From a93c2dcd564c1d3278f5f5e52674aba9938399be Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Mon, 10 Feb 2020 14:35:35 -0800
Subject: [PATCH 0001/1664] Indicate PiP animation type from Launcher to SysUI

Also, need callback from SysUI to Launcher once the pip animation is
started to keep back compatibility.

Bug: 146594635
Test: manually
Change-Id: I617a17fd5f6049d9f1d49f9f834623a2bb49f6ca
---
 .../quickstep/FallbackSwipeHandler.java       |  2 ++
 .../quickstep/LauncherSwipeHandler.java       |  2 ++
 .../android/quickstep/views/RecentsView.java  |  9 +++++
 .../com/android/quickstep/SystemUiProxy.java  | 33 +++++++++++++++++--
 4 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackSwipeHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackSwipeHandler.java
index 700feef790..cd001a128b 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackSwipeHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackSwipeHandler.java
@@ -332,6 +332,8 @@ public class FallbackSwipeHandler extends BaseSwipeUpHandler<RecentsActivity, Fa
                     // Send a home intent to clear the task stack
                     mContext.startActivity(mGestureState.getHomeIntent());
                 } else {
+                    // Notify swipe-to-home (recents animation) is finished
+                    SystemUiProxy.INSTANCE.get(mContext).notifySwipeToHomeFinished();
                     mRecentsAnimationController.finish(true, () -> {
                         if (!mTouchedHomeDuringTransition) {
                             // If the user hasn't interacted with the screen during the transition,
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java
index 345a147ca5..646d01fb8f 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java
@@ -699,6 +699,8 @@ public class LauncherSwipeHandler<T extends BaseDraggingActivity>
         switch (mGestureState.getEndTarget()) {
             case HOME:
                 mStateCallback.setState(STATE_SCALED_CONTROLLER_HOME | STATE_CAPTURE_SCREENSHOT);
+                // Notify swipe-to-home (recents animation) is finished
+                SystemUiProxy.INSTANCE.get(mContext).notifySwipeToHomeFinished();
                 break;
             case RECENTS:
                 mStateCallback.setState(STATE_SCALED_CONTROLLER_RECENTS | STATE_CAPTURE_SCREENSHOT
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
index a673ab61b7..a7968ca055 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
@@ -17,6 +17,7 @@
 package com.android.quickstep.views;
 
 import static androidx.dynamicanimation.animation.DynamicAnimation.MIN_VISIBLE_CHANGE_PIXELS;
+
 import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS;
 import static com.android.launcher3.InvariantDeviceProfile.CHANGE_FLAG_ICON_PARAMS;
 import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
@@ -105,11 +106,13 @@ import com.android.quickstep.RecentsAnimationController;
 import com.android.quickstep.RecentsAnimationTargets;
 import com.android.quickstep.RecentsModel;
 import com.android.quickstep.RecentsModel.TaskVisualsChangeListener;
+import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.TaskThumbnailCache;
 import com.android.quickstep.TaskUtils;
 import com.android.quickstep.ViewUtils;
 import com.android.quickstep.util.AppWindowAnimationHelper;
 import com.android.quickstep.util.LayoutUtils;
+import com.android.systemui.shared.recents.IPinnedStackAnimationListener;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.recents.model.ThumbnailData;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
@@ -261,7 +264,10 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
                 }
             });
         }
+    };
 
+    private final IPinnedStackAnimationListener mIPinnedStackAnimationListener =
+            new IPinnedStackAnimationListener.Stub() {
         @Override
         public void onPinnedStackAnimationStarted() {
             // Needed for activities that auto-enter PiP, which will not trigger a remote
@@ -443,6 +449,8 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
         mSyncTransactionApplier = new SyncRtSurfaceTransactionApplierCompat(this);
         RecentsModel.INSTANCE.get(getContext()).addThumbnailChangeListener(this);
         mIdp.addOnChangeListener(this);
+        SystemUiProxy.INSTANCE.get(getContext()).setPinnedStackAnimationListener(
+                mIPinnedStackAnimationListener);
     }
 
     @Override
@@ -455,6 +463,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
         mSyncTransactionApplier = null;
         RecentsModel.INSTANCE.get(getContext()).removeThumbnailChangeListener(this);
         mIdp.removeOnChangeListener(this);
+        SystemUiProxy.INSTANCE.get(getContext()).setPinnedStackAnimationListener(null);
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index 458d6a9553..eb60601c44 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -29,6 +29,7 @@ import android.util.Log;
 import android.view.MotionEvent;
 
 import com.android.launcher3.util.MainThreadInitializedObject;
+import com.android.systemui.shared.recents.IPinnedStackAnimationListener;
 import com.android.systemui.shared.recents.ISystemUiProxy;
 
 /**
@@ -268,9 +269,7 @@ public class SystemUiProxy implements ISystemUiProxy {
         }
     }
 
-    /**
-     * See SharedApiCompat#setShelfHeight()
-     */
+    @Override
     public void setShelfHeight(boolean visible, int shelfHeight) {
         boolean changed = visible != mLastShelfVisible || shelfHeight != mLastShelfHeight;
         if (mSystemUiProxy != null && changed) {
@@ -306,4 +305,32 @@ public class SystemUiProxy implements ISystemUiProxy {
             }
         }
     }
+
+    /**
+     * Notifies that swipe-to-home action is finished.
+     */
+    @Override
+    public void notifySwipeToHomeFinished() {
+        if (mSystemUiProxy != null) {
+            try {
+                mSystemUiProxy.notifySwipeToHomeFinished();
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call setPinnedStackAnimationType", e);
+            }
+        }
+    }
+
+    /**
+     * Sets listener to get pinned stack animation callbacks.
+     */
+    @Override
+    public void setPinnedStackAnimationListener(IPinnedStackAnimationListener listener) {
+        if (mSystemUiProxy != null) {
+            try {
+                mSystemUiProxy.setPinnedStackAnimationListener(listener);
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call setPinnedStackAnimationListener", e);
+            }
+        }
+    }
 }
-- 
GitLab


From e1aff298891495a422d3595f90749a457e7c4ae6 Mon Sep 17 00:00:00 2001
From: Vadim Caen <caen@google.com>
Date: Tue, 25 Feb 2020 12:48:21 +0100
Subject: [PATCH 0002/1664] Fixed portrait orientation if fixed_rotation flag

Use SCREEN_ORIENTATION_PORTRAIT for the launcher if the fixed_rotation
is enabled

Test: manual, check that the launcher doesn't rotates when the flag is
enabled and we are coming from a landscape activity
Bug: 147469164
Bug: 146416687
Change-Id: I0fe0d16ec1fbfe096fbdfcf2c315e12fb3423cf8
---
 src/com/android/launcher3/PagedView.java      | 23 +++++++++++++++++--
 src/com/android/launcher3/Utilities.java      |  9 ++++++++
 .../launcher3/states/RotationHelper.java      |  6 ++++-
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 4c6e1f3ebc..66dba98e0f 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -20,12 +20,15 @@ import static com.android.launcher3.compat.AccessibilityManagerCompat.isAccessib
 import static com.android.launcher3.compat.AccessibilityManagerCompat.isObservedEventType;
 import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;
 import static com.android.launcher3.touch.OverScroll.OVERSCROLL_DAMP_FACTOR;
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 
 import android.animation.LayoutTransition;
 import android.animation.TimeInterpolator;
 import android.annotation.SuppressLint;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.res.TypedArray;
+import android.database.ContentObserver;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.os.Bundle;
@@ -64,6 +67,9 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
     private static final String TAG = "PagedView";
     private static final boolean DEBUG = false;
 
+    public static boolean sFlagForcedRotation = false;
+    public static final String FIXED_ROTATION_TRANSFORM_SETTING_NAME = "fixed_rotation_transform";
+
     public static final int INVALID_PAGE = -1;
     protected static final ComputePageScrollsLogic SIMPLE_SCROLL_LOGIC = (v) -> v.getVisibility() != GONE;
 
@@ -166,11 +172,12 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
      * Initializes various states for this workspace.
      */
     protected void init() {
-        mScroller = new OverScroller(getContext());
+        Context context = getContext();
+        mScroller = new OverScroller(context);
         setDefaultInterpolator(Interpolators.SCROLL);
         mCurrentPage = 0;
 
-        final ViewConfiguration configuration = ViewConfiguration.get(getContext());
+        final ViewConfiguration configuration = ViewConfiguration.get(context);
         mTouchSlop = configuration.getScaledPagingTouchSlop();
         mMaximumVelocity = configuration.getScaledMaximumFlingVelocity();
 
@@ -182,6 +189,18 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         if (Utilities.ATLEAST_OREO) {
             setDefaultFocusHighlightEnabled(false);
         }
+
+        sFlagForcedRotation = Utilities.isFixedRotationTransformEnabled(context);
+        final ContentResolver resolver = context.getContentResolver();
+        final ContentObserver observer = new ContentObserver(MAIN_EXECUTOR.getHandler()) {
+            @Override
+            public void onChange(boolean selfChange) {
+                sFlagForcedRotation = Utilities.isFixedRotationTransformEnabled(context);
+            }
+        };
+        resolver.registerContentObserver(Settings.Global.getUriFor(
+                FIXED_ROTATION_TRANSFORM_SETTING_NAME),
+                false, observer);
     }
 
     protected void setDefaultInterpolator(Interpolator interpolator) {
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index e0e4cc0ce4..571f745080 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -17,6 +17,7 @@
 package com.android.launcher3;
 
 import static com.android.launcher3.ItemInfoWithIcon.FLAG_ICON_BADGED;
+import static com.android.launcher3.PagedView.FIXED_ROTATION_TRANSFORM_SETTING_NAME;
 
 import android.animation.ValueAnimator;
 import android.annotation.TargetApi;
@@ -127,6 +128,14 @@ public final class Utilities {
                         Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0;
     }
 
+    /**
+     * Checks whether the fixed_rotation_flag is enabled.
+     */
+    public static boolean isFixedRotationTransformEnabled(Context context) {
+        return Settings.Global.getInt(context.getContentResolver(),
+            FIXED_ROTATION_TRANSFORM_SETTING_NAME, 0) != 0;
+    }
+
     // An intent extra to indicate the horizontal scroll of the wallpaper.
     public static final String EXTRA_WALLPAPER_OFFSET = "com.android.launcher3.WALLPAPER_OFFSET";
     public static final String EXTRA_WALLPAPER_FLAVOR = "com.android.launcher3.WALLPAPER_FLAVOR";
diff --git a/src/com/android/launcher3/states/RotationHelper.java b/src/com/android/launcher3/states/RotationHelper.java
index 852928b416..3a64f9aeb8 100644
--- a/src/com/android/launcher3/states/RotationHelper.java
+++ b/src/com/android/launcher3/states/RotationHelper.java
@@ -17,6 +17,7 @@ package com.android.launcher3.states;
 
 import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LOCKED;
 import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_NOSENSOR;
+import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
 import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
 import static android.util.DisplayMetrics.DENSITY_DEVICE_STABLE;
 
@@ -26,6 +27,7 @@ import android.content.res.Resources;
 import android.view.WindowManager;
 
 import com.android.launcher3.Launcher;
+import com.android.launcher3.PagedView;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
@@ -182,7 +184,9 @@ public class RotationHelper implements OnSharedPreferenceChangeListener {
         }
 
         final int activityFlags;
-        if (mStateHandlerRequest != REQUEST_NONE) {
+        if (PagedView.sFlagForcedRotation) {
+            activityFlags = SCREEN_ORIENTATION_PORTRAIT;
+        } else if (mStateHandlerRequest != REQUEST_NONE) {
             activityFlags = mStateHandlerRequest == REQUEST_LOCK ?
                     SCREEN_ORIENTATION_LOCKED : SCREEN_ORIENTATION_UNSPECIFIED;
         } else if (mCurrentTransitionRequest != REQUEST_NONE) {
-- 
GitLab


From 38d2e3086ce3a6636bd7647c170d51e04a56186a Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Thu, 5 Mar 2020 18:04:41 +0000
Subject: [PATCH 0003/1664] Revert "Fixed portrait orientation if
 fixed_rotation flag"

This reverts commit e1aff298891495a422d3595f90749a457e7c4ae6.

Reason for revert: An equivalent change was made in ub-launcher3-master with slight variations, causing conflicts when merging from there to platform master. Once this is reverted, conflicts should go away and the new solution should be good to go.

Change-Id: I19ba4af5f1e5f089fb771ada8b20c28a4b09b68c
---
 src/com/android/launcher3/PagedView.java      | 23 ++-----------------
 src/com/android/launcher3/Utilities.java      |  9 --------
 .../launcher3/states/RotationHelper.java      |  6 +----
 3 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 66dba98e0f..4c6e1f3ebc 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -20,15 +20,12 @@ import static com.android.launcher3.compat.AccessibilityManagerCompat.isAccessib
 import static com.android.launcher3.compat.AccessibilityManagerCompat.isObservedEventType;
 import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;
 import static com.android.launcher3.touch.OverScroll.OVERSCROLL_DAMP_FACTOR;
-import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 
 import android.animation.LayoutTransition;
 import android.animation.TimeInterpolator;
 import android.annotation.SuppressLint;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.database.ContentObserver;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.os.Bundle;
@@ -67,9 +64,6 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
     private static final String TAG = "PagedView";
     private static final boolean DEBUG = false;
 
-    public static boolean sFlagForcedRotation = false;
-    public static final String FIXED_ROTATION_TRANSFORM_SETTING_NAME = "fixed_rotation_transform";
-
     public static final int INVALID_PAGE = -1;
     protected static final ComputePageScrollsLogic SIMPLE_SCROLL_LOGIC = (v) -> v.getVisibility() != GONE;
 
@@ -172,12 +166,11 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
      * Initializes various states for this workspace.
      */
     protected void init() {
-        Context context = getContext();
-        mScroller = new OverScroller(context);
+        mScroller = new OverScroller(getContext());
         setDefaultInterpolator(Interpolators.SCROLL);
         mCurrentPage = 0;
 
-        final ViewConfiguration configuration = ViewConfiguration.get(context);
+        final ViewConfiguration configuration = ViewConfiguration.get(getContext());
         mTouchSlop = configuration.getScaledPagingTouchSlop();
         mMaximumVelocity = configuration.getScaledMaximumFlingVelocity();
 
@@ -189,18 +182,6 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         if (Utilities.ATLEAST_OREO) {
             setDefaultFocusHighlightEnabled(false);
         }
-
-        sFlagForcedRotation = Utilities.isFixedRotationTransformEnabled(context);
-        final ContentResolver resolver = context.getContentResolver();
-        final ContentObserver observer = new ContentObserver(MAIN_EXECUTOR.getHandler()) {
-            @Override
-            public void onChange(boolean selfChange) {
-                sFlagForcedRotation = Utilities.isFixedRotationTransformEnabled(context);
-            }
-        };
-        resolver.registerContentObserver(Settings.Global.getUriFor(
-                FIXED_ROTATION_TRANSFORM_SETTING_NAME),
-                false, observer);
     }
 
     protected void setDefaultInterpolator(Interpolator interpolator) {
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 571f745080..e0e4cc0ce4 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -17,7 +17,6 @@
 package com.android.launcher3;
 
 import static com.android.launcher3.ItemInfoWithIcon.FLAG_ICON_BADGED;
-import static com.android.launcher3.PagedView.FIXED_ROTATION_TRANSFORM_SETTING_NAME;
 
 import android.animation.ValueAnimator;
 import android.annotation.TargetApi;
@@ -128,14 +127,6 @@ public final class Utilities {
                         Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0;
     }
 
-    /**
-     * Checks whether the fixed_rotation_flag is enabled.
-     */
-    public static boolean isFixedRotationTransformEnabled(Context context) {
-        return Settings.Global.getInt(context.getContentResolver(),
-            FIXED_ROTATION_TRANSFORM_SETTING_NAME, 0) != 0;
-    }
-
     // An intent extra to indicate the horizontal scroll of the wallpaper.
     public static final String EXTRA_WALLPAPER_OFFSET = "com.android.launcher3.WALLPAPER_OFFSET";
     public static final String EXTRA_WALLPAPER_FLAVOR = "com.android.launcher3.WALLPAPER_FLAVOR";
diff --git a/src/com/android/launcher3/states/RotationHelper.java b/src/com/android/launcher3/states/RotationHelper.java
index 3a64f9aeb8..852928b416 100644
--- a/src/com/android/launcher3/states/RotationHelper.java
+++ b/src/com/android/launcher3/states/RotationHelper.java
@@ -17,7 +17,6 @@ package com.android.launcher3.states;
 
 import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LOCKED;
 import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_NOSENSOR;
-import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
 import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
 import static android.util.DisplayMetrics.DENSITY_DEVICE_STABLE;
 
@@ -27,7 +26,6 @@ import android.content.res.Resources;
 import android.view.WindowManager;
 
 import com.android.launcher3.Launcher;
-import com.android.launcher3.PagedView;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
@@ -184,9 +182,7 @@ public class RotationHelper implements OnSharedPreferenceChangeListener {
         }
 
         final int activityFlags;
-        if (PagedView.sFlagForcedRotation) {
-            activityFlags = SCREEN_ORIENTATION_PORTRAIT;
-        } else if (mStateHandlerRequest != REQUEST_NONE) {
+        if (mStateHandlerRequest != REQUEST_NONE) {
             activityFlags = mStateHandlerRequest == REQUEST_LOCK ?
                     SCREEN_ORIENTATION_LOCKED : SCREEN_ORIENTATION_UNSPECIFIED;
         } else if (mCurrentTransitionRequest != REQUEST_NONE) {
-- 
GitLab


From 30c29bfc08c2429a382d9d34a7728f8f73e9b8fd Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Tue, 3 Mar 2020 01:15:27 +0000
Subject: [PATCH 0004/1664] Removes iconloaderlib from Launcher3.

Bug: 138964382
Test: builds
Change-Id: Ic60adfb2ebdcf1a72b440df26023b861fd6e62d5
---
 iconloaderlib/Android.bp                      |  44 --
 iconloaderlib/AndroidManifest.xml             |  20 -
 iconloaderlib/build.gradle                    |  38 --
 .../adaptive_icon_drawable_wrapper.xml        |  22 -
 .../res/drawable/ic_instant_app_badge.xml     |  39 --
 iconloaderlib/res/values/colors.xml           |  21 -
 iconloaderlib/res/values/config.xml           |  27 -
 iconloaderlib/res/values/dimens.xml           |  19 -
 .../launcher3/icons/BaseIconFactory.java      | 396 ------------
 .../android/launcher3/icons/BitmapInfo.java   |  72 ---
 .../launcher3/icons/BitmapRenderer.java       |  70 ---
 .../launcher3/icons/ColorExtractor.java       | 127 ----
 .../android/launcher3/icons/DotRenderer.java  | 143 -----
 .../launcher3/icons/FixedScaleDrawable.java   |  53 --
 .../launcher3/icons/GraphicsUtils.java        |  85 ---
 .../launcher3/icons/IconNormalizer.java       | 411 -------------
 .../launcher3/icons/ShadowGenerator.java      | 167 -----
 .../launcher3/icons/cache/BaseIconCache.java  | 582 ------------------
 .../launcher3/icons/cache/CachingLogic.java   |  65 --
 .../icons/cache/HandlerRunnable.java          |  67 --
 .../icons/cache/IconCacheUpdateHandler.java   | 313 ----------
 .../android/launcher3/util/ComponentKey.java  |  59 --
 .../launcher3/util/NoLocaleSQLiteHelper.java  |  58 --
 .../launcher3/util/SQLiteCacheHelper.java     | 125 ----
 .../android/launcher3/icons/IconFactory.java  |  89 ---
 .../launcher3/icons/SimpleIconCache.java      | 114 ----
 26 files changed, 3226 deletions(-)
 delete mode 100644 iconloaderlib/Android.bp
 delete mode 100644 iconloaderlib/AndroidManifest.xml
 delete mode 100644 iconloaderlib/build.gradle
 delete mode 100644 iconloaderlib/res/drawable-v26/adaptive_icon_drawable_wrapper.xml
 delete mode 100644 iconloaderlib/res/drawable/ic_instant_app_badge.xml
 delete mode 100644 iconloaderlib/res/values/colors.xml
 delete mode 100644 iconloaderlib/res/values/config.xml
 delete mode 100644 iconloaderlib/res/values/dimens.xml
 delete mode 100644 iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java
 delete mode 100644 iconloaderlib/src/com/android/launcher3/icons/BitmapInfo.java
 delete mode 100644 iconloaderlib/src/com/android/launcher3/icons/BitmapRenderer.java
 delete mode 100644 iconloaderlib/src/com/android/launcher3/icons/ColorExtractor.java
 delete mode 100644 iconloaderlib/src/com/android/launcher3/icons/DotRenderer.java
 delete mode 100644 iconloaderlib/src/com/android/launcher3/icons/FixedScaleDrawable.java
 delete mode 100644 iconloaderlib/src/com/android/launcher3/icons/GraphicsUtils.java
 delete mode 100644 iconloaderlib/src/com/android/launcher3/icons/IconNormalizer.java
 delete mode 100644 iconloaderlib/src/com/android/launcher3/icons/ShadowGenerator.java
 delete mode 100644 iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java
 delete mode 100644 iconloaderlib/src/com/android/launcher3/icons/cache/CachingLogic.java
 delete mode 100644 iconloaderlib/src/com/android/launcher3/icons/cache/HandlerRunnable.java
 delete mode 100644 iconloaderlib/src/com/android/launcher3/icons/cache/IconCacheUpdateHandler.java
 delete mode 100644 iconloaderlib/src/com/android/launcher3/util/ComponentKey.java
 delete mode 100644 iconloaderlib/src/com/android/launcher3/util/NoLocaleSQLiteHelper.java
 delete mode 100644 iconloaderlib/src/com/android/launcher3/util/SQLiteCacheHelper.java
 delete mode 100644 iconloaderlib/src_full_lib/com/android/launcher3/icons/IconFactory.java
 delete mode 100644 iconloaderlib/src_full_lib/com/android/launcher3/icons/SimpleIconCache.java

diff --git a/iconloaderlib/Android.bp b/iconloaderlib/Android.bp
deleted file mode 100644
index f12d16e42a..0000000000
--- a/iconloaderlib/Android.bp
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (C) 2018 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-android_library {
-    name: "iconloader_base",
-    sdk_version: "28",
-    min_sdk_version: "21",
-    static_libs: [
-        "androidx.core_core",
-    ],
-    resource_dirs: [
-        "res",
-    ],
-    srcs: [
-        "src/**/*.java",
-    ],
-}
-
-android_library {
-    name: "iconloader",
-    sdk_version: "system_current",
-    min_sdk_version: "21",
-    static_libs: [
-        "androidx.core_core",
-    ],
-    resource_dirs: [
-        "res",
-    ],
-    srcs: [
-        "src/**/*.java",
-        "src_full_lib/**/*.java",
-    ],
-}
diff --git a/iconloaderlib/AndroidManifest.xml b/iconloaderlib/AndroidManifest.xml
deleted file mode 100644
index b30258da2a..0000000000
--- a/iconloaderlib/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.launcher3.icons">
-</manifest>
diff --git a/iconloaderlib/build.gradle b/iconloaderlib/build.gradle
deleted file mode 100644
index d7a62e1114..0000000000
--- a/iconloaderlib/build.gradle
+++ /dev/null
@@ -1,38 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion COMPILE_SDK
-    buildToolsVersion BUILD_TOOLS_VERSION
-
-    defaultConfig {
-        minSdkVersion 25
-        targetSdkVersion 28
-        versionCode 1
-        versionName "1.0"
-    }
-
-    sourceSets {
-        main {
-            java.srcDirs = ['src', 'src_full_lib']
-            manifest.srcFile 'AndroidManifest.xml'
-            res.srcDirs = ['res']
-        }
-    }
-
-    lintOptions {
-        abortOnError false
-    }
-
-    tasks.withType(JavaCompile) {
-        options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-}
-
-dependencies {
-    implementation "androidx.core:core:${ANDROID_X_VERSION}"
-}
diff --git a/iconloaderlib/res/drawable-v26/adaptive_icon_drawable_wrapper.xml b/iconloaderlib/res/drawable-v26/adaptive_icon_drawable_wrapper.xml
deleted file mode 100644
index 9f13cf5719..0000000000
--- a/iconloaderlib/res/drawable-v26/adaptive_icon_drawable_wrapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/legacy_icon_background"/>
-    <foreground>
-        <com.android.launcher3.icons.FixedScaleDrawable />
-    </foreground>
-</adaptive-icon>
diff --git a/iconloaderlib/res/drawable/ic_instant_app_badge.xml b/iconloaderlib/res/drawable/ic_instant_app_badge.xml
deleted file mode 100644
index b74317e5f2..0000000000
--- a/iconloaderlib/res/drawable/ic_instant_app_badge.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="@dimen/profile_badge_size"
-    android:height="@dimen/profile_badge_size"
-    android:viewportWidth="18"
-    android:viewportHeight="18">
-
-    <path
-        android:fillColor="@android:color/black"
-        android:strokeWidth="1"
-        android:pathData="M 9 0 C 13.9705627485 0 18 4.02943725152 18 9 C 18 13.9705627485 13.9705627485 18 9 18 C 4.02943725152 18 0 13.9705627485 0 9 C 0 4.02943725152 4.02943725152 0 9 0 Z" />
-    <path
-        android:fillColor="@android:color/white"
-        android:strokeWidth="1"
-        android:pathData="M 9 0 C 13.9705627485 0 18 4.02943725152 18 9 C 18 13.9705627485 13.9705627485 18 9 18 C 4.02943725152 18 0 13.9705627485 0 9 C 0 4.02943725152 4.02943725152 0 9 0 Z" />
-    <path
-        android:fillColor="@android:color/white"
-        android:strokeWidth="1"
-        android:pathData="M 9 0 C 13.9705627485 0 18 4.02943725152 18 9 C 18 13.9705627485 13.9705627485 18 9 18 C 4.02943725152 18 0 13.9705627485 0 9 C 0 4.02943725152 4.02943725152 0 9 0 Z" />
-    <path
-        android:fillColor="@android:color/black"
-        android:fillAlpha="0.87"
-        android:strokeWidth="1"
-        android:pathData="M 6 10.4123279 L 8.63934949 10.4123279 L 8.63934949 15.6 L 12.5577168 7.84517705 L 9.94547194 7.84517705 L 9.94547194 2 Z" />
-</vector>
diff --git a/iconloaderlib/res/values/colors.xml b/iconloaderlib/res/values/colors.xml
deleted file mode 100644
index 873b2fc5fb..0000000000
--- a/iconloaderlib/res/values/colors.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2018, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-    <color name="legacy_icon_background">#FFFFFF</color>
-</resources>
diff --git a/iconloaderlib/res/values/config.xml b/iconloaderlib/res/values/config.xml
deleted file mode 100644
index 68c2d2e3aa..0000000000
--- a/iconloaderlib/res/values/config.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2018, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Various configurations to control the simple cache implementation -->
-
-    <dimen name="default_icon_bitmap_size">56dp</dimen>
-    <bool name="simple_cache_enable_im_memory">false</bool>
-    <string name="cache_db_name" translatable="false">app_icons.db</string>
-
-</resources>
\ No newline at end of file
diff --git a/iconloaderlib/res/values/dimens.xml b/iconloaderlib/res/values/dimens.xml
deleted file mode 100644
index e8c0c44f72..0000000000
--- a/iconloaderlib/res/values/dimens.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <dimen name="profile_badge_size">24dp</dimen>
-</resources>
diff --git a/iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java b/iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java
deleted file mode 100644
index 31a923e314..0000000000
--- a/iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java
+++ /dev/null
@@ -1,396 +0,0 @@
-package com.android.launcher3.icons;
-
-import static android.graphics.Paint.DITHER_FLAG;
-import static android.graphics.Paint.FILTER_BITMAP_FLAG;
-
-import static com.android.launcher3.icons.ShadowGenerator.BLUR_FACTOR;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.PaintFlagsDrawFilter;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.graphics.drawable.AdaptiveIconDrawable;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.os.Process;
-import android.os.UserHandle;
-
-import androidx.annotation.NonNull;
-
-/**
- * This class will be moved to androidx library. There shouldn't be any dependency outside
- * this package.
- */
-public class BaseIconFactory implements AutoCloseable {
-
-    private static final String TAG = "BaseIconFactory";
-    private static final int DEFAULT_WRAPPER_BACKGROUND = Color.WHITE;
-    static final boolean ATLEAST_OREO = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
-    static final boolean ATLEAST_P = Build.VERSION.SDK_INT >= Build.VERSION_CODES.P;
-
-    private static final float ICON_BADGE_SCALE = 0.444f;
-
-    private final Rect mOldBounds = new Rect();
-    protected final Context mContext;
-    private final Canvas mCanvas;
-    private final PackageManager mPm;
-    private final ColorExtractor mColorExtractor;
-    private boolean mDisableColorExtractor;
-    private boolean mBadgeOnLeft = false;
-
-    protected final int mFillResIconDpi;
-    protected final int mIconBitmapSize;
-
-    private IconNormalizer mNormalizer;
-    private ShadowGenerator mShadowGenerator;
-    private final boolean mShapeDetection;
-
-    private Drawable mWrapperIcon;
-    private int mWrapperBackgroundColor = DEFAULT_WRAPPER_BACKGROUND;
-
-    protected BaseIconFactory(Context context, int fillResIconDpi, int iconBitmapSize,
-            boolean shapeDetection) {
-        mContext = context.getApplicationContext();
-        mShapeDetection = shapeDetection;
-        mFillResIconDpi = fillResIconDpi;
-        mIconBitmapSize = iconBitmapSize;
-
-        mPm = mContext.getPackageManager();
-        mColorExtractor = new ColorExtractor();
-
-        mCanvas = new Canvas();
-        mCanvas.setDrawFilter(new PaintFlagsDrawFilter(DITHER_FLAG, FILTER_BITMAP_FLAG));
-        clear();
-    }
-
-    protected BaseIconFactory(Context context, int fillResIconDpi, int iconBitmapSize) {
-        this(context, fillResIconDpi, iconBitmapSize, false);
-    }
-
-    protected void clear() {
-        mWrapperBackgroundColor = DEFAULT_WRAPPER_BACKGROUND;
-        mDisableColorExtractor = false;
-        mBadgeOnLeft = false;
-    }
-
-    public ShadowGenerator getShadowGenerator() {
-        if (mShadowGenerator == null) {
-            mShadowGenerator = new ShadowGenerator(mIconBitmapSize);
-        }
-        return mShadowGenerator;
-    }
-
-    public IconNormalizer getNormalizer() {
-        if (mNormalizer == null) {
-            mNormalizer = new IconNormalizer(mContext, mIconBitmapSize, mShapeDetection);
-        }
-        return mNormalizer;
-    }
-
-    @SuppressWarnings("deprecation")
-    public BitmapInfo createIconBitmap(Intent.ShortcutIconResource iconRes) {
-        try {
-            Resources resources = mPm.getResourcesForApplication(iconRes.packageName);
-            if (resources != null) {
-                final int id = resources.getIdentifier(iconRes.resourceName, null, null);
-                // do not stamp old legacy shortcuts as the app may have already forgotten about it
-                return createBadgedIconBitmap(
-                        resources.getDrawableForDensity(id, mFillResIconDpi),
-                        Process.myUserHandle() /* only available on primary user */,
-                        false /* do not apply legacy treatment */);
-            }
-        } catch (Exception e) {
-            // Icon not found.
-        }
-        return null;
-    }
-
-    public BitmapInfo createIconBitmap(Bitmap icon) {
-        if (mIconBitmapSize != icon.getWidth() || mIconBitmapSize != icon.getHeight()) {
-            icon = createIconBitmap(new BitmapDrawable(mContext.getResources(), icon), 1f);
-        }
-
-        return BitmapInfo.of(icon, extractColor(icon));
-    }
-
-    public BitmapInfo createBadgedIconBitmap(Drawable icon, UserHandle user,
-            boolean shrinkNonAdaptiveIcons) {
-        return createBadgedIconBitmap(icon, user, shrinkNonAdaptiveIcons, false, null);
-    }
-
-    public BitmapInfo createBadgedIconBitmap(Drawable icon, UserHandle user,
-            int iconAppTargetSdk) {
-        return createBadgedIconBitmap(icon, user, iconAppTargetSdk, false);
-    }
-
-    public BitmapInfo createBadgedIconBitmap(Drawable icon, UserHandle user,
-            int iconAppTargetSdk, boolean isInstantApp) {
-        return createBadgedIconBitmap(icon, user, iconAppTargetSdk, isInstantApp, null);
-    }
-
-    public BitmapInfo createBadgedIconBitmap(Drawable icon, UserHandle user,
-            int iconAppTargetSdk, boolean isInstantApp, float[] scale) {
-        boolean shrinkNonAdaptiveIcons = ATLEAST_P ||
-                (ATLEAST_OREO && iconAppTargetSdk >= Build.VERSION_CODES.O);
-        return createBadgedIconBitmap(icon, user, shrinkNonAdaptiveIcons, isInstantApp, scale);
-    }
-
-    public Bitmap createScaledBitmapWithoutShadow(Drawable icon, int iconAppTargetSdk) {
-        boolean shrinkNonAdaptiveIcons = ATLEAST_P ||
-                (ATLEAST_OREO && iconAppTargetSdk >= Build.VERSION_CODES.O);
-        return  createScaledBitmapWithoutShadow(icon, shrinkNonAdaptiveIcons);
-    }
-
-    /**
-     * Creates bitmap using the source drawable and various parameters.
-     * The bitmap is visually normalized with other icons and has enough spacing to add shadow.
-     *
-     * @param icon                      source of the icon
-     * @param user                      info can be used for a badge
-     * @param shrinkNonAdaptiveIcons    {@code true} if non adaptive icons should be treated
-     * @param isInstantApp              info can be used for a badge
-     * @param scale                     returns the scale result from normalization
-     * @return a bitmap suitable for disaplaying as an icon at various system UIs.
-     */
-    public BitmapInfo createBadgedIconBitmap(@NonNull Drawable icon, UserHandle user,
-            boolean shrinkNonAdaptiveIcons, boolean isInstantApp, float[] scale) {
-        if (scale == null) {
-            scale = new float[1];
-        }
-        icon = normalizeAndWrapToAdaptiveIcon(icon, shrinkNonAdaptiveIcons, null, scale);
-        Bitmap bitmap = createIconBitmap(icon, scale[0]);
-        if (ATLEAST_OREO && icon instanceof AdaptiveIconDrawable) {
-            mCanvas.setBitmap(bitmap);
-            getShadowGenerator().recreateIcon(Bitmap.createBitmap(bitmap), mCanvas);
-            mCanvas.setBitmap(null);
-        }
-
-        if (isInstantApp) {
-            badgeWithDrawable(bitmap, mContext.getDrawable(R.drawable.ic_instant_app_badge));
-        }
-        if (user != null) {
-            BitmapDrawable drawable = new FixedSizeBitmapDrawable(bitmap);
-            Drawable badged = mPm.getUserBadgedIcon(drawable, user);
-            if (badged instanceof BitmapDrawable) {
-                bitmap = ((BitmapDrawable) badged).getBitmap();
-            } else {
-                bitmap = createIconBitmap(badged, 1f);
-            }
-        }
-        int color = extractColor(bitmap);
-        return icon instanceof BitmapInfo.Extender
-                ? ((BitmapInfo.Extender) icon).getExtendedInfo(bitmap, color, this)
-                : BitmapInfo.of(bitmap, color);
-    }
-
-    public Bitmap createScaledBitmapWithoutShadow(Drawable icon, boolean shrinkNonAdaptiveIcons) {
-        RectF iconBounds = new RectF();
-        float[] scale = new float[1];
-        icon = normalizeAndWrapToAdaptiveIcon(icon, shrinkNonAdaptiveIcons, iconBounds, scale);
-        return createIconBitmap(icon,
-                Math.min(scale[0], ShadowGenerator.getScaleForBounds(iconBounds)));
-    }
-
-    /**
-     * Switches badging to left/right
-     */
-    public void setBadgeOnLeft(boolean badgeOnLeft) {
-        mBadgeOnLeft = badgeOnLeft;
-    }
-
-    /**
-     * Sets the background color used for wrapped adaptive icon
-     */
-    public void setWrapperBackgroundColor(int color) {
-        mWrapperBackgroundColor = (Color.alpha(color) < 255) ? DEFAULT_WRAPPER_BACKGROUND : color;
-    }
-
-    /**
-     * Disables the dominant color extraction for all icons loaded.
-     */
-    public void disableColorExtraction() {
-        mDisableColorExtractor = true;
-    }
-
-    private Drawable normalizeAndWrapToAdaptiveIcon(@NonNull Drawable icon,
-            boolean shrinkNonAdaptiveIcons, RectF outIconBounds, float[] outScale) {
-        if (icon == null) {
-            return null;
-        }
-        float scale = 1f;
-
-        if (shrinkNonAdaptiveIcons && ATLEAST_OREO) {
-            if (mWrapperIcon == null) {
-                mWrapperIcon = mContext.getDrawable(R.drawable.adaptive_icon_drawable_wrapper)
-                        .mutate();
-            }
-            AdaptiveIconDrawable dr = (AdaptiveIconDrawable) mWrapperIcon;
-            dr.setBounds(0, 0, 1, 1);
-            boolean[] outShape = new boolean[1];
-            scale = getNormalizer().getScale(icon, outIconBounds, dr.getIconMask(), outShape);
-            if (!(icon instanceof AdaptiveIconDrawable) && !outShape[0]) {
-                FixedScaleDrawable fsd = ((FixedScaleDrawable) dr.getForeground());
-                fsd.setDrawable(icon);
-                fsd.setScale(scale);
-                icon = dr;
-                scale = getNormalizer().getScale(icon, outIconBounds, null, null);
-
-                ((ColorDrawable) dr.getBackground()).setColor(mWrapperBackgroundColor);
-            }
-        } else {
-            scale = getNormalizer().getScale(icon, outIconBounds, null, null);
-        }
-
-        outScale[0] = scale;
-        return icon;
-    }
-
-    /**
-     * Adds the {@param badge} on top of {@param target} using the badge dimensions.
-     */
-    public void badgeWithDrawable(Bitmap target, Drawable badge) {
-        mCanvas.setBitmap(target);
-        badgeWithDrawable(mCanvas, badge);
-        mCanvas.setBitmap(null);
-    }
-
-    /**
-     * Adds the {@param badge} on top of {@param target} using the badge dimensions.
-     */
-    public void badgeWithDrawable(Canvas target, Drawable badge) {
-        int badgeSize = getBadgeSizeForIconSize(mIconBitmapSize);
-        if (mBadgeOnLeft) {
-            badge.setBounds(0, mIconBitmapSize - badgeSize, badgeSize, mIconBitmapSize);
-        } else {
-            badge.setBounds(mIconBitmapSize - badgeSize, mIconBitmapSize - badgeSize,
-                    mIconBitmapSize, mIconBitmapSize);
-        }
-        badge.draw(target);
-    }
-
-    private Bitmap createIconBitmap(Drawable icon, float scale) {
-        return createIconBitmap(icon, scale, mIconBitmapSize);
-    }
-
-    /**
-     * @param icon drawable that should be flattened to a bitmap
-     * @param scale the scale to apply before drawing {@param icon} on the canvas
-     */
-    public Bitmap createIconBitmap(@NonNull Drawable icon, float scale, int size) {
-        Bitmap bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
-        if (icon == null) {
-            return bitmap;
-        }
-        mCanvas.setBitmap(bitmap);
-        mOldBounds.set(icon.getBounds());
-
-        if (ATLEAST_OREO && icon instanceof AdaptiveIconDrawable) {
-            int offset = Math.max((int) Math.ceil(BLUR_FACTOR * size),
-                    Math.round(size * (1 - scale) / 2 ));
-            icon.setBounds(offset, offset, size - offset, size - offset);
-            icon.draw(mCanvas);
-        } else {
-            if (icon instanceof BitmapDrawable) {
-                BitmapDrawable bitmapDrawable = (BitmapDrawable) icon;
-                Bitmap b = bitmapDrawable.getBitmap();
-                if (bitmap != null && b.getDensity() == Bitmap.DENSITY_NONE) {
-                    bitmapDrawable.setTargetDensity(mContext.getResources().getDisplayMetrics());
-                }
-            }
-            int width = size;
-            int height = size;
-
-            int intrinsicWidth = icon.getIntrinsicWidth();
-            int intrinsicHeight = icon.getIntrinsicHeight();
-            if (intrinsicWidth > 0 && intrinsicHeight > 0) {
-                // Scale the icon proportionally to the icon dimensions
-                final float ratio = (float) intrinsicWidth / intrinsicHeight;
-                if (intrinsicWidth > intrinsicHeight) {
-                    height = (int) (width / ratio);
-                } else if (intrinsicHeight > intrinsicWidth) {
-                    width = (int) (height * ratio);
-                }
-            }
-            final int left = (size - width) / 2;
-            final int top = (size - height) / 2;
-            icon.setBounds(left, top, left + width, top + height);
-            mCanvas.save();
-            mCanvas.scale(scale, scale, size / 2, size / 2);
-            icon.draw(mCanvas);
-            mCanvas.restore();
-
-        }
-        icon.setBounds(mOldBounds);
-        mCanvas.setBitmap(null);
-        return bitmap;
-    }
-
-    @Override
-    public void close() {
-        clear();
-    }
-
-    public BitmapInfo makeDefaultIcon(UserHandle user) {
-        return createBadgedIconBitmap(getFullResDefaultActivityIcon(mFillResIconDpi),
-                user, Build.VERSION.SDK_INT);
-    }
-
-    public static Drawable getFullResDefaultActivityIcon(int iconDpi) {
-        return Resources.getSystem().getDrawableForDensity(
-                Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
-                        ? android.R.drawable.sym_def_app_icon : android.R.mipmap.sym_def_app_icon,
-                iconDpi);
-    }
-
-    /**
-     * Badges the provided source with the badge info
-     */
-    public BitmapInfo badgeBitmap(Bitmap source, BitmapInfo badgeInfo) {
-        Bitmap icon = BitmapRenderer.createHardwareBitmap(mIconBitmapSize, mIconBitmapSize, (c) -> {
-            getShadowGenerator().recreateIcon(source, c);
-            badgeWithDrawable(c, new FixedSizeBitmapDrawable(badgeInfo.icon));
-        });
-        return BitmapInfo.of(icon, badgeInfo.color);
-    }
-
-    private int extractColor(Bitmap bitmap) {
-        return mDisableColorExtractor ? 0 : mColorExtractor.findDominantColorByHue(bitmap);
-    }
-
-    /**
-     * Returns the correct badge size given an icon size
-     */
-    public static int getBadgeSizeForIconSize(int iconSize) {
-        return (int) (ICON_BADGE_SCALE * iconSize);
-    }
-
-    /**
-     * An extension of {@link BitmapDrawable} which returns the bitmap pixel size as intrinsic size.
-     * This allows the badging to be done based on the action bitmap size rather than
-     * the scaled bitmap size.
-     */
-    private static class FixedSizeBitmapDrawable extends BitmapDrawable {
-
-        public FixedSizeBitmapDrawable(Bitmap bitmap) {
-            super(null, bitmap);
-        }
-
-        @Override
-        public int getIntrinsicHeight() {
-            return getBitmap().getWidth();
-        }
-
-        @Override
-        public int getIntrinsicWidth() {
-            return getBitmap().getWidth();
-        }
-    }
-}
diff --git a/iconloaderlib/src/com/android/launcher3/icons/BitmapInfo.java b/iconloaderlib/src/com/android/launcher3/icons/BitmapInfo.java
deleted file mode 100644
index d33f9b1112..0000000000
--- a/iconloaderlib/src/com/android/launcher3/icons/BitmapInfo.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.icons;
-
-import android.graphics.Bitmap;
-import android.graphics.Bitmap.Config;
-
-import androidx.annotation.NonNull;
-
-public class BitmapInfo {
-
-    public static final Bitmap LOW_RES_ICON = Bitmap.createBitmap(1, 1, Config.ALPHA_8);
-    public static final BitmapInfo LOW_RES_INFO = fromBitmap(LOW_RES_ICON);
-
-    public final Bitmap icon;
-    public final int color;
-
-    public BitmapInfo(Bitmap icon, int color) {
-        this.icon = icon;
-        this.color = color;
-    }
-
-    /**
-     * Ideally icon should not be null, except in cases when generating hardware bitmap failed
-     */
-    public final boolean isNullOrLowRes() {
-        return icon == null || icon == LOW_RES_ICON;
-    }
-
-    public final boolean isLowRes() {
-        return LOW_RES_ICON == icon;
-    }
-
-    public static BitmapInfo fromBitmap(@NonNull Bitmap bitmap) {
-        return of(bitmap, 0);
-    }
-
-    public static BitmapInfo of(@NonNull Bitmap bitmap, int color) {
-        return new BitmapInfo(bitmap, color);
-    }
-
-    /**
-     * Interface to be implemented by drawables to provide a custom BitmapInfo
-     */
-    public interface Extender {
-
-        /**
-         * Called for creating a custom BitmapInfo
-         */
-        default BitmapInfo getExtendedInfo(Bitmap bitmap, int color, BaseIconFactory iconFactory) {
-            return BitmapInfo.of(bitmap, color);
-        }
-
-        /**
-         * Notifies the drawable that it will be drawn directly in the UI, without any preprocessing
-         */
-        default void prepareToDrawOnUi() { }
-    }
-}
diff --git a/iconloaderlib/src/com/android/launcher3/icons/BitmapRenderer.java b/iconloaderlib/src/com/android/launcher3/icons/BitmapRenderer.java
deleted file mode 100644
index 5751ed95cb..0000000000
--- a/iconloaderlib/src/com/android/launcher3/icons/BitmapRenderer.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.icons;
-
-import android.annotation.TargetApi;
-import android.graphics.Bitmap;
-import android.graphics.Bitmap.Config;
-import android.graphics.Canvas;
-import android.graphics.Picture;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.os.Build;
-import android.os.Build.VERSION_CODES;
-
-/**
- * Interface representing a bitmap draw operation.
- */
-public interface BitmapRenderer {
-
-    boolean USE_HARDWARE_BITMAP = Build.VERSION.SDK_INT >= Build.VERSION_CODES.P;
-
-    static Bitmap createSoftwareBitmap(int width, int height, BitmapRenderer renderer) {
-        GraphicsUtils.noteNewBitmapCreated();
-        Bitmap result = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-        renderer.draw(new Canvas(result));
-        return result;
-    }
-
-    @TargetApi(Build.VERSION_CODES.P)
-    static Bitmap createHardwareBitmap(int width, int height, BitmapRenderer renderer) {
-        if (!USE_HARDWARE_BITMAP) {
-            return createSoftwareBitmap(width, height, renderer);
-        }
-
-        GraphicsUtils.noteNewBitmapCreated();
-        Picture picture = new Picture();
-        renderer.draw(picture.beginRecording(width, height));
-        picture.endRecording();
-        return Bitmap.createBitmap(picture);
-    }
-
-    /**
-     * Returns a bitmap from subset of the source bitmap. The new bitmap may be the
-     * same object as source, or a copy may have been made.
-     */
-    static Bitmap createBitmap(Bitmap source, int x, int y, int width, int height) {
-        if (Build.VERSION.SDK_INT >= VERSION_CODES.O && source.getConfig() == Config.HARDWARE) {
-            return createHardwareBitmap(width, height, c -> c.drawBitmap(source,
-                    new Rect(x, y, x + width, y + height), new RectF(0, 0, width, height), null));
-        } else {
-            GraphicsUtils.noteNewBitmapCreated();
-            return Bitmap.createBitmap(source, x, y, width, height);
-        }
-    }
-
-    void draw(Canvas out);
-}
diff --git a/iconloaderlib/src/com/android/launcher3/icons/ColorExtractor.java b/iconloaderlib/src/com/android/launcher3/icons/ColorExtractor.java
deleted file mode 100644
index 87bda825cc..0000000000
--- a/iconloaderlib/src/com/android/launcher3/icons/ColorExtractor.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.icons;
-
-import android.graphics.Bitmap;
-import android.graphics.Color;
-import android.util.SparseArray;
-import java.util.Arrays;
-
-/**
- * Utility class for extracting colors from a bitmap.
- */
-public class ColorExtractor {
-
-    private final int NUM_SAMPLES = 20;
-    private final float[] mTmpHsv = new float[3];
-    private final float[] mTmpHueScoreHistogram = new float[360];
-    private final int[] mTmpPixels = new int[NUM_SAMPLES];
-    private final SparseArray<Float> mTmpRgbScores = new SparseArray<>();
-
-    /**
-     * This picks a dominant color, looking for high-saturation, high-value, repeated hues.
-     * @param bitmap The bitmap to scan
-     */
-    public int findDominantColorByHue(Bitmap bitmap) {
-        return findDominantColorByHue(bitmap, NUM_SAMPLES);
-    }
-
-    /**
-     * This picks a dominant color, looking for high-saturation, high-value, repeated hues.
-     * @param bitmap The bitmap to scan
-     */
-    public int findDominantColorByHue(Bitmap bitmap, int samples) {
-        final int height = bitmap.getHeight();
-        final int width = bitmap.getWidth();
-        int sampleStride = (int) Math.sqrt((height * width) / samples);
-        if (sampleStride < 1) {
-            sampleStride = 1;
-        }
-
-        // This is an out-param, for getting the hsv values for an rgb
-        float[] hsv = mTmpHsv;
-        Arrays.fill(hsv, 0);
-
-        // First get the best hue, by creating a histogram over 360 hue buckets,
-        // where each pixel contributes a score weighted by saturation, value, and alpha.
-        float[] hueScoreHistogram = mTmpHueScoreHistogram;
-        Arrays.fill(hueScoreHistogram, 0);
-        float highScore = -1;
-        int bestHue = -1;
-
-        int[] pixels = mTmpPixels;
-        Arrays.fill(pixels, 0);
-        int pixelCount = 0;
-
-        for (int y = 0; y < height; y += sampleStride) {
-            for (int x = 0; x < width; x += sampleStride) {
-                int argb = bitmap.getPixel(x, y);
-                int alpha = 0xFF & (argb >> 24);
-                if (alpha < 0x80) {
-                    // Drop mostly-transparent pixels.
-                    continue;
-                }
-                // Remove the alpha channel.
-                int rgb = argb | 0xFF000000;
-                Color.colorToHSV(rgb, hsv);
-                // Bucket colors by the 360 integer hues.
-                int hue = (int) hsv[0];
-                if (hue < 0 || hue >= hueScoreHistogram.length) {
-                    // Defensively avoid array bounds violations.
-                    continue;
-                }
-                if (pixelCount < samples) {
-                    pixels[pixelCount++] = rgb;
-                }
-                float score = hsv[1] * hsv[2];
-                hueScoreHistogram[hue] += score;
-                if (hueScoreHistogram[hue] > highScore) {
-                    highScore = hueScoreHistogram[hue];
-                    bestHue = hue;
-                }
-            }
-        }
-
-        SparseArray<Float> rgbScores = mTmpRgbScores;
-        rgbScores.clear();
-        int bestColor = 0xff000000;
-        highScore = -1;
-        // Go back over the RGB colors that match the winning hue,
-        // creating a histogram of weighted s*v scores, for up to 100*100 [s,v] buckets.
-        // The highest-scoring RGB color wins.
-        for (int i = 0; i < pixelCount; i++) {
-            int rgb = pixels[i];
-            Color.colorToHSV(rgb, hsv);
-            int hue = (int) hsv[0];
-            if (hue == bestHue) {
-                float s = hsv[1];
-                float v = hsv[2];
-                int bucket = (int) (s * 100) + (int) (v * 10000);
-                // Score by cumulative saturation * value.
-                float score = s * v;
-                Float oldTotal = rgbScores.get(bucket);
-                float newTotal = oldTotal == null ? score : oldTotal + score;
-                rgbScores.put(bucket, newTotal);
-                if (newTotal > highScore) {
-                    highScore = newTotal;
-                    // All the colors in the winning bucket are very similar. Last in wins.
-                    bestColor = rgb;
-                }
-            }
-        }
-        return bestColor;
-    }
-}
diff --git a/iconloaderlib/src/com/android/launcher3/icons/DotRenderer.java b/iconloaderlib/src/com/android/launcher3/icons/DotRenderer.java
deleted file mode 100644
index 97a0fd3ffc..0000000000
--- a/iconloaderlib/src/com/android/launcher3/icons/DotRenderer.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.icons;
-
-import static android.graphics.Paint.ANTI_ALIAS_FLAG;
-import static android.graphics.Paint.FILTER_BITMAP_FLAG;
-
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Path;
-import android.graphics.PathMeasure;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.util.Log;
-import android.view.ViewDebug;
-
-/**
- * Used to draw a notification dot on top of an icon.
- */
-public class DotRenderer {
-
-    private static final String TAG = "DotRenderer";
-
-    // The dot size is defined as a percentage of the app icon size.
-    private static final float SIZE_PERCENTAGE = 0.228f;
-
-    private final float mCircleRadius;
-    private final Paint mCirclePaint = new Paint(ANTI_ALIAS_FLAG | FILTER_BITMAP_FLAG);
-
-    private final Bitmap mBackgroundWithShadow;
-    private final float mBitmapOffset;
-
-    // Stores the center x and y position as a percentage (0 to 1) of the icon size
-    private final float[] mRightDotPosition;
-    private final float[] mLeftDotPosition;
-
-    public DotRenderer(int iconSizePx, Path iconShapePath, int pathSize) {
-        int size = Math.round(SIZE_PERCENTAGE * iconSizePx);
-        ShadowGenerator.Builder builder = new ShadowGenerator.Builder(Color.TRANSPARENT);
-        builder.ambientShadowAlpha = 88;
-        mBackgroundWithShadow = builder.setupBlurForSize(size).createPill(size, size);
-        mCircleRadius = builder.radius;
-
-        mBitmapOffset = -mBackgroundWithShadow.getHeight() * 0.5f; // Same as width.
-
-        // Find the points on the path that are closest to the top left and right corners.
-        mLeftDotPosition = getPathPoint(iconShapePath, pathSize, -1);
-        mRightDotPosition = getPathPoint(iconShapePath, pathSize, 1);
-    }
-
-    private static float[] getPathPoint(Path path, float size, float direction) {
-        float halfSize = size / 2;
-        // Small delta so that we don't get a zero size triangle
-        float delta = 1;
-
-        float x = halfSize + direction * halfSize;
-        Path trianglePath = new Path();
-        trianglePath.moveTo(halfSize, halfSize);
-        trianglePath.lineTo(x + delta * direction, 0);
-        trianglePath.lineTo(x, -delta);
-        trianglePath.close();
-
-        trianglePath.op(path, Path.Op.INTERSECT);
-        float[] pos = new float[2];
-        new PathMeasure(trianglePath, false).getPosTan(0, pos, null);
-
-        pos[0] = pos[0] / size;
-        pos[1] = pos[1] / size;
-        return pos;
-    }
-
-    public float[] getLeftDotPosition() {
-        return mLeftDotPosition;
-    }
-
-    public float[] getRightDotPosition() {
-        return mRightDotPosition;
-    }
-
-    /**
-     * Draw a circle on top of the canvas according to the given params.
-     */
-    public void draw(Canvas canvas, DrawParams params) {
-        if (params == null) {
-            Log.e(TAG, "Invalid null argument(s) passed in call to draw.");
-            return;
-        }
-        canvas.save();
-
-        Rect iconBounds = params.iconBounds;
-        float[] dotPosition = params.leftAlign ? mLeftDotPosition : mRightDotPosition;
-        float dotCenterX = iconBounds.left + iconBounds.width() * dotPosition[0];
-        float dotCenterY = iconBounds.top + iconBounds.height() * dotPosition[1];
-
-        // Ensure dot fits entirely in canvas clip bounds.
-        Rect canvasBounds = canvas.getClipBounds();
-        float offsetX = params.leftAlign
-                ? Math.max(0, canvasBounds.left - (dotCenterX + mBitmapOffset))
-                : Math.min(0, canvasBounds.right - (dotCenterX - mBitmapOffset));
-        float offsetY = Math.max(0, canvasBounds.top - (dotCenterY + mBitmapOffset));
-
-        // We draw the dot relative to its center.
-        canvas.translate(dotCenterX + offsetX, dotCenterY + offsetY);
-        canvas.scale(params.scale, params.scale);
-
-        mCirclePaint.setColor(Color.BLACK);
-        canvas.drawBitmap(mBackgroundWithShadow, mBitmapOffset, mBitmapOffset, mCirclePaint);
-        mCirclePaint.setColor(params.color);
-        canvas.drawCircle(0, 0, mCircleRadius, mCirclePaint);
-        canvas.restore();
-    }
-
-    public static class DrawParams {
-        /** The color (possibly based on the icon) to use for the dot. */
-        @ViewDebug.ExportedProperty(category = "notification dot", formatToHexString = true)
-        public int color;
-        /** The bounds of the icon that the dot is drawn on top of. */
-        @ViewDebug.ExportedProperty(category = "notification dot")
-        public Rect iconBounds = new Rect();
-        /** The progress of the animation, from 0 to 1. */
-        @ViewDebug.ExportedProperty(category = "notification dot")
-        public float scale;
-        /** Whether the dot should align to the top left of the icon rather than the top right. */
-        @ViewDebug.ExportedProperty(category = "notification dot")
-        public boolean leftAlign;
-    }
-}
diff --git a/iconloaderlib/src/com/android/launcher3/icons/FixedScaleDrawable.java b/iconloaderlib/src/com/android/launcher3/icons/FixedScaleDrawable.java
deleted file mode 100644
index 516965ec2b..0000000000
--- a/iconloaderlib/src/com/android/launcher3/icons/FixedScaleDrawable.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.android.launcher3.icons;
-
-import android.content.res.Resources;
-import android.content.res.Resources.Theme;
-import android.graphics.Canvas;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.DrawableWrapper;
-import android.util.AttributeSet;
-
-import org.xmlpull.v1.XmlPullParser;
-
-/**
- * Extension of {@link DrawableWrapper} which scales the child drawables by a fixed amount.
- */
-public class FixedScaleDrawable extends DrawableWrapper {
-
-    // TODO b/33553066 use the constant defined in MaskableIconDrawable
-    private static final float LEGACY_ICON_SCALE = .7f * .6667f;
-    private float mScaleX, mScaleY;
-
-    public FixedScaleDrawable() {
-        super(new ColorDrawable());
-        mScaleX = LEGACY_ICON_SCALE;
-        mScaleY = LEGACY_ICON_SCALE;
-    }
-
-    @Override
-    public void draw(Canvas canvas) {
-        int saveCount = canvas.save();
-        canvas.scale(mScaleX, mScaleY,
-                getBounds().exactCenterX(), getBounds().exactCenterY());
-        super.draw(canvas);
-        canvas.restoreToCount(saveCount);
-    }
-
-    @Override
-    public void inflate(Resources r, XmlPullParser parser, AttributeSet attrs) { }
-
-    @Override
-    public void inflate(Resources r, XmlPullParser parser, AttributeSet attrs, Theme theme) { }
-
-    public void setScale(float scale) {
-        float h = getIntrinsicHeight();
-        float w = getIntrinsicWidth();
-        mScaleX = scale * LEGACY_ICON_SCALE;
-        mScaleY = scale * LEGACY_ICON_SCALE;
-        if (h > w && w > 0) {
-            mScaleX *= w / h;
-        } else if (w > h && h > 0) {
-            mScaleY *= h / w;
-        }
-    }
-}
diff --git a/iconloaderlib/src/com/android/launcher3/icons/GraphicsUtils.java b/iconloaderlib/src/com/android/launcher3/icons/GraphicsUtils.java
deleted file mode 100644
index 22f1f2357e..0000000000
--- a/iconloaderlib/src/com/android/launcher3/icons/GraphicsUtils.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.icons;
-
-import android.graphics.Bitmap;
-import android.graphics.Rect;
-import android.graphics.Region;
-import android.graphics.RegionIterator;
-import android.util.Log;
-
-import androidx.annotation.ColorInt;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-public class GraphicsUtils {
-
-    private static final String TAG = "GraphicsUtils";
-
-    public static Runnable sOnNewBitmapRunnable = () -> { };
-
-    /**
-     * Set the alpha component of {@code color} to be {@code alpha}. Unlike the support lib version,
-     * it bounds the alpha in valid range instead of throwing an exception to allow for safer
-     * interpolation of color animations
-     */
-    @ColorInt
-    public static int setColorAlphaBound(int color, int alpha) {
-        if (alpha < 0) {
-            alpha = 0;
-        } else if (alpha > 255) {
-            alpha = 255;
-        }
-        return (color & 0x00ffffff) | (alpha << 24);
-    }
-
-    /**
-     * Compresses the bitmap to a byte array for serialization.
-     */
-    public static byte[] flattenBitmap(Bitmap bitmap) {
-        // Try go guesstimate how much space the icon will take when serialized
-        // to avoid unnecessary allocations/copies during the write (4 bytes per pixel).
-        int size = bitmap.getWidth() * bitmap.getHeight() * 4;
-        ByteArrayOutputStream out = new ByteArrayOutputStream(size);
-        try {
-            bitmap.compress(Bitmap.CompressFormat.PNG, 100, out);
-            out.flush();
-            out.close();
-            return out.toByteArray();
-        } catch (IOException e) {
-            Log.w(TAG, "Could not write bitmap");
-            return null;
-        }
-    }
-
-    public static int getArea(Region r) {
-        RegionIterator itr = new RegionIterator(r);
-        int area = 0;
-        Rect tempRect = new Rect();
-        while (itr.next(tempRect)) {
-            area += tempRect.width() * tempRect.height();
-        }
-        return area;
-    }
-
-    /**
-     * Utility method to track new bitmap creation
-     */
-    public static void noteNewBitmapCreated() {
-        sOnNewBitmapRunnable.run();
-    }
-}
diff --git a/iconloaderlib/src/com/android/launcher3/icons/IconNormalizer.java b/iconloaderlib/src/com/android/launcher3/icons/IconNormalizer.java
deleted file mode 100644
index de39e79fec..0000000000
--- a/iconloaderlib/src/com/android/launcher3/icons/IconNormalizer.java
+++ /dev/null
@@ -1,411 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.icons;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Matrix;
-import android.graphics.Paint;
-import android.graphics.Path;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.graphics.Region;
-import android.graphics.drawable.AdaptiveIconDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.util.Log;
-
-import java.nio.ByteBuffer;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-public class IconNormalizer {
-
-    private static final String TAG = "IconNormalizer";
-    private static final boolean DEBUG = false;
-    // Ratio of icon visible area to full icon size for a square shaped icon
-    private static final float MAX_SQUARE_AREA_FACTOR = 375.0f / 576;
-    // Ratio of icon visible area to full icon size for a circular shaped icon
-    private static final float MAX_CIRCLE_AREA_FACTOR = 380.0f / 576;
-
-    private static final float CIRCLE_AREA_BY_RECT = (float) Math.PI / 4;
-
-    // Slope used to calculate icon visible area to full icon size for any generic shaped icon.
-    private static final float LINEAR_SCALE_SLOPE =
-            (MAX_CIRCLE_AREA_FACTOR - MAX_SQUARE_AREA_FACTOR) / (1 - CIRCLE_AREA_BY_RECT);
-
-    private static final int MIN_VISIBLE_ALPHA = 40;
-
-    // Shape detection related constants
-    private static final float BOUND_RATIO_MARGIN = .05f;
-    private static final float PIXEL_DIFF_PERCENTAGE_THRESHOLD = 0.005f;
-    private static final float SCALE_NOT_INITIALIZED = 0;
-
-    // Ratio of the diameter of an normalized circular icon to the actual icon size.
-    public static final float ICON_VISIBLE_AREA_FACTOR = 0.92f;
-
-    private final int mMaxSize;
-    private final Bitmap mBitmap;
-    private final Canvas mCanvas;
-    private final Paint mPaintMaskShape;
-    private final Paint mPaintMaskShapeOutline;
-    private final byte[] mPixels;
-
-    private final RectF mAdaptiveIconBounds;
-    private float mAdaptiveIconScale;
-
-    private boolean mEnableShapeDetection;
-
-    // for each y, stores the position of the leftmost x and the rightmost x
-    private final float[] mLeftBorder;
-    private final float[] mRightBorder;
-    private final Rect mBounds;
-    private final Path mShapePath;
-    private final Matrix mMatrix;
-
-    /** package private **/
-    IconNormalizer(Context context, int iconBitmapSize, boolean shapeDetection) {
-        // Use twice the icon size as maximum size to avoid scaling down twice.
-        mMaxSize = iconBitmapSize * 2;
-        mBitmap = Bitmap.createBitmap(mMaxSize, mMaxSize, Bitmap.Config.ALPHA_8);
-        mCanvas = new Canvas(mBitmap);
-        mPixels = new byte[mMaxSize * mMaxSize];
-        mLeftBorder = new float[mMaxSize];
-        mRightBorder = new float[mMaxSize];
-        mBounds = new Rect();
-        mAdaptiveIconBounds = new RectF();
-
-        mPaintMaskShape = new Paint();
-        mPaintMaskShape.setColor(Color.RED);
-        mPaintMaskShape.setStyle(Paint.Style.FILL);
-        mPaintMaskShape.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.XOR));
-
-        mPaintMaskShapeOutline = new Paint();
-        mPaintMaskShapeOutline.setStrokeWidth(
-                2 * context.getResources().getDisplayMetrics().density);
-        mPaintMaskShapeOutline.setStyle(Paint.Style.STROKE);
-        mPaintMaskShapeOutline.setColor(Color.BLACK);
-        mPaintMaskShapeOutline.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR));
-
-        mShapePath = new Path();
-        mMatrix = new Matrix();
-        mAdaptiveIconScale = SCALE_NOT_INITIALIZED;
-        mEnableShapeDetection = shapeDetection;
-    }
-
-    private static float getScale(float hullArea, float boundingArea, float fullArea) {
-        float hullByRect = hullArea / boundingArea;
-        float scaleRequired;
-        if (hullByRect < CIRCLE_AREA_BY_RECT) {
-            scaleRequired = MAX_CIRCLE_AREA_FACTOR;
-        } else {
-            scaleRequired = MAX_SQUARE_AREA_FACTOR + LINEAR_SCALE_SLOPE * (1 - hullByRect);
-        }
-
-        float areaScale = hullArea / fullArea;
-        // Use sqrt of the final ratio as the images is scaled across both width and height.
-        return areaScale > scaleRequired ? (float) Math.sqrt(scaleRequired / areaScale) : 1;
-    }
-
-    /**
-     * @param d Should be AdaptiveIconDrawable
-     * @param size Canvas size to use
-     */
-    @TargetApi(Build.VERSION_CODES.O)
-    public static float normalizeAdaptiveIcon(Drawable d, int size, @Nullable RectF outBounds) {
-        Rect tmpBounds = new Rect(d.getBounds());
-        d.setBounds(0, 0, size, size);
-
-        Path path = ((AdaptiveIconDrawable) d).getIconMask();
-        Region region = new Region();
-        region.setPath(path, new Region(0, 0, size, size));
-
-        Rect hullBounds = region.getBounds();
-        int hullArea = GraphicsUtils.getArea(region);
-
-        if (outBounds != null) {
-            float sizeF = size;
-            outBounds.set(
-                    hullBounds.left / sizeF,
-                    hullBounds.top / sizeF,
-                    1 - (hullBounds.right / sizeF),
-                    1 - (hullBounds.bottom / sizeF));
-        }
-        d.setBounds(tmpBounds);
-        return getScale(hullArea, hullArea, size * size);
-    }
-
-    /**
-     * Returns if the shape of the icon is same as the path.
-     * For this method to work, the shape path bounds should be in [0,1]x[0,1] bounds.
-     */
-    private boolean isShape(Path maskPath) {
-        // Condition1:
-        // If width and height of the path not close to a square, then the icon shape is
-        // not same as the mask shape.
-        float iconRatio = ((float) mBounds.width()) / mBounds.height();
-        if (Math.abs(iconRatio - 1) > BOUND_RATIO_MARGIN) {
-            if (DEBUG) {
-                Log.d(TAG, "Not same as mask shape because width != height. " + iconRatio);
-            }
-            return false;
-        }
-
-        // Condition 2:
-        // Actual icon (white) and the fitted shape (e.g., circle)(red) XOR operation
-        // should generate transparent image, if the actual icon is equivalent to the shape.
-
-        // Fit the shape within the icon's bounding box
-        mMatrix.reset();
-        mMatrix.setScale(mBounds.width(), mBounds.height());
-        mMatrix.postTranslate(mBounds.left, mBounds.top);
-        maskPath.transform(mMatrix, mShapePath);
-
-        // XOR operation
-        mCanvas.drawPath(mShapePath, mPaintMaskShape);
-
-        // DST_OUT operation around the mask path outline
-        mCanvas.drawPath(mShapePath, mPaintMaskShapeOutline);
-
-        // Check if the result is almost transparent
-        return isTransparentBitmap();
-    }
-
-    /**
-     * Used to determine if certain the bitmap is transparent.
-     */
-    private boolean isTransparentBitmap() {
-        ByteBuffer buffer = ByteBuffer.wrap(mPixels);
-        buffer.rewind();
-        mBitmap.copyPixelsToBuffer(buffer);
-
-        int y = mBounds.top;
-        // buffer position
-        int index = y * mMaxSize;
-        // buffer shift after every row, width of buffer = mMaxSize
-        int rowSizeDiff = mMaxSize - mBounds.right;
-
-        int sum = 0;
-        for (; y < mBounds.bottom; y++) {
-            index += mBounds.left;
-            for (int x = mBounds.left; x < mBounds.right; x++) {
-                if ((mPixels[index] & 0xFF) > MIN_VISIBLE_ALPHA) {
-                    sum++;
-                }
-                index++;
-            }
-            index += rowSizeDiff;
-        }
-
-        float percentageDiffPixels = ((float) sum) / (mBounds.width() * mBounds.height());
-        return percentageDiffPixels < PIXEL_DIFF_PERCENTAGE_THRESHOLD;
-    }
-
-    /**
-     * Returns the amount by which the {@param d} should be scaled (in both dimensions) so that it
-     * matches the design guidelines for a launcher icon.
-     *
-     * We first calculate the convex hull of the visible portion of the icon.
-     * This hull then compared with the bounding rectangle of the hull to find how closely it
-     * resembles a circle and a square, by comparing the ratio of the areas. Note that this is not an
-     * ideal solution but it gives satisfactory result without affecting the performance.
-     *
-     * This closeness is used to determine the ratio of hull area to the full icon size.
-     * Refer {@link #MAX_CIRCLE_AREA_FACTOR} and {@link #MAX_SQUARE_AREA_FACTOR}
-     *
-     * @param outBounds optional rect to receive the fraction distance from each edge.
-     */
-    public synchronized float getScale(@NonNull Drawable d, @Nullable RectF outBounds,
-            @Nullable Path path, @Nullable boolean[] outMaskShape) {
-        if (BaseIconFactory.ATLEAST_OREO && d instanceof AdaptiveIconDrawable) {
-            if (mAdaptiveIconScale == SCALE_NOT_INITIALIZED) {
-                mAdaptiveIconScale = normalizeAdaptiveIcon(d, mMaxSize, mAdaptiveIconBounds);
-            }
-            if (outBounds != null) {
-                outBounds.set(mAdaptiveIconBounds);
-            }
-            return mAdaptiveIconScale;
-        }
-        int width = d.getIntrinsicWidth();
-        int height = d.getIntrinsicHeight();
-        if (width <= 0 || height <= 0) {
-            width = width <= 0 || width > mMaxSize ? mMaxSize : width;
-            height = height <= 0 || height > mMaxSize ? mMaxSize : height;
-        } else if (width > mMaxSize || height > mMaxSize) {
-            int max = Math.max(width, height);
-            width = mMaxSize * width / max;
-            height = mMaxSize * height / max;
-        }
-
-        mBitmap.eraseColor(Color.TRANSPARENT);
-        d.setBounds(0, 0, width, height);
-        d.draw(mCanvas);
-
-        ByteBuffer buffer = ByteBuffer.wrap(mPixels);
-        buffer.rewind();
-        mBitmap.copyPixelsToBuffer(buffer);
-
-        // Overall bounds of the visible icon.
-        int topY = -1;
-        int bottomY = -1;
-        int leftX = mMaxSize + 1;
-        int rightX = -1;
-
-        // Create border by going through all pixels one row at a time and for each row find
-        // the first and the last non-transparent pixel. Set those values to mLeftBorder and
-        // mRightBorder and use -1 if there are no visible pixel in the row.
-
-        // buffer position
-        int index = 0;
-        // buffer shift after every row, width of buffer = mMaxSize
-        int rowSizeDiff = mMaxSize - width;
-        // first and last position for any row.
-        int firstX, lastX;
-
-        for (int y = 0; y < height; y++) {
-            firstX = lastX = -1;
-            for (int x = 0; x < width; x++) {
-                if ((mPixels[index] & 0xFF) > MIN_VISIBLE_ALPHA) {
-                    if (firstX == -1) {
-                        firstX = x;
-                    }
-                    lastX = x;
-                }
-                index++;
-            }
-            index += rowSizeDiff;
-
-            mLeftBorder[y] = firstX;
-            mRightBorder[y] = lastX;
-
-            // If there is at least one visible pixel, update the overall bounds.
-            if (firstX != -1) {
-                bottomY = y;
-                if (topY == -1) {
-                    topY = y;
-                }
-
-                leftX = Math.min(leftX, firstX);
-                rightX = Math.max(rightX, lastX);
-            }
-        }
-
-        if (topY == -1 || rightX == -1) {
-            // No valid pixels found. Do not scale.
-            return 1;
-        }
-
-        convertToConvexArray(mLeftBorder, 1, topY, bottomY);
-        convertToConvexArray(mRightBorder, -1, topY, bottomY);
-
-        // Area of the convex hull
-        float area = 0;
-        for (int y = 0; y < height; y++) {
-            if (mLeftBorder[y] <= -1) {
-                continue;
-            }
-            area += mRightBorder[y] - mLeftBorder[y] + 1;
-        }
-
-        mBounds.left = leftX;
-        mBounds.right = rightX;
-
-        mBounds.top = topY;
-        mBounds.bottom = bottomY;
-
-        if (outBounds != null) {
-            outBounds.set(((float) mBounds.left) / width, ((float) mBounds.top) / height,
-                    1 - ((float) mBounds.right) / width,
-                    1 - ((float) mBounds.bottom) / height);
-        }
-        if (outMaskShape != null && mEnableShapeDetection && outMaskShape.length > 0) {
-            outMaskShape[0] = isShape(path);
-        }
-        // Area of the rectangle required to fit the convex hull
-        float rectArea = (bottomY + 1 - topY) * (rightX + 1 - leftX);
-        return getScale(area, rectArea, width * height);
-    }
-
-    /**
-     * Modifies {@param xCoordinates} to represent a convex border. Fills in all missing values
-     * (except on either ends) with appropriate values.
-     * @param xCoordinates map of x coordinate per y.
-     * @param direction 1 for left border and -1 for right border.
-     * @param topY the first Y position (inclusive) with a valid value.
-     * @param bottomY the last Y position (inclusive) with a valid value.
-     */
-    private static void convertToConvexArray(
-            float[] xCoordinates, int direction, int topY, int bottomY) {
-        int total = xCoordinates.length;
-        // The tangent at each pixel.
-        float[] angles = new float[total - 1];
-
-        int first = topY; // First valid y coordinate
-        int last = -1;    // Last valid y coordinate which didn't have a missing value
-
-        float lastAngle = Float.MAX_VALUE;
-
-        for (int i = topY + 1; i <= bottomY; i++) {
-            if (xCoordinates[i] <= -1) {
-                continue;
-            }
-            int start;
-
-            if (lastAngle == Float.MAX_VALUE) {
-                start = first;
-            } else {
-                float currentAngle = (xCoordinates[i] - xCoordinates[last]) / (i - last);
-                start = last;
-                // If this position creates a concave angle, keep moving up until we find a
-                // position which creates a convex angle.
-                if ((currentAngle - lastAngle) * direction < 0) {
-                    while (start > first) {
-                        start --;
-                        currentAngle = (xCoordinates[i] - xCoordinates[start]) / (i - start);
-                        if ((currentAngle - angles[start]) * direction >= 0) {
-                            break;
-                        }
-                    }
-                }
-            }
-
-            // Reset from last check
-            lastAngle = (xCoordinates[i] - xCoordinates[start]) / (i - start);
-            // Update all the points from start.
-            for (int j = start; j < i; j++) {
-                angles[j] = lastAngle;
-                xCoordinates[j] = xCoordinates[start] + lastAngle * (j - start);
-            }
-            last = i;
-        }
-    }
-
-    /**
-     * @return The diameter of the normalized circle that fits inside of the square (size x size).
-     */
-    public static int getNormalizedCircleSize(int size) {
-        float area = size * size * MAX_CIRCLE_AREA_FACTOR;
-        return (int) Math.round(Math.sqrt((4 * area) / Math.PI));
-    }
-}
diff --git a/iconloaderlib/src/com/android/launcher3/icons/ShadowGenerator.java b/iconloaderlib/src/com/android/launcher3/icons/ShadowGenerator.java
deleted file mode 100644
index 770272728d..0000000000
--- a/iconloaderlib/src/com/android/launcher3/icons/ShadowGenerator.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.icons;
-
-import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
-
-import android.graphics.Bitmap;
-import android.graphics.BlurMaskFilter;
-import android.graphics.BlurMaskFilter.Blur;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.RectF;
-
-/**
- * Utility class to add shadows to bitmaps.
- */
-public class ShadowGenerator {
-    public static final float BLUR_FACTOR = 0.5f/48;
-
-    // Percent of actual icon size
-    public static final float KEY_SHADOW_DISTANCE = 1f/48;
-    private static final int KEY_SHADOW_ALPHA = 61;
-    // Percent of actual icon size
-    private static final float HALF_DISTANCE = 0.5f;
-    private static final int AMBIENT_SHADOW_ALPHA = 30;
-
-    private final int mIconSize;
-
-    private final Paint mBlurPaint;
-    private final Paint mDrawPaint;
-    private final BlurMaskFilter mDefaultBlurMaskFilter;
-
-    public ShadowGenerator(int iconSize) {
-        mIconSize = iconSize;
-        mBlurPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG);
-        mDrawPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG);
-        mDefaultBlurMaskFilter = new BlurMaskFilter(mIconSize * BLUR_FACTOR, Blur.NORMAL);
-    }
-
-    public synchronized void recreateIcon(Bitmap icon, Canvas out) {
-        recreateIcon(icon, mDefaultBlurMaskFilter, AMBIENT_SHADOW_ALPHA, KEY_SHADOW_ALPHA, out);
-    }
-
-    public synchronized void recreateIcon(Bitmap icon, BlurMaskFilter blurMaskFilter,
-            int ambientAlpha, int keyAlpha, Canvas out) {
-        int[] offset = new int[2];
-        mBlurPaint.setMaskFilter(blurMaskFilter);
-        Bitmap shadow = icon.extractAlpha(mBlurPaint, offset);
-
-        // Draw ambient shadow
-        mDrawPaint.setAlpha(ambientAlpha);
-        out.drawBitmap(shadow, offset[0], offset[1], mDrawPaint);
-
-        // Draw key shadow
-        mDrawPaint.setAlpha(keyAlpha);
-        out.drawBitmap(shadow, offset[0], offset[1] + KEY_SHADOW_DISTANCE * mIconSize, mDrawPaint);
-
-        // Draw the icon
-        mDrawPaint.setAlpha(255);
-        out.drawBitmap(icon, 0, 0, mDrawPaint);
-    }
-
-    /**
-     * Returns the minimum amount by which an icon with {@param bounds} should be scaled
-     * so that the shadows do not get clipped.
-     */
-    public static float getScaleForBounds(RectF bounds) {
-        float scale = 1;
-
-        // For top, left & right, we need same space.
-        float minSide = Math.min(Math.min(bounds.left, bounds.right), bounds.top);
-        if (minSide < BLUR_FACTOR) {
-            scale = (HALF_DISTANCE - BLUR_FACTOR) / (HALF_DISTANCE - minSide);
-        }
-
-        float bottomSpace = BLUR_FACTOR + KEY_SHADOW_DISTANCE;
-        if (bounds.bottom < bottomSpace) {
-            scale = Math.min(scale, (HALF_DISTANCE - bottomSpace) / (HALF_DISTANCE - bounds.bottom));
-        }
-        return scale;
-    }
-
-    public static class Builder {
-
-        public final RectF bounds = new RectF();
-        public final int color;
-
-        public int ambientShadowAlpha = AMBIENT_SHADOW_ALPHA;
-
-        public float shadowBlur;
-
-        public float keyShadowDistance;
-        public int keyShadowAlpha = KEY_SHADOW_ALPHA;
-        public float radius;
-
-        public Builder(int color) {
-            this.color = color;
-        }
-
-        public Builder setupBlurForSize(int height) {
-            shadowBlur = height * 1f / 24;
-            keyShadowDistance = height * 1f / 16;
-            return this;
-        }
-
-        public Bitmap createPill(int width, int height) {
-            return createPill(width, height, height / 2f);
-        }
-
-        public Bitmap createPill(int width, int height, float r) {
-            radius = r;
-
-            int centerX = Math.round(width / 2f + shadowBlur);
-            int centerY = Math.round(radius + shadowBlur + keyShadowDistance);
-            int center = Math.max(centerX, centerY);
-            bounds.set(0, 0, width, height);
-            bounds.offsetTo(center - width / 2f, center - height / 2f);
-
-            int size = center * 2;
-            return BitmapRenderer.createHardwareBitmap(size, size, this::drawShadow);
-        }
-
-        public void drawShadow(Canvas c) {
-            Paint p = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG);
-            p.setColor(color);
-
-            // Key shadow
-            p.setShadowLayer(shadowBlur, 0, keyShadowDistance,
-                    setColorAlphaBound(Color.BLACK, keyShadowAlpha));
-            c.drawRoundRect(bounds, radius, radius, p);
-
-            // Ambient shadow
-            p.setShadowLayer(shadowBlur, 0, 0,
-                    setColorAlphaBound(Color.BLACK, ambientShadowAlpha));
-            c.drawRoundRect(bounds, radius, radius, p);
-
-            if (Color.alpha(color) < 255) {
-                // Clear any content inside the pill-rect for translucent fill.
-                p.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR));
-                p.clearShadowLayer();
-                p.setColor(Color.BLACK);
-                c.drawRoundRect(bounds, radius, radius, p);
-
-                p.setXfermode(null);
-                p.setColor(color);
-                c.drawRoundRect(bounds, radius, radius, p);
-            }
-        }
-    }
-}
diff --git a/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java b/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java
deleted file mode 100644
index 4c634cbc26..0000000000
--- a/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java
+++ /dev/null
@@ -1,582 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.icons.cache;
-
-import static com.android.launcher3.icons.BaseIconFactory.getFullResDefaultActivityIcon;
-import static com.android.launcher3.icons.BitmapInfo.LOW_RES_ICON;
-import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
-
-import android.content.ComponentName;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.pm.ActivityInfo;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.res.Resources;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteException;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.os.Handler;
-import android.os.LocaleList;
-import android.os.Looper;
-import android.os.Process;
-import android.os.UserHandle;
-import android.text.TextUtils;
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
-
-import com.android.launcher3.icons.BaseIconFactory;
-import com.android.launcher3.icons.BitmapInfo;
-import com.android.launcher3.icons.BitmapRenderer;
-import com.android.launcher3.icons.GraphicsUtils;
-import com.android.launcher3.util.ComponentKey;
-import com.android.launcher3.util.SQLiteCacheHelper;
-
-import java.util.AbstractMap;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Supplier;
-
-public abstract class BaseIconCache {
-
-    private static final String TAG = "BaseIconCache";
-    private static final boolean DEBUG = false;
-
-    private static final int INITIAL_ICON_CACHE_CAPACITY = 50;
-
-    // Empty class name is used for storing package default entry.
-    public static final String EMPTY_CLASS_NAME = ".";
-
-    public static class CacheEntry {
-
-        @NonNull
-        public BitmapInfo bitmap = BitmapInfo.LOW_RES_INFO;
-        public CharSequence title = "";
-        public CharSequence contentDescription = "";
-    }
-
-    private final HashMap<UserHandle, BitmapInfo> mDefaultIcons = new HashMap<>();
-
-    protected final Context mContext;
-    protected final PackageManager mPackageManager;
-
-    private final Map<ComponentKey, CacheEntry> mCache;
-    protected final Handler mWorkerHandler;
-
-    protected int mIconDpi;
-    protected IconDB mIconDb;
-    protected LocaleList mLocaleList = LocaleList.getEmptyLocaleList();
-    protected String mSystemState = "";
-
-    private final String mDbFileName;
-    private final BitmapFactory.Options mDecodeOptions;
-    private final Looper mBgLooper;
-
-    public BaseIconCache(Context context, String dbFileName, Looper bgLooper,
-            int iconDpi, int iconPixelSize, boolean inMemoryCache) {
-        mContext = context;
-        mDbFileName = dbFileName;
-        mPackageManager = context.getPackageManager();
-        mBgLooper = bgLooper;
-        mWorkerHandler = new Handler(mBgLooper);
-
-        if (inMemoryCache) {
-            mCache = new HashMap<>(INITIAL_ICON_CACHE_CAPACITY);
-        } else {
-            // Use a dummy cache
-            mCache = new AbstractMap<ComponentKey, CacheEntry>() {
-                @Override
-                public Set<Entry<ComponentKey, CacheEntry>> entrySet() {
-                    return Collections.emptySet();
-                }
-
-                @Override
-                public CacheEntry put(ComponentKey key, CacheEntry value) {
-                    return value;
-                }
-            };
-        }
-
-        if (BitmapRenderer.USE_HARDWARE_BITMAP && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            mDecodeOptions = new BitmapFactory.Options();
-            mDecodeOptions.inPreferredConfig = Bitmap.Config.HARDWARE;
-        } else {
-            mDecodeOptions = null;
-        }
-
-        updateSystemState();
-        mIconDpi = iconDpi;
-        mIconDb = new IconDB(context, dbFileName, iconPixelSize);
-    }
-
-    /**
-     * Returns the persistable serial number for {@param user}. Subclass should implement proper
-     * caching strategy to avoid making binder call every time.
-     */
-    protected abstract long getSerialNumberForUser(UserHandle user);
-
-    /**
-     * Return true if the given app is an instant app and should be badged appropriately.
-     */
-    protected abstract boolean isInstantApp(ApplicationInfo info);
-
-    /**
-     * Opens and returns an icon factory. The factory is recycled by the caller.
-     */
-    protected abstract BaseIconFactory getIconFactory();
-
-    public void updateIconParams(int iconDpi, int iconPixelSize) {
-        mWorkerHandler.post(() -> updateIconParamsBg(iconDpi, iconPixelSize));
-    }
-
-    private synchronized void updateIconParamsBg(int iconDpi, int iconPixelSize) {
-        mIconDpi = iconDpi;
-        mDefaultIcons.clear();
-        mIconDb.clear();
-        mIconDb.close();
-        mIconDb = new IconDB(mContext, mDbFileName, iconPixelSize);
-        mCache.clear();
-    }
-
-    private Drawable getFullResIcon(Resources resources, int iconId) {
-        if (resources != null && iconId != 0) {
-            try {
-                return resources.getDrawableForDensity(iconId, mIconDpi);
-            } catch (Resources.NotFoundException e) { }
-        }
-        return getFullResDefaultActivityIcon(mIconDpi);
-    }
-
-    public Drawable getFullResIcon(String packageName, int iconId) {
-        try {
-            return getFullResIcon(mPackageManager.getResourcesForApplication(packageName), iconId);
-        } catch (PackageManager.NameNotFoundException e) { }
-        return getFullResDefaultActivityIcon(mIconDpi);
-    }
-
-    public Drawable getFullResIcon(ActivityInfo info) {
-        try {
-            return getFullResIcon(mPackageManager.getResourcesForApplication(info.applicationInfo),
-                    info.getIconResource());
-        } catch (PackageManager.NameNotFoundException e) { }
-        return getFullResDefaultActivityIcon(mIconDpi);
-    }
-
-    private BitmapInfo makeDefaultIcon(UserHandle user) {
-        try (BaseIconFactory li = getIconFactory()) {
-            return li.makeDefaultIcon(user);
-        }
-    }
-
-    /**
-     * Remove any records for the supplied ComponentName.
-     */
-    public synchronized void remove(ComponentName componentName, UserHandle user) {
-        mCache.remove(new ComponentKey(componentName, user));
-    }
-
-    /**
-     * Remove any records for the supplied package name from memory.
-     */
-    private void removeFromMemCacheLocked(String packageName, UserHandle user) {
-        HashSet<ComponentKey> forDeletion = new HashSet<>();
-        for (ComponentKey key: mCache.keySet()) {
-            if (key.componentName.getPackageName().equals(packageName)
-                    && key.user.equals(user)) {
-                forDeletion.add(key);
-            }
-        }
-        for (ComponentKey condemned: forDeletion) {
-            mCache.remove(condemned);
-        }
-    }
-
-    /**
-     * Removes the entries related to the given package in memory and persistent DB.
-     */
-    public synchronized void removeIconsForPkg(String packageName, UserHandle user) {
-        removeFromMemCacheLocked(packageName, user);
-        long userSerial = getSerialNumberForUser(user);
-        mIconDb.delete(
-                IconDB.COLUMN_COMPONENT + " LIKE ? AND " + IconDB.COLUMN_USER + " = ?",
-                new String[]{packageName + "/%", Long.toString(userSerial)});
-    }
-
-    public IconCacheUpdateHandler getUpdateHandler() {
-        updateSystemState();
-        return new IconCacheUpdateHandler(this);
-    }
-
-    /**
-     * Refreshes the system state definition used to check the validity of the cache. It
-     * incorporates all the properties that can affect the cache like the list of enabled locale
-     * and system-version.
-     */
-    private void updateSystemState() {
-        mLocaleList = mContext.getResources().getConfiguration().getLocales();
-        mSystemState = mLocaleList.toLanguageTags() + "," + Build.VERSION.SDK_INT;
-    }
-
-    protected String getIconSystemState(String packageName) {
-        return mSystemState;
-    }
-
-    /**
-     * Adds an entry into the DB and the in-memory cache.
-     * @param replaceExisting if true, it will recreate the bitmap even if it already exists in
-     *                        the memory. This is useful then the previous bitmap was created using
-     *                        old data.
-     */
-    @VisibleForTesting
-    public synchronized <T> void addIconToDBAndMemCache(T object, CachingLogic<T> cachingLogic,
-            PackageInfo info, long userSerial, boolean replaceExisting) {
-        UserHandle user = cachingLogic.getUser(object);
-        ComponentName componentName = cachingLogic.getComponent(object);
-
-        final ComponentKey key = new ComponentKey(componentName, user);
-        CacheEntry entry = null;
-        if (!replaceExisting) {
-            entry = mCache.get(key);
-            // We can't reuse the entry if the high-res icon is not present.
-            if (entry == null || entry.bitmap.isNullOrLowRes()) {
-                entry = null;
-            }
-        }
-        if (entry == null) {
-            entry = new CacheEntry();
-            entry.bitmap = cachingLogic.loadIcon(mContext, object);
-        }
-        // Icon can't be loaded from cachingLogic, which implies alternative icon was loaded
-        // (e.g. fallback icon, default icon). So we drop here since there's no point in caching
-        // an empty entry.
-        if (entry.bitmap.isNullOrLowRes()) return;
-        entry.title = cachingLogic.getLabel(object);
-        entry.contentDescription = mPackageManager.getUserBadgedLabel(entry.title, user);
-        if (cachingLogic.addToMemCache()) mCache.put(key, entry);
-
-        ContentValues values = newContentValues(entry.bitmap, entry.title.toString(),
-                componentName.getPackageName(), cachingLogic.getKeywords(object, mLocaleList));
-        addIconToDB(values, componentName, info, userSerial,
-                cachingLogic.getLastUpdatedTime(object, info));
-    }
-
-    /**
-     * Updates {@param values} to contain versioning information and adds it to the DB.
-     * @param values {@link ContentValues} containing icon & title
-     */
-    private void addIconToDB(ContentValues values, ComponentName key,
-            PackageInfo info, long userSerial, long lastUpdateTime) {
-        values.put(IconDB.COLUMN_COMPONENT, key.flattenToString());
-        values.put(IconDB.COLUMN_USER, userSerial);
-        values.put(IconDB.COLUMN_LAST_UPDATED, lastUpdateTime);
-        values.put(IconDB.COLUMN_VERSION, info.versionCode);
-        mIconDb.insertOrReplace(values);
-    }
-
-    public synchronized BitmapInfo getDefaultIcon(UserHandle user) {
-        if (!mDefaultIcons.containsKey(user)) {
-            mDefaultIcons.put(user, makeDefaultIcon(user));
-        }
-        return mDefaultIcons.get(user);
-    }
-
-    public boolean isDefaultIcon(BitmapInfo icon, UserHandle user) {
-        return getDefaultIcon(user).icon == icon.icon;
-    }
-
-    /**
-     * Retrieves the entry from the cache. If the entry is not present, it creates a new entry.
-     * This method is not thread safe, it must be called from a synchronized method.
-     */
-    protected <T> CacheEntry cacheLocked(
-            @NonNull ComponentName componentName, @NonNull UserHandle user,
-            @NonNull Supplier<T> infoProvider, @NonNull CachingLogic<T> cachingLogic,
-            boolean usePackageIcon, boolean useLowResIcon) {
-        assertWorkerThread();
-        ComponentKey cacheKey = new ComponentKey(componentName, user);
-        CacheEntry entry = mCache.get(cacheKey);
-        if (entry == null || (entry.bitmap.isLowRes() && !useLowResIcon)) {
-            entry = new CacheEntry();
-            if (cachingLogic.addToMemCache()) {
-                mCache.put(cacheKey, entry);
-            }
-
-            // Check the DB first.
-            T object = null;
-            boolean providerFetchedOnce = false;
-
-            if (!getEntryFromDB(cacheKey, entry, useLowResIcon)) {
-                object = infoProvider.get();
-                providerFetchedOnce = true;
-
-                if (object != null) {
-                    entry.bitmap = cachingLogic.loadIcon(mContext, object);
-                } else {
-                    if (usePackageIcon) {
-                        CacheEntry packageEntry = getEntryForPackageLocked(
-                                componentName.getPackageName(), user, false);
-                        if (packageEntry != null) {
-                            if (DEBUG) Log.d(TAG, "using package default icon for " +
-                                    componentName.toShortString());
-                            entry.bitmap = packageEntry.bitmap;
-                            entry.title = packageEntry.title;
-                            entry.contentDescription = packageEntry.contentDescription;
-                        }
-                    }
-                    if (entry.bitmap == null) {
-                        if (DEBUG) Log.d(TAG, "using default icon for " +
-                                componentName.toShortString());
-                        entry.bitmap = getDefaultIcon(user);
-                    }
-                }
-            }
-
-            if (TextUtils.isEmpty(entry.title)) {
-                if (object == null && !providerFetchedOnce) {
-                    object = infoProvider.get();
-                    providerFetchedOnce = true;
-                }
-                if (object != null) {
-                    entry.title = cachingLogic.getLabel(object);
-                    entry.contentDescription = mPackageManager.getUserBadgedLabel(
-                            cachingLogic.getDescription(object, entry.title), user);
-                }
-            }
-        }
-        return entry;
-    }
-
-    public synchronized void clear() {
-        assertWorkerThread();
-        mIconDb.clear();
-    }
-
-    /**
-     * Adds a default package entry in the cache. This entry is not persisted and will be removed
-     * when the cache is flushed.
-     */
-    protected synchronized void cachePackageInstallInfo(String packageName, UserHandle user,
-            Bitmap icon, CharSequence title) {
-        removeFromMemCacheLocked(packageName, user);
-
-        ComponentKey cacheKey = getPackageKey(packageName, user);
-        CacheEntry entry = mCache.get(cacheKey);
-
-        // For icon caching, do not go through DB. Just update the in-memory entry.
-        if (entry == null) {
-            entry = new CacheEntry();
-        }
-        if (!TextUtils.isEmpty(title)) {
-            entry.title = title;
-        }
-        if (icon != null) {
-            BaseIconFactory li = getIconFactory();
-            entry.bitmap = li.createIconBitmap(icon);
-            li.close();
-        }
-        if (!TextUtils.isEmpty(title) && entry.bitmap.icon != null) {
-            mCache.put(cacheKey, entry);
-        }
-    }
-
-    private static ComponentKey getPackageKey(String packageName, UserHandle user) {
-        ComponentName cn = new ComponentName(packageName, packageName + EMPTY_CLASS_NAME);
-        return new ComponentKey(cn, user);
-    }
-
-    /**
-     * Gets an entry for the package, which can be used as a fallback entry for various components.
-     * This method is not thread safe, it must be called from a synchronized method.
-     */
-    protected CacheEntry getEntryForPackageLocked(String packageName, UserHandle user,
-            boolean useLowResIcon) {
-        assertWorkerThread();
-        ComponentKey cacheKey = getPackageKey(packageName, user);
-        CacheEntry entry = mCache.get(cacheKey);
-
-        if (entry == null || (entry.bitmap.isLowRes() && !useLowResIcon)) {
-            entry = new CacheEntry();
-            boolean entryUpdated = true;
-
-            // Check the DB first.
-            if (!getEntryFromDB(cacheKey, entry, useLowResIcon)) {
-                try {
-                    int flags = Process.myUserHandle().equals(user) ? 0 :
-                            PackageManager.GET_UNINSTALLED_PACKAGES;
-                    PackageInfo info = mPackageManager.getPackageInfo(packageName, flags);
-                    ApplicationInfo appInfo = info.applicationInfo;
-                    if (appInfo == null) {
-                        throw new NameNotFoundException("ApplicationInfo is null");
-                    }
-
-                    BaseIconFactory li = getIconFactory();
-                    // Load the full res icon for the application, but if useLowResIcon is set, then
-                    // only keep the low resolution icon instead of the larger full-sized icon
-                    BitmapInfo iconInfo = li.createBadgedIconBitmap(
-                            appInfo.loadIcon(mPackageManager), user, appInfo.targetSdkVersion,
-                            isInstantApp(appInfo));
-                    li.close();
-
-                    entry.title = appInfo.loadLabel(mPackageManager);
-                    entry.contentDescription = mPackageManager.getUserBadgedLabel(entry.title, user);
-                    entry.bitmap = BitmapInfo.of(
-                            useLowResIcon ? LOW_RES_ICON : iconInfo.icon, iconInfo.color);
-
-                    // Add the icon in the DB here, since these do not get written during
-                    // package updates.
-                    ContentValues values = newContentValues(
-                            iconInfo, entry.title.toString(), packageName, null);
-                    addIconToDB(values, cacheKey.componentName, info, getSerialNumberForUser(user),
-                            info.lastUpdateTime);
-
-                } catch (NameNotFoundException e) {
-                    if (DEBUG) Log.d(TAG, "Application not installed " + packageName);
-                    entryUpdated = false;
-                }
-            }
-
-            // Only add a filled-out entry to the cache
-            if (entryUpdated) {
-                mCache.put(cacheKey, entry);
-            }
-        }
-        return entry;
-    }
-
-    protected boolean getEntryFromDB(ComponentKey cacheKey, CacheEntry entry, boolean lowRes) {
-        Cursor c = null;
-        try {
-            c = mIconDb.query(
-                    lowRes ? IconDB.COLUMNS_LOW_RES : IconDB.COLUMNS_HIGH_RES,
-                    IconDB.COLUMN_COMPONENT + " = ? AND " + IconDB.COLUMN_USER + " = ?",
-                    new String[]{
-                            cacheKey.componentName.flattenToString(),
-                            Long.toString(getSerialNumberForUser(cacheKey.user))});
-            if (c.moveToNext()) {
-                // Set the alpha to be 255, so that we never have a wrong color
-                entry.bitmap = BitmapInfo.of(LOW_RES_ICON, setColorAlphaBound(c.getInt(0), 255));
-                entry.title = c.getString(1);
-                if (entry.title == null) {
-                    entry.title = "";
-                    entry.contentDescription = "";
-                } else {
-                    entry.contentDescription = mPackageManager.getUserBadgedLabel(
-                            entry.title, cacheKey.user);
-                }
-
-                if (!lowRes) {
-                    byte[] data = c.getBlob(2);
-                    try {
-                        entry.bitmap = BitmapInfo.of(
-                                BitmapFactory.decodeByteArray(data, 0, data.length, mDecodeOptions),
-                                entry.bitmap.color);
-                    } catch (Exception e) { }
-                }
-                return true;
-            }
-        } catch (SQLiteException e) {
-            Log.d(TAG, "Error reading icon cache", e);
-        } finally {
-            if (c != null) {
-                c.close();
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Returns a cursor for an arbitrary query to the cache db
-     */
-    public synchronized Cursor queryCacheDb(String[] columns, String selection,
-            String[] selectionArgs) {
-        return mIconDb.query(columns, selection, selectionArgs);
-    }
-
-    /**
-     * Cache class to store the actual entries on disk
-     */
-    public static final class IconDB extends SQLiteCacheHelper {
-        private static final int RELEASE_VERSION = 27;
-
-        public static final String TABLE_NAME = "icons";
-        public static final String COLUMN_ROWID = "rowid";
-        public static final String COLUMN_COMPONENT = "componentName";
-        public static final String COLUMN_USER = "profileId";
-        public static final String COLUMN_LAST_UPDATED = "lastUpdated";
-        public static final String COLUMN_VERSION = "version";
-        public static final String COLUMN_ICON = "icon";
-        public static final String COLUMN_ICON_COLOR = "icon_color";
-        public static final String COLUMN_LABEL = "label";
-        public static final String COLUMN_SYSTEM_STATE = "system_state";
-        public static final String COLUMN_KEYWORDS = "keywords";
-
-        public static final String[] COLUMNS_HIGH_RES = new String[] {
-                IconDB.COLUMN_ICON_COLOR, IconDB.COLUMN_LABEL, IconDB.COLUMN_ICON };
-        public static final String[] COLUMNS_LOW_RES = new String[] {
-                IconDB.COLUMN_ICON_COLOR, IconDB.COLUMN_LABEL };
-
-        public IconDB(Context context, String dbFileName, int iconPixelSize) {
-            super(context, dbFileName, (RELEASE_VERSION << 16) + iconPixelSize, TABLE_NAME);
-        }
-
-        @Override
-        protected void onCreateTable(SQLiteDatabase db) {
-            db.execSQL("CREATE TABLE IF NOT EXISTS " + TABLE_NAME + " ("
-                    + COLUMN_COMPONENT + " TEXT NOT NULL, "
-                    + COLUMN_USER + " INTEGER NOT NULL, "
-                    + COLUMN_LAST_UPDATED + " INTEGER NOT NULL DEFAULT 0, "
-                    + COLUMN_VERSION + " INTEGER NOT NULL DEFAULT 0, "
-                    + COLUMN_ICON + " BLOB, "
-                    + COLUMN_ICON_COLOR + " INTEGER NOT NULL DEFAULT 0, "
-                    + COLUMN_LABEL + " TEXT, "
-                    + COLUMN_SYSTEM_STATE + " TEXT, "
-                    + COLUMN_KEYWORDS + " TEXT, "
-                    + "PRIMARY KEY (" + COLUMN_COMPONENT + ", " + COLUMN_USER + ") "
-                    + ");");
-        }
-    }
-
-    private ContentValues newContentValues(BitmapInfo bitmapInfo, String label,
-            String packageName, @Nullable String keywords) {
-        ContentValues values = new ContentValues();
-        values.put(IconDB.COLUMN_ICON,
-                bitmapInfo.isLowRes() ? null : GraphicsUtils.flattenBitmap(bitmapInfo.icon));
-        values.put(IconDB.COLUMN_ICON_COLOR, bitmapInfo.color);
-
-        values.put(IconDB.COLUMN_LABEL, label);
-        values.put(IconDB.COLUMN_SYSTEM_STATE, getIconSystemState(packageName));
-        values.put(IconDB.COLUMN_KEYWORDS, keywords);
-        return values;
-    }
-
-    private void assertWorkerThread() {
-        if (Looper.myLooper() != mBgLooper) {
-            throw new IllegalStateException("Cache accessed on wrong thread " + Looper.myLooper());
-        }
-    }
-}
diff --git a/iconloaderlib/src/com/android/launcher3/icons/cache/CachingLogic.java b/iconloaderlib/src/com/android/launcher3/icons/cache/CachingLogic.java
deleted file mode 100644
index c12e9dcc15..0000000000
--- a/iconloaderlib/src/com/android/launcher3/icons/cache/CachingLogic.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.icons.cache;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.pm.PackageInfo;
-import android.os.LocaleList;
-import android.os.UserHandle;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.icons.BitmapInfo;
-
-public interface CachingLogic<T> {
-
-    ComponentName getComponent(T object);
-
-    UserHandle getUser(T object);
-
-    CharSequence getLabel(T object);
-
-    default CharSequence getDescription(T object, CharSequence fallback) {
-        return fallback;
-    }
-
-    @NonNull
-    BitmapInfo loadIcon(Context context, T object);
-
-    /**
-     * Provides a option list of keywords to associate with this object
-     */
-    @Nullable
-    default String getKeywords(T object, LocaleList localeList) {
-        return null;
-    }
-
-    /**
-     * Returns the timestamp the entry was last updated in cache.
-     */
-    default long getLastUpdatedTime(T object, PackageInfo info) {
-        return info.lastUpdateTime;
-    }
-
-    /**
-     * Returns true the object should be added to mem cache; otherwise returns false.
-     */
-    default boolean addToMemCache() {
-        return true;
-    }
-}
diff --git a/iconloaderlib/src/com/android/launcher3/icons/cache/HandlerRunnable.java b/iconloaderlib/src/com/android/launcher3/icons/cache/HandlerRunnable.java
deleted file mode 100644
index ee52934543..0000000000
--- a/iconloaderlib/src/com/android/launcher3/icons/cache/HandlerRunnable.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.icons.cache;
-
-import android.os.Handler;
-
-/**
- * A runnable that can be posted to a {@link Handler} which can be canceled.
- */
-public abstract class HandlerRunnable implements Runnable {
-
-    private final Handler mHandler;
-    private final Runnable mEndRunnable;
-
-    private boolean mEnded = false;
-    private boolean mCanceled = false;
-
-    public HandlerRunnable(Handler handler, Runnable endRunnable) {
-        mHandler = handler;
-        mEndRunnable = endRunnable;
-    }
-
-    /**
-     * Cancels this runnable from being run, only if it has not already run.
-     */
-    public void cancel() {
-        mHandler.removeCallbacks(this);
-        // TODO: This can actually cause onEnd to be called twice if the handler is already running
-        //       this runnable
-        // NOTE: This is currently run on whichever thread the caller is run on.
-        mCanceled = true;
-        onEnd();
-    }
-
-    /**
-     * @return whether this runnable was canceled.
-     */
-    protected boolean isCanceled() {
-        return mCanceled;
-    }
-
-    /**
-     * To be called by the implemention of this runnable. The end callback is done on whichever
-     * thread the caller is calling from.
-     */
-    public void onEnd() {
-        if (!mEnded) {
-            mEnded = true;
-            if (mEndRunnable != null) {
-                mEndRunnable.run();
-            }
-        }
-    }
-}
diff --git a/iconloaderlib/src/com/android/launcher3/icons/cache/IconCacheUpdateHandler.java b/iconloaderlib/src/com/android/launcher3/icons/cache/IconCacheUpdateHandler.java
deleted file mode 100644
index 9e1ad7b7b2..0000000000
--- a/iconloaderlib/src/com/android/launcher3/icons/cache/IconCacheUpdateHandler.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.icons.cache;
-
-import android.content.ComponentName;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteException;
-import android.os.SystemClock;
-import android.os.UserHandle;
-import android.text.TextUtils;
-import android.util.ArrayMap;
-import android.util.Log;
-import android.util.SparseBooleanArray;
-
-import com.android.launcher3.icons.cache.BaseIconCache.IconDB;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.Stack;
-
-/**
- * Utility class to handle updating the Icon cache
- */
-public class IconCacheUpdateHandler {
-
-    private static final String TAG = "IconCacheUpdateHandler";
-
-    /**
-     * In this mode, all invalid icons are marked as to-be-deleted in {@link #mItemsToDelete}.
-     * This mode is used for the first run.
-     */
-    private static final boolean MODE_SET_INVALID_ITEMS = true;
-
-    /**
-     * In this mode, any valid icon is removed from {@link #mItemsToDelete}. This is used for all
-     * subsequent runs, which essentially acts as set-union of all valid items.
-     */
-    private static final boolean MODE_CLEAR_VALID_ITEMS = false;
-
-    private static final Object ICON_UPDATE_TOKEN = new Object();
-
-    private final HashMap<String, PackageInfo> mPkgInfoMap;
-    private final BaseIconCache mIconCache;
-
-    private final ArrayMap<UserHandle, Set<String>> mPackagesToIgnore = new ArrayMap<>();
-
-    private final SparseBooleanArray mItemsToDelete = new SparseBooleanArray();
-    private boolean mFilterMode = MODE_SET_INVALID_ITEMS;
-
-    IconCacheUpdateHandler(BaseIconCache cache) {
-        mIconCache = cache;
-
-        mPkgInfoMap = new HashMap<>();
-
-        // Remove all active icon update tasks.
-        mIconCache.mWorkerHandler.removeCallbacksAndMessages(ICON_UPDATE_TOKEN);
-
-        createPackageInfoMap();
-    }
-
-    /**
-     * Sets a package to ignore for processing
-     */
-    public void addPackagesToIgnore(UserHandle userHandle, String packageName) {
-        Set<String> packages = mPackagesToIgnore.get(userHandle);
-        if (packages == null) {
-            packages = new HashSet<>();
-            mPackagesToIgnore.put(userHandle, packages);
-        }
-        packages.add(packageName);
-    }
-
-    private void createPackageInfoMap() {
-        PackageManager pm = mIconCache.mPackageManager;
-        for (PackageInfo info :
-                pm.getInstalledPackages(PackageManager.MATCH_UNINSTALLED_PACKAGES)) {
-            mPkgInfoMap.put(info.packageName, info);
-        }
-    }
-
-    /**
-     * Updates the persistent DB, such that only entries corresponding to {@param apps} remain in
-     * the DB and are updated.
-     * @return The set of packages for which icons have updated.
-     */
-    public <T> void updateIcons(List<T> apps, CachingLogic<T> cachingLogic,
-            OnUpdateCallback onUpdateCallback) {
-        // Filter the list per user
-        HashMap<UserHandle, HashMap<ComponentName, T>> userComponentMap = new HashMap<>();
-        int count = apps.size();
-        for (int i = 0; i < count; i++) {
-            T app = apps.get(i);
-            UserHandle userHandle = cachingLogic.getUser(app);
-            HashMap<ComponentName, T> componentMap = userComponentMap.get(userHandle);
-            if (componentMap == null) {
-                componentMap = new HashMap<>();
-                userComponentMap.put(userHandle, componentMap);
-            }
-            componentMap.put(cachingLogic.getComponent(app), app);
-        }
-
-        for (Entry<UserHandle, HashMap<ComponentName, T>> entry : userComponentMap.entrySet()) {
-            updateIconsPerUser(entry.getKey(), entry.getValue(), cachingLogic, onUpdateCallback);
-        }
-
-        // From now on, clear every valid item from the global valid map.
-        mFilterMode = MODE_CLEAR_VALID_ITEMS;
-    }
-
-    /**
-     * Updates the persistent DB, such that only entries corresponding to {@param apps} remain in
-     * the DB and are updated.
-     * @return The set of packages for which icons have updated.
-     */
-    @SuppressWarnings("unchecked")
-    private <T> void updateIconsPerUser(UserHandle user, HashMap<ComponentName, T> componentMap,
-            CachingLogic<T> cachingLogic, OnUpdateCallback onUpdateCallback) {
-        Set<String> ignorePackages = mPackagesToIgnore.get(user);
-        if (ignorePackages == null) {
-            ignorePackages = Collections.emptySet();
-        }
-        long userSerial = mIconCache.getSerialNumberForUser(user);
-
-        Stack<T> appsToUpdate = new Stack<>();
-
-        try (Cursor c = mIconCache.mIconDb.query(
-                new String[]{IconDB.COLUMN_ROWID, IconDB.COLUMN_COMPONENT,
-                        IconDB.COLUMN_LAST_UPDATED, IconDB.COLUMN_VERSION,
-                        IconDB.COLUMN_SYSTEM_STATE},
-                IconDB.COLUMN_USER + " = ? ",
-                new String[]{Long.toString(userSerial)})) {
-
-            final int indexComponent = c.getColumnIndex(IconDB.COLUMN_COMPONENT);
-            final int indexLastUpdate = c.getColumnIndex(IconDB.COLUMN_LAST_UPDATED);
-            final int indexVersion = c.getColumnIndex(IconDB.COLUMN_VERSION);
-            final int rowIndex = c.getColumnIndex(IconDB.COLUMN_ROWID);
-            final int systemStateIndex = c.getColumnIndex(IconDB.COLUMN_SYSTEM_STATE);
-
-            while (c.moveToNext()) {
-                String cn = c.getString(indexComponent);
-                ComponentName component = ComponentName.unflattenFromString(cn);
-                PackageInfo info = mPkgInfoMap.get(component.getPackageName());
-
-                int rowId = c.getInt(rowIndex);
-                if (info == null) {
-                    if (!ignorePackages.contains(component.getPackageName())) {
-
-                        if (mFilterMode == MODE_SET_INVALID_ITEMS) {
-                            mIconCache.remove(component, user);
-                            mItemsToDelete.put(rowId, true);
-                        }
-                    }
-                    continue;
-                }
-                if ((info.applicationInfo.flags & ApplicationInfo.FLAG_IS_DATA_ONLY) != 0) {
-                    // Application is not present
-                    continue;
-                }
-
-                long updateTime = c.getLong(indexLastUpdate);
-                int version = c.getInt(indexVersion);
-                T app = componentMap.remove(component);
-                if (version == info.versionCode && updateTime == info.lastUpdateTime
-                        && TextUtils.equals(c.getString(systemStateIndex),
-                                mIconCache.getIconSystemState(info.packageName))) {
-
-                    if (mFilterMode == MODE_CLEAR_VALID_ITEMS) {
-                        mItemsToDelete.put(rowId, false);
-                    }
-                    continue;
-                }
-
-                if (app == null) {
-                    if (mFilterMode == MODE_SET_INVALID_ITEMS) {
-                        mIconCache.remove(component, user);
-                        mItemsToDelete.put(rowId, true);
-                    }
-                } else {
-                    appsToUpdate.add(app);
-                }
-            }
-        } catch (SQLiteException e) {
-            Log.d(TAG, "Error reading icon cache", e);
-            // Continue updating whatever we have read so far
-        }
-
-        // Insert remaining apps.
-        if (!componentMap.isEmpty() || !appsToUpdate.isEmpty()) {
-            Stack<T> appsToAdd = new Stack<>();
-            appsToAdd.addAll(componentMap.values());
-            new SerializedIconUpdateTask(userSerial, user, appsToAdd, appsToUpdate, cachingLogic,
-                    onUpdateCallback).scheduleNext();
-        }
-    }
-
-    /**
-     * Commits all updates as part of the update handler to disk. Not more calls should be made
-     * to this class after this.
-     */
-    public void finish() {
-        // Commit all deletes
-        int deleteCount = 0;
-        StringBuilder queryBuilder = new StringBuilder()
-                .append(IconDB.COLUMN_ROWID)
-                .append(" IN (");
-
-        int count = mItemsToDelete.size();
-        for (int i = 0;  i < count; i++) {
-            if (mItemsToDelete.valueAt(i)) {
-                if (deleteCount > 0) {
-                    queryBuilder.append(", ");
-                }
-                queryBuilder.append(mItemsToDelete.keyAt(i));
-                deleteCount++;
-            }
-        }
-        queryBuilder.append(')');
-
-        if (deleteCount > 0) {
-            mIconCache.mIconDb.delete(queryBuilder.toString(), null);
-        }
-    }
-
-    /**
-     * A runnable that updates invalid icons and adds missing icons in the DB for the provided
-     * LauncherActivityInfo list. Items are updated/added one at a time, so that the
-     * worker thread doesn't get blocked.
-     */
-    private class SerializedIconUpdateTask<T> implements Runnable {
-        private final long mUserSerial;
-        private final UserHandle mUserHandle;
-        private final Stack<T> mAppsToAdd;
-        private final Stack<T> mAppsToUpdate;
-        private final CachingLogic<T> mCachingLogic;
-        private final HashSet<String> mUpdatedPackages = new HashSet<>();
-        private final OnUpdateCallback mOnUpdateCallback;
-
-        SerializedIconUpdateTask(long userSerial, UserHandle userHandle,
-                Stack<T> appsToAdd, Stack<T> appsToUpdate, CachingLogic<T> cachingLogic,
-                OnUpdateCallback onUpdateCallback) {
-            mUserHandle = userHandle;
-            mUserSerial = userSerial;
-            mAppsToAdd = appsToAdd;
-            mAppsToUpdate = appsToUpdate;
-            mCachingLogic = cachingLogic;
-            mOnUpdateCallback = onUpdateCallback;
-        }
-
-        @Override
-        public void run() {
-            if (!mAppsToUpdate.isEmpty()) {
-                T app = mAppsToUpdate.pop();
-                String pkg = mCachingLogic.getComponent(app).getPackageName();
-                PackageInfo info = mPkgInfoMap.get(pkg);
-
-                mIconCache.addIconToDBAndMemCache(
-                        app, mCachingLogic, info, mUserSerial, true /*replace existing*/);
-                mUpdatedPackages.add(pkg);
-
-                if (mAppsToUpdate.isEmpty() && !mUpdatedPackages.isEmpty()) {
-                    // No more app to update. Notify callback.
-                    mOnUpdateCallback.onPackageIconsUpdated(mUpdatedPackages, mUserHandle);
-                }
-
-                // Let it run one more time.
-                scheduleNext();
-            } else if (!mAppsToAdd.isEmpty()) {
-                T app = mAppsToAdd.pop();
-                PackageInfo info = mPkgInfoMap.get(mCachingLogic.getComponent(app).getPackageName());
-                // We do not check the mPkgInfoMap when generating the mAppsToAdd. Although every
-                // app should have package info, this is not guaranteed by the api
-                if (info != null) {
-                    mIconCache.addIconToDBAndMemCache(app, mCachingLogic, info,
-                            mUserSerial, false /*replace existing*/);
-                }
-
-                if (!mAppsToAdd.isEmpty()) {
-                    scheduleNext();
-                }
-            }
-        }
-
-        public void scheduleNext() {
-            mIconCache.mWorkerHandler.postAtTime(this, ICON_UPDATE_TOKEN,
-                    SystemClock.uptimeMillis() + 1);
-        }
-    }
-
-    public interface OnUpdateCallback {
-
-        void onPackageIconsUpdated(HashSet<String> updatedPackages, UserHandle user);
-    }
-}
diff --git a/iconloaderlib/src/com/android/launcher3/util/ComponentKey.java b/iconloaderlib/src/com/android/launcher3/util/ComponentKey.java
deleted file mode 100644
index 34bed94270..0000000000
--- a/iconloaderlib/src/com/android/launcher3/util/ComponentKey.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.android.launcher3.util;
-
-/**
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import android.content.ComponentName;
-import android.os.UserHandle;
-
-import java.util.Arrays;
-
-public class ComponentKey {
-
-    public final ComponentName componentName;
-    public final UserHandle user;
-
-    private final int mHashCode;
-
-    public ComponentKey(ComponentName componentName, UserHandle user) {
-        if (componentName == null || user == null) {
-            throw new NullPointerException();
-        }
-        this.componentName = componentName;
-        this.user = user;
-        mHashCode = Arrays.hashCode(new Object[] {componentName, user});
-
-    }
-
-    @Override
-    public int hashCode() {
-        return mHashCode;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        ComponentKey other = (ComponentKey) o;
-        return other.componentName.equals(componentName) && other.user.equals(user);
-    }
-
-    /**
-     * Encodes a component key as a string of the form [flattenedComponentString#userId].
-     */
-    @Override
-    public String toString() {
-        return componentName.flattenToString() + "#" + user;
-    }
-}
\ No newline at end of file
diff --git a/iconloaderlib/src/com/android/launcher3/util/NoLocaleSQLiteHelper.java b/iconloaderlib/src/com/android/launcher3/util/NoLocaleSQLiteHelper.java
deleted file mode 100644
index fe864a2847..0000000000
--- a/iconloaderlib/src/com/android/launcher3/util/NoLocaleSQLiteHelper.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.util;
-
-import static android.database.sqlite.SQLiteDatabase.NO_LOCALIZED_COLLATORS;
-
-import android.content.Context;
-import android.content.ContextWrapper;
-import android.database.DatabaseErrorHandler;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteDatabase.CursorFactory;
-import android.database.sqlite.SQLiteDatabase.OpenParams;
-import android.database.sqlite.SQLiteOpenHelper;
-import android.os.Build;
-
-/**
- * Extension of {@link SQLiteOpenHelper} which avoids creating default locale table by
- * A context wrapper which creates databases without support for localized collators.
- */
-public abstract class NoLocaleSQLiteHelper extends SQLiteOpenHelper {
-
-    private static final boolean ATLEAST_P =
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.P;
-
-    public NoLocaleSQLiteHelper(Context context, String name, int version) {
-        super(ATLEAST_P ? context : new NoLocalContext(context), name, null, version);
-        if (ATLEAST_P) {
-            setOpenParams(new OpenParams.Builder().addOpenFlags(NO_LOCALIZED_COLLATORS).build());
-        }
-    }
-
-    private static class NoLocalContext extends ContextWrapper {
-        public NoLocalContext(Context base) {
-            super(base);
-        }
-
-        @Override
-        public SQLiteDatabase openOrCreateDatabase(
-                String name, int mode, CursorFactory factory, DatabaseErrorHandler errorHandler) {
-            return super.openOrCreateDatabase(
-                    name, mode | Context.MODE_NO_LOCALIZED_COLLATORS, factory, errorHandler);
-        }
-    }
-}
diff --git a/iconloaderlib/src/com/android/launcher3/util/SQLiteCacheHelper.java b/iconloaderlib/src/com/android/launcher3/util/SQLiteCacheHelper.java
deleted file mode 100644
index 49de4bd1bf..0000000000
--- a/iconloaderlib/src/com/android/launcher3/util/SQLiteCacheHelper.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.android.launcher3.util;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteException;
-import android.database.sqlite.SQLiteFullException;
-import android.database.sqlite.SQLiteOpenHelper;
-import android.util.Log;
-
-/**
- * An extension of {@link SQLiteOpenHelper} with utility methods for a single table cache DB.
- * Any exception during write operations are ignored, and any version change causes a DB reset.
- */
-public abstract class SQLiteCacheHelper {
-    private static final String TAG = "SQLiteCacheHelper";
-
-    private static final boolean IN_MEMORY_CACHE = false;
-
-    private final String mTableName;
-    private final MySQLiteOpenHelper mOpenHelper;
-
-    private boolean mIgnoreWrites;
-
-    public SQLiteCacheHelper(Context context, String name, int version, String tableName) {
-        if (IN_MEMORY_CACHE) {
-            name = null;
-        }
-        mTableName = tableName;
-        mOpenHelper = new MySQLiteOpenHelper(context, name, version);
-
-        mIgnoreWrites = false;
-    }
-
-    /**
-     * @see SQLiteDatabase#delete(String, String, String[])
-     */
-    public void delete(String whereClause, String[] whereArgs) {
-        if (mIgnoreWrites) {
-            return;
-        }
-        try {
-            mOpenHelper.getWritableDatabase().delete(mTableName, whereClause, whereArgs);
-        } catch (SQLiteFullException e) {
-            onDiskFull(e);
-        } catch (SQLiteException e) {
-            Log.d(TAG, "Ignoring sqlite exception", e);
-        }
-    }
-
-    /**
-     * @see SQLiteDatabase#insertWithOnConflict(String, String, ContentValues, int)
-     */
-    public void insertOrReplace(ContentValues values) {
-        if (mIgnoreWrites) {
-            return;
-        }
-        try {
-            mOpenHelper.getWritableDatabase().insertWithOnConflict(
-                    mTableName, null, values, SQLiteDatabase.CONFLICT_REPLACE);
-        } catch (SQLiteFullException e) {
-            onDiskFull(e);
-        } catch (SQLiteException e) {
-            Log.d(TAG, "Ignoring sqlite exception", e);
-        }
-    }
-
-    private void onDiskFull(SQLiteFullException e) {
-        Log.e(TAG, "Disk full, all write operations will be ignored", e);
-        mIgnoreWrites = true;
-    }
-
-    /**
-     * @see SQLiteDatabase#query(String, String[], String, String[], String, String, String)
-     */
-    public Cursor query(String[] columns, String selection, String[] selectionArgs) {
-        return mOpenHelper.getReadableDatabase().query(
-                mTableName, columns, selection, selectionArgs, null, null, null);
-    }
-
-    public void clear() {
-        mOpenHelper.clearDB(mOpenHelper.getWritableDatabase());
-    }
-
-    public void close() {
-        mOpenHelper.close();
-    }
-
-    protected abstract void onCreateTable(SQLiteDatabase db);
-
-    /**
-     * A private inner class to prevent direct DB access.
-     */
-    private class MySQLiteOpenHelper extends NoLocaleSQLiteHelper {
-
-        public MySQLiteOpenHelper(Context context, String name, int version) {
-            super(context, name, version);
-        }
-
-        @Override
-        public void onCreate(SQLiteDatabase db) {
-            onCreateTable(db);
-        }
-
-        @Override
-        public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-            if (oldVersion != newVersion) {
-                clearDB(db);
-            }
-        }
-
-        @Override
-        public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-            if (oldVersion != newVersion) {
-                clearDB(db);
-            }
-        }
-
-        private void clearDB(SQLiteDatabase db) {
-            db.execSQL("DROP TABLE IF EXISTS " + mTableName);
-            onCreate(db);
-        }
-    }
-}
diff --git a/iconloaderlib/src_full_lib/com/android/launcher3/icons/IconFactory.java b/iconloaderlib/src_full_lib/com/android/launcher3/icons/IconFactory.java
deleted file mode 100644
index 48f11fde3b..0000000000
--- a/iconloaderlib/src_full_lib/com/android/launcher3/icons/IconFactory.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.icons;
-
-import android.content.Context;
-
-/**
- * Wrapper class to provide access to {@link BaseIconFactory} and also to provide pool of this class
- * that are threadsafe.
- */
-public class IconFactory extends BaseIconFactory {
-
-    private static final Object sPoolSync = new Object();
-    private static IconFactory sPool;
-    private static int sPoolId = 0;
-
-    /**
-     * Return a new Message instance from the global pool. Allows us to
-     * avoid allocating new objects in many cases.
-     */
-    public static IconFactory obtain(Context context) {
-        int poolId;
-        synchronized (sPoolSync) {
-            if (sPool != null) {
-                IconFactory m = sPool;
-                sPool = m.next;
-                m.next = null;
-                return m;
-            }
-            poolId = sPoolId;
-        }
-
-        return new IconFactory(context,
-                context.getResources().getConfiguration().densityDpi,
-                context.getResources().getDimensionPixelSize(R.dimen.default_icon_bitmap_size),
-                poolId);
-    }
-
-    public static void clearPool() {
-        synchronized (sPoolSync) {
-            sPool = null;
-            sPoolId++;
-        }
-    }
-
-    private final int mPoolId;
-
-    private IconFactory next;
-
-    private IconFactory(Context context, int fillResIconDpi, int iconBitmapSize, int poolId) {
-        super(context, fillResIconDpi, iconBitmapSize);
-        mPoolId = poolId;
-    }
-
-    /**
-     * Recycles a LauncherIcons that may be in-use.
-     */
-    public void recycle() {
-        synchronized (sPoolSync) {
-            if (sPoolId != mPoolId) {
-                return;
-            }
-            // Clear any temporary state variables
-            clear();
-
-            next = sPool;
-            sPool = this;
-        }
-    }
-
-    @Override
-    public void close() {
-        recycle();
-    }
-}
diff --git a/iconloaderlib/src_full_lib/com/android/launcher3/icons/SimpleIconCache.java b/iconloaderlib/src_full_lib/com/android/launcher3/icons/SimpleIconCache.java
deleted file mode 100644
index 1337975f19..0000000000
--- a/iconloaderlib/src_full_lib/com/android/launcher3/icons/SimpleIconCache.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.icons;
-
-import static android.content.Intent.ACTION_MANAGED_PROFILE_ADDED;
-import static android.content.Intent.ACTION_MANAGED_PROFILE_REMOVED;
-
-import android.annotation.TargetApi;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.ApplicationInfo;
-import android.os.Build;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.Looper;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.util.SparseLongArray;
-
-import com.android.launcher3.icons.cache.BaseIconCache;
-
-/**
- * Wrapper class to provide access to {@link BaseIconFactory} and also to provide pool of this class
- * that are threadsafe.
- */
-@TargetApi(Build.VERSION_CODES.P)
-public class SimpleIconCache extends BaseIconCache {
-
-    private static SimpleIconCache sIconCache = null;
-    private static final Object CACHE_LOCK = new Object();
-
-    private final SparseLongArray mUserSerialMap = new SparseLongArray(2);
-    private final UserManager mUserManager;
-
-    public SimpleIconCache(Context context, String dbFileName, Looper bgLooper, int iconDpi,
-            int iconPixelSize, boolean inMemoryCache) {
-        super(context, dbFileName, bgLooper, iconDpi, iconPixelSize, inMemoryCache);
-        mUserManager = context.getSystemService(UserManager.class);
-
-        // Listen for user cache changes.
-        IntentFilter filter = new IntentFilter(ACTION_MANAGED_PROFILE_ADDED);
-        filter.addAction(ACTION_MANAGED_PROFILE_REMOVED);
-        context.registerReceiver(new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                resetUserCache();
-            }
-        }, filter, null, new Handler(bgLooper), 0);
-    }
-
-    @Override
-    protected long getSerialNumberForUser(UserHandle user) {
-        synchronized (mUserSerialMap) {
-            int index = mUserSerialMap.indexOfKey(user.getIdentifier());
-            if (index >= 0) {
-                return mUserSerialMap.valueAt(index);
-            }
-            long serial = mUserManager.getSerialNumberForUser(user);
-            mUserSerialMap.put(user.getIdentifier(), serial);
-            return serial;
-        }
-    }
-
-    private void resetUserCache() {
-        synchronized (mUserSerialMap) {
-            mUserSerialMap.clear();
-        }
-    }
-
-    @Override
-    protected boolean isInstantApp(ApplicationInfo info) {
-        return info.isInstantApp();
-    }
-
-    @Override
-    protected BaseIconFactory getIconFactory() {
-        return IconFactory.obtain(mContext);
-    }
-
-    public static SimpleIconCache getIconCache(Context context) {
-        synchronized (CACHE_LOCK) {
-            if (sIconCache != null) {
-                return sIconCache;
-            }
-            boolean inMemoryCache =
-                    context.getResources().getBoolean(R.bool.simple_cache_enable_im_memory);
-            String dbFileName = context.getString(R.string.cache_db_name);
-
-            HandlerThread bgThread = new HandlerThread("simple-icon-cache");
-            bgThread.start();
-
-            sIconCache = new SimpleIconCache(context.getApplicationContext(), dbFileName,
-                    bgThread.getLooper(), context.getResources().getConfiguration().densityDpi,
-                    context.getResources().getDimensionPixelSize(R.dimen.default_icon_bitmap_size),
-                    inMemoryCache);
-            return sIconCache;
-        }
-    }
-}
-- 
GitLab


From ca4f2e81facaa0637bedee918f1dc04f8d460c05 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 18 Mar 2020 22:06:50 -0700
Subject: [PATCH 0005/1664] Import translations. DO NOT MERGE

BUG: 151750123
Auto-generated-cl: translation import
Change-Id: I5c7e8ffccb7830d2159bfe0de0d35fe011938e74
---
 res/values-rm/strings.xml | 203 --------------------------------------
 1 file changed, 203 deletions(-)
 delete mode 100644 res/values-rm/strings.xml

diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
deleted file mode 100644
index 0758148f58..0000000000
--- a/res/values-rm/strings.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
-* Copyright (C) 2008 The Android Open Source Project
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for application_name (5181331383435256801) -->
-    <skip />
-    <!-- no translation found for home (7658288663002113681) -->
-    <skip />
-    <!-- no translation found for uid_name (7820867637514617527) -->
-    <skip />
-    <string name="folder_name" msgid="7371454440695724752"></string>
-    <!-- no translation found for activity_not_found (8071924732094499514) -->
-    <skip />
-    <!-- no translation found for widgets_tab_label (2921133187116603919) -->
-    <skip />
-    <!-- no translation found for widget_adder (3201040140710381657) -->
-    <skip />
-    <!-- no translation found for toggle_weight_watcher (5645299835184636119) -->
-    <skip />
-    <!-- no translation found for long_press_widget_to_add (7699152356777458215) -->
-    <skip />
-    <!-- no translation found for market (2619650989819296998) -->
-    <skip />
-    <!-- no translation found for widget_dims_format (2370757736025621599) -->
-    <skip />
-    <!-- no translation found for external_drop_widget_error (3165821058322217155) -->
-    <skip />
-    <!-- no translation found for external_drop_widget_pick_title (3486317258037690630) -->
-    <skip />
-    <!-- no translation found for rename_folder_label (3727762225964550653) -->
-    <skip />
-    <!-- no translation found for rename_folder_title (3771389277707820891) -->
-    <skip />
-    <!-- no translation found for rename_action (5559600076028658757) -->
-    <skip />
-    <!-- no translation found for cancel_action (7009134900002915310) -->
-    <skip />
-    <!-- no translation found for menu_item_add_item (1264911265836810421) -->
-    <skip />
-    <!-- no translation found for group_applications (3797214114206693605) -->
-    <skip />
-    <!-- no translation found for group_shortcuts (6012256992764410535) -->
-    <skip />
-    <!-- no translation found for group_widgets (1569030723286851002) -->
-    <skip />
-    <!-- no translation found for completely_out_of_space (6106288382070760318) -->
-    <skip />
-    <!-- no translation found for out_of_space (4691004494942118364) -->
-    <skip />
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
-    <!-- no translation found for shortcut_installed (1701742129426969556) -->
-    <skip />
-    <!-- no translation found for shortcut_uninstalled (8176767991305701821) -->
-    <skip />
-    <!-- no translation found for shortcut_duplicate (9167217446062498127) -->
-    <skip />
-    <!-- no translation found for title_select_shortcut (6680642571148153868) -->
-    <skip />
-    <!-- no translation found for title_select_application (3280812711670683644) -->
-    <skip />
-    <!-- no translation found for all_apps_button_label (9110807029020582876) -->
-    <skip />
-    <!-- no translation found for all_apps_home_button_label (252062713717058851) -->
-    <skip />
-    <!-- no translation found for delete_zone_label_workspace (4009607676751398685) -->
-    <skip />
-    <!-- no translation found for delete_zone_label_all_apps (8083826390278958980) -->
-    <skip />
-    <!-- no translation found for delete_target_label (1822697352535677073) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (5100785476250872595) -->
-    <skip />
-    <!-- no translation found for info_target_label (8053346143994679532) -->
-    <skip />
-    <!-- no translation found for accessibility_search_button (1628520399424565142) -->
-    <skip />
-    <!-- no translation found for accessibility_voice_search_button (4637324840434406584) -->
-    <skip />
-    <!-- no translation found for accessibility_all_apps_button (2603132375383800483) -->
-    <skip />
-    <!-- no translation found for accessibility_delete_button (6466114477993744621) -->
-    <skip />
-    <!-- no translation found for delete_zone_label_all_apps_system_app (449755632749610895) -->
-    <skip />
-    <!-- no translation found for cab_menu_delete_app (7435191475867183689) -->
-    <skip />
-    <!-- no translation found for cab_menu_app_info (8593722221450362342) -->
-    <skip />
-    <!-- no translation found for cab_app_selection_text (374688303047985416) -->
-    <skip />
-    <!-- no translation found for cab_widget_selection_text (1833458597831541241) -->
-    <skip />
-    <!-- no translation found for cab_folder_selection_text (7999992513806132118) -->
-    <skip />
-    <!-- no translation found for cab_shortcut_selection_text (2103811025667946450) -->
-    <skip />
-    <!-- no translation found for permlab_install_shortcut (5632423390354674437) -->
-    <skip />
-    <!-- no translation found for permdesc_install_shortcut (923466509822011139) -->
-    <skip />
-    <!-- no translation found for permlab_uninstall_shortcut (864595034498083837) -->
-    <skip />
-    <!-- no translation found for permdesc_uninstall_shortcut (5134129545001836849) -->
-    <skip />
-    <!-- no translation found for permlab_read_settings (1941457408239617576) -->
-    <skip />
-    <!-- no translation found for permdesc_read_settings (5833423719057558387) -->
-    <skip />
-    <!-- no translation found for permlab_write_settings (3574213698004620587) -->
-    <skip />
-    <!-- no translation found for permdesc_write_settings (5440712911516509985) -->
-    <skip />
-    <!-- no translation found for gadget_error_text (6081085226050792095) -->
-    <skip />
-    <!-- no translation found for uninstall_system_app_text (4172046090762920660) -->
-    <skip />
-    <!-- no translation found for dream_name (1530253749244328964) -->
-    <skip />
-    <!-- no translation found for folder_hint_text (6617836969016293992) -->
-    <skip />
-    <!-- no translation found for workspace_description_format (2950174241104043327) -->
-    <skip />
-    <!-- no translation found for default_scroll_format (7475544710230993317) -->
-    <skip />
-    <!-- no translation found for workspace_scroll_format (8458889198184077399) -->
-    <skip />
-    <!-- no translation found for apps_customize_apps_scroll_format (370005296147130238) -->
-    <skip />
-    <!-- no translation found for apps_customize_widgets_scroll_format (3106209519974971521) -->
-    <skip />
-    <!-- no translation found for first_run_cling_title (2459738000155917941) -->
-    <skip />
-    <!-- no translation found for first_run_cling_description (6447072552696253358) -->
-    <skip />
-    <!-- no translation found for first_run_cling_create_screens_hint (6950729526680114157) -->
-    <skip />
-    <!-- no translation found for migration_cling_title (9181776667882933767) -->
-    <skip />
-    <!-- no translation found for migration_cling_description (2752413805582227644) -->
-    <skip />
-    <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
-    <skip />
-    <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
-    <skip />
-    <!-- no translation found for workspace_cling_title (5626202359865825661) -->
-    <skip />
-    <!-- no translation found for workspace_cling_move_item (528201129978005352) -->
-    <skip />
-    <!-- no translation found for folder_cling_title (3894908818693254164) -->
-    <skip />
-    <!-- no translation found for folder_cling_create_folder (6158215559475836131) -->
-    <skip />
-    <!-- no translation found for cling_dismiss (8962359497601507581) -->
-    <skip />
-    <!-- no translation found for folder_opened (94695026776264709) -->
-    <skip />
-    <!-- no translation found for folder_tap_to_close (1884479294466410023) -->
-    <skip />
-    <!-- no translation found for folder_tap_to_rename (9191075570492871147) -->
-    <skip />
-    <!-- no translation found for folder_closed (4100806530910930934) -->
-    <skip />
-    <!-- no translation found for folder_renamed (1794088362165669656) -->
-    <skip />
-    <!-- no translation found for folder_name_format (6629239338071103179) -->
-    <skip />
-    <!-- no translation found for widget_button_text (2880537293434387943) -->
-    <skip />
-    <!-- no translation found for wallpaper_button_text (8404103075899945851) -->
-    <skip />
-    <!-- no translation found for settings_button_text (8119458837558863227) -->
-    <skip />
-    <!-- no translation found for package_state_enqueued (6227252464303085641) -->
-    <skip />
-    <!-- no translation found for package_state_downloading (4088770468458724721) -->
-    <skip />
-    <!-- no translation found for package_state_installing (7588193972189849870) -->
-    <skip />
-    <!-- no translation found for package_state_unknown (7592128424511031410) -->
-    <skip />
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
-</resources>
-- 
GitLab


From 0b65822f308902bb1dc98ea98e0362a830d9aa25 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Mon, 13 Apr 2020 18:30:39 -0700
Subject: [PATCH 0006/1664] Temporarily disabling events checking in git_master

Bug: 153824894
Change-Id: I5f294d1a808b1ceefd0b753de6c9207cf92de06d
---
 .../com/android/launcher3/tapl/LauncherInstrumentation.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 975fe9c1e7..b8e55651ae 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -250,7 +250,8 @@ public final class LauncherInstrumentation {
     }
 
     public void enableCheckEventsForSuccessfulGestures() {
-        mCheckEventsForSuccessfulGestures = true;
+        // b/153824894
+        // mCheckEventsForSuccessfulGestures = true;
     }
 
     public void setOnLauncherCrashed(Runnable onLauncherCrashed) {
-- 
GitLab


From 7d375e31fe5d221750f9128c20121e34c1ab142f Mon Sep 17 00:00:00 2001
From: Tony Huang <tonyychuang@google.com>
Date: Tue, 26 Nov 2019 14:00:14 +0800
Subject: [PATCH 0007/1664] Enable one-handed mode gestural in QuickStep

Handling swipe-down/swipe-up gestural in device bottom area
for one-handed mode

1) The regsion is larger than gesture navigationbar view
2) One handed gestural in quickstep only active on NO_BUTTON, TWO_BUTTONS mode
3) One handed gestural only support on portrait mode

Bug: 150747547
Bug: 154189137
Bug: 156988988

Test: make and install
Test: manual enable one handed mode and swipe down to trigger
Test: manual start one handed and rotate device

Change-Id: I7b2447bfb2fe4082c95176b62934b98077b84920
---
 .../quickstep/TouchInteractionService.java    |  18 ++-
 .../OneHandedModeInputConsumer.java           | 143 ++++++++++++++++++
 quickstep/res/values/dimens.xml               |   4 +
 .../com/android/quickstep/InputConsumer.java  |   2 +
 .../OrientationTouchTransformer.java          |  14 +-
 .../RecentsAnimationDeviceState.java          |  45 +++++-
 .../com/android/quickstep/SystemUiProxy.java  |  22 +++
 .../util/SecureSettingsObserver.java          |   8 +
 8 files changed, 250 insertions(+), 6 deletions(-)
 create mode 100644 quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
index 8bffc7805c..a88e413c84 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
@@ -75,6 +75,7 @@ import com.android.launcher3.util.WindowBounds;
 import com.android.quickstep.inputconsumers.AccessibilityInputConsumer;
 import com.android.quickstep.inputconsumers.AssistantInputConsumer;
 import com.android.quickstep.inputconsumers.DeviceLockedInputConsumer;
+import com.android.quickstep.inputconsumers.OneHandedModeInputConsumer;
 import com.android.quickstep.inputconsumers.OtherActivityInputConsumer;
 import com.android.quickstep.inputconsumers.OverscrollInputConsumer;
 import com.android.quickstep.inputconsumers.OverviewInputConsumer;
@@ -85,7 +86,6 @@ import com.android.quickstep.util.ActiveGestureLog;
 import com.android.quickstep.util.AssistantUtilities;
 import com.android.quickstep.util.ProtoTracer;
 import com.android.quickstep.util.SplitScreenBounds;
-import com.android.quickstep.views.RecentsView;
 import com.android.systemui.plugins.OverscrollPlugin;
 import com.android.systemui.plugins.PluginListener;
 import com.android.systemui.shared.recents.IOverviewProxy;
@@ -492,6 +492,12 @@ public class TouchInteractionService extends Service implements PluginListener<O
                     newGestureState,
                     InputConsumer.NO_OP, mInputMonitorCompat,
                     mOverviewComponentObserver.assistantGestureIsConstrained());
+            } else if (mDeviceState.canTriggerOneHandedAction(event)
+                    && !mDeviceState.isOneHandedModeActive()) {
+                // Consume gesture event for triggering one handed feature.
+                mUncheckedConsumer = new OneHandedModeInputConsumer(this, mDeviceState,
+                        InputConsumer.NO_OP, mInputMonitorCompat);
+                newGestureState = DEFAULT_STATE;
             } else {
                 newGestureState = DEFAULT_STATE;
                 mUncheckedConsumer = InputConsumer.NO_OP;
@@ -596,6 +602,11 @@ public class TouchInteractionService extends Service implements PluginListener<O
                 base = new ScreenPinnedInputConsumer(this, newGestureState);
             }
 
+            if (mDeviceState.canTriggerOneHandedAction(event)) {
+                base = new OneHandedModeInputConsumer(this, mDeviceState, base,
+                        mInputMonitorCompat);
+            }
+
             if (mDeviceState.isAccessibilityMenuAvailable()) {
                 base = new AccessibilityInputConsumer(this, mDeviceState, base,
                         mInputMonitorCompat);
@@ -604,6 +615,11 @@ public class TouchInteractionService extends Service implements PluginListener<O
             if (mDeviceState.isScreenPinningActive()) {
                 base = mResetGestureInputConsumer;
             }
+
+            if (mDeviceState.canTriggerOneHandedAction(event)) {
+                base = new OneHandedModeInputConsumer(this, mDeviceState, base,
+                        mInputMonitorCompat);
+            }
         }
         return base;
     }
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
new file mode 100644
index 0000000000..fced849a4d
--- /dev/null
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.quickstep.inputconsumers;
+
+import static android.view.MotionEvent.ACTION_CANCEL;
+import static android.view.MotionEvent.ACTION_DOWN;
+import static android.view.MotionEvent.ACTION_MOVE;
+import static android.view.MotionEvent.ACTION_UP;
+
+import static com.android.launcher3.Utilities.squaredHypot;
+
+import android.content.Context;
+import android.graphics.PointF;
+import android.view.MotionEvent;
+
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+import com.android.quickstep.InputConsumer;
+import com.android.quickstep.RecentsAnimationDeviceState;
+import com.android.quickstep.SystemUiProxy;
+import com.android.systemui.shared.system.InputMonitorCompat;
+
+/**
+ * Touch consumer for handling gesture event to launch one handed
+ * One handed gestural in quickstep only active on NO_BUTTON, TWO_BUTTONS, and portrait mode
+ */
+public class OneHandedModeInputConsumer extends DelegateInputConsumer {
+
+    private static final String TAG = "OneHandedModeInputConsumer";
+    private static final int ANGLE_MAX = 150;
+    private static final int ANGLE_MIN = 30;
+
+    private final Context mContext;
+    private final RecentsAnimationDeviceState mDeviceState;
+
+    private final float mDragDistThreshold;
+    private final float mSquaredSlop;
+
+    private final PointF mDownPos = new PointF();
+    private final PointF mLastPos = new PointF();
+    private final PointF mStartDragPos = new PointF();
+
+    private boolean mPassedSlop;
+
+    public OneHandedModeInputConsumer(Context context, RecentsAnimationDeviceState deviceState,
+            InputConsumer delegate, InputMonitorCompat inputMonitor) {
+        super(delegate, inputMonitor);
+        mContext = context;
+        mDeviceState = deviceState;
+        mDragDistThreshold = context.getResources().getDimensionPixelSize(
+                R.dimen.gestures_onehanded_drag_threshold);
+        mSquaredSlop = Utilities.squaredTouchSlop(context);
+    }
+
+    @Override
+    public int getType() {
+        return TYPE_ONE_HANDED | mDelegate.getType();
+    }
+
+    @Override
+    public void onMotionEvent(MotionEvent ev) {
+        switch (ev.getActionMasked()) {
+            case ACTION_DOWN: {
+                mDownPos.set(ev.getX(), ev.getY());
+                mLastPos.set(mDownPos);
+                break;
+            }
+            case ACTION_MOVE: {
+                if (mState == STATE_DELEGATE_ACTIVE) {
+                    break;
+                }
+                if (!mDelegate.allowInterceptByParent()) {
+                    mState = STATE_DELEGATE_ACTIVE;
+                    break;
+                }
+
+                mLastPos.set(ev.getX(), ev.getY());
+                if (!mPassedSlop) {
+                    if (squaredHypot(mLastPos.x - mDownPos.x, mLastPos.y - mDownPos.y)
+                            > mSquaredSlop) {
+                        mStartDragPos.set(mLastPos.x, mLastPos.y);
+                        if ((!mDeviceState.isOneHandedModeActive() && isValidStartAngle(
+                                mDownPos.x - mLastPos.x, mDownPos.y - mLastPos.y))
+                                || (mDeviceState.isOneHandedModeActive() && isValidExitAngle(
+                                mDownPos.x - mLastPos.x, mDownPos.y - mLastPos.y))) {
+                            mPassedSlop = true;
+                            setActive(ev);
+                        } else {
+                            mState = STATE_DELEGATE_ACTIVE;
+                        }
+                    }
+                } else {
+                    float distance = (float) Math.hypot(mLastPos.x - mStartDragPos.x,
+                            mLastPos.y - mStartDragPos.y);
+                    if (distance > mDragDistThreshold && mPassedSlop
+                            && mDeviceState.isOneHandedModeActive()) {
+                        SystemUiProxy.INSTANCE.get(mContext).stopOneHandedMode();
+                    }
+                }
+                break;
+            }
+            case ACTION_UP:
+            case ACTION_CANCEL: {
+                if (mLastPos.y >= mStartDragPos.y && mPassedSlop
+                        && !mDeviceState.isOneHandedModeActive()) {
+                    SystemUiProxy.INSTANCE.get(mContext).startOneHandedMode();
+                }
+
+                mPassedSlop = false;
+                mState = STATE_INACTIVE;
+                break;
+            }
+        }
+
+        if (mState != STATE_ACTIVE) {
+            mDelegate.onMotionEvent(ev);
+        }
+    }
+
+    private boolean isValidStartAngle(float deltaX, float deltaY) {
+        final float angle = (float) Math.toDegrees(Math.atan2(deltaY, deltaX));
+        return angle > -(ANGLE_MAX) && angle < -(ANGLE_MIN);
+    }
+
+    private boolean isValidExitAngle(float deltaX, float deltaY) {
+        final float angle = (float) Math.toDegrees(Math.atan2(deltaY, deltaX));
+        return angle > ANGLE_MIN && angle < ANGLE_MAX;
+    }
+}
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 9d703167d9..6737c5f61d 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -76,6 +76,10 @@
     <dimen name="gestures_assistant_drag_threshold">55dp</dimen>
     <dimen name="gestures_assistant_fling_threshold">55dp</dimen>
 
+    <!-- One-Handed Mode -->
+    <!-- Threshold for draging distance to enable one-handed mode -->
+    <dimen name="gestures_onehanded_drag_threshold">20dp</dimen>
+
     <!-- Distance to move elements when swiping up to go home from launcher -->
     <dimen name="home_pullback_distance">28dp</dimen>
 
diff --git a/quickstep/src/com/android/quickstep/InputConsumer.java b/quickstep/src/com/android/quickstep/InputConsumer.java
index a4861dce01..0eed3e322d 100644
--- a/quickstep/src/com/android/quickstep/InputConsumer.java
+++ b/quickstep/src/com/android/quickstep/InputConsumer.java
@@ -34,6 +34,7 @@ public interface InputConsumer {
     int TYPE_OVERVIEW_WITHOUT_FOCUS = 1 << 7;
     int TYPE_RESET_GESTURE = 1 << 8;
     int TYPE_OVERSCROLL = 1 << 9;
+    int TYPE_ONE_HANDED = 1 << 10;
 
     String[] NAMES = new String[] {
            "TYPE_NO_OP",                    // 0
@@ -46,6 +47,7 @@ public interface InputConsumer {
             "TYPE_OVERVIEW_WITHOUT_FOCUS",  // 7
             "TYPE_RESET_GESTURE",           // 8
             "TYPE_OVERSCROLL",              // 9
+            "TYPE_ONE_HANDED",              // 10
     };
 
     InputConsumer NO_OP = () -> TYPE_NO_OP;
diff --git a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
index 4cf7aab4ab..6b94a79000 100644
--- a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
+++ b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
@@ -37,7 +37,6 @@ import android.view.Surface;
 import com.android.launcher3.R;
 import com.android.launcher3.ResourceUtils;
 import com.android.launcher3.util.DefaultDisplay;
-import com.android.quickstep.util.RecentsOrientedState.SurfaceRotation;
 
 import java.io.PrintWriter;
 
@@ -63,6 +62,7 @@ class OrientationTouchTransformer {
     private SparseArray<OrientationRectF> mSwipeTouchRegions = new SparseArray<>(MAX_ORIENTATIONS);
     private final RectF mAssistantLeftRegion = new RectF();
     private final RectF mAssistantRightRegion = new RectF();
+    private final RectF mOneHandedModeRegion = new RectF();
     private int mCurrentDisplayRotation;
     private boolean mEnableMultipleRegions;
     private Resources mResources;
@@ -185,10 +185,10 @@ class OrientationTouchTransformer {
 
         Point size = display.realSize;
         int rotation = display.rotation;
+        int touchHeight = getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE);
         OrientationRectF orientationRectF =
                 new OrientationRectF(0, 0, size.x, size.y, rotation);
         if (mMode == SysUINavigationMode.Mode.NO_BUTTON) {
-            int touchHeight = getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE);
             orientationRectF.top = orientationRectF.bottom - touchHeight;
 
             final int assistantWidth = mResources
@@ -217,10 +217,11 @@ class OrientationTouchTransformer {
                             + getNavbarSize(ResourceUtils.NAVBAR_LANDSCAPE_LEFT_RIGHT_SIZE);
                     break;
                 default:
-                    orientationRectF.top = orientationRectF.bottom
-                            - getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE);
+                    orientationRectF.top = orientationRectF.bottom - touchHeight;
             }
         }
+        // One handed gestural only active on portrait mode
+        mOneHandedModeRegion.set(0, orientationRectF.bottom - touchHeight, size.x, size.y);
 
         return orientationRectF;
     }
@@ -231,6 +232,10 @@ class OrientationTouchTransformer {
 
     }
 
+    boolean touchInOneHandedModeRegion(MotionEvent ev) {
+        return mOneHandedModeRegion.contains(ev.getX(), ev.getY());
+    }
+
     private int getNavbarSize(String resName) {
         return ResourceUtils.getNavbarSize(resName, mResources);
     }
@@ -313,6 +318,7 @@ class OrientationTouchTransformer {
             regions.append(rectF.mRotation).append(" ");
         }
         pw.println(regions.toString());
+        pw.println("  mOneHandedModeRegion=" + mOneHandedModeRegion);
     }
 
     private class OrientationRectF extends RectF {
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index a892ddcccd..c32abcf0d8 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -29,6 +29,7 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_B
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_HOME_DISABLED;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NAV_BAR_HIDDEN;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_ONE_HANDED_ACTIVE;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING;
@@ -43,16 +44,19 @@ import android.content.IntentFilter;
 import android.content.res.Resources;
 import android.graphics.Region;
 import android.os.Process;
+import android.os.SystemProperties;
 import android.os.UserManager;
 import android.text.TextUtils;
-import android.util.Log;
+import android.util.DisplayMetrics;
 import android.view.MotionEvent;
+import android.view.Surface;
 
 import androidx.annotation.BinderThread;
 
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.util.DefaultDisplay;
+import com.android.launcher3.util.SecureSettingsObserver;
 import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;
 import com.android.quickstep.util.NavBarPosition;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
@@ -73,6 +77,8 @@ public class RecentsAnimationDeviceState implements
         NavigationModeChangeListener,
         DefaultDisplay.DisplayInfoChangeListener {
 
+    private static boolean sIsOneHandedEnabled;
+
     private final Context mContext;
     private final SysUINavigationMode mSysUiNavMode;
     private final DefaultDisplay mDefaultDisplay;
@@ -84,6 +90,7 @@ public class RecentsAnimationDeviceState implements
     private @SystemUiStateFlags int mSystemUiStateFlags;
     private SysUINavigationMode.Mode mMode = THREE_BUTTONS;
     private NavBarPosition mNavBarPosition;
+    private SecureSettingsObserver mOneHandedEnabledObserver;
 
     private final Region mDeferredGestureRegion = new Region();
     private boolean mAssistantAvailable;
@@ -169,6 +176,13 @@ public class RecentsAnimationDeviceState implements
                         ComponentName.unflattenFromString(blockingActivity));
             }
         }
+
+        if (SystemProperties.getBoolean("ro.support_one_handed_mode", false)) {
+            mOneHandedEnabledObserver = SecureSettingsObserver.newOneHandedSettingsObserver(
+                    mContext, this::onOneHandedEnabledSettingsChanged);
+            mOneHandedEnabledObserver.register();
+            mOneHandedEnabledObserver.dispatchOnChange();
+        }
     }
 
     private void setupOrientationSwipeHandler() {
@@ -436,6 +450,13 @@ public class RecentsAnimationDeviceState implements
                 event.getY(pointerIndex));
     }
 
+    /**
+     * @return whether screen pinning is enabled and active
+     */
+    public boolean isOneHandedModeActive() {
+        return (mSystemUiStateFlags & SYSUI_STATE_ONE_HANDED_ACTIVE) != 0;
+    }
+
     /**
      * Sets the region in screen space where the gestures should be deferred (ie. due to specific
      * nav bar ui).
@@ -496,6 +517,28 @@ public class RecentsAnimationDeviceState implements
                 && !isLockToAppActive();
     }
 
+    /**
+     * One handed gestural in quickstep only active on NO_BUTTON, TWO_BUTTONS, and portrait mode
+     *
+     * @param ev The touch screen motion event.
+     * @return whether the given motion event can trigger the one handed mode.
+     */
+    public boolean canTriggerOneHandedAction(MotionEvent ev) {
+        if (!sIsOneHandedEnabled) {
+            return false;
+        }
+
+        final DefaultDisplay.Info displayInfo = mDefaultDisplay.getInfo();
+        return (mOrientationTouchTransformer.touchInOneHandedModeRegion(ev)
+                && displayInfo.rotation != Surface.ROTATION_90
+                && displayInfo.rotation != Surface.ROTATION_270
+                && displayInfo.metrics.densityDpi < DisplayMetrics.DENSITY_600);
+    }
+
+    private void onOneHandedEnabledSettingsChanged(boolean isOneHandedEnabled) {
+        sIsOneHandedEnabled = isOneHandedEnabled;
+    }
+
     /**
      * *May* apply a transform on the motion event if it lies in the nav bar region for another
      * orientation that is currently being tracked as a part of quickstep
diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index 20d133c3c6..a3eabc966c 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -344,4 +344,26 @@ public class SystemUiProxy implements ISystemUiProxy {
             }
         }
     }
+
+    @Override
+    public void startOneHandedMode() {
+        if (mSystemUiProxy != null) {
+            try {
+                mSystemUiProxy.startOneHandedMode();
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call startOneHandedMode", e);
+            }
+        }
+    }
+
+    @Override
+    public void stopOneHandedMode() {
+        if (mSystemUiProxy != null) {
+            try {
+                mSystemUiProxy.stopOneHandedMode();
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call stopOneHandedMode", e);
+            }
+        }
+    }
 }
diff --git a/src/com/android/launcher3/util/SecureSettingsObserver.java b/src/com/android/launcher3/util/SecureSettingsObserver.java
index 48aa02b799..08a8e6d255 100644
--- a/src/com/android/launcher3/util/SecureSettingsObserver.java
+++ b/src/com/android/launcher3/util/SecureSettingsObserver.java
@@ -29,6 +29,8 @@ public class SecureSettingsObserver extends ContentObserver {
 
     /** Hidden field Settings.Secure.NOTIFICATION_BADGING */
     public static final String NOTIFICATION_BADGING = "notification_badging";
+    /** Hidden field Settings.Secure.ONE_HANDED_MODE_ENABLED */
+    public static final String ONE_HANDED_ENABLED = "one_handed_mode_enabled";
 
     private final ContentResolver mResolver;
     private final String mKeySetting;
@@ -79,4 +81,10 @@ public class SecureSettingsObserver extends ContentObserver {
         return new SecureSettingsObserver(
                 context.getContentResolver(), listener, NOTIFICATION_BADGING, 1);
     }
+
+    public static SecureSettingsObserver newOneHandedSettingsObserver(Context context,
+            OnChangeListener listener) {
+        return new SecureSettingsObserver(
+                context.getContentResolver(), listener, ONE_HANDED_ENABLED, 1);
+    }
 }
-- 
GitLab


From 5ca2980e54c2b1f50f5cb4262e79c30a9f180864 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Tue, 2 Jun 2020 18:21:18 -0400
Subject: [PATCH 0008/1664] Merging from ub-launcher3-rvc-dev @ build 6552182

Bug:150504032
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-rvc-dev_rvc-dev_6552182.html

Change-Id: I795aafd151c6ce53077e1aebb97567eedd84f274
---
 protos/launcher_atom.proto                    |   6 +
 .../hybridhotseat/HotseatEduController.java   |  73 +---
 .../HotseatPredictionController.java          |   4 +-
 .../uioverrides/QuickstepLauncher.java        |  15 +
 .../QuickstepAtomicAnimationFactory.java      |   3 +-
 .../NavBarToHomeTouchController.java          |   3 +-
 .../android/quickstep/BaseSwipeUpHandler.java | 322 +---------------
 .../quickstep/BaseSwipeUpHandlerV2.java       |   9 +-
 .../quickstep/FallbackActivityInterface.java  |   2 +-
 .../quickstep/LauncherActivityInterface.java  |  16 +-
 .../QuickstepTestInformationHandler.java      |   5 +-
 .../quickstep/SwipeUpAnimationLogic.java      | 350 ++++++++++++++++++
 .../quickstep/TouchInteractionService.java    |  13 +-
 .../FallbackNavBarTouchController.java        |  12 +-
 .../OtherActivityInputConsumer.java           |   5 +
 .../OverviewWithoutFocusInputConsumer.java    |  12 +-
 .../SysUiOverlayInputConsumer.java            |  86 +++++
 .../quickstep/util/TaskViewSimulator.java     |  21 +-
 .../util/TriggerSwipeUpTouchTracker.java      |  14 +-
 .../quickstep/views/OverviewActionsView.java  |   2 -
 .../android/quickstep/views/RecentsView.java  |   5 +
 .../res/layout/gesture_tutorial_fragment.xml  |   7 +
 quickstep/res/values/strings.xml              |   6 -
 .../statehandlers/DepthController.java        |  21 +-
 .../quickstep/BaseActivityInterface.java      |   2 +-
 .../com/android/quickstep/InputConsumer.java  |  11 +-
 .../OrientationTouchTransformer.java          |  27 +-
 .../android/quickstep/RecentTasksList.java    |  83 +++--
 .../quickstep/RecentsAnimationController.java |  31 +-
 .../RecentsAnimationDeviceState.java          | 100 ++++-
 .../BackGestureTutorialController.java        |   8 +-
 .../HomeGestureTutorialController.java        | 227 +++++++++++-
 .../interaction/NavBarGestureHandler.java     |  46 ++-
 .../interaction/TutorialController.java       |   5 +
 .../interaction/TutorialFragment.java         |   5 -
 .../logging/StatsLogCompatManager.java        |  19 +-
 .../quickstep/util/RecentsOrientedState.java  |   6 +-
 .../quickstep/RecentTasksListTest.java        |   8 +-
 res/values/colors.xml                         |   1 +
 .../launcher3/BaseDraggingActivity.java       |  14 +-
 src/com/android/launcher3/DeviceProfile.java  |  16 +-
 .../launcher3/InvariantDeviceProfile.java     |   2 +-
 .../android/launcher3/LauncherSettings.java   |   3 +-
 .../allapps/AllAppsTransitionController.java  |   6 +-
 .../android/launcher3/anim/Interpolators.java |   5 +
 src/com/android/launcher3/folder/Folder.java  |   1 +
 .../launcher3/logging/StatsLogManager.java    |  34 +-
 .../launcher3/model/data/ItemInfo.java        |   6 +
 .../popup/PopupContainerWithArrow.java        |   6 +-
 .../launcher3/popup/PopupPopulator.java       |   3 +
 .../launcher3/popup/SystemShortcut.java       |   9 +-
 .../touch/WorkspaceTouchListener.java         |   7 +-
 .../launcher3/util/DefaultDisplay.java        |   9 +-
 .../launcher3/views/BaseDragLayer.java        |   5 +
 .../launcher3/views/FloatingIconView.java     |  10 +
 .../android/launcher3/views/ListenerView.java |  25 +-
 .../launcher3/views/OptionsPopupView.java     |  35 +-
 .../uioverrides/PreviewSurfaceRenderer.java   |  27 --
 58 files changed, 1192 insertions(+), 622 deletions(-)
 create mode 100644 quickstep/recents_ui_overrides/src/com/android/quickstep/SwipeUpAnimationLogic.java
 create mode 100644 quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/SysUiOverlayInputConsumer.java
 delete mode 100644 src_ui_overrides/com/android/launcher3/uioverrides/PreviewSurfaceRenderer.java

diff --git a/protos/launcher_atom.proto b/protos/launcher_atom.proto
index 5f5fab0f8c..d552daff43 100644
--- a/protos/launcher_atom.proto
+++ b/protos/launcher_atom.proto
@@ -51,6 +51,7 @@ message ContainerInfo {
     WidgetsContainer widgets_container = 5;
     PredictionContainer prediction_container = 6;
     SearchResultContainer search_result_container = 7;
+    ShortcutsContainer shortcuts_container = 8;
   }
 }
 
@@ -69,6 +70,11 @@ message PredictionContainer {
 message SearchResultContainer {
 }
 
+// Container for package specific shortcuts to deep links and notifications.
+// Typically shown as popup window by longpressing on an icon.
+message ShortcutsContainer {
+}
+
 enum Origin {
   UNKNOWN = 0;
   DEFAULT_LAYOUT = 1;       // icon automatically placed in workspace, folder, hotseat
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduController.java
index e4d0adf0c0..7c4f3ecd01 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduController.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduController.java
@@ -15,17 +15,9 @@
  */
 package com.android.launcher3.hybridhotseat;
 
-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
 import android.content.Intent;
-import android.content.res.Configuration;
-import android.os.Build;
 import android.view.View;
 
-import androidx.core.app.NotificationCompat;
-
 import com.android.launcher3.CellLayout;
 import com.android.launcher3.Hotseat;
 import com.android.launcher3.InvariantDeviceProfile;
@@ -37,11 +29,8 @@ import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
-import com.android.launcher3.uioverrides.QuickstepLauncher;
-import com.android.launcher3.util.ActivityTracker;
 import com.android.launcher3.util.GridOccupancy;
 import com.android.launcher3.util.IntArray;
-import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.ArrowTipView;
 import com.android.launcher3.views.Snackbar;
 
@@ -54,18 +43,15 @@ import java.util.stream.IntStream;
  * Controller class for managing user onboaridng flow for hybrid hotseat
  */
 public class HotseatEduController {
-    public static final String KEY_HOTSEAT_EDU_SEEN = "hotseat_edu_seen";
-
-    private static final String NOTIFICATION_CHANNEL_ID = "launcher_onboarding";
-    private static final int ONBOARDING_NOTIFICATION_ID = 7641;
 
+    public static final String KEY_HOTSEAT_EDU_SEEN = "hotseat_edu_seen";
+    public static final String HOTSEAT_EDU_ACTION =
+            "com.android.launcher3.action.SHOW_HYBRID_HOTSEAT_EDU";
     private static final String SETTINGS_ACTION =
             "android.settings.ACTION_CONTENT_SUGGESTIONS_SETTINGS";
 
     private final Launcher mLauncher;
     private final Hotseat mHotseat;
-    private final NotificationManager mNotificationManager;
-    private final Notification mNotification;
     private List<WorkspaceItemInfo> mPredictedApps;
     private HotseatEduDialog mActiveDialog;
 
@@ -77,9 +63,6 @@ public class HotseatEduController {
         mLauncher = launcher;
         mHotseat = launcher.getHotseat();
         mOnOnboardingComplete = runnable;
-        mNotificationManager = mLauncher.getSystemService(NotificationManager.class);
-        createNotificationChannel();
-        mNotification = createNotification();
     }
 
     /**
@@ -216,11 +199,6 @@ public class HotseatEduController {
         return pageId;
     }
 
-
-    void removeNotification() {
-        mNotificationManager.cancel(ONBOARDING_NOTIFICATION_ID);
-    }
-
     void moveHotseatItems() {
         mHotseat.removeAllViewsInLayout();
         if (!mNewItems.isEmpty()) {
@@ -258,45 +236,9 @@ public class HotseatEduController {
 
     void setPredictedApps(List<WorkspaceItemInfo> predictedApps) {
         mPredictedApps = predictedApps;
-        if (!mPredictedApps.isEmpty()
-                && mLauncher.getOrientation() == Configuration.ORIENTATION_PORTRAIT) {
-            mNotificationManager.notify(ONBOARDING_NOTIFICATION_ID, mNotification);
-        }
-        else {
-            removeNotification();
-        }
-    }
-
-    private void createNotificationChannel() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return;
-        CharSequence name = mLauncher.getString(R.string.hotseat_edu_prompt_title);
-        int importance = NotificationManager.IMPORTANCE_LOW;
-        NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, name,
-                importance);
-        mNotificationManager.createNotificationChannel(channel);
-    }
-
-    private Notification createNotification() {
-        Intent intent = new Intent(mLauncher.getApplicationContext(), mLauncher.getClass());
-        intent = new NotificationHandler().addToIntent(intent);
-
-        CharSequence name = mLauncher.getString(R.string.hotseat_edu_prompt_title);
-        String description = mLauncher.getString(R.string.hotseat_edu_prompt_content);
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(mLauncher,
-                NOTIFICATION_CHANNEL_ID)
-                .setContentTitle(name)
-                .setOngoing(true)
-                .setColor(Themes.getColorAccent(mLauncher))
-                .setContentIntent(PendingIntent.getActivity(mLauncher, 0, intent,
-                        PendingIntent.FLAG_CANCEL_CURRENT))
-                .setSmallIcon(R.drawable.hotseat_edu_notification_icon)
-                .setContentText(description);
-        return builder.build();
-
     }
 
     void destroy() {
-        removeNotification();
         if (mActiveDialog != null) {
             mActiveDialog.setHotseatEduController(null);
         }
@@ -334,14 +276,5 @@ public class HotseatEduController {
         mActiveDialog.setHotseatEduController(this);
         mActiveDialog.show(mPredictedApps);
     }
-
-    static class NotificationHandler implements
-            ActivityTracker.SchedulerCallback<QuickstepLauncher> {
-        @Override
-        public boolean init(QuickstepLauncher activity, boolean alreadyOnHome) {
-            activity.getHotseatPredictionController().showEdu();
-            return true;
-        }
-    }
 }
 
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
index e2acf9358d..05bcb57adc 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
@@ -41,7 +41,6 @@ import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherSettings;
-import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.allapps.AllAppsStore;
@@ -148,8 +147,7 @@ public class HotseatPredictionController implements DragController.DragListener,
      */
     public void showEdu() {
         if (mHotseatEduController == null) return;
-        mLauncher.getStateManager().goToState(LauncherState.NORMAL, true,
-                () -> mHotseatEduController.showEdu());
+        mHotseatEduController.showEdu();
     }
 
     @Override
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 1dc5be6141..39e0f88c40 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -44,6 +44,7 @@ import com.android.launcher3.allapps.DiscoveryBounce;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.folder.Folder;
+import com.android.launcher3.hybridhotseat.HotseatEduController;
 import com.android.launcher3.hybridhotseat.HotseatPredictionController;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
@@ -98,6 +99,20 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
         }
     }
 
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        if (HotseatEduController.HOTSEAT_EDU_ACTION.equals(intent.getAction())
+                && mHotseatPredictionController != null) {
+            boolean alreadyOnHome = hasWindowFocus() && ((intent.getFlags()
+                    & Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT)
+                    != Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT);
+            getStateManager().goToState(NORMAL, alreadyOnHome, () -> {
+                mHotseatPredictionController.showEdu();
+            });
+        }
+    }
+
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
index 94c7771513..a487869316 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
@@ -29,6 +29,7 @@ import static com.android.launcher3.anim.Interpolators.DEACCEL;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_1_7;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
 import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
+import static com.android.launcher3.anim.Interpolators.FINAL_FRAME;
 import static com.android.launcher3.anim.Interpolators.INSTANT;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
@@ -188,7 +189,7 @@ public class QuickstepAtomicAnimationFactory extends
             }
         } else if (toState == NORMAL && fromState == OVERVIEW_PEEK) {
             // Keep fully visible until the very end (when overview is offscreen) to make invisible.
-            config.setInterpolator(ANIM_OVERVIEW_FADE, t -> t < 1 ? 0 : 1);
+            config.setInterpolator(ANIM_OVERVIEW_FADE, FINAL_FRAME);
         } else if (toState == OVERVIEW_PEEK && fromState == NORMAL) {
             config.setInterpolator(ANIM_OVERVIEW_FADE, INSTANT);
             config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, OVERSHOOT_1_7);
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
index bf0690c77d..39bbfb93bc 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
@@ -116,8 +116,7 @@ public class NavBarToHomeTouchController implements TouchController,
             if (TestProtocol.sDebugTracing) {
                 Log.d(TestProtocol.PAUSE_NOT_DETECTED,
                         "NavBarToHomeTouchController.canInterceptTouch true 2 "
-                                + AbstractFloatingView.getTopOpenView(mLauncher).getClass()
-                                .getSimpleName());
+                                + AbstractFloatingView.getTopOpenView(mLauncher), new Exception());
             }
             return true;
         }
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java
index 5b396dd547..737d837ac7 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java
@@ -15,57 +15,38 @@
  */
 package com.android.quickstep;
 
-import static com.android.launcher3.anim.Interpolators.ACCEL_1_5;
-import static com.android.launcher3.anim.Interpolators.DEACCEL;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;
-import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION;
 
-import android.animation.Animator;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Matrix;
-import android.graphics.Matrix.ScaleToFit;
 import android.graphics.PointF;
 import android.graphics.Rect;
-import android.graphics.RectF;
 import android.os.Build;
 import android.util.Log;
 import android.view.MotionEvent;
-import android.view.animation.Interpolator;
 
 import androidx.annotation.CallSuper;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile;
-import com.android.launcher3.Utilities;
-import com.android.launcher3.anim.AnimationSuccessListener;
-import com.android.launcher3.anim.AnimatorPlaybackController;
-import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.testing.TestProtocol;
-import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.util.VibratorWrapper;
-import com.android.launcher3.views.FloatingIconView;
+import com.android.launcher3.util.WindowBounds;
 import com.android.quickstep.RecentsAnimationCallbacks.RecentsAnimationListener;
 import com.android.quickstep.util.ActiveGestureLog;
 import com.android.quickstep.util.ActivityInitListener;
-import com.android.quickstep.util.RectFSpringAnim;
-import com.android.quickstep.util.TaskViewSimulator;
 import com.android.quickstep.util.TransformParams;
-import com.android.quickstep.util.TransformParams.BuilderProxy;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
 import com.android.systemui.shared.recents.model.ThumbnailData;
 import com.android.systemui.shared.system.InputConsumerController;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat;
-import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams.Builder;
 
 import java.util.ArrayList;
 import java.util.function.Consumer;
@@ -75,40 +56,13 @@ import java.util.function.Consumer;
  */
 @TargetApi(Build.VERSION_CODES.Q)
 public abstract class BaseSwipeUpHandler<T extends StatefulActivity<?>, Q extends RecentsView>
-        implements RecentsAnimationListener {
+        extends SwipeUpAnimationLogic implements RecentsAnimationListener {
 
     private static final String TAG = "BaseSwipeUpHandler";
-    protected static final Rect TEMP_RECT = new Rect();
-
-    public static final float MIN_PROGRESS_FOR_OVERVIEW = 0.7f;
-    private static final Interpolator PULLBACK_INTERPOLATOR = DEACCEL;
-
-    // The distance needed to drag to reach the task size in recents.
-    protected int mTransitionDragLength;
-    // How much further we can drag past recents, as a factor of mTransitionDragLength.
-    protected float mDragLengthFactor = 1;
-    // Start resisting when swiping past this factor of mTransitionDragLength.
-    private float mDragLengthFactorStartPullback = 1f;
-    // This is how far down we can scale down, where 0f is full screen and 1f is recents.
-    private float mDragLengthFactorMaxPullback = 1f;
-
-    protected final Context mContext;
-    protected final RecentsAnimationDeviceState mDeviceState;
-    protected final GestureState mGestureState;
+
     protected final BaseActivityInterface<?, T> mActivityInterface;
     protected final InputConsumerController mInputConsumer;
 
-    protected final TaskViewSimulator mTaskViewSimulator;
-    private AnimatorPlaybackController mWindowTransitionController;
-
-    protected final TransformParams mTransformParams = new TransformParams();
-
-    // Shift in the range of [0, 1].
-    // 0 => preview snapShot is completely visible, and hotseat is completely translated down
-    // 1 => preview snapShot is completely aligned with the recents view and hotseat is completely
-    // visible.
-    protected final AnimatedFloat mCurrentShift = new AnimatedFloat(this::updateFinalShift);
-
     protected final ActivityInitListener mActivityInitListener;
 
     protected RecentsAnimationController mRecentsAnimationController;
@@ -119,7 +73,6 @@ public abstract class BaseSwipeUpHandler<T extends StatefulActivity<?>, Q extend
 
     protected T mActivity;
     protected Q mRecentsView;
-    protected DeviceProfile mDp;
 
     protected Runnable mGestureEndCallback;
 
@@ -131,13 +84,10 @@ public abstract class BaseSwipeUpHandler<T extends StatefulActivity<?>, Q extend
 
     protected BaseSwipeUpHandler(Context context, RecentsAnimationDeviceState deviceState,
             GestureState gestureState, InputConsumerController inputConsumer) {
-        mContext = context;
-        mDeviceState = deviceState;
-        mGestureState = gestureState;
+        super(context, deviceState, gestureState, new TransformParams());
         mActivityInterface = gestureState.getActivityInterface();
         mActivityInitListener = mActivityInterface.createActivityInitListener(this::onActivityInit);
         mInputConsumer = inputConsumer;
-        mTaskViewSimulator = new TaskViewSimulator(context, gestureState.getActivityInterface());
     }
 
     /**
@@ -157,28 +107,6 @@ public abstract class BaseSwipeUpHandler<T extends StatefulActivity<?>, Q extend
         return mRecentsView != null ? mRecentsView.getEventDispatcher(navbarRotation) : null;
     }
 
-    @UiThread
-    public void updateDisplacement(float displacement) {
-        // We are moving in the negative x/y direction
-        displacement = -displacement;
-        float shift;
-        if (displacement > mTransitionDragLength * mDragLengthFactor && mTransitionDragLength > 0) {
-            shift = mDragLengthFactor;
-        } else {
-            float translation = Math.max(displacement, 0);
-            shift = mTransitionDragLength == 0 ? 0 : translation / mTransitionDragLength;
-            if (shift > mDragLengthFactorStartPullback) {
-                float pullbackProgress = Utilities.getProgress(shift,
-                        mDragLengthFactorStartPullback, mDragLengthFactor);
-                pullbackProgress = PULLBACK_INTERPOLATOR.getInterpolation(pullbackProgress);
-                shift = mDragLengthFactorStartPullback + pullbackProgress
-                        * (mDragLengthFactorMaxPullback - mDragLengthFactorStartPullback);
-            }
-        }
-
-        mCurrentShift.updateValue(shift);
-    }
-
     public void setGestureEndCallback(Runnable gestureEndCallback) {
         mGestureEndCallback = gestureEndCallback;
     }
@@ -275,6 +203,7 @@ public abstract class BaseSwipeUpHandler<T extends StatefulActivity<?>, Q extend
             RecentsAnimationTargets targets) {
         mRecentsAnimationController = recentsAnimationController;
         mRecentsAnimationTargets = targets;
+        mTransformParams.setTargetSet(mRecentsAnimationTargets);
         DeviceProfile dp = InvariantDeviceProfile.INSTANCE.get(mContext).getDeviceProfile(mContext);
         RemoteAnimationTargetCompat runningTaskTarget = targets.findTask(
                 mGestureState.getRunningTaskId());
@@ -282,7 +211,8 @@ public abstract class BaseSwipeUpHandler<T extends StatefulActivity<?>, Q extend
         if (targets.minimizedHomeBounds != null && runningTaskTarget != null) {
             Rect overviewStackBounds = mActivityInterface
                     .getOverviewWindowBounds(targets.minimizedHomeBounds, runningTaskTarget);
-            dp = dp.getMultiWindowProfile(mContext, overviewStackBounds);
+            dp = dp.getMultiWindowProfile(mContext,
+                    new WindowBounds(overviewStackBounds, targets.homeContentInsets));
         } else {
             // If we are not in multi-window mode, home insets should be same as system insets.
             dp = dp.copy(mContext);
@@ -355,35 +285,6 @@ public abstract class BaseSwipeUpHandler<T extends StatefulActivity<?>, Q extend
         return mGestureState.getLastStartedTaskId() != -1;
     }
 
-    protected void initTransitionEndpoints(DeviceProfile dp) {
-        mDp = dp;
-
-        mTaskViewSimulator.setDp(dp);
-        mTaskViewSimulator.setLayoutRotation(
-                mDeviceState.getCurrentActiveRotation(),
-                mDeviceState.getDisplayRotation());
-        mTransitionDragLength = mActivityInterface.getSwipeUpDestinationAndLength(
-                dp, mContext, TEMP_RECT,
-                mTaskViewSimulator.getOrientationState().getOrientationHandler());
-
-        if (mDeviceState.isFullyGesturalNavMode()) {
-            // We can drag all the way to the top of the screen.
-            mDragLengthFactor = (float) dp.heightPx / mTransitionDragLength;
-
-            float startScale = mTaskViewSimulator.getFullScreenScale();
-            // Start pulling back when RecentsView scale is 0.75f, and let it go down to 0.5f.
-            mDragLengthFactorStartPullback = (0.75f - startScale) / (1 - startScale);
-            mDragLengthFactorMaxPullback = (0.5f - startScale) / (1 - startScale);
-        } else {
-            mDragLengthFactor = 1;
-            mDragLengthFactorStartPullback = mDragLengthFactorMaxPullback = 1;
-        }
-
-        PendingAnimation pa = new PendingAnimation(mTransitionDragLength * 2);
-        mTaskViewSimulator.addAppToOverviewAnim(pa, t -> t * mDragLengthFactor);
-        mWindowTransitionController = pa.createPlaybackController();
-    }
-
     /**
      * Return true if the window should be translated horizontally if the recents view scrolls
      */
@@ -455,7 +356,6 @@ public abstract class BaseSwipeUpHandler<T extends StatefulActivity<?>, Q extend
         if (mWindowTransitionController != null) {
             float progress = mCurrentShift.value / mDragLengthFactor;
             mWindowTransitionController.setPlayFraction(progress);
-            mTransformParams.setTargetSet(mRecentsAnimationTargets);
 
             if (mRecentsViewScrollLinked) {
                 mTaskViewSimulator.setScroll(mRecentsView.getScrollOffset());
@@ -464,217 +364,9 @@ public abstract class BaseSwipeUpHandler<T extends StatefulActivity<?>, Q extend
         }
     }
 
-    protected PagedOrientationHandler getOrientationHandler() {
-        return mTaskViewSimulator.getOrientationState().getOrientationHandler();
-    }
-
-    /**
-     * Creates an animation that transforms the current app window into the home app.
-     * @param startProgress The progress of {@link #mCurrentShift} to start the window from.
-     * @param homeAnimationFactory The home animation factory.
-     */
-    protected RectFSpringAnim createWindowAnimationToHome(float startProgress,
-            HomeAnimationFactory homeAnimationFactory) {
-        final RectF targetRect = homeAnimationFactory.getWindowTargetRect();
-        final FloatingIconView fiv = homeAnimationFactory.mIconView;
-        final boolean isFloatingIconView = fiv != null;
-
-        mWindowTransitionController.setPlayFraction(startProgress / mDragLengthFactor);
-        mTaskViewSimulator.apply(mTransformParams
-                .setProgress(startProgress)
-                .setTargetSet(mRecentsAnimationTargets));
-        RectF cropRectF = new RectF(mTaskViewSimulator.getCurrentCropRect());
-
-        // Matrix to map a rect in Launcher space to window space
-        Matrix homeToWindowPositionMap = new Matrix();
-        mTaskViewSimulator.applyWindowToHomeRotation(homeToWindowPositionMap);
-
-        final RectF startRect = new RectF(cropRectF);
-        mTaskViewSimulator.getCurrentMatrix().mapRect(startRect);
-        // Move the startRect to Launcher space as floatingIconView runs in Launcher
-        Matrix windowToHomePositionMap = new Matrix();
-        homeToWindowPositionMap.invert(windowToHomePositionMap);
-        windowToHomePositionMap.mapRect(startRect);
-
-        RectFSpringAnim anim = new RectFSpringAnim(startRect, targetRect, mContext);
-        if (isFloatingIconView) {
-            anim.addAnimatorListener(fiv);
-            fiv.setOnTargetChangeListener(anim::onTargetPositionChanged);
-            fiv.setFastFinishRunnable(anim::end);
-        }
-
-        SpringAnimationRunner runner = new SpringAnimationRunner(
-                homeAnimationFactory, cropRectF, homeToWindowPositionMap);
-        anim.addOnUpdateListener(runner);
-        anim.addAnimatorListener(runner);
-        return anim;
-    }
-
     public interface Factory {
 
         BaseSwipeUpHandler newHandler(
                 GestureState gestureState, long touchTimeMs, boolean continuingLastGesture);
     }
-
-    protected interface RunningWindowAnim {
-        void end();
-
-        void cancel();
-
-        static RunningWindowAnim wrap(Animator animator) {
-            return new RunningWindowAnim() {
-                @Override
-                public void end() {
-                    animator.end();
-                }
-
-                @Override
-                public void cancel() {
-                    animator.cancel();
-                }
-            };
-        }
-
-        static RunningWindowAnim wrap(RectFSpringAnim rectFSpringAnim) {
-            return new RunningWindowAnim() {
-                @Override
-                public void end() {
-                    rectFSpringAnim.end();
-                }
-
-                @Override
-                public void cancel() {
-                    rectFSpringAnim.cancel();
-                }
-            };
-        }
-    }
-
-    /**
-     * @param progress The progress of the animation to the home screen.
-     * @return The current alpha to set on the animating app window.
-     */
-    protected float getWindowAlpha(float progress) {
-        // Alpha interpolates between [1, 0] between progress values [start, end]
-        final float start = 0f;
-        final float end = 0.85f;
-
-        if (progress <= start) {
-            return 1f;
-        }
-        if (progress >= end) {
-            return 0f;
-        }
-        return Utilities.mapToRange(progress, start, end, 1, 0, ACCEL_1_5);
-    }
-
-    protected abstract class HomeAnimationFactory {
-
-        private FloatingIconView mIconView;
-
-        public HomeAnimationFactory(@Nullable FloatingIconView iconView) {
-            mIconView = iconView;
-        }
-
-        public @NonNull RectF getWindowTargetRect() {
-            PagedOrientationHandler orientationHandler = getOrientationHandler();
-            DeviceProfile dp = mDp;
-            final int halfIconSize = dp.iconSizePx / 2;
-            float primaryDimension = orientationHandler
-                    .getPrimaryValue(dp.availableWidthPx, dp.availableHeightPx);
-            float secondaryDimension = orientationHandler
-                    .getSecondaryValue(dp.availableWidthPx, dp.availableHeightPx);
-            final float targetX =  primaryDimension / 2f;
-            final float targetY = secondaryDimension - dp.hotseatBarSizePx;
-            // Fallback to animate to center of screen.
-            return new RectF(targetX - halfIconSize, targetY - halfIconSize,
-                    targetX + halfIconSize, targetY + halfIconSize);
-        }
-
-        public abstract @NonNull AnimatorPlaybackController createActivityAnimationToHome();
-
-        public void playAtomicAnimation(float velocity) {
-            // No-op
-        }
-    }
-
-    private class SpringAnimationRunner extends AnimationSuccessListener
-            implements RectFSpringAnim.OnUpdateListener, BuilderProxy {
-
-        final Rect mCropRect = new Rect();
-        final Matrix mMatrix = new Matrix();
-
-        final RectF mWindowCurrentRect = new RectF();
-        final Matrix mHomeToWindowPositionMap;
-
-        final FloatingIconView mFIV;
-        final AnimatorPlaybackController mHomeAnim;
-        final RectF mCropRectF;
-
-        final float mStartRadius;
-        final float mEndRadius;
-        final float mWindowAlphaThreshold;
-
-        SpringAnimationRunner(HomeAnimationFactory factory, RectF cropRectF,
-                Matrix homeToWindowPositionMap) {
-            mHomeAnim = factory.createActivityAnimationToHome();
-            mCropRectF = cropRectF;
-            mHomeToWindowPositionMap = homeToWindowPositionMap;
-
-            cropRectF.roundOut(mCropRect);
-            mFIV = factory.mIconView;
-
-            // End on a "round-enough" radius so that the shape reveal doesn't have to do too much
-            // rounding at the end of the animation.
-            mStartRadius = mTaskViewSimulator.getCurrentCornerRadius();
-            mEndRadius = cropRectF.width() / 2f;
-
-            // We want the window alpha to be 0 once this threshold is met, so that the
-            // FolderIconView can be seen morphing into the icon shape.
-            mWindowAlphaThreshold = mFIV != null ? 1f - SHAPE_PROGRESS_DURATION : 1f;
-        }
-
-        @Override
-        public void onUpdate(RectF currentRect, float progress) {
-            mHomeAnim.setPlayFraction(progress);
-            mHomeToWindowPositionMap.mapRect(mWindowCurrentRect, currentRect);
-
-            mMatrix.setRectToRect(mCropRectF, mWindowCurrentRect, ScaleToFit.FILL);
-            float cornerRadius = Utilities.mapRange(progress, mStartRadius, mEndRadius);
-            mTransformParams
-                    .setTargetAlpha(getWindowAlpha(progress))
-                    .setCornerRadius(cornerRadius);
-
-            mTransformParams.applySurfaceParams(mTransformParams.createSurfaceParams(this));
-            if (mFIV != null) {
-                mFIV.update(currentRect, 1f, progress,
-                        mWindowAlphaThreshold, mMatrix.mapRadius(cornerRadius), false);
-            }
-        }
-
-        @Override
-        public void onBuildTargetParams(
-                Builder builder, RemoteAnimationTargetCompat app, TransformParams params) {
-            builder.withMatrix(mMatrix)
-                    .withWindowCrop(mCropRect)
-                    .withCornerRadius(params.getCornerRadius());
-        }
-
-        @Override
-        public void onCancel() {
-            if (mFIV != null) {
-                mFIV.fastFinish();
-            }
-        }
-
-        @Override
-        public void onAnimationStart(Animator animation) {
-            mHomeAnim.dispatchOnStart();
-        }
-
-        @Override
-        public void onAnimationSuccess(Animator animator) {
-            mHomeAnim.getAnimationPlayer().end();
-        }
-    }
 }
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java
index 46799ff272..92e10b14f9 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java
@@ -29,6 +29,7 @@ import static com.android.quickstep.GestureState.GestureEndTarget.LAST_TASK;
 import static com.android.quickstep.GestureState.GestureEndTarget.NEW_TASK;
 import static com.android.quickstep.GestureState.GestureEndTarget.RECENTS;
 import static com.android.quickstep.GestureState.STATE_END_TARGET_ANIMATION_FINISHED;
+import static com.android.quickstep.GestureState.STATE_END_TARGET_SET;
 import static com.android.quickstep.GestureState.STATE_RECENTS_SCROLLING_FINISHED;
 import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;
 import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
@@ -253,6 +254,10 @@ public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q exte
         mStateCallback.runOnceAtState(STATE_HANDLER_INVALIDATED | STATE_RESUME_LAST_TASK,
                 this::notifyTransitionCancelled);
 
+        mGestureState.runOnceAtState(STATE_END_TARGET_SET,
+                () -> mDeviceState.onEndTargetCalculated(mGestureState.getEndTarget(),
+                        mActivityInterface));
+
         if (!ENABLE_QUICKSTEP_LIVE_TILE.get()) {
             mStateCallback.addChangeListener(STATE_APP_CONTROLLER_RECEIVED | STATE_LAUNCHER_PRESENT
                             | STATE_SCREENSHOT_VIEW_SHOWN | STATE_CAPTURE_SCREENSHOT,
@@ -1035,7 +1040,7 @@ public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q exte
                 }
                 // Make sure recents is in its final state
                 maybeUpdateRecentsAttachedState(false);
-                mActivityInterface.onSwipeUpToHomeComplete();
+                mActivityInterface.onSwipeUpToHomeComplete(mDeviceState);
             }
         });
         return anim;
@@ -1232,7 +1237,6 @@ public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q exte
         }
         ActiveGestureLog.INSTANCE.addLog("finishRecentsAnimation", true);
         doLogGesture(HOME);
-        mDeviceState.enableMultipleRegions(false);
     }
 
     protected abstract void finishRecentsControllerToHome(Runnable callback);
@@ -1248,7 +1252,6 @@ public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q exte
 
         SystemUiProxy.INSTANCE.get(mContext).onOverviewShown(false, TAG);
         doLogGesture(RECENTS);
-        mDeviceState.onSwipeUpToOverview(mActivityInterface);
         reset();
     }
 
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityInterface.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityInterface.java
index c9ff88409a..70be3ab8af 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityInterface.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityInterface.java
@@ -69,7 +69,7 @@ public final class FallbackActivityInterface extends
 
     /** 4 */
     @Override
-    public void onSwipeUpToHomeComplete() {
+    public void onSwipeUpToHomeComplete(RecentsAnimationDeviceState deviceState) {
         onSwipeUpToRecentsComplete();
     }
 
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java
index 13b84e036e..62eb235251 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java
@@ -96,7 +96,7 @@ public final class LauncherActivityInterface extends
     }
 
     @Override
-    public void onSwipeUpToHomeComplete() {
+    public void onSwipeUpToHomeComplete(RecentsAnimationDeviceState deviceState) {
         Launcher launcher = getCreatedActivity();
         if (launcher == null) {
             return;
@@ -105,6 +105,7 @@ public final class LauncherActivityInterface extends
         // recents, we assume the first task is invisible, making translation off by one task.
         launcher.getStateManager().reapplyState();
         launcher.getRootView().setForceHideBackArrow(false);
+        notifyRecentsOfOrientation(deviceState);
     }
 
     @Override
@@ -235,17 +236,20 @@ public final class LauncherActivityInterface extends
                         // Are we going from Recents to Workspace?
                         if (toState == LauncherState.NORMAL) {
                             exitRunnable.run();
-
-                            // reset layout on swipe to home
-                            RecentsView recentsView = getCreatedActivity().getOverviewPanel();
-                            recentsView.setLayoutRotation(deviceState.getCurrentActiveRotation(),
-                                    deviceState.getDisplayRotation());
+                            notifyRecentsOfOrientation(deviceState);
                             stateManager.removeStateListener(this);
                         }
                     }
                 });
     }
 
+    private void notifyRecentsOfOrientation(RecentsAnimationDeviceState deviceState) {
+        // reset layout on swipe to home
+        RecentsView recentsView = getCreatedActivity().getOverviewPanel();
+        recentsView.setLayoutRotation(deviceState.getCurrentActiveRotation(),
+                deviceState.getDisplayRotation());
+    }
+
     @Override
     public Rect getOverviewWindowBounds(Rect homeBounds, RemoteAnimationTargetCompat target) {
         return homeBounds;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/QuickstepTestInformationHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/QuickstepTestInformationHandler.java
index 0d49b2b500..a28dabc6a3 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/QuickstepTestInformationHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/QuickstepTestInformationHandler.java
@@ -79,12 +79,13 @@ public class QuickstepTestInformationHandler extends TestInformationHandler {
 
     @Override
     protected Activity getCurrentActivity() {
-        OverviewComponentObserver observer = new OverviewComponentObserver(mContext,
-                new RecentsAnimationDeviceState(mContext));
+        RecentsAnimationDeviceState rads = new RecentsAnimationDeviceState(mContext);
+        OverviewComponentObserver observer = new OverviewComponentObserver(mContext, rads);
         try {
             return observer.getActivityInterface().getCreatedActivity();
         } finally {
             observer.onDestroy();
+            rads.destroy();
         }
     }
 
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/SwipeUpAnimationLogic.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/SwipeUpAnimationLogic.java
new file mode 100644
index 0000000000..b17730ba6d
--- /dev/null
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/SwipeUpAnimationLogic.java
@@ -0,0 +1,350 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.quickstep;
+
+import static com.android.launcher3.anim.Interpolators.ACCEL_1_5;
+import static com.android.launcher3.anim.Interpolators.DEACCEL;
+import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION;
+
+import android.animation.Animator;
+import android.content.Context;
+import android.graphics.Matrix;
+import android.graphics.Matrix.ScaleToFit;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.view.animation.Interpolator;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
+
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.anim.AnimationSuccessListener;
+import com.android.launcher3.anim.AnimatorPlaybackController;
+import com.android.launcher3.anim.PendingAnimation;
+import com.android.launcher3.touch.PagedOrientationHandler;
+import com.android.launcher3.views.FloatingIconView;
+import com.android.quickstep.util.RectFSpringAnim;
+import com.android.quickstep.util.TaskViewSimulator;
+import com.android.quickstep.util.TransformParams;
+import com.android.quickstep.util.TransformParams.BuilderProxy;
+import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
+import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams.Builder;
+
+public abstract class SwipeUpAnimationLogic {
+
+    protected static final Rect TEMP_RECT = new Rect();
+    private static final Interpolator PULLBACK_INTERPOLATOR = DEACCEL;
+
+    protected DeviceProfile mDp;
+
+    protected final Context mContext;
+    protected final RecentsAnimationDeviceState mDeviceState;
+    protected final GestureState mGestureState;
+    protected final TaskViewSimulator mTaskViewSimulator;
+
+    protected final TransformParams mTransformParams;
+
+    // Shift in the range of [0, 1].
+    // 0 => preview snapShot is completely visible, and hotseat is completely translated down
+    // 1 => preview snapShot is completely aligned with the recents view and hotseat is completely
+    // visible.
+    protected final AnimatedFloat mCurrentShift = new AnimatedFloat(this::updateFinalShift);
+
+    // The distance needed to drag to reach the task size in recents.
+    protected int mTransitionDragLength;
+    // How much further we can drag past recents, as a factor of mTransitionDragLength.
+    protected float mDragLengthFactor = 1;
+    // Start resisting when swiping past this factor of mTransitionDragLength.
+    private float mDragLengthFactorStartPullback = 1f;
+    // This is how far down we can scale down, where 0f is full screen and 1f is recents.
+    private float mDragLengthFactorMaxPullback = 1f;
+
+    protected AnimatorPlaybackController mWindowTransitionController;
+
+    public SwipeUpAnimationLogic(Context context, RecentsAnimationDeviceState deviceState,
+            GestureState gestureState, TransformParams transformParams) {
+        mContext = context;
+        mDeviceState = deviceState;
+        mGestureState = gestureState;
+        mTaskViewSimulator = new TaskViewSimulator(context, gestureState.getActivityInterface());
+        mTransformParams = transformParams;
+    }
+
+    protected void initTransitionEndpoints(DeviceProfile dp) {
+        mDp = dp;
+
+        mTaskViewSimulator.setDp(dp);
+        mTaskViewSimulator.setLayoutRotation(
+                mDeviceState.getCurrentActiveRotation(),
+                mDeviceState.getDisplayRotation());
+        mTransitionDragLength = mGestureState.getActivityInterface().getSwipeUpDestinationAndLength(
+                dp, mContext, TEMP_RECT,
+                mTaskViewSimulator.getOrientationState().getOrientationHandler());
+
+        if (mDeviceState.isFullyGesturalNavMode()) {
+            // We can drag all the way to the top of the screen.
+            mDragLengthFactor = (float) dp.heightPx / mTransitionDragLength;
+
+            float startScale = mTaskViewSimulator.getFullScreenScale();
+            // Start pulling back when RecentsView scale is 0.75f, and let it go down to 0.5f.
+            mDragLengthFactorStartPullback = (0.75f - startScale) / (1 - startScale);
+            mDragLengthFactorMaxPullback = (0.5f - startScale) / (1 - startScale);
+        } else {
+            mDragLengthFactor = 1;
+            mDragLengthFactorStartPullback = mDragLengthFactorMaxPullback = 1;
+        }
+
+        PendingAnimation pa = new PendingAnimation(mTransitionDragLength * 2);
+        mTaskViewSimulator.addAppToOverviewAnim(pa, t -> t * mDragLengthFactor);
+        mWindowTransitionController = pa.createPlaybackController();
+    }
+
+    @UiThread
+    public void updateDisplacement(float displacement) {
+        // We are moving in the negative x/y direction
+        displacement = -displacement;
+        float shift;
+        if (displacement > mTransitionDragLength * mDragLengthFactor && mTransitionDragLength > 0) {
+            shift = mDragLengthFactor;
+        } else {
+            float translation = Math.max(displacement, 0);
+            shift = mTransitionDragLength == 0 ? 0 : translation / mTransitionDragLength;
+            if (shift > mDragLengthFactorStartPullback) {
+                float pullbackProgress = Utilities.getProgress(shift,
+                        mDragLengthFactorStartPullback, mDragLengthFactor);
+                pullbackProgress = PULLBACK_INTERPOLATOR.getInterpolation(pullbackProgress);
+                shift = mDragLengthFactorStartPullback + pullbackProgress
+                        * (mDragLengthFactorMaxPullback - mDragLengthFactorStartPullback);
+            }
+        }
+
+        mCurrentShift.updateValue(shift);
+    }
+
+    /**
+     * Called when the value of {@link #mCurrentShift} changes
+     */
+    @UiThread
+    public abstract void updateFinalShift();
+
+    protected PagedOrientationHandler getOrientationHandler() {
+        return mTaskViewSimulator.getOrientationState().getOrientationHandler();
+    }
+
+    protected abstract class HomeAnimationFactory {
+
+        public FloatingIconView mIconView;
+
+        public HomeAnimationFactory(@Nullable FloatingIconView iconView) {
+            mIconView = iconView;
+        }
+
+        public @NonNull RectF getWindowTargetRect() {
+            PagedOrientationHandler orientationHandler = getOrientationHandler();
+            DeviceProfile dp = mDp;
+            final int halfIconSize = dp.iconSizePx / 2;
+            float primaryDimension = orientationHandler
+                    .getPrimaryValue(dp.availableWidthPx, dp.availableHeightPx);
+            float secondaryDimension = orientationHandler
+                    .getSecondaryValue(dp.availableWidthPx, dp.availableHeightPx);
+            final float targetX =  primaryDimension / 2f;
+            final float targetY = secondaryDimension - dp.hotseatBarSizePx;
+            // Fallback to animate to center of screen.
+            return new RectF(targetX - halfIconSize, targetY - halfIconSize,
+                    targetX + halfIconSize, targetY + halfIconSize);
+        }
+
+        public abstract @NonNull AnimatorPlaybackController createActivityAnimationToHome();
+
+        public void playAtomicAnimation(float velocity) {
+            // No-op
+        }
+    }
+
+    /**
+     * Creates an animation that transforms the current app window into the home app.
+     * @param startProgress The progress of {@link #mCurrentShift} to start the window from.
+     * @param homeAnimationFactory The home animation factory.
+     */
+    protected RectFSpringAnim createWindowAnimationToHome(float startProgress,
+            HomeAnimationFactory homeAnimationFactory) {
+        final RectF targetRect = homeAnimationFactory.getWindowTargetRect();
+        final FloatingIconView fiv = homeAnimationFactory.mIconView;
+        final boolean isFloatingIconView = fiv != null;
+
+        mWindowTransitionController.setPlayFraction(startProgress / mDragLengthFactor);
+        mTaskViewSimulator.apply(mTransformParams.setProgress(startProgress));
+        RectF cropRectF = new RectF(mTaskViewSimulator.getCurrentCropRect());
+
+        // Matrix to map a rect in Launcher space to window space
+        Matrix homeToWindowPositionMap = new Matrix();
+        mTaskViewSimulator.applyWindowToHomeRotation(homeToWindowPositionMap);
+
+        final RectF startRect = new RectF(cropRectF);
+        mTaskViewSimulator.getCurrentMatrix().mapRect(startRect);
+        // Move the startRect to Launcher space as floatingIconView runs in Launcher
+        Matrix windowToHomePositionMap = new Matrix();
+        homeToWindowPositionMap.invert(windowToHomePositionMap);
+        windowToHomePositionMap.mapRect(startRect);
+
+        RectFSpringAnim anim = new RectFSpringAnim(startRect, targetRect, mContext);
+        if (isFloatingIconView) {
+            anim.addAnimatorListener(fiv);
+            fiv.setOnTargetChangeListener(anim::onTargetPositionChanged);
+            fiv.setFastFinishRunnable(anim::end);
+        }
+
+        SpringAnimationRunner runner = new SpringAnimationRunner(
+                homeAnimationFactory, cropRectF, homeToWindowPositionMap);
+        anim.addOnUpdateListener(runner);
+        anim.addAnimatorListener(runner);
+        return anim;
+    }
+
+    /**
+     * @param progress The progress of the animation to the home screen.
+     * @return The current alpha to set on the animating app window.
+     */
+    protected float getWindowAlpha(float progress) {
+        // Alpha interpolates between [1, 0] between progress values [start, end]
+        final float start = 0f;
+        final float end = 0.85f;
+
+        if (progress <= start) {
+            return 1f;
+        }
+        if (progress >= end) {
+            return 0f;
+        }
+        return Utilities.mapToRange(progress, start, end, 1, 0, ACCEL_1_5);
+    }
+
+    protected class SpringAnimationRunner extends AnimationSuccessListener
+            implements RectFSpringAnim.OnUpdateListener, BuilderProxy {
+
+        final Rect mCropRect = new Rect();
+        final Matrix mMatrix = new Matrix();
+
+        final RectF mWindowCurrentRect = new RectF();
+        final Matrix mHomeToWindowPositionMap;
+
+        final FloatingIconView mFIV;
+        final AnimatorPlaybackController mHomeAnim;
+        final RectF mCropRectF;
+
+        final float mStartRadius;
+        final float mEndRadius;
+        final float mWindowAlphaThreshold;
+
+        SpringAnimationRunner(HomeAnimationFactory factory, RectF cropRectF,
+                Matrix homeToWindowPositionMap) {
+            mHomeAnim = factory.createActivityAnimationToHome();
+            mCropRectF = cropRectF;
+            mHomeToWindowPositionMap = homeToWindowPositionMap;
+
+            cropRectF.roundOut(mCropRect);
+            mFIV = factory.mIconView;
+
+            // End on a "round-enough" radius so that the shape reveal doesn't have to do too much
+            // rounding at the end of the animation.
+            mStartRadius = mTaskViewSimulator.getCurrentCornerRadius();
+            mEndRadius = cropRectF.width() / 2f;
+
+            // We want the window alpha to be 0 once this threshold is met, so that the
+            // FolderIconView can be seen morphing into the icon shape.
+            mWindowAlphaThreshold = mFIV != null ? 1f - SHAPE_PROGRESS_DURATION : 1f;
+        }
+
+        @Override
+        public void onUpdate(RectF currentRect, float progress) {
+            mHomeAnim.setPlayFraction(progress);
+            mHomeToWindowPositionMap.mapRect(mWindowCurrentRect, currentRect);
+
+            mMatrix.setRectToRect(mCropRectF, mWindowCurrentRect, ScaleToFit.FILL);
+            float cornerRadius = Utilities.mapRange(progress, mStartRadius, mEndRadius);
+            mTransformParams
+                    .setTargetAlpha(getWindowAlpha(progress))
+                    .setCornerRadius(cornerRadius);
+
+            mTransformParams.applySurfaceParams(mTransformParams.createSurfaceParams(this));
+            if (mFIV != null) {
+                mFIV.update(currentRect, 1f, progress,
+                        mWindowAlphaThreshold, mMatrix.mapRadius(cornerRadius), false);
+            }
+        }
+
+        @Override
+        public void onBuildTargetParams(
+                Builder builder, RemoteAnimationTargetCompat app, TransformParams params) {
+            builder.withMatrix(mMatrix)
+                    .withWindowCrop(mCropRect)
+                    .withCornerRadius(params.getCornerRadius());
+        }
+
+        @Override
+        public void onCancel() {
+            if (mFIV != null) {
+                mFIV.fastFinish();
+            }
+        }
+
+        @Override
+        public void onAnimationStart(Animator animation) {
+            mHomeAnim.dispatchOnStart();
+        }
+
+        @Override
+        public void onAnimationSuccess(Animator animator) {
+            mHomeAnim.getAnimationPlayer().end();
+        }
+    }
+
+    public interface RunningWindowAnim {
+        void end();
+
+        void cancel();
+
+        static RunningWindowAnim wrap(Animator animator) {
+            return new RunningWindowAnim() {
+                @Override
+                public void end() {
+                    animator.end();
+                }
+
+                @Override
+                public void cancel() {
+                    animator.cancel();
+                }
+            };
+        }
+
+        static RunningWindowAnim wrap(RectFSpringAnim rectFSpringAnim) {
+            return new RunningWindowAnim() {
+                @Override
+                public void end() {
+                    rectFSpringAnim.end();
+                }
+
+                @Override
+                public void cancel() {
+                    rectFSpringAnim.cancel();
+                }
+            };
+        }
+    }
+}
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
index c4d4ab850a..c8619bdd12 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
@@ -82,6 +82,7 @@ import com.android.quickstep.inputconsumers.OverviewInputConsumer;
 import com.android.quickstep.inputconsumers.OverviewWithoutFocusInputConsumer;
 import com.android.quickstep.inputconsumers.ResetGestureInputConsumer;
 import com.android.quickstep.inputconsumers.ScreenPinnedInputConsumer;
+import com.android.quickstep.inputconsumers.SysUiOverlayInputConsumer;
 import com.android.quickstep.util.ActiveGestureLog;
 import com.android.quickstep.util.AssistantUtilities;
 import com.android.quickstep.util.ProtoTracer;
@@ -595,6 +596,13 @@ public class TouchInteractionService extends Service implements PluginListener<O
                 }
             }
 
+            // If Bubbles is expanded, use the overlay input consumer, which will close Bubbles
+            // instead of going all the way home when a swipe up is detected.
+            if (mDeviceState.isBubblesExpanded()) {
+                base = new SysUiOverlayInputConsumer(
+                        getBaseContext(), mDeviceState, mInputMonitorCompat);
+            }
+
             if (mDeviceState.isScreenPinningActive()) {
                 // Note: we only allow accessibility to wrap this, and it replaces the previous
                 // base input consumer (which should be NO_OP anyway since topTaskLocked == true).
@@ -630,7 +638,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
         if (!isFixedRotationTransformEnabled()) {
             return;
         }
-        mDeviceState.enableMultipleRegions(baseInputConsumer instanceof OtherActivityInputConsumer);
+        baseInputConsumer.notifyOrientationSetup();
     }
 
     private InputConsumer newBaseConsumer(GestureState previousGestureState,
@@ -742,12 +750,13 @@ public class TouchInteractionService extends Service implements PluginListener<O
         if (!mDeviceState.isUserUnlocked()) {
             return;
         }
+
         if (mDeviceState.isButtonNavMode() && !mOverviewComponentObserver.isHomeAndOverviewSame()) {
             // Prevent the overview from being started before the real home on first boot.
             return;
         }
 
-        if (RestoreDbTask.isPending(this)) {
+        if (RestoreDbTask.isPending(this) || !mDeviceState.isUserSetupComplete()) {
             // Preloading while a restore is pending may cause launcher to start the restore
             // too early.
             return;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackNavBarTouchController.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackNavBarTouchController.java
index 6f919c10c8..be3fddecf0 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackNavBarTouchController.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackNavBarTouchController.java
@@ -15,6 +15,7 @@
  */
 package com.android.quickstep.fallback;
 
+import android.graphics.PointF;
 import android.view.MotionEvent;
 
 import androidx.annotation.Nullable;
@@ -30,7 +31,8 @@ import com.android.quickstep.util.TriggerSwipeUpTouchTracker;
 /**
  * In 0-button mode, intercepts swipe up from the nav bar on FallbackRecentsView to go home.
  */
-public class FallbackNavBarTouchController implements TouchController {
+public class FallbackNavBarTouchController implements TouchController,
+        TriggerSwipeUpTouchTracker.OnSwipeUpListener {
 
     private final RecentsActivity mActivity;
     @Nullable
@@ -44,7 +46,7 @@ public class FallbackNavBarTouchController implements TouchController {
                     DefaultDisplay.INSTANCE.get(mActivity).getInfo());
             mTriggerSwipeUpTracker = new TriggerSwipeUpTouchTracker(mActivity,
                     true /* disableHorizontalSwipe */, navBarPosition,
-                    null /* onInterceptTouch */, this::onSwipeUp);
+                    null /* onInterceptTouch */, this);
         } else {
             mTriggerSwipeUpTracker = null;
         }
@@ -72,7 +74,11 @@ public class FallbackNavBarTouchController implements TouchController {
         return false;
     }
 
-    private void onSwipeUp(boolean wasFling) {
+    @Override
+    public void onSwipeUp(boolean wasFling, PointF finalVelocity) {
         mActivity.<FallbackRecentsView>getOverviewPanel().startHome();
     }
+
+    @Override
+    public void onSwipeUpCancelled() {}
 }
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
index 8b08ea76fe..14215a1f67 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
@@ -403,6 +403,11 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
         TraceHelper.INSTANCE.endSection(traceToken);
     }
 
+    @Override
+    public void notifyOrientationSetup() {
+        mDeviceState.onStartGesture();
+    }
+
     @Override
     public void onConsumerAboutToBeSwitched() {
         Preconditions.assertUIThread();
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java
index ac1c3a8742..4440a04bea 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java
@@ -17,6 +17,7 @@ package com.android.quickstep.inputconsumers;
 
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.PointF;
 import android.view.MotionEvent;
 
 import com.android.launcher3.BaseActivity;
@@ -33,7 +34,8 @@ import com.android.quickstep.util.ActiveGestureLog;
 import com.android.quickstep.util.TriggerSwipeUpTouchTracker;
 import com.android.systemui.shared.system.InputMonitorCompat;
 
-public class OverviewWithoutFocusInputConsumer implements InputConsumer {
+public class OverviewWithoutFocusInputConsumer implements InputConsumer,
+        TriggerSwipeUpTouchTracker.OnSwipeUpListener {
 
     private final Context mContext;
     private final InputMonitorCompat mInputMonitor;
@@ -45,7 +47,7 @@ public class OverviewWithoutFocusInputConsumer implements InputConsumer {
         mContext = context;
         mInputMonitor = inputMonitor;
         mTriggerSwipeUpTracker = new TriggerSwipeUpTouchTracker(context, disableHorizontalSwipe,
-                deviceState.getNavBarPosition(), this::onInterceptTouch, this::onSwipeUp);
+                deviceState.getNavBarPosition(), this::onInterceptTouch, this);
     }
 
     @Override
@@ -70,7 +72,8 @@ public class OverviewWithoutFocusInputConsumer implements InputConsumer {
         }
     }
 
-    private void onSwipeUp(boolean wasFling) {
+    @Override
+    public void onSwipeUp(boolean wasFling, PointF finalVelocity) {
         mContext.startActivity(new Intent(Intent.ACTION_MAIN)
                 .addCategory(Intent.CATEGORY_HOME)
                 .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
@@ -83,4 +86,7 @@ public class OverviewWithoutFocusInputConsumer implements InputConsumer {
                 wasFling ? Touch.FLING : Touch.SWIPE, Direction.UP, containerType, pageIndex);
         activity.getUserEventDispatcher().setPreviousHomeGesture(true);
     }
+
+    @Override
+    public void onSwipeUpCancelled() {}
 }
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/SysUiOverlayInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/SysUiOverlayInputConsumer.java
new file mode 100644
index 0000000000..3f833c0a6d
--- /dev/null
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/SysUiOverlayInputConsumer.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.quickstep.inputconsumers;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.PointF;
+import android.view.MotionEvent;
+
+import com.android.launcher3.testing.TestLogging;
+import com.android.launcher3.testing.TestProtocol;
+import com.android.quickstep.InputConsumer;
+import com.android.quickstep.RecentsAnimationDeviceState;
+import com.android.quickstep.util.TriggerSwipeUpTouchTracker;
+import com.android.systemui.shared.system.InputMonitorCompat;
+
+/**
+ * Input consumer used when a fullscreen System UI overlay is showing (such as the expanded Bubbles
+ * UI).
+ *
+ * This responds to swipes up by sending a closeSystemDialogs broadcast (causing overlays to close)
+ * rather than closing the app behind the overlay and sending the user all the way home.
+ */
+public class SysUiOverlayInputConsumer implements InputConsumer,
+        TriggerSwipeUpTouchTracker.OnSwipeUpListener {
+
+    private final Context mContext;
+    private final InputMonitorCompat mInputMonitor;
+    private final TriggerSwipeUpTouchTracker mTriggerSwipeUpTracker;
+
+    public SysUiOverlayInputConsumer(
+            Context context,
+            RecentsAnimationDeviceState deviceState,
+            InputMonitorCompat inputMonitor) {
+        mContext = context;
+        mInputMonitor = inputMonitor;
+        mTriggerSwipeUpTracker = new TriggerSwipeUpTouchTracker(context, true,
+                deviceState.getNavBarPosition(), this::onInterceptTouch, this);
+    }
+
+    @Override
+    public int getType() {
+        return TYPE_SYSUI_OVERLAY;
+    }
+
+    @Override
+    public boolean allowInterceptByParent() {
+        return !mTriggerSwipeUpTracker.interceptedTouch();
+    }
+
+    @Override
+    public void onMotionEvent(MotionEvent ev) {
+        mTriggerSwipeUpTracker.onMotionEvent(ev);
+    }
+
+    private void onInterceptTouch() {
+        if (mInputMonitor != null) {
+            TestLogging.recordEvent(TestProtocol.SEQUENCE_PILFER, "pilferPointers");
+            mInputMonitor.pilferPointers();
+        }
+    }
+
+    @Override
+    public void onSwipeUp(boolean wasFling, PointF finalVelocity) {
+        // Close system dialogs when a swipe up is detected.
+        mContext.sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));
+    }
+
+    @Override
+    public void onSwipeUpCancelled() {
+
+    }
+}
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java
index 3b08675885..3c9762be6d 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -23,6 +23,7 @@ import static com.android.systemui.shared.system.WindowManagerWrapper.WINDOWING_
 import android.animation.TimeInterpolator;
 import android.content.Context;
 import android.graphics.Matrix;
+import android.graphics.Point;
 import android.graphics.PointF;
 import android.graphics.Rect;
 import android.graphics.RectF;
@@ -74,7 +75,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
     private DeviceProfile mDp;
 
     private final Matrix mMatrix = new Matrix();
-    private RemoteAnimationTargetCompat mRunningTarget;
+    private final Point mRunningTargetWindowPosition = new Point();
 
     // Thumbnail view properties
     private final Rect mThumbnailPosition = new Rect();
@@ -139,13 +140,19 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
      * Sets the targets which the simulator will control
      */
     public void setPreview(RemoteAnimationTargetCompat runningTarget) {
-        mRunningTarget = runningTarget;
+        setPreviewBounds(runningTarget.screenSpaceBounds, runningTarget.contentInsets);
+        mRunningTargetWindowPosition.set(runningTarget.position.x, runningTarget.position.y);
+    }
 
-        mThumbnailData.insets.set(mRunningTarget.contentInsets);
+    /**
+     * Sets the targets which the simulator will control
+     */
+    public void setPreviewBounds(Rect bounds, Rect insets) {
+        mThumbnailData.insets.set(insets);
         // TODO: What is this?
         mThumbnailData.windowingMode = WINDOWING_MODE_FULLSCREEN;
 
-        mThumbnailPosition.set(runningTarget.screenSpaceBounds);
+        mThumbnailPosition.set(bounds);
         mLayoutValid = false;
     }
 
@@ -199,16 +206,14 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
         postDisplayRotation(deltaRotation(
                 mOrientationState.getLauncherRotation(), mOrientationState.getDisplayRotation()),
                 mDp.widthPx, mDp.heightPx, matrix);
-        if (mRunningTarget != null) {
-            matrix.postTranslate(-mRunningTarget.position.x, -mRunningTarget.position.y);
-        }
+        matrix.postTranslate(-mRunningTargetWindowPosition.x, -mRunningTargetWindowPosition.y);
     }
 
     /**
      * Applies the target to the previously set parameters
      */
     public void apply(TransformParams params) {
-        if (mDp == null || mRunningTarget == null) {
+        if (mDp == null || mThumbnailPosition.isEmpty()) {
             return;
         }
         if (!mLayoutValid) {
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TriggerSwipeUpTouchTracker.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TriggerSwipeUpTouchTracker.java
index c71258b87b..29b95589f3 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TriggerSwipeUpTouchTracker.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TriggerSwipeUpTouchTracker.java
@@ -149,8 +149,12 @@ public class TriggerSwipeUpTouchTracker {
             isSwipeUp = squaredHypot(displacementX, displacementY) >= mSquaredTouchSlop;
         }
 
-        if (isSwipeUp && mOnSwipeUp != null) {
-            mOnSwipeUp.onSwipeUp(wasFling);
+        if (mOnSwipeUp != null) {
+            if (isSwipeUp) {
+                mOnSwipeUp.onSwipeUp(wasFling, new PointF(velocityX, velocityY));
+            } else {
+                mOnSwipeUp.onSwipeUpCancelled();
+            }
         }
     }
 
@@ -161,7 +165,11 @@ public class TriggerSwipeUpTouchTracker {
         /**
          * Called on touch up if a swipe up was detected.
          * @param wasFling Whether the swipe was a fling, or just passed touch slop at low velocity.
+         * @param finalVelocity The final velocity of the swipe.
          */
-        void onSwipeUp(boolean wasFling);
+        void onSwipeUp(boolean wasFling, PointF finalVelocity);
+
+        /** Called on touch up if a swipe up was not detected. */
+        void onSwipeUpCancelled();
     }
 }
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/OverviewActionsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/OverviewActionsView.java
index ea33d007f4..83287c463a 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/OverviewActionsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/OverviewActionsView.java
@@ -45,8 +45,6 @@ import java.lang.annotation.RetentionPolicy;
 public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayout
         implements OnClickListener {
 
-    public static final long VISIBILITY_TRANSITION_DURATION_MS = 80;
-
     @IntDef(flag = true, value = {
             HIDDEN_UNSUPPORTED_NAVIGATION,
             HIDDEN_DISABLED_FEATURE,
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
index a506b7eb0c..324aaecf0e 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
@@ -1039,6 +1039,11 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
     }
 
     private void animateRecentsRotationInPlace(int newRotation) {
+        if (mOrientationState.canLauncherRotate()) {
+            // Update the rotation but let system take care of the rotation animation
+            setLayoutRotation(newRotation, mOrientationState.getDisplayRotation());
+            return;
+        }
         AnimatorSet pa = setRecentsChangedOrientation(true);
         pa.addListener(AnimationSuccessListener.forRunnable(() -> {
             setLayoutRotation(newRotation, mOrientationState.getDisplayRotation());
diff --git a/quickstep/res/layout/gesture_tutorial_fragment.xml b/quickstep/res/layout/gesture_tutorial_fragment.xml
index 190290ebb4..74197bef40 100644
--- a/quickstep/res/layout/gesture_tutorial_fragment.xml
+++ b/quickstep/res/layout/gesture_tutorial_fragment.xml
@@ -24,6 +24,13 @@
         android:layout_height="match_parent"
         android:background="@drawable/gesture_tutorial_ripple"/>
 
+    <View
+        android:id="@+id/gesture_tutorial_fake_task_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/gesture_tutorial_fake_task_view_color"
+        android:visibility="invisible" />
+
     <ImageView
         android:id="@+id/gesture_tutorial_fragment_hand_coaching"
         android:layout_width="match_parent"
diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml
index 36769656a6..37d5ca3715 100644
--- a/quickstep/res/values/strings.xml
+++ b/quickstep/res/values/strings.xml
@@ -63,12 +63,6 @@
     <!-- Content description for a close button. [CHAR LIMIT=NONE] -->
     <string  name="gesture_tutorial_close_button_content_description" translatable="false">Close</string>
 
-
-    <!-- Hotseat migration notification title -->
-    <string name="hotseat_edu_prompt_title">Easily access your most-used apps</string>
-    <!-- Hotseat migration notification content -->
-    <string name="hotseat_edu_prompt_content">Pixel predicts apps you\’ll need next, right on your Home screen. Tap to set up.</string>
-
     <!-- Hotseat educational strings for users who don't qualify for migration -->
     <string name="hotseat_edu_title_migrate">Get app suggestions on the bottom row of your Home screen</string>
 
diff --git a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
index 8292a92af6..fcffaedfd8 100644
--- a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
+++ b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
@@ -102,11 +102,30 @@ public class DepthController implements StateHandler<LauncherState> {
      */
     private float mDepth;
 
+    private View.OnAttachStateChangeListener mOnAttachListener;
+
     public DepthController(Launcher l) {
         mLauncher = l;
     }
 
     private void ensureDependencies() {
+        if (mLauncher.getRootView() != null && mOnAttachListener == null) {
+            mOnAttachListener = new View.OnAttachStateChangeListener() {
+                @Override
+                public void onViewAttachedToWindow(View view) {
+                    // To handle the case where window token is invalid during last setDepth call.
+                    IBinder windowToken = mLauncher.getRootView().getWindowToken();
+                    if (windowToken != null) {
+                        mWallpaperManager.setWallpaperZoomOut(windowToken, mDepth);
+                    }
+                }
+
+                @Override
+                public void onViewDetachedFromWindow(View view) {
+                }
+            };
+            mLauncher.getRootView().addOnAttachStateChangeListener(mOnAttachListener);
+        }
         if (mWallpaperManager != null) {
             return;
         }
@@ -184,10 +203,10 @@ public class DepthController implements StateHandler<LauncherState> {
             return;
         }
 
-        mDepth = depthF;
         if (mSurface == null || !mSurface.isValid()) {
             return;
         }
+        mDepth = depthF;
         ensureDependencies();
         IBinder windowToken = mLauncher.getRootView().getWindowToken();
         if (windowToken != null) {
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index 91249250f5..7122647e6f 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -101,7 +101,7 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
         activity.getStateManager().reapplyState();
     }
 
-    public abstract void onSwipeUpToHomeComplete();
+    public abstract void onSwipeUpToHomeComplete(RecentsAnimationDeviceState deviceState);
 
     public abstract void onAssistantVisibilityChanged(float visibility);
 
diff --git a/quickstep/src/com/android/quickstep/InputConsumer.java b/quickstep/src/com/android/quickstep/InputConsumer.java
index 0eed3e322d..67711c0810 100644
--- a/quickstep/src/com/android/quickstep/InputConsumer.java
+++ b/quickstep/src/com/android/quickstep/InputConsumer.java
@@ -34,7 +34,8 @@ public interface InputConsumer {
     int TYPE_OVERVIEW_WITHOUT_FOCUS = 1 << 7;
     int TYPE_RESET_GESTURE = 1 << 8;
     int TYPE_OVERSCROLL = 1 << 9;
-    int TYPE_ONE_HANDED = 1 << 10;
+    int TYPE_SYSUI_OVERLAY = 1 << 10;
+    int TYPE_ONE_HANDED = 1 << 11;
 
     String[] NAMES = new String[] {
            "TYPE_NO_OP",                    // 0
@@ -47,7 +48,8 @@ public interface InputConsumer {
             "TYPE_OVERVIEW_WITHOUT_FOCUS",  // 7
             "TYPE_RESET_GESTURE",           // 8
             "TYPE_OVERSCROLL",              // 9
-            "TYPE_ONE_HANDED",              // 10
+            "TYPE_SYSUI_OVERLAY",           // 10
+            "TYPE_ONE_HANDED",              // 11
     };
 
     InputConsumer NO_OP = () -> TYPE_NO_OP;
@@ -71,6 +73,11 @@ public interface InputConsumer {
         return false;
     }
 
+    /**
+     * Handle and specific setup necessary based on the orientation of the device
+     */
+    default void notifyOrientationSetup() {}
+
     /**
      * Returns the active input consumer is in the hierarchy of this input consumer.
      */
diff --git a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
index 6b94a79000..b59f0118af 100644
--- a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
+++ b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
@@ -67,6 +67,14 @@ class OrientationTouchTransformer {
     private boolean mEnableMultipleRegions;
     private Resources mResources;
     private OrientationRectF mLastRectTouched;
+    /**
+     * The rotation of the last touched nav bar. Derived from {@link #mLastRectTouched}, but has a
+     * longer lifetime than the rect. Note this is different than {@link #mQuickStepStartingRotation}
+     * as it always updates its value on every touch whereas mQuickstepStartingRotation only
+     * updates when device rotation matches touch rotation. Maybe this will be only one necessary
+     * after TODO(b/154580671) is in. TBD.
+     */
+    private int mLastRectRotation;
     private SysUINavigationMode.Mode mMode;
     private QuickStepContractInfo mContractInfo;
 
@@ -143,15 +151,18 @@ class OrientationTouchTransformer {
      * ALSO, you BETTER call this with {@param enableMultipleRegions} set to false once you're done.
      *
      * @param enableMultipleRegions Set to true to start tracking multiple nav bar regions
-     * @param info The current displayInfo
+     * @param info The current displayInfo which will be the start of the quickswitch gesture
      */
     void enableMultipleRegions(boolean enableMultipleRegions, DefaultDisplay.Info info) {
         mEnableMultipleRegions = enableMultipleRegions &&
                 mMode != SysUINavigationMode.Mode.TWO_BUTTONS;
-        if (!enableMultipleRegions) {
+        if (mEnableMultipleRegions) {
+            mQuickStepStartingRotation = info.rotation;
+        } else {
+            mLastRectRotation = 0;
             mQuickStepStartingRotation = QUICKSTEP_ROTATION_UNINITIALIZED;
-            resetSwipeRegions(info);
         }
+        resetSwipeRegions(info);
     }
 
     /**
@@ -248,11 +259,7 @@ class OrientationTouchTransformer {
     }
 
     int getCurrentActiveRotation() {
-        if (mLastRectTouched == null) {
-            return 0;
-        } else {
-            return mLastRectTouched.mRotation;
-        }
+        return mLastRectRotation;
     }
 
     int getQuickStepStartingRotation() {
@@ -291,7 +298,9 @@ class OrientationTouchTransformer {
                     }
                     if (rect.applyTransform(event, false)) {
                         mLastRectTouched = rect;
-                        if (mCurrentDisplayRotation == mLastRectTouched.mRotation) {
+                        mLastRectRotation = rect.mRotation;
+                        if (mEnableMultipleRegions && mCurrentDisplayRotation == mLastRectRotation) {
+                            // TODO(b/154580671) might make this block unnecessary
                             // Start a touch session for the default nav region for the display
                             mQuickStepStartingRotation = mLastRectTouched.mRotation;
                             resetSwipeRegions();
diff --git a/quickstep/src/com/android/quickstep/RecentTasksList.java b/quickstep/src/com/android/quickstep/RecentTasksList.java
index 2d9c56f673..70b4f20c2b 100644
--- a/quickstep/src/com/android/quickstep/RecentTasksList.java
+++ b/quickstep/src/com/android/quickstep/RecentTasksList.java
@@ -40,21 +40,20 @@ import java.util.function.Consumer;
 /**
  * Manages the recent task list from the system, caching it as necessary.
  */
-@TargetApi(Build.VERSION_CODES.P)
+@TargetApi(Build.VERSION_CODES.R)
 public class RecentTasksList extends TaskStackChangeListener {
 
+    private static final TaskLoadResult INVALID_RESULT = new TaskLoadResult(-1, false, 0);
+
     private final KeyguardManagerCompat mKeyguardManager;
     private final LooperExecutor mMainThreadExecutor;
     private final ActivityManagerWrapper mActivityManagerWrapper;
 
     // The list change id, increments as the task list changes in the system
     private int mChangeId;
-    // The last change id when the list was last loaded completely, must be <= the list change id
-    private int mLastLoadedId;
-    // The last change id was loaded with keysOnly  = true
-    private boolean mLastLoadHadKeysOnly;
 
-    ArrayList<Task> mTasks = new ArrayList<>();
+    private TaskLoadResult mResultsBg = INVALID_RESULT;
+    private TaskLoadResult mResultsUi = INVALID_RESULT;
 
     public RecentTasksList(LooperExecutor mainThreadExecutor,
             KeyguardManagerCompat keyguardManager, ActivityManagerWrapper activityManagerWrapper) {
@@ -71,7 +70,7 @@ public class RecentTasksList extends TaskStackChangeListener {
     public void getTaskKeys(int numTasks, Consumer<ArrayList<Task>> callback) {
         // Kick off task loading in the background
         UI_HELPER_EXECUTOR.execute(() -> {
-            ArrayList<Task> tasks = loadTasksInBackground(numTasks, true /* loadKeysOnly */);
+            ArrayList<Task> tasks = loadTasksInBackground(numTasks, -1, true /* loadKeysOnly */);
             mMainThreadExecutor.execute(() -> callback.accept(tasks));
         });
     }
@@ -85,26 +84,30 @@ public class RecentTasksList extends TaskStackChangeListener {
      */
     public synchronized int getTasks(boolean loadKeysOnly, Consumer<ArrayList<Task>> callback) {
         final int requestLoadId = mChangeId;
-        Runnable resultCallback = callback == null
-                ? () -> { }
-                : () -> callback.accept(copyOf(mTasks));
-
-        if (mLastLoadedId == mChangeId && (!mLastLoadHadKeysOnly || loadKeysOnly)) {
+        if (mResultsUi.isValidForRequest(requestLoadId, loadKeysOnly)) {
             // The list is up to date, send the callback on the next frame,
             // so that requestID can be returned first.
-            mMainThreadExecutor.post(resultCallback);
+            if (callback != null) {
+                // Copy synchronously as the changeId might change by next frame
+                ArrayList<Task> result = copyOf(mResultsUi);
+                mMainThreadExecutor.post(() -> callback.accept(result));
+            }
+
             return requestLoadId;
         }
 
         // Kick off task loading in the background
         UI_HELPER_EXECUTOR.execute(() -> {
-            ArrayList<Task> tasks = loadTasksInBackground(Integer.MAX_VALUE, loadKeysOnly);
-
+            if (!mResultsBg.isValidForRequest(requestLoadId, loadKeysOnly)) {
+                mResultsBg = loadTasksInBackground(Integer.MAX_VALUE, requestLoadId, loadKeysOnly);
+            }
+            TaskLoadResult loadResult = mResultsBg;
             mMainThreadExecutor.execute(() -> {
-                mTasks = tasks;
-                mLastLoadedId = requestLoadId;
-                mLastLoadHadKeysOnly = loadKeysOnly;
-                resultCallback.run();
+                mResultsUi = loadResult;
+                if (callback != null) {
+                    ArrayList<Task> result = copyOf(mResultsUi);
+                    callback.accept(result);
+                }
             });
         });
 
@@ -119,8 +122,8 @@ public class RecentTasksList extends TaskStackChangeListener {
     }
 
     @Override
-    public synchronized void onTaskStackChanged() {
-        mChangeId++;
+    public void onTaskStackChanged() {
+        invalidateLoadedTasks();
     }
 
     @Override
@@ -131,22 +134,28 @@ public class RecentTasksList extends TaskStackChangeListener {
         // callback (those are for changes to the active tasks), but the task list is still updated,
         // so we should also invalidate the change id to ensure we load a new list instead of 
         // reusing a stale list.
-        mChangeId++;
+        invalidateLoadedTasks();
     }
 
     @Override
     public void onTaskRemoved(int taskId) {
-        mTasks = loadTasksInBackground(Integer.MAX_VALUE, false);
+        invalidateLoadedTasks();
     }
 
+
     @Override
-    public synchronized void onActivityPinned(String packageName, int userId, int taskId,
-            int stackId) {
-        mChangeId++;
+    public void onActivityPinned(String packageName, int userId, int taskId, int stackId) {
+        invalidateLoadedTasks();
     }
 
     @Override
     public synchronized void onActivityUnpinned() {
+        invalidateLoadedTasks();
+    }
+
+    private synchronized void invalidateLoadedTasks() {
+        UI_HELPER_EXECUTOR.execute(() -> mResultsBg = INVALID_RESULT);
+        mResultsUi = INVALID_RESULT;
         mChangeId++;
     }
 
@@ -154,9 +163,8 @@ public class RecentTasksList extends TaskStackChangeListener {
      * Loads and creates a list of all the recent tasks.
      */
     @VisibleForTesting
-    ArrayList<Task> loadTasksInBackground(int numTasks, boolean loadKeysOnly) {
+    TaskLoadResult loadTasksInBackground(int numTasks, int requestId, boolean loadKeysOnly) {
         int currentUserId = Process.myUserHandle().getIdentifier();
-        ArrayList<Task> allTasks = new ArrayList<>();
         List<ActivityManager.RecentTaskInfo> rawTasks =
                 mActivityManagerWrapper.getRecentTasks(numTasks, currentUserId);
         // The raw tasks are given in most-recent to least-recent order, we need to reverse it
@@ -173,6 +181,7 @@ public class RecentTasksList extends TaskStackChangeListener {
             }
         };
 
+        TaskLoadResult allTasks = new TaskLoadResult(requestId, loadKeysOnly, rawTasks.size());
         for (ActivityManager.RecentTaskInfo rawTask : rawTasks) {
             Task.TaskKey taskKey = new Task.TaskKey(rawTask);
             Task task;
@@ -197,4 +206,22 @@ public class RecentTasksList extends TaskStackChangeListener {
         }
         return newTasks;
     }
+
+    private static class TaskLoadResult extends ArrayList<Task> {
+
+        final int mId;
+
+        // If the result was loaded with keysOnly  = true
+        final boolean mKeysOnly;
+
+        TaskLoadResult(int id, boolean keysOnly, int size) {
+            super(size);
+            mId = id;
+            mKeysOnly = keysOnly;
+        }
+
+        boolean isValidForRequest(int requestId, boolean loadKeysOnly) {
+            return mId == requestId && (!mKeysOnly || loadKeysOnly);
+        }
+    }
 }
\ No newline at end of file
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationController.java b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
index b0a3cd2a1e..4e9aa6135e 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationController.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
@@ -29,7 +29,6 @@ import android.view.KeyEvent;
 import android.view.MotionEvent;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 
 import com.android.launcher3.util.Preconditions;
@@ -58,8 +57,7 @@ public class RecentsAnimationController {
     private boolean mUseLauncherSysBarFlags = false;
     private boolean mSplitScreenMinimized = false;
     private boolean mTouchInProgress;
-    private boolean mFinishPending;
-    private @Nullable Runnable mFinishPendingCallback;
+    private boolean mDisableInputProxyPending;
 
     public RecentsAnimationController(RecentsAnimationControllerCompat controller,
             boolean allowMinimizeSplitScreen,
@@ -138,12 +136,12 @@ public class RecentsAnimationController {
 
     @UiThread
     public void finishAnimationToHome() {
-        finishAndClear(true /* toRecents */, null, false /* sendUserLeaveHint */);
+        finishAndDisableInputProxy(true /* toRecents */, null, false /* sendUserLeaveHint */);
     }
 
     @UiThread
     public void finishAnimationToApp() {
-        finishAndClear(false /* toRecents */, null, false /* sendUserLeaveHint */);
+        finishAndDisableInputProxy(false /* toRecents */, null, false /* sendUserLeaveHint */);
     }
 
     /** See {@link #finish(boolean, Runnable, boolean)} */
@@ -162,19 +160,16 @@ public class RecentsAnimationController {
     @UiThread
     public void finish(boolean toRecents, Runnable onFinishComplete, boolean sendUserLeaveHint) {
         Preconditions.assertUIThread();
-        if (!toRecents) {
-            finishAndClear(false, onFinishComplete, sendUserLeaveHint);
+        if (toRecents && mTouchInProgress) {
+            // Finish the controller as requested, but don't disable input proxy yet.
+            mDisableInputProxyPending = true;
+            finishController(toRecents, onFinishComplete, sendUserLeaveHint);
         } else {
-            if (mTouchInProgress) {
-                mFinishPending = true;
-                mFinishPendingCallback = onFinishComplete;
-            } else {
-                finishAndClear(true, onFinishComplete, sendUserLeaveHint);
-            }
+            finishAndDisableInputProxy(toRecents, onFinishComplete, sendUserLeaveHint);
         }
     }
 
-    private void finishAndClear(boolean toRecents, Runnable onFinishComplete,
+    private void finishAndDisableInputProxy(boolean toRecents, Runnable onFinishComplete,
             boolean sendUserLeaveHint) {
         disableInputProxy();
         finishController(toRecents, onFinishComplete, sendUserLeaveHint);
@@ -262,11 +257,9 @@ public class RecentsAnimationController {
         } else if (action == ACTION_CANCEL || action == ACTION_UP) {
             // Finish any pending actions
             mTouchInProgress = false;
-            if (mFinishPending) {
-                mFinishPending = false;
-                finishAndClear(true /* toRecents */, mFinishPendingCallback,
-                        false /* sendUserLeaveHint */);
-                mFinishPendingCallback = null;
+            if (mDisableInputProxyPending) {
+                mDisableInputProxyPending = false;
+                disableInputProxy();
             }
         }
         if (mInputConsumer != null) {
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index f7c29851af..c83de13618 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -18,6 +18,7 @@ package com.android.quickstep;
 import static android.content.Intent.ACTION_USER_UNLOCKED;
 
 import static com.android.launcher3.util.DefaultDisplay.CHANGE_ALL;
+import static com.android.launcher3.util.DefaultDisplay.CHANGE_FRAME_DELAY;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
 import static com.android.quickstep.SysUINavigationMode.Mode.THREE_BUTTONS;
@@ -46,6 +47,7 @@ import android.graphics.Region;
 import android.os.Process;
 import android.os.SystemProperties;
 import android.os.UserManager;
+import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.view.MotionEvent;
@@ -111,7 +113,8 @@ public class RecentsAnimationDeviceState implements
     private TaskStackChangeListener mFrozenTaskListener = new TaskStackChangeListener() {
         @Override
         public void onRecentTaskListFrozenChanged(boolean frozen) {
-            if (frozen) {
+            mTaskListFrozen = frozen;
+            if (frozen || mInOverview) {
                 return;
             }
             enableMultipleRegions(false);
@@ -132,6 +135,9 @@ public class RecentsAnimationDeviceState implements
      * TODO: (b/156984037) For when user rotates after entering overview
      */
     private boolean mInOverview;
+    private boolean mTaskListFrozen;
+
+    private boolean mIsUserSetupComplete;
 
     public RecentsAnimationDeviceState(Context context) {
         mContext = context;
@@ -190,6 +196,17 @@ public class RecentsAnimationDeviceState implements
             mOneHandedEnabledObserver.register();
             mOneHandedEnabledObserver.dispatchOnChange();
         }
+
+        SecureSettingsObserver userSetupObserver = new SecureSettingsObserver(
+                context.getContentResolver(),
+                e -> mIsUserSetupComplete = e,
+                Settings.Secure.USER_SETUP_COMPLETE,
+                0);
+        mIsUserSetupComplete = userSetupObserver.getValue();
+        if (!mIsUserSetupComplete) {
+            userSetupObserver.register();
+            runOnDestroy(userSetupObserver::unregister);
+        }
     }
 
     private void setupOrientationSwipeHandler() {
@@ -258,7 +275,8 @@ public class RecentsAnimationDeviceState implements
 
     @Override
     public void onDisplayInfoChanged(DefaultDisplay.Info info, int flags) {
-        if (info.id != getDisplayId()) {
+        if (info.id != getDisplayId() || (flags & CHANGE_FRAME_DELAY) == CHANGE_FRAME_DELAY) {
+            // ignore displays that aren't running launcher and frame refresh rate changes
             return;
         }
 
@@ -329,6 +347,13 @@ public class RecentsAnimationDeviceState implements
         return mIsUserUnlocked;
     }
 
+    /**
+     * @return whether the user has completed setup wizard
+     */
+    public boolean isUserSetupComplete() {
+        return mIsUserSetupComplete;
+    }
+
     private void notifyUserUnlocked() {
         for (Runnable action : mUserUnlockedActions) {
             action.run();
@@ -375,7 +400,6 @@ public class RecentsAnimationDeviceState implements
         return (mSystemUiStateFlags & SYSUI_STATE_NAV_BAR_HIDDEN) == 0
                 && (mSystemUiStateFlags & SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED) == 0
                 && (mSystemUiStateFlags & SYSUI_STATE_QUICK_SETTINGS_EXPANDED) == 0
-                && (mSystemUiStateFlags & SYSUI_STATE_BUBBLES_EXPANDED) == 0
                 && ((mSystemUiStateFlags & SYSUI_STATE_HOME_DISABLED) == 0
                         || (mSystemUiStateFlags & SYSUI_STATE_OVERVIEW_DISABLED) == 0);
     }
@@ -395,6 +419,13 @@ public class RecentsAnimationDeviceState implements
         return (mSystemUiStateFlags & SYSUI_STATE_SCREEN_PINNING) != 0;
     }
 
+    /**
+     * @return whether the bubble stack is expanded
+     */
+    public boolean isBubblesExpanded() {
+        return (mSystemUiStateFlags & SYSUI_STATE_BUBBLES_EXPANDED) != 0;
+    }
+
     /**
      * @return whether lock-task mode is active
      */
@@ -550,7 +581,7 @@ public class RecentsAnimationDeviceState implements
      * *May* apply a transform on the motion event if it lies in the nav bar region for another
      * orientation that is currently being tracked as a part of quickstep
      */
-    public void setOrientationTransformIfNeeded(MotionEvent event) {
+    void setOrientationTransformIfNeeded(MotionEvent event) {
         // negative coordinates bug b/143901881
         if (event.getX() < 0 || event.getY() < 0) {
             event.setLocation(Math.max(0, event.getX()), Math.max(0, event.getY()));
@@ -558,25 +589,54 @@ public class RecentsAnimationDeviceState implements
         mOrientationTouchTransformer.transform(event);
     }
 
-    void onSwipeUpToOverview(BaseActivityInterface activityInterface) {
-        mInOverview = true;
-        activityInterface.onExitOverview(this, () -> {
-            mInOverview = false;
-            enableMultipleRegions(false);
-        });
+    void enableMultipleRegions(boolean enable) {
+        mOrientationTouchTransformer.enableMultipleRegions(enable, mDefaultDisplay.getInfo());
+        notifySysuiForRotation(mOrientationTouchTransformer.getQuickStepStartingRotation());
     }
 
-    void enableMultipleRegions(boolean enable) {
-        if (mInOverview) {
-            return;
+    private void notifySysuiForRotation(int rotation) {
+        UI_HELPER_EXECUTOR.execute(() ->
+                SystemUiProxy.INSTANCE.get(mContext).onQuickSwitchToNewTask(rotation));
+    }
+
+    public void onStartGesture() {
+        if (mTaskListFrozen) {
+            // Prioritize whatever nav bar user touches once in quickstep
+            // This case is specifically when user changes what nav bar they are using mid
+            // quickswitch session before tasks list is unfrozen
+            notifySysuiForRotation(mOrientationTouchTransformer.getCurrentActiveRotation());
+        }
+    }
+
+
+    void onEndTargetCalculated(GestureState.GestureEndTarget endTarget,
+            BaseActivityInterface activityInterface) {
+        if (endTarget == GestureState.GestureEndTarget.RECENTS) {
+            mInOverview = true;
+            if (!mTaskListFrozen) {
+                // If we're in landscape w/o ever quickswitching, show the navbar in landscape
+                enableMultipleRegions(true);
+            }
+            activityInterface.onExitOverview(this, () -> {
+                mInOverview = false;
+                enableMultipleRegions(false);
+            });
+        } else if (endTarget == GestureState.GestureEndTarget.HOME) {
+            enableMultipleRegions(false);
+        } else if (endTarget == GestureState.GestureEndTarget.NEW_TASK) {
+            if (mOrientationTouchTransformer.getQuickStepStartingRotation() == -1) {
+                // First gesture to start quickswitch
+                enableMultipleRegions(true);
+            } else {
+                notifySysuiForRotation(mOrientationTouchTransformer.getCurrentActiveRotation());
+            }
+        } else if (endTarget == GestureState.GestureEndTarget.LAST_TASK) {
+            if (!mTaskListFrozen) {
+                // touched nav bar but didn't go anywhere and not quickswitching, do nothing
+                return;
+            }
+            notifySysuiForRotation(mOrientationTouchTransformer.getCurrentActiveRotation());
         }
-        mOrientationTouchTransformer.enableMultipleRegions(enable, mDefaultDisplay.getInfo());
-        UI_HELPER_EXECUTOR.execute(() -> {
-            int quickStepStartingRotation =
-                    mOrientationTouchTransformer.getQuickStepStartingRotation();
-            SystemUiProxy.INSTANCE.get(mContext)
-                    .onQuickSwitchToNewTask(quickStepStartingRotation);
-        });
     }
 
     public int getCurrentActiveRotation() {
diff --git a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
index 58870edece..41e86e00b6 100644
--- a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
@@ -18,8 +18,11 @@ package com.android.quickstep.interaction;
 import static com.android.quickstep.interaction.TutorialController.TutorialType.BACK_NAVIGATION_COMPLETE;
 import static com.android.quickstep.interaction.TutorialController.TutorialType.LEFT_EDGE_BACK_NAVIGATION;
 
+import android.graphics.PointF;
 import android.view.View;
 
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.R;
 import com.android.quickstep.interaction.EdgeBackGestureHandler.BackGestureResult;
 import com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult;
@@ -154,11 +157,14 @@ final class BackGestureTutorialController extends TutorialController {
     }
 
     @Override
-    public void onNavBarGestureAttempted(NavBarGestureResult result) {
+    public void onNavBarGestureAttempted(NavBarGestureResult result, PointF finalVelocity) {
         if (mTutorialType == BACK_NAVIGATION_COMPLETE) {
             if (result == NavBarGestureResult.HOME_GESTURE_COMPLETED) {
                 mTutorialFragment.closeTutorial();
             }
         }
     }
+
+    @Override
+    public void setNavBarGestureProgress(@Nullable Float displacement) {}
 }
diff --git a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
index 524cbaf06f..65f41a4a6c 100644
--- a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
@@ -15,19 +15,135 @@
  */
 package com.android.quickstep.interaction;
 
+import static com.android.launcher3.anim.Interpolators.ACCEL;
+import static com.android.launcher3.util.DefaultDisplay.getSingleFrameMs;
+import static com.android.quickstep.BaseSwipeUpHandlerV2.MAX_SWIPE_DURATION;
 import static com.android.quickstep.interaction.TutorialController.TutorialType.HOME_NAVIGATION_COMPLETE;
 
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.graphics.Insets;
+import android.graphics.Outline;
+import android.graphics.PointF;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.os.Build;
+import android.view.SurfaceControl;
 import android.view.View;
+import android.view.ViewOutlineProvider;
+import android.view.WindowInsets.Type;
+import android.view.WindowManager;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.anim.AnimationSuccessListener;
+import com.android.launcher3.anim.AnimatorPlaybackController;
+import com.android.launcher3.anim.PendingAnimation;
+import com.android.quickstep.AnimatedFloat;
+import com.android.quickstep.GestureState;
+import com.android.quickstep.OverviewComponentObserver;
+import com.android.quickstep.RecentsAnimationDeviceState;
+import com.android.quickstep.SwipeUpAnimationLogic;
+import com.android.quickstep.SwipeUpAnimationLogic.RunningWindowAnim;
 import com.android.quickstep.interaction.EdgeBackGestureHandler.BackGestureResult;
 import com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult;
+import com.android.quickstep.util.RectFSpringAnim;
+import com.android.quickstep.util.TransformParams;
+import com.android.systemui.shared.system.QuickStepContract;
+import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
 
 /** A {@link TutorialController} for the Home tutorial. */
+@TargetApi(Build.VERSION_CODES.R)
 final class HomeGestureTutorialController extends TutorialController {
 
+    private float mFakeTaskViewRadius;
+    private Rect mFakeTaskViewRect = new Rect();
+
+    private final ViewSwipeUpAnimation mViewSwipeUpAnimation;
+    private RunningWindowAnim mRunningWindowAnim;
+
     HomeGestureTutorialController(HomeGestureTutorialFragment fragment, TutorialType tutorialType) {
         super(fragment, tutorialType);
+
+        RecentsAnimationDeviceState deviceState = new RecentsAnimationDeviceState(mContext);
+        OverviewComponentObserver observer = new OverviewComponentObserver(mContext, deviceState);
+        mViewSwipeUpAnimation = new ViewSwipeUpAnimation(mContext, deviceState,
+                new GestureState(observer, -1));
+        observer.onDestroy();
+        deviceState.destroy();
+
+        DeviceProfile dp = InvariantDeviceProfile.INSTANCE.get(mContext)
+                .getDeviceProfile(mContext)
+                .copy(mContext);
+        Insets insets = mContext.getSystemService(WindowManager.class)
+                .getCurrentWindowMetrics()
+                .getWindowInsets()
+                .getInsets(Type.systemBars());
+        dp.updateInsets(new Rect(insets.left, insets.top, insets.right, insets.bottom));
+        mViewSwipeUpAnimation.initDp(dp);
+
+        mFakeTaskViewRadius = QuickStepContract.getWindowCornerRadius(mContext.getResources());
+
+        mFakeTaskView.setClipToOutline(true);
+        mFakeTaskView.setOutlineProvider(new ViewOutlineProvider() {
+            @Override
+            public void getOutline(View view, Outline outline) {
+                outline.setRoundRect(mFakeTaskViewRect, mFakeTaskViewRadius);
+            }
+        });
+    }
+
+    private void cancelRunningAnimation() {
+        if (mRunningWindowAnim != null) {
+            mRunningWindowAnim.cancel();
+        }
+        mRunningWindowAnim = null;
+    }
+
+    /** Fades the task view, optionally after animating to a fake Overview. */
+    private void fadeOutFakeTaskView(boolean toOverviewFirst, @Nullable Runnable onEndRunnable) {
+        cancelRunningAnimation();
+        PendingAnimation anim = new PendingAnimation(300);
+        AnimatorListenerAdapter resetTaskView = new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation, boolean isReverse) {
+                mFakeTaskView.setVisibility(View.INVISIBLE);
+                mFakeTaskView.setAlpha(1);
+                mRunningWindowAnim = null;
+            }
+        };
+        if (toOverviewFirst) {
+            anim.setFloat(mViewSwipeUpAnimation.getCurrentShift(), AnimatedFloat.VALUE, 1, ACCEL);
+            anim.addListener(new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationEnd(Animator animation, boolean isReverse) {
+                    PendingAnimation fadeAnim = new PendingAnimation(300);
+                    fadeAnim.setViewAlpha(mFakeTaskView, 0, ACCEL);
+                    fadeAnim.addListener(resetTaskView);
+                    AnimatorSet animset = fadeAnim.buildAnim();
+                    animset.setStartDelay(100);
+                    animset.start();
+                    mRunningWindowAnim = RunningWindowAnim.wrap(animset);
+                }
+            });
+        } else {
+            anim.setViewAlpha(mFakeTaskView, 0, ACCEL);
+            anim.addListener(resetTaskView);
+        }
+        if (onEndRunnable != null) {
+            anim.addListener(AnimationSuccessListener.forRunnable(onEndRunnable));
+        }
+        AnimatorSet animset = anim.buildAnim();
+        animset.start();
+        mRunningWindowAnim = RunningWindowAnim.wrap(animset);
     }
 
     @Override
@@ -85,22 +201,35 @@ final class HomeGestureTutorialController extends TutorialController {
     }
 
     @Override
-    public void onNavBarGestureAttempted(NavBarGestureResult result) {
+    public void onNavBarGestureAttempted(NavBarGestureResult result, PointF finalVelocity) {
         switch (mTutorialType) {
             case HOME_NAVIGATION:
                 switch (result) {
-                    case HOME_GESTURE_COMPLETED:
+                    case HOME_GESTURE_COMPLETED: {
+                        hideFeedback();
+                        cancelRunningAnimation();
                         hideHandCoachingAnimation();
-                        mTutorialFragment.changeController(HOME_NAVIGATION_COMPLETE);
+                        RectFSpringAnim rectAnim =
+                                mViewSwipeUpAnimation.handleSwipeUpToHome(finalVelocity);
+                        // After home animation finishes, fade out and then move to the next screen.
+                        rectAnim.addAnimatorListener(AnimationSuccessListener.forRunnable(
+                                () -> fadeOutFakeTaskView(false,
+                                        () -> mTutorialFragment.changeController(
+                                                HOME_NAVIGATION_COMPLETE))));
+                        mRunningWindowAnim = RunningWindowAnim.wrap(rectAnim);
                         break;
+                    }
                     case HOME_NOT_STARTED_TOO_FAR_FROM_EDGE:
                     case OVERVIEW_NOT_STARTED_TOO_FAR_FROM_EDGE:
                         showFeedback(R.string.home_gesture_feedback_swipe_too_far_from_edge);
                         break;
                     case OVERVIEW_GESTURE_COMPLETED:
-                        showFeedback(R.string.home_gesture_feedback_overview_detected);
+                        fadeOutFakeTaskView(true, () ->
+                                showFeedback(R.string.home_gesture_feedback_overview_detected));
                         break;
                     case HOME_OR_OVERVIEW_NOT_STARTED_WRONG_SWIPE_DIRECTION:
+                    case HOME_OR_OVERVIEW_CANCELLED:
+                        fadeOutFakeTaskView(false, null);
                         showFeedback(R.string.home_gesture_feedback_wrong_swipe_direction);
                         break;
                 }
@@ -112,4 +241,94 @@ final class HomeGestureTutorialController extends TutorialController {
                 break;
         }
     }
+
+    @Override
+    public void setNavBarGestureProgress(@Nullable Float displacement) {
+        if (displacement == null || mTutorialType == HOME_NAVIGATION_COMPLETE) {
+            mFakeTaskView.setVisibility(View.INVISIBLE);
+        } else {
+            mFakeTaskView.setVisibility(View.VISIBLE);
+            if (mRunningWindowAnim == null) {
+                mViewSwipeUpAnimation.updateDisplacement(displacement);
+            }
+        }
+    }
+
+    private class ViewSwipeUpAnimation extends SwipeUpAnimationLogic {
+
+        ViewSwipeUpAnimation(Context context, RecentsAnimationDeviceState deviceState,
+                             GestureState gestureState) {
+            super(context, deviceState, gestureState, new FakeTransformParams());
+        }
+
+        void initDp(DeviceProfile dp) {
+            initTransitionEndpoints(dp);
+            mTaskViewSimulator.setPreviewBounds(
+                    new Rect(0, 0, dp.widthPx, dp.heightPx), dp.getInsets());
+        }
+
+        @Override
+        public void updateFinalShift() {
+            float progress = mCurrentShift.value / mDragLengthFactor;
+            mWindowTransitionController.setPlayFraction(progress);
+            mTaskViewSimulator.apply(mTransformParams);
+        }
+
+        AnimatedFloat getCurrentShift() {
+            return mCurrentShift;
+        }
+
+        RectFSpringAnim handleSwipeUpToHome(PointF velocity) {
+            PointF velocityPxPerMs = new PointF(velocity.x, velocity.y);
+            float currentShift = mCurrentShift.value;
+            final float startShift = Utilities.boundToRange(currentShift - velocityPxPerMs.y
+                    * getSingleFrameMs(mContext) / mTransitionDragLength, 0, mDragLengthFactor);
+            float distanceToTravel = (1 - currentShift) * mTransitionDragLength;
+
+            // we want the page's snap velocity to approximately match the velocity at
+            // which the user flings, so we scale the duration by a value near to the
+            // derivative of the scroll interpolator at zero, ie. 2.
+            long baseDuration = Math.round(Math.abs(distanceToTravel / velocityPxPerMs.y));
+            long duration = Math.min(MAX_SWIPE_DURATION, 2 * baseDuration);
+            HomeAnimationFactory homeAnimFactory = new HomeAnimationFactory(null) {
+                @Override
+                public AnimatorPlaybackController createActivityAnimationToHome() {
+                    return AnimatorPlaybackController.wrap(new AnimatorSet(), duration);
+                }
+
+                @NonNull
+                @Override
+                public RectF getWindowTargetRect() {
+                    int fakeHomeIconSizePx = mDp.allAppsIconSizePx;
+                    int fakeHomeIconLeft = (mDp.widthPx - fakeHomeIconSizePx) / 2;
+                    int fakeHomeIconTop = mDp.heightPx - (mDp.allAppsCellHeightPx * 3);
+                    return new RectF(fakeHomeIconLeft, fakeHomeIconTop,
+                            fakeHomeIconLeft + fakeHomeIconSizePx,
+                            fakeHomeIconTop + fakeHomeIconSizePx);
+                }
+            };
+            RectFSpringAnim windowAnim = createWindowAnimationToHome(startShift, homeAnimFactory);
+            windowAnim.start(mContext, velocityPxPerMs);
+            return windowAnim;
+        }
+    }
+
+    private class FakeTransformParams extends TransformParams {
+
+        @Override
+        public SurfaceParams[] createSurfaceParams(BuilderProxy proxy) {
+            SurfaceParams.Builder builder = new SurfaceParams.Builder((SurfaceControl) null);
+            proxy.onBuildTargetParams(builder, null, this);
+            return new SurfaceParams[] {builder.build()};
+        }
+
+        @Override
+        public void applySurfaceParams(SurfaceParams[] params) {
+            SurfaceParams p = params[0];
+            mFakeTaskView.setAnimationMatrix(p.matrix);
+            mFakeTaskViewRect.set(p.windowCrop);
+            mFakeTaskViewRadius = p.cornerRadius;
+            mFakeTaskView.invalidateOutline();
+        }
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java b/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java
index 6d8caa2ec5..4069c09a28 100644
--- a/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java
+++ b/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java
@@ -17,6 +17,7 @@ package com.android.quickstep.interaction;
 
 import static com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult.HOME_GESTURE_COMPLETED;
 import static com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult.HOME_NOT_STARTED_TOO_FAR_FROM_EDGE;
+import static com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult.HOME_OR_OVERVIEW_CANCELLED;
 import static com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult.HOME_OR_OVERVIEW_NOT_STARTED_WRONG_SWIPE_DIRECTION;
 import static com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult.OVERVIEW_GESTURE_COMPLETED;
 import static com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult.OVERVIEW_NOT_STARTED_TOO_FAR_FROM_EDGE;
@@ -24,19 +25,23 @@ import static com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestu
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Point;
+import android.graphics.PointF;
 import android.view.Display;
 import android.view.MotionEvent;
 import android.view.Surface;
 import android.view.View;
 import android.view.View.OnTouchListener;
 
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.ResourceUtils;
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.util.NavBarPosition;
 import com.android.quickstep.util.TriggerSwipeUpTouchTracker;
 
 /** Utility class to handle home gestures. */
-public class NavBarGestureHandler implements OnTouchListener {
+public class NavBarGestureHandler implements OnTouchListener,
+        TriggerSwipeUpTouchTracker.OnSwipeUpListener {
 
     private static final String LOG_TAG = "NavBarGestureHandler";
 
@@ -44,6 +49,7 @@ public class NavBarGestureHandler implements OnTouchListener {
     private final TriggerSwipeUpTouchTracker mSwipeUpTouchTracker;
     private int mBottomGestureHeight;
     private boolean mTouchCameFromNavBar;
+    private float mDownY;
     private NavBarGestureAttemptCallback mGestureCallback;
 
     NavBarGestureHandler(Context context) {
@@ -55,10 +61,11 @@ public class NavBarGestureHandler implements OnTouchListener {
             displayRotation = display.getRotation();
             display.getRealSize(mDisplaySize);
         }
+        mDownY = mDisplaySize.y;
         mSwipeUpTouchTracker =
                 new TriggerSwipeUpTouchTracker(context, true /*disableHorizontalSwipe*/,
                         new NavBarPosition(Mode.NO_BUTTON, displayRotation),
-                        null /*onInterceptTouch*/, this::onSwipeUp);
+                        null /*onInterceptTouch*/, this);
 
         final Resources resources = context.getResources();
         mBottomGestureHeight =
@@ -73,16 +80,26 @@ public class NavBarGestureHandler implements OnTouchListener {
         mGestureCallback = null;
     }
 
-    private void onSwipeUp(boolean wasFling) {
+    @Override
+    public void onSwipeUp(boolean wasFling, PointF finalVelocity) {
         if (mGestureCallback == null) {
             return;
         }
+        finalVelocity.set(finalVelocity.x / 1000, finalVelocity.y / 1000);
         if (mTouchCameFromNavBar) {
             mGestureCallback.onNavBarGestureAttempted(wasFling
-                    ? HOME_GESTURE_COMPLETED : OVERVIEW_GESTURE_COMPLETED);
+                    ? HOME_GESTURE_COMPLETED : OVERVIEW_GESTURE_COMPLETED, finalVelocity);
         } else {
             mGestureCallback.onNavBarGestureAttempted(wasFling
-                    ? HOME_NOT_STARTED_TOO_FAR_FROM_EDGE : OVERVIEW_NOT_STARTED_TOO_FAR_FROM_EDGE);
+                    ? HOME_NOT_STARTED_TOO_FAR_FROM_EDGE : OVERVIEW_NOT_STARTED_TOO_FAR_FROM_EDGE,
+                    finalVelocity);
+        }
+    }
+
+    @Override
+    public void onSwipeUpCancelled() {
+        if (mGestureCallback != null) {
+            mGestureCallback.onNavBarGestureAttempted(HOME_OR_OVERVIEW_CANCELLED, new PointF());
         }
     }
 
@@ -91,15 +108,22 @@ public class NavBarGestureHandler implements OnTouchListener {
         int action = motionEvent.getAction();
         boolean intercepted = mSwipeUpTouchTracker.interceptedTouch();
         if (action == MotionEvent.ACTION_DOWN) {
-            mTouchCameFromNavBar = motionEvent.getRawY() >= mDisplaySize.y - mBottomGestureHeight;
+            mDownY = motionEvent.getY();
+            mTouchCameFromNavBar = mDownY >= mDisplaySize.y - mBottomGestureHeight;
+            if (!mTouchCameFromNavBar) {
+                mGestureCallback.setNavBarGestureProgress(null);
+            }
             mSwipeUpTouchTracker.init();
         } else if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) {
             if (mGestureCallback != null && !intercepted && mTouchCameFromNavBar) {
                 mGestureCallback.onNavBarGestureAttempted(
-                        HOME_OR_OVERVIEW_NOT_STARTED_WRONG_SWIPE_DIRECTION);
+                        HOME_OR_OVERVIEW_NOT_STARTED_WRONG_SWIPE_DIRECTION, new PointF());
                 intercepted = true;
             }
         }
+        if (mTouchCameFromNavBar && mGestureCallback != null) {
+            mGestureCallback.setNavBarGestureProgress(motionEvent.getY() - mDownY);
+        }
         mSwipeUpTouchTracker.onMotionEvent(motionEvent);
         return intercepted;
     }
@@ -110,12 +134,16 @@ public class NavBarGestureHandler implements OnTouchListener {
         OVERVIEW_GESTURE_COMPLETED,
         HOME_NOT_STARTED_TOO_FAR_FROM_EDGE,
         OVERVIEW_NOT_STARTED_TOO_FAR_FROM_EDGE,
-        HOME_OR_OVERVIEW_NOT_STARTED_WRONG_SWIPE_DIRECTION  // Side swipe on nav bar.
+        HOME_OR_OVERVIEW_NOT_STARTED_WRONG_SWIPE_DIRECTION,  // Side swipe on nav bar.
+        HOME_OR_OVERVIEW_CANCELLED
     }
 
     /** Callback to let the UI react to attempted nav bar gestures. */
     interface NavBarGestureAttemptCallback {
         /** Called whenever any touch is completed. */
-        void onNavBarGestureAttempted(NavBarGestureResult result);
+        void onNavBarGestureAttempted(NavBarGestureResult result, PointF finalVelocity);
+
+        /** Indicates how far a touch originating in the nav bar has moved from the nav bar. */
+        void setNavBarGestureProgress(@Nullable Float displacement);
     }
 }
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
index 1e29f44704..f27d500eff 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
@@ -15,6 +15,7 @@
  */
 package com.android.quickstep.interaction;
 
+import android.content.Context;
 import android.graphics.drawable.RippleDrawable;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -39,11 +40,13 @@ abstract class TutorialController implements BackGestureAttemptCallback,
 
     final TutorialFragment mTutorialFragment;
     TutorialType mTutorialType;
+    final Context mContext;
 
     final ImageButton mCloseButton;
     final TextView mTitleTextView;
     final TextView mSubtitleTextView;
     final TextView mFeedbackView;
+    final View mFakeTaskView;
     final View mRippleView;
     final RippleDrawable mRippleDrawable;
     final TutorialHandAnimation mHandCoachingAnimation;
@@ -55,6 +58,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
     TutorialController(TutorialFragment tutorialFragment, TutorialType tutorialType) {
         mTutorialFragment = tutorialFragment;
         mTutorialType = tutorialType;
+        mContext = mTutorialFragment.getContext();
 
         View rootView = tutorialFragment.getRootView();
         mCloseButton = rootView.findViewById(R.id.gesture_tutorial_fragment_close_button);
@@ -62,6 +66,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         mTitleTextView = rootView.findViewById(R.id.gesture_tutorial_fragment_title_view);
         mSubtitleTextView = rootView.findViewById(R.id.gesture_tutorial_fragment_subtitle_view);
         mFeedbackView = rootView.findViewById(R.id.gesture_tutorial_fragment_feedback_view);
+        mFakeTaskView = rootView.findViewById(R.id.gesture_tutorial_fake_task_view);
         mRippleView = rootView.findViewById(R.id.gesture_tutorial_ripple_view);
         mRippleDrawable = (RippleDrawable) mRippleView.getBackground();
         mHandCoachingAnimation = tutorialFragment.getHandAnimation();
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
index 44c1a5da04..a3881cffb0 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
@@ -37,11 +37,6 @@ import com.android.quickstep.interaction.TutorialController.TutorialType;
 abstract class TutorialFragment extends Fragment implements OnTouchListener {
 
     private static final String LOG_TAG = "TutorialFragment";
-    private static final String SYSTEM_NAVIGATION_SETTING_INTENT =
-            "#Intent;action=com.android.settings.SEARCH_RESULT_TRAMPOLINE;S"
-                    + ".:settings:fragment_args_key=gesture_system_navigation_input_summary;S"
-                    + ".:settings:show_fragment=com.android.settings.gestures"
-                    + ".SystemNavigationGestureSettings;end";
     static final String KEY_TUTORIAL_TYPE = "tutorial_type";
 
     TutorialType mTutorialType;
diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
index 69812b6154..d4d46fbb2c 100644
--- a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
+++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
@@ -65,10 +65,10 @@ public class StatsLogCompatManager extends StatsLogManager {
     }
 
     /**
-     * Logs a {@link LauncherEvent}.
+     * Logs a {@link EventEnum}.
      */
     @Override
-    public void log(LauncherEvent event) {
+    public void log(EventEnum event) {
         log(event, DEFAULT_INSTANCE_ID, LauncherAtom.ItemInfo.getDefaultInstance());
     }
 
@@ -76,7 +76,7 @@ public class StatsLogCompatManager extends StatsLogManager {
      * Logs an event and accompanying {@link InstanceId}.
      */
     @Override
-    public void log(LauncherEvent event, InstanceId instanceId) {
+    public void log(EventEnum event, InstanceId instanceId) {
         log(event, instanceId, LauncherAtom.ItemInfo.getDefaultInstance());
     }
 
@@ -84,7 +84,7 @@ public class StatsLogCompatManager extends StatsLogManager {
      * Logs an event and accompanying {@link ItemInfo}.
      */
     @Override
-    public void log(LauncherEvent event, @Nullable LauncherAtom.ItemInfo info) {
+    public void log(EventEnum event, @Nullable LauncherAtom.ItemInfo info) {
         log(event, DEFAULT_INSTANCE_ID, info);
     }
 
@@ -92,7 +92,7 @@ public class StatsLogCompatManager extends StatsLogManager {
      * Logs an event and accompanying {@link InstanceId} and {@link LauncherAtom.ItemInfo}.
      */
     @Override
-    public void log(LauncherEvent event, InstanceId instanceId,
+    public void log(EventEnum event, InstanceId instanceId,
             @Nullable LauncherAtom.ItemInfo info) {
         logInternal(event, instanceId, info,
                 LAUNCHER_UICHANGED__DST_STATE__HOME,
@@ -102,14 +102,17 @@ public class StatsLogCompatManager extends StatsLogManager {
     /**
      * Logs an event and accompanying {@link InstanceId} and {@link LauncherAtom.ItemInfo}.
      */
-    private void logInternal(LauncherEvent event, InstanceId instanceId,
+    private void logInternal(EventEnum event, InstanceId instanceId,
             @Nullable LauncherAtom.ItemInfo info, int startState, int endState) {
         info = info == null ? LauncherAtom.ItemInfo.getDefaultInstance() : info;
 
         if (IS_VERBOSE) {
+            String name = (event instanceof LauncherEvent) ? ((LauncherEvent) event).name() :
+                    event.getId() + "";
+
             Log.d(TAG, instanceId == DEFAULT_INSTANCE_ID
-                    ? String.format("\n%s\n%s", event.name(), info)
-                    : String.format("%s(InstanceId:%s)\n%s", event.name(), instanceId, info));
+                    ? String.format("\n%s\n%s", name, info)
+                    : String.format("%s(InstanceId:%s)\n%s", name, instanceId, info));
         }
 
         if (!Utilities.ATLEAST_R) {
diff --git a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
index 5745990614..498c232ec3 100644
--- a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
+++ b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
@@ -208,7 +208,7 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
         mDisplayRotation = displayRotation;
         mTouchRotation = touchRotation;
 
-        if (mLauncherRotation == mTouchRotation) {
+        if (mLauncherRotation == mTouchRotation || canLauncherRotate()) {
             mOrientationHandler = PagedOrientationHandler.HOME_ROTATED;
             if (DEBUG) {
                 Log.d(TAG, "current RecentsOrientedState: " + this);
@@ -240,7 +240,7 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
 
     private void setFlag(int mask, boolean enabled) {
         boolean wasRotationEnabled = !TestProtocol.sDisableSensorRotation
-                && mFlags == VALUE_ROTATION_WATCHER_ENABLED;
+                && (mFlags & VALUE_ROTATION_WATCHER_ENABLED) == VALUE_ROTATION_WATCHER_ENABLED;
         if (enabled) {
             mFlags |= mask;
         } else {
@@ -248,7 +248,7 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
         }
 
         boolean isRotationEnabled = !TestProtocol.sDisableSensorRotation
-                && mFlags == VALUE_ROTATION_WATCHER_ENABLED;
+                && (mFlags & VALUE_ROTATION_WATCHER_ENABLED) == VALUE_ROTATION_WATCHER_ENABLED;
         if (wasRotationEnabled != isRotationEnabled) {
             UI_HELPER_EXECUTOR.execute(() -> {
                 if (isRotationEnabled) {
diff --git a/quickstep/tests/src/com/android/quickstep/RecentTasksListTest.java b/quickstep/tests/src/com/android/quickstep/RecentTasksListTest.java
index 34eb7f8177..79ddf7a399 100644
--- a/quickstep/tests/src/com/android/quickstep/RecentTasksListTest.java
+++ b/quickstep/tests/src/com/android/quickstep/RecentTasksListTest.java
@@ -58,9 +58,9 @@ public class RecentTasksListTest {
     }
 
     @Test
-    public void onTaskRemoved_reloadsAllTasks() {
+    public void onTaskRemoved_doesNotFetchTasks() {
         mRecentTasksList.onTaskRemoved(0);
-        verify(mockActivityManagerWrapper, times(1))
+        verify(mockActivityManagerWrapper, times(0))
                 .getRecentTasks(anyInt(), anyInt());
     }
 
@@ -77,7 +77,7 @@ public class RecentTasksListTest {
         when(mockActivityManagerWrapper.getRecentTasks(anyInt(), anyInt()))
                 .thenReturn(Collections.singletonList(recentTaskInfo));
 
-        List<Task> taskList = mRecentTasksList.loadTasksInBackground(Integer.MAX_VALUE, true);
+        List<Task> taskList = mRecentTasksList.loadTasksInBackground(Integer.MAX_VALUE, -1, true);
 
         assertEquals(1, taskList.size());
         assertNull(taskList.get(0).taskDescription.getLabel());
@@ -91,7 +91,7 @@ public class RecentTasksListTest {
         when(mockActivityManagerWrapper.getRecentTasks(anyInt(), anyInt()))
                 .thenReturn(Collections.singletonList(recentTaskInfo));
 
-        List<Task> taskList = mRecentTasksList.loadTasksInBackground(Integer.MAX_VALUE, false);
+        List<Task> taskList = mRecentTasksList.loadTasksInBackground(Integer.MAX_VALUE, -1, false);
 
         assertEquals(1, taskList.size());
         assertEquals(taskDescription, taskList.get(0).taskDescription.getLabel());
diff --git a/res/values/colors.xml b/res/values/colors.xml
index c9c893e511..c4ec7dd7f0 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -43,6 +43,7 @@
     <color name="gesture_tutorial_subtitle_color">#99000000</color> <!-- 60% black -->
     <color name="gesture_tutorial_feedback_color">#FF000000</color>
     <color name="gesture_tutorial_ripple_color">#A0C2F9</color> <!-- Light Blue -->
+    <color name="gesture_tutorial_fake_task_view_color">#6DA1FF</color> <!-- Light Blue -->
     <color name="gesture_tutorial_action_button_label_color">#FFFFFFFF</color>
     <color name="gesture_tutorial_primary_color">#1A73E8</color> <!-- Blue -->
 
diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java
index 0ac278457a..d1d5e2624d 100644
--- a/src/com/android/launcher3/BaseDraggingActivity.java
+++ b/src/com/android/launcher3/BaseDraggingActivity.java
@@ -24,6 +24,7 @@ import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.content.pm.LauncherApps;
 import android.content.res.Configuration;
+import android.graphics.Insets;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.os.Bundle;
@@ -35,6 +36,8 @@ import android.view.ActionMode;
 import android.view.Display;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.WindowInsets.Type;
+import android.view.WindowMetrics;
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
@@ -51,6 +54,7 @@ import com.android.launcher3.util.DefaultDisplay.Info;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.util.TraceHelper;
+import com.android.launcher3.util.WindowBounds;
 
 /**
  * Extension of BaseActivity allowing support for drag-n-drop
@@ -272,15 +276,19 @@ public abstract class BaseDraggingActivity extends BaseActivity
 
     protected abstract void reapplyUi();
 
-    protected Rect getMultiWindowDisplaySize() {
+    protected WindowBounds getMultiWindowDisplaySize() {
         if (Utilities.ATLEAST_R) {
-            return new Rect(getWindowManager().getCurrentWindowMetrics().getBounds());
+            WindowMetrics wm = getWindowManager().getCurrentWindowMetrics();
+
+            Insets insets = wm.getWindowInsets().getInsets(Type.systemBars());
+            return new WindowBounds(wm.getBounds(),
+                    new Rect(insets.left, insets.top, insets.right, insets.bottom));
         }
         // Note: Calls to getSize() can't rely on our cached DefaultDisplay since it can return
         // the app window size
         Display display = getWindowManager().getDefaultDisplay();
         Point mwSize = new Point();
         display.getSize(mwSize);
-        return new Rect(0, 0, mwSize.x, mwSize.y);
+        return new WindowBounds(new Rect(0, 0, mwSize.x, mwSize.y), new Rect());
     }
 }
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 51b21aa795..72831f4d09 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -29,6 +29,7 @@ import com.android.launcher3.graphics.IconShape;
 import com.android.launcher3.icons.DotRenderer;
 import com.android.launcher3.icons.IconNormalizer;
 import com.android.launcher3.util.DefaultDisplay;
+import com.android.launcher3.util.WindowBounds;
 
 public class DeviceProfile {
 
@@ -265,19 +266,16 @@ public class DeviceProfile {
     /**
      * TODO: Move this to the builder as part of setMultiWindowMode
      */
-    public DeviceProfile getMultiWindowProfile(Context context, Rect windowPosition) {
+    public DeviceProfile getMultiWindowProfile(Context context, WindowBounds windowBounds) {
         // We take the minimum sizes of this profile and it's multi-window variant to ensure that
         // the system decor is always excluded.
-        Point mwSize = new Point(Math.min(availableWidthPx, windowPosition.width()),
-                Math.min(availableHeightPx, windowPosition.height()));
+        Point mwSize = new Point(Math.min(availableWidthPx, windowBounds.availableSize.x),
+                Math.min(availableHeightPx, windowBounds.availableSize.y));
 
-        // In multi-window mode, we can have widthPx = availableWidthPx
-        // and heightPx = availableHeightPx because Launcher uses the InvariantDeviceProfiles'
-        // widthPx and heightPx values where it's needed.
         DeviceProfile profile = toBuilder(context)
                 .setSizeRange(mwSize, mwSize)
-                .setSize(mwSize.x, mwSize.y)
-                .setWindowPosition(windowPosition.left, windowPosition.top)
+                .setSize(windowBounds.bounds.width(), windowBounds.bounds.height())
+                .setWindowPosition(windowBounds.bounds.left, windowBounds.bounds.top)
                 .setMultiWindowMode(true)
                 .build();
 
@@ -299,7 +297,7 @@ public class DeviceProfile {
     }
 
     /**
-     * Inverse of {@link #getMultiWindowProfile(Context, Rect)}
+     * Inverse of {@link #getMultiWindowProfile(Context, WindowBounds)}
      * @return device profile corresponding to the current orientation in non multi-window mode.
      */
     public DeviceProfile getFullScreenProfile() {
diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index 8951674879..60abc66b2b 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -200,7 +200,7 @@ public class InvariantDeviceProfile {
                 DefaultDisplay.INSTANCE.get(context).getInfo(),
                 getPredefinedDeviceProfiles(context, gridName));
 
-        Info myInfo = new Info(display);
+        Info myInfo = new Info(context, display);
         DisplayOption myDisplayOption = invDistWeightedInterpolate(
                 myInfo, getPredefinedDeviceProfiles(context, gridName));
 
diff --git a/src/com/android/launcher3/LauncherSettings.java b/src/com/android/launcher3/LauncherSettings.java
index 67890726b1..2cb3910793 100644
--- a/src/com/android/launcher3/LauncherSettings.java
+++ b/src/com/android/launcher3/LauncherSettings.java
@@ -154,9 +154,9 @@ public class LauncherSettings {
         public static final int CONTAINER_HOTSEAT_PREDICTION = -103;
         public static final int CONTAINER_ALL_APPS = -104;
         public static final int CONTAINER_WIDGETS_TRAY = -105;
-
         // Represents search results view.
         public static final int CONTAINER_SEARCH_RESULTS = -106;
+        public static final int CONTAINER_SHORTCUTS = -107;
 
         public static final String containerToString(int container) {
             switch (container) {
@@ -166,6 +166,7 @@ public class LauncherSettings {
                 case CONTAINER_ALL_APPS: return "all_apps";
                 case CONTAINER_WIDGETS_TRAY: return "widgets_tray";
                 case CONTAINER_SEARCH_RESULTS: return "search_result";
+                case CONTAINER_SHORTCUTS: return "shortcuts";
                 default: return String.valueOf(container);
             }
         }
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index aa9edda582..99ed0ad52b 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -6,6 +6,8 @@ import static com.android.launcher3.LauncherState.APPS_VIEW_ITEM_MASK;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.VERTICAL_SWIPE_INDICATOR;
 import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
+import static com.android.launcher3.anim.Interpolators.FINAL_FRAME;
+import static com.android.launcher3.anim.Interpolators.INSTANT;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE;
@@ -227,7 +229,9 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
         setter.setInt(mScrimView, ScrimView.DRAG_HANDLE_ALPHA,
                 (visibleElements & VERTICAL_SWIPE_INDICATOR) != 0 ? 255 : 0, allAppsFade);
 
-        setter.setViewAlpha(mAppsView, hasAnyVisibleItem ? 1 : 0, allAppsFade);
+        // Set visibility of the container at the very beginning or end of the transition.
+        setter.setViewAlpha(mAppsView, hasAnyVisibleItem ? 1 : 0,
+                hasAnyVisibleItem ? INSTANT : FINAL_FRAME);
     }
 
     public AnimatorListenerAdapter getProgressAnimatorListener() {
diff --git a/src/com/android/launcher3/anim/Interpolators.java b/src/com/android/launcher3/anim/Interpolators.java
index fccc120900..860ccebef4 100644
--- a/src/com/android/launcher3/anim/Interpolators.java
+++ b/src/com/android/launcher3/anim/Interpolators.java
@@ -61,6 +61,11 @@ public class Interpolators {
     public static final Interpolator EXAGGERATED_EASE;
 
     public static final Interpolator INSTANT = t -> 1;
+    /**
+     * All values of t map to 0 until t == 1. This is primarily useful for setting view visibility,
+     * which should only happen at the very end of the animation (when it's already hidden).
+     */
+    public static final Interpolator FINAL_FRAME = t -> t < 1 ? 0 : 1;
 
     private static final int MIN_SETTLE_DURATION = 200;
     private static final float OVERSHOOT_FACTOR = 0.9f;
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index f7fe535a48..fdf0ea46f2 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -466,6 +466,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
                 if (!isEmpty(firstLabel)) {
                     mFolderName.setHint("");
                     mFolderName.setText(firstLabel);
+                    mFolderName.selectAll();
                 }
             }
             mFolderName.showKeyboard();
diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index 4c2c79d6dd..dda39e8a51 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -32,7 +32,7 @@ import com.android.launcher3.util.ResourceBasedOverride;
  */
 public class StatsLogManager implements ResourceBasedOverride {
 
-    interface EventEnum {
+    public interface EventEnum {
         int getId();
     }
 
@@ -63,6 +63,18 @@ public class StatsLogManager implements ResourceBasedOverride {
                 + "new/same value.")
         LAUNCHER_FOLDER_LABEL_UPDATED(460),
 
+        @UiEvent(doc = "User long pressed on the workspace empty space.")
+        LAUNCHER_WORKSPACE_LONGPRESS(461),
+
+        @UiEvent(doc = "User tapped or long pressed on a wallpaper icon inside launcher settings.")
+        LAUNCHER_WALLPAPER_BUTTON_TAP_OR_LONGPRESS(462),
+
+        @UiEvent(doc = "User tapped or long pressed on settings icon inside launcher settings.")
+        LAUNCHER_SETTINGS_BUTTON_TAP_OR_LONGPRESS(463),
+
+        @UiEvent(doc = "User tapped or long pressed on widget tray icon inside launcher settings.")
+        LAUNCHER_WIDGETSTRAY_BUTTON_TAP_OR_LONGPRESS(464),
+
         @UiEvent(doc = "A dragged item is dropped on 'Remove' button in the target bar")
         LAUNCHER_ITEM_DROPPED_ON_REMOVE(465),
 
@@ -82,7 +94,15 @@ public class StatsLogManager implements ResourceBasedOverride {
 
         @UiEvent(doc = "User cancelled uninstalling the package after dropping on "
                 + "the icon onto 'Uninstall' button in the target bar")
-        LAUNCHER_ITEM_UNINSTALL_CANCELLED(470);
+        LAUNCHER_ITEM_UNINSTALL_CANCELLED(470),
+
+        @UiEvent(doc = "User opened package specific widgets list by tapping on widgets system "
+                + "shortcut within longpress popup window.")
+        LAUNCHER_SYSTEM_SHORTCUT_WIDGETS_TAP(514),
+
+        @UiEvent(doc = "User opened app info of the package by tapping on appinfo system shortcut "
+                + "within longpress popup window.")
+        LAUNCHER_SYSTEM_SHORTCUT_APP_INFO_TAP(515);
         // ADD MORE
 
         private final int mId;
@@ -113,27 +133,27 @@ public class StatsLogManager implements ResourceBasedOverride {
     }
 
     /**
-     * Logs a {@link LauncherEvent}.
+     * Logs a {@link EventEnum}.
      */
-    public void log(LauncherEvent event) {
+    public void log(EventEnum event) {
     }
 
     /**
      * Logs an event and accompanying {@link InstanceId}.
      */
-    public void log(LauncherEvent event, InstanceId instanceId) {
+    public void log(EventEnum event, InstanceId instanceId) {
     }
 
     /**
      * Logs an event and accompanying {@link ItemInfo}.
      */
-    public void log(LauncherEvent event, @Nullable ItemInfo info) {
+    public void log(EventEnum event, @Nullable ItemInfo itemInfo) {
     }
 
     /**
      * Logs an event and accompanying {@link InstanceId} and {@link ItemInfo}.
      */
-    public void log(LauncherEvent event, InstanceId instanceId, @Nullable ItemInfo info) {
+    public void log(EventEnum event, InstanceId instanceId, @Nullable ItemInfo itemInfo) {
     }
 
     /**
diff --git a/src/com/android/launcher3/model/data/ItemInfo.java b/src/com/android/launcher3/model/data/ItemInfo.java
index 3a89236138..0c815d145a 100644
--- a/src/com/android/launcher3/model/data/ItemInfo.java
+++ b/src/com/android/launcher3/model/data/ItemInfo.java
@@ -22,6 +22,7 @@ import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION;
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_PREDICTION;
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_SEARCH_RESULTS;
+import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_SHORTCUTS;
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_TRAY;
 import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
 import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET;
@@ -45,6 +46,7 @@ import com.android.launcher3.logger.LauncherAtom.AllAppsContainer;
 import com.android.launcher3.logger.LauncherAtom.ContainerInfo;
 import com.android.launcher3.logger.LauncherAtom.PredictionContainer;
 import com.android.launcher3.logger.LauncherAtom.SearchResultContainer;
+import com.android.launcher3.logger.LauncherAtom.ShortcutsContainer;
 import com.android.launcher3.util.ContentWriter;
 
 import java.util.Optional;
@@ -363,6 +365,10 @@ public class ItemInfo {
                 return ContainerInfo.newBuilder()
                         .setSearchResultContainer(SearchResultContainer.getDefaultInstance())
                         .build();
+            case CONTAINER_SHORTCUTS:
+                return ContainerInfo.newBuilder()
+                        .setShortcutsContainer(ShortcutsContainer.getDefaultInstance())
+                        .build();
         }
         return ContainerInfo.getDefaultInstance();
     }
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index 331298f414..614cf1401d 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -16,6 +16,7 @@
 
 package com.android.launcher3.popup;
 
+import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_SHORTCUTS;
 import static com.android.launcher3.Utilities.squaredHypot;
 import static com.android.launcher3.Utilities.squaredTouchSlop;
 import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
@@ -61,6 +62,7 @@ import com.android.launcher3.dragndrop.DragView;
 import com.android.launcher3.dragndrop.DraggableView;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
+import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.notification.NotificationInfo;
 import com.android.launcher3.notification.NotificationItemView;
 import com.android.launcher3.notification.NotificationKeyData;
@@ -675,8 +677,10 @@ public class PopupContainerWithArrow<T extends BaseDraggingActivity> extends Arr
             iconShift.y = mIconLastTouchPos.y - mLauncher.getDeviceProfile().iconSizePx;
 
             DraggableView draggableView = DraggableView.ofType(DraggableView.DRAGGABLE_ICON);
+            WorkspaceItemInfo itemInfo = sv.getFinalInfo();
+            itemInfo.container = CONTAINER_SHORTCUTS;
             DragView dv = mLauncher.getWorkspace().beginDragShared(sv.getIconView(), draggableView,
-                    mContainer, sv.getFinalInfo(),
+                    mContainer, itemInfo,
                     new ShortcutDragPreviewProvider(sv.getIconView(), iconShift),
                     new DragOptions());
             dv.animateShift(-iconShift.x, -iconShift.y);
diff --git a/src/com/android/launcher3/popup/PopupPopulator.java b/src/com/android/launcher3/popup/PopupPopulator.java
index 7da86cc0af..6d3bc1451a 100644
--- a/src/com/android/launcher3/popup/PopupPopulator.java
+++ b/src/com/android/launcher3/popup/PopupPopulator.java
@@ -16,6 +16,8 @@
 
 package com.android.launcher3.popup;
 
+import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_SHORTCUTS;
+
 import android.content.ComponentName;
 import android.content.pm.ShortcutInfo;
 import android.os.Handler;
@@ -160,6 +162,7 @@ public class PopupPopulator {
                 final WorkspaceItemInfo si = new WorkspaceItemInfo(shortcut, launcher);
                 cache.getUnbadgedShortcutIcon(si, shortcut);
                 si.rank = i;
+                si.container = CONTAINER_SHORTCUTS;
 
                 final DeepShortcutView view = shortcutViews.get(i);
                 uiHandler.post(() -> view.applyShortcutInfo(si, shortcut, container));
diff --git a/src/com/android/launcher3/popup/SystemShortcut.java b/src/com/android/launcher3/popup/SystemShortcut.java
index ae35d4c594..58ed5e8132 100644
--- a/src/com/android/launcher3/popup/SystemShortcut.java
+++ b/src/com/android/launcher3/popup/SystemShortcut.java
@@ -1,5 +1,7 @@
 package com.android.launcher3.popup;
 
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SYSTEM_SHORTCUT_APP_INFO_TAP;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SYSTEM_SHORTCUT_WIDGETS_TAP;
 
 import android.app.ActivityOptions;
 import android.content.Context;
@@ -103,7 +105,6 @@ public abstract class SystemShortcut<T extends BaseDraggingActivity> extends Ite
     };
 
     public static class Widgets extends SystemShortcut<Launcher> {
-
         public Widgets(Launcher target, ItemInfo itemInfo) {
             super(R.drawable.ic_widget, R.string.widget_button_text, target, itemInfo);
         }
@@ -117,6 +118,9 @@ public abstract class SystemShortcut<T extends BaseDraggingActivity> extends Ite
             widgetsBottomSheet.populateAndShow(mItemInfo);
             mTarget.getUserEventDispatcher().logActionOnControl(Action.Touch.TAP,
                     ControlType.WIDGETS_BUTTON, view);
+            // TODO(thiruram): Fix missing container info when item is inside folder.
+            mTarget.getStatsLogManager().log(LAUNCHER_SYSTEM_SHORTCUT_WIDGETS_TAP,
+                    mItemInfo.buildProto());
         }
     }
 
@@ -137,6 +141,9 @@ public abstract class SystemShortcut<T extends BaseDraggingActivity> extends Ite
                     mItemInfo, sourceBounds, ActivityOptions.makeBasic().toBundle());
             mTarget.getUserEventDispatcher().logActionOnControl(Action.Touch.TAP,
                     ControlType.APPINFO_TARGET, view);
+            // TODO(thiruram): Fix missing container info when item is inside folder.
+            mTarget.getStatsLogManager().log(LAUNCHER_SYSTEM_SHORTCUT_APP_INFO_TAP,
+                    mItemInfo.buildProto());
         }
     }
 
diff --git a/src/com/android/launcher3/touch/WorkspaceTouchListener.java b/src/com/android/launcher3/touch/WorkspaceTouchListener.java
index e6de06d6f0..7270ce28fb 100644
--- a/src/com/android/launcher3/touch/WorkspaceTouchListener.java
+++ b/src/com/android/launcher3/touch/WorkspaceTouchListener.java
@@ -22,6 +22,7 @@ import static android.view.MotionEvent.ACTION_POINTER_UP;
 import static android.view.MotionEvent.ACTION_UP;
 
 import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WORKSPACE_LONGPRESS;
 
 import android.graphics.PointF;
 import android.graphics.Rect;
@@ -41,8 +42,6 @@ import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.views.OptionsPopupView;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 
 /**
  * Helper class to handle touch on empty space in workspace and show options popup on long press
@@ -175,9 +174,7 @@ public class WorkspaceTouchListener extends GestureDetector.SimpleOnGestureListe
 
                 mWorkspace.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS,
                         HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING);
-                mLauncher.getUserEventDispatcher().logActionOnContainer(Action.Touch.LONGPRESS,
-                        Action.Direction.NONE, ContainerType.WORKSPACE,
-                        mWorkspace.getCurrentPage());
+                mLauncher.getStatsLogManager().log(LAUNCHER_WORKSPACE_LONGPRESS);
                 OptionsPopupView.showDefaultOptions(mLauncher, mTouchDownPoint.x, mTouchDownPoint.y);
             } else {
                 cancelLongPress();
diff --git a/src/com/android/launcher3/util/DefaultDisplay.java b/src/com/android/launcher3/util/DefaultDisplay.java
index fabdb4e86c..150fb5b043 100644
--- a/src/com/android/launcher3/util/DefaultDisplay.java
+++ b/src/com/android/launcher3/util/DefaultDisplay.java
@@ -145,10 +145,11 @@ public class DefaultDisplay implements DisplayListener {
         }
 
         private Info(Context context) {
-            this(context.getSystemService(DisplayManager.class).getDisplay(DEFAULT_DISPLAY));
+            this(context, context.getSystemService(DisplayManager.class)
+                    .getDisplay(DEFAULT_DISPLAY));
         }
 
-        public Info(Display display) {
+        public Info(Context context, Display display) {
             id = display.getDisplayId();
             rotation = display.getRotation();
 
@@ -161,8 +162,8 @@ public class DefaultDisplay implements DisplayListener {
             display.getRealSize(realSize);
             display.getCurrentSizeRange(smallestSize, largestSize);
 
-            metrics = new DisplayMetrics();
-            display.getMetrics(metrics);
+            Context defaultDisplayContext = context.createDisplayContext(display);
+            metrics = defaultDisplayContext.getResources().getDisplayMetrics();
         }
 
         private boolean hasDifferentSize(Info info) {
diff --git a/src/com/android/launcher3/views/BaseDragLayer.java b/src/com/android/launcher3/views/BaseDragLayer.java
index 6915953068..c37c47c0a0 100644
--- a/src/com/android/launcher3/views/BaseDragLayer.java
+++ b/src/com/android/launcher3/views/BaseDragLayer.java
@@ -181,6 +181,11 @@ public abstract class BaseDragLayer<T extends Context & ActivityContext>
     }
 
     private TouchController findControllerToHandleTouch(MotionEvent ev) {
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "findControllerToHandleTouch ev=" + ev
+                    + ", isEventInLauncher=" + isEventInLauncher(ev)
+                    + ", topOpenView=" + AbstractFloatingView.getTopOpenView(mActivity));
+        }
         if (isEventInLauncher(ev)) {
             AbstractFloatingView topView = AbstractFloatingView.getTopOpenView(mActivity);
             if (topView != null && topView.onControllerInterceptTouchEvent(ev)) {
diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java
index bd12e06b60..177aff4a89 100644
--- a/src/com/android/launcher3/views/FloatingIconView.java
+++ b/src/com/android/launcher3/views/FloatingIconView.java
@@ -59,6 +59,7 @@ import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.popup.SystemShortcut;
 import com.android.launcher3.shortcuts.DeepShortcutView;
+import com.android.launcher3.testing.TestProtocol;
 
 /**
  * A view that is created to look like another view with the purpose of creating fluid animations.
@@ -560,6 +561,11 @@ public class FloatingIconView extends FrameLayout implements
         view.setVisibility(INVISIBLE);
         parent.addView(view);
         dragLayer.addView(view.mListenerView);
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "getFloatingIconView. listenerView "
+                    + "added to dragLayer. listenerView=" + view.mListenerView + ", fiv=" + view,
+                    new Exception());
+        }
         view.mListenerView.setListener(view::fastFinish);
 
         view.mEndRunnable = () -> {
@@ -639,6 +645,10 @@ public class FloatingIconView extends FrameLayout implements
     private void finish(DragLayer dragLayer) {
         ((ViewGroup) dragLayer.getParent()).removeView(this);
         dragLayer.removeView(mListenerView);
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "listenerView removed from dragLayer. "
+                    + "listenerView=" + mListenerView + ", fiv=" + this, new Exception());
+        }
         recycle();
         mLauncher.getViewCache().recycleView(R.layout.floating_icon_view, this);
     }
diff --git a/src/com/android/launcher3/views/ListenerView.java b/src/com/android/launcher3/views/ListenerView.java
index 263f7c4c32..575f86454c 100644
--- a/src/com/android/launcher3/views/ListenerView.java
+++ b/src/com/android/launcher3/views/ListenerView.java
@@ -17,18 +17,20 @@ package com.android.launcher3.views;
 
 import android.content.Context;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 
 import com.android.launcher3.AbstractFloatingView;
+import com.android.launcher3.testing.TestProtocol;
 
 /**
  * An invisible AbstractFloatingView that can run a callback when it is being closed.
  */
 public class ListenerView extends AbstractFloatingView {
 
-    public Runnable mCloseListener;
+    private Runnable mCloseListener;
 
     public ListenerView(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -36,12 +38,20 @@ public class ListenerView extends AbstractFloatingView {
     }
 
     public void setListener(Runnable listener) {
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "ListenerView setListener lv=" + this
+                    + ", listener=" + listener, new Exception());
+        }
         mCloseListener = listener;
     }
 
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "ListenerView onAttachedToWindow lv=" + this,
+                    new Exception());
+        }
         mIsOpen = true;
     }
 
@@ -49,10 +59,19 @@ public class ListenerView extends AbstractFloatingView {
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
         mIsOpen = false;
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "ListenerView onDetachedFromView lv=" + this,
+                    new Exception());
+        }
     }
 
     @Override
     protected void handleClose(boolean animate) {
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "ListenerView handeClose lv=" + this
+                    + ", mIsOpen=" + mIsOpen + ", mCloseListener=" + mCloseListener
+                    + ", getParent()=" + getParent(), new Exception());
+        }
         if (mIsOpen) {
             if (mCloseListener != null) {
                 mCloseListener.run();
@@ -77,6 +96,10 @@ public class ListenerView extends AbstractFloatingView {
 
     @Override
     public boolean onControllerInterceptTouchEvent(MotionEvent ev) {
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "ListenerView touchEvent lv=" + this
+                    + ", ev=" + ev, new Exception());
+        }
         if (ev.getAction() == MotionEvent.ACTION_DOWN) {
             handleClose(false);
         }
diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java
index d5c3c1d30e..7467186721 100644
--- a/src/com/android/launcher3/views/OptionsPopupView.java
+++ b/src/com/android/launcher3/views/OptionsPopupView.java
@@ -17,6 +17,9 @@ package com.android.launcher3.views;
 
 import static com.android.launcher3.Utilities.EXTRA_WALLPAPER_FLAVOR;
 import static com.android.launcher3.Utilities.EXTRA_WALLPAPER_OFFSET;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SETTINGS_BUTTON_TAP_OR_LONGPRESS;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WALLPAPER_BUTTON_TAP_OR_LONGPRESS;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WIDGETSTRAY_BUTTON_TAP_OR_LONGPRESS;
 
 import android.content.Context;
 import android.content.Intent;
@@ -37,13 +40,12 @@ import androidx.annotation.VisibleForTesting;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.logging.StatsLogManager.EventEnum;
 import com.android.launcher3.model.WidgetsModel;
 import com.android.launcher3.popup.ArrowPopup;
 import com.android.launcher3.shortcuts.DeepShortcutView;
 import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.TestProtocol;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ControlType;
 import com.android.launcher3.widget.WidgetsFullSheet;
 
 import java.util.ArrayList;
@@ -68,21 +70,21 @@ public class OptionsPopupView extends ArrowPopup
 
     @Override
     public void onClick(View view) {
-        handleViewClick(view, Action.Touch.TAP);
+        handleViewClick(view);
     }
 
     @Override
     public boolean onLongClick(View view) {
-        return handleViewClick(view, Action.Touch.LONGPRESS);
+        return handleViewClick(view);
     }
 
-    private boolean handleViewClick(View view, int action) {
+    private boolean handleViewClick(View view) {
         OptionItem item = mItemMap.get(view);
         if (item == null) {
             return false;
         }
-        if (item.mControlTypeForLog > 0) {
-            logTap(action, item.mControlTypeForLog);
+        if (item.mEventId.getId() > 0) {
+            mLauncher.getStatsLogManager().log(item.mEventId);
         }
         if (item.mClickListener.onLongClick(view)) {
             close(true);
@@ -91,10 +93,6 @@ public class OptionsPopupView extends ArrowPopup
         return false;
     }
 
-    private void logTap(int action, int controlType) {
-        mLauncher.getUserEventDispatcher().logActionOnControl(action, controlType);
-    }
-
     @Override
     public boolean onControllerInterceptTouchEvent(MotionEvent ev) {
         if (ev.getAction() != MotionEvent.ACTION_DOWN) {
@@ -159,13 +157,16 @@ public class OptionsPopupView extends ArrowPopup
         int resDrawable = Utilities.existsStyleWallpapers(launcher) ?
                 R.drawable.ic_palette : R.drawable.ic_wallpaper;
         options.add(new OptionItem(resString, resDrawable,
-                ControlType.WALLPAPER_BUTTON, OptionsPopupView::startWallpaperPicker));
+                LAUNCHER_WALLPAPER_BUTTON_TAP_OR_LONGPRESS,
+                OptionsPopupView::startWallpaperPicker));
         if (!WidgetsModel.GO_DISABLE_WIDGETS) {
             options.add(new OptionItem(R.string.widget_button_text, R.drawable.ic_widget,
-                    ControlType.WIDGETS_BUTTON, OptionsPopupView::onWidgetsClicked));
+                    LAUNCHER_WIDGETSTRAY_BUTTON_TAP_OR_LONGPRESS,
+                    OptionsPopupView::onWidgetsClicked));
         }
         options.add(new OptionItem(R.string.settings_button_text, R.drawable.ic_setting,
-                ControlType.SETTINGS_BUTTON, OptionsPopupView::startSettings));
+                LAUNCHER_SETTINGS_BUTTON_TAP_OR_LONGPRESS,
+                OptionsPopupView::startSettings));
 
         show(launcher, target, options);
     }
@@ -224,14 +225,14 @@ public class OptionsPopupView extends ArrowPopup
 
         private final int mLabelRes;
         private final int mIconRes;
-        private final int mControlTypeForLog;
+        private final EventEnum mEventId;
         private final OnLongClickListener mClickListener;
 
-        public OptionItem(int labelRes, int iconRes, int controlTypeForLog,
+        public OptionItem(int labelRes, int iconRes, EventEnum eventId,
                 OnLongClickListener clickListener) {
             mLabelRes = labelRes;
             mIconRes = iconRes;
-            mControlTypeForLog = controlTypeForLog;
+            mEventId = eventId;
             mClickListener = clickListener;
         }
     }
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/PreviewSurfaceRenderer.java b/src_ui_overrides/com/android/launcher3/uioverrides/PreviewSurfaceRenderer.java
deleted file mode 100644
index 4913cadb5a..0000000000
--- a/src_ui_overrides/com/android/launcher3/uioverrides/PreviewSurfaceRenderer.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.uioverrides;
-
-import android.content.Context;
-import android.os.Bundle;
-
-/** Render preview using surface view. */
-public class PreviewSurfaceRenderer {
-
-    /** Handle a received surface view request. */
-    public static void render(Context context, Bundle bundle) { }
-}
-- 
GitLab


From f903d2c910e76432ebbaa3a803b8d4e817f9ea7f Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Wed, 3 Jun 2020 18:56:27 -0400
Subject: [PATCH 0009/1664] Merging from ub-launcher3-rvc-dev @ build 6557059

Bug:150504032
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-rvc-dev_rvc-dev_6557059.html

Change-Id: I280025d9e58626fe725fe24ca60c28e89d0cee74
---
 .../hybridhotseat/HotseatEduController.java   |   8 +-
 .../hybridhotseat/HotseatEduDialog.java       |   3 +-
 .../HotseatPredictionController.java          |  10 +-
 .../hybridhotseat/HotseatRestoreHelper.java   | 100 +++++++
 .../QuickstepAtomicAnimationFactory.java      |   2 +
 .../AppToOverviewAnimationProvider.java       |   5 +-
 .../android/quickstep/BaseSwipeUpHandler.java |  21 +-
 .../quickstep/LauncherActivityInterface.java  |  14 +-
 .../quickstep/TaskShortcutFactory.java        |  26 +-
 .../com/android/quickstep/TaskViewUtils.java  |   7 +-
 .../quickstep/TouchInteractionService.java    |  48 ++--
 .../quickstep/util/RectFSpringAnim.java       |   9 +-
 .../util/StaggeredWorkspaceAnim.java          |   7 +-
 .../util/SurfaceTransactionApplier.java       | 136 ++++++++++
 .../quickstep/util/TransformParams.java       |   4 +-
 .../quickstep/views/OverviewActionsView.java  |  19 +-
 .../android/quickstep/views/RecentsView.java  |  11 +-
 .../com/android/quickstep/views/TaskView.java |   6 +-
 .../res/layout/gesture_tutorial_fragment.xml  |   3 +-
 quickstep/res/values/colors.xml               |   1 +
 quickstep/res/values/strings.xml              |  14 +-
 quickstep/res/values/styles.xml               |   6 +-
 .../launcher3/BaseQuickstepLauncher.java      |   4 +-
 .../QuickstepAppTransitionManagerImpl.java    |  14 +-
 .../launcher3/model/WellbeingModel.java       |   8 +-
 .../statehandlers/DepthController.java        |   4 +-
 .../OrientationTouchTransformer.java          |  11 +
 .../RecentsAnimationDeviceState.java          |   8 +-
 .../quickstep/RemoteAnimationTargets.java     |  73 ++++--
 .../com/android/quickstep/SystemUiProxy.java  |   5 +
 .../BackGestureTutorialController.java        |   8 -
 .../interaction/EdgeBackGesturePanel.java     |   6 +-
 .../HomeGestureTutorialController.java        | 232 +----------------
 .../OverviewGestureTutorialController.java    | 124 +++++++++
 .../OverviewGestureTutorialFragment.java      |  37 +++
 .../SwipeUpGestureTutorialController.java     | 246 ++++++++++++++++++
 .../interaction/TutorialController.java       |  19 +-
 .../interaction/TutorialFragment.java         |   3 +
 res/drawable/gesture_tutorial_ripple.xml      |   5 +-
 res/values/colors.xml                         |   6 -
 res/values/styles.xml                         |   1 -
 .../config/robolectric.properties             |   2 +-
 ...a => ShadowSurfaceTransactionApplier.java} |   6 +-
 .../android/launcher3/LauncherProvider.java   |  12 +
 .../android/launcher3/LauncherSettings.java   |   7 +
 .../launcher3/allapps/SearchUiManager.java    |   9 +
 .../search/AppsSearchContainerLayout.java     |   3 +-
 .../launcher3/config/FeatureFlags.java        |   2 +-
 .../launcher3/logging/StatsLogManager.java    |  12 +-
 .../launcher3/model/GridBackupTable.java      |  26 ++
 .../settings/DeveloperOptionsFragment.java    |   9 +
 .../states/StateAnimationConfig.java          |   6 +-
 .../launcher3/testing/TestProtocol.java       |   1 +
 53 files changed, 1018 insertions(+), 351 deletions(-)
 create mode 100644 quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatRestoreHelper.java
 create mode 100644 quickstep/recents_ui_overrides/src/com/android/quickstep/util/SurfaceTransactionApplier.java
 create mode 100644 quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
 create mode 100644 quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java
 create mode 100644 quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
 rename robolectric_tests/src/com/android/launcher3/shadows/{ShadowSyncRtSurfaceTransactionApplierCompat.java => ShadowSurfaceTransactionApplier.java} (83%)

diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduController.java
index 7c4f3ecd01..f1ce72e708 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduController.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduController.java
@@ -52,6 +52,7 @@ public class HotseatEduController {
 
     private final Launcher mLauncher;
     private final Hotseat mHotseat;
+    private final HotseatRestoreHelper mRestoreHelper;
     private List<WorkspaceItemInfo> mPredictedApps;
     private HotseatEduDialog mActiveDialog;
 
@@ -59,9 +60,10 @@ public class HotseatEduController {
     private IntArray mNewScreens = null;
     private Runnable mOnOnboardingComplete;
 
-    HotseatEduController(Launcher launcher, Runnable runnable) {
+    HotseatEduController(Launcher launcher, HotseatRestoreHelper restoreHelper, Runnable runnable) {
         mLauncher = launcher;
         mHotseat = launcher.getHotseat();
+        mRestoreHelper = restoreHelper;
         mOnOnboardingComplete = runnable;
     }
 
@@ -69,11 +71,14 @@ public class HotseatEduController {
      * Checks what type of migration should be used and migrates hotseat
      */
     void migrate() {
+        mRestoreHelper.createBackup();
         if (FeatureFlags.HOTSEAT_MIGRATE_TO_FOLDER.get()) {
             migrateToFolder();
         } else {
             migrateHotseatWhole();
         }
+        Snackbar.show(mLauncher, R.string.hotsaet_tip_prediction_enabled, R.string.hotseat_turn_off,
+                null, () -> mLauncher.startActivity(new Intent(SETTINGS_ACTION)));
     }
 
     /**
@@ -84,7 +89,6 @@ public class HotseatEduController {
      */
     private int migrateToFolder() {
         ArrayDeque<FolderInfo> folders = new ArrayDeque<>();
-
         ArrayList<WorkspaceItemInfo> putIntoFolder = new ArrayList<>();
 
         //separate folders and items that can get in folders
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java
index 66c60bca1f..fdd3562a2e 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java
@@ -16,7 +16,8 @@
 package com.android.launcher3.hybridhotseat;
 
 import static com.android.launcher3.logging.LoggerUtils.newLauncherEvent;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.ControlType.HYBRID_HOTSEAT_CANCELED;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.ControlType
+        .HYBRID_HOTSEAT_CANCELED;
 
 import android.animation.PropertyValuesHolder;
 import android.content.Context;
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
index 05bcb57adc..725f516335 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
@@ -92,6 +92,8 @@ public class HotseatPredictionController implements DragController.DragListener,
     private Launcher mLauncher;
     private final Hotseat mHotseat;
 
+    private final HotseatRestoreHelper mRestoreHelper;
+
     private List<ComponentKeyMapper> mComponentKeyMappers = new ArrayList<>();
 
     private DynamicItemCache mDynamicItemCache;
@@ -129,6 +131,7 @@ public class HotseatPredictionController implements DragController.DragListener,
         mHotSeatItemsCount = mLauncher.getDeviceProfile().inv.numHotseatIcons;
         launcher.getDeviceProfile().inv.addOnChangeListener(this);
         mHotseat.addOnAttachStateChangeListener(this);
+        mRestoreHelper = new HotseatRestoreHelper(mLauncher);
         if (mHotseat.isAttachedToWindow()) {
             onViewAttachedToWindow(mHotseat);
         }
@@ -297,7 +300,8 @@ public class HotseatPredictionController implements DragController.DragListener,
         });
         setPauseUIUpdate(false);
         if (!isEduSeen()) {
-            mHotseatEduController = new HotseatEduController(mLauncher, this::createPredictor);
+            mHotseatEduController = new HotseatEduController(mLauncher, mRestoreHelper,
+                    this::createPredictor);
         }
     }
 
@@ -320,9 +324,11 @@ public class HotseatPredictionController implements DragController.DragListener,
         updateDependencies();
         bindItems(items, false, null);
     }
-
     private void setPredictedApps(List<AppTarget> appTargets) {
         mComponentKeyMappers.clear();
+        if (appTargets.isEmpty() && mRestoreHelper.shouldRestoreToBackup()) {
+            mRestoreHelper.restoreBackup();
+        }
         StringBuilder predictionLog = new StringBuilder("predictedApps: [\n");
         ArrayList<ComponentKey> componentKeys = new ArrayList<>();
         for (AppTarget appTarget : appTargets) {
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatRestoreHelper.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatRestoreHelper.java
new file mode 100644
index 0000000000..c95ff7a2d1
--- /dev/null
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatRestoreHelper.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.hybridhotseat;
+
+import static com.android.launcher3.LauncherSettings.Favorites.HYBRID_HOTSEAT_BACKUP_TABLE;
+import static com.android.launcher3.provider.LauncherDbUtils.tableExists;
+
+import com.android.launcher3.InvariantDeviceProfile;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherSettings;
+import com.android.launcher3.model.GridBackupTable;
+import com.android.launcher3.provider.LauncherDbUtils;
+
+/**
+ * A helper class to manage migration revert restoration for hybrid hotseat
+ */
+public class HotseatRestoreHelper {
+    private final Launcher mLauncher;
+    private boolean mBackupExists;
+
+    HotseatRestoreHelper(Launcher context) {
+        mLauncher = context;
+        setupBackupTable();
+    }
+
+    /**
+     * Creates a snapshot backup of Favorite table for future restoration use.
+     */
+    public synchronized void createBackup() {
+        try (LauncherDbUtils.SQLiteTransaction transaction = (LauncherDbUtils.SQLiteTransaction)
+                LauncherSettings.Settings.call(
+                        mLauncher.getContentResolver(),
+                        LauncherSettings.Settings.METHOD_NEW_TRANSACTION)
+                        .getBinder(LauncherSettings.Settings.EXTRA_VALUE)) {
+            InvariantDeviceProfile idp = mLauncher.getDeviceProfile().inv;
+            GridBackupTable backupTable = new GridBackupTable(mLauncher,
+                    transaction.getDb(), idp.numHotseatIcons, idp.numColumns,
+                    idp.numRows);
+            backupTable.createCustomBackupTable(HYBRID_HOTSEAT_BACKUP_TABLE);
+            transaction.commit();
+            LauncherSettings.Settings.call(mLauncher.getContentResolver(),
+                    LauncherSettings.Settings.METHOD_REFRESH_HOTSEAT_RESTORE_TABLE);
+            mBackupExists = true;
+        }
+    }
+
+    /**
+     * Finds and restores a previously saved snapshow of Favorites table
+     */
+    public void restoreBackup() {
+        try (LauncherDbUtils.SQLiteTransaction transaction = (LauncherDbUtils.SQLiteTransaction)
+                LauncherSettings.Settings.call(
+                        mLauncher.getContentResolver(),
+                        LauncherSettings.Settings.METHOD_NEW_TRANSACTION)
+                        .getBinder(LauncherSettings.Settings.EXTRA_VALUE)) {
+            if (!tableExists(transaction.getDb(), HYBRID_HOTSEAT_BACKUP_TABLE)) {
+                mBackupExists = false;
+                return;
+            }
+            InvariantDeviceProfile idp = mLauncher.getDeviceProfile().inv;
+            GridBackupTable backupTable = new GridBackupTable(mLauncher,
+                    transaction.getDb(), idp.numHotseatIcons, idp.numColumns,
+                    idp.numRows);
+            backupTable.restoreFromCustomBackupTable(HYBRID_HOTSEAT_BACKUP_TABLE, true);
+            transaction.commit();
+            mBackupExists = false;
+            mLauncher.getModel().forceReload();
+        }
+    }
+
+    /**
+     * Returns if prediction controller should attempt restoring a backup
+     */
+    public synchronized boolean shouldRestoreToBackup() {
+        return mBackupExists;
+    }
+
+    private synchronized void setupBackupTable() {
+        try (LauncherDbUtils.SQLiteTransaction transaction = (LauncherDbUtils.SQLiteTransaction)
+                LauncherSettings.Settings.call(
+                        mLauncher.getContentResolver(),
+                        LauncherSettings.Settings.METHOD_NEW_TRANSACTION)
+                        .getBinder(LauncherSettings.Settings.EXTRA_VALUE)) {
+            mBackupExists = tableExists(transaction.getDb(), HYBRID_HOTSEAT_BACKUP_TABLE);
+        }
+    }
+}
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
index a487869316..79dc3e25c3 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
@@ -37,6 +37,7 @@ import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_7;
 import static com.android.launcher3.anim.Interpolators.clampToProgress;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_ACTIONS;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_DEPTH;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_TRANSLATE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE;
@@ -210,6 +211,7 @@ public class QuickstepAtomicAnimationFactory extends
             }
             config.setInterpolator(ANIM_WORKSPACE_FADE, OVERSHOOT_1_2);
             config.setInterpolator(ANIM_OVERVIEW_SCALE, OVERSHOOT_1_2);
+            config.setInterpolator(ANIM_DEPTH, OVERSHOOT_1_2);
             Interpolator translationInterpolator = ENABLE_OVERVIEW_ACTIONS.get()
                     && removeShelfFromOverview(mActivity)
                     ? OVERSHOOT_1_2
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/AppToOverviewAnimationProvider.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/AppToOverviewAnimationProvider.java
index c18a0fdebb..e5782e7a45 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/AppToOverviewAnimationProvider.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/AppToOverviewAnimationProvider.java
@@ -33,11 +33,11 @@ import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.quickstep.util.RemoteAnimationProvider;
+import com.android.quickstep.util.SurfaceTransactionApplier;
 import com.android.quickstep.util.TaskViewSimulator;
 import com.android.quickstep.util.TransformParams;
 import com.android.quickstep.views.RecentsView;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
-import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat;
 
 /**
  * Provider for the atomic (for 3-button mode) remote window animation from the app to the overview.
@@ -132,8 +132,7 @@ final class AppToOverviewAnimationProvider<T extends StatefulActivity<?>> extend
 
         TransformParams params = new TransformParams()
                 .setTargetSet(targets)
-                .setSyncTransactionApplier(
-                        new SyncRtSurfaceTransactionApplierCompat(mActivity.getRootView()));
+                .setSyncTransactionApplier(new SurfaceTransactionApplier(mActivity.getRootView()));
 
         AnimatedFloat recentsAlpha = new AnimatedFloat(() -> { });
         params.setBaseBuilderProxy((builder, app, p)
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java
index 737d837ac7..6cbe794860 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java
@@ -40,13 +40,14 @@ import com.android.launcher3.util.WindowBounds;
 import com.android.quickstep.RecentsAnimationCallbacks.RecentsAnimationListener;
 import com.android.quickstep.util.ActiveGestureLog;
 import com.android.quickstep.util.ActivityInitListener;
+import com.android.quickstep.util.RectFSpringAnim;
+import com.android.quickstep.util.SurfaceTransactionApplier;
 import com.android.quickstep.util.TransformParams;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
 import com.android.systemui.shared.recents.model.ThumbnailData;
 import com.android.systemui.shared.system.InputConsumerController;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
-import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat;
 
 import java.util.ArrayList;
 import java.util.function.Consumer;
@@ -114,10 +115,10 @@ public abstract class BaseSwipeUpHandler<T extends StatefulActivity<?>, Q extend
     public abstract Intent getLaunchIntent();
 
     protected void linkRecentsViewScroll() {
-        SyncRtSurfaceTransactionApplierCompat.create(mRecentsView, applier -> {
+        SurfaceTransactionApplier.create(mRecentsView, applier -> {
             mTransformParams.setSyncTransactionApplier(applier);
             runOnRecentsAnimationStart(() ->
-                    mRecentsAnimationTargets.addDependentTransactionApplier(applier));
+                    mRecentsAnimationTargets.addReleaseCheck(applier));
         });
 
         mRecentsView.setOnScrollChangeListener((v, scrollX, scrollY, oldScrollX, oldScrollY) -> {
@@ -356,7 +357,8 @@ public abstract class BaseSwipeUpHandler<T extends StatefulActivity<?>, Q extend
         if (mWindowTransitionController != null) {
             float progress = mCurrentShift.value / mDragLengthFactor;
             mWindowTransitionController.setPlayFraction(progress);
-
+        }
+        if (mRecentsAnimationTargets != null) {
             if (mRecentsViewScrollLinked) {
                 mTaskViewSimulator.setScroll(mRecentsView.getScrollOffset());
             }
@@ -364,6 +366,17 @@ public abstract class BaseSwipeUpHandler<T extends StatefulActivity<?>, Q extend
         }
     }
 
+    @Override
+    protected RectFSpringAnim createWindowAnimationToHome(float startProgress,
+            HomeAnimationFactory homeAnimationFactory) {
+        RectFSpringAnim anim =
+                super.createWindowAnimationToHome(startProgress, homeAnimationFactory);
+        if (mRecentsAnimationTargets != null) {
+            mRecentsAnimationTargets.addReleaseCheck(anim);
+        }
+        return anim;
+    }
+
     public interface Factory {
 
         BaseSwipeUpHandler newHandler(
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java
index 62eb235251..4801d71779 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java
@@ -310,8 +310,8 @@ public final class LauncherActivityInterface extends
     @Override
     protected float getExtraSpace(Context context, DeviceProfile dp,
             PagedOrientationHandler orientationHandler) {
-        if (dp.isVerticalBarLayout() ||
-                hideShelfInTwoButtonLandscape(context, orientationHandler)) {
+        if ((dp.isVerticalBarLayout() && !showOverviewActions(context))
+                || hideShelfInTwoButtonLandscape(context, orientationHandler)) {
             return 0;
         } else {
             Resources res = context.getResources();
@@ -319,12 +319,14 @@ public final class LauncherActivityInterface extends
                 //TODO: this needs to account for the swipe gesture height and accessibility
                 // UI when shown.
                 float actionsBottomMargin = 0;
-                if (getMode(context) == Mode.THREE_BUTTONS) {
-                    actionsBottomMargin = res.getDimensionPixelSize(
+                if (!dp.isVerticalBarLayout()) {
+                    if (getMode(context) == Mode.THREE_BUTTONS) {
+                        actionsBottomMargin = res.getDimensionPixelSize(
                             R.dimen.overview_actions_bottom_margin_three_button);
-                } else {
-                    actionsBottomMargin = res.getDimensionPixelSize(
+                    } else {
+                        actionsBottomMargin = res.getDimensionPixelSize(
                             R.dimen.overview_actions_bottom_margin_gesture);
+                    }
                 }
                 float actionsHeight = actionsBottomMargin
                         + res.getDimensionPixelSize(R.dimen.overview_actions_height);
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskShortcutFactory.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskShortcutFactory.java
index 021d39dd6e..cdaa6555a0 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskShortcutFactory.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskShortcutFactory.java
@@ -18,6 +18,8 @@ package com.android.quickstep;
 
 import static android.view.Display.DEFAULT_DISPLAY;
 
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SYSTEM_SHORTCUT_FREE_FORM_TAP;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SYSTEM_SHORTCUT_SPLIT_SCREEN_TAP;
 import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.TAP;
 
 import android.app.Activity;
@@ -35,6 +37,7 @@ import android.view.View;
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.R;
+import com.android.launcher3.logging.StatsLogManager.LauncherEvent;
 import com.android.launcher3.model.WellbeingModel;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.popup.SystemShortcut;
@@ -83,10 +86,12 @@ public interface TaskShortcutFactory {
 
         private final int mIconRes;
         private final int mTextRes;
+        private final LauncherEvent mLauncherEvent;
 
-        MultiWindowFactory(int iconRes, int textRes) {
+        MultiWindowFactory(int iconRes, int textRes, LauncherEvent launcherEvent) {
             mIconRes = iconRes;
             mTextRes = textRes;
+            mLauncherEvent = launcherEvent;
         }
 
         protected abstract boolean isAvailable(BaseDraggingActivity activity, int displayId);
@@ -102,7 +107,8 @@ public interface TaskShortcutFactory {
             if (!isAvailable(activity, task.key.displayId)) {
                 return null;
             }
-            return new MultiWindowSystemShortcut(mIconRes, mTextRes, activity, taskView, this);
+            return new MultiWindowSystemShortcut(mIconRes, mTextRes, activity, taskView, this,
+                    mLauncherEvent);
         }
     }
 
@@ -114,11 +120,12 @@ public interface TaskShortcutFactory {
         private final TaskThumbnailView mThumbnailView;
         private final TaskView mTaskView;
         private final MultiWindowFactory mFactory;
+        private final LauncherEvent mLauncherEvent;
 
-        public MultiWindowSystemShortcut(int iconRes, int textRes,
-                BaseDraggingActivity activity, TaskView taskView, MultiWindowFactory factory) {
+        public MultiWindowSystemShortcut(int iconRes, int textRes, BaseDraggingActivity activity,
+                TaskView taskView, MultiWindowFactory factory, LauncherEvent launcherEvent) {
             super(iconRes, textRes, activity, dummyInfo(taskView));
-
+            mLauncherEvent = launcherEvent;
             mHandler = new Handler(Looper.getMainLooper());
             mTaskView = taskView;
             mRecentsView = activity.getOverviewPanel();
@@ -203,12 +210,13 @@ public interface TaskShortcutFactory {
                 WindowManagerWrapper.getInstance().overridePendingAppTransitionMultiThumbFuture(
                         future, animStartedListener, mHandler, true /* scaleUp */,
                         taskKey.displayId);
+                mTarget.getStatsLogManager().log(mLauncherEvent, mTaskView.buildProto());
             }
         }
     }
 
-    TaskShortcutFactory SPLIT_SCREEN = new MultiWindowFactory(
-            R.drawable.ic_split_screen, R.string.recent_task_option_split_screen) {
+    TaskShortcutFactory SPLIT_SCREEN = new MultiWindowFactory(R.drawable.ic_split_screen,
+            R.string.recent_task_option_split_screen, LAUNCHER_SYSTEM_SHORTCUT_SPLIT_SCREEN_TAP) {
 
         @Override
         protected boolean isAvailable(BaseDraggingActivity activity, int displayId) {
@@ -241,8 +249,8 @@ public interface TaskShortcutFactory {
         }
     };
 
-    TaskShortcutFactory FREE_FORM = new MultiWindowFactory(
-            R.drawable.ic_split_screen, R.string.recent_task_option_freeform) {
+    TaskShortcutFactory FREE_FORM = new MultiWindowFactory(R.drawable.ic_split_screen,
+            R.string.recent_task_option_freeform, LAUNCHER_SYSTEM_SHORTCUT_FREE_FORM_TAP) {
 
         @Override
         protected boolean isAvailable(BaseDraggingActivity activity, int displayId) {
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskViewUtils.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskViewUtils.java
index c68d6e2e0d..e2e25f32d3 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskViewUtils.java
@@ -42,6 +42,7 @@ import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.util.DefaultDisplay;
+import com.android.quickstep.util.SurfaceTransactionApplier;
 import com.android.quickstep.util.TaskViewSimulator;
 import com.android.quickstep.util.TransformParams;
 import com.android.quickstep.views.RecentsView;
@@ -49,7 +50,6 @@ import com.android.quickstep.views.TaskThumbnailView;
 import com.android.quickstep.views.TaskView;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
-import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat;
 
 /**
  * Utility class for helpful methods related to {@link TaskView} objects and their tasks.
@@ -128,11 +128,10 @@ public final class TaskViewUtils {
             RemoteAnimationTargetCompat[] wallpaperTargets, DepthController depthController,
             PendingAnimation out) {
 
-        SyncRtSurfaceTransactionApplierCompat applier =
-                new SyncRtSurfaceTransactionApplierCompat(v);
+        SurfaceTransactionApplier applier = new SurfaceTransactionApplier(v);
         final RemoteAnimationTargets targets =
                 new RemoteAnimationTargets(appTargets, wallpaperTargets, MODE_OPENING);
-        targets.addDependentTransactionApplier(applier);
+        targets.addReleaseCheck(applier);
 
         TransformParams params = new TransformParams()
                     .setSyncTransactionApplier(applier)
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
index c8619bdd12..d6c65efe53 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
@@ -30,6 +30,7 @@ import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SYS
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_TRACING_ENABLED;
 
 import android.annotation.TargetApi;
+import android.app.ActivityManager;
 import android.app.PendingIntent;
 import android.app.RemoteAction;
 import android.app.Service;
@@ -135,10 +136,10 @@ public class TouchInteractionService extends Service implements PluginListener<O
     private static final int MAX_BACK_NOTIFICATION_COUNT = 3;
 
     /**
-     * System Action ID to show all apps.  This ID should follow the ones in
-     * com.android.systemui.accessibility.SystemActions.
+     * System Action ID to show all apps.
+     * TODO: Use AccessibilityService's corresponding global action constant in S
      */
-    private static final int SYSTEM_ACTION_ID_ALL_APPS = 100;
+    private static final int SYSTEM_ACTION_ID_ALL_APPS = 14;
 
     private int mBackGestureNotificationCounter = -1;
     @Nullable
@@ -468,10 +469,17 @@ public class TouchInteractionService extends Service implements PluginListener<O
 
         final int action = event.getAction();
         if (action == ACTION_DOWN) {
+            if (TestProtocol.sDebugTracing) {
+                Log.d(TestProtocol.NO_SWIPE_TO_HOME, "TouchInteractionService.onInputEvent:DOWN");
+            }
             mDeviceState.setOrientationTransformIfNeeded(event);
             GestureState newGestureState;
 
             if (mDeviceState.isInSwipeUpTouchRegion(event)) {
+                if (TestProtocol.sDebugTracing) {
+                    Log.d(TestProtocol.NO_SWIPE_TO_HOME,
+                            "TouchInteractionService.onInputEvent:isInSwipeUpTouchRegion");
+                }
                 // Clone the previous gesture state since onConsumerAboutToBeSwitched might trigger
                 // onConsumerInactive and wipe the previous gesture state
                 GestureState prevGestureState = new GestureState(mGestureState);
@@ -481,18 +489,22 @@ public class TouchInteractionService extends Service implements PluginListener<O
 
                 ActiveGestureLog.INSTANCE.addLog("setInputConsumer: " + mConsumer.getName());
                 mUncheckedConsumer = mConsumer;
-            } else if (mDeviceState.isUserUnlocked()
-                    && mDeviceState.isFullyGesturalNavMode()
-                    && mDeviceState.canTriggerAssistantAction(event)) {
+            } else if (mDeviceState.isUserUnlocked() && mDeviceState.isFullyGesturalNavMode()) {
                 newGestureState = createGestureState();
-                // Do not change mConsumer as if there is an ongoing QuickSwitch gesture, we should
-                // not interrupt it. QuickSwitch assumes that interruption can only happen if the
-                // next gesture is also quick switch.
-                mUncheckedConsumer = new AssistantInputConsumer(
-                    this,
-                    newGestureState,
-                    InputConsumer.NO_OP, mInputMonitorCompat,
-                    mOverviewComponentObserver.assistantGestureIsConstrained());
+                ActivityManager.RunningTaskInfo runningTask = newGestureState.getRunningTask();
+                if (mDeviceState.canTriggerAssistantAction(event, runningTask)) {
+                    // Do not change mConsumer as if there is an ongoing QuickSwitch gesture, we
+                    // should not interrupt it. QuickSwitch assumes that interruption can only
+                    // happen if the next gesture is also quick switch.
+                    mUncheckedConsumer = new AssistantInputConsumer(
+                            this,
+                            newGestureState,
+                            InputConsumer.NO_OP, mInputMonitorCompat,
+                            mOverviewComponentObserver.assistantGestureIsConstrained());
+                } else {
+                    newGestureState = DEFAULT_STATE;
+                    mUncheckedConsumer = InputConsumer.NO_OP;
+                }
             } else if (mDeviceState.canTriggerOneHandedAction(event)
                     && !mDeviceState.isOneHandedModeActive()) {
                 // Consume gesture event for triggering one handed feature.
@@ -544,6 +556,9 @@ public class TouchInteractionService extends Service implements PluginListener<O
 
     private InputConsumer newConsumer(GestureState previousGestureState,
             GestureState newGestureState, MotionEvent event) {
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.NO_SWIPE_TO_HOME, "newConsumer");
+        }
         boolean canStartSystemGesture = mDeviceState.canStartSystemGesture();
 
         if (!mDeviceState.isUserUnlocked()) {
@@ -555,6 +570,9 @@ public class TouchInteractionService extends Service implements PluginListener<O
                 return mResetGestureInputConsumer;
             }
         }
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.NO_SWIPE_TO_HOME, "newConsumer:user is unlocked");
+        }
 
         // When there is an existing recents animation running, bypass systemState check as this is
         // a followup gesture and the first gesture started in a valid system state.
@@ -566,7 +584,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
             handleOrientationSetup(base);
         }
         if (mDeviceState.isFullyGesturalNavMode()) {
-            if (mDeviceState.canTriggerAssistantAction(event)) {
+            if (mDeviceState.canTriggerAssistantAction(event, newGestureState.getRunningTask())) {
                 base = new AssistantInputConsumer(
                     this,
                     newGestureState,
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/RectFSpringAnim.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/RectFSpringAnim.java
index 8a6c4a17ae..e5d2c53d60 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/RectFSpringAnim.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/RectFSpringAnim.java
@@ -29,6 +29,7 @@ import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.FlingSpringAnim;
 import com.android.launcher3.util.DynamicResource;
+import com.android.quickstep.RemoteAnimationTargets.ReleaseCheck;
 import com.android.systemui.plugins.ResourceProvider;
 
 import java.util.ArrayList;
@@ -39,7 +40,7 @@ import java.util.List;
  * Applies spring forces to animate from a starting rect to a target rect,
  * while providing update callbacks to the caller.
  */
-public class RectFSpringAnim {
+public class RectFSpringAnim extends ReleaseCheck {
 
     private static final FloatPropertyCompat<RectFSpringAnim> RECT_CENTER_X =
             new FloatPropertyCompat<RectFSpringAnim>("rectCenterXSpring") {
@@ -116,6 +117,7 @@ public class RectFSpringAnim {
         ResourceProvider rp = DynamicResource.provider(context);
         mMinVisChange = rp.getDimension(R.dimen.swipe_up_fling_min_visible_change);
         mYOvershoot = rp.getDimension(R.dimen.swipe_up_y_overshoot);
+        setCanRelease(true);
     }
 
     public void onTargetPositionChanged() {
@@ -190,10 +192,12 @@ public class RectFSpringAnim {
                     maybeOnEnd();
                 });
 
+        setCanRelease(false);
+        mAnimsStarted = true;
+
         mRectXAnim.start();
         mRectYAnim.start();
         mRectScaleAnim.start();
-        mAnimsStarted = true;
         for (Animator.AnimatorListener animatorListener : mAnimatorListeners) {
             animatorListener.onAnimationStart(null);
         }
@@ -245,6 +249,7 @@ public class RectFSpringAnim {
     private void maybeOnEnd() {
         if (mAnimsStarted && isEnded()) {
             mAnimsStarted = false;
+            setCanRelease(true);
             for (Animator.AnimatorListener animatorListener : mAnimatorListeners) {
                 animatorListener.onAnimationEnd(null);
             }
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
index ebc9f96394..70903935bf 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
@@ -121,8 +121,11 @@ public class StaggeredWorkspaceAnim {
                 addStaggeredAnimationForView(child, grid.inv.numRows + 1, totalRows);
             }
 
-            View qsb = launcher.findViewById(R.id.search_container_all_apps);
-            addStaggeredAnimationForView(qsb, grid.inv.numRows + 2, totalRows);
+            if (launcher.getAppsView().getSearchUiManager()
+                    .isQsbVisible(NORMAL.getVisibleElements(launcher))) {
+                addStaggeredAnimationForView(launcher.getAppsView().getSearchView(),
+                        grid.inv.numRows + 2, totalRows);
+            }
         }
 
         if (animateOverviewScrim) {
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/SurfaceTransactionApplier.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/SurfaceTransactionApplier.java
new file mode 100644
index 0000000000..0a3e3ecf11
--- /dev/null
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/SurfaceTransactionApplier.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.quickstep.util;
+
+import static com.android.systemui.shared.system.TransactionCompat.deferTransactionUntil;
+import static com.android.systemui.shared.system.TransactionCompat.setEarlyWakeup;
+
+import android.annotation.TargetApi;
+import android.os.Build;
+import android.os.Handler;
+import android.os.Message;
+import android.view.SurfaceControl;
+import android.view.SurfaceControl.Transaction;
+import android.view.View;
+
+import com.android.quickstep.RemoteAnimationTargets.ReleaseCheck;
+import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
+import com.android.systemui.shared.system.ViewRootImplCompat;
+
+import java.util.function.Consumer;
+
+
+/**
+ * Helper class to apply surface transactions in sync with RenderThread similar to
+ *   android.view.SyncRtSurfaceTransactionApplier
+ * with some Launcher specific utility methods
+ */
+@TargetApi(Build.VERSION_CODES.R)
+public class SurfaceTransactionApplier extends ReleaseCheck {
+
+    private static final int MSG_UPDATE_SEQUENCE_NUMBER = 0;
+
+    private final SurfaceControl mBarrierSurfaceControl;
+    private final ViewRootImplCompat mTargetViewRootImpl;
+    private final Handler mApplyHandler;
+
+    private int mLastSequenceNumber = 0;
+
+    /**
+     * @param targetView The view in the surface that acts as synchronization anchor.
+     */
+    public SurfaceTransactionApplier(View targetView) {
+        mTargetViewRootImpl = new ViewRootImplCompat(targetView);
+        mBarrierSurfaceControl = mTargetViewRootImpl.getRenderSurfaceControl();
+        mApplyHandler = new Handler(this::onApplyMessage);
+    }
+
+    protected boolean onApplyMessage(Message msg) {
+        if (msg.what == MSG_UPDATE_SEQUENCE_NUMBER) {
+            setCanRelease(msg.arg1 == mLastSequenceNumber);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Schedules applying surface parameters on the next frame.
+     *
+     * @param params The surface parameters to apply. DO NOT MODIFY the list after passing into
+     *               this method to avoid synchronization issues.
+     */
+    public void scheduleApply(final SurfaceParams... params) {
+        View view = mTargetViewRootImpl.getView();
+        if (view == null) {
+            return;
+        }
+
+        mLastSequenceNumber++;
+        final int toApplySeqNo = mLastSequenceNumber;
+        setCanRelease(false);
+        mTargetViewRootImpl.registerRtFrameCallback(frame -> {
+            if (mBarrierSurfaceControl == null || !mBarrierSurfaceControl.isValid()) {
+                Message.obtain(mApplyHandler, MSG_UPDATE_SEQUENCE_NUMBER, toApplySeqNo, 0)
+                        .sendToTarget();
+                return;
+            }
+            Transaction t = new Transaction();
+            for (int i = params.length - 1; i >= 0; i--) {
+                SurfaceParams surfaceParams = params[i];
+                if (surfaceParams.surface.isValid()) {
+                    deferTransactionUntil(t, surfaceParams.surface, mBarrierSurfaceControl, frame);
+                    surfaceParams.applyTo(t);
+                }
+            }
+            setEarlyWakeup(t);
+            t.apply();
+            Message.obtain(mApplyHandler, MSG_UPDATE_SEQUENCE_NUMBER, toApplySeqNo, 0)
+                    .sendToTarget();
+        });
+
+        // Make sure a frame gets scheduled.
+        view.invalidate();
+    }
+
+    /**
+     * Creates an instance of SyncRtSurfaceTransactionApplier, deferring until the target view is
+     * attached if necessary.
+     */
+    public static void create(
+            final View targetView, final Consumer<SurfaceTransactionApplier> callback) {
+        if (targetView == null) {
+            // No target view, no applier
+            callback.accept(null);
+        } else if (new ViewRootImplCompat(targetView).isValid()) {
+            // Already attached, we're good to go
+            callback.accept(new SurfaceTransactionApplier(targetView));
+        } else {
+            // Haven't been attached before we can get the view root
+            targetView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
+                @Override
+                public void onViewAttachedToWindow(View v) {
+                    targetView.removeOnAttachStateChangeListener(this);
+                    callback.accept(new SurfaceTransactionApplier(targetView));
+                }
+
+                @Override
+                public void onViewDetachedFromWindow(View v) {
+                    // Do nothing
+                }
+            });
+        }
+    }
+}
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TransformParams.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TransformParams.java
index 9bb508eb37..7a62e83c39 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TransformParams.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TransformParams.java
@@ -57,7 +57,7 @@ public class TransformParams {
     private float mTargetAlpha;
     private float mCornerRadius;
     private RemoteAnimationTargets mTargetSet;
-    private SyncRtSurfaceTransactionApplierCompat mSyncTransactionApplier;
+    private SurfaceTransactionApplier mSyncTransactionApplier;
 
     private BuilderProxy mHomeBuilderProxy = BuilderProxy.ALWAYS_VISIBLE;
     private BuilderProxy mBaseBuilderProxy = BuilderProxy.ALWAYS_VISIBLE;
@@ -112,7 +112,7 @@ public class TransformParams {
      * are computed based on these TransformParams.
      */
     public TransformParams setSyncTransactionApplier(
-            SyncRtSurfaceTransactionApplierCompat applier) {
+            SurfaceTransactionApplier applier) {
         mSyncTransactionApplier = applier;
         return this;
     }
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/OverviewActionsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/OverviewActionsView.java
index 83287c463a..08c3dc9c27 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/OverviewActionsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/OverviewActionsView.java
@@ -21,6 +21,7 @@ import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_SHARE;
 import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
 
 import android.content.Context;
+import android.content.res.Configuration;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
@@ -33,6 +34,7 @@ import androidx.annotation.Nullable;
 import com.android.launcher3.R;
 import com.android.launcher3.util.MultiValueAlpha;
 import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;
+import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.TaskOverlayFactory.OverlayUICallbacks;
 
@@ -129,6 +131,12 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
         updateHiddenFlags(HIDDEN_UNSUPPORTED_NAVIGATION, !removeShelfFromOverview(getContext()));
     }
 
+    @Override
+    protected void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        updateVerticalMargin(SysUINavigationMode.getMode(getContext()));
+    }
+
     public void updateHiddenFlags(@ActionsHiddenFlags int visibilityFlags, boolean enable) {
         if (enable) {
             mHiddenFlags |= visibilityFlags;
@@ -152,10 +160,13 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
         return mMultiValueAlpha.getProperty(INDEX_FULLSCREEN_ALPHA);
     }
 
-    /** Updates vertical margins for different navigation mode. */
-    public void updateVerticalMarginForNavModeChange(Mode mode) {
-        int bottomMargin = 0;
-        if (mode == Mode.THREE_BUTTONS) {
+    /** Updates vertical margins for different navigation mode or configuration changes. */
+    public void updateVerticalMargin(Mode mode) {
+        int bottomMargin;
+        int orientation = getResources().getConfiguration().orientation;
+        if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
+            bottomMargin = 0;
+        } else if (mode == Mode.THREE_BUTTONS) {
             bottomMargin = getResources()
                     .getDimensionPixelSize(R.dimen.overview_actions_bottom_margin_three_button);
         } else {
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
index 324aaecf0e..64d90cf4f7 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
@@ -127,6 +127,7 @@ import com.android.quickstep.ViewUtils;
 import com.android.quickstep.util.LayoutUtils;
 import com.android.quickstep.util.RecentsOrientedState;
 import com.android.quickstep.util.SplitScreenBounds;
+import com.android.quickstep.util.SurfaceTransactionApplier;
 import com.android.quickstep.util.TransformParams;
 import com.android.systemui.plugins.ResourceProvider;
 import com.android.systemui.shared.recents.IPinnedStackAnimationListener;
@@ -135,7 +136,6 @@ import com.android.systemui.shared.recents.model.ThumbnailData;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.LauncherEventUtil;
 import com.android.systemui.shared.system.PackageManagerWrapper;
-import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat;
 import com.android.systemui.shared.system.TaskStackChangeListener;
 
 import java.util.ArrayList;
@@ -211,7 +211,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
     protected final BaseActivityInterface mSizeStrategy;
     protected RecentsAnimationController mRecentsAnimationController;
     protected RecentsAnimationTargets mRecentsAnimationTargets;
-    protected SyncRtSurfaceTransactionApplierCompat mSyncTransactionApplier;
+    protected SurfaceTransactionApplier mSyncTransactionApplier;
     protected int mTaskWidth;
     protected int mTaskHeight;
     protected boolean mEnableDrawingLiveTile = false;
@@ -492,6 +492,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
 
     public void init(OverviewActionsView actionsView) {
         mActionsView = actionsView;
+        mActionsView.updateHiddenFlags(HIDDEN_NO_TASKS, getTaskViewCount() == 0);
     }
 
     @Override
@@ -501,7 +502,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
         mModel.getThumbnailCache().getHighResLoadingState().addCallback(this);
         mActivity.addMultiWindowModeChangedListener(mMultiWindowModeChangedListener);
         ActivityManagerWrapper.getInstance().registerTaskStackListener(mTaskStackListener);
-        mSyncTransactionApplier = new SyncRtSurfaceTransactionApplierCompat(this);
+        mSyncTransactionApplier = new SurfaceTransactionApplier(this);
         RecentsModel.INSTANCE.get(getContext()).addThumbnailChangeListener(this);
         mIdp.addOnChangeListener(this);
         mIPinnedStackAnimationListener.setActivity(mActivity);
@@ -1626,8 +1627,10 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
                     : View.LAYOUT_DIRECTION_RTL);
             mClearAllButton.setRotation(mOrientationHandler.getDegreesRotated());
             mActivity.getDragLayer().recreateControllers();
+            boolean isInLandscape = touchRotation != 0
+                    || mOrientationState.getLauncherRotation() != ROTATION_0;
             mActionsView.updateHiddenFlags(HIDDEN_NON_ZERO_ROTATION,
-                    touchRotation != 0 || mOrientationState.getLauncherRotation() != ROTATION_0);
+                    !mOrientationState.canLauncherRotate() && isInLandscape);
             resetPaddingFromTaskSize();
             requestLayout();
         }
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 6b759ba43a..af9d7f76bc 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
@@ -30,6 +30,7 @@ import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.Interpolators.TOUCH_RESPONSE_INTERPOLATOR;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_ICON_TAP_OR_LONGPRESS;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_TAP;
 
 import android.animation.Animator;
@@ -222,8 +223,8 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         setOutlineProvider(mOutlineProvider);
     }
 
-    /* Builds proto for logging */
-    protected LauncherAtom.ItemInfo buildProto() {
+    /** Builds proto for logging */
+    public LauncherAtom.ItemInfo buildProto() {
         ComponentKey componentKey = TaskUtils.getLaunchComponentKeyForTask(getTask().key);
         LauncherAtom.ItemInfo.Builder itemBuilder = LauncherAtom.ItemInfo.newBuilder();
         itemBuilder.setIsWork(componentKey.user != Process.myUserHandle());
@@ -424,6 +425,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     private boolean showTaskMenu(int action) {
         getRecentsView().snapToPage(getRecentsView().indexOfChild(this));
         mMenuView = TaskMenuView.showForTask(this);
+        mActivity.getStatsLogManager().log(LAUNCHER_TASK_ICON_TAP_OR_LONGPRESS, buildProto());
         UserEventDispatcher.newInstance(getContext()).logActionOnItem(action, Direction.NONE,
                 LauncherLogProto.ItemType.TASK_ICON);
         if (mMenuView != null) {
diff --git a/quickstep/res/layout/gesture_tutorial_fragment.xml b/quickstep/res/layout/gesture_tutorial_fragment.xml
index 74197bef40..459d65faf7 100644
--- a/quickstep/res/layout/gesture_tutorial_fragment.xml
+++ b/quickstep/res/layout/gesture_tutorial_fragment.xml
@@ -16,7 +16,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/gesture_tutorial_background_color">
+    android:background="?android:attr/colorBackground">
 
     <View
         android:id="@+id/gesture_tutorial_ripple_view"
@@ -49,6 +49,7 @@
         android:background="@android:color/transparent"
         android:accessibilityTraversalAfter="@id/gesture_tutorial_fragment_titles_container"
         android:contentDescription="@string/gesture_tutorial_close_button_content_description"
+        android:tint="?android:attr/textColorPrimary"
         android:src="@drawable/gesture_tutorial_close_button"/>
 
     <LinearLayout
diff --git a/quickstep/res/values/colors.xml b/quickstep/res/values/colors.xml
index 3583676742..40da136ff0 100644
--- a/quickstep/res/values/colors.xml
+++ b/quickstep/res/values/colors.xml
@@ -14,5 +14,6 @@
      limitations under the License.
 -->
 <resources>
+    <color name="back_arrow_color_light">#FFFFFFFF</color>
     <color name="back_arrow_color_dark">#99000000</color>
 </resources>
\ No newline at end of file
diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml
index 37d5ca3715..1ed3b2457c 100644
--- a/quickstep/res/values/strings.xml
+++ b/quickstep/res/values/strings.xml
@@ -83,6 +83,8 @@
     <string name="hotseat_tip_no_empty_slots">Drag apps off the bottom row to get app suggestions</string>
     <!-- tip shown if user declines migration and has some open spots for prediction -->
     <string name="hotseat_tip_gaps_filled">App suggestions added to empty space</string>
+    <!-- tip shown when user migrates and predictions are enabled in hotseat -->
+    <string name="hotsaet_tip_prediction_enabled">App suggestions Enabled</string>
 
     <!-- content description for hotseat items -->
     <string name="hotseat_prediction_content_description">Predicted app: <xliff:g id="title" example="Chrome">%1$s</xliff:g></string>
@@ -110,7 +112,6 @@
     <!-- Subtitle shown on the confirmation screen after successful gesture. [CHAR LIMIT=60] -->
     <string name="back_gesture_tutorial_confirm_subtitle" translatable="false">To change the sensitivity of the back gesture, go to Settings</string>
 
-
     <!-- Title shown during interactive part of Home gesture tutorial. [CHAR LIMIT=30] -->
     <string name="home_gesture_tutorial_playground_title" translatable="false">Tutorial: Go Home</string>
     <!-- Subtitle shown during interactive parts of Home gesture tutorial. [CHAR LIMIT=60] -->
@@ -122,6 +123,17 @@
     <!-- Feedback shown during interactive parts of Home gesture tutorial when the gesture is horizontal instead of vertical. [CHAR LIMIT=100] -->
     <string name="home_gesture_feedback_wrong_swipe_direction" translatable="false">Make sure you swipe straight up</string>
 
+    <!-- Title shown during interactive part of Overview gesture tutorial. [CHAR LIMIT=30] -->
+    <string name="overview_gesture_tutorial_playground_title" translatable="false">Tutorial: Switch Apps</string>
+    <!-- Subtitle shown during interactive parts of Overview gesture tutorial. [CHAR LIMIT=60] -->
+    <string name="overview_gesture_tutorial_playground_subtitle" translatable="false">Swipe up from the bottom of the screen and hold</string>
+    <!-- Feedback shown during interactive parts of Overview gesture tutorial when the gesture is started too far from the edge. [CHAR LIMIT=100] -->
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" translatable="false">Make sure you swipe from the bottom edge of the screen</string>
+    <!-- Feedback shown during interactive parts of Overview gesture tutorial when the Home gesture is detected. [CHAR LIMIT=100] -->
+    <string name="overview_gesture_feedback_home_detected" translatable="false">Try holding the window for longer before releasing</string>
+    <!-- Feedback shown during interactive parts of Overview gesture tutorial when the gesture is horizontal instead of vertical. [CHAR LIMIT=100] -->
+    <string name="overview_gesture_feedback_wrong_swipe_direction" translatable="false">Make sure you swipe straight up and pause</string>
+
     <!-- Title shown on the confirmation screen after successful gesture. [CHAR LIMIT=30] -->
     <string name="gesture_tutorial_confirm_title" translatable="false">All set</string>
     <!-- Button text shown on a button on the confirm screen to leave the tutorial. [CHAR LIMIT=14] -->
diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml
index 90957e42ff..8d054b4be5 100644
--- a/quickstep/res/values/styles.xml
+++ b/quickstep/res/values/styles.xml
@@ -35,14 +35,14 @@
     <style name="TextAppearance.GestureTutorial.Title"
         parent="TextAppearance.GestureTutorial">
         <item name="android:gravity">center</item>
-        <item name="android:textColor">@color/gesture_tutorial_title_color</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:textSize">28sp</item>
     </style>
 
     <style name="TextAppearance.GestureTutorial.Subtitle"
         parent="TextAppearance.GestureTutorial">
         <item name="android:gravity">center</item>
-        <item name="android:textColor">@color/gesture_tutorial_subtitle_color</item>
+        <item name="android:textColor">?android:attr/textColorTertiary</item>
         <item name="android:letterSpacing">0.03</item>
         <item name="android:textSize">21sp</item>
     </style>
@@ -50,7 +50,7 @@
     <style name="TextAppearance.GestureTutorial.Feedback"
         parent="TextAppearance.GestureTutorial">
         <item name="android:gravity">center</item>
-        <item name="android:textColor">@color/gesture_tutorial_feedback_color</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:letterSpacing">0.03</item>
         <item name="android:textSize">21sp</item>
     </style>
diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 0968d8e4ad..48743070d8 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -93,7 +93,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
     public void onNavigationModeChanged(Mode newMode) {
         getDragLayer().recreateControllers();
         if (mActionsView != null && isOverviewActionsEnabled()) {
-            mActionsView.updateVerticalMarginForNavModeChange(newMode);
+            mActionsView.updateVerticalMargin(newMode);
         }
     }
 
@@ -175,7 +175,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
             // Overview is above all other launcher elements, including qsb, so move it to the top.
             getOverviewPanel().bringToFront();
             mActionsView.bringToFront();
-            mActionsView.updateVerticalMarginForNavModeChange(SysUINavigationMode.getMode(this));
+            mActionsView.updateVerticalMargin(SysUINavigationMode.getMode(this));
         }
     }
 
diff --git a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
index c0d16c9ba8..10f789d428 100644
--- a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
@@ -82,6 +82,7 @@ import com.android.quickstep.RemoteAnimationTargets;
 import com.android.quickstep.util.MultiValueUpdateListener;
 import com.android.quickstep.util.RemoteAnimationProvider;
 import com.android.quickstep.util.StaggeredWorkspaceAnim;
+import com.android.quickstep.util.SurfaceTransactionApplier;
 import com.android.systemui.shared.system.ActivityCompat;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
 import com.android.systemui.shared.system.QuickStepContract;
@@ -89,7 +90,6 @@ import com.android.systemui.shared.system.RemoteAnimationAdapterCompat;
 import com.android.systemui.shared.system.RemoteAnimationDefinitionCompat;
 import com.android.systemui.shared.system.RemoteAnimationRunnerCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
-import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat;
 import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
 import com.android.systemui.shared.system.WindowManagerWrapper;
 
@@ -455,9 +455,9 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
 
         RemoteAnimationTargets openingTargets = new RemoteAnimationTargets(appTargets,
                 wallpaperTargets, MODE_OPENING);
-        SyncRtSurfaceTransactionApplierCompat surfaceApplier =
-                new SyncRtSurfaceTransactionApplierCompat(floatingView);
-        openingTargets.addDependentTransactionApplier(surfaceApplier);
+        SurfaceTransactionApplier surfaceApplier =
+                new SurfaceTransactionApplier(floatingView);
+        openingTargets.addReleaseCheck(surfaceApplier);
 
         // Scale the app icon to take up the entire screen. This simplifies the math when
         // animating the app window position / scale.
@@ -714,8 +714,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
      */
     private Animator getUnlockWindowAnimator(RemoteAnimationTargetCompat[] appTargets,
             RemoteAnimationTargetCompat[] wallpaperTargets) {
-        SyncRtSurfaceTransactionApplierCompat surfaceApplier =
-                new SyncRtSurfaceTransactionApplierCompat(mDragLayer);
+        SurfaceTransactionApplier surfaceApplier = new SurfaceTransactionApplier(mDragLayer);
         ValueAnimator unlockAnimator = ValueAnimator.ofFloat(0, 1);
         unlockAnimator.setDuration(CLOSING_TRANSITION_DURATION_MS);
         float cornerRadius = mDeviceProfile.isMultiWindowMode ? 0 :
@@ -743,8 +742,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
      */
     private Animator getClosingWindowAnimators(RemoteAnimationTargetCompat[] appTargets,
             RemoteAnimationTargetCompat[] wallpaperTargets) {
-        SyncRtSurfaceTransactionApplierCompat surfaceApplier =
-                new SyncRtSurfaceTransactionApplierCompat(mDragLayer);
+        SurfaceTransactionApplier surfaceApplier = new SurfaceTransactionApplier(mDragLayer);
         Matrix matrix = new Matrix();
         Point tmpPos = new Point();
         ValueAnimator closingAnimator = ValueAnimator.ofFloat(0, 1);
diff --git a/quickstep/src/com/android/launcher3/model/WellbeingModel.java b/quickstep/src/com/android/launcher3/model/WellbeingModel.java
index 2181aa826a..f42b124fd6 100644
--- a/quickstep/src/com/android/launcher3/model/WellbeingModel.java
+++ b/quickstep/src/com/android/launcher3/model/WellbeingModel.java
@@ -77,6 +77,7 @@ public final class WellbeingModel {
     private static final String EXTRA_ACTION = "action";
     private static final String EXTRA_MAX_NUM_ACTIONS_SHOWN = "max_num_actions_shown";
     private static final String EXTRA_PACKAGES = "packages";
+    private static final String EXTRA_SUCCESS = "success";
 
     public static final MainThreadInitializedObject<WellbeingModel> INSTANCE =
             new MainThreadInitializedObject<>(WellbeingModel::new);
@@ -221,6 +222,7 @@ public final class WellbeingModel {
             params.putInt(EXTRA_MAX_NUM_ACTIONS_SHOWN, 1);
             // Perform wellbeing call .
             remoteActionBundle = client.call(METHOD_GET_ACTIONS, null, params);
+            if (!remoteActionBundle.getBoolean(EXTRA_SUCCESS, true)) return false;
 
             synchronized (mModelLock) {
                 // Remove the entries for requested packages, and then update the fist with what we
@@ -281,9 +283,9 @@ public final class WellbeingModel {
                 // Remove all existing messages
                 mWorkerHandler.removeCallbacksAndMessages(null);
                 final String[] packageNames = mContext.getSystemService(LauncherApps.class)
-                            .getActivityList(null, Process.myUserHandle()).stream()
-                            .map(li -> li.getApplicationInfo().packageName).distinct()
-                            .toArray(String[]::new);
+                        .getActivityList(null, Process.myUserHandle()).stream()
+                        .map(li -> li.getApplicationInfo().packageName).distinct()
+                        .toArray(String[]::new);
                 if (!updateActions(packageNames)) {
                     scheduleRefreshRetry(msg);
                 }
diff --git a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
index fcffaedfd8..ebe9e26c02 100644
--- a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
+++ b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
@@ -17,6 +17,7 @@
 package com.android.launcher3.statehandlers;
 
 import static com.android.launcher3.anim.Interpolators.LINEAR;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_DEPTH;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_DEPTH_CONTROLLER;
 
 import android.os.IBinder;
@@ -191,11 +192,12 @@ public class DepthController implements StateHandler<LauncherState> {
 
         float toDepth = toState.getDepth(mLauncher);
         if (Float.compare(mDepth, toDepth) != 0) {
-            animation.setFloat(this, DEPTH, toDepth, LINEAR);
+            animation.setFloat(this, DEPTH, toDepth, config.getInterpolator(ANIM_DEPTH, LINEAR));
         }
     }
 
     private void setDepth(float depth) {
+        depth = Utilities.boundToRange(depth, 0, 1);
         // Round out the depth to dedupe frequent, non-perceptable updates
         int depthI = (int) (depth * 256);
         float depthF = depthI / 256f;
diff --git a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
index b59f0118af..b49bc5a378 100644
--- a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
+++ b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
@@ -36,6 +36,7 @@ import android.view.Surface;
 
 import com.android.launcher3.R;
 import com.android.launcher3.ResourceUtils;
+import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.DefaultDisplay;
 
 import java.io.PrintWriter;
@@ -252,6 +253,10 @@ class OrientationTouchTransformer {
     }
 
     boolean touchInValidSwipeRegions(float x, float y) {
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.NO_SWIPE_TO_HOME, "touchInValidSwipeRegions " + x + "," + y + " in "
+                    + mLastRectTouched);
+        }
         if (mLastRectTouched != null) {
             return mLastRectTouched.contains(x, y);
         }
@@ -293,10 +298,16 @@ class OrientationTouchTransformer {
 
                 for (int i = 0; i < MAX_ORIENTATIONS; i++) {
                     OrientationRectF rect = mSwipeTouchRegions.get(i);
+                    if (TestProtocol.sDebugTracing) {
+                        Log.d(TestProtocol.NO_SWIPE_TO_HOME, "transform:DOWN, rect=" + rect);
+                    }
                     if (rect == null) {
                         continue;
                     }
                     if (rect.applyTransform(event, false)) {
+                        if (TestProtocol.sDebugTracing) {
+                            Log.d(TestProtocol.NO_SWIPE_TO_HOME, "setting mLastRectTouched");
+                        }
                         mLastRectTouched = rect;
                         mLastRectRotation = rect.mRotation;
                         if (mEnableMultipleRegions && mCurrentDisplayRotation == mLastRectRotation) {
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index c83de13618..995e9187fa 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -546,13 +546,15 @@ public class RecentsAnimationDeviceState implements
 
     /**
      * @param ev An ACTION_DOWN motion event
-     * @return whether the given motion event can trigger the assistant.
+     * @param task Info for the currently running task
+     * @return whether the given motion event can trigger the assistant over the current task.
      */
-    public boolean canTriggerAssistantAction(MotionEvent ev) {
+    public boolean canTriggerAssistantAction(MotionEvent ev, ActivityManager.RunningTaskInfo task) {
         return mAssistantAvailable
                 && !QuickStepContract.isAssistantGestureDisabled(mSystemUiStateFlags)
                 && mOrientationTouchTransformer.touchInAssistantRegion(ev)
-                && !isLockToAppActive();
+                && !isLockToAppActive()
+                && !isGestureBlockedActivity(task);
     }
 
     /**
diff --git a/quickstep/src/com/android/quickstep/RemoteAnimationTargets.java b/quickstep/src/com/android/quickstep/RemoteAnimationTargets.java
index f90df4563f..ab5e3ba0cc 100644
--- a/quickstep/src/com/android/quickstep/RemoteAnimationTargets.java
+++ b/quickstep/src/com/android/quickstep/RemoteAnimationTargets.java
@@ -16,19 +16,16 @@
 package com.android.quickstep;
 
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
-import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat;
 
-import java.util.ArrayDeque;
 import java.util.ArrayList;
-import java.util.Queue;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * Holds a collection of RemoteAnimationTargets, filtered by different properties.
  */
 public class RemoteAnimationTargets {
 
-    private final Queue<SyncRtSurfaceTransactionApplierCompat> mDependentTransactionAppliers =
-            new ArrayDeque<>(1);
+    private final CopyOnWriteArrayList<ReleaseCheck> mReleaseChecks = new CopyOnWriteArrayList<>();
 
     public final RemoteAnimationTargetCompat[] unfilteredApps;
     public final RemoteAnimationTargetCompat[] apps;
@@ -36,6 +33,8 @@ public class RemoteAnimationTargets {
     public final int targetMode;
     public final boolean hasRecents;
 
+    private boolean mReleased = false;
+
     public RemoteAnimationTargets(RemoteAnimationTargetCompat[] apps,
             RemoteAnimationTargetCompat[] wallpapers, int targetMode) {
         ArrayList<RemoteAnimationTargetCompat> filteredApps = new ArrayList<>();
@@ -76,21 +75,65 @@ public class RemoteAnimationTargets {
         return false;
     }
 
-    public void addDependentTransactionApplier(SyncRtSurfaceTransactionApplierCompat delay) {
-        mDependentTransactionAppliers.add(delay);
+    public void addReleaseCheck(ReleaseCheck check) {
+        mReleaseChecks.add(check);
     }
 
     public void release() {
-        SyncRtSurfaceTransactionApplierCompat applier = mDependentTransactionAppliers.poll();
-        if (applier == null) {
-            for (RemoteAnimationTargetCompat target : unfilteredApps) {
-                target.release();
+        if (mReleased) {
+            return;
+        }
+        for (ReleaseCheck check : mReleaseChecks) {
+            if (!check.mCanRelease) {
+                check.addOnSafeToReleaseCallback(this::release);
+                return;
             }
-            for (RemoteAnimationTargetCompat target : wallpapers) {
-                target.release();
+        }
+        mReleaseChecks.clear();
+        mReleased = true;
+
+        for (RemoteAnimationTargetCompat target : unfilteredApps) {
+            target.release();
+        }
+        for (RemoteAnimationTargetCompat target : wallpapers) {
+            target.release();
+        }
+    }
+
+    /**
+     * Interface for intercepting surface release method
+     */
+    public static class ReleaseCheck {
+
+        boolean mCanRelease = false;
+        private Runnable mAfterApplyCallback;
+
+        protected void setCanRelease(boolean canRelease) {
+            mCanRelease = canRelease;
+            if (mCanRelease && mAfterApplyCallback != null) {
+                Runnable r = mAfterApplyCallback;
+                mAfterApplyCallback = null;
+                r.run();
+            }
+        }
+
+        /**
+         * Adds a callback to notify when the surface can safely be released
+         */
+        void addOnSafeToReleaseCallback(Runnable callback) {
+            if (mCanRelease) {
+                callback.run();
+            } else {
+                if (mAfterApplyCallback == null) {
+                    mAfterApplyCallback = callback;
+                } else {
+                    final Runnable oldCallback = mAfterApplyCallback;
+                    mAfterApplyCallback = () -> {
+                        callback.run();
+                        oldCallback.run();
+                    };
+                }
             }
-        } else {
-            applier.addAfterApplyCallback(this::release);
         }
     }
 }
diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index a3eabc966c..2ca5dc68ac 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -31,6 +31,7 @@ import android.view.MotionEvent;
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.systemui.shared.recents.IPinnedStackAnimationListener;
 import com.android.systemui.shared.recents.ISystemUiProxy;
+import com.android.systemui.shared.recents.model.Task;
 
 /**
  * Holds the reference to SystemUI.
@@ -366,4 +367,8 @@ public class SystemUiProxy implements ISystemUiProxy {
             }
         }
     }
+  
+    public void handleImageBundleAsScreenshot(Bundle screenImageBundle, Rect locationInScreen,
+            Insets visibleInsets, Task.TaskKey task) {
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
index 41e86e00b6..1f398fc5ea 100644
--- a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
@@ -34,14 +34,6 @@ final class BackGestureTutorialController extends TutorialController {
         super(fragment, tutorialType);
     }
 
-    @Override
-    void transitToController() {
-        super.transitToController();
-        if (mTutorialType != BACK_NAVIGATION_COMPLETE) {
-            showHandCoachingAnimation();
-        }
-    }
-
     @Override
     Integer getTitleStringId() {
         switch (mTutorialType) {
diff --git a/quickstep/src/com/android/quickstep/interaction/EdgeBackGesturePanel.java b/quickstep/src/com/android/quickstep/interaction/EdgeBackGesturePanel.java
index 5bf50260aa..0521db4d1b 100644
--- a/quickstep/src/com/android/quickstep/interaction/EdgeBackGesturePanel.java
+++ b/quickstep/src/com/android/quickstep/interaction/EdgeBackGesturePanel.java
@@ -280,7 +280,11 @@ public class EdgeBackGesturePanel extends View {
                 new SpringForce()
                         .setStiffness(SpringForce.STIFFNESS_MEDIUM)
                         .setDampingRatio(SpringForce.DAMPING_RATIO_LOW_BOUNCY));
-        mPaint.setColor(context.getColor(R.color.back_arrow_color_dark));
+        int currentNightMode =
+                context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+        mPaint.setColor(context.getColor(currentNightMode == Configuration.UI_MODE_NIGHT_YES
+                ? R.color.back_arrow_color_light
+                : R.color.back_arrow_color_dark));
         loadDimens();
         updateArrowDirection();
 
diff --git a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
index 65f41a4a6c..0edabd45c5 100644
--- a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
@@ -15,143 +15,23 @@
  */
 package com.android.quickstep.interaction;
 
-import static com.android.launcher3.anim.Interpolators.ACCEL;
-import static com.android.launcher3.util.DefaultDisplay.getSingleFrameMs;
-import static com.android.quickstep.BaseSwipeUpHandlerV2.MAX_SWIPE_DURATION;
 import static com.android.quickstep.interaction.TutorialController.TutorialType.HOME_NAVIGATION_COMPLETE;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
 import android.annotation.TargetApi;
-import android.content.Context;
-import android.graphics.Insets;
-import android.graphics.Outline;
 import android.graphics.PointF;
-import android.graphics.Rect;
-import android.graphics.RectF;
 import android.os.Build;
-import android.view.SurfaceControl;
 import android.view.View;
-import android.view.ViewOutlineProvider;
-import android.view.WindowInsets.Type;
-import android.view.WindowManager;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
-import com.android.launcher3.anim.AnimationSuccessListener;
-import com.android.launcher3.anim.AnimatorPlaybackController;
-import com.android.launcher3.anim.PendingAnimation;
-import com.android.quickstep.AnimatedFloat;
-import com.android.quickstep.GestureState;
-import com.android.quickstep.OverviewComponentObserver;
-import com.android.quickstep.RecentsAnimationDeviceState;
-import com.android.quickstep.SwipeUpAnimationLogic;
-import com.android.quickstep.SwipeUpAnimationLogic.RunningWindowAnim;
 import com.android.quickstep.interaction.EdgeBackGestureHandler.BackGestureResult;
 import com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult;
-import com.android.quickstep.util.RectFSpringAnim;
-import com.android.quickstep.util.TransformParams;
-import com.android.systemui.shared.system.QuickStepContract;
-import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
 
 /** A {@link TutorialController} for the Home tutorial. */
 @TargetApi(Build.VERSION_CODES.R)
-final class HomeGestureTutorialController extends TutorialController {
-
-    private float mFakeTaskViewRadius;
-    private Rect mFakeTaskViewRect = new Rect();
-
-    private final ViewSwipeUpAnimation mViewSwipeUpAnimation;
-    private RunningWindowAnim mRunningWindowAnim;
+final class HomeGestureTutorialController extends SwipeUpGestureTutorialController {
 
     HomeGestureTutorialController(HomeGestureTutorialFragment fragment, TutorialType tutorialType) {
         super(fragment, tutorialType);
-
-        RecentsAnimationDeviceState deviceState = new RecentsAnimationDeviceState(mContext);
-        OverviewComponentObserver observer = new OverviewComponentObserver(mContext, deviceState);
-        mViewSwipeUpAnimation = new ViewSwipeUpAnimation(mContext, deviceState,
-                new GestureState(observer, -1));
-        observer.onDestroy();
-        deviceState.destroy();
-
-        DeviceProfile dp = InvariantDeviceProfile.INSTANCE.get(mContext)
-                .getDeviceProfile(mContext)
-                .copy(mContext);
-        Insets insets = mContext.getSystemService(WindowManager.class)
-                .getCurrentWindowMetrics()
-                .getWindowInsets()
-                .getInsets(Type.systemBars());
-        dp.updateInsets(new Rect(insets.left, insets.top, insets.right, insets.bottom));
-        mViewSwipeUpAnimation.initDp(dp);
-
-        mFakeTaskViewRadius = QuickStepContract.getWindowCornerRadius(mContext.getResources());
-
-        mFakeTaskView.setClipToOutline(true);
-        mFakeTaskView.setOutlineProvider(new ViewOutlineProvider() {
-            @Override
-            public void getOutline(View view, Outline outline) {
-                outline.setRoundRect(mFakeTaskViewRect, mFakeTaskViewRadius);
-            }
-        });
-    }
-
-    private void cancelRunningAnimation() {
-        if (mRunningWindowAnim != null) {
-            mRunningWindowAnim.cancel();
-        }
-        mRunningWindowAnim = null;
-    }
-
-    /** Fades the task view, optionally after animating to a fake Overview. */
-    private void fadeOutFakeTaskView(boolean toOverviewFirst, @Nullable Runnable onEndRunnable) {
-        cancelRunningAnimation();
-        PendingAnimation anim = new PendingAnimation(300);
-        AnimatorListenerAdapter resetTaskView = new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(Animator animation, boolean isReverse) {
-                mFakeTaskView.setVisibility(View.INVISIBLE);
-                mFakeTaskView.setAlpha(1);
-                mRunningWindowAnim = null;
-            }
-        };
-        if (toOverviewFirst) {
-            anim.setFloat(mViewSwipeUpAnimation.getCurrentShift(), AnimatedFloat.VALUE, 1, ACCEL);
-            anim.addListener(new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationEnd(Animator animation, boolean isReverse) {
-                    PendingAnimation fadeAnim = new PendingAnimation(300);
-                    fadeAnim.setViewAlpha(mFakeTaskView, 0, ACCEL);
-                    fadeAnim.addListener(resetTaskView);
-                    AnimatorSet animset = fadeAnim.buildAnim();
-                    animset.setStartDelay(100);
-                    animset.start();
-                    mRunningWindowAnim = RunningWindowAnim.wrap(animset);
-                }
-            });
-        } else {
-            anim.setViewAlpha(mFakeTaskView, 0, ACCEL);
-            anim.addListener(resetTaskView);
-        }
-        if (onEndRunnable != null) {
-            anim.addListener(AnimationSuccessListener.forRunnable(onEndRunnable));
-        }
-        AnimatorSet animset = anim.buildAnim();
-        animset.start();
-        mRunningWindowAnim = RunningWindowAnim.wrap(animset);
-    }
-
-    @Override
-    void transitToController() {
-        super.transitToController();
-        if (mTutorialType != HOME_NAVIGATION_COMPLETE) {
-            showHandCoachingAnimation();
-        }
     }
 
     @Override
@@ -190,6 +70,14 @@ final class HomeGestureTutorialController extends TutorialController {
     public void onBackGestureAttempted(BackGestureResult result) {
         switch (mTutorialType) {
             case HOME_NAVIGATION:
+                switch (result) {
+                    case BACK_COMPLETED_FROM_LEFT:
+                    case BACK_COMPLETED_FROM_RIGHT:
+                    case BACK_CANCELLED_FROM_LEFT:
+                    case BACK_CANCELLED_FROM_RIGHT:
+                        showFeedback(R.string.home_gesture_feedback_swipe_too_far_from_edge);
+                        break;
+                }
                 break;
             case HOME_NAVIGATION_COMPLETE:
                 if (result == BackGestureResult.BACK_COMPLETED_FROM_LEFT
@@ -206,17 +94,8 @@ final class HomeGestureTutorialController extends TutorialController {
             case HOME_NAVIGATION:
                 switch (result) {
                     case HOME_GESTURE_COMPLETED: {
-                        hideFeedback();
-                        cancelRunningAnimation();
-                        hideHandCoachingAnimation();
-                        RectFSpringAnim rectAnim =
-                                mViewSwipeUpAnimation.handleSwipeUpToHome(finalVelocity);
-                        // After home animation finishes, fade out and then move to the next screen.
-                        rectAnim.addAnimatorListener(AnimationSuccessListener.forRunnable(
-                                () -> fadeOutFakeTaskView(false,
-                                        () -> mTutorialFragment.changeController(
-                                                HOME_NAVIGATION_COMPLETE))));
-                        mRunningWindowAnim = RunningWindowAnim.wrap(rectAnim);
+                        animateFakeTaskViewHome(finalVelocity, () ->
+                                mTutorialFragment.changeController(HOME_NAVIGATION_COMPLETE));
                         break;
                     }
                     case HOME_NOT_STARTED_TOO_FAR_FROM_EDGE:
@@ -242,93 +121,4 @@ final class HomeGestureTutorialController extends TutorialController {
         }
     }
 
-    @Override
-    public void setNavBarGestureProgress(@Nullable Float displacement) {
-        if (displacement == null || mTutorialType == HOME_NAVIGATION_COMPLETE) {
-            mFakeTaskView.setVisibility(View.INVISIBLE);
-        } else {
-            mFakeTaskView.setVisibility(View.VISIBLE);
-            if (mRunningWindowAnim == null) {
-                mViewSwipeUpAnimation.updateDisplacement(displacement);
-            }
-        }
-    }
-
-    private class ViewSwipeUpAnimation extends SwipeUpAnimationLogic {
-
-        ViewSwipeUpAnimation(Context context, RecentsAnimationDeviceState deviceState,
-                             GestureState gestureState) {
-            super(context, deviceState, gestureState, new FakeTransformParams());
-        }
-
-        void initDp(DeviceProfile dp) {
-            initTransitionEndpoints(dp);
-            mTaskViewSimulator.setPreviewBounds(
-                    new Rect(0, 0, dp.widthPx, dp.heightPx), dp.getInsets());
-        }
-
-        @Override
-        public void updateFinalShift() {
-            float progress = mCurrentShift.value / mDragLengthFactor;
-            mWindowTransitionController.setPlayFraction(progress);
-            mTaskViewSimulator.apply(mTransformParams);
-        }
-
-        AnimatedFloat getCurrentShift() {
-            return mCurrentShift;
-        }
-
-        RectFSpringAnim handleSwipeUpToHome(PointF velocity) {
-            PointF velocityPxPerMs = new PointF(velocity.x, velocity.y);
-            float currentShift = mCurrentShift.value;
-            final float startShift = Utilities.boundToRange(currentShift - velocityPxPerMs.y
-                    * getSingleFrameMs(mContext) / mTransitionDragLength, 0, mDragLengthFactor);
-            float distanceToTravel = (1 - currentShift) * mTransitionDragLength;
-
-            // we want the page's snap velocity to approximately match the velocity at
-            // which the user flings, so we scale the duration by a value near to the
-            // derivative of the scroll interpolator at zero, ie. 2.
-            long baseDuration = Math.round(Math.abs(distanceToTravel / velocityPxPerMs.y));
-            long duration = Math.min(MAX_SWIPE_DURATION, 2 * baseDuration);
-            HomeAnimationFactory homeAnimFactory = new HomeAnimationFactory(null) {
-                @Override
-                public AnimatorPlaybackController createActivityAnimationToHome() {
-                    return AnimatorPlaybackController.wrap(new AnimatorSet(), duration);
-                }
-
-                @NonNull
-                @Override
-                public RectF getWindowTargetRect() {
-                    int fakeHomeIconSizePx = mDp.allAppsIconSizePx;
-                    int fakeHomeIconLeft = (mDp.widthPx - fakeHomeIconSizePx) / 2;
-                    int fakeHomeIconTop = mDp.heightPx - (mDp.allAppsCellHeightPx * 3);
-                    return new RectF(fakeHomeIconLeft, fakeHomeIconTop,
-                            fakeHomeIconLeft + fakeHomeIconSizePx,
-                            fakeHomeIconTop + fakeHomeIconSizePx);
-                }
-            };
-            RectFSpringAnim windowAnim = createWindowAnimationToHome(startShift, homeAnimFactory);
-            windowAnim.start(mContext, velocityPxPerMs);
-            return windowAnim;
-        }
-    }
-
-    private class FakeTransformParams extends TransformParams {
-
-        @Override
-        public SurfaceParams[] createSurfaceParams(BuilderProxy proxy) {
-            SurfaceParams.Builder builder = new SurfaceParams.Builder((SurfaceControl) null);
-            proxy.onBuildTargetParams(builder, null, this);
-            return new SurfaceParams[] {builder.build()};
-        }
-
-        @Override
-        public void applySurfaceParams(SurfaceParams[] params) {
-            SurfaceParams p = params[0];
-            mFakeTaskView.setAnimationMatrix(p.matrix);
-            mFakeTaskViewRect.set(p.windowCrop);
-            mFakeTaskViewRadius = p.cornerRadius;
-            mFakeTaskView.invalidateOutline();
-        }
-    }
 }
diff --git a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
new file mode 100644
index 0000000000..c636ebaea9
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.quickstep.interaction;
+
+import static com.android.quickstep.interaction.TutorialController.TutorialType.OVERVIEW_NAVIGATION_COMPLETE;
+
+import android.annotation.TargetApi;
+import android.graphics.PointF;
+import android.os.Build;
+import android.view.View;
+
+import com.android.launcher3.R;
+import com.android.quickstep.interaction.EdgeBackGestureHandler.BackGestureResult;
+import com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult;
+
+/** A {@link TutorialController} for the Overview tutorial. */
+@TargetApi(Build.VERSION_CODES.R)
+final class OverviewGestureTutorialController extends SwipeUpGestureTutorialController {
+
+    OverviewGestureTutorialController(OverviewGestureTutorialFragment fragment,
+            TutorialType tutorialType) {
+        super(fragment, tutorialType);
+    }
+
+    @Override
+    Integer getTitleStringId() {
+        switch (mTutorialType) {
+            case OVERVIEW_NAVIGATION:
+                return R.string.overview_gesture_tutorial_playground_title;
+            case OVERVIEW_NAVIGATION_COMPLETE:
+                return R.string.gesture_tutorial_confirm_title;
+        }
+        return null;
+    }
+
+    @Override
+    Integer getSubtitleStringId() {
+        if (mTutorialType == TutorialType.OVERVIEW_NAVIGATION) {
+            return R.string.overview_gesture_tutorial_playground_subtitle;
+        }
+        return null;
+    }
+
+    @Override
+    Integer getActionButtonStringId() {
+        if (mTutorialType == OVERVIEW_NAVIGATION_COMPLETE) {
+            return R.string.gesture_tutorial_action_button_label_done;
+        }
+        return null;
+    }
+
+    @Override
+    void onActionButtonClicked(View button) {
+        mTutorialFragment.closeTutorial();
+    }
+
+    @Override
+    public void onBackGestureAttempted(BackGestureResult result) {
+        switch (mTutorialType) {
+            case OVERVIEW_NAVIGATION:
+                switch (result) {
+                    case BACK_COMPLETED_FROM_LEFT:
+                    case BACK_COMPLETED_FROM_RIGHT:
+                    case BACK_CANCELLED_FROM_LEFT:
+                    case BACK_CANCELLED_FROM_RIGHT:
+                        showFeedback(R.string.overview_gesture_feedback_swipe_too_far_from_edge);
+                        break;
+                }
+                break;
+            case OVERVIEW_NAVIGATION_COMPLETE:
+                if (result == BackGestureResult.BACK_COMPLETED_FROM_LEFT
+                        || result == BackGestureResult.BACK_COMPLETED_FROM_RIGHT) {
+                    mTutorialFragment.closeTutorial();
+                }
+                break;
+        }
+    }
+
+    @Override
+    public void onNavBarGestureAttempted(NavBarGestureResult result, PointF finalVelocity) {
+        switch (mTutorialType) {
+            case OVERVIEW_NAVIGATION:
+                switch (result) {
+                    case HOME_GESTURE_COMPLETED: {
+                        animateFakeTaskViewHome(finalVelocity, () ->
+                                showFeedback(R.string.overview_gesture_feedback_home_detected));
+                        break;
+                    }
+                    case HOME_NOT_STARTED_TOO_FAR_FROM_EDGE:
+                    case OVERVIEW_NOT_STARTED_TOO_FAR_FROM_EDGE:
+                        showFeedback(R.string.overview_gesture_feedback_swipe_too_far_from_edge);
+                        break;
+                    case OVERVIEW_GESTURE_COMPLETED:
+                        fadeOutFakeTaskView(true, () ->
+                                mTutorialFragment.changeController(OVERVIEW_NAVIGATION_COMPLETE));
+                        break;
+                    case HOME_OR_OVERVIEW_NOT_STARTED_WRONG_SWIPE_DIRECTION:
+                    case HOME_OR_OVERVIEW_CANCELLED:
+                        fadeOutFakeTaskView(false, null);
+                        showFeedback(R.string.overview_gesture_feedback_wrong_swipe_direction);
+                        break;
+                }
+                break;
+            case OVERVIEW_NAVIGATION_COMPLETE:
+                if (result == NavBarGestureResult.HOME_GESTURE_COMPLETED) {
+                    mTutorialFragment.closeTutorial();
+                }
+                break;
+        }
+    }
+}
diff --git a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java
new file mode 100644
index 0000000000..3357b70497
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.quickstep.interaction;
+
+import com.android.launcher3.R;
+import com.android.quickstep.interaction.TutorialController.TutorialType;
+
+/** Shows the Overview gesture interactive tutorial. */
+public class OverviewGestureTutorialFragment extends TutorialFragment {
+    @Override
+    int getHandAnimationResId() {
+        return R.drawable.overview_gesture;
+    }
+
+    @Override
+    TutorialController createController(TutorialType type) {
+        return new OverviewGestureTutorialController(this, type);
+    }
+
+    @Override
+    Class<? extends TutorialController> getControllerClass() {
+        return OverviewGestureTutorialController.class;
+    }
+}
diff --git a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
new file mode 100644
index 0000000000..14e00dce7a
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
@@ -0,0 +1,246 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.quickstep.interaction;
+
+import static com.android.launcher3.anim.Interpolators.ACCEL;
+import static com.android.launcher3.util.DefaultDisplay.getSingleFrameMs;
+import static com.android.quickstep.BaseSwipeUpHandlerV2.MAX_SWIPE_DURATION;
+import static com.android.quickstep.interaction.TutorialController.TutorialType.HOME_NAVIGATION_COMPLETE;
+import static com.android.quickstep.interaction.TutorialController.TutorialType.OVERVIEW_NAVIGATION_COMPLETE;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.graphics.Insets;
+import android.graphics.Outline;
+import android.graphics.PointF;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.os.Build;
+import android.view.SurfaceControl;
+import android.view.View;
+import android.view.ViewOutlineProvider;
+import android.view.WindowInsets;
+import android.view.WindowManager;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.InvariantDeviceProfile;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.anim.AnimationSuccessListener;
+import com.android.launcher3.anim.AnimatorPlaybackController;
+import com.android.launcher3.anim.PendingAnimation;
+import com.android.quickstep.AnimatedFloat;
+import com.android.quickstep.GestureState;
+import com.android.quickstep.OverviewComponentObserver;
+import com.android.quickstep.RecentsAnimationDeviceState;
+import com.android.quickstep.SwipeUpAnimationLogic;
+import com.android.quickstep.SwipeUpAnimationLogic.RunningWindowAnim;
+import com.android.quickstep.util.RectFSpringAnim;
+import com.android.quickstep.util.TransformParams;
+import com.android.systemui.shared.system.QuickStepContract;
+import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
+
+@TargetApi(Build.VERSION_CODES.R)
+abstract class SwipeUpGestureTutorialController extends TutorialController {
+    private final ViewSwipeUpAnimation mViewSwipeUpAnimation;
+    private float mFakeTaskViewRadius;
+    private Rect mFakeTaskViewRect = new Rect();
+    private RunningWindowAnim mRunningWindowAnim;
+
+    SwipeUpGestureTutorialController(TutorialFragment tutorialFragment, TutorialType tutorialType) {
+        super(tutorialFragment, tutorialType);
+        RecentsAnimationDeviceState deviceState = new RecentsAnimationDeviceState(mContext);
+        OverviewComponentObserver observer = new OverviewComponentObserver(mContext, deviceState);
+        mViewSwipeUpAnimation = new ViewSwipeUpAnimation(mContext, deviceState,
+                new GestureState(observer, -1));
+        observer.onDestroy();
+        deviceState.destroy();
+
+        DeviceProfile dp = InvariantDeviceProfile.INSTANCE.get(mContext)
+                .getDeviceProfile(mContext)
+                .copy(mContext);
+        Insets insets = mContext.getSystemService(WindowManager.class)
+                .getCurrentWindowMetrics()
+                .getWindowInsets()
+                .getInsets(WindowInsets.Type.systemBars());
+        dp.updateInsets(new Rect(insets.left, insets.top, insets.right, insets.bottom));
+        mViewSwipeUpAnimation.initDp(dp);
+
+        mFakeTaskViewRadius = QuickStepContract.getWindowCornerRadius(mContext.getResources());
+        mFakeTaskView.setClipToOutline(true);
+        mFakeTaskView.setOutlineProvider(new ViewOutlineProvider() {
+            @Override
+            public void getOutline(View view, Outline outline) {
+                outline.setRoundRect(mFakeTaskViewRect, mFakeTaskViewRadius);
+            }
+        });
+    }
+
+    private void cancelRunningAnimation() {
+        if (mRunningWindowAnim != null) {
+            mRunningWindowAnim.cancel();
+        }
+        mRunningWindowAnim = null;
+    }
+
+    /** Fades the task view, optionally after animating to a fake Overview. */
+    void fadeOutFakeTaskView(boolean toOverviewFirst, @Nullable Runnable onEndRunnable) {
+        hideFeedback();
+        hideHandCoachingAnimation();
+        cancelRunningAnimation();
+        PendingAnimation anim = new PendingAnimation(300);
+        AnimatorListenerAdapter resetTaskView = new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation, boolean isReverse) {
+                mFakeTaskView.setVisibility(View.INVISIBLE);
+                mFakeTaskView.setAlpha(1);
+                mRunningWindowAnim = null;
+            }
+        };
+        if (toOverviewFirst) {
+            anim.setFloat(mViewSwipeUpAnimation.getCurrentShift(), AnimatedFloat.VALUE, 1, ACCEL);
+            anim.addListener(new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationEnd(Animator animation, boolean isReverse) {
+                    PendingAnimation fadeAnim = new PendingAnimation(300);
+                    fadeAnim.setViewAlpha(mFakeTaskView, 0, ACCEL);
+                    fadeAnim.addListener(resetTaskView);
+                    AnimatorSet animset = fadeAnim.buildAnim();
+                    animset.setStartDelay(100);
+                    animset.start();
+                    mRunningWindowAnim = RunningWindowAnim.wrap(animset);
+                }
+            });
+        } else {
+            anim.setViewAlpha(mFakeTaskView, 0, ACCEL);
+            anim.addListener(resetTaskView);
+        }
+        if (onEndRunnable != null) {
+            anim.addListener(AnimationSuccessListener.forRunnable(onEndRunnable));
+        }
+        AnimatorSet animset = anim.buildAnim();
+        animset.start();
+        mRunningWindowAnim = RunningWindowAnim.wrap(animset);
+    }
+
+    void animateFakeTaskViewHome(PointF finalVelocity, @Nullable Runnable onEndRunnable) {
+        hideFeedback();
+        hideHandCoachingAnimation();
+        cancelRunningAnimation();
+        RectFSpringAnim rectAnim =
+                mViewSwipeUpAnimation.handleSwipeUpToHome(finalVelocity);
+        // After home animation finishes, fade out and run onEndRunnable.
+        rectAnim.addAnimatorListener(AnimationSuccessListener.forRunnable(
+                () -> fadeOutFakeTaskView(false, onEndRunnable)));
+        mRunningWindowAnim = RunningWindowAnim.wrap(rectAnim);
+    }
+
+    @Override
+    public void setNavBarGestureProgress(@Nullable Float displacement) {
+        if (displacement == null || mTutorialType == HOME_NAVIGATION_COMPLETE
+                || mTutorialType == OVERVIEW_NAVIGATION_COMPLETE) {
+            mFakeTaskView.setVisibility(View.INVISIBLE);
+        } else {
+            mFakeTaskView.setVisibility(View.VISIBLE);
+            if (mRunningWindowAnim == null) {
+                mViewSwipeUpAnimation.updateDisplacement(displacement);
+            }
+        }
+    }
+
+    class ViewSwipeUpAnimation extends SwipeUpAnimationLogic {
+
+        ViewSwipeUpAnimation(Context context, RecentsAnimationDeviceState deviceState,
+                             GestureState gestureState) {
+            super(context, deviceState, gestureState, new FakeTransformParams());
+        }
+
+        void initDp(DeviceProfile dp) {
+            initTransitionEndpoints(dp);
+            mTaskViewSimulator.setPreviewBounds(
+                    new Rect(0, 0, dp.widthPx, dp.heightPx), dp.getInsets());
+        }
+
+        @Override
+        public void updateFinalShift() {
+            float progress = mCurrentShift.value / mDragLengthFactor;
+            mWindowTransitionController.setPlayFraction(progress);
+            mTaskViewSimulator.apply(mTransformParams);
+        }
+
+        AnimatedFloat getCurrentShift() {
+            return mCurrentShift;
+        }
+
+        RectFSpringAnim handleSwipeUpToHome(PointF velocity) {
+            PointF velocityPxPerMs = new PointF(velocity.x, velocity.y);
+            float currentShift = mCurrentShift.value;
+            final float startShift = Utilities.boundToRange(currentShift - velocityPxPerMs.y
+                    * getSingleFrameMs(mContext) / mTransitionDragLength, 0, mDragLengthFactor);
+            float distanceToTravel = (1 - currentShift) * mTransitionDragLength;
+
+            // we want the page's snap velocity to approximately match the velocity at
+            // which the user flings, so we scale the duration by a value near to the
+            // derivative of the scroll interpolator at zero, ie. 2.
+            long baseDuration = Math.round(Math.abs(distanceToTravel / velocityPxPerMs.y));
+            long duration = Math.min(MAX_SWIPE_DURATION, 2 * baseDuration);
+            HomeAnimationFactory homeAnimFactory = new HomeAnimationFactory(null) {
+                @Override
+                public AnimatorPlaybackController createActivityAnimationToHome() {
+                    return AnimatorPlaybackController.wrap(new AnimatorSet(), duration);
+                }
+
+                @NonNull
+                @Override
+                public RectF getWindowTargetRect() {
+                    int fakeHomeIconSizePx = mDp.allAppsIconSizePx;
+                    int fakeHomeIconLeft = (mDp.widthPx - fakeHomeIconSizePx) / 2;
+                    int fakeHomeIconTop = mDp.heightPx - (mDp.allAppsCellHeightPx * 3);
+                    return new RectF(fakeHomeIconLeft, fakeHomeIconTop,
+                            fakeHomeIconLeft + fakeHomeIconSizePx,
+                            fakeHomeIconTop + fakeHomeIconSizePx);
+                }
+            };
+            RectFSpringAnim windowAnim = createWindowAnimationToHome(startShift, homeAnimFactory);
+            windowAnim.start(mContext, velocityPxPerMs);
+            return windowAnim;
+        }
+    }
+
+    private class FakeTransformParams extends TransformParams {
+
+        @Override
+        public SurfaceParams[] createSurfaceParams(BuilderProxy proxy) {
+            SurfaceParams.Builder builder = new SurfaceParams.Builder((SurfaceControl) null);
+            proxy.onBuildTargetParams(builder, null, this);
+            return new SurfaceParams[] {builder.build()};
+        }
+
+        @Override
+        public void applySurfaceParams(SurfaceParams[] params) {
+            SurfaceParams p = params[0];
+            mFakeTaskView.setAnimationMatrix(p.matrix);
+            mFakeTaskViewRect.set(p.windowCrop);
+            mFakeTaskViewRadius = p.cornerRadius;
+            mFakeTaskView.invalidateOutline();
+        }
+    }
+}
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
index f27d500eff..511c8b6dc6 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
@@ -140,6 +140,9 @@ abstract class TutorialController implements BackGestureAttemptCallback,
     void onActionTextButtonClicked(View button) {}
 
     void showHandCoachingAnimation() {
+        if (isComplete()) {
+            return;
+        }
         mHandCoachingAnimation.startLoopedAnimation(mTutorialType);
     }
 
@@ -153,6 +156,12 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         hideFeedback();
         updateTitles();
         updateActionButtons();
+
+        if (isComplete()) {
+            hideHandCoachingAnimation();
+        } else {
+            showHandCoachingAnimation();
+        }
     }
 
     private void updateTitles() {
@@ -190,12 +199,20 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         button.setOnClickListener(listener);
     }
 
+    private boolean isComplete() {
+        return mTutorialType == TutorialType.BACK_NAVIGATION_COMPLETE
+                || mTutorialType == TutorialType.HOME_NAVIGATION_COMPLETE
+                || mTutorialType == TutorialType.OVERVIEW_NAVIGATION_COMPLETE;
+    }
+
     /** Denotes the type of the tutorial. */
     enum TutorialType {
         RIGHT_EDGE_BACK_NAVIGATION,
         LEFT_EDGE_BACK_NAVIGATION,
         BACK_NAVIGATION_COMPLETE,
         HOME_NAVIGATION,
-        HOME_NAVIGATION_COMPLETE
+        HOME_NAVIGATION_COMPLETE,
+        OVERVIEW_NAVIGATION,
+        OVERVIEW_NAVIGATION_COMPLETE
     }
 }
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
index a3881cffb0..da6815d776 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
@@ -68,6 +68,9 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
             case HOME_NAVIGATION:
             case HOME_NAVIGATION_COMPLETE:
                 return new HomeGestureTutorialFragment();
+            case OVERVIEW_NAVIGATION:
+            case OVERVIEW_NAVIGATION_COMPLETE:
+                return new OverviewGestureTutorialFragment();
             default:
                 Log.e(LOG_TAG, "Failed to find an appropriate fragment for " + tutorialType.name());
         }
diff --git a/res/drawable/gesture_tutorial_ripple.xml b/res/drawable/gesture_tutorial_ripple.xml
index ca456627c5..782af33ab3 100644
--- a/res/drawable/gesture_tutorial_ripple.xml
+++ b/res/drawable/gesture_tutorial_ripple.xml
@@ -1,6 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple android:color="@color/gesture_tutorial_ripple_color"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@android:id/mask"
-        android:drawable="@color/gesture_tutorial_background_color" />
-</ripple>
\ No newline at end of file
+    xmlns:android="http://schemas.android.com/apk/res/android"/>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index c4ec7dd7f0..043ad9a9d5 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -38,14 +38,8 @@
     <color name="all_apps_bg_hand_fill">#E5E5E5</color>
     <color name="all_apps_bg_hand_fill_dark">#9AA0A6</color>
 
-    <color name="gesture_tutorial_background_color">#FFFFFFFF</color>
-    <color name="gesture_tutorial_title_color">#FF000000</color>
-    <color name="gesture_tutorial_subtitle_color">#99000000</color> <!-- 60% black -->
-    <color name="gesture_tutorial_feedback_color">#FF000000</color>
     <color name="gesture_tutorial_ripple_color">#A0C2F9</color> <!-- Light Blue -->
     <color name="gesture_tutorial_fake_task_view_color">#6DA1FF</color> <!-- Light Blue -->
     <color name="gesture_tutorial_action_button_label_color">#FFFFFFFF</color>
     <color name="gesture_tutorial_primary_color">#1A73E8</color> <!-- Blue -->
-
-
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 26b72052fd..e470c42459 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -81,7 +81,6 @@
         <item name="folderFillColor">#CDFFFFFF</item>
         <item name="folderIconBorderColor">#FF80868B</item>
         <item name="folderTextColor">?attr/workspaceTextColor</item>
-
     </style>
 
     <style name="LauncherTheme.Dark" parent="@style/LauncherTheme">
diff --git a/robolectric_tests/config/robolectric.properties b/robolectric_tests/config/robolectric.properties
index c162255bb4..b1717120af 100644
--- a/robolectric_tests/config/robolectric.properties
+++ b/robolectric_tests/config/robolectric.properties
@@ -13,6 +13,6 @@ shadows= \
     com.android.launcher3.shadows.ShadowLooperExecutor \
     com.android.launcher3.shadows.ShadowMainThreadInitializedObject \
     com.android.launcher3.shadows.ShadowOverrides \
-    com.android.launcher3.shadows.ShadowSyncRtSurfaceTransactionApplierCompat \
+    com.android.launcher3.shadows.ShadowSurfaceTransactionApplier \
 
 application=com.android.launcher3.util.LauncherTestApplication
\ No newline at end of file
diff --git a/robolectric_tests/src/com/android/launcher3/shadows/ShadowSyncRtSurfaceTransactionApplierCompat.java b/robolectric_tests/src/com/android/launcher3/shadows/ShadowSurfaceTransactionApplier.java
similarity index 83%
rename from robolectric_tests/src/com/android/launcher3/shadows/ShadowSyncRtSurfaceTransactionApplierCompat.java
rename to robolectric_tests/src/com/android/launcher3/shadows/ShadowSurfaceTransactionApplier.java
index 238926c65f..a9f2f270a3 100644
--- a/robolectric_tests/src/com/android/launcher3/shadows/ShadowSyncRtSurfaceTransactionApplierCompat.java
+++ b/robolectric_tests/src/com/android/launcher3/shadows/ShadowSurfaceTransactionApplier.java
@@ -26,11 +26,11 @@ import org.robolectric.annotation.Implements;
 import org.robolectric.annotation.RealObject;
 
 /**
- * Shadow for SyncRtSurfaceTransactionApplierCompat to override default functionality
+ * Shadow for SurfaceTransactionApplier to override default functionality
  */
-@Implements(className = "com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat",
+@Implements(className = "com.android.quickstep.util.SurfaceTransactionApplier",
         isInAndroidSdk = false)
-public class ShadowSyncRtSurfaceTransactionApplierCompat {
+public class ShadowSurfaceTransactionApplier {
 
     @RealObject
     private Object mRealObject;
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 48b97fafd3..e8b5568783 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -411,6 +411,11 @@ public class LauncherProvider extends ContentProvider {
                         Favorites.BACKUP_TABLE_NAME);
                 return null;
             }
+            case LauncherSettings.Settings.METHOD_REFRESH_HOTSEAT_RESTORE_TABLE: {
+                mOpenHelper.mHotseatRestoreTableExists = tableExists(
+                        mOpenHelper.getReadableDatabase(), Favorites.HYBRID_HOTSEAT_BACKUP_TABLE);
+                return null;
+            }
             case LauncherSettings.Settings.METHOD_RESTORE_BACKUP_TABLE: {
                 final long ts = System.currentTimeMillis();
                 if (ts - mLastRestoreTimestamp > RESTORE_BACKUP_TABLE_DELAY) {
@@ -609,6 +614,7 @@ public class LauncherProvider extends ContentProvider {
         private int mMaxItemId = -1;
         private int mMaxScreenId = -1;
         private boolean mBackupTableExists;
+        private boolean mHotseatRestoreTableExists;
 
         static DatabaseHelper createDatabaseHelper(Context context, boolean forMigration) {
             return createDatabaseHelper(context, null, forMigration);
@@ -633,6 +639,8 @@ public class LauncherProvider extends ContentProvider {
                 databaseHelper.mBackupTableExists = tableExists(
                         databaseHelper.getReadableDatabase(), Favorites.BACKUP_TABLE_NAME);
             }
+            databaseHelper.mHotseatRestoreTableExists = tableExists(
+                    databaseHelper.getReadableDatabase(), Favorites.HYBRID_HOTSEAT_BACKUP_TABLE);
 
             databaseHelper.initIds();
             return databaseHelper;
@@ -679,6 +687,10 @@ public class LauncherProvider extends ContentProvider {
                 dropTable(db, Favorites.BACKUP_TABLE_NAME);
                 mBackupTableExists = false;
             }
+            if (mHotseatRestoreTableExists) {
+                dropTable(db, Favorites.HYBRID_HOTSEAT_BACKUP_TABLE);
+                mHotseatRestoreTableExists = false;
+            }
         }
 
         /**
diff --git a/src/com/android/launcher3/LauncherSettings.java b/src/com/android/launcher3/LauncherSettings.java
index 2cb3910793..2a5ee001d5 100644
--- a/src/com/android/launcher3/LauncherSettings.java
+++ b/src/com/android/launcher3/LauncherSettings.java
@@ -99,6 +99,11 @@ public class LauncherSettings {
          */
         public static final String BACKUP_TABLE_NAME = "favorites_bakup";
 
+        /**
+         * Backup table created when user hotseat is moved to workspace for hybrid hotseat
+         */
+        public static final String HYBRID_HOTSEAT_BACKUP_TABLE = "hotseat_restore_backup";
+
         /**
          * Temporary table used specifically for grid migrations during wallpaper preview
          */
@@ -333,6 +338,8 @@ public class LauncherSettings {
 
         public static final String METHOD_REFRESH_BACKUP_TABLE = "refresh_backup_table";
 
+        public static final String METHOD_REFRESH_HOTSEAT_RESTORE_TABLE = "restore_hotseat_table";
+
         public static final String METHOD_RESTORE_BACKUP_TABLE = "restore_backup_table";
 
         public static final String METHOD_UPDATE_CURRENT_OPEN_HELPER = "update_current_open_helper";
diff --git a/src/com/android/launcher3/allapps/SearchUiManager.java b/src/com/android/launcher3/allapps/SearchUiManager.java
index 34bf636cb4..7d5363f269 100644
--- a/src/com/android/launcher3/allapps/SearchUiManager.java
+++ b/src/com/android/launcher3/allapps/SearchUiManager.java
@@ -15,6 +15,8 @@
  */
 package com.android.launcher3.allapps;
 
+import static com.android.launcher3.LauncherState.ALL_APPS_HEADER;
+
 import android.graphics.Rect;
 import android.view.KeyEvent;
 import android.view.animation.Interpolator;
@@ -56,6 +58,13 @@ public interface SearchUiManager {
     void setContentVisibility(int visibleElements, PropertySetter setter,
             Interpolator interpolator);
 
+    /**
+     * Returns true if the QSB should be visible for the given set of visible elements
+     */
+    default boolean isQsbVisible(int visibleElements) {
+        return (visibleElements & ALL_APPS_HEADER) != 0;
+    }
+
     /**
      * Called to control how the search UI result should be handled.
      *
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
index e72e1a8bc1..356c52ca39 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
@@ -19,7 +19,6 @@ import static android.view.View.MeasureSpec.EXACTLY;
 import static android.view.View.MeasureSpec.getSize;
 import static android.view.View.MeasureSpec.makeMeasureSpec;
 
-import static com.android.launcher3.LauncherState.ALL_APPS_HEADER;
 import static com.android.launcher3.Utilities.prefixTextWithIcon;
 import static com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR;
 
@@ -213,7 +212,7 @@ public class AppsSearchContainerLayout extends ExtendedEditText
     @Override
     public void setContentVisibility(int visibleElements, PropertySetter setter,
             Interpolator interpolator) {
-        setter.setViewAlpha(this, (visibleElements & ALL_APPS_HEADER) != 0 ? 1 : 0, interpolator);
+        setter.setViewAlpha(this, isQsbVisible(visibleElements) ? 1 : 0, interpolator);
     }
 
     @Override
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 978dd52a4f..118ce0c44d 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -103,7 +103,7 @@ public final class FeatureFlags {
             "Adds localized title and keyword search and ranking");
 
     public static final BooleanFlag ENABLE_PREDICTION_DISMISS = getDebugFlag(
-            "ENABLE_PREDICTION_DISMISS", false, "Allow option to dimiss apps from predicted list");
+            "ENABLE_PREDICTION_DISMISS", true, "Allow option to dimiss apps from predicted list");
 
     public static final BooleanFlag ENABLE_QUICK_CAPTURE_GESTURE = getDebugFlag(
             "ENABLE_QUICK_CAPTURE_GESTURE", true, "Swipe from right to left to quick capture");
diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index dda39e8a51..85013d7216 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -96,13 +96,23 @@ public class StatsLogManager implements ResourceBasedOverride {
                 + "the icon onto 'Uninstall' button in the target bar")
         LAUNCHER_ITEM_UNINSTALL_CANCELLED(470),
 
+        @UiEvent(doc = "User tapped or long pressed on the task icon(aka package icon) "
+                + "from overview to open task menu.")
+        LAUNCHER_TASK_ICON_TAP_OR_LONGPRESS(517),
+
         @UiEvent(doc = "User opened package specific widgets list by tapping on widgets system "
                 + "shortcut within longpress popup window.")
         LAUNCHER_SYSTEM_SHORTCUT_WIDGETS_TAP(514),
 
         @UiEvent(doc = "User opened app info of the package by tapping on appinfo system shortcut "
                 + "within longpress popup window.")
-        LAUNCHER_SYSTEM_SHORTCUT_APP_INFO_TAP(515);
+        LAUNCHER_SYSTEM_SHORTCUT_APP_INFO_TAP(515),
+
+        @UiEvent(doc = "User tapped on split screen icon on a task menu.")
+        LAUNCHER_SYSTEM_SHORTCUT_SPLIT_SCREEN_TAP(518),
+
+        @UiEvent(doc = "User tapped on free form icon on a task menu.")
+        LAUNCHER_SYSTEM_SHORTCUT_FREE_FORM_TAP(519);
         // ADD MORE
 
         private final int mId;
diff --git a/src/com/android/launcher3/model/GridBackupTable.java b/src/com/android/launcher3/model/GridBackupTable.java
index 4a1bc4df88..acfc339268 100644
--- a/src/com/android/launcher3/model/GridBackupTable.java
+++ b/src/com/android/launcher3/model/GridBackupTable.java
@@ -127,6 +127,32 @@ public class GridBackupTable {
         return mRestoredHotseatSize;
     }
 
+    /**
+     * Creates a new table and populates with copy of Favorites.TABLE_NAME
+     */
+    public void createCustomBackupTable(String tableName) {
+        long profileId = UserCache.INSTANCE.get(mContext).getSerialNumberForUser(
+                Process.myUserHandle());
+        copyTable(mDb, Favorites.TABLE_NAME, tableName, profileId);
+        encodeDBProperties(0);
+    }
+
+    /**
+     *
+     * Restores the contents of a custom table to Favorites.TABLE_NAME
+     */
+
+    public void restoreFromCustomBackupTable(String tableName, boolean dropAfterUse) {
+        if (!tableExists(mDb, tableName)) {
+            return;
+        }
+        long userSerial = UserCache.INSTANCE.get(mContext).getSerialNumberForUser(
+                Process.myUserHandle());
+        copyTable(mDb, tableName, Favorites.TABLE_NAME, userSerial);
+        if (dropAfterUse) {
+            dropTable(mDb, tableName);
+        }
+    }
     /**
      * Copy valid grid entries from one table to another.
      */
diff --git a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
index 5bf91737c1..e80ee2cfe9 100644
--- a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
+++ b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
@@ -237,6 +237,15 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
             return true;
         });
         sandboxCategory.addPreference(launchHomeTutorialPreference);
+        Preference launchOverviewTutorialPreference = new Preference(context);
+        launchOverviewTutorialPreference.setKey("launchOverviewTutorial");
+        launchOverviewTutorialPreference.setTitle("Launch Overview Tutorial");
+        launchOverviewTutorialPreference.setSummary("Learn how to use the Overview gesture");
+        launchOverviewTutorialPreference.setOnPreferenceClickListener(preference -> {
+            startActivity(launchSandboxIntent.putExtra("tutorial_type", "OVERVIEW_NAVIGATION"));
+            return true;
+        });
+        sandboxCategory.addPreference(launchOverviewTutorialPreference);
     }
 
     private String toName(String action) {
diff --git a/src/com/android/launcher3/states/StateAnimationConfig.java b/src/com/android/launcher3/states/StateAnimationConfig.java
index 1c4986728f..f90ad3cd0b 100644
--- a/src/com/android/launcher3/states/StateAnimationConfig.java
+++ b/src/com/android/launcher3/states/StateAnimationConfig.java
@@ -69,7 +69,8 @@ public class StateAnimationConfig {
             ANIM_ALL_APPS_FADE,
             ANIM_OVERVIEW_SCRIM_FADE,
             ANIM_ALL_APPS_HEADER_FADE,
-            ANIM_OVERVIEW_MODAL
+            ANIM_OVERVIEW_MODAL,
+            ANIM_DEPTH,
     })
     @Retention(RetentionPolicy.SOURCE)
     public @interface AnimType {}
@@ -87,8 +88,9 @@ public class StateAnimationConfig {
     public static final int ANIM_OVERVIEW_SCRIM_FADE = 11;
     public static final int ANIM_ALL_APPS_HEADER_FADE = 12; // e.g. predictions
     public static final int ANIM_OVERVIEW_MODAL = 13;
+    public static final int ANIM_DEPTH = 14;
 
-    private static final int ANIM_TYPES_COUNT = 14;
+    private static final int ANIM_TYPES_COUNT = 15;
 
     private final Interpolator[] mInterpolators = new Interpolator[ANIM_TYPES_COUNT];
 
diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java
index 44eae56a0d..519b1b993f 100644
--- a/src/com/android/launcher3/testing/TestProtocol.java
+++ b/src/com/android/launcher3/testing/TestProtocol.java
@@ -101,4 +101,5 @@ public final class TestProtocol {
     public static final String PERMANENT_DIAG_TAG = "TaplTarget";
     public static final String PAUSE_NOT_DETECTED = "b/139891609";
     public static final String OVERIEW_NOT_ALLAPPS = "b/156095088";
+    public static final String NO_SWIPE_TO_HOME = "b/158017601";
 }
-- 
GitLab


From 23c2836690d66f848d28fac2ca322674a7429a61 Mon Sep 17 00:00:00 2001
From: Ashwini Oruganti <ashfall@google.com>
Date: Thu, 4 Jun 2020 17:47:09 -0700
Subject: [PATCH 0010/1664] Add an exported flag in manifest

With b/150232615, we will need an explicit value set for the exported
flag when intent filters are present, as the default behavior is
changing for future versions. This change adds the value reflecting the
previous default to the manifest.

These changes were made using an automated tool, the xml file may be
reformatted slightly creating a larger diff. The only "real" change is
the addition of "android:exported" to activities, services, and
receivers that have one or more intent-filters.

Bug: 150232615
Bug: 158198882
Test: TH
Exempt-From-Owner-Approval: mechanical refactoring
Change-Id: I083a7bcab968c881f7cdff7152a249691ffac316
---
 AndroidManifest-common.xml             |  11 ++-
 AndroidManifest.xml                    |   1 +
 quickstep/AndroidManifest-launcher.xml |   1 +
 quickstep/AndroidManifest.xml          | 128 ++++++++++++-------------
 tests/AndroidManifest-common.xml       |  22 ++++-
 tests/dummy_app/AndroidManifest.xml    |   1 +
 6 files changed, 93 insertions(+), 71 deletions(-)

diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index ff5bf0d1e5..84dd06aa39 100644
--- a/AndroidManifest-common.xml
+++ b/AndroidManifest-common.xml
@@ -86,6 +86,7 @@
         <receiver
             android:name="com.android.launcher3.InstallShortcutReceiver"
             android:permission="com.android.launcher.permission.INSTALL_SHORTCUT"
+            android:exported="true"
             android:enabled="@bool/enable_install_shortcut_api" >
             <intent-filter>
                 <action android:name="com.android.launcher.action.INSTALL_SHORTCUT" />
@@ -94,14 +95,16 @@
 
         <!-- Intent received when a session is committed -->
         <receiver
-            android:name="com.android.launcher3.SessionCommitReceiver" >
+            android:name="com.android.launcher3.SessionCommitReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.content.pm.action.SESSION_COMMITTED" />
             </intent-filter>
         </receiver>
 
         <!-- Intent received used to initialize a restored widget -->
-        <receiver android:name="com.android.launcher3.AppWidgetsRestoredReceiver" >
+        <receiver android:name="com.android.launcher3.AppWidgetsRestoredReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_HOST_RESTORED"/>
             </intent-filter>
@@ -117,6 +120,7 @@
             android:name="com.android.launcher3.notification.NotificationListener"
             android:label="@string/notification_dots_service_title"
             android:enabled="@bool/notification_dots_enabled"
+            android:exported="true"
             android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
             <intent-filter>
                 <action android:name="android.service.notification.NotificationListenerService" />
@@ -130,6 +134,7 @@
             android:theme="@style/AppItemActivityTheme"
             android:excludeFromRecents="true"
             android:autoRemoveFromRecents="true"
+            android:exported="true"
             android:label="@string/action_add_to_workspace" >
             <intent-filter>
                 <action android:name="android.content.pm.action.CONFIRM_PIN_SHORTCUT" />
@@ -165,6 +170,7 @@
             android:name="com.android.launcher3.settings.SettingsActivity"
             android:label="@string/settings_button_text"
             android:theme="@style/HomeSettingsTheme"
+            android:exported="true"
             android:autoRemoveFromRecents="true">
             <intent-filter>
                 <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
@@ -187,6 +193,7 @@
             android:name="com.android.launcher3.secondarydisplay.SecondaryDisplayLauncher"
             android:theme="@style/AppTheme"
             android:launchMode="singleTop"
+            android:exported="true"
             android:enabled="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b031ffbee4..8e01f82018 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -53,6 +53,7 @@
             android:resizeableActivity="true"
             android:resumeWhilePausing="true"
             android:taskAffinity=""
+            android:exported="true"
             android:enabled="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/quickstep/AndroidManifest-launcher.xml b/quickstep/AndroidManifest-launcher.xml
index 527bfc3854..078205ba63 100644
--- a/quickstep/AndroidManifest-launcher.xml
+++ b/quickstep/AndroidManifest-launcher.xml
@@ -53,6 +53,7 @@
             android:resizeableActivity="true"
             android:resumeWhilePausing="true"
             android:taskAffinity="${packageName}.launcher"
+            android:exported="true"
             android:enabled="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml
index b2286f1bd7..7f63a370e3 100644
--- a/quickstep/AndroidManifest.xml
+++ b/quickstep/AndroidManifest.xml
@@ -17,93 +17,87 @@
 ** limitations under the License.
 */
 -->
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.android.launcher3" >
 
-    <uses-permission android:name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     xmlns:tools="http://schemas.android.com/tools"
+     package="com.android.launcher3">
 
-    
-    <application
-        android:backupAgent="com.android.launcher3.LauncherBackupAgent"
-        android:fullBackupOnly="true"
-        android:fullBackupContent="@xml/backupscheme"
-        android:hardwareAccelerated="true"
-        android:icon="@drawable/ic_launcher_home"
-        android:label="@string/derived_app_name"
-        android:theme="@style/AppTheme"
-        android:largeHeap="@bool/config_largeHeap"
-        android:restoreAnyVersion="true"
-        android:supportsRtl="true" >
+    <uses-permission android:name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS"/>
+    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
 
-        <service
-            android:name="com.android.quickstep.TouchInteractionService"
-            android:permission="android.permission.STATUS_BAR_SERVICE"
-            android:directBootAware="true" >
+
+    <application android:backupAgent="com.android.launcher3.LauncherBackupAgent"
+         android:fullBackupOnly="true"
+         android:fullBackupContent="@xml/backupscheme"
+         android:hardwareAccelerated="true"
+         android:icon="@drawable/ic_launcher_home"
+         android:label="@string/derived_app_name"
+         android:theme="@style/AppTheme"
+         android:largeHeap="@bool/config_largeHeap"
+         android:restoreAnyVersion="true"
+         android:supportsRtl="true">
+
+        <service android:name="com.android.quickstep.TouchInteractionService"
+             android:permission="android.permission.STATUS_BAR_SERVICE"
+             android:directBootAware="true"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.QUICKSTEP_SERVICE" />
+                <action android:name="android.intent.action.QUICKSTEP_SERVICE"/>
             </intent-filter>
         </service>
 
         <activity android:name="com.android.quickstep.RecentsActivity"
-            android:excludeFromRecents="true"
-            android:launchMode="singleTask"
-            android:clearTaskOnLaunch="true"
-            android:stateNotNeeded="true"
-            android:theme="@style/LauncherTheme"
-            android:screenOrientation="unspecified"
-            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize"
-            android:resizeableActivity="true"
-            android:resumeWhilePausing="true"
-            android:taskAffinity="" />
+             android:excludeFromRecents="true"
+             android:launchMode="singleTask"
+             android:clearTaskOnLaunch="true"
+             android:stateNotNeeded="true"
+             android:theme="@style/LauncherTheme"
+             android:screenOrientation="unspecified"
+             android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize"
+             android:resizeableActivity="true"
+             android:resumeWhilePausing="true"
+             android:taskAffinity=""/>
 
         <!-- Content provider to settings search. The autority should be same as the packageName -->
-        <provider
-            android:name="com.android.quickstep.LauncherSearchIndexablesProvider"
-            android:authorities="${packageName}"
-            android:grantUriPermissions="true"
-            android:multiprocess="true"
-            android:permission="android.permission.READ_SEARCH_INDEXABLES"
-            android:exported="true">
+        <provider android:name="com.android.quickstep.LauncherSearchIndexablesProvider"
+             android:authorities="${packageName}"
+             android:grantUriPermissions="true"
+             android:multiprocess="true"
+             android:permission="android.permission.READ_SEARCH_INDEXABLES"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.content.action.SEARCH_INDEXABLES_PROVIDER" />
+                <action android:name="android.content.action.SEARCH_INDEXABLES_PROVIDER"/>
             </intent-filter>
         </provider>
 
         <!-- FileProvider used for sharing images. -->
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${packageName}.overview.fileprovider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/overview_file_provider_paths" />
+        <provider android:name="androidx.core.content.FileProvider"
+             android:authorities="${packageName}.overview.fileprovider"
+             android:exported="false"
+             android:grantUriPermissions="true">
+            <meta-data android:name="android.support.FILE_PROVIDER_PATHS"
+                 android:resource="@xml/overview_file_provider_paths"/>
         </provider>
 
-        <service
-            android:name="com.android.launcher3.uioverrides.dynamicui.WallpaperManagerCompatVL$ColorExtractionService"
-            tools:node="remove" />
+        <service android:name="com.android.launcher3.uioverrides.dynamicui.WallpaperManagerCompatVL$ColorExtractionService"
+             tools:node="remove"/>
 
-        <activity
-            android:name="com.android.launcher3.proxy.ProxyActivityStarter"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"
-            android:launchMode="singleTask"
-            android:clearTaskOnLaunch="true"
-            android:exported="false" />
+        <activity android:name="com.android.launcher3.proxy.ProxyActivityStarter"
+             android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"
+             android:launchMode="singleTask"
+             android:clearTaskOnLaunch="true"
+             android:exported="false"/>
 
-        <activity
-            android:name="com.android.quickstep.interaction.GestureSandboxActivity"
-            android:autoRemoveFromRecents="true"
-            android:excludeFromRecents="true"
-            android:taskAffinity="${packageName}.launcher"
-            android:screenOrientation="portrait">
+        <activity android:name="com.android.quickstep.interaction.GestureSandboxActivity"
+             android:autoRemoveFromRecents="true"
+             android:excludeFromRecents="true"
+             android:taskAffinity="${packageName}.launcher"
+             android:screenOrientation="portrait"
+             android:exported="true">
             <intent-filter>
-                <action android:name="com.android.quickstep.action.GESTURE_SANDBOX" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="com.android.quickstep.action.GESTURE_SANDBOX"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
 
diff --git a/tests/AndroidManifest-common.xml b/tests/AndroidManifest-common.xml
index 1c8f095810..f243f279eb 100644
--- a/tests/AndroidManifest-common.xml
+++ b/tests/AndroidManifest-common.xml
@@ -29,6 +29,7 @@
 
         <receiver
             android:name="com.android.launcher3.testcomponent.AppWidgetNoConfig"
+            android:exported="true"
             android:label="No Config">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
@@ -39,6 +40,7 @@
 
         <receiver
             android:name="com.android.launcher3.testcomponent.AppWdigetHidden"
+            android:exported="true"
             android:label="Hidden widget">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
@@ -49,6 +51,7 @@
 
         <receiver
             android:name="com.android.launcher3.testcomponent.AppWidgetWithConfig"
+            android:exported="true"
             android:label="With Config">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
@@ -58,12 +61,14 @@
         </receiver>
 
         <activity
-            android:name="com.android.launcher3.testcomponent.WidgetConfigActivity">
+            android:name="com.android.launcher3.testcomponent.WidgetConfigActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.launcher3.testcomponent.CustomShortcutConfigActivity">
+        <activity android:name="com.android.launcher3.testcomponent.CustomShortcutConfigActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -72,6 +77,7 @@
         <activity
             android:name="com.android.launcher3.testcomponent.RequestPinItemActivity"
             android:icon="@drawable/test_drawable_pin_item"
+            android:exported="true"
             android:label="Test Pin Item">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -102,6 +108,7 @@
             android:stateNotNeeded="true"
             android:taskAffinity=""
             android:theme="@android:style/Theme.DeviceDefault.Light"
+            android:exported="true"
             android:windowSoftInputMode="adjustPan">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -114,6 +121,7 @@
         <activity
             android:name="com.android.launcher3.testcomponent.BaseTestingActivity"
             android:label="LauncherTestApp"
+            android:exported="true"
             android:taskAffinity="com.android.launcher3.testcomponent.Affinity1">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -128,6 +136,7 @@
         </activity>
         <activity-alias android:name="Activity2"
                         android:label="TestActivity2"
+                        android:exported="true"
                         android:targetActivity="com.android.launcher3.testcomponent.BaseTestingActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -136,6 +145,7 @@
         </activity-alias>
         <activity-alias android:name="Activity3"
                         android:label="TestActivity3"
+                        android:exported="true"
                         android:targetActivity="com.android.launcher3.testcomponent.BaseTestingActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -144,6 +154,7 @@
         </activity-alias>
         <activity-alias android:name="Activity4"
                         android:label="TestActivity4"
+                        android:exported="true"
                         android:targetActivity="com.android.launcher3.testcomponent.BaseTestingActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -152,6 +163,7 @@
         </activity-alias>
         <activity-alias android:name="Activity5"
                         android:label="TestActivity5"
+                        android:exported="true"
                         android:targetActivity="com.android.launcher3.testcomponent.BaseTestingActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -160,6 +172,7 @@
         </activity-alias>
         <activity-alias android:name="Activity6"
                         android:label="TestActivity6"
+                        android:exported="true"
                         android:targetActivity="com.android.launcher3.testcomponent.BaseTestingActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -168,6 +181,7 @@
         </activity-alias>
         <activity-alias android:name="Activity7"
                         android:label="TestActivity7"
+                        android:exported="true"
                         android:targetActivity="com.android.launcher3.testcomponent.BaseTestingActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -176,6 +190,7 @@
         </activity-alias>
         <activity-alias android:name="Activity8"
                         android:label="TestActivity8"
+                        android:exported="true"
                         android:targetActivity="com.android.launcher3.testcomponent.BaseTestingActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -184,6 +199,7 @@
         </activity-alias>
         <activity-alias android:name="Activity9"
                         android:label="TestActivity9"
+                        android:exported="true"
                         android:targetActivity="com.android.launcher3.testcomponent.BaseTestingActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -192,6 +208,7 @@
         </activity-alias>
         <activity-alias android:name="Activity10"
                         android:label="TestActivity10"
+                        android:exported="true"
                         android:targetActivity="com.android.launcher3.testcomponent.BaseTestingActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -200,6 +217,7 @@
         </activity-alias>
         <activity-alias android:name="Activity11"
                         android:label="TestActivity11"
+                        android:exported="true"
                         android:targetActivity="com.android.launcher3.testcomponent.BaseTestingActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
diff --git a/tests/dummy_app/AndroidManifest.xml b/tests/dummy_app/AndroidManifest.xml
index f00138c78e..d5e2320b70 100644
--- a/tests/dummy_app/AndroidManifest.xml
+++ b/tests/dummy_app/AndroidManifest.xml
@@ -26,6 +26,7 @@
         <activity
             android:name="Activity1"
             android:icon="@mipmap/ic_launcher1"
+            android:exported="true"
             android:label="Aardwolf">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
-- 
GitLab


From dd3eb7d075021df869b009d5a78666d7d225aaf1 Mon Sep 17 00:00:00 2001
From: Jerry Chang <chenghsiuchang@google.com>
Date: Fri, 5 Jun 2020 16:36:44 +0800
Subject: [PATCH 0011/1664] Hook one-handed gesture to expand notification
 panel by default

Notify to expand notification panel through SystemUiProxy when
one-handed mode disabled and one-handed gesture detected.

Bug: 154080211
Test: make and install
Test: manual disable one handed mode and swipe down to trigger
Test: verified the gesture works even outside of home page
Change-Id: Iacc0e506ccd04dd81f6182759c8af7d686a7b77b
---
 .../OneHandedModeInputConsumer.java           | 32 +++++++++++++++----
 .../RecentsAnimationDeviceState.java          | 13 ++++----
 .../com/android/quickstep/SystemUiProxy.java  | 11 +++++++
 3 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
index fced849a4d..46249d9fc5 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
@@ -106,18 +106,16 @@ public class OneHandedModeInputConsumer extends DelegateInputConsumer {
                 } else {
                     float distance = (float) Math.hypot(mLastPos.x - mStartDragPos.x,
                             mLastPos.y - mStartDragPos.y);
-                    if (distance > mDragDistThreshold && mPassedSlop
-                            && mDeviceState.isOneHandedModeActive()) {
-                        SystemUiProxy.INSTANCE.get(mContext).stopOneHandedMode();
+                    if (distance > mDragDistThreshold && mPassedSlop) {
+                        onStopGestureDetected();
                     }
                 }
                 break;
             }
             case ACTION_UP:
             case ACTION_CANCEL: {
-                if (mLastPos.y >= mStartDragPos.y && mPassedSlop
-                        && !mDeviceState.isOneHandedModeActive()) {
-                    SystemUiProxy.INSTANCE.get(mContext).startOneHandedMode();
+                if (mLastPos.y >= mStartDragPos.y && mPassedSlop) {
+                    onStartGestureDetected();
                 }
 
                 mPassedSlop = false;
@@ -131,6 +129,28 @@ public class OneHandedModeInputConsumer extends DelegateInputConsumer {
         }
     }
 
+    private void onStartGestureDetected() {
+        if (mDeviceState.isOneHandedModeActive()) {
+            return;
+        }
+
+        if (mDeviceState.isOneHandedModeEnabled()) {
+            SystemUiProxy.INSTANCE.get(mContext).startOneHandedMode();
+            return;
+        }
+
+        // Hook one-handed gesture to expand notification panel by default
+        SystemUiProxy.INSTANCE.get(mContext).expandNotificationPanel();
+    }
+
+    private void onStopGestureDetected() {
+        if (!mDeviceState.isOneHandedModeEnabled() || !mDeviceState.isOneHandedModeActive()) {
+            return;
+        }
+
+        SystemUiProxy.INSTANCE.get(mContext).stopOneHandedMode();
+    }
+
     private boolean isValidStartAngle(float deltaX, float deltaY) {
         final float angle = (float) Math.toDegrees(Math.atan2(deltaY, deltaX));
         return angle > -(ANGLE_MAX) && angle < -(ANGLE_MIN);
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index db670b7a5a..03c9691d9b 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -79,8 +79,6 @@ public class RecentsAnimationDeviceState implements
         NavigationModeChangeListener,
         DefaultDisplay.DisplayInfoChangeListener {
 
-    private static boolean sIsOneHandedEnabled;
-
     private final Context mContext;
     private final SysUINavigationMode mSysUiNavMode;
     private final DefaultDisplay mDefaultDisplay;
@@ -97,6 +95,7 @@ public class RecentsAnimationDeviceState implements
     private final Region mDeferredGestureRegion = new Region();
     private boolean mAssistantAvailable;
     private float mAssistantVisibility;
+    private boolean mIsOneHandedModeEnabled;
 
     private boolean mIsUserUnlocked;
     private final ArrayList<Runnable> mUserUnlockedActions = new ArrayList<>();
@@ -564,10 +563,6 @@ public class RecentsAnimationDeviceState implements
      * @return whether the given motion event can trigger the one handed mode.
      */
     public boolean canTriggerOneHandedAction(MotionEvent ev) {
-        if (!sIsOneHandedEnabled) {
-            return false;
-        }
-
         final DefaultDisplay.Info displayInfo = mDefaultDisplay.getInfo();
         return (mOrientationTouchTransformer.touchInOneHandedModeRegion(ev)
                 && displayInfo.rotation != Surface.ROTATION_90
@@ -575,8 +570,12 @@ public class RecentsAnimationDeviceState implements
                 && displayInfo.metrics.densityDpi < DisplayMetrics.DENSITY_600);
     }
 
+    public boolean isOneHandedModeEnabled() {
+        return mIsOneHandedModeEnabled;
+    }
+
     private void onOneHandedEnabledSettingsChanged(boolean isOneHandedEnabled) {
-        sIsOneHandedEnabled = isOneHandedEnabled;
+        mIsOneHandedModeEnabled = isOneHandedEnabled;
     }
 
     /**
diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index e7bbbd0655..5b239a4303 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -380,4 +380,15 @@ public class SystemUiProxy implements ISystemUiProxy {
             }
         }
     }
+
+    @Override
+    public void expandNotificationPanel() {
+        if (mSystemUiProxy != null) {
+            try {
+                mSystemUiProxy.expandNotificationPanel();
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call expandNotificationPanel", e);
+            }
+        }
+    }
 }
-- 
GitLab


From 05cd0aedf34554350b7ccacdb52f4c84dbf2768e Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Wed, 6 May 2020 13:18:13 -0700
Subject: [PATCH 0012/1664] Notify SysUi on device rotation for back gesture

Whenever device rotates, we notify sysui to hide/show
the back gesture if the foreground app also rotates.
We also notify sysui when device rotates to match
the orientation of the current foreground app (this
is for apps with fixed rotations).

Fixes: 154580671
Test: Created test apps of different rotations
and ensured that back functionality was present when
attempting to go back.

Change-Id: I33a71698411d9bc2416b6660f8dbd53233628917
(cherry picked from commit 80303ac4b9b2f881d146af619aaad28b390a4ca0)
---
 .../RecentsAnimationDeviceState.java          | 119 ++++++++++++++++--
 .../quickstep/util/RecentsOrientedState.java  |   6 +-
 2 files changed, 115 insertions(+), 10 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index dedc11da49..6ac117104f 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -16,6 +16,7 @@
 package com.android.quickstep;
 
 import static android.content.Intent.ACTION_USER_UNLOCKED;
+import static android.view.Surface.ROTATION_0;
 
 import static com.android.launcher3.util.DefaultDisplay.CHANGE_ALL;
 import static com.android.launcher3.util.DefaultDisplay.CHANGE_FRAME_DELAY;
@@ -52,15 +53,18 @@ import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.view.MotionEvent;
 import android.view.Surface;
+import android.view.OrientationEventListener;
 
 import androidx.annotation.BinderThread;
 
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.DefaultDisplay;
 import com.android.launcher3.util.SecureSettingsObserver;
 import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;
 import com.android.quickstep.util.NavBarPosition;
+import com.android.quickstep.util.RecentsOrientedState;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.QuickStepContract;
 import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags;
@@ -119,9 +123,53 @@ public class RecentsAnimationDeviceState implements
             }
             enableMultipleRegions(false);
         }
+
+        @Override
+        public void onActivityRotation(int displayId) {
+            super.onActivityRotation(displayId);
+            // This always gets called before onDisplayInfoChanged() so we know how to process
+            // the rotation in that method. This is done to avoid having a race condition between
+            // the sensor readings and onDisplayInfoChanged() call
+            if (displayId != mDisplayId) {
+                return;
+            }
+
+            mPrioritizeDeviceRotation = true;
+            if (mInOverview) {
+                // reset, launcher must be rotating
+                mExitOverviewRunnable.run();
+            }
+        }
+    };
+
+    private Runnable mExitOverviewRunnable = new Runnable() {
+        @Override
+        public void run() {
+            mInOverview = false;
+            enableMultipleRegions(false);
+        }
     };
 
     private OrientationTouchTransformer mOrientationTouchTransformer;
+    /**
+     * Used to listen for when the device rotates into the orientation of the current
+     * foreground app. For example, if a user quickswitches from a portrait to a fixed landscape
+     * app and then rotates rotates the device to match that orientation, this triggers calls to
+     * sysui to adjust the navbar.
+     */
+    private OrientationEventListener mOrientationListener;
+    private int mPreviousRotation = ROTATION_0;
+    /**
+     * This is the configuration of the foreground app or the app that will be in the foreground
+     * once a quickstep gesture finishes.
+     */
+    private int mCurrentAppRotation = -1;
+    /**
+     * This flag is set to true when the device physically changes orientations. When true,
+     * we will always report the current rotation of the foreground app whenever the display
+     * changes, as it would indicate the user's intention to rotate the foreground app.
+     */
+    private boolean mPrioritizeDeviceRotation = false;
 
     private Region mExclusionRegion;
     private SystemGestureExclusionListenerCompat mExclusionListener;
@@ -207,6 +255,26 @@ public class RecentsAnimationDeviceState implements
             userSetupObserver.register();
             runOnDestroy(userSetupObserver::unregister);
         }
+
+        mOrientationListener = new OrientationEventListener(context) {
+            @Override
+            public void onOrientationChanged(int degrees) {
+                int newRotation = RecentsOrientedState.getRotationForUserDegreesRotated(degrees,
+                        mPreviousRotation);
+                if (newRotation == mPreviousRotation) {
+                    return;
+                }
+
+                mPreviousRotation = newRotation;
+                mPrioritizeDeviceRotation = true;
+
+                if (newRotation == mCurrentAppRotation) {
+                    // When user rotates device to the orientation of the foreground app after
+                    // quickstepping
+                    toggleSecondaryNavBarsForRotation(false);
+                }
+            }
+        };
     }
 
     private void setupOrientationSwipeHandler() {
@@ -282,6 +350,18 @@ public class RecentsAnimationDeviceState implements
         mNavBarPosition = new NavBarPosition(mMode, info);
         updateGestureTouchRegions();
         mOrientationTouchTransformer.createOrAddTouchRegion(info);
+        mCurrentAppRotation = mDisplayRotation;
+
+        /* Update nav bars on the following:
+         * a) if we're not expecting quickswitch, this is coming from an activity rotation
+         * b) we launch an app in the orientation that user is already in
+         * c) We're not in overview, since overview will always be portrait (w/o home rotation)
+         */
+        if ((mPrioritizeDeviceRotation
+                || mCurrentAppRotation == mPreviousRotation) // switch to an app of orientation user is in
+                && !mInOverview) {
+            toggleSecondaryNavBarsForRotation(false);
+        }
     }
 
     /**
@@ -596,9 +676,13 @@ public class RecentsAnimationDeviceState implements
         mOrientationTouchTransformer.transform(event);
     }
 
-    void enableMultipleRegions(boolean enable) {
-        mOrientationTouchTransformer.enableMultipleRegions(enable, mDefaultDisplay.getInfo());
-        notifySysuiForRotation(mOrientationTouchTransformer.getQuickStepStartingRotation());
+    private void enableMultipleRegions(boolean enable) {
+        toggleSecondaryNavBarsForRotation(enable);
+        if (enable && !TestProtocol.sDisableSensorRotation) {
+            mOrientationListener.enable();
+        } else {
+            mOrientationListener.disable();
+        }
     }
 
     private void notifySysuiForRotation(int rotation) {
@@ -624,10 +708,7 @@ public class RecentsAnimationDeviceState implements
                 // If we're in landscape w/o ever quickswitching, show the navbar in landscape
                 enableMultipleRegions(true);
             }
-            activityInterface.onExitOverview(this, () -> {
-                mInOverview = false;
-                enableMultipleRegions(false);
-            });
+            activityInterface.onExitOverview(this, mExitOverviewRunnable);
         } else if (endTarget == GestureState.GestureEndTarget.HOME) {
             enableMultipleRegions(false);
         } else if (endTarget == GestureState.GestureEndTarget.NEW_TASK) {
@@ -637,6 +718,11 @@ public class RecentsAnimationDeviceState implements
             } else {
                 notifySysuiForRotation(mOrientationTouchTransformer.getCurrentActiveRotation());
             }
+
+            // A new gesture is starting, reset the current device rotation
+            // This is done under the assumption that the user won't rotate the phone and then
+            // quickswitch in the old orientation.
+            mPrioritizeDeviceRotation = false;
         } else if (endTarget == GestureState.GestureEndTarget.LAST_TASK) {
             if (!mTaskListFrozen) {
                 // touched nav bar but didn't go anywhere and not quickswitching, do nothing
@@ -646,7 +732,24 @@ public class RecentsAnimationDeviceState implements
         }
     }
 
-    int getCurrentActiveRotation() {
+    private void notifySysuiOfCurrentRotation(int rotation) {
+        UI_HELPER_EXECUTOR.execute(() -> SystemUiProxy.INSTANCE.get(mContext)
+                .onQuickSwitchToNewTask(rotation));
+    }
+
+    /**
+     * Disables/Enables multiple nav bars on {@link OrientationTouchTransformer} and then
+     * notifies system UI of the primary rotation the user is interacting with
+     *
+     * @param enable if {@code true}, this will report to sysUI the navbar of the region the gesture
+     *               started in (during ACTION_DOWN), otherwise will report {@param displayRotation}
+     */
+    private void toggleSecondaryNavBarsForRotation(boolean enable) {
+        mOrientationTouchTransformer.enableMultipleRegions(enable, mDefaultDisplay.getInfo());
+        notifySysuiOfCurrentRotation(mOrientationTouchTransformer.getQuickStepStartingRotation());
+    }
+
+    public int getCurrentActiveRotation() {
         if (!mMode.hasGestures) {
             // touch rotation should always match that of display for 3 button
             return mDisplayRotation;
diff --git a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
index 7715cca60f..fe5a6c90b1 100644
--- a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
+++ b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
@@ -445,7 +445,8 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
                 }
                 break;
             case ROTATION_270:
-                if (degrees < (90 - threshold)) {
+                if (degrees < (90 - threshold) ||
+                        (degrees > (270 + threshold) && degrees < 360)) {
                     return ROTATION_0;
                 }
                 if (degrees > (90 + threshold) && degrees < 180) {
@@ -468,7 +469,8 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
                 if (degrees < (270 - threshold) && degrees > 90) {
                     return ROTATION_180;
                 }
-                if (degrees > (270 + threshold) && degrees < 360) {
+                if (degrees > (270 + threshold) && degrees < 360
+                        || (degrees >= 0 && degrees < threshold)) {
                     return ROTATION_0;
                 }
                 // flip from landscape to seascape
-- 
GitLab


From a66dafe617f6d200697a9129b1b322d88490b777 Mon Sep 17 00:00:00 2001
From: Bill Lin <lbill@google.com>
Date: Thu, 4 Jun 2020 16:48:00 +0800
Subject: [PATCH 0013/1664] Update state and touch region after one handed
 overlay changed

The matrix for overall modes x state changes:
-----------------------------------------------------
   Mode     |      State changed     | *Before|*After
-----------------------------------------------------
  OneHanded |  Portrait->Landscape   |  80dp  |  32dp
  OneHanded |  Landscape->Portrait   |  32dp  |  80dp
-----------------------------------------------------
  OneHanded |  Disable->Enable       |  32dp  |  32dp
 (Landscape)|  Enable->Disable       |  32dp  |  32dp
-----------------------------------------------------
  OneHanded |  Disable->Enable       |  32dp  |  80dp
 (Portrait) |  Enable->Disable       |  80dp  |  32dp
-----------------------------------------------------
  NO_BUTTON |  Portrait->Landscape   |  32dp  |  32dp
  NO_BUTTON |  Landscape->Portrait   |  32dp  |  32dp
  2 BUTTON  |  Portrait->Landscape   |  48dp  |  48dp
  2 BUTTON  |  Landscape->Portrait   |  48dp  |  48dp
  3 BUTTON  |  Portrait->Landscape   |  48dp  |  48dp
  3 BUTTON  |  Landscape->Portrait   |  48dp  |  48dp
-----------------------------------------------------
* dimen : navigation_bar_gesture_height

Test: adb bugrepot | grep mOneHandedModeRegion
Test: manually triger one handed
Test: atest WindowInsetsBehaviorTests
Bug: 157958539

Change-Id: I0f4b5d18053058730a06c3c216e849850c0390f4
---
 .../quickstep/TouchInteractionService.java    | 16 +++++
 .../OrientationTouchTransformer.java          | 29 ++++++++--
 .../RecentsAnimationDeviceState.java          | 24 +++++++-
 .../quickstep/SysUINavigationMode.java        | 58 ++++++++++++++++++-
 4 files changed, 116 insertions(+), 11 deletions(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
index a696c21133..901c9814ae 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
@@ -58,6 +58,7 @@ import androidx.annotation.WorkerThread;
 
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.R;
+import com.android.launcher3.ResourceUtils;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.logging.UserEventDispatcher;
@@ -298,6 +299,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
         mAM = ActivityManagerWrapper.getInstance();
         mDeviceState = new RecentsAnimationDeviceState(this);
         mDeviceState.addNavigationModeChangedCallback(this::onNavigationModeChanged);
+        mDeviceState.addOneHandedModeChangedCallback(this::onOneHandedModeOverlayChanged);
         mDeviceState.runOnUserUnlocked(this::onUserUnlocked);
         ProtoTracer.INSTANCE.get(this).add(this);
 
@@ -338,6 +340,13 @@ public class TouchInteractionService extends Service implements PluginListener<O
         resetHomeBounceSeenOnQuickstepEnabledFirstTime();
     }
 
+    /**
+     * Called when the one handed mode overlay package changes, to recreate touch region.
+     */
+    private void onOneHandedModeOverlayChanged(int newGesturalHeight) {
+        initInputMonitor();
+    }
+
     @UiThread
     public void onUserUnlocked() {
         mTaskAnimationManager = new TaskAnimationManager();
@@ -811,6 +820,13 @@ public class TouchInteractionService extends Service implements PluginListener<O
         }
         if (mOverviewComponentObserver.canHandleConfigChanges(activity.getComponentName(),
                 activity.getResources().getConfiguration().diff(newConfig))) {
+            // Since navBar gestural height are different between portrait and landscape,
+            // can handle orientation changes and refresh navigation gestural region through
+            // onOneHandedModeChanged()
+            int newGesturalHeight = ResourceUtils.getNavbarSize(
+                    ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE,
+                    getApplicationContext().getResources());
+            mDeviceState.onOneHandedModeChanged(newGesturalHeight);
             return;
         }
 
diff --git a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
index b49bc5a378..5dcdd7a2d9 100644
--- a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
+++ b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
@@ -65,6 +65,7 @@ class OrientationTouchTransformer {
     private final RectF mAssistantRightRegion = new RectF();
     private final RectF mOneHandedModeRegion = new RectF();
     private int mCurrentDisplayRotation;
+    private int mNavBarGesturalHeight;
     private boolean mEnableMultipleRegions;
     private Resources mResources;
     private OrientationRectF mLastRectTouched;
@@ -104,20 +105,35 @@ class OrientationTouchTransformer {
         mResources = resources;
         mMode = mode;
         mContractInfo = contractInfo;
+        mNavBarGesturalHeight = getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE);
     }
 
-    void setNavigationMode(SysUINavigationMode.Mode newMode, DefaultDisplay.Info info) {
-        if (mMode == newMode) {
-            return;
-        }
-        this.mMode = newMode;
+    private void refreshTouchRegion(DefaultDisplay.Info info, Resources newRes) {
         // Swipe touch regions are independent of nav mode, so we have to clear them explicitly
         // here to avoid, for ex, a nav region for 2-button rotation 0 being used for 3-button mode
         // It tries to cache and reuse swipe regions whenever possible based only on rotation
+        mResources = newRes;
         mSwipeTouchRegions.clear();
         resetSwipeRegions(info);
     }
 
+    void setNavigationMode(SysUINavigationMode.Mode newMode, DefaultDisplay.Info info,
+            Resources newRes) {
+        if (mMode == newMode) {
+            return;
+        }
+        this.mMode = newMode;
+        refreshTouchRegion(info, newRes);
+    }
+
+    void setGesturalHeight(int newGesturalHeight, DefaultDisplay.Info info, Resources newRes) {
+        if (mNavBarGesturalHeight == newGesturalHeight) {
+            return;
+        }
+        mNavBarGesturalHeight = newGesturalHeight;
+        refreshTouchRegion(info, newRes);
+    }
+
     /**
      * Sets the current nav bar region to listen to events for as determined by
      * {@param info}. If multiple nav bar regions are enabled, then this region will be added
@@ -197,7 +213,7 @@ class OrientationTouchTransformer {
 
         Point size = display.realSize;
         int rotation = display.rotation;
-        int touchHeight = getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE);
+        int touchHeight = mNavBarGesturalHeight;
         OrientationRectF orientationRectF =
                 new OrientationRectF(0, 0, size.x, size.y, rotation);
         if (mMode == SysUINavigationMode.Mode.NO_BUTTON) {
@@ -338,6 +354,7 @@ class OrientationTouchTransformer {
             regions.append(rectF.mRotation).append(" ");
         }
         pw.println(regions.toString());
+        pw.println("  mNavBarGesturalHeight=" + mNavBarGesturalHeight);
         pw.println("  mOneHandedModeRegion=" + mOneHandedModeRegion);
     }
 
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index 04aba228f4..8a1c30f0b2 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -52,8 +52,8 @@ import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.view.MotionEvent;
-import android.view.Surface;
 import android.view.OrientationEventListener;
+import android.view.Surface;
 
 import androidx.annotation.BinderThread;
 
@@ -63,6 +63,7 @@ import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.DefaultDisplay;
 import com.android.launcher3.util.SecureSettingsObserver;
 import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;
+import com.android.quickstep.SysUINavigationMode.OneHandedModeChangeListener;
 import com.android.quickstep.util.NavBarPosition;
 import com.android.quickstep.util.RecentsOrientedState;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
@@ -81,7 +82,8 @@ import java.util.stream.Collectors;
  */
 public class RecentsAnimationDeviceState implements
         NavigationModeChangeListener,
-        DefaultDisplay.DisplayInfoChangeListener {
+        DefaultDisplay.DisplayInfoChangeListener,
+        OneHandedModeChangeListener {
 
     private final Context mContext;
     private final SysUINavigationMode mSysUiNavMode;
@@ -310,6 +312,15 @@ public class RecentsAnimationDeviceState implements
         runOnDestroy(() -> mSysUiNavMode.removeModeChangeListener(listener));
     }
 
+    /**
+     * Adds a listener for the one handed mode change,
+     * guaranteed to be called after the device state's mode has changed.
+     */
+    public void addOneHandedModeChangedCallback(OneHandedModeChangeListener listener) {
+        listener.onOneHandedModeChanged(mSysUiNavMode.addOneHandedOverlayChangeListener(listener));
+        runOnDestroy(() -> mSysUiNavMode.removeOneHandedOverlayChangeListener(listener));
+    }
+
     @Override
     public void onNavigationModeChanged(SysUINavigationMode.Mode newMode) {
         mDefaultDisplay.removeChangeListener(this);
@@ -324,7 +335,8 @@ public class RecentsAnimationDeviceState implements
 
         mNavBarPosition = new NavBarPosition(newMode, mDefaultDisplay.getInfo());
 
-        mOrientationTouchTransformer.setNavigationMode(newMode, mDefaultDisplay.getInfo());
+        mOrientationTouchTransformer.setNavigationMode(newMode, mDefaultDisplay.getInfo(),
+                mContext.getApplicationContext().getResources());
         if (!mMode.hasGestures && newMode.hasGestures) {
             setupOrientationSwipeHandler();
         } else if (mMode.hasGestures && !newMode.hasGestures){
@@ -363,6 +375,12 @@ public class RecentsAnimationDeviceState implements
         }
     }
 
+    @Override
+    public void onOneHandedModeChanged(int newGesturalHeight) {
+        mOrientationTouchTransformer.setGesturalHeight(newGesturalHeight, mDefaultDisplay.getInfo(),
+                mContext.getApplicationContext().getResources());
+    }
+
     /**
      * @return the current navigation mode for the device.
      */
diff --git a/quickstep/src/com/android/quickstep/SysUINavigationMode.java b/quickstep/src/com/android/quickstep/SysUINavigationMode.java
index 05ce2a2b9b..26c72a2f4a 100644
--- a/quickstep/src/com/android/quickstep/SysUINavigationMode.java
+++ b/quickstep/src/com/android/quickstep/SysUINavigationMode.java
@@ -24,6 +24,7 @@ import android.content.Intent;
 import android.content.res.Resources;
 import android.util.Log;
 
+import com.android.launcher3.ResourceUtils;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.util.MainThreadInitializedObject;
 
@@ -62,11 +63,20 @@ public class SysUINavigationMode {
     private static final String ACTION_OVERLAY_CHANGED = "android.intent.action.OVERLAY_CHANGED";
     private static final String NAV_BAR_INTERACTION_MODE_RES_NAME =
             "config_navBarInteractionMode";
+    private static final String NAV_BAR_INTERACTION_MODE_OVERLAY_PACKAGE_PREFIX =
+            "com.android.internal.systemui.navbar";
+    private static final String ONE_HANDED_MODE_OVERLAY_PACKAGE_PREFIX =
+            "com.android.internal.systemui.onehanded";
+    private static final int INVALID_RESOURCE_HANDLE = -1;
 
     private final Context mContext;
     private Mode mMode;
 
+    private int mNavBarGesturalHeight;
+
     private final List<NavigationModeChangeListener> mChangeListeners = new ArrayList<>();
+    private final List<OneHandedModeChangeListener> mOneHandedOverlayChangeListeners =
+            new ArrayList<>();
 
     public SysUINavigationMode(Context context) {
         mContext = context;
@@ -77,7 +87,15 @@ public class SysUINavigationMode {
             public void onReceive(Context context, Intent intent) {
                 updateMode();
             }
-        }, getPackageFilter("android", ACTION_OVERLAY_CHANGED));
+        }, getPackageFilter(NAV_BAR_INTERACTION_MODE_OVERLAY_PACKAGE_PREFIX,
+                ACTION_OVERLAY_CHANGED));
+
+        mContext.registerReceiver(new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                updateGesturalHeight();
+            }
+        }, getPackageFilter(ONE_HANDED_MODE_OVERLAY_PACKAGE_PREFIX, ACTION_OVERLAY_CHANGED));
     }
 
     /** Updates navigation mode when needed. */
@@ -89,8 +107,24 @@ public class SysUINavigationMode {
         }
     }
 
+    private void updateGesturalHeight() {
+        int newGesturalHeight = getSystemIntegerRes(mContext,
+                ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE);
+
+        if (newGesturalHeight == INVALID_RESOURCE_HANDLE) {
+            return;
+        }
+
+        if (mNavBarGesturalHeight != newGesturalHeight) {
+            mNavBarGesturalHeight = newGesturalHeight;
+            dispatchOneHandedOverlayChange();
+        }
+    }
+
     private void initializeMode() {
         int modeInt = getSystemIntegerRes(mContext, NAV_BAR_INTERACTION_MODE_RES_NAME);
+        mNavBarGesturalHeight = getSystemIntegerRes(mContext,
+                ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE);
         for(Mode m : Mode.values()) {
             if (m.resValue == modeInt) {
                 mMode = m;
@@ -104,6 +138,12 @@ public class SysUINavigationMode {
         }
     }
 
+    private void dispatchOneHandedOverlayChange() {
+        for (OneHandedModeChangeListener listener : mOneHandedOverlayChangeListeners) {
+            listener.onOneHandedModeChanged(mNavBarGesturalHeight);
+        }
+    }
+
     public Mode addModeChangeListener(NavigationModeChangeListener listener) {
         mChangeListeners.add(listener);
         return mMode;
@@ -113,6 +153,15 @@ public class SysUINavigationMode {
         mChangeListeners.remove(listener);
     }
 
+    public int addOneHandedOverlayChangeListener(OneHandedModeChangeListener listener) {
+        mOneHandedOverlayChangeListeners.add(listener);
+        return mNavBarGesturalHeight;
+    }
+
+    public void removeOneHandedOverlayChangeListener(OneHandedModeChangeListener listener) {
+        mOneHandedOverlayChangeListeners.remove(listener);
+    }
+
     public Mode getMode() {
         return mMode;
     }
@@ -125,7 +174,7 @@ public class SysUINavigationMode {
             return res.getInteger(resId);
         } else {
             Log.e(TAG, "Failed to get system resource ID. Incompatible framework version?");
-            return -1;
+            return INVALID_RESOURCE_HANDLE;
         }
     }
 
@@ -150,4 +199,9 @@ public class SysUINavigationMode {
 
         void onNavigationModeChanged(Mode newMode);
     }
+
+    public interface OneHandedModeChangeListener {
+
+        void onOneHandedModeChanged(int newGesturalHeight);
+    }
 }
\ No newline at end of file
-- 
GitLab


From f69563e935dd0d39c424c5588e1261fd13e538ce Mon Sep 17 00:00:00 2001
From: Bill Lin <lbill@google.com>
Date: Wed, 17 Jun 2020 11:21:24 +0000
Subject: [PATCH 0014/1664] Revert "Update state and touch region after one
 handed overlay changed"

This reverts commit a66dafe617f6d200697a9129b1b322d88490b777.

Reason for revert: b/159183864 introduce com.android.launcher3.memory.MemoryTests failed after this CL merged.

Due to I need more time to investigate the root cause and do not block MemoryTests, revert this CL temporary.

Change-Id: I0408123e36c55a262ee0f1080cd6612785b3f527
---
 .../quickstep/TouchInteractionService.java    | 16 -----
 .../OrientationTouchTransformer.java          | 29 ++--------
 .../RecentsAnimationDeviceState.java          | 24 +-------
 .../quickstep/SysUINavigationMode.java        | 58 +------------------
 4 files changed, 11 insertions(+), 116 deletions(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
index 901c9814ae..a696c21133 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
@@ -58,7 +58,6 @@ import androidx.annotation.WorkerThread;
 
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.R;
-import com.android.launcher3.ResourceUtils;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.logging.UserEventDispatcher;
@@ -299,7 +298,6 @@ public class TouchInteractionService extends Service implements PluginListener<O
         mAM = ActivityManagerWrapper.getInstance();
         mDeviceState = new RecentsAnimationDeviceState(this);
         mDeviceState.addNavigationModeChangedCallback(this::onNavigationModeChanged);
-        mDeviceState.addOneHandedModeChangedCallback(this::onOneHandedModeOverlayChanged);
         mDeviceState.runOnUserUnlocked(this::onUserUnlocked);
         ProtoTracer.INSTANCE.get(this).add(this);
 
@@ -340,13 +338,6 @@ public class TouchInteractionService extends Service implements PluginListener<O
         resetHomeBounceSeenOnQuickstepEnabledFirstTime();
     }
 
-    /**
-     * Called when the one handed mode overlay package changes, to recreate touch region.
-     */
-    private void onOneHandedModeOverlayChanged(int newGesturalHeight) {
-        initInputMonitor();
-    }
-
     @UiThread
     public void onUserUnlocked() {
         mTaskAnimationManager = new TaskAnimationManager();
@@ -820,13 +811,6 @@ public class TouchInteractionService extends Service implements PluginListener<O
         }
         if (mOverviewComponentObserver.canHandleConfigChanges(activity.getComponentName(),
                 activity.getResources().getConfiguration().diff(newConfig))) {
-            // Since navBar gestural height are different between portrait and landscape,
-            // can handle orientation changes and refresh navigation gestural region through
-            // onOneHandedModeChanged()
-            int newGesturalHeight = ResourceUtils.getNavbarSize(
-                    ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE,
-                    getApplicationContext().getResources());
-            mDeviceState.onOneHandedModeChanged(newGesturalHeight);
             return;
         }
 
diff --git a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
index 5dcdd7a2d9..b49bc5a378 100644
--- a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
+++ b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
@@ -65,7 +65,6 @@ class OrientationTouchTransformer {
     private final RectF mAssistantRightRegion = new RectF();
     private final RectF mOneHandedModeRegion = new RectF();
     private int mCurrentDisplayRotation;
-    private int mNavBarGesturalHeight;
     private boolean mEnableMultipleRegions;
     private Resources mResources;
     private OrientationRectF mLastRectTouched;
@@ -105,35 +104,20 @@ class OrientationTouchTransformer {
         mResources = resources;
         mMode = mode;
         mContractInfo = contractInfo;
-        mNavBarGesturalHeight = getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE);
     }
 
-    private void refreshTouchRegion(DefaultDisplay.Info info, Resources newRes) {
+    void setNavigationMode(SysUINavigationMode.Mode newMode, DefaultDisplay.Info info) {
+        if (mMode == newMode) {
+            return;
+        }
+        this.mMode = newMode;
         // Swipe touch regions are independent of nav mode, so we have to clear them explicitly
         // here to avoid, for ex, a nav region for 2-button rotation 0 being used for 3-button mode
         // It tries to cache and reuse swipe regions whenever possible based only on rotation
-        mResources = newRes;
         mSwipeTouchRegions.clear();
         resetSwipeRegions(info);
     }
 
-    void setNavigationMode(SysUINavigationMode.Mode newMode, DefaultDisplay.Info info,
-            Resources newRes) {
-        if (mMode == newMode) {
-            return;
-        }
-        this.mMode = newMode;
-        refreshTouchRegion(info, newRes);
-    }
-
-    void setGesturalHeight(int newGesturalHeight, DefaultDisplay.Info info, Resources newRes) {
-        if (mNavBarGesturalHeight == newGesturalHeight) {
-            return;
-        }
-        mNavBarGesturalHeight = newGesturalHeight;
-        refreshTouchRegion(info, newRes);
-    }
-
     /**
      * Sets the current nav bar region to listen to events for as determined by
      * {@param info}. If multiple nav bar regions are enabled, then this region will be added
@@ -213,7 +197,7 @@ class OrientationTouchTransformer {
 
         Point size = display.realSize;
         int rotation = display.rotation;
-        int touchHeight = mNavBarGesturalHeight;
+        int touchHeight = getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE);
         OrientationRectF orientationRectF =
                 new OrientationRectF(0, 0, size.x, size.y, rotation);
         if (mMode == SysUINavigationMode.Mode.NO_BUTTON) {
@@ -354,7 +338,6 @@ class OrientationTouchTransformer {
             regions.append(rectF.mRotation).append(" ");
         }
         pw.println(regions.toString());
-        pw.println("  mNavBarGesturalHeight=" + mNavBarGesturalHeight);
         pw.println("  mOneHandedModeRegion=" + mOneHandedModeRegion);
     }
 
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index 8a1c30f0b2..04aba228f4 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -52,8 +52,8 @@ import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.view.MotionEvent;
-import android.view.OrientationEventListener;
 import android.view.Surface;
+import android.view.OrientationEventListener;
 
 import androidx.annotation.BinderThread;
 
@@ -63,7 +63,6 @@ import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.DefaultDisplay;
 import com.android.launcher3.util.SecureSettingsObserver;
 import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;
-import com.android.quickstep.SysUINavigationMode.OneHandedModeChangeListener;
 import com.android.quickstep.util.NavBarPosition;
 import com.android.quickstep.util.RecentsOrientedState;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
@@ -82,8 +81,7 @@ import java.util.stream.Collectors;
  */
 public class RecentsAnimationDeviceState implements
         NavigationModeChangeListener,
-        DefaultDisplay.DisplayInfoChangeListener,
-        OneHandedModeChangeListener {
+        DefaultDisplay.DisplayInfoChangeListener {
 
     private final Context mContext;
     private final SysUINavigationMode mSysUiNavMode;
@@ -312,15 +310,6 @@ public class RecentsAnimationDeviceState implements
         runOnDestroy(() -> mSysUiNavMode.removeModeChangeListener(listener));
     }
 
-    /**
-     * Adds a listener for the one handed mode change,
-     * guaranteed to be called after the device state's mode has changed.
-     */
-    public void addOneHandedModeChangedCallback(OneHandedModeChangeListener listener) {
-        listener.onOneHandedModeChanged(mSysUiNavMode.addOneHandedOverlayChangeListener(listener));
-        runOnDestroy(() -> mSysUiNavMode.removeOneHandedOverlayChangeListener(listener));
-    }
-
     @Override
     public void onNavigationModeChanged(SysUINavigationMode.Mode newMode) {
         mDefaultDisplay.removeChangeListener(this);
@@ -335,8 +324,7 @@ public class RecentsAnimationDeviceState implements
 
         mNavBarPosition = new NavBarPosition(newMode, mDefaultDisplay.getInfo());
 
-        mOrientationTouchTransformer.setNavigationMode(newMode, mDefaultDisplay.getInfo(),
-                mContext.getApplicationContext().getResources());
+        mOrientationTouchTransformer.setNavigationMode(newMode, mDefaultDisplay.getInfo());
         if (!mMode.hasGestures && newMode.hasGestures) {
             setupOrientationSwipeHandler();
         } else if (mMode.hasGestures && !newMode.hasGestures){
@@ -375,12 +363,6 @@ public class RecentsAnimationDeviceState implements
         }
     }
 
-    @Override
-    public void onOneHandedModeChanged(int newGesturalHeight) {
-        mOrientationTouchTransformer.setGesturalHeight(newGesturalHeight, mDefaultDisplay.getInfo(),
-                mContext.getApplicationContext().getResources());
-    }
-
     /**
      * @return the current navigation mode for the device.
      */
diff --git a/quickstep/src/com/android/quickstep/SysUINavigationMode.java b/quickstep/src/com/android/quickstep/SysUINavigationMode.java
index 26c72a2f4a..05ce2a2b9b 100644
--- a/quickstep/src/com/android/quickstep/SysUINavigationMode.java
+++ b/quickstep/src/com/android/quickstep/SysUINavigationMode.java
@@ -24,7 +24,6 @@ import android.content.Intent;
 import android.content.res.Resources;
 import android.util.Log;
 
-import com.android.launcher3.ResourceUtils;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.util.MainThreadInitializedObject;
 
@@ -63,20 +62,11 @@ public class SysUINavigationMode {
     private static final String ACTION_OVERLAY_CHANGED = "android.intent.action.OVERLAY_CHANGED";
     private static final String NAV_BAR_INTERACTION_MODE_RES_NAME =
             "config_navBarInteractionMode";
-    private static final String NAV_BAR_INTERACTION_MODE_OVERLAY_PACKAGE_PREFIX =
-            "com.android.internal.systemui.navbar";
-    private static final String ONE_HANDED_MODE_OVERLAY_PACKAGE_PREFIX =
-            "com.android.internal.systemui.onehanded";
-    private static final int INVALID_RESOURCE_HANDLE = -1;
 
     private final Context mContext;
     private Mode mMode;
 
-    private int mNavBarGesturalHeight;
-
     private final List<NavigationModeChangeListener> mChangeListeners = new ArrayList<>();
-    private final List<OneHandedModeChangeListener> mOneHandedOverlayChangeListeners =
-            new ArrayList<>();
 
     public SysUINavigationMode(Context context) {
         mContext = context;
@@ -87,15 +77,7 @@ public class SysUINavigationMode {
             public void onReceive(Context context, Intent intent) {
                 updateMode();
             }
-        }, getPackageFilter(NAV_BAR_INTERACTION_MODE_OVERLAY_PACKAGE_PREFIX,
-                ACTION_OVERLAY_CHANGED));
-
-        mContext.registerReceiver(new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                updateGesturalHeight();
-            }
-        }, getPackageFilter(ONE_HANDED_MODE_OVERLAY_PACKAGE_PREFIX, ACTION_OVERLAY_CHANGED));
+        }, getPackageFilter("android", ACTION_OVERLAY_CHANGED));
     }
 
     /** Updates navigation mode when needed. */
@@ -107,24 +89,8 @@ public class SysUINavigationMode {
         }
     }
 
-    private void updateGesturalHeight() {
-        int newGesturalHeight = getSystemIntegerRes(mContext,
-                ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE);
-
-        if (newGesturalHeight == INVALID_RESOURCE_HANDLE) {
-            return;
-        }
-
-        if (mNavBarGesturalHeight != newGesturalHeight) {
-            mNavBarGesturalHeight = newGesturalHeight;
-            dispatchOneHandedOverlayChange();
-        }
-    }
-
     private void initializeMode() {
         int modeInt = getSystemIntegerRes(mContext, NAV_BAR_INTERACTION_MODE_RES_NAME);
-        mNavBarGesturalHeight = getSystemIntegerRes(mContext,
-                ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE);
         for(Mode m : Mode.values()) {
             if (m.resValue == modeInt) {
                 mMode = m;
@@ -138,12 +104,6 @@ public class SysUINavigationMode {
         }
     }
 
-    private void dispatchOneHandedOverlayChange() {
-        for (OneHandedModeChangeListener listener : mOneHandedOverlayChangeListeners) {
-            listener.onOneHandedModeChanged(mNavBarGesturalHeight);
-        }
-    }
-
     public Mode addModeChangeListener(NavigationModeChangeListener listener) {
         mChangeListeners.add(listener);
         return mMode;
@@ -153,15 +113,6 @@ public class SysUINavigationMode {
         mChangeListeners.remove(listener);
     }
 
-    public int addOneHandedOverlayChangeListener(OneHandedModeChangeListener listener) {
-        mOneHandedOverlayChangeListeners.add(listener);
-        return mNavBarGesturalHeight;
-    }
-
-    public void removeOneHandedOverlayChangeListener(OneHandedModeChangeListener listener) {
-        mOneHandedOverlayChangeListeners.remove(listener);
-    }
-
     public Mode getMode() {
         return mMode;
     }
@@ -174,7 +125,7 @@ public class SysUINavigationMode {
             return res.getInteger(resId);
         } else {
             Log.e(TAG, "Failed to get system resource ID. Incompatible framework version?");
-            return INVALID_RESOURCE_HANDLE;
+            return -1;
         }
     }
 
@@ -199,9 +150,4 @@ public class SysUINavigationMode {
 
         void onNavigationModeChanged(Mode newMode);
     }
-
-    public interface OneHandedModeChangeListener {
-
-        void onOneHandedModeChanged(int newGesturalHeight);
-    }
 }
\ No newline at end of file
-- 
GitLab


From 70b5ca2505c96f4d6176cf2439562b826601b354 Mon Sep 17 00:00:00 2001
From: Bill Lin <lbill@google.com>
Date: Thu, 4 Jun 2020 16:48:00 +0800
Subject: [PATCH 0015/1664] Update state and touch region after one handed
 overlay changed

The matrix for overall modes x state changes:
-----------------------------------------------------
   Mode     |      State changed     | *Before|*After
-----------------------------------------------------
  OneHanded |  Portrait->Landscape   |  80dp  |  32dp
  OneHanded |  Landscape->Portrait   |  32dp  |  80dp
-----------------------------------------------------
  OneHanded |  Disable->Enable       |  32dp  |  32dp
 (Landscape)|  Enable->Disable       |  32dp  |  32dp
-----------------------------------------------------
  OneHanded |  Disable->Enable       |  32dp  |  80dp
 (Portrait) |  Enable->Disable       |  80dp  |  32dp
-----------------------------------------------------
  NO_BUTTON |  Portrait->Landscape   |  32dp  |  32dp
  NO_BUTTON |  Landscape->Portrait   |  32dp  |  32dp
  2 BUTTON  |  Portrait->Landscape   |  48dp  |  48dp
  2 BUTTON  |  Landscape->Portrait   |  48dp  |  48dp
  3 BUTTON  |  Portrait->Landscape   |  48dp  |  48dp
  3 BUTTON  |  Landscape->Portrait   |  48dp  |  48dp
-----------------------------------------------------
* dimen : navigation_bar_gesture_height

Test: adb bugrepot | grep mOneHandedModeRegion
Test: manually triger one handed
Test: atest WindowInsetsBehaviorTests
Test: atest com.android.launcher3.memory.MemoryTests
Test: flake -once
Test: rnlot -t com.android.launcher3.memory.MemoryTests
Bug: 157958539
Bug: 159183864
Change-Id: I19755938c3c93eb59a9f621af5722f5679c1da14
---
 .../quickstep/TouchInteractionService.java    | 16 ++++
 .../OrientationTouchTransformer.java          | 29 ++++++--
 .../RecentsAnimationDeviceState.java          | 24 +++++-
 .../quickstep/SysUINavigationMode.java        | 73 +++++++++++++++----
 src/com/android/launcher3/ResourceUtils.java  |  9 ++-
 5 files changed, 125 insertions(+), 26 deletions(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
index 52e6fabc9d..70ef2c0c65 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
@@ -58,6 +58,7 @@ import androidx.annotation.WorkerThread;
 
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.R;
+import com.android.launcher3.ResourceUtils;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.logging.UserEventDispatcher;
@@ -298,6 +299,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
         mAM = ActivityManagerWrapper.getInstance();
         mDeviceState = new RecentsAnimationDeviceState(this);
         mDeviceState.addNavigationModeChangedCallback(this::onNavigationModeChanged);
+        mDeviceState.addOneHandedModeChangedCallback(this::onOneHandedModeOverlayChanged);
         mDeviceState.runOnUserUnlocked(this::onUserUnlocked);
         ProtoTracer.INSTANCE.get(this).add(this);
 
@@ -338,6 +340,13 @@ public class TouchInteractionService extends Service implements PluginListener<O
         resetHomeBounceSeenOnQuickstepEnabledFirstTime();
     }
 
+    /**
+     * Called when the one handed mode overlay package changes, to recreate touch region.
+     */
+    private void onOneHandedModeOverlayChanged(int newGesturalHeight) {
+        initInputMonitor();
+    }
+
     @UiThread
     public void onUserUnlocked() {
         mTaskAnimationManager = new TaskAnimationManager();
@@ -813,6 +822,13 @@ public class TouchInteractionService extends Service implements PluginListener<O
         }
         if (mOverviewComponentObserver.canHandleConfigChanges(activity.getComponentName(),
                 activity.getResources().getConfiguration().diff(newConfig))) {
+            // Since navBar gestural height are different between portrait and landscape,
+            // can handle orientation changes and refresh navigation gestural region through
+            // onOneHandedModeChanged()
+            int newGesturalHeight = ResourceUtils.getNavbarSize(
+                    ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE,
+                    getApplicationContext().getResources());
+            mDeviceState.onOneHandedModeChanged(newGesturalHeight);
             return;
         }
 
diff --git a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
index b49bc5a378..5dcdd7a2d9 100644
--- a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
+++ b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
@@ -65,6 +65,7 @@ class OrientationTouchTransformer {
     private final RectF mAssistantRightRegion = new RectF();
     private final RectF mOneHandedModeRegion = new RectF();
     private int mCurrentDisplayRotation;
+    private int mNavBarGesturalHeight;
     private boolean mEnableMultipleRegions;
     private Resources mResources;
     private OrientationRectF mLastRectTouched;
@@ -104,20 +105,35 @@ class OrientationTouchTransformer {
         mResources = resources;
         mMode = mode;
         mContractInfo = contractInfo;
+        mNavBarGesturalHeight = getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE);
     }
 
-    void setNavigationMode(SysUINavigationMode.Mode newMode, DefaultDisplay.Info info) {
-        if (mMode == newMode) {
-            return;
-        }
-        this.mMode = newMode;
+    private void refreshTouchRegion(DefaultDisplay.Info info, Resources newRes) {
         // Swipe touch regions are independent of nav mode, so we have to clear them explicitly
         // here to avoid, for ex, a nav region for 2-button rotation 0 being used for 3-button mode
         // It tries to cache and reuse swipe regions whenever possible based only on rotation
+        mResources = newRes;
         mSwipeTouchRegions.clear();
         resetSwipeRegions(info);
     }
 
+    void setNavigationMode(SysUINavigationMode.Mode newMode, DefaultDisplay.Info info,
+            Resources newRes) {
+        if (mMode == newMode) {
+            return;
+        }
+        this.mMode = newMode;
+        refreshTouchRegion(info, newRes);
+    }
+
+    void setGesturalHeight(int newGesturalHeight, DefaultDisplay.Info info, Resources newRes) {
+        if (mNavBarGesturalHeight == newGesturalHeight) {
+            return;
+        }
+        mNavBarGesturalHeight = newGesturalHeight;
+        refreshTouchRegion(info, newRes);
+    }
+
     /**
      * Sets the current nav bar region to listen to events for as determined by
      * {@param info}. If multiple nav bar regions are enabled, then this region will be added
@@ -197,7 +213,7 @@ class OrientationTouchTransformer {
 
         Point size = display.realSize;
         int rotation = display.rotation;
-        int touchHeight = getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE);
+        int touchHeight = mNavBarGesturalHeight;
         OrientationRectF orientationRectF =
                 new OrientationRectF(0, 0, size.x, size.y, rotation);
         if (mMode == SysUINavigationMode.Mode.NO_BUTTON) {
@@ -338,6 +354,7 @@ class OrientationTouchTransformer {
             regions.append(rectF.mRotation).append(" ");
         }
         pw.println(regions.toString());
+        pw.println("  mNavBarGesturalHeight=" + mNavBarGesturalHeight);
         pw.println("  mOneHandedModeRegion=" + mOneHandedModeRegion);
     }
 
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index 04aba228f4..8a1c30f0b2 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -52,8 +52,8 @@ import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.view.MotionEvent;
-import android.view.Surface;
 import android.view.OrientationEventListener;
+import android.view.Surface;
 
 import androidx.annotation.BinderThread;
 
@@ -63,6 +63,7 @@ import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.DefaultDisplay;
 import com.android.launcher3.util.SecureSettingsObserver;
 import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;
+import com.android.quickstep.SysUINavigationMode.OneHandedModeChangeListener;
 import com.android.quickstep.util.NavBarPosition;
 import com.android.quickstep.util.RecentsOrientedState;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
@@ -81,7 +82,8 @@ import java.util.stream.Collectors;
  */
 public class RecentsAnimationDeviceState implements
         NavigationModeChangeListener,
-        DefaultDisplay.DisplayInfoChangeListener {
+        DefaultDisplay.DisplayInfoChangeListener,
+        OneHandedModeChangeListener {
 
     private final Context mContext;
     private final SysUINavigationMode mSysUiNavMode;
@@ -310,6 +312,15 @@ public class RecentsAnimationDeviceState implements
         runOnDestroy(() -> mSysUiNavMode.removeModeChangeListener(listener));
     }
 
+    /**
+     * Adds a listener for the one handed mode change,
+     * guaranteed to be called after the device state's mode has changed.
+     */
+    public void addOneHandedModeChangedCallback(OneHandedModeChangeListener listener) {
+        listener.onOneHandedModeChanged(mSysUiNavMode.addOneHandedOverlayChangeListener(listener));
+        runOnDestroy(() -> mSysUiNavMode.removeOneHandedOverlayChangeListener(listener));
+    }
+
     @Override
     public void onNavigationModeChanged(SysUINavigationMode.Mode newMode) {
         mDefaultDisplay.removeChangeListener(this);
@@ -324,7 +335,8 @@ public class RecentsAnimationDeviceState implements
 
         mNavBarPosition = new NavBarPosition(newMode, mDefaultDisplay.getInfo());
 
-        mOrientationTouchTransformer.setNavigationMode(newMode, mDefaultDisplay.getInfo());
+        mOrientationTouchTransformer.setNavigationMode(newMode, mDefaultDisplay.getInfo(),
+                mContext.getApplicationContext().getResources());
         if (!mMode.hasGestures && newMode.hasGestures) {
             setupOrientationSwipeHandler();
         } else if (mMode.hasGestures && !newMode.hasGestures){
@@ -363,6 +375,12 @@ public class RecentsAnimationDeviceState implements
         }
     }
 
+    @Override
+    public void onOneHandedModeChanged(int newGesturalHeight) {
+        mOrientationTouchTransformer.setGesturalHeight(newGesturalHeight, mDefaultDisplay.getInfo(),
+                mContext.getApplicationContext().getResources());
+    }
+
     /**
      * @return the current navigation mode for the device.
      */
diff --git a/quickstep/src/com/android/quickstep/SysUINavigationMode.java b/quickstep/src/com/android/quickstep/SysUINavigationMode.java
index 05ce2a2b9b..6994d669e0 100644
--- a/quickstep/src/com/android/quickstep/SysUINavigationMode.java
+++ b/quickstep/src/com/android/quickstep/SysUINavigationMode.java
@@ -16,14 +16,15 @@
 
 package com.android.quickstep;
 
+import static com.android.launcher3.ResourceUtils.INVALID_RESOURCE_HANDLE;
 import static com.android.launcher3.util.PackageManagerHelper.getPackageFilter;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.Resources;
 import android.util.Log;
 
+import com.android.launcher3.ResourceUtils;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.util.MainThreadInitializedObject;
 
@@ -58,15 +59,19 @@ public class SysUINavigationMode {
             new MainThreadInitializedObject<>(SysUINavigationMode::new);
 
     private static final String TAG = "SysUINavigationMode";
-
     private static final String ACTION_OVERLAY_CHANGED = "android.intent.action.OVERLAY_CHANGED";
     private static final String NAV_BAR_INTERACTION_MODE_RES_NAME =
             "config_navBarInteractionMode";
+    private static final String TARGET_OVERLAY_PACKAGE = "android";
 
     private final Context mContext;
     private Mode mMode;
 
+    private int mNavBarGesturalHeight;
+
     private final List<NavigationModeChangeListener> mChangeListeners = new ArrayList<>();
+    private final List<OneHandedModeChangeListener> mOneHandedOverlayChangeListeners =
+            new ArrayList<>();
 
     public SysUINavigationMode(Context context) {
         mContext = context;
@@ -76,8 +81,9 @@ public class SysUINavigationMode {
             @Override
             public void onReceive(Context context, Intent intent) {
                 updateMode();
+                updateGesturalHeight();
             }
-        }, getPackageFilter("android", ACTION_OVERLAY_CHANGED));
+        }, getPackageFilter(TARGET_OVERLAY_PACKAGE, ACTION_OVERLAY_CHANGED));
     }
 
     /** Updates navigation mode when needed. */
@@ -89,9 +95,35 @@ public class SysUINavigationMode {
         }
     }
 
+    private void updateGesturalHeight() {
+        int newGesturalHeight = ResourceUtils.getDimenByName(
+                ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE, mContext.getResources(),
+                INVALID_RESOURCE_HANDLE);
+
+        if (newGesturalHeight == INVALID_RESOURCE_HANDLE) {
+            Log.e(TAG, "Failed to get system resource ID. Incompatible framework version?");
+            return;
+        }
+
+        if (mNavBarGesturalHeight != newGesturalHeight) {
+            mNavBarGesturalHeight = newGesturalHeight;
+            dispatchOneHandedOverlayChange();
+        }
+    }
+
     private void initializeMode() {
-        int modeInt = getSystemIntegerRes(mContext, NAV_BAR_INTERACTION_MODE_RES_NAME);
-        for(Mode m : Mode.values()) {
+        int modeInt = ResourceUtils.getIntegerByName(NAV_BAR_INTERACTION_MODE_RES_NAME,
+                mContext.getResources(), INVALID_RESOURCE_HANDLE);
+        mNavBarGesturalHeight = ResourceUtils.getDimenByName(
+                ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE, mContext.getResources(),
+                INVALID_RESOURCE_HANDLE);
+
+        if (modeInt == INVALID_RESOURCE_HANDLE) {
+            Log.e(TAG, "Failed to get system resource ID. Incompatible framework version?");
+            return;
+        }
+
+        for (Mode m : Mode.values()) {
             if (m.resValue == modeInt) {
                 mMode = m;
             }
@@ -104,6 +136,12 @@ public class SysUINavigationMode {
         }
     }
 
+    private void dispatchOneHandedOverlayChange() {
+        for (OneHandedModeChangeListener listener : mOneHandedOverlayChangeListeners) {
+            listener.onOneHandedModeChanged(mNavBarGesturalHeight);
+        }
+    }
+
     public Mode addModeChangeListener(NavigationModeChangeListener listener) {
         mChangeListeners.add(listener);
         return mMode;
@@ -113,20 +151,17 @@ public class SysUINavigationMode {
         mChangeListeners.remove(listener);
     }
 
-    public Mode getMode() {
-        return mMode;
+    public int addOneHandedOverlayChangeListener(OneHandedModeChangeListener listener) {
+        mOneHandedOverlayChangeListeners.add(listener);
+        return mNavBarGesturalHeight;
     }
 
-    private static int getSystemIntegerRes(Context context, String resName) {
-        Resources res = context.getResources();
-        int resId = res.getIdentifier(resName, "integer", "android");
+    public void removeOneHandedOverlayChangeListener(OneHandedModeChangeListener listener) {
+        mOneHandedOverlayChangeListeners.remove(listener);
+    }
 
-        if (resId != 0) {
-            return res.getInteger(resId);
-        } else {
-            Log.e(TAG, "Failed to get system resource ID. Incompatible framework version?");
-            return -1;
-        }
+    public Mode getMode() {
+        return mMode;
     }
 
     /** @return Whether we can remove the shelf from overview. */
@@ -144,10 +179,16 @@ public class SysUINavigationMode {
     public void dump(PrintWriter pw) {
         pw.println("SysUINavigationMode:");
         pw.println("  mode=" + mMode.name());
+        pw.println("  mNavBarGesturalHeight=:" + mNavBarGesturalHeight);
     }
 
     public interface NavigationModeChangeListener {
 
         void onNavigationModeChanged(Mode newMode);
     }
+
+    public interface OneHandedModeChangeListener {
+
+        void onOneHandedModeChanged(int newGesturalHeight);
+    }
 }
\ No newline at end of file
diff --git a/src/com/android/launcher3/ResourceUtils.java b/src/com/android/launcher3/ResourceUtils.java
index 403d77913c..c9fb75a2db 100644
--- a/src/com/android/launcher3/ResourceUtils.java
+++ b/src/com/android/launcher3/ResourceUtils.java
@@ -22,6 +22,7 @@ import android.util.TypedValue;
 
 public class ResourceUtils {
     public static final int DEFAULT_NAVBAR_VALUE = 48;
+    public static final int INVALID_RESOURCE_HANDLE = -1;
     public static final String NAVBAR_LANDSCAPE_LEFT_RIGHT_SIZE = "navigation_bar_width";
     public static final String NAVBAR_BOTTOM_GESTURE_SIZE = "navigation_bar_gesture_height";
 
@@ -51,7 +52,13 @@ public class ResourceUtils {
         return val;
     }
 
+    public static int getIntegerByName(String resName, Resources res, int defaultValue) {
+        int resId = res.getIdentifier(resName, "integer", "android");
+        return resId != 0 ? res.getInteger(resId) : defaultValue;
+    }
+
     public static int pxFromDp(float size, DisplayMetrics metrics) {
-        return Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, size, metrics));
+        return size < 0 ? INVALID_RESOURCE_HANDLE : Math.round(
+                TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, size, metrics));
     }
 }
-- 
GitLab


From cadb94983be5ab558202041a053eb4b67ccf3c01 Mon Sep 17 00:00:00 2001
From: Rajeev Kumar <rajekumar@google.com>
Date: Tue, 23 Jun 2020 10:17:51 -0700
Subject: [PATCH 0016/1664] Add explicit android:exported="true" declarations

We add this for GestureSandboxActivity and
com.android.launcher3.uioverrides.QuickstepLauncher to
reinstate the behavior of go/ag/11746107 which was
incorrectly reverted in go/ag/11963698.

We also add this for HotseatEduActivity which was
newly added in go/ag/11963698.

Bug: 159709775
Test: wembley-userdebug boots and has functioning Launcher
Change-Id: I17904f9ad88abc66364675426545eae423cb3175
---
 quickstep/AndroidManifest-launcher.xml | 3 ++-
 quickstep/AndroidManifest.xml          | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/quickstep/AndroidManifest-launcher.xml b/quickstep/AndroidManifest-launcher.xml
index 60afddb0a8..1a634ce58c 100644
--- a/quickstep/AndroidManifest-launcher.xml
+++ b/quickstep/AndroidManifest-launcher.xml
@@ -53,7 +53,8 @@
             android:resizeableActivity="true"
             android:resumeWhilePausing="true"
             android:taskAffinity=""
-            android:enabled="true">
+            android:enabled="true"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.HOME" />
diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml
index 9a4f297114..868c659be6 100644
--- a/quickstep/AndroidManifest.xml
+++ b/quickstep/AndroidManifest.xml
@@ -98,7 +98,8 @@
             android:name="com.android.quickstep.interaction.GestureSandboxActivity"
             android:autoRemoveFromRecents="true"
             android:excludeFromRecents="true"
-            android:screenOrientation="portrait">
+            android:screenOrientation="portrait"
+            android:exported="true">
             <intent-filter>
                 <action android:name="com.android.quickstep.action.GESTURE_SANDBOX"/>
                 <category android:name="android.intent.category.DEFAULT"/>
@@ -110,7 +111,8 @@
             android:noHistory="true"
             android:launchMode="singleTask"
             android:clearTaskOnLaunch="true"
-            android:permission="${packageName}.permission.HOTSEAT_EDU">
+            android:permission="${packageName}.permission.HOTSEAT_EDU"
+            android:exported="true">
             <intent-filter>
                 <action android:name="com.android.launcher3.action.SHOW_HYBRID_HOTSEAT_EDU"/>
                 <category android:name="android.intent.category.DEFAULT" />
-- 
GitLab


From 779efaca91309f82e133954e1fab032601b2aa93 Mon Sep 17 00:00:00 2001
From: Jerry Chang <chenghsiuchang@google.com>
Date: Tue, 23 Jun 2020 21:40:05 +0800
Subject: [PATCH 0017/1664] Guard swipe to notification gesture with system
 settings preference

Bug: 154080211
Test: make and install, check the gesture works as expectedly
Change-Id: Ibd6bbd595d2fba5d68e66eb54e4a7fec160b9bf8
---
 .../OneHandedModeInputConsumer.java           | 14 ++++-----
 .../RecentsAnimationDeviceState.java          | 29 ++++++++++++++-----
 .../util/SecureSettingsObserver.java          | 14 +++++++++
 3 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
index 46249d9fc5..0bb8fff2a1 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
@@ -130,17 +130,13 @@ public class OneHandedModeInputConsumer extends DelegateInputConsumer {
     }
 
     private void onStartGestureDetected() {
-        if (mDeviceState.isOneHandedModeActive()) {
-            return;
-        }
-
         if (mDeviceState.isOneHandedModeEnabled()) {
-            SystemUiProxy.INSTANCE.get(mContext).startOneHandedMode();
-            return;
+            if (!mDeviceState.isOneHandedModeActive()) {
+                SystemUiProxy.INSTANCE.get(mContext).startOneHandedMode();
+            }
+        } else if (mDeviceState.isSwipeToNotificationEnabled()) {
+            SystemUiProxy.INSTANCE.get(mContext).expandNotificationPanel();
         }
-
-        // Hook one-handed gesture to expand notification panel by default
-        SystemUiProxy.INSTANCE.get(mContext).expandNotificationPanel();
     }
 
     private void onStopGestureDetected() {
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index 8a1c30f0b2..448c93e616 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -96,12 +96,12 @@ public class RecentsAnimationDeviceState implements
     private @SystemUiStateFlags int mSystemUiStateFlags;
     private SysUINavigationMode.Mode mMode = THREE_BUTTONS;
     private NavBarPosition mNavBarPosition;
-    private SecureSettingsObserver mOneHandedEnabledObserver;
 
     private final Region mDeferredGestureRegion = new Region();
     private boolean mAssistantAvailable;
     private float mAssistantVisibility;
     private boolean mIsOneHandedModeEnabled;
+    private boolean mIsSwipeToNotificationEnabled;
 
     private boolean mIsUserUnlocked;
     private final ArrayList<Runnable> mUserUnlockedActions = new ArrayList<>();
@@ -240,12 +240,21 @@ public class RecentsAnimationDeviceState implements
         }
 
         if (SystemProperties.getBoolean("ro.support_one_handed_mode", false)) {
-            mOneHandedEnabledObserver = SecureSettingsObserver.newOneHandedSettingsObserver(
-                    mContext, this::onOneHandedEnabledSettingsChanged);
-            mOneHandedEnabledObserver.register();
-            mOneHandedEnabledObserver.dispatchOnChange();
+            SecureSettingsObserver oneHandedEnabledObserver =
+                    SecureSettingsObserver.newOneHandedSettingsObserver(
+                            mContext, enabled -> mIsOneHandedModeEnabled = enabled);
+            oneHandedEnabledObserver.register();
+            oneHandedEnabledObserver.dispatchOnChange();
+            runOnDestroy(oneHandedEnabledObserver::unregister);
         }
 
+        SecureSettingsObserver swipeBottomEnabledObserver =
+                SecureSettingsObserver.newSwipeToNotificationSettingsObserver(
+                        mContext, enabled -> mIsSwipeToNotificationEnabled = enabled);
+        swipeBottomEnabledObserver.register();
+        swipeBottomEnabledObserver.dispatchOnChange();
+        runOnDestroy(swipeBottomEnabledObserver::unregister);
+
         SecureSettingsObserver userSetupObserver = new SecureSettingsObserver(
                 context.getContentResolver(),
                 e -> mIsUserSetupComplete = e,
@@ -666,6 +675,10 @@ public class RecentsAnimationDeviceState implements
      * @return whether the given motion event can trigger the one handed mode.
      */
     public boolean canTriggerOneHandedAction(MotionEvent ev) {
+        if (!mIsOneHandedModeEnabled && !mIsSwipeToNotificationEnabled) {
+            return false;
+        }
+
         final DefaultDisplay.Info displayInfo = mDefaultDisplay.getInfo();
         return (mOrientationTouchTransformer.touchInOneHandedModeRegion(ev)
                 && displayInfo.rotation != Surface.ROTATION_90
@@ -677,8 +690,8 @@ public class RecentsAnimationDeviceState implements
         return mIsOneHandedModeEnabled;
     }
 
-    private void onOneHandedEnabledSettingsChanged(boolean isOneHandedEnabled) {
-        mIsOneHandedModeEnabled = isOneHandedEnabled;
+    public boolean isSwipeToNotificationEnabled() {
+        return mIsSwipeToNotificationEnabled;
     }
 
     /**
@@ -790,6 +803,8 @@ public class RecentsAnimationDeviceState implements
         pw.println("  currentActiveRotation=" + getCurrentActiveRotation());
         pw.println("  displayRotation=" + getDisplayRotation());
         pw.println("  isUserUnlocked=" + mIsUserUnlocked);
+        pw.println("  isOneHandedModeEnabled=" + mIsOneHandedModeEnabled);
+        pw.println("  isSwipeToNotificationEnabled=" + mIsSwipeToNotificationEnabled);
         mOrientationTouchTransformer.dump(pw);
     }
 }
diff --git a/src/com/android/launcher3/util/SecureSettingsObserver.java b/src/com/android/launcher3/util/SecureSettingsObserver.java
index 08a8e6d255..4b2242907b 100644
--- a/src/com/android/launcher3/util/SecureSettingsObserver.java
+++ b/src/com/android/launcher3/util/SecureSettingsObserver.java
@@ -31,6 +31,9 @@ public class SecureSettingsObserver extends ContentObserver {
     public static final String NOTIFICATION_BADGING = "notification_badging";
     /** Hidden field Settings.Secure.ONE_HANDED_MODE_ENABLED */
     public static final String ONE_HANDED_ENABLED = "one_handed_mode_enabled";
+    /** Hidden field Settings.Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED */
+    public static final String ONE_HANDED_SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED =
+            "swipe_bottom_to_notification_enabled";
 
     private final ContentResolver mResolver;
     private final String mKeySetting;
@@ -87,4 +90,15 @@ public class SecureSettingsObserver extends ContentObserver {
         return new SecureSettingsObserver(
                 context.getContentResolver(), listener, ONE_HANDED_ENABLED, 1);
     }
+
+    /**
+     * Constructs settings observer for {@link #ONE_HANDED_SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED}
+     * preference.
+     */
+    public static SecureSettingsObserver newSwipeToNotificationSettingsObserver(Context context,
+            OnChangeListener listener) {
+        return new SecureSettingsObserver(
+                context.getContentResolver(), listener,
+                ONE_HANDED_SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, 1);
+    }
 }
-- 
GitLab


From 5fbd925715a4fdea6fd29b1631e66cce76355838 Mon Sep 17 00:00:00 2001
From: Vadim Tryshev <vadimt@google.com>
Date: Thu, 9 Jul 2020 20:24:47 +0000
Subject: [PATCH 0018/1664] Revert "Temporarily disabling events checking in
 git_master"

This reverts commit 0b65822f308902bb1dc98ea98e0362a830d9aa25.

Reason for revert: Switched from logcat to TestProtocol for
events checking.

Bug: 153824894
Change-Id: Ifdc50400bf8a4d6d4a918efd376817b2882be7bb
---
 .../com/android/launcher3/tapl/LauncherInstrumentation.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index b8e55651ae..975fe9c1e7 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -250,8 +250,7 @@ public final class LauncherInstrumentation {
     }
 
     public void enableCheckEventsForSuccessfulGestures() {
-        // b/153824894
-        // mCheckEventsForSuccessfulGestures = true;
+        mCheckEventsForSuccessfulGestures = true;
     }
 
     public void setOnLauncherCrashed(Runnable onLauncherCrashed) {
-- 
GitLab


From 4bc691b9881d2d6336cd39bf9d0063579f7d5fed Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Mon, 13 Jul 2020 20:02:13 -0700
Subject: [PATCH 0019/1664] Removing workarounds for a fixed bug

Bug: 148422894
Change-Id: Ic6faa173ac5f28c8656daf68ac8304563264afdd
---
 .../com/android/quickstep/NavigationModeSwitchRule.java   | 4 ++--
 .../android/launcher3/util/rule/FailureInvestigator.java  | 6 ------
 .../android/launcher3/tapl/LauncherInstrumentation.java   | 8 +-------
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
index 40265c47e2..0f6671d18c 100644
--- a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
+++ b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
@@ -188,7 +188,7 @@ public class NavigationModeSwitchRule implements TestRule {
                     SYS_UI_NAVIGATION_MODE.removeModeChangeListener(listener));
 
             Wait.atMost(() -> "Navigation mode didn't change to " + expectedMode,
-                    () -> currentSysUiNavigationMode() == expectedMode, 60000 /* b/148422894 */,
+                    () -> currentSysUiNavigationMode() == expectedMode, WAIT_TIME_MS,
                     launcher);
             // b/139137636
 //            assertTrue(launcher, "Navigation mode didn't change to " + expectedMode,
@@ -202,7 +202,7 @@ public class NavigationModeSwitchRule implements TestRule {
         Wait.atMost(() -> "Switching nav mode: "
                         + launcher.getNavigationModeMismatchError(),
                 () -> launcher.getNavigationModeMismatchError() == null,
-                60000 /* b/148422894 */, launcher);
+                WAIT_TIME_MS, launcher);
         AbstractLauncherUiTest.checkDetectedLeaks(launcher);
         return true;
     }
diff --git a/tests/src/com/android/launcher3/util/rule/FailureInvestigator.java b/tests/src/com/android/launcher3/util/rule/FailureInvestigator.java
index e4f520f891..77546de3cc 100644
--- a/tests/src/com/android/launcher3/util/rule/FailureInvestigator.java
+++ b/tests/src/com/android/launcher3/util/rule/FailureInvestigator.java
@@ -87,12 +87,6 @@ class FailureInvestigator {
             return 145935261;
         }
 
-        if (matches("java\\.lang\\.AssertionError\\: http\\:\\/\\/go\\/tapl \\: want to get "
-                + "workspace object; Presence of recents button doesn't match the interaction "
-                + "mode, mode\\=ZERO_BUTTON, hasRecents\\=true", exception)) {
-            return 148422894;
-        }
-
         final String logSinceBoot;
         try {
             final String systemBootTime =
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 0cf611ad26..ecf51a7ff9 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -548,13 +548,7 @@ public final class LauncherInstrumentation {
         assertEquals("Unexpected display rotation",
                 mExpectedRotation, mDevice.getDisplayRotation());
 
-        // b/148422894
-        String error = null;
-        for (int i = 0; i != 600; ++i) {
-            error = getNavigationModeMismatchError();
-            if (error == null) break;
-            sleep(100);
-        }
+        final String error = getNavigationModeMismatchError();
         assertTrue(error, error == null);
 
         log("verifyContainerType: " + containerType);
-- 
GitLab


From cf6bae49a3a37ed2134965b91930c32837454989 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Mon, 13 Jul 2020 17:43:51 -0700
Subject: [PATCH 0020/1664] Fixing swiping up on home interrupting animation

Bug: 161180005
Change-Id: Ida59b87b2fb5905d98b0090630a6ce32fc9c36c8
(cherry picked from commit 93188d61da1df0e2abe82775300582915b353c6e)
---
 .../src/com/android/quickstep/BaseSwipeUpHandlerV2.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java
index 37aa0dadd2..6c4c5d3f4d 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java
@@ -42,6 +42,7 @@ import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
 import static com.android.quickstep.util.ShelfPeekAnim.ShelfAnimState.HIDE;
 import static com.android.quickstep.util.ShelfPeekAnim.ShelfAnimState.PEEK;
 import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD;
+import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME;
 
 import android.animation.Animator;
 import android.animation.TimeInterpolator;
@@ -90,6 +91,7 @@ import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.InputConsumerController;
 import com.android.systemui.shared.system.LatencyTrackerCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
+import com.android.systemui.shared.system.TaskInfoCompat;
 import com.android.systemui.shared.system.TaskStackChangeListener;
 
 /**
@@ -940,7 +942,8 @@ public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q exte
         @Override
         public void onActivityRestartAttempt(ActivityManager.RunningTaskInfo task,
                 boolean homeTaskVisible, boolean clearedTask, boolean wasVisible) {
-            if (task.taskId == mGestureState.getRunningTaskId()) {
+            if (task.taskId == mGestureState.getRunningTaskId()
+                    && TaskInfoCompat.getActivityType(task) != ACTIVITY_TYPE_HOME) {
                 // Since this is an edge case, just cancel and relaunch with default activity
                 // options (since we don't know if there's an associated app icon to launch from)
                 endRunningWindowAnim(true /* cancel */);
@@ -1327,6 +1330,6 @@ public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q exte
 
     private static boolean isNotInRecents(RemoteAnimationTargetCompat app) {
         return app.isNotInRecents
-                || app.activityType == RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME;
+                || app.activityType == ACTIVITY_TYPE_HOME;
     }
 }
-- 
GitLab


From 40c9cfa3c87fda871486486b16ca353d15073c3f Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Tue, 14 Jul 2020 15:51:24 -0700
Subject: [PATCH 0021/1664] Productizing useful diags

The bug doesn't repro, but it makes sense to keep the diags

Bug: 156287114
Change-Id: I4a9f43e02eec1b1386067a90e4c17ad109adcfa5
---
 .../launcher3/tapl/LauncherInstrumentation.java   | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 0cf611ad26..f90dff281c 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -448,7 +448,7 @@ public final class LauncherInstrumentation {
             }
         }
 
-        dumpDiagnostics();
+        dumpDiagnostics(message);
 
         log("Hierarchy dump for: " + message);
         dumpViewHierarchy();
@@ -456,10 +456,11 @@ public final class LauncherInstrumentation {
         return message;
     }
 
-    private void dumpDiagnostics() {
-        Log.e("b/156287114", "Input:");
+    private void dumpDiagnostics(String message) {
+        log("Diagnostics for failure: " + message);
+        log("Input:");
         logShellCommand("dumpsys input");
-        Log.e("b/156287114", "TIS:");
+        log("TIS:");
         logShellCommand("dumpsys activity service TouchInteractionService");
     }
 
@@ -467,10 +468,10 @@ public final class LauncherInstrumentation {
         try {
             for (String line : mDevice.executeShellCommand(command).split("\\n")) {
                 SystemClock.sleep(10);
-                Log.d("b/156287114", line);
+                log(line);
             }
         } catch (IOException e) {
-            Log.d("b/156287114", "Failed to execute " + command);
+            log("Failed to execute " + command);
         }
     }
 
@@ -1365,7 +1366,7 @@ public final class LauncherInstrumentation {
                 if (mCheckEventsForSuccessfulGestures) {
                     final String message = eventChecker.verify(WAIT_TIME_MS, true);
                     if (message != null) {
-                        dumpDiagnostics();
+                        dumpDiagnostics(message);
                         checkForAnomaly();
                         Assert.fail(formatSystemHealthMessage(
                                 "http://go/tapl : successful gesture produced " + message));
-- 
GitLab


From c5a9ae5500b38dc5ad59b27f5d77fedf95e88bfd Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Thu, 9 Jul 2020 14:54:23 -0700
Subject: [PATCH 0022/1664] Calculate all apps cell height based on actual
 sizes.

This ensures that the cell contents always fit.

Bug: 160716074
Change-Id: I3d85adec3e7e3652fe4a258bd659382a3e696211
(cherry picked from commit 3535944395c5932c2c1968851375d121c5507bd3)
---
 src/com/android/launcher3/DeviceProfile.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index e3cd0bd181..49caa93e61 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -369,8 +369,10 @@ public class DeviceProfile {
         if (allAppsHasDifferentNumColumns()) {
             allAppsIconSizePx = ResourceUtils.pxFromDp(inv.allAppsIconSize, mInfo.metrics);
             allAppsIconTextSizePx = Utilities.pxFromSp(inv.allAppsIconTextSize, mInfo.metrics);
-            allAppsCellHeightPx = getCellSize(inv.numAllAppsColumns, inv.numAllAppsColumns).y;
             allAppsIconDrawablePaddingPx = iconDrawablePaddingOriginalPx;
+            // We use 4 below to ensure labels are closer to their corresponding icon.
+            allAppsCellHeightPx = Math.round(allAppsIconSizePx + allAppsIconTextSizePx
+                    + (4 * allAppsIconDrawablePaddingPx));
         } else {
             allAppsIconSizePx = iconSizePx;
             allAppsIconTextSizePx = iconTextSizePx;
-- 
GitLab


From a37ecee10454b3c74c87394bf58342bda541009d Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Fri, 17 Jul 2020 18:23:59 -0700
Subject: [PATCH 0023/1664] Introducing a new gesture scope

Gesture may occur outside of Launcher and not trigger system gesture recognition
by TIS.

Change-Id: Ibbb0180d6ef3856ab652164e6f3c1c86488a4caa
---
 .../android/launcher3/tapl/Background.java    |  6 ++---
 .../tapl/LauncherInstrumentation.java         | 23 ++++++++++++-------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/Background.java b/tests/tapl/com/android/launcher3/tapl/Background.java
index ce94a3e723..0c4e5a9461 100644
--- a/tests/tapl/com/android/launcher3/tapl/Background.java
+++ b/tests/tapl/com/android/launcher3/tapl/Background.java
@@ -85,7 +85,7 @@ public class Background extends LauncherInstrumentation.VisibleContainer {
                 final LauncherInstrumentation.GestureScope gestureScope =
                         zeroButtonToOverviewGestureStartsInLauncher()
                                 ? LauncherInstrumentation.GestureScope.INSIDE_TO_OUTSIDE
-                                : LauncherInstrumentation.GestureScope.OUTSIDE;
+                                : LauncherInstrumentation.GestureScope.OUTSIDE_WITH_PILFER;
 
                 // b/156044202
                 mLauncher.log("Hierarchy before swiping up to overview:");
@@ -130,7 +130,7 @@ public class Background extends LauncherInstrumentation.VisibleContainer {
                 }
 
                 mLauncher.swipeToState(startX, startY, endX, endY, 10, OVERVIEW_STATE_ORDINAL,
-                        LauncherInstrumentation.GestureScope.OUTSIDE);
+                        LauncherInstrumentation.GestureScope.OUTSIDE_WITH_PILFER);
                 break;
             }
 
@@ -194,7 +194,7 @@ public class Background extends LauncherInstrumentation.VisibleContainer {
                 mLauncher.swipeToState(startX, startY, endX, endY, 20, expectedState,
                         launcherWasVisible && isZeroButton
                                 ? LauncherInstrumentation.GestureScope.INSIDE_TO_OUTSIDE
-                                : LauncherInstrumentation.GestureScope.OUTSIDE);
+                                : LauncherInstrumentation.GestureScope.OUTSIDE_WITH_PILFER);
                 break;
             }
 
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index a32d2f9ba5..645eb4c1c0 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -112,9 +112,10 @@ public final class LauncherInstrumentation {
 
     public enum NavigationModel {ZERO_BUTTON, TWO_BUTTON, THREE_BUTTON}
 
-    // Where the gesture happens: outside of Launcher, inside or from inside to outside.
+    // Where the gesture happens: outside of Launcher, inside or from inside to outside and
+    // whether the gesture recognition triggers pilfer.
     public enum GestureScope {
-        OUTSIDE, INSIDE, INSIDE_TO_OUTSIDE
+        OUTSIDE_WITHOUT_PILFER, OUTSIDE_WITH_PILFER, INSIDE, INSIDE_TO_OUTSIDE
     }
 
     ;
@@ -696,7 +697,7 @@ public final class LauncherInstrumentation {
                                 ZERO_BUTTON_STEPS_FROM_BACKGROUND_TO_HOME, NORMAL_STATE_ORDINAL,
                                 launcherWasVisible
                                         ? GestureScope.INSIDE_TO_OUTSIDE
-                                        : GestureScope.OUTSIDE);
+                                        : GestureScope.OUTSIDE_WITH_PILFER);
                     }
                 }
             } else {
@@ -1165,7 +1166,8 @@ public final class LauncherInstrumentation {
         final boolean notLauncher3 = !isLauncher3();
         switch (action) {
             case MotionEvent.ACTION_DOWN:
-                if (gestureScope != GestureScope.OUTSIDE) {
+                if (gestureScope != GestureScope.OUTSIDE_WITH_PILFER
+                        && gestureScope != GestureScope.OUTSIDE_WITHOUT_PILFER) {
                     expectEvent(TestProtocol.SEQUENCE_MAIN, EVENT_TOUCH_DOWN);
                 }
                 if (notLauncher3 && getNavigationModel() != NavigationModel.THREE_BUTTON) {
@@ -1173,12 +1175,17 @@ public final class LauncherInstrumentation {
                 }
                 break;
             case MotionEvent.ACTION_UP:
-                if (notLauncher3 && gestureScope != GestureScope.INSIDE) {
+                if (notLauncher3 && gestureScope != GestureScope.INSIDE
+                        && (gestureScope == GestureScope.OUTSIDE_WITH_PILFER
+                        || gestureScope == GestureScope.INSIDE_TO_OUTSIDE)) {
                     expectEvent(TestProtocol.SEQUENCE_PILFER, EVENT_PILFER_POINTERS);
                 }
-                if (gestureScope != GestureScope.OUTSIDE) {
-                    expectEvent(TestProtocol.SEQUENCE_MAIN, gestureScope == GestureScope.INSIDE
-                            ? EVENT_TOUCH_UP : EVENT_TOUCH_CANCEL);
+                if (gestureScope != GestureScope.OUTSIDE_WITH_PILFER
+                        && gestureScope != GestureScope.OUTSIDE_WITHOUT_PILFER) {
+                    expectEvent(TestProtocol.SEQUENCE_MAIN,
+                            gestureScope == GestureScope.INSIDE
+                                    || gestureScope == GestureScope.OUTSIDE_WITHOUT_PILFER
+                                    ? EVENT_TOUCH_UP : EVENT_TOUCH_CANCEL);
                 }
                 if (notLauncher3 && getNavigationModel() != NavigationModel.THREE_BUTTON) {
                     expectEvent(TestProtocol.SEQUENCE_TIS, EVENT_TOUCH_UP_TIS);
-- 
GitLab


From 9ae44d6c2be08b94fde5356282858a8753c752ba Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Fri, 17 Jul 2020 11:18:25 -0700
Subject: [PATCH 0024/1664] Setup controller for on device search

With introduction of feature flag ENABLE_DEVICE_SEARCH, Launcher can now show a softkey input when user goes to all apps.

Bug: 161545076
Test: Manual
Change-Id: Ie75d059da0a20d0fb98b87bb948a205c080ba529
---
 src/com/android/launcher3/config/FeatureFlags.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 5c4a4922fd..78e8b82ddf 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -94,6 +94,10 @@ public final class FeatureFlags {
     public static final BooleanFlag ENABLE_SUGGESTED_ACTIONS_OVERVIEW = new DeviceFlag(
             "ENABLE_SUGGESTED_ACTIONS_OVERVIEW", false, "Show chip hints on the overview screen");
 
+
+    public static final BooleanFlag ENABLE_DEVICE_SEARCH = getDebugFlag(
+            "ENABLE_DEVICE_SEARCH", false, "Allows on device search in all apps");
+
     public static final BooleanFlag FOLDER_NAME_SUGGEST = new DeviceFlag(
             "FOLDER_NAME_SUGGEST", true,
             "Suggests folder names instead of blank text.");
-- 
GitLab


From 665232be613372d75173a1a61c7f936897b6561d Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Mon, 20 Jul 2020 12:22:59 -0700
Subject: [PATCH 0025/1664] Removing diags for a fixed flake

Bug: 160238801
Change-Id: Ia166eb1f154ddeeb70da5a141c9e985a265ba49a
---
 .../android/launcher3/BaseRecyclerView.java   | 27 -----------
 .../compat/AccessibilityManagerCompat.java    |  6 ---
 .../launcher3/testing/TestProtocol.java       |  1 -
 .../launcher3/views/BaseDragLayer.java        |  3 --
 .../launcher3/widget/WidgetsDiffReporter.java |  6 +--
 .../launcher3/widget/WidgetsFullSheet.java    | 11 -----
 .../launcher3/widget/WidgetsRecyclerView.java | 45 -------------------
 .../tapl/LauncherInstrumentation.java         |  7 +--
 8 files changed, 3 insertions(+), 103 deletions(-)

diff --git a/src/com/android/launcher3/BaseRecyclerView.java b/src/com/android/launcher3/BaseRecyclerView.java
index 41eeb78bc7..c55b46b33a 100644
--- a/src/com/android/launcher3/BaseRecyclerView.java
+++ b/src/com/android/launcher3/BaseRecyclerView.java
@@ -16,11 +16,8 @@
 
 package com.android.launcher3;
 
-import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED;
-
 import android.content.Context;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
@@ -29,8 +26,6 @@ import android.view.accessibility.AccessibilityNodeInfo;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.launcher3.compat.AccessibilityManagerCompat;
-import com.android.launcher3.testing.TestProtocol;
-import com.android.launcher3.views.ActivityContext;
 import com.android.launcher3.views.RecyclerViewFastScroller;
 
 
@@ -183,10 +178,6 @@ public abstract class BaseRecyclerView extends RecyclerView  {
     public void onScrollStateChanged(int state) {
         super.onScrollStateChanged(state);
 
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, "onScrollStateChanged: " + state);
-        }
-
         if (state == SCROLL_STATE_IDLE) {
             AccessibilityManagerCompat.sendScrollFinishedEventToTest(getContext());
         }
@@ -196,23 +187,5 @@ public abstract class BaseRecyclerView extends RecyclerView  {
     public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
         super.onInitializeAccessibilityNodeInfo(info);
         if (isLayoutSuppressed()) info.setScrollable(false);
-        if (Utilities.IS_RUNNING_IN_TEST_HARNESS) {
-            Log.d(TestProtocol.NO_SCROLL_END_WIDGETS,
-                    "onInitializeAccessibilityNodeInfo, scrollable: " + info.isScrollable());
-        }
-    }
-
-    @Override
-    public void setLayoutFrozen(boolean frozen) {
-        final boolean changing = frozen != isLayoutSuppressed();
-        super.setLayoutFrozen(frozen);
-        if (changing) {
-            if (Utilities.IS_RUNNING_IN_TEST_HARNESS) {
-                Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, "setLayoutFrozen " + frozen
-                        + " @ " + Log.getStackTraceString(new Throwable()));
-                ActivityContext.lookupContext(getContext()).getDragLayer()
-                        .sendAccessibilityEvent(TYPE_WINDOW_CONTENT_CHANGED);
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/src/com/android/launcher3/compat/AccessibilityManagerCompat.java b/src/com/android/launcher3/compat/AccessibilityManagerCompat.java
index d86bb17698..1d32d1dfa2 100644
--- a/src/com/android/launcher3/compat/AccessibilityManagerCompat.java
+++ b/src/com/android/launcher3/compat/AccessibilityManagerCompat.java
@@ -75,9 +75,6 @@ public class AccessibilityManagerCompat {
     }
 
     public static void sendScrollFinishedEventToTest(Context context) {
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, "sendScrollFinishedEventToTest");
-        }
         final AccessibilityManager accessibilityManager = getAccessibilityManagerForTest(context);
         if (accessibilityManager == null) return;
 
@@ -97,9 +94,6 @@ public class AccessibilityManagerCompat {
                 AccessibilityEvent.TYPE_ANNOUNCEMENT);
         e.setClassName(eventTag);
         e.setParcelableData(data);
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, "sendEventToTest " + e);
-        }
         accessibilityManager.sendAccessibilityEvent(e);
     }
 
diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java
index 2644db8f3c..8165627448 100644
--- a/src/com/android/launcher3/testing/TestProtocol.java
+++ b/src/com/android/launcher3/testing/TestProtocol.java
@@ -107,5 +107,4 @@ public final class TestProtocol {
     public static final String PAUSE_NOT_DETECTED = "b/139891609";
     public static final String OVERIEW_NOT_ALLAPPS = "b/156095088";
     public static final String NO_SWIPE_TO_HOME = "b/158017601";
-    public static final String NO_SCROLL_END_WIDGETS = "b/160238801";
 }
diff --git a/src/com/android/launcher3/views/BaseDragLayer.java b/src/com/android/launcher3/views/BaseDragLayer.java
index 2c75c74827..b010b4b94b 100644
--- a/src/com/android/launcher3/views/BaseDragLayer.java
+++ b/src/com/android/launcher3/views/BaseDragLayer.java
@@ -292,9 +292,6 @@ public abstract class BaseDragLayer<T extends Context & ActivityContext>
 
     @Override
     public boolean dispatchTouchEvent(MotionEvent ev) {
-        if (Utilities.IS_RUNNING_IN_TEST_HARNESS) {
-            Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, "BaseDragLayer: " + ev);
-        }
         switch (ev.getAction()) {
             case ACTION_DOWN: {
                 if ((mTouchDispatchState & TOUCH_DISPATCHING_TO_VIEW_IN_PROGRESS) != 0) {
diff --git a/src/com/android/launcher3/widget/WidgetsDiffReporter.java b/src/com/android/launcher3/widget/WidgetsDiffReporter.java
index c9e80dc848..df6e2c3023 100644
--- a/src/com/android/launcher3/widget/WidgetsDiffReporter.java
+++ b/src/com/android/launcher3/widget/WidgetsDiffReporter.java
@@ -20,10 +20,8 @@ import android.util.Log;
 
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.android.launcher3.Utilities;
 import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.model.data.PackageItemInfo;
-import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.widget.WidgetsListAdapter.WidgetListRowEntryComparator;
 
 import java.util.ArrayList;
@@ -34,8 +32,8 @@ import java.util.Iterator;
  * methods accordingly.
  */
 public class WidgetsDiffReporter {
-    private static final boolean DEBUG = Utilities.IS_RUNNING_IN_TEST_HARNESS; // b/160238801
-    private static final String TAG = TestProtocol.NO_SCROLL_END_WIDGETS;
+    private static final boolean DEBUG = false;
+    private static final String TAG = "WidgetsDiffReporter";
 
     private final IconCache mIconCache;
     private final RecyclerView.Adapter mListener;
diff --git a/src/com/android/launcher3/widget/WidgetsFullSheet.java b/src/com/android/launcher3/widget/WidgetsFullSheet.java
index ba55f5adee..68a3ec51ee 100644
--- a/src/com/android/launcher3/widget/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/WidgetsFullSheet.java
@@ -24,7 +24,6 @@ import android.animation.PropertyValuesHolder;
 import android.content.Context;
 import android.graphics.Rect;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -39,10 +38,8 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherAppWidgetHost.ProviderChangedListener;
 import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.compat.AccessibilityManagerCompat;
-import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.views.RecyclerViewFastScroller;
 import com.android.launcher3.views.TopRoundedCornerView;
 
@@ -71,14 +68,6 @@ public class WidgetsFullSheet extends BaseWidgetSheet
 
     }
 
-    @Override
-    public boolean dispatchTouchEvent(MotionEvent ev) {
-        if (Utilities.IS_RUNNING_IN_TEST_HARNESS) {
-            Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, "WidgetsFullSheet: " + ev);
-        }
-        return super.dispatchTouchEvent(ev);
-    }
-
     public WidgetsFullSheet(Context context, AttributeSet attrs) {
         this(context, attrs, 0);
     }
diff --git a/src/com/android/launcher3/widget/WidgetsRecyclerView.java b/src/com/android/launcher3/widget/WidgetsRecyclerView.java
index 8f81977fc2..69de12b9d5 100644
--- a/src/com/android/launcher3/widget/WidgetsRecyclerView.java
+++ b/src/com/android/launcher3/widget/WidgetsRecyclerView.java
@@ -19,14 +19,11 @@ package com.android.launcher3.widget;
 import android.content.Context;
 import android.graphics.Point;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 
 import com.android.launcher3.BaseRecyclerView;
 import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
-import com.android.launcher3.testing.TestProtocol;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -120,9 +117,6 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
     public int getCurrentScrollY() {
         // Skip early if widgets are not bound.
         if (isModelNotReady() || getChildCount() == 0) {
-            if (Utilities.IS_RUNNING_IN_TEST_HARNESS) {
-                Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, "getCurrentScrollY: -1");
-            }
             return -1;
         }
 
@@ -131,10 +125,6 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
         int y = (child.getMeasuredHeight() * rowIndex);
         int offset = getLayoutManager().getDecoratedTop(child);
 
-        if (Utilities.IS_RUNNING_IN_TEST_HARNESS) {
-            Log.d(TestProtocol.NO_SCROLL_END_WIDGETS,
-                    "getCurrentScrollY: " + (getPaddingTop() + y - offset));
-        }
         return getPaddingTop() + y - offset;
     }
 
@@ -166,22 +156,13 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
         }
         if (mTouchDownOnScroller) {
             final boolean result = mScrollbar.handleTouchEvent(e, mFastScrollerOffset);
-            if (Utilities.IS_RUNNING_IN_TEST_HARNESS) {
-                Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, "onInterceptTouchEvent 1 " + result);
-            }
             return result;
         }
-        if (Utilities.IS_RUNNING_IN_TEST_HARNESS) {
-            Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, "onInterceptTouchEvent 2 false");
-        }
         return false;
     }
 
     @Override
     public void onTouchEvent(RecyclerView rv, MotionEvent e) {
-        if (Utilities.IS_RUNNING_IN_TEST_HARNESS) {
-            Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, "WidgetsRecyclerView.onTouchEvent");
-        }
         if (mTouchDownOnScroller) {
             mScrollbar.handleTouchEvent(e, mFastScrollerOffset);
         }
@@ -189,31 +170,5 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
 
     @Override
     public void onRequestDisallowInterceptTouchEvent(boolean disallowIntercept) {
-        if (Utilities.IS_RUNNING_IN_TEST_HARNESS) {
-            Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, "onRequestDisallowInterceptTouchEvent "
-                    + disallowIntercept);
-        }
-    }
-
-    @Override
-    public boolean dispatchTouchEvent(MotionEvent ev) {
-        final boolean result = super.dispatchTouchEvent(ev);
-        if (Utilities.IS_RUNNING_IN_TEST_HARNESS) {
-            Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, "WidgetsRecyclerView: state: "
-                    + getScrollState()
-                    + " can scroll: " + getLayoutManager().canScrollVertically()
-                    + " result: " + result
-                    + " layout suppressed: " + isLayoutSuppressed()
-                    + " event: " + ev);
-        }
-        return result;
-    }
-
-    @Override
-    public void stopNestedScroll() {
-        if (Utilities.IS_RUNNING_IN_TEST_HARNESS) {
-            Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, "stopNestedScroll");
-        }
-        super.stopNestedScroll();
     }
 }
\ No newline at end of file
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index a32d2f9ba5..e387a607b1 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -636,11 +636,9 @@ public final class LauncherInstrumentation {
     Parcelable executeAndWaitForEvent(Runnable command,
             UiAutomation.AccessibilityEventFilter eventFilter, Supplier<String> message) {
         try {
-            Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, "executeAndWaitForEvent: before");
             final AccessibilityEvent event =
                     mInstrumentation.getUiAutomation().executeAndWaitForEvent(
                             command, eventFilter, LONG_WAIT_TIME_MS);
-            Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, "executeAndWaitForEvent: after");
             assertNotNull("executeAndWaitForEvent returned null (this can't happen)", event);
             final Parcelable parcelableData = event.getParcelableData();
             event.recycle();
@@ -1097,10 +1095,7 @@ public final class LauncherInstrumentation {
         executeAndWaitForEvent(
                 () -> linearGesture(
                         startX, startY, endX, endY, steps, slowDown, GestureScope.INSIDE),
-                event -> {
-                    Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, "scroll: received event: " + event);
-                    return TestProtocol.SCROLL_FINISHED_MESSAGE.equals(event.getClassName());
-                },
+                event -> TestProtocol.SCROLL_FINISHED_MESSAGE.equals(event.getClassName()),
                 () -> "Didn't receive a scroll end message: " + startX + ", " + startY
                         + ", " + endX + ", " + endY);
     }
-- 
GitLab


From 00850fb588bf7b33b49d4771883039d5fd70be81 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 20 Jul 2020 13:57:56 -0700
Subject: [PATCH 0026/1664] Create a new instance of rotation touch helper per
 device state

Change-Id: I4e4288eaf37aab5bf0b8115f5e06e64459c20f00
---
 .../com/android/quickstep/RecentsAnimationDeviceState.java    | 2 +-
 quickstep/src/com/android/quickstep/RotationTouchHelper.java  | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index dd80bd758e..7a6bbb4ab9 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -114,7 +114,7 @@ public class RecentsAnimationDeviceState implements
         mDefaultDisplay = DefaultDisplay.INSTANCE.get(context);
         mDisplayId = mDefaultDisplay.getInfo().id;
         runOnDestroy(() -> mDefaultDisplay.removeChangeListener(this));
-        mRotationTouchHelper = RotationTouchHelper.INSTANCE.get(context);
+        mRotationTouchHelper = new RotationTouchHelper(context);
         runOnDestroy(mRotationTouchHelper::destroy);
 
         // Register for user unlocked if necessary
diff --git a/quickstep/src/com/android/quickstep/RotationTouchHelper.java b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
index d89ca10b69..5f3c02205e 100644
--- a/quickstep/src/com/android/quickstep/RotationTouchHelper.java
+++ b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
@@ -41,8 +41,6 @@ import java.util.ArrayList;
 public class RotationTouchHelper implements
         SysUINavigationMode.NavigationModeChangeListener,
         DefaultDisplay.DisplayInfoChangeListener {
-    public static final MainThreadInitializedObject<RotationTouchHelper> INSTANCE =
-            new MainThreadInitializedObject<>(RotationTouchHelper::new);
 
     private final OrientationTouchTransformer mOrientationTouchTransformer;
     private final DefaultDisplay mDefaultDisplay;
@@ -122,7 +120,7 @@ public class RotationTouchHelper implements
 
     private final Context mContext;
 
-    private RotationTouchHelper(Context context) {
+    public RotationTouchHelper(Context context) {
         mContext = context;
         Resources resources = mContext.getResources();
         mSysUiNavMode = SysUINavigationMode.INSTANCE.get(context);
-- 
GitLab


From a0dfbff96aa1127f1bd13aa447033381c52d5398 Mon Sep 17 00:00:00 2001
From: Tony Huang <tonyychuang@google.com>
Date: Tue, 26 Nov 2019 14:00:14 +0800
Subject: [PATCH 0027/1664] Enable one-handed mode gestural in QuickStep

Handling swipe-down/swipe-up gestural in device bottom area
for one-handed mode

1) The regsion is larger than gesture navigationbar view
2) One handed gestural in quickstep only active on NO_BUTTON, TWO_BUTTONS mode
3) One handed gestural only support on portrait mode

Bug: 150747547
Bug: 154189137
Bug: 156988988

Test: make and install
Test: manual enable one handed mode and swipe down to trigger
Test: manual start one handed and rotate device

Change-Id: I7b2447bfb2fe4082c95176b62934b98077b84920
(cherry picked from commit 7d375e31fe5d221750f9128c20121e34c1ab142f)
---
 .../quickstep/TouchInteractionService.java    |  16 ++
 .../OneHandedModeInputConsumer.java           | 143 ++++++++++++++++++
 quickstep/res/values/dimens.xml               |   4 +
 .../com/android/quickstep/InputConsumer.java  |   4 +-
 .../OrientationTouchTransformer.java          |  13 +-
 .../RecentsAnimationDeviceState.java          |  43 ++++++
 .../quickstep/RotationTouchHelper.java        |   4 +
 .../com/android/quickstep/SystemUiProxy.java  |  24 ++-
 .../util/SecureSettingsObserver.java          |   8 +
 9 files changed, 254 insertions(+), 5 deletions(-)
 create mode 100644 quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
index 8837c0ec75..574cd3402b 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
@@ -74,6 +74,7 @@ import com.android.launcher3.util.WindowBounds;
 import com.android.quickstep.inputconsumers.AccessibilityInputConsumer;
 import com.android.quickstep.inputconsumers.AssistantInputConsumer;
 import com.android.quickstep.inputconsumers.DeviceLockedInputConsumer;
+import com.android.quickstep.inputconsumers.OneHandedModeInputConsumer;
 import com.android.quickstep.inputconsumers.OtherActivityInputConsumer;
 import com.android.quickstep.inputconsumers.OverscrollInputConsumer;
 import com.android.quickstep.inputconsumers.OverviewInputConsumer;
@@ -500,6 +501,11 @@ public class TouchInteractionService extends Service implements PluginListener<O
                             mGestureState,
                             InputConsumer.NO_OP, mInputMonitorCompat,
                             mOverviewComponentObserver.assistantGestureIsConstrained());
+                } else if (mDeviceState.canTriggerOneHandedAction(event)
+                    && !mDeviceState.isOneHandedModeActive()) {
+                    // Consume gesture event for triggering one handed feature.
+                    mUncheckedConsumer = new OneHandedModeInputConsumer(this, mDeviceState,
+                        InputConsumer.NO_OP, mInputMonitorCompat);
                 } else {
                     mUncheckedConsumer = InputConsumer.NO_OP;
                 }
@@ -627,6 +633,11 @@ public class TouchInteractionService extends Service implements PluginListener<O
                 base = new ScreenPinnedInputConsumer(this, newGestureState);
             }
 
+            if (mDeviceState.canTriggerOneHandedAction(event)) {
+                base = new OneHandedModeInputConsumer(this, mDeviceState, base,
+                        mInputMonitorCompat);
+            }
+
             if (mDeviceState.isAccessibilityMenuAvailable()) {
                 base = new AccessibilityInputConsumer(this, mDeviceState, base,
                         mInputMonitorCompat);
@@ -635,6 +646,11 @@ public class TouchInteractionService extends Service implements PluginListener<O
             if (mDeviceState.isScreenPinningActive()) {
                 base = mResetGestureInputConsumer;
             }
+
+            if (mDeviceState.canTriggerOneHandedAction(event)) {
+                base = new OneHandedModeInputConsumer(this, mDeviceState, base,
+                        mInputMonitorCompat);
+            }
         }
         return base;
     }
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
new file mode 100644
index 0000000000..fced849a4d
--- /dev/null
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.quickstep.inputconsumers;
+
+import static android.view.MotionEvent.ACTION_CANCEL;
+import static android.view.MotionEvent.ACTION_DOWN;
+import static android.view.MotionEvent.ACTION_MOVE;
+import static android.view.MotionEvent.ACTION_UP;
+
+import static com.android.launcher3.Utilities.squaredHypot;
+
+import android.content.Context;
+import android.graphics.PointF;
+import android.view.MotionEvent;
+
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+import com.android.quickstep.InputConsumer;
+import com.android.quickstep.RecentsAnimationDeviceState;
+import com.android.quickstep.SystemUiProxy;
+import com.android.systemui.shared.system.InputMonitorCompat;
+
+/**
+ * Touch consumer for handling gesture event to launch one handed
+ * One handed gestural in quickstep only active on NO_BUTTON, TWO_BUTTONS, and portrait mode
+ */
+public class OneHandedModeInputConsumer extends DelegateInputConsumer {
+
+    private static final String TAG = "OneHandedModeInputConsumer";
+    private static final int ANGLE_MAX = 150;
+    private static final int ANGLE_MIN = 30;
+
+    private final Context mContext;
+    private final RecentsAnimationDeviceState mDeviceState;
+
+    private final float mDragDistThreshold;
+    private final float mSquaredSlop;
+
+    private final PointF mDownPos = new PointF();
+    private final PointF mLastPos = new PointF();
+    private final PointF mStartDragPos = new PointF();
+
+    private boolean mPassedSlop;
+
+    public OneHandedModeInputConsumer(Context context, RecentsAnimationDeviceState deviceState,
+            InputConsumer delegate, InputMonitorCompat inputMonitor) {
+        super(delegate, inputMonitor);
+        mContext = context;
+        mDeviceState = deviceState;
+        mDragDistThreshold = context.getResources().getDimensionPixelSize(
+                R.dimen.gestures_onehanded_drag_threshold);
+        mSquaredSlop = Utilities.squaredTouchSlop(context);
+    }
+
+    @Override
+    public int getType() {
+        return TYPE_ONE_HANDED | mDelegate.getType();
+    }
+
+    @Override
+    public void onMotionEvent(MotionEvent ev) {
+        switch (ev.getActionMasked()) {
+            case ACTION_DOWN: {
+                mDownPos.set(ev.getX(), ev.getY());
+                mLastPos.set(mDownPos);
+                break;
+            }
+            case ACTION_MOVE: {
+                if (mState == STATE_DELEGATE_ACTIVE) {
+                    break;
+                }
+                if (!mDelegate.allowInterceptByParent()) {
+                    mState = STATE_DELEGATE_ACTIVE;
+                    break;
+                }
+
+                mLastPos.set(ev.getX(), ev.getY());
+                if (!mPassedSlop) {
+                    if (squaredHypot(mLastPos.x - mDownPos.x, mLastPos.y - mDownPos.y)
+                            > mSquaredSlop) {
+                        mStartDragPos.set(mLastPos.x, mLastPos.y);
+                        if ((!mDeviceState.isOneHandedModeActive() && isValidStartAngle(
+                                mDownPos.x - mLastPos.x, mDownPos.y - mLastPos.y))
+                                || (mDeviceState.isOneHandedModeActive() && isValidExitAngle(
+                                mDownPos.x - mLastPos.x, mDownPos.y - mLastPos.y))) {
+                            mPassedSlop = true;
+                            setActive(ev);
+                        } else {
+                            mState = STATE_DELEGATE_ACTIVE;
+                        }
+                    }
+                } else {
+                    float distance = (float) Math.hypot(mLastPos.x - mStartDragPos.x,
+                            mLastPos.y - mStartDragPos.y);
+                    if (distance > mDragDistThreshold && mPassedSlop
+                            && mDeviceState.isOneHandedModeActive()) {
+                        SystemUiProxy.INSTANCE.get(mContext).stopOneHandedMode();
+                    }
+                }
+                break;
+            }
+            case ACTION_UP:
+            case ACTION_CANCEL: {
+                if (mLastPos.y >= mStartDragPos.y && mPassedSlop
+                        && !mDeviceState.isOneHandedModeActive()) {
+                    SystemUiProxy.INSTANCE.get(mContext).startOneHandedMode();
+                }
+
+                mPassedSlop = false;
+                mState = STATE_INACTIVE;
+                break;
+            }
+        }
+
+        if (mState != STATE_ACTIVE) {
+            mDelegate.onMotionEvent(ev);
+        }
+    }
+
+    private boolean isValidStartAngle(float deltaX, float deltaY) {
+        final float angle = (float) Math.toDegrees(Math.atan2(deltaY, deltaX));
+        return angle > -(ANGLE_MAX) && angle < -(ANGLE_MIN);
+    }
+
+    private boolean isValidExitAngle(float deltaX, float deltaY) {
+        final float angle = (float) Math.toDegrees(Math.atan2(deltaY, deltaX));
+        return angle > ANGLE_MIN && angle < ANGLE_MAX;
+    }
+}
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 9d703167d9..6737c5f61d 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -76,6 +76,10 @@
     <dimen name="gestures_assistant_drag_threshold">55dp</dimen>
     <dimen name="gestures_assistant_fling_threshold">55dp</dimen>
 
+    <!-- One-Handed Mode -->
+    <!-- Threshold for draging distance to enable one-handed mode -->
+    <dimen name="gestures_onehanded_drag_threshold">20dp</dimen>
+
     <!-- Distance to move elements when swiping up to go home from launcher -->
     <dimen name="home_pullback_distance">28dp</dimen>
 
diff --git a/quickstep/src/com/android/quickstep/InputConsumer.java b/quickstep/src/com/android/quickstep/InputConsumer.java
index ec720d5d5e..67711c0810 100644
--- a/quickstep/src/com/android/quickstep/InputConsumer.java
+++ b/quickstep/src/com/android/quickstep/InputConsumer.java
@@ -35,6 +35,7 @@ public interface InputConsumer {
     int TYPE_RESET_GESTURE = 1 << 8;
     int TYPE_OVERSCROLL = 1 << 9;
     int TYPE_SYSUI_OVERLAY = 1 << 10;
+    int TYPE_ONE_HANDED = 1 << 11;
 
     String[] NAMES = new String[] {
            "TYPE_NO_OP",                    // 0
@@ -47,7 +48,8 @@ public interface InputConsumer {
             "TYPE_OVERVIEW_WITHOUT_FOCUS",  // 7
             "TYPE_RESET_GESTURE",           // 8
             "TYPE_OVERSCROLL",              // 9
-            "TYPE_SYSUI_OVERLAY"         // 10
+            "TYPE_SYSUI_OVERLAY",           // 10
+            "TYPE_ONE_HANDED",              // 11
     };
 
     InputConsumer NO_OP = () -> TYPE_NO_OP;
diff --git a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
index 1081548b0d..03d44e8c81 100644
--- a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
+++ b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
@@ -63,6 +63,7 @@ class OrientationTouchTransformer {
     private SparseArray<OrientationRectF> mSwipeTouchRegions = new SparseArray<>(MAX_ORIENTATIONS);
     private final RectF mAssistantLeftRegion = new RectF();
     private final RectF mAssistantRightRegion = new RectF();
+    private final RectF mOneHandedModeRegion = new RectF();
     private int mCurrentDisplayRotation;
     private boolean mEnableMultipleRegions;
     private Resources mResources;
@@ -216,10 +217,10 @@ class OrientationTouchTransformer {
 
         Point size = display.realSize;
         int rotation = display.rotation;
+        int touchHeight = getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE);
         OrientationRectF orientationRectF =
                 new OrientationRectF(0, 0, size.x, size.y, rotation);
         if (mMode == SysUINavigationMode.Mode.NO_BUTTON) {
-            int touchHeight = getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE);
             orientationRectF.top = orientationRectF.bottom - touchHeight;
             updateAssistantRegions(orientationRectF);
         } else {
@@ -235,10 +236,11 @@ class OrientationTouchTransformer {
                             + getNavbarSize(ResourceUtils.NAVBAR_LANDSCAPE_LEFT_RIGHT_SIZE);
                     break;
                 default:
-                    orientationRectF.top = orientationRectF.bottom
-                            - getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE);
+                    orientationRectF.top = orientationRectF.bottom - touchHeight;
             }
         }
+        // One handed gestural only active on portrait mode
+        mOneHandedModeRegion.set(0, orientationRectF.bottom - touchHeight, size.x, size.y);
 
         return orientationRectF;
     }
@@ -264,6 +266,10 @@ class OrientationTouchTransformer {
 
     }
 
+    boolean touchInOneHandedModeRegion(MotionEvent ev) {
+        return mOneHandedModeRegion.contains(ev.getX(), ev.getY());
+    }
+
     private int getNavbarSize(String resName) {
         return ResourceUtils.getNavbarSize(resName, mResources);
     }
@@ -355,6 +361,7 @@ class OrientationTouchTransformer {
             regions.append(rectF.mRotation).append(" ");
         }
         pw.println(regions.toString());
+        pw.println("  mOneHandedModeRegion=" + mOneHandedModeRegion);
     }
 
     private class OrientationRectF extends RectF {
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index 7a6bbb4ab9..87522b852e 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -29,6 +29,7 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_G
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_HOME_DISABLED;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NAV_BAR_HIDDEN;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_ONE_HANDED_ACTIVE;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING;
@@ -43,10 +44,13 @@ import android.content.IntentFilter;
 import android.content.res.Resources;
 import android.graphics.Region;
 import android.os.Process;
+import android.os.SystemProperties;
 import android.os.UserManager;
 import android.provider.Settings;
 import android.text.TextUtils;
+import android.util.DisplayMetrics;
 import android.view.MotionEvent;
+import android.view.Surface;
 
 import androidx.annotation.BinderThread;
 
@@ -73,6 +77,8 @@ public class RecentsAnimationDeviceState implements
         NavigationModeChangeListener,
         DefaultDisplay.DisplayInfoChangeListener {
 
+    private static boolean sIsOneHandedEnabled;
+
     private final Context mContext;
     private final SysUINavigationMode mSysUiNavMode;
     private final DefaultDisplay mDefaultDisplay;
@@ -84,6 +90,7 @@ public class RecentsAnimationDeviceState implements
     private @SystemUiStateFlags int mSystemUiStateFlags;
     private SysUINavigationMode.Mode mMode = THREE_BUTTONS;
     private NavBarPosition mNavBarPosition;
+    private SecureSettingsObserver mOneHandedEnabledObserver;
 
     private final Region mDeferredGestureRegion = new Region();
     private boolean mAssistantAvailable;
@@ -157,6 +164,13 @@ public class RecentsAnimationDeviceState implements
             }
         }
 
+        if (SystemProperties.getBoolean("ro.support_one_handed_mode", false)) {
+            mOneHandedEnabledObserver = SecureSettingsObserver.newOneHandedSettingsObserver(
+                    mContext, this::onOneHandedEnabledSettingsChanged);
+            mOneHandedEnabledObserver.register();
+            mOneHandedEnabledObserver.dispatchOnChange();
+        }
+
         SecureSettingsObserver userSetupObserver = new SecureSettingsObserver(
                 context.getContentResolver(),
                 e -> mIsUserSetupComplete = e,
@@ -405,6 +419,13 @@ public class RecentsAnimationDeviceState implements
         return (mSystemUiStateFlags & SYSUI_STATE_OVERVIEW_DISABLED) != 0;
     }
 
+    /**
+     * @return whether screen pinning is enabled and active
+     */
+    public boolean isOneHandedModeActive() {
+        return (mSystemUiStateFlags & SYSUI_STATE_ONE_HANDED_ACTIVE) != 0;
+    }
+
     /**
      * Sets the region in screen space where the gestures should be deferred (ie. due to specific
      * nav bar ui).
@@ -467,6 +488,28 @@ public class RecentsAnimationDeviceState implements
                 && !isGestureBlockedActivity(task);
     }
 
+    /**
+     * One handed gestural in quickstep only active on NO_BUTTON, TWO_BUTTONS, and portrait mode
+     *
+     * @param ev The touch screen motion event.
+     * @return whether the given motion event can trigger the one handed mode.
+     */
+    public boolean canTriggerOneHandedAction(MotionEvent ev) {
+        if (!sIsOneHandedEnabled) {
+            return false;
+        }
+
+        final DefaultDisplay.Info displayInfo = mDefaultDisplay.getInfo();
+        return (mRotationTouchHelper.touchInOneHandedModeRegion(ev)
+            && displayInfo.rotation != Surface.ROTATION_90
+            && displayInfo.rotation != Surface.ROTATION_270
+            && displayInfo.metrics.densityDpi < DisplayMetrics.DENSITY_600);
+    }
+
+    private void onOneHandedEnabledSettingsChanged(boolean isOneHandedEnabled) {
+        sIsOneHandedEnabled = isOneHandedEnabled;
+    }
+
     public RotationTouchHelper getRotationTouchHelper() {
         return mRotationTouchHelper;
     }
diff --git a/quickstep/src/com/android/quickstep/RotationTouchHelper.java b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
index 5f3c02205e..88a85bb118 100644
--- a/quickstep/src/com/android/quickstep/RotationTouchHelper.java
+++ b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
@@ -188,6 +188,10 @@ public class RotationTouchHelper implements
         return mOrientationTouchTransformer.touchInAssistantRegion(ev);
     }
 
+    public boolean touchInOneHandedModeRegion(MotionEvent ev) {
+        return mOrientationTouchTransformer.touchInOneHandedModeRegion(ev);
+    }
+
     /**
      * Updates the regions for detecting the swipe up/quickswitch and assistant gestures.
      */
diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index 299e9e5af1..72510a999a 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -352,10 +352,32 @@ public class SystemUiProxy implements ISystemUiProxy {
         if (mSystemUiProxy != null) {
             try {
                 mSystemUiProxy.handleImageBundleAsScreenshot(screenImageBundle, locationInScreen,
-                        visibleInsets, task);
+                    visibleInsets, task);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call handleImageBundleAsScreenshot");
             }
         }
     }
+
+    @Override
+    public void startOneHandedMode() {
+        if (mSystemUiProxy != null) {
+            try {
+                mSystemUiProxy.startOneHandedMode();
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call startOneHandedMode", e);
+            }
+        }
+    }
+
+    @Override
+    public void stopOneHandedMode() {
+        if (mSystemUiProxy != null) {
+            try {
+                mSystemUiProxy.stopOneHandedMode();
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call stopOneHandedMode", e);
+            }
+        }
+    }
 }
diff --git a/src/com/android/launcher3/util/SecureSettingsObserver.java b/src/com/android/launcher3/util/SecureSettingsObserver.java
index 48aa02b799..08a8e6d255 100644
--- a/src/com/android/launcher3/util/SecureSettingsObserver.java
+++ b/src/com/android/launcher3/util/SecureSettingsObserver.java
@@ -29,6 +29,8 @@ public class SecureSettingsObserver extends ContentObserver {
 
     /** Hidden field Settings.Secure.NOTIFICATION_BADGING */
     public static final String NOTIFICATION_BADGING = "notification_badging";
+    /** Hidden field Settings.Secure.ONE_HANDED_MODE_ENABLED */
+    public static final String ONE_HANDED_ENABLED = "one_handed_mode_enabled";
 
     private final ContentResolver mResolver;
     private final String mKeySetting;
@@ -79,4 +81,10 @@ public class SecureSettingsObserver extends ContentObserver {
         return new SecureSettingsObserver(
                 context.getContentResolver(), listener, NOTIFICATION_BADGING, 1);
     }
+
+    public static SecureSettingsObserver newOneHandedSettingsObserver(Context context,
+            OnChangeListener listener) {
+        return new SecureSettingsObserver(
+                context.getContentResolver(), listener, ONE_HANDED_ENABLED, 1);
+    }
 }
-- 
GitLab


From 1c1f5d9aef0bd5e55460547d2da21dba3a5985d4 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Sat, 18 Jul 2020 23:37:47 +0000
Subject: [PATCH 0028/1664] Hook one-handed gesture to expand notification
 panel by default

Notify to expand notification panel through SystemUiProxy when
one-handed mode disabled and one-handed gesture detected.

Bug: 154080211
Test: make and install
Test: manual disable one handed mode and swipe down to trigger
Test: verified the gesture works even outside of home page

Change-Id: Iacc0e506ccd04dd81f6182759c8af7d686a7b77b
(cherry picked from commit dd3eb7d075021df869b009d5a78666d7d225aaf1)
---
 .../OneHandedModeInputConsumer.java           | 32 +++++++++++++++----
 .../RecentsAnimationDeviceState.java          | 13 ++++----
 .../com/android/quickstep/SystemUiProxy.java  | 11 +++++++
 3 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
index fced849a4d..46249d9fc5 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
@@ -106,18 +106,16 @@ public class OneHandedModeInputConsumer extends DelegateInputConsumer {
                 } else {
                     float distance = (float) Math.hypot(mLastPos.x - mStartDragPos.x,
                             mLastPos.y - mStartDragPos.y);
-                    if (distance > mDragDistThreshold && mPassedSlop
-                            && mDeviceState.isOneHandedModeActive()) {
-                        SystemUiProxy.INSTANCE.get(mContext).stopOneHandedMode();
+                    if (distance > mDragDistThreshold && mPassedSlop) {
+                        onStopGestureDetected();
                     }
                 }
                 break;
             }
             case ACTION_UP:
             case ACTION_CANCEL: {
-                if (mLastPos.y >= mStartDragPos.y && mPassedSlop
-                        && !mDeviceState.isOneHandedModeActive()) {
-                    SystemUiProxy.INSTANCE.get(mContext).startOneHandedMode();
+                if (mLastPos.y >= mStartDragPos.y && mPassedSlop) {
+                    onStartGestureDetected();
                 }
 
                 mPassedSlop = false;
@@ -131,6 +129,28 @@ public class OneHandedModeInputConsumer extends DelegateInputConsumer {
         }
     }
 
+    private void onStartGestureDetected() {
+        if (mDeviceState.isOneHandedModeActive()) {
+            return;
+        }
+
+        if (mDeviceState.isOneHandedModeEnabled()) {
+            SystemUiProxy.INSTANCE.get(mContext).startOneHandedMode();
+            return;
+        }
+
+        // Hook one-handed gesture to expand notification panel by default
+        SystemUiProxy.INSTANCE.get(mContext).expandNotificationPanel();
+    }
+
+    private void onStopGestureDetected() {
+        if (!mDeviceState.isOneHandedModeEnabled() || !mDeviceState.isOneHandedModeActive()) {
+            return;
+        }
+
+        SystemUiProxy.INSTANCE.get(mContext).stopOneHandedMode();
+    }
+
     private boolean isValidStartAngle(float deltaX, float deltaY) {
         final float angle = (float) Math.toDegrees(Math.atan2(deltaY, deltaX));
         return angle > -(ANGLE_MAX) && angle < -(ANGLE_MIN);
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index 87522b852e..15e6ca5e93 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -77,8 +77,6 @@ public class RecentsAnimationDeviceState implements
         NavigationModeChangeListener,
         DefaultDisplay.DisplayInfoChangeListener {
 
-    private static boolean sIsOneHandedEnabled;
-
     private final Context mContext;
     private final SysUINavigationMode mSysUiNavMode;
     private final DefaultDisplay mDefaultDisplay;
@@ -95,6 +93,7 @@ public class RecentsAnimationDeviceState implements
     private final Region mDeferredGestureRegion = new Region();
     private boolean mAssistantAvailable;
     private float mAssistantVisibility;
+    private boolean mIsOneHandedModeEnabled;
 
     private boolean mIsUserUnlocked;
     private final ArrayList<Runnable> mUserUnlockedActions = new ArrayList<>();
@@ -495,10 +494,6 @@ public class RecentsAnimationDeviceState implements
      * @return whether the given motion event can trigger the one handed mode.
      */
     public boolean canTriggerOneHandedAction(MotionEvent ev) {
-        if (!sIsOneHandedEnabled) {
-            return false;
-        }
-
         final DefaultDisplay.Info displayInfo = mDefaultDisplay.getInfo();
         return (mRotationTouchHelper.touchInOneHandedModeRegion(ev)
             && displayInfo.rotation != Surface.ROTATION_90
@@ -506,8 +501,12 @@ public class RecentsAnimationDeviceState implements
             && displayInfo.metrics.densityDpi < DisplayMetrics.DENSITY_600);
     }
 
+    public boolean isOneHandedModeEnabled() {
+        return mIsOneHandedModeEnabled;
+    }
+
     private void onOneHandedEnabledSettingsChanged(boolean isOneHandedEnabled) {
-        sIsOneHandedEnabled = isOneHandedEnabled;
+        mIsOneHandedModeEnabled = isOneHandedEnabled;
     }
 
     public RotationTouchHelper getRotationTouchHelper() {
diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index 72510a999a..e4b05aec12 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -380,4 +380,15 @@ public class SystemUiProxy implements ISystemUiProxy {
             }
         }
     }
+
+    @Override
+    public void expandNotificationPanel() {
+        if (mSystemUiProxy != null) {
+            try {
+                mSystemUiProxy.expandNotificationPanel();
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call expandNotificationPanel", e);
+            }
+        }
+    }
 }
-- 
GitLab


From fc6c42107d826343e72312b1c75d5bad16d44408 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Sat, 18 Jul 2020 23:50:05 +0000
Subject: [PATCH 0029/1664] Update state and touch region after one handed
 overlay changed

The matrix for overall modes x state changes:
-----------------------------------------------------
   Mode     |      State changed     | *Before|*After
-----------------------------------------------------
  OneHanded |  Portrait->Landscape   |  80dp  |  32dp
  OneHanded |  Landscape->Portrait   |  32dp  |  80dp
-----------------------------------------------------
  OneHanded |  Disable->Enable       |  32dp  |  32dp
 (Landscape)|  Enable->Disable       |  32dp  |  32dp
-----------------------------------------------------
  OneHanded |  Disable->Enable       |  32dp  |  80dp
 (Portrait) |  Enable->Disable       |  80dp  |  32dp
-----------------------------------------------------
  NO_BUTTON |  Portrait->Landscape   |  32dp  |  32dp
  NO_BUTTON |  Landscape->Portrait   |  32dp  |  32dp
  2 BUTTON  |  Portrait->Landscape   |  48dp  |  48dp
  2 BUTTON  |  Landscape->Portrait   |  48dp  |  48dp
  3 BUTTON  |  Portrait->Landscape   |  48dp  |  48dp
  3 BUTTON  |  Landscape->Portrait   |  48dp  |  48dp
-----------------------------------------------------
* dimen : navigation_bar_gesture_height

Test: adb bugrepot | grep mOneHandedModeRegion
Test: manually triger one handed
Test: atest WindowInsetsBehaviorTests
Test: atest com.android.launcher3.memory.MemoryTests
Test: flake -once
Test: rnlot -t com.android.launcher3.memory.MemoryTests
Bug: 157958539
Bug: 159183864

Change-Id: I19755938c3c93eb59a9f621af5722f5679c1da14
(cherry picked from commit 70b5ca2505c96f4d6176cf2439562b826601b354)
---
 .../quickstep/TouchInteractionService.java    | 16 ++++
 .../OrientationTouchTransformer.java          | 29 ++++++--
 .../RecentsAnimationDeviceState.java          | 19 ++++-
 .../quickstep/RotationTouchHelper.java        | 11 ++-
 .../quickstep/SysUINavigationMode.java        | 73 +++++++++++++++----
 src/com/android/launcher3/ResourceUtils.java  |  9 ++-
 6 files changed, 131 insertions(+), 26 deletions(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
index 574cd3402b..e5852be46f 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
@@ -58,6 +58,7 @@ import androidx.annotation.WorkerThread;
 
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.R;
+import com.android.launcher3.ResourceUtils;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.logging.UserEventDispatcher;
@@ -298,6 +299,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
         mAM = ActivityManagerWrapper.getInstance();
         mDeviceState = new RecentsAnimationDeviceState(this);
         mDeviceState.addNavigationModeChangedCallback(this::onNavigationModeChanged);
+        mDeviceState.addOneHandedModeChangedCallback(this::onOneHandedModeOverlayChanged);
         mDeviceState.runOnUserUnlocked(this::onUserUnlocked);
         mRotationTouchHelper = mDeviceState.getRotationTouchHelper();
         ProtoTracer.INSTANCE.get(this).add(this);
@@ -339,6 +341,13 @@ public class TouchInteractionService extends Service implements PluginListener<O
         resetHomeBounceSeenOnQuickstepEnabledFirstTime();
     }
 
+    /**
+     * Called when the one handed mode overlay package changes, to recreate touch region.
+     */
+    private void onOneHandedModeOverlayChanged(int newGesturalHeight) {
+        initInputMonitor();
+    }
+
     @UiThread
     public void onUserUnlocked() {
         mTaskAnimationManager = new TaskAnimationManager();
@@ -812,6 +821,13 @@ public class TouchInteractionService extends Service implements PluginListener<O
         }
         if (mOverviewComponentObserver.canHandleConfigChanges(activity.getComponentName(),
                 activity.getResources().getConfiguration().diff(newConfig))) {
+            // Since navBar gestural height are different between portrait and landscape,
+            // can handle orientation changes and refresh navigation gestural region through
+            // onOneHandedModeChanged()
+            int newGesturalHeight = ResourceUtils.getNavbarSize(
+                    ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE,
+                    getApplicationContext().getResources());
+            mDeviceState.onOneHandedModeChanged(newGesturalHeight);
             return;
         }
 
diff --git a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
index 03d44e8c81..0710a0aaa4 100644
--- a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
+++ b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
@@ -65,6 +65,7 @@ class OrientationTouchTransformer {
     private final RectF mAssistantRightRegion = new RectF();
     private final RectF mOneHandedModeRegion = new RectF();
     private int mCurrentDisplayRotation;
+    private int mNavBarGesturalHeight;
     private boolean mEnableMultipleRegions;
     private Resources mResources;
     private OrientationRectF mLastRectTouched;
@@ -104,20 +105,35 @@ class OrientationTouchTransformer {
         mResources = resources;
         mMode = mode;
         mContractInfo = contractInfo;
+        mNavBarGesturalHeight = getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE);
     }
 
-    void setNavigationMode(SysUINavigationMode.Mode newMode, DefaultDisplay.Info info) {
-        if (mMode == newMode) {
-            return;
-        }
-        this.mMode = newMode;
+    private void refreshTouchRegion(DefaultDisplay.Info info, Resources newRes) {
         // Swipe touch regions are independent of nav mode, so we have to clear them explicitly
         // here to avoid, for ex, a nav region for 2-button rotation 0 being used for 3-button mode
         // It tries to cache and reuse swipe regions whenever possible based only on rotation
+        mResources = newRes;
         mSwipeTouchRegions.clear();
         resetSwipeRegions(info);
     }
 
+    void setNavigationMode(SysUINavigationMode.Mode newMode, DefaultDisplay.Info info,
+            Resources newRes) {
+        if (mMode == newMode) {
+            return;
+        }
+        this.mMode = newMode;
+        refreshTouchRegion(info, newRes);
+    }
+
+    void setGesturalHeight(int newGesturalHeight, DefaultDisplay.Info info, Resources newRes) {
+        if (mNavBarGesturalHeight == newGesturalHeight) {
+            return;
+        }
+        mNavBarGesturalHeight = newGesturalHeight;
+        refreshTouchRegion(info, newRes);
+    }
+
     /**
      * Sets the current nav bar region to listen to events for as determined by
      * {@param info}. If multiple nav bar regions are enabled, then this region will be added
@@ -217,7 +233,7 @@ class OrientationTouchTransformer {
 
         Point size = display.realSize;
         int rotation = display.rotation;
-        int touchHeight = getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE);
+        int touchHeight = mNavBarGesturalHeight;
         OrientationRectF orientationRectF =
                 new OrientationRectF(0, 0, size.x, size.y, rotation);
         if (mMode == SysUINavigationMode.Mode.NO_BUTTON) {
@@ -361,6 +377,7 @@ class OrientationTouchTransformer {
             regions.append(rectF.mRotation).append(" ");
         }
         pw.println(regions.toString());
+        pw.println("  mNavBarGesturalHeight=" + mNavBarGesturalHeight);
         pw.println("  mOneHandedModeRegion=" + mOneHandedModeRegion);
     }
 
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index 15e6ca5e93..1a786726a5 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -59,6 +59,7 @@ import com.android.launcher3.Utilities;
 import com.android.launcher3.util.DefaultDisplay;
 import com.android.launcher3.util.SecureSettingsObserver;
 import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;
+import com.android.quickstep.SysUINavigationMode.OneHandedModeChangeListener;
 import com.android.quickstep.util.NavBarPosition;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.QuickStepContract;
@@ -75,7 +76,8 @@ import java.util.stream.Collectors;
  */
 public class RecentsAnimationDeviceState implements
         NavigationModeChangeListener,
-        DefaultDisplay.DisplayInfoChangeListener {
+        DefaultDisplay.DisplayInfoChangeListener,
+        OneHandedModeChangeListener {
 
     private final Context mContext;
     private final SysUINavigationMode mSysUiNavMode;
@@ -204,6 +206,15 @@ public class RecentsAnimationDeviceState implements
         runOnDestroy(() -> mSysUiNavMode.removeModeChangeListener(listener));
     }
 
+    /**
+     * Adds a listener for the one handed mode change,
+     * guaranteed to be called after the device state's mode has changed.
+     */
+    public void addOneHandedModeChangedCallback(OneHandedModeChangeListener listener) {
+        listener.onOneHandedModeChanged(mSysUiNavMode.addOneHandedOverlayChangeListener(listener));
+        runOnDestroy(() -> mSysUiNavMode.removeOneHandedOverlayChangeListener(listener));
+    }
+
     @Override
     public void onNavigationModeChanged(SysUINavigationMode.Mode newMode) {
         mDefaultDisplay.removeChangeListener(this);
@@ -217,7 +228,6 @@ public class RecentsAnimationDeviceState implements
         }
 
         mNavBarPosition = new NavBarPosition(newMode, mDefaultDisplay.getInfo());
-
         mMode = newMode;
     }
 
@@ -234,6 +244,11 @@ public class RecentsAnimationDeviceState implements
         mNavBarPosition = new NavBarPosition(mMode, info);
     }
 
+    @Override
+    public void onOneHandedModeChanged(int newGesturalHeight) {
+        mRotationTouchHelper.setGesturalHeight(newGesturalHeight);
+    }
+
     /**
      * @return the current navigation mode for the device.
      */
diff --git a/quickstep/src/com/android/quickstep/RotationTouchHelper.java b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
index 88a85bb118..2b5e42a61e 100644
--- a/quickstep/src/com/android/quickstep/RotationTouchHelper.java
+++ b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
@@ -226,7 +226,8 @@ public class RotationTouchHelper implements
         mDefaultDisplay.addChangeListener(this);
         onDisplayInfoChanged(mDefaultDisplay.getInfo(), CHANGE_ALL);
 
-        mOrientationTouchTransformer.setNavigationMode(newMode, mDefaultDisplay.getInfo());
+        mOrientationTouchTransformer.setNavigationMode(newMode, mDefaultDisplay.getInfo(),
+            mContext.getResources());
         if (!mMode.hasGestures && newMode.hasGestures) {
             setupOrientationSwipeHandler();
         } else if (mMode.hasGestures && !newMode.hasGestures){
@@ -270,6 +271,14 @@ public class RotationTouchHelper implements
         }
     }
 
+    /**
+     * Sets the gestural height.
+     */
+    void setGesturalHeight(int newGesturalHeight) {
+        mOrientationTouchTransformer.setGesturalHeight(newGesturalHeight, mDefaultDisplay.getInfo(),
+            mContext.getResources());
+    }
+
     /**
      * *May* apply a transform on the motion event if it lies in the nav bar region for another
      * orientation that is currently being tracked as a part of quickstep
diff --git a/quickstep/src/com/android/quickstep/SysUINavigationMode.java b/quickstep/src/com/android/quickstep/SysUINavigationMode.java
index 05ce2a2b9b..6994d669e0 100644
--- a/quickstep/src/com/android/quickstep/SysUINavigationMode.java
+++ b/quickstep/src/com/android/quickstep/SysUINavigationMode.java
@@ -16,14 +16,15 @@
 
 package com.android.quickstep;
 
+import static com.android.launcher3.ResourceUtils.INVALID_RESOURCE_HANDLE;
 import static com.android.launcher3.util.PackageManagerHelper.getPackageFilter;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.Resources;
 import android.util.Log;
 
+import com.android.launcher3.ResourceUtils;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.util.MainThreadInitializedObject;
 
@@ -58,15 +59,19 @@ public class SysUINavigationMode {
             new MainThreadInitializedObject<>(SysUINavigationMode::new);
 
     private static final String TAG = "SysUINavigationMode";
-
     private static final String ACTION_OVERLAY_CHANGED = "android.intent.action.OVERLAY_CHANGED";
     private static final String NAV_BAR_INTERACTION_MODE_RES_NAME =
             "config_navBarInteractionMode";
+    private static final String TARGET_OVERLAY_PACKAGE = "android";
 
     private final Context mContext;
     private Mode mMode;
 
+    private int mNavBarGesturalHeight;
+
     private final List<NavigationModeChangeListener> mChangeListeners = new ArrayList<>();
+    private final List<OneHandedModeChangeListener> mOneHandedOverlayChangeListeners =
+            new ArrayList<>();
 
     public SysUINavigationMode(Context context) {
         mContext = context;
@@ -76,8 +81,9 @@ public class SysUINavigationMode {
             @Override
             public void onReceive(Context context, Intent intent) {
                 updateMode();
+                updateGesturalHeight();
             }
-        }, getPackageFilter("android", ACTION_OVERLAY_CHANGED));
+        }, getPackageFilter(TARGET_OVERLAY_PACKAGE, ACTION_OVERLAY_CHANGED));
     }
 
     /** Updates navigation mode when needed. */
@@ -89,9 +95,35 @@ public class SysUINavigationMode {
         }
     }
 
+    private void updateGesturalHeight() {
+        int newGesturalHeight = ResourceUtils.getDimenByName(
+                ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE, mContext.getResources(),
+                INVALID_RESOURCE_HANDLE);
+
+        if (newGesturalHeight == INVALID_RESOURCE_HANDLE) {
+            Log.e(TAG, "Failed to get system resource ID. Incompatible framework version?");
+            return;
+        }
+
+        if (mNavBarGesturalHeight != newGesturalHeight) {
+            mNavBarGesturalHeight = newGesturalHeight;
+            dispatchOneHandedOverlayChange();
+        }
+    }
+
     private void initializeMode() {
-        int modeInt = getSystemIntegerRes(mContext, NAV_BAR_INTERACTION_MODE_RES_NAME);
-        for(Mode m : Mode.values()) {
+        int modeInt = ResourceUtils.getIntegerByName(NAV_BAR_INTERACTION_MODE_RES_NAME,
+                mContext.getResources(), INVALID_RESOURCE_HANDLE);
+        mNavBarGesturalHeight = ResourceUtils.getDimenByName(
+                ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE, mContext.getResources(),
+                INVALID_RESOURCE_HANDLE);
+
+        if (modeInt == INVALID_RESOURCE_HANDLE) {
+            Log.e(TAG, "Failed to get system resource ID. Incompatible framework version?");
+            return;
+        }
+
+        for (Mode m : Mode.values()) {
             if (m.resValue == modeInt) {
                 mMode = m;
             }
@@ -104,6 +136,12 @@ public class SysUINavigationMode {
         }
     }
 
+    private void dispatchOneHandedOverlayChange() {
+        for (OneHandedModeChangeListener listener : mOneHandedOverlayChangeListeners) {
+            listener.onOneHandedModeChanged(mNavBarGesturalHeight);
+        }
+    }
+
     public Mode addModeChangeListener(NavigationModeChangeListener listener) {
         mChangeListeners.add(listener);
         return mMode;
@@ -113,20 +151,17 @@ public class SysUINavigationMode {
         mChangeListeners.remove(listener);
     }
 
-    public Mode getMode() {
-        return mMode;
+    public int addOneHandedOverlayChangeListener(OneHandedModeChangeListener listener) {
+        mOneHandedOverlayChangeListeners.add(listener);
+        return mNavBarGesturalHeight;
     }
 
-    private static int getSystemIntegerRes(Context context, String resName) {
-        Resources res = context.getResources();
-        int resId = res.getIdentifier(resName, "integer", "android");
+    public void removeOneHandedOverlayChangeListener(OneHandedModeChangeListener listener) {
+        mOneHandedOverlayChangeListeners.remove(listener);
+    }
 
-        if (resId != 0) {
-            return res.getInteger(resId);
-        } else {
-            Log.e(TAG, "Failed to get system resource ID. Incompatible framework version?");
-            return -1;
-        }
+    public Mode getMode() {
+        return mMode;
     }
 
     /** @return Whether we can remove the shelf from overview. */
@@ -144,10 +179,16 @@ public class SysUINavigationMode {
     public void dump(PrintWriter pw) {
         pw.println("SysUINavigationMode:");
         pw.println("  mode=" + mMode.name());
+        pw.println("  mNavBarGesturalHeight=:" + mNavBarGesturalHeight);
     }
 
     public interface NavigationModeChangeListener {
 
         void onNavigationModeChanged(Mode newMode);
     }
+
+    public interface OneHandedModeChangeListener {
+
+        void onOneHandedModeChanged(int newGesturalHeight);
+    }
 }
\ No newline at end of file
diff --git a/src/com/android/launcher3/ResourceUtils.java b/src/com/android/launcher3/ResourceUtils.java
index 403d77913c..c9fb75a2db 100644
--- a/src/com/android/launcher3/ResourceUtils.java
+++ b/src/com/android/launcher3/ResourceUtils.java
@@ -22,6 +22,7 @@ import android.util.TypedValue;
 
 public class ResourceUtils {
     public static final int DEFAULT_NAVBAR_VALUE = 48;
+    public static final int INVALID_RESOURCE_HANDLE = -1;
     public static final String NAVBAR_LANDSCAPE_LEFT_RIGHT_SIZE = "navigation_bar_width";
     public static final String NAVBAR_BOTTOM_GESTURE_SIZE = "navigation_bar_gesture_height";
 
@@ -51,7 +52,13 @@ public class ResourceUtils {
         return val;
     }
 
+    public static int getIntegerByName(String resName, Resources res, int defaultValue) {
+        int resId = res.getIdentifier(resName, "integer", "android");
+        return resId != 0 ? res.getInteger(resId) : defaultValue;
+    }
+
     public static int pxFromDp(float size, DisplayMetrics metrics) {
-        return Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, size, metrics));
+        return size < 0 ? INVALID_RESOURCE_HANDLE : Math.round(
+                TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, size, metrics));
     }
 }
-- 
GitLab


From fbb8c69a56d7fe9a7e9e809262b8e6b17d00397f Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Sat, 18 Jul 2020 23:55:26 +0000
Subject: [PATCH 0030/1664] Guard swipe to notification gesture with system
 settings preference

Bug: 154080211
Test: make and install, check the gesture works as expectedly

Change-Id: Ibd6bbd595d2fba5d68e66eb54e4a7fec160b9bf8
(cherry picked from commit 779efaca91309f82e133954e1fab032601b2aa93)
---
 .../OneHandedModeInputConsumer.java           | 14 ++++-----
 .../RecentsAnimationDeviceState.java          | 29 ++++++++++++++-----
 .../util/SecureSettingsObserver.java          | 14 +++++++++
 3 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
index 46249d9fc5..0bb8fff2a1 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
@@ -130,17 +130,13 @@ public class OneHandedModeInputConsumer extends DelegateInputConsumer {
     }
 
     private void onStartGestureDetected() {
-        if (mDeviceState.isOneHandedModeActive()) {
-            return;
-        }
-
         if (mDeviceState.isOneHandedModeEnabled()) {
-            SystemUiProxy.INSTANCE.get(mContext).startOneHandedMode();
-            return;
+            if (!mDeviceState.isOneHandedModeActive()) {
+                SystemUiProxy.INSTANCE.get(mContext).startOneHandedMode();
+            }
+        } else if (mDeviceState.isSwipeToNotificationEnabled()) {
+            SystemUiProxy.INSTANCE.get(mContext).expandNotificationPanel();
         }
-
-        // Hook one-handed gesture to expand notification panel by default
-        SystemUiProxy.INSTANCE.get(mContext).expandNotificationPanel();
     }
 
     private void onStopGestureDetected() {
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index 1a786726a5..2868b1b37c 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -90,12 +90,12 @@ public class RecentsAnimationDeviceState implements
     private @SystemUiStateFlags int mSystemUiStateFlags;
     private SysUINavigationMode.Mode mMode = THREE_BUTTONS;
     private NavBarPosition mNavBarPosition;
-    private SecureSettingsObserver mOneHandedEnabledObserver;
 
     private final Region mDeferredGestureRegion = new Region();
     private boolean mAssistantAvailable;
     private float mAssistantVisibility;
     private boolean mIsOneHandedModeEnabled;
+    private boolean mIsSwipeToNotificationEnabled;
 
     private boolean mIsUserUnlocked;
     private final ArrayList<Runnable> mUserUnlockedActions = new ArrayList<>();
@@ -166,12 +166,21 @@ public class RecentsAnimationDeviceState implements
         }
 
         if (SystemProperties.getBoolean("ro.support_one_handed_mode", false)) {
-            mOneHandedEnabledObserver = SecureSettingsObserver.newOneHandedSettingsObserver(
-                    mContext, this::onOneHandedEnabledSettingsChanged);
-            mOneHandedEnabledObserver.register();
-            mOneHandedEnabledObserver.dispatchOnChange();
+            SecureSettingsObserver oneHandedEnabledObserver =
+                    SecureSettingsObserver.newOneHandedSettingsObserver(
+                            mContext, enabled -> mIsOneHandedModeEnabled = enabled);
+            oneHandedEnabledObserver.register();
+            oneHandedEnabledObserver.dispatchOnChange();
+            runOnDestroy(oneHandedEnabledObserver::unregister);
         }
 
+        SecureSettingsObserver swipeBottomEnabledObserver =
+                SecureSettingsObserver.newSwipeToNotificationSettingsObserver(
+                        mContext, enabled -> mIsSwipeToNotificationEnabled = enabled);
+        swipeBottomEnabledObserver.register();
+        swipeBottomEnabledObserver.dispatchOnChange();
+        runOnDestroy(swipeBottomEnabledObserver::unregister);
+
         SecureSettingsObserver userSetupObserver = new SecureSettingsObserver(
                 context.getContentResolver(),
                 e -> mIsUserSetupComplete = e,
@@ -509,6 +518,10 @@ public class RecentsAnimationDeviceState implements
      * @return whether the given motion event can trigger the one handed mode.
      */
     public boolean canTriggerOneHandedAction(MotionEvent ev) {
+        if (!mIsOneHandedModeEnabled && !mIsSwipeToNotificationEnabled) {
+            return false;
+        }
+
         final DefaultDisplay.Info displayInfo = mDefaultDisplay.getInfo();
         return (mRotationTouchHelper.touchInOneHandedModeRegion(ev)
             && displayInfo.rotation != Surface.ROTATION_90
@@ -520,8 +533,8 @@ public class RecentsAnimationDeviceState implements
         return mIsOneHandedModeEnabled;
     }
 
-    private void onOneHandedEnabledSettingsChanged(boolean isOneHandedEnabled) {
-        mIsOneHandedModeEnabled = isOneHandedEnabled;
+    public boolean isSwipeToNotificationEnabled() {
+        return mIsSwipeToNotificationEnabled;
     }
 
     public RotationTouchHelper getRotationTouchHelper() {
@@ -538,6 +551,8 @@ public class RecentsAnimationDeviceState implements
         pw.println("  assistantDisabled="
                 + QuickStepContract.isAssistantGestureDisabled(mSystemUiStateFlags));
         pw.println("  isUserUnlocked=" + mIsUserUnlocked);
+        pw.println("  isOneHandedModeEnabled=" + mIsOneHandedModeEnabled);
+        pw.println("  isSwipeToNotificationEnabled=" + mIsSwipeToNotificationEnabled);
         mRotationTouchHelper.dump(pw);
     }
 }
diff --git a/src/com/android/launcher3/util/SecureSettingsObserver.java b/src/com/android/launcher3/util/SecureSettingsObserver.java
index 08a8e6d255..4b2242907b 100644
--- a/src/com/android/launcher3/util/SecureSettingsObserver.java
+++ b/src/com/android/launcher3/util/SecureSettingsObserver.java
@@ -31,6 +31,9 @@ public class SecureSettingsObserver extends ContentObserver {
     public static final String NOTIFICATION_BADGING = "notification_badging";
     /** Hidden field Settings.Secure.ONE_HANDED_MODE_ENABLED */
     public static final String ONE_HANDED_ENABLED = "one_handed_mode_enabled";
+    /** Hidden field Settings.Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED */
+    public static final String ONE_HANDED_SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED =
+            "swipe_bottom_to_notification_enabled";
 
     private final ContentResolver mResolver;
     private final String mKeySetting;
@@ -87,4 +90,15 @@ public class SecureSettingsObserver extends ContentObserver {
         return new SecureSettingsObserver(
                 context.getContentResolver(), listener, ONE_HANDED_ENABLED, 1);
     }
+
+    /**
+     * Constructs settings observer for {@link #ONE_HANDED_SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED}
+     * preference.
+     */
+    public static SecureSettingsObserver newSwipeToNotificationSettingsObserver(Context context,
+            OnChangeListener listener) {
+        return new SecureSettingsObserver(
+                context.getContentResolver(), listener,
+                ONE_HANDED_SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, 1);
+    }
 }
-- 
GitLab


From 0c2b05947ec4d1b71910216552e29cfe1d575b07 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 20 Jul 2020 16:46:47 -0700
Subject: [PATCH 0031/1664] Handle uiMode changes

- Launcher already dedupes if there are no theme changes

Bug: 148988542
Test: adb shell cmd uimode car yes/no, adb shell cmd uimode night yes/no
Change-Id: Ia83f02d18a0433c8be59d1f488e58b38476ba5ff
---
 AndroidManifest.xml                    | 2 +-
 quickstep/AndroidManifest-launcher.xml | 2 +-
 quickstep/AndroidManifest.xml          | 2 +-
 tests/AndroidManifest-common.xml       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8e01f82018..4664c9315a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -49,7 +49,7 @@
             android:stateNotNeeded="true"
             android:windowSoftInputMode="adjustPan"
             android:screenOrientation="unspecified"
-            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize"
+            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:resizeableActivity="true"
             android:resumeWhilePausing="true"
             android:taskAffinity=""
diff --git a/quickstep/AndroidManifest-launcher.xml b/quickstep/AndroidManifest-launcher.xml
index 53910e344b..19f85e4c1f 100644
--- a/quickstep/AndroidManifest-launcher.xml
+++ b/quickstep/AndroidManifest-launcher.xml
@@ -49,7 +49,7 @@
             android:stateNotNeeded="true"
             android:windowSoftInputMode="adjustPan"
             android:screenOrientation="unspecified"
-            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize"
+            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:resizeableActivity="true"
             android:resumeWhilePausing="true"
             android:taskAffinity=""
diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml
index 4e7c3fa75b..5be32a89b4 100644
--- a/quickstep/AndroidManifest.xml
+++ b/quickstep/AndroidManifest.xml
@@ -59,7 +59,7 @@
              android:stateNotNeeded="true"
              android:theme="@style/LauncherTheme"
              android:screenOrientation="unspecified"
-             android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize"
+             android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
              android:resizeableActivity="true"
              android:resumeWhilePausing="true"
              android:taskAffinity=""/>
diff --git a/tests/AndroidManifest-common.xml b/tests/AndroidManifest-common.xml
index f243f279eb..bc6356ffa6 100644
--- a/tests/AndroidManifest-common.xml
+++ b/tests/AndroidManifest-common.xml
@@ -98,7 +98,7 @@
         <activity
             android:name="com.android.launcher3.testcomponent.TestLauncherActivity"
             android:clearTaskOnLaunch="true"
-            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize"
+            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:enabled="false"
             android:label="Test launcher"
             android:launchMode="singleTask"
-- 
GitLab


From efa41c1c522c039eefd85b1f3ae1c411010a8cf5 Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Tue, 21 Jul 2020 23:17:32 -0700
Subject: [PATCH 0032/1664] Limit launcher snapshot logging once per day.

This change will make sure launcher snapshot is logged only once in 24hrs interval using sharedpreference.

Bug: 161375303
Change-Id: Iab6b25d931b2e91ae5647e266bd68ead86c99bc6
---
 .../logging/StatsLogCompatManager.java        | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
index f378c2444f..b978c09f09 100644
--- a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
+++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
@@ -16,6 +16,10 @@
 
 package com.android.quickstep.logging;
 
+import static android.text.format.DateUtils.DAY_IN_MILLIS;
+import static android.text.format.DateUtils.formatElapsedTime;
+
+import static com.android.launcher3.Utilities.getDevicePrefs;
 import static com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.FOLDER;
 import static com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.SEARCH_RESULT_CONTAINER;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WORKSPACE_SNAPSHOT;
@@ -24,6 +28,8 @@ import static com.android.systemui.shared.system.SysUiStatsLog.LAUNCHER_UICHANGE
 import static com.android.systemui.shared.system.SysUiStatsLog.LAUNCHER_UICHANGED__DST_STATE__HOME;
 import static com.android.systemui.shared.system.SysUiStatsLog.LAUNCHER_UICHANGED__DST_STATE__OVERVIEW;
 
+import static java.lang.System.currentTimeMillis;
+
 import android.content.Context;
 import android.util.Log;
 
@@ -71,7 +77,7 @@ public class StatsLogCompatManager extends StatsLogManager {
 
     private static final String TAG = "StatsLog";
     private static final boolean IS_VERBOSE = Utilities.isPropertyEnabled(LogConfig.STATSLOG);
-
+    private static final String LAST_SNAPSHOT_TIME_MILLIS = "LAST_SNAPSHOT_TIME_MILLIS";
     private static final InstanceId DEFAULT_INSTANCE_ID = InstanceId.fakeInstanceId(0);
     // LauncherAtom.ItemInfo.getDefaultInstance() should be used but until launcher proto migrates
     // from nano to lite, bake constant to prevent robo test failure.
@@ -113,6 +119,20 @@ public class StatsLogCompatManager extends StatsLogManager {
 
         @Override
         public void execute(LauncherAppState app, BgDataModel dataModel, AllAppsList apps) {
+            long lastSnapshotTimeMillis = getDevicePrefs(mContext)
+                    .getLong(LAST_SNAPSHOT_TIME_MILLIS, 0);
+            // Log snapshot only if previous snapshot was older than a day
+            if (currentTimeMillis() - lastSnapshotTimeMillis < DAY_IN_MILLIS) {
+                if (IS_VERBOSE) {
+                    String elapsedTime = formatElapsedTime(
+                            (currentTimeMillis() - lastSnapshotTimeMillis) / 1000);
+                    Log.d(TAG, String.format(
+                            "Skipped snapshot logging since previous snapshot was %s old.",
+                            elapsedTime));
+                }
+                return;
+            }
+
             IntSparseArrayMap<FolderInfo> folders = dataModel.folders.clone();
             ArrayList<ItemInfo> workspaceItems = (ArrayList) dataModel.workspaceItems.clone();
             ArrayList<LauncherAppWidgetInfo> appWidgets = (ArrayList) dataModel.appWidgets.clone();
@@ -135,10 +155,12 @@ public class StatsLogCompatManager extends StatsLogManager {
                 LauncherAtom.ItemInfo atomInfo = info.buildProto(null);
                 writeSnapshot(atomInfo, mInstanceId);
             }
+            getDevicePrefs(mContext).edit()
+                    .putLong(LAST_SNAPSHOT_TIME_MILLIS, currentTimeMillis()).apply();
         }
     }
 
-    private static void writeSnapshot(LauncherAtom.ItemInfo info, InstanceId instanceId) {
+    private void writeSnapshot(LauncherAtom.ItemInfo info, InstanceId instanceId) {
         if (IS_VERBOSE) {
             Log.d(TAG, String.format("\nwriteSnapshot(%d):\n%s", instanceId.getId(), info));
         }
-- 
GitLab


From 457ae09acc35e511c5423b3eeea5220ef719c4f4 Mon Sep 17 00:00:00 2001
From: alexmang <alexmang@google.com>
Date: Sat, 18 Jul 2020 14:34:12 -0700
Subject: [PATCH 0033/1664] Add filtering of preferences in developer options

Search will recursively go into each preference group and set visibility of preferences based on title match. If a preference group (category) has no preferences, we will hide that preference group as well.

All queries and titles are sanitized by turning them to lower case and replacing underscores with spaces for convenience.

Change-Id: Ibdc689d74d0c872c92c1d523bbc0efdb9e31aecd
---
 res/layout/home_settings.xml                  | 21 ++++++++
 res/values/dimens.xml                         |  3 ++
 res/values/strings.xml                        |  3 +-
 res/values/styles.xml                         |  9 ++++
 .../settings/DeveloperOptionsFragment.java    | 51 +++++++++++++++++++
 5 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 res/layout/home_settings.xml

diff --git a/res/layout/home_settings.xml b/res/layout/home_settings.xml
new file mode 100644
index 0000000000..0f2461ad9e
--- /dev/null
+++ b/res/layout/home_settings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <EditText
+        android:id="@+id/filter_box"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/developer_options_filter_margins"
+        android:hint="@string/developer_options_filter_hint"
+        android:visibility="gone"
+        />
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@android:id/list_container"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 947e635d73..969765f121 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -247,6 +247,9 @@
     <dimen name="snackbar_min_text_size">12sp</dimen>
     <dimen name="snackbar_max_text_size">14sp</dimen>
 
+<!-- Developer Options -->
+    <dimen name="developer_options_filter_margins">10dp</dimen>
+
 <!-- Theming related -->
     <dimen name="default_dialog_corner_radius">8dp</dimen>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 935bb40fb3..80b511a54c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -348,7 +348,8 @@
     <!-- content description for paused work apps list -->
     <string name="work_apps_paused_content_description">Work profile is paused. Work apps can\’t send you notifications, use your battery, or access your location</string>
 
-
+    <!-- A hint shown in launcher settings develop options filter box -->
+    <string name="developer_options_filter_hint">Filter</string>
 
     <!-- A tip shown pointing at work toggle -->
     <string name="work_switch_tip">Pause work apps and notifications</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 25f21f35ec..3b9532eeee 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -149,6 +149,15 @@
 
     <style name="HomeSettingsTheme" parent="@android:style/Theme.DeviceDefault.Settings">
         <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="preferenceTheme">@style/HomeSettingsPreferenceTheme</item>
+    </style>
+
+    <style name="HomeSettingsPreferenceTheme" parent="@style/PreferenceThemeOverlay.v14.Material">
+        <item name="preferenceFragmentCompatStyle">@style/HomeSettingsFragmentCompatStyle</item>
+    </style>
+
+    <style name="HomeSettingsFragmentCompatStyle" parent="@style/PreferenceFragment.Material">
+        <item name="android:layout">@layout/home_settings</item>
     </style>
 
     <!--
diff --git a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
index b12d04f610..4baecb7c56 100644
--- a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
+++ b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
@@ -34,17 +34,23 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.util.ArrayMap;
 import android.util.Pair;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.EditText;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceDataStore;
 import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceGroup;
 import androidx.preference.PreferenceScreen;
 import androidx.preference.PreferenceViewHolder;
 import androidx.preference.SwitchPreference;
@@ -81,6 +87,7 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
     private PreferenceCategory mPluginsCategory;
     private FlagTogglerPrefUi mFlagTogglerPrefUi;
 
+
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_ADDED);
@@ -99,6 +106,50 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
         maybeAddSandboxCategory();
     }
 
+    private void filterPreferences(String query, PreferenceGroup pg) {
+        int count = pg.getPreferenceCount();
+        int hidden = 0;
+        for (int i = 0; i < count; i++) {
+            Preference preference = pg.getPreference(i);
+            if (preference instanceof PreferenceGroup) {
+                filterPreferences(query, (PreferenceGroup) preference);
+            } else {
+                String title = preference.getTitle().toString().toLowerCase().replace("_", " ");
+                if (query.isEmpty() || title.contains(query)) {
+                    preference.setVisible(true);
+                } else {
+                    preference.setVisible(false);
+                    hidden++;
+                }
+            }
+        }
+        pg.setVisible(hidden != count);
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        EditText filterBox = view.findViewById(R.id.filter_box);
+        filterBox.setVisibility(View.VISIBLE);
+        filterBox.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable editable) {
+                String query = editable.toString().toLowerCase().replace("_", " ");
+                filterPreferences(query, mPreferenceScreen);
+            }
+        });
+    }
+
     @Override
     public void onDestroy() {
         super.onDestroy();
-- 
GitLab


From 28f5075eb01a3a9e7c5e5de50fb6f99d0e1c953d Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 21 Jul 2020 14:15:13 -0700
Subject: [PATCH 0034/1664] Adding support for storing container based item
 list in the model

These items get updated automatically during various model tasks.
Also simplifying the pinned shortcut state, by calculating the
list of ppined shortcut on demand, instead of storing a refCount.

Bug: 160748731
Change-Id: I3169d293552b05b4f4d6c529397fbc761887a282
---
 src/com/android/launcher3/Launcher.java       |   2 +-
 src/com/android/launcher3/Workspace.java      |   3 +-
 .../launcher3/model/BaseModelUpdateTask.java  |  29 ++-
 .../android/launcher3/model/BgDataModel.java  | 179 +++++++++++++-----
 .../android/launcher3/model/LoaderTask.java   |  16 +-
 .../SecondaryDisplayLauncher.java             |   2 +-
 .../launcher3/shortcuts/ShortcutKey.java      |   4 +
 7 files changed, 163 insertions(+), 72 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 8c0a2d7abd..f3cc164aa9 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2495,7 +2495,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
      * @param updated list of shortcuts which have changed.
      */
     @Override
-    public void bindWorkspaceItemsChanged(ArrayList<WorkspaceItemInfo> updated) {
+    public void bindWorkspaceItemsChanged(List<WorkspaceItemInfo> updated) {
         if (!updated.isEmpty()) {
             mWorkspace.updateShortcuts(updated);
         }
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index a6283ff253..15e0daa8ea 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -115,6 +115,7 @@ import com.android.systemui.plugins.shared.LauncherOverlayManager.LauncherOverla
 
 import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.function.Predicate;
 
 /**
@@ -3087,7 +3088,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         return false;
     }
 
-    void updateShortcuts(ArrayList<WorkspaceItemInfo> shortcuts) {
+    void updateShortcuts(List<WorkspaceItemInfo> shortcuts) {
         final HashSet<WorkspaceItemInfo> updates = new HashSet<>(shortcuts);
         ItemOperator op = (info, v) -> {
             if (v instanceof BubbleTextView && updates.contains(info)) {
diff --git a/src/com/android/launcher3/model/BaseModelUpdateTask.java b/src/com/android/launcher3/model/BaseModelUpdateTask.java
index 9013cba54f..d1e501788e 100644
--- a/src/com/android/launcher3/model/BaseModelUpdateTask.java
+++ b/src/com/android/launcher3/model/BaseModelUpdateTask.java
@@ -22,7 +22,9 @@ import com.android.launcher3.LauncherModel;
 import com.android.launcher3.LauncherModel.CallbackTask;
 import com.android.launcher3.LauncherModel.ModelUpdateTask;
 import com.android.launcher3.model.BgDataModel.Callbacks;
+import com.android.launcher3.model.BgDataModel.FixedContainerItems;
 import com.android.launcher3.model.data.AppInfo;
+import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.ItemInfoMatcher;
@@ -30,7 +32,10 @@ import com.android.launcher3.widget.WidgetListRowEntry;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.Executor;
+import java.util.stream.Collectors;
 
 /**
  * Extension of {@link ModelUpdateTask} with some utility methods
@@ -88,11 +93,27 @@ public abstract class BaseModelUpdateTask implements ModelUpdateTask {
         return mModel.getWriter(false /* hasVerticalHotseat */, false /* verifyChanges */);
     }
 
-
-    public void bindUpdatedWorkspaceItems(final ArrayList<WorkspaceItemInfo> updatedShortcuts) {
-        if (!updatedShortcuts.isEmpty()) {
-            scheduleCallbackTask(c -> c.bindWorkspaceItemsChanged(updatedShortcuts));
+    public void bindUpdatedWorkspaceItems(List<WorkspaceItemInfo> allUpdates) {
+        // Bind workspace items
+        List<WorkspaceItemInfo> workspaceUpdates = allUpdates.stream()
+                .filter(info -> info.id != ItemInfo.NO_ID)
+                .collect(Collectors.toList());
+        if (!workspaceUpdates.isEmpty()) {
+            scheduleCallbackTask(c -> c.bindWorkspaceItemsChanged(workspaceUpdates));
         }
+
+        // Bind extra items if any
+        allUpdates.stream()
+                .mapToInt(info -> info.container)
+                .distinct()
+                .mapToObj(mDataModel.extraItems::get)
+                .filter(Objects::nonNull)
+                .forEach(this::bindExtraContainerItems);
+    }
+
+    public void bindExtraContainerItems(FixedContainerItems item) {
+        FixedContainerItems copy = item.clone();
+        scheduleCallbackTask(c -> c.bindExtraContainerItems(copy));
     }
 
     public void bindDeepShortcuts(BgDataModel dataModel) {
diff --git a/src/com/android/launcher3/model/BgDataModel.java b/src/com/android/launcher3/model/BgDataModel.java
index 7524920ce8..dfdc1387ff 100644
--- a/src/com/android/launcher3/model/BgDataModel.java
+++ b/src/com/android/launcher3/model/BgDataModel.java
@@ -15,19 +15,25 @@
  */
 package com.android.launcher3.model;
 
+import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_GET_KEY_FIELDS_ONLY;
+
 import static com.android.launcher3.model.WidgetsModel.GO_DISABLE_WIDGETS;
 import static com.android.launcher3.shortcuts.ShortcutRequest.PINNED;
 
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.mapping;
+
 import android.content.Context;
 import android.content.pm.LauncherApps;
 import android.content.pm.ShortcutInfo;
 import android.os.UserHandle;
 import android.text.TextUtils;
+import android.util.ArraySet;
 import android.util.Log;
-import android.util.MutableInt;
 
 import com.android.launcher3.InstallShortcutReceiver;
 import com.android.launcher3.LauncherSettings;
+import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.Workspace;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.data.AppInfo;
@@ -36,8 +42,10 @@ import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.model.data.PromiseAppInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.launcher3.pm.UserCache;
 import com.android.launcher3.shortcuts.ShortcutKey;
 import com.android.launcher3.shortcuts.ShortcutRequest;
+import com.android.launcher3.shortcuts.ShortcutRequest.QueryResult;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.IntSet;
@@ -50,14 +58,16 @@ import java.io.FileDescriptor;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.function.BiConsumer;
+import java.util.Set;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * All the data stored in-memory and managed by the LauncherModel
@@ -89,9 +99,9 @@ public class BgDataModel {
     public final IntSparseArrayMap<FolderInfo> folders = new IntSparseArrayMap<>();
 
     /**
-     * Map of ShortcutKey to the number of times it is pinned.
+     * Extra container based items
      */
-    public final Map<ShortcutKey, MutableInt> pinnedShortcutCounts = new HashMap<>();
+    public final IntSparseArrayMap<FixedContainerItems> extraItems = new IntSparseArrayMap<>();
 
     /**
      * List of all cached predicted items visible on home screen
@@ -128,8 +138,8 @@ public class BgDataModel {
         appWidgets.clear();
         folders.clear();
         itemsIdMap.clear();
-        pinnedShortcutCounts.clear();
         deepShortcutMap.clear();
+        extraItems.clear();
     }
 
     /**
@@ -182,6 +192,7 @@ public class BgDataModel {
     }
 
     public synchronized void removeItem(Context context, Iterable<? extends ItemInfo> items) {
+        ArraySet<UserHandle> updatedDeepShortcuts = new ArraySet<>();
         for (ItemInfo item : items) {
             switch (item.itemType) {
                 case LauncherSettings.Favorites.ITEM_TYPE_FOLDER:
@@ -200,14 +211,7 @@ public class BgDataModel {
                     workspaceItems.remove(item);
                     break;
                 case LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT: {
-                    // Decrement pinned shortcut count
-                    ShortcutKey pinnedShortcut = ShortcutKey.fromItemInfo(item);
-                    MutableInt count = pinnedShortcutCounts.get(pinnedShortcut);
-                    if ((count == null || --count.value == 0)
-                            && !InstallShortcutReceiver.getPendingShortcuts(context)
-                                .contains(pinnedShortcut)) {
-                        unpinShortcut(context, pinnedShortcut);
-                    }
+                    updatedDeepShortcuts.add(item.user);
                     // Fall through.
                 }
                 case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION:
@@ -221,6 +225,7 @@ public class BgDataModel {
             }
             itemsIdMap.remove(item.id);
         }
+        updatedDeepShortcuts.forEach(user -> updateShortcutPinnedState(context, user));
     }
 
     public synchronized void addItem(Context context, ItemInfo item, boolean newItem) {
@@ -230,23 +235,7 @@ public class BgDataModel {
                 folders.put(item.id, (FolderInfo) item);
                 workspaceItems.add(item);
                 break;
-            case LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT: {
-                // Increment the count for the given shortcut
-                ShortcutKey pinnedShortcut = ShortcutKey.fromItemInfo(item);
-                MutableInt count = pinnedShortcutCounts.get(pinnedShortcut);
-                if (count == null) {
-                    count = new MutableInt(1);
-                    pinnedShortcutCounts.put(pinnedShortcut, count);
-                } else {
-                    count.value++;
-                }
-
-                // Since this is a new item, pin the shortcut in the system server.
-                if (newItem && count.value == 1) {
-                    updatePinnedShortcuts(context, pinnedShortcut, List::add);
-                }
-                // Fall through
-            }
+            case LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT:
             case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION:
             case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT:
                 if (item.container == LauncherSettings.Favorites.CONTAINER_DESKTOP ||
@@ -271,36 +260,87 @@ public class BgDataModel {
                 appWidgets.add((LauncherAppWidgetInfo) item);
                 break;
         }
+        if (newItem && item.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT) {
+            updateShortcutPinnedState(context, item.user);
+        }
     }
 
     /**
-     * Removes the given shortcut from the current list of pinned shortcuts.
-     * (Runs on background thread)
+     * Updates the deep shortucts state in system to match out internal model, pinning any missing
+     * shortcuts and unpinning any extra shortcuts.
      */
-    public void unpinShortcut(Context context, ShortcutKey key) {
-        updatePinnedShortcuts(context, key, List::remove);
+    public void updateShortcutPinnedState(Context context) {
+        for (UserHandle user : UserCache.INSTANCE.get(context).getUserProfiles()) {
+            updateShortcutPinnedState(context, user);
+        }
     }
 
-    private void updatePinnedShortcuts(Context context, ShortcutKey key,
-            BiConsumer<List<String>, String> idOp) {
+    /**
+     * Updates the deep shortucts state in system to match out internal model, pinning any missing
+     * shortcuts and unpinning any extra shortcuts.
+     */
+    public synchronized void updateShortcutPinnedState(Context context, UserHandle user) {
         if (GO_DISABLE_WIDGETS) {
             return;
         }
-        String packageName = key.componentName.getPackageName();
-        String id = key.getId();
-        UserHandle user = key.user;
-        List<String> pinnedIds = new ShortcutRequest(context, user)
-                .forPackage(packageName)
-                .query(PINNED)
-                .stream()
-                .map(ShortcutInfo::getId)
-                .collect(Collectors.toCollection(ArrayList::new));
-        idOp.accept(pinnedIds, id);
-        try {
-            context.getSystemService(LauncherApps.class).pinShortcuts(packageName, pinnedIds, user);
-        } catch (SecurityException | IllegalStateException e) {
-            Log.w(TAG, "Failed to pin shortcut", e);
+
+        // Collect all system shortcuts
+        QueryResult result = new ShortcutRequest(context, user)
+                .query(PINNED | FLAG_GET_KEY_FIELDS_ONLY);
+        if (!result.wasSuccess()) {
+            return;
+        }
+        // Map of packageName to shortcutIds that are currently in the system
+        Map<String, Set<String>> systemMap = result.stream()
+                .collect(groupingBy(ShortcutInfo::getPackage,
+                        mapping(ShortcutInfo::getId, Collectors.toSet())));
+
+        // Collect all model shortcuts
+        Stream.Builder<WorkspaceItemInfo> itemStream = Stream.builder();
+        forAllWorkspaceItemInfos(user, itemStream::accept);
+        // Map of packageName to shortcutIds that are currently in our model
+        Map<String, Set<String>> modelMap = Stream.concat(
+                    // Model shortcuts
+                    itemStream.build()
+                        .filter(wi -> wi.itemType == Favorites.ITEM_TYPE_DEEP_SHORTCUT)
+                        .map(ShortcutKey::fromItemInfo),
+                    // Pending shortcuts
+                    InstallShortcutReceiver.getPendingShortcuts(context)
+                        .stream().filter(si -> si.user.equals(user)))
+                .collect(groupingBy(ShortcutKey::getPackageName,
+                        mapping(ShortcutKey::getId, Collectors.toSet())));
+
+        // Check for diff
+        for (Map.Entry<String, Set<String>> entry : modelMap.entrySet()) {
+            Set<String> modelShortcuts = entry.getValue();
+            Set<String> systemShortcuts = systemMap.remove(entry.getKey());
+            if (systemShortcuts == null) {
+                systemShortcuts = Collections.emptySet();
+            }
+
+            // Do not use .equals as it can vary based on the type of set
+            if (systemShortcuts.size() != modelShortcuts.size()
+                    || !systemShortcuts.containsAll(modelShortcuts)) {
+                // Update system state for this package
+                try {
+                    context.getSystemService(LauncherApps.class).pinShortcuts(
+                            entry.getKey(), new ArrayList<>(modelShortcuts), user);
+                } catch (SecurityException | IllegalStateException e) {
+                    Log.w(TAG, "Failed to pin shortcut", e);
+                }
+            }
         }
+
+        // If there are any extra pinned shortcuts, remove them
+        systemMap.keySet().forEach(packageName -> {
+            // Update system state
+            try {
+                context.getSystemService(LauncherApps.class).pinShortcuts(
+                        packageName, Collections.emptyList(), user);
+            } catch (SecurityException | IllegalStateException e) {
+                Log.w(TAG, "Failed to unpin shortcut", e);
+            }
+        });
     }
 
     /**
@@ -360,8 +400,40 @@ public class BgDataModel {
                 op.accept((WorkspaceItemInfo) info);
             }
         }
+
+        for (int i = extraItems.size() - 1; i >= 0; i--) {
+            for (ItemInfo info : extraItems.valueAt(i).items) {
+                if (info instanceof WorkspaceItemInfo && userHandle.equals(info.user)) {
+                    op.accept((WorkspaceItemInfo) info);
+                }
+            }
+        }
+    }
+
+    /**
+     * An object containing items corresponding to a fixed container
+     */
+    public static class FixedContainerItems {
+
+        public final int containerId;
+        public final List<ItemInfo> items;
+
+        public FixedContainerItems(int containerId) {
+            this(containerId, new ArrayList<>());
+        }
+
+        public FixedContainerItems(int containerId, List<ItemInfo> items) {
+            this.containerId = containerId;
+            this.items = items;
+        }
+
+        @Override
+        public FixedContainerItems clone() {
+            return new FixedContainerItems(containerId, Collections.unmodifiableList(items));
+        }
     }
 
+
     public interface Callbacks {
         // If the launcher has permission to access deep shortcuts.
         int FLAG_HAS_SHORTCUT_PERMISSION = 1 << 0;
@@ -384,7 +456,7 @@ public class BgDataModel {
         void bindAppsAdded(IntArray newScreens,
                 ArrayList<ItemInfo> addNotAnimated, ArrayList<ItemInfo> addAnimated);
         void bindPromiseAppProgressUpdated(PromiseAppInfo app);
-        void bindWorkspaceItemsChanged(ArrayList<WorkspaceItemInfo> updated);
+        void bindWorkspaceItemsChanged(List<WorkspaceItemInfo> updated);
         void bindWidgetsRestored(ArrayList<LauncherAppWidgetInfo> widgets);
         void bindRestoreItemsChange(HashSet<ItemInfo> updates);
         void bindWorkspaceComponentsRemoved(ItemInfoMatcher matcher);
@@ -393,6 +465,11 @@ public class BgDataModel {
         void executeOnNextDraw(ViewOnDrawExecutor executor);
         void bindDeepShortcutMap(HashMap<ComponentKey, Integer> deepShortcutMap);
 
+        /**
+         * Binds extra item provided any external source
+         */
+        default void bindExtraContainerItems(FixedContainerItems item) { }
+
         void bindAllApplications(AppInfo[] apps, int flags);
 
         /**
diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index 4a64522c65..bea00869ee 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -46,12 +46,10 @@ import android.os.UserManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.LongSparseArray;
-import android.util.MutableInt;
 import android.util.TimingLogger;
 
 import androidx.annotation.WorkerThread;
 
-import com.android.launcher3.InstallShortcutReceiver;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherModel;
 import com.android.launcher3.LauncherSettings;
@@ -94,7 +92,6 @@ import com.android.launcher3.widget.WidgetManagerHelper;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CancellationException;
@@ -794,17 +791,8 @@ public class LoaderTask implements Runnable {
                         LauncherSettings.Settings.METHOD_REMOVE_GHOST_WIDGETS);
             }
 
-            // Unpin shortcuts that don't exist on the workspace.
-            HashSet<ShortcutKey> pendingShortcuts =
-                    InstallShortcutReceiver.getPendingShortcuts(context);
-            for (ShortcutKey key : shortcutKeyToPinnedShortcuts.keySet()) {
-                MutableInt numTimesPinned = mBgDataModel.pinnedShortcutCounts.get(key);
-                if ((numTimesPinned == null || numTimesPinned.value == 0)
-                        && !pendingShortcuts.contains(key)) {
-                    // Shortcut is pinned but doesn't exist on the workspace; unpin it.
-                    mBgDataModel.unpinShortcut(context, key);
-                }
-            }
+            // Update pinned state of model shortcuts
+            mBgDataModel.updateShortcutPinnedState(context);
 
             // Sort the folder items, update ranks, and make sure all preview items are high res.
             FolderGridOrganizer verifier =
diff --git a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
index a013312860..c996748a28 100644
--- a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
+++ b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
@@ -222,7 +222,7 @@ public class SecondaryDisplayLauncher extends BaseDraggingActivity
     }
 
     @Override
-    public void bindWorkspaceItemsChanged(ArrayList<WorkspaceItemInfo> updated) { }
+    public void bindWorkspaceItemsChanged(List<WorkspaceItemInfo> updated) { }
 
     @Override
     public void bindWidgetsRestored(ArrayList<LauncherAppWidgetInfo> widgets) { }
diff --git a/src/com/android/launcher3/shortcuts/ShortcutKey.java b/src/com/android/launcher3/shortcuts/ShortcutKey.java
index 3ca9490cc5..0c6d675afd 100644
--- a/src/com/android/launcher3/shortcuts/ShortcutKey.java
+++ b/src/com/android/launcher3/shortcuts/ShortcutKey.java
@@ -30,6 +30,10 @@ public class ShortcutKey extends ComponentKey {
         return componentName.getClassName();
     }
 
+    public String getPackageName() {
+        return componentName.getPackageName();
+    }
+
     /**
      * Creates a {@link ShortcutRequest} for this key
      */
-- 
GitLab


From e1c0dda778cb89b2e1c0402b5d516d79a032d6cf Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Thu, 23 Jul 2020 16:05:02 -0700
Subject: [PATCH 0035/1664] Eliminating 10-sec wait for a non-existing widget

If we want to ensure that a widget doesn't exist, it's sufficient to
wait 100 ms

Change-Id: I9982e89e1a376678df2271954ce177a90a6a579d
---
 tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java
index a4aa9f270b..fa495f5a95 100644
--- a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java
+++ b/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java
@@ -192,7 +192,7 @@ public class BindWidgetTest extends AbstractLauncherUiTest {
                         WidgetManagerHelper.WIDGET_OPTION_RESTORE_COMPLETED));
         executeOnLauncher(l -> l.getAppWidgetHost().startListening());
         verifyWidgetPresent(info);
-        assertNull(mLauncher.getWorkspace().tryGetPendingWidget(DEFAULT_UI_TIMEOUT));
+        assertNull(mLauncher.getWorkspace().tryGetPendingWidget(100));
     }
 
     @Test
-- 
GitLab


From 4c80053950d9bf0e6c087f430fa5388daa52a2ec Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Thu, 23 Jul 2020 19:13:10 -0700
Subject: [PATCH 0036/1664] Speed up tests by injecting input events
 asynchronously

This way, we can get a humble ~3% acceleration

Change-Id: I53705d457838ea41be9af9ae0851ee8d2e2c1c3f
---
 .../com/android/launcher3/tapl/LauncherInstrumentation.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index c74dea9bb5..16891e2e69 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -1184,7 +1184,7 @@ public final class LauncherInstrumentation {
 
         final MotionEvent event = getMotionEvent(downTime, currentTime, action, point.x, point.y);
         assertTrue("injectInputEvent failed",
-                mInstrumentation.getUiAutomation().injectInputEvent(event, true));
+                mInstrumentation.getUiAutomation().injectInputEvent(event, false));
         event.recycle();
     }
 
-- 
GitLab


From 0bc32dcce64b20459ff6f8eff960b217810d59d8 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Thu, 23 Jul 2020 20:00:37 -0700
Subject: [PATCH 0037/1664] Recycling already running activities

This saves time on non-restarting activities that already exist.

Change-Id: I1506e70342608d2a8d7154d25d36e28aa8cb7554
---
 .../StartLauncherViaGestureTests.java          |  4 +++-
 .../android/quickstep/TaplTestsQuickstep.java  | 18 ++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java b/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java
index 0c5b9ada5d..664958a18e 100644
--- a/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java
+++ b/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java
@@ -48,7 +48,9 @@ public class StartLauncherViaGestureTests extends AbstractQuickStepTest {
         // b/143488140
         mLauncher.pressHome();
         // Start an activity where the gestures start.
-        startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR));
+        if (mLauncher.getRecentTasks().isEmpty()) {
+            startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR));
+        }
     }
 
     private void runTest(String... eventSequence) {
diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
index bf093fdabf..ed25cc71ca 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
@@ -69,14 +69,16 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
     }
 
     private void startTestApps() throws Exception {
-        startAppFast(getAppPackageName());
-        startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR));
-        startTestActivity(2);
-
-        executeOnLauncher(launcher -> assertTrue(
-                "Launcher activity is the top activity; expecting another activity to be the top "
-                        + "one",
-                isInBackground(launcher)));
+        if (mLauncher.getRecentTasks().size() < 3) {
+            startAppFast(getAppPackageName());
+            startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR));
+            startTestActivity(2);
+
+            executeOnLauncher(launcher -> assertTrue(
+                    "Launcher activity is the top activity; expecting another activity to be the "
+                            + "top one",
+                    isInBackground(launcher)));
+        }
     }
 
     @Test
-- 
GitLab


From 3a8075366c3177f8e308f8d0473d17a2c886cc94 Mon Sep 17 00:00:00 2001
From: andychou <andychou@google.com>
Date: Fri, 24 Jul 2020 13:26:14 +0800
Subject: [PATCH 0038/1664] Add ActivityOptions for SecondDisplayLaucher to
 launch activity

Currently, SecondDisplayLauncher doesn't specify ActivityOption to
launch on second display, so application will launch on main display
even the user tries to launch APP from SecondDisplayLauncher.
So need to specify ActivityOption then activity can launch on the correct
display

Bug: 162042798
Test: manual testing
Change-Id: Iceb4e01b725834983a5d01cf54350f61851ad172
---
 .../launcher3/secondarydisplay/SecondaryDisplayLauncher.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
index 21ad2756fb..68617921d3 100644
--- a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
+++ b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
@@ -22,6 +22,7 @@ import android.animation.AnimatorListenerAdapter;
 import android.app.ActivityOptions;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.Display;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewAnimationUtils;
@@ -170,7 +171,9 @@ public class SecondaryDisplayLauncher extends BaseDraggingActivity
 
     @Override
     public ActivityOptions getActivityLaunchOptions(View v) {
-        return null;
+        final Display display = getWindow().getDecorView().getDisplay();
+        return display != null ? ActivityOptions.makeBasic().setLaunchDisplayId(
+                       display.getDisplayId()) : null;
     }
 
     @Override
-- 
GitLab


From d25dabb466554fb15cd5bbe712318fb39197f96c Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Sat, 18 Jul 2020 08:32:23 -0700
Subject: [PATCH 0039/1664] Add InsetTransitionController to device search

Also removed plugin support as if both the feature flag and
the plugin is turned on, there are object/resource contention

Bug: 161594550

Change-Id: I2cb98e83c46c7e47db96b90fa8d7cb9620643221
---
 src/com/android/launcher3/Launcher.java       |   1 -
 .../AllAppsInsetTransitionController.java     | 186 ++++++++++++++++++
 .../allapps/AllAppsTransitionController.java  | 111 +++++------
 .../AbstractStateChangeTouchController.java   |   9 +-
 .../launcher3/util/SystemUiController.java    |   3 +-
 5 files changed, 239 insertions(+), 71 deletions(-)
 create mode 100644 src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index f3cc164aa9..e49c4559f0 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1550,7 +1550,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         mOverlayManager.onActivityDestroyed(this);
         mAppTransitionManager.unregisterRemoteAnimations();
         mUserChangedCallbackCloseable.close();
-        mAllAppsController.onActivityDestroyed();
     }
 
     public LauncherAccessibilityDelegate getAccessibilityDelegate() {
diff --git a/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java b/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
new file mode 100644
index 0000000000..5af9113ae8
--- /dev/null
+++ b/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.allapps;
+
+import android.graphics.Insets;
+import android.os.Build;
+import android.util.Log;
+import android.view.View;
+import android.view.WindowInsets;
+import android.view.WindowInsetsAnimationControlListener;
+import android.view.WindowInsetsAnimationController;
+import android.view.animation.Interpolator;
+import android.view.animation.LinearInterpolator;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.core.os.BuildCompat;
+
+/**
+ * Handles IME over all apps to be synchronously transitioning along with the passed in
+ * root inset.
+ */
+public class AllAppsInsetTransitionController {
+
+    private static final boolean DEBUG = false;
+    private static final String TAG = "AllAppsInsetTransitionController";
+    private static final Interpolator LINEAR = new LinearInterpolator();
+
+    private WindowInsetsAnimationController mAnimationController;
+    private WindowInsetsAnimationControlListener mCurrentRequest;
+
+    private float mAllAppsHeight;
+
+    private int mDownInsetBottom;
+    private boolean mShownAtDown;
+
+    private int mHiddenInsetBottom;
+    private int mShownInsetBottom;
+
+    private float mDown, mCurrent;
+    private View mApps;
+
+    public AllAppsInsetTransitionController(float allAppsHeight, View appsView) {
+        mAllAppsHeight = allAppsHeight;
+        mApps = appsView;
+    }
+
+    /**
+     * Initializes member variables and requests for the {@link WindowInsetsAnimationController}
+     * object.
+     *
+     * @param progress value between 0..1
+     */
+    @RequiresApi(api = Build.VERSION_CODES.R)
+    public void onDragStart(float progress) {
+        if (!BuildCompat.isAtLeastR()) return;
+        onAnimationEnd(progress);
+
+        mDown = progress * mAllAppsHeight;
+
+        // Below two values are sometimes incorrect. Possibly a platform bug
+        mDownInsetBottom = mApps.getRootWindowInsets().getInsets(WindowInsets.Type.ime()).bottom;
+        mShownAtDown = mApps.getRootWindowInsets().isVisible(WindowInsets.Type.ime());
+
+        // override this value based on what it should actually be.
+        mShownAtDown = Float.compare(progress, 1f) == 0 ? false : true;
+        mDownInsetBottom = mShownAtDown ? mShownInsetBottom : mHiddenInsetBottom;
+        if (DEBUG) {
+            Log.d(TAG, "\nonDragStart mDownInsets=" + mDownInsetBottom
+                    + " mShownAtDown =" + mShownAtDown);
+        }
+
+        mApps.getWindowInsetsController().controlWindowInsetsAnimation(
+                WindowInsets.Type.ime(), -1 /* no predetermined duration */, LINEAR, null,
+                mCurrentRequest = new WindowInsetsAnimationControlListener() {
+
+                    @Override
+                    public void onReady(WindowInsetsAnimationController controller, int types) {
+                        if (DEBUG) {
+                            Log.d(TAG, "Listener.onReady " + (mCurrentRequest == this));
+                        }
+                        if (mCurrentRequest == this) {
+                            mAnimationController = controller;
+                        } else {
+                            controller.finish(mShownAtDown);
+                        }
+                    }
+
+                    @Override
+                    public void onFinished(WindowInsetsAnimationController controller) {
+                        // when screen lock happens, then this method get called
+                        mAnimationController.finish(false);
+                        mAnimationController = null;
+                        if (DEBUG) {
+                            Log.d(TAG, "Listener.onFinished ctrl=" + controller);
+                        }
+                    }
+
+                    @Override
+                    public void onCancelled(@Nullable WindowInsetsAnimationController controller) {
+                        mAnimationController = null;
+                        if (controller != null) {
+                            controller.finish(mShownAtDown);
+                        }
+                        if (DEBUG) {
+                            Log.d(TAG, "Listener.onCancelled ctrl=" + controller);
+                        }
+                    }
+                });
+    }
+
+    /**
+     * Handles the translation using the progress.
+     *
+     * @param progress value between 0..1
+     */
+    @RequiresApi(api = 30)
+    public void setProgress(float progress) {
+        if (!BuildCompat.isAtLeastR()) return;
+        // progress that equals to 0 or 1 is error prone. Do not use them.
+        // Instead use onDragStart and onAnimationEnd
+        if (mAnimationController == null || progress <= 0f || progress >= 1f) return;
+
+        mCurrent = progress * mAllAppsHeight;
+        mHiddenInsetBottom = mAnimationController.getHiddenStateInsets().bottom; // 0
+        mShownInsetBottom = mAnimationController.getShownStateInsets().bottom; // 1155
+
+        int shift = mShownAtDown ? 0 : (int) (mAllAppsHeight - mShownInsetBottom);
+
+        int inset = (int) (mDownInsetBottom + (mDown - mCurrent) - shift);
+
+        if (DEBUG) {
+            Log.d(TAG, "updateInset mCurrent=" + mCurrent + " mDown="
+                    + mDown + " hidden=" + mHiddenInsetBottom
+                    + " shown=" + mShownInsetBottom
+                    + " mDownInsets.bottom=" + mDownInsetBottom + " inset:" + inset
+                    + " shift: " + shift);
+        }
+        final int start = mShownAtDown ? mShownInsetBottom : mHiddenInsetBottom;
+        final int end = mShownAtDown ? mHiddenInsetBottom : mShownInsetBottom;
+        inset = Math.max(inset, mHiddenInsetBottom);
+        inset = Math.min(inset, mShownInsetBottom);
+        Log.d(TAG, "updateInset inset:" + inset);
+
+        mAnimationController.setInsetsAndAlpha(
+                Insets.of(0, 0, 0, inset),
+                1f, (inset - start) / (float) (end - start));
+    }
+
+    /**
+     * Report to the animation controller that we no longer plan to translate anymore.
+     *
+     * @param progress value between 0..1
+     */
+    @RequiresApi(api = 30)
+    public void onAnimationEnd(float progress) {
+        if (DEBUG) {
+            Log.d(TAG, "endTranslation progress=" + progress
+                    + " mAnimationController=" + mAnimationController);
+        }
+
+        if (mAnimationController == null) return;
+
+        if (Float.compare(progress, 1f) == 0 /* bottom */) {
+            mAnimationController.finish(false /* gone */);
+        }
+        if (Float.compare(progress, 0f) == 0 /* top */) {
+            mAnimationController.finish(true /* show */);
+        }
+        mAnimationController = null;
+        mCurrentRequest = null;
+    }
+}
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index a9b030e056..5b00631659 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.android.launcher3.allapps;
 
 import static com.android.launcher3.LauncherState.ALL_APPS_CONTENT;
@@ -14,31 +29,28 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FA
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_HEADER_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_VERTICAL_PROGRESS;
+import static com.android.launcher3.util.SystemUiController.UI_STATE_ALLAPPS;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
-import android.content.Context;
 import android.util.FloatProperty;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.animation.Interpolator;
-import android.widget.EditText;
+
+import androidx.core.os.BuildCompat;
 
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
-import com.android.launcher3.R;
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.anim.PropertySetter;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
 import com.android.launcher3.states.StateAnimationConfig;
-import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
 import com.android.launcher3.views.ScrimView;
-import com.android.systemui.plugins.AllAppsSearchPlugin;
-import com.android.systemui.plugins.PluginListener;
 
 /**
  * Handles AllApps view transition.
@@ -51,7 +63,7 @@ import com.android.systemui.plugins.PluginListener;
  * closer to top or closer to the page indicator.
  */
 public class AllAppsTransitionController implements StateHandler<LauncherState>,
-        OnDeviceProfileChangeListener, PluginListener<AllAppsSearchPlugin> {
+        OnDeviceProfileChangeListener {
 
     public static final FloatProperty<AllAppsTransitionController> ALL_APPS_PROGRESS =
             new FloatProperty<AllAppsTransitionController>("allAppsProgress") {
@@ -85,10 +97,7 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
     private float mProgress;        // [0, 1], mShiftRange * mProgress = shiftCurrent
 
     private float mScrollRangeDelta = 0;
-
-    // plugin related variables
-    private AllAppsSearchPlugin mPlugin;
-    private View mPluginContent;
+    private AllAppsInsetTransitionController mInsetController;
 
     public AllAppsTransitionController(Launcher l) {
         mLauncher = l;
@@ -103,6 +112,10 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
         return mShiftRange;
     }
 
+    public AllAppsInsetTransitionController getInsetController() {
+        return mInsetController;
+    }
+
     @Override
     public void onDeviceProfileChanged(DeviceProfile dp) {
         mIsVerticalLayout = dp.isVerticalBarLayout();
@@ -130,8 +143,8 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
         float shiftCurrent = progress * mShiftRange;
 
         mAppsView.setTranslationY(shiftCurrent);
-        if (mPlugin != null) {
-            mPlugin.setProgress(progress);
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
+            mInsetController.setProgress(progress);
         }
     }
 
@@ -201,16 +214,12 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
         Interpolator allAppsFade = config.getInterpolator(ANIM_ALL_APPS_FADE, LINEAR);
         Interpolator headerFade = config.getInterpolator(ANIM_ALL_APPS_HEADER_FADE, allAppsFade);
 
-        if (mPlugin == null) {
-            setter.setViewAlpha(mAppsView.getContentView(), hasAllAppsContent ? 1 : 0, allAppsFade);
-            setter.setViewAlpha(mAppsView.getScrollBar(), hasAllAppsContent ? 1 : 0, allAppsFade);
-            mAppsView.getFloatingHeaderView().setContentVisibility(hasHeaderExtra,
-                    hasAllAppsContent, setter, headerFade, allAppsFade);
-        } else {
-            setter.setViewAlpha(mPluginContent, hasAllAppsContent ? 1 : 0, allAppsFade);
-            setter.setViewAlpha(mAppsView.getContentView(), 0, allAppsFade);
-            setter.setViewAlpha(mAppsView.getScrollBar(), 0, allAppsFade);
-        }
+
+        setter.setViewAlpha(mAppsView.getContentView(), hasAllAppsContent ? 1 : 0, allAppsFade);
+        setter.setViewAlpha(mAppsView.getScrollBar(), hasAllAppsContent ? 1 : 0, allAppsFade);
+        mAppsView.getFloatingHeaderView().setContentVisibility(hasHeaderExtra,
+                hasAllAppsContent, setter, headerFade, allAppsFade);
+
         mAppsView.getSearchUiManager().setContentVisibility(visibleElements, setter, allAppsFade);
 
         setter.setInt(mScrimView, ScrimView.DRAG_HANDLE_ALPHA,
@@ -228,8 +237,12 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
     public void setupViews(AllAppsContainerView appsView, ScrimView scrimView) {
         mAppsView = appsView;
         mScrimView = scrimView;
-        PluginManagerWrapper.INSTANCE.get(mLauncher)
-                .addPluginListener(this, AllAppsSearchPlugin.class, false);
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && BuildCompat.isAtLeastR()) {
+            mInsetController = new AllAppsInsetTransitionController(mShiftRange, mAppsView);
+            mLauncher.getSystemUiController().updateUiState(UI_STATE_ALLAPPS,
+                    View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+        }
     }
 
     /**
@@ -252,47 +265,11 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
         if (Float.compare(mProgress, 1f) == 0) {
             mAppsView.reset(false /* animate */);
         }
-        updatePluginAnimationEnd();
-    }
-
-    @Override
-    public void onPluginConnected(AllAppsSearchPlugin plugin, Context context) {
-        mPlugin = plugin;
-        mPluginContent = mLauncher.getLayoutInflater().inflate(
-                R.layout.all_apps_content_layout, mAppsView, false);
-        mAppsView.addView(mPluginContent);
-        mPluginContent.setAlpha(0f);
-        mPlugin.setup((ViewGroup) mPluginContent, mLauncher, mShiftRange);
-    }
-
-    @Override
-    public void onPluginDisconnected(AllAppsSearchPlugin plugin) {
-        mPlugin = null;
-        mAppsView.removeView(mPluginContent);
-    }
-
-    public void onActivityDestroyed() {
-        PluginManagerWrapper.INSTANCE.get(mLauncher).removePluginListener(this);
-    }
-
-    /** Used for the plugin to signal when drag starts happens
-     * @param toAllApps*/
-    public void onDragStart(boolean toAllApps) {
-        if (mPlugin == null) return;
-
-        if (toAllApps) {
-            EditText editText = mAppsView.getSearchUiManager().setTextSearchEnabled(true);
-            mPlugin.setEditText(editText);
-        }
-        mPlugin.onDragStart(toAllApps ? 1f : 0f);
-    }
-
-    private void updatePluginAnimationEnd() {
-        if (mPlugin == null) return;
-        mPlugin.onAnimationEnd(mProgress);
-        if (Float.compare(mProgress, 1f) == 0) {
-            mAppsView.getSearchUiManager().setTextSearchEnabled(false);
-            mPlugin.setEditText(null);
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && BuildCompat.isAtLeastR()) {
+            mInsetController.onAnimationEnd(mProgress);
+            if (Float.compare(mProgress, 1f) == 0) {
+                mAppsView.getSearchUiManager().setTextSearchEnabled(true).requestFocus();
+            }
         }
     }
 }
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index 3c78b08960..66dbf6a73d 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -37,6 +37,8 @@ import android.util.Log;
 import android.view.HapticFeedbackConstants;
 import android.view.MotionEvent;
 
+import androidx.core.os.BuildCompat;
+
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAnimUtils;
 import com.android.launcher3.LauncherState;
@@ -44,6 +46,7 @@ import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.logger.LauncherAtom;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.states.StateAnimationConfig;
@@ -265,8 +268,10 @@ public abstract class AbstractStateChangeTouchController
         mCanBlockFling = mFromState == NORMAL;
         mFlingBlockCheck.unblockFling();
         // Must be called after all the animation controllers have been paused
-        if (mToState == ALL_APPS || mToState == NORMAL) {
-            mLauncher.getAllAppsController().onDragStart(mToState == ALL_APPS);
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && BuildCompat.isAtLeastR()
+                && (mToState == ALL_APPS || mToState == NORMAL)) {
+            mLauncher.getAllAppsController().getInsetController().onDragStart(
+                    mToState == ALL_APPS ? 0 : 1);
         }
     }
 
diff --git a/src/com/android/launcher3/util/SystemUiController.java b/src/com/android/launcher3/util/SystemUiController.java
index 275c0246e2..3e48006f62 100644
--- a/src/com/android/launcher3/util/SystemUiController.java
+++ b/src/com/android/launcher3/util/SystemUiController.java
@@ -33,6 +33,7 @@ public class SystemUiController {
     public static final int UI_STATE_SCRIM_VIEW = 1;
     public static final int UI_STATE_WIDGET_BOTTOM_SHEET = 2;
     public static final int UI_STATE_OVERVIEW = 3;
+    public static final int UI_STATE_ALLAPPS = 4;
 
     public static final int FLAG_LIGHT_NAV = 1 << 0;
     public static final int FLAG_DARK_NAV = 1 << 1;
@@ -40,7 +41,7 @@ public class SystemUiController {
     public static final int FLAG_DARK_STATUS = 1 << 3;
 
     private final Window mWindow;
-    private final int[] mStates = new int[4];
+    private final int[] mStates = new int[5];
 
     public SystemUiController(Window window) {
         mWindow = window;
-- 
GitLab


From 0e649985e7f2e180e22ca9c8891016e1c44c007b Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Mon, 20 Jul 2020 14:17:13 -0700
Subject: [PATCH 0040/1664] Move the live tile as the recent view scrolls in
 Overview

Also
- Add offsetY for the case that user swipes up the live tile in Overview
- Fix the relative layer to use MIN_VALUE

Bug: 160911104
Test: manual

Change-Id: I7432240763cca94abe12086868e584cf8a453763
---
 .../NavBarToHomeTouchController.java          |  3 +-
 .../TaskViewTouchController.java              |  8 ++-
 .../quickstep/util/TaskViewSimulator.java     |  9 ++-
 .../quickstep/views/LauncherRecentsView.java  | 59 +------------------
 .../android/quickstep/views/RecentsView.java  | 49 +++++++++++----
 5 files changed, 53 insertions(+), 75 deletions(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
index c1a585ea9d..e45fa9d513 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
@@ -159,8 +159,7 @@ public class NavBarToHomeTouchController implements TouchController,
             builder.setFloat(recentsView, ADJACENT_PAGE_OFFSET,
                     -mPullbackDistance / recentsView.getPageOffsetScale(), PULLBACK_INTERPOLATOR);
             if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
-                builder.addOnFrameCallback(
-                        () -> recentsView.redrawLiveTile(false /* mightNeedToRefill */));
+                builder.addOnFrameCallback(recentsView::redrawLiveTile);
             }
         } else if (mStartState == ALL_APPS) {
             AllAppsTransitionController allAppsController = mLauncher.getAllAppsController();
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
index 0ee5d047c6..37a595ec07 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
@@ -263,8 +263,10 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
                 totalDisplacement * mProgressMultiplier, 0, 1));
 
         if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
-            if (mRecentsView.getCurrentPage() != 0 || isGoingUp) {
-                mRecentsView.redrawLiveTile(true);
+            if (mRecentsView.getCurrentPage() == 0) {
+                mRecentsView.getLiveTileTaskViewSimulator().setOffsetY(
+                        isGoingUp ? totalDisplacement : 0);
+                mRecentsView.redrawLiveTile();
             }
         }
         return true;
@@ -300,7 +302,7 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
         if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
             mCurrentAnimation.getAnimationPlayer().addUpdateListener(valueAnimator -> {
                 if (mRecentsView.getCurrentPage() != 0 || mCurrentAnimationIsGoingUp) {
-                    mRecentsView.redrawLiveTile(true);
+                    mRecentsView.redrawLiveTile();
                 }
             });
         }
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java
index 2805299b0e..105b62a911 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -73,6 +73,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
     private final BaseActivityInterface mSizeStrategy;
 
     private final Rect mTaskRect = new Rect();
+    private float mOffsetY;
     private final PointF mPivot = new PointF();
     private DeviceProfile mDp;
 
@@ -178,6 +179,10 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
         }
     }
 
+    public void setOffsetY(float offsetY) {
+        mOffsetY = offsetY;
+    }
+
     /**
      * Adds animation for all the components corresponding to transition from an app to overview
      */
@@ -281,7 +286,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
         mMatrix.postScale(scale, scale);
 
         // Apply TaskView matrix: translate, scale, scroll
-        mMatrix.postTranslate(mTaskRect.left, mTaskRect.top);
+        mMatrix.postTranslate(mTaskRect.left, mTaskRect.top + mOffsetY);
         mMatrix.postScale(mCurveScale, mCurveScale, taskWidth / 2, taskHeight / 2);
         mOrientationState.getOrientationHandler().set(
                 mMatrix, MATRIX_POST_TRANSLATE, mScrollState.scroll);
@@ -307,7 +312,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
                 .withCornerRadius(getCurrentCornerRadius());
 
         if (ENABLE_QUICKSTEP_LIVE_TILE.get() && params.getRecentsSurface() != null) {
-            builder.withRelativeLayerTo(params.getRecentsSurface(), Integer.MAX_VALUE);
+            builder.withRelativeLayerTo(params.getRecentsSurface(), Integer.MIN_VALUE);
         }
     }
 
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java
index 1034234138..0fcd74bf2c 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java
@@ -15,7 +15,6 @@
  */
 package com.android.quickstep.views;
 
-import static com.android.launcher3.LauncherState.ALL_APPS;
 import static com.android.launcher3.LauncherState.ALL_APPS_HEADER_EXTRA;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
@@ -46,7 +45,6 @@ import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
 import com.android.launcher3.views.ScrimView;
 import com.android.quickstep.LauncherActivityInterface;
 import com.android.quickstep.SysUINavigationMode;
-import com.android.quickstep.util.TransformParams;
 import com.android.systemui.plugins.PluginListener;
 import com.android.systemui.plugins.RecentsExtraCard;
 
@@ -57,8 +55,6 @@ import com.android.systemui.plugins.RecentsExtraCard;
 public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher>
         implements StateListener<LauncherState> {
 
-    private final TransformParams mTransformParams = new TransformParams();
-
     private RecentsExtraCard mRecentsExtraCardPlugin;
     private RecentsExtraViewContainer mRecentsExtraViewContainer;
     private PluginListener<RecentsExtraCard> mRecentsExtraCardPluginListener =
@@ -108,17 +104,6 @@ public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher>
         }
     }
 
-    @Override
-    public void setTranslationY(float translationY) {
-        super.setTranslationY(translationY);
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
-            LauncherState state = mActivity.getStateManager().getState();
-            if (state == OVERVIEW || state == ALL_APPS) {
-                redrawLiveTile(false);
-            }
-        }
-    }
-
     /**
      * Animates adjacent tasks and translate hotseat off screen as well.
      */
@@ -154,11 +139,11 @@ public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher>
     protected void onTaskLaunchAnimationUpdate(float progress, TaskView tv) {
         if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
             if (tv.isRunningTask()) {
-                mTransformParams.setProgress(1 - progress)
+                mLiveTileParams.setProgress(1 - progress)
                         .setSyncTransactionApplier(mSyncTransactionApplier);
                 // TODO: Revisit live tiles
             } else {
-                redrawLiveTile(true);
+                redrawLiveTile();
             }
         }
     }
@@ -174,46 +159,6 @@ public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher>
         super.onTaskLaunchAnimationEnd(success);
     }
 
-    @Override
-    public void scrollTo(int x, int y) {
-        super.scrollTo(x, y);
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && mEnableDrawingLiveTile) {
-            redrawLiveTile(true);
-        }
-    }
-
-    @Override
-    public TransformParams getLiveTileParams(
-            boolean mightNeedToRefill) {
-        if (!mEnableDrawingLiveTile || mRecentsAnimationController == null
-                || mRecentsAnimationTargets == null) {
-            return null;
-        }
-        TaskView taskView = getRunningTaskView();
-        if (taskView != null) {
-            taskView.getThumbnail().getGlobalVisibleRect(mTempRect);
-            int offsetX = (int) (mTaskWidth * taskView.getScaleX() * getScaleX()
-                    - mTempRect.width());
-            int offsetY = (int) (mTaskHeight * taskView.getScaleY() * getScaleY()
-                    - mTempRect.height());
-            if (((mCurrentPage != 0) || mightNeedToRefill) && offsetX > 0) {
-                if (mTempRect.left - offsetX < 0) {
-                    mTempRect.left -= offsetX;
-                } else {
-                    mTempRect.right += offsetX;
-                }
-            }
-            if (mightNeedToRefill && offsetY > 0) {
-                mTempRect.top -= offsetY;
-            }
-            mTransformParams.setProgress(1f)
-                    .setTargetAlpha(taskView.getAlpha())
-                    .setSyncTransactionApplier(mSyncTransactionApplier)
-                    .setTargetSet(mRecentsAnimationTargets);
-        }
-        return mTransformParams;
-    }
-
     @Override
     public void reset() {
         super.reset();
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
index e898b757ec..49a9db978b 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
@@ -130,6 +130,7 @@ import com.android.quickstep.util.LayoutUtils;
 import com.android.quickstep.util.RecentsOrientedState;
 import com.android.quickstep.util.SplitScreenBounds;
 import com.android.quickstep.util.SurfaceTransactionApplier;
+import com.android.quickstep.util.TaskViewSimulator;
 import com.android.quickstep.util.TransformParams;
 import com.android.systemui.plugins.ResourceProvider;
 import com.android.systemui.shared.recents.IPinnedStackAnimationListener;
@@ -213,10 +214,11 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     protected RecentsOrientedState mOrientationState;
     protected final BaseActivityInterface mSizeStrategy;
     protected RecentsAnimationController mRecentsAnimationController;
-    protected RecentsAnimationTargets mRecentsAnimationTargets;
     protected SurfaceTransactionApplier mSyncTransactionApplier;
     protected int mTaskWidth;
     protected int mTaskHeight;
+    protected final TransformParams mLiveTileParams = new TransformParams();
+    protected final TaskViewSimulator mLiveTileTaskViewSimulator;
     protected boolean mEnableDrawingLiveTile = false;
     protected final Rect mTempRect = new Rect();
     private final PointF mTempPointF = new PointF();
@@ -394,7 +396,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mActivity = BaseActivity.fromContext(context);
         mOrientationState = new RecentsOrientedState(
                 context, mSizeStrategy, this::animateRecentsRotationInPlace);
-        mOrientationState.setRecentsRotation(mActivity.getDisplay().getRotation());
+        final int rotation = mActivity.getDisplay().getRotation();
+        mOrientationState.setRecentsRotation(rotation);
 
         mFastFlingVelocity = getResources()
                 .getDimensionPixelSize(R.dimen.recents_fast_fling_velocity);
@@ -430,6 +433,12 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
 
         // Initialize quickstep specific cache params here, as this is constructed only once
         mActivity.getViewCache().setCacheSize(R.layout.digital_wellbeing_toast, 5);
+
+        mLiveTileTaskViewSimulator = new TaskViewSimulator(getContext(), getSizeStrategy());
+        mLiveTileTaskViewSimulator.recentsViewScale.value = 1;
+        mLiveTileTaskViewSimulator.setLayoutRotation(getPagedViewOrientedState().getTouchRotation(),
+                getPagedViewOrientedState().getDisplayRotation());
+        mLiveTileTaskViewSimulator.setRecentsRotation(rotation);
     }
 
     public OverScroller getScroller() {
@@ -514,6 +523,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mActivity.addMultiWindowModeChangedListener(mMultiWindowModeChangedListener);
         ActivityManagerWrapper.getInstance().registerTaskStackListener(mTaskStackListener);
         mSyncTransactionApplier = new SurfaceTransactionApplier(this);
+        mLiveTileParams.setSyncTransactionApplier(mSyncTransactionApplier);
         RecentsModel.INSTANCE.get(getContext()).addThumbnailChangeListener(this);
         mIdp.addOnChangeListener(this);
         mIPinnedStackAnimationListener.setActivity(mActivity);
@@ -531,6 +541,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mActivity.removeMultiWindowModeChangedListener(mMultiWindowModeChangedListener);
         ActivityManagerWrapper.getInstance().unregisterTaskStackListener(mTaskStackListener);
         mSyncTransactionApplier = null;
+        mLiveTileParams.setSyncTransactionApplier(null);
         RecentsModel.INSTANCE.get(getContext()).removeThumbnailChangeListener(this);
         mIdp.removeOnChangeListener(this);
         SystemUiProxy.INSTANCE.get(getContext()).setPinnedStackAnimationListener(null);
@@ -858,6 +869,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     public void setInsets(Rect insets) {
         mInsets.set(insets);
         resetPaddingFromTaskSize();
+        mLiveTileTaskViewSimulator.setDp(mActivity.getDeviceProfile());
     }
 
     private void resetPaddingFromTaskSize() {
@@ -899,6 +911,12 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
 
         // Update the high res thumbnail loader state
         mModel.getThumbnailCache().getHighResLoadingState().setFlingingFast(isFlingingFast);
+
+        mLiveTileTaskViewSimulator.setScroll(getScrollOffset());
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && mEnableDrawingLiveTile
+                && mLiveTileParams.getTargetSet() != null) {
+            redrawLiveTile();
+        }
         return scrolling;
     }
 
@@ -1006,7 +1024,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mTaskListChangeId = -1;
 
         mRecentsAnimationController = null;
-        mRecentsAnimationTargets = null;
+        mLiveTileParams.setTargetSet(null);
 
         unloadVisibleTaskData();
         setCurrentPage(0);
@@ -1668,9 +1686,11 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     @Override
     protected void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
-        if (mOrientationState.setRecentsRotation(mActivity.getDisplay().getRotation())) {
+        final int rotation = mActivity.getDisplay().getRotation();
+        if (mOrientationState.setRecentsRotation(rotation)) {
             updateOrientationHandler();
         }
+        mLiveTileTaskViewSimulator.setRecentsRotation(rotation);
     }
 
     public void setLayoutRotation(int touchRotation, int displayRotation) {
@@ -1699,6 +1719,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         requestLayout();
         // Reapply the current page to update page scrolls.
         setCurrentPage(mCurrentPage);
+        mLiveTileTaskViewSimulator.setLayoutRotation(getPagedViewOrientedState().getTouchRotation(),
+                getPagedViewOrientedState().getDisplayRotation());
     }
 
     public RecentsOrientedState getPagedViewOrientedState() {
@@ -2075,13 +2097,23 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mEnableDrawingLiveTile = enableDrawingLiveTile;
     }
 
-    public void redrawLiveTile(boolean mightNeedToRefill) { }
+    public void redrawLiveTile() {
+        mLiveTileTaskViewSimulator.apply(mLiveTileParams);
+    }
+
+    public TaskViewSimulator getLiveTileTaskViewSimulator() {
+        return mLiveTileTaskViewSimulator;
+    }
 
     // TODO: To be removed in a follow up CL
     public void setRecentsAnimationTargets(RecentsAnimationController recentsAnimationController,
             RecentsAnimationTargets recentsAnimationTargets) {
         mRecentsAnimationController = recentsAnimationController;
-        mRecentsAnimationTargets = recentsAnimationTargets;
+        if (recentsAnimationTargets != null) {
+            mLiveTileTaskViewSimulator.setPreview(
+                    recentsAnimationTargets.apps[recentsAnimationTargets.apps.length - 1]);
+            mLiveTileParams.setTargetSet(recentsAnimationTargets);
+        }
     }
 
     public void setLiveTileOverlayAttached(boolean liveTileOverlayAttached) {
@@ -2217,11 +2249,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         };
     }
 
-    public TransformParams getLiveTileParams(
-            boolean mightNeedToRefill) {
-        return null;
-    }
-
     private void updateEnabledOverlays() {
         int overlayEnabledPage = mOverlayEnabled ? getNextPage() : -1;
         int taskCount = getTaskViewCount();
-- 
GitLab


From f8ceabbcc1588f27a7b0532c4e52f2ea4089bafd Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Fri, 24 Jul 2020 17:58:26 -0700
Subject: [PATCH 0041/1664] Misc test improvements

Ignoring state events from NexusLauncher in Launcher3 tests.
Improving diags for failed app launch.

Change-Id: I3ffb49c598edef7b6698b48ba7b63e6163ef25b4
---
 .../compat/AccessibilityManagerCompat.java    | 11 ++++++----
 .../android/launcher3/tapl/Background.java    |  2 +-
 .../android/launcher3/tapl/Launchable.java    | 11 ++++++----
 .../tapl/LauncherInstrumentation.java         | 21 +++++++++++++------
 4 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/com/android/launcher3/compat/AccessibilityManagerCompat.java b/src/com/android/launcher3/compat/AccessibilityManagerCompat.java
index 1d32d1dfa2..30c3417d63 100644
--- a/src/com/android/launcher3/compat/AccessibilityManagerCompat.java
+++ b/src/com/android/launcher3/compat/AccessibilityManagerCompat.java
@@ -70,7 +70,8 @@ public class AccessibilityManagerCompat {
         final Bundle parcel = new Bundle();
         parcel.putInt(TestProtocol.STATE_FIELD, stateOrdinal);
 
-        sendEventToTest(accessibilityManager, TestProtocol.SWITCHED_TO_STATE_MESSAGE, parcel);
+        sendEventToTest(
+                accessibilityManager, context, TestProtocol.SWITCHED_TO_STATE_MESSAGE, parcel);
         Log.d(TestProtocol.PERMANENT_DIAG_TAG, "sendStateEventToTest: " + stateOrdinal);
     }
 
@@ -78,22 +79,24 @@ public class AccessibilityManagerCompat {
         final AccessibilityManager accessibilityManager = getAccessibilityManagerForTest(context);
         if (accessibilityManager == null) return;
 
-        sendEventToTest(accessibilityManager, TestProtocol.SCROLL_FINISHED_MESSAGE, null);
+        sendEventToTest(accessibilityManager, context, TestProtocol.SCROLL_FINISHED_MESSAGE, null);
     }
 
     public static void sendPauseDetectedEventToTest(Context context) {
         final AccessibilityManager accessibilityManager = getAccessibilityManagerForTest(context);
         if (accessibilityManager == null) return;
 
-        sendEventToTest(accessibilityManager, TestProtocol.PAUSE_DETECTED_MESSAGE, null);
+        sendEventToTest(accessibilityManager, context, TestProtocol.PAUSE_DETECTED_MESSAGE, null);
     }
 
     private static void sendEventToTest(
-            AccessibilityManager accessibilityManager, String eventTag, Bundle data) {
+            AccessibilityManager accessibilityManager,
+            Context context, String eventTag, Bundle data) {
         final AccessibilityEvent e = AccessibilityEvent.obtain(
                 AccessibilityEvent.TYPE_ANNOUNCEMENT);
         e.setClassName(eventTag);
         e.setParcelableData(data);
+        e.setPackageName(context.getApplicationContext().getPackageName());
         accessibilityManager.sendAccessibilityEvent(e);
     }
 
diff --git a/tests/tapl/com/android/launcher3/tapl/Background.java b/tests/tapl/com/android/launcher3/tapl/Background.java
index 0c4e5a9461..e538f60218 100644
--- a/tests/tapl/com/android/launcher3/tapl/Background.java
+++ b/tests/tapl/com/android/launcher3/tapl/Background.java
@@ -93,7 +93,7 @@ public class Background extends LauncherInstrumentation.VisibleContainer {
 
                 mLauncher.sendPointer(
                         downTime, downTime, MotionEvent.ACTION_DOWN, start, gestureScope);
-                mLauncher.executeAndWaitForEvent(
+                mLauncher.executeAndWaitForLauncherEvent(
                         () -> mLauncher.movePointer(
                                 downTime,
                                 downTime,
diff --git a/tests/tapl/com/android/launcher3/tapl/Launchable.java b/tests/tapl/com/android/launcher3/tapl/Launchable.java
index 13ecfb8589..093c024732 100644
--- a/tests/tapl/com/android/launcher3/tapl/Launchable.java
+++ b/tests/tapl/com/android/launcher3/tapl/Launchable.java
@@ -56,15 +56,18 @@ abstract class Launchable {
     private Background launch(BySelector selector) {
         LauncherInstrumentation.log("Launchable.launch before click " +
                 mObject.getVisibleCenter() + " in " + mLauncher.getVisibleBounds(mObject));
+        final String label = mObject.getText();
 
         mLauncher.executeAndWaitForEvent(
-                () -> mLauncher.clickLauncherObject(mObject),
+                () -> {
+                    mLauncher.clickLauncherObject(mObject);
+                    expectActivityStartEvents();
+                },
                 event -> event.getEventType() == TYPE_WINDOW_STATE_CHANGED,
-                () -> "Launching an app didn't open a new window: " + mObject.getText());
-        expectActivityStartEvents();
+                () -> "Launching an app didn't open a new window: " + label);
 
         mLauncher.assertTrue(
-                "App didn't start: " + selector,
+                "App didn't start: " + label,
                 mLauncher.getDevice().wait(Until.hasObject(selector),
                         LauncherInstrumentation.WAIT_TIME_MS));
         return new Background(mLauncher);
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index c74dea9bb5..5c47faa89d 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -103,6 +103,7 @@ public final class LauncherInstrumentation {
 
     static final Pattern EVENT_TOUCH_DOWN_TIS = getTouchEventPatternTIS("ACTION_DOWN");
     static final Pattern EVENT_TOUCH_UP_TIS = getTouchEventPatternTIS("ACTION_UP");
+    private final String mLauncherPackage;
 
     // Types for launcher containers that the user is interacting with. "Background" is a
     // pseudo-container corresponding to inactive launcher covered by another app.
@@ -216,11 +217,11 @@ public final class LauncherInstrumentation {
         // Launcher package. As during inproc tests the tested launcher may not be selected as the
         // current launcher, choosing target package for inproc. For out-of-proc, use the installed
         // launcher package.
-        final String authorityPackage = testPackage.equals(targetPackage) ?
-                getLauncherPackageName() :
-                targetPackage;
+        mLauncherPackage = testPackage.equals(targetPackage)
+                ? getLauncherPackageName()
+                : targetPackage;
 
-        String testProviderAuthority = authorityPackage + ".TestInfo";
+        String testProviderAuthority = mLauncherPackage + ".TestInfo";
         mTestProviderUri = new Uri.Builder()
                 .scheme(ContentResolver.SCHEME_CONTENT)
                 .authority(testProviderAuthority)
@@ -628,6 +629,14 @@ public final class LauncherInstrumentation {
         fail("Launcher didn't initialize");
     }
 
+    Parcelable executeAndWaitForLauncherEvent(Runnable command,
+            UiAutomation.AccessibilityEventFilter eventFilter, Supplier<String> message) {
+        return executeAndWaitForEvent(
+                command,
+                e -> mLauncherPackage.equals(e.getPackageName()) && eventFilter.accept(e),
+                message);
+    }
+
     Parcelable executeAndWaitForEvent(Runnable command,
             UiAutomation.AccessibilityEventFilter eventFilter, Supplier<String> message) {
         try {
@@ -972,7 +981,7 @@ public final class LauncherInstrumentation {
 
     void runToState(Runnable command, int expectedState) {
         final List<Integer> actualEvents = new ArrayList<>();
-        executeAndWaitForEvent(
+        executeAndWaitForLauncherEvent(
                 command,
                 event -> isSwitchToStateEvent(event, expectedState, actualEvents),
                 () -> "Failed to receive an event for the state change: expected ["
@@ -1087,7 +1096,7 @@ public final class LauncherInstrumentation {
                 return;
         }
 
-        executeAndWaitForEvent(
+        executeAndWaitForLauncherEvent(
                 () -> linearGesture(
                         startX, startY, endX, endY, steps, slowDown, GestureScope.INSIDE),
                 event -> TestProtocol.SCROLL_FINISHED_MESSAGE.equals(event.getClassName()),
-- 
GitLab


From 90573f0515014a853150b1ad8caa5300b47459d9 Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Thu, 23 Jul 2020 16:13:54 -0700
Subject: [PATCH 0042/1664] Logs system navigation details part of launcher
 snapshot logging.

Bug: 157997545
Change-Id: I18e908dc62bb790c3a77e1aacd0236a7d84e8ce5
---
 .../quickstep/SysUINavigationMode.java        | 16 +++--
 .../logging/StatsLogCompatManager.java        | 19 +++---
 .../launcher3/logging/StatsLogManager.java    | 59 ++++++++++++++++---
 3 files changed, 73 insertions(+), 21 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/SysUINavigationMode.java b/quickstep/src/com/android/quickstep/SysUINavigationMode.java
index 6994d669e0..6b502186e9 100644
--- a/quickstep/src/com/android/quickstep/SysUINavigationMode.java
+++ b/quickstep/src/com/android/quickstep/SysUINavigationMode.java
@@ -17,6 +17,9 @@
 package com.android.quickstep;
 
 import static com.android.launcher3.ResourceUtils.INVALID_RESOURCE_HANDLE;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_NAVIGATION_MODE_2_BUTTON;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_NAVIGATION_MODE_3_BUTTON;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_NAVIGATION_MODE_GESTURE_BUTTON;
 import static com.android.launcher3.util.PackageManagerHelper.getPackageFilter;
 
 import android.content.BroadcastReceiver;
@@ -25,6 +28,7 @@ import android.content.Intent;
 import android.util.Log;
 
 import com.android.launcher3.ResourceUtils;
+import com.android.launcher3.logging.StatsLogManager.LauncherEvent;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.util.MainThreadInitializedObject;
 
@@ -38,16 +42,18 @@ import java.util.List;
 public class SysUINavigationMode {
 
     public enum Mode {
-        THREE_BUTTONS(false, 0),
-        TWO_BUTTONS(true, 1),
-        NO_BUTTON(true, 2);
+        THREE_BUTTONS(false, 0, LAUNCHER_NAVIGATION_MODE_3_BUTTON),
+        TWO_BUTTONS(true, 1, LAUNCHER_NAVIGATION_MODE_2_BUTTON),
+        NO_BUTTON(true, 2, LAUNCHER_NAVIGATION_MODE_GESTURE_BUTTON);
 
         public final boolean hasGestures;
         public final int resValue;
+        public final LauncherEvent launcherEvent;
 
-        Mode(boolean hasGestures, int resValue) {
+        Mode(boolean hasGestures, int resValue, LauncherEvent launcherEvent) {
             this.hasGestures = hasGestures;
             this.resValue = resValue;
+            this.launcherEvent = launcherEvent;
         }
     }
 
@@ -183,12 +189,10 @@ public class SysUINavigationMode {
     }
 
     public interface NavigationModeChangeListener {
-
         void onNavigationModeChanged(Mode newMode);
     }
 
     public interface OneHandedModeChangeListener {
-
         void onOneHandedModeChanged(int newGesturalHeight);
     }
 }
\ No newline at end of file
diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
index b978c09f09..059d158ae6 100644
--- a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
+++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
@@ -59,6 +59,7 @@ import com.android.launcher3.util.LogConfig;
 import com.android.systemui.shared.system.SysUiStatsLog;
 
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 import java.util.OptionalInt;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -100,21 +101,22 @@ public class StatsLogCompatManager extends StatsLogManager {
     }
 
     /**
-     * Logs the workspace layout information on the model thread.
+     * Logs impression of the current workspace with additional launcher events.
      */
     @Override
-    public void logSnapshot() {
+    public void logSnapshot(List<EventEnum> extraEvents) {
         LauncherAppState.getInstance(mContext).getModel().enqueueModelUpdateTask(
-                new SnapshotWorker());
+                new SnapshotWorker(extraEvents));
     }
 
     private class SnapshotWorker extends BaseModelUpdateTask {
-
         private final InstanceId mInstanceId;
+        private final List<EventEnum> mExtraEvents;
 
-        SnapshotWorker() {
-            mInstanceId = new InstanceIdSequence(
-                    1 << 20 /*InstanceId.INSTANCE_ID_MAX*/).newInstanceId();
+        SnapshotWorker(List<EventEnum> extraEvents) {
+            mInstanceId = new InstanceIdSequence(1 << 20 /*InstanceId.INSTANCE_ID_MAX*/)
+                    .newInstanceId();
+            this.mExtraEvents = extraEvents;
         }
 
         @Override
@@ -155,6 +157,9 @@ public class StatsLogCompatManager extends StatsLogManager {
                 LauncherAtom.ItemInfo atomInfo = info.buildProto(null);
                 writeSnapshot(atomInfo, mInstanceId);
             }
+            mExtraEvents
+                    .forEach(eventName -> logger().withInstanceId(mInstanceId).log(eventName));
+
             getDevicePrefs(mContext).edit()
                     .putLong(LAST_SNAPSHOT_TIME_MILLIS, currentTimeMillis()).apply();
         }
diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index acf44824dc..de72534ccc 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -30,11 +30,16 @@ import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.userevent.LauncherLogProto;
 import com.android.launcher3.util.ResourceBasedOverride;
 
+import java.util.List;
+
 /**
  * Handles the user event logging in R+.
+ *
+ * <pre>
  * All of the event ids are defined here.
  * Most of the methods are dummy methods for Launcher3
  * Actual call happens only for Launcher variant that implements QuickStep.
+ * </pre>
  */
 public class StatsLogManager implements ResourceBasedOverride {
 
@@ -46,8 +51,8 @@ public class StatsLogManager implements ResourceBasedOverride {
     public static final int LAUNCHER_STATE_UNCHANGED = 5;
 
     /**
-     * Returns proper launcher state enum for {@link StatsLogManager}
-     * (to be removed during UserEventDispatcher cleanup)
+     * Returns proper launcher state enum for {@link StatsLogManager}(to be removed during
+     * UserEventDispatcher cleanup)
      */
     public static int containerTypeToAtomState(int containerType) {
         switch (containerType) {
@@ -64,9 +69,8 @@ public class StatsLogManager implements ResourceBasedOverride {
     }
 
     /**
-     * Returns event enum based on the two {@link ContainerType} transition information when
-     * swipe gesture happens.
-     * (to be removed during UserEventDispatcher cleanup)
+     * Returns event enum based on the two {@link ContainerType} transition information when swipe
+     * gesture happens(to be removed during UserEventDispatcher cleanup).
      */
     public static EventEnum getLauncherAtomEvent(int startContainerType,
             int targetContainerType, EventEnum fallbackEvent) {
@@ -270,7 +274,46 @@ public class StatsLogManager implements ResourceBasedOverride {
         LAUNCHER_SELECT_MODE_CLOSE(583),
 
         @UiEvent(doc = "User tapped on the highlight items in select mode")
-        LAUNCHER_SELECT_MODE_ITEM(584);
+        LAUNCHER_SELECT_MODE_ITEM(584),
+
+        @UiEvent(doc = "Notification dot on app icon enabled.")
+        LAUNCHER_NOTIFICATION_DOT_ENABLED(611),
+
+        @UiEvent(doc = "Notification dot on app icon disabled.")
+        LAUNCHER_NOTIFICATION_DOT_DISABLED(612),
+
+        @UiEvent(doc = "For new apps, add app icons to home screen enabled.")
+        LAUNCHER_ADD_NEW_APPS_TO_HOME_SCREEN_ENABLED(613),
+
+        @UiEvent(doc = "For new apps, add app icons to home screen disabled.")
+        LAUNCHER_ADD_NEW_APPS_TO_HOME_SCREEN_DISABLED(614),
+
+        @UiEvent(doc = "Home screen rotation is enabled when phone is rotated.")
+        LAUNCHER_HOME_SCREEN_ROTATION_ENABLED(615),
+
+        @UiEvent(doc = "Home screen rotation is disabled when phone is rotated.")
+        LAUNCHER_HOME_SCREEN_ROTATION_DISABLED(616),
+
+        @UiEvent(doc = "Suggestions in all apps list enabled.")
+        LAUNCHER_ALL_APPS_SUGGESTIONS_ENABLED(619),
+
+        @UiEvent(doc = "Suggestions in all apps list disabled.")
+        LAUNCHER_ALL_APPS_SUGGESTIONS_DISABLED(620),
+
+        @UiEvent(doc = "Suggestions on home screen is enabled.")
+        LAUNCHER_HOME_SCREEN_SUGGESTIONS_ENABLED(621),
+
+        @UiEvent(doc = "Suggestions on home screen is disabled.")
+        LAUNCHER_HOME_SCREEN_SUGGESTIONS_DISABLED(622),
+
+        @UiEvent(doc = "System navigation is 3 button mode.")
+        LAUNCHER_NAVIGATION_MODE_3_BUTTON(623),
+
+        @UiEvent(doc = "System navigation mode is 2 button mode.")
+        LAUNCHER_NAVIGATION_MODE_2_BUTTON(624),
+
+        @UiEvent(doc = "System navigation mode is 0 button mode/gesture navigation mode .")
+        LAUNCHER_NAVIGATION_MODE_GESTURE_BUTTON(625);
 
         // ADD MORE
 
@@ -401,8 +444,8 @@ public class StatsLogManager implements ResourceBasedOverride {
     }
 
     /**
-     * Logs snapshot, or impression of the current workspace.
+     * Logs impression of the current workspace with additional launcher events.
      */
-    public void logSnapshot() {
+    public void logSnapshot(List<EventEnum> additionalEvents) {
     }
 }
-- 
GitLab


From 83901e1d7dcb8cb230743082c99bed8fec375b22 Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Mon, 27 Jul 2020 09:54:47 -0700
Subject: [PATCH 0043/1664] Add thiruram@ to launcher/owners list.

Change-Id: Ia26bf6be82d45a2e4da2377543a699d6f9eb9d90
---
 OWNERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OWNERS b/OWNERS
index 3069afaedc..1d6ad8cf8d 100644
--- a/OWNERS
+++ b/OWNERS
@@ -28,6 +28,7 @@ tracyzhou@google.com
 peanutbutter@google.com
 xuqiu@google.com
 sreyasr@google.com
+thiruram@google.com
 
 per-file FeatureFlags.java, globs = set noparent
 per-file FeatureFlags.java = sunnygoyal@google.com, winsonc@google.com, zakcohen@google.com, mrcasey@google.com, adamcohen@google.com, hyunyoungs@google.com
-- 
GitLab


From 5db25d5787c34bcd96855f5bc5b32313cbfe2fcd Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Sat, 25 Jul 2020 11:13:12 -0700
Subject: [PATCH 0044/1664] Align live tile with the current task view in
 Overview when the users swipes up to dismiss

Test: manual
Bug: 160911104
Change-Id: I64b6e737cb11a9bea25b59762431d1023d2153ac
---
 .../touchcontrollers/TaskViewTouchController.java | 15 ---------------
 .../com/android/quickstep/views/RecentsView.java  |  7 +++++++
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
index 37a595ec07..fce019b3e4 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
@@ -16,7 +16,6 @@
 package com.android.launcher3.uioverrides.touchcontrollers;
 
 import static com.android.launcher3.AbstractFloatingView.TYPE_ACCESSIBLE;
-import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.touch.SingleAxisSwipeDetector.DIRECTION_BOTH;
 import static com.android.launcher3.touch.SingleAxisSwipeDetector.DIRECTION_NEGATIVE;
 import static com.android.launcher3.touch.SingleAxisSwipeDetector.DIRECTION_POSITIVE;
@@ -262,13 +261,6 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
         mCurrentAnimation.setPlayFraction(Utilities.boundToRange(
                 totalDisplacement * mProgressMultiplier, 0, 1));
 
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
-            if (mRecentsView.getCurrentPage() == 0) {
-                mRecentsView.getLiveTileTaskViewSimulator().setOffsetY(
-                        isGoingUp ? totalDisplacement : 0);
-                mRecentsView.redrawLiveTile();
-            }
-        }
         return true;
     }
 
@@ -299,13 +291,6 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
         }
 
         mCurrentAnimation.setEndAction(() -> onCurrentAnimationEnd(goingToEnd, logAction));
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
-            mCurrentAnimation.getAnimationPlayer().addUpdateListener(valueAnimator -> {
-                if (mRecentsView.getCurrentPage() != 0 || mCurrentAnimationIsGoingUp) {
-                    mRecentsView.redrawLiveTile();
-                }
-            });
-        }
         mCurrentAnimation.startWithVelocity(mActivity, goingToEnd,
                 velocity, mEndDisplacement, animationDuration);
     }
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
index 49a9db978b..eaa9521246 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
@@ -1475,6 +1475,13 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             anim.addOnFrameCallback(this::updateCurveProperties);
         }
 
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && getRunningTaskView() == taskView) {
+            anim.addOnFrameCallback(() -> {
+                mLiveTileTaskViewSimulator.setOffsetY(taskView.getTranslationY());
+                redrawLiveTile();
+            });
+        }
+
         // Add a tiny bit of translation Z, so that it draws on top of other views
         if (animateTaskView) {
             taskView.setTranslationZ(0.1f);
-- 
GitLab


From ca394a3eaba445a367a098e1bbca984c208c8090 Mon Sep 17 00:00:00 2001
From: andychou <andychou@google.com>
Date: Fri, 24 Jul 2020 13:26:14 +0800
Subject: [PATCH 0045/1664] Add ActivityOptions for SecondDisplayLaucher to
 launch activity

Currently, SecondDisplayLauncher doesn't specify ActivityOption to
launch on second display, so application will launch on main display
even the user tries to launch APP from SecondDisplayLauncher.
So need to specify ActivityOption then activity can launch on the correct
display

Bug: 162042798
Test: manual testing
Change-Id: Iceb4e01b725834983a5d01cf54350f61851ad172
(cherry picked from commit 3a8075366c3177f8e308f8d0473d17a2c886cc94)
---
 .../launcher3/secondarydisplay/SecondaryDisplayLauncher.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
index c996748a28..31c3014874 100644
--- a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
+++ b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
@@ -20,6 +20,7 @@ import android.animation.AnimatorListenerAdapter;
 import android.app.ActivityOptions;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.Display;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewAnimationUtils;
@@ -168,7 +169,9 @@ public class SecondaryDisplayLauncher extends BaseDraggingActivity
 
     @Override
     public ActivityOptions getActivityLaunchOptions(View v) {
-        return null;
+        final Display display = getWindow().getDecorView().getDisplay();
+        return display != null ? ActivityOptions.makeBasic().setLaunchDisplayId(
+                       display.getDisplayId()) : null;
     }
 
     @Override
-- 
GitLab


From fe00c0907629cbbc3d1e0d59abf91a790bc7601b Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Sun, 26 Jul 2020 15:11:10 -0700
Subject: [PATCH 0046/1664] Unifying handler (#1) BaseSwipeUpHandlerV2 =>
 AbsSwipeUpHandler

Change-Id: I34647ced0e96e63cdbba35f6eb3bdc3f86810ebe
---
 .../{BaseSwipeUpHandlerV2.java => AbsSwipeUpHandler.java} | 8 ++++----
 .../src/com/android/quickstep/FallbackSwipeHandler.java   | 2 +-
 .../src/com/android/quickstep/LauncherSwipeHandlerV2.java | 2 +-
 .../inputconsumers/DeviceLockedInputConsumer.java         | 2 +-
 .../src/com/android/quickstep/BaseActivityInterface.java  | 2 +-
 .../interaction/SwipeUpGestureTutorialController.java     | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename quickstep/recents_ui_overrides/src/com/android/quickstep/{BaseSwipeUpHandlerV2.java => AbsSwipeUpHandler.java} (99%)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
similarity index 99%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java
rename to quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
index 411d74f7f1..5afbed3619 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -99,10 +99,10 @@ import com.android.systemui.shared.system.TaskStackChangeListener;
  * Handles the navigation gestures when Launcher is the default home activity.
  * TODO: Merge this with BaseSwipeUpHandler
  */
-@TargetApi(Build.VERSION_CODES.O)
-public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q extends RecentsView>
+@TargetApi(Build.VERSION_CODES.R)
+public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends RecentsView>
         extends BaseSwipeUpHandler<T, Q> implements OnApplyWindowInsetsListener {
-    private static final String TAG = BaseSwipeUpHandlerV2.class.getSimpleName();
+    private static final String TAG = "AbsSwipeUpHandler";
 
     private static final String[] STATE_NAMES = DEBUG_STATES ? new String[16] : null;
 
@@ -201,7 +201,7 @@ public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q exte
 
     private final Runnable mOnDeferredActivityLaunch = this::onDeferredActivityLaunch;
 
-    public BaseSwipeUpHandlerV2(Context context, RecentsAnimationDeviceState deviceState,
+    public AbsSwipeUpHandler(Context context, RecentsAnimationDeviceState deviceState,
             TaskAnimationManager taskAnimationManager, GestureState gestureState,
             long touchTimeMs, boolean continuingLastGesture,
             InputConsumerController inputConsumer) {
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackSwipeHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackSwipeHandler.java
index f60a50bb43..ffb05dfed7 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackSwipeHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackSwipeHandler.java
@@ -71,7 +71,7 @@ import java.util.function.Consumer;
  */
 @TargetApi(Build.VERSION_CODES.R)
 public class FallbackSwipeHandler extends
-        BaseSwipeUpHandlerV2<RecentsActivity, FallbackRecentsView> {
+        AbsSwipeUpHandler<RecentsActivity, FallbackRecentsView> {
 
     /**
      * Message used for receiving gesture nav contract information. We use a static messenger to
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandlerV2.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandlerV2.java
index 052d0a68a6..44114558e5 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandlerV2.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandlerV2.java
@@ -39,7 +39,7 @@ import com.android.systemui.shared.system.InputConsumerController;
  * Temporary class to allow easier refactoring
  */
 public class LauncherSwipeHandlerV2 extends
-        BaseSwipeUpHandlerV2<BaseQuickstepLauncher, RecentsView> {
+        AbsSwipeUpHandler<BaseQuickstepLauncher, RecentsView> {
 
     public LauncherSwipeHandlerV2(Context context, RecentsAnimationDeviceState deviceState,
             TaskAnimationManager taskAnimationManager, GestureState gestureState, long touchTimeMs,
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
index a676390ce3..db1948b9f3 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
@@ -21,7 +21,7 @@ import static android.view.MotionEvent.ACTION_UP;
 
 import static com.android.launcher3.Utilities.squaredHypot;
 import static com.android.launcher3.Utilities.squaredTouchSlop;
-import static com.android.quickstep.BaseSwipeUpHandlerV2.MIN_PROGRESS_FOR_OVERVIEW;
+import static com.android.quickstep.AbsSwipeUpHandler.MIN_PROGRESS_FOR_OVERVIEW;
 import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;
 import static com.android.quickstep.util.ActiveGestureLog.INTENT_EXTRA_LOG_TRACE_ID;
 
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index f4a394a4f6..0ae386f39a 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -20,7 +20,7 @@ import static com.android.launcher3.anim.Interpolators.ACCEL_2;
 import static com.android.launcher3.anim.Interpolators.INSTANT;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_ACTIONS;
-import static com.android.quickstep.BaseSwipeUpHandlerV2.RECENTS_ATTACH_DURATION;
+import static com.android.quickstep.AbsSwipeUpHandler.RECENTS_ATTACH_DURATION;
 import static com.android.quickstep.SysUINavigationMode.getMode;
 import static com.android.quickstep.SysUINavigationMode.hideShelfInTwoButtonLandscape;
 import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
diff --git a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
index 4110b33d24..044e010b3c 100644
--- a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
@@ -18,7 +18,7 @@ package com.android.quickstep.interaction;
 import static com.android.launcher3.anim.Interpolators.ACCEL;
 import static com.android.launcher3.util.DefaultDisplay.getSingleFrameMs;
 import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION;
-import static com.android.quickstep.BaseSwipeUpHandlerV2.MAX_SWIPE_DURATION;
+import static com.android.quickstep.AbsSwipeUpHandler.MAX_SWIPE_DURATION;
 import static com.android.quickstep.interaction.TutorialController.TutorialType.HOME_NAVIGATION_COMPLETE;
 import static com.android.quickstep.interaction.TutorialController.TutorialType.OVERVIEW_NAVIGATION_COMPLETE;
 
-- 
GitLab


From 7695ea58cfd3539cf7ba3ae8427f9754f99ae6f7 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Mon, 27 Jul 2020 15:16:03 -0700
Subject: [PATCH 0047/1664] Unifying handler (#2) BaseSwipeUpHandler =>
 AbsSwipeUpHandler

Change-Id: I9a1eb45ccb5b03dd348f42592965e7fd5e0e6420
---
 ...{BaseSwipeUpHandler.java => AbsSwipeUpHandler.java} |  8 ++++----
 .../com/android/quickstep/BaseSwipeUpHandlerV2.java    |  2 +-
 .../com/android/quickstep/TouchInteractionService.java | 10 +++++-----
 .../inputconsumers/OtherActivityInputConsumer.java     |  8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)
 rename quickstep/recents_ui_overrides/src/com/android/quickstep/{BaseSwipeUpHandler.java => AbsSwipeUpHandler.java} (98%)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
similarity index 98%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java
rename to quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
index cbef67b84b..feaa8b9afb 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -60,10 +60,10 @@ import java.util.function.Consumer;
  * Base class for swipe up handler with some utility methods
  */
 @TargetApi(Build.VERSION_CODES.Q)
-public abstract class BaseSwipeUpHandler<T extends StatefulActivity<?>, Q extends RecentsView>
+public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends RecentsView>
         extends SwipeUpAnimationLogic implements RecentsAnimationListener {
 
-    private static final String TAG = "BaseSwipeUpHandler";
+    private static final String TAG = "AbsSwipeUpHandler";
 
     protected final BaseActivityInterface<?, T> mActivityInterface;
     protected final InputConsumerProxy mInputConsumerProxy;
@@ -87,7 +87,7 @@ public abstract class BaseSwipeUpHandler<T extends StatefulActivity<?>, Q extend
 
     private boolean mRecentsViewScrollLinked = false;
 
-    protected BaseSwipeUpHandler(Context context, RecentsAnimationDeviceState deviceState,
+    protected AbsSwipeUpHandler(Context context, RecentsAnimationDeviceState deviceState,
             GestureState gestureState, InputConsumerController inputConsumer) {
         super(context, deviceState, gestureState, new TransformParams());
         mActivityInterface = gestureState.getActivityInterface();
@@ -389,7 +389,7 @@ public abstract class BaseSwipeUpHandler<T extends StatefulActivity<?>, Q extend
 
     public interface Factory {
 
-        BaseSwipeUpHandler newHandler(
+        AbsSwipeUpHandler newHandler(
                 GestureState gestureState, long touchTimeMs, boolean continuingLastGesture);
     }
 }
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java
index 411d74f7f1..434fed29a1 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java
@@ -101,7 +101,7 @@ import com.android.systemui.shared.system.TaskStackChangeListener;
  */
 @TargetApi(Build.VERSION_CODES.O)
 public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q extends RecentsView>
-        extends BaseSwipeUpHandler<T, Q> implements OnApplyWindowInsetsListener {
+        extends AbsSwipeUpHandler<T, Q> implements OnApplyWindowInsetsListener {
     private static final String TAG = BaseSwipeUpHandlerV2.class.getSimpleName();
 
     private static final String[] STATE_NAMES = DEBUG_STATES ? new String[16] : null;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
index e5852be46f..1012ab2246 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
@@ -269,9 +269,9 @@ public class TouchInteractionService extends Service implements PluginListener<O
         return sIsInitialized;
     }
 
-    private final BaseSwipeUpHandler.Factory mLauncherSwipeHandlerFactory =
+    private final AbsSwipeUpHandler.Factory mLauncherSwipeHandlerFactory =
             this::createLauncherSwipeHandler;
-    private final BaseSwipeUpHandler.Factory mFallbackSwipeHandlerFactory =
+    private final AbsSwipeUpHandler.Factory mFallbackSwipeHandlerFactory =
             this::createFallbackSwipeHandler;
 
     private ActivityManagerWrapper mAM;
@@ -716,7 +716,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
     private InputConsumer createOtherActivityInputConsumer(GestureState gestureState,
             MotionEvent event) {
 
-        final BaseSwipeUpHandler.Factory factory;
+        final AbsSwipeUpHandler.Factory factory;
         if (!mOverviewComponentObserver.isHomeAndOverviewSame()) {
             factory = mFallbackSwipeHandlerFactory;
         } else {
@@ -889,13 +889,13 @@ public class TouchInteractionService extends Service implements PluginListener<O
         }
     }
 
-    private BaseSwipeUpHandler createLauncherSwipeHandler(
+    private AbsSwipeUpHandler createLauncherSwipeHandler(
             GestureState gestureState, long touchTimeMs, boolean continuingLastGesture) {
         return new LauncherSwipeHandlerV2(this, mDeviceState, mTaskAnimationManager,
                 gestureState, touchTimeMs, continuingLastGesture, mInputConsumer);
     }
 
-    private BaseSwipeUpHandler createFallbackSwipeHandler(
+    private AbsSwipeUpHandler createFallbackSwipeHandler(
             GestureState gestureState, long touchTimeMs, boolean continuingLastGesture) {
         return new FallbackSwipeHandler(this, mDeviceState, mTaskAnimationManager,
                 gestureState, touchTimeMs, continuingLastGesture, mInputConsumer);
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
index 6259f1f9fe..f02e5e6d61 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
@@ -53,8 +53,8 @@ import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.Preconditions;
 import com.android.launcher3.util.TraceHelper;
 import com.android.quickstep.BaseActivityInterface;
-import com.android.quickstep.BaseSwipeUpHandler;
-import com.android.quickstep.BaseSwipeUpHandler.Factory;
+import com.android.quickstep.AbsSwipeUpHandler;
+import com.android.quickstep.AbsSwipeUpHandler.Factory;
 import com.android.quickstep.GestureState;
 import com.android.quickstep.InputConsumer;
 import com.android.quickstep.RecentsAnimationCallbacks;
@@ -93,7 +93,7 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
     private final InputMonitorCompat mInputMonitorCompat;
     private final BaseActivityInterface mActivityInterface;
 
-    private final BaseSwipeUpHandler.Factory mHandlerFactory;
+    private final AbsSwipeUpHandler.Factory mHandlerFactory;
 
     private final Consumer<OtherActivityInputConsumer> mOnCompleteCallback;
     private final MotionPauseDetector mMotionPauseDetector;
@@ -101,7 +101,7 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
 
     private VelocityTracker mVelocityTracker;
 
-    private BaseSwipeUpHandler mInteractionHandler;
+    private AbsSwipeUpHandler mInteractionHandler;
 
     private final boolean mIsDeferredDownTarget;
     private final PointF mDownPos = new PointF();
-- 
GitLab


From 26bca0808996061f8d8f124abf9d5ae46f54415d Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Mon, 27 Jul 2020 22:52:29 -0700
Subject: [PATCH 0048/1664] Handle requestFocus for ENABLE_DEVICE_SEARCH Bug:
 161594550

Change-Id: Ic99c04f1235e48e90b64df86e3739f8e14bc648f
---
 .../allapps/AllAppsInsetTransitionController.java     | 11 +++++++++++
 .../allapps/AllAppsTransitionController.java          | 11 ++++++++++-
 .../android/launcher3/allapps/SearchUiManager.java    |  8 ++------
 .../allapps/search/AppsSearchContainerLayout.java     |  2 +-
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java b/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
index 5af9113ae8..d7af5f1a7a 100644
--- a/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
@@ -58,6 +58,17 @@ public class AllAppsInsetTransitionController {
         mApps = appsView;
     }
 
+    public void hide() {
+        if (!BuildCompat.isAtLeastR()) return;
+
+        WindowInsets insets = mApps.getRootWindowInsets();
+        if (insets == null) return;
+
+        if (insets.isVisible(WindowInsets.Type.ime())) {
+            mApps.getWindowInsetsController().hide(WindowInsets.Type.ime());
+        }
+    }
+
     /**
      * Initializes member variables and requests for the {@link WindowInsetsAnimationController}
      * object.
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 5b00631659..2b816a08a8 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -37,6 +37,7 @@ import android.animation.ObjectAnimator;
 import android.util.FloatProperty;
 import android.view.View;
 import android.view.animation.Interpolator;
+import android.widget.EditText;
 
 import androidx.core.os.BuildCompat;
 
@@ -267,8 +268,16 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
         }
         if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && BuildCompat.isAtLeastR()) {
             mInsetController.onAnimationEnd(mProgress);
+            if (Float.compare(mProgress, 0f) == 0) {
+                EditText editText = mAppsView.getSearchUiManager().getEditText();
+                if (editText != null) {
+                    editText.requestFocus();
+                }
+            }
             if (Float.compare(mProgress, 1f) == 0) {
-                mAppsView.getSearchUiManager().setTextSearchEnabled(true).requestFocus();
+                // Called when home gesture closes all apps container.
+                // TODO: should make the controller hide synchronously
+                mInsetController.hide();
             }
         }
     }
diff --git a/src/com/android/launcher3/allapps/SearchUiManager.java b/src/com/android/launcher3/allapps/SearchUiManager.java
index 7d5363f269..aa056a01f4 100644
--- a/src/com/android/launcher3/allapps/SearchUiManager.java
+++ b/src/com/android/launcher3/allapps/SearchUiManager.java
@@ -66,12 +66,8 @@ public interface SearchUiManager {
     }
 
     /**
-     * Called to control how the search UI result should be handled.
-     *
-     * @param isEnabled when {@code true}, the search is all handled inside AOSP
-     *                  and is not overlayable.
-     * @return the searchbox edit text object
+     * @return the edit text object
      */
     @Nullable
-    EditText setTextSearchEnabled(boolean isEnabled);
+    EditText getEditText();
 }
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
index 356c52ca39..2e89c89c62 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
@@ -216,7 +216,7 @@ public class AppsSearchContainerLayout extends ExtendedEditText
     }
 
     @Override
-    public EditText setTextSearchEnabled(boolean isEnabled) {
+    public EditText getEditText() {
         return this;
     }
 }
-- 
GitLab


From 884516069c4ca1d135c8f91c187b1c6d275c21e7 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Mon, 27 Jul 2020 22:26:53 -0700
Subject: [PATCH 0049/1664] Match live tile with the cut out when swiping down
 in Overview

Bug: 160911104
Test: manual
Change-Id: Ic2e65b773239e409a1d55781b7393c3b82b10c94
---
 .../android/quickstep/util/TaskViewSimulator.java   | 10 +++++++++-
 .../quickstep/views/LauncherRecentsView.java        | 13 -------------
 .../com/android/quickstep/views/RecentsView.java    |  9 ++++-----
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java
index 105b62a911..2de4036f9e 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -184,13 +184,21 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
     }
 
     /**
-     * Adds animation for all the components corresponding to transition from an app to overview
+     * Adds animation for all the components corresponding to transition from an app to overview.
      */
     public void addAppToOverviewAnim(PendingAnimation pa, TimeInterpolator interpolator) {
         pa.addFloat(fullScreenProgress, AnimatedFloat.VALUE, 1, 0, interpolator);
         pa.addFloat(recentsViewScale, AnimatedFloat.VALUE, getFullScreenScale(), 1, interpolator);
     }
 
+    /**
+     * Adds animation for all the components corresponding to transition from overview to the app.
+     */
+    public void addOverviewToAppAnim(PendingAnimation pa, TimeInterpolator interpolator) {
+        pa.addFloat(fullScreenProgress, AnimatedFloat.VALUE, 0, 1, interpolator);
+        pa.addFloat(recentsViewScale, AnimatedFloat.VALUE, 1, getFullScreenScale(), interpolator);
+    }
+
     /**
      * Returns the current clipped/visible window bounds in the window coordinate space
      */
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java
index 0fcd74bf2c..0a4cec7759 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java
@@ -135,19 +135,6 @@ public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher>
         return anim;
     }
 
-    @Override
-    protected void onTaskLaunchAnimationUpdate(float progress, TaskView tv) {
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
-            if (tv.isRunningTask()) {
-                mLiveTileParams.setProgress(1 - progress)
-                        .setSyncTransactionApplier(mSyncTransactionApplier);
-                // TODO: Revisit live tiles
-            } else {
-                redrawLiveTile();
-            }
-        }
-    }
-
     @Override
     protected void onTaskLaunchAnimationEnd(boolean success) {
         if (success) {
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
index 49a9db978b..b478161f8e 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
@@ -1978,8 +1978,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                             ? targetSysUiFlags
                             : 0);
 
-            onTaskLaunchAnimationUpdate(animator.getAnimatedFraction(), tv);
-
             // Passing the threshold from taskview to fullscreen app will vibrate
             final boolean passed = animator.getAnimatedFraction() >=
                     SUCCESS_TRANSITION_PROGRESS;
@@ -2003,6 +2001,10 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
 
         mPendingAnimation = new PendingAnimation(duration);
         mPendingAnimation.add(anim);
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+            mLiveTileTaskViewSimulator.addOverviewToAppAnim(mPendingAnimation, interpolator);
+            mPendingAnimation.addOnFrameCallback(this::redrawLiveTile);
+        }
         mPendingAnimation.addEndListener((endState) -> {
             if (endState.isSuccess) {
                 Consumer<Boolean> onLaunchResult = (result) -> {
@@ -2028,9 +2030,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         return mPendingAnimation;
     }
 
-    protected void onTaskLaunchAnimationUpdate(float progress, TaskView tv) {
-    }
-
     protected void onTaskLaunchAnimationEnd(boolean success) {
         if (success) {
             resetTaskVisuals();
-- 
GitLab


From 52e2545a667b91412384817b9811233d03d1ab6e Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Mon, 20 Jul 2020 12:38:01 -0700
Subject: [PATCH 0050/1664] Removing arrow indicator from homescreen and adding
 a separate view for various accessibility actions

Bug: 159247871
Change-Id: I14536844929e03d36a6a5f294d4f5daad8c82d15
---
 .../uioverrides/QuickstepLauncher.java        |   6 +-
 .../quickstep/views/LauncherRecentsView.java  |   8 -
 .../util/QuickstepOnboardingPrefs.java        |  14 -
 .../quickstep/views/ShelfScrimView.java       |  36 +-
 .../drag_handle_indicator_shadow.xml          |  19 -
 .../drag_handle_indicator_no_shadow.xml       |  29 --
 res/layout/launcher.xml                       |   6 +
 res/values/dimens.xml                         |   8 -
 res/values/drawables.xml                      |   1 -
 res/values/strings.xml                        |   6 +-
 src/com/android/launcher3/Launcher.java       |   8 +-
 src/com/android/launcher3/Workspace.java      |   2 +-
 .../allapps/AllAppsTransitionController.java  |   4 -
 .../launcher3/util/OnboardingPrefs.java       |   3 -
 .../views/AccessibilityActionsView.java       |  97 ++++
 .../launcher3/views/OptionsPopupView.java     |  40 +-
 .../android/launcher3/views/ScrimView.java    | 415 +-----------------
 17 files changed, 137 insertions(+), 565 deletions(-)
 delete mode 100644 res/drawable-v24/drag_handle_indicator_shadow.xml
 delete mode 100644 res/drawable/drag_handle_indicator_no_shadow.xml
 create mode 100644 src/com/android/launcher3/views/AccessibilityActionsView.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index f87138e536..beb2a6a156 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -215,10 +215,8 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
         switch (state.ordinal) {
             case HINT_STATE_ORDINAL: {
                 Workspace workspace = getWorkspace();
-                boolean willMoveScreens = workspace.getNextPage() != Workspace.DEFAULT_PAGE;
-                getStateManager().goToState(NORMAL, true,
-                        willMoveScreens ? null : getScrimView()::startDragHandleEducationAnim);
-                if (willMoveScreens) {
+                getStateManager().goToState(NORMAL);
+                if (workspace.getNextPage() != Workspace.DEFAULT_PAGE) {
                     workspace.post(workspace::moveToDefaultScreen);
                 }
                 break;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java
index 0a4cec7759..f31bc19c06 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java
@@ -38,11 +38,9 @@ import android.widget.FrameLayout;
 import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.Hotseat;
 import com.android.launcher3.LauncherState;
-import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.StateManager.StateListener;
 import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
-import com.android.launcher3.views.ScrimView;
 import com.android.quickstep.LauncherActivityInterface;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.systemui.plugins.PluginListener;
@@ -126,12 +124,6 @@ public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher>
         }
         anim.play(ObjectAnimator.ofFloat(
                 mActivity.getAllAppsController(), ALL_APPS_PROGRESS, allAppsProgressOffscreen));
-
-        ObjectAnimator dragHandleAnim = ObjectAnimator.ofInt(
-                mActivity.getScrimView(), ScrimView.DRAG_HANDLE_ALPHA, 0);
-        dragHandleAnim.setInterpolator(Interpolators.ACCEL_2);
-        anim.play(dragHandleAnim);
-
         return anim;
     }
 
diff --git a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
index 9ed2bbef38..c2e67c1f2f 100644
--- a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
+++ b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
@@ -87,20 +87,6 @@ public class QuickstepOnboardingPrefs extends OnboardingPrefs<BaseQuickstepLaunc
             });
         }
 
-        if (!hasReachedMaxCount(ALL_APPS_COUNT)) {
-            stateManager.addStateListener(new StateListener<LauncherState>() {
-                @Override
-                public void onStateTransitionComplete(LauncherState finalState) {
-                    if (finalState == ALL_APPS) {
-                        if (incrementEventCount(ALL_APPS_COUNT)) {
-                            stateManager.removeStateListener(this);
-                            mLauncher.getScrimView().updateDragHandleVisibility();
-                        }
-                    }
-                }
-            });
-        }
-
         if (FeatureFlags.ENABLE_HYBRID_HOTSEAT.get() && !hasReachedMaxCount(
                 HOTSEAT_DISCOVERY_TIP_COUNT)) {
             stateManager.addStateListener(new StateListener<LauncherState>() {
diff --git a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java b/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
index 19e278be3c..f1ac6a5b94 100644
--- a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
+++ b/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
@@ -44,7 +44,6 @@ import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.uioverrides.states.OverviewState;
-import com.android.launcher3.util.OnboardingPrefs;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.ScrimView;
 import com.android.quickstep.SysUINavigationMode;
@@ -77,15 +76,11 @@ public class ShelfScrimView extends ScrimView<BaseQuickstepLauncher>
     private final float mRadius;
     private final int mMaxScrimAlpha;
     private final Paint mPaint;
-    private final OnboardingPrefs mOnboardingPrefs;
 
     // Mid point where the alpha changes
     private int mMidAlpha;
     private float mMidProgress;
 
-    // The progress at which the drag handle starts moving up with the shelf.
-    private float mDragHandleProgress;
-
     private Interpolator mBeforeMidProgressColorInterpolator = ACCEL;
     private Interpolator mAfterMidProgressColorInterpolator = ACCEL;
 
@@ -103,7 +98,6 @@ public class ShelfScrimView extends ScrimView<BaseQuickstepLauncher>
     private boolean mRemainingScreenPathValid = false;
 
     private Mode mSysUINavigationMode;
-    private boolean mIsTwoZoneSwipeModel;
 
     public ShelfScrimView(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -112,7 +106,6 @@ public class ShelfScrimView extends ScrimView<BaseQuickstepLauncher>
         mEndAlpha = Color.alpha(mEndScrim);
         mRadius = BOTTOM_CORNER_RADIUS_RATIO * Themes.getDialogCornerRadius(context);
         mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-        mOnboardingPrefs = mLauncher.getOnboardingPrefs();
 
         // Just assume the easiest UI for now, until we have the proper layout information.
         mDrawingFlatColor = true;
@@ -145,11 +138,9 @@ public class ShelfScrimView extends ScrimView<BaseQuickstepLauncher>
             // Show the shelf more quickly before reaching overview progress.
             mBeforeMidProgressColorInterpolator = ACCEL_2;
             mAfterMidProgressColorInterpolator = ACCEL;
-            mIsTwoZoneSwipeModel = FeatureFlags.ENABLE_OVERVIEW_ACTIONS.get();
         } else {
             mBeforeMidProgressColorInterpolator = ACCEL;
             mAfterMidProgressColorInterpolator = Interpolators.clampToProgress(ACCEL, 0.5f, 1f);
-            mIsTwoZoneSwipeModel = false;
         }
     }
 
@@ -164,7 +155,6 @@ public class ShelfScrimView extends ScrimView<BaseQuickstepLauncher>
 
             Context context = getContext();
             if ((OVERVIEW.getVisibleElements(mLauncher) & ALL_APPS_HEADER_EXTRA) == 0) {
-                mDragHandleProgress = 1;
                 if (FeatureFlags.ENABLE_OVERVIEW_ACTIONS.get()
                         && SysUINavigationMode.removeShelfFromOverview(context)) {
                     // Fade in all apps background quickly to distinguish from swiping from nav bar.
@@ -182,29 +172,22 @@ public class ShelfScrimView extends ScrimView<BaseQuickstepLauncher>
                         + hotseatPadding.bottom + hotseatPadding.top;
                 float dragHandleTop =
                         Math.min(hotseatSize, LayoutUtils.getDefaultSwipeHeight(context, dp));
-                mDragHandleProgress =  1 - (dragHandleTop / mShiftRange);
             }
-            mTopOffset = dp.getInsets().top - mDragHandleSize.y;
+            mTopOffset = dp.getInsets().top;
             mShelfTopAtThreshold = mShiftRange * SCRIM_CATCHUP_THRESHOLD + mTopOffset;
         }
         updateColors();
         updateSysUiColors();
-        updateDragHandleAlpha();
         invalidate();
     }
 
     @Override
     public void updateColors() {
         super.updateColors();
-        mDragHandleOffset = 0;
         if (mDrawingFlatColor) {
             return;
         }
 
-        if (mProgress < mDragHandleProgress) {
-            mDragHandleOffset = mShiftRange * (mDragHandleProgress - mProgress);
-        }
-
         if (mProgress >= SCRIM_CATCHUP_THRESHOLD) {
             mShelfTop = mShiftRange * mProgress + mTopOffset;
         } else {
@@ -258,20 +241,8 @@ public class ShelfScrimView extends ScrimView<BaseQuickstepLauncher>
         }
     }
 
-    @Override
-    protected boolean shouldDragHandleBeVisible() {
-        boolean needsAllAppsEdu = mIsTwoZoneSwipeModel
-                && !mOnboardingPrefs.hasReachedMaxCount(OnboardingPrefs.ALL_APPS_COUNT);
-        return needsAllAppsEdu || super.shouldDragHandleBeVisible();
-    }
-
     @Override
     protected void onDraw(Canvas canvas) {
-        drawBackground(canvas);
-        drawDragHandle(canvas);
-    }
-
-    private void drawBackground(Canvas canvas) {
         if (mDrawingFlatColor) {
             if (mCurrentFlatColor != 0) {
                 canvas.drawColor(mCurrentFlatColor);
@@ -311,9 +282,4 @@ public class ShelfScrimView extends ScrimView<BaseQuickstepLauncher>
         mPaint.setColor(mShelfColor);
         canvas.drawRoundRect(0, mShelfTop, width, height + mRadius, mRadius, mRadius, mPaint);
     }
-
-    @Override
-    public float getVisualTop() {
-        return mShelfTop;
-    }
 }
diff --git a/res/drawable-v24/drag_handle_indicator_shadow.xml b/res/drawable-v24/drag_handle_indicator_shadow.xml
deleted file mode 100644
index 774bc38ceb..0000000000
--- a/res/drawable-v24/drag_handle_indicator_shadow.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.launcher3.graphics.ShadowDrawable
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/drag_handle_indicator_no_shadow"
-    android:elevation="@dimen/vertical_drag_handle_elevation" />
diff --git a/res/drawable/drag_handle_indicator_no_shadow.xml b/res/drawable/drag_handle_indicator_no_shadow.xml
deleted file mode 100644
index 341e60cda9..0000000000
--- a/res/drawable/drag_handle_indicator_no_shadow.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="@dimen/vertical_drag_handle_width"
-    android:height="@dimen/vertical_drag_handle_height"
-    android:viewportWidth="18.0"
-    android:viewportHeight="6.0"
-    android:tint="?attr/workspaceTextColor" >
-
-    <path
-        android:pathData="M17,6c-0.15,0-0.3-0.03-0.45-0.11L9,2.12L1.45,5.89c-0.5,0.25-1.09,
-        0.05-1.34-0.45S0.06,4.35,0.55,4.11l8-4c0.28-0.14,0.61-0.14,0.89,0l8,4c0.49,0.25,0.69,
-        0.85,0.45,1.34C17.72,5.8,17.37,6,17,6z"
-        android:fillColor="@android:color/white" />
-</vector>
diff --git a/res/layout/launcher.xml b/res/layout/launcher.xml
index a13790826b..0c18c8a2ba 100644
--- a/res/layout/launcher.xml
+++ b/res/layout/launcher.xml
@@ -28,6 +28,12 @@
         android:clipToPadding="false"
         android:importantForAccessibility="no">
 
+        <com.android.launcher3.views.AccessibilityActionsView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:contentDescription="@string/home_screen"
+            />
+
         <!-- The workspace contains 5 screens of cells -->
         <!-- DO NOT CHANGE THE ID -->
         <com.android.launcher3.Workspace
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 969765f121..f59f02f994 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -40,14 +40,6 @@
     <dimen name="workspace_page_indicator_line_height">1dp</dimen>
     <dimen name="workspace_page_indicator_overlap_workspace">0dp</dimen>
 
-    <!-- Hotseat/all-apps scrim -->
-    <dimen name="all_apps_scrim_blur">4dp</dimen>
-    <dimen name="vertical_drag_handle_width">18dp</dimen>
-    <dimen name="vertical_drag_handle_height">6dp</dimen>
-    <dimen name="vertical_drag_handle_elevation">1dp</dimen>
-    <dimen name="vertical_drag_handle_touch_size">48dp</dimen>
-    <dimen name="vertical_drag_handle_padding_in_vertical_bar_layout">16dp</dimen>
-
 <!-- Drop target bar -->
     <dimen name="dynamic_grid_drop_target_size">48dp</dimen>
     <dimen name="drop_target_vertical_gap">20dp</dimen>
diff --git a/res/values/drawables.xml b/res/values/drawables.xml
index 7d631426cb..9c57ec1214 100644
--- a/res/values/drawables.xml
+++ b/res/values/drawables.xml
@@ -18,5 +18,4 @@
     <drawable name="ic_remove_shadow">@drawable/ic_remove_no_shadow</drawable>
     <drawable name="ic_uninstall_shadow">@drawable/ic_uninstall_no_shadow</drawable>
     <drawable name="ic_block_shadow">@drawable/ic_block_no_shadow</drawable>
-    <drawable name="all_apps_arrow_shadow">@drawable/drag_handle_indicator_no_shadow</drawable>
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 80b511a54c..12beeeb566 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -36,7 +36,7 @@
     <!-- Message shown when a shortcut is not available. It could have been temporarily disabled and may start working again after some time. -->
     <string name="shortcut_not_available">Shortcut isn\'t available</string>
     <!-- User visible name for the launcher/home screen. [CHAR_LIMIT=30] -->
-    <string name="home_screen">Home screen</string>
+    <string name="home_screen">Home</string>
     <!-- Label for showing custom action list of a shortcut or widget. [CHAR_LIMIT=30] -->
     <string name="custom_actions">Custom actions</string>
 
@@ -88,10 +88,6 @@
     <string name="all_apps_button_personal_label">Personal apps list</string>
     <string name="all_apps_button_work_label">Work apps list</string>
 
-    <!-- Label for button in all applications label to go back home (to the workspace / desktop)
-         for accessibilty (spoken when the button gets focus). -->
-    <string name="all_apps_home_button_label">Home</string>
-
     <!-- Label for remove drop target (from the homescreen only).
          May appear next to uninstall_drop_target_label [CHAR_LIMIT=20] -->
     <string name="remove_drop_target_label">Remove</string>
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index e49c4559f0..f9fba6f80f 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -453,10 +453,10 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
                     mAppsView.getAlphaProperty(APPS_VIEW_ALPHA_CHANNEL_INDEX).setValue(alpha);
                 } else if (finalState == OVERVIEW || finalState == OVERVIEW_PEEK) {
                     mAppsView.getAlphaProperty(APPS_VIEW_ALPHA_CHANNEL_INDEX).setValue(alpha);
-                    mScrimView.getAlphaProperty(SCRIM_VIEW_ALPHA_CHANNEL_INDEX).setValue(alpha);
+                    mScrimView.setAlpha(alpha);
                 } else {
                     mAppsView.getAlphaProperty(APPS_VIEW_ALPHA_CHANNEL_INDEX).setValue(1f);
-                    mScrimView.getAlphaProperty(SCRIM_VIEW_ALPHA_CHANNEL_INDEX).setValue(1f);
+                    mScrimView.setAlpha(1f);
                 }
             }
         });
@@ -553,7 +553,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
             mAppsView.getAlphaProperty(APPS_VIEW_ALPHA_CHANNEL_INDEX).setValue(alpha);
         } else if (state == OVERVIEW || state == OVERVIEW_PEEK) {
             mAppsView.getAlphaProperty(APPS_VIEW_ALPHA_CHANNEL_INDEX).setValue(alpha);
-            mScrimView.getAlphaProperty(SCRIM_VIEW_ALPHA_CHANNEL_INDEX).setValue(alpha);
+            mScrimView.setAlpha(alpha);
         }
     }
 
@@ -1936,7 +1936,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         // Populate event with a fake title based on the current state.
         // TODO: When can workspace be null?
         text.add(mWorkspace == null
-                ? getString(R.string.all_apps_home_button_label)
+                ? getString(R.string.home_screen)
                 : mStateManager.getState().getDescription(this));
         return result;
     }
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 15e0daa8ea..3be9ac7e07 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -3263,7 +3263,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         }
         if (nScreens == 0) {
             // When the workspace is not loaded, we do not know how many screen will be bound.
-            return getContext().getString(R.string.all_apps_home_button_label);
+            return getContext().getString(R.string.home_screen);
         }
         return getContext().getString(R.string.workspace_scroll_format, page + 1, nScreens);
     }
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 5b00631659..1224cb0080 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -19,7 +19,6 @@ import static com.android.launcher3.LauncherState.ALL_APPS_CONTENT;
 import static com.android.launcher3.LauncherState.ALL_APPS_HEADER_EXTRA;
 import static com.android.launcher3.LauncherState.APPS_VIEW_ITEM_MASK;
 import static com.android.launcher3.LauncherState.OVERVIEW;
-import static com.android.launcher3.LauncherState.VERTICAL_SWIPE_INDICATOR;
 import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 import static com.android.launcher3.anim.Interpolators.FINAL_FRAME;
 import static com.android.launcher3.anim.Interpolators.INSTANT;
@@ -222,9 +221,6 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
 
         mAppsView.getSearchUiManager().setContentVisibility(visibleElements, setter, allAppsFade);
 
-        setter.setInt(mScrimView, ScrimView.DRAG_HANDLE_ALPHA,
-                (visibleElements & VERTICAL_SWIPE_INDICATOR) != 0 ? 255 : 0, allAppsFade);
-
         // Set visibility of the container at the very beginning or end of the transition.
         setter.setViewAlpha(mAppsView, hasAnyVisibleItem ? 1 : 0,
                 hasAnyVisibleItem ? INSTANT : FINAL_FRAME);
diff --git a/src/com/android/launcher3/util/OnboardingPrefs.java b/src/com/android/launcher3/util/OnboardingPrefs.java
index 26313e5a21..6e5e7d9355 100644
--- a/src/com/android/launcher3/util/OnboardingPrefs.java
+++ b/src/com/android/launcher3/util/OnboardingPrefs.java
@@ -36,7 +36,6 @@ public class OnboardingPrefs<T extends Launcher> {
     public static final String SHELF_BOUNCE_SEEN = "launcher.shelf_bounce_seen";
     public static final String HOME_BOUNCE_COUNT = "launcher.home_bounce_count";
     public static final String SHELF_BOUNCE_COUNT = "launcher.shelf_bounce_count";
-    public static final String ALL_APPS_COUNT = "launcher.all_apps_count";
     public static final String HOTSEAT_DISCOVERY_TIP_COUNT = "launcher.hotseat_discovery_tip_count";
     public static final String HOTSEAT_LONGPRESS_TIP_SEEN = "launcher.hotseat_longpress_tip_seen";
 
@@ -56,7 +55,6 @@ public class OnboardingPrefs<T extends Launcher> {
     @StringDef(value = {
             HOME_BOUNCE_COUNT,
             SHELF_BOUNCE_COUNT,
-            ALL_APPS_COUNT,
             HOTSEAT_DISCOVERY_TIP_COUNT
     })
     @Retention(RetentionPolicy.SOURCE)
@@ -67,7 +65,6 @@ public class OnboardingPrefs<T extends Launcher> {
         Map<String, Integer> maxCounts = new ArrayMap<>(4);
         maxCounts.put(HOME_BOUNCE_COUNT, 3);
         maxCounts.put(SHELF_BOUNCE_COUNT, 3);
-        maxCounts.put(ALL_APPS_COUNT, 5);
         maxCounts.put(HOTSEAT_DISCOVERY_TIP_COUNT, 5);
         MAX_COUNTS = Collections.unmodifiableMap(maxCounts);
     }
diff --git a/src/com/android/launcher3/views/AccessibilityActionsView.java b/src/com/android/launcher3/views/AccessibilityActionsView.java
new file mode 100644
index 0000000000..0eacaa3009
--- /dev/null
+++ b/src/com/android/launcher3/views/AccessibilityActionsView.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.views;
+
+import static com.android.launcher3.LauncherState.ALL_APPS;
+import static com.android.launcher3.LauncherState.NORMAL;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.accessibility.AccessibilityNodeInfo;
+import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
+
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherState;
+import com.android.launcher3.R;
+import com.android.launcher3.statemanager.StateManager.StateListener;
+import com.android.launcher3.views.OptionsPopupView.OptionItem;
+
+/**
+ * Placeholder view to expose additional Launcher actions via accessibility actions
+ */
+public class AccessibilityActionsView extends View implements StateListener<LauncherState> {
+
+    public AccessibilityActionsView(Context context) {
+        this(context, null);
+    }
+
+    public AccessibilityActionsView(Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public AccessibilityActionsView(Context context, @Nullable AttributeSet attrs,
+            int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        Launcher.getLauncher(context).getStateManager().addStateListener(this);
+        setWillNotDraw(true);
+    }
+
+    @Override
+    public void onStateTransitionComplete(LauncherState finalState) {
+        setImportantForAccessibility(finalState == NORMAL
+                ? IMPORTANT_FOR_ACCESSIBILITY_YES : IMPORTANT_FOR_ACCESSIBILITY_NO);
+    }
+
+    @Override
+    public AccessibilityNodeInfo createAccessibilityNodeInfo() {
+        AccessibilityNodeInfo info = super.createAccessibilityNodeInfo();
+        Launcher l = Launcher.getLauncher(getContext());
+        info.addAction(new AccessibilityAction(
+                R.string.all_apps_button_label, l.getText(R.string.all_apps_button_label)));
+        for (OptionItem item : OptionsPopupView.getOptions(l)) {
+            info.addAction(new AccessibilityAction(item.labelRes, l.getText(item.labelRes)));
+        }
+        return info;
+    }
+
+    @Override
+    public boolean performAccessibilityAction(int action, Bundle arguments) {
+        if (super.performAccessibilityAction(action, arguments)) {
+            return true;
+        }
+        Launcher l = Launcher.getLauncher(getContext());
+        if (action == R.string.all_apps_button_label) {
+            l.getStateManager().goToState(ALL_APPS);
+            return true;
+        }
+        for (OptionItem item : OptionsPopupView.getOptions(l)) {
+            if (item.labelRes == action) {
+                if (item.eventId.getId() > 0) {
+                    l.getStatsLogManager().logger().log(item.eventId);
+                }
+                if (item.clickListener.onLongClick(this)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+}
diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java
index 049a1acbf3..e95dc5b83f 100644
--- a/src/com/android/launcher3/views/OptionsPopupView.java
+++ b/src/com/android/launcher3/views/OptionsPopupView.java
@@ -85,10 +85,10 @@ public class OptionsPopupView extends ArrowPopup
         if (item == null) {
             return false;
         }
-        if (item.mEventId.getId() > 0) {
-            mLauncher.getStatsLogManager().logger().log(item.mEventId);
+        if (item.eventId.getId() > 0) {
+            mLauncher.getStatsLogManager().logger().log(item.eventId);
         }
-        if (item.mClickListener.onLongClick(view)) {
+        if (item.clickListener.onLongClick(view)) {
             close(true);
             return true;
         }
@@ -130,8 +130,8 @@ public class OptionsPopupView extends ArrowPopup
         for (OptionItem item : items) {
             DeepShortcutView view =
                     (DeepShortcutView) popup.inflateAndAdd(R.layout.system_shortcut, popup);
-            view.getIconView().setBackgroundResource(item.mIconRes);
-            view.getBubbleText().setText(item.mLabelRes);
+            view.getIconView().setBackgroundResource(item.iconRes);
+            view.getBubbleText().setText(item.labelRes);
             view.setDividerVisibility(View.INVISIBLE);
             view.setOnClickListener(popup);
             view.setOnLongClickListener(popup);
@@ -152,7 +152,13 @@ public class OptionsPopupView extends ArrowPopup
             y = launcher.getDragLayer().getHeight() / 2;
         }
         RectF target = new RectF(x - halfSize, y - halfSize, x + halfSize, y + halfSize);
+        show(launcher, target, getOptions(launcher));
+    }
 
+    /**
+     * Returns the list of supported actions
+     */
+    public static ArrayList<OptionItem> getOptions(Launcher launcher) {
         ArrayList<OptionItem> options = new ArrayList<>();
         int resString = Utilities.existsStyleWallpapers(launcher) ?
                 R.string.styles_wallpaper_button_text : R.string.wallpaper_button_text;
@@ -170,10 +176,10 @@ public class OptionsPopupView extends ArrowPopup
                 LAUNCHER_SETTINGS_BUTTON_TAP_OR_LONGPRESS,
                 OptionsPopupView::startSettings));
 
-        show(launcher, target, options);
+        return options;
     }
 
-    public static boolean onWidgetsClicked(View view) {
+    private static boolean onWidgetsClicked(View view) {
         return openWidgets(Launcher.getLauncher(view.getContext())) != null;
     }
 
@@ -188,7 +194,7 @@ public class OptionsPopupView extends ArrowPopup
         }
     }
 
-    public static boolean startSettings(View view) {
+    private static boolean startSettings(View view) {
         TestLogging.recordEvent(TestProtocol.SEQUENCE_MAIN, "start: startSettings");
         Launcher launcher = Launcher.getLauncher(view.getContext());
         launcher.startActivity(new Intent(Intent.ACTION_APPLICATION_PREFERENCES)
@@ -201,7 +207,7 @@ public class OptionsPopupView extends ArrowPopup
      * Event handler for the wallpaper picker button that appears after a long press
      * on the home screen.
      */
-    public static boolean startWallpaperPicker(View v) {
+    private static boolean startWallpaperPicker(View v) {
         Launcher launcher = Launcher.getLauncher(v.getContext());
         if (!Utilities.isWallpaperAllowed(launcher)) {
             Toast.makeText(launcher, R.string.msg_disabled_by_admin, Toast.LENGTH_SHORT).show();
@@ -233,17 +239,17 @@ public class OptionsPopupView extends ArrowPopup
 
     public static class OptionItem {
 
-        private final int mLabelRes;
-        private final int mIconRes;
-        private final EventEnum mEventId;
-        private final OnLongClickListener mClickListener;
+        public final int labelRes;
+        public final int iconRes;
+        public final EventEnum eventId;
+        public final OnLongClickListener clickListener;
 
         public OptionItem(int labelRes, int iconRes, EventEnum eventId,
                 OnLongClickListener clickListener) {
-            mLabelRes = labelRes;
-            mIconRes = iconRes;
-            mEventId = eventId;
-            mClickListener = clickListener;
+            this.labelRes = labelRes;
+            this.iconRes = iconRes;
+            this.eventId = eventId;
+            this.clickListener = clickListener;
         }
     }
 }
diff --git a/src/com/android/launcher3/views/ScrimView.java b/src/com/android/launcher3/views/ScrimView.java
index 22faf97cc4..7f0765becd 100644
--- a/src/com/android/launcher3/views/ScrimView.java
+++ b/src/com/android/launcher3/views/ScrimView.java
@@ -15,119 +15,37 @@
  */
 package com.android.launcher3.views;
 
-import static android.content.Context.ACCESSIBILITY_SERVICE;
-import static android.view.MotionEvent.ACTION_DOWN;
-
 import static androidx.core.graphics.ColorUtils.compositeColors;
 
-import static com.android.launcher3.LauncherState.ALL_APPS;
-import static com.android.launcher3.LauncherState.NORMAL;
-import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
-import static com.android.launcher3.anim.Interpolators.DEACCEL;
-import static com.android.launcher3.anim.Interpolators.LINEAR;
-import static com.android.launcher3.anim.Interpolators.clampToProgress;
 import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
 import static com.android.launcher3.util.SystemUiController.UI_STATE_SCRIM_VIEW;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.Keyframe;
-import android.animation.ObjectAnimator;
-import android.animation.PropertyValuesHolder;
-import android.animation.RectEvaluator;
 import android.content.Context;
-import android.content.res.Resources;
 import android.graphics.Canvas;
 import android.graphics.Color;
-import android.graphics.Point;
 import android.graphics.Rect;
-import android.graphics.RectF;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
 import android.util.AttributeSet;
-import android.util.IntProperty;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
 import android.view.View;
-import android.view.accessibility.AccessibilityManager;
-import android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.core.graphics.ColorUtils;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat;
-import androidx.customview.widget.ExploreByTouchHelper;
 
-import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Insettable;
 import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
-import com.android.launcher3.statemanager.StateManager;
-import com.android.launcher3.statemanager.StateManager.StateListener;
 import com.android.launcher3.uioverrides.WallpaperColorInfo;
 import com.android.launcher3.uioverrides.WallpaperColorInfo.OnChangeListener;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ControlType;
-import com.android.launcher3.util.MultiValueAlpha;
-import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;
 import com.android.launcher3.util.Themes;
-import com.android.launcher3.widget.WidgetsFullSheet;
-
-import java.util.List;
 
 /**
  * Simple scrim which draws a flat color
  */
-public class ScrimView<T extends Launcher> extends View implements Insettable, OnChangeListener,
-        AccessibilityStateChangeListener {
-
-    public static final IntProperty<ScrimView> DRAG_HANDLE_ALPHA =
-            new IntProperty<ScrimView>("dragHandleAlpha") {
-
-                @Override
-                public Integer get(ScrimView scrimView) {
-                    return scrimView.mDragHandleAlpha;
-                }
-
-                @Override
-                public void setValue(ScrimView scrimView, int value) {
-                    scrimView.setDragHandleAlpha(value);
-                }
-            };
-    private static final int WALLPAPERS = R.string.wallpaper_button_text;
-    private static final int WIDGETS = R.string.widget_button_text;
-    private static final int SETTINGS = R.string.settings_button_text;
-    private static final int ALPHA_CHANNEL_COUNT = 1;
-
-    private static final long DRAG_HANDLE_BOUNCE_DURATION_MS = 300;
-    // How much to delay before repeating the bounce.
-    private static final long DRAG_HANDLE_BOUNCE_DELAY_MS = 200;
-    // Repeat this many times (i.e. total number of bounces is 1 + this).
-    private static final int DRAG_HANDLE_BOUNCE_REPEAT_COUNT = 2;
-
-    private final Rect mTempRect = new Rect();
-    private final int[] mTempPos = new int[2];
+public class ScrimView<T extends Launcher> extends View implements Insettable, OnChangeListener {
 
     protected final T mLauncher;
     private final WallpaperColorInfo mWallpaperColorInfo;
-    private final AccessibilityManager mAM;
     protected final int mEndScrim;
     protected final boolean mIsScrimDark;
 
-    private final StateListener<LauncherState> mAccessibilityLauncherStateListener =
-            new StateListener<LauncherState>() {
-        @Override
-        public void onStateTransitionComplete(LauncherState finalState) {
-            setImportantForAccessibility(finalState == ALL_APPS
-                    ? IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS
-                    : IMPORTANT_FOR_ACCESSIBILITY_AUTO);
-        }
-    };
-
     protected float mMaxScrimAlpha;
 
     protected float mProgress = 1;
@@ -137,22 +55,6 @@ public class ScrimView<T extends Launcher> extends View implements Insettable, O
     protected int mEndFlatColor;
     protected int mEndFlatColorAlpha;
 
-    protected final Point mDragHandleSize;
-    private final int mDragHandleTouchSize;
-    private final int mDragHandlePaddingInVerticalBarLayout;
-    protected float mDragHandleOffset;
-    private final Rect mDragHandleBounds;
-    private final RectF mHitRect = new RectF();
-    private ObjectAnimator mDragHandleAnim;
-
-    private final MultiValueAlpha mMultiValueAlpha;
-
-    private final AccessibilityHelper mAccessibilityHelper;
-    @Nullable
-    protected Drawable mDragHandle;
-
-    private int mDragHandleAlpha = 255;
-
     public ScrimView(Context context, AttributeSet attrs) {
         super(context, attrs);
         mLauncher = Launcher.cast(Launcher.getLauncher(context));
@@ -161,59 +63,24 @@ public class ScrimView<T extends Launcher> extends View implements Insettable, O
         mIsScrimDark = ColorUtils.calculateLuminance(mEndScrim) < 0.5f;
 
         mMaxScrimAlpha = 0.7f;
-
-        Resources res = context.getResources();
-        mDragHandleSize = new Point(res.getDimensionPixelSize(R.dimen.vertical_drag_handle_width),
-                res.getDimensionPixelSize(R.dimen.vertical_drag_handle_height));
-        mDragHandleBounds = new Rect(0, 0, mDragHandleSize.x, mDragHandleSize.y);
-        mDragHandleTouchSize = res.getDimensionPixelSize(R.dimen.vertical_drag_handle_touch_size);
-        mDragHandlePaddingInVerticalBarLayout = context.getResources()
-                .getDimensionPixelSize(R.dimen.vertical_drag_handle_padding_in_vertical_bar_layout);
-
-        mAccessibilityHelper = createAccessibilityHelper();
-        ViewCompat.setAccessibilityDelegate(this, mAccessibilityHelper);
-
-        mAM = (AccessibilityManager) context.getSystemService(ACCESSIBILITY_SERVICE);
         setFocusable(false);
-        mMultiValueAlpha = new MultiValueAlpha(this, ALPHA_CHANNEL_COUNT);
-    }
-
-    public AlphaProperty getAlphaProperty(int index) {
-        return mMultiValueAlpha.getProperty(index);
-    }
-
-    @NonNull
-    protected AccessibilityHelper createAccessibilityHelper() {
-        return new AccessibilityHelper();
     }
 
     @Override
-    public void setInsets(Rect insets) {
-        updateDragHandleBounds();
-        updateDragHandleVisibility();
-    }
+    public void setInsets(Rect insets) { }
 
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        updateDragHandleBounds();
-    }
 
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
         mWallpaperColorInfo.addOnChangeListener(this);
         onExtractedColorsChanged(mWallpaperColorInfo);
-
-        mAM.addAccessibilityStateChangeListener(this);
-        onAccessibilityStateChanged(mAM.isEnabled());
     }
 
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
         mWallpaperColorInfo.removeOnChangeListener(this);
-        mAM.removeAccessibilityStateChangeListener(this);
     }
 
     @Override
@@ -234,10 +101,8 @@ public class ScrimView<T extends Launcher> extends View implements Insettable, O
     public void setProgress(float progress) {
         if (mProgress != progress) {
             mProgress = progress;
-            stopDragHandleEducationAnim();
             updateColors();
             updateSysUiColors();
-            updateDragHandleAlpha();
             invalidate();
         }
     }
@@ -260,286 +125,10 @@ public class ScrimView<T extends Launcher> extends View implements Insettable, O
         }
     }
 
-    protected void updateDragHandleAlpha() {
-        if (mDragHandle != null) {
-            mDragHandle.setAlpha(mDragHandleAlpha);
-        }
-    }
-
-    private void setDragHandleAlpha(int alpha) {
-        if (alpha != mDragHandleAlpha) {
-            mDragHandleAlpha = alpha;
-            if (mDragHandle != null) {
-                mDragHandle.setAlpha(mDragHandleAlpha);
-                invalidate();
-            }
-        }
-    }
-
     @Override
     protected void onDraw(Canvas canvas) {
         if (mCurrentFlatColor != 0) {
             canvas.drawColor(mCurrentFlatColor);
         }
-        drawDragHandle(canvas);
-    }
-
-    protected void drawDragHandle(Canvas canvas) {
-        if (mDragHandle != null) {
-            canvas.translate(0, -mDragHandleOffset);
-            mDragHandle.draw(canvas);
-            canvas.translate(0, mDragHandleOffset);
-        }
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        boolean superHandledTouch = super.onTouchEvent(event);
-        if (event.getAction() == ACTION_DOWN) {
-            if (!superHandledTouch && mHitRect.contains(event.getX(), event.getY())) {
-                if (startDragHandleEducationAnim()) {
-                    return true;
-                }
-            }
-            stopDragHandleEducationAnim();
-        }
-        return superHandledTouch;
-    }
-
-    /**
-     * Animates the drag handle to demonstrate how to get to all apps.
-     * @return Whether the animation was started (false if drag handle is invisible).
-     */
-    public boolean startDragHandleEducationAnim() {
-        stopDragHandleEducationAnim();
-
-        if (mDragHandle == null || mDragHandle.getAlpha() != 255) {
-            return false;
-        }
-
-        final Drawable drawable = mDragHandle;
-        mDragHandle = null;
-
-        Rect bounds = new Rect(mDragHandleBounds);
-        bounds.offset(0, -(int) mDragHandleOffset);
-        drawable.setBounds(bounds);
-
-        Rect topBounds = new Rect(bounds);
-        topBounds.offset(0, -bounds.height());
-
-        Rect invalidateRegion = new Rect(bounds);
-        invalidateRegion.top = topBounds.top;
-
-        final float progressToReachTop = 0.6f;
-        Keyframe frameTop = Keyframe.ofObject(progressToReachTop, topBounds);
-        frameTop.setInterpolator(DEACCEL);
-        Keyframe frameBot = Keyframe.ofObject(1, bounds);
-        frameBot.setInterpolator(ACCEL_DEACCEL);
-        PropertyValuesHolder holder = PropertyValuesHolder.ofKeyframe("bounds",
-                Keyframe.ofObject(0, bounds), frameTop, frameBot);
-        holder.setEvaluator(new RectEvaluator());
-
-        mDragHandleAnim = ObjectAnimator.ofPropertyValuesHolder(drawable, holder);
-        long totalBounceDuration = DRAG_HANDLE_BOUNCE_DURATION_MS + DRAG_HANDLE_BOUNCE_DELAY_MS;
-        // The bounce finishes by this progress, the rest of the duration just delays next bounce.
-        float delayStartProgress = 1f - (float) DRAG_HANDLE_BOUNCE_DELAY_MS / totalBounceDuration;
-        mDragHandleAnim.addUpdateListener((v) -> invalidate(invalidateRegion));
-        mDragHandleAnim.setDuration(totalBounceDuration);
-        mDragHandleAnim.setInterpolator(clampToProgress(LINEAR, 0, delayStartProgress));
-        mDragHandleAnim.setRepeatCount(DRAG_HANDLE_BOUNCE_REPEAT_COUNT);
-        getOverlay().add(drawable);
-
-        mDragHandleAnim.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                mDragHandleAnim = null;
-                getOverlay().remove(drawable);
-                updateDragHandleVisibility(drawable);
-            }
-        });
-        mDragHandleAnim.start();
-        return true;
-    }
-
-    private void stopDragHandleEducationAnim() {
-        if (mDragHandleAnim != null) {
-            mDragHandleAnim.end();
-        }
-    }
-
-    protected void updateDragHandleBounds() {
-        DeviceProfile grid = mLauncher.getDeviceProfile();
-        final int left;
-        final int width = getMeasuredWidth();
-        final int top = getMeasuredHeight() - mDragHandleSize.y - grid.getInsets().bottom;
-        final int topMargin;
-
-        if (grid.isVerticalBarLayout()) {
-            topMargin = grid.workspacePadding.bottom + mDragHandlePaddingInVerticalBarLayout;
-            if (grid.isSeascape()) {
-                left = width - grid.getInsets().right - mDragHandleSize.x
-                        - mDragHandlePaddingInVerticalBarLayout;
-            } else {
-                left = grid.getInsets().left + mDragHandlePaddingInVerticalBarLayout;
-            }
-        } else {
-            left = Math.round((width - mDragHandleSize.x) / 2f);
-            topMargin = grid.hotseatBarSizePx;
-        }
-        mDragHandleBounds.offsetTo(left, top - topMargin);
-        mHitRect.set(mDragHandleBounds);
-        // Inset outwards to increase touch size.
-        mHitRect.inset((mDragHandleSize.x - mDragHandleTouchSize) / 2f,
-                (mDragHandleSize.y - mDragHandleTouchSize) / 2f);
-
-        if (mDragHandle != null) {
-            mDragHandle.setBounds(mDragHandleBounds);
-        }
-    }
-
-    @Override
-    public void onAccessibilityStateChanged(boolean enabled) {
-        StateManager<LauncherState> stateManager = mLauncher.getStateManager();
-        stateManager.removeStateListener(mAccessibilityLauncherStateListener);
-
-        if (enabled) {
-            stateManager.addStateListener(mAccessibilityLauncherStateListener);
-            mAccessibilityLauncherStateListener.onStateTransitionComplete(stateManager.getState());
-        } else {
-            setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
-        }
-        updateDragHandleVisibility();
-    }
-
-    public void updateDragHandleVisibility() {
-        updateDragHandleVisibility(null);
-    }
-
-    private void updateDragHandleVisibility(@Nullable Drawable recycle) {
-        boolean visible = shouldDragHandleBeVisible();
-        boolean wasVisible = mDragHandle != null;
-        if (visible != wasVisible) {
-            if (visible) {
-                mDragHandle = recycle != null ? recycle :
-                        mLauncher.getDrawable(R.drawable.drag_handle_indicator_shadow);
-                mDragHandle.setBounds(mDragHandleBounds);
-
-                updateDragHandleAlpha();
-            } else {
-                mDragHandle = null;
-            }
-            invalidate();
-        }
-    }
-
-    protected boolean shouldDragHandleBeVisible() {
-        return mLauncher.getDeviceProfile().isVerticalBarLayout() || mAM.isEnabled();
-    }
-
-    @Override
-    public boolean dispatchHoverEvent(MotionEvent event) {
-        return mAccessibilityHelper.dispatchHoverEvent(event) || super.dispatchHoverEvent(event);
-    }
-
-    @Override
-    public boolean dispatchKeyEvent(KeyEvent event) {
-        return mAccessibilityHelper.dispatchKeyEvent(event) || super.dispatchKeyEvent(event);
-    }
-
-    @Override
-    public void onFocusChanged(boolean gainFocus, int direction,
-            Rect previouslyFocusedRect) {
-        super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
-        mAccessibilityHelper.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
-    }
-
-    protected class AccessibilityHelper extends ExploreByTouchHelper {
-
-        private static final int DRAG_HANDLE_ID = 1;
-
-        public AccessibilityHelper() {
-            super(ScrimView.this);
-        }
-
-        @Override
-        protected int getVirtualViewAt(float x, float y) {
-            return  mHitRect.contains((int) x, (int) y)
-                    ? DRAG_HANDLE_ID : INVALID_ID;
-        }
-
-        @Override
-        protected void getVisibleVirtualViews(List<Integer> virtualViewIds) {
-            virtualViewIds.add(DRAG_HANDLE_ID);
-        }
-
-        @Override
-        protected void onPopulateNodeForVirtualView(int virtualViewId,
-                AccessibilityNodeInfoCompat node) {
-            node.setContentDescription(getContext().getString(R.string.all_apps_button_label));
-            node.setBoundsInParent(mDragHandleBounds);
-
-            getLocationOnScreen(mTempPos);
-            mTempRect.set(mDragHandleBounds);
-            mTempRect.offset(mTempPos[0], mTempPos[1]);
-            node.setBoundsInScreen(mTempRect);
-
-            node.addAction(AccessibilityNodeInfoCompat.ACTION_CLICK);
-            node.setClickable(true);
-            node.setFocusable(true);
-
-            if (mLauncher.isInState(NORMAL)) {
-                Context context = getContext();
-                if (Utilities.isWallpaperAllowed(context)) {
-                    node.addAction(
-                            new AccessibilityActionCompat(WALLPAPERS, context.getText(WALLPAPERS)));
-                }
-                node.addAction(new AccessibilityActionCompat(WIDGETS, context.getText(WIDGETS)));
-                node.addAction(new AccessibilityActionCompat(SETTINGS, context.getText(SETTINGS)));
-            }
-        }
-
-        @Override
-        protected boolean onPerformActionForVirtualView(
-                int virtualViewId, int action, Bundle arguments) {
-            if (action == AccessibilityNodeInfoCompat.ACTION_CLICK) {
-                mLauncher.getUserEventDispatcher().logActionOnControl(
-                        Action.Touch.TAP, ControlType.ALL_APPS_BUTTON,
-                        mLauncher.getStateManager().getState().containerType);
-                mLauncher.getStateManager().goToState(ALL_APPS);
-                return true;
-            } else if (action == WALLPAPERS) {
-                return OptionsPopupView.startWallpaperPicker(ScrimView.this);
-            } else if (action == WIDGETS) {
-                int originalImportanceForAccessibility = getImportantForAccessibility();
-                setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
-                WidgetsFullSheet widgetsFullSheet = OptionsPopupView.openWidgets(mLauncher);
-                if (widgetsFullSheet == null) {
-                    setImportantForAccessibility(originalImportanceForAccessibility);
-                    return false;
-                }
-                widgetsFullSheet.addOnAttachStateChangeListener(new OnAttachStateChangeListener() {
-                    @Override
-                    public void onViewAttachedToWindow(View view) {}
-
-                    @Override
-                    public void onViewDetachedFromWindow(View view) {
-                        setImportantForAccessibility(originalImportanceForAccessibility);
-                        widgetsFullSheet.removeOnAttachStateChangeListener(this);
-                    }
-                });
-                return true;
-            } else if (action == SETTINGS) {
-                return OptionsPopupView.startSettings(ScrimView.this);
-            }
-
-            return false;
-        }
-    }
-
-    /**
-     * @return The top of this scrim view, or {@link Float#MAX_VALUE} if there's no distinct top.
-     */
-    public float getVisualTop() {
-        return Float.MAX_VALUE;
     }
 }
-- 
GitLab


From df10ff46bd916e7bd0f685f8c59af8783d52906d Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Sun, 26 Jul 2020 19:11:14 -0700
Subject: [PATCH 0051/1664] Migrate AllAppsSearch [part 1/3]

[Video attached to bug report]

Setup DeviceSearchAlgorithm to handle on device search

Bug: 161801950
Test: Manual
Change-Id: Ib55f415f9992ceab687bbbfe904d153157541648
---
 res/layout/search_section_title.xml           | 25 +++++
 res/values/strings.xml                        |  4 +
 .../launcher3/allapps/AllAppsGridAdapter.java |  9 ++
 .../allapps/AllAppsRecyclerView.java          |  1 +
 .../allapps/AlphabeticalAppsList.java         | 94 ++++++++++---------
 .../search/AllAppsSearchBarController.java    |  7 +-
 .../search/AppsSearchContainerLayout.java     | 13 +--
 .../allapps/search/AppsSearchPipeline.java    | 92 ++++++++++++++++++
 .../search/DefaultAppSearchAlgorithm.java     | 34 ++-----
 .../allapps/search/SearchPipeline.java        | 32 +++++++
 .../allapps/search/SearchSectionInfo.java     | 36 +++++++
 11 files changed, 267 insertions(+), 80 deletions(-)
 create mode 100644 res/layout/search_section_title.xml
 create mode 100644 src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
 create mode 100644 src/com/android/launcher3/allapps/search/SearchPipeline.java
 create mode 100644 src/com/android/launcher3/allapps/search/SearchSectionInfo.java

diff --git a/res/layout/search_section_title.xml b/res/layout/search_section_title.xml
new file mode 100644
index 0000000000..9ab27c1620
--- /dev/null
+++ b/res/layout/search_section_title.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+          android:id="@+id/section_title"
+          android:textSize="14sp"
+          android:fontFamily="@style/TextHeadline"
+          android:layout_width="wrap_content"
+          android:textColor="?android:attr/textColorPrimary"
+          android:layout_marginLeft="16dp"
+          android:layout_marginRight="16dp"
+          android:paddingTop="8dp"
+          android:layout_height="wrap_content"/>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 80b511a54c..0ec0581457 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -67,6 +67,10 @@
     <!-- Label for an icon representing any generic app. [CHAR_LIMIT=50] -->
     <string name="label_application">App</string>
 
+    <!--All apps Search-->
+    <!-- Section title for apps [CHAR_LIMIT=50] -->
+    <string name="search_corpus_apps">Apps</string>
+
     <!-- Popup items -->
     <!-- Text to display as the header above notifications. [CHAR_LIMIT=30] -->
     <string name="notifications_header">Notifications</string>
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index d65316090c..dec92df2d3 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -66,6 +66,8 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter.
     // A divider that separates the apps list and the search market button
     public static final int VIEW_TYPE_ALL_APPS_DIVIDER = 1 << 4;
 
+    public static final int VIEW_TYPE_SEARCH_CORPUS_TITLE =  1 << 5;
+
     // Common view type masks
     public static final int VIEW_TYPE_MASK_DIVIDER = VIEW_TYPE_ALL_APPS_DIVIDER;
     public static final int VIEW_TYPE_MASK_ICON = VIEW_TYPE_ICON;
@@ -274,6 +276,9 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter.
             case VIEW_TYPE_ALL_APPS_DIVIDER:
                 return new ViewHolder(mLayoutInflater.inflate(
                         R.layout.all_apps_divider, parent, false));
+            case VIEW_TYPE_SEARCH_CORPUS_TITLE:
+                return new ViewHolder(
+                        mLayoutInflater.inflate(R.layout.search_section_title, parent, false));
             default:
                 throw new RuntimeException("Unexpected view type");
         }
@@ -302,6 +307,10 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter.
                     searchView.setVisibility(View.GONE);
                 }
                 break;
+            case VIEW_TYPE_SEARCH_CORPUS_TITLE:
+                TextView titleView = (TextView) holder.itemView;
+                titleView.setText(mApps.getAdapterItems().get(position).searchSectionInfo.getTitle(
+                        titleView.getContext()));
             case VIEW_TYPE_ALL_APPS_DIVIDER:
                 // nothing to do
                 break;
diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
index cbf02b7f55..640ef01bb7 100644
--- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
@@ -107,6 +107,7 @@ public class AllAppsRecyclerView extends BaseRecyclerView implements LogContaine
         pool.setMaxRecycledViews(AllAppsGridAdapter.VIEW_TYPE_ALL_APPS_DIVIDER, 1);
         pool.setMaxRecycledViews(AllAppsGridAdapter.VIEW_TYPE_SEARCH_MARKET, 1);
         pool.setMaxRecycledViews(AllAppsGridAdapter.VIEW_TYPE_ICON, approxRows * mNumAppsPerRow);
+        pool.setMaxRecycledViews(AllAppsGridAdapter.VIEW_TYPE_SEARCH_CORPUS_TITLE, 1);
 
         mViewHeights.clear();
         mViewHeights.put(AllAppsGridAdapter.VIEW_TYPE_ICON, grid.allAppsCellHeightPx);
diff --git a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
index 06209bba85..266bfa2785 100644
--- a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
+++ b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
@@ -19,8 +19,9 @@ package com.android.launcher3.allapps;
 import android.content.Context;
 
 import com.android.launcher3.BaseDraggingActivity;
+import com.android.launcher3.allapps.search.SearchSectionInfo;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.data.AppInfo;
-import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.ItemInfoMatcher;
 import com.android.launcher3.util.LabelComparator;
 
@@ -30,6 +31,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.stream.Collectors;
 
 /**
  * The alphabetically sorted list of applications.
@@ -82,6 +84,8 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
         public AppInfo appInfo = null;
         // The index of this app not including sections
         public int appIndex = -1;
+        // Search section associated to result
+        public SearchSectionInfo searchSectionInfo = null;
 
         public static AdapterItem asApp(int pos, String sectionName, AppInfo appInfo,
                 int appIndex) {
@@ -114,6 +118,17 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
             item.position = pos;
             return item;
         }
+
+        /**
+         * Factory method for search section title AdapterItem
+         */
+        public static AdapterItem asSearchTitle(SearchSectionInfo sectionInfo, int pos) {
+            AdapterItem item = new AdapterItem();
+            item.viewType = AllAppsGridAdapter.VIEW_TYPE_SEARCH_CORPUS_TITLE;
+            item.position = pos;
+            item.searchSectionInfo = sectionInfo;
+            return item;
+        }
     }
 
     private final BaseDraggingActivity mLauncher;
@@ -132,7 +147,7 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
     private final boolean mIsWork;
 
     // The of ordered component names as a result of a search query
-    private ArrayList<ComponentKey> mSearchResults;
+    private ArrayList<AdapterItem> mSearchResults;
     private AllAppsGridAdapter mAdapter;
     private AppInfoComparator mAppNameComparator;
     private final int mNumAppsPerRow;
@@ -210,10 +225,10 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
     }
 
     /**
-     * Sets the sorted list of filtered components.
+     * Sets results list for search
      */
-    public boolean setOrderedFilter(ArrayList<ComponentKey> f) {
-        if (mSearchResults != f) {
+    public boolean setSearchResults(ArrayList<AdapterItem> f) {
+        if (f == null || mSearchResults != f) {
             boolean same = mSearchResults != null && mSearchResults.equals(f);
             mSearchResults = f;
             onAppsUpdated();
@@ -298,35 +313,42 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
 
         // Recreate the filtered and sectioned apps (for convenience for the grid layout) from the
         // ordered set of sections
-        for (AppInfo info : getFiltersAppInfos()) {
-            String sectionName = info.sectionName;
-
-            // Create a new section if the section names do not match
-            if (!sectionName.equals(lastSectionName)) {
-                lastSectionName = sectionName;
-                lastFastScrollerSectionInfo = new FastScrollSectionInfo(sectionName);
-                mFastScrollerSections.add(lastFastScrollerSectionInfo);
-            }
+        if (!hasFilter()) {
+            for (AppInfo info : mApps) {
+                String sectionName = info.sectionName;
+
+                // Create a new section if the section names do not match
+                if (!sectionName.equals(lastSectionName)) {
+                    lastSectionName = sectionName;
+                    lastFastScrollerSectionInfo = new FastScrollSectionInfo(sectionName);
+                    mFastScrollerSections.add(lastFastScrollerSectionInfo);
+                }
 
-            // Create an app item
-            AdapterItem appItem = AdapterItem.asApp(position++, sectionName, info, appIndex++);
-            if (lastFastScrollerSectionInfo.fastScrollToItem == null) {
-                lastFastScrollerSectionInfo.fastScrollToItem = appItem;
+                // Create an app item
+                AdapterItem appItem = AdapterItem.asApp(position++, sectionName, info, appIndex++);
+                if (lastFastScrollerSectionInfo.fastScrollToItem == null) {
+                    lastFastScrollerSectionInfo.fastScrollToItem = appItem;
+                }
+                mAdapterItems.add(appItem);
+                mFilteredApps.add(info);
             }
-            mAdapterItems.add(appItem);
-            mFilteredApps.add(info);
-        }
+        } else {
+            mAdapterItems.addAll(mSearchResults);
+            List<AppInfo> appInfos = mSearchResults.stream().filter(
+                    i -> AllAppsGridAdapter.isIconViewType(i.viewType)).map(i -> i.appInfo).collect(
+                    Collectors.toList());
+            mFilteredApps.addAll(appInfos);
+            if (!FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
+                // Append the search market item
+                if (hasNoFilteredResults()) {
+                    mAdapterItems.add(AdapterItem.asEmptySearch(position++));
+                } else {
+                    mAdapterItems.add(AdapterItem.asAllAppsDivider(position++));
+                }
+                mAdapterItems.add(AdapterItem.asMarketSearch(position++));
 
-        if (hasFilter()) {
-            // Append the search market item
-            if (hasNoFilteredResults()) {
-                mAdapterItems.add(AdapterItem.asEmptySearch(position++));
-            } else {
-                mAdapterItems.add(AdapterItem.asAllAppsDivider(position++));
             }
-            mAdapterItems.add(AdapterItem.asMarketSearch(position++));
         }
-
         if (mNumAppsPerRow != 0) {
             // Update the number of rows in the adapter after we do all the merging (otherwise, we
             // would have to shift the values again)
@@ -381,18 +403,4 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
             }
         }
     }
-
-    private List<AppInfo> getFiltersAppInfos() {
-        if (mSearchResults == null) {
-            return mApps;
-        }
-        ArrayList<AppInfo> result = new ArrayList<>();
-        for (ComponentKey key : mSearchResults) {
-            AppInfo match = mAllAppsStore.getApp(key);
-            if (match != null) {
-                result.add(match);
-            }
-        }
-        return result;
-    }
 }
diff --git a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
index df1cd26da4..db94e8b6e8 100644
--- a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
+++ b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
@@ -28,7 +28,7 @@ import android.widget.TextView.OnEditorActionListener;
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.ExtendedEditText;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.util.ComponentKey;
+import com.android.launcher3.allapps.AlphabeticalAppsList;
 import com.android.launcher3.util.PackageManagerHelper;
 
 import java.util.ArrayList;
@@ -50,6 +50,7 @@ public class AllAppsSearchBarController
     public void setVisibility(int visibility) {
         mInput.setVisibility(visibility);
     }
+
     /**
      * Sets the references to the apps model and the search result callback.
      */
@@ -164,9 +165,9 @@ public class AllAppsSearchBarController
         /**
          * Called when the search is complete.
          *
-         * @param apps sorted list of matching components or null if in case of failure.
+         * @param items sorted list of search result adapter items.
          */
-        void onSearchResult(String query, ArrayList<ComponentKey> apps);
+        void onSearchResult(String query, ArrayList<AlphabeticalAppsList.AdapterItem> items);
 
         /**
          * Called when the search results should be cleared.
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
index 356c52ca39..df6a89bcb1 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
@@ -38,13 +38,13 @@ import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.ExtendedEditText;
 import com.android.launcher3.Insettable;
+import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.allapps.AllAppsStore;
 import com.android.launcher3.allapps.AlphabeticalAppsList;
 import com.android.launcher3.allapps.SearchUiManager;
 import com.android.launcher3.anim.PropertySetter;
-import com.android.launcher3.util.ComponentKey;
 
 import java.util.ArrayList;
 
@@ -135,7 +135,8 @@ public class AppsSearchContainerLayout extends ExtendedEditText
         mApps = appsView.getApps();
         mAppsView = appsView;
         mSearchBarController.initialize(
-                new DefaultAppSearchAlgorithm(mApps.getApps()), this, mLauncher, this);
+                new DefaultAppSearchAlgorithm(LauncherAppState.getInstance(mLauncher)), this,
+                mLauncher, this);
     }
 
     @Override
@@ -168,9 +169,9 @@ public class AppsSearchContainerLayout extends ExtendedEditText
     }
 
     @Override
-    public void onSearchResult(String query, ArrayList<ComponentKey> apps) {
-        if (apps != null) {
-            mApps.setOrderedFilter(apps);
+    public void onSearchResult(String query, ArrayList<AlphabeticalAppsList.AdapterItem> items) {
+        if (items != null) {
+            mApps.setSearchResults(items);
             notifyResultChanged();
             mAppsView.setLastSearchQuery(query);
         }
@@ -178,7 +179,7 @@ public class AppsSearchContainerLayout extends ExtendedEditText
 
     @Override
     public void clearSearchResult() {
-        if (mApps.setOrderedFilter(null)) {
+        if (mApps.setSearchResults(null)) {
             notifyResultChanged();
         }
 
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java b/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
new file mode 100644
index 0000000000..5beb956079
--- /dev/null
+++ b/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.allapps.search;
+
+import androidx.annotation.WorkerThread;
+
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.R;
+import com.android.launcher3.allapps.AlphabeticalAppsList.AdapterItem;
+import com.android.launcher3.model.AllAppsList;
+import com.android.launcher3.model.BaseModelUpdateTask;
+import com.android.launcher3.model.BgDataModel;
+import com.android.launcher3.model.data.AppInfo;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+
+/**
+ * A device search section for handling app searches
+ */
+public class AppsSearchPipeline implements SearchPipeline {
+
+    private static final int MAX_RESULTS_COUNT = 5;
+
+    private final SearchSectionInfo mSearchSectionInfo;
+    private final LauncherAppState mLauncherAppState;
+
+    public AppsSearchPipeline(LauncherAppState launcherAppState) {
+        mLauncherAppState = launcherAppState;
+        mSearchSectionInfo = new SearchSectionInfo(R.string.search_corpus_apps);
+    }
+
+    @Override
+    @WorkerThread
+    public void performSearch(String query, Consumer<ArrayList<AdapterItem>> callback) {
+        mLauncherAppState.getModel().enqueueModelUpdateTask(new BaseModelUpdateTask() {
+            @Override
+            public void execute(LauncherAppState app, BgDataModel dataModel, AllAppsList apps) {
+                callback.accept(getAdapterItems(getTitleMatchResult(apps.data, query)));
+            }
+        });
+    }
+
+    /**
+     * Filters {@link AppInfo}s matching specified query
+     */
+    public static ArrayList<AppInfo> getTitleMatchResult(List<AppInfo> apps, String query) {
+        // Do an intersection of the words in the query and each title, and filter out all the
+        // apps that don't match all of the words in the query.
+        final String queryTextLower = query.toLowerCase();
+        final ArrayList<AppInfo> result = new ArrayList<>();
+        DefaultAppSearchAlgorithm.StringMatcher matcher =
+                DefaultAppSearchAlgorithm.StringMatcher.getInstance();
+        for (AppInfo info : apps) {
+            if (DefaultAppSearchAlgorithm.matches(info, queryTextLower, matcher)) {
+                result.add(info);
+            }
+        }
+        return result;
+    }
+
+    private ArrayList<AdapterItem> getAdapterItems(List<AppInfo> matchingApps) {
+        ArrayList<AdapterItem> items = new ArrayList<>();
+        if (matchingApps.isEmpty()) {
+            return items;
+        }
+        items.add(AdapterItem.asSearchTitle(mSearchSectionInfo, 0));
+        int existingItems = items.size();
+        int searchResultsCount = Math.min(matchingApps.size(), MAX_RESULTS_COUNT);
+        for (int i = 0; i < searchResultsCount; i++) {
+            AdapterItem appItem = AdapterItem.asApp(i + existingItems, "", matchingApps.get(i), i);
+            appItem.searchSectionInfo = mSearchSectionInfo;
+            items.add(appItem);
+        }
+
+        return items;
+    }
+}
diff --git a/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java b/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java
index f72a9888cf..db10311675 100644
--- a/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java
+++ b/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java
@@ -17,24 +17,22 @@ package com.android.launcher3.allapps.search;
 
 import android.os.Handler;
 
+import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.model.data.AppInfo;
-import com.android.launcher3.util.ComponentKey;
 
 import java.text.Collator;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * The default search implementation.
  */
 public class DefaultAppSearchAlgorithm implements SearchAlgorithm {
 
-    private final List<AppInfo> mApps;
     protected final Handler mResultHandler;
+    private final AppsSearchPipeline mAppsSearchPipeline;
 
-    public DefaultAppSearchAlgorithm(List<AppInfo> apps) {
-        mApps = apps;
+    public DefaultAppSearchAlgorithm(LauncherAppState launcherAppState) {
         mResultHandler = new Handler();
+        mAppsSearchPipeline = new AppsSearchPipeline(launcherAppState);
     }
 
     @Override
@@ -47,28 +45,8 @@ public class DefaultAppSearchAlgorithm implements SearchAlgorithm {
     @Override
     public void doSearch(final String query,
             final AllAppsSearchBarController.Callbacks callback) {
-        final ArrayList<ComponentKey> result = getTitleMatchResult(query);
-        mResultHandler.post(new Runnable() {
-
-            @Override
-            public void run() {
-                callback.onSearchResult(query, result);
-            }
-        });
-    }
-
-    private ArrayList<ComponentKey> getTitleMatchResult(String query) {
-        // Do an intersection of the words in the query and each title, and filter out all the
-        // apps that don't match all of the words in the query.
-        final String queryTextLower = query.toLowerCase();
-        final ArrayList<ComponentKey> result = new ArrayList<>();
-        StringMatcher matcher = StringMatcher.getInstance();
-        for (AppInfo info : mApps) {
-            if (matches(info, queryTextLower, matcher)) {
-                result.add(info.toComponentKey());
-            }
-        }
-        return result;
+        mAppsSearchPipeline.performSearch(query,
+                results -> mResultHandler.post(() -> callback.onSearchResult(query, results)));
     }
 
     public static boolean matches(AppInfo info, String query, StringMatcher matcher) {
diff --git a/src/com/android/launcher3/allapps/search/SearchPipeline.java b/src/com/android/launcher3/allapps/search/SearchPipeline.java
new file mode 100644
index 0000000000..321674025a
--- /dev/null
+++ b/src/com/android/launcher3/allapps/search/SearchPipeline.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.allapps.search;
+
+import com.android.launcher3.allapps.AlphabeticalAppsList;
+
+import java.util.ArrayList;
+import java.util.function.Consumer;
+
+/**
+ * An interface for handling search within pipeline
+ */
+public interface SearchPipeline {
+
+    /**
+     * Perform query
+     */
+    void performSearch(String query, Consumer<ArrayList<AlphabeticalAppsList.AdapterItem>> cb);
+}
diff --git a/src/com/android/launcher3/allapps/search/SearchSectionInfo.java b/src/com/android/launcher3/allapps/search/SearchSectionInfo.java
new file mode 100644
index 0000000000..880b2466dc
--- /dev/null
+++ b/src/com/android/launcher3/allapps/search/SearchSectionInfo.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.allapps.search;
+
+import android.content.Context;
+
+/**
+ * Info class for a search section
+ */
+public class SearchSectionInfo {
+    private final int mTitleResId;
+
+    public SearchSectionInfo(int titleResId) {
+        mTitleResId = titleResId;
+    }
+
+    /**
+     * Returns the section's title
+     */
+    public String getTitle(Context context) {
+        return context.getString(mTitleResId);
+    }
+}
-- 
GitLab


From 261d817a95a039a49f971254140b4ce07d53ccb4 Mon Sep 17 00:00:00 2001
From: Vadim Tryshev <vadimt@google.com>
Date: Wed, 29 Jul 2020 02:50:35 +0000
Subject: [PATCH 0052/1664] Revert "Recycling already running activities"

This reverts commit 0bc32dcce64b20459ff6f8eff960b217810d59d8.

Reason for revert: Tests are broken, perhaps caused by this one

Change-Id: Ie409f04931a27bd6da616c1e52e279eb07479631
---
 .../StartLauncherViaGestureTests.java          |  4 +---
 .../android/quickstep/TaplTestsQuickstep.java  | 18 ++++++++----------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java b/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java
index 664958a18e..0c5b9ada5d 100644
--- a/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java
+++ b/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java
@@ -48,9 +48,7 @@ public class StartLauncherViaGestureTests extends AbstractQuickStepTest {
         // b/143488140
         mLauncher.pressHome();
         // Start an activity where the gestures start.
-        if (mLauncher.getRecentTasks().isEmpty()) {
-            startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR));
-        }
+        startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR));
     }
 
     private void runTest(String... eventSequence) {
diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
index ed25cc71ca..bf093fdabf 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
@@ -69,16 +69,14 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
     }
 
     private void startTestApps() throws Exception {
-        if (mLauncher.getRecentTasks().size() < 3) {
-            startAppFast(getAppPackageName());
-            startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR));
-            startTestActivity(2);
-
-            executeOnLauncher(launcher -> assertTrue(
-                    "Launcher activity is the top activity; expecting another activity to be the "
-                            + "top one",
-                    isInBackground(launcher)));
-        }
+        startAppFast(getAppPackageName());
+        startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR));
+        startTestActivity(2);
+
+        executeOnLauncher(launcher -> assertTrue(
+                "Launcher activity is the top activity; expecting another activity to be the top "
+                        + "one",
+                isInBackground(launcher)));
     }
 
     @Test
-- 
GitLab


From 12baaadeca97160ab567f4380991470ff536ff5f Mon Sep 17 00:00:00 2001
From: Yuchen He <yuchenhe@google.com>
Date: Wed, 29 Jul 2020 17:15:03 +0000
Subject: [PATCH 0053/1664] Enable memory dump for Launcher

Bug: 154772063
Change-Id: I3b2bc2e341037746891658f2596999248ec272ef
---
 tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index 858e183ab7..a1a2ed2a72 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -116,8 +116,7 @@ public abstract class AbstractLauncherUiTest {
         if (TestHelpers.isInLauncherProcess()) {
             StrictMode.VmPolicy.Builder builder =
                     new StrictMode.VmPolicy.Builder()
-// b/154772063
-//                            .detectActivityLeaks()
+                            .detectActivityLeaks()
                             .penaltyLog()
                             .penaltyListener(Runnable::run, violation -> {
                                 if (sStrictmodeDetectedActivityLeak == null) {
-- 
GitLab


From 7383d4e6d2769937f8a8fe33e82e960aeb5771f4 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 7 Jul 2020 19:25:25 -0700
Subject: [PATCH 0054/1664] Fix adjacent task offset distance

Instead of calculating an overall distance for tasks to translate
based on RecentsView width, calculate the distance for the tasks
to the left and right of the midpoint based on how far the first
adjacent tasks in those directions are from being offscreen.

Changes made to make "distance to offscreen" calculations possible:
- Update TaskView curve scale to reach final scale as soon as it is
  completely offscreen. Before, it would reach its final scale just
  shy of that point (calculations were off).
- As we update RecentsView scale, calculate how much the new scale
  will push out tasks that are just offscreen.
- With both above, we can calculate the scale and position of a
  TaskView such that it is just offscreen, and interpolate
  between its current position and that position.

Tests:
- Task comes in immediately when quick switching from home, and
  doesn't shift as you swipe directly upwards.
- When swiping far up from an app, tasks come in from all the way
  offscreen, and cover distance appropriately (e.g. if you're
  scrolled a bit to the right when you pause, the left adjacent
  app will move faster to cover the farther distance).
- Task modalness: entering Select mode now animates adjacent tasks
  at the same rate as the scaling up, because they move only the
  distance needed to get offscreen (before they moved way too far
  and thus seemed to be much faster than the rest of the animation).

Bug: 149934536
Change-Id: Ie3fffe0e5c304cb16e7637f058f5ce72cee40aeb
---
 .../QuickstepAtomicAnimationFactory.java      |   4 +-
 .../NoButtonQuickSwitchTouchController.java   |   7 +-
 .../FallbackRecentsStateController.java       |   4 +-
 .../quickstep/util/TaskViewSimulator.java     |   6 +-
 .../android/quickstep/views/RecentsView.java  | 126 ++++++++++++++++--
 .../BaseRecentsViewStateController.java       |   6 +-
 .../quickstep/BaseActivityInterface.java      |   4 +-
 src/com/android/launcher3/PagedView.java      |  21 ++-
 .../touch/LandscapePagedViewHandler.java      |   1 +
 .../touch/PagedOrientationHandler.java        |   1 +
 .../touch/PortraitPagedViewHandler.java       |   1 +
 11 files changed, 146 insertions(+), 35 deletions(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
index a0af79743b..131fcbfbf1 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
@@ -17,7 +17,6 @@ package com.android.launcher3.uioverrides.states;
 
 import static android.view.View.VISIBLE;
 
-import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
 import static com.android.launcher3.LauncherState.BACKGROUND_APP;
 import static com.android.launcher3.LauncherState.HINT_STATE;
 import static com.android.launcher3.LauncherState.HOTSEAT_ICONS;
@@ -52,6 +51,7 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_S
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_TRANSLATE;
 import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
 import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
+import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
@@ -212,7 +212,7 @@ public class QuickstepAtomicAnimationFactory extends
                 // Scale up the recents, if it is not coming from the side
                 RecentsView overview = mActivity.getOverviewPanel();
                 if (overview.getVisibility() != VISIBLE || overview.getContentAlpha() == 0) {
-                    SCALE_PROPERTY.set(overview, RECENTS_PREPARE_SCALE);
+                    RECENTS_SCALE_PROPERTY.set(overview, RECENTS_PREPARE_SCALE);
                 }
             }
             config.setInterpolator(ANIM_WORKSPACE_FADE, OVERSHOOT_1_2);
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
index 1b439d1d31..821ada400e 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
@@ -15,7 +15,6 @@
  */
 package com.android.launcher3.uioverrides.touchcontrollers;
 
-import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
 import static com.android.launcher3.LauncherState.HOTSEAT_ICONS;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
@@ -47,6 +46,7 @@ import static com.android.quickstep.util.ShelfPeekAnim.ShelfAnimState.HIDE;
 import static com.android.quickstep.util.ShelfPeekAnim.ShelfAnimState.PEEK;
 import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET;
 import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS;
+import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
 
 import android.animation.Animator;
@@ -244,7 +244,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
         final LauncherState toState = OVERVIEW;
 
         // Set RecentView's initial properties.
-        SCALE_PROPERTY.set(mRecentsView, fromState.getOverviewScaleAndOffset(mLauncher)[0]);
+        RECENTS_SCALE_PROPERTY.set(mRecentsView, fromState.getOverviewScaleAndOffset(mLauncher)[0]);
         ADJACENT_PAGE_OFFSET.set(mRecentsView, 1f);
         mRecentsView.setContentAlpha(1);
         mRecentsView.setFullscreenProgress(fromState.getOverviewFullscreenProgress());
@@ -266,7 +266,8 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
         //   - RecentsView scale
         //   - RecentsView fullscreenProgress
         PendingAnimation yAnim = new PendingAnimation((long) (mYRange * 2));
-        yAnim.setFloat(mRecentsView, SCALE_PROPERTY, scaleAndOffset[0], SCALE_DOWN_INTERPOLATOR);
+        yAnim.setFloat(mRecentsView, RECENTS_SCALE_PROPERTY, scaleAndOffset[0],
+                SCALE_DOWN_INTERPOLATOR);
         yAnim.setFloat(mRecentsView, FULLSCREEN_PROGRESS,
                 toState.getOverviewFullscreenProgress(), SCALE_DOWN_INTERPOLATOR);
         mYOverviewAnim = yAnim.createPlaybackController();
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsStateController.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
index 3f1e7bad9b..163c23268b 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
@@ -15,7 +15,6 @@
  */
 package com.android.quickstep.fallback;
 
-import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_MODAL;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE;
@@ -25,6 +24,7 @@ import static com.android.launcher3.states.StateAnimationConfig.PLAY_ATOMIC_OVER
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
 import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET;
 import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS;
+import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
 import static com.android.quickstep.views.RecentsView.TASK_MODALNESS;
 
 import com.android.launcher3.anim.PendingAnimation;
@@ -82,7 +82,7 @@ public class FallbackRecentsStateController implements StateHandler<RecentsState
                 MultiValueAlpha.VALUE, buttonAlpha, LINEAR);
 
         float[] scaleAndOffset = state.getOverviewScaleAndOffset(mActivity);
-        setter.setFloat(mRecentsView, SCALE_PROPERTY, scaleAndOffset[0],
+        setter.setFloat(mRecentsView, RECENTS_SCALE_PROPERTY, scaleAndOffset[0],
                 config.getInterpolator(ANIM_OVERVIEW_SCALE, LINEAR));
         setter.setFloat(mRecentsView, ADJACENT_PAGE_OFFSET, scaleAndOffset[1],
                 config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_X, LINEAR));
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java
index 2de4036f9e..94e496d183 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -32,7 +32,6 @@ import android.graphics.RectF;
 import android.util.IntProperty;
 
 import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.touch.PagedOrientationHandler;
@@ -94,7 +93,6 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
     public final AnimatedFloat recentsViewScale = new AnimatedFloat();
     public final AnimatedFloat fullScreenProgress = new AnimatedFloat();
     private final ScrollState mScrollState = new ScrollState();
-    private final int mPageSpacing;
 
     // Cached calculations
     private boolean mLayoutValid = false;
@@ -108,7 +106,6 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
         mOrientationState.setGestureActive(true);
 
         mCurrentFullscreenParams = new FullscreenDrawParams(context);
-        mPageSpacing = context.getResources().getDimensionPixelSize(R.dimen.recents_page_spacing);
     }
 
     /**
@@ -275,7 +272,8 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
             int start = mOrientationState.getOrientationHandler()
                     .getPrimaryValue(mTaskRect.left, mTaskRect.top);
             mScrollState.screenCenter = start + mScrollState.scroll + mScrollState.halfPageSize;
-            mScrollState.updateInterpolation(start, mPageSpacing);
+            mScrollState.pageParentScale = recentsViewScale.value;
+            mScrollState.updateInterpolation(start);
             mCurveScale = TaskView.getCurveScaleForInterpolation(mScrollState.linearInterpolation);
         }
 
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
index b478161f8e..dda2c5c230 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
@@ -22,7 +22,6 @@ import static android.view.View.MeasureSpec.makeMeasureSpec;
 
 import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS;
 import static com.android.launcher3.InvariantDeviceProfile.CHANGE_FLAG_ICON_PARAMS;
-import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
 import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA;
 import static com.android.launcher3.LauncherState.BACKGROUND_APP;
 import static com.android.launcher3.Utilities.EDGE_NAV_BAR;
@@ -62,6 +61,7 @@ import android.graphics.Canvas;
 import android.graphics.Point;
 import android.graphics.PointF;
 import android.graphics.Rect;
+import android.graphics.RectF;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
@@ -211,6 +211,23 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                 }
             };
 
+    /** Same as normal SCALE_PROPERTY, but also updates page offsets that depend on this scale. */
+    public static final FloatProperty<RecentsView> RECENTS_SCALE_PROPERTY =
+            new FloatProperty<RecentsView>("recentsScale") {
+                @Override
+                public void setValue(RecentsView view, float scale) {
+                    view.setScaleX(scale);
+                    view.setScaleY(scale);
+                    view.mLastComputedTaskPushOutDistance = null;
+                    view.updatePageOffsets();
+                }
+
+                @Override
+                public Float get(RecentsView view) {
+                    return view.getScaleX();
+                }
+            };
+
     protected RecentsOrientedState mOrientationState;
     protected final BaseActivityInterface mSizeStrategy;
     protected RecentsAnimationController mRecentsAnimationController;
@@ -219,8 +236,12 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     protected int mTaskHeight;
     protected final TransformParams mLiveTileParams = new TransformParams();
     protected final TaskViewSimulator mLiveTileTaskViewSimulator;
+    protected final Rect mLastComputedTaskSize = new Rect();
+    // How much a task that is directly offscreen will be pushed out due to RecentsView scale/pivot.
+    protected Float mLastComputedTaskPushOutDistance = null;
     protected boolean mEnableDrawingLiveTile = false;
     protected final Rect mTempRect = new Rect();
+    protected final RectF mTempRectF = new RectF();
     private final PointF mTempPointF = new PointF();
 
     private static final int DISMISS_TASK_DURATION = 300;
@@ -887,6 +908,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     public void getTaskSize(Rect outRect) {
         mSizeStrategy.calculateTaskSize(mActivity, mActivity.getDeviceProfile(), outRect,
                 mOrientationHandler);
+        mLastComputedTaskSize.set(outRect);
     }
 
     /** Gets the task size for modal state. */
@@ -934,8 +956,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         final int pageCount = getPageCount();
         for (int i = 0; i < pageCount; i++) {
             View page = getPageAt(i);
-            mScrollState.updateInterpolation(mOrientationHandler.getChildStartWithTranslation(page),
-                    mPageSpacing);
+            mScrollState.updateInterpolation(
+                    mOrientationHandler.getChildStartWithTranslation(page));
             ((PageCallbacks) page).onPageScroll(mScrollState);
         }
     }
@@ -1357,10 +1379,14 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         /**
          * Updates linearInterpolation for the provided child position
          */
-        public void updateInterpolation(float childStart, int pageSpacing) {
-            float pageCenter = childStart + halfPageSize;
+        public void updateInterpolation(float childStart) {
+            float scaledHalfPageSize = halfPageSize / pageParentScale;
+            float pageCenter = childStart + scaledHalfPageSize;
             float distanceFromScreenCenter = screenCenter - pageCenter;
-            float distanceToReachEdge = halfScreenSize + halfPageSize + pageSpacing;
+            // How far the page has to move from the center to be offscreen, taking into account
+            // the EDGE_SCALE_DOWN_FACTOR that will be applied at that position.
+            float distanceToReachEdge = halfScreenSize
+                    + scaledHalfPageSize * (1 - TaskView.EDGE_SCALE_DOWN_FACTOR);
             linearInterpolation = Math.min(1,
                     Math.abs(distanceFromScreenCenter) / distanceToReachEdge);
         }
@@ -1802,14 +1828,15 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         setPivotX(mTempPointF.x);
         setPivotY(mTempPointF.y);
         setTaskModalness(mTaskModalness);
+        mLastComputedTaskPushOutDistance = null;
         updatePageOffsets();
         setImportantForAccessibility(isModal() ? IMPORTANT_FOR_ACCESSIBILITY_NO
                 : IMPORTANT_FOR_ACCESSIBILITY_AUTO);
     }
 
     private void updatePageOffsets() {
-        float offset = mAdjacentPageOffset * getWidth();
-        float modalOffset = ACCEL_0_75.getInterpolation(mTaskModalness) * getWidth();
+        float offset = mAdjacentPageOffset;
+        float modalOffset = ACCEL_0_75.getInterpolation(mTaskModalness);
         if (mIsRtl) {
             offset = -offset;
             modalOffset = -modalOffset;
@@ -1818,18 +1845,89 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
 
         TaskView runningTask = mRunningTaskId == -1 || !mRunningTaskTileHidden
                 ? null : getTaskView(mRunningTaskId);
-        int midPoint = runningTask == null ? -1 : indexOfChild(runningTask);
-        int currentPage = getCurrentPage();
+        int midpoint = runningTask == null ? -1 : indexOfChild(runningTask);
+        int modalMidpoint = getCurrentPage();
+
+        float midpointOffsetSize = 0;
+        float leftOffsetSize = midpoint - 1 >= 0
+                ? -getOffsetSize(midpoint - 1, midpoint, offset)
+                : 0;
+        float rightOffsetSize = midpoint + 1 < count
+                ? getOffsetSize(midpoint + 1, midpoint, offset)
+                : 0;
+
+        float modalMidpointOffsetSize = 0;
+        float modalLeftOffsetSize = modalMidpoint - 1 >= 0
+                ? -getOffsetSize(modalMidpoint - 1, modalMidpoint, modalOffset)
+                : 0;
+        float modalRightOffsetSize = modalMidpoint + 1 < count
+                ? getOffsetSize(modalMidpoint + 1, modalMidpoint, modalOffset)
+                : 0;
 
         for (int i = 0; i < count; i++) {
-            float translation = i == midPoint ? 0 : (i < midPoint ? -offset : offset);
-            float modalTranslation =
-                    i == currentPage ? 0 : (i < currentPage ? -modalOffset : modalOffset);
+            float translation = i == midpoint
+                    ? midpointOffsetSize
+                    : i < midpoint
+                            ? leftOffsetSize
+                            : rightOffsetSize;
+            float modalTranslation = i == modalMidpoint
+                    ? modalMidpointOffsetSize
+                    : i < modalMidpoint
+                            ? modalLeftOffsetSize
+                            : modalRightOffsetSize;
             getChildAt(i).setTranslationX(translation + modalTranslation);
         }
         updateCurveProperties();
     }
 
+    /**
+     * Computes the distance to offset the given child such that it is completely offscreen when
+     * translating away from the given midpoint.
+     * @param offsetProgress From 0 to 1 where 0 means no offset and 1 means offset offscreen.
+     */
+    private float getOffsetSize(int childIndex, int midpointIndex, float offsetProgress) {
+        if (offsetProgress == 0) {
+            // Don't bother calculating everything below if we won't offset anyway.
+            return 0;
+        }
+        // First, get the position of the task relative to the midpoint. If there is no midpoint
+        // then we just use the normal (centered) task position.
+        mTempRectF.set(mLastComputedTaskSize);
+        RectF taskPosition = mTempRectF;
+        float desiredLeft = getWidth();
+        float distanceToOffscreen = desiredLeft - taskPosition.left;
+        // Used to calculate the scale of the task view based on its new offset.
+        float centerToOffscreenProgress = Math.abs(offsetProgress);
+        if (midpointIndex > -1) {
+            // When there is a midpoint reference task, adjacent tasks have less distance to travel
+            // to reach offscreen. Offset the task position to the task's starting point.
+            View child = getChildAt(childIndex);
+            View midpointChild = getChildAt(midpointIndex);
+            int distanceFromMidpoint = Math.abs(mOrientationHandler.getChildStart(child)
+                    - mOrientationHandler.getChildStart(midpointChild)
+                    + getDisplacementFromScreenCenter(midpointIndex));
+            taskPosition.offset(distanceFromMidpoint, 0);
+            centerToOffscreenProgress = Utilities.mapRange(centerToOffscreenProgress,
+                    distanceFromMidpoint / distanceToOffscreen, 1);
+        }
+        // Find the task's scale based on its offscreen progress, then see how far it still needs to
+        // move to be completely offscreen.
+        Utilities.scaleRectFAboutCenter(taskPosition,
+                TaskView.getCurveScaleForInterpolation(centerToOffscreenProgress));
+        distanceToOffscreen = desiredLeft - taskPosition.left;
+        // Finally, we need to account for RecentsView scale, because it moves tasks based on its
+        // pivot. To do this, we move the task position to where it would be offscreen at scale = 1
+        // (computed above), then we apply the scale via getMatrix() to determine how much that
+        // moves the task from its desired position, and adjust the computed distance accordingly.
+        if (mLastComputedTaskPushOutDistance == null) {
+            taskPosition.offsetTo(desiredLeft, 0);
+            getMatrix().mapRect(taskPosition);
+            mLastComputedTaskPushOutDistance = (taskPosition.left - desiredLeft) / getScaleX();
+        }
+        distanceToOffscreen -= mLastComputedTaskPushOutDistance;
+        return distanceToOffscreen * offsetProgress;
+    }
+
     /**
      * TODO: Do not assume motion across X axis for adjacent page
      */
@@ -1928,7 +2026,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         float toScale = getMaxScaleForFullScreen();
         if (launchingCenterTask) {
             RecentsView recentsView = tv.getRecentsView();
-            anim.play(ObjectAnimator.ofFloat(recentsView, SCALE_PROPERTY, toScale));
+            anim.play(ObjectAnimator.ofFloat(recentsView, RECENTS_SCALE_PROPERTY, toScale));
             anim.play(ObjectAnimator.ofFloat(recentsView, FULLSCREEN_PROGRESS, 1));
         } else {
             // We are launching an adjacent task, so parallax the center and other adjacent task.
diff --git a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
index ec3a4905f5..6e120e8bd8 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
@@ -16,7 +16,6 @@
 
 package com.android.launcher3.uioverrides;
 
-import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
 import static com.android.launcher3.anim.Interpolators.AGGRESSIVE_EASE_IN_OUT;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.graphics.Scrim.SCRIM_PROGRESS;
@@ -29,6 +28,7 @@ import static com.android.launcher3.states.StateAnimationConfig.PLAY_ATOMIC_OVER
 import static com.android.launcher3.states.StateAnimationConfig.PLAY_ATOMIC_OVERVIEW_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
 import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET;
+import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
 
 import android.util.FloatProperty;
 
@@ -61,7 +61,7 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView>
     @Override
     public void setState(@NonNull LauncherState state) {
         float[] scaleAndOffset = state.getOverviewScaleAndOffset(mLauncher);
-        SCALE_PROPERTY.set(mRecentsView, scaleAndOffset[0]);
+        RECENTS_SCALE_PROPERTY.set(mRecentsView, scaleAndOffset[0]);
         ADJACENT_PAGE_OFFSET.set(mRecentsView, scaleAndOffset[1]);
 
         getContentAlphaProperty().set(mRecentsView, state.overviewUi ? 1f : 0);
@@ -93,7 +93,7 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView>
     void setStateWithAnimationInternal(@NonNull final LauncherState toState,
             @NonNull StateAnimationConfig config, @NonNull PendingAnimation setter) {
         float[] scaleAndOffset = toState.getOverviewScaleAndOffset(mLauncher);
-        setter.setFloat(mRecentsView, SCALE_PROPERTY, scaleAndOffset[0],
+        setter.setFloat(mRecentsView, RECENTS_SCALE_PROPERTY, scaleAndOffset[0],
                 config.getInterpolator(ANIM_OVERVIEW_SCALE, LINEAR));
         setter.setFloat(mRecentsView, ADJACENT_PAGE_OFFSET, scaleAndOffset[1],
                 config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_X, LINEAR));
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index 0ae386f39a..9dc2132683 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -15,7 +15,6 @@
  */
 package com.android.quickstep;
 
-import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
 import static com.android.launcher3.anim.Interpolators.ACCEL_2;
 import static com.android.launcher3.anim.Interpolators.INSTANT;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
@@ -28,6 +27,7 @@ import static com.android.quickstep.util.RecentsAtomicAnimationFactory.INDEX_REC
 import static com.android.quickstep.util.RecentsAtomicAnimationFactory.INDEX_RECENTS_TRANSLATE_X_ANIM;
 import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET;
 import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS;
+import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
 
 import android.animation.Animator;
 import android.annotation.TargetApi;
@@ -393,7 +393,7 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
         protected void createBackgroundToOverviewAnim(ACTIVITY_TYPE activity, PendingAnimation pa) {
             //  Scale down recents from being full screen to being in overview.
             RecentsView recentsView = activity.getOverviewPanel();
-            pa.addFloat(recentsView, SCALE_PROPERTY,
+            pa.addFloat(recentsView, RECENTS_SCALE_PROPERTY,
                     recentsView.getMaxScaleForFullScreen(), 1, LINEAR);
             pa.addFloat(recentsView, FULLSCREEN_PROGRESS, 1, 0, LINEAR);
         }
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index e29faacd97..e13d89f184 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1448,11 +1448,8 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         int minDistanceFromScreenCenterIndex = -1;
         final int childCount = getChildCount();
         for (int i = 0; i < childCount; ++i) {
-            View layout = getPageAt(i);
-            int childSize = mOrientationHandler.getMeasuredSize(layout);
-            int halfChildSize = (childSize / 2);
-            int childCenter = getChildOffset(i) + halfChildSize;
-            int distanceFromScreenCenter = Math.abs(childCenter - screenCenter);
+            int distanceFromScreenCenter = Math.abs(
+                    getDisplacementFromScreenCenter(i, screenCenter));
             if (distanceFromScreenCenter < minDistanceFromScreenCenter) {
                 minDistanceFromScreenCenter = distanceFromScreenCenter;
                 minDistanceFromScreenCenterIndex = i;
@@ -1461,6 +1458,20 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         return minDistanceFromScreenCenterIndex;
     }
 
+    private int getDisplacementFromScreenCenter(int childIndex, int screenCenter) {
+        View layout = getPageAt(childIndex);
+        int childSize = mOrientationHandler.getMeasuredSize(layout);
+        int halfChildSize = (childSize / 2);
+        int childCenter = getChildOffset(childIndex) + halfChildSize;
+        return childCenter - screenCenter;
+    }
+
+    protected int getDisplacementFromScreenCenter(int childIndex) {
+        int pageOrientationSize = mOrientationHandler.getMeasuredSize(this);
+        int screenCenter = mOrientationHandler.getPrimaryScroll(this) + (pageOrientationSize / 2);
+        return getDisplacementFromScreenCenter(childIndex, screenCenter);
+    }
+
     protected void snapToDestination() {
         snapToPage(getPageNearestToCenterOfScreen(), getPageSnapDuration());
     }
diff --git a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
index ac1ade260d..1aaa608657 100644
--- a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
+++ b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
@@ -72,6 +72,7 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
         out.halfPageSize = view.getNormalChildHeight() / 2;
         out.halfScreenSize = view.getMeasuredHeight() / 2;
         out.screenCenter = insets.top + view.getPaddingTop() + out.scroll + out.halfPageSize;
+        out.pageParentScale = view.getScaleY();
     }
 
     @Override
diff --git a/src/com/android/launcher3/touch/PagedOrientationHandler.java b/src/com/android/launcher3/touch/PagedOrientationHandler.java
index d4f5cba40e..f88cdb3b0d 100644
--- a/src/com/android/launcher3/touch/PagedOrientationHandler.java
+++ b/src/com/android/launcher3/touch/PagedOrientationHandler.java
@@ -109,6 +109,7 @@ public interface PagedOrientationHandler {
         public int halfPageSize;
         public int screenCenter;
         public int halfScreenSize;
+        public float pageParentScale;
     }
 
     class ChildBounds {
diff --git a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
index 3341996383..f18b109515 100644
--- a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
+++ b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
@@ -70,6 +70,7 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
         out.halfPageSize = view.getNormalChildWidth() / 2;
         out.halfScreenSize = view.getMeasuredWidth() / 2;
         out.screenCenter = insets.left + view.getPaddingLeft() + out.scroll + out.halfPageSize;
+        out.pageParentScale = view.getScaleX();
     }
 
     @Override
-- 
GitLab


From 8b74cc761b5a3185f3cfffe0a3833bbf7dd32636 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Mon, 27 Jul 2020 17:50:33 -0700
Subject: [PATCH 0055/1664] Moving all-apps predictions to Launcher model

Predictions are loaded and managed by Launcher model and follow
the model lifecycle. They are then bound to the callback which
handles the UI

Bug: 160748731
Change-Id: I4a3ea0698d80fafe94afb4ce66ffa7f4a6a91c68
---
 .../res/values/override.xml                   |   5 +-
 .../appprediction/PredictionRowView.java      |  78 +---
 .../PredictionUiStateManager.java             | 348 ------------------
 .../AppEventProducer.java}                    | 125 +------
 .../launcher3/model/PredictionUpdateTask.java | 117 ++++++
 .../model/QuickstepModelDelegate.java         | 138 +++++++
 .../uioverrides/QuickstepLauncher.java        |  39 +-
 .../quickstep/LauncherActivityInterface.java  |   1 -
 ...EventDispatcherAppPredictionExtension.java |  49 ---
 .../quickstep/AppPredictionsUITests.java      | 162 --------
 res/values/config.xml                         |   1 +
 src/com/android/launcher3/Launcher.java       |   5 +-
 .../android/launcher3/LauncherAppState.java   |   3 +-
 src/com/android/launcher3/LauncherModel.java  |  30 +-
 .../graphics/LauncherPreviewRenderer.java     |   3 +-
 .../launcher3/model/AppLaunchTracker.java     |  33 --
 .../android/launcher3/model/BgDataModel.java  |   7 -
 .../android/launcher3/model/LoaderTask.java   |   7 +-
 .../launcher3/model/ModelDelegate.java        |  75 ++++
 .../launcher3/ui/AbstractLauncherUiTest.java  |   3 -
 20 files changed, 424 insertions(+), 805 deletions(-)
 delete mode 100644 quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionUiStateManager.java
 rename quickstep/recents_ui_overrides/src/com/android/launcher3/{appprediction/PredictionAppTracker.java => model/AppEventProducer.java} (65%)
 create mode 100644 quickstep/recents_ui_overrides/src/com/android/launcher3/model/PredictionUpdateTask.java
 create mode 100644 quickstep/recents_ui_overrides/src/com/android/launcher3/model/QuickstepModelDelegate.java
 delete mode 100644 quickstep/recents_ui_overrides/src/com/android/quickstep/logging/UserEventDispatcherAppPredictionExtension.java
 delete mode 100644 quickstep/tests/src/com/android/quickstep/AppPredictionsUITests.java
 delete mode 100644 src/com/android/launcher3/model/AppLaunchTracker.java
 create mode 100644 src/com/android/launcher3/model/ModelDelegate.java

diff --git a/quickstep/recents_ui_overrides/res/values/override.xml b/quickstep/recents_ui_overrides/res/values/override.xml
index 6aa9619cc9..1937164b7d 100644
--- a/quickstep/recents_ui_overrides/res/values/override.xml
+++ b/quickstep/recents_ui_overrides/res/values/override.xml
@@ -25,8 +25,11 @@
 
   <string name="main_process_initializer_class" translatable="false">com.android.quickstep.QuickstepProcessInitializer</string>
 
-  <string name="user_event_dispatcher_class" translatable="false">com.android.quickstep.logging.UserEventDispatcherAppPredictionExtension</string>
+  <string name="user_event_dispatcher_class" translatable="false">com.android.quickstep.logging.UserEventDispatcherExtension</string>
 
   <string name="prediction_model_class" translatable="false">com.android.launcher3.hybridhotseat.HotseatPredictionModel</string>
+
+  <string name="model_delegate_class" translatable="false">com.android.launcher3.model.QuickstepModelDelegate</string>
+
 </resources>
 
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java
index e11c701640..55384af96b 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java
@@ -30,7 +30,6 @@ import android.graphics.Rect;
 import android.os.Build;
 import android.util.AttributeSet;
 import android.util.IntProperty;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.animation.Interpolator;
@@ -44,19 +43,15 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
-import com.android.launcher3.allapps.AllAppsStore;
 import com.android.launcher3.allapps.FloatingHeaderRow;
 import com.android.launcher3.allapps.FloatingHeaderView;
 import com.android.launcher3.anim.AlphaUpdateListener;
 import com.android.launcher3.anim.PropertySetter;
-import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.keyboard.FocusIndicatorHelper;
 import com.android.launcher3.keyboard.FocusIndicatorHelper.SimpleFocusIndicatorHelper;
 import com.android.launcher3.logging.StatsLogUtils.LogContainerProvider;
-import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
@@ -67,15 +62,12 @@ import com.android.launcher3.util.Themes;
 import com.android.quickstep.AnimatedFloat;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 @TargetApi(Build.VERSION_CODES.P)
 public class PredictionRowView extends LinearLayout implements
         LogContainerProvider, OnDeviceProfileChangeListener, FloatingHeaderRow {
 
-    private static final String TAG = "PredictionRowView";
-
     private static final IntProperty<PredictionRowView> TEXT_ALPHA =
             new IntProperty<PredictionRowView>("textAlpha") {
                 @Override
@@ -93,16 +85,14 @@ public class PredictionRowView extends LinearLayout implements
             (t) -> (t < 0.8f) ? 0 : (t - 0.8f) / 0.2f;
 
     private final Launcher mLauncher;
-    private final PredictionUiStateManager mPredictionUiStateManager;
     private int mNumPredictedAppsPerRow;
 
-    // The set of predicted app component names
-    private final List<ComponentKeyMapper> mPredictedAppComponents = new ArrayList<>();
-    // The set of predicted apps resolved from the component names and the current set of apps
-    private final ArrayList<ItemInfoWithIcon> mPredictedApps = new ArrayList<>();
     // Helper to drawing the focus indicator.
     private final FocusIndicatorHelper mFocusHelper;
 
+    // The set of predicted apps resolved from the component names and the current set of apps
+    private final List<WorkspaceItemInfo> mPredictedApps = new ArrayList<>();
+
     private final int mIconTextColor;
     private final int mIconFullTextAlpha;
     private int mIconLastSetTextAlpha;
@@ -134,8 +124,6 @@ public class PredictionRowView extends LinearLayout implements
         mLauncher = Launcher.getLauncher(context);
         mLauncher.addOnDeviceProfileChangeListener(this);
 
-        mPredictionUiStateManager = PredictionUiStateManager.INSTANCE.get(context);
-
         mIconTextColor = Themes.getAttrColor(context, android.R.attr.textColorSecondary);
         mIconFullTextAlpha = Color.alpha(mIconTextColor);
         mIconCurrentTextAlpha = mIconFullTextAlpha;
@@ -146,24 +134,9 @@ public class PredictionRowView extends LinearLayout implements
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
-
-        mPredictionUiStateManager.setTargetAppsView(mLauncher.getAppsView());
-        getAppsStore().registerIconContainer(this);
         AllAppsTipView.scheduleShowIfNeeded(mLauncher);
     }
 
-    private AllAppsStore getAppsStore() {
-        return mLauncher.getAppsView().getAppsStore();
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-
-        mPredictionUiStateManager.setTargetAppsView(null);
-        getAppsStore().unregisterIconContainer(this);
-    }
-
     public void setup(FloatingHeaderView parent, FloatingHeaderRow[] rows, boolean tabsHidden) {
         mParent = parent;
     }
@@ -205,7 +178,7 @@ public class PredictionRowView extends LinearLayout implements
      * Returns the predicted apps.
      */
     public List<ItemInfoWithIcon> getPredictedApps() {
-        return mPredictedApps;
+        return new ArrayList<>(mPredictedApps);
     }
 
     /**
@@ -217,12 +190,12 @@ public class PredictionRowView extends LinearLayout implements
      * If the number of predicted apps is the same as the previous list of predicted apps,
      * we can optimize by swapping them in place.
      */
-    public void setPredictedApps(List<ComponentKeyMapper> apps) {
-        mPredictedAppComponents.clear();
-        mPredictedAppComponents.addAll(apps);
-
+    public void setPredictedApps(List<ItemInfo> items) {
         mPredictedApps.clear();
-        mPredictedApps.addAll(processPredictedAppComponents(mPredictedAppComponents));
+        items.stream()
+                .filter(itemInfo -> itemInfo instanceof WorkspaceItemInfo)
+                .map(itemInfo -> (WorkspaceItemInfo) itemInfo)
+                .forEach(mPredictedApps::add);
         applyPredictionApps();
     }
 
@@ -264,11 +237,7 @@ public class PredictionRowView extends LinearLayout implements
             icon.reset();
             if (predictionCount > i) {
                 icon.setVisibility(View.VISIBLE);
-                if (mPredictedApps.get(i) instanceof AppInfo) {
-                    icon.applyFromApplicationInfo((AppInfo) mPredictedApps.get(i));
-                } else if (mPredictedApps.get(i) instanceof WorkspaceItemInfo) {
-                    icon.applyFromWorkspaceItem((WorkspaceItemInfo) mPredictedApps.get(i));
-                }
+                icon.applyFromWorkspaceItem(mPredictedApps.get(i));
                 icon.setTextColor(iconColor);
             } else {
                 icon.setVisibility(predictionCount == 0 ? GONE : INVISIBLE);
@@ -284,33 +253,6 @@ public class PredictionRowView extends LinearLayout implements
         mParent.onHeightUpdated();
     }
 
-    private List<ItemInfoWithIcon> processPredictedAppComponents(
-            List<ComponentKeyMapper> components) {
-        if (getAppsStore().getApps().length == 0) {
-            // Apps have not been bound yet.
-            return Collections.emptyList();
-        }
-
-        List<ItemInfoWithIcon> predictedApps = new ArrayList<>();
-        for (ComponentKeyMapper mapper : components) {
-            ItemInfoWithIcon info = mapper.getApp(getAppsStore());
-            if (info != null) {
-                ItemInfoWithIcon predictedApp = info.clone();
-                predictedApp.container = LauncherSettings.Favorites.CONTAINER_PREDICTION;
-                predictedApps.add(predictedApp);
-            } else {
-                if (FeatureFlags.IS_STUDIO_BUILD) {
-                    Log.e(TAG, "Predicted app not found: " + mapper);
-                }
-            }
-            // Stop at the number of predicted apps
-            if (predictedApps.size() == mNumPredictedAppsPerRow) {
-                break;
-            }
-        }
-        return predictedApps;
-    }
-
     @Override
     public void fillInLogContainerData(ItemInfo childInfo, LauncherLogProto.Target child,
             ArrayList<LauncherLogProto.Target> parents) {
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionUiStateManager.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionUiStateManager.java
deleted file mode 100644
index 830c1032ba..0000000000
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionUiStateManager.java
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.appprediction;
-
-import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
-import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT;
-import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT;
-import static com.android.launcher3.LauncherState.BACKGROUND_APP;
-import static com.android.launcher3.LauncherState.OVERVIEW;
-
-import android.app.prediction.AppPredictor;
-import android.app.prediction.AppTarget;
-import android.content.ComponentName;
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.InvariantDeviceProfile;
-import com.android.launcher3.InvariantDeviceProfile.OnIDPChangeListener;
-import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.LauncherSettings;
-import com.android.launcher3.LauncherState;
-import com.android.launcher3.Utilities;
-import com.android.launcher3.allapps.AllAppsContainerView;
-import com.android.launcher3.allapps.AllAppsStore.OnUpdateListener;
-import com.android.launcher3.hybridhotseat.HotseatPredictionController;
-import com.android.launcher3.icons.IconCache.ItemInfoUpdateReceiver;
-import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.model.data.ItemInfoWithIcon;
-import com.android.launcher3.shortcuts.ShortcutKey;
-import com.android.launcher3.statemanager.StateManager.StateListener;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
-import com.android.launcher3.util.ComponentKey;
-import com.android.launcher3.util.MainThreadInitializedObject;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.OptionalInt;
-import java.util.stream.IntStream;
-
-/**
- * Handler responsible to updating the UI due to predicted apps changes. Operations:
- * 1) Pushes the predicted apps to all-apps. If all-apps is visible, waits until it becomes
- * invisible again before applying the changes. This ensures that the UI does not change abruptly
- * in front of the user, even if an app launched and user pressed back button to return to the
- * all-apps UI again.
- * 2) Prefetch high-res icons for predicted apps. This ensures that we have the icons in memory
- * even if all-apps is not opened as they are shown in search UI as well
- * 3) Load instant app if it is not already in memory. As predictions are persisted on disk,
- * instant app will not be in memory when launcher starts.
- * 4) Maintains the current active client id (for the predictions) and all updates are performed on
- * that client id.
- */
-public class PredictionUiStateManager implements StateListener<LauncherState>,
-        ItemInfoUpdateReceiver, OnIDPChangeListener, OnUpdateListener {
-
-    public static final String LAST_PREDICTION_ENABLED_STATE = "last_prediction_enabled_state";
-
-    // TODO (b/129421797): Update the client constants
-    public enum Client {
-        HOME("home");
-
-        public final String id;
-
-        Client(String id) {
-            this.id = id;
-        }
-    }
-
-    public static final MainThreadInitializedObject<PredictionUiStateManager> INSTANCE =
-            new MainThreadInitializedObject<>(PredictionUiStateManager::new);
-
-    private final Context mContext;
-
-    private final DynamicItemCache mDynamicItemCache;
-    private List mPredictionServicePredictions = Collections.emptyList();
-
-    private int mMaxIconsPerRow;
-
-    private AllAppsContainerView mAppsView;
-
-    private PredictionState mPendingState;
-    private PredictionState mCurrentState;
-
-    private boolean mGettingValidPredictionResults;
-
-    private PredictionUiStateManager(Context context) {
-        mContext = context;
-
-        mDynamicItemCache = new DynamicItemCache(context, this::onAppsUpdated);
-
-        InvariantDeviceProfile idp = LauncherAppState.getIDP(context);
-        mMaxIconsPerRow = idp.numColumns;
-
-        idp.addOnChangeListener(this);
-        mGettingValidPredictionResults = Utilities.getDevicePrefs(context)
-                .getBoolean(LAST_PREDICTION_ENABLED_STATE, true);
-
-        // Call this last
-        mCurrentState = parseLastState();
-    }
-
-    @Override
-    public void onIdpChanged(int changeFlags, InvariantDeviceProfile profile) {
-        mMaxIconsPerRow = profile.numColumns;
-    }
-
-    public void setTargetAppsView(AllAppsContainerView appsView) {
-        if (mAppsView != null) {
-            mAppsView.getAppsStore().removeUpdateListener(this);
-        }
-        mAppsView = appsView;
-        if (mAppsView != null) {
-            mAppsView.getAppsStore().addUpdateListener(this);
-        }
-        if (mPendingState != null) {
-            applyState(mPendingState);
-            mPendingState = null;
-        } else {
-            applyState(mCurrentState);
-        }
-        updateDependencies(mCurrentState);
-    }
-
-    @Override
-    public void reapplyItemInfo(ItemInfoWithIcon info) { }
-
-    @Override
-    public void onStateTransitionComplete(LauncherState state) {
-        if (mAppsView == null) {
-            return;
-        }
-        if (mPendingState != null && canApplyPredictions(mPendingState)) {
-            applyState(mPendingState);
-            mPendingState = null;
-        }
-        if (mPendingState == null) {
-            Launcher.getLauncher(mAppsView.getContext()).getStateManager()
-                    .removeStateListener(this);
-        }
-    }
-
-    private void scheduleApplyPredictedApps(PredictionState state) {
-        boolean registerListener = mPendingState == null;
-        mPendingState = state;
-        if (registerListener) {
-            // Add a listener and wait until appsView is invisible again.
-            Launcher.getLauncher(mAppsView.getContext()).getStateManager().addStateListener(this);
-        }
-    }
-
-    private void applyState(PredictionState state) {
-        mCurrentState = state;
-        if (mAppsView != null) {
-            mAppsView.getFloatingHeaderView().findFixedRowByType(PredictionRowView.class)
-                    .setPredictedApps(mCurrentState.apps);
-        }
-    }
-
-    private void updatePredictionStateAfterCallback() {
-        boolean validResults = mPredictionServicePredictions != null
-                && !mPredictionServicePredictions.isEmpty();
-        if (validResults != mGettingValidPredictionResults) {
-            mGettingValidPredictionResults = validResults;
-            Utilities.getDevicePrefs(mContext).edit()
-                    .putBoolean(LAST_PREDICTION_ENABLED_STATE, true)
-                    .apply();
-        }
-        dispatchOnChange(true);
-    }
-
-    public AppPredictor.Callback appPredictorCallback(Client client) {
-        return targets -> {
-            mPredictionServicePredictions = targets;
-            updatePredictionStateAfterCallback();
-        };
-    }
-
-    private void dispatchOnChange(boolean changed) {
-        PredictionState newState = changed
-                ? parseLastState()
-                : mPendingState != null && canApplyPredictions(mPendingState)
-                        ? mPendingState
-                        : mCurrentState;
-        if (changed && mAppsView != null && !canApplyPredictions(newState)) {
-            scheduleApplyPredictedApps(newState);
-        } else {
-            applyState(newState);
-        }
-    }
-
-    private PredictionState parseLastState() {
-        PredictionState state = new PredictionState();
-        state.isEnabled = mGettingValidPredictionResults;
-        if (!state.isEnabled) {
-            state.apps = Collections.EMPTY_LIST;
-            return state;
-        }
-
-        state.apps = new ArrayList<>();
-
-        List<AppTarget> appTargets = mPredictionServicePredictions;
-        if (!appTargets.isEmpty()) {
-            for (AppTarget appTarget : appTargets) {
-                ComponentKey key;
-                if (appTarget.getShortcutInfo() != null) {
-                    key = ShortcutKey.fromInfo(appTarget.getShortcutInfo());
-                } else {
-                    key = new ComponentKey(new ComponentName(appTarget.getPackageName(),
-                            appTarget.getClassName()), appTarget.getUser());
-                }
-                state.apps.add(new ComponentKeyMapper(key, mDynamicItemCache));
-            }
-        }
-        updateDependencies(state);
-        return state;
-    }
-
-    private void updateDependencies(PredictionState state) {
-        if (!state.isEnabled || mAppsView == null) {
-            return;
-        }
-        mDynamicItemCache.updateDependencies(state.apps, mAppsView.getAppsStore(), this,
-                mMaxIconsPerRow);
-    }
-
-    @Override
-    public void onAppsUpdated() {
-        dispatchOnChange(false);
-    }
-
-    private boolean canApplyPredictions(PredictionState newState) {
-        if (mAppsView == null) {
-            // If there is no apps view, no need to schedule.
-            return true;
-        }
-        Launcher launcher = Launcher.getLauncher(mAppsView.getContext());
-        PredictionRowView predictionRow = mAppsView.getFloatingHeaderView().
-                findFixedRowByType(PredictionRowView.class);
-        if (!predictionRow.isShown() || predictionRow.getAlpha() == 0 ||
-                launcher.isForceInvisible()) {
-            return true;
-        }
-
-        if (mCurrentState.isEnabled != newState.isEnabled
-                || mCurrentState.apps.isEmpty() != newState.apps.isEmpty()) {
-            // If the visibility of the prediction row is changing, apply immediately.
-            return true;
-        }
-
-        if (launcher.getDeviceProfile().isVerticalBarLayout()) {
-            // If we are here & mAppsView.isShown() = true, we are probably in all-apps or mid way
-            return false;
-        }
-        if (!launcher.isInState(OVERVIEW) && !launcher.isInState(BACKGROUND_APP)) {
-            // Just a fallback as we dont need to apply instantly, if we are not in the swipe-up UI
-            return false;
-        }
-
-        // Instead of checking against 1, we should check against (1 + delta), where delta accounts
-        // for the nav-bar height (as app icon can still be visible under the nav-bar). Checking
-        // against 1, keeps the logic simple :)
-        return launcher.getAllAppsController().getProgress() > 1;
-    }
-
-    public PredictionState getCurrentState() {
-        return mCurrentState;
-    }
-
-    /**
-     * Returns ranking info for the app within all apps prediction.
-     * Only applicable when {@link ItemInfo#itemType} is one of the followings:
-     * {@link LauncherSettings.Favorites#ITEM_TYPE_APPLICATION},
-     * {@link LauncherSettings.Favorites#ITEM_TYPE_SHORTCUT},
-     * {@link LauncherSettings.Favorites#ITEM_TYPE_DEEP_SHORTCUT}
-     */
-    public OptionalInt getAllAppsRank(@Nullable ItemInfo itemInfo) {
-        if (itemInfo == null || itemInfo.getTargetComponent() == null || itemInfo.user == null) {
-            return OptionalInt.empty();
-        }
-
-        if (itemInfo.itemType == ITEM_TYPE_APPLICATION
-                || itemInfo.itemType == ITEM_TYPE_SHORTCUT
-                || itemInfo.itemType == ITEM_TYPE_DEEP_SHORTCUT) {
-            ComponentKey key = new ComponentKey(itemInfo.getTargetComponent(),
-                    itemInfo.user);
-            final List<ComponentKeyMapper> apps = getCurrentState().apps;
-            return IntStream.range(0, apps.size())
-                    .filter(index -> key.equals(apps.get(index).getComponentKey()))
-                    .findFirst();
-        }
-
-        return OptionalInt.empty();
-    }
-
-    /**
-     * Fill in predicted_rank field based on app prediction.
-     * Only applicable when {@link ItemInfo#itemType} is one of the followings:
-     * {@link LauncherSettings.Favorites#ITEM_TYPE_APPLICATION},
-     * {@link LauncherSettings.Favorites#ITEM_TYPE_SHORTCUT},
-     * {@link LauncherSettings.Favorites#ITEM_TYPE_DEEP_SHORTCUT}
-     */
-    public static void fillInPredictedRank(
-            @NonNull ItemInfo itemInfo, @NonNull LauncherLogProto.Target target) {
-
-        final PredictionUiStateManager manager = PredictionUiStateManager.INSTANCE.getNoCreate();
-        if (manager == null || itemInfo.getTargetComponent() == null || itemInfo.user == null
-                || (itemInfo.itemType != LauncherSettings.Favorites.ITEM_TYPE_APPLICATION
-                && itemInfo.itemType != LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT
-                && itemInfo.itemType != LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT)) {
-            return;
-        }
-        if (itemInfo.container != LauncherSettings.Favorites.CONTAINER_PREDICTION) {
-            HotseatPredictionController.encodeHotseatLayoutIntoPredictionRank(itemInfo, target);
-            return;
-        }
-
-        final ComponentKey k = new ComponentKey(itemInfo.getTargetComponent(), itemInfo.user);
-        final List<ComponentKeyMapper> predictedApps = manager.getCurrentState().apps;
-        IntStream.range(0, predictedApps.size())
-                .filter((i) -> k.equals(predictedApps.get(i).getComponentKey()))
-                .findFirst()
-                .ifPresent((rank) -> target.predictedRank = 0 - rank);
-    }
-
-    public static class PredictionState {
-
-        public boolean isEnabled;
-        public List<ComponentKeyMapper> apps;
-    }
-}
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionAppTracker.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/model/AppEventProducer.java
similarity index 65%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionAppTracker.java
rename to quickstep/recents_ui_overrides/src/com/android/launcher3/model/AppEventProducer.java
index 8cabe3d80b..8e4c43f464 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionAppTracker.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/model/AppEventProducer.java
@@ -13,175 +13,76 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.launcher3.appprediction;
+package com.android.launcher3.model;
 
-import static com.android.launcher3.InvariantDeviceProfile.CHANGE_FLAG_GRID;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_APP_LAUNCH_TAP;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ITEM_DROPPED_ON_DONT_SUGGEST;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_QUICKSWITCH_LEFT;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_QUICKSWITCH_RIGHT;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_SWIPE_DOWN;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_TAP;
-import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
 import android.annotation.TargetApi;
-import android.app.prediction.AppPredictionContext;
-import android.app.prediction.AppPredictionManager;
-import android.app.prediction.AppPredictor;
 import android.app.prediction.AppTarget;
 import android.app.prediction.AppTargetEvent;
 import android.app.prediction.AppTargetId;
 import android.content.ComponentName;
 import android.content.Context;
 import android.os.Build;
-import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Process;
 import android.os.SystemClock;
 import android.os.UserHandle;
 import android.text.TextUtils;
-import android.util.Log;
 
 import androidx.annotation.AnyThread;
 import androidx.annotation.Nullable;
-import androidx.annotation.UiThread;
 import androidx.annotation.WorkerThread;
 
-import com.android.launcher3.InvariantDeviceProfile;
-import com.android.launcher3.appprediction.PredictionUiStateManager.Client;
 import com.android.launcher3.logger.LauncherAtom;
 import com.android.launcher3.logger.LauncherAtom.ContainerInfo;
 import com.android.launcher3.logger.LauncherAtom.FolderContainer;
 import com.android.launcher3.logger.LauncherAtom.HotseatContainer;
 import com.android.launcher3.logger.LauncherAtom.WorkspaceContainer;
 import com.android.launcher3.logging.StatsLogManager.EventEnum;
-import com.android.launcher3.model.AppLaunchTracker;
 import com.android.launcher3.pm.UserCache;
-import com.android.quickstep.logging.StatsLogCompatManager;
 import com.android.quickstep.logging.StatsLogCompatManager.StatsLogConsumer;
 
 import java.util.Locale;
+import java.util.function.Consumer;
 import java.util.function.Predicate;
 
 /**
- * Subclass of app tracker which publishes the data to the prediction engine and gets back results.
+ * Utility class to track stats log and emit corresponding app events
  */
-@TargetApi(Build.VERSION_CODES.Q)
-public class PredictionAppTracker extends AppLaunchTracker implements StatsLogConsumer {
+@TargetApi(Build.VERSION_CODES.R)
+public class AppEventProducer implements StatsLogConsumer {
 
-    private static final String TAG = "PredictionAppTracker";
-    private static final boolean DBG = false;
+    private static final int MSG_LAUNCH = 0;
 
-    private static final int MSG_INIT = 0;
-    private static final int MSG_DESTROY = 1;
-    private static final int MSG_LAUNCH = 2;
-    private static final int MSG_PREDICT = 3;
-
-    protected final Context mContext;
+    private final Context mContext;
     private final Handler mMessageHandler;
+    private final Consumer<AppTargetEvent> mCallback;
 
-    // Accessed only on worker thread
-    private AppPredictor mHomeAppPredictor;
-
-    public PredictionAppTracker(Context context) {
+    public AppEventProducer(Context context, Consumer<AppTargetEvent> callback) {
         mContext = context;
-        mMessageHandler = new Handler(UI_HELPER_EXECUTOR.getLooper(), this::handleMessage);
-        InvariantDeviceProfile.INSTANCE.get(mContext).addOnChangeListener(this::onIdpChanged);
-
-        mMessageHandler.sendEmptyMessage(MSG_INIT);
-    }
-
-    @UiThread
-    private void onIdpChanged(int changeFlags, InvariantDeviceProfile profile) {
-        if ((changeFlags & CHANGE_FLAG_GRID) != 0) {
-            // Reinitialize everything
-            mMessageHandler.sendEmptyMessage(MSG_INIT);
-        }
-    }
-
-    @WorkerThread
-    private void destroy() {
-        if (mHomeAppPredictor != null) {
-            mHomeAppPredictor.destroy();
-            mHomeAppPredictor = null;
-        }
-        StatsLogCompatManager.LOGS_CONSUMER.remove(this);
-    }
-
-    @WorkerThread
-    private AppPredictor createPredictor(Client client, int count) {
-        AppPredictionManager apm = mContext.getSystemService(AppPredictionManager.class);
-
-        if (apm == null) {
-            return null;
-        }
-
-        AppPredictor predictor = apm.createAppPredictionSession(
-                new AppPredictionContext.Builder(mContext)
-                        .setUiSurface(client.id)
-                        .setPredictedTargetCount(count)
-                        .setExtras(getAppPredictionContextExtras(client))
-                        .build());
-        predictor.registerPredictionUpdates(mContext.getMainExecutor(),
-                PredictionUiStateManager.INSTANCE.get(mContext).appPredictorCallback(client));
-        predictor.requestPredictionUpdate();
-        return predictor;
-    }
-
-    /**
-     * Override to add custom extras.
-     */
-    @WorkerThread
-    @Nullable
-    public Bundle getAppPredictionContextExtras(Client client) {
-        return null;
+        mMessageHandler = new Handler(MODEL_EXECUTOR.getLooper(), this::handleMessage);
+        mCallback = callback;
     }
 
     @WorkerThread
     private boolean handleMessage(Message msg) {
         switch (msg.what) {
-            case MSG_INIT: {
-                // Destroy any existing clients
-                destroy();
-
-                // Initialize the clients
-                int count = InvariantDeviceProfile.INSTANCE.get(mContext).numAllAppsColumns;
-                mHomeAppPredictor = createPredictor(Client.HOME, count);
-                StatsLogCompatManager.LOGS_CONSUMER.add(this);
-                return true;
-            }
-            case MSG_DESTROY: {
-                destroy();
-                return true;
-            }
             case MSG_LAUNCH: {
-                if (mHomeAppPredictor != null) {
-                    mHomeAppPredictor.notifyAppTargetEvent((AppTargetEvent) msg.obj);
-                }
-                return true;
-            }
-            case MSG_PREDICT: {
-                if (mHomeAppPredictor != null) {
-                    mHomeAppPredictor.requestPredictionUpdate();
-                }
+                mCallback.accept((AppTargetEvent) msg.obj);
                 return true;
             }
         }
         return false;
     }
 
-    @Override
-    @UiThread
-    public void onReturnedToHome() {
-        String client = Client.HOME.id;
-        mMessageHandler.removeMessages(MSG_PREDICT, client);
-        Message.obtain(mMessageHandler, MSG_PREDICT, client).sendToTarget();
-        if (DBG) {
-            Log.d(TAG, String.format("Sent immediate message to update %s", client));
-        }
-    }
-
     @AnyThread
     private void sendEvent(LauncherAtom.ItemInfo atomInfo, int eventId) {
         AppTarget target = toAppTarget(atomInfo);
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/model/PredictionUpdateTask.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/model/PredictionUpdateTask.java
new file mode 100644
index 0000000000..721e2bebd5
--- /dev/null
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/model/PredictionUpdateTask.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.model;
+
+import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT;
+import static com.android.launcher3.model.QuickstepModelDelegate.LAST_PREDICTION_ENABLED_STATE;
+import static com.android.quickstep.InstantAppResolverImpl.COMPONENT_CLASS_MARKER;
+
+import android.app.prediction.AppTarget;
+import android.content.ComponentName;
+import android.content.pm.LauncherActivityInfo;
+import android.content.pm.LauncherApps;
+import android.content.pm.ShortcutInfo;
+import android.os.UserHandle;
+
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.model.BgDataModel.FixedContainerItems;
+import com.android.launcher3.model.data.AppInfo;
+import com.android.launcher3.model.data.WorkspaceItemInfo;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Task to update model as a result of predicted apps update
+ */
+public class PredictionUpdateTask extends BaseModelUpdateTask {
+
+    private final List<AppTarget> mTargets;
+    private final int mContainerId;
+
+    PredictionUpdateTask(int containerId, List<AppTarget> targets) {
+        mContainerId = containerId;
+        mTargets = targets;
+    }
+
+    @Override
+    public void execute(LauncherAppState app, BgDataModel dataModel, AllAppsList apps) {
+        // TODO: persist the whole list
+        Utilities.getDevicePrefs(app.getContext()).edit()
+                .putBoolean(LAST_PREDICTION_ENABLED_STATE, !mTargets.isEmpty()).apply();
+
+        FixedContainerItems fci;
+        synchronized (dataModel) {
+            fci = dataModel.extraItems.get(mContainerId);
+            if (fci == null) {
+                return;
+            }
+        }
+
+        Set<UserHandle> usersForChangedShortcuts = new HashSet<>(fci.items.stream()
+                .filter(info -> info.itemType == ITEM_TYPE_DEEP_SHORTCUT)
+                .map(info -> info.user)
+                .collect(Collectors.toSet()));
+        fci.items.clear();
+
+        for (AppTarget target : mTargets) {
+            WorkspaceItemInfo itemInfo;
+            ShortcutInfo si = target.getShortcutInfo();
+            if (si != null) {
+                usersForChangedShortcuts.add(si.getUserHandle());
+                itemInfo = new WorkspaceItemInfo(si, app.getContext());
+                app.getIconCache().getShortcutIcon(itemInfo, si);
+            } else {
+                String className = target.getClassName();
+                if (COMPONENT_CLASS_MARKER.equals(className)) {
+                    // TODO: Implement this
+                    continue;
+                }
+                ComponentName cn = new ComponentName(target.getPackageName(), className);
+                UserHandle user = target.getUser();
+                itemInfo = apps.data.stream()
+                        .filter(info -> user.equals(info.user) && cn.equals(info.componentName))
+                        .map(AppInfo::makeWorkspaceItem)
+                        .findAny()
+                        .orElseGet(() -> {
+                            LauncherActivityInfo lai = app.getContext()
+                                    .getSystemService(LauncherApps.class)
+                                    .resolveActivity(AppInfo.makeLaunchIntent(cn), user);
+                            if (lai == null) {
+                                return null;
+                            }
+                            AppInfo ai = new AppInfo(app.getContext(), lai, user);
+                            app.getIconCache().getTitleAndIcon(ai, lai, false);
+                            return ai.makeWorkspaceItem();
+                        });
+
+                if (itemInfo == null) {
+                    continue;
+                }
+            }
+
+            itemInfo.container = mContainerId;
+            fci.items.add(itemInfo);
+        }
+
+        bindExtraContainerItems(fci);
+        usersForChangedShortcuts.forEach(
+                u -> dataModel.updateShortcutPinnedState(app.getContext(), u));
+    }
+}
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/model/QuickstepModelDelegate.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/model/QuickstepModelDelegate.java
new file mode 100644
index 0000000000..b5164695d5
--- /dev/null
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/model/QuickstepModelDelegate.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.model;
+
+import static com.android.launcher3.InvariantDeviceProfile.CHANGE_FLAG_GRID;
+import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_PREDICTION;
+
+import android.app.prediction.AppPredictionContext;
+import android.app.prediction.AppPredictionManager;
+import android.app.prediction.AppPredictor;
+import android.app.prediction.AppTarget;
+import android.app.prediction.AppTargetEvent;
+import android.content.Context;
+
+import androidx.annotation.WorkerThread;
+
+import com.android.launcher3.InvariantDeviceProfile;
+import com.android.launcher3.InvariantDeviceProfile.OnIDPChangeListener;
+import com.android.launcher3.model.BgDataModel.FixedContainerItems;
+import com.android.launcher3.util.Executors;
+import com.android.quickstep.logging.StatsLogCompatManager;
+
+import java.util.List;
+
+/**
+ * Model delegate which loads prediction items
+ */
+public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChangeListener {
+
+    public static final String LAST_PREDICTION_ENABLED_STATE = "last_prediction_enabled_state";
+
+    private final InvariantDeviceProfile mIDP;
+    private final AppEventProducer mAppEventProducer;
+
+    private AppPredictor mAllAppsPredictor;
+    private boolean mActive = false;
+
+    public QuickstepModelDelegate(Context context) {
+        mAppEventProducer = new AppEventProducer(context, this::onAppTargetEvent);
+
+        mIDP = InvariantDeviceProfile.INSTANCE.get(context);
+        mIDP.addOnChangeListener(this);
+        StatsLogCompatManager.LOGS_CONSUMER.add(mAppEventProducer);
+    }
+
+    @Override
+    public void loadItems() {
+        // TODO: Implement caching and preloading
+        super.loadItems();
+        mDataModel.extraItems.put(
+                CONTAINER_PREDICTION, new FixedContainerItems(CONTAINER_PREDICTION));
+
+        mActive = true;
+        recreatePredictors();
+    }
+
+    @Override
+    public void validateData() {
+        super.validateData();
+        if (mAllAppsPredictor != null) {
+            mAllAppsPredictor.requestPredictionUpdate();
+        }
+    }
+
+    @Override
+    public void destroy() {
+        super.destroy();
+        mActive = false;
+        StatsLogCompatManager.LOGS_CONSUMER.remove(mAppEventProducer);
+
+        destroyPredictors();
+        mIDP.removeOnChangeListener(this);
+    }
+
+    private void destroyPredictors() {
+        if (mAllAppsPredictor != null) {
+            mAllAppsPredictor.destroy();
+            mAllAppsPredictor = null;
+        }
+    }
+
+    @WorkerThread
+    private void recreatePredictors() {
+        destroyPredictors();
+        if (!mActive) {
+            return;
+        }
+
+        Context context = mApp.getContext();
+        AppPredictionManager apm = context.getSystemService(AppPredictionManager.class);
+        if (apm == null) {
+            return;
+        }
+
+        int count = mIDP.numAllAppsColumns;
+
+        mAllAppsPredictor = apm.createAppPredictionSession(
+                new AppPredictionContext.Builder(context)
+                        .setUiSurface("home")
+                        .setPredictedTargetCount(count)
+                        .build());
+        mAllAppsPredictor.registerPredictionUpdates(
+                Executors.MODEL_EXECUTOR, this::onAllAppsPredictionChanged);
+        mAllAppsPredictor.requestPredictionUpdate();
+    }
+
+    private void onAllAppsPredictionChanged(List<AppTarget> targets) {
+        mApp.getModel().enqueueModelUpdateTask(
+                new PredictionUpdateTask(CONTAINER_PREDICTION, targets));
+    }
+
+    @Override
+    public void onIdpChanged(int changeFlags, InvariantDeviceProfile profile) {
+        if ((changeFlags & CHANGE_FLAG_GRID) != 0) {
+            // Reinitialize everything
+            Executors.MODEL_EXECUTOR.execute(this::recreatePredictors);
+        }
+    }
+
+    private void onAppTargetEvent(AppTargetEvent event) {
+        if (mAllAppsPredictor != null) {
+            mAllAppsPredictor.notifyAppTargetEvent(event);
+        }
+    }
+}
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index f87138e536..23a05295bf 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -17,6 +17,9 @@ package com.android.launcher3.uioverrides;
 
 import static android.view.accessibility.AccessibilityEvent.TYPE_VIEW_FOCUSED;
 
+import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
+import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT;
+import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.OVERVIEW_MODAL_TASK;
@@ -37,16 +40,18 @@ import android.view.View;
 import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.Workspace;
 import com.android.launcher3.allapps.DiscoveryBounce;
 import com.android.launcher3.anim.AnimatorPlaybackController;
-import com.android.launcher3.appprediction.PredictionUiStateManager;
+import com.android.launcher3.appprediction.PredictionRowView;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.folder.Folder;
 import com.android.launcher3.hybridhotseat.HotseatPredictionController;
 import com.android.launcher3.logging.InstanceId;
 import com.android.launcher3.logging.StatsLogManager.StatsLogger;
+import com.android.launcher3.model.BgDataModel.FixedContainerItems;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
@@ -79,7 +84,7 @@ import java.io.FileDescriptor;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.OptionalInt;
+import java.util.Objects;
 import java.util.stream.Stream;
 
 public class QuickstepLauncher extends BaseQuickstepLauncher {
@@ -91,6 +96,8 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
     public static final AsyncCommand SET_SHELF_HEIGHT = (context, arg1, arg2) ->
             SystemUiProxy.INSTANCE.get(context).setShelfHeight(arg1 != 0, arg2);
 
+    private FixedContainerItems mAllAppsPredictions;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -111,8 +118,23 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
     protected void logAppLaunch(ItemInfo info, InstanceId instanceId) {
         StatsLogger logger = getStatsLogManager()
                 .logger().withItemInfo(info).withInstanceId(instanceId);
-        OptionalInt allAppsRank = PredictionUiStateManager.INSTANCE.get(this).getAllAppsRank(info);
-        allAppsRank.ifPresent(logger::withRank);
+
+        if (mAllAppsPredictions != null
+                && (info.itemType == ITEM_TYPE_APPLICATION
+                || info.itemType == ITEM_TYPE_SHORTCUT
+                || info.itemType == ITEM_TYPE_DEEP_SHORTCUT)) {
+            int count = mAllAppsPredictions.items.size();
+            for (int i = 0; i < count; i++) {
+                ItemInfo targetInfo = mAllAppsPredictions.items.get(i);
+                if (targetInfo.itemType == info.itemType
+                        && targetInfo.user.equals(info.user)
+                        && Objects.equals(targetInfo.getIntent(), info.getIntent())) {
+                    logger.withRank(i);
+                    break;
+                }
+
+            }
+        }
         logger.log(LAUNCHER_APP_LAUNCH_TAP);
 
         if (mHotseatPredictionController != null) {
@@ -199,6 +221,15 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
         }
     }
 
+    @Override
+    public void bindExtraContainerItems(FixedContainerItems item) {
+        if (item.containerId == Favorites.CONTAINER_PREDICTION) {
+            mAllAppsPredictions = item;
+            getAppsView().getFloatingHeaderView().findFixedRowByType(PredictionRowView.class)
+                    .setPredictedApps(item.items);
+        }
+    }
+
     @Override
     public void onDestroy() {
         super.onDestroy();
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java
index b02035516d..5a35eb5eb2 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java
@@ -41,7 +41,6 @@ import com.android.launcher3.R;
 import com.android.launcher3.allapps.DiscoveryBounce;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
-import com.android.launcher3.appprediction.PredictionUiStateManager;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statehandlers.DepthController.ClampedDepthProperty;
 import com.android.launcher3.statemanager.StateManager;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/logging/UserEventDispatcherAppPredictionExtension.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/logging/UserEventDispatcherAppPredictionExtension.java
deleted file mode 100644
index e0008033b4..0000000000
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/logging/UserEventDispatcherAppPredictionExtension.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.quickstep.logging;
-
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-
-import com.android.launcher3.appprediction.PredictionUiStateManager;
-import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
-
-import java.util.ArrayList;
-
-/**
- * This class handles AOSP MetricsLogger function calls and logging around
- * quickstep interactions and app launches.
- */
-@SuppressWarnings("unused")
-public class UserEventDispatcherAppPredictionExtension extends UserEventDispatcherExtension {
-
-    public static final int ALL_APPS_PREDICTION_TIPS = 2;
-
-    private static final String TAG = "UserEventDispatcher";
-
-    public UserEventDispatcherAppPredictionExtension(Context context) {
-        super(context);
-    }
-
-    @Override
-    protected void onFillInLogContainerData(
-            @NonNull ItemInfo itemInfo, @NonNull LauncherLogProto.Target target,
-            @NonNull ArrayList<LauncherLogProto.Target> targets) {
-        PredictionUiStateManager.fillInPredictedRank(itemInfo, target);
-    }
-}
diff --git a/quickstep/tests/src/com/android/quickstep/AppPredictionsUITests.java b/quickstep/tests/src/com/android/quickstep/AppPredictionsUITests.java
deleted file mode 100644
index 5904fcd691..0000000000
--- a/quickstep/tests/src/com/android/quickstep/AppPredictionsUITests.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/**
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.android.quickstep;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
-import android.app.prediction.AppPredictor;
-import android.app.prediction.AppTarget;
-import android.app.prediction.AppTargetId;
-import android.content.ComponentName;
-import android.content.pm.LauncherActivityInfo;
-import android.content.pm.LauncherApps;
-import android.os.Process;
-import android.view.View;
-
-import androidx.test.filters.LargeTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.launcher3.BubbleTextView;
-import com.android.launcher3.Launcher;
-import com.android.launcher3.appprediction.PredictionRowView;
-import com.android.launcher3.appprediction.PredictionUiStateManager;
-import com.android.launcher3.appprediction.PredictionUiStateManager.Client;
-import com.android.launcher3.model.AppLaunchTracker;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@LargeTest
-@RunWith(AndroidJUnit4.class)
-public class AppPredictionsUITests extends AbstractQuickStepTest {
-
-    private LauncherActivityInfo mSampleApp1;
-    private LauncherActivityInfo mSampleApp2;
-    private LauncherActivityInfo mSampleApp3;
-
-    private AppPredictor.Callback mCallback;
-
-    @Before
-    public void setUp() throws Exception {
-        super.setUp();
-
-        List<LauncherActivityInfo> activities = mTargetContext.getSystemService(LauncherApps.class)
-                .getActivityList(null, Process.myUserHandle());
-        mSampleApp1 = activities.get(0);
-        mSampleApp2 = activities.get(1);
-        mSampleApp3 = activities.get(2);
-
-        // Disable app tracker
-        AppLaunchTracker.INSTANCE.initializeForTesting(new AppLaunchTracker());
-        PredictionUiStateManager.INSTANCE.initializeForTesting(null);
-
-        mCallback = PredictionUiStateManager.INSTANCE.get(mTargetContext).appPredictorCallback(
-                Client.HOME);
-
-        mDevice.setOrientationNatural();
-    }
-
-    @After
-    public void tearDown() throws Throwable {
-        AppLaunchTracker.INSTANCE.initializeForTesting(null);
-        PredictionUiStateManager.INSTANCE.initializeForTesting(null);
-        mDevice.unfreezeRotation();
-    }
-
-    /**
-     * Test that prediction UI is updated as soon as we get predictions from the system
-     */
-    @Test
-    public void testPredictionExistsInAllApps() {
-        mLauncher.pressHome().switchToAllApps();
-
-        // Dispatch an update
-        sendPredictionUpdate(mSampleApp1, mSampleApp2);
-        // The first update should apply immediately.
-        waitForLauncherCondition("Predictions were not updated in loading state",
-                launcher -> getPredictedApp(launcher).size() == 2);
-    }
-
-    /**
-     * Test that prediction update is deferred if it is already visible
-     */
-    @Test
-    public void testPredictionsDeferredUntilHome() {
-        mDevice.pressHome();
-        sendPredictionUpdate(mSampleApp1, mSampleApp2);
-        mLauncher.pressHome().switchToAllApps();
-        waitForLauncherCondition("Predictions were not updated in loading state",
-                launcher -> getPredictedApp(launcher).size() == 2);
-
-        // Update predictions while all-apps is visible
-        sendPredictionUpdate(mSampleApp1, mSampleApp2, mSampleApp3);
-        assertEquals(2, getFromLauncher(this::getPredictedApp).size());
-
-        // Go home and go back to all-apps
-        mLauncher.pressHome().switchToAllApps();
-        assertEquals(3, getFromLauncher(this::getPredictedApp).size());
-    }
-
-    @Test
-    public void testPredictionsDisabled() {
-        mDevice.pressHome();
-        sendPredictionUpdate();
-        mLauncher.pressHome().switchToAllApps();
-
-        waitForLauncherCondition("Predictions were not updated in loading state",
-                launcher -> launcher.getAppsView().getFloatingHeaderView()
-                        .findFixedRowByType(PredictionRowView.class).getVisibility() == View.GONE);
-        assertFalse(PredictionUiStateManager.INSTANCE.get(mTargetContext)
-                .getCurrentState().isEnabled);
-    }
-
-    public ArrayList<BubbleTextView> getPredictedApp(Launcher launcher) {
-        PredictionRowView container = launcher.getAppsView().getFloatingHeaderView()
-                .findFixedRowByType(PredictionRowView.class);
-
-        ArrayList<BubbleTextView> predictedAppViews = new ArrayList<>();
-        for (int i = 0; i < container.getChildCount(); i++) {
-            View view = container.getChildAt(i);
-            if (view instanceof BubbleTextView && view.getVisibility() == View.VISIBLE) {
-                predictedAppViews.add((BubbleTextView) view);
-            }
-        }
-        return predictedAppViews;
-    }
-
-    private void sendPredictionUpdate(LauncherActivityInfo... activities) {
-        getOnUiThread(() -> {
-            List<AppTarget> targets = new ArrayList<>(activities.length);
-            for (LauncherActivityInfo info : activities) {
-                ComponentName cn = info.getComponentName();
-                AppTarget target = new AppTarget.Builder(
-                        new AppTargetId("app:" + cn), cn.getPackageName(), info.getUser())
-                        .setClassName(cn.getClassName())
-                        .build();
-                targets.add(target);
-            }
-            mCallback.onTargetsAvailable(targets);
-            return null;
-        });
-    }
-}
diff --git a/res/values/config.xml b/res/values/config.xml
index 75fcc907db..dc8bdffca3 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -70,6 +70,7 @@
     <string name="test_information_handler_class" translatable="false"></string>
     <string name="launcher_activity_logic_class" translatable="false"></string>
     <string name="prediction_model_class" translatable="false"></string>
+    <string name="model_delegate_class" translatable="false"></string>
 
     <!-- View ID to use for QSB widget -->
     <item type="id" name="qsb_widget" />
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index e49c4559f0..1123c79b37 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -119,7 +119,6 @@ import com.android.launcher3.logger.LauncherAtom;
 import com.android.launcher3.logging.FileLog;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.logging.UserEventDispatcher;
-import com.android.launcher3.model.AppLaunchTracker;
 import com.android.launcher3.model.BgDataModel.Callbacks;
 import com.android.launcher3.model.ModelWriter;
 import com.android.launcher3.model.data.AppInfo;
@@ -911,14 +910,12 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         logStopAndResume(Action.Command.RESUME);
         getUserEventDispatcher().startSession();
 
-        AppLaunchTracker.INSTANCE.get(this).onReturnedToHome();
-
         // Process any items that were added while Launcher was away.
         InstallShortcutReceiver.disableAndFlushInstallQueue(
                 InstallShortcutReceiver.FLAG_ACTIVITY_PAUSED, this);
 
         // Refresh shortcuts if the permission changed.
-        mModel.refreshShortcutsIfRequired();
+        mModel.validateModelDataOnResume();
 
         // Set the notification listener and fetch updated notifications when we resume
         NotificationListener.setNotificationsChangedListener(mPopupDataProvider);
diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index 53e5274c0c..e3fe87d1e9 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -128,7 +128,7 @@ public class LauncherAppState {
         mInvariantDeviceProfile = InvariantDeviceProfile.INSTANCE.get(context);
         mIconCache = new IconCache(mContext, mInvariantDeviceProfile, iconCacheFileName);
         mWidgetCache = new WidgetPreviewLoader(mContext, mIconCache);
-        mModel = new LauncherModel(this, mIconCache, AppFilter.newInstance(mContext));
+        mModel = new LauncherModel(context, this, mIconCache, AppFilter.newInstance(mContext));
         mPredictionModel = PredictionModel.newInstance(mContext);
     }
 
@@ -157,6 +157,7 @@ public class LauncherAppState {
      * Call from Application.onTerminate(), which is not guaranteed to ever be called.
      */
     public void onTerminate() {
+        mModel.destroy();
         if (mModelChangeReceiver != null) {
             mContext.unregisterReceiver(mModelChangeReceiver);
         }
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index ff4b545a06..e2568d5ef6 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -20,7 +20,6 @@ import static com.android.launcher3.LauncherAppState.ACTION_FORCE_ROLOAD;
 import static com.android.launcher3.config.FeatureFlags.IS_STUDIO_BUILD;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
-import static com.android.launcher3.util.PackageManagerHelper.hasShortcutsPermission;
 
 import android.content.Context;
 import android.content.Intent;
@@ -46,6 +45,7 @@ import com.android.launcher3.model.BgDataModel.Callbacks;
 import com.android.launcher3.model.CacheDataUpdatedTask;
 import com.android.launcher3.model.LoaderResults;
 import com.android.launcher3.model.LoaderTask;
+import com.android.launcher3.model.ModelDelegate;
 import com.android.launcher3.model.ModelWriter;
 import com.android.launcher3.model.PackageInstallStateChangedTask;
 import com.android.launcher3.model.PackageUpdatedTask;
@@ -112,20 +112,22 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi
      */
     private final BgDataModel mBgDataModel = new BgDataModel();
 
+    private final ModelDelegate mModelDelegate;
+
     // Runnable to check if the shortcuts permission has changed.
-    private final Runnable mShortcutPermissionCheckRunnable = new Runnable() {
+    private final Runnable mDataValidationCheck = new Runnable() {
         @Override
         public void run() {
-            if (mModelLoaded && hasShortcutsPermission(mApp.getContext())
-                    != mBgAllAppsList.hasShortcutHostPermission()) {
-                forceReload();
+            if (mModelLoaded) {
+                mModelDelegate.validateData();
             }
         }
     };
 
-    LauncherModel(LauncherAppState app, IconCache iconCache, AppFilter appFilter) {
+    LauncherModel(Context context, LauncherAppState app, IconCache iconCache, AppFilter appFilter) {
         mApp = app;
         mBgAllAppsList = new AllAppsList(iconCache, appFilter);
+        mModelDelegate = ModelDelegate.newInstance(context, app, mBgAllAppsList, mBgDataModel);
     }
 
     /**
@@ -217,6 +219,13 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi
         }
     }
 
+    /**
+     * Called when the model is destroyed
+     */
+    public void destroy() {
+        MODEL_EXECUTOR.execute(mModelDelegate::destroy);
+    }
+
     public void onBroadcastIntent(Intent intent) {
         if (DEBUG_RECEIVER) Log.d(TAG, "onReceive intent=" + intent);
         final String action = intent.getAction();
@@ -372,7 +381,8 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi
     public void startLoaderForResults(LoaderResults results) {
         synchronized (mLock) {
             stopLoader();
-            mLoaderTask = new LoaderTask(mApp, mBgAllAppsList, mBgDataModel, results);
+            mLoaderTask = new LoaderTask(
+                    mApp, mBgAllAppsList, mBgDataModel, mModelDelegate, results);
 
             // Always post the loader task, instead of running directly (even on same thread) so
             // that we exit any nested synchronized blocks
@@ -491,9 +501,9 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi
      * Current implementation simply reloads the workspace, but it can be optimized to
      * use partial updates similar to {@link UserCache}
      */
-    public void refreshShortcutsIfRequired() {
-        MODEL_EXECUTOR.getHandler().removeCallbacks(mShortcutPermissionCheckRunnable);
-        MODEL_EXECUTOR.post(mShortcutPermissionCheckRunnable);
+    public void validateModelDataOnResume() {
+        MODEL_EXECUTOR.getHandler().removeCallbacks(mDataValidationCheck);
+        MODEL_EXECUTOR.post(mDataValidationCheck);
     }
 
     /**
diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index a424f8458a..d8eb838ed5 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -74,6 +74,7 @@ import com.android.launcher3.model.BgDataModel;
 import com.android.launcher3.model.BgDataModel.Callbacks;
 import com.android.launcher3.model.LoaderResults;
 import com.android.launcher3.model.LoaderTask;
+import com.android.launcher3.model.ModelDelegate;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.model.WidgetsModel;
 import com.android.launcher3.model.data.AppInfo;
@@ -579,7 +580,7 @@ public class LauncherPreviewRenderer {
         private final FutureTask<WorkspaceResult> mTask = new FutureTask<>(this);
 
         WorkspaceItemsInfoFromPreviewFetcher(LauncherAppState app) {
-            super(app, null, new BgDataModel(), null);
+            super(app, null, new BgDataModel(), new ModelDelegate(), null);
         }
 
         @Override
diff --git a/src/com/android/launcher3/model/AppLaunchTracker.java b/src/com/android/launcher3/model/AppLaunchTracker.java
deleted file mode 100644
index a93c0dd77c..0000000000
--- a/src/com/android/launcher3/model/AppLaunchTracker.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.model;
-
-import static com.android.launcher3.util.MainThreadInitializedObject.forOverride;
-
-import com.android.launcher3.R;
-import com.android.launcher3.util.MainThreadInitializedObject;
-import com.android.launcher3.util.ResourceBasedOverride;
-
-/**
- * Callback for receiving various app launch events
- */
-public class AppLaunchTracker implements ResourceBasedOverride {
-
-    public static final MainThreadInitializedObject<AppLaunchTracker> INSTANCE =
-            forOverride(AppLaunchTracker.class, R.string.app_launch_tracker_class);
-
-    public void onReturnedToHome() { }
-}
diff --git a/src/com/android/launcher3/model/BgDataModel.java b/src/com/android/launcher3/model/BgDataModel.java
index dfdc1387ff..6158a9c6b4 100644
--- a/src/com/android/launcher3/model/BgDataModel.java
+++ b/src/com/android/launcher3/model/BgDataModel.java
@@ -108,13 +108,6 @@ public class BgDataModel {
      */
     public final ArrayList<AppInfo> cachedPredictedItems = new ArrayList<>();
 
-    /**
-     * @see Callbacks#FLAG_HAS_SHORTCUT_PERMISSION
-     * @see Callbacks#FLAG_QUIET_MODE_ENABLED
-     * @see Callbacks#FLAG_QUIET_MODE_CHANGE_PERMISSION
-     */
-    public int flags;
-
     /**
      * Maps all launcher activities to counts of their shortcuts.
      */
diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index bea00869ee..b0679095f3 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -109,6 +109,7 @@ public class LoaderTask implements Runnable {
     protected final LauncherAppState mApp;
     private final AllAppsList mBgAllAppsList;
     protected final BgDataModel mBgDataModel;
+    private final ModelDelegate mModelDelegate;
 
     private FirstScreenBroadcast mFirstScreenBroadcast;
 
@@ -128,10 +129,11 @@ public class LoaderTask implements Runnable {
     private boolean mStopped;
 
     public LoaderTask(LauncherAppState app, AllAppsList bgAllAppsList, BgDataModel dataModel,
-            LoaderResults results) {
+            ModelDelegate modelDelegate, LoaderResults results) {
         mApp = app;
         mBgAllAppsList = bgAllAppsList;
         mBgDataModel = dataModel;
+        mModelDelegate = modelDelegate;
         mResults = results;
 
         mLauncherApps = mApp.getContext().getSystemService(LauncherApps.class);
@@ -767,6 +769,9 @@ public class LoaderTask implements Runnable {
                 IOUtils.closeSilently(c);
             }
 
+            // Load delegate items
+            mModelDelegate.loadItems();
+
             // Break early if we've stopped loading
             if (mStopped) {
                 mBgDataModel.clear();
diff --git a/src/com/android/launcher3/model/ModelDelegate.java b/src/com/android/launcher3/model/ModelDelegate.java
new file mode 100644
index 0000000000..ce4eed5bbd
--- /dev/null
+++ b/src/com/android/launcher3/model/ModelDelegate.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.model;
+
+import static com.android.launcher3.util.PackageManagerHelper.hasShortcutsPermission;
+
+import android.content.Context;
+
+import androidx.annotation.WorkerThread;
+
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.R;
+import com.android.launcher3.util.ResourceBasedOverride;
+
+/**
+ * Class to extend LauncherModel functionality to provide extra data
+ */
+public class ModelDelegate implements ResourceBasedOverride {
+
+    /**
+     * Creates and initializes a new instance of the delegate
+     */
+    public static ModelDelegate newInstance(
+            Context context, LauncherAppState app, AllAppsList appsList, BgDataModel dataModel) {
+        ModelDelegate delegate = Overrides.getObject(
+                ModelDelegate.class, context, R.string.model_delegate_class);
+
+        delegate.mApp = app;
+        delegate.mAppsList = appsList;
+        delegate.mDataModel = dataModel;
+        return delegate;
+    }
+
+    protected LauncherAppState mApp;
+    protected AllAppsList mAppsList;
+    protected BgDataModel mDataModel;
+
+    public ModelDelegate() { }
+
+    /**
+     * Called periodically to validate and update any data
+     */
+    @WorkerThread
+    public void validateData() {
+        if (hasShortcutsPermission(mApp.getContext())
+                != mAppsList.hasShortcutHostPermission()) {
+            mApp.getModel().forceReload();
+        }
+    }
+
+    /**
+     * Load delegate items if any in the data model
+     */
+    @WorkerThread
+    public void loadItems() { }
+
+    /**
+     * Called when the delegate is no loner needed
+     */
+    @WorkerThread
+    public void destroy() { }
+}
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index 858e183ab7..201218b79a 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -53,7 +53,6 @@ import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.common.WidgetUtils;
-import com.android.launcher3.model.AppLaunchTracker;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.tapl.LauncherInstrumentation;
@@ -272,8 +271,6 @@ public abstract class AbstractLauncherUiTest {
         }
 
         mLauncherPid = 0;
-        // Disable app tracker
-        AppLaunchTracker.INSTANCE.initializeForTesting(new AppLaunchTracker());
 
         mTargetContext = InstrumentationRegistry.getTargetContext();
         mTargetPackage = mTargetContext.getPackageName();
-- 
GitLab


From eaf7a955467a5d189b982ee436a8eefaa30e3006 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 29 Jul 2020 16:54:20 -0700
Subject: [PATCH 0056/1664] Changing minimum supported Launcher version to 26

Change-Id: I49fcf874430ac53c3246371e179fbd828e14e4da
---
 Android.mk                                    |   6 +-
 AndroidManifest-common.xml                    |  18 ---
 AndroidManifest.xml                           |   2 +-
 .../QuickstepAppTransitionManagerImpl.java    |   3 -
 res/animator-v23/discovery_bounce.xml         |  43 -------
 res/animator/discovery_bounce.xml             |  40 ++++---
 .../all_apps_bg_hand_fill.xml                 |   0
 .../all_apps_bg_hand_fill_dark.xml            |   0
 .../ic_deepshortcut_placeholder.xml           |  20 ----
 res/drawable-v26/ic_launcher_home.xml         |  21 ----
 .../ic_block_shadow.xml                       |   0
 res/drawable/ic_deepshortcut_placeholder.xml  |  14 +--
 res/drawable/ic_launcher_home.xml             |   9 +-
 .../ic_remove_shadow.xml                      |   0
 .../ic_setup_shadow.xml                       |   0
 .../ic_uninstall_shadow.xml                   |   0
 res/mipmap-hdpi/ic_launcher_home.png          | Bin 236 -> 0 bytes
 res/mipmap-mdpi/ic_launcher_home.png          | Bin 216 -> 0 bytes
 res/mipmap-xhdpi/ic_launcher_home.png         | Bin 235 -> 0 bytes
 res/mipmap-xxhdpi/ic_launcher_home.png        | Bin 266 -> 0 bytes
 .../styles.xml                                |   0
 res/values-v22/styles.xml                     |  26 ----
 res/values-v26/bools.xml                      |  23 ----
 res/values-v26/styles.xml                     |  31 -----
 res/values/bools.xml                          |  23 ----
 res/values/colors.xml                         |   3 -
 res/values/drawables.xml                      |  21 ----
 res/values/styles.xml                         |  16 +--
 .../launcher3/AbstractFloatingView.java       |   3 +-
 src/com/android/launcher3/CellLayout.java     |   4 +-
 .../launcher3/InstallShortcutReceiver.java    |  29 +----
 src/com/android/launcher3/Launcher.java       |   5 +-
 .../android/launcher3/LauncherAppState.java   |  14 +--
 .../android/launcher3/LauncherProvider.java   |   1 -
 .../launcher3/MainProcessInitializer.java     |   1 -
 src/com/android/launcher3/PagedView.java      |   4 +-
 .../launcher3/SessionCommitReceiver.java      | 111 +-----------------
 src/com/android/launcher3/Utilities.java      |  24 ----
 .../android/launcher3/dragndrop/DragView.java |   3 -
 .../android/launcher3/graphics/IconShape.java |   8 +-
 .../launcher3/model/PackageUpdatedTask.java   |  10 +-
 .../android/launcher3/model/data/AppInfo.java |   3 +-
 .../launcher3/pm/InstallSessionHelper.java    |  23 +++-
 .../pm/ShortcutConfigActivityInfo.java        |  49 +++-----
 .../popup/PopupContainerWithArrow.java        |   5 +-
 .../launcher3/settings/SettingsActivity.java  |   9 --
 .../launcher3/statemanager/StateManager.java  |   5 +-
 .../AbstractStateChangeTouchController.java   |  10 +-
 .../launcher3/util/PackageManagerHelper.java  |  38 +-----
 .../launcher3/util/SystemUiController.java    |  12 +-
 .../launcher3/views/FloatingIconView.java     |   4 +-
 .../widget/LauncherAppWidgetHostView.java     |   4 +-
 .../launcher3/widget/WidgetManagerHelper.java |  20 +---
 .../dynamicui/WallpaperManagerCompat.java     |   5 +-
 .../ui/widget/RequestPinItemTest.java         |   4 -
 55 files changed, 130 insertions(+), 597 deletions(-)
 delete mode 100644 res/animator-v23/discovery_bounce.xml
 rename res/{color-v24 => color}/all_apps_bg_hand_fill.xml (100%)
 rename res/{color-v24 => color}/all_apps_bg_hand_fill_dark.xml (100%)
 delete mode 100644 res/drawable-v26/ic_deepshortcut_placeholder.xml
 delete mode 100644 res/drawable-v26/ic_launcher_home.xml
 rename res/{drawable-v24 => drawable}/ic_block_shadow.xml (100%)
 rename res/{drawable-v24 => drawable}/ic_remove_shadow.xml (100%)
 rename res/{drawable-v24 => drawable}/ic_setup_shadow.xml (100%)
 rename res/{drawable-v24 => drawable}/ic_uninstall_shadow.xml (100%)
 delete mode 100644 res/mipmap-hdpi/ic_launcher_home.png
 delete mode 100644 res/mipmap-mdpi/ic_launcher_home.png
 delete mode 100644 res/mipmap-xhdpi/ic_launcher_home.png
 delete mode 100644 res/mipmap-xxhdpi/ic_launcher_home.png
 rename res/{values-night-v26 => values-night}/styles.xml (100%)
 delete mode 100644 res/values-v22/styles.xml
 delete mode 100644 res/values-v26/bools.xml
 delete mode 100644 res/values-v26/styles.xml
 delete mode 100644 res/values/bools.xml
 delete mode 100644 res/values/drawables.xml

diff --git a/Android.mk b/Android.mk
index 7805b32e8e..91ecccb1e4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -48,7 +48,7 @@ LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/ --proto_path=$(LOCAL_PA
 LOCAL_PROTO_JAVA_OUTPUT_PARAMS := enum_style=java
 
 LOCAL_SDK_VERSION := current
-LOCAL_MIN_SDK_VERSION := 21
+LOCAL_MIN_SDK_VERSION := 26
 LOCAL_MODULE := Launcher3CommonDepsLib
 LOCAL_PRIVILEGED_MODULE := true
 LOCAL_MANIFEST_FILE := AndroidManifest-common.xml
@@ -77,7 +77,7 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 LOCAL_PROGUARD_ENABLED := disabled
 
 LOCAL_SDK_VERSION := current
-LOCAL_MIN_SDK_VERSION := 21
+LOCAL_MIN_SDK_VERSION := 26
 LOCAL_PACKAGE_NAME := Launcher3
 LOCAL_PRIVILEGED_MODULE := true
 LOCAL_SYSTEM_EXT_MODULE := true
@@ -108,7 +108,7 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/go/res
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 LOCAL_SDK_VERSION := current
-LOCAL_MIN_SDK_VERSION := 21
+LOCAL_MIN_SDK_VERSION := 26
 LOCAL_PACKAGE_NAME := Launcher3Go
 LOCAL_PRIVILEGED_MODULE := true
 LOCAL_SYSTEM_EXT_MODULE := true
diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index 19a16e341a..97e3786a36 100644
--- a/AndroidManifest-common.xml
+++ b/AndroidManifest-common.xml
@@ -29,12 +29,6 @@
     at compile time. Note that the components defined in AndroidManifest.xml are also required,
     with some minor changed based on the derivative app.
     -->
-    <permission
-        android:name="com.android.launcher.permission.INSTALL_SHORTCUT"
-        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
-        android:protectionLevel="dangerous"
-        android:label="@string/permlab_install_shortcut"
-        android:description="@string/permdesc_install_shortcut" />
 
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.SET_WALLPAPER" />
@@ -79,17 +73,6 @@
         android:restoreAnyVersion="true"
         android:supportsRtl="true" >
 
-        <!-- Intent received used to install shortcuts from other applications -->
-        <receiver
-            android:name="com.android.launcher3.InstallShortcutReceiver"
-            android:permission="com.android.launcher.permission.INSTALL_SHORTCUT"
-            android:exported="true"
-            android:enabled="@bool/enable_install_shortcut_api" >
-            <intent-filter>
-                <action android:name="com.android.launcher.action.INSTALL_SHORTCUT" />
-            </intent-filter>
-        </receiver>
-
         <!-- Intent received when a session is committed -->
         <receiver
             android:name="com.android.launcher3.SessionCommitReceiver"
@@ -116,7 +99,6 @@
         <service
             android:name="com.android.launcher3.notification.NotificationListener"
             android:label="@string/notification_dots_service_title"
-            android:enabled="@bool/notification_dots_enabled"
             android:exported="true"
             android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
             <intent-filter>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4664c9315a..97bce9c1d7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,7 +20,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.launcher3">
-    <uses-sdk android:targetSdkVersion="29" android:minSdkVersion="25"/>
+    <uses-sdk android:targetSdkVersion="29" android:minSdkVersion="26"/>
     <!--
     Manifest entries specific to Launcher3. This is merged with AndroidManifest-common.xml.
     Refer comments around specific entries on how to extend individual components.
diff --git a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
index bd97f650dd..f3d543405d 100644
--- a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
@@ -45,7 +45,6 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
-import android.annotation.TargetApi;
 import android.app.ActivityOptions;
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -55,7 +54,6 @@ import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.os.CancellationSignal;
 import android.os.Handler;
 import android.os.Looper;
@@ -94,7 +92,6 @@ import com.android.systemui.shared.system.WindowManagerWrapper;
  * {@link LauncherAppTransitionManager} with Quickstep-specific app transitions for launching from
  * home and/or all-apps.  Not used for 3p launchers.
  */
-@TargetApi(Build.VERSION_CODES.O)
 @SuppressWarnings("unused")
 public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTransitionManager
         implements OnDeviceProfileChangeListener {
diff --git a/res/animator-v23/discovery_bounce.xml b/res/animator-v23/discovery_bounce.xml
deleted file mode 100644
index f5548537b1..0000000000
--- a/res/animator-v23/discovery_bounce.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2017, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="2166"
-    android:repeatCount="5">
-    <propertyValuesHolder
-        android:propertyName="progress"
-        android:valueType="floatType">
-        <keyframe
-            android:fraction="0"
-            android:value="1f" />
-        <keyframe
-            android:fraction="0.246"
-            android:value="1f" />
-        <keyframe
-            android:fraction=".423"
-            android:interpolator="@interpolator/disco_bounce"
-            android:value="0.9738f" />
-        <keyframe
-            android:fraction="0.754"
-            android:interpolator="@interpolator/disco_bounce"
-            android:value="1f" />
-        <keyframe
-            android:fraction="1"
-            android:value="1f" />
-    </propertyValuesHolder>
-</objectAnimator>
diff --git a/res/animator/discovery_bounce.xml b/res/animator/discovery_bounce.xml
index f02ebdbace..f5548537b1 100644
--- a/res/animator/discovery_bounce.xml
+++ b/res/animator/discovery_bounce.xml
@@ -16,20 +16,28 @@
 ** limitations under the License.
 */
 -->
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:ordering="sequentially">
-    <objectAnimator
-        android:duration="166"
-        android:interpolator="@interpolator/disco_bounce"
+<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="2166"
+    android:repeatCount="5">
+    <propertyValuesHolder
         android:propertyName="progress"
-        android:startOffset="750"
-        android:valueFrom="1f"
-        android:valueTo="0.9438f"
-        android:valueType="floatType" />
-    <objectAnimator
-        android:duration="500"
-        android:interpolator="@interpolator/disco_bounce"
-        android:propertyName="progress"
-        android:valueTo="1f"
-        android:valueType="floatType" />
-</set>
+        android:valueType="floatType">
+        <keyframe
+            android:fraction="0"
+            android:value="1f" />
+        <keyframe
+            android:fraction="0.246"
+            android:value="1f" />
+        <keyframe
+            android:fraction=".423"
+            android:interpolator="@interpolator/disco_bounce"
+            android:value="0.9738f" />
+        <keyframe
+            android:fraction="0.754"
+            android:interpolator="@interpolator/disco_bounce"
+            android:value="1f" />
+        <keyframe
+            android:fraction="1"
+            android:value="1f" />
+    </propertyValuesHolder>
+</objectAnimator>
diff --git a/res/color-v24/all_apps_bg_hand_fill.xml b/res/color/all_apps_bg_hand_fill.xml
similarity index 100%
rename from res/color-v24/all_apps_bg_hand_fill.xml
rename to res/color/all_apps_bg_hand_fill.xml
diff --git a/res/color-v24/all_apps_bg_hand_fill_dark.xml b/res/color/all_apps_bg_hand_fill_dark.xml
similarity index 100%
rename from res/color-v24/all_apps_bg_hand_fill_dark.xml
rename to res/color/all_apps_bg_hand_fill_dark.xml
diff --git a/res/drawable-v26/ic_deepshortcut_placeholder.xml b/res/drawable-v26/ic_deepshortcut_placeholder.xml
deleted file mode 100644
index 3fa85065bd..0000000000
--- a/res/drawable-v26/ic_deepshortcut_placeholder.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="?attr/popupColorSecondary"/>
-    <foreground android:drawable="?attr/popupColorSecondary"/>
-</adaptive-icon>
diff --git a/res/drawable-v26/ic_launcher_home.xml b/res/drawable-v26/ic_launcher_home.xml
deleted file mode 100644
index 7038775f35..0000000000
--- a/res/drawable-v26/ic_launcher_home.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/icon_background" />
-    <foreground>
-        <bitmap android:src="@mipmap/ic_launcher_home_foreground"/>
-    </foreground>
-</adaptive-icon>
diff --git a/res/drawable-v24/ic_block_shadow.xml b/res/drawable/ic_block_shadow.xml
similarity index 100%
rename from res/drawable-v24/ic_block_shadow.xml
rename to res/drawable/ic_block_shadow.xml
diff --git a/res/drawable/ic_deepshortcut_placeholder.xml b/res/drawable/ic_deepshortcut_placeholder.xml
index 85a9694501..3fa85065bd 100644
--- a/res/drawable/ic_deepshortcut_placeholder.xml
+++ b/res/drawable/ic_deepshortcut_placeholder.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<!--
+     Copyright (C) 2017 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -13,10 +14,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="oval">
-    <solid android:color="?attr/popupColorSecondary" />
-    <size
-        android:height="32dp"
-        android:width="32dp" />
-</shape>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="?attr/popupColorSecondary"/>
+    <foreground android:drawable="?attr/popupColorSecondary"/>
+</adaptive-icon>
diff --git a/res/drawable/ic_launcher_home.xml b/res/drawable/ic_launcher_home.xml
index a6f2519954..7038775f35 100644
--- a/res/drawable/ic_launcher_home.xml
+++ b/res/drawable/ic_launcher_home.xml
@@ -13,6 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<bitmap
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@mipmap/ic_launcher_home" />
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/icon_background" />
+    <foreground>
+        <bitmap android:src="@mipmap/ic_launcher_home_foreground"/>
+    </foreground>
+</adaptive-icon>
diff --git a/res/drawable-v24/ic_remove_shadow.xml b/res/drawable/ic_remove_shadow.xml
similarity index 100%
rename from res/drawable-v24/ic_remove_shadow.xml
rename to res/drawable/ic_remove_shadow.xml
diff --git a/res/drawable-v24/ic_setup_shadow.xml b/res/drawable/ic_setup_shadow.xml
similarity index 100%
rename from res/drawable-v24/ic_setup_shadow.xml
rename to res/drawable/ic_setup_shadow.xml
diff --git a/res/drawable-v24/ic_uninstall_shadow.xml b/res/drawable/ic_uninstall_shadow.xml
similarity index 100%
rename from res/drawable-v24/ic_uninstall_shadow.xml
rename to res/drawable/ic_uninstall_shadow.xml
diff --git a/res/mipmap-hdpi/ic_launcher_home.png b/res/mipmap-hdpi/ic_launcher_home.png
deleted file mode 100644
index d068d92361a06550fb1bcdf36fbc4bf56242d54e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 236
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~M1W6-E06|){rmU-|Ns9C14G(O
z28NkujJG~Lkd;*dlwd3g@(X5gcy=QV$Z7I)aSW-r_4dL>z6Jx1mc(q=`~Q1QL!@ST
zvx^@#{d2kXq4bSSI^01QuQhjd%Q~fAzm?V=urg{pU$2PM(daz_S{a5;E6(U}afk}8
z47;BZ=<q}K;;y1y2e^1ePfuCM7JH35a-!n-&|LZ14sHRCM%z@r#E3MlP}E-d;==SK
dr^so4@9}c{5tZE2kPGq`gQu&X%Q~loCIIuURvG{R

diff --git a/res/mipmap-mdpi/ic_launcher_home.png b/res/mipmap-mdpi/ic_launcher_home.png
deleted file mode 100644
index 16c8ec2e50d313f9772623ed0e0300b0a799b627..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 216
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)IBm#UwT!AzY?BBot|NsAI7#PxK
zGBC_MW4!h0fvl_wpaf${kY6x^!?PP{Ku(^gi(^Oy<J~jtf(HzEoG%6mv<4V}5y#(C
zFYi^q`c_|ls?H)ox#2cTL-7Hvj9nZ@f13uBP7b|L0>+{T*7@8zVPfLG>P=&IiV(vR
zKTbn8<}=KmM{as0#4%>w<_hqP=C9KIV#aG9#kVxgf8%cH=Mf+Wdb;|#taD0e0sys(
BO-=v+

diff --git a/res/mipmap-xhdpi/ic_launcher_home.png b/res/mipmap-xhdpi/ic_launcher_home.png
deleted file mode 100644
index 8b2671bdd80f36d23f2f3d45842dfb78092feec3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 235
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeE3?v1%WpM*3i2$DvS0D`p`}gnv|Ns9P28Ohm
z3=A{R7;k-gAS<f^D8X0~<QL4~@a#q!kkjbt;uuoF`1ZV~AhRKlOJJ}7Yp?{Dv!jTU
z;+M<YrX5~$e8=i9=l<^9V!l*_@tuQAzQP5^2IG#OY}4Kx5R!R5v4Hh>rHabI#5x}f
zrrE1+d3>F*Mn=YdO~U8??v%F<%Vx|LtWoD~o66j6_Tr_4iL*dP62FU^fCO{!!Tn9@
cJd9I<>I_fVT@aRE69aOyr>mdKI;Vst0EsD5ZU6uP

diff --git a/res/mipmap-xxhdpi/ic_launcher_home.png b/res/mipmap-xxhdpi/ic_launcher_home.png
deleted file mode 100644
index 43d8b7d886c9a928c666b0af551a1ab35c365aae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 266
zcmeAS@N?(olHy`uVBq!ia0vp^6F``S8Ays|{O<-*5&=FTu0R?H_V3^S|Ns9p3=C;A
z85m}sG2Z(0Kvq@-P=c`}$S;_|;n|HeAZLN6i(^Oy<J*huf`<)w94-b4v<4Wo0?8na
zKYUNu1Yfe<`)~i#X#Y)n6_u2vv^F+KHK|--VNto3(iv*WA~H2)=hm%Wjt=LwFKY2I
z+OBuuUSaWNkI-5#1%>bs)2ELra~Vb3uF0>TroB60O9PkFq+(Sw=ihUjiyf9KJfCE$
zyPMIKX@$*_(+#(pT#hU#bue`n6A-xYec^LvEq*~k!LJttIo_Q0KfmWG6Ua-Ru6{1-
HoD!M<4rE|^

diff --git a/res/values-night-v26/styles.xml b/res/values-night/styles.xml
similarity index 100%
rename from res/values-night-v26/styles.xml
rename to res/values-night/styles.xml
diff --git a/res/values-v22/styles.xml b/res/values-v22/styles.xml
deleted file mode 100644
index f86db7a493..0000000000
--- a/res/values-v22/styles.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-* Copyright (C) 2018 The Android Open Source Project
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
--->
-
-<resources>
-
-    <style name="AppItemActivityTheme" parent="@android:style/Theme.DeviceDefault.Light.Dialog.Alert">
-        <item name="widgetsTheme">@style/WidgetContainerTheme</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/res/values-v26/bools.xml b/res/values-v26/bools.xml
deleted file mode 100644
index ad8c7a1865..0000000000
--- a/res/values-v26/bools.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* Copyright 2017, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources>
-    <bool name="notification_dots_enabled">true</bool>
-
-    <bool name="enable_install_shortcut_api">false</bool>
-</resources>
\ No newline at end of file
diff --git a/res/values-v26/styles.xml b/res/values-v26/styles.xml
deleted file mode 100644
index d2f0802fa5..0000000000
--- a/res/values-v26/styles.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-* Copyright (C) 2017 The Android Open Source Project
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
--->
-<resources>
-    <!-- Theme for the widget container. -->
-    <style name="WidgetContainerTheme" parent="@android:style/Theme.DeviceDefault.Settings">
-        <item name="android:colorPrimaryDark">#E8EAED</item>
-        <item name="android:textColorSecondary">?android:attr/textColorPrimary</item>
-        <item name="android:colorEdgeEffect">?android:attr/textColorSecondary</item>
-    </style>
-    <style name="WidgetContainerTheme.Dark" parent="AppTheme.Dark">
-        <item name="android:colorEdgeEffect">?android:attr/textColorSecondary</item>
-        <item name="android:colorPrimaryDark">#616161</item> <!-- Gray 700 -->
-    </style>
-
-</resources>
diff --git a/res/values/bools.xml b/res/values/bools.xml
deleted file mode 100644
index bc2c678874..0000000000
--- a/res/values/bools.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* Copyright 2017, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources>
-    <bool name="notification_dots_enabled">false</bool>
-
-    <bool name="enable_install_shortcut_api">true</bool>
-</resources>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 043ad9a9d5..f56fbaaace 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -35,9 +35,6 @@
 
     <color name="icon_background">#E0E0E0</color> <!-- Gray 300 -->
 
-    <color name="all_apps_bg_hand_fill">#E5E5E5</color>
-    <color name="all_apps_bg_hand_fill_dark">#9AA0A6</color>
-
     <color name="gesture_tutorial_ripple_color">#A0C2F9</color> <!-- Light Blue -->
     <color name="gesture_tutorial_fake_task_view_color">#6DA1FF</color> <!-- Light Blue -->
     <color name="gesture_tutorial_action_button_label_color">#FFFFFFFF</color>
diff --git a/res/values/drawables.xml b/res/values/drawables.xml
deleted file mode 100644
index 9c57ec1214..0000000000
--- a/res/values/drawables.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <drawable name="ic_setup_shadow">@drawable/ic_setting</drawable>
-    <drawable name="ic_remove_shadow">@drawable/ic_remove_no_shadow</drawable>
-    <drawable name="ic_uninstall_shadow">@drawable/ic_uninstall_no_shadow</drawable>
-    <drawable name="ic_block_shadow">@drawable/ic_block_no_shadow</drawable>
-</resources>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3b9532eeee..fd3d873635 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -143,7 +143,7 @@
     <style name="AppTheme.Dark.DarkMainColor" parent="@style/LauncherTheme.Dark.DarkMainColor" />
     <style name="AppTheme.Dark.DarkText" parent="@style/LauncherTheme.Dark.DarkText" />
 
-    <style name="AppItemActivityTheme" parent="@android:style/Theme.Material.Light.Dialog.Alert">
+    <style name="AppItemActivityTheme" parent="@android:style/Theme.DeviceDefault.Light.Dialog.Alert">
         <item name="widgetsTheme">@style/WidgetContainerTheme</item>
     </style>
 
@@ -171,14 +171,16 @@
         <item name="android:textColorSecondary">?attr/workspaceTextColor</item>
     </style>
 
-    <!-- Theme for the widget container. Overridden on API 26. -->
+    <!-- Theme for the widget container. -->
     <style name="WidgetContainerTheme" parent="@android:style/Theme.DeviceDefault.Settings">
-        <item name="android:colorEdgeEffect">?android:attr/textColorSecondaryInverse</item>
-        <item name="android:textColorPrimary">?android:attr/textColorPrimaryInverse</item>
-        <item name="android:textColorSecondary">?android:attr/textColorSecondaryInverse</item>
+        <item name="android:colorPrimaryDark">#E8EAED</item>
+        <item name="android:textColorSecondary">?android:attr/textColorPrimary</item>
+        <item name="android:colorEdgeEffect">?android:attr/textColorSecondary</item>
+    </style>
+    <style name="WidgetContainerTheme.Dark" parent="AppTheme.Dark">
+        <item name="android:colorEdgeEffect">?android:attr/textColorSecondary</item>
+        <item name="android:colorPrimaryDark">#616161</item> <!-- Gray 700 -->
     </style>
-
-    <style name="WidgetContainerTheme.Dark" />
 
     <style name="FastScrollerPopup" parent="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle">
         <item name="android:layout_width">wrap_content</item>
diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java
index ce37a30160..3bfe379257 100644
--- a/src/com/android/launcher3/AbstractFloatingView.java
+++ b/src/com/android/launcher3/AbstractFloatingView.java
@@ -16,6 +16,7 @@
 
 package com.android.launcher3;
 
+import static android.animation.ValueAnimator.areAnimatorsEnabled;
 import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED;
 import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED;
 
@@ -126,7 +127,7 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
     }
 
     public final void close(boolean animate) {
-        animate &= Utilities.areAnimationsEnabled(getContext());
+        animate &= areAnimatorsEnabled();
         if (mIsOpen) {
             BaseActivity.fromContext(getContext()).getUserEventDispatcher()
                     .resetElapsedContainerMillis("container closed");
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 89d768c302..1cd201f99e 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -16,6 +16,8 @@
 
 package com.android.launcher3;
 
+import static android.animation.ValueAnimator.areAnimatorsEnabled;
+
 import static com.android.launcher3.anim.Interpolators.DEACCEL_1_5;
 
 import android.animation.Animator;
@@ -2009,7 +2011,7 @@ public class CellLayout extends ViewGroup {
             // Animations are disabled in power save mode, causing the repeated animation to jump
             // spastically between beginning and end states. Since this looks bad, we don't repeat
             // the animation in power save mode.
-            if (Utilities.areAnimationsEnabled(getContext())) {
+            if (areAnimatorsEnabled()) {
                 va.setRepeatMode(ValueAnimator.REVERSE);
                 va.setRepeatCount(ValueAnimator.INFINITE);
             }
diff --git a/src/com/android/launcher3/InstallShortcutReceiver.java b/src/com/android/launcher3/InstallShortcutReceiver.java
index 62c9b4dc93..be6adc751f 100644
--- a/src/com/android/launcher3/InstallShortcutReceiver.java
+++ b/src/com/android/launcher3/InstallShortcutReceiver.java
@@ -20,7 +20,6 @@ import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProviderInfo;
-import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -69,7 +68,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-public class InstallShortcutReceiver extends BroadcastReceiver {
+public class InstallShortcutReceiver {
 
     public static final int FLAG_ACTIVITY_PAUSED = 1;
     public static final int FLAG_LOADER_RUNNING = 2;
@@ -82,9 +81,6 @@ public class InstallShortcutReceiver extends BroadcastReceiver {
     private static final String TAG = "InstallShortcutReceiver";
     private static final boolean DBG = false;
 
-    private static final String ACTION_INSTALL_SHORTCUT =
-            "com.android.launcher.action.INSTALL_SHORTCUT";
-
     private static final String LAUNCH_INTENT_KEY = "intent.launch";
     private static final String NAME_KEY = "name";
     private static final String ICON_KEY = "icon";
@@ -188,25 +184,6 @@ public class InstallShortcutReceiver extends BroadcastReceiver {
         sp.edit().putStringSet(APPS_PENDING_INSTALL, newStrings).apply();
     }
 
-    public void onReceive(Context context, Intent data) {
-        if (!ACTION_INSTALL_SHORTCUT.equals(data.getAction())) {
-            return;
-        }
-        PendingInstallShortcutInfo info = createPendingInfo(context, data);
-        if (info != null) {
-            if (!info.isLauncherActivity()) {
-                // Since its a custom shortcut, verify that it is safe to launch.
-                if (!new PackageManagerHelper(context).hasPermissionForActivity(
-                        info.launchIntent, null)) {
-                    // Target cannot be launched, or requires some special permission to launch
-                    Log.e(TAG, "Ignoring malicious intent " + info.launchIntent.toUri(0));
-                    return;
-                }
-            }
-            queuePendingShortcutInfo(info, context);
-        }
-    }
-
     /**
      * @return true is the extra is either null or is of type {@param type}
      */
@@ -251,6 +228,10 @@ public class InstallShortcutReceiver extends BroadcastReceiver {
         queuePendingShortcutInfo(new PendingInstallShortcutInfo(info, widgetId, context), context);
     }
 
+    public static void queueApplication(LauncherActivityInfo info, Context context) {
+        queuePendingShortcutInfo(new PendingInstallShortcutInfo(info, context), context);
+    }
+
     public static void queueApplication(Intent data, UserHandle user, Context context) {
         queuePendingShortcutInfo(new PendingInstallShortcutInfo(data, context, user),
                 context);
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index db1f1b0c6a..f87c34435a 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1196,11 +1196,8 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         int[] cellXY = mTmpAddItemCellCoordinates;
         CellLayout layout = getCellLayout(container, screenId);
 
-        WorkspaceItemInfo info = null;
-        if (Utilities.ATLEAST_OREO) {
-            info = PinRequestHelper.createWorkspaceItemFromPinItemRequest(
+        WorkspaceItemInfo info = PinRequestHelper.createWorkspaceItemFromPinItemRequest(
                     this, PinRequestHelper.getPinItemRequest(data), 0);
-        }
 
         if (info == null) {
             // Legacy shortcuts are only supported for primary profile.
diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index e3fe87d1e9..782a8699cc 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -109,15 +109,11 @@ public class LauncherAppState {
         mInstallSessionTracker = InstallSessionHelper.INSTANCE.get(context)
                 .registerInstallTracker(mModel, MODEL_EXECUTOR);
 
-        if (!mContext.getResources().getBoolean(R.bool.notification_dots_enabled)) {
-            mNotificationDotsObserver = null;
-        } else {
-            // Register an observer to rebind the notification listener when dots are re-enabled.
-            mNotificationDotsObserver =
-                    newNotificationSettingsObserver(mContext, this::onNotificationSettingsChanged);
-            mNotificationDotsObserver.register();
-            mNotificationDotsObserver.dispatchOnChange();
-        }
+        // Register an observer to rebind the notification listener when dots are re-enabled.
+        mNotificationDotsObserver =
+                newNotificationSettingsObserver(mContext, this::onNotificationSettingsChanged);
+        mNotificationDotsObserver.register();
+        mNotificationDotsObserver.dispatchOnChange();
     }
 
     public LauncherAppState(Context context, @Nullable String iconCacheFileName) {
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index e8b5568783..fdbbf4e0d8 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -872,7 +872,6 @@ public class LauncherProvider extends ContentProvider {
          * Removes widgets which are registered to the Launcher's host, but are not present
          * in our model.
          */
-        @TargetApi(Build.VERSION_CODES.O)
         public void removeGhostWidgets(SQLiteDatabase db) {
             // Get all existing widget ids.
             final AppWidgetHost host = newLauncherWidgetHost();
diff --git a/src/com/android/launcher3/MainProcessInitializer.java b/src/com/android/launcher3/MainProcessInitializer.java
index 5f6ecb5510..f2a3de7dca 100644
--- a/src/com/android/launcher3/MainProcessInitializer.java
+++ b/src/com/android/launcher3/MainProcessInitializer.java
@@ -38,7 +38,6 @@ public class MainProcessInitializer implements ResourceBasedOverride {
     protected void init(Context context) {
         FileLog.setDir(context.getApplicationContext().getFilesDir());
         FeatureFlags.initialize(context);
-        SessionCommitReceiver.applyDefaultUserPrefs(context);
         IconShape.init(context);
 
         if (BitmapCreationCheck.ENABLED) {
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index e13d89f184..4303dee769 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -195,9 +195,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         mMinFlingVelocity = (int) (MIN_FLING_VELOCITY * density);
         mMinSnapVelocity = (int) (MIN_SNAP_VELOCITY * density);
 
-        if (Utilities.ATLEAST_OREO) {
-            setDefaultFocusHighlightEnabled(false);
-        }
+        setDefaultFocusHighlightEnabled(false);
     }
 
     protected void setDefaultInterpolator(Interpolator interpolator) {
diff --git a/src/com/android/launcher3/SessionCommitReceiver.java b/src/com/android/launcher3/SessionCommitReceiver.java
index 89f0a3d286..a8d6490a5b 100644
--- a/src/com/android/launcher3/SessionCommitReceiver.java
+++ b/src/com/android/launcher3/SessionCommitReceiver.java
@@ -16,55 +16,32 @@
 
 package com.android.launcher3;
 
-import static com.android.launcher3.pm.InstallSessionHelper.getUserHandle;
-
-import android.annotation.TargetApi;
 import android.content.BroadcastReceiver;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.pm.LauncherActivityInfo;
 import android.content.pm.LauncherApps;
 import android.content.pm.PackageInstaller;
 import android.content.pm.PackageInstaller.SessionInfo;
 import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Build;
 import android.os.UserHandle;
-import android.provider.Settings;
 import android.text.TextUtils;
-import android.util.Log;
 
 import com.android.launcher3.pm.InstallSessionHelper;
-import com.android.launcher3.util.Executors;
 
 import java.util.List;
 
 /**
  * BroadcastReceiver to handle session commit intent.
  */
-@TargetApi(Build.VERSION_CODES.O)
 public class SessionCommitReceiver extends BroadcastReceiver {
 
-    private static final String TAG = "SessionCommitReceiver";
-
-    // The content provider for the add to home screen setting. It should be of the format:
-    // <package name>.addtohomescreen
-    private static final String MARKER_PROVIDER_PREFIX = ".addtohomescreen";
-
     // Preference key for automatically adding icon to homescreen.
     public static final String ADD_ICON_PREFERENCE_KEY = "pref_add_icon_to_home";
-    public static final String ADD_ICON_PREFERENCE_INITIALIZED_KEY =
-            "pref_add_icon_to_home_initialized";
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        if (!isEnabled(context) || !Utilities.ATLEAST_OREO) {
+        if (!isEnabled(context)) {
             // User has decided to not add icons on homescreen.
             return;
         }
@@ -89,16 +66,6 @@ public class SessionCommitReceiver extends BroadcastReceiver {
         queueAppIconAddition(context, info.getAppPackageName(), user);
     }
 
-    public static void queuePromiseAppIconAddition(Context context, SessionInfo sessionInfo) {
-        String packageName = sessionInfo.getAppPackageName();
-        if (context.getSystemService(LauncherApps.class)
-                .getActivityList(packageName, getUserHandle(sessionInfo)).isEmpty()) {
-            // Ensure application isn't already installed.
-            queueAppIconAddition(context, packageName, sessionInfo.getAppLabel(),
-                    sessionInfo.getAppIcon(), getUserHandle(sessionInfo));
-        }
-    }
-
     public static void queueAppIconAddition(Context context, String packageName, UserHandle user) {
         List<LauncherActivityInfo> activities = context.getSystemService(LauncherApps.class)
                 .getActivityList(packageName, user);
@@ -106,85 +73,11 @@ public class SessionCommitReceiver extends BroadcastReceiver {
             // no activity found
             return;
         }
-        queueAppIconAddition(context, packageName, activities.get(0).getLabel(), null, user);
-    }
-
-    private static void queueAppIconAddition(Context context, String packageName,
-            CharSequence label, Bitmap icon, UserHandle user) {
-        Intent data = new Intent();
-        data.putExtra(Intent.EXTRA_SHORTCUT_INTENT, new Intent().setComponent(
-                new ComponentName(packageName, "")).setPackage(packageName));
-        data.putExtra(Intent.EXTRA_SHORTCUT_NAME, label);
-        data.putExtra(Intent.EXTRA_SHORTCUT_ICON, icon);
 
-        InstallShortcutReceiver.queueApplication(data, user, context);
+        InstallShortcutReceiver.queueApplication(activities.get(0), context);
     }
 
     public static boolean isEnabled(Context context) {
         return Utilities.getPrefs(context).getBoolean(ADD_ICON_PREFERENCE_KEY, true);
     }
-
-    public static void applyDefaultUserPrefs(final Context context) {
-        if (!Utilities.ATLEAST_OREO) {
-            return;
-        }
-        SharedPreferences prefs = Utilities.getPrefs(context);
-        if (prefs.getAll().isEmpty()) {
-            // This logic assumes that the code is the first thing that is executed (before any
-            // shared preference is written).
-            // TODO: Move this logic to DB upgrade once we have proper support for db downgrade
-            // If it is a fresh start, just apply the default value. We use prefs.isEmpty() to infer
-            // a fresh start as put preferences always contain some values corresponding to current
-            // grid.
-            prefs.edit().putBoolean(ADD_ICON_PREFERENCE_KEY, true).apply();
-        } else if (!prefs.contains(ADD_ICON_PREFERENCE_INITIALIZED_KEY)) {
-            new PrefInitTask(context).executeOnExecutor(Executors.THREAD_POOL_EXECUTOR);
-        }
-    }
-
-    private static class PrefInitTask extends AsyncTask<Void, Void, Void> {
-        private final Context mContext;
-
-        PrefInitTask(Context context) {
-            mContext = context;
-        }
-
-        @Override
-        protected Void doInBackground(Void... voids) {
-            boolean addIconToHomeScreenEnabled = readValueFromMarketApp();
-            Utilities.getPrefs(mContext).edit()
-                    .putBoolean(ADD_ICON_PREFERENCE_KEY, addIconToHomeScreenEnabled)
-                    .putBoolean(ADD_ICON_PREFERENCE_INITIALIZED_KEY, true)
-                    .apply();
-            return null;
-        }
-
-        public boolean readValueFromMarketApp() {
-            // Get the marget package
-            ResolveInfo ri = mContext.getPackageManager().resolveActivity(
-                    new Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_APP_MARKET),
-                    PackageManager.MATCH_DEFAULT_ONLY | PackageManager.MATCH_SYSTEM_ONLY);
-            if (ri == null) {
-                return true;
-            }
-
-            Cursor c = null;
-            try {
-                c = mContext.getContentResolver().query(
-                        Uri.parse("content://" + ri.activityInfo.packageName
-                                + MARKER_PROVIDER_PREFIX),
-                        null, null, null, null);
-                if (c.moveToNext()) {
-                    return c.getInt(c.getColumnIndexOrThrow(Settings.NameValueTable.VALUE)) != 0;
-                }
-            } catch (Exception e) {
-                Log.d(TAG, "Error reading add to homescreen preference", e);
-            } finally {
-                if (c != null) {
-                    c.close();
-                }
-            }
-            return true;
-        }
-    }
 }
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index bf637886b7..068d0bc6ac 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -18,7 +18,6 @@ package com.android.launcher3;
 
 import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_ICON_BADGED;
 
-import android.animation.ValueAnimator;
 import android.annotation.TargetApi;
 import android.app.ActivityManager;
 import android.app.Person;
@@ -48,7 +47,6 @@ import android.os.Build;
 import android.os.DeadObjectException;
 import android.os.Handler;
 import android.os.Message;
-import android.os.PowerManager;
 import android.os.TransactionTooLargeException;
 import android.provider.Settings;
 import android.text.Spannable;
@@ -65,7 +63,6 @@ import android.view.animation.Interpolator;
 
 import androidx.core.os.BuildCompat;
 
-import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.dragndrop.FolderAdaptiveIcon;
 import com.android.launcher3.graphics.GridOptionsProvider;
 import com.android.launcher3.graphics.TintedDrawableSpan;
@@ -113,12 +110,6 @@ public final class Utilities {
     public static final boolean ATLEAST_P =
             Build.VERSION.SDK_INT >= Build.VERSION_CODES.P;
 
-    public static final boolean ATLEAST_OREO_MR1 =
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1;
-
-    public static final boolean ATLEAST_OREO =
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
-
     /**
      * Set on a motion event dispatched from the nav bar. See {@link MotionEvent#setEdgeFlags(int)}.
      */
@@ -494,21 +485,6 @@ public final class Utilities {
                 LauncherFiles.DEVICE_PREFERENCES_KEY, Context.MODE_PRIVATE);
     }
 
-    /**
-     * @return {@link SharedPreferences} that backs {@link FeatureFlags}
-     */
-    public static SharedPreferences getFeatureFlagsPrefs(Context context) {
-        // Use application context for shared preferences, so that we use a single cached instance
-        return context.getApplicationContext().getSharedPreferences(
-            FeatureFlags.FLAGS_PREF_NAME, Context.MODE_PRIVATE);
-    }
-
-    public static boolean areAnimationsEnabled(Context context) {
-        return ATLEAST_OREO
-                ? ValueAnimator.areAnimatorsEnabled()
-                : !context.getSystemService(PowerManager.class).isPowerSaveMode();
-    }
-
     public static boolean isWallpaperAllowed(Context context) {
         return context.getSystemService(WallpaperManager.class).isSetWallpaperAllowed();
     }
diff --git a/src/com/android/launcher3/dragndrop/DragView.java b/src/com/android/launcher3/dragndrop/DragView.java
index de0fa1a1f7..86b93d0aa3 100644
--- a/src/com/android/launcher3/dragndrop/DragView.java
+++ b/src/com/android/launcher3/dragndrop/DragView.java
@@ -187,9 +187,6 @@ public class DragView extends View implements StateListener<LauncherState> {
      */
     @TargetApi(Build.VERSION_CODES.O)
     public void setItemInfo(final ItemInfo info) {
-        if (!Utilities.ATLEAST_OREO) {
-            return;
-        }
         if (info.itemType != LauncherSettings.Favorites.ITEM_TYPE_APPLICATION &&
                 info.itemType != LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT &&
                 info.itemType != LauncherSettings.Favorites.ITEM_TYPE_FOLDER) {
diff --git a/src/com/android/launcher3/graphics/IconShape.java b/src/com/android/launcher3/graphics/IconShape.java
index 4369385ae1..b208a40d35 100644
--- a/src/com/android/launcher3/graphics/IconShape.java
+++ b/src/com/android/launcher3/graphics/IconShape.java
@@ -43,8 +43,9 @@ import android.util.Xml;
 import android.view.View;
 import android.view.ViewOutlineProvider;
 
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.RoundedRectRevealOutlineProvider;
 import com.android.launcher3.icons.GraphicsUtils;
 import com.android.launcher3.icons.IconNormalizer;
@@ -59,8 +60,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.annotation.Nullable;
-
 /**
  * Abstract representation of the shape of an icon shape
  */
@@ -381,9 +380,6 @@ public abstract class IconShape {
      * Initializes the shape which is closest to the {@link AdaptiveIconDrawable}
      */
     public static void init(Context context) {
-        if (!Utilities.ATLEAST_OREO) {
-            return;
-        }
         pickBestShape(context);
     }
 
diff --git a/src/com/android/launcher3/model/PackageUpdatedTask.java b/src/com/android/launcher3/model/PackageUpdatedTask.java
index dca4ec0dcc..c0ae6f903c 100644
--- a/src/com/android/launcher3/model/PackageUpdatedTask.java
+++ b/src/com/android/launcher3/model/PackageUpdatedTask.java
@@ -24,7 +24,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.LauncherApps;
 import android.content.pm.ShortcutInfo;
-import android.os.Process;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.util.Log;
@@ -32,8 +31,6 @@ import android.util.Log;
 import com.android.launcher3.InstallShortcutReceiver;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherSettings.Favorites;
-import com.android.launcher3.SessionCommitReceiver;
-import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.IconCache;
@@ -108,11 +105,6 @@ public class PackageUpdatedTask extends BaseModelUpdateTask {
                         appsList.removePackage(packages[i], mUser);
                     }
                     appsList.addPackage(context, packages[i], mUser);
-
-                    // Automatically add homescreen icon for work profile apps for below O device.
-                    if (!Utilities.ATLEAST_OREO && !Process.myUserHandle().equals(mUser)) {
-                        SessionCommitReceiver.queueAppIconAddition(context, packages[i], mUser);
-                    }
                 }
                 flagOp = FlagOp.removeFlag(WorkspaceItemInfo.FLAG_DISABLED_NOT_AVAILABLE);
                 break;
@@ -331,7 +323,7 @@ public class PackageUpdatedTask extends BaseModelUpdateTask {
             InstallShortcutReceiver.removeFromInstallQueue(context, removedPackages, mUser);
         }
 
-        if (Utilities.ATLEAST_OREO && mOp == OP_ADD) {
+        if (mOp == OP_ADD) {
             // Load widgets for the new package. Changes due to app updates are handled through
             // AppWidgetHost events, this is just to initialize the long-press options.
             for (int i = 0; i < N; i++) {
diff --git a/src/com/android/launcher3/model/data/AppInfo.java b/src/com/android/launcher3/model/data/AppInfo.java
index b17b062c32..aee1f2a65b 100644
--- a/src/com/android/launcher3/model/data/AppInfo.java
+++ b/src/com/android/launcher3/model/data/AppInfo.java
@@ -138,8 +138,7 @@ public class AppInfo extends ItemInfoWithIcon {
         info.runtimeStatusFlags |= (appInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0
                 ? FLAG_SYSTEM_NO : FLAG_SYSTEM_YES;
 
-        if (Utilities.ATLEAST_OREO
-                && appInfo.targetSdkVersion >= Build.VERSION_CODES.O
+        if (appInfo.targetSdkVersion >= Build.VERSION_CODES.O
                 && Process.myUserHandle().equals(lai.getUser())) {
             // The icon for a non-primary user is badged, hence it's not exactly an adaptive icon.
             info.runtimeStatusFlags |= FLAG_ADAPTIVE_ICON;
diff --git a/src/com/android/launcher3/pm/InstallSessionHelper.java b/src/com/android/launcher3/pm/InstallSessionHelper.java
index 901d27f373..ce4644fdba 100644
--- a/src/com/android/launcher3/pm/InstallSessionHelper.java
+++ b/src/com/android/launcher3/pm/InstallSessionHelper.java
@@ -18,7 +18,9 @@ package com.android.launcher3.pm;
 
 import static com.android.launcher3.Utilities.getPrefs;
 
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.LauncherApps;
 import android.content.pm.PackageInstaller;
@@ -32,6 +34,7 @@ import android.text.TextUtils;
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 
+import com.android.launcher3.InstallShortcutReceiver;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.SessionCommitReceiver;
 import com.android.launcher3.Utilities;
@@ -167,7 +170,7 @@ public class InstallSessionHelper {
      * Attempt to restore workspace layout if the session is triggered due to device restore.
      */
     public boolean restoreDbIfApplicable(@NonNull final SessionInfo info) {
-        if (!Utilities.ATLEAST_OREO || !FeatureFlags.ENABLE_DATABASE_RESTORE.get()) {
+        if (!FeatureFlags.ENABLE_DATABASE_RESTORE.get()) {
             return false;
         }
         if (isRestore(info)) {
@@ -203,7 +206,7 @@ public class InstallSessionHelper {
      * - A promise icon for the session has not already been created
      */
     void tryQueuePromiseAppIcon(PackageInstaller.SessionInfo sessionInfo) {
-        if (Utilities.ATLEAST_OREO && FeatureFlags.PROMISE_APPS_NEW_INSTALLS.get()
+        if (FeatureFlags.PROMISE_APPS_NEW_INSTALLS.get()
                 && SessionCommitReceiver.isEnabled(mAppContext)
                 && verify(sessionInfo) != null
                 && sessionInfo.getInstallReason() == PackageManager.INSTALL_REASON_USER
@@ -212,7 +215,21 @@ public class InstallSessionHelper {
                 && !mPromiseIconIds.contains(sessionInfo.getSessionId())
                 && new PackageManagerHelper(mAppContext).getApplicationInfo(
                         sessionInfo.getAppPackageName(), getUserHandle(sessionInfo), 0) == null) {
-            SessionCommitReceiver.queuePromiseAppIconAddition(mAppContext, sessionInfo);
+
+            String packageName = sessionInfo.getAppPackageName();
+            if (mAppContext.getSystemService(LauncherApps.class)
+                    .getActivityList(packageName, getUserHandle(sessionInfo)).isEmpty()) {
+                // Ensure application isn't already installed.
+                Intent data = new Intent();
+                data.putExtra(Intent.EXTRA_SHORTCUT_INTENT, new Intent().setComponent(
+                        new ComponentName(packageName, "")).setPackage(packageName));
+                data.putExtra(Intent.EXTRA_SHORTCUT_NAME, sessionInfo.getAppLabel());
+                data.putExtra(Intent.EXTRA_SHORTCUT_ICON, sessionInfo.getAppIcon());
+
+                InstallShortcutReceiver.queueApplication(data, getUserHandle(sessionInfo),
+                        mAppContext);
+            }
+
             mPromiseIconIds.add(sessionInfo.getSessionId());
             updatePromiseIconPrefs();
         }
diff --git a/src/com/android/launcher3/pm/ShortcutConfigActivityInfo.java b/src/com/android/launcher3/pm/ShortcutConfigActivityInfo.java
index 40d7031ac0..7af14c64ab 100644
--- a/src/com/android/launcher3/pm/ShortcutConfigActivityInfo.java
+++ b/src/com/android/launcher3/pm/ShortcutConfigActivityInfo.java
@@ -27,7 +27,6 @@ import android.content.pm.ActivityInfo;
 import android.content.pm.LauncherActivityInfo;
 import android.content.pm.LauncherApps;
 import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Process;
@@ -39,13 +38,13 @@ import androidx.annotation.Nullable;
 
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
 import com.android.launcher3.icons.ComponentWithLabelAndIcon;
 import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.util.PackageUserKey;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -175,37 +174,23 @@ public abstract class ShortcutConfigActivityInfo implements ComponentWithLabelAn
         List<ShortcutConfigActivityInfo> result = new ArrayList<>();
         UserHandle myUser = Process.myUserHandle();
 
-        if (Utilities.ATLEAST_OREO) {
-            final List<UserHandle> users;
-            final String packageName;
-            if (packageUser == null) {
-                users = UserCache.INSTANCE.get(context).getUserProfiles();
-                packageName = null;
-            } else {
-                users = new ArrayList<>(1);
-                users.add(packageUser.mUser);
-                packageName = packageUser.mPackageName;
-            }
-            LauncherApps launcherApps = context.getSystemService(LauncherApps.class);
-            for (UserHandle user : users) {
-                boolean ignoreTargetSdk = myUser.equals(user);
-                for (LauncherActivityInfo activityInfo :
-                        launcherApps.getShortcutConfigActivityList(packageName, user)) {
-                    if (ignoreTargetSdk || activityInfo.getApplicationInfo().targetSdkVersion
-                            >= Build.VERSION_CODES.O) {
-                        result.add(new ShortcutConfigActivityInfoVO(activityInfo));
-                    }
-                }
-            }
+        final List<UserHandle> users;
+        final String packageName;
+        if (packageUser == null) {
+            users = UserCache.INSTANCE.get(context).getUserProfiles();
+            packageName = null;
         } else {
-            if (packageUser == null || packageUser.mUser.equals(myUser)) {
-                Intent intent = new Intent(Intent.ACTION_CREATE_SHORTCUT);
-                if (packageUser != null) {
-                    intent.setPackage(packageUser.mPackageName);
-                }
-                for (ResolveInfo info :
-                        context.getPackageManager().queryIntentActivities(intent, 0)) {
-                    result.add(new ShortcutConfigActivityInfoVL(info.activityInfo));
+            users = Collections.singletonList(packageUser.mUser);
+            packageName = packageUser.mPackageName;
+        }
+        LauncherApps launcherApps = context.getSystemService(LauncherApps.class);
+        for (UserHandle user : users) {
+            boolean ignoreTargetSdk = myUser.equals(user);
+            for (LauncherActivityInfo activityInfo :
+                    launcherApps.getShortcutConfigActivityList(packageName, user)) {
+                if (ignoreTargetSdk || activityInfo.getApplicationInfo().targetSdkVersion
+                        >= Build.VERSION_CODES.O) {
+                    result.add(new ShortcutConfigActivityInfoVO(activityInfo));
                 }
             }
         }
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index 614cf1401d..896fb186d4 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -52,7 +52,6 @@ import com.android.launcher3.DropTarget;
 import com.android.launcher3.DropTarget.DragObject;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
 import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
 import com.android.launcher3.accessibility.ShortcutMenuAccessibilityDelegate;
 import com.android.launcher3.dot.DotInfo;
@@ -400,9 +399,7 @@ public class PopupContainerWithArrow<T extends BaseDraggingActivity> extends Arr
         } else if (view instanceof ImageView) {
             // Only the system shortcut icon shows on a gray background header.
             info.setIconAndContentDescriptionFor((ImageView) view);
-            if (Utilities.ATLEAST_OREO) {
-                view.setTooltipText(view.getContentDescription());
-            }
+            view.setTooltipText(view.getContentDescription());
         }
         view.setTag(info);
         view.setOnClickListener(info);
diff --git a/src/com/android/launcher3/settings/SettingsActivity.java b/src/com/android/launcher3/settings/SettingsActivity.java
index d3213a1871..ec3a467224 100644
--- a/src/com/android/launcher3/settings/SettingsActivity.java
+++ b/src/com/android/launcher3/settings/SettingsActivity.java
@@ -18,7 +18,6 @@ package com.android.launcher3.settings;
 
 import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ACCESSIBILITY_FOCUS;
 
-import static com.android.launcher3.SessionCommitReceiver.ADD_ICON_PREFERENCE_KEY;
 import static com.android.launcher3.states.RotationHelper.ALLOW_ROTATION_PREFERENCE_KEY;
 import static com.android.launcher3.states.RotationHelper.getAllowRotationDefaultValue;
 import static com.android.launcher3.util.SecureSettingsObserver.newNotificationSettingsObserver;
@@ -172,11 +171,6 @@ public class SettingsActivity extends FragmentActivity
         protected boolean initPreference(Preference preference) {
             switch (preference.getKey()) {
                 case NOTIFICATION_DOTS_PREFERENCE_KEY:
-                    if (!Utilities.ATLEAST_OREO ||
-                            !getResources().getBoolean(R.bool.notification_dots_enabled)) {
-                        return false;
-                    }
-
                     // Listen to system notification dot settings while this UI is active.
                     mNotificationDotsObserver = newNotificationSettingsObserver(
                             getActivity(), (NotificationDotsPreference) preference);
@@ -188,9 +182,6 @@ public class SettingsActivity extends FragmentActivity
                     mNotificationDotsObserver.dispatchOnChange();
                     return true;
 
-                case ADD_ICON_PREFERENCE_KEY:
-                    return Utilities.ATLEAST_OREO;
-
                 case ALLOW_ROTATION_PREFERENCE_KEY:
                     if (getResources().getBoolean(R.bool.allow_rotation)) {
                         // Launcher supports rotation by default. No need to show this setting.
diff --git a/src/com/android/launcher3/statemanager/StateManager.java b/src/com/android/launcher3/statemanager/StateManager.java
index 60b87d984b..6ff1254245 100644
--- a/src/com/android/launcher3/statemanager/StateManager.java
+++ b/src/com/android/launcher3/statemanager/StateManager.java
@@ -16,6 +16,8 @@
 
 package com.android.launcher3.statemanager;
 
+import static android.animation.ValueAnimator.areAnimatorsEnabled;
+
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_COMPONENTS;
 
 import android.animation.Animator;
@@ -26,7 +28,6 @@ import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
 
-import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
@@ -179,7 +180,7 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
 
     private void goToState(STATE_TYPE state, boolean animated, long delay,
             final Runnable onCompleteRunnable) {
-        animated &= Utilities.areAnimationsEnabled(mActivity);
+        animated &= areAnimatorsEnabled();
         if (mActivity.isInState(state)) {
             if (mConfig.currentAnimation == null) {
                 // Run any queued runnable
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index 66dbf6a73d..02ca92618e 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -513,15 +513,7 @@ public abstract class AbstractStateChangeTouchController
         if (mAtomicAnim == null) {
             return 0;
         }
-        if (Utilities.ATLEAST_OREO) {
-            return mAtomicAnim.getTotalDuration() - mAtomicAnim.getCurrentPlayTime();
-        } else {
-            long remainingDuration = 0;
-            for (Animator anim : mAtomicAnim.getChildAnimations()) {
-                remainingDuration = Math.max(remainingDuration, anim.getDuration());
-            }
-            return remainingDuration;
-        }
+        return mAtomicAnim.getTotalDuration() - mAtomicAnim.getCurrentPlayTime();
     }
 
     protected void updateSwipeCompleteAnimation(ValueAnimator animator, long expectedDuration,
diff --git a/src/com/android/launcher3/util/PackageManagerHelper.java b/src/com/android/launcher3/util/PackageManagerHelper.java
index 86f3431b54..523545af43 100644
--- a/src/com/android/launcher3/util/PackageManagerHelper.java
+++ b/src/com/android/launcher3/util/PackageManagerHelper.java
@@ -37,7 +37,6 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.PatternMatcher;
-import android.os.Process;
 import android.os.UserHandle;
 import android.text.TextUtils;
 import android.util.Log;
@@ -46,7 +45,6 @@ import android.widget.Toast;
 
 import com.android.launcher3.PendingAddItemInfo;
 import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
@@ -96,36 +94,12 @@ public class PackageManagerHelper {
      * Returns the application info for the provided package or null
      */
     public ApplicationInfo getApplicationInfo(String packageName, UserHandle user, int flags) {
-        if (Utilities.ATLEAST_OREO) {
-            try {
-                ApplicationInfo info = mLauncherApps.getApplicationInfo(packageName, flags, user);
-                return (info.flags & ApplicationInfo.FLAG_INSTALLED) == 0 || !info.enabled
-                        ? null : info;
-            } catch (PackageManager.NameNotFoundException e) {
-                return null;
-            }
-        } else {
-            final boolean isPrimaryUser = Process.myUserHandle().equals(user);
-            if (!isPrimaryUser && (flags == 0)) {
-                // We are looking for an installed app on a secondary profile. Prior to O, the only
-                // entry point for work profiles is through the LauncherActivity.
-                List<LauncherActivityInfo> activityList =
-                        mLauncherApps.getActivityList(packageName, user);
-                return activityList.size() > 0 ? activityList.get(0).getApplicationInfo() : null;
-            }
-            try {
-                ApplicationInfo info = mPm.getApplicationInfo(packageName, flags);
-                // There is no way to check if the app is installed for managed profile. But for
-                // primary profile, we can still have this check.
-                if (isPrimaryUser && ((info.flags & ApplicationInfo.FLAG_INSTALLED) == 0)
-                        || !info.enabled) {
-                    return null;
-                }
-                return info;
-            } catch (PackageManager.NameNotFoundException e) {
-                // Package not found
-                return null;
-            }
+        try {
+            ApplicationInfo info = mLauncherApps.getApplicationInfo(packageName, flags, user);
+            return (info.flags & ApplicationInfo.FLAG_INSTALLED) == 0 || !info.enabled
+                    ? null : info;
+        } catch (PackageManager.NameNotFoundException e) {
+            return null;
         }
     }
 
diff --git a/src/com/android/launcher3/util/SystemUiController.java b/src/com/android/launcher3/util/SystemUiController.java
index 3e48006f62..50166c3888 100644
--- a/src/com/android/launcher3/util/SystemUiController.java
+++ b/src/com/android/launcher3/util/SystemUiController.java
@@ -19,8 +19,6 @@ package com.android.launcher3.util;
 import android.view.View;
 import android.view.Window;
 
-import com.android.launcher3.Utilities;
-
 import java.util.Arrays;
 
 /**
@@ -78,12 +76,10 @@ public class SystemUiController {
     }
 
     private int getSysUiVisibilityFlags(int stateFlag, int currentVisibility) {
-        if (Utilities.ATLEAST_OREO) {
-            if ((stateFlag & FLAG_LIGHT_NAV) != 0) {
-                currentVisibility |= View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
-            } else if ((stateFlag & FLAG_DARK_NAV) != 0) {
-                currentVisibility &= ~(View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
-            }
+        if ((stateFlag & FLAG_LIGHT_NAV) != 0) {
+            currentVisibility |= View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
+        } else if ((stateFlag & FLAG_DARK_NAV) != 0) {
+            currentVisibility &= ~(View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
         }
 
         if ((stateFlag & FLAG_LIGHT_STATUS) != 0) {
diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java
index 8186dfa3dc..52a82f8e93 100644
--- a/src/com/android/launcher3/views/FloatingIconView.java
+++ b/src/com/android/launcher3/views/FloatingIconView.java
@@ -256,7 +256,6 @@ public class FloatingIconView extends FrameLayout implements
         Drawable drawable = null;
         Drawable badge = null;
         boolean supportsAdaptiveIcons = ADAPTIVE_ICON_WINDOW_ANIM.get()
-                && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
                 && !info.isDisabled(); // Use original icon for disabled icons.
         Drawable btvIcon = originalView instanceof BubbleTextView
                 ? ((BubbleTextView) originalView).getIcon() : null;
@@ -383,8 +382,7 @@ public class FloatingIconView extends FrameLayout implements
     @WorkerThread
     @SuppressWarnings("WrongThread")
     private static int getOffsetForIconBounds(Launcher l, Drawable drawable, RectF position) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O
-                || !(drawable instanceof AdaptiveIconDrawable)
+        if (!(drawable instanceof AdaptiveIconDrawable)
                 || (drawable instanceof FolderAdaptiveIcon)) {
             return 0;
         }
diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
index 6f2e179912..780a1a18bd 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
@@ -80,9 +80,7 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         setAccessibilityDelegate(mLauncher.getAccessibilityDelegate());
         setBackgroundResource(R.drawable.widget_internal_focus_bg);
 
-        if (Utilities.ATLEAST_OREO) {
-            setExecutor(Executors.THREAD_POOL_EXECUTOR);
-        }
+        setExecutor(Executors.THREAD_POOL_EXECUTOR);
         if (Utilities.ATLEAST_Q && Themes.getAttrBoolean(mLauncher, R.attr.isWorkspaceDarkText)) {
             setOnLightBackground(true);
         }
diff --git a/src/com/android/launcher3/widget/WidgetManagerHelper.java b/src/com/android/launcher3/widget/WidgetManagerHelper.java
index 4b6c569d6c..c0c5c48077 100644
--- a/src/com/android/launcher3/widget/WidgetManagerHelper.java
+++ b/src/com/android/launcher3/widget/WidgetManagerHelper.java
@@ -23,13 +23,11 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Process;
 import android.os.UserHandle;
 
 import androidx.annotation.Nullable;
 
 import com.android.launcher3.LauncherAppWidgetProviderInfo;
-import com.android.launcher3.Utilities;
 import com.android.launcher3.model.WidgetsModel;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.pm.UserCache;
@@ -84,22 +82,8 @@ public class WidgetManagerHelper {
             return allWidgetsSteam(mContext).collect(Collectors.toList());
         }
 
-        if (Utilities.ATLEAST_OREO) {
-            return mAppWidgetManager.getInstalledProvidersForPackage(
-                    packageUser.mPackageName, packageUser.mUser);
-        }
-
-        String pkg = packageUser.mPackageName;
-        return Stream.concat(
-                // Only get providers for the given package/user.
-                mAppWidgetManager.getInstalledProvidersForProfile(packageUser.mUser)
-                        .stream()
-                        .filter(w -> w.provider.equals(pkg)),
-                Process.myUserHandle().equals(packageUser.mUser)
-                        && mContext.getPackageName().equals(pkg)
-                        ? CustomWidgetManager.INSTANCE.get(mContext).stream()
-                        : Stream.empty())
-                .collect(Collectors.toList());
+        return mAppWidgetManager.getInstalledProvidersForPackage(
+                packageUser.mPackageName, packageUser.mUser);
     }
 
     /**
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompat.java b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompat.java
index 0fd0a35317..9dbe47cb66 100644
--- a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompat.java
+++ b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompat.java
@@ -17,8 +17,7 @@
 package com.android.launcher3.uioverrides.dynamicui;
 
 import android.content.Context;
-
-import com.android.launcher3.Utilities;
+import android.os.Build;
 
 import androidx.annotation.Nullable;
 
@@ -32,7 +31,7 @@ public abstract class WallpaperManagerCompat {
             if (sInstance == null) {
                 context = context.getApplicationContext();
 
-                if (Utilities.ATLEAST_OREO_MR1) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
                     try {
                         sInstance = new WallpaperManagerCompatVOMR1(context);
                     } catch (Throwable e) {
diff --git a/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java b/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java
index 0e43d81475..822fefc208 100644
--- a/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java
+++ b/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java
@@ -30,7 +30,6 @@ import androidx.test.filters.LargeTest;
 import androidx.test.runner.AndroidJUnit4;
 
 import com.android.launcher3.LauncherSettings.Favorites;
-import com.android.launcher3.Utilities;
 import com.android.launcher3.Workspace.ItemOperator;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
@@ -126,9 +125,6 @@ public class RequestPinItemTest extends AbstractLauncherUiTest {
 
     private void runTest(String activityMethod, boolean isWidget, ItemOperator itemMatcher,
             Intent... commandIntents) throws Throwable {
-        if (!Utilities.ATLEAST_OREO) {
-            return;
-        }
         clearHomescreen();
         mDevice.pressHome();
 
-- 
GitLab


From b0611351e3cb70a9868226fc54bc23534311ae2e Mon Sep 17 00:00:00 2001
From: Jason Chang <jasonsfchang@google.com>
Date: Tue, 30 Jun 2020 15:44:14 +0800
Subject: [PATCH 0057/1664] Refactoring to use more precise statements when
 calculating gesture distance and others

1) Use more precise statements when calculating gesture distance
and refine ACTION_CANCEL motion events and others.

2) Check system property "ro.support_one_handed_mode" to enable or
disable one-handed quicksteps gesture feature.

Bug: 160315874

Test: make and install
Test: manual enable one handed mode and swipe down to trigger
Test: manual start one handed and rotate device
Change-Id: Ib27f9b6f92edda3cbff1ecb554b1a70f2e56e552
---
 .../OneHandedModeInputConsumer.java               | 15 ++++++++-------
 .../quickstep/RecentsAnimationDeviceState.java    | 12 ++++++++++--
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
index 0bb8fff2a1..22bd334517 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
@@ -52,7 +52,6 @@ public class OneHandedModeInputConsumer extends DelegateInputConsumer {
 
     private final PointF mDownPos = new PointF();
     private final PointF mLastPos = new PointF();
-    private final PointF mStartDragPos = new PointF();
 
     private boolean mPassedSlop;
 
@@ -92,7 +91,6 @@ public class OneHandedModeInputConsumer extends DelegateInputConsumer {
                 if (!mPassedSlop) {
                     if (squaredHypot(mLastPos.x - mDownPos.x, mLastPos.y - mDownPos.y)
                             > mSquaredSlop) {
-                        mStartDragPos.set(mLastPos.x, mLastPos.y);
                         if ((!mDeviceState.isOneHandedModeActive() && isValidStartAngle(
                                 mDownPos.x - mLastPos.x, mDownPos.y - mLastPos.y))
                                 || (mDeviceState.isOneHandedModeActive() && isValidExitAngle(
@@ -104,17 +102,16 @@ public class OneHandedModeInputConsumer extends DelegateInputConsumer {
                         }
                     }
                 } else {
-                    float distance = (float) Math.hypot(mLastPos.x - mStartDragPos.x,
-                            mLastPos.y - mStartDragPos.y);
+                    float distance = (float) Math.hypot(mLastPos.x - mDownPos.x,
+                            mLastPos.y - mDownPos.y);
                     if (distance > mDragDistThreshold && mPassedSlop) {
                         onStopGestureDetected();
                     }
                 }
                 break;
             }
-            case ACTION_UP:
-            case ACTION_CANCEL: {
-                if (mLastPos.y >= mStartDragPos.y && mPassedSlop) {
+            case ACTION_UP: {
+                if (mLastPos.y >= mDownPos.y && mPassedSlop) {
                     onStartGestureDetected();
                 }
 
@@ -122,6 +119,10 @@ public class OneHandedModeInputConsumer extends DelegateInputConsumer {
                 mState = STATE_INACTIVE;
                 break;
             }
+            case ACTION_CANCEL:
+                mPassedSlop = false;
+                mState = STATE_INACTIVE;
+                break;
         }
 
         if (mState != STATE_ACTIVE) {
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index 2868b1b37c..716887509d 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -79,6 +79,8 @@ public class RecentsAnimationDeviceState implements
         DefaultDisplay.DisplayInfoChangeListener,
         OneHandedModeChangeListener {
 
+    static final String SUPPORT_ONE_HANDED_MODE = "ro.support_one_handed_mode";
+
     private final Context mContext;
     private final SysUINavigationMode mSysUiNavMode;
     private final DefaultDisplay mDefaultDisplay;
@@ -165,13 +167,15 @@ public class RecentsAnimationDeviceState implements
             }
         }
 
-        if (SystemProperties.getBoolean("ro.support_one_handed_mode", false)) {
+        if (SystemProperties.getBoolean(SUPPORT_ONE_HANDED_MODE, false)) {
             SecureSettingsObserver oneHandedEnabledObserver =
                     SecureSettingsObserver.newOneHandedSettingsObserver(
                             mContext, enabled -> mIsOneHandedModeEnabled = enabled);
             oneHandedEnabledObserver.register();
             oneHandedEnabledObserver.dispatchOnChange();
             runOnDestroy(oneHandedEnabledObserver::unregister);
+        } else {
+            mIsOneHandedModeEnabled = false;
         }
 
         SecureSettingsObserver swipeBottomEnabledObserver =
@@ -443,7 +447,7 @@ public class RecentsAnimationDeviceState implements
     }
 
     /**
-     * @return whether screen pinning is enabled and active
+     * @return whether one-handed mode is enabled and active
      */
     public boolean isOneHandedModeActive() {
         return (mSystemUiStateFlags & SYSUI_STATE_ONE_HANDED_ACTIVE) != 0;
@@ -518,6 +522,10 @@ public class RecentsAnimationDeviceState implements
      * @return whether the given motion event can trigger the one handed mode.
      */
     public boolean canTriggerOneHandedAction(MotionEvent ev) {
+        if (!SystemProperties.getBoolean(SUPPORT_ONE_HANDED_MODE, false)) {
+            return false;
+        }
+
         if (!mIsOneHandedModeEnabled && !mIsSwipeToNotificationEnabled) {
             return false;
         }
-- 
GitLab


From bcdbf27b967263db9a9499764546b2248f065312 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Thu, 30 Jul 2020 09:42:36 -0700
Subject: [PATCH 0058/1664] Revert "Finish the current task in live tile mode
 when swiping up and right to the previous task"

This is a manual revert to ag/9654924 (WindowTransformSwipeHandler has been moved)

Fixes: 143714109
Test: manual
Change-Id: I3c55e7bcacfcdc9c9343b2df5804064053169ade
---
 .../src/com/android/quickstep/AbsSwipeUpHandler.java     | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
index f3711459a1..3a5c027698 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1221,15 +1221,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
 
     @UiThread
     private void startNewTask() {
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
-            mRecentsAnimationController.finish(true /* toRecents */, this::startNewTaskInternal);
-        } else {
-            startNewTaskInternal();
-        }
-    }
-
-    @UiThread
-    private void startNewTaskInternal() {
         TaskView taskToLaunch = mRecentsView == null ? null : mRecentsView.getNextPageTaskView();
         startNewTask(success -> {
             if (!success) {
-- 
GitLab


From cded4dd923ffaf0be870ed07227e9ceffaf93126 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 30 Jul 2020 12:25:58 -0700
Subject: [PATCH 0059/1664] Create a copy of the original list instead of a new
 view

unmodifiableList is backed up by the original list and is not suitable
to passing to different thead.

Bug: 162518472
Change-Id: I71774ced89d64acc7176269e107cfcf47627f7c4
---
 src/com/android/launcher3/model/BgDataModel.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/model/BgDataModel.java b/src/com/android/launcher3/model/BgDataModel.java
index 6158a9c6b4..fd8520dcdf 100644
--- a/src/com/android/launcher3/model/BgDataModel.java
+++ b/src/com/android/launcher3/model/BgDataModel.java
@@ -422,7 +422,7 @@ public class BgDataModel {
 
         @Override
         public FixedContainerItems clone() {
-            return new FixedContainerItems(containerId, Collections.unmodifiableList(items));
+            return new FixedContainerItems(containerId, new ArrayList<>(items));
         }
     }
 
-- 
GitLab


From e873a171f761ef1b256b482cd6b0028e59742fbd Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Thu, 30 Jul 2020 15:08:34 -0700
Subject: [PATCH 0060/1664] Expecting TYPE_WINDOW_STATE_CHANGED in quick switch

Bug: 142654442
Change-Id: I48c8d929952872e444d1a3f7a40721d8edcd8942
---
 .../android/launcher3/tapl/Background.java    | 106 +++++++++---------
 .../tapl/com/android/launcher3/tapl/Home.java |   6 -
 2 files changed, 54 insertions(+), 58 deletions(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/Background.java b/tests/tapl/com/android/launcher3/tapl/Background.java
index e538f60218..c9c846fc1a 100644
--- a/tests/tapl/com/android/launcher3/tapl/Background.java
+++ b/tests/tapl/com/android/launcher3/tapl/Background.java
@@ -16,8 +16,9 @@
 
 package com.android.launcher3.tapl;
 
+import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED;
+
 import static com.android.launcher3.tapl.OverviewTask.TASK_START_EVENT;
-import static com.android.launcher3.testing.TestProtocol.BACKGROUND_APP_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.OVERVIEW_STATE_ORDINAL;
 
 import android.graphics.Point;
@@ -150,65 +151,66 @@ public class Background extends LauncherInstrumentation.VisibleContainer {
     /**
      * Swipes right or double presses the square button to switch to the previous app.
      */
+    @NonNull
     public Background quickSwitchToPreviousApp() {
         try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck();
              LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
                      "want to quick switch to the previous app")) {
             verifyActiveContainer();
-            quickSwitchToPreviousApp(getExpectedStateForQuickSwitch());
-            return new Background(mLauncher);
-        }
-    }
-
-    protected int getExpectedStateForQuickSwitch() {
-        return BACKGROUND_APP_STATE_ORDINAL;
-    }
-
-    protected void quickSwitchToPreviousApp(int expectedState) {
-        final boolean launcherWasVisible = mLauncher.isLauncherVisible();
-        boolean transposeInLandscape = false;
-        switch (mLauncher.getNavigationModel()) {
-            case TWO_BUTTON:
-                transposeInLandscape = true;
-                // Fall through, zero button and two button modes behave the same.
-            case ZERO_BUTTON: {
-                final int startX;
-                final int startY;
-                final int endX;
-                final int endY;
-                if (mLauncher.getDevice().isNaturalOrientation() || !transposeInLandscape) {
-                    // Swipe from the bottom left to the bottom right of the screen.
-                    startX = 0;
-                    startY = getSwipeStartY();
-                    endX = mLauncher.getDevice().getDisplayWidth();
-                    endY = startY;
-                } else {
-                    // Swipe from the bottom right to the top right of the screen.
-                    startX = getSwipeStartX();
-                    startY = mLauncher.getRealDisplaySize().y - 1;
-                    endX = startX;
-                    endY = 0;
+            final boolean launcherWasVisible = mLauncher.isLauncherVisible();
+            boolean transposeInLandscape = false;
+            switch (mLauncher.getNavigationModel()) {
+                case TWO_BUTTON:
+                    transposeInLandscape = true;
+                    // Fall through, zero button and two button modes behave the same.
+                case ZERO_BUTTON: {
+                    final int startX;
+                    final int startY;
+                    final int endX;
+                    final int endY;
+                    if (mLauncher.getDevice().isNaturalOrientation() || !transposeInLandscape) {
+                        // Swipe from the bottom left to the bottom right of the screen.
+                        startX = 0;
+                        startY = getSwipeStartY();
+                        endX = mLauncher.getDevice().getDisplayWidth();
+                        endY = startY;
+                    } else {
+                        // Swipe from the bottom right to the top right of the screen.
+                        startX = getSwipeStartX();
+                        startY = mLauncher.getRealDisplaySize().y - 1;
+                        endX = startX;
+                        endY = 0;
+                    }
+                    final boolean isZeroButton = mLauncher.getNavigationModel()
+                            == LauncherInstrumentation.NavigationModel.ZERO_BUTTON;
+                    LauncherInstrumentation.GestureScope gestureScope =
+                            launcherWasVisible && isZeroButton
+                                    ? LauncherInstrumentation.GestureScope.INSIDE_TO_OUTSIDE
+                                    : LauncherInstrumentation.GestureScope.OUTSIDE_WITH_PILFER;
+                    mLauncher.executeAndWaitForEvent(
+                            () -> mLauncher.linearGesture(
+                                    startX, startY, endX, endY, 20, false, gestureScope),
+                            event -> event.getEventType() == TYPE_WINDOW_STATE_CHANGED,
+                            () -> "Quick switch gesture didn't change window state");
+                    break;
                 }
-                final boolean isZeroButton = mLauncher.getNavigationModel()
-                        == LauncherInstrumentation.NavigationModel.ZERO_BUTTON;
-                mLauncher.swipeToState(startX, startY, endX, endY, 20, expectedState,
-                        launcherWasVisible && isZeroButton
-                                ? LauncherInstrumentation.GestureScope.INSIDE_TO_OUTSIDE
-                                : LauncherInstrumentation.GestureScope.OUTSIDE_WITH_PILFER);
-                break;
-            }
 
-            case THREE_BUTTON:
-                // Double press the recents button.
-                UiObject2 recentsButton = mLauncher.waitForSystemUiObject("recent_apps");
-                mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, SQUARE_BUTTON_EVENT);
-                mLauncher.runToState(() -> recentsButton.click(), OVERVIEW_STATE_ORDINAL);
-                mLauncher.getOverview();
-                mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, SQUARE_BUTTON_EVENT);
-                recentsButton.click();
-                break;
+                case THREE_BUTTON:
+                    // Double press the recents button.
+                    UiObject2 recentsButton = mLauncher.waitForSystemUiObject("recent_apps");
+                    mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, SQUARE_BUTTON_EVENT);
+                    mLauncher.runToState(() -> recentsButton.click(), OVERVIEW_STATE_ORDINAL);
+                    mLauncher.getOverview();
+                    mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, SQUARE_BUTTON_EVENT);
+                    mLauncher.executeAndWaitForEvent(
+                            () -> recentsButton.click(),
+                            event -> event.getEventType() == TYPE_WINDOW_STATE_CHANGED,
+                            () -> "Pressing recents button didn't change window state");
+                    break;
+            }
+            mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, TASK_START_EVENT);
+            return new Background(mLauncher);
         }
-        mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, TASK_START_EVENT);
     }
 
     protected String getSwipeHeightRequestName() {
diff --git a/tests/tapl/com/android/launcher3/tapl/Home.java b/tests/tapl/com/android/launcher3/tapl/Home.java
index c06e254135..0060844ced 100644
--- a/tests/tapl/com/android/launcher3/tapl/Home.java
+++ b/tests/tapl/com/android/launcher3/tapl/Home.java
@@ -16,8 +16,6 @@
 
 package com.android.launcher3.tapl;
 
-import static com.android.launcher3.testing.TestProtocol.QUICK_SWITCH_STATE_ORDINAL;
-
 import androidx.annotation.NonNull;
 
 /**
@@ -65,8 +63,4 @@ public abstract class Home extends Background {
         return true;
     }
 
-    @Override
-    protected int getExpectedStateForQuickSwitch() {
-        return QUICK_SWITCH_STATE_ORDINAL;
-    }
 }
\ No newline at end of file
-- 
GitLab


From 2c80b305f46c9fe69b28239a2a7533cdf1d85a13 Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Thu, 30 Jul 2020 15:42:30 -0700
Subject: [PATCH 0061/1664] Log entire touchable region rect

Bug: 162001398
Change-Id: Icac1d81cd6d11aa47279c81db8cc2e5ff92d6b0c
---
 .../src/com/android/quickstep/OrientationTouchTransformer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
index 0710a0aaa4..b2bce0c043 100644
--- a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
+++ b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
@@ -374,7 +374,7 @@ class OrientationTouchTransformer {
         StringBuilder regions = new StringBuilder("  currentTouchableRotations=");
         for(int i = 0; i < mSwipeTouchRegions.size(); i++) {
             OrientationRectF rectF = mSwipeTouchRegions.get(mSwipeTouchRegions.keyAt(i));
-            regions.append(rectF.mRotation).append(" ");
+            regions.append(rectF).append(" ");
         }
         pw.println(regions.toString());
         pw.println("  mNavBarGesturalHeight=" + mNavBarGesturalHeight);
-- 
GitLab


From 30caccbbc24ad7944cd4cc37bca1bc3c6e3fdd69 Mon Sep 17 00:00:00 2001
From: Yuchen He <yuchenhe@google.com>
Date: Wed, 29 Jul 2020 17:15:03 +0000
Subject: [PATCH 0062/1664] Enable memory dump for Launcher

Bug: 154772063
Change-Id: I3b2bc2e341037746891658f2596999248ec272ef
(cherry picked from commit 12baaadeca97160ab567f4380991470ff536ff5f)
---
 tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index 201218b79a..5e42d9b988 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -115,8 +115,7 @@ public abstract class AbstractLauncherUiTest {
         if (TestHelpers.isInLauncherProcess()) {
             StrictMode.VmPolicy.Builder builder =
                     new StrictMode.VmPolicy.Builder()
-// b/154772063
-//                            .detectActivityLeaks()
+                            .detectActivityLeaks()
                             .penaltyLog()
                             .penaltyListener(Runnable::run, violation -> {
                                 if (sStrictmodeDetectedActivityLeak == null) {
-- 
GitLab


From ca9590c3901360bd8bd0d9429a17a72312dde842 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Thu, 30 Jul 2020 19:51:41 -0700
Subject: [PATCH 0063/1664] Reset live tile task view simulator params

Since we reuse the same mLiveTileTaskViewSimulator in the RecentsView, we need to reset the params after it settles in Overview from swipe up so that we don't render with obsolete param values.

Test: manual
Fixes: 160911104
Change-Id: I523a321e44d867c5bb68afe93e7a83e7ae23498b
---
 .../src/com/android/quickstep/views/RecentsView.java      | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
index 51e4a85a14..0335ee7748 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
@@ -849,6 +849,14 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                 taskView.setModalness(mTaskModalness);
             }
         }
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+            // Since we reuse the same mLiveTileTaskViewSimulator in the RecentsView, we need
+            // to reset the params after it settles in Overview from swipe up so that we don't
+            // render with obsolete param values.
+            mLiveTileTaskViewSimulator.fullScreenProgress.value = 0;
+            mLiveTileTaskViewSimulator.recentsViewScale.value = 1;
+            mLiveTileTaskViewSimulator.setOffsetY(0);
+        }
         if (mRunningTaskTileHidden) {
             setRunningTaskHidden(mRunningTaskTileHidden);
         }
-- 
GitLab


From 35376a35910e36d692a939a1fcee1139d9b44fb9 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 15 Jul 2020 17:02:16 -0700
Subject: [PATCH 0064/1664] Using StatsLog for notifyingAppPredictor

> Adding a listener in StartsLogManager for listening to events.
  This allows events to be directored to the predictor only if
  it is already running, instead of creating it.
> Unifying the event format to be same as hotseat predictor

Bug: 160748731
Change-Id: Ib00e6249ff642c030f00bcad5b748255e704d16a
---
 protos/launcher_atom.proto                    |   1 +
 .../appprediction/PredictionAppTracker.java   | 232 +++++++++++-------
 .../appprediction/PredictionRowView.java      |   6 +-
 .../uioverrides/QuickstepLauncher.java        |   7 +-
 .../quickstep/BaseSwipeUpHandlerV2.java       |  53 ++--
 .../quickstep/TouchInteractionService.java    |   9 +-
 .../fallback/FallbackRecentsView.java         |   6 -
 .../quickstep/views/LauncherRecentsView.java  |  16 --
 .../android/quickstep/views/RecentsView.java  |  10 -
 .../com/android/quickstep/views/TaskView.java |   4 +-
 .../logging/StatsLogCompatManager.java        |  71 +++---
 .../launcher3/BaseDraggingActivity.java       |  15 +-
 src/com/android/launcher3/Launcher.java       |   9 +-
 .../launcher3/SecondaryDropTarget.java        |  16 +-
 .../launcher3/allapps/AllAppsGridAdapter.java |   3 +-
 .../search/AllAppsSearchBarController.java    |   5 +-
 .../launcher3/logging/StatsLogManager.java    |  16 --
 .../launcher3/model/AppLaunchTracker.java     |  26 --
 .../launcher3/model/data/ItemInfo.java        |   8 +
 .../launcher3/popup/SystemShortcut.java       |   2 +-
 .../SecondaryDisplayLauncher.java             |   4 +-
 .../launcher3/touch/ItemClickHandler.java     |  29 +--
 .../launcher3/views/OptionsPopupView.java     |   2 +-
 .../plugins/AppLaunchEventsPlugin.java        |  54 ----
 24 files changed, 259 insertions(+), 345 deletions(-)
 delete mode 100644 src_plugins/com/android/systemui/plugins/AppLaunchEventsPlugin.java

diff --git a/protos/launcher_atom.proto b/protos/launcher_atom.proto
index 561196941c..cd229ae015 100644
--- a/protos/launcher_atom.proto
+++ b/protos/launcher_atom.proto
@@ -131,6 +131,7 @@ message Application {
 // Legacy shortcuts and shortcuts handled by ShortcutManager
 message Shortcut {
   optional string shortcut_name = 1;
+  optional string shortcut_id = 2;
 }
 
 // AppWidgets handled by AppWidgetManager
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionAppTracker.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionAppTracker.java
index e4442dae8f..8cabe3d80b 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionAppTracker.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionAppTracker.java
@@ -16,6 +16,12 @@
 package com.android.launcher3.appprediction;
 
 import static com.android.launcher3.InvariantDeviceProfile.CHANGE_FLAG_GRID;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_APP_LAUNCH_TAP;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ITEM_DROPPED_ON_DONT_SUGGEST;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_QUICKSWITCH_LEFT;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_QUICKSWITCH_RIGHT;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_SWIPE_DOWN;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_TAP;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
 import android.annotation.TargetApi;
@@ -31,29 +37,38 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.os.Process;
+import android.os.SystemClock;
 import android.os.UserHandle;
+import android.text.TextUtils;
 import android.util.Log;
 
+import androidx.annotation.AnyThread;
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 import androidx.annotation.WorkerThread;
 
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.appprediction.PredictionUiStateManager.Client;
+import com.android.launcher3.logger.LauncherAtom;
+import com.android.launcher3.logger.LauncherAtom.ContainerInfo;
+import com.android.launcher3.logger.LauncherAtom.FolderContainer;
+import com.android.launcher3.logger.LauncherAtom.HotseatContainer;
+import com.android.launcher3.logger.LauncherAtom.WorkspaceContainer;
+import com.android.launcher3.logging.StatsLogManager.EventEnum;
 import com.android.launcher3.model.AppLaunchTracker;
-import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
-import com.android.systemui.plugins.AppLaunchEventsPlugin;
-import com.android.systemui.plugins.PluginListener;
+import com.android.launcher3.pm.UserCache;
+import com.android.quickstep.logging.StatsLogCompatManager;
+import com.android.quickstep.logging.StatsLogCompatManager.StatsLogConsumer;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Locale;
+import java.util.function.Predicate;
 
 /**
  * Subclass of app tracker which publishes the data to the prediction engine and gets back results.
  */
 @TargetApi(Build.VERSION_CODES.Q)
-public class PredictionAppTracker extends AppLaunchTracker
-        implements PluginListener<AppLaunchEventsPlugin> {
+public class PredictionAppTracker extends AppLaunchTracker implements StatsLogConsumer {
 
     private static final String TAG = "PredictionAppTracker";
     private static final boolean DBG = false;
@@ -65,7 +80,6 @@ public class PredictionAppTracker extends AppLaunchTracker
 
     protected final Context mContext;
     private final Handler mMessageHandler;
-    private final List<AppLaunchEventsPlugin> mAppLaunchEventsPluginsList;
 
     // Accessed only on worker thread
     private AppPredictor mHomeAppPredictor;
@@ -76,10 +90,6 @@ public class PredictionAppTracker extends AppLaunchTracker
         InvariantDeviceProfile.INSTANCE.get(mContext).addOnChangeListener(this::onIdpChanged);
 
         mMessageHandler.sendEmptyMessage(MSG_INIT);
-
-        mAppLaunchEventsPluginsList = new ArrayList<>();
-        PluginManagerWrapper.INSTANCE.get(context)
-                .addPluginListener(this, AppLaunchEventsPlugin.class, true);
     }
 
     @UiThread
@@ -96,6 +106,7 @@ public class PredictionAppTracker extends AppLaunchTracker
             mHomeAppPredictor.destroy();
             mHomeAppPredictor = null;
         }
+        StatsLogCompatManager.LOGS_CONSUMER.remove(this);
     }
 
     @WorkerThread
@@ -137,6 +148,7 @@ public class PredictionAppTracker extends AppLaunchTracker
                 // Initialize the clients
                 int count = InvariantDeviceProfile.INSTANCE.get(mContext).numAllAppsColumns;
                 mHomeAppPredictor = createPredictor(Client.HOME, count);
+                StatsLogCompatManager.LOGS_CONSUMER.add(this);
                 return true;
             }
             case MSG_DESTROY: {
@@ -168,98 +180,142 @@ public class PredictionAppTracker extends AppLaunchTracker
         if (DBG) {
             Log.d(TAG, String.format("Sent immediate message to update %s", client));
         }
-
-        // Relay onReturnedToHome to every plugin.
-        mAppLaunchEventsPluginsList.forEach(AppLaunchEventsPlugin::onReturnedToHome);
     }
 
-    @Override
-    @UiThread
-    public void onStartShortcut(String packageName, String shortcutId, UserHandle user,
-                                String container) {
-        // TODO: Use the full shortcut info
-        AppTarget target = new AppTarget.Builder(
-                new AppTargetId("shortcut:" + shortcutId), packageName, user)
-                .setClassName(shortcutId)
-                .build();
-
-        sendLaunch(target, container);
-
-        // Relay onStartShortcut info to every connected plugin.
-        mAppLaunchEventsPluginsList
-                .forEach(plugin -> plugin.onStartShortcut(
-                        packageName,
-                        shortcutId,
-                        user,
-                        container != null ? container : CONTAINER_DEFAULT)
-        );
-
-    }
-
-    @Override
-    @UiThread
-    public void onStartApp(ComponentName cn, UserHandle user, String container) {
-        if (cn != null) {
-            AppTarget target = new AppTarget.Builder(
-                    new AppTargetId("app:" + cn), cn.getPackageName(), user)
-                    .setClassName(cn.getClassName())
+    @AnyThread
+    private void sendEvent(LauncherAtom.ItemInfo atomInfo, int eventId) {
+        AppTarget target = toAppTarget(atomInfo);
+        if (target != null) {
+            AppTargetEvent event = new AppTargetEvent.Builder(target, eventId)
+                    .setLaunchLocation(getContainer(atomInfo))
                     .build();
-            sendLaunch(target, container);
-
-            // Relay onStartApp to every connected plugin.
-            mAppLaunchEventsPluginsList
-                    .forEach(plugin -> plugin.onStartApp(
-                            cn,
-                            user,
-                            container != null ? container : CONTAINER_DEFAULT)
-            );
+            Message.obtain(mMessageHandler, MSG_LAUNCH, event).sendToTarget();
         }
     }
 
     @Override
-    @UiThread
-    public void onDismissApp(ComponentName cn, UserHandle user, String container) {
-        if (cn == null) return;
-        AppTarget target = new AppTarget.Builder(
-                new AppTargetId("app: " + cn), cn.getPackageName(), user)
-                .setClassName(cn.getClassName())
-                .build();
-        sendDismiss(target, container);
-
-        // Relay onDismissApp to every connected plugin.
-        mAppLaunchEventsPluginsList
-                .forEach(plugin -> plugin.onDismissApp(
-                        cn,
-                        user,
-                        container != null ? container : CONTAINER_DEFAULT)
-        );
+    public void consume(EventEnum event, LauncherAtom.ItemInfo atomInfo) {
+        if (event == LAUNCHER_APP_LAUNCH_TAP
+                || event == LAUNCHER_TASK_LAUNCH_SWIPE_DOWN
+                || event == LAUNCHER_TASK_LAUNCH_TAP
+                || event == LAUNCHER_QUICKSWITCH_RIGHT
+                || event == LAUNCHER_QUICKSWITCH_LEFT) {
+            sendEvent(atomInfo, AppTargetEvent.ACTION_LAUNCH);
+        } else if (event == LAUNCHER_ITEM_DROPPED_ON_DONT_SUGGEST) {
+            sendEvent(atomInfo, AppTargetEvent.ACTION_DISMISS);
+        }
     }
 
-    @UiThread
-    private void sendEvent(AppTarget target, String container, int eventId) {
-        AppTargetEvent event = new AppTargetEvent.Builder(target, eventId)
-                .setLaunchLocation(container == null ? CONTAINER_DEFAULT : container)
-                .build();
-        Message.obtain(mMessageHandler, MSG_LAUNCH, event).sendToTarget();
+    @Nullable
+    private AppTarget toAppTarget(LauncherAtom.ItemInfo info) {
+        UserHandle userHandle = Process.myUserHandle();
+        if (info.getIsWork()) {
+            userHandle = UserCache.INSTANCE.get(mContext).getUserProfiles().stream()
+                    .filter(((Predicate<UserHandle>) userHandle::equals).negate())
+                    .findAny()
+                    .orElse(null);
+        }
+        if (userHandle == null) {
+            return null;
+        }
+        ComponentName cn = null;
+        String id = null;
+
+        switch (info.getItemCase()) {
+            case APPLICATION: {
+                LauncherAtom.Application app = info.getApplication();
+                if ((cn = parseNullable(app.getComponentName())) != null) {
+                    id = "app:" + cn.getPackageName();
+                }
+                break;
+            }
+            case SHORTCUT: {
+                LauncherAtom.Shortcut si = info.getShortcut();
+                if (!TextUtils.isEmpty(si.getShortcutId())
+                        && (cn = parseNullable(si.getShortcutName())) != null) {
+                    id = "shortcut:" + si.getShortcutId();
+                }
+                break;
+            }
+            case WIDGET: {
+                LauncherAtom.Widget widget = info.getWidget();
+                if ((cn = parseNullable(widget.getComponentName())) != null) {
+                    id = "widget:" + cn.getPackageName();
+                }
+                break;
+            }
+            case TASK: {
+                LauncherAtom.Task task = info.getTask();
+                if ((cn = parseNullable(task.getComponentName())) != null) {
+                    id = "app:" + cn.getPackageName();
+                }
+                break;
+            }
+            case FOLDER_ICON: {
+                id = "folder:" + SystemClock.uptimeMillis();
+                cn = new ComponentName(mContext.getPackageName(), "#folder");
+            }
+        }
+        if (id != null && cn != null) {
+            return new AppTarget.Builder(new AppTargetId(id), cn.getPackageName(), userHandle)
+                    .setClassName(cn.getClassName())
+                    .build();
+        }
+        return null;
     }
 
-    @UiThread
-    private void sendLaunch(AppTarget target, String container) {
-        sendEvent(target, container, AppTargetEvent.ACTION_LAUNCH);
+    private String getContainer(LauncherAtom.ItemInfo info) {
+        ContainerInfo ci = info.getContainerInfo();
+        switch (ci.getContainerCase()) {
+            case WORKSPACE: {
+                // In case the item type is not widgets, the spaceX and spanY default to 1.
+                int spanX = info.getWidget().getSpanX();
+                int spanY = info.getWidget().getSpanY();
+                return getWorkspaceContainerString(ci.getWorkspace(), spanX, spanY);
+            }
+            case HOTSEAT: {
+                return getHotseatContainerString(ci.getHotseat());
+            }
+            case TASK_SWITCHER_CONTAINER: {
+                return "task-switcher";
+            }
+            case ALL_APPS_CONTAINER: {
+                return "all-apps";
+            }
+            case SEARCH_RESULT_CONTAINER: {
+                return "search-results";
+            }
+            case PREDICTED_HOTSEAT_CONTAINER: {
+                return "predictions/hotseat";
+            }
+            case PREDICTION_CONTAINER: {
+                return "predictions";
+            }
+            case FOLDER: {
+                FolderContainer fc = ci.getFolder();
+                switch (fc.getParentContainerCase()) {
+                    case WORKSPACE:
+                        return "folder/" + getWorkspaceContainerString(fc.getWorkspace(), 1, 1);
+                    case HOTSEAT:
+                        return "folder/" + getHotseatContainerString(fc.getHotseat());
+                }
+                return "folder";
+            }
+        }
+        return "";
     }
 
-    @UiThread
-    private void sendDismiss(AppTarget target, String container) {
-        sendEvent(target, container, AppTargetEvent.ACTION_DISMISS);
+    private static String getWorkspaceContainerString(WorkspaceContainer wc, int spanX, int spanY) {
+        return String.format(Locale.ENGLISH, "workspace/%d/[%d,%d]/[%d,%d]",
+                wc.getPageIndex(), wc.getGridX(), wc.getGridY(), spanX, spanY);
     }
 
-    @Override
-    public void onPluginConnected(AppLaunchEventsPlugin appLaunchEventsPlugin, Context context) {
-        mAppLaunchEventsPluginsList.add(appLaunchEventsPlugin);
+    private static String getHotseatContainerString(HotseatContainer hc) {
+        return String.format(Locale.ENGLISH, "hotseat/%d", hc.getIndex());
     }
 
-    @Override
-    public void onPluginDisconnected(AppLaunchEventsPlugin appLaunchEventsPlugin) {
-        mAppLaunchEventsPluginsList.remove(appLaunchEventsPlugin);
+    private static ComponentName parseNullable(String componentNameString) {
+        return TextUtils.isEmpty(componentNameString)
+                ? null : ComponentName.unflattenFromString(componentNameString);
     }
 }
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java
index 44691d3bb0..e11c701640 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java
@@ -56,7 +56,6 @@ import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.keyboard.FocusIndicatorHelper;
 import com.android.launcher3.keyboard.FocusIndicatorHelper.SimpleFocusIndicatorHelper;
 import com.android.launcher3.logging.StatsLogUtils.LogContainerProvider;
-import com.android.launcher3.model.AppLaunchTracker;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
@@ -93,9 +92,6 @@ public class PredictionRowView extends LinearLayout implements
     private static final Interpolator ALPHA_FACTOR_INTERPOLATOR =
             (t) -> (t < 0.8f) ? 0 : (t - 0.8f) / 0.2f;
 
-    private static final OnClickListener PREDICTION_CLICK_LISTENER =
-            ItemClickHandler.getInstance(AppLaunchTracker.CONTAINER_PREDICTIONS);
-
     private final Launcher mLauncher;
     private final PredictionUiStateManager mPredictionUiStateManager;
     private int mNumPredictedAppsPerRow;
@@ -246,7 +242,7 @@ public class PredictionRowView extends LinearLayout implements
             while (getChildCount() < mNumPredictedAppsPerRow) {
                 BubbleTextView icon = (BubbleTextView) inflater.inflate(
                         R.layout.all_apps_icon, this, false);
-                icon.setOnClickListener(PREDICTION_CLICK_LISTENER);
+                icon.setOnClickListener(ItemClickHandler.INSTANCE);
                 icon.setOnLongClickListener(ItemLongClickListener.INSTANCE_ALL_APPS);
                 icon.setLongPressTimeoutFactor(1f);
                 icon.setOnFocusChangeListener(mFocusHelper);
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 9a03d92e48..bdbd1e955d 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -34,8 +34,6 @@ import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 
-import androidx.annotation.Nullable;
-
 import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
@@ -129,12 +127,11 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
     }
 
     @Override
-    public boolean startActivitySafely(View v, Intent intent, ItemInfo item,
-            @Nullable String sourceContainer) {
+    public boolean startActivitySafely(View v, Intent intent, ItemInfo item) {
         if (mHotseatPredictionController != null) {
             mHotseatPredictionController.setPauseUIUpdate(true);
         }
-        return super.startActivitySafely(v, intent, item, sourceContainer);
+        return super.startActivitySafely(v, intent, item);
     }
 
     @Override
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java
index b5c1404ea3..1e98a6b61d 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java
@@ -59,6 +59,7 @@ import android.view.ViewTreeObserver.OnDrawListener;
 import android.view.WindowInsets;
 import android.view.animation.Interpolator;
 
+import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 
 import com.android.launcher3.AbstractFloatingView;
@@ -69,6 +70,7 @@ import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.logging.StatsLogManager;
+import com.android.launcher3.logging.StatsLogManager.StatsLogger;
 import com.android.launcher3.logging.UserEventDispatcher;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
@@ -874,22 +876,7 @@ public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q exte
         animateToProgress(startShift, endShift, duration, interpolator, endTarget, velocityPxPerMs);
     }
 
-    private void doLogGesture(GestureEndTarget endTarget) {
-        DeviceProfile dp = mDp;
-        if (dp == null || mDownPos == null) {
-            // We probably never received an animation controller, skip logging.
-            return;
-        }
-
-        int pageIndex = endTarget == LAST_TASK
-                ? LOG_NO_OP_PAGE_INDEX
-                : mRecentsView.getNextPage();
-        UserEventDispatcher.newInstance(mContext).logStateChangeAction(
-                mLogAction, mLogDirection,
-                (int) mDownPos.x, (int) mDownPos.y,
-                ContainerType.NAVBAR, ContainerType.APP,
-                endTarget.containerType,
-                pageIndex);
+    private void doLogGesture(GestureEndTarget endTarget, @Nullable TaskView targetTask) {
         StatsLogManager.EventEnum event;
         switch (endTarget) {
             case HOME:
@@ -907,10 +894,29 @@ public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q exte
             default:
                 event = IGNORE;
         }
-        StatsLogManager.newInstance(mContext).logger()
+        StatsLogger logger = StatsLogManager.newInstance(mContext).logger()
                 .withSrcState(LAUNCHER_STATE_BACKGROUND)
-                .withDstState(StatsLogManager.containerTypeToAtomState(endTarget.containerType))
-                .log(event);
+                .withDstState(StatsLogManager.containerTypeToAtomState(endTarget.containerType));
+        if (targetTask != null) {
+            logger.withItemInfo(targetTask.getItemInfo());
+        }
+        logger.log(event);
+
+
+        DeviceProfile dp = mDp;
+        if (dp == null || mDownPos == null) {
+            // We probably never received an animation controller, skip logging.
+            return;
+        }
+        int pageIndex = endTarget == LAST_TASK
+                ? LOG_NO_OP_PAGE_INDEX
+                : mRecentsView.getNextPage();
+        UserEventDispatcher.newInstance(mContext).logStateChangeAction(
+                mLogAction, mLogDirection,
+                (int) mDownPos.x, (int) mDownPos.y,
+                ContainerType.NAVBAR, ContainerType.APP,
+                endTarget.containerType,
+                pageIndex);
     }
 
     /** Animates to the given progress, where 0 is the current app and 1 is overview. */
@@ -1115,7 +1121,7 @@ public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q exte
     private void resumeLastTask() {
         mRecentsAnimationController.finish(false /* toRecents */, null);
         ActiveGestureLog.INSTANCE.addLog("finishRecentsAnimation", false);
-        doLogGesture(LAST_TASK);
+        doLogGesture(LAST_TASK, null);
         reset();
     }
 
@@ -1130,6 +1136,7 @@ public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q exte
 
     @UiThread
     private void startNewTaskInternal() {
+        TaskView taskToLaunch = mRecentsView == null ? null : mRecentsView.getNextPageTaskView();
         startNewTask(success -> {
             if (!success) {
                 reset();
@@ -1138,7 +1145,7 @@ public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q exte
                 endLauncherTransitionController();
                 updateSysUiFlags(1 /* windowProgress == overview */);
             }
-            doLogGesture(NEW_TASK);
+            doLogGesture(NEW_TASK, taskToLaunch);
         });
     }
 
@@ -1284,7 +1291,7 @@ public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q exte
                     () -> mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED));
         }
         ActiveGestureLog.INSTANCE.addLog("finishRecentsAnimation", true);
-        doLogGesture(HOME);
+        doLogGesture(HOME, mRecentsView == null ? null : mRecentsView.getCurrentPageTaskView());
     }
 
     protected abstract void finishRecentsControllerToHome(Runnable callback);
@@ -1299,7 +1306,7 @@ public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q exte
         mRecentsView.onSwipeUpAnimationSuccess();
 
         SystemUiProxy.INSTANCE.get(mContext).onOverviewShown(false, TAG);
-        doLogGesture(RECENTS);
+        doLogGesture(RECENTS, mRecentsView.getCurrentPageTaskView());
         reset();
     }
 
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
index a3705fdb24..131ebc169c 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
@@ -62,7 +62,6 @@ import com.android.launcher3.ResourceUtils;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.logging.UserEventDispatcher;
-import com.android.launcher3.model.AppLaunchTracker;
 import com.android.launcher3.provider.RestoreDbTask;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.testing.TestLogging;
@@ -796,13 +795,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
                 mOverviewComponentObserver.getActivityInterface();
         final Intent overviewIntent = new Intent(
                 mOverviewComponentObserver.getOverviewIntentIgnoreSysUiState());
-        if (activityInterface.getCreatedActivity() == null) {
-            // Make sure that UI states will be initialized.
-            activityInterface.createActivityInitListener((wasVisible) -> {
-                AppLaunchTracker.INSTANCE.get(TouchInteractionService.this);
-                return false;
-            }).register(overviewIntent);
-        } else if (fromInit) {
+        if (activityInterface.getCreatedActivity() != null && fromInit) {
             // The activity has been created before the initialization of overview service. It is
             // usually happens when booting or launcher is the top activity, so we should already
             // have the latest state.
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsView.java
index ffe9d6aed9..a946304779 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsView.java
@@ -63,12 +63,6 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity>
         mActivity.startHome();
     }
 
-    @Override
-    public boolean shouldUseMultiWindowTaskSizeStrategy() {
-        // Just use the activity task size for multi-window as well.
-        return false;
-    }
-
     /**
      * When starting gesture interaction from home, we add a temporary invisible tile corresponding
      * to the home task. This allows us to handle quick-switch similarly to a quick-switching
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java
index 59c6815290..1034234138 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java
@@ -31,7 +31,6 @@ import android.animation.ObjectAnimator;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build;
-import android.os.UserHandle;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.Surface;
@@ -41,18 +40,15 @@ import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.Hotseat;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.anim.Interpolators;
-import com.android.launcher3.model.AppLaunchTracker;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.StateManager.StateListener;
 import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
-import com.android.launcher3.util.TraceHelper;
 import com.android.launcher3.views.ScrimView;
 import com.android.quickstep.LauncherActivityInterface;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.util.TransformParams;
 import com.android.systemui.plugins.PluginListener;
 import com.android.systemui.plugins.RecentsExtraCard;
-import com.android.systemui.shared.recents.model.Task;
 
 /**
  * {@link RecentsView} used in Launcher activity
@@ -178,18 +174,6 @@ public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher>
         super.onTaskLaunchAnimationEnd(success);
     }
 
-    @Override
-    public void onTaskLaunched(Task task) {
-        UserHandle user =  UserHandle.of(task.key.userId);
-        AppLaunchTracker.INSTANCE.get(getContext()).onStartApp(task.getTopComponent(), user,
-                AppLaunchTracker.CONTAINER_OVERVIEW);
-    }
-
-    @Override
-    public boolean shouldUseMultiWindowTaskSizeStrategy() {
-        return TraceHelper.whitelistIpcs("isInMultiWindowMode", mActivity::isInMultiWindowMode);
-    }
-
     @Override
     public void scrollTo(int x, int y) {
         super.scrollTo(x, y);
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
index 9c25b240ba..520b36e971 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
@@ -55,11 +55,8 @@ import android.animation.LayoutTransition.TransitionListener;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.annotation.TargetApi;
-import android.app.ActivityManager;
 import android.app.ActivityManager.RunningTaskInfo;
-import android.content.ComponentName;
 import android.content.Context;
-import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.Canvas;
 import android.graphics.Point;
@@ -1997,19 +1994,12 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     protected void onTaskLaunchAnimationUpdate(float progress, TaskView tv) {
     }
 
-    public abstract boolean shouldUseMultiWindowTaskSizeStrategy();
-
     protected void onTaskLaunchAnimationEnd(boolean success) {
         if (success) {
             resetTaskVisuals();
         }
     }
 
-    /**
-     * Called when task activity is launched
-     */
-    public void onTaskLaunched(Task task){ }
-
     @Override
     protected void notifyPageSwitchListener(int prevPage) {
         super.notifyPageSwitchListener(prevPage);
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 222f6e6728..82fabac68f 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
@@ -30,8 +30,7 @@ import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.Interpolators.TOUCH_RESPONSE_INTERPOLATOR;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
-import static com.android.launcher3.logging.StatsLogManager.LauncherEvent
-        .LAUNCHER_TASK_ICON_TAP_OR_LONGPRESS;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_ICON_TAP_OR_LONGPRESS;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_TAP;
 
 import android.animation.Animator;
@@ -385,7 +384,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
                             }
                         }, resultCallbackHandler);
             }
-            getRecentsView().onTaskLaunched(mTask);
         }
     }
 
diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
index eac45e9907..ecbe73447d 100644
--- a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
+++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
@@ -27,7 +27,7 @@ import static com.android.systemui.shared.system.SysUiStatsLog.LAUNCHER_UICHANGE
 import android.content.Context;
 import android.util.Log;
 
-import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
 
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.Utilities;
@@ -54,6 +54,7 @@ import com.android.systemui.shared.system.SysUiStatsLog;
 import java.util.ArrayList;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * This class calls StatsLog compile time generated methods.
@@ -68,8 +69,6 @@ public class StatsLogCompatManager extends StatsLogManager {
     private static final String TAG = "StatsLog";
     private static final boolean IS_VERBOSE = Utilities.isPropertyEnabled(LogConfig.STATSLOG);
 
-    private static Context sContext;
-
     private static final InstanceId DEFAULT_INSTANCE_ID = InstanceId.fakeInstanceId(0);
     // LauncherAtom.ItemInfo.getDefaultInstance() should be used but until launcher proto migrates
     // from nano to lite, bake constant to prevent robo test failure.
@@ -77,8 +76,13 @@ public class StatsLogCompatManager extends StatsLogManager {
     private static final int FOLDER_HIERARCHY_OFFSET = 100;
     private static final int SEARCH_RESULT_HIERARCHY_OFFSET = 200;
 
+    public static final CopyOnWriteArrayList<StatsLogConsumer> LOGS_CONSUMER =
+            new CopyOnWriteArrayList<>();
+
+    private final Context mContext;
+
     public StatsLogCompatManager(Context context) {
-        sContext = context;
+        mContext = context;
     }
 
     @Override
@@ -86,25 +90,12 @@ public class StatsLogCompatManager extends StatsLogManager {
         return new StatsCompatLogger();
     }
 
-    /**
-     * Logs a ranking event and accompanying {@link InstanceId} and package name.
-     */
-    @Override
-    public void log(EventEnum rankingEvent, InstanceId instanceId, @Nullable String packageName,
-            int position) {
-        SysUiStatsLog.write(SysUiStatsLog.RANKING_SELECTED,
-                rankingEvent.getId() /* event_id = 1; */,
-                packageName /* package_name = 2; */,
-                instanceId.getId() /* instance_id = 3; */,
-                position /* position_picked = 4; */);
-    }
-
     /**
      * Logs the workspace layout information on the model thread.
      */
     @Override
     public void logSnapshot() {
-        LauncherAppState.getInstance(sContext).getModel().enqueueModelUpdateTask(
+        LauncherAppState.getInstance(mContext).getModel().enqueueModelUpdateTask(
                 new SnapshotWorker());
     }
 
@@ -175,6 +166,7 @@ public class StatsLogCompatManager extends StatsLogManager {
     private static class StatsCompatLogger implements StatsLogger {
 
         private static final ItemInfo DEFAULT_ITEM_INFO = new ItemInfo();
+
         private ItemInfo mItemInfo = DEFAULT_ITEM_INFO;
         private InstanceId mInstanceId = DEFAULT_INSTANCE_ID;
         private OptionalInt mRank = OptionalInt.empty();
@@ -253,36 +245,35 @@ public class StatsLogCompatManager extends StatsLogManager {
                 return;
             }
 
-            if (mItemInfo.container < 0) {
-                // Item is not within a folder. Write to StatsLog in same thread.
-                write(event, mInstanceId, applyOverwrites(mItemInfo.buildProto()), mSrcState,
-                        mDstState);
+            LauncherAppState appState = LauncherAppState.getInstanceNoCreate();
+            if (mItemInfo.container < 0 || appState == null) {
+                // Write log on the model thread so that logs do not go out of order
+                // (for eg: drop comes after drag)
+                Executors.MODEL_EXECUTOR.execute(
+                        () -> write(event, applyOverwrites(mItemInfo.buildProto())));
             } else {
                 // Item is inside the folder, fetch folder info in a BG thread
                 // and then write to StatsLog.
-                LauncherAppState.getInstance(sContext).getModel().enqueueModelUpdateTask(
+                appState.getModel().enqueueModelUpdateTask(
                         new BaseModelUpdateTask() {
                             @Override
                             public void execute(LauncherAppState app, BgDataModel dataModel,
                                     AllAppsList apps) {
                                 FolderInfo folderInfo = dataModel.folders.get(mItemInfo.container);
-                                write(event, mInstanceId,
-                                        applyOverwrites(mItemInfo.buildProto(folderInfo)),
-                                        mSrcState, mDstState);
+                                write(event, applyOverwrites(mItemInfo.buildProto(folderInfo)));
                             }
                         });
             }
         }
 
         private LauncherAtom.ItemInfo applyOverwrites(LauncherAtom.ItemInfo atomInfo) {
-            LauncherAtom.ItemInfo.Builder itemInfoBuilder =
-                    (LauncherAtom.ItemInfo.Builder) atomInfo.toBuilder();
+            LauncherAtom.ItemInfo.Builder itemInfoBuilder = atomInfo.toBuilder();
 
             mRank.ifPresent(itemInfoBuilder::setRank);
             mContainerInfo.ifPresent(itemInfoBuilder::setContainerInfo);
 
             if (mFromState.isPresent() || mToState.isPresent() || mEditText.isPresent()) {
-                FolderIcon.Builder folderIconBuilder = (FolderIcon.Builder) itemInfoBuilder
+                FolderIcon.Builder folderIconBuilder = itemInfoBuilder
                         .getFolderIcon()
                         .toBuilder();
                 mFromState.ifPresent(folderIconBuilder::setFromLabelState);
@@ -293,8 +284,11 @@ public class StatsLogCompatManager extends StatsLogManager {
             return itemInfoBuilder.build();
         }
 
-        private void write(EventEnum event, InstanceId instanceId, LauncherAtom.ItemInfo atomInfo,
-                int srcState, int dstState) {
+        @WorkerThread
+        private void write(EventEnum event, LauncherAtom.ItemInfo atomInfo) {
+            InstanceId instanceId = mInstanceId;
+            int srcState = mSrcState;
+            int dstState = mDstState;
             if (IS_VERBOSE) {
                 String name = (event instanceof Enum) ? ((Enum) event).name() :
                         event.getId() + "";
@@ -307,6 +301,10 @@ public class StatsLogCompatManager extends StatsLogManager {
                                 atomInfo));
             }
 
+            for (StatsLogConsumer consumer : LOGS_CONSUMER) {
+                consumer.consume(event, atomInfo);
+            }
+
             SysUiStatsLog.write(
                     SysUiStatsLog.LAUNCHER_EVENT,
                     SysUiStatsLog.LAUNCHER_UICHANGED__ACTION__DEFAULT_ACTION /* deprecated */,
@@ -446,7 +444,16 @@ public class StatsLogCompatManager extends StatsLogManager {
                 return "ALLAPPS";
             default:
                 return "INVALID";
-
         }
     }
+
+
+    /**
+     * Interface to get stats log while it is dispatched to the system
+     */
+    public interface StatsLogConsumer {
+
+        @WorkerThread
+        void consume(EventEnum event, LauncherAtom.ItemInfo atomInfo);
+    }
 }
diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java
index 9cb8cf2c51..296fb7ae78 100644
--- a/src/com/android/launcher3/BaseDraggingActivity.java
+++ b/src/com/android/launcher3/BaseDraggingActivity.java
@@ -45,7 +45,6 @@ import androidx.annotation.Nullable;
 import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.logging.InstanceId;
 import com.android.launcher3.logging.InstanceIdSequence;
-import com.android.launcher3.model.AppLaunchTracker;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.touch.ItemClickHandler;
@@ -154,8 +153,7 @@ public abstract class BaseDraggingActivity extends BaseActivity
 
     public abstract ActivityOptions getActivityLaunchOptions(View v);
 
-    public boolean startActivitySafely(View v, Intent intent, @Nullable ItemInfo item,
-            @Nullable String sourceContainer) {
+    public boolean startActivitySafely(View v, Intent intent, @Nullable ItemInfo item) {
         if (mIsSafeModeEnabled && !PackageManagerHelper.isSystemApp(this, intent)) {
             Toast.makeText(this, R.string.safemode_shortcut_error, Toast.LENGTH_SHORT).show();
             return false;
@@ -176,17 +174,13 @@ public abstract class BaseDraggingActivity extends BaseActivity
                     && !((WorkspaceItemInfo) item).isPromise();
             if (isShortcut) {
                 // Shortcuts need some special checks due to legacy reasons.
-                startShortcutIntentSafely(intent, optsBundle, item, sourceContainer);
+                startShortcutIntentSafely(intent, optsBundle, item);
             } else if (user == null || user.equals(Process.myUserHandle())) {
                 // Could be launching some bookkeeping activity
                 startActivity(intent, optsBundle);
-                AppLaunchTracker.INSTANCE.get(this).onStartApp(intent.getComponent(),
-                        Process.myUserHandle(), sourceContainer);
             } else {
                 getSystemService(LauncherApps.class).startMainActivity(
                         intent.getComponent(), user, intent.getSourceBounds(), optsBundle);
-                AppLaunchTracker.INSTANCE.get(this).onStartApp(intent.getComponent(), user,
-                        sourceContainer);
             }
             getUserEventDispatcher().logAppLaunch(v, intent, user);
             if (item != null) {
@@ -206,8 +200,7 @@ public abstract class BaseDraggingActivity extends BaseActivity
                 .log(LAUNCHER_APP_LAUNCH_TAP);
     }
 
-    private void startShortcutIntentSafely(Intent intent, Bundle optsBundle, ItemInfo info,
-            @Nullable String sourceContainer) {
+    private void startShortcutIntentSafely(Intent intent, Bundle optsBundle, ItemInfo info) {
         try {
             StrictMode.VmPolicy oldPolicy = StrictMode.getVmPolicy();
             try {
@@ -221,8 +214,6 @@ public abstract class BaseDraggingActivity extends BaseActivity
                     String id = ((WorkspaceItemInfo) info).getDeepShortcutId();
                     String packageName = intent.getPackage();
                     startShortcut(packageName, id, intent.getSourceBounds(), optsBundle, info.user);
-                    AppLaunchTracker.INSTANCE.get(this).onStartShortcut(packageName, id, info.user,
-                            sourceContainer);
                 } else {
                     // Could be launching some bookkeeping activity
                     startActivity(intent, optsBundle);
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index d06ae7a9c5..2bf47fbec6 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -814,7 +814,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
             if (grantResults.length > 0
                     && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                startActivitySafely(v, intent, null, null);
+                startActivitySafely(v, intent, null);
             } else {
                 // TODO: Show a snack bar with link to settings
                 Toast.makeText(this, getString(R.string.msg_no_phone_permission,
@@ -1862,13 +1862,12 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     }
 
     @Override
-    public boolean startActivitySafely(View v, Intent intent, ItemInfo item,
-            @Nullable String sourceContainer) {
+    public boolean startActivitySafely(View v, Intent intent, ItemInfo item) {
         if (!hasBeenResumed()) {
             // Workaround an issue where the WM launch animation is clobbered when finishing the
             // recents animation into launcher. Defer launching the activity until Launcher is
             // next resumed.
-            addOnResumeCallback(() -> startActivitySafely(v, intent, item, sourceContainer));
+            addOnResumeCallback(() -> startActivitySafely(v, intent, item));
             if (mOnDeferredActivityLaunchCallback != null) {
                 mOnDeferredActivityLaunchCallback.run();
                 mOnDeferredActivityLaunchCallback = null;
@@ -1876,7 +1875,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
             return true;
         }
 
-        boolean success = super.startActivitySafely(v, intent, item, sourceContainer);
+        boolean success = super.startActivitySafely(v, intent, item);
         if (success && v instanceof BubbleTextView) {
             // This is set to the view that launched the activity that navigated the user away
             // from launcher. Since there is no callback for when the activity has finished
diff --git a/src/com/android/launcher3/SecondaryDropTarget.java b/src/com/android/launcher3/SecondaryDropTarget.java
index 499b54f6d2..56875bb337 100644
--- a/src/com/android/launcher3/SecondaryDropTarget.java
+++ b/src/com/android/launcher3/SecondaryDropTarget.java
@@ -39,7 +39,7 @@ import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.logging.FileLog;
 import com.android.launcher3.logging.LoggerUtils;
 import com.android.launcher3.logging.StatsLogManager;
-import com.android.launcher3.model.AppLaunchTracker;
+import com.android.launcher3.logging.StatsLogManager.StatsLogger;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
@@ -218,13 +218,16 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList
     public void onDrop(DragObject d, DragOptions options) {
         // Defer onComplete
         d.dragSource = new DeferredOnComplete(d.dragSource, getContext());
+
         super.onDrop(d, options);
+        StatsLogger logger = mStatsLogManager.logger().withInstanceId(d.logInstanceId);
+        if (d.originalDragInfo != null) {
+            logger.withItemInfo(d.originalDragInfo);
+        }
         if (mCurrentAccessibilityAction == UNINSTALL) {
-            mStatsLogManager.logger().withInstanceId(d.logInstanceId)
-                    .log(LAUNCHER_ITEM_DROPPED_ON_UNINSTALL);
+            logger.log(LAUNCHER_ITEM_DROPPED_ON_UNINSTALL);
         } else if (mCurrentAccessibilityAction == DISMISS_PREDICTION) {
-            mStatsLogManager.logger().withInstanceId(d.logInstanceId)
-                    .log(LAUNCHER_ITEM_DROPPED_ON_DONT_SUGGEST);
+            logger.log(LAUNCHER_ITEM_DROPPED_ON_DONT_SUGGEST);
         }
     }
 
@@ -283,8 +286,7 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList
             return null;
         }
         if (mCurrentAccessibilityAction == DISMISS_PREDICTION) {
-            AppLaunchTracker.INSTANCE.get(getContext()).onDismissApp(info.getTargetComponent(),
-                    info.user, AppLaunchTracker.CONTAINER_PREDICTIONS);
+            // We sent the log event, nothing else left to do
             return null;
         }
         // else: mCurrentAccessibilityAction == UNINSTALL
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index 8ec4d273f8..d65316090c 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -41,7 +41,6 @@ import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.AlphabeticalAppsList.AdapterItem;
-import com.android.launcher3.model.AppLaunchTracker;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.util.PackageManagerHelper;
 
@@ -270,7 +269,7 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter.
                 View searchMarketView = mLayoutInflater.inflate(R.layout.all_apps_search_market,
                         parent, false);
                 searchMarketView.setOnClickListener(v -> mLauncher.startActivitySafely(
-                        v, mMarketSearchIntent, null, AppLaunchTracker.CONTAINER_SEARCH));
+                        v, mMarketSearchIntent, null));
                 return new ViewHolder(searchMarketView);
             case VIEW_TYPE_ALL_APPS_DIVIDER:
                 return new ViewHolder(mLayoutInflater.inflate(
diff --git a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
index ed45749b1e..df1cd26da4 100644
--- a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
+++ b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
@@ -28,7 +28,6 @@ import android.widget.TextView.OnEditorActionListener;
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.ExtendedEditText;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.model.AppLaunchTracker;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.PackageManagerHelper;
 
@@ -112,8 +111,8 @@ public class AllAppsSearchBarController
             return false;
         }
         return mLauncher.startActivitySafely(v,
-                PackageManagerHelper.getMarketSearchIntent(mLauncher, query), null,
-                AppLaunchTracker.CONTAINER_SEARCH);
+                PackageManagerHelper.getMarketSearchIntent(mLauncher, query), null
+        );
     }
 
     @Override
diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index 8e23b65d5f..acf44824dc 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -15,7 +15,6 @@
  */
 package com.android.launcher3.logging;
 
-import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.IGNORE;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_CLOSE_DOWN;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_OPEN_UP;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE;
@@ -23,8 +22,6 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH
 
 import android.content.Context;
 
-import androidx.annotation.Nullable;
-
 import com.android.launcher3.R;
 import com.android.launcher3.logger.LauncherAtom.ContainerInfo;
 import com.android.launcher3.logger.LauncherAtom.FromState;
@@ -403,19 +400,6 @@ public class StatsLogManager implements ResourceBasedOverride {
         return mgr;
     }
 
-    /**
-     * Log an event with ranked-choice information along with package. Does nothing if event.getId()
-     * <= 0.
-     *
-     * @param rankingEvent an enum implementing EventEnum interface.
-     * @param instanceId An identifier obtained from an InstanceIdSequence.
-     * @param packageName the package name of the relevant app, if known (null otherwise).
-     * @param position the position picked.
-     */
-    public void log(EventEnum rankingEvent, InstanceId instanceId, @Nullable String packageName,
-            int position) {
-    }
-
     /**
      * Logs snapshot, or impression of the current workspace.
      */
diff --git a/src/com/android/launcher3/model/AppLaunchTracker.java b/src/com/android/launcher3/model/AppLaunchTracker.java
index 629a0ee496..a93c0dd77c 100644
--- a/src/com/android/launcher3/model/AppLaunchTracker.java
+++ b/src/com/android/launcher3/model/AppLaunchTracker.java
@@ -17,13 +17,7 @@ package com.android.launcher3.model;
 
 import static com.android.launcher3.util.MainThreadInitializedObject.forOverride;
 
-import android.content.ComponentName;
-import android.os.UserHandle;
-
-import androidx.annotation.Nullable;
-
 import com.android.launcher3.R;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.launcher3.util.ResourceBasedOverride;
 
@@ -32,28 +26,8 @@ import com.android.launcher3.util.ResourceBasedOverride;
  */
 public class AppLaunchTracker implements ResourceBasedOverride {
 
-    /**
-     * Derived from LauncherEvent proto.
-     * TODO: Use proper descriptive constants
-     */
-    public static final String CONTAINER_DEFAULT = Integer.toString(ContainerType.WORKSPACE);
-    public static final String CONTAINER_ALL_APPS = Integer.toString(ContainerType.ALLAPPS);
-    public static final String CONTAINER_PREDICTIONS = Integer.toString(ContainerType.PREDICTION);
-    public static final String CONTAINER_SEARCH = Integer.toString(ContainerType.SEARCHRESULT);
-    public static final String CONTAINER_OVERVIEW = Integer.toString(ContainerType.OVERVIEW);
-
-
     public static final MainThreadInitializedObject<AppLaunchTracker> INSTANCE =
             forOverride(AppLaunchTracker.class, R.string.app_launch_tracker_class);
 
-    public void onStartShortcut(String packageName, String shortcutId, UserHandle user,
-            @Nullable String container) { }
-
-    public void onStartApp(ComponentName componentName, UserHandle user,
-            @Nullable String container) { }
-
-    public void onDismissApp(ComponentName componentName, UserHandle user,
-             @Nullable String container){}
-
     public void onReturnedToHome() { }
 }
diff --git a/src/com/android/launcher3/model/data/ItemInfo.java b/src/com/android/launcher3/model/data/ItemInfo.java
index 0d3ddad183..59233cd4d8 100644
--- a/src/com/android/launcher3/model/data/ItemInfo.java
+++ b/src/com/android/launcher3/model/data/ItemInfo.java
@@ -53,6 +53,7 @@ import com.android.launcher3.logger.LauncherAtom.SettingsContainer;
 import com.android.launcher3.logger.LauncherAtom.ShortcutsContainer;
 import com.android.launcher3.logger.LauncherAtom.TaskSwitcherContainer;
 import com.android.launcher3.model.ModelWriter;
+import com.android.launcher3.shortcuts.ShortcutKey;
 import com.android.launcher3.util.ContentWriter;
 
 import java.util.Optional;
@@ -285,6 +286,13 @@ public class ItemInfo {
                                 .orElse(LauncherAtom.Application.newBuilder()));
                 break;
             case ITEM_TYPE_DEEP_SHORTCUT:
+                itemBuilder
+                        .setShortcut(nullableComponent
+                                .map(component -> LauncherAtom.Shortcut.newBuilder()
+                                        .setShortcutName(component.flattenToShortString())
+                                        .setShortcutId(ShortcutKey.fromItemInfo(this).getId()))
+                                .orElse(LauncherAtom.Shortcut.newBuilder()));
+                break;
             case ITEM_TYPE_SHORTCUT:
                 itemBuilder
                         .setShortcut(nullableComponent
diff --git a/src/com/android/launcher3/popup/SystemShortcut.java b/src/com/android/launcher3/popup/SystemShortcut.java
index fd292a3714..79984889ef 100644
--- a/src/com/android/launcher3/popup/SystemShortcut.java
+++ b/src/com/android/launcher3/popup/SystemShortcut.java
@@ -174,7 +174,7 @@ public abstract class SystemShortcut<T extends BaseDraggingActivity> extends Ite
         public void onClick(View view) {
             Intent intent = new PackageManagerHelper(view.getContext()).getMarketIntent(
                     mItemInfo.getTargetComponent().getPackageName());
-            mTarget.startActivitySafely(view, intent, mItemInfo, null);
+            mTarget.startActivitySafely(view, intent, mItemInfo);
             AbstractFloatingView.closeAllOpenViews(mTarget);
         }
     }
diff --git a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
index 68617921d3..8f21d5cafe 100644
--- a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
+++ b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
@@ -15,8 +15,6 @@
  */
 package com.android.launcher3.secondarydisplay;
 
-import static com.android.launcher3.model.AppLaunchTracker.CONTAINER_ALL_APPS;
-
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.app.ActivityOptions;
@@ -330,7 +328,7 @@ public class SecondaryDisplayLauncher extends BaseDraggingActivity
             if (intent == null) {
                 throw new IllegalArgumentException("Input must have a valid intent");
             }
-            startActivitySafely(v, intent, item, CONTAINER_ALL_APPS);
+            startActivitySafely(v, intent, item);
         }
     }
 }
diff --git a/src/com/android/launcher3/touch/ItemClickHandler.java b/src/com/android/launcher3/touch/ItemClickHandler.java
index 848666674d..61d6f7d804 100644
--- a/src/com/android/launcher3/touch/ItemClickHandler.java
+++ b/src/com/android/launcher3/touch/ItemClickHandler.java
@@ -18,7 +18,6 @@ package com.android.launcher3.touch;
 import static com.android.launcher3.Launcher.REQUEST_BIND_PENDING_APPWIDGET;
 import static com.android.launcher3.Launcher.REQUEST_RECONFIGURE_APPWIDGET;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_FOLDER_OPEN;
-import static com.android.launcher3.model.AppLaunchTracker.CONTAINER_ALL_APPS;
 import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_DISABLED_BY_PUBLISHER;
 import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_DISABLED_LOCKED_USER;
 import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_DISABLED_QUIET_USER;
@@ -37,8 +36,6 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Toast;
 
-import androidx.annotation.Nullable;
-
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppWidgetProviderInfo;
@@ -72,13 +69,9 @@ public class ItemClickHandler {
     /**
      * Instance used for click handling on items
      */
-    public static final OnClickListener INSTANCE = getInstance(null);
-
-    public static final OnClickListener getInstance(String sourceContainer) {
-        return v -> onClick(v, sourceContainer);
-    }
+    public static final OnClickListener INSTANCE = ItemClickHandler::onClick;
 
-    private static void onClick(View v, String sourceContainer) {
+    private static void onClick(View v) {
         // Make sure that rogue clicks don't get through while allapps is launching, or after the
         // view has detached (it's possible for this to happen if the view is removed mid touch).
         if (v.getWindowToken() == null) return;
@@ -88,14 +81,14 @@ public class ItemClickHandler {
 
         Object tag = v.getTag();
         if (tag instanceof WorkspaceItemInfo) {
-            onClickAppShortcut(v, (WorkspaceItemInfo) tag, launcher, sourceContainer);
+            onClickAppShortcut(v, (WorkspaceItemInfo) tag, launcher);
         } else if (tag instanceof FolderInfo) {
             if (v instanceof FolderIcon) {
                 onClickFolderIcon(v);
             }
         } else if (tag instanceof AppInfo) {
-            startAppShortcutOrInfoActivity(v, (AppInfo) tag, launcher,
-                    sourceContainer == null ? CONTAINER_ALL_APPS: sourceContainer);
+            startAppShortcutOrInfoActivity(v, (AppInfo) tag, launcher
+            );
         } else if (tag instanceof LauncherAppWidgetInfo) {
             if (v instanceof PendingAppWidgetHostView) {
                 onClickPendingWidget((PendingAppWidgetHostView) v, launcher);
@@ -191,7 +184,7 @@ public class ItemClickHandler {
 
         // Fallback to using custom market intent.
         Intent intent = new PackageManagerHelper(launcher).getMarketIntent(packageName);
-        launcher.startActivitySafely(v, intent, item, null);
+        launcher.startActivitySafely(v, intent, item);
     }
 
     /**
@@ -199,8 +192,7 @@ public class ItemClickHandler {
      *
      * @param v The view that was clicked. Must be a tagged with a {@link WorkspaceItemInfo}.
      */
-    public static void onClickAppShortcut(View v, WorkspaceItemInfo shortcut, Launcher launcher,
-            @Nullable String sourceContainer) {
+    public static void onClickAppShortcut(View v, WorkspaceItemInfo shortcut, Launcher launcher) {
         if (shortcut.isDisabled()) {
             final int disabledFlags = shortcut.runtimeStatusFlags
                     & WorkspaceItemInfo.FLAG_DISABLED_MASK;
@@ -241,11 +233,10 @@ public class ItemClickHandler {
         }
 
         // Start activities
-        startAppShortcutOrInfoActivity(v, shortcut, launcher, sourceContainer);
+        startAppShortcutOrInfoActivity(v, shortcut, launcher);
     }
 
-    private static void startAppShortcutOrInfoActivity(View v, ItemInfo item, Launcher launcher,
-            @Nullable String sourceContainer) {
+    private static void startAppShortcutOrInfoActivity(View v, ItemInfo item, Launcher launcher) {
         TestLogging.recordEvent(
                 TestProtocol.SEQUENCE_MAIN, "start: startAppShortcutOrInfoActivity");
         Intent intent;
@@ -274,6 +265,6 @@ public class ItemClickHandler {
             // Preload the icon to reduce latency b/w swapping the floating view with the original.
             FloatingIconView.fetchIcon(launcher, v, item, true /* isOpening */);
         }
-        launcher.startActivitySafely(v, intent, item, sourceContainer);
+        launcher.startActivitySafely(v, intent, item);
     }
 }
diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java
index d558781be8..049a1acbf3 100644
--- a/src/com/android/launcher3/views/OptionsPopupView.java
+++ b/src/com/android/launcher3/views/OptionsPopupView.java
@@ -220,7 +220,7 @@ public class OptionsPopupView extends ArrowPopup
         if (!TextUtils.isEmpty(pickerPackage)) {
             intent.setPackage(pickerPackage);
         }
-        return launcher.startActivitySafely(v, intent, dummyInfo(intent), null);
+        return launcher.startActivitySafely(v, intent, dummyInfo(intent));
     }
 
     static WorkspaceItemInfo dummyInfo(Intent intent) {
diff --git a/src_plugins/com/android/systemui/plugins/AppLaunchEventsPlugin.java b/src_plugins/com/android/systemui/plugins/AppLaunchEventsPlugin.java
deleted file mode 100644
index 15a0ffaa0c..0000000000
--- a/src_plugins/com/android/systemui/plugins/AppLaunchEventsPlugin.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.systemui.plugins;
-
-import android.content.ComponentName;
-import android.os.UserHandle;
-
-import com.android.systemui.plugins.annotations.ProvidesInterface;
-
-/**
- * Plugin interface which sends app launch events.
- */
-@ProvidesInterface(action = AppLaunchEventsPlugin.ACTION, version = AppLaunchEventsPlugin.VERSION)
-public interface AppLaunchEventsPlugin extends Plugin {
-    String ACTION = "com.android.systemui.action.PLUGIN_APP_EVENTS";
-    int VERSION = 1;
-
-    /**
-     * Receives onStartShortcut event from
-     * {@link com.android.launcher3.appprediction.PredictionAppTracker}.
-     */
-    void onStartShortcut(String packageName, String shortcutId, UserHandle user, String container);
-
-    /**
-     * Receives onStartApp event from
-     * {@link com.android.launcher3.appprediction.PredictionAppTracker}.
-     */
-    void onStartApp(ComponentName componentName, UserHandle user, String container);
-
-    /**
-     * Receives onDismissApp event from
-     * {@link com.android.launcher3.appprediction.PredictionAppTracker}.
-     */
-    void onDismissApp(ComponentName componentName, UserHandle user, String container);
-
-    /**
-     * Receives onReturnedToHome event from
-     * {@link com.android.launcher3.appprediction.PredictionAppTracker}.
-     */
-    void onReturnedToHome();
-}
-- 
GitLab


From a6f9cc023c21adbd13a3f21269cb47a371c6f0a9 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Wed, 15 Jul 2020 15:25:09 -0700
Subject: [PATCH 0065/1664] Increasing wait time for end-action events.

This is supposed to fix a flake in one of widgets tests.

The end-scroll event is posted by the system server to another thread
may arrive in ~13 sec.

The delay may have been caused by the previous test that just created
and deleted a user, so the system is busy with processing that.

Bug: 160238801
Change-Id: I43d0804252202ae04c731f35fb219c4be4bd4a76
(cherry picked from commit ba161b7393994481b84581525be7f76331d7d15b)
---
 .../com/android/launcher3/tapl/LauncherInstrumentation.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index bf079cbe76..53d60a0013 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -152,6 +152,7 @@ public final class LauncherInstrumentation {
     private static final String WIDGETS_RES_ID = "widgets_list_view";
     private static final String CONTEXT_MENU_RES_ID = "deep_shortcuts_container";
     public static final int WAIT_TIME_MS = 10000;
+    public static final int LONG_WAIT_TIME_MS = 60000;
     private static final String SYSTEMUI_PACKAGE = "com.android.systemui";
 
     private static WeakReference<VisibleContainer> sActiveContainer = new WeakReference<>(null);
@@ -638,7 +639,7 @@ public final class LauncherInstrumentation {
             Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, "executeAndWaitForEvent: before");
             final AccessibilityEvent event =
                     mInstrumentation.getUiAutomation().executeAndWaitForEvent(
-                            command, eventFilter, WAIT_TIME_MS);
+                            command, eventFilter, LONG_WAIT_TIME_MS);
             Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, "executeAndWaitForEvent: after");
             assertNotNull("executeAndWaitForEvent returned null (this can't happen)", event);
             final Parcelable parcelableData = event.getParcelableData();
-- 
GitLab


From 03c38c5c665b08acb8d817bedc3ff78120f879da Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Thu, 25 Jun 2020 15:51:33 -0700
Subject: [PATCH 0066/1664] Rewrite long swipe resistance ("pullback") logic

- Rename "pullback" to "resistance" to reduce confusion.
- Remove mDragLengthFactorStartPullback & mDragLengthFactorMaxPullback
- Add AnimatorControllerWithResistance, which has 2 controllers, one
  for the normal shift to overview, then one to apply the resistance
  when swiping beyond that.
- Don't hack animator interpolators/progress; insteaad, allow progress
  to go > 1 (which will run the separate resistance animator).
- Don't start launcher controller separately from window controller;
  instead, both are controlled by mCurrentShift in updateFinalShift().
- The resistance animation logic is shared by both the active window
  and launcher (RecentsView).

Bug: 149934536
Change-Id: Ib0f9da18e10cc9ddf1a2f82ed767f237c89d3a41
---
 .../android/quickstep/AbsSwipeUpHandler.java  |  58 ++-----
 .../AppToOverviewAnimationProvider.java       |   4 +-
 .../quickstep/FallbackActivityInterface.java  |   4 +-
 .../quickstep/LauncherActivityInterface.java  |   4 +-
 .../quickstep/SwipeUpAnimationLogic.java      |  35 ++--
 .../quickstep/BaseActivityInterface.java      |  15 +-
 .../SwipeUpGestureTutorialController.java     |   3 +-
 .../AnimatorControllerWithResistance.java     | 157 ++++++++++++++++++
 .../android/launcher3/anim/Interpolators.java |   1 +
 9 files changed, 198 insertions(+), 83 deletions(-)
 create mode 100644 quickstep/src/com/android/quickstep/util/AnimatorControllerWithResistance.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
index 3a5c027698..b6d44eb300 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -23,7 +23,6 @@ import static com.android.launcher3.anim.Interpolators.DEACCEL;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
-import static com.android.launcher3.config.FeatureFlags.UNSTABLE_SPRINGS;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.IGNORE;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE;
@@ -48,7 +47,6 @@ import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHO
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME;
 
 import android.animation.Animator;
-import android.animation.TimeInterpolator;
 import android.animation.ValueAnimator;
 import android.annotation.TargetApi;
 import android.app.ActivityManager;
@@ -75,7 +73,6 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimationSuccessListener;
-import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.logging.StatsLogManager.StatsLogger;
@@ -93,6 +90,7 @@ import com.android.quickstep.GestureState.GestureEndTarget;
 import com.android.quickstep.inputconsumers.OverviewInputConsumer;
 import com.android.quickstep.util.ActiveGestureLog;
 import com.android.quickstep.util.ActivityInitListener;
+import com.android.quickstep.util.AnimatorControllerWithResistance;
 import com.android.quickstep.util.InputConsumerProxy;
 import com.android.quickstep.util.RectFSpringAnim;
 import com.android.quickstep.util.ShelfPeekAnim;
@@ -214,8 +212,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
     private ThumbnailData mTaskSnapshot;
 
     // Used to control launcher components throughout the swipe gesture.
-    private AnimatorPlaybackController mLauncherTransitionController;
-    private boolean mHasLauncherTransitionControllerStarted;
+    private AnimatorControllerWithResistance mLauncherTransitionController;
 
     private AnimationFactory mAnimationFactory = (t) -> { };
 
@@ -564,11 +561,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
 
     /**
      * We don't want to change mLauncherTransitionController if mGestureState.getEndTarget() == HOME
-     * (it has its own animation) or if we're already animating the current controller.
+     * (it has its own animation).
      * @return Whether we can create the launcher controller or update its progress.
      */
     private boolean canCreateNewOrUpdateExistingLauncherTransitionController() {
-        return mGestureState.getEndTarget() != HOME && !mHasLauncherTransitionControllerStarted;
+        return mGestureState.getEndTarget() != HOME;
     }
 
     @Override
@@ -578,10 +575,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         return result;
     }
 
-    private void onAnimatorPlaybackControllerCreated(AnimatorPlaybackController anim) {
+    private void onAnimatorPlaybackControllerCreated(AnimatorControllerWithResistance anim) {
         mLauncherTransitionController = anim;
-        mLauncherTransitionController.dispatchSetInterpolator(t -> t * mDragLengthFactor);
-        mLauncherTransitionController.dispatchOnStart();
+        mLauncherTransitionController.getNormalController().dispatchOnStart();
         updateLauncherTransitionProgress();
     }
 
@@ -621,10 +617,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                 || !canCreateNewOrUpdateExistingLauncherTransitionController()) {
             return;
         }
-        // Normalize the progress to 0 to 1, as the animation controller will clamp it to that
-        // anyway. The controller mimics the drag length factor by applying it to its interpolators.
-        float progress = mCurrentShift.value / mDragLengthFactor;
-        mLauncherTransitionController.setPlayFraction(progress);
+        mLauncherTransitionController.setProgress(mCurrentShift.value, mDragLengthFactor);
     }
 
     /**
@@ -1112,31 +1105,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
             windowAnim.start();
             mRunningWindowAnim = RunningWindowAnim.wrap(windowAnim);
         }
-        // Always play the entire launcher animation when going home, since it is separate from
-        // the animation that has been controlled thus far.
-        if (mGestureState.getEndTarget() == HOME) {
-            start = 0;
-        }
-
-        // We want to use the same interpolator as the window, but need to adjust it to
-        // interpolate over the remaining progress (end - start).
-        TimeInterpolator adjustedInterpolator = Interpolators.mapToProgress(
-                interpolator, start, end);
-        if (mLauncherTransitionController == null) {
-            return;
-        }
-        if (start == end || duration <= 0) {
-            mLauncherTransitionController.dispatchSetInterpolator(t -> end);
-        } else {
-            mLauncherTransitionController.dispatchSetInterpolator(adjustedInterpolator);
-        }
-        mLauncherTransitionController.getAnimationPlayer().setDuration(Math.max(0, duration));
-
-        if (UNSTABLE_SPRINGS.get()) {
-            mLauncherTransitionController.dispatchOnStart();
-        }
-        mLauncherTransitionController.getAnimationPlayer().start();
-        mHasLauncherTransitionControllerStarted = true;
     }
 
     private void computeRecentsScrollIfInvisible() {
@@ -1261,10 +1229,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
     private void cancelCurrentAnimation() {
         mCanceled = true;
         mCurrentShift.cancelAnimation();
-        if (mLauncherTransitionController != null && mLauncherTransitionController
-                .getAnimationPlayer().isStarted()) {
-            mLauncherTransitionController.getAnimationPlayer().cancel();
-        }
     }
 
     private void invalidateHandler() {
@@ -1290,7 +1254,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
     private void endLauncherTransitionController() {
         setShelfState(ShelfAnimState.CANCEL, LINEAR, 0);
         if (mLauncherTransitionController != null) {
-            mLauncherTransitionController.getAnimationPlayer().end();
+            // End the animation, but stay at the same visual progress.
+            mLauncherTransitionController.getNormalController().dispatchSetInterpolator(
+                    t -> Utilities.boundToRange(mCurrentShift.value, 0, 1));
+            mLauncherTransitionController.getNormalController().getAnimationPlayer().end();
             mLauncherTransitionController = null;
         }
     }
@@ -1572,8 +1539,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
      */
     protected void applyWindowTransform() {
         if (mWindowTransitionController != null) {
-            float progress = mCurrentShift.value / mDragLengthFactor;
-            mWindowTransitionController.setPlayFraction(progress);
+            mWindowTransitionController.setProgress(mCurrentShift.value, mDragLengthFactor);
         }
         if (mRecentsAnimationTargets != null) {
             if (mRecentsViewScrollLinked) {
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/AppToOverviewAnimationProvider.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/AppToOverviewAnimationProvider.java
index 9310685e30..55f542461c 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/AppToOverviewAnimationProvider.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/AppToOverviewAnimationProvider.java
@@ -79,8 +79,8 @@ final class AppToOverviewAnimationProvider<T extends StatefulActivity<?>> extend
         BaseActivityInterface.AnimationFactory factory = mActivityInterface.prepareRecentsUI(
                 mDeviceState,
                 wasVisible, (controller) -> {
-                    controller.dispatchOnStart();
-                    controller.getAnimationPlayer().end();
+                    controller.getNormalController().dispatchOnStart();
+                    controller.getNormalController().getAnimationPlayer().end();
                 });
         factory.createActivityInterface(RECENTS_LAUNCH_DURATION);
         factory.setRecentsAttachedToAppWindow(true, false);
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityInterface.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityInterface.java
index d1da0c1c10..3898f0b0ca 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityInterface.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityInterface.java
@@ -27,11 +27,11 @@ import androidx.annotation.Nullable;
 
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.R;
-import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.quickstep.fallback.RecentsState;
 import com.android.quickstep.util.ActivityInitListener;
+import com.android.quickstep.util.AnimatorControllerWithResistance;
 import com.android.quickstep.views.RecentsView;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
@@ -84,7 +84,7 @@ public final class FallbackActivityInterface extends
     /** 6 */
     @Override
     public AnimationFactory prepareRecentsUI(RecentsAnimationDeviceState deviceState,
-            boolean activityVisible, Consumer<AnimatorPlaybackController> callback) {
+            boolean activityVisible, Consumer<AnimatorControllerWithResistance> callback) {
         DefaultAnimationFactory factory = new DefaultAnimationFactory(callback);
         factory.initUI();
         return factory;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java
index 5a35eb5eb2..4e38f494f1 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java
@@ -39,7 +39,6 @@ import com.android.launcher3.LauncherInitListener;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.DiscoveryBounce;
-import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statehandlers.DepthController.ClampedDepthProperty;
@@ -49,6 +48,7 @@ import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.util.ActivityInitListener;
+import com.android.quickstep.util.AnimatorControllerWithResistance;
 import com.android.quickstep.util.LayoutUtils;
 import com.android.quickstep.util.ShelfPeekAnim.ShelfAnimState;
 import com.android.quickstep.views.RecentsView;
@@ -118,7 +118,7 @@ public final class LauncherActivityInterface extends
 
     @Override
     public AnimationFactory prepareRecentsUI(RecentsAnimationDeviceState deviceState,
-            boolean activityVisible, Consumer<AnimatorPlaybackController> callback) {
+            boolean activityVisible, Consumer<AnimatorControllerWithResistance> callback) {
         notifyRecentsOfOrientation(deviceState.getRotationTouchHelper());
         DefaultAnimationFactory factory = new DefaultAnimationFactory(callback) {
             @Override
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/SwipeUpAnimationLogic.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/SwipeUpAnimationLogic.java
index e54a21c073..137f8091ad 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/SwipeUpAnimationLogic.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/SwipeUpAnimationLogic.java
@@ -16,7 +16,7 @@
 package com.android.quickstep;
 
 import static com.android.launcher3.anim.Interpolators.ACCEL_1_5;
-import static com.android.launcher3.anim.Interpolators.DEACCEL;
+import static com.android.launcher3.anim.Interpolators.LINEAR;
 
 import android.animation.Animator;
 import android.content.Context;
@@ -24,7 +24,6 @@ import android.graphics.Matrix;
 import android.graphics.Matrix.ScaleToFit;
 import android.graphics.Rect;
 import android.graphics.RectF;
-import android.view.animation.Interpolator;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.UiThread;
@@ -35,6 +34,7 @@ import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.touch.PagedOrientationHandler;
+import com.android.quickstep.util.AnimatorControllerWithResistance;
 import com.android.quickstep.util.RectFSpringAnim;
 import com.android.quickstep.util.TaskViewSimulator;
 import com.android.quickstep.util.TransformParams;
@@ -45,7 +45,6 @@ import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.
 public abstract class SwipeUpAnimationLogic {
 
     protected static final Rect TEMP_RECT = new Rect();
-    private static final Interpolator PULLBACK_INTERPOLATOR = DEACCEL;
 
     protected DeviceProfile mDp;
 
@@ -66,12 +65,8 @@ public abstract class SwipeUpAnimationLogic {
     protected int mTransitionDragLength;
     // How much further we can drag past recents, as a factor of mTransitionDragLength.
     protected float mDragLengthFactor = 1;
-    // Start resisting when swiping past this factor of mTransitionDragLength.
-    private float mDragLengthFactorStartPullback = 1f;
-    // This is how far down we can scale down, where 0f is full screen and 1f is recents.
-    private float mDragLengthFactorMaxPullback = 1f;
 
-    protected AnimatorPlaybackController mWindowTransitionController;
+    protected AnimatorControllerWithResistance mWindowTransitionController;
 
     public SwipeUpAnimationLogic(Context context, RecentsAnimationDeviceState deviceState,
             GestureState gestureState, TransformParams transformParams) {
@@ -97,19 +92,16 @@ public abstract class SwipeUpAnimationLogic {
         if (mDeviceState.isFullyGesturalNavMode()) {
             // We can drag all the way to the top of the screen.
             mDragLengthFactor = (float) dp.heightPx / mTransitionDragLength;
-
-            float startScale = mTaskViewSimulator.getFullScreenScale();
-            // Start pulling back when RecentsView scale is 0.75f, and let it go down to 0.5f.
-            mDragLengthFactorStartPullback = (0.75f - startScale) / (1 - startScale);
-            mDragLengthFactorMaxPullback = (0.5f - startScale) / (1 - startScale);
         } else {
-            mDragLengthFactor = 1;
-            mDragLengthFactorStartPullback = mDragLengthFactorMaxPullback = 1;
+            mDragLengthFactor = 1 + AnimatorControllerWithResistance.TWO_BUTTON_EXTRA_DRAG_FACTOR;
         }
 
         PendingAnimation pa = new PendingAnimation(mTransitionDragLength * 2);
-        mTaskViewSimulator.addAppToOverviewAnim(pa, t -> t * mDragLengthFactor);
-        mWindowTransitionController = pa.createPlaybackController();
+        mTaskViewSimulator.addAppToOverviewAnim(pa, LINEAR);
+        AnimatorPlaybackController normalController = pa.createPlaybackController();
+        mWindowTransitionController = AnimatorControllerWithResistance.createForRecents(
+                normalController, mContext, mTaskViewSimulator.getOrientationState(),
+                mDp, mTaskViewSimulator.recentsViewScale, AnimatedFloat.VALUE);
     }
 
     @UiThread
@@ -122,13 +114,6 @@ public abstract class SwipeUpAnimationLogic {
         } else {
             float translation = Math.max(displacement, 0);
             shift = mTransitionDragLength == 0 ? 0 : translation / mTransitionDragLength;
-            if (shift > mDragLengthFactorStartPullback) {
-                float pullbackProgress = Utilities.getProgress(shift,
-                        mDragLengthFactorStartPullback, mDragLengthFactor);
-                pullbackProgress = PULLBACK_INTERPOLATOR.getInterpolation(pullbackProgress);
-                shift = mDragLengthFactorStartPullback + pullbackProgress
-                        * (mDragLengthFactorMaxPullback - mDragLengthFactorStartPullback);
-            }
         }
 
         mCurrentShift.updateValue(shift);
@@ -183,7 +168,7 @@ public abstract class SwipeUpAnimationLogic {
             HomeAnimationFactory homeAnimationFactory) {
         final RectF targetRect = homeAnimationFactory.getWindowTargetRect();
 
-        mWindowTransitionController.setPlayFraction(startProgress / mDragLengthFactor);
+        mCurrentShift.updateValue(startProgress);
         mTaskViewSimulator.apply(mTransformParams.setProgress(startProgress));
         RectF cropRectF = new RectF(mTaskViewSimulator.getCurrentCropRect());
 
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index 9dc2132683..a9a4e95381 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -52,6 +52,7 @@ import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.util.WindowBounds;
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.util.ActivityInitListener;
+import com.android.quickstep.util.AnimatorControllerWithResistance;
 import com.android.quickstep.util.ShelfPeekAnim;
 import com.android.quickstep.util.SplitScreenBounds;
 import com.android.quickstep.views.RecentsView;
@@ -106,7 +107,7 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
     public abstract void onAssistantVisibilityChanged(float visibility);
 
     public abstract AnimationFactory prepareRecentsUI(RecentsAnimationDeviceState deviceState,
-            boolean activityVisible, Consumer<AnimatorPlaybackController> callback);
+            boolean activityVisible, Consumer<AnimatorControllerWithResistance> callback);
 
     public abstract ActivityInitListener createActivityInitListener(
             Predicate<Boolean> onInitListener);
@@ -312,11 +313,11 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
 
         protected final ACTIVITY_TYPE mActivity;
         private final STATE_TYPE mStartState;
-        private final Consumer<AnimatorPlaybackController> mCallback;
+        private final Consumer<AnimatorControllerWithResistance> mCallback;
 
         private boolean mIsAttachedToWindow;
 
-        DefaultAnimationFactory(Consumer<AnimatorPlaybackController> callback) {
+        DefaultAnimationFactory(Consumer<AnimatorControllerWithResistance> callback) {
             mCallback = callback;
 
             mActivity = getCreatedActivity();
@@ -344,7 +345,13 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
             controller.setEndAction(() -> mActivity.getStateManager().goToState(
                     controller.getInterpolatedProgress() > 0.5 ? mOverviewState : mBackgroundState,
                     false));
-            mCallback.accept(controller);
+
+            RecentsView recentsView = mActivity.getOverviewPanel();
+            AnimatorControllerWithResistance controllerWithResistance =
+                    AnimatorControllerWithResistance.createForRecents(controller, mActivity,
+                            recentsView.getPagedViewOrientedState(), mActivity.getDeviceProfile(),
+                            recentsView, RECENTS_SCALE_PROPERTY);
+            mCallback.accept(controllerWithResistance);
 
             // Creating the activity controller animation sometimes reapplies the launcher state
             // (because we set the animation as the current state animation), so we reapply the
diff --git a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
index 044e010b3c..60d8ef6ff4 100644
--- a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
@@ -184,8 +184,7 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
 
         @Override
         public void updateFinalShift() {
-            float progress = mCurrentShift.value / mDragLengthFactor;
-            mWindowTransitionController.setPlayFraction(progress);
+            mWindowTransitionController.setProgress(mCurrentShift.value, mDragLengthFactor);
             mTaskViewSimulator.apply(mTransformParams);
         }
 
diff --git a/quickstep/src/com/android/quickstep/util/AnimatorControllerWithResistance.java b/quickstep/src/com/android/quickstep/util/AnimatorControllerWithResistance.java
new file mode 100644
index 0000000000..d58329ab0b
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/util/AnimatorControllerWithResistance.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.quickstep.util;
+
+import static com.android.launcher3.anim.Interpolators.DEACCEL;
+import static com.android.launcher3.anim.Interpolators.LINEAR;
+import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
+
+import android.animation.TimeInterpolator;
+import android.content.Context;
+import android.graphics.PointF;
+import android.graphics.Rect;
+import android.util.FloatProperty;
+
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.anim.AnimatorPlaybackController;
+import com.android.launcher3.anim.PendingAnimation;
+import com.android.quickstep.LauncherActivityInterface;
+import com.android.quickstep.SysUINavigationMode;
+
+/**
+ * Controls an animation that can go beyond progress = 1, at which point resistance should be
+ * applied. Internally, this is a wrapper around 2 {@link AnimatorPlaybackController}s, one that
+ * runs from progress 0 to 1 like normal, then one that seamlessly continues that animation but
+ * starts applying resistance as well.
+ */
+public class AnimatorControllerWithResistance {
+
+    /**
+     * How much farther we can drag past overview in 2-button mode, as a factor of the distance
+     * it takes to drag from an app to overview.
+     */
+    public static final float TWO_BUTTON_EXTRA_DRAG_FACTOR = 0.25f;
+
+    /**
+     * Start slowing down the rate of scaling down when recents view is smaller than this scale.
+     */
+    private static final float RECENTS_SCALE_START_RESIST = 0.75f;
+
+    /**
+     * Recents view will reach this scale at the very end of the drag.
+     */
+    private static final float RECENTS_SCALE_MAX_RESIST = 0.5f;
+
+    private static final TimeInterpolator RECENTS_SCALE_RESIST_INTERPOLATOR = DEACCEL;
+
+    private final AnimatorPlaybackController mNormalController;
+    private final AnimatorPlaybackController mResistanceController;
+
+    // Initialize to -1 so the first 0 gets applied.
+    private float mLastNormalProgress = -1;
+    private float mLastResistProgress;
+
+    public AnimatorControllerWithResistance(AnimatorPlaybackController normalController,
+            AnimatorPlaybackController resistanceController) {
+        mNormalController = normalController;
+        mResistanceController = resistanceController;
+    }
+
+    public AnimatorPlaybackController getNormalController() {
+        return mNormalController;
+    }
+
+    /**
+     * Applies the current progress of the animation.
+     * @param progress From 0 to maxProgress, where 1 is the target we are animating towards.
+     * @param maxProgress > 1, this is where the resistance will be applied.
+     */
+    public void setProgress(float progress, float maxProgress) {
+        float normalProgress = Utilities.boundToRange(progress, 0, 1);
+        if (normalProgress != mLastNormalProgress) {
+            mLastNormalProgress = normalProgress;
+            mNormalController.setPlayFraction(normalProgress);
+        }
+        if (maxProgress <= 1) {
+            return;
+        }
+        float resistProgress = progress <= 1 ? 0 : Utilities.getProgress(progress, 1, maxProgress);
+        if (resistProgress != mLastResistProgress) {
+            mLastResistProgress = resistProgress;
+            mResistanceController.setPlayFraction(resistProgress);
+        }
+    }
+
+    /**
+     * Applies resistance to recents when swiping up past its target position.
+     * @param normalController The controller to run from 0 to 1 before this resistance applies.
+     * @param context Used to compute start and end values.
+     * @param recentsOrientedState Used to compute start and end values.
+     * @param dp Used to compute start and end values.
+     * @param scaleTarget The target for the scaleProperty.
+     * @param scaleProperty Animate the value to change the scale of the window/recents view.
+     */
+    public static <SCALE> AnimatorControllerWithResistance createForRecents(
+            AnimatorPlaybackController normalController, Context context,
+            RecentsOrientedState recentsOrientedState, DeviceProfile dp, SCALE scaleTarget,
+            FloatProperty<SCALE> scaleProperty) {
+        Rect startRect = new Rect();
+        LauncherActivityInterface.INSTANCE.calculateTaskSize(context, dp, startRect,
+                recentsOrientedState.getOrientationHandler());
+        long distanceToCover = startRect.bottom;
+        boolean isTwoButtonMode = SysUINavigationMode.getMode(context) == TWO_BUTTONS;
+        if (isTwoButtonMode) {
+            // We can only drag a small distance past overview, not to the top of the screen.
+            distanceToCover = (long)
+                    ((dp.heightPx - startRect.bottom) * TWO_BUTTON_EXTRA_DRAG_FACTOR);
+        }
+        PendingAnimation resistAnim = new PendingAnimation(distanceToCover * 2);
+
+        PointF pivot = new PointF();
+        float fullscreenScale = recentsOrientedState.getFullScreenScaleAndPivot(
+                startRect, dp, pivot);
+        float startScale = 1;
+        float prevScaleRate = (fullscreenScale - startScale) / (dp.heightPx - startRect.bottom);
+        // This is what the scale would be at the end of the drag if we didn't apply resistance.
+        float endScale = startScale - prevScaleRate * distanceToCover;
+        final TimeInterpolator scaleInterpolator;
+        if (isTwoButtonMode) {
+            // We are bounded by the distance of the drag, so we don't need to apply resistance.
+            scaleInterpolator = LINEAR;
+        } else {
+            // Create an interpolator that resists the scale so the scale doesn't get smaller than
+            // RECENTS_SCALE_MAX_RESIST.
+            float startResist = Utilities.getProgress(RECENTS_SCALE_START_RESIST, startScale,
+                    endScale);
+            float maxResist = Utilities.getProgress(RECENTS_SCALE_MAX_RESIST, startScale, endScale);
+            scaleInterpolator = t -> {
+                if (t < startResist) {
+                    return t;
+                }
+                float resistProgress = Utilities.getProgress(t, startResist, 1);
+                resistProgress = RECENTS_SCALE_RESIST_INTERPOLATOR.getInterpolation(resistProgress);
+                return startResist + resistProgress * (maxResist - startResist);
+            };
+        }
+        resistAnim.addFloat(scaleTarget, scaleProperty, startScale, endScale,
+                scaleInterpolator);
+
+        AnimatorPlaybackController resistanceController = resistAnim.createPlaybackController();
+        return new AnimatorControllerWithResistance(normalController, resistanceController);
+    }
+
+}
diff --git a/src/com/android/launcher3/anim/Interpolators.java b/src/com/android/launcher3/anim/Interpolators.java
index 860ccebef4..6ad43ea1e4 100644
--- a/src/com/android/launcher3/anim/Interpolators.java
+++ b/src/com/android/launcher3/anim/Interpolators.java
@@ -198,6 +198,7 @@ public class Interpolators {
         public OvershootParams(float startProgress, float overshootPastProgress,
                 float endProgress, float velocityPxPerMs, int totalDistancePx, Context context) {
             velocityPxPerMs = Math.abs(velocityPxPerMs);
+            overshootPastProgress = Math.max(overshootPastProgress, startProgress);
             start = startProgress;
             int startPx = (int) (start * totalDistancePx);
             // Overshoot by about half a frame.
-- 
GitLab


From ab98166c36f2955359ccdf31defe0678f66bdd99 Mon Sep 17 00:00:00 2001
From: Raman Tenneti <rtenneti@google.com>
Date: Mon, 3 Aug 2020 12:54:21 -0700
Subject: [PATCH 0067/1664] AOSP/Launcher3 - Update language to comply with
 Android's inclusive language guidance.

See https://source.android.com/setup/contribute/respectful-code for reference

BUG=161896447

Test: make and Presubmit verify.

Change-Id: I44e903046dd4cd9c7c07872fc56a8d552eb09522
---
 .../fallback/FallbackRecentsView.java         | 10 +++++-----
 .../DeviceLockedInputConsumer.java            |  2 +-
 .../android/quickstep/views/RecentsView.java  |  6 +++---
 .../quickstep/views/TaskThumbnailView.java    |  2 +-
 .../com/android/quickstep/views/TaskView.java | 16 +++++++--------
 .../quickstep/RecentsActivityTest.java        |  6 +++---
 .../com/android/quickstep/RecentsModel.java   |  6 +++---
 .../quickstep/ViewInflationDuringSwipeUp.java |  8 ++++----
 .../model/CacheDataUpdatedTaskTest.java       |  6 +++---
 .../model/DbDowngradeHelperTest.java          |  2 +-
 .../model/DefaultLayoutProviderTest.java      |  4 ++--
 .../launcher3/model/LoaderCursorTest.java     |  4 ++--
 .../launcher3/provider/RestoreDbTaskTest.java |  4 ++--
 .../launcher3/util/LauncherModelHelper.java   | 10 +++++-----
 .../widget/WidgetsListAdapterTest.java        |  2 +-
 .../launcher3/anim/PendingAnimation.java      |  2 +-
 .../launcher3/dragndrop/DragController.java   |  8 ++++----
 .../PinShortcutRequestActivityInfo.java       |  4 ++--
 .../launcher3/logging/StatsLogManager.java    |  2 +-
 .../logging/UserEventDispatcher.java          |  2 +-
 .../model/data/WorkspaceItemInfo.java         |  2 +-
 .../notification/NotificationKeyData.java     |  4 ++--
 .../notification/NotificationMainView.java    |  2 +-
 .../launcher3/views/OptionsPopupView.java     | 14 ++++++-------
 .../dynamicui/ColorExtractionAlgorithm.java   | 20 +++++++++----------
 .../testcomponent/ListViewService.java        |  2 +-
 .../tapl/LauncherInstrumentation.java         |  3 +--
 27 files changed, 76 insertions(+), 77 deletions(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsView.java
index a946304779..f5f525965f 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsView.java
@@ -101,20 +101,20 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity>
     }
 
     @Override
-    protected boolean shouldAddDummyTaskView(RunningTaskInfo runningTaskInfo) {
+    protected boolean shouldAddStubTaskView(RunningTaskInfo runningTaskInfo) {
         if (mHomeTaskInfo != null && runningTaskInfo != null &&
                 mHomeTaskInfo.taskId == runningTaskInfo.taskId
                 && getTaskViewCount() == 0) {
-            // Do not add a dummy task if we are running over home with empty recents, so that we
-            // show the empty recents message instead of showing a dummy task and later removing it.
+            // Do not add a stub task if we are running over home with empty recents, so that we
+            // show the empty recents message instead of showing a stub task and later removing it.
             return false;
         }
-        return super.shouldAddDummyTaskView(runningTaskInfo);
+        return super.shouldAddStubTaskView(runningTaskInfo);
     }
 
     @Override
     protected void applyLoadPlan(ArrayList<Task> tasks) {
-        // When quick-switching on 3p-launcher, we add a "dummy" tile corresponding to Launcher
+        // When quick-switching on 3p-launcher, we add a "stub" tile corresponding to Launcher
         // as well. This tile is never shown as we have setCurrentTaskHidden, but allows use to
         // track the index of the next task appropriately, as if we are switching on any other app.
         if (mHomeTaskInfo != null && mHomeTaskInfo.taskId == mRunningTaskId && !tasks.isEmpty()) {
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
index db1948b9f3..7032fae8f0 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
@@ -60,7 +60,7 @@ import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams.Builder;
 
 /**
- * A dummy input consumer used when the device is still locked, e.g. from secure camera.
+ * A placeholder input consumer used when the device is still locked, e.g. from secure camera.
  */
 public class DeviceLockedInputConsumer implements InputConsumer,
         RecentsAnimationCallbacks.RecentsAnimationListener, BuilderProxy {
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
index 0335ee7748..9393e08327 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
@@ -1183,9 +1183,9 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     }
 
     /**
-     * Returns true if we should add a dummy taskView for the running task id
+     * Returns true if we should add a stub taskView for the running task id
      */
-    protected boolean shouldAddDummyTaskView(RunningTaskInfo runningTaskInfo) {
+    protected boolean shouldAddStubTaskView(RunningTaskInfo runningTaskInfo) {
         return runningTaskInfo != null && getTaskView(runningTaskInfo.taskId) == null;
     }
 
@@ -1196,7 +1196,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
      * is called.  Also scrolls the view to this task.
      */
     public void showCurrentTask(RunningTaskInfo runningTaskInfo) {
-        if (shouldAddDummyTaskView(runningTaskInfo)) {
+        if (shouldAddStubTaskView(runningTaskInfo)) {
             boolean wasEmpty = getChildCount() == 0;
             // Add an empty view for now until the task plan is loaded and applied
             final TaskView taskView = mTaskViewPool.getView();
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java
index a8d6442135..7651dd89e2 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java
@@ -125,7 +125,7 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
         mDimmingPaintAfterClearing.setColor(Color.BLACK);
         mActivity = BaseActivity.fromContext(context);
         mIsDarkTextTheme = Themes.getAttrBoolean(mActivity, R.attr.isWorkspaceDarkText);
-        // Initialize with dummy value. It is overridden later by TaskView
+        // Initialize with placeholder value. It is overridden later by TaskView
         mFullscreenParams = TEMP_PARAMS.get(context);
     }
 
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 27d84e6184..6b7daec7bd 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
@@ -245,14 +245,14 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
      */
     public WorkspaceItemInfo getItemInfo() {
         ComponentKey componentKey = TaskUtils.getLaunchComponentKeyForTask(getTask().key);
-        WorkspaceItemInfo dummyInfo = new WorkspaceItemInfo();
-        dummyInfo.itemType = LauncherSettings.Favorites.ITEM_TYPE_TASK;
-        dummyInfo.container = LauncherSettings.Favorites.CONTAINER_TASKSWITCHER;
-        dummyInfo.user = componentKey.user;
-        dummyInfo.intent = new Intent().setComponent(componentKey.componentName);
-        dummyInfo.title = TaskUtils.getTitle(getContext(), getTask());
-        dummyInfo.screenId = getRecentsView().indexOfChild(this);
-        return dummyInfo;
+        WorkspaceItemInfo stubInfo = new WorkspaceItemInfo();
+        stubInfo.itemType = LauncherSettings.Favorites.ITEM_TYPE_TASK;
+        stubInfo.container = LauncherSettings.Favorites.CONTAINER_TASKSWITCHER;
+        stubInfo.user = componentKey.user;
+        stubInfo.intent = new Intent().setComponent(componentKey.componentName);
+        stubInfo.title = TaskUtils.getTitle(getContext(), getTask());
+        stubInfo.screenId = getRecentsView().indexOfChild(this);
+        return stubInfo;
     }
 
     @Override
diff --git a/quickstep/robolectric_tests/src/com/android/quickstep/RecentsActivityTest.java b/quickstep/robolectric_tests/src/com/android/quickstep/RecentsActivityTest.java
index c148a4b6fe..7049af0eb7 100644
--- a/quickstep/robolectric_tests/src/com/android/quickstep/RecentsActivityTest.java
+++ b/quickstep/robolectric_tests/src/com/android/quickstep/RecentsActivityTest.java
@@ -60,9 +60,9 @@ public class RecentsActivityTest {
 
         FallbackRecentsView frv = activity.getOverviewPanel();
 
-        RunningTaskInfo dummyTask = new RunningTaskInfo();
-        dummyTask.taskId = 22;
-        frv.showCurrentTask(dummyTask);
+        RunningTaskInfo placeholderTask = new RunningTaskInfo();
+        placeholderTask.taskId = 22;
+        frv.showCurrentTask(placeholderTask);
         doLayout(activity);
 
         ThumbnailData thumbnailData = new ThumbnailData();
diff --git a/quickstep/src/com/android/quickstep/RecentsModel.java b/quickstep/src/com/android/quickstep/RecentsModel.java
index 6f54ba2935..6c302ae5d7 100644
--- a/quickstep/src/com/android/quickstep/RecentsModel.java
+++ b/quickstep/src/com/android/quickstep/RecentsModel.java
@@ -160,9 +160,9 @@ public class RecentsModel extends TaskStackChangeListener {
 
     @Override
     public void onTaskRemoved(int taskId) {
-        Task.TaskKey dummyKey = new Task.TaskKey(taskId, 0, null, null, 0, 0);
-        mThumbnailCache.remove(dummyKey);
-        mIconCache.onTaskRemoved(dummyKey);
+        Task.TaskKey stubKey = new Task.TaskKey(taskId, 0, null, null, 0, 0);
+        mThumbnailCache.remove(stubKey);
+        mIconCache.onTaskRemoved(stubKey);
     }
 
     public void onTrimMemory(int level) {
diff --git a/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java b/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java
index 115294addf..72116eb570 100644
--- a/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java
+++ b/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java
@@ -71,7 +71,7 @@ import java.util.function.IntConsumer;
 
 /**
  * Test to verify view inflation does not happen during swipe up.
- * To verify view inflation, we setup a dummy ViewConfiguration and check if any call to that class
+ * To verify view inflation, we setup a stub ViewConfiguration and check if any call to that class
  * does from a View.init method or not.
  *
  * Alternative approaches considered:
@@ -138,13 +138,13 @@ public class ViewInflationDuringSwipeUp extends AbstractQuickStepTest {
     @Test
     @NavigationModeSwitch(mode = ZERO_BUTTON)
     public void testSwipeUpFromApp_widget_update() {
-        String dummyText = "Some random dummy text";
+        String stubText = "Some random stub text";
 
         executeSwipeUpTestWithWidget(
                 widgetId -> { },
                 widgetId -> AppWidgetManager.getInstance(getContext())
-                        .updateAppWidget(widgetId, createMainWidgetViews(dummyText)),
-                dummyText);
+                        .updateAppWidget(widgetId, createMainWidgetViews(stubText)),
+                stubText);
     }
 
     @Test
diff --git a/robolectric_tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java b/robolectric_tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java
index 5610b0ee0a..9ac3fe761e 100644
--- a/robolectric_tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java
+++ b/robolectric_tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java
@@ -53,10 +53,10 @@ public class CacheDataUpdatedTaskTest {
         mModelHelper = new LauncherModelHelper();
         mModelHelper.initializeData("/cache_data_updated_task_data.txt");
 
-        // Add dummy entries in the cache to simulate update
+        // Add placeholder entries in the cache to simulate update
         Context context = RuntimeEnvironment.application;
         IconCache iconCache = LauncherAppState.getInstance(context).getIconCache();
-        CachingLogic<ItemInfo> dummyLogic = new CachingLogic<ItemInfo>() {
+        CachingLogic<ItemInfo> placeholderLogic = new CachingLogic<ItemInfo>() {
             @Override
             public ComponentName getComponent(ItemInfo info) {
                 return info.getTargetComponent();
@@ -81,7 +81,7 @@ public class CacheDataUpdatedTaskTest {
 
         UserManager um = context.getSystemService(UserManager.class);
         for (ItemInfo info : mModelHelper.getBgDataModel().itemsIdMap) {
-            iconCache.addIconToDBAndMemCache(info, dummyLogic, new PackageInfo(),
+            iconCache.addIconToDBAndMemCache(info, placeholderLogic, new PackageInfo(),
                     um.getSerialNumberForUser(info.user), true);
         }
     }
diff --git a/robolectric_tests/src/com/android/launcher3/model/DbDowngradeHelperTest.java b/robolectric_tests/src/com/android/launcher3/model/DbDowngradeHelperTest.java
index bbbe21e3f2..be03c7dd4b 100644
--- a/robolectric_tests/src/com/android/launcher3/model/DbDowngradeHelperTest.java
+++ b/robolectric_tests/src/com/android/launcher3/model/DbDowngradeHelperTest.java
@@ -165,7 +165,7 @@ public class DbDowngradeHelperTest {
             @Override
             public void onOpen(SQLiteDatabase db) { }
         };
-        // Insert dummy data
+        // Insert mock data
         for (int i = 0; i < 10; i++) {
             ContentValues values = new ContentValues();
             values.put(Favorites._ID, i);
diff --git a/robolectric_tests/src/com/android/launcher3/model/DefaultLayoutProviderTest.java b/robolectric_tests/src/com/android/launcher3/model/DefaultLayoutProviderTest.java
index 8f3a83ed07..655237d08c 100644
--- a/robolectric_tests/src/com/android/launcher3/model/DefaultLayoutProviderTest.java
+++ b/robolectric_tests/src/com/android/launcher3/model/DefaultLayoutProviderTest.java
@@ -109,7 +109,7 @@ public class DefaultLayoutProviderTest {
     public void testCustomProfileLoaded_with_widget() throws Exception {
         String pendingAppPkg = "com.test.pending";
 
-        // Add a dummy session info so that the widget exists
+        // Add a placeholder session info so that the widget exists
         SessionParams params = new SessionParams(SessionParams.MODE_FULL_INSTALL);
         params.setAppPackageName(pendingAppPkg);
 
@@ -120,7 +120,7 @@ public class DefaultLayoutProviderTest {
         setField(sessionInfo, "appIcon", BitmapInfo.LOW_RES_ICON);
 
         writeLayoutAndLoad(new LauncherLayoutBuilder().atWorkspace(0, 1, 0)
-                .putWidget(pendingAppPkg, "DummyWidget", 2, 2));
+                .putWidget(pendingAppPkg, "PlaceholderWidget", 2, 2));
 
         // Verify widget
         assertEquals(1, mModelHelper.getBgDataModel().appWidgets.size());
diff --git a/robolectric_tests/src/com/android/launcher3/model/LoaderCursorTest.java b/robolectric_tests/src/com/android/launcher3/model/LoaderCursorTest.java
index 3a252dcce9..0e760f97db 100644
--- a/robolectric_tests/src/com/android/launcher3/model/LoaderCursorTest.java
+++ b/robolectric_tests/src/com/android/launcher3/model/LoaderCursorTest.java
@@ -110,7 +110,7 @@ public class LoaderCursorTest {
     public void getAppShortcutInfo_dontAllowMissing_invalidComponent() {
         initCursor(ITEM_TYPE_APPLICATION, "");
         assertTrue(mLoaderCursor.moveToNext());
-        ComponentName cn = new ComponentName(mContext.getPackageName(), "dummy-do");
+        ComponentName cn = new ComponentName(mContext.getPackageName(), "placeholder-do");
         assertNull(mLoaderCursor.getAppShortcutInfo(
                 new Intent().setComponent(cn), false /* allowMissingTarget */, true));
     }
@@ -136,7 +136,7 @@ public class LoaderCursorTest {
         initCursor(ITEM_TYPE_APPLICATION, "");
         assertTrue(mLoaderCursor.moveToNext());
 
-        ComponentName cn = new ComponentName(mContext.getPackageName(), "dummy-do");
+        ComponentName cn = new ComponentName(mContext.getPackageName(), "placeholder-do");
         WorkspaceItemInfo info = Executors.MODEL_EXECUTOR.submit(() ->
                 mLoaderCursor.getAppShortcutInfo(
                         new Intent().setComponent(cn), true  /* allowMissingTarget */, true))
diff --git a/robolectric_tests/src/com/android/launcher3/provider/RestoreDbTaskTest.java b/robolectric_tests/src/com/android/launcher3/provider/RestoreDbTaskTest.java
index ee73b82bb8..4184d33a68 100644
--- a/robolectric_tests/src/com/android/launcher3/provider/RestoreDbTaskTest.java
+++ b/robolectric_tests/src/com/android/launcher3/provider/RestoreDbTaskTest.java
@@ -44,7 +44,7 @@ public class RestoreDbTaskTest {
     @Test
     public void testMigrateProfileId() throws Exception {
         SQLiteDatabase db = new MyDatabaseHelper(42).getWritableDatabase();
-        // Add some dummy data
+        // Add some mock data
         for (int i = 0; i < 5; i++) {
             ContentValues values = new ContentValues();
             values.put(Favorites._ID, i);
@@ -64,7 +64,7 @@ public class RestoreDbTaskTest {
     @Test
     public void testChangeDefaultColumn() throws Exception {
         SQLiteDatabase db = new MyDatabaseHelper(42).getWritableDatabase();
-        // Add some dummy data
+        // Add some mock data
         for (int i = 0; i < 5; i++) {
             ContentValues values = new ContentValues();
             values.put(Favorites._ID, i);
diff --git a/robolectric_tests/src/com/android/launcher3/util/LauncherModelHelper.java b/robolectric_tests/src/com/android/launcher3/util/LauncherModelHelper.java
index 03880879d7..f2b3071c95 100644
--- a/robolectric_tests/src/com/android/launcher3/util/LauncherModelHelper.java
+++ b/robolectric_tests/src/com/android/launcher3/util/LauncherModelHelper.java
@@ -81,7 +81,7 @@ public class LauncherModelHelper {
     public static final int NO__ICON = -1;
     public static final String TEST_PACKAGE = "com.android.launcher3.validpackage";
 
-    // Authority for providing a dummy default-workspace-layout data.
+    // Authority for providing a test default-workspace-layout data.
     private static final String TEST_PROVIDER_AUTHORITY =
             LauncherModelHelper.class.getName().toLowerCase();
     private static final int DEFAULT_BITMAP_SIZE = 10;
@@ -252,7 +252,7 @@ public class LauncherModelHelper {
     }
 
     /**
-     * Adds a dummy item in the DB.
+     * Adds a mock item in the DB.
      * @param type {@link #APP_ICON} or {@link #SHORTCUT} or >= 2 for
      *             folder (where the type represents the number of items in the folder).
      */
@@ -310,7 +310,7 @@ public class LauncherModelHelper {
     }
 
     /**
-     * Initializes the DB with dummy elements to represent the provided grid structure.
+     * Initializes the DB with mock elements to represent the provided grid structure.
      * @param typeArray A 3d array of item types. {@see #addItem(int, long, long, int, int)} for
      *                  type definitions. The first dimension represents the screens and the next
      *                  two represent the workspace grid.
@@ -347,7 +347,7 @@ public class LauncherModelHelper {
     }
 
     /**
-     * Sets up a dummy provider to load the provided layout by default, next time the layout loads
+     * Sets up a mock provider to load the provided layout by default, next time the layout loads
      */
     public LauncherModelHelper setupDefaultLayoutProvider(LauncherLayoutBuilder builder)
             throws Exception {
@@ -360,7 +360,7 @@ public class LauncherModelHelper {
                 "launcher3.layout.provider", TEST_PROVIDER_AUTHORITY);
 
         shadowOf(context.getPackageManager())
-                .addProviderIfNotPresent(new ComponentName("com.test", "Dummy")).authority =
+                .addProviderIfNotPresent(new ComponentName("com.test", "Mock")).authority =
                 TEST_PROVIDER_AUTHORITY;
 
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
diff --git a/robolectric_tests/src/com/android/launcher3/widget/WidgetsListAdapterTest.java b/robolectric_tests/src/com/android/launcher3/widget/WidgetsListAdapterTest.java
index 84c65b1108..5ab3106bd9 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/WidgetsListAdapterTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/WidgetsListAdapterTest.java
@@ -129,7 +129,7 @@ public class WidgetsListAdapterTest {
         ShadowPackageManager spm = shadowOf(mContext.getPackageManager());
 
         for (int i = 0; i < num; i++) {
-            ComponentName cn = new ComponentName("com.dummy.apk" + i, "DummyWidet");
+            ComponentName cn = new ComponentName("com.placeholder.apk" + i, "PlaceholderWidet");
 
             AppWidgetProviderInfo widgetInfo = new AppWidgetProviderInfo();
             widgetInfo.provider = cn;
diff --git a/src/com/android/launcher3/anim/PendingAnimation.java b/src/com/android/launcher3/anim/PendingAnimation.java
index 4195933f5c..53625756b8 100644
--- a/src/com/android/launcher3/anim/PendingAnimation.java
+++ b/src/com/android/launcher3/anim/PendingAnimation.java
@@ -149,7 +149,7 @@ public class PendingAnimation implements PropertySetter {
             mProgressAnimator = null;
         }
         if (mAnimHolders.isEmpty()) {
-            // Add a dummy animation to that the duration is respected
+            // Add a placeholder animation to that the duration is respected
             add(ValueAnimator.ofFloat(0, 1).setDuration(mDuration));
         }
         return mAnim;
diff --git a/src/com/android/launcher3/dragndrop/DragController.java b/src/com/android/launcher3/dragndrop/DragController.java
index 03028d3a86..ef666f0acd 100644
--- a/src/com/android/launcher3/dragndrop/DragController.java
+++ b/src/com/android/launcher3/dragndrop/DragController.java
@@ -463,10 +463,10 @@ public class DragController implements DragDriver.EventListener, TouchController
     }
 
     public void forceTouchMove() {
-        int[] dummyCoordinates = mCoordinatesTemp;
-        DropTarget dropTarget = findDropTarget(mLastTouch.x, mLastTouch.y, dummyCoordinates);
-        mDragObject.x = dummyCoordinates[0];
-        mDragObject.y = dummyCoordinates[1];
+        int[] placeholderCoordinates = mCoordinatesTemp;
+        DropTarget dropTarget = findDropTarget(mLastTouch.x, mLastTouch.y, placeholderCoordinates);
+        mDragObject.x = placeholderCoordinates[0];
+        mDragObject.y = placeholderCoordinates[1];
         checkTouchMove(dropTarget);
     }
 
diff --git a/src/com/android/launcher3/dragndrop/PinShortcutRequestActivityInfo.java b/src/com/android/launcher3/dragndrop/PinShortcutRequestActivityInfo.java
index 9982b39339..f543e47c0a 100644
--- a/src/com/android/launcher3/dragndrop/PinShortcutRequestActivityInfo.java
+++ b/src/com/android/launcher3/dragndrop/PinShortcutRequestActivityInfo.java
@@ -49,14 +49,14 @@ class PinShortcutRequestActivityInfo extends ShortcutConfigActivityInfo {
 
     // Class name used in the target component, such that it will never represent an
     // actual existing class.
-    private static final String DUMMY_COMPONENT_CLASS = "pinned-shortcut";
+    private static final String STUB_COMPONENT_CLASS = "pinned-shortcut";
 
     private final PinItemRequest mRequest;
     private final ShortcutInfo mInfo;
     private final Context mContext;
 
     public PinShortcutRequestActivityInfo(PinItemRequest request, Context context) {
-        super(new ComponentName(request.getShortcutInfo().getPackage(), DUMMY_COMPONENT_CLASS),
+        super(new ComponentName(request.getShortcutInfo().getPackage(), STUB_COMPONENT_CLASS),
                 request.getShortcutInfo().getUserHandle());
         mRequest = request;
         mInfo = request.getShortcutInfo();
diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index de72534ccc..03740096c3 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -37,7 +37,7 @@ import java.util.List;
  *
  * <pre>
  * All of the event ids are defined here.
- * Most of the methods are dummy methods for Launcher3
+ * Most of the methods are placeholder methods for Launcher3
  * Actual call happens only for Launcher variant that implements QuickStep.
  * </pre>
  */
diff --git a/src/com/android/launcher3/logging/UserEventDispatcher.java b/src/com/android/launcher3/logging/UserEventDispatcher.java
index e094cab82f..31a81b8164 100644
--- a/src/com/android/launcher3/logging/UserEventDispatcher.java
+++ b/src/com/android/launcher3/logging/UserEventDispatcher.java
@@ -147,7 +147,7 @@ public class UserEventDispatcher implements ResourceBasedOverride {
     }
 
     /**
-     * Dummy method.
+     * Placeholder method.
      */
     public void logActionTip(int actionType, int viewType) {
     }
diff --git a/src/com/android/launcher3/model/data/WorkspaceItemInfo.java b/src/com/android/launcher3/model/data/WorkspaceItemInfo.java
index a7bf1f38af..1e1d093b13 100644
--- a/src/com/android/launcher3/model/data/WorkspaceItemInfo.java
+++ b/src/com/android/launcher3/model/data/WorkspaceItemInfo.java
@@ -216,7 +216,7 @@ public class WorkspaceItemInfo extends ItemInfoWithIcon {
         if (cn == null && (itemType == Favorites.ITEM_TYPE_SHORTCUT || hasStatusFlag(
                 FLAG_SUPPORTS_WEB_UI | FLAG_AUTOINSTALL_ICON | FLAG_RESTORED_ICON))) {
             // Legacy shortcuts and promise icons with web UI may not have a componentName but just
-            // a packageName. In that case create a dummy componentName instead of adding additional
+            // a packageName. In that case create a empty componentName instead of adding additional
             // check everywhere.
             String pkg = intent.getPackage();
             return pkg == null ? null : new ComponentName(pkg, IconCache.EMPTY_CLASS_NAME);
diff --git a/src/com/android/launcher3/notification/NotificationKeyData.java b/src/com/android/launcher3/notification/NotificationKeyData.java
index a1917ecb00..1dda3dfd27 100644
--- a/src/com/android/launcher3/notification/NotificationKeyData.java
+++ b/src/com/android/launcher3/notification/NotificationKeyData.java
@@ -30,9 +30,9 @@ import java.util.List;
 
 /**
  * The key data associated with the notification, used to determine what to include
- * in dots and dummy popup views before they are populated.
+ * in dots and stub popup views before they are populated.
  *
- * @see NotificationInfo for the full data used when populating the dummy views.
+ * @see NotificationInfo for the full data used when populating the stub views.
  */
 public class NotificationKeyData {
     public final String notificationKey;
diff --git a/src/com/android/launcher3/notification/NotificationMainView.java b/src/com/android/launcher3/notification/NotificationMainView.java
index b03aa9c3fe..32f060ba85 100644
--- a/src/com/android/launcher3/notification/NotificationMainView.java
+++ b/src/com/android/launcher3/notification/NotificationMainView.java
@@ -137,7 +137,7 @@ public class NotificationMainView extends FrameLayout implements SingleAxisSwipe
             setOnClickListener(mNotificationInfo);
         }
         setContentTranslation(0);
-        // Add a dummy ItemInfo so that logging populates the correct container and item types
+        // Add a stub ItemInfo so that logging populates the correct container and item types
         // instead of DEFAULT_CONTAINERTYPE and DEFAULT_ITEMTYPE, respectively.
         setTag(NOTIFICATION_ITEM_INFO);
         if (animate) {
diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java
index e95dc5b83f..9ad2331112 100644
--- a/src/com/android/launcher3/views/OptionsPopupView.java
+++ b/src/com/android/launcher3/views/OptionsPopupView.java
@@ -226,15 +226,15 @@ public class OptionsPopupView extends ArrowPopup
         if (!TextUtils.isEmpty(pickerPackage)) {
             intent.setPackage(pickerPackage);
         }
-        return launcher.startActivitySafely(v, intent, dummyInfo(intent));
+        return launcher.startActivitySafely(v, intent, placeholderInfo(intent));
     }
 
-    static WorkspaceItemInfo dummyInfo(Intent intent) {
-        WorkspaceItemInfo dummyInfo = new WorkspaceItemInfo();
-        dummyInfo.intent = intent;
-        dummyInfo.itemType = LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT;
-        dummyInfo.container = LauncherSettings.Favorites.CONTAINER_SETTINGS;
-        return dummyInfo;
+    static WorkspaceItemInfo placeholderInfo(Intent intent) {
+        WorkspaceItemInfo placeholderInfo = new WorkspaceItemInfo();
+        placeholderInfo.intent = intent;
+        placeholderInfo.itemType = LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT;
+        placeholderInfo.container = LauncherSettings.Favorites.CONTAINER_SETTINGS;
+        return placeholderInfo;
     }
 
     public static class OptionItem {
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/ColorExtractionAlgorithm.java b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/ColorExtractionAlgorithm.java
index 5a1f9caa5d..780a0f0372 100644
--- a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/ColorExtractionAlgorithm.java
+++ b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/ColorExtractionAlgorithm.java
@@ -21,16 +21,16 @@ import android.util.Log;
 import android.util.Pair;
 import android.util.Range;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.graphics.ColorUtils;
+
 import com.android.launcher3.Utilities;
 
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.graphics.ColorUtils;
-
 /**
  * Implementation of tonal color extraction
  **/
@@ -69,7 +69,7 @@ public class ColorExtractionAlgorithm {
         // palettes. The best fit is tweaked to be closer to the source color
         // and replaces the original palette
 
-        // Get the most preeminent, non-blacklisted color.
+        // Get the most preeminent, non-disallowed color.
         Integer bestColor = 0;
         final float[] hsl = new float[3];
         for (int i = 0; i < mainColorsSize; i++) {
@@ -78,7 +78,7 @@ public class ColorExtractionAlgorithm {
                     Color.blue(colorValue), hsl);
 
             // Stop when we find a color that meets our criteria
-            if (!isBlacklisted(hsl)) {
+            if (!isDisallowed(hsl)) {
                 bestColor = colorValue;
                 break;
             }
@@ -167,12 +167,12 @@ public class ColorExtractionAlgorithm {
     }
 
     /**
-     * Checks if a given color exists in the blacklist
+     * Checks if a given color exists in the disallowed_colors list.
      * @param hsl float array with 3 components (H 0..360, S 0..1 and L 0..1)
      * @return true if color should be avoided
      */
-    private boolean isBlacklisted(float[] hsl) {
-        for (ColorRange badRange: BLACKLISTED_COLORS) {
+    private boolean isDisallowed(float[] hsl) {
+        for (ColorRange badRange: DISALLOWED_COLORS) {
             if (badRange.containsColor(hsl[0], hsl[1], hsl[2])) {
                 return true;
             }
@@ -592,7 +592,7 @@ public class ColorExtractionAlgorithm {
     );
 
     @SuppressWarnings("WeakerAccess")
-    static final ColorRange[] BLACKLISTED_COLORS = new ColorRange[] {
+    static final ColorRange[] DISALLOWED_COLORS = new ColorRange[] {
 
             // Red
             new ColorRange(
diff --git a/tests/src/com/android/launcher3/testcomponent/ListViewService.java b/tests/src/com/android/launcher3/testcomponent/ListViewService.java
index 3da20e0991..9e3a492551 100644
--- a/tests/src/com/android/launcher3/testcomponent/ListViewService.java
+++ b/tests/src/com/android/launcher3/testcomponent/ListViewService.java
@@ -89,7 +89,7 @@ public class ListViewService extends RemoteViewsService {
                 public RemoteViewsFactory onGetViewFactory(Intent intent) {
                     return SimpleViewsFactory.this;
                 }
-            }.onBind(new Intent("dummy_intent"));
+            }.onBind(new Intent("stub_intent"));
         }
     }
 }
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index c621616ef5..a77c1c6b70 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -175,8 +175,7 @@ public final class LauncherInstrumentation {
     private Runnable mOnLauncherCrashed;
 
     private static Pattern getTouchEventPattern(String prefix, String action) {
-        // The pattern includes sanity checks that we don't get a multi-touch events or other
-        // surprises.
+        // The pattern includes checks that we don't get a multi-touch events or other surprises.
         return Pattern.compile(
                 prefix + ": MotionEvent.*?action=" + action + ".*?id\\[0\\]=0"
                         + ".*?toolType\\[0\\]=TOOL_TYPE_FINGER.*?buttonState=0.*?pointerCount=1");
-- 
GitLab


From f66f2f66cf130d48a0c8897628655fd2310a1358 Mon Sep 17 00:00:00 2001
From: Jason Chang <jasonsfchang@google.com>
Date: Tue, 4 Aug 2020 19:56:39 +0800
Subject: [PATCH 0068/1664] Refactoring One-Handed feature flag and others

Purify some conditions for reducing redundancy codes.

Test: manual
Change-Id: I2f39207424f9db3fb6b12bc08bee525f3dfab0aa
---
 .../RecentsAnimationDeviceState.java          | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index 716887509d..fe152a0cd9 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -98,6 +98,7 @@ public class RecentsAnimationDeviceState implements
     private float mAssistantVisibility;
     private boolean mIsOneHandedModeEnabled;
     private boolean mIsSwipeToNotificationEnabled;
+    private final boolean mIsOneHandedModeSupported;
 
     private boolean mIsUserUnlocked;
     private final ArrayList<Runnable> mUserUnlockedActions = new ArrayList<>();
@@ -123,6 +124,7 @@ public class RecentsAnimationDeviceState implements
         mSysUiNavMode = SysUINavigationMode.INSTANCE.get(context);
         mDefaultDisplay = DefaultDisplay.INSTANCE.get(context);
         mDisplayId = mDefaultDisplay.getInfo().id;
+        mIsOneHandedModeSupported = SystemProperties.getBoolean(SUPPORT_ONE_HANDED_MODE, false);
         runOnDestroy(() -> mDefaultDisplay.removeChangeListener(this));
         mRotationTouchHelper = new RotationTouchHelper(context);
         runOnDestroy(mRotationTouchHelper::destroy);
@@ -167,7 +169,7 @@ public class RecentsAnimationDeviceState implements
             }
         }
 
-        if (SystemProperties.getBoolean(SUPPORT_ONE_HANDED_MODE, false)) {
+        if (mIsOneHandedModeSupported) {
             SecureSettingsObserver oneHandedEnabledObserver =
                     SecureSettingsObserver.newOneHandedSettingsObserver(
                             mContext, enabled -> mIsOneHandedModeEnabled = enabled);
@@ -522,19 +524,18 @@ public class RecentsAnimationDeviceState implements
      * @return whether the given motion event can trigger the one handed mode.
      */
     public boolean canTriggerOneHandedAction(MotionEvent ev) {
-        if (!SystemProperties.getBoolean(SUPPORT_ONE_HANDED_MODE, false)) {
+        if (!mIsOneHandedModeSupported) {
             return false;
         }
 
-        if (!mIsOneHandedModeEnabled && !mIsSwipeToNotificationEnabled) {
-            return false;
+        if (mIsOneHandedModeEnabled || mIsSwipeToNotificationEnabled) {
+            final DefaultDisplay.Info displayInfo = mDefaultDisplay.getInfo();
+            return (mRotationTouchHelper.touchInOneHandedModeRegion(ev)
+                && displayInfo.rotation != Surface.ROTATION_90
+                && displayInfo.rotation != Surface.ROTATION_270
+                && displayInfo.metrics.densityDpi < DisplayMetrics.DENSITY_600);
         }
-
-        final DefaultDisplay.Info displayInfo = mDefaultDisplay.getInfo();
-        return (mRotationTouchHelper.touchInOneHandedModeRegion(ev)
-            && displayInfo.rotation != Surface.ROTATION_90
-            && displayInfo.rotation != Surface.ROTATION_270
-            && displayInfo.metrics.densityDpi < DisplayMetrics.DENSITY_600);
+        return false;
     }
 
     public boolean isOneHandedModeEnabled() {
-- 
GitLab


From e8bea3ea7a7a2370f1effc75a674e7510264b999 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Thu, 30 Jul 2020 02:12:10 -0700
Subject: [PATCH 0069/1664] Allow search results decoration [part 2/3]

[Video attached to bug report]

Bug: 162480567
Test: Manual
Change-Id: Iff285abde5b2a3f3f3a63e7318020cfe7572af49
---
 .../appprediction/AppsDividerView.java        |  13 +-
 .../appprediction/PredictionRowView.java      |  17 +++
 res/layout/search_section_title.xml           |   4 +-
 res/values/colors.xml                         |   4 +
 .../allapps/AllAppsContainerView.java         |  10 +-
 .../allapps/AllAppsSectionDecorator.java      | 140 ++++++++++++++++++
 .../allapps/AlphabeticalAppsList.java         |  32 +++-
 .../allapps/search/AppsSearchPipeline.java    |  18 ++-
 .../allapps/search/SearchSectionInfo.java     |  39 +++++
 9 files changed, 261 insertions(+), 16 deletions(-)
 create mode 100644 src/com/android/launcher3/allapps/AllAppsSectionDecorator.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AppsDividerView.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AppsDividerView.java
index 914d9e9774..7dc7bfcc36 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AppsDividerView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AppsDividerView.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (C) 2019 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -42,6 +42,7 @@ import com.android.launcher3.R;
 import com.android.launcher3.allapps.FloatingHeaderRow;
 import com.android.launcher3.allapps.FloatingHeaderView;
 import com.android.launcher3.anim.PropertySetter;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.statemanager.StateManager.StateListener;
 import com.android.launcher3.util.Themes;
 
@@ -90,7 +91,8 @@ public class AppsDividerView extends View implements StateListener<LauncherState
         mLauncher = Launcher.getLauncher(context);
 
         boolean isMainColorDark = Themes.getAttrBoolean(context, R.attr.isMainColorDark);
-        mPaint.setStrokeWidth(getResources().getDimensionPixelSize(R.dimen.all_apps_divider_height));
+        mPaint.setStrokeWidth(
+                getResources().getDimensionPixelSize(R.dimen.all_apps_divider_height));
 
         mStrokeColor = ContextCompat.getColor(context, isMainColorDark
                 ? R.color.all_apps_prediction_row_separator_dark
@@ -134,7 +136,7 @@ public class AppsDividerView extends View implements StateListener<LauncherState
                 if (row == this) {
                     break;
                 } else if (row.shouldDraw()) {
-                    sectionCount ++;
+                    sectionCount++;
                 }
             }
 
@@ -181,6 +183,11 @@ public class AppsDividerView extends View implements StateListener<LauncherState
     }
 
     private void updateViewVisibility() {
+        // hide divider since we have item decoration for prediction row
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
+            setVisibility(GONE);
+            return;
+        }
         setVisibility(mDividerType == DividerType.NONE
                 ? GONE
                 : (mIsScrolledOut ? INVISIBLE : VISIBLE));
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java
index 55384af96b..8a810e3aa4 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java
@@ -45,10 +45,12 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
+import com.android.launcher3.allapps.AllAppsSectionDecorator;
 import com.android.launcher3.allapps.FloatingHeaderRow;
 import com.android.launcher3.allapps.FloatingHeaderView;
 import com.android.launcher3.anim.AlphaUpdateListener;
 import com.android.launcher3.anim.PropertySetter;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.keyboard.FocusIndicatorHelper;
 import com.android.launcher3.keyboard.FocusIndicatorHelper.SimpleFocusIndicatorHelper;
 import com.android.launcher3.logging.StatsLogUtils.LogContainerProvider;
@@ -110,6 +112,8 @@ public class PredictionRowView extends LinearLayout implements
 
     private boolean mPredictionsEnabled = false;
 
+    AllAppsSectionDecorator.SectionDecorationHandler mDecorationHandler;
+
     public PredictionRowView(@NonNull Context context) {
         this(context, null);
     }
@@ -128,6 +132,11 @@ public class PredictionRowView extends LinearLayout implements
         mIconFullTextAlpha = Color.alpha(mIconTextColor);
         mIconCurrentTextAlpha = mIconFullTextAlpha;
 
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
+            mDecorationHandler = new AllAppsSectionDecorator.SectionDecorationHandler(getContext(),
+                    false);
+        }
+
         updateVisibility();
     }
 
@@ -153,6 +162,14 @@ public class PredictionRowView extends LinearLayout implements
 
     @Override
     protected void dispatchDraw(Canvas canvas) {
+        if (mDecorationHandler != null) {
+            mDecorationHandler.reset();
+            int childrenCount = getChildCount();
+            for (int i = 0; i < childrenCount; i++) {
+                mDecorationHandler.extendBounds(getChildAt(i));
+            }
+            mDecorationHandler.onDraw(canvas);
+        }
         mFocusHelper.draw(canvas);
         super.dispatchDraw(canvas);
     }
diff --git a/res/layout/search_section_title.xml b/res/layout/search_section_title.xml
index 9ab27c1620..c39a641d66 100644
--- a/res/layout/search_section_title.xml
+++ b/res/layout/search_section_title.xml
@@ -19,7 +19,5 @@
           android:fontFamily="@style/TextHeadline"
           android:layout_width="wrap_content"
           android:textColor="?android:attr/textColorPrimary"
-          android:layout_marginLeft="16dp"
-          android:layout_marginRight="16dp"
-          android:paddingTop="8dp"
+          android:padding="4dp"
           android:layout_height="wrap_content"/>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index f56fbaaace..ad607a3cb6 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -35,6 +35,10 @@
 
     <color name="icon_background">#E0E0E0</color> <!-- Gray 300 -->
 
+    <color name="all_apps_bg_hand_fill">#E5E5E5</color>
+    <color name="all_apps_bg_hand_fill_dark">#9AA0A6</color>
+    <color name="all_apps_section_fill">#327d7d7d</color>
+
     <color name="gesture_tutorial_ripple_color">#A0C2F9</color> <!-- Light Blue -->
     <color name="gesture_tutorial_fake_task_view_color">#6DA1FF</color> <!-- Light Blue -->
     <color name="gesture_tutorial_action_button_label_color">#FFFFFFFF</color>
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 77b8a32c7a..2d711e6251 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -55,6 +55,7 @@ import com.android.launcher3.Insettable;
 import com.android.launcher3.InsettableFrameLayout;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.keyboard.FocusedItemDecorator;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
@@ -486,7 +487,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         if (mWorkModeSwitch != null) {
             mWorkModeSwitch.setWorkTabVisible(pos == AdapterHolder.WORK
                     && mAllAppsStore.hasModelFlag(
-                            FLAG_HAS_SHORTCUT_PERMISSION | FLAG_QUIET_MODE_CHANGE_PERMISSION));
+                    FLAG_HAS_SHORTCUT_PERMISSION | FLAG_QUIET_MODE_CHANGE_PERMISSION));
         }
     }
 
@@ -538,6 +539,10 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         int padding = mHeader.getMaxTranslation();
         for (int i = 0; i < mAH.length; i++) {
             mAH[i].padding.top = padding;
+            if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && mUsingTabs) {
+                //add extra space between tabs and recycler view
+                mAH[i].padding.top += mLauncher.getDeviceProfile().edgeMarginPx;
+            }
             mAH[i].applyPadding();
         }
     }
@@ -652,6 +657,9 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
             applyVerticalFadingEdgeEnabled(verticalFadingEdge);
             applyPadding();
             setupOverlay();
+            if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
+                recyclerView.addItemDecoration(new AllAppsSectionDecorator(getApps()));
+            }
         }
 
         void setupOverlay() {
diff --git a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
new file mode 100644
index 0000000000..ac55072d58
--- /dev/null
+++ b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.allapps;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.view.View;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.launcher3.R;
+import com.android.launcher3.allapps.search.SearchSectionInfo;
+import com.android.launcher3.util.Themes;
+
+import java.util.List;
+
+/**
+ * ItemDecoration class that groups items in {@link AllAppsRecyclerView}
+ */
+public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
+
+    private final AlphabeticalAppsList mApps;
+
+    AllAppsSectionDecorator(AlphabeticalAppsList appsList) {
+        mApps = appsList;
+    }
+
+    @Override
+    public void onDraw(Canvas c, RecyclerView parent, RecyclerView.State state) {
+        // Iterate through views in recylerview and draw bounds around views in the same section.
+        // Since views in the same section will follow each other, we can skip to a last view in
+        // a section to get the bounds of the section without having to iterate on evert item.
+        int itemCount = parent.getChildCount();
+        List<AlphabeticalAppsList.AdapterItem> adapterItems = mApps.getAdapterItems();
+        SectionDecorationHandler lastDecorationHandler = null;
+        int i = 0;
+        while (i < itemCount) {
+            View view = parent.getChildAt(i);
+            int position = parent.getChildAdapterPosition(view);
+            AlphabeticalAppsList.AdapterItem adapterItem = adapterItems.get(position);
+            if (adapterItem.searchSectionInfo != null) {
+                SearchSectionInfo sectionInfo = adapterItem.searchSectionInfo;
+                int endIndex = Math.min(i + sectionInfo.getPosEnd() - position, itemCount - 1);
+                SectionDecorationHandler decorationHandler = sectionInfo.getDecorationHandler();
+                if (decorationHandler != lastDecorationHandler && lastDecorationHandler != null) {
+                    drawDecoration(c, lastDecorationHandler, parent);
+                }
+                lastDecorationHandler = decorationHandler;
+                if (decorationHandler != null) {
+                    decorationHandler.extendBounds(view);
+                }
+
+                if (endIndex > i) {
+                    i = endIndex;
+                    continue;
+                }
+
+            }
+            i++;
+        }
+        if (lastDecorationHandler != null) {
+            drawDecoration(c, lastDecorationHandler, parent);
+        }
+    }
+
+    private void drawDecoration(Canvas c, SectionDecorationHandler decorationHandler, View parent) {
+        if (decorationHandler == null) return;
+        if (decorationHandler.mIsFullWidth) {
+            decorationHandler.mBounds.left = parent.getPaddingLeft();
+            decorationHandler.mBounds.right = parent.getWidth() - parent.getPaddingRight();
+        }
+        decorationHandler.onDraw(c);
+        decorationHandler.reset();
+    }
+
+    /**
+     * Handles grouping and drawing of items in the same all apps sections.
+     */
+    public static class SectionDecorationHandler {
+        protected RectF mBounds = new RectF();
+        private final boolean mIsFullWidth;
+        private final float mRadius;
+        private final int mFillcolor;
+        Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+
+
+        public SectionDecorationHandler(Context context, boolean isFullWidth) {
+            mIsFullWidth = isFullWidth;
+            mFillcolor = context.getColor(R.color.all_apps_section_fill);
+            mRadius = Themes.getDialogCornerRadius(context);
+        }
+
+        /**
+         * Extends current bounds to include view
+         */
+        public void extendBounds(View view) {
+            if (mBounds.isEmpty()) {
+                mBounds.set(view.getLeft(), view.getTop(), view.getRight(), view.getBottom());
+            } else {
+                mBounds.set(
+                        Math.min(mBounds.left, view.getLeft()),
+                        Math.min(mBounds.top, view.getTop()),
+                        Math.max(mBounds.right, view.getRight()),
+                        Math.max(mBounds.bottom, view.getBottom())
+                );
+            }
+        }
+
+        /**
+         * Draw bounds onto canvas
+         */
+        public void onDraw(Canvas canvas) {
+            mPaint.setColor(mFillcolor);
+            canvas.drawRoundRect(mBounds, mRadius, mRadius, mPaint);
+        }
+
+        /**
+         * Reset view bounds to empty
+         */
+        public void reset() {
+            mBounds.setEmpty();
+        }
+    }
+
+}
diff --git a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
index 266bfa2785..5d9c5549f3 100644
--- a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
+++ b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
@@ -31,7 +31,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.TreeMap;
-import java.util.stream.Collectors;
 
 /**
  * The alphabetically sorted list of applications.
@@ -311,9 +310,15 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
         mFastScrollerSections.clear();
         mAdapterItems.clear();
 
+        SearchSectionInfo appSection = new SearchSectionInfo();
+        appSection.setDecorationHandler(
+                new AllAppsSectionDecorator.SectionDecorationHandler(mLauncher, true));
+
         // Recreate the filtered and sectioned apps (for convenience for the grid layout) from the
         // ordered set of sections
+
         if (!hasFilter()) {
+            appSection.setPosStart(position);
             for (AppInfo info : mApps) {
                 String sectionName = info.sectionName;
 
@@ -329,14 +334,31 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
                 if (lastFastScrollerSectionInfo.fastScrollToItem == null) {
                     lastFastScrollerSectionInfo.fastScrollToItem = appItem;
                 }
+                if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
+                    appItem.searchSectionInfo = appSection;
+                }
                 mAdapterItems.add(appItem);
                 mFilteredApps.add(info);
             }
+            appSection.setPosEnd(mApps.isEmpty() ? appSection.getPosStart() : position - 1);
         } else {
-            mAdapterItems.addAll(mSearchResults);
-            List<AppInfo> appInfos = mSearchResults.stream().filter(
-                    i -> AllAppsGridAdapter.isIconViewType(i.viewType)).map(i -> i.appInfo).collect(
-                    Collectors.toList());
+            List<AppInfo> appInfos = new ArrayList<>();
+            SearchSectionInfo lastSection = null;
+            for (int i = 0; i < mSearchResults.size(); i++) {
+                AdapterItem adapterItem = mSearchResults.get(i);
+                adapterItem.position = i;
+                mAdapterItems.add(adapterItem);
+                if (adapterItem.searchSectionInfo != lastSection) {
+                    adapterItem.searchSectionInfo.setPosStart(i);
+                    if (lastSection != null) {
+                        lastSection.setPosEnd(i - 1);
+                    }
+                    lastSection = adapterItem.searchSectionInfo;
+                }
+                if (AllAppsGridAdapter.isIconViewType(adapterItem.viewType)) {
+                    appInfos.add(adapterItem.appInfo);
+                }
+            }
             mFilteredApps.addAll(appInfos);
             if (!FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
                 // Append the search market item
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java b/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
index 5beb956079..fb786513ac 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
@@ -19,6 +19,7 @@ import androidx.annotation.WorkerThread;
 
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
+import com.android.launcher3.allapps.AllAppsSectionDecorator.SectionDecorationHandler;
 import com.android.launcher3.allapps.AlphabeticalAppsList.AdapterItem;
 import com.android.launcher3.model.AllAppsList;
 import com.android.launcher3.model.BaseModelUpdateTask;
@@ -36,12 +37,21 @@ public class AppsSearchPipeline implements SearchPipeline {
 
     private static final int MAX_RESULTS_COUNT = 5;
 
-    private final SearchSectionInfo mSearchSectionInfo;
+    private static final int SECTION_TYPE_HEADER = 0;
+    private static final int SECTION_TYPE_APPS = 1;
+
+    private final SearchSectionInfo[] mSearchSectionInfos;
     private final LauncherAppState mLauncherAppState;
 
+
     public AppsSearchPipeline(LauncherAppState launcherAppState) {
         mLauncherAppState = launcherAppState;
-        mSearchSectionInfo = new SearchSectionInfo(R.string.search_corpus_apps);
+        mSearchSectionInfos = new SearchSectionInfo[]{
+                new SearchSectionInfo(R.string.search_corpus_apps),
+                new SearchSectionInfo()
+        };
+        mSearchSectionInfos[SECTION_TYPE_APPS].setDecorationHandler(
+                new SectionDecorationHandler(launcherAppState.getContext(), true));
     }
 
     @Override
@@ -78,12 +88,12 @@ public class AppsSearchPipeline implements SearchPipeline {
         if (matchingApps.isEmpty()) {
             return items;
         }
-        items.add(AdapterItem.asSearchTitle(mSearchSectionInfo, 0));
+        items.add(AdapterItem.asSearchTitle(mSearchSectionInfos[SECTION_TYPE_HEADER], 0));
         int existingItems = items.size();
         int searchResultsCount = Math.min(matchingApps.size(), MAX_RESULTS_COUNT);
         for (int i = 0; i < searchResultsCount; i++) {
             AdapterItem appItem = AdapterItem.asApp(i + existingItems, "", matchingApps.get(i), i);
-            appItem.searchSectionInfo = mSearchSectionInfo;
+            appItem.searchSectionInfo = mSearchSectionInfos[SECTION_TYPE_APPS];
             items.add(appItem);
         }
 
diff --git a/src/com/android/launcher3/allapps/search/SearchSectionInfo.java b/src/com/android/launcher3/allapps/search/SearchSectionInfo.java
index 880b2466dc..dee0ffd2df 100644
--- a/src/com/android/launcher3/allapps/search/SearchSectionInfo.java
+++ b/src/com/android/launcher3/allapps/search/SearchSectionInfo.java
@@ -17,20 +17,59 @@ package com.android.launcher3.allapps.search;
 
 import android.content.Context;
 
+import com.android.launcher3.allapps.AllAppsSectionDecorator.SectionDecorationHandler;
+
 /**
  * Info class for a search section
  */
 public class SearchSectionInfo {
+
     private final int mTitleResId;
+    private SectionDecorationHandler mDecorationHandler;
+
+    public int getPosStart() {
+        return mPosStart;
+    }
+
+    public void setPosStart(int posStart) {
+        mPosStart = posStart;
+    }
+
+    public int getPosEnd() {
+        return mPosEnd;
+    }
+
+    public void setPosEnd(int posEnd) {
+        mPosEnd = posEnd;
+    }
+
+    private int mPosStart;
+    private int mPosEnd;
+
+    public SearchSectionInfo() {
+        this(-1);
+    }
 
     public SearchSectionInfo(int titleResId) {
         mTitleResId = titleResId;
     }
 
+    public void setDecorationHandler(SectionDecorationHandler sectionDecorationHandler) {
+        mDecorationHandler = sectionDecorationHandler;
+    }
+
+
+    public SectionDecorationHandler getDecorationHandler() {
+        return mDecorationHandler;
+    }
+
     /**
      * Returns the section's title
      */
     public String getTitle(Context context) {
+        if (mTitleResId == -1) {
+            return "";
+        }
         return context.getString(mTitleResId);
     }
 }
-- 
GitLab


From 60096e990aba5dd2daf88a31a78c185df19fe111 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Tue, 4 Aug 2020 11:19:21 -0700
Subject: [PATCH 0070/1664] Remove mFilteredApps

Currently, we are maintaining a list of appInfos to report the number of Accessibility recycler-view items. This could be done by maintaining an int.

Bug: 162480567
Test: Manual
Change-Id: I9de8e1d4ac6e1a674d1e19b591dedad0dd4cc536
---
 .../allapps/AlphabeticalAppsList.java         | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
index 5d9c5549f3..0fc04a740b 100644
--- a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
+++ b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
@@ -128,6 +128,10 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
             item.searchSectionInfo = sectionInfo;
             return item;
         }
+
+        boolean isCountedForAccessibility() {
+            return viewType == AllAppsGridAdapter.VIEW_TYPE_ICON;
+        }
     }
 
     private final BaseDraggingActivity mLauncher;
@@ -136,8 +140,8 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
     private final List<AppInfo> mApps = new ArrayList<>();
     private final AllAppsStore mAllAppsStore;
 
-    // The set of filtered apps with the current filter
-    private final List<AppInfo> mFilteredApps = new ArrayList<>();
+    // The number of results in current adapter
+    private int mAccessibilityResultsCount = 0;
     // The current set of adapter items
     private final ArrayList<AdapterItem> mAdapterItems = new ArrayList<>();
     // The set of sections that we allow fast-scrolling to (includes non-merged sections)
@@ -206,7 +210,7 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
      * Returns the number of applications in this list.
      */
     public int getNumFilteredApps() {
-        return mFilteredApps.size();
+        return mAccessibilityResultsCount;
     }
 
     /**
@@ -220,7 +224,7 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
      * Returns whether there are no filtered results.
      */
     public boolean hasNoFilteredResults() {
-        return (mSearchResults != null) && mFilteredApps.isEmpty();
+        return (mSearchResults != null) && mAccessibilityResultsCount == 0;
     }
 
     /**
@@ -306,7 +310,7 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
         int appIndex = 0;
 
         // Prepare to update the list of sections, filtered apps, etc.
-        mFilteredApps.clear();
+        mAccessibilityResultsCount = 0;
         mFastScrollerSections.clear();
         mAdapterItems.clear();
 
@@ -318,6 +322,7 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
         // ordered set of sections
 
         if (!hasFilter()) {
+            mAccessibilityResultsCount = mApps.size();
             appSection.setPosStart(position);
             for (AppInfo info : mApps) {
                 String sectionName = info.sectionName;
@@ -338,7 +343,6 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
                     appItem.searchSectionInfo = appSection;
                 }
                 mAdapterItems.add(appItem);
-                mFilteredApps.add(info);
             }
             appSection.setPosEnd(mApps.isEmpty() ? appSection.getPosStart() : position - 1);
         } else {
@@ -358,8 +362,10 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
                 if (AllAppsGridAdapter.isIconViewType(adapterItem.viewType)) {
                     appInfos.add(adapterItem.appInfo);
                 }
+                if (adapterItem.isCountedForAccessibility()) {
+                    mAccessibilityResultsCount++;
+                }
             }
-            mFilteredApps.addAll(appInfos);
             if (!FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
                 // Append the search market item
                 if (hasNoFilteredResults()) {
-- 
GitLab


From f8e9b467ae11de1d307f5d77c36ff8002e66255d Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Tue, 4 Aug 2020 21:57:14 +0000
Subject: [PATCH 0071/1664] Revert "Finish recents animation when launching
 another task in Overview"

This reverts commit e62eaa16b360433e35b4e4655e16c312a7bfd110.

Reason for revert: No longer necessary

Change-Id: I9ed533147ac5546b7da6c9e3a51f5a7e6c8ef8e6
---
 .../src/com/android/quickstep/views/TaskView.java    | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

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 a1775f4284..57327f8ab3 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
@@ -287,19 +287,11 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     public void launchTask(boolean animate, boolean freezeTaskList, Consumer<Boolean> resultCallback,
             Handler resultCallbackHandler) {
         if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
-            RecentsView recentsView = getRecentsView();
             if (isRunningTask()) {
-                recentsView.finishRecentsAnimation(false /* toRecents */,
+                getRecentsView().finishRecentsAnimation(false /* toRecents */,
                         () -> resultCallbackHandler.post(() -> resultCallback.accept(true)));
             } else {
-                // This is a workaround against the WM issue that app open is not correctly animated
-                // when recents animation is being cleaned up (b/143774568). When that's possible,
-                // we should rely on the framework side to cancel the recents animation, and we will
-                // clean up the screenshot on the launcher side while we launch the next task.
-                recentsView.switchToScreenshot(null,
-                        () -> recentsView.finishRecentsAnimation(true /* toRecents */,
-                                () -> launchTaskInternal(animate, freezeTaskList, resultCallback,
-                                        resultCallbackHandler)));
+                launchTaskInternal(animate, freezeTaskList, resultCallback, resultCallbackHandler);
             }
         } else {
             launchTaskInternal(animate, freezeTaskList, resultCallback, resultCallbackHandler);
-- 
GitLab


From 77ca1e4c40a98b048905e021d94eab154a637455 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 4 Aug 2020 17:28:46 -0700
Subject: [PATCH 0072/1664] Moving data sanitization to the end, as it need not
 block the loading

Change-Id: If1a966e546127efafd0afd7e3ca771f63a1fa544
---
 .../android/launcher3/model/LoaderTask.java   | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index b0679095f3..e89031e61d 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -128,6 +128,8 @@ public class LoaderTask implements Runnable {
 
     private boolean mStopped;
 
+    private boolean mItemsDeleted = false;
+
     public LoaderTask(LauncherAppState app, AllAppsList bgAllAppsList, BgDataModel dataModel,
             ModelDelegate modelDelegate, LoaderResults results) {
         mApp = app;
@@ -271,6 +273,7 @@ public class LoaderTask implements Runnable {
             if (FeatureFlags.FOLDER_NAME_SUGGEST.get()) {
                 loadFolderNames();
             }
+            sanitizeData();
 
             verifyNotStopped();
             updateHandler.finish();
@@ -791,14 +794,9 @@ public class LoaderTask implements Runnable {
                     mBgDataModel.itemsIdMap.remove(folderId);
                 }
 
-                // Remove any ghost widgets
-                LauncherSettings.Settings.call(contentResolver,
-                        LauncherSettings.Settings.METHOD_REMOVE_GHOST_WIDGETS);
+                mItemsDeleted = true;
             }
 
-            // Update pinned state of model shortcuts
-            mBgDataModel.updateShortcutPinnedState(context);
-
             // Sort the folder items, update ranks, and make sure all preview items are high res.
             FolderGridOrganizer verifier =
                     new FolderGridOrganizer(mApp.getInvariantDeviceProfile());
@@ -872,6 +870,18 @@ public class LoaderTask implements Runnable {
         }
     }
 
+    private void sanitizeData() {
+        Context context = mApp.getContext();
+        if (mItemsDeleted) {
+            // Remove any ghost widgets
+            LauncherSettings.Settings.call(context.getContentResolver(),
+                    LauncherSettings.Settings.METHOD_REMOVE_GHOST_WIDGETS);
+        }
+
+        // Update pinned state of model shortcuts
+        mBgDataModel.updateShortcutPinnedState(context);
+    }
+
     private List<LauncherActivityInfo> loadAllApps() {
         final List<UserHandle> profiles = mUserCache.getUserProfiles();
         List<LauncherActivityInfo> allActivityList = new ArrayList<>();
-- 
GitLab


From dd15acea87875d6d7a0d388e7ddfb283c8fd2a71 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 4 Aug 2020 15:52:01 -0700
Subject: [PATCH 0073/1664] Close system dialogs when opening all apps from
 system action

Bug: 161685099
Change-Id: I67313340102816828a95e8f9e7d8fa19b4ca3c55
---
 .../android/launcher3/uioverrides/QuickstepLauncher.java | 9 +++++++++
 src/com/android/launcher3/Launcher.java                  | 7 ++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index f87138e536..8f4aea7541 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -27,6 +27,7 @@ import static com.android.launcher3.testing.TestProtocol.OVERVIEW_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.QUICK_SWITCH_STATE_ORDINAL;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
+import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY;
 
 import android.content.Intent;
 import android.content.res.Configuration;
@@ -75,6 +76,7 @@ import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
 
+import com.android.systemui.shared.system.ActivityManagerWrapper;
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -148,6 +150,13 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
         }
     }
 
+    @Override
+    protected void showAllAppsFromIntent(boolean alreadyOnHome) {
+        ActivityManagerWrapper.getInstance().closeSystemWindows(
+            CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY);
+        super.showAllAppsFromIntent(alreadyOnHome);
+    }
+
     @Override
     public void folderCreatedFromItem(Folder folder, WorkspaceItemInfo itemInfo) {
         super.folderCreatedFromItem(folder, itemInfo);
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 2bf47fbec6..377c5803a9 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1451,12 +1451,17 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
             }
             mOverlayManager.hideOverlay(isStarted() && !isForceInvisible());
         } else if (Intent.ACTION_ALL_APPS.equals(intent.getAction())) {
-            getStateManager().goToState(ALL_APPS, alreadyOnHome);
+            showAllAppsFromIntent(alreadyOnHome);
         }
 
         TraceHelper.INSTANCE.endSection(traceToken);
     }
 
+    protected void showAllAppsFromIntent(boolean alreadyOnHome) {
+        AbstractFloatingView.closeAllOpenViews(this);
+        getStateManager().goToState(ALL_APPS, alreadyOnHome);
+    }
+
     /**
      * Hides the keyboard if visible
      */
-- 
GitLab


From 17d0080cc32ed36df154f52f6cf2b5082e7e3c31 Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Tue, 4 Aug 2020 19:51:26 -0700
Subject: [PATCH 0074/1664] Adjusts Clear all to be vertically centered with
 the tasks.

I made a sample task where the content of the app was
centered, and I added lines to demonstrate the center
while in Overview. As you can see, the center of the
app content is slightly different from the TaskView
in Recents - it seems part of the bottom of the app
gets removed when transitioning to Recents (for the
rounded corner radius or nav bar?). On Pixel 4, I
had to add 46dp of padding to the bottom line for it
to appear at the bottom of the screenshot in Recents.

Screenshot: https://drive.google.com/file/d/1xzQNXWb0T0UGDhDS9Ov-AduM3nd-pfg8/view?usp=sharing
Before: https://drive.google.com/file/d/1ghN9VWP44XjcZkdmI106dy4_jB4Vs4J3/view?usp=sharing

Rotating between landscape and portrait:
https://drive.google.com/file/d/1OD5aKT9LCE5w950-6AaHfWXU4sLyW3Qe/view?usp=sharing

Fixes: 154964045
Change-Id: I594057e3b5df58c5a907b6ca14daa700d5011b7b
---
 .../src/com/android/quickstep/views/ClearAllButton.java     | 6 +++++-
 quickstep/res/layout/overview_clear_all_button.xml          | 3 +--
 .../android/launcher3/touch/LandscapePagedViewHandler.java  | 5 +++--
 .../android/launcher3/touch/PagedOrientationHandler.java    | 3 ++-
 .../android/launcher3/touch/PortraitPagedViewHandler.java   | 5 +++--
 .../android/launcher3/touch/SeascapePagedViewHandler.java   | 6 ------
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/ClearAllButton.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/ClearAllButton.java
index fd74357f37..0837300a22 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/ClearAllButton.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/ClearAllButton.java
@@ -45,12 +45,15 @@ public class ClearAllButton extends Button implements PageCallbacks {
     private float mVisibilityAlpha = 1;
 
     private boolean mIsRtl;
+    private final float mOriginalTranslationX, mOriginalTranslationY;
 
     private int mScrollOffset;
 
     public ClearAllButton(Context context, AttributeSet attrs) {
         super(context, attrs);
         mIsRtl = getLayoutDirection() == LAYOUT_DIRECTION_RTL;
+        mOriginalTranslationX = getTranslationX();
+        mOriginalTranslationY = getTranslationY();
     }
 
     @Override
@@ -99,7 +102,8 @@ public class ClearAllButton extends Button implements PageCallbacks {
 
         float shift = Math.min(scrollState.scrollFromEdge, orientationSize);
         float translation = mIsRtl ? (mScrollOffset - shift) : (mScrollOffset + shift);
-        orientationHandler.setPrimaryAndResetSecondaryTranslate(this, translation);
+        orientationHandler.setPrimaryAndResetSecondaryTranslate(
+                this, translation, mOriginalTranslationX, mOriginalTranslationY);
         mScrollAlpha = 1 - shift / orientationSize;
         updateAlpha();
     }
diff --git a/quickstep/res/layout/overview_clear_all_button.xml b/quickstep/res/layout/overview_clear_all_button.xml
index fc06ba057f..34ff91df9a 100644
--- a/quickstep/res/layout/overview_clear_all_button.xml
+++ b/quickstep/res/layout/overview_clear_all_button.xml
@@ -23,5 +23,4 @@
     android:text="@string/recents_clear_all"
     android:textColor="?attr/workspaceTextColor"
     android:textSize="14sp"
-    android:translationY="@dimen/task_thumbnail_half_top_margin"
-    />
\ No newline at end of file
+    android:translationY="@dimen/task_thumbnail_half_top_margin" />
\ No newline at end of file
diff --git a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
index 1aaa608657..d4ea3b9171 100644
--- a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
+++ b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
@@ -148,8 +148,9 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
     }
 
     @Override
-    public void setPrimaryAndResetSecondaryTranslate(View view, float translation) {
-        view.setTranslationX(0);
+    public void setPrimaryAndResetSecondaryTranslate(
+            View view, float translation, float defaultTranslationX, float defaultTranslationY) {
+        view.setTranslationX(defaultTranslationX);
         view.setTranslationY(translation);
     }
 
diff --git a/src/com/android/launcher3/touch/PagedOrientationHandler.java b/src/com/android/launcher3/touch/PagedOrientationHandler.java
index f88cdb3b0d..9c843453ce 100644
--- a/src/com/android/launcher3/touch/PagedOrientationHandler.java
+++ b/src/com/android/launcher3/touch/PagedOrientationHandler.java
@@ -65,7 +65,8 @@ public interface PagedOrientationHandler {
     int getSecondaryDimension(View view);
     FloatProperty<View> getPrimaryViewTranslate();
     FloatProperty<View> getSecondaryViewTranslate();
-    void setPrimaryAndResetSecondaryTranslate(View view, float translation);
+    void setPrimaryAndResetSecondaryTranslate(
+            View view, float translation, float defaultTranslationX, float defaultTranslationY);
     int getPrimaryScroll(View view);
     float getPrimaryScale(View view);
     int getChildStart(View view);
diff --git a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
index f18b109515..fd881e7732 100644
--- a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
+++ b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
@@ -145,9 +145,10 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
     }
 
     @Override
-    public void setPrimaryAndResetSecondaryTranslate(View view, float translation) {
+    public void setPrimaryAndResetSecondaryTranslate(
+            View view, float translation, float defaultTranslationX, float defaultTranslationY) {
         view.setTranslationX(translation);
-        view.setTranslationY(0);
+        view.setTranslationY(defaultTranslationY);
     }
 
     @Override
diff --git a/src/com/android/launcher3/touch/SeascapePagedViewHandler.java b/src/com/android/launcher3/touch/SeascapePagedViewHandler.java
index e91f16d71a..c00fe298aa 100644
--- a/src/com/android/launcher3/touch/SeascapePagedViewHandler.java
+++ b/src/com/android/launcher3/touch/SeascapePagedViewHandler.java
@@ -74,12 +74,6 @@ public class SeascapePagedViewHandler extends LandscapePagedViewHandler {
         return y + thumbnailView.getMeasuredHeight();
     }
 
-    @Override
-    public void setPrimaryAndResetSecondaryTranslate(View view, float translation) {
-        view.setTranslationX(0);
-        view.setTranslationY(translation);
-    }
-
     @Override
     public int getDistanceToBottomOfRect(DeviceProfile dp, Rect rect) {
         return dp.widthPx - rect.right;
-- 
GitLab


From 4a53c70c5734f65d210c1b425549224acbe7c642 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Tue, 4 Aug 2020 14:06:55 -0700
Subject: [PATCH 0075/1664] Introduce support for Hero app Section

[Video attached to bug report]

Bug: 162871508
Test: Manual
Change-Id: Ia6f5621d6220f55e6fd5e56530853c267838442c
---
 res/layout/search_result_hero_app.xml         |  74 ++++++++
 res/values/attrs.xml                          |   1 +
 res/values/colors.xml                         |   2 -
 src/com/android/launcher3/BubbleTextView.java |   3 +
 .../launcher3/allapps/AllAppsGridAdapter.java |  16 +-
 .../allapps/AlphabeticalAppsList.java         |  26 ++-
 .../allapps/search/AppsSearchPipeline.java    |  86 +++++++---
 .../search/DefaultAppSearchAlgorithm.java     |   2 +-
 .../launcher3/views/HeroSearchResultView.java | 158 ++++++++++++++++++
 9 files changed, 342 insertions(+), 26 deletions(-)
 create mode 100644 res/layout/search_result_hero_app.xml
 create mode 100644 src/com/android/launcher3/views/HeroSearchResultView.java

diff --git a/res/layout/search_result_hero_app.xml b/res/layout/search_result_hero_app.xml
new file mode 100644
index 0000000000..bd0e42b6a9
--- /dev/null
+++ b/res/layout/search_result_hero_app.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.launcher3.views.HeroSearchResultView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
+    android:padding="@dimen/dynamic_grid_edge_margin">
+
+    <FrameLayout
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_vertical"
+        android:layout_weight="1">
+        <com.android.launcher3.BubbleTextView
+            android:id="@+id/bubble_text"
+            style="@style/BaseIcon"
+            android:drawablePadding="@dimen/dynamic_grid_icon_drawable_padding"
+            android:gravity="start|center_vertical"
+            android:textAlignment="viewStart"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="16sp"
+            android:layout_height="wrap_content"
+            launcher:iconDisplay="hero_app"
+            launcher:layoutHorizontal="true"/>
+
+        <View
+            android:id="@+id/icon"
+            android:layout_width="@dimen/deep_shortcut_icon_size"
+            android:layout_height="@dimen/deep_shortcut_icon_size"
+            android:layout_gravity="start|center_vertical"
+            android:background="@drawable/ic_deepshortcut_placeholder"/>
+    </FrameLayout>
+
+    <com.android.launcher3.BubbleTextView
+        android:id="@+id/shortcut_0"
+        style="@style/BaseIcon"
+        android:layout_width="@dimen/deep_shortcut_icon_size"
+        android:layout_height="match_parent"
+        android:gravity="start|center_vertical"
+        android:textAlignment="center"
+        launcher:iconDisplay="shortcut_popup"
+        android:textSize="12sp"
+        launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size"
+        launcher:layoutHorizontal="false"/>
+
+    <com.android.launcher3.BubbleTextView
+        android:id="@+id/shortcut_1"
+        style="@style/BaseIcon"
+        android:layout_width="@dimen/deep_shortcut_icon_size"
+        android:layout_height="match_parent"
+        android:gravity="start|center_vertical"
+        android:textAlignment="center"
+        launcher:iconDisplay="shortcut_popup"
+        android:textSize="12sp"
+        launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size"
+        launcher:layoutHorizontal="false"/>
+
+</com.android.launcher3.views.HeroSearchResultView>
\ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 26e6cbad0c..acb8221d7c 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -57,6 +57,7 @@
             <enum name="folder" value="2" />
             <enum name="widget_section" value="3" />
             <enum name="shortcut_popup" value="4" />
+            <enum name="hero_app" value="5" />
         </attr>
         <attr name="centerVertically" format="boolean" />
     </declare-styleable>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index ad607a3cb6..9a89dee956 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -35,8 +35,6 @@
 
     <color name="icon_background">#E0E0E0</color> <!-- Gray 300 -->
 
-    <color name="all_apps_bg_hand_fill">#E5E5E5</color>
-    <color name="all_apps_bg_hand_fill_dark">#9AA0A6</color>
     <color name="all_apps_section_fill">#327d7d7d</color>
 
     <color name="gesture_tutorial_ripple_color">#A0C2F9</color> <!-- Light Blue -->
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 198f13d02a..55d5de758a 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -77,6 +77,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
     private static final int DISPLAY_WORKSPACE = 0;
     private static final int DISPLAY_ALL_APPS = 1;
     private static final int DISPLAY_FOLDER = 2;
+    private static final int DISPLAY_HERO_APP = 5;
 
     private static final int[] STATE_PRESSED = new int[] {android.R.attr.state_pressed};
 
@@ -178,6 +179,8 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
             setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.folderChildTextSizePx);
             setCompoundDrawablePadding(grid.folderChildDrawablePaddingPx);
             defaultIconSize = grid.folderChildIconSizePx;
+        } else if (mDisplay == DISPLAY_HERO_APP) {
+            defaultIconSize = grid.allAppsIconSizePx;
         } else {
             // widget_selection or shortcut_popup
             defaultIconSize = grid.iconSizePx;
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index dec92df2d3..2cec797fd0 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -43,6 +43,7 @@ import com.android.launcher3.R;
 import com.android.launcher3.allapps.AlphabeticalAppsList.AdapterItem;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.util.PackageManagerHelper;
+import com.android.launcher3.views.HeroSearchResultView;
 
 import java.util.List;
 
@@ -66,7 +67,9 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter.
     // A divider that separates the apps list and the search market button
     public static final int VIEW_TYPE_ALL_APPS_DIVIDER = 1 << 4;
 
-    public static final int VIEW_TYPE_SEARCH_CORPUS_TITLE =  1 << 5;
+    public static final int VIEW_TYPE_SEARCH_CORPUS_TITLE = 1 << 5;
+
+    public static final int VIEW_TYPE_SEARCH_HERO_APP = 1 << 6;
 
     // Common view type masks
     public static final int VIEW_TYPE_MASK_DIVIDER = VIEW_TYPE_ALL_APPS_DIVIDER;
@@ -279,6 +282,10 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter.
             case VIEW_TYPE_SEARCH_CORPUS_TITLE:
                 return new ViewHolder(
                         mLayoutInflater.inflate(R.layout.search_section_title, parent, false));
+
+            case VIEW_TYPE_SEARCH_HERO_APP:
+                return new ViewHolder(mLayoutInflater.inflate(
+                        R.layout.search_result_hero_app, parent, false));
             default:
                 throw new RuntimeException("Unexpected view type");
         }
@@ -311,6 +318,13 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter.
                 TextView titleView = (TextView) holder.itemView;
                 titleView.setText(mApps.getAdapterItems().get(position).searchSectionInfo.getTitle(
                         titleView.getContext()));
+                break;
+            case VIEW_TYPE_SEARCH_HERO_APP:
+                HeroSearchResultView heroView = (HeroSearchResultView) holder.itemView;
+                heroView.prepareUsingAdapterItem(
+                        (AlphabeticalAppsList.HeroAppAdapterItem) mApps.getAdapterItems().get(
+                                position));
+                break;
             case VIEW_TYPE_ALL_APPS_DIVIDER:
                 // nothing to do
                 break;
diff --git a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
index 0fc04a740b..9076f2a650 100644
--- a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
+++ b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
@@ -22,6 +22,7 @@ import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.allapps.search.SearchSectionInfo;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.data.AppInfo;
+import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.util.ItemInfoMatcher;
 import com.android.launcher3.util.LabelComparator;
 
@@ -130,10 +131,33 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
         }
 
         boolean isCountedForAccessibility() {
-            return viewType == AllAppsGridAdapter.VIEW_TYPE_ICON;
+            return viewType == AllAppsGridAdapter.VIEW_TYPE_ICON
+                    || viewType == AllAppsGridAdapter.VIEW_TYPE_SEARCH_HERO_APP;
         }
     }
 
+    /**
+     * Extension of AdapterItem that contains shortcut workspace items
+     */
+    public static class HeroAppAdapterItem extends AdapterItem {
+        private ArrayList<WorkspaceItemInfo> mShortcutInfos;
+
+        public HeroAppAdapterItem(AppInfo info, ArrayList<WorkspaceItemInfo> shortcutInfos) {
+            viewType = AllAppsGridAdapter.VIEW_TYPE_SEARCH_HERO_APP;
+            mShortcutInfos = shortcutInfos;
+            appInfo = info;
+        }
+
+        /**
+         * Returns list of shortcuts for appInfo
+         */
+        public ArrayList<WorkspaceItemInfo> getShortcutInfos() {
+            return mShortcutInfos;
+        }
+
+    }
+
+
     private final BaseDraggingActivity mLauncher;
 
     // The set of apps from the system
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java b/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
index fb786513ac..e67e8972e7 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
@@ -15,16 +15,25 @@
  */
 package com.android.launcher3.allapps.search;
 
+import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_SHORTCUTS;
+
+import android.content.Context;
+import android.content.pm.ShortcutInfo;
+
 import androidx.annotation.WorkerThread;
 
 import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsSectionDecorator.SectionDecorationHandler;
 import com.android.launcher3.allapps.AlphabeticalAppsList.AdapterItem;
+import com.android.launcher3.allapps.AlphabeticalAppsList.HeroAppAdapterItem;
+import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.model.AllAppsList;
 import com.android.launcher3.model.BaseModelUpdateTask;
 import com.android.launcher3.model.BgDataModel;
 import com.android.launcher3.model.data.AppInfo;
+import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.launcher3.popup.PopupPopulator;
+import com.android.launcher3.shortcuts.ShortcutRequest;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -36,22 +45,23 @@ import java.util.function.Consumer;
 public class AppsSearchPipeline implements SearchPipeline {
 
     private static final int MAX_RESULTS_COUNT = 5;
+    private static final int MAX_HERO_SECTION_COUNT = 2;
+    private static final int MAX_SHORTCUTS_COUNT = 2;
 
-    private static final int SECTION_TYPE_HEADER = 0;
-    private static final int SECTION_TYPE_APPS = 1;
-
-    private final SearchSectionInfo[] mSearchSectionInfos;
+    private final SearchSectionInfo mSearchSectionInfo;
     private final LauncherAppState mLauncherAppState;
-
+    private final boolean mHeroSectionSupported;
 
     public AppsSearchPipeline(LauncherAppState launcherAppState) {
+        this(launcherAppState, true);
+    }
+
+    public AppsSearchPipeline(LauncherAppState launcherAppState, boolean supportsHeroView) {
         mLauncherAppState = launcherAppState;
-        mSearchSectionInfos = new SearchSectionInfo[]{
-                new SearchSectionInfo(R.string.search_corpus_apps),
-                new SearchSectionInfo()
-        };
-        mSearchSectionInfos[SECTION_TYPE_APPS].setDecorationHandler(
+        mSearchSectionInfo = new SearchSectionInfo();
+        mSearchSectionInfo.setDecorationHandler(
                 new SectionDecorationHandler(launcherAppState.getContext(), true));
+        mHeroSectionSupported = supportsHeroView;
     }
 
     @Override
@@ -60,11 +70,38 @@ public class AppsSearchPipeline implements SearchPipeline {
         mLauncherAppState.getModel().enqueueModelUpdateTask(new BaseModelUpdateTask() {
             @Override
             public void execute(LauncherAppState app, BgDataModel dataModel, AllAppsList apps) {
-                callback.accept(getAdapterItems(getTitleMatchResult(apps.data, query)));
+                List<AppInfo> matchingResults = getTitleMatchResult(apps.data, query);
+                if (mHeroSectionSupported && matchingResults.size() <= MAX_HERO_SECTION_COUNT) {
+                    callback.accept(getHeroAdapterItems(app.getContext(), matchingResults));
+                } else {
+                    callback.accept(getAdapterItems(matchingResults));
+                }
             }
         });
     }
 
+    /**
+     * Returns MAX_SHORTCUTS_COUNT shortcuts from local cache
+     * TODO: Shortcuts should be ranked based on relevancy 
+     */
+    private ArrayList<WorkspaceItemInfo> getShortcutInfos(Context context, AppInfo appInfo) {
+        List<ShortcutInfo> shortcuts = new ShortcutRequest(context, appInfo.user)
+                .withContainer(appInfo.getTargetComponent())
+                .query(ShortcutRequest.PUBLISHED);
+        shortcuts = PopupPopulator.sortAndFilterShortcuts(shortcuts, null);
+        IconCache cache = LauncherAppState.getInstance(context).getIconCache();
+        ArrayList<WorkspaceItemInfo> shortcutItems = new ArrayList<>();
+        for (int i = 0; i < shortcuts.size() && i < MAX_SHORTCUTS_COUNT; i++) {
+            final ShortcutInfo shortcut = shortcuts.get(i);
+            final WorkspaceItemInfo si = new WorkspaceItemInfo(shortcut, context);
+            cache.getUnbadgedShortcutIcon(si, shortcut);
+            si.rank = i;
+            si.container = CONTAINER_SHORTCUTS;
+            shortcutItems.add(si);
+        }
+        return shortcutItems;
+    }
+
     /**
      * Filters {@link AppInfo}s matching specified query
      */
@@ -83,17 +120,24 @@ public class AppsSearchPipeline implements SearchPipeline {
         return result;
     }
 
+    private ArrayList<AdapterItem> getHeroAdapterItems(Context context, List<AppInfo> apps) {
+        ArrayList<AdapterItem> adapterItems = new ArrayList<>();
+        for (int i = 0; i < apps.size(); i++) {
+            //hero app
+            AppInfo appInfo = apps.get(i);
+            ArrayList<WorkspaceItemInfo> shortcuts = getShortcutInfos(context, appInfo);
+            AdapterItem adapterItem = new HeroAppAdapterItem(appInfo, shortcuts);
+            adapterItem.searchSectionInfo = mSearchSectionInfo;
+            adapterItems.add(adapterItem);
+        }
+        return adapterItems;
+    }
+
     private ArrayList<AdapterItem> getAdapterItems(List<AppInfo> matchingApps) {
         ArrayList<AdapterItem> items = new ArrayList<>();
-        if (matchingApps.isEmpty()) {
-            return items;
-        }
-        items.add(AdapterItem.asSearchTitle(mSearchSectionInfos[SECTION_TYPE_HEADER], 0));
-        int existingItems = items.size();
-        int searchResultsCount = Math.min(matchingApps.size(), MAX_RESULTS_COUNT);
-        for (int i = 0; i < searchResultsCount; i++) {
-            AdapterItem appItem = AdapterItem.asApp(i + existingItems, "", matchingApps.get(i), i);
-            appItem.searchSectionInfo = mSearchSectionInfos[SECTION_TYPE_APPS];
+        for (int i = 0; i < matchingApps.size() && i < MAX_RESULTS_COUNT; i++) {
+            AdapterItem appItem = AdapterItem.asApp(i, "", matchingApps.get(i), i);
+            appItem.searchSectionInfo = mSearchSectionInfo;
             items.add(appItem);
         }
 
diff --git a/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java b/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java
index db10311675..470191c3fc 100644
--- a/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java
+++ b/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java
@@ -32,7 +32,7 @@ public class DefaultAppSearchAlgorithm implements SearchAlgorithm {
 
     public DefaultAppSearchAlgorithm(LauncherAppState launcherAppState) {
         mResultHandler = new Handler();
-        mAppsSearchPipeline = new AppsSearchPipeline(launcherAppState);
+        mAppsSearchPipeline = new AppsSearchPipeline(launcherAppState, false);
     }
 
     @Override
diff --git a/src/com/android/launcher3/views/HeroSearchResultView.java b/src/com/android/launcher3/views/HeroSearchResultView.java
new file mode 100644
index 0000000000..c2a02bcdab
--- /dev/null
+++ b/src/com/android/launcher3/views/HeroSearchResultView.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.views;
+
+import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS;
+
+import android.content.Context;
+import android.graphics.Point;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+
+import com.android.launcher3.BubbleTextView;
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.DragSource;
+import com.android.launcher3.DropTarget;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+import com.android.launcher3.allapps.AlphabeticalAppsList;
+import com.android.launcher3.dragndrop.DragOptions;
+import com.android.launcher3.dragndrop.DraggableView;
+import com.android.launcher3.graphics.DragPreviewProvider;
+import com.android.launcher3.model.data.AppInfo;
+import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.launcher3.shortcuts.ShortcutDragPreviewProvider;
+import com.android.launcher3.touch.ItemLongClickListener;
+import com.android.launcher3.userevent.nano.LauncherLogProto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A view representing a high confidence app search result that includes shortcuts
+ */
+public class HeroSearchResultView extends LinearLayout implements DragSource {
+
+    BubbleTextView mBubbleTextView;
+    View mIconView;
+    BubbleTextView[] mDeepShortcutTextViews = new BubbleTextView[2];
+
+    public HeroSearchResultView(Context context) {
+        super(context);
+    }
+
+    public HeroSearchResultView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public HeroSearchResultView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        Launcher launcher = Launcher.getLauncher(getContext());
+        DeviceProfile grid = launcher.getDeviceProfile();
+        mIconView = findViewById(R.id.icon);
+        ViewGroup.LayoutParams iconParams = mIconView.getLayoutParams();
+        iconParams.height = grid.allAppsIconSizePx;
+        iconParams.width = grid.allAppsIconSizePx;
+
+
+        mBubbleTextView = findViewById(R.id.bubble_text);
+        mBubbleTextView.setOnClickListener(launcher.getItemOnClickListener());
+        mBubbleTextView.setOnLongClickListener(new HeroItemDragHandler(getContext(), this));
+        setLayoutParams(
+                new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, grid.allAppsCellHeightPx));
+
+
+        mDeepShortcutTextViews[0] = findViewById(R.id.shortcut_0);
+        mDeepShortcutTextViews[1] = findViewById(R.id.shortcut_1);
+        for (BubbleTextView bubbleTextView : mDeepShortcutTextViews) {
+            bubbleTextView.setLayoutParams(
+                    new LinearLayout.LayoutParams(grid.allAppsIconSizePx,
+                            grid.allAppsIconSizePx));
+            bubbleTextView.setOnClickListener(launcher.getItemOnClickListener());
+        }
+    }
+
+    /**
+     * Apply {@link ItemInfo} for appIcon and shortcut Icons
+     */
+    public void prepareUsingAdapterItem(AlphabeticalAppsList.HeroAppAdapterItem adapterItem) {
+        mBubbleTextView.applyFromApplicationInfo(adapterItem.appInfo);
+        mIconView.setBackground(mBubbleTextView.getIcon());
+        mIconView.setTag(adapterItem.appInfo);
+        List<WorkspaceItemInfo> shorcutInfos = adapterItem.getShortcutInfos();
+        for (int i = 0; i < mDeepShortcutTextViews.length; i++) {
+            mDeepShortcutTextViews[i].setVisibility(shorcutInfos.size() > i ? VISIBLE : GONE);
+            if (i < shorcutInfos.size()) {
+                mDeepShortcutTextViews[i].applyFromWorkspaceItem(shorcutInfos.get(i));
+            }
+        }
+
+    }
+
+    @Override
+    public void onDropCompleted(View target, DropTarget.DragObject d, boolean success) {
+        mBubbleTextView.setVisibility(VISIBLE);
+        mBubbleTextView.setIconVisible(true);
+    }
+
+    @Override
+    public void fillInLogContainerData(ItemInfo childInfo, LauncherLogProto.Target child,
+            ArrayList<LauncherLogProto.Target> parents) {
+
+    }
+
+    private void setWillDrawIcon(boolean willDraw) {
+        mIconView.setVisibility(willDraw ? View.VISIBLE : View.INVISIBLE);
+    }
+
+
+    /**
+     * Drag and drop handler for popup items in Launcher activity
+     */
+    public static class HeroItemDragHandler implements OnLongClickListener {
+        private final Launcher mLauncher;
+        private final HeroSearchResultView mContainer;
+
+        HeroItemDragHandler(Context context, HeroSearchResultView container) {
+            mLauncher = Launcher.getLauncher(context);
+            mContainer = container;
+        }
+
+        @Override
+        public boolean onLongClick(View v) {
+            if (!ItemLongClickListener.canStartDrag(mLauncher)) return false;
+            mContainer.setWillDrawIcon(false);
+
+            DraggableView draggableView = DraggableView.ofType(DraggableView.DRAGGABLE_ICON);
+            WorkspaceItemInfo itemInfo = new WorkspaceItemInfo((AppInfo) v.getTag());
+            itemInfo.container = CONTAINER_ALL_APPS;
+            DragPreviewProvider previewProvider = new ShortcutDragPreviewProvider(
+                    mContainer.mIconView, new Point());
+            mLauncher.getWorkspace().beginDragShared(mContainer.mBubbleTextView,
+                    draggableView, mContainer, itemInfo, previewProvider, new DragOptions());
+
+            return false;
+        }
+    }
+}
-- 
GitLab


From 2104d72b281ef4ee9f15aef333bd65a03f8f7eb4 Mon Sep 17 00:00:00 2001
From: Adam Bookatz <bookatz@google.com>
Date: Wed, 29 Jul 2020 15:46:16 -0700
Subject: [PATCH 0076/1664] LauncherInstrumentation enables even when
 non-system user

Attempting to run a tapl test while the device is in a secondary user
currently fails because the test app doesn't get enabled for
this secondary user. We fix that (at least one issue with it) in this cl.

Test: make PlatformScenarioTests; adb root && adb install -r -g ${ANDROID_PRODUCT_OUT}/testcases/PlatformScenarioTests/$(get_build_var TARGET_ARCH)/PlatformScenarioTests.apk
adb shell am instrument -w -r -e class android.platform.test.scenario.chrome.OpenApp android.platform.test.scenario/androidx.test.runner.AndroidJUnitRunner
(Do this while the current user is SYSTEM as well as Guest)

Bug: 162454040
Change-Id: If6d8e545b41eb20e3fed2935c39069ce97d8b6cd
---
 .../android/launcher3/tapl/LauncherInstrumentation.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index a77c1c6b70..92ab9b8a16 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -64,6 +64,7 @@ import androidx.test.uiautomator.Until;
 
 import com.android.launcher3.ResourceUtils;
 import com.android.launcher3.testing.TestProtocol;
+import com.android.systemui.shared.system.ContextUtils;
 import com.android.systemui.shared.system.QuickStepContract;
 
 import org.junit.Assert;
@@ -238,11 +239,12 @@ public final class LauncherInstrumentation {
 
         if (pm.getComponentEnabledSetting(cn) != COMPONENT_ENABLED_STATE_ENABLED) {
             if (TestHelpers.isInLauncherProcess()) {
-                getContext().getPackageManager().setComponentEnabledSetting(
-                        cn, COMPONENT_ENABLED_STATE_ENABLED, DONT_KILL_APP);
+                pm.setComponentEnabledSetting(cn, COMPONENT_ENABLED_STATE_ENABLED, DONT_KILL_APP);
             } else {
                 try {
-                    mDevice.executeShellCommand("pm enable " + cn.flattenToString());
+                    final int userId = ContextUtils.getUserId(getContext());
+                    mDevice.executeShellCommand(
+                            "pm enable --user " + userId + " " + cn.flattenToString());
                 } catch (IOException e) {
                     fail(e.toString());
                 }
-- 
GitLab


From 66aead7d2cf426f64d06b573470d0658c858b1b3 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 7 Aug 2020 16:56:50 -0700
Subject: [PATCH 0077/1664] Removing some obsolete methods and wrapper

Change-Id: I9d3c8d851ad596ba0d5165ab3c0f6661575166fc
---
 .../quickstep/TouchInteractionService.java    | 45 +++----------------
 1 file changed, 5 insertions(+), 40 deletions(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
index 1012ab2246..2baba783fb 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
@@ -101,24 +101,6 @@ import java.io.FileDescriptor;
 import java.io.PrintWriter;
 import java.util.Arrays;
 import java.util.LinkedList;
-import java.util.List;
-
-/**
- * Wrapper around a list for processing arguments.
- */
-class ArgList extends LinkedList<String> {
-    public ArgList(List<String> l) {
-        super(l);
-    }
-
-    public String peekArg() {
-        return peekFirst();
-    }
-
-    public String nextArg() {
-        return pollFirst().toLowerCase();
-    }
-}
 
 /**
  * Service connected by system-UI for handling touch interaction.
@@ -238,23 +220,6 @@ public class TouchInteractionService extends Service implements PluginListener<O
             WindowBounds wb = new WindowBounds(bounds, insets);
             MAIN_EXECUTOR.execute(() -> SplitScreenBounds.INSTANCE.setSecondaryWindowBounds(wb));
         }
-
-        /** Deprecated methods **/
-        public void onQuickStep(MotionEvent motionEvent) { }
-
-        public void onQuickScrubEnd() { }
-
-        public void onQuickScrubProgress(float progress) { }
-
-        public void onQuickScrubStart() { }
-
-        public void onPreMotionEvent(int downHitTarget) { }
-
-        public void onMotionEvent(MotionEvent ev) {
-            ev.recycle();
-        }
-
-        public void onBind(ISystemUiProxy iSystemUiProxy) { }
     };
 
     private static boolean sConnected = false;
@@ -837,10 +802,10 @@ public class TouchInteractionService extends Service implements PluginListener<O
     @Override
     protected void dump(FileDescriptor fd, PrintWriter pw, String[] rawArgs) {
         if (rawArgs.length > 0 && Utilities.IS_DEBUG_DEVICE) {
-            ArgList args = new ArgList(Arrays.asList(rawArgs));
-            switch (args.nextArg()) {
+            LinkedList<String> args = new LinkedList(Arrays.asList(rawArgs));
+            switch (args.pollFirst()) {
                 case "cmd":
-                    if (args.peekArg() == null) {
+                    if (args.peekFirst() == null) {
                         printAvailableCommands(pw);
                     } else {
                         onCommand(pw, args);
@@ -881,8 +846,8 @@ public class TouchInteractionService extends Service implements PluginListener<O
         pw.println("  clear-touch-log: Clears the touch interaction log");
     }
 
-    private void onCommand(PrintWriter pw, ArgList args) {
-        switch (args.nextArg()) {
+    private void onCommand(PrintWriter pw, LinkedList<String> args) {
+        switch (args.pollFirst()) {
             case "clear-touch-log":
                 ActiveGestureLog.INSTANCE.clear();
                 break;
-- 
GitLab


From f3bc79718201cf17479a46e9860ea518a900d68f Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 17 Jul 2020 13:06:57 -0700
Subject: [PATCH 0078/1664] Update overview from home transitions

For both NoButtonNavbarToOverviewTouchController and
NavBarToHomeTouchController:
- Have consistent resistance applied such that RecentsView scales
  down and translates up slightly (but not as much as from an app)
- Have consistent animation to home if you fling to that state
  rather than stay in overview. This is handled by a new class,
  OverviewToHomeAnim, which consolidates logic from NBTHTC and
  overrides some interpolators such that RecentsView doesn't fade
  out or translate downwards during the animation (it just slides
  off the screen while the home animation plays).

Also make overview actions not clickable when alpha == 0, so that
you can tap the hotseat/qsb during the transition from home to
overview.

Bug: 144170434
Change-Id: Ic291f285ff2f63c477633c48d4fadb23cf70c28a
---
 .../RecentsViewStateController.java           |  11 +-
 .../QuickstepAtomicAnimationFactory.java      |  15 +-
 .../NavBarToHomeTouchController.java          |  25 +++-
 ...ButtonNavbarToOverviewTouchController.java |  73 ++++------
 .../quickstep/util/OverviewToHomeAnim.java    | 130 ++++++++++++++++++
 .../quickstep/views/OverviewActionsView.java  |   9 +-
 .../AnimatorControllerWithResistance.java     |  84 +++++++++--
 .../launcher3/statemanager/StateManager.java  |  18 +++
 .../states/StateAnimationConfig.java          |   4 +-
 9 files changed, 289 insertions(+), 80 deletions(-)
 create mode 100644 quickstep/recents_ui_overrides/src/com/android/quickstep/util/OverviewToHomeAnim.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsViewStateController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
index 085b9b3af9..5ccc1e8681 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
@@ -17,6 +17,7 @@ package com.android.launcher3.uioverrides;
 
 import static com.android.launcher3.LauncherState.OVERVIEW_BUTTONS;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_ACTIONS_FADE;
 import static com.android.quickstep.views.RecentsView.CONTENT_ALPHA;
 import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS;
 import static com.android.quickstep.views.RecentsView.TASK_MODALNESS;
@@ -57,7 +58,7 @@ public final class RecentsViewStateController extends
             mRecentsView.updateEmptyMessage();
             mRecentsView.resetTaskVisuals();
         }
-        setAlphas(PropertySetter.NO_ANIM_PROPERTY_SETTER, state);
+        setAlphas(PropertySetter.NO_ANIM_PROPERTY_SETTER, new StateAnimationConfig(), state);
         mRecentsView.setFullscreenProgress(state.getOverviewFullscreenProgress());
     }
 
@@ -75,17 +76,19 @@ public final class RecentsViewStateController extends
                     AnimationSuccessListener.forRunnable(mRecentsView::resetTaskVisuals));
         }
 
-        setAlphas(builder, toState);
+        setAlphas(builder, config, toState);
         builder.setFloat(mRecentsView, FULLSCREEN_PROGRESS,
                 toState.getOverviewFullscreenProgress(), LINEAR);
     }
 
-    private void setAlphas(PropertySetter propertySetter, LauncherState state) {
+    private void setAlphas(PropertySetter propertySetter, StateAnimationConfig config,
+            LauncherState state) {
         float buttonAlpha = (state.getVisibleElements(mLauncher) & OVERVIEW_BUTTONS) != 0 ? 1 : 0;
         propertySetter.setFloat(mRecentsView.getClearAllButton(), ClearAllButton.VISIBILITY_ALPHA,
                 buttonAlpha, LINEAR);
         propertySetter.setFloat(mLauncher.getActionsView().getVisibilityAlpha(),
-                MultiValueAlpha.VALUE, buttonAlpha, LINEAR);
+                MultiValueAlpha.VALUE, buttonAlpha, config.getInterpolator(
+                        ANIM_OVERVIEW_ACTIONS_FADE, LINEAR));
     }
 
     @Override
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
index 131fcbfbf1..daa1aadbae 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
@@ -25,6 +25,7 @@ import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.OVERVIEW_PEEK;
 import static com.android.launcher3.WorkspaceStateTransitionAnimation.getSpringScaleAnimator;
 import static com.android.launcher3.anim.Interpolators.ACCEL;
+import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.anim.Interpolators.DEACCEL;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_1_7;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
@@ -163,10 +164,15 @@ public class QuickstepAtomicAnimationFactory extends
             config.setInterpolator(ANIM_WORKSPACE_FADE, ACCEL);
             config.setInterpolator(ANIM_ALL_APPS_FADE, ACCEL);
             config.setInterpolator(ANIM_OVERVIEW_SCALE, clampToProgress(ACCEL, 0, 0.9f));
-            config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, ACCEL);
-            config.setInterpolator(ANIM_OVERVIEW_FADE, DEACCEL_1_7);
-            Workspace workspace = mActivity.getWorkspace();
+            config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, ACCEL_DEACCEL);
+
+            if (SysUINavigationMode.getMode(mActivity) == NO_BUTTON) {
+                config.setInterpolator(ANIM_OVERVIEW_FADE, FINAL_FRAME);
+            } else {
+                config.setInterpolator(ANIM_OVERVIEW_FADE, DEACCEL_1_7);
+            }
 
+            Workspace workspace = mActivity.getWorkspace();
             // Start from a higher workspace scale, but only if we're invisible so we don't jump.
             boolean isWorkspaceVisible = workspace.getVisibility() == VISIBLE;
             if (isWorkspaceVisible) {
@@ -206,8 +212,10 @@ public class QuickstepAtomicAnimationFactory extends
                 config.setInterpolator(ANIM_WORKSPACE_SCALE,
                         fromState == NORMAL ? ACCEL : OVERSHOOT_1_2);
                 config.setInterpolator(ANIM_WORKSPACE_TRANSLATE, ACCEL);
+                config.setInterpolator(ANIM_OVERVIEW_FADE, INSTANT);
             } else {
                 config.setInterpolator(ANIM_WORKSPACE_SCALE, OVERSHOOT_1_2);
+                config.setInterpolator(ANIM_OVERVIEW_FADE, OVERSHOOT_1_2);
 
                 // Scale up the recents, if it is not coming from the side
                 RecentsView overview = mActivity.getOverviewPanel();
@@ -225,7 +233,6 @@ public class QuickstepAtomicAnimationFactory extends
                     : OVERSHOOT_1_7;
             config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, translationInterpolator);
             config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, translationInterpolator);
-            config.setInterpolator(ANIM_OVERVIEW_FADE, OVERSHOOT_1_2);
         } else if (fromState == HINT_STATE && toState == NORMAL) {
             config.setInterpolator(ANIM_DEPTH, DEACCEL_3);
             if (mHintToNormalDuration == -1) {
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
index e45fa9d513..57fd11a174 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
@@ -19,13 +19,13 @@ import static com.android.launcher3.AbstractFloatingView.TYPE_ALL;
 import static com.android.launcher3.AbstractFloatingView.TYPE_ALL_APPS_EDU;
 import static com.android.launcher3.LauncherState.ALL_APPS;
 import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_ALL_APPS_EDU;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE;
 import static com.android.launcher3.touch.AbstractStateChangeTouchController.SUCCESS_TRANSITION_PROGRESS;
-import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
 
 import android.animation.ValueAnimator;
@@ -45,6 +45,7 @@ import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.compat.AccessibilityManagerCompat;
 import com.android.launcher3.config.FeatureFlags;
+import com.android.launcher3.graphics.OverviewScrim;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.testing.TestProtocol;
@@ -52,7 +53,9 @@ import com.android.launcher3.touch.SingleAxisSwipeDetector;
 import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
 import com.android.launcher3.util.TouchController;
+import com.android.quickstep.util.AnimatorControllerWithResistance;
 import com.android.quickstep.util.AssistantUtilities;
+import com.android.quickstep.util.OverviewToHomeAnim;
 import com.android.quickstep.views.RecentsView;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 
@@ -63,6 +66,8 @@ public class NavBarToHomeTouchController implements TouchController,
         SingleAxisSwipeDetector.Listener {
 
     private static final Interpolator PULLBACK_INTERPOLATOR = DEACCEL_3;
+    // How much of the overview scrim we can remove during the transition.
+    private static final float OVERVIEW_TO_HOME_SCRIM_PROGRESS = 0.5f;
 
     private final Launcher mLauncher;
     private final SingleAxisSwipeDetector mSwipeDetector;
@@ -156,8 +161,13 @@ public class NavBarToHomeTouchController implements TouchController,
         final PendingAnimation builder = new PendingAnimation(accuracy);
         if (mStartState.overviewUi) {
             RecentsView recentsView = mLauncher.getOverviewPanel();
-            builder.setFloat(recentsView, ADJACENT_PAGE_OFFSET,
-                    -mPullbackDistance / recentsView.getPageOffsetScale(), PULLBACK_INTERPOLATOR);
+            AnimatorControllerWithResistance.createRecentsResistanceFromOverviewAnim(mLauncher,
+                    builder);
+            float endScrimAlpha = Utilities.mapRange(OVERVIEW_TO_HOME_SCRIM_PROGRESS,
+                    mStartState.getOverviewScrimAlpha(mLauncher),
+                    mEndState.getOverviewScrimAlpha(mLauncher));
+            builder.setFloat(mLauncher.getDragLayer().getOverviewScrim(),
+                    OverviewScrim.SCRIM_PROGRESS, endScrimAlpha, PULLBACK_INTERPOLATOR);
             if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
                 builder.addOnFrameCallback(recentsView::redrawLiveTile);
             }
@@ -211,8 +221,13 @@ public class NavBarToHomeTouchController implements TouchController,
                 recentsView.switchToScreenshot(null,
                         () -> recentsView.finishRecentsAnimation(true /* toRecents */, null));
             }
-            mLauncher.getStateManager().goToState(mEndState, true,
-                    () -> onSwipeInteractionCompleted(mEndState));
+            if (mStartState == OVERVIEW) {
+                new OverviewToHomeAnim(mLauncher, () -> onSwipeInteractionCompleted(mEndState))
+                        .animateWithVelocity(velocity);
+            } else {
+                mLauncher.getStateManager().goToState(mEndState, true,
+                        () -> onSwipeInteractionCompleted(mEndState));
+            }
             if (mStartState != mEndState) {
                 logStateChange(mStartState.containerType, logAction);
             }
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
index 9316938c45..13c99f901b 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -21,11 +21,8 @@ import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.Utilities.EDGE_NAV_BAR;
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
-import static com.android.launcher3.states.StateAnimationConfig.PLAY_ATOMIC_OVERVIEW_PEEK;
 import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;
 
-import android.animation.Animator;
-import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.graphics.PointF;
@@ -35,14 +32,14 @@ import android.view.MotionEvent;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.anim.AnimationSuccessListener;
+import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.graphics.OverviewScrim;
 import com.android.launcher3.statemanager.StateManager;
-import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
 import com.android.launcher3.util.VibratorWrapper;
-import com.android.quickstep.util.StaggeredWorkspaceAnim;
+import com.android.quickstep.util.AnimatorControllerWithResistance;
+import com.android.quickstep.util.OverviewToHomeAnim;
 import com.android.quickstep.views.RecentsView;
 
 /**
@@ -62,10 +59,10 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo
 
     private boolean mDidTouchStartInNavBar;
     private boolean mReachedOverview;
-    private boolean mIsOverviewRehidden;
-    private boolean mIsHomeStaggeredAnimFinished;
     // The last recorded displacement before we reached overview.
     private PointF mStartDisplacement = new PointF();
+    private float mStartY;
+    private AnimatorPlaybackController mOverviewResistYAnim;
 
     // Normal to Hint animation has flag SKIP_OVERVIEW, so we update this scrim with this animator.
     private ObjectAnimator mNormalToHintOverviewScrimAnimator;
@@ -123,6 +120,7 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo
                     mToState.getOverviewScrimAlpha(mLauncher));
         }
         mReachedOverview = false;
+        mOverviewResistYAnim = null;
     }
 
     @Override
@@ -160,6 +158,9 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo
         mNormalToHintOverviewScrimAnimator = null;
         mCurrentAnimation.dispatchOnCancelWithoutCancelRunnable(() -> {
             mLauncher.getStateManager().goToState(OVERVIEW, true, () -> {
+                mOverviewResistYAnim = AnimatorControllerWithResistance
+                        .createRecentsResistanceFromOverviewAnim(mLauncher, null)
+                        .createPlaybackController();
                 mReachedOverview = true;
                 maybeSwipeInteractionToOverviewComplete();
             });
@@ -173,13 +174,6 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo
         }
     }
 
-    // Used if flinging back to home after reaching overview
-    private void maybeSwipeInteractionToHomeComplete() {
-        if (mIsHomeStaggeredAnimFinished && mIsOverviewRehidden) {
-            onSwipeInteractionCompleted(NORMAL, Touch.FLING);
-        }
-    }
-
     @Override
     protected boolean handlingOverviewAnim() {
         return mDidTouchStartInNavBar && super.handlingOverviewAnim();
@@ -193,11 +187,17 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo
         if (mMotionPauseDetector.isPaused()) {
             if (!mReachedOverview) {
                 mStartDisplacement.set(xDisplacement, yDisplacement);
+                mStartY = event.getY();
             } else {
                 mRecentsView.setTranslationX((xDisplacement - mStartDisplacement.x)
                         * OVERVIEW_MOVEMENT_FACTOR);
-                mRecentsView.setTranslationY((yDisplacement - mStartDisplacement.y)
-                        * OVERVIEW_MOVEMENT_FACTOR);
+                float yProgress = (mStartDisplacement.y - yDisplacement) / mStartY;
+                if (yProgress > 0 && mOverviewResistYAnim != null) {
+                    mOverviewResistYAnim.setPlayFraction(yProgress);
+                } else {
+                    mRecentsView.setTranslationY((yDisplacement - mStartDisplacement.y)
+                            * OVERVIEW_MOVEMENT_FACTOR);
+                }
             }
             // Stay in Overview.
             return true;
@@ -212,37 +212,10 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo
         StateManager<LauncherState> stateManager = mLauncher.getStateManager();
         boolean goToHomeInsteadOfOverview = isFling;
         if (goToHomeInsteadOfOverview) {
-            if (velocity > 0) {
-                stateManager.goToState(NORMAL, true,
-                        () -> onSwipeInteractionCompleted(NORMAL, Touch.FLING));
-            } else {
-                mIsHomeStaggeredAnimFinished = mIsOverviewRehidden = false;
-
-                StaggeredWorkspaceAnim staggeredWorkspaceAnim = new StaggeredWorkspaceAnim(
-                        mLauncher, velocity, false /* animateOverviewScrim */);
-                staggeredWorkspaceAnim.addAnimatorListener(new AnimationSuccessListener() {
-                    @Override
-                    public void onAnimationSuccess(Animator animator) {
-                        mIsHomeStaggeredAnimFinished = true;
-                        maybeSwipeInteractionToHomeComplete();
-                    }
-                }).start();
-
-                // StaggeredWorkspaceAnim doesn't animate overview, so we handle it here.
-                stateManager.cancelAnimation();
-                StateAnimationConfig config = new StateAnimationConfig();
-                config.duration = OVERVIEW.getTransitionDuration(mLauncher);
-                config.animFlags = PLAY_ATOMIC_OVERVIEW_PEEK;
-                AnimatorSet anim = stateManager.createAtomicAnimation(
-                        stateManager.getState(), NORMAL, config);
-                anim.addListener(AnimationSuccessListener.forRunnable(() -> {
-                    mIsOverviewRehidden = true;
-                    maybeSwipeInteractionToHomeComplete();
-                }));
-                anim.start();
-            }
+            new OverviewToHomeAnim(mLauncher, ()-> onSwipeInteractionCompleted(NORMAL, Touch.FLING))
+                    .animateWithVelocity(velocity);
         }
-        if (mReachedOverview) {
+        if (mReachedOverview && !goToHomeInsteadOfOverview) {
             float distanceDp = dpiFromPx(Math.max(
                     Math.abs(mRecentsView.getTranslationX()),
                     Math.abs(mRecentsView.getTranslationY())));
@@ -251,11 +224,11 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo
             mRecentsView.animate()
                     .translationX(0)
                     .translationY(0)
+                    .scaleX(1)
+                    .scaleY(1)
                     .setInterpolator(ACCEL_DEACCEL)
                     .setDuration(duration)
-                    .withEndAction(goToHomeInsteadOfOverview
-                            ? null
-                            : this::maybeSwipeInteractionToOverviewComplete);
+                    .withEndAction(this::maybeSwipeInteractionToOverviewComplete);
         }
     }
 
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/OverviewToHomeAnim.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/OverviewToHomeAnim.java
new file mode 100644
index 0000000000..084692ea6a
--- /dev/null
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/OverviewToHomeAnim.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.quickstep.util;
+
+import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.LauncherState.OVERVIEW;
+import static com.android.launcher3.anim.Interpolators.DEACCEL;
+import static com.android.launcher3.anim.Interpolators.FINAL_FRAME;
+import static com.android.launcher3.anim.Interpolators.INSTANT;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_COMPONENTS;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_ACTIONS_FADE;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y;
+import static com.android.launcher3.states.StateAnimationConfig.PLAY_ATOMIC_OVERVIEW_PEEK;
+
+import android.animation.Animator;
+import android.animation.AnimatorSet;
+import android.util.Log;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherState;
+import com.android.launcher3.anim.AnimationSuccessListener;
+import com.android.launcher3.statemanager.StateManager;
+import com.android.launcher3.states.StateAnimationConfig;
+import com.android.quickstep.views.RecentsView;
+
+/**
+ * Runs an animation from overview to home. Currently, this animation is just a wrapper around the
+ * normal state transition, in order to keep RecentsView at the same scale and translationY that
+ * it started out at as it translates offscreen. It also scrolls RecentsView to page 0 and may play
+ * a {@link StaggeredWorkspaceAnim} if we're starting from an upward fling.
+ */
+public class OverviewToHomeAnim {
+
+    private static final String TAG = "OverviewToHomeAnim";
+
+    // Constants to specify how to scroll RecentsView to the default page if it's not already there.
+    private static final int DEFAULT_PAGE = 0;
+    private static final int PER_PAGE_SCROLL_DURATION = 150;
+    private static final int MAX_PAGE_SCROLL_DURATION = 750;
+
+    private final Launcher mLauncher;
+    private final Runnable mOnReachedHome;
+
+    // Only run mOnReachedHome when both of these are true.
+    private boolean mIsHomeStaggeredAnimFinished;
+    private boolean mIsOverviewHidden;
+
+    public OverviewToHomeAnim(Launcher launcher, Runnable onReachedHome) {
+        mLauncher = launcher;
+        mOnReachedHome = onReachedHome;
+    }
+
+    /**
+     * Starts the animation. If velocity < 0 (i.e. upwards), also plays a
+     * {@link StaggeredWorkspaceAnim}.
+     */
+    public void animateWithVelocity(float velocity) {
+        StateManager<LauncherState> stateManager = mLauncher.getStateManager();
+        LauncherState startState = stateManager.getState();
+        if (startState != OVERVIEW) {
+            Log.e(TAG, "animateFromOverviewToHome: unexpected start state " + startState);
+        }
+
+        boolean playStaggeredWorkspaceAnim = velocity < 0;
+        if (playStaggeredWorkspaceAnim) {
+            StaggeredWorkspaceAnim staggeredWorkspaceAnim = new StaggeredWorkspaceAnim(
+                    mLauncher, velocity, false /* animateOverviewScrim */);
+            staggeredWorkspaceAnim.addAnimatorListener(new AnimationSuccessListener() {
+                @Override
+                public void onAnimationSuccess(Animator animator) {
+                    mIsHomeStaggeredAnimFinished = true;
+                    maybeOverviewToHomeAnimComplete();
+                }
+            }).start();
+        } else {
+            mIsHomeStaggeredAnimFinished = true;
+        }
+
+        RecentsView recentsView = mLauncher.getOverviewPanel();
+        int numPagesToScroll = recentsView.getNextPage() - DEFAULT_PAGE;
+        int scrollDuration = Math.min(MAX_PAGE_SCROLL_DURATION,
+                numPagesToScroll * PER_PAGE_SCROLL_DURATION);
+        int duration = Math.max(scrollDuration, startState.getTransitionDuration(mLauncher));
+
+        StateAnimationConfig config = new StateAnimationConfig();
+        config.duration = duration;
+        config.animFlags = playStaggeredWorkspaceAnim
+                // StaggeredWorkspaceAnim doesn't animate overview, so we handle it here.
+                ? PLAY_ATOMIC_OVERVIEW_PEEK
+                : ANIM_ALL_COMPONENTS;
+        AnimatorSet anim = stateManager.createAtomicAnimation(
+                startState, NORMAL, config, overrideConfig -> {
+                    overrideConfig.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, DEACCEL);
+                    overrideConfig.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, FINAL_FRAME);
+                    overrideConfig.setInterpolator(ANIM_OVERVIEW_SCALE, FINAL_FRAME);
+                    overrideConfig.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, INSTANT);
+                });
+        anim.addListener(new AnimationSuccessListener() {
+            @Override
+            public void onAnimationSuccess(Animator animator) {
+                mIsOverviewHidden = true;
+                maybeOverviewToHomeAnimComplete();
+            }
+        });
+        stateManager.cancelAnimation();
+        anim.start();
+        recentsView.snapToPage(DEFAULT_PAGE, duration);
+    }
+
+    private void maybeOverviewToHomeAnimComplete() {
+        if (mIsHomeStaggeredAnimFinished && mIsOverviewHidden) {
+            mOnReachedHome.run();
+        }
+    }
+}
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/OverviewActionsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/OverviewActionsView.java
index 79d57c55a2..ede2b70236 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/OverviewActionsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/OverviewActionsView.java
@@ -33,6 +33,7 @@ import androidx.annotation.Nullable;
 
 import com.android.launcher3.Insettable;
 import com.android.launcher3.R;
+import com.android.launcher3.anim.AlphaUpdateListener;
 import com.android.launcher3.util.MultiValueAlpha;
 import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;
 import com.android.quickstep.SysUINavigationMode;
@@ -141,6 +142,13 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
         }
     }
 
+    @Override
+    public void setAlpha(float alpha) {
+        super.setAlpha(alpha);
+        // Ensure actions don't consume clicks when alpha is 0.
+        AlphaUpdateListener.updateVisibility(this);
+    }
+
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
@@ -168,7 +176,6 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
         }
         boolean isHidden = mHiddenFlags != 0;
         mMultiValueAlpha.getProperty(INDEX_HIDDEN_FLAGS_ALPHA).setValue(isHidden ? 0 : 1);
-        setVisibility(isHidden ? INVISIBLE : VISIBLE);
     }
 
     /**
diff --git a/quickstep/src/com/android/quickstep/util/AnimatorControllerWithResistance.java b/quickstep/src/com/android/quickstep/util/AnimatorControllerWithResistance.java
index 23b02d5665..a19a67c8fc 100644
--- a/quickstep/src/com/android/quickstep/util/AnimatorControllerWithResistance.java
+++ b/quickstep/src/com/android/quickstep/util/AnimatorControllerWithResistance.java
@@ -18,6 +18,8 @@ package com.android.quickstep.util;
 import static com.android.launcher3.anim.Interpolators.DEACCEL;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
+import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
+import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION;
 
 import android.animation.TimeInterpolator;
 import android.content.Context;
@@ -27,12 +29,16 @@ import android.graphics.Rect;
 import android.graphics.RectF;
 import android.util.FloatProperty;
 
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.quickstep.LauncherActivityInterface;
 import com.android.quickstep.SysUINavigationMode;
+import com.android.quickstep.views.RecentsView;
 
 /**
  * Controls an animation that can go beyond progress = 1, at which point resistance should be
@@ -48,15 +54,32 @@ public class AnimatorControllerWithResistance {
      */
     public static final float TWO_BUTTON_EXTRA_DRAG_FACTOR = 0.25f;
 
-    /**
-     * Start slowing down the rate of scaling down when recents view is smaller than this scale.
-     */
-    private static final float RECENTS_SCALE_START_RESIST = 0.75f;
+    private enum RecentsParams {
+        FROM_APP(0.75f, 0.5f, 1f),
+        FROM_OVERVIEW(1f, 0.75f, 0.5f);
 
-    /**
-     * Recents view will reach this scale at the very end of the drag.
-     */
-    private static final float RECENTS_SCALE_MAX_RESIST = 0.5f;
+        RecentsParams(float scaleStartResist, float scaleMaxResist, float translationFactor) {
+            this.scaleStartResist = scaleStartResist;
+            this.scaleMaxResist = scaleMaxResist;
+            this.translationFactor = translationFactor;
+        }
+
+        /**
+         * Start slowing down the rate of scaling down when recents view is smaller than this scale.
+         */
+        public final float scaleStartResist;
+
+        /**
+         * Recents view will reach this scale at the very end of the drag.
+         */
+        public final float scaleMaxResist;
+
+        /**
+         * How much translation to apply to RecentsView when the drag reaches the top of the screen,
+         * where 0 will keep it centered and 1 will have it barely touch the top of the screen.
+         */
+        public final float translationFactor;
+    }
 
     private static final TimeInterpolator RECENTS_SCALE_RESIST_INTERPOLATOR = DEACCEL;
     private static final TimeInterpolator RECENTS_TRANSLATE_RESIST_INTERPOLATOR = LINEAR;
@@ -115,6 +138,24 @@ public class AnimatorControllerWithResistance {
             RecentsOrientedState recentsOrientedState, DeviceProfile dp, SCALE scaleTarget,
             FloatProperty<SCALE> scaleProperty, TRANSLATION translationTarget,
             FloatProperty<TRANSLATION> translationProperty) {
+
+        PendingAnimation resistAnim = createRecentsResistanceAnim(null, context,
+                recentsOrientedState, dp, scaleTarget, scaleProperty, translationTarget,
+                translationProperty, RecentsParams.FROM_APP);
+
+        AnimatorPlaybackController resistanceController = resistAnim.createPlaybackController();
+        return new AnimatorControllerWithResistance(normalController, resistanceController);
+    }
+
+    /**
+     * Creates the resistance animation for {@link #createForRecents}, or can be used separately
+     * when starting from recents, i.e. {@link #createRecentsResistanceFromOverviewAnim}.
+     */
+    public static <SCALE, TRANSLATION> PendingAnimation createRecentsResistanceAnim(
+            @Nullable PendingAnimation resistAnim, Context context,
+            RecentsOrientedState recentsOrientedState, DeviceProfile dp, SCALE scaleTarget,
+            FloatProperty<SCALE> scaleProperty, TRANSLATION translationTarget,
+            FloatProperty<TRANSLATION> translationProperty, RecentsParams params) {
         Rect startRect = new Rect();
         LauncherActivityInterface.INSTANCE.calculateTaskSize(context, dp, startRect,
                 recentsOrientedState.getOrientationHandler());
@@ -125,7 +166,9 @@ public class AnimatorControllerWithResistance {
             distanceToCover = (long)
                     ((dp.heightPx - startRect.bottom) * TWO_BUTTON_EXTRA_DRAG_FACTOR);
         }
-        PendingAnimation resistAnim = new PendingAnimation(distanceToCover * 2);
+        if (resistAnim == null) {
+            resistAnim = new PendingAnimation(distanceToCover * 2);
+        }
 
         PointF pivot = new PointF();
         float fullscreenScale = recentsOrientedState.getFullScreenScaleAndPivot(
@@ -141,9 +184,9 @@ public class AnimatorControllerWithResistance {
         } else {
             // Create an interpolator that resists the scale so the scale doesn't get smaller than
             // RECENTS_SCALE_MAX_RESIST.
-            float startResist = Utilities.getProgress(RECENTS_SCALE_START_RESIST, startScale,
+            float startResist = Utilities.getProgress(params.scaleStartResist , startScale,
                     endScale);
-            float maxResist = Utilities.getProgress(RECENTS_SCALE_MAX_RESIST, startScale, endScale);
+            float maxResist = Utilities.getProgress(params.scaleMaxResist, startScale, endScale);
             scaleInterpolator = t -> {
                 if (t < startResist) {
                     return t;
@@ -160,17 +203,28 @@ public class AnimatorControllerWithResistance {
             // Compute where the task view would be based on the end scale, if we didn't translate.
             RectF endRectF = new RectF(startRect);
             Matrix temp = new Matrix();
-            temp.setScale(RECENTS_SCALE_MAX_RESIST, RECENTS_SCALE_MAX_RESIST, pivot.x, pivot.y);
+            temp.setScale(params.scaleMaxResist, params.scaleMaxResist, pivot.x, pivot.y);
             temp.mapRect(endRectF);
             // Translate such that the task view touches the top of the screen when drag does.
             float endTranslation = endRectF.top * recentsOrientedState.getOrientationHandler()
-                    .getSecondaryTranslationDirectionFactor();
+                    .getSecondaryTranslationDirectionFactor() * params.translationFactor;
             resistAnim.addFloat(translationTarget, translationProperty, 0, endTranslation,
                     RECENTS_TRANSLATE_RESIST_INTERPOLATOR);
         }
 
-        AnimatorPlaybackController resistanceController = resistAnim.createPlaybackController();
-        return new AnimatorControllerWithResistance(normalController, resistanceController);
+        return resistAnim;
     }
 
+    /**
+     * Helper method to update or create a PendingAnimation suitable for animating
+     * a RecentsView interaction that started from the overview state.
+     */
+    public static PendingAnimation createRecentsResistanceFromOverviewAnim(
+            BaseDraggingActivity activity, @Nullable PendingAnimation resistanceAnim) {
+        RecentsView recentsView = activity.getOverviewPanel();
+        return createRecentsResistanceAnim(resistanceAnim, activity,
+                recentsView.getPagedViewOrientedState(), activity.getDeviceProfile(),
+                recentsView, RECENTS_SCALE_PROPERTY, recentsView, TASK_SECONDARY_TRANSLATION,
+                RecentsParams.FROM_OVERVIEW);
+    }
 }
diff --git a/src/com/android/launcher3/statemanager/StateManager.java b/src/com/android/launcher3/statemanager/StateManager.java
index 6ff1254245..d93c6e6a99 100644
--- a/src/com/android/launcher3/statemanager/StateManager.java
+++ b/src/com/android/launcher3/statemanager/StateManager.java
@@ -28,6 +28,9 @@ import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
 
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
@@ -37,6 +40,7 @@ import com.android.launcher3.testing.TestProtocol;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
+import java.util.function.Consumer;
 
 /**
  * Class to manage transitions between different states for a StatefulActivity based on different
@@ -262,9 +266,23 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
      */
     public AnimatorSet createAtomicAnimation(
             STATE_TYPE fromState, STATE_TYPE toState, StateAnimationConfig config) {
+        return createAtomicAnimation(fromState, toState, config, null);
+    }
+
+    /**
+     * @see #createAtomicAnimation(BaseState, BaseState, StateAnimationConfig)
+     * @param overrideConfig Optional callback to override some config params that were populated
+     *                       by {{@link #prepareForAtomicAnimation}} before creating the animation.
+     */
+    public AnimatorSet createAtomicAnimation(STATE_TYPE fromState, STATE_TYPE toState,
+            StateAnimationConfig config, @Nullable Consumer<StateAnimationConfig> overrideConfig) {
         PendingAnimation builder = new PendingAnimation(config.duration);
         prepareForAtomicAnimation(fromState, toState, config);
 
+        if (overrideConfig != null) {
+            overrideConfig.accept(config);
+        }
+
         for (StateHandler handler : mActivity.getStateManager().getStateHandlers()) {
             handler.setStateWithAnimation(toState, config, builder);
         }
diff --git a/src/com/android/launcher3/states/StateAnimationConfig.java b/src/com/android/launcher3/states/StateAnimationConfig.java
index f90ad3cd0b..4e8b30ca27 100644
--- a/src/com/android/launcher3/states/StateAnimationConfig.java
+++ b/src/com/android/launcher3/states/StateAnimationConfig.java
@@ -71,6 +71,7 @@ public class StateAnimationConfig {
             ANIM_ALL_APPS_HEADER_FADE,
             ANIM_OVERVIEW_MODAL,
             ANIM_DEPTH,
+            ANIM_OVERVIEW_ACTIONS_FADE,
     })
     @Retention(RetentionPolicy.SOURCE)
     public @interface AnimType {}
@@ -89,8 +90,9 @@ public class StateAnimationConfig {
     public static final int ANIM_ALL_APPS_HEADER_FADE = 12; // e.g. predictions
     public static final int ANIM_OVERVIEW_MODAL = 13;
     public static final int ANIM_DEPTH = 14;
+    public static final int ANIM_OVERVIEW_ACTIONS_FADE = 15;
 
-    private static final int ANIM_TYPES_COUNT = 15;
+    private static final int ANIM_TYPES_COUNT = 16;
 
     private final Interpolator[] mInterpolators = new Interpolator[ANIM_TYPES_COUNT];
 
-- 
GitLab


From e6f9e0eb7ea49b0f2feae80d7a2d57fe9db5e38e Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 10 Aug 2020 19:13:17 +0000
Subject: [PATCH 0079/1664] Revert "Update overview from home transitions"

This reverts commit f3bc79718201cf17479a46e9860ea518a900d68f.

Reason for revert: updating upstream, need to wait to cherry-pick until that's approved

Change-Id: I702286dba66fb4582ab682a5b0b8cd80ccebf346
---
 .../RecentsViewStateController.java           |  11 +-
 .../QuickstepAtomicAnimationFactory.java      |  15 +-
 .../NavBarToHomeTouchController.java          |  25 +---
 ...ButtonNavbarToOverviewTouchController.java |  73 ++++++----
 .../quickstep/util/OverviewToHomeAnim.java    | 130 ------------------
 .../quickstep/views/OverviewActionsView.java  |   9 +-
 .../AnimatorControllerWithResistance.java     |  84 ++---------
 .../launcher3/statemanager/StateManager.java  |  18 ---
 .../states/StateAnimationConfig.java          |   4 +-
 9 files changed, 80 insertions(+), 289 deletions(-)
 delete mode 100644 quickstep/recents_ui_overrides/src/com/android/quickstep/util/OverviewToHomeAnim.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsViewStateController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
index 5ccc1e8681..085b9b3af9 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
@@ -17,7 +17,6 @@ package com.android.launcher3.uioverrides;
 
 import static com.android.launcher3.LauncherState.OVERVIEW_BUTTONS;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_ACTIONS_FADE;
 import static com.android.quickstep.views.RecentsView.CONTENT_ALPHA;
 import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS;
 import static com.android.quickstep.views.RecentsView.TASK_MODALNESS;
@@ -58,7 +57,7 @@ public final class RecentsViewStateController extends
             mRecentsView.updateEmptyMessage();
             mRecentsView.resetTaskVisuals();
         }
-        setAlphas(PropertySetter.NO_ANIM_PROPERTY_SETTER, new StateAnimationConfig(), state);
+        setAlphas(PropertySetter.NO_ANIM_PROPERTY_SETTER, state);
         mRecentsView.setFullscreenProgress(state.getOverviewFullscreenProgress());
     }
 
@@ -76,19 +75,17 @@ public final class RecentsViewStateController extends
                     AnimationSuccessListener.forRunnable(mRecentsView::resetTaskVisuals));
         }
 
-        setAlphas(builder, config, toState);
+        setAlphas(builder, toState);
         builder.setFloat(mRecentsView, FULLSCREEN_PROGRESS,
                 toState.getOverviewFullscreenProgress(), LINEAR);
     }
 
-    private void setAlphas(PropertySetter propertySetter, StateAnimationConfig config,
-            LauncherState state) {
+    private void setAlphas(PropertySetter propertySetter, LauncherState state) {
         float buttonAlpha = (state.getVisibleElements(mLauncher) & OVERVIEW_BUTTONS) != 0 ? 1 : 0;
         propertySetter.setFloat(mRecentsView.getClearAllButton(), ClearAllButton.VISIBILITY_ALPHA,
                 buttonAlpha, LINEAR);
         propertySetter.setFloat(mLauncher.getActionsView().getVisibilityAlpha(),
-                MultiValueAlpha.VALUE, buttonAlpha, config.getInterpolator(
-                        ANIM_OVERVIEW_ACTIONS_FADE, LINEAR));
+                MultiValueAlpha.VALUE, buttonAlpha, LINEAR);
     }
 
     @Override
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
index daa1aadbae..131fcbfbf1 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
@@ -25,7 +25,6 @@ import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.OVERVIEW_PEEK;
 import static com.android.launcher3.WorkspaceStateTransitionAnimation.getSpringScaleAnimator;
 import static com.android.launcher3.anim.Interpolators.ACCEL;
-import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.anim.Interpolators.DEACCEL;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_1_7;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
@@ -164,15 +163,10 @@ public class QuickstepAtomicAnimationFactory extends
             config.setInterpolator(ANIM_WORKSPACE_FADE, ACCEL);
             config.setInterpolator(ANIM_ALL_APPS_FADE, ACCEL);
             config.setInterpolator(ANIM_OVERVIEW_SCALE, clampToProgress(ACCEL, 0, 0.9f));
-            config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, ACCEL_DEACCEL);
-
-            if (SysUINavigationMode.getMode(mActivity) == NO_BUTTON) {
-                config.setInterpolator(ANIM_OVERVIEW_FADE, FINAL_FRAME);
-            } else {
-                config.setInterpolator(ANIM_OVERVIEW_FADE, DEACCEL_1_7);
-            }
-
+            config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, ACCEL);
+            config.setInterpolator(ANIM_OVERVIEW_FADE, DEACCEL_1_7);
             Workspace workspace = mActivity.getWorkspace();
+
             // Start from a higher workspace scale, but only if we're invisible so we don't jump.
             boolean isWorkspaceVisible = workspace.getVisibility() == VISIBLE;
             if (isWorkspaceVisible) {
@@ -212,10 +206,8 @@ public class QuickstepAtomicAnimationFactory extends
                 config.setInterpolator(ANIM_WORKSPACE_SCALE,
                         fromState == NORMAL ? ACCEL : OVERSHOOT_1_2);
                 config.setInterpolator(ANIM_WORKSPACE_TRANSLATE, ACCEL);
-                config.setInterpolator(ANIM_OVERVIEW_FADE, INSTANT);
             } else {
                 config.setInterpolator(ANIM_WORKSPACE_SCALE, OVERSHOOT_1_2);
-                config.setInterpolator(ANIM_OVERVIEW_FADE, OVERSHOOT_1_2);
 
                 // Scale up the recents, if it is not coming from the side
                 RecentsView overview = mActivity.getOverviewPanel();
@@ -233,6 +225,7 @@ public class QuickstepAtomicAnimationFactory extends
                     : OVERSHOOT_1_7;
             config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, translationInterpolator);
             config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, translationInterpolator);
+            config.setInterpolator(ANIM_OVERVIEW_FADE, OVERSHOOT_1_2);
         } else if (fromState == HINT_STATE && toState == NORMAL) {
             config.setInterpolator(ANIM_DEPTH, DEACCEL_3);
             if (mHintToNormalDuration == -1) {
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
index 57fd11a174..e45fa9d513 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
@@ -19,13 +19,13 @@ import static com.android.launcher3.AbstractFloatingView.TYPE_ALL;
 import static com.android.launcher3.AbstractFloatingView.TYPE_ALL_APPS_EDU;
 import static com.android.launcher3.LauncherState.ALL_APPS;
 import static com.android.launcher3.LauncherState.NORMAL;
-import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_ALL_APPS_EDU;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE;
 import static com.android.launcher3.touch.AbstractStateChangeTouchController.SUCCESS_TRANSITION_PROGRESS;
+import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
 
 import android.animation.ValueAnimator;
@@ -45,7 +45,6 @@ import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.compat.AccessibilityManagerCompat;
 import com.android.launcher3.config.FeatureFlags;
-import com.android.launcher3.graphics.OverviewScrim;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.testing.TestProtocol;
@@ -53,9 +52,7 @@ import com.android.launcher3.touch.SingleAxisSwipeDetector;
 import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
 import com.android.launcher3.util.TouchController;
-import com.android.quickstep.util.AnimatorControllerWithResistance;
 import com.android.quickstep.util.AssistantUtilities;
-import com.android.quickstep.util.OverviewToHomeAnim;
 import com.android.quickstep.views.RecentsView;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 
@@ -66,8 +63,6 @@ public class NavBarToHomeTouchController implements TouchController,
         SingleAxisSwipeDetector.Listener {
 
     private static final Interpolator PULLBACK_INTERPOLATOR = DEACCEL_3;
-    // How much of the overview scrim we can remove during the transition.
-    private static final float OVERVIEW_TO_HOME_SCRIM_PROGRESS = 0.5f;
 
     private final Launcher mLauncher;
     private final SingleAxisSwipeDetector mSwipeDetector;
@@ -161,13 +156,8 @@ public class NavBarToHomeTouchController implements TouchController,
         final PendingAnimation builder = new PendingAnimation(accuracy);
         if (mStartState.overviewUi) {
             RecentsView recentsView = mLauncher.getOverviewPanel();
-            AnimatorControllerWithResistance.createRecentsResistanceFromOverviewAnim(mLauncher,
-                    builder);
-            float endScrimAlpha = Utilities.mapRange(OVERVIEW_TO_HOME_SCRIM_PROGRESS,
-                    mStartState.getOverviewScrimAlpha(mLauncher),
-                    mEndState.getOverviewScrimAlpha(mLauncher));
-            builder.setFloat(mLauncher.getDragLayer().getOverviewScrim(),
-                    OverviewScrim.SCRIM_PROGRESS, endScrimAlpha, PULLBACK_INTERPOLATOR);
+            builder.setFloat(recentsView, ADJACENT_PAGE_OFFSET,
+                    -mPullbackDistance / recentsView.getPageOffsetScale(), PULLBACK_INTERPOLATOR);
             if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
                 builder.addOnFrameCallback(recentsView::redrawLiveTile);
             }
@@ -221,13 +211,8 @@ public class NavBarToHomeTouchController implements TouchController,
                 recentsView.switchToScreenshot(null,
                         () -> recentsView.finishRecentsAnimation(true /* toRecents */, null));
             }
-            if (mStartState == OVERVIEW) {
-                new OverviewToHomeAnim(mLauncher, () -> onSwipeInteractionCompleted(mEndState))
-                        .animateWithVelocity(velocity);
-            } else {
-                mLauncher.getStateManager().goToState(mEndState, true,
-                        () -> onSwipeInteractionCompleted(mEndState));
-            }
+            mLauncher.getStateManager().goToState(mEndState, true,
+                    () -> onSwipeInteractionCompleted(mEndState));
             if (mStartState != mEndState) {
                 logStateChange(mStartState.containerType, logAction);
             }
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
index 13c99f901b..9316938c45 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -21,8 +21,11 @@ import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.Utilities.EDGE_NAV_BAR;
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
+import static com.android.launcher3.states.StateAnimationConfig.PLAY_ATOMIC_OVERVIEW_PEEK;
 import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;
 
+import android.animation.Animator;
+import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.graphics.PointF;
@@ -32,14 +35,14 @@ import android.view.MotionEvent;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.anim.AnimatorPlaybackController;
+import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.graphics.OverviewScrim;
 import com.android.launcher3.statemanager.StateManager;
+import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
 import com.android.launcher3.util.VibratorWrapper;
-import com.android.quickstep.util.AnimatorControllerWithResistance;
-import com.android.quickstep.util.OverviewToHomeAnim;
+import com.android.quickstep.util.StaggeredWorkspaceAnim;
 import com.android.quickstep.views.RecentsView;
 
 /**
@@ -59,10 +62,10 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo
 
     private boolean mDidTouchStartInNavBar;
     private boolean mReachedOverview;
+    private boolean mIsOverviewRehidden;
+    private boolean mIsHomeStaggeredAnimFinished;
     // The last recorded displacement before we reached overview.
     private PointF mStartDisplacement = new PointF();
-    private float mStartY;
-    private AnimatorPlaybackController mOverviewResistYAnim;
 
     // Normal to Hint animation has flag SKIP_OVERVIEW, so we update this scrim with this animator.
     private ObjectAnimator mNormalToHintOverviewScrimAnimator;
@@ -120,7 +123,6 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo
                     mToState.getOverviewScrimAlpha(mLauncher));
         }
         mReachedOverview = false;
-        mOverviewResistYAnim = null;
     }
 
     @Override
@@ -158,9 +160,6 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo
         mNormalToHintOverviewScrimAnimator = null;
         mCurrentAnimation.dispatchOnCancelWithoutCancelRunnable(() -> {
             mLauncher.getStateManager().goToState(OVERVIEW, true, () -> {
-                mOverviewResistYAnim = AnimatorControllerWithResistance
-                        .createRecentsResistanceFromOverviewAnim(mLauncher, null)
-                        .createPlaybackController();
                 mReachedOverview = true;
                 maybeSwipeInteractionToOverviewComplete();
             });
@@ -174,6 +173,13 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo
         }
     }
 
+    // Used if flinging back to home after reaching overview
+    private void maybeSwipeInteractionToHomeComplete() {
+        if (mIsHomeStaggeredAnimFinished && mIsOverviewRehidden) {
+            onSwipeInteractionCompleted(NORMAL, Touch.FLING);
+        }
+    }
+
     @Override
     protected boolean handlingOverviewAnim() {
         return mDidTouchStartInNavBar && super.handlingOverviewAnim();
@@ -187,17 +193,11 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo
         if (mMotionPauseDetector.isPaused()) {
             if (!mReachedOverview) {
                 mStartDisplacement.set(xDisplacement, yDisplacement);
-                mStartY = event.getY();
             } else {
                 mRecentsView.setTranslationX((xDisplacement - mStartDisplacement.x)
                         * OVERVIEW_MOVEMENT_FACTOR);
-                float yProgress = (mStartDisplacement.y - yDisplacement) / mStartY;
-                if (yProgress > 0 && mOverviewResistYAnim != null) {
-                    mOverviewResistYAnim.setPlayFraction(yProgress);
-                } else {
-                    mRecentsView.setTranslationY((yDisplacement - mStartDisplacement.y)
-                            * OVERVIEW_MOVEMENT_FACTOR);
-                }
+                mRecentsView.setTranslationY((yDisplacement - mStartDisplacement.y)
+                        * OVERVIEW_MOVEMENT_FACTOR);
             }
             // Stay in Overview.
             return true;
@@ -212,10 +212,37 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo
         StateManager<LauncherState> stateManager = mLauncher.getStateManager();
         boolean goToHomeInsteadOfOverview = isFling;
         if (goToHomeInsteadOfOverview) {
-            new OverviewToHomeAnim(mLauncher, ()-> onSwipeInteractionCompleted(NORMAL, Touch.FLING))
-                    .animateWithVelocity(velocity);
+            if (velocity > 0) {
+                stateManager.goToState(NORMAL, true,
+                        () -> onSwipeInteractionCompleted(NORMAL, Touch.FLING));
+            } else {
+                mIsHomeStaggeredAnimFinished = mIsOverviewRehidden = false;
+
+                StaggeredWorkspaceAnim staggeredWorkspaceAnim = new StaggeredWorkspaceAnim(
+                        mLauncher, velocity, false /* animateOverviewScrim */);
+                staggeredWorkspaceAnim.addAnimatorListener(new AnimationSuccessListener() {
+                    @Override
+                    public void onAnimationSuccess(Animator animator) {
+                        mIsHomeStaggeredAnimFinished = true;
+                        maybeSwipeInteractionToHomeComplete();
+                    }
+                }).start();
+
+                // StaggeredWorkspaceAnim doesn't animate overview, so we handle it here.
+                stateManager.cancelAnimation();
+                StateAnimationConfig config = new StateAnimationConfig();
+                config.duration = OVERVIEW.getTransitionDuration(mLauncher);
+                config.animFlags = PLAY_ATOMIC_OVERVIEW_PEEK;
+                AnimatorSet anim = stateManager.createAtomicAnimation(
+                        stateManager.getState(), NORMAL, config);
+                anim.addListener(AnimationSuccessListener.forRunnable(() -> {
+                    mIsOverviewRehidden = true;
+                    maybeSwipeInteractionToHomeComplete();
+                }));
+                anim.start();
+            }
         }
-        if (mReachedOverview && !goToHomeInsteadOfOverview) {
+        if (mReachedOverview) {
             float distanceDp = dpiFromPx(Math.max(
                     Math.abs(mRecentsView.getTranslationX()),
                     Math.abs(mRecentsView.getTranslationY())));
@@ -224,11 +251,11 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo
             mRecentsView.animate()
                     .translationX(0)
                     .translationY(0)
-                    .scaleX(1)
-                    .scaleY(1)
                     .setInterpolator(ACCEL_DEACCEL)
                     .setDuration(duration)
-                    .withEndAction(this::maybeSwipeInteractionToOverviewComplete);
+                    .withEndAction(goToHomeInsteadOfOverview
+                            ? null
+                            : this::maybeSwipeInteractionToOverviewComplete);
         }
     }
 
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/OverviewToHomeAnim.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/OverviewToHomeAnim.java
deleted file mode 100644
index 084692ea6a..0000000000
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/OverviewToHomeAnim.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.quickstep.util;
-
-import static com.android.launcher3.LauncherState.NORMAL;
-import static com.android.launcher3.LauncherState.OVERVIEW;
-import static com.android.launcher3.anim.Interpolators.DEACCEL;
-import static com.android.launcher3.anim.Interpolators.FINAL_FRAME;
-import static com.android.launcher3.anim.Interpolators.INSTANT;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_COMPONENTS;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_ACTIONS_FADE;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y;
-import static com.android.launcher3.states.StateAnimationConfig.PLAY_ATOMIC_OVERVIEW_PEEK;
-
-import android.animation.Animator;
-import android.animation.AnimatorSet;
-import android.util.Log;
-
-import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherState;
-import com.android.launcher3.anim.AnimationSuccessListener;
-import com.android.launcher3.statemanager.StateManager;
-import com.android.launcher3.states.StateAnimationConfig;
-import com.android.quickstep.views.RecentsView;
-
-/**
- * Runs an animation from overview to home. Currently, this animation is just a wrapper around the
- * normal state transition, in order to keep RecentsView at the same scale and translationY that
- * it started out at as it translates offscreen. It also scrolls RecentsView to page 0 and may play
- * a {@link StaggeredWorkspaceAnim} if we're starting from an upward fling.
- */
-public class OverviewToHomeAnim {
-
-    private static final String TAG = "OverviewToHomeAnim";
-
-    // Constants to specify how to scroll RecentsView to the default page if it's not already there.
-    private static final int DEFAULT_PAGE = 0;
-    private static final int PER_PAGE_SCROLL_DURATION = 150;
-    private static final int MAX_PAGE_SCROLL_DURATION = 750;
-
-    private final Launcher mLauncher;
-    private final Runnable mOnReachedHome;
-
-    // Only run mOnReachedHome when both of these are true.
-    private boolean mIsHomeStaggeredAnimFinished;
-    private boolean mIsOverviewHidden;
-
-    public OverviewToHomeAnim(Launcher launcher, Runnable onReachedHome) {
-        mLauncher = launcher;
-        mOnReachedHome = onReachedHome;
-    }
-
-    /**
-     * Starts the animation. If velocity < 0 (i.e. upwards), also plays a
-     * {@link StaggeredWorkspaceAnim}.
-     */
-    public void animateWithVelocity(float velocity) {
-        StateManager<LauncherState> stateManager = mLauncher.getStateManager();
-        LauncherState startState = stateManager.getState();
-        if (startState != OVERVIEW) {
-            Log.e(TAG, "animateFromOverviewToHome: unexpected start state " + startState);
-        }
-
-        boolean playStaggeredWorkspaceAnim = velocity < 0;
-        if (playStaggeredWorkspaceAnim) {
-            StaggeredWorkspaceAnim staggeredWorkspaceAnim = new StaggeredWorkspaceAnim(
-                    mLauncher, velocity, false /* animateOverviewScrim */);
-            staggeredWorkspaceAnim.addAnimatorListener(new AnimationSuccessListener() {
-                @Override
-                public void onAnimationSuccess(Animator animator) {
-                    mIsHomeStaggeredAnimFinished = true;
-                    maybeOverviewToHomeAnimComplete();
-                }
-            }).start();
-        } else {
-            mIsHomeStaggeredAnimFinished = true;
-        }
-
-        RecentsView recentsView = mLauncher.getOverviewPanel();
-        int numPagesToScroll = recentsView.getNextPage() - DEFAULT_PAGE;
-        int scrollDuration = Math.min(MAX_PAGE_SCROLL_DURATION,
-                numPagesToScroll * PER_PAGE_SCROLL_DURATION);
-        int duration = Math.max(scrollDuration, startState.getTransitionDuration(mLauncher));
-
-        StateAnimationConfig config = new StateAnimationConfig();
-        config.duration = duration;
-        config.animFlags = playStaggeredWorkspaceAnim
-                // StaggeredWorkspaceAnim doesn't animate overview, so we handle it here.
-                ? PLAY_ATOMIC_OVERVIEW_PEEK
-                : ANIM_ALL_COMPONENTS;
-        AnimatorSet anim = stateManager.createAtomicAnimation(
-                startState, NORMAL, config, overrideConfig -> {
-                    overrideConfig.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, DEACCEL);
-                    overrideConfig.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, FINAL_FRAME);
-                    overrideConfig.setInterpolator(ANIM_OVERVIEW_SCALE, FINAL_FRAME);
-                    overrideConfig.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, INSTANT);
-                });
-        anim.addListener(new AnimationSuccessListener() {
-            @Override
-            public void onAnimationSuccess(Animator animator) {
-                mIsOverviewHidden = true;
-                maybeOverviewToHomeAnimComplete();
-            }
-        });
-        stateManager.cancelAnimation();
-        anim.start();
-        recentsView.snapToPage(DEFAULT_PAGE, duration);
-    }
-
-    private void maybeOverviewToHomeAnimComplete() {
-        if (mIsHomeStaggeredAnimFinished && mIsOverviewHidden) {
-            mOnReachedHome.run();
-        }
-    }
-}
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/OverviewActionsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/OverviewActionsView.java
index ede2b70236..79d57c55a2 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/OverviewActionsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/OverviewActionsView.java
@@ -33,7 +33,6 @@ import androidx.annotation.Nullable;
 
 import com.android.launcher3.Insettable;
 import com.android.launcher3.R;
-import com.android.launcher3.anim.AlphaUpdateListener;
 import com.android.launcher3.util.MultiValueAlpha;
 import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;
 import com.android.quickstep.SysUINavigationMode;
@@ -142,13 +141,6 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
         }
     }
 
-    @Override
-    public void setAlpha(float alpha) {
-        super.setAlpha(alpha);
-        // Ensure actions don't consume clicks when alpha is 0.
-        AlphaUpdateListener.updateVisibility(this);
-    }
-
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
@@ -176,6 +168,7 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
         }
         boolean isHidden = mHiddenFlags != 0;
         mMultiValueAlpha.getProperty(INDEX_HIDDEN_FLAGS_ALPHA).setValue(isHidden ? 0 : 1);
+        setVisibility(isHidden ? INVISIBLE : VISIBLE);
     }
 
     /**
diff --git a/quickstep/src/com/android/quickstep/util/AnimatorControllerWithResistance.java b/quickstep/src/com/android/quickstep/util/AnimatorControllerWithResistance.java
index a19a67c8fc..23b02d5665 100644
--- a/quickstep/src/com/android/quickstep/util/AnimatorControllerWithResistance.java
+++ b/quickstep/src/com/android/quickstep/util/AnimatorControllerWithResistance.java
@@ -18,8 +18,6 @@ package com.android.quickstep.util;
 import static com.android.launcher3.anim.Interpolators.DEACCEL;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
-import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
-import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION;
 
 import android.animation.TimeInterpolator;
 import android.content.Context;
@@ -29,16 +27,12 @@ import android.graphics.Rect;
 import android.graphics.RectF;
 import android.util.FloatProperty;
 
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.quickstep.LauncherActivityInterface;
 import com.android.quickstep.SysUINavigationMode;
-import com.android.quickstep.views.RecentsView;
 
 /**
  * Controls an animation that can go beyond progress = 1, at which point resistance should be
@@ -54,32 +48,15 @@ public class AnimatorControllerWithResistance {
      */
     public static final float TWO_BUTTON_EXTRA_DRAG_FACTOR = 0.25f;
 
-    private enum RecentsParams {
-        FROM_APP(0.75f, 0.5f, 1f),
-        FROM_OVERVIEW(1f, 0.75f, 0.5f);
-
-        RecentsParams(float scaleStartResist, float scaleMaxResist, float translationFactor) {
-            this.scaleStartResist = scaleStartResist;
-            this.scaleMaxResist = scaleMaxResist;
-            this.translationFactor = translationFactor;
-        }
+    /**
+     * Start slowing down the rate of scaling down when recents view is smaller than this scale.
+     */
+    private static final float RECENTS_SCALE_START_RESIST = 0.75f;
 
-        /**
-         * Start slowing down the rate of scaling down when recents view is smaller than this scale.
-         */
-        public final float scaleStartResist;
-
-        /**
-         * Recents view will reach this scale at the very end of the drag.
-         */
-        public final float scaleMaxResist;
-
-        /**
-         * How much translation to apply to RecentsView when the drag reaches the top of the screen,
-         * where 0 will keep it centered and 1 will have it barely touch the top of the screen.
-         */
-        public final float translationFactor;
-    }
+    /**
+     * Recents view will reach this scale at the very end of the drag.
+     */
+    private static final float RECENTS_SCALE_MAX_RESIST = 0.5f;
 
     private static final TimeInterpolator RECENTS_SCALE_RESIST_INTERPOLATOR = DEACCEL;
     private static final TimeInterpolator RECENTS_TRANSLATE_RESIST_INTERPOLATOR = LINEAR;
@@ -138,24 +115,6 @@ public class AnimatorControllerWithResistance {
             RecentsOrientedState recentsOrientedState, DeviceProfile dp, SCALE scaleTarget,
             FloatProperty<SCALE> scaleProperty, TRANSLATION translationTarget,
             FloatProperty<TRANSLATION> translationProperty) {
-
-        PendingAnimation resistAnim = createRecentsResistanceAnim(null, context,
-                recentsOrientedState, dp, scaleTarget, scaleProperty, translationTarget,
-                translationProperty, RecentsParams.FROM_APP);
-
-        AnimatorPlaybackController resistanceController = resistAnim.createPlaybackController();
-        return new AnimatorControllerWithResistance(normalController, resistanceController);
-    }
-
-    /**
-     * Creates the resistance animation for {@link #createForRecents}, or can be used separately
-     * when starting from recents, i.e. {@link #createRecentsResistanceFromOverviewAnim}.
-     */
-    public static <SCALE, TRANSLATION> PendingAnimation createRecentsResistanceAnim(
-            @Nullable PendingAnimation resistAnim, Context context,
-            RecentsOrientedState recentsOrientedState, DeviceProfile dp, SCALE scaleTarget,
-            FloatProperty<SCALE> scaleProperty, TRANSLATION translationTarget,
-            FloatProperty<TRANSLATION> translationProperty, RecentsParams params) {
         Rect startRect = new Rect();
         LauncherActivityInterface.INSTANCE.calculateTaskSize(context, dp, startRect,
                 recentsOrientedState.getOrientationHandler());
@@ -166,9 +125,7 @@ public class AnimatorControllerWithResistance {
             distanceToCover = (long)
                     ((dp.heightPx - startRect.bottom) * TWO_BUTTON_EXTRA_DRAG_FACTOR);
         }
-        if (resistAnim == null) {
-            resistAnim = new PendingAnimation(distanceToCover * 2);
-        }
+        PendingAnimation resistAnim = new PendingAnimation(distanceToCover * 2);
 
         PointF pivot = new PointF();
         float fullscreenScale = recentsOrientedState.getFullScreenScaleAndPivot(
@@ -184,9 +141,9 @@ public class AnimatorControllerWithResistance {
         } else {
             // Create an interpolator that resists the scale so the scale doesn't get smaller than
             // RECENTS_SCALE_MAX_RESIST.
-            float startResist = Utilities.getProgress(params.scaleStartResist , startScale,
+            float startResist = Utilities.getProgress(RECENTS_SCALE_START_RESIST, startScale,
                     endScale);
-            float maxResist = Utilities.getProgress(params.scaleMaxResist, startScale, endScale);
+            float maxResist = Utilities.getProgress(RECENTS_SCALE_MAX_RESIST, startScale, endScale);
             scaleInterpolator = t -> {
                 if (t < startResist) {
                     return t;
@@ -203,28 +160,17 @@ public class AnimatorControllerWithResistance {
             // Compute where the task view would be based on the end scale, if we didn't translate.
             RectF endRectF = new RectF(startRect);
             Matrix temp = new Matrix();
-            temp.setScale(params.scaleMaxResist, params.scaleMaxResist, pivot.x, pivot.y);
+            temp.setScale(RECENTS_SCALE_MAX_RESIST, RECENTS_SCALE_MAX_RESIST, pivot.x, pivot.y);
             temp.mapRect(endRectF);
             // Translate such that the task view touches the top of the screen when drag does.
             float endTranslation = endRectF.top * recentsOrientedState.getOrientationHandler()
-                    .getSecondaryTranslationDirectionFactor() * params.translationFactor;
+                    .getSecondaryTranslationDirectionFactor();
             resistAnim.addFloat(translationTarget, translationProperty, 0, endTranslation,
                     RECENTS_TRANSLATE_RESIST_INTERPOLATOR);
         }
 
-        return resistAnim;
+        AnimatorPlaybackController resistanceController = resistAnim.createPlaybackController();
+        return new AnimatorControllerWithResistance(normalController, resistanceController);
     }
 
-    /**
-     * Helper method to update or create a PendingAnimation suitable for animating
-     * a RecentsView interaction that started from the overview state.
-     */
-    public static PendingAnimation createRecentsResistanceFromOverviewAnim(
-            BaseDraggingActivity activity, @Nullable PendingAnimation resistanceAnim) {
-        RecentsView recentsView = activity.getOverviewPanel();
-        return createRecentsResistanceAnim(resistanceAnim, activity,
-                recentsView.getPagedViewOrientedState(), activity.getDeviceProfile(),
-                recentsView, RECENTS_SCALE_PROPERTY, recentsView, TASK_SECONDARY_TRANSLATION,
-                RecentsParams.FROM_OVERVIEW);
-    }
 }
diff --git a/src/com/android/launcher3/statemanager/StateManager.java b/src/com/android/launcher3/statemanager/StateManager.java
index d93c6e6a99..6ff1254245 100644
--- a/src/com/android/launcher3/statemanager/StateManager.java
+++ b/src/com/android/launcher3/statemanager/StateManager.java
@@ -28,9 +28,6 @@ import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
 
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
@@ -40,7 +37,6 @@ import com.android.launcher3.testing.TestProtocol;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
-import java.util.function.Consumer;
 
 /**
  * Class to manage transitions between different states for a StatefulActivity based on different
@@ -266,23 +262,9 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
      */
     public AnimatorSet createAtomicAnimation(
             STATE_TYPE fromState, STATE_TYPE toState, StateAnimationConfig config) {
-        return createAtomicAnimation(fromState, toState, config, null);
-    }
-
-    /**
-     * @see #createAtomicAnimation(BaseState, BaseState, StateAnimationConfig)
-     * @param overrideConfig Optional callback to override some config params that were populated
-     *                       by {{@link #prepareForAtomicAnimation}} before creating the animation.
-     */
-    public AnimatorSet createAtomicAnimation(STATE_TYPE fromState, STATE_TYPE toState,
-            StateAnimationConfig config, @Nullable Consumer<StateAnimationConfig> overrideConfig) {
         PendingAnimation builder = new PendingAnimation(config.duration);
         prepareForAtomicAnimation(fromState, toState, config);
 
-        if (overrideConfig != null) {
-            overrideConfig.accept(config);
-        }
-
         for (StateHandler handler : mActivity.getStateManager().getStateHandlers()) {
             handler.setStateWithAnimation(toState, config, builder);
         }
diff --git a/src/com/android/launcher3/states/StateAnimationConfig.java b/src/com/android/launcher3/states/StateAnimationConfig.java
index 4e8b30ca27..f90ad3cd0b 100644
--- a/src/com/android/launcher3/states/StateAnimationConfig.java
+++ b/src/com/android/launcher3/states/StateAnimationConfig.java
@@ -71,7 +71,6 @@ public class StateAnimationConfig {
             ANIM_ALL_APPS_HEADER_FADE,
             ANIM_OVERVIEW_MODAL,
             ANIM_DEPTH,
-            ANIM_OVERVIEW_ACTIONS_FADE,
     })
     @Retention(RetentionPolicy.SOURCE)
     public @interface AnimType {}
@@ -90,9 +89,8 @@ public class StateAnimationConfig {
     public static final int ANIM_ALL_APPS_HEADER_FADE = 12; // e.g. predictions
     public static final int ANIM_OVERVIEW_MODAL = 13;
     public static final int ANIM_DEPTH = 14;
-    public static final int ANIM_OVERVIEW_ACTIONS_FADE = 15;
 
-    private static final int ANIM_TYPES_COUNT = 16;
+    private static final int ANIM_TYPES_COUNT = 15;
 
     private final Interpolator[] mInterpolators = new Interpolator[ANIM_TYPES_COUNT];
 
-- 
GitLab


From 90751820d9ef8f09ece7aba656dfe881e3b149dd Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 10 Aug 2020 13:11:43 -0700
Subject: [PATCH 0080/1664] Add back code missing from upstream merge

Change-Id: I7c2f08ed1b9c7462feabe1ad793af4ddc55aff1b
---
 .../src/com/android/quickstep/AbsSwipeUpHandler.java   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
index b6d44eb300..c10527bcfe 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -525,6 +525,16 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
             recentsAttachedToAppWindow = mIsShelfPeeking || mIsLikelyToStartNewTask;
         }
         mAnimationFactory.setRecentsAttachedToAppWindow(recentsAttachedToAppWindow, animate);
+
+        // Reapply window transform throughout the attach animation, as the animation affects how
+        // much the window is bound by overscroll (vs moving freely).
+        if (animate) {
+            ValueAnimator reapplyWindowTransformAnim = ValueAnimator.ofFloat(0, 1);
+            reapplyWindowTransformAnim.addUpdateListener(anim -> applyWindowTransform());
+            reapplyWindowTransformAnim.setDuration(RECENTS_ATTACH_DURATION).start();
+        } else {
+            applyWindowTransform();
+        }
     }
 
     public void setIsLikelyToStartNewTask(boolean isLikelyToStartNewTask) {
-- 
GitLab


From c830bef923200e97ad8d0ef9bf37d0c121d7e56d Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 10 Aug 2020 15:06:02 -0700
Subject: [PATCH 0081/1664] Don't reapply window transform if we are already
 running a window anim

Bug: 149934536
Change-Id: I3fa7f0b2581ca83923a42f37f52850b02c22e995
---
 .../src/com/android/quickstep/AbsSwipeUpHandler.java        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
index c10527bcfe..d2fee30ca3 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -530,7 +530,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         // much the window is bound by overscroll (vs moving freely).
         if (animate) {
             ValueAnimator reapplyWindowTransformAnim = ValueAnimator.ofFloat(0, 1);
-            reapplyWindowTransformAnim.addUpdateListener(anim -> applyWindowTransform());
+            reapplyWindowTransformAnim.addUpdateListener(anim -> {
+                if (mRunningWindowAnim == null) {
+                    applyWindowTransform();
+                }
+            });
             reapplyWindowTransformAnim.setDuration(RECENTS_ATTACH_DURATION).start();
         } else {
             applyWindowTransform();
-- 
GitLab


From b55f7591ed2fee28e1c2a4059d19d2f069185cf5 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Mon, 10 Aug 2020 15:08:36 -0700
Subject: [PATCH 0082/1664] Ensure that the task is always clipped to match the
 tile aspect ratio

Instead of trying to estimate the insets, we clip the task such it is
restricted within the task insets when possible.

Change-Id: If160115fda07dfd2e01e96d41e4b5dc43a77ac94
---
 .../quickstep/views/TaskThumbnailView.java    | 141 +++++++++++-------
 1 file changed, 86 insertions(+), 55 deletions(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java
index 7995269e75..c5f673fbae 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java
@@ -326,22 +326,14 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
         // Draw the background in all cases, except when the thumbnail data is opaque
         final boolean drawBackgroundOnly = mTask == null || mTask.isLocked || mBitmapShader == null
                 || mThumbnailData == null;
-        if (drawBackgroundOnly || mPreviewPositionHelper.mClipBottom > 0
-                || mThumbnailData.isTranslucent) {
+        if (drawBackgroundOnly || mThumbnailData.isTranslucent) {
             canvas.drawRoundRect(x, y, width, height, cornerRadius, cornerRadius, mBackgroundPaint);
             if (drawBackgroundOnly) {
                 return;
             }
         }
 
-        if (mPreviewPositionHelper.mClipBottom > 0) {
-            canvas.save();
-            canvas.clipRect(x, y, width, mPreviewPositionHelper.mClipBottom);
-            canvas.drawRoundRect(x, y, width, height, cornerRadius, cornerRadius, mPaint);
-            canvas.restore();
-        } else {
-            canvas.drawRoundRect(x, y, width, height, cornerRadius, cornerRadius, mPaint);
-        }
+        canvas.drawRoundRect(x, y, width, height, cornerRadius, cornerRadius, mPaint);
     }
 
     public TaskView getTaskView() {
@@ -379,7 +371,6 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
     }
 
     private void updateThumbnailMatrix() {
-        mPreviewPositionHelper.mClipBottom = -1;
         mPreviewPositionHelper.mIsOrientationChanged = false;
         if (mBitmapShader != null && mThumbnailData != null) {
             mPreviewRect.set(0, 0, mThumbnailData.thumbnail.getWidth(),
@@ -473,23 +464,16 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
         /**
          * Updates the matrix based on the provided parameters
          */
-        public void updateThumbnailMatrix(Rect thumbnailPosition, ThumbnailData thumbnailData,
+        public void updateThumbnailMatrix(Rect thumbnailBounds, ThumbnailData thumbnailData,
                 int canvasWidth, int canvasHeight, DeviceProfile dp, int currentRotation) {
             boolean isRotated = false;
             boolean isOrientationDifferent;
-            mClipBottom = -1;
 
             int thumbnailRotation = thumbnailData.rotation;
             int deltaRotate = getRotationDelta(currentRotation, thumbnailRotation);
-            Rect thumbnailInsets = getBoundedInsets(
-                    dp.getInsets(), thumbnailData.insets, deltaRotate);
+            RectF thumbnailClipHint = new RectF(thumbnailData.insets);
 
             float scale = thumbnailData.scale;
-            final float thumbnailWidth = thumbnailPosition.width()
-                    - (thumbnailInsets.left + thumbnailInsets.right) * scale;
-            final float thumbnailHeight = thumbnailPosition.height()
-                    - (thumbnailInsets.top + thumbnailInsets.bottom) * scale;
-
             final float thumbnailScale;
 
             // Landscape vs portrait change
@@ -497,17 +481,80 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
                     && thumbnailData.windowingMode == WINDOWING_MODE_FULLSCREEN;
             isOrientationDifferent = isOrientationChange(deltaRotate)
                     && windowingModeSupportsRotation;
-            if (canvasWidth == 0) {
+            if (canvasWidth == 0 || canvasHeight == 0 || scale == 0) {
                 // If we haven't measured , skip the thumbnail drawing and only draw the background
                 // color
                 thumbnailScale = 0f;
             } else {
                 // Rotate the screenshot if not in multi-window mode
                 isRotated = deltaRotate > 0 && windowingModeSupportsRotation;
-                // Scale the screenshot to always fit the width of the card.
-                thumbnailScale = isOrientationDifferent
-                        ? canvasWidth / thumbnailHeight
-                        : canvasWidth / thumbnailWidth;
+
+                float surfaceWidth = thumbnailBounds.width() / scale;
+                float surfaceHeight = thumbnailBounds.height() / scale;
+                float availableWidth = surfaceWidth
+                        - (thumbnailClipHint.left + thumbnailClipHint.right);
+                float availableHeight = surfaceHeight
+                        - (thumbnailClipHint.top + thumbnailClipHint.bottom);
+
+                final float targetW, targetH;
+                if (isOrientationDifferent) {
+                    targetW = canvasHeight;
+                    targetH = canvasWidth;
+                } else {
+                    targetW = canvasWidth;
+                    targetH = canvasHeight;
+                }
+                float canvasAspect = targetW / targetH;
+
+                // Update the clipHint such that
+                //   > the final clipped position has same aspect ratio as requested by canvas
+                //   > the clipped region is within the task insets if possible
+                //   > the clipped region is not scaled up when drawing. If that is not possible
+                //     while staying within the taskInsets, move outside the insets.
+                float croppedWidth = availableWidth;
+                if (croppedWidth < targetW) {
+                    croppedWidth = Math.min(targetW, surfaceWidth);
+                }
+
+                float croppedHeight = croppedWidth / canvasAspect;
+                if (croppedHeight > availableHeight) {
+                    croppedHeight = availableHeight;
+                    if (croppedHeight < targetH) {
+                        croppedHeight = Math.min(targetH, surfaceHeight);
+                    }
+                    croppedWidth = croppedHeight * canvasAspect;
+
+                    // One last check in case the task aspect radio messed up something
+                    if (croppedWidth > surfaceWidth) {
+                        croppedWidth = surfaceWidth;
+                        croppedHeight = croppedWidth / canvasAspect;
+                    }
+                }
+
+                // Update the clip hints
+                float halfExtraW = (availableWidth - croppedWidth) / 2;
+                thumbnailClipHint.left += halfExtraW;
+                thumbnailClipHint.right += halfExtraW;
+                if (thumbnailClipHint.left < 0) {
+                    thumbnailClipHint.right += thumbnailClipHint.left;
+                    thumbnailClipHint.left = 0;
+                } else if (thumbnailClipHint.right < 0) {
+                    thumbnailClipHint.left += thumbnailClipHint.right;
+                    thumbnailClipHint.right = 0;
+                }
+
+                float halfExtraH = (availableHeight - croppedHeight) / 2;
+                thumbnailClipHint.top += halfExtraH;
+                thumbnailClipHint.bottom += halfExtraH;
+                if (thumbnailClipHint.top < 0) {
+                    thumbnailClipHint.bottom += thumbnailClipHint.top;
+                    thumbnailClipHint.top = 0;
+                } else if (thumbnailClipHint.bottom < 0) {
+                    thumbnailClipHint.top += thumbnailClipHint.bottom;
+                    thumbnailClipHint.bottom = 0;
+                }
+
+                thumbnailScale = targetW / (croppedWidth * scale);
             }
 
             Rect splitScreenInsets = dp.getInsets();
@@ -517,24 +564,24 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
                     mClippedInsets.offsetTo(splitScreenInsets.left * scale,
                             splitScreenInsets.top * scale);
                 } else {
-                    mClippedInsets.offsetTo(thumbnailInsets.left * scale,
-                            thumbnailInsets.top * scale);
+                    mClippedInsets.offsetTo(thumbnailClipHint.left * scale,
+                            thumbnailClipHint.top * scale);
                 }
                 mMatrix.setTranslate(
-                        -thumbnailInsets.left * scale,
-                        -thumbnailInsets.top * scale);
+                        -thumbnailClipHint.left * scale,
+                        -thumbnailClipHint.top * scale);
             } else {
-                setThumbnailRotation(deltaRotate, thumbnailInsets, scale, thumbnailPosition);
+                setThumbnailRotation(deltaRotate, thumbnailClipHint, scale, thumbnailBounds);
             }
 
             final float widthWithInsets;
             final float heightWithInsets;
             if (isOrientationDifferent) {
-                widthWithInsets = thumbnailPosition.height() * thumbnailScale;
-                heightWithInsets = thumbnailPosition.width() * thumbnailScale;
+                widthWithInsets = thumbnailBounds.height() * thumbnailScale;
+                heightWithInsets = thumbnailBounds.width() * thumbnailScale;
             } else {
-                widthWithInsets = thumbnailPosition.width() * thumbnailScale;
-                heightWithInsets = thumbnailPosition.height() * thumbnailScale;
+                widthWithInsets = thumbnailBounds.width() * thumbnailScale;
+                heightWithInsets = thumbnailBounds.height() * thumbnailScale;
             }
             mClippedInsets.left *= thumbnailScale;
             mClippedInsets.top *= thumbnailScale;
@@ -550,25 +597,9 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
             }
 
             mMatrix.postScale(thumbnailScale, thumbnailScale);
-
-            float bitmapHeight = Math.max(0,
-                    (isOrientationDifferent ? thumbnailWidth : thumbnailHeight) * thumbnailScale);
-            if (Math.round(bitmapHeight) < canvasHeight) {
-                mClipBottom = bitmapHeight;
-            }
             mIsOrientationChanged = isOrientationDifferent;
         }
 
-        private Rect getBoundedInsets(Rect activityInsets, Rect insets, int deltaRotation) {
-            if (deltaRotation != 0) {
-                return insets;
-            }
-            return new Rect(Math.min(insets.left, activityInsets.left),
-                    Math.min(insets.top, activityInsets.top),
-                    Math.min(insets.right, activityInsets.right),
-                    Math.min(insets.bottom, activityInsets.bottom));
-        }
-
         private int getRotationDelta(int oldRotation, int newRotation) {
             int delta = newRotation - oldRotation;
             if (delta < 0) delta += 4;
@@ -584,12 +615,12 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
             return deltaRotation == Surface.ROTATION_90 || deltaRotation == Surface.ROTATION_270;
         }
 
-        private void setThumbnailRotation(int deltaRotate, Rect thumbnailInsets, float scale,
+        private void setThumbnailRotation(int deltaRotate, RectF thumbnailInsets, float scale,
                 Rect thumbnailPosition) {
-            int newLeftInset = 0;
-            int newTopInset = 0;
-            int translateX = 0;
-            int translateY = 0;
+            float newLeftInset = 0;
+            float newTopInset = 0;
+            float translateX = 0;
+            float translateY = 0;
 
             mMatrix.setRotate(90 * deltaRotate);
             switch (deltaRotate) { /* Counter-clockwise */
-- 
GitLab


From 5dd045bec67ca12a3de4b4adc88a92a0166c0f50 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Tue, 4 Aug 2020 22:22:49 -0700
Subject: [PATCH 0083/1664] Handle IME selection focus for ENABLE_DEVICE_SEARCH

Bug: 162861289
Change-Id: I15e4eae09be2aa9f89a5157fd74c95e91e64bc53
---
 .../appprediction/AppsDividerView.java        |  5 +++
 .../appprediction/PredictionRowView.java      |  8 +++-
 res/values/colors.xml                         |  3 +-
 .../allapps/AllAppsContainerView.java         | 19 +++++++-
 .../allapps/AllAppsSectionDecorator.java      | 45 ++++++++++++++-----
 .../allapps/AlphabeticalAppsList.java         | 19 ++++++++
 .../launcher3/allapps/FloatingHeaderRow.java  |  6 +++
 .../launcher3/allapps/FloatingHeaderView.java | 14 ++++++
 .../launcher3/allapps/PluginHeaderRow.java    |  5 +++
 .../search/AllAppsSearchBarController.java    | 13 ++++++
 .../keyboard/FocusIndicatorHelper.java        | 22 ++++++---
 11 files changed, 138 insertions(+), 21 deletions(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AppsDividerView.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AppsDividerView.java
index 7dc7bfcc36..b891120378 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AppsDividerView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AppsDividerView.java
@@ -310,4 +310,9 @@ public class AppsDividerView extends View implements StateListener<LauncherState
     public Class<AppsDividerView> getTypeClass() {
         return AppsDividerView.class;
     }
+
+    @Override
+    public View getFocusedChild() {
+        return null;
+    }
 }
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java
index 8a810e3aa4..d3c4c3d62d 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java
@@ -169,6 +169,7 @@ public class PredictionRowView extends LinearLayout implements
                 mDecorationHandler.extendBounds(getChildAt(i));
             }
             mDecorationHandler.onDraw(canvas);
+            mDecorationHandler.onFocusDraw(canvas, getFocusedChild());
         }
         mFocusHelper.draw(canvas);
         super.dispatchDraw(canvas);
@@ -183,7 +184,7 @@ public class PredictionRowView extends LinearLayout implements
 
     @Override
     public boolean shouldDraw() {
-        return getVisibility() != GONE;
+        return getVisibility() == VISIBLE;
     }
 
     @Override
@@ -364,4 +365,9 @@ public class PredictionRowView extends LinearLayout implements
     public Class<PredictionRowView> getTypeClass() {
         return PredictionRowView.class;
     }
+
+    @Override
+    public View getFocusedChild() {
+        return getChildAt(0);
+    }
 }
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 9a89dee956..fe9717cd7a 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -35,7 +35,8 @@
 
     <color name="icon_background">#E0E0E0</color> <!-- Gray 300 -->
 
-    <color name="all_apps_section_fill">#327d7d7d</color>
+    <color name="all_apps_section_fill">#32c0c0c0</color>
+    <color name="all_apps_section_focused_item">#40c0c0c0</color>
 
     <color name="gesture_tutorial_ripple_color">#A0C2F9</color> <!-- Light Blue -->
     <color name="gesture_tutorial_fake_task_view_color">#6DA1FF</color> <!-- Light Blue -->
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 2d711e6251..af3722a1f8 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -527,6 +527,22 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         return mViewPager == null ? getActiveRecyclerView() : mViewPager;
     }
 
+    /**
+     * Returns the ItemInfo of a view that is in focus, ready to be launched by an IME.
+     */
+    public ItemInfo getHighlightedItemInfo() {
+        View view = getFloatingHeaderView().getFocusedChild();
+        if (view != null && view.getTag() instanceof ItemInfo) {
+            return ((ItemInfo) view.getTag());
+        }
+        if (getActiveRecyclerView().getApps().getFocusedChild() != null) {
+            // TODO: when new pipelines are included, getSearchResults
+            // should be supported at recycler view level and not apps list level.
+            return getActiveRecyclerView().getApps().getFocusedChild().appInfo;
+        }
+        return null;
+    }
+
     public RecyclerViewFastScroller getScrollBar() {
         AllAppsRecyclerView rv = getActiveRecyclerView();
         return rv == null ? null : rv.getScrollbar();
@@ -658,7 +674,8 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
             applyPadding();
             setupOverlay();
             if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
-                recyclerView.addItemDecoration(new AllAppsSectionDecorator(getApps()));
+                recyclerView.addItemDecoration(new AllAppsSectionDecorator(
+                        AllAppsContainerView.this));
             }
         }
 
diff --git a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
index ac55072d58..a168c06d72 100644
--- a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
+++ b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
@@ -21,6 +21,7 @@ import android.graphics.Paint;
 import android.graphics.RectF;
 import android.view.View;
 
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.launcher3.R;
@@ -34,19 +35,19 @@ import java.util.List;
  */
 public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
 
-    private final AlphabeticalAppsList mApps;
+    private final AllAppsContainerView mAppsView;
 
-    AllAppsSectionDecorator(AlphabeticalAppsList appsList) {
-        mApps = appsList;
+    AllAppsSectionDecorator(AllAppsContainerView appsContainerView) {
+        mAppsView = appsContainerView;
     }
 
     @Override
     public void onDraw(Canvas c, RecyclerView parent, RecyclerView.State state) {
         // Iterate through views in recylerview and draw bounds around views in the same section.
         // Since views in the same section will follow each other, we can skip to a last view in
-        // a section to get the bounds of the section without having to iterate on evert item.
+        // a section to get the bounds of the section without having to iterate on every item.
         int itemCount = parent.getChildCount();
-        List<AlphabeticalAppsList.AdapterItem> adapterItems = mApps.getAdapterItems();
+        List<AlphabeticalAppsList.AdapterItem> adapterItems = mAppsView.getApps().getAdapterItems();
         SectionDecorationHandler lastDecorationHandler = null;
         int i = 0;
         while (i < itemCount) {
@@ -69,7 +70,6 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
                     i = endIndex;
                     continue;
                 }
-
             }
             i++;
         }
@@ -78,13 +78,21 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
         }
     }
 
-    private void drawDecoration(Canvas c, SectionDecorationHandler decorationHandler, View parent) {
+    private void drawDecoration(Canvas c, SectionDecorationHandler decorationHandler,
+            RecyclerView parent) {
         if (decorationHandler == null) return;
         if (decorationHandler.mIsFullWidth) {
             decorationHandler.mBounds.left = parent.getPaddingLeft();
             decorationHandler.mBounds.right = parent.getWidth() - parent.getPaddingRight();
         }
         decorationHandler.onDraw(c);
+        if (mAppsView.getFloatingHeaderView().getFocusedChild() == null
+                && mAppsView.getApps().getFocusedChild() != null) {
+            int index = mAppsView.getApps().getFocusedChildIndex();
+            if (index >= 0 && index < parent.getChildCount()) {
+                decorationHandler.onFocusDraw(c, parent.getChildAt(index));
+            }
+        }
         decorationHandler.reset();
     }
 
@@ -95,18 +103,21 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
         protected RectF mBounds = new RectF();
         private final boolean mIsFullWidth;
         private final float mRadius;
+
+        private final int mFocusColor;
         private final int mFillcolor;
-        Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        private final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
 
 
         public SectionDecorationHandler(Context context, boolean isFullWidth) {
             mIsFullWidth = isFullWidth;
             mFillcolor = context.getColor(R.color.all_apps_section_fill);
+            mFocusColor = context.getColor(R.color.all_apps_section_focused_item);
             mRadius = Themes.getDialogCornerRadius(context);
         }
 
         /**
-         * Extends current bounds to include view
+         * Extends current bounds to include the view.
          */
         public void extendBounds(View view) {
             if (mBounds.isEmpty()) {
@@ -122,7 +133,7 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
         }
 
         /**
-         * Draw bounds onto canvas
+         * Draw bounds onto canvas.
          */
         public void onDraw(Canvas canvas) {
             mPaint.setColor(mFillcolor);
@@ -130,7 +141,19 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
         }
 
         /**
-         * Reset view bounds to empty
+         * Draw the bound of the view to the canvas.
+         */
+        public void onFocusDraw(Canvas canvas, @Nullable View view) {
+            if (view == null) {
+                return;
+            }
+            mPaint.setColor(mFocusColor);
+            canvas.drawRoundRect(view.getLeft(), view.getTop(),
+                    view.getRight(), view.getBottom(), mRadius, mRadius, mPaint);
+        }
+
+        /**
+         * Reset view bounds to empty.
          */
         public void reset() {
             mBounds.setEmpty();
diff --git a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
index 9076f2a650..7379dbed9a 100644
--- a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
+++ b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
@@ -223,6 +223,25 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
         return mAdapterItems;
     }
 
+    /**
+     * Returns the child adapter item with IME launch focus.
+     */
+    public AdapterItem getFocusedChild() {
+        return mAdapterItems.get(getFocusedChildIndex());
+    }
+
+    /**
+     * Returns the index of the child with IME launch focus.
+     */
+    public int getFocusedChildIndex() {
+        for (AdapterItem item : mAdapterItems) {
+            if (item.isCountedForAccessibility()) {
+                return mAdapterItems.indexOf(item);
+            }
+        }
+        return -1;
+    }
+
     /**
      * Returns the number of rows of applications
      */
diff --git a/src/com/android/launcher3/allapps/FloatingHeaderRow.java b/src/com/android/launcher3/allapps/FloatingHeaderRow.java
index f899587bc0..e357f61dac 100644
--- a/src/com/android/launcher3/allapps/FloatingHeaderRow.java
+++ b/src/com/android/launcher3/allapps/FloatingHeaderRow.java
@@ -16,6 +16,7 @@
 package com.android.launcher3.allapps;
 
 import android.graphics.Rect;
+import android.view.View;
 import android.view.animation.Interpolator;
 
 import com.android.launcher3.DeviceProfile;
@@ -55,4 +56,9 @@ public interface FloatingHeaderRow {
     void setVerticalScroll(int scroll, boolean isScrolledOut);
 
     Class<? extends FloatingHeaderRow> getTypeClass();
+
+    /**
+     * Returns a child that has focus to be launched by the IME.
+     */
+    View getFocusedChild();
 }
diff --git a/src/com/android/launcher3/allapps/FloatingHeaderView.java b/src/com/android/launcher3/allapps/FloatingHeaderView.java
index 81e1b94acf..11d3fb995a 100644
--- a/src/com/android/launcher3/allapps/FloatingHeaderView.java
+++ b/src/com/android/launcher3/allapps/FloatingHeaderView.java
@@ -38,6 +38,7 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Insettable;
 import com.android.launcher3.R;
 import com.android.launcher3.anim.PropertySetter;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
 import com.android.systemui.plugins.AllAppsRow;
 import com.android.systemui.plugins.AllAppsRow.OnHeightUpdatedListener;
@@ -194,6 +195,19 @@ public class FloatingHeaderView extends LinearLayout implements
         onHeightUpdated();
     }
 
+    @Override
+    public View getFocusedChild() {
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
+            for (FloatingHeaderRow row : mAllRows) {
+                if (row.hasVisibleContent() && row.shouldDraw()) {
+                    return row.getFocusedChild();
+                }
+            }
+            return null;
+        }
+        return super.getFocusedChild();
+    }
+
     public void setup(AllAppsContainerView.AdapterHolder[] mAH, boolean tabsHidden) {
         for (FloatingHeaderRow row : mAllRows) {
             row.setup(this, mAllRows, tabsHidden);
diff --git a/src/com/android/launcher3/allapps/PluginHeaderRow.java b/src/com/android/launcher3/allapps/PluginHeaderRow.java
index 3089b18150..cf7142c338 100644
--- a/src/com/android/launcher3/allapps/PluginHeaderRow.java
+++ b/src/com/android/launcher3/allapps/PluginHeaderRow.java
@@ -83,4 +83,9 @@ public class PluginHeaderRow implements FloatingHeaderRow {
     public Class<PluginHeaderRow> getTypeClass() {
         return PluginHeaderRow.class;
     }
+
+    @Override
+    public View getFocusedChild() {
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
index db94e8b6e8..06faaacd8e 100644
--- a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
+++ b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
@@ -27,8 +27,11 @@ import android.widget.TextView.OnEditorActionListener;
 
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.ExtendedEditText;
+import com.android.launcher3.Launcher;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.allapps.AlphabeticalAppsList;
+import com.android.launcher3.config.FeatureFlags;
+import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.util.PackageManagerHelper;
 
 import java.util.ArrayList;
@@ -101,6 +104,16 @@ public class AllAppsSearchBarController
 
     @Override
     public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
+            if (actionId == EditorInfo.IME_ACTION_SEARCH) {
+                ItemInfo info = Launcher.getLauncher(mLauncher).getAppsView()
+                        .getHighlightedItemInfo();
+                if (info != null) {
+                    return mLauncher.startActivitySafely(v, info.getIntent(), info);
+                }
+            }
+        }
+
         // Skip if it's not the right action
         if (actionId != EditorInfo.IME_ACTION_SEARCH) {
             return false;
diff --git a/src/com/android/launcher3/keyboard/FocusIndicatorHelper.java b/src/com/android/launcher3/keyboard/FocusIndicatorHelper.java
index c50189c1c2..ae7ad106b8 100644
--- a/src/com/android/launcher3/keyboard/FocusIndicatorHelper.java
+++ b/src/com/android/launcher3/keyboard/FocusIndicatorHelper.java
@@ -32,6 +32,8 @@ import android.view.View;
 import android.view.View.OnFocusChangeListener;
 
 import com.android.launcher3.R;
+import com.android.launcher3.config.FeatureFlags;
+import com.android.launcher3.util.Themes;
 
 /**
  * A helper class to draw background of a focused view.
@@ -93,6 +95,7 @@ public abstract class FocusIndicatorHelper implements
 
     private ObjectAnimator mCurrentAnimation;
     private float mAlpha;
+    private float mRadius;
 
     public FocusIndicatorHelper(View container) {
         mContainer = container;
@@ -104,6 +107,9 @@ public abstract class FocusIndicatorHelper implements
 
         setAlpha(0);
         mShift = 0;
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
+            mRadius = Themes.getDialogCornerRadius(container.getContext());
+        }
     }
 
     protected void setAlpha(float alpha) {
@@ -129,13 +135,15 @@ public abstract class FocusIndicatorHelper implements
     }
 
     public void draw(Canvas c) {
-        if (mAlpha > 0) {
-            Rect newRect = getDrawRect();
-            if (newRect != null) {
-                mDirtyRect.set(newRect);
-                c.drawRect(mDirtyRect, mPaint);
-                mIsDirty = true;
-            }
+        if (mAlpha <= 0) return;
+
+        Rect newRect = getDrawRect();
+        if (newRect != null) {
+            mDirtyRect.set(newRect);
+            c.drawRoundRect((float) mDirtyRect.left, (float) mDirtyRect.top,
+                    (float) mDirtyRect.right, (float) mDirtyRect.bottom,
+                    mRadius, mRadius, mPaint);
+            mIsDirty = true;
         }
     }
 
-- 
GitLab


From d62e797d1834306ec394ebf64f4c84939f033d97 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 11 Aug 2020 12:10:36 -0700
Subject: [PATCH 0084/1664] Disabling debug log as the associated bug is closed

Bug: 154951045
Change-Id: I2e503c6d2f0a9f694ee1f88167924114fe495c2f
---
 .../src/com/android/quickstep/util/RecentsOrientedState.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
index 81d24d79c7..df9b0cf435 100644
--- a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
+++ b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
@@ -71,7 +71,7 @@ import java.util.function.IntConsumer;
 public final class RecentsOrientedState implements SharedPreferences.OnSharedPreferenceChangeListener {
 
     private static final String TAG = "RecentsOrientedState";
-    private static final boolean DEBUG = true;
+    private static final boolean DEBUG = false;
 
     private ContentObserver mSystemAutoRotateObserver = new ContentObserver(new Handler()) {
         @Override
-- 
GitLab


From 762d06136cc7c91afe8cdfdac5426b58c174edd8 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 29 Jul 2020 15:03:46 -0700
Subject: [PATCH 0085/1664] Caching last predictions and loading it with model

Adding support for persisting itemInfos on disk. This uses
a separate xml file. Unlike prefs, it does not keep the items
in memory and is just a wraper over reading/writing a file.

Bug: 160748731
Change-Id: Iaccab9928ab8f30127fb3c2d630ca8ca83f0bd05
---
 .../launcher3/model/PredictionUpdateTask.java |  40 ++--
 .../model/QuickstepModelDelegate.java         | 177 +++++++++++++++--
 .../launcher3/model/LoaderCursorTest.java     |   8 +-
 .../android/launcher3/AutoInstallsLayout.java |   2 +-
 .../launcher3/model/BaseLoaderResults.java    |  12 +-
 .../android/launcher3/model/BgDataModel.java  |   8 +
 .../android/launcher3/model/LoaderCursor.java |   2 +-
 .../android/launcher3/model/LoaderTask.java   |  15 +-
 .../launcher3/model/ModelDelegate.java        |   7 +-
 .../launcher3/model/data/ItemInfo.java        |   6 -
 .../model/data/LauncherAppWidgetInfo.java     |  10 -
 src/com/android/launcher3/util/IOUtils.java   |  27 +--
 .../launcher3/util/PersistedItemArray.java    | 180 ++++++++++++++++++
 13 files changed, 393 insertions(+), 101 deletions(-)
 create mode 100644 src/com/android/launcher3/util/PersistedItemArray.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/model/PredictionUpdateTask.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/model/PredictionUpdateTask.java
index 721e2bebd5..b0fba3d5ae 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/model/PredictionUpdateTask.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/model/PredictionUpdateTask.java
@@ -21,6 +21,7 @@ import static com.android.quickstep.InstantAppResolverImpl.COMPONENT_CLASS_MARKE
 
 import android.app.prediction.AppTarget;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.pm.LauncherActivityInfo;
 import android.content.pm.LauncherApps;
 import android.content.pm.ShortcutInfo;
@@ -29,6 +30,7 @@ import android.os.UserHandle;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.model.BgDataModel.FixedContainerItems;
+import com.android.launcher3.model.QuickstepModelDelegate.PredictorState;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 
@@ -43,27 +45,22 @@ import java.util.stream.Collectors;
 public class PredictionUpdateTask extends BaseModelUpdateTask {
 
     private final List<AppTarget> mTargets;
-    private final int mContainerId;
+    private final PredictorState mPredictorState;
 
-    PredictionUpdateTask(int containerId, List<AppTarget> targets) {
-        mContainerId = containerId;
+    PredictionUpdateTask(PredictorState predictorState, List<AppTarget> targets) {
+        mPredictorState = predictorState;
         mTargets = targets;
     }
 
     @Override
     public void execute(LauncherAppState app, BgDataModel dataModel, AllAppsList apps) {
-        // TODO: persist the whole list
-        Utilities.getDevicePrefs(app.getContext()).edit()
-                .putBoolean(LAST_PREDICTION_ENABLED_STATE, !mTargets.isEmpty()).apply();
+        Context context = app.getContext();
 
-        FixedContainerItems fci;
-        synchronized (dataModel) {
-            fci = dataModel.extraItems.get(mContainerId);
-            if (fci == null) {
-                return;
-            }
-        }
+        // TODO: remove this
+        Utilities.getDevicePrefs(context).edit()
+                .putBoolean(LAST_PREDICTION_ENABLED_STATE, !mTargets.isEmpty()).apply();
 
+        FixedContainerItems fci = mPredictorState.items;
         Set<UserHandle> usersForChangedShortcuts = new HashSet<>(fci.items.stream()
                 .filter(info -> info.itemType == ITEM_TYPE_DEEP_SHORTCUT)
                 .map(info -> info.user)
@@ -75,7 +72,7 @@ public class PredictionUpdateTask extends BaseModelUpdateTask {
             ShortcutInfo si = target.getShortcutInfo();
             if (si != null) {
                 usersForChangedShortcuts.add(si.getUserHandle());
-                itemInfo = new WorkspaceItemInfo(si, app.getContext());
+                itemInfo = new WorkspaceItemInfo(si, context);
                 app.getIconCache().getShortcutIcon(itemInfo, si);
             } else {
                 String className = target.getClassName();
@@ -87,16 +84,18 @@ public class PredictionUpdateTask extends BaseModelUpdateTask {
                 UserHandle user = target.getUser();
                 itemInfo = apps.data.stream()
                         .filter(info -> user.equals(info.user) && cn.equals(info.componentName))
-                        .map(AppInfo::makeWorkspaceItem)
+                        .map(ai -> {
+                            app.getIconCache().getTitleAndIcon(ai, false);
+                            return ai.makeWorkspaceItem();
+                        })
                         .findAny()
                         .orElseGet(() -> {
-                            LauncherActivityInfo lai = app.getContext()
-                                    .getSystemService(LauncherApps.class)
+                            LauncherActivityInfo lai = context.getSystemService(LauncherApps.class)
                                     .resolveActivity(AppInfo.makeLaunchIntent(cn), user);
                             if (lai == null) {
                                 return null;
                             }
-                            AppInfo ai = new AppInfo(app.getContext(), lai, user);
+                            AppInfo ai = new AppInfo(context, lai, user);
                             app.getIconCache().getTitleAndIcon(ai, lai, false);
                             return ai.makeWorkspaceItem();
                         });
@@ -106,12 +105,15 @@ public class PredictionUpdateTask extends BaseModelUpdateTask {
                 }
             }
 
-            itemInfo.container = mContainerId;
+            itemInfo.container = fci.containerId;
             fci.items.add(itemInfo);
         }
 
         bindExtraContainerItems(fci);
         usersForChangedShortcuts.forEach(
                 u -> dataModel.updateShortcutPinnedState(app.getContext(), u));
+
+        // Save to disk
+        mPredictorState.storage.write(context, fci.items);
     }
 }
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/model/QuickstepModelDelegate.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/model/QuickstepModelDelegate.java
index b5164695d5..166cb6cc4d 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/model/QuickstepModelDelegate.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/model/QuickstepModelDelegate.java
@@ -17,6 +17,8 @@ package com.android.launcher3.model;
 
 import static com.android.launcher3.InvariantDeviceProfile.CHANGE_FLAG_GRID;
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_PREDICTION;
+import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
+import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT;
 
 import android.app.prediction.AppPredictionContext;
 import android.app.prediction.AppPredictionManager;
@@ -24,16 +26,32 @@ import android.app.prediction.AppPredictor;
 import android.app.prediction.AppTarget;
 import android.app.prediction.AppTargetEvent;
 import android.content.Context;
+import android.content.Intent;
+import android.content.pm.LauncherActivityInfo;
+import android.content.pm.LauncherApps;
+import android.content.pm.ShortcutInfo;
+import android.os.UserHandle;
 
+import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
 
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile.OnIDPChangeListener;
+import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.model.BgDataModel.FixedContainerItems;
+import com.android.launcher3.model.data.AppInfo;
+import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.launcher3.shortcuts.ShortcutKey;
 import com.android.launcher3.util.Executors;
+import com.android.launcher3.util.PersistedItemArray;
 import com.android.quickstep.logging.StatsLogCompatManager;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.IntStream;
 
 /**
  * Model delegate which loads prediction items
@@ -42,10 +60,12 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
 
     public static final String LAST_PREDICTION_ENABLED_STATE = "last_prediction_enabled_state";
 
+    private final PredictorState mAllAppsState =
+            new PredictorState(CONTAINER_PREDICTION, "all_apps_predictions");
+
     private final InvariantDeviceProfile mIDP;
     private final AppEventProducer mAppEventProducer;
 
-    private AppPredictor mAllAppsPredictor;
     private boolean mActive = false;
 
     public QuickstepModelDelegate(Context context) {
@@ -57,11 +77,15 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
     }
 
     @Override
-    public void loadItems() {
+    public void loadItems(UserManagerState ums, Map<ShortcutKey, ShortcutInfo> pinnedShortcuts) {
         // TODO: Implement caching and preloading
-        super.loadItems();
-        mDataModel.extraItems.put(
-                CONTAINER_PREDICTION, new FixedContainerItems(CONTAINER_PREDICTION));
+        super.loadItems(ums, pinnedShortcuts);
+
+        WorkspaceItemFactory factory =
+                new WorkspaceItemFactory(mApp, ums, pinnedShortcuts, mIDP.numAllAppsColumns);
+        mAllAppsState.items.setItems(
+                mAllAppsState.storage.read(mApp.getContext(), factory, ums.allUsers::get));
+        mDataModel.extraItems.put(CONTAINER_PREDICTION, mAllAppsState.items);
 
         mActive = true;
         recreatePredictors();
@@ -70,8 +94,8 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
     @Override
     public void validateData() {
         super.validateData();
-        if (mAllAppsPredictor != null) {
-            mAllAppsPredictor.requestPredictionUpdate();
+        if (mAllAppsState.predictor != null) {
+            mAllAppsState.predictor.requestPredictionUpdate();
         }
     }
 
@@ -86,10 +110,7 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
     }
 
     private void destroyPredictors() {
-        if (mAllAppsPredictor != null) {
-            mAllAppsPredictor.destroy();
-            mAllAppsPredictor = null;
-        }
+        mAllAppsState.destroyPredictor();
     }
 
     @WorkerThread
@@ -98,7 +119,6 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
         if (!mActive) {
             return;
         }
-
         Context context = mApp.getContext();
         AppPredictionManager apm = context.getSystemService(AppPredictionManager.class);
         if (apm == null) {
@@ -107,19 +127,23 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
 
         int count = mIDP.numAllAppsColumns;
 
-        mAllAppsPredictor = apm.createAppPredictionSession(
+        mAllAppsState.predictor = apm.createAppPredictionSession(
                 new AppPredictionContext.Builder(context)
                         .setUiSurface("home")
                         .setPredictedTargetCount(count)
                         .build());
-        mAllAppsPredictor.registerPredictionUpdates(
-                Executors.MODEL_EXECUTOR, this::onAllAppsPredictionChanged);
-        mAllAppsPredictor.requestPredictionUpdate();
+        mAllAppsState.predictor.registerPredictionUpdates(
+                Executors.MODEL_EXECUTOR, t -> handleUpdate(mAllAppsState, t));
+        mAllAppsState.predictor.requestPredictionUpdate();
     }
 
-    private void onAllAppsPredictionChanged(List<AppTarget> targets) {
-        mApp.getModel().enqueueModelUpdateTask(
-                new PredictionUpdateTask(CONTAINER_PREDICTION, targets));
+
+    private void handleUpdate(PredictorState state, List<AppTarget> targets) {
+        if (state.setTargets(targets)) {
+            // No diff, skip
+            return;
+        }
+        mApp.getModel().enqueueModelUpdateTask(new PredictionUpdateTask(state, targets));
     }
 
     @Override
@@ -131,8 +155,119 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
     }
 
     private void onAppTargetEvent(AppTargetEvent event) {
-        if (mAllAppsPredictor != null) {
-            mAllAppsPredictor.notifyAppTargetEvent(event);
+        if (mAllAppsState.predictor != null) {
+            mAllAppsState.predictor.notifyAppTargetEvent(event);
+        }
+    }
+
+    static class PredictorState {
+
+        public final FixedContainerItems items;
+        public final PersistedItemArray storage;
+        public AppPredictor predictor;
+
+        private List<AppTarget> mLastTargets;
+
+        PredictorState(int container, String storageName) {
+            items = new FixedContainerItems(container);
+            storage = new PersistedItemArray(storageName);
+            mLastTargets = Collections.emptyList();
+        }
+
+        public void destroyPredictor() {
+            if (predictor != null) {
+                predictor.destroy();
+                predictor = null;
+            }
+        }
+
+        /**
+         * Sets the new targets and returns true if it was different than before.
+         */
+        boolean setTargets(List<AppTarget> newTargets) {
+            List<AppTarget> oldTargets = mLastTargets;
+            mLastTargets = newTargets;
+
+            int size = oldTargets.size();
+            return size == newTargets.size() && IntStream.range(0, size)
+                    .allMatch(i -> areAppTargetsSame(oldTargets.get(i), newTargets.get(i)));
+        }
+    }
+
+    /**
+     * Compares two targets for the properties which we care about
+     */
+    private static boolean areAppTargetsSame(AppTarget t1, AppTarget t2) {
+        if (!Objects.equals(t1.getPackageName(), t2.getPackageName())
+                || !Objects.equals(t1.getUser(), t2.getUser())
+                || !Objects.equals(t1.getClassName(), t2.getClassName())) {
+            return false;
+        }
+
+        ShortcutInfo s1 = t1.getShortcutInfo();
+        ShortcutInfo s2 = t2.getShortcutInfo();
+        if (s1 != null) {
+            if (s2 == null || !Objects.equals(s1.getId(), s2.getId())) {
+                return false;
+            }
+        } else if (s2 != null) {
+            return false;
+        }
+        return true;
+    }
+
+    private static class WorkspaceItemFactory implements PersistedItemArray.ItemFactory {
+
+        private final LauncherAppState mAppState;
+        private final UserManagerState mUMS;
+        private final Map<ShortcutKey, ShortcutInfo> mPinnedShortcuts;
+        private final int mMaxCount;
+
+        private int mReadCount = 0;
+
+        protected WorkspaceItemFactory(LauncherAppState appState, UserManagerState ums,
+                Map<ShortcutKey, ShortcutInfo> pinnedShortcuts, int maxCount) {
+            mAppState = appState;
+            mUMS = ums;
+            mPinnedShortcuts = pinnedShortcuts;
+            mMaxCount = maxCount;
+        }
+
+        @Nullable
+        @Override
+        public ItemInfo createInfo(int itemType, UserHandle user, Intent intent) {
+            if (mReadCount >= mMaxCount) {
+                return null;
+            }
+            switch (itemType) {
+                case ITEM_TYPE_APPLICATION: {
+                    LauncherActivityInfo lai = mAppState.getContext()
+                            .getSystemService(LauncherApps.class)
+                            .resolveActivity(intent, user);
+                    if (lai == null) {
+                        return null;
+                    }
+                    AppInfo info = new AppInfo(lai, user, mUMS.isUserQuiet(user));
+                    mAppState.getIconCache().getTitleAndIcon(info, lai, false);
+                    mReadCount++;
+                    return info.makeWorkspaceItem();
+                }
+                case ITEM_TYPE_DEEP_SHORTCUT: {
+                    ShortcutKey key = ShortcutKey.fromIntent(intent, user);
+                    if (key == null) {
+                        return null;
+                    }
+                    ShortcutInfo si = mPinnedShortcuts.get(key);
+                    if (si == null) {
+                        return null;
+                    }
+                    WorkspaceItemInfo wii = new WorkspaceItemInfo(si, mAppState.getContext());
+                    mAppState.getIconCache().getShortcutIcon(wii, si);
+                    mReadCount++;
+                    return wii;
+                }
+            }
+            return null;
         }
     }
 }
diff --git a/robolectric_tests/src/com/android/launcher3/model/LoaderCursorTest.java b/robolectric_tests/src/com/android/launcher3/model/LoaderCursorTest.java
index 0e760f97db..fb08c56a40 100644
--- a/robolectric_tests/src/com/android/launcher3/model/LoaderCursorTest.java
+++ b/robolectric_tests/src/com/android/launcher3/model/LoaderCursorTest.java
@@ -51,7 +51,7 @@ import android.os.Process;
 
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.LauncherSettings;
+import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.util.Executors;
@@ -92,9 +92,9 @@ public class LoaderCursorTest {
                 SCREEN, CELLX, CELLY, RESTORED, INTENT
         });
 
-        mLoaderCursor = new LoaderCursor(mCursor, LauncherSettings.Favorites.CONTENT_URI, mApp,
-                new UserManagerState());
-        mLoaderCursor.allUsers.put(0, Process.myUserHandle());
+        UserManagerState ums = new UserManagerState();
+        mLoaderCursor = new LoaderCursor(mCursor, Favorites.CONTENT_URI, mApp, ums);
+        ums.allUsers.put(0, Process.myUserHandle());
     }
 
     private void initCursor(int itemType, String title) {
diff --git a/src/com/android/launcher3/AutoInstallsLayout.java b/src/com/android/launcher3/AutoInstallsLayout.java
index 432073ebaf..f61bc055e2 100644
--- a/src/com/android/launcher3/AutoInstallsLayout.java
+++ b/src/com/android/launcher3/AutoInstallsLayout.java
@@ -658,7 +658,7 @@ public class AutoInstallsLayout {
         }
     }
 
-    protected static void beginDocument(XmlPullParser parser, String firstElementName)
+    public static void beginDocument(XmlPullParser parser, String firstElementName)
             throws XmlPullParserException, IOException {
         int type;
         while ((type = parser.next()) != XmlPullParser.START_TAG
diff --git a/src/com/android/launcher3/model/BaseLoaderResults.java b/src/com/android/launcher3/model/BaseLoaderResults.java
index 8b0ef7b97f..586333fd2e 100644
--- a/src/com/android/launcher3/model/BaseLoaderResults.java
+++ b/src/com/android/launcher3/model/BaseLoaderResults.java
@@ -27,6 +27,7 @@ import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherModel.CallbackTask;
 import com.android.launcher3.PagedView;
 import com.android.launcher3.model.BgDataModel.Callbacks;
+import com.android.launcher3.model.BgDataModel.FixedContainerItems;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
@@ -76,18 +77,20 @@ public abstract class BaseLoaderResults {
         ArrayList<ItemInfo> workspaceItems = new ArrayList<>();
         ArrayList<LauncherAppWidgetInfo> appWidgets = new ArrayList<>();
         final IntArray orderedScreenIds = new IntArray();
+        ArrayList<FixedContainerItems> extraItems = new ArrayList<>();
 
         synchronized (mBgDataModel) {
             workspaceItems.addAll(mBgDataModel.workspaceItems);
             appWidgets.addAll(mBgDataModel.appWidgets);
             orderedScreenIds.addAll(mBgDataModel.collectWorkspaceScreens());
+            mBgDataModel.extraItems.forEach(extraItems::add);
             mBgDataModel.lastBindId++;
             mMyBindingId = mBgDataModel.lastBindId;
         }
 
         for (Callbacks cb : mCallbacksList) {
             new WorkspaceBinder(cb, mUiExecutor, mApp, mBgDataModel, mMyBindingId,
-                    workspaceItems, appWidgets, orderedScreenIds).bind();
+                    workspaceItems, appWidgets, extraItems, orderedScreenIds).bind();
         }
     }
 
@@ -135,7 +138,7 @@ public abstract class BaseLoaderResults {
         private final ArrayList<ItemInfo> mWorkspaceItems;
         private final ArrayList<LauncherAppWidgetInfo> mAppWidgets;
         private final IntArray mOrderedScreenIds;
-
+        private final ArrayList<FixedContainerItems> mExtraItems;
 
         WorkspaceBinder(Callbacks callbacks,
                 Executor uiExecutor,
@@ -144,6 +147,7 @@ public abstract class BaseLoaderResults {
                 int myBindingId,
                 ArrayList<ItemInfo> workspaceItems,
                 ArrayList<LauncherAppWidgetInfo> appWidgets,
+                ArrayList<FixedContainerItems> extraItems,
                 IntArray orderedScreenIds) {
             mCallbacks = callbacks;
             mUiExecutor = uiExecutor;
@@ -152,6 +156,7 @@ public abstract class BaseLoaderResults {
             mMyBindingId = myBindingId;
             mWorkspaceItems = workspaceItems;
             mAppWidgets = appWidgets;
+            mExtraItems = extraItems;
             mOrderedScreenIds = orderedScreenIds;
         }
 
@@ -198,6 +203,8 @@ public abstract class BaseLoaderResults {
             // Load items on the current page.
             bindWorkspaceItems(currentWorkspaceItems, mainExecutor);
             bindAppWidgets(currentAppWidgets, mainExecutor);
+            mExtraItems.forEach(item ->
+                    executeCallbacksTask(c -> c.bindExtraContainerItems(item), mainExecutor));
 
             // Locate available spots for prediction using currentWorkspaceItems
             IntArray gaps = getMissingHotseatRanks(currentWorkspaceItems, idp.numHotseatIcons);
@@ -207,6 +214,7 @@ public abstract class BaseLoaderResults {
             // happens later).
             // This ensures that the first screen is immediately visible (eg. during rotation)
             // In case of !validFirstPage, bind all pages one after other.
+
             final Executor deferredExecutor =
                     validFirstPage ? new ViewOnDrawExecutor() : mainExecutor;
 
diff --git a/src/com/android/launcher3/model/BgDataModel.java b/src/com/android/launcher3/model/BgDataModel.java
index fd8520dcdf..140342f98c 100644
--- a/src/com/android/launcher3/model/BgDataModel.java
+++ b/src/com/android/launcher3/model/BgDataModel.java
@@ -424,6 +424,14 @@ public class BgDataModel {
         public FixedContainerItems clone() {
             return new FixedContainerItems(containerId, new ArrayList<>(items));
         }
+
+        public void setItems(List<ItemInfo> newItems) {
+            items.clear();
+            newItems.forEach(item -> {
+                item.container = containerId;
+                items.add(item);
+            });
+        }
     }
 
 
diff --git a/src/com/android/launcher3/model/LoaderCursor.java b/src/com/android/launcher3/model/LoaderCursor.java
index 165d1eab6b..a27ac2391d 100644
--- a/src/com/android/launcher3/model/LoaderCursor.java
+++ b/src/com/android/launcher3/model/LoaderCursor.java
@@ -65,7 +65,7 @@ public class LoaderCursor extends CursorWrapper {
 
     private static final String TAG = "LoaderCursor";
 
-    public final LongSparseArray<UserHandle> allUsers;
+    private final LongSparseArray<UserHandle> allUsers;
 
     private final Uri mContentUri;
     private final Context mContext;
diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index e89031e61d..1dd8c112c6 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -360,15 +360,12 @@ public class LoaderTask implements Runnable {
                 final int optionsIndex = c.getColumnIndexOrThrow(
                         LauncherSettings.Favorites.OPTIONS);
 
-                final LongSparseArray<UserHandle> allUsers = c.allUsers;
                 final LongSparseArray<Boolean> unlockedUsers = new LongSparseArray<>();
 
                 mUserManagerState.init(mUserCache, mUserManager);
 
                 for (UserHandle user : mUserCache.getUserProfiles()) {
                     long serialNo = mUserCache.getSerialNumberForUser(user);
-                    allUsers.put(serialNo, user);
-
                     boolean userUnlocked = mUserManager.isUserUnlocked(user);
 
                     // We can only query for shortcuts when the user is unlocked.
@@ -419,16 +416,6 @@ public class LoaderTask implements Runnable {
                             ComponentName cn = intent.getComponent();
                             targetPkg = cn == null ? intent.getPackage() : cn.getPackageName();
 
-                            if (allUsers.indexOfValue(c.user) < 0) {
-                                if (c.itemType == LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT) {
-                                    c.markDeleted("Legacy shortcuts are only allowed for current users");
-                                    continue;
-                                } else if (c.restoreFlag != 0) {
-                                    // Don't restore items for other profiles.
-                                    c.markDeleted("Restore from other profiles not supported");
-                                    continue;
-                                }
-                            }
                             if (TextUtils.isEmpty(targetPkg) &&
                                     c.itemType != LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT) {
                                 c.markDeleted("Only legacy shortcuts can have null package");
@@ -773,7 +760,7 @@ public class LoaderTask implements Runnable {
             }
 
             // Load delegate items
-            mModelDelegate.loadItems();
+            mModelDelegate.loadItems(mUserManagerState, shortcutKeyToPinnedShortcuts);
 
             // Break early if we've stopped loading
             if (mStopped) {
diff --git a/src/com/android/launcher3/model/ModelDelegate.java b/src/com/android/launcher3/model/ModelDelegate.java
index ce4eed5bbd..53e8a86078 100644
--- a/src/com/android/launcher3/model/ModelDelegate.java
+++ b/src/com/android/launcher3/model/ModelDelegate.java
@@ -18,13 +18,17 @@ package com.android.launcher3.model;
 import static com.android.launcher3.util.PackageManagerHelper.hasShortcutsPermission;
 
 import android.content.Context;
+import android.content.pm.ShortcutInfo;
 
 import androidx.annotation.WorkerThread;
 
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
+import com.android.launcher3.shortcuts.ShortcutKey;
 import com.android.launcher3.util.ResourceBasedOverride;
 
+import java.util.Map;
+
 /**
  * Class to extend LauncherModel functionality to provide extra data
  */
@@ -65,11 +69,12 @@ public class ModelDelegate implements ResourceBasedOverride {
      * Load delegate items if any in the data model
      */
     @WorkerThread
-    public void loadItems() { }
+    public void loadItems(UserManagerState ums, Map<ShortcutKey, ShortcutInfo> pinnedShortcuts) { }
 
     /**
      * Called when the delegate is no loner needed
      */
     @WorkerThread
     public void destroy() { }
+
 }
diff --git a/src/com/android/launcher3/model/data/ItemInfo.java b/src/com/android/launcher3/model/data/ItemInfo.java
index 59233cd4d8..e03fd72449 100644
--- a/src/com/android/launcher3/model/data/ItemInfo.java
+++ b/src/com/android/launcher3/model/data/ItemInfo.java
@@ -257,12 +257,6 @@ public class ItemInfo {
         return container == CONTAINER_HOTSEAT_PREDICTION || container == CONTAINER_PREDICTION;
     }
 
-    /**
-     * Can be overridden by inherited classes to fill in {@link LauncherAtom.ItemInfo}
-     */
-    public void setItemBuilder(LauncherAtom.ItemInfo.Builder builder) {
-    }
-
     /**
      * Creates {@link LauncherAtom.ItemInfo} with important fields and parent container info.
      */
diff --git a/src/com/android/launcher3/model/data/LauncherAppWidgetInfo.java b/src/com/android/launcher3/model/data/LauncherAppWidgetInfo.java
index b0d19a609a..c04b7f0ffa 100644
--- a/src/com/android/launcher3/model/data/LauncherAppWidgetInfo.java
+++ b/src/com/android/launcher3/model/data/LauncherAppWidgetInfo.java
@@ -26,7 +26,6 @@ import androidx.annotation.Nullable;
 import com.android.launcher3.AppWidgetResizeFrame;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherSettings;
-import com.android.launcher3.logger.LauncherAtom;
 import com.android.launcher3.util.ContentWriter;
 
 /**
@@ -195,13 +194,4 @@ public class LauncherAppWidgetInfo extends ItemInfo {
     public final boolean hasOptionFlag(int option) {
         return (options & option) != 0;
     }
-
-    @Override
-    public void setItemBuilder(LauncherAtom.ItemInfo.Builder builder) {
-        builder.setWidget(LauncherAtom.Widget.newBuilder()
-                .setSpanX(spanX)
-                .setSpanY(spanY)
-                .setComponentName(providerName.toString())
-                .setPackageName(providerName.getPackageName()));
-    }
 }
diff --git a/src/com/android/launcher3/util/IOUtils.java b/src/com/android/launcher3/util/IOUtils.java
index fcb96d7db5..1cec0ecc10 100644
--- a/src/com/android/launcher3/util/IOUtils.java
+++ b/src/com/android/launcher3/util/IOUtils.java
@@ -16,20 +16,19 @@
 
 package com.android.launcher3.util;
 
-import android.content.Context;
+import android.os.FileUtils;
 import android.util.Log;
 
+import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
 
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.UUID;
 
 /**
  * Supports various IO utility functions
@@ -52,6 +51,9 @@ public class IOUtils {
     }
 
     public static long copy(InputStream from, OutputStream to) throws IOException {
+        if (Utilities.ATLEAST_Q) {
+            return FileUtils.copy(from, to);
+        }
         byte[] buf = new byte[BUF_SIZE];
         long total = 0;
         int r;
@@ -62,25 +64,6 @@ public class IOUtils {
         return total;
     }
 
-    /**
-     * Utility method to debug binary data
-     */
-    public static String createTempFile(Context context, byte[] data) {
-        if (!FeatureFlags.IS_STUDIO_BUILD) {
-            throw new IllegalStateException("Method only allowed in development mode");
-        }
-
-        String name = UUID.randomUUID().toString();
-        File file = new File(context.getCacheDir(), name);
-        try (FileOutputStream fo = new FileOutputStream(file)) {
-            fo.write(data);
-            fo.flush();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        return file.getAbsolutePath();
-    }
-
     public static void closeSilently(Closeable c) {
         if (c != null) {
             try {
diff --git a/src/com/android/launcher3/util/PersistedItemArray.java b/src/com/android/launcher3/util/PersistedItemArray.java
new file mode 100644
index 0000000000..ae20638e31
--- /dev/null
+++ b/src/com/android/launcher3/util/PersistedItemArray.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.util;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.UserHandle;
+import android.util.AtomicFile;
+import android.util.Log;
+import android.util.Xml;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
+
+import com.android.launcher3.AutoInstallsLayout;
+import com.android.launcher3.LauncherSettings.Favorites;
+import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.pm.UserCache;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+import org.xmlpull.v1.XmlSerializer;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.LongFunction;
+
+/**
+ * Utility class to read/write a list of {@link com.android.launcher3.model.data.ItemInfo} on disk.
+ * This class is not thread safe, the caller should ensure proper threading
+ */
+public class PersistedItemArray<T extends ItemInfo> {
+
+    private static final String TAG = "PersistedItemArray";
+
+    private static final String TAG_ROOT = "items";
+    private static final String TAG_ENTRY = "entry";
+
+    private final String mFileName;
+
+    public PersistedItemArray(String fileName) {
+        mFileName = fileName + ".xml";
+    }
+
+    /**
+     * Writes the provided list of items on the disk
+     */
+    @WorkerThread
+    public void write(Context context, List<T> items) {
+        AtomicFile file = new AtomicFile(context.getFileStreamPath(mFileName));
+
+        FileOutputStream fos;
+        try {
+            fos = file.startWrite();
+        } catch (IOException e) {
+            Log.e(TAG, "Unable to persist items in " + mFileName, e);
+            return;
+        }
+
+        UserCache userCache = UserCache.INSTANCE.get(context);
+
+        try {
+            XmlSerializer out = Xml.newSerializer();
+            out.setOutput(fos, StandardCharsets.UTF_8.name());
+            out.startDocument(null, true);
+            out.startTag(null, TAG_ROOT);
+            for (T item : items) {
+                Intent intent = item.getIntent();
+                if (intent == null) {
+                    continue;
+                }
+
+                out.startTag(null, TAG_ENTRY);
+                out.attribute(null, Favorites.ITEM_TYPE, Integer.toString(item.itemType));
+                out.attribute(null, Favorites.PROFILE_ID,
+                        Long.toString(userCache.getSerialNumberForUser(item.user)));
+                out.attribute(null, Favorites.INTENT, intent.toUri(0));
+                out.endTag(null, TAG_ENTRY);
+            }
+            out.endTag(null, TAG_ROOT);
+            out.endDocument();
+        } catch (IOException e) {
+            file.failWrite(fos);
+            Log.e(TAG, "Unable to persist items in " + mFileName, e);
+            return;
+        }
+
+        file.finishWrite(fos);
+    }
+
+    /**
+     * Reads the items from the disk
+     */
+    @WorkerThread
+    public List<T> read(Context context, ItemFactory<T> factory) {
+        return read(context, factory, UserCache.INSTANCE.get(context)::getUserForSerialNumber);
+    }
+
+    /**
+     * Reads the items from the disk
+     * @param userFn method to provide user handle for a given user serial
+     */
+    @WorkerThread
+    public List<T> read(Context context, ItemFactory<T> factory, LongFunction<UserHandle> userFn) {
+        List<T> result = new ArrayList<>();
+        AtomicFile file = new AtomicFile(context.getFileStreamPath(mFileName));
+
+        try (FileInputStream fis = file.openRead()) {
+            XmlPullParser parser = Xml.newPullParser();
+            parser.setInput(new InputStreamReader(fis, StandardCharsets.UTF_8));
+
+            AutoInstallsLayout.beginDocument(parser, TAG_ROOT);
+            final int depth = parser.getDepth();
+
+            int type;
+            while (((type = parser.next()) != XmlPullParser.END_TAG
+                    || parser.getDepth() > depth) && type != XmlPullParser.END_DOCUMENT) {
+                if (type != XmlPullParser.START_TAG || !TAG_ENTRY.equals(parser.getName())) {
+                    continue;
+                }
+                try {
+                    int itemType = Integer.parseInt(
+                            parser.getAttributeValue(null, Favorites.ITEM_TYPE));
+                    UserHandle user = userFn.apply(Long.parseLong(
+                            parser.getAttributeValue(null, Favorites.PROFILE_ID)));
+                    Intent intent = Intent.parseUri(
+                            parser.getAttributeValue(null, Favorites.INTENT), 0);
+
+                    if (user != null && intent != null) {
+                        T item = factory.createInfo(itemType, user, intent);
+                        if (item != null) {
+                            result.add(item);
+                        }
+                    }
+                } catch (Exception e) {
+                    // Ignore this entry
+                }
+            }
+        } catch (FileNotFoundException e) {
+            // Ignore
+        } catch (IOException | XmlPullParserException e) {
+            Log.e(TAG, "Unable to read items in " + mFileName, e);
+            return Collections.emptyList();
+        }
+        return result;
+    }
+
+    /**
+     * Interface to create an ItemInfo during parsing
+     */
+    public interface ItemFactory<T extends ItemInfo> {
+
+        /**
+         * Returns an item info or null in which case the entry is ignored
+         */
+        @Nullable
+        T createInfo(int itemType, UserHandle user, Intent intent);
+    }
+}
-- 
GitLab


From 53116c6cc84236ac49064efa9988f92b5b558599 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 7 Aug 2020 16:32:18 -0700
Subject: [PATCH 0086/1664]  Simplifying InstallShortcutReceiver

> Removing support for legacy shortcuts (with embedded icon)
> Unifying pattern for storing the data in prefs

Change-Id: Ife250807c7ce5337969d25444ee23c751bc2a487
---
 .../launcher3/InstallShortcutReceiver.java    | 526 +++++-------------
 src/com/android/launcher3/Launcher.java       |   3 +-
 .../launcher3/SessionCommitReceiver.java      |  17 +-
 src/com/android/launcher3/Utilities.java      |   9 +
 .../android/launcher3/icons/IconCache.java    |  10 +-
 .../android/launcher3/model/ModelUtils.java   |  62 +++
 .../launcher3/pm/InstallSessionHelper.java    |  18 +-
 7 files changed, 203 insertions(+), 442 deletions(-)

diff --git a/src/com/android/launcher3/InstallShortcutReceiver.java b/src/com/android/launcher3/InstallShortcutReceiver.java
index be6adc751f..d2b05c5b01 100644
--- a/src/com/android/launcher3/InstallShortcutReceiver.java
+++ b/src/com/android/launcher3/InstallShortcutReceiver.java
@@ -16,6 +16,13 @@
 
 package com.android.launcher3;
 
+import static android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID;
+
+import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
+import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET;
+import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT;
+import static com.android.launcher3.LauncherSettings.Favorites.PROFILE_ID;
+import static com.android.launcher3.model.data.AppInfo.makeLaunchIntent;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
 import android.appwidget.AppWidgetManager;
@@ -24,37 +31,25 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.content.pm.ActivityInfo;
 import android.content.pm.LauncherActivityInfo;
 import android.content.pm.LauncherApps;
-import android.content.pm.PackageManager;
 import android.content.pm.ShortcutInfo;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.os.Parcelable;
 import android.os.Process;
 import android.os.UserHandle;
-import android.text.TextUtils;
-import android.util.Base64;
 import android.util.Log;
 import android.util.Pair;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
 
-import com.android.launcher3.icons.BitmapInfo;
-import com.android.launcher3.icons.GraphicsUtils;
-import com.android.launcher3.icons.LauncherIcons;
-import com.android.launcher3.model.data.AppInfo;
+import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pm.UserCache;
 import com.android.launcher3.shortcuts.ShortcutKey;
 import com.android.launcher3.shortcuts.ShortcutRequest;
-import com.android.launcher3.util.PackageManagerHelper;
 import com.android.launcher3.util.Preconditions;
-import com.android.launcher3.util.Thunk;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -81,17 +76,6 @@ public class InstallShortcutReceiver {
     private static final String TAG = "InstallShortcutReceiver";
     private static final boolean DBG = false;
 
-    private static final String LAUNCH_INTENT_KEY = "intent.launch";
-    private static final String NAME_KEY = "name";
-    private static final String ICON_KEY = "icon";
-    private static final String ICON_RESOURCE_NAME_KEY = "iconResource";
-    private static final String ICON_RESOURCE_PACKAGE_NAME_KEY = "iconResourcePackage";
-
-    private static final String APP_SHORTCUT_TYPE_KEY = "isAppShortcut";
-    private static final String DEEPSHORTCUT_TYPE_KEY = "isDeepShortcut";
-    private static final String APP_WIDGET_TYPE_KEY = "isAppWidget";
-    private static final String USER_HANDLE_KEY = "userHandle";
-
     // The set of shortcuts that are pending install
     private static final String APPS_PENDING_INSTALL = "apps_to_install";
 
@@ -100,7 +84,7 @@ public class InstallShortcutReceiver {
 
     @WorkerThread
     private static void addToQueue(Context context, PendingInstallShortcutInfo info) {
-        String encoded = info.encodeToString();
+        String encoded = info.encodeToString(context);
         SharedPreferences prefs = Utilities.getPrefs(context);
         Set<String> strings = prefs.getStringSet(APPS_PENDING_INSTALL, null);
         strings = (strings != null) ? new HashSet<>(strings) : new HashSet<>(1);
@@ -123,25 +107,14 @@ public class InstallShortcutReceiver {
             return;
         }
 
-        LauncherApps launcherApps = context.getSystemService(LauncherApps.class);
         for (String encoded : strings) {
             PendingInstallShortcutInfo info = decode(encoded, context);
             if (info == null) {
                 continue;
             }
 
-            String pkg = getIntentPackage(info.launchIntent);
-            if (!TextUtils.isEmpty(pkg)
-                    && !launcherApps.isPackageEnabled(pkg, info.user)
-                    && !info.isActivity) {
-                if (DBG) {
-                    Log.d(TAG, "Ignoring shortcut for absent package: " + info.launchIntent);
-                }
-                continue;
-            }
-
             // Generate a shortcut info to add into the model
-            installQueue.add(info.getItemInfo());
+            installQueue.add(info.getItemInfo(context));
         }
         prefs.edit().remove(APPS_PENDING_INSTALL).apply();
         if (!installQueue.isEmpty()) {
@@ -172,8 +145,8 @@ public class InstallShortcutReceiver {
             String encoded = newStringsIter.next();
             try {
                 Decoder decoder = new Decoder(encoded, context);
-                if (packageNames.contains(getIntentPackage(decoder.launcherIntent)) &&
-                        user.equals(decoder.user)) {
+                if (packageNames.contains(getIntentPackage(decoder.intent))
+                        && user.equals(decoder.user)) {
                     newStringsIter.remove();
                 }
             } catch (JSONException | URISyntaxException e) {
@@ -184,57 +157,17 @@ public class InstallShortcutReceiver {
         sp.edit().putStringSet(APPS_PENDING_INSTALL, newStrings).apply();
     }
 
-    /**
-     * @return true is the extra is either null or is of type {@param type}
-     */
-    private static boolean isValidExtraType(Intent intent, String key, Class type) {
-        Object extra = intent.getParcelableExtra(key);
-        return extra == null || type.isInstance(extra);
-    }
-
-    /**
-     * Verifies the intent and creates a {@link PendingInstallShortcutInfo}
-     */
-    private static PendingInstallShortcutInfo createPendingInfo(Context context, Intent data) {
-        if (!isValidExtraType(data, Intent.EXTRA_SHORTCUT_INTENT, Intent.class) ||
-                !(isValidExtraType(data, Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
-                        Intent.ShortcutIconResource.class)) ||
-                !(isValidExtraType(data, Intent.EXTRA_SHORTCUT_ICON, Bitmap.class))) {
-
-            if (DBG) Log.e(TAG, "Invalid install shortcut intent");
-            return null;
-        }
-
-        PendingInstallShortcutInfo info = new PendingInstallShortcutInfo(
-                data, Process.myUserHandle(), context);
-        if (info.launchIntent == null || info.label == null) {
-            if (DBG) Log.e(TAG, "Invalid install shortcut intent");
-            return null;
-        }
-
-        return convertToLauncherActivityIfPossible(info);
-    }
-
-    public static WorkspaceItemInfo fromShortcutIntent(Context context, Intent data) {
-        PendingInstallShortcutInfo info = createPendingInfo(context, data);
-        return info == null ? null : (WorkspaceItemInfo) info.getItemInfo().first;
-    }
-
     public static void queueShortcut(ShortcutInfo info, Context context) {
-        queuePendingShortcutInfo(new PendingInstallShortcutInfo(info, context), context);
+        queuePendingShortcutInfo(new PendingInstallShortcutInfo(info), context);
     }
 
     public static void queueWidget(AppWidgetProviderInfo info, int widgetId, Context context) {
-        queuePendingShortcutInfo(new PendingInstallShortcutInfo(info, widgetId, context), context);
-    }
-
-    public static void queueApplication(LauncherActivityInfo info, Context context) {
-        queuePendingShortcutInfo(new PendingInstallShortcutInfo(info, context), context);
+        queuePendingShortcutInfo(new PendingInstallShortcutInfo(info, widgetId), context);
     }
 
-    public static void queueApplication(Intent data, UserHandle user, Context context) {
-        queuePendingShortcutInfo(new PendingInstallShortcutInfo(data, context, user),
-                context);
+    public static void queueApplication(
+            String packageName, UserHandle userHandle, Context context) {
+        queuePendingShortcutInfo(new PendingInstallShortcutInfo(packageName, userHandle), context);
     }
 
     public static HashSet<ShortcutKey> getPendingShortcuts(Context context) {
@@ -248,8 +181,8 @@ public class InstallShortcutReceiver {
         for (String encoded : strings) {
             try {
                 Decoder decoder = new Decoder(encoded, context);
-                if (decoder.optBoolean(DEEPSHORTCUT_TYPE_KEY)) {
-                    result.add(ShortcutKey.fromIntent(decoder.launcherIntent, decoder.user));
+                if (decoder.optInt(Favorites.ITEM_TYPE, -1) == ITEM_TYPE_DEEP_SHORTCUT) {
+                    result.add(ShortcutKey.fromIntent(decoder.intent, decoder.user));
                 }
             } catch (JSONException | URISyntaxException e) {
                 Log.d(TAG, "Exception reading shortcut to add: " + e);
@@ -279,224 +212,111 @@ public class InstallShortcutReceiver {
         MODEL_EXECUTOR.post(() -> flushQueueInBackground(context));
     }
 
-    /**
-     * Ensures that we have a valid, non-null name.  If the provided name is null, we will return
-     * the application name instead.
-     */
-    @Thunk static CharSequence ensureValidName(Context context, Intent intent, CharSequence name) {
-        if (name == null) {
-            try {
-                PackageManager pm = context.getPackageManager();
-                ActivityInfo info = pm.getActivityInfo(intent.getComponent(), 0);
-                name = info.loadLabel(pm);
-            } catch (PackageManager.NameNotFoundException nnfe) {
-                return "";
-            }
-        }
-        return name;
-    }
 
-    private static class PendingInstallShortcutInfo {
+    private static class PendingInstallShortcutInfo extends ItemInfo {
 
-        final boolean isActivity;
-        @Nullable final ShortcutInfo shortcutInfo;
-        @Nullable final AppWidgetProviderInfo providerInfo;
+        final Intent intent;
 
-        @Nullable final Intent data;
-        final Context mContext;
-        final Intent launchIntent;
-        final String label;
-        final UserHandle user;
+        @Nullable ShortcutInfo shortcutInfo;
+        @Nullable AppWidgetProviderInfo providerInfo;
 
         /**
-         * Initializes a PendingInstallShortcutInfo received from a different app.
+         * Initializes a PendingInstallShortcutInfo to represent a pending launcher target.
          */
-        public PendingInstallShortcutInfo(Intent data, UserHandle user, Context context) {
-            isActivity = false;
-            shortcutInfo = null;
-            providerInfo = null;
-
-            this.data = data;
-            this.user = user;
-            mContext = context;
-
-            launchIntent = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_INTENT);
-            label = data.getStringExtra(Intent.EXTRA_SHORTCUT_NAME);
+        public PendingInstallShortcutInfo(String packageName, UserHandle userHandle) {
+            itemType = Favorites.ITEM_TYPE_APPLICATION;
+            intent = new Intent().setPackage(packageName);
+            user = userHandle;
         }
 
         /**
-         * Initializes a PendingInstallShortcutInfo to represent a launcher target.
+         * Initializes a PendingInstallShortcutInfo to represent a deep shortcut.
          */
-        public PendingInstallShortcutInfo(LauncherActivityInfo info, Context context) {
-            isActivity = true;
-            shortcutInfo = null;
-            providerInfo = null;
-
-            String packageName = info.getComponentName().getPackageName();
-            data = new Intent();
-            data.putExtra(Intent.EXTRA_SHORTCUT_INTENT, new Intent().setComponent(
-                    new ComponentName(packageName, "")).setPackage(packageName));
-            data.putExtra(Intent.EXTRA_SHORTCUT_NAME, info.getLabel());
-
-            user = info.getUser();
-            mContext = context;
-
-            launchIntent = AppInfo.makeLaunchIntent(info);
-            label = info.getLabel().toString();
-        }
-
-        /**
-         * Initializes a PendingInstallShortcutInfo to represent a launcher target.
-         */
-        public PendingInstallShortcutInfo(Intent data, Context context, UserHandle user) {
-            isActivity = true;
-            shortcutInfo = null;
-            providerInfo = null;
-
-            this.data = data;
-            this.user = user;
-            mContext = context;
-
-            launchIntent = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_INTENT);
-            label = data.getStringExtra(Intent.EXTRA_SHORTCUT_NAME);
-        }
-
-        /**
-         * Initializes a PendingInstallShortcutInfo to represent a launcher target.
-         */
-        public PendingInstallShortcutInfo(ShortcutInfo info, Context context) {
-            isActivity = false;
-            shortcutInfo = info;
-            providerInfo = null;
-
-            data = null;
-            mContext = context;
+        public PendingInstallShortcutInfo(ShortcutInfo info) {
+            itemType = Favorites.ITEM_TYPE_DEEP_SHORTCUT;
+            intent = ShortcutKey.makeIntent(info);
             user = info.getUserHandle();
 
-            launchIntent = ShortcutKey.makeIntent(info);
-            label = info.getShortLabel().toString();
+            shortcutInfo = info;
         }
 
         /**
-         * Initializes a PendingInstallShortcutInfo to represent a launcher target.
+         * Initializes a PendingInstallShortcutInfo to represent an app widget.
          */
-        public PendingInstallShortcutInfo(
-                AppWidgetProviderInfo info, int widgetId, Context context) {
-            isActivity = false;
-            shortcutInfo = null;
-            providerInfo = info;
-
-            data = null;
-            mContext = context;
+        public PendingInstallShortcutInfo(AppWidgetProviderInfo info, int widgetId) {
+            itemType = Favorites.ITEM_TYPE_APPWIDGET;
+            intent = new Intent()
+                    .setComponent(info.provider)
+                    .putExtra(EXTRA_APPWIDGET_ID, widgetId);
             user = info.getProfile();
 
-            launchIntent = new Intent().setComponent(info.provider)
-                    .putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId);
-            label = info.label;
+            providerInfo = info;
         }
 
-        public String encodeToString() {
+        public String encodeToString(Context context) {
             try {
-                if (shortcutInfo != null) {
-                    // If it a launcher target, we only need component name, and user to
-                    // recreate this.
-                    return new JSONStringer()
-                            .object()
-                            .key(LAUNCH_INTENT_KEY).value(launchIntent.toUri(0))
-                            .key(DEEPSHORTCUT_TYPE_KEY).value(true)
-                            .key(USER_HANDLE_KEY).value(UserCache.INSTANCE.get(mContext)
-                                    .getSerialNumberForUser(user))
-                            .endObject().toString();
-                } else if (providerInfo != null) {
-                    // If it a launcher target, we only need component name, and user to
-                    // recreate this.
-                    return new JSONStringer()
-                            .object()
-                            .key(LAUNCH_INTENT_KEY).value(launchIntent.toUri(0))
-                            .key(APP_WIDGET_TYPE_KEY).value(true)
-                            .key(USER_HANDLE_KEY).value(UserCache.INSTANCE.get(mContext)
-                                    .getSerialNumberForUser(user))
-                            .endObject().toString();
-                }
-
-                if (launchIntent.getAction() == null) {
-                    launchIntent.setAction(Intent.ACTION_VIEW);
-                } else if (launchIntent.getAction().equals(Intent.ACTION_MAIN) &&
-                        launchIntent.getCategories() != null &&
-                        launchIntent.getCategories().contains(Intent.CATEGORY_LAUNCHER)) {
-                    launchIntent.addFlags(
-                            Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
-                }
-
-                // This name is only used for comparisons and notifications, so fall back to activity
-                // name if not supplied
-                String name = ensureValidName(mContext, launchIntent, label).toString();
-                Bitmap icon = data == null ? null
-                        : data.getParcelableExtra(Intent.EXTRA_SHORTCUT_ICON);
-                Intent.ShortcutIconResource iconResource = data == null ? null
-                    : data.getParcelableExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE);
-
-                // Only encode the parameters which are supported by the API.
-                JSONStringer json = new JSONStringer()
-                    .object()
-                    .key(LAUNCH_INTENT_KEY).value(launchIntent.toUri(0))
-                    .key(NAME_KEY).value(name)
-                    .key(USER_HANDLE_KEY).value(
-                            UserCache.INSTANCE.get(mContext).getSerialNumberForUser(user))
-                    .key(APP_SHORTCUT_TYPE_KEY).value(isActivity);
-                if (icon != null) {
-                    byte[] iconByteArray = GraphicsUtils.flattenBitmap(icon);
-                    if (iconByteArray != null) {
-                        json = json.key(ICON_KEY).value(
-                                Base64.encodeToString(
-                                        iconByteArray, 0, iconByteArray.length, Base64.DEFAULT));
-                    }
-                }
-                if (iconResource != null) {
-                    json = json.key(ICON_RESOURCE_NAME_KEY).value(iconResource.resourceName);
-                    json = json.key(ICON_RESOURCE_PACKAGE_NAME_KEY)
-                            .value(iconResource.packageName);
-                }
-                return json.endObject().toString();
+                return new JSONStringer()
+                        .object()
+                        .key(Favorites.ITEM_TYPE).value(itemType)
+                        .key(Favorites.INTENT).value(intent.toUri(0))
+                        .key(PROFILE_ID).value(
+                                UserCache.INSTANCE.get(context).getSerialNumberForUser(user))
+                        .endObject().toString();
             } catch (JSONException e) {
                 Log.d(TAG, "Exception when adding shortcut: " + e);
                 return null;
             }
         }
 
-        public Pair<ItemInfo, Object> getItemInfo() {
-            if (isActivity) {
-                WorkspaceItemInfo si = createWorkspaceItemInfo(data, user,
-                        LauncherAppState.getInstance(mContext));
-                si.itemType = LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
-                si.status |= WorkspaceItemInfo.FLAG_AUTOINSTALL_ICON;
-                return Pair.create(si, null);
-            } else if (shortcutInfo != null) {
-                WorkspaceItemInfo itemInfo = new WorkspaceItemInfo(shortcutInfo, mContext);
-                LauncherAppState.getInstance(mContext).getIconCache().getShortcutIcon(
-                        itemInfo, shortcutInfo);
-                return Pair.create(itemInfo, shortcutInfo);
-            } else if (providerInfo != null) {
-                LauncherAppWidgetProviderInfo info = LauncherAppWidgetProviderInfo
-                        .fromProviderInfo(mContext, providerInfo);
-                LauncherAppWidgetInfo widgetInfo = new LauncherAppWidgetInfo(
-                        launchIntent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, 0),
-                        info.provider);
-                InvariantDeviceProfile idp = LauncherAppState.getIDP(mContext);
-                widgetInfo.minSpanX = info.minSpanX;
-                widgetInfo.minSpanY = info.minSpanY;
-                widgetInfo.spanX = Math.min(info.spanX, idp.numColumns);
-                widgetInfo.spanY = Math.min(info.spanY, idp.numRows);
-                return Pair.create(widgetInfo, providerInfo);
-            } else {
-                WorkspaceItemInfo itemInfo =
-                        createWorkspaceItemInfo(data, user, LauncherAppState.getInstance(mContext));
-                return Pair.create(itemInfo, null);
+        public Pair<ItemInfo, Object> getItemInfo(Context context) {
+            switch (itemType) {
+                case ITEM_TYPE_APPLICATION: {
+                    String packageName = intent.getPackage();
+                    List<LauncherActivityInfo> laiList =
+                            context.getSystemService(LauncherApps.class)
+                                    .getActivityList(packageName, user);
+
+                    final WorkspaceItemInfo si = new WorkspaceItemInfo();
+                    si.user = user;
+                    si.itemType = ITEM_TYPE_APPLICATION;
+
+                    LauncherActivityInfo lai;
+                    boolean usePackageIcon = laiList.isEmpty();
+                    if (usePackageIcon) {
+                        lai = null;
+                        si.intent = makeLaunchIntent(new ComponentName(packageName, ""))
+                                .setPackage(packageName);
+                        si.status |= WorkspaceItemInfo.FLAG_AUTOINSTALL_ICON;
+                    } else {
+                        lai = laiList.get(0);
+                        si.intent = makeLaunchIntent(lai);
+                    }
+                    LauncherAppState.getInstance(context).getIconCache()
+                            .getTitleAndIcon(si, () -> lai, usePackageIcon, false);
+                    return Pair.create(si, null);
+                }
+                case ITEM_TYPE_DEEP_SHORTCUT: {
+                    WorkspaceItemInfo itemInfo = new WorkspaceItemInfo(shortcutInfo, context);
+                    LauncherAppState.getInstance(context).getIconCache()
+                            .getShortcutIcon(itemInfo, shortcutInfo);
+                    return Pair.create(itemInfo, shortcutInfo);
+                }
+                case ITEM_TYPE_APPWIDGET: {
+                    LauncherAppWidgetProviderInfo info = LauncherAppWidgetProviderInfo
+                            .fromProviderInfo(context, providerInfo);
+                    LauncherAppWidgetInfo widgetInfo = new LauncherAppWidgetInfo(
+                            intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, 0),
+                            info.provider);
+                    InvariantDeviceProfile idp = LauncherAppState.getIDP(context);
+                    widgetInfo.minSpanX = info.minSpanX;
+                    widgetInfo.minSpanY = info.minSpanY;
+                    widgetInfo.spanX = Math.min(info.spanX, idp.numColumns);
+                    widgetInfo.spanY = Math.min(info.spanY, idp.numRows);
+                    widgetInfo.user = user;
+                    return Pair.create(widgetInfo, providerInfo);
+                }
             }
-        }
-
-        public boolean isLauncherActivity() {
-            return isActivity;
+            return null;
         }
     }
 
@@ -508,56 +328,32 @@ public class InstallShortcutReceiver {
     private static PendingInstallShortcutInfo decode(String encoded, Context context) {
         try {
             Decoder decoder = new Decoder(encoded, context);
-            if (decoder.optBoolean(APP_SHORTCUT_TYPE_KEY)) {
-                LauncherActivityInfo info = context.getSystemService(LauncherApps.class)
-                        .resolveActivity(decoder.launcherIntent, decoder.user);
-                if (info != null) {
-                    return new PendingInstallShortcutInfo(info, context);
-                }
-            } else if (decoder.optBoolean(DEEPSHORTCUT_TYPE_KEY)) {
-                List<ShortcutInfo> si = ShortcutKey.fromIntent(decoder.launcherIntent, decoder.user)
-                        .buildRequest(context)
-                        .query(ShortcutRequest.ALL);
-                if (si.isEmpty()) {
-                    return null;
-                } else {
-                    return new PendingInstallShortcutInfo(si.get(0), context);
+            switch (decoder.optInt(Favorites.ITEM_TYPE, -1)) {
+                case Favorites.ITEM_TYPE_APPLICATION:
+                    return new PendingInstallShortcutInfo(
+                            decoder.intent.getPackage(), decoder.user);
+                case Favorites.ITEM_TYPE_DEEP_SHORTCUT: {
+                    List<ShortcutInfo> si = ShortcutKey.fromIntent(decoder.intent, decoder.user)
+                            .buildRequest(context)
+                            .query(ShortcutRequest.ALL);
+                    if (si.isEmpty()) {
+                        return null;
+                    } else {
+                        return new PendingInstallShortcutInfo(si.get(0));
+                    }
                 }
-            } else if (decoder.optBoolean(APP_WIDGET_TYPE_KEY)) {
-                int widgetId = decoder.launcherIntent
-                        .getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, 0);
-                AppWidgetProviderInfo info = AppWidgetManager.getInstance(context)
-                        .getAppWidgetInfo(widgetId);
-                if (info == null || !info.provider.equals(decoder.launcherIntent.getComponent()) ||
-                        !info.getProfile().equals(decoder.user)) {
-                    return null;
+                case Favorites.ITEM_TYPE_APPWIDGET: {
+                    int widgetId = decoder.intent.getIntExtra(EXTRA_APPWIDGET_ID, 0);
+                    AppWidgetProviderInfo info =
+                            AppWidgetManager.getInstance(context).getAppWidgetInfo(widgetId);
+                    if (info == null || !info.provider.equals(decoder.intent.getComponent())
+                            || !info.getProfile().equals(decoder.user)) {
+                        return null;
+                    }
+                    return new PendingInstallShortcutInfo(info, widgetId);
                 }
-                return new PendingInstallShortcutInfo(info, widgetId, context);
-            }
-
-            Intent data = new Intent();
-            data.putExtra(Intent.EXTRA_SHORTCUT_INTENT, decoder.launcherIntent);
-            data.putExtra(Intent.EXTRA_SHORTCUT_NAME, decoder.getString(NAME_KEY));
-
-            String iconBase64 = decoder.optString(ICON_KEY);
-            String iconResourceName = decoder.optString(ICON_RESOURCE_NAME_KEY);
-            String iconResourcePackageName = decoder.optString(ICON_RESOURCE_PACKAGE_NAME_KEY);
-            if (iconBase64 != null && !iconBase64.isEmpty()) {
-                byte[] iconArray = Base64.decode(iconBase64, Base64.DEFAULT);
-                Bitmap b = BitmapFactory.decodeByteArray(iconArray, 0, iconArray.length);
-                data.putExtra(Intent.EXTRA_SHORTCUT_ICON, b);
-            } else if (iconResourceName != null && !iconResourceName.isEmpty()) {
-                Intent.ShortcutIconResource iconResource =
-                    new Intent.ShortcutIconResource();
-                iconResource.resourceName = iconResourceName;
-                iconResource.packageName = iconResourcePackageName;
-                data.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, iconResource);
-            }
-
-            if (decoder.optBoolean(APP_SHORTCUT_TYPE_KEY)) {
-                return new PendingInstallShortcutInfo(data, context, decoder.user);
-            } else {
-                return new PendingInstallShortcutInfo(data, decoder.user, context);
+                default:
+                    Log.e(TAG, "Unknown item type");
             }
         } catch (JSONException | URISyntaxException e) {
             Log.d(TAG, "Exception reading shortcut to add: " + e);
@@ -566,88 +362,18 @@ public class InstallShortcutReceiver {
     }
 
     private static class Decoder extends JSONObject {
-        public final Intent launcherIntent;
+        public final Intent intent;
         public final UserHandle user;
 
         private Decoder(String encoded, Context context) throws JSONException, URISyntaxException {
             super(encoded);
-            launcherIntent = Intent.parseUri(getString(LAUNCH_INTENT_KEY), 0);
-            user = has(USER_HANDLE_KEY) ? UserCache.INSTANCE.get(context)
-                    .getUserForSerialNumber(getLong(USER_HANDLE_KEY))
+            intent = Intent.parseUri(getString(Favorites.INTENT), 0);
+            user = has(PROFILE_ID)
+                    ? UserCache.INSTANCE.get(context).getUserForSerialNumber(getLong(PROFILE_ID))
                     : Process.myUserHandle();
-            if (user == null) {
-                throw new JSONException("Invalid user");
+            if (user == null || intent == null) {
+                throw new JSONException("Invalid data");
             }
         }
     }
-
-    /**
-     * Tries to create a new PendingInstallShortcutInfo which represents the same target,
-     * but is an app target and not a shortcut.
-     * @return the newly created info or the original one.
-     */
-    private static PendingInstallShortcutInfo convertToLauncherActivityIfPossible(
-            PendingInstallShortcutInfo original) {
-        if (original.isLauncherActivity()) {
-            // Already an activity target
-            return original;
-        }
-        if (!PackageManagerHelper.isLauncherAppTarget(original.launchIntent)) {
-            return original;
-        }
-
-        LauncherActivityInfo info = original.mContext.getSystemService(LauncherApps.class)
-                .resolveActivity(original.launchIntent, original.user);
-        if (info == null) {
-            return original;
-        }
-        // Ignore any conflicts in the label name, as that can change based on locale.
-        return new PendingInstallShortcutInfo(info, original.mContext);
-    }
-
-    private static WorkspaceItemInfo createWorkspaceItemInfo(Intent data, UserHandle user,
-            LauncherAppState app) {
-        if (data == null) {
-            Log.e(TAG, "Can't construct WorkspaceItemInfo with null data");
-            return null;
-        }
-
-        Intent intent = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_INTENT);
-        String name = data.getStringExtra(Intent.EXTRA_SHORTCUT_NAME);
-        Parcelable bitmap = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_ICON);
-
-        if (intent == null) {
-            // If the intent is null, return null as we can't construct a valid WorkspaceItemInfo
-            Log.e(TAG, "Can't construct WorkspaceItemInfo with null intent");
-            return null;
-        }
-
-        final WorkspaceItemInfo info = new WorkspaceItemInfo();
-        info.user = user;
-
-        BitmapInfo iconInfo = null;
-        LauncherIcons li = LauncherIcons.obtain(app.getContext());
-        if (bitmap instanceof Bitmap) {
-            iconInfo = li.createIconBitmap((Bitmap) bitmap);
-        } else {
-            Parcelable extra = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE);
-            if (extra instanceof Intent.ShortcutIconResource) {
-                info.iconResource = (Intent.ShortcutIconResource) extra;
-                iconInfo = li.createIconBitmap(info.iconResource);
-            }
-        }
-        li.recycle();
-
-        if (iconInfo == null) {
-            iconInfo = app.getIconCache().getDefaultIcon(info.user);
-        }
-        info.bitmap = iconInfo;
-
-        info.title = Utilities.trim(name);
-        info.contentDescription = app.getContext().getPackageManager()
-                .getUserBadgedLabel(info.title, info.user);
-        info.intent = intent;
-        return info;
-    }
-
 }
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index e723408088..3f64df3702 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -120,6 +120,7 @@ import com.android.launcher3.logging.FileLog;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.logging.UserEventDispatcher;
 import com.android.launcher3.model.BgDataModel.Callbacks;
+import com.android.launcher3.model.ModelUtils;
 import com.android.launcher3.model.ModelWriter;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.FolderInfo;
@@ -1202,7 +1203,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         if (info == null) {
             // Legacy shortcuts are only supported for primary profile.
             info = Process.myUserHandle().equals(args.user)
-                    ? InstallShortcutReceiver.fromShortcutIntent(this, data) : null;
+                    ? ModelUtils.fromLegacyShortcutIntent(this, data) : null;
 
             if (info == null) {
                 Log.e(TAG, "Unable to parse a valid custom shortcut result");
diff --git a/src/com/android/launcher3/SessionCommitReceiver.java b/src/com/android/launcher3/SessionCommitReceiver.java
index a8d6490a5b..e48ffb95ea 100644
--- a/src/com/android/launcher3/SessionCommitReceiver.java
+++ b/src/com/android/launcher3/SessionCommitReceiver.java
@@ -19,8 +19,6 @@ package com.android.launcher3;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.LauncherActivityInfo;
-import android.content.pm.LauncherApps;
 import android.content.pm.PackageInstaller;
 import android.content.pm.PackageInstaller.SessionInfo;
 import android.content.pm.PackageManager;
@@ -29,8 +27,6 @@ import android.text.TextUtils;
 
 import com.android.launcher3.pm.InstallSessionHelper;
 
-import java.util.List;
-
 /**
  * BroadcastReceiver to handle session commit intent.
  */
@@ -63,18 +59,7 @@ public class SessionCommitReceiver extends BroadcastReceiver {
             return;
         }
 
-        queueAppIconAddition(context, info.getAppPackageName(), user);
-    }
-
-    public static void queueAppIconAddition(Context context, String packageName, UserHandle user) {
-        List<LauncherActivityInfo> activities = context.getSystemService(LauncherApps.class)
-                .getActivityList(packageName, user);
-        if (activities.isEmpty()) {
-            // no activity found
-            return;
-        }
-
-        InstallShortcutReceiver.queueApplication(activities.get(0), context);
+        InstallShortcutReceiver.queueApplication(info.getAppPackageName(), user, context);
     }
 
     public static boolean isEnabled(Context context) {
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 068d0bc6ac..dea2a8dfd2 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -25,6 +25,7 @@ import android.app.WallpaperManager;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.LauncherActivityInfo;
 import android.content.pm.LauncherApps;
@@ -639,6 +640,14 @@ public final class Utilities {
         }
     }
 
+    /**
+     * @return true is the extra is either null or is of type {@param type}
+     */
+    public static boolean isValidExtraType(Intent intent, String key, Class type) {
+        Object extra = intent.getParcelableExtra(key);
+        return extra == null || type.isInstance(extra);
+    }
+
     public static float squaredHypot(float x, float y) {
         return x * x + y * y;
     }
diff --git a/src/com/android/launcher3/icons/IconCache.java b/src/com/android/launcher3/icons/IconCache.java
index ff0f773468..444c2dab81 100644
--- a/src/com/android/launcher3/icons/IconCache.java
+++ b/src/com/android/launcher3/icons/IconCache.java
@@ -259,14 +259,6 @@ public class IconCache extends BaseIconCache {
         }
     }
 
-    /**
-     * Fill in info with the icon and label for deep shortcut.
-     */
-    public synchronized CacheEntry getDeepShortcutTitleAndIcon(ShortcutInfo info) {
-        return cacheLocked(ShortcutKey.fromInfo(info).componentName, info.getUserHandle(),
-                () -> info, mShortcutCachingLogic, false, false);
-    }
-
     /**
      * Fill in {@param info} with the icon and label. If the
      * corresponding activity is not found, it reverts to the package icon.
@@ -295,7 +287,7 @@ public class IconCache extends BaseIconCache {
     /**
      * Fill in {@param mWorkspaceItemInfo} with the icon and label for {@param info}
      */
-    private synchronized void getTitleAndIcon(
+    public synchronized void getTitleAndIcon(
             @NonNull ItemInfoWithIcon infoInOut,
             @NonNull Supplier<LauncherActivityInfo> activityInfoProvider,
             boolean usePkgIcon, boolean useLowResIcon) {
diff --git a/src/com/android/launcher3/model/ModelUtils.java b/src/com/android/launcher3/model/ModelUtils.java
index 4efeba5b0f..a8cc9ad3f3 100644
--- a/src/com/android/launcher3/model/ModelUtils.java
+++ b/src/com/android/launcher3/model/ModelUtils.java
@@ -15,10 +15,22 @@
  */
 package com.android.launcher3.model;
 
+import static com.android.launcher3.Utilities.isValidExtraType;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.os.Process;
+import android.util.Log;
+
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherSettings;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
+import com.android.launcher3.icons.BitmapInfo;
+import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.IntSet;
 
@@ -33,6 +45,8 @@ import java.util.stream.IntStream;
  */
 public class ModelUtils {
 
+    private static final String TAG = "ModelUtils";
+
     /**
      * Filters the set of items who are directly or indirectly (via another container) on the
      * specified screen.
@@ -125,4 +139,52 @@ public class ModelUtils {
         IntStream.range(0, len).filter(i -> !seen.contains(i)).forEach(result::add);
         return result;
     }
+
+
+    /**
+     * Creates a workspace item info for the legacy shortcut intent
+     */
+    @SuppressWarnings("deprecation")
+    public static WorkspaceItemInfo fromLegacyShortcutIntent(Context context, Intent data) {
+        if (!isValidExtraType(data, Intent.EXTRA_SHORTCUT_INTENT, Intent.class)
+                || !(isValidExtraType(data, Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
+                        Intent.ShortcutIconResource.class))
+                || !(isValidExtraType(data, Intent.EXTRA_SHORTCUT_ICON, Bitmap.class))) {
+
+            Log.e(TAG, "Invalid install shortcut intent");
+            return null;
+        }
+
+        Intent launchIntent = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_INTENT);
+        String label = data.getStringExtra(Intent.EXTRA_SHORTCUT_NAME);
+        if (launchIntent == null || label == null) {
+            Log.e(TAG, "Invalid install shortcut intent");
+            return null;
+        }
+
+        final WorkspaceItemInfo info = new WorkspaceItemInfo();
+        info.user = Process.myUserHandle();
+
+        BitmapInfo iconInfo = null;
+        try (LauncherIcons li = LauncherIcons.obtain(context)) {
+            Bitmap bitmap = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_ICON);
+            if (bitmap != null) {
+                iconInfo = li.createIconBitmap(bitmap);
+            } else {
+                info.iconResource = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE);
+                if (info.iconResource != null) {
+                    iconInfo = li.createIconBitmap(info.iconResource);
+                }
+            }
+        }
+
+        if (iconInfo == null) {
+            Log.e(TAG, "Invalid icon by the app");
+            return null;
+        }
+        info.bitmap = iconInfo;
+        info.contentDescription = info.title = Utilities.trim(label);
+        info.intent = launchIntent;
+        return info;
+    }
 }
diff --git a/src/com/android/launcher3/pm/InstallSessionHelper.java b/src/com/android/launcher3/pm/InstallSessionHelper.java
index ce4644fdba..d546013fca 100644
--- a/src/com/android/launcher3/pm/InstallSessionHelper.java
+++ b/src/com/android/launcher3/pm/InstallSessionHelper.java
@@ -18,9 +18,7 @@ package com.android.launcher3.pm;
 
 import static com.android.launcher3.Utilities.getPrefs;
 
-import android.content.ComponentName;
 import android.content.Context;
-import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.LauncherApps;
 import android.content.pm.PackageInstaller;
@@ -215,20 +213,8 @@ public class InstallSessionHelper {
                 && !mPromiseIconIds.contains(sessionInfo.getSessionId())
                 && new PackageManagerHelper(mAppContext).getApplicationInfo(
                         sessionInfo.getAppPackageName(), getUserHandle(sessionInfo), 0) == null) {
-
-            String packageName = sessionInfo.getAppPackageName();
-            if (mAppContext.getSystemService(LauncherApps.class)
-                    .getActivityList(packageName, getUserHandle(sessionInfo)).isEmpty()) {
-                // Ensure application isn't already installed.
-                Intent data = new Intent();
-                data.putExtra(Intent.EXTRA_SHORTCUT_INTENT, new Intent().setComponent(
-                        new ComponentName(packageName, "")).setPackage(packageName));
-                data.putExtra(Intent.EXTRA_SHORTCUT_NAME, sessionInfo.getAppLabel());
-                data.putExtra(Intent.EXTRA_SHORTCUT_ICON, sessionInfo.getAppIcon());
-
-                InstallShortcutReceiver.queueApplication(data, getUserHandle(sessionInfo),
-                        mAppContext);
-            }
+            InstallShortcutReceiver.queueApplication(
+                    sessionInfo.getAppPackageName(), getUserHandle(sessionInfo), mAppContext);
 
             mPromiseIconIds.add(sessionInfo.getSessionId());
             updatePromiseIconPrefs();
-- 
GitLab


From d6c3315a67980c90712103135bae302b86ee080e Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Tue, 11 Aug 2020 22:46:22 -0700
Subject: [PATCH 0087/1664] Only draw app below launcher for TaskViewSimulator
 at swipe up or in Overview

Bug: 160361464
Test: Manual
Change-Id: Ic4d912f1656d87f445a8016640c0eb166cace0d5
---
 .../src/com/android/quickstep/SwipeUpAnimationLogic.java  | 1 +
 .../src/com/android/quickstep/util/TaskViewSimulator.java | 8 +++++++-
 .../src/com/android/quickstep/views/RecentsView.java      | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/SwipeUpAnimationLogic.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/SwipeUpAnimationLogic.java
index 2963b6ce18..b6eaa1c7b6 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/SwipeUpAnimationLogic.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/SwipeUpAnimationLogic.java
@@ -79,6 +79,7 @@ public abstract class SwipeUpAnimationLogic {
         mTaskViewSimulator.setLayoutRotation(
                 mDeviceState.getRotationTouchHelper().getCurrentActiveRotation(),
                 mDeviceState.getRotationTouchHelper().getDisplayRotation());
+        mTaskViewSimulator.setDrawsBelowRecents(true);
     }
 
     protected void initTransitionEndpoints(DeviceProfile dp) {
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java
index 6a2d32405c..e5f4d38762 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -73,6 +73,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
 
     private final Rect mTaskRect = new Rect();
     private float mOffsetY;
+    private boolean mDrawsBelowRecents;
     private final PointF mPivot = new PointF();
     private DeviceProfile mDp;
 
@@ -181,6 +182,10 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
         mOffsetY = offsetY;
     }
 
+    public void setDrawsBelowRecents(boolean drawsBelowRecents) {
+        mDrawsBelowRecents = drawsBelowRecents;
+    }
+
     /**
      * Adds animation for all the components corresponding to transition from an app to overview.
      */
@@ -320,7 +325,8 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
                 .withWindowCrop(mTmpCropRect)
                 .withCornerRadius(getCurrentCornerRadius());
 
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && params.getRecentsSurface() != null) {
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && mDrawsBelowRecents
+                && params.getRecentsSurface() != null) {
             builder.withRelativeLayerTo(params.getRecentsSurface(), Integer.MIN_VALUE);
         }
     }
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
index ef75d8abd5..00a85400f7 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
@@ -475,6 +475,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mLiveTileTaskViewSimulator.setLayoutRotation(getPagedViewOrientedState().getTouchRotation(),
                 getPagedViewOrientedState().getDisplayRotation());
         mLiveTileTaskViewSimulator.setRecentsRotation(rotation);
+        mLiveTileTaskViewSimulator.setDrawsBelowRecents(true);
     }
 
     public OverScroller getScroller() {
-- 
GitLab


From cb956ff4f5adf0c4abb586940d9e89582a70bfd3 Mon Sep 17 00:00:00 2001
From: Becky Qiu <xuqiu@google.com>
Date: Mon, 10 Aug 2020 12:44:48 -0700
Subject: [PATCH 0088/1664] [Overview Actions] Set launcher state to Overview
 when rotate in recents.

Test: local
Bug: 160718310

Change-Id: I73f498151d7cc6a9db9d352549124c9d550ae6f2
---
 .../src/com/android/quickstep/views/RecentsView.java       | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
index 4d58a0dc79..aa36780278 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
@@ -24,6 +24,7 @@ import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAG
 import static com.android.launcher3.InvariantDeviceProfile.CHANGE_FLAG_ICON_PARAMS;
 import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA;
 import static com.android.launcher3.LauncherState.BACKGROUND_APP;
+import static com.android.launcher3.LauncherState.OVERVIEW_MODAL_TASK;
 import static com.android.launcher3.Utilities.EDGE_NAV_BAR;
 import static com.android.launcher3.Utilities.mapToRange;
 import static com.android.launcher3.Utilities.squaredHypot;
@@ -93,6 +94,7 @@ import com.android.launcher3.BaseActivity;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Insettable;
 import com.android.launcher3.InvariantDeviceProfile;
+import com.android.launcher3.LauncherState;
 import com.android.launcher3.PagedView;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
@@ -1748,6 +1750,11 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             updateOrientationHandler();
         }
         mLiveTileTaskViewSimulator.setRecentsRotation(rotation);
+        // If overview is in modal state when rotate, reset it to overview state without running
+        // animation.
+        if (mActivity.isInState(OVERVIEW_MODAL_TASK)) {
+            mActivity.getStateManager().goToState(LauncherState.OVERVIEW, false);
+        }
     }
 
     public void setLayoutRotation(int touchRotation, int displayRotation) {
-- 
GitLab


From fd58da6a75b55eb2ef40dd53fc6135636812ac6a Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 11 Aug 2020 12:06:49 -0700
Subject: [PATCH 0089/1664] Wrapping display properties in a wrapper class

This would allow us to support gestures on multiple-displays

Change-Id: I8f426bbdf04520f4189cadce2bde6aab4933c8d9
---
 .../NoButtonQuickSwitchTouchController.java   |   2 +-
 .../android/quickstep/AbsSwipeUpHandler.java  |   2 +-
 .../com/android/quickstep/TaskViewUtils.java  |   4 +-
 .../FallbackNavBarTouchController.java        |   4 +-
 .../DeviceLockedInputConsumer.java            |   4 +-
 .../OrientationTouchTransformerTest.java      |   8 +-
 .../quickstep/util/TaskViewSimulatorTest.java |   4 +-
 .../launcher3/LauncherAnimationRunner.java    |   2 +-
 .../OrientationTouchTransformer.java          |  22 +-
 .../RecentsAnimationDeviceState.java          |  37 ++-
 .../quickstep/RotationTouchHelper.java        |  37 +--
 .../SwipeUpGestureTutorialController.java     |   2 +-
 .../quickstep/util/NavBarPosition.java        |   4 +-
 .../quickstep/util/SplitScreenBounds.java     |   4 +-
 .../launcher3/BaseDraggingActivity.java       |  12 +-
 src/com/android/launcher3/DeviceProfile.java  |  15 +-
 .../launcher3/FirstFrameAnimatorHelper.java   |   2 +-
 .../launcher3/InvariantDeviceProfile.java     |  12 +-
 .../anim/AnimatorPlaybackController.java      |   2 +-
 .../android/launcher3/anim/Interpolators.java |   2 +-
 .../anim/SpringAnimationBuilder.java          |   4 +-
 .../AbstractStateChangeTouchController.java   |   2 +-
 .../android/launcher3/util/ConfigMonitor.java |  15 +-
 .../launcher3/util/DefaultDisplay.java        | 198 -------------
 .../launcher3/util/DisplayController.java     | 274 ++++++++++++++++++
 .../launcher3/views/BaseDragLayer.java        |   2 +-
 .../launcher3/views/FloatingSurfaceView.java  |   4 +-
 27 files changed, 383 insertions(+), 297 deletions(-)
 delete mode 100644 src/com/android/launcher3/util/DefaultDisplay.java
 create mode 100644 src/com/android/launcher3/util/DisplayController.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
index 5c9fd4705b..3867c35050 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
@@ -38,7 +38,7 @@ import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
 import static com.android.launcher3.touch.BothAxesSwipeDetector.DIRECTION_RIGHT;
 import static com.android.launcher3.touch.BothAxesSwipeDetector.DIRECTION_UP;
 import static com.android.launcher3.uioverrides.states.QuickstepAtomicAnimationFactory.INDEX_PAUSE_TO_OVERVIEW_ANIM;
-import static com.android.launcher3.util.DefaultDisplay.getSingleFrameMs;
+import static com.android.launcher3.util.DisplayController.getSingleFrameMs;
 import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;
 import static com.android.quickstep.util.ShelfPeekAnim.ShelfAnimState.CANCEL;
 import static com.android.quickstep.util.ShelfPeekAnim.ShelfAnimState.HIDE;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
index d2fee30ca3..282f6fa2b8 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -29,7 +29,7 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_OVERVIEW_GESTURE;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_QUICKSWITCH_LEFT;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_QUICKSWITCH_RIGHT;
-import static com.android.launcher3.util.DefaultDisplay.getSingleFrameMs;
+import static com.android.launcher3.util.DisplayController.getSingleFrameMs;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW;
 import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskViewUtils.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskViewUtils.java
index e2e25f32d3..a5af1814d9 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskViewUtils.java
@@ -41,7 +41,7 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.statehandlers.DepthController;
-import com.android.launcher3.util.DefaultDisplay;
+import com.android.launcher3.util.DisplayController;
 import com.android.quickstep.util.SurfaceTransactionApplier;
 import com.android.quickstep.util.TaskViewSimulator;
 import com.android.quickstep.util.TransformParams;
@@ -146,7 +146,7 @@ public final class TaskViewUtils {
         DeviceProfile dp = BaseActivity.fromContext(context).getDeviceProfile();
         // RecentsView never updates the display rotation until swipe-up so the value may be stale.
         // Use the display value instead.
-        int displayRotation = DefaultDisplay.INSTANCE.get(context).getInfo().rotation;
+        int displayRotation = DisplayController.getDefaultDisplay(context).getInfo().rotation;
 
         TaskViewSimulator topMostSimulator = null;
         if (targets.apps.length > 0) {
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackNavBarTouchController.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackNavBarTouchController.java
index be3fddecf0..a4a7bd3ae9 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackNavBarTouchController.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackNavBarTouchController.java
@@ -21,7 +21,7 @@ import android.view.MotionEvent;
 import androidx.annotation.Nullable;
 
 import com.android.launcher3.Utilities;
-import com.android.launcher3.util.DefaultDisplay;
+import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.TouchController;
 import com.android.quickstep.RecentsActivity;
 import com.android.quickstep.SysUINavigationMode;
@@ -43,7 +43,7 @@ public class FallbackNavBarTouchController implements TouchController,
         SysUINavigationMode.Mode sysUINavigationMode = SysUINavigationMode.getMode(mActivity);
         if (sysUINavigationMode == SysUINavigationMode.Mode.NO_BUTTON) {
             NavBarPosition navBarPosition = new NavBarPosition(sysUINavigationMode,
-                    DefaultDisplay.INSTANCE.get(mActivity).getInfo());
+                    DisplayController.getDefaultDisplay(mActivity).getInfo());
             mTriggerSwipeUpTracker = new TriggerSwipeUpTouchTracker(mActivity,
                     true /* disableHorizontalSwipe */, navBarPosition,
                     null /* onInterceptTouch */, this);
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
index 7032fae8f0..584ff28fdb 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
@@ -41,7 +41,7 @@ import com.android.launcher3.R;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.TestProtocol;
-import com.android.launcher3.util.DefaultDisplay;
+import com.android.launcher3.util.DisplayController;
 import com.android.quickstep.AnimatedFloat;
 import com.android.quickstep.GestureState;
 import com.android.quickstep.InputConsumer;
@@ -115,7 +115,7 @@ public class DeviceLockedInputConsumer implements InputConsumer,
                 R.dimen.device_locked_y_offset);
 
         // Do not use DeviceProfile as the user data might be locked
-        mDisplaySize = DefaultDisplay.INSTANCE.get(context).getInfo().realSize;
+        mDisplaySize = DisplayController.getDefaultDisplay(context).getInfo().realSize;
 
         // Init states
         mStateCallback = new MultiStateCallback(STATE_NAMES);
diff --git a/quickstep/robolectric_tests/src/com/android/quickstep/OrientationTouchTransformerTest.java b/quickstep/robolectric_tests/src/com/android/quickstep/OrientationTouchTransformerTest.java
index 22d205a7cd..5cb55ec2d0 100644
--- a/quickstep/robolectric_tests/src/com/android/quickstep/OrientationTouchTransformerTest.java
+++ b/quickstep/robolectric_tests/src/com/android/quickstep/OrientationTouchTransformerTest.java
@@ -32,7 +32,7 @@ import android.view.MotionEvent;
 import android.view.Surface;
 
 import com.android.launcher3.ResourceUtils;
-import com.android.launcher3.util.DefaultDisplay;
+import com.android.launcher3.util.DisplayController;
 
 import org.junit.Before;
 import org.junit.Ignore;
@@ -50,7 +50,7 @@ public class OrientationTouchTransformerTest {
     private OrientationTouchTransformer mTouchTransformer;
 
     Resources mResources;
-    private DefaultDisplay.Info mInfo;
+    private DisplayController.Info mInfo;
 
 
     @Before
@@ -231,12 +231,12 @@ public class OrientationTouchTransformerTest {
         assertTrue(mTouchTransformer.touchInValidSwipeRegions(inRegion2.getX(), inRegion2.getY()));
     }
 
-    private DefaultDisplay.Info createDisplayInfo(int rotation) {
+    private DisplayController.Info createDisplayInfo(int rotation) {
         Point p = new Point(SIZE_WIDTH, SIZE_HEIGHT);
         if (rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270) {
             p = new Point(SIZE_HEIGHT, SIZE_WIDTH);
         }
-        return new DefaultDisplay.Info(0, rotation, 0, p, p, p, null);
+        return new DisplayController.Info(0, rotation, 0, p, p, p, null);
     }
 
     private float generateTouchRegionHeight(int rotation) {
diff --git a/quickstep/robolectric_tests/src/com/android/quickstep/util/TaskViewSimulatorTest.java b/quickstep/robolectric_tests/src/com/android/quickstep/util/TaskViewSimulatorTest.java
index a31ba2177b..5491daae7b 100644
--- a/quickstep/robolectric_tests/src/com/android/quickstep/util/TaskViewSimulatorTest.java
+++ b/quickstep/robolectric_tests/src/com/android/quickstep/util/TaskViewSimulatorTest.java
@@ -27,7 +27,7 @@ import android.view.SurfaceControl;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.shadows.LShadowDisplay;
-import com.android.launcher3.util.DefaultDisplay;
+import com.android.launcher3.util.DisplayController;
 import com.android.quickstep.LauncherActivityInterface;
 import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
 
@@ -144,7 +144,7 @@ public class TaskViewSimulatorTest {
                     LauncherActivityInterface.INSTANCE);
             tvs.setDp(mDeviceProfile);
 
-            int launcherRotation = DefaultDisplay.INSTANCE.get(mContext).getInfo().rotation;
+            int launcherRotation = DisplayController.INSTANCE.get(mContext).getInfo().rotation;
             if (mAppRotation < 0) {
                 mAppRotation = launcherRotation;
             }
diff --git a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
index 5ad0bca11f..199cf63b92 100644
--- a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
+++ b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
@@ -16,7 +16,7 @@
 package com.android.launcher3;
 
 import static com.android.launcher3.Utilities.postAsyncCallback;
-import static com.android.launcher3.util.DefaultDisplay.getSingleFrameMs;
+import static com.android.launcher3.util.DisplayController.getSingleFrameMs;
 import static com.android.systemui.shared.recents.utilities.Utilities.postAtFrontOfQueueAsynchronously;
 
 import android.animation.Animator;
diff --git a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
index b2bce0c043..eb33f98dad 100644
--- a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
+++ b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
@@ -37,7 +37,7 @@ import android.view.Surface;
 import com.android.launcher3.R;
 import com.android.launcher3.ResourceUtils;
 import com.android.launcher3.testing.TestProtocol;
-import com.android.launcher3.util.DefaultDisplay;
+import com.android.launcher3.util.DisplayController.Info;
 
 import java.io.PrintWriter;
 
@@ -85,7 +85,7 @@ class OrientationTouchTransformer {
      * QUICKSTEP_ROTATION_UNINITIALIZED, then user has not tapped on an active nav region.
      * Otherwise it will be the rotation of the display when the user first interacted with the
      * active nav bar region.
-     * The "session" ends when {@link #enableMultipleRegions(boolean, DefaultDisplay.Info)} is
+     * The "session" ends when {@link #enableMultipleRegions(boolean, Info)} is
      * called - usually from a timeout or if user starts interacting w/ the foreground app.
      *
      * This is different than {@link #mLastRectTouched} as it can get reset by the system whereas
@@ -108,7 +108,7 @@ class OrientationTouchTransformer {
         mNavBarGesturalHeight = getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE);
     }
 
-    private void refreshTouchRegion(DefaultDisplay.Info info, Resources newRes) {
+    private void refreshTouchRegion(Info info, Resources newRes) {
         // Swipe touch regions are independent of nav mode, so we have to clear them explicitly
         // here to avoid, for ex, a nav region for 2-button rotation 0 being used for 3-button mode
         // It tries to cache and reuse swipe regions whenever possible based only on rotation
@@ -117,7 +117,7 @@ class OrientationTouchTransformer {
         resetSwipeRegions(info);
     }
 
-    void setNavigationMode(SysUINavigationMode.Mode newMode, DefaultDisplay.Info info,
+    void setNavigationMode(SysUINavigationMode.Mode newMode, Info info,
             Resources newRes) {
         if (mMode == newMode) {
             return;
@@ -126,7 +126,7 @@ class OrientationTouchTransformer {
         refreshTouchRegion(info, newRes);
     }
 
-    void setGesturalHeight(int newGesturalHeight, DefaultDisplay.Info info, Resources newRes) {
+    void setGesturalHeight(int newGesturalHeight, Info info, Resources newRes) {
         if (mNavBarGesturalHeight == newGesturalHeight) {
             return;
         }
@@ -140,9 +140,9 @@ class OrientationTouchTransformer {
      * alongside other regions.
      * Ok to call multiple times
      *
-     * @see #enableMultipleRegions(boolean, DefaultDisplay.Info)
+     * @see #enableMultipleRegions(boolean, Info)
      */
-    void createOrAddTouchRegion(DefaultDisplay.Info info) {
+    void createOrAddTouchRegion(Info info) {
         mCurrentDisplayRotation = info.rotation;
         if (mQuickStepStartingRotation > QUICKSTEP_ROTATION_UNINITIALIZED
                 && mCurrentDisplayRotation == mQuickStepStartingRotation) {
@@ -170,7 +170,7 @@ class OrientationTouchTransformer {
      * @param enableMultipleRegions Set to true to start tracking multiple nav bar regions
      * @param info The current displayInfo which will be the start of the quickswitch gesture
      */
-    void enableMultipleRegions(boolean enableMultipleRegions, DefaultDisplay.Info info) {
+    void enableMultipleRegions(boolean enableMultipleRegions, Info info) {
         mEnableMultipleRegions = enableMultipleRegions &&
                 mMode != SysUINavigationMode.Mode.TWO_BUTTONS;
         if (mEnableMultipleRegions) {
@@ -191,7 +191,7 @@ class OrientationTouchTransformer {
      *
      * @param displayInfo The display whos rotation will be used as the current active rotation
      */
-    void setSingleActiveRegion(DefaultDisplay.Info displayInfo) {
+    void setSingleActiveRegion(Info displayInfo) {
         mActiveTouchRotation = displayInfo.rotation;
         resetSwipeRegions(displayInfo);
     }
@@ -202,7 +202,7 @@ class OrientationTouchTransformer {
      * To be called whenever we want to stop tracking more than one swipe region.
      * Ok to call multiple times.
      */
-    private void resetSwipeRegions(DefaultDisplay.Info region) {
+    private void resetSwipeRegions(Info region) {
         if (DEBUG) {
             Log.d(TAG, "clearing all regions except rotation: " + mCurrentDisplayRotation);
         }
@@ -226,7 +226,7 @@ class OrientationTouchTransformer {
         }
     }
 
-    private OrientationRectF createRegionForDisplay(DefaultDisplay.Info display) {
+    private OrientationRectF createRegionForDisplay(Info display) {
         if (DEBUG) {
             Log.d(TAG, "creating rotation region for: " + mCurrentDisplayRotation);
         }
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index fe152a0cd9..e9fc42328b 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -17,8 +17,8 @@ package com.android.quickstep;
 
 import static android.content.Intent.ACTION_USER_UNLOCKED;
 
-import static com.android.launcher3.util.DefaultDisplay.CHANGE_ALL;
-import static com.android.launcher3.util.DefaultDisplay.CHANGE_FRAME_DELAY;
+import static com.android.launcher3.util.DisplayController.DisplayHolder.CHANGE_ALL;
+import static com.android.launcher3.util.DisplayController.DisplayHolder.CHANGE_FRAME_DELAY;
 import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
 import static com.android.quickstep.SysUINavigationMode.Mode.THREE_BUTTONS;
 import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
@@ -56,7 +56,10 @@ import androidx.annotation.BinderThread;
 
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.util.DefaultDisplay;
+import com.android.launcher3.util.DisplayController;
+import com.android.launcher3.util.DisplayController.DisplayHolder;
+import com.android.launcher3.util.DisplayController.DisplayInfoChangeListener;
+import com.android.launcher3.util.DisplayController.Info;
 import com.android.launcher3.util.SecureSettingsObserver;
 import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;
 import com.android.quickstep.SysUINavigationMode.OneHandedModeChangeListener;
@@ -76,14 +79,14 @@ import java.util.stream.Collectors;
  */
 public class RecentsAnimationDeviceState implements
         NavigationModeChangeListener,
-        DefaultDisplay.DisplayInfoChangeListener,
+        DisplayInfoChangeListener,
         OneHandedModeChangeListener {
 
     static final String SUPPORT_ONE_HANDED_MODE = "ro.support_one_handed_mode";
 
     private final Context mContext;
     private final SysUINavigationMode mSysUiNavMode;
-    private final DefaultDisplay mDefaultDisplay;
+    private final DisplayHolder mDisplayHolder;
     private final int mDisplayId;
     private final RotationTouchHelper mRotationTouchHelper;
 
@@ -120,13 +123,17 @@ public class RecentsAnimationDeviceState implements
     private boolean mIsUserSetupComplete;
 
     public RecentsAnimationDeviceState(Context context) {
+        this(context, DisplayController.getDefaultDisplay(context));
+    }
+
+    public RecentsAnimationDeviceState(Context context, DisplayHolder displayHolder) {
         mContext = context;
+        mDisplayHolder = displayHolder;
         mSysUiNavMode = SysUINavigationMode.INSTANCE.get(context);
-        mDefaultDisplay = DefaultDisplay.INSTANCE.get(context);
-        mDisplayId = mDefaultDisplay.getInfo().id;
+        mDisplayId = mDisplayHolder.getInfo().id;
         mIsOneHandedModeSupported = SystemProperties.getBoolean(SUPPORT_ONE_HANDED_MODE, false);
-        runOnDestroy(() -> mDefaultDisplay.removeChangeListener(this));
-        mRotationTouchHelper = new RotationTouchHelper(context);
+        runOnDestroy(() -> mDisplayHolder.removeChangeListener(this));
+        mRotationTouchHelper = new RotationTouchHelper(context, mDisplayHolder);
         runOnDestroy(mRotationTouchHelper::destroy);
 
         // Register for user unlocked if necessary
@@ -232,9 +239,9 @@ public class RecentsAnimationDeviceState implements
 
     @Override
     public void onNavigationModeChanged(SysUINavigationMode.Mode newMode) {
-        mDefaultDisplay.removeChangeListener(this);
-        mDefaultDisplay.addChangeListener(this);
-        onDisplayInfoChanged(mDefaultDisplay.getInfo(), CHANGE_ALL);
+        mDisplayHolder.removeChangeListener(this);
+        mDisplayHolder.addChangeListener(this);
+        onDisplayInfoChanged(mDisplayHolder.getInfo(), CHANGE_ALL);
 
         if (newMode == NO_BUTTON) {
             mExclusionListener.register();
@@ -242,12 +249,12 @@ public class RecentsAnimationDeviceState implements
             mExclusionListener.unregister();
         }
 
-        mNavBarPosition = new NavBarPosition(newMode, mDefaultDisplay.getInfo());
+        mNavBarPosition = new NavBarPosition(newMode, mDisplayHolder.getInfo());
         mMode = newMode;
     }
 
     @Override
-    public void onDisplayInfoChanged(DefaultDisplay.Info info, int flags) {
+    public void onDisplayInfoChanged(Info info, int flags) {
         if (info.id != getDisplayId() || flags == CHANGE_FRAME_DELAY) {
             // ignore displays that aren't running launcher and frame refresh rate changes
             return;
@@ -529,7 +536,7 @@ public class RecentsAnimationDeviceState implements
         }
 
         if (mIsOneHandedModeEnabled || mIsSwipeToNotificationEnabled) {
-            final DefaultDisplay.Info displayInfo = mDefaultDisplay.getInfo();
+            final Info displayInfo = mDisplayHolder.getInfo();
             return (mRotationTouchHelper.touchInOneHandedModeRegion(ev)
                 && displayInfo.rotation != Surface.ROTATION_90
                 && displayInfo.rotation != Surface.ROTATION_270
diff --git a/quickstep/src/com/android/quickstep/RotationTouchHelper.java b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
index 2b5e42a61e..2cf32122cf 100644
--- a/quickstep/src/com/android/quickstep/RotationTouchHelper.java
+++ b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
@@ -17,8 +17,8 @@ package com.android.quickstep;
 
 import static android.view.Surface.ROTATION_0;
 
-import static com.android.launcher3.util.DefaultDisplay.CHANGE_ALL;
-import static com.android.launcher3.util.DefaultDisplay.CHANGE_FRAME_DELAY;
+import static com.android.launcher3.util.DisplayController.DisplayHolder.CHANGE_ALL;
+import static com.android.launcher3.util.DisplayController.DisplayHolder.CHANGE_FRAME_DELAY;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.quickstep.SysUINavigationMode.Mode.THREE_BUTTONS;
 
@@ -28,8 +28,9 @@ import android.view.MotionEvent;
 import android.view.OrientationEventListener;
 
 import com.android.launcher3.testing.TestProtocol;
-import com.android.launcher3.util.DefaultDisplay;
-import com.android.launcher3.util.MainThreadInitializedObject;
+import com.android.launcher3.util.DisplayController.DisplayHolder;
+import com.android.launcher3.util.DisplayController.DisplayInfoChangeListener;
+import com.android.launcher3.util.DisplayController.Info;
 import com.android.quickstep.util.RecentsOrientedState;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.QuickStepContract;
@@ -40,10 +41,10 @@ import java.util.ArrayList;
 
 public class RotationTouchHelper implements
         SysUINavigationMode.NavigationModeChangeListener,
-        DefaultDisplay.DisplayInfoChangeListener {
+        DisplayInfoChangeListener {
 
     private final OrientationTouchTransformer mOrientationTouchTransformer;
-    private final DefaultDisplay mDefaultDisplay;
+    private final DisplayHolder mDisplayHolder;
     private final SysUINavigationMode mSysUiNavMode;
     private final int mDisplayId;
     private int mDisplayRotation;
@@ -120,12 +121,12 @@ public class RotationTouchHelper implements
 
     private final Context mContext;
 
-    public RotationTouchHelper(Context context) {
+    public RotationTouchHelper(Context context, DisplayHolder displayHolder) {
         mContext = context;
+        mDisplayHolder = displayHolder;
         Resources resources = mContext.getResources();
         mSysUiNavMode = SysUINavigationMode.INSTANCE.get(context);
-        mDefaultDisplay = DefaultDisplay.INSTANCE.get(context);
-        mDisplayId = mDefaultDisplay.getInfo().id;
+        mDisplayId = mDisplayHolder.getInfo().id;
 
         mOrientationTouchTransformer = new OrientationTouchTransformer(resources, mMode,
                 () -> QuickStepContract.getWindowCornerRadius(resources));
@@ -200,7 +201,7 @@ public class RotationTouchHelper implements
             return;
         }
 
-        mOrientationTouchTransformer.createOrAddTouchRegion(mDefaultDisplay.getInfo());
+        mOrientationTouchTransformer.createOrAddTouchRegion(mDisplayHolder.getInfo());
     }
 
     /**
@@ -222,11 +223,11 @@ public class RotationTouchHelper implements
 
     @Override
     public void onNavigationModeChanged(SysUINavigationMode.Mode newMode) {
-        mDefaultDisplay.removeChangeListener(this);
-        mDefaultDisplay.addChangeListener(this);
-        onDisplayInfoChanged(mDefaultDisplay.getInfo(), CHANGE_ALL);
+        mDisplayHolder.removeChangeListener(this);
+        mDisplayHolder.addChangeListener(this);
+        onDisplayInfoChanged(mDisplayHolder.getInfo(), CHANGE_ALL);
 
-        mOrientationTouchTransformer.setNavigationMode(newMode, mDefaultDisplay.getInfo(),
+        mOrientationTouchTransformer.setNavigationMode(newMode, mDisplayHolder.getInfo(),
             mContext.getResources());
         if (!mMode.hasGestures && newMode.hasGestures) {
             setupOrientationSwipeHandler();
@@ -242,7 +243,7 @@ public class RotationTouchHelper implements
     }
 
     @Override
-    public void onDisplayInfoChanged(DefaultDisplay.Info info, int flags) {
+    public void onDisplayInfoChanged(Info info, int flags) {
         if (info.id != mDisplayId|| flags == CHANGE_FRAME_DELAY) {
             // ignore displays that aren't running launcher and frame refresh rate changes
             return;
@@ -275,7 +276,7 @@ public class RotationTouchHelper implements
      * Sets the gestural height.
      */
     void setGesturalHeight(int newGesturalHeight) {
-        mOrientationTouchTransformer.setGesturalHeight(newGesturalHeight, mDefaultDisplay.getInfo(),
+        mOrientationTouchTransformer.setGesturalHeight(newGesturalHeight, mDisplayHolder.getInfo(),
             mContext.getResources());
     }
 
@@ -292,7 +293,7 @@ public class RotationTouchHelper implements
     }
 
     private void enableMultipleRegions(boolean enable) {
-        mOrientationTouchTransformer.enableMultipleRegions(enable, mDefaultDisplay.getInfo());
+        mOrientationTouchTransformer.enableMultipleRegions(enable, mDisplayHolder.getInfo());
         notifySysuiOfCurrentRotation(mOrientationTouchTransformer.getQuickStepStartingRotation());
         if (enable && !mInOverview && !TestProtocol.sDisableSensorRotation) {
             // Clear any previous state from sensor manager
@@ -355,7 +356,7 @@ public class RotationTouchHelper implements
      * notifies system UI of the primary rotation the user is interacting with
      */
     private void toggleSecondaryNavBarsForRotation() {
-        mOrientationTouchTransformer.setSingleActiveRegion(mDefaultDisplay.getInfo());
+        mOrientationTouchTransformer.setSingleActiveRegion(mDisplayHolder.getInfo());
         notifySysuiOfCurrentRotation(mOrientationTouchTransformer.getCurrentActiveRotation());
     }
 
diff --git a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
index 60d8ef6ff4..865b66e64b 100644
--- a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
@@ -16,7 +16,7 @@
 package com.android.quickstep.interaction;
 
 import static com.android.launcher3.anim.Interpolators.ACCEL;
-import static com.android.launcher3.util.DefaultDisplay.getSingleFrameMs;
+import static com.android.launcher3.util.DisplayController.getSingleFrameMs;
 import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION;
 import static com.android.quickstep.AbsSwipeUpHandler.MAX_SWIPE_DURATION;
 import static com.android.quickstep.interaction.TutorialController.TutorialType.HOME_NAVIGATION_COMPLETE;
diff --git a/quickstep/src/com/android/quickstep/util/NavBarPosition.java b/quickstep/src/com/android/quickstep/util/NavBarPosition.java
index 0a98e1bfea..449dba8f26 100644
--- a/quickstep/src/com/android/quickstep/util/NavBarPosition.java
+++ b/quickstep/src/com/android/quickstep/util/NavBarPosition.java
@@ -19,7 +19,7 @@ import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
 
 import android.view.Surface;
 
-import com.android.launcher3.util.DefaultDisplay;
+import com.android.launcher3.util.DisplayController.Info;
 import com.android.quickstep.SysUINavigationMode;
 
 /**
@@ -30,7 +30,7 @@ public class NavBarPosition {
     private final SysUINavigationMode.Mode mMode;
     private final int mDisplayRotation;
 
-    public NavBarPosition(SysUINavigationMode.Mode mode, DefaultDisplay.Info info) {
+    public NavBarPosition(SysUINavigationMode.Mode mode, Info info) {
         mMode = mode;
         mDisplayRotation = info.rotation;
     }
diff --git a/quickstep/src/com/android/quickstep/util/SplitScreenBounds.java b/quickstep/src/com/android/quickstep/util/SplitScreenBounds.java
index a770e8e2b5..176478f1dc 100644
--- a/quickstep/src/com/android/quickstep/util/SplitScreenBounds.java
+++ b/quickstep/src/com/android/quickstep/util/SplitScreenBounds.java
@@ -32,7 +32,7 @@ import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 
 import com.android.launcher3.R;
-import com.android.launcher3.util.DefaultDisplay;
+import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.WindowBounds;
 
 import java.util.ArrayList;
@@ -77,7 +77,7 @@ public class SplitScreenBounds {
 
         WindowBounds bounds = new WindowBounds(wm.getBounds(),
                 new Rect(insets.left, insets.top, insets.right, insets.bottom));
-        int rotation = DefaultDisplay.INSTANCE.get(context).getInfo().rotation;
+        int rotation = DisplayController.getDefaultDisplay(context).getInfo().rotation;
         int halfDividerSize = context.getResources()
                 .getDimensionPixelSize(R.dimen.multi_window_task_divider_size) / 2;
 
diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java
index bd8c53cb92..cbc3abcc41 100644
--- a/src/com/android/launcher3/BaseDraggingActivity.java
+++ b/src/com/android/launcher3/BaseDraggingActivity.java
@@ -17,7 +17,7 @@
 package com.android.launcher3;
 
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_APP_LAUNCH_TAP;
-import static com.android.launcher3.util.DefaultDisplay.CHANGE_ROTATION;
+import static com.android.launcher3.util.DisplayController.DisplayHolder.CHANGE_ROTATION;
 
 import android.app.ActivityOptions;
 import android.content.ActivityNotFoundException;
@@ -50,9 +50,9 @@ import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.touch.ItemClickHandler;
 import com.android.launcher3.uioverrides.WallpaperColorInfo;
-import com.android.launcher3.util.DefaultDisplay;
-import com.android.launcher3.util.DefaultDisplay.DisplayInfoChangeListener;
-import com.android.launcher3.util.DefaultDisplay.Info;
+import com.android.launcher3.util.DisplayController;
+import com.android.launcher3.util.DisplayController.DisplayInfoChangeListener;
+import com.android.launcher3.util.DisplayController.Info;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.util.TraceHelper;
@@ -84,7 +84,7 @@ public abstract class BaseDraggingActivity extends BaseActivity
 
         mIsSafeModeEnabled = TraceHelper.allowIpcs("isSafeMode",
                 () -> getPackageManager().isSafeMode());
-        DefaultDisplay.INSTANCE.get(this).addChangeListener(this);
+        DisplayController.getDefaultDisplay(this).addChangeListener(this);
 
         // Update theme
         WallpaperColorInfo.INSTANCE.get(this).addOnChangeListener(this);
@@ -257,7 +257,7 @@ public abstract class BaseDraggingActivity extends BaseActivity
     protected void onDestroy() {
         super.onDestroy();
         WallpaperColorInfo.INSTANCE.get(this).removeOnChangeListener(this);
-        DefaultDisplay.INSTANCE.get(this).removeChangeListener(this);
+        DisplayController.getDefaultDisplay(this).removeChangeListener(this);
     }
 
     public void runOnceOnStart(Runnable action) {
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 49caa93e61..12ce9f3448 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -28,7 +28,8 @@ import com.android.launcher3.CellLayout.ContainerType;
 import com.android.launcher3.graphics.IconShape;
 import com.android.launcher3.icons.DotRenderer;
 import com.android.launcher3.icons.IconNormalizer;
-import com.android.launcher3.util.DefaultDisplay;
+import com.android.launcher3.util.DisplayController;
+import com.android.launcher3.util.DisplayController.Info;
 import com.android.launcher3.util.WindowBounds;
 
 public class DeviceProfile {
@@ -38,7 +39,7 @@ public class DeviceProfile {
 
 
     public final InvariantDeviceProfile inv;
-    private final DefaultDisplay.Info mInfo;
+    private final Info mInfo;
 
     // Device properties
     public final boolean isTablet;
@@ -140,7 +141,7 @@ public class DeviceProfile {
     public DotRenderer mDotRendererWorkSpace;
     public DotRenderer mDotRendererAllApps;
 
-    DeviceProfile(Context context, InvariantDeviceProfile inv, DefaultDisplay.Info info,
+    DeviceProfile(Context context, InvariantDeviceProfile inv, Info info,
             Point minSize, Point maxSize, int width, int height, boolean isLandscape,
             boolean isMultiWindowMode, boolean transposeLayoutWithOrientation,
             Point windowPosition) {
@@ -606,7 +607,7 @@ public class DeviceProfile {
      */
     public boolean updateIsSeascape(Context context) {
         if (isVerticalBarLayout()) {
-            boolean isSeascape = DefaultDisplay.INSTANCE.get(context).getInfo().rotation
+            boolean isSeascape = DisplayController.getDefaultDisplay(context).getInfo().rotation
                     == Surface.ROTATION_270;
             if (mIsSeascape != isSeascape) {
                 mIsSeascape = isSeascape;
@@ -638,7 +639,7 @@ public class DeviceProfile {
         }
     }
 
-    private static Context getContext(Context c, DefaultDisplay.Info info, int orientation) {
+    private static Context getContext(Context c, Info info, int orientation) {
         Configuration config = new Configuration(c.getResources().getConfiguration());
         config.orientation = orientation;
         config.densityDpi = info.metrics.densityDpi;
@@ -662,7 +663,7 @@ public class DeviceProfile {
     public static class Builder {
         private Context mContext;
         private InvariantDeviceProfile mInv;
-        private DefaultDisplay.Info mInfo;
+        private Info mInfo;
 
         private final Point mWindowPosition = new Point();
         private Point mMinSize, mMaxSize;
@@ -672,7 +673,7 @@ public class DeviceProfile {
         private boolean mIsMultiWindowMode = false;
         private boolean mTransposeLayoutWithOrientation;
 
-        public Builder(Context context, InvariantDeviceProfile inv, DefaultDisplay.Info info) {
+        public Builder(Context context, InvariantDeviceProfile inv, Info info) {
             mContext = context;
             mInv = inv;
             mInfo = info;
diff --git a/src/com/android/launcher3/FirstFrameAnimatorHelper.java b/src/com/android/launcher3/FirstFrameAnimatorHelper.java
index 6c5bc40b3e..a199a5779a 100644
--- a/src/com/android/launcher3/FirstFrameAnimatorHelper.java
+++ b/src/com/android/launcher3/FirstFrameAnimatorHelper.java
@@ -15,7 +15,7 @@
  */
 package com.android.launcher3;
 
-import static com.android.launcher3.util.DefaultDisplay.getSingleFrameMs;
+import static com.android.launcher3.util.DisplayController.getSingleFrameMs;
 
 import android.animation.ValueAnimator;
 import android.animation.ValueAnimator.AnimatorUpdateListener;
diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index e39e89c038..370bd6ffc8 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -48,8 +48,8 @@ import androidx.annotation.VisibleForTesting;
 
 import com.android.launcher3.graphics.IconShape;
 import com.android.launcher3.util.ConfigMonitor;
-import com.android.launcher3.util.DefaultDisplay;
-import com.android.launcher3.util.DefaultDisplay.Info;
+import com.android.launcher3.util.DisplayController;
+import com.android.launcher3.util.DisplayController.Info;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.launcher3.util.Themes;
@@ -198,7 +198,7 @@ public class InvariantDeviceProfile {
 
         // Get the display info based on default display and interpolate it to existing display
         DisplayOption defaultDisplayOption = invDistWeightedInterpolate(
-                DefaultDisplay.INSTANCE.get(context).getInfo(),
+                DisplayController.getDefaultDisplay(context).getInfo(),
                 getPredefinedDeviceProfiles(context, gridName));
 
         Info myInfo = new Info(context, display);
@@ -231,7 +231,7 @@ public class InvariantDeviceProfile {
     }
 
     private String initGrid(Context context, String gridName) {
-        DefaultDisplay.Info displayInfo = DefaultDisplay.INSTANCE.get(context).getInfo();
+        Info displayInfo = DisplayController.getDefaultDisplay(context).getInfo();
         ArrayList<DisplayOption> allOptions = getPredefinedDeviceProfiles(context, gridName);
 
         DisplayOption displayOption = invDistWeightedInterpolate(displayInfo, allOptions);
@@ -240,7 +240,7 @@ public class InvariantDeviceProfile {
     }
 
     private void initGrid(
-            Context context, DefaultDisplay.Info displayInfo, DisplayOption displayOption) {
+            Context context, Info displayInfo, DisplayOption displayOption) {
         GridOption closestProfile = displayOption.grid;
         numRows = closestProfile.numRows;
         numColumns = closestProfile.numColumns;
@@ -466,7 +466,7 @@ public class InvariantDeviceProfile {
 
     @VisibleForTesting
     static DisplayOption invDistWeightedInterpolate(
-            DefaultDisplay.Info displayInfo, ArrayList<DisplayOption> points) {
+            Info displayInfo, ArrayList<DisplayOption> points) {
         Point smallestSize = new Point(displayInfo.smallestSize);
         Point largestSize = new Point(displayInfo.largestSize);
 
diff --git a/src/com/android/launcher3/anim/AnimatorPlaybackController.java b/src/com/android/launcher3/anim/AnimatorPlaybackController.java
index ea0ff8b687..dcdfb6e51a 100644
--- a/src/com/android/launcher3/anim/AnimatorPlaybackController.java
+++ b/src/com/android/launcher3/anim/AnimatorPlaybackController.java
@@ -19,7 +19,7 @@ import static com.android.launcher3.Utilities.boundToRange;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.Interpolators.clampToProgress;
 import static com.android.launcher3.anim.Interpolators.scrollInterpolatorForVelocity;
-import static com.android.launcher3.util.DefaultDisplay.getSingleFrameMs;
+import static com.android.launcher3.util.DisplayController.getSingleFrameMs;
 
 import android.animation.Animator;
 import android.animation.Animator.AnimatorListener;
diff --git a/src/com/android/launcher3/anim/Interpolators.java b/src/com/android/launcher3/anim/Interpolators.java
index 6ad43ea1e4..8016b2d5b8 100644
--- a/src/com/android/launcher3/anim/Interpolators.java
+++ b/src/com/android/launcher3/anim/Interpolators.java
@@ -16,7 +16,7 @@
 
 package com.android.launcher3.anim;
 
-import static com.android.launcher3.util.DefaultDisplay.getSingleFrameMs;
+import static com.android.launcher3.util.DisplayController.getSingleFrameMs;
 
 import android.content.Context;
 import android.graphics.Path;
diff --git a/src/com/android/launcher3/anim/SpringAnimationBuilder.java b/src/com/android/launcher3/anim/SpringAnimationBuilder.java
index a9702b4784..bd52158f0a 100644
--- a/src/com/android/launcher3/anim/SpringAnimationBuilder.java
+++ b/src/com/android/launcher3/anim/SpringAnimationBuilder.java
@@ -25,7 +25,7 @@ import android.util.FloatProperty;
 import androidx.annotation.FloatRange;
 import androidx.dynamicanimation.animation.SpringForce;
 
-import com.android.launcher3.util.DefaultDisplay;
+import com.android.launcher3.util.DisplayController;
 
 /**
  * Utility class to build an object animator which follows the same path as a spring animation for
@@ -134,7 +134,7 @@ public class SpringAnimationBuilder {
     }
 
     public SpringAnimationBuilder computeParams() {
-        int singleFrameMs = DefaultDisplay.getSingleFrameMs(mContext);
+        int singleFrameMs = DisplayController.getSingleFrameMs(mContext);
         double naturalFreq = Math.sqrt(mStiffness);
         double dampedFreq = naturalFreq * Math.sqrt(1 - mDampingRatio * mDampingRatio);
 
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index 02ca92618e..8ee5a6e533 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -26,7 +26,7 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_COMPONENTS;
 import static com.android.launcher3.states.StateAnimationConfig.PLAY_ATOMIC_OVERVIEW_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.PLAY_NON_ATOMIC;
-import static com.android.launcher3.util.DefaultDisplay.getSingleFrameMs;
+import static com.android.launcher3.util.DisplayController.getSingleFrameMs;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
diff --git a/src/com/android/launcher3/util/ConfigMonitor.java b/src/com/android/launcher3/util/ConfigMonitor.java
index 0f81520578..b3b69f6ab3 100644
--- a/src/com/android/launcher3/util/ConfigMonitor.java
+++ b/src/com/android/launcher3/util/ConfigMonitor.java
@@ -26,14 +26,16 @@ import android.content.res.Configuration;
 import android.graphics.Point;
 import android.util.Log;
 
+import com.android.launcher3.util.DisplayController.DisplayInfoChangeListener;
+import com.android.launcher3.util.DisplayController.Info;
+
 import java.util.function.Consumer;
 
 /**
  * {@link BroadcastReceiver} which watches configuration changes and
  * notifies the callback in case changes which affect the device profile occur.
  */
-public class ConfigMonitor extends BroadcastReceiver implements
-        DefaultDisplay.DisplayInfoChangeListener {
+public class ConfigMonitor extends BroadcastReceiver implements DisplayInfoChangeListener {
 
     private static final String TAG = "ConfigMonitor";
 
@@ -57,9 +59,9 @@ public class ConfigMonitor extends BroadcastReceiver implements
         mFontScale = config.fontScale;
         mDensity = config.densityDpi;
 
-        DefaultDisplay display = DefaultDisplay.INSTANCE.get(context);
+        DisplayController.DisplayHolder display = DisplayController.getDefaultDisplay(context);
         display.addChangeListener(this);
-        DefaultDisplay.Info displayInfo = display.getInfo();
+        Info displayInfo = display.getInfo();
         mDisplayId = displayInfo.id;
 
         mRealSize = new Point(displayInfo.realSize);
@@ -82,7 +84,7 @@ public class ConfigMonitor extends BroadcastReceiver implements
     }
 
     @Override
-    public void onDisplayInfoChanged(DefaultDisplay.Info info, int flags) {
+    public void onDisplayInfoChanged(Info info, int flags) {
         if (info.id != mDisplayId) {
             return;
         }
@@ -113,8 +115,7 @@ public class ConfigMonitor extends BroadcastReceiver implements
     public void unregister() {
         try {
             mContext.unregisterReceiver(this);
-            DefaultDisplay display = DefaultDisplay.INSTANCE.get(mContext);
-            display.removeChangeListener(this);
+            DisplayController.getDefaultDisplay(mContext).removeChangeListener(this);
         } catch (Exception e) {
             Log.e(TAG, "Failed to unregister config monitor", e);
         }
diff --git a/src/com/android/launcher3/util/DefaultDisplay.java b/src/com/android/launcher3/util/DefaultDisplay.java
deleted file mode 100644
index 35788a54c8..0000000000
--- a/src/com/android/launcher3/util/DefaultDisplay.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.util;
-
-import static android.view.Display.DEFAULT_DISPLAY;
-
-import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
-
-import android.content.Context;
-import android.graphics.Point;
-import android.hardware.display.DisplayManager;
-import android.hardware.display.DisplayManager.DisplayListener;
-import android.os.Handler;
-import android.os.Message;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.view.Display;
-
-import androidx.annotation.VisibleForTesting;
-
-import java.util.ArrayList;
-
-/**
- * Utility class to cache properties of default display to avoid a system RPC on every call.
- */
-public class DefaultDisplay implements DisplayListener {
-
-    public static final MainThreadInitializedObject<DefaultDisplay> INSTANCE =
-            new MainThreadInitializedObject<>(DefaultDisplay::new);
-
-    private static final String TAG = "DefaultDisplay";
-
-    public static final int CHANGE_SIZE = 1 << 0;
-    public static final int CHANGE_ROTATION = 1 << 1;
-    public static final int CHANGE_FRAME_DELAY = 1 << 2;
-
-    public static final int CHANGE_ALL = CHANGE_SIZE | CHANGE_ROTATION | CHANGE_FRAME_DELAY;
-
-    private final Context mDisplayContext;
-    private final int mId;
-    private final ArrayList<DisplayInfoChangeListener> mListeners = new ArrayList<>();
-    private final Handler mChangeHandler;
-    private Info mInfo;
-
-    private DefaultDisplay(Context context) {
-        DisplayManager dm = context.getSystemService(DisplayManager.class);
-        // Use application context to create display context so that it can have its own Resources.
-        mDisplayContext = context.getApplicationContext().createDisplayContext(
-                dm.getDisplay(DEFAULT_DISPLAY));
-        // Note that the Display object must be obtained from DisplayManager which is associated to
-        // the display context, so the Display is isolated from Activity and Application to provide
-        // the actual state of device that excludes the additional adjustment and override.
-        mInfo = new Info(mDisplayContext);
-        mId = mInfo.id;
-        mChangeHandler = new Handler(this::onChange);
-
-        dm.registerDisplayListener(this, UI_HELPER_EXECUTOR.getHandler());
-    }
-
-    @Override
-    public final void onDisplayAdded(int displayId) {  }
-
-    @Override
-    public final void onDisplayRemoved(int displayId) { }
-
-    @Override
-    public final void onDisplayChanged(int displayId) {
-        if (displayId != mId) {
-            return;
-        }
-
-        Info oldInfo = mInfo;
-        Info info = new Info(mDisplayContext);
-
-        int change = 0;
-        if (info.hasDifferentSize(oldInfo)) {
-            change |= CHANGE_SIZE;
-        }
-        if (oldInfo.rotation != info.rotation) {
-            change |= CHANGE_ROTATION;
-        }
-        if (info.singleFrameMs != oldInfo.singleFrameMs) {
-            change |= CHANGE_FRAME_DELAY;
-        }
-
-        if (change != 0) {
-            mInfo = info;
-            mChangeHandler.sendEmptyMessage(change);
-        }
-    }
-
-    public static int getSingleFrameMs(Context context) {
-        return INSTANCE.get(context).getInfo().singleFrameMs;
-    }
-
-    public Info getInfo() {
-        return mInfo;
-    }
-
-    public void addChangeListener(DisplayInfoChangeListener listener) {
-        mListeners.add(listener);
-    }
-
-    public void removeChangeListener(DisplayInfoChangeListener listener) {
-        mListeners.remove(listener);
-    }
-
-    private boolean onChange(Message msg) {
-        for (int i = mListeners.size() - 1; i >= 0; i--) {
-            mListeners.get(i).onDisplayInfoChanged(mInfo, msg.what);
-        }
-        return true;
-    }
-
-    public static class Info {
-
-        public final int id;
-        public final int rotation;
-        public final int singleFrameMs;
-
-        public final Point realSize;
-        public final Point smallestSize;
-        public final Point largestSize;
-
-        public final DisplayMetrics metrics;
-
-        @VisibleForTesting
-        public Info(int id, int rotation, int singleFrameMs, Point realSize, Point smallestSize,
-                Point largestSize, DisplayMetrics metrics) {
-            this.id = id;
-            this.rotation = rotation;
-            this.singleFrameMs = singleFrameMs;
-            this.realSize = realSize;
-            this.smallestSize = smallestSize;
-            this.largestSize = largestSize;
-            this.metrics = metrics;
-        }
-
-        private Info(Context context) {
-            this(context, context.getSystemService(DisplayManager.class)
-                    .getDisplay(DEFAULT_DISPLAY));
-        }
-
-        public Info(Context context, Display display) {
-            id = display.getDisplayId();
-            rotation = display.getRotation();
-
-            float refreshRate = display.getRefreshRate();
-            singleFrameMs = refreshRate > 0 ? (int) (1000 / refreshRate) : 16;
-
-            realSize = new Point();
-            smallestSize = new Point();
-            largestSize = new Point();
-            display.getRealSize(realSize);
-            display.getCurrentSizeRange(smallestSize, largestSize);
-
-            metrics = context.getResources().getDisplayMetrics();
-        }
-
-        private boolean hasDifferentSize(Info info) {
-            if (!realSize.equals(info.realSize)
-                    && !realSize.equals(info.realSize.y, info.realSize.x)) {
-                Log.d(TAG, String.format("Display size changed from %s to %s",
-                        info.realSize, realSize));
-                return true;
-            }
-
-            if (!smallestSize.equals(info.smallestSize) || !largestSize.equals(info.largestSize)) {
-                Log.d(TAG, String.format("Available size changed from [%s, %s] to [%s, %s]",
-                        smallestSize, largestSize, info.smallestSize, info.largestSize));
-                return true;
-            }
-
-            return false;
-        }
-    }
-
-    /**
-     * Interface for listening for display changes
-     */
-    public interface DisplayInfoChangeListener {
-
-        void onDisplayInfoChanged(Info info, int flags);
-    }
-}
diff --git a/src/com/android/launcher3/util/DisplayController.java b/src/com/android/launcher3/util/DisplayController.java
new file mode 100644
index 0000000000..e5c84418c6
--- /dev/null
+++ b/src/com/android/launcher3/util/DisplayController.java
@@ -0,0 +1,274 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.util;
+
+import static android.view.Display.DEFAULT_DISPLAY;
+
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+
+import android.content.Context;
+import android.graphics.Point;
+import android.hardware.display.DisplayManager;
+import android.hardware.display.DisplayManager.DisplayListener;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.util.SparseArray;
+import android.view.Display;
+
+import androidx.annotation.VisibleForTesting;
+
+import java.util.ArrayList;
+
+/**
+ * Utility class to cache properties of default display to avoid a system RPC on every call.
+ */
+public class DisplayController implements DisplayListener {
+
+    private static final String TAG = "DisplayController";
+
+    public static final MainThreadInitializedObject<DisplayController> INSTANCE =
+            new MainThreadInitializedObject<>(DisplayController::new);
+
+    private final SparseArray<DisplayHolder> mOtherDisplays = new SparseArray<>(0);
+    // We store the default display separately, to avoid null checks for primary use case.
+    private final DisplayHolder mDefaultDisplay;
+
+    private final ArrayList<DisplayListChangeListener> mListListeners = new ArrayList<>();
+
+    private DisplayController(Context context) {
+        mDefaultDisplay = new DisplayHolder(context, DEFAULT_DISPLAY);
+
+        DisplayManager dm = context.getSystemService(DisplayManager.class);
+        dm.registerDisplayListener(this, UI_HELPER_EXECUTOR.getHandler());
+    }
+
+    @Override
+    public final void onDisplayAdded(int displayId) {
+        DisplayHolder holder = new DisplayHolder(mDefaultDisplay.mDisplayContext, displayId);
+        synchronized (mOtherDisplays) {
+            mOtherDisplays.put(displayId, holder);
+        }
+        MAIN_EXECUTOR.execute(() -> mListListeners.forEach(l-> l.onDisplayAdded(holder)));
+    }
+
+    @Override
+    public final void onDisplayRemoved(int displayId) {
+        synchronized (mOtherDisplays) {
+            mOtherDisplays.remove(displayId);
+        }
+        MAIN_EXECUTOR.execute(() -> mListListeners.forEach(l-> l.onDisplayRemoved(displayId)));
+    }
+
+    /**
+     * Returns the holder corresponding to the given display
+     */
+    public DisplayHolder getHolder(int displayId) {
+        if (displayId == mDefaultDisplay.mId) {
+            return mDefaultDisplay;
+        } else {
+            synchronized (mOtherDisplays) {
+                return mOtherDisplays.get(displayId);
+            }
+        }
+    }
+
+    /**
+     * Adds a listener for display list changes
+     */
+    public void addListChangeListener(DisplayListChangeListener listener) {
+        mListListeners.add(listener);
+    }
+
+    /**
+     * Removes a previously added display list change listener
+     */
+    public void removeListChangeListener(DisplayListChangeListener listener) {
+        mListListeners.remove(listener);
+    }
+
+    @Override
+    public final void onDisplayChanged(int displayId) {
+        DisplayHolder holder = getHolder(displayId);
+        if (holder != null) {
+            holder.handleOnChange();
+        }
+    }
+
+    public static int getSingleFrameMs(Context context) {
+        return getDefaultDisplay(context).getInfo().singleFrameMs;
+    }
+
+    public static DisplayHolder getDefaultDisplay(Context context) {
+        return INSTANCE.get(context).mDefaultDisplay;
+    }
+
+    /**
+     * A listener to receiving addition or removal of new displays
+     */
+    public interface DisplayListChangeListener {
+
+        /**
+         * Called when a new display is added
+         */
+        void onDisplayAdded(DisplayHolder holder);
+
+        /**
+         * Called when a previously added display is removed
+         */
+        void onDisplayRemoved(int displayId);
+    }
+
+    /**
+     * Interface for listening for display changes
+     */
+    public interface DisplayInfoChangeListener {
+
+        void onDisplayInfoChanged(Info info, int flags);
+    }
+
+    public static class DisplayHolder {
+
+        public static final int CHANGE_SIZE = 1 << 0;
+        public static final int CHANGE_ROTATION = 1 << 1;
+        public static final int CHANGE_FRAME_DELAY = 1 << 2;
+
+        public static final int CHANGE_ALL = CHANGE_SIZE | CHANGE_ROTATION | CHANGE_FRAME_DELAY;
+
+        final Context mDisplayContext;
+        final int mId;
+        private final ArrayList<DisplayInfoChangeListener> mListeners = new ArrayList<>();
+        private DisplayController.Info mInfo;
+
+        public DisplayHolder(Context context, int id) {
+            DisplayManager dm = context.getSystemService(DisplayManager.class);
+            // Use application context to create display context so that it can have its own
+            // Resources.
+            mDisplayContext = context.getApplicationContext()
+                    .createDisplayContext(dm.getDisplay(id));
+            // Note that the Display object must be obtained from DisplayManager which is
+            // associated to the display context, so the Display is isolated from Activity and
+            // Application to provide the actual state of device that excludes the additional
+            // adjustment and override.
+            mInfo = new DisplayController.Info(mDisplayContext);
+            mId = mInfo.id;
+        }
+
+        public void addChangeListener(DisplayInfoChangeListener listener) {
+            mListeners.add(listener);
+        }
+
+        public void removeChangeListener(DisplayInfoChangeListener listener) {
+            mListeners.remove(listener);
+        }
+
+        public DisplayController.Info getInfo() {
+            return mInfo;
+        }
+
+        protected void handleOnChange() {
+            Info oldInfo = mInfo;
+            Info info = new Info(mDisplayContext);
+
+            int change = 0;
+            if (info.hasDifferentSize(oldInfo)) {
+                change |= CHANGE_SIZE;
+            }
+            if (oldInfo.rotation != info.rotation) {
+                change |= CHANGE_ROTATION;
+            }
+            if (info.singleFrameMs != oldInfo.singleFrameMs) {
+                change |= CHANGE_FRAME_DELAY;
+            }
+
+            if (change != 0) {
+                mInfo = info;
+                final int flags = change;
+                MAIN_EXECUTOR.execute(() -> notifyChange(flags));
+            }
+        }
+
+        private void notifyChange(int flags) {
+            for (int i = mListeners.size() - 1; i >= 0; i--) {
+                mListeners.get(i).onDisplayInfoChanged(mInfo, flags);
+            }
+        }
+
+    }
+
+    public static class Info {
+
+        public final int id;
+        public final int rotation;
+        public final int singleFrameMs;
+
+        public final Point realSize;
+        public final Point smallestSize;
+        public final Point largestSize;
+
+        public final DisplayMetrics metrics;
+
+        @VisibleForTesting
+        public Info(int id, int rotation, int singleFrameMs, Point realSize, Point smallestSize,
+                Point largestSize, DisplayMetrics metrics) {
+            this.id = id;
+            this.rotation = rotation;
+            this.singleFrameMs = singleFrameMs;
+            this.realSize = realSize;
+            this.smallestSize = smallestSize;
+            this.largestSize = largestSize;
+            this.metrics = metrics;
+        }
+
+        private Info(Context context) {
+            this(context, context.getSystemService(DisplayManager.class)
+                    .getDisplay(DEFAULT_DISPLAY));
+        }
+
+        public Info(Context context, Display display) {
+            id = display.getDisplayId();
+            rotation = display.getRotation();
+
+            float refreshRate = display.getRefreshRate();
+            singleFrameMs = refreshRate > 0 ? (int) (1000 / refreshRate) : 16;
+
+            realSize = new Point();
+            smallestSize = new Point();
+            largestSize = new Point();
+            display.getRealSize(realSize);
+            display.getCurrentSizeRange(smallestSize, largestSize);
+
+            metrics = context.getResources().getDisplayMetrics();
+        }
+
+        private boolean hasDifferentSize(Info info) {
+            if (!realSize.equals(info.realSize)
+                    && !realSize.equals(info.realSize.y, info.realSize.x)) {
+                Log.d(TAG, String.format("Display size changed from %s to %s",
+                        info.realSize, realSize));
+                return true;
+            }
+
+            if (!smallestSize.equals(info.smallestSize) || !largestSize.equals(info.largestSize)) {
+                Log.d(TAG, String.format("Available size changed from [%s, %s] to [%s, %s]",
+                        smallestSize, largestSize, info.smallestSize, info.largestSize));
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/com/android/launcher3/views/BaseDragLayer.java b/src/com/android/launcher3/views/BaseDragLayer.java
index 357eeb81f9..2be827b01a 100644
--- a/src/com/android/launcher3/views/BaseDragLayer.java
+++ b/src/com/android/launcher3/views/BaseDragLayer.java
@@ -20,7 +20,7 @@ import static android.view.MotionEvent.ACTION_CANCEL;
 import static android.view.MotionEvent.ACTION_DOWN;
 import static android.view.MotionEvent.ACTION_UP;
 
-import static com.android.launcher3.util.DefaultDisplay.getSingleFrameMs;
+import static com.android.launcher3.util.DisplayController.getSingleFrameMs;
 
 import android.annotation.TargetApi;
 import android.app.WallpaperInfo;
diff --git a/src/com/android/launcher3/views/FloatingSurfaceView.java b/src/com/android/launcher3/views/FloatingSurfaceView.java
index 040619e9c7..9582232279 100644
--- a/src/com/android/launcher3/views/FloatingSurfaceView.java
+++ b/src/com/android/launcher3/views/FloatingSurfaceView.java
@@ -40,7 +40,7 @@ import com.android.launcher3.GestureNavContract;
 import com.android.launcher3.Insettable;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
-import com.android.launcher3.util.DefaultDisplay;
+import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.Executors;
 
 /**
@@ -97,7 +97,7 @@ public class FloatingSurfaceView extends AbstractFloatingView implements
 
         // Remove after some time, to avoid flickering
         Executors.MAIN_EXECUTOR.getHandler().postDelayed(mRemoveViewRunnable,
-                DefaultDisplay.INSTANCE.get(mLauncher).getInfo().singleFrameMs);
+                DisplayController.getDefaultDisplay(mLauncher).getInfo().singleFrameMs);
     }
 
     private void removeViewFromParent() {
-- 
GitLab


From 60e68c91e93395f7ebe51d3d9a3986ff5d381c8e Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 12 Aug 2020 13:59:27 -0700
Subject: [PATCH 0090/1664] Removing static state management from the install
 shortcut queue

Change-Id: I0b74a843b2081ee314e0840d5ea8ab8ddabde32b
---
 src/com/android/launcher3/Launcher.java       |  24 ++--
 src/com/android/launcher3/LauncherModel.java  |   4 +-
 .../launcher3/SessionCommitReceiver.java      |   4 +-
 .../launcher3/dragndrop/AddItemActivity.java  |   7 +-
 .../android/launcher3/model/BgDataModel.java  |   3 +-
 .../ItemInstallQueue.java}                    | 124 ++++++++++++------
 .../launcher3/model/PackageUpdatedTask.java   |   4 +-
 .../launcher3/pm/InstallSessionHelper.java    |   6 +-
 8 files changed, 112 insertions(+), 64 deletions(-)
 rename src/com/android/launcher3/{InstallShortcutReceiver.java => model/ItemInstallQueue.java} (81%)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 3f64df3702..2ddaaea4db 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -24,7 +24,6 @@ import static com.android.launcher3.AbstractFloatingView.TYPE_ALL;
 import static com.android.launcher3.AbstractFloatingView.TYPE_ICON_SURFACE;
 import static com.android.launcher3.AbstractFloatingView.TYPE_REBIND_SAFE;
 import static com.android.launcher3.AbstractFloatingView.TYPE_SNACKBAR;
-import static com.android.launcher3.InstallShortcutReceiver.FLAG_DRAG_AND_DROP;
 import static com.android.launcher3.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY;
 import static com.android.launcher3.LauncherState.ALL_APPS;
 import static com.android.launcher3.LauncherState.FLAG_CLOSE_POPUPS;
@@ -43,6 +42,9 @@ import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKG
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ONRESUME;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ONSTOP;
 import static com.android.launcher3.logging.StatsLogManager.containerTypeToAtomState;
+import static com.android.launcher3.model.ItemInstallQueue.FLAG_ACTIVITY_PAUSED;
+import static com.android.launcher3.model.ItemInstallQueue.FLAG_DRAG_AND_DROP;
+import static com.android.launcher3.model.ItemInstallQueue.FLAG_LOADER_RUNNING;
 import static com.android.launcher3.popup.SystemShortcut.APP_INFO;
 import static com.android.launcher3.popup.SystemShortcut.INSTALL;
 import static com.android.launcher3.popup.SystemShortcut.WIDGETS;
@@ -120,6 +122,7 @@ import com.android.launcher3.logging.FileLog;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.logging.UserEventDispatcher;
 import com.android.launcher3.model.BgDataModel.Callbacks;
+import com.android.launcher3.model.ItemInstallQueue;
 import com.android.launcher3.model.ModelUtils;
 import com.android.launcher3.model.ModelWriter;
 import com.android.launcher3.model.data.AppInfo;
@@ -912,8 +915,8 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         getUserEventDispatcher().startSession();
 
         // Process any items that were added while Launcher was away.
-        InstallShortcutReceiver.disableAndFlushInstallQueue(
-                InstallShortcutReceiver.FLAG_ACTIVITY_PAUSED, this);
+        ItemInstallQueue.INSTANCE.get(this)
+                .resumeModelPush(FLAG_ACTIVITY_PAUSED);
 
         // Refresh shortcuts if the permission changed.
         mModel.validateModelDataOnResume();
@@ -1007,7 +1010,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         if (state == SPRING_LOADED) {
             // Prevent any Un/InstallShortcutReceivers from updating the db while we are
             // not on homescreen
-            InstallShortcutReceiver.enableInstallQueue(FLAG_DRAG_AND_DROP);
+            ItemInstallQueue.INSTANCE.get(this).pauseModelPush(FLAG_DRAG_AND_DROP);
             getRotationHelper().setCurrentStateRequest(REQUEST_LOCK);
 
             mWorkspace.showPageIndicatorAtCurrentScroll();
@@ -1032,7 +1035,8 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
         if (state == NORMAL) {
             // Re-enable any Un/InstallShortcutReceiver and now process any queued items
-            InstallShortcutReceiver.disableAndFlushInstallQueue(FLAG_DRAG_AND_DROP, this);
+            ItemInstallQueue.INSTANCE.get(this)
+                    .resumeModelPush(FLAG_DRAG_AND_DROP);
 
             // Clear any rotation locks when going to normal state
             getRotationHelper().setCurrentStateRequest(REQUEST_NONE);
@@ -1066,7 +1070,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     @Override
     protected void onPause() {
         // Ensure that items added to Launcher are queued until Launcher returns
-        InstallShortcutReceiver.enableInstallQueue(InstallShortcutReceiver.FLAG_ACTIVITY_PAUSED);
+        ItemInstallQueue.INSTANCE.get(this).pauseModelPush(FLAG_ACTIVITY_PAUSED);
 
         super.onPause();
         mDragController.cancelDrag();
@@ -2421,8 +2425,8 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
             mPendingActivityResult = null;
         }
 
-        InstallShortcutReceiver.disableAndFlushInstallQueue(
-                InstallShortcutReceiver.FLAG_LOADER_RUNNING, this);
+        ItemInstallQueue.INSTANCE.get(this)
+                .resumeModelPush(FLAG_LOADER_RUNNING);
 
         // When undoing the removal of the last item on a page, return to that page.
         // Since we are just resetting the current page without user interaction,
@@ -2449,8 +2453,8 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
     private ValueAnimator createNewAppBounceAnimation(View v, int i) {
         ValueAnimator bounceAnim = new PropertyListBuilder().alpha(1).scale(1).build(v)
-                .setDuration(InstallShortcutReceiver.NEW_SHORTCUT_BOUNCE_DURATION);
-        bounceAnim.setStartDelay(i * InstallShortcutReceiver.NEW_SHORTCUT_STAGGER_DELAY);
+                .setDuration(ItemInstallQueue.NEW_SHORTCUT_BOUNCE_DURATION);
+        bounceAnim.setStartDelay(i * ItemInstallQueue.NEW_SHORTCUT_STAGGER_DELAY);
         bounceAnim.setInterpolator(new OvershootInterpolator(BOUNCE_ANIMATION_TENSION));
         return bounceAnim;
     }
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index e2568d5ef6..f306c78d02 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -43,6 +43,7 @@ import com.android.launcher3.model.BaseModelUpdateTask;
 import com.android.launcher3.model.BgDataModel;
 import com.android.launcher3.model.BgDataModel.Callbacks;
 import com.android.launcher3.model.CacheDataUpdatedTask;
+import com.android.launcher3.model.ItemInstallQueue;
 import com.android.launcher3.model.LoaderResults;
 import com.android.launcher3.model.LoaderTask;
 import com.android.launcher3.model.ModelDelegate;
@@ -330,7 +331,8 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi
      */
     public boolean startLoader() {
         // Enable queue before starting loader. It will get disabled in Launcher#finishBindingItems
-        InstallShortcutReceiver.enableInstallQueue(InstallShortcutReceiver.FLAG_LOADER_RUNNING);
+        ItemInstallQueue.INSTANCE.get(mApp.getContext())
+                .pauseModelPush(ItemInstallQueue.FLAG_LOADER_RUNNING);
         synchronized (mLock) {
             // Don't bother to start the thread if we know it's not going to do anything
             final Callbacks[] callbacksList = getCallbacks();
diff --git a/src/com/android/launcher3/SessionCommitReceiver.java b/src/com/android/launcher3/SessionCommitReceiver.java
index e48ffb95ea..007e5f5370 100644
--- a/src/com/android/launcher3/SessionCommitReceiver.java
+++ b/src/com/android/launcher3/SessionCommitReceiver.java
@@ -25,6 +25,7 @@ import android.content.pm.PackageManager;
 import android.os.UserHandle;
 import android.text.TextUtils;
 
+import com.android.launcher3.model.ItemInstallQueue;
 import com.android.launcher3.pm.InstallSessionHelper;
 
 /**
@@ -59,7 +60,8 @@ public class SessionCommitReceiver extends BroadcastReceiver {
             return;
         }
 
-        InstallShortcutReceiver.queueApplication(info.getAppPackageName(), user, context);
+        ItemInstallQueue.INSTANCE.get(context)
+                .queueItem(info.getAppPackageName(), user);
     }
 
     public static boolean isEnabled(Context context) {
diff --git a/src/com/android/launcher3/dragndrop/AddItemActivity.java b/src/com/android/launcher3/dragndrop/AddItemActivity.java
index 0df67133ab..2d625c5373 100644
--- a/src/com/android/launcher3/dragndrop/AddItemActivity.java
+++ b/src/com/android/launcher3/dragndrop/AddItemActivity.java
@@ -43,13 +43,13 @@ import android.view.View.OnLongClickListener;
 import android.view.View.OnTouchListener;
 
 import com.android.launcher3.BaseActivity;
-import com.android.launcher3.InstallShortcutReceiver;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherAppWidgetHost;
 import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.R;
+import com.android.launcher3.model.ItemInstallQueue;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.pm.PinRequestHelper;
 import com.android.launcher3.userevent.nano.LauncherLogProto.Action;
@@ -249,7 +249,7 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
      */
     public void onPlaceAutomaticallyClick(View v) {
         if (mRequest.getRequestType() == PinItemRequest.REQUEST_TYPE_SHORTCUT) {
-            InstallShortcutReceiver.queueShortcut(mRequest.getShortcutInfo(), this);
+            ItemInstallQueue.INSTANCE.get(this).queueItem(mRequest.getShortcutInfo());
             logCommand(Action.Command.CONFIRM);
             mRequest.accept();
             finish();
@@ -270,7 +270,8 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
     }
 
     private void acceptWidget(int widgetId) {
-        InstallShortcutReceiver.queueWidget(mRequest.getAppWidgetProviderInfo(this), widgetId, this);
+        ItemInstallQueue.INSTANCE.get(this)
+                .queueItem(mRequest.getAppWidgetProviderInfo(this), widgetId);
         mWidgetOptions.putInt(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId);
         mRequest.accept(mWidgetOptions);
         logCommand(Action.Command.CONFIRM);
diff --git a/src/com/android/launcher3/model/BgDataModel.java b/src/com/android/launcher3/model/BgDataModel.java
index 140342f98c..7e45021bf3 100644
--- a/src/com/android/launcher3/model/BgDataModel.java
+++ b/src/com/android/launcher3/model/BgDataModel.java
@@ -31,7 +31,6 @@ import android.text.TextUtils;
 import android.util.ArraySet;
 import android.util.Log;
 
-import com.android.launcher3.InstallShortcutReceiver;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.Workspace;
@@ -298,7 +297,7 @@ public class BgDataModel {
                         .filter(wi -> wi.itemType == Favorites.ITEM_TYPE_DEEP_SHORTCUT)
                         .map(ShortcutKey::fromItemInfo),
                     // Pending shortcuts
-                    InstallShortcutReceiver.getPendingShortcuts(context)
+                    ItemInstallQueue.INSTANCE.get(context).getPendingShortcuts()
                         .stream().filter(si -> si.user.equals(user)))
                 .collect(groupingBy(ShortcutKey::getPackageName,
                         mapping(ShortcutKey::getId, Collectors.toSet())));
diff --git a/src/com/android/launcher3/InstallShortcutReceiver.java b/src/com/android/launcher3/model/ItemInstallQueue.java
similarity index 81%
rename from src/com/android/launcher3/InstallShortcutReceiver.java
rename to src/com/android/launcher3/model/ItemInstallQueue.java
index d2b05c5b01..6238db3152 100644
--- a/src/com/android/launcher3/InstallShortcutReceiver.java
+++ b/src/com/android/launcher3/model/ItemInstallQueue.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher3;
+package com.android.launcher3.model;
 
 import static android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID;
 
@@ -42,13 +42,19 @@ import android.util.Pair;
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
 
+import com.android.launcher3.InvariantDeviceProfile;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.LauncherSettings.Favorites;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pm.UserCache;
 import com.android.launcher3.shortcuts.ShortcutKey;
 import com.android.launcher3.shortcuts.ShortcutRequest;
+import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.launcher3.util.Preconditions;
 
 import org.json.JSONException;
@@ -63,16 +69,15 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-public class InstallShortcutReceiver {
+/**
+ * Class to maintain a queue of pending items to be added to the workspace.
+ */
+public class ItemInstallQueue {
 
     public static final int FLAG_ACTIVITY_PAUSED = 1;
     public static final int FLAG_LOADER_RUNNING = 2;
     public static final int FLAG_DRAG_AND_DROP = 4;
 
-    // Determines whether to defer installing shortcuts immediately until
-    // processAllPendingInstalls() is called.
-    private static int sInstallQueueDisabledFlags = 0;
-
     private static final String TAG = "InstallShortcutReceiver";
     private static final boolean DBG = false;
 
@@ -82,10 +87,23 @@ public class InstallShortcutReceiver {
     public static final int NEW_SHORTCUT_BOUNCE_DURATION = 450;
     public static final int NEW_SHORTCUT_STAGGER_DELAY = 85;
 
+    public static MainThreadInitializedObject<ItemInstallQueue> INSTANCE =
+            new MainThreadInitializedObject<>(ItemInstallQueue::new);
+
+    private final Context mContext;
+
+    // Determines whether to defer installing shortcuts immediately until
+    // processAllPendingInstalls() is called.
+    private int mInstallQueueDisabledFlags = 0;
+
+    private ItemInstallQueue(Context context) {
+        mContext = context;
+    }
+
     @WorkerThread
-    private static void addToQueue(Context context, PendingInstallShortcutInfo info) {
-        String encoded = info.encodeToString(context);
-        SharedPreferences prefs = Utilities.getPrefs(context);
+    private void addToQueue(PendingInstallShortcutInfo info) {
+        String encoded = info.encodeToString(mContext);
+        SharedPreferences prefs = Utilities.getPrefs(mContext);
         Set<String> strings = prefs.getStringSet(APPS_PENDING_INSTALL, null);
         strings = (strings != null) ? new HashSet<>(strings) : new HashSet<>(1);
         strings.add(encoded);
@@ -93,14 +111,15 @@ public class InstallShortcutReceiver {
     }
 
     @WorkerThread
-    private static void flushQueueInBackground(Context context) {
-        if (Launcher.ACTIVITY_TRACKER.getCreatedActivity() == null) {
+    private void flushQueueInBackground() {
+        Launcher launcher = Launcher.ACTIVITY_TRACKER.getCreatedActivity();
+        if (launcher == null) {
             // Launcher not loaded
             return;
         }
 
         ArrayList<Pair<ItemInfo, Object>> installQueue = new ArrayList<>();
-        SharedPreferences prefs = Utilities.getPrefs(context);
+        SharedPreferences prefs = Utilities.getPrefs(mContext);
         Set<String> strings = prefs.getStringSet(APPS_PENDING_INSTALL, null);
         if (DBG) Log.d(TAG, "Getting and clearing APPS_PENDING_INSTALL: " + strings);
         if (strings == null) {
@@ -108,29 +127,31 @@ public class InstallShortcutReceiver {
         }
 
         for (String encoded : strings) {
-            PendingInstallShortcutInfo info = decode(encoded, context);
+            PendingInstallShortcutInfo info = decode(encoded, mContext);
             if (info == null) {
                 continue;
             }
 
             // Generate a shortcut info to add into the model
-            installQueue.add(info.getItemInfo(context));
+            installQueue.add(info.getItemInfo(mContext));
         }
         prefs.edit().remove(APPS_PENDING_INSTALL).apply();
         if (!installQueue.isEmpty()) {
-            LauncherAppState.getInstance(context).getModel()
-                    .addAndBindAddedWorkspaceItems(installQueue);
+            launcher.getModel().addAndBindAddedWorkspaceItems(installQueue);
         }
     }
 
-    public static void removeFromInstallQueue(Context context, HashSet<String> packageNames,
-            UserHandle user) {
+    /**
+     * Removes previously added items from the queue.
+     */
+    @WorkerThread
+    public void removeFromInstallQueue(HashSet<String> packageNames, UserHandle user) {
         if (packageNames.isEmpty()) {
             return;
         }
         Preconditions.assertWorkerThread();
 
-        SharedPreferences sp = Utilities.getPrefs(context);
+        SharedPreferences sp = Utilities.getPrefs(mContext);
         Set<String> strings = sp.getStringSet(APPS_PENDING_INSTALL, null);
         if (DBG) {
             Log.d(TAG, "APPS_PENDING_INSTALL: " + strings
@@ -144,7 +165,7 @@ public class InstallShortcutReceiver {
         while (newStringsIter.hasNext()) {
             String encoded = newStringsIter.next();
             try {
-                Decoder decoder = new Decoder(encoded, context);
+                Decoder decoder = new Decoder(encoded, mContext);
                 if (packageNames.contains(getIntentPackage(decoder.intent))
                         && user.equals(decoder.user)) {
                     newStringsIter.remove();
@@ -157,30 +178,42 @@ public class InstallShortcutReceiver {
         sp.edit().putStringSet(APPS_PENDING_INSTALL, newStrings).apply();
     }
 
-    public static void queueShortcut(ShortcutInfo info, Context context) {
-        queuePendingShortcutInfo(new PendingInstallShortcutInfo(info), context);
+    /**
+     * Adds an item to the install queue
+     */
+    public void queueItem(ShortcutInfo info) {
+        queuePendingShortcutInfo(new PendingInstallShortcutInfo(info));
     }
 
-    public static void queueWidget(AppWidgetProviderInfo info, int widgetId, Context context) {
-        queuePendingShortcutInfo(new PendingInstallShortcutInfo(info, widgetId), context);
+    /**
+     * Adds an item to the install queue
+     */
+    public void queueItem(AppWidgetProviderInfo info, int widgetId) {
+        queuePendingShortcutInfo(new PendingInstallShortcutInfo(info, widgetId));
     }
 
-    public static void queueApplication(
-            String packageName, UserHandle userHandle, Context context) {
-        queuePendingShortcutInfo(new PendingInstallShortcutInfo(packageName, userHandle), context);
+    /**
+     * Adds an item to the install queue
+     */
+    public void queueItem(String packageName, UserHandle userHandle) {
+        queuePendingShortcutInfo(new PendingInstallShortcutInfo(packageName, userHandle));
     }
 
-    public static HashSet<ShortcutKey> getPendingShortcuts(Context context) {
+    /**
+     * Returns all pending shorts in the queue
+     */
+    @WorkerThread
+    public HashSet<ShortcutKey> getPendingShortcuts() {
         HashSet<ShortcutKey> result = new HashSet<>();
 
-        Set<String> strings = Utilities.getPrefs(context).getStringSet(APPS_PENDING_INSTALL, null);
+        Set<String> strings = Utilities.getPrefs(mContext).getStringSet(APPS_PENDING_INSTALL, null);
         if (strings == null || ((Collection) strings).isEmpty()) {
             return result;
         }
 
         for (String encoded : strings) {
             try {
-                Decoder decoder = new Decoder(encoded, context);
+                Decoder decoder = new Decoder(encoded, mContext);
                 if (decoder.optInt(Favorites.ITEM_TYPE, -1) == ITEM_TYPE_DEEP_SHORTCUT) {
                     result.add(ShortcutKey.fromIntent(decoder.intent, decoder.user));
                 }
@@ -191,28 +224,35 @@ public class InstallShortcutReceiver {
         return result;
     }
 
-    private static void queuePendingShortcutInfo(PendingInstallShortcutInfo info, Context context) {
+    private void queuePendingShortcutInfo(PendingInstallShortcutInfo info) {
         // Queue the item up for adding if launcher has not loaded properly yet
-        MODEL_EXECUTOR.post(() -> addToQueue(context, info));
-        flushInstallQueue(context);
+        MODEL_EXECUTOR.post(() -> addToQueue(info));
+        flushInstallQueue();
     }
 
-    public static void enableInstallQueue(int flag) {
-        sInstallQueueDisabledFlags |= flag;
+    /**
+     * Pauses the push-to-model flow until unpaused. All items are held in the queue and
+     * not added to the model.
+     */
+    public void pauseModelPush(int flag) {
+        mInstallQueueDisabledFlags |= flag;
     }
-    public static void disableAndFlushInstallQueue(int flag, Context context) {
-        sInstallQueueDisabledFlags &= ~flag;
-        flushInstallQueue(context);
+
+    /**
+     * Adds all the queue items to the model if the use is completely resumed.
+     */
+    public void resumeModelPush(int flag) {
+        mInstallQueueDisabledFlags &= ~flag;
+        flushInstallQueue();
     }
 
-    static void flushInstallQueue(Context context) {
-        if (sInstallQueueDisabledFlags != 0) {
+    private void flushInstallQueue() {
+        if (mInstallQueueDisabledFlags != 0) {
             return;
         }
-        MODEL_EXECUTOR.post(() -> flushQueueInBackground(context));
+        MODEL_EXECUTOR.post(this::flushQueueInBackground);
     }
 
-
     private static class PendingInstallShortcutInfo extends ItemInfo {
 
         final Intent intent;
diff --git a/src/com/android/launcher3/model/PackageUpdatedTask.java b/src/com/android/launcher3/model/PackageUpdatedTask.java
index c0ae6f903c..896bfb666e 100644
--- a/src/com/android/launcher3/model/PackageUpdatedTask.java
+++ b/src/com/android/launcher3/model/PackageUpdatedTask.java
@@ -28,7 +28,6 @@ import android.os.UserHandle;
 import android.os.UserManager;
 import android.util.Log;
 
-import com.android.launcher3.InstallShortcutReceiver;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.config.FeatureFlags;
@@ -320,7 +319,8 @@ public class PackageUpdatedTask extends BaseModelUpdateTask {
             deleteAndBindComponentsRemoved(removeMatch);
 
             // Remove any queued items from the install queue
-            InstallShortcutReceiver.removeFromInstallQueue(context, removedPackages, mUser);
+            ItemInstallQueue.INSTANCE.get(context)
+                    .removeFromInstallQueue(removedPackages, mUser);
         }
 
         if (mOp == OP_ADD) {
diff --git a/src/com/android/launcher3/pm/InstallSessionHelper.java b/src/com/android/launcher3/pm/InstallSessionHelper.java
index d546013fca..753a6dd85e 100644
--- a/src/com/android/launcher3/pm/InstallSessionHelper.java
+++ b/src/com/android/launcher3/pm/InstallSessionHelper.java
@@ -32,11 +32,11 @@ import android.text.TextUtils;
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 
-import com.android.launcher3.InstallShortcutReceiver;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.SessionCommitReceiver;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
+import com.android.launcher3.model.ItemInstallQueue;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.IntSet;
 import com.android.launcher3.util.LooperExecutor;
@@ -213,8 +213,8 @@ public class InstallSessionHelper {
                 && !mPromiseIconIds.contains(sessionInfo.getSessionId())
                 && new PackageManagerHelper(mAppContext).getApplicationInfo(
                         sessionInfo.getAppPackageName(), getUserHandle(sessionInfo), 0) == null) {
-            InstallShortcutReceiver.queueApplication(
-                    sessionInfo.getAppPackageName(), getUserHandle(sessionInfo), mAppContext);
+            ItemInstallQueue.INSTANCE.get(mAppContext)
+                    .queueItem(sessionInfo.getAppPackageName(), getUserHandle(sessionInfo));
 
             mPromiseIconIds.add(sessionInfo.getSessionId());
             updatePromiseIconPrefs();
-- 
GitLab


From a310e9c035c87c4fc5b3d23bbcc70f11ffc48561 Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Mon, 10 Aug 2020 17:04:40 -0700
Subject: [PATCH 0091/1664] Refactors LauncherPreviewRenderer to better support
 subclassing.

Basically this removes the inner class MainThreadRenderer, which
was only created and used for its populate() method in the parent's
getRenderedView() method. All methods and members of that subclass
are merged into the parent LauncherPreviewRenderer class, and
getRenderedView() simply inlines the previous populate() code.

Other smaller changes:
 - Extracted out shouldShowQsb() and shouldShowRealLauncherPreview()
 - Disables search view and its children to prevent interaction

Change-Id: I7d0cce73efbe022c16661a0ad66eefe5cb285641
---
 .../graphics/LauncherPreviewRenderer.java     | 488 +++++++++---------
 1 file changed, 244 insertions(+), 244 deletions(-)

diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index d8eb838ed5..cca9836835 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -117,7 +117,8 @@ import java.util.concurrent.TimeoutException;
  *   4) Measure and draw the view on a canvas
  */
 @TargetApi(Build.VERSION_CODES.O)
-public class LauncherPreviewRenderer {
+public class LauncherPreviewRenderer extends ContextThemeWrapper
+        implements ActivityContext, WorkspaceLayoutManager, LayoutInflater.Factory2 {
 
     private static final String TAG = "LauncherPreviewRenderer";
 
@@ -211,10 +212,14 @@ public class LauncherPreviewRenderer {
     private final DeviceProfile mDp;
     private final boolean mMigrated;
     private final Rect mInsets;
-
     private final WorkspaceItemInfo mWorkspaceItemInfo;
+    private final LayoutInflater mHomeElementInflater;
+    private final InsettableFrameLayout mRootView;
+    private final Hotseat mHotseat;
+    private final CellLayout mWorkspace;
 
     public LauncherPreviewRenderer(Context context, InvariantDeviceProfile idp, boolean migrated) {
+        super(context, R.style.AppTheme);
         mUiHandler = new Handler(Looper.getMainLooper());
         mContext = context;
         mIdp = idp;
@@ -239,291 +244,286 @@ public class LauncherPreviewRenderer {
         mWorkspaceItemInfo.intent = new Intent();
         mWorkspaceItemInfo.contentDescription = mWorkspaceItemInfo.title =
                 context.getString(R.string.label_application);
+
+        mHomeElementInflater = LayoutInflater.from(
+                new ContextThemeWrapper(this, R.style.HomeScreenElementTheme));
+        mHomeElementInflater.setFactory2(this);
+
+        mRootView = (InsettableFrameLayout) mHomeElementInflater.inflate(
+                R.layout.launcher_preview_layout, null, false);
+        mRootView.setInsets(mInsets);
+        measureView(mRootView, mDp.widthPx, mDp.heightPx);
+
+        mHotseat = mRootView.findViewById(R.id.hotseat);
+        mHotseat.resetLayout(false);
+
+        mWorkspace = mRootView.findViewById(R.id.workspace);
+        mWorkspace.setPadding(mDp.workspacePadding.left + mDp.cellLayoutPaddingLeftRightPx,
+                mDp.workspacePadding.top,
+                mDp.workspacePadding.right + mDp.cellLayoutPaddingLeftRightPx,
+                mDp.workspacePadding.bottom);
     }
 
     /** Populate preview and render it. */
     public View getRenderedView() {
-        MainThreadRenderer renderer = new MainThreadRenderer(mContext);
-        renderer.populate();
-        return renderer.mRootView;
+        populate();
+        return mRootView;
     }
 
-    private class MainThreadRenderer extends ContextThemeWrapper
-            implements ActivityContext, WorkspaceLayoutManager, LayoutInflater.Factory2 {
-
-        private final LayoutInflater mHomeElementInflater;
-        private final InsettableFrameLayout mRootView;
+    public boolean shouldShowRealLauncherPreview() {
+        return ENABLE_LAUNCHER_PREVIEW_IN_GRID_PICKER.get();
+    }
 
-        private final Hotseat mHotseat;
-        private final CellLayout mWorkspace;
+    public boolean shouldShowQsb() {
+        return FeatureFlags.QSB_ON_FIRST_SCREEN;
+    }
 
-        MainThreadRenderer(Context context) {
-            super(context, R.style.AppTheme);
+    @Override
+    public View onCreateView(View parent, String name, Context context, AttributeSet attrs) {
+        if ("TextClock".equals(name)) {
+            // Workaround for TextClock accessing handler for unregistering ticker.
+            return new TextClock(context, attrs) {
 
-            mHomeElementInflater = LayoutInflater.from(
-                    new ContextThemeWrapper(this, R.style.HomeScreenElementTheme));
-            mHomeElementInflater.setFactory2(this);
+                @Override
+                public Handler getHandler() {
+                    return mUiHandler;
+                }
+            };
+        } else if (!"fragment".equals(name)) {
+            return null;
+        }
 
-            mRootView = (InsettableFrameLayout) mHomeElementInflater.inflate(
-                    R.layout.launcher_preview_layout, null, false);
-            mRootView.setInsets(mInsets);
-            measureView(mRootView, mDp.widthPx, mDp.heightPx);
+        TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.PreviewFragment);
+        FragmentWithPreview f = (FragmentWithPreview) Fragment.instantiate(
+                context, ta.getString(R.styleable.PreviewFragment_android_name));
+        f.enterPreviewMode(context);
+        f.onInit(null);
 
-            mHotseat = mRootView.findViewById(R.id.hotseat);
-            mHotseat.resetLayout(false);
+        View view = f.onCreateView(LayoutInflater.from(context), (ViewGroup) parent, null);
+        view.setId(ta.getInt(R.styleable.PreviewFragment_android_id, View.NO_ID));
+        return view;
+    }
 
-            mWorkspace = mRootView.findViewById(R.id.workspace);
-            mWorkspace.setPadding(mDp.workspacePadding.left + mDp.cellLayoutPaddingLeftRightPx,
-                    mDp.workspacePadding.top,
-                    mDp.workspacePadding.right + mDp.cellLayoutPaddingLeftRightPx,
-                    mDp.workspacePadding.bottom);
-        }
+    @Override
+    public View onCreateView(String name, Context context, AttributeSet attrs) {
+        return onCreateView(null, name, context, attrs);
+    }
 
-        @Override
-        public View onCreateView(View parent, String name, Context context, AttributeSet attrs) {
-            if ("TextClock".equals(name)) {
-                // Workaround for TextClock accessing handler for unregistering ticker.
-                return new TextClock(context, attrs) {
-
-                    @Override
-                    public Handler getHandler() {
-                        return mUiHandler;
-                    }
-                };
-            } else if (!"fragment".equals(name)) {
-                return null;
-            }
+    @Override
+    public BaseDragLayer getDragLayer() {
+        throw new UnsupportedOperationException();
+    }
 
-            TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.PreviewFragment);
-            FragmentWithPreview f = (FragmentWithPreview) Fragment.instantiate(
-                    context, ta.getString(R.styleable.PreviewFragment_android_name));
-            f.enterPreviewMode(context);
-            f.onInit(null);
+    @Override
+    public DeviceProfile getDeviceProfile() {
+        return mDp;
+    }
 
-            View view = f.onCreateView(LayoutInflater.from(context), (ViewGroup) parent, null);
-            view.setId(ta.getInt(R.styleable.PreviewFragment_android_id, View.NO_ID));
-            return view;
-        }
+    @Override
+    public Hotseat getHotseat() {
+        return mHotseat;
+    }
 
-        @Override
-        public View onCreateView(String name, Context context, AttributeSet attrs) {
-            return onCreateView(null, name, context, attrs);
-        }
+    @Override
+    public CellLayout getScreenWithId(int screenId) {
+        return mWorkspace;
+    }
 
-        @Override
-        public BaseDragLayer getDragLayer() {
-            throw new UnsupportedOperationException();
-        }
+    private void inflateAndAddIcon(WorkspaceItemInfo info) {
+        BubbleTextView icon = (BubbleTextView) mHomeElementInflater.inflate(
+                R.layout.app_icon, mWorkspace, false);
+        icon.applyFromWorkspaceItem(info);
+        addInScreenFromBind(icon, info);
+    }
 
-        @Override
-        public DeviceProfile getDeviceProfile() {
-            return mDp;
-        }
+    private void inflateAndAddFolder(FolderInfo info) {
+        FolderIcon folderIcon = FolderIcon.inflateIcon(R.layout.folder_icon, this, mWorkspace,
+                info);
+        addInScreenFromBind(folderIcon, info);
+    }
 
-        @Override
-        public Hotseat getHotseat() {
-            return mHotseat;
+    private void inflateAndAddWidgets(
+            LauncherAppWidgetInfo info,
+            Map<ComponentKey, AppWidgetProviderInfo> widgetProviderInfoMap) {
+        if (widgetProviderInfoMap == null) {
+            return;
         }
-
-        @Override
-        public CellLayout getScreenWithId(int screenId) {
-            return mWorkspace;
+        AppWidgetProviderInfo providerInfo = widgetProviderInfoMap.get(
+                new ComponentKey(info.providerName, info.user));
+        if (providerInfo == null) {
+            return;
         }
+        inflateAndAddWidgets(info, LauncherAppWidgetProviderInfo.fromProviderInfo(
+                getApplicationContext(), providerInfo));
+    }
 
-        private void inflateAndAddIcon(WorkspaceItemInfo info) {
-            BubbleTextView icon = (BubbleTextView) mHomeElementInflater.inflate(
-                    R.layout.app_icon, mWorkspace, false);
-            icon.applyFromWorkspaceItem(info);
-            addInScreenFromBind(icon, info);
+    private void inflateAndAddWidgets(LauncherAppWidgetInfo info, WidgetsModel widgetsModel) {
+        WidgetItem widgetItem = widgetsModel.getWidgetProviderInfoByProviderName(
+                info.providerName);
+        if (widgetItem == null) {
+            return;
         }
+        inflateAndAddWidgets(info, widgetItem.widgetInfo);
+    }
 
-        private void inflateAndAddFolder(FolderInfo info) {
-            FolderIcon folderIcon = FolderIcon.inflateIcon(R.layout.folder_icon, this, mWorkspace,
-                    info);
-            addInScreenFromBind(folderIcon, info);
-        }
+    private void inflateAndAddWidgets(
+            LauncherAppWidgetInfo info, LauncherAppWidgetProviderInfo providerInfo) {
+        AppWidgetHostView view = new AppWidgetHostView(mContext);
+        view.setAppWidget(-1, providerInfo);
+        view.updateAppWidget(null);
+        view.setTag(info);
+        addInScreenFromBind(view, info);
+    }
 
-        private void inflateAndAddWidgets(LauncherAppWidgetInfo info,
-                Map<ComponentKey, AppWidgetProviderInfo> widgetProviderInfoMap) {
-            if (widgetProviderInfoMap == null) {
-                return;
-            }
-            AppWidgetProviderInfo providerInfo = widgetProviderInfoMap.get(
-                    new ComponentKey(info.providerName, info.user));
-            if (providerInfo == null) {
-                return;
-            }
-            inflateAndAddWidgets(info, LauncherAppWidgetProviderInfo.fromProviderInfo(
-                    getApplicationContext(), providerInfo));
+    private void inflateAndAddPredictedIcon(WorkspaceItemInfo info) {
+        View view = PredictedAppIconInflater.inflate(mHomeElementInflater, mWorkspace, info);
+        if (view != null) {
+            addInScreenFromBind(view, info);
         }
+    }
 
-        private void inflateAndAddWidgets(LauncherAppWidgetInfo info, WidgetsModel widgetsModel) {
-            WidgetItem widgetItem = widgetsModel.getWidgetProviderInfoByProviderName(
-                    info.providerName);
-            if (widgetItem == null) {
-                return;
-            }
-            inflateAndAddWidgets(info, widgetItem.widgetInfo);
+    private void dispatchVisibilityAggregated(View view, boolean isVisible) {
+        // Similar to View.dispatchVisibilityAggregated implementation.
+        final boolean thisVisible = view.getVisibility() == VISIBLE;
+        if (thisVisible || !isVisible) {
+            view.onVisibilityAggregated(isVisible);
         }
 
-        private void inflateAndAddWidgets(LauncherAppWidgetInfo info,
-                LauncherAppWidgetProviderInfo providerInfo) {
-            AppWidgetHostView view = new AppWidgetHostView(mContext);
-            view.setAppWidget(-1, providerInfo);
-            view.updateAppWidget(null);
-            view.setTag(info);
-            addInScreenFromBind(view, info);
-        }
+        if (view instanceof ViewGroup) {
+            isVisible = thisVisible && isVisible;
+            ViewGroup vg = (ViewGroup) view;
+            int count = vg.getChildCount();
 
-        private void inflateAndAddPredictedIcon(WorkspaceItemInfo info) {
-            View view = PredictedAppIconInflater.inflate(mHomeElementInflater, mWorkspace, info);
-            if (view != null) {
-                addInScreenFromBind(view, info);
+            for (int i = 0; i < count; i++) {
+                dispatchVisibilityAggregated(vg.getChildAt(i), isVisible);
             }
         }
+    }
 
-        private void dispatchVisibilityAggregated(View view, boolean isVisible) {
-            // Similar to View.dispatchVisibilityAggregated implementation.
-            final boolean thisVisible = view.getVisibility() == VISIBLE;
-            if (thisVisible || !isVisible) {
-                view.onVisibilityAggregated(isVisible);
+    private void populate() {
+        if (shouldShowRealLauncherPreview()) {
+            WorkspaceFetcher fetcher;
+            PreviewContext previewContext = null;
+            if (mMigrated) {
+                previewContext = new PreviewContext(mContext, mIdp);
+                LauncherAppState appForPreview = new LauncherAppState(
+                        previewContext, null /* iconCacheFileName */);
+                fetcher = new WorkspaceItemsInfoFromPreviewFetcher(appForPreview);
+                MODEL_EXECUTOR.execute(fetcher);
+            } else {
+                fetcher = new WorkspaceItemsInfoFetcher();
+                LauncherAppState.getInstance(mContext).getModel().enqueueModelUpdateTask(
+                        (LauncherModel.ModelUpdateTask) fetcher);
             }
-
-            if (view instanceof ViewGroup) {
-                isVisible = thisVisible && isVisible;
-                ViewGroup vg = (ViewGroup) view;
-                int count = vg.getChildCount();
-
-                for (int i = 0; i < count; i++) {
-                    dispatchVisibilityAggregated(vg.getChildAt(i), isVisible);
-                }
+            WorkspaceResult workspaceResult = fetcher.get();
+            if (previewContext != null) {
+                previewContext.onDestroy();
             }
-        }
-
-        private void populate() {
-            if (ENABLE_LAUNCHER_PREVIEW_IN_GRID_PICKER.get()) {
-                WorkspaceFetcher fetcher;
-                PreviewContext previewContext = null;
-                if (mMigrated) {
-                    previewContext = new PreviewContext(mContext, mIdp);
-                    LauncherAppState appForPreview = new LauncherAppState(
-                            previewContext, null /* iconCacheFileName */);
-                    fetcher = new WorkspaceItemsInfoFromPreviewFetcher(appForPreview);
-                    MODEL_EXECUTOR.execute(fetcher);
-                } else {
-                    fetcher = new WorkspaceItemsInfoFetcher();
-                    LauncherAppState.getInstance(mContext).getModel().enqueueModelUpdateTask(
-                            (LauncherModel.ModelUpdateTask) fetcher);
-                }
-                WorkspaceResult workspaceResult = fetcher.get();
-                if (previewContext != null) {
-                    previewContext.onDestroy();
-                }
 
-                if (workspaceResult == null) {
-                    return;
-                }
-
-                // Separate the items that are on the current screen, and all the other remaining
-                // items
-                ArrayList<ItemInfo> currentWorkspaceItems = new ArrayList<>();
-                ArrayList<ItemInfo> otherWorkspaceItems = new ArrayList<>();
-                ArrayList<LauncherAppWidgetInfo> currentAppWidgets = new ArrayList<>();
-                ArrayList<LauncherAppWidgetInfo> otherAppWidgets = new ArrayList<>();
-
-                filterCurrentWorkspaceItems(0 /* currentScreenId */,
-                        workspaceResult.mWorkspaceItems, currentWorkspaceItems,
-                        otherWorkspaceItems);
-                filterCurrentWorkspaceItems(0 /* currentScreenId */, workspaceResult.mAppWidgets,
-                        currentAppWidgets, otherAppWidgets);
-                sortWorkspaceItemsSpatially(mIdp, currentWorkspaceItems);
-
-                for (ItemInfo itemInfo : currentWorkspaceItems) {
-                    switch (itemInfo.itemType) {
-                        case Favorites.ITEM_TYPE_APPLICATION:
-                        case Favorites.ITEM_TYPE_SHORTCUT:
-                        case Favorites.ITEM_TYPE_DEEP_SHORTCUT:
-                            inflateAndAddIcon((WorkspaceItemInfo) itemInfo);
-                            break;
-                        case LauncherSettings.Favorites.ITEM_TYPE_FOLDER:
-                            inflateAndAddFolder((FolderInfo) itemInfo);
-                            break;
-                        default:
-                            break;
-                    }
-                }
-                for (ItemInfo itemInfo : currentAppWidgets) {
-                    switch (itemInfo.itemType) {
-                        case Favorites.ITEM_TYPE_APPWIDGET:
-                        case Favorites.ITEM_TYPE_CUSTOM_APPWIDGET:
-                            if (mMigrated) {
-                                inflateAndAddWidgets((LauncherAppWidgetInfo) itemInfo,
-                                        workspaceResult.mWidgetProvidersMap);
-                            } else {
-                                inflateAndAddWidgets((LauncherAppWidgetInfo) itemInfo,
-                                        workspaceResult.mWidgetsModel);
-                            }
-                            break;
-                        default:
-                            break;
-                    }
-                }
+            if (workspaceResult == null) {
+                return;
+            }
 
-                IntArray ranks = getMissingHotseatRanks(currentWorkspaceItems,
-                        mIdp.numHotseatIcons);
-                int count = Math.min(ranks.size(), workspaceResult.mCachedPredictedItems.size());
-                for (int i = 0; i < count; i++) {
-                    AppInfo appInfo = workspaceResult.mCachedPredictedItems.get(i);
-                    int rank = ranks.get(i);
-                    WorkspaceItemInfo itemInfo = new WorkspaceItemInfo(appInfo);
-                    itemInfo.container = LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION;
-                    itemInfo.rank = rank;
-                    itemInfo.cellX = mHotseat.getCellXFromOrder(rank);
-                    itemInfo.cellY = mHotseat.getCellYFromOrder(rank);
-                    itemInfo.screenId = rank;
-                    inflateAndAddPredictedIcon(itemInfo);
-                }
-            } else {
-                // Add hotseat icons
-                for (int i = 0; i < mIdp.numHotseatIcons; i++) {
-                    WorkspaceItemInfo info = new WorkspaceItemInfo(mWorkspaceItemInfo);
-                    info.container = Favorites.CONTAINER_HOTSEAT;
-                    info.screenId = i;
-                    inflateAndAddIcon(info);
+            // Separate the items that are on the current screen, and the other remaining items.
+            ArrayList<ItemInfo> currentWorkspaceItems = new ArrayList<>();
+            ArrayList<ItemInfo> otherWorkspaceItems = new ArrayList<>();
+            ArrayList<LauncherAppWidgetInfo> currentAppWidgets = new ArrayList<>();
+            ArrayList<LauncherAppWidgetInfo> otherAppWidgets = new ArrayList<>();
+            filterCurrentWorkspaceItems(0 /* currentScreenId */,
+                    workspaceResult.mWorkspaceItems, currentWorkspaceItems,
+                    otherWorkspaceItems);
+            filterCurrentWorkspaceItems(0 /* currentScreenId */, workspaceResult.mAppWidgets,
+                    currentAppWidgets, otherAppWidgets);
+            sortWorkspaceItemsSpatially(mIdp, currentWorkspaceItems);
+            for (ItemInfo itemInfo : currentWorkspaceItems) {
+                switch (itemInfo.itemType) {
+                    case Favorites.ITEM_TYPE_APPLICATION:
+                    case Favorites.ITEM_TYPE_SHORTCUT:
+                    case Favorites.ITEM_TYPE_DEEP_SHORTCUT:
+                        inflateAndAddIcon((WorkspaceItemInfo) itemInfo);
+                        break;
+                    case Favorites.ITEM_TYPE_FOLDER:
+                        inflateAndAddFolder((FolderInfo) itemInfo);
+                        break;
+                    default:
+                        break;
                 }
-                // Add workspace icons
-                for (int i = 0; i < mIdp.numColumns; i++) {
-                    WorkspaceItemInfo info = new WorkspaceItemInfo(mWorkspaceItemInfo);
-                    info.container = Favorites.CONTAINER_DESKTOP;
-                    info.screenId = 0;
-                    info.cellX = i;
-                    info.cellY = mIdp.numRows - 1;
-                    inflateAndAddIcon(info);
+            }
+            for (ItemInfo itemInfo : currentAppWidgets) {
+                switch (itemInfo.itemType) {
+                    case Favorites.ITEM_TYPE_APPWIDGET:
+                    case Favorites.ITEM_TYPE_CUSTOM_APPWIDGET:
+                        if (mMigrated) {
+                            inflateAndAddWidgets((LauncherAppWidgetInfo) itemInfo,
+                                    workspaceResult.mWidgetProvidersMap);
+                        } else {
+                            inflateAndAddWidgets((LauncherAppWidgetInfo) itemInfo,
+                                    workspaceResult.mWidgetsModel);
+                        }
+                        break;
+                    default:
+                        break;
                 }
             }
-
-            // Add first page QSB
-            if (FeatureFlags.QSB_ON_FIRST_SCREEN) {
-                View qsb = mHomeElementInflater.inflate(
-                        R.layout.search_container_workspace, mWorkspace, false);
-                CellLayout.LayoutParams lp =
-                        new CellLayout.LayoutParams(0, 0, mWorkspace.getCountX(), 1);
-                lp.canReorder = false;
-                mWorkspace.addViewToCellLayout(qsb, 0, R.id.search_container_workspace, lp, true);
+            IntArray ranks = getMissingHotseatRanks(currentWorkspaceItems,
+                    mIdp.numHotseatIcons);
+            int count = Math.min(ranks.size(), workspaceResult.mCachedPredictedItems.size());
+            for (int i = 0; i < count; i++) {
+                AppInfo appInfo = workspaceResult.mCachedPredictedItems.get(i);
+                int rank = ranks.get(i);
+                WorkspaceItemInfo itemInfo = new WorkspaceItemInfo(appInfo);
+                itemInfo.container = Favorites.CONTAINER_HOTSEAT_PREDICTION;
+                itemInfo.rank = rank;
+                itemInfo.cellX = mHotseat.getCellXFromOrder(rank);
+                itemInfo.cellY = mHotseat.getCellYFromOrder(rank);
+                itemInfo.screenId = rank;
+                inflateAndAddPredictedIcon(itemInfo);
+            }
+        } else {
+            // Add hotseat icons
+            for (int i = 0; i < mIdp.numHotseatIcons; i++) {
+                WorkspaceItemInfo info = new WorkspaceItemInfo(mWorkspaceItemInfo);
+                info.container = Favorites.CONTAINER_HOTSEAT;
+                info.screenId = i;
+                inflateAndAddIcon(info);
+            }
+            // Add workspace icons
+            for (int i = 0; i < mIdp.numColumns; i++) {
+                WorkspaceItemInfo info = new WorkspaceItemInfo(mWorkspaceItemInfo);
+                info.container = Favorites.CONTAINER_DESKTOP;
+                info.screenId = 0;
+                info.cellX = i;
+                info.cellY = mIdp.numRows - 1;
+                inflateAndAddIcon(info);
             }
+        }
+
+        // Add first page QSB
+        if (shouldShowQsb()) {
+            View qsb = mHomeElementInflater.inflate(
+                    R.layout.search_container_workspace, mWorkspace, false);
+            CellLayout.LayoutParams lp =
+                    new CellLayout.LayoutParams(0, 0, mWorkspace.getCountX(), 1);
+            lp.canReorder = false;
+            mWorkspace.addViewToCellLayout(qsb, 0, R.id.search_container_workspace, lp, true);
+        }
 
-            // Setup search view
-            SearchUiManager searchUiManager =
-                    mRootView.findViewById(R.id.search_container_all_apps);
-            mRootView.findViewById(R.id.apps_view).setTranslationY(
-                    mDp.heightPx - searchUiManager.getScrollRangeDelta(mInsets));
-
-            measureView(mRootView, mDp.widthPx, mDp.heightPx);
-            dispatchVisibilityAggregated(mRootView, true);
-            measureView(mRootView, mDp.widthPx, mDp.heightPx);
-            // Additional measure for views which use auto text size API
-            measureView(mRootView, mDp.widthPx, mDp.heightPx);
+        // Setup search view
+        SearchUiManager searchUiManager =
+                mRootView.findViewById(R.id.search_container_all_apps);
+        mRootView.findViewById(R.id.apps_view).setTranslationY(
+                mDp.heightPx - searchUiManager.getScrollRangeDelta(mInsets));
+        ViewGroup searchView = (ViewGroup) searchUiManager;
+        searchView.setEnabled(false);
+        for (int i = 0; i < searchView.getChildCount(); i++) {
+            searchView.getChildAt(i).setEnabled(false);
         }
+
+        measureView(mRootView, mDp.widthPx, mDp.heightPx);
+        dispatchVisibilityAggregated(mRootView, true);
+        measureView(mRootView, mDp.widthPx, mDp.heightPx);
+        // Additional measure for views which use auto text size API
+        measureView(mRootView, mDp.widthPx, mDp.heightPx);
     }
 
     private static void measureView(View view, int width, int height) {
-- 
GitLab


From 59d04e6ea69dc0c81fceab601194d8c0a6238fa0 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 12 Aug 2020 18:05:42 -0700
Subject: [PATCH 0092/1664] Use system VelocityTracker instead of forking least
 squares algorithm

Change-Id: I8e03cdd0942b9037054cd1955bdb6809c89f3ea2
---
 .../quickstep/util/MotionPauseDetector.java   | 144 ++----------------
 .../launcher3/config/FeatureFlags.java        |   6 +-
 2 files changed, 19 insertions(+), 131 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java b/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java
index f60f7ad6d8..b86293607e 100644
--- a/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java
+++ b/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java
@@ -15,12 +15,13 @@
  */
 package com.android.quickstep.util;
 
-import static com.android.launcher3.config.FeatureFlags.ENABLE_LSQ_VELOCITY_PROVIDER;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_SYSTEM_VELOCITY_PROVIDER;
 
 import android.content.Context;
 import android.content.res.Resources;
 import android.util.Log;
 import android.view.MotionEvent;
+import android.view.VelocityTracker;
 
 import com.android.launcher3.Alarm;
 import com.android.launcher3.R;
@@ -92,8 +93,8 @@ public class MotionPauseDetector {
         mForcePauseTimeout = new Alarm();
         mForcePauseTimeout.setOnAlarmListener(alarm -> updatePaused(true /* isPaused */));
         mMakePauseHarderToTrigger = makePauseHarderToTrigger;
-        mVelocityProvider = ENABLE_LSQ_VELOCITY_PROVIDER.get()
-                ? new LSqVelocityProvider(axis) : new LinearVelocityProvider(axis);
+        mVelocityProvider = ENABLE_SYSTEM_VELOCITY_PROVIDER.get()
+                ? new SystemVelocityProvider(axis) : new LinearVelocityProvider(axis);
     }
 
     /**
@@ -264,141 +265,28 @@ public class MotionPauseDetector {
         }
     }
 
-    /**
-     * Java implementation of {@link android.view.VelocityTracker} using the Least Square (deg 2)
-     * algorithm.
-     */
-    private static class LSqVelocityProvider implements VelocityProvider {
-
-        // Maximum age of a motion event to be considered when calculating the velocity.
-        private static final long HORIZON_MS = 100;
-        // Number of samples to keep.
-        private static final int HISTORY_SIZE = 20;
-
-        // Position history are stored in a circular array
-        private final long[] mHistoricTimes = new long[HISTORY_SIZE];
-        private final float[] mHistoricPos = new float[HISTORY_SIZE];
-        private int mHistoryCount = 0;
-        private int mHistoryStart = 0;
+    private static class SystemVelocityProvider implements VelocityProvider {
 
+        private final VelocityTracker mVelocityTracker;
         private final int mAxis;
 
-        LSqVelocityProvider(int axis) {
+        SystemVelocityProvider(int axis) {
+            mVelocityTracker = VelocityTracker.obtain();
             mAxis = axis;
         }
 
-        @Override
-        public void clear() {
-            mHistoryCount = mHistoryStart = 0;
-        }
-
-        private void addPositionAndTime(long eventTime, float eventPosition) {
-            mHistoricTimes[mHistoryStart] = eventTime;
-            mHistoricPos[mHistoryStart] = eventPosition;
-            mHistoryStart++;
-            if (mHistoryStart >= HISTORY_SIZE) {
-                mHistoryStart = 0;
-            }
-            mHistoryCount = Math.min(HISTORY_SIZE, mHistoryCount + 1);
-        }
-
         @Override
         public Float addMotionEvent(MotionEvent ev, int pointer) {
-            // Add all historic points
-            int historyCount = ev.getHistorySize();
-            for (int i = 0; i < historyCount; i++) {
-                addPositionAndTime(
-                        ev.getHistoricalEventTime(i), ev.getHistoricalAxisValue(mAxis, pointer, i));
-            }
-
-            // Start index for the last position (about to be added)
-            int eventStartIndex = mHistoryStart;
-            addPositionAndTime(ev.getEventTime(), ev.getAxisValue(mAxis, pointer));
-            return solveUnweightedLeastSquaresDeg2(eventStartIndex);
+            mVelocityTracker.addMovement(ev);
+            mVelocityTracker.computeCurrentVelocity(1); // px / ms
+            return mAxis == MotionEvent.AXIS_X
+                    ? mVelocityTracker.getXVelocity(pointer)
+                    : mVelocityTracker.getYVelocity(pointer);
         }
 
-        /**
-         * Solves the instantaneous velocity.
-         * Based on solveUnweightedLeastSquaresDeg2 in VelocityTracker.cpp
-         */
-        private Float solveUnweightedLeastSquaresDeg2(final int pointPos) {
-            final long eventTime = mHistoricTimes[pointPos];
-
-            float sxi = 0, sxiyi = 0, syi = 0, sxi2 = 0, sxi3 = 0, sxi2yi = 0, sxi4 = 0;
-            int count = 0;
-            for (int i = 0; i < mHistoryCount; i++) {
-                int index = pointPos - i;
-                if (index < 0) {
-                    index += HISTORY_SIZE;
-                }
-
-                long time = mHistoricTimes[index];
-                long age = eventTime - time;
-                if (age > HORIZON_MS) {
-                    break;
-                }
-                count++;
-                float xi = -age;
-
-                float yi = mHistoricPos[index];
-                float xi2 = xi * xi;
-                float xi3 = xi2 * xi;
-                float xi4 = xi3 * xi;
-                float xiyi = xi * yi;
-                float xi2yi = xi2 * yi;
-
-                sxi += xi;
-                sxi2 += xi2;
-                sxiyi += xiyi;
-                sxi2yi += xi2yi;
-                syi += yi;
-                sxi3 += xi3;
-                sxi4 += xi4;
-            }
-
-            if (count < 3) {
-                // Too few samples
-                switch (count) {
-                    case 2: {
-                        int endPos = pointPos - 1;
-                        if (endPos < 0) {
-                            endPos += HISTORY_SIZE;
-                        }
-                        long denominator = eventTime - mHistoricTimes[endPos];
-                        if (denominator != 0) {
-                            return (mHistoricPos[pointPos] - mHistoricPos[endPos]) / denominator;
-                        }
-                    }
-                    // fall through
-                    case 1:
-                        return 0f;
-                    default:
-                        return null;
-                }
-            }
-
-            float Sxx = sxi2 - sxi * sxi / count;
-            float Sxy = sxiyi - sxi * syi / count;
-            float Sxx2 = sxi3 - sxi * sxi2 / count;
-            float Sx2y = sxi2yi - sxi2 * syi / count;
-            float Sx2x2 = sxi4 - sxi2 * sxi2 / count;
-
-            float denominator = Sxx * Sx2x2 - Sxx2 * Sxx2;
-            if (denominator == 0) {
-                // division by 0 when computing velocity
-                return null;
-            }
-            // Compute a
-            // float numerator = Sx2y*Sxx - Sxy*Sxx2;
-
-            // Compute b
-            float numerator = Sxy * Sx2x2 - Sx2y * Sxx2;
-            float b = numerator / denominator;
-
-            // Compute c
-            // float c = syi/count - b * sxi/count - a * sxi2/count;
-
-            return b;
+        @Override
+        public void clear() {
+            mVelocityTracker.clear();
         }
     }
 }
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 0ab74afd87..74a3a272d2 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -161,9 +161,9 @@ public final class FeatureFlags {
             "ENABLE_UNIVERSAL_SMARTSPACE", false,
             "Replace Smartspace with a version rendered by System UI.");
 
-    public static final BooleanFlag ENABLE_LSQ_VELOCITY_PROVIDER = getDebugFlag(
-            "ENABLE_LSQ_VELOCITY_PROVIDER", true,
-            "Use Least Square algorithm for motion pause detection.");
+    public static final BooleanFlag ENABLE_SYSTEM_VELOCITY_PROVIDER = getDebugFlag(
+            "ENABLE_SYSTEM_VELOCITY_PROVIDER", true,
+            "Use system VelocityTracker's algorithm for motion pause detection.");
 
     public static final BooleanFlag ALWAYS_USE_HARDWARE_OPTIMIZATION_FOR_FOLDER_ANIMATIONS =
             getDebugFlag(
-- 
GitLab


From 81c0cac4574915a6bf77955bbb74ecc1cde79c6f Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Thu, 13 Aug 2020 11:01:15 -0700
Subject: [PATCH 0093/1664] [Live Tile] Place the target app back above
 Launcher when swipe up end target is home

Test: manual
Bug: 160361464
Change-Id: Ic2b332774fe3f25f36f0bfd2b5e6cf66fb1d09dd
---
 .../src/com/android/quickstep/AbsSwipeUpHandler.java       | 1 +
 .../src/com/android/quickstep/util/TaskViewSimulator.java  | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
index 282f6fa2b8..2ca07eccd0 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1059,6 +1059,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         }
 
         if (mGestureState.getEndTarget() == HOME) {
+            mTaskViewSimulator.setDrawsBelowRecents(false);
             HomeAnimationFactory homeAnimFactory = createHomeAnimationFactory(duration);
             RectFSpringAnim windowAnim = createWindowAnimationToHome(start, homeAnimFactory);
             windowAnim.addAnimatorListener(new AnimationSuccessListener() {
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java
index e5f4d38762..903e87a7f8 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -325,9 +325,10 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
                 .withWindowCrop(mTmpCropRect)
                 .withCornerRadius(getCurrentCornerRadius());
 
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && mDrawsBelowRecents
-                && params.getRecentsSurface() != null) {
-            builder.withRelativeLayerTo(params.getRecentsSurface(), Integer.MIN_VALUE);
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && params.getRecentsSurface() != null) {
+            // When relativeLayer = 0, it reverts the surfaces back to the original order.
+            builder.withRelativeLayerTo(params.getRecentsSurface(),
+                    mDrawsBelowRecents ? Integer.MIN_VALUE : 0);
         }
     }
 
-- 
GitLab


From 8ad575e1e65c8a73b37abcd89062c22a27f0ad37 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Sat, 1 Aug 2020 16:08:48 -0700
Subject: [PATCH 0094/1664] Handle overview actions in Live Tile mode

- Switch to screenshot and finish recents animation when an overview action is selected

Fixes: 162564471
Test: Manual
Change-Id: I3db20619435d079bb39ce4cb37b46ea775416336
---
 .../android/quickstep/TaskOverlayFactory.java | 21 +++++++++++++++
 .../android/quickstep/views/RecentsView.java  | 26 ++++++++++++++-----
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java
index 36579ec736..3a47024592 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java
@@ -18,6 +18,7 @@ package com.android.quickstep;
 
 import static android.view.Surface.ROTATION_0;
 
+import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.quickstep.views.OverviewActionsView.DISABLED_NO_THUMBNAIL;
 import static com.android.quickstep.views.OverviewActionsView.DISABLED_ROTATED;
 
@@ -41,6 +42,7 @@ import com.android.launcher3.popup.SystemShortcut;
 import com.android.launcher3.util.ResourceBasedOverride;
 import com.android.quickstep.util.RecentsOrientedState;
 import com.android.quickstep.views.OverviewActionsView;
+import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskThumbnailView;
 import com.android.quickstep.views.TaskView;
 import com.android.systemui.shared.recents.model.Task;
@@ -155,6 +157,7 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
                 getActionsView().setCallbacks(new OverlayUICallbacks() {
                     @Override
                     public void onShare() {
+                        endLiveTileMode(isAllowedByPolicy);
                         if (isAllowedByPolicy) {
                             mImageApi.startShareActivity();
                         } else {
@@ -165,12 +168,30 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
                     @SuppressLint("NewApi")
                     @Override
                     public void onScreenshot() {
+                        endLiveTileMode(isAllowedByPolicy);
                         saveScreenshot(task);
                     }
                 });
             }
         }
 
+        /**
+         * End rendering live tile in Overview.
+         *
+         * @param showScreenshot if it's true, we take a screenshot and switch to it.
+         */
+        public void endLiveTileMode(boolean showScreenshot) {
+            if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+                RecentsView recentsView = mThumbnailView.getTaskView().getRecentsView();
+                if (showScreenshot) {
+                    recentsView.switchToScreenshot(
+                            () -> recentsView.finishRecentsAnimation(true /* toRecents */, null));
+                } else {
+                    recentsView.finishRecentsAnimation(true /* toRecents */, null);
+                }
+            }
+        }
+
         /**
          * Called to save screenshot of the task thumbnail.
          */
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
index 52677607ab..a9b5bf3ea9 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
@@ -2294,13 +2294,13 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mRecentsAnimationController.finish(toRecents, () -> {
             if (onFinishComplete != null) {
                 onFinishComplete.run();
-                // After we finish the recents animation, the current task id should be correctly
-                // reset so that when the task is launched from Overview later, it goes through the
-                // flow of starting a new task instead of finishing recents animation to app. A
-                // typical example of this is (1) user swipes up from app to Overview (2) user
-                // taps on QSB (3) user goes back to Overview and launch the most recent task.
-                setCurrentTask(-1);
             }
+            // After we finish the recents animation, the current task id should be correctly
+            // reset so that when the task is launched from Overview later, it goes through the
+            // flow of starting a new task instead of finishing recents animation to app. A
+            // typical example of this is (1) user swipes up from app to Overview (2) user
+            // taps on QSB (3) user goes back to Overview and launch the most recent task.
+            setCurrentTask(-1);
         });
     }
 
@@ -2428,7 +2428,19 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         }
     }
 
-    /** If it's in the live tile mode, switch the running task into screenshot mode. */
+    /**
+     * Switch the current running task view to static snapshot mode,
+     * capturing the snapshot at the same time.
+     */
+    public void switchToScreenshot(Runnable onFinishRunnable) {
+        switchToScreenshot(mRunningTaskId == -1 ? null
+                : mRecentsAnimationController.screenshotTask(mRunningTaskId), onFinishRunnable);
+    }
+
+    /**
+     * Switch the current running task view to static snapshot mode, using the
+     * provided thumbnail data as the snapshot.
+     */
     public void switchToScreenshot(ThumbnailData thumbnailData, Runnable onFinishRunnable) {
         TaskView taskView = getRunningTaskView();
         if (taskView != null) {
-- 
GitLab


From 8cac927bdb1054de643db86c918bb825f0860177 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Fri, 14 Aug 2020 00:11:36 -0700
Subject: [PATCH 0095/1664] Hookup existing AllAppsSearchPlugin interface to
 SearchBarController Bug: 161801331

Change-Id: Ied575f78ad2139c6818ae5a13467b7399b9ab17a
---
 .../search/AllAppsSearchBarController.java    | 75 +++++++++++++++++--
 .../search/AppsSearchContainerLayout.java     | 12 ++-
 .../systemui/plugins/AllAppsSearchPlugin.java | 31 +++-----
 3 files changed, 92 insertions(+), 26 deletions(-)

diff --git a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
index 06faaacd8e..0d8748165a 100644
--- a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
+++ b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
@@ -15,15 +15,23 @@
  */
 package com.android.launcher3.allapps.search;
 
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
+import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.View.OnFocusChangeListener;
 import android.view.inputmethod.EditorInfo;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
+import android.widget.Toast;
+
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.ExtendedEditText;
@@ -32,23 +40,31 @@ import com.android.launcher3.Utilities;
 import com.android.launcher3.allapps.AlphabeticalAppsList;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
 import com.android.launcher3.util.PackageManagerHelper;
+import com.android.systemui.plugins.AllAppsSearchPlugin;
+import com.android.systemui.plugins.PluginListener;
 
 import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
 
 /**
  * An interface to a search box that AllApps can command.
  */
 public class AllAppsSearchBarController
         implements TextWatcher, OnEditorActionListener, ExtendedEditText.OnBackKeyListener,
-        OnFocusChangeListener {
+        OnFocusChangeListener, PluginListener<AllAppsSearchPlugin> {
 
+    private static final String TAG = "AllAppsSearchBarContoller";
     protected BaseDraggingActivity mLauncher;
     protected Callbacks mCb;
     protected ExtendedEditText mInput;
     protected String mQuery;
 
     protected SearchAlgorithm mSearchAlgorithm;
+    private AllAppsSearchPlugin mPlugin;
+    private Consumer mPlubinCb;
 
     public void setVisibility(int visibility) {
         mInput.setVisibility(visibility);
@@ -59,7 +75,7 @@ public class AllAppsSearchBarController
      */
     public final void initialize(
             SearchAlgorithm searchAlgorithm, ExtendedEditText input,
-            BaseDraggingActivity launcher, Callbacks cb) {
+            BaseDraggingActivity launcher, Callbacks cb, Consumer<List<Bundle>> secondaryCb) {
         mCb = cb;
         mLauncher = launcher;
 
@@ -69,11 +85,19 @@ public class AllAppsSearchBarController
         mInput.setOnBackKeyListener(this);
         mInput.setOnFocusChangeListener(this);
         mSearchAlgorithm = searchAlgorithm;
+
+        PluginManagerWrapper.INSTANCE.get(launcher).addPluginListener(this,
+                AllAppsSearchPlugin.class);
+        mPlubinCb = secondaryCb;
     }
 
     @Override
     public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-        // Do nothing
+        if (mPlugin != null) {
+            if (s.length() == 0) {
+                mPlugin.startedTyping();
+            }
+        }
     }
 
     @Override
@@ -90,6 +114,9 @@ public class AllAppsSearchBarController
         } else {
             mSearchAlgorithm.cancel(false);
             mSearchAlgorithm.doSearch(mQuery, mCb);
+            if (mPlugin != null) {
+                mPlugin.performSearch(mQuery, mPlubinCb);
+            }
         }
     }
 
@@ -170,13 +197,52 @@ public class AllAppsSearchBarController
         return mInput.isFocused();
     }
 
+    @Override
+    public void onPluginConnected(AllAppsSearchPlugin allAppsSearchPlugin, Context context) {
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
+            mPlugin = allAppsSearchPlugin;
+            checkCallPermission();
+        }
+    }
+
+    /**
+     * Check call permissions.
+     */
+    public void checkCallPermission() {
+        final String[] permission = {"android.permission.CALL_PHONE",
+                "android.permission.READ_CONTACTS"};
+        boolean request = false;
+        for (String p : permission) {
+            int permissionCheck = ContextCompat.checkSelfPermission(mLauncher, p);
+            if (permissionCheck != PackageManager.PERMISSION_GRANTED) {
+                request = true;
+            }
+        }
+
+        if (!request) return;
+        boolean rationale = false;
+        for (String p : permission) {
+            if (mLauncher.shouldShowRequestPermissionRationale(p)) {
+                rationale = true;
+            }
+            if (rationale) {
+                Log.e(TAG, p + " Show rationale");
+                Toast.makeText(mLauncher, "Requesting Permissions", Toast.LENGTH_SHORT).show();
+            } else {
+                ActivityCompat.requestPermissions(mLauncher,  permission,  123);
+                Log.e(TAG, p + " request permission");
+            }
+        }
+
+    }
+
     /**
      * Callback for getting search results.
      */
     public interface Callbacks {
 
         /**
-         * Called when the search is complete.
+         * Called when the search from primary source is complete.
          *
          * @param items sorted list of search result adapter items.
          */
@@ -187,5 +253,4 @@ public class AllAppsSearchBarController
          */
         void clearSearchResult();
     }
-
 }
\ No newline at end of file
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
index 16a1efd819..e8a0d7a493 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
@@ -24,6 +24,7 @@ import static com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTO
 
 import android.content.Context;
 import android.graphics.Rect;
+import android.os.Bundle;
 import android.text.Selection;
 import android.text.SpannableStringBuilder;
 import android.text.method.TextKeyListener;
@@ -47,13 +48,15 @@ import com.android.launcher3.allapps.SearchUiManager;
 import com.android.launcher3.anim.PropertySetter;
 
 import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
 
 /**
  * Layout to contain the All-apps search UI.
  */
 public class AppsSearchContainerLayout extends ExtendedEditText
         implements SearchUiManager, AllAppsSearchBarController.Callbacks,
-        AllAppsStore.OnUpdateListener, Insettable {
+        AllAppsStore.OnUpdateListener, Insettable, Consumer<List<Bundle>> {
 
     private final BaseDraggingActivity mLauncher;
     private final AllAppsSearchBarController mSearchBarController;
@@ -136,7 +139,7 @@ public class AppsSearchContainerLayout extends ExtendedEditText
         mAppsView = appsView;
         mSearchBarController.initialize(
                 new DefaultAppSearchAlgorithm(LauncherAppState.getInstance(mLauncher)), this,
-                mLauncher, this);
+                mLauncher, this, this);
     }
 
     @Override
@@ -220,4 +223,9 @@ public class AppsSearchContainerLayout extends ExtendedEditText
     public EditText getEditText() {
         return this;
     }
+
+    @Override
+    public void accept(List<Bundle> bundles) {
+        // TODO: Render the result on mAppsView object
+    }
 }
diff --git a/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java b/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
index c57f07df44..be20e2dbe6 100644
--- a/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
+++ b/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
@@ -16,35 +16,28 @@
 
 package com.android.systemui.plugins;
 
-import android.app.Activity;
-import android.view.ViewGroup;
-import android.widget.EditText;
+import android.os.Bundle;
 
 import com.android.systemui.plugins.annotations.ProvidesInterface;
 
+import java.util.List;
+import java.util.function.Consumer;
+
 /**
- * Implement this plugin interface to replace the all apps recycler view of the all apps drawer.
+ * Implement this plugin interface to fetch search result data from the plugin side.
  */
 @ProvidesInterface(action = AllAppsSearchPlugin.ACTION, version = AllAppsSearchPlugin.VERSION)
 public interface AllAppsSearchPlugin extends Plugin {
     String ACTION = "com.android.systemui.action.PLUGIN_ALL_APPS_SEARCH_ACTIONS";
-    int VERSION = 3;
-
-    /** Following are the order that these methods should be called. */
-    void setup(ViewGroup parent, Activity activity, float allAppsContainerHeight);
+    int VERSION = 4;
 
     /**
-     * When drag starts, pass window inset related fields and the progress to indicate
-     * whether user is swiping down or swiping up
+     * Send signal when user starts typing.
      */
-    void onDragStart(float progress);
-
-    /** progress is between [0, 1] 1: down, 0: up */
-    void setProgress(float progress);
+    void startedTyping();
 
-    /** Called when container animation stops, so that plugin can perform cleanups */
-    void onAnimationEnd(float progress);
-
-    /** pass over the search box object */
-    void setEditText(EditText editText);
+    /**
+     * Send over the query and get the search results.
+     */
+    void performSearch(String query, Consumer<List<Bundle>> results);
 }
-- 
GitLab


From 5fb83a47f292df4be2f55380caac65e36048052d Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Mon, 10 Aug 2020 10:50:36 -0700
Subject: [PATCH 0096/1664] Removing icon recents version

Change-Id: Ibdc88715e38590cedf8a7b5174061bb2c6ef9533
---
 Android.mk                                    |  11 +-
 go/res/values-v26/bools.xml                   |  21 --
 go/res/values/dimens.xml                      |  20 --
 .../launcher3/model/LoaderResults.java        |   8 +-
 .../icons/cache/IconCacheUpdateHandler.java   | 317 ------------------
 .../res/values/colors.xml                     |  24 --
 .../res/values/config.xml                     |  18 -
 .../res/values/dimens.xml                     |  38 ---
 .../recents_ui_overrides/src/REMOVED.txt      |   2 +
 .../res/drawable/all_apps_edu_circle.xml      |   0
 .../drawable/chip_hint_background_light.xml   |   0
 .../res/drawable/chip_scrim_gradient.xml      |   0
 .../hotseat_edu_notification_icon.xml         |   0
 .../res/layout/all_apps_edu_view.xml          |   0
 .../res/layout/fallback_recents_activity.xml  |   0
 .../res/layout/floating_header_content.xml    |   0
 .../res/layout/overview_panel.xml             |   0
 .../res/layout/predicted_app_icon.xml         |   0
 .../res/layout/predicted_hotseat_edu.xml      |   0
 quickstep/res/values/colors.xml               |   8 +
 quickstep/res/values/config.xml               |   2 +
 quickstep/res/values/dimens.xml               |  22 ++
 .../res/values/override.xml                   |   1 -
 .../LauncherAppTransitionManagerImpl.java     |   0
 .../appprediction/AllAppsTipView.java         |   0
 .../appprediction/AppsDividerView.java        |   0
 .../appprediction/ComponentKeyMapper.java     |   0
 .../appprediction/DynamicItemCache.java       |   0
 .../appprediction/InstantAppItemInfo.java     |   0
 .../appprediction/PredictionRowView.java      |   0
 .../hybridhotseat/HotseatEduActivity.java     |   0
 .../hybridhotseat/HotseatEduController.java   |   1 -
 .../hybridhotseat/HotseatEduDialog.java       |   0
 .../hybridhotseat/HotseatFileLog.java         |   0
 .../HotseatPredictionController.java          |   0
 .../hybridhotseat/HotseatPredictionModel.java |   0
 .../hybridhotseat/HotseatRestoreHelper.java   |   0
 .../launcher3/model/AppEventProducer.java     |   0
 .../launcher3/model/PredictionUpdateTask.java |   0
 .../model/QuickstepModelDelegate.java         |   0
 .../uioverrides/PredictedAppIcon.java         |   0
 .../uioverrides/PredictedAppIconInflater.java |   0
 .../uioverrides/QuickstepLauncher.java        |   0
 .../RecentsViewStateController.java           |   0
 .../states/BackgroundAppState.java            |   0
 .../states/OverviewModalTaskState.java        |   0
 .../uioverrides/states/OverviewPeekState.java |   0
 .../uioverrides/states/OverviewState.java     |   0
 .../uioverrides/states/QuickSwitchState.java  |   0
 .../QuickstepAtomicAnimationFactory.java      |   0
 .../FlingAndHoldTouchController.java          |   0
 .../NavBarToHomeTouchController.java          |   0
 ...ButtonNavbarToOverviewTouchController.java |   0
 .../NoButtonQuickSwitchTouchController.java   |   0
 .../OverviewToAllAppsTouchController.java     |   0
 .../PortraitOverviewStateTouchHelper.java     |   0
 .../QuickSwitchTouchController.java           |   0
 .../TaskViewTouchController.java              |   0
 .../TransposedQuickSwitchTouchController.java |   0
 .../android/quickstep/AbsSwipeUpHandler.java  |   0
 .../AppToOverviewAnimationProvider.java       |   0
 .../quickstep/FallbackActivityInterface.java  |   0
 .../quickstep/FallbackSwipeHandler.java       |   0
 .../android/quickstep/ImageActionsApi.java    |   0
 .../quickstep/LauncherActivityInterface.java  |   0
 .../quickstep/LauncherSwipeHandlerV2.java     |   0
 .../quickstep/OverscrollPluginFactory.java    |   0
 .../quickstep/OverviewCommandHelper.java      |   0
 .../QuickstepTestInformationHandler.java      |   0
 .../android/quickstep/RecentsActivity.java    |   0
 .../quickstep/SwipeUpAnimationLogic.java      |   0
 .../android/quickstep/TaskOverlayFactory.java |   0
 .../quickstep/TaskShortcutFactory.java        |   0
 .../com/android/quickstep/TaskViewUtils.java  |   0
 .../quickstep/TouchInteractionService.java    |   0
 .../src/com/android/quickstep/ViewUtils.java  |   0
 .../FallbackNavBarTouchController.java        |   0
 .../FallbackRecentsStateController.java       |   0
 .../fallback/FallbackRecentsView.java         |   0
 .../quickstep/fallback/RecentsDragLayer.java  |   0
 .../quickstep/fallback/RecentsState.java      |   0
 .../fallback/RecentsTaskController.java       |   0
 .../AccessibilityInputConsumer.java           |   0
 .../AssistantInputConsumer.java               |   0
 .../inputconsumers/DelegateInputConsumer.java |   0
 .../DeviceLockedInputConsumer.java            |   0
 .../OneHandedModeInputConsumer.java           |   0
 .../OtherActivityInputConsumer.java           |   0
 .../OverscrollInputConsumer.java              |   0
 .../inputconsumers/OverviewInputConsumer.java |   0
 .../OverviewWithoutFocusInputConsumer.java    |   0
 .../ResetGestureInputConsumer.java            |   0
 .../ScreenPinnedInputConsumer.java            |   0
 .../SysUiOverlayInputConsumer.java            |   0
 .../quickstep/util/ActiveGestureLog.java      |   0
 .../quickstep/util/AssistantUtilities.java    |   0
 .../quickstep/util/InputConsumerProxy.java    |   0
 .../quickstep/util/OverviewToHomeAnim.java    |   0
 .../android/quickstep/util/ProtoTracer.java   |   0
 .../util/RecentsAtomicAnimationFactory.java   |   0
 .../quickstep/util/RectFSpringAnim.java       |   0
 .../android/quickstep/util/ShelfPeekAnim.java |   0
 .../util/StaggeredWorkspaceAnim.java          |   0
 .../util/SurfaceTransactionApplier.java       |   0
 .../quickstep/util/TaskCornerRadius.java      |   0
 .../quickstep/util/TaskViewSimulator.java     |   0
 .../quickstep/util/TransformParams.java       |   0
 .../util/TriggerSwipeUpTouchTracker.java      |   0
 .../quickstep/views/AllAppsEduView.java       |   0
 .../quickstep/views/ClearAllButton.java       |   0
 .../views/DigitalWellBeingToast.java          |   0
 .../com/android/quickstep/views/IconView.java |   0
 .../quickstep/views/LauncherRecentsView.java  |   0
 .../quickstep/views/LiveTileOverlay.java      |   0
 .../quickstep/views/OverviewActionsView.java  |   0
 .../views/RecentsExtraViewContainer.java      |   0
 .../android/quickstep/views/RecentsView.java  |   0
 .../android/quickstep/views/TaskMenuView.java |   0
 .../quickstep/views/TaskThumbnailView.java    |   0
 .../com/android/quickstep/views/TaskView.java |   0
 src/com/android/launcher3/LauncherModel.java  |   8 +-
 .../launcher3/model/LoaderResults.java        |   8 +-
 122 files changed, 41 insertions(+), 468 deletions(-)
 delete mode 100644 go/res/values-v26/bools.xml
 delete mode 100644 go/res/values/dimens.xml
 delete mode 100644 iconloaderlib/src/com/android/launcher3/icons/cache/IconCacheUpdateHandler.java
 delete mode 100644 quickstep/recents_ui_overrides/res/values/colors.xml
 delete mode 100644 quickstep/recents_ui_overrides/res/values/config.xml
 delete mode 100644 quickstep/recents_ui_overrides/res/values/dimens.xml
 create mode 100644 quickstep/recents_ui_overrides/src/REMOVED.txt
 rename quickstep/{recents_ui_overrides => }/res/drawable/all_apps_edu_circle.xml (100%)
 rename quickstep/{recents_ui_overrides => }/res/drawable/chip_hint_background_light.xml (100%)
 rename quickstep/{recents_ui_overrides => }/res/drawable/chip_scrim_gradient.xml (100%)
 rename quickstep/{recents_ui_overrides => }/res/drawable/hotseat_edu_notification_icon.xml (100%)
 rename quickstep/{recents_ui_overrides => }/res/layout/all_apps_edu_view.xml (100%)
 rename quickstep/{recents_ui_overrides => }/res/layout/fallback_recents_activity.xml (100%)
 rename quickstep/{recents_ui_overrides => }/res/layout/floating_header_content.xml (100%)
 rename quickstep/{recents_ui_overrides => }/res/layout/overview_panel.xml (100%)
 rename quickstep/{recents_ui_overrides => }/res/layout/predicted_app_icon.xml (100%)
 rename quickstep/{recents_ui_overrides => }/res/layout/predicted_hotseat_edu.xml (100%)
 rename quickstep/{recents_ui_overrides => }/res/values/override.xml (99%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/appprediction/AllAppsTipView.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/appprediction/AppsDividerView.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/appprediction/ComponentKeyMapper.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/appprediction/DynamicItemCache.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/appprediction/InstantAppItemInfo.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/appprediction/PredictionRowView.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/hybridhotseat/HotseatEduActivity.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/hybridhotseat/HotseatEduController.java (99%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/hybridhotseat/HotseatFileLog.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/hybridhotseat/HotseatPredictionModel.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/hybridhotseat/HotseatRestoreHelper.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/model/AppEventProducer.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/model/PredictionUpdateTask.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/model/QuickstepModelDelegate.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/uioverrides/PredictedAppIcon.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/uioverrides/PredictedAppIconInflater.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/uioverrides/QuickstepLauncher.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/uioverrides/RecentsViewStateController.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/uioverrides/states/OverviewPeekState.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/uioverrides/states/OverviewState.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/launcher3/uioverrides/touchcontrollers/TransposedQuickSwitchTouchController.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/AbsSwipeUpHandler.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/AppToOverviewAnimationProvider.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/FallbackActivityInterface.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/FallbackSwipeHandler.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/ImageActionsApi.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/LauncherActivityInterface.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/LauncherSwipeHandlerV2.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/OverscrollPluginFactory.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/OverviewCommandHelper.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/QuickstepTestInformationHandler.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/RecentsActivity.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/SwipeUpAnimationLogic.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/TaskOverlayFactory.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/TaskShortcutFactory.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/TaskViewUtils.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/TouchInteractionService.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/ViewUtils.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/fallback/FallbackNavBarTouchController.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/fallback/FallbackRecentsStateController.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/fallback/FallbackRecentsView.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/fallback/RecentsDragLayer.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/fallback/RecentsState.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/fallback/RecentsTaskController.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/inputconsumers/AccessibilityInputConsumer.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/inputconsumers/DelegateInputConsumer.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/inputconsumers/OverscrollInputConsumer.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/inputconsumers/ResetGestureInputConsumer.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/inputconsumers/ScreenPinnedInputConsumer.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/inputconsumers/SysUiOverlayInputConsumer.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/util/ActiveGestureLog.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/util/AssistantUtilities.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/util/InputConsumerProxy.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/util/OverviewToHomeAnim.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/util/ProtoTracer.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/util/RecentsAtomicAnimationFactory.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/util/RectFSpringAnim.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/util/ShelfPeekAnim.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/util/SurfaceTransactionApplier.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/util/TaskCornerRadius.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/util/TaskViewSimulator.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/util/TransformParams.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/util/TriggerSwipeUpTouchTracker.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/views/AllAppsEduView.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/views/ClearAllButton.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/views/DigitalWellBeingToast.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/views/IconView.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/views/LauncherRecentsView.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/views/LiveTileOverlay.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/views/OverviewActionsView.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/views/RecentsExtraViewContainer.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/views/RecentsView.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/views/TaskMenuView.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/views/TaskThumbnailView.java (100%)
 rename quickstep/{recents_ui_overrides => }/src/com/android/quickstep/views/TaskView.java (100%)

diff --git a/Android.mk b/Android.mk
index 91ecccb1e4..752b530ab0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -149,12 +149,9 @@ LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib
 LOCAL_SRC_FILES := \
     $(call all-java-files-under, src) \
     $(call all-java-files-under, quickstep/src) \
-    $(call all-java-files-under, quickstep/recents_ui_overrides/src) \
     $(call all-java-files-under, src_shortcuts_overrides)
 
-LOCAL_RESOURCE_DIR := \
-    $(LOCAL_PATH)/quickstep/res \
-    $(LOCAL_PATH)/quickstep/recents_ui_overrides/res
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/quickstep/res
 LOCAL_PROGUARD_ENABLED := disabled
 
 
@@ -183,9 +180,7 @@ LOCAL_SYSTEM_EXT_MODULE := true
 LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3
 LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
 
-LOCAL_RESOURCE_DIR := \
-    $(LOCAL_PATH)/quickstep/res \
-    $(LOCAL_PATH)/quickstep/recents_ui_overrides/res
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/quickstep/res
 
 LOCAL_FULL_LIBS_MANIFEST_FILES := \
     $(LOCAL_PATH)/quickstep/AndroidManifest-launcher.xml \
@@ -220,12 +215,10 @@ LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib
 LOCAL_SRC_FILES := \
     $(call all-java-files-under, src) \
     $(call all-java-files-under, quickstep/src) \
-    $(call all-java-files-under, quickstep/recents_ui_overrides/src) \
     $(call all-java-files-under, go/src)
 
 LOCAL_RESOURCE_DIR := \
     $(LOCAL_PATH)/quickstep/res \
-    $(LOCAL_PATH)/quickstep/recents_ui_overrides/res \
     $(LOCAL_PATH)/go/res
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
diff --git a/go/res/values-v26/bools.xml b/go/res/values-v26/bools.xml
deleted file mode 100644
index cc4a7ba449..0000000000
--- a/go/res/values-v26/bools.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* Copyright 2017, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources>
-    <bool name="notification_badging_enabled">false</bool>
-</resources>
\ No newline at end of file
diff --git a/go/res/values/dimens.xml b/go/res/values/dimens.xml
deleted file mode 100644
index f1b1053160..0000000000
--- a/go/res/values/dimens.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <!-- Dynamic Grid -->
-    <dimen name="dynamic_grid_hotseat_size">60dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/go/src/com/android/launcher3/model/LoaderResults.java b/go/src/com/android/launcher3/model/LoaderResults.java
index 713053191d..5f71061a6e 100644
--- a/go/src/com/android/launcher3/model/LoaderResults.java
+++ b/go/src/com/android/launcher3/model/LoaderResults.java
@@ -20,7 +20,6 @@ import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.model.BgDataModel.Callbacks;
-import com.android.launcher3.util.LooperExecutor;
 
 /**
  * Helper class to handle results of {@link com.android.launcher3.model.LoaderTask}.
@@ -29,12 +28,7 @@ public class LoaderResults extends BaseLoaderResults {
 
     public LoaderResults(LauncherAppState app, BgDataModel dataModel,
             AllAppsList allAppsList, Callbacks[] callbacks) {
-        this(app, dataModel, allAppsList, callbacks, MAIN_EXECUTOR);
-    }
-
-    public LoaderResults(LauncherAppState app, BgDataModel dataModel,
-            AllAppsList allAppsList, Callbacks[] callbacks, LooperExecutor executor) {
-        super(app, dataModel, allAppsList, callbacks, executor);
+        super(app, dataModel, allAppsList, callbacks, MAIN_EXECUTOR);
     }
 
     @Override
diff --git a/iconloaderlib/src/com/android/launcher3/icons/cache/IconCacheUpdateHandler.java b/iconloaderlib/src/com/android/launcher3/icons/cache/IconCacheUpdateHandler.java
deleted file mode 100644
index 7b8070a6e1..0000000000
--- a/iconloaderlib/src/com/android/launcher3/icons/cache/IconCacheUpdateHandler.java
+++ /dev/null
@@ -1,317 +0,0 @@
-<<<<<<< HEAD   (cc6caf Merge "Let launcher to provide its own OverscrollPlugin" int)
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.icons.cache;
-
-import android.content.ComponentName;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteException;
-import android.os.SystemClock;
-import android.os.UserHandle;
-import android.text.TextUtils;
-import android.util.ArrayMap;
-import android.util.Log;
-import android.util.SparseBooleanArray;
-
-import com.android.launcher3.icons.cache.BaseIconCache.IconDB;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.Stack;
-
-/**
- * Utility class to handle updating the Icon cache
- */
-public class IconCacheUpdateHandler {
-
-    private static final String TAG = "IconCacheUpdateHandler";
-
-    /**
-     * In this mode, all invalid icons are marked as to-be-deleted in {@link #mItemsToDelete}.
-     * This mode is used for the first run.
-     */
-    private static final boolean MODE_SET_INVALID_ITEMS = true;
-
-    /**
-     * In this mode, any valid icon is removed from {@link #mItemsToDelete}. This is used for all
-     * subsequent runs, which essentially acts as set-union of all valid items.
-     */
-    private static final boolean MODE_CLEAR_VALID_ITEMS = false;
-
-    private static final Object ICON_UPDATE_TOKEN = new Object();
-
-    private final HashMap<String, PackageInfo> mPkgInfoMap;
-    private final BaseIconCache mIconCache;
-
-    private final ArrayMap<UserHandle, Set<String>> mPackagesToIgnore = new ArrayMap<>();
-
-    private final SparseBooleanArray mItemsToDelete = new SparseBooleanArray();
-    private boolean mFilterMode = MODE_SET_INVALID_ITEMS;
-
-    IconCacheUpdateHandler(BaseIconCache cache) {
-        mIconCache = cache;
-
-        mPkgInfoMap = new HashMap<>();
-
-        // Remove all active icon update tasks.
-        mIconCache.mWorkerHandler.removeCallbacksAndMessages(ICON_UPDATE_TOKEN);
-
-        createPackageInfoMap();
-    }
-
-    /**
-     * Sets a package to ignore for processing
-     */
-    public void addPackagesToIgnore(UserHandle userHandle, String packageName) {
-        Set<String> packages = mPackagesToIgnore.get(userHandle);
-        if (packages == null) {
-            packages = new HashSet<>();
-            mPackagesToIgnore.put(userHandle, packages);
-        }
-        packages.add(packageName);
-    }
-
-    private void createPackageInfoMap() {
-        PackageManager pm = mIconCache.mPackageManager;
-        for (PackageInfo info :
-                pm.getInstalledPackages(PackageManager.MATCH_UNINSTALLED_PACKAGES)) {
-            mPkgInfoMap.put(info.packageName, info);
-        }
-    }
-
-    /**
-     * Updates the persistent DB, such that only entries corresponding to {@param apps} remain in
-     * the DB and are updated.
-     * @return The set of packages for which icons have updated.
-     */
-    public <T> void updateIcons(List<T> apps, CachingLogic<T> cachingLogic,
-            OnUpdateCallback onUpdateCallback) {
-        // Filter the list per user
-        HashMap<UserHandle, HashMap<ComponentName, T>> userComponentMap = new HashMap<>();
-        int count = apps.size();
-        for (int i = 0; i < count; i++) {
-            T app = apps.get(i);
-            UserHandle userHandle = cachingLogic.getUser(app);
-            HashMap<ComponentName, T> componentMap = userComponentMap.get(userHandle);
-            if (componentMap == null) {
-                componentMap = new HashMap<>();
-                userComponentMap.put(userHandle, componentMap);
-            }
-            componentMap.put(cachingLogic.getComponent(app), app);
-        }
-
-        for (Entry<UserHandle, HashMap<ComponentName, T>> entry : userComponentMap.entrySet()) {
-            updateIconsPerUser(entry.getKey(), entry.getValue(), cachingLogic, onUpdateCallback);
-        }
-
-        // From now on, clear every valid item from the global valid map.
-        mFilterMode = MODE_CLEAR_VALID_ITEMS;
-    }
-
-    /**
-     * Updates the persistent DB, such that only entries corresponding to {@param apps} remain in
-     * the DB and are updated.
-     * @return The set of packages for which icons have updated.
-     */
-    @SuppressWarnings("unchecked")
-    private <T> void updateIconsPerUser(UserHandle user, HashMap<ComponentName, T> componentMap,
-            CachingLogic<T> cachingLogic, OnUpdateCallback onUpdateCallback) {
-        Set<String> ignorePackages = mPackagesToIgnore.get(user);
-        if (ignorePackages == null) {
-            ignorePackages = Collections.emptySet();
-        }
-        long userSerial = mIconCache.getSerialNumberForUser(user);
-
-        Stack<T> appsToUpdate = new Stack<>();
-
-        try (Cursor c = mIconCache.mIconDb.query(
-                new String[]{IconDB.COLUMN_ROWID, IconDB.COLUMN_COMPONENT,
-                        IconDB.COLUMN_LAST_UPDATED, IconDB.COLUMN_VERSION,
-                        IconDB.COLUMN_SYSTEM_STATE},
-                IconDB.COLUMN_USER + " = ? ",
-                new String[]{Long.toString(userSerial)})) {
-
-            final int indexComponent = c.getColumnIndex(IconDB.COLUMN_COMPONENT);
-            final int indexLastUpdate = c.getColumnIndex(IconDB.COLUMN_LAST_UPDATED);
-            final int indexVersion = c.getColumnIndex(IconDB.COLUMN_VERSION);
-            final int rowIndex = c.getColumnIndex(IconDB.COLUMN_ROWID);
-            final int systemStateIndex = c.getColumnIndex(IconDB.COLUMN_SYSTEM_STATE);
-
-            while (c.moveToNext()) {
-                String cn = c.getString(indexComponent);
-                ComponentName component = ComponentName.unflattenFromString(cn);
-                PackageInfo info = mPkgInfoMap.get(component.getPackageName());
-
-                int rowId = c.getInt(rowIndex);
-                if (info == null) {
-                    if (!ignorePackages.contains(component.getPackageName())) {
-
-                        if (mFilterMode == MODE_SET_INVALID_ITEMS) {
-                            mIconCache.remove(component, user);
-                            mItemsToDelete.put(rowId, true);
-                        }
-                    }
-                    continue;
-                }
-                if ((info.applicationInfo.flags & ApplicationInfo.FLAG_IS_DATA_ONLY) != 0) {
-                    // Application is not present
-                    continue;
-                }
-
-                long updateTime = c.getLong(indexLastUpdate);
-                int version = c.getInt(indexVersion);
-                T app = componentMap.remove(component);
-                if (version == info.versionCode
-                        && updateTime == cachingLogic.getLastUpdatedTime(app, info)
-                        && TextUtils.equals(c.getString(systemStateIndex),
-                                mIconCache.getIconSystemState(info.packageName))) {
-
-                    if (mFilterMode == MODE_CLEAR_VALID_ITEMS) {
-                        mItemsToDelete.put(rowId, false);
-                    }
-                    continue;
-                }
-
-                if (app == null) {
-                    if (mFilterMode == MODE_SET_INVALID_ITEMS) {
-                        mIconCache.remove(component, user);
-                        mItemsToDelete.put(rowId, true);
-                    }
-                } else {
-                    appsToUpdate.add(app);
-                }
-            }
-        } catch (SQLiteException e) {
-            Log.d(TAG, "Error reading icon cache", e);
-            // Continue updating whatever we have read so far
-        }
-
-        // Insert remaining apps.
-        if (!componentMap.isEmpty() || !appsToUpdate.isEmpty()) {
-            Stack<T> appsToAdd = new Stack<>();
-            appsToAdd.addAll(componentMap.values());
-            new SerializedIconUpdateTask(userSerial, user, appsToAdd, appsToUpdate, cachingLogic,
-                    onUpdateCallback).scheduleNext();
-        }
-    }
-
-    /**
-     * Commits all updates as part of the update handler to disk. Not more calls should be made
-     * to this class after this.
-     */
-    public void finish() {
-        // Commit all deletes
-        int deleteCount = 0;
-        StringBuilder queryBuilder = new StringBuilder()
-                .append(IconDB.COLUMN_ROWID)
-                .append(" IN (");
-
-        int count = mItemsToDelete.size();
-        for (int i = 0;  i < count; i++) {
-            if (mItemsToDelete.valueAt(i)) {
-                if (deleteCount > 0) {
-                    queryBuilder.append(", ");
-                }
-                queryBuilder.append(mItemsToDelete.keyAt(i));
-                deleteCount++;
-            }
-        }
-        queryBuilder.append(')');
-
-        if (deleteCount > 0) {
-            mIconCache.mIconDb.delete(queryBuilder.toString(), null);
-        }
-    }
-
-    /**
-     * A runnable that updates invalid icons and adds missing icons in the DB for the provided
-     * LauncherActivityInfo list. Items are updated/added one at a time, so that the
-     * worker thread doesn't get blocked.
-     */
-    private class SerializedIconUpdateTask<T> implements Runnable {
-        private final long mUserSerial;
-        private final UserHandle mUserHandle;
-        private final Stack<T> mAppsToAdd;
-        private final Stack<T> mAppsToUpdate;
-        private final CachingLogic<T> mCachingLogic;
-        private final HashSet<String> mUpdatedPackages = new HashSet<>();
-        private final OnUpdateCallback mOnUpdateCallback;
-
-        SerializedIconUpdateTask(long userSerial, UserHandle userHandle,
-                Stack<T> appsToAdd, Stack<T> appsToUpdate, CachingLogic<T> cachingLogic,
-                OnUpdateCallback onUpdateCallback) {
-            mUserHandle = userHandle;
-            mUserSerial = userSerial;
-            mAppsToAdd = appsToAdd;
-            mAppsToUpdate = appsToUpdate;
-            mCachingLogic = cachingLogic;
-            mOnUpdateCallback = onUpdateCallback;
-        }
-
-        @Override
-        public void run() {
-            if (!mAppsToUpdate.isEmpty()) {
-                T app = mAppsToUpdate.pop();
-                String pkg = mCachingLogic.getComponent(app).getPackageName();
-                PackageInfo info = mPkgInfoMap.get(pkg);
-
-                mIconCache.addIconToDBAndMemCache(
-                        app, mCachingLogic, info, mUserSerial, true /*replace existing*/);
-                mUpdatedPackages.add(pkg);
-
-                if (mAppsToUpdate.isEmpty() && !mUpdatedPackages.isEmpty()) {
-                    // No more app to update. Notify callback.
-                    mOnUpdateCallback.onPackageIconsUpdated(mUpdatedPackages, mUserHandle);
-                }
-
-                // Let it run one more time.
-                scheduleNext();
-            } else if (!mAppsToAdd.isEmpty()) {
-                T app = mAppsToAdd.pop();
-                PackageInfo info = mPkgInfoMap.get(mCachingLogic.getComponent(app).getPackageName());
-                // We do not check the mPkgInfoMap when generating the mAppsToAdd. Although every
-                // app should have package info, this is not guaranteed by the api
-                if (info != null) {
-                    mIconCache.addIconToDBAndMemCache(app, mCachingLogic, info,
-                            mUserSerial, false /*replace existing*/);
-                }
-
-                if (!mAppsToAdd.isEmpty()) {
-                    scheduleNext();
-                }
-            }
-        }
-
-        public void scheduleNext() {
-            mIconCache.mWorkerHandler.postAtTime(this, ICON_UPDATE_TOKEN,
-                    SystemClock.uptimeMillis() + 1);
-        }
-    }
-
-    public interface OnUpdateCallback {
-
-        void onPackageIconsUpdated(HashSet<String> updatedPackages, UserHandle user);
-    }
-}
-=======
->>>>>>> CHANGE (805b52 Removes iconloaderlib from Launcher3.)
diff --git a/quickstep/recents_ui_overrides/res/values/colors.xml b/quickstep/recents_ui_overrides/res/values/colors.xml
deleted file mode 100644
index f03f118f38..0000000000
--- a/quickstep/recents_ui_overrides/res/values/colors.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <color name="chip_hint_foreground_color">#fff</color>
-    <color name="chip_scrim_start_color">#39000000</color>
-
-    <color name="all_apps_label_text">#61000000</color>
-    <color name="all_apps_label_text_dark">#61FFFFFF</color>
-    <color name="all_apps_prediction_row_separator">#3c000000</color>
-    <color name="all_apps_prediction_row_separator_dark">#3cffffff</color>
-</resources>
\ No newline at end of file
diff --git a/quickstep/recents_ui_overrides/res/values/config.xml b/quickstep/recents_ui_overrides/res/values/config.xml
deleted file mode 100644
index 120e03456f..0000000000
--- a/quickstep/recents_ui_overrides/res/values/config.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <integer name="max_depth_blur_radius">150</integer>
-</resources>
\ No newline at end of file
diff --git a/quickstep/recents_ui_overrides/res/values/dimens.xml b/quickstep/recents_ui_overrides/res/values/dimens.xml
deleted file mode 100644
index 9266b0652b..0000000000
--- a/quickstep/recents_ui_overrides/res/values/dimens.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <dimen name="chip_hint_border_width">1dp</dimen>
-    <dimen name="chip_hint_corner_radius">20dp</dimen>
-    <dimen name="chip_hint_outer_padding">20dp</dimen>
-    <dimen name="chip_hint_start_padding">10dp</dimen>
-    <dimen name="chip_hint_end_padding">12dp</dimen>
-    <dimen name="chip_hint_horizontal_margin">20dp</dimen>
-    <dimen name="chip_hint_vertical_offset">16dp</dimen>
-    <dimen name="chip_hint_elevation">2dp</dimen>
-    <dimen name="chip_icon_size">16dp</dimen>
-    <dimen name="chip_text_height">26dp</dimen>
-    <dimen name="chip_text_top_padding">4dp</dimen>
-    <dimen name="chip_text_start_padding">10dp</dimen>
-    <dimen name="chip_text_size">14sp</dimen>
-
-    <dimen name="all_apps_prediction_row_divider_height">17dp</dimen>
-    <dimen name="all_apps_label_top_padding">16dp</dimen>
-    <dimen name="all_apps_label_bottom_padding">8dp</dimen>
-    <dimen name="all_apps_label_text_size">14sp</dimen>
-
-    <!-- Minimum distance to swipe to trigger accessibility gesture -->
-    <dimen name="accessibility_gesture_min_swipe_distance">80dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/quickstep/recents_ui_overrides/src/REMOVED.txt b/quickstep/recents_ui_overrides/src/REMOVED.txt
new file mode 100644
index 0000000000..c3a3eaf692
--- /dev/null
+++ b/quickstep/recents_ui_overrides/src/REMOVED.txt
@@ -0,0 +1,2 @@
+Temp file to prevent build breakage.
+Will be removed in followup cl.
\ No newline at end of file
diff --git a/quickstep/recents_ui_overrides/res/drawable/all_apps_edu_circle.xml b/quickstep/res/drawable/all_apps_edu_circle.xml
similarity index 100%
rename from quickstep/recents_ui_overrides/res/drawable/all_apps_edu_circle.xml
rename to quickstep/res/drawable/all_apps_edu_circle.xml
diff --git a/quickstep/recents_ui_overrides/res/drawable/chip_hint_background_light.xml b/quickstep/res/drawable/chip_hint_background_light.xml
similarity index 100%
rename from quickstep/recents_ui_overrides/res/drawable/chip_hint_background_light.xml
rename to quickstep/res/drawable/chip_hint_background_light.xml
diff --git a/quickstep/recents_ui_overrides/res/drawable/chip_scrim_gradient.xml b/quickstep/res/drawable/chip_scrim_gradient.xml
similarity index 100%
rename from quickstep/recents_ui_overrides/res/drawable/chip_scrim_gradient.xml
rename to quickstep/res/drawable/chip_scrim_gradient.xml
diff --git a/quickstep/recents_ui_overrides/res/drawable/hotseat_edu_notification_icon.xml b/quickstep/res/drawable/hotseat_edu_notification_icon.xml
similarity index 100%
rename from quickstep/recents_ui_overrides/res/drawable/hotseat_edu_notification_icon.xml
rename to quickstep/res/drawable/hotseat_edu_notification_icon.xml
diff --git a/quickstep/recents_ui_overrides/res/layout/all_apps_edu_view.xml b/quickstep/res/layout/all_apps_edu_view.xml
similarity index 100%
rename from quickstep/recents_ui_overrides/res/layout/all_apps_edu_view.xml
rename to quickstep/res/layout/all_apps_edu_view.xml
diff --git a/quickstep/recents_ui_overrides/res/layout/fallback_recents_activity.xml b/quickstep/res/layout/fallback_recents_activity.xml
similarity index 100%
rename from quickstep/recents_ui_overrides/res/layout/fallback_recents_activity.xml
rename to quickstep/res/layout/fallback_recents_activity.xml
diff --git a/quickstep/recents_ui_overrides/res/layout/floating_header_content.xml b/quickstep/res/layout/floating_header_content.xml
similarity index 100%
rename from quickstep/recents_ui_overrides/res/layout/floating_header_content.xml
rename to quickstep/res/layout/floating_header_content.xml
diff --git a/quickstep/recents_ui_overrides/res/layout/overview_panel.xml b/quickstep/res/layout/overview_panel.xml
similarity index 100%
rename from quickstep/recents_ui_overrides/res/layout/overview_panel.xml
rename to quickstep/res/layout/overview_panel.xml
diff --git a/quickstep/recents_ui_overrides/res/layout/predicted_app_icon.xml b/quickstep/res/layout/predicted_app_icon.xml
similarity index 100%
rename from quickstep/recents_ui_overrides/res/layout/predicted_app_icon.xml
rename to quickstep/res/layout/predicted_app_icon.xml
diff --git a/quickstep/recents_ui_overrides/res/layout/predicted_hotseat_edu.xml b/quickstep/res/layout/predicted_hotseat_edu.xml
similarity index 100%
rename from quickstep/recents_ui_overrides/res/layout/predicted_hotseat_edu.xml
rename to quickstep/res/layout/predicted_hotseat_edu.xml
diff --git a/quickstep/res/values/colors.xml b/quickstep/res/values/colors.xml
index 40da136ff0..449fe108ef 100644
--- a/quickstep/res/values/colors.xml
+++ b/quickstep/res/values/colors.xml
@@ -16,4 +16,12 @@
 <resources>
     <color name="back_arrow_color_light">#FFFFFFFF</color>
     <color name="back_arrow_color_dark">#99000000</color>
+
+    <color name="chip_hint_foreground_color">#fff</color>
+    <color name="chip_scrim_start_color">#39000000</color>
+
+    <color name="all_apps_label_text">#61000000</color>
+    <color name="all_apps_label_text_dark">#61FFFFFF</color>
+    <color name="all_apps_prediction_row_separator">#3c000000</color>
+    <color name="all_apps_prediction_row_separator_dark">#3cffffff</color>
 </resources>
\ No newline at end of file
diff --git a/quickstep/res/values/config.xml b/quickstep/res/values/config.xml
index a57112bf66..9ec303a48c 100644
--- a/quickstep/res/values/config.xml
+++ b/quickstep/res/values/config.xml
@@ -37,4 +37,6 @@
     <integer name="assistant_gesture_corner_deg_threshold">20</integer>
 
     <string name="wellbeing_provider_pkg" translatable="false"/>
+
+    <integer name="max_depth_blur_radius">150</integer>
 </resources>
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 6737c5f61d..f9f1051672 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -102,4 +102,26 @@
     <dimen name="swipe_edu_circle_size">64dp</dimen>
     <dimen name="swipe_edu_width">80dp</dimen>
     <dimen name="swipe_edu_max_height">184dp</dimen>
+
+    <dimen name="chip_hint_border_width">1dp</dimen>
+    <dimen name="chip_hint_corner_radius">20dp</dimen>
+    <dimen name="chip_hint_outer_padding">20dp</dimen>
+    <dimen name="chip_hint_start_padding">10dp</dimen>
+    <dimen name="chip_hint_end_padding">12dp</dimen>
+    <dimen name="chip_hint_horizontal_margin">20dp</dimen>
+    <dimen name="chip_hint_vertical_offset">16dp</dimen>
+    <dimen name="chip_hint_elevation">2dp</dimen>
+    <dimen name="chip_icon_size">16dp</dimen>
+    <dimen name="chip_text_height">26dp</dimen>
+    <dimen name="chip_text_top_padding">4dp</dimen>
+    <dimen name="chip_text_start_padding">10dp</dimen>
+    <dimen name="chip_text_size">14sp</dimen>
+
+    <dimen name="all_apps_prediction_row_divider_height">17dp</dimen>
+    <dimen name="all_apps_label_top_padding">16dp</dimen>
+    <dimen name="all_apps_label_bottom_padding">8dp</dimen>
+    <dimen name="all_apps_label_text_size">14sp</dimen>
+
+    <!-- Minimum distance to swipe to trigger accessibility gesture -->
+    <dimen name="accessibility_gesture_min_swipe_distance">80dp</dimen>
 </resources>
diff --git a/quickstep/recents_ui_overrides/res/values/override.xml b/quickstep/res/values/override.xml
similarity index 99%
rename from quickstep/recents_ui_overrides/res/values/override.xml
rename to quickstep/res/values/override.xml
index 1937164b7d..397ea82489 100644
--- a/quickstep/recents_ui_overrides/res/values/override.xml
+++ b/quickstep/res/values/override.xml
@@ -32,4 +32,3 @@
   <string name="model_delegate_class" translatable="false">com.android.launcher3.model.QuickstepModelDelegate</string>
 
 </resources>
-
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
rename to quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AllAppsTipView.java b/quickstep/src/com/android/launcher3/appprediction/AllAppsTipView.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AllAppsTipView.java
rename to quickstep/src/com/android/launcher3/appprediction/AllAppsTipView.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AppsDividerView.java b/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AppsDividerView.java
rename to quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/ComponentKeyMapper.java b/quickstep/src/com/android/launcher3/appprediction/ComponentKeyMapper.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/ComponentKeyMapper.java
rename to quickstep/src/com/android/launcher3/appprediction/ComponentKeyMapper.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/DynamicItemCache.java b/quickstep/src/com/android/launcher3/appprediction/DynamicItemCache.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/DynamicItemCache.java
rename to quickstep/src/com/android/launcher3/appprediction/DynamicItemCache.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/InstantAppItemInfo.java b/quickstep/src/com/android/launcher3/appprediction/InstantAppItemInfo.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/InstantAppItemInfo.java
rename to quickstep/src/com/android/launcher3/appprediction/InstantAppItemInfo.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java
rename to quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduActivity.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduActivity.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduActivity.java
rename to quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduActivity.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduController.java
similarity index 99%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduController.java
rename to quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduController.java
index 4f95254a72..8ebf1251ec 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduController.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduController.java
@@ -284,4 +284,3 @@ public class HotseatEduController {
         return new Intent(SETTINGS_ACTION).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
     }
 }
-
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java
rename to quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatFileLog.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatFileLog.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatFileLog.java
rename to quickstep/src/com/android/launcher3/hybridhotseat/HotseatFileLog.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
rename to quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatPredictionModel.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionModel.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatPredictionModel.java
rename to quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionModel.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatRestoreHelper.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatRestoreHelper.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatRestoreHelper.java
rename to quickstep/src/com/android/launcher3/hybridhotseat/HotseatRestoreHelper.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/model/AppEventProducer.java b/quickstep/src/com/android/launcher3/model/AppEventProducer.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/model/AppEventProducer.java
rename to quickstep/src/com/android/launcher3/model/AppEventProducer.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/model/PredictionUpdateTask.java b/quickstep/src/com/android/launcher3/model/PredictionUpdateTask.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/model/PredictionUpdateTask.java
rename to quickstep/src/com/android/launcher3/model/PredictionUpdateTask.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/model/QuickstepModelDelegate.java b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/model/QuickstepModelDelegate.java
rename to quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/PredictedAppIcon.java b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
rename to quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/PredictedAppIconInflater.java b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIconInflater.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/PredictedAppIconInflater.java
rename to quickstep/src/com/android/launcher3/uioverrides/PredictedAppIconInflater.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
rename to quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
rename to quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
rename to quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java
rename to quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewPeekState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewPeekState.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewPeekState.java
rename to quickstep/src/com/android/launcher3/uioverrides/states/OverviewPeekState.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewState.java
rename to quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java
rename to quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
rename to quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java
rename to quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
rename to quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
rename to quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
rename to quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java
rename to quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java
rename to quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
rename to quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
rename to quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TransposedQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TransposedQuickSwitchTouchController.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TransposedQuickSwitchTouchController.java
rename to quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TransposedQuickSwitchTouchController.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
rename to quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/AppToOverviewAnimationProvider.java b/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/AppToOverviewAnimationProvider.java
rename to quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityInterface.java b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityInterface.java
rename to quickstep/src/com/android/quickstep/FallbackActivityInterface.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackSwipeHandler.java b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackSwipeHandler.java
rename to quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/ImageActionsApi.java b/quickstep/src/com/android/quickstep/ImageActionsApi.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/ImageActionsApi.java
rename to quickstep/src/com/android/quickstep/ImageActionsApi.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java
rename to quickstep/src/com/android/quickstep/LauncherActivityInterface.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandlerV2.java b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandlerV2.java
rename to quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/OverscrollPluginFactory.java b/quickstep/src/com/android/quickstep/OverscrollPluginFactory.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/OverscrollPluginFactory.java
rename to quickstep/src/com/android/quickstep/OverscrollPluginFactory.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/OverviewCommandHelper.java
rename to quickstep/src/com/android/quickstep/OverviewCommandHelper.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/QuickstepTestInformationHandler.java b/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/QuickstepTestInformationHandler.java
rename to quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/RecentsActivity.java
rename to quickstep/src/com/android/quickstep/RecentsActivity.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/SwipeUpAnimationLogic.java b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/SwipeUpAnimationLogic.java
rename to quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java
rename to quickstep/src/com/android/quickstep/TaskOverlayFactory.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskShortcutFactory.java b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/TaskShortcutFactory.java
rename to quickstep/src/com/android/quickstep/TaskShortcutFactory.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/TaskViewUtils.java
rename to quickstep/src/com/android/quickstep/TaskViewUtils.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
rename to quickstep/src/com/android/quickstep/TouchInteractionService.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/ViewUtils.java b/quickstep/src/com/android/quickstep/ViewUtils.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/ViewUtils.java
rename to quickstep/src/com/android/quickstep/ViewUtils.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackNavBarTouchController.java b/quickstep/src/com/android/quickstep/fallback/FallbackNavBarTouchController.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackNavBarTouchController.java
rename to quickstep/src/com/android/quickstep/fallback/FallbackNavBarTouchController.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsStateController.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
rename to quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsView.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsView.java
rename to quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/RecentsDragLayer.java b/quickstep/src/com/android/quickstep/fallback/RecentsDragLayer.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/RecentsDragLayer.java
rename to quickstep/src/com/android/quickstep/fallback/RecentsDragLayer.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/RecentsState.java b/quickstep/src/com/android/quickstep/fallback/RecentsState.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/RecentsState.java
rename to quickstep/src/com/android/quickstep/fallback/RecentsState.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/RecentsTaskController.java b/quickstep/src/com/android/quickstep/fallback/RecentsTaskController.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/RecentsTaskController.java
rename to quickstep/src/com/android/quickstep/fallback/RecentsTaskController.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/AccessibilityInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/AccessibilityInputConsumer.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/AccessibilityInputConsumer.java
rename to quickstep/src/com/android/quickstep/inputconsumers/AccessibilityInputConsumer.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java
rename to quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DelegateInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/DelegateInputConsumer.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DelegateInputConsumer.java
rename to quickstep/src/com/android/quickstep/inputconsumers/DelegateInputConsumer.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
rename to quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
rename to quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
rename to quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverscrollInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OverscrollInputConsumer.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverscrollInputConsumer.java
rename to quickstep/src/com/android/quickstep/inputconsumers/OverscrollInputConsumer.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
rename to quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java
rename to quickstep/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/ResetGestureInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/ResetGestureInputConsumer.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/ResetGestureInputConsumer.java
rename to quickstep/src/com/android/quickstep/inputconsumers/ResetGestureInputConsumer.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/ScreenPinnedInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/ScreenPinnedInputConsumer.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/ScreenPinnedInputConsumer.java
rename to quickstep/src/com/android/quickstep/inputconsumers/ScreenPinnedInputConsumer.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/SysUiOverlayInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/SysUiOverlayInputConsumer.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/SysUiOverlayInputConsumer.java
rename to quickstep/src/com/android/quickstep/inputconsumers/SysUiOverlayInputConsumer.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ActiveGestureLog.java b/quickstep/src/com/android/quickstep/util/ActiveGestureLog.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/util/ActiveGestureLog.java
rename to quickstep/src/com/android/quickstep/util/ActiveGestureLog.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/AssistantUtilities.java b/quickstep/src/com/android/quickstep/util/AssistantUtilities.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/util/AssistantUtilities.java
rename to quickstep/src/com/android/quickstep/util/AssistantUtilities.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/InputConsumerProxy.java b/quickstep/src/com/android/quickstep/util/InputConsumerProxy.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/util/InputConsumerProxy.java
rename to quickstep/src/com/android/quickstep/util/InputConsumerProxy.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/OverviewToHomeAnim.java b/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/util/OverviewToHomeAnim.java
rename to quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ProtoTracer.java b/quickstep/src/com/android/quickstep/util/ProtoTracer.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/util/ProtoTracer.java
rename to quickstep/src/com/android/quickstep/util/ProtoTracer.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/RecentsAtomicAnimationFactory.java b/quickstep/src/com/android/quickstep/util/RecentsAtomicAnimationFactory.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/util/RecentsAtomicAnimationFactory.java
rename to quickstep/src/com/android/quickstep/util/RecentsAtomicAnimationFactory.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/RectFSpringAnim.java b/quickstep/src/com/android/quickstep/util/RectFSpringAnim.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/util/RectFSpringAnim.java
rename to quickstep/src/com/android/quickstep/util/RectFSpringAnim.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ShelfPeekAnim.java b/quickstep/src/com/android/quickstep/util/ShelfPeekAnim.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/util/ShelfPeekAnim.java
rename to quickstep/src/com/android/quickstep/util/ShelfPeekAnim.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
rename to quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/SurfaceTransactionApplier.java b/quickstep/src/com/android/quickstep/util/SurfaceTransactionApplier.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/util/SurfaceTransactionApplier.java
rename to quickstep/src/com/android/quickstep/util/SurfaceTransactionApplier.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskCornerRadius.java b/quickstep/src/com/android/quickstep/util/TaskCornerRadius.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskCornerRadius.java
rename to quickstep/src/com/android/quickstep/util/TaskCornerRadius.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java
rename to quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TransformParams.java b/quickstep/src/com/android/quickstep/util/TransformParams.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/util/TransformParams.java
rename to quickstep/src/com/android/quickstep/util/TransformParams.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TriggerSwipeUpTouchTracker.java b/quickstep/src/com/android/quickstep/util/TriggerSwipeUpTouchTracker.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/util/TriggerSwipeUpTouchTracker.java
rename to quickstep/src/com/android/quickstep/util/TriggerSwipeUpTouchTracker.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/AllAppsEduView.java b/quickstep/src/com/android/quickstep/views/AllAppsEduView.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/views/AllAppsEduView.java
rename to quickstep/src/com/android/quickstep/views/AllAppsEduView.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/ClearAllButton.java b/quickstep/src/com/android/quickstep/views/ClearAllButton.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/views/ClearAllButton.java
rename to quickstep/src/com/android/quickstep/views/ClearAllButton.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/DigitalWellBeingToast.java b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/views/DigitalWellBeingToast.java
rename to quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/IconView.java b/quickstep/src/com/android/quickstep/views/IconView.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/views/IconView.java
rename to quickstep/src/com/android/quickstep/views/IconView.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java
rename to quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LiveTileOverlay.java b/quickstep/src/com/android/quickstep/views/LiveTileOverlay.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/views/LiveTileOverlay.java
rename to quickstep/src/com/android/quickstep/views/LiveTileOverlay.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/OverviewActionsView.java b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/views/OverviewActionsView.java
rename to quickstep/src/com/android/quickstep/views/OverviewActionsView.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsExtraViewContainer.java b/quickstep/src/com/android/quickstep/views/RecentsExtraViewContainer.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsExtraViewContainer.java
rename to quickstep/src/com/android/quickstep/views/RecentsExtraViewContainer.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
rename to quickstep/src/com/android/quickstep/views/RecentsView.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskMenuView.java
rename to quickstep/src/com/android/quickstep/views/TaskMenuView.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java
rename to quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
similarity index 100%
rename from quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java
rename to quickstep/src/com/android/quickstep/views/TaskView.java
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index e2568d5ef6..f58e0b496a 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -60,7 +60,6 @@ import com.android.launcher3.pm.UserCache;
 import com.android.launcher3.shortcuts.ShortcutRequest;
 import com.android.launcher3.util.IntSet;
 import com.android.launcher3.util.ItemInfoMatcher;
-import com.android.launcher3.util.LooperExecutor;
 import com.android.launcher3.util.PackageUserKey;
 import com.android.launcher3.util.Preconditions;
 
@@ -85,7 +84,6 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi
 
     private final LauncherAppState mApp;
     private final Object mLock = new Object();
-    private final LooperExecutor mMainExecutor = MAIN_EXECUTOR;
 
     private LoaderTask mLoaderTask;
     private boolean mIsLoaderTaskRunning;
@@ -337,13 +335,13 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi
             if (callbacksList.length > 0) {
                 // Clear any pending bind-runnables from the synchronized load process.
                 for (Callbacks cb : callbacksList) {
-                    mMainExecutor.execute(cb::clearPendingBinds);
+                    MAIN_EXECUTOR.execute(cb::clearPendingBinds);
                 }
 
                 // If there is already one running, tell it to stop.
                 stopLoader();
                 LoaderResults loaderResults = new LoaderResults(
-                        mApp, mBgDataModel, mBgAllAppsList, callbacksList, mMainExecutor);
+                        mApp, mBgDataModel, mBgAllAppsList, callbacksList);
                 if (mModelLoaded && !mIsLoaderTaskRunning) {
                     // Divide the set of loaded items into those that we are binding synchronously,
                     // and everything else that is to be bound normally (asynchronously).
@@ -530,7 +528,7 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi
     }
 
     public void enqueueModelUpdateTask(ModelUpdateTask task) {
-        task.init(mApp, this, mBgDataModel, mBgAllAppsList, mMainExecutor);
+        task.init(mApp, this, mBgDataModel, mBgAllAppsList, MAIN_EXECUTOR);
         MODEL_EXECUTOR.execute(task);
     }
 
diff --git a/src_shortcuts_overrides/com/android/launcher3/model/LoaderResults.java b/src_shortcuts_overrides/com/android/launcher3/model/LoaderResults.java
index dcb4636bfc..269af7bcc5 100644
--- a/src_shortcuts_overrides/com/android/launcher3/model/LoaderResults.java
+++ b/src_shortcuts_overrides/com/android/launcher3/model/LoaderResults.java
@@ -21,7 +21,6 @@ import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.model.BgDataModel.Callbacks;
 import com.android.launcher3.util.ComponentKey;
-import com.android.launcher3.util.LooperExecutor;
 import com.android.launcher3.widget.WidgetListRowEntry;
 
 import java.util.ArrayList;
@@ -34,12 +33,7 @@ public class LoaderResults extends BaseLoaderResults {
 
     public LoaderResults(LauncherAppState app, BgDataModel dataModel,
             AllAppsList allAppsList, Callbacks[] callbacks) {
-        this(app, dataModel, allAppsList, callbacks, MAIN_EXECUTOR);
-    }
-
-    public LoaderResults(LauncherAppState app, BgDataModel dataModel,
-            AllAppsList allAppsList, Callbacks[] callbacks, LooperExecutor executor) {
-        super(app, dataModel, allAppsList, callbacks, executor);
+        super(app, dataModel, allAppsList, callbacks, MAIN_EXECUTOR);
     }
 
     @Override
-- 
GitLab


From 4fb5f74bb4884794a1a5f08f62092f7f63c2d05b Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 10 Aug 2020 18:33:01 -0700
Subject: [PATCH 0097/1664] Track OverviewToHomeAnim with StateManager

This way we mark the the current state as NORMAL at the start of
the animation, and cancel it as part of other state transitions.
This allows us to interact with launcher (e.g. to go to all apps
or pull down the notification shade) during the animation.

Also use OverviewToHomeAnim from RecentsView#startHome() to
ensure the animation is consistent, e.g. doesn't fade out
RecentsView, scrolls to page 1, etc.

Bug: 144170434
Change-Id: I5348565b9e705d8ffba39818dde9efe82b16bb7a
---
 .../uioverrides/states/AllAppsState.java      |  4 ++-
 .../PortraitStatesTouchController.java        |  4 +++
 .../quickstep/util/OverviewToHomeAnim.java    | 11 +++++---
 .../quickstep/views/LauncherRecentsView.java  |  7 ++++--
 .../launcher3/statemanager/StateManager.java  | 25 ++++++++++++++++---
 5 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
index e7cd39381d..29a6be0779 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
@@ -18,6 +18,7 @@ package com.android.launcher3.uioverrides.states;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_ACTIONS;
 import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
+import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
 
 import android.content.Context;
 
@@ -92,7 +93,8 @@ public class AllAppsState extends LauncherState {
 
     @Override
     public float[] getOverviewScaleAndOffset(Launcher launcher) {
-        return new float[] {0.9f, 0};
+        float offset = ENABLE_OVERVIEW_ACTIONS.get() && removeShelfFromOverview(launcher) ? 1 : 0;
+        return new float[] {0.9f, offset};
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
index 20ee61db9b..a684b9d7fb 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
@@ -142,6 +142,10 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
                 Log.d(TestProtocol.OVERIEW_NOT_ALLAPPS,
                         "PortraitStatesTouchController.getTargetState 1");
             }
+            if (ENABLE_OVERVIEW_ACTIONS.get() && removeShelfFromOverview(mLauncher)) {
+                // Don't allow swiping down to overview.
+                return NORMAL;
+            }
             return TouchInteractionService.isConnected() ?
                     mLauncher.getStateManager().getLastState() : NORMAL;
         } else if (fromState == OVERVIEW) {
diff --git a/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java b/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
index d2e1dedd2b..6278e147c0 100644
--- a/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
+++ b/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
@@ -76,6 +76,7 @@ public class OverviewToHomeAnim {
         if (startState != OVERVIEW) {
             Log.e(TAG, "animateFromOverviewToHome: unexpected start state " + startState);
         }
+        AnimatorSet anim = new AnimatorSet();
 
         boolean playStaggeredWorkspaceAnim = velocity < 0;
         if (playStaggeredWorkspaceAnim) {
@@ -87,7 +88,8 @@ public class OverviewToHomeAnim {
                     mIsHomeStaggeredAnimFinished = true;
                     maybeOverviewToHomeAnimComplete();
                 }
-            }).start();
+            });
+            anim.play(staggeredWorkspaceAnim.getAnimators());
         } else {
             mIsHomeStaggeredAnimFinished = true;
         }
@@ -108,16 +110,17 @@ public class OverviewToHomeAnim {
         config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, FINAL_FRAME);
         config.setInterpolator(ANIM_OVERVIEW_SCALE, FINAL_FRAME);
         config.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, INSTANT);
-        AnimatorSet anim = stateManager.createAtomicAnimation(
+        AnimatorSet stateAnim = stateManager.createAtomicAnimation(
                 startState, NORMAL, config);
-        anim.addListener(new AnimationSuccessListener() {
+        stateAnim.addListener(new AnimationSuccessListener() {
             @Override
             public void onAnimationSuccess(Animator animator) {
                 mIsOverviewHidden = true;
                 maybeOverviewToHomeAnimComplete();
             }
         });
-        stateManager.cancelAnimation();
+        anim.play(stateAnim);
+        stateManager.setCurrentAnimation(anim, NORMAL);
         anim.start();
         recentsView.snapToPage(DEFAULT_PAGE, duration);
     }
diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
index f31bc19c06..b338bd07ee 100644
--- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
@@ -43,6 +43,7 @@ import com.android.launcher3.statemanager.StateManager.StateListener;
 import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
 import com.android.quickstep.LauncherActivityInterface;
 import com.android.quickstep.SysUINavigationMode;
+import com.android.quickstep.util.OverviewToHomeAnim;
 import com.android.systemui.plugins.PluginListener;
 import com.android.systemui.plugins.RecentsExtraCard;
 
@@ -93,12 +94,14 @@ public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher>
 
     @Override
     public void startHome() {
+        Runnable onReachedHome = () -> mActivity.getStateManager().goToState(NORMAL, false);
+        OverviewToHomeAnim overviewToHomeAnim = new OverviewToHomeAnim(mActivity, onReachedHome);
         if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
             switchToScreenshot(null,
                     () -> finishRecentsAnimation(true /* toRecents */,
-                            () -> mActivity.getStateManager().goToState(NORMAL)));
+                            () -> overviewToHomeAnim.animateWithVelocity(0)));
         } else {
-            mActivity.getStateManager().goToState(NORMAL);
+            overviewToHomeAnim.animateWithVelocity(0);
         }
     }
 
diff --git a/src/com/android/launcher3/statemanager/StateManager.java b/src/com/android/launcher3/statemanager/StateManager.java
index 6ff1254245..beb5b684f9 100644
--- a/src/com/android/launcher3/statemanager/StateManager.java
+++ b/src/com/android/launcher3/statemanager/StateManager.java
@@ -312,7 +312,13 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
                 handler.setStateWithAnimation(state, mConfig, builder);
             }
         }
-        builder.addListener(new AnimationSuccessListener() {
+        builder.addListener(createStateAnimationListener(state));
+        mConfig.setAnimation(builder.buildAnim(), state);
+        return builder;
+    }
+
+    private AnimatorListener createStateAnimationListener(STATE_TYPE state) {
+        return new AnimationSuccessListener() {
 
             @Override
             public void onAnimationStart(Animator animation) {
@@ -327,9 +333,7 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
                 }
                 onStateTransitionEnd(state);
             }
-        });
-        mConfig.setAnimation(builder.buildAnim(), state);
-        return builder;
+        };
     }
 
     private void onStateTransitionStart(STATE_TYPE state) {
@@ -396,6 +400,19 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
         mConfig.playbackController = controller;
     }
 
+    /**
+     * @see #setCurrentAnimation(AnimatorSet, Animator...). Using this method tells the StateManager
+     * that this is a custom animation to the given state, and thus the StateManager will add an
+     * animation listener to call {@link #onStateTransitionStart} and {@link #onStateTransitionEnd}.
+     * @param anim The custom animation to the given state.
+     * @param toState The state we are animating towards.
+     */
+    public void setCurrentAnimation(AnimatorSet anim, STATE_TYPE toState) {
+        cancelAnimation();
+        setCurrentAnimation(anim);
+        anim.addListener(createStateAnimationListener(toState));
+    }
+
     /**
      * Sets the animation as the current state animation, i.e., canceled when
      * starting another animation and may block some launcher interactions while running.
-- 
GitLab


From d844fe758c880447bff8708646ecfcd92e98ba06 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Thu, 13 Aug 2020 19:33:26 -0700
Subject: [PATCH 0098/1664] Remove ENABLE_OVERVIEW_ACTIONS flag, defaulting to
 true

We no longer support the "peeking" model where the shelf would
peek on motion pause from an app and overview would peek on motion
pause from home. Thus, removed/inlined the following:
- FlingAndHoldTouchController (merged into its sole subclass
  NoButtonNavbarToOverviewTouchController)
- ShelfPeekAnim
- OverviewPeekState

Change-Id: I066a3ad2636fde4786089c922b896bf1e03361fd
---
 quickstep/res/values/dimens.xml               |   1 -
 .../launcher3/BaseQuickstepLauncher.java      |   9 +-
 .../uioverrides/QuickstepLauncher.java        |  12 +-
 .../uioverrides/states/AllAppsState.java      |  13 +-
 .../uioverrides/states/OverviewPeekState.java |  31 --
 .../uioverrides/states/OverviewState.java     |  12 +-
 .../QuickstepAtomicAnimationFactory.java      |  28 +-
 .../FlingAndHoldTouchController.java          | 279 ------------------
 ...ButtonNavbarToOverviewTouchController.java | 121 ++++++--
 .../NoButtonQuickSwitchTouchController.java   |  40 ---
 .../PortraitStatesTouchController.java        |  15 +-
 .../android/quickstep/AbsSwipeUpHandler.java  |  35 +--
 .../quickstep/BaseActivityInterface.java      |   8 +-
 .../quickstep/LauncherActivityInterface.java  |   8 -
 .../QuickstepTestInformationHandler.java      |   6 -
 .../quickstep/TaskShortcutFactory.java        |  12 +-
 .../android/quickstep/util/LayoutUtils.java   |   3 +-
 .../util/QuickstepOnboardingPrefs.java        |   4 +-
 .../android/quickstep/util/ShelfPeekAnim.java | 105 -------
 .../quickstep/views/OverviewActionsView.java  |  12 +-
 .../quickstep/views/ShelfScrimView.java       |  14 +-
 src/com/android/launcher3/Launcher.java       |   5 +-
 src/com/android/launcher3/LauncherState.java  |   3 -
 .../launcher3/config/FeatureFlags.java        |   4 -
 .../launcher3/testing/TestProtocol.java       |  14 +-
 .../uioverrides/states/OverviewState.java     |   4 -
 .../tapl/LauncherInstrumentation.java         |  13 +-
 27 files changed, 147 insertions(+), 664 deletions(-)
 delete mode 100644 quickstep/src/com/android/launcher3/uioverrides/states/OverviewPeekState.java
 delete mode 100644 quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java
 delete mode 100644 quickstep/src/com/android/quickstep/util/ShelfPeekAnim.java

diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index f9f1051672..313db8ccaf 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -30,7 +30,6 @@
 
     <dimen name="recents_page_spacing">10dp</dimen>
     <dimen name="recents_clear_all_deadzone_vertical_margin">70dp</dimen>
-    <dimen name="overview_peek_distance">96dp</dimen>
 
     <!-- The speed in dp/s at which the user needs to be scrolling in recents such that we start
              loading full resolution screenshots. -->
diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 235df425b4..a0016cb905 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -50,7 +50,6 @@ import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.util.QuickstepOnboardingPrefs;
 import com.android.quickstep.util.RemoteAnimationProvider;
 import com.android.quickstep.util.RemoteFadeOutAnimationListener;
-import com.android.quickstep.util.ShelfPeekAnim;
 import com.android.quickstep.views.OverviewActionsView;
 import com.android.quickstep.views.RecentsView;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
@@ -73,8 +72,6 @@ public abstract class BaseQuickstepLauncher extends Launcher
             (context, arg1, arg2) -> SystemUiProxy.INSTANCE.get(context).setBackButtonAlpha(
                     Float.intBitsToFloat(arg1), arg2 != 0);
 
-    private final ShelfPeekAnim mShelfPeekAnim = new ShelfPeekAnim(this);
-
     private OverviewActionsView mActionsView;
     protected HotseatPredictionController mHotseatPredictionController;
 
@@ -196,7 +193,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
     }
 
     private boolean isOverviewActionsEnabled() {
-        return FeatureFlags.ENABLE_OVERVIEW_ACTIONS.get() && removeShelfFromOverview(this);
+        return removeShelfFromOverview(this);
     }
 
     public <T extends OverviewActionsView> T getActionsView() {
@@ -317,10 +314,6 @@ public abstract class BaseQuickstepLauncher extends Launcher
                 Stream.of(WellbeingModel.SHORTCUT_FACTORY));
     }
 
-    public ShelfPeekAnim getShelfPeekAnim() {
-        return mShelfPeekAnim;
-    }
-
     /**
      * Returns Prediction controller for hybrid hotseat
      */
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 4107698621..f7bc0b32d4 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -60,7 +60,6 @@ import com.android.launcher3.popup.SystemShortcut;
 import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.uioverrides.states.QuickstepAtomicAnimationFactory;
-import com.android.launcher3.uioverrides.touchcontrollers.FlingAndHoldTouchController;
 import com.android.launcher3.uioverrides.touchcontrollers.LandscapeEdgeSwipeController;
 import com.android.launcher3.uioverrides.touchcontrollers.NavBarToHomeTouchController;
 import com.android.launcher3.uioverrides.touchcontrollers.NoButtonNavbarToOverviewTouchController;
@@ -80,8 +79,8 @@ import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
-
 import com.android.systemui.shared.system.ActivityManagerWrapper;
+
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -306,14 +305,7 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
             if (TestProtocol.sDebugTracing) {
                 Log.d(TestProtocol.PAUSE_NOT_DETECTED, "createTouchControllers.2");
             }
-            if (FeatureFlags.ENABLE_OVERVIEW_ACTIONS.get()) {
-                if (TestProtocol.sDebugTracing) {
-                    Log.d(TestProtocol.PAUSE_NOT_DETECTED, "createTouchControllers.3");
-                }
-                list.add(new NoButtonNavbarToOverviewTouchController(this));
-            } else {
-                list.add(new FlingAndHoldTouchController(this));
-            }
+            list.add(new NoButtonNavbarToOverviewTouchController(this));
         } else {
             if (getDeviceProfile().isVerticalBarLayout()) {
                 list.add(new OverviewToAllAppsTouchController(this));
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
index 29a6be0779..bce73cd4e4 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
@@ -16,8 +16,6 @@
 package com.android.launcher3.uioverrides.states;
 
 import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
-import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_ACTIONS;
-import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
 import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
 
 import android.content.Context;
@@ -26,7 +24,6 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
-import com.android.quickstep.SysUINavigationMode;
 
 /**
  * Definition for AllApps state
@@ -66,13 +63,7 @@ public class AllAppsState extends LauncherState {
     public ScaleAndTranslation getWorkspaceScaleAndTranslation(Launcher launcher) {
         ScaleAndTranslation scaleAndTranslation = LauncherState.OVERVIEW
                 .getWorkspaceScaleAndTranslation(launcher);
-        if (SysUINavigationMode.getMode(launcher) == NO_BUTTON && !ENABLE_OVERVIEW_ACTIONS.get()) {
-            float normalScale = 1;
-            // Scale down halfway to where we'd be in overview, to prepare for a potential pause.
-            scaleAndTranslation.scale = (scaleAndTranslation.scale + normalScale) / 2;
-        } else {
-            scaleAndTranslation.scale = 1;
-        }
+        scaleAndTranslation.scale = 1;
         return scaleAndTranslation;
     }
 
@@ -93,7 +84,7 @@ public class AllAppsState extends LauncherState {
 
     @Override
     public float[] getOverviewScaleAndOffset(Launcher launcher) {
-        float offset = ENABLE_OVERVIEW_ACTIONS.get() && removeShelfFromOverview(launcher) ? 1 : 0;
+        float offset = removeShelfFromOverview(launcher) ? 1 : 0;
         return new float[] {0.9f, offset};
     }
 
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewPeekState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewPeekState.java
deleted file mode 100644
index fc9a11bf66..0000000000
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewPeekState.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.uioverrides.states;
-
-import com.android.launcher3.Launcher;
-
-public class OverviewPeekState extends OverviewState {
-    private static final float OVERVIEW_OFFSET = 0.7f;
-
-    public OverviewPeekState(int id) {
-        super(id);
-    }
-
-    @Override
-    public float[] getOverviewScaleAndOffset(Launcher launcher) {
-        return new float[] {NO_SCALE, OVERVIEW_OFFSET};
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
index d174bfd2d9..6ec114e216 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -16,7 +16,6 @@
 package com.android.launcher3.uioverrides.states;
 
 import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
-import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_ACTIONS;
 import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
 import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
 import static com.android.quickstep.SysUINavigationMode.hideShelfInTwoButtonLandscape;
@@ -65,7 +64,7 @@ public class OverviewState extends LauncherState {
     public int getTransitionDuration(Context context) {
         // In no-button mode, overview comes in all the way from the left, so give it more time.
         boolean isNoButtonMode = SysUINavigationMode.INSTANCE.get(context).getMode() == NO_BUTTON;
-        return isNoButtonMode && ENABLE_OVERVIEW_ACTIONS.get() ? 380 : 250;
+        return isNoButtonMode ? 380 : 250;
     }
 
     @Override
@@ -108,8 +107,7 @@ public class OverviewState extends LauncherState {
 
     @Override
     public ScaleAndTranslation getQsbScaleAndTranslation(Launcher launcher) {
-        if (this == OVERVIEW && ENABLE_OVERVIEW_ACTIONS.get()
-                && removeShelfFromOverview(launcher)) {
+        if (this == OVERVIEW && removeShelfFromOverview(launcher)) {
             // Treat the QSB as part of the hotseat so they move together.
             return getHotseatScaleAndTranslation(launcher);
         }
@@ -129,7 +127,7 @@ public class OverviewState extends LauncherState {
     @Override
     public int getVisibleElements(Launcher launcher) {
         RecentsView recentsView = launcher.getOverviewPanel();
-        if (ENABLE_OVERVIEW_ACTIONS.get() && removeShelfFromOverview(launcher) ||
+        if (removeShelfFromOverview(launcher) ||
                 hideShelfInTwoButtonLandscape(launcher, recentsView.getPagedOrientationHandler())) {
             return OVERVIEW_BUTTONS;
         } else if (launcher.getDeviceProfile().isVerticalBarLayout()) {
@@ -191,10 +189,6 @@ public class OverviewState extends LauncherState {
         return new BackgroundAppState(id);
     }
 
-    public static OverviewState newPeekState(int id) {
-        return new OverviewPeekState(id);
-    }
-
     public static OverviewState newSwitchState(int id) {
         return new QuickSwitchState(id);
     }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
index daa1aadbae..94af134de5 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
@@ -22,28 +22,24 @@ import static com.android.launcher3.LauncherState.HINT_STATE;
 import static com.android.launcher3.LauncherState.HOTSEAT_ICONS;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
-import static com.android.launcher3.LauncherState.OVERVIEW_PEEK;
 import static com.android.launcher3.WorkspaceStateTransitionAnimation.getSpringScaleAnimator;
 import static com.android.launcher3.anim.Interpolators.ACCEL;
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.anim.Interpolators.DEACCEL;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_1_7;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
-import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 import static com.android.launcher3.anim.Interpolators.FINAL_FRAME;
 import static com.android.launcher3.anim.Interpolators.INSTANT;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
 import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_7;
 import static com.android.launcher3.anim.Interpolators.clampToProgress;
-import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_ACTIONS;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_DEPTH;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_TRANSLATE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCRIM_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_VERTICAL_PROGRESS;
@@ -190,23 +186,14 @@ public class QuickstepAtomicAnimationFactory extends
             if (!isHotseatVisible) {
                 hotseat.setScaleX(0.92f);
                 hotseat.setScaleY(0.92f);
-                if (ENABLE_OVERVIEW_ACTIONS.get()) {
-                    AllAppsContainerView qsbContainer = mActivity.getAppsView();
-                    View qsb = qsbContainer.getSearchView();
-                    boolean qsbVisible = qsb.getVisibility() == VISIBLE && qsb.getAlpha() > 0;
-                    if (!qsbVisible) {
-                        qsbContainer.setScaleX(0.92f);
-                        qsbContainer.setScaleY(0.92f);
-                    }
+                AllAppsContainerView qsbContainer = mActivity.getAppsView();
+                View qsb = qsbContainer.getSearchView();
+                boolean qsbVisible = qsb.getVisibility() == VISIBLE && qsb.getAlpha() > 0;
+                if (!qsbVisible) {
+                    qsbContainer.setScaleX(0.92f);
+                    qsbContainer.setScaleY(0.92f);
                 }
             }
-        } else if (toState == NORMAL && fromState == OVERVIEW_PEEK) {
-            // Keep fully visible until the very end (when overview is offscreen) to make invisible.
-            config.setInterpolator(ANIM_OVERVIEW_FADE, FINAL_FRAME);
-        } else if (toState == OVERVIEW_PEEK && fromState == NORMAL) {
-            config.setInterpolator(ANIM_OVERVIEW_FADE, INSTANT);
-            config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, OVERSHOOT_1_7);
-            config.setInterpolator(ANIM_OVERVIEW_SCRIM_FADE, FAST_OUT_SLOW_IN);
         } else if ((fromState == NORMAL || fromState == HINT_STATE) && toState == OVERVIEW) {
             if (SysUINavigationMode.getMode(mActivity) == NO_BUTTON) {
                 config.setInterpolator(ANIM_WORKSPACE_SCALE,
@@ -227,8 +214,7 @@ public class QuickstepAtomicAnimationFactory extends
             config.setInterpolator(ANIM_ALL_APPS_FADE, OVERSHOOT_1_2);
             config.setInterpolator(ANIM_OVERVIEW_SCALE, OVERSHOOT_1_2);
             config.setInterpolator(ANIM_DEPTH, OVERSHOOT_1_2);
-            Interpolator translationInterpolator = ENABLE_OVERVIEW_ACTIONS.get()
-                    && removeShelfFromOverview(mActivity)
+            Interpolator translationInterpolator = removeShelfFromOverview(mActivity)
                     ? OVERSHOOT_1_2
                     : OVERSHOOT_1_7;
             config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, translationInterpolator);
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java
deleted file mode 100644
index fac478e777..0000000000
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.uioverrides.touchcontrollers;
-
-import static com.android.launcher3.LauncherState.ALL_APPS;
-import static com.android.launcher3.LauncherState.NORMAL;
-import static com.android.launcher3.LauncherState.OVERVIEW;
-import static com.android.launcher3.LauncherState.OVERVIEW_PEEK;
-import static com.android.launcher3.anim.Interpolators.ACCEL;
-import static com.android.launcher3.anim.Interpolators.DEACCEL;
-import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_HEADER_FADE;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_FADE;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_SCALE;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_TRANSLATE;
-import static com.android.launcher3.states.StateAnimationConfig.PLAY_ATOMIC_OVERVIEW_PEEK;
-import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
-import static com.android.launcher3.uioverrides.states.QuickstepAtomicAnimationFactory.INDEX_PAUSE_TO_OVERVIEW_ANIM;
-import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;
-import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
-import android.util.Log;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewConfiguration;
-
-import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherState;
-import com.android.launcher3.anim.AnimationSuccessListener;
-import com.android.launcher3.anim.Interpolators;
-import com.android.launcher3.states.StateAnimationConfig;
-import com.android.launcher3.states.StateAnimationConfig.AnimationFlags;
-import com.android.launcher3.testing.TestProtocol;
-import com.android.launcher3.uioverrides.states.QuickstepAtomicAnimationFactory;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
-import com.android.launcher3.util.VibratorWrapper;
-import com.android.quickstep.SystemUiProxy;
-import com.android.quickstep.util.MotionPauseDetector;
-import com.android.quickstep.views.RecentsView;
-
-/**
- * Touch controller which handles swipe and hold to go to Overview
- */
-public class FlingAndHoldTouchController extends PortraitStatesTouchController {
-
-    private static final long PEEK_IN_ANIM_DURATION = 240;
-    private static final long PEEK_OUT_ANIM_DURATION = 100;
-    private static final float MAX_DISPLACEMENT_PERCENT = 0.75f;
-
-    protected final MotionPauseDetector mMotionPauseDetector;
-    private final float mMotionPauseMinDisplacement;
-    private final float mMotionPauseMaxDisplacement;
-
-    private AnimatorSet mPeekAnim;
-
-    public FlingAndHoldTouchController(Launcher l) {
-        super(l, false /* allowDragToOverview */);
-        mMotionPauseDetector = new MotionPauseDetector(l);
-        mMotionPauseMinDisplacement = ViewConfiguration.get(l).getScaledTouchSlop();
-        mMotionPauseMaxDisplacement = getMotionPauseMaxDisplacement();
-    }
-
-    protected float getMotionPauseMaxDisplacement() {
-        return getShiftRange() * MAX_DISPLACEMENT_PERCENT;
-    }
-
-    @Override
-    protected long getAtomicDuration() {
-        return QuickstepAtomicAnimationFactory.ATOMIC_DURATION_FROM_PAUSED_TO_OVERVIEW;
-    }
-
-    @Override
-    public void onDragStart(boolean start, float startDisplacement) {
-        mMotionPauseDetector.clear();
-
-        super.onDragStart(start, startDisplacement);
-
-        if (handlingOverviewAnim()) {
-            mMotionPauseDetector.setOnMotionPauseListener(this::onMotionPauseChanged);
-        }
-
-        if (mAtomicAnim != null) {
-            mAtomicAnim.cancel();
-        }
-    }
-
-    protected void onMotionPauseChanged(boolean isPaused) {
-        RecentsView recentsView = mLauncher.getOverviewPanel();
-        recentsView.setOverviewStateEnabled(isPaused);
-        if (mPeekAnim != null) {
-            mPeekAnim.cancel();
-        }
-        LauncherState fromState = isPaused ? NORMAL : OVERVIEW_PEEK;
-        LauncherState toState = isPaused ? OVERVIEW_PEEK : NORMAL;
-        long peekDuration = isPaused ? PEEK_IN_ANIM_DURATION : PEEK_OUT_ANIM_DURATION;
-
-        StateAnimationConfig config = new StateAnimationConfig();
-        config.duration = peekDuration;
-        config.animFlags = PLAY_ATOMIC_OVERVIEW_PEEK;
-        mPeekAnim = mLauncher.getStateManager().createAtomicAnimation(
-                fromState, toState, config);
-        mPeekAnim.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                mPeekAnim = null;
-            }
-        });
-        mPeekAnim.start();
-        VibratorWrapper.INSTANCE.get(mLauncher).vibrate(OVERVIEW_HAPTIC);
-
-        mLauncher.getDragLayer().getScrim().createSysuiMultiplierAnim(isPaused ? 0 : 1)
-                .setDuration(peekDuration).start();
-    }
-
-    /**
-     * @return Whether we are handling the overview animation, rather than
-     * having it as part of the existing animation to the target state.
-     */
-    protected boolean handlingOverviewAnim() {
-        int stateFlags = SystemUiProxy.INSTANCE.get(mLauncher).getLastSystemUiStateFlags();
-        return mStartState == NORMAL && (stateFlags & SYSUI_STATE_OVERVIEW_DISABLED) == 0;
-    }
-
-    @Override
-    protected StateAnimationConfig getConfigForStates(
-            LauncherState fromState, LauncherState toState) {
-        if (fromState == NORMAL && toState == ALL_APPS) {
-            StateAnimationConfig builder = new StateAnimationConfig();
-            // Fade in prediction icons quickly, then rest of all apps after reaching overview.
-            float progressToReachOverview = NORMAL.getVerticalProgress(mLauncher)
-                    - OVERVIEW.getVerticalProgress(mLauncher);
-            builder.setInterpolator(ANIM_ALL_APPS_HEADER_FADE, Interpolators.clampToProgress(
-                    ACCEL,
-                    0,
-                    ALL_APPS_CONTENT_FADE_THRESHOLD));
-            builder.setInterpolator(ANIM_ALL_APPS_FADE, Interpolators.clampToProgress(
-                    ACCEL,
-                    progressToReachOverview,
-                    progressToReachOverview + ALL_APPS_CONTENT_FADE_THRESHOLD));
-
-            // Get workspace out of the way quickly, to prepare for potential pause.
-            builder.setInterpolator(ANIM_WORKSPACE_SCALE, DEACCEL_3);
-            builder.setInterpolator(ANIM_WORKSPACE_TRANSLATE, DEACCEL_3);
-            builder.setInterpolator(ANIM_WORKSPACE_FADE, DEACCEL_3);
-            return builder;
-        } else if (fromState == ALL_APPS && toState == NORMAL) {
-            StateAnimationConfig builder = new StateAnimationConfig();
-            // Keep all apps/predictions opaque until the very end of the transition.
-            float progressToReachOverview = OVERVIEW.getVerticalProgress(mLauncher);
-            builder.setInterpolator(ANIM_ALL_APPS_FADE, Interpolators.clampToProgress(
-                    DEACCEL,
-                    progressToReachOverview - ALL_APPS_CONTENT_FADE_THRESHOLD,
-                    progressToReachOverview));
-            builder.setInterpolator(ANIM_ALL_APPS_HEADER_FADE, Interpolators.clampToProgress(
-                    DEACCEL,
-                    1 - ALL_APPS_CONTENT_FADE_THRESHOLD,
-                    1));
-            return builder;
-        }
-        return super.getConfigForStates(fromState, toState);
-    }
-
-    @Override
-    public boolean onDrag(float displacement, MotionEvent event) {
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "FlingAndHoldTouchController");
-        }
-        float upDisplacement = -displacement;
-        mMotionPauseDetector.setDisallowPause(!handlingOverviewAnim()
-                || upDisplacement < mMotionPauseMinDisplacement
-                || upDisplacement > mMotionPauseMaxDisplacement);
-        mMotionPauseDetector.addPosition(event);
-        return super.onDrag(displacement, event);
-    }
-
-    @Override
-    public void onDragEnd(float velocity) {
-        if (mMotionPauseDetector.isPaused() && handlingOverviewAnim()) {
-            goToOverviewOnDragEnd(velocity);
-        } else {
-            super.onDragEnd(velocity);
-        }
-
-        View searchView = mLauncher.getAppsView().getSearchView();
-        if (searchView instanceof FeedbackHandler) {
-            ((FeedbackHandler) searchView).resetFeedback();
-        }
-        mMotionPauseDetector.clear();
-    }
-
-    protected void goToOverviewOnDragEnd(float velocity) {
-        if (mPeekAnim != null) {
-            mPeekAnim.cancel();
-        }
-
-        Animator overviewAnim = mLauncher.createAtomicAnimationFactory()
-                .createStateElementAnimation(INDEX_PAUSE_TO_OVERVIEW_ANIM);
-        mAtomicAnim = new AnimatorSet();
-        mAtomicAnim.addListener(new AnimationSuccessListener() {
-            @Override
-            public void onAnimationSuccess(Animator animator) {
-                onSwipeInteractionCompleted(OVERVIEW, Touch.SWIPE);
-            }
-
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                super.onAnimationEnd(animation);
-                if (mCancelled) {
-                    StateAnimationConfig config = new StateAnimationConfig();
-                    config.animFlags = PLAY_ATOMIC_OVERVIEW_PEEK;
-                    config.duration = PEEK_OUT_ANIM_DURATION;
-                    mPeekAnim = mLauncher.getStateManager().createAtomicAnimation(
-                            mFromState, mToState, config);
-                    mPeekAnim.start();
-                }
-                mAtomicAnim = null;
-            }
-        });
-        mAtomicAnim.play(overviewAnim);
-        mAtomicAnim.start();
-    }
-
-    @Override
-    protected void goToTargetState(LauncherState targetState, int logAction) {
-        if (mPeekAnim != null && mPeekAnim.isStarted()) {
-            // Don't jump to the target state until overview is no longer peeking.
-            mPeekAnim.addListener(new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationEnd(Animator animation) {
-                    FlingAndHoldTouchController.super.goToTargetState(targetState, logAction);
-                }
-            });
-        } else {
-            super.goToTargetState(targetState, logAction);
-        }
-    }
-
-    @Override
-    @AnimationFlags
-    protected int updateAnimComponentsOnReinit(@AnimationFlags int animComponents) {
-        if (handlingOverviewAnim()) {
-            // We don't want the state transition to all apps to animate overview,
-            // as that will cause a jump after our atomic animation.
-            return animComponents | SKIP_OVERVIEW;
-        } else {
-            return animComponents;
-        }
-    }
-
-    /**
-     * Interface for views with feedback animation requiring reset
-     */
-    public interface FeedbackHandler {
-
-        /**
-         * reset searchWidget feedback
-         */
-        void resetFeedback();
-    }
-
-}
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
index dbff20ae6c..dc7ba97041 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -16,30 +16,44 @@
 
 package com.android.launcher3.uioverrides.touchcontrollers;
 
+import static com.android.launcher3.LauncherState.ALL_APPS;
 import static com.android.launcher3.LauncherState.HINT_STATE;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.Utilities.EDGE_NAV_BAR;
+import static com.android.launcher3.anim.Interpolators.ACCEL;
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
+import static com.android.launcher3.anim.Interpolators.DEACCEL;
+import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_HEADER_FADE;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_FADE;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_SCALE;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_TRANSLATE;
 import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
 
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.graphics.PointF;
 import android.util.Log;
 import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewConfiguration;
 
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimatorPlaybackController;
+import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.graphics.OverviewScrim;
-import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
 import com.android.launcher3.util.VibratorWrapper;
+import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
+import com.android.quickstep.util.MotionPauseDetector;
 import com.android.quickstep.util.OverviewToHomeAnim;
 import com.android.quickstep.views.RecentsView;
 
@@ -48,7 +62,7 @@ import com.android.quickstep.views.RecentsView;
  * the nav bar falls back to go to All Apps. Swiping from the nav bar without holding goes to the
  * first home screen instead of to Overview.
  */
-public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchController {
+public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouchController {
 
 
     // How much of the movement to use for translating overview after swipe and hold.
@@ -57,6 +71,8 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo
     private static final float TRANSLATION_ANIM_VELOCITY_DP_PER_MS = 0.8f;
 
     private final RecentsView mRecentsView;
+    private final MotionPauseDetector mMotionPauseDetector;
+    private final float mMotionPauseMinDisplacement;
 
     private boolean mDidTouchStartInNavBar;
     private boolean mReachedOverview;
@@ -69,20 +85,15 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo
     private ObjectAnimator mNormalToHintOverviewScrimAnimator;
 
     public NoButtonNavbarToOverviewTouchController(Launcher l) {
-        super(l);
+        super(l, false /* allowDragToOverview */);
         mRecentsView = l.getOverviewPanel();
+        mMotionPauseDetector = new MotionPauseDetector(l);
+        mMotionPauseMinDisplacement = ViewConfiguration.get(l).getScaledTouchSlop();
         if (TestProtocol.sDebugTracing) {
             Log.d(TestProtocol.PAUSE_NOT_DETECTED, "NoButtonNavbarToOverviewTouchController.ctor");
         }
     }
 
-    @Override
-    protected float getMotionPauseMaxDisplacement() {
-        // No need to disallow pause when swiping up all the way up the screen (unlike
-        // FlingAndHoldTouchController where user is probably intending to go to all apps).
-        return Float.MAX_VALUE;
-    }
-
     @Override
     protected boolean canInterceptTouch(MotionEvent ev) {
         mDidTouchStartInNavBar = (ev.getEdgeFlags() & EDGE_NAV_BAR) != 0;
@@ -113,6 +124,13 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo
     @Override
     public void onDragStart(boolean start, float startDisplacement) {
         super.onDragStart(start, startDisplacement);
+
+        mMotionPauseDetector.clear();
+
+        if (handlingOverviewAnim()) {
+            mMotionPauseDetector.setOnMotionPauseListener(this::onMotionPauseChanged);
+        }
+
         if (mFromState == NORMAL && mToState == HINT_STATE) {
             mNormalToHintOverviewScrimAnimator = ObjectAnimator.ofFloat(
                     mLauncher.getDragLayer().getOverviewScrim(),
@@ -134,7 +152,18 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo
 
     @Override
     public void onDragEnd(float velocity) {
-        super.onDragEnd(velocity);
+        if (mMotionPauseDetector.isPaused() && handlingOverviewAnim()) {
+            goToOverviewOrHomeOnDragEnd(velocity);
+        } else {
+            super.onDragEnd(velocity);
+        }
+
+        View searchView = mLauncher.getAppsView().getSearchView();
+        if (searchView instanceof FeedbackHandler) {
+            ((FeedbackHandler) searchView).resetFeedback();
+        }
+
+        mMotionPauseDetector.clear();
         mNormalToHintOverviewScrimAnimator = null;
     }
 
@@ -151,8 +180,7 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo
         }
     }
 
-    @Override
-    protected void onMotionPauseChanged(boolean isPaused) {
+    private void onMotionPauseChanged(boolean isPaused) {
         if (mCurrentAnimation == null) {
             return;
         }
@@ -175,9 +203,10 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo
         }
     }
 
-    @Override
-    protected boolean handlingOverviewAnim() {
-        return mDidTouchStartInNavBar && super.handlingOverviewAnim();
+    private boolean handlingOverviewAnim() {
+        int stateFlags = SystemUiProxy.INSTANCE.get(mLauncher).getLastSystemUiStateFlags();
+        return mDidTouchStartInNavBar && mStartState == NORMAL
+                && (stateFlags & SYSUI_STATE_OVERVIEW_DISABLED) == 0;
     }
 
     @Override
@@ -203,14 +232,18 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo
             // Stay in Overview.
             return true;
         }
+
+        float upDisplacement = -yDisplacement;
+        mMotionPauseDetector.setDisallowPause(!handlingOverviewAnim()
+                || upDisplacement < mMotionPauseMinDisplacement);
+        mMotionPauseDetector.addPosition(event);
+
         return super.onDrag(yDisplacement, xDisplacement, event);
     }
 
-    @Override
-    protected void goToOverviewOnDragEnd(float velocity) {
+    private void goToOverviewOrHomeOnDragEnd(float velocity) {
         float velocityDp = dpiFromPx(velocity);
         boolean isFling = Math.abs(velocityDp) > 1;
-        StateManager<LauncherState> stateManager = mLauncher.getStateManager();
         boolean goToHomeInsteadOfOverview = isFling;
         if (goToHomeInsteadOfOverview) {
             new OverviewToHomeAnim(mLauncher, ()-> onSwipeInteractionCompleted(NORMAL, Touch.FLING))
@@ -243,4 +276,54 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo
     private float dpiFromPx(float pixels) {
         return Utilities.dpiFromPx(pixels, mLauncher.getResources().getDisplayMetrics());
     }
+
+    @Override
+    protected StateAnimationConfig getConfigForStates(
+            LauncherState fromState, LauncherState toState) {
+        if (fromState == NORMAL && toState == ALL_APPS) {
+            StateAnimationConfig builder = new StateAnimationConfig();
+            // Fade in prediction icons quickly, then rest of all apps after reaching overview.
+            float progressToReachOverview = NORMAL.getVerticalProgress(mLauncher)
+                    - OVERVIEW.getVerticalProgress(mLauncher);
+            builder.setInterpolator(ANIM_ALL_APPS_HEADER_FADE, Interpolators.clampToProgress(
+                    ACCEL,
+                    0,
+                    ALL_APPS_CONTENT_FADE_THRESHOLD));
+            builder.setInterpolator(ANIM_ALL_APPS_FADE, Interpolators.clampToProgress(
+                    ACCEL,
+                    progressToReachOverview,
+                    progressToReachOverview + ALL_APPS_CONTENT_FADE_THRESHOLD));
+
+            // Get workspace out of the way quickly, to prepare for potential pause.
+            builder.setInterpolator(ANIM_WORKSPACE_SCALE, DEACCEL_3);
+            builder.setInterpolator(ANIM_WORKSPACE_TRANSLATE, DEACCEL_3);
+            builder.setInterpolator(ANIM_WORKSPACE_FADE, DEACCEL_3);
+            return builder;
+        } else if (fromState == ALL_APPS && toState == NORMAL) {
+            StateAnimationConfig builder = new StateAnimationConfig();
+            // Keep all apps/predictions opaque until the very end of the transition.
+            float progressToReachOverview = OVERVIEW.getVerticalProgress(mLauncher);
+            builder.setInterpolator(ANIM_ALL_APPS_FADE, Interpolators.clampToProgress(
+                    DEACCEL,
+                    progressToReachOverview - ALL_APPS_CONTENT_FADE_THRESHOLD,
+                    progressToReachOverview));
+            builder.setInterpolator(ANIM_ALL_APPS_HEADER_FADE, Interpolators.clampToProgress(
+                    DEACCEL,
+                    1 - ALL_APPS_CONTENT_FADE_THRESHOLD,
+                    1));
+            return builder;
+        }
+        return super.getConfigForStates(fromState, toState);
+    }
+
+    /**
+     * Interface for views with feedback animation requiring reset
+     */
+    public interface FeedbackHandler {
+
+        /**
+         * reset searchWidget feedback
+         */
+        void resetFeedback();
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
index 3867c35050..4b0642fab7 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
@@ -15,7 +15,6 @@
  */
 package com.android.launcher3.uioverrides.touchcontrollers;
 
-import static com.android.launcher3.LauncherState.HOTSEAT_ICONS;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.OVERVIEW_BUTTONS;
@@ -25,7 +24,6 @@ import static com.android.launcher3.anim.Interpolators.ACCEL_0_75;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_5;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.Interpolators.scrollInterpolatorForVelocity;
-import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_UNKNOWN_SWIPEDOWN;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_UNKNOWN_SWIPEUP;
@@ -40,9 +38,6 @@ import static com.android.launcher3.touch.BothAxesSwipeDetector.DIRECTION_UP;
 import static com.android.launcher3.uioverrides.states.QuickstepAtomicAnimationFactory.INDEX_PAUSE_TO_OVERVIEW_ANIM;
 import static com.android.launcher3.util.DisplayController.getSingleFrameMs;
 import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;
-import static com.android.quickstep.util.ShelfPeekAnim.ShelfAnimState.CANCEL;
-import static com.android.quickstep.util.ShelfPeekAnim.ShelfAnimState.HIDE;
-import static com.android.quickstep.util.ShelfPeekAnim.ShelfAnimState.PEEK;
 import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET;
 import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS;
 import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
@@ -60,10 +55,8 @@ import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.allapps.AllAppsTransitionController;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
-import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.graphics.OverviewScrim;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.states.StateAnimationConfig;
@@ -79,8 +72,6 @@ import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
 import com.android.quickstep.util.LayoutUtils;
 import com.android.quickstep.util.MotionPauseDetector;
-import com.android.quickstep.util.ShelfPeekAnim;
-import com.android.quickstep.util.ShelfPeekAnim.ShelfAnimState;
 import com.android.quickstep.util.StaggeredWorkspaceAnim;
 import com.android.quickstep.views.LauncherRecentsView;
 
@@ -99,7 +90,6 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
 
     private final BaseQuickstepLauncher mLauncher;
     private final BothAxesSwipeDetector mSwipeDetector;
-    private final ShelfPeekAnim mShelfPeekAnim;
     private final float mXRange;
     private final float mYRange;
     private final float mMaxYProgress;
@@ -121,7 +111,6 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
     public NoButtonQuickSwitchTouchController(BaseQuickstepLauncher launcher) {
         mLauncher = launcher;
         mSwipeDetector = new BothAxesSwipeDetector(mLauncher, this);
-        mShelfPeekAnim = mLauncher.getShelfPeekAnim();
         mRecentsView = mLauncher.getOverviewPanel();
         mXRange = mLauncher.getDeviceProfile().widthPx / 2f;
         mYRange = LayoutUtils.getShelfTrackingDistance(
@@ -191,25 +180,6 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
     @Override
     public void onMotionPauseChanged(boolean isPaused) {
         VibratorWrapper.INSTANCE.get(mLauncher).vibrate(OVERVIEW_HAPTIC);
-
-        if (FeatureFlags.ENABLE_OVERVIEW_ACTIONS.get()) {
-            return;
-        }
-
-        ShelfAnimState shelfState = isPaused ? PEEK : HIDE;
-        if (shelfState == PEEK) {
-            // Some shelf elements (e.g. qsb) were hidden, but we need them visible when peeking.
-            AllAppsTransitionController allAppsController = mLauncher.getAllAppsController();
-            allAppsController.setAlphas(
-                    NORMAL, new StateAnimationConfig(), NO_ANIM_PROPERTY_SETTER);
-
-            if ((OVERVIEW.getVisibleElements(mLauncher) & HOTSEAT_ICONS) != 0) {
-                // Hotseat was hidden, but we need it visible when peeking.
-                mLauncher.getHotseat().setAlpha(1);
-            }
-        }
-        mShelfPeekAnim.setShelfState(shelfState, ShelfPeekAnim.INTERPOLATOR,
-                ShelfPeekAnim.DURATION);
     }
 
     private void setupAnimators() {
@@ -301,10 +271,6 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
         mIsHomeScreenVisible = FADE_OUT_INTERPOLATOR.getInterpolation(xProgress)
                 <= 1 - ALPHA_CUTOFF_THRESHOLD;
 
-        if (wasHomeScreenVisible && !mIsHomeScreenVisible) {
-            // Get the shelf all the way offscreen so it pops up when we decide to peek it.
-            mShelfPeekAnim.setShelfState(HIDE, LINEAR, 0);
-        }
 
         // Only allow motion pause if the home screen is invisible, since some
         // home screen elements will appear in the shelf on motion pause.
@@ -312,11 +278,6 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
                 || -displacement.y < mMotionPauseMinDisplacement);
         mMotionPauseDetector.addPosition(ev);
 
-        if (mIsHomeScreenVisible) {
-            // Cancel the shelf anim so it doesn't clobber mNonOverviewAnim.
-            mShelfPeekAnim.setShelfState(CANCEL, LINEAR, 0);
-        }
-
         if (mXOverviewAnim != null) {
             mXOverviewAnim.setPlayFraction(xProgress);
         }
@@ -474,7 +435,6 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
         if (mYOverviewAnim != null) {
             mYOverviewAnim.cancelAnimation();
         }
-        mShelfPeekAnim.setShelfState(ShelfAnimState.CANCEL, LINEAR, 0);
         mMotionPauseDetector.clear();
     }
 
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
index a684b9d7fb..1208c6c79b 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
@@ -24,7 +24,6 @@ import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.anim.Interpolators.ACCEL;
 import static com.android.launcher3.anim.Interpolators.DEACCEL;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
-import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_ACTIONS;
 import static com.android.launcher3.config.FeatureFlags.UNSTABLE_SPRINGS;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE;
@@ -142,7 +141,7 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
                 Log.d(TestProtocol.OVERIEW_NOT_ALLAPPS,
                         "PortraitStatesTouchController.getTargetState 1");
             }
-            if (ENABLE_OVERVIEW_ACTIONS.get() && removeShelfFromOverview(mLauncher)) {
+            if (removeShelfFromOverview(mLauncher)) {
                 // Don't allow swiping down to overview.
                 return NORMAL;
             }
@@ -154,7 +153,7 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
                         "PortraitStatesTouchController.getTargetState 2");
             }
             LauncherState positiveDragTarget = ALL_APPS;
-            if (ENABLE_OVERVIEW_ACTIONS.get() && removeShelfFromOverview(mLauncher)) {
+            if (removeShelfFromOverview(mLauncher)) {
                 // Don't allow swiping up to all apps.
                 positiveDragTarget = OVERVIEW;
             }
@@ -249,7 +248,7 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
 
         final StateAnimationConfig config = totalShift == 0 ? new StateAnimationConfig()
                 : getConfigForStates(mFromState, mToState);
-        config.animFlags = updateAnimComponentsOnReinit(animFlags);
+        config.animFlags = animFlags;
         config.duration = maxAccuracy;
 
         cancelPendingAnim();
@@ -283,14 +282,6 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
         return 1 / totalShift;
     }
 
-    /**
-     * Give subclasses the chance to update the animation when we re-initialize towards a new state.
-     */
-    @AnimationFlags
-    protected int updateAnimComponentsOnReinit(@AnimationFlags int animComponents) {
-        return animComponents;
-    }
-
     private void cancelPendingAnim() {
         if (mPendingAnimation != null) {
             mPendingAnimation.finish(false, Touch.SWIPE);
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 2ca07eccd0..aaa2720047 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -20,7 +20,6 @@ import static android.widget.Toast.LENGTH_SHORT;
 import static com.android.launcher3.BaseActivity.INVISIBLE_BY_STATE_HANDLER;
 import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS;
 import static com.android.launcher3.anim.Interpolators.DEACCEL;
-import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
@@ -41,8 +40,6 @@ import static com.android.quickstep.GestureState.STATE_END_TARGET_ANIMATION_FINI
 import static com.android.quickstep.GestureState.STATE_END_TARGET_SET;
 import static com.android.quickstep.GestureState.STATE_RECENTS_SCROLLING_FINISHED;
 import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;
-import static com.android.quickstep.util.ShelfPeekAnim.ShelfAnimState.HIDE;
-import static com.android.quickstep.util.ShelfPeekAnim.ShelfAnimState.PEEK;
 import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD;
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME;
 
@@ -93,8 +90,6 @@ import com.android.quickstep.util.ActivityInitListener;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
 import com.android.quickstep.util.InputConsumerProxy;
 import com.android.quickstep.util.RectFSpringAnim;
-import com.android.quickstep.util.ShelfPeekAnim;
-import com.android.quickstep.util.ShelfPeekAnim.ShelfAnimState;
 import com.android.quickstep.util.SurfaceTransactionApplier;
 import com.android.quickstep.util.TransformParams;
 import com.android.quickstep.views.LiveTileOverlay;
@@ -205,7 +200,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
 
     // Either RectFSpringAnim (if animating home) or ObjectAnimator (from mCurrentShift) otherwise
     private RunningWindowAnim mRunningWindowAnim;
-    private boolean mIsShelfPeeking;
+    private boolean mIsMotionPaused;
 
     private boolean mContinuingLastGesture;
 
@@ -491,7 +486,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
      * Called when motion pause is detected
      */
     public void onMotionPauseChanged(boolean isPaused) {
-        setShelfState(isPaused ? PEEK : HIDE, ShelfPeekAnim.INTERPOLATOR, ShelfPeekAnim.DURATION);
+        mIsMotionPaused = isPaused;
+        maybeUpdateRecentsAttachedState();
+        performHapticFeedback();
     }
 
     public void maybeUpdateRecentsAttachedState() {
@@ -522,7 +519,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
             // The window is going away so make sure recents is always visible in this case.
             recentsAttachedToAppWindow = true;
         } else {
-            recentsAttachedToAppWindow = mIsShelfPeeking || mIsLikelyToStartNewTask;
+            recentsAttachedToAppWindow = mIsMotionPaused || mIsLikelyToStartNewTask;
         }
         mAnimationFactory.setRecentsAttachedToAppWindow(recentsAttachedToAppWindow, animate);
 
@@ -552,19 +549,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         }
     }
 
-    @UiThread
-    public void setShelfState(ShelfAnimState shelfState, Interpolator interpolator, long duration) {
-        mAnimationFactory.setShelfState(shelfState, interpolator, duration);
-        boolean wasShelfPeeking = mIsShelfPeeking;
-        mIsShelfPeeking = shelfState == PEEK;
-        if (mIsShelfPeeking != wasShelfPeeking) {
-            maybeUpdateRecentsAttachedState();
-        }
-        if (shelfState.shouldPreformHaptic) {
-            performHapticFeedback();
-        }
-    }
-
     private void buildAnimationController() {
         if (!canCreateNewOrUpdateExistingLauncherTransitionController()) {
             return;
@@ -852,7 +836,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
             if (isCancel) {
                 endTarget = LAST_TASK;
             } else if (mDeviceState.isFullyGesturalNavMode()) {
-                if (mIsShelfPeeking) {
+                if (mIsMotionPaused) {
                     endTarget = RECENTS;
                 } else if (goingToNewTask) {
                     endTarget = NEW_TASK;
@@ -874,7 +858,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
 
             if (mDeviceState.isFullyGesturalNavMode() && isSwipeUp && !willGoToNewTaskOnSwipeUp) {
                 endTarget = HOME;
-            } else if (mDeviceState.isFullyGesturalNavMode() && isSwipeUp && !mIsShelfPeeking) {
+            } else if (mDeviceState.isFullyGesturalNavMode() && isSwipeUp && !mIsMotionPaused) {
                 // If swiping at a diagonal, base end target on the faster velocity.
                 endTarget = NEW_TASK;
             } else if (isSwipeUp) {
@@ -942,7 +926,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
             mInputConsumerProxy.enable();
         }
         if (endTarget == HOME) {
-            setShelfState(ShelfAnimState.CANCEL, LINEAR, 0);
             duration = Math.max(MIN_OVERSHOOT_DURATION, duration);
         } else if (endTarget == RECENTS) {
             LiveTileOverlay.INSTANCE.startIconAnimation();
@@ -958,9 +941,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                 }
                 duration = Math.max(duration, mRecentsView.getScroller().getDuration());
             }
-            if (mDeviceState.isFullyGesturalNavMode()) {
-                setShelfState(ShelfAnimState.OVERVIEW, interpolator, duration);
-            }
         }
 
         // Let RecentsView handle the scrolling to the task, which we launch in startNewTask()
@@ -1267,7 +1247,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
     }
 
     private void endLauncherTransitionController() {
-        setShelfState(ShelfAnimState.CANCEL, LINEAR, 0);
         if (mLauncherTransitionController != null) {
             // End the animation, but stay at the same visual progress.
             mLauncherTransitionController.getNormalController().dispatchSetInterpolator(
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index 1a4620b3e7..8b108ac299 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -18,7 +18,6 @@ package com.android.quickstep;
 import static com.android.launcher3.anim.Interpolators.ACCEL_2;
 import static com.android.launcher3.anim.Interpolators.INSTANT;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
-import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_ACTIONS;
 import static com.android.quickstep.AbsSwipeUpHandler.RECENTS_ATTACH_DURATION;
 import static com.android.quickstep.SysUINavigationMode.getMode;
 import static com.android.quickstep.SysUINavigationMode.hideShelfInTwoButtonLandscape;
@@ -37,7 +36,6 @@ import android.content.res.Resources;
 import android.graphics.Rect;
 import android.os.Build;
 import android.view.MotionEvent;
-import android.view.animation.Interpolator;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
@@ -54,7 +52,6 @@ import com.android.launcher3.util.WindowBounds;
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.util.ActivityInitListener;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
-import com.android.quickstep.util.ShelfPeekAnim;
 import com.android.quickstep.util.SplitScreenBounds;
 import com.android.quickstep.views.RecentsView;
 import com.android.systemui.shared.recents.model.ThumbnailData;
@@ -299,9 +296,6 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
 
         default void onTransitionCancelled() { }
 
-        default void setShelfState(ShelfPeekAnim.ShelfAnimState animState,
-                Interpolator interpolator, long duration) { }
-
         /**
          * @param attached Whether to show RecentsView alongside the app window. If false, recents
          *                 will be hidden by some property we can animate, e.g. alpha.
@@ -409,6 +403,6 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
     }
 
     protected static boolean showOverviewActions(Context context) {
-        return ENABLE_OVERVIEW_ACTIONS.get() && removeShelfFromOverview(context);
+        return removeShelfFromOverview(context);
     }
 }
diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
index 4e38f494f1..036d473060 100644
--- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
@@ -27,7 +27,6 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Rect;
 import android.util.Log;
-import android.view.animation.Interpolator;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
@@ -50,7 +49,6 @@ import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.util.ActivityInitListener;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
 import com.android.quickstep.util.LayoutUtils;
-import com.android.quickstep.util.ShelfPeekAnim.ShelfAnimState;
 import com.android.quickstep.views.RecentsView;
 import com.android.systemui.plugins.shared.LauncherOverlayManager;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
@@ -121,12 +119,6 @@ public final class LauncherActivityInterface extends
             boolean activityVisible, Consumer<AnimatorControllerWithResistance> callback) {
         notifyRecentsOfOrientation(deviceState.getRotationTouchHelper());
         DefaultAnimationFactory factory = new DefaultAnimationFactory(callback) {
-            @Override
-            public void setShelfState(ShelfAnimState shelfState, Interpolator interpolator,
-                    long duration) {
-                mActivity.getShelfPeekAnim().setShelfState(shelfState, interpolator, duration);
-            }
-
             @Override
             protected void createBackgroundToOverviewAnim(BaseQuickstepLauncher activity,
                     PendingAnimation pa) {
diff --git a/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java b/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java
index 5026f36e08..e4b8ce2df5 100644
--- a/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java
+++ b/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java
@@ -53,12 +53,6 @@ public class QuickstepTestInformationHandler extends TestInformationHandler {
                         Bundle::putInt, PortraitStatesTouchController::getHotseatTop);
             }
 
-            case TestProtocol.REQUEST_OVERVIEW_ACTIONS_ENABLED: {
-                response.putBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD,
-                        FeatureFlags.ENABLE_OVERVIEW_ACTIONS.get());
-                return response;
-            }
-
             case TestProtocol.REQUEST_OVERVIEW_SHARE_ENABLED: {
                 response.putBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD,
                         FeatureFlags.ENABLE_OVERVIEW_SHARE.get());
diff --git a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
index ff051b6db7..3b245b3230 100644
--- a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
@@ -18,7 +18,6 @@ package com.android.quickstep;
 
 import static android.view.Display.DEFAULT_DISPLAY;
 
-import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_ACTIONS;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_SELECTIONS;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SYSTEM_SHORTCUT_FREE_FORM_TAP;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SYSTEM_SHORTCUT_SPLIT_SCREEN_TAP;
@@ -310,16 +309,11 @@ public interface TaskShortcutFactory {
     TaskShortcutFactory WELLBEING = (activity, view) ->
             WellbeingModel.SHORTCUT_FACTORY.getShortcut(activity, view.getItemInfo());
 
-    TaskShortcutFactory SCREENSHOT = (activity, tv) -> {
-        if (ENABLE_OVERVIEW_ACTIONS.get()) {
-            return tv.getThumbnail().getTaskOverlay()
-                .getScreenshotShortcut(activity, tv.getItemInfo());
-        }
-        return null;
-    };
+    TaskShortcutFactory SCREENSHOT = (activity, tv) -> tv.getThumbnail().getTaskOverlay()
+            .getScreenshotShortcut(activity, tv.getItemInfo());
 
     TaskShortcutFactory MODAL = (activity, tv) -> {
-        if (ENABLE_OVERVIEW_ACTIONS.get() && ENABLE_OVERVIEW_SELECTIONS.get()) {
+        if (ENABLE_OVERVIEW_SELECTIONS.get()) {
             return tv.getThumbnail().getTaskOverlay().getModalStateSystemShortcut(tv.getItemInfo());
         }
         return null;
diff --git a/quickstep/src/com/android/quickstep/util/LayoutUtils.java b/quickstep/src/com/android/quickstep/util/LayoutUtils.java
index f7bd1e29d8..b88a195de4 100644
--- a/quickstep/src/com/android/quickstep/util/LayoutUtils.java
+++ b/quickstep/src/com/android/quickstep/util/LayoutUtils.java
@@ -15,7 +15,6 @@
  */
 package com.android.quickstep.util;
 
-import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_ACTIONS;
 import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
 
 import android.content.Context;
@@ -45,7 +44,7 @@ public class LayoutUtils {
     public static int getShelfTrackingDistance(Context context, DeviceProfile dp,
             PagedOrientationHandler orientationHandler) {
         // Track the bottom of the window.
-        if (ENABLE_OVERVIEW_ACTIONS.get() && removeShelfFromOverview(context)) {
+        if (removeShelfFromOverview(context)) {
             Rect taskSize = new Rect();
             LauncherActivityInterface.INSTANCE.calculateTaskSize(context, dp, taskSize,
                     orientationHandler);
diff --git a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
index c2e67c1f2f..7eda627934 100644
--- a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
+++ b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
@@ -21,7 +21,6 @@ import static com.android.launcher3.LauncherState.ALL_APPS;
 import static com.android.launcher3.LauncherState.HINT_STATE;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
-import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_ACTIONS;
 import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
 import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
 
@@ -66,8 +65,7 @@ public class QuickstepOnboardingPrefs extends OnboardingPrefs<BaseQuickstepLaunc
         }
 
         boolean shelfBounceSeen = getBoolean(SHELF_BOUNCE_SEEN);
-        if (!shelfBounceSeen && ENABLE_OVERVIEW_ACTIONS.get()
-                && removeShelfFromOverview(launcher)) {
+        if (!shelfBounceSeen && removeShelfFromOverview(launcher)) {
             // There's no shelf in overview, so don't bounce it (can't get to all apps anyway).
             shelfBounceSeen = true;
             mSharedPrefs.edit().putBoolean(SHELF_BOUNCE_SEEN, shelfBounceSeen).apply();
diff --git a/quickstep/src/com/android/quickstep/util/ShelfPeekAnim.java b/quickstep/src/com/android/quickstep/util/ShelfPeekAnim.java
deleted file mode 100644
index 85006da109..0000000000
--- a/quickstep/src/com/android/quickstep/util/ShelfPeekAnim.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.quickstep.util;
-
-import static com.android.launcher3.LauncherState.BACKGROUND_APP;
-import static com.android.launcher3.LauncherState.OVERVIEW;
-import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
-import static com.android.launcher3.uioverrides.states.QuickstepAtomicAnimationFactory.INDEX_SHELF_ANIM;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.view.animation.Interpolator;
-
-import com.android.launcher3.Launcher;
-import com.android.launcher3.config.FeatureFlags;
-import com.android.launcher3.uioverrides.states.OverviewState;
-
-/**
- * Animates the shelf between states HIDE, PEEK, and OVERVIEW.
- */
-public class ShelfPeekAnim {
-
-    public static final Interpolator INTERPOLATOR = OVERSHOOT_1_2;
-    public static final long DURATION = 240;
-
-    private final Launcher mLauncher;
-
-    private ShelfAnimState mShelfState;
-    private boolean mIsPeeking;
-
-    public ShelfPeekAnim(Launcher launcher) {
-        mLauncher = launcher;
-    }
-
-    /**
-     * Animates to the given state, canceling the previous animation if it was still running.
-     */
-    public void setShelfState(ShelfAnimState shelfState, Interpolator interpolator, long duration) {
-        if (mShelfState == shelfState || FeatureFlags.ENABLE_OVERVIEW_ACTIONS.get()) {
-            return;
-        }
-        mLauncher.getStateManager().cancelStateElementAnimation(INDEX_SHELF_ANIM);
-        mShelfState = shelfState;
-        mIsPeeking = mShelfState == ShelfAnimState.PEEK || mShelfState == ShelfAnimState.HIDE;
-        if (mShelfState == ShelfAnimState.CANCEL) {
-            return;
-        }
-        float shelfHiddenProgress = BACKGROUND_APP.getVerticalProgress(mLauncher);
-        float shelfOverviewProgress = OVERVIEW.getVerticalProgress(mLauncher);
-        // Peek based on default overview progress so we can see hotseat if we're showing
-        // that instead of predictions in overview.
-        float defaultOverviewProgress = OverviewState.getDefaultVerticalProgress(mLauncher);
-        float shelfPeekingProgress = shelfHiddenProgress
-                - (shelfHiddenProgress - defaultOverviewProgress) * 0.25f;
-        float toProgress = mShelfState == ShelfAnimState.HIDE
-                ? shelfHiddenProgress
-                : mShelfState == ShelfAnimState.PEEK
-                        ? shelfPeekingProgress
-                        : shelfOverviewProgress;
-        Animator shelfAnim = mLauncher.getStateManager()
-                .createStateElementAnimation(INDEX_SHELF_ANIM, toProgress);
-        shelfAnim.setInterpolator(interpolator);
-        shelfAnim.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationCancel(Animator animation) {
-                mShelfState = ShelfAnimState.CANCEL;
-            }
-
-            @Override
-            public void onAnimationEnd(Animator animator) {
-                mIsPeeking = mShelfState == ShelfAnimState.PEEK;
-            }
-        });
-        shelfAnim.setDuration(duration).start();
-    }
-
-    /** @return Whether the shelf is currently peeking or animating to or from peeking. */
-    public boolean isPeeking() {
-        return mIsPeeking;
-    }
-
-    /** The various shelf states we can animate to. */
-    public enum ShelfAnimState {
-        HIDE(true), PEEK(true), OVERVIEW(false), CANCEL(false);
-
-        ShelfAnimState(boolean shouldPreformHaptic) {
-            this.shouldPreformHaptic = shouldPreformHaptic;
-        }
-
-        public final boolean shouldPreformHaptic;
-    }
-}
diff --git a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
index 1bf2fbf81f..8f609919f5 100644
--- a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
+++ b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
@@ -16,7 +16,6 @@
 
 package com.android.quickstep.views;
 
-import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_ACTIONS;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_SHARE;
 import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
 
@@ -53,7 +52,6 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
 
     @IntDef(flag = true, value = {
             HIDDEN_UNSUPPORTED_NAVIGATION,
-            HIDDEN_DISABLED_FEATURE,
             HIDDEN_NON_ZERO_ROTATION,
             HIDDEN_NO_TASKS,
             HIDDEN_GESTURE_RUNNING,
@@ -62,11 +60,10 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
     public @interface ActionsHiddenFlags { }
 
     public static final int HIDDEN_UNSUPPORTED_NAVIGATION = 1 << 0;
-    public static final int HIDDEN_DISABLED_FEATURE = 1 << 1;
-    public static final int HIDDEN_NON_ZERO_ROTATION = 1 << 2;
-    public static final int HIDDEN_NO_TASKS = 1 << 3;
-    public static final int HIDDEN_GESTURE_RUNNING = 1 << 4;
-    public static final int HIDDEN_NO_RECENTS = 1 << 5;
+    public static final int HIDDEN_NON_ZERO_ROTATION = 1 << 1;
+    public static final int HIDDEN_NO_TASKS = 1 << 2;
+    public static final int HIDDEN_GESTURE_RUNNING = 1 << 3;
+    public static final int HIDDEN_NO_RECENTS = 1 << 4;
 
     @IntDef(flag = true, value = {
             DISABLED_SCROLLING,
@@ -145,7 +142,6 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
-        updateHiddenFlags(HIDDEN_DISABLED_FEATURE, !ENABLE_OVERVIEW_ACTIONS.get());
         updateHiddenFlags(HIDDEN_UNSUPPORTED_NAVIGATION, !removeShelfFromOverview(getContext()));
     }
 
diff --git a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java b/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
index f1ac6a5b94..e6613ebe80 100644
--- a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
+++ b/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
@@ -16,9 +16,7 @@
 package com.android.quickstep.views;
 
 import static com.android.launcher3.LauncherState.ALL_APPS_HEADER_EXTRA;
-import static com.android.launcher3.LauncherState.BACKGROUND_APP;
 import static com.android.launcher3.LauncherState.OVERVIEW;
-import static com.android.launcher3.LauncherState.QUICK_SWITCH;
 import static com.android.launcher3.anim.Interpolators.ACCEL;
 import static com.android.launcher3.anim.Interpolators.ACCEL_2;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
@@ -38,11 +36,9 @@ import android.view.animation.Interpolator;
 
 import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.Interpolators;
-import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.uioverrides.states.OverviewState;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.ScrimView;
@@ -155,8 +151,7 @@ public class ShelfScrimView extends ScrimView<BaseQuickstepLauncher>
 
             Context context = getContext();
             if ((OVERVIEW.getVisibleElements(mLauncher) & ALL_APPS_HEADER_EXTRA) == 0) {
-                if (FeatureFlags.ENABLE_OVERVIEW_ACTIONS.get()
-                        && SysUINavigationMode.removeShelfFromOverview(context)) {
+                if (SysUINavigationMode.removeShelfFromOverview(context)) {
                     // Fade in all apps background quickly to distinguish from swiping from nav bar.
                     mMidAlpha = Themes.getAttrInteger(context, R.attr.allAppsInterimScrimAlpha);
                     mMidProgress = OverviewState.getDefaultVerticalProgress(mLauncher);
@@ -198,13 +193,6 @@ public class ShelfScrimView extends ScrimView<BaseQuickstepLauncher>
         if (mProgress >= 1) {
             mRemainingScreenColor = 0;
             mShelfColor = 0;
-            LauncherState state = mLauncher.getStateManager().getState();
-            if (mSysUINavigationMode == Mode.NO_BUTTON
-                    && (state == BACKGROUND_APP || state == QUICK_SWITCH)
-                    && mLauncher.getShelfPeekAnim().isPeeking()) {
-                // Show the shelf background when peeking during swipe up.
-                mShelfColor = setColorAlphaBound(mEndScrim, mMidAlpha);
-            }
         } else if (mProgress >= mMidProgress) {
             mRemainingScreenColor = 0;
 
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 3f64df3702..53b65e812f 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -34,7 +34,6 @@ import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.NO_OFFSET;
 import static com.android.launcher3.LauncherState.NO_SCALE;
 import static com.android.launcher3.LauncherState.OVERVIEW;
-import static com.android.launcher3.LauncherState.OVERVIEW_PEEK;
 import static com.android.launcher3.LauncherState.SPRING_LOADED;
 import static com.android.launcher3.Utilities.postAsyncCallback;
 import static com.android.launcher3.dragndrop.DragLayer.ALPHA_INDEX_LAUNCHER_LOAD;
@@ -451,7 +450,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
                 float alpha = 1f - mCurrentAssistantVisibility;
                 if (finalState == NORMAL) {
                     mAppsView.getAlphaProperty(APPS_VIEW_ALPHA_CHANNEL_INDEX).setValue(alpha);
-                } else if (finalState == OVERVIEW || finalState == OVERVIEW_PEEK) {
+                } else if (finalState == OVERVIEW) {
                     mAppsView.getAlphaProperty(APPS_VIEW_ALPHA_CHANNEL_INDEX).setValue(alpha);
                     mScrimView.setAlpha(alpha);
                 } else {
@@ -551,7 +550,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         LauncherState state = mStateManager.getState();
         if (state == NORMAL) {
             mAppsView.getAlphaProperty(APPS_VIEW_ALPHA_CHANNEL_INDEX).setValue(alpha);
-        } else if (state == OVERVIEW || state == OVERVIEW_PEEK) {
+        } else if (state == OVERVIEW) {
             mAppsView.getAlphaProperty(APPS_VIEW_ALPHA_CHANNEL_INDEX).setValue(alpha);
             mScrimView.setAlpha(alpha);
         }
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java
index 39b0f2ffb9..b6bc500a58 100644
--- a/src/com/android/launcher3/LauncherState.java
+++ b/src/com/android/launcher3/LauncherState.java
@@ -21,7 +21,6 @@ import static com.android.launcher3.testing.TestProtocol.BACKGROUND_APP_STATE_OR
 import static com.android.launcher3.testing.TestProtocol.HINT_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.NORMAL_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.OVERVIEW_MODAL_TASK_STATE_ORDINAL;
-import static com.android.launcher3.testing.TestProtocol.OVERVIEW_PEEK_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.OVERVIEW_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.QUICK_SWITCH_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.SPRING_LOADED_STATE_ORDINAL;
@@ -117,8 +116,6 @@ public abstract class LauncherState implements BaseState<LauncherState> {
     public static final LauncherState HINT_STATE = new HintState(HINT_STATE_ORDINAL);
 
     public static final LauncherState OVERVIEW = new OverviewState(OVERVIEW_STATE_ORDINAL);
-    public static final LauncherState OVERVIEW_PEEK =
-            OverviewState.newPeekState(OVERVIEW_PEEK_STATE_ORDINAL);
     public static final LauncherState OVERVIEW_MODAL_TASK = OverviewState.newModalTaskState(
             OVERVIEW_MODAL_TASK_STATE_ORDINAL);
     public static final LauncherState QUICK_SWITCH =
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index e624dd31ae..37d2d402cb 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -142,10 +142,6 @@ public final class FeatureFlags {
     public static final BooleanFlag ENABLE_LAUNCHER_PREVIEW_IN_GRID_PICKER = getDebugFlag(
             "ENABLE_LAUNCHER_PREVIEW_IN_GRID_PICKER", true, "Show launcher preview in grid picker");
 
-    public static final BooleanFlag ENABLE_OVERVIEW_ACTIONS = getDebugFlag(
-            "ENABLE_OVERVIEW_ACTIONS", true, "Show app actions instead of the shelf in Overview."
-            + " As part of this decoupling, also distinguish swipe up from nav bar vs above it.");
-
     // Keep as DeviceFlag for remote disable in emergency.
     public static final BooleanFlag ENABLE_OVERVIEW_SELECTIONS = new DeviceFlag(
             "ENABLE_OVERVIEW_SELECTIONS", true, "Show Select Mode button in Overview Actions");
diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java
index 8616881a73..30f8fb02a0 100644
--- a/src/com/android/launcher3/testing/TestProtocol.java
+++ b/src/com/android/launcher3/testing/TestProtocol.java
@@ -27,12 +27,11 @@ public final class TestProtocol {
     public static final int NORMAL_STATE_ORDINAL = 0;
     public static final int SPRING_LOADED_STATE_ORDINAL = 1;
     public static final int OVERVIEW_STATE_ORDINAL = 2;
-    public static final int OVERVIEW_PEEK_STATE_ORDINAL = 3;
-    public static final int OVERVIEW_MODAL_TASK_STATE_ORDINAL = 4;
-    public static final int QUICK_SWITCH_STATE_ORDINAL = 5;
-    public static final int ALL_APPS_STATE_ORDINAL = 6;
-    public static final int BACKGROUND_APP_STATE_ORDINAL = 7;
-    public static final int HINT_STATE_ORDINAL = 8;
+    public static final int OVERVIEW_MODAL_TASK_STATE_ORDINAL = 3;
+    public static final int QUICK_SWITCH_STATE_ORDINAL = 4;
+    public static final int ALL_APPS_STATE_ORDINAL = 5;
+    public static final int BACKGROUND_APP_STATE_ORDINAL = 6;
+    public static final int HINT_STATE_ORDINAL = 7;
     public static final String TAPL_EVENTS_TAG = "TaplEvents";
     public static final String SEQUENCE_MAIN = "Main";
     public static final String SEQUENCE_TIS = "TIS";
@@ -46,8 +45,6 @@ public final class TestProtocol {
                 return "SpringLoaded";
             case OVERVIEW_STATE_ORDINAL:
                 return "Overview";
-            case OVERVIEW_PEEK_STATE_ORDINAL:
-                return "OverviewPeek";
             case OVERVIEW_MODAL_TASK_STATE_ORDINAL:
                 return "OverviewModal";
             case QUICK_SWITCH_STATE_ORDINAL:
@@ -98,7 +95,6 @@ public final class TestProtocol {
     public static final String REQUEST_ENABLE_DEBUG_TRACING = "enable-debug-tracing";
     public static final String REQUEST_DISABLE_DEBUG_TRACING = "disable-debug-tracing";
 
-    public static final String REQUEST_OVERVIEW_ACTIONS_ENABLED = "overview-actions-enabled";
     public static final String REQUEST_OVERVIEW_SHARE_ENABLED = "overview-share-enabled";
 
     public static boolean sDisableSensorRotation;
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java b/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java
index 7a6332ce00..d102bccaad 100644
--- a/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -38,10 +38,6 @@ public class OverviewState extends LauncherState {
         return new OverviewState(id);
     }
 
-    public static OverviewState newPeekState(int id) {
-        return new OverviewState(id);
-    }
-
     public static OverviewState newSwitchState(int id) {
         return new OverviewState(id);
     }
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 92ab9b8a16..80adf05c2b 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -1304,17 +1304,8 @@ public final class LauncherInstrumentation {
         if (getNavigationModel() == NavigationModel.TWO_BUTTON) {
             return true;
         }
-        // Overview actions hide all apps
-        if (overviewActionsEnabled()) {
-            return false;
-        }
-        // ...otherwise there should be all apps
-        return true;
-    }
-
-    private boolean overviewActionsEnabled() {
-        return getTestInfo(TestProtocol.REQUEST_OVERVIEW_ACTIONS_ENABLED).getBoolean(
-                TestProtocol.TEST_INFO_RESPONSE_FIELD);
+        // ...otherwise there are overview actions, which hide all apps
+        return false;
     }
 
     boolean overviewShareEnabled() {
-- 
GitLab


From 66f3ffe39fe4be1b53a5ef70a1a8e25ad3111f82 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Sat, 15 Aug 2020 00:43:22 -0700
Subject: [PATCH 0099/1664] [Live Tile] Tapping home in Overview does not take
 user back to app

Fixes: 162340084
Test: Manual
Change-Id: I8e2caa4ec0d3203d70d35fc409e8053cae51e21e
---
 .../com/android/quickstep/TouchInteractionService.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 5ec6377819..ba0a81fab5 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -659,17 +659,17 @@ public class TouchInteractionService extends Service implements PluginListener<O
                     runningComponent != null && runningComponent.equals(homeComponent);
         }
 
-        if (gestureState.getRunningTask() == null) {
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get()
+                && gestureState.getActivityInterface().isInLiveTileMode()) {
+            return createOverviewInputConsumer(
+                    previousGestureState, gestureState, event, forceOverviewInputConsumer);
+        } else if (gestureState.getRunningTask() == null) {
             return mResetGestureInputConsumer;
         } else if (previousGestureState.isRunningAnimationToLauncher()
                 || gestureState.getActivityInterface().isResumed()
                 || forceOverviewInputConsumer) {
             return createOverviewInputConsumer(
                     previousGestureState, gestureState, event, forceOverviewInputConsumer);
-        } else if (ENABLE_QUICKSTEP_LIVE_TILE.get()
-                && gestureState.getActivityInterface().isInLiveTileMode()) {
-            return createOverviewInputConsumer(
-                    previousGestureState, gestureState, event, forceOverviewInputConsumer);
         } else if (mDeviceState.isGestureBlockedActivity(gestureState.getRunningTask())) {
             return mResetGestureInputConsumer;
         } else {
-- 
GitLab


From 0fc3d1275a2e6a68b276b47032b696b8f7622016 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 11 Aug 2020 18:49:28 -0700
Subject: [PATCH 0100/1664] Moving hotseat predictions to ModelDelegate

Bug: 160748731

Change-Id: I8db7856a17e0b6ca45b4d5ec3513f788f22db11a
---
 quickstep/res/values/override.xml             |   2 -
 .../launcher3/BaseQuickstepLauncher.java      |  17 -
 .../appprediction/ComponentKeyMapper.java     |  63 ---
 .../appprediction/DynamicItemCache.java       | 268 -------------
 .../hybridhotseat/HotseatEduController.java   |  14 +-
 .../HotseatPredictionController.java          | 376 +++---------------
 .../hybridhotseat/HotseatPredictionModel.java |  66 ++-
 .../hybridhotseat/HotseatRestoreHelper.java   |  29 +-
 .../launcher3/model/AppEventProducer.java     | 103 ++++-
 .../model/QuickstepModelDelegate.java         |  52 ++-
 .../uioverrides/QuickstepLauncher.java        |  57 +--
 .../util/QuickstepOnboardingPrefs.java        |   6 +-
 res/values/config.xml                         |   1 -
 src/com/android/launcher3/DropTarget.java     |  12 -
 src/com/android/launcher3/Launcher.java       |  14 -
 .../android/launcher3/LauncherAppState.java   |   7 -
 src/com/android/launcher3/LauncherModel.java  |   7 +
 src/com/android/launcher3/Workspace.java      |   3 +-
 src/com/android/launcher3/folder/Folder.java  |   4 +-
 .../graphics/LauncherPreviewRenderer.java     |  35 +-
 .../launcher3/logging/StatsLogManager.java    |   8 +-
 .../launcher3/model/BaseLoaderResults.java    |   9 -
 .../android/launcher3/model/BgDataModel.java  |  10 -
 .../android/launcher3/model/LoaderTask.java   |  30 +-
 .../launcher3/model/ModelDelegate.java        |   6 +
 .../launcher3/model/PredictionModel.java      | 136 -------
 .../SecondaryDisplayLauncher.java             |   3 -
 .../launcher3/util/OnboardingPrefs.java       |   3 +-
 28 files changed, 293 insertions(+), 1048 deletions(-)
 delete mode 100644 quickstep/src/com/android/launcher3/appprediction/ComponentKeyMapper.java
 delete mode 100644 quickstep/src/com/android/launcher3/appprediction/DynamicItemCache.java
 delete mode 100644 src/com/android/launcher3/model/PredictionModel.java

diff --git a/quickstep/res/values/override.xml b/quickstep/res/values/override.xml
index 397ea82489..8f4ce4343b 100644
--- a/quickstep/res/values/override.xml
+++ b/quickstep/res/values/override.xml
@@ -27,8 +27,6 @@
 
   <string name="user_event_dispatcher_class" translatable="false">com.android.quickstep.logging.UserEventDispatcherExtension</string>
 
-  <string name="prediction_model_class" translatable="false">com.android.launcher3.hybridhotseat.HotseatPredictionModel</string>
-
   <string name="model_delegate_class" translatable="false">com.android.launcher3.model.QuickstepModelDelegate</string>
 
 </resources>
diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index a0016cb905..68111d2632 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -26,12 +26,10 @@ import android.animation.AnimatorSet;
 import android.animation.ValueAnimator;
 import android.content.Intent;
 import android.content.IntentSender;
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.CancellationSignal;
 
 import com.android.launcher3.config.FeatureFlags;
-import com.android.launcher3.hybridhotseat.HotseatPredictionController;
 import com.android.launcher3.model.WellbeingModel;
 import com.android.launcher3.popup.SystemShortcut;
 import com.android.launcher3.proxy.ProxyActivityStarter;
@@ -40,14 +38,12 @@ import com.android.launcher3.statehandlers.BackButtonAlphaHandler;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
 import com.android.launcher3.uioverrides.RecentsViewStateController;
-import com.android.launcher3.util.OnboardingPrefs;
 import com.android.launcher3.util.UiThreadHelper;
 import com.android.quickstep.RecentsModel;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;
 import com.android.quickstep.SystemUiProxy;
-import com.android.quickstep.util.QuickstepOnboardingPrefs;
 import com.android.quickstep.util.RemoteAnimationProvider;
 import com.android.quickstep.util.RemoteFadeOutAnimationListener;
 import com.android.quickstep.views.OverviewActionsView;
@@ -73,7 +69,6 @@ public abstract class BaseQuickstepLauncher extends Launcher
                     Float.intBitsToFloat(arg1), arg2 != 0);
 
     private OverviewActionsView mActionsView;
-    protected HotseatPredictionController mHotseatPredictionController;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -221,11 +216,6 @@ public abstract class BaseQuickstepLauncher extends Launcher
         return mDepthController;
     }
 
-    @Override
-    protected OnboardingPrefs createOnboardingPrefs(SharedPreferences sharedPrefs) {
-        return new QuickstepOnboardingPrefs(this, sharedPrefs);
-    }
-
     @Override
     public void useFadeOutAnimationForLauncherStart(CancellationSignal signal) {
         QuickstepAppTransitionManagerImpl appTransitionManager =
@@ -314,13 +304,6 @@ public abstract class BaseQuickstepLauncher extends Launcher
                 Stream.of(WellbeingModel.SHORTCUT_FACTORY));
     }
 
-    /**
-     * Returns Prediction controller for hybrid hotseat
-     */
-    public HotseatPredictionController getHotseatPredictionController() {
-        return mHotseatPredictionController;
-    }
-
     public void setHintUserWillBeActive() {
         addActivityFlags(ACTIVITY_STATE_USER_WILL_BE_ACTIVE);
     }
diff --git a/quickstep/src/com/android/launcher3/appprediction/ComponentKeyMapper.java b/quickstep/src/com/android/launcher3/appprediction/ComponentKeyMapper.java
deleted file mode 100644
index d200868899..0000000000
--- a/quickstep/src/com/android/launcher3/appprediction/ComponentKeyMapper.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.appprediction;
-
-import static com.android.quickstep.InstantAppResolverImpl.COMPONENT_CLASS_MARKER;
-
-import com.android.launcher3.allapps.AllAppsStore;
-import com.android.launcher3.model.data.AppInfo;
-import com.android.launcher3.model.data.ItemInfoWithIcon;
-import com.android.launcher3.util.ComponentKey;
-
-public class ComponentKeyMapper {
-
-    protected final ComponentKey componentKey;
-    private final DynamicItemCache mCache;
-
-    public ComponentKeyMapper(ComponentKey key, DynamicItemCache cache) {
-        componentKey = key;
-        mCache = cache;
-    }
-
-    public String getPackage() {
-        return componentKey.componentName.getPackageName();
-    }
-
-    public String getComponentClass() {
-        return componentKey.componentName.getClassName();
-    }
-
-    public ComponentKey getComponentKey() {
-        return componentKey;
-    }
-
-    @Override
-    public String toString() {
-        return componentKey.toString();
-    }
-
-    public ItemInfoWithIcon getApp(AllAppsStore store) {
-        AppInfo item = store.getApp(componentKey);
-        if (item != null) {
-            return item;
-        } else if (getComponentClass().equals(COMPONENT_CLASS_MARKER)) {
-            return mCache.getInstantApp(componentKey.componentName.getPackageName());
-        } else {
-            return mCache.getShortcutInfo(componentKey);
-        }
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/appprediction/DynamicItemCache.java b/quickstep/src/com/android/launcher3/appprediction/DynamicItemCache.java
deleted file mode 100644
index ab96b1340a..0000000000
--- a/quickstep/src/com/android/launcher3/appprediction/DynamicItemCache.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/**
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.appprediction;
-
-import static android.content.pm.PackageManager.MATCH_INSTANT;
-
-import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
-import static com.android.quickstep.InstantAppResolverImpl.COMPONENT_CLASS_MARKER;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ShortcutInfo;
-import android.net.Uri;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.Message;
-import android.util.ArrayMap;
-import android.util.Log;
-
-import androidx.annotation.MainThread;
-import androidx.annotation.Nullable;
-import androidx.annotation.UiThread;
-import androidx.annotation.WorkerThread;
-
-import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.allapps.AllAppsStore;
-import com.android.launcher3.icons.IconCache;
-import com.android.launcher3.model.data.AppInfo;
-import com.android.launcher3.model.data.WorkspaceItemInfo;
-import com.android.launcher3.shortcuts.ShortcutKey;
-import com.android.launcher3.shortcuts.ShortcutRequest;
-import com.android.launcher3.util.ComponentKey;
-import com.android.launcher3.util.InstantAppResolver;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Utility class which loads and caches predicted items like instant apps and shortcuts, before
- * they can be displayed on the UI
- */
-public class DynamicItemCache {
-
-    private static final String TAG = "DynamicItemCache";
-    private static final boolean DEBUG = false;
-    private static final String DEFAULT_URL = "default-url";
-
-    private static final int BG_MSG_LOAD_SHORTCUTS = 1;
-    private static final int BG_MSG_LOAD_INSTANT_APPS = 2;
-
-    private static final int UI_MSG_UPDATE_SHORTCUTS = 1;
-    private static final int UI_MSG_UPDATE_INSTANT_APPS = 2;
-
-    private final Context mContext;
-    private final Handler mWorker;
-    private final Handler mUiHandler;
-    private final InstantAppResolver mInstantAppResolver;
-    private final Runnable mOnUpdateCallback;
-    private final IconCache mIconCache;
-
-    private final Map<ComponentKey, WorkspaceItemInfo> mShortcuts;
-    private final Map<String, InstantAppItemInfo> mInstantApps;
-
-    public DynamicItemCache(Context context, Runnable onUpdateCallback) {
-        mContext = context;
-        mWorker = new Handler(MODEL_EXECUTOR.getLooper(), this::handleWorkerMessage);
-        mUiHandler = new Handler(Looper.getMainLooper(), this::handleUiMessage);
-        mInstantAppResolver = InstantAppResolver.newInstance(context);
-        mOnUpdateCallback = onUpdateCallback;
-        mIconCache = LauncherAppState.getInstance(mContext).getIconCache();
-
-        mShortcuts = new HashMap<>();
-        mInstantApps = new HashMap<>();
-    }
-
-    public void cacheItems(List<ShortcutKey> shortcutKeys, List<String> pkgNames) {
-        if (!shortcutKeys.isEmpty()) {
-            mWorker.removeMessages(BG_MSG_LOAD_SHORTCUTS);
-            Message.obtain(mWorker, BG_MSG_LOAD_SHORTCUTS, shortcutKeys).sendToTarget();
-        }
-        if (!pkgNames.isEmpty()) {
-            mWorker.removeMessages(BG_MSG_LOAD_INSTANT_APPS);
-            Message.obtain(mWorker, BG_MSG_LOAD_INSTANT_APPS, pkgNames).sendToTarget();
-        }
-    }
-
-    private boolean handleWorkerMessage(Message msg) {
-        switch (msg.what) {
-            case BG_MSG_LOAD_SHORTCUTS: {
-                List<ShortcutKey> shortcutKeys = msg.obj != null ?
-                        (List<ShortcutKey>) msg.obj : Collections.EMPTY_LIST;
-                Map<ShortcutKey, WorkspaceItemInfo> shortcutKeyAndInfos = new ArrayMap<>();
-                for (ShortcutKey shortcutKey : shortcutKeys) {
-                    WorkspaceItemInfo workspaceItemInfo = loadShortcutWorker(shortcutKey);
-                    if (workspaceItemInfo != null) {
-                        shortcutKeyAndInfos.put(shortcutKey, workspaceItemInfo);
-                    }
-                }
-                Message.obtain(mUiHandler, UI_MSG_UPDATE_SHORTCUTS, shortcutKeyAndInfos)
-                        .sendToTarget();
-                return true;
-            }
-            case BG_MSG_LOAD_INSTANT_APPS: {
-                List<String> pkgNames = msg.obj != null ?
-                        (List<String>) msg.obj : Collections.EMPTY_LIST;
-                List<InstantAppItemInfo> instantAppItemInfos = new ArrayList<>();
-                for (String pkgName : pkgNames) {
-                    InstantAppItemInfo instantAppItemInfo = loadInstantApp(pkgName);
-                    if (instantAppItemInfo != null) {
-                        instantAppItemInfos.add(instantAppItemInfo);
-                    }
-                }
-                Message.obtain(mUiHandler, UI_MSG_UPDATE_INSTANT_APPS, instantAppItemInfos)
-                        .sendToTarget();
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private boolean handleUiMessage(Message msg) {
-        switch (msg.what) {
-            case UI_MSG_UPDATE_SHORTCUTS: {
-                mShortcuts.clear();
-                mShortcuts.putAll((Map<ShortcutKey, WorkspaceItemInfo>) msg.obj);
-                mOnUpdateCallback.run();
-                return true;
-            }
-            case UI_MSG_UPDATE_INSTANT_APPS: {
-                List<InstantAppItemInfo> instantAppItemInfos = (List<InstantAppItemInfo>) msg.obj;
-                mInstantApps.clear();
-                for (InstantAppItemInfo instantAppItemInfo : instantAppItemInfos) {
-                    mInstantApps.put(instantAppItemInfo.getTargetComponent().getPackageName(),
-                            instantAppItemInfo);
-                }
-                mOnUpdateCallback.run();
-                if (DEBUG) {
-                    Log.d(TAG, String.format("Cache size: %d, Cache: %s",
-                            mInstantApps.size(), mInstantApps.toString()));
-                }
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @WorkerThread
-    private WorkspaceItemInfo loadShortcutWorker(ShortcutKey shortcutKey) {
-        List<ShortcutInfo> details = shortcutKey.buildRequest(mContext).query(ShortcutRequest.ALL);
-        if (!details.isEmpty()) {
-            WorkspaceItemInfo si = new WorkspaceItemInfo(details.get(0), mContext);
-            mIconCache.getShortcutIcon(si, details.get(0));
-            return si;
-        }
-        if (DEBUG) {
-            Log.d(TAG, "No shortcut found: " + shortcutKey.toString());
-        }
-        return null;
-    }
-
-    private InstantAppItemInfo loadInstantApp(String pkgName) {
-        PackageManager pm = mContext.getPackageManager();
-
-        try {
-            ApplicationInfo ai = pm.getApplicationInfo(pkgName, 0);
-            if (!mInstantAppResolver.isInstantApp(ai)) {
-                return null;
-            }
-        } catch (PackageManager.NameNotFoundException e) {
-            return null;
-        }
-
-        String url = retrieveDefaultUrl(pkgName, pm);
-        if (url == null) {
-            Log.w(TAG, "no default-url available for pkg " + pkgName);
-            return null;
-        }
-
-        Intent intent = new Intent(Intent.ACTION_VIEW)
-                .addCategory(Intent.CATEGORY_BROWSABLE)
-                .setData(Uri.parse(url));
-        InstantAppItemInfo info = new InstantAppItemInfo(intent, pkgName);
-        IconCache iconCache = LauncherAppState.getInstance(mContext).getIconCache();
-        iconCache.getTitleAndIcon(info, false);
-        if (info.bitmap.icon == null || iconCache.isDefaultIcon(info.bitmap, info.user)) {
-            return null;
-        }
-        return info;
-    }
-
-    @Nullable
-    public static String retrieveDefaultUrl(String pkgName, PackageManager pm) {
-        Intent mainIntent = new Intent().setAction(Intent.ACTION_MAIN)
-                .addCategory(Intent.CATEGORY_LAUNCHER).setPackage(pkgName);
-        List<ResolveInfo> resolveInfos = pm.queryIntentActivities(
-                mainIntent, MATCH_INSTANT | PackageManager.GET_META_DATA);
-        String url = null;
-        for (ResolveInfo resolveInfo : resolveInfos) {
-            if (resolveInfo.activityInfo.metaData != null
-                    && resolveInfo.activityInfo.metaData.containsKey(DEFAULT_URL)) {
-                url = resolveInfo.activityInfo.metaData.getString(DEFAULT_URL);
-            }
-        }
-        return url;
-    }
-
-    @UiThread
-    public InstantAppItemInfo getInstantApp(String pkgName) {
-        return mInstantApps.get(pkgName);
-    }
-
-    @MainThread
-    public WorkspaceItemInfo getShortcutInfo(ComponentKey key) {
-        return mShortcuts.get(key);
-    }
-
-    /**
-     * requests and caches icons for app targets
-     */
-    public void updateDependencies(List<ComponentKeyMapper> componentKeyMappers,
-            AllAppsStore appsStore, IconCache.ItemInfoUpdateReceiver callback, int itemCount) {
-        List<String> instantAppsToLoad = new ArrayList<>();
-        List<ShortcutKey> shortcutsToLoad = new ArrayList<>();
-        int total = componentKeyMappers.size();
-        for (int i = 0, count = 0; i < total && count < itemCount; i++) {
-            ComponentKeyMapper mapper = componentKeyMappers.get(i);
-            // Update instant apps
-            if (COMPONENT_CLASS_MARKER.equals(mapper.getComponentClass())) {
-                instantAppsToLoad.add(mapper.getPackage());
-                count++;
-            } else if (mapper.getComponentKey() instanceof ShortcutKey) {
-                shortcutsToLoad.add((ShortcutKey) mapper.getComponentKey());
-                count++;
-            } else {
-                // Reload high res icon
-                AppInfo info = (AppInfo) mapper.getApp(appsStore);
-                if (info != null) {
-                    if (info.usingLowResIcon()) {
-                        mIconCache.updateIconInBackground(callback, info);
-                    }
-                    count++;
-                }
-            }
-        }
-        cacheItems(shortcutsToLoad, instantAppsToLoad);
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduController.java
index 8ebf1251ec..4451e7a6c1 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduController.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduController.java
@@ -47,35 +47,27 @@ import java.util.stream.IntStream;
  */
 public class HotseatEduController {
 
-    public static final String HOTSEAT_EDU_ACTION =
-            "com.android.launcher3.action.SHOW_HYBRID_HOTSEAT_EDU";
     public static final String SETTINGS_ACTION =
             "android.settings.ACTION_CONTENT_SUGGESTIONS_SETTINGS";
 
     private final Launcher mLauncher;
     private final Hotseat mHotseat;
-    private HotseatRestoreHelper mRestoreHelper;
     private List<WorkspaceItemInfo> mPredictedApps;
     private HotseatEduDialog mActiveDialog;
 
     private ArrayList<ItemInfo> mNewItems = new ArrayList<>();
     private IntArray mNewScreens = null;
-    private Runnable mOnOnboardingComplete;
 
-    HotseatEduController(Launcher launcher, HotseatRestoreHelper restoreHelper, Runnable runnable) {
+    HotseatEduController(Launcher launcher) {
         mLauncher = launcher;
         mHotseat = launcher.getHotseat();
-        mRestoreHelper = restoreHelper;
-        mOnOnboardingComplete = runnable;
     }
 
     /**
      * Checks what type of migration should be used and migrates hotseat
      */
     void migrate() {
-        if (mRestoreHelper != null) {
-            mRestoreHelper.createBackup();
-        }
+        HotseatRestoreHelper.createBackup(mLauncher);
         if (FeatureFlags.HOTSEAT_MIGRATE_TO_FOLDER.get()) {
             migrateToFolder();
         } else {
@@ -227,7 +219,7 @@ public class HotseatEduController {
     }
 
     void finishOnboarding() {
-        mOnOnboardingComplete.run();
+        mLauncher.getModel().onWorkspaceUiChanged();
     }
 
     void showDimissTip() {
diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
index b94e6337d0..6fe16c9faa 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
@@ -15,23 +15,17 @@
  */
 package com.android.launcher3.hybridhotseat;
 
-import static com.android.launcher3.InvariantDeviceProfile.CHANGE_FLAG_GRID;
 import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.hybridhotseat.HotseatEduController.getSettingsIntent;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOTSEAT_PREDICTION_PINNED;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOTSEAT_RANKED;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
-import android.app.prediction.AppPredictionContext;
-import android.app.prediction.AppPredictionManager;
-import android.app.prediction.AppPredictor;
-import android.app.prediction.AppTarget;
-import android.app.prediction.AppTargetEvent;
 import android.content.ComponentName;
 import android.os.Process;
-import android.util.Log;
 import android.view.HapticFeedbackConstants;
 import android.view.View;
 import android.view.ViewGroup;
@@ -44,77 +38,51 @@ import com.android.launcher3.DropTarget;
 import com.android.launcher3.Hotseat;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.allapps.AllAppsStore;
 import com.android.launcher3.anim.AnimationSuccessListener;
-import com.android.launcher3.appprediction.ComponentKeyMapper;
-import com.android.launcher3.appprediction.DynamicItemCache;
 import com.android.launcher3.dragndrop.DragController;
 import com.android.launcher3.dragndrop.DragOptions;
-import com.android.launcher3.icons.IconCache;
+import com.android.launcher3.graphics.DragPreviewProvider;
 import com.android.launcher3.logger.LauncherAtom.ContainerInfo;
 import com.android.launcher3.logger.LauncherAtom.PredictedHotseatContainer;
 import com.android.launcher3.logging.InstanceId;
-import com.android.launcher3.model.data.AppInfo;
-import com.android.launcher3.model.data.FolderInfo;
+import com.android.launcher3.model.BgDataModel.FixedContainerItems;
 import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.popup.SystemShortcut;
-import com.android.launcher3.shortcuts.ShortcutKey;
 import com.android.launcher3.touch.ItemLongClickListener;
 import com.android.launcher3.uioverrides.PredictedAppIcon;
 import com.android.launcher3.uioverrides.QuickstepLauncher;
 import com.android.launcher3.userevent.nano.LauncherLogProto;
-import com.android.launcher3.util.ComponentKey;
-import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.OnboardingPrefs;
 import com.android.launcher3.views.ArrowTipView;
 import com.android.launcher3.views.Snackbar;
 
-import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.OptionalInt;
-import java.util.stream.IntStream;
+import java.util.stream.Collectors;
 
 /**
  * Provides prediction ability for the hotseat. Fills gaps in hotseat with predicted items, allows
  * pinning of predicted apps and manages replacement of predicted apps with user drag.
  */
 public class HotseatPredictionController implements DragController.DragListener,
-        View.OnAttachStateChangeListener, SystemShortcut.Factory<QuickstepLauncher>,
-        InvariantDeviceProfile.OnIDPChangeListener, AllAppsStore.OnUpdateListener,
-        IconCache.ItemInfoUpdateReceiver, DragSource {
+        SystemShortcut.Factory<QuickstepLauncher>, InvariantDeviceProfile.OnIDPChangeListener,
+        DragSource {
 
-    private static final String TAG = "PredictiveHotseat";
-    private static final boolean DEBUG = false;
-
-    private static final String PREDICTION_CLIENT = "hotseat";
-    private DropTarget.DragObject mDragObject;
     private int mHotSeatItemsCount;
-    private int mPredictedSpotsCount = 0;
 
     private Launcher mLauncher;
     private final Hotseat mHotseat;
 
-    private final HotseatRestoreHelper mRestoreHelper;
-
-    private List<ComponentKeyMapper> mComponentKeyMappers = new ArrayList<>();
+    private List<ItemInfo> mPredictedItems = Collections.emptyList();
 
-    private DynamicItemCache mDynamicItemCache;
-
-    private final HotseatPredictionModel mPredictionModel;
-    private AppPredictor mAppPredictor;
-    private AllAppsStore mAllAppsStore;
     private AnimatorSet mIconRemoveAnimators;
     private boolean mUIUpdatePaused = false;
-    private boolean mIsDestroyed = false;
-
+    private boolean mDragInProgress = false;
 
     private List<PredictedAppIcon.PredictedIconOutlineDrawing> mOutlineDrawings = new ArrayList<>();
 
@@ -130,26 +98,23 @@ public class HotseatPredictionController implements DragController.DragListener,
             mLauncher.getDragLayer().performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
             return true;
         }
+
         // Start the drag
-        mLauncher.getWorkspace().beginDragShared(v, this, new DragOptions());
+        // Use a new itemInfo so that the original predicted item is stable
+        WorkspaceItemInfo dragItem = new WorkspaceItemInfo((WorkspaceItemInfo) v.getTag());
+        v.setVisibility(View.INVISIBLE);
+        mLauncher.getWorkspace().beginDragShared(
+                v, null, this, dragItem, new DragPreviewProvider(v), new DragOptions());
         return true;
     };
 
     public HotseatPredictionController(Launcher launcher) {
         mLauncher = launcher;
         mHotseat = launcher.getHotseat();
-        mAllAppsStore = mLauncher.getAppsView().getAppsStore();
-        LauncherAppState appState = LauncherAppState.getInstance(launcher);
-        mPredictionModel = (HotseatPredictionModel) appState.getPredictionModel();
-        mAllAppsStore.addUpdateListener(this);
-        mDynamicItemCache = new DynamicItemCache(mLauncher, this::fillGapsWithPrediction);
         mHotSeatItemsCount = mLauncher.getDeviceProfile().inv.numHotseatIcons;
+        mLauncher.getDragController().addDragListener(this);
+
         launcher.getDeviceProfile().inv.addOnChangeListener(this);
-        mHotseat.addOnAttachStateChangeListener(this);
-        mRestoreHelper = new HotseatRestoreHelper(mLauncher);
-        if (mHotseat.isAttachedToWindow()) {
-            onViewAttachedToWindow(mHotseat);
-        }
     }
 
     /**
@@ -157,7 +122,7 @@ public class HotseatPredictionController implements DragController.DragListener,
      */
     public void showEdu() {
         mLauncher.getStateManager().goToState(NORMAL, true, () -> {
-            if (mComponentKeyMappers.isEmpty()) {
+            if (mPredictedItems.isEmpty()) {
                 // launcher has empty predictions set
                 Snackbar.show(mLauncher, R.string.hotsaet_tip_prediction_disabled,
                         R.string.hotseat_prediction_settings, null,
@@ -165,10 +130,10 @@ public class HotseatPredictionController implements DragController.DragListener,
             } else if (getPredictedIcons().size() >= (mHotSeatItemsCount + 1) / 2) {
                 showDiscoveryTip();
             } else {
-                HotseatEduController eduController = new HotseatEduController(mLauncher,
-                        mRestoreHelper,
-                        this::createPredictor);
-                eduController.setPredictedApps(mapToWorkspaceItemInfo(mComponentKeyMappers));
+                HotseatEduController eduController = new HotseatEduController(mLauncher);
+                eduController.setPredictedApps(mPredictedItems.stream()
+                        .map(i -> (WorkspaceItemInfo) i)
+                        .collect(Collectors.toList()));
                 eduController.showEdu();
             }
         });
@@ -192,17 +157,7 @@ public class HotseatPredictionController implements DragController.DragListener,
      * Returns if hotseat client has predictions
      */
     public boolean hasPredictions() {
-        return !mComponentKeyMappers.isEmpty();
-    }
-
-    @Override
-    public void onViewAttachedToWindow(View view) {
-        mLauncher.getDragController().addDragListener(this);
-    }
-
-    @Override
-    public void onViewDetachedFromWindow(View view) {
-        mLauncher.getDragController().removeDragListener(this);
+        return !mPredictedItems.isEmpty();
     }
 
     private void fillGapsWithPrediction() {
@@ -210,15 +165,10 @@ public class HotseatPredictionController implements DragController.DragListener,
     }
 
     private void fillGapsWithPrediction(boolean animate, Runnable callback) {
-        if (mUIUpdatePaused || mDragObject != null) {
-            return;
-        }
-        List<WorkspaceItemInfo> predictedApps = mapToWorkspaceItemInfo(mComponentKeyMappers);
-        if (mComponentKeyMappers.isEmpty() != predictedApps.isEmpty()) {
-            // Safely ignore update as AppsList is not ready yet. This will called again once
-            // apps are ready (HotseatPredictionController#onAppsUpdated)
+        if (mUIUpdatePaused || mDragInProgress) {
             return;
         }
+
         int predictionIndex = 0;
         ArrayList<WorkspaceItemInfo> newItems = new ArrayList<>();
         // make sure predicted icon removal and filling predictions don't step on each other
@@ -240,14 +190,15 @@ public class HotseatPredictionController implements DragController.DragListener,
             if (child != null && !isPredictedIcon(child)) {
                 continue;
             }
-            if (predictedApps.size() <= predictionIndex) {
+            if (mPredictedItems.size() <= predictionIndex) {
                 // Remove predicted apps from the past
                 if (isPredictedIcon(child)) {
                     mHotseat.removeView(child);
                 }
                 continue;
             }
-            WorkspaceItemInfo predictedItem = predictedApps.get(predictionIndex++);
+            WorkspaceItemInfo predictedItem =
+                    (WorkspaceItemInfo) mPredictedItems.get(predictionIndex++);
             if (isPredictedIcon(child) && child.isEnabled()) {
                 PredictedAppIcon icon = (PredictedAppIcon) child;
                 icon.applyFromWorkspaceItem(predictedItem);
@@ -257,7 +208,6 @@ public class HotseatPredictionController implements DragController.DragListener,
             }
             preparePredictionInfo(predictedItem, rank);
         }
-        mPredictedSpotsCount = predictionIndex;
         bindItems(newItems, animate, callback);
     }
 
@@ -285,13 +235,7 @@ public class HotseatPredictionController implements DragController.DragListener,
      * Unregisters callbacks and frees resources
      */
     public void destroy() {
-        mIsDestroyed = true;
-        mAllAppsStore.removeUpdateListener(this);
         mLauncher.getDeviceProfile().inv.removeOnChangeListener(this);
-        mHotseat.removeOnAttachStateChangeListener(this);
-        if (mAppPredictor != null) {
-            mAppPredictor.destroy();
-        }
     }
 
     /**
@@ -305,97 +249,14 @@ public class HotseatPredictionController implements DragController.DragListener,
     }
 
     /**
-     * Creates App Predictor with all the current apps pinned on the hotseat
+     * Sets or updates the predicted items
      */
-    public void createPredictor() {
-        AppPredictionManager apm = mLauncher.getSystemService(AppPredictionManager.class);
-        if (apm == null) {
-            return;
-        }
-        if (mAppPredictor != null) {
-            mAppPredictor.destroy();
-            mAppPredictor = null;
+    public void setPredictedItems(FixedContainerItems items) {
+        mPredictedItems = items.items;
+        if (mPredictedItems.isEmpty()) {
+            HotseatRestoreHelper.restoreBackup(mLauncher);
         }
-        WeakReference<HotseatPredictionController> controllerRef = new WeakReference<>(this);
-
-
-        mPredictionModel.createBundle(bundle -> {
-            if (mIsDestroyed) return;
-            mAppPredictor = apm.createAppPredictionSession(
-                    new AppPredictionContext.Builder(mLauncher)
-                            .setUiSurface(PREDICTION_CLIENT)
-                            .setPredictedTargetCount(mHotSeatItemsCount)
-                            .setExtras(bundle)
-                            .build());
-            mAppPredictor.registerPredictionUpdates(
-                    mLauncher.getApplicationContext().getMainExecutor(),
-                    list -> {
-                        if (controllerRef.get() != null) {
-                            controllerRef.get().setPredictedApps(list);
-                        }
-                    });
-            mAppPredictor.requestPredictionUpdate();
-        });
-        setPauseUIUpdate(false);
-    }
-
-    /**
-     * Create WorkspaceItemInfo objects and binds PredictedAppIcon views for cached predicted items.
-     */
-    public void showCachedItems(List<AppInfo> apps, IntArray ranks) {
-        if (hasPredictions() && mAppPredictor != null) {
-            mAppPredictor.requestPredictionUpdate();
-            fillGapsWithPrediction();
-            return;
-        }
-        int count = Math.min(ranks.size(), apps.size());
-        List<WorkspaceItemInfo> items = new ArrayList<>(count);
-        for (int i = 0; i < count; i++) {
-            WorkspaceItemInfo item = new WorkspaceItemInfo(apps.get(i));
-            ComponentKey componentKey = new ComponentKey(item.getTargetComponent(), item.user);
-            preparePredictionInfo(item, ranks.get(i));
-            items.add(item);
-
-            mComponentKeyMappers.add(new ComponentKeyMapper(componentKey, mDynamicItemCache));
-        }
-        updateDependencies();
-        bindItems(items, false, null);
-    }
-
-    private void setPredictedApps(List<AppTarget> appTargets) {
-        mComponentKeyMappers.clear();
-        if (appTargets.isEmpty()) {
-            mRestoreHelper.restoreBackup();
-        }
-        StringBuilder predictionLog = new StringBuilder("predictedApps: [\n");
-        ArrayList<ComponentKey> componentKeys = new ArrayList<>();
-        for (AppTarget appTarget : appTargets) {
-            ComponentKey key;
-            if (appTarget.getShortcutInfo() != null) {
-                key = ShortcutKey.fromInfo(appTarget.getShortcutInfo());
-            } else {
-                key = new ComponentKey(new ComponentName(appTarget.getPackageName(),
-                        appTarget.getClassName()), appTarget.getUser());
-            }
-            componentKeys.add(key);
-            predictionLog.append(key.toString());
-            predictionLog.append(",rank:");
-            predictionLog.append(appTarget.getRank());
-            predictionLog.append("\n");
-            mComponentKeyMappers.add(new ComponentKeyMapper(key, mDynamicItemCache));
-        }
-        predictionLog.append("]");
-        if (Utilities.IS_DEBUG_DEVICE) {
-            HotseatFileLog.INSTANCE.get(mLauncher).log(TAG, predictionLog.toString());
-        }
-        updateDependencies();
         fillGapsWithPrediction();
-        mPredictionModel.cachePredictionComponentKeys(componentKeys);
-    }
-
-    private void updateDependencies() {
-        mDynamicItemCache.updateDependencies(mComponentKeyMappers, mAllAppsStore, this,
-                mHotSeatItemsCount);
     }
 
     /**
@@ -414,42 +275,9 @@ public class HotseatPredictionController implements DragController.DragListener,
                 workspaceItemInfo.cellX, workspaceItemInfo.cellY);
         ObjectAnimator.ofFloat(icon, SCALE_PROPERTY, 1, 0.8f, 1).start();
         icon.pin(workspaceItemInfo);
-        AppTarget appTarget = mPredictionModel.getAppTargetFromInfo(workspaceItemInfo);
-        if (appTarget != null) {
-            notifyItemAction(mPredictionModel.wrapAppTargetWithLocation(appTarget,
-                    AppTargetEvent.ACTION_PIN, workspaceItemInfo));
-        }
-    }
-
-    private List<WorkspaceItemInfo> mapToWorkspaceItemInfo(
-            List<ComponentKeyMapper> components) {
-        AllAppsStore allAppsStore = mLauncher.getAppsView().getAppsStore();
-        if (allAppsStore.getApps().length == 0) {
-            return Collections.emptyList();
-        }
-
-        List<WorkspaceItemInfo> predictedApps = new ArrayList<>();
-        for (ComponentKeyMapper mapper : components) {
-            ItemInfoWithIcon info = mapper.getApp(allAppsStore);
-            if (info instanceof AppInfo) {
-                WorkspaceItemInfo predictedApp = new WorkspaceItemInfo((AppInfo) info);
-                predictedApp.container = LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION;
-                predictedApps.add(predictedApp);
-            } else if (info instanceof WorkspaceItemInfo) {
-                WorkspaceItemInfo predictedApp = new WorkspaceItemInfo((WorkspaceItemInfo) info);
-                predictedApp.container = LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION;
-                predictedApps.add(predictedApp);
-            } else {
-                if (DEBUG) {
-                    Log.e(TAG, "Predicted app not found: " + mapper);
-                }
-            }
-            // Stop at the number of hotseat items
-            if (predictedApps.size() == mHotSeatItemsCount) {
-                break;
-            }
-        }
-        return predictedApps;
+        mLauncher.getStatsLogManager().logger()
+                .withItemInfo(workspaceItemInfo)
+                .log(LAUNCHER_HOTSEAT_PREDICTION_PINNED);
     }
 
     private List<PredictedAppIcon> getPredictedIcons() {
@@ -465,7 +293,7 @@ public class HotseatPredictionController implements DragController.DragListener,
     }
 
     private void removePredictedApps(List<PredictedAppIcon.PredictedIconOutlineDrawing> outlines,
-            ItemInfo draggedInfo) {
+            DropTarget.DragObject dragObject) {
         if (mIconRemoveAnimators != null) {
             mIconRemoveAnimators.end();
         }
@@ -475,7 +303,7 @@ public class HotseatPredictionController implements DragController.DragListener,
             if (!icon.isEnabled()) {
                 continue;
             }
-            if (icon.getTag().equals(draggedInfo)) {
+            if (dragObject.dragSource == this && icon.equals(dragObject.originalView)) {
                 mHotseat.removeView(icon);
                 continue;
             }
@@ -497,84 +325,23 @@ public class HotseatPredictionController implements DragController.DragListener,
         mIconRemoveAnimators.start();
     }
 
-    private void notifyItemAction(AppTargetEvent event) {
-        if (mAppPredictor != null) {
-            mAppPredictor.notifyAppTargetEvent(event);
-        }
-    }
-
     @Override
     public void onDragStart(DropTarget.DragObject dragObject, DragOptions options) {
-        removePredictedApps(mOutlineDrawings, dragObject.dragInfo);
-        mDragObject = dragObject;
+        removePredictedApps(mOutlineDrawings, dragObject);
         if (mOutlineDrawings.isEmpty()) return;
         for (PredictedAppIcon.PredictedIconOutlineDrawing outlineDrawing : mOutlineDrawings) {
             mHotseat.addDelegatedCellDrawing(outlineDrawing);
         }
+        mDragInProgress = true;
         mHotseat.invalidate();
     }
 
-    /**
-     * Unpins pinned app when it's converted into a folder
-     */
-    public void folderCreatedFromWorkspaceItem(ItemInfo itemInfo, FolderInfo folderInfo) {
-        AppTarget folderTarget = mPredictionModel.getAppTargetFromInfo(folderInfo);
-        AppTarget itemTarget = mPredictionModel.getAppTargetFromInfo(itemInfo);
-        if (folderTarget != null && HotseatPredictionModel.isTrackedForPrediction(folderInfo)) {
-            notifyItemAction(mPredictionModel.wrapAppTargetWithLocation(folderTarget,
-                    AppTargetEvent.ACTION_PIN, folderInfo));
-        }
-        // using folder info with isTrackedForPrediction as itemInfo.container is already changed
-        // to folder by this point
-        if (itemTarget != null && HotseatPredictionModel.isTrackedForPrediction(folderInfo)) {
-            notifyItemAction(mPredictionModel.wrapAppTargetWithLocation(itemTarget,
-                    AppTargetEvent.ACTION_UNPIN, folderInfo
-            ));
-        }
-    }
-
-    /**
-     * Pins workspace item created when all folder items are removed but one
-     */
-    public void folderConvertedToWorkspaceItem(ItemInfo itemInfo, FolderInfo folderInfo) {
-        AppTarget folderTarget = mPredictionModel.getAppTargetFromInfo(folderInfo);
-        AppTarget itemTarget = mPredictionModel.getAppTargetFromInfo(itemInfo);
-        if (folderTarget != null && HotseatPredictionModel.isTrackedForPrediction(folderInfo)) {
-            notifyItemAction(mPredictionModel.wrapAppTargetWithLocation(folderTarget,
-                    AppTargetEvent.ACTION_UNPIN, folderInfo));
-        }
-        if (itemTarget != null && HotseatPredictionModel.isTrackedForPrediction(itemInfo)) {
-            notifyItemAction(mPredictionModel.wrapAppTargetWithLocation(itemTarget,
-                    AppTargetEvent.ACTION_PIN, itemInfo));
-        }
-    }
-
     @Override
     public void onDragEnd() {
-        if (mDragObject == null) {
-            return;
-        }
-
-        ItemInfo dragInfo = mDragObject.dragInfo;
-        if (mDragObject.isMoved()) {
-            AppTarget appTarget = mPredictionModel.getAppTargetFromInfo(dragInfo);
-            //always send pin event first to prevent AiAi from predicting an item moved within
-            // the same page
-            if (appTarget != null && HotseatPredictionModel.isTrackedForPrediction(dragInfo)) {
-                notifyItemAction(mPredictionModel.wrapAppTargetWithLocation(appTarget,
-                        AppTargetEvent.ACTION_PIN, dragInfo));
-            }
-            if (appTarget != null && HotseatPredictionModel.isTrackedForPrediction(
-                    mDragObject.originalDragInfo)) {
-                notifyItemAction(mPredictionModel.wrapAppTargetWithLocation(appTarget,
-                        AppTargetEvent.ACTION_UNPIN, mDragObject.originalDragInfo));
-            }
-        }
-        mDragObject = null;
+        mDragInProgress = false;
         fillGapsWithPrediction(true, this::removeOutlineDrawings);
     }
 
-
     @Nullable
     @Override
     public SystemShortcut<QuickstepLauncher> getShortcut(QuickstepLauncher activity,
@@ -604,19 +371,7 @@ public class HotseatPredictionController implements DragController.DragListener,
 
     @Override
     public void onIdpChanged(int changeFlags, InvariantDeviceProfile profile) {
-        if ((changeFlags & CHANGE_FLAG_GRID) != 0) {
-            this.mHotSeatItemsCount = profile.numHotseatIcons;
-            createPredictor();
-        }
-    }
-
-    @Override
-    public void onAppsUpdated() {
-        fillGapsWithPrediction();
-    }
-
-    @Override
-    public void reapplyItemInfo(ItemInfoWithIcon info) {
+        this.mHotSeatItemsCount = profile.numHotseatIcons;
     }
 
     @Override
@@ -643,17 +398,20 @@ public class HotseatPredictionController implements DragController.DragListener,
                             + ",launchLocation:" + itemInfo.container);
         }
 
-        if (itemInfo.getTargetComponent() == null || itemInfo.user == null) {
+
+        ComponentName targetCN = itemInfo.getTargetComponent();
+        if (targetCN == null) {
             return;
         }
-
-        final ComponentKey key = new ComponentKey(itemInfo.getTargetComponent(), itemInfo.user);
-
-        final List<ComponentKeyMapper> predictedApps = new ArrayList<>(mComponentKeyMappers);
-        OptionalInt rank = IntStream.range(0, predictedApps.size())
-                .filter(index -> key.equals(predictedApps.get(index).getComponentKey()))
-                .findFirst();
-        if (!rank.isPresent()) {
+        int rank = -1;
+        for (int i = mPredictedItems.size() - 1; i >= 0; i--) {
+            ItemInfo info = mPredictedItems.get(i);
+            if (targetCN.equals(info.getTargetComponent()) && itemInfo.user.equals(info.user)) {
+                rank = i;
+                break;
+            }
+        }
+        if (rank < 0) {
             return;
         }
 
@@ -666,11 +424,11 @@ public class HotseatPredictionController implements DragController.DragListener,
         PredictedHotseatContainer.Builder containerBuilder = PredictedHotseatContainer.newBuilder();
         containerBuilder.setCardinality(cardinality);
         if (itemInfo.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION) {
-            containerBuilder.setIndex(rank.getAsInt());
+            containerBuilder.setIndex(rank);
         }
         mLauncher.getStatsLogManager().logger()
                 .withInstanceId(instanceId)
-                .withRank(rank.getAsInt())
+                .withRank(rank)
                 .withContainerInfo(ContainerInfo.newBuilder()
                         .setPredictedHotseatContainer(containerBuilder)
                         .build())
@@ -691,30 +449,6 @@ public class HotseatPredictionController implements DragController.DragListener,
         }
     }
 
-    /**
-     * Fill in predicted_rank field based on app prediction.
-     * Only applicable when {@link ItemInfo#itemType} is PREDICTED_HOTSEAT
-     */
-    public static void encodeHotseatLayoutIntoPredictionRank(
-            @NonNull ItemInfo itemInfo, @NonNull LauncherLogProto.Target target) {
-        QuickstepLauncher launcher = QuickstepLauncher.ACTIVITY_TRACKER.getCreatedActivity();
-        if (launcher == null || launcher.getHotseatPredictionController() == null
-                || itemInfo.getTargetComponent() == null) {
-            return;
-        }
-        HotseatPredictionController controller = launcher.getHotseatPredictionController();
-
-        final ComponentKey k = new ComponentKey(itemInfo.getTargetComponent(), itemInfo.user);
-
-        final List<ComponentKeyMapper> predictedApps = controller.mComponentKeyMappers;
-        OptionalInt rank = IntStream.range(0, predictedApps.size())
-                .filter((i) -> k.equals(predictedApps.get(i).getComponentKey()))
-                .findFirst();
-
-        target.predictedRank = 10000 + (controller.mPredictedSpotsCount * 100)
-                + (rank.isPresent() ? rank.getAsInt() + 1 : 0);
-    }
-
     private static boolean isPredictedIcon(View view) {
         return view instanceof PredictedAppIcon && view.getTag() instanceof WorkspaceItemInfo
                 && ((WorkspaceItemInfo) view.getTag()).container
diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionModel.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionModel.java
index 5a038d27af..8f31c22d15 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionModel.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionModel.java
@@ -15,7 +15,7 @@
  */
 package com.android.launcher3.hybridhotseat;
 
-import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION;
 
 import android.app.prediction.AppTarget;
 import android.app.prediction.AppTargetEvent;
@@ -24,13 +24,10 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.os.Bundle;
 
-import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.Workspace;
-import com.android.launcher3.model.AllAppsList;
-import com.android.launcher3.model.BaseModelUpdateTask;
 import com.android.launcher3.model.BgDataModel;
-import com.android.launcher3.model.PredictionModel;
+import com.android.launcher3.model.BgDataModel.FixedContainerItems;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
@@ -38,55 +35,48 @@ import com.android.launcher3.shortcuts.ShortcutKey;
 
 import java.util.ArrayList;
 import java.util.Locale;
-import java.util.function.Consumer;
 
 /**
  * Model helper for app predictions in workspace
  */
-public class HotseatPredictionModel extends PredictionModel {
+public class HotseatPredictionModel {
     private static final String APP_LOCATION_HOTSEAT = "hotseat";
     private static final String APP_LOCATION_WORKSPACE = "workspace";
 
     private static final String BUNDLE_KEY_PIN_EVENTS = "pin_events";
     private static final String BUNDLE_KEY_CURRENT_ITEMS = "current_items";
 
-
-    public HotseatPredictionModel(Context context) { }
-
     /**
-     * Creates and returns bundle using workspace items and cached items
+     * Creates and returns bundle using workspace items
      */
-    public void createBundle(Consumer<Bundle> cb) {
-        LauncherAppState appState = LauncherAppState.getInstance(mContext);
-        appState.getModel().enqueueModelUpdateTask(new BaseModelUpdateTask() {
-            @Override
-            public void execute(LauncherAppState app, BgDataModel dataModel, AllAppsList apps) {
-                Bundle bundle = new Bundle();
-                ArrayList<AppTargetEvent> events = new ArrayList<>();
-                ArrayList<ItemInfo> workspaceItems = new ArrayList<>(dataModel.workspaceItems);
-                workspaceItems.addAll(dataModel.appWidgets);
-                for (ItemInfo item : workspaceItems) {
-                    AppTarget target = getAppTargetFromInfo(item);
-                    if (target != null && !isTrackedForPrediction(item)) continue;
-                    events.add(wrapAppTargetWithLocation(target, AppTargetEvent.ACTION_PIN, item));
-                }
-                ArrayList<AppTarget> currentTargets = new ArrayList<>();
-                for (ItemInfo itemInfo : dataModel.cachedPredictedItems) {
-                    AppTarget target = getAppTargetFromInfo(itemInfo);
-                    if (target != null) currentTargets.add(target);
-                }
-                bundle.putParcelableArrayList(BUNDLE_KEY_PIN_EVENTS, events);
-                bundle.putParcelableArrayList(BUNDLE_KEY_CURRENT_ITEMS, currentTargets);
-                MAIN_EXECUTOR.execute(() -> cb.accept(bundle));
+    public static Bundle convertDataModelToAppTargetBundle(Context context, BgDataModel dataModel) {
+        Bundle bundle = new Bundle();
+        ArrayList<AppTargetEvent> events = new ArrayList<>();
+        ArrayList<ItemInfo> workspaceItems = new ArrayList<>(dataModel.workspaceItems);
+        workspaceItems.addAll(dataModel.appWidgets);
+        for (ItemInfo item : workspaceItems) {
+            AppTarget target = getAppTargetFromInfo(context, item);
+            if (target != null && !isTrackedForPrediction(item)) continue;
+            events.add(wrapAppTargetWithLocation(target, AppTargetEvent.ACTION_PIN, item));
+        }
+        ArrayList<AppTarget> currentTargets = new ArrayList<>();
+        FixedContainerItems hotseatItems = dataModel.extraItems.get(CONTAINER_HOTSEAT_PREDICTION);
+        if (hotseatItems != null) {
+            for (ItemInfo itemInfo : hotseatItems.items) {
+                AppTarget target = getAppTargetFromInfo(context, itemInfo);
+                if (target != null) currentTargets.add(target);
             }
-        });
+        }
+        bundle.putParcelableArrayList(BUNDLE_KEY_PIN_EVENTS, events);
+        bundle.putParcelableArrayList(BUNDLE_KEY_CURRENT_ITEMS, currentTargets);
+        return bundle;
     }
 
     /**
      * Creates and returns for {@link AppTarget} object given an {@link ItemInfo}. Returns null
      * if item is not supported prediction
      */
-    public AppTarget getAppTargetFromInfo(ItemInfo info) {
+    public static AppTarget getAppTargetFromInfo(Context context, ItemInfo info) {
         if (info == null) return null;
         if (info.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET
                 && info instanceof LauncherAppWidgetInfo
@@ -107,17 +97,17 @@ public class HotseatPredictionModel extends PredictionModel {
                     shortcutKey.componentName.getPackageName(), shortcutKey.user).build();
         } else if (info.itemType == LauncherSettings.Favorites.ITEM_TYPE_FOLDER) {
             return new AppTarget.Builder(new AppTargetId("folder:" + info.id),
-                    mContext.getPackageName(), info.user).build();
+                    context.getPackageName(), info.user).build();
         }
         return null;
     }
 
-
     /**
      * Creates and returns {@link AppTargetEvent} from an {@link AppTarget}, action, and item
      * location using {@link ItemInfo}
      */
-    public AppTargetEvent wrapAppTargetWithLocation(AppTarget target, int action, ItemInfo info) {
+    public static AppTargetEvent wrapAppTargetWithLocation(
+            AppTarget target, int action, ItemInfo info) {
         String location = String.format(Locale.ENGLISH, "%s/%d/[%d,%d]/[%d,%d]",
                 info.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT
                         ? APP_LOCATION_HOTSEAT : APP_LOCATION_WORKSPACE,
diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatRestoreHelper.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatRestoreHelper.java
index 9e7c9fba6d..90f762e24c 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatRestoreHelper.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatRestoreHelper.java
@@ -19,8 +19,10 @@ import static com.android.launcher3.LauncherSettings.Favorites.HYBRID_HOTSEAT_BA
 import static com.android.launcher3.provider.LauncherDbUtils.tableExists;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
+import android.content.Context;
+
 import com.android.launcher3.InvariantDeviceProfile;
-import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.model.GridBackupTable;
 import com.android.launcher3.provider.LauncherDbUtils;
@@ -29,29 +31,24 @@ import com.android.launcher3.provider.LauncherDbUtils;
  * A helper class to manage migration revert restoration for hybrid hotseat
  */
 public class HotseatRestoreHelper {
-    private final Launcher mLauncher;
-
-    HotseatRestoreHelper(Launcher context) {
-        mLauncher = context;
-    }
 
     /**
      * Creates a snapshot backup of Favorite table for future restoration use.
      */
-    public void createBackup() {
+    public static void createBackup(Context context) {
         MODEL_EXECUTOR.execute(() -> {
             try (LauncherDbUtils.SQLiteTransaction transaction = (LauncherDbUtils.SQLiteTransaction)
                     LauncherSettings.Settings.call(
-                            mLauncher.getContentResolver(),
+                            context.getContentResolver(),
                             LauncherSettings.Settings.METHOD_NEW_TRANSACTION)
                             .getBinder(LauncherSettings.Settings.EXTRA_VALUE)) {
-                InvariantDeviceProfile idp = mLauncher.getDeviceProfile().inv;
-                GridBackupTable backupTable = new GridBackupTable(mLauncher,
+                InvariantDeviceProfile idp = LauncherAppState.getIDP(context);
+                GridBackupTable backupTable = new GridBackupTable(context,
                         transaction.getDb(), idp.numHotseatIcons, idp.numColumns,
                         idp.numRows);
                 backupTable.createCustomBackupTable(HYBRID_HOTSEAT_BACKUP_TABLE);
                 transaction.commit();
-                LauncherSettings.Settings.call(mLauncher.getContentResolver(),
+                LauncherSettings.Settings.call(context.getContentResolver(),
                         LauncherSettings.Settings.METHOD_REFRESH_HOTSEAT_RESTORE_TABLE);
             }
         });
@@ -60,23 +57,23 @@ public class HotseatRestoreHelper {
     /**
      * Finds and restores a previously saved snapshow of Favorites table
      */
-    public void restoreBackup() {
+    public static void restoreBackup(Context context) {
         MODEL_EXECUTOR.execute(() -> {
             try (LauncherDbUtils.SQLiteTransaction transaction = (LauncherDbUtils.SQLiteTransaction)
                     LauncherSettings.Settings.call(
-                            mLauncher.getContentResolver(),
+                            context.getContentResolver(),
                             LauncherSettings.Settings.METHOD_NEW_TRANSACTION)
                             .getBinder(LauncherSettings.Settings.EXTRA_VALUE)) {
                 if (!tableExists(transaction.getDb(), HYBRID_HOTSEAT_BACKUP_TABLE)) {
                     return;
                 }
-                InvariantDeviceProfile idp = mLauncher.getDeviceProfile().inv;
-                GridBackupTable backupTable = new GridBackupTable(mLauncher,
+                InvariantDeviceProfile idp = LauncherAppState.getIDP(context);
+                GridBackupTable backupTable = new GridBackupTable(context,
                         transaction.getDb(), idp.numHotseatIcons, idp.numColumns,
                         idp.numRows);
                 backupTable.restoreFromCustomBackupTable(HYBRID_HOTSEAT_BACKUP_TABLE, true);
                 transaction.commit();
-                mLauncher.getModel().forceReload();
+                LauncherAppState.getInstance(context).getModel().forceReload();
             }
         });
     }
diff --git a/quickstep/src/com/android/launcher3/model/AppEventProducer.java b/quickstep/src/com/android/launcher3/model/AppEventProducer.java
index 8e4c43f464..364a321f75 100644
--- a/quickstep/src/com/android/launcher3/model/AppEventProducer.java
+++ b/quickstep/src/com/android/launcher3/model/AppEventProducer.java
@@ -15,8 +15,21 @@
  */
 package com.android.launcher3.model;
 
+import static android.app.prediction.AppTargetEvent.ACTION_DISMISS;
+import static android.app.prediction.AppTargetEvent.ACTION_LAUNCH;
+import static android.app.prediction.AppTargetEvent.ACTION_PIN;
+import static android.app.prediction.AppTargetEvent.ACTION_UNPIN;
+
+import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION;
+import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_PREDICTION;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_APP_LAUNCH_TAP;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_FOLDER_CONVERTED_TO_ICON;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOTSEAT_PREDICTION_PINNED;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ITEM_DRAG_STARTED;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ITEM_DROPPED_ON_DONT_SUGGEST;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ITEM_DROPPED_ON_REMOVE;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ITEM_DROP_COMPLETED;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ITEM_DROP_FOLDER_CREATED;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_QUICKSWITCH_LEFT;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_QUICKSWITCH_RIGHT;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_SWIPE_DOWN;
@@ -47,11 +60,12 @@ import com.android.launcher3.logger.LauncherAtom.FolderContainer;
 import com.android.launcher3.logger.LauncherAtom.HotseatContainer;
 import com.android.launcher3.logger.LauncherAtom.WorkspaceContainer;
 import com.android.launcher3.logging.StatsLogManager.EventEnum;
+import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.pm.UserCache;
 import com.android.quickstep.logging.StatsLogCompatManager.StatsLogConsumer;
 
 import java.util.Locale;
-import java.util.function.Consumer;
+import java.util.function.ObjIntConsumer;
 import java.util.function.Predicate;
 
 /**
@@ -64,9 +78,11 @@ public class AppEventProducer implements StatsLogConsumer {
 
     private final Context mContext;
     private final Handler mMessageHandler;
-    private final Consumer<AppTargetEvent> mCallback;
+    private final ObjIntConsumer<AppTargetEvent> mCallback;
+
+    private LauncherAtom.ItemInfo mLastDragItem;
 
-    public AppEventProducer(Context context, Consumer<AppTargetEvent> callback) {
+    public AppEventProducer(Context context, ObjIntConsumer<AppTargetEvent> callback) {
         mContext = context;
         mMessageHandler = new Handler(MODEL_EXECUTOR.getLooper(), this::handleMessage);
         mCallback = callback;
@@ -76,7 +92,7 @@ public class AppEventProducer implements StatsLogConsumer {
     private boolean handleMessage(Message msg) {
         switch (msg.what) {
             case MSG_LAUNCH: {
-                mCallback.accept((AppTargetEvent) msg.obj);
+                mCallback.accept((AppTargetEvent) msg.obj, msg.arg1);
                 return true;
             }
         }
@@ -84,13 +100,18 @@ public class AppEventProducer implements StatsLogConsumer {
     }
 
     @AnyThread
-    private void sendEvent(LauncherAtom.ItemInfo atomInfo, int eventId) {
-        AppTarget target = toAppTarget(atomInfo);
+    private void sendEvent(LauncherAtom.ItemInfo atomInfo, int eventId, int targetPredictor) {
+        sendEvent(toAppTarget(atomInfo), atomInfo, eventId, targetPredictor);
+    }
+
+    @AnyThread
+    private void sendEvent(AppTarget target, LauncherAtom.ItemInfo locationInfo, int eventId,
+            int targetPredictor) {
         if (target != null) {
             AppTargetEvent event = new AppTargetEvent.Builder(target, eventId)
-                    .setLaunchLocation(getContainer(atomInfo))
+                    .setLaunchLocation(getContainer(locationInfo))
                     .build();
-            Message.obtain(mMessageHandler, MSG_LAUNCH, event).sendToTarget();
+            mMessageHandler.obtainMessage(MSG_LAUNCH, targetPredictor, 0, event).sendToTarget();
         }
     }
 
@@ -101,9 +122,42 @@ public class AppEventProducer implements StatsLogConsumer {
                 || event == LAUNCHER_TASK_LAUNCH_TAP
                 || event == LAUNCHER_QUICKSWITCH_RIGHT
                 || event == LAUNCHER_QUICKSWITCH_LEFT) {
-            sendEvent(atomInfo, AppTargetEvent.ACTION_LAUNCH);
+            sendEvent(atomInfo, ACTION_LAUNCH, CONTAINER_PREDICTION);
         } else if (event == LAUNCHER_ITEM_DROPPED_ON_DONT_SUGGEST) {
-            sendEvent(atomInfo, AppTargetEvent.ACTION_DISMISS);
+            sendEvent(atomInfo, ACTION_DISMISS, CONTAINER_PREDICTION);
+        } else if (event == LAUNCHER_ITEM_DRAG_STARTED) {
+            mLastDragItem = atomInfo;
+        } else if (event == LAUNCHER_ITEM_DROP_COMPLETED) {
+            if (mLastDragItem == null) {
+                return;
+            }
+            if (isTrackedForHotseatPrediction(atomInfo)) {
+                sendEvent(atomInfo, ACTION_PIN, CONTAINER_HOTSEAT_PREDICTION);
+            }
+            if (isTrackedForHotseatPrediction(mLastDragItem)) {
+                sendEvent(mLastDragItem, ACTION_UNPIN, CONTAINER_HOTSEAT_PREDICTION);
+            }
+            mLastDragItem = null;
+        } else if (event == LAUNCHER_ITEM_DROP_FOLDER_CREATED) {
+            if (isTrackedForHotseatPrediction(atomInfo)) {
+                sendEvent(createTempFolderTarget(), atomInfo, ACTION_PIN,
+                        CONTAINER_HOTSEAT_PREDICTION);
+                sendEvent(atomInfo, ACTION_UNPIN, CONTAINER_HOTSEAT_PREDICTION);
+            }
+        } else if (event == LAUNCHER_FOLDER_CONVERTED_TO_ICON) {
+            if (isTrackedForHotseatPrediction(atomInfo)) {
+                sendEvent(createTempFolderTarget(), atomInfo, ACTION_UNPIN,
+                        CONTAINER_HOTSEAT_PREDICTION);
+                sendEvent(atomInfo, ACTION_PIN, CONTAINER_HOTSEAT_PREDICTION);
+            }
+        } else if (event == LAUNCHER_ITEM_DROPPED_ON_REMOVE) {
+            if (mLastDragItem != null && isTrackedForHotseatPrediction(mLastDragItem)) {
+                sendEvent(mLastDragItem, ACTION_UNPIN, CONTAINER_HOTSEAT_PREDICTION);
+            }
+        } else if (event == LAUNCHER_HOTSEAT_PREDICTION_PINNED) {
+            if (isTrackedForHotseatPrediction(atomInfo)) {
+                sendEvent(atomInfo, ACTION_PIN, CONTAINER_HOTSEAT_PREDICTION);
+            }
         }
     }
 
@@ -152,10 +206,8 @@ public class AppEventProducer implements StatsLogConsumer {
                 }
                 break;
             }
-            case FOLDER_ICON: {
-                id = "folder:" + SystemClock.uptimeMillis();
-                cn = new ComponentName(mContext.getPackageName(), "#folder");
-            }
+            case FOLDER_ICON:
+                return createTempFolderTarget();
         }
         if (id != null && cn != null) {
             return new AppTarget.Builder(new AppTargetId(id), cn.getPackageName(), userHandle)
@@ -165,6 +217,12 @@ public class AppEventProducer implements StatsLogConsumer {
         return null;
     }
 
+    private AppTarget createTempFolderTarget() {
+        return new AppTarget.Builder(new AppTargetId("folder:" + SystemClock.uptimeMillis()),
+                mContext.getPackageName(), Process.myUserHandle())
+                .build();
+    }
+
     private String getContainer(LauncherAtom.ItemInfo info) {
         ContainerInfo ci = info.getContainerInfo();
         switch (ci.getContainerCase()) {
@@ -212,11 +270,26 @@ public class AppEventProducer implements StatsLogConsumer {
     }
 
     private static String getHotseatContainerString(HotseatContainer hc) {
-        return String.format(Locale.ENGLISH, "hotseat/%d", hc.getIndex());
+        return String.format(Locale.ENGLISH, "hotseat/%1$d/[%1$d,0]/[1,1]", hc.getIndex());
     }
 
     private static ComponentName parseNullable(String componentNameString) {
         return TextUtils.isEmpty(componentNameString)
                 ? null : ComponentName.unflattenFromString(componentNameString);
     }
+
+    /**
+     * Helper method to determine if {@link ItemInfo} should be tracked and reported to predictors
+     */
+    private static boolean isTrackedForHotseatPrediction(LauncherAtom.ItemInfo info) {
+        ContainerInfo ci = info.getContainerInfo();
+        switch (ci.getContainerCase()) {
+            case HOTSEAT:
+                return true;
+            case WORKSPACE:
+                return ci.getWorkspace().getPageIndex() == 0;
+            default:
+                return false;
+        }
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
index 166cb6cc4d..be57dece79 100644
--- a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
+++ b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
@@ -16,9 +16,11 @@
 package com.android.launcher3.model;
 
 import static com.android.launcher3.InvariantDeviceProfile.CHANGE_FLAG_GRID;
+import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION;
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_PREDICTION;
 import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
 import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT;
+import static com.android.launcher3.hybridhotseat.HotseatPredictionModel.convertDataModelToAppTargetBundle;
 
 import android.app.prediction.AppPredictionContext;
 import android.app.prediction.AppPredictionManager;
@@ -62,6 +64,8 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
 
     private final PredictorState mAllAppsState =
             new PredictorState(CONTAINER_PREDICTION, "all_apps_predictions");
+    private final PredictorState mHotseatState =
+            new PredictorState(CONTAINER_HOTSEAT_PREDICTION, "hotseat_predictions");
 
     private final InvariantDeviceProfile mIDP;
     private final AppEventProducer mAppEventProducer;
@@ -81,13 +85,23 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
         // TODO: Implement caching and preloading
         super.loadItems(ums, pinnedShortcuts);
 
-        WorkspaceItemFactory factory =
+        WorkspaceItemFactory allAppsFactory =
                 new WorkspaceItemFactory(mApp, ums, pinnedShortcuts, mIDP.numAllAppsColumns);
         mAllAppsState.items.setItems(
-                mAllAppsState.storage.read(mApp.getContext(), factory, ums.allUsers::get));
+                mAllAppsState.storage.read(mApp.getContext(), allAppsFactory, ums.allUsers::get));
         mDataModel.extraItems.put(CONTAINER_PREDICTION, mAllAppsState.items);
 
+        WorkspaceItemFactory hotseatFactory =
+                new WorkspaceItemFactory(mApp, ums, pinnedShortcuts, mIDP.numHotseatIcons);
+        mHotseatState.items.setItems(
+                mHotseatState.storage.read(mApp.getContext(), hotseatFactory, ums.allUsers::get));
+        mDataModel.extraItems.put(CONTAINER_HOTSEAT_PREDICTION, mHotseatState.items);
         mActive = true;
+    }
+
+    @Override
+    public void workspaceLoadComplete() {
+        super.workspaceLoadComplete();
         recreatePredictors();
     }
 
@@ -111,6 +125,7 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
 
     private void destroyPredictors() {
         mAllAppsState.destroyPredictor();
+        mHotseatState.destroyPredictor();
     }
 
     @WorkerThread
@@ -125,18 +140,28 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
             return;
         }
 
-        int count = mIDP.numAllAppsColumns;
-
-        mAllAppsState.predictor = apm.createAppPredictionSession(
+        registerPredictor(mAllAppsState, apm.createAppPredictionSession(
                 new AppPredictionContext.Builder(context)
                         .setUiSurface("home")
-                        .setPredictedTargetCount(count)
-                        .build());
-        mAllAppsState.predictor.registerPredictionUpdates(
-                Executors.MODEL_EXECUTOR, t -> handleUpdate(mAllAppsState, t));
-        mAllAppsState.predictor.requestPredictionUpdate();
+                        .setPredictedTargetCount(mIDP.numAllAppsColumns)
+                        .build()));
+
+        // TODO: get bundle
+        registerPredictor(mHotseatState, apm.createAppPredictionSession(
+                new AppPredictionContext.Builder(context)
+                        .setUiSurface("hotseat")
+                        .setPredictedTargetCount(mIDP.numHotseatIcons)
+                        .setExtras(convertDataModelToAppTargetBundle(context, mDataModel))
+                        .build()));
+
     }
 
+    private void registerPredictor(PredictorState state, AppPredictor predictor) {
+        state.predictor = predictor;
+        state.predictor.registerPredictionUpdates(
+                Executors.MODEL_EXECUTOR, t -> handleUpdate(state, t));
+        state.predictor.requestPredictionUpdate();
+    }
 
     private void handleUpdate(PredictorState state, List<AppTarget> targets) {
         if (state.setTargets(targets)) {
@@ -154,9 +179,10 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
         }
     }
 
-    private void onAppTargetEvent(AppTargetEvent event) {
-        if (mAllAppsState.predictor != null) {
-            mAllAppsState.predictor.notifyAppTargetEvent(event);
+    private void onAppTargetEvent(AppTargetEvent event, int client) {
+        PredictorState state = client == CONTAINER_PREDICTION ? mAllAppsState : mHotseatState;
+        if (state.predictor != null) {
+            state.predictor.notifyAppTargetEvent(event);
         }
     }
 
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index f7bc0b32d4..e808f8cb78 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -33,8 +33,8 @@ import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY;
 
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.res.Configuration;
-import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 
@@ -48,14 +48,11 @@ import com.android.launcher3.allapps.DiscoveryBounce;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.appprediction.PredictionRowView;
 import com.android.launcher3.config.FeatureFlags;
-import com.android.launcher3.folder.Folder;
 import com.android.launcher3.hybridhotseat.HotseatPredictionController;
 import com.android.launcher3.logging.InstanceId;
 import com.android.launcher3.logging.StatsLogManager.StatsLogger;
 import com.android.launcher3.model.BgDataModel.FixedContainerItems;
-import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.popup.SystemShortcut;
 import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory;
 import com.android.launcher3.testing.TestProtocol;
@@ -70,13 +67,14 @@ import com.android.launcher3.uioverrides.touchcontrollers.QuickSwitchTouchContro
 import com.android.launcher3.uioverrides.touchcontrollers.StatusBarTouchController;
 import com.android.launcher3.uioverrides.touchcontrollers.TaskViewTouchController;
 import com.android.launcher3.uioverrides.touchcontrollers.TransposedQuickSwitchTouchController;
-import com.android.launcher3.util.IntArray;
+import com.android.launcher3.util.OnboardingPrefs;
 import com.android.launcher3.util.TouchController;
 import com.android.launcher3.util.UiThreadHelper;
 import com.android.launcher3.util.UiThreadHelper.AsyncCommand;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.SystemUiProxy;
+import com.android.quickstep.util.QuickstepOnboardingPrefs;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
@@ -84,7 +82,6 @@ import com.android.systemui.shared.system.ActivityManagerWrapper;
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Objects;
 import java.util.stream.Stream;
 
@@ -98,14 +95,7 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
             SystemUiProxy.INSTANCE.get(context).setShelfHeight(arg1 != 0, arg2);
 
     private FixedContainerItems mAllAppsPredictions;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (mHotseatPredictionController != null) {
-            mHotseatPredictionController.createPredictor();
-        }
-    }
+    private HotseatPredictionController mHotseatPredictionController;
 
     @Override
     protected void setupViews() {
@@ -143,6 +133,18 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
         }
     }
 
+    /**
+     * Returns Prediction controller for hybrid hotseat
+     */
+    public HotseatPredictionController getHotseatPredictionController() {
+        return mHotseatPredictionController;
+    }
+
+    @Override
+    protected OnboardingPrefs createOnboardingPrefs(SharedPreferences sharedPrefs) {
+        return new QuickstepOnboardingPrefs(this, sharedPrefs);
+    }
+
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
@@ -178,22 +180,6 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
         super.showAllAppsFromIntent(alreadyOnHome);
     }
 
-    @Override
-    public void folderCreatedFromItem(Folder folder, WorkspaceItemInfo itemInfo) {
-        super.folderCreatedFromItem(folder, itemInfo);
-        if (mHotseatPredictionController != null) {
-            mHotseatPredictionController.folderCreatedFromWorkspaceItem(itemInfo, folder.getInfo());
-        }
-    }
-
-    @Override
-    public void folderConvertedToItem(Folder folder, WorkspaceItemInfo itemInfo) {
-        super.folderConvertedToItem(folder, itemInfo);
-        if (mHotseatPredictionController != null) {
-            mHotseatPredictionController.folderConvertedToWorkspaceItem(itemInfo, folder.getInfo());
-        }
-    }
-
     @Override
     public Stream<SystemShortcut.Factory> getSupportedShortcuts() {
         if (mHotseatPredictionController != null) {
@@ -221,20 +207,15 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
         }
     }
 
-    @Override
-    public void bindPredictedItems(List<AppInfo> appInfos, IntArray ranks) {
-        super.bindPredictedItems(appInfos, ranks);
-        if (mHotseatPredictionController != null) {
-            mHotseatPredictionController.showCachedItems(appInfos, ranks);
-        }
-    }
-
     @Override
     public void bindExtraContainerItems(FixedContainerItems item) {
         if (item.containerId == Favorites.CONTAINER_PREDICTION) {
             mAllAppsPredictions = item;
             getAppsView().getFloatingHeaderView().findFixedRowByType(PredictionRowView.class)
                     .setPredictedApps(item.items);
+        } else if (item.containerId == Favorites.CONTAINER_HOTSEAT_PREDICTION
+                && mHotseatPredictionController != null) {
+            mHotseatPredictionController.setPredictedItems(item);
         }
     }
 
diff --git a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
index 7eda627934..b10adb43b5 100644
--- a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
+++ b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
@@ -26,13 +26,13 @@ import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
 
 import android.content.SharedPreferences;
 
-import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.Workspace;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.hybridhotseat.HotseatPredictionController;
 import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.statemanager.StateManager.StateListener;
+import com.android.launcher3.uioverrides.QuickstepLauncher;
 import com.android.launcher3.util.OnboardingPrefs;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.views.AllAppsEduView;
@@ -40,9 +40,9 @@ import com.android.quickstep.views.AllAppsEduView;
 /**
  * Extends {@link OnboardingPrefs} for quickstep-specific onboarding data.
  */
-public class QuickstepOnboardingPrefs extends OnboardingPrefs<BaseQuickstepLauncher> {
+public class QuickstepOnboardingPrefs extends OnboardingPrefs<QuickstepLauncher> {
 
-    public QuickstepOnboardingPrefs(BaseQuickstepLauncher launcher, SharedPreferences sharedPrefs) {
+    public QuickstepOnboardingPrefs(QuickstepLauncher launcher, SharedPreferences sharedPrefs) {
         super(launcher, sharedPrefs);
 
         StateManager<LauncherState> stateManager = launcher.getStateManager();
diff --git a/res/values/config.xml b/res/values/config.xml
index dc8bdffca3..fc0a5e10dc 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -69,7 +69,6 @@
     <string name="app_launch_tracker_class" translatable="false"></string>
     <string name="test_information_handler_class" translatable="false"></string>
     <string name="launcher_activity_logic_class" translatable="false"></string>
-    <string name="prediction_model_class" translatable="false"></string>
     <string name="model_delegate_class" translatable="false"></string>
 
     <!-- View ID to use for QSB widget -->
diff --git a/src/com/android/launcher3/DropTarget.java b/src/com/android/launcher3/DropTarget.java
index b27abc4369..fd4c30c6f2 100644
--- a/src/com/android/launcher3/DropTarget.java
+++ b/src/com/android/launcher3/DropTarget.java
@@ -113,18 +113,6 @@ public interface DropTarget {
 
             return res;
         }
-
-
-        /**
-         * This is used to determine if an object is dropped at a different location than it was
-         * dragged from
-         */
-        public boolean isMoved() {
-            return dragInfo.cellX != originalDragInfo.cellX
-                    || dragInfo.cellY != originalDragInfo.cellY
-                    || dragInfo.screenId != originalDragInfo.screenId
-                    || dragInfo.container != originalDragInfo.container;
-        }
     }
 
     /**
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 53b65e812f..cbb577af74 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -108,7 +108,6 @@ import com.android.launcher3.dot.DotInfo;
 import com.android.launcher3.dragndrop.DragController;
 import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.dragndrop.DragView;
-import com.android.launcher3.folder.Folder;
 import com.android.launcher3.folder.FolderGridOrganizer;
 import com.android.launcher3.folder.FolderIcon;
 import com.android.launcher3.icons.IconCache;
@@ -1742,16 +1741,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         return newFolder;
     }
 
-    /**
-     * Called when a workspace item is converted into a folder
-     */
-    public void folderCreatedFromItem(Folder folder, WorkspaceItemInfo itemInfo){}
-
-    /**
-     * Called when a folder is converted into a workspace item
-     */
-    public void folderConvertedToItem(Folder folder, WorkspaceItemInfo itemInfo) {}
-
     /**
      * Unbinds the view for the specified item, and removes the item and all its children.
      *
@@ -2189,9 +2178,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         workspace.requestLayout();
     }
 
-    @Override
-    public void bindPredictedItems(List<AppInfo> appInfos, IntArray ranks) { }
-
     /**
      * Add the views for a widget to the workspace.
      */
diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index 782a8699cc..b278e81655 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -33,7 +33,6 @@ import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.icons.IconProvider;
 import com.android.launcher3.icons.LauncherIcons;
-import com.android.launcher3.model.PredictionModel;
 import com.android.launcher3.notification.NotificationListener;
 import com.android.launcher3.pm.InstallSessionHelper;
 import com.android.launcher3.pm.InstallSessionTracker;
@@ -58,7 +57,6 @@ public class LauncherAppState {
     private final IconCache mIconCache;
     private final WidgetPreviewLoader mWidgetCache;
     private final InvariantDeviceProfile mInvariantDeviceProfile;
-    private final PredictionModel mPredictionModel;
 
     private SecureSettingsObserver mNotificationDotsObserver;
     private InstallSessionTracker mInstallSessionTracker;
@@ -125,7 +123,6 @@ public class LauncherAppState {
         mIconCache = new IconCache(mContext, mInvariantDeviceProfile, iconCacheFileName);
         mWidgetCache = new WidgetPreviewLoader(mContext, mIconCache);
         mModel = new LauncherModel(context, this, mIconCache, AppFilter.newInstance(mContext));
-        mPredictionModel = PredictionModel.newInstance(mContext);
     }
 
     protected void onNotificationSettingsChanged(boolean areNotificationDotsEnabled) {
@@ -182,10 +179,6 @@ public class LauncherAppState {
         return mModel;
     }
 
-    public PredictionModel getPredictionModel() {
-        return mPredictionModel;
-    }
-
     public WidgetPreviewLoader getWidgetCache() {
         return mWidgetCache;
     }
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index f58e0b496a..6aa4c430b1 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -217,6 +217,13 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi
         }
     }
 
+    /**
+     * Called when the workspace items have drastically changed
+     */
+    public void onWorkspaceUiChanged() {
+        MODEL_EXECUTOR.execute(mModelDelegate::workspaceLoadComplete);
+    }
+
     /**
      * Called when the model is destroyed
      */
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 3be9ac7e07..252e64e534 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1702,7 +1702,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
                 fi.addItem(destInfo);
                 fi.addItem(sourceInfo);
             }
-            mLauncher.folderCreatedFromItem(fi.getFolder(), destInfo);
             return true;
         }
         return false;
@@ -1719,7 +1718,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         if (dropOverView instanceof FolderIcon) {
             FolderIcon fi = (FolderIcon) dropOverView;
             if (fi.acceptDrop(d.dragInfo)) {
-                mStatsLogManager.logger().withItemInfo(fi.mInfo).withInstanceId(d.logInstanceId)
+                mStatsLogManager.logger().withItemInfo(d.dragInfo).withInstanceId(d.logInstanceId)
                         .log(LauncherEvent.LAUNCHER_ITEM_DROP_COMPLETED);
                 fi.onDrop(d, false /* itemReturnedOnFailedDrop */);
 
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index b91d1c3260..61543c4ce5 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -24,6 +24,7 @@ import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent;
 import static com.android.launcher3.config.FeatureFlags.ALWAYS_USE_HARDWARE_OPTIMIZATION_FOR_FOLDER_ANIMATIONS;
 import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_FOLDER_CONVERTED_TO_ICON;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_FOLDER_LABEL_UPDATED;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ITEM_DROP_COMPLETED;
 
@@ -1183,7 +1184,8 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
                         newIcon.requestFocus();
                     }
                     if (finalItem != null) {
-                        mLauncher.folderConvertedToItem(mFolderIcon.getFolder(), finalItem);
+                        mStatsLogManager.logger().withItemInfo(finalItem)
+                                .log(LAUNCHER_FOLDER_CONVERTED_TO_ICON);
                     }
                 }
             }
diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index cca9836835..0f1432a9b6 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -19,6 +19,7 @@ import static android.view.View.MeasureSpec.EXACTLY;
 import static android.view.View.MeasureSpec.makeMeasureSpec;
 import static android.view.View.VISIBLE;
 
+import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_LAUNCHER_PREVIEW_IN_GRID_PICKER;
 import static com.android.launcher3.model.ModelUtils.filterCurrentWorkspaceItems;
 import static com.android.launcher3.model.ModelUtils.getMissingHotseatRanks;
@@ -72,12 +73,12 @@ import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.model.AllAppsList;
 import com.android.launcher3.model.BgDataModel;
 import com.android.launcher3.model.BgDataModel.Callbacks;
+import com.android.launcher3.model.BgDataModel.FixedContainerItems;
 import com.android.launcher3.model.LoaderResults;
 import com.android.launcher3.model.LoaderTask;
 import com.android.launcher3.model.ModelDelegate;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.model.WidgetsModel;
-import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
@@ -95,6 +96,7 @@ import com.android.launcher3.widget.custom.CustomWidgetManager;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -467,12 +469,14 @@ public class LauncherPreviewRenderer extends ContextThemeWrapper
             }
             IntArray ranks = getMissingHotseatRanks(currentWorkspaceItems,
                     mIdp.numHotseatIcons);
-            int count = Math.min(ranks.size(), workspaceResult.mCachedPredictedItems.size());
+            List<ItemInfo> predictions = workspaceResult.mHotseatPredictions == null
+                    ? Collections.emptyList() : workspaceResult.mHotseatPredictions.items;
+            int count = Math.min(ranks.size(), predictions.size());
             for (int i = 0; i < count; i++) {
-                AppInfo appInfo = workspaceResult.mCachedPredictedItems.get(i);
                 int rank = ranks.get(i);
-                WorkspaceItemInfo itemInfo = new WorkspaceItemInfo(appInfo);
-                itemInfo.container = Favorites.CONTAINER_HOTSEAT_PREDICTION;
+                WorkspaceItemInfo itemInfo =
+                        new WorkspaceItemInfo((WorkspaceItemInfo) predictions.get(i));
+                itemInfo.container = CONTAINER_HOTSEAT_PREDICTION;
                 itemInfo.rank = rank;
                 itemInfo.cellX = mHotseat.getCellXFromOrder(rank);
                 itemInfo.cellY = mHotseat.getCellYFromOrder(rank);
@@ -569,8 +573,7 @@ public class LauncherPreviewRenderer extends ContextThemeWrapper
                 return null;
             }
 
-            return new WorkspaceResult(mBgDataModel.workspaceItems, mBgDataModel.appWidgets,
-                    mBgDataModel.cachedPredictedItems, mBgDataModel.widgetsModel, null);
+            return new WorkspaceResult(mBgDataModel, mBgDataModel.widgetsModel, null);
         }
     }
 
@@ -594,11 +597,10 @@ public class LauncherPreviewRenderer extends ContextThemeWrapper
         }
 
         @Override
-        public WorkspaceResult call() throws Exception {
+        public WorkspaceResult call() {
             List<ShortcutInfo> allShortcuts = new ArrayList<>();
             loadWorkspace(allShortcuts, LauncherSettings.Favorites.PREVIEW_CONTENT_URI);
-            return new WorkspaceResult(mBgDataModel.workspaceItems, mBgDataModel.appWidgets,
-                    mBgDataModel.cachedPredictedItems, null, mWidgetProvidersMap);
+            return new WorkspaceResult(mBgDataModel, null, mWidgetProvidersMap);
         }
     }
 
@@ -618,17 +620,16 @@ public class LauncherPreviewRenderer extends ContextThemeWrapper
     private static class WorkspaceResult {
         private final ArrayList<ItemInfo> mWorkspaceItems;
         private final ArrayList<LauncherAppWidgetInfo> mAppWidgets;
-        private final ArrayList<AppInfo> mCachedPredictedItems;
+        private final FixedContainerItems mHotseatPredictions;
         private final WidgetsModel mWidgetsModel;
         private final Map<ComponentKey, AppWidgetProviderInfo> mWidgetProvidersMap;
 
-        private WorkspaceResult(ArrayList<ItemInfo> workspaceItems,
-                ArrayList<LauncherAppWidgetInfo> appWidgets,
-                ArrayList<AppInfo> cachedPredictedItems, WidgetsModel widgetsModel,
+        private WorkspaceResult(BgDataModel dataModel,
+                WidgetsModel widgetsModel,
                 Map<ComponentKey, AppWidgetProviderInfo> widgetProviderInfoMap) {
-            mWorkspaceItems = workspaceItems;
-            mAppWidgets = appWidgets;
-            mCachedPredictedItems = cachedPredictedItems;
+            mWorkspaceItems = dataModel.workspaceItems;
+            mAppWidgets = dataModel.appWidgets;
+            mHotseatPredictions = dataModel.extraItems.get(CONTAINER_HOTSEAT_PREDICTION);
             mWidgetsModel = widgetsModel;
             mWidgetProvidersMap = widgetProviderInfoMap;
         }
diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index 22823391dd..ec1c3ef779 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -316,7 +316,13 @@ public class StatsLogManager implements ResourceBasedOverride {
         LAUNCHER_NAVIGATION_MODE_GESTURE_BUTTON(625),
 
         @UiEvent(doc = "User tapped on image content in Overview Select mode.")
-        LAUNCHER_SELECT_MODE_IMAGE(627);
+        LAUNCHER_SELECT_MODE_IMAGE(627),
+
+        @UiEvent(doc = "A folder was replaced by a single item")
+        LAUNCHER_FOLDER_CONVERTED_TO_ICON(628),
+
+        @UiEvent(doc = "A hotseat prediction item was pinned")
+        LAUNCHER_HOTSEAT_PREDICTION_PINNED(629);
 
         // ADD MORE
 
diff --git a/src/com/android/launcher3/model/BaseLoaderResults.java b/src/com/android/launcher3/model/BaseLoaderResults.java
index 586333fd2e..5c85babb76 100644
--- a/src/com/android/launcher3/model/BaseLoaderResults.java
+++ b/src/com/android/launcher3/model/BaseLoaderResults.java
@@ -17,7 +17,6 @@
 package com.android.launcher3.model;
 
 import static com.android.launcher3.model.ModelUtils.filterCurrentWorkspaceItems;
-import static com.android.launcher3.model.ModelUtils.getMissingHotseatRanks;
 import static com.android.launcher3.model.ModelUtils.sortWorkspaceItemsSpatially;
 
 import android.util.Log;
@@ -206,9 +205,6 @@ public abstract class BaseLoaderResults {
             mExtraItems.forEach(item ->
                     executeCallbacksTask(c -> c.bindExtraContainerItems(item), mainExecutor));
 
-            // Locate available spots for prediction using currentWorkspaceItems
-            IntArray gaps = getMissingHotseatRanks(currentWorkspaceItems, idp.numHotseatIcons);
-            bindPredictedItems(gaps, mainExecutor);
             // In case of validFirstPage, only bind the first screen, and defer binding the
             // remaining screens after first onDraw (and an optional the fade animation whichever
             // happens later).
@@ -261,11 +257,6 @@ public abstract class BaseLoaderResults {
             }
         }
 
-        private void bindPredictedItems(IntArray ranks, final Executor executor) {
-            ArrayList<AppInfo> items = new ArrayList<>(mBgDataModel.cachedPredictedItems);
-            executeCallbacksTask(c -> c.bindPredictedItems(items, ranks), executor);
-        }
-
         protected void executeCallbacksTask(CallbackTask task, Executor executor) {
             executor.execute(() -> {
                 if (mMyBindingId != mBgDataModel.lastBindId) {
diff --git a/src/com/android/launcher3/model/BgDataModel.java b/src/com/android/launcher3/model/BgDataModel.java
index 140342f98c..1fc897af7c 100644
--- a/src/com/android/launcher3/model/BgDataModel.java
+++ b/src/com/android/launcher3/model/BgDataModel.java
@@ -103,11 +103,6 @@ public class BgDataModel {
      */
     public final IntSparseArrayMap<FixedContainerItems> extraItems = new IntSparseArrayMap<>();
 
-    /**
-     * List of all cached predicted items visible on home screen
-     */
-    public final ArrayList<AppInfo> cachedPredictedItems = new ArrayList<>();
-
     /**
      * Maps all launcher activities to counts of their shortcuts.
      */
@@ -472,10 +467,5 @@ public class BgDataModel {
         default void bindExtraContainerItems(FixedContainerItems item) { }
 
         void bindAllApplications(AppInfo[] apps, int flags);
-
-        /**
-         * Binds predicted appInfos at at available prediction slots.
-         */
-        void bindPredictedItems(List<AppInfo> appInfos, IntArray ranks);
     }
 }
diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index 1dd8c112c6..983ec0c176 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -48,8 +48,6 @@ import android.util.Log;
 import android.util.LongSparseArray;
 import android.util.TimingLogger;
 
-import androidx.annotation.WorkerThread;
-
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherModel;
 import com.android.launcher3.LauncherSettings;
@@ -190,13 +188,13 @@ public class LoaderTask implements Runnable {
         try (LauncherModel.LoaderTransaction transaction = mApp.getModel().beginLoader(this)) {
             List<ShortcutInfo> allShortcuts = new ArrayList<>();
             loadWorkspace(allShortcuts);
-            loadCachedPredictions();
             logger.addSplit("loadWorkspace");
 
             verifyNotStopped();
             mResults.bindWorkspace();
             logger.addSplit("bindWorkspace");
 
+            mModelDelegate.workspaceLoadComplete();
             // Notify the installer packages of packages with active installs on the first screen.
             sendFirstScreenActiveInstallsBroadcast();
             logger.addSplit("sendFirstScreenActiveInstallsBroadcast");
@@ -839,24 +837,6 @@ public class LoaderTask implements Runnable {
         }
     }
 
-    @WorkerThread
-    private void loadCachedPredictions() {
-        synchronized (mBgDataModel) {
-            List<ComponentKey> componentKeys =
-                    mApp.getPredictionModel().getPredictionComponentKeys();
-            List<LauncherActivityInfo> l;
-            mBgDataModel.cachedPredictedItems.clear();
-            for (ComponentKey key : componentKeys) {
-                l = mLauncherApps.getActivityList(key.componentName.getPackageName(), key.user);
-                if (l.size() == 0) continue;
-                AppInfo info = new AppInfo(l.get(0), key.user,
-                        mUserManagerState.isUserQuiet(key.user));
-                mBgDataModel.cachedPredictedItems.add(info);
-                mIconCache.getTitleAndIcon(info, false);
-            }
-        }
-    }
-
     private void sanitizeData() {
         Context context = mApp.getContext();
         if (mItemsDeleted) {
@@ -900,14 +880,6 @@ public class LoaderTask implements Runnable {
                         PackageInstallInfo.fromInstallingState(info));
             }
         }
-        for (AppInfo item : mBgDataModel.cachedPredictedItems) {
-            List<LauncherActivityInfo> l = mLauncherApps.getActivityList(
-                    item.componentName.getPackageName(), item.user);
-            for (LauncherActivityInfo info : l) {
-                boolean quietMode = mUserManagerState.isUserQuiet(item.user);
-                mBgAllAppsList.add(new AppInfo(info, item.user, quietMode), info);
-            }
-        }
 
         mBgAllAppsList.setFlags(FLAG_QUIET_MODE_ENABLED,
                 mUserManagerState.isAnyProfileQuietModeEnabled());
diff --git a/src/com/android/launcher3/model/ModelDelegate.java b/src/com/android/launcher3/model/ModelDelegate.java
index 53e8a86078..3ed880906d 100644
--- a/src/com/android/launcher3/model/ModelDelegate.java
+++ b/src/com/android/launcher3/model/ModelDelegate.java
@@ -71,6 +71,12 @@ public class ModelDelegate implements ResourceBasedOverride {
     @WorkerThread
     public void loadItems(UserManagerState ums, Map<ShortcutKey, ShortcutInfo> pinnedShortcuts) { }
 
+    /**
+     * Called during loader after workspace loading is complete
+     */
+    @WorkerThread
+    public void workspaceLoadComplete() { }
+
     /**
      * Called when the delegate is no loner needed
      */
diff --git a/src/com/android/launcher3/model/PredictionModel.java b/src/com/android/launcher3/model/PredictionModel.java
deleted file mode 100644
index cb3903d4ed..0000000000
--- a/src/com/android/launcher3/model/PredictionModel.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.model;
-
-import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.UserHandle;
-
-import androidx.annotation.AnyThread;
-import androidx.annotation.WorkerThread;
-
-import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
-import com.android.launcher3.pm.UserCache;
-import com.android.launcher3.util.ComponentKey;
-import com.android.launcher3.util.Preconditions;
-import com.android.launcher3.util.ResourceBasedOverride;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Model Helper for app predictions
- */
-public class PredictionModel implements ResourceBasedOverride {
-
-    private static final String CACHED_ITEMS_KEY = "predicted_item_keys";
-    private static final int MAX_CACHE_ITEMS = 5;
-
-    protected Context mContext;
-    private SharedPreferences mDevicePrefs;
-    private UserCache mUserCache;
-
-
-    /**
-     * Retrieve instance of this object that can be overridden in runtime based on the build
-     * variant of the application.
-     */
-    public static PredictionModel newInstance(Context context) {
-        PredictionModel model = Overrides.getObject(PredictionModel.class, context,
-                R.string.prediction_model_class);
-        model.init(context);
-        return model;
-    }
-
-    protected void init(Context context) {
-        mContext = context;
-        mDevicePrefs = Utilities.getDevicePrefs(mContext);
-        mUserCache = UserCache.INSTANCE.get(mContext);
-
-    }
-
-    /**
-     * Formats and stores a list of component key in device preferences.
-     */
-    @AnyThread
-    public void cachePredictionComponentKeys(List<ComponentKey> componentKeys) {
-        MODEL_EXECUTOR.execute(() -> {
-            LauncherAppState appState = LauncherAppState.getInstance(mContext);
-            StringBuilder builder = new StringBuilder();
-            int count = Math.min(componentKeys.size(), MAX_CACHE_ITEMS);
-            for (int i = 0; i < count; i++) {
-                builder.append(serializeComponentKeyToString(componentKeys.get(i)));
-                builder.append("\n");
-            }
-            if (componentKeys.isEmpty() /* should invalidate loader items */) {
-                appState.getModel().enqueueModelUpdateTask(new BaseModelUpdateTask() {
-                    @Override
-                    public void execute(LauncherAppState app, BgDataModel model, AllAppsList apps) {
-                        model.cachedPredictedItems.clear();
-                    }
-                });
-            }
-            mDevicePrefs.edit().putString(CACHED_ITEMS_KEY, builder.toString()).apply();
-        });
-    }
-
-    /**
-     * parses and returns ComponentKeys saved by
-     * {@link PredictionModel#cachePredictionComponentKeys(List)}
-     */
-    @WorkerThread
-    public List<ComponentKey> getPredictionComponentKeys() {
-        Preconditions.assertWorkerThread();
-        ArrayList<ComponentKey> items = new ArrayList<>();
-        String cachedBlob = mDevicePrefs.getString(CACHED_ITEMS_KEY, "");
-        for (String line : cachedBlob.split("\n")) {
-            ComponentKey key = getComponentKeyFromSerializedString(line);
-            if (key != null) {
-                items.add(key);
-            }
-
-        }
-        return items;
-    }
-
-    private String serializeComponentKeyToString(ComponentKey componentKey) {
-        long userSerialNumber = mUserCache.getSerialNumberForUser(componentKey.user);
-        return componentKey.componentName.flattenToString() + "#" + userSerialNumber;
-    }
-
-    private ComponentKey getComponentKeyFromSerializedString(String str) {
-        int sep = str.indexOf('#');
-        if (sep < 0 || (sep + 1) >= str.length()) {
-            return null;
-        }
-        ComponentName componentName = ComponentName.unflattenFromString(str.substring(0, sep));
-        if (componentName == null) {
-            return null;
-        }
-        try {
-            long serialNumber = Long.parseLong(str.substring(sep + 1));
-            UserHandle userHandle = mUserCache.getUserForSerialNumber(serialNumber);
-            return userHandle != null ? new ComponentKey(componentName, userHandle) : null;
-        } catch (NumberFormatException ex) {
-            return null;
-        }
-    }
-}
diff --git a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
index 31c3014874..2b04365ddc 100644
--- a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
+++ b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
@@ -196,9 +196,6 @@ public class SecondaryDisplayLauncher extends BaseDraggingActivity
     @Override
     public void bindItems(List<ItemInfo> shortcuts, boolean forceAnimateIcons) { }
 
-    @Override
-    public void bindPredictedItems(List<AppInfo> appInfos, IntArray ranks) { }
-
     @Override
     public void bindScreens(IntArray orderedScreenIds) { }
 
diff --git a/src/com/android/launcher3/util/OnboardingPrefs.java b/src/com/android/launcher3/util/OnboardingPrefs.java
index 6e5e7d9355..1b33197879 100644
--- a/src/com/android/launcher3/util/OnboardingPrefs.java
+++ b/src/com/android/launcher3/util/OnboardingPrefs.java
@@ -44,7 +44,8 @@ public class OnboardingPrefs<T extends Launcher> {
      */
     @StringDef(value = {
             HOME_BOUNCE_SEEN,
-            SHELF_BOUNCE_SEEN
+            SHELF_BOUNCE_SEEN,
+            HOTSEAT_LONGPRESS_TIP_SEEN
     })
     @Retention(RetentionPolicy.SOURCE)
     public @interface EventBoolKey {}
-- 
GitLab


From f9abe7bcbdca75ea5978e7489e39b8d7b88623a4 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Mon, 17 Aug 2020 22:14:28 -0700
Subject: [PATCH 0101/1664] Update rect in LiveTileOverlay via copying

Probably a recent change updates the rect when reaching overview, which wasn't happening before. Regardless, we shouldn't have copied the rect by reference since the referenced copy can be changed.

Fixes: 165143463
Test: manual
Change-Id: I9315a20226f0a4b3440ce5ee6cc1f4ed1ddca487
---
 .../android/quickstep/views/LiveTileOverlay.java   | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/LiveTileOverlay.java b/quickstep/src/com/android/quickstep/views/LiveTileOverlay.java
index 30c9f77aa8..c6c2d7e4f0 100644
--- a/quickstep/src/com/android/quickstep/views/LiveTileOverlay.java
+++ b/quickstep/src/com/android/quickstep/views/LiveTileOverlay.java
@@ -40,14 +40,13 @@ public class LiveTileOverlay extends Drawable {
     public static final LiveTileOverlay INSTANCE = new LiveTileOverlay();
 
     private final Paint mPaint = new Paint();
+    private final RectF mCurrentRect = new RectF();
     private final Rect mBoundsRect = new Rect();
 
-    private RectF mCurrentRect;
     private float mCornerRadius;
     private Drawable mIcon;
     private Animator mIconAnimator;
 
-    private boolean mDrawEnabled = true;
     private float mIconAnimationProgress = 0f;
     private boolean mIsAttached;
 
@@ -58,7 +57,7 @@ public class LiveTileOverlay extends Drawable {
     public void update(RectF currentRect, float cornerRadius) {
         invalidateSelf();
 
-        mCurrentRect = currentRect;
+        mCurrentRect.set(currentRect);
         mCornerRadius = cornerRadius;
 
         mCurrentRect.roundOut(mBoundsRect);
@@ -93,16 +92,9 @@ public class LiveTileOverlay extends Drawable {
         return mIconAnimationProgress;
     }
 
-    public void setDrawEnabled(boolean drawEnabled) {
-        if (mDrawEnabled != drawEnabled) {
-            mDrawEnabled = drawEnabled;
-            invalidateSelf();
-        }
-    }
-
     @Override
     public void draw(Canvas canvas) {
-        if (mCurrentRect != null && mDrawEnabled) {
+        if (mCurrentRect != null) {
             canvas.drawRoundRect(mCurrentRect, mCornerRadius, mCornerRadius, mPaint);
             if (mIcon != null && mIconAnimationProgress > 0f) {
                 canvas.save();
-- 
GitLab


From 114de69c9812284f541b0588ea68c71c2b8bb739 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Sat, 15 Aug 2020 09:40:26 -0700
Subject: [PATCH 0102/1664] Introduce support for play results in launcher

Introduces PluginSearchPipeline class, a plugin listener for AllAppsSearchPlugin. Coverts from List<Bundle> results from callback to AdapterItems to be rendered in SearchController.
- Moves AdapterItem to AllAppsGridAdapter

Bug: 164699827
Test: Manual
Change-Id: I20ec147e6b3f4707cf69d62b4b4ac70a90196345
---
 res/layout/search_result_play_item.xml        |  75 +++++++++
 res/layout/search_section_title.xml           |  16 +-
 res/values/strings.xml                        |   2 +
 .../allapps/AllAppsContainerView.java         |  21 +++
 .../launcher3/allapps/AllAppsGridAdapter.java | 125 ++++++++++++--
 .../allapps/AllAppsRecyclerView.java          |  12 +-
 .../allapps/AllAppsSectionDecorator.java      |   4 +-
 .../allapps/AlphabeticalAppsList.java         | 101 +-----------
 .../search/AllAppsSearchBarController.java    |  95 ++++-------
 .../search/AppsSearchContainerLayout.java     |   3 +-
 .../allapps/search/AppsSearchPipeline.java    |  11 +-
 .../allapps/search/SearchPipeline.java        |   4 +-
 .../allapps/search/SearchSectionInfo.java     |  17 +-
 .../launcher3/views/HeroSearchResultView.java |  13 +-
 .../launcher3/views/SearchResultPlayItem.java | 154 ++++++++++++++++++
 .../views/SearchSectionHeaderView.java        |  55 +++++++
 16 files changed, 493 insertions(+), 215 deletions(-)
 create mode 100644 res/layout/search_result_play_item.xml
 create mode 100644 src/com/android/launcher3/views/SearchResultPlayItem.java
 create mode 100644 src/com/android/launcher3/views/SearchSectionHeaderView.java

diff --git a/res/layout/search_result_play_item.xml b/res/layout/search_result_play_item.xml
new file mode 100644
index 0000000000..4e82eafc61
--- /dev/null
+++ b/res/layout/search_result_play_item.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.launcher3.views.SearchResultPlayItem xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="8dp"
+    android:orientation="horizontal">
+    <View
+        android:id="@+id/icon"
+        android:layout_width="@dimen/deep_shortcut_icon_size"
+        android:layout_height="@dimen/deep_shortcut_icon_size"
+        android:layout_gravity="start|center_vertical"
+        android:background="@drawable/ic_deepshortcut_placeholder" />
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start|center_vertical"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:padding="8dp">
+
+        <TextView
+            android:id="@+id/title_view"
+            style="@style/TextHeadline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAlignment="viewStart"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="16sp" />
+
+        <TextView
+            android:id="@+id/detail_0"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="?android:attr/textColorPrimary" />
+
+        <TextView
+            android:id="@+id/detail_1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="?android:attr/textColorPrimary"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/detail_2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="?android:attr/textColorPrimary"
+            android:visibility="gone" />
+    </LinearLayout>
+    <Button
+        android:id="@+id/try_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start|center_vertical"
+        android:background="?android:attr/selectableItemBackground"
+        android:text="@string/search_action_try_now">
+    </Button>
+
+
+</com.android.launcher3.views.SearchResultPlayItem>
diff --git a/res/layout/search_section_title.xml b/res/layout/search_section_title.xml
index c39a641d66..941901591c 100644
--- a/res/layout/search_section_title.xml
+++ b/res/layout/search_section_title.xml
@@ -13,11 +13,11 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-          android:id="@+id/section_title"
-          android:textSize="14sp"
-          android:fontFamily="@style/TextHeadline"
-          android:layout_width="wrap_content"
-          android:textColor="?android:attr/textColorPrimary"
-          android:padding="4dp"
-          android:layout_height="wrap_content"/>
\ No newline at end of file
+<com.android.launcher3.views.SearchSectionHeaderView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/section_title"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:fontFamily="@style/TextHeadline"
+    android:padding="4dp"
+    android:textColor="?android:attr/textColorPrimary"
+    android:textSize="14sp" />
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ef47eefba1..ad3e2b79f4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -70,6 +70,8 @@
     <!--All apps Search-->
     <!-- Section title for apps [CHAR_LIMIT=50] -->
     <string name="search_corpus_apps">Apps</string>
+    <!-- try instant app action for play search result [CHAR_LIMIT=50 -->
+    <string name="search_action_try_now">Try Now</string>
 
     <!-- Popup items -->
     <!-- Text to display as the header above notifications. [CHAR_LIMIT=30] -->
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index af3722a1f8..99fff4d095 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -15,6 +15,8 @@
  */
 package com.android.launcher3.allapps;
 
+import static com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItem;
+import static com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
 import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
 import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_HAS_SHORTCUT_PERMISSION;
 import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_QUIET_MODE_CHANGE_PERMISSION;
@@ -527,6 +529,25 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         return mViewPager == null ? getActiveRecyclerView() : mViewPager;
     }
 
+    /**
+     * Handles selection on focused view and returns success
+     */
+    public boolean selectFocusedView(View v) {
+        ItemInfo itemInfo = getHighlightedItemInfo();
+        if (itemInfo != null) {
+            return mLauncher.startActivitySafely(v, itemInfo.getIntent(), itemInfo);
+        }
+        AdapterItem focusedItem = getActiveRecyclerView().getApps().getFocusedChild();
+        if (focusedItem instanceof AdapterItemWithPayload) {
+            Runnable onSelection = ((AdapterItemWithPayload) focusedItem).getSelectionHandler();
+            if (onSelection != null) {
+                onSelection.run();
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * Returns the ItemInfo of a view that is in focus, ready to be launched by an IME.
      */
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index 2cec797fd0..c61f01f206 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -40,10 +40,10 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.R;
-import com.android.launcher3.allapps.AlphabeticalAppsList.AdapterItem;
+import com.android.launcher3.allapps.search.AllAppsSearchBarController.PayloadResultHandler;
+import com.android.launcher3.allapps.search.SearchSectionInfo;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.util.PackageManagerHelper;
-import com.android.launcher3.views.HeroSearchResultView;
 
 import java.util.List;
 
@@ -71,6 +71,8 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter.
 
     public static final int VIEW_TYPE_SEARCH_HERO_APP = 1 << 6;
 
+    public static final int DETAIL_ROW_WITH_BUTTON = 1 << 7;
+
     // Common view type masks
     public static final int VIEW_TYPE_MASK_DIVIDER = VIEW_TYPE_ALL_APPS_DIVIDER;
     public static final int VIEW_TYPE_MASK_ICON = VIEW_TYPE_ICON;
@@ -85,6 +87,108 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter.
         }
     }
 
+    /**
+     * Info about a particular adapter item (can be either section or app)
+     */
+    public static class AdapterItem {
+        /** Common properties */
+        // The index of this adapter item in the list
+        public int position;
+        // The type of this item
+        public int viewType;
+
+        /** App-only properties */
+        // The section name of this app.  Note that there can be multiple items with different
+        // sectionNames in the same section
+        public String sectionName = null;
+        // The row that this item shows up on
+        public int rowIndex;
+        // The index of this app in the row
+        public int rowAppIndex;
+        // The associated AppInfo for the app
+        public AppInfo appInfo = null;
+        // The index of this app not including sections
+        public int appIndex = -1;
+        // Search section associated to result
+        public SearchSectionInfo searchSectionInfo = null;
+
+        /**
+         * Factory method for AppIcon AdapterItem
+         */
+        public static AdapterItem asApp(int pos, String sectionName, AppInfo appInfo,
+                int appIndex) {
+            AdapterItem item = new AdapterItem();
+            item.viewType = VIEW_TYPE_ICON;
+            item.position = pos;
+            item.sectionName = sectionName;
+            item.appInfo = appInfo;
+            item.appIndex = appIndex;
+            return item;
+        }
+
+        /**
+         * Factory method for empty search results view
+         */
+        public static AdapterItem asEmptySearch(int pos) {
+            AdapterItem item = new AdapterItem();
+            item.viewType = VIEW_TYPE_EMPTY_SEARCH;
+            item.position = pos;
+            return item;
+        }
+
+        /**
+         * Factory method for a dividerView in AllAppsSearch
+         */
+        public static AdapterItem asAllAppsDivider(int pos) {
+            AdapterItem item = new AdapterItem();
+            item.viewType = VIEW_TYPE_ALL_APPS_DIVIDER;
+            item.position = pos;
+            return item;
+        }
+
+        /**
+         * Factory method for a market search button
+         */
+        public static AdapterItem asMarketSearch(int pos) {
+            AdapterItem item = new AdapterItem();
+            item.viewType = VIEW_TYPE_SEARCH_MARKET;
+            item.position = pos;
+            return item;
+        }
+
+        boolean isCountedForAccessibility() {
+            return viewType == VIEW_TYPE_ICON
+                    || viewType == VIEW_TYPE_SEARCH_HERO_APP
+                    || viewType == DETAIL_ROW_WITH_BUTTON;
+        }
+    }
+
+    /**
+     * Extension of AdapterItem that contains an extra payload specific to item
+     * @param <T> Play load Type
+     */
+    public static class AdapterItemWithPayload<T> extends AdapterItem {
+        private T mPayload;
+        private Runnable mSelectionHandler;
+
+        public AdapterItemWithPayload(T payload, int type) {
+            mPayload = payload;
+            viewType = type;
+        }
+
+        public void setSelectionHandler(Runnable runnable) {
+            mSelectionHandler = runnable;
+        }
+
+        public Runnable getSelectionHandler() {
+            return mSelectionHandler;
+        }
+
+        public T getPayload() {
+            return mPayload;
+        }
+    }
+
     /**
      * A subclass of GridLayoutManager that overrides accessibility values during app search.
      */
@@ -286,6 +390,9 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter.
             case VIEW_TYPE_SEARCH_HERO_APP:
                 return new ViewHolder(mLayoutInflater.inflate(
                         R.layout.search_result_hero_app, parent, false));
+            case DETAIL_ROW_WITH_BUTTON:
+                return new ViewHolder(mLayoutInflater.inflate(
+                        R.layout.search_result_play_item, parent, false));
             default:
                 throw new RuntimeException("Unexpected view type");
         }
@@ -315,15 +422,11 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter.
                 }
                 break;
             case VIEW_TYPE_SEARCH_CORPUS_TITLE:
-                TextView titleView = (TextView) holder.itemView;
-                titleView.setText(mApps.getAdapterItems().get(position).searchSectionInfo.getTitle(
-                        titleView.getContext()));
-                break;
+            case DETAIL_ROW_WITH_BUTTON:
             case VIEW_TYPE_SEARCH_HERO_APP:
-                HeroSearchResultView heroView = (HeroSearchResultView) holder.itemView;
-                heroView.prepareUsingAdapterItem(
-                        (AlphabeticalAppsList.HeroAppAdapterItem) mApps.getAdapterItems().get(
-                                position));
+                PayloadResultHandler payloadResultView = (PayloadResultHandler) holder.itemView;
+                payloadResultView.applyAdapterInfo(
+                        (AdapterItemWithPayload) mApps.getAdapterItems().get(position));
                 break;
             case VIEW_TYPE_ALL_APPS_DIVIDER:
                 // nothing to do
@@ -344,7 +447,7 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter.
 
     @Override
     public int getItemViewType(int position) {
-        AlphabeticalAppsList.AdapterItem item = mApps.getAdapterItems().get(position);
+        AdapterItem item = mApps.getAdapterItems().get(position);
         return item.viewType;
     }
 
diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
index 640ef01bb7..13a93ff0cc 100644
--- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
@@ -278,7 +278,7 @@ public class AllAppsRecyclerView extends BaseRecyclerView implements LogContaine
         if (mApps == null) {
             return;
         }
-        List<AlphabeticalAppsList.AdapterItem> items = mApps.getAdapterItems();
+        List<AllAppsGridAdapter.AdapterItem> items = mApps.getAdapterItems();
 
         // Skip early if there are no items or we haven't been measured
         if (items.isEmpty() || mNumAppsPerRow == 0) {
@@ -352,7 +352,7 @@ public class AllAppsRecyclerView extends BaseRecyclerView implements LogContaine
     @Override
     public int getCurrentScrollY() {
         // Return early if there are no items or we haven't been measured
-        List<AlphabeticalAppsList.AdapterItem> items = mApps.getAdapterItems();
+        List<AllAppsGridAdapter.AdapterItem> items = mApps.getAdapterItems();
         if (items.isEmpty() || mNumAppsPerRow == 0 || getChildCount() == 0) {
             return -1;
         }
@@ -368,14 +368,14 @@ public class AllAppsRecyclerView extends BaseRecyclerView implements LogContaine
     }
 
     public int getCurrentScrollY(int position, int offset) {
-        List<AlphabeticalAppsList.AdapterItem> items = mApps.getAdapterItems();
-        AlphabeticalAppsList.AdapterItem posItem = position < items.size() ?
-                items.get(position) : null;
+        List<AllAppsGridAdapter.AdapterItem> items = mApps.getAdapterItems();
+        AllAppsGridAdapter.AdapterItem posItem = position < items.size()
+                ? items.get(position) : null;
         int y = mCachedScrollPositions.get(position, -1);
         if (y < 0) {
             y = 0;
             for (int i = 0; i < position; i++) {
-                AlphabeticalAppsList.AdapterItem item = items.get(i);
+                AllAppsGridAdapter.AdapterItem item = items.get(i);
                 if (AllAppsGridAdapter.isIconViewType(item.viewType)) {
                     // Break once we reach the desired row
                     if (posItem != null && posItem.viewType == item.viewType &&
diff --git a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
index a168c06d72..6f29e1102c 100644
--- a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
+++ b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
@@ -47,13 +47,13 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
         // Since views in the same section will follow each other, we can skip to a last view in
         // a section to get the bounds of the section without having to iterate on every item.
         int itemCount = parent.getChildCount();
-        List<AlphabeticalAppsList.AdapterItem> adapterItems = mAppsView.getApps().getAdapterItems();
+        List<AllAppsGridAdapter.AdapterItem> adapterItems = mAppsView.getApps().getAdapterItems();
         SectionDecorationHandler lastDecorationHandler = null;
         int i = 0;
         while (i < itemCount) {
             View view = parent.getChildAt(i);
             int position = parent.getChildAdapterPosition(view);
-            AlphabeticalAppsList.AdapterItem adapterItem = adapterItems.get(position);
+            AllAppsGridAdapter.AdapterItem adapterItem = adapterItems.get(position);
             if (adapterItem.searchSectionInfo != null) {
                 SearchSectionInfo sectionInfo = adapterItem.searchSectionInfo;
                 int endIndex = Math.min(i + sectionInfo.getPosEnd() - position, itemCount - 1);
diff --git a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
index 7379dbed9a..8c059d5fce 100644
--- a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
+++ b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
@@ -19,10 +19,10 @@ package com.android.launcher3.allapps;
 import android.content.Context;
 
 import com.android.launcher3.BaseDraggingActivity;
+import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItem;
 import com.android.launcher3.allapps.search.SearchSectionInfo;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.data.AppInfo;
-import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.util.ItemInfoMatcher;
 import com.android.launcher3.util.LabelComparator;
 
@@ -62,101 +62,6 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
         }
     }
 
-    /**
-     * Info about a particular adapter item (can be either section or app)
-     */
-    public static class AdapterItem {
-        /** Common properties */
-        // The index of this adapter item in the list
-        public int position;
-        // The type of this item
-        public int viewType;
-
-        /** App-only properties */
-        // The section name of this app.  Note that there can be multiple items with different
-        // sectionNames in the same section
-        public String sectionName = null;
-        // The row that this item shows up on
-        public int rowIndex;
-        // The index of this app in the row
-        public int rowAppIndex;
-        // The associated AppInfo for the app
-        public AppInfo appInfo = null;
-        // The index of this app not including sections
-        public int appIndex = -1;
-        // Search section associated to result
-        public SearchSectionInfo searchSectionInfo = null;
-
-        public static AdapterItem asApp(int pos, String sectionName, AppInfo appInfo,
-                int appIndex) {
-            AdapterItem item = new AdapterItem();
-            item.viewType = AllAppsGridAdapter.VIEW_TYPE_ICON;
-            item.position = pos;
-            item.sectionName = sectionName;
-            item.appInfo = appInfo;
-            item.appIndex = appIndex;
-            return item;
-        }
-
-        public static AdapterItem asEmptySearch(int pos) {
-            AdapterItem item = new AdapterItem();
-            item.viewType = AllAppsGridAdapter.VIEW_TYPE_EMPTY_SEARCH;
-            item.position = pos;
-            return item;
-        }
-
-        public static AdapterItem asAllAppsDivider(int pos) {
-            AdapterItem item = new AdapterItem();
-            item.viewType = AllAppsGridAdapter.VIEW_TYPE_ALL_APPS_DIVIDER;
-            item.position = pos;
-            return item;
-        }
-
-        public static AdapterItem asMarketSearch(int pos) {
-            AdapterItem item = new AdapterItem();
-            item.viewType = AllAppsGridAdapter.VIEW_TYPE_SEARCH_MARKET;
-            item.position = pos;
-            return item;
-        }
-
-        /**
-         * Factory method for search section title AdapterItem
-         */
-        public static AdapterItem asSearchTitle(SearchSectionInfo sectionInfo, int pos) {
-            AdapterItem item = new AdapterItem();
-            item.viewType = AllAppsGridAdapter.VIEW_TYPE_SEARCH_CORPUS_TITLE;
-            item.position = pos;
-            item.searchSectionInfo = sectionInfo;
-            return item;
-        }
-
-        boolean isCountedForAccessibility() {
-            return viewType == AllAppsGridAdapter.VIEW_TYPE_ICON
-                    || viewType == AllAppsGridAdapter.VIEW_TYPE_SEARCH_HERO_APP;
-        }
-    }
-
-    /**
-     * Extension of AdapterItem that contains shortcut workspace items
-     */
-    public static class HeroAppAdapterItem extends AdapterItem {
-        private ArrayList<WorkspaceItemInfo> mShortcutInfos;
-
-        public HeroAppAdapterItem(AppInfo info, ArrayList<WorkspaceItemInfo> shortcutInfos) {
-            viewType = AllAppsGridAdapter.VIEW_TYPE_SEARCH_HERO_APP;
-            mShortcutInfos = shortcutInfos;
-            appInfo = info;
-        }
-
-        /**
-         * Returns list of shortcuts for appInfo
-         */
-        public ArrayList<WorkspaceItemInfo> getShortcutInfos() {
-            return mShortcutInfos;
-        }
-
-    }
-
 
     private final BaseDraggingActivity mLauncher;
 
@@ -396,7 +301,9 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
                 adapterItem.position = i;
                 mAdapterItems.add(adapterItem);
                 if (adapterItem.searchSectionInfo != lastSection) {
-                    adapterItem.searchSectionInfo.setPosStart(i);
+                    if (adapterItem.searchSectionInfo != null) {
+                        adapterItem.searchSectionInfo.setPosStart(i);
+                    }
                     if (lastSection != null) {
                         lastSection.setPosEnd(i - 1);
                     }
diff --git a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
index 0d8748165a..2e5ed3ec35 100644
--- a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
+++ b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
@@ -15,35 +15,26 @@
  */
 package com.android.launcher3.allapps.search;
 
-import android.content.Context;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.View.OnFocusChangeListener;
 import android.view.inputmethod.EditorInfo;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
-import android.widget.Toast;
-
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
 
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.ExtendedEditText;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.allapps.AlphabeticalAppsList;
+import com.android.launcher3.allapps.AllAppsGridAdapter;
+import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
 import com.android.launcher3.config.FeatureFlags;
-import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.systemui.plugins.AllAppsSearchPlugin;
-import com.android.systemui.plugins.PluginListener;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -54,17 +45,14 @@ import java.util.function.Consumer;
  */
 public class AllAppsSearchBarController
         implements TextWatcher, OnEditorActionListener, ExtendedEditText.OnBackKeyListener,
-        OnFocusChangeListener, PluginListener<AllAppsSearchPlugin> {
+        OnFocusChangeListener {
 
-    private static final String TAG = "AllAppsSearchBarContoller";
     protected BaseDraggingActivity mLauncher;
     protected Callbacks mCb;
     protected ExtendedEditText mInput;
     protected String mQuery;
 
     protected SearchAlgorithm mSearchAlgorithm;
-    private AllAppsSearchPlugin mPlugin;
-    private Consumer mPlubinCb;
 
     public void setVisibility(int visibility) {
         mInput.setVisibility(visibility);
@@ -85,18 +73,13 @@ public class AllAppsSearchBarController
         mInput.setOnBackKeyListener(this);
         mInput.setOnFocusChangeListener(this);
         mSearchAlgorithm = searchAlgorithm;
-
-        PluginManagerWrapper.INSTANCE.get(launcher).addPluginListener(this,
-                AllAppsSearchPlugin.class);
-        mPlubinCb = secondaryCb;
     }
 
     @Override
-    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-        if (mPlugin != null) {
-            if (s.length() == 0) {
-                mPlugin.startedTyping();
-            }
+    public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+        if (mSearchAlgorithm instanceof PluginWrapper) {
+            ((PluginWrapper) mSearchAlgorithm).runOnPluginIfConnected(
+                    AllAppsSearchPlugin::startedTyping);
         }
     }
 
@@ -114,9 +97,6 @@ public class AllAppsSearchBarController
         } else {
             mSearchAlgorithm.cancel(false);
             mSearchAlgorithm.doSearch(mQuery, mCb);
-            if (mPlugin != null) {
-                mPlugin.performSearch(mQuery, mPlubinCb);
-            }
         }
     }
 
@@ -133,10 +113,8 @@ public class AllAppsSearchBarController
     public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
         if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
             if (actionId == EditorInfo.IME_ACTION_SEARCH) {
-                ItemInfo info = Launcher.getLauncher(mLauncher).getAppsView()
-                        .getHighlightedItemInfo();
-                if (info != null) {
-                    return mLauncher.startActivitySafely(v, info.getIntent(), info);
+                if (Launcher.getLauncher(mLauncher).getAppsView().selectFocusedView(v)) {
+                    return true;
                 }
             }
         }
@@ -197,43 +175,14 @@ public class AllAppsSearchBarController
         return mInput.isFocused();
     }
 
-    @Override
-    public void onPluginConnected(AllAppsSearchPlugin allAppsSearchPlugin, Context context) {
-        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
-            mPlugin = allAppsSearchPlugin;
-            checkCallPermission();
-        }
-    }
-
     /**
-     * Check call permissions.
+     * A wrapper setup for running essential calls to plugin from search controller
      */
-    public void checkCallPermission() {
-        final String[] permission = {"android.permission.CALL_PHONE",
-                "android.permission.READ_CONTACTS"};
-        boolean request = false;
-        for (String p : permission) {
-            int permissionCheck = ContextCompat.checkSelfPermission(mLauncher, p);
-            if (permissionCheck != PackageManager.PERMISSION_GRANTED) {
-                request = true;
-            }
-        }
-
-        if (!request) return;
-        boolean rationale = false;
-        for (String p : permission) {
-            if (mLauncher.shouldShowRequestPermissionRationale(p)) {
-                rationale = true;
-            }
-            if (rationale) {
-                Log.e(TAG, p + " Show rationale");
-                Toast.makeText(mLauncher, "Requesting Permissions", Toast.LENGTH_SHORT).show();
-            } else {
-                ActivityCompat.requestPermissions(mLauncher,  permission,  123);
-                Log.e(TAG, p + " request permission");
-            }
-        }
-
+    public interface PluginWrapper {
+        /**
+         * executes call if plugin is connected
+         */
+        void runOnPluginIfConnected(Consumer<AllAppsSearchPlugin> plugin);
     }
 
     /**
@@ -246,11 +195,23 @@ public class AllAppsSearchBarController
          *
          * @param items sorted list of search result adapter items.
          */
-        void onSearchResult(String query, ArrayList<AlphabeticalAppsList.AdapterItem> items);
+        void onSearchResult(String query, ArrayList<AllAppsGridAdapter.AdapterItem> items);
 
         /**
          * Called when the search results should be cleared.
          */
         void clearSearchResult();
     }
+
+    /**
+     * An interface for supporting dynamic search results
+     *
+     * @param <T> Type of payload
+     */
+    public interface PayloadResultHandler<T> {
+        /**
+         * Updates View using Adapter's payload
+         */
+        void applyAdapterInfo(AdapterItemWithPayload<T> adapterItemWithPayload);
+    }
 }
\ No newline at end of file
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
index e8a0d7a493..6f183eebc0 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
@@ -42,6 +42,7 @@ import com.android.launcher3.Insettable;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsContainerView;
+import com.android.launcher3.allapps.AllAppsGridAdapter;
 import com.android.launcher3.allapps.AllAppsStore;
 import com.android.launcher3.allapps.AlphabeticalAppsList;
 import com.android.launcher3.allapps.SearchUiManager;
@@ -172,7 +173,7 @@ public class AppsSearchContainerLayout extends ExtendedEditText
     }
 
     @Override
-    public void onSearchResult(String query, ArrayList<AlphabeticalAppsList.AdapterItem> items) {
+    public void onSearchResult(String query, ArrayList<AllAppsGridAdapter.AdapterItem> items) {
         if (items != null) {
             mApps.setSearchResults(items);
             notifyResultChanged();
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java b/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
index e67e8972e7..fb3d953bac 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
@@ -16,6 +16,7 @@
 package com.android.launcher3.allapps.search;
 
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_SHORTCUTS;
+import static com.android.launcher3.allapps.AllAppsGridAdapter.VIEW_TYPE_SEARCH_HERO_APP;
 
 import android.content.Context;
 import android.content.pm.ShortcutInfo;
@@ -23,9 +24,9 @@ import android.content.pm.ShortcutInfo;
 import androidx.annotation.WorkerThread;
 
 import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.allapps.AllAppsGridAdapter;
+import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItem;
 import com.android.launcher3.allapps.AllAppsSectionDecorator.SectionDecorationHandler;
-import com.android.launcher3.allapps.AlphabeticalAppsList.AdapterItem;
-import com.android.launcher3.allapps.AlphabeticalAppsList.HeroAppAdapterItem;
 import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.model.AllAppsList;
 import com.android.launcher3.model.BaseModelUpdateTask;
@@ -82,7 +83,7 @@ public class AppsSearchPipeline implements SearchPipeline {
 
     /**
      * Returns MAX_SHORTCUTS_COUNT shortcuts from local cache
-     * TODO: Shortcuts should be ranked based on relevancy 
+     * TODO: Shortcuts should be ranked based on relevancy
      */
     private ArrayList<WorkspaceItemInfo> getShortcutInfos(Context context, AppInfo appInfo) {
         List<ShortcutInfo> shortcuts = new ShortcutRequest(context, appInfo.user)
@@ -126,7 +127,9 @@ public class AppsSearchPipeline implements SearchPipeline {
             //hero app
             AppInfo appInfo = apps.get(i);
             ArrayList<WorkspaceItemInfo> shortcuts = getShortcutInfos(context, appInfo);
-            AdapterItem adapterItem = new HeroAppAdapterItem(appInfo, shortcuts);
+            AdapterItem adapterItem = new AllAppsGridAdapter.AdapterItemWithPayload(shortcuts,
+                    VIEW_TYPE_SEARCH_HERO_APP);
+            adapterItem.appInfo = appInfo;
             adapterItem.searchSectionInfo = mSearchSectionInfo;
             adapterItems.add(adapterItem);
         }
diff --git a/src/com/android/launcher3/allapps/search/SearchPipeline.java b/src/com/android/launcher3/allapps/search/SearchPipeline.java
index 321674025a..545f0e3fa2 100644
--- a/src/com/android/launcher3/allapps/search/SearchPipeline.java
+++ b/src/com/android/launcher3/allapps/search/SearchPipeline.java
@@ -15,7 +15,7 @@
  */
 package com.android.launcher3.allapps.search;
 
-import com.android.launcher3.allapps.AlphabeticalAppsList;
+import com.android.launcher3.allapps.AllAppsGridAdapter;
 
 import java.util.ArrayList;
 import java.util.function.Consumer;
@@ -28,5 +28,5 @@ public interface SearchPipeline {
     /**
      * Perform query
      */
-    void performSearch(String query, Consumer<ArrayList<AlphabeticalAppsList.AdapterItem>> cb);
+    void performSearch(String query, Consumer<ArrayList<AllAppsGridAdapter.AdapterItem>> cb);
 }
diff --git a/src/com/android/launcher3/allapps/search/SearchSectionInfo.java b/src/com/android/launcher3/allapps/search/SearchSectionInfo.java
index dee0ffd2df..e026e8449d 100644
--- a/src/com/android/launcher3/allapps/search/SearchSectionInfo.java
+++ b/src/com/android/launcher3/allapps/search/SearchSectionInfo.java
@@ -15,8 +15,6 @@
  */
 package com.android.launcher3.allapps.search;
 
-import android.content.Context;
-
 import com.android.launcher3.allapps.AllAppsSectionDecorator.SectionDecorationHandler;
 
 /**
@@ -24,7 +22,7 @@ import com.android.launcher3.allapps.AllAppsSectionDecorator.SectionDecorationHa
  */
 public class SearchSectionInfo {
 
-    private final int mTitleResId;
+    private String mTitle;
     private SectionDecorationHandler mDecorationHandler;
 
     public int getPosStart() {
@@ -47,11 +45,11 @@ public class SearchSectionInfo {
     private int mPosEnd;
 
     public SearchSectionInfo() {
-        this(-1);
+        this(null);
     }
 
-    public SearchSectionInfo(int titleResId) {
-        mTitleResId = titleResId;
+    public SearchSectionInfo(String title) {
+        mTitle = title;
     }
 
     public void setDecorationHandler(SectionDecorationHandler sectionDecorationHandler) {
@@ -66,10 +64,7 @@ public class SearchSectionInfo {
     /**
      * Returns the section's title
      */
-    public String getTitle(Context context) {
-        if (mTitleResId == -1) {
-            return "";
-        }
-        return context.getString(mTitleResId);
+    public String getTitle() {
+        return mTitle == null ? "" : mTitle;
     }
 }
diff --git a/src/com/android/launcher3/views/HeroSearchResultView.java b/src/com/android/launcher3/views/HeroSearchResultView.java
index c2a02bcdab..10f3c41f35 100644
--- a/src/com/android/launcher3/views/HeroSearchResultView.java
+++ b/src/com/android/launcher3/views/HeroSearchResultView.java
@@ -30,7 +30,8 @@ import com.android.launcher3.DragSource;
 import com.android.launcher3.DropTarget;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
-import com.android.launcher3.allapps.AlphabeticalAppsList;
+import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
+import com.android.launcher3.allapps.search.AllAppsSearchBarController;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.dragndrop.DraggableView;
 import com.android.launcher3.graphics.DragPreviewProvider;
@@ -47,7 +48,8 @@ import java.util.List;
 /**
  * A view representing a high confidence app search result that includes shortcuts
  */
-public class HeroSearchResultView extends LinearLayout implements DragSource {
+public class HeroSearchResultView extends LinearLayout implements DragSource,
+        AllAppsSearchBarController.PayloadResultHandler<List<WorkspaceItemInfo>> {
 
     BubbleTextView mBubbleTextView;
     View mIconView;
@@ -96,18 +98,18 @@ public class HeroSearchResultView extends LinearLayout implements DragSource {
     /**
      * Apply {@link ItemInfo} for appIcon and shortcut Icons
      */
-    public void prepareUsingAdapterItem(AlphabeticalAppsList.HeroAppAdapterItem adapterItem) {
+    @Override
+    public void applyAdapterInfo(AdapterItemWithPayload<List<WorkspaceItemInfo>> adapterItem) {
         mBubbleTextView.applyFromApplicationInfo(adapterItem.appInfo);
         mIconView.setBackground(mBubbleTextView.getIcon());
         mIconView.setTag(adapterItem.appInfo);
-        List<WorkspaceItemInfo> shorcutInfos = adapterItem.getShortcutInfos();
+        List<WorkspaceItemInfo> shorcutInfos = adapterItem.getPayload();
         for (int i = 0; i < mDeepShortcutTextViews.length; i++) {
             mDeepShortcutTextViews[i].setVisibility(shorcutInfos.size() > i ? VISIBLE : GONE);
             if (i < shorcutInfos.size()) {
                 mDeepShortcutTextViews[i].applyFromWorkspaceItem(shorcutInfos.get(i));
             }
         }
-
     }
 
     @Override
@@ -126,7 +128,6 @@ public class HeroSearchResultView extends LinearLayout implements DragSource {
         mIconView.setVisibility(willDraw ? View.VISIBLE : View.INVISIBLE);
     }
 
-
     /**
      * Drag and drop handler for popup items in Launcher activity
      */
diff --git a/src/com/android/launcher3/views/SearchResultPlayItem.java b/src/com/android/launcher3/views/SearchResultPlayItem.java
new file mode 100644
index 0000000000..19a4c5d84c
--- /dev/null
+++ b/src/com/android/launcher3/views/SearchResultPlayItem.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.views;
+
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.BitmapDrawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
+import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+
+import java.io.IOException;
+import java.net.URL;
+
+/**
+ * A View representing a PlayStore item.
+ */
+public class SearchResultPlayItem extends LinearLayout implements
+        AllAppsSearchBarController.PayloadResultHandler<Bundle> {
+    private final DeviceProfile mDeviceProfile;
+    private View mIconView;
+    private TextView mTitleView;
+    private TextView[] mDetailViews = new TextView[3];
+    private Button mPreviewButton;
+    private String mPackageName;
+    private boolean mIsInstantGame;
+
+    public SearchResultPlayItem(Context context) {
+        this(context, null, 0);
+    }
+
+    public SearchResultPlayItem(Context context,
+            @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public SearchResultPlayItem(Context context, @Nullable AttributeSet attrs,
+            int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mDeviceProfile = Launcher.getLauncher(getContext()).getDeviceProfile();
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mIconView = findViewById(R.id.icon);
+        mTitleView = findViewById(R.id.title_view);
+        mPreviewButton = findViewById(R.id.try_button);
+        mPreviewButton.setOnClickListener(view -> launchInstantGame());
+        mDetailViews[0] = findViewById(R.id.detail_0);
+        mDetailViews[1] = findViewById(R.id.detail_1);
+        mDetailViews[2] = findViewById(R.id.detail_2);
+
+        ViewGroup.LayoutParams iconParams = mIconView.getLayoutParams();
+        iconParams.height = mDeviceProfile.allAppsIconSizePx;
+        iconParams.width = mDeviceProfile.allAppsIconSizePx;
+        setOnClickListener(view -> handleSelection());
+
+    }
+
+    @Override
+    public void applyAdapterInfo(AdapterItemWithPayload<Bundle> adapterItemWithPayload) {
+        Bundle bundle = adapterItemWithPayload.getPayload();
+        adapterItemWithPayload.setSelectionHandler(this::handleSelection);
+        if (bundle.getString("package", "").equals(mPackageName)) {
+            return;
+        }
+        mIsInstantGame = bundle.getBoolean("instant_game", false);
+        mPackageName = bundle.getString("package");
+        mPreviewButton.setVisibility(mIsInstantGame ? VISIBLE : GONE);
+        mTitleView.setText(bundle.getString("title"));
+//        TODO: Should use a generic type to get values b/165320033
+        showIfNecessary(mDetailViews[0], bundle.getString("price"));
+        showIfNecessary(mDetailViews[1], bundle.getString("rating"));
+        showIfNecessary(mDetailViews[2], bundle.getString("category"));
+
+        mIconView.setBackgroundResource(R.drawable.ic_deepshortcut_placeholder);
+        UI_HELPER_EXECUTOR.execute(() -> {
+            try {
+//                TODO: Handle caching
+                URL url = new URL(bundle.getString("icon_url"));
+                Bitmap bitmap = BitmapFactory.decodeStream(url.openStream());
+                BitmapDrawable bitmapDrawable = new BitmapDrawable(getResources(),
+                        Bitmap.createScaledBitmap(bitmap, mDeviceProfile.allAppsIconSizePx,
+                                mDeviceProfile.allAppsIconSizePx, false));
+                mIconView.post(() -> mIconView.setBackground(bitmapDrawable));
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        });
+    }
+
+    private void showIfNecessary(TextView textView, @Nullable String string) {
+        if (string == null || string.isEmpty()) {
+            textView.setVisibility(GONE);
+        } else {
+            textView.setText(string);
+            textView.setVisibility(VISIBLE);
+        }
+    }
+
+    private void handleSelection() {
+        if (mPackageName == null) return;
+        Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(
+                "https://play.google.com/store/apps/details?id="
+                        + mPackageName));
+        i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        getContext().startActivity(i);
+    }
+
+    private void launchInstantGame() {
+        if (!mIsInstantGame) return;
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        String referrer = "Pixel_Launcher";
+        String id = mPackageName;
+        String deepLinkUrl = "market://details?id=" + id + "&launch=true&referrer=" + referrer;
+        intent.setPackage("com.android.vending");
+        intent.setData(Uri.parse(deepLinkUrl));
+        intent.putExtra("overlay", true);
+        intent.putExtra("callerId", getContext().getPackageName());
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        getContext().startActivity(intent);
+    }
+}
diff --git a/src/com/android/launcher3/views/SearchSectionHeaderView.java b/src/com/android/launcher3/views/SearchSectionHeaderView.java
new file mode 100644
index 0000000000..d439ee3d68
--- /dev/null
+++ b/src/com/android/launcher3/views/SearchSectionHeaderView.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.views;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.allapps.AllAppsGridAdapter;
+import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+
+/**
+ * Header text view that shows a title for a given section in All apps search
+ */
+public class SearchSectionHeaderView extends TextView implements
+        AllAppsSearchBarController.PayloadResultHandler<String> {
+    public SearchSectionHeaderView(Context context) {
+        super(context);
+    }
+
+    public SearchSectionHeaderView(Context context,
+            @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public SearchSectionHeaderView(Context context, @Nullable AttributeSet attrs, int styleAttr) {
+        super(context, attrs, styleAttr);
+    }
+
+    @Override
+    public void applyAdapterInfo(AllAppsGridAdapter.AdapterItemWithPayload<String> adapterItem) {
+        String title = adapterItem.getPayload();
+        if (title == null || !title.isEmpty()) {
+            setText(title);
+            setVisibility(VISIBLE);
+        } else {
+            setVisibility(INVISIBLE);
+        }
+    }
+}
-- 
GitLab


From 1fbab3ad2ccb61024611dd7bde282f6a5f19f4e8 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 18 Aug 2020 15:12:56 -0700
Subject: [PATCH 0103/1664] Update worksace page indicator during HINT_STATE
 transition

Test: Scroll to workspace page 2, then swipe up from the nav bar;
ensure that the page indicator fades in and scrolls to page 1

Change-Id: Ie0157c8e67b94509d3817f7e160d26f505185bbb
---
 src/com/android/launcher3/Workspace.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 3be9ac7e07..6bfd3495e5 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -22,6 +22,7 @@ import static com.android.launcher3.LauncherState.ALL_APPS;
 import static com.android.launcher3.LauncherState.FLAG_MULTI_PAGE;
 import static com.android.launcher3.LauncherState.FLAG_WORKSPACE_ICONS_CAN_BE_DRAGGED;
 import static com.android.launcher3.LauncherState.FLAG_WORKSPACE_INACCESSIBLE;
+import static com.android.launcher3.LauncherState.HINT_STATE;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.SPRING_LOADED;
@@ -943,7 +944,10 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         super.onScrollChanged(l, t, oldl, oldt);
 
         // Update the page indicator progress.
-        boolean isTransitioning = mIsSwitchingState
+        // Unlike from other states, we show the page indicator when transitioning from HINT_STATE.
+        boolean isSwitchingState = mIsSwitchingState
+                && mLauncher.getStateManager().getCurrentStableState() != HINT_STATE;
+        boolean isTransitioning = isSwitchingState
                 || (getLayoutTransition() != null && getLayoutTransition().isRunning());
         if (!isTransitioning) {
             showPageIndicatorAtCurrentScroll();
-- 
GitLab


From b9f9d69f678d5bdb948d293ebc308adf804430f8 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Wed, 19 Aug 2020 00:58:34 -0700
Subject: [PATCH 0104/1664] Hide IME when scrolling happens on all apps
 screen/scroller

Bug: 161594550

TL;DR;;
- draging an item closes the IME
- clearing a searchbox to empty string has no effect on IME

Change-Id: Ic3a91d1b22434dcb78347dd8b12b5ceab14eb928
---
 .../android/launcher3/ExtendedEditText.java   |  5 +++++
 .../allapps/AllAppsContainerView.java         | 21 +++++++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/ExtendedEditText.java b/src/com/android/launcher3/ExtendedEditText.java
index d64967b75e..02c61620fe 100644
--- a/src/com/android/launcher3/ExtendedEditText.java
+++ b/src/com/android/launcher3/ExtendedEditText.java
@@ -24,6 +24,7 @@ import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.util.UiThreadHelper;
 
 
@@ -130,6 +131,10 @@ public class ExtendedEditText extends EditText {
     public void reset() {
         if (!TextUtils.isEmpty(getText())) {
             setText("");
+        } else {
+            if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
+                return;
+            }
         }
         if (isFocused()) {
             View nextFocus = focusSearch(View.FOCUS_DOWN);
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index af3722a1f8..21ee494542 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -42,6 +42,7 @@ import android.view.WindowInsets;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
+import androidx.core.os.BuildCompat;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -108,7 +109,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
 
     private final MultiValueAlpha mMultiValueAlpha;
 
-    Rect mInsets = new Rect();
+    private Rect mInsets = new Rect();
 
     public AllAppsContainerView(Context context) {
         this(context, null);
@@ -204,6 +205,17 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         mAH[AdapterHolder.WORK].applyPadding();
     }
 
+    private void hideInput() {
+        if (!BuildCompat.isAtLeastR() || !FeatureFlags.ENABLE_DEVICE_SEARCH.get()) return;
+
+        WindowInsets insets = getRootWindowInsets();
+        if (insets == null) return;
+
+        if (insets.isVisible(WindowInsets.Type.ime())) {
+            getWindowInsetsController().hide(WindowInsets.Type.ime());
+        }
+    }
+
     /**
      * Returns whether the view itself will handle the touch event or not.
      */
@@ -219,9 +231,14 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         }
         if (rv.getScrollbar().getThumbOffsetY() >= 0 &&
                 mLauncher.getDragLayer().isEventOverView(rv.getScrollbar(), ev)) {
+            hideInput();
             return false;
         }
-        return rv.shouldContainerScroll(ev, mLauncher.getDragLayer());
+        boolean shouldScroll = rv.shouldContainerScroll(ev, mLauncher.getDragLayer());
+        if (shouldScroll) {
+            hideInput();
+        }
+        return shouldScroll;
     }
 
     @Override
-- 
GitLab


From 63d327442cf178dafab9d93a2e3ef02ff25ccc20 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 19 Aug 2020 17:00:20 -0700
Subject: [PATCH 0105/1664] Disabling notification dots for Launcher3Go

Bug: 164457095
Change-Id: If751719a698785957d37b4656a0132d2b56b64f9
---
 go/AndroidManifest.xml                                      | 6 ++++++
 go/src/com/android/launcher3/model/WidgetsModel.java        | 1 +
 src/com/android/launcher3/settings/SettingsActivity.java    | 5 +++++
 .../com/android/launcher3/model/WidgetsModel.java           | 1 +
 4 files changed, 13 insertions(+)

diff --git a/go/AndroidManifest.xml b/go/AndroidManifest.xml
index f84a82eaa2..f36439db53 100644
--- a/go/AndroidManifest.xml
+++ b/go/AndroidManifest.xml
@@ -46,6 +46,12 @@
             tools:node="replace" >
         </activity>
 
+        <service
+            android:name="com.android.launcher3.notification.NotificationListener"
+            android:label="@string/notification_dots_service_title"
+            android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"
+            android:enabled="false"
+            tools:node="replace" />
     </application>
 
 </manifest>
diff --git a/go/src/com/android/launcher3/model/WidgetsModel.java b/go/src/com/android/launcher3/model/WidgetsModel.java
index 3b3dc0196c..89b3831564 100644
--- a/go/src/com/android/launcher3/model/WidgetsModel.java
+++ b/go/src/com/android/launcher3/model/WidgetsModel.java
@@ -41,6 +41,7 @@ public class WidgetsModel {
 
     // True is the widget support is disabled.
     public static final boolean GO_DISABLE_WIDGETS = true;
+    public static final boolean GO_DISABLE_NOTIFICATION_DOTS = true;
 
     private static final ArrayList<WidgetListRowEntry> EMPTY_WIDGET_LIST = new ArrayList<>();
 
diff --git a/src/com/android/launcher3/settings/SettingsActivity.java b/src/com/android/launcher3/settings/SettingsActivity.java
index ec3a467224..922425fca1 100644
--- a/src/com/android/launcher3/settings/SettingsActivity.java
+++ b/src/com/android/launcher3/settings/SettingsActivity.java
@@ -44,6 +44,7 @@ import com.android.launcher3.LauncherFiles;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
+import com.android.launcher3.model.WidgetsModel;
 import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
 import com.android.launcher3.util.SecureSettingsObserver;
 
@@ -171,6 +172,10 @@ public class SettingsActivity extends FragmentActivity
         protected boolean initPreference(Preference preference) {
             switch (preference.getKey()) {
                 case NOTIFICATION_DOTS_PREFERENCE_KEY:
+                    if (WidgetsModel.GO_DISABLE_NOTIFICATION_DOTS) {
+                        return false;
+                    }
+
                     // Listen to system notification dot settings while this UI is active.
                     mNotificationDotsObserver = newNotificationSettingsObserver(
                             getActivity(), (NotificationDotsPreference) preference);
diff --git a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
index 9d877881ec..a64df62c3b 100644
--- a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
+++ b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
@@ -51,6 +51,7 @@ public class WidgetsModel {
 
     // True is the widget support is disabled.
     public static final boolean GO_DISABLE_WIDGETS = false;
+    public static final boolean GO_DISABLE_NOTIFICATION_DOTS = false;
 
     private static final String TAG = "WidgetsModel";
     private static final boolean DEBUG = false;
-- 
GitLab


From 104c9d1206661b27d1ac4485de1bbb1cdcf4c898 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 12 Aug 2020 14:38:23 -0700
Subject: [PATCH 0106/1664] Using persisted item storage for install queue.

Shared prefs are loaded during startup and should avoid large objects

Change-Id: Ibb5c8307dbccb9414b42454825e6c3c2a972efa6
---
 .../android/launcher3/model/BgDataModel.java  |   3 +-
 .../launcher3/model/ItemInstallQueue.java     | 203 ++++++------------
 .../launcher3/util/PersistedItemArray.java    |  14 +-
 3 files changed, 73 insertions(+), 147 deletions(-)

diff --git a/src/com/android/launcher3/model/BgDataModel.java b/src/com/android/launcher3/model/BgDataModel.java
index 7e45021bf3..cf3251416e 100644
--- a/src/com/android/launcher3/model/BgDataModel.java
+++ b/src/com/android/launcher3/model/BgDataModel.java
@@ -297,8 +297,7 @@ public class BgDataModel {
                         .filter(wi -> wi.itemType == Favorites.ITEM_TYPE_DEEP_SHORTCUT)
                         .map(ShortcutKey::fromItemInfo),
                     // Pending shortcuts
-                    ItemInstallQueue.INSTANCE.get(context).getPendingShortcuts()
-                        .stream().filter(si -> si.user.equals(user)))
+                    ItemInstallQueue.INSTANCE.get(context).getPendingShortcuts(user))
                 .collect(groupingBy(ShortcutKey::getPackageName,
                         mapping(ShortcutKey::getId, Collectors.toSet())));
 
diff --git a/src/com/android/launcher3/model/ItemInstallQueue.java b/src/com/android/launcher3/model/ItemInstallQueue.java
index 6238db3152..5e48a0ff2e 100644
--- a/src/com/android/launcher3/model/ItemInstallQueue.java
+++ b/src/com/android/launcher3/model/ItemInstallQueue.java
@@ -21,7 +21,6 @@ import static android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID;
 import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
 import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET;
 import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT;
-import static com.android.launcher3.LauncherSettings.Favorites.PROFILE_ID;
 import static com.android.launcher3.model.data.AppInfo.makeLaunchIntent;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
@@ -30,11 +29,9 @@ import android.appwidget.AppWidgetProviderInfo;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.pm.LauncherActivityInfo;
 import android.content.pm.LauncherApps;
 import android.content.pm.ShortcutInfo;
-import android.os.Process;
 import android.os.UserHandle;
 import android.util.Log;
 import android.util.Pair;
@@ -47,27 +44,19 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.LauncherSettings.Favorites;
-import com.android.launcher3.Utilities;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
-import com.android.launcher3.pm.UserCache;
 import com.android.launcher3.shortcuts.ShortcutKey;
 import com.android.launcher3.shortcuts.ShortcutRequest;
 import com.android.launcher3.util.MainThreadInitializedObject;
+import com.android.launcher3.util.PersistedItemArray;
 import com.android.launcher3.util.Preconditions;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.json.JSONStringer;
-
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * Class to maintain a queue of pending items to be added to the workspace.
@@ -79,7 +68,6 @@ public class ItemInstallQueue {
     public static final int FLAG_DRAG_AND_DROP = 4;
 
     private static final String TAG = "InstallShortcutReceiver";
-    private static final boolean DBG = false;
 
     // The set of shortcuts that are pending install
     private static final String APPS_PENDING_INSTALL = "apps_to_install";
@@ -90,24 +78,34 @@ public class ItemInstallQueue {
     public static MainThreadInitializedObject<ItemInstallQueue> INSTANCE =
             new MainThreadInitializedObject<>(ItemInstallQueue::new);
 
+    private final PersistedItemArray<PendingInstallShortcutInfo> mStorage =
+            new PersistedItemArray<>(APPS_PENDING_INSTALL);
     private final Context mContext;
 
     // Determines whether to defer installing shortcuts immediately until
     // processAllPendingInstalls() is called.
     private int mInstallQueueDisabledFlags = 0;
 
+    // Only accessed on worker thread
+    private List<PendingInstallShortcutInfo> mItems;
+
     private ItemInstallQueue(Context context) {
         mContext = context;
     }
 
+    @WorkerThread
+    private void ensureQueueLoaded() {
+        Preconditions.assertWorkerThread();
+        if (mItems == null) {
+            mItems = mStorage.read(mContext, this::decode);
+        }
+    }
+
     @WorkerThread
     private void addToQueue(PendingInstallShortcutInfo info) {
-        String encoded = info.encodeToString(mContext);
-        SharedPreferences prefs = Utilities.getPrefs(mContext);
-        Set<String> strings = prefs.getStringSet(APPS_PENDING_INSTALL, null);
-        strings = (strings != null) ? new HashSet<>(strings) : new HashSet<>(1);
-        strings.add(encoded);
-        prefs.edit().putStringSet(APPS_PENDING_INSTALL, strings).apply();
+        ensureQueueLoaded();
+        mItems.add(info);
+        mStorage.write(mContext, mItems);
     }
 
     @WorkerThread
@@ -117,28 +115,21 @@ public class ItemInstallQueue {
             // Launcher not loaded
             return;
         }
-
-        ArrayList<Pair<ItemInfo, Object>> installQueue = new ArrayList<>();
-        SharedPreferences prefs = Utilities.getPrefs(mContext);
-        Set<String> strings = prefs.getStringSet(APPS_PENDING_INSTALL, null);
-        if (DBG) Log.d(TAG, "Getting and clearing APPS_PENDING_INSTALL: " + strings);
-        if (strings == null) {
+        ensureQueueLoaded();
+        if (mItems.isEmpty()) {
             return;
         }
 
-        for (String encoded : strings) {
-            PendingInstallShortcutInfo info = decode(encoded, mContext);
-            if (info == null) {
-                continue;
-            }
+        List<Pair<ItemInfo, Object>> installQueue = mItems.stream()
+                .map(info -> info.getItemInfo(mContext))
+                .collect(Collectors.toList());
 
-            // Generate a shortcut info to add into the model
-            installQueue.add(info.getItemInfo(mContext));
-        }
-        prefs.edit().remove(APPS_PENDING_INSTALL).apply();
+        // Add the items and clear queue
         if (!installQueue.isEmpty()) {
             launcher.getModel().addAndBindAddedWorkspaceItems(installQueue);
         }
+        mItems.clear();
+        mStorage.getFile(mContext).delete();
     }
 
     /**
@@ -149,33 +140,11 @@ public class ItemInstallQueue {
         if (packageNames.isEmpty()) {
             return;
         }
-        Preconditions.assertWorkerThread();
-
-        SharedPreferences sp = Utilities.getPrefs(mContext);
-        Set<String> strings = sp.getStringSet(APPS_PENDING_INSTALL, null);
-        if (DBG) {
-            Log.d(TAG, "APPS_PENDING_INSTALL: " + strings
-                    + ", removing packages: " + packageNames);
-        }
-        if (strings == null || ((Collection) strings).isEmpty()) {
-            return;
-        }
-        Set<String> newStrings = new HashSet<>(strings);
-        Iterator<String> newStringsIter = newStrings.iterator();
-        while (newStringsIter.hasNext()) {
-            String encoded = newStringsIter.next();
-            try {
-                Decoder decoder = new Decoder(encoded, mContext);
-                if (packageNames.contains(getIntentPackage(decoder.intent))
-                        && user.equals(decoder.user)) {
-                    newStringsIter.remove();
-                }
-            } catch (JSONException | URISyntaxException e) {
-                Log.d(TAG, "Exception reading shortcut to add: " + e);
-                newStringsIter.remove();
-            }
+        ensureQueueLoaded();
+        if (mItems.removeIf(item ->
+                item.user.equals(user) && packageNames.contains(getIntentPackage(item.intent)))) {
+            mStorage.write(mContext, mItems);
         }
-        sp.edit().putStringSet(APPS_PENDING_INSTALL, newStrings).apply();
     }
 
     /**
@@ -200,28 +169,14 @@ public class ItemInstallQueue {
     }
 
     /**
-     * Returns all pending shorts in the queue
+     * Returns a stream of all pending shortcuts in the queue
      */
     @WorkerThread
-    public HashSet<ShortcutKey> getPendingShortcuts() {
-        HashSet<ShortcutKey> result = new HashSet<>();
-
-        Set<String> strings = Utilities.getPrefs(mContext).getStringSet(APPS_PENDING_INSTALL, null);
-        if (strings == null || ((Collection) strings).isEmpty()) {
-            return result;
-        }
-
-        for (String encoded : strings) {
-            try {
-                Decoder decoder = new Decoder(encoded, mContext);
-                if (decoder.optInt(Favorites.ITEM_TYPE, -1) == ITEM_TYPE_DEEP_SHORTCUT) {
-                    result.add(ShortcutKey.fromIntent(decoder.intent, decoder.user));
-                }
-            } catch (JSONException | URISyntaxException e) {
-                Log.d(TAG, "Exception reading shortcut to add: " + e);
-            }
-        }
-        return result;
+    public Stream<ShortcutKey> getPendingShortcuts(UserHandle user) {
+        ensureQueueLoaded();
+        return mItems.stream()
+                .filter(item -> item.itemType == ITEM_TYPE_DEEP_SHORTCUT && user.equals(item.user))
+                .map(item -> ShortcutKey.fromIntent(item.intent, user));
     }
 
     private void queuePendingShortcutInfo(PendingInstallShortcutInfo info) {
@@ -293,19 +248,9 @@ public class ItemInstallQueue {
             providerInfo = info;
         }
 
-        public String encodeToString(Context context) {
-            try {
-                return new JSONStringer()
-                        .object()
-                        .key(Favorites.ITEM_TYPE).value(itemType)
-                        .key(Favorites.INTENT).value(intent.toUri(0))
-                        .key(PROFILE_ID).value(
-                                UserCache.INSTANCE.get(context).getSerialNumberForUser(user))
-                        .endObject().toString();
-            } catch (JSONException e) {
-                Log.d(TAG, "Exception when adding shortcut: " + e);
-                return null;
-            }
+        @Override
+        public Intent getIntent() {
+            return intent;
         }
 
         public Pair<ItemInfo, Object> getItemInfo(Context context) {
@@ -365,55 +310,33 @@ public class ItemInstallQueue {
                 ? intent.getPackage() : intent.getComponent().getPackageName();
     }
 
-    private static PendingInstallShortcutInfo decode(String encoded, Context context) {
-        try {
-            Decoder decoder = new Decoder(encoded, context);
-            switch (decoder.optInt(Favorites.ITEM_TYPE, -1)) {
-                case Favorites.ITEM_TYPE_APPLICATION:
-                    return new PendingInstallShortcutInfo(
-                            decoder.intent.getPackage(), decoder.user);
-                case Favorites.ITEM_TYPE_DEEP_SHORTCUT: {
-                    List<ShortcutInfo> si = ShortcutKey.fromIntent(decoder.intent, decoder.user)
-                            .buildRequest(context)
-                            .query(ShortcutRequest.ALL);
-                    if (si.isEmpty()) {
-                        return null;
-                    } else {
-                        return new PendingInstallShortcutInfo(si.get(0));
-                    }
+    private PendingInstallShortcutInfo decode(int itemType, UserHandle user, Intent intent) {
+        switch (itemType) {
+            case Favorites.ITEM_TYPE_APPLICATION:
+                return new PendingInstallShortcutInfo(intent.getPackage(), user);
+            case Favorites.ITEM_TYPE_DEEP_SHORTCUT: {
+                List<ShortcutInfo> si = ShortcutKey.fromIntent(intent, user)
+                        .buildRequest(mContext)
+                        .query(ShortcutRequest.ALL);
+                if (si.isEmpty()) {
+                    return null;
+                } else {
+                    return new PendingInstallShortcutInfo(si.get(0));
                 }
-                case Favorites.ITEM_TYPE_APPWIDGET: {
-                    int widgetId = decoder.intent.getIntExtra(EXTRA_APPWIDGET_ID, 0);
-                    AppWidgetProviderInfo info =
-                            AppWidgetManager.getInstance(context).getAppWidgetInfo(widgetId);
-                    if (info == null || !info.provider.equals(decoder.intent.getComponent())
-                            || !info.getProfile().equals(decoder.user)) {
-                        return null;
-                    }
-                    return new PendingInstallShortcutInfo(info, widgetId);
+            }
+            case Favorites.ITEM_TYPE_APPWIDGET: {
+                int widgetId = intent.getIntExtra(EXTRA_APPWIDGET_ID, 0);
+                AppWidgetProviderInfo info =
+                        AppWidgetManager.getInstance(mContext).getAppWidgetInfo(widgetId);
+                if (info == null || !info.provider.equals(intent.getComponent())
+                        || !info.getProfile().equals(user)) {
+                    return null;
                 }
-                default:
-                    Log.e(TAG, "Unknown item type");
+                return new PendingInstallShortcutInfo(info, widgetId);
             }
-        } catch (JSONException | URISyntaxException e) {
-            Log.d(TAG, "Exception reading shortcut to add: " + e);
+            default:
+                Log.e(TAG, "Unknown item type");
         }
         return null;
     }
-
-    private static class Decoder extends JSONObject {
-        public final Intent intent;
-        public final UserHandle user;
-
-        private Decoder(String encoded, Context context) throws JSONException, URISyntaxException {
-            super(encoded);
-            intent = Intent.parseUri(getString(Favorites.INTENT), 0);
-            user = has(PROFILE_ID)
-                    ? UserCache.INSTANCE.get(context).getUserForSerialNumber(getLong(PROFILE_ID))
-                    : Process.myUserHandle();
-            if (user == null || intent == null) {
-                throw new JSONException("Invalid data");
-            }
-        }
-    }
 }
diff --git a/src/com/android/launcher3/util/PersistedItemArray.java b/src/com/android/launcher3/util/PersistedItemArray.java
index ae20638e31..7ff2abb8a6 100644
--- a/src/com/android/launcher3/util/PersistedItemArray.java
+++ b/src/com/android/launcher3/util/PersistedItemArray.java
@@ -68,8 +68,7 @@ public class PersistedItemArray<T extends ItemInfo> {
      */
     @WorkerThread
     public void write(Context context, List<T> items) {
-        AtomicFile file = new AtomicFile(context.getFileStreamPath(mFileName));
-
+        AtomicFile file = getFile(context);
         FileOutputStream fos;
         try {
             fos = file.startWrite();
@@ -124,9 +123,7 @@ public class PersistedItemArray<T extends ItemInfo> {
     @WorkerThread
     public List<T> read(Context context, ItemFactory<T> factory, LongFunction<UserHandle> userFn) {
         List<T> result = new ArrayList<>();
-        AtomicFile file = new AtomicFile(context.getFileStreamPath(mFileName));
-
-        try (FileInputStream fis = file.openRead()) {
+        try (FileInputStream fis = getFile(context).openRead()) {
             XmlPullParser parser = Xml.newPullParser();
             parser.setInput(new InputStreamReader(fis, StandardCharsets.UTF_8));
 
@@ -166,6 +163,13 @@ public class PersistedItemArray<T extends ItemInfo> {
         return result;
     }
 
+    /**
+     * Returns the underlying file used for persisting data
+     */
+    public AtomicFile getFile(Context context) {
+        return new AtomicFile(context.getFileStreamPath(mFileName));
+    }
+
     /**
      * Interface to create an ItemInfo during parsing
      */
-- 
GitLab


From 5af9c3537da7f14ecd91b7976f902a8360d1c48f Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 19 Aug 2020 17:21:53 -0700
Subject: [PATCH 0107/1664] Allow swipe up to go home from overivew during task
 dismiss animation

Test: go to overview, dismiss a task, swipe up to go home during the
transition (easier to try with animation duraation scaled up)

Bug: 144170434
Change-Id: I28b846b43260179aeac877351a7069743f66f3ea
---
 .../touchcontrollers/TaskViewTouchController.java    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
index 3586b4f183..df6194d4b2 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
@@ -82,7 +82,15 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
         mDetector = new SingleAxisSwipeDetector(activity, this, dir);
     }
 
-    private boolean canInterceptTouch() {
+    private boolean canInterceptTouch(MotionEvent ev) {
+        if ((ev.getEdgeFlags() & Utilities.EDGE_NAV_BAR) != 0) {
+            // Don't intercept swipes on the nav bar, as user might be trying to go home
+            // during a task dismiss animation.
+            if (mCurrentAnimation != null) {
+                mCurrentAnimation.getAnimationPlayer().end();
+            }
+            return false;
+        }
         if (mCurrentAnimation != null) {
             mCurrentAnimation.forceFinishIfCloseToEnd();
         }
@@ -118,7 +126,7 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
             clearState();
         }
         if (ev.getAction() == MotionEvent.ACTION_DOWN) {
-            mNoIntercept = !canInterceptTouch();
+            mNoIntercept = !canInterceptTouch(ev);
             if (mNoIntercept) {
                 return false;
             }
-- 
GitLab


From b176dc99b225e8562c04d69b9cea99d1553f0bc3 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 12 Aug 2020 13:28:24 -0700
Subject: [PATCH 0108/1664] Set new scrimMultiplier instead of scrimProgress
 for overview -> home

Animating this new property allows us to adjust the scrim without
competing with other state animations that could be setting the
scrim progress. Also reset scrimMultipler = 1 for state transitions.

Test: Swipe from home to overview, then during that transition swipe
from overview to home; when the former transition ends while the
second is still in progress, ensure scrim value doesn't jump

Bug: 144170434
Change-Id: I44b57ced1c6902e558fe1818bcbf11ceb4ff2f6f
---
 .../BaseRecentsViewStateController.java       |  4 +++
 .../NavBarToHomeTouchController.java          | 12 ++++----
 .../launcher3/graphics/OverviewScrim.java     | 28 +++++++++++++++++++
 src/com/android/launcher3/graphics/Scrim.java |  6 +++-
 4 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
index 1b8e244ac1..aad7e17df0 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
@@ -18,6 +18,7 @@ package com.android.launcher3.uioverrides;
 
 import static com.android.launcher3.anim.Interpolators.AGGRESSIVE_EASE_IN_OUT;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
+import static com.android.launcher3.graphics.OverviewScrim.SCRIM_MULTIPLIER;
 import static com.android.launcher3.graphics.Scrim.SCRIM_PROGRESS;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_MODAL;
@@ -70,6 +71,7 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView>
         getContentAlphaProperty().set(mRecentsView, state.overviewUi ? 1f : 0);
         OverviewScrim scrim = mLauncher.getDragLayer().getOverviewScrim();
         SCRIM_PROGRESS.set(scrim, state.getOverviewScrimAlpha(mLauncher));
+        SCRIM_MULTIPLIER.set(scrim, 1f);
         getTaskModalnessProperty().set(mRecentsView, state.getOverviewModalness());
     }
 
@@ -108,6 +110,8 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView>
         OverviewScrim scrim = mLauncher.getDragLayer().getOverviewScrim();
         setter.setFloat(scrim, SCRIM_PROGRESS, toState.getOverviewScrimAlpha(mLauncher),
                 config.getInterpolator(ANIM_OVERVIEW_SCRIM_FADE, LINEAR));
+        setter.setFloat(scrim, SCRIM_MULTIPLIER, 1f,
+                config.getInterpolator(ANIM_OVERVIEW_SCRIM_FADE, LINEAR));
 
         setter.setFloat(
                 mRecentsView, getTaskModalnessProperty(),
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
index 57fd11a174..da3c4858a8 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
@@ -66,8 +66,8 @@ public class NavBarToHomeTouchController implements TouchController,
         SingleAxisSwipeDetector.Listener {
 
     private static final Interpolator PULLBACK_INTERPOLATOR = DEACCEL_3;
-    // How much of the overview scrim we can remove during the transition.
-    private static final float OVERVIEW_TO_HOME_SCRIM_PROGRESS = 0.5f;
+    // The min amount of overview scrim we keep during the transition.
+    private static final float OVERVIEW_TO_HOME_SCRIM_MULTIPLIER = 0.5f;
 
     private final Launcher mLauncher;
     private final SingleAxisSwipeDetector mSwipeDetector;
@@ -163,11 +163,11 @@ public class NavBarToHomeTouchController implements TouchController,
             RecentsView recentsView = mLauncher.getOverviewPanel();
             AnimatorControllerWithResistance.createRecentsResistanceFromOverviewAnim(mLauncher,
                     builder);
-            float endScrimAlpha = Utilities.mapRange(OVERVIEW_TO_HOME_SCRIM_PROGRESS,
-                    mStartState.getOverviewScrimAlpha(mLauncher),
-                    mEndState.getOverviewScrimAlpha(mLauncher));
+
             builder.setFloat(mLauncher.getDragLayer().getOverviewScrim(),
-                    OverviewScrim.SCRIM_PROGRESS, endScrimAlpha, PULLBACK_INTERPOLATOR);
+                    OverviewScrim.SCRIM_MULTIPLIER, OVERVIEW_TO_HOME_SCRIM_MULTIPLIER,
+                    PULLBACK_INTERPOLATOR);
+
             if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
                 builder.addOnFrameCallback(recentsView::redrawLiveTile);
             }
diff --git a/src/com/android/launcher3/graphics/OverviewScrim.java b/src/com/android/launcher3/graphics/OverviewScrim.java
index 94acbfdcca..c0c3e5e9c2 100644
--- a/src/com/android/launcher3/graphics/OverviewScrim.java
+++ b/src/com/android/launcher3/graphics/OverviewScrim.java
@@ -22,6 +22,7 @@ import static com.android.launcher3.LauncherState.HOTSEAT_ICONS;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 
 import android.graphics.Rect;
+import android.util.FloatProperty;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -33,10 +34,25 @@ import androidx.annotation.Nullable;
  */
 public class OverviewScrim extends Scrim {
 
+    public static final FloatProperty<OverviewScrim> SCRIM_MULTIPLIER =
+            new FloatProperty<OverviewScrim>("scrimMultiplier") {
+                @Override
+                public Float get(OverviewScrim scrim) {
+                    return scrim.mScrimMultiplier;
+                }
+
+                @Override
+                public void setValue(OverviewScrim scrim, float v) {
+                    scrim.setScrimMultiplier(v);
+                }
+            };
+
     private @NonNull View mStableScrimmedView;
     // Might be higher up if mStableScrimmedView is invisible.
     private @Nullable View mCurrentScrimmedView;
 
+    private float mScrimMultiplier = 1f;
+
     public OverviewScrim(View view) {
         super(view);
         mStableScrimmedView = mCurrentScrimmedView = mLauncher.getOverviewPanel();
@@ -68,4 +84,16 @@ public class OverviewScrim extends Scrim {
     public @Nullable View getScrimmedView() {
         return mCurrentScrimmedView;
     }
+
+    private void setScrimMultiplier(float scrimMultiplier) {
+        if (Float.compare(mScrimMultiplier, scrimMultiplier) != 0) {
+            mScrimMultiplier = scrimMultiplier;
+            invalidate();
+        }
+    }
+
+    @Override
+    protected int getScrimAlpha() {
+        return Math.round(super.getScrimAlpha() * mScrimMultiplier);
+    }
 }
diff --git a/src/com/android/launcher3/graphics/Scrim.java b/src/com/android/launcher3/graphics/Scrim.java
index f90962d5d1..a151cba47d 100644
--- a/src/com/android/launcher3/graphics/Scrim.java
+++ b/src/com/android/launcher3/graphics/Scrim.java
@@ -61,7 +61,11 @@ public class Scrim implements View.OnAttachStateChangeListener,
     }
 
     public void draw(Canvas canvas) {
-        canvas.drawColor(setColorAlphaBound(mScrimColor, mScrimAlpha));
+        canvas.drawColor(setColorAlphaBound(mScrimColor, getScrimAlpha()));
+    }
+
+    protected int getScrimAlpha() {
+        return mScrimAlpha;
     }
 
     private void setScrimProgress(float progress) {
-- 
GitLab


From f26954292941cd49637889752d423090d644355a Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Wed, 19 Aug 2020 21:24:07 -0700
Subject: [PATCH 0109/1664] Remove USER_EVENT_DISPATCHER feature flag Bug:
 165675920

Change-Id: I56fc4833f7e83dc2babffdb1f7c17c7ba39558a8
---
 src/com/android/launcher3/config/FeatureFlags.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 37d2d402cb..d8fca1da5e 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -174,9 +174,6 @@ public final class FeatureFlags {
             "SEPARATE_RECENTS_ACTIVITY", false,
             "Uses a separate recents activity instead of using the integrated recents+Launcher UI");
 
-    public static final BooleanFlag USER_EVENT_DISPATCHER = new DeviceFlag(
-            "USER_EVENT_DISPATCHER", true, "User event dispatcher collects logs.");
-
     public static final BooleanFlag ENABLE_MINIMAL_DEVICE = new DeviceFlag(
             "ENABLE_MINIMAL_DEVICE", false,
             "Allow user to toggle minimal device mode in launcher.");
-- 
GitLab


From 43ad0c2e0b739b6fa805e008d4ac023ea8316006 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 19 Aug 2020 16:47:05 -0700
Subject: [PATCH 0110/1664] Prevent crash when display is already removed by
 the time we get displayAdded

Bug: 165165662
Change-Id: I5486b17a0a7235c922c4b5ebfa2cdc39303a8243
---
 .../launcher3/util/DisplayController.java     | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/com/android/launcher3/util/DisplayController.java b/src/com/android/launcher3/util/DisplayController.java
index e5c84418c6..355c949325 100644
--- a/src/com/android/launcher3/util/DisplayController.java
+++ b/src/com/android/launcher3/util/DisplayController.java
@@ -50,7 +50,7 @@ public class DisplayController implements DisplayListener {
     private final ArrayList<DisplayListChangeListener> mListListeners = new ArrayList<>();
 
     private DisplayController(Context context) {
-        mDefaultDisplay = new DisplayHolder(context, DEFAULT_DISPLAY);
+        mDefaultDisplay = DisplayHolder.create(context, DEFAULT_DISPLAY);
 
         DisplayManager dm = context.getSystemService(DisplayManager.class);
         dm.registerDisplayListener(this, UI_HELPER_EXECUTOR.getHandler());
@@ -58,7 +58,11 @@ public class DisplayController implements DisplayListener {
 
     @Override
     public final void onDisplayAdded(int displayId) {
-        DisplayHolder holder = new DisplayHolder(mDefaultDisplay.mDisplayContext, displayId);
+        DisplayHolder holder = DisplayHolder.create(mDefaultDisplay.mDisplayContext, displayId);
+        if (holder == null) {
+            // Display is already removed by the time we dot this.
+            return;
+        }
         synchronized (mOtherDisplays) {
             mOtherDisplays.put(displayId, holder);
         }
@@ -153,12 +157,8 @@ public class DisplayController implements DisplayListener {
         private final ArrayList<DisplayInfoChangeListener> mListeners = new ArrayList<>();
         private DisplayController.Info mInfo;
 
-        public DisplayHolder(Context context, int id) {
-            DisplayManager dm = context.getSystemService(DisplayManager.class);
-            // Use application context to create display context so that it can have its own
-            // Resources.
-            mDisplayContext = context.getApplicationContext()
-                    .createDisplayContext(dm.getDisplay(id));
+        private DisplayHolder(Context displayContext) {
+            mDisplayContext = displayContext;
             // Note that the Display object must be obtained from DisplayManager which is
             // associated to the display context, so the Display is isolated from Activity and
             // Application to provide the actual state of device that excludes the additional
@@ -207,6 +207,17 @@ public class DisplayController implements DisplayListener {
             }
         }
 
+        private static DisplayHolder create(Context context, int id) {
+            DisplayManager dm = context.getSystemService(DisplayManager.class);
+            Display display = dm.getDisplay(id);
+            if (display == null) {
+                return null;
+            }
+            // Use application context to create display context so that it can have its own
+            // Resources.
+            Context displayContext = context.getApplicationContext().createDisplayContext(display);
+            return new DisplayHolder(displayContext);
+        }
     }
 
     public static class Info {
-- 
GitLab


From af8516254ed50e4c1c3d1db198344b4439e1aa5e Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Fri, 21 Aug 2020 23:44:20 -0700
Subject: [PATCH 0111/1664] Get rid of grid options pref

Missed this one last time

Test: N/A
Change-Id: I7ecfa72f2f358342ea9f8296cdc5d0187498426b
---
 res/xml/launcher_preferences.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/res/xml/launcher_preferences.xml b/res/xml/launcher_preferences.xml
index 3455cb8661..7e7220813a 100644
--- a/res/xml/launcher_preferences.xml
+++ b/res/xml/launcher_preferences.xml
@@ -44,12 +44,6 @@
         android:defaultValue="@bool/allow_rotation"
         android:persistent="true" />
 
-    <SwitchPreference
-        android:key="pref_grid_options"
-        android:title="Enable grid options"
-        android:defaultValue="false"
-        android:persistent="true" />
-
     <androidx.preference.PreferenceScreen
         android:key="pref_developer_options"
         android:persistent="false"
-- 
GitLab


From b5493b90bc9412a79b6774972a79264b635c2b6c Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 24 Aug 2020 16:24:34 -0700
Subject: [PATCH 0112/1664] Fix a couple issues with overview to home
 transition

- In fake portrait, fade out instead of translating offscreen, as
  the orientation doesn't map to where RecentsView actually lives
- From OverviewModalTaskState, start from > 1 scale, and use
  OverviewToHomeAnim (to ensure RecentsView doesn't fade out etc)
  - To keep parameter list sane, added RecentsParams to
    AnimatorControllerWithResistance which has the new startScale
    (set to current scale for modal state) and renames the old
    RecentsParams to RecentsResistanceParams. Sorry if that's
    confusing.

Bug: 144170434
Change-Id: I437f0d18cad4c94feea25954aed3390acedcaed5
---
 .../NavBarToHomeTouchController.java          |   3 +-
 .../AnimatorControllerWithResistance.java     | 133 +++++++++++++-----
 .../quickstep/util/OverviewToHomeAnim.java    |   9 +-
 3 files changed, 105 insertions(+), 40 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
index da3c4858a8..e3d949851d 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
@@ -19,7 +19,6 @@ import static com.android.launcher3.AbstractFloatingView.TYPE_ALL;
 import static com.android.launcher3.AbstractFloatingView.TYPE_ALL_APPS_EDU;
 import static com.android.launcher3.LauncherState.ALL_APPS;
 import static com.android.launcher3.LauncherState.NORMAL;
-import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_ALL_APPS_EDU;
@@ -221,7 +220,7 @@ public class NavBarToHomeTouchController implements TouchController,
                 recentsView.switchToScreenshot(null,
                         () -> recentsView.finishRecentsAnimation(true /* toRecents */, null));
             }
-            if (mStartState == OVERVIEW) {
+            if (mStartState.overviewUi) {
                 new OverviewToHomeAnim(mLauncher, () -> onSwipeInteractionCompleted(mEndState))
                         .animateWithVelocity(velocity);
             } else {
diff --git a/quickstep/src/com/android/quickstep/util/AnimatorControllerWithResistance.java b/quickstep/src/com/android/quickstep/util/AnimatorControllerWithResistance.java
index a19a67c8fc..deb70e0f8b 100644
--- a/quickstep/src/com/android/quickstep/util/AnimatorControllerWithResistance.java
+++ b/quickstep/src/com/android/quickstep/util/AnimatorControllerWithResistance.java
@@ -31,11 +31,12 @@ import android.util.FloatProperty;
 
 import androidx.annotation.Nullable;
 
-import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.Launcher;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
+import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.quickstep.LauncherActivityInterface;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.views.RecentsView;
@@ -54,11 +55,12 @@ public class AnimatorControllerWithResistance {
      */
     public static final float TWO_BUTTON_EXTRA_DRAG_FACTOR = 0.25f;
 
-    private enum RecentsParams {
+    private enum RecentsResistanceParams {
         FROM_APP(0.75f, 0.5f, 1f),
         FROM_OVERVIEW(1f, 0.75f, 0.5f);
 
-        RecentsParams(float scaleStartResist, float scaleMaxResist, float translationFactor) {
+        RecentsResistanceParams(float scaleStartResist, float scaleMaxResist,
+                float translationFactor) {
             this.scaleStartResist = scaleStartResist;
             this.scaleMaxResist = scaleMaxResist;
             this.translationFactor = translationFactor;
@@ -139,9 +141,9 @@ public class AnimatorControllerWithResistance {
             FloatProperty<SCALE> scaleProperty, TRANSLATION translationTarget,
             FloatProperty<TRANSLATION> translationProperty) {
 
-        PendingAnimation resistAnim = createRecentsResistanceAnim(null, context,
-                recentsOrientedState, dp, scaleTarget, scaleProperty, translationTarget,
-                translationProperty, RecentsParams.FROM_APP);
+        RecentsParams params = new RecentsParams(context, recentsOrientedState, dp, scaleTarget,
+                scaleProperty, translationTarget, translationProperty);
+        PendingAnimation resistAnim = createRecentsResistanceAnim(params);
 
         AnimatorPlaybackController resistanceController = resistAnim.createPlaybackController();
         return new AnimatorControllerWithResistance(normalController, resistanceController);
@@ -152,31 +154,30 @@ public class AnimatorControllerWithResistance {
      * when starting from recents, i.e. {@link #createRecentsResistanceFromOverviewAnim}.
      */
     public static <SCALE, TRANSLATION> PendingAnimation createRecentsResistanceAnim(
-            @Nullable PendingAnimation resistAnim, Context context,
-            RecentsOrientedState recentsOrientedState, DeviceProfile dp, SCALE scaleTarget,
-            FloatProperty<SCALE> scaleProperty, TRANSLATION translationTarget,
-            FloatProperty<TRANSLATION> translationProperty, RecentsParams params) {
+            RecentsParams<SCALE, TRANSLATION> params) {
         Rect startRect = new Rect();
-        LauncherActivityInterface.INSTANCE.calculateTaskSize(context, dp, startRect,
-                recentsOrientedState.getOrientationHandler());
+        PagedOrientationHandler orientationHandler = params.recentsOrientedState
+                .getOrientationHandler();
+        LauncherActivityInterface.INSTANCE.calculateTaskSize(params.context, params.dp, startRect,
+                orientationHandler);
         long distanceToCover = startRect.bottom;
-        boolean isTwoButtonMode = SysUINavigationMode.getMode(context) == TWO_BUTTONS;
+        boolean isTwoButtonMode = SysUINavigationMode.getMode(params.context) == TWO_BUTTONS;
         if (isTwoButtonMode) {
             // We can only drag a small distance past overview, not to the top of the screen.
             distanceToCover = (long)
-                    ((dp.heightPx - startRect.bottom) * TWO_BUTTON_EXTRA_DRAG_FACTOR);
-        }
-        if (resistAnim == null) {
-            resistAnim = new PendingAnimation(distanceToCover * 2);
+                    ((params.dp.heightPx - startRect.bottom) * TWO_BUTTON_EXTRA_DRAG_FACTOR);
         }
+        PendingAnimation resistAnim = params.resistAnim != null
+                ? params.resistAnim
+                : new PendingAnimation(distanceToCover * 2);
 
         PointF pivot = new PointF();
-        float fullscreenScale = recentsOrientedState.getFullScreenScaleAndPivot(
-                startRect, dp, pivot);
-        float startScale = 1;
-        float prevScaleRate = (fullscreenScale - startScale) / (dp.heightPx - startRect.bottom);
+        float fullscreenScale = params.recentsOrientedState.getFullScreenScaleAndPivot(
+                startRect, params.dp, pivot);
+        float prevScaleRate = (fullscreenScale - params.startScale)
+                / (params.dp.heightPx - startRect.bottom);
         // This is what the scale would be at the end of the drag if we didn't apply resistance.
-        float endScale = startScale - prevScaleRate * distanceToCover;
+        float endScale = params.startScale - prevScaleRate * distanceToCover;
         final TimeInterpolator scaleInterpolator;
         if (isTwoButtonMode) {
             // We are bounded by the distance of the drag, so we don't need to apply resistance.
@@ -184,9 +185,10 @@ public class AnimatorControllerWithResistance {
         } else {
             // Create an interpolator that resists the scale so the scale doesn't get smaller than
             // RECENTS_SCALE_MAX_RESIST.
-            float startResist = Utilities.getProgress(params.scaleStartResist , startScale,
-                    endScale);
-            float maxResist = Utilities.getProgress(params.scaleMaxResist, startScale, endScale);
+            float startResist = Utilities.getProgress(params.resistanceParams.scaleStartResist,
+                    params.startScale, endScale);
+            float maxResist = Utilities.getProgress(params.resistanceParams.scaleMaxResist,
+                    params.startScale, endScale);
             scaleInterpolator = t -> {
                 if (t < startResist) {
                     return t;
@@ -196,20 +198,22 @@ public class AnimatorControllerWithResistance {
                 return startResist + resistProgress * (maxResist - startResist);
             };
         }
-        resistAnim.addFloat(scaleTarget, scaleProperty, startScale, endScale,
+        resistAnim.addFloat(params.scaleTarget, params.scaleProperty, params.startScale, endScale,
                 scaleInterpolator);
 
         if (!isTwoButtonMode) {
             // Compute where the task view would be based on the end scale, if we didn't translate.
             RectF endRectF = new RectF(startRect);
             Matrix temp = new Matrix();
-            temp.setScale(params.scaleMaxResist, params.scaleMaxResist, pivot.x, pivot.y);
+            temp.setScale(params.resistanceParams.scaleMaxResist,
+                    params.resistanceParams.scaleMaxResist, pivot.x, pivot.y);
             temp.mapRect(endRectF);
             // Translate such that the task view touches the top of the screen when drag does.
-            float endTranslation = endRectF.top * recentsOrientedState.getOrientationHandler()
-                    .getSecondaryTranslationDirectionFactor() * params.translationFactor;
-            resistAnim.addFloat(translationTarget, translationProperty, 0, endTranslation,
-                    RECENTS_TRANSLATE_RESIST_INTERPOLATOR);
+            float endTranslation = endRectF.top
+                    * orientationHandler.getSecondaryTranslationDirectionFactor()
+                    * params.resistanceParams.translationFactor;
+            resistAnim.addFloat(params.translationTarget, params.translationProperty,
+                    params.startTranslation, endTranslation, RECENTS_TRANSLATE_RESIST_INTERPOLATOR);
         }
 
         return resistAnim;
@@ -220,11 +224,66 @@ public class AnimatorControllerWithResistance {
      * a RecentsView interaction that started from the overview state.
      */
     public static PendingAnimation createRecentsResistanceFromOverviewAnim(
-            BaseDraggingActivity activity, @Nullable PendingAnimation resistanceAnim) {
-        RecentsView recentsView = activity.getOverviewPanel();
-        return createRecentsResistanceAnim(resistanceAnim, activity,
-                recentsView.getPagedViewOrientedState(), activity.getDeviceProfile(),
-                recentsView, RECENTS_SCALE_PROPERTY, recentsView, TASK_SECONDARY_TRANSLATION,
-                RecentsParams.FROM_OVERVIEW);
+            Launcher launcher, @Nullable PendingAnimation resistanceAnim) {
+        RecentsView recentsView = launcher.getOverviewPanel();
+        RecentsParams params = new RecentsParams(launcher, recentsView.getPagedViewOrientedState(),
+                launcher.getDeviceProfile(), recentsView, RECENTS_SCALE_PROPERTY, recentsView,
+                TASK_SECONDARY_TRANSLATION)
+                .setResistAnim(resistanceAnim)
+                .setResistanceParams(RecentsResistanceParams.FROM_OVERVIEW)
+                .setStartScale(recentsView.getScaleX());
+        return createRecentsResistanceAnim(params);
+    }
+
+    /**
+     * Params to compute resistance when scaling/translating recents.
+     */
+    private static class RecentsParams<SCALE, TRANSLATION> {
+        // These are all required and can't have default values, hence are final.
+        public final Context context;
+        public final RecentsOrientedState recentsOrientedState;
+        public final DeviceProfile dp;
+        public final SCALE scaleTarget;
+        public final FloatProperty<SCALE> scaleProperty;
+        public final TRANSLATION translationTarget;
+        public final FloatProperty<TRANSLATION> translationProperty;
+
+        // These are not required, or can have a default value that is generally correct.
+        @Nullable public PendingAnimation resistAnim = null;
+        public RecentsResistanceParams resistanceParams = RecentsResistanceParams.FROM_APP;
+        public float startScale = 1f;
+        public float startTranslation = 0f;
+
+        private RecentsParams(Context context, RecentsOrientedState recentsOrientedState,
+                DeviceProfile dp, SCALE scaleTarget, FloatProperty<SCALE> scaleProperty,
+                TRANSLATION translationTarget, FloatProperty<TRANSLATION> translationProperty) {
+            this.context = context;
+            this.recentsOrientedState = recentsOrientedState;
+            this.dp = dp;
+            this.scaleTarget = scaleTarget;
+            this.scaleProperty = scaleProperty;
+            this.translationTarget = translationTarget;
+            this.translationProperty = translationProperty;
+        }
+
+        private RecentsParams setResistAnim(PendingAnimation resistAnim) {
+            this.resistAnim = resistAnim;
+            return this;
+        }
+
+        private RecentsParams setResistanceParams(RecentsResistanceParams resistanceParams) {
+            this.resistanceParams = resistanceParams;
+            return this;
+        }
+
+        private RecentsParams setStartScale(float startScale) {
+            this.startScale = startScale;
+            return this;
+        }
+
+        private RecentsParams setStartTranslation(float startTranslation) {
+            this.startTranslation = startTranslation;
+            return this;
+        }
     }
 }
diff --git a/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java b/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
index 6278e147c0..4a298d3bad 100644
--- a/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
+++ b/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
@@ -22,6 +22,7 @@ import static com.android.launcher3.anim.Interpolators.FINAL_FRAME;
 import static com.android.launcher3.anim.Interpolators.INSTANT;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_COMPONENTS;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_ACTIONS_FADE;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y;
@@ -106,10 +107,16 @@ public class OverviewToHomeAnim {
                 // StaggeredWorkspaceAnim doesn't animate overview, so we handle it here.
                 ? PLAY_ATOMIC_OVERVIEW_PEEK
                 : ANIM_ALL_COMPONENTS;
-        config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, DEACCEL);
+        boolean isLayoutNaturalToLauncher = recentsView.getPagedOrientationHandler()
+                .isLayoutNaturalToLauncher();
+        config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, isLayoutNaturalToLauncher
+                ? DEACCEL : FINAL_FRAME);
         config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, FINAL_FRAME);
         config.setInterpolator(ANIM_OVERVIEW_SCALE, FINAL_FRAME);
         config.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, INSTANT);
+        if (!isLayoutNaturalToLauncher) {
+            config.setInterpolator(ANIM_OVERVIEW_FADE, DEACCEL);
+        }
         AnimatorSet stateAnim = stateManager.createAtomicAnimation(
                 startState, NORMAL, config);
         stateAnim.addListener(new AnimationSuccessListener() {
-- 
GitLab


From d9d340c87987ba72aaea13efab49b55c7b9fac54 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Sat, 22 Aug 2020 23:05:58 -0700
Subject: [PATCH 0113/1664] Introduce transparency in all apps for
 OnDeviceSearch Bug: 165999272

Change-Id: Ic4adf11d030328db47a5b0d1cd915b40902c12de
---
 res/values/colors.xml                                    | 3 ---
 .../launcher3/allapps/AllAppsSectionDecorator.java       | 9 +++++++--
 .../allapps/search/AppsSearchContainerLayout.java        | 4 ++--
 .../launcher3/allapps/search/AppsSearchPipeline.java     | 9 +++++----
 .../allapps/search/DefaultAppSearchAlgorithm.java        | 5 +++--
 src/com/android/launcher3/views/ScrimView.java           | 8 +++++++-
 6 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/res/values/colors.xml b/res/values/colors.xml
index fe9717cd7a..f56fbaaace 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -35,9 +35,6 @@
 
     <color name="icon_background">#E0E0E0</color> <!-- Gray 300 -->
 
-    <color name="all_apps_section_fill">#32c0c0c0</color>
-    <color name="all_apps_section_focused_item">#40c0c0c0</color>
-
     <color name="gesture_tutorial_ripple_color">#A0C2F9</color> <!-- Light Blue -->
     <color name="gesture_tutorial_fake_task_view_color">#6DA1FF</color> <!-- Light Blue -->
     <color name="gesture_tutorial_action_button_label_color">#FFFFFFFF</color>
diff --git a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
index 6f29e1102c..9534c85cf6 100644
--- a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
+++ b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
@@ -22,6 +22,7 @@ import android.graphics.RectF;
 import android.view.View;
 
 import androidx.annotation.Nullable;
+import androidx.core.graphics.ColorUtils;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.launcher3.R;
@@ -100,6 +101,9 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
      * Handles grouping and drawing of items in the same all apps sections.
      */
     public static class SectionDecorationHandler {
+        private static final int FILL_ALPHA = (int) (.3f * 255);
+        private static final int FOCUS_ALPHA = (int) (.8f * 255);
+
         protected RectF mBounds = new RectF();
         private final boolean mIsFullWidth;
         private final float mRadius;
@@ -111,8 +115,9 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
 
         public SectionDecorationHandler(Context context, boolean isFullWidth) {
             mIsFullWidth = isFullWidth;
-            mFillcolor = context.getColor(R.color.all_apps_section_fill);
-            mFocusColor = context.getColor(R.color.all_apps_section_focused_item);
+            int endScrim = Themes.getAttrColor(context, R.attr.allAppsScrimColor);
+            mFillcolor = ColorUtils.setAlphaComponent(endScrim, FILL_ALPHA);
+            mFocusColor = ColorUtils.setAlphaComponent(endScrim, FOCUS_ALPHA);
             mRadius = Themes.getDialogCornerRadius(context);
         }
 
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
index 6f183eebc0..7518521255 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
@@ -139,8 +139,8 @@ public class AppsSearchContainerLayout extends ExtendedEditText
         mApps = appsView.getApps();
         mAppsView = appsView;
         mSearchBarController.initialize(
-                new DefaultAppSearchAlgorithm(LauncherAppState.getInstance(mLauncher)), this,
-                mLauncher, this, this);
+                new DefaultAppSearchAlgorithm(mLauncher, LauncherAppState.getInstance(mLauncher)),
+                this, mLauncher, this, this);
     }
 
     @Override
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java b/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
index fb3d953bac..6e9a7da4ae 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
@@ -53,15 +53,16 @@ public class AppsSearchPipeline implements SearchPipeline {
     private final LauncherAppState mLauncherAppState;
     private final boolean mHeroSectionSupported;
 
-    public AppsSearchPipeline(LauncherAppState launcherAppState) {
-        this(launcherAppState, true);
+    public AppsSearchPipeline(Context context, LauncherAppState launcherAppState) {
+        this(context, launcherAppState, true);
     }
 
-    public AppsSearchPipeline(LauncherAppState launcherAppState, boolean supportsHeroView) {
+    public AppsSearchPipeline(Context context, LauncherAppState launcherAppState,
+            boolean supportsHeroView) {
         mLauncherAppState = launcherAppState;
         mSearchSectionInfo = new SearchSectionInfo();
         mSearchSectionInfo.setDecorationHandler(
-                new SectionDecorationHandler(launcherAppState.getContext(), true));
+                new SectionDecorationHandler(context, true));
         mHeroSectionSupported = supportsHeroView;
     }
 
diff --git a/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java b/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java
index 470191c3fc..d757f78523 100644
--- a/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java
+++ b/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java
@@ -15,6 +15,7 @@
  */
 package com.android.launcher3.allapps.search;
 
+import android.content.Context;
 import android.os.Handler;
 
 import com.android.launcher3.LauncherAppState;
@@ -30,9 +31,9 @@ public class DefaultAppSearchAlgorithm implements SearchAlgorithm {
     protected final Handler mResultHandler;
     private final AppsSearchPipeline mAppsSearchPipeline;
 
-    public DefaultAppSearchAlgorithm(LauncherAppState launcherAppState) {
+    public DefaultAppSearchAlgorithm(Context context, LauncherAppState launcherAppState) {
         mResultHandler = new Handler();
-        mAppsSearchPipeline = new AppsSearchPipeline(launcherAppState, false);
+        mAppsSearchPipeline = new AppsSearchPipeline(context, launcherAppState, false);
     }
 
     @Override
diff --git a/src/com/android/launcher3/views/ScrimView.java b/src/com/android/launcher3/views/ScrimView.java
index 7f0765becd..77cec80fd7 100644
--- a/src/com/android/launcher3/views/ScrimView.java
+++ b/src/com/android/launcher3/views/ScrimView.java
@@ -32,6 +32,7 @@ import androidx.core.graphics.ColorUtils;
 import com.android.launcher3.Insettable;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.uioverrides.WallpaperColorInfo;
 import com.android.launcher3.uioverrides.WallpaperColorInfo.OnChangeListener;
 import com.android.launcher3.util.Themes;
@@ -41,6 +42,7 @@ import com.android.launcher3.util.Themes;
  */
 public class ScrimView<T extends Launcher> extends View implements Insettable, OnChangeListener {
 
+    private static final float SCRIM_ALPHA = .75f;
     protected final T mLauncher;
     private final WallpaperColorInfo mWallpaperColorInfo;
     protected final int mEndScrim;
@@ -59,7 +61,11 @@ public class ScrimView<T extends Launcher> extends View implements Insettable, O
         super(context, attrs);
         mLauncher = Launcher.cast(Launcher.getLauncher(context));
         mWallpaperColorInfo = WallpaperColorInfo.INSTANCE.get(context);
-        mEndScrim = Themes.getAttrColor(context, R.attr.allAppsScrimColor);
+        int endScrim = Themes.getAttrColor(context, R.attr.allAppsScrimColor);
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
+            endScrim = ColorUtils.setAlphaComponent(endScrim, (int) (255  * SCRIM_ALPHA));
+        }
+        mEndScrim = endScrim;
         mIsScrimDark = ColorUtils.calculateLuminance(mEndScrim) < 0.5f;
 
         mMaxScrimAlpha = 0.7f;
-- 
GitLab


From 6b670d62df460078612900fda49ae902a02e1c69 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Sat, 22 Aug 2020 23:24:43 -0700
Subject: [PATCH 0114/1664] Good riddance UserEventDispatcher [1/n]

Bug: 165675920
Change-Id: I237ed4243e1724b3c370c5660673bb3966bf4811
---
 .../appprediction/AllAppsTipView.java         |   5 +-
 .../hybridhotseat/HotseatEduDialog.java       |  11 --
 .../HotseatPredictionController.java          |   6 -
 .../uioverrides/states/OverviewState.java     |   4 -
 .../NavBarToHomeTouchController.java          |   4 +-
 .../quickstep/OverviewCommandHelper.java      |   7 -
 .../quickstep/TouchInteractionService.java    |  18 +--
 .../logging/UserEventDispatcherExtension.java |  86 ------------
 .../quickstep/views/AllAppsEduView.java       |   5 -
 .../android/quickstep/views/RecentsView.java  |  11 --
 .../android/quickstep/views/TaskMenuView.java |   5 -
 .../com/android/quickstep/views/TaskView.java |   4 -
 .../launcher3/AbstractFloatingView.java       |  12 +-
 .../launcher3/AppWidgetResizeFrame.java       |   5 -
 .../launcher3/BaseDraggingActivity.java       |   1 -
 src/com/android/launcher3/DragSource.java     |   3 +-
 src/com/android/launcher3/Launcher.java       |   1 -
 .../launcher3/SecondaryDropTarget.java        |   7 -
 src/com/android/launcher3/Workspace.java      |  21 ---
 .../allapps/AllAppsContainerView.java         |  12 --
 .../launcher3/allapps/DiscoveryBounce.java    |   5 -
 .../dragndrop/PinItemDragListener.java        |  11 --
 src/com/android/launcher3/folder/Folder.java  |  33 -----
 .../logging/UserEventDispatcher.java          | 125 +-----------------
 .../notification/NotificationInfo.java        |   1 -
 .../popup/PopupContainerWithArrow.java        |  26 ----
 .../android/launcher3/views/ArrowTipView.java |   4 -
 .../launcher3/views/FloatingSurfaceView.java  |   3 -
 .../launcher3/views/HeroSearchResultView.java |   8 --
 .../android/launcher3/views/ListenerView.java |   5 -
 .../launcher3/views/OptionsPopupView.java     |   5 -
 src/com/android/launcher3/views/Snackbar.java |   5 -
 .../android/launcher3/views/WorkEduView.java  |  11 --
 .../launcher3/widget/BaseWidgetSheet.java     |  28 ----
 .../launcher3/widget/WidgetsBottomSheet.java  |   5 -
 .../launcher3/widget/WidgetsFullSheet.java    |   5 -
 .../systemui/plugins/UserEventPlugin.java     |  34 -----
 37 files changed, 9 insertions(+), 533 deletions(-)
 delete mode 100644 quickstep/src/com/android/quickstep/logging/UserEventDispatcherExtension.java
 delete mode 100644 src_plugins/com/android/systemui/plugins/UserEventPlugin.java

diff --git a/quickstep/src/com/android/launcher3/appprediction/AllAppsTipView.java b/quickstep/src/com/android/launcher3/appprediction/AllAppsTipView.java
index 8477b103a2..98bf483a3d 100644
--- a/quickstep/src/com/android/launcher3/appprediction/AllAppsTipView.java
+++ b/quickstep/src/com/android/launcher3/appprediction/AllAppsTipView.java
@@ -19,7 +19,6 @@ package com.android.launcher3.appprediction;
 import static com.android.launcher3.AbstractFloatingView.TYPE_DISCOVERY_BOUNCE;
 import static com.android.launcher3.AbstractFloatingView.TYPE_ON_BOARD_POPUP;
 import static com.android.launcher3.LauncherState.ALL_APPS;
-import static com.android.quickstep.logging.UserEventDispatcherExtension.ALL_APPS_PREDICTION_TIPS;
 
 import android.os.UserManager;
 
@@ -31,7 +30,6 @@ import com.android.launcher3.Utilities;
 import com.android.launcher3.allapps.FloatingHeaderView;
 import com.android.launcher3.statemanager.StateManager.StateListener;
 import com.android.launcher3.views.ArrowTipView;
-import com.android.systemui.shared.system.LauncherEventUtil;
 
 /**
  * ArrowTip helper aligned just above prediction apps, shown to users that enter all apps for the
@@ -57,8 +55,7 @@ public class AllAppsTipView {
         floatingHeaderView.findFixedRowByType(PredictionRowView.class).getLocationOnScreen(coords);
         ArrowTipView arrowTipView = new ArrowTipView(launcher).setOnClosedCallback(() -> {
             launcher.getSharedPrefs().edit().putBoolean(ALL_APPS_TIP_SEEN, true).apply();
-            launcher.getUserEventDispatcher().logActionTip(LauncherEventUtil.DISMISS,
-                    ALL_APPS_PREDICTION_TIPS);
+            // TODO: add log to WW
         });
         arrowTipView.show(launcher.getString(R.string.all_apps_prediction_tip), coords[1]);
 
diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java
index 2b3f3953ea..39bf008fc3 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java
@@ -40,7 +40,6 @@ import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.uioverrides.PredictedAppIcon;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.launcher3.views.AbstractSlideInView;
 
 import java.util.List;
@@ -122,16 +121,6 @@ public class HotseatEduDialog extends AbstractSlideInView implements Insettable
         handleClose(true);
     }
 
-    @Override
-    public void logActionCommand(int command) {
-        // Since this is on-boarding popup, it is not a user controlled action.
-    }
-
-    @Override
-    public int getLogContainerType() {
-        return LauncherLogProto.ContainerType.TIP;
-    }
-
     @Override
     protected boolean isOfType(int type) {
         return (type & TYPE_ON_BOARD_POPUP) != 0;
diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
index b94e6337d0..1d1296fb5c 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
@@ -624,12 +624,6 @@ public class HotseatPredictionController implements DragController.DragListener,
         //Does nothing
     }
 
-    @Override
-    public void fillInLogContainerData(ItemInfo childInfo, LauncherLogProto.Target child,
-            ArrayList<LauncherLogProto.Target> parents) {
-        mHotseat.fillInLogContainerData(childInfo, child, parents);
-    }
-
     /**
      * Logs rank info based on current list of predicted items
      */
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
index 6ec114e216..bbe7821864 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -16,7 +16,6 @@
 package com.android.launcher3.uioverrides.states;
 
 import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
-import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
 import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
 import static com.android.quickstep.SysUINavigationMode.hideShelfInTwoButtonLandscape;
 import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
@@ -30,7 +29,6 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.Workspace;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action;
 import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.util.LayoutUtils;
@@ -177,8 +175,6 @@ public class OverviewState extends LauncherState {
     public void onBackPressed(Launcher launcher) {
         TaskView taskView = launcher.<RecentsView>getOverviewPanel().getRunningTaskView();
         if (taskView != null) {
-            launcher.getUserEventDispatcher().logActionCommand(Action.Command.BACK,
-                    newContainerTarget(ContainerType.OVERVIEW));
             taskView.launchTask(true);
         } else {
             super.onBackPressed(launcher);
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
index da3c4858a8..60ad4cd66b 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
@@ -229,12 +229,12 @@ public class NavBarToHomeTouchController implements TouchController,
                         () -> onSwipeInteractionCompleted(mEndState));
             }
             if (mStartState != mEndState) {
-                logStateChange(mStartState.containerType, logAction);
+                // TODO: add to WW log
             }
             AbstractFloatingView topOpenView = AbstractFloatingView.getTopOpenView(mLauncher);
             if (topOpenView != null) {
                 AbstractFloatingView.closeAllOpenViews(mLauncher);
-                logStateChange(topOpenView.getLogContainerType(), logAction);
+                // TODO: add to WW log
             }
             ActivityManagerWrapper.getInstance()
                     .closeSystemWindows(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
index dca33789e5..365cff576a 100644
--- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
@@ -29,7 +29,6 @@ import android.view.ViewConfiguration;
 
 import androidx.annotation.BinderThread;
 
-import com.android.launcher3.logging.UserEventDispatcher;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.quickstep.util.ActivityInitListener;
@@ -87,12 +86,6 @@ public class OverviewCommandHelper {
         MAIN_EXECUTOR.execute(new HideRecentsCommand());
     }
 
-    @BinderThread
-    public void onTip(int actionType, int viewType) {
-        MAIN_EXECUTOR.execute(() ->
-                UserEventDispatcher.newInstance(mContext).logActionTip(actionType, viewType));
-    }
-
     private class ShowRecentsCommand extends RecentsActivityCommand {
 
         private final boolean mTriggeredFromAltTab;
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index ba0a81fab5..2387692eb9 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -22,7 +22,6 @@ import static android.view.MotionEvent.ACTION_UP;
 
 import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.quickstep.GestureState.DEFAULT_STATE;
 import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_INPUT_MONITOR;
 import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SYSUI_PROXY;
@@ -61,7 +60,6 @@ import com.android.launcher3.R;
 import com.android.launcher3.ResourceUtils;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
-import com.android.launcher3.logging.UserEventDispatcher;
 import com.android.launcher3.provider.RestoreDbTask;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.testing.TestLogging;
@@ -141,7 +139,6 @@ public class TouchInteractionService extends Service implements PluginListener<O
         }
 
         @BinderThread
-        @Override
         public void onOverviewToggle() {
             TestLogging.recordEvent(TestProtocol.SEQUENCE_MAIN, "onOverviewToggle");
             mOverviewCommandHelper.onOverviewToggle();
@@ -165,7 +162,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
         @BinderThread
         @Override
         public void onTip(int actionType, int viewType) {
-            mOverviewCommandHelper.onTip(actionType, viewType);
+            // Please delete this method from the interface
         }
 
         @BinderThread
@@ -189,18 +186,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
         @BinderThread
         public void onBackAction(boolean completed, int downX, int downY, boolean isButton,
                 boolean gestureSwipeLeft) {
-            if (mOverviewComponentObserver == null) {
-                return;
-            }
-
-            final BaseActivityInterface activityInterface =
-                    mOverviewComponentObserver.getActivityInterface();
-            UserEventDispatcher.newInstance(getBaseContext()).logActionBack(completed, downX, downY,
-                    isButton, gestureSwipeLeft, activityInterface.getContainerType());
-
-            if (completed && !isButton && shouldNotifyBackGesture()) {
-                UI_HELPER_EXECUTOR.execute(TouchInteractionService.this::tryNotifyBackGesture);
-            }
+            // Remove this method from the interface
         }
 
         @BinderThread
diff --git a/quickstep/src/com/android/quickstep/logging/UserEventDispatcherExtension.java b/quickstep/src/com/android/quickstep/logging/UserEventDispatcherExtension.java
deleted file mode 100644
index 9ca7f234e7..0000000000
--- a/quickstep/src/com/android/quickstep/logging/UserEventDispatcherExtension.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.quickstep.logging;
-
-import android.content.Context;
-import android.util.Log;
-
-import static com.android.launcher3.logging.LoggerUtils.newLauncherEvent;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.ControlType.CANCEL_TARGET;
-import static com.android.systemui.shared.system.LauncherEventUtil.DISMISS;
-import static com.android.systemui.shared.system.LauncherEventUtil.RECENTS_QUICK_SCRUB_ONBOARDING_TIP;
-import static com.android.systemui.shared.system.LauncherEventUtil.RECENTS_SWIPE_UP_ONBOARDING_TIP;
-import static com.android.systemui.shared.system.LauncherEventUtil.VISIBLE;
-
-import com.android.launcher3.logging.UserEventDispatcher;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
-import com.android.systemui.shared.system.MetricsLoggerCompat;
-
-/**
- * This class handles AOSP MetricsLogger function calls and logging around
- * quickstep interactions.
- */
-@SuppressWarnings("unused")
-public class UserEventDispatcherExtension extends UserEventDispatcher {
-
-    public static final int ALL_APPS_PREDICTION_TIPS = 2;
-
-    private static final String TAG = "UserEventDispatcher";
-
-    public UserEventDispatcherExtension(Context context) { }
-
-    public void logStateChangeAction(int action, int dir, int downX, int downY,
-                                     int srcChildTargetType, int srcParentContainerType,
-                                     int dstContainerType, int pageIndex) {
-        new MetricsLoggerCompat().visibility(MetricsLoggerCompat.OVERVIEW_ACTIVITY,
-                dstContainerType == LauncherLogProto.ContainerType.TASKSWITCHER);
-        super.logStateChangeAction(action, dir, downX, downY, srcChildTargetType,
-                srcParentContainerType, dstContainerType, pageIndex);
-    }
-
-    public void logActionTip(int actionType, int viewType) {
-        LauncherLogProto.Action action = new LauncherLogProto.Action();
-        LauncherLogProto.Target target = new LauncherLogProto.Target();
-        switch(actionType) {
-            case VISIBLE:
-                action.type = LauncherLogProto.Action.Type.TIP;
-                target.type = LauncherLogProto.Target.Type.CONTAINER;
-                target.containerType = LauncherLogProto.ContainerType.TIP;
-                break;
-            case DISMISS:
-                action.type = LauncherLogProto.Action.Type.TOUCH;
-                action.touch = LauncherLogProto.Action.Touch.TAP;
-                target.type = LauncherLogProto.Target.Type.CONTROL;
-                target.controlType = CANCEL_TARGET;
-                break;
-            default:
-                Log.e(TAG, "Unexpected action type = " + actionType);
-        }
-
-        switch(viewType) {
-            case RECENTS_QUICK_SCRUB_ONBOARDING_TIP:
-                target.tipType = LauncherLogProto.TipType.QUICK_SCRUB_TEXT;
-                break;
-            case RECENTS_SWIPE_UP_ONBOARDING_TIP:
-                target.tipType = LauncherLogProto.TipType.SWIPE_UP_TEXT;
-                break;
-            default:
-                Log.e(TAG, "Unexpected viewType = " + viewType);
-        }
-        LauncherLogProto.LauncherEvent event = newLauncherEvent(action, target);
-        dispatchUserEvent(event, null);
-    }
-}
diff --git a/quickstep/src/com/android/quickstep/views/AllAppsEduView.java b/quickstep/src/com/android/quickstep/views/AllAppsEduView.java
index c06dd9c0bd..97a239ce86 100644
--- a/quickstep/src/com/android/quickstep/views/AllAppsEduView.java
+++ b/quickstep/src/com/android/quickstep/views/AllAppsEduView.java
@@ -104,11 +104,6 @@ public class AllAppsEduView extends AbstractFloatingView {
         mLauncher.getDragLayer().removeView(this);
     }
 
-    @Override
-    public void logActionCommand(int command) {
-        // TODO
-    }
-
     @Override
     protected boolean isOfType(int type) {
         return (type & TYPE_ALL_APPS_EDU) != 0;
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index a9b5bf3ea9..982a7c432c 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -110,8 +110,6 @@ import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.touch.PagedOrientationHandler.CurveProperties;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
 import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.DynamicResource;
@@ -142,7 +140,6 @@ import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.recents.model.Task.TaskKey;
 import com.android.systemui.shared.recents.model.ThumbnailData;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
-import com.android.systemui.shared.system.LauncherEventUtil;
 import com.android.systemui.shared.system.PackageManagerWrapper;
 import com.android.systemui.shared.system.TaskStackChangeListener;
 
@@ -673,9 +670,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     public void onDigitalWellbeingToastShown() {
         if (!mDwbToastShown) {
             mDwbToastShown = true;
-            mActivity.getUserEventDispatcher().logActionTip(
-                    LauncherEventUtil.VISIBLE,
-                    LauncherLogProto.TipType.DWB_TOAST);
         }
     }
 
@@ -1461,8 +1455,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         if (taskView.getTask() != null) {
             ActivityManagerWrapper.getInstance().removeTask(taskView.getTask().key.id);
             ComponentKey compKey = TaskUtils.getLaunchComponentKeyForTask(taskView.getTask().key);
-            mActivity.getUserEventDispatcher().logTaskLaunchOrDismiss(
-                    endState.logAction, Direction.UP, index, compKey);
             mActivity.getStatsLogManager().logger().withItemInfo(taskView.getItemInfo())
                     .log(LAUNCHER_TASK_DISMISS_SWIPE_UP);
         }
@@ -2174,9 +2166,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                 tv.launchTask(false, onLaunchResult, getHandler());
                 Task task = tv.getTask();
                 if (task != null) {
-                    mActivity.getUserEventDispatcher().logTaskLaunchOrDismiss(
-                            endState.logAction, Direction.DOWN, indexOfChild(tv),
-                            TaskUtils.getLaunchComponentKeyForTask(task.key));
                     mActivity.getStatsLogManager().logger().withItemInfo(tv.getItemInfo())
                             .log(LAUNCHER_TASK_LAUNCH_SWIPE_DOWN);
                 }
diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
index 8b49f2c212..656d59e000 100644
--- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
@@ -132,11 +132,6 @@ public class TaskMenuView extends AbstractFloatingView {
         }
     }
 
-    @Override
-    public void logActionCommand(int command) {
-        // TODO
-    }
-
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 3a359f0f50..259cd4dbfd 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -225,10 +225,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
             } else {
                 launchTask(true /* animate */);
             }
-
-            mActivity.getUserEventDispatcher().logTaskLaunchOrDismiss(
-                    Touch.TAP, Direction.NONE, getRecentsView().indexOfChild(this),
-                    TaskUtils.getLaunchComponentKeyForTask(getTask().key));
             mActivity.getStatsLogManager().logger().withItemInfo(getItemInfo())
                     .log(LAUNCHER_TASK_LAUNCH_TAP);
         });
diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java
index 3bfe379257..3c34444b28 100644
--- a/src/com/android/launcher3/AbstractFloatingView.java
+++ b/src/com/android/launcher3/AbstractFloatingView.java
@@ -36,8 +36,6 @@ import android.widget.LinearLayout;
 import androidx.annotation.IntDef;
 
 import com.android.launcher3.anim.PendingAnimation;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.launcher3.util.TouchController;
 import com.android.launcher3.views.ActivityContext;
 import com.android.launcher3.views.BaseDragLayer;
@@ -129,8 +127,7 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
     public final void close(boolean animate) {
         animate &= areAnimatorsEnabled();
         if (mIsOpen) {
-            BaseActivity.fromContext(getContext()).getUserEventDispatcher()
-                    .resetElapsedContainerMillis("container closed");
+            // Add to WW logging
         }
         handleClose(animate);
         mIsOpen = false;
@@ -145,12 +142,6 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
     public void addHintCloseAnim(
             float distanceToMove, Interpolator interpolator, PendingAnimation target) { }
 
-    public abstract void logActionCommand(int command);
-
-    public int getLogContainerType() {
-        return ContainerType.DEFAULT_CONTAINERTYPE;
-    }
-
     public final boolean isOpen() {
         return mIsOpen;
     }
@@ -159,7 +150,6 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
 
     /** @return Whether the back is consumed. If false, Launcher will handle the back as well. */
     public boolean onBackPressed() {
-        logActionCommand(Action.Command.BACK);
         close(true);
         return true;
     }
diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java
index 6f7b684537..168d9c479c 100644
--- a/src/com/android/launcher3/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher3/AppWidgetResizeFrame.java
@@ -536,11 +536,6 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
         mDragLayer.removeView(this);
     }
 
-    @Override
-    public void logActionCommand(int command) {
-        // TODO: Log this case.
-    }
-
     @Override
     protected boolean isOfType(int type) {
         return (type & TYPE_WIDGET_RESIZE_FRAME) != 0;
diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java
index cbc3abcc41..0d90602278 100644
--- a/src/com/android/launcher3/BaseDraggingActivity.java
+++ b/src/com/android/launcher3/BaseDraggingActivity.java
@@ -193,7 +193,6 @@ public abstract class BaseDraggingActivity extends BaseActivity
                 getSystemService(LauncherApps.class).startMainActivity(
                         intent.getComponent(), user, intent.getSourceBounds(), optsBundle);
             }
-            getUserEventDispatcher().logAppLaunch(v, intent, user);
             if (item != null) {
                 InstanceId instanceId = new InstanceIdSequence().newInstanceId();
                 logAppLaunch(item, instanceId);
diff --git a/src/com/android/launcher3/DragSource.java b/src/com/android/launcher3/DragSource.java
index d4d7b99fd4..ba227d4b90 100644
--- a/src/com/android/launcher3/DragSource.java
+++ b/src/com/android/launcher3/DragSource.java
@@ -19,12 +19,11 @@ package com.android.launcher3;
 import android.view.View;
 
 import com.android.launcher3.DropTarget.DragObject;
-import com.android.launcher3.logging.StatsLogUtils.LogContainerProvider;
 
 /**
  * Interface defining an object that can originate a drag.
  */
-public interface DragSource extends LogContainerProvider {
+public interface DragSource {
 
     /**
      * A callback made back to the source after an item from this source has been dropped on a
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 51a9dfe7ac..2e2ef2de4a 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -911,7 +911,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     @CallSuper
     protected void onDeferredResumed() {
         logStopAndResume(Action.Command.RESUME);
-        getUserEventDispatcher().startSession();
 
         // Process any items that were added while Launcher was away.
         ItemInstallQueue.INSTANCE.get(this)
diff --git a/src/com/android/launcher3/SecondaryDropTarget.java b/src/com/android/launcher3/SecondaryDropTarget.java
index 56875bb337..2df7f5ad20 100644
--- a/src/com/android/launcher3/SecondaryDropTarget.java
+++ b/src/com/android/launcher3/SecondaryDropTarget.java
@@ -49,7 +49,6 @@ import com.android.launcher3.util.PackageManagerHelper;
 import com.android.launcher3.util.Themes;
 
 import java.net.URISyntaxException;
-import java.util.ArrayList;
 
 /**
  * Drop target which provides a secondary option for an item.
@@ -339,12 +338,6 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList
             mDragObject = d;
         }
 
-        @Override
-        public void fillInLogContainerData(ItemInfo childInfo, Target child,
-                ArrayList<Target> parents) {
-            mOriginal.fillInLogContainerData(childInfo, child, parents);
-        }
-
         @Override
         public void onLauncherResume() {
             // We use MATCH_UNINSTALLED_PACKAGES as the app can be on SD card as well.
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 6bfd3495e5..383512b128 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -28,7 +28,6 @@ import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.SPRING_LOADED;
 import static com.android.launcher3.config.FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM;
 import static com.android.launcher3.dragndrop.DragLayer.ALPHA_INDEX_OVERLAY;
-import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SWIPELEFT;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SWIPERIGHT;
@@ -99,7 +98,6 @@ import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.touch.WorkspaceTouchListener;
 import com.android.launcher3.userevent.nano.LauncherLogProto.Action;
 import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
 import com.android.launcher3.util.Executors;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.IntSparseArrayMap;
@@ -1506,7 +1504,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
                     .showForIcon((BubbleTextView) child);
             if (popupContainer != null) {
                 dragOptions.preDragCondition = popupContainer.createPreDragCondition();
-                mLauncher.getUserEventDispatcher().resetElapsedContainerMillis("dragging started");
             }
         }
 
@@ -3272,24 +3269,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         return getContext().getString(R.string.workspace_scroll_format, page + 1, nScreens);
     }
 
-    @Override
-    public void fillInLogContainerData(ItemInfo childInfo, Target child,
-            ArrayList<Target> parents) {
-        if (childInfo.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT
-                || childInfo.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION) {
-            getHotseat().fillInLogContainerData(childInfo, child, parents);
-            return;
-        } else if (childInfo.container >= 0) {
-            FolderIcon icon = (FolderIcon) getHomescreenIconByItemId(childInfo.container);
-            icon.getFolder().fillInLogContainerData(childInfo, child, parents);
-            return;
-        }
-        child.gridX = childInfo.cellX;
-        child.gridY = childInfo.cellY;
-        child.pageIndex = getCurrentPage();
-        parents.add(newContainerTarget(ContainerType.WORKSPACE));
-    }
-
     /**
      * Used as a workaround to ensure that the AppWidgetService receives the
      * PACKAGE_ADDED broadcast before updating widgets.
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 0684fe0526..1f515669a6 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -17,7 +17,6 @@ package com.android.launcher3.allapps;
 
 import static com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItem;
 import static com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
-import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
 import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_HAS_SHORTCUT_PERMISSION;
 import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_QUIET_MODE_CHANGE_PERMISSION;
 import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_QUIET_MODE_ENABLED;
@@ -62,8 +61,6 @@ import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.keyboard.FocusedItemDecorator;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
 import com.android.launcher3.util.ItemInfoMatcher;
 import com.android.launcher3.util.MultiValueAlpha;
 import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;
@@ -71,8 +68,6 @@ import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.RecyclerViewFastScroller;
 import com.android.launcher3.views.SpringRelativeLayout;
 
-import java.util.ArrayList;
-
 /**
  * The all apps view container.
  */
@@ -354,13 +349,6 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
     public void onDropCompleted(View target, DragObject d, boolean success) {
     }
 
-    @Override
-    public void fillInLogContainerData(ItemInfo childInfo, Target child,
-            ArrayList<Target> parents) {
-        parents.add(newContainerTarget(
-                getApps().hasFilter() ? ContainerType.SEARCHRESULT : ContainerType.ALLAPPS));
-    }
-
     @Override
     public void setInsets(Rect insets) {
         mInsets.set(insets);
diff --git a/src/com/android/launcher3/allapps/DiscoveryBounce.java b/src/com/android/launcher3/allapps/DiscoveryBounce.java
index b4ff5ea19a..14595ca941 100644
--- a/src/com/android/launcher3/allapps/DiscoveryBounce.java
+++ b/src/com/android/launcher3/allapps/DiscoveryBounce.java
@@ -115,11 +115,6 @@ public class DiscoveryBounce extends AbstractFloatingView {
         }
     }
 
-    @Override
-    public void logActionCommand(int command) {
-        // Since this is on-boarding popup, it is not a user controlled action.
-    }
-
     @Override
     protected boolean isOfType(int type) {
         return (type & TYPE_DISCOVERY_BOUNCE) != 0;
diff --git a/src/com/android/launcher3/dragndrop/PinItemDragListener.java b/src/com/android/launcher3/dragndrop/PinItemDragListener.java
index bf3aa7f7cb..6104d80676 100644
--- a/src/com/android/launcher3/dragndrop/PinItemDragListener.java
+++ b/src/com/android/launcher3/dragndrop/PinItemDragListener.java
@@ -16,7 +16,6 @@
 
 package com.android.launcher3.dragndrop;
 
-import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
 
 import android.annotation.TargetApi;
 import android.appwidget.AppWidgetManager;
@@ -33,15 +32,11 @@ import com.android.launcher3.DragSource;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.PendingAddItemInfo;
-import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.launcher3.widget.PendingAddShortcutInfo;
 import com.android.launcher3.widget.PendingAddWidgetInfo;
 import com.android.launcher3.widget.PendingItemDragHelper;
 import com.android.launcher3.widget.WidgetAddFlowHandler;
 
-import java.util.ArrayList;
-
 /**
  * {@link DragSource} for handling drop from a different window. This object is initialized
  * in the source window and is passed on to the Launcher activity as an Intent extra.
@@ -106,12 +101,6 @@ public class PinItemDragListener extends BaseItemDragListener {
         return dragHelper;
     }
 
-    @Override
-    public void fillInLogContainerData(ItemInfo childInfo, LauncherLogProto.Target child,
-            ArrayList<LauncherLogProto.Target> parents) {
-        parents.add(newContainerTarget(LauncherLogProto.ContainerType.PINITEM));
-    }
-
     @Override
     protected void postCleanup() {
         super.postCleanup();
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index b91d1c3260..547b42aec5 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -19,7 +19,6 @@ package com.android.launcher3.folder;
 import static android.text.TextUtils.isEmpty;
 
 import static com.android.launcher3.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY;
-import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent;
 import static com.android.launcher3.config.FeatureFlags.ALWAYS_USE_HARDWARE_OPTIMIZATION_FOR_FOLDER_ANIMATIONS;
@@ -1481,27 +1480,6 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         outRect.right += mScrollAreaOffset;
     }
 
-    @Override
-    public void fillInLogContainerData(ItemInfo childInfo, LauncherLogProto.Target child,
-            ArrayList<LauncherLogProto.Target> targets) {
-        child.gridX = childInfo.cellX;
-        child.gridY = childInfo.cellY;
-        child.pageIndex = mContent.getCurrentPage();
-
-        LauncherLogProto.Target target = newContainerTarget(LauncherLogProto.ContainerType.FOLDER);
-        target.pageIndex = mInfo.screenId;
-        target.gridX = mInfo.cellX;
-        target.gridY = mInfo.cellY;
-        targets.add(target);
-
-        // continue to parent
-        if (mInfo.container == CONTAINER_HOTSEAT) {
-            mLauncher.getHotseat().fillInLogContainerData(mInfo, target, targets);
-        } else {
-            mLauncher.getWorkspace().fillInLogContainerData(mInfo, target, targets);
-        }
-    }
-
     private class OnScrollHintListener implements OnAlarmListener {
 
         private final DragObject mDragObject;
@@ -1589,17 +1567,6 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         return getOpenView(launcher, TYPE_FOLDER);
     }
 
-    @Override
-    public void logActionCommand(int command) {
-        mLauncher.getUserEventDispatcher().logActionCommand(
-                command, getFolderIcon(), getLogContainerType());
-    }
-
-    @Override
-    public int getLogContainerType() {
-        return LauncherLogProto.ContainerType.FOLDER;
-    }
-
     /**
      * Navigation bar back key or hardware input back key has been issued.
      */
diff --git a/src/com/android/launcher3/logging/UserEventDispatcher.java b/src/com/android/launcher3/logging/UserEventDispatcher.java
index 31a81b8164..a40cc263db 100644
--- a/src/com/android/launcher3/logging/UserEventDispatcher.java
+++ b/src/com/android/launcher3/logging/UserEventDispatcher.java
@@ -19,26 +19,21 @@ package com.android.launcher3.logging;
 import static com.android.launcher3.logging.LoggerUtils.newAction;
 import static com.android.launcher3.logging.LoggerUtils.newCommandAction;
 import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
-import static com.android.launcher3.logging.LoggerUtils.newControlTarget;
 import static com.android.launcher3.logging.LoggerUtils.newDropTarget;
 import static com.android.launcher3.logging.LoggerUtils.newItemTarget;
 import static com.android.launcher3.logging.LoggerUtils.newLauncherEvent;
 import static com.android.launcher3.logging.LoggerUtils.newTarget;
 import static com.android.launcher3.logging.LoggerUtils.newTouchAction;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.ControlType;
 import static com.android.launcher3.userevent.nano.LauncherLogProto.ItemType;
 import static com.android.launcher3.userevent.nano.LauncherLogProto.TipType;
 
 import static java.util.Optional.ofNullable;
 
-import android.app.PendingIntent;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.os.Process;
 import android.os.SystemClock;
-import android.os.UserHandle;
 import android.util.Log;
 import android.view.View;
 
@@ -54,7 +49,6 @@ import com.android.launcher3.userevent.LauncherLogProto;
 import com.android.launcher3.userevent.nano.LauncherLogProto.Action;
 import com.android.launcher3.userevent.nano.LauncherLogProto.LauncherEvent;
 import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
-import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.InstantAppResolver;
 import com.android.launcher3.util.LogConfig;
 import com.android.launcher3.util.ResourceBasedOverride;
@@ -101,7 +95,7 @@ public class UserEventDispatcher implements ResourceBasedOverride {
      *
      * @return whether container data was added.
      */
-    public boolean fillLogContainer(@Nullable View v, Target child,
+    private boolean fillLogContainer(@Nullable View v, Target child,
             @Nullable ArrayList<Target> targets) {
         LogContainerProvider firstParent = StatsLogUtils.getLaunchProviderRecursive(v);
         if (v == null || !(v.getTag() instanceof ItemInfo) || firstParent == null) {
@@ -125,55 +119,6 @@ public class UserEventDispatcher implements ResourceBasedOverride {
     private boolean mAppOrTaskLaunch;
     private boolean mPreviousHomeGesture;
 
-    //                      APP_ICON    SHORTCUT    WIDGET
-    // --------------------------------------------------------------
-    // packageNameHash      required    optional    required
-    // componentNameHash    required                required
-    // intentHash                       required
-    // --------------------------------------------------------------
-
-    @Deprecated
-    public void logAppLaunch(View v, Intent intent, @Nullable UserHandle userHandle) {
-        Target itemTarget = newItemTarget(v, mInstantAppResolver);
-        Action action = newTouchAction(Action.Touch.TAP);
-        ArrayList<Target> targets = makeTargetsList(itemTarget);
-        if (fillLogContainer(v, itemTarget, targets)) {
-            onFillInLogContainerData((ItemInfo) v.getTag(), itemTarget, targets);
-            fillIntentInfo(itemTarget, intent, userHandle);
-        }
-        LauncherEvent event = newLauncherEvent(action,  targets);
-        dispatchUserEvent(event, intent);
-        mAppOrTaskLaunch = true;
-    }
-
-    /**
-     * Placeholder method.
-     */
-    public void logActionTip(int actionType, int viewType) {
-    }
-
-    @Deprecated
-    public void logTaskLaunchOrDismiss(int action, int direction, int taskIndex,
-            ComponentKey componentKey) {
-        LauncherEvent event = newLauncherEvent(newTouchAction(action), // TAP or SWIPE or FLING
-                newTarget(Target.Type.ITEM));
-        if (action == Action.Touch.SWIPE || action == Action.Touch.FLING) {
-            // Direction DOWN means the task was launched, UP means it was dismissed.
-            event.action.dir = direction;
-        }
-        event.srcTarget[0].itemType = ItemType.TASK;
-        event.srcTarget[0].pageIndex = taskIndex;
-        fillComponentInfo(event.srcTarget[0], componentKey.componentName);
-        dispatchUserEvent(event, null);
-        mAppOrTaskLaunch = true;
-    }
-
-    protected void fillIntentInfo(Target target, Intent intent, @Nullable UserHandle userHandle) {
-        target.intentHash = intent.hashCode();
-        target.isWorkApp = userHandle != null && !userHandle.equals(Process.myUserHandle());
-        fillComponentInfo(target, intent.getComponent());
-    }
-
     private void fillComponentInfo(Target target, ComponentName cn) {
         if (cn != null) {
             target.packageNameHash = (mUuidStr + cn.getPackageName()).hashCode();
@@ -181,22 +126,6 @@ public class UserEventDispatcher implements ResourceBasedOverride {
         }
     }
 
-    public void logNotificationLaunch(View v, PendingIntent intent) {
-        LauncherEvent event = newLauncherEvent(newTouchAction(Action.Touch.TAP),
-                newItemTarget(v, mInstantAppResolver), newTarget(Target.Type.CONTAINER));
-        Target itemTarget = newItemTarget(v, mInstantAppResolver);
-        ArrayList<Target> targets = makeTargetsList(itemTarget);
-
-        if (fillLogContainer(v, itemTarget, targets)) {
-            itemTarget.packageNameHash = (mUuidStr + intent.getCreatorPackage()).hashCode();
-        }
-        dispatchUserEvent(event, null);
-    }
-
-    public void logActionCommand(int command, Target srcTarget) {
-        logActionCommand(command, srcTarget, null);
-    }
-
     public void logActionCommand(int command, int srcContainerType, int dstContainerType) {
         logActionCommand(command, newContainerTarget(srcContainerType),
                 dstContainerType >= 0 ? newContainerTarget(dstContainerType) : null);
@@ -227,25 +156,6 @@ public class UserEventDispatcher implements ResourceBasedOverride {
         dispatchUserEvent(event, null);
     }
 
-    /**
-     * TODO: Make this function work when a container view is passed as the 2nd param.
-     */
-    public void logActionCommand(int command, View itemView, int srcContainerType) {
-        LauncherEvent event = newLauncherEvent(newCommandAction(command),
-                newItemTarget(itemView, mInstantAppResolver), newTarget(Target.Type.CONTAINER));
-
-        Target itemTarget = newItemTarget(itemView, mInstantAppResolver);
-        ArrayList<Target> targets = makeTargetsList(itemTarget);
-
-        if (fillLogContainer(itemView, itemTarget, targets)) {
-            // TODO: Remove the following two lines once fillInLogContainerData can take in a
-            // container view.
-            itemTarget.type = Target.Type.CONTAINER;
-            itemTarget.containerType = srcContainerType;
-        }
-        dispatchUserEvent(event, null);
-    }
-
     public void logActionOnControl(int action, int controlType) {
         logActionOnControl(action, controlType, null);
     }
@@ -332,7 +242,6 @@ public class UserEventDispatcher implements ResourceBasedOverride {
         event.srcTarget[0].spanX = downX;
         event.srcTarget[0].spanY = downY;
         dispatchUserEvent(event, null);
-        resetElapsedContainerMillis("state changed");
     }
 
     public void logActionOnItem(int action, int dir, int itemType) {
@@ -386,7 +295,6 @@ public class UserEventDispatcher implements ResourceBasedOverride {
         ArrayList<Target> targets = makeTargetsList(child);
         fillLogContainer(icon, child, targets);
         dispatchUserEvent(newLauncherEvent(newTouchAction(Action.Touch.TAP), targets), null);
-        resetElapsedContainerMillis("deep shortcut open");
     }
 
     public void logDragNDrop(DropTarget.DragObject dragObj, View dropTargetAsView) {
@@ -397,7 +305,7 @@ public class UserEventDispatcher implements ResourceBasedOverride {
         Target destChild = newItemTarget(dragObj.originalDragInfo, mInstantAppResolver);
         ArrayList<Target> destTargets = makeTargetsList(destChild);
 
-        dragObj.dragSource.fillInLogContainerData(dragObj.originalDragInfo, srcChild, srcTargets);
+        //dragObj.dragSource.fillInLogContainerData(dragObj.originalDragInfo, srcChild, srcTargets);
         if (dropTargetAsView instanceof LogContainerProvider) {
             ((LogContainerProvider) dropTargetAsView).fillInLogContainerData(dragObj.dragInfo,
                     destChild, destTargets);
@@ -414,35 +322,6 @@ public class UserEventDispatcher implements ResourceBasedOverride {
         dispatchUserEvent(event, null);
     }
 
-    public void logActionBack(boolean completed, int downX, int downY, boolean isButton,
-            boolean gestureSwipeLeft, int containerType) {
-        int actionTouch = isButton ? Action.Touch.TAP : Action.Touch.SWIPE;
-        Action action = newCommandAction(actionTouch);
-        action.command = Action.Command.BACK;
-        action.dir = isButton ? Action.Direction.NONE :
-                gestureSwipeLeft ? Action.Direction.LEFT : Action.Direction.RIGHT;
-        Target target = newControlTarget(isButton ? ControlType.BACK_BUTTON :
-                ControlType.BACK_GESTURE);
-        target.spanX = downX;
-        target.spanY = downY;
-        target.cardinality = completed ? 1 : 0;
-        LauncherEvent event = newLauncherEvent(action, target, newContainerTarget(containerType));
-
-        dispatchUserEvent(event, null);
-    }
-
-    /**
-     * Currently logs following containers: workspace, allapps, widget tray.
-     */
-    public final void resetElapsedContainerMillis(String reason) {
-        mElapsedContainerMillis = SystemClock.uptimeMillis();
-        if (!IS_VERBOSE) {
-            return;
-        }
-        Log.d(TAG, "resetElapsedContainerMillis reason=" + reason);
-
-    }
-
     public final void startSession() {
         mSessionStarted = true;
         mElapsedSessionMillis = SystemClock.uptimeMillis();
diff --git a/src/com/android/launcher3/notification/NotificationInfo.java b/src/com/android/launcher3/notification/NotificationInfo.java
index 835f72d5be..80eeb22747 100644
--- a/src/com/android/launcher3/notification/NotificationInfo.java
+++ b/src/com/android/launcher3/notification/NotificationInfo.java
@@ -106,7 +106,6 @@ public class NotificationInfo implements View.OnClickListener {
                 view, 0, 0, view.getWidth(), view.getHeight()).toBundle();
         try {
             intent.send(null, 0, null, null, null, null, activityOptions);
-            launcher.getUserEventDispatcher().logNotificationLaunch(view, intent);
             launcher.getStatsLogManager().logger().withItemInfo(mItemInfo)
                     .log(LAUNCHER_NOTIFICATION_LAUNCH_TAP);
         } catch (PendingIntent.CanceledException e) {
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index 896fb186d4..26b32b8195 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -20,12 +20,9 @@ import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_SHORTCU
 import static com.android.launcher3.Utilities.squaredHypot;
 import static com.android.launcher3.Utilities.squaredTouchSlop;
 import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
-import static com.android.launcher3.notification.NotificationMainView.NOTIFICATION_ITEM_INFO;
 import static com.android.launcher3.popup.PopupPopulator.MAX_SHORTCUTS;
 import static com.android.launcher3.popup.PopupPopulator.MAX_SHORTCUTS_IF_NOTIFICATIONS;
 import static com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.ItemType;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.Target;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
 import android.animation.AnimatorSet;
@@ -147,17 +144,6 @@ public class PopupContainerWithArrow<T extends BaseDraggingActivity> extends Arr
         return (type & TYPE_ACTION_POPUP) != 0;
     }
 
-    @Override
-    public void logActionCommand(int command) {
-        mLauncher.getUserEventDispatcher().logActionCommand(
-                command, mOriginalIcon, getLogContainerType());
-    }
-
-    @Override
-    public int getLogContainerType() {
-        return ContainerType.DEEPSHORTCUTS;
-    }
-
     public OnClickListener getItemClickListener() {
         return (view) -> {
             mLauncher.getItemOnClickListener().onClick(view);
@@ -495,18 +481,6 @@ public class PopupContainerWithArrow<T extends BaseDraggingActivity> extends Arr
         }
     }
 
-    @Override
-    public void fillInLogContainerData(ItemInfo childInfo, Target child,
-            ArrayList<Target> parents) {
-        if (childInfo == NOTIFICATION_ITEM_INFO) {
-            child.itemType = ItemType.NOTIFICATION;
-        } else {
-            child.itemType = ItemType.DEEPSHORTCUT;
-            child.rank = childInfo.rank;
-        }
-        parents.add(newContainerTarget(ContainerType.DEEPSHORTCUTS));
-    }
-
     @Override
     protected void onCreateCloseAnimation(AnimatorSet anim) {
         // Animate original icon's text back in.
diff --git a/src/com/android/launcher3/views/ArrowTipView.java b/src/com/android/launcher3/views/ArrowTipView.java
index b4a6b141ce..1f12a2f8c8 100644
--- a/src/com/android/launcher3/views/ArrowTipView.java
+++ b/src/com/android/launcher3/views/ArrowTipView.java
@@ -86,10 +86,6 @@ public class ArrowTipView extends AbstractFloatingView {
         }
     }
 
-    @Override
-    public void logActionCommand(int command) {
-    }
-
     @Override
     protected boolean isOfType(int type) {
         return (type & TYPE_ON_BOARD_POPUP) != 0;
diff --git a/src/com/android/launcher3/views/FloatingSurfaceView.java b/src/com/android/launcher3/views/FloatingSurfaceView.java
index 9582232279..011f6de8e2 100644
--- a/src/com/android/launcher3/views/FloatingSurfaceView.java
+++ b/src/com/android/launcher3/views/FloatingSurfaceView.java
@@ -121,9 +121,6 @@ public class FloatingSurfaceView extends AbstractFloatingView implements
         launcher.getDragLayer().addView(view);
     }
 
-    @Override
-    public void logActionCommand(int command) { }
-
     @Override
     protected boolean isOfType(int type) {
         return (type & TYPE_ICON_SURFACE) != 0;
diff --git a/src/com/android/launcher3/views/HeroSearchResultView.java b/src/com/android/launcher3/views/HeroSearchResultView.java
index 10f3c41f35..7b2df80b32 100644
--- a/src/com/android/launcher3/views/HeroSearchResultView.java
+++ b/src/com/android/launcher3/views/HeroSearchResultView.java
@@ -40,9 +40,7 @@ import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.shortcuts.ShortcutDragPreviewProvider;
 import com.android.launcher3.touch.ItemLongClickListener;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -118,12 +116,6 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
         mBubbleTextView.setIconVisible(true);
     }
 
-    @Override
-    public void fillInLogContainerData(ItemInfo childInfo, LauncherLogProto.Target child,
-            ArrayList<LauncherLogProto.Target> parents) {
-
-    }
-
     private void setWillDrawIcon(boolean willDraw) {
         mIconView.setVisibility(willDraw ? View.VISIBLE : View.INVISIBLE);
     }
diff --git a/src/com/android/launcher3/views/ListenerView.java b/src/com/android/launcher3/views/ListenerView.java
index 3ef778b575..6e3f0ce690 100644
--- a/src/com/android/launcher3/views/ListenerView.java
+++ b/src/com/android/launcher3/views/ListenerView.java
@@ -84,11 +84,6 @@ public class ListenerView extends AbstractFloatingView {
         mIsOpen = false;
     }
 
-    @Override
-    public void logActionCommand(int command) {
-        // Users do not interact with FloatingIconView, so there is nothing to log here.
-    }
-
     @Override
     protected boolean isOfType(int type) {
         return (type & TYPE_LISTENER) != 0;
diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java
index 9ad2331112..3ec20d57a1 100644
--- a/src/com/android/launcher3/views/OptionsPopupView.java
+++ b/src/com/android/launcher3/views/OptionsPopupView.java
@@ -107,11 +107,6 @@ public class OptionsPopupView extends ArrowPopup
         return true;
     }
 
-    @Override
-    public void logActionCommand(int command) {
-        // TODO:
-    }
-
     @Override
     protected boolean isOfType(int type) {
         return (type & TYPE_OPTIONS_POPUP) != 0;
diff --git a/src/com/android/launcher3/views/Snackbar.java b/src/com/android/launcher3/views/Snackbar.java
index 513ce59a62..49fcd2ebde 100644
--- a/src/com/android/launcher3/views/Snackbar.java
+++ b/src/com/android/launcher3/views/Snackbar.java
@@ -166,11 +166,6 @@ public class Snackbar extends AbstractFloatingView {
         }
     }
 
-    @Override
-    public void logActionCommand(int command) {
-        // TODO
-    }
-
     @Override
     protected boolean isOfType(int type) {
         return (type & TYPE_SNACKBAR) != 0;
diff --git a/src/com/android/launcher3/views/WorkEduView.java b/src/com/android/launcher3/views/WorkEduView.java
index d35a38fba8..d6737db725 100644
--- a/src/com/android/launcher3/views/WorkEduView.java
+++ b/src/com/android/launcher3/views/WorkEduView.java
@@ -38,7 +38,6 @@ import com.android.launcher3.allapps.AllAppsPagedView;
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.statemanager.StateManager.StateListener;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 
 /**
  * On boarding flow for users right after setting up work profile
@@ -88,16 +87,6 @@ public class WorkEduView extends AbstractSlideInView
         mLauncher.getStateManager().removeStateListener(this);
     }
 
-    @Override
-    public void logActionCommand(int command) {
-        // Since this is on-boarding popup, it is not a user controlled action.
-    }
-
-    @Override
-    public int getLogContainerType() {
-        return LauncherLogProto.ContainerType.TIP;
-    }
-
     @Override
     protected boolean isOfType(int type) {
         return (type & TYPE_ON_BOARD_POPUP) != 0;
diff --git a/src/com/android/launcher3/widget/BaseWidgetSheet.java b/src/com/android/launcher3/widget/BaseWidgetSheet.java
index 3e5113a231..01af96cb33 100644
--- a/src/com/android/launcher3/widget/BaseWidgetSheet.java
+++ b/src/com/android/launcher3/widget/BaseWidgetSheet.java
@@ -16,7 +16,6 @@
 package com.android.launcher3.widget;
 
 import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
-import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
 
 import android.content.Context;
 import android.graphics.Point;
@@ -31,20 +30,15 @@ import com.android.launcher3.DropTarget.DragObject;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.dragndrop.DragOptions;
-import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.popup.PopupDataProvider;
 import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.ItemLongClickListener;
 import com.android.launcher3.uioverrides.WallpaperColorInfo;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
 import com.android.launcher3.util.SystemUiController;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.AbstractSlideInView;
 
-import java.util.ArrayList;
-
 /**
  * Base class for various widgets popup
  */
@@ -149,28 +143,6 @@ abstract class BaseWidgetSheet extends AbstractSlideInView
                 isSheetDark ? SystemUiController.FLAG_DARK_NAV : SystemUiController.FLAG_LIGHT_NAV);
     }
 
-    @Override
-    public void fillInLogContainerData(ItemInfo childInfo, Target child,
-            ArrayList<Target> parents) {
-        Target target = newContainerTarget(ContainerType.WIDGETS);
-        target.cardinality = getElementsRowCount();
-        parents.add(target);
-    }
-
-    @Override
-    public final void logActionCommand(int command) {
-        Target target = newContainerTarget(getLogContainerType());
-        target.cardinality = getElementsRowCount();
-        mLauncher.getUserEventDispatcher().logActionCommand(command, target);
-    }
-
-    @Override
-    public int getLogContainerType() {
-        return ContainerType.WIDGETS;
-    }
-
-    protected abstract int getElementsRowCount();
-
     protected SystemUiController getSystemUiController() {
         return mLauncher.getSystemUiController();
     }
diff --git a/src/com/android/launcher3/widget/WidgetsBottomSheet.java b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
index 30be7a673d..3585a1814b 100644
--- a/src/com/android/launcher3/widget/WidgetsBottomSheet.java
+++ b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
@@ -179,11 +179,6 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
         setPadding(leftInset, getPaddingTop(), rightInset, bottomInset);
     }
 
-    @Override
-    protected int getElementsRowCount() {
-        return 1;
-    }
-
     @Override
     protected Pair<View, String> getAccessibilityTarget() {
         return Pair.create(findViewById(R.id.title),  getContext().getString(
diff --git a/src/com/android/launcher3/widget/WidgetsFullSheet.java b/src/com/android/launcher3/widget/WidgetsFullSheet.java
index 68a3ec51ee..4c8c339998 100644
--- a/src/com/android/launcher3/widget/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/WidgetsFullSheet.java
@@ -242,11 +242,6 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         return launcher.findViewById(R.id.widgets_list_view);
     }
 
-    @Override
-    protected int getElementsRowCount() {
-        return mAdapter.getItemCount();
-    }
-
     @Override
     public void addHintCloseAnim(
             float distanceToMove, Interpolator interpolator, PendingAnimation target) {
diff --git a/src_plugins/com/android/systemui/plugins/UserEventPlugin.java b/src_plugins/com/android/systemui/plugins/UserEventPlugin.java
deleted file mode 100644
index 0e3664ae3f..0000000000
--- a/src_plugins/com/android/systemui/plugins/UserEventPlugin.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.systemui.plugins;
-
-import com.android.systemui.plugins.annotations.ProvidesInterface;
-
-/**
- * Implement this plugin interface to access user event log on the device for prototype purpose.
- * NOTE: plugin is for internal prototype only and is not visible in production environment.
- */
-@ProvidesInterface(action = UserEventPlugin.ACTION, version = UserEventPlugin.VERSION)
-public interface UserEventPlugin extends Plugin {
-    String ACTION = "com.android.launcher3.action.PLUGIN_USER_EVENT_LOG";
-    int VERSION = 1;
-
-    /**
-     * Callback to be triggered whenever an user event occurs.
-     */
-    void onUserEvent(Object event);
-}
-- 
GitLab


From a2d6a91be904335767aee36844aeced5c84efc47 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Sun, 23 Aug 2020 15:58:39 -0700
Subject: [PATCH 0115/1664] Support settings search in AllApps

[preview attached to  BR]

Bug: 166044087
Test: Manual
Change-Id: I997fc1c7e2e2c500f64858df9ccea4911e05d649
---
 Android.mk                                    |   1 +
 res/layout/search_result_settings_row.xml     |  57 ++++++++++
 res/layout/search_result_slice.xml            |  19 ++++
 .../launcher3/allapps/AllAppsGridAdapter.java |  59 +++++++++-
 .../allapps/AllAppsSectionDecorator.java      |   4 +-
 .../views/SearchSettingsRowView.java          | 102 ++++++++++++++++++
 6 files changed, 235 insertions(+), 7 deletions(-)
 create mode 100644 res/layout/search_result_settings_row.xml
 create mode 100644 res/layout/search_result_slice.xml
 create mode 100644 src/com/android/launcher3/views/SearchSettingsRowView.java

diff --git a/Android.mk b/Android.mk
index 752b530ab0..25f5412d21 100644
--- a/Android.mk
+++ b/Android.mk
@@ -28,6 +28,7 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \
     androidx.recyclerview_recyclerview \
     androidx.dynamicanimation_dynamicanimation \
     androidx.preference_preference \
+    androidx.slice_slice-view \
     iconloader_base
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
diff --git a/res/layout/search_result_settings_row.xml b/res/layout/search_result_settings_row.xml
new file mode 100644
index 0000000000..19daf346e2
--- /dev/null
+++ b/res/layout/search_result_settings_row.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.launcher3.views.SearchSettingsRowView xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/TextHeadline"
+    android:id="@+id/section_title"
+    android:background="?android:attr/selectableItemBackground"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:gravity="center_vertical"
+    android:padding="4dp"
+    android:minHeight="48dp"
+    android:textColor="?android:attr/textColorPrimary"
+    android:textSize="14sp">
+
+    <TextView
+        android:id="@+id/title"
+        style="@style/TextTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="16sp" />
+
+    <TextView
+        android:id="@+id/description"
+        style="@style/TextTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="14sp" />
+
+    <TextView
+        android:id="@+id/breadcrumbs"
+        style="@style/TextTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:alpha=".7"
+        android:textColor="?android:attr/textColorSecondary"
+        android:textSize="14sp" />
+
+
+</com.android.launcher3.views.SearchSettingsRowView>
\ No newline at end of file
diff --git a/res/layout/search_result_slice.xml b/res/layout/search_result_slice.xml
new file mode 100644
index 0000000000..ea1d49a56d
--- /dev/null
+++ b/res/layout/search_result_slice.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<androidx.slice.widget.SliceView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingHorizontal="4dp" />
\ No newline at end of file
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index c61f01f206..da161ac1cc 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -20,6 +20,7 @@ import static com.android.launcher3.touch.ItemLongClickListener.INSTANCE_ALL_APP
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
+import android.net.Uri;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -30,18 +31,27 @@ import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityEvent;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.view.accessibility.AccessibilityEventCompat;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
 import androidx.core.view.accessibility.AccessibilityRecordCompat;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LifecycleRegistry;
+import androidx.lifecycle.LiveData;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+import androidx.slice.Slice;
+import androidx.slice.widget.SliceLiveData;
+import androidx.slice.widget.SliceView;
 
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.search.AllAppsSearchBarController.PayloadResultHandler;
 import com.android.launcher3.allapps.search.SearchSectionInfo;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.util.PackageManagerHelper;
 
@@ -50,7 +60,9 @@ import java.util.List;
 /**
  * The grid view adapter of all the apps.
  */
-public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter.ViewHolder> {
+public class AllAppsGridAdapter extends
+        RecyclerView.Adapter<AllAppsGridAdapter.ViewHolder> implements
+        LifecycleOwner {
 
     public static final String TAG = "AppsGridAdapter";
 
@@ -71,12 +83,18 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter.
 
     public static final int VIEW_TYPE_SEARCH_HERO_APP = 1 << 6;
 
-    public static final int DETAIL_ROW_WITH_BUTTON = 1 << 7;
+    public static final int VIEW_TYPE_SEARCH_ROW_WITH_BUTTON = 1 << 7;
+
+    public static final int VIEW_TYPE_SEARCH_ROW = 1 << 8;
+
+    public static final int VIEW_TYPE_SEARCH_SLICE = 1 << 9;
 
     // Common view type masks
     public static final int VIEW_TYPE_MASK_DIVIDER = VIEW_TYPE_ALL_APPS_DIVIDER;
     public static final int VIEW_TYPE_MASK_ICON = VIEW_TYPE_ICON;
 
+    private final LifecycleRegistry mLifecycleRegistry;
+
     /**
      * ViewHolder for each icon.
      */
@@ -159,12 +177,15 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter.
         boolean isCountedForAccessibility() {
             return viewType == VIEW_TYPE_ICON
                     || viewType == VIEW_TYPE_SEARCH_HERO_APP
-                    || viewType == DETAIL_ROW_WITH_BUTTON;
+                    || viewType == VIEW_TYPE_SEARCH_ROW_WITH_BUTTON
+                    || viewType == VIEW_TYPE_SEARCH_SLICE
+                    || viewType == VIEW_TYPE_SEARCH_ROW;
         }
     }
 
     /**
      * Extension of AdapterItem that contains an extra payload specific to item
+     *
      * @param <T> Play load Type
      */
     public static class AdapterItemWithPayload<T> extends AdapterItem {
@@ -310,6 +331,12 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter.
         mOnIconClickListener = launcher.getItemOnClickListener();
 
         setAppsPerRow(mLauncher.getDeviceProfile().inv.numAllAppsColumns);
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
+            mLifecycleRegistry = new LifecycleRegistry(this);
+            mLifecycleRegistry.setCurrentState(Lifecycle.State.STARTED);
+        } else {
+            mLifecycleRegistry = null;
+        }
     }
 
     public void setAppsPerRow(int appsPerRow) {
@@ -390,9 +417,15 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter.
             case VIEW_TYPE_SEARCH_HERO_APP:
                 return new ViewHolder(mLayoutInflater.inflate(
                         R.layout.search_result_hero_app, parent, false));
-            case DETAIL_ROW_WITH_BUTTON:
+            case VIEW_TYPE_SEARCH_ROW_WITH_BUTTON:
                 return new ViewHolder(mLayoutInflater.inflate(
                         R.layout.search_result_play_item, parent, false));
+            case VIEW_TYPE_SEARCH_ROW:
+                return new ViewHolder(mLayoutInflater.inflate(
+                        R.layout.search_result_settings_row, parent, false));
+            case VIEW_TYPE_SEARCH_SLICE:
+                return new ViewHolder(mLayoutInflater.inflate(
+                        R.layout.search_result_slice, parent, false));
             default:
                 throw new RuntimeException("Unexpected view type");
         }
@@ -421,9 +454,20 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter.
                     searchView.setVisibility(View.GONE);
                 }
                 break;
+            case VIEW_TYPE_SEARCH_SLICE:
+                SliceView sliceView = (SliceView) holder.itemView;
+                Uri uri = ((AdapterItemWithPayload<Uri>) mApps.getAdapterItems().get(position))
+                        .getPayload();
+                try {
+                    LiveData<Slice> liveData = SliceLiveData.fromUri(mLauncher, uri);
+                    liveData.observe(this::getLifecycle, sliceView);
+                } catch (Exception ignored) {
+                }
+                break;
             case VIEW_TYPE_SEARCH_CORPUS_TITLE:
-            case DETAIL_ROW_WITH_BUTTON:
+            case VIEW_TYPE_SEARCH_ROW_WITH_BUTTON:
             case VIEW_TYPE_SEARCH_HERO_APP:
+            case VIEW_TYPE_SEARCH_ROW:
                 PayloadResultHandler payloadResultView = (PayloadResultHandler) holder.itemView;
                 payloadResultView.applyAdapterInfo(
                         (AdapterItemWithPayload) mApps.getAdapterItems().get(position));
@@ -451,4 +495,9 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter.
         return item.viewType;
     }
 
+    @NonNull
+    @Override
+    public Lifecycle getLifecycle() {
+        return mLifecycleRegistry;
+    }
 }
diff --git a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
index 9534c85cf6..0214c3547d 100644
--- a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
+++ b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
@@ -108,8 +108,8 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
         private final boolean mIsFullWidth;
         private final float mRadius;
 
-        private final int mFocusColor;
-        private final int mFillcolor;
+        protected int mFocusColor;
+        protected int mFillcolor;
         private final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
 
 
diff --git a/src/com/android/launcher3/views/SearchSettingsRowView.java b/src/com/android/launcher3/views/SearchSettingsRowView.java
new file mode 100644
index 0000000000..08c78ffc3a
--- /dev/null
+++ b/src/com/android/launcher3/views/SearchSettingsRowView.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.views;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+import com.android.launcher3.allapps.AllAppsGridAdapter;
+import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+
+import java.util.ArrayList;
+
+/**
+ * A row of tappable TextViews with a breadcrumb for settings search.
+ */
+public class SearchSettingsRowView extends LinearLayout implements
+        View.OnClickListener, AllAppsSearchBarController.PayloadResultHandler<Bundle> {
+
+    private TextView mTitleView;
+    private TextView mDescriptionView;
+    private TextView mBreadcrumbsView;
+    private Intent mIntent;
+
+    public SearchSettingsRowView(@NonNull Context context) {
+        super(context);
+    }
+
+    public SearchSettingsRowView(@NonNull Context context,
+            @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public SearchSettingsRowView(@NonNull Context context, @Nullable AttributeSet attrs,
+            int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mTitleView = findViewById(R.id.title);
+        mDescriptionView = findViewById(R.id.description);
+        mBreadcrumbsView = findViewById(R.id.breadcrumbs);
+        setOnClickListener(this);
+    }
+
+    @Override
+    public void applyAdapterInfo(
+            AllAppsGridAdapter.AdapterItemWithPayload<Bundle> adapterItemWithPayload) {
+        Bundle bundle = adapterItemWithPayload.getPayload();
+        mIntent = bundle.getParcelable("intent");
+        showIfAvailable(mTitleView, bundle.getString("title"));
+        showIfAvailable(mDescriptionView, bundle.getString("description"));
+        ArrayList<String> breadcrumbs = bundle.getStringArrayList("breadcrumbs");
+        //TODO: implement RTL friendly breadcrumbs view
+        showIfAvailable(mBreadcrumbsView, breadcrumbs != null
+                ? String.join(" > ", breadcrumbs) : null);
+        adapterItemWithPayload.setSelectionHandler(() -> onClick(this));
+    }
+
+    private void showIfAvailable(TextView view, @Nullable String string) {
+        if (TextUtils.isEmpty(string)) {
+            view.setVisibility(GONE);
+        } else {
+            view.setVisibility(VISIBLE);
+            view.setText(string);
+        }
+    }
+
+    @Override
+    public void onClick(View view) {
+        if (mIntent == null) return;
+        // TODO: create ItemInfo object and then use it to call startActivityForResult for proper
+        //  WW logging
+        Launcher launcher = Launcher.getLauncher(view.getContext());
+        launcher.startActivityForResult(mIntent, 0);
+    }
+}
-- 
GitLab


From 8acdb23e64a7e48ad7f15dac22816e7bf95292a9 Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Tue, 25 Aug 2020 18:26:29 -0700
Subject: [PATCH 0116/1664] Init rotationTouchHelper before NavModeChange
 listener

NavModeChange listener relies on rotationTouchHelper
to be non-null, but we instantiate rotationTouchHelper
after nav mode changes are fired off.

Fixes: 166303464
Change-Id: Iab92d0fe0ee842d907d7226dfd9ca599e7729675
---
 .../src/com/android/quickstep/TouchInteractionService.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 2387692eb9..5b4a2395cd 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -249,10 +249,10 @@ public class TouchInteractionService extends Service implements PluginListener<O
         mMainChoreographer = Choreographer.getInstance();
         mAM = ActivityManagerWrapper.getInstance();
         mDeviceState = new RecentsAnimationDeviceState(this);
+        mRotationTouchHelper = mDeviceState.getRotationTouchHelper();
         mDeviceState.addNavigationModeChangedCallback(this::onNavigationModeChanged);
         mDeviceState.addOneHandedModeChangedCallback(this::onOneHandedModeOverlayChanged);
         mDeviceState.runOnUserUnlocked(this::onUserUnlocked);
-        mRotationTouchHelper = mDeviceState.getRotationTouchHelper();
         ProtoTracer.INSTANCE.get(this).add(this);
 
         sConnected = true;
-- 
GitLab


From d6bacdcaf069d35ff86a70bd8f5b817458d7c882 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Sun, 23 Aug 2020 21:56:07 -0700
Subject: [PATCH 0117/1664] Handle AppSearch in plugin

+ Use AppSearchPipeline as a fallback if plugin times out

Bug: 166058597
Test: Manual
Change-Id: I96a38e412fd08f47475d2bc37bff34b86538ea12
---
 src/com/android/launcher3/BubbleTextView.java | 17 +++--
 .../allapps/search/AppsSearchPipeline.java    | 64 +------------------
 .../search/DefaultAppSearchAlgorithm.java     |  2 +-
 .../android/launcher3/model/AllAppsList.java  |  2 +-
 .../launcher3/views/HeroSearchResultView.java | 10 +--
 .../launcher3/widget/WidgetsListAdapter.java  | 22 +++----
 6 files changed, 32 insertions(+), 85 deletions(-)

diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 55d5de758a..06bb263f23 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -79,7 +79,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
     private static final int DISPLAY_FOLDER = 2;
     private static final int DISPLAY_HERO_APP = 5;
 
-    private static final int[] STATE_PRESSED = new int[] {android.R.attr.state_pressed};
+    private static final int[] STATE_PRESSED = new int[]{android.R.attr.state_pressed};
 
     private final PointF mTranslationForReorderBounce = new PointF(0, 0);
     private final PointF mTranslationForReorderPreview = new PointF(0, 0);
@@ -280,7 +280,10 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         applyDotState(info, false /* animate */);
     }
 
-    public void applyFromPackageItemInfo(PackageItemInfo info) {
+    /**
+     * Apply label and tag using a generic {@link ItemInfoWithIcon}
+     */
+    public void applyFromItemInfoWithIcon(ItemInfoWithIcon info) {
         applyIconAndLabel(info);
         // We don't need to check the info since it's not a WorkspaceItemInfo
         super.setTag(info);
@@ -407,12 +410,14 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
 
     /**
      * Draws the notification dot in the top right corner of the icon bounds.
+     *
      * @param canvas The canvas to draw to.
      */
     protected void drawDotIfNecessary(Canvas canvas) {
         if (!mForceHideDot && (hasDot() || mDotParams.scale > 0)) {
             getIconBounds(mDotParams.iconBounds);
-            Utilities.scaleRectAboutCenter(mDotParams.iconBounds, IconShape.getNormalizationScale());
+            Utilities.scaleRectAboutCenter(mDotParams.iconBounds,
+                    IconShape.getNormalizationScale());
             final int scrollX = getScrollX();
             final int scrollY = getScrollY();
             canvas.translate(scrollX, scrollY);
@@ -507,6 +512,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
 
     /**
      * Creates an animator to fade the text in or out.
+     *
      * @param fadeIn Whether the text should fade in or fade out.
      */
     public ObjectAnimator createTextAlphaAnimator(boolean fadeIn) {
@@ -663,7 +669,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
                 applyFromWorkspaceItem((WorkspaceItemInfo) info);
                 mActivity.invalidateParent(info);
             } else if (info instanceof PackageItemInfo) {
-                applyFromPackageItemInfo((PackageItemInfo) info);
+                applyFromItemInfoWithIcon((PackageItemInfo) info);
             }
 
             mDisableRelayout = false;
@@ -761,7 +767,8 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
     public SafeCloseable prepareDrawDragView() {
         resetIconScale();
         setForceHideDot(true);
-        return () -> { };
+        return () -> {
+        };
     }
 
     private void resetIconScale() {
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java b/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
index 6e9a7da4ae..dc9c1559d5 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
@@ -15,26 +15,15 @@
  */
 package com.android.launcher3.allapps.search;
 
-import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_SHORTCUTS;
-import static com.android.launcher3.allapps.AllAppsGridAdapter.VIEW_TYPE_SEARCH_HERO_APP;
-
 import android.content.Context;
-import android.content.pm.ShortcutInfo;
-
-import androidx.annotation.WorkerThread;
 
 import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.allapps.AllAppsGridAdapter;
 import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItem;
 import com.android.launcher3.allapps.AllAppsSectionDecorator.SectionDecorationHandler;
-import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.model.AllAppsList;
 import com.android.launcher3.model.BaseModelUpdateTask;
 import com.android.launcher3.model.BgDataModel;
 import com.android.launcher3.model.data.AppInfo;
-import com.android.launcher3.model.data.WorkspaceItemInfo;
-import com.android.launcher3.popup.PopupPopulator;
-import com.android.launcher3.shortcuts.ShortcutRequest;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -46,64 +35,28 @@ import java.util.function.Consumer;
 public class AppsSearchPipeline implements SearchPipeline {
 
     private static final int MAX_RESULTS_COUNT = 5;
-    private static final int MAX_HERO_SECTION_COUNT = 2;
-    private static final int MAX_SHORTCUTS_COUNT = 2;
 
     private final SearchSectionInfo mSearchSectionInfo;
     private final LauncherAppState mLauncherAppState;
-    private final boolean mHeroSectionSupported;
 
     public AppsSearchPipeline(Context context, LauncherAppState launcherAppState) {
-        this(context, launcherAppState, true);
-    }
-
-    public AppsSearchPipeline(Context context, LauncherAppState launcherAppState,
-            boolean supportsHeroView) {
         mLauncherAppState = launcherAppState;
         mSearchSectionInfo = new SearchSectionInfo();
         mSearchSectionInfo.setDecorationHandler(
                 new SectionDecorationHandler(context, true));
-        mHeroSectionSupported = supportsHeroView;
     }
 
     @Override
-    @WorkerThread
     public void performSearch(String query, Consumer<ArrayList<AdapterItem>> callback) {
         mLauncherAppState.getModel().enqueueModelUpdateTask(new BaseModelUpdateTask() {
             @Override
             public void execute(LauncherAppState app, BgDataModel dataModel, AllAppsList apps) {
                 List<AppInfo> matchingResults = getTitleMatchResult(apps.data, query);
-                if (mHeroSectionSupported && matchingResults.size() <= MAX_HERO_SECTION_COUNT) {
-                    callback.accept(getHeroAdapterItems(app.getContext(), matchingResults));
-                } else {
-                    callback.accept(getAdapterItems(matchingResults));
-                }
+                callback.accept(getAdapterItems(matchingResults));
             }
         });
     }
 
-    /**
-     * Returns MAX_SHORTCUTS_COUNT shortcuts from local cache
-     * TODO: Shortcuts should be ranked based on relevancy
-     */
-    private ArrayList<WorkspaceItemInfo> getShortcutInfos(Context context, AppInfo appInfo) {
-        List<ShortcutInfo> shortcuts = new ShortcutRequest(context, appInfo.user)
-                .withContainer(appInfo.getTargetComponent())
-                .query(ShortcutRequest.PUBLISHED);
-        shortcuts = PopupPopulator.sortAndFilterShortcuts(shortcuts, null);
-        IconCache cache = LauncherAppState.getInstance(context).getIconCache();
-        ArrayList<WorkspaceItemInfo> shortcutItems = new ArrayList<>();
-        for (int i = 0; i < shortcuts.size() && i < MAX_SHORTCUTS_COUNT; i++) {
-            final ShortcutInfo shortcut = shortcuts.get(i);
-            final WorkspaceItemInfo si = new WorkspaceItemInfo(shortcut, context);
-            cache.getUnbadgedShortcutIcon(si, shortcut);
-            si.rank = i;
-            si.container = CONTAINER_SHORTCUTS;
-            shortcutItems.add(si);
-        }
-        return shortcutItems;
-    }
-
     /**
      * Filters {@link AppInfo}s matching specified query
      */
@@ -122,21 +75,6 @@ public class AppsSearchPipeline implements SearchPipeline {
         return result;
     }
 
-    private ArrayList<AdapterItem> getHeroAdapterItems(Context context, List<AppInfo> apps) {
-        ArrayList<AdapterItem> adapterItems = new ArrayList<>();
-        for (int i = 0; i < apps.size(); i++) {
-            //hero app
-            AppInfo appInfo = apps.get(i);
-            ArrayList<WorkspaceItemInfo> shortcuts = getShortcutInfos(context, appInfo);
-            AdapterItem adapterItem = new AllAppsGridAdapter.AdapterItemWithPayload(shortcuts,
-                    VIEW_TYPE_SEARCH_HERO_APP);
-            adapterItem.appInfo = appInfo;
-            adapterItem.searchSectionInfo = mSearchSectionInfo;
-            adapterItems.add(adapterItem);
-        }
-        return adapterItems;
-    }
-
     private ArrayList<AdapterItem> getAdapterItems(List<AppInfo> matchingApps) {
         ArrayList<AdapterItem> items = new ArrayList<>();
         for (int i = 0; i < matchingApps.size() && i < MAX_RESULTS_COUNT; i++) {
diff --git a/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java b/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java
index d757f78523..5ed7de54fa 100644
--- a/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java
+++ b/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java
@@ -33,7 +33,7 @@ public class DefaultAppSearchAlgorithm implements SearchAlgorithm {
 
     public DefaultAppSearchAlgorithm(Context context, LauncherAppState launcherAppState) {
         mResultHandler = new Handler();
-        mAppsSearchPipeline = new AppsSearchPipeline(context, launcherAppState, false);
+        mAppsSearchPipeline = new AppsSearchPipeline(context, launcherAppState);
     }
 
     @Override
diff --git a/src/com/android/launcher3/model/AllAppsList.java b/src/com/android/launcher3/model/AllAppsList.java
index eb5d1068ac..2695e66591 100644
--- a/src/com/android/launcher3/model/AllAppsList.java
+++ b/src/com/android/launcher3/model/AllAppsList.java
@@ -305,7 +305,7 @@ public class AllAppsList {
      *
      * @return the corresponding AppInfo or null
      */
-    private @Nullable AppInfo findAppInfo(@NonNull ComponentName componentName,
+    public @Nullable AppInfo findAppInfo(@NonNull ComponentName componentName,
                                           @NonNull UserHandle user) {
         for (AppInfo info: data) {
             if (componentName.equals(info.componentName) && user.equals(info.user)) {
diff --git a/src/com/android/launcher3/views/HeroSearchResultView.java b/src/com/android/launcher3/views/HeroSearchResultView.java
index 7b2df80b32..761ef0d639 100644
--- a/src/com/android/launcher3/views/HeroSearchResultView.java
+++ b/src/com/android/launcher3/views/HeroSearchResultView.java
@@ -37,6 +37,7 @@ import com.android.launcher3.dragndrop.DraggableView;
 import com.android.launcher3.graphics.DragPreviewProvider;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.shortcuts.ShortcutDragPreviewProvider;
 import com.android.launcher3.touch.ItemLongClickListener;
@@ -47,8 +48,9 @@ import java.util.List;
  * A view representing a high confidence app search result that includes shortcuts
  */
 public class HeroSearchResultView extends LinearLayout implements DragSource,
-        AllAppsSearchBarController.PayloadResultHandler<List<WorkspaceItemInfo>> {
+        AllAppsSearchBarController.PayloadResultHandler<List<ItemInfoWithIcon>> {
 
+    public static final int MAX_SHORTCUTS_COUNT = 2;
     BubbleTextView mBubbleTextView;
     View mIconView;
     BubbleTextView[] mDeepShortcutTextViews = new BubbleTextView[2];
@@ -97,15 +99,15 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
      * Apply {@link ItemInfo} for appIcon and shortcut Icons
      */
     @Override
-    public void applyAdapterInfo(AdapterItemWithPayload<List<WorkspaceItemInfo>> adapterItem) {
+    public void applyAdapterInfo(AdapterItemWithPayload<List<ItemInfoWithIcon>> adapterItem) {
         mBubbleTextView.applyFromApplicationInfo(adapterItem.appInfo);
         mIconView.setBackground(mBubbleTextView.getIcon());
         mIconView.setTag(adapterItem.appInfo);
-        List<WorkspaceItemInfo> shorcutInfos = adapterItem.getPayload();
+        List<ItemInfoWithIcon> shorcutInfos = adapterItem.getPayload();
         for (int i = 0; i < mDeepShortcutTextViews.length; i++) {
             mDeepShortcutTextViews[i].setVisibility(shorcutInfos.size() > i ? VISIBLE : GONE);
             if (i < shorcutInfos.size()) {
-                mDeepShortcutTextViews[i].applyFromWorkspaceItem(shorcutInfos.get(i));
+                mDeepShortcutTextViews[i].applyFromItemInfoWithIcon(shorcutInfos.get(i));
             }
         }
     }
diff --git a/src/com/android/launcher3/widget/WidgetsListAdapter.java b/src/com/android/launcher3/widget/WidgetsListAdapter.java
index a45521dee7..5bf96906be 100644
--- a/src/com/android/launcher3/widget/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/WidgetsListAdapter.java
@@ -23,9 +23,12 @@ import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
 import android.view.ViewGroup;
 
-import com.android.launcher3.icons.IconCache;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.Adapter;
+
 import com.android.launcher3.R;
 import com.android.launcher3.WidgetPreviewLoader;
+import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.util.LabelComparator;
 
@@ -34,9 +37,6 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.RecyclerView.Adapter;
-
 /**
  * List view adapter for the widget tray.
  *
@@ -128,7 +128,7 @@ public class WidgetsListAdapter extends Adapter<WidgetsRowViewHolder> {
         int childCount = row.getChildCount();
 
         if (expectedChildCount > childCount) {
-            for (int i = childCount ; i < expectedChildCount; i++) {
+            for (int i = childCount; i < expectedChildCount; i++) {
                 if ((i & 1) == 1) {
                     // Add a divider for odd index
                     mLayoutInflater.inflate(R.layout.widget_list_divider, row);
@@ -144,24 +144,24 @@ public class WidgetsListAdapter extends Adapter<WidgetsRowViewHolder> {
                 }
             }
         } else if (expectedChildCount < childCount) {
-            for (int i = expectedChildCount ; i < childCount; i++) {
+            for (int i = expectedChildCount; i < childCount; i++) {
                 row.getChildAt(i).setVisibility(View.GONE);
             }
         }
 
         // Bind the views in the application info section.
-        holder.title.applyFromPackageItemInfo(entry.pkgItem);
+        holder.title.applyFromItemInfoWithIcon(entry.pkgItem);
 
         // Bind the view in the widget horizontal tray region.
-        for (int i=0; i < infoList.size(); i++) {
-            WidgetCell widget = (WidgetCell) row.getChildAt(2*i);
+        for (int i = 0; i < infoList.size(); i++) {
+            WidgetCell widget = (WidgetCell) row.getChildAt(2 * i);
             widget.applyFromCellItem(infoList.get(i), mWidgetPreviewLoader);
             widget.setApplyBitmapDeferred(mApplyBitmapDeferred);
             widget.ensurePreview();
             widget.setVisibility(View.VISIBLE);
 
             if (i > 0) {
-                row.getChildAt(2*i - 1).setVisibility(View.VISIBLE);
+                row.getChildAt(2 * i - 1).setVisibility(View.VISIBLE);
             }
         }
     }
@@ -185,7 +185,7 @@ public class WidgetsListAdapter extends Adapter<WidgetsRowViewHolder> {
     @Override
     public void onViewRecycled(WidgetsRowViewHolder holder) {
         int total = holder.cellContainer.getChildCount();
-        for (int i = 0; i < total; i+=2) {
+        for (int i = 0; i < total; i += 2) {
             WidgetCell widget = (WidgetCell) holder.cellContainer.getChildAt(i);
             widget.clear();
         }
-- 
GitLab


From d4d2a73b67324dc1b5312dd0e93f6222619aa260 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Sat, 22 Aug 2020 02:09:42 -0700
Subject: [PATCH 0118/1664] Removing MultiHashMap and using java-streams
 instead

This makes it easier to choose different collection
implementations

Change-Id: Ic44e128b7478fcbbb1b546027685e058945af3f9
---
 .../launcher3/model/FirstScreenBroadcast.java |  43 +++---
 .../android/launcher3/model/LoaderTask.java   |   7 +-
 .../android/launcher3/model/ModelUtils.java   |  10 +-
 .../model/SdCardAvailableReceiver.java        |  26 ++--
 .../launcher3/model/ShortcutsChangedTask.java |  62 ++++----
 .../launcher3/popup/PopupDataProvider.java    |  20 +--
 .../launcher3/popup/SystemShortcut.java       |   2 +-
 .../launcher3/util/ItemInfoMatcher.java       |   3 +-
 .../android/launcher3/util/MultiHashMap.java  |  52 -------
 .../android/launcher3/model/WidgetsModel.java | 144 +++++++++---------
 10 files changed, 150 insertions(+), 219 deletions(-)
 delete mode 100644 src/com/android/launcher3/util/MultiHashMap.java

diff --git a/src/com/android/launcher3/model/FirstScreenBroadcast.java b/src/com/android/launcher3/model/FirstScreenBroadcast.java
index 5112304fb8..70d1b481e6 100644
--- a/src/com/android/launcher3/model/FirstScreenBroadcast.java
+++ b/src/com/android/launcher3/model/FirstScreenBroadcast.java
@@ -17,25 +17,30 @@ package com.android.launcher3.model;
 
 import static android.os.Process.myUserHandle;
 
+import static com.android.launcher3.pm.InstallSessionHelper.getUserHandle;
+
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.mapping;
+
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInstaller.SessionInfo;
+import android.os.UserHandle;
 import android.util.Log;
 
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
-import com.android.launcher3.util.MultiHashMap;
 import com.android.launcher3.util.PackageUserKey;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * Helper class to send broadcasts to package installers that have:
@@ -61,26 +66,10 @@ public class FirstScreenBroadcast {
 
     private static final String VERIFICATION_TOKEN_EXTRA = "verificationToken";
 
-    private final MultiHashMap<String, String> mPackagesForInstaller;
+    private final HashMap<PackageUserKey, SessionInfo> mSessionInfoForPackage;
 
     public FirstScreenBroadcast(HashMap<PackageUserKey, SessionInfo> sessionInfoForPackage) {
-        mPackagesForInstaller = getPackagesForInstaller(sessionInfoForPackage);
-    }
-
-    /**
-     * @return Map where the key is the package name of the installer, and the value is a list
-     *         of packages with active sessions for that installer.
-     */
-    private MultiHashMap<String, String> getPackagesForInstaller(
-            HashMap<PackageUserKey, SessionInfo> sessionInfoForPackage) {
-        MultiHashMap<String, String> packagesForInstaller = new MultiHashMap<>();
-        for (Map.Entry<PackageUserKey, SessionInfo> entry : sessionInfoForPackage.entrySet()) {
-            if (myUserHandle().equals(entry.getKey().mUser)) {
-                packagesForInstaller.addToList(entry.getValue().getInstallerPackageName(),
-                        entry.getKey().mPackageName);
-            }
-        }
-        return packagesForInstaller;
+        mSessionInfoForPackage = sessionInfoForPackage;
     }
 
     /**
@@ -88,9 +77,15 @@ public class FirstScreenBroadcast {
      * first screen.
      */
     public void sendBroadcasts(Context context, List<ItemInfo> firstScreenItems) {
-        for (Map.Entry<String, ArrayList<String>> entry : mPackagesForInstaller.entrySet()) {
-            sendBroadcastToInstaller(context, entry.getKey(), entry.getValue(), firstScreenItems);
-        }
+        UserHandle myUser = myUserHandle();
+        mSessionInfoForPackage
+                .values()
+                .stream()
+                .filter(info -> myUser.equals(getUserHandle(info)))
+                .collect(groupingBy(SessionInfo::getInstallerPackageName,
+                        mapping(SessionInfo::getAppPackageName, Collectors.toSet())))
+                .forEach((installer, packages) ->
+                    sendBroadcastToInstaller(context, installer, packages, firstScreenItems));
     }
 
     /**
@@ -99,7 +94,7 @@ public class FirstScreenBroadcast {
      * @param firstScreenItems List of items on the first screen.
      */
     private void sendBroadcastToInstaller(Context context, String installerPackageName,
-            List<String> packages, List<ItemInfo> firstScreenItems) {
+            Set<String> packages, List<ItemInfo> firstScreenItems) {
         Set<String> folderItems = new HashSet<>();
         Set<String> workspaceItems = new HashSet<>();
         Set<String> hotseatItems = new HashSet<>();
diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index 983ec0c176..a9e385fcc2 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -81,7 +81,6 @@ import com.android.launcher3.shortcuts.ShortcutRequest.QueryResult;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.IOUtils;
 import com.android.launcher3.util.LooperIdleLock;
-import com.android.launcher3.util.MultiHashMap;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.launcher3.util.PackageUserKey;
 import com.android.launcher3.util.TraceHelper;
@@ -90,8 +89,10 @@ import com.android.launcher3.widget.WidgetManagerHelper;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.CancellationException;
 
 /**
@@ -302,7 +303,7 @@ public class LoaderTask implements Runnable {
         final PackageManagerHelper pmHelper = new PackageManagerHelper(context);
         final boolean isSafeMode = pmHelper.isSafeMode();
         final boolean isSdCardReady = Utilities.isBootCompleted();
-        final MultiHashMap<UserHandle, String> pendingPackages = new MultiHashMap<>();
+        final Set<PackageUserKey> pendingPackages = new HashSet<>();
 
         boolean clearDb = false;
         try {
@@ -483,7 +484,7 @@ public class LoaderTask implements Runnable {
                                     // SdCard is not ready yet. Package might get available,
                                     // once it is ready.
                                     Log.d(TAG, "Missing pkg, will check later: " + targetPkg);
-                                    pendingPackages.addToList(c.user, targetPkg);
+                                    pendingPackages.add(new PackageUserKey(targetPkg, c.user));
                                     // Add the icon on the workspace anyway.
                                     allowMissingTarget = true;
                                 } else {
diff --git a/src/com/android/launcher3/model/ModelUtils.java b/src/com/android/launcher3/model/ModelUtils.java
index a8cc9ad3f3..9b5fac8734 100644
--- a/src/com/android/launcher3/model/ModelUtils.java
+++ b/src/com/android/launcher3/model/ModelUtils.java
@@ -36,8 +36,8 @@ import com.android.launcher3.util.IntSet;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.IntStream;
 
 /**
@@ -56,13 +56,7 @@ public class ModelUtils {
             ArrayList<T> currentScreenItems,
             ArrayList<T> otherScreenItems) {
         // Purge any null ItemInfos
-        Iterator<T> iter = allWorkspaceItems.iterator();
-        while (iter.hasNext()) {
-            ItemInfo i = iter.next();
-            if (i == null) {
-                iter.remove();
-            }
-        }
+        allWorkspaceItems.removeIf(Objects::isNull);
         // Order the set of items by their containers first, this allows use to walk through the
         // list sequentially, build up a list of containers that are in the specified screen,
         // as well as all items in those containers.
diff --git a/src/com/android/launcher3/model/SdCardAvailableReceiver.java b/src/com/android/launcher3/model/SdCardAvailableReceiver.java
index eb3cb52796..3798575f8a 100644
--- a/src/com/android/launcher3/model/SdCardAvailableReceiver.java
+++ b/src/com/android/launcher3/model/SdCardAvailableReceiver.java
@@ -24,12 +24,11 @@ import android.os.UserHandle;
 
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherModel;
-import com.android.launcher3.util.MultiHashMap;
 import com.android.launcher3.util.PackageManagerHelper;
+import com.android.launcher3.util.PackageUserKey;
 
 import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Map.Entry;
+import java.util.Set;
 
 /**
  * Helper class to re-query app status when SD-card becomes available.
@@ -42,10 +41,9 @@ public class SdCardAvailableReceiver extends BroadcastReceiver {
 
     private final LauncherModel mModel;
     private final Context mContext;
-    private final MultiHashMap<UserHandle, String> mPackages;
+    private final Set<PackageUserKey> mPackages;
 
-    public SdCardAvailableReceiver(LauncherAppState app,
-            MultiHashMap<UserHandle, String> packages) {
+    public SdCardAvailableReceiver(LauncherAppState app, Set<PackageUserKey> packages) {
         mModel = app.getModel();
         mContext = app.getContext();
         mPackages = packages;
@@ -55,19 +53,17 @@ public class SdCardAvailableReceiver extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         final LauncherApps launcherApps = context.getSystemService(LauncherApps.class);
         final PackageManagerHelper pmHelper = new PackageManagerHelper(context);
-        for (Entry<UserHandle, ArrayList<String>> entry : mPackages.entrySet()) {
-            UserHandle user = entry.getKey();
+        for (PackageUserKey puk : mPackages) {
+            UserHandle user = puk.mUser;
 
             final ArrayList<String> packagesRemoved = new ArrayList<>();
             final ArrayList<String> packagesUnavailable = new ArrayList<>();
 
-            for (String pkg : new HashSet<>(entry.getValue())) {
-                if (!launcherApps.isPackageEnabled(pkg, user)) {
-                    if (pmHelper.isAppOnSdcard(pkg, user)) {
-                        packagesUnavailable.add(pkg);
-                    } else {
-                        packagesRemoved.add(pkg);
-                    }
+            if (!launcherApps.isPackageEnabled(puk.mPackageName, user)) {
+                if (pmHelper.isAppOnSdcard(puk.mPackageName, user)) {
+                    packagesUnavailable.add(puk.mPackageName);
+                } else {
+                    packagesRemoved.add(puk.mPackageName);
                 }
             }
             if (!packagesRemoved.isEmpty()) {
diff --git a/src/com/android/launcher3/model/ShortcutsChangedTask.java b/src/com/android/launcher3/model/ShortcutsChangedTask.java
index 88006ba6fb..6fedad1c9d 100644
--- a/src/com/android/launcher3/model/ShortcutsChangedTask.java
+++ b/src/com/android/launcher3/model/ShortcutsChangedTask.java
@@ -25,11 +25,12 @@ import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.shortcuts.ShortcutKey;
 import com.android.launcher3.shortcuts.ShortcutRequest;
 import com.android.launcher3.util.ItemInfoMatcher;
-import com.android.launcher3.util.MultiHashMap;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * Handles changes due to shortcut manager updates (deep shortcut changes)
@@ -53,54 +54,53 @@ public class ShortcutsChangedTask extends BaseModelUpdateTask {
     public void execute(LauncherAppState app, BgDataModel dataModel, AllAppsList apps) {
         final Context context = app.getContext();
         // Find WorkspaceItemInfo's that have changed on the workspace.
-        HashSet<ShortcutKey> removedKeys = new HashSet<>();
-        MultiHashMap<ShortcutKey, WorkspaceItemInfo> keyToShortcutInfo = new MultiHashMap<>();
-        HashSet<String> allIds = new HashSet<>();
+        ArrayList<WorkspaceItemInfo> matchingWorkspaceItems = new ArrayList<>();
 
         synchronized (dataModel) {
             dataModel.forAllWorkspaceItemInfos(mUser, si -> {
                 if ((si.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT)
                         && mPackageName.equals(si.getIntent().getPackage())) {
-                    keyToShortcutInfo.addToList(ShortcutKey.fromItemInfo(si), si);
-                    allIds.add(si.getDeepShortcutId());
+                    matchingWorkspaceItems.add(si);
                 }
             });
         }
 
-        final ArrayList<WorkspaceItemInfo> updatedWorkspaceItemInfos = new ArrayList<>();
-        if (!keyToShortcutInfo.isEmpty()) {
+        if (!matchingWorkspaceItems.isEmpty()) {
             // Update the workspace to reflect the changes to updated shortcuts residing on it.
+            List<String> allLauncherKnownIds = matchingWorkspaceItems.stream()
+                    .map(WorkspaceItemInfo::getDeepShortcutId)
+                    .distinct()
+                    .collect(Collectors.toList());
             List<ShortcutInfo> shortcuts = new ShortcutRequest(context, mUser)
-                    .forPackage(mPackageName, new ArrayList<>(allIds))
+                    .forPackage(mPackageName, allLauncherKnownIds)
                     .query(ShortcutRequest.ALL);
+
+            Set<String> nonPinnedIds = new HashSet<>(allLauncherKnownIds);
+            ArrayList<WorkspaceItemInfo> updatedWorkspaceItemInfos = new ArrayList<>();
             for (ShortcutInfo fullDetails : shortcuts) {
-                ShortcutKey key = ShortcutKey.fromInfo(fullDetails);
-                List<WorkspaceItemInfo> workspaceItemInfos = keyToShortcutInfo.remove(key);
                 if (!fullDetails.isPinned()) {
-                    // The shortcut was previously pinned but is no longer, so remove it from
-                    // the workspace and our pinned shortcut counts.
-                    // Note that we put this check here, after querying for full details,
-                    // because there's a possible race condition between pinning and
-                    // receiving this callback.
-                    removedKeys.add(key);
                     continue;
                 }
-                for (final WorkspaceItemInfo workspaceItemInfo : workspaceItemInfos) {
-                    workspaceItemInfo.updateFromDeepShortcutInfo(fullDetails, context);
-                    app.getIconCache().getShortcutIcon(workspaceItemInfo, fullDetails);
-                    updatedWorkspaceItemInfos.add(workspaceItemInfo);
-                }
-            }
-        }
 
-        // If there are still entries in keyToShortcutInfo, that means that
-        // the corresponding shortcuts weren't passed in onShortcutsChanged(). This
-        // means they were cleared, so we remove and unpin them now.
-        removedKeys.addAll(keyToShortcutInfo.keySet());
+                String sid = fullDetails.getId();
+                nonPinnedIds.remove(sid);
+                matchingWorkspaceItems
+                        .stream()
+                        .filter(itemInfo -> sid.equals(itemInfo.getDeepShortcutId()))
+                        .forEach(workspaceItemInfo -> {
+                            workspaceItemInfo.updateFromDeepShortcutInfo(fullDetails, context);
+                            app.getIconCache().getShortcutIcon(workspaceItemInfo, fullDetails);
+                            updatedWorkspaceItemInfos.add(workspaceItemInfo);
+                        });
+            }
 
-        bindUpdatedWorkspaceItems(updatedWorkspaceItemInfos);
-        if (!keyToShortcutInfo.isEmpty()) {
-            deleteAndBindComponentsRemoved(ItemInfoMatcher.ofShortcutKeys(removedKeys));
+            bindUpdatedWorkspaceItems(updatedWorkspaceItemInfos);
+            if (!nonPinnedIds.isEmpty()) {
+                deleteAndBindComponentsRemoved(ItemInfoMatcher.ofShortcutKeys(
+                        nonPinnedIds.stream()
+                                .map(id -> new ShortcutKey(mPackageName, mUser, id))
+                                .collect(Collectors.toSet())));
+            }
         }
 
         if (mUpdateIdMap) {
diff --git a/src/com/android/launcher3/popup/PopupDataProvider.java b/src/com/android/launcher3/popup/PopupDataProvider.java
index 5a5f66832d..76048ba610 100644
--- a/src/com/android/launcher3/popup/PopupDataProvider.java
+++ b/src/com/android/launcher3/popup/PopupDataProvider.java
@@ -38,7 +38,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
@@ -202,20 +201,11 @@ public class PopupDataProvider implements NotificationListener.NotificationsChan
     }
 
     public List<WidgetItem> getWidgetsForPackageUser(PackageUserKey packageUserKey) {
-        for (WidgetListRowEntry entry : mAllWidgets) {
-            if (entry.pkgItem.packageName.equals(packageUserKey.mPackageName)) {
-                ArrayList<WidgetItem> widgets = new ArrayList<>(entry.widgets);
-                // Remove widgets not associated with the correct user.
-                Iterator<WidgetItem> iterator = widgets.iterator();
-                while (iterator.hasNext()) {
-                    if (!iterator.next().user.equals(packageUserKey.mUser)) {
-                        iterator.remove();
-                    }
-                }
-                return widgets.isEmpty() ? null : widgets;
-            }
-        }
-        return null;
+        return mAllWidgets.stream()
+                .filter(row -> row.pkgItem.packageName.equals(packageUserKey.mPackageName))
+                .flatMap(row -> row.widgets.stream())
+                .filter(widget -> packageUserKey.mUser.equals(widget.user))
+                .collect(Collectors.toList());
     }
 
     /**
diff --git a/src/com/android/launcher3/popup/SystemShortcut.java b/src/com/android/launcher3/popup/SystemShortcut.java
index 79984889ef..81302ac1f7 100644
--- a/src/com/android/launcher3/popup/SystemShortcut.java
+++ b/src/com/android/launcher3/popup/SystemShortcut.java
@@ -99,7 +99,7 @@ public abstract class SystemShortcut<T extends BaseDraggingActivity> extends Ite
         final List<WidgetItem> widgets =
                 launcher.getPopupDataProvider().getWidgetsForPackageUser(new PackageUserKey(
                         itemInfo.getTargetComponent().getPackageName(), itemInfo.user));
-        if (widgets == null) {
+        if (widgets.isEmpty()) {
             return null;
         }
         return new Widgets(launcher, itemInfo);
diff --git a/src/com/android/launcher3/util/ItemInfoMatcher.java b/src/com/android/launcher3/util/ItemInfoMatcher.java
index e98af35563..d26bb5779e 100644
--- a/src/com/android/launcher3/util/ItemInfoMatcher.java
+++ b/src/com/android/launcher3/util/ItemInfoMatcher.java
@@ -27,6 +27,7 @@ import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.shortcuts.ShortcutKey;
 
 import java.util.HashSet;
+import java.util.Set;
 
 /**
  * A utility class to check for {@link ItemInfo}
@@ -99,7 +100,7 @@ public interface ItemInfoMatcher {
         return (info, cn) -> packageNames.contains(cn.getPackageName()) && info.user.equals(user);
     }
 
-    static ItemInfoMatcher ofShortcutKeys(HashSet<ShortcutKey> keys) {
+    static ItemInfoMatcher ofShortcutKeys(Set<ShortcutKey> keys) {
         return  (info, cn) -> info.itemType == Favorites.ITEM_TYPE_DEEP_SHORTCUT &&
                         keys.contains(ShortcutKey.fromItemInfo(info));
     }
diff --git a/src/com/android/launcher3/util/MultiHashMap.java b/src/com/android/launcher3/util/MultiHashMap.java
deleted file mode 100644
index b7275c1f76..0000000000
--- a/src/com/android/launcher3/util/MultiHashMap.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.util;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-/**
- * A utility map from keys to an ArrayList of values.
- */
-public class MultiHashMap<K, V> extends HashMap<K, ArrayList<V>> {
-
-    public MultiHashMap() { }
-
-    public MultiHashMap(int size) {
-        super(size);
-    }
-
-    public void addToList(K key, V value) {
-        ArrayList<V> list = get(key);
-        if (list == null) {
-            list = new ArrayList<>();
-            list.add(value);
-            put(key, list);
-        } else {
-            list.add(value);
-        }
-    }
-
-    @Override
-    public MultiHashMap<K, V> clone() {
-        MultiHashMap<K, V> map = new MultiHashMap<>(size());
-        for (Entry<K, ArrayList<V>> entry : entrySet()) {
-            map.put(entry.getKey(), new ArrayList<V>(entry.getValue()));
-        }
-        return map;
-    }
-}
diff --git a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
index a64df62c3b..34ebbac59a 100644
--- a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
+++ b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
@@ -26,7 +26,6 @@ import com.android.launcher3.icons.ComponentWithLabelAndIcon;
 import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.pm.ShortcutConfigActivityInfo;
-import com.android.launcher3.util.MultiHashMap;
 import com.android.launcher3.util.PackageUserKey;
 import com.android.launcher3.util.Preconditions;
 import com.android.launcher3.widget.WidgetItemComparator;
@@ -36,11 +35,12 @@ import com.android.launcher3.widget.WidgetManagerHelper;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 /**
  * Widgets data model that is used by the adapters of the widget views and controllers.
@@ -57,9 +57,7 @@ public class WidgetsModel {
     private static final boolean DEBUG = false;
 
     /* Map of widgets and shortcuts that are tracked per package. */
-    private final MultiHashMap<PackageItemInfo, WidgetItem> mWidgetsList = new MultiHashMap<>();
-
-    private AppFilter mAppFilter;
+    private final Map<PackageItemInfo, List<WidgetItem>> mWidgetsList = new HashMap<>();
 
     /**
      * Returns a list of {@link WidgetListRowEntry}. All {@link WidgetItem} in a single row
@@ -74,8 +72,9 @@ public class WidgetsModel {
         AlphabeticIndexCompat indexer = new AlphabeticIndexCompat(context);
 
         WidgetItemComparator widgetComparator = new WidgetItemComparator();
-        for (Map.Entry<PackageItemInfo, ArrayList<WidgetItem>> entry : mWidgetsList.entrySet()) {
-            WidgetListRowEntry row = new WidgetListRowEntry(entry.getKey(), entry.getValue());
+        for (Map.Entry<PackageItemInfo, List<WidgetItem>> entry : mWidgetsList.entrySet()) {
+            WidgetListRowEntry row = new WidgetListRowEntry(
+                    entry.getKey(), new ArrayList<>(entry.getValue()));
             row.titleSectionName = (row.pkgItem.title == null) ? "" :
                     indexer.computeSectionName(row.pkgItem.title);
             Collections.sort(row.widgets, widgetComparator);
@@ -146,77 +145,42 @@ public class WidgetsModel {
         if (packageUser == null) {
             mWidgetsList.clear();
         } else {
-            // Only clear the widgets for the given package/user.
-            PackageItemInfo packageItem = null;
-            for (PackageItemInfo item : mWidgetsList.keySet()) {
-                if (item.packageName.equals(packageUser.mPackageName)) {
-                    packageItem = item;
-                    break;
-                }
-            }
+            PackageItemInfo packageItem = mWidgetsList.keySet()
+                    .stream()
+                    .filter(item -> item.packageName.equals(packageUser.mPackageName))
+                    .findFirst()
+                    .orElse(null);
             if (packageItem != null) {
                 // We want to preserve the user that was on the packageItem previously,
                 // so add it to tmpPackageItemInfos here to avoid creating a new entry.
                 tmpPackageItemInfos.put(packageItem.packageName, packageItem);
 
-                Iterator<WidgetItem> widgetItemIterator = mWidgetsList.get(packageItem).iterator();
-                while (widgetItemIterator.hasNext()) {
-                    WidgetItem nextWidget = widgetItemIterator.next();
-                    if (nextWidget.componentName.getPackageName().equals(packageUser.mPackageName)
-                            && nextWidget.user.equals(packageUser.mUser)) {
-                        widgetItemIterator.remove();
-                    }
-                }
+                // Add the widgets for other users in the rawList as it only contains widgets for
+                // packageUser
+                List<WidgetItem> otherUserItems = mWidgetsList.remove(packageItem);
+                otherUserItems.removeIf(w -> w.user.equals(packageUser.mUser));
+                rawWidgetsShortcuts.addAll(otherUserItems);
             }
         }
 
-        InvariantDeviceProfile idp = app.getInvariantDeviceProfile();
         UserHandle myUser = Process.myUserHandle();
 
         // add and update.
-        for (WidgetItem item : rawWidgetsShortcuts) {
-            if (item.widgetInfo != null) {
-                if ((item.widgetInfo.getWidgetFeatures() & WIDGET_FEATURE_HIDE_FROM_PICKER) != 0) {
-                    // Widget is hidden from picker
-                    continue;
-                }
-
-                // Ensure that all widgets we show can be added on a workspace of this size
-                int minSpanX = Math.min(item.widgetInfo.spanX, item.widgetInfo.minSpanX);
-                int minSpanY = Math.min(item.widgetInfo.spanY, item.widgetInfo.minSpanY);
-                if (minSpanX > idp.numColumns || minSpanY > idp.numRows) {
-                    if (DEBUG) {
-                        Log.d(TAG, String.format(
-                                "Widget %s : (%d X %d) can't fit on this device",
-                                item.componentName, minSpanX, minSpanY));
+        mWidgetsList.putAll(rawWidgetsShortcuts.stream()
+                .filter(new WidgetValidityCheck(app))
+                .collect(Collectors.groupingBy(item -> {
+                    String packageName = item.componentName.getPackageName();
+                    PackageItemInfo pInfo = tmpPackageItemInfos.get(packageName);
+                    if (pInfo == null) {
+                        pInfo = new PackageItemInfo(packageName);
+                        pInfo.user = item.user;
+                        tmpPackageItemInfos.put(packageName,  pInfo);
+                    } else if (!myUser.equals(pInfo.user)) {
+                        // Keep updating the user, until we get the primary user.
+                        pInfo.user = item.user;
                     }
-                    continue;
-                }
-            }
-
-            if (mAppFilter == null) {
-                mAppFilter = AppFilter.newInstance(app.getContext());
-            }
-            if (!mAppFilter.shouldShowApp(item.componentName)) {
-                if (DEBUG) {
-                    Log.d(TAG, String.format("%s is filtered and not added to the widget tray.",
-                            item.componentName));
-                }
-                continue;
-            }
-
-            String packageName = item.componentName.getPackageName();
-            PackageItemInfo pInfo = tmpPackageItemInfos.get(packageName);
-            if (pInfo == null) {
-                pInfo = new PackageItemInfo(packageName);
-                pInfo.user = item.user;
-                tmpPackageItemInfos.put(packageName,  pInfo);
-            } else if (!myUser.equals(pInfo.user)) {
-                // Keep updating the user, until we get the primary user.
-                pInfo.user = item.user;
-            }
-            mWidgetsList.addToList(pInfo, item);
-        }
+                    return pInfo;
+                })));
 
         // Update each package entry
         IconCache iconCache = app.getIconCache();
@@ -227,9 +191,9 @@ public class WidgetsModel {
 
     public void onPackageIconsUpdated(Set<String> packageNames, UserHandle user,
             LauncherAppState app) {
-        for (Entry<PackageItemInfo, ArrayList<WidgetItem>> entry : mWidgetsList.entrySet()) {
+        for (Entry<PackageItemInfo, List<WidgetItem>> entry : mWidgetsList.entrySet()) {
             if (packageNames.contains(entry.getKey().packageName)) {
-                ArrayList<WidgetItem> items = entry.getValue();
+                List<WidgetItem> items = entry.getValue();
                 int count = items.size();
                 for (int i = 0; i < count; i++) {
                     WidgetItem item = items.get(i);
@@ -249,7 +213,7 @@ public class WidgetsModel {
 
     public WidgetItem getWidgetProviderInfoByProviderName(
             ComponentName providerName) {
-        ArrayList<WidgetItem> widgetsList = mWidgetsList.get(
+        List<WidgetItem> widgetsList = mWidgetsList.get(
                 new PackageItemInfo(providerName.getPackageName()));
         if (widgetsList == null) {
             return null;
@@ -262,4 +226,46 @@ public class WidgetsModel {
         }
         return null;
     }
+
+    private static class WidgetValidityCheck implements Predicate<WidgetItem> {
+
+        private final InvariantDeviceProfile mIdp;
+        private final AppFilter mAppFilter;
+
+        WidgetValidityCheck(LauncherAppState app) {
+            mIdp = app.getInvariantDeviceProfile();
+            mAppFilter = AppFilter.newInstance(app.getContext());
+        }
+
+        @Override
+        public boolean test(WidgetItem item) {
+            if (item.widgetInfo != null) {
+                if ((item.widgetInfo.getWidgetFeatures() & WIDGET_FEATURE_HIDE_FROM_PICKER) != 0) {
+                    // Widget is hidden from picker
+                    return false;
+                }
+
+                // Ensure that all widgets we show can be added on a workspace of this size
+                int minSpanX = Math.min(item.widgetInfo.spanX, item.widgetInfo.minSpanX);
+                int minSpanY = Math.min(item.widgetInfo.spanY, item.widgetInfo.minSpanY);
+                if (minSpanX > mIdp.numColumns || minSpanY > mIdp.numRows) {
+                    if (DEBUG) {
+                        Log.d(TAG, String.format(
+                                "Widget %s : (%d X %d) can't fit on this device",
+                                item.componentName, minSpanX, minSpanY));
+                    }
+                    return false;
+                }
+            }
+            if (!mAppFilter.shouldShowApp(item.componentName)) {
+                if (DEBUG) {
+                    Log.d(TAG, String.format("%s is filtered and not added to the widget tray.",
+                            item.componentName));
+                }
+                return false;
+            }
+
+            return true;
+        }
+    }
 }
\ No newline at end of file
-- 
GitLab


From 0f12b6013da4a53b911dedd1e70a4783994a405b Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Wed, 26 Aug 2020 19:08:18 -0700
Subject: [PATCH 0119/1664] Delays removal of extra screen when dropping an
 app.

This prevents a conflict between the scroll animation
and layout transition caused by removing the screen.
Since the extra screen is at the end of the workspace,
this most commonly (only?) causes issues in RTL, as
everything shifts to the left to fill the void of the
empty screen. See bug for example video of the issue.

With this change, the removal of the empty screen
happens after Launcher finishes transitioning back
to NORMAL state after dropping an icon/widget,
rather than in onDragEnd.

Note: There is a similar issue when placing a widget
in RTL (even if not switching screens), but it's not
made worse by this CL. Filed b/166531479.

Demo:
https://drive.google.com/file/d/1JTP81syjoBFe3_N2SOZHP5r5_RoCUWan/view?usp=sharing

Fixes: 163382092
Change-Id: I55ed5af8e1d80dcc0d1b6502c3c5b068dc6f8722
---
 src/com/android/launcher3/Workspace.java      | 20 ++++++++++++++-----
 .../launcher3/WorkspaceLayoutManager.java     |  2 +-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 3be9ac7e07..3ef4bf6604 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -93,6 +93,7 @@ import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pageindicators.WorkspacePageIndicator;
 import com.android.launcher3.popup.PopupContainerWithArrow;
+import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.touch.WorkspaceTouchListener;
@@ -437,10 +438,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
             enforceDragParity("onDragEnd", 0, 0);
         }
 
-        if (!mDeferRemoveExtraEmptyScreen) {
-            removeExtraEmptyScreen(mDragSourceInternal != null);
-        }
-
         updateChildrenLayersEnabled();
         mDragInfo = null;
         mOutlineProvider = null;
@@ -658,6 +655,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         convertFinalScreenToEmptyScreenIfNecessary();
         if (hasExtraEmptyScreen()) {
             removeView(mWorkspaceScreens.get(EXTRA_EMPTY_SCREEN_ID));
+            setCurrentPage(getNextPage());
             mWorkspaceScreens.remove(EXTRA_EMPTY_SCREEN_ID);
             mScreenOrder.removeValue(EXTRA_EMPTY_SCREEN_ID);
 
@@ -1873,6 +1871,18 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
                             };
                         }
                     }
+                    StateManager<LauncherState> stateManager = mLauncher.getStateManager();
+                    stateManager.addStateListener(new StateManager.StateListener<LauncherState>() {
+                        @Override
+                        public void onStateTransitionComplete(LauncherState finalState) {
+                            if (finalState == NORMAL) {
+                                if (!mDeferRemoveExtraEmptyScreen) {
+                                    removeExtraEmptyScreen(true /* stripEmptyScreens */);
+                                }
+                                stateManager.removeStateListener(this);
+                            }
+                        }
+                    });
 
                     mLauncher.getModelWriter().modifyItemInDatabase(info, container, screenId,
                             lp.cellX, lp.cellY, item.spanX, item.spanY);
@@ -2453,7 +2463,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
             Runnable onAnimationCompleteRunnable = new Runnable() {
                 @Override
                 public void run() {
-                    // Normally removeExtraEmptyScreen is called in Workspace#onDragEnd, but when
+                    // Normally removeExtraEmptyScreen is called in Workspace#onDrop, but when
                     // adding an item that may not be dropped right away (due to a config activity)
                     // we defer the removal until the activity returns.
                     deferRemoveExtraEmptyScreen();
diff --git a/src/com/android/launcher3/WorkspaceLayoutManager.java b/src/com/android/launcher3/WorkspaceLayoutManager.java
index c3d4aeb745..ea887cc5eb 100644
--- a/src/com/android/launcher3/WorkspaceLayoutManager.java
+++ b/src/com/android/launcher3/WorkspaceLayoutManager.java
@@ -28,7 +28,7 @@ public interface WorkspaceLayoutManager {
 
     String TAG = "Launcher.Workspace";
 
-    // The screen id used for the empty screen always present to the right.
+    // The screen id used for the empty screen always present at the end.
     int EXTRA_EMPTY_SCREEN_ID = -201;
     // The is the first screen. It is always present, even if its empty.
     int FIRST_SCREEN_ID = 0;
-- 
GitLab


From 90faa282f1016c7629f0fbb02b2780baee031dbc Mon Sep 17 00:00:00 2001
From: Sreyas <sreyasr@google.com>
Date: Thu, 27 Aug 2020 15:48:00 -0700
Subject: [PATCH 0120/1664] Implementing TouchDelegate to make full chip
 clickable.

Merging to ub-launcher3-master manually as automerger failed.
Tested: Manual

Change-Id: I1b8b43de7f04e1e13cb283c88f95a7c6fea84ea6
---
 .../android/quickstep/views/RecentsView.java  | 10 ++----
 .../com/android/quickstep/views/TaskView.java | 36 +++++++++++++++++--
 2 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 982a7c432c..6ae91b69b8 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -79,7 +79,6 @@ import android.view.HapticFeedbackConstants;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
-import android.view.TouchDelegate;
 import android.view.View;
 import android.view.ViewDebug;
 import android.view.ViewGroup;
@@ -706,12 +705,9 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         super.onTouchEvent(ev);
 
         TaskView taskView = getCurrentPageTaskView();
-        if (taskView != null) {
-            TouchDelegate mChildTouchDelegate = taskView.getIconTouchDelegate(ev);
-            if (mChildTouchDelegate != null && mChildTouchDelegate.onTouchEvent(ev)) {
-                // Keep consuming events to pass to delegate
-                return true;
-            }
+        if (taskView != null && taskView.offerTouchToChildren(ev)) {
+            // Keep consuming events to pass to delegate
+            return true;
         }
 
         final int x = (int) ev.getX();
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 259cd4dbfd..321821b573 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -135,6 +135,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
      * delegated bounds only to be updated.
      */
     private TransformingTouchDelegate mIconTouchDelegate;
+    private TransformingTouchDelegate mChipTouchDelegate;
 
     private static final List<Rect> SYSTEM_GESTURE_EXCLUSION_RECT =
             Collections.singletonList(new Rect());
@@ -200,6 +201,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     private View mContextualChipWrapper;
     private View mContextualChip;
     private final float[] mIconCenterCoords = new float[2];
+    private final float[] mChipCenterCoords = new float[2];
 
     public TaskView(Context context) {
         this(context, null);
@@ -259,11 +261,22 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         mIconTouchDelegate = new TransformingTouchDelegate(mIconView);
     }
 
-    public TouchDelegate getIconTouchDelegate(MotionEvent event) {
+    /**
+     * Whether the taskview should take the touch event from parent. Events passed to children
+     * that might require special handling.
+     */
+    public boolean offerTouchToChildren(MotionEvent event) {
         if (event.getAction() == MotionEvent.ACTION_DOWN) {
             computeAndSetIconTouchDelegate();
+            computeAndSetChipTouchDelegate();
+        }
+        if (mIconTouchDelegate != null && mIconTouchDelegate.onTouchEvent(event)) {
+            return true;
+        }
+        if (mChipTouchDelegate != null && mChipTouchDelegate.onTouchEvent(event)) {
+            return true;
         }
-        return mIconTouchDelegate;
+        return false;
     }
 
     private void computeAndSetIconTouchDelegate() {
@@ -278,6 +291,23 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
                 (int) (mIconCenterCoords[1] + iconHalfSize));
     }
 
+    private void computeAndSetChipTouchDelegate() {
+        if (mContextualChipWrapper != null) {
+            float chipHalfWidth = mContextualChipWrapper.getWidth() / 2f;
+            float chipHalfHeight = mContextualChipWrapper.getHeight() / 2f;
+            mChipCenterCoords[0] = chipHalfWidth;
+            mChipCenterCoords[1] = chipHalfHeight;
+            getDescendantCoordRelativeToAncestor(mContextualChipWrapper, mActivity.getDragLayer(),
+                    mChipCenterCoords,
+                    false);
+            mChipTouchDelegate.setBounds(
+                    (int) (mChipCenterCoords[0] - chipHalfWidth),
+                    (int) (mChipCenterCoords[1] - chipHalfHeight),
+                    (int) (mChipCenterCoords[0] + chipHalfWidth),
+                    (int) (mChipCenterCoords[1] + chipHalfHeight));
+        }
+    }
+
     /**
      * The modalness of this view is how it should be displayed when it is shown on its own in the
      * modal state of overview.
@@ -712,6 +742,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
                 mContextualChip.animate().scaleX(1f).scaleY(1f).setDuration(50);
             }
             if (mContextualChipWrapper != null) {
+                mChipTouchDelegate = new TransformingTouchDelegate(mContextualChipWrapper);
                 mContextualChipWrapper.animate().alpha(1f).setDuration(50);
             }
         }
@@ -733,6 +764,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         View oldContextualChipWrapper = mContextualChipWrapper;
         mContextualChipWrapper = null;
         mContextualChip = null;
+        mChipTouchDelegate = null;
         return oldContextualChipWrapper;
     }
 
-- 
GitLab


From 734be27f9b2a63bfa7fc33d6488993a4811ced9c Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 28 Aug 2020 13:23:10 -0700
Subject: [PATCH 0121/1664] Intercept touch events from anywhere while all apps
 is closing

Previously we did this only from a settled state, but now we also
do it during the transition to NORMAL.

Test: open all apps. Then, swipe down to home and back up to all
apps (from above the top of all apps).

Fixes: 159856104
Change-Id: Ib78c6a41d5fa17dd26a7df4e9069e0ada1f46dd0
---
 .../touchcontrollers/PortraitStatesTouchController.java  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
index 1208c6c79b..059a703075 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
@@ -89,13 +89,16 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
 
     @Override
     protected boolean canInterceptTouch(MotionEvent ev) {
+        // If we are swiping to all apps instead of overview, allow it from anywhere.
+        boolean interceptAnywhere = mLauncher.isInState(NORMAL) && !mAllowDragToOverview;
         if (mCurrentAnimation != null) {
             if (mFinishFastOnSecondTouch) {
                 mCurrentAnimation.getAnimationPlayer().end();
             }
 
             AllAppsTransitionController allAppsController = mLauncher.getAllAppsController();
-            if (ev.getY() >= allAppsController.getShiftRange() * allAppsController.getProgress()) {
+            if (ev.getY() >= allAppsController.getShiftRange() * allAppsController.getProgress()
+                    || interceptAnywhere) {
                 // If we are already animating from a previous state, we can intercept as long as
                 // the touch is below the current all apps progress (to allow for double swipe).
                 return true;
@@ -117,9 +120,7 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
                 return false;
             }
         } else {
-            // If we are swiping to all apps instead of overview, allow it from anywhere.
-            boolean interceptAnywhere = mLauncher.isInState(NORMAL) && !mAllowDragToOverview;
-            // For all other states, only listen if the event originated below the hotseat height
+            // For non-normal states, only listen if the event originated below the hotseat height
             if (!interceptAnywhere && !isTouchOverHotseat(mLauncher, ev)) {
                 return false;
             }
-- 
GitLab


From 5191fe9ba04f141a95692a242ec499a53f93b117 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Mon, 24 Aug 2020 16:38:02 -0700
Subject: [PATCH 0122/1664] SearchTarget/SearchTargetEvent API

Bug: 165869384
Bug: 161599758

TL;DR;;
Also introduce some additional methods for
- all apps start and stop
- metrics logging

Change-Id: I666ff5a27a5f8befdb0db483ebb07344a90e96bc
---
 quickstep/res/values/override.xml             |  2 -
 .../search/AllAppsSearchBarController.java    |  8 +-
 .../systemui/plugins/AllAppsSearchPlugin.java | 25 +++--
 .../com/android/systemui/plugins/OWNERS       |  4 -
 .../systemui/plugins/shared/SearchTarget.java | 99 +++++++++++++++++++
 .../plugins/shared/SearchTargetEvent.java     | 39 ++++++++
 6 files changed, 164 insertions(+), 13 deletions(-)
 delete mode 100644 src_plugins/com/android/systemui/plugins/OWNERS
 create mode 100644 src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
 create mode 100644 src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java

diff --git a/quickstep/res/values/override.xml b/quickstep/res/values/override.xml
index 8f4ce4343b..605774dd9c 100644
--- a/quickstep/res/values/override.xml
+++ b/quickstep/res/values/override.xml
@@ -25,8 +25,6 @@
 
   <string name="main_process_initializer_class" translatable="false">com.android.quickstep.QuickstepProcessInitializer</string>
 
-  <string name="user_event_dispatcher_class" translatable="false">com.android.quickstep.logging.UserEventDispatcherExtension</string>
-
   <string name="model_delegate_class" translatable="false">com.android.launcher3.model.QuickstepModelDelegate</string>
 
 </resources>
diff --git a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
index 2e5ed3ec35..29e340480d 100644
--- a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
+++ b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
@@ -79,7 +79,7 @@ public class AllAppsSearchBarController
     public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
         if (mSearchAlgorithm instanceof PluginWrapper) {
             ((PluginWrapper) mSearchAlgorithm).runOnPluginIfConnected(
-                    AllAppsSearchPlugin::startedTyping);
+                    AllAppsSearchPlugin::startedSearchSession);
         }
     }
 
@@ -113,7 +113,13 @@ public class AllAppsSearchBarController
     public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
         if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
             if (actionId == EditorInfo.IME_ACTION_SEARCH) {
+                // selectFocusedView should return SearchTargetEvent that is passed onto onClick
                 if (Launcher.getLauncher(mLauncher).getAppsView().selectFocusedView(v)) {
+                    if (mSearchAlgorithm instanceof PluginWrapper) {
+                        ((PluginWrapper) mSearchAlgorithm).runOnPluginIfConnected(plugin -> {
+                            plugin.onClick(false, null);
+                        });
+                    }
                     return true;
                 }
             }
diff --git a/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java b/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
index be20e2dbe6..9949678458 100644
--- a/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
+++ b/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
@@ -16,9 +16,9 @@
 
 package com.android.systemui.plugins;
 
-import android.os.Bundle;
-
 import com.android.systemui.plugins.annotations.ProvidesInterface;
+import com.android.systemui.plugins.shared.SearchTarget;
+import com.android.systemui.plugins.shared.SearchTargetEvent;
 
 import java.util.List;
 import java.util.function.Consumer;
@@ -29,15 +29,28 @@ import java.util.function.Consumer;
 @ProvidesInterface(action = AllAppsSearchPlugin.ACTION, version = AllAppsSearchPlugin.VERSION)
 public interface AllAppsSearchPlugin extends Plugin {
     String ACTION = "com.android.systemui.action.PLUGIN_ALL_APPS_SEARCH_ACTIONS";
-    int VERSION = 4;
+    int VERSION = 5;
+
+
+    /**
+     * Send signal when user enters all apps.
+     */
+    void startAllAppsSession();
 
     /**
      * Send signal when user starts typing.
      */
-    void startedTyping();
+    void startedSearchSession();
 
     /**
      * Send over the query and get the search results.
      */
-    void performSearch(String query, Consumer<List<Bundle>> results);
-}
+    void performSearch(String query, Consumer<List<SearchTarget>> results);
+
+    void onClick(boolean isTouch, SearchTargetEvent event);
+
+    /**
+     * Send signal when user exits all apps.
+     */
+    void endAllAppsSession();
+}
\ No newline at end of file
diff --git a/src_plugins/com/android/systemui/plugins/OWNERS b/src_plugins/com/android/systemui/plugins/OWNERS
deleted file mode 100644
index 0514999392..0000000000
--- a/src_plugins/com/android/systemui/plugins/OWNERS
+++ /dev/null
@@ -1,4 +0,0 @@
-# When changing interface for this plugin OR when increasing version code, please add Alex
-# Only add other owners if Alex is not available
-per-file AllAppsSearchPlugin.java, globs = set noparent
-per-file AllAppsSearchPlugin.java = alexmang@google.com, hyunyoungs@google.com, sunnygoyal@google.com, twickham@google.com
diff --git a/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java b/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
new file mode 100644
index 0000000000..913fc0ed7c
--- /dev/null
+++ b/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.plugins.shared;
+
+import android.content.pm.ShortcutInfo;
+import android.os.Bundle;
+
+import java.util.List;
+
+/**
+ * Used to return all apps search targets.
+ */
+public class SearchTarget implements Comparable<SearchTarget> {
+
+    public enum ViewType {
+        TOP_HIT(0),
+        HERO(1),
+        DETAIL(2),
+        ROW(3),
+        ROW_WITH_BUTTON(4),
+        SLICE(5);
+
+        private final int mId;
+        ViewType(int id) {
+            mId = id;
+        }
+
+        public int get() {
+            return mId;
+        }
+    }
+
+    public enum ItemType {
+        PLAY_RESULTS(0, "Play Store", ViewType.DETAIL),
+        SETTINGS_ROW(1, "Settings", ViewType.ROW),
+        SETTINGS_SLICE(2, "Settings", ViewType.SLICE),
+        APP(3, "", ViewType.TOP_HIT),
+        APP_HERO(4, "", ViewType.HERO);
+
+        private final int mId;
+        private final String mTitle;
+        private final ViewType mViewType;
+
+        ItemType(int id, String title, ViewType type) {
+            mId = id;
+            mTitle = title;
+            mViewType = type;
+        }
+
+        public ViewType getViewType() {
+            return mViewType;
+        }
+
+        public String getTitle() {
+            return mTitle;
+        }
+
+        public int getId() {
+            return mId;
+        }
+    }
+
+    public ItemType type;
+    public List<ShortcutInfo> shortcuts;
+    public Bundle bundle;
+    public float score;
+
+    /**
+     * Constructor to create the search target. Bundle is currently temporary to hold
+     * search target primitives that cannot be expressed as java primitive objects
+     * or AOSP native objects.
+     *
+     */
+    public SearchTarget(ItemType itemType, List<ShortcutInfo> shortcuts,
+            Bundle bundle, float score) {
+        this.type = itemType;
+        this.shortcuts = shortcuts;
+        this.bundle = bundle;
+        this.score = score;
+    }
+
+    @Override
+    public int compareTo(SearchTarget o) {
+        return Float.compare(o.score, score);
+    }
+}
diff --git a/src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java b/src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java
new file mode 100644
index 0000000000..00aacd0543
--- /dev/null
+++ b/src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.plugins.shared;
+
+import android.content.pm.ShortcutInfo;
+import android.os.Bundle;
+
+/**
+ * Event used for the feedback loop to the plugin. (and future aiai)
+ */
+public class SearchTargetEvent {
+    public SearchTarget.ItemType type;
+    public ShortcutInfo shortcut;
+    public Bundle bundle;
+    public float score;
+
+    public SearchTargetEvent(SearchTarget.ItemType itemType,
+            ShortcutInfo shortcut,
+            Bundle bundle,
+            float score) {
+        this.type = itemType;
+        this.shortcut = shortcut;
+        this.bundle = bundle;
+        this.score = score;
+    }
+}
-- 
GitLab


From 486fad2c44696d93d4b7ffe8a069d1a6d8fe377e Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 5 Aug 2020 23:18:59 -0700
Subject: [PATCH 0123/1664] Migrate trace proto from nano to lite

Bug: 166630570

Change-Id: I0567d0f71dd78e5dab87bb5878417c99c9bbe306
---
 .../RecentsAnimationDeviceState.java          |  1 +
 .../quickstep/TouchInteractionService.java    | 30 ++++----
 .../android/quickstep/util/ProtoTracer.java   | 76 ++++++++++---------
 3 files changed, 59 insertions(+), 48 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index e9fc42328b..d8064a2153 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -569,6 +569,7 @@ public class RecentsAnimationDeviceState implements
         pw.println("  isUserUnlocked=" + mIsUserUnlocked);
         pw.println("  isOneHandedModeEnabled=" + mIsOneHandedModeEnabled);
         pw.println("  isSwipeToNotificationEnabled=" + mIsSwipeToNotificationEnabled);
+        pw.println("  deferredGestureRegion=" + mDeferredGestureRegion);
         mRotationTouchHelper.dump(pw);
     }
 }
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 5b4a2395cd..ebdc867190 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -64,8 +64,8 @@ import com.android.launcher3.provider.RestoreDbTask;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.TestProtocol;
-import com.android.launcher3.tracing.nano.LauncherTraceProto;
-import com.android.launcher3.tracing.nano.TouchInteractionServiceProto;
+import com.android.launcher3.tracing.LauncherTraceProto;
+import com.android.launcher3.tracing.TouchInteractionServiceProto;
 import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
 import com.android.launcher3.util.OnboardingPrefs;
 import com.android.launcher3.util.TraceHelper;
@@ -105,7 +105,7 @@ import java.util.LinkedList;
  */
 @TargetApi(Build.VERSION_CODES.R)
 public class TouchInteractionService extends Service implements PluginListener<OverscrollPlugin>,
-        ProtoTraceable<LauncherTraceProto> {
+        ProtoTraceable<LauncherTraceProto.Builder> {
 
     private static final String TAG = "TouchInteractionService";
 
@@ -368,9 +368,12 @@ public class TouchInteractionService extends Service implements PluginListener<O
 
             // Update the tracing state
             if ((mDeviceState.getSystemUiStateFlags() & SYSUI_STATE_TRACING_ENABLED) != 0) {
-                ProtoTracer.INSTANCE.get(TouchInteractionService.this).start();
+                Log.d(TAG, "Starting tracing.");
+                ProtoTracer.INSTANCE.get(this).start();
             } else {
-                ProtoTracer.INSTANCE.get(TouchInteractionService.this).stop();
+                Log.d(TAG, "Stopping tracing. Dumping to file="
+                    + ProtoTracer.INSTANCE.get(this).getTraceFile());
+                ProtoTracer.INSTANCE.get(this).stop();
             }
         }
     }
@@ -394,7 +397,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
         disposeEventHandlers();
         mDeviceState.destroy();
         SystemUiProxy.INSTANCE.get(this).setProxy(null);
-        ProtoTracer.INSTANCE.get(TouchInteractionService.this).stop();
+        ProtoTracer.INSTANCE.get(this).stop();
         ProtoTracer.INSTANCE.get(this).remove(this);
 
         getSystemService(AccessibilityManager.class)
@@ -503,6 +506,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
             reset();
         }
         TraceHelper.INSTANCE.endFlagsOverride(traceToken);
+        ProtoTracer.INSTANCE.get(this).scheduleFrameUpdate();
     }
 
     private GestureState createGestureState(GestureState previousGestureState) {
@@ -821,8 +825,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
             pw.println("  mConsumer=" + mConsumer.getName());
             ActiveGestureLog.INSTANCE.dump("", pw);
             pw.println("ProtoTrace:");
-            pw.println("  file="
-                    + ProtoTracer.INSTANCE.get(TouchInteractionService.this).getTraceFile());
+            pw.println("  file=" + ProtoTracer.INSTANCE.get(this).getTraceFile());
         }
     }
 
@@ -878,11 +881,10 @@ public class TouchInteractionService extends Service implements PluginListener<O
     }
 
     @Override
-    public void writeToProto(LauncherTraceProto proto) {
-        if (proto.touchInteractionService == null) {
-            proto.touchInteractionService = new TouchInteractionServiceProto();
-        }
-        proto.touchInteractionService.serviceConnected = true;
-        proto.touchInteractionService.serviceConnected = true;
+    public void writeToProto(LauncherTraceProto.Builder proto) {
+        TouchInteractionServiceProto.Builder serviceProto =
+            TouchInteractionServiceProto.newBuilder();
+        serviceProto.setServiceConnected(true);
+        proto.setTouchInteractionService(serviceProto);
     }
 }
diff --git a/quickstep/src/com/android/quickstep/util/ProtoTracer.java b/quickstep/src/com/android/quickstep/util/ProtoTracer.java
index 190763a36e..ef9586d693 100644
--- a/quickstep/src/com/android/quickstep/util/ProtoTracer.java
+++ b/quickstep/src/com/android/quickstep/util/ProtoTracer.java
@@ -16,24 +16,23 @@
 
 package com.android.quickstep.util;
 
-import static com.android.launcher3.tracing.nano.LauncherTraceFileProto.MagicNumber.MAGIC_NUMBER_H;
-import static com.android.launcher3.tracing.nano.LauncherTraceFileProto.MagicNumber.MAGIC_NUMBER_L;
+import static com.android.launcher3.tracing.LauncherTraceFileProto.MagicNumber.MAGIC_NUMBER_H_VALUE;
+import static com.android.launcher3.tracing.LauncherTraceFileProto.MagicNumber.MAGIC_NUMBER_L_VALUE;
 
 import android.content.Context;
 import android.os.SystemClock;
 
-import com.android.launcher3.tracing.nano.LauncherTraceProto;
-import com.android.launcher3.tracing.nano.LauncherTraceEntryProto;
-import com.android.launcher3.tracing.nano.LauncherTraceFileProto;
+import android.os.Trace;
+import com.android.launcher3.tracing.LauncherTraceProto;
+import com.android.launcher3.tracing.LauncherTraceEntryProto;
+import com.android.launcher3.tracing.LauncherTraceFileProto;
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.systemui.shared.tracing.FrameProtoTracer;
 import com.android.systemui.shared.tracing.FrameProtoTracer.ProtoTraceParams;
 import com.android.systemui.shared.tracing.ProtoTraceable;
-import com.google.protobuf.nano.MessageNano;
+import com.google.protobuf.MessageLite;
 
 import java.io.File;
-import java.io.FileDescriptor;
-import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Queue;
 
@@ -41,18 +40,20 @@ import java.util.Queue;
 /**
  * Controller for coordinating winscope proto tracing.
  */
-public class ProtoTracer implements ProtoTraceParams<MessageNano,
-        LauncherTraceFileProto, LauncherTraceEntryProto, LauncherTraceProto> {
+public class ProtoTracer implements ProtoTraceParams<MessageLite.Builder,
+        LauncherTraceFileProto.Builder, LauncherTraceEntryProto.Builder,
+                LauncherTraceProto.Builder> {
 
     public static final MainThreadInitializedObject<ProtoTracer> INSTANCE =
             new MainThreadInitializedObject<>(ProtoTracer::new);
 
     private static final String TAG = "ProtoTracer";
-    private static final long MAGIC_NUMBER_VALUE = ((long) MAGIC_NUMBER_H << 32) | MAGIC_NUMBER_L;
+    private static final long MAGIC_NUMBER_VALUE =
+            ((long) MAGIC_NUMBER_H_VALUE << 32) | MAGIC_NUMBER_L_VALUE;
 
     private final Context mContext;
-    private final FrameProtoTracer<MessageNano,
-            LauncherTraceFileProto, LauncherTraceEntryProto, LauncherTraceProto> mProtoTracer;
+    private final FrameProtoTracer<MessageLite.Builder, LauncherTraceFileProto.Builder,
+        LauncherTraceEntryProto.Builder, LauncherTraceProto.Builder> mProtoTracer;
 
     public ProtoTracer(Context context) {
         mContext = context;
@@ -65,40 +66,47 @@ public class ProtoTracer implements ProtoTraceParams<MessageNano,
     }
 
     @Override
-    public LauncherTraceFileProto getEncapsulatingTraceProto() {
-        return new LauncherTraceFileProto();
+    public LauncherTraceFileProto.Builder getEncapsulatingTraceProto() {
+        return LauncherTraceFileProto.newBuilder();
     }
 
     @Override
-    public LauncherTraceEntryProto updateBufferProto(LauncherTraceEntryProto reuseObj,
-            ArrayList<ProtoTraceable<LauncherTraceProto>> traceables) {
-        LauncherTraceEntryProto proto = reuseObj != null
-                ? reuseObj
-                : new LauncherTraceEntryProto();
-        proto.elapsedRealtimeNanos = SystemClock.elapsedRealtimeNanos();
-        proto.launcher = proto.launcher != null ? proto.launcher : new LauncherTraceProto();
+    public LauncherTraceEntryProto.Builder updateBufferProto(
+            LauncherTraceEntryProto.Builder reuseObj,
+            ArrayList<ProtoTraceable<LauncherTraceProto.Builder>> traceables) {
+        Trace.beginSection("ProtoTracer.updateBufferProto");
+        LauncherTraceEntryProto.Builder proto = LauncherTraceEntryProto.newBuilder();
+        proto.setElapsedRealtimeNanos(SystemClock.elapsedRealtimeNanos());
+        LauncherTraceProto.Builder launcherProto = LauncherTraceProto.newBuilder();
         for (ProtoTraceable t : traceables) {
-            t.writeToProto(proto.launcher);
+            t.writeToProto(launcherProto);
         }
+        proto.setLauncher(launcherProto);
+        Trace.endSection();
         return proto;
     }
 
     @Override
-    public byte[] serializeEncapsulatingProto(LauncherTraceFileProto encapsulatingProto,
-            Queue<LauncherTraceEntryProto> buffer) {
-        encapsulatingProto.magicNumber = MAGIC_NUMBER_VALUE;
-        encapsulatingProto.entry = buffer.toArray(new LauncherTraceEntryProto[0]);
-        return MessageNano.toByteArray(encapsulatingProto);
+    public byte[] serializeEncapsulatingProto(LauncherTraceFileProto.Builder encapsulatingProto,
+            Queue<LauncherTraceEntryProto.Builder> buffer) {
+        Trace.beginSection("ProtoTracer.serializeEncapsulatingProto");
+        encapsulatingProto.setMagicNumber(MAGIC_NUMBER_VALUE);
+        for (LauncherTraceEntryProto.Builder entry : buffer) {
+            encapsulatingProto.addEntry(entry);
+        }
+        byte[] bytes = encapsulatingProto.build().toByteArray();
+        Trace.endSection();
+        return bytes;
     }
 
     @Override
-    public byte[] getProtoBytes(MessageNano proto) {
-        return MessageNano.toByteArray(proto);
+    public byte[] getProtoBytes(MessageLite.Builder proto) {
+        return proto.build().toByteArray();
     }
 
     @Override
-    public int getProtoSize(MessageNano proto) {
-        return proto.getCachedSize();
+    public int getProtoSize(MessageLite.Builder proto) {
+        return proto.build().getSerializedSize();
     }
 
     public void start() {
@@ -109,11 +117,11 @@ public class ProtoTracer implements ProtoTraceParams<MessageNano,
         mProtoTracer.stop();
     }
 
-    public void add(ProtoTraceable<LauncherTraceProto> traceable) {
+    public void add(ProtoTraceable<LauncherTraceProto.Builder> traceable) {
         mProtoTracer.add(traceable);
     }
 
-    public void remove(ProtoTraceable<LauncherTraceProto> traceable) {
+    public void remove(ProtoTraceable<LauncherTraceProto.Builder> traceable) {
         mProtoTracer.remove(traceable);
     }
 
-- 
GitLab


From 639505c23b32b8d478d884fc57cccb6df1ee6278 Mon Sep 17 00:00:00 2001
From: Sreyas <sreyasr@google.com>
Date: Fri, 28 Aug 2020 10:20:05 -0700
Subject: [PATCH 0124/1664] Scale down chip proportional to TaskView becoming
 fullscreen.

Merging into ub-launcher3-master manually as automerger failed.

Tested: Manual
Change-Id: Ic8e6dd6ba83206d67ee27d4af9d56639e9e43ff9
---
 quickstep/src/com/android/quickstep/views/TaskView.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 321821b573..b87d770d7b 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -563,7 +563,11 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
                 .getInterpolation(progress);
         mIconView.setScaleX(scale);
         mIconView.setScaleY(scale);
-
+        if (mContextualChip != null && mContextualChipWrapper != null) {
+            mContextualChipWrapper.setAlpha(scale);
+            mContextualChip.setScaleX(scale);
+            mContextualChip.setScaleY(scale);
+        }
         updateFooterVerticalOffset(1.0f - scale);
     }
 
-- 
GitLab


From ed5e43bd254eb3434a4f5bb20ad07168e6e374d5 Mon Sep 17 00:00:00 2001
From: Sreyas <sreyasr@google.com>
Date: Fri, 28 Aug 2020 10:59:00 -0700
Subject: [PATCH 0125/1664] Make modal based UI changes in TaskView only if
 modalness changes.

Fixes issue with jittery displaying of suggestion chip, when entering overview.
Merging into master manually as automerger failed.
Tested:Manual

Change-Id: I8228c51b22d550cb8f0aa559f997060b571763f1
---
 quickstep/src/com/android/quickstep/views/TaskView.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 321821b573..950f66ff6e 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -315,6 +315,9 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
      * @param modalness [0, 1] 0 being in context with other tasks, 1 being shown on its own.
      */
     public void setModalness(float modalness) {
+        if (mModalness == modalness) {
+            return;
+        }
         mModalness = modalness;
         mIconView.setAlpha(comp(modalness));
         if (mContextualChip != null) {
@@ -324,7 +327,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         if (mContextualChipWrapper != null) {
             mContextualChipWrapper.setAlpha(comp(modalness));
         }
-
         updateFooterVerticalOffset(mFooterVerticalOffset);
     }
 
-- 
GitLab


From 3a89e422375278bb6a5eafcaaa8968a8fe73c7a9 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Thu, 27 Aug 2020 18:05:46 -0700
Subject: [PATCH 0126/1664] Don't detach recents from app window after motion
 pause

- Update MotionPauseListener to have 2 methods: the existing
  onMotionPauseChanged(isPaused) and onMotionPauseDetected()
  - onMotionPauseDetected is the default as most listeners only
    care about the first detected pause
  - AbsSwipeUpHandler still listens to pause changes, to help
    determine the end target at the end of the gesture

Bug: 159089437
Change-Id: I6d14f106cdcbe4e07d8dddba1cee909a963615b1
---
 ...ButtonNavbarToOverviewTouchController.java |  4 +--
 .../NoButtonQuickSwitchTouchController.java   |  7 +++---
 .../android/quickstep/AbsSwipeUpHandler.java  | 25 +++++++++++++------
 .../OtherActivityInputConsumer.java           |  4 +--
 .../ScreenPinnedInputConsumer.java            | 20 +++++++--------
 .../interaction/NavBarGestureHandler.java     |  9 +++----
 .../quickstep/util/MotionPauseDetector.java   |  9 ++++++-
 7 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
index 591d3ca1f9..a0f6dc5821 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -128,7 +128,7 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
         mMotionPauseDetector.clear();
 
         if (handlingOverviewAnim()) {
-            mMotionPauseDetector.setOnMotionPauseListener(this::onMotionPauseChanged);
+            mMotionPauseDetector.setOnMotionPauseListener(this::onMotionPauseDetected);
         }
 
         if (mFromState == NORMAL && mToState == HINT_STATE) {
@@ -185,7 +185,7 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
         }
     }
 
-    private void onMotionPauseChanged(boolean isPaused) {
+    private void onMotionPauseDetected() {
         if (mCurrentAnimation == null) {
             return;
         }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
index 4b0642fab7..87c246f2c7 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
@@ -80,7 +80,7 @@ import com.android.quickstep.views.LauncherRecentsView;
  * the user as possible, also handles swipe up and hold to go to overview and swiping back home.
  */
 public class NoButtonQuickSwitchTouchController implements TouchController,
-        BothAxesSwipeDetector.Listener, MotionPauseDetector.OnMotionPauseListener {
+        BothAxesSwipeDetector.Listener {
 
     /** The minimum progress of the scale/translationY animation until drag end. */
     private static final float Y_ANIM_MIN_PROGRESS = 0.25f;
@@ -167,7 +167,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
         if (start) {
             mStartState = mLauncher.getStateManager().getState();
 
-            mMotionPauseDetector.setOnMotionPauseListener(this);
+            mMotionPauseDetector.setOnMotionPauseListener(this::onMotionPauseDetected);
 
             // We have detected horizontal drag start, now allow swipe up as well.
             mSwipeDetector.setDetectableScrollConditions(DIRECTION_RIGHT | DIRECTION_UP,
@@ -177,8 +177,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
         }
     }
 
-    @Override
-    public void onMotionPauseChanged(boolean isPaused) {
+    private void onMotionPauseDetected() {
         VibratorWrapper.INSTANCE.get(mLauncher).vibrate(OVERVIEW_HAPTIC);
     }
 
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index aaa2720047..a932b30dac 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -89,6 +89,7 @@ import com.android.quickstep.util.ActiveGestureLog;
 import com.android.quickstep.util.ActivityInitListener;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
 import com.android.quickstep.util.InputConsumerProxy;
+import com.android.quickstep.util.MotionPauseDetector;
 import com.android.quickstep.util.RectFSpringAnim;
 import com.android.quickstep.util.SurfaceTransactionApplier;
 import com.android.quickstep.util.TransformParams;
@@ -201,6 +202,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
     // Either RectFSpringAnim (if animating home) or ObjectAnimator (from mCurrentShift) otherwise
     private RunningWindowAnim mRunningWindowAnim;
     private boolean mIsMotionPaused;
+    private boolean mHasMotionEverBeenPaused;
 
     private boolean mContinuingLastGesture;
 
@@ -482,13 +484,20 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                 .getHighResLoadingState().setVisible(true);
     }
 
-    /**
-     * Called when motion pause is detected
-     */
-    public void onMotionPauseChanged(boolean isPaused) {
-        mIsMotionPaused = isPaused;
-        maybeUpdateRecentsAttachedState();
-        performHapticFeedback();
+    public MotionPauseDetector.OnMotionPauseListener getMotionPauseListener() {
+        return new MotionPauseDetector.OnMotionPauseListener() {
+            @Override
+            public void onMotionPauseDetected() {
+                mHasMotionEverBeenPaused = true;
+                maybeUpdateRecentsAttachedState();
+                performHapticFeedback();
+            }
+
+            @Override
+            public void onMotionPauseChanged(boolean isPaused) {
+                mIsMotionPaused = isPaused;
+            }
+        };
     }
 
     public void maybeUpdateRecentsAttachedState() {
@@ -519,7 +528,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
             // The window is going away so make sure recents is always visible in this case.
             recentsAttachedToAppWindow = true;
         } else {
-            recentsAttachedToAppWindow = mIsMotionPaused || mIsLikelyToStartNewTask;
+            recentsAttachedToAppWindow = mHasMotionEverBeenPaused || mIsLikelyToStartNewTask;
         }
         mAnimationFactory.setRecentsAttachedToAppWindow(recentsAttachedToAppWindow, animate);
 
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
index f02e5e6d61..0e1364a9ec 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
@@ -52,9 +52,9 @@ import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.Preconditions;
 import com.android.launcher3.util.TraceHelper;
-import com.android.quickstep.BaseActivityInterface;
 import com.android.quickstep.AbsSwipeUpHandler;
 import com.android.quickstep.AbsSwipeUpHandler.Factory;
+import com.android.quickstep.BaseActivityInterface;
 import com.android.quickstep.GestureState;
 import com.android.quickstep.InputConsumer;
 import com.android.quickstep.RecentsAnimationCallbacks;
@@ -365,7 +365,7 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
         mInteractionHandler = mHandlerFactory.newHandler(mGestureState, touchTimeMs,
                 mTaskAnimationManager.isRecentsAnimationRunning());
         mInteractionHandler.setGestureEndCallback(this::onInteractionGestureFinished);
-        mMotionPauseDetector.setOnMotionPauseListener(mInteractionHandler::onMotionPauseChanged);
+        mMotionPauseDetector.setOnMotionPauseListener(mInteractionHandler.getMotionPauseListener());
         Intent intent = new Intent(mInteractionHandler.getLaunchIntent());
         mInteractionHandler.initWhenReady(intent);
 
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/ScreenPinnedInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/ScreenPinnedInputConsumer.java
index b9827fff1d..a8bf333567 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/ScreenPinnedInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/ScreenPinnedInputConsumer.java
@@ -42,18 +42,16 @@ public class ScreenPinnedInputConsumer implements InputConsumer {
         mMotionPauseMinDisplacement = context.getResources().getDimension(
                 R.dimen.motion_pause_detector_min_displacement_from_app);
         mMotionPauseDetector = new MotionPauseDetector(context, true /* makePauseHarderToTrigger*/);
-        mMotionPauseDetector.setOnMotionPauseListener(isPaused -> {
-            if (isPaused) {
-                SystemUiProxy.INSTANCE.get(context).stopScreenPinning();
-                BaseDraggingActivity launcherActivity = gestureState.getActivityInterface()
-                        .getCreatedActivity();
-                if (launcherActivity != null) {
-                    launcherActivity.getRootView().performHapticFeedback(
-                            HapticFeedbackConstants.LONG_PRESS,
-                            HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING);
-                }
-                mMotionPauseDetector.clear();
+        mMotionPauseDetector.setOnMotionPauseListener(() -> {
+            SystemUiProxy.INSTANCE.get(context).stopScreenPinning();
+            BaseDraggingActivity launcherActivity = gestureState.getActivityInterface()
+                    .getCreatedActivity();
+            if (launcherActivity != null) {
+                launcherActivity.getRootView().performHapticFeedback(
+                        HapticFeedbackConstants.LONG_PRESS,
+                        HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING);
             }
+            mMotionPauseDetector.clear();
         });
     }
 
diff --git a/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java b/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java
index 81c4d0c7c8..8925235d94 100644
--- a/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java
+++ b/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java
@@ -182,7 +182,7 @@ public class NavBarGestureHandler implements OnTouchListener,
                 mLaunchedAssistant = false;
                 mSwipeUpTouchTracker.init();
                 mMotionPauseDetector.clear();
-                mMotionPauseDetector.setOnMotionPauseListener(this::onMotionPauseChanged);
+                mMotionPauseDetector.setOnMotionPauseListener(this::onMotionPauseDetected);
                 break;
             case MotionEvent.ACTION_MOVE:
                 mLastPos.set(event.getX(), event.getY());
@@ -220,7 +220,6 @@ public class NavBarGestureHandler implements OnTouchListener,
             case MotionEvent.ACTION_UP:
             case MotionEvent.ACTION_CANCEL:
                 mMotionPauseDetector.clear();
-                mMotionPauseDetector.setOnMotionPauseListener(null);
                 if (mGestureCallback != null && !intercepted && mTouchCameFromNavBar) {
                     mGestureCallback.onNavBarGestureAttempted(
                             HOME_OR_OVERVIEW_NOT_STARTED_WRONG_SWIPE_DIRECTION, new PointF());
@@ -252,10 +251,8 @@ public class NavBarGestureHandler implements OnTouchListener,
         return intercepted;
     }
 
-    protected void onMotionPauseChanged(boolean isPaused) {
-        if (isPaused) {
-            VibratorWrapper.INSTANCE.get(mContext).vibrate(OVERVIEW_HAPTIC);
-        }
+    protected void onMotionPauseDetected() {
+        VibratorWrapper.INSTANCE.get(mContext).vibrate(OVERVIEW_HAPTIC);
     }
 
     /**
diff --git a/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java b/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java
index b86293607e..d0f6879b70 100644
--- a/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java
+++ b/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java
@@ -184,11 +184,15 @@ public class MotionPauseDetector {
         }
         if (mIsPaused != isPaused) {
             mIsPaused = isPaused;
+            boolean isFirstDetectedPause = !mHasEverBeenPaused && mIsPaused;
             if (mIsPaused) {
                 AccessibilityManagerCompat.sendPauseDetectedEventToTest(mContext);
                 mHasEverBeenPaused = true;
             }
             if (mOnMotionPauseListener != null) {
+                if (isFirstDetectedPause) {
+                    mOnMotionPauseListener.onMotionPauseDetected();
+                }
                 mOnMotionPauseListener.onMotionPauseChanged(mIsPaused);
             }
         }
@@ -211,7 +215,10 @@ public class MotionPauseDetector {
     }
 
     public interface OnMotionPauseListener {
-        void onMotionPauseChanged(boolean isPaused);
+        /** Called only the first time motion pause is detected. */
+        void onMotionPauseDetected();
+        /** Called every time motion changes from paused to not paused and vice versa. */
+        default void onMotionPauseChanged(boolean isPaused) { }
     }
 
     /**
-- 
GitLab


From 61e8ae1d9d1610c21782743f188057b756c6f2bf Mon Sep 17 00:00:00 2001
From: Pinyao Ting <pinyaoting@google.com>
Date: Wed, 2 Sep 2020 17:46:27 -0700
Subject: [PATCH 0127/1664] Refrain from overwriting shortcut icon with default
 icon

Invert the condition check in IconCache so that, if a shortcut is
already using a non-default icon, do not replace it with default icon
again.

Bug: 162783875
Test: add weather shortcut, backup, restore, verify its icon is not
replaced by default droid icon

Change-Id: Idaf4ce4afa84d21f7192a2f4ce41a6f8daa8d3f2
---
 src/com/android/launcher3/icons/IconCache.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/icons/IconCache.java b/src/com/android/launcher3/icons/IconCache.java
index 444c2dab81..80135571b2 100644
--- a/src/com/android/launcher3/icons/IconCache.java
+++ b/src/com/android/launcher3/icons/IconCache.java
@@ -67,8 +67,8 @@ public class IconCache extends BaseIconCache {
 
     private static final String TAG = "Launcher.IconCache";
 
-    private final Predicate<ItemInfoWithIcon> mIsUsingFallbackIconCheck = w -> w.bitmap != null
-            && w.bitmap.isNullOrLowRes() && !isDefaultIcon(w.bitmap, w.user);
+    private final Predicate<ItemInfoWithIcon> mIsUsingFallbackOrNonDefaultIconCheck = w ->
+            w.bitmap != null && (w.bitmap.isNullOrLowRes() || !isDefaultIcon(w.bitmap, w.user));
 
     private final CachingLogic<ComponentWithLabel> mComponentWithLabelCachingLogic;
     private final CachingLogic<LauncherActivityInfo> mLauncherActivityInfoCachingLogic;
@@ -192,14 +192,14 @@ public class IconCache extends BaseIconCache {
      * Fill in {@param info} with the icon for {@param si}
      */
     public void getShortcutIcon(ItemInfoWithIcon info, ShortcutInfo si) {
-        getShortcutIcon(info, si, true, mIsUsingFallbackIconCheck);
+        getShortcutIcon(info, si, true, mIsUsingFallbackOrNonDefaultIconCheck);
     }
 
     /**
      * Fill in {@param info} with an unbadged icon for {@param si}
      */
     public void getUnbadgedShortcutIcon(ItemInfoWithIcon info, ShortcutInfo si) {
-        getShortcutIcon(info, si, false, mIsUsingFallbackIconCheck);
+        getShortcutIcon(info, si, false, mIsUsingFallbackOrNonDefaultIconCheck);
     }
 
     /**
-- 
GitLab


From 01e4070836deef941570cdeb41137a8047db4e10 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 31 Aug 2020 21:00:59 -0700
Subject: [PATCH 0128/1664] Standardize quickstep velocities

- Compute velocities as px/ms from VelocityTracker, instead of
  computing px/s and dividing by 1000 in various places
- Use quickstep_fling_threshold_speed in TriggerSwipeUpTouchTracker
  instead of ViewConfiguration#getScaledMinimumFlingVelocity
- Check MotionPauseDetector to determine whether a fling is
  sufficient to escape after pause, in additon to above threshold

Bug: 159089437
Change-Id: Ib0fae7804e1f008f3b6ab37d6c463352c224b0e4
---
 quickstep/res/values/dimens.xml               |  5 +---
 ...ButtonNavbarToOverviewTouchController.java | 16 +++++------
 .../android/quickstep/AbsSwipeUpHandler.java  | 20 ++++++-------
 .../DeviceLockedInputConsumer.java            |  7 ++---
 .../OtherActivityInputConsumer.java           |  4 +--
 .../interaction/NavBarGestureHandler.java     |  1 -
 .../util/TriggerSwipeUpTouchTracker.java      |  8 ++++--
 .../android/launcher3/util/VelocityUtils.java | 28 +++++++++++++++++++
 8 files changed, 56 insertions(+), 33 deletions(-)
 create mode 100644 src/com/android/launcher3/util/VelocityUtils.java

diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 313db8ccaf..c85fe6ca35 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -35,16 +35,13 @@
              loading full resolution screenshots. -->
     <dimen name="recents_fast_fling_velocity">600dp</dimen>
 
-    <!-- These velocities are in dp / s -->
-    <dimen name="quickstep_fling_threshold_velocity">500dp</dimen>
-    <dimen name="quickstep_fling_min_velocity">250dp</dimen>
-
     <!-- These speeds are in dp / ms -->
     <dimen name="motion_pause_detector_speed_very_slow">0.0285dp</dimen>
     <dimen name="motion_pause_detector_speed_slow">0.15dp</dimen>
     <dimen name="motion_pause_detector_speed_somewhat_fast">0.285dp</dimen>
     <dimen name="motion_pause_detector_speed_fast">1.4dp</dimen>
     <dimen name="motion_pause_detector_min_displacement_from_app">36dp</dimen>
+    <dimen name="quickstep_fling_threshold_speed">0.5dp</dimen>
 
     <!-- Launcher app transition -->
     <dimen name="content_trans_y">50dp</dimen>
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
index a0f6dc5821..c78d4741d8 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -75,6 +75,7 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
     private final float mMotionPauseMinDisplacement;
 
     private boolean mDidTouchStartInNavBar;
+    private boolean mStartedOverview;
     private boolean mReachedOverview;
     // The last recorded displacement before we reached overview.
     private PointF mStartDisplacement = new PointF();
@@ -138,6 +139,7 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
                     mFromState.getOverviewScrimAlpha(mLauncher),
                     mToState.getOverviewScrimAlpha(mLauncher));
         }
+        mStartedOverview = false;
         mReachedOverview = false;
         mOverviewResistYAnim = null;
     }
@@ -152,7 +154,7 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
 
     @Override
     public void onDragEnd(float velocity) {
-        if (mMotionPauseDetector.isPaused() && handlingOverviewAnim()) {
+        if (mStartedOverview) {
             goToOverviewOrHomeOnDragEnd(velocity);
         } else {
             super.onDragEnd(velocity);
@@ -199,6 +201,7 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
                 maybeSwipeInteractionToOverviewComplete();
             });
         });
+        mStartedOverview = true;
         VibratorWrapper.INSTANCE.get(mLauncher).vibrate(OVERVIEW_HAPTIC);
     }
 
@@ -219,7 +222,7 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
         if (TestProtocol.sDebugTracing) {
             Log.d(TestProtocol.PAUSE_NOT_DETECTED, "NoButtonNavbarToOverviewTouchController");
         }
-        if (mMotionPauseDetector.isPaused()) {
+        if (mStartedOverview) {
             if (!mReachedOverview) {
                 mStartDisplacement.set(xDisplacement, yDisplacement);
                 mStartY = event.getY();
@@ -234,8 +237,6 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
                             * OVERVIEW_MOVEMENT_FACTOR);
                 }
             }
-            // Stay in Overview.
-            return true;
         }
 
         float upDisplacement = -yDisplacement;
@@ -243,13 +244,12 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
                 || upDisplacement < mMotionPauseMinDisplacement);
         mMotionPauseDetector.addPosition(event);
 
-        return super.onDrag(yDisplacement, xDisplacement, event);
+        // Stay in Overview.
+        return mStartedOverview || super.onDrag(yDisplacement, xDisplacement, event);
     }
 
     private void goToOverviewOrHomeOnDragEnd(float velocity) {
-        float velocityDp = dpiFromPx(velocity);
-        boolean isFling = Math.abs(velocityDp) > 1;
-        boolean goToHomeInsteadOfOverview = isFling;
+        boolean goToHomeInsteadOfOverview = !mMotionPauseDetector.isPaused();
         if (goToHomeInsteadOfOverview) {
             new OverviewToHomeAnim(mLauncher, ()-> onSwipeInteractionCompleted(NORMAL, Touch.FLING))
                     .animateWithVelocity(velocity);
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index a932b30dac..4bdc59e0c2 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -751,8 +751,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
     @UiThread
     public void onGestureEnded(float endVelocity, PointF velocity, PointF downPos) {
         float flingThreshold = mContext.getResources()
-                .getDimension(R.dimen.quickstep_fling_threshold_velocity);
-        boolean isFling = mGestureStarted && Math.abs(endVelocity) > flingThreshold;
+                .getDimension(R.dimen.quickstep_fling_threshold_speed);
+        boolean isFling = mGestureStarted && !mIsMotionPaused
+                && Math.abs(endVelocity) > flingThreshold;
         mStateCallback.setStateOnUiThread(STATE_GESTURE_COMPLETED);
 
         mLogAction = isFling ? Touch.FLING : Touch.SWIPE;
@@ -867,7 +868,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
 
             if (mDeviceState.isFullyGesturalNavMode() && isSwipeUp && !willGoToNewTaskOnSwipeUp) {
                 endTarget = HOME;
-            } else if (mDeviceState.isFullyGesturalNavMode() && isSwipeUp && !mIsMotionPaused) {
+            } else if (mDeviceState.isFullyGesturalNavMode() && isSwipeUp) {
                 // If swiping at a diagonal, base end target on the faster velocity.
                 endTarget = NEW_TASK;
             } else if (isSwipeUp) {
@@ -887,7 +888,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
     @UiThread
     private void handleNormalGestureEnd(float endVelocity, boolean isFling, PointF velocity,
             boolean isCancel) {
-        PointF velocityPxPerMs = new PointF(velocity.x / 1000, velocity.y / 1000);
         long duration = MAX_SWIPE_DURATION;
         float currentShift = mCurrentShift.value;
         final GestureEndTarget endTarget = calculateEndTarget(velocity, endVelocity,
@@ -902,14 +902,12 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
             startShift = currentShift;
             interpolator = endTarget == RECENTS ? OVERSHOOT_1_2 : DEACCEL;
         } else {
-            startShift = Utilities.boundToRange(currentShift - velocityPxPerMs.y
+            startShift = Utilities.boundToRange(currentShift - velocity.y
                     * getSingleFrameMs(mContext) / mTransitionDragLength, 0, mDragLengthFactor);
-            float minFlingVelocity = mContext.getResources()
-                    .getDimension(R.dimen.quickstep_fling_min_velocity);
-            if (Math.abs(endVelocity) > minFlingVelocity && mTransitionDragLength > 0) {
+            if (mTransitionDragLength > 0) {
                 if (endTarget == RECENTS && !mDeviceState.isFullyGesturalNavMode()) {
                     Interpolators.OvershootParams overshoot = new Interpolators.OvershootParams(
-                            startShift, endShift, endShift, endVelocity / 1000,
+                            startShift, endShift, endShift, endVelocity,
                             mTransitionDragLength, mContext);
                     endShift = overshoot.end;
                     interpolator = overshoot.interpolator;
@@ -921,7 +919,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                     // we want the page's snap velocity to approximately match the velocity at
                     // which the user flings, so we scale the duration by a value near to the
                     // derivative of the scroll interpolator at zero, ie. 2.
-                    long baseDuration = Math.round(Math.abs(distanceToTravel / velocityPxPerMs.y));
+                    long baseDuration = Math.round(Math.abs(distanceToTravel / velocity.y));
                     duration = Math.min(MAX_SWIPE_DURATION, 2 * baseDuration);
 
                     if (endTarget == RECENTS) {
@@ -961,7 +959,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
             mGestureState.setState(STATE_RECENTS_SCROLLING_FINISHED);
         }
 
-        animateToProgress(startShift, endShift, duration, interpolator, endTarget, velocityPxPerMs);
+        animateToProgress(startShift, endShift, duration, interpolator, endTarget, velocity);
     }
 
     private void doLogGesture(GestureEndTarget endTarget, @Nullable TaskView targetTask) {
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
index 584ff28fdb..5aaea0009e 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
@@ -21,6 +21,7 @@ import static android.view.MotionEvent.ACTION_UP;
 
 import static com.android.launcher3.Utilities.squaredHypot;
 import static com.android.launcher3.Utilities.squaredTouchSlop;
+import static com.android.launcher3.util.VelocityUtils.PX_PER_MS;
 import static com.android.quickstep.AbsSwipeUpHandler.MIN_PROGRESS_FOR_OVERVIEW;
 import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;
 import static com.android.quickstep.util.ActiveGestureLog.INTENT_EXTRA_LOG_TRACE_ID;
@@ -35,7 +36,6 @@ import android.graphics.Point;
 import android.graphics.PointF;
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
-import android.view.ViewConfiguration;
 
 import com.android.launcher3.R;
 import com.android.launcher3.anim.Interpolators;
@@ -180,12 +180,11 @@ public class DeviceLockedInputConsumer implements InputConsumer,
      */
     private void finishTouchTracking(MotionEvent ev) {
         if (mThresholdCrossed && ev.getAction() == ACTION_UP) {
-            mVelocityTracker.computeCurrentVelocity(1000,
-                    ViewConfiguration.get(mContext).getScaledMaximumFlingVelocity());
+            mVelocityTracker.computeCurrentVelocity(PX_PER_MS);
 
             float velocityY = mVelocityTracker.getYVelocity();
             float flingThreshold = mContext.getResources()
-                    .getDimension(R.dimen.quickstep_fling_threshold_velocity);
+                    .getDimension(R.dimen.quickstep_fling_threshold_speed);
 
             boolean dismissTask;
             if (Math.abs(velocityY) > flingThreshold) {
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
index 0e1364a9ec..b1a1133885 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
@@ -28,6 +28,7 @@ import static com.android.launcher3.PagedView.DEBUG_FAILED_QUICKSWITCH;
 import static com.android.launcher3.Utilities.EDGE_NAV_BAR;
 import static com.android.launcher3.Utilities.squaredHypot;
 import static com.android.launcher3.util.TraceHelper.FLAG_CHECK_FOR_RACE_CONDITIONS;
+import static com.android.launcher3.util.VelocityUtils.PX_PER_MS;
 import static com.android.quickstep.GestureState.STATE_OVERSCROLL_WINDOW_CREATED;
 import static com.android.quickstep.util.ActiveGestureLog.INTENT_EXTRA_LOG_TRACE_ID;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
@@ -393,8 +394,7 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
             if (ev.getActionMasked() == ACTION_CANCEL) {
                 mInteractionHandler.onGestureCancelled();
             } else {
-                mVelocityTracker.computeCurrentVelocity(1000,
-                        ViewConfiguration.get(this).getScaledMaximumFlingVelocity());
+                mVelocityTracker.computeCurrentVelocity(PX_PER_MS);
                 float velocityX = mVelocityTracker.getXVelocity(mActivePointerId);
                 float velocityY = mVelocityTracker.getYVelocity(mActivePointerId);
                 float velocity = mNavBarPosition.isRightEdge()
diff --git a/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java b/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java
index 8925235d94..f897ecc01a 100644
--- a/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java
+++ b/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java
@@ -144,7 +144,6 @@ public class NavBarGestureHandler implements OnTouchListener,
         if (mGestureCallback == null || mAssistantGestureActive) {
             return;
         }
-        finalVelocity.set(finalVelocity.x / 1000, finalVelocity.y / 1000);
         if (mTouchCameFromNavBar) {
             mGestureCallback.onNavBarGestureAttempted(wasFling
                     ? HOME_GESTURE_COMPLETED : OVERVIEW_GESTURE_COMPLETED, finalVelocity);
diff --git a/quickstep/src/com/android/quickstep/util/TriggerSwipeUpTouchTracker.java b/quickstep/src/com/android/quickstep/util/TriggerSwipeUpTouchTracker.java
index 29b95589f3..7bbde30df8 100644
--- a/quickstep/src/com/android/quickstep/util/TriggerSwipeUpTouchTracker.java
+++ b/quickstep/src/com/android/quickstep/util/TriggerSwipeUpTouchTracker.java
@@ -21,13 +21,14 @@ import static android.view.MotionEvent.ACTION_MOVE;
 import static android.view.MotionEvent.ACTION_UP;
 
 import static com.android.launcher3.Utilities.squaredHypot;
+import static com.android.launcher3.util.VelocityUtils.PX_PER_MS;
 
 import android.content.Context;
 import android.graphics.PointF;
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
-import android.view.ViewConfiguration;
 
+import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 
 /**
@@ -50,7 +51,8 @@ public class TriggerSwipeUpTouchTracker {
             NavBarPosition navBarPosition, Runnable onInterceptTouch,
             OnSwipeUpListener onSwipeUp) {
         mSquaredTouchSlop = Utilities.squaredTouchSlop(context);
-        mMinFlingVelocity = ViewConfiguration.get(context).getScaledMinimumFlingVelocity();
+        mMinFlingVelocity = context.getResources().getDimension(
+                R.dimen.quickstep_fling_threshold_speed);
         mNavBarPosition = navBarPosition;
         mDisableHorizontalSwipe = disableHorizontalSwipe;
         mOnInterceptTouch = onInterceptTouch;
@@ -130,7 +132,7 @@ public class TriggerSwipeUpTouchTracker {
     }
 
     private void onGestureEnd(MotionEvent ev) {
-        mVelocityTracker.computeCurrentVelocity(1000);
+        mVelocityTracker.computeCurrentVelocity(PX_PER_MS);
         float velocityX = mVelocityTracker.getXVelocity();
         float velocityY = mVelocityTracker.getYVelocity();
         float velocity = mNavBarPosition.isRightEdge()
diff --git a/src/com/android/launcher3/util/VelocityUtils.java b/src/com/android/launcher3/util/VelocityUtils.java
new file mode 100644
index 0000000000..d5962ed0dc
--- /dev/null
+++ b/src/com/android/launcher3/util/VelocityUtils.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.util;
+
+/**
+ * Contains some constants and functions to standardize velocity usage.
+ */
+public class VelocityUtils {
+
+    /**
+     * Unit to pass to {@link android.view.VelocityTracker#computeCurrentVelocity(int)}.
+     */
+    public static final int PX_PER_MS = 1;
+
+}
-- 
GitLab


From 8a35c76427c8cc1619addaba91d47c4976b9eae0 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Thu, 3 Sep 2020 14:30:10 -0700
Subject: [PATCH 0129/1664] Add folder UI animation.

Test: manual

Fixing b/144948355. The entire launcher was panning up when the user
would try to edit a folder name if that folder's name field would have
otherwise been obscured by the keyboard. This had the effect of
obscuring the smartspace. Added an animation to the folder UI to bring
it above the keyboard during text editing.

Change-Id: I0f95aae27fc7426f1025135ea6d4fa142a21cf43
---
 src/com/android/launcher3/Launcher.java      |  5 ++
 src/com/android/launcher3/folder/Folder.java | 95 ++++++++++++++++++++
 2 files changed, 100 insertions(+)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index cacd3fbe7f..2e36bc01dd 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -88,6 +88,7 @@ import android.view.Menu;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.animation.OvershootInterpolator;
 import android.widget.Toast;
@@ -466,6 +467,10 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
         mUserChangedCallbackCloseable = UserCache.INSTANCE.get(this).addUserChangeListener(
                 () -> getStateManager().goToState(NORMAL));
+
+        if (Utilities.ATLEAST_R) {
+            getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING);
+        }
     }
 
     protected LauncherOverlayManager getDefaultOverlay() {
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index f1606ea747..c841b7b0f3 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -17,6 +17,7 @@
 package com.android.launcher3.folder;
 
 import static android.text.TextUtils.isEmpty;
+import static android.view.WindowInsetsAnimation.Callback.DISPATCH_MODE_STOP;
 
 import static com.android.launcher3.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY;
 import static com.android.launcher3.LauncherState.NORMAL;
@@ -34,8 +35,10 @@ import android.annotation.SuppressLint;
 import android.appwidget.AppWidgetHostView;
 import android.content.Context;
 import android.graphics.Canvas;
+import android.graphics.Insets;
 import android.graphics.Path;
 import android.graphics.Rect;
+import android.os.Build;
 import android.text.InputType;
 import android.text.Selection;
 import android.text.TextUtils;
@@ -47,11 +50,16 @@ import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewDebug;
+import android.view.WindowInsets;
+import android.view.WindowInsetsAnimation;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.animation.AnimationUtils;
 import android.view.inputmethod.EditorInfo;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.Alarm;
 import com.android.launcher3.BubbleTextView;
@@ -252,6 +260,13 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         int measureSpec = MeasureSpec.UNSPECIFIED;
         mFooter.measure(measureSpec, measureSpec);
         mFooterHeight = mFooter.getMeasuredHeight();
+
+        if (Utilities.ATLEAST_R) {
+            WindowInsetsAnimation.Callback cb = new FolderWindowInsetsAnimationCallback(
+                    DISPATCH_MODE_STOP, this);
+
+            setWindowInsetsAnimationCallback(cb);
+        }
     }
 
     public boolean onLongClick(View v) {
@@ -373,6 +388,26 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         return false;
     }
 
+    @Override
+    public WindowInsets onApplyWindowInsets(WindowInsets windowInsets) {
+        if (Utilities.ATLEAST_R) {
+            this.setTranslationY(0);
+
+            if (windowInsets.isVisible(WindowInsets.Type.ime())) {
+                Insets keyboardInsets = windowInsets.getInsets(WindowInsets.Type.ime());
+                int folderHeightFromBottom = getHeightFromBottom();
+
+                if (keyboardInsets.bottom > folderHeightFromBottom) {
+                    // Translate this folder above the keyboard, then add the folder name's padding
+                    this.setTranslationY(folderHeightFromBottom - keyboardInsets.bottom
+                            - mFolderName.getPaddingBottom());
+                }
+            }
+        }
+
+        return windowInsets;
+    }
+
     public FolderIcon getFolderIcon() {
         return mFolderIcon;
     }
@@ -1646,4 +1681,64 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         mLauncher.getUserEventDispatcher()
                 .logLauncherEvent(mInfo.getFolderLabelStateLauncherEvent(fromState, toState));
     }
+
+    /** Returns the height of the current folder's bottom edge from the bottom of the screen. */
+    private int getHeightFromBottom() {
+        DragLayer.LayoutParams layoutParams = (DragLayer.LayoutParams) getLayoutParams();
+        int folderBottomPx = layoutParams.y + layoutParams.height;
+        int windowBottomPx = mLauncher.getDeviceProfile().heightPx;
+
+        return windowBottomPx - folderBottomPx;
+    }
+
+    /** Callback that animates a folder sliding up above the ime. */
+    @RequiresApi(api = Build.VERSION_CODES.R)
+    private static class FolderWindowInsetsAnimationCallback
+            extends WindowInsetsAnimation.Callback {
+
+        private final Folder mFolder;
+        float mFolderTranslationStart;
+        float mFolderTranslationEnd;
+
+        FolderWindowInsetsAnimationCallback(int dispatchMode, Folder folder) {
+            super(dispatchMode);
+
+            mFolder = folder;
+        }
+
+        @Override
+        public void onPrepare(@NonNull WindowInsetsAnimation animation) {
+            mFolderTranslationStart = mFolder.getTranslationY();
+        }
+
+        @NonNull
+        @Override
+        public WindowInsetsAnimation.Bounds onStart(
+                @NonNull WindowInsetsAnimation animation,
+                @NonNull WindowInsetsAnimation.Bounds bounds) {
+            mFolderTranslationEnd = mFolder.getTranslationY();
+
+            mFolder.setTranslationY(mFolderTranslationStart);
+
+            return super.onStart(animation, bounds);
+        }
+
+        @NonNull
+        @Override
+        public WindowInsets onProgress(@NonNull WindowInsets windowInsets,
+                @NonNull List<WindowInsetsAnimation> list) {
+            if (list.size() == 0) {
+                mFolder.setTranslationY(0);
+
+                return windowInsets;
+            }
+            float progress = list.get(0).getInterpolatedFraction();
+
+            mFolder.setTranslationY(
+                    Utilities.mapRange(progress, mFolderTranslationStart, mFolderTranslationEnd));
+
+            return windowInsets;
+        }
+
+    }
 }
-- 
GitLab


From 4307781a101b1030c456f94ae6f2ba97fd6d1715 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sat, 5 Sep 2020 18:47:07 +0000
Subject: [PATCH 0130/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: If9d4e92299ac6d5952ff7d07db10b0d74d9a3e34
---
 quickstep/res/values-es-rUS/strings.xml | 4 ++--
 quickstep/res/values-hu/strings.xml     | 2 +-
 quickstep/res/values-in/strings.xml     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/quickstep/res/values-es-rUS/strings.xml b/quickstep/res/values-es-rUS/strings.xml
index 1191becfa1..d1ae0fe437 100644
--- a/quickstep/res/values-es-rUS/strings.xml
+++ b/quickstep/res/values-es-rUS/strings.xml
@@ -33,9 +33,9 @@
     <string name="all_apps_label" msgid="8542784161730910663">"Todas las apps"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Predicción de tus apps"</string>
     <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Obtén sugerencias de aplicaciones en la fila inferior de la pantalla principal"</string>
-    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Obtén sugerencias de apps en la fila de favoritos de la Pantalla principal"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Obtén sugerencias de apps en la fila de favoritos de la pantalla principal"</string>
     <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Accede fácilmente en la pantalla principal a las apps que más usas. Las sugerencias cambiarán según tus rutinas. Las apps de la fila inferior se desplazarán hacia arriba en la pantalla principal."</string>
-    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Accede fácilmente en la pantalla principal a las apps que más usas. Las sugerencias cambiarán según tus rutinas. Se moverán a la Pantalla principal las apps que estén en la fila de favoritos."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Accede fácilmente en la pantalla principal a las apps que más usas. Las sugerencias cambiarán según tus rutinas. Se moverán a la pantalla principal las apps que estén en la fila de favoritos."</string>
     <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Accede fácilmente a las apps que más usas en la pantalla principal. Las sugerencias cambiarán según tus rutinas. Las apps de la fila inferior se moverán a una nueva carpeta."</string>
     <string name="hotseat_edu_accept" msgid="1611544083278999837">"Obtén sugerencias de aplicaciones"</string>
     <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"No, gracias"</string>
diff --git a/quickstep/res/values-hu/strings.xml b/quickstep/res/values-hu/strings.xml
index 75983c4313..f81355eccf 100644
--- a/quickstep/res/values-hu/strings.xml
+++ b/quickstep/res/values-hu/strings.xml
@@ -20,7 +20,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Osztott képernyő"</string>
-    <string name="recent_task_option_pin" msgid="7929860679018978258">"Rögzítés"</string>
+    <string name="recent_task_option_pin" msgid="7929860679018978258">"Kitűzés"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Szabad forma"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Nincsenek mostanában használt elemek"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Alkalmazáshasználati beállítások"</string>
diff --git a/quickstep/res/values-in/strings.xml b/quickstep/res/values-in/strings.xml
index a85ea4e2e3..d7437d0ddb 100644
--- a/quickstep/res/values-in/strings.xml
+++ b/quickstep/res/values-in/strings.xml
@@ -25,7 +25,7 @@
     <string name="recents_empty_message" msgid="7040467240571714191">"Tidak ada item yang baru dibuka"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Setelan penggunaan aplikasi"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Hapus semua"</string>
-    <string name="accessibility_recent_apps" msgid="4058661986695117371">"Aplikasi baru-baru ini"</string>
+    <string name="accessibility_recent_apps" msgid="4058661986695117371">"Aplikasi terbaru"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>, <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; 1 menit"</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"<xliff:g id="TIME">%1$s</xliff:g> tersisa hari ini"</string>
-- 
GitLab


From a16a23bfdc345db79395f771434805a4fd084517 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sat, 5 Sep 2020 18:47:35 +0000
Subject: [PATCH 0131/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I937d1c6fe5f15090699b1cbb57b8271e5f70e90d
---
 quickstep/res/values-es-rUS/strings.xml | 4 ++--
 quickstep/res/values-hu/strings.xml     | 2 +-
 quickstep/res/values-in/strings.xml     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/quickstep/res/values-es-rUS/strings.xml b/quickstep/res/values-es-rUS/strings.xml
index 1191becfa1..d1ae0fe437 100644
--- a/quickstep/res/values-es-rUS/strings.xml
+++ b/quickstep/res/values-es-rUS/strings.xml
@@ -33,9 +33,9 @@
     <string name="all_apps_label" msgid="8542784161730910663">"Todas las apps"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Predicción de tus apps"</string>
     <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Obtén sugerencias de aplicaciones en la fila inferior de la pantalla principal"</string>
-    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Obtén sugerencias de apps en la fila de favoritos de la Pantalla principal"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Obtén sugerencias de apps en la fila de favoritos de la pantalla principal"</string>
     <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Accede fácilmente en la pantalla principal a las apps que más usas. Las sugerencias cambiarán según tus rutinas. Las apps de la fila inferior se desplazarán hacia arriba en la pantalla principal."</string>
-    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Accede fácilmente en la pantalla principal a las apps que más usas. Las sugerencias cambiarán según tus rutinas. Se moverán a la Pantalla principal las apps que estén en la fila de favoritos."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Accede fácilmente en la pantalla principal a las apps que más usas. Las sugerencias cambiarán según tus rutinas. Se moverán a la pantalla principal las apps que estén en la fila de favoritos."</string>
     <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Accede fácilmente a las apps que más usas en la pantalla principal. Las sugerencias cambiarán según tus rutinas. Las apps de la fila inferior se moverán a una nueva carpeta."</string>
     <string name="hotseat_edu_accept" msgid="1611544083278999837">"Obtén sugerencias de aplicaciones"</string>
     <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"No, gracias"</string>
diff --git a/quickstep/res/values-hu/strings.xml b/quickstep/res/values-hu/strings.xml
index 75983c4313..f81355eccf 100644
--- a/quickstep/res/values-hu/strings.xml
+++ b/quickstep/res/values-hu/strings.xml
@@ -20,7 +20,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Osztott képernyő"</string>
-    <string name="recent_task_option_pin" msgid="7929860679018978258">"Rögzítés"</string>
+    <string name="recent_task_option_pin" msgid="7929860679018978258">"Kitűzés"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Szabad forma"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Nincsenek mostanában használt elemek"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Alkalmazáshasználati beállítások"</string>
diff --git a/quickstep/res/values-in/strings.xml b/quickstep/res/values-in/strings.xml
index a85ea4e2e3..d7437d0ddb 100644
--- a/quickstep/res/values-in/strings.xml
+++ b/quickstep/res/values-in/strings.xml
@@ -25,7 +25,7 @@
     <string name="recents_empty_message" msgid="7040467240571714191">"Tidak ada item yang baru dibuka"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Setelan penggunaan aplikasi"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Hapus semua"</string>
-    <string name="accessibility_recent_apps" msgid="4058661986695117371">"Aplikasi baru-baru ini"</string>
+    <string name="accessibility_recent_apps" msgid="4058661986695117371">"Aplikasi terbaru"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>, <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; 1 menit"</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"<xliff:g id="TIME">%1$s</xliff:g> tersisa hari ini"</string>
-- 
GitLab


From 5ad2a690894ce7a4a74b189370243ba038ab048a Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sat, 5 Sep 2020 18:49:09 +0000
Subject: [PATCH 0132/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I561a389ed45dce75d1f929c77d4f1de2aafb5d52
---
 res/values-af/strings.xml | 2 +-
 res/values-as/strings.xml | 2 +-
 res/values-hi/strings.xml | 2 +-
 res/values-hy/strings.xml | 6 +++---
 res/values-ja/strings.xml | 2 +-
 res/values-kn/strings.xml | 2 +-
 res/values-ml/strings.xml | 2 +-
 res/values-mn/strings.xml | 2 +-
 res/values-mr/strings.xml | 2 +-
 res/values-nl/strings.xml | 2 +-
 res/values-or/strings.xml | 2 +-
 res/values-te/strings.xml | 2 +-
 12 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index f19d121e7f..c39a9dc9ab 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -53,7 +53,7 @@
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Programinligting"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Installeer"</string>
     <string name="dismiss_prediction_label" msgid="3357562989568808658">"Moenie program voorstel nie"</string>
-    <string name="pin_prediction" msgid="4196423321649756498">"PIN-voorspelling"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Vasspeldvoorspelling"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"installeer kortpaaie"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Laat \'n program toe om kortpaaie by te voeg sonder gebruikerinmenging."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"lees Tuis-instellings en -kortpaaie"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index a6967b758b..8e9aafc651 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -98,7 +98,7 @@
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"নতুন এপসমূহৰ বাবে"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"অজ্ঞাত"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"আঁতৰাওক"</string>
-    <string name="abandoned_search" msgid="891119232568284442">"সন্ধান কৰক"</string>
+    <string name="abandoned_search" msgid="891119232568284442">"Search"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"এই এপটো ইনষ্টল কৰা হোৱা নাই"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"এই আইকনৰ এপটো ইনষ্টল কৰা হোৱা নাই। আপুনি এইটো আঁতৰাব পাৰে অথবা এপটো বিচাৰি মেনুৱেলভাৱে ইনষ্টল কৰিব পাৰে।"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> ডাউনল’ড কৰি থকা হৈছে, <xliff:g id="PROGRESS">%2$s</xliff:g> সম্পূৰ্ণ হ’ল"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index af3dcdb8b2..0cec9a324f 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -98,7 +98,7 @@
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"नए ऐप्लिकेशन के लिए"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"अज्ञात"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"निकालें"</string>
-    <string name="abandoned_search" msgid="891119232568284442">"सर्च करें"</string>
+    <string name="abandoned_search" msgid="891119232568284442">"खोजें"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"यह ऐप्लिकेशन इंस्टॉल नहीं है"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"इस आइकॉन का ऐप इंस्टॉल नहीं है. आप उसे निकाल सकते हैं या ऐप को खोज कर उसे मैन्युअल रूप से इंस्टॉल कर सकते हैं."</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> डाउनलोड हो रहा है, <xliff:g id="PROGRESS">%2$s</xliff:g> पूरी हुई"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 99b582b0b2..c098bb3f4b 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -48,8 +48,8 @@
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Անձնական հավելվածների ցանկ"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Աշխատանքային հավելվածների ցանկ"</string>
     <string name="all_apps_home_button_label" msgid="252062713717058851">"Հիմնական"</string>
-    <string name="remove_drop_target_label" msgid="7812859488053230776">"Ապատեղադրել"</string>
-    <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Հեռացնել"</string>
+    <string name="remove_drop_target_label" msgid="7812859488053230776">"Հեռացնել"</string>
+    <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Ապատեղադրել"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Հավելվածի մասին"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Տեղադրել"</string>
     <string name="dismiss_prediction_label" msgid="3357562989568808658">"Թաքցնել առաջարկը"</string>
@@ -97,7 +97,7 @@
     <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Ավելացնել պատկերակները հիմնական էկրանին"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Նոր հավելվածների համար"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Անհայտ է"</string>
-    <string name="abandoned_clean_this" msgid="7610119707847920412">"Ապատեղադրել"</string>
+    <string name="abandoned_clean_this" msgid="7610119707847920412">"Հեռացնել"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Գտնել"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Այս ծրագիրը տեղադրված չէ:"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Այս պատկերակի ծրագիրը տեղադրված չէ: Դուք կարող եք հեռացնել այն կամ գտնել ծրագիրը և տեղադրել այն ձեռքով:"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index a6e37c4fb4..4e0181c58d 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -53,7 +53,7 @@
     <string name="app_info_drop_target_label" msgid="692894985365717661">"アプリ情報"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"インストール"</string>
     <string name="dismiss_prediction_label" msgid="3357562989568808658">"アプリの候補を表示しない"</string>
-    <string name="pin_prediction" msgid="4196423321649756498">"アプリの候補を固定表示"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"アプリの候補を固定"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"ショートカットのインストール"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"ユーザー操作なしでショートカットを追加することをアプリに許可します。"</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"ホームの設定とショートカットの読み取り"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 1990e9e64e..09c115211c 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -98,7 +98,7 @@
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"ಹೊಸ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"ಅಪರಿಚಿತ"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"ತೆಗೆದುಹಾಕಿ"</string>
-    <string name="abandoned_search" msgid="891119232568284442">"ಹುಡುಕಿ"</string>
+    <string name="abandoned_search" msgid="891119232568284442">"Search"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"ಈ ಅಪ್ಲಿಕೇಶನ್ ಸ್ಥಾಪನೆಗೊಂಡಿಲ್ಲ"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"ಈ ಐಕಾನ್ ಅಪ್ಲಿಕೇಶನ್ ಸ್ಥಾಪನೆಗೊಂಡಿಲ್ಲ. ನೀವು ಅದನ್ನು ತೆಗೆದುಹಾಕಬಹುದು ಅಥವಾ ಅಪ್ಲಿಕೇಶನ್ ಹುಡುಕಬಹುದು ಮತ್ತು ಹಸ್ತಚಾಲಿತವಾಗಿ ಅದನ್ನು ಸ್ಥಾಪಿಸಬಹುದು."</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> ಡೌನ್‌ಲೋಡ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ, <xliff:g id="PROGRESS">%2$s</xliff:g> ಪೂರ್ಣಗೊಂಡಿದೆ"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 01d8935672..8156318199 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -98,7 +98,7 @@
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"പുതിയ ആപ്പുകൾക്ക്"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"അജ്ഞാതം"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"നീക്കംചെയ്യുക"</string>
-    <string name="abandoned_search" msgid="891119232568284442">"തിരയുക"</string>
+    <string name="abandoned_search" msgid="891119232568284442">"Search"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"ഈ അപ്ലിക്കേഷൻ ഇൻസ്റ്റാളുചെയ്‌തിട്ടില്ല"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"ഈ ഐക്കണുവേണ്ടി അപ്ലിക്കേഷൻ ഇൻസ്റ്റാളുചെയ്‌തിട്ടില്ല. നിങ്ങൾക്കത് നീക്കംചെയ്യാനാകും അല്ലെങ്കിൽ അപ്ലിക്കേഷനുവേണ്ടി തിരഞ്ഞുകൊണ്ട് അത് സ്വമേധയാ ഇൻസ്റ്റാളുചെയ്യുക."</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> ഡൗൺലോഡ് ചെയ്യുന്നു, <xliff:g id="PROGRESS">%2$s</xliff:g> പൂർത്തിയായി"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 027e78042a..1d680ab914 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -35,7 +35,7 @@
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Гараар байршуулахын тулд дараад хүлээнэ үү"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Автоматаар нэмэх"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Апп хайх"</string>
-    <string name="all_apps_loading_message" msgid="5813968043155271636">"Аппыг ачааллаж байна..."</string>
+    <string name="all_apps_loading_message" msgid="5813968043155271636">"Аппыг ачаалж байна..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\"-д тохирох апп олдсонгүй"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Бусад апп-г хайх"</string>
     <string name="label_application" msgid="8531721983832654978">"Апп"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 488f911e32..6f50f055e6 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -98,7 +98,7 @@
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"नवीन ॲप्ससाठी"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"अज्ञात"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"काढा"</string>
-    <string name="abandoned_search" msgid="891119232568284442">"शोधा"</string>
+    <string name="abandoned_search" msgid="891119232568284442">"Search"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"हा अ‍ॅप इंस्टॉल केलेला नाही"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"या चिन्हासाठी अ‍ॅप इंस्टॉल केलेला नाही. तुम्ही ते काढू शकता किंवा अ‍ॅपचा शोध घेऊ शकता आणि त्यास व्यक्तिचलितपणे इंस्टॉल करू शकता."</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> डाउनलोड होत आहे , <xliff:g id="PROGRESS">%2$s</xliff:g> पूर्ण झाले"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 76f1ecb0e5..ded05b099e 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -100,7 +100,7 @@
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Verwijderen"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Zoeken"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Deze app is niet geïnstalleerd"</string>
-    <string name="abandoned_promise_explanation" msgid="3990027586878167529">"De app voor dit pictogram is niet geïnstalleerd. Je kunt het pictogram verwijderen of de app zoeken en handmatig installeren."</string>
+    <string name="abandoned_promise_explanation" msgid="3990027586878167529">"De app voor dit icoon is niet geïnstalleerd. Je kunt het icoon verwijderen of de app zoeken en handmatig installeren."</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> wordt gedownload, <xliff:g id="PROGRESS">%2$s</xliff:g> voltooid"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> wacht op installatie"</string>
     <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g>-widgets"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index c6e2ba1dfe..994b620203 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -98,7 +98,7 @@
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"ନୂଆ ଆପ୍‌ ପାଇଁ"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"ଅଜଣା"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"ବାହାର କରନ୍ତୁ"</string>
-    <string name="abandoned_search" msgid="891119232568284442">"ସର୍ଚ୍ଚ କରନ୍ତୁ"</string>
+    <string name="abandoned_search" msgid="891119232568284442">"Search"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"ଏହି ଆପ୍‌ ଇନଷ୍ଟଲ୍‌ ହୋଇନାହିଁ"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"ଏହି ଆଇକନ୍‌ ପାଇଁ ଆପ୍‌ ଇନଷ୍ଟଲ୍‌ ହୋଇନାହିଁ। ଏହାକୁ ଆପଣ ଆପ୍‌ ପାଇଁ ବାହାର କରିପାରିବେ କିମ୍ୱା ସର୍ଚ୍ଚ କରି ପାରିବେ ଏବଂ ଏହାକୁ ମାନୁଆଲ୍‌ ଭାବରେ ଇନଷ୍ଟଲ୍‌ କରିପାରିବେ।"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> ଡାଉନଲୋଡ୍‌ ହେଉଛି, <xliff:g id="PROGRESS">%2$s</xliff:g> ସମ୍ପୂର୍ଣ୍ଣ"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 9816896fd6..3f6f9a63ab 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -98,7 +98,7 @@
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"కొత్త యాప్‌ల కోసం"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"తెలియదు"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"తీసివేయి"</string>
-    <string name="abandoned_search" msgid="891119232568284442">"వెతుకు"</string>
+    <string name="abandoned_search" msgid="891119232568284442">"సెర్చ్"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"ఈ యాప్ ఇన్‌స్టాల్ చేయబడలేదు"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"ఈ చిహ్నం యొక్క యాప్ ఇన్‌స్టాల్ చేయబడలేదు. మీరు దీన్ని తీసివేయవచ్చు లేదా ఆ యాప్ కోసం శోధించి దాన్ని మాన్యువల్‌గా ఇన్‌స్టాల్ చేయవచ్చు."</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> డౌన్‌లోడ్ అవుతోంది, <xliff:g id="PROGRESS">%2$s</xliff:g> పూర్తయింది"</string>
-- 
GitLab


From c4a8e0548415e79c9e68bef1149ed54a3deaaed6 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sat, 5 Sep 2020 18:49:41 +0000
Subject: [PATCH 0133/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: If5df1f7ce4c804632081cbc9d0e3050a87b2aeef
---
 res/values-af/strings.xml | 2 +-
 res/values-as/strings.xml | 2 +-
 res/values-hi/strings.xml | 2 +-
 res/values-hy/strings.xml | 6 +++---
 res/values-ja/strings.xml | 2 +-
 res/values-kn/strings.xml | 2 +-
 res/values-ml/strings.xml | 2 +-
 res/values-mn/strings.xml | 2 +-
 res/values-mr/strings.xml | 2 +-
 res/values-nl/strings.xml | 2 +-
 res/values-or/strings.xml | 2 +-
 res/values-te/strings.xml | 2 +-
 12 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index f19d121e7f..c39a9dc9ab 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -53,7 +53,7 @@
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Programinligting"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Installeer"</string>
     <string name="dismiss_prediction_label" msgid="3357562989568808658">"Moenie program voorstel nie"</string>
-    <string name="pin_prediction" msgid="4196423321649756498">"PIN-voorspelling"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Vasspeldvoorspelling"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"installeer kortpaaie"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Laat \'n program toe om kortpaaie by te voeg sonder gebruikerinmenging."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"lees Tuis-instellings en -kortpaaie"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index a6967b758b..8e9aafc651 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -98,7 +98,7 @@
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"নতুন এপসমূহৰ বাবে"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"অজ্ঞাত"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"আঁতৰাওক"</string>
-    <string name="abandoned_search" msgid="891119232568284442">"সন্ধান কৰক"</string>
+    <string name="abandoned_search" msgid="891119232568284442">"Search"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"এই এপটো ইনষ্টল কৰা হোৱা নাই"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"এই আইকনৰ এপটো ইনষ্টল কৰা হোৱা নাই। আপুনি এইটো আঁতৰাব পাৰে অথবা এপটো বিচাৰি মেনুৱেলভাৱে ইনষ্টল কৰিব পাৰে।"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> ডাউনল’ড কৰি থকা হৈছে, <xliff:g id="PROGRESS">%2$s</xliff:g> সম্পূৰ্ণ হ’ল"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index af3dcdb8b2..0cec9a324f 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -98,7 +98,7 @@
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"नए ऐप्लिकेशन के लिए"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"अज्ञात"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"निकालें"</string>
-    <string name="abandoned_search" msgid="891119232568284442">"सर्च करें"</string>
+    <string name="abandoned_search" msgid="891119232568284442">"खोजें"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"यह ऐप्लिकेशन इंस्टॉल नहीं है"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"इस आइकॉन का ऐप इंस्टॉल नहीं है. आप उसे निकाल सकते हैं या ऐप को खोज कर उसे मैन्युअल रूप से इंस्टॉल कर सकते हैं."</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> डाउनलोड हो रहा है, <xliff:g id="PROGRESS">%2$s</xliff:g> पूरी हुई"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 99b582b0b2..c098bb3f4b 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -48,8 +48,8 @@
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Անձնական հավելվածների ցանկ"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Աշխատանքային հավելվածների ցանկ"</string>
     <string name="all_apps_home_button_label" msgid="252062713717058851">"Հիմնական"</string>
-    <string name="remove_drop_target_label" msgid="7812859488053230776">"Ապատեղադրել"</string>
-    <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Հեռացնել"</string>
+    <string name="remove_drop_target_label" msgid="7812859488053230776">"Հեռացնել"</string>
+    <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Ապատեղադրել"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Հավելվածի մասին"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Տեղադրել"</string>
     <string name="dismiss_prediction_label" msgid="3357562989568808658">"Թաքցնել առաջարկը"</string>
@@ -97,7 +97,7 @@
     <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Ավելացնել պատկերակները հիմնական էկրանին"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Նոր հավելվածների համար"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Անհայտ է"</string>
-    <string name="abandoned_clean_this" msgid="7610119707847920412">"Ապատեղադրել"</string>
+    <string name="abandoned_clean_this" msgid="7610119707847920412">"Հեռացնել"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Գտնել"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Այս ծրագիրը տեղադրված չէ:"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Այս պատկերակի ծրագիրը տեղադրված չէ: Դուք կարող եք հեռացնել այն կամ գտնել ծրագիրը և տեղադրել այն ձեռքով:"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index a6e37c4fb4..4e0181c58d 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -53,7 +53,7 @@
     <string name="app_info_drop_target_label" msgid="692894985365717661">"アプリ情報"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"インストール"</string>
     <string name="dismiss_prediction_label" msgid="3357562989568808658">"アプリの候補を表示しない"</string>
-    <string name="pin_prediction" msgid="4196423321649756498">"アプリの候補を固定表示"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"アプリの候補を固定"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"ショートカットのインストール"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"ユーザー操作なしでショートカットを追加することをアプリに許可します。"</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"ホームの設定とショートカットの読み取り"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 1990e9e64e..09c115211c 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -98,7 +98,7 @@
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"ಹೊಸ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"ಅಪರಿಚಿತ"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"ತೆಗೆದುಹಾಕಿ"</string>
-    <string name="abandoned_search" msgid="891119232568284442">"ಹುಡುಕಿ"</string>
+    <string name="abandoned_search" msgid="891119232568284442">"Search"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"ಈ ಅಪ್ಲಿಕೇಶನ್ ಸ್ಥಾಪನೆಗೊಂಡಿಲ್ಲ"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"ಈ ಐಕಾನ್ ಅಪ್ಲಿಕೇಶನ್ ಸ್ಥಾಪನೆಗೊಂಡಿಲ್ಲ. ನೀವು ಅದನ್ನು ತೆಗೆದುಹಾಕಬಹುದು ಅಥವಾ ಅಪ್ಲಿಕೇಶನ್ ಹುಡುಕಬಹುದು ಮತ್ತು ಹಸ್ತಚಾಲಿತವಾಗಿ ಅದನ್ನು ಸ್ಥಾಪಿಸಬಹುದು."</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> ಡೌನ್‌ಲೋಡ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ, <xliff:g id="PROGRESS">%2$s</xliff:g> ಪೂರ್ಣಗೊಂಡಿದೆ"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 01d8935672..8156318199 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -98,7 +98,7 @@
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"പുതിയ ആപ്പുകൾക്ക്"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"അജ്ഞാതം"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"നീക്കംചെയ്യുക"</string>
-    <string name="abandoned_search" msgid="891119232568284442">"തിരയുക"</string>
+    <string name="abandoned_search" msgid="891119232568284442">"Search"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"ഈ അപ്ലിക്കേഷൻ ഇൻസ്റ്റാളുചെയ്‌തിട്ടില്ല"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"ഈ ഐക്കണുവേണ്ടി അപ്ലിക്കേഷൻ ഇൻസ്റ്റാളുചെയ്‌തിട്ടില്ല. നിങ്ങൾക്കത് നീക്കംചെയ്യാനാകും അല്ലെങ്കിൽ അപ്ലിക്കേഷനുവേണ്ടി തിരഞ്ഞുകൊണ്ട് അത് സ്വമേധയാ ഇൻസ്റ്റാളുചെയ്യുക."</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> ഡൗൺലോഡ് ചെയ്യുന്നു, <xliff:g id="PROGRESS">%2$s</xliff:g> പൂർത്തിയായി"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 027e78042a..1d680ab914 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -35,7 +35,7 @@
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Гараар байршуулахын тулд дараад хүлээнэ үү"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Автоматаар нэмэх"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Апп хайх"</string>
-    <string name="all_apps_loading_message" msgid="5813968043155271636">"Аппыг ачааллаж байна..."</string>
+    <string name="all_apps_loading_message" msgid="5813968043155271636">"Аппыг ачаалж байна..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\"-д тохирох апп олдсонгүй"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Бусад апп-г хайх"</string>
     <string name="label_application" msgid="8531721983832654978">"Апп"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 488f911e32..6f50f055e6 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -98,7 +98,7 @@
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"नवीन ॲप्ससाठी"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"अज्ञात"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"काढा"</string>
-    <string name="abandoned_search" msgid="891119232568284442">"शोधा"</string>
+    <string name="abandoned_search" msgid="891119232568284442">"Search"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"हा अ‍ॅप इंस्टॉल केलेला नाही"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"या चिन्हासाठी अ‍ॅप इंस्टॉल केलेला नाही. तुम्ही ते काढू शकता किंवा अ‍ॅपचा शोध घेऊ शकता आणि त्यास व्यक्तिचलितपणे इंस्टॉल करू शकता."</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> डाउनलोड होत आहे , <xliff:g id="PROGRESS">%2$s</xliff:g> पूर्ण झाले"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 76f1ecb0e5..ded05b099e 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -100,7 +100,7 @@
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Verwijderen"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Zoeken"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Deze app is niet geïnstalleerd"</string>
-    <string name="abandoned_promise_explanation" msgid="3990027586878167529">"De app voor dit pictogram is niet geïnstalleerd. Je kunt het pictogram verwijderen of de app zoeken en handmatig installeren."</string>
+    <string name="abandoned_promise_explanation" msgid="3990027586878167529">"De app voor dit icoon is niet geïnstalleerd. Je kunt het icoon verwijderen of de app zoeken en handmatig installeren."</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> wordt gedownload, <xliff:g id="PROGRESS">%2$s</xliff:g> voltooid"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> wacht op installatie"</string>
     <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g>-widgets"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index c6e2ba1dfe..994b620203 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -98,7 +98,7 @@
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"ନୂଆ ଆପ୍‌ ପାଇଁ"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"ଅଜଣା"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"ବାହାର କରନ୍ତୁ"</string>
-    <string name="abandoned_search" msgid="891119232568284442">"ସର୍ଚ୍ଚ କରନ୍ତୁ"</string>
+    <string name="abandoned_search" msgid="891119232568284442">"Search"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"ଏହି ଆପ୍‌ ଇନଷ୍ଟଲ୍‌ ହୋଇନାହିଁ"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"ଏହି ଆଇକନ୍‌ ପାଇଁ ଆପ୍‌ ଇନଷ୍ଟଲ୍‌ ହୋଇନାହିଁ। ଏହାକୁ ଆପଣ ଆପ୍‌ ପାଇଁ ବାହାର କରିପାରିବେ କିମ୍ୱା ସର୍ଚ୍ଚ କରି ପାରିବେ ଏବଂ ଏହାକୁ ମାନୁଆଲ୍‌ ଭାବରେ ଇନଷ୍ଟଲ୍‌ କରିପାରିବେ।"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> ଡାଉନଲୋଡ୍‌ ହେଉଛି, <xliff:g id="PROGRESS">%2$s</xliff:g> ସମ୍ପୂର୍ଣ୍ଣ"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 9816896fd6..3f6f9a63ab 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -98,7 +98,7 @@
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"కొత్త యాప్‌ల కోసం"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"తెలియదు"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"తీసివేయి"</string>
-    <string name="abandoned_search" msgid="891119232568284442">"వెతుకు"</string>
+    <string name="abandoned_search" msgid="891119232568284442">"సెర్చ్"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"ఈ యాప్ ఇన్‌స్టాల్ చేయబడలేదు"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"ఈ చిహ్నం యొక్క యాప్ ఇన్‌స్టాల్ చేయబడలేదు. మీరు దీన్ని తీసివేయవచ్చు లేదా ఆ యాప్ కోసం శోధించి దాన్ని మాన్యువల్‌గా ఇన్‌స్టాల్ చేయవచ్చు."</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> డౌన్‌లోడ్ అవుతోంది, <xliff:g id="PROGRESS">%2$s</xliff:g> పూర్తయింది"</string>
-- 
GitLab


From b0277191f386b0fb5eeaaff9cbcf1854676f1da3 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Tue, 8 Sep 2020 00:51:00 -0700
Subject: [PATCH 0134/1664] Improve AA+ Search UI, fix IME double close Bug:
 167573256

Change-Id: If0d76177a8589bee3283d8c06529cedc8aab6c31
---
 res/values/strings.xml                                      | 2 ++
 .../launcher3/allapps/AllAppsTransitionController.java      | 6 +-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ad3e2b79f4..6ab81501f4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -58,6 +58,8 @@
     <!-- All Apps -->
     <!-- Search bar text in the apps view. [CHAR_LIMIT=50] -->
     <string name="all_apps_search_bar_hint">Search apps</string>
+    <!-- Search bar text in the apps view. [CHAR_LIMIT=50] -->
+    <string name="all_apps_on_device_search_bar_hint">Search this phone and more...</string>
     <!-- Loading apps text. [CHAR_LIMIT=50] -->
     <string name="all_apps_loading_message">Loading apps&#8230;</string>
     <!-- No-search-results text. [CHAR_LIMIT=50] -->
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 0268b9638f..4195a056fe 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -270,11 +270,7 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
                     editText.requestFocus();
                 }
             }
-            if (Float.compare(mProgress, 1f) == 0) {
-                // Called when home gesture closes all apps container.
-                // TODO: should make the controller hide synchronously
-                mInsetController.hide();
-            }
+            // TODO: should make the controller hide synchronously
         }
     }
 }
-- 
GitLab


From 7aa577d8836c624abd876ff3914b14c232cca860 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Thu, 3 Sep 2020 09:42:54 -0700
Subject: [PATCH 0135/1664] Show independent shortcuts from Hero view

Test: Manual
Screenshot: https://screenshot.googleplex.com/6iQGEZADXf9PtWz
Bug: 165320033
Change-Id: Ib8db1fc34da4adc39f3bec5557223a1e283380dd
---
 res/layout/search_result_shortcut.xml         | 42 ++++++++
 .../launcher3/allapps/AllAppsGridAdapter.java |  9 +-
 .../launcher3/views/SearchResultShortcut.java | 98 +++++++++++++++++++
 .../systemui/plugins/shared/SearchTarget.java |  8 +-
 4 files changed, 154 insertions(+), 3 deletions(-)
 create mode 100644 res/layout/search_result_shortcut.xml
 create mode 100644 src/com/android/launcher3/views/SearchResultShortcut.java

diff --git a/res/layout/search_result_shortcut.xml b/res/layout/search_result_shortcut.xml
new file mode 100644
index 0000000000..c350c973da
--- /dev/null
+++ b/res/layout/search_result_shortcut.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.launcher3.views.SearchResultShortcut xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
+    android:padding="@dimen/dynamic_grid_edge_margin">
+
+    <com.android.launcher3.BubbleTextView
+        android:id="@+id/bubble_text"
+        style="@style/BaseIcon"
+        android:drawablePadding="@dimen/dynamic_grid_icon_drawable_padding"
+        android:gravity="start|center_vertical"
+        android:textAlignment="viewStart"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="16sp"
+        android:layout_height="wrap_content"
+        launcher:iconDisplay="hero_app"
+        launcher:layoutHorizontal="true" />
+
+    <View
+        android:id="@+id/icon"
+        android:layout_width="@dimen/deep_shortcut_icon_size"
+        android:layout_height="@dimen/deep_shortcut_icon_size"
+        android:layout_gravity="start|center_vertical"
+        android:background="@drawable/ic_deepshortcut_placeholder" />
+
+</com.android.launcher3.views.SearchResultShortcut>
\ No newline at end of file
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index da161ac1cc..ad6aa63371 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -89,6 +89,8 @@ public class AllAppsGridAdapter extends
 
     public static final int VIEW_TYPE_SEARCH_SLICE = 1 << 9;
 
+    public static final int VIEW_TYPE_SEARCH_SHORTCUT = 1 << 10;
+
     // Common view type masks
     public static final int VIEW_TYPE_MASK_DIVIDER = VIEW_TYPE_ALL_APPS_DIVIDER;
     public static final int VIEW_TYPE_MASK_ICON = VIEW_TYPE_ICON;
@@ -179,7 +181,8 @@ public class AllAppsGridAdapter extends
                     || viewType == VIEW_TYPE_SEARCH_HERO_APP
                     || viewType == VIEW_TYPE_SEARCH_ROW_WITH_BUTTON
                     || viewType == VIEW_TYPE_SEARCH_SLICE
-                    || viewType == VIEW_TYPE_SEARCH_ROW;
+                    || viewType == VIEW_TYPE_SEARCH_ROW
+                    || viewType == VIEW_TYPE_SEARCH_SHORTCUT;
         }
     }
 
@@ -426,6 +429,9 @@ public class AllAppsGridAdapter extends
             case VIEW_TYPE_SEARCH_SLICE:
                 return new ViewHolder(mLayoutInflater.inflate(
                         R.layout.search_result_slice, parent, false));
+            case VIEW_TYPE_SEARCH_SHORTCUT:
+                return new ViewHolder(mLayoutInflater.inflate(
+                        R.layout.search_result_shortcut, parent, false));
             default:
                 throw new RuntimeException("Unexpected view type");
         }
@@ -468,6 +474,7 @@ public class AllAppsGridAdapter extends
             case VIEW_TYPE_SEARCH_ROW_WITH_BUTTON:
             case VIEW_TYPE_SEARCH_HERO_APP:
             case VIEW_TYPE_SEARCH_ROW:
+            case VIEW_TYPE_SEARCH_SHORTCUT:
                 PayloadResultHandler payloadResultView = (PayloadResultHandler) holder.itemView;
                 payloadResultView.applyAdapterInfo(
                         (AdapterItemWithPayload) mApps.getAdapterItems().get(position));
diff --git a/src/com/android/launcher3/views/SearchResultShortcut.java b/src/com/android/launcher3/views/SearchResultShortcut.java
new file mode 100644
index 0000000000..a402719e76
--- /dev/null
+++ b/src/com/android/launcher3/views/SearchResultShortcut.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.views;
+
+import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
+
+import android.content.Context;
+import android.content.pm.ShortcutInfo;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.BubbleTextView;
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.R;
+import com.android.launcher3.allapps.AllAppsGridAdapter;
+import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.launcher3.touch.ItemClickHandler;
+import com.android.systemui.plugins.shared.SearchTarget;
+
+/**
+ * A view representing a stand alone shortcut search result
+ */
+public class SearchResultShortcut extends FrameLayout implements
+        AllAppsSearchBarController.PayloadResultHandler<SearchTarget> {
+
+    BubbleTextView mBubbleTextView;
+    View mIconView;
+
+    public SearchResultShortcut(@NonNull Context context) {
+        super(context);
+    }
+
+    public SearchResultShortcut(@NonNull Context context,
+            @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public SearchResultShortcut(@NonNull Context context, @Nullable AttributeSet attrs,
+            int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        Launcher launcher = Launcher.getLauncher(getContext());
+        DeviceProfile grid = launcher.getDeviceProfile();
+        mIconView = findViewById(R.id.icon);
+        ViewGroup.LayoutParams iconParams = mIconView.getLayoutParams();
+        iconParams.height = grid.allAppsIconSizePx;
+        iconParams.width = grid.allAppsIconSizePx;
+        mBubbleTextView = findViewById(R.id.bubble_text);
+        setOnClickListener(v -> handleSelection());
+    }
+
+    @Override
+    public void applyAdapterInfo(
+            AllAppsGridAdapter.AdapterItemWithPayload<SearchTarget> adapterItemWithPayload) {
+        SearchTarget payload = adapterItemWithPayload.getPayload();
+        ShortcutInfo si = payload.shortcuts.get(0);
+        WorkspaceItemInfo workspaceItemInfo = new WorkspaceItemInfo(si, getContext());
+        mBubbleTextView.applyFromWorkspaceItem(workspaceItemInfo);
+        mIconView.setBackground(mBubbleTextView.getIcon());
+        LauncherAppState launcherAppState = LauncherAppState.getInstance(getContext());
+        MODEL_EXECUTOR.execute(() -> {
+            launcherAppState.getIconCache().getShortcutIcon(workspaceItemInfo, si);
+            mBubbleTextView.applyFromWorkspaceItem(workspaceItemInfo);
+            mIconView.setBackground(mBubbleTextView.getIcon());
+        });
+        adapterItemWithPayload.setSelectionHandler(this::handleSelection);
+    }
+
+    private void handleSelection() {
+        ItemClickHandler.onClickAppShortcut(this, (WorkspaceItemInfo) mBubbleTextView.getTag(),
+                Launcher.getLauncher(getContext()));
+    }
+}
diff --git a/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java b/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
index 913fc0ed7c..c6b8300499 100644
--- a/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
+++ b/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
@@ -31,7 +31,9 @@ public class SearchTarget implements Comparable<SearchTarget> {
         DETAIL(2),
         ROW(3),
         ROW_WITH_BUTTON(4),
-        SLICE(5);
+        SLICE(5),
+        SHORTCUT(6),
+        PEOPLE(7);
 
         private final int mId;
         ViewType(int id) {
@@ -48,7 +50,9 @@ public class SearchTarget implements Comparable<SearchTarget> {
         SETTINGS_ROW(1, "Settings", ViewType.ROW),
         SETTINGS_SLICE(2, "Settings", ViewType.SLICE),
         APP(3, "", ViewType.TOP_HIT),
-        APP_HERO(4, "", ViewType.HERO);
+        APP_HERO(4, "", ViewType.HERO),
+        SHORTCUT(5, "Shortcuts", ViewType.SHORTCUT),
+        PEOPLE(6, "People", ViewType.PEOPLE);
 
         private final int mId;
         private final String mTitle;
-- 
GitLab


From 70dc1066b6939ef7b106a0c587bd78ba341168ed Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Thu, 3 Sep 2020 13:34:17 -0700
Subject: [PATCH 0136/1664] Annotating open-Launcher transition in trace files

Currently, in trace files, it's hard
to find the exact set of frames for this transition.

Change-Id: I17ac201f9f9bc357ba42003776ec7a20ddef033d
---
 .../QuickstepAppTransitionManagerImpl.java      | 17 +++++++++++++++++
 .../android/quickstep/AbsSwipeUpHandler.java    |  9 +++++++++
 2 files changed, 26 insertions(+)

diff --git a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
index f3d543405d..e2449a4d8a 100644
--- a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
@@ -57,6 +57,7 @@ import android.graphics.drawable.Drawable;
 import android.os.CancellationSignal;
 import android.os.Handler;
 import android.os.Looper;
+import android.os.Trace;
 import android.util.Pair;
 import android.view.View;
 
@@ -137,6 +138,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
 
     // Progress = 0: All apps is fully pulled up, Progress = 1: All apps is fully pulled down.
     public static final float ALL_APPS_PROGRESS_OFF_SCREEN = 1.3059858f;
+    public static final String TRANSITION_OPEN_LAUNCHER = "transition:OpenLauncher";
 
     protected final BaseQuickstepLauncher mLauncher;
 
@@ -853,6 +855,21 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                 // is initialized.
                 if (launcherIsATargetWithMode(appTargets, MODE_OPENING)
                         || mLauncher.isForceInvisible()) {
+                    if (Trace.isEnabled()) {
+                        anim.addListener(new AnimatorListenerAdapter() {
+                            @Override
+                            public void onAnimationStart(Animator animation) {
+                                Trace.beginAsyncSection(TRANSITION_OPEN_LAUNCHER, 0);
+                                super.onAnimationStart(animation);
+                            }
+
+                            @Override
+                            public void onAnimationEnd(Animator animation) {
+                                super.onAnimationEnd(animation);
+                                Trace.endAsyncSection(TRANSITION_OPEN_LAUNCHER, 0);
+                            }
+                        });
+                    }
                     // Only register the content animation for cancellation when state changes
                     mLauncher.getStateManager().setCurrentAnimation(anim);
 
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index aaa2720047..2d18b6f1e4 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -19,6 +19,7 @@ import static android.widget.Toast.LENGTH_SHORT;
 
 import static com.android.launcher3.BaseActivity.INVISIBLE_BY_STATE_HANDLER;
 import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS;
+import static com.android.launcher3.QuickstepAppTransitionManagerImpl.TRANSITION_OPEN_LAUNCHER;
 import static com.android.launcher3.anim.Interpolators.DEACCEL;
 import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
@@ -53,6 +54,7 @@ import android.graphics.PointF;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.SystemClock;
+import android.os.Trace;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
@@ -1135,6 +1137,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         anim.addAnimatorListener(new AnimationSuccessListener() {
             @Override
             public void onAnimationStart(Animator animation) {
+                Trace.beginAsyncSection(TRANSITION_OPEN_LAUNCHER, 0);
                 if (mActivity != null) {
                     removeLiveTileOverlay();
                 }
@@ -1149,6 +1152,12 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                 maybeUpdateRecentsAttachedState(false);
                 mActivityInterface.onSwipeUpToHomeComplete(mDeviceState);
             }
+
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                super.onAnimationEnd(animation);
+                Trace.endAsyncSection(TRANSITION_OPEN_LAUNCHER, 0);
+            }
         });
         if (mRecentsAnimationTargets != null) {
             mRecentsAnimationTargets.addReleaseCheck(anim);
-- 
GitLab


From 4484015f482772e2a493cc1dda525c929398b4f2 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 25 Aug 2020 23:22:18 -0700
Subject: [PATCH 0137/1664] Simplifying AppFilter

Change-Id: I36217a42aa67f2b3bc3a3226ace2ef7e194956a6
---
 res/values/config.xml                         |  3 ++-
 src/com/android/launcher3/AppFilter.java      | 20 ++++++++++++++-----
 .../android/launcher3/LauncherAppState.java   |  2 +-
 .../android/launcher3/model/WidgetsModel.java |  2 +-
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/res/values/config.xml b/res/values/config.xml
index fc0a5e10dc..325b62f9dc 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -59,7 +59,6 @@
     <bool name="hotseat_transpose_layout_with_orientation">true</bool>
 
     <!-- Various classes overriden by projects/build flavors. -->
-    <string name="app_filter_class" translatable="false"></string>
     <string name="user_event_dispatcher_class" translatable="false"></string>
     <string name="folder_name_provider_class" translatable="false"></string>
     <string name="stats_log_manager_class" translatable="false"></string>
@@ -187,4 +186,6 @@
 
     <string-array name="live_wallpapers_remove_sysui_scrims">
     </string-array>
+
+    <string-array name="filtered_components" ></string-array>
 </resources>
diff --git a/src/com/android/launcher3/AppFilter.java b/src/com/android/launcher3/AppFilter.java
index 9b6166ffcf..3db456cbdb 100644
--- a/src/com/android/launcher3/AppFilter.java
+++ b/src/com/android/launcher3/AppFilter.java
@@ -3,15 +3,25 @@ package com.android.launcher3;
 import android.content.ComponentName;
 import android.content.Context;
 
-import com.android.launcher3.util.ResourceBasedOverride;
+import java.util.Arrays;
+import java.util.Set;
+import java.util.stream.Collectors;
 
-public class AppFilter implements ResourceBasedOverride {
+/**
+ * Utility class to filter out components from various lists
+ */
+public class AppFilter {
 
-    public static AppFilter newInstance(Context context) {
-        return Overrides.getObject(AppFilter.class, context, R.string.app_filter_class);
+    private final Set<ComponentName> mFilteredComponents;
+
+    public AppFilter(Context context) {
+        mFilteredComponents = Arrays.stream(
+                context.getResources().getStringArray(R.array.filtered_components))
+                .map(ComponentName::unflattenFromString)
+                .collect(Collectors.toSet());
     }
 
     public boolean shouldShowApp(ComponentName app) {
-        return true;
+        return !mFilteredComponents.contains(app);
     }
 }
diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index b278e81655..bfe327e40d 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -122,7 +122,7 @@ public class LauncherAppState {
         mInvariantDeviceProfile = InvariantDeviceProfile.INSTANCE.get(context);
         mIconCache = new IconCache(mContext, mInvariantDeviceProfile, iconCacheFileName);
         mWidgetCache = new WidgetPreviewLoader(mContext, mIconCache);
-        mModel = new LauncherModel(context, this, mIconCache, AppFilter.newInstance(mContext));
+        mModel = new LauncherModel(context, this, mIconCache, new AppFilter(mContext));
     }
 
     protected void onNotificationSettingsChanged(boolean areNotificationDotsEnabled) {
diff --git a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
index 34ebbac59a..b4e45f835a 100644
--- a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
+++ b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
@@ -234,7 +234,7 @@ public class WidgetsModel {
 
         WidgetValidityCheck(LauncherAppState app) {
             mIdp = app.getInvariantDeviceProfile();
-            mAppFilter = AppFilter.newInstance(app.getContext());
+            mAppFilter = new AppFilter(app.getContext());
         }
 
         @Override
-- 
GitLab


From f367ced932e802b411d36d9c702bd02db54e8dec Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Tue, 8 Sep 2020 15:36:07 -0700
Subject: [PATCH 0138/1664] Annotating open-app transitions in trace files

Change-Id: I2461186321b7c33dbabca34c066b61f2169010f3
---
 .../QuickstepAppTransitionManagerImpl.java    | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
index e2449a4d8a..dddcc865fa 100644
--- a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
@@ -904,6 +904,9 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
      */
     private class AppLaunchAnimationRunner implements WrappedAnimationRunnerImpl {
 
+        private static final String TRANSITION_LAUNCH_FROM_RECENTS = "transition:LaunchFromRecents";
+        private static final String TRANSITION_LAUNCH_FROM_ICON = "transition:LaunchFromIcon";
+
         private final Handler mHandler;
         private final View mV;
 
@@ -926,7 +929,8 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
             boolean launcherClosing =
                     launcherIsATargetWithMode(appTargets, MODE_CLOSING);
 
-            if (isLaunchingFromRecents(mV, appTargets)) {
+            final boolean launchingFromRecents = isLaunchingFromRecents(mV, appTargets);
+            if (launchingFromRecents) {
                 composeRecentsLaunchAnimator(anim, mV, appTargets, wallpaperTargets,
                         launcherClosing);
             } else {
@@ -934,6 +938,26 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                         launcherClosing);
             }
 
+            if (Trace.isEnabled()) {
+                final String section =
+                        launchingFromRecents
+                                ? TRANSITION_LAUNCH_FROM_RECENTS : TRANSITION_LAUNCH_FROM_ICON;
+
+                anim.addListener(new AnimatorListenerAdapter() {
+                    @Override
+                    public void onAnimationStart(Animator animation) {
+                        Trace.beginAsyncSection(section, 0);
+                        super.onAnimationStart(animation);
+                    }
+
+                    @Override
+                    public void onAnimationEnd(Animator animation) {
+                        super.onAnimationEnd(animation);
+                        Trace.endAsyncSection(section, 0);
+                    }
+                });
+            }
+
             if (launcherClosing) {
                 anim.addListener(mForceInvisibleListener);
             }
-- 
GitLab


From 35f9150a677b6c29bcf8a3befd47b50ea5665b71 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Tue, 8 Sep 2020 14:00:56 -0700
Subject: [PATCH 0139/1664] Support People search result in launcher

NOTE: this uses PackageManager and should be removed after people<>shortcut mapping in search provider.

Bug: 166337069
Test: Manual
Change-Id: I016ff0d5e6ada1599cce3d75bdcd55347c85193e
---
 res/layout/search_result_people_item.xml      |  62 +++++++
 .../launcher3/allapps/AllAppsGridAdapter.java |   7 +
 .../views/SearchResultPeopleView.java         | 156 ++++++++++++++++++
 3 files changed, 225 insertions(+)
 create mode 100644 res/layout/search_result_people_item.xml
 create mode 100644 src/com/android/launcher3/views/SearchResultPeopleView.java

diff --git a/res/layout/search_result_people_item.xml b/res/layout/search_result_people_item.xml
new file mode 100644
index 0000000000..a505e4a968
--- /dev/null
+++ b/res/layout/search_result_people_item.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.launcher3.views.SearchResultPeopleView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:gravity="center_vertical"
+    android:layout_height="wrap_content"
+    android:padding="8dp"
+    android:orientation="horizontal">
+
+    <View
+        android:id="@+id/icon"
+        android:layout_marginRight="8dp"
+        android:layout_width="@dimen/default_icon_bitmap_size"
+        android:layout_height="@dimen/default_icon_bitmap_size" />
+
+    <TextView
+        android:layout_width="0dp"
+        android:textColor="?android:attr/textColorPrimary"
+        android:id="@+id/title"
+        android:layout_height="wrap_content"
+        android:layout_weight="1" />
+
+    <ImageButton
+        android:id="@+id/provider_0"
+        android:scaleType="fitCenter"
+        android:adjustViewBounds="true"
+        android:layout_margin="5dp"
+        android:background="?android:attr/selectableItemBackground"
+        android:layout_width="@dimen/default_icon_bitmap_size"
+        android:layout_height="@dimen/default_icon_bitmap_size" />
+
+    <ImageButton
+        android:id="@+id/provider_1"
+        android:layout_margin="5dp"
+        android:scaleType="fitCenter"
+        android:adjustViewBounds="true"
+        android:background="?android:attr/selectableItemBackground"
+        android:layout_width="@dimen/default_icon_bitmap_size"
+        android:layout_height="@dimen/default_icon_bitmap_size" />
+
+    <ImageButton
+        android:id="@+id/provider_2"
+        android:layout_margin="5dp"
+        android:scaleType="fitCenter"
+        android:adjustViewBounds="true"
+        android:background="?android:attr/selectableItemBackground"
+        android:layout_width="@dimen/default_icon_bitmap_size"
+        android:layout_height="@dimen/default_icon_bitmap_size" />
+
+</com.android.launcher3.views.SearchResultPeopleView>
\ No newline at end of file
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index ad6aa63371..4e801a7cc8 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -91,6 +91,8 @@ public class AllAppsGridAdapter extends
 
     public static final int VIEW_TYPE_SEARCH_SHORTCUT = 1 << 10;
 
+    public static final int VIEW_TYPE_SEARCH_PEOPLE = 1 << 11;
+
     // Common view type masks
     public static final int VIEW_TYPE_MASK_DIVIDER = VIEW_TYPE_ALL_APPS_DIVIDER;
     public static final int VIEW_TYPE_MASK_ICON = VIEW_TYPE_ICON;
@@ -182,6 +184,7 @@ public class AllAppsGridAdapter extends
                     || viewType == VIEW_TYPE_SEARCH_ROW_WITH_BUTTON
                     || viewType == VIEW_TYPE_SEARCH_SLICE
                     || viewType == VIEW_TYPE_SEARCH_ROW
+                    || viewType == VIEW_TYPE_SEARCH_PEOPLE
                     || viewType == VIEW_TYPE_SEARCH_SHORTCUT;
         }
     }
@@ -432,6 +435,9 @@ public class AllAppsGridAdapter extends
             case VIEW_TYPE_SEARCH_SHORTCUT:
                 return new ViewHolder(mLayoutInflater.inflate(
                         R.layout.search_result_shortcut, parent, false));
+            case VIEW_TYPE_SEARCH_PEOPLE:
+                return new ViewHolder(mLayoutInflater.inflate(
+                        R.layout.search_result_people_item, parent, false));
             default:
                 throw new RuntimeException("Unexpected view type");
         }
@@ -475,6 +481,7 @@ public class AllAppsGridAdapter extends
             case VIEW_TYPE_SEARCH_HERO_APP:
             case VIEW_TYPE_SEARCH_ROW:
             case VIEW_TYPE_SEARCH_SHORTCUT:
+            case VIEW_TYPE_SEARCH_PEOPLE:
                 PayloadResultHandler payloadResultView = (PayloadResultHandler) holder.itemView;
                 payloadResultView.applyAdapterInfo(
                         (AdapterItemWithPayload) mApps.getAdapterItems().get(position));
diff --git a/src/com/android/launcher3/views/SearchResultPeopleView.java b/src/com/android/launcher3/views/SearchResultPeopleView.java
new file mode 100644
index 0000000000..d1e34fa65f
--- /dev/null
+++ b/src/com/android/launcher3/views/SearchResultPeopleView.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.views;
+
+import static android.content.Intent.URI_ALLOW_UNSAFE;
+import static android.content.Intent.URI_ANDROID_APP_SCHEME;
+
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.core.graphics.drawable.RoundedBitmapDrawable;
+import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
+
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+import com.android.launcher3.allapps.AllAppsGridAdapter;
+import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+import com.android.launcher3.util.Themes;
+
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+
+/**
+ * A view representing a single people search result in all apps
+ */
+public class SearchResultPeopleView extends LinearLayout implements
+        AllAppsSearchBarController.PayloadResultHandler<Bundle> {
+
+    private final int mIconSize;
+    private final int mButtonSize;
+    private final PackageManager mPackageManager;
+    View mIconView;
+    TextView mTitleView;
+    ImageButton[] mProviderButtons = new ImageButton[3];
+
+    public SearchResultPeopleView(Context context) {
+        this(context, null, 0);
+    }
+
+    public SearchResultPeopleView(Context context,
+            @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public SearchResultPeopleView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        DeviceProfile deviceProfile = Launcher.getLauncher(getContext()).getDeviceProfile();
+        mPackageManager = getContext().getPackageManager();
+        mIconSize = deviceProfile.iconSizePx;
+        mButtonSize = (int) (deviceProfile.iconSizePx / 1.5f);
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mIconView = findViewById(R.id.icon);
+        mIconView.getLayoutParams().height = mIconSize;
+        mIconView.getLayoutParams().width = mIconSize;
+        mTitleView = findViewById(R.id.title);
+        mProviderButtons[0] = findViewById(R.id.provider_0);
+        mProviderButtons[1] = findViewById(R.id.provider_1);
+        mProviderButtons[2] = findViewById(R.id.provider_2);
+        for (ImageButton button : mProviderButtons) {
+            button.getLayoutParams().width = mButtonSize;
+            button.getLayoutParams().height = mButtonSize;
+        }
+        setOnClickListener(v -> handleSelection());
+    }
+
+    @Override
+    public void applyAdapterInfo(
+            AllAppsGridAdapter.AdapterItemWithPayload<Bundle> adapterItemWithPayload) {
+        Launcher launcher = Launcher.getLauncher(getContext());
+        Bundle payload = adapterItemWithPayload.getPayload();
+        mTitleView.setText(payload.getString("title"));
+        mContactUri = payload.getParcelable("contact_uri");
+        Bitmap icon = payload.getParcelable("icon");
+        if (icon != null) {
+            RoundedBitmapDrawable d = RoundedBitmapDrawableFactory.create(getResources(), icon);
+            float radius = Themes.getDialogCornerRadius(getContext());
+            d.setCornerRadius(radius);
+            d.setBounds(0, 0, mIconSize, mIconSize);
+            BitmapDrawable bitmapDrawable = new BitmapDrawable(getResources(),
+                    Bitmap.createScaledBitmap(icon, mIconSize, mIconSize, false));
+            mIconView.setBackground(d);
+        }
+
+        ArrayList<Bundle> providers = payload.getParcelableArrayList("providers");
+        for (int i = 0; i < mProviderButtons.length; i++) {
+            ImageButton button = mProviderButtons[i];
+            if (providers != null && i < providers.size()) {
+                try {
+                    Bundle provider = providers.get(i);
+                    Intent intent = Intent.parseUri(provider.getString("intent_uri_str"),
+                            URI_ANDROID_APP_SCHEME | URI_ALLOW_UNSAFE);
+                    String pkg = provider.getString("package_name");
+                    button.setOnClickListener(b -> launcher.startActivitySafely(b, intent, null));
+                    UI_HELPER_EXECUTOR.post(() -> {
+                        try {
+                            ApplicationInfo applicationInfo = mPackageManager.getApplicationInfo(
+                                    pkg, 0);
+                            Drawable appIcon = applicationInfo.loadIcon(mPackageManager);
+                            button.setImageDrawable(appIcon);
+                        } catch (PackageManager.NameNotFoundException ignored) {
+                        }
+
+                    });
+                } catch (URISyntaxException ex) {
+                    button.setVisibility(GONE);
+                }
+            } else {
+                button.setVisibility(GONE);
+            }
+        }
+        adapterItemWithPayload.setSelectionHandler(this::handleSelection);
+    }
+
+    Uri mContactUri;
+
+    private void handleSelection() {
+        if (mContactUri != null) {
+            Launcher launcher = Launcher.getLauncher(getContext());
+            launcher.startActivitySafely(this, new Intent(Intent.ACTION_VIEW, mContactUri).setFlags(
+                    Intent.FLAG_ACTIVITY_NEW_TASK), null);
+        }
+    }
+}
-- 
GitLab


From 4318324ab4dfd583f97f5f93448cfd02df4fdeda Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 9 Sep 2020 17:12:49 -0700
Subject: [PATCH 0140/1664] Allow pause during quick switch for any horizontal
 displacement

The shelf no longer exists in 0 button mode, so it's not necessary
to wait for workspace to be invisible before allowing the pause.

Change-Id: I202ed9991b18f5e7cb2e4f0aa6be7a0d66b8ffd7
---
 .../NoButtonQuickSwitchTouchController.java                 | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
index 4b0642fab7..8285850c7e 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
@@ -271,11 +271,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
         mIsHomeScreenVisible = FADE_OUT_INTERPOLATOR.getInterpolation(xProgress)
                 <= 1 - ALPHA_CUTOFF_THRESHOLD;
 
-
-        // Only allow motion pause if the home screen is invisible, since some
-        // home screen elements will appear in the shelf on motion pause.
-        mMotionPauseDetector.setDisallowPause(mIsHomeScreenVisible
-                || -displacement.y < mMotionPauseMinDisplacement);
+        mMotionPauseDetector.setDisallowPause(-displacement.y < mMotionPauseMinDisplacement);
         mMotionPauseDetector.addPosition(ev);
 
         if (mXOverviewAnim != null) {
-- 
GitLab


From 248a7f89ac0b46157e145ae3df836fb8ad23138a Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 28 Aug 2020 14:53:31 -0700
Subject: [PATCH 0141/1664] Only set live target if there is a target to set

Fixes: 166143722
Change-Id: I10c5bf384f6cee02cc55c035647911672f638e48
---
 quickstep/src/com/android/quickstep/views/RecentsView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 6ae91b69b8..0362377399 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2251,7 +2251,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     public void setRecentsAnimationTargets(RecentsAnimationController recentsAnimationController,
             RecentsAnimationTargets recentsAnimationTargets) {
         mRecentsAnimationController = recentsAnimationController;
-        if (recentsAnimationTargets != null) {
+        if (recentsAnimationTargets != null && recentsAnimationTargets.apps.length > 0) {
             mLiveTileTaskViewSimulator.setPreview(
                     recentsAnimationTargets.apps[recentsAnimationTargets.apps.length - 1]);
             mLiveTileParams.setTargetSet(recentsAnimationTargets);
-- 
GitLab


From 46aba2a46ef98f5c24ed495d766b4b2b8c4b7129 Mon Sep 17 00:00:00 2001
From: Sreyas <sreyasr@google.com>
Date: Wed, 9 Sep 2020 16:36:35 -0700
Subject: [PATCH 0142/1664] Adding content push button behind flag to OAV.

Tested: TaplTestsNexus:testOverviewActions()
Change-Id: I83bc6e5033e2292776c927fba363214f347e01ce
---
 .../res/layout/overview_actions_container.xml |  2 +-
 .../QuickstepTestInformationHandler.java      |  6 ++++++
 .../quickstep/views/OverviewActionsView.java  |  2 +-
 .../launcher3/config/FeatureFlags.java        |  3 +++
 .../launcher3/testing/TestProtocol.java       |  2 ++
 .../tapl/LauncherInstrumentation.java         |  5 +++++
 .../launcher3/tapl/OverviewActions.java       | 21 +++++++++++++++++++
 7 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/quickstep/res/layout/overview_actions_container.xml b/quickstep/res/layout/overview_actions_container.xml
index 258f24a54e..d15a2d2ab6 100644
--- a/quickstep/res/layout/overview_actions_container.xml
+++ b/quickstep/res/layout/overview_actions_container.xml
@@ -56,7 +56,7 @@
             android:visibility="gone" />
 
         <Space
-            android:id="@+id/share_space"
+            android:id="@+id/oav_three_button_space"
             android:layout_width="0dp"
             android:layout_height="1dp"
             android:layout_weight="1"
diff --git a/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java b/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java
index e4b8ce2df5..39af0db8ff 100644
--- a/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java
+++ b/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java
@@ -58,6 +58,12 @@ public class QuickstepTestInformationHandler extends TestInformationHandler {
                         FeatureFlags.ENABLE_OVERVIEW_SHARE.get());
                 return response;
             }
+
+            case TestProtocol.REQUEST_OVERVIEW_CONTENT_PUSH_ENABLED: {
+                response.putBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD,
+                        FeatureFlags.ENABLE_OVERVIEW_CONTENT_PUSH.get());
+                return response;
+            }
         }
 
         return super.call(method);
diff --git a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
index 8f609919f5..2a6c9e92db 100644
--- a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
+++ b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
@@ -113,7 +113,7 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
         findViewById(R.id.action_screenshot).setOnClickListener(this);
         if (ENABLE_OVERVIEW_SHARE.get()) {
             share.setVisibility(VISIBLE);
-            findViewById(R.id.share_space).setVisibility(VISIBLE);
+            findViewById(R.id.oav_three_button_space).setVisibility(VISIBLE);
         }
     }
 
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index d8fca1da5e..2627149167 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -149,6 +149,9 @@ public final class FeatureFlags {
     public static final BooleanFlag ENABLE_OVERVIEW_SHARE = getDebugFlag(
             "ENABLE_OVERVIEW_SHARE", false, "Show Share button in Overview Actions");
 
+    public static final BooleanFlag ENABLE_OVERVIEW_CONTENT_PUSH = getDebugFlag(
+            "ENABLE_OVERVIEW_CONTENT_PUSH", false, "Show Content Push button in Overview Actions");
+
     public static final BooleanFlag ENABLE_DATABASE_RESTORE = getDebugFlag(
             "ENABLE_DATABASE_RESTORE", true,
             "Enable database restore when new restore session is created");
diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java
index 30f8fb02a0..b2d008119e 100644
--- a/src/com/android/launcher3/testing/TestProtocol.java
+++ b/src/com/android/launcher3/testing/TestProtocol.java
@@ -96,6 +96,8 @@ public final class TestProtocol {
     public static final String REQUEST_DISABLE_DEBUG_TRACING = "disable-debug-tracing";
 
     public static final String REQUEST_OVERVIEW_SHARE_ENABLED = "overview-share-enabled";
+    public static final String REQUEST_OVERVIEW_CONTENT_PUSH_ENABLED =
+            "overview-content-push-enabled";
 
     public static boolean sDisableSensorRotation;
     public static final String REQUEST_MOCK_SENSOR_ROTATION = "mock-sensor-rotation";
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 80adf05c2b..22833ec16d 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -1313,6 +1313,11 @@ public final class LauncherInstrumentation {
                 TestProtocol.TEST_INFO_RESPONSE_FIELD);
     }
 
+    boolean overviewContentPushEnabled() {
+        return getTestInfo(TestProtocol.REQUEST_OVERVIEW_CONTENT_PUSH_ENABLED).getBoolean(
+                TestProtocol.TEST_INFO_RESPONSE_FIELD);
+    }
+
     private void disableSensorRotation() {
         getTestInfo(TestProtocol.REQUEST_MOCK_SENSOR_ROTATION);
     }
diff --git a/tests/tapl/com/android/launcher3/tapl/OverviewActions.java b/tests/tapl/com/android/launcher3/tapl/OverviewActions.java
index a30a404764..e3e0f4209d 100644
--- a/tests/tapl/com/android/launcher3/tapl/OverviewActions.java
+++ b/tests/tapl/com/android/launcher3/tapl/OverviewActions.java
@@ -33,6 +33,27 @@ public class OverviewActions {
         this.mLauncher = launcherInstrumentation;
     }
 
+    /**
+     * Clicks content push button.
+     */
+    @NonNull
+    public Overview clickAndDismissContentPush() {
+        if (mLauncher.overviewContentPushEnabled()) {
+            try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck();
+                 LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
+                         "want to click content push button and exit screenshot ui")) {
+                UiObject2 exo = mLauncher.waitForObjectInContainer(mOverviewActions,
+                        "action_content_push");
+                mLauncher.clickLauncherObject(exo);
+                try (LauncherInstrumentation.Closable c1 = mLauncher.addContextLayer(
+                        "clicked content push button")) {
+                    return new Overview(mLauncher);
+                }
+            }
+        }
+        return new Overview(mLauncher);
+    }
+
     /**
      * Clicks screenshot button and closes screenshot ui.
      */
-- 
GitLab


From ef9596d4c19fed7d635c40d26bb0cb37e1003a46 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Mon, 3 Aug 2020 12:07:50 -0700
Subject: [PATCH 0143/1664] Only load the first page in grid preview

Bug: 160662425
Test: manual (verified correctness)
Change-Id: I9dc3b7d7b84924ffb588470d4b6b20431a62b6cd
---
 .../graphics/LauncherPreviewRenderer.java     |  5 +-
 .../android/launcher3/model/LoaderTask.java   | 59 ++++++++++---------
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index 0f1432a9b6..cd84c96171 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -599,7 +599,10 @@ public class LauncherPreviewRenderer extends ContextThemeWrapper
         @Override
         public WorkspaceResult call() {
             List<ShortcutInfo> allShortcuts = new ArrayList<>();
-            loadWorkspace(allShortcuts, LauncherSettings.Favorites.PREVIEW_CONTENT_URI);
+            loadWorkspace(allShortcuts, LauncherSettings.Favorites.PREVIEW_CONTENT_URI,
+                    LauncherSettings.Favorites.SCREEN + " = 0 or "
+                            + LauncherSettings.Favorites.CONTAINER + " = "
+                            + LauncherSettings.Favorites.CONTAINER_HOTSEAT);
             return new WorkspaceResult(mBgDataModel, null, mWidgetProvidersMap);
         }
     }
diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index a9e385fcc2..2b4520b613 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -127,6 +127,7 @@ public class LoaderTask implements Runnable {
 
     private boolean mStopped;
 
+    private final Set<PackageUserKey> mPendingPackages = new HashSet<>();
     private boolean mItemsDeleted = false;
 
     public LoaderTask(LauncherAppState app, AllAppsList bgAllAppsList, BgDataModel dataModel,
@@ -294,16 +295,17 @@ public class LoaderTask implements Runnable {
     }
 
     private void loadWorkspace(List<ShortcutInfo> allDeepShortcuts) {
-        loadWorkspace(allDeepShortcuts, LauncherSettings.Favorites.CONTENT_URI);
+        loadWorkspace(allDeepShortcuts, LauncherSettings.Favorites.CONTENT_URI,
+                null /* selection */);
     }
 
-    protected void loadWorkspace(List<ShortcutInfo> allDeepShortcuts, Uri contentUri) {
+    protected void loadWorkspace(List<ShortcutInfo> allDeepShortcuts, Uri contentUri,
+            String selection) {
         final Context context = mApp.getContext();
         final ContentResolver contentResolver = context.getContentResolver();
         final PackageManagerHelper pmHelper = new PackageManagerHelper(context);
         final boolean isSafeMode = pmHelper.isSafeMode();
         final boolean isSdCardReady = Utilities.isBootCompleted();
-        final Set<PackageUserKey> pendingPackages = new HashSet<>();
 
         boolean clearDb = false;
         try {
@@ -332,6 +334,7 @@ public class LoaderTask implements Runnable {
 
         synchronized (mBgDataModel) {
             mBgDataModel.clear();
+            mPendingPackages.clear();
 
             final HashMap<PackageUserKey, SessionInfo> installingPkgs =
                     mSessionHelper.getActiveSessions();
@@ -342,8 +345,8 @@ public class LoaderTask implements Runnable {
 
             Map<ShortcutKey, ShortcutInfo> shortcutKeyToPinnedShortcuts = new HashMap<>();
             final LoaderCursor c = new LoaderCursor(
-                    contentResolver.query(contentUri, null, null, null, null), contentUri, mApp,
-                    mUserManagerState);
+                    contentResolver.query(contentUri, null, selection, null, null), contentUri,
+                    mApp, mUserManagerState);
 
             try {
                 final int appWidgetIdIndex = c.getColumnIndexOrThrow(
@@ -484,7 +487,7 @@ public class LoaderTask implements Runnable {
                                     // SdCard is not ready yet. Package might get available,
                                     // once it is ready.
                                     Log.d(TAG, "Missing pkg, will check later: " + targetPkg);
-                                    pendingPackages.add(new PackageUserKey(targetPkg, c.user));
+                                    mPendingPackages.add(new PackageUserKey(targetPkg, c.user));
                                     // Add the icon on the workspace anyway.
                                     allowMissingTarget = true;
                                 } else {
@@ -768,20 +771,7 @@ public class LoaderTask implements Runnable {
             }
 
             // Remove dead items
-            if (c.commitDeleted()) {
-                // Remove any empty folder
-                int[] deletedFolderIds = LauncherSettings.Settings
-                        .call(contentResolver,
-                                LauncherSettings.Settings.METHOD_DELETE_EMPTY_FOLDERS)
-                        .getIntArray(LauncherSettings.Settings.EXTRA_VALUE);
-                for (int folderId : deletedFolderIds) {
-                    mBgDataModel.workspaceItems.remove(mBgDataModel.folders.get(folderId));
-                    mBgDataModel.folders.remove(folderId);
-                    mBgDataModel.itemsIdMap.remove(folderId);
-                }
-
-                mItemsDeleted = true;
-            }
+            mItemsDeleted = c.commitDeleted();
 
             // Sort the folder items, update ranks, and make sure all preview items are high res.
             FolderGridOrganizer verifier =
@@ -807,13 +797,6 @@ public class LoaderTask implements Runnable {
             }
 
             c.commitRestoredItems();
-            if (!isSdCardReady && !pendingPackages.isEmpty()) {
-                context.registerReceiver(
-                        new SdCardAvailableReceiver(mApp, pendingPackages),
-                        new IntentFilter(Intent.ACTION_BOOT_COMPLETED),
-                        null,
-                        MODEL_EXECUTOR.getHandler());
-            }
         }
     }
 
@@ -840,14 +823,34 @@ public class LoaderTask implements Runnable {
 
     private void sanitizeData() {
         Context context = mApp.getContext();
+        ContentResolver contentResolver = context.getContentResolver();
         if (mItemsDeleted) {
+            // Remove any empty folder
+            int[] deletedFolderIds = LauncherSettings.Settings
+                    .call(contentResolver,
+                            LauncherSettings.Settings.METHOD_DELETE_EMPTY_FOLDERS)
+                    .getIntArray(LauncherSettings.Settings.EXTRA_VALUE);
+            for (int folderId : deletedFolderIds) {
+                mBgDataModel.workspaceItems.remove(mBgDataModel.folders.get(folderId));
+                mBgDataModel.folders.remove(folderId);
+                mBgDataModel.itemsIdMap.remove(folderId);
+            }
+
             // Remove any ghost widgets
-            LauncherSettings.Settings.call(context.getContentResolver(),
+            LauncherSettings.Settings.call(contentResolver,
                     LauncherSettings.Settings.METHOD_REMOVE_GHOST_WIDGETS);
         }
 
         // Update pinned state of model shortcuts
         mBgDataModel.updateShortcutPinnedState(context);
+
+        if (!Utilities.isBootCompleted() && !mPendingPackages.isEmpty()) {
+            context.registerReceiver(
+                    new SdCardAvailableReceiver(mApp, mPendingPackages),
+                    new IntentFilter(Intent.ACTION_BOOT_COMPLETED),
+                    null,
+                    MODEL_EXECUTOR.getHandler());
+        }
     }
 
     private List<LauncherActivityInfo> loadAllApps() {
-- 
GitLab


From 312cf438633088c3657da6ac7e06937186dca9ea Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Mon, 3 Aug 2020 12:07:50 -0700
Subject: [PATCH 0144/1664] Only load the first page in grid preview

Bug: 160662425
Test: manual (verified correctness)
Merged-In: I9dc3b7d7b84924ffb588470d4b6b20431a62b6cd
Change-Id: I9dc3b7d7b84924ffb588470d4b6b20431a62b6cd
---
 .../graphics/LauncherPreviewRenderer.java     |  5 +-
 .../android/launcher3/model/LoaderTask.java   | 62 ++++++++++---------
 2 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index a424f8458a..7b769b8299 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -595,7 +595,10 @@ public class LauncherPreviewRenderer {
         @Override
         public WorkspaceResult call() throws Exception {
             List<ShortcutInfo> allShortcuts = new ArrayList<>();
-            loadWorkspace(allShortcuts, LauncherSettings.Favorites.PREVIEW_CONTENT_URI);
+            loadWorkspace(allShortcuts, LauncherSettings.Favorites.PREVIEW_CONTENT_URI,
+                    LauncherSettings.Favorites.SCREEN + " = 0 or "
+                    + LauncherSettings.Favorites.CONTAINER + " = "
+                    + LauncherSettings.Favorites.CONTAINER_HOTSEAT);
             return new WorkspaceResult(mBgDataModel.workspaceItems, mBgDataModel.appWidgets,
                     mBgDataModel.cachedPredictedItems, null, mWidgetProvidersMap);
         }
diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index 4a64522c65..d62f8d5dbb 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -293,10 +293,12 @@ public class LoaderTask implements Runnable {
     }
 
     private void loadWorkspace(List<ShortcutInfo> allDeepShortcuts) {
-        loadWorkspace(allDeepShortcuts, LauncherSettings.Favorites.CONTENT_URI);
+        loadWorkspace(allDeepShortcuts, LauncherSettings.Favorites.CONTENT_URI,
+                null /* selection */);
     }
 
-    protected void loadWorkspace(List<ShortcutInfo> allDeepShortcuts, Uri contentUri) {
+    protected void loadWorkspace(List<ShortcutInfo> allDeepShortcuts, Uri contentUri,
+            String selection) {
         final Context context = mApp.getContext();
         final ContentResolver contentResolver = context.getContentResolver();
         final PackageManagerHelper pmHelper = new PackageManagerHelper(context);
@@ -341,8 +343,8 @@ public class LoaderTask implements Runnable {
 
             Map<ShortcutKey, ShortcutInfo> shortcutKeyToPinnedShortcuts = new HashMap<>();
             final LoaderCursor c = new LoaderCursor(
-                    contentResolver.query(contentUri, null, null, null, null), contentUri, mApp,
-                    mUserManagerState);
+                    contentResolver.query(contentUri, null, selection, null, null), contentUri,
+                    mApp, mUserManagerState);
 
             try {
                 final int appWidgetIdIndex = c.getColumnIndexOrThrow(
@@ -776,33 +778,35 @@ public class LoaderTask implements Runnable {
                 return;
             }
 
-            // Remove dead items
-            if (c.commitDeleted()) {
-                // Remove any empty folder
-                int[] deletedFolderIds = LauncherSettings.Settings
-                        .call(contentResolver,
-                                LauncherSettings.Settings.METHOD_DELETE_EMPTY_FOLDERS)
-                        .getIntArray(LauncherSettings.Settings.EXTRA_VALUE);
-                for (int folderId : deletedFolderIds) {
-                    mBgDataModel.workspaceItems.remove(mBgDataModel.folders.get(folderId));
-                    mBgDataModel.folders.remove(folderId);
-                    mBgDataModel.itemsIdMap.remove(folderId);
-                }
+            if (contentUri == LauncherSettings.Favorites.CONTENT_URI) {
+                // Remove dead items
+                if (c.commitDeleted()) {
+                    // Remove any empty folder
+                    int[] deletedFolderIds = LauncherSettings.Settings
+                            .call(contentResolver,
+                                    LauncherSettings.Settings.METHOD_DELETE_EMPTY_FOLDERS)
+                            .getIntArray(LauncherSettings.Settings.EXTRA_VALUE);
+                    for (int folderId : deletedFolderIds) {
+                        mBgDataModel.workspaceItems.remove(mBgDataModel.folders.get(folderId));
+                        mBgDataModel.folders.remove(folderId);
+                        mBgDataModel.itemsIdMap.remove(folderId);
+                    }
 
-                // Remove any ghost widgets
-                LauncherSettings.Settings.call(contentResolver,
-                        LauncherSettings.Settings.METHOD_REMOVE_GHOST_WIDGETS);
-            }
+                    // Remove any ghost widgets
+                    LauncherSettings.Settings.call(contentResolver,
+                            LauncherSettings.Settings.METHOD_REMOVE_GHOST_WIDGETS);
+                }
 
-            // Unpin shortcuts that don't exist on the workspace.
-            HashSet<ShortcutKey> pendingShortcuts =
-                    InstallShortcutReceiver.getPendingShortcuts(context);
-            for (ShortcutKey key : shortcutKeyToPinnedShortcuts.keySet()) {
-                MutableInt numTimesPinned = mBgDataModel.pinnedShortcutCounts.get(key);
-                if ((numTimesPinned == null || numTimesPinned.value == 0)
-                        && !pendingShortcuts.contains(key)) {
-                    // Shortcut is pinned but doesn't exist on the workspace; unpin it.
-                    mBgDataModel.unpinShortcut(context, key);
+                // Unpin shortcuts that don't exist on the workspace.
+                HashSet<ShortcutKey> pendingShortcuts =
+                        InstallShortcutReceiver.getPendingShortcuts(context);
+                for (ShortcutKey key : shortcutKeyToPinnedShortcuts.keySet()) {
+                    MutableInt numTimesPinned = mBgDataModel.pinnedShortcutCounts.get(key);
+                    if ((numTimesPinned == null || numTimesPinned.value == 0)
+                            && !pendingShortcuts.contains(key)) {
+                        // Shortcut is pinned but doesn't exist on the workspace; unpin it.
+                        mBgDataModel.unpinShortcut(context, key);
+                    }
                 }
             }
 
-- 
GitLab


From 95f1cda431dce2f2db3ac7380de6340b9af8b005 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Mon, 3 Aug 2020 12:07:50 -0700
Subject: [PATCH 0145/1664] Only load the first page in grid preview

Bug: 160662425
Test: manual (verified correctness)
Change-Id: I9dc3b7d7b84924ffb588470d4b6b20431a62b6cd
(cherry picked from commit ef9596d4c19fed7d635c40d26bb0cb37e1003a46)
---
 .../graphics/LauncherPreviewRenderer.java     |  5 +-
 .../android/launcher3/model/LoaderTask.java   | 59 ++++++++++---------
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index 0f1432a9b6..cd84c96171 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -599,7 +599,10 @@ public class LauncherPreviewRenderer extends ContextThemeWrapper
         @Override
         public WorkspaceResult call() {
             List<ShortcutInfo> allShortcuts = new ArrayList<>();
-            loadWorkspace(allShortcuts, LauncherSettings.Favorites.PREVIEW_CONTENT_URI);
+            loadWorkspace(allShortcuts, LauncherSettings.Favorites.PREVIEW_CONTENT_URI,
+                    LauncherSettings.Favorites.SCREEN + " = 0 or "
+                            + LauncherSettings.Favorites.CONTAINER + " = "
+                            + LauncherSettings.Favorites.CONTAINER_HOTSEAT);
             return new WorkspaceResult(mBgDataModel, null, mWidgetProvidersMap);
         }
     }
diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index a9e385fcc2..2b4520b613 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -127,6 +127,7 @@ public class LoaderTask implements Runnable {
 
     private boolean mStopped;
 
+    private final Set<PackageUserKey> mPendingPackages = new HashSet<>();
     private boolean mItemsDeleted = false;
 
     public LoaderTask(LauncherAppState app, AllAppsList bgAllAppsList, BgDataModel dataModel,
@@ -294,16 +295,17 @@ public class LoaderTask implements Runnable {
     }
 
     private void loadWorkspace(List<ShortcutInfo> allDeepShortcuts) {
-        loadWorkspace(allDeepShortcuts, LauncherSettings.Favorites.CONTENT_URI);
+        loadWorkspace(allDeepShortcuts, LauncherSettings.Favorites.CONTENT_URI,
+                null /* selection */);
     }
 
-    protected void loadWorkspace(List<ShortcutInfo> allDeepShortcuts, Uri contentUri) {
+    protected void loadWorkspace(List<ShortcutInfo> allDeepShortcuts, Uri contentUri,
+            String selection) {
         final Context context = mApp.getContext();
         final ContentResolver contentResolver = context.getContentResolver();
         final PackageManagerHelper pmHelper = new PackageManagerHelper(context);
         final boolean isSafeMode = pmHelper.isSafeMode();
         final boolean isSdCardReady = Utilities.isBootCompleted();
-        final Set<PackageUserKey> pendingPackages = new HashSet<>();
 
         boolean clearDb = false;
         try {
@@ -332,6 +334,7 @@ public class LoaderTask implements Runnable {
 
         synchronized (mBgDataModel) {
             mBgDataModel.clear();
+            mPendingPackages.clear();
 
             final HashMap<PackageUserKey, SessionInfo> installingPkgs =
                     mSessionHelper.getActiveSessions();
@@ -342,8 +345,8 @@ public class LoaderTask implements Runnable {
 
             Map<ShortcutKey, ShortcutInfo> shortcutKeyToPinnedShortcuts = new HashMap<>();
             final LoaderCursor c = new LoaderCursor(
-                    contentResolver.query(contentUri, null, null, null, null), contentUri, mApp,
-                    mUserManagerState);
+                    contentResolver.query(contentUri, null, selection, null, null), contentUri,
+                    mApp, mUserManagerState);
 
             try {
                 final int appWidgetIdIndex = c.getColumnIndexOrThrow(
@@ -484,7 +487,7 @@ public class LoaderTask implements Runnable {
                                     // SdCard is not ready yet. Package might get available,
                                     // once it is ready.
                                     Log.d(TAG, "Missing pkg, will check later: " + targetPkg);
-                                    pendingPackages.add(new PackageUserKey(targetPkg, c.user));
+                                    mPendingPackages.add(new PackageUserKey(targetPkg, c.user));
                                     // Add the icon on the workspace anyway.
                                     allowMissingTarget = true;
                                 } else {
@@ -768,20 +771,7 @@ public class LoaderTask implements Runnable {
             }
 
             // Remove dead items
-            if (c.commitDeleted()) {
-                // Remove any empty folder
-                int[] deletedFolderIds = LauncherSettings.Settings
-                        .call(contentResolver,
-                                LauncherSettings.Settings.METHOD_DELETE_EMPTY_FOLDERS)
-                        .getIntArray(LauncherSettings.Settings.EXTRA_VALUE);
-                for (int folderId : deletedFolderIds) {
-                    mBgDataModel.workspaceItems.remove(mBgDataModel.folders.get(folderId));
-                    mBgDataModel.folders.remove(folderId);
-                    mBgDataModel.itemsIdMap.remove(folderId);
-                }
-
-                mItemsDeleted = true;
-            }
+            mItemsDeleted = c.commitDeleted();
 
             // Sort the folder items, update ranks, and make sure all preview items are high res.
             FolderGridOrganizer verifier =
@@ -807,13 +797,6 @@ public class LoaderTask implements Runnable {
             }
 
             c.commitRestoredItems();
-            if (!isSdCardReady && !pendingPackages.isEmpty()) {
-                context.registerReceiver(
-                        new SdCardAvailableReceiver(mApp, pendingPackages),
-                        new IntentFilter(Intent.ACTION_BOOT_COMPLETED),
-                        null,
-                        MODEL_EXECUTOR.getHandler());
-            }
         }
     }
 
@@ -840,14 +823,34 @@ public class LoaderTask implements Runnable {
 
     private void sanitizeData() {
         Context context = mApp.getContext();
+        ContentResolver contentResolver = context.getContentResolver();
         if (mItemsDeleted) {
+            // Remove any empty folder
+            int[] deletedFolderIds = LauncherSettings.Settings
+                    .call(contentResolver,
+                            LauncherSettings.Settings.METHOD_DELETE_EMPTY_FOLDERS)
+                    .getIntArray(LauncherSettings.Settings.EXTRA_VALUE);
+            for (int folderId : deletedFolderIds) {
+                mBgDataModel.workspaceItems.remove(mBgDataModel.folders.get(folderId));
+                mBgDataModel.folders.remove(folderId);
+                mBgDataModel.itemsIdMap.remove(folderId);
+            }
+
             // Remove any ghost widgets
-            LauncherSettings.Settings.call(context.getContentResolver(),
+            LauncherSettings.Settings.call(contentResolver,
                     LauncherSettings.Settings.METHOD_REMOVE_GHOST_WIDGETS);
         }
 
         // Update pinned state of model shortcuts
         mBgDataModel.updateShortcutPinnedState(context);
+
+        if (!Utilities.isBootCompleted() && !mPendingPackages.isEmpty()) {
+            context.registerReceiver(
+                    new SdCardAvailableReceiver(mApp, mPendingPackages),
+                    new IntentFilter(Intent.ACTION_BOOT_COMPLETED),
+                    null,
+                    MODEL_EXECUTOR.getHandler());
+        }
     }
 
     private List<LauncherActivityInfo> loadAllApps() {
-- 
GitLab


From f4eb70c96edcdb368efd05d9f6895438d742079e Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Thu, 10 Sep 2020 12:05:19 -0700
Subject: [PATCH 0146/1664] Setup logging pipeline for search results

Bug: 168121204
Test: Manual
Change-Id: I4abb6c75aa0f22416616a713733bef2802b703d1
---
 .../allapps/AllAppsContainerView.java         | 28 +++---
 .../launcher3/allapps/AllAppsGridAdapter.java | 95 ++++++++++++++++---
 .../search/AllAppsSearchBarController.java    |  5 -
 .../launcher3/views/HeroSearchResultView.java | 57 ++++++++++-
 .../views/SearchResultPeopleView.java         | 44 +++++++--
 .../launcher3/views/SearchResultPlayItem.java | 21 +++-
 .../launcher3/views/SearchResultShortcut.java | 30 ++++--
 .../views/SearchSettingsRowView.java          | 21 +++-
 .../systemui/plugins/AllAppsSearchPlugin.java |  5 +-
 .../plugins/shared/SearchTargetEvent.java     | 15 +--
 10 files changed, 262 insertions(+), 59 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 1f515669a6..5079469f4a 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -67,6 +67,9 @@ import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.RecyclerViewFastScroller;
 import com.android.launcher3.views.SpringRelativeLayout;
+import com.android.systemui.plugins.shared.SearchTargetEvent;
+
+import java.util.function.IntConsumer;
 
 /**
  * The all apps view container.
@@ -538,34 +541,35 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
      * Handles selection on focused view and returns success
      */
     public boolean selectFocusedView(View v) {
-        ItemInfo itemInfo = getHighlightedItemInfo();
-        if (itemInfo != null) {
-            return mLauncher.startActivitySafely(v, itemInfo.getIntent(), itemInfo);
+        ItemInfo headerItem = getHighlightedItemFromHeader();
+        if (headerItem != null) {
+            return mLauncher.startActivitySafely(v, headerItem.getIntent(), headerItem);
         }
         AdapterItem focusedItem = getActiveRecyclerView().getApps().getFocusedChild();
         if (focusedItem instanceof AdapterItemWithPayload) {
-            Runnable onSelection = ((AdapterItemWithPayload) focusedItem).getSelectionHandler();
+            IntConsumer onSelection =
+                    ((AdapterItemWithPayload) focusedItem).getSelectionHandler();
             if (onSelection != null) {
-                onSelection.run();
+                onSelection.accept(SearchTargetEvent.QUICK_SELECT);
                 return true;
             }
         }
+        if (focusedItem.appInfo != null) {
+            ItemInfo itemInfo = focusedItem.appInfo;
+            return mLauncher.startActivitySafely(v, itemInfo.getIntent(), itemInfo);
+        }
         return false;
     }
 
     /**
-     * Returns the ItemInfo of a view that is in focus, ready to be launched by an IME.
+     * Returns the ItemInfo of a focused view inside {@link FloatingHeaderView}
      */
-    public ItemInfo getHighlightedItemInfo() {
+    public ItemInfo getHighlightedItemFromHeader() {
         View view = getFloatingHeaderView().getFocusedChild();
         if (view != null && view.getTag() instanceof ItemInfo) {
             return ((ItemInfo) view.getTag());
         }
-        if (getActiveRecyclerView().getApps().getFocusedChild() != null) {
-            // TODO: when new pipelines are included, getSearchResults
-            // should be supported at recycler view level and not apps list level.
-            return getActiveRecyclerView().getApps().getFocusedChild().appInfo;
-        }
+
         return null;
     }
 
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index 4e801a7cc8..f077173c0a 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -21,6 +21,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.net.Uri;
+import android.os.Bundle;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -54,8 +55,13 @@ import com.android.launcher3.allapps.search.SearchSectionInfo;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.util.PackageManagerHelper;
+import com.android.launcher3.views.HeroSearchResultView;
+import com.android.systemui.plugins.AllAppsSearchPlugin;
+import com.android.systemui.plugins.shared.SearchTarget;
+import com.android.systemui.plugins.shared.SearchTargetEvent;
 
 import java.util.List;
+import java.util.function.IntConsumer;
 
 /**
  * The grid view adapter of all the apps.
@@ -196,18 +202,28 @@ public class AllAppsGridAdapter extends
      */
     public static class AdapterItemWithPayload<T> extends AdapterItem {
         private T mPayload;
-        private Runnable mSelectionHandler;
+        private AllAppsSearchPlugin mPlugin;
+        private IntConsumer mSelectionHandler;
 
-        public AdapterItemWithPayload(T payload, int type) {
+        public AllAppsSearchPlugin getPlugin() {
+            return mPlugin;
+        }
+
+        public void setPlugin(AllAppsSearchPlugin plugin) {
+            mPlugin = plugin;
+        }
+
+        public AdapterItemWithPayload(T payload, int type, AllAppsSearchPlugin plugin) {
             mPayload = payload;
             viewType = type;
+            mPlugin = plugin;
         }
 
-        public void setSelectionHandler(Runnable runnable) {
+        public void setSelectionHandler(IntConsumer runnable) {
             mSelectionHandler = runnable;
         }
 
-        public Runnable getSelectionHandler() {
+        public IntConsumer getSelectionHandler() {
             return mSelectionHandler;
         }
 
@@ -396,10 +412,12 @@ public class AllAppsGridAdapter extends
             case VIEW_TYPE_ICON:
                 BubbleTextView icon = (BubbleTextView) mLayoutInflater.inflate(
                         R.layout.all_apps_icon, parent, false);
-                icon.setOnClickListener(mOnIconClickListener);
-                icon.setOnLongClickListener(mOnIconLongClickListener);
                 icon.setLongPressTimeoutFactor(1f);
                 icon.setOnFocusChangeListener(mIconFocusListener);
+                if (!FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
+                    icon.setOnClickListener(mOnIconClickListener);
+                    icon.setOnLongClickListener(mOnIconLongClickListener);
+                }
 
                 // Ensure the all apps icon height matches the workspace icons in portrait mode.
                 icon.getLayoutParams().height = mLauncher.getDeviceProfile().allAppsCellHeightPx;
@@ -419,7 +437,6 @@ public class AllAppsGridAdapter extends
             case VIEW_TYPE_SEARCH_CORPUS_TITLE:
                 return new ViewHolder(
                         mLayoutInflater.inflate(R.layout.search_section_title, parent, false));
-
             case VIEW_TYPE_SEARCH_HERO_APP:
                 return new ViewHolder(mLayoutInflater.inflate(
                         R.layout.search_result_hero_app, parent, false));
@@ -447,10 +464,36 @@ public class AllAppsGridAdapter extends
     public void onBindViewHolder(ViewHolder holder, int position) {
         switch (holder.getItemViewType()) {
             case VIEW_TYPE_ICON:
-                AppInfo info = mApps.getAdapterItems().get(position).appInfo;
+                AdapterItem adapterItem = mApps.getAdapterItems().get(position);
+                AppInfo info = adapterItem.appInfo;
                 BubbleTextView icon = (BubbleTextView) holder.itemView;
                 icon.reset();
                 icon.applyFromApplicationInfo(info);
+                if (!FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
+                    break;
+                }
+                //TODO: replace with custom TopHitBubbleTextView with support for both shortcut
+                // and apps
+                if (adapterItem instanceof AdapterItemWithPayload) {
+                    AdapterItemWithPayload withPayload = (AdapterItemWithPayload) adapterItem;
+                    IntConsumer selectionHandler = type -> {
+                        SearchTargetEvent e = new SearchTargetEvent(SearchTarget.ItemType.APP,
+                                type);
+                        e.bundle = HeroSearchResultView.getAppBundle(info);
+                        if (withPayload.getPlugin() != null) {
+                            withPayload.getPlugin().notifySearchTargetEvent(e);
+                        }
+                    };
+                    icon.setOnClickListener(view -> {
+                        selectionHandler.accept(SearchTargetEvent.SELECT);
+                        mOnIconClickListener.onClick(view);
+                    });
+                    icon.setOnLongClickListener(view -> {
+                        selectionHandler.accept(SearchTargetEvent.LONG_PRESS);
+                        return mOnIconLongClickListener.onLongClick(view);
+                    });
+                    withPayload.setSelectionHandler(selectionHandler);
+                }
                 break;
             case VIEW_TYPE_EMPTY_SEARCH:
                 TextView emptyViewText = (TextView) holder.itemView;
@@ -468,11 +511,22 @@ public class AllAppsGridAdapter extends
                 break;
             case VIEW_TYPE_SEARCH_SLICE:
                 SliceView sliceView = (SliceView) holder.itemView;
-                Uri uri = ((AdapterItemWithPayload<Uri>) mApps.getAdapterItems().get(position))
-                        .getPayload();
+                AdapterItemWithPayload<Uri> item =
+                        (AdapterItemWithPayload<Uri>) mApps.getAdapterItems().get(position);
+                sliceView.setOnSliceActionListener((info1, s) -> {
+                    if (item.getPlugin() != null) {
+                        SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
+                                SearchTarget.ItemType.SETTINGS_SLICE,
+                                SearchTargetEvent.CHILD_SELECT);
+                        searchTargetEvent.bundle = new Bundle();
+                        searchTargetEvent.bundle.putParcelable("uri", item.getPayload());
+                        item.getPlugin().notifySearchTargetEvent(searchTargetEvent);
+                    }
+                });
                 try {
-                    LiveData<Slice> liveData = SliceLiveData.fromUri(mLauncher, uri);
+                    LiveData<Slice> liveData = SliceLiveData.fromUri(mLauncher, item.getPayload());
                     liveData.observe(this::getLifecycle, sliceView);
+                    sliceView.setTag(liveData);
                 } catch (Exception ignored) {
                 }
                 break;
@@ -492,6 +546,25 @@ public class AllAppsGridAdapter extends
         }
     }
 
+    @Override
+    public void onViewRecycled(@NonNull ViewHolder holder) {
+        super.onViewRecycled(holder);
+        if (!FeatureFlags.ENABLE_DEVICE_SEARCH.get()) return;
+        if (holder.itemView instanceof BubbleTextView) {
+            BubbleTextView icon = (BubbleTextView) holder.itemView;
+            icon.setOnClickListener(mOnIconClickListener);
+            icon.setOnLongClickListener(mOnIconLongClickListener);
+        } else if (holder.itemView instanceof SliceView) {
+            SliceView sliceView = (SliceView) holder.itemView;
+            sliceView.setOnSliceActionListener(null);
+            if (sliceView.getTag() instanceof LiveData) {
+                LiveData sliceLiveData = (LiveData) sliceView.getTag();
+                sliceLiveData.removeObservers(this::getLifecycle);
+            }
+        }
+    }
+
+
     @Override
     public boolean onFailedToRecycleView(ViewHolder holder) {
         // Always recycle and we will reset the view when it is bound
diff --git a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
index 29e340480d..3320189a1d 100644
--- a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
+++ b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
@@ -115,11 +115,6 @@ public class AllAppsSearchBarController
             if (actionId == EditorInfo.IME_ACTION_SEARCH) {
                 // selectFocusedView should return SearchTargetEvent that is passed onto onClick
                 if (Launcher.getLauncher(mLauncher).getAppsView().selectFocusedView(v)) {
-                    if (mSearchAlgorithm instanceof PluginWrapper) {
-                        ((PluginWrapper) mSearchAlgorithm).runOnPluginIfConnected(plugin -> {
-                            plugin.onClick(false, null);
-                        });
-                    }
                     return true;
                 }
             }
diff --git a/src/com/android/launcher3/views/HeroSearchResultView.java b/src/com/android/launcher3/views/HeroSearchResultView.java
index 761ef0d639..a8e1c6b30c 100644
--- a/src/com/android/launcher3/views/HeroSearchResultView.java
+++ b/src/com/android/launcher3/views/HeroSearchResultView.java
@@ -18,7 +18,9 @@ package com.android.launcher3.views;
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS;
 
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.Point;
+import android.os.Bundle;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
@@ -41,6 +43,9 @@ import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.shortcuts.ShortcutDragPreviewProvider;
 import com.android.launcher3.touch.ItemLongClickListener;
+import com.android.systemui.plugins.AllAppsSearchPlugin;
+import com.android.systemui.plugins.shared.SearchTarget;
+import com.android.systemui.plugins.shared.SearchTargetEvent;
 
 import java.util.List;
 
@@ -54,6 +59,7 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
     BubbleTextView mBubbleTextView;
     View mIconView;
     BubbleTextView[] mDeepShortcutTextViews = new BubbleTextView[2];
+    AllAppsSearchPlugin mPlugin;
 
     public HeroSearchResultView(Context context) {
         super(context);
@@ -79,7 +85,10 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
 
 
         mBubbleTextView = findViewById(R.id.bubble_text);
-        mBubbleTextView.setOnClickListener(launcher.getItemOnClickListener());
+        mBubbleTextView.setOnClickListener(view -> {
+            handleSelection(SearchTargetEvent.SELECT);
+            launcher.getItemOnClickListener().onClick(view);
+        });
         mBubbleTextView.setOnLongClickListener(new HeroItemDragHandler(getContext(), this));
         setLayoutParams(
                 new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, grid.allAppsCellHeightPx));
@@ -91,7 +100,18 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
             bubbleTextView.setLayoutParams(
                     new LinearLayout.LayoutParams(grid.allAppsIconSizePx,
                             grid.allAppsIconSizePx));
-            bubbleTextView.setOnClickListener(launcher.getItemOnClickListener());
+            bubbleTextView.setOnClickListener(view -> {
+                WorkspaceItemInfo itemInfo = (WorkspaceItemInfo) bubbleTextView.getTag();
+                SearchTargetEvent event = new SearchTargetEvent(
+                        SearchTarget.ItemType.APP_HERO,
+                        SearchTargetEvent.CHILD_SELECT);
+                event.bundle = getAppBundle(itemInfo);
+                event.bundle.putString("shortcut_id", itemInfo.getDeepShortcutId());
+                if (mPlugin != null) {
+                    mPlugin.notifySearchTargetEvent(event);
+                }
+                launcher.getItemOnClickListener().onClick(view);
+            });
         }
     }
 
@@ -110,6 +130,8 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
                 mDeepShortcutTextViews[i].applyFromItemInfoWithIcon(shorcutInfos.get(i));
             }
         }
+        mPlugin = adapterItem.getPlugin();
+        adapterItem.setSelectionHandler(this::handleSelection);
     }
 
     @Override
@@ -147,7 +169,38 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
             mLauncher.getWorkspace().beginDragShared(mContainer.mBubbleTextView,
                     draggableView, mContainer, itemInfo, previewProvider, new DragOptions());
 
+            SearchTargetEvent event = new SearchTargetEvent(
+                    SearchTarget.ItemType.APP_HERO, SearchTargetEvent.LONG_PRESS);
+            event.bundle = getAppBundle(itemInfo);
+            if (mContainer.mPlugin != null) {
+                mContainer.mPlugin.notifySearchTargetEvent(event);
+            }
+
             return false;
         }
     }
+
+    private void handleSelection(int eventType) {
+        ItemInfo itemInfo = (ItemInfo) mBubbleTextView.getTag();
+        if (itemInfo == null) return;
+        Launcher launcher = Launcher.getLauncher(getContext());
+        launcher.startActivitySafely(this, itemInfo.getIntent(), itemInfo);
+
+        SearchTargetEvent event = new SearchTargetEvent(
+                SearchTarget.ItemType.APP_HERO, eventType);
+        event.bundle = getAppBundle(itemInfo);
+        if (mPlugin != null) {
+            mPlugin.notifySearchTargetEvent(event);
+        }
+    }
+
+    /**
+     * Helper method to generate {@link SearchTargetEvent} bundle from {@link ItemInfo}
+     */
+    public static Bundle getAppBundle(ItemInfo itemInfo) {
+        Bundle b = new Bundle();
+        b.putParcelable(Intent.EXTRA_COMPONENT_NAME, itemInfo.getTargetComponent());
+        b.putParcelable(Intent.EXTRA_USER, itemInfo.user);
+        return b;
+    }
 }
diff --git a/src/com/android/launcher3/views/SearchResultPeopleView.java b/src/com/android/launcher3/views/SearchResultPeopleView.java
index d1e34fa65f..78e9841d36 100644
--- a/src/com/android/launcher3/views/SearchResultPeopleView.java
+++ b/src/com/android/launcher3/views/SearchResultPeopleView.java
@@ -45,6 +45,9 @@ import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsGridAdapter;
 import com.android.launcher3.allapps.search.AllAppsSearchBarController;
 import com.android.launcher3.util.Themes;
+import com.android.systemui.plugins.AllAppsSearchPlugin;
+import com.android.systemui.plugins.shared.SearchTarget;
+import com.android.systemui.plugins.shared.SearchTargetEvent;
 
 import java.net.URISyntaxException;
 import java.util.ArrayList;
@@ -58,9 +61,12 @@ public class SearchResultPeopleView extends LinearLayout implements
     private final int mIconSize;
     private final int mButtonSize;
     private final PackageManager mPackageManager;
-    View mIconView;
-    TextView mTitleView;
-    ImageButton[] mProviderButtons = new ImageButton[3];
+    private View mIconView;
+    private TextView mTitleView;
+    private ImageButton[] mProviderButtons = new ImageButton[3];
+    private AllAppsSearchPlugin mPlugin;
+    private Uri mContactUri;
+
 
     public SearchResultPeopleView(Context context) {
         this(context, null, 0);
@@ -93,14 +99,14 @@ public class SearchResultPeopleView extends LinearLayout implements
             button.getLayoutParams().width = mButtonSize;
             button.getLayoutParams().height = mButtonSize;
         }
-        setOnClickListener(v -> handleSelection());
+        setOnClickListener(v -> handleSelection(SearchTargetEvent.SELECT));
     }
 
     @Override
     public void applyAdapterInfo(
             AllAppsGridAdapter.AdapterItemWithPayload<Bundle> adapterItemWithPayload) {
-        Launcher launcher = Launcher.getLauncher(getContext());
         Bundle payload = adapterItemWithPayload.getPayload();
+        mPlugin = adapterItemWithPayload.getPlugin();
         mTitleView.setText(payload.getString("title"));
         mContactUri = payload.getParcelable("contact_uri");
         Bitmap icon = payload.getParcelable("icon");
@@ -122,8 +128,8 @@ public class SearchResultPeopleView extends LinearLayout implements
                     Bundle provider = providers.get(i);
                     Intent intent = Intent.parseUri(provider.getString("intent_uri_str"),
                             URI_ANDROID_APP_SCHEME | URI_ALLOW_UNSAFE);
+                    setupProviderButton(button, provider, intent);
                     String pkg = provider.getString("package_name");
-                    button.setOnClickListener(b -> launcher.startActivitySafely(b, intent, null));
                     UI_HELPER_EXECUTOR.post(() -> {
                         try {
                             ApplicationInfo applicationInfo = mPackageManager.getApplicationInfo(
@@ -144,13 +150,35 @@ public class SearchResultPeopleView extends LinearLayout implements
         adapterItemWithPayload.setSelectionHandler(this::handleSelection);
     }
 
-    Uri mContactUri;
+    private void setupProviderButton(ImageButton button, Bundle provider, Intent intent) {
+        Launcher launcher = Launcher.getLauncher(getContext());
+        button.setOnClickListener(b -> {
+            launcher.startActivitySafely(b, intent, null);
+            SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
+                    SearchTarget.ItemType.PEOPLE,
+                    SearchTargetEvent.CHILD_SELECT);
+            searchTargetEvent.bundle = new Bundle();
+            searchTargetEvent.bundle.putParcelable("contact_uri", mContactUri);
+            searchTargetEvent.bundle.putBundle("provider", provider);
+            if (mPlugin != null) {
+                mPlugin.notifySearchTargetEvent(searchTargetEvent);
+            }
+        });
+    }
+
 
-    private void handleSelection() {
+    private void handleSelection(int eventType) {
         if (mContactUri != null) {
             Launcher launcher = Launcher.getLauncher(getContext());
             launcher.startActivitySafely(this, new Intent(Intent.ACTION_VIEW, mContactUri).setFlags(
                     Intent.FLAG_ACTIVITY_NEW_TASK), null);
+            SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
+                    SearchTarget.ItemType.PEOPLE, eventType);
+            searchTargetEvent.bundle = new Bundle();
+            searchTargetEvent.bundle.putParcelable("contact_uri", mContactUri);
+            if (mPlugin != null) {
+                mPlugin.notifySearchTargetEvent(searchTargetEvent);
+            }
         }
     }
 }
diff --git a/src/com/android/launcher3/views/SearchResultPlayItem.java b/src/com/android/launcher3/views/SearchResultPlayItem.java
index 19a4c5d84c..8624609f80 100644
--- a/src/com/android/launcher3/views/SearchResultPlayItem.java
+++ b/src/com/android/launcher3/views/SearchResultPlayItem.java
@@ -38,6 +38,9 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
 import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+import com.android.systemui.plugins.AllAppsSearchPlugin;
+import com.android.systemui.plugins.shared.SearchTarget;
+import com.android.systemui.plugins.shared.SearchTargetEvent;
 
 import java.io.IOException;
 import java.net.URL;
@@ -54,6 +57,7 @@ public class SearchResultPlayItem extends LinearLayout implements
     private Button mPreviewButton;
     private String mPackageName;
     private boolean mIsInstantGame;
+    private AllAppsSearchPlugin mPlugin;
 
     public SearchResultPlayItem(Context context) {
         this(context, null, 0);
@@ -84,13 +88,14 @@ public class SearchResultPlayItem extends LinearLayout implements
         ViewGroup.LayoutParams iconParams = mIconView.getLayoutParams();
         iconParams.height = mDeviceProfile.allAppsIconSizePx;
         iconParams.width = mDeviceProfile.allAppsIconSizePx;
-        setOnClickListener(view -> handleSelection());
+        setOnClickListener(view -> handleSelection(SearchTargetEvent.SELECT));
 
     }
 
     @Override
     public void applyAdapterInfo(AdapterItemWithPayload<Bundle> adapterItemWithPayload) {
         Bundle bundle = adapterItemWithPayload.getPayload();
+        mPlugin = adapterItemWithPayload.getPlugin();
         adapterItemWithPayload.setSelectionHandler(this::handleSelection);
         if (bundle.getString("package", "").equals(mPackageName)) {
             return;
@@ -129,13 +134,14 @@ public class SearchResultPlayItem extends LinearLayout implements
         }
     }
 
-    private void handleSelection() {
+    private void handleSelection(int eventType) {
         if (mPackageName == null) return;
         Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(
                 "https://play.google.com/store/apps/details?id="
                         + mPackageName));
         i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         getContext().startActivity(i);
+        logSearchEvent(eventType);
     }
 
     private void launchInstantGame() {
@@ -150,5 +156,16 @@ public class SearchResultPlayItem extends LinearLayout implements
         intent.putExtra("callerId", getContext().getPackageName());
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         getContext().startActivity(intent);
+        logSearchEvent(SearchTargetEvent.CHILD_SELECT);
+    }
+
+    private void logSearchEvent(int eventType) {
+        SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
+                SearchTarget.ItemType.PLAY_RESULTS, eventType);
+        searchTargetEvent.bundle = new Bundle();
+        searchTargetEvent.bundle.putString("package_name", mPackageName);
+        if (mPlugin != null) {
+            mPlugin.notifySearchTargetEvent(searchTargetEvent);
+        }
     }
 }
diff --git a/src/com/android/launcher3/views/SearchResultShortcut.java b/src/com/android/launcher3/views/SearchResultShortcut.java
index a402719e76..307cf34c7d 100644
--- a/src/com/android/launcher3/views/SearchResultShortcut.java
+++ b/src/com/android/launcher3/views/SearchResultShortcut.java
@@ -36,7 +36,9 @@ import com.android.launcher3.allapps.AllAppsGridAdapter;
 import com.android.launcher3.allapps.search.AllAppsSearchBarController;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.touch.ItemClickHandler;
+import com.android.systemui.plugins.AllAppsSearchPlugin;
 import com.android.systemui.plugins.shared.SearchTarget;
+import com.android.systemui.plugins.shared.SearchTargetEvent;
 
 /**
  * A view representing a stand alone shortcut search result
@@ -44,8 +46,10 @@ import com.android.systemui.plugins.shared.SearchTarget;
 public class SearchResultShortcut extends FrameLayout implements
         AllAppsSearchBarController.PayloadResultHandler<SearchTarget> {
 
-    BubbleTextView mBubbleTextView;
-    View mIconView;
+    private BubbleTextView mBubbleTextView;
+    private View mIconView;
+    private ShortcutInfo mShortcutInfo;
+    private AllAppsSearchPlugin mPlugin;
 
     public SearchResultShortcut(@NonNull Context context) {
         super(context);
@@ -71,28 +75,36 @@ public class SearchResultShortcut extends FrameLayout implements
         iconParams.height = grid.allAppsIconSizePx;
         iconParams.width = grid.allAppsIconSizePx;
         mBubbleTextView = findViewById(R.id.bubble_text);
-        setOnClickListener(v -> handleSelection());
+        setOnClickListener(v -> handleSelection(SearchTargetEvent.SELECT));
     }
 
     @Override
     public void applyAdapterInfo(
             AllAppsGridAdapter.AdapterItemWithPayload<SearchTarget> adapterItemWithPayload) {
         SearchTarget payload = adapterItemWithPayload.getPayload();
-        ShortcutInfo si = payload.shortcuts.get(0);
-        WorkspaceItemInfo workspaceItemInfo = new WorkspaceItemInfo(si, getContext());
+        mPlugin = adapterItemWithPayload.getPlugin();
+        mShortcutInfo = payload.shortcuts.get(0);
+        WorkspaceItemInfo workspaceItemInfo = new WorkspaceItemInfo(mShortcutInfo, getContext());
         mBubbleTextView.applyFromWorkspaceItem(workspaceItemInfo);
         mIconView.setBackground(mBubbleTextView.getIcon());
         LauncherAppState launcherAppState = LauncherAppState.getInstance(getContext());
         MODEL_EXECUTOR.execute(() -> {
-            launcherAppState.getIconCache().getShortcutIcon(workspaceItemInfo, si);
+            launcherAppState.getIconCache().getShortcutIcon(workspaceItemInfo, mShortcutInfo);
             mBubbleTextView.applyFromWorkspaceItem(workspaceItemInfo);
             mIconView.setBackground(mBubbleTextView.getIcon());
         });
         adapterItemWithPayload.setSelectionHandler(this::handleSelection);
     }
 
-    private void handleSelection() {
-        ItemClickHandler.onClickAppShortcut(this, (WorkspaceItemInfo) mBubbleTextView.getTag(),
-                Launcher.getLauncher(getContext()));
+    private void handleSelection(int eventType) {
+        WorkspaceItemInfo itemInfo = (WorkspaceItemInfo) mBubbleTextView.getTag();
+        ItemClickHandler.onClickAppShortcut(this, itemInfo, Launcher.getLauncher(getContext()));
+
+        SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
+                SearchTarget.ItemType.SHORTCUT, eventType);
+        searchTargetEvent.shortcut = mShortcutInfo;
+        if (mPlugin != null) {
+            mPlugin.notifySearchTargetEvent(searchTargetEvent);
+        }
     }
 }
diff --git a/src/com/android/launcher3/views/SearchSettingsRowView.java b/src/com/android/launcher3/views/SearchSettingsRowView.java
index 08c78ffc3a..93bcee2585 100644
--- a/src/com/android/launcher3/views/SearchSettingsRowView.java
+++ b/src/com/android/launcher3/views/SearchSettingsRowView.java
@@ -31,6 +31,9 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsGridAdapter;
 import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+import com.android.systemui.plugins.AllAppsSearchPlugin;
+import com.android.systemui.plugins.shared.SearchTarget;
+import com.android.systemui.plugins.shared.SearchTargetEvent;
 
 import java.util.ArrayList;
 
@@ -44,6 +47,7 @@ public class SearchSettingsRowView extends LinearLayout implements
     private TextView mDescriptionView;
     private TextView mBreadcrumbsView;
     private Intent mIntent;
+    private AllAppsSearchPlugin mPlugin;
 
     public SearchSettingsRowView(@NonNull Context context) {
         super(context);
@@ -72,6 +76,7 @@ public class SearchSettingsRowView extends LinearLayout implements
     public void applyAdapterInfo(
             AllAppsGridAdapter.AdapterItemWithPayload<Bundle> adapterItemWithPayload) {
         Bundle bundle = adapterItemWithPayload.getPayload();
+        mPlugin = adapterItemWithPayload.getPlugin();
         mIntent = bundle.getParcelable("intent");
         showIfAvailable(mTitleView, bundle.getString("title"));
         showIfAvailable(mDescriptionView, bundle.getString("description"));
@@ -79,7 +84,7 @@ public class SearchSettingsRowView extends LinearLayout implements
         //TODO: implement RTL friendly breadcrumbs view
         showIfAvailable(mBreadcrumbsView, breadcrumbs != null
                 ? String.join(" > ", breadcrumbs) : null);
-        adapterItemWithPayload.setSelectionHandler(() -> onClick(this));
+        adapterItemWithPayload.setSelectionHandler(this::handleSelection);
     }
 
     private void showIfAvailable(TextView view, @Nullable String string) {
@@ -93,10 +98,22 @@ public class SearchSettingsRowView extends LinearLayout implements
 
     @Override
     public void onClick(View view) {
+        handleSelection(SearchTargetEvent.SELECT);
+    }
+
+    private void handleSelection(int eventType) {
         if (mIntent == null) return;
         // TODO: create ItemInfo object and then use it to call startActivityForResult for proper
         //  WW logging
-        Launcher launcher = Launcher.getLauncher(view.getContext());
+        Launcher launcher = Launcher.getLauncher(getContext());
         launcher.startActivityForResult(mIntent, 0);
+
+        SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
+                SearchTarget.ItemType.SETTINGS_ROW, eventType);
+        searchTargetEvent.bundle = new Bundle();
+        searchTargetEvent.bundle.putParcelable("intent", mIntent);
+        if (mPlugin != null) {
+            mPlugin.notifySearchTargetEvent(searchTargetEvent);
+        }
     }
 }
diff --git a/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java b/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
index 9949678458..437cf3cfe5 100644
--- a/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
+++ b/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
@@ -47,7 +47,10 @@ public interface AllAppsSearchPlugin extends Plugin {
      */
     void performSearch(String query, Consumer<List<SearchTarget>> results);
 
-    void onClick(boolean isTouch, SearchTargetEvent event);
+    /**
+     * Send over search target interaction events to Plugin
+     */
+    void notifySearchTargetEvent(SearchTargetEvent event);
 
     /**
      * Send signal when user exits all apps.
diff --git a/src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java b/src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java
index 00aacd0543..ac4bc333c6 100644
--- a/src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java
+++ b/src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java
@@ -22,18 +22,19 @@ import android.os.Bundle;
  * Event used for the feedback loop to the plugin. (and future aiai)
  */
 public class SearchTargetEvent {
+    public static final int SELECT = 0;
+    public static final int QUICK_SELECT = 1;
+    public static final int LONG_PRESS = 2;
+    public static final int CHILD_SELECT = 3;
+
     public SearchTarget.ItemType type;
     public ShortcutInfo shortcut;
+    public int eventType;
     public Bundle bundle;
     public float score;
 
-    public SearchTargetEvent(SearchTarget.ItemType itemType,
-            ShortcutInfo shortcut,
-            Bundle bundle,
-            float score) {
+    public SearchTargetEvent(SearchTarget.ItemType itemType, int eventType) {
         this.type = itemType;
-        this.shortcut = shortcut;
-        this.bundle = bundle;
-        this.score = score;
+        this.eventType = eventType;
     }
 }
-- 
GitLab


From 1c3150fa1fb1482606bf0957b67d1cab91906a15 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 9 Sep 2020 17:35:47 -0700
Subject: [PATCH 0147/1664] Inline INDEX_PAUSE_TO_OVERVIEW_ANIM

It is only used by NoButtonQuickSwitchTouchController. Also removed
the interpolator overrides that are no longer needed since we don't
animate the shelf into overview mode.

Change-Id: I358a6020caaee859c6b22179591ab1d11a432f1d
---
 .../QuickstepAtomicAnimationFactory.java      | 25 +------------------
 .../NoButtonQuickSwitchTouchController.java   |  8 +++---
 2 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
index 94af134de5..77fd103a6c 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
@@ -36,13 +36,10 @@ import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_7;
 import static com.android.launcher3.anim.Interpolators.clampToProgress;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_DEPTH;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_SCALE;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_TRANSLATE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_VERTICAL_PROGRESS;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_TRANSLATE;
@@ -64,7 +61,6 @@ import com.android.launcher3.LauncherState.ScaleAndTranslation;
 import com.android.launcher3.Workspace;
 import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.allapps.AllAppsTransitionController;
-import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.uioverrides.QuickstepLauncher;
 import com.android.quickstep.SysUINavigationMode;
@@ -81,10 +77,8 @@ public class QuickstepAtomicAnimationFactory extends
     private static final float RECENTS_PREPARE_SCALE = 1.33f;
 
     public static final int INDEX_SHELF_ANIM = RecentsAtomicAnimationFactory.NEXT_INDEX + 0;
-    public static final int INDEX_PAUSE_TO_OVERVIEW_ANIM =
-            RecentsAtomicAnimationFactory.NEXT_INDEX + 1;
 
-    private static final int MY_ANIM_COUNT = 2;
+    private static final int MY_ANIM_COUNT = 1;
     protected static final int NEXT_INDEX = RecentsAtomicAnimationFactory.NEXT_INDEX
             + MY_ANIM_COUNT;
 
@@ -92,8 +86,6 @@ public class QuickstepAtomicAnimationFactory extends
     // cache the value.
     private int mHintToNormalDuration = -1;
 
-    public static final long ATOMIC_DURATION_FROM_PAUSED_TO_OVERVIEW = 300;
-
     public QuickstepAtomicAnimationFactory(QuickstepLauncher activity) {
         super(activity, MY_ANIM_COUNT);
     }
@@ -132,21 +124,6 @@ public class QuickstepAtomicAnimationFactory extends
 
                 return springAnim;
             }
-            case INDEX_PAUSE_TO_OVERVIEW_ANIM: {
-                StateAnimationConfig config = new StateAnimationConfig();
-                config.duration = ATOMIC_DURATION_FROM_PAUSED_TO_OVERVIEW;
-
-                config.setInterpolator(ANIM_VERTICAL_PROGRESS, OVERSHOOT_1_2);
-                config.setInterpolator(ANIM_ALL_APPS_FADE, DEACCEL_3);
-                if ((OVERVIEW.getVisibleElements(mActivity) & HOTSEAT_ICONS) != 0) {
-                    config.setInterpolator(ANIM_HOTSEAT_SCALE, OVERSHOOT_1_2);
-                    config.setInterpolator(ANIM_HOTSEAT_TRANSLATE, OVERSHOOT_1_2);
-                }
-
-                StateManager<LauncherState> stateManager = mActivity.getStateManager();
-                return stateManager.createAtomicAnimation(
-                        stateManager.getCurrentStableState(), OVERVIEW, config);
-            }
             default:
                 return super.createStateElementAnimation(index, values);
         }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
index 8285850c7e..34d5f7313a 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
@@ -35,7 +35,6 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_T
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
 import static com.android.launcher3.touch.BothAxesSwipeDetector.DIRECTION_RIGHT;
 import static com.android.launcher3.touch.BothAxesSwipeDetector.DIRECTION_UP;
-import static com.android.launcher3.uioverrides.states.QuickstepAtomicAnimationFactory.INDEX_PAUSE_TO_OVERVIEW_ANIM;
 import static com.android.launcher3.util.DisplayController.getSingleFrameMs;
 import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;
 import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET;
@@ -87,6 +86,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
     private static final Interpolator FADE_OUT_INTERPOLATOR = DEACCEL_5;
     private static final Interpolator TRANSLATE_OUT_INTERPOLATOR = ACCEL_0_75;
     private static final Interpolator SCALE_DOWN_INTERPOLATOR = LINEAR;
+    private static final long ATOMIC_DURATION_FROM_PAUSED_TO_OVERVIEW = 300;
 
     private final BaseQuickstepLauncher mLauncher;
     private final BothAxesSwipeDetector mSwipeDetector;
@@ -292,8 +292,10 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
         if (mMotionPauseDetector.isPaused() && noFling) {
             cancelAnimations();
 
-            Animator overviewAnim = mLauncher.createAtomicAnimationFactory()
-                    .createStateElementAnimation(INDEX_PAUSE_TO_OVERVIEW_ANIM);
+            StateAnimationConfig config = new StateAnimationConfig();
+            config.duration = ATOMIC_DURATION_FROM_PAUSED_TO_OVERVIEW;
+            Animator overviewAnim = mLauncher.getStateManager().createAtomicAnimation(
+                    mStartState, OVERVIEW, config);
             overviewAnim.addListener(new AnimatorListenerAdapter() {
                 @Override
                 public void onAnimationEnd(Animator animation) {
-- 
GitLab


From 5f1de1ad29db20b5cab3e500e40aa2d3c26f621f Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Fri, 11 Sep 2020 11:33:14 -0700
Subject: [PATCH 0148/1664] set people icon on main thread

Change-Id: I23435e41677efc6f262b464bfb5d9db6c057abb8
---
 src/com/android/launcher3/views/SearchResultPeopleView.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/views/SearchResultPeopleView.java b/src/com/android/launcher3/views/SearchResultPeopleView.java
index d1e34fa65f..2dd1c5c278 100644
--- a/src/com/android/launcher3/views/SearchResultPeopleView.java
+++ b/src/com/android/launcher3/views/SearchResultPeopleView.java
@@ -18,6 +18,7 @@ package com.android.launcher3.views;
 import static android.content.Intent.URI_ALLOW_UNSAFE;
 import static android.content.Intent.URI_ANDROID_APP_SCHEME;
 
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
 import android.content.Context;
@@ -129,7 +130,7 @@ public class SearchResultPeopleView extends LinearLayout implements
                             ApplicationInfo applicationInfo = mPackageManager.getApplicationInfo(
                                     pkg, 0);
                             Drawable appIcon = applicationInfo.loadIcon(mPackageManager);
-                            button.setImageDrawable(appIcon);
+                            MAIN_EXECUTOR.post(()-> button.setImageDrawable(appIcon));
                         } catch (PackageManager.NameNotFoundException ignored) {
                         }
 
-- 
GitLab


From ef4b506c349f6e30a90eb41c03c2b6167becd417 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 11 Sep 2020 13:00:06 -0700
Subject: [PATCH 0149/1664] Dismiss task menu when swiping to home

Change-Id: Ie23e12cefeed2835aa0e5902337856505a5815bc
---
 .../touchcontrollers/NavBarToHomeTouchController.java           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
index d57429478c..76168440a8 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
@@ -170,6 +170,8 @@ public class NavBarToHomeTouchController implements TouchController,
             if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
                 builder.addOnFrameCallback(recentsView::redrawLiveTile);
             }
+
+            AbstractFloatingView.closeOpenContainer(mLauncher, AbstractFloatingView.TYPE_TASK_MENU);
         } else if (mStartState == ALL_APPS) {
             AllAppsTransitionController allAppsController = mLauncher.getAllAppsController();
             builder.setFloat(allAppsController, ALL_APPS_PROGRESS,
-- 
GitLab


From d099d24807bd1a416c464d8a22f87dcbfa81b1f0 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Mon, 14 Sep 2020 09:23:12 -0700
Subject: [PATCH 0150/1664] resolve invalid size variable issue for people view

Change-Id: I176a4de9536a7724a07c4e953f124b0c1691fe1b
---
 res/layout/search_result_people_item.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/res/layout/search_result_people_item.xml b/res/layout/search_result_people_item.xml
index a505e4a968..a603941dfa 100644
--- a/res/layout/search_result_people_item.xml
+++ b/res/layout/search_result_people_item.xml
@@ -22,8 +22,8 @@
     <View
         android:id="@+id/icon"
         android:layout_marginRight="8dp"
-        android:layout_width="@dimen/default_icon_bitmap_size"
-        android:layout_height="@dimen/default_icon_bitmap_size" />
+        android:layout_width="@dimen/deep_shortcut_icon_size"
+        android:layout_height="@dimen/deep_shortcut_icon_size" />
 
     <TextView
         android:layout_width="0dp"
@@ -38,8 +38,8 @@
         android:adjustViewBounds="true"
         android:layout_margin="5dp"
         android:background="?android:attr/selectableItemBackground"
-        android:layout_width="@dimen/default_icon_bitmap_size"
-        android:layout_height="@dimen/default_icon_bitmap_size" />
+        android:layout_width="@dimen/deep_shortcut_icon_size"
+        android:layout_height="@dimen/deep_shortcut_icon_size" />
 
     <ImageButton
         android:id="@+id/provider_1"
@@ -47,8 +47,8 @@
         android:scaleType="fitCenter"
         android:adjustViewBounds="true"
         android:background="?android:attr/selectableItemBackground"
-        android:layout_width="@dimen/default_icon_bitmap_size"
-        android:layout_height="@dimen/default_icon_bitmap_size" />
+        android:layout_width="@dimen/deep_shortcut_icon_size"
+        android:layout_height="@dimen/deep_shortcut_icon_size" />
 
     <ImageButton
         android:id="@+id/provider_2"
@@ -56,7 +56,7 @@
         android:scaleType="fitCenter"
         android:adjustViewBounds="true"
         android:background="?android:attr/selectableItemBackground"
-        android:layout_width="@dimen/default_icon_bitmap_size"
-        android:layout_height="@dimen/default_icon_bitmap_size" />
+        android:layout_width="@dimen/deep_shortcut_icon_size"
+        android:layout_height="@dimen/deep_shortcut_icon_size" />
 
 </com.android.launcher3.views.SearchResultPeopleView>
\ No newline at end of file
-- 
GitLab


From 2fa2e0ae230cb960bc4f16aa69e5847080949a5a Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Fri, 11 Sep 2020 13:34:25 -0700
Subject: [PATCH 0151/1664] Fix launcher leaks

Follow up of: ag/12558751
Bug: 168121204

Change-Id: I381284a5e1cd9568ed14ec7a357ff150e35c18c6
---
 src/com/android/launcher3/Launcher.java       | 23 ++++++++++++++++-
 .../launcher3/allapps/AllAppsGridAdapter.java | 25 +++----------------
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 2e36bc01dd..90566f3ce8 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -94,9 +94,13 @@ import android.view.animation.OvershootInterpolator;
 import android.widget.Toast;
 
 import androidx.annotation.CallSuper;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LifecycleRegistry;
 
 import com.android.launcher3.DropTarget.DragObject;
 import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
@@ -206,7 +210,8 @@ import java.util.stream.Stream;
  * Default launcher application.
  */
 public class Launcher extends StatefulActivity<LauncherState> implements LauncherExterns,
-        Callbacks, InvariantDeviceProfile.OnIDPChangeListener, PluginListener<OverlayPlugin> {
+        Callbacks, InvariantDeviceProfile.OnIDPChangeListener, PluginListener<OverlayPlugin>,
+        LifecycleOwner {
     public static final String TAG = "Launcher";
 
     public static final ActivityTracker<Launcher> ACTIVITY_TRACKER = new ActivityTracker<>();
@@ -267,6 +272,8 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     private LauncherAppTransitionManager mAppTransitionManager;
     private Configuration mOldConfig;
 
+    private LifecycleRegistry mLifecycleRegistry;
+
     @Thunk
     Workspace mWorkspace;
     @Thunk
@@ -471,6 +478,15 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         if (Utilities.ATLEAST_R) {
             getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING);
         }
+
+        mLifecycleRegistry = new LifecycleRegistry(this);
+        mLifecycleRegistry.setCurrentState(Lifecycle.State.CREATED);
+    }
+
+    @NonNull
+    @Override
+    public Lifecycle getLifecycle() {
+        return mLifecycleRegistry;
     }
 
     protected LauncherOverlayManager getDefaultOverlay() {
@@ -886,6 +902,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
     @Override
     protected void onStop() {
+        mLifecycleRegistry.setCurrentState(Lifecycle.State.CREATED);
         super.onStop();
         if (mDeferOverlayCallbacks) {
             checkIfOverlayStillDeferred();
@@ -909,6 +926,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
         mAppWidgetHost.setListenIfResumed(true);
         TraceHelper.INSTANCE.endSection(traceToken);
+        mLifecycleRegistry.setCurrentState(Lifecycle.State.STARTED);
     }
 
     @Override
@@ -1068,6 +1086,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         }
 
         TraceHelper.INSTANCE.endSection(traceToken);
+        mLifecycleRegistry.setCurrentState(Lifecycle.State.RESUMED);
     }
 
     @Override
@@ -1075,6 +1094,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         // Ensure that items added to Launcher are queued until Launcher returns
         ItemInstallQueue.INSTANCE.get(this).pauseModelPush(FLAG_ACTIVITY_PAUSED);
 
+        mLifecycleRegistry.setCurrentState(Lifecycle.State.STARTED);
         super.onPause();
         mDragController.cancelDrag();
         mLastTouchUpTime = -1;
@@ -1557,6 +1577,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         mOverlayManager.onActivityDestroyed(this);
         mAppTransitionManager.unregisterRemoteAnimations();
         mUserChangedCallbackCloseable.close();
+        mLifecycleRegistry.setCurrentState(Lifecycle.State.DESTROYED);
     }
 
     public LauncherAccessibilityDelegate getAccessibilityDelegate() {
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index f077173c0a..d1340faf23 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -37,9 +37,6 @@ import androidx.annotation.Nullable;
 import androidx.core.view.accessibility.AccessibilityEventCompat;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
 import androidx.core.view.accessibility.AccessibilityRecordCompat;
-import androidx.lifecycle.Lifecycle;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.lifecycle.LifecycleRegistry;
 import androidx.lifecycle.LiveData;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -49,6 +46,7 @@ import androidx.slice.widget.SliceView;
 
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.BubbleTextView;
+import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.search.AllAppsSearchBarController.PayloadResultHandler;
 import com.android.launcher3.allapps.search.SearchSectionInfo;
@@ -67,8 +65,7 @@ import java.util.function.IntConsumer;
  * The grid view adapter of all the apps.
  */
 public class AllAppsGridAdapter extends
-        RecyclerView.Adapter<AllAppsGridAdapter.ViewHolder> implements
-        LifecycleOwner {
+        RecyclerView.Adapter<AllAppsGridAdapter.ViewHolder> {
 
     public static final String TAG = "AppsGridAdapter";
 
@@ -103,8 +100,6 @@ public class AllAppsGridAdapter extends
     public static final int VIEW_TYPE_MASK_DIVIDER = VIEW_TYPE_ALL_APPS_DIVIDER;
     public static final int VIEW_TYPE_MASK_ICON = VIEW_TYPE_ICON;
 
-    private final LifecycleRegistry mLifecycleRegistry;
-
     /**
      * ViewHolder for each icon.
      */
@@ -353,12 +348,6 @@ public class AllAppsGridAdapter extends
         mOnIconClickListener = launcher.getItemOnClickListener();
 
         setAppsPerRow(mLauncher.getDeviceProfile().inv.numAllAppsColumns);
-        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
-            mLifecycleRegistry = new LifecycleRegistry(this);
-            mLifecycleRegistry.setCurrentState(Lifecycle.State.STARTED);
-        } else {
-            mLifecycleRegistry = null;
-        }
     }
 
     public void setAppsPerRow(int appsPerRow) {
@@ -525,7 +514,7 @@ public class AllAppsGridAdapter extends
                 });
                 try {
                     LiveData<Slice> liveData = SliceLiveData.fromUri(mLauncher, item.getPayload());
-                    liveData.observe(this::getLifecycle, sliceView);
+                    liveData.observe((Launcher) mLauncher, sliceView);
                     sliceView.setTag(liveData);
                 } catch (Exception ignored) {
                 }
@@ -559,7 +548,7 @@ public class AllAppsGridAdapter extends
             sliceView.setOnSliceActionListener(null);
             if (sliceView.getTag() instanceof LiveData) {
                 LiveData sliceLiveData = (LiveData) sliceView.getTag();
-                sliceLiveData.removeObservers(this::getLifecycle);
+                sliceLiveData.removeObservers((Launcher) mLauncher);
             }
         }
     }
@@ -581,10 +570,4 @@ public class AllAppsGridAdapter extends
         AdapterItem item = mApps.getAdapterItems().get(position);
         return item.viewType;
     }
-
-    @NonNull
-    @Override
-    public Lifecycle getLifecycle() {
-        return mLifecycleRegistry;
-    }
 }
-- 
GitLab


From c238e1d71a154c8268c3a717e3f1af5257d5bdf4 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Wed, 9 Sep 2020 11:23:31 -0700
Subject: [PATCH 0152/1664] Fix folder close animation.

Closing a folder at the same time as the keyboard closes causes the
folder close animation to jump. Fixed the animation.

Test: manual
Change-Id: I0785260f280ffc2932cd92d40073009a8c032b1d
---
 src/com/android/launcher3/folder/Folder.java | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index c841b7b0f3..281598a48b 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -58,6 +58,7 @@ import android.view.inputmethod.EditorInfo;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 
 import com.android.launcher3.AbstractFloatingView;
@@ -216,6 +217,8 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
 
     private StatsLogManager mStatsLogManager;
 
+    @Nullable private FolderWindowInsetsAnimationCallback mFolderWindowInsetsAnimationCallback;
+
     /**
      * Used to inflate the Workspace from XML.
      *
@@ -262,10 +265,10 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         mFooterHeight = mFooter.getMeasuredHeight();
 
         if (Utilities.ATLEAST_R) {
-            WindowInsetsAnimation.Callback cb = new FolderWindowInsetsAnimationCallback(
-                    DISPATCH_MODE_STOP, this);
+            mFolderWindowInsetsAnimationCallback =
+                    new FolderWindowInsetsAnimationCallback(DISPATCH_MODE_STOP, this);
 
-            setWindowInsetsAnimationCallback(cb);
+            setWindowInsetsAnimationCallback(mFolderWindowInsetsAnimationCallback);
         }
     }
 
@@ -755,11 +758,17 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         a.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationStart(Animator animation) {
+                if (Utilities.ATLEAST_R) {
+                    setWindowInsetsAnimationCallback(null);
+                }
                 mIsAnimatingClosed = true;
             }
 
             @Override
             public void onAnimationEnd(Animator animation) {
+                if (Utilities.ATLEAST_R && mFolderWindowInsetsAnimationCallback != null) {
+                    setWindowInsetsAnimationCallback(mFolderWindowInsetsAnimationCallback);
+                }
                 closeComplete(true);
                 announceAccessibilityChanges();
                 mIsAnimatingClosed = false;
-- 
GitLab


From 9e754b008d33c60727dcc9e0dd4173dc7f4f7a07 Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Sun, 9 Aug 2020 21:49:18 -0700
Subject: [PATCH 0153/1664] Adds ability to use LauncherPreviewRenderer in
 Sandbox.

This is mostly a proof-of-concept for future use and
tweaks as desired by UX.

The idea is to better replicate the actual UI.

Screenshot: https://drive.google.com/file/d/1EGDgcrSH2QZuSh6P3zWLBl6L8Xd-gtFY/view?usp=sharing

Bug: 148542211
Change-Id: Ibed4b8118346ef72599463c9fd6a2f71166993fd
---
 .../res/layout/gesture_tutorial_fragment.xml  |  9 ++--
 .../interaction/EdgeBackGestureHandler.java   |  4 ++
 .../interaction/NavBarGestureHandler.java     |  6 +++
 .../interaction/RootSandboxLayout.java        | 44 +++++++++++++++++++
 .../interaction/SandboxLauncherRenderer.java  | 44 +++++++++++++++++++
 .../interaction/TutorialController.java       |  4 ++
 .../interaction/TutorialFragment.java         | 21 +++++++--
 src/com/android/launcher3/CellLayout.java     |  7 +--
 .../launcher3/WorkspaceLayoutManager.java     |  6 ++-
 .../graphics/LauncherPreviewRenderer.java     |  3 +-
 10 files changed, 133 insertions(+), 15 deletions(-)
 create mode 100644 quickstep/src/com/android/quickstep/interaction/RootSandboxLayout.java
 create mode 100644 quickstep/src/com/android/quickstep/interaction/SandboxLauncherRenderer.java

diff --git a/quickstep/res/layout/gesture_tutorial_fragment.xml b/quickstep/res/layout/gesture_tutorial_fragment.xml
index 43bf0ea966..52475dfc8a 100644
--- a/quickstep/res/layout/gesture_tutorial_fragment.xml
+++ b/quickstep/res/layout/gesture_tutorial_fragment.xml
@@ -13,7 +13,8 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.quickstep.interaction.RootSandboxLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?android:attr/colorBackground">
@@ -93,11 +94,11 @@
         style="@style/TextAppearance.GestureTutorial.Feedback"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_above="@id/gesture_tutorial_fragment_action_button"
+        android:layout_below="@id/gesture_tutorial_fragment_titles_container"
         android:layout_centerHorizontal="true"
         android:layout_marginStart="@dimen/gesture_tutorial_feedback_margin_start_end"
         android:layout_marginEnd="@dimen/gesture_tutorial_feedback_margin_start_end"
-        android:layout_marginBottom="10dp"/>
+        android:layout_marginTop="40dp"/>
 
     <!-- android:stateListAnimator="@null" removes shadow and normal on click behavior (increase
          of elevation and shadow) which is replaced by ripple effect in android:foreground -->
@@ -126,4 +127,4 @@
         android:background="@null"
         android:foreground="?android:attr/selectableItemBackgroundBorderless"
         android:stateListAnimator="@null"/>
-</RelativeLayout>
\ No newline at end of file
+</com.android.quickstep.interaction.RootSandboxLayout>
\ No newline at end of file
diff --git a/quickstep/src/com/android/quickstep/interaction/EdgeBackGestureHandler.java b/quickstep/src/com/android/quickstep/interaction/EdgeBackGestureHandler.java
index e4b348e51b..9489bac266 100644
--- a/quickstep/src/com/android/quickstep/interaction/EdgeBackGestureHandler.java
+++ b/quickstep/src/com/android/quickstep/interaction/EdgeBackGestureHandler.java
@@ -143,6 +143,10 @@ public class EdgeBackGestureHandler implements OnTouchListener {
         return false;
     }
 
+    boolean onInterceptTouch(MotionEvent motionEvent) {
+        return isWithinTouchRegion((int) motionEvent.getX(), (int) motionEvent.getY());
+    }
+
     private boolean isWithinTouchRegion(int x, int y) {
         // Disallow if too far from the edge
         if (x > mEdgeWidth + mLeftInset && x < (mDisplaySize.x - mEdgeWidth - mRightInset)) {
diff --git a/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java b/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java
index f897ecc01a..d1b0a7088f 100644
--- a/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java
+++ b/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java
@@ -250,6 +250,12 @@ public class NavBarGestureHandler implements OnTouchListener,
         return intercepted;
     }
 
+    boolean onInterceptTouch(MotionEvent event) {
+        return mAssistantLeftRegion.contains(event.getX(), event.getY())
+                || mAssistantRightRegion.contains(event.getX(), event.getY())
+                || event.getY() >= mDisplaySize.y - mBottomGestureHeight;
+    }
+
     protected void onMotionPauseDetected() {
         VibratorWrapper.INSTANCE.get(mContext).vibrate(OVERVIEW_HAPTIC);
     }
diff --git a/quickstep/src/com/android/quickstep/interaction/RootSandboxLayout.java b/quickstep/src/com/android/quickstep/interaction/RootSandboxLayout.java
new file mode 100644
index 0000000000..db1afc2012
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/interaction/RootSandboxLayout.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.quickstep.interaction;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.widget.RelativeLayout;
+
+import androidx.fragment.app.FragmentManager;
+
+/** Root layout that TutorialFragment uses to intercept motion events. */
+public class RootSandboxLayout extends RelativeLayout {
+    public RootSandboxLayout(Context context) {
+        super(context);
+    }
+
+    public RootSandboxLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public RootSandboxLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent motionEvent) {
+        return ((TutorialFragment) FragmentManager.findFragment(this))
+                .onInterceptTouch(motionEvent);
+    }
+}
diff --git a/quickstep/src/com/android/quickstep/interaction/SandboxLauncherRenderer.java b/quickstep/src/com/android/quickstep/interaction/SandboxLauncherRenderer.java
new file mode 100644
index 0000000000..80ffe6609e
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/interaction/SandboxLauncherRenderer.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.quickstep.interaction;
+
+import android.content.Context;
+import android.view.View;
+
+import com.android.launcher3.InvariantDeviceProfile;
+import com.android.launcher3.graphics.LauncherPreviewRenderer;
+
+/** Renders a fake Launcher for use in the Sandbox. */
+class SandboxLauncherRenderer extends LauncherPreviewRenderer {
+    SandboxLauncherRenderer(Context context, InvariantDeviceProfile idp, boolean migrated) {
+        super(context, idp, migrated);
+    }
+
+    @Override
+    public boolean shouldShowRealLauncherPreview() {
+        return false;
+    }
+
+    @Override
+    public boolean shouldShowQsb() {
+        return false;
+    }
+
+    @Override
+    public View.OnLongClickListener getWorkspaceChildOnLongClickListener() {
+        return null;
+    }
+}
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
index 73f1f8cb8c..db80342673 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
@@ -47,6 +47,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
     final TextView mTitleTextView;
     final TextView mSubtitleTextView;
     final TextView mFeedbackView;
+    final View mLauncherView;
     final ClipIconView mFakeIconView;
     final View mFakeTaskView;
     final View mRippleView;
@@ -68,6 +69,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         mTitleTextView = rootView.findViewById(R.id.gesture_tutorial_fragment_title_view);
         mSubtitleTextView = rootView.findViewById(R.id.gesture_tutorial_fragment_subtitle_view);
         mFeedbackView = rootView.findViewById(R.id.gesture_tutorial_fragment_feedback_view);
+        mLauncherView = tutorialFragment.getLauncherView();
         mFakeIconView = rootView.findViewById(R.id.gesture_tutorial_fake_icon_view);
         mFakeTaskView = rootView.findViewById(R.id.gesture_tutorial_fake_task_view);
         mRippleView = rootView.findViewById(R.id.gesture_tutorial_ripple_view);
@@ -162,8 +164,10 @@ abstract class TutorialController implements BackGestureAttemptCallback,
 
         if (isComplete()) {
             hideHandCoachingAnimation();
+            mLauncherView.setVisibility(View.INVISIBLE);
         } else {
             showHandCoachingAnimation();
+            mLauncherView.setVisibility(View.VISIBLE);
         }
     }
 
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
index 9a8264d098..c90ad94b8c 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
@@ -31,6 +31,7 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
+import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.R;
 import com.android.quickstep.interaction.TutorialController.TutorialType;
 
@@ -45,6 +46,7 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
     TutorialHandAnimation mHandCoachingAnimation;
     EdgeBackGestureHandler mEdgeBackGestureHandler;
     NavBarGestureHandler mNavBarGestureHandler;
+    private View mLauncherView;
 
     public static TutorialFragment newInstance(TutorialType tutorialType) {
         TutorialFragment fragment = getFragmentForTutorialType(tutorialType);
@@ -114,8 +116,11 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
             return insets;
         });
         mRootView.setOnTouchListener(this);
-        mHandCoachingAnimation = new TutorialHandAnimation(getContext(), mRootView,
-                getHandAnimationResId());
+        mHandCoachingAnimation =
+                new TutorialHandAnimation(getContext(), mRootView, getHandAnimationResId());
+        InvariantDeviceProfile dp = InvariantDeviceProfile.INSTANCE.get(getContext());
+        mLauncherView = new SandboxLauncherRenderer(getContext(), dp, true).getRenderedView();
+        ((ViewGroup) mRootView).addView(mLauncherView, 0);
         return mRootView;
     }
 
@@ -133,11 +138,17 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
 
     @Override
     public boolean onTouch(View view, MotionEvent motionEvent) {
-        // Note: Using logical or to ensure both functions get called.
+        // Note: Using logical-or to ensure both functions get called.
         return mEdgeBackGestureHandler.onTouch(view, motionEvent)
                 | mNavBarGestureHandler.onTouch(view, motionEvent);
     }
 
+    boolean onInterceptTouch(MotionEvent motionEvent) {
+        // Note: Using logical-or to ensure both functions get called.
+        return mEdgeBackGestureHandler.onInterceptTouch(motionEvent)
+                | mNavBarGestureHandler.onInterceptTouch(motionEvent);
+    }
+
     void onAttachedToWindow() {
         mEdgeBackGestureHandler.setViewGroupParent((ViewGroup) getRootView());
     }
@@ -168,6 +179,10 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
         return mRootView;
     }
 
+    View getLauncherView() {
+        return mLauncherView;
+    }
+
     TutorialHandAnimation getHandAnimation() {
         return mHandCoachingAnimation;
     }
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 1cd201f99e..2809bd5a96 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -323,11 +323,8 @@ public class CellLayout extends ViewGroup {
 
     @Override
     public boolean onInterceptTouchEvent(MotionEvent ev) {
-        if (mTouchHelper != null
-                || (mInterceptTouchListener != null && mInterceptTouchListener.onTouch(this, ev))) {
-            return true;
-        }
-        return false;
+        return mTouchHelper != null
+                || (mInterceptTouchListener != null && mInterceptTouchListener.onTouch(this, ev));
     }
 
     public void enableHardwareLayer(boolean hasLayer) {
diff --git a/src/com/android/launcher3/WorkspaceLayoutManager.java b/src/com/android/launcher3/WorkspaceLayoutManager.java
index ea887cc5eb..d6302ce580 100644
--- a/src/com/android/launcher3/WorkspaceLayoutManager.java
+++ b/src/com/android/launcher3/WorkspaceLayoutManager.java
@@ -130,12 +130,16 @@ public interface WorkspaceLayoutManager {
         }
 
         child.setHapticFeedbackEnabled(false);
-        child.setOnLongClickListener(ItemLongClickListener.INSTANCE_WORKSPACE);
+        child.setOnLongClickListener(getWorkspaceChildOnLongClickListener());
         if (child instanceof DropTarget) {
             onAddDropTarget((DropTarget) child);
         }
     }
 
+    default View.OnLongClickListener getWorkspaceChildOnLongClickListener() {
+        return ItemLongClickListener.INSTANCE_WORKSPACE;
+    }
+
     Hotseat getHotseat();
 
     CellLayout getScreenWithId(int screenId);
diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index cd84c96171..effb3a4a0c 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -513,8 +513,7 @@ public class LauncherPreviewRenderer extends ContextThemeWrapper
         }
 
         // Setup search view
-        SearchUiManager searchUiManager =
-                mRootView.findViewById(R.id.search_container_all_apps);
+        SearchUiManager searchUiManager = mRootView.findViewById(R.id.search_container_all_apps);
         mRootView.findViewById(R.id.apps_view).setTranslationY(
                 mDp.heightPx - searchUiManager.getScrollRangeDelta(mInsets));
         ViewGroup searchView = (ViewGroup) searchUiManager;
-- 
GitLab


From 5e182b60c6103f9e2263eb9d48ee5e8e0bf0f79f Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Mon, 14 Sep 2020 09:58:35 -0700
Subject: [PATCH 0154/1664] Add launcher state and activity lifecycle in
 AllAppsSearchPlugin Bug: 165678938

Change-Id: Ica7c70ad66dcc1442ff5d0c638aaf0f1ada0fc36
---
 .../systemui/plugins/AllAppsSearchPlugin.java | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java b/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
index 437cf3cfe5..4fa670f44a 100644
--- a/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
+++ b/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
@@ -16,6 +16,9 @@
 
 package com.android.systemui.plugins;
 
+import android.app.Activity;
+import android.view.View;
+
 import com.android.systemui.plugins.annotations.ProvidesInterface;
 import com.android.systemui.plugins.shared.SearchTarget;
 import com.android.systemui.plugins.shared.SearchTargetEvent;
@@ -29,22 +32,20 @@ import java.util.function.Consumer;
 @ProvidesInterface(action = AllAppsSearchPlugin.ACTION, version = AllAppsSearchPlugin.VERSION)
 public interface AllAppsSearchPlugin extends Plugin {
     String ACTION = "com.android.systemui.action.PLUGIN_ALL_APPS_SEARCH_ACTIONS";
-    int VERSION = 5;
+    int VERSION = 6;
 
+    void setup(Activity activity, View view);
 
     /**
-     * Send signal when user enters all apps.
+     * Send launcher state related signals.
      */
-    void startAllAppsSession();
+    void onStateTransitionStart(int fromState, int toState);
+    void onStateTransitionComplete(int state);
 
     /**
-     * Send signal when user starts typing.
+     * Send signal when user starts typing, perform search, when search ends
      */
     void startedSearchSession();
-
-    /**
-     * Send over the query and get the search results.
-     */
     void performSearch(String query, Consumer<List<SearchTarget>> results);
 
     /**
@@ -53,7 +54,8 @@ public interface AllAppsSearchPlugin extends Plugin {
     void notifySearchTargetEvent(SearchTargetEvent event);
 
     /**
-     * Send signal when user exits all apps.
+     * Launcher activity lifecycle callbacks
      */
-    void endAllAppsSession();
+    void onResume(int state);
+    void onStop(int state);
 }
\ No newline at end of file
-- 
GitLab


From 7729447716cb39bbf113952cf9593ae95711a141 Mon Sep 17 00:00:00 2001
From: Vadim Tryshev <vadimt@google.com>
Date: Thu, 17 Sep 2020 17:15:08 +0000
Subject: [PATCH 0155/1664] Revert "Speed up tests by injecting input events
 asynchronously"

This reverts commit 4c80053950d9bf0e6c087f430fa5388daa52a2ec.

Reason for revert: Broke tests

Change-Id: I3bd556b3127c0936b18a3fec8202b492d2ecb099
---
 .../com/android/launcher3/tapl/LauncherInstrumentation.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 16891e2e69..c74dea9bb5 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -1184,7 +1184,7 @@ public final class LauncherInstrumentation {
 
         final MotionEvent event = getMotionEvent(downTime, currentTime, action, point.x, point.y);
         assertTrue("injectInputEvent failed",
-                mInstrumentation.getUiAutomation().injectInputEvent(event, false));
+                mInstrumentation.getUiAutomation().injectInputEvent(event, true));
         event.recycle();
     }
 
-- 
GitLab


From b1ee0a020fddf0d4aa25055273f612c0d3214264 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Thu, 17 Sep 2020 11:51:42 -0700
Subject: [PATCH 0156/1664] Remove tracing for a non-repro flake

Change-Id: I53cc5020435bb3b630754a77d73590b35b595407
---
 src/com/android/launcher3/pm/UserCache.java         | 5 -----
 src/com/android/launcher3/testing/TestProtocol.java | 1 -
 tests/src/com/android/launcher3/ui/WorkTabTest.java | 5 -----
 3 files changed, 11 deletions(-)

diff --git a/src/com/android/launcher3/pm/UserCache.java b/src/com/android/launcher3/pm/UserCache.java
index 2d7d6b092a..5aab41a8a2 100644
--- a/src/com/android/launcher3/pm/UserCache.java
+++ b/src/com/android/launcher3/pm/UserCache.java
@@ -21,10 +21,8 @@ import android.content.Intent;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.util.ArrayMap;
-import android.util.Log;
 import android.util.LongSparseArray;
 
-import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.launcher3.util.SafeCloseable;
 import com.android.launcher3.util.SimpleBroadcastReceiver;
@@ -104,9 +102,6 @@ public class UserCache {
                 mUsers = null;
                 mUserToSerialMap = null;
             }
-            if (TestProtocol.sDebugTracing) {
-                Log.d(TestProtocol.WORK_PROFILE_REMOVED, "Work profile removed", new Exception());
-            }
         }
     }
 
diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java
index b2d008119e..7f7635561d 100644
--- a/src/com/android/launcher3/testing/TestProtocol.java
+++ b/src/com/android/launcher3/testing/TestProtocol.java
@@ -106,5 +106,4 @@ public final class TestProtocol {
     public static final String PAUSE_NOT_DETECTED = "b/139891609";
     public static final String OVERIEW_NOT_ALLAPPS = "b/156095088";
     public static final String NO_SWIPE_TO_HOME = "b/158017601";
-    public static final String WORK_PROFILE_REMOVED = "b/159671700";
 }
diff --git a/tests/src/com/android/launcher3/ui/WorkTabTest.java b/tests/src/com/android/launcher3/ui/WorkTabTest.java
index f5f93c429f..e51c1cad37 100644
--- a/tests/src/com/android/launcher3/ui/WorkTabTest.java
+++ b/tests/src/com/android/launcher3/ui/WorkTabTest.java
@@ -24,7 +24,6 @@ import static org.junit.Assert.assertTrue;
 import android.os.Process;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.util.Log;
 import android.widget.TextView;
 
 import androidx.test.filters.LargeTest;
@@ -35,7 +34,6 @@ import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.allapps.AllAppsPagedView;
 import com.android.launcher3.allapps.WorkModeSwitch;
 import com.android.launcher3.dragndrop.DragLayer;
-import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.views.WorkEduView;
 
 import org.junit.After;
@@ -135,9 +133,6 @@ public class WorkTabTest extends AbstractLauncherUiTest {
             workEduView.findViewById(R.id.proceed).callOnClick();
         });
 
-        executeOnLauncher(launcher -> Log.d(TestProtocol.WORK_PROFILE_REMOVED,
-                "Work profile status: " + launcher.getAppsView().isPersonalTabVisible()));
-
         // verify work edu is seen next
         waitForLauncherCondition("Launcher did not show the next edu screen", l ->
                 ((AllAppsPagedView) l.getAppsView().getContentView()).getCurrentPage() == WORK_PAGE
-- 
GitLab


From 24f0f34d0159bd11ea1e4a0a0053d3e9be32f6d0 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 17 Sep 2020 13:23:39 -0700
Subject: [PATCH 0157/1664] Only check activity rotation allowed when
 considering menu layout

- The canRecentsActivityRotate() also checks whether system rotation
  is enabled which prevents us from using the right layout orientation
  when home rotation is enabled while system rotation is disabled.

Bug: 168278832
Test: Tested menu visibility in combination of
      Auto rotate setting x Home rotation setting X Device orientation
Change-Id: If74a38b1ec51abd2ea7f3ba3de23f0b2c4cab0ab
---
 quickstep/src/com/android/quickstep/views/TaskMenuView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
index 656d59e000..d47eba6408 100644
--- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
@@ -246,7 +246,7 @@ public class TaskMenuView extends AbstractFloatingView {
         setScaleX(taskView.getScaleX());
         setScaleY(taskView.getScaleY());
         boolean canActivityRotate = taskView.getRecentsView()
-            .mOrientationState.canRecentsActivityRotate();
+            .mOrientationState.isRecentsActivityRotationAllowed();
         mOptionLayout.setOrientation(orientationHandler
                 .getTaskMenuLayoutOrientation(canActivityRotate, mOptionLayout));
         setPosition(sTempRect.left - insets.left, sTempRect.top - insets.top,
-- 
GitLab


From 44981eb88ecdd4782e6bf6bb89eea6e9fc667335 Mon Sep 17 00:00:00 2001
From: Jerry Chang <chenghsiuchang@google.com>
Date: Fri, 18 Sep 2020 17:37:06 +0800
Subject: [PATCH 0158/1664] Remove legacy involveSplitScreen API

The onSplitScreenInvoked was used to notify system ui to reset the
divider position before entering split screen. With
SplitScreenTaskOrganizer, WM Shell library could know the exact time
when entering/leaving split screen mode. Removes the legacy API and
resets divider position when leaving split screen mode.

Fix: 168869136
Test: atest WMShellTests
Test: atest SystemUITests
Test: manual check recents and split screen behavior
Change-Id: Id14925619d1ec7c014a3e306fd99ec3734f227da
---
 .../src/com/android/quickstep/SystemUiProxy.java      | 11 -----------
 .../com/android/quickstep/TaskShortcutFactory.java    |  1 -
 2 files changed, 12 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index e4b05aec12..2666869136 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -113,17 +113,6 @@ public class SystemUiProxy implements ISystemUiProxy {
         }
     }
 
-    @Override
-    public void onSplitScreenInvoked() {
-        if (mSystemUiProxy != null) {
-            try {
-                mSystemUiProxy.onSplitScreenInvoked();
-            } catch (RemoteException e) {
-                Log.w(TAG, "Failed call onSplitScreenInvoked", e);
-            }
-        }
-    }
-
     @Override
     public void onOverviewShown(boolean fromHome) {
         onOverviewShown(fromHome, TAG);
diff --git a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
index 3b245b3230..2b55b805c6 100644
--- a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
@@ -228,7 +228,6 @@ public interface TaskShortcutFactory {
 
         @Override
         protected boolean onActivityStarted(BaseDraggingActivity activity) {
-            SystemUiProxy.INSTANCE.get(activity).onSplitScreenInvoked();
             activity.getUserEventDispatcher().logActionOnControl(TAP,
                     LauncherLogProto.ControlType.SPLIT_SCREEN_TARGET);
             return true;
-- 
GitLab


From dd0b469a7681bd06f410c912bb04aeef71911650 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Fri, 18 Sep 2020 14:31:25 -0700
Subject: [PATCH 0159/1664] Experiment with closing all apps before overview
 actions test

Bug: 165029151
Change-Id: I1090b963ac1a12c96968014c69b8b26e1768be85
---
 .../tests/src/com/android/quickstep/TaplTestsQuickstep.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
index ecd4e2bd67..c5863c143c 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
@@ -201,6 +201,12 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
     @PortraitLandscape
     public void testOverviewActions() throws Exception {
         if (mLauncher.getNavigationModel() != NavigationModel.TWO_BUTTON) {
+            // Experimenting for b/165029151:
+            final Overview overview = mLauncher.pressHome().switchToOverview();
+            if (overview.hasTasks()) overview.dismissAllTasks();
+            mLauncher.pressHome();
+            //
+
             startTestAppsWithCheck();
             OverviewActions actionsView =
                     mLauncher.pressHome().switchToOverview().getOverviewActions();
-- 
GitLab


From 28633e998586f9ebe85eb3b15e190a015dadfb1d Mon Sep 17 00:00:00 2001
From: Pinyao Ting <pinyaoting@google.com>
Date: Wed, 2 Sep 2020 11:19:40 -0700
Subject: [PATCH 0160/1664] Fix the issue Launcher is calling minimal device
 endpoint on UI thread

Test: manual
Change-Id: I72b12da43520d775bfd652a3b10406440f7cf64f
---
 .../launcher3/model/WellbeingModel.java       | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/model/WellbeingModel.java b/quickstep/src/com/android/launcher3/model/WellbeingModel.java
index 810f4e3c59..f92b3e33b2 100644
--- a/quickstep/src/com/android/launcher3/model/WellbeingModel.java
+++ b/quickstep/src/com/android/launcher3/model/WellbeingModel.java
@@ -63,7 +63,6 @@ import com.android.launcher3.util.SimpleBroadcastReceiver;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.function.Consumer;
 
 /**
  * Data model for digital wellbeing status of apps.
@@ -222,9 +221,8 @@ public final class WellbeingModel {
             reloadLauncherInNormalMode(context);
             return;
         }
-        runWithMinimalDeviceConfigs((bundle) -> {
-            if (bundle.getInt(EXTRA_MINIMAL_DEVICE_STATE, UNKNOWN_MINIMAL_DEVICE_STATE)
-                    == IN_MINIMAL_DEVICE) {
+        mWorkerHandler.post(() -> {
+            if (isInMinimalDeviceMode()) {
                 reloadLauncherInMinimalMode(context);
             } else {
                 reloadLauncherInNormalMode(context);
@@ -253,31 +251,30 @@ public final class WellbeingModel {
                 .authority(mWellbeingProviderPkg + ".api");
     }
 
-    /**
-     * Fetch most up-to-date minimal device config.
-     */
     @WorkerThread
-    private void runWithMinimalDeviceConfigs(Consumer<Bundle> consumer) {
+    private boolean isInMinimalDeviceMode() {
         if (!FeatureFlags.ENABLE_MINIMAL_DEVICE.get()) {
-            return;
+            return false;
         }
         if (DEBUG || mIsInTest) {
-            Log.d(TAG, "runWithMinimalDeviceConfigs() called");
+            Log.d(TAG, "isInMinimalDeviceMode() called");
         }
         Preconditions.assertNonUiThread();
 
         final Uri contentUri = apiBuilder().build();
-        final Bundle remoteBundle;
         try (ContentProviderClient client = mContext.getContentResolver()
                 .acquireUnstableContentProviderClient(contentUri)) {
-            remoteBundle = client.call(
+            final Bundle remoteBundle = client == null ? null : client.call(
                     METHOD_GET_MINIMAL_DEVICE_CONFIG, null /* args */, null /* extras */);
-            consumer.accept(remoteBundle);
+            return remoteBundle != null
+                    && remoteBundle.getInt(EXTRA_MINIMAL_DEVICE_STATE,
+                    UNKNOWN_MINIMAL_DEVICE_STATE) == IN_MINIMAL_DEVICE;
         } catch (Exception e) {
             Log.e(TAG, "Failed to retrieve data from " + contentUri + ": " + e);
             if (mIsInTest) throw new RuntimeException(e);
         }
-        if (DEBUG || mIsInTest) Log.i(TAG, "runWithMinimalDeviceConfigs(): finished");
+        if (DEBUG || mIsInTest) Log.i(TAG, "isInMinimalDeviceMode(): finished");
+        return false;
     }
 
     private boolean updateActions(String... packageNames) {
-- 
GitLab


From a435e186863782e25b2781b5dc4f9b5765693165 Mon Sep 17 00:00:00 2001
From: Pinyao Ting <pinyaoting@google.com>
Date: Thu, 17 Sep 2020 10:37:35 -0700
Subject: [PATCH 0161/1664] enable minimal device mode for droidfood in S

Test: manual
Change-Id: Ieb24734e6c4245a872b5ac0f1a99766d542e983e
---
 src/com/android/launcher3/config/FeatureFlags.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 2627149167..4175280991 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -177,8 +177,8 @@ public final class FeatureFlags {
             "SEPARATE_RECENTS_ACTIVITY", false,
             "Uses a separate recents activity instead of using the integrated recents+Launcher UI");
 
-    public static final BooleanFlag ENABLE_MINIMAL_DEVICE = new DeviceFlag(
-            "ENABLE_MINIMAL_DEVICE", false,
+    public static final BooleanFlag ENABLE_MINIMAL_DEVICE = getDebugFlag(
+            "ENABLE_MINIMAL_DEVICE", true,
             "Allow user to toggle minimal device mode in launcher.");
 
     public static void initialize(Context context) {
-- 
GitLab


From 9cd3740fe7f78cf0430b1c8dd64cf6767f9ef108 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 17 Sep 2020 13:23:39 -0700
Subject: [PATCH 0162/1664] Only check activity rotation allowed when
 considering menu layout

- The canRecentsActivityRotate() also checks whether system rotation
  is enabled which prevents us from using the right layout orientation
  when home rotation is enabled while system rotation is disabled.

Bug: 168278832
Test: Tested menu visibility in combination of
      Auto rotate setting x Home rotation setting X Device orientation
Change-Id: If74a38b1ec51abd2ea7f3ba3de23f0b2c4cab0ab
Merged-In: If74a38b1ec51abd2ea7f3ba3de23f0b2c4cab0ab
---
 .../src/com/android/quickstep/views/TaskMenuView.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskMenuView.java
index 8b49f2c212..fb799a800c 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskMenuView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskMenuView.java
@@ -251,7 +251,7 @@ public class TaskMenuView extends AbstractFloatingView {
         setScaleX(taskView.getScaleX());
         setScaleY(taskView.getScaleY());
         boolean canActivityRotate = taskView.getRecentsView()
-            .mOrientationState.canRecentsActivityRotate();
+            .mOrientationState.isRecentsActivityRotationAllowed();
         mOptionLayout.setOrientation(orientationHandler
                 .getTaskMenuLayoutOrientation(canActivityRotate, mOptionLayout));
         setPosition(sTempRect.left - insets.left, sTempRect.top - insets.top,
-- 
GitLab


From a85fa09885903470346faa97ff141cf5fd7ef2b2 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 21 Sep 2020 11:14:49 -0700
Subject: [PATCH 0163/1664] Make overview to home translate faster

Fixes: 169052350
Change-Id: Ia6f21f479498927a5561819fcc256b698acbd095
---
 .../src/com/android/quickstep/util/OverviewToHomeAnim.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java b/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
index 4a298d3bad..1031c5b080 100644
--- a/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
+++ b/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
@@ -18,8 +18,10 @@ package com.android.quickstep.util;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.anim.Interpolators.DEACCEL;
+import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 import static com.android.launcher3.anim.Interpolators.FINAL_FRAME;
 import static com.android.launcher3.anim.Interpolators.INSTANT;
+import static com.android.launcher3.anim.Interpolators.clampToProgress;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_COMPONENTS;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_ACTIONS_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE;
@@ -110,7 +112,7 @@ public class OverviewToHomeAnim {
         boolean isLayoutNaturalToLauncher = recentsView.getPagedOrientationHandler()
                 .isLayoutNaturalToLauncher();
         config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, isLayoutNaturalToLauncher
-                ? DEACCEL : FINAL_FRAME);
+                ? clampToProgress(FAST_OUT_SLOW_IN, 0, 0.75f) : FINAL_FRAME);
         config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, FINAL_FRAME);
         config.setInterpolator(ANIM_OVERVIEW_SCALE, FINAL_FRAME);
         config.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, INSTANT);
-- 
GitLab


From ca23b981d9aa72b98ac3c5d53009a7e9477be6be Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 21 Sep 2020 11:47:40 -0700
Subject: [PATCH 0164/1664] Allow touches on Workspace during transition from
 Overview

Previously we only allowed touches on the hotseat (due to it being
in the shelf in Overview); now we allow touches anywhere if we are
not in an overview state.

Test: enter overview, swipe up to home and scroll workspace or tap
a workspace icon during the transition

Bug: 169052350
Change-Id: I59ee695ba9cb6f5fddd8e41c5796cdba6b3d2112
---
 .../android/quickstep/views/LauncherRecentsView.java  | 11 ++---------
 src/com/android/launcher3/Workspace.java              |  7 -------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
index b338bd07ee..52a7466429 100644
--- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
@@ -36,7 +36,6 @@ import android.view.Surface;
 import android.widget.FrameLayout;
 
 import com.android.launcher3.BaseQuickstepLauncher;
-import com.android.launcher3.Hotseat;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.StateManager.StateListener;
@@ -177,14 +176,8 @@ public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher>
 
     @Override
     protected boolean shouldStealTouchFromSiblingsBelow(MotionEvent ev) {
-        if (ev.getAction() == MotionEvent.ACTION_DOWN) {
-            // Allow touches to go through to the hotseat.
-            Hotseat hotseat = mActivity.getHotseat();
-            boolean touchingHotseat = hotseat.isShown()
-                    && mActivity.getDragLayer().isEventOverView(hotseat, ev, this);
-            return !touchingHotseat;
-        }
-        return super.shouldStealTouchFromSiblingsBelow(ev);
+        return mActivity.getStateManager().getState().overviewUi
+                && super.shouldStealTouchFromSiblingsBelow(ev);
     }
 
     @Override
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 45aaa1b673..e7ded363a2 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1175,13 +1175,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         computeScrollHelper(false);
     }
 
-    @Override
-    protected void determineScrollingStart(MotionEvent ev, float touchSlopScale) {
-        if (!isSwitchingState()) {
-            super.determineScrollingStart(ev, touchSlopScale);
-        }
-    }
-
     @Override
     public void announceForAccessibility(CharSequence text) {
         // Don't announce if apps is on top of us.
-- 
GitLab


From 35a0c59021a267c84b7ffcb77782cbf8cdfb1d15 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Mon, 21 Sep 2020 15:49:24 -0700
Subject: [PATCH 0165/1664] Add window focus / visibility changed signals to
 AllAppsSearchPlugin

Change-Id: Ieb48e398cca85dd4343e37fef0015f5e4fece86f
---
 .../com/android/systemui/plugins/AllAppsSearchPlugin.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java b/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
index 4fa670f44a..48369a4890 100644
--- a/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
+++ b/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
@@ -42,6 +42,12 @@ public interface AllAppsSearchPlugin extends Plugin {
     void onStateTransitionStart(int fromState, int toState);
     void onStateTransitionComplete(int state);
 
+    /**
+     * Send launcher window focus and visibility changed signals.
+     */
+    void onWindowFocusChanged(boolean hasFocus);
+    void onWindowVisibilityChanged(int visibility);
+
     /**
      * Send signal when user starts typing, perform search, when search ends
      */
-- 
GitLab


From 25ecae1ef1d1900d680c6fe80d73f1b05278c7f3 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Mon, 14 Sep 2020 14:07:38 -0700
Subject: [PATCH 0166/1664] Add cross-fade animation to launcher for dark/light
 theme changes.

Test: manual

Fixing b/167570781. The launcher was not cross-fading it's original appearance with its new appearance on theme changes. It would only reload. Added a cross-fade animation.

Demo: https://drive.google.com/file/d/1adRIJIMFw4WGdfSqZbS0caR2LH3j_yH-/view?usp=sharing

Change-Id: I69162d9c49565e007cb33402389abf7d20806dd7
---
 src/com/android/launcher3/Launcher.java | 59 ++++++++++++++++++++++++-
 1 file changed, 57 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 90566f3ce8..1cf2e89e44 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -18,6 +18,7 @@ package com.android.launcher3;
 
 import static android.content.pm.ActivityInfo.CONFIG_ORIENTATION;
 import static android.content.pm.ActivityInfo.CONFIG_SCREEN_SIZE;
+import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO;
 import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED;
 
 import static com.android.launcher3.AbstractFloatingView.TYPE_ALL;
@@ -70,6 +71,7 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.database.sqlite.SQLiteDatabase;
+import android.graphics.Bitmap;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.CancellationSignal;
@@ -88,9 +90,10 @@ import android.view.Menu;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
+import android.view.WindowManager.LayoutParams;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.animation.OvershootInterpolator;
+import android.widget.ImageView;
 import android.widget.Toast;
 
 import androidx.annotation.CallSuper;
@@ -117,6 +120,7 @@ import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.dragndrop.DragView;
 import com.android.launcher3.folder.FolderGridOrganizer;
 import com.android.launcher3.folder.FolderIcon;
+import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.keyboard.CustomActionsPopup;
 import com.android.launcher3.keyboard.ViewGroupFocusHelper;
@@ -269,6 +273,8 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     private static final int APPS_VIEW_ALPHA_CHANNEL_INDEX = 1;
     private static final int SCRIM_VIEW_ALPHA_CHANNEL_INDEX = 0;
 
+    private static final int THEME_CROSS_FADE_ANIMATION_DURATION = 375;
+
     private LauncherAppTransitionManager mAppTransitionManager;
     private Configuration mOldConfig;
 
@@ -400,6 +406,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
         inflateRootView(R.layout.launcher);
         setupViews();
+        crossFadeWithPreviousAppearance();
         mPopupDataProvider = new PopupDataProvider(this::updateNotificationDots);
 
         mAppTransitionManager = LauncherAppTransitionManager.newInstance(this);
@@ -476,7 +483,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
                 () -> getStateManager().goToState(NORMAL));
 
         if (Utilities.ATLEAST_R) {
-            getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING);
+            getWindow().setSoftInputMode(LayoutParams.SOFT_INPUT_ADJUST_NOTHING);
         }
 
         mLifecycleRegistry = new LifecycleRegistry(this);
@@ -1364,6 +1371,18 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         closeContextMenu();
     }
 
+    @Override
+    public Object onRetainNonConfigurationInstance() {
+        int width = mDragLayer.getWidth();
+        int height = mDragLayer.getHeight();
+
+        if (width <= 0 || height <= 0) {
+            return null;
+        }
+
+        return BitmapRenderer.createHardwareBitmap(width, height, mDragLayer::draw);
+    }
+
     public AllAppsTransitionController getAllAppsController() {
         return mAllAppsController;
     }
@@ -2758,4 +2777,40 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
         void onLauncherResume();
     }
+
+    /**
+     * Cross-fades the launcher's updated appearance with its previous appearance.
+     *
+     * This method is used to cross-fade UI updates on activity creation, specifically dark mode
+     * updates.
+     */
+    private void crossFadeWithPreviousAppearance() {
+        Bitmap previousAppearanceBitmap = (Bitmap) getLastNonConfigurationInstance();
+
+        if (previousAppearanceBitmap == null) {
+            return;
+        }
+
+        ImageView crossFadeHelper = new ImageView(this);
+
+        crossFadeHelper.setImageBitmap(previousAppearanceBitmap);
+        crossFadeHelper.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
+
+        InsettableFrameLayout.LayoutParams layoutParams = new InsettableFrameLayout.LayoutParams(
+                InsettableFrameLayout.LayoutParams.MATCH_PARENT,
+                InsettableFrameLayout.LayoutParams.MATCH_PARENT);
+
+        layoutParams.ignoreInsets = true;
+
+        crossFadeHelper.setLayoutParams(layoutParams);
+
+        getRootView().addView(crossFadeHelper);
+
+        crossFadeHelper
+                .animate()
+                .setDuration(THEME_CROSS_FADE_ANIMATION_DURATION)
+                .alpha(0f)
+                .withEndAction(() -> getRootView().removeView(crossFadeHelper))
+                .start();
+    }
 }
-- 
GitLab


From c445a359ae1609f431f4a83399e5adc74e39afb0 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 21 Sep 2020 16:18:43 -0700
Subject: [PATCH 0167/1664] Remove invisible home task view as soon as gesture
 to Recents ends

Fixes: 168288052
Change-Id: I929d021b26dad8b2f9b1f6a659522054bbf3ec28
---
 .../src/com/android/quickstep/AbsSwipeUpHandler.java   | 10 +++++++---
 .../quickstep/fallback/FallbackRecentsView.java        | 10 ++++++----
 .../src/com/android/quickstep/views/RecentsView.java   | 10 +++++++++-
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 26ad3778a7..22e6755eb1 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -434,9 +434,13 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                 mOnDeferredActivityLaunch);
 
         mGestureState.runOnceAtState(STATE_END_TARGET_SET,
-                () -> mDeviceState.getRotationTouchHelper().
-                        onEndTargetCalculated(mGestureState.getEndTarget(),
-                                mActivityInterface));
+                () -> {
+                    mDeviceState.getRotationTouchHelper()
+                            .onEndTargetCalculated(mGestureState.getEndTarget(),
+                                    mActivityInterface);
+
+                    mRecentsView.onGestureEndTargetCalculated(mGestureState.getEndTarget());
+                });
 
         notifyGestureStartedAsync();
     }
diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
index f5f525965f..8f2356c696 100644
--- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
+++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
@@ -15,6 +15,7 @@
  */
 package com.android.quickstep.fallback;
 
+import static com.android.quickstep.GestureState.GestureEndTarget.RECENTS;
 import static com.android.quickstep.fallback.RecentsState.DEFAULT;
 import static com.android.quickstep.fallback.RecentsState.MODAL_TASK;
 
@@ -27,6 +28,7 @@ import android.util.AttributeSet;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.statemanager.StateManager.StateListener;
 import com.android.quickstep.FallbackActivityInterface;
+import com.android.quickstep.GestureState;
 import com.android.quickstep.RecentsActivity;
 import com.android.quickstep.views.OverviewActionsView;
 import com.android.quickstep.views.RecentsView;
@@ -74,14 +76,14 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity>
     }
 
     /**
-     * When the gesture ends and recents view become interactive, we also remove the temporary
+     * When the gesture ends and we're going to recents view, we also remove the temporary
      * invisible tile added for the home task. This also pushes the remaining tiles back
      * to the center.
      */
     @Override
-    public void onGestureAnimationEnd() {
-        super.onGestureAnimationEnd();
-        if (mHomeTaskInfo != null) {
+    public void onGestureEndTargetCalculated(GestureState.GestureEndTarget endTarget) {
+        super.onGestureEndTargetCalculated(endTarget);
+        if (mHomeTaskInfo != null && endTarget == RECENTS) {
             TaskView tv = getTaskView(mHomeTaskInfo.taskId);
             if (tv != null) {
                 PendingAnimation pa = createTaskDismissAnimation(tv, true, false, 150);
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 0362377399..b617817728 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -118,6 +118,7 @@ import com.android.launcher3.util.ResourceBasedOverride.Overrides;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.util.ViewPool;
 import com.android.quickstep.BaseActivityInterface;
+import com.android.quickstep.GestureState;
 import com.android.quickstep.RecentsAnimationController;
 import com.android.quickstep.RecentsAnimationTargets;
 import com.android.quickstep.RecentsModel;
@@ -1183,7 +1184,14 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     }
 
     /**
-     * Called when a gesture from an app has finished.
+     * Called when a gesture from an app has finished, and an end target has been determined.
+     */
+    public void onGestureEndTargetCalculated(GestureState.GestureEndTarget endTarget) {
+
+    }
+
+    /**
+     * Called when a gesture from an app has finished, and the animation to the target has ended.
      */
     public void onGestureAnimationEnd() {
         if (mOrientationState.setGestureActive(false)) {
-- 
GitLab


From 0f5c9dbb6f72025b8fe3f1690c4c953b448dc3ea Mon Sep 17 00:00:00 2001
From: "Wesley.CW Wang" <wesleycwwang@google.com>
Date: Tue, 8 Sep 2020 16:33:11 +0800
Subject: [PATCH 0168/1664] Add intent extra when launching WallpaperPicker
 from Launcher

 - Add extra to the intent to help WallpaperPicker log the launch
 source
 - design doc: go/log-wppg-launch-source

Bug: 154781896
Test: manually
Change-Id: Ife774866b06251c01f28f72555c3dcc844fdc051
---
 src/com/android/launcher3/Utilities.java              | 4 ++++
 src/com/android/launcher3/views/OptionsPopupView.java | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index bf637886b7..681118d882 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -141,6 +141,10 @@ public final class Utilities {
     public static final String EXTRA_WALLPAPER_OFFSET = "com.android.launcher3.WALLPAPER_OFFSET";
     public static final String EXTRA_WALLPAPER_FLAVOR = "com.android.launcher3.WALLPAPER_FLAVOR";
 
+    // An intent extra to indicate the launch source by launcher.
+    public static final String EXTRA_WALLPAPER_LAUNCH_SOURCE =
+            "com.android.wallpaper.LAUNCH_SOURCE";
+
     public static boolean IS_RUNNING_IN_TEST_HARNESS =
                     ActivityManager.isRunningInTestHarness();
 
diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java
index d558781be8..349ba9d5c1 100644
--- a/src/com/android/launcher3/views/OptionsPopupView.java
+++ b/src/com/android/launcher3/views/OptionsPopupView.java
@@ -16,6 +16,7 @@
 package com.android.launcher3.views;
 
 import static com.android.launcher3.Utilities.EXTRA_WALLPAPER_FLAVOR;
+import static com.android.launcher3.Utilities.EXTRA_WALLPAPER_LAUNCH_SOURCE;
 import static com.android.launcher3.Utilities.EXTRA_WALLPAPER_OFFSET;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.IGNORE;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SETTINGS_BUTTON_TAP_OR_LONGPRESS;
@@ -210,7 +211,8 @@ public class OptionsPopupView extends ArrowPopup
         Intent intent = new Intent(Intent.ACTION_SET_WALLPAPER)
                 .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
                 .putExtra(EXTRA_WALLPAPER_OFFSET,
-                        launcher.getWorkspace().getWallpaperOffsetForCenterPage());
+                        launcher.getWorkspace().getWallpaperOffsetForCenterPage())
+                .putExtra(EXTRA_WALLPAPER_LAUNCH_SOURCE, "app_launched_launcher");
         if (!Utilities.existsStyleWallpapers(launcher)) {
             intent.putExtra(EXTRA_WALLPAPER_FLAVOR, "wallpaper_only");
         } else {
-- 
GitLab


From b3a0f1ffc06612e2d951e408293dd6eca9070765 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Sun, 20 Sep 2020 11:28:18 -0700
Subject: [PATCH 0169/1664] Add thumbnail viewtype to SearchTarget Bug:
 168825522

Change-Id: I012665ef5e5ac66f37f9bdb37d55cc47726b29a9
---
 res/layout/search_result_thumbnail.xml        | 19 +++++
 .../launcher3/allapps/AllAppsGridAdapter.java | 22 +++--
 .../views/ThumbnailSearchResultView.java      | 81 +++++++++++++++++++
 .../systemui/plugins/shared/SearchTarget.java | 45 ++++++++++-
 4 files changed, 160 insertions(+), 7 deletions(-)
 create mode 100644 res/layout/search_result_thumbnail.xml
 create mode 100644 src/com/android/launcher3/views/ThumbnailSearchResultView.java

diff --git a/res/layout/search_result_thumbnail.xml b/res/layout/search_result_thumbnail.xml
new file mode 100644
index 0000000000..0cc5a29f60
--- /dev/null
+++ b/res/layout/search_result_thumbnail.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.launcher3.views.ThumbnailSearchResultView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="125dp"
+    android:layout_height="125dp"/>
\ No newline at end of file
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index d1340faf23..e08bd5ba3b 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -96,6 +96,8 @@ public class AllAppsGridAdapter extends
 
     public static final int VIEW_TYPE_SEARCH_PEOPLE = 1 << 11;
 
+    public static final int VIEW_TYPE_SEARCH_THUMBNAIL = 1 << 12;
+
     // Common view type masks
     public static final int VIEW_TYPE_MASK_DIVIDER = VIEW_TYPE_ALL_APPS_DIVIDER;
     public static final int VIEW_TYPE_MASK_ICON = VIEW_TYPE_ICON;
@@ -186,6 +188,7 @@ public class AllAppsGridAdapter extends
                     || viewType == VIEW_TYPE_SEARCH_SLICE
                     || viewType == VIEW_TYPE_SEARCH_ROW
                     || viewType == VIEW_TYPE_SEARCH_PEOPLE
+                    || viewType == VIEW_TYPE_SEARCH_THUMBNAIL
                     || viewType == VIEW_TYPE_SEARCH_SHORTCUT;
         }
     }
@@ -307,15 +310,21 @@ public class AllAppsGridAdapter extends
 
         @Override
         public int getSpanSize(int position) {
-            if (isIconViewType(mApps.getAdapterItems().get(position).viewType)) {
-                return 1;
+            int viewType = mApps.getAdapterItems().get(position).viewType;
+            if (isIconViewType(viewType)) {
+                return 1 * SPAN_MULTIPLIER;
+            } else if (viewType == VIEW_TYPE_SEARCH_THUMBNAIL) {
+                return mAppsPerRow;
             } else {
                 // Section breaks span the full width
-                return mAppsPerRow;
+                return mAppsPerRow * SPAN_MULTIPLIER;
             }
         }
     }
 
+    // multiplier to support adapter item column count that is not mAppsPerRow.
+    private static final int SPAN_MULTIPLIER = 3;
+
     private final BaseDraggingActivity mLauncher;
     private final LayoutInflater mLayoutInflater;
     private final AlphabeticalAppsList mApps;
@@ -352,7 +361,7 @@ public class AllAppsGridAdapter extends
 
     public void setAppsPerRow(int appsPerRow) {
         mAppsPerRow = appsPerRow;
-        mGridLayoutMgr.setSpanCount(mAppsPerRow);
+        mGridLayoutMgr.setSpanCount(mAppsPerRow * SPAN_MULTIPLIER);
     }
 
     /**
@@ -444,6 +453,9 @@ public class AllAppsGridAdapter extends
             case VIEW_TYPE_SEARCH_PEOPLE:
                 return new ViewHolder(mLayoutInflater.inflate(
                         R.layout.search_result_people_item, parent, false));
+            case VIEW_TYPE_SEARCH_THUMBNAIL:
+                return new ViewHolder(mLayoutInflater.inflate(
+                        R.layout.search_result_thumbnail, parent, false));
             default:
                 throw new RuntimeException("Unexpected view type");
         }
@@ -525,6 +537,7 @@ public class AllAppsGridAdapter extends
             case VIEW_TYPE_SEARCH_ROW:
             case VIEW_TYPE_SEARCH_SHORTCUT:
             case VIEW_TYPE_SEARCH_PEOPLE:
+            case VIEW_TYPE_SEARCH_THUMBNAIL:
                 PayloadResultHandler payloadResultView = (PayloadResultHandler) holder.itemView;
                 payloadResultView.applyAdapterInfo(
                         (AdapterItemWithPayload) mApps.getAdapterItems().get(position));
@@ -553,7 +566,6 @@ public class AllAppsGridAdapter extends
         }
     }
 
-
     @Override
     public boolean onFailedToRecycleView(ViewHolder holder) {
         // Always recycle and we will reset the view when it is bound
diff --git a/src/com/android/launcher3/views/ThumbnailSearchResultView.java b/src/com/android/launcher3/views/ThumbnailSearchResultView.java
new file mode 100644
index 0000000000..decc861565
--- /dev/null
+++ b/src/com/android/launcher3/views/ThumbnailSearchResultView.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.views;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.AttributeSet;
+
+import androidx.core.graphics.drawable.RoundedBitmapDrawable;
+import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
+import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+import com.android.launcher3.util.Themes;
+import com.android.systemui.plugins.AllAppsSearchPlugin;
+import com.android.systemui.plugins.shared.SearchTarget;
+import com.android.systemui.plugins.shared.SearchTargetEvent;
+
+/**
+ * A view representing a high confidence app search result that includes shortcuts
+ */
+public class ThumbnailSearchResultView extends androidx.appcompat.widget.AppCompatImageView
+        implements AllAppsSearchBarController.PayloadResultHandler<Bundle> {
+
+    Intent mIntent;
+    AllAppsSearchPlugin mPlugin;
+
+    public ThumbnailSearchResultView(Context context) {
+        super(context);
+    }
+
+    public ThumbnailSearchResultView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public ThumbnailSearchResultView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    private void handleSelection(int eventType) {
+        Launcher launcher = Launcher.getLauncher(getContext());
+        launcher.startActivitySafely(this, mIntent, null);
+
+        SearchTargetEvent event = new SearchTargetEvent(
+                SearchTarget.ItemType.SCREENSHOT, eventType);
+        if (mPlugin != null) {
+            mPlugin.notifySearchTargetEvent(event);
+        }
+    }
+
+    @Override
+    public void applyAdapterInfo(AdapterItemWithPayload<Bundle> adapterItem) {
+        RoundedBitmapDrawable drawable = RoundedBitmapDrawableFactory.create(null,
+                (Bitmap) adapterItem.getPayload().getParcelable("bitmap"));
+        drawable.setCornerRadius(Themes.getDialogCornerRadius(getContext()));
+        setImageDrawable(drawable);
+        mIntent = new Intent(Intent.ACTION_VIEW)
+                .setData(Uri.parse(adapterItem.getPayload().getString("uri")))
+                .setType("image/*")
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        mPlugin = adapterItem.getPlugin();
+        adapterItem.setSelectionHandler(this::handleSelection);
+    }
+}
diff --git a/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java b/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
index c6b8300499..9144976f98 100644
--- a/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
+++ b/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
@@ -26,14 +26,52 @@ import java.util.List;
 public class SearchTarget implements Comparable<SearchTarget> {
 
     public enum ViewType {
+
+        /**
+         * Consists of N number of icons. (N: launcher column count)
+         */
         TOP_HIT(0),
+
+        /**
+         * Consists of 1 icon and two subsidiary icons.
+         */
         HERO(1),
+
+        /**
+         * Main/sub/breadcrumb texts are rendered.
+         */
         DETAIL(2),
+
+        /**
+         * Consists of an icon, three detail strings.
+         */
         ROW(3),
+
+        /**
+         * Consists of an icon, three detail strings and a button.
+         */
         ROW_WITH_BUTTON(4),
+
+        /**
+         * Consists of a single slice view
+         */
         SLICE(5),
+
+        /**
+         * Similar to hero section.
+         */
         SHORTCUT(6),
-        PEOPLE(7);
+
+        /**
+         * Person icon and handling app icons are rendered.
+         */
+        PEOPLE(7),
+
+        /**
+         * N number of 1x1 ratio thumbnail is rendered.
+         * (current N = 3)
+         */
+        THUMBNAIL(8);
 
         private final int mId;
         ViewType(int id) {
@@ -52,9 +90,12 @@ public class SearchTarget implements Comparable<SearchTarget> {
         APP(3, "", ViewType.TOP_HIT),
         APP_HERO(4, "", ViewType.HERO),
         SHORTCUT(5, "Shortcuts", ViewType.SHORTCUT),
-        PEOPLE(6, "People", ViewType.PEOPLE);
+        PEOPLE(6, "People", ViewType.PEOPLE),
+        SCREENSHOT(7, "Screenshots", ViewType.THUMBNAIL);
 
         private final int mId;
+
+        /** Used to render section title. */
         private final String mTitle;
         private final ViewType mViewType;
 
-- 
GitLab


From 573b9ca9ada0b3b0dff7daeeff8acba7d4d95229 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 22 Sep 2020 12:13:35 -0700
Subject: [PATCH 0170/1664] Moving package installer initialization to worker
 thread

Bug: 169002215
Change-Id: Ie7b9a1eb27b634455e3d43da411037642efd0534
---
 .../android/launcher3/LauncherAppState.java   |  2 +-
 .../launcher3/SessionCommitReceiver.java      |  8 +++
 .../launcher3/pm/InstallSessionHelper.java    | 51 +++++++++++--------
 .../launcher3/pm/InstallSessionTracker.java   |  3 ++
 4 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index bfe327e40d..a4181c53c9 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -105,7 +105,7 @@ public class LauncherAppState {
         new Handler().post( () -> mInvariantDeviceProfile.verifyConfigChangedInBackground(context));
 
         mInstallSessionTracker = InstallSessionHelper.INSTANCE.get(context)
-                .registerInstallTracker(mModel, MODEL_EXECUTOR);
+                .registerInstallTracker(mModel);
 
         // Register an observer to rebind the notification listener when dots are re-enabled.
         mNotificationDotsObserver =
diff --git a/src/com/android/launcher3/SessionCommitReceiver.java b/src/com/android/launcher3/SessionCommitReceiver.java
index 007e5f5370..1bbbb2b59e 100644
--- a/src/com/android/launcher3/SessionCommitReceiver.java
+++ b/src/com/android/launcher3/SessionCommitReceiver.java
@@ -25,8 +25,11 @@ import android.content.pm.PackageManager;
 import android.os.UserHandle;
 import android.text.TextUtils;
 
+import androidx.annotation.WorkerThread;
+
 import com.android.launcher3.model.ItemInstallQueue;
 import com.android.launcher3.pm.InstallSessionHelper;
+import com.android.launcher3.util.Executors;
 
 /**
  * BroadcastReceiver to handle session commit intent.
@@ -38,6 +41,11 @@ public class SessionCommitReceiver extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
+        Executors.MODEL_EXECUTOR.execute(() -> processIntent(context, intent));
+    }
+
+    @WorkerThread
+    private static void processIntent(Context context, Intent intent) {
         if (!isEnabled(context)) {
             // User has decided to not add icons on homescreen.
             return;
diff --git a/src/com/android/launcher3/pm/InstallSessionHelper.java b/src/com/android/launcher3/pm/InstallSessionHelper.java
index 753a6dd85e..fa25114d49 100644
--- a/src/com/android/launcher3/pm/InstallSessionHelper.java
+++ b/src/com/android/launcher3/pm/InstallSessionHelper.java
@@ -17,6 +17,7 @@
 package com.android.launcher3.pm;
 
 import static com.android.launcher3.Utilities.getPrefs;
+import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
@@ -31,6 +32,7 @@ import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
+import androidx.annotation.WorkerThread;
 
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.SessionCommitReceiver;
@@ -39,10 +41,10 @@ import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.ItemInstallQueue;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.IntSet;
-import com.android.launcher3.util.LooperExecutor;
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.launcher3.util.PackageUserKey;
+import com.android.launcher3.util.Preconditions;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -65,27 +67,27 @@ public class InstallSessionHelper {
 
     private final LauncherApps mLauncherApps;
     private final Context mAppContext;
-    private final IntSet mPromiseIconIds;
 
     private final PackageInstaller mInstaller;
     private final HashMap<String, Boolean> mSessionVerifiedMap = new HashMap<>();
 
+    private IntSet mPromiseIconIds;
+
     public InstallSessionHelper(Context context) {
         mInstaller = context.getPackageManager().getPackageInstaller();
         mAppContext = context.getApplicationContext();
         mLauncherApps = context.getSystemService(LauncherApps.class);
-
-        mPromiseIconIds = IntSet.wrap(IntArray.fromConcatString(
-                getPrefs(context).getString(PROMISE_ICON_IDS, "")));
-
-        cleanUpPromiseIconIds();
     }
 
-    public static UserHandle getUserHandle(SessionInfo info) {
-        return Utilities.ATLEAST_Q ? info.getUser() : Process.myUserHandle();
-    }
+    @WorkerThread
+    private IntSet getPromiseIconIds() {
+        Preconditions.assertWorkerThread();
+        if (mPromiseIconIds != null) {
+            return mPromiseIconIds;
+        }
+        mPromiseIconIds = IntSet.wrap(IntArray.fromConcatString(
+                getPrefs(mAppContext).getString(PROMISE_ICON_IDS, "")));
 
-    protected void cleanUpPromiseIconIds() {
         IntArray existingIds = new IntArray();
         for (SessionInfo info : getActiveSessions().values()) {
             existingIds.add(info.getSessionId());
@@ -100,6 +102,7 @@ public class InstallSessionHelper {
         for (int i = idsToRemove.size() - 1; i >= 0; --i) {
             mPromiseIconIds.getArray().removeValue(idsToRemove.get(i));
         }
+        return mPromiseIconIds;
     }
 
     public HashMap<PackageUserKey, SessionInfo> getActiveSessions() {
@@ -126,7 +129,7 @@ public class InstallSessionHelper {
 
     private void updatePromiseIconPrefs() {
         getPrefs(mAppContext).edit()
-                .putString(PROMISE_ICON_IDS, mPromiseIconIds.getArray().toConcatString())
+                .putString(PROMISE_ICON_IDS, getPromiseIconIds().getArray().toConcatString())
                 .apply();
     }
 
@@ -184,13 +187,15 @@ public class InstallSessionHelper {
         return info.getInstallReason() == PackageManager.INSTALL_REASON_DEVICE_RESTORE;
     }
 
+    @WorkerThread
     public boolean promiseIconAddedForId(int sessionId) {
-        return mPromiseIconIds.contains(sessionId);
+        return getPromiseIconIds().contains(sessionId);
     }
 
+    @WorkerThread
     public void removePromiseIconId(int sessionId) {
-        if (mPromiseIconIds.contains(sessionId)) {
-            mPromiseIconIds.getArray().removeValue(sessionId);
+        if (promiseIconAddedForId(sessionId)) {
+            getPromiseIconIds().getArray().removeValue(sessionId);
             updatePromiseIconPrefs();
         }
     }
@@ -203,6 +208,7 @@ public class InstallSessionHelper {
      * - The app is not already installed
      * - A promise icon for the session has not already been created
      */
+    @WorkerThread
     void tryQueuePromiseAppIcon(PackageInstaller.SessionInfo sessionInfo) {
         if (FeatureFlags.PROMISE_APPS_NEW_INSTALLS.get()
                 && SessionCommitReceiver.isEnabled(mAppContext)
@@ -210,25 +216,24 @@ public class InstallSessionHelper {
                 && sessionInfo.getInstallReason() == PackageManager.INSTALL_REASON_USER
                 && sessionInfo.getAppIcon() != null
                 && !TextUtils.isEmpty(sessionInfo.getAppLabel())
-                && !mPromiseIconIds.contains(sessionInfo.getSessionId())
+                && !promiseIconAddedForId(sessionInfo.getSessionId())
                 && new PackageManagerHelper(mAppContext).getApplicationInfo(
                         sessionInfo.getAppPackageName(), getUserHandle(sessionInfo), 0) == null) {
             ItemInstallQueue.INSTANCE.get(mAppContext)
                     .queueItem(sessionInfo.getAppPackageName(), getUserHandle(sessionInfo));
 
-            mPromiseIconIds.add(sessionInfo.getSessionId());
+            getPromiseIconIds().add(sessionInfo.getSessionId());
             updatePromiseIconPrefs();
         }
     }
 
-    public InstallSessionTracker registerInstallTracker(
-            InstallSessionTracker.Callback callback, LooperExecutor executor) {
+    public InstallSessionTracker registerInstallTracker(InstallSessionTracker.Callback callback) {
         InstallSessionTracker tracker = new InstallSessionTracker(this, callback);
 
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
-            mInstaller.registerSessionCallback(tracker, executor.getHandler());
+            mInstaller.registerSessionCallback(tracker, MODEL_EXECUTOR.getHandler());
         } else {
-            mLauncherApps.registerPackageInstallerSessionCallback(executor, tracker);
+            mLauncherApps.registerPackageInstallerSessionCallback(MODEL_EXECUTOR, tracker);
         }
         return tracker;
     }
@@ -240,4 +245,8 @@ public class InstallSessionHelper {
             mLauncherApps.unregisterPackageInstallerSessionCallback(tracker);
         }
     }
+
+    public static UserHandle getUserHandle(SessionInfo info) {
+        return Utilities.ATLEAST_Q ? info.getUser() : Process.myUserHandle();
+    }
 }
diff --git a/src/com/android/launcher3/pm/InstallSessionTracker.java b/src/com/android/launcher3/pm/InstallSessionTracker.java
index eb3ca7366b..b0b907ab19 100644
--- a/src/com/android/launcher3/pm/InstallSessionTracker.java
+++ b/src/com/android/launcher3/pm/InstallSessionTracker.java
@@ -24,8 +24,11 @@ import android.content.pm.PackageInstaller.SessionInfo;
 import android.os.UserHandle;
 import android.util.SparseArray;
 
+import androidx.annotation.WorkerThread;
+
 import com.android.launcher3.util.PackageUserKey;
 
+@WorkerThread
 public class InstallSessionTracker extends PackageInstaller.SessionCallback {
 
     // Lazily initialized
-- 
GitLab


From e806f95349ce2f34250fe4de5b368e90b3112d6c Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Tue, 22 Sep 2020 11:05:20 -0700
Subject: [PATCH 0171/1664] Additional logs to resolve flaky work profile

Bug: 159671700
Change-Id: I9bed08ef89b06f79ee1e6a4140a880eeeb76ee75
---
 src/com/android/launcher3/pm/UserCache.java         | 5 +++++
 src/com/android/launcher3/testing/TestProtocol.java | 1 +
 tests/src/com/android/launcher3/ui/WorkTabTest.java | 6 ++++++
 3 files changed, 12 insertions(+)

diff --git a/src/com/android/launcher3/pm/UserCache.java b/src/com/android/launcher3/pm/UserCache.java
index 5aab41a8a2..5ade22be5e 100644
--- a/src/com/android/launcher3/pm/UserCache.java
+++ b/src/com/android/launcher3/pm/UserCache.java
@@ -21,8 +21,10 @@ import android.content.Intent;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.util.ArrayMap;
+import android.util.Log;
 import android.util.LongSparseArray;
 
+import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.launcher3.util.SafeCloseable;
 import com.android.launcher3.util.SimpleBroadcastReceiver;
@@ -58,6 +60,9 @@ public class UserCache {
     private void onUsersChanged(Intent intent) {
         enableAndResetCache();
         mUserChangeListeners.forEach(Runnable::run);
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.WORK_PROFILE_REMOVED, "profile changed", new Exception());
+        }
     }
 
     /**
diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java
index 7f7635561d..b2d008119e 100644
--- a/src/com/android/launcher3/testing/TestProtocol.java
+++ b/src/com/android/launcher3/testing/TestProtocol.java
@@ -106,4 +106,5 @@ public final class TestProtocol {
     public static final String PAUSE_NOT_DETECTED = "b/139891609";
     public static final String OVERIEW_NOT_ALLAPPS = "b/156095088";
     public static final String NO_SWIPE_TO_HOME = "b/158017601";
+    public static final String WORK_PROFILE_REMOVED = "b/159671700";
 }
diff --git a/tests/src/com/android/launcher3/ui/WorkTabTest.java b/tests/src/com/android/launcher3/ui/WorkTabTest.java
index e51c1cad37..488e763f94 100644
--- a/tests/src/com/android/launcher3/ui/WorkTabTest.java
+++ b/tests/src/com/android/launcher3/ui/WorkTabTest.java
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertTrue;
 import android.os.Process;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.util.Log;
 import android.widget.TextView;
 
 import androidx.test.filters.LargeTest;
@@ -34,6 +35,7 @@ import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.allapps.AllAppsPagedView;
 import com.android.launcher3.allapps.WorkModeSwitch;
 import com.android.launcher3.dragndrop.DragLayer;
+import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.views.WorkEduView;
 
 import org.junit.After;
@@ -133,6 +135,10 @@ public class WorkTabTest extends AbstractLauncherUiTest {
             workEduView.findViewById(R.id.proceed).callOnClick();
         });
 
+        executeOnLauncher(launcher -> Log.d(TestProtocol.WORK_PROFILE_REMOVED,
+                "work profile status (" + mProfileUserId + ") :"
+                        + launcher.getAppsView().isWorkTabVisible()));
+
         // verify work edu is seen next
         waitForLauncherCondition("Launcher did not show the next edu screen", l ->
                 ((AllAppsPagedView) l.getAppsView().getContentView()).getCurrentPage() == WORK_PAGE
-- 
GitLab


From 649122edc0f9ea1690fc78e8707523d2cf1e3ba0 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 22 Sep 2020 23:43:51 +0000
Subject: [PATCH 0172/1664] Revert "Disabling testToast on virtual devices"

This reverts commit f6385576d51a4bba48f5e9760a54d9fc33aa8b7f.

Reason for revert: Test

Change-Id: I9caec3b2d64995b31f3dbbf5cb2865f4e5941afe
---
 .../com/android/quickstep/DigitalWellBeingToastTest.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java b/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java
index ccfa3fc0fb..9a053f2f62 100644
--- a/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java
+++ b/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java
@@ -3,6 +3,8 @@ package com.android.quickstep;
 import static androidx.test.InstrumentationRegistry.getInstrumentation;
 
 import static com.android.launcher3.LauncherState.OVERVIEW;
+import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUBMIT;
+import static com.android.launcher3.util.rule.TestStabilityRule.UNBUNDLED_POSTSUBMIT;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -11,12 +13,12 @@ import static org.junit.Assert.assertTrue;
 import android.app.PendingIntent;
 import android.app.usage.UsageStatsManager;
 import android.content.Intent;
-import android.os.Build;
 
 import androidx.test.filters.LargeTest;
 import androidx.test.runner.AndroidJUnit4;
 
 import com.android.launcher3.Launcher;
+import com.android.launcher3.util.rule.TestStabilityRule;
 import com.android.quickstep.views.DigitalWellBeingToast;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
@@ -33,10 +35,9 @@ public class DigitalWellBeingToastTest extends AbstractQuickStepTest {
             resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR);
 
     @Test
+    // b/150303529
+    @TestStabilityRule.Stability(flavors = UNBUNDLED_POSTSUBMIT | PLATFORM_POSTSUBMIT)
     public void testToast() throws Exception {
-        // b/150303529
-        if (Build.MODEL.contains("Cuttlefish")) return;
-
         startAppFast(CALCULATOR_PACKAGE);
 
         final UsageStatsManager usageStatsManager =
-- 
GitLab


From 407ff592720e5f4a0f9c26f264b24ed539f3c589 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Sun, 9 Aug 2020 22:01:28 -0700
Subject: [PATCH 0173/1664] [DO NOT MERGE][NPE] check RecentsView exists before
 using it

Bug: 162176024
Change-Id: I8fe2ed42836bd6645f600b223e81526840ead557
---
 .../src/com/android/quickstep/views/TaskView.java            | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 2058a7f375..3621658b79 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
@@ -419,7 +419,10 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
                             }
                         }, resultCallbackHandler);
             }
-            getRecentsView().onTaskLaunched(mTask);
+            RecentsView recentsView = getRecentsView();
+            if (recentsView != null) {
+                recentsView.onTaskLaunched(mTask);
+            }
         }
     }
 
-- 
GitLab


From 9b947993be58725b65da3d7670643ac7bebd34c3 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Tue, 22 Sep 2020 14:17:03 -0700
Subject: [PATCH 0174/1664] [DO NOT MERGE] Encode launch location for hotseat
 items

Bug: 162003157
Test: Manual
Change-Id: I18f8f3f431dbabb3d22898d27d70c8730ad0150f
---
 src/com/android/launcher3/model/AppLaunchTracker.java | 1 +
 src/com/android/launcher3/touch/ItemClickHandler.java | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/src/com/android/launcher3/model/AppLaunchTracker.java b/src/com/android/launcher3/model/AppLaunchTracker.java
index 629a0ee496..906c2e018b 100644
--- a/src/com/android/launcher3/model/AppLaunchTracker.java
+++ b/src/com/android/launcher3/model/AppLaunchTracker.java
@@ -41,6 +41,7 @@ public class AppLaunchTracker implements ResourceBasedOverride {
     public static final String CONTAINER_PREDICTIONS = Integer.toString(ContainerType.PREDICTION);
     public static final String CONTAINER_SEARCH = Integer.toString(ContainerType.SEARCHRESULT);
     public static final String CONTAINER_OVERVIEW = Integer.toString(ContainerType.OVERVIEW);
+    public static final String CONTAINER_HOTSEAT = Integer.toString(ContainerType.HOTSEAT);
 
 
     public static final MainThreadInitializedObject<AppLaunchTracker> INSTANCE =
diff --git a/src/com/android/launcher3/touch/ItemClickHandler.java b/src/com/android/launcher3/touch/ItemClickHandler.java
index 848666674d..f50b2b30de 100644
--- a/src/com/android/launcher3/touch/ItemClickHandler.java
+++ b/src/com/android/launcher3/touch/ItemClickHandler.java
@@ -19,6 +19,7 @@ import static com.android.launcher3.Launcher.REQUEST_BIND_PENDING_APPWIDGET;
 import static com.android.launcher3.Launcher.REQUEST_RECONFIGURE_APPWIDGET;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_FOLDER_OPEN;
 import static com.android.launcher3.model.AppLaunchTracker.CONTAINER_ALL_APPS;
+import static com.android.launcher3.model.AppLaunchTracker.CONTAINER_HOTSEAT;
 import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_DISABLED_BY_PUBLISHER;
 import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_DISABLED_LOCKED_USER;
 import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_DISABLED_QUIET_USER;
@@ -42,6 +43,7 @@ import androidx.annotation.Nullable;
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppWidgetProviderInfo;
+import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.folder.Folder;
@@ -240,6 +242,12 @@ public class ItemClickHandler {
             }
         }
 
+        if (sourceContainer == null && (
+                shortcut.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT
+                        || shortcut.container
+                        == LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION)) {
+            sourceContainer = CONTAINER_HOTSEAT;
+        }
         // Start activities
         startAppShortcutOrInfoActivity(v, shortcut, launcher, sourceContainer);
     }
-- 
GitLab


From 657f396c9c12bb8b76ae599879be535ce022795b Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 22 Sep 2020 16:36:34 -0700
Subject: [PATCH 0175/1664] Scale task view in TaskViewSimulator before
 translating it

The pivot is supposed to be at the center of the task view, hence why
we use width / 2, height / 2, but technically this is assuming that
translation == 0. This error isn't normally noticeable because scale
is 1 when the task is centered, so the pivot doesn't matter. By
scaling before translating, we ensure the pivot doesn't depend on
the translation.

Test: scroll side to side while swiping up from an app, ensure the
running window scales down properly; when you let go to enter recents
while the second task is centermost, the running window ends in the
exact position as the first TaskView that replaces it.

Fixes: 169103357
Change-Id: Ica53c6b6fb073304c29f26d30fb829bb9d282185
---
 .../src/com/android/quickstep/util/TaskViewSimulator.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index 903e87a7f8..081413e4f3 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -297,9 +297,9 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
         mMatrix.postTranslate(insets.left, insets.top);
         mMatrix.postScale(scale, scale);
 
-        // Apply TaskView matrix: translate, scale, scroll
-        mMatrix.postTranslate(mTaskRect.left, mTaskRect.top + mOffsetY);
+        // Apply TaskView matrix: scale, translate, scroll
         mMatrix.postScale(mCurveScale, mCurveScale, taskWidth / 2, taskHeight / 2);
+        mMatrix.postTranslate(mTaskRect.left, mTaskRect.top + mOffsetY);
         mOrientationState.getOrientationHandler().set(
                 mMatrix, MATRIX_POST_TRANSLATE, mScrollState.scroll);
 
-- 
GitLab


From 99d6c2ff0d28e6079de64e0a343067755cbccbde Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Tue, 22 Sep 2020 18:28:22 -0700
Subject: [PATCH 0176/1664] Update hero app shortcuts with icon

- set appropriate click handler for recycled app icons

Bug: 168810843
Bug: 168733655
Test: Manual
Change-Id: Ic644deb4ac6c7a1cb9a2c3b75f7e2ac86380a9d0
---
 .../launcher3/allapps/AllAppsGridAdapter.java |  4 +++
 .../launcher3/views/HeroSearchResultView.java | 29 ++++++++++++++-----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index e08bd5ba3b..0abf84a798 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -495,6 +495,10 @@ public class AllAppsGridAdapter extends
                     });
                     withPayload.setSelectionHandler(selectionHandler);
                 }
+                else {
+                    icon.setOnClickListener(mOnIconClickListener);
+                    icon.setOnLongClickListener(mOnIconLongClickListener);
+                }
                 break;
             case VIEW_TYPE_EMPTY_SEARCH:
                 TextView emptyViewText = (TextView) holder.itemView;
diff --git a/src/com/android/launcher3/views/HeroSearchResultView.java b/src/com/android/launcher3/views/HeroSearchResultView.java
index a8e1c6b30c..845c6de824 100644
--- a/src/com/android/launcher3/views/HeroSearchResultView.java
+++ b/src/com/android/launcher3/views/HeroSearchResultView.java
@@ -16,12 +16,16 @@
 package com.android.launcher3.views;
 
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS;
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ShortcutInfo;
 import android.graphics.Point;
 import android.os.Bundle;
 import android.util.AttributeSet;
+import android.util.Pair;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
@@ -31,9 +35,10 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.DragSource;
 import com.android.launcher3.DropTarget;
 import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
-import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+import com.android.launcher3.allapps.search.AllAppsSearchBarController.PayloadResultHandler;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.dragndrop.DraggableView;
 import com.android.launcher3.graphics.DragPreviewProvider;
@@ -53,7 +58,7 @@ import java.util.List;
  * A view representing a high confidence app search result that includes shortcuts
  */
 public class HeroSearchResultView extends LinearLayout implements DragSource,
-        AllAppsSearchBarController.PayloadResultHandler<List<ItemInfoWithIcon>> {
+        PayloadResultHandler<List<Pair<ShortcutInfo, ItemInfoWithIcon>>> {
 
     public static final int MAX_SHORTCUTS_COUNT = 2;
     BubbleTextView mBubbleTextView;
@@ -119,15 +124,25 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
      * Apply {@link ItemInfo} for appIcon and shortcut Icons
      */
     @Override
-    public void applyAdapterInfo(AdapterItemWithPayload<List<ItemInfoWithIcon>> adapterItem) {
+    public void applyAdapterInfo(
+            AdapterItemWithPayload<List<Pair<ShortcutInfo, ItemInfoWithIcon>>> adapterItem) {
         mBubbleTextView.applyFromApplicationInfo(adapterItem.appInfo);
         mIconView.setBackground(mBubbleTextView.getIcon());
         mIconView.setTag(adapterItem.appInfo);
-        List<ItemInfoWithIcon> shorcutInfos = adapterItem.getPayload();
+        List<Pair<ShortcutInfo, ItemInfoWithIcon>> shortcutDetails = adapterItem.getPayload();
+        LauncherAppState appState = LauncherAppState.getInstance(getContext());
         for (int i = 0; i < mDeepShortcutTextViews.length; i++) {
-            mDeepShortcutTextViews[i].setVisibility(shorcutInfos.size() > i ? VISIBLE : GONE);
-            if (i < shorcutInfos.size()) {
-                mDeepShortcutTextViews[i].applyFromItemInfoWithIcon(shorcutInfos.get(i));
+            BubbleTextView shortcutView = mDeepShortcutTextViews[i];
+            mDeepShortcutTextViews[i].setVisibility(shortcutDetails.size() > i ? VISIBLE : GONE);
+            if (i < shortcutDetails.size()) {
+                Pair<ShortcutInfo, ItemInfoWithIcon> p = shortcutDetails.get(i);
+                //apply ItemInfo and prepare view
+                shortcutView.applyFromItemInfoWithIcon(p.second);
+                MODEL_EXECUTOR.execute(() -> {
+                    // load unbadged shortcut in background and update view when icon ready
+                    appState.getIconCache().getUnbadgedShortcutIcon(p.second, p.first);
+                    MAIN_EXECUTOR.post(() -> shortcutView.reapplyItemInfo(p.second));
+                });
             }
         }
         mPlugin = adapterItem.getPlugin();
-- 
GitLab


From f01064953b4106b86ea18a0925dbb5f4247ce656 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Tue, 22 Sep 2020 20:52:45 -0700
Subject: [PATCH 0177/1664] Track search results with position and search
 Identifier

Bug: 169087008
Test: Manual
Change-Id: I54c74093b90e5aea03a7810f55fcc32f0ddf8dda
---
 .../launcher3/allapps/AllAppsGridAdapter.java | 47 ++++++++++++-------
 .../search/AllAppsSearchBarController.java    | 40 ++++++++++++++++
 .../launcher3/views/HeroSearchResultView.java | 12 +++--
 .../views/SearchResultPeopleView.java         | 20 +++++---
 .../launcher3/views/SearchResultPlayItem.java |  9 +++-
 .../launcher3/views/SearchResultShortcut.java | 11 ++++-
 .../views/SearchSectionHeaderView.java        |  5 ++
 .../views/SearchSettingsRowView.java          |  9 +++-
 .../views/ThumbnailSearchResultView.java      | 10 +++-
 .../systemui/plugins/AllAppsSearchPlugin.java |  2 +-
 .../systemui/plugins/shared/SearchTarget.java |  4 +-
 .../plugins/shared/SearchTargetEvent.java     |  8 +++-
 12 files changed, 141 insertions(+), 36 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index 0abf84a798..f01f90be11 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -200,6 +200,7 @@ public class AllAppsGridAdapter extends
      */
     public static class AdapterItemWithPayload<T> extends AdapterItem {
         private T mPayload;
+        private String mSearchSessionId;
         private AllAppsSearchPlugin mPlugin;
         private IntConsumer mSelectionHandler;
 
@@ -221,6 +222,14 @@ public class AllAppsGridAdapter extends
             mSelectionHandler = runnable;
         }
 
+        public void setSearchSessionId(String searchSessionId) {
+            mSearchSessionId = searchSessionId;
+        }
+
+        public String getSearchSessionId() {
+            return mSearchSessionId;
+        }
+
         public IntConsumer getSelectionHandler() {
             return mSelectionHandler;
         }
@@ -228,6 +237,8 @@ public class AllAppsGridAdapter extends
         public T getPayload() {
             return mPayload;
         }
+
+
     }
 
     /**
@@ -476,24 +487,23 @@ public class AllAppsGridAdapter extends
                 //TODO: replace with custom TopHitBubbleTextView with support for both shortcut
                 // and apps
                 if (adapterItem instanceof AdapterItemWithPayload) {
-                    AdapterItemWithPayload withPayload = (AdapterItemWithPayload) adapterItem;
-                    IntConsumer selectionHandler = type -> {
+                    AdapterItemWithPayload item = (AdapterItemWithPayload) adapterItem;
+                    item.setSelectionHandler(type -> {
                         SearchTargetEvent e = new SearchTargetEvent(SearchTarget.ItemType.APP,
-                                type);
+                                type, item.position, item.getSearchSessionId());
                         e.bundle = HeroSearchResultView.getAppBundle(info);
-                        if (withPayload.getPlugin() != null) {
-                            withPayload.getPlugin().notifySearchTargetEvent(e);
+                        if (item.getPlugin() != null) {
+                            item.getPlugin().notifySearchTargetEvent(e);
                         }
-                    };
+                    });
                     icon.setOnClickListener(view -> {
-                        selectionHandler.accept(SearchTargetEvent.SELECT);
+                        item.getSelectionHandler().accept(SearchTargetEvent.SELECT);
                         mOnIconClickListener.onClick(view);
                     });
                     icon.setOnLongClickListener(view -> {
-                        selectionHandler.accept(SearchTargetEvent.LONG_PRESS);
+                        item.getSelectionHandler().accept(SearchTargetEvent.SELECT);
                         return mOnIconLongClickListener.onLongClick(view);
                     });
-                    withPayload.setSelectionHandler(selectionHandler);
                 }
                 else {
                     icon.setOnClickListener(mOnIconClickListener);
@@ -516,20 +526,22 @@ public class AllAppsGridAdapter extends
                 break;
             case VIEW_TYPE_SEARCH_SLICE:
                 SliceView sliceView = (SliceView) holder.itemView;
-                AdapterItemWithPayload<Uri> item =
+                AdapterItemWithPayload<Uri> slicePayload =
                         (AdapterItemWithPayload<Uri>) mApps.getAdapterItems().get(position);
                 sliceView.setOnSliceActionListener((info1, s) -> {
-                    if (item.getPlugin() != null) {
+                    if (slicePayload.getPlugin() != null) {
                         SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
                                 SearchTarget.ItemType.SETTINGS_SLICE,
-                                SearchTargetEvent.CHILD_SELECT);
+                                SearchTargetEvent.CHILD_SELECT, slicePayload.position,
+                                slicePayload.getSearchSessionId());
                         searchTargetEvent.bundle = new Bundle();
-                        searchTargetEvent.bundle.putParcelable("uri", item.getPayload());
-                        item.getPlugin().notifySearchTargetEvent(searchTargetEvent);
+                        searchTargetEvent.bundle.putParcelable("uri", slicePayload.getPayload());
+                        slicePayload.getPlugin().notifySearchTargetEvent(searchTargetEvent);
                     }
                 });
                 try {
-                    LiveData<Slice> liveData = SliceLiveData.fromUri(mLauncher, item.getPayload());
+                    LiveData<Slice> liveData = SliceLiveData.fromUri(mLauncher,
+                            slicePayload.getPayload());
                     liveData.observe((Launcher) mLauncher, sliceView);
                     sliceView.setTag(liveData);
                 } catch (Exception ignored) {
@@ -542,9 +554,10 @@ public class AllAppsGridAdapter extends
             case VIEW_TYPE_SEARCH_SHORTCUT:
             case VIEW_TYPE_SEARCH_PEOPLE:
             case VIEW_TYPE_SEARCH_THUMBNAIL:
+                AdapterItemWithPayload item =
+                        (AdapterItemWithPayload) mApps.getAdapterItems().get(position);
                 PayloadResultHandler payloadResultView = (PayloadResultHandler) holder.itemView;
-                payloadResultView.applyAdapterInfo(
-                        (AdapterItemWithPayload) mApps.getAdapterItems().get(position));
+                payloadResultView.setup(item);
                 break;
             case VIEW_TYPE_ALL_APPS_DIVIDER:
                 // nothing to do
diff --git a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
index 3320189a1d..d7fa5bc479 100644
--- a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
+++ b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
@@ -35,6 +35,8 @@ import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.systemui.plugins.AllAppsSearchPlugin;
+import com.android.systemui.plugins.shared.SearchTarget;
+import com.android.systemui.plugins.shared.SearchTargetEvent;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -213,6 +215,44 @@ public class AllAppsSearchBarController
         /**
          * Updates View using Adapter's payload
          */
+
+        default void setup(AdapterItemWithPayload<T> adapterItemWithPayload) {
+            Object[] targetInfo = getTargetInfo();
+            if (targetInfo != null) {
+                targetInfo[0] = adapterItemWithPayload.getSearchSessionId();
+                targetInfo[1] = adapterItemWithPayload.position;
+            }
+            applyAdapterInfo(adapterItemWithPayload);
+        }
+
         void applyAdapterInfo(AdapterItemWithPayload<T> adapterItemWithPayload);
+
+        /**
+         * Gets object created by {@link PayloadResultHandler#createTargetInfo()}
+         */
+        Object[] getTargetInfo();
+
+        /**
+         * Creates a wrapper object to hold searchSessionId and item position
+         */
+        default Object[] createTargetInfo() {
+            return new Object[2];
+        }
+
+        /**
+         * Generates a SearchTargetEvent object for a PayloadHandlerView
+         */
+        default SearchTargetEvent getSearchTargetEvent(SearchTarget.ItemType itemType,
+                int eventType) {
+            Object[] targetInfo = getTargetInfo();
+            if (targetInfo == null) return null;
+
+            String searchSessionId = (String) targetInfo[0];
+            int position = (int) targetInfo[1];
+            return new SearchTargetEvent(itemType, eventType,
+                    position, searchSessionId);
+        }
     }
+
+
 }
\ No newline at end of file
diff --git a/src/com/android/launcher3/views/HeroSearchResultView.java b/src/com/android/launcher3/views/HeroSearchResultView.java
index 845c6de824..94b9ca1484 100644
--- a/src/com/android/launcher3/views/HeroSearchResultView.java
+++ b/src/com/android/launcher3/views/HeroSearchResultView.java
@@ -61,6 +61,7 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
         PayloadResultHandler<List<Pair<ShortcutInfo, ItemInfoWithIcon>>> {
 
     public static final int MAX_SHORTCUTS_COUNT = 2;
+    private final Object[] mTargetInfo = createTargetInfo();
     BubbleTextView mBubbleTextView;
     View mIconView;
     BubbleTextView[] mDeepShortcutTextViews = new BubbleTextView[2];
@@ -107,7 +108,7 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
                             grid.allAppsIconSizePx));
             bubbleTextView.setOnClickListener(view -> {
                 WorkspaceItemInfo itemInfo = (WorkspaceItemInfo) bubbleTextView.getTag();
-                SearchTargetEvent event = new SearchTargetEvent(
+                SearchTargetEvent event = getSearchTargetEvent(
                         SearchTarget.ItemType.APP_HERO,
                         SearchTargetEvent.CHILD_SELECT);
                 event.bundle = getAppBundle(itemInfo);
@@ -149,6 +150,11 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
         adapterItem.setSelectionHandler(this::handleSelection);
     }
 
+    @Override
+    public Object[] getTargetInfo() {
+        return mTargetInfo;
+    }
+
     @Override
     public void onDropCompleted(View target, DropTarget.DragObject d, boolean success) {
         mBubbleTextView.setVisibility(VISIBLE);
@@ -184,7 +190,7 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
             mLauncher.getWorkspace().beginDragShared(mContainer.mBubbleTextView,
                     draggableView, mContainer, itemInfo, previewProvider, new DragOptions());
 
-            SearchTargetEvent event = new SearchTargetEvent(
+            SearchTargetEvent event = mContainer.getSearchTargetEvent(
                     SearchTarget.ItemType.APP_HERO, SearchTargetEvent.LONG_PRESS);
             event.bundle = getAppBundle(itemInfo);
             if (mContainer.mPlugin != null) {
@@ -201,7 +207,7 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
         Launcher launcher = Launcher.getLauncher(getContext());
         launcher.startActivitySafely(this, itemInfo.getIntent(), itemInfo);
 
-        SearchTargetEvent event = new SearchTargetEvent(
+        SearchTargetEvent event = getSearchTargetEvent(
                 SearchTarget.ItemType.APP_HERO, eventType);
         event.bundle = getAppBundle(itemInfo);
         if (mPlugin != null) {
diff --git a/src/com/android/launcher3/views/SearchResultPeopleView.java b/src/com/android/launcher3/views/SearchResultPeopleView.java
index 6e45e88b32..eacc095188 100644
--- a/src/com/android/launcher3/views/SearchResultPeopleView.java
+++ b/src/com/android/launcher3/views/SearchResultPeopleView.java
@@ -67,7 +67,7 @@ public class SearchResultPeopleView extends LinearLayout implements
     private ImageButton[] mProviderButtons = new ImageButton[3];
     private AllAppsSearchPlugin mPlugin;
     private Uri mContactUri;
-
+    private final Object[] mTargetInfo = createTargetInfo();
 
     public SearchResultPeopleView(Context context) {
         this(context, null, 0);
@@ -129,14 +129,14 @@ public class SearchResultPeopleView extends LinearLayout implements
                     Bundle provider = providers.get(i);
                     Intent intent = Intent.parseUri(provider.getString("intent_uri_str"),
                             URI_ANDROID_APP_SCHEME | URI_ALLOW_UNSAFE);
-                    setupProviderButton(button, provider, intent);
+                    setupProviderButton(button, provider, intent, adapterItemWithPayload);
                     String pkg = provider.getString("package_name");
                     UI_HELPER_EXECUTOR.post(() -> {
                         try {
                             ApplicationInfo applicationInfo = mPackageManager.getApplicationInfo(
                                     pkg, 0);
                             Drawable appIcon = applicationInfo.loadIcon(mPackageManager);
-                            MAIN_EXECUTOR.post(()-> button.setImageDrawable(appIcon));
+                            MAIN_EXECUTOR.post(() -> button.setImageDrawable(appIcon));
                         } catch (PackageManager.NameNotFoundException ignored) {
                         }
 
@@ -151,11 +151,17 @@ public class SearchResultPeopleView extends LinearLayout implements
         adapterItemWithPayload.setSelectionHandler(this::handleSelection);
     }
 
-    private void setupProviderButton(ImageButton button, Bundle provider, Intent intent) {
+    @Override
+    public Object[] getTargetInfo() {
+        return mTargetInfo;
+    }
+
+    private void setupProviderButton(ImageButton button, Bundle provider, Intent intent,
+            AllAppsGridAdapter.AdapterItem adapterItem) {
         Launcher launcher = Launcher.getLauncher(getContext());
         button.setOnClickListener(b -> {
             launcher.startActivitySafely(b, intent, null);
-            SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
+            SearchTargetEvent searchTargetEvent = getSearchTargetEvent(
                     SearchTarget.ItemType.PEOPLE,
                     SearchTargetEvent.CHILD_SELECT);
             searchTargetEvent.bundle = new Bundle();
@@ -173,8 +179,8 @@ public class SearchResultPeopleView extends LinearLayout implements
             Launcher launcher = Launcher.getLauncher(getContext());
             launcher.startActivitySafely(this, new Intent(Intent.ACTION_VIEW, mContactUri).setFlags(
                     Intent.FLAG_ACTIVITY_NEW_TASK), null);
-            SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
-                    SearchTarget.ItemType.PEOPLE, eventType);
+            SearchTargetEvent searchTargetEvent = getSearchTargetEvent(SearchTarget.ItemType.PEOPLE,
+                    eventType);
             searchTargetEvent.bundle = new Bundle();
             searchTargetEvent.bundle.putParcelable("contact_uri", mContactUri);
             if (mPlugin != null) {
diff --git a/src/com/android/launcher3/views/SearchResultPlayItem.java b/src/com/android/launcher3/views/SearchResultPlayItem.java
index 8624609f80..ff3ecc8bc3 100644
--- a/src/com/android/launcher3/views/SearchResultPlayItem.java
+++ b/src/com/android/launcher3/views/SearchResultPlayItem.java
@@ -58,6 +58,8 @@ public class SearchResultPlayItem extends LinearLayout implements
     private String mPackageName;
     private boolean mIsInstantGame;
     private AllAppsSearchPlugin mPlugin;
+    private final Object[] mTargetInfo = createTargetInfo();
+
 
     public SearchResultPlayItem(Context context) {
         this(context, null, 0);
@@ -125,6 +127,11 @@ public class SearchResultPlayItem extends LinearLayout implements
         });
     }
 
+    @Override
+    public Object[] getTargetInfo() {
+        return mTargetInfo;
+    }
+
     private void showIfNecessary(TextView textView, @Nullable String string) {
         if (string == null || string.isEmpty()) {
             textView.setVisibility(GONE);
@@ -160,7 +167,7 @@ public class SearchResultPlayItem extends LinearLayout implements
     }
 
     private void logSearchEvent(int eventType) {
-        SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
+        SearchTargetEvent searchTargetEvent = getSearchTargetEvent(
                 SearchTarget.ItemType.PLAY_RESULTS, eventType);
         searchTargetEvent.bundle = new Bundle();
         searchTargetEvent.bundle.putString("package_name", mPackageName);
diff --git a/src/com/android/launcher3/views/SearchResultShortcut.java b/src/com/android/launcher3/views/SearchResultShortcut.java
index 307cf34c7d..a409f0807f 100644
--- a/src/com/android/launcher3/views/SearchResultShortcut.java
+++ b/src/com/android/launcher3/views/SearchResultShortcut.java
@@ -50,6 +50,8 @@ public class SearchResultShortcut extends FrameLayout implements
     private View mIconView;
     private ShortcutInfo mShortcutInfo;
     private AllAppsSearchPlugin mPlugin;
+    private final Object[] mTargetInfo = createTargetInfo();
+
 
     public SearchResultShortcut(@NonNull Context context) {
         super(context);
@@ -96,12 +98,17 @@ public class SearchResultShortcut extends FrameLayout implements
         adapterItemWithPayload.setSelectionHandler(this::handleSelection);
     }
 
+    @Override
+    public Object[] getTargetInfo() {
+        return mTargetInfo;
+    }
+
     private void handleSelection(int eventType) {
         WorkspaceItemInfo itemInfo = (WorkspaceItemInfo) mBubbleTextView.getTag();
         ItemClickHandler.onClickAppShortcut(this, itemInfo, Launcher.getLauncher(getContext()));
 
-        SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
-                SearchTarget.ItemType.SHORTCUT, eventType);
+        SearchTargetEvent searchTargetEvent = getSearchTargetEvent(SearchTarget.ItemType.SHORTCUT,
+                eventType);
         searchTargetEvent.shortcut = mShortcutInfo;
         if (mPlugin != null) {
             mPlugin.notifySearchTargetEvent(searchTargetEvent);
diff --git a/src/com/android/launcher3/views/SearchSectionHeaderView.java b/src/com/android/launcher3/views/SearchSectionHeaderView.java
index d439ee3d68..0fe0a43ff5 100644
--- a/src/com/android/launcher3/views/SearchSectionHeaderView.java
+++ b/src/com/android/launcher3/views/SearchSectionHeaderView.java
@@ -52,4 +52,9 @@ public class SearchSectionHeaderView extends TextView implements
             setVisibility(INVISIBLE);
         }
     }
+
+    @Override
+    public Object[] getTargetInfo() {
+        return null;
+    }
 }
diff --git a/src/com/android/launcher3/views/SearchSettingsRowView.java b/src/com/android/launcher3/views/SearchSettingsRowView.java
index 93bcee2585..a1a0172547 100644
--- a/src/com/android/launcher3/views/SearchSettingsRowView.java
+++ b/src/com/android/launcher3/views/SearchSettingsRowView.java
@@ -48,6 +48,8 @@ public class SearchSettingsRowView extends LinearLayout implements
     private TextView mBreadcrumbsView;
     private Intent mIntent;
     private AllAppsSearchPlugin mPlugin;
+    private final Object[] mTargetInfo = createTargetInfo();
+
 
     public SearchSettingsRowView(@NonNull Context context) {
         super(context);
@@ -87,6 +89,11 @@ public class SearchSettingsRowView extends LinearLayout implements
         adapterItemWithPayload.setSelectionHandler(this::handleSelection);
     }
 
+    @Override
+    public Object[] getTargetInfo() {
+        return mTargetInfo;
+    }
+
     private void showIfAvailable(TextView view, @Nullable String string) {
         if (TextUtils.isEmpty(string)) {
             view.setVisibility(GONE);
@@ -108,7 +115,7 @@ public class SearchSettingsRowView extends LinearLayout implements
         Launcher launcher = Launcher.getLauncher(getContext());
         launcher.startActivityForResult(mIntent, 0);
 
-        SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
+        SearchTargetEvent searchTargetEvent = getSearchTargetEvent(
                 SearchTarget.ItemType.SETTINGS_ROW, eventType);
         searchTargetEvent.bundle = new Bundle();
         searchTargetEvent.bundle.putParcelable("intent", mIntent);
diff --git a/src/com/android/launcher3/views/ThumbnailSearchResultView.java b/src/com/android/launcher3/views/ThumbnailSearchResultView.java
index decc861565..1d58a063b9 100644
--- a/src/com/android/launcher3/views/ThumbnailSearchResultView.java
+++ b/src/com/android/launcher3/views/ThumbnailSearchResultView.java
@@ -39,8 +39,10 @@ import com.android.systemui.plugins.shared.SearchTargetEvent;
 public class ThumbnailSearchResultView extends androidx.appcompat.widget.AppCompatImageView
         implements AllAppsSearchBarController.PayloadResultHandler<Bundle> {
 
+    private final Object[] mTargetInfo = createTargetInfo();
     Intent mIntent;
     AllAppsSearchPlugin mPlugin;
+    int mPosition;
 
     public ThumbnailSearchResultView(Context context) {
         super(context);
@@ -58,7 +60,7 @@ public class ThumbnailSearchResultView extends androidx.appcompat.widget.AppComp
         Launcher launcher = Launcher.getLauncher(getContext());
         launcher.startActivitySafely(this, mIntent, null);
 
-        SearchTargetEvent event = new SearchTargetEvent(
+        SearchTargetEvent event = getSearchTargetEvent(
                 SearchTarget.ItemType.SCREENSHOT, eventType);
         if (mPlugin != null) {
             mPlugin.notifySearchTargetEvent(event);
@@ -67,6 +69,7 @@ public class ThumbnailSearchResultView extends androidx.appcompat.widget.AppComp
 
     @Override
     public void applyAdapterInfo(AdapterItemWithPayload<Bundle> adapterItem) {
+        mPosition = adapterItem.position;
         RoundedBitmapDrawable drawable = RoundedBitmapDrawableFactory.create(null,
                 (Bitmap) adapterItem.getPayload().getParcelable("bitmap"));
         drawable.setCornerRadius(Themes.getDialogCornerRadius(getContext()));
@@ -78,4 +81,9 @@ public class ThumbnailSearchResultView extends androidx.appcompat.widget.AppComp
         mPlugin = adapterItem.getPlugin();
         adapterItem.setSelectionHandler(this::handleSelection);
     }
+
+    @Override
+    public Object[] getTargetInfo() {
+        return mTargetInfo;
+    }
 }
diff --git a/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java b/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
index 48369a4890..aa3ab8f7e0 100644
--- a/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
+++ b/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
@@ -32,7 +32,7 @@ import java.util.function.Consumer;
 @ProvidesInterface(action = AllAppsSearchPlugin.ACTION, version = AllAppsSearchPlugin.VERSION)
 public interface AllAppsSearchPlugin extends Plugin {
     String ACTION = "com.android.systemui.action.PLUGIN_ALL_APPS_SEARCH_ACTIONS";
-    int VERSION = 6;
+    int VERSION = 7;
 
     void setup(Activity activity, View view);
 
diff --git a/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java b/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
index 9144976f98..fb8dd723bc 100644
--- a/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
+++ b/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
@@ -122,6 +122,7 @@ public class SearchTarget implements Comparable<SearchTarget> {
     public List<ShortcutInfo> shortcuts;
     public Bundle bundle;
     public float score;
+    public String mSessionId;
 
     /**
      * Constructor to create the search target. Bundle is currently temporary to hold
@@ -130,11 +131,12 @@ public class SearchTarget implements Comparable<SearchTarget> {
      *
      */
     public SearchTarget(ItemType itemType, List<ShortcutInfo> shortcuts,
-            Bundle bundle, float score) {
+            Bundle bundle, float score, String sessionId) {
         this.type = itemType;
         this.shortcuts = shortcuts;
         this.bundle = bundle;
         this.score = score;
+        this.mSessionId = sessionId;
     }
 
     @Override
diff --git a/src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java b/src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java
index ac4bc333c6..00a78de9af 100644
--- a/src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java
+++ b/src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java
@@ -31,10 +31,14 @@ public class SearchTargetEvent {
     public ShortcutInfo shortcut;
     public int eventType;
     public Bundle bundle;
-    public float score;
+    public int index;
+    public String sessionIdentifier;
 
-    public SearchTargetEvent(SearchTarget.ItemType itemType, int eventType) {
+    public SearchTargetEvent(SearchTarget.ItemType itemType, int eventType, int index,
+            String sessionId) {
         this.type = itemType;
         this.eventType = eventType;
+        this.index = index;
+        this.sessionIdentifier = sessionId;
     }
 }
-- 
GitLab


From bf6e8ffbf030b6d419b808c28335bf8a8724e9bc Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Wed, 23 Sep 2020 12:15:43 -0700
Subject: [PATCH 0178/1664] Remove widgets that no longer fit the workspace in
 their current spans.

This can happen when display size changes.
We compare span sizes of widget in the db to the min sizes of the widget
in the current display size. If the widget can no longer fit in its existing
spans, we remove it.

Bug: 168818961
Change-Id: I6b095d2eeaeda95bfa91baec89cb54660695b60b
---
 src/com/android/launcher3/model/LoaderTask.java | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index 2b4520b613..c0d5882b46 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -49,6 +49,7 @@ import android.util.LongSparseArray;
 import android.util.TimingLogger;
 
 import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.LauncherModel;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.Utilities;
@@ -306,6 +307,7 @@ public class LoaderTask implements Runnable {
         final PackageManagerHelper pmHelper = new PackageManagerHelper(context);
         final boolean isSafeMode = pmHelper.isSafeMode();
         final boolean isSdCardReady = Utilities.isBootCompleted();
+        final WidgetManagerHelper widgetHelper = new WidgetManagerHelper(context);
 
         boolean clearDb = false;
         try {
@@ -391,6 +393,7 @@ public class LoaderTask implements Runnable {
 
                 WorkspaceItemInfo info;
                 LauncherAppWidgetInfo appWidgetInfo;
+                LauncherAppWidgetProviderInfo widgetProviderInfo;
                 Intent intent;
                 String targetPkg;
 
@@ -720,6 +723,19 @@ public class LoaderTask implements Runnable {
                                             + appWidgetInfo.spanX + "x" + appWidgetInfo.spanY);
                                     continue;
                                 }
+                                widgetProviderInfo =
+                                        widgetHelper.getLauncherAppWidgetInfo(appWidgetId);
+                                if (widgetProviderInfo != null
+                                        && (appWidgetInfo.spanX < widgetProviderInfo.minSpanX
+                                        || appWidgetInfo.spanY < widgetProviderInfo.minSpanY)) {
+                                    // This can happen when display size changes.
+                                    c.markDeleted("Widget removed, min sizes not met: "
+                                            + "span=" + appWidgetInfo.spanX + "x"
+                                            + appWidgetInfo.spanY + " minSpan="
+                                            + widgetProviderInfo.minSpanX + "x"
+                                            + widgetProviderInfo.minSpanY);
+                                    continue;
+                                }
                                 if (!c.isOnWorkspaceOrHotseat()) {
                                     c.markDeleted("Widget found where container != " +
                                             "CONTAINER_DESKTOP nor CONTAINER_HOTSEAT - ignoring!");
-- 
GitLab


From 350b462f24ff1fc95cad23044fbd2194fe03ea05 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Fri, 18 Sep 2020 11:16:30 -0700
Subject: [PATCH 0179/1664] Animate icon update from loading state.

Test: manual

Fixing b/129983531. Having app icons pop in without any animation from a solid placeholder color can look janky. Added a sequential fade in, fade out animation.

Preview: https://drive.google.com/file/d/11NgEja7vzm3f3aH3WbEQljUWGKuuK00_/view?usp=sharing
Change-Id: If77e8f480b02d5b7d29f89afa44450c83a68a276
---
 src/com/android/launcher3/BubbleTextView.java | 48 +++++++++++++++++--
 .../android/launcher3/FastBitmapDrawable.java |  9 +++-
 2 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 06bb263f23..fd04081198 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -23,6 +23,7 @@ import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
+import android.animation.ValueAnimator;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
@@ -30,6 +31,8 @@ import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.PointF;
+import android.graphics.PorterDuff.Mode;
+import android.graphics.PorterDuffColorFilter;
 import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
@@ -43,6 +46,8 @@ import android.view.View;
 import android.view.ViewDebug;
 import android.widget.TextView;
 
+import androidx.core.graphics.ColorUtils;
+
 import com.android.launcher3.Launcher.OnResumeCallback;
 import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
 import com.android.launcher3.dot.DotInfo;
@@ -50,6 +55,7 @@ import com.android.launcher3.dragndrop.DraggableView;
 import com.android.launcher3.folder.FolderIcon;
 import com.android.launcher3.graphics.IconPalette;
 import com.android.launcher3.graphics.IconShape;
+import com.android.launcher3.graphics.PlaceHolderIconDrawable;
 import com.android.launcher3.graphics.PreloadIconDrawable;
 import com.android.launcher3.icons.DotRenderer;
 import com.android.launcher3.icons.IconCache.IconLoadRequest;
@@ -84,6 +90,8 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
     private final PointF mTranslationForReorderBounce = new PointF(0, 0);
     private final PointF mTranslationForReorderPreview = new PointF(0, 0);
 
+    private static final int ICON_UPDATE_ANIMATION_DURATION = 375;
+
     private float mScaleForReorderBounce = 1f;
 
     private static final Property<BubbleTextView, Float> DOT_SCALE_PROPERTY
@@ -636,11 +644,14 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         mDisableRelayout = mIcon != null;
 
         icon.setBounds(0, 0, mIconSize, mIconSize);
-        if (mLayoutHorizontal) {
-            setCompoundDrawablesRelative(icon, null, null, null);
-        } else {
-            setCompoundDrawables(null, icon, null, null);
+
+        updateIcon(icon);
+
+        // If the current icon is a placeholder color, animate its update.
+        if (mIcon != null && mIcon instanceof PlaceHolderIconDrawable) {
+            animateIconUpdate((PlaceHolderIconDrawable) mIcon, icon);
         }
+
         mDisableRelayout = false;
     }
 
@@ -776,4 +787,33 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
             ((FastBitmapDrawable) mIcon).setScale(1f);
         }
     }
+
+    private void updateIcon(Drawable newIcon) {
+        if (mLayoutHorizontal) {
+            setCompoundDrawablesRelative(newIcon, null, null, null);
+        } else {
+            setCompoundDrawables(null, newIcon, null, null);
+        }
+    }
+
+    private static void animateIconUpdate(PlaceHolderIconDrawable oldIcon, Drawable newIcon) {
+        int placeholderColor = oldIcon.mPaint.getColor();
+        int originalAlpha = Color.alpha(placeholderColor);
+
+        ValueAnimator iconUpdateAnimation = ValueAnimator.ofInt(originalAlpha, 0);
+        iconUpdateAnimation.setDuration(ICON_UPDATE_ANIMATION_DURATION);
+        iconUpdateAnimation.addUpdateListener(valueAnimator -> {
+            int newAlpha = (int) valueAnimator.getAnimatedValue();
+            int newColor = ColorUtils.setAlphaComponent(placeholderColor, newAlpha);
+
+            newIcon.setColorFilter(new PorterDuffColorFilter(newColor, Mode.SRC_ATOP));
+        });
+        iconUpdateAnimation.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                newIcon.setColorFilter(null);
+            }
+        });
+        iconUpdateAnimation.start();
+    }
 }
diff --git a/src/com/android/launcher3/FastBitmapDrawable.java b/src/com/android/launcher3/FastBitmapDrawable.java
index d3b86ded80..139d4a85e4 100644
--- a/src/com/android/launcher3/FastBitmapDrawable.java
+++ b/src/com/android/launcher3/FastBitmapDrawable.java
@@ -33,6 +33,8 @@ import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.util.Property;
 
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.graphics.PlaceHolderIconDrawable;
 import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
@@ -54,6 +56,8 @@ public class FastBitmapDrawable extends Drawable {
     protected Bitmap mBitmap;
     protected final int mIconColor;
 
+    @Nullable private ColorFilter mColorFilter;
+
     private boolean mIsPressed;
     private boolean mIsDisabled;
     private float mDisabledAlpha = 1f;
@@ -115,7 +119,8 @@ public class FastBitmapDrawable extends Drawable {
 
     @Override
     public void setColorFilter(ColorFilter cf) {
-        // No op
+        mColorFilter = cf;
+        updateFilter();
     }
 
     @Override
@@ -265,7 +270,7 @@ public class FastBitmapDrawable extends Drawable {
      * Updates the paint to reflect the current brightness and saturation.
      */
     protected void updateFilter() {
-        mPaint.setColorFilter(mIsDisabled ? getDisabledColorFilter() : null);
+        mPaint.setColorFilter(mIsDisabled ? getDisabledColorFilter() : mColorFilter);
         invalidateSelf();
     }
 
-- 
GitLab


From 30cd4dca5fae4d5b1b9d87191bb6d22b2f4ffdc1 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 23 Sep 2020 15:33:32 -0700
Subject: [PATCH 0180/1664] Remove test restrictions

Bug: 150303529
Change-Id: I1cfbd2bfb26fc47ee0bfb54dd174cd59ae0bfc5e
---
 .../src/com/android/quickstep/DigitalWellBeingToastTest.java    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java b/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java
index 9a053f2f62..2a7da7eca8 100644
--- a/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java
+++ b/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java
@@ -35,8 +35,6 @@ public class DigitalWellBeingToastTest extends AbstractQuickStepTest {
             resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR);
 
     @Test
-    // b/150303529
-    @TestStabilityRule.Stability(flavors = UNBUNDLED_POSTSUBMIT | PLATFORM_POSTSUBMIT)
     public void testToast() throws Exception {
         startAppFast(CALCULATOR_PACKAGE);
 
-- 
GitLab


From ceb1724376a1f7c647ced9750afa494fdfa37e8f Mon Sep 17 00:00:00 2001
From: Sreyas <sreyasr@google.com>
Date: Wed, 23 Sep 2020 16:12:21 -0700
Subject: [PATCH 0181/1664] Removing OAV HIDDEN_GESTURE_RUNNING flag.

Overview was being hidden when gesture was running, this is unnecessary as other hidden flags cover all the use cases.
Bug: 168565347

Change-Id: Ieab36783fccc0088f9cdbe0768a93c5c46b23def
---
 .../src/com/android/quickstep/views/OverviewActionsView.java  | 4 +---
 quickstep/src/com/android/quickstep/views/RecentsView.java    | 3 ---
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
index 2a6c9e92db..b8e07cb189 100644
--- a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
+++ b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
@@ -54,7 +54,6 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
             HIDDEN_UNSUPPORTED_NAVIGATION,
             HIDDEN_NON_ZERO_ROTATION,
             HIDDEN_NO_TASKS,
-            HIDDEN_GESTURE_RUNNING,
             HIDDEN_NO_RECENTS})
     @Retention(RetentionPolicy.SOURCE)
     public @interface ActionsHiddenFlags { }
@@ -62,8 +61,7 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
     public static final int HIDDEN_UNSUPPORTED_NAVIGATION = 1 << 0;
     public static final int HIDDEN_NON_ZERO_ROTATION = 1 << 1;
     public static final int HIDDEN_NO_TASKS = 1 << 2;
-    public static final int HIDDEN_GESTURE_RUNNING = 1 << 3;
-    public static final int HIDDEN_NO_RECENTS = 1 << 4;
+    public static final int HIDDEN_NO_RECENTS = 1 << 3;
 
     @IntDef(flag = true, value = {
             DISABLED_SCROLLING,
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 0362377399..1ae011b2c0 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -44,7 +44,6 @@ import static com.android.launcher3.userevent.nano.LauncherLogProto.ControlType.
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW;
 import static com.android.quickstep.TaskUtils.checkCurrentOrManagedUserId;
-import static com.android.quickstep.views.OverviewActionsView.HIDDEN_GESTURE_RUNNING;
 import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NON_ZERO_ROTATION;
 import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NO_RECENTS;
 import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NO_TASKS;
@@ -1129,7 +1128,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         setEnableDrawingLiveTile(false);
         setRunningTaskHidden(true);
         setRunningTaskIconScaledDown(true);
-        mActionsView.updateHiddenFlags(HIDDEN_GESTURE_RUNNING, true);
     }
 
     /**
@@ -1322,7 +1320,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     }
 
     private void animateActionsViewIn() {
-        mActionsView.updateHiddenFlags(HIDDEN_GESTURE_RUNNING, false);
         ObjectAnimator anim = ObjectAnimator.ofFloat(
                 mActionsView.getVisibilityAlpha(), MultiValueAlpha.VALUE, 0, 1);
         anim.setDuration(TaskView.SCALE_ICON_DURATION);
-- 
GitLab


From 69f9cae8106acce1095c6da2b5d8f565d1f989e9 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 23 Sep 2020 17:24:17 -0700
Subject: [PATCH 0182/1664] Remove CurveProperties#pageParentScale

Test: Set TaskView#EDGE_SCALE_DOWN_FACTOR = 0.2f, then swipe
down on the centermost TaskView; ensure it fills the screen.
Alternatively, touch and hold the nav bar and ensure there is
no jump in scale on the app window.

Fixes: 169259407
Change-Id: Ib3cfba6ebafbcb90de9c6b1ab79f53605d995321
---
 .../src/com/android/quickstep/util/TaskViewSimulator.java    | 1 -
 quickstep/src/com/android/quickstep/views/RecentsView.java   | 5 ++---
 .../android/launcher3/touch/LandscapePagedViewHandler.java   | 1 -
 src/com/android/launcher3/touch/PagedOrientationHandler.java | 1 -
 .../android/launcher3/touch/PortraitPagedViewHandler.java    | 1 -
 5 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index 081413e4f3..3a54bd61aa 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -278,7 +278,6 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
             int start = mOrientationState.getOrientationHandler()
                     .getPrimaryValue(mTaskRect.left, mTaskRect.top);
             mScrollState.screenCenter = start + mScrollState.scroll + mScrollState.halfPageSize;
-            mScrollState.pageParentScale = recentsViewScale.value;
             mScrollState.updateInterpolation(start);
             mCurveScale = TaskView.getCurveScaleForInterpolation(mScrollState.linearInterpolation);
         }
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index b617817728..d319a98f9a 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1415,13 +1415,12 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
          * Updates linearInterpolation for the provided child position
          */
         public void updateInterpolation(float childStart) {
-            float scaledHalfPageSize = halfPageSize / pageParentScale;
-            float pageCenter = childStart + scaledHalfPageSize;
+            float pageCenter = childStart + halfPageSize;
             float distanceFromScreenCenter = screenCenter - pageCenter;
             // How far the page has to move from the center to be offscreen, taking into account
             // the EDGE_SCALE_DOWN_FACTOR that will be applied at that position.
             float distanceToReachEdge = halfScreenSize
-                    + scaledHalfPageSize * (1 - TaskView.EDGE_SCALE_DOWN_FACTOR);
+                    + halfPageSize * (1 - TaskView.EDGE_SCALE_DOWN_FACTOR);
             linearInterpolation = Math.min(1,
                     Math.abs(distanceFromScreenCenter) / distanceToReachEdge);
         }
diff --git a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
index fb02f79c49..17f02be5b4 100644
--- a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
+++ b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
@@ -72,7 +72,6 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
         out.halfPageSize = view.getNormalChildHeight() / 2;
         out.halfScreenSize = view.getMeasuredHeight() / 2;
         out.screenCenter = insets.top + view.getPaddingTop() + out.scroll + out.halfPageSize;
-        out.pageParentScale = view.getScaleY();
     }
 
     @Override
diff --git a/src/com/android/launcher3/touch/PagedOrientationHandler.java b/src/com/android/launcher3/touch/PagedOrientationHandler.java
index 354d78d0ac..114b75acec 100644
--- a/src/com/android/launcher3/touch/PagedOrientationHandler.java
+++ b/src/com/android/launcher3/touch/PagedOrientationHandler.java
@@ -112,7 +112,6 @@ public interface PagedOrientationHandler {
         public int halfPageSize;
         public int screenCenter;
         public int halfScreenSize;
-        public float pageParentScale;
     }
 
     class ChildBounds {
diff --git a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
index 06479e6b6a..5f5b2d1feb 100644
--- a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
+++ b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
@@ -70,7 +70,6 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
         out.halfPageSize = view.getNormalChildWidth() / 2;
         out.halfScreenSize = view.getMeasuredWidth() / 2;
         out.screenCenter = insets.left + view.getPaddingLeft() + out.scroll + out.halfPageSize;
-        out.pageParentScale = view.getScaleX();
     }
 
     @Override
-- 
GitLab


From a7ddfc0722ee75fe88b022a3537f2b0f51f13543 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Wed, 23 Sep 2020 19:40:14 -0700
Subject: [PATCH 0183/1664]  [Live tile] Use OverviewInputConsumer in live tile
 mode

Fixes: 169285206
Test: fling the home handle in Overview to go home
Change-Id: I41eae8a5120857b653a8b261a03cd5f83f99e6bb
---
 .../src/com/android/quickstep/TouchInteractionService.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index ebdc867190..4b5adcb6c6 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -20,6 +20,7 @@ import static android.view.MotionEvent.ACTION_CANCEL;
 import static android.view.MotionEvent.ACTION_DOWN;
 import static android.view.MotionEvent.ACTION_UP;
 
+import static com.android.launcher3.config.FeatureFlags.ASSISTANT_GIVES_LAUNCHER_FOCUS;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.quickstep.GestureState.DEFAULT_STATE;
@@ -704,8 +705,10 @@ public class TouchInteractionService extends Service implements PluginListener<O
 
         if (activity.getRootView().hasWindowFocus()
                 || previousGestureState.isRunningAnimationToLauncher()
-                || (FeatureFlags.ASSISTANT_GIVES_LAUNCHER_FOCUS.get()
-                    && forceOverviewInputConsumer)) {
+                || (ASSISTANT_GIVES_LAUNCHER_FOCUS.get()
+                    && forceOverviewInputConsumer)
+                || (ENABLE_QUICKSTEP_LIVE_TILE.get())
+                    && gestureState.getActivityInterface().isInLiveTileMode()) {
             return new OverviewInputConsumer(gestureState, activity, mInputMonitorCompat,
                     false /* startingInActivityBounds */);
         } else {
-- 
GitLab


From 82ff64530e5341f07b881f63ed82a830cf084c7f Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Thu, 24 Sep 2020 10:16:44 -0700
Subject: [PATCH 0184/1664] Remove CurveProperties#pageParentScale

Test: Set TaskView#EDGE_SCALE_DOWN_FACTOR = 0.2f, then swipe
down on the centermost TaskView; ensure it fills the screen.
Alternatively, touch and hold the nav bar and ensure there is
no jump in scale on the app window.

Fixes: 169259407
Change-Id: Ib3cfba6ebafbcb90de9c6b1ab79f53605d995321
Merged-In: Ib3cfba6ebafbcb90de9c6b1ab79f53605d995321
---
 .../src/com/android/quickstep/util/TaskViewSimulator.java    | 1 -
 .../src/com/android/quickstep/views/RecentsView.java         | 5 ++---
 .../android/launcher3/touch/LandscapePagedViewHandler.java   | 1 -
 src/com/android/launcher3/touch/PagedOrientationHandler.java | 1 -
 .../android/launcher3/touch/PortraitPagedViewHandler.java    | 1 -
 5 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java
index db64464a61..c0601456fc 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -250,7 +250,6 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
             int start = mOrientationState.getOrientationHandler()
                     .getPrimaryValue(mTaskRect.left, mTaskRect.top);
             mScrollState.screenCenter = start + mScrollState.scroll + mScrollState.halfPageSize;
-            mScrollState.pageParentScale = recentsViewScale.value;
             mScrollState.updateInterpolation(start);
             mCurveScale = TaskView.getCurveScaleForInterpolation(mScrollState.linearInterpolation);
         }
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
index 1d17f5af70..e86a946e59 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
@@ -1390,13 +1390,12 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
          * Updates linearInterpolation for the provided child position
          */
         public void updateInterpolation(float childStart) {
-            float scaledHalfPageSize = halfPageSize / pageParentScale;
-            float pageCenter = childStart + scaledHalfPageSize;
+            float pageCenter = childStart + halfPageSize;
             float distanceFromScreenCenter = screenCenter - pageCenter;
             // How far the page has to move from the center to be offscreen, taking into account
             // the EDGE_SCALE_DOWN_FACTOR that will be applied at that position.
             float distanceToReachEdge = halfScreenSize
-                    + scaledHalfPageSize * (1 - TaskView.EDGE_SCALE_DOWN_FACTOR);
+                    + halfPageSize * (1 - TaskView.EDGE_SCALE_DOWN_FACTOR);
             linearInterpolation = Math.min(1,
                     Math.abs(distanceFromScreenCenter) / distanceToReachEdge);
         }
diff --git a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
index 4fd163360b..e64d2bb0f9 100644
--- a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
+++ b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
@@ -72,7 +72,6 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
         out.halfPageSize = view.getNormalChildHeight() / 2;
         out.halfScreenSize = view.getMeasuredHeight() / 2;
         out.screenCenter = insets.top + view.getPaddingTop() + out.scroll + out.halfPageSize;
-        out.pageParentScale = view.getScaleY();
     }
 
     @Override
diff --git a/src/com/android/launcher3/touch/PagedOrientationHandler.java b/src/com/android/launcher3/touch/PagedOrientationHandler.java
index c0d488bb45..e4a24072f0 100644
--- a/src/com/android/launcher3/touch/PagedOrientationHandler.java
+++ b/src/com/android/launcher3/touch/PagedOrientationHandler.java
@@ -111,7 +111,6 @@ public interface PagedOrientationHandler {
         public int halfPageSize;
         public int screenCenter;
         public int halfScreenSize;
-        public float pageParentScale;
     }
 
     class ChildBounds {
diff --git a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
index 9e53e5f8ec..e4662de3b3 100644
--- a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
+++ b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
@@ -70,7 +70,6 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
         out.halfPageSize = view.getNormalChildWidth() / 2;
         out.halfScreenSize = view.getMeasuredWidth() / 2;
         out.screenCenter = insets.left + view.getPaddingLeft() + out.scroll + out.halfPageSize;
-        out.pageParentScale = view.getScaleX();
     }
 
     @Override
-- 
GitLab


From 47644d209c97b77d3b36ea2270a64882dbe821d4 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Thu, 24 Sep 2020 12:13:08 -0700
Subject: [PATCH 0185/1664] Make overview to home translate faster

Fixes: 169052350
Change-Id: Ia6f21f479498927a5561819fcc256b698acbd095
Merged-In: Ia6f21f479498927a5561819fcc256b698acbd095
---
 .../src/com/android/quickstep/util/OverviewToHomeAnim.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/OverviewToHomeAnim.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/OverviewToHomeAnim.java
index 4a298d3bad..1031c5b080 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/OverviewToHomeAnim.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/OverviewToHomeAnim.java
@@ -18,8 +18,10 @@ package com.android.quickstep.util;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.anim.Interpolators.DEACCEL;
+import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 import static com.android.launcher3.anim.Interpolators.FINAL_FRAME;
 import static com.android.launcher3.anim.Interpolators.INSTANT;
+import static com.android.launcher3.anim.Interpolators.clampToProgress;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_COMPONENTS;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_ACTIONS_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE;
@@ -110,7 +112,7 @@ public class OverviewToHomeAnim {
         boolean isLayoutNaturalToLauncher = recentsView.getPagedOrientationHandler()
                 .isLayoutNaturalToLauncher();
         config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, isLayoutNaturalToLauncher
-                ? DEACCEL : FINAL_FRAME);
+                ? clampToProgress(FAST_OUT_SLOW_IN, 0, 0.75f) : FINAL_FRAME);
         config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, FINAL_FRAME);
         config.setInterpolator(ANIM_OVERVIEW_SCALE, FINAL_FRAME);
         config.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, INSTANT);
-- 
GitLab


From 02be2a43f5f2ba545c784ae671a20f7547a6539a Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Wed, 23 Sep 2020 00:45:27 -0700
Subject: [PATCH 0186/1664] Support Remote actions

Bug: 168846477
Test: Manual
Change-Id: I7b9dc96bc7a8ccb25ccb4b7135880768256f1ef3
---
 res/layout/search_result_icon_row.xml         |  31 ++++
 res/layout/search_result_shortcut.xml         |  42 -----
 src/com/android/launcher3/BubbleTextView.java |  11 ++
 .../launcher3/allapps/AllAppsGridAdapter.java |  14 +-
 .../model/data/RemoteActionItemInfo.java      |  64 ++++++++
 .../launcher3/touch/ItemClickHandler.java     |  24 +++
 .../launcher3/views/HeroSearchResultView.java |   2 +-
 .../launcher3/views/SearchResultIconRow.java  | 154 ++++++++++++++++++
 .../launcher3/views/SearchResultShortcut.java | 117 -------------
 .../systemui/plugins/shared/SearchTarget.java |  15 +-
 .../plugins/shared/SearchTargetEvent.java     |   2 +
 11 files changed, 307 insertions(+), 169 deletions(-)
 create mode 100644 res/layout/search_result_icon_row.xml
 delete mode 100644 res/layout/search_result_shortcut.xml
 create mode 100644 src/com/android/launcher3/model/data/RemoteActionItemInfo.java
 create mode 100644 src/com/android/launcher3/views/SearchResultIconRow.java
 delete mode 100644 src/com/android/launcher3/views/SearchResultShortcut.java

diff --git a/res/layout/search_result_icon_row.xml b/res/layout/search_result_icon_row.xml
new file mode 100644
index 0000000000..5ecc0c27b6
--- /dev/null
+++ b/res/layout/search_result_icon_row.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.launcher3.views.SearchResultIconRow xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto"
+    style="@style/BaseIcon"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:drawablePadding="@dimen/dynamic_grid_icon_drawable_padding"
+    android:gravity="start|center_vertical"
+    android:textAlignment="viewStart"
+    android:textColor="?android:attr/textColorPrimary"
+    android:textSize="16sp"
+    android:padding="@dimen/dynamic_grid_edge_margin"
+    launcher:iconDisplay="hero_app"
+    launcher:layoutHorizontal="true"
+    >
+
+</com.android.launcher3.views.SearchResultIconRow>
\ No newline at end of file
diff --git a/res/layout/search_result_shortcut.xml b/res/layout/search_result_shortcut.xml
deleted file mode 100644
index c350c973da..0000000000
--- a/res/layout/search_result_shortcut.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.launcher3.views.SearchResultShortcut xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:gravity="center_vertical"
-    android:padding="@dimen/dynamic_grid_edge_margin">
-
-    <com.android.launcher3.BubbleTextView
-        android:id="@+id/bubble_text"
-        style="@style/BaseIcon"
-        android:drawablePadding="@dimen/dynamic_grid_icon_drawable_padding"
-        android:gravity="start|center_vertical"
-        android:textAlignment="viewStart"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textSize="16sp"
-        android:layout_height="wrap_content"
-        launcher:iconDisplay="hero_app"
-        launcher:layoutHorizontal="true" />
-
-    <View
-        android:id="@+id/icon"
-        android:layout_width="@dimen/deep_shortcut_icon_size"
-        android:layout_height="@dimen/deep_shortcut_icon_size"
-        android:layout_gravity="start|center_vertical"
-        android:background="@drawable/ic_deepshortcut_placeholder" />
-
-</com.android.launcher3.views.SearchResultShortcut>
\ No newline at end of file
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index fd04081198..1e5a9e44d5 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -65,6 +65,7 @@ import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.model.data.PromiseAppInfo;
+import com.android.launcher3.model.data.RemoteActionItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.util.SafeCloseable;
 import com.android.launcher3.views.ActivityContext;
@@ -300,6 +301,14 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         verifyHighRes();
     }
 
+    /**
+     * Apply label and tag using a {@link RemoteActionItemInfo}
+     */
+    public void applyFromRemoteActionInfo(RemoteActionItemInfo remoteActionItemInfo) {
+        applyIconAndLabel(remoteActionItemInfo);
+        setTag(remoteActionItemInfo);
+    }
+
     private void applyIconAndLabel(ItemInfoWithIcon info) {
         FastBitmapDrawable iconDrawable = newIcon(getContext(), info);
         mDotParams.color = IconPalette.getMutedColor(info.bitmap.color, 0.54f);
@@ -681,6 +690,8 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
                 mActivity.invalidateParent(info);
             } else if (info instanceof PackageItemInfo) {
                 applyFromItemInfoWithIcon((PackageItemInfo) info);
+            } else if (info instanceof RemoteActionItemInfo) {
+                applyFromRemoteActionInfo((RemoteActionItemInfo) info);
             }
 
             mDisableRelayout = false;
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index f01f90be11..2779ba773e 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -92,7 +92,7 @@ public class AllAppsGridAdapter extends
 
     public static final int VIEW_TYPE_SEARCH_SLICE = 1 << 9;
 
-    public static final int VIEW_TYPE_SEARCH_SHORTCUT = 1 << 10;
+    public static final int VIEW_TYPE_SEARCH_ICON_ROW = 1 << 10;
 
     public static final int VIEW_TYPE_SEARCH_PEOPLE = 1 << 11;
 
@@ -189,7 +189,7 @@ public class AllAppsGridAdapter extends
                     || viewType == VIEW_TYPE_SEARCH_ROW
                     || viewType == VIEW_TYPE_SEARCH_PEOPLE
                     || viewType == VIEW_TYPE_SEARCH_THUMBNAIL
-                    || viewType == VIEW_TYPE_SEARCH_SHORTCUT;
+                    || viewType == VIEW_TYPE_SEARCH_ICON_ROW;
         }
     }
 
@@ -458,9 +458,9 @@ public class AllAppsGridAdapter extends
             case VIEW_TYPE_SEARCH_SLICE:
                 return new ViewHolder(mLayoutInflater.inflate(
                         R.layout.search_result_slice, parent, false));
-            case VIEW_TYPE_SEARCH_SHORTCUT:
+            case VIEW_TYPE_SEARCH_ICON_ROW:
                 return new ViewHolder(mLayoutInflater.inflate(
-                        R.layout.search_result_shortcut, parent, false));
+                        R.layout.search_result_icon_row, parent, false));
             case VIEW_TYPE_SEARCH_PEOPLE:
                 return new ViewHolder(mLayoutInflater.inflate(
                         R.layout.search_result_people_item, parent, false));
@@ -551,7 +551,7 @@ public class AllAppsGridAdapter extends
             case VIEW_TYPE_SEARCH_ROW_WITH_BUTTON:
             case VIEW_TYPE_SEARCH_HERO_APP:
             case VIEW_TYPE_SEARCH_ROW:
-            case VIEW_TYPE_SEARCH_SHORTCUT:
+            case VIEW_TYPE_SEARCH_ICON_ROW:
             case VIEW_TYPE_SEARCH_PEOPLE:
             case VIEW_TYPE_SEARCH_THUMBNAIL:
                 AdapterItemWithPayload item =
@@ -571,8 +571,8 @@ public class AllAppsGridAdapter extends
         if (!FeatureFlags.ENABLE_DEVICE_SEARCH.get()) return;
         if (holder.itemView instanceof BubbleTextView) {
             BubbleTextView icon = (BubbleTextView) holder.itemView;
-            icon.setOnClickListener(mOnIconClickListener);
-            icon.setOnLongClickListener(mOnIconLongClickListener);
+            icon.setOnClickListener(null);
+            icon.setOnLongClickListener(null);
         } else if (holder.itemView instanceof SliceView) {
             SliceView sliceView = (SliceView) holder.itemView;
             sliceView.setOnSliceActionListener(null);
diff --git a/src/com/android/launcher3/model/data/RemoteActionItemInfo.java b/src/com/android/launcher3/model/data/RemoteActionItemInfo.java
new file mode 100644
index 0000000000..81f7f3a0a2
--- /dev/null
+++ b/src/com/android/launcher3/model/data/RemoteActionItemInfo.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.model.data;
+
+import android.app.RemoteAction;
+import android.os.Process;
+
+/**
+ * Represents a launchable {@link RemoteAction}
+ */
+public class RemoteActionItemInfo extends ItemInfoWithIcon {
+
+    private final RemoteAction mRemoteAction;
+    private final String mToken;
+    private final boolean mShouldStart;
+
+    public RemoteActionItemInfo(RemoteAction remoteAction, String token, boolean shouldStart) {
+        mShouldStart = shouldStart;
+        mToken = token;
+        mRemoteAction = remoteAction;
+        title = remoteAction.getTitle();
+        user = Process.myUserHandle();
+    }
+
+    public RemoteActionItemInfo(RemoteActionItemInfo info) {
+        super(info);
+        this.mShouldStart = info.mShouldStart;
+        this.mRemoteAction = info.mRemoteAction;
+        this.mToken = info.mToken;
+    }
+
+    @Override
+    public ItemInfoWithIcon clone() {
+        return new RemoteActionItemInfo(this);
+    }
+
+    public RemoteAction getRemoteAction() {
+        return mRemoteAction;
+    }
+
+    public String getToken() {
+        return mToken;
+    }
+
+    /**
+     * Getter method for mShouldStart
+     */
+    public boolean shouldStartInLauncher() {
+        return mShouldStart;
+    }
+}
diff --git a/src/com/android/launcher3/touch/ItemClickHandler.java b/src/com/android/launcher3/touch/ItemClickHandler.java
index 61d6f7d804..d56391da3d 100644
--- a/src/com/android/launcher3/touch/ItemClickHandler.java
+++ b/src/com/android/launcher3/touch/ItemClickHandler.java
@@ -25,7 +25,9 @@ import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_DISABLED_SA
 import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_DISABLED_SUSPENDED;
 
 import android.app.AlertDialog;
+import android.app.PendingIntent;
 import android.content.Intent;
+import android.content.IntentSender;
 import android.content.pm.LauncherApps;
 import android.content.pm.PackageInstaller.SessionInfo;
 import android.os.Process;
@@ -49,6 +51,7 @@ import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.model.data.PromiseAppInfo;
+import com.android.launcher3.model.data.RemoteActionItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pm.InstallSessionHelper;
 import com.android.launcher3.testing.TestLogging;
@@ -236,6 +239,27 @@ public class ItemClickHandler {
         startAppShortcutOrInfoActivity(v, shortcut, launcher);
     }
 
+    /**
+     * Event handler for a {@link android.app.RemoteAction} click
+     *
+     */
+    public static void onClickRemoteAction(Launcher launcher,
+            RemoteActionItemInfo remoteActionInfo) {
+        try {
+            PendingIntent pendingIntent = remoteActionInfo.getRemoteAction().getActionIntent();
+            if (remoteActionInfo.shouldStartInLauncher()) {
+                launcher.startIntentSenderForResult(pendingIntent.getIntentSender(), 0, null, 0, 0,
+                        0);
+            } else {
+                pendingIntent.send();
+            }
+        } catch (PendingIntent.CanceledException | IntentSender.SendIntentException e) {
+            Toast.makeText(launcher,
+                    launcher.getResources().getText(R.string.shortcut_not_available),
+                    Toast.LENGTH_SHORT).show();
+        }
+    }
+
     private static void startAppShortcutOrInfoActivity(View v, ItemInfo item, Launcher launcher) {
         TestLogging.recordEvent(
                 TestProtocol.SEQUENCE_MAIN, "start: startAppShortcutOrInfoActivity");
diff --git a/src/com/android/launcher3/views/HeroSearchResultView.java b/src/com/android/launcher3/views/HeroSearchResultView.java
index 94b9ca1484..dd322d921a 100644
--- a/src/com/android/launcher3/views/HeroSearchResultView.java
+++ b/src/com/android/launcher3/views/HeroSearchResultView.java
@@ -138,7 +138,7 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
             if (i < shortcutDetails.size()) {
                 Pair<ShortcutInfo, ItemInfoWithIcon> p = shortcutDetails.get(i);
                 //apply ItemInfo and prepare view
-                shortcutView.applyFromItemInfoWithIcon(p.second);
+                shortcutView.applyFromWorkspaceItem((WorkspaceItemInfo) p.second);
                 MODEL_EXECUTOR.execute(() -> {
                     // load unbadged shortcut in background and update view when icon ready
                     appState.getIconCache().getUnbadgedShortcutIcon(p.second, p.first);
diff --git a/src/com/android/launcher3/views/SearchResultIconRow.java b/src/com/android/launcher3/views/SearchResultIconRow.java
new file mode 100644
index 0000000000..57c85cf42e
--- /dev/null
+++ b/src/com/android/launcher3/views/SearchResultIconRow.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.views;
+
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+
+import android.app.RemoteAction;
+import android.content.Context;
+import android.content.pm.ShortcutInfo;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.AttributeSet;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
+import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+import com.android.launcher3.icons.LauncherIcons;
+import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.ItemInfoWithIcon;
+import com.android.launcher3.model.data.RemoteActionItemInfo;
+import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.launcher3.touch.ItemClickHandler;
+import com.android.systemui.plugins.AllAppsSearchPlugin;
+import com.android.systemui.plugins.shared.SearchTarget;
+import com.android.systemui.plugins.shared.SearchTargetEvent;
+
+/**
+ * A view representing a stand alone shortcut search result
+ */
+public class SearchResultIconRow extends DoubleShadowBubbleTextView implements
+        AllAppsSearchBarController.PayloadResultHandler<SearchTarget> {
+
+    private final Object[] mTargetInfo = createTargetInfo();
+    private ShortcutInfo mShortcutInfo;
+    private AllAppsSearchPlugin mPlugin;
+    private AdapterItemWithPayload<SearchTarget> mAdapterItem;
+
+
+    public SearchResultIconRow(@NonNull Context context) {
+        super(context);
+    }
+
+    public SearchResultIconRow(@NonNull Context context,
+            @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public SearchResultIconRow(@NonNull Context context, @Nullable AttributeSet attrs,
+            int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    public void applyAdapterInfo(AdapterItemWithPayload<SearchTarget> adapterItemWithPayload) {
+        if (mAdapterItem != null) {
+            mAdapterItem.setSelectionHandler(null);
+        }
+        mAdapterItem = adapterItemWithPayload;
+        SearchTarget payload = adapterItemWithPayload.getPayload();
+        mPlugin = adapterItemWithPayload.getPlugin();
+
+        if (payload.mRemoteAction != null) {
+            prepareUsingRemoteAction(payload.mRemoteAction,
+                    payload.bundle.getString(SearchTarget.REMOTE_ACTION_TOKEN),
+                    payload.bundle.getBoolean(SearchTarget.REMOTE_ACTION_SHOULD_START));
+        } else {
+            prepareUsingShortcutInfo(payload.shortcuts.get(0));
+        }
+        setOnClickListener(v -> handleSelection(SearchTargetEvent.SELECT));
+        adapterItemWithPayload.setSelectionHandler(this::handleSelection);
+    }
+
+    private void prepareUsingShortcutInfo(ShortcutInfo shortcutInfo) {
+        mShortcutInfo = shortcutInfo;
+        WorkspaceItemInfo workspaceItemInfo = new WorkspaceItemInfo(mShortcutInfo, getContext());
+        applyFromWorkspaceItem(workspaceItemInfo);
+        LauncherAppState launcherAppState = LauncherAppState.getInstance(getContext());
+        MODEL_EXECUTOR.execute(() -> {
+            launcherAppState.getIconCache().getShortcutIcon(workspaceItemInfo, mShortcutInfo);
+            reapplyItemInfoAsync(workspaceItemInfo);
+        });
+    }
+
+    private void prepareUsingRemoteAction(RemoteAction remoteAction, String token, boolean start) {
+        RemoteActionItemInfo itemInfo = new RemoteActionItemInfo(remoteAction, token, start);
+
+        applyFromRemoteActionInfo(itemInfo);
+        UI_HELPER_EXECUTOR.post(() -> {
+            // If the Drawable from the remote action is not AdaptiveBitmap, styling will not work.
+            try (LauncherIcons li = LauncherIcons.obtain(getContext())) {
+                Drawable d = itemInfo.getRemoteAction().getIcon().loadDrawable(getContext());
+                itemInfo.bitmap = li.createBadgedIconBitmap(d, itemInfo.user,
+                        Build.VERSION.SDK_INT);
+                reapplyItemInfoAsync(itemInfo);
+            }
+        });
+
+    }
+
+    void reapplyItemInfoAsync(ItemInfoWithIcon itemInfoWithIcon) {
+        MAIN_EXECUTOR.post(() -> reapplyItemInfo(itemInfoWithIcon));
+    }
+
+    @Override
+    public Object[] getTargetInfo() {
+        return mTargetInfo;
+    }
+
+    private void handleSelection(int eventType) {
+        ItemInfo itemInfo = (ItemInfo) getTag();
+        Launcher launcher = Launcher.getLauncher(getContext());
+        final SearchTargetEvent searchTargetEvent;
+        if (itemInfo instanceof WorkspaceItemInfo) {
+            ItemClickHandler.onClickAppShortcut(this, (WorkspaceItemInfo) itemInfo, launcher);
+            searchTargetEvent = getSearchTargetEvent(SearchTarget.ItemType.SHORTCUT,
+                    eventType);
+            searchTargetEvent.shortcut = mShortcutInfo;
+        } else {
+            RemoteActionItemInfo remoteItemInfo = (RemoteActionItemInfo) itemInfo;
+            ItemClickHandler.onClickRemoteAction(launcher, remoteItemInfo);
+            searchTargetEvent = getSearchTargetEvent(SearchTarget.ItemType.REMOTE_ACTION,
+                    eventType);
+            searchTargetEvent.bundle = new Bundle();
+            searchTargetEvent.remoteAction = remoteItemInfo.getRemoteAction();
+            searchTargetEvent.bundle.putBoolean(SearchTarget.REMOTE_ACTION_SHOULD_START,
+                    remoteItemInfo.shouldStartInLauncher());
+            searchTargetEvent.bundle.putString(SearchTarget.REMOTE_ACTION_TOKEN,
+                    remoteItemInfo.getToken());
+        }
+        if (mPlugin != null) {
+            mPlugin.notifySearchTargetEvent(searchTargetEvent);
+        }
+    }
+}
diff --git a/src/com/android/launcher3/views/SearchResultShortcut.java b/src/com/android/launcher3/views/SearchResultShortcut.java
deleted file mode 100644
index a409f0807f..0000000000
--- a/src/com/android/launcher3/views/SearchResultShortcut.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.views;
-
-import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
-
-import android.content.Context;
-import android.content.pm.ShortcutInfo;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.BubbleTextView;
-import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.R;
-import com.android.launcher3.allapps.AllAppsGridAdapter;
-import com.android.launcher3.allapps.search.AllAppsSearchBarController;
-import com.android.launcher3.model.data.WorkspaceItemInfo;
-import com.android.launcher3.touch.ItemClickHandler;
-import com.android.systemui.plugins.AllAppsSearchPlugin;
-import com.android.systemui.plugins.shared.SearchTarget;
-import com.android.systemui.plugins.shared.SearchTargetEvent;
-
-/**
- * A view representing a stand alone shortcut search result
- */
-public class SearchResultShortcut extends FrameLayout implements
-        AllAppsSearchBarController.PayloadResultHandler<SearchTarget> {
-
-    private BubbleTextView mBubbleTextView;
-    private View mIconView;
-    private ShortcutInfo mShortcutInfo;
-    private AllAppsSearchPlugin mPlugin;
-    private final Object[] mTargetInfo = createTargetInfo();
-
-
-    public SearchResultShortcut(@NonNull Context context) {
-        super(context);
-    }
-
-    public SearchResultShortcut(@NonNull Context context,
-            @Nullable AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public SearchResultShortcut(@NonNull Context context, @Nullable AttributeSet attrs,
-            int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        Launcher launcher = Launcher.getLauncher(getContext());
-        DeviceProfile grid = launcher.getDeviceProfile();
-        mIconView = findViewById(R.id.icon);
-        ViewGroup.LayoutParams iconParams = mIconView.getLayoutParams();
-        iconParams.height = grid.allAppsIconSizePx;
-        iconParams.width = grid.allAppsIconSizePx;
-        mBubbleTextView = findViewById(R.id.bubble_text);
-        setOnClickListener(v -> handleSelection(SearchTargetEvent.SELECT));
-    }
-
-    @Override
-    public void applyAdapterInfo(
-            AllAppsGridAdapter.AdapterItemWithPayload<SearchTarget> adapterItemWithPayload) {
-        SearchTarget payload = adapterItemWithPayload.getPayload();
-        mPlugin = adapterItemWithPayload.getPlugin();
-        mShortcutInfo = payload.shortcuts.get(0);
-        WorkspaceItemInfo workspaceItemInfo = new WorkspaceItemInfo(mShortcutInfo, getContext());
-        mBubbleTextView.applyFromWorkspaceItem(workspaceItemInfo);
-        mIconView.setBackground(mBubbleTextView.getIcon());
-        LauncherAppState launcherAppState = LauncherAppState.getInstance(getContext());
-        MODEL_EXECUTOR.execute(() -> {
-            launcherAppState.getIconCache().getShortcutIcon(workspaceItemInfo, mShortcutInfo);
-            mBubbleTextView.applyFromWorkspaceItem(workspaceItemInfo);
-            mIconView.setBackground(mBubbleTextView.getIcon());
-        });
-        adapterItemWithPayload.setSelectionHandler(this::handleSelection);
-    }
-
-    @Override
-    public Object[] getTargetInfo() {
-        return mTargetInfo;
-    }
-
-    private void handleSelection(int eventType) {
-        WorkspaceItemInfo itemInfo = (WorkspaceItemInfo) mBubbleTextView.getTag();
-        ItemClickHandler.onClickAppShortcut(this, itemInfo, Launcher.getLauncher(getContext()));
-
-        SearchTargetEvent searchTargetEvent = getSearchTargetEvent(SearchTarget.ItemType.SHORTCUT,
-                eventType);
-        searchTargetEvent.shortcut = mShortcutInfo;
-        if (mPlugin != null) {
-            mPlugin.notifySearchTargetEvent(searchTargetEvent);
-        }
-    }
-}
diff --git a/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java b/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
index fb8dd723bc..9d9ccbaf6e 100644
--- a/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
+++ b/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
@@ -15,6 +15,7 @@
  */
 package com.android.systemui.plugins.shared;
 
+import android.app.RemoteAction;
 import android.content.pm.ShortcutInfo;
 import android.os.Bundle;
 
@@ -25,6 +26,14 @@ import java.util.List;
  */
 public class SearchTarget implements Comparable<SearchTarget> {
 
+
+    /**
+     * A bundle key for boolean value of whether remote action should be started in launcher or not
+     */
+    public static final String REMOTE_ACTION_SHOULD_START = "should_start_for_result";
+    public static final String REMOTE_ACTION_TOKEN = "action_token";
+
+
     public enum ViewType {
 
         /**
@@ -74,6 +83,7 @@ public class SearchTarget implements Comparable<SearchTarget> {
         THUMBNAIL(8);
 
         private final int mId;
+
         ViewType(int id) {
             mId = id;
         }
@@ -91,7 +101,8 @@ public class SearchTarget implements Comparable<SearchTarget> {
         APP_HERO(4, "", ViewType.HERO),
         SHORTCUT(5, "Shortcuts", ViewType.SHORTCUT),
         PEOPLE(6, "People", ViewType.PEOPLE),
-        SCREENSHOT(7, "Screenshots", ViewType.THUMBNAIL);
+        SCREENSHOT(7, "Screenshots", ViewType.THUMBNAIL),
+        REMOTE_ACTION(8, "Remote Actions", ViewType.SHORTCUT);
 
         private final int mId;
 
@@ -123,12 +134,12 @@ public class SearchTarget implements Comparable<SearchTarget> {
     public Bundle bundle;
     public float score;
     public String mSessionId;
+    public RemoteAction mRemoteAction;
 
     /**
      * Constructor to create the search target. Bundle is currently temporary to hold
      * search target primitives that cannot be expressed as java primitive objects
      * or AOSP native objects.
-     *
      */
     public SearchTarget(ItemType itemType, List<ShortcutInfo> shortcuts,
             Bundle bundle, float score, String sessionId) {
diff --git a/src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java b/src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java
index 00a78de9af..5016abc1e9 100644
--- a/src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java
+++ b/src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java
@@ -15,6 +15,7 @@
  */
 package com.android.systemui.plugins.shared;
 
+import android.app.RemoteAction;
 import android.content.pm.ShortcutInfo;
 import android.os.Bundle;
 
@@ -29,6 +30,7 @@ public class SearchTargetEvent {
 
     public SearchTarget.ItemType type;
     public ShortcutInfo shortcut;
+    public RemoteAction remoteAction;
     public int eventType;
     public Bundle bundle;
     public int index;
-- 
GitLab


From ec7b1ee73bd306a0114e31fb11b419a98057392e Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Thu, 24 Sep 2020 20:23:06 -0700
Subject: [PATCH 0187/1664] Make SPAN_MULTIPLIER public Bug: 169294860

Change-Id: I6c32689c390de38f230cff4062889dd560afe6c3
---
 src/com/android/launcher3/allapps/AllAppsGridAdapter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index f01f90be11..20f9372cf8 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -334,7 +334,7 @@ public class AllAppsGridAdapter extends
     }
 
     // multiplier to support adapter item column count that is not mAppsPerRow.
-    private static final int SPAN_MULTIPLIER = 3;
+    public static final int SPAN_MULTIPLIER = 3;
 
     private final BaseDraggingActivity mLauncher;
     private final LayoutInflater mLayoutInflater;
-- 
GitLab


From e6477328aa8b82f516e1502e99343af265ad5fd6 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Sun, 20 Sep 2020 22:49:57 -0700
Subject: [PATCH 0188/1664] [DO NOT MERGE] Add component name to launcher home
 and overview gestures Bug: 168805198

Change-Id: Idcc7d00b0f23c2a0f9be6f0ab2600278e18cc1a3
---
 protos/launcher_atom.proto                       | 11 +++++++++--
 .../android/quickstep/BaseSwipeUpHandlerV2.java  | 16 ++++++++++++++++
 src/com/android/launcher3/LauncherSettings.java  |  1 +
 .../android/launcher3/model/data/ItemInfo.java   |  7 +++++++
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/protos/launcher_atom.proto b/protos/launcher_atom.proto
index 561196941c..1a8ab65370 100644
--- a/protos/launcher_atom.proto
+++ b/protos/launcher_atom.proto
@@ -55,6 +55,7 @@ message ContainerInfo {
     SettingsContainer settings_container = 9;
     PredictedHotseatContainer predicted_hotseat_container = 10;
     TaskSwitcherContainer task_switcher_container = 11;
+    TaskForegroundContainer task_foreground_container = 12;
   }
 }
 
@@ -92,8 +93,14 @@ message ShortcutsContainer {
 message SettingsContainer {
 }
 
-message TaskSwitcherContainer {
-}
+// Container for tasks in the Overview UI.
+// Typically entered using either the overview gesture or overview button.
+message TaskSwitcherContainer {}
+
+// Container for tasks from another foreground app, when not on launcher screen.
+// Typically home gesture or overview gesture can be triggered from
+// this container.
+message TaskForegroundContainer {}
 
 enum Attribute {
   UNKNOWN = 0;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java
index 0aa14862a7..a4ea9b4145 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java
@@ -47,6 +47,7 @@ import android.animation.Animator;
 import android.animation.ValueAnimator;
 import android.annotation.TargetApi;
 import android.app.ActivityManager;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.PointF;
@@ -62,12 +63,14 @@ import androidx.annotation.UiThread;
 
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.logging.UserEventDispatcher;
+import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
 import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
@@ -928,12 +931,25 @@ public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q exte
             default:
                 event = IGNORE;
         }
+        ComponentName componentName = mGestureState.getRunningTask().baseActivity;
         StatsLogManager.newInstance(mContext).logger()
                 .withSrcState(LAUNCHER_STATE_BACKGROUND)
                 .withDstState(StatsLogManager.containerTypeToAtomState(endTarget.containerType))
+                .withItemInfo(getItemInfo(componentName))
                 .log(event);
     }
 
+    /**
+     * Builds proto for logging
+     */
+    public WorkspaceItemInfo getItemInfo(ComponentName componentName) {
+        WorkspaceItemInfo placeholderInfo = new WorkspaceItemInfo();
+        placeholderInfo.itemType = LauncherSettings.Favorites.ITEM_TYPE_TASK;
+        placeholderInfo.container = LauncherSettings.Favorites.CONTAINER_TASKFOREGROUND;
+        placeholderInfo.intent = new Intent().setComponent(componentName);
+        return placeholderInfo;
+    }
+
     /** Animates to the given progress, where 0 is the current app and 1 is overview. */
     @UiThread
     private void animateToProgress(float start, float end, long duration, Interpolator interpolator,
diff --git a/src/com/android/launcher3/LauncherSettings.java b/src/com/android/launcher3/LauncherSettings.java
index 58a418edec..a1ac229ae7 100644
--- a/src/com/android/launcher3/LauncherSettings.java
+++ b/src/com/android/launcher3/LauncherSettings.java
@@ -164,6 +164,7 @@ public class LauncherSettings {
         public static final int CONTAINER_SHORTCUTS = -107;
         public static final int CONTAINER_SETTINGS = -108;
         public static final int CONTAINER_TASKSWITCHER = -109;
+        public static final int CONTAINER_TASKFOREGROUND = -110;
 
         public static final String containerToString(int container) {
             switch (container) {
diff --git a/src/com/android/launcher3/model/data/ItemInfo.java b/src/com/android/launcher3/model/data/ItemInfo.java
index 0d3ddad183..b9b3d382c8 100644
--- a/src/com/android/launcher3/model/data/ItemInfo.java
+++ b/src/com/android/launcher3/model/data/ItemInfo.java
@@ -24,6 +24,7 @@ import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_PREDICT
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_SEARCH_RESULTS;
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_SETTINGS;
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_SHORTCUTS;
+import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_TASKFOREGROUND;
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_TASKSWITCHER;
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_TRAY;
 import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
@@ -51,6 +52,7 @@ import com.android.launcher3.logger.LauncherAtom.PredictionContainer;
 import com.android.launcher3.logger.LauncherAtom.SearchResultContainer;
 import com.android.launcher3.logger.LauncherAtom.SettingsContainer;
 import com.android.launcher3.logger.LauncherAtom.ShortcutsContainer;
+import com.android.launcher3.logger.LauncherAtom.TaskForegroundContainer;
 import com.android.launcher3.logger.LauncherAtom.TaskSwitcherContainer;
 import com.android.launcher3.model.ModelWriter;
 import com.android.launcher3.util.ContentWriter;
@@ -392,6 +394,11 @@ public class ItemInfo {
                 return ContainerInfo.newBuilder()
                         .setTaskSwitcherContainer(TaskSwitcherContainer.getDefaultInstance())
                         .build();
+            case CONTAINER_TASKFOREGROUND:
+                return ContainerInfo.newBuilder()
+                        .setTaskForegroundContainer(TaskForegroundContainer.getDefaultInstance())
+                        .build();
+
 
         }
         return ContainerInfo.getDefaultInstance();
-- 
GitLab


From a13715bb931c0211fdadd95fbbfdd37720e6e350 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Thu, 24 Sep 2020 22:19:16 -0700
Subject: [PATCH 0189/1664] [Live Tile] Switch to screenshot when any task menu
 option is selected

- App info
- Split screen
- Pause app

Fixes: 169385194
Test: Manual
Change-Id: I7df8ac7dd89c8c7ae75d8e2e4207cd32ca7b10ea
---
 .../com/android/quickstep/views/TaskMenuView.java    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
index d47eba6408..4aff7e3211 100644
--- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
@@ -16,6 +16,7 @@
 
 package com.android.quickstep.views;
 
+import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.quickstep.views.TaskThumbnailView.DIM_ALPHA;
 
 import android.animation.Animator;
@@ -229,7 +230,16 @@ public class TaskMenuView extends AbstractFloatingView {
                 menuOptionView.findViewById(R.id.icon), menuOptionView.findViewById(R.id.text));
         LayoutParams lp = (LayoutParams) menuOptionView.getLayoutParams();
         mTaskView.getPagedOrientationHandler().setLayoutParamsForTaskMenuOptionItem(lp);
-        menuOptionView.setOnClickListener(menuOption);
+        menuOptionView.setOnClickListener(view -> {
+            if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+                RecentsView recentsView = mTaskView.getRecentsView();
+                recentsView.switchToScreenshot(null,
+                        () -> recentsView.finishRecentsAnimation(true /* toRecents */,
+                                () -> menuOption.onClick(view)));
+            } else {
+                menuOption.onClick(view);
+            }
+        });
         mOptionLayout.addView(menuOptionView);
     }
 
-- 
GitLab


From 2517dfd123534d3f4907700c51ff6c24ac85926a Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Fri, 25 Sep 2020 10:13:57 -0700
Subject: [PATCH 0190/1664] Update TutorialFragments to work without hand
 gesture animations.

Test: manual

TutorialFragments needed to implement getHandAnimationResId, however not all TutorialFragments will need a hand gesture animation. Updated TutorialFragment to remove this requirement.

Change-Id: I2f75d6447dcceb226569181176deed1d5e80fa5f
---
 .../AssistantGestureTutorialFragment.java     |  2 +-
 .../BackGestureTutorialFragment.java          |  2 +-
 .../HomeGestureTutorialFragment.java          |  2 +-
 .../OverviewGestureTutorialFragment.java      |  2 +-
 .../interaction/TutorialController.java       |  7 +++++--
 .../interaction/TutorialFragment.java         | 20 +++++++++++++------
 6 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialFragment.java
index 70181fb9ca..16886ec177 100644
--- a/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialFragment.java
@@ -24,7 +24,7 @@ import com.android.quickstep.interaction.TutorialController.TutorialType;
 /** Shows the Home gesture interactive tutorial. */
 public class AssistantGestureTutorialFragment extends TutorialFragment {
     @Override
-    int getHandAnimationResId() {
+    Integer getHandAnimationResId() {
         return R.drawable.assistant_gesture;
     }
 
diff --git a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java
index bef50ea8df..41db684d44 100644
--- a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java
@@ -24,7 +24,7 @@ import com.android.quickstep.interaction.TutorialController.TutorialType;
 /** Shows the Back gesture interactive tutorial. */
 public class BackGestureTutorialFragment extends TutorialFragment {
     @Override
-    int getHandAnimationResId() {
+    Integer getHandAnimationResId() {
         return R.drawable.back_gesture;
     }
 
diff --git a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialFragment.java
index e2a9d1276c..63595a5283 100644
--- a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialFragment.java
@@ -21,7 +21,7 @@ import com.android.quickstep.interaction.TutorialController.TutorialType;
 /** Shows the Home gesture interactive tutorial. */
 public class HomeGestureTutorialFragment extends TutorialFragment {
     @Override
-    int getHandAnimationResId() {
+    Integer getHandAnimationResId() {
         return R.drawable.home_gesture;
     }
 
diff --git a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java
index 3357b70497..93200bb21d 100644
--- a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java
@@ -21,7 +21,7 @@ import com.android.quickstep.interaction.TutorialController.TutorialType;
 /** Shows the Overview gesture interactive tutorial. */
 public class OverviewGestureTutorialFragment extends TutorialFragment {
     @Override
-    int getHandAnimationResId() {
+    Integer getHandAnimationResId() {
         return R.drawable.overview_gesture;
     }
 
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
index db80342673..d0a12679c0 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
@@ -52,7 +52,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
     final View mFakeTaskView;
     final View mRippleView;
     final RippleDrawable mRippleDrawable;
-    final TutorialHandAnimation mHandCoachingAnimation;
+    @Nullable final TutorialHandAnimation mHandCoachingAnimation;
     final ImageView mHandCoachingView;
     final Button mActionTextButton;
     final Button mActionButton;
@@ -145,13 +145,16 @@ abstract class TutorialController implements BackGestureAttemptCallback,
     void onActionTextButtonClicked(View button) {}
 
     void showHandCoachingAnimation() {
-        if (isComplete()) {
+        if (isComplete() || mHandCoachingAnimation == null) {
             return;
         }
         mHandCoachingAnimation.startLoopedAnimation(mTutorialType);
     }
 
     void hideHandCoachingAnimation() {
+        if (mHandCoachingAnimation == null) {
+            return;
+        }
         mHandCoachingAnimation.stop();
         mHandCoachingView.setVisibility(View.INVISIBLE);
     }
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
index c90ad94b8c..559ba354d2 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
@@ -43,7 +43,7 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
     TutorialType mTutorialType;
     @Nullable TutorialController mTutorialController = null;
     View mRootView;
-    TutorialHandAnimation mHandCoachingAnimation;
+    @Nullable TutorialHandAnimation mHandCoachingAnimation = null;
     EdgeBackGestureHandler mEdgeBackGestureHandler;
     NavBarGestureHandler mNavBarGestureHandler;
     private View mLauncherView;
@@ -82,7 +82,9 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
         return null;
     }
 
-    abstract int getHandAnimationResId();
+    @Nullable Integer getHandAnimationResId() {
+        return null;
+    }
 
     abstract TutorialController createController(TutorialType type);
 
@@ -116,8 +118,11 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
             return insets;
         });
         mRootView.setOnTouchListener(this);
-        mHandCoachingAnimation =
-                new TutorialHandAnimation(getContext(), mRootView, getHandAnimationResId());
+        Integer handAnimationResId = getHandAnimationResId();
+        if (handAnimationResId != null) {
+            mHandCoachingAnimation =
+                new TutorialHandAnimation(getContext(), mRootView, handAnimationResId);
+        }
         InvariantDeviceProfile dp = InvariantDeviceProfile.INSTANCE.get(getContext());
         mLauncherView = new SandboxLauncherRenderer(getContext(), dp, true).getRenderedView();
         ((ViewGroup) mRootView).addView(mLauncherView, 0);
@@ -133,7 +138,10 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
     @Override
     public void onPause() {
         super.onPause();
-        mHandCoachingAnimation.stop();
+
+        if (mHandCoachingAnimation != null) {
+            mHandCoachingAnimation.stop();
+        }
     }
 
     @Override
@@ -183,7 +191,7 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
         return mLauncherView;
     }
 
-    TutorialHandAnimation getHandAnimation() {
+    @Nullable TutorialHandAnimation getHandAnimation() {
         return mHandCoachingAnimation;
     }
 
-- 
GitLab


From 91ef6856d7d025d6ac811e1d2b72a34afc9bea0c Mon Sep 17 00:00:00 2001
From: Jerry Chang <chenghsiuchang@google.com>
Date: Fri, 18 Sep 2020 17:37:06 +0800
Subject: [PATCH 0191/1664] Remove legacy involveSplitScreen API

The onSplitScreenInvoked was used to notify system ui to reset the
divider position before entering split screen. With
SplitScreenTaskOrganizer, WM Shell library could know the exact time
when entering/leaving split screen mode. Removes the legacy API and
resets divider position when leaving split screen mode.

Fix: 168869136
Test: atest WMShellTests
Test: atest SystemUITests
Test: manual check recents and split screen behavior
Change-Id: Id14925619d1ec7c014a3e306fd99ec3734f227da
(cherry picked from commit 44981eb88ecdd4782e6bf6bb89eea6e9fc667335)
---
 .../src/com/android/quickstep/SystemUiProxy.java      | 11 -----------
 .../com/android/quickstep/TaskShortcutFactory.java    |  1 -
 2 files changed, 12 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index e4b05aec12..2666869136 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -113,17 +113,6 @@ public class SystemUiProxy implements ISystemUiProxy {
         }
     }
 
-    @Override
-    public void onSplitScreenInvoked() {
-        if (mSystemUiProxy != null) {
-            try {
-                mSystemUiProxy.onSplitScreenInvoked();
-            } catch (RemoteException e) {
-                Log.w(TAG, "Failed call onSplitScreenInvoked", e);
-            }
-        }
-    }
-
     @Override
     public void onOverviewShown(boolean fromHome) {
         onOverviewShown(fromHome, TAG);
diff --git a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
index 3b245b3230..2b55b805c6 100644
--- a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
@@ -228,7 +228,6 @@ public interface TaskShortcutFactory {
 
         @Override
         protected boolean onActivityStarted(BaseDraggingActivity activity) {
-            SystemUiProxy.INSTANCE.get(activity).onSplitScreenInvoked();
             activity.getUserEventDispatcher().logActionOnControl(TAP,
                     LauncherLogProto.ControlType.SPLIT_SCREEN_TARGET);
             return true;
-- 
GitLab


From 1b17d6be20c9d1c6a4fe194b71c644f5f8a281a1 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Fri, 25 Sep 2020 12:32:08 -0700
Subject: [PATCH 0192/1664] Make the workspace popup menu items statically
 ordered.

Test: manual

Fixes: 160190991.

Reordering the workspace's popup menu items breaks muscle memory of getting to the wallpaper and home settings. Added ArrowPopup#show and refactored ArrowPopup#reorderAndShow to allow more flexbility.

Change-Id: I3fa327d08488a52312c86769bb9a065ccacb17aa
---
 .../android/launcher3/popup/ArrowPopup.java   | 58 ++++++++++++-------
 .../launcher3/views/OptionsPopupView.java     |  2 +-
 2 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java
index d5b32fccd1..90285c470b 100644
--- a/src/com/android/launcher3/popup/ArrowPopup.java
+++ b/src/com/android/launcher3/popup/ArrowPopup.java
@@ -151,32 +151,52 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
      * @param viewsToFlip number of views from the top to to flip in case of reverse order
      */
     protected void reorderAndShow(int viewsToFlip) {
+        setupForDisplay();
+        boolean reverseOrder = mIsAboveIcon;
+        if (reverseOrder) {
+            reverseOrder(viewsToFlip);
+        }
+        onInflationComplete(reverseOrder);
+        addArrow();
+        animateOpen();
+    }
+
+    /**
+     * Shows the popup at the desired location.
+     */
+    protected void show() {
+        setupForDisplay();
+        onInflationComplete(false);
+        addArrow();
+        animateOpen();
+    }
+
+    private void setupForDisplay() {
         setVisibility(View.INVISIBLE);
         mIsOpen = true;
         getPopupContainer().addView(this);
         orientAboutObject();
+    }
 
-        boolean reverseOrder = mIsAboveIcon;
-        if (reverseOrder) {
-            int count = getChildCount();
-            ArrayList<View> allViews = new ArrayList<>(count);
-            for (int i = 0; i < count; i++) {
-                if (i == viewsToFlip) {
-                    Collections.reverse(allViews);
-                }
-                allViews.add(getChildAt(i));
+    private void reverseOrder(int viewsToFlip) {
+        int count = getChildCount();
+        ArrayList<View> allViews = new ArrayList<>(count);
+        for (int i = 0; i < count; i++) {
+            if (i == viewsToFlip) {
+                Collections.reverse(allViews);
             }
-            Collections.reverse(allViews);
-            removeAllViews();
-            for (int i = 0; i < count; i++) {
-                addView(allViews.get(i));
-            }
-
-            orientAboutObject();
+            allViews.add(getChildAt(i));
         }
-        onInflationComplete(reverseOrder);
+        Collections.reverse(allViews);
+        removeAllViews();
+        for (int i = 0; i < count; i++) {
+            addView(allViews.get(i));
+        }
+
+        orientAboutObject();
+    }
 
-        // Add the arrow.
+    private void addArrow() {
         final Resources res = getResources();
         final int arrowCenterOffset = res.getDimensionPixelSize(isAlignedWithStart()
                 ? R.dimen.popup_arrow_horizontal_center_start
@@ -214,8 +234,6 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
 
         mArrow.setPivotX(arrowLp.width / 2);
         mArrow.setPivotY(mIsAboveIcon ? arrowLp.height : 0);
-
-        animateOpen();
     }
 
     protected boolean isAlignedWithStart() {
diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java
index a8caa9ea00..80f0981af5 100644
--- a/src/com/android/launcher3/views/OptionsPopupView.java
+++ b/src/com/android/launcher3/views/OptionsPopupView.java
@@ -133,7 +133,7 @@ public class OptionsPopupView extends ArrowPopup
             view.setOnLongClickListener(popup);
             popup.mItemMap.put(view, item);
         }
-        popup.reorderAndShow(popup.getChildCount());
+        popup.show();
     }
 
     @VisibleForTesting
-- 
GitLab


From 95786e077daa43b96ebea34ec3035b05bf96ffce Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Tue, 15 Sep 2020 00:34:10 -0700
Subject: [PATCH 0193/1664] Good riddance UserEventDispatcher

Bug: 165675920
Bug: 161381246

TL;DR;;
- nano -> lite proto
- add all the missing logs to WW
- pin item related logging fix
- Removed logging for assistant

sgrep "com.android.launcher3.userevent.nano." | cut -f1 -d: | xargs sed -i -e 's/userevent\.nano\./userevent\./g'

Change-Id: Ie2a49fdd891cacbd7ef40a1dc9e41ff0574c7517
---
 Android.mk                                    |   8 -
 build.gradle                                  |  24 +-
 protos/launcher_log.proto                     | 245 ------------
 .../appprediction/PredictionRowView.java      |  31 +-
 .../HotseatPredictionController.java          |   1 -
 .../uioverrides/states/AllAppsState.java      |   4 +-
 .../states/BackgroundAppState.java            |   5 +-
 .../states/OverviewModalTaskState.java        |   5 +-
 .../uioverrides/states/OverviewState.java     |   4 +-
 .../uioverrides/states/QuickSwitchState.java  |   5 +-
 .../LandscapeEdgeSwipeController.java         |  16 +-
 .../NavBarToHomeTouchController.java          |  19 +-
 ...ButtonNavbarToOverviewTouchController.java |   5 +-
 .../NoButtonQuickSwitchTouchController.java   |  25 +-
 .../OverviewToAllAppsTouchController.java     |   6 -
 .../PortraitStatesTouchController.java        |  13 +-
 .../QuickSwitchTouchController.java           |  19 +-
 .../StatusBarTouchController.java             |  14 +-
 .../TaskViewTouchController.java              |  14 +-
 .../android/quickstep/AbsSwipeUpHandler.java  |  29 +-
 .../quickstep/BaseActivityInterface.java      |   5 -
 .../quickstep/FallbackActivityInterface.java  |  10 -
 .../com/android/quickstep/GestureState.java   |  12 +-
 .../quickstep/LauncherActivityInterface.java  |  12 -
 .../quickstep/OverviewCommandHelper.java      |   9 -
 .../android/quickstep/RecentsActivity.java    |   1 -
 .../quickstep/TaskShortcutFactory.java        |   4 -
 .../AssistantInputConsumer.java               |  20 +-
 .../OverviewWithoutFocusInputConsumer.java    |  17 +-
 .../quickstep/util/RecentsOrientedState.java  |  11 +-
 .../views/DigitalWellBeingToast.java          |   5 +-
 .../android/quickstep/views/RecentsView.java  |  10 +-
 .../com/android/quickstep/views/TaskView.java |  14 +-
 res/values/config.xml                         |   1 -
 .../secondarydisplay/SDWorkModeTest.java      |   5 -
 .../launcher3/ui/LauncherUIScrollTest.java    |   5 -
 src/com/android/launcher3/BaseActivity.java   |  12 -
 .../android/launcher3/ButtonDropTarget.java   |   3 -
 .../android/launcher3/DeleteDropTarget.java   |  24 +-
 src/com/android/launcher3/Hotseat.java        |  23 +-
 src/com/android/launcher3/Launcher.java       |  33 +-
 src/com/android/launcher3/LauncherState.java  |  12 +-
 .../launcher3/SecondaryDropTarget.java        |  16 -
 src/com/android/launcher3/Workspace.java      |  33 +-
 .../allapps/AllAppsRecyclerView.java          |  15 +-
 .../launcher3/allapps/DiscoveryBounce.java    |  10 +-
 .../launcher3/anim/PendingAnimation.java      |  10 +-
 .../launcher3/dragndrop/AddItemActivity.java  |  30 +-
 .../launcher3/dragndrop/DragController.java   |   2 -
 src/com/android/launcher3/folder/Folder.java  |  34 +-
 .../android/launcher3/folder/FolderIcon.java  |   1 -
 .../launcher3/logging/LoggerUtils.java        | 190 ---------
 .../launcher3/logging/StatsLogManager.java    |  74 ++--
 .../launcher3/logging/StatsLogUtils.java      |  49 ---
 .../logging/UserEventDispatcher.java          | 373 ------------------
 .../launcher3/model/data/FolderInfo.java      | 119 ------
 .../notification/NotificationMainView.java    |   7 +-
 .../popup/PopupContainerWithArrow.java        |   9 +-
 .../launcher3/popup/RemoteActionShortcut.java |   4 -
 .../launcher3/popup/SystemShortcut.java       |   6 -
 .../android/launcher3/states/HintState.java   |   5 +-
 .../launcher3/states/SpringLoadedState.java   |   5 +-
 .../AbstractStateChangeTouchController.java   |  50 +--
 .../touch/AllAppsSwipeController.java         |   7 -
 .../uioverrides/states/AllAppsState.java      |   4 +-
 .../uioverrides/states/OverviewState.java     |   5 +-
 66 files changed, 232 insertions(+), 1566 deletions(-)
 delete mode 100644 protos/launcher_log.proto
 delete mode 100644 src/com/android/launcher3/logging/LoggerUtils.java
 delete mode 100644 src/com/android/launcher3/logging/StatsLogUtils.java
 delete mode 100644 src/com/android/launcher3/logging/UserEventDispatcher.java

diff --git a/Android.mk b/Android.mk
index 25f5412d21..349a134d75 100644
--- a/Android.mk
+++ b/Android.mk
@@ -36,18 +36,12 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
     launcher_log_protos_lite
 
 LOCAL_SRC_FILES := \
-    $(call all-proto-files-under, protos) \
-    $(call all-proto-files-under, proto_overrides) \
     $(call all-java-files-under, src_build_config) \
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
 LOCAL_PROGUARD_ENABLED := disabled
 
-LOCAL_PROTOC_OPTIMIZE_TYPE := nano
-LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/ --proto_path=$(LOCAL_PATH)/proto_overrides/
-LOCAL_PROTO_JAVA_OUTPUT_PARAMS := enum_style=java
-
 LOCAL_SDK_VERSION := current
 LOCAL_MIN_SDK_VERSION := 26
 LOCAL_MODULE := Launcher3CommonDepsLib
@@ -135,7 +129,6 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_STATIC_JAVA_LIBRARIES := \
     SystemUI-statsd \
     SystemUISharedLib \
-    launcherprotosnano \
     launcher_log_protos_lite
 ifneq (,$(wildcard frameworks/base))
   LOCAL_PRIVATE_PLATFORM_APIS := true
@@ -203,7 +196,6 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_STATIC_JAVA_LIBRARIES := \
     SystemUI-statsd \
     SystemUISharedLib \
-    launcherprotosnano \
     launcher_log_protos_lite
 ifneq (,$(wildcard frameworks/base))
   LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/build.gradle b/build.gradle
index 534ca65115..28a05d569c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -82,7 +82,6 @@ android {
             manifest.srcFile 'AndroidManifest-common.xml'
             proto {
                 srcDir 'protos/'
-                srcDir 'proto_overrides/'
             }
         }
 
@@ -150,7 +149,6 @@ dependencies {
     implementation "androidx.preference:preference:${ANDROID_X_VERSION}"
     implementation project(':IconLoader')
     withQuickstepImplementation project(':SharedLibWrapper')
-    implementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/libs", include: 'launcher_protos.jar')
 
     // Recents lib dependency
     withQuickstepImplementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/quickstep/libs", include: 'sysui_shared.jar')
@@ -171,20 +169,16 @@ dependencies {
 protobuf {
     // Configure the protoc executable
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.0.0'
-
-        generateProtoTasks {
-            all().each { task ->
-                task.builtins {
-                    remove java
-                    javanano {
-                        option "java_package=launcher_log_extension.proto|com.android.launcher3.userevent.nano"
-                        option "java_package=launcher_log.proto|com.android.launcher3.userevent.nano"
-                        option "java_package=launcher_dump.proto|com.android.launcher3.model.nano"
-                        option "enum_style=java"
-                    }
+        artifact = "com.google.protobuf:protoc:${protocVersion}"
+    }
+    generateProtoTasks {
+        all().each { task ->
+            task.builtins {
+                remove java
+                java {
+                    option "lite"
                 }
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/protos/launcher_log.proto b/protos/launcher_log.proto
deleted file mode 100644
index 9423cb2642..0000000000
--- a/protos/launcher_log.proto
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-syntax = "proto2";
-
-import "launcher_log_extension.proto";
-
-option java_package = "com.android.launcher3.userevent";
-option java_outer_classname = "LauncherLogProto";
-
-package userevent;
-
-message Target {
-  enum Type {
-    NONE = 0;
-    ITEM = 1;
-    CONTROL = 2;
-    CONTAINER = 3;
-  }
-
-  optional Type type = 1;
-
-  // For container type and item type
-  // Used mainly for ContainerType.FOLDER, ItemType.*
-  optional int32 page_index = 2;
-  optional int32 rank = 3;
-  optional int32 grid_x = 4;
-  optional int32 grid_y = 5;
-
-  // For container types only
-  optional ContainerType container_type = 6;
-  optional int32 cardinality = 7;
-
-  // For control types only
-  optional ControlType control_type = 8;
-
-  // For item types only
-  optional ItemType item_type = 9;
-  optional int32 package_name_hash = 10;
-  optional int32 component_hash = 11;      // Used for ItemType.WIDGET
-  optional int32 intent_hash = 12;         // Used for ItemType.SHORTCUT
-  optional int32 span_x = 13 [default = 1];// Used for ItemType.WIDGET
-  optional int32 span_y = 14 [default = 1];// Used for ItemType.WIDGET
-  optional int32 predictedRank = 15;
-  optional TargetExtension extension = 16;
-  optional TipType tip_type = 17;
-  optional int32 search_query_length = 18;
-  optional bool is_work_app = 19;
-  optional FromFolderLabelState from_folder_label_state = 20;
-  optional ToFolderLabelState to_folder_label_state = 21;
-
-  // Note: proto does not support duplicate enum values, even if they belong to different enum type.
-  // Hence "FROM" and "TO" prefix added.
-  enum FromFolderLabelState {
-    FROM_FOLDER_LABEL_STATE_UNSPECIFIED = 0;
-    FROM_EMPTY = 1;
-    FROM_CUSTOM = 2;
-    FROM_SUGGESTED = 3;
-  }
-
-  enum ToFolderLabelState {
-    TO_FOLDER_LABEL_STATE_UNSPECIFIED = 0;
-    TO_SUGGESTION0_WITH_VALID_PRIMARY = 1;
-    TO_SUGGESTION1_WITH_VALID_PRIMARY = 2;
-    TO_SUGGESTION1_WITH_EMPTY_PRIMARY = 3;
-    TO_SUGGESTION2_WITH_VALID_PRIMARY = 4;
-    TO_SUGGESTION2_WITH_EMPTY_PRIMARY = 5;
-    TO_SUGGESTION3_WITH_VALID_PRIMARY = 6;
-    TO_SUGGESTION3_WITH_EMPTY_PRIMARY = 7;
-    TO_EMPTY_WITH_VALID_SUGGESTIONS = 8 [deprecated = true];
-    TO_EMPTY_WITH_VALID_PRIMARY = 15;
-    TO_EMPTY_WITH_VALID_SUGGESTIONS_AND_EMPTY_PRIMARY = 16;
-    TO_EMPTY_WITH_EMPTY_SUGGESTIONS = 9;
-    TO_EMPTY_WITH_SUGGESTIONS_DISABLED = 10;
-    TO_CUSTOM_WITH_VALID_SUGGESTIONS = 11 [deprecated = true];
-    TO_CUSTOM_WITH_VALID_PRIMARY = 17;
-    TO_CUSTOM_WITH_VALID_SUGGESTIONS_AND_EMPTY_PRIMARY = 18;
-    TO_CUSTOM_WITH_EMPTY_SUGGESTIONS = 12;
-    TO_CUSTOM_WITH_SUGGESTIONS_DISABLED = 13;
-    UNCHANGED = 14;
-  }
-}
-
-// Used to define what type of item a Target would represent.
-enum ItemType {
-  DEFAULT_ITEMTYPE = 0;
-  APP_ICON = 1;
-  SHORTCUT = 2;
-  WIDGET = 3;
-  FOLDER_ICON = 4;
-  DEEPSHORTCUT = 5;
-  SEARCHBOX = 6;
-  EDITTEXT = 7;
-  NOTIFICATION = 8;
-  TASK = 9;         // Each page of Recents UI (QuickStep)
-  WEB_APP = 10;
-  TASK_ICON = 11;
-}
-
-// Used to define what type of container a Target would represent.
-enum ContainerType {
-  DEFAULT_CONTAINERTYPE = 0;
-  WORKSPACE = 1;
-  HOTSEAT = 2;
-  FOLDER = 3;
-  ALLAPPS = 4;
-  WIDGETS = 5;
-  OVERVIEW = 6;   // Zoomed out workspace (without QuickStep)
-  PREDICTION = 7;
-  SEARCHRESULT = 8;
-  DEEPSHORTCUTS = 9;
-  PINITEM = 10;    // confirmation screen
-  NAVBAR = 11;
-  TASKSWITCHER = 12; // Recents UI Container (QuickStep)
-  APP = 13; // Foreground activity is another app (QuickStep)
-  TIP = 14; // Onboarding texts (QuickStep)
-  OTHER_LAUNCHER_APP = 15;
-}
-
-// Used to define what type of control a Target would represent.
-enum ControlType {
-  DEFAULT_CONTROLTYPE = 0;
-  ALL_APPS_BUTTON = 1;
-  WIDGETS_BUTTON = 2;
-  WALLPAPER_BUTTON = 3;
-  SETTINGS_BUTTON = 4;
-  REMOVE_TARGET = 5;
-  UNINSTALL_TARGET = 6;
-  APPINFO_TARGET = 7;
-  RESIZE_HANDLE = 8;
-  VERTICAL_SCROLL = 9;
-  HOME_INTENT = 10; // Deprecated, use enum Command instead
-  BACK_BUTTON = 11;
-  QUICK_SCRUB_BUTTON = 12;
-  CLEAR_ALL_BUTTON = 13;
-  CANCEL_TARGET = 14;
-  TASK_PREVIEW = 15;
-  SPLIT_SCREEN_TARGET = 16;
-  REMOTE_ACTION_SHORTCUT = 17;
-  APP_USAGE_SETTINGS = 18;
-  BACK_GESTURE = 19;
-  UNDO = 20;
-  DISMISS_PREDICTION = 21;
-  HYBRID_HOTSEAT_ACCEPTED = 22;
-  HYBRID_HOTSEAT_CANCELED = 23;
-  OVERVIEW_ACTIONS_SHARE_BUTTON = 24;
-  OVERVIEW_ACTIONS_SCREENSHOT_BUTTON = 25;
-  OVERVIEW_ACTIONS_SELECT_BUTTON = 26;
-  SELECT_MODE_CLOSE_BUTTON = 27;
-  SELECT_MODE_ITEM = 28;
-}
-
-enum TipType {
-  DEFAULT_NONE = 0;
-  BOUNCE = 1;
-  SWIPE_UP_TEXT = 2;
-  QUICK_SCRUB_TEXT = 3;
-  PREDICTION_TEXT = 4;
-  DWB_TOAST = 5;
-  HYBRID_HOTSEAT = 6;
-}
-
-// Used to define the action component of the LauncherEvent.
-message Action {
-  enum Type {
-    TOUCH = 0;
-    AUTOMATED = 1;
-    COMMAND = 2;
-    TIP = 3;
-    SOFT_KEYBOARD = 4;
-    // HARD_KEYBOARD, ASSIST
-  }
-
-  enum Touch {
-    TAP = 0;
-    LONGPRESS = 1;
-    DRAGDROP = 2;
-    SWIPE = 3;
-    FLING = 4;
-    PINCH = 5;
-    SWIPE_NOOP = 6;
-  }
-
-  enum Direction {
-    NONE = 0;
-    UP = 1;
-    DOWN = 2;
-    LEFT = 3;
-    RIGHT = 4;
-    UPRIGHT = 5;
-    UPLEFT = 6;
-  }
-  enum Command {
-    HOME_INTENT = 0;
-    BACK = 1;
-    ENTRY = 2;          // Indicates entry to one of Launcher container type target
-                        // not using the HOME_INTENT
-    CANCEL = 3;         // Indicates that a confirmation screen was cancelled
-    CONFIRM = 4;        // Indicates thata confirmation screen was accepted
-    STOP = 5;           // Indicates onStop() was called (screen time out, power off)
-    RECENTS_BUTTON = 6; // Indicates that Recents button was pressed
-    RESUME = 7;         // Indicates onResume() was called
-  }
-
-  optional Type type = 1;
-  optional Touch touch = 2;
-  optional Direction dir = 3;
-  optional Command command = 4;
-  // Log if the action was performed on outside of the container
-  optional bool is_outside = 5;
-  optional bool is_state_change = 6;
-}
-
-//
-// Context free grammar of typical user interaction:
-//         Action (Touch) + Target
-//         Action (Touch) + Target + Target
-//
-message LauncherEvent {
-  required Action action = 1;
-  // List of targets that touch actions can be operated on.
-  repeated Target src_target = 2;
-  repeated Target dest_target = 3;
-
-  optional int64 action_duration_millis = 4;
-  optional int64 elapsed_container_millis = 5;
-  optional int64 elapsed_session_millis = 6;
-
-  optional bool is_in_multi_window_mode = 7 [deprecated = true];
-  optional bool is_in_landscape_mode = 8 [deprecated = true];
-
-  optional LauncherEventExtension extension = 9;
-}
diff --git a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
index d3c4c3d62d..5b066c6be6 100644
--- a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
+++ b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
@@ -16,11 +16,8 @@
 
 package com.android.launcher3.appprediction;
 
-import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
-import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
-import static com.android.launcher3.logging.LoggerUtils.newTarget;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -43,7 +40,6 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsSectionDecorator;
 import com.android.launcher3.allapps.FloatingHeaderRow;
@@ -53,13 +49,11 @@ import com.android.launcher3.anim.PropertySetter;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.keyboard.FocusIndicatorHelper;
 import com.android.launcher3.keyboard.FocusIndicatorHelper.SimpleFocusIndicatorHelper;
-import com.android.launcher3.logging.StatsLogUtils.LogContainerProvider;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.touch.ItemClickHandler;
 import com.android.launcher3.touch.ItemLongClickListener;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.launcher3.util.Themes;
 import com.android.quickstep.AnimatedFloat;
 
@@ -68,7 +62,7 @@ import java.util.List;
 
 @TargetApi(Build.VERSION_CODES.P)
 public class PredictionRowView extends LinearLayout implements
-        LogContainerProvider, OnDeviceProfileChangeListener, FloatingHeaderRow {
+        OnDeviceProfileChangeListener, FloatingHeaderRow {
 
     private static final IntProperty<PredictionRowView> TEXT_ALPHA =
             new IntProperty<PredictionRowView>("textAlpha") {
@@ -271,29 +265,6 @@ public class PredictionRowView extends LinearLayout implements
         mParent.onHeightUpdated();
     }
 
-    @Override
-    public void fillInLogContainerData(ItemInfo childInfo, LauncherLogProto.Target child,
-            ArrayList<LauncherLogProto.Target> parents) {
-        for (int i = 0; i < mPredictedApps.size(); i++) {
-            ItemInfoWithIcon appInfo = mPredictedApps.get(i);
-            if (appInfo == childInfo) {
-                child.predictedRank = i;
-                break;
-            }
-        }
-        parents.add(newContainerTarget(LauncherLogProto.ContainerType.PREDICTION));
-
-        // include where the prediction is coming this used to be Launcher#modifyUserEvent
-        LauncherLogProto.Target parent = newTarget(LauncherLogProto.Target.Type.CONTAINER);
-        LauncherState state = mLauncher.getStateManager().getState();
-        if (state == LauncherState.ALL_APPS) {
-            parent.containerType = LauncherLogProto.ContainerType.ALLAPPS;
-        } else if (state == OVERVIEW) {
-            parent.containerType = LauncherLogProto.ContainerType.TASKSWITCHER;
-        }
-        parents.add(parent);
-    }
-
     public void setTextAlpha(int textAlpha) {
         mIconLastSetTextAlpha = textAlpha;
         if (getAlpha() < 1 && textAlpha > 0) {
diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
index 151a113d1e..380735044d 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
@@ -55,7 +55,6 @@ import com.android.launcher3.popup.SystemShortcut;
 import com.android.launcher3.touch.ItemLongClickListener;
 import com.android.launcher3.uioverrides.PredictedAppIcon;
 import com.android.launcher3.uioverrides.QuickstepLauncher;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.launcher3.util.OnboardingPrefs;
 import com.android.launcher3.views.ArrowTipView;
 import com.android.launcher3.views.Snackbar;
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
index bce73cd4e4..a2e3bdf8a0 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
@@ -16,6 +16,7 @@
 package com.android.launcher3.uioverrides.states;
 
 import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_ALLAPPS;
 import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
 
 import android.content.Context;
@@ -23,7 +24,6 @@ import android.content.Context;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.allapps.AllAppsContainerView;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 
 /**
  * Definition for AllApps state
@@ -40,7 +40,7 @@ public class AllAppsState extends LauncherState {
     };
 
     public AllAppsState(int id) {
-        super(id, ContainerType.ALLAPPS, STATE_FLAGS);
+        super(id, LAUNCHER_STATE_ALLAPPS, STATE_FLAGS);
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
index 8ff05f2aaa..4b4f955204 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
@@ -15,12 +15,13 @@
  */
 package com.android.launcher3.uioverrides.states;
 
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
+
 import android.content.Context;
 
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.allapps.AllAppsTransitionController;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.quickstep.util.LayoutUtils;
 import com.android.quickstep.views.RecentsView;
 
@@ -33,7 +34,7 @@ public class BackgroundAppState extends OverviewState {
             | FLAG_WORKSPACE_INACCESSIBLE | FLAG_NON_INTERACTIVE | FLAG_CLOSE_POPUPS;
 
     public BackgroundAppState(int id) {
-        this(id, LauncherLogProto.ContainerType.TASKSWITCHER);
+        this(id, LAUNCHER_STATE_BACKGROUND);
     }
 
     protected BackgroundAppState(int id, int logContainer) {
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java
index fc0dcd5119..41c689d16d 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java
@@ -15,13 +15,14 @@
  */
 package com.android.launcher3.uioverrides.states;
 
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW;
+
 import android.content.Context;
 import android.graphics.Rect;
 
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.quickstep.views.RecentsView;
 
 /**
@@ -34,7 +35,7 @@ public class OverviewModalTaskState extends OverviewState {
             FLAG_DISABLE_RESTORE | FLAG_OVERVIEW_UI | FLAG_WORKSPACE_INACCESSIBLE;
 
     public OverviewModalTaskState(int id) {
-        super(id, ContainerType.OVERVIEW, STATE_FLAGS);
+        super(id, LAUNCHER_STATE_OVERVIEW, STATE_FLAGS);
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
index bbe7821864..525ff5816d 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -16,6 +16,7 @@
 package com.android.launcher3.uioverrides.states;
 
 import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW;
 import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
 import static com.android.quickstep.SysUINavigationMode.hideShelfInTwoButtonLandscape;
 import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
@@ -29,7 +30,6 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.Workspace;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.util.LayoutUtils;
 import com.android.quickstep.views.RecentsView;
@@ -51,7 +51,7 @@ public class OverviewState extends LauncherState {
     }
 
     protected OverviewState(int id, int stateFlags) {
-        this(id, ContainerType.TASKSWITCHER, stateFlags);
+        this(id, LAUNCHER_STATE_OVERVIEW, stateFlags);
     }
 
     protected OverviewState(int id, int logContainer, int stateFlags) {
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java
index 2c7373e206..51e72dacdc 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java
@@ -15,8 +15,9 @@
  */
 package com.android.launcher3.uioverrides.states;
 
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
+
 import com.android.launcher3.Launcher;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 
 /**
  * State to indicate we are about to launch a recent task. Note that this state is only used when
@@ -26,7 +27,7 @@ import com.android.launcher3.userevent.nano.LauncherLogProto;
 public class QuickSwitchState extends BackgroundAppState {
 
     public QuickSwitchState(int id) {
-        super(id, LauncherLogProto.ContainerType.APP);
+        super(id, LAUNCHER_STATE_BACKGROUND);
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeEdgeSwipeController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeEdgeSwipeController.java
index bef191ef8f..7a0f634b45 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeEdgeSwipeController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeEdgeSwipeController.java
@@ -12,8 +12,6 @@ import com.android.launcher3.LauncherState;
 import com.android.launcher3.states.StateAnimationConfig.AnimationFlags;
 import com.android.launcher3.touch.AbstractStateChangeTouchController;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
 import com.android.quickstep.SystemUiProxy;
 
 /**
@@ -45,11 +43,6 @@ public class LandscapeEdgeSwipeController extends AbstractStateChangeTouchContro
         return draggingFromNav ? OVERVIEW : NORMAL;
     }
 
-    @Override
-    protected int getLogContainerTypeForNormalState(MotionEvent ev) {
-        return LauncherLogProto.ContainerType.NAVBAR;
-    }
-
     @Override
     protected float getShiftRange() {
         return mLauncher.getDragLayer().getWidth();
@@ -65,13 +58,8 @@ public class LandscapeEdgeSwipeController extends AbstractStateChangeTouchContro
     }
 
     @Override
-    protected int getDirectionForLog() {
-        return mLauncher.getDeviceProfile().isSeascape() ? Direction.RIGHT : Direction.LEFT;
-    }
-
-    @Override
-    protected void onSwipeInteractionCompleted(LauncherState targetState, int logAction) {
-        super.onSwipeInteractionCompleted(targetState, logAction);
+    protected void onSwipeInteractionCompleted(LauncherState targetState) {
+        super.onSwipeInteractionCompleted(targetState);
         if (mStartState == NORMAL && targetState == OVERVIEW) {
             SystemUiProxy.INSTANCE.get(mLauncher).onOverviewShown(true, TAG);
         }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
index 76168440a8..d210bc6851 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
@@ -45,12 +45,9 @@ import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.compat.AccessibilityManagerCompat;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.graphics.OverviewScrim;
-import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
 import com.android.launcher3.util.TouchController;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
 import com.android.quickstep.util.AssistantUtilities;
@@ -211,7 +208,6 @@ public class NavBarToHomeTouchController implements TouchController,
     @Override
     public void onDragEnd(float velocity) {
         boolean fling = mSwipeDetector.isFling(velocity);
-        final int logAction = fling ? Touch.FLING : Touch.SWIPE;
         float progress = mCurrentAnimation.getProgressFraction();
         float interpolatedProgress = PULLBACK_INTERPOLATOR.getInterpolation(progress);
         boolean success = interpolatedProgress >= SUCCESS_TRANSITION_PROGRESS
@@ -230,7 +226,7 @@ public class NavBarToHomeTouchController implements TouchController,
                         () -> onSwipeInteractionCompleted(mEndState));
             }
             if (mStartState != mEndState) {
-                // TODO: add to WW log
+                logHomeGesture();
             }
             AbstractFloatingView topOpenView = AbstractFloatingView.getTopOpenView(mLauncher);
             if (topOpenView != null) {
@@ -255,17 +251,10 @@ public class NavBarToHomeTouchController implements TouchController,
         AccessibilityManagerCompat.sendStateEventToTest(mLauncher, targetState.ordinal);
     }
 
-    private void logStateChange(int startContainerType, int logAction) {
-        mLauncher.getUserEventDispatcher().logStateChangeAction(logAction,
-                LauncherLogProto.Action.Direction.UP,
-                mSwipeDetector.getDownX(), mSwipeDetector.getDownY(),
-                LauncherLogProto.ContainerType.NAVBAR,
-                startContainerType,
-                mEndState.containerType,
-                mLauncher.getWorkspace().getCurrentPage());
+    private void logHomeGesture() {
         mLauncher.getStatsLogManager().logger()
-                .withSrcState(StatsLogManager.containerTypeToAtomState(mStartState.containerType))
-                .withDstState(StatsLogManager.containerTypeToAtomState(mEndState.containerType))
+                .withSrcState(mStartState.statsLogOrdinal)
+                .withDstState(mEndState.statsLogOrdinal)
                 .log(LAUNCHER_HOME_GESTURE);
     }
 }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
index c78d4741d8..2a3bdbfcb8 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -49,7 +49,6 @@ import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.graphics.OverviewScrim;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.testing.TestProtocol;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
 import com.android.launcher3.util.VibratorWrapper;
 import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
@@ -207,7 +206,7 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
 
     private void maybeSwipeInteractionToOverviewComplete() {
         if (mReachedOverview && mDetector.isSettlingState()) {
-            onSwipeInteractionCompleted(OVERVIEW, Touch.SWIPE);
+            onSwipeInteractionCompleted(OVERVIEW);
         }
     }
 
@@ -251,7 +250,7 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
     private void goToOverviewOrHomeOnDragEnd(float velocity) {
         boolean goToHomeInsteadOfOverview = !mMotionPauseDetector.isPaused();
         if (goToHomeInsteadOfOverview) {
-            new OverviewToHomeAnim(mLauncher, ()-> onSwipeInteractionCompleted(NORMAL, Touch.FLING))
+            new OverviewToHomeAnim(mLauncher, ()-> onSwipeInteractionCompleted(NORMAL))
                     .animateWithVelocity(velocity);
         }
         if (mReachedOverview) {
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
index a6a3497f04..f378848a71 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
@@ -57,13 +57,9 @@ import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.graphics.OverviewScrim;
-import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.touch.BaseSwipeDetector;
 import com.android.launcher3.touch.BothAxesSwipeDetector;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
 import com.android.launcher3.util.TouchController;
 import com.android.launcher3.util.VibratorWrapper;
 import com.android.quickstep.AnimatedFloat;
@@ -287,7 +283,6 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
         boolean horizontalFling = mSwipeDetector.isFling(velocity.x);
         boolean verticalFling = mSwipeDetector.isFling(velocity.y);
         boolean noFling = !horizontalFling && !verticalFling;
-        int logAction = noFling ? Touch.SWIPE : Touch.FLING;
         if (mMotionPauseDetector.isPaused() && noFling) {
             cancelAnimations();
 
@@ -298,7 +293,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
             overviewAnim.addListener(new AnimatorListenerAdapter() {
                 @Override
                 public void onAnimationEnd(Animator animation) {
-                    onAnimationToStateCompleted(OVERVIEW, logAction);
+                    onAnimationToStateCompleted(OVERVIEW);
                 }
             });
             overviewAnim.start();
@@ -393,7 +388,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
         }
 
         nonOverviewAnim.setDuration(Math.max(xDuration, yDuration));
-        mNonOverviewAnim.setEndAction(() -> onAnimationToStateCompleted(targetState, logAction));
+        mNonOverviewAnim.setEndAction(() -> onAnimationToStateCompleted(targetState));
 
         cancelAnimations();
         xOverviewAnim.start();
@@ -401,27 +396,17 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
         nonOverviewAnim.start();
     }
 
-    private void onAnimationToStateCompleted(LauncherState targetState, int logAction) {
-        mLauncher.getUserEventDispatcher().logStateChangeAction(logAction,
-                getDirectionForLog(), mSwipeDetector.getDownX(), mSwipeDetector.getDownY(),
-                LauncherLogProto.ContainerType.NAVBAR,
-                mStartState.containerType,
-                targetState.containerType,
-                mLauncher.getWorkspace().getCurrentPage());
+    private void onAnimationToStateCompleted(LauncherState targetState) {
         mLauncher.getStatsLogManager().logger()
                 .withSrcState(LAUNCHER_STATE_HOME)
-                .withDstState(StatsLogManager.containerTypeToAtomState(targetState.containerType))
-                .log(getLauncherAtomEvent(mStartState.containerType, targetState.containerType,
+                .withDstState(targetState.statsLogOrdinal)
+                .log(getLauncherAtomEvent(mStartState.statsLogOrdinal, targetState.statsLogOrdinal,
                         targetState.ordinal > mStartState.ordinal
                                 ? LAUNCHER_UNKNOWN_SWIPEUP
                                 : LAUNCHER_UNKNOWN_SWIPEDOWN));
         mLauncher.getStateManager().goToState(targetState, false, this::clearState);
     }
 
-    private int getDirectionForLog() {
-        return Utilities.isRtl(mLauncher.getResources()) ? Direction.LEFT : Direction.RIGHT;
-    }
-
     private void cancelAnimations() {
         if (mNonOverviewAnim != null) {
             mNonOverviewAnim.getAnimationPlayer().cancel();
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java
index 90911684ec..45e5e2fb7c 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java
@@ -25,7 +25,6 @@ import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.quickstep.TouchInteractionService;
 import com.android.quickstep.views.RecentsView;
 
@@ -73,9 +72,4 @@ public class OverviewToAllAppsTouchController extends PortraitStatesTouchControl
         }
         return fromState;
     }
-
-    @Override
-    protected int getLogContainerTypeForNormalState(MotionEvent ev) {
-        return LauncherLogProto.ContainerType.WORKSPACE;
-    }
 }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
index 059a703075..037d9889fd 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
@@ -48,8 +48,6 @@ import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.AbstractStateChangeTouchController;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
 import com.android.launcher3.uioverrides.states.OverviewState;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.TouchInteractionService;
 import com.android.quickstep.util.LayoutUtils;
@@ -172,11 +170,6 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
         return fromState;
     }
 
-    @Override
-    protected int getLogContainerTypeForNormalState(MotionEvent ev) {
-        return isTouchOverHotseat(mLauncher, ev) ? ContainerType.HOTSEAT : ContainerType.WORKSPACE;
-    }
-
     private StateAnimationConfig getNormalToOverviewAnimation() {
         mAllAppsInterpolatorWrapper.baseInterpolator = LINEAR;
 
@@ -285,7 +278,7 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
 
     private void cancelPendingAnim() {
         if (mPendingAnimation != null) {
-            mPendingAnimation.finish(false, Touch.SWIPE);
+            mPendingAnimation.finish(false);
             mPendingAnimation = null;
         }
     }
@@ -320,8 +313,8 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
     }
 
     @Override
-    protected void onSwipeInteractionCompleted(LauncherState targetState, int logAction) {
-        super.onSwipeInteractionCompleted(targetState, logAction);
+    protected void onSwipeInteractionCompleted(LauncherState targetState) {
+        super.onSwipeInteractionCompleted(targetState);
         if (mStartState == NORMAL && targetState == OVERVIEW) {
             SystemUiProxy.INSTANCE.get(mLauncher).onOverviewShown(true, TAG);
         }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
index c643858e5c..b8c2030852 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
@@ -21,6 +21,7 @@ import static com.android.launcher3.anim.Interpolators.ACCEL_2;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
 import static com.android.launcher3.anim.Interpolators.INSTANT;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE;
@@ -41,8 +42,6 @@ import com.android.launcher3.Utilities;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.touch.AbstractStateChangeTouchController;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.SystemUiProxy;
@@ -92,14 +91,14 @@ public class QuickSwitchTouchController extends AbstractStateChangeTouchControll
     @Override
     public void onDragStart(boolean start, float startDisplacement) {
         super.onDragStart(start, startDisplacement);
-        mStartContainerType = LauncherLogProto.ContainerType.NAVBAR;
+        mStartContainerType = LAUNCHER_STATE_BACKGROUND;
         ActivityManagerWrapper.getInstance()
                 .closeSystemWindows(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
     }
 
     @Override
-    protected void onSwipeInteractionCompleted(LauncherState targetState, int logAction) {
-        super.onSwipeInteractionCompleted(targetState, logAction);
+    protected void onSwipeInteractionCompleted(LauncherState targetState) {
+        super.onSwipeInteractionCompleted(targetState);
     }
 
     @Override
@@ -153,14 +152,4 @@ public class QuickSwitchTouchController extends AbstractStateChangeTouchControll
     protected float getShiftRange() {
         return mLauncher.getDeviceProfile().widthPx / 2f;
     }
-
-    @Override
-    protected int getLogContainerTypeForNormalState(MotionEvent ev) {
-        return LauncherLogProto.ContainerType.NAVBAR;
-    }
-
-    @Override
-    protected int getDirectionForLog() {
-        return Utilities.isRtl(mLauncher.getResources()) ? Direction.LEFT : Direction.RIGHT;
-    }
 }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java
index 16bd9ed384..fe69c9b87d 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java
@@ -15,10 +15,12 @@
  */
 package com.android.launcher3.uioverrides.touchcontrollers;
 
+import static android.view.MotionEvent.ACTION_CANCEL;
 import static android.view.MotionEvent.ACTION_DOWN;
 import static android.view.MotionEvent.ACTION_MOVE;
 import static android.view.MotionEvent.ACTION_UP;
-import static android.view.MotionEvent.ACTION_CANCEL;
+
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SWIPE_DOWN_WORKSPACE_NOTISHADE_OPEN;
 
 import android.graphics.PointF;
 import android.util.SparseArray;
@@ -31,12 +33,9 @@ import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.launcher3.util.TouchController;
-
 import com.android.quickstep.SystemUiProxy;
+
 import java.io.PrintWriter;
 
 /**
@@ -133,9 +132,8 @@ public class StatusBarTouchController implements TouchController {
         int action = ev.getAction();
         if (action == ACTION_UP || action == ACTION_CANCEL) {
             dispatchTouchEvent(ev);
-            mLauncher.getUserEventDispatcher().logActionOnContainer(action == ACTION_UP ?
-                    Touch.FLING : Touch.SWIPE, Direction.DOWN, ContainerType.WORKSPACE,
-                    mLauncher.getWorkspace().getCurrentPage());
+            mLauncher.getStatsLogManager().logger()
+                    .log(LAUNCHER_SWIPE_DOWN_WORKSPACE_NOTISHADE_OPEN);
             setWindowSlippery(false);
             return true;
         }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
index df6194d4b2..186caf6dc1 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
@@ -36,7 +36,6 @@ import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.touch.BaseSwipeDetector;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
 import com.android.launcher3.util.FlingBlockCheck;
 import com.android.launcher3.util.TouchController;
 import com.android.launcher3.views.BaseDragLayer;
@@ -203,7 +202,7 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
             mCurrentAnimation.setPlayFraction(0);
         }
         if (mPendingAnimation != null) {
-            mPendingAnimation.finish(false, Touch.SWIPE);
+            mPendingAnimation.finish(false);
             mPendingAnimation = null;
         }
 
@@ -285,7 +284,6 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
     public void onDragEnd(float velocity) {
         boolean fling = mDetector.isFling(velocity);
         final boolean goingToEnd;
-        final int logAction;
         boolean blockedFling = fling && mFlingBlockCheck.isBlocked();
         if (blockedFling) {
             fling = false;
@@ -294,11 +292,9 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
         float progress = mCurrentAnimation.getProgressFraction();
         float interpolatedProgress = mCurrentAnimation.getInterpolatedProgress();
         if (fling) {
-            logAction = Touch.FLING;
             boolean goingUp = orientationHandler.isGoingUp(velocity, mIsRtl);
             goingToEnd = goingUp == mCurrentAnimationIsGoingUp;
         } else {
-            logAction = Touch.SWIPE;
             goingToEnd = interpolatedProgress > SUCCESS_TRANSITION_PROGRESS;
         }
         long animationDuration = BaseSwipeDetector.calculateDuration(
@@ -307,14 +303,14 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
             animationDuration *= LauncherAnimUtils.blockedFlingDurationFactor(velocity);
         }
 
-        mCurrentAnimation.setEndAction(() -> onCurrentAnimationEnd(goingToEnd, logAction));
+        mCurrentAnimation.setEndAction(() -> onCurrentAnimationEnd(goingToEnd));
         mCurrentAnimation.startWithVelocity(mActivity, goingToEnd,
                 velocity, mEndDisplacement, animationDuration);
     }
 
-    private void onCurrentAnimationEnd(boolean wasSuccess, int logAction) {
+    private void onCurrentAnimationEnd(boolean wasSuccess) {
         if (mPendingAnimation != null) {
-            mPendingAnimation.finish(wasSuccess, logAction);
+            mPendingAnimation.finish(wasSuccess);
             mPendingAnimation = null;
         }
         clearState();
@@ -326,7 +322,7 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
         mTaskBeingDragged = null;
         mCurrentAnimation = null;
         if (mPendingAnimation != null) {
-            mPendingAnimation.finish(false, Touch.SWIPE);
+            mPendingAnimation.finish(false);
             mPendingAnimation = null;
         }
     }
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 22e6755eb1..6774433a1f 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -75,12 +75,8 @@ import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.logging.StatsLogManager.StatsLogger;
-import com.android.launcher3.logging.UserEventDispatcher;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.testing.TestProtocol;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.launcher3.util.TraceHelper;
 import com.android.launcher3.util.VibratorWrapper;
 import com.android.launcher3.util.WindowBounds;
@@ -219,8 +215,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
 
     private boolean mPassedOverviewThreshold;
     private boolean mGestureStarted;
-    private int mLogAction = Touch.SWIPE;
-    private int mLogDirection = Direction.UP;
+    private boolean mLogDirectionUpOrLeft = true;
     private PointF mDownPos;
     private boolean mIsLikelyToStartNewTask;
 
@@ -745,7 +740,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
     public void onGestureCancelled() {
         updateDisplacement(0);
         mStateCallback.setStateOnUiThread(STATE_GESTURE_COMPLETED);
-        mLogAction = Touch.SWIPE_NOOP;
         handleNormalGestureEnd(0, false, new PointF(), true /* isCancel */);
     }
 
@@ -761,13 +755,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         boolean isFling = mGestureStarted && !mIsMotionPaused
                 && Math.abs(endVelocity) > flingThreshold;
         mStateCallback.setStateOnUiThread(STATE_GESTURE_COMPLETED);
-
-        mLogAction = isFling ? Touch.FLING : Touch.SWIPE;
         boolean isVelocityVertical = Math.abs(velocity.y) > Math.abs(velocity.x);
         if (isVelocityVertical) {
-            mLogDirection = velocity.y < 0 ? Direction.UP : Direction.DOWN;
+            mLogDirectionUpOrLeft = velocity.y < 0;
         } else {
-            mLogDirection = velocity.x < 0 ? Direction.LEFT : Direction.RIGHT;
+            mLogDirectionUpOrLeft = velocity.x < 0;
         }
         mDownPos = downPos;
         handleNormalGestureEnd(endVelocity, isFling, velocity, false /* isCancel */);
@@ -979,8 +971,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                 break;
             case LAST_TASK:
             case NEW_TASK:
-                event = (mLogDirection == Direction.LEFT)
-                        ? LAUNCHER_QUICKSWITCH_LEFT
+                event = mLogDirectionUpOrLeft ? LAUNCHER_QUICKSWITCH_LEFT
                         : LAUNCHER_QUICKSWITCH_RIGHT;
                 break;
             default:
@@ -988,12 +979,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         }
         StatsLogger logger = StatsLogManager.newInstance(mContext).logger()
                 .withSrcState(LAUNCHER_STATE_BACKGROUND)
-                .withDstState(StatsLogManager.containerTypeToAtomState(endTarget.containerType));
+                .withDstState(endTarget.containerType);
         if (targetTask != null) {
             logger.withItemInfo(targetTask.getItemInfo());
         }
-        logger.log(event);
-
 
         DeviceProfile dp = mDp;
         if (dp == null || mDownPos == null) {
@@ -1003,12 +992,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         int pageIndex = endTarget == LAST_TASK
                 ? LOG_NO_OP_PAGE_INDEX
                 : mRecentsView.getNextPage();
-        UserEventDispatcher.newInstance(mContext).logStateChangeAction(
-                mLogAction, mLogDirection,
-                (int) mDownPos.x, (int) mDownPos.y,
-                ContainerType.NAVBAR, ContainerType.APP,
-                endTarget.containerType,
-                pageIndex);
+        // TODO: set correct container using the pageIndex
+        logger.log(event);
     }
 
     /** Animates to the given progress, where 0 is the current app and 1 is overview. */
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index 8b108ac299..d35e270dd5 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -152,11 +152,6 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
     public abstract void onExitOverview(RotationTouchHelper deviceState,
             Runnable exitRunnable);
 
-    /**
-     * Used for containerType in {@link com.android.launcher3.logging.UserEventDispatcher}
-     */
-    public abstract int getContainerType();
-
     public abstract boolean isInLiveTileMode();
 
     public abstract void onLaunchTaskFailed();
diff --git a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
index 3898f0b0ca..2885abff1b 100644
--- a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
@@ -28,7 +28,6 @@ import androidx.annotation.Nullable;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.R;
 import com.android.launcher3.touch.PagedOrientationHandler;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.quickstep.fallback.RecentsState;
 import com.android.quickstep.util.ActivityInitListener;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
@@ -144,15 +143,6 @@ public final class FallbackActivityInterface extends
         // no-op, fake landscape not supported for 3P
     }
 
-    @Override
-    public int getContainerType() {
-        RecentsActivity activity = getCreatedActivity();
-        boolean visible = activity != null && activity.isStarted() && activity.hasWindowFocus();
-        return visible
-                ? LauncherLogProto.ContainerType.OTHER_LAUNCHER_APP
-                : LauncherLogProto.ContainerType.APP;
-    }
-
     @Override
     public boolean isInLiveTileMode() {
         return false;
diff --git a/quickstep/src/com/android/quickstep/GestureState.java b/quickstep/src/com/android/quickstep/GestureState.java
index 00b5eb9880..9c23c8320b 100644
--- a/quickstep/src/com/android/quickstep/GestureState.java
+++ b/quickstep/src/com/android/quickstep/GestureState.java
@@ -15,6 +15,9 @@
  */
 package com.android.quickstep;
 
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW;
 import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;
 
 import android.annotation.TargetApi;
@@ -23,7 +26,6 @@ import android.content.Intent;
 import android.os.Build;
 
 import com.android.launcher3.statemanager.StatefulActivity;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.quickstep.util.ActiveGestureLog;
 import com.android.systemui.shared.recents.model.ThumbnailData;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
@@ -44,13 +46,13 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL
      * Defines the end targets of a gesture and the associated state.
      */
     public enum GestureEndTarget {
-        HOME(true, ContainerType.WORKSPACE, false),
+        HOME(true, LAUNCHER_STATE_HOME, false),
 
-        RECENTS(true, ContainerType.TASKSWITCHER, true),
+        RECENTS(true, LAUNCHER_STATE_OVERVIEW, true),
 
-        NEW_TASK(false, ContainerType.APP, true),
+        NEW_TASK(false, LAUNCHER_STATE_BACKGROUND, true),
 
-        LAST_TASK(false, ContainerType.APP, true);
+        LAST_TASK(false, LAUNCHER_STATE_BACKGROUND, true);
 
         GestureEndTarget(boolean isLauncher, int containerType,
                 boolean recentsAttachedToAppWindow) {
diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
index 036d473060..98b8455e51 100644
--- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
@@ -44,7 +44,6 @@ import com.android.launcher3.statehandlers.DepthController.ClampedDepthProperty;
 import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.PagedOrientationHandler;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.util.ActivityInitListener;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
@@ -208,10 +207,6 @@ public final class LauncherActivityInterface extends
             return false;
         }
 
-        launcher.getUserEventDispatcher().logActionCommand(
-                LauncherLogProto.Action.Command.RECENTS_BUTTON,
-                getContainerType(),
-                LauncherLogProto.ContainerType.TASKSWITCHER);
         launcher.getStateManager().goToState(OVERVIEW,
                 launcher.getStateManager().shouldAnimateStateChange(), onCompleteCallback);
         return true;
@@ -252,13 +247,6 @@ public final class LauncherActivityInterface extends
         return true;
     }
 
-    @Override
-    public int getContainerType() {
-        final Launcher launcher = getVisibleLauncher();
-        return launcher != null ? launcher.getStateManager().getState().containerType
-                : LauncherLogProto.ContainerType.APP;
-    }
-
     @Override
     public boolean isInLiveTileMode() {
         Launcher launcher = getCreatedActivity();
diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
index 365cff576a..2b10989ec5 100644
--- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
@@ -30,7 +30,6 @@ import android.view.ViewConfiguration;
 import androidx.annotation.BinderThread;
 
 import com.android.launcher3.statemanager.StatefulActivity;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.quickstep.util.ActivityInitListener;
 import com.android.quickstep.util.RemoteAnimationProvider;
 import com.android.quickstep.views.RecentsView;
@@ -150,7 +149,6 @@ public class OverviewCommandHelper {
         private final AppToOverviewAnimationProvider<T> mAnimationProvider;
 
         private final long mToggleClickedTime = SystemClock.uptimeMillis();
-        private boolean mUserEventLogged;
         private ActivityInitListener mListener;
 
         public RecentsActivityCommand() {
@@ -212,13 +210,6 @@ public class OverviewCommandHelper {
 
         private boolean onActivityReady(Boolean wasVisible) {
             final T activity = mActivityInterface.getCreatedActivity();
-            if (!mUserEventLogged) {
-                activity.getUserEventDispatcher().logActionCommand(
-                        LauncherLogProto.Action.Command.RECENTS_BUTTON,
-                        mActivityInterface.getContainerType(),
-                        LauncherLogProto.ContainerType.TASKSWITCHER);
-                mUserEventLogged = true;
-            }
             return mAnimationProvider.onActivityReady(activity, wasVisible);
         }
 
diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index 6f2f9fb523..0e32c95199 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -118,7 +118,6 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
          * etc.)
          */
     protected void onHandleConfigChanged() {
-        mUserEventDispatcher = null;
         initDeviceProfile();
 
         AbstractFloatingView.closeOpenViews(this, true,
diff --git a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
index 2b55b805c6..65bb0f35d1 100644
--- a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
@@ -21,7 +21,6 @@ import static android.view.Display.DEFAULT_DISPLAY;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_SELECTIONS;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SYSTEM_SHORTCUT_FREE_FORM_TAP;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SYSTEM_SHORTCUT_SPLIT_SCREEN_TAP;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.TAP;
 
 import android.app.Activity;
 import android.app.ActivityOptions;
@@ -39,7 +38,6 @@ import com.android.launcher3.logging.StatsLogManager.LauncherEvent;
 import com.android.launcher3.model.WellbeingModel;
 import com.android.launcher3.popup.SystemShortcut;
 import com.android.launcher3.popup.SystemShortcut.AppInfo;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.launcher3.util.Executors;
 import com.android.launcher3.util.InstantAppResolver;
 import com.android.quickstep.views.RecentsView;
@@ -228,8 +226,6 @@ public interface TaskShortcutFactory {
 
         @Override
         protected boolean onActivityStarted(BaseDraggingActivity activity) {
-            activity.getUserEventDispatcher().logActionOnControl(TAP,
-                    LauncherLogProto.ControlType.SPLIT_SCREEN_TARGET);
             return true;
         }
     };
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java
index 89e6931ed9..580e4ec807 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java
@@ -25,12 +25,6 @@ import static android.view.MotionEvent.ACTION_POINTER_UP;
 import static android.view.MotionEvent.ACTION_UP;
 
 import static com.android.launcher3.Utilities.squaredHypot;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction.UPLEFT;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction.UPRIGHT;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.FLING;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.SWIPE;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.SWIPE_NOOP;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType.NAVBAR;
 
 import android.animation.ValueAnimator;
 import android.content.Context;
@@ -47,7 +41,6 @@ import android.view.ViewConfiguration;
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.R;
 import com.android.launcher3.anim.Interpolators;
-import com.android.launcher3.logging.UserEventDispatcher;
 import com.android.quickstep.BaseActivityInterface;
 import com.android.quickstep.GestureState;
 import com.android.quickstep.InputConsumer;
@@ -80,7 +73,6 @@ public class AssistantInputConsumer extends DelegateInputConsumer {
     private float mTimeFraction;
     private long mDragTime;
     private float mLastProgress;
-    private int mDirection;
     private BaseActivityInterface mActivityInterface;
 
     private final float mDragDistThreshold;
@@ -197,8 +189,6 @@ public class AssistantInputConsumer extends DelegateInputConsumer {
                 if (mState != STATE_DELEGATE_ACTIVE && !mLaunchedAssistant) {
                     ValueAnimator animator = ValueAnimator.ofFloat(mLastProgress, 0)
                         .setDuration(RETRACT_ANIMATION_DURATION_MS);
-                    UserEventDispatcher.newInstance(mContext).logActionOnContainer(
-                        SWIPE_NOOP, mDirection, NAVBAR);
                     animator.addUpdateListener(valueAnimator -> {
                         float progress = (float) valueAnimator.getAnimatedValue();
                         SystemUiProxy.INSTANCE.get(mContext).onAssistantProgress(progress);
@@ -223,7 +213,7 @@ public class AssistantInputConsumer extends DelegateInputConsumer {
             mLastProgress = Math.min(mDistance * 1f / mDragDistThreshold, 1) * mTimeFraction;
             if (mDistance >= mDragDistThreshold && mTimeFraction >= 1) {
                 SystemUiProxy.INSTANCE.get(mContext).onAssistantGestureCompletion(0);
-                startAssistantInternal(SWIPE);
+                startAssistantInternal();
 
                 Bundle args = new Bundle();
                 args.putInt(OPA_BUNDLE_TRIGGER, OPA_BUNDLE_TRIGGER_DIAG_SWIPE_GESTURE);
@@ -236,10 +226,7 @@ public class AssistantInputConsumer extends DelegateInputConsumer {
         }
     }
 
-    private void startAssistantInternal(int gestureType) {
-        UserEventDispatcher.newInstance(mContext)
-            .logActionOnContainer(gestureType, mDirection, NAVBAR);
-
+    private void startAssistantInternal() {
         BaseDraggingActivity launcherActivity = mActivityInterface.getCreatedActivity();
         if (launcherActivity != null) {
             launcherActivity.getRootView().performHapticFeedback(
@@ -253,7 +240,6 @@ public class AssistantInputConsumer extends DelegateInputConsumer {
      */
     private boolean isValidAssistantGestureAngle(float deltaX, float deltaY) {
         float angle = (float) Math.toDegrees(Math.atan2(deltaY, deltaX));
-        mDirection = angle > 90 ? UPLEFT : UPRIGHT;
 
         // normalize so that angle is measured clockwise from horizontal in the bottom right corner
         // and counterclockwise from horizontal in the bottom left corner
@@ -272,7 +258,7 @@ public class AssistantInputConsumer extends DelegateInputConsumer {
                 mLastProgress = 1;
                 SystemUiProxy.INSTANCE.get(mContext).onAssistantGestureCompletion(
                     (float) Math.sqrt(velocityX * velocityX + velocityY * velocityY));
-                startAssistantInternal(FLING);
+                startAssistantInternal();
 
                 Bundle args = new Bundle();
                 args.putInt(INVOCATION_TYPE_KEY, INVOCATION_TYPE_GESTURE);
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java
index 1c77a0593d..924b32c015 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java
@@ -15,6 +15,7 @@
  */
 package com.android.quickstep.inputconsumers;
 
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE;
 
@@ -27,9 +28,6 @@ import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.logger.LauncherAtom;
 import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.TestProtocol;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
 import com.android.quickstep.GestureState;
 import com.android.quickstep.InputConsumer;
 import com.android.quickstep.RecentsAnimationDeviceState;
@@ -82,17 +80,12 @@ public class OverviewWithoutFocusInputConsumer implements InputConsumer,
         mContext.startActivity(mGestureState.getHomeIntent());
         ActiveGestureLog.INSTANCE.addLog("startQuickstep");
         BaseActivity activity = BaseDraggingActivity.fromContext(mContext);
-        int pageIndex = -1; // This number doesn't reflect workspace page index.
-                            // It only indicates that launcher client screen was shown.
-        int containerType = (mGestureState != null && mGestureState.getEndTarget() != null)
+        int state = (mGestureState != null && mGestureState.getEndTarget() != null)
                 ? mGestureState.getEndTarget().containerType
-                : LauncherLogProto.ContainerType.WORKSPACE;
-        activity.getUserEventDispatcher().logActionOnContainer(
-                wasFling ? Touch.FLING : Touch.SWIPE, Direction.UP, containerType, pageIndex);
-        activity.getUserEventDispatcher().setPreviousHomeGesture(true);
+                : LAUNCHER_STATE_HOME;
         activity.getStatsLogManager().logger()
-                .withSrcState(LAUNCHER_STATE_HOME)
-                .withDstState(LAUNCHER_STATE_HOME)
+                .withSrcState(LAUNCHER_STATE_BACKGROUND)
+                .withDstState(state)
                 .withContainerInfo(LauncherAtom.ContainerInfo.newBuilder()
                         .setWorkspace(
                                 LauncherAtom.WorkspaceContainer.newBuilder()
diff --git a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
index df9b0cf435..de44e07bae 100644
--- a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
+++ b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
@@ -23,7 +23,6 @@ import static android.view.Surface.ROTATION_180;
 import static android.view.Surface.ROTATION_270;
 import static android.view.Surface.ROTATION_90;
 
-import static com.android.launcher3.logging.LoggerUtils.extractObjectNameAndAddress;
 import static com.android.launcher3.states.RotationHelper.ALLOW_ROTATION_PREFERENCE_KEY;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
@@ -72,6 +71,7 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
 
     private static final String TAG = "RecentsOrientedState";
     private static final boolean DEBUG = false;
+    private static final String DELIMITER_DOT = "\\.";
 
     private ContentObserver mSystemAutoRotateObserver = new ContentObserver(new Handler()) {
         @Override
@@ -534,4 +534,13 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
                 ? idp.landscapeProfile
                 : idp.portraitProfile;
     }
+
+    /**
+     * String conversion for only the helpful parts of {@link Object#toString()} method
+     * @param stringToExtract "foo.bar.baz.MyObject@1234"
+     * @return "MyObject@1234"
+     */
+    private static String extractObjectNameAndAddress(String stringToExtract) {
+        return stringToExtract.substring(stringToExtract.lastIndexOf(DELIMITER_DOT));
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
index b06d4bc355..95bde801bf 100644
--- a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
+++ b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
@@ -42,7 +42,6 @@ import androidx.annotation.StringRes;
 import com.android.launcher3.BaseActivity;
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.R;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.systemui.shared.recents.model.Task;
 
 import java.time.Duration;
@@ -217,8 +216,8 @@ public final class DigitalWellBeingToast {
                     view, 0, 0,
                     view.getWidth(), view.getHeight());
             activity.startActivity(intent, options.toBundle());
-            activity.getUserEventDispatcher().logActionOnControl(LauncherLogProto.Action.Touch.TAP,
-                    LauncherLogProto.ControlType.APP_USAGE_SETTINGS, view);
+
+            // TODO: add WW logging on the app usage settings click.
         } catch (ActivityNotFoundException e) {
             Log.e(TAG, "Failed to open app usage settings for task "
                     + mTask.getTopComponent().getPackageName(), e);
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 0d1dd22ba5..4bfa4da42a 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -35,12 +35,11 @@ import static com.android.launcher3.anim.Interpolators.ACCEL_2;
 import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_CLEAR_ALL;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_DISMISS_SWIPE_UP;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_SWIPE_DOWN;
 import static com.android.launcher3.statehandlers.DepthController.DEPTH;
 import static com.android.launcher3.uioverrides.touchcontrollers.TaskViewTouchController.SUCCESS_TRANSITION_PROGRESS;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.TAP;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.ControlType.CLEAR_ALL_BUTTON;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW;
 import static com.android.quickstep.TaskUtils.checkCurrentOrManagedUserId;
@@ -108,7 +107,6 @@ import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.touch.PagedOrientationHandler.CurveProperties;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.DynamicResource;
 import com.android.launcher3.util.MultiValueAlpha;
@@ -1463,7 +1461,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     public PendingAnimation createTaskDismissAnimation(TaskView taskView, boolean animateTaskView,
             boolean shouldRemoveTask, long duration) {
         if (mPendingAnimation != null) {
-            mPendingAnimation.finish(false, Touch.SWIPE);
+            mPendingAnimation.finish(false);
         }
         PendingAnimation anim = new PendingAnimation(duration);
 
@@ -1625,7 +1623,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     protected void runDismissAnimation(PendingAnimation pendingAnim) {
         AnimatorPlaybackController controller = pendingAnim.createPlaybackController();
         controller.dispatchOnStart();
-        controller.setEndAction(() -> pendingAnim.finish(true, Touch.SWIPE));
+        controller.setEndAction(() -> pendingAnim.finish(true));
         controller.getAnimationPlayer().setInterpolator(FAST_OUT_SLOW_IN);
         controller.start();
     }
@@ -1638,7 +1636,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     @SuppressWarnings("unused")
     private void dismissAllTasks(View view) {
         runDismissAnimation(createAllTasksDismissAnimation(DISMISS_TASK_DURATION));
-        mActivity.getUserEventDispatcher().logActionOnControl(TAP, CLEAR_ALL_BUTTON);
+        mActivity.getStatsLogManager().logger().log(LAUNCHER_TASK_CLEAR_ALL);
     }
 
     private void dismissCurrentTask() {
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 6a2ab5a304..034d9fb7f7 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -73,15 +73,11 @@ import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.anim.PendingAnimation;
-import com.android.launcher3.logging.UserEventDispatcher;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.popup.SystemShortcut;
 import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.PagedOrientationHandler;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.TransformingTouchDelegate;
 import com.android.launcher3.util.ViewPool.Reusable;
@@ -368,7 +364,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
                 this, RECENTS_LAUNCH_DURATION, TOUCH_RESPONSE_INTERPOLATOR);
         AnimatorPlaybackController currentAnimation = pendingAnimation.createPlaybackController();
         currentAnimation.setEndAction(() -> {
-            pendingAnimation.finish(true, Touch.SWIPE);
+            pendingAnimation.finish(true);
             launchTask(false);
         });
         return currentAnimation;
@@ -483,15 +479,13 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         }
     }
 
-    private boolean showTaskMenu(int action) {
+    private boolean showTaskMenu() {
         if (!getRecentsView().isClearAllHidden()) {
             getRecentsView().snapToPage(getRecentsView().indexOfChild(this));
         } else {
             mMenuView = TaskMenuView.showForTask(this);
             mActivity.getStatsLogManager().logger().withItemInfo(getItemInfo())
                     .log(LAUNCHER_TASK_ICON_TAP_OR_LONGPRESS);
-            UserEventDispatcher.newInstance(getContext()).logActionOnItem(action, Direction.NONE,
-                    LauncherLogProto.ItemType.TASK_ICON);
             if (mMenuView != null) {
                 mMenuView.addOnAttachStateChangeListener(mTaskMenuStateListener);
             }
@@ -502,10 +496,10 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     private void setIcon(Drawable icon) {
         if (icon != null) {
             mIconView.setDrawable(icon);
-            mIconView.setOnClickListener(v -> showTaskMenu(Touch.TAP));
+            mIconView.setOnClickListener(v -> showTaskMenu());
             mIconView.setOnLongClickListener(v -> {
                 requestDisallowInterceptTouchEvent(true);
-                return showTaskMenu(Touch.LONGPRESS);
+                return showTaskMenu();
             });
         } else {
             mIconView.setDrawable(null);
diff --git a/res/values/config.xml b/res/values/config.xml
index 325b62f9dc..46b8c23a62 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -59,7 +59,6 @@
     <bool name="hotseat_transpose_layout_with_orientation">true</bool>
 
     <!-- Various classes overriden by projects/build flavors. -->
-    <string name="user_event_dispatcher_class" translatable="false"></string>
     <string name="folder_name_provider_class" translatable="false"></string>
     <string name="stats_log_manager_class" translatable="false"></string>
     <string name="app_transition_manager_class" translatable="false"></string>
diff --git a/robolectric_tests/src/com/android/launcher3/secondarydisplay/SDWorkModeTest.java b/robolectric_tests/src/com/android/launcher3/secondarydisplay/SDWorkModeTest.java
index 0ca5ce6f44..baae2a6a80 100644
--- a/robolectric_tests/src/com/android/launcher3/secondarydisplay/SDWorkModeTest.java
+++ b/robolectric_tests/src/com/android/launcher3/secondarydisplay/SDWorkModeTest.java
@@ -21,7 +21,6 @@ import static com.android.launcher3.util.Preconditions.assertNotNull;
 
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
 
 import android.content.Context;
 import android.os.UserManager;
@@ -30,8 +29,6 @@ import android.provider.Settings;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.allapps.AllAppsPagedView;
 import com.android.launcher3.allapps.AllAppsRecyclerView;
-import com.android.launcher3.logging.UserEventDispatcher;
-import com.android.launcher3.shadows.ShadowOverrides;
 import com.android.launcher3.util.LauncherLayoutBuilder;
 import com.android.launcher3.util.LauncherModelHelper;
 
@@ -69,8 +66,6 @@ public class SDWorkModeTest {
         mModelHelper = new LauncherModelHelper();
         mTargetContext = RuntimeEnvironment.application;
         mIdp = InvariantDeviceProfile.INSTANCE.get(mTargetContext);
-        ShadowOverrides.setProvider(UserEventDispatcher.class,
-                c -> mock(UserEventDispatcher.class));
         Settings.Global.putFloat(mTargetContext.getContentResolver(),
                 Settings.Global.WINDOW_ANIMATION_SCALE, 0);
 
diff --git a/robolectric_tests/src/com/android/launcher3/ui/LauncherUIScrollTest.java b/robolectric_tests/src/com/android/launcher3/ui/LauncherUIScrollTest.java
index d330d10133..957ae77eee 100644
--- a/robolectric_tests/src/com/android/launcher3/ui/LauncherUIScrollTest.java
+++ b/robolectric_tests/src/com/android/launcher3/ui/LauncherUIScrollTest.java
@@ -20,7 +20,6 @@ import static com.android.launcher3.util.LauncherUIHelper.doLayout;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
-import static org.mockito.Mockito.mock;
 
 import android.content.Context;
 import android.os.SystemClock;
@@ -36,8 +35,6 @@ import com.android.launcher3.LauncherState;
 import com.android.launcher3.folder.Folder;
 import com.android.launcher3.folder.FolderIcon;
 import com.android.launcher3.folder.FolderPagedView;
-import com.android.launcher3.logging.UserEventDispatcher;
-import com.android.launcher3.shadows.ShadowOverrides;
 import com.android.launcher3.util.LauncherLayoutBuilder;
 import com.android.launcher3.util.LauncherLayoutBuilder.FolderBuilder;
 import com.android.launcher3.util.LauncherModelHelper;
@@ -70,8 +67,6 @@ public class LauncherUIScrollTest {
         mModelHelper = new LauncherModelHelper();
         mTargetContext = RuntimeEnvironment.application;
         mIdp = InvariantDeviceProfile.INSTANCE.get(mTargetContext);
-        ShadowOverrides.setProvider(UserEventDispatcher.class,
-                c -> mock(UserEventDispatcher.class));
 
         Settings.Global.putFloat(mTargetContext.getContentResolver(),
                 Settings.Global.WINDOW_ANIMATION_SCALE, 0);
diff --git a/src/com/android/launcher3/BaseActivity.java b/src/com/android/launcher3/BaseActivity.java
index 310c306f19..5e50e278f0 100644
--- a/src/com/android/launcher3/BaseActivity.java
+++ b/src/com/android/launcher3/BaseActivity.java
@@ -37,8 +37,6 @@ import androidx.annotation.IntDef;
 
 import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
 import com.android.launcher3.logging.StatsLogManager;
-import com.android.launcher3.logging.UserEventDispatcher;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.launcher3.util.SystemUiController;
 import com.android.launcher3.util.ViewCache;
 import com.android.launcher3.views.ActivityContext;
@@ -82,7 +80,6 @@ public abstract class BaseActivity extends Activity implements ActivityContext {
             new ArrayList<>();
 
     protected DeviceProfile mDeviceProfile;
-    protected UserEventDispatcher mUserEventDispatcher;
     protected StatsLogManager mStatsLogManager;
     protected SystemUiController mSystemUiController;
 
@@ -144,8 +141,6 @@ public abstract class BaseActivity extends Activity implements ActivityContext {
         return mDeviceProfile;
     }
 
-    public void modifyUserEvent(LauncherLogProto.LauncherEvent event) {}
-
     public final StatsLogManager getStatsLogManager() {
         if (mStatsLogManager == null) {
             mStatsLogManager = StatsLogManager.newInstance(this);
@@ -153,13 +148,6 @@ public abstract class BaseActivity extends Activity implements ActivityContext {
         return mStatsLogManager;
     }
 
-    public final UserEventDispatcher getUserEventDispatcher() {
-        if (mUserEventDispatcher == null) {
-            mUserEventDispatcher = UserEventDispatcher.newInstance(this);
-        }
-        return mUserEventDispatcher;
-    }
-
     public SystemUiController getSystemUiController() {
         if (mSystemUiController == null) {
             mSystemUiController = new SystemUiController(getWindow());
diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
index 09827d664b..df005e6357 100644
--- a/src/com/android/launcher3/ButtonDropTarget.java
+++ b/src/com/android/launcher3/ButtonDropTarget.java
@@ -47,7 +47,6 @@ import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.dragndrop.DragView;
 import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.util.Thunk;
 
@@ -395,6 +394,4 @@ public abstract class ButtonDropTarget extends TextView
                 TextUtils.TruncateAt.END);
         return !mText.equals(displayedText);
     }
-
-    public abstract Target getDropTargetForLogging();
 }
diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java
index 28574972ad..cc119c9361 100644
--- a/src/com/android/launcher3/DeleteDropTarget.java
+++ b/src/com/android/launcher3/DeleteDropTarget.java
@@ -18,8 +18,7 @@ package com.android.launcher3;
 
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ITEM_DROPPED_ON_CANCEL;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ITEM_DROPPED_ON_REMOVE;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.TAP;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.ControlType.UNDO;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_UNDO;
 
 import android.content.Context;
 import android.text.TextUtils;
@@ -28,22 +27,19 @@ import android.view.View;
 
 import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
 import com.android.launcher3.dragndrop.DragOptions;
-import com.android.launcher3.logging.LoggerUtils;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.model.ModelWriter;
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ControlType;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
 import com.android.launcher3.views.Snackbar;
 
 public class DeleteDropTarget extends ButtonDropTarget {
 
     private final StatsLogManager mStatsLogManager;
 
-    private int mControlType = ControlType.DEFAULT_CONTROLTYPE;
+    private StatsLogManager.LauncherEvent mLauncherEvent;
 
     public DeleteDropTarget(Context context, AttributeSet attrs) {
         this(context, attrs, 0);
@@ -115,8 +111,8 @@ public class DeleteDropTarget extends ButtonDropTarget {
      * Set mControlType depending on the drag item.
      */
     private void setControlTypeBasedOnDragSource(ItemInfo item) {
-        mControlType = item.id != ItemInfo.NO_ID ? ControlType.REMOVE_TARGET
-                : ControlType.CANCEL_TARGET;
+        mLauncherEvent = item.id != ItemInfo.NO_ID ? LAUNCHER_ITEM_DROPPED_ON_REMOVE
+                : LAUNCHER_ITEM_DROPPED_ON_CANCEL;
     }
 
     @Override
@@ -127,8 +123,7 @@ public class DeleteDropTarget extends ButtonDropTarget {
         }
         super.onDrop(d, options);
         mStatsLogManager.logger().withInstanceId(d.logInstanceId)
-                .log(mControlType == ControlType.REMOVE_TARGET ? LAUNCHER_ITEM_DROPPED_ON_REMOVE
-                        : LAUNCHER_ITEM_DROPPED_ON_CANCEL);
+                .log(mLauncherEvent);
     }
 
     @Override
@@ -141,7 +136,7 @@ public class DeleteDropTarget extends ButtonDropTarget {
             Runnable onUndoClicked = () -> {
                 mLauncher.setPageToBindSynchronously(itemPage);
                 modelWriter.abortDelete();
-                mLauncher.getUserEventDispatcher().logActionOnControl(TAP, UNDO);
+                mLauncher.getStatsLogManager().logger().log(LAUNCHER_UNDO);
             };
             Snackbar.show(mLauncher, R.string.item_removed, R.string.undo,
                     modelWriter::commitDelete, onUndoClicked);
@@ -161,11 +156,4 @@ public class DeleteDropTarget extends ButtonDropTarget {
         mLauncher.getDragLayer()
                 .announceForAccessibility(getContext().getString(R.string.item_removed));
     }
-
-    @Override
-    public Target getDropTargetForLogging() {
-        Target t = LoggerUtils.newTarget(Target.Type.CONTROL);
-        t.controlType = mControlType;
-        return t;
-    }
 }
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index 51f3819460..6547b53940 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -16,8 +16,6 @@
 
 package com.android.launcher3;
 
-import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
-
 import android.content.Context;
 import android.graphics.Rect;
 import android.util.AttributeSet;
@@ -27,14 +25,10 @@ import android.view.ViewDebug;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
-import com.android.launcher3.logging.StatsLogUtils.LogContainerProvider;
-import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
-
-import java.util.ArrayList;
-
-public class Hotseat extends CellLayout implements LogContainerProvider, Insettable {
+/**
+ * View class that represents the bottom row of the home screen.
+ */
+public class Hotseat extends CellLayout implements Insettable {
 
     @ViewDebug.ExportedProperty(category = "launcher")
     private boolean mHasVerticalHotseat;
@@ -78,15 +72,6 @@ public class Hotseat extends CellLayout implements LogContainerProvider, Insetta
         }
     }
 
-    @Override
-    public void fillInLogContainerData(ItemInfo childInfo, Target child,
-            ArrayList<Target> parents) {
-        child.rank = childInfo.rank;
-        child.gridX = childInfo.cellX;
-        child.gridY = childInfo.cellY;
-        parents.add(newContainerTarget(LauncherLogProto.ContainerType.HOTSEAT));
-    }
-
     @Override
     public void setInsets(Rect insets) {
         FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) getLayoutParams();
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 1cf2e89e44..4b75a33fc1 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -37,11 +37,10 @@ import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.SPRING_LOADED;
 import static com.android.launcher3.Utilities.postAsyncCallback;
 import static com.android.launcher3.dragndrop.DragLayer.ALPHA_INDEX_LAUNCHER_LOAD;
-import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ONRESUME;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ONSTOP;
-import static com.android.launcher3.logging.StatsLogManager.containerTypeToAtomState;
 import static com.android.launcher3.model.ItemInstallQueue.FLAG_ACTIVITY_PAUSED;
 import static com.android.launcher3.model.ItemInstallQueue.FLAG_DRAG_AND_DROP;
 import static com.android.launcher3.model.ItemInstallQueue.FLAG_LOADER_RUNNING;
@@ -127,7 +126,6 @@ import com.android.launcher3.keyboard.ViewGroupFocusHelper;
 import com.android.launcher3.logger.LauncherAtom;
 import com.android.launcher3.logging.FileLog;
 import com.android.launcher3.logging.StatsLogManager;
-import com.android.launcher3.logging.UserEventDispatcher;
 import com.android.launcher3.model.BgDataModel.Callbacks;
 import com.android.launcher3.model.ItemInstallQueue;
 import com.android.launcher3.model.ModelUtils;
@@ -155,9 +153,6 @@ import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.AllAppsSwipeController;
 import com.android.launcher3.touch.ItemClickHandler;
 import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
 import com.android.launcher3.util.ActivityResultInfo;
 import com.android.launcher3.util.ActivityTracker;
 import com.android.launcher3.util.ComponentKey;
@@ -561,7 +556,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     }
 
     private void onIdpChanged(InvariantDeviceProfile idp) {
-        mUserEventDispatcher = null;
 
         initDeviceProfile(idp);
         dispatchDeviceProfileChanged();
@@ -917,7 +911,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
             mOverlayManager.onActivityStopped(this);
         }
 
-        logStopAndResume(Action.Command.STOP);
+        logStopAndResume(false /* isResume */);
         mAppWidgetHost.setListenIfResumed(false);
         NotificationListener.removeNotificationsChangedListener();
     }
@@ -939,7 +933,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     @Override
     @CallSuper
     protected void onDeferredResumed() {
-        logStopAndResume(Action.Command.RESUME);
+        logStopAndResume(true /* isResume */);
 
         // Process any items that were added while Launcher was away.
         ItemInstallQueue.INSTANCE.get(this)
@@ -956,32 +950,28 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
     protected void handlePendingActivityRequest() { }
 
-    private void logStopAndResume(int command) {
+    private void logStopAndResume(boolean isResume) {
         if (mPendingExecutor != null) return;
         int pageIndex = mWorkspace.isOverlayShown() ? -1 : mWorkspace.getCurrentPage();
-        int containerType = mStateManager.getState().containerType;
+        int statsLogOrdinal = mStateManager.getState().statsLogOrdinal;
 
         StatsLogManager.EventEnum event;
         StatsLogManager.StatsLogger logger = getStatsLogManager().logger();
-        if (command == Action.Command.RESUME) {
+        if (isResume) {
             logger.withSrcState(LAUNCHER_STATE_BACKGROUND)
-                .withDstState(containerTypeToAtomState(mStateManager.getState().containerType));
+                .withDstState(mStateManager.getState().statsLogOrdinal);
             event = LAUNCHER_ONRESUME;
         } else { /* command == Action.Command.STOP */
-            logger.withSrcState(containerTypeToAtomState(mStateManager.getState().containerType))
+            logger.withSrcState(mStateManager.getState().statsLogOrdinal)
                     .withDstState(LAUNCHER_STATE_BACKGROUND);
             event = LAUNCHER_ONSTOP;
         }
 
-        if (containerType == ContainerType.WORKSPACE && mWorkspace != null) {
-            getUserEventDispatcher().logActionCommand(command,
-                    containerType, -1, pageIndex);
+        if (statsLogOrdinal == LAUNCHER_STATE_HOME && mWorkspace != null) {
             logger.withContainerInfo(LauncherAtom.ContainerInfo.newBuilder()
                     .setWorkspace(
                             LauncherAtom.WorkspaceContainer.newBuilder()
                                     .setPageIndex(pageIndex)).build());
-        } else {
-            getUserEventDispatcher().logActionCommand(command, containerType, -1);
         }
         logger.log(event);
     }
@@ -1483,11 +1473,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
             }
 
             // Handle HOME_INTENT
-            UserEventDispatcher ued = getUserEventDispatcher();
-            Target target = newContainerTarget(mStateManager.getState().containerType);
-            target.pageIndex = mWorkspace.getCurrentPage();
-            ued.logActionCommand(Action.Command.HOME_INTENT, target,
-                    newContainerTarget(ContainerType.WORKSPACE));
             hideKeyboard();
 
             if (mLauncherCallbacks != null) {
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java
index b6bc500a58..eba0ac9633 100644
--- a/src/com/android/launcher3/LauncherState.java
+++ b/src/com/android/launcher3/LauncherState.java
@@ -16,6 +16,7 @@
 package com.android.launcher3;
 
 import static com.android.launcher3.anim.Interpolators.ACCEL_2;
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
 import static com.android.launcher3.testing.TestProtocol.ALL_APPS_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.BACKGROUND_APP_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.HINT_STATE_ORDINAL;
@@ -35,7 +36,6 @@ import com.android.launcher3.states.SpringLoadedState;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.uioverrides.states.AllAppsState;
 import com.android.launcher3.uioverrides.states.OverviewState;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 
 import java.util.Arrays;
 
@@ -97,7 +97,7 @@ public abstract class LauncherState implements BaseState<LauncherState> {
      * TODO: Create a separate class for NORMAL state.
      */
     public static final LauncherState NORMAL = new LauncherState(NORMAL_STATE_ORDINAL,
-            ContainerType.WORKSPACE,
+            LAUNCHER_STATE_HOME,
             FLAG_DISABLE_RESTORE | FLAG_WORKSPACE_ICONS_CAN_BE_DRAGGED | FLAG_HIDE_BACK_BUTTON |
                     FLAG_HAS_SYS_UI_SCRIM) {
         @Override
@@ -126,9 +126,9 @@ public abstract class LauncherState implements BaseState<LauncherState> {
     public final int ordinal;
 
     /**
-     * Used for containerType in {@link com.android.launcher3.logging.UserEventDispatcher}
+     * Used for {@link com.android.launcher3.logging.StatsLogManager}
      */
-    public final int containerType;
+    public final int statsLogOrdinal;
 
     /**
      * True if the state has overview panel visible.
@@ -137,8 +137,8 @@ public abstract class LauncherState implements BaseState<LauncherState> {
 
     private final int mFlags;
 
-    public LauncherState(int id, int containerType, int flags) {
-        this.containerType = containerType;
+    public LauncherState(int id, int statsLogOrdinal, int flags) {
+        this.statsLogOrdinal = statsLogOrdinal;
         this.mFlags = flags;
         this.overviewUi = (flags & FLAG_OVERVIEW_UI) != 0;
         this.ordinal = id;
diff --git a/src/com/android/launcher3/SecondaryDropTarget.java b/src/com/android/launcher3/SecondaryDropTarget.java
index 2df7f5ad20..92b88e6186 100644
--- a/src/com/android/launcher3/SecondaryDropTarget.java
+++ b/src/com/android/launcher3/SecondaryDropTarget.java
@@ -37,14 +37,11 @@ import com.android.launcher3.Launcher.OnResumeCallback;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.logging.FileLog;
-import com.android.launcher3.logging.LoggerUtils;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.logging.StatsLogManager.StatsLogger;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ControlType;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.launcher3.util.Themes;
 
@@ -134,19 +131,6 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList
         return mCurrentAccessibilityAction;
     }
 
-    @Override
-    public Target getDropTargetForLogging() {
-        Target t = LoggerUtils.newTarget(Target.Type.CONTROL);
-        if (mCurrentAccessibilityAction == UNINSTALL) {
-            t.controlType = ControlType.UNINSTALL_TARGET;
-        } else if (mCurrentAccessibilityAction == DISMISS_PREDICTION) {
-            t.controlType = ControlType.DISMISS_PREDICTION;
-        } else {
-            t.controlType = ControlType.SETTINGS_BUTTON;
-        }
-        return t;
-    }
-
     @Override
     protected boolean supportsDrop(ItemInfo info) {
         return supportsAccessibilityDrop(info, getViewUnderDrag(info));
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index e7ded363a2..98328cf8af 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -85,7 +85,6 @@ import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.logger.LauncherAtom;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.logging.StatsLogManager.LauncherEvent;
-import com.android.launcher3.logging.UserEventDispatcher;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
@@ -97,8 +96,6 @@ import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.touch.WorkspaceTouchListener;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.launcher3.util.Executors;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.IntSparseArrayMap;
@@ -1004,8 +1001,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
     public void onOverlayScrollChanged(float scroll) {
         if (Float.compare(scroll, 1f) == 0) {
             if (!mOverlayShown) {
-                mLauncher.getUserEventDispatcher().logActionOnContainer(Action.Touch.SWIPE,
-                        Action.Direction.LEFT, ContainerType.WORKSPACE, 0);
                 mLauncher.getStatsLogManager().logger()
                         .withSrcState(LAUNCHER_STATE_HOME)
                         .withDstState(LAUNCHER_STATE_HOME)
@@ -1020,20 +1015,16 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
             // Not announcing the overlay page for accessibility since it announces itself.
         } else if (Float.compare(scroll, 0f) == 0) {
             if (mOverlayShown) {
-                UserEventDispatcher ued = mLauncher.getUserEventDispatcher();
-                if (!ued.isPreviousHomeGesture()) {
-                    mLauncher.getUserEventDispatcher().logActionOnContainer(Action.Touch.SWIPE,
-                        Action.Direction.RIGHT, ContainerType.WORKSPACE, -1);
-                    mLauncher.getStatsLogManager().logger()
-                            .withSrcState(LAUNCHER_STATE_HOME)
-                            .withDstState(LAUNCHER_STATE_HOME)
-                            .withContainerInfo(LauncherAtom.ContainerInfo.newBuilder()
-                                    .setWorkspace(
-                                            LauncherAtom.WorkspaceContainer.newBuilder()
-                                                    .setPageIndex(-1))
-                                    .build())
-                            .log(LAUNCHER_SWIPERIGHT);
-                }
+                // TODO: this is logged unnecessarily on home gesture.
+                mLauncher.getStatsLogManager().logger()
+                        .withSrcState(LAUNCHER_STATE_HOME)
+                        .withDstState(LAUNCHER_STATE_HOME)
+                        .withContainerInfo(LauncherAtom.ContainerInfo.newBuilder()
+                                .setWorkspace(
+                                        LauncherAtom.WorkspaceContainer.newBuilder()
+                                                .setPageIndex(-1))
+                                .build())
+                        .log(LAUNCHER_SWIPERIGHT);
             } else if (Float.compare(mOverlayTranslation, 0f) != 0) {
                 // When arriving to 0 overscroll from non-zero overscroll, announce page for
                 // accessibility since default announcements were disabled while in overscroll
@@ -1124,12 +1115,8 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
     protected void notifyPageSwitchListener(int prevPage) {
         super.notifyPageSwitchListener(prevPage);
         if (prevPage != mCurrentPage) {
-            int swipeDirection = (prevPage < mCurrentPage)
-                    ? Action.Direction.RIGHT : Action.Direction.LEFT;
             StatsLogManager.EventEnum event = (prevPage < mCurrentPage)
                     ? LAUNCHER_SWIPERIGHT : LAUNCHER_SWIPELEFT;
-            mLauncher.getUserEventDispatcher().logActionOnContainer(Action.Touch.SWIPE,
-                    swipeDirection, ContainerType.WORKSPACE, prevPage);
             mLauncher.getStatsLogManager().logger()
                     .withSrcState(LAUNCHER_STATE_HOME)
                     .withDstState(LAUNCHER_STATE_HOME)
diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
index 13a93ff0cc..72b6d94192 100644
--- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
@@ -19,8 +19,6 @@ import static android.view.View.MeasureSpec.EXACTLY;
 import static android.view.View.MeasureSpec.UNSPECIFIED;
 import static android.view.View.MeasureSpec.makeMeasureSpec;
 
-import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
-
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Canvas;
@@ -38,10 +36,6 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsGridAdapter.AppsGridLayoutManager;
-import com.android.launcher3.logging.StatsLogUtils.LogContainerProvider;
-import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
 import com.android.launcher3.views.RecyclerViewFastScroller;
 
 import java.util.ArrayList;
@@ -50,7 +44,7 @@ import java.util.List;
 /**
  * A RecyclerView with custom fast scroll support for the all apps view.
  */
-public class AllAppsRecyclerView extends BaseRecyclerView implements LogContainerProvider {
+public class AllAppsRecyclerView extends BaseRecyclerView {
 
     private AlphabeticalAppsList mApps;
     private final int mNumAppsPerRow;
@@ -176,13 +170,6 @@ public class AllAppsRecyclerView extends BaseRecyclerView implements LogContaine
         mAutoSizedOverlays.clear();
     }
 
-    @Override
-    public void fillInLogContainerData(ItemInfo childInfo, Target child,
-            ArrayList<Target> parents) {
-        parents.add(newContainerTarget(
-                getApps().hasFilter() ? ContainerType.SEARCHRESULT : ContainerType.ALLAPPS));
-    }
-
     public void onSearchResultsChanged() {
         // Always scroll the view to the top so the user can see the changed results
         scrollToTop();
diff --git a/src/com/android/launcher3/allapps/DiscoveryBounce.java b/src/com/android/launcher3/allapps/DiscoveryBounce.java
index 14595ca941..0005db88c8 100644
--- a/src/com/android/launcher3/allapps/DiscoveryBounce.java
+++ b/src/com/android/launcher3/allapps/DiscoveryBounce.java
@@ -18,8 +18,6 @@ package com.android.launcher3.allapps;
 
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType.HOTSEAT;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType.PREDICTION;
 
 import android.animation.Animator;
 import android.animation.AnimatorInflater;
@@ -120,10 +118,10 @@ public class DiscoveryBounce extends AbstractFloatingView {
         return (type & TYPE_DISCOVERY_BOUNCE) != 0;
     }
 
-    private void show(int containerType) {
+    private void show() {
         mIsOpen = true;
         mLauncher.getDragLayer().addView(this);
-        mLauncher.getUserEventDispatcher().logActionBounceTip(containerType);
+        // TODO: add WW log for discovery bounce tip show event.
     }
 
     public static void showForHomeIfNeeded(Launcher launcher) {
@@ -146,7 +144,7 @@ public class DiscoveryBounce extends AbstractFloatingView {
         }
         onboardingPrefs.incrementEventCount(OnboardingPrefs.HOME_BOUNCE_COUNT);
 
-        new DiscoveryBounce(launcher, 0).show(HOTSEAT);
+        new DiscoveryBounce(launcher, 0).show();
     }
 
     public static void showForOverviewIfNeeded(Launcher launcher,
@@ -179,7 +177,7 @@ public class DiscoveryBounce extends AbstractFloatingView {
         onboardingPrefs.incrementEventCount(OnboardingPrefs.SHELF_BOUNCE_COUNT);
 
         new DiscoveryBounce(launcher, (1 - OVERVIEW.getVerticalProgress(launcher)))
-                .show(PREDICTION);
+                .show();
     }
 
     /**
diff --git a/src/com/android/launcher3/anim/PendingAnimation.java b/src/com/android/launcher3/anim/PendingAnimation.java
index 53625756b8..6dd316ed60 100644
--- a/src/com/android/launcher3/anim/PendingAnimation.java
+++ b/src/com/android/launcher3/anim/PendingAnimation.java
@@ -73,9 +73,9 @@ public class PendingAnimation implements PropertySetter {
         addAnimationHoldersRecur(a, mDuration, springProperty, mAnimHolders);
     }
 
-    public void finish(boolean isSuccess, int logAction) {
+    public void finish(boolean isSuccess) {
         for (Consumer<EndState> listeners : mEndListeners) {
-            listeners.accept(new EndState(isSuccess, logAction));
+            listeners.accept(new EndState(isSuccess));
         }
         mEndListeners.clear();
     }
@@ -164,7 +164,7 @@ public class PendingAnimation implements PropertySetter {
 
     /**
      * Add a listener of receiving the end state.
-     * Note that the listeners are called as a result of calling {@link #finish(boolean, int)}
+     * Note that the listeners are called as a result of calling {@link #finish(boolean)}
      * and not automatically
      */
     public void addEndListener(Consumer<EndState> listener) {
@@ -173,11 +173,9 @@ public class PendingAnimation implements PropertySetter {
 
     public static class EndState {
         public boolean isSuccess;
-        public int logAction;
 
-        public EndState(boolean isSuccess, int logAction) {
+        public EndState(boolean isSuccess) {
             this.isSuccess = isSuccess;
-            this.logAction = logAction;
         }
     }
 }
diff --git a/src/com/android/launcher3/dragndrop/AddItemActivity.java b/src/com/android/launcher3/dragndrop/AddItemActivity.java
index 2d625c5373..42e247aa9b 100644
--- a/src/com/android/launcher3/dragndrop/AddItemActivity.java
+++ b/src/com/android/launcher3/dragndrop/AddItemActivity.java
@@ -16,10 +16,11 @@
 
 package com.android.launcher3.dragndrop;
 
-import static com.android.launcher3.logging.LoggerUtils.newCommandAction;
-import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
-import static com.android.launcher3.logging.LoggerUtils.newItemTarget;
-import static com.android.launcher3.logging.LoggerUtils.newLauncherEvent;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ADD_EXTERNAL_ITEM_BACK;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ADD_EXTERNAL_ITEM_CANCELLED;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ADD_EXTERNAL_ITEM_DRAGGED;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ADD_EXTERNAL_ITEM_PLACED_AUTOMATICALLY;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ADD_EXTERNAL_ITEM_START;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
 import android.annotation.TargetApi;
@@ -49,11 +50,10 @@ import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherAppWidgetHost;
 import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.R;
+import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.model.ItemInstallQueue;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.pm.PinRequestHelper;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.launcher3.util.InstantAppResolver;
 import com.android.launcher3.views.BaseDragLayer;
 import com.android.launcher3.widget.PendingAddShortcutInfo;
@@ -125,7 +125,7 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
         // savedInstanceState is null when the activity is created the first time (i.e., avoids
         // duplicate logging during rotation)
         if (savedInstanceState == null) {
-            logCommand(Action.Command.ENTRY);
+            logCommand(LAUNCHER_ADD_EXTERNAL_ITEM_START);
         }
     }
 
@@ -178,6 +178,7 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
         startActivity(homeIntent,
                 ActivityOptions.makeCustomAnimation(this, 0, android.R.anim.fade_out)
                         .toBundle());
+        logCommand(LAUNCHER_ADD_EXTERNAL_ITEM_DRAGGED);
         mFinishOnPause = true;
         return false;
     }
@@ -240,7 +241,7 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
      * Called when the cancel button is clicked.
      */
     public void onCancelClick(View v) {
-        logCommand(Action.Command.CANCEL);
+        logCommand(LAUNCHER_ADD_EXTERNAL_ITEM_CANCELLED);
         finish();
     }
 
@@ -250,7 +251,7 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
     public void onPlaceAutomaticallyClick(View v) {
         if (mRequest.getRequestType() == PinItemRequest.REQUEST_TYPE_SHORTCUT) {
             ItemInstallQueue.INSTANCE.get(this).queueItem(mRequest.getShortcutInfo());
-            logCommand(Action.Command.CONFIRM);
+            logCommand(LAUNCHER_ADD_EXTERNAL_ITEM_PLACED_AUTOMATICALLY);
             mRequest.accept();
             finish();
             return;
@@ -274,13 +275,13 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
                 .queueItem(mRequest.getAppWidgetProviderInfo(this), widgetId);
         mWidgetOptions.putInt(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId);
         mRequest.accept(mWidgetOptions);
-        logCommand(Action.Command.CONFIRM);
+        logCommand(LAUNCHER_ADD_EXTERNAL_ITEM_PLACED_AUTOMATICALLY);
         finish();
     }
 
     @Override
     public void onBackPressed() {
-        logCommand(Action.Command.BACK);
+        logCommand(LAUNCHER_ADD_EXTERNAL_ITEM_BACK);
         super.onBackPressed();
     }
 
@@ -320,10 +321,7 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
         throw new UnsupportedOperationException();
     }
 
-    private void logCommand(int command) {
-        getUserEventDispatcher().dispatchUserEvent(newLauncherEvent(
-                newCommandAction(command),
-                newItemTarget(mWidgetCell.getWidgetView(), mInstantAppResolver),
-                newContainerTarget(ContainerType.PINITEM)), null);
+    private void logCommand(StatsLogManager.EventEnum command) {
+        getStatsLogManager().logger().log(command);
     }
 }
diff --git a/src/com/android/launcher3/dragndrop/DragController.java b/src/com/android/launcher3/dragndrop/DragController.java
index ef666f0acd..1cfe6acf05 100644
--- a/src/com/android/launcher3/dragndrop/DragController.java
+++ b/src/com/android/launcher3/dragndrop/DragController.java
@@ -206,7 +206,6 @@ public class DragController implements DragDriver.EventListener, TouchController
         }
 
         handleMoveEvent(mLastTouch.x, mLastTouch.y);
-        mLauncher.getUserEventDispatcher().resetActionDurationMillis();
 
         if (!mLauncher.isTouchInProgress() && options.simulatedDndStartPoint == null) {
             // If it is an internal drag and the touch is already complete, cancel immediately
@@ -544,7 +543,6 @@ public class DragController implements DragDriver.EventListener, TouchController
             }
         }
         final View dropTargetAsView = dropTarget instanceof View ? (View) dropTarget : null;
-        mLauncher.getUserEventDispatcher().logDragNDrop(mDragObject, dropTargetAsView);
         dispatchDropComplete(dropTargetAsView, accepted);
     }
 
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index 281598a48b..63fa391d43 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -23,7 +23,6 @@ import static com.android.launcher3.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent;
 import static com.android.launcher3.config.FeatureFlags.ALWAYS_USE_HARDWARE_OPTIMIZATION_FOR_FOLDER_ANIMATIONS;
-import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_FOLDER_CONVERTED_TO_ICON;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_FOLDER_LABEL_UPDATED;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ITEM_DROP_COMPLETED;
@@ -95,7 +94,6 @@ import com.android.launcher3.model.data.FolderInfo.FolderListener;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pageindicators.PageIndicatorDots;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.launcher3.util.Executors;
 import com.android.launcher3.util.Thunk;
 import com.android.launcher3.views.ClipPathView;
@@ -599,15 +597,6 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
      * is played.
      */
     private void animateOpen(List<WorkspaceItemInfo> items, int pageNo) {
-        animateOpen(items, pageNo, false);
-    }
-
-    /**
-     * Opens the user folder described by the specified tag. The opening of the folder
-     * is animated relative to the specified View. If the View is null, no animation
-     * is played.
-     */
-    private void animateOpen(List<WorkspaceItemInfo> items, int pageNo, boolean skipUserEventLog) {
         Folder openFolder = getOpen(mLauncher);
         if (openFolder != null && openFolder != this) {
             // Close any open folder before opening a folder.
@@ -657,14 +646,6 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
                 mState = STATE_OPEN;
                 announceAccessibilityChanges();
 
-                if (!skipUserEventLog) {
-                    mLauncher.getUserEventDispatcher().logActionOnItem(
-                            LauncherLogProto.Action.Touch.TAP,
-                            LauncherLogProto.Action.Direction.NONE,
-                            LauncherLogProto.ItemType.FOLDER_ICON, mInfo.cellX, mInfo.cellY);
-                }
-
-
                 mContent.setFocusOnFirstChild();
             }
         });
@@ -1513,7 +1494,6 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
                 }
 
                 statsLogger.log(LAUNCHER_FOLDER_LABEL_UPDATED);
-                logFolderLabelState(mFromLabelState, toLabelState);
                 mFolderName.dispatchBackKey();
             }
         }
@@ -1644,8 +1624,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
                         return true;
                     }
                 } else {
-                    mLauncher.getUserEventDispatcher().logActionTapOutside(
-                            newContainerTarget(LauncherLogProto.ContainerType.FOLDER));
+                    // TODO: add ww log if need to gather tap outside to close folder
                     close(true);
                     return true;
                 }
@@ -1680,17 +1659,6 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         return mContent;
     }
 
-    /**
-     * Logs current folder label info.
-     *
-     * @deprecated This method is only used for log validation and soon will be removed.
-     */
-    @Deprecated
-    public void logFolderLabelState(FromState fromState, ToState toState) {
-        mLauncher.getUserEventDispatcher()
-                .logLauncherEvent(mInfo.getFolderLabelStateLauncherEvent(fromState, toState));
-    }
-
     /** Returns the height of the current folder's bottom edge from the bottom of the screen. */
     private int getHeightFromBottom() {
         DragLayer.LayoutParams layoutParams = (DragLayer.LayoutParams) getLayoutParams();
diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java
index 32d061cb42..3296eed5ca 100644
--- a/src/com/android/launcher3/folder/FolderIcon.java
+++ b/src/com/android/launcher3/folder/FolderIcon.java
@@ -478,7 +478,6 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
                 // event is assumed to be folder creation on the server side.
                 .withEditText(newTitle.toString())
                 .log(LAUNCHER_FOLDER_AUTO_LABELED);
-        mFolder.logFolderLabelState(fromState, ToState.TO_SUGGESTION0);
     }
 
 
diff --git a/src/com/android/launcher3/logging/LoggerUtils.java b/src/com/android/launcher3/logging/LoggerUtils.java
deleted file mode 100644
index cd4f034e83..0000000000
--- a/src/com/android/launcher3/logging/LoggerUtils.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.logging;
-
-import android.util.ArrayMap;
-import android.util.SparseArray;
-import android.view.View;
-
-import com.android.launcher3.ButtonDropTarget;
-import com.android.launcher3.LauncherSettings;
-import com.android.launcher3.model.data.AppInfo;
-import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.userevent.nano.LauncherLogExtensions.TargetExtension;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ItemType;
-import com.android.launcher3.userevent.nano.LauncherLogProto.LauncherEvent;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
-import com.android.launcher3.util.InstantAppResolver;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-
-/**
- * Helper methods for logging.
- */
-public class LoggerUtils {
-    private static final ArrayMap<Class, SparseArray<String>> sNameCache = new ArrayMap<>();
-    private static final String UNKNOWN = "UNKNOWN";
-    private static final int DEFAULT_PREDICTED_RANK = 10000;
-    private static final String DELIMITER_DOT = "\\.";
-
-    public static String getFieldName(int value, Class c) {
-        SparseArray<String> cache;
-        synchronized (sNameCache) {
-            cache = sNameCache.get(c);
-            if (cache == null) {
-                cache = new SparseArray<>();
-                for (Field f : c.getDeclaredFields()) {
-                    if (f.getType() == int.class && Modifier.isStatic(f.getModifiers())) {
-                        try {
-                            f.setAccessible(true);
-                            cache.put(f.getInt(null), f.getName());
-                        } catch (IllegalAccessException e) {
-                            // Ignore
-                        }
-                    }
-                }
-                sNameCache.put(c, cache);
-            }
-        }
-        String result = cache.get(value);
-        return result != null ? result : UNKNOWN;
-    }
-
-    public static Target newItemTarget(int itemType) {
-        Target t = newTarget(Target.Type.ITEM);
-        t.itemType = itemType;
-        return t;
-    }
-
-    public static Target newItemTarget(View v, InstantAppResolver instantAppResolver) {
-        return (v != null) && (v.getTag() instanceof ItemInfo)
-                ? newItemTarget((ItemInfo) v.getTag(), instantAppResolver)
-                : newTarget(Target.Type.ITEM);
-    }
-
-    public static Target newItemTarget(ItemInfo info, InstantAppResolver instantAppResolver) {
-        Target t = newTarget(Target.Type.ITEM);
-        switch (info.itemType) {
-            case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION:
-                t.itemType = (instantAppResolver != null && info instanceof AppInfo
-                        && instantAppResolver.isInstantApp(((AppInfo) info)))
-                        ? ItemType.WEB_APP
-                        : ItemType.APP_ICON;
-                t.predictedRank = DEFAULT_PREDICTED_RANK;
-                break;
-            case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT:
-                t.itemType = ItemType.SHORTCUT;
-                t.predictedRank = DEFAULT_PREDICTED_RANK;
-                break;
-            case LauncherSettings.Favorites.ITEM_TYPE_FOLDER:
-                t.itemType = ItemType.FOLDER_ICON;
-                break;
-            case LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET:
-                t.itemType = ItemType.WIDGET;
-                break;
-            case LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT:
-                t.itemType = ItemType.DEEPSHORTCUT;
-                t.predictedRank = DEFAULT_PREDICTED_RANK;
-                break;
-        }
-        return t;
-    }
-
-    public static Target newDropTarget(View v) {
-        if (!(v instanceof ButtonDropTarget)) {
-            return newTarget(Target.Type.CONTAINER);
-        }
-        if (v instanceof ButtonDropTarget) {
-            return ((ButtonDropTarget) v).getDropTargetForLogging();
-        }
-        return newTarget(Target.Type.CONTROL);
-    }
-
-    public static Target newTarget(int targetType, TargetExtension extension) {
-        Target t = new Target();
-        t.type = targetType;
-        t.extension = extension;
-        return t;
-    }
-
-    public static Target newTarget(int targetType) {
-        Target t = new Target();
-        t.type = targetType;
-        return t;
-    }
-
-    public static Target newControlTarget(int controlType) {
-        Target t = newTarget(Target.Type.CONTROL);
-        t.controlType = controlType;
-        return t;
-    }
-
-    public static Target newContainerTarget(int containerType) {
-        Target t = newTarget(Target.Type.CONTAINER);
-        t.containerType = containerType;
-        return t;
-    }
-
-    public static Action newAction(int type) {
-        Action a = new Action();
-        a.type = type;
-        return a;
-    }
-
-    public static Action newCommandAction(int command) {
-        Action a = newAction(Action.Type.COMMAND);
-        a.command = command;
-        return a;
-    }
-
-    public static Action newTouchAction(int touch) {
-        Action a = newAction(Action.Type.TOUCH);
-        a.touch = touch;
-        return a;
-    }
-
-    public static LauncherEvent newLauncherEvent(Action action, Target... srcTargets) {
-        LauncherEvent event = new LauncherEvent();
-        event.srcTarget = srcTargets;
-        event.action = action;
-        return event;
-    }
-
-    /**
-     * Creates LauncherEvent using Action and ArrayList of Targets
-     */
-    public static LauncherEvent newLauncherEvent(Action action, ArrayList<Target> targets) {
-        Target[] targetsArray = new Target[targets.size()];
-        targets.toArray(targetsArray);
-        return newLauncherEvent(action, targetsArray);
-    }
-
-    /**
-     * String conversion for only the helpful parts of {@link Object#toString()} method
-     * @param stringToExtract "foo.bar.baz.MyObject@1234"
-     * @return "MyObject@1234"
-     */
-    public static String extractObjectNameAndAddress(String stringToExtract) {
-        String[] superStringParts = stringToExtract.split(DELIMITER_DOT);
-        if (superStringParts.length == 0) {
-            return "";
-        }
-        return superStringParts[superStringParts.length - 1];
-    }
-}
diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index ec1c3ef779..2c5bf320ad 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -27,7 +27,6 @@ import com.android.launcher3.logger.LauncherAtom.ContainerInfo;
 import com.android.launcher3.logger.LauncherAtom.FromState;
 import com.android.launcher3.logger.LauncherAtom.ToState;
 import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.userevent.LauncherLogProto;
 import com.android.launcher3.util.ResourceBasedOverride;
 
 import java.util.List;
@@ -51,40 +50,22 @@ public class StatsLogManager implements ResourceBasedOverride {
     public static final int LAUNCHER_STATE_UNCHANGED = 5;
 
     /**
-     * Returns proper launcher state enum for {@link StatsLogManager}(to be removed during
-     * UserEventDispatcher cleanup)
-     */
-    public static int containerTypeToAtomState(int containerType) {
-        switch (containerType) {
-            case LauncherLogProto.ContainerType.ALLAPPS_VALUE:
-                return LAUNCHER_STATE_ALLAPPS;
-            case LauncherLogProto.ContainerType.OVERVIEW_VALUE:
-                return LAUNCHER_STATE_OVERVIEW;
-            case LauncherLogProto.ContainerType.WORKSPACE_VALUE:
-                return LAUNCHER_STATE_HOME;
-            case LauncherLogProto.ContainerType.APP_VALUE:
-                return LAUNCHER_STATE_BACKGROUND;
-        }
-        return LAUNCHER_STATE_UNSPECIFIED;
-    }
-
-    /**
-     * Returns event enum based on the two {@link ContainerType} transition information when swipe
+     * Returns event enum based on the two state transition information when swipe
      * gesture happens(to be removed during UserEventDispatcher cleanup).
      */
-    public static EventEnum getLauncherAtomEvent(int startContainerType,
-            int targetContainerType, EventEnum fallbackEvent) {
-        if (startContainerType == LauncherLogProto.ContainerType.WORKSPACE.getNumber()
-                && targetContainerType == LauncherLogProto.ContainerType.WORKSPACE.getNumber()) {
+    public static EventEnum getLauncherAtomEvent(int startState,
+            int targetState, EventEnum fallbackEvent) {
+        if (startState == LAUNCHER_STATE_HOME
+                && targetState == LAUNCHER_STATE_HOME) {
             return LAUNCHER_HOME_GESTURE;
-        } else if (startContainerType != LauncherLogProto.ContainerType.TASKSWITCHER.getNumber()
-                && targetContainerType == LauncherLogProto.ContainerType.TASKSWITCHER.getNumber()) {
+        } else if (startState != LAUNCHER_STATE_OVERVIEW
+                && targetState == LAUNCHER_STATE_OVERVIEW) {
             return LAUNCHER_OVERVIEW_GESTURE;
-        } else if (startContainerType != LauncherLogProto.ContainerType.ALLAPPS.getNumber()
-                && targetContainerType == LauncherLogProto.ContainerType.ALLAPPS.getNumber()) {
+        } else if (startState != LAUNCHER_STATE_ALLAPPS
+                && targetState == LAUNCHER_STATE_ALLAPPS) {
             return LAUNCHER_ALLAPPS_OPEN_UP;
-        } else if (startContainerType == LauncherLogProto.ContainerType.ALLAPPS.getNumber()
-                && targetContainerType != LauncherLogProto.ContainerType.ALLAPPS.getNumber()) {
+        } else if (startState == LAUNCHER_STATE_ALLAPPS
+                && targetState != LAUNCHER_STATE_ALLAPPS) {
             return LAUNCHER_ALLAPPS_CLOSE_DOWN;
         }
         return fallbackEvent; // TODO fix
@@ -322,7 +303,38 @@ public class StatsLogManager implements ResourceBasedOverride {
         LAUNCHER_FOLDER_CONVERTED_TO_ICON(628),
 
         @UiEvent(doc = "A hotseat prediction item was pinned")
-        LAUNCHER_HOTSEAT_PREDICTION_PINNED(629);
+        LAUNCHER_HOTSEAT_PREDICTION_PINNED(629),
+
+        @UiEvent(doc = "Activity to add external item was started")
+        LAUNCHER_ADD_EXTERNAL_ITEM_START(641),
+
+        @UiEvent(doc = "Activity to add external item was cancelled")
+        LAUNCHER_ADD_EXTERNAL_ITEM_CANCELLED(642),
+
+        @UiEvent(doc = "Activity to add external item was backed out")
+        LAUNCHER_ADD_EXTERNAL_ITEM_BACK(643),
+
+        @UiEvent(doc = "Item was placed automatically in external item addition flow")
+        LAUNCHER_ADD_EXTERNAL_ITEM_PLACED_AUTOMATICALLY(644),
+
+        @UiEvent(doc = "Item was dragged in external item addition flow")
+        LAUNCHER_ADD_EXTERNAL_ITEM_DRAGGED(645),
+
+        @UiEvent(doc = "Undo event was tapped.")
+        LAUNCHER_UNDO(648),
+
+        @UiEvent(doc = "Task switcher clear all target was tapped.")
+        LAUNCHER_TASK_CLEAR_ALL(649),
+
+        @UiEvent(doc = "Task preview was long pressed.")
+        LAUNCHER_TASK_PREVIEW_LONGPRESS(650),
+
+        @UiEvent(doc = "User swiped down on workspace (triggering noti shade to open).")
+        LAUNCHER_SWIPE_DOWN_WORKSPACE_NOTISHADE_OPEN(651),
+
+        @UiEvent(doc = "Notification dismissed by swiping right.")
+        LAUNCHER_NOTIFICATION_DISMISSED(652),
+        ;
 
         // ADD MORE
 
diff --git a/src/com/android/launcher3/logging/StatsLogUtils.java b/src/com/android/launcher3/logging/StatsLogUtils.java
deleted file mode 100644
index a5cc7ea305..0000000000
--- a/src/com/android/launcher3/logging/StatsLogUtils.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.android.launcher3.logging;
-
-import android.view.View;
-import android.view.ViewParent;
-
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
-
-import java.util.ArrayList;
-
-public class StatsLogUtils {
-    private final static int MAXIMUM_VIEW_HIERARCHY_LEVEL = 5;
-
-    /**
-     * Implemented by containers to provide a container source for a given child.
-     */
-    public interface LogContainerProvider {
-
-        /**
-         * Populates parent container targets for an item
-         */
-        void fillInLogContainerData(ItemInfo childInfo, Target child, ArrayList<Target> parents);
-    }
-
-    /**
-     * Recursively finds the parent of the given child which implements IconLogInfoProvider
-     */
-    public static LogContainerProvider getLaunchProviderRecursive(@Nullable View v) {
-        ViewParent parent;
-        if (v != null) {
-            parent = v.getParent();
-        } else {
-            return null;
-        }
-
-        // Optimization to only check up to 5 parents.
-        int count = MAXIMUM_VIEW_HIERARCHY_LEVEL;
-        while (parent != null && count-- > 0) {
-            if (parent instanceof LogContainerProvider) {
-                return (LogContainerProvider) parent;
-            } else {
-                parent = parent.getParent();
-            }
-        }
-        return null;
-    }
-}
diff --git a/src/com/android/launcher3/logging/UserEventDispatcher.java b/src/com/android/launcher3/logging/UserEventDispatcher.java
deleted file mode 100644
index a40cc263db..0000000000
--- a/src/com/android/launcher3/logging/UserEventDispatcher.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.logging;
-
-import static com.android.launcher3.logging.LoggerUtils.newAction;
-import static com.android.launcher3.logging.LoggerUtils.newCommandAction;
-import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
-import static com.android.launcher3.logging.LoggerUtils.newDropTarget;
-import static com.android.launcher3.logging.LoggerUtils.newItemTarget;
-import static com.android.launcher3.logging.LoggerUtils.newLauncherEvent;
-import static com.android.launcher3.logging.LoggerUtils.newTarget;
-import static com.android.launcher3.logging.LoggerUtils.newTouchAction;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.ItemType;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.TipType;
-
-import static java.util.Optional.ofNullable;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.SystemClock;
-import android.util.Log;
-import android.view.View;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.DropTarget;
-import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
-import com.android.launcher3.logging.StatsLogUtils.LogContainerProvider;
-import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.userevent.LauncherLogProto;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action;
-import com.android.launcher3.userevent.nano.LauncherLogProto.LauncherEvent;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
-import com.android.launcher3.util.InstantAppResolver;
-import com.android.launcher3.util.LogConfig;
-import com.android.launcher3.util.ResourceBasedOverride;
-
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.nano.InvalidProtocolBufferNanoException;
-import com.google.protobuf.nano.MessageNano;
-
-import java.util.ArrayList;
-import java.util.UUID;
-
-/**
- * Manages the creation of {@link LauncherEvent}.
- * To debug this class, execute following command before side loading a new apk.
- * <p>
- * $ adb shell setprop log.tag.UserEvent VERBOSE
- */
-public class UserEventDispatcher implements ResourceBasedOverride {
-
-    private static final String TAG = "UserEvent";
-    private static final boolean IS_VERBOSE = Utilities.isPropertyEnabled(LogConfig.USEREVENT);
-    private static final String UUID_STORAGE = "uuid";
-
-    /**
-     * A factory method for UserEventDispatcher
-     */
-    public static UserEventDispatcher newInstance(Context context) {
-        SharedPreferences sharedPrefs = Utilities.getDevicePrefs(context);
-        String uuidStr = sharedPrefs.getString(UUID_STORAGE, null);
-        if (uuidStr == null) {
-            uuidStr = UUID.randomUUID().toString();
-            sharedPrefs.edit().putString(UUID_STORAGE, uuidStr).apply();
-        }
-        UserEventDispatcher ued = Overrides.getObject(UserEventDispatcher.class,
-                context.getApplicationContext(), R.string.user_event_dispatcher_class);
-        ued.mUuidStr = uuidStr;
-        ued.mInstantAppResolver = InstantAppResolver.newInstance(context);
-        return ued;
-    }
-
-
-    /**
-     * Fills in the container data on the given event if the given view is not null.
-     *
-     * @return whether container data was added.
-     */
-    private boolean fillLogContainer(@Nullable View v, Target child,
-            @Nullable ArrayList<Target> targets) {
-        LogContainerProvider firstParent = StatsLogUtils.getLaunchProviderRecursive(v);
-        if (v == null || !(v.getTag() instanceof ItemInfo) || firstParent == null) {
-            return false;
-        }
-        final ItemInfo itemInfo = (ItemInfo) v.getTag();
-        firstParent.fillInLogContainerData(itemInfo, child, targets);
-        return true;
-    }
-
-    protected void onFillInLogContainerData(@NonNull ItemInfo itemInfo, @NonNull Target target,
-            @NonNull ArrayList<Target> targets) {
-    }
-
-    private boolean mSessionStarted;
-    private long mElapsedContainerMillis;
-    private long mElapsedSessionMillis;
-    private long mActionDurationMillis;
-    private String mUuidStr;
-    protected InstantAppResolver mInstantAppResolver;
-    private boolean mAppOrTaskLaunch;
-    private boolean mPreviousHomeGesture;
-
-    private void fillComponentInfo(Target target, ComponentName cn) {
-        if (cn != null) {
-            target.packageNameHash = (mUuidStr + cn.getPackageName()).hashCode();
-            target.componentHash = (mUuidStr + cn.flattenToString()).hashCode();
-        }
-    }
-
-    public void logActionCommand(int command, int srcContainerType, int dstContainerType) {
-        logActionCommand(command, newContainerTarget(srcContainerType),
-                dstContainerType >= 0 ? newContainerTarget(dstContainerType) : null);
-    }
-
-    public void logActionCommand(int command, int srcContainerType, int dstContainerType,
-            int pageIndex) {
-        Target srcTarget = newContainerTarget(srcContainerType);
-        srcTarget.pageIndex = pageIndex;
-        logActionCommand(command, srcTarget,
-                dstContainerType >= 0 ? newContainerTarget(dstContainerType) : null);
-    }
-
-    public void logActionCommand(int command, Target srcTarget, Target dstTarget) {
-        LauncherEvent event = newLauncherEvent(newCommandAction(command), srcTarget);
-        if (command == Action.Command.STOP) {
-            if (mAppOrTaskLaunch || !mSessionStarted) {
-                mSessionStarted = false;
-                return;
-            }
-        }
-
-        if (dstTarget != null) {
-            event.destTarget = new Target[1];
-            event.destTarget[0] = dstTarget;
-            event.action.isStateChange = true;
-        }
-        dispatchUserEvent(event, null);
-    }
-
-    public void logActionOnControl(int action, int controlType) {
-        logActionOnControl(action, controlType, null);
-    }
-
-    public void logActionOnControl(int action, int controlType, int parentContainerType) {
-        logActionOnControl(action, controlType, null, parentContainerType);
-    }
-
-    /**
-     * Logs control action with proper parent hierarchy
-     */
-    public void logActionOnControl(int actionType, int controlType,
-            @Nullable View controlInContainer, int... parentTypes) {
-        Target control = newTarget(Target.Type.CONTROL);
-        control.controlType = controlType;
-        Action action = newAction(actionType);
-
-        ArrayList<Target> targets = makeTargetsList(control);
-        if (controlInContainer != null) {
-            fillLogContainer(controlInContainer, control, targets);
-        }
-        for (int parentContainerType : parentTypes) {
-            if (parentContainerType < 0) continue;
-            targets.add(newContainerTarget(parentContainerType));
-        }
-        LauncherEvent event = newLauncherEvent(action, targets);
-        if (actionType == Action.Touch.DRAGDROP) {
-            event.actionDurationMillis = SystemClock.uptimeMillis() - mActionDurationMillis;
-        }
-        dispatchUserEvent(event, null);
-    }
-
-    public void logActionTapOutside(Target target) {
-        LauncherEvent event = newLauncherEvent(newTouchAction(Action.Type.TOUCH),
-                target);
-        event.action.isOutside = true;
-        dispatchUserEvent(event, null);
-    }
-
-    public void logActionBounceTip(int containerType) {
-        LauncherEvent event = newLauncherEvent(newAction(Action.Type.TIP),
-                newContainerTarget(containerType));
-        event.srcTarget[0].tipType = TipType.BOUNCE;
-        dispatchUserEvent(event, null);
-    }
-
-    public void logActionOnContainer(int action, int dir, int containerType) {
-        logActionOnContainer(action, dir, containerType, 0);
-    }
-
-    public void logActionOnContainer(int action, int dir, int containerType, int pageIndex) {
-        LauncherEvent event = newLauncherEvent(newTouchAction(action),
-                newContainerTarget(containerType));
-        event.action.dir = dir;
-        event.srcTarget[0].pageIndex = pageIndex;
-        dispatchUserEvent(event, null);
-    }
-
-    /**
-     * Used primarily for swipe up and down when state changes when swipe up happens from the
-     * navbar bezel, the {@param srcChildContainerType} is NAVBAR and
-     * {@param srcParentContainerType} is either one of the two
-     * (1) WORKSPACE: if the launcher is the foreground activity
-     * (2) APP: if another app was the foreground activity
-     */
-    public void logStateChangeAction(int action, int dir, int downX, int downY,
-            int srcChildTargetType, int srcParentContainerType, int dstContainerType,
-            int pageIndex) {
-        LauncherEvent event;
-        if (srcChildTargetType == ItemType.TASK) {
-            event = newLauncherEvent(newTouchAction(action),
-                    newItemTarget(srcChildTargetType),
-                    newContainerTarget(srcParentContainerType));
-        } else {
-            event = newLauncherEvent(newTouchAction(action),
-                    newContainerTarget(srcChildTargetType),
-                    newContainerTarget(srcParentContainerType));
-        }
-        event.destTarget = new Target[1];
-        event.destTarget[0] = newContainerTarget(dstContainerType);
-        event.action.dir = dir;
-        event.action.isStateChange = true;
-        event.srcTarget[0].pageIndex = pageIndex;
-        event.srcTarget[0].spanX = downX;
-        event.srcTarget[0].spanY = downY;
-        dispatchUserEvent(event, null);
-    }
-
-    public void logActionOnItem(int action, int dir, int itemType) {
-        logActionOnItem(action, dir, itemType, null, null);
-    }
-
-    /**
-     * Creates new {@link LauncherEvent} of ITEM target type with input arguments and dispatches it.
-     *
-     * @param touchAction ENUM value of {@link LauncherLogProto.Action.Touch} Action
-     * @param dir         ENUM value of {@link LauncherLogProto.Action.Direction} Action
-     * @param itemType    ENUM value of {@link LauncherLogProto.ItemType}
-     * @param gridX       Nullable X coordinate of item's position on the workspace grid
-     * @param gridY       Nullable Y coordinate of item's position on the workspace grid
-     */
-    public void logActionOnItem(int touchAction, int dir, int itemType,
-            @Nullable Integer gridX, @Nullable Integer gridY) {
-        Target itemTarget = newTarget(Target.Type.ITEM);
-        itemTarget.itemType = itemType;
-        ofNullable(gridX).ifPresent(value -> itemTarget.gridX = value);
-        ofNullable(gridY).ifPresent(value -> itemTarget.gridY = value);
-        LauncherEvent event = newLauncherEvent(newTouchAction(touchAction), itemTarget);
-        event.action.dir = dir;
-        dispatchUserEvent(event, null);
-    }
-
-    /**
-     * Logs proto lite version of LauncherEvent object to clearcut.
-     */
-    public void logLauncherEvent(
-            com.android.launcher3.userevent.LauncherLogProto.LauncherEvent launcherEvent) {
-
-        if (mPreviousHomeGesture) {
-            mPreviousHomeGesture = false;
-        }
-        mAppOrTaskLaunch = false;
-        launcherEvent.toBuilder()
-                .setElapsedContainerMillis(SystemClock.uptimeMillis() - mElapsedContainerMillis)
-                .setElapsedSessionMillis(
-                        SystemClock.uptimeMillis() - mElapsedSessionMillis).build();
-        try {
-            dispatchUserEvent(LauncherEvent.parseFrom(launcherEvent.toByteArray()), null);
-        } catch (InvalidProtocolBufferNanoException e) {
-            throw new RuntimeException("Cannot convert LauncherEvent from Lite to Nano version.");
-        }
-    }
-
-    public void logDeepShortcutsOpen(View icon) {
-        ItemInfo info = (ItemInfo) icon.getTag();
-        Target child = newItemTarget(info, mInstantAppResolver);
-        ArrayList<Target> targets = makeTargetsList(child);
-        fillLogContainer(icon, child, targets);
-        dispatchUserEvent(newLauncherEvent(newTouchAction(Action.Touch.TAP), targets), null);
-    }
-
-    public void logDragNDrop(DropTarget.DragObject dragObj, View dropTargetAsView) {
-        Target srcChild = newItemTarget(dragObj.originalDragInfo, mInstantAppResolver);
-        ArrayList<Target> srcTargets = makeTargetsList(srcChild);
-
-
-        Target destChild = newItemTarget(dragObj.originalDragInfo, mInstantAppResolver);
-        ArrayList<Target> destTargets = makeTargetsList(destChild);
-
-        //dragObj.dragSource.fillInLogContainerData(dragObj.originalDragInfo, srcChild, srcTargets);
-        if (dropTargetAsView instanceof LogContainerProvider) {
-            ((LogContainerProvider) dropTargetAsView).fillInLogContainerData(dragObj.dragInfo,
-                    destChild, destTargets);
-        }
-        else {
-            destTargets.add(newDropTarget(dropTargetAsView));
-        }
-        LauncherEvent event = newLauncherEvent(newTouchAction(Action.Touch.DRAGDROP), srcTargets);
-        Target[] destTargetsArray = new Target[destTargets.size()];
-        destTargets.toArray(destTargetsArray);
-        event.destTarget = destTargetsArray;
-
-        event.actionDurationMillis = SystemClock.uptimeMillis() - mActionDurationMillis;
-        dispatchUserEvent(event, null);
-    }
-
-    public final void startSession() {
-        mSessionStarted = true;
-        mElapsedSessionMillis = SystemClock.uptimeMillis();
-        mElapsedContainerMillis = SystemClock.uptimeMillis();
-    }
-
-    public final void setPreviousHomeGesture(boolean homeGesture) {
-        mPreviousHomeGesture = homeGesture;
-    }
-
-    public final boolean isPreviousHomeGesture() {
-        return mPreviousHomeGesture;
-    }
-
-    public final void resetActionDurationMillis() {
-        mActionDurationMillis = SystemClock.uptimeMillis();
-    }
-
-    public void dispatchUserEvent(LauncherEvent ev, Intent intent) {
-        if (mPreviousHomeGesture) {
-            mPreviousHomeGesture = false;
-        }
-        mAppOrTaskLaunch = false;
-        ev.elapsedContainerMillis = SystemClock.uptimeMillis() - mElapsedContainerMillis;
-        ev.elapsedSessionMillis = SystemClock.uptimeMillis() - mElapsedSessionMillis;
-        if (!IS_VERBOSE) {
-            return;
-        }
-        LauncherLogProto.LauncherEvent liteLauncherEvent;
-        try {
-            liteLauncherEvent =
-                    LauncherLogProto.LauncherEvent.parseFrom(MessageNano.toByteArray(ev));
-        } catch (InvalidProtocolBufferException e) {
-            throw new RuntimeException("Cannot parse LauncherEvent from Nano to Lite version");
-        }
-        Log.d(TAG, liteLauncherEvent.toString());
-    }
-
-    /**
-     * Constructs an ArrayList with targets
-     */
-    public static ArrayList<Target> makeTargetsList(Target... targets) {
-        ArrayList<Target> result = new ArrayList<>();
-        for (Target target : targets) {
-            result.add(target);
-        }
-        return result;
-    }
-}
diff --git a/src/com/android/launcher3/model/data/FolderInfo.java b/src/com/android/launcher3/model/data/FolderInfo.java
index 41ccbd7054..06a2c92dab 100644
--- a/src/com/android/launcher3/model/data/FolderInfo.java
+++ b/src/com/android/launcher3/model/data/FolderInfo.java
@@ -20,15 +20,9 @@ import static android.text.TextUtils.isEmpty;
 
 import static androidx.core.util.Preconditions.checkNotNull;
 
-import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_DESKTOP;
-import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT;
 import static com.android.launcher3.logger.LauncherAtom.Attribute.EMPTY_LABEL;
 import static com.android.launcher3.logger.LauncherAtom.Attribute.MANUAL_LABEL;
 import static com.android.launcher3.logger.LauncherAtom.Attribute.SUGGESTED_LABEL;
-import static com.android.launcher3.userevent.LauncherLogProto.Target.FromFolderLabelState.FROM_CUSTOM;
-import static com.android.launcher3.userevent.LauncherLogProto.Target.FromFolderLabelState.FROM_EMPTY;
-import static com.android.launcher3.userevent.LauncherLogProto.Target.FromFolderLabelState.FROM_FOLDER_LABEL_STATE_UNSPECIFIED;
-import static com.android.launcher3.userevent.LauncherLogProto.Target.FromFolderLabelState.FROM_SUGGESTED;
 
 import android.os.Process;
 
@@ -43,10 +37,6 @@ import com.android.launcher3.logger.LauncherAtom.Attribute;
 import com.android.launcher3.logger.LauncherAtom.FromState;
 import com.android.launcher3.logger.LauncherAtom.ToState;
 import com.android.launcher3.model.ModelWriter;
-import com.android.launcher3.userevent.LauncherLogProto;
-import com.android.launcher3.userevent.LauncherLogProto.Target;
-import com.android.launcher3.userevent.LauncherLogProto.Target.FromFolderLabelState;
-import com.android.launcher3.userevent.LauncherLogProto.Target.ToFolderLabelState;
 import com.android.launcher3.util.ContentWriter;
 
 import java.util.ArrayList;
@@ -359,113 +349,4 @@ public class FolderInfo extends ItemInfo {
         }
         return LauncherAtom.ToState.TO_STATE_UNSPECIFIED;
     }
-
-    /**
-     * Returns {@link LauncherLogProto.LauncherEvent} to log current folder label info.
-     *
-     * @deprecated This method is used only for validation purpose and soon will be removed.
-     */
-    @Deprecated
-    public LauncherLogProto.LauncherEvent getFolderLabelStateLauncherEvent(FromState fromState,
-            ToState toState) {
-        return LauncherLogProto.LauncherEvent.newBuilder()
-                .setAction(LauncherLogProto.Action
-                        .newBuilder()
-                        .setType(LauncherLogProto.Action.Type.SOFT_KEYBOARD))
-                .addSrcTarget(Target
-                        .newBuilder()
-                        .setType(Target.Type.ITEM)
-                        .setItemType(LauncherLogProto.ItemType.EDITTEXT)
-                        .setFromFolderLabelState(convertFolderLabelState(fromState))
-                        .setToFolderLabelState(convertFolderLabelState(toState)))
-                .addSrcTarget(Target.newBuilder()
-                        .setType(Target.Type.CONTAINER)
-                        .setContainerType(LauncherLogProto.ContainerType.FOLDER)
-                        .setPageIndex(screenId)
-                        .setGridX(cellX)
-                        .setGridY(cellY)
-                        .setCardinality(contents.size()))
-                .addSrcTarget(newParentContainerTarget())
-                .build();
-    }
-
-    /**
-     * @deprecated This method is used only for validation purpose and soon will be removed.
-     */
-    @Deprecated
-    private Target.Builder newParentContainerTarget() {
-        Target.Builder builder = Target.newBuilder().setType(Target.Type.CONTAINER);
-        switch (container) {
-            case CONTAINER_HOTSEAT:
-                return builder.setContainerType(LauncherLogProto.ContainerType.HOTSEAT);
-            case CONTAINER_DESKTOP:
-                return builder.setContainerType(LauncherLogProto.ContainerType.WORKSPACE);
-            default:
-                throw new AssertionError(String
-                        .format("Expected container to be either %s or %s but found %s.",
-                                CONTAINER_HOTSEAT,
-                                CONTAINER_DESKTOP,
-                                container));
-        }
-    }
-
-    /**
-     * @deprecated This method is used only for validation purpose and soon will be removed.
-     */
-    @Deprecated
-    private static FromFolderLabelState convertFolderLabelState(FromState fromState) {
-        switch (fromState) {
-            case FROM_EMPTY:
-                return FROM_EMPTY;
-            case FROM_SUGGESTED:
-                return FROM_SUGGESTED;
-            case FROM_CUSTOM:
-                return FROM_CUSTOM;
-            default:
-                return FROM_FOLDER_LABEL_STATE_UNSPECIFIED;
-        }
-    }
-
-    /**
-     * @deprecated This method is used only for validation purpose and soon will be removed.
-     */
-    @Deprecated
-    private static ToFolderLabelState convertFolderLabelState(ToState toState) {
-        switch (toState) {
-            case UNCHANGED:
-                return ToFolderLabelState.UNCHANGED;
-            case TO_SUGGESTION0:
-                return ToFolderLabelState.TO_SUGGESTION0_WITH_VALID_PRIMARY;
-            case TO_SUGGESTION1_WITH_VALID_PRIMARY:
-                return ToFolderLabelState.TO_SUGGESTION1_WITH_VALID_PRIMARY;
-            case TO_SUGGESTION1_WITH_EMPTY_PRIMARY:
-                return ToFolderLabelState.TO_SUGGESTION1_WITH_EMPTY_PRIMARY;
-            case TO_SUGGESTION2_WITH_VALID_PRIMARY:
-                return ToFolderLabelState.TO_SUGGESTION2_WITH_VALID_PRIMARY;
-            case TO_SUGGESTION2_WITH_EMPTY_PRIMARY:
-                return ToFolderLabelState.TO_SUGGESTION2_WITH_EMPTY_PRIMARY;
-            case TO_SUGGESTION3_WITH_VALID_PRIMARY:
-                return ToFolderLabelState.TO_SUGGESTION3_WITH_VALID_PRIMARY;
-            case TO_SUGGESTION3_WITH_EMPTY_PRIMARY:
-                return ToFolderLabelState.TO_SUGGESTION3_WITH_EMPTY_PRIMARY;
-            case TO_EMPTY_WITH_VALID_PRIMARY:
-                return ToFolderLabelState.TO_EMPTY_WITH_VALID_PRIMARY;
-            case TO_EMPTY_WITH_VALID_SUGGESTIONS_AND_EMPTY_PRIMARY:
-                return ToFolderLabelState.TO_EMPTY_WITH_VALID_SUGGESTIONS_AND_EMPTY_PRIMARY;
-            case TO_EMPTY_WITH_EMPTY_SUGGESTIONS:
-                return ToFolderLabelState.TO_EMPTY_WITH_EMPTY_SUGGESTIONS;
-            case TO_EMPTY_WITH_SUGGESTIONS_DISABLED:
-                return ToFolderLabelState.TO_EMPTY_WITH_SUGGESTIONS_DISABLED;
-            case TO_CUSTOM_WITH_VALID_PRIMARY:
-                return ToFolderLabelState.TO_CUSTOM_WITH_VALID_PRIMARY;
-            case TO_CUSTOM_WITH_VALID_SUGGESTIONS_AND_EMPTY_PRIMARY:
-                return ToFolderLabelState.TO_CUSTOM_WITH_VALID_SUGGESTIONS_AND_EMPTY_PRIMARY;
-            case TO_CUSTOM_WITH_EMPTY_SUGGESTIONS:
-                return ToFolderLabelState.TO_CUSTOM_WITH_EMPTY_SUGGESTIONS;
-            case TO_CUSTOM_WITH_SUGGESTIONS_DISABLED:
-                return ToFolderLabelState.TO_CUSTOM_WITH_SUGGESTIONS_DISABLED;
-            default:
-                return ToFolderLabelState.TO_FOLDER_LABEL_STATE_UNSPECIFIED;
-        }
-    }
 }
diff --git a/src/com/android/launcher3/notification/NotificationMainView.java b/src/com/android/launcher3/notification/NotificationMainView.java
index 32f060ba85..9b065233b9 100644
--- a/src/com/android/launcher3/notification/NotificationMainView.java
+++ b/src/com/android/launcher3/notification/NotificationMainView.java
@@ -17,6 +17,7 @@
 package com.android.launcher3.notification;
 
 import static com.android.launcher3.anim.Interpolators.scrollInterpolatorForVelocity;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_NOTIFICATION_DISMISSED;
 
 import android.animation.Animator;
 import android.animation.ObjectAnimator;
@@ -41,7 +42,6 @@ import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.touch.BaseSwipeDetector;
 import com.android.launcher3.touch.OverScroll;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.launcher3.util.Themes;
 
 /**
@@ -168,10 +168,7 @@ public class NotificationMainView extends FrameLayout implements SingleAxisSwipe
         Launcher launcher = Launcher.getLauncher(getContext());
         launcher.getPopupDataProvider().cancelNotification(
                 mNotificationInfo.notificationKey);
-        launcher.getUserEventDispatcher().logActionOnItem(
-                LauncherLogProto.Action.Touch.SWIPE,
-                LauncherLogProto.Action.Direction.RIGHT, // Assume all swipes are right for logging.
-                LauncherLogProto.ItemType.NOTIFICATION);
+        launcher.getStatsLogManager().logger().log(LAUNCHER_NOTIFICATION_DISMISSED);
     }
 
     // SingleAxisSwipeDetector.Listener's
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index 26b32b8195..6d92b8b627 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -19,10 +19,8 @@ package com.android.launcher3.popup;
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_SHORTCUTS;
 import static com.android.launcher3.Utilities.squaredHypot;
 import static com.android.launcher3.Utilities.squaredTouchSlop;
-import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
 import static com.android.launcher3.popup.PopupPopulator.MAX_SHORTCUTS;
 import static com.android.launcher3.popup.PopupPopulator.MAX_SHORTCUTS_IF_NOTIFICATIONS;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
 import android.animation.AnimatorSet;
@@ -160,8 +158,7 @@ public class PopupContainerWithArrow<T extends BaseDraggingActivity> extends Arr
         if (ev.getAction() == MotionEvent.ACTION_DOWN) {
             BaseDragLayer dl = getPopupContainer();
             if (!dl.isEventOverView(this, ev)) {
-                mLauncher.getUserEventDispatcher().logActionTapOutside(
-                        newContainerTarget(ContainerType.DEEPSHORTCUTS));
+                // TODO: add WW log if want to log if tap closed deep shortcut container.
                 close(true);
 
                 // We let touches on the original icon go through so that users can launch
@@ -435,7 +432,9 @@ public class PopupContainerWithArrow<T extends BaseDraggingActivity> extends Arr
                     // Make sure we keep the original icon hidden while it is being dragged.
                     mOriginalIcon.setVisibility(INVISIBLE);
                 } else {
-                    mLauncher.getUserEventDispatcher().logDeepShortcutsOpen(mOriginalIcon);
+                    // TODO: add WW logging if want to add logging for long press on popup
+                    //  container.
+                    //  mLauncher.getUserEventDispatcher().logDeepShortcutsOpen(mOriginalIcon);
                     if (!mIsAboveIcon) {
                         // Show the icon but keep the text hidden.
                         mOriginalIcon.setVisibility(VISIBLE);
diff --git a/src/com/android/launcher3/popup/RemoteActionShortcut.java b/src/com/android/launcher3/popup/RemoteActionShortcut.java
index 61829c002b..7c393ad1e2 100644
--- a/src/com/android/launcher3/popup/RemoteActionShortcut.java
+++ b/src/com/android/launcher3/popup/RemoteActionShortcut.java
@@ -37,7 +37,6 @@ import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 
 @TargetApi(Build.VERSION_CODES.Q)
 public class RemoteActionShortcut extends SystemShortcut<BaseDraggingActivity> {
@@ -107,9 +106,6 @@ public class RemoteActionShortcut extends SystemShortcut<BaseDraggingActivity> {
                     Toast.LENGTH_SHORT)
                     .show();
         }
-
-        mTarget.getUserEventDispatcher().logActionOnControl(LauncherLogProto.Action.Touch.TAP,
-                LauncherLogProto.ControlType.REMOTE_ACTION_SHORTCUT, view);
     }
 
     @Override
diff --git a/src/com/android/launcher3/popup/SystemShortcut.java b/src/com/android/launcher3/popup/SystemShortcut.java
index 81302ac1f7..577fe4afaa 100644
--- a/src/com/android/launcher3/popup/SystemShortcut.java
+++ b/src/com/android/launcher3/popup/SystemShortcut.java
@@ -21,8 +21,6 @@ import com.android.launcher3.R;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ControlType;
 import com.android.launcher3.util.InstantAppResolver;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.launcher3.util.PackageUserKey;
@@ -117,8 +115,6 @@ public abstract class SystemShortcut<T extends BaseDraggingActivity> extends Ite
                     (WidgetsBottomSheet) mTarget.getLayoutInflater().inflate(
                             R.layout.widgets_bottom_sheet, mTarget.getDragLayer(), false);
             widgetsBottomSheet.populateAndShow(mItemInfo);
-            mTarget.getUserEventDispatcher().logActionOnControl(Action.Touch.TAP,
-                    ControlType.WIDGETS_BUTTON, view);
             mTarget.getStatsLogManager().logger().withItemInfo(mItemInfo)
                     .log(LAUNCHER_SYSTEM_SHORTCUT_WIDGETS_TAP);
         }
@@ -139,8 +135,6 @@ public abstract class SystemShortcut<T extends BaseDraggingActivity> extends Ite
             Rect sourceBounds = mTarget.getViewBounds(view);
             new PackageManagerHelper(mTarget).startDetailsActivityForInfo(
                     mItemInfo, sourceBounds, ActivityOptions.makeBasic().toBundle());
-            mTarget.getUserEventDispatcher().logActionOnControl(Action.Touch.TAP,
-                    ControlType.APPINFO_TARGET, view);
             mTarget.getStatsLogManager().logger().withItemInfo(mItemInfo)
                     .log(LAUNCHER_SYSTEM_SHORTCUT_APP_INFO_TAP);
         }
diff --git a/src/com/android/launcher3/states/HintState.java b/src/com/android/launcher3/states/HintState.java
index b8a184fcfc..fd1d965982 100644
--- a/src/com/android/launcher3/states/HintState.java
+++ b/src/com/android/launcher3/states/HintState.java
@@ -15,11 +15,12 @@
  */
 package com.android.launcher3.states;
 
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
+
 import android.content.Context;
 
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 
 /**
  * Scale down workspace/hotseat to hint at going to either overview (on pause) or first home screen.
@@ -30,7 +31,7 @@ public class HintState extends LauncherState {
             | FLAG_HAS_SYS_UI_SCRIM;
 
     public HintState(int id) {
-        super(id, ContainerType.DEFAULT_CONTAINERTYPE, STATE_FLAGS);
+        super(id, LAUNCHER_STATE_HOME, STATE_FLAGS);
     }
 
     @Override
diff --git a/src/com/android/launcher3/states/SpringLoadedState.java b/src/com/android/launcher3/states/SpringLoadedState.java
index 2a4f887503..45172b56ef 100644
--- a/src/com/android/launcher3/states/SpringLoadedState.java
+++ b/src/com/android/launcher3/states/SpringLoadedState.java
@@ -15,6 +15,8 @@
  */
 package com.android.launcher3.states;
 
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
+
 import android.content.Context;
 import android.graphics.Rect;
 
@@ -22,7 +24,6 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.Workspace;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 
 /**
  * Definition for spring loaded state used during drag and drop.
@@ -35,7 +36,7 @@ public class SpringLoadedState extends LauncherState {
             | FLAG_HIDE_BACK_BUTTON;
 
     public SpringLoadedState(int id) {
-        super(id, ContainerType.WORKSPACE, STATE_FLAGS);
+        super(id, LAUNCHER_STATE_HOME, STATE_FLAGS);
     }
 
     @Override
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index 8ee5a6e533..9fd53e2563 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -21,6 +21,9 @@ import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.anim.Interpolators.scrollInterpolatorForVelocity;
 import static com.android.launcher3.config.FeatureFlags.UNSTABLE_SPRINGS;
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_ALLAPPS;
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_UNKNOWN_SWIPEDOWN;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_UNKNOWN_SWIPEUP;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_COMPONENTS;
@@ -52,9 +55,6 @@ import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.states.StateAnimationConfig.AnimationFlags;
 import com.android.launcher3.testing.TestProtocol;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.launcher3.util.FlingBlockCheck;
 import com.android.launcher3.util.TouchController;
 
@@ -190,11 +190,6 @@ public abstract class AbstractStateChangeTouchController
 
     protected abstract float initCurrentAnimation(@AnimationFlags int animComponents);
 
-    /**
-     * Returns the container that the touch started from when leaving NORMAL state.
-     */
-    protected abstract int getLogContainerTypeForNormalState(MotionEvent ev);
-
     private boolean reinitCurrentAnimation(boolean reachedToState, boolean isDragTowardPositive) {
         LauncherState newFromState = mFromState == null ? mLauncher.getStateManager().getState()
                 : reachedToState ? mToState : mFromState;
@@ -307,11 +302,11 @@ public abstract class AbstractStateChangeTouchController
     public boolean onDrag(float displacement, MotionEvent ev) {
         if (!mIsLogContainerSet) {
             if (mStartState == ALL_APPS) {
-                mStartContainerType = ContainerType.ALLAPPS;
+                mStartContainerType = LAUNCHER_STATE_ALLAPPS;
             } else if (mStartState == NORMAL) {
-                mStartContainerType = getLogContainerTypeForNormalState(ev);
+                mStartContainerType = LAUNCHER_STATE_HOME;
             } else if (mStartState == OVERVIEW) {
-                mStartContainerType = ContainerType.TASKSWITCHER;
+                mStartContainerType = LAUNCHER_STATE_OVERVIEW;
             }
             mIsLogContainerSet = true;
         }
@@ -401,7 +396,6 @@ public abstract class AbstractStateChangeTouchController
     @Override
     public void onDragEnd(float velocity) {
         boolean fling = mDetector.isFling(velocity);
-        final int logAction = fling ? Touch.FLING : Touch.SWIPE;
 
         boolean blockedFling = fling && mFlingBlockCheck.isBlocked();
         if (blockedFling) {
@@ -458,7 +452,7 @@ public abstract class AbstractStateChangeTouchController
             }
         }
 
-        mCurrentAnimation.setEndAction(() -> onSwipeInteractionCompleted(targetState, logAction));
+        mCurrentAnimation.setEndAction(() -> onSwipeInteractionCompleted(targetState));
         ValueAnimator anim = mCurrentAnimation.getAnimationPlayer();
         anim.setFloatValues(startProgress, endProgress);
         maybeUpdateAtomicAnim(mFromState, targetState, targetState == mToState ? 1f : 0f);
@@ -522,11 +516,7 @@ public abstract class AbstractStateChangeTouchController
                 .setInterpolator(scrollInterpolatorForVelocity(velocity));
     }
 
-    protected int getDirectionForLog() {
-        return mToState.ordinal > mFromState.ordinal ? Direction.UP : Direction.DOWN;
-    }
-
-    protected void onSwipeInteractionCompleted(LauncherState targetState, int logAction) {
+    protected void onSwipeInteractionCompleted(LauncherState targetState) {
         if (mAtomicComponentsController != null) {
             mAtomicComponentsController.getAnimationPlayer().end();
             mAtomicComponentsController = null;
@@ -535,18 +525,18 @@ public abstract class AbstractStateChangeTouchController
         boolean shouldGoToTargetState = true;
         if (mPendingAnimation != null) {
             boolean reachedTarget = mToState == targetState;
-            mPendingAnimation.finish(reachedTarget, logAction);
+            mPendingAnimation.finish(reachedTarget);
             mPendingAnimation = null;
             shouldGoToTargetState = !reachedTarget;
         }
         if (shouldGoToTargetState) {
-            goToTargetState(targetState, logAction);
+            goToTargetState(targetState);
         }
     }
 
-    protected void goToTargetState(LauncherState targetState, int logAction) {
+    protected void goToTargetState(LauncherState targetState) {
         if (targetState != mStartState) {
-            logReachedState(logAction, targetState);
+            logReachedState(targetState);
         }
         if (!mLauncher.isInState(targetState)) {
             // If we're already in the target state, don't jump to it at the end of the animation in
@@ -556,24 +546,18 @@ public abstract class AbstractStateChangeTouchController
         mLauncher.getDragLayer().getScrim().createSysuiMultiplierAnim(1f).setDuration(0).start();
     }
 
-    private void logReachedState(int logAction, LauncherState targetState) {
+    private void logReachedState(LauncherState targetState) {
         // Transition complete. log the action
-        mLauncher.getUserEventDispatcher().logStateChangeAction(logAction,
-                getDirectionForLog(), mDetector.getDownX(), mDetector.getDownY(),
-                mStartContainerType /* e.g., hotseat */,
-                mStartState.containerType /* e.g., workspace */,
-                targetState.containerType,
-                mLauncher.getWorkspace().getCurrentPage());
         mLauncher.getStatsLogManager().logger()
-                .withSrcState(StatsLogManager.containerTypeToAtomState(mStartState.containerType))
-                .withDstState(StatsLogManager.containerTypeToAtomState(targetState.containerType))
+                .withSrcState(mStartState.statsLogOrdinal)
+                .withDstState(targetState.statsLogOrdinal)
                 .withContainerInfo(LauncherAtom.ContainerInfo.newBuilder()
                         .setWorkspace(
                                 LauncherAtom.WorkspaceContainer.newBuilder()
                                         .setPageIndex(mLauncher.getWorkspace().getCurrentPage()))
                         .build())
-                .log(StatsLogManager.getLauncherAtomEvent(mStartState.containerType,
-                            targetState.containerType, mToState.ordinal > mFromState.ordinal
+                .log(StatsLogManager.getLauncherAtomEvent(mStartState.statsLogOrdinal,
+                            targetState.statsLogOrdinal, mToState.ordinal > mFromState.ordinal
                                     ? LAUNCHER_UNKNOWN_SWIPEUP
                                     : LAUNCHER_UNKNOWN_SWIPEDOWN));
     }
diff --git a/src/com/android/launcher3/touch/AllAppsSwipeController.java b/src/com/android/launcher3/touch/AllAppsSwipeController.java
index 4a202b65d8..f9dcf2d2e9 100644
--- a/src/com/android/launcher3/touch/AllAppsSwipeController.java
+++ b/src/com/android/launcher3/touch/AllAppsSwipeController.java
@@ -24,7 +24,6 @@ import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.states.StateAnimationConfig.AnimationFlags;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 
 /**
  * TouchController to switch between NORMAL and ALL_APPS state.
@@ -69,12 +68,6 @@ public class AllAppsSwipeController extends AbstractStateChangeTouchController {
         return fromState;
     }
 
-    @Override
-    protected int getLogContainerTypeForNormalState(MotionEvent ev) {
-        return mLauncher.getDragLayer().isEventOverView(mLauncher.getHotseat(), mTouchDownEvent)
-                ? ContainerType.HOTSEAT : ContainerType.WORKSPACE;
-    }
-
     @Override
     protected float initCurrentAnimation(@AnimationFlags int animComponents) {
         float range = getShiftRange();
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java b/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java
index ec3f93ff1b..a4e53a1cc0 100644
--- a/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java
+++ b/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java
@@ -16,13 +16,13 @@
 package com.android.launcher3.uioverrides.states;
 
 import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_ALLAPPS;
 
 import android.content.Context;
 
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 
 /**
  * Definition for AllApps state
@@ -41,7 +41,7 @@ public class AllAppsState extends LauncherState {
     };
 
     public AllAppsState(int id) {
-        super(id, ContainerType.ALLAPPS, STATE_FLAGS);
+        super(id, LAUNCHER_STATE_ALLAPPS, STATE_FLAGS);
     }
 
     @Override
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java b/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java
index d102bccaad..da5a94f6fd 100644
--- a/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -15,10 +15,11 @@
  */
 package com.android.launcher3.uioverrides.states;
 
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW;
+
 import android.content.Context;
 
 import com.android.launcher3.LauncherState;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 
 /**
  * Definition for overview state
@@ -26,7 +27,7 @@ import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 public class OverviewState extends LauncherState {
 
     public OverviewState(int id) {
-        super(id, ContainerType.WORKSPACE, FLAG_DISABLE_RESTORE);
+        super(id, LAUNCHER_STATE_OVERVIEW, FLAG_DISABLE_RESTORE);
     }
 
     @Override
-- 
GitLab


From 10759887c276571b29a58843b9bb854c78731f99 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 25 Sep 2020 16:42:58 -0700
Subject: [PATCH 0194/1664] Fixing lock during RecentsModel initialization

HandlerThread.getLooper blocks the current thread until.
the final thread is initialized. Updating RecentsModel to
use an executor instead of a handler thread to avoid this.

Change-Id: I3b2e82a375ea65bea1526af4a32c6a2488102541
---
 .../quickstep/OverviewCommandHelper.java      |  4 +-
 .../com/android/quickstep/RecentsModel.java   | 14 ++--
 .../com/android/quickstep/TaskIconCache.java  | 50 +++++---------
 .../android/quickstep/TaskThumbnailCache.java | 52 +++++---------
 .../quickstep/util/CancellableTask.java       | 68 +++++++++++++++++++
 .../com/android/quickstep/views/TaskView.java |  5 +-
 src/com/android/launcher3/util/Executors.java | 27 ++++++++
 7 files changed, 141 insertions(+), 79 deletions(-)
 create mode 100644 quickstep/src/com/android/quickstep/util/CancellableTask.java

diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
index 365cff576a..20484e7cdf 100644
--- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
@@ -47,7 +47,6 @@ public class OverviewCommandHelper {
 
     private final Context mContext;
     private final RecentsAnimationDeviceState mDeviceState;
-    private final RecentsModel mRecentsModel;
     private final OverviewComponentObserver mOverviewComponentObserver;
 
     private long mLastToggleTime;
@@ -56,7 +55,6 @@ public class OverviewCommandHelper {
             OverviewComponentObserver observer) {
         mContext = context;
         mDeviceState = deviceState;
-        mRecentsModel = RecentsModel.INSTANCE.get(mContext);
         mOverviewComponentObserver = observer;
     }
 
@@ -160,7 +158,7 @@ public class OverviewCommandHelper {
                     ActivityManagerWrapper.getInstance().getRunningTask(), mDeviceState);
 
             // Preload the plan
-            mRecentsModel.getTasks(null);
+            RecentsModel.INSTANCE.get(mContext).getTasks(null);
         }
 
         @Override
diff --git a/quickstep/src/com/android/quickstep/RecentsModel.java b/quickstep/src/com/android/quickstep/RecentsModel.java
index 6c302ae5d7..d47217b770 100644
--- a/quickstep/src/com/android/quickstep/RecentsModel.java
+++ b/quickstep/src/com/android/quickstep/RecentsModel.java
@@ -18,7 +18,6 @@ package com.android.quickstep;
 import static android.os.Process.THREAD_PRIORITY_BACKGROUND;
 
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-import static com.android.launcher3.util.Executors.createAndStartNewLooper;
 import static com.android.quickstep.TaskUtils.checkCurrentOrManagedUserId;
 
 import android.annotation.TargetApi;
@@ -26,11 +25,11 @@ import android.app.ActivityManager;
 import android.content.ComponentCallbacks2;
 import android.content.Context;
 import android.os.Build;
-import android.os.Looper;
 import android.os.Process;
 import android.os.UserHandle;
 
 import com.android.launcher3.icons.IconProvider;
+import com.android.launcher3.util.Executors.SimpleThreadFactory;
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.recents.model.ThumbnailData;
@@ -40,6 +39,8 @@ import com.android.systemui.shared.system.TaskStackChangeListener;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
 import java.util.function.Consumer;
 
 /**
@@ -52,6 +53,9 @@ public class RecentsModel extends TaskStackChangeListener {
     public static final MainThreadInitializedObject<RecentsModel> INSTANCE =
             new MainThreadInitializedObject<>(RecentsModel::new);
 
+    private static final Executor RECENTS_MODEL_EXECUTOR = Executors.newSingleThreadExecutor(
+            new SimpleThreadFactory("TaskThumbnailIconCache-", THREAD_PRIORITY_BACKGROUND));
+
     private final List<TaskVisualsChangeListener> mThumbnailChangeListeners = new ArrayList<>();
     private final Context mContext;
 
@@ -61,12 +65,10 @@ public class RecentsModel extends TaskStackChangeListener {
 
     private RecentsModel(Context context) {
         mContext = context;
-        Looper looper =
-                createAndStartNewLooper("TaskThumbnailIconCache", THREAD_PRIORITY_BACKGROUND);
         mTaskList = new RecentTasksList(MAIN_EXECUTOR,
                 new KeyguardManagerCompat(context), ActivityManagerWrapper.getInstance());
-        mIconCache = new TaskIconCache(context, looper);
-        mThumbnailCache = new TaskThumbnailCache(context, looper);
+        mIconCache = new TaskIconCache(context, RECENTS_MODEL_EXECUTOR);
+        mThumbnailCache = new TaskThumbnailCache(context, RECENTS_MODEL_EXECUTOR);
 
         ActivityManagerWrapper.getInstance().registerTaskStackListener(this);
         IconProvider.registerIconChangeListener(context,
diff --git a/quickstep/src/com/android/quickstep/TaskIconCache.java b/quickstep/src/com/android/quickstep/TaskIconCache.java
index 7ff799ec55..65e89cfa2f 100644
--- a/quickstep/src/com/android/quickstep/TaskIconCache.java
+++ b/quickstep/src/com/android/quickstep/TaskIconCache.java
@@ -17,7 +17,6 @@ package com.android.quickstep;
 
 import static com.android.launcher3.FastBitmapDrawable.newIcon;
 import static com.android.launcher3.uioverrides.QuickstepLauncher.GO_LOW_RAM_RECENTS_ENABLED;
-import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 
 import android.app.ActivityManager.TaskDescription;
 import android.content.Context;
@@ -27,8 +26,6 @@ import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.os.Handler;
-import android.os.Looper;
 import android.os.UserHandle;
 import android.util.SparseArray;
 import android.view.accessibility.AccessibilityManager;
@@ -37,12 +34,11 @@ import androidx.annotation.WorkerThread;
 
 import com.android.launcher3.FastBitmapDrawable;
 import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
 import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.IconProvider;
 import com.android.launcher3.icons.LauncherIcons;
-import com.android.launcher3.icons.cache.HandlerRunnable;
 import com.android.launcher3.util.Preconditions;
+import com.android.quickstep.util.CancellableTask;
 import com.android.quickstep.util.TaskKeyLruCache;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.recents.model.Task.TaskKey;
@@ -50,6 +46,7 @@ import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.PackageManagerWrapper;
 import com.android.systemui.shared.system.TaskDescriptionCompat;
 
+import java.util.concurrent.Executor;
 import java.util.function.Consumer;
 
 /**
@@ -57,7 +54,7 @@ import java.util.function.Consumer;
  */
 public class TaskIconCache {
 
-    private final Handler mBackgroundHandler;
+    private final Executor mBgExecutor;
     private final AccessibilityManager mAccessibilityManager;
 
     private final Context mContext;
@@ -65,9 +62,9 @@ public class TaskIconCache {
     private final SparseArray<BitmapInfo> mDefaultIcons = new SparseArray<>();
     private final IconProvider mIconProvider;
 
-    public TaskIconCache(Context context, Looper backgroundLooper) {
+    public TaskIconCache(Context context, Executor bgExecutor) {
         mContext = context;
-        mBackgroundHandler = new Handler(backgroundLooper);
+        mBgExecutor = bgExecutor;
         mAccessibilityManager = context.getSystemService(AccessibilityManager.class);
 
         Resources res = context.getResources();
@@ -83,31 +80,27 @@ public class TaskIconCache {
      * @param callback The callback to receive the task after its data has been populated.
      * @return A cancelable handle to the request
      */
-    public IconLoadRequest updateIconInBackground(Task task, Consumer<Task> callback) {
+    public CancellableTask updateIconInBackground(Task task, Consumer<Task> callback) {
         Preconditions.assertUIThread();
         if (task.icon != null) {
             // Nothing to load, the icon is already loaded
             callback.accept(task);
             return null;
         }
+        CancellableTask<TaskCacheEntry> request = new CancellableTask<TaskCacheEntry>() {
+            @Override
+            public TaskCacheEntry getResultOnBg() {
+                return getCacheEntry(task);
+            }
 
-        IconLoadRequest request = new IconLoadRequest(mBackgroundHandler) {
             @Override
-            public void run() {
-                TaskCacheEntry entry = getCacheEntry(task);
-                if (isCanceled()) {
-                    // We don't call back to the provided callback in this case
-                    return;
-                }
-                MAIN_EXECUTOR.execute(() -> {
-                    task.icon = entry.icon;
-                    task.titleDescription = entry.contentDescription;
-                    callback.accept(task);
-                    onEnd();
-                });
+            public void handleResult(TaskCacheEntry result) {
+                task.icon = result.icon;
+                task.titleDescription = result.contentDescription;
+                callback.accept(task);
             }
         };
-        Utilities.postAsyncCallback(mBackgroundHandler, request);
+        mBgExecutor.execute(request);
         return request;
     }
 
@@ -120,9 +113,8 @@ public class TaskIconCache {
     }
 
     void invalidateCacheEntries(String pkg, UserHandle handle) {
-        Utilities.postAsyncCallback(mBackgroundHandler,
-                () -> mIconCache.removeAll(key ->
-                        pkg.equals(key.getPackageName()) && handle.getIdentifier() == key.userId));
+        mBgExecutor.execute(() -> mIconCache.removeAll(key ->
+                pkg.equals(key.getPackageName()) && handle.getIdentifier() == key.userId));
     }
 
     @WorkerThread
@@ -208,12 +200,6 @@ public class TaskIconCache {
         }
     }
 
-    public static abstract class IconLoadRequest extends HandlerRunnable {
-        IconLoadRequest(Handler handler) {
-            super(handler, null);
-        }
-    }
-
     private static class TaskCacheEntry {
         public Drawable icon;
         public String contentDescription = "";
diff --git a/quickstep/src/com/android/quickstep/TaskThumbnailCache.java b/quickstep/src/com/android/quickstep/TaskThumbnailCache.java
index 2b7a8ec250..a8a0219594 100644
--- a/quickstep/src/com/android/quickstep/TaskThumbnailCache.java
+++ b/quickstep/src/com/android/quickstep/TaskThumbnailCache.java
@@ -15,17 +15,12 @@
  */
 package com.android.quickstep;
 
-import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-
 import android.content.Context;
 import android.content.res.Resources;
-import android.os.Handler;
-import android.os.Looper;
 
 import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
-import com.android.launcher3.icons.cache.HandlerRunnable;
 import com.android.launcher3.util.Preconditions;
+import com.android.quickstep.util.CancellableTask;
 import com.android.quickstep.util.TaskKeyLruCache;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.recents.model.Task.TaskKey;
@@ -33,11 +28,12 @@ import com.android.systemui.shared.recents.model.ThumbnailData;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 
 import java.util.ArrayList;
+import java.util.concurrent.Executor;
 import java.util.function.Consumer;
 
 public class TaskThumbnailCache {
 
-    private final Handler mBackgroundHandler;
+    private final Executor mBgExecutor;
 
     private final int mCacheSize;
     private final TaskKeyLruCache<ThumbnailData> mCache;
@@ -94,8 +90,8 @@ public class TaskThumbnailCache {
         }
     }
 
-    public TaskThumbnailCache(Context context, Looper backgroundLooper) {
-        mBackgroundHandler = new Handler(backgroundLooper);
+    public TaskThumbnailCache(Context context, Executor bgExecutor) {
+        mBgExecutor = bgExecutor;
         mHighResLoadingState = new HighResLoadingState(context);
 
         Resources res = context.getResources();
@@ -130,7 +126,7 @@ public class TaskThumbnailCache {
      * @param callback The callback to receive the task after its data has been populated.
      * @return A cancelable handle to the request
      */
-    public ThumbnailLoadRequest updateThumbnailInBackground(
+    public CancellableTask updateThumbnailInBackground(
             Task task, Consumer<ThumbnailData> callback) {
         Preconditions.assertUIThread();
 
@@ -142,14 +138,13 @@ public class TaskThumbnailCache {
             return null;
         }
 
-
         return updateThumbnailInBackground(task.key, !mHighResLoadingState.isEnabled(), t -> {
             task.thumbnail = t;
             callback.accept(t);
         });
     }
 
-    private ThumbnailLoadRequest updateThumbnailInBackground(TaskKey key, boolean lowResolution,
+    private CancellableTask updateThumbnailInBackground(TaskKey key, boolean lowResolution,
             Consumer<ThumbnailData> callback) {
         Preconditions.assertUIThread();
 
@@ -160,26 +155,20 @@ public class TaskThumbnailCache {
             return null;
         }
 
-        ThumbnailLoadRequest request = new ThumbnailLoadRequest(mBackgroundHandler,
-                lowResolution) {
+        CancellableTask<ThumbnailData> request = new CancellableTask<ThumbnailData>() {
             @Override
-            public void run() {
-                ThumbnailData thumbnail = ActivityManagerWrapper.getInstance().getTaskThumbnail(
+            public ThumbnailData getResultOnBg() {
+                return ActivityManagerWrapper.getInstance().getTaskThumbnail(
                         key.id, lowResolution);
+            }
 
-                MAIN_EXECUTOR.execute(() -> {
-                    if (isCanceled()) {
-                        // We don't call back to the provided callback in this case
-                        return;
-                    }
-
-                    mCache.put(key, thumbnail);
-                    callback.accept(thumbnail);
-                    onEnd();
-                });
+            @Override
+            public void handleResult(ThumbnailData result) {
+                mCache.put(key, result);
+                callback.accept(result);
             }
         };
-        Utilities.postAsyncCallback(mBackgroundHandler, request);
+        mBgExecutor.execute(request);
         return request;
     }
 
@@ -218,15 +207,6 @@ public class TaskThumbnailCache {
         return mEnableTaskSnapshotPreloading && mHighResLoadingState.mVisible;
     }
 
-    public static abstract class ThumbnailLoadRequest extends HandlerRunnable {
-        public final boolean mLowResolution;
-
-        ThumbnailLoadRequest(Handler handler, boolean lowResolution) {
-            super(handler, null);
-            mLowResolution = lowResolution;
-        }
-    }
-
     /**
      * @return Whether device supports low-res thumbnails. Low-res files are an optimization
      * for faster load times of snapshots. Devices can optionally disable low-res files so that
diff --git a/quickstep/src/com/android/quickstep/util/CancellableTask.java b/quickstep/src/com/android/quickstep/util/CancellableTask.java
new file mode 100644
index 0000000000..a6e2e81589
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/util/CancellableTask.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.quickstep.util;
+
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+
+import androidx.annotation.UiThread;
+import androidx.annotation.WorkerThread;
+
+/**
+ * Utility class to executore a task on background and post the result on UI thread
+ */
+public abstract class CancellableTask<T> implements Runnable {
+
+    private boolean mCancelled = false;
+
+    @Override
+    public final void run() {
+        if (mCancelled) {
+            return;
+        }
+        T result = getResultOnBg();
+        if (mCancelled) {
+            return;
+        }
+        MAIN_EXECUTOR.execute(() -> {
+            if (mCancelled) {
+                return;
+            }
+            handleResult(result);
+        });
+    }
+
+    /**
+     * Called on the worker thread to process the request. The return object is passed to
+     * {@link #handleResult(Object)}
+     */
+    @WorkerThread
+    public abstract T getResultOnBg();
+
+    /**
+     * Called on the UI thread to handle the final result.
+     * @param result
+     */
+    @UiThread
+    public abstract void handleResult(T result);
+
+    /**
+     * Cancels the request. If it is called before {@link #handleResult(Object)}, that method
+     * will not be called
+     */
+    public void cancel() {
+        mCancelled = true;
+    }
+}
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 6a2ab5a304..ada54be0db 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -90,6 +90,7 @@ import com.android.quickstep.TaskIconCache;
 import com.android.quickstep.TaskOverlayFactory;
 import com.android.quickstep.TaskThumbnailCache;
 import com.android.quickstep.TaskUtils;
+import com.android.quickstep.util.CancellableTask;
 import com.android.quickstep.util.RecentsOrientedState;
 import com.android.quickstep.util.TaskCornerRadius;
 import com.android.quickstep.views.RecentsView.PageCallbacks;
@@ -189,8 +190,8 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     private boolean mShowScreenshot;
 
     // The current background requests to load the task thumbnail and icon
-    private TaskThumbnailCache.ThumbnailLoadRequest mThumbnailLoadRequest;
-    private TaskIconCache.IconLoadRequest mIconLoadRequest;
+    private CancellableTask mThumbnailLoadRequest;
+    private CancellableTask mIconLoadRequest;
 
     // Order in which the footers appear. Lower order appear below higher order.
     public static final int INDEX_DIGITAL_WELLBEING_TOAST = 0;
diff --git a/src/com/android/launcher3/util/Executors.java b/src/com/android/launcher3/util/Executors.java
index 0a32734fca..a85ae458ed 100644
--- a/src/com/android/launcher3/util/Executors.java
+++ b/src/com/android/launcher3/util/Executors.java
@@ -20,8 +20,10 @@ import android.os.Looper;
 import android.os.Process;
 
 import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * Various different executors used in Launcher
@@ -83,4 +85,29 @@ public class Executors {
      */
     public static final LooperExecutor MODEL_EXECUTOR =
             new LooperExecutor(createAndStartNewLooper("launcher-loader"));
+
+    /**
+     * A simple ThreadFactory to set the thread name and priority when used with executors.
+     */
+    public static class SimpleThreadFactory implements ThreadFactory {
+
+        private final int mPriority;
+        private final String mNamePrefix;
+
+        private final AtomicInteger mCount = new AtomicInteger(0);
+
+        public SimpleThreadFactory(String namePrefix, int priority) {
+            mNamePrefix = namePrefix;
+            mPriority = priority;
+        }
+
+        @Override
+        public Thread newThread(Runnable runnable) {
+            Thread t = new Thread(() -> {
+                Process.setThreadPriority(mPriority);
+                runnable.run();
+            }, mNamePrefix + mCount.incrementAndGet());
+            return t;
+        }
+    }
 }
-- 
GitLab


From b8a30ef68a133c216c5af10d746808065890d024 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Fri, 25 Sep 2020 13:03:40 -0700
Subject: [PATCH 0195/1664] Adding jank tracing for some CUJs

Test: checking traces

Bug: 169220800
Bug: 169220955
Bug: 169221267
Bug: 169220924
Bug: 169220843
Change-Id: Ia32635764c78139f7e9a616c9fe70ae1a507c1b2
---
 .../launcher3/BaseQuickstepLauncher.java      |  8 ++
 .../QuickstepAppTransitionManagerImpl.java    | 75 ++++++++++---------
 .../android/quickstep/AbsSwipeUpHandler.java  | 10 +++
 3 files changed, 59 insertions(+), 34 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 68111d2632..54c2383be9 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -22,6 +22,8 @@ import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY;
 
+import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
+
 import android.animation.AnimatorSet;
 import android.animation.ValueAnimator;
 import android.content.Intent;
@@ -307,4 +309,10 @@ public abstract class BaseQuickstepLauncher extends Launcher
     public void setHintUserWillBeActive() {
         addActivityFlags(ACTIVITY_STATE_USER_WILL_BE_ACTIVE);
     }
+
+    @Override
+    public void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        InteractionJankMonitorWrapper.init(getWindow().getDecorView());
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
index dddcc865fa..d453bc3455 100644
--- a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
@@ -66,6 +66,7 @@ import androidx.annotation.Nullable;
 
 import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
 import com.android.launcher3.allapps.AllAppsTransitionController;
+import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.shortcuts.DeepShortcutView;
@@ -81,6 +82,7 @@ import com.android.quickstep.util.StaggeredWorkspaceAnim;
 import com.android.quickstep.util.SurfaceTransactionApplier;
 import com.android.systemui.shared.system.ActivityCompat;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
+import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
 import com.android.systemui.shared.system.QuickStepContract;
 import com.android.systemui.shared.system.RemoteAnimationAdapterCompat;
 import com.android.systemui.shared.system.RemoteAnimationDefinitionCompat;
@@ -791,6 +793,36 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                 == PackageManager.PERMISSION_GRANTED;
     }
 
+    private void addCujInstrumentation(Animator anim, int cuj, String transition) {
+        if (Trace.isEnabled()) {
+            anim.addListener(new AnimationSuccessListener() {
+                @Override
+                public void onAnimationStart(Animator animation) {
+                    Trace.beginAsyncSection(transition, 0);
+                    InteractionJankMonitorWrapper.begin(cuj);
+                    super.onAnimationStart(animation);
+                }
+
+                @Override
+                public void onAnimationCancel(Animator animation) {
+                    super.onAnimationCancel(animation);
+                    InteractionJankMonitorWrapper.cancel(cuj);
+                }
+
+                @Override
+                public void onAnimationSuccess(Animator animator) {
+                    InteractionJankMonitorWrapper.end(cuj);
+                }
+
+                @Override
+                public void onAnimationEnd(Animator animation) {
+                    super.onAnimationEnd(animation);
+                    Trace.endAsyncSection(TRANSITION_OPEN_LAUNCHER, 0);
+                }
+            });
+        }
+    }
+
     /**
      * Remote animation runner for animation from the app to Launcher, including recents.
      */
@@ -855,21 +887,9 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                 // is initialized.
                 if (launcherIsATargetWithMode(appTargets, MODE_OPENING)
                         || mLauncher.isForceInvisible()) {
-                    if (Trace.isEnabled()) {
-                        anim.addListener(new AnimatorListenerAdapter() {
-                            @Override
-                            public void onAnimationStart(Animator animation) {
-                                Trace.beginAsyncSection(TRANSITION_OPEN_LAUNCHER, 0);
-                                super.onAnimationStart(animation);
-                            }
-
-                            @Override
-                            public void onAnimationEnd(Animator animation) {
-                                super.onAnimationEnd(animation);
-                                Trace.endAsyncSection(TRANSITION_OPEN_LAUNCHER, 0);
-                            }
-                        });
-                    }
+                    addCujInstrumentation(
+                            anim, InteractionJankMonitorWrapper.CUJ_APP_CLOSE_TO_HOME,
+                            TRANSITION_OPEN_LAUNCHER);
                     // Only register the content animation for cancellation when state changes
                     mLauncher.getStateManager().setCurrentAnimation(anim);
 
@@ -938,25 +958,12 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                         launcherClosing);
             }
 
-            if (Trace.isEnabled()) {
-                final String section =
-                        launchingFromRecents
-                                ? TRANSITION_LAUNCH_FROM_RECENTS : TRANSITION_LAUNCH_FROM_ICON;
-
-                anim.addListener(new AnimatorListenerAdapter() {
-                    @Override
-                    public void onAnimationStart(Animator animation) {
-                        Trace.beginAsyncSection(section, 0);
-                        super.onAnimationStart(animation);
-                    }
-
-                    @Override
-                    public void onAnimationEnd(Animator animation) {
-                        super.onAnimationEnd(animation);
-                        Trace.endAsyncSection(section, 0);
-                    }
-                });
-            }
+            addCujInstrumentation(anim,
+                    launchingFromRecents
+                            ? InteractionJankMonitorWrapper.CUJ_APP_LAUNCH_FROM_RECENTS
+                            : InteractionJankMonitorWrapper.CUJ_APP_LAUNCH_FROM_ICON,
+                    launchingFromRecents
+                            ? TRANSITION_LAUNCH_FROM_RECENTS : TRANSITION_LAUNCH_FROM_ICON);
 
             if (launcherClosing) {
                 anim.addListener(mForceInvisibleListener);
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 6774433a1f..5e05a7dbe1 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -97,6 +97,7 @@ import com.android.quickstep.views.TaskView;
 import com.android.systemui.shared.recents.model.ThumbnailData;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.InputConsumerController;
+import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
 import com.android.systemui.shared.system.LatencyTrackerCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 import com.android.systemui.shared.system.TaskInfoCompat;
@@ -1130,10 +1131,12 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         anim.addOnUpdateListener((r, p) -> {
             updateSysUiFlags(Math.max(p, mCurrentShift.value));
         });
+        final int cuj = InteractionJankMonitorWrapper.CUJ_APP_CLOSE_TO_HOME;
         anim.addAnimatorListener(new AnimationSuccessListener() {
             @Override
             public void onAnimationStart(Animator animation) {
                 Trace.beginAsyncSection(TRANSITION_OPEN_LAUNCHER, 0);
+                InteractionJankMonitorWrapper.begin(cuj);
                 if (mActivity != null) {
                     removeLiveTileOverlay();
                 }
@@ -1147,6 +1150,13 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                 // Make sure recents is in its final state
                 maybeUpdateRecentsAttachedState(false);
                 mActivityInterface.onSwipeUpToHomeComplete(mDeviceState);
+                InteractionJankMonitorWrapper.end(cuj);
+            }
+
+            @Override
+            public void onAnimationCancel(Animator animation) {
+                super.onAnimationCancel(animation);
+                InteractionJankMonitorWrapper.cancel(cuj);
             }
 
             @Override
-- 
GitLab


From 9fcb45f872cd23413fafcc645001ba79fafc5087 Mon Sep 17 00:00:00 2001
From: Jonathan Miranda <jonmiranda@google.com>
Date: Tue, 29 Sep 2020 02:08:10 +0000
Subject: [PATCH 0196/1664] Revert "Remove widgets that no longer fit the
 workspace in their current spans."

This reverts commit bf6e8ffbf030b6d419b808c28335bf8a8724e9bc.

Reason for revert: broken tests
Bug: 141313472
Change-Id: I1e93e21e2c6618dea6cd099a46c9b9d2ab3ab81c
---
 src/com/android/launcher3/model/LoaderTask.java | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index c0d5882b46..2b4520b613 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -49,7 +49,6 @@ import android.util.LongSparseArray;
 import android.util.TimingLogger;
 
 import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.LauncherModel;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.Utilities;
@@ -307,7 +306,6 @@ public class LoaderTask implements Runnable {
         final PackageManagerHelper pmHelper = new PackageManagerHelper(context);
         final boolean isSafeMode = pmHelper.isSafeMode();
         final boolean isSdCardReady = Utilities.isBootCompleted();
-        final WidgetManagerHelper widgetHelper = new WidgetManagerHelper(context);
 
         boolean clearDb = false;
         try {
@@ -393,7 +391,6 @@ public class LoaderTask implements Runnable {
 
                 WorkspaceItemInfo info;
                 LauncherAppWidgetInfo appWidgetInfo;
-                LauncherAppWidgetProviderInfo widgetProviderInfo;
                 Intent intent;
                 String targetPkg;
 
@@ -723,19 +720,6 @@ public class LoaderTask implements Runnable {
                                             + appWidgetInfo.spanX + "x" + appWidgetInfo.spanY);
                                     continue;
                                 }
-                                widgetProviderInfo =
-                                        widgetHelper.getLauncherAppWidgetInfo(appWidgetId);
-                                if (widgetProviderInfo != null
-                                        && (appWidgetInfo.spanX < widgetProviderInfo.minSpanX
-                                        || appWidgetInfo.spanY < widgetProviderInfo.minSpanY)) {
-                                    // This can happen when display size changes.
-                                    c.markDeleted("Widget removed, min sizes not met: "
-                                            + "span=" + appWidgetInfo.spanX + "x"
-                                            + appWidgetInfo.spanY + " minSpan="
-                                            + widgetProviderInfo.minSpanX + "x"
-                                            + widgetProviderInfo.minSpanY);
-                                    continue;
-                                }
                                 if (!c.isOnWorkspaceOrHotseat()) {
                                     c.markDeleted("Widget found where container != " +
                                             "CONTAINER_DESKTOP nor CONTAINER_HOTSEAT - ignoring!");
-- 
GitLab


From 020e628f22cc7975beab439c6da26af2f9ebc15b Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Mon, 28 Sep 2020 17:01:42 -0700
Subject: [PATCH 0197/1664] Add shadow radius to windows during app launch /
 close animations.

Bug: 168608912
Change-Id: I2ec50b0b3711c0861659f9c641bbc05fcdeaab45
---
 quickstep/res/values/dimens.xml                    |  2 ++
 .../QuickstepAppTransitionManagerImpl.java         | 12 ++++++++++--
 .../android/quickstep/SwipeUpAnimationLogic.java   | 13 +++++++++++--
 .../android/quickstep/util/TaskViewSimulator.java  |  3 ++-
 .../android/quickstep/util/TransformParams.java    | 14 ++++++++++++++
 5 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index c85fe6ca35..c7c0c7ed73 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -51,6 +51,8 @@
     <dimen name="recents_empty_message_text_size">16sp</dimen>
     <dimen name="recents_empty_message_text_padding">16dp</dimen>
 
+    <dimen name="max_shadow_radius">5dp</dimen>
+
     <!-- Total space (start + end) between the task card and the edge of the screen
          in various configurations -->
     <dimen name="task_card_vert_space">40dp</dimen>
diff --git a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
index dddcc865fa..6e567f792c 100644
--- a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
@@ -151,6 +151,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
     private final float mContentTransY;
     private final float mWorkspaceTransY;
     private final float mClosingWindowTransY;
+    private final float mMaxShadowRadius;
 
     private DeviceProfile mDeviceProfile;
 
@@ -184,6 +185,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
         mContentTransY = res.getDimensionPixelSize(R.dimen.content_trans_y);
         mWorkspaceTransY = res.getDimensionPixelSize(R.dimen.workspace_trans_y);
         mClosingWindowTransY = res.getDimensionPixelSize(R.dimen.closing_window_trans_y);
+        mMaxShadowRadius = res.getDimensionPixelSize(R.dimen.max_shadow_radius);
 
         mLauncher.addOnDeviceProfileChangeListener(this);
     }
@@ -536,6 +538,8 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                     EXAGGERATED_EASE);
             FloatProp mWindowRadius = new FloatProp(initialWindowRadius, windowRadius, 0,
                     RADIUS_DURATION, EXAGGERATED_EASE);
+            FloatProp mShadowRadius = new FloatProp(0, mMaxShadowRadius, 0,
+                    APP_LAUNCH_DURATION, EXAGGERATED_EASE);
 
             @Override
             public void onUpdate(float percent) {
@@ -598,7 +602,8 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                         builder.withMatrix(matrix)
                                 .withWindowCrop(crop)
                                 .withAlpha(1f - mIconAlpha.value)
-                                .withCornerRadius(mWindowRadius.value);
+                                .withCornerRadius(mWindowRadius.value)
+                                .withShadowRadius(mShadowRadius.value);
                     } else {
                         tmpPos.set(target.position.x, target.position.y);
                         if (target.localBounds != null) {
@@ -748,6 +753,8 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
             FloatProp mDy = new FloatProp(0, mClosingWindowTransY, 0, duration, DEACCEL_1_7);
             FloatProp mScale = new FloatProp(1f, 1f, 0, duration, DEACCEL_1_7);
             FloatProp mAlpha = new FloatProp(1f, 0f, 25, 125, LINEAR);
+            FloatProp mShadowRadius = new FloatProp(mMaxShadowRadius, 0, 0, duration,
+                    DEACCEL_1_7);
 
             @Override
             public void onUpdate(float percent) {
@@ -769,7 +776,8 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                         matrix.postTranslate(tmpPos.x, tmpPos.y);
                         builder.withMatrix(matrix)
                                 .withAlpha(mAlpha.value)
-                                .withCornerRadius(windowCornerRadius);
+                                .withCornerRadius(windowCornerRadius)
+                                .withShadowRadius(mShadowRadius.value);
                     } else {
                         matrix.setTranslate(tmpPos.x, tmpPos.y);
                         builder.withMatrix(matrix)
diff --git a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
index b6eaa1c7b6..a46de1f601 100644
--- a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
+++ b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
@@ -29,6 +29,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.UiThread;
 
 import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.AnimatorPlaybackController;
@@ -66,6 +67,8 @@ public abstract class SwipeUpAnimationLogic {
     // How much further we can drag past recents, as a factor of mTransitionDragLength.
     protected float mDragLengthFactor = 1;
 
+    protected final float mMaxShadowRadius;
+
     protected AnimatorControllerWithResistance mWindowTransitionController;
 
     public SwipeUpAnimationLogic(Context context, RecentsAnimationDeviceState deviceState,
@@ -80,6 +83,9 @@ public abstract class SwipeUpAnimationLogic {
                 mDeviceState.getRotationTouchHelper().getCurrentActiveRotation(),
                 mDeviceState.getRotationTouchHelper().getDisplayRotation());
         mTaskViewSimulator.setDrawsBelowRecents(true);
+
+        mMaxShadowRadius = context.getResources().getDimensionPixelSize(R.dimen.max_shadow_radius);
+        mTransformParams.setShadowRadius(mMaxShadowRadius);
     }
 
     protected void initTransitionEndpoints(DeviceProfile dp) {
@@ -251,9 +257,11 @@ public abstract class SwipeUpAnimationLogic {
 
             mMatrix.setRectToRect(mCropRectF, mWindowCurrentRect, ScaleToFit.FILL);
             float cornerRadius = Utilities.mapRange(progress, mStartRadius, mEndRadius);
+            float shadowRadius = Utilities.mapRange(progress, mMaxShadowRadius, 0);
             mTransformParams
                     .setTargetAlpha(getWindowAlpha(progress))
-                    .setCornerRadius(cornerRadius);
+                    .setCornerRadius(cornerRadius)
+                    .setShadowRadius(mMaxShadowRadius);
 
             mTransformParams.applySurfaceParams(mTransformParams.createSurfaceParams(this));
             mAnimationFactory.update(currentRect, progress, mMatrix.mapRadius(cornerRadius));
@@ -264,7 +272,8 @@ public abstract class SwipeUpAnimationLogic {
                 Builder builder, RemoteAnimationTargetCompat app, TransformParams params) {
             builder.withMatrix(mMatrix)
                     .withWindowCrop(mCropRect)
-                    .withCornerRadius(params.getCornerRadius());
+                    .withCornerRadius(params.getCornerRadius())
+                    .withShadowRadius(params.getShadowRadius());
         }
 
         @Override
diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index 3a54bd61aa..08fe48d5ce 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -322,7 +322,8 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
             Builder builder, RemoteAnimationTargetCompat app, TransformParams params) {
         builder.withMatrix(mMatrix)
                 .withWindowCrop(mTmpCropRect)
-                .withCornerRadius(getCurrentCornerRadius());
+                .withCornerRadius(getCurrentCornerRadius())
+                .withShadowRadius(params.getShadowRadius());
 
         if (ENABLE_QUICKSTEP_LIVE_TILE.get() && params.getRecentsSurface() != null) {
             // When relativeLayer = 0, it reverts the surfaces back to the original order.
diff --git a/quickstep/src/com/android/quickstep/util/TransformParams.java b/quickstep/src/com/android/quickstep/util/TransformParams.java
index 45f49bb785..c6a0c6631c 100644
--- a/quickstep/src/com/android/quickstep/util/TransformParams.java
+++ b/quickstep/src/com/android/quickstep/util/TransformParams.java
@@ -57,6 +57,7 @@ public class TransformParams {
     private float mProgress;
     private float mTargetAlpha;
     private float mCornerRadius;
+    private float mShadowRadius;
     private RemoteAnimationTargets mTargetSet;
     private SurfaceTransactionApplier mSyncTransactionApplier;
     private SurfaceControl mRecentsSurface;
@@ -68,6 +69,7 @@ public class TransformParams {
         mProgress = 0;
         mTargetAlpha = 1;
         mCornerRadius = -1;
+        mShadowRadius = 0;
     }
 
     /**
@@ -90,6 +92,14 @@ public class TransformParams {
         return this;
     }
 
+    /**
+     * Sets the shadow radius of the transformed window, in pixels.
+     */
+    public TransformParams setShadowRadius(float shadowRadius) {
+        mShadowRadius = shadowRadius;
+        return this;
+    }
+
     /**
      * Specifies the alpha of the transformed window. Default is 1.
      */
@@ -197,6 +207,10 @@ public class TransformParams {
         return mCornerRadius;
     }
 
+    public float getShadowRadius() {
+        return mShadowRadius;
+    }
+
     public SurfaceControl getRecentsSurface() {
         return mRecentsSurface;
     }
-- 
GitLab


From b7487f867c2ff1bd0459182934b4040a0cf1d865 Mon Sep 17 00:00:00 2001
From: jayaprakashs <jayaprakashs@google.com>
Date: Wed, 23 Sep 2020 22:46:36 -0700
Subject: [PATCH 0198/1664] [Search] [People] Pass intent to People view
 instead of URI.

Tested:
On Phone

Bug: 169294622

Change-Id: I4e379a80a256e018761af2925e640745456faeec
---
 .../views/SearchResultPeopleView.java         | 51 ++++++++-----------
 1 file changed, 20 insertions(+), 31 deletions(-)

diff --git a/src/com/android/launcher3/views/SearchResultPeopleView.java b/src/com/android/launcher3/views/SearchResultPeopleView.java
index eacc095188..0c9a22f672 100644
--- a/src/com/android/launcher3/views/SearchResultPeopleView.java
+++ b/src/com/android/launcher3/views/SearchResultPeopleView.java
@@ -15,9 +15,6 @@
  */
 package com.android.launcher3.views;
 
-import static android.content.Intent.URI_ALLOW_UNSAFE;
-import static android.content.Intent.URI_ANDROID_APP_SCHEME;
-
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
@@ -28,7 +25,6 @@ import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.net.Uri;
 import android.os.Bundle;
 import android.util.AttributeSet;
 import android.view.View;
@@ -50,7 +46,6 @@ import com.android.systemui.plugins.AllAppsSearchPlugin;
 import com.android.systemui.plugins.shared.SearchTarget;
 import com.android.systemui.plugins.shared.SearchTargetEvent;
 
-import java.net.URISyntaxException;
 import java.util.ArrayList;
 
 /**
@@ -66,7 +61,7 @@ public class SearchResultPeopleView extends LinearLayout implements
     private TextView mTitleView;
     private ImageButton[] mProviderButtons = new ImageButton[3];
     private AllAppsSearchPlugin mPlugin;
-    private Uri mContactUri;
+    private Intent mIntent;
     private final Object[] mTargetInfo = createTargetInfo();
 
     public SearchResultPeopleView(Context context) {
@@ -109,7 +104,7 @@ public class SearchResultPeopleView extends LinearLayout implements
         Bundle payload = adapterItemWithPayload.getPayload();
         mPlugin = adapterItemWithPayload.getPlugin();
         mTitleView.setText(payload.getString("title"));
-        mContactUri = payload.getParcelable("contact_uri");
+        mIntent = payload.getParcelable("intent");
         Bitmap icon = payload.getParcelable("icon");
         if (icon != null) {
             RoundedBitmapDrawable d = RoundedBitmapDrawableFactory.create(getResources(), icon);
@@ -125,25 +120,20 @@ public class SearchResultPeopleView extends LinearLayout implements
         for (int i = 0; i < mProviderButtons.length; i++) {
             ImageButton button = mProviderButtons[i];
             if (providers != null && i < providers.size()) {
-                try {
-                    Bundle provider = providers.get(i);
-                    Intent intent = Intent.parseUri(provider.getString("intent_uri_str"),
-                            URI_ANDROID_APP_SCHEME | URI_ALLOW_UNSAFE);
-                    setupProviderButton(button, provider, intent, adapterItemWithPayload);
-                    String pkg = provider.getString("package_name");
-                    UI_HELPER_EXECUTOR.post(() -> {
-                        try {
-                            ApplicationInfo applicationInfo = mPackageManager.getApplicationInfo(
-                                    pkg, 0);
-                            Drawable appIcon = applicationInfo.loadIcon(mPackageManager);
-                            MAIN_EXECUTOR.post(() -> button.setImageDrawable(appIcon));
-                        } catch (PackageManager.NameNotFoundException ignored) {
-                        }
-
-                    });
-                } catch (URISyntaxException ex) {
-                    button.setVisibility(GONE);
-                }
+                Bundle provider = providers.get(i);
+                Intent intent = provider.getParcelable("intent");
+                setupProviderButton(button, provider, intent, adapterItemWithPayload);
+                String pkg = provider.getString("package_name");
+                UI_HELPER_EXECUTOR.post(() -> {
+                    try {
+                        ApplicationInfo applicationInfo = mPackageManager.getApplicationInfo(
+                                pkg, 0);
+                        Drawable appIcon = applicationInfo.loadIcon(mPackageManager);
+                        MAIN_EXECUTOR.post(() -> button.setImageDrawable(appIcon));
+                    } catch (PackageManager.NameNotFoundException ignored) {
+                    }
+
+                });
             } else {
                 button.setVisibility(GONE);
             }
@@ -165,7 +155,7 @@ public class SearchResultPeopleView extends LinearLayout implements
                     SearchTarget.ItemType.PEOPLE,
                     SearchTargetEvent.CHILD_SELECT);
             searchTargetEvent.bundle = new Bundle();
-            searchTargetEvent.bundle.putParcelable("contact_uri", mContactUri);
+            searchTargetEvent.bundle.putParcelable("intent", mIntent);
             searchTargetEvent.bundle.putBundle("provider", provider);
             if (mPlugin != null) {
                 mPlugin.notifySearchTargetEvent(searchTargetEvent);
@@ -175,14 +165,13 @@ public class SearchResultPeopleView extends LinearLayout implements
 
 
     private void handleSelection(int eventType) {
-        if (mContactUri != null) {
+        if (mIntent != null) {
             Launcher launcher = Launcher.getLauncher(getContext());
-            launcher.startActivitySafely(this, new Intent(Intent.ACTION_VIEW, mContactUri).setFlags(
-                    Intent.FLAG_ACTIVITY_NEW_TASK), null);
+            launcher.startActivitySafely(this, mIntent, null);
             SearchTargetEvent searchTargetEvent = getSearchTargetEvent(SearchTarget.ItemType.PEOPLE,
                     eventType);
             searchTargetEvent.bundle = new Bundle();
-            searchTargetEvent.bundle.putParcelable("contact_uri", mContactUri);
+            searchTargetEvent.bundle.putParcelable("intent", mIntent);
             if (mPlugin != null) {
                 mPlugin.notifySearchTargetEvent(searchTargetEvent);
             }
-- 
GitLab


From 907845eba549e59ed445b3981cd63c029666cb76 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 28 Sep 2020 20:04:52 -0700
Subject: [PATCH 0199/1664] Wrap animation runner for recents animation

Bug: 160239388
Change-Id: I937c89b963b88702548daca7c0b85f7a79d5d706
---
 .../launcher3/LauncherAnimationRunner.java     |  3 +--
 .../com/android/quickstep/RecentsActivity.java | 18 +++++++++++++++---
 .../util/RemoteAnimationProvider.java          | 12 ++++++++----
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
index 199cf63b92..75355c9b4e 100644
--- a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
+++ b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
@@ -34,8 +34,7 @@ import com.android.systemui.shared.system.RemoteAnimationRunnerCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
 @TargetApi(Build.VERSION_CODES.P)
-public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCompat,
-        WrappedAnimationRunnerImpl {
+public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCompat {
 
     private static final String TAG = "LauncherAnimationRunner";
 
diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index 6f2f9fb523..87ae9596e6 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -41,7 +41,10 @@ import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherAnimationRunner;
+import com.android.launcher3.LauncherAnimationRunner.AnimationResult;
 import com.android.launcher3.R;
+import com.android.launcher3.WrappedAnimationRunnerImpl;
+import com.android.launcher3.WrappedLauncherAnimationRunner;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.compat.AccessibilityManagerCompat;
@@ -87,6 +90,9 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
 
     private StateManager<RecentsState> mStateManager;
 
+    // Strong refs to runners which are cleared when the activity is destroyed
+    private WrappedAnimationRunnerImpl mActivityLaunchAnimationRunner;
+
     /**
      * Init drag layer and overview panel views.
      */
@@ -170,8 +176,11 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
         }
 
         final TaskView taskView = (TaskView) v;
-        RemoteAnimationRunnerCompat runner = new LauncherAnimationRunner(mUiHandler,
-                true /* startAtFrontOfQueue */) {
+        mActivityLaunchAnimationRunner = new WrappedAnimationRunnerImpl() {
+            @Override
+            public Handler getHandler() {
+                return mUiHandler;
+            }
 
             @Override
             public void onCreateAnimation(RemoteAnimationTargetCompat[] appTargets,
@@ -182,8 +191,10 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
                 result.setAnimation(anim, RecentsActivity.this);
             }
         };
+        final LauncherAnimationRunner wrapper = new WrappedLauncherAnimationRunner<>(
+                mActivityLaunchAnimationRunner, true /* startAtFrontOfQueue */);
         return ActivityOptionsCompat.makeRemoteAnimation(new RemoteAnimationAdapterCompat(
-                runner, RECENTS_LAUNCH_DURATION,
+                wrapper, RECENTS_LAUNCH_DURATION,
                 RECENTS_LAUNCH_DURATION - STATUS_BAR_TRANSITION_DURATION
                         - STATUS_BAR_TRANSITION_PRE_DELAY));
     }
@@ -288,6 +299,7 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
     protected void onDestroy() {
         super.onDestroy();
         ACTIVITY_TRACKER.onActivityDestroyed(this);
+        mActivityLaunchAnimationRunner = null;
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java b/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java
index 04308c80cb..19c6588877 100644
--- a/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java
+++ b/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java
@@ -21,6 +21,8 @@ import android.content.Context;
 import android.os.Handler;
 
 import com.android.launcher3.LauncherAnimationRunner;
+import com.android.launcher3.LauncherAnimationRunner.AnimationResult;
+import com.android.launcher3.WrappedAnimationRunnerImpl;
 import com.android.launcher3.WrappedLauncherAnimationRunner;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
 import com.android.systemui.shared.system.RemoteAnimationAdapterCompat;
@@ -28,14 +30,17 @@ import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
 public abstract class RemoteAnimationProvider {
 
-    LauncherAnimationRunner mAnimationRunner;
+    WrappedAnimationRunnerImpl mAnimationRunner;
 
     public abstract AnimatorSet createWindowAnimation(RemoteAnimationTargetCompat[] appTargets,
             RemoteAnimationTargetCompat[] wallpaperTargets);
 
     ActivityOptions toActivityOptions(Handler handler, long duration, Context context) {
-        mAnimationRunner = new LauncherAnimationRunner(handler,
-                false /* startAtFrontOfQueue */) {
+        mAnimationRunner = new WrappedAnimationRunnerImpl() {
+            @Override
+            public Handler getHandler() {
+                return handler;
+            }
 
             @Override
             public void onCreateAnimation(RemoteAnimationTargetCompat[] appTargets,
@@ -45,7 +50,6 @@ public abstract class RemoteAnimationProvider {
         };
         final LauncherAnimationRunner wrapper = new WrappedLauncherAnimationRunner(
                 mAnimationRunner, false /* startAtFrontOfQueue */);
-
         return ActivityOptionsCompat.makeRemoteAnimation(
                 new RemoteAnimationAdapterCompat(wrapper, duration, 0));
     }
-- 
GitLab


From f2711396822430800e9f7f110fa4b26902088b8c Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Mon, 28 Sep 2020 01:53:31 -0700
Subject: [PATCH 0200/1664] Thumbnail/Suggest view type support remote action

Bug: 169330678


Change-Id: I629d3e6b1622bf71e0174eb2489e976ef98875ad
---
 res/layout/search_result_suggest.xml          |  38 +++++
 .../launcher3/allapps/AllAppsGridAdapter.java |   9 +-
 .../views/SearchResultSuggestRow.java         | 131 ++++++++++++++++++
 .../views/ThumbnailSearchResultView.java      |  53 +++++--
 .../systemui/plugins/shared/SearchTarget.java |  10 +-
 5 files changed, 224 insertions(+), 17 deletions(-)
 create mode 100644 res/layout/search_result_suggest.xml
 create mode 100644 src/com/android/launcher3/views/SearchResultSuggestRow.java

diff --git a/res/layout/search_result_suggest.xml b/res/layout/search_result_suggest.xml
new file mode 100644
index 0000000000..c5d96f03ea
--- /dev/null
+++ b/res/layout/search_result_suggest.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.launcher3.views.SearchResultSuggestRow xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/TextHeadline"
+    android:id="@+id/section_title"
+    android:background="?android:attr/selectableItemBackground"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:gravity="center_vertical"
+    android:padding="4dp"
+    android:minHeight="48dp"
+    android:textColor="?android:attr/textColorPrimary"
+    android:textSize="14sp">
+
+    <TextView
+        android:id="@+id/title"
+        style="@style/TextTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingStart="8dp"
+        android:layout_marginBottom="4dp"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="14sp" />
+
+</com.android.launcher3.views.SearchResultSuggestRow>
\ No newline at end of file
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index 81d94ba9e5..8bc8e53af3 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -98,6 +98,8 @@ public class AllAppsGridAdapter extends
 
     public static final int VIEW_TYPE_SEARCH_THUMBNAIL = 1 << 12;
 
+    public static final int VIEW_TYPE_SEARCH_SUGGEST = 1 << 13;
+
     // Common view type masks
     public static final int VIEW_TYPE_MASK_DIVIDER = VIEW_TYPE_ALL_APPS_DIVIDER;
     public static final int VIEW_TYPE_MASK_ICON = VIEW_TYPE_ICON;
@@ -189,7 +191,8 @@ public class AllAppsGridAdapter extends
                     || viewType == VIEW_TYPE_SEARCH_ROW
                     || viewType == VIEW_TYPE_SEARCH_PEOPLE
                     || viewType == VIEW_TYPE_SEARCH_THUMBNAIL
-                    || viewType == VIEW_TYPE_SEARCH_ICON_ROW;
+                    || viewType == VIEW_TYPE_SEARCH_ICON_ROW
+                    || viewType == VIEW_TYPE_SEARCH_SUGGEST;
         }
     }
 
@@ -467,6 +470,9 @@ public class AllAppsGridAdapter extends
             case VIEW_TYPE_SEARCH_THUMBNAIL:
                 return new ViewHolder(mLayoutInflater.inflate(
                         R.layout.search_result_thumbnail, parent, false));
+            case VIEW_TYPE_SEARCH_SUGGEST:
+                return new ViewHolder(mLayoutInflater.inflate(
+                        R.layout.search_result_suggest, parent, false));
             default:
                 throw new RuntimeException("Unexpected view type");
         }
@@ -554,6 +560,7 @@ public class AllAppsGridAdapter extends
             case VIEW_TYPE_SEARCH_ICON_ROW:
             case VIEW_TYPE_SEARCH_PEOPLE:
             case VIEW_TYPE_SEARCH_THUMBNAIL:
+            case VIEW_TYPE_SEARCH_SUGGEST:
                 AdapterItemWithPayload item =
                         (AdapterItemWithPayload) mApps.getAdapterItems().get(position);
                 PayloadResultHandler payloadResultView = (PayloadResultHandler) holder.itemView;
diff --git a/src/com/android/launcher3/views/SearchResultSuggestRow.java b/src/com/android/launcher3/views/SearchResultSuggestRow.java
new file mode 100644
index 0000000000..b5abbcc724
--- /dev/null
+++ b/src/com/android/launcher3/views/SearchResultSuggestRow.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.views;
+
+import static com.android.systemui.plugins.shared.SearchTarget.ItemType.SUGGEST;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
+import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.RemoteActionItemInfo;
+import com.android.launcher3.touch.ItemClickHandler;
+import com.android.systemui.plugins.AllAppsSearchPlugin;
+import com.android.systemui.plugins.shared.SearchTarget;
+import com.android.systemui.plugins.shared.SearchTargetEvent;
+
+/**
+ * A view representing a fallback search suggestion row.
+ */
+public class SearchResultSuggestRow extends LinearLayout implements
+        View.OnClickListener, AllAppsSearchBarController.PayloadResultHandler<SearchTarget> {
+
+    private final Object[] mTargetInfo = createTargetInfo();
+    private AllAppsSearchPlugin mPlugin;
+    private AdapterItemWithPayload<SearchTarget> mAdapterItem;
+    private TextView mTitle;
+
+
+    public SearchResultSuggestRow(@NonNull Context context) {
+        super(context);
+    }
+
+    public SearchResultSuggestRow(@NonNull Context context,
+            @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public SearchResultSuggestRow(@NonNull Context context, @Nullable AttributeSet attrs,
+            int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mTitle = findViewById(R.id.title);
+        setOnClickListener(this);
+    }
+    @Override
+    public void applyAdapterInfo(AdapterItemWithPayload<SearchTarget> adapterItemWithPayload) {
+        mAdapterItem = adapterItemWithPayload;
+        SearchTarget payload = adapterItemWithPayload.getPayload();
+        mPlugin = adapterItemWithPayload.getPlugin();
+
+        if (payload.mRemoteAction != null) {
+            RemoteActionItemInfo itemInfo = new RemoteActionItemInfo(payload.mRemoteAction,
+                    payload.bundle.getString(SearchTarget.REMOTE_ACTION_TOKEN),
+                    payload.bundle.getBoolean(SearchTarget.REMOTE_ACTION_SHOULD_START));
+            setTag(itemInfo);
+        }
+        showIfAvailable(mTitle, payload.mRemoteAction.getTitle().toString());
+        setOnClickListener(v -> handleSelection(SearchTargetEvent.SELECT));
+        adapterItemWithPayload.setSelectionHandler(this::handleSelection);
+    }
+
+    @Override
+    public Object[] getTargetInfo() {
+        return mTargetInfo;
+    }
+
+    private void handleSelection(int eventType) {
+        ItemInfo itemInfo = (ItemInfo) getTag();
+        Launcher launcher = Launcher.getLauncher(getContext());
+        if (itemInfo instanceof  RemoteActionItemInfo) return;
+
+        RemoteActionItemInfo remoteItemInfo = (RemoteActionItemInfo) itemInfo;
+        ItemClickHandler.onClickRemoteAction(launcher, remoteItemInfo);
+        SearchTargetEvent searchTargetEvent = getSearchTargetEvent(SUGGEST, eventType);
+        searchTargetEvent.bundle = new Bundle();
+        searchTargetEvent.remoteAction = remoteItemInfo.getRemoteAction();
+        searchTargetEvent.bundle.putBoolean(SearchTarget.REMOTE_ACTION_SHOULD_START,
+                remoteItemInfo.shouldStartInLauncher());
+        searchTargetEvent.bundle.putString(SearchTarget.REMOTE_ACTION_TOKEN,
+                remoteItemInfo.getToken());
+
+        if (mPlugin != null) {
+            mPlugin.notifySearchTargetEvent(searchTargetEvent);
+        }
+    }
+
+    @Override
+    public void onClick(View view) {
+        handleSelection(SearchTargetEvent.SELECT);
+    }
+
+    private void showIfAvailable(TextView view, @Nullable String string) {
+        System.out.println("Plugin suggest string:" + string);
+        if (TextUtils.isEmpty(string)) {
+            view.setVisibility(GONE);
+        } else {
+            System.out.println("Plugin suggest string:" + string);
+            view.setVisibility(VISIBLE);
+            view.setText(string);
+        }
+    }
+}
diff --git a/src/com/android/launcher3/views/ThumbnailSearchResultView.java b/src/com/android/launcher3/views/ThumbnailSearchResultView.java
index 1d58a063b9..bbc47739f3 100644
--- a/src/com/android/launcher3/views/ThumbnailSearchResultView.java
+++ b/src/com/android/launcher3/views/ThumbnailSearchResultView.java
@@ -18,8 +18,8 @@ package com.android.launcher3.views;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
-import android.os.Bundle;
 import android.util.AttributeSet;
 
 import androidx.core.graphics.drawable.RoundedBitmapDrawable;
@@ -28,6 +28,10 @@ import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
 import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.RemoteActionItemInfo;
+import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.launcher3.touch.ItemClickHandler;
 import com.android.launcher3.util.Themes;
 import com.android.systemui.plugins.AllAppsSearchPlugin;
 import com.android.systemui.plugins.shared.SearchTarget;
@@ -37,10 +41,9 @@ import com.android.systemui.plugins.shared.SearchTargetEvent;
  * A view representing a high confidence app search result that includes shortcuts
  */
 public class ThumbnailSearchResultView extends androidx.appcompat.widget.AppCompatImageView
-        implements AllAppsSearchBarController.PayloadResultHandler<Bundle> {
+        implements AllAppsSearchBarController.PayloadResultHandler<SearchTarget> {
 
     private final Object[] mTargetInfo = createTargetInfo();
-    Intent mIntent;
     AllAppsSearchPlugin mPlugin;
     int mPosition;
 
@@ -58,26 +61,48 @@ public class ThumbnailSearchResultView extends androidx.appcompat.widget.AppComp
 
     private void handleSelection(int eventType) {
         Launcher launcher = Launcher.getLauncher(getContext());
-        launcher.startActivitySafely(this, mIntent, null);
-
-        SearchTargetEvent event = getSearchTargetEvent(
-                SearchTarget.ItemType.SCREENSHOT, eventType);
+        ItemInfo itemInfo = (ItemInfo) getTag();
+        if (itemInfo instanceof RemoteActionItemInfo) {
+            RemoteActionItemInfo remoteItemInfo = (RemoteActionItemInfo) itemInfo;
+            ItemClickHandler.onClickRemoteAction(launcher, remoteItemInfo);
+        } else {
+            ItemClickHandler.onClickAppShortcut(this, (WorkspaceItemInfo) itemInfo, launcher);
+        }
         if (mPlugin != null) {
+            SearchTargetEvent event = getSearchTargetEvent(
+                    SearchTarget.ItemType.SCREENSHOT, eventType);
             mPlugin.notifySearchTargetEvent(event);
         }
     }
 
     @Override
-    public void applyAdapterInfo(AdapterItemWithPayload<Bundle> adapterItem) {
+    public void applyAdapterInfo(AdapterItemWithPayload<SearchTarget> adapterItem) {
+        Launcher launcher = Launcher.getLauncher(getContext());
         mPosition = adapterItem.position;
-        RoundedBitmapDrawable drawable = RoundedBitmapDrawableFactory.create(null,
-                (Bitmap) adapterItem.getPayload().getParcelable("bitmap"));
+
+        SearchTarget target = adapterItem.getPayload();
+        Bitmap bitmap;
+        if (target.mRemoteAction != null) {
+            RemoteActionItemInfo itemInfo = new RemoteActionItemInfo(target.mRemoteAction,
+                    target.bundle.getString(SearchTarget.REMOTE_ACTION_TOKEN),
+                    target.bundle.getBoolean(SearchTarget.REMOTE_ACTION_SHOULD_START));
+            ItemClickHandler.onClickRemoteAction(launcher, itemInfo);
+            bitmap = ((BitmapDrawable) target.mRemoteAction.getIcon()
+                    .loadDrawable(getContext())).getBitmap();
+            setTag(itemInfo);
+        } else {
+            bitmap = (Bitmap) target.bundle.getParcelable("bitmap");
+            WorkspaceItemInfo itemInfo = new WorkspaceItemInfo();
+            itemInfo.intent = new Intent(Intent.ACTION_VIEW)
+                    .setData(Uri.parse(target.bundle.getString("uri")))
+                    .setType("image/*")
+                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            setTag(itemInfo);
+        }
+        RoundedBitmapDrawable drawable = RoundedBitmapDrawableFactory.create(null, bitmap);
         drawable.setCornerRadius(Themes.getDialogCornerRadius(getContext()));
         setImageDrawable(drawable);
-        mIntent = new Intent(Intent.ACTION_VIEW)
-                .setData(Uri.parse(adapterItem.getPayload().getString("uri")))
-                .setType("image/*")
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        setOnClickListener(v -> handleSelection(SearchTargetEvent.SELECT));
         mPlugin = adapterItem.getPlugin();
         adapterItem.setSelectionHandler(this::handleSelection);
     }
diff --git a/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java b/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
index 9d9ccbaf6e..3780b20926 100644
--- a/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
+++ b/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
@@ -80,7 +80,12 @@ public class SearchTarget implements Comparable<SearchTarget> {
          * N number of 1x1 ratio thumbnail is rendered.
          * (current N = 3)
          */
-        THUMBNAIL(8);
+        THUMBNAIL(8),
+
+        /**
+         * Fallback search icon and relevant text is rendered.
+         */
+        SUGGEST(9);
 
         private final int mId;
 
@@ -102,7 +107,8 @@ public class SearchTarget implements Comparable<SearchTarget> {
         SHORTCUT(5, "Shortcuts", ViewType.SHORTCUT),
         PEOPLE(6, "People", ViewType.PEOPLE),
         SCREENSHOT(7, "Screenshots", ViewType.THUMBNAIL),
-        REMOTE_ACTION(8, "Remote Actions", ViewType.SHORTCUT);
+        REMOTE_ACTION(8, "Remote Actions", ViewType.SHORTCUT),
+        SUGGEST(9, "Fallback Search", ViewType.SUGGEST);
 
         private final int mId;
 
-- 
GitLab


From 63623967b83edad56db58173ebb6687c685b9177 Mon Sep 17 00:00:00 2001
From: Riddle Hsu <riddlehsu@google.com>
Date: Wed, 30 Sep 2020 00:32:04 +0800
Subject: [PATCH 0201/1664] Add latency metrics for recents gesture

Pass the touch down time to RecentsAnimation#startRecentsActivity.

Bug: 169221287
Test: Enable statsd log: "adb shell cmd stats print-logs"
      Touch gesture navigation bar.
      adb logcat | grep statsd | grep "(48)"
      The line may contain 0x100000->4[I] 0x110000->20[I]
      that means 4=by recents and 20=latency 20ms.
Change-Id: I81ee804895b7712f4d925736f5b4694c11a12cbe
---
 quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 5 +++++
 .../com/android/quickstep/RecentsAnimationCallbacks.java   | 7 +++++++
 .../src/com/android/quickstep/TaskAnimationManager.java    | 5 +++--
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 26ad3778a7..ef7a8f6477 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1419,6 +1419,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         mGestureEndCallback = gestureEndCallback;
     }
 
+    @Override
+    public long getStartTouchTime() {
+        return mTouchTimeMs;
+    }
+
     protected void linkRecentsViewScroll() {
         SurfaceTransactionApplier.create(mRecentsView, applier -> {
             mTransformParams.setSyncTransactionApplier(applier);
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java b/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java
index a21c7140de..f319b943c6 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java
@@ -160,5 +160,12 @@ public class RecentsAnimationCallbacks implements
          * Callback made when a task started from the recents is ready for an app transition.
          */
         default void onTaskAppeared(RemoteAnimationTargetCompat appearedTaskTarget) {}
+
+        /**
+         * The time in milliseconds of the touch event that starts the recents animation.
+         */
+        default long getStartTouchTime() {
+            return 0;
+        }
     }
 }
diff --git a/quickstep/src/com/android/quickstep/TaskAnimationManager.java b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
index cad51f4cc6..49f40cb5b5 100644
--- a/quickstep/src/com/android/quickstep/TaskAnimationManager.java
+++ b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
@@ -46,7 +46,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
     public void preloadRecentsAnimation(Intent intent) {
         // Pass null animation handler to indicate this start is for preloading
         UI_HELPER_EXECUTOR.execute(() -> ActivityManagerWrapper.getInstance()
-                .startRecentsActivity(intent, null, null, null, null));
+                .startRecentsActivity(intent, 0, null, null, null));
     }
 
     /**
@@ -116,10 +116,11 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
                 }
             }
         });
+        final long eventTime = listener.getStartTouchTime();
         mCallbacks.addListener(gestureState);
         mCallbacks.addListener(listener);
         UI_HELPER_EXECUTOR.execute(() -> ActivityManagerWrapper.getInstance()
-                .startRecentsActivity(intent, null, mCallbacks, null, null));
+                .startRecentsActivity(intent, eventTime, mCallbacks, null, null));
         gestureState.setState(STATE_RECENTS_ANIMATION_INITIALIZED);
         return mCallbacks;
     }
-- 
GitLab


From 7bdf3574a3bff06a377b4364877687bfa7619d06 Mon Sep 17 00:00:00 2001
From: Riddle Hsu <riddlehsu@google.com>
Date: Tue, 22 Sep 2020 21:52:40 +0800
Subject: [PATCH 0202/1664] Add app start source info of apps launched from
 launcher

Bug: 166614700
Test: Enable statsd log: "adb shell cmd stats print-logs"
      adb logcat | grep statsd | grep "(48)"
      The line may contain 0x100000->1[I] 0x110000->10[I]
      that means 1=from launcher and 10=latency 10ms.
Change-Id: Iddaff7066b66e241ba58ec87129ddbe2c531dc7e
---
 .../com/android/launcher3/BaseQuickstepLauncher.java | 12 ++++++++++++
 src/com/android/launcher3/Launcher.java              |  7 ++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 68111d2632..bc3b4ab0ef 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -24,10 +24,12 @@ import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SY
 
 import android.animation.AnimatorSet;
 import android.animation.ValueAnimator;
+import android.app.ActivityOptions;
 import android.content.Intent;
 import android.content.IntentSender;
 import android.os.Bundle;
 import android.os.CancellationSignal;
+import android.view.View;
 
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.WellbeingModel;
@@ -49,6 +51,7 @@ import com.android.quickstep.util.RemoteFadeOutAnimationListener;
 import com.android.quickstep.views.OverviewActionsView;
 import com.android.quickstep.views.RecentsView;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
+import com.android.systemui.shared.system.ActivityOptionsCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
 import java.util.stream.Stream;
@@ -304,6 +307,15 @@ public abstract class BaseQuickstepLauncher extends Launcher
                 Stream.of(WellbeingModel.SHORTCUT_FACTORY));
     }
 
+    @Override
+    public ActivityOptions getActivityLaunchOptions(View v) {
+        ActivityOptions activityOptions = super.getActivityLaunchOptions(v);
+        if (activityOptions != null && mLastTouchUpTime > 0) {
+            ActivityOptionsCompat.setLauncherSourceInfo(activityOptions, mLastTouchUpTime);
+        }
+        return activityOptions;
+    }
+
     public void setHintUserWillBeActive() {
         addActivityFlags(ACTIVITY_STATE_USER_WILL_BE_ACTIVE);
     }
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 90566f3ce8..4c5224b647 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -76,6 +76,7 @@ import android.os.CancellationSignal;
 import android.os.Parcelable;
 import android.os.Process;
 import android.os.StrictMode;
+import android.os.SystemClock;
 import android.text.TextUtils;
 import android.text.method.TextKeyListener;
 import android.util.Log;
@@ -349,7 +350,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     private boolean mDeferOverlayCallbacks;
     private final Runnable mDeferredOverlayCallbacks = this::checkIfOverlayStillDeferred;
 
-    private long mLastTouchUpTime = -1;
+    protected long mLastTouchUpTime = -1;
     private boolean mTouchInProgress;
 
     private SafeCloseable mUserChangedCallbackCloseable;
@@ -1824,7 +1825,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
                 mTouchInProgress = true;
                 break;
             case MotionEvent.ACTION_UP:
-                mLastTouchUpTime = System.currentTimeMillis();
+                mLastTouchUpTime = ev.getEventTime();
                 // Follow through
             case MotionEvent.ACTION_CANCEL:
                 mTouchInProgress = false;
@@ -2457,7 +2458,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         if (mDragController.isDragging()) {
             return false;
         } else {
-            return (System.currentTimeMillis() - mLastTouchUpTime)
+            return (SystemClock.uptimeMillis() - mLastTouchUpTime)
                     > (NEW_APPS_ANIMATION_INACTIVE_TIMEOUT_SECONDS * 1000);
         }
     }
-- 
GitLab


From de9a5e109d9636bd7e0f0e390658d33214c873d2 Mon Sep 17 00:00:00 2001
From: Hilary Huo <hhuo@google.com>
Date: Fri, 25 Sep 2020 11:12:51 -0700
Subject: [PATCH 0203/1664] [pixel-search] Change Nasa actions title name

Change-Id: I3e44513d797d867b97664ff2ee46a8e33d020e99
---
 src/com/android/launcher3/views/SearchResultIconRow.java     | 3 ++-
 .../com/android/systemui/plugins/shared/SearchTarget.java    | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/views/SearchResultIconRow.java b/src/com/android/launcher3/views/SearchResultIconRow.java
index 57c85cf42e..313ae5e611 100644
--- a/src/com/android/launcher3/views/SearchResultIconRow.java
+++ b/src/com/android/launcher3/views/SearchResultIconRow.java
@@ -42,6 +42,7 @@ import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.touch.ItemClickHandler;
 import com.android.systemui.plugins.AllAppsSearchPlugin;
 import com.android.systemui.plugins.shared.SearchTarget;
+import com.android.systemui.plugins.shared.SearchTarget.ItemType;
 import com.android.systemui.plugins.shared.SearchTargetEvent;
 
 /**
@@ -138,7 +139,7 @@ public class SearchResultIconRow extends DoubleShadowBubbleTextView implements
         } else {
             RemoteActionItemInfo remoteItemInfo = (RemoteActionItemInfo) itemInfo;
             ItemClickHandler.onClickRemoteAction(launcher, remoteItemInfo);
-            searchTargetEvent = getSearchTargetEvent(SearchTarget.ItemType.REMOTE_ACTION,
+            searchTargetEvent = getSearchTargetEvent(ItemType.ACTION,
                     eventType);
             searchTargetEvent.bundle = new Bundle();
             searchTargetEvent.remoteAction = remoteItemInfo.getRemoteAction();
diff --git a/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java b/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
index 3780b20926..3f0dc39cc1 100644
--- a/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
+++ b/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
@@ -107,8 +107,9 @@ public class SearchTarget implements Comparable<SearchTarget> {
         SHORTCUT(5, "Shortcuts", ViewType.SHORTCUT),
         PEOPLE(6, "People", ViewType.PEOPLE),
         SCREENSHOT(7, "Screenshots", ViewType.THUMBNAIL),
-        REMOTE_ACTION(8, "Remote Actions", ViewType.SHORTCUT),
-        SUGGEST(9, "Fallback Search", ViewType.SUGGEST);
+        ACTION(8, "Actions", ViewType.SHORTCUT),
+        SUGGEST(9, "Fallback Search", ViewType.SUGGEST),
+        CHROME_TAB(10, "Chrome Tab", ViewType.SHORTCUT);
 
         private final int mId;
 
-- 
GitLab


From aff3e5263e19736961886e8295aa1529dae5478d Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 3 Sep 2020 17:01:56 -0700
Subject: [PATCH 0204/1664] Disable batching until the initial gesture is
 detected

- Just doing other activity since that's the most common case for now

Bug: 167732711
Change-Id: Icc910dbaf057893710c5f0bc6705e57cf8e3ee22
---
 .../android/quickstep/TouchInteractionService.java   |  4 +++-
 .../inputconsumers/OtherActivityInputConsumer.java   | 12 ++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 4b5adcb6c6..7bf8fbafac 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -683,7 +683,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
         final boolean disableHorizontalSwipe = mDeviceState.isInExclusionRegion(event);
         return new OtherActivityInputConsumer(this, mDeviceState, mTaskAnimationManager,
                 gestureState, shouldDefer, this::onConsumerInactive,
-                mInputMonitorCompat, disableHorizontalSwipe, factory);
+                mInputMonitorCompat, mInputEventReceiver, disableHorizontalSwipe, factory);
     }
 
     private InputConsumer createDeviceLockedInputConsumer(GestureState gestureState) {
@@ -732,6 +732,8 @@ public class TouchInteractionService extends Service implements PluginListener<O
     private void reset() {
         mConsumer = mUncheckedConsumer = mResetGestureInputConsumer;
         mGestureState = DEFAULT_STATE;
+        // By default, use batching of the input events
+        mInputEventReceiver.setBatchingEnabled(true);
     }
 
     private void preloadOverview(boolean fromInit) {
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
index b1a1133885..35dbee9490 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
@@ -67,6 +67,7 @@ import com.android.quickstep.util.CachedEventDispatcher;
 import com.android.quickstep.util.MotionPauseDetector;
 import com.android.quickstep.util.NavBarPosition;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
+import com.android.systemui.shared.system.InputChannelCompat.InputEventReceiver;
 import com.android.systemui.shared.system.InputMonitorCompat;
 
 import java.util.function.Consumer;
@@ -92,6 +93,7 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
     private RecentsAnimationCallbacks mActiveCallbacks;
     private final CachedEventDispatcher mRecentsViewDispatcher = new CachedEventDispatcher();
     private final InputMonitorCompat mInputMonitorCompat;
+    private final InputEventReceiver mInputEventReceiver;
     private final BaseActivityInterface mActivityInterface;
 
     private final AbsSwipeUpHandler.Factory mHandlerFactory;
@@ -135,8 +137,8 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
     public OtherActivityInputConsumer(Context base, RecentsAnimationDeviceState deviceState,
             TaskAnimationManager taskAnimationManager, GestureState gestureState,
             boolean isDeferredDownTarget, Consumer<OtherActivityInputConsumer> onCompleteCallback,
-            InputMonitorCompat inputMonitorCompat, boolean disableHorizontalSwipe,
-            Factory handlerFactory) {
+            InputMonitorCompat inputMonitorCompat, InputEventReceiver inputEventReceiver,
+            boolean disableHorizontalSwipe, Factory handlerFactory) {
         super(base);
         mDeviceState = deviceState;
         mNavBarPosition = mDeviceState.getNavBarPosition();
@@ -154,6 +156,7 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
         mOnCompleteCallback = onCompleteCallback;
         mVelocityTracker = VelocityTracker.obtain();
         mInputMonitorCompat = inputMonitorCompat;
+        mInputEventReceiver = inputEventReceiver;
 
         boolean continuingPreviousGesture = mTaskAnimationManager.isRecentsAnimationRunning();
         mIsDeferredDownTarget = !continuingPreviousGesture && isDeferredDownTarget;
@@ -215,6 +218,9 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
 
         switch (ev.getActionMasked()) {
             case ACTION_DOWN: {
+                // Until we detect the gesture, handle events as we receive them
+                mInputEventReceiver.setBatchingEnabled(false);
+
                 Object traceToken = TraceHelper.INSTANCE.beginSection(DOWN_EVT,
                         FLAG_CHECK_FOR_RACE_CONDITIONS);
                 mActivePointerId = ev.getPointerId(0);
@@ -351,6 +357,8 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
         }
         TestLogging.recordEvent(TestProtocol.SEQUENCE_PILFER, "pilferPointers");
         mInputMonitorCompat.pilferPointers();
+        // Once we detect the gesture, we can enable batching to reduce further updates
+        mInputEventReceiver.setBatchingEnabled(true);
 
         mActivityInterface.closeOverlay();
         ActivityManagerWrapper.getInstance().closeSystemWindows(
-- 
GitLab


From 9fa2d8812aeec1033b6912f3f373080276a644ae Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Wed, 30 Sep 2020 10:57:04 -0700
Subject: [PATCH 0205/1664] Resolve race condition between @Before conditions

Bug: 159671700
Change-Id: I5c96c32c171b7b539ce0ea799cf45955c2bee670
---
 .../src/com/android/launcher3/ui/AbstractLauncherUiTest.java  | 2 ++
 tests/src/com/android/launcher3/ui/WorkTabTest.java           | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index 5e42d9b988..e118481570 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -279,6 +279,8 @@ public abstract class AbstractLauncherUiTest {
         if (userManager != null) {
             for (UserHandle userHandle : userManager.getUserProfiles()) {
                 if (!userHandle.isSystem()) {
+                    Log.d(TestProtocol.WORK_PROFILE_REMOVED,
+                            "removing user " + userHandle.getIdentifier());
                     mDevice.executeShellCommand("pm remove-user " + userHandle.getIdentifier());
                 }
             }
diff --git a/tests/src/com/android/launcher3/ui/WorkTabTest.java b/tests/src/com/android/launcher3/ui/WorkTabTest.java
index 488e763f94..8d594de926 100644
--- a/tests/src/com/android/launcher3/ui/WorkTabTest.java
+++ b/tests/src/com/android/launcher3/ui/WorkTabTest.java
@@ -55,7 +55,9 @@ public class WorkTabTest extends AbstractLauncherUiTest {
     private static final int WORK_PAGE = AllAppsContainerView.AdapterHolder.WORK;
 
     @Before
-    public void createWorkProfile() throws Exception {
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
         String output =
                 mDevice.executeShellCommand(
                         "pm create-user --profileOf 0 --managed TestProfile");
-- 
GitLab


From 5e315bc7a905be743ff7ad511ce941cd2e7bdf56 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Wed, 30 Sep 2020 12:02:50 -0700
Subject: [PATCH 0206/1664] Draw BubbleTextView drawable behind ClipIconView
 during app close animation.

The BubbleTextView drawable has built in shadows.

Prior to this, we waited for the FloatingIconView to finish
animating into place before fading in the BubbleTextView behind it.
We did this to prevent the shadow from blinking in.

Now that we've refactored FloatingIconView & ClipIconView,
we draw the BubbleTextView behind the ClipIconView so that the shadow is
revealed when the icon finishes clipping to its final shape and it
no longer has to be faded in.

Bug: 168608912
Change-Id: Ic0809f74ecbbec2f6e7caf7eca2fb560a8a02dec
---
 .../launcher3/views/FloatingIconView.java     | 88 ++++++-------------
 1 file changed, 28 insertions(+), 60 deletions(-)

diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java
index 52a82f8e93..d9a14e9e3f 100644
--- a/src/com/android/launcher3/views/FloatingIconView.java
+++ b/src/com/android/launcher3/views/FloatingIconView.java
@@ -15,7 +15,6 @@
  */
 package com.android.launcher3.views;
 
-import static com.android.launcher3.LauncherAnimUtils.DRAWABLE_ALPHA;
 import static com.android.launcher3.Utilities.getBadge;
 import static com.android.launcher3.Utilities.getFullDrawable;
 import static com.android.launcher3.config.FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM;
@@ -23,9 +22,6 @@ import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 import static com.android.launcher3.views.IconLabelDotView.setIconAndDotVisible;
 
 import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.Canvas;
@@ -74,7 +70,6 @@ public class FloatingIconView extends FrameLayout implements
     private static @Nullable IconLoadResult sIconLoadResult;
 
     public static final float SHAPE_PROGRESS_DURATION = 0.10f;
-    private static final int FADE_DURATION_MS = 200;
     private static final RectF sTmpRectF = new RectF();
     private static final Object[] sTmpObjArray = new Object[1];
 
@@ -89,6 +84,9 @@ public class FloatingIconView extends FrameLayout implements
 
     private IconLoadResult mIconLoadResult;
 
+    // Draw the drawable of the BubbleTextView behind ClipIconView to reveal the built in shadow.
+    private View mBtvDrawable;
+
     private ClipIconView mClipIconView;
     private @Nullable Drawable mBadge;
 
@@ -98,7 +96,6 @@ public class FloatingIconView extends FrameLayout implements
 
     private final Rect mFinalDrawableBounds = new Rect();
 
-    private AnimatorSet mFadeAnimatorSet;
     private ListenerView mListenerView;
     private Runnable mFastFinishRunnable;
 
@@ -116,6 +113,8 @@ public class FloatingIconView extends FrameLayout implements
         mIsRtl = Utilities.isRtl(getResources());
         mListenerView = new ListenerView(context, attrs);
         mClipIconView = new ClipIconView(context, attrs);
+        mBtvDrawable = new ImageView(context, attrs);
+        addView(mBtvDrawable);
         addView(mClipIconView);
         setWillNotDraw(false);
     }
@@ -176,6 +175,7 @@ public class FloatingIconView extends FrameLayout implements
         setLayoutParams(lp);
 
         mClipIconView.setLayoutParams(new FrameLayout.LayoutParams(lp.width, lp.height));
+        mBtvDrawable.setLayoutParams(new FrameLayout.LayoutParams(lp.width, lp.height));
     }
 
     private void updatePosition(RectF pos, InsettableFrameLayout.LayoutParams lp) {
@@ -292,6 +292,8 @@ public class FloatingIconView extends FrameLayout implements
         drawable = drawable == null ? null : drawable.getConstantState().newDrawable();
         int iconOffset = getOffsetForIconBounds(l, drawable, pos);
         synchronized (iconLoadResult) {
+            iconLoadResult.btvDrawable = btvIcon == null || drawable == btvIcon
+                    ? null : btvIcon.getConstantState().newDrawable();
             iconLoadResult.drawable = drawable;
             iconLoadResult.badge = badge;
             iconLoadResult.iconOffset = iconOffset;
@@ -311,7 +313,8 @@ public class FloatingIconView extends FrameLayout implements
      * @param iconOffset The amount of offset needed to match this view with the original view.
      */
     @UiThread
-    private void setIcon(@Nullable Drawable drawable, @Nullable Drawable badge, int iconOffset) {
+    private void setIcon(@Nullable Drawable drawable, @Nullable Drawable badge,
+            @Nullable Drawable btvIcon, int iconOffset) {
         final InsettableFrameLayout.LayoutParams lp =
                 (InsettableFrameLayout.LayoutParams) getLayoutParams();
         mBadge = badge;
@@ -342,6 +345,10 @@ public class FloatingIconView extends FrameLayout implements
                 mBadge.setBounds(0, 0, clipViewOgWidth, clipViewOgHeight);
             }
         }
+
+        if (!mIsOpening && btvIcon != null) {
+            mBtvDrawable.setBackground(btvIcon);
+        }
         invalidate();
     }
 
@@ -360,7 +367,7 @@ public class FloatingIconView extends FrameLayout implements
         synchronized (mIconLoadResult) {
             if (mIconLoadResult.isIconLoaded) {
                 setIcon(mIconLoadResult.drawable, mIconLoadResult.badge,
-                        mIconLoadResult.iconOffset);
+                        mIconLoadResult.btvDrawable, mIconLoadResult.iconOffset);
                 setIconAndDotVisible(originalView, false);
             } else {
                 mIconLoadResult.onIconLoaded = () -> {
@@ -369,7 +376,7 @@ public class FloatingIconView extends FrameLayout implements
                     }
 
                     setIcon(mIconLoadResult.drawable, mIconLoadResult.badge,
-                            mIconLoadResult.iconOffset);
+                            mIconLoadResult.btvDrawable, mIconLoadResult.iconOffset);
 
                     setVisibility(VISIBLE);
                     setIconAndDotVisible(originalView, false);
@@ -434,10 +441,6 @@ public class FloatingIconView extends FrameLayout implements
             mEndRunnable.run();
             mEndRunnable = null;
         }
-        if (mFadeAnimatorSet != null) {
-            mFadeAnimatorSet.end();
-            mFadeAnimatorSet = null;
-        }
     }
 
     @Override
@@ -546,8 +549,16 @@ public class FloatingIconView extends FrameLayout implements
                     setIconAndDotVisible(originalView, true);
                     view.finish(dragLayer);
                 } else {
-                    view.mFadeAnimatorSet = view.createFadeAnimation(originalView, dragLayer);
-                    view.mFadeAnimatorSet.start();
+                    originalView.setVisibility(VISIBLE);
+                    if (originalView instanceof IconLabelDotView) {
+                        setIconAndDotVisible(originalView, true);
+                    }
+                    if (originalView instanceof BubbleTextView) {
+                        BubbleTextView btv = (BubbleTextView) originalView;
+                        btv.setIconVisible(true);
+                        btv.setForceHideDot(true);
+                    }
+                    view.finish(dragLayer);
                 }
             } else {
                 view.finish(dragLayer);
@@ -564,47 +575,6 @@ public class FloatingIconView extends FrameLayout implements
         return view;
     }
 
-    private AnimatorSet createFadeAnimation(View originalView, DragLayer dragLayer) {
-        AnimatorSet fade = new AnimatorSet();
-        fade.setDuration(FADE_DURATION_MS);
-        fade.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationStart(Animator animation) {
-                originalView.setVisibility(VISIBLE);
-            }
-
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                finish(dragLayer);
-            }
-        });
-
-        if (originalView instanceof IconLabelDotView) {
-            fade.addListener(new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationEnd(Animator animation) {
-                    setIconAndDotVisible(originalView, true);
-                }
-            });
-        }
-
-        if (originalView instanceof BubbleTextView) {
-            BubbleTextView btv = (BubbleTextView) originalView;
-            fade.addListener(new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationStart(Animator animation) {
-                    btv.setIconVisible(true);
-                    btv.setForceHideDot(true);
-                }
-            });
-            fade.play(ObjectAnimator.ofInt(btv.getIcon(), DRAWABLE_ALPHA, 0, 255));
-        } else if (!(originalView instanceof FolderIcon)) {
-            fade.play(ObjectAnimator.ofFloat(originalView, ALPHA, 0f, 1f));
-        }
-
-        return fade;
-    }
-
     private void finish(DragLayer dragLayer) {
         ((ViewGroup) dragLayer.getParent()).removeView(this);
         dragLayer.removeView(mListenerView);
@@ -628,11 +598,7 @@ public class FloatingIconView extends FrameLayout implements
         mLoadIconSignal = null;
         mEndRunnable = null;
         mFinalDrawableBounds.setEmpty();
-        if (mFadeAnimatorSet != null) {
-            mFadeAnimatorSet.cancel();
-        }
         mPositionOut = null;
-        mFadeAnimatorSet = null;
         mListenerView.setListener(null);
         mOriginalIcon = null;
         mOnTargetChangeRunnable = null;
@@ -640,11 +606,13 @@ public class FloatingIconView extends FrameLayout implements
         sTmpObjArray[0] = null;
         mIconLoadResult = null;
         mClipIconView.recycle();
+        mBtvDrawable.setBackground(null);
         mFastFinishRunnable = null;
     }
 
     private static class IconLoadResult {
         final ItemInfo itemInfo;
+        Drawable btvDrawable;
         Drawable drawable;
         Drawable badge;
         int iconOffset;
-- 
GitLab


From 2ec0ade64a4b4228caa8881a55d3cb02e434e3a1 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Thu, 24 Sep 2020 13:27:30 -0700
Subject: [PATCH 0207/1664] Add sandbox mode to gesture tutorial settings.

Test: manual

Added a Sandbox mode tutorial fragment and controller. This fragment allows the user to try all the gesture commands and receive feedback, whether the gesture was successful or not.

Preview: https://drive.google.com/file/d/1Qmn71ZHMOrv2XjUngb6S4W5jOaBIvF1_/view?usp=sharing

Change-Id: I7d28ce25daa38fa6d05b18d43d02b77c1fc8a264
---
 quickstep/res/values/strings.xml              |  15 +++
 .../SandboxModeTutorialController.java        | 102 ++++++++++++++++++
 .../SandboxModeTutorialFragment.java          |  43 ++++++++
 .../interaction/TutorialController.java       |   6 +-
 .../interaction/TutorialFragment.java         |   2 +
 .../settings/DeveloperOptionsFragment.java    |   9 ++
 6 files changed, 175 insertions(+), 2 deletions(-)
 create mode 100644 quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java
 create mode 100644 quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialFragment.java

diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml
index 769d29838a..b913ba4480 100644
--- a/quickstep/res/values/strings.xml
+++ b/quickstep/res/values/strings.xml
@@ -149,6 +149,21 @@
     <!-- Feedback shown during interactive parts of Assistant gesture tutorial when the gesture doesn't go far enough. [CHAR LIMIT=100] -->
     <string name="assistant_gesture_feedback_swipe_not_long_enough" translatable="false">Try swiping further</string>
 
+    <!-- Title shown in sandbox mode part of gesture tutorial. [CHAR LIMIT=30] -->
+    <string name="sandbox_mode_title" translatable="false">Sandbox Mode</string>
+    <!-- Subtitle shown in sandbox mode part of gesture tutorial. [CHAR LIMIT=60] -->
+    <string name="sandbox_mode_subtitle" translatable="false">Try any navigation gesture</string>
+    <!-- Feedback shown in sandbox mode when the back gesture is successfully issued. [CHAR LIMIT=60] -->
+    <string name="sandbox_mode_back_gesture_feedback_successful" translatable="false">Back gesture successful</string>
+    <!-- Feedback shown in sandbox mode when the assistant gesture is a successfully issued. [CHAR LIMIT=60] -->
+    <string name="sandbox_mode_assistant_gesture_feedback_successful" translatable="false">Assistant gesture successful</string>
+    <!-- Feedback shown in sandbox mode when the home gesture is a successfully issued. [CHAR LIMIT=60] -->
+    <string name="sandbox_mode_home_gesture_feedback_successful" translatable="false">Home gesture successful</string>
+    <!-- Feedback shown in sandbox mode when the overview gesture is a successfully issued. [CHAR LIMIT=60] -->
+    <string name="sandbox_mode_overview_gesture_feedback_successful" translatable="false">Overview gesture successful</string>
+    <!-- Feedback shown in sandbox mode when the back gesture swipe is too far from the edge. [CHAR LIMIT=60] -->
+    <string name="sandbox_mode_back_gesture_feedback_swipe_too_far_from_edge" translatable="false">Make sure you swipe from the left/right edge of the screen</string>
+
     <!-- Title shown on the confirmation screen after successful gesture. [CHAR LIMIT=30] -->
     <string name="gesture_tutorial_confirm_title" translatable="false">All set</string>
     <!-- Button text shown on a button on the confirm screen to leave the tutorial. [CHAR LIMIT=14] -->
diff --git a/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java b/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java
new file mode 100644
index 0000000000..d54efc56e5
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.quickstep.interaction;
+
+import android.graphics.PointF;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.R;
+import com.android.quickstep.interaction.EdgeBackGestureHandler.BackGestureResult;
+import com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult;
+
+/** A {@link TutorialController} for the Sandbox Mode. */
+public class SandboxModeTutorialController extends SwipeUpGestureTutorialController {
+
+    SandboxModeTutorialController(SandboxModeTutorialFragment fragment, TutorialType tutorialType) {
+        super(fragment, tutorialType);
+    }
+
+    @Nullable
+    @Override
+    Integer getTitleStringId() {
+        return R.string.sandbox_mode_title;
+    }
+
+    @Nullable
+    @Override
+    Integer getSubtitleStringId() {
+        return R.string.sandbox_mode_subtitle;
+    }
+
+    @Nullable
+    @Override
+    Integer getActionButtonStringId() {
+        return R.string.gesture_tutorial_action_button_label_done;
+    }
+
+    @Override
+    void onActionButtonClicked(View button) {
+        mTutorialFragment.closeTutorial();
+    }
+
+    @Override
+    public void onBackGestureAttempted(BackGestureResult result) {
+        switch (result) {
+            case BACK_COMPLETED_FROM_LEFT:
+            case BACK_COMPLETED_FROM_RIGHT:
+                showRippleEffect(null);
+                showFeedback(R.string.sandbox_mode_back_gesture_feedback_successful);
+                break;
+            case BACK_CANCELLED_FROM_RIGHT:
+                showFeedback(R.string.back_gesture_feedback_cancelled_right_edge);
+                break;
+            case BACK_CANCELLED_FROM_LEFT:
+                showFeedback(R.string.back_gesture_feedback_cancelled_left_edge);
+                break;
+            case BACK_NOT_STARTED_TOO_FAR_FROM_EDGE:
+                showFeedback(R.string.sandbox_mode_back_gesture_feedback_swipe_too_far_from_edge);
+                break;
+        }
+    }
+
+    @Override
+    public void onNavBarGestureAttempted(NavBarGestureResult result, PointF finalVelocity) {
+        switch (result) {
+            case ASSISTANT_COMPLETED:
+                showRippleEffect(null);
+                showFeedback(R.string.sandbox_mode_assistant_gesture_feedback_successful);
+                break;
+            case HOME_GESTURE_COMPLETED:
+                animateFakeTaskViewHome(finalVelocity, () -> {
+                    showFeedback(R.string.sandbox_mode_home_gesture_feedback_successful);
+                });
+                break;
+            case OVERVIEW_GESTURE_COMPLETED:
+                fadeOutFakeTaskView(true, () -> {
+                    showFeedback(R.string.sandbox_mode_overview_gesture_feedback_successful);
+                });
+                break;
+            case HOME_OR_OVERVIEW_NOT_STARTED_WRONG_SWIPE_DIRECTION:
+            case HOME_OR_OVERVIEW_CANCELLED:
+            case HOME_NOT_STARTED_TOO_FAR_FROM_EDGE:
+            case OVERVIEW_NOT_STARTED_TOO_FAR_FROM_EDGE:
+                showFeedback(R.string.home_gesture_feedback_swipe_too_far_from_edge);
+                break;
+        }
+    }
+}
diff --git a/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialFragment.java
new file mode 100644
index 0000000000..955a2f7d2e
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialFragment.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.quickstep.interaction;
+
+import android.view.MotionEvent;
+import android.view.View;
+
+import com.android.quickstep.interaction.TutorialController.TutorialType;
+
+/** Shows the general navigation gesture sandbox environment. */
+public class SandboxModeTutorialFragment extends TutorialFragment {
+
+    @Override
+    TutorialController createController(TutorialType type) {
+        return new SandboxModeTutorialController(this, type);
+    }
+
+    @Override
+    Class<? extends TutorialController> getControllerClass() {
+        return SandboxModeTutorialController.class;
+    }
+
+    @Override
+    public boolean onTouch(View view, MotionEvent motionEvent) {
+        if (motionEvent.getAction() == MotionEvent.ACTION_DOWN && mTutorialController != null) {
+            mTutorialController.setRippleHotspot(motionEvent.getX(), motionEvent.getY());
+        }
+        return super.onTouch(view, motionEvent);
+    }
+}
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
index d0a12679c0..2198ade105 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
@@ -213,7 +213,8 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         return mTutorialType == TutorialType.BACK_NAVIGATION_COMPLETE
                 || mTutorialType == TutorialType.HOME_NAVIGATION_COMPLETE
                 || mTutorialType == TutorialType.OVERVIEW_NAVIGATION_COMPLETE
-                || mTutorialType == TutorialType.ASSISTANT_COMPLETE;
+                || mTutorialType == TutorialType.ASSISTANT_COMPLETE
+                || mTutorialType == TutorialType.SANDBOX_MODE;
     }
 
     /** Denotes the type of the tutorial. */
@@ -226,6 +227,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         OVERVIEW_NAVIGATION,
         OVERVIEW_NAVIGATION_COMPLETE,
         ASSISTANT,
-        ASSISTANT_COMPLETE
+        ASSISTANT_COMPLETE,
+        SANDBOX_MODE
     }
 }
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
index 559ba354d2..f297d5a835 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
@@ -76,6 +76,8 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
             case ASSISTANT:
             case ASSISTANT_COMPLETE:
                 return new AssistantGestureTutorialFragment();
+            case SANDBOX_MODE:
+                return new SandboxModeTutorialFragment();
             default:
                 Log.e(LOG_TAG, "Failed to find an appropriate fragment for " + tutorialType.name());
         }
diff --git a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
index 4baecb7c56..f4b059d8d8 100644
--- a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
+++ b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
@@ -306,6 +306,15 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
             return true;
         });
         sandboxCategory.addPreference(launchAssistantTutorialPreference);
+        Preference launchSandboxModeTutorialPreference = new Preference(context);
+        launchSandboxModeTutorialPreference.setKey("launchSandboxMode");
+        launchSandboxModeTutorialPreference.setTitle("Launch Sandbox Mode");
+        launchSandboxModeTutorialPreference.setSummary("Practice navigation gestures");
+        launchSandboxModeTutorialPreference.setOnPreferenceClickListener(preference -> {
+            startActivity(launchSandboxIntent.putExtra("tutorial_type", "SANDBOX_MODE"));
+            return true;
+        });
+        sandboxCategory.addPreference(launchSandboxModeTutorialPreference);
     }
 
     private String toName(String action) {
-- 
GitLab


From 1d7ed30dba4b2c71fc7b0981532a872a13e5aedb Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Wed, 23 Sep 2020 12:15:43 -0700
Subject: [PATCH 0208/1664] Remove widgets that no longer fit the workspace in
 their current spans.

This can happen when display size changes.
We compare span sizes of widget in the db to the min sizes of the widget
in the current display size. If the widget can no longer fit in its existing
spans, we remove it.

Also update test widgets to have minWidth/minHeight of 1dp. This ensures that
the spanX, spanY, min* values remain consistent between different test devices.

Bug: 168818961
Change-Id: I723372e4582658f78b2f23ced9073cb77977a6b8
---
 src/com/android/launcher3/model/LoaderTask.java | 16 ++++++++++++++++
 tests/res/xml/appwidget_hidden.xml              |  4 ++--
 tests/res/xml/appwidget_no_config.xml           |  4 ++--
 tests/res/xml/appwidget_with_config.xml         |  4 ++--
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index 2b4520b613..c0d5882b46 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -49,6 +49,7 @@ import android.util.LongSparseArray;
 import android.util.TimingLogger;
 
 import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.LauncherModel;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.Utilities;
@@ -306,6 +307,7 @@ public class LoaderTask implements Runnable {
         final PackageManagerHelper pmHelper = new PackageManagerHelper(context);
         final boolean isSafeMode = pmHelper.isSafeMode();
         final boolean isSdCardReady = Utilities.isBootCompleted();
+        final WidgetManagerHelper widgetHelper = new WidgetManagerHelper(context);
 
         boolean clearDb = false;
         try {
@@ -391,6 +393,7 @@ public class LoaderTask implements Runnable {
 
                 WorkspaceItemInfo info;
                 LauncherAppWidgetInfo appWidgetInfo;
+                LauncherAppWidgetProviderInfo widgetProviderInfo;
                 Intent intent;
                 String targetPkg;
 
@@ -720,6 +723,19 @@ public class LoaderTask implements Runnable {
                                             + appWidgetInfo.spanX + "x" + appWidgetInfo.spanY);
                                     continue;
                                 }
+                                widgetProviderInfo =
+                                        widgetHelper.getLauncherAppWidgetInfo(appWidgetId);
+                                if (widgetProviderInfo != null
+                                        && (appWidgetInfo.spanX < widgetProviderInfo.minSpanX
+                                        || appWidgetInfo.spanY < widgetProviderInfo.minSpanY)) {
+                                    // This can happen when display size changes.
+                                    c.markDeleted("Widget removed, min sizes not met: "
+                                            + "span=" + appWidgetInfo.spanX + "x"
+                                            + appWidgetInfo.spanY + " minSpan="
+                                            + widgetProviderInfo.minSpanX + "x"
+                                            + widgetProviderInfo.minSpanY);
+                                    continue;
+                                }
                                 if (!c.isOnWorkspaceOrHotseat()) {
                                     c.markDeleted("Widget found where container != " +
                                             "CONTAINER_DESKTOP nor CONTAINER_HOTSEAT - ignoring!");
diff --git a/tests/res/xml/appwidget_hidden.xml b/tests/res/xml/appwidget_hidden.xml
index 6f0e0066fd..f6cffb52bf 100644
--- a/tests/res/xml/appwidget_hidden.xml
+++ b/tests/res/xml/appwidget_hidden.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:minWidth="180dp"
-    android:minHeight="110dp"
+    android:minWidth="1dp"
+    android:minHeight="1dp"
     android:updatePeriodMillis="86400000"
     android:initialLayout="@layout/test_layout_appwidget_blue"
     android:resizeMode="horizontal|vertical"
diff --git a/tests/res/xml/appwidget_no_config.xml b/tests/res/xml/appwidget_no_config.xml
index d24dfe34d8..0d932dc235 100644
--- a/tests/res/xml/appwidget_no_config.xml
+++ b/tests/res/xml/appwidget_no_config.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:minWidth="180dp"
-    android:minHeight="110dp"
+    android:minWidth="1dp"
+    android:minHeight="1dp"
     android:updatePeriodMillis="86400000"
     android:initialLayout="@layout/test_layout_appwidget_red"
     android:resizeMode="horizontal|vertical"
diff --git a/tests/res/xml/appwidget_with_config.xml b/tests/res/xml/appwidget_with_config.xml
index 8403689876..813e6df5fc 100644
--- a/tests/res/xml/appwidget_with_config.xml
+++ b/tests/res/xml/appwidget_with_config.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:minWidth="180dp"
-    android:minHeight="110dp"
+    android:minWidth="1dp"
+    android:minHeight="1dp"
     android:updatePeriodMillis="86400000"
     android:initialLayout="@layout/test_layout_appwidget_blue"
     android:configure="com.android.launcher3.testcomponent.WidgetConfigActivity"
-- 
GitLab


From c8cbd822b5a61cceb265821a9c7794dc9e9219aa Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Sun, 27 Sep 2020 12:10:06 -0700
Subject: [PATCH 0209/1664] Fix logic around launchTask in the live tile case

When how things are structured changed in the past 1-2 releases, we have dup logic in launchTask. There are two cases
- Swipe down from Overview: RecentsView#createTaskLaunchAnimation. In endListener, call launchTask in the non live tile case, and call finishRecentsAnimation in the live tile case
- Tap on the TaskView to launch task: In the non live tile case, call launchTask as it calls startActivity with option. In the live tile, currently we call createLaunchAnimationForRunningTask, which plays the task launch animation, which calls finishRecentsAnimation at the end. But this animation is not sufficient, when the user swipes the live tile task off to the right and tries to launch it. We will need to replace this animation with createRecentsWindowAnimator

Fixes: 169516051
Test: manual
Change-Id: Id764d6787175bcdb1c82adb8e4743af192a1fd9d
---
 .../android/quickstep/views/RecentsView.java  |  7 ++++++-
 .../com/android/quickstep/views/TaskView.java | 20 ++-----------------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 4bfa4da42a..7a8e11df78 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2161,7 +2161,12 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                         tv.notifyTaskLaunchFailed(TAG);
                     }
                 };
-                tv.launchTask(false, onLaunchResult, getHandler());
+                if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+                    finishRecentsAnimation(false /* toRecents */, null);
+                    onLaunchResult.accept(true /* success */);
+                } else {
+                    tv.launchTask(false, onLaunchResult, getHandler());
+                }
                 Task task = tv.getTask();
                 if (task != null) {
                     mActivity.getStatsLogManager().logger().withItemInfo(tv.getItemInfo())
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 8fbf44b572..686f8785c5 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -217,6 +217,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
             }
             if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
                 if (isRunningTask()) {
+                    // TODO: Replace this animation with createRecentsWindowAnimator
                     createLaunchAnimationForRunningTask().start();
                 } else {
                     launchTask(true /* animate */);
@@ -364,10 +365,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         final PendingAnimation pendingAnimation = getRecentsView().createTaskLaunchAnimation(
                 this, RECENTS_LAUNCH_DURATION, TOUCH_RESPONSE_INTERPOLATOR);
         AnimatorPlaybackController currentAnimation = pendingAnimation.createPlaybackController();
-        currentAnimation.setEndAction(() -> {
-            pendingAnimation.finish(true);
-            launchTask(false);
-        });
+        currentAnimation.setEndAction(() -> pendingAnimation.finish(true));
         return currentAnimation;
     }
 
@@ -390,20 +388,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
 
     public void launchTask(boolean animate, boolean freezeTaskList, Consumer<Boolean> resultCallback,
             Handler resultCallbackHandler) {
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
-            if (isRunningTask()) {
-                getRecentsView().finishRecentsAnimation(false /* toRecents */,
-                        () -> resultCallbackHandler.post(() -> resultCallback.accept(true)));
-            } else {
-                launchTaskInternal(animate, freezeTaskList, resultCallback, resultCallbackHandler);
-            }
-        } else {
-            launchTaskInternal(animate, freezeTaskList, resultCallback, resultCallbackHandler);
-        }
-    }
-
-    private void launchTaskInternal(boolean animate, boolean freezeTaskList,
-            Consumer<Boolean> resultCallback, Handler resultCallbackHandler) {
         if (mTask != null) {
             final ActivityOptions opts;
             TestLogging.recordEvent(
-- 
GitLab


From f6b72c4ad1d2e082441a64c4d6a5a02ee8a251ca Mon Sep 17 00:00:00 2001
From: Hilary Huo <hhuo@google.com>
Date: Thu, 1 Oct 2020 12:26:48 -0700
Subject: [PATCH 0210/1664] [pixel-search] Bug fix: automatically launch
 screenshot + center&crop remoteaction icon

Bug: b/169330678
Change-Id: Id5f8a0ce6d68f7ed9e4d1ff258ee3772229eb63b
---
 .../android/launcher3/views/ThumbnailSearchResultView.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/views/ThumbnailSearchResultView.java b/src/com/android/launcher3/views/ThumbnailSearchResultView.java
index bbc47739f3..81bcad97ed 100644
--- a/src/com/android/launcher3/views/ThumbnailSearchResultView.java
+++ b/src/com/android/launcher3/views/ThumbnailSearchResultView.java
@@ -86,9 +86,12 @@ public class ThumbnailSearchResultView extends androidx.appcompat.widget.AppComp
             RemoteActionItemInfo itemInfo = new RemoteActionItemInfo(target.mRemoteAction,
                     target.bundle.getString(SearchTarget.REMOTE_ACTION_TOKEN),
                     target.bundle.getBoolean(SearchTarget.REMOTE_ACTION_SHOULD_START));
-            ItemClickHandler.onClickRemoteAction(launcher, itemInfo);
             bitmap = ((BitmapDrawable) target.mRemoteAction.getIcon()
-                    .loadDrawable(getContext())).getBitmap();
+                .loadDrawable(getContext())).getBitmap();
+            Bitmap crop = Bitmap.createBitmap(bitmap, 0,
+                    bitmap.getHeight() / 2 - bitmap.getWidth() / 2,
+                    bitmap.getWidth(), bitmap.getWidth());
+            bitmap = crop;
             setTag(itemInfo);
         } else {
             bitmap = (Bitmap) target.bundle.getParcelable("bitmap");
-- 
GitLab


From d6b1f3c086f9ac097cd03e1ee898b153478ec11a Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Fri, 2 Oct 2020 00:26:35 -0700
Subject: [PATCH 0211/1664] Action icon should be used as a badge instead of
 main icon

Bug: 169796517
Change-Id: I3f07fdc2ae6e1af463701f942c26c3ca5d836ee2
---
 .../launcher3/views/SearchResultIconRow.java   | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/views/SearchResultIconRow.java b/src/com/android/launcher3/views/SearchResultIconRow.java
index 313ae5e611..6438d1dbe4 100644
--- a/src/com/android/launcher3/views/SearchResultIconRow.java
+++ b/src/com/android/launcher3/views/SearchResultIconRow.java
@@ -34,6 +34,7 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
 import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
@@ -83,7 +84,8 @@ public class SearchResultIconRow extends DoubleShadowBubbleTextView implements
         if (payload.mRemoteAction != null) {
             prepareUsingRemoteAction(payload.mRemoteAction,
                     payload.bundle.getString(SearchTarget.REMOTE_ACTION_TOKEN),
-                    payload.bundle.getBoolean(SearchTarget.REMOTE_ACTION_SHOULD_START));
+                    payload.bundle.getBoolean(SearchTarget.REMOTE_ACTION_SHOULD_START),
+                    payload.type == ItemType.ACTION);
         } else {
             prepareUsingShortcutInfo(payload.shortcuts.get(0));
         }
@@ -102,7 +104,8 @@ public class SearchResultIconRow extends DoubleShadowBubbleTextView implements
         });
     }
 
-    private void prepareUsingRemoteAction(RemoteAction remoteAction, String token, boolean start) {
+    private void prepareUsingRemoteAction(RemoteAction remoteAction, String token, boolean start,
+            boolean useIconToBadge) {
         RemoteActionItemInfo itemInfo = new RemoteActionItemInfo(remoteAction, token, start);
 
         applyFromRemoteActionInfo(itemInfo);
@@ -110,8 +113,17 @@ public class SearchResultIconRow extends DoubleShadowBubbleTextView implements
             // If the Drawable from the remote action is not AdaptiveBitmap, styling will not work.
             try (LauncherIcons li = LauncherIcons.obtain(getContext())) {
                 Drawable d = itemInfo.getRemoteAction().getIcon().loadDrawable(getContext());
-                itemInfo.bitmap = li.createBadgedIconBitmap(d, itemInfo.user,
+                BitmapInfo bitmap = li.createBadgedIconBitmap(d, itemInfo.user,
                         Build.VERSION.SDK_INT);
+
+                if (useIconToBadge) {
+                    BitmapInfo placeholder = li.createIconBitmap(
+                            itemInfo.getRemoteAction().getTitle().toString().substring(0, 1),
+                            bitmap.color);
+                    itemInfo.bitmap = li.badgeBitmap(placeholder.icon, bitmap);
+                } else {
+                    itemInfo.bitmap = bitmap;
+                }
                 reapplyItemInfoAsync(itemInfo);
             }
         });
-- 
GitLab


From f622e42bf6983d3adb95386bfd6375d281f1d4f2 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 2 Oct 2020 10:35:56 -0700
Subject: [PATCH 0212/1664] Removing unused proto extensions

Change-Id: I6d0319c99934dad5176b6f70b895a4ca772ec45f
---
 Android.bp                                   |  2 --
 proto_overrides/launcher_log_extension.proto | 30 --------------------
 2 files changed, 32 deletions(-)
 delete mode 100644 proto_overrides/launcher_log_extension.proto

diff --git a/Android.bp b/Android.bp
index e132854e62..081f48598e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -35,14 +35,12 @@ java_library_static {
     name: "launcher_log_protos_lite",
     srcs: [
         "protos/*.proto",
-        "proto_overrides/*.proto",
     ],
     sdk_version: "current",
     proto: {
         type: "lite",
         local_include_dirs:[
             "protos",
-            "proto_overrides",
         ],
     },
     static_libs: ["libprotobuf-java-lite"],
diff --git a/proto_overrides/launcher_log_extension.proto b/proto_overrides/launcher_log_extension.proto
deleted file mode 100644
index 2995aa2833..0000000000
--- a/proto_overrides/launcher_log_extension.proto
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-syntax = "proto2";
-
-option java_package = "com.android.launcher3.userevent";
-option java_outer_classname = "LauncherLogExtensions";
-
-package userevent;
-
-//
-// Use this to add any app specific extensions to the proto.
-//
-message LauncherEventExtension {
-}
-
-message TargetExtension {
-}
-- 
GitLab


From 58804ac5257f45dddbf7a6db35cf8f369ee1e88e Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 16 Sep 2020 16:27:40 -0700
Subject: [PATCH 0213/1664] Adding stats log for add item flow

Bug: 169385783
Bug: 168167693
Change-Id: I37395f1b118727f67e0f14c02f945b8213b165c8
---
 .../launcher3/dragndrop/AddItemActivity.java       |  8 ++++----
 src/com/android/launcher3/model/data/ItemInfo.java | 14 ++++++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/com/android/launcher3/dragndrop/AddItemActivity.java b/src/com/android/launcher3/dragndrop/AddItemActivity.java
index 42e247aa9b..77d2b85ef9 100644
--- a/src/com/android/launcher3/dragndrop/AddItemActivity.java
+++ b/src/com/android/launcher3/dragndrop/AddItemActivity.java
@@ -53,8 +53,8 @@ import com.android.launcher3.R;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.model.ItemInstallQueue;
 import com.android.launcher3.model.WidgetItem;
+import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.pm.PinRequestHelper;
-import com.android.launcher3.util.InstantAppResolver;
 import com.android.launcher3.views.BaseDragLayer;
 import com.android.launcher3.widget.PendingAddShortcutInfo;
 import com.android.launcher3.widget.PendingAddWidgetInfo;
@@ -87,7 +87,6 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
     private Bundle mWidgetOptions;
 
     private boolean mFinishOnPause = false;
-    private InstantAppResolver mInstantAppResolver;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -101,7 +100,6 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
 
         mApp = LauncherAppState.getInstance(this);
         mIdp = mApp.getInvariantDeviceProfile();
-        mInstantAppResolver = InstantAppResolver.newInstance(this);
 
         // Use the application context to get the device profile, as in multiwindow-mode, the
         // confirmation activity might be rotated.
@@ -322,6 +320,8 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
     }
 
     private void logCommand(StatsLogManager.EventEnum command) {
-        getStatsLogManager().logger().log(command);
+        getStatsLogManager().logger()
+                .withItemInfo((ItemInfo) mWidgetCell.getWidgetView().getTag())
+                .log(command);
     }
 }
diff --git a/src/com/android/launcher3/model/data/ItemInfo.java b/src/com/android/launcher3/model/data/ItemInfo.java
index e03fd72449..b11b419dde 100644
--- a/src/com/android/launcher3/model/data/ItemInfo.java
+++ b/src/com/android/launcher3/model/data/ItemInfo.java
@@ -32,6 +32,7 @@ import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SH
 import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT;
 import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_TASK;
 import static com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.CONTAINER_NOT_SET;
+import static com.android.launcher3.shortcuts.ShortcutKey.EXTRA_SHORTCUT_ID;
 
 import android.content.ComponentName;
 import android.content.ContentValues;
@@ -50,10 +51,10 @@ import com.android.launcher3.logger.LauncherAtom.ContainerInfo;
 import com.android.launcher3.logger.LauncherAtom.PredictionContainer;
 import com.android.launcher3.logger.LauncherAtom.SearchResultContainer;
 import com.android.launcher3.logger.LauncherAtom.SettingsContainer;
+import com.android.launcher3.logger.LauncherAtom.Shortcut;
 import com.android.launcher3.logger.LauncherAtom.ShortcutsContainer;
 import com.android.launcher3.logger.LauncherAtom.TaskSwitcherContainer;
 import com.android.launcher3.model.ModelWriter;
-import com.android.launcher3.shortcuts.ShortcutKey;
 import com.android.launcher3.util.ContentWriter;
 
 import java.util.Optional;
@@ -282,9 +283,14 @@ public class ItemInfo {
             case ITEM_TYPE_DEEP_SHORTCUT:
                 itemBuilder
                         .setShortcut(nullableComponent
-                                .map(component -> LauncherAtom.Shortcut.newBuilder()
-                                        .setShortcutName(component.flattenToShortString())
-                                        .setShortcutId(ShortcutKey.fromItemInfo(this).getId()))
+                                .map(component -> {
+                                    Shortcut.Builder lsb = Shortcut.newBuilder()
+                                            .setShortcutName(component.flattenToShortString());
+                                    Optional.ofNullable(getIntent())
+                                            .map(i -> i.getStringExtra(EXTRA_SHORTCUT_ID))
+                                            .ifPresent(lsb::setShortcutId);
+                                    return lsb;
+                                })
                                 .orElse(LauncherAtom.Shortcut.newBuilder()));
                 break;
             case ITEM_TYPE_SHORTCUT:
-- 
GitLab


From 733e3c609b7653a36e58747c881458ec00d98df8 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 29 Sep 2020 10:32:32 -0700
Subject: [PATCH 0214/1664] Moving some initializations to the background
 thread

HandlerThread.getLooper blocks until the thread is ready. Instead
moving all looper dependency to the new thread itself.

Change-Id: I240e8c56b855a991433a7fe93875059e6dab146b
---
 .../launcher3/model/WellbeingModel.java       | 202 +++++++-----------
 .../quickstep/util/RecentsOrientedState.java  |  10 +-
 src/com/android/launcher3/Utilities.java      |  15 ++
 .../launcher3/states/RotationHelper.java      |  41 +---
 .../launcher3/util/BgObjectWithLooper.java    |  46 ++++
 5 files changed, 145 insertions(+), 169 deletions(-)
 create mode 100644 src/com/android/launcher3/util/BgObjectWithLooper.java

diff --git a/quickstep/src/com/android/launcher3/model/WellbeingModel.java b/quickstep/src/com/android/launcher3/model/WellbeingModel.java
index f92b3e33b2..a9fc1aa085 100644
--- a/quickstep/src/com/android/launcher3/model/WellbeingModel.java
+++ b/quickstep/src/com/android/launcher3/model/WellbeingModel.java
@@ -18,8 +18,7 @@ package com.android.launcher3.model;
 
 import static android.content.ContentResolver.SCHEME_CONTENT;
 
-import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-import static com.android.launcher3.util.Executors.createAndStartNewLooper;
+import static com.android.launcher3.Utilities.newContentObserver;
 
 import android.annotation.TargetApi;
 import android.app.RemoteAction;
@@ -35,7 +34,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.DeadObjectException;
 import android.os.Handler;
-import android.os.Message;
+import android.os.Looper;
 import android.os.Process;
 import android.os.UserHandle;
 import android.text.TextUtils;
@@ -43,7 +42,7 @@ import android.util.ArrayMap;
 import android.util.Log;
 
 import androidx.annotation.MainThread;
-import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
 
 import com.android.launcher3.BaseDraggingActivity;
@@ -55,6 +54,7 @@ import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.popup.RemoteActionShortcut;
 import com.android.launcher3.popup.SystemShortcut;
+import com.android.launcher3.util.BgObjectWithLooper;
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.launcher3.util.Preconditions;
@@ -68,15 +68,11 @@ import java.util.Map;
  * Data model for digital wellbeing status of apps.
  */
 @TargetApi(Build.VERSION_CODES.Q)
-public final class WellbeingModel {
+public final class WellbeingModel extends BgObjectWithLooper {
     private static final String TAG = "WellbeingModel";
     private static final int[] RETRY_TIMES_MS = {5000, 15000, 30000};
     private static final boolean DEBUG = false;
 
-    private static final int MSG_PACKAGE_ADDED = 1;
-    private static final int MSG_PACKAGE_REMOVED = 2;
-    private static final int MSG_FULL_REFRESH = 3;
-
     private static final int UNKNOWN_MINIMAL_DEVICE_STATE = 0;
     private static final int IN_MINIMAL_DEVICE = 2;
 
@@ -98,9 +94,9 @@ public final class WellbeingModel {
 
     private final Context mContext;
     private final String mWellbeingProviderPkg;
-    private final Handler mWorkerHandler;
 
-    private final ContentObserver mContentObserver;
+    private Handler mWorkerHandler;
+    private ContentObserver mContentObserver;
 
     private final Object mModelLock = new Object();
     // Maps the action Id to the corresponding RemoteAction
@@ -111,60 +107,67 @@ public final class WellbeingModel {
 
     private WellbeingModel(final Context context) {
         mContext = context;
-        mWorkerHandler =
-                new Handler(createAndStartNewLooper("WellbeingHandler"), this::handleMessage);
-
         mWellbeingProviderPkg = mContext.getString(R.string.wellbeing_provider_pkg);
-        mContentObserver = new ContentObserver(MAIN_EXECUTOR.getHandler()) {
-            @Override
-            public void onChange(boolean selfChange, Uri uri) {
-                if (DEBUG || mIsInTest) {
-                    Log.d(TAG, "ContentObserver.onChange() called with: selfChange = ["
-                            + selfChange + "], uri = [" + uri + "]");
-                }
-                Preconditions.assertUIThread();
-
-                if (uri.getPath().contains(PATH_ACTIONS)) {
-                    // Wellbeing reports that app actions have changed.
-                    updateWellbeingData();
-                } else if (uri.getPath().contains(PATH_MINIMAL_DEVICE)) {
-                    // Wellbeing reports that minimal device state or config is changed.
-                    updateLauncherModel(context);
-                }
-            }
-        };
-        FeatureFlags.ENABLE_MINIMAL_DEVICE.addChangeListener(mContext, () ->
-                updateLauncherModel(context));
+        initializeInBackground("WellbeingHandler");
+    }
 
+    @Override
+    protected void onInitialized(Looper looper) {
+        mWorkerHandler = new Handler(looper);
+        mContentObserver = newContentObserver(mWorkerHandler, this::onWellbeingUriChanged);
         if (!TextUtils.isEmpty(mWellbeingProviderPkg)) {
-            context.registerReceiver(
-                    new SimpleBroadcastReceiver(this::onWellbeingProviderChanged),
+            mContext.registerReceiver(
+                    new SimpleBroadcastReceiver(t -> restartObserver()),
                     PackageManagerHelper.getPackageFilter(mWellbeingProviderPkg,
                             Intent.ACTION_PACKAGE_ADDED, Intent.ACTION_PACKAGE_CHANGED,
                             Intent.ACTION_PACKAGE_REMOVED, Intent.ACTION_PACKAGE_DATA_CLEARED,
-                            Intent.ACTION_PACKAGE_RESTARTED));
+                            Intent.ACTION_PACKAGE_RESTARTED),
+                    null, mWorkerHandler);
 
             IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_ADDED);
             filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
             filter.addDataScheme("package");
-            context.registerReceiver(new SimpleBroadcastReceiver(this::onAppPackageChanged),
-                    filter);
+            mContext.registerReceiver(new SimpleBroadcastReceiver(this::onAppPackageChanged),
+                    filter, null, mWorkerHandler);
 
             restartObserver();
         }
     }
 
-    public void setInTest(boolean inTest) {
-        mIsInTest = inTest;
-    }
-
-    protected void onWellbeingProviderChanged(Intent intent) {
+    @WorkerThread
+    private void onWellbeingUriChanged(Uri uri) {
+        Preconditions.assertNonUiThread();
         if (DEBUG || mIsInTest) {
-            Log.d(TAG, "Changes to Wellbeing package: intent = [" + intent + "]");
+            Log.d(TAG, "ContentObserver.onChange() called with: uri = [" + uri + "]");
         }
-        restartObserver();
+        if (uri.getPath().contains(PATH_ACTIONS)) {
+            // Wellbeing reports that app actions have changed.
+            updateAllPackages();
+        } else if (uri.getPath().contains(PATH_MINIMAL_DEVICE)) {
+            // Wellbeing reports that minimal device state or config is changed.
+            if (!FeatureFlags.ENABLE_MINIMAL_DEVICE.get()) {
+                return;
+            }
+            final Bundle extras = new Bundle();
+            String dbFile;
+            if (isInMinimalDeviceMode()) {
+                dbFile = DB_NAME_MINIMAL_DEVICE;
+                extras.putString(LauncherProvider.KEY_LAYOUT_PROVIDER_AUTHORITY,
+                        mWellbeingProviderPkg + ".api");
+            } else {
+                dbFile = InvariantDeviceProfile.INSTANCE.get(mContext).dbFile;
+            }
+            LauncherSettings.Settings.call(mContext.getContentResolver(),
+                    LauncherSettings.Settings.METHOD_SWITCH_DATABASE,
+                    dbFile, extras);
+        }
+    }
+
+    public void setInTest(boolean inTest) {
+        mIsInTest = inTest;
     }
 
+    @WorkerThread
     private void restartObserver() {
         final ContentResolver resolver = mContext.getContentResolver();
         resolver.unregisterContentObserver(mContentObserver);
@@ -179,7 +182,7 @@ public final class WellbeingModel {
             Log.e(TAG, "Failed to register content observer for " + actionsUri + ": " + e);
             if (mIsInTest) throw new RuntimeException(e);
         }
-        updateWellbeingData();
+        updateAllPackages();
     }
 
     @MainThread
@@ -212,39 +215,6 @@ public final class WellbeingModel {
         }
     }
 
-    private void updateWellbeingData() {
-        mWorkerHandler.sendEmptyMessage(MSG_FULL_REFRESH);
-    }
-
-    private void updateLauncherModel(@NonNull final Context context) {
-        if (!FeatureFlags.ENABLE_MINIMAL_DEVICE.get()) {
-            reloadLauncherInNormalMode(context);
-            return;
-        }
-        mWorkerHandler.post(() -> {
-            if (isInMinimalDeviceMode()) {
-                reloadLauncherInMinimalMode(context);
-            } else {
-                reloadLauncherInNormalMode(context);
-            }
-        });
-    }
-
-    private void reloadLauncherInNormalMode(@NonNull final Context context) {
-        LauncherSettings.Settings.call(context.getContentResolver(),
-                LauncherSettings.Settings.METHOD_SWITCH_DATABASE,
-                InvariantDeviceProfile.INSTANCE.get(context).dbFile);
-    }
-
-    private void reloadLauncherInMinimalMode(@NonNull final Context context) {
-        final Bundle extras = new Bundle();
-        extras.putString(LauncherProvider.KEY_LAYOUT_PROVIDER_AUTHORITY,
-                mWellbeingProviderPkg + ".api");
-        LauncherSettings.Settings.call(context.getContentResolver(),
-                LauncherSettings.Settings.METHOD_SWITCH_DATABASE,
-                DB_NAME_MINIMAL_DEVICE, extras);
-    }
-
     private Uri.Builder apiBuilder() {
         return new Uri.Builder()
                 .scheme(SCHEME_CONTENT)
@@ -277,7 +247,8 @@ public final class WellbeingModel {
         return false;
     }
 
-    private boolean updateActions(String... packageNames) {
+    @WorkerThread
+    private boolean updateActions(String[] packageNames) {
         if (packageNames.length == 0) {
             return true;
         }
@@ -340,68 +311,51 @@ public final class WellbeingModel {
         return true;
     }
 
-    private boolean handleMessage(Message msg) {
-        switch (msg.what) {
-            case MSG_PACKAGE_REMOVED: {
-                String packageName = (String) msg.obj;
-                mWorkerHandler.removeCallbacksAndMessages(packageName);
-                synchronized (mModelLock) {
-                    mPackageToActionId.remove(packageName);
-                }
-                return true;
-            }
-            case MSG_PACKAGE_ADDED: {
-                String packageName = (String) msg.obj;
-                mWorkerHandler.removeCallbacksAndMessages(packageName);
-                if (!updateActions(packageName)) {
-                    scheduleRefreshRetry(msg);
-                }
-                return true;
-            }
-
-            case MSG_FULL_REFRESH: {
-                // Remove all existing messages
-                mWorkerHandler.removeCallbacksAndMessages(null);
-                final String[] packageNames = mContext.getSystemService(LauncherApps.class)
-                        .getActivityList(null, Process.myUserHandle()).stream()
-                        .map(li -> li.getApplicationInfo().packageName).distinct()
-                        .toArray(String[]::new);
-                if (!updateActions(packageNames)) {
-                    scheduleRefreshRetry(msg);
-                }
-                return true;
-            }
+    @WorkerThread
+    private void updateActionsWithRetry(int retryCount, @Nullable String packageName) {
+        String[] packageNames = TextUtils.isEmpty(packageName)
+                ?  mContext.getSystemService(LauncherApps.class)
+                .getActivityList(null, Process.myUserHandle()).stream()
+                .map(li -> li.getApplicationInfo().packageName).distinct()
+                .toArray(String[]::new)
+                : new String[] { packageName };
+
+        mWorkerHandler.removeCallbacksAndMessages(packageName);
+        if (updateActions(packageNames)) {
+            return;
         }
-        return false;
-    }
-
-    private void scheduleRefreshRetry(Message originalMsg) {
-        int retryCount = originalMsg.arg1;
         if (retryCount >= RETRY_TIMES_MS.length) {
             // To many retries, skip
             return;
         }
+        mWorkerHandler.postDelayed(
+                () -> updateActionsWithRetry(retryCount + 1, packageName),
+                packageName, RETRY_TIMES_MS[retryCount]);
+    }
 
-        Message msg = Message.obtain(originalMsg);
-        msg.arg1 = retryCount + 1;
-        mWorkerHandler.sendMessageDelayed(msg, RETRY_TIMES_MS[retryCount]);
+    @WorkerThread
+    private void updateAllPackages() {
+        updateActionsWithRetry(0, null);
     }
 
+    @WorkerThread
     private void onAppPackageChanged(Intent intent) {
         if (DEBUG || mIsInTest) Log.d(TAG, "Changes in apps: intent = [" + intent + "]");
-        Preconditions.assertUIThread();
+        Preconditions.assertNonUiThread();
 
         final String packageName = intent.getData().getSchemeSpecificPart();
         if (packageName == null || packageName.length() == 0) {
             // they sent us a bad intent
             return;
         }
-
         final String action = intent.getAction();
         if (Intent.ACTION_PACKAGE_REMOVED.equals(action)) {
-            Message.obtain(mWorkerHandler, MSG_PACKAGE_REMOVED, packageName).sendToTarget();
+            mWorkerHandler.removeCallbacksAndMessages(packageName);
+            synchronized (mModelLock) {
+                mPackageToActionId.remove(packageName);
+            }
         } else if (Intent.ACTION_PACKAGE_ADDED.equals(action)) {
-            Message.obtain(mWorkerHandler, MSG_PACKAGE_ADDED, packageName).sendToTarget();
+            updateActionsWithRetry(0, packageName);
         }
     }
 
diff --git a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
index de44e07bae..5f0ef83382 100644
--- a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
+++ b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
@@ -23,6 +23,7 @@ import static android.view.Surface.ROTATION_180;
 import static android.view.Surface.ROTATION_270;
 import static android.view.Surface.ROTATION_90;
 
+import static com.android.launcher3.Utilities.newContentObserver;
 import static com.android.launcher3.states.RotationHelper.ALLOW_ROTATION_PREFERENCE_KEY;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
@@ -73,12 +74,9 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
     private static final boolean DEBUG = false;
     private static final String DELIMITER_DOT = "\\.";
 
-    private ContentObserver mSystemAutoRotateObserver = new ContentObserver(new Handler()) {
-        @Override
-        public void onChange(boolean selfChange) {
-            updateAutoRotateSetting();
-        }
-    };
+    private ContentObserver mSystemAutoRotateObserver =
+            newContentObserver(new Handler(), t -> updateAutoRotateSetting());
+
     @Retention(SOURCE)
     @IntDef({ROTATION_0, ROTATION_90, ROTATION_180, ROTATION_270})
     public @interface SurfaceRotation {}
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 43ccb7990c..1e023dfc0a 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -34,6 +34,7 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ShortcutInfo;
 import android.content.res.Resources;
+import android.database.ContentObserver;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.Matrix;
@@ -44,6 +45,7 @@ import android.graphics.RectF;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.InsetDrawable;
+import android.net.Uri;
 import android.os.Build;
 import android.os.DeadObjectException;
 import android.os.Handler;
@@ -83,6 +85,7 @@ import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
+import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -661,6 +664,18 @@ public final class Utilities {
         return slop * slop;
     }
 
+    /**
+     * Helper method to create a content provider
+     */
+    public static ContentObserver newContentObserver(Handler handler, Consumer<Uri> command) {
+        return new ContentObserver(handler) {
+            @Override
+            public void onChange(boolean selfChange, Uri uri) {
+                command.accept(uri);
+            }
+        };
+    }
+
     private static class FixedSizeEmptyDrawable extends ColorDrawable {
 
         private final int mSize;
diff --git a/src/com/android/launcher3/states/RotationHelper.java b/src/com/android/launcher3/states/RotationHelper.java
index 5a60f5328a..ecf4f36c52 100644
--- a/src/com/android/launcher3/states/RotationHelper.java
+++ b/src/com/android/launcher3/states/RotationHelper.java
@@ -21,14 +21,9 @@ import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
 import static android.util.DisplayMetrics.DENSITY_DEVICE_STABLE;
 
 import android.app.Activity;
-import android.content.ContentResolver;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.content.res.Resources;
-import android.database.ContentObserver;
-import android.os.Handler;
-import android.provider.Settings;
-import android.util.Log;
 
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
@@ -43,16 +38,6 @@ public class RotationHelper implements OnSharedPreferenceChangeListener {
 
     public static final String ALLOW_ROTATION_PREFERENCE_KEY = "pref_allowRotation";
 
-    private final ContentResolver mContentResolver;
-    private boolean mSystemAutoRotateEnabled;
-
-    private ContentObserver mSystemAutoRotateObserver = new ContentObserver(new Handler()) {
-        @Override
-        public void onChange(boolean selfChange) {
-            updateAutoRotateSetting();
-        }
-    };
-
     public static boolean getAllowRotationDefaultValue() {
         // If the device's pixel density was scaled (usually via settings for A11y), use the
         // original dimensions to determine if rotation is allowed of not.
@@ -106,20 +91,6 @@ public class RotationHelper implements OnSharedPreferenceChangeListener {
         } else {
             mSharedPrefs = null;
         }
-
-        mContentResolver = activity.getContentResolver();
-    }
-
-    private void updateAutoRotateSetting() {
-        int autoRotateEnabled = 0;
-        try {
-            autoRotateEnabled = Settings.System.getInt(mContentResolver,
-                    Settings.System.ACCELEROMETER_ROTATION);
-        } catch (Settings.SettingNotFoundException e) {
-            Log.e(TAG, "autorotate setting not found", e);
-        }
-
-        mSystemAutoRotateEnabled = autoRotateEnabled == 1;
     }
 
     @Override
@@ -129,7 +100,6 @@ public class RotationHelper implements OnSharedPreferenceChangeListener {
                 getAllowRotationDefaultValue());
         if (mHomeRotationEnabled != wasRotationEnabled) {
             notifyChange();
-            updateAutoRotateSetting();
         }
     }
 
@@ -165,11 +135,6 @@ public class RotationHelper implements OnSharedPreferenceChangeListener {
         if (!mInitialized) {
             mInitialized = true;
             notifyChange();
-
-            mContentResolver.registerContentObserver(
-                    Settings.System.getUriFor(Settings.System.ACCELEROMETER_ROTATION),
-                    false, mSystemAutoRotateObserver);
-            updateAutoRotateSetting();
         }
     }
 
@@ -179,7 +144,6 @@ public class RotationHelper implements OnSharedPreferenceChangeListener {
             if (mSharedPrefs != null) {
                 mSharedPrefs.unregisterOnSharedPreferenceChangeListener(this);
             }
-            mContentResolver.unregisterContentObserver(mSystemAutoRotateObserver);
         }
     }
 
@@ -225,9 +189,8 @@ public class RotationHelper implements OnSharedPreferenceChangeListener {
     @Override
     public String toString() {
         return String.format("[mStateHandlerRequest=%d, mCurrentStateRequest=%d,"
-                + " mLastActivityFlags=%d, mIgnoreAutoRotateSettings=%b, mHomeRotationEnabled=%b,"
-                        + " mSystemAutoRotateEnabled=%b]",
+                + " mLastActivityFlags=%d, mIgnoreAutoRotateSettings=%b, mHomeRotationEnabled=%b]",
                 mStateHandlerRequest, mCurrentStateRequest, mLastActivityFlags,
-                mIgnoreAutoRotateSettings, mHomeRotationEnabled, mSystemAutoRotateEnabled);
+                mIgnoreAutoRotateSettings, mHomeRotationEnabled);
     }
 }
diff --git a/src/com/android/launcher3/util/BgObjectWithLooper.java b/src/com/android/launcher3/util/BgObjectWithLooper.java
new file mode 100644
index 0000000000..1483c43a11
--- /dev/null
+++ b/src/com/android/launcher3/util/BgObjectWithLooper.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.util;
+
+import android.os.Looper;
+
+import androidx.annotation.WorkerThread;
+
+/**
+ * Utility class to define an object which does most of it's processing on a
+ * dedicated background thread.
+ */
+public abstract class BgObjectWithLooper {
+
+    /**
+     * Start initialization of the object
+     */
+    public final void initializeInBackground(String threadName) {
+        new Thread(this::runOnThread, threadName).start();
+    }
+
+    private void runOnThread() {
+        Looper.prepare();
+        onInitialized(Looper.myLooper());
+        Looper.loop();
+    }
+
+    /**
+     * Called on the background thread to handle initialization
+     */
+    @WorkerThread
+    protected abstract void onInitialized(Looper looper);
+}
-- 
GitLab


From a762b02418695f5a1ff2f96586660de8c3610280 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Fri, 2 Oct 2020 13:56:28 -0700
Subject: [PATCH 0215/1664] Annotating Quick Switch CUJ for non-3-button modes

Bug: 169221288
Change-Id: I7145a9e28a2f0a789d19d2a0e3d15630c6e50f6a
---
 .../src/com/android/quickstep/AbsSwipeUpHandler.java   | 10 ++++++++--
 .../android/quickstep/RecentsAnimationController.java  |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 5e05a7dbe1..1439d4e97c 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -715,6 +715,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
 
     @UiThread
     public void onGestureStarted(boolean isLikelyToStartNewTask) {
+        InteractionJankMonitorWrapper.begin(
+                InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH, 2000 /* ms timeout */);
         notifyGestureStartedAsync();
         setIsLikelyToStartNewTask(isLikelyToStartNewTask, false /* animate */);
         mStateCallback.setStateOnUiThread(STATE_GESTURE_STARTED);
@@ -790,7 +792,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
     }
 
     private void onSettledOnEndTarget() {
-        switch (mGestureState.getEndTarget()) {
+        final GestureEndTarget endTarget = mGestureState.getEndTarget();
+        switch (endTarget) {
             case HOME:
                 mStateCallback.setState(STATE_SCALED_CONTROLLER_HOME | STATE_CAPTURE_SCREENSHOT);
                 // Notify swipe-to-home (recents animation) is finished
@@ -807,7 +810,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                 mStateCallback.setState(STATE_RESUME_LAST_TASK);
                 break;
         }
-        ActiveGestureLog.INSTANCE.addLog("onSettledOnEndTarget " + mGestureState.getEndTarget());
+        ActiveGestureLog.INSTANCE.addLog("onSettledOnEndTarget " + endTarget);
+        if (endTarget != NEW_TASK) {
+            InteractionJankMonitorWrapper.cancel(InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH);
+        }
     }
 
     /** @return Whether this was the task we were waiting to appear, and thus handled it. */
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationController.java b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
index 51f5e5d785..798c12bcdc 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationController.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
@@ -23,6 +23,7 @@ import androidx.annotation.UiThread;
 
 import com.android.launcher3.util.Preconditions;
 import com.android.systemui.shared.recents.model.ThumbnailData;
+import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
 import com.android.systemui.shared.system.RecentsAnimationControllerCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
@@ -149,6 +150,7 @@ public class RecentsAnimationController {
         mOnFinishedListener.accept(this);
         UI_HELPER_EXECUTOR.execute(() -> {
             mController.finish(toRecents, sendUserLeaveHint);
+            InteractionJankMonitorWrapper.end(InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH);
             if (callback != null) {
                 MAIN_EXECUTOR.execute(callback);
             }
-- 
GitLab


From 88ddae38db924f700082a113670ce5a719116a95 Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Fri, 2 Oct 2020 13:51:36 -0700
Subject: [PATCH 0216/1664] Comply with the ISystemUiProxy.aidl change

Two methods are added to support communications between Launcher and
SysUI when user swipes an auto PiP-able Activity to home.

Bug: 143965596
Test: N/A
Change-Id: I2c73a287a094e882bde3cd71c27f9f66ae20e64a
---
 .../com/android/quickstep/SystemUiProxy.java  | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index 2666869136..a214d81e76 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -17,7 +17,10 @@ package com.android.quickstep;
 
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 
+import android.app.PictureInPictureParams;
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.pm.ActivityInfo;
 import android.graphics.Bitmap;
 import android.graphics.Insets;
 import android.graphics.Rect;
@@ -380,4 +383,29 @@ public class SystemUiProxy implements ISystemUiProxy {
             }
         }
     }
+
+    @Override
+    public Rect startSwipePipToHome(ComponentName componentName, ActivityInfo activityInfo,
+            PictureInPictureParams pictureInPictureParams, int launcherRotation, int shelfHeight) {
+        if (mSystemUiProxy != null) {
+            try {
+                return mSystemUiProxy.startSwipePipToHome(componentName, activityInfo,
+                        pictureInPictureParams, launcherRotation, shelfHeight);
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call startSwipePipToHome", e);
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public void stopSwipePipToHome(ComponentName componentName, Rect destinationBounds) {
+        if (mSystemUiProxy != null) {
+            try {
+                mSystemUiProxy.stopSwipePipToHome(componentName, destinationBounds);
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call stopSwipePipToHome");
+            }
+        }
+    }
 }
-- 
GitLab


From 7fcd74abb399100ac8243be6ca28c09cc8adc8c8 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Fri, 2 Oct 2020 19:20:11 -0700
Subject: [PATCH 0217/1664] Suggest result should launch Bug: 169980192

Change-Id: I762245a5cc4740d093c9cb3b44a508e9e3f2b763
---
 src/com/android/launcher3/views/SearchResultSuggestRow.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/views/SearchResultSuggestRow.java b/src/com/android/launcher3/views/SearchResultSuggestRow.java
index b5abbcc724..6543c76cfb 100644
--- a/src/com/android/launcher3/views/SearchResultSuggestRow.java
+++ b/src/com/android/launcher3/views/SearchResultSuggestRow.java
@@ -96,7 +96,8 @@ public class SearchResultSuggestRow extends LinearLayout implements
     private void handleSelection(int eventType) {
         ItemInfo itemInfo = (ItemInfo) getTag();
         Launcher launcher = Launcher.getLauncher(getContext());
-        if (itemInfo instanceof  RemoteActionItemInfo) return;
+
+        if (!(itemInfo instanceof  RemoteActionItemInfo)) return;
 
         RemoteActionItemInfo remoteItemInfo = (RemoteActionItemInfo) itemInfo;
         ItemClickHandler.onClickRemoteAction(launcher, remoteItemInfo);
-- 
GitLab


From d028937e74a9ea6d36e463de4c87ed37283bbdf6 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Sat, 3 Oct 2020 00:36:53 -0700
Subject: [PATCH 0218/1664] [Live tile] Finish recents animation when the phone
 goes to sleep in live tile mode

Fixes: 169988381
Test: manual
Change-Id: Ic71d3e6767eadb6854dbd46581bf9d3242c161a4
---
 quickstep/src/com/android/quickstep/views/RecentsView.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 7a8e11df78..42e43f9249 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -539,6 +539,9 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     @Override
     protected void onWindowVisibilityChanged(int visibility) {
         super.onWindowVisibilityChanged(visibility);
+        if (visibility == GONE && ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+            finishRecentsAnimation(true /* toRecents */, null);
+        }
         updateTaskStackListenerState();
     }
 
-- 
GitLab


From 087a9e39b663dade90d8dfd74300e42575649b87 Mon Sep 17 00:00:00 2001
From: Alistair Delva <adelva@google.com>
Date: Mon, 5 Oct 2020 14:46:26 +0000
Subject: [PATCH 0219/1664] Revert "Merge commit
 '8d14dbe041199d611839140f1c9285fd4174e9f4' ..."

Revert "Merging from ub-launcher3-master @ build 6877130"

Revert "Merging from ub-launcher3-master @ build 6877130"

Revert "Merging from ub-launcher3-master @ build 6877130"

Revert submission 12738409-merge_ub-launcher3-master_6877130

Reason for revert: Introduced crashes to global presubmit

Reverted Changes:
I624658ce6:Merge commit '8d14dbe041199d611839140f1c9285fd4174...
Iccd2f1e3a:Merging from ub-launcher3-master @ build 6877130
I791d64951:Merging from ub-launcher3-master @ build 6877130
Icdd32ab01:Merging from ub-launcher3-master @ build 6877130

Bug: 169963211
Change-Id: I77a4ae59e823147beae8dd7cb9b54ccdace2c7f4
---
 Android.mk                                    |   8 +
 build.gradle                                  |  24 +-
 protos/launcher_log.proto                     | 245 ++++++++++++
 .../res/layout/gesture_tutorial_fragment.xml  |   9 +-
 quickstep/res/values/strings.xml              |  15 -
 .../launcher3/BaseQuickstepLauncher.java      |   8 -
 .../launcher3/LauncherAnimationRunner.java    |   3 +-
 .../QuickstepAppTransitionManagerImpl.java    |  75 ++--
 .../appprediction/PredictionRowView.java      |  31 +-
 .../HotseatPredictionController.java          |   1 +
 .../uioverrides/states/AllAppsState.java      |   4 +-
 .../states/BackgroundAppState.java            |   5 +-
 .../states/OverviewModalTaskState.java        |   5 +-
 .../uioverrides/states/OverviewState.java     |   4 +-
 .../uioverrides/states/QuickSwitchState.java  |   5 +-
 .../LandscapeEdgeSwipeController.java         |  16 +-
 .../NavBarToHomeTouchController.java          |  19 +-
 ...ButtonNavbarToOverviewTouchController.java |   5 +-
 .../NoButtonQuickSwitchTouchController.java   |  25 +-
 .../OverviewToAllAppsTouchController.java     |   6 +
 .../PortraitStatesTouchController.java        |  13 +-
 .../QuickSwitchTouchController.java           |  19 +-
 .../StatusBarTouchController.java             |  14 +-
 .../TaskViewTouchController.java              |  14 +-
 .../android/quickstep/AbsSwipeUpHandler.java  |  49 +--
 .../quickstep/BaseActivityInterface.java      |   5 +
 .../quickstep/FallbackActivityInterface.java  |  10 +
 .../com/android/quickstep/GestureState.java   |  12 +-
 .../quickstep/LauncherActivityInterface.java  |  12 +
 .../quickstep/OverviewCommandHelper.java      |  13 +-
 .../android/quickstep/RecentsActivity.java    |  19 +-
 .../com/android/quickstep/RecentsModel.java   |  14 +-
 .../com/android/quickstep/TaskIconCache.java  |  50 ++-
 .../quickstep/TaskShortcutFactory.java        |   4 +
 .../android/quickstep/TaskThumbnailCache.java |  52 ++-
 .../quickstep/TouchInteractionService.java    |  11 +-
 .../fallback/FallbackRecentsView.java         |  10 +-
 .../AssistantInputConsumer.java               |  20 +-
 .../OtherActivityInputConsumer.java           |  12 +-
 .../OverviewWithoutFocusInputConsumer.java    |  17 +-
 .../AssistantGestureTutorialFragment.java     |   2 +-
 .../BackGestureTutorialFragment.java          |   2 +-
 .../interaction/EdgeBackGestureHandler.java   |   4 -
 .../HomeGestureTutorialFragment.java          |   2 +-
 .../interaction/NavBarGestureHandler.java     |   6 -
 .../OverviewGestureTutorialFragment.java      |   2 +-
 .../interaction/RootSandboxLayout.java        |  44 ---
 .../interaction/SandboxLauncherRenderer.java  |  44 ---
 .../SandboxModeTutorialController.java        | 102 -----
 .../SandboxModeTutorialFragment.java          |  43 --
 .../interaction/TutorialController.java       |  17 +-
 .../interaction/TutorialFragment.java         |  39 +-
 .../quickstep/util/CancellableTask.java       |  68 ----
 .../quickstep/util/OverviewToHomeAnim.java    |   4 +-
 .../quickstep/util/RecentsOrientedState.java  |  11 +-
 .../util/RemoteAnimationProvider.java         |  12 +-
 .../quickstep/util/TaskViewSimulator.java     |   5 +-
 .../views/DigitalWellBeingToast.java          |   5 +-
 .../quickstep/views/LauncherRecentsView.java  |  11 +-
 .../quickstep/views/OverviewActionsView.java  |   4 +-
 .../android/quickstep/views/RecentsView.java  |  35 +-
 .../android/quickstep/views/TaskMenuView.java |  12 +-
 .../com/android/quickstep/views/TaskView.java |  37 +-
 .../quickstep/DigitalWellBeingToastTest.java  |   7 +-
 res/layout/search_result_icon_row.xml         |  31 --
 res/layout/search_result_shortcut.xml         |  42 ++
 res/layout/search_result_suggest.xml          |  38 --
 res/layout/search_result_thumbnail.xml        |  19 -
 res/values/config.xml                         |   1 +
 .../secondarydisplay/SDWorkModeTest.java      |   5 +
 .../launcher3/ui/LauncherUIScrollTest.java    |   5 +
 src/com/android/launcher3/BaseActivity.java   |  12 +
 src/com/android/launcher3/BubbleTextView.java |  59 +--
 .../android/launcher3/ButtonDropTarget.java   |   3 +
 src/com/android/launcher3/CellLayout.java     |   7 +-
 .../android/launcher3/DeleteDropTarget.java   |  24 +-
 .../android/launcher3/FastBitmapDrawable.java |   9 +-
 src/com/android/launcher3/Hotseat.java        |  23 +-
 src/com/android/launcher3/Launcher.java       |  92 ++---
 .../android/launcher3/LauncherAppState.java   |   2 +-
 src/com/android/launcher3/LauncherState.java  |  12 +-
 .../launcher3/SecondaryDropTarget.java        |  16 +
 .../launcher3/SessionCommitReceiver.java      |   8 -
 src/com/android/launcher3/Utilities.java      |   4 -
 src/com/android/launcher3/Workspace.java      |  40 +-
 .../launcher3/WorkspaceLayoutManager.java     |   6 +-
 .../launcher3/allapps/AllAppsGridAdapter.java |  94 ++---
 .../allapps/AllAppsRecyclerView.java          |  15 +-
 .../launcher3/allapps/DiscoveryBounce.java    |  10 +-
 .../search/AllAppsSearchBarController.java    |  40 --
 .../launcher3/anim/PendingAnimation.java      |  10 +-
 .../launcher3/dragndrop/AddItemActivity.java  |  30 +-
 .../launcher3/dragndrop/DragController.java   |   2 +
 src/com/android/launcher3/folder/Folder.java  |  34 +-
 .../android/launcher3/folder/FolderIcon.java  |   1 +
 .../graphics/LauncherPreviewRenderer.java     |   3 +-
 .../launcher3/logging/LoggerUtils.java        | 190 +++++++++
 .../launcher3/logging/StatsLogManager.java    |  74 ++--
 .../launcher3/logging/StatsLogUtils.java      |  49 +++
 .../logging/UserEventDispatcher.java          | 373 ++++++++++++++++++
 .../launcher3/model/data/FolderInfo.java      | 119 ++++++
 .../model/data/RemoteActionItemInfo.java      |  64 ---
 .../notification/NotificationMainView.java    |   7 +-
 .../launcher3/pm/InstallSessionHelper.java    |  51 +--
 .../launcher3/pm/InstallSessionTracker.java   |   3 -
 src/com/android/launcher3/pm/UserCache.java   |   6 +-
 .../android/launcher3/popup/ArrowPopup.java   |  58 +--
 .../popup/PopupContainerWithArrow.java        |   9 +-
 .../launcher3/popup/RemoteActionShortcut.java |   4 +
 .../launcher3/popup/SystemShortcut.java       |   6 +
 .../settings/DeveloperOptionsFragment.java    |   9 -
 .../android/launcher3/states/HintState.java   |   5 +-
 .../launcher3/states/SpringLoadedState.java   |   5 +-
 .../AbstractStateChangeTouchController.java   |  50 ++-
 .../touch/AllAppsSwipeController.java         |   7 +
 .../launcher3/touch/ItemClickHandler.java     |  24 --
 .../touch/LandscapePagedViewHandler.java      |   1 +
 .../touch/PagedOrientationHandler.java        |   1 +
 .../touch/PortraitPagedViewHandler.java       |   1 +
 src/com/android/launcher3/util/Executors.java |  27 --
 .../launcher3/views/FloatingIconView.java     |  88 +++--
 .../launcher3/views/HeroSearchResultView.java |  41 +-
 .../launcher3/views/OptionsPopupView.java     |   6 +-
 .../launcher3/views/SearchResultIconRow.java  | 155 --------
 .../views/SearchResultPeopleView.java         |  67 ++--
 .../launcher3/views/SearchResultPlayItem.java |   9 +-
 .../launcher3/views/SearchResultShortcut.java | 110 ++++++
 .../views/SearchResultSuggestRow.java         | 131 ------
 .../views/SearchSectionHeaderView.java        |   5 -
 .../views/SearchSettingsRowView.java          |   9 +-
 .../views/ThumbnailSearchResultView.java      | 114 ------
 .../systemui/plugins/AllAppsSearchPlugin.java |   8 +-
 .../systemui/plugins/shared/SearchTarget.java |  69 +---
 .../plugins/shared/SearchTargetEvent.java     |  10 +-
 .../uioverrides/states/AllAppsState.java      |   4 +-
 .../uioverrides/states/OverviewState.java     |   5 +-
 .../launcher3/ui/AbstractLauncherUiTest.java  |   2 -
 .../com/android/launcher3/ui/WorkTabTest.java |   7 +-
 138 files changed, 2136 insertions(+), 1945 deletions(-)
 create mode 100644 protos/launcher_log.proto
 delete mode 100644 quickstep/src/com/android/quickstep/interaction/RootSandboxLayout.java
 delete mode 100644 quickstep/src/com/android/quickstep/interaction/SandboxLauncherRenderer.java
 delete mode 100644 quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java
 delete mode 100644 quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialFragment.java
 delete mode 100644 quickstep/src/com/android/quickstep/util/CancellableTask.java
 delete mode 100644 res/layout/search_result_icon_row.xml
 create mode 100644 res/layout/search_result_shortcut.xml
 delete mode 100644 res/layout/search_result_suggest.xml
 delete mode 100644 res/layout/search_result_thumbnail.xml
 create mode 100644 src/com/android/launcher3/logging/LoggerUtils.java
 create mode 100644 src/com/android/launcher3/logging/StatsLogUtils.java
 create mode 100644 src/com/android/launcher3/logging/UserEventDispatcher.java
 delete mode 100644 src/com/android/launcher3/model/data/RemoteActionItemInfo.java
 delete mode 100644 src/com/android/launcher3/views/SearchResultIconRow.java
 create mode 100644 src/com/android/launcher3/views/SearchResultShortcut.java
 delete mode 100644 src/com/android/launcher3/views/SearchResultSuggestRow.java
 delete mode 100644 src/com/android/launcher3/views/ThumbnailSearchResultView.java

diff --git a/Android.mk b/Android.mk
index 349a134d75..25f5412d21 100644
--- a/Android.mk
+++ b/Android.mk
@@ -36,12 +36,18 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
     launcher_log_protos_lite
 
 LOCAL_SRC_FILES := \
+    $(call all-proto-files-under, protos) \
+    $(call all-proto-files-under, proto_overrides) \
     $(call all-java-files-under, src_build_config) \
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
 LOCAL_PROGUARD_ENABLED := disabled
 
+LOCAL_PROTOC_OPTIMIZE_TYPE := nano
+LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/ --proto_path=$(LOCAL_PATH)/proto_overrides/
+LOCAL_PROTO_JAVA_OUTPUT_PARAMS := enum_style=java
+
 LOCAL_SDK_VERSION := current
 LOCAL_MIN_SDK_VERSION := 26
 LOCAL_MODULE := Launcher3CommonDepsLib
@@ -129,6 +135,7 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_STATIC_JAVA_LIBRARIES := \
     SystemUI-statsd \
     SystemUISharedLib \
+    launcherprotosnano \
     launcher_log_protos_lite
 ifneq (,$(wildcard frameworks/base))
   LOCAL_PRIVATE_PLATFORM_APIS := true
@@ -196,6 +203,7 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_STATIC_JAVA_LIBRARIES := \
     SystemUI-statsd \
     SystemUISharedLib \
+    launcherprotosnano \
     launcher_log_protos_lite
 ifneq (,$(wildcard frameworks/base))
   LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/build.gradle b/build.gradle
index 28a05d569c..534ca65115 100644
--- a/build.gradle
+++ b/build.gradle
@@ -82,6 +82,7 @@ android {
             manifest.srcFile 'AndroidManifest-common.xml'
             proto {
                 srcDir 'protos/'
+                srcDir 'proto_overrides/'
             }
         }
 
@@ -149,6 +150,7 @@ dependencies {
     implementation "androidx.preference:preference:${ANDROID_X_VERSION}"
     implementation project(':IconLoader')
     withQuickstepImplementation project(':SharedLibWrapper')
+    implementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/libs", include: 'launcher_protos.jar')
 
     // Recents lib dependency
     withQuickstepImplementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/quickstep/libs", include: 'sysui_shared.jar')
@@ -169,16 +171,20 @@ dependencies {
 protobuf {
     // Configure the protoc executable
     protoc {
-        artifact = "com.google.protobuf:protoc:${protocVersion}"
-    }
-    generateProtoTasks {
-        all().each { task ->
-            task.builtins {
-                remove java
-                java {
-                    option "lite"
+        artifact = 'com.google.protobuf:protoc:3.0.0'
+
+        generateProtoTasks {
+            all().each { task ->
+                task.builtins {
+                    remove java
+                    javanano {
+                        option "java_package=launcher_log_extension.proto|com.android.launcher3.userevent.nano"
+                        option "java_package=launcher_log.proto|com.android.launcher3.userevent.nano"
+                        option "java_package=launcher_dump.proto|com.android.launcher3.model.nano"
+                        option "enum_style=java"
+                    }
                 }
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/protos/launcher_log.proto b/protos/launcher_log.proto
new file mode 100644
index 0000000000..9423cb2642
--- /dev/null
+++ b/protos/launcher_log.proto
@@ -0,0 +1,245 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+syntax = "proto2";
+
+import "launcher_log_extension.proto";
+
+option java_package = "com.android.launcher3.userevent";
+option java_outer_classname = "LauncherLogProto";
+
+package userevent;
+
+message Target {
+  enum Type {
+    NONE = 0;
+    ITEM = 1;
+    CONTROL = 2;
+    CONTAINER = 3;
+  }
+
+  optional Type type = 1;
+
+  // For container type and item type
+  // Used mainly for ContainerType.FOLDER, ItemType.*
+  optional int32 page_index = 2;
+  optional int32 rank = 3;
+  optional int32 grid_x = 4;
+  optional int32 grid_y = 5;
+
+  // For container types only
+  optional ContainerType container_type = 6;
+  optional int32 cardinality = 7;
+
+  // For control types only
+  optional ControlType control_type = 8;
+
+  // For item types only
+  optional ItemType item_type = 9;
+  optional int32 package_name_hash = 10;
+  optional int32 component_hash = 11;      // Used for ItemType.WIDGET
+  optional int32 intent_hash = 12;         // Used for ItemType.SHORTCUT
+  optional int32 span_x = 13 [default = 1];// Used for ItemType.WIDGET
+  optional int32 span_y = 14 [default = 1];// Used for ItemType.WIDGET
+  optional int32 predictedRank = 15;
+  optional TargetExtension extension = 16;
+  optional TipType tip_type = 17;
+  optional int32 search_query_length = 18;
+  optional bool is_work_app = 19;
+  optional FromFolderLabelState from_folder_label_state = 20;
+  optional ToFolderLabelState to_folder_label_state = 21;
+
+  // Note: proto does not support duplicate enum values, even if they belong to different enum type.
+  // Hence "FROM" and "TO" prefix added.
+  enum FromFolderLabelState {
+    FROM_FOLDER_LABEL_STATE_UNSPECIFIED = 0;
+    FROM_EMPTY = 1;
+    FROM_CUSTOM = 2;
+    FROM_SUGGESTED = 3;
+  }
+
+  enum ToFolderLabelState {
+    TO_FOLDER_LABEL_STATE_UNSPECIFIED = 0;
+    TO_SUGGESTION0_WITH_VALID_PRIMARY = 1;
+    TO_SUGGESTION1_WITH_VALID_PRIMARY = 2;
+    TO_SUGGESTION1_WITH_EMPTY_PRIMARY = 3;
+    TO_SUGGESTION2_WITH_VALID_PRIMARY = 4;
+    TO_SUGGESTION2_WITH_EMPTY_PRIMARY = 5;
+    TO_SUGGESTION3_WITH_VALID_PRIMARY = 6;
+    TO_SUGGESTION3_WITH_EMPTY_PRIMARY = 7;
+    TO_EMPTY_WITH_VALID_SUGGESTIONS = 8 [deprecated = true];
+    TO_EMPTY_WITH_VALID_PRIMARY = 15;
+    TO_EMPTY_WITH_VALID_SUGGESTIONS_AND_EMPTY_PRIMARY = 16;
+    TO_EMPTY_WITH_EMPTY_SUGGESTIONS = 9;
+    TO_EMPTY_WITH_SUGGESTIONS_DISABLED = 10;
+    TO_CUSTOM_WITH_VALID_SUGGESTIONS = 11 [deprecated = true];
+    TO_CUSTOM_WITH_VALID_PRIMARY = 17;
+    TO_CUSTOM_WITH_VALID_SUGGESTIONS_AND_EMPTY_PRIMARY = 18;
+    TO_CUSTOM_WITH_EMPTY_SUGGESTIONS = 12;
+    TO_CUSTOM_WITH_SUGGESTIONS_DISABLED = 13;
+    UNCHANGED = 14;
+  }
+}
+
+// Used to define what type of item a Target would represent.
+enum ItemType {
+  DEFAULT_ITEMTYPE = 0;
+  APP_ICON = 1;
+  SHORTCUT = 2;
+  WIDGET = 3;
+  FOLDER_ICON = 4;
+  DEEPSHORTCUT = 5;
+  SEARCHBOX = 6;
+  EDITTEXT = 7;
+  NOTIFICATION = 8;
+  TASK = 9;         // Each page of Recents UI (QuickStep)
+  WEB_APP = 10;
+  TASK_ICON = 11;
+}
+
+// Used to define what type of container a Target would represent.
+enum ContainerType {
+  DEFAULT_CONTAINERTYPE = 0;
+  WORKSPACE = 1;
+  HOTSEAT = 2;
+  FOLDER = 3;
+  ALLAPPS = 4;
+  WIDGETS = 5;
+  OVERVIEW = 6;   // Zoomed out workspace (without QuickStep)
+  PREDICTION = 7;
+  SEARCHRESULT = 8;
+  DEEPSHORTCUTS = 9;
+  PINITEM = 10;    // confirmation screen
+  NAVBAR = 11;
+  TASKSWITCHER = 12; // Recents UI Container (QuickStep)
+  APP = 13; // Foreground activity is another app (QuickStep)
+  TIP = 14; // Onboarding texts (QuickStep)
+  OTHER_LAUNCHER_APP = 15;
+}
+
+// Used to define what type of control a Target would represent.
+enum ControlType {
+  DEFAULT_CONTROLTYPE = 0;
+  ALL_APPS_BUTTON = 1;
+  WIDGETS_BUTTON = 2;
+  WALLPAPER_BUTTON = 3;
+  SETTINGS_BUTTON = 4;
+  REMOVE_TARGET = 5;
+  UNINSTALL_TARGET = 6;
+  APPINFO_TARGET = 7;
+  RESIZE_HANDLE = 8;
+  VERTICAL_SCROLL = 9;
+  HOME_INTENT = 10; // Deprecated, use enum Command instead
+  BACK_BUTTON = 11;
+  QUICK_SCRUB_BUTTON = 12;
+  CLEAR_ALL_BUTTON = 13;
+  CANCEL_TARGET = 14;
+  TASK_PREVIEW = 15;
+  SPLIT_SCREEN_TARGET = 16;
+  REMOTE_ACTION_SHORTCUT = 17;
+  APP_USAGE_SETTINGS = 18;
+  BACK_GESTURE = 19;
+  UNDO = 20;
+  DISMISS_PREDICTION = 21;
+  HYBRID_HOTSEAT_ACCEPTED = 22;
+  HYBRID_HOTSEAT_CANCELED = 23;
+  OVERVIEW_ACTIONS_SHARE_BUTTON = 24;
+  OVERVIEW_ACTIONS_SCREENSHOT_BUTTON = 25;
+  OVERVIEW_ACTIONS_SELECT_BUTTON = 26;
+  SELECT_MODE_CLOSE_BUTTON = 27;
+  SELECT_MODE_ITEM = 28;
+}
+
+enum TipType {
+  DEFAULT_NONE = 0;
+  BOUNCE = 1;
+  SWIPE_UP_TEXT = 2;
+  QUICK_SCRUB_TEXT = 3;
+  PREDICTION_TEXT = 4;
+  DWB_TOAST = 5;
+  HYBRID_HOTSEAT = 6;
+}
+
+// Used to define the action component of the LauncherEvent.
+message Action {
+  enum Type {
+    TOUCH = 0;
+    AUTOMATED = 1;
+    COMMAND = 2;
+    TIP = 3;
+    SOFT_KEYBOARD = 4;
+    // HARD_KEYBOARD, ASSIST
+  }
+
+  enum Touch {
+    TAP = 0;
+    LONGPRESS = 1;
+    DRAGDROP = 2;
+    SWIPE = 3;
+    FLING = 4;
+    PINCH = 5;
+    SWIPE_NOOP = 6;
+  }
+
+  enum Direction {
+    NONE = 0;
+    UP = 1;
+    DOWN = 2;
+    LEFT = 3;
+    RIGHT = 4;
+    UPRIGHT = 5;
+    UPLEFT = 6;
+  }
+  enum Command {
+    HOME_INTENT = 0;
+    BACK = 1;
+    ENTRY = 2;          // Indicates entry to one of Launcher container type target
+                        // not using the HOME_INTENT
+    CANCEL = 3;         // Indicates that a confirmation screen was cancelled
+    CONFIRM = 4;        // Indicates thata confirmation screen was accepted
+    STOP = 5;           // Indicates onStop() was called (screen time out, power off)
+    RECENTS_BUTTON = 6; // Indicates that Recents button was pressed
+    RESUME = 7;         // Indicates onResume() was called
+  }
+
+  optional Type type = 1;
+  optional Touch touch = 2;
+  optional Direction dir = 3;
+  optional Command command = 4;
+  // Log if the action was performed on outside of the container
+  optional bool is_outside = 5;
+  optional bool is_state_change = 6;
+}
+
+//
+// Context free grammar of typical user interaction:
+//         Action (Touch) + Target
+//         Action (Touch) + Target + Target
+//
+message LauncherEvent {
+  required Action action = 1;
+  // List of targets that touch actions can be operated on.
+  repeated Target src_target = 2;
+  repeated Target dest_target = 3;
+
+  optional int64 action_duration_millis = 4;
+  optional int64 elapsed_container_millis = 5;
+  optional int64 elapsed_session_millis = 6;
+
+  optional bool is_in_multi_window_mode = 7 [deprecated = true];
+  optional bool is_in_landscape_mode = 8 [deprecated = true];
+
+  optional LauncherEventExtension extension = 9;
+}
diff --git a/quickstep/res/layout/gesture_tutorial_fragment.xml b/quickstep/res/layout/gesture_tutorial_fragment.xml
index 52475dfc8a..43bf0ea966 100644
--- a/quickstep/res/layout/gesture_tutorial_fragment.xml
+++ b/quickstep/res/layout/gesture_tutorial_fragment.xml
@@ -13,8 +13,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<com.android.quickstep.interaction.RootSandboxLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?android:attr/colorBackground">
@@ -94,11 +93,11 @@
         style="@style/TextAppearance.GestureTutorial.Feedback"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/gesture_tutorial_fragment_titles_container"
+        android:layout_above="@id/gesture_tutorial_fragment_action_button"
         android:layout_centerHorizontal="true"
         android:layout_marginStart="@dimen/gesture_tutorial_feedback_margin_start_end"
         android:layout_marginEnd="@dimen/gesture_tutorial_feedback_margin_start_end"
-        android:layout_marginTop="40dp"/>
+        android:layout_marginBottom="10dp"/>
 
     <!-- android:stateListAnimator="@null" removes shadow and normal on click behavior (increase
          of elevation and shadow) which is replaced by ripple effect in android:foreground -->
@@ -127,4 +126,4 @@
         android:background="@null"
         android:foreground="?android:attr/selectableItemBackgroundBorderless"
         android:stateListAnimator="@null"/>
-</com.android.quickstep.interaction.RootSandboxLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml
index 4b45b10d4d..86120e3b97 100644
--- a/quickstep/res/values/strings.xml
+++ b/quickstep/res/values/strings.xml
@@ -149,21 +149,6 @@
     <!-- Feedback shown during interactive parts of Assistant gesture tutorial when the gesture doesn't go far enough. [CHAR LIMIT=100] -->
     <string name="assistant_gesture_feedback_swipe_not_long_enough" translatable="false">Try swiping further</string>
 
-    <!-- Title shown in sandbox mode part of gesture tutorial. [CHAR LIMIT=30] -->
-    <string name="sandbox_mode_title" translatable="false">Sandbox Mode</string>
-    <!-- Subtitle shown in sandbox mode part of gesture tutorial. [CHAR LIMIT=60] -->
-    <string name="sandbox_mode_subtitle" translatable="false">Try any navigation gesture</string>
-    <!-- Feedback shown in sandbox mode when the back gesture is successfully issued. [CHAR LIMIT=60] -->
-    <string name="sandbox_mode_back_gesture_feedback_successful" translatable="false">Back gesture successful</string>
-    <!-- Feedback shown in sandbox mode when the assistant gesture is a successfully issued. [CHAR LIMIT=60] -->
-    <string name="sandbox_mode_assistant_gesture_feedback_successful" translatable="false">Assistant gesture successful</string>
-    <!-- Feedback shown in sandbox mode when the home gesture is a successfully issued. [CHAR LIMIT=60] -->
-    <string name="sandbox_mode_home_gesture_feedback_successful" translatable="false">Home gesture successful</string>
-    <!-- Feedback shown in sandbox mode when the overview gesture is a successfully issued. [CHAR LIMIT=60] -->
-    <string name="sandbox_mode_overview_gesture_feedback_successful" translatable="false">Overview gesture successful</string>
-    <!-- Feedback shown in sandbox mode when the back gesture swipe is too far from the edge. [CHAR LIMIT=60] -->
-    <string name="sandbox_mode_back_gesture_feedback_swipe_too_far_from_edge" translatable="false">Make sure you swipe from the left/right edge of the screen</string>
-
     <!-- Title shown on the confirmation screen after successful gesture. [CHAR LIMIT=30] -->
     <string name="gesture_tutorial_confirm_title" translatable="false">All set</string>
     <!-- Button text shown on a button on the confirm screen to leave the tutorial. [CHAR LIMIT=14] -->
diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 54c2383be9..68111d2632 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -22,8 +22,6 @@ import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY;
 
-import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
-
 import android.animation.AnimatorSet;
 import android.animation.ValueAnimator;
 import android.content.Intent;
@@ -309,10 +307,4 @@ public abstract class BaseQuickstepLauncher extends Launcher
     public void setHintUserWillBeActive() {
         addActivityFlags(ACTIVITY_STATE_USER_WILL_BE_ACTIVE);
     }
-
-    @Override
-    public void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        InteractionJankMonitorWrapper.init(getWindow().getDecorView());
-    }
 }
diff --git a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
index 5c8463c2a7..b35b33c418 100644
--- a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
+++ b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
@@ -34,7 +34,8 @@ import com.android.systemui.shared.system.RemoteAnimationRunnerCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
 @TargetApi(Build.VERSION_CODES.P)
-public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCompat {
+public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCompat,
+        WrappedAnimationRunnerImpl {
 
     private static final String TAG = "LauncherAnimationRunner";
 
diff --git a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
index 057c0f4aaa..b53e834db4 100644
--- a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
@@ -66,7 +66,6 @@ import androidx.annotation.Nullable;
 
 import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
 import com.android.launcher3.allapps.AllAppsTransitionController;
-import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.shortcuts.DeepShortcutView;
@@ -82,7 +81,6 @@ import com.android.quickstep.util.StaggeredWorkspaceAnim;
 import com.android.quickstep.util.SurfaceTransactionApplier;
 import com.android.systemui.shared.system.ActivityCompat;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
-import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
 import com.android.systemui.shared.system.QuickStepContract;
 import com.android.systemui.shared.system.RemoteAnimationAdapterCompat;
 import com.android.systemui.shared.system.RemoteAnimationDefinitionCompat;
@@ -797,36 +795,6 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                 == PackageManager.PERMISSION_GRANTED;
     }
 
-    private void addCujInstrumentation(Animator anim, int cuj, String transition) {
-        if (Trace.isEnabled()) {
-            anim.addListener(new AnimationSuccessListener() {
-                @Override
-                public void onAnimationStart(Animator animation) {
-                    Trace.beginAsyncSection(transition, 0);
-                    InteractionJankMonitorWrapper.begin(cuj);
-                    super.onAnimationStart(animation);
-                }
-
-                @Override
-                public void onAnimationCancel(Animator animation) {
-                    super.onAnimationCancel(animation);
-                    InteractionJankMonitorWrapper.cancel(cuj);
-                }
-
-                @Override
-                public void onAnimationSuccess(Animator animator) {
-                    InteractionJankMonitorWrapper.end(cuj);
-                }
-
-                @Override
-                public void onAnimationEnd(Animator animation) {
-                    super.onAnimationEnd(animation);
-                    Trace.endAsyncSection(TRANSITION_OPEN_LAUNCHER, 0);
-                }
-            });
-        }
-    }
-
     /**
      * Remote animation runner for animation from the app to Launcher, including recents.
      */
@@ -891,9 +859,21 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                 // is initialized.
                 if (launcherIsATargetWithMode(appTargets, MODE_OPENING)
                         || mLauncher.isForceInvisible()) {
-                    addCujInstrumentation(
-                            anim, InteractionJankMonitorWrapper.CUJ_APP_CLOSE_TO_HOME,
-                            TRANSITION_OPEN_LAUNCHER);
+                    if (Trace.isEnabled()) {
+                        anim.addListener(new AnimatorListenerAdapter() {
+                            @Override
+                            public void onAnimationStart(Animator animation) {
+                                Trace.beginAsyncSection(TRANSITION_OPEN_LAUNCHER, 0);
+                                super.onAnimationStart(animation);
+                            }
+
+                            @Override
+                            public void onAnimationEnd(Animator animation) {
+                                super.onAnimationEnd(animation);
+                                Trace.endAsyncSection(TRANSITION_OPEN_LAUNCHER, 0);
+                            }
+                        });
+                    }
                     // Only register the content animation for cancellation when state changes
                     mLauncher.getStateManager().setCurrentAnimation(anim);
 
@@ -962,12 +942,25 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                         launcherClosing);
             }
 
-            addCujInstrumentation(anim,
-                    launchingFromRecents
-                            ? InteractionJankMonitorWrapper.CUJ_APP_LAUNCH_FROM_RECENTS
-                            : InteractionJankMonitorWrapper.CUJ_APP_LAUNCH_FROM_ICON,
-                    launchingFromRecents
-                            ? TRANSITION_LAUNCH_FROM_RECENTS : TRANSITION_LAUNCH_FROM_ICON);
+            if (Trace.isEnabled()) {
+                final String section =
+                        launchingFromRecents
+                                ? TRANSITION_LAUNCH_FROM_RECENTS : TRANSITION_LAUNCH_FROM_ICON;
+
+                anim.addListener(new AnimatorListenerAdapter() {
+                    @Override
+                    public void onAnimationStart(Animator animation) {
+                        Trace.beginAsyncSection(section, 0);
+                        super.onAnimationStart(animation);
+                    }
+
+                    @Override
+                    public void onAnimationEnd(Animator animation) {
+                        super.onAnimationEnd(animation);
+                        Trace.endAsyncSection(section, 0);
+                    }
+                });
+            }
 
             if (launcherClosing) {
                 anim.addListener(mForceInvisibleListener);
diff --git a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
index 5b066c6be6..d3c4c3d62d 100644
--- a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
+++ b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
@@ -16,8 +16,11 @@
 
 package com.android.launcher3.appprediction;
 
+import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
+import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
+import static com.android.launcher3.logging.LoggerUtils.newTarget;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -40,6 +43,7 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsSectionDecorator;
 import com.android.launcher3.allapps.FloatingHeaderRow;
@@ -49,11 +53,13 @@ import com.android.launcher3.anim.PropertySetter;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.keyboard.FocusIndicatorHelper;
 import com.android.launcher3.keyboard.FocusIndicatorHelper.SimpleFocusIndicatorHelper;
+import com.android.launcher3.logging.StatsLogUtils.LogContainerProvider;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.touch.ItemClickHandler;
 import com.android.launcher3.touch.ItemLongClickListener;
+import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.launcher3.util.Themes;
 import com.android.quickstep.AnimatedFloat;
 
@@ -62,7 +68,7 @@ import java.util.List;
 
 @TargetApi(Build.VERSION_CODES.P)
 public class PredictionRowView extends LinearLayout implements
-        OnDeviceProfileChangeListener, FloatingHeaderRow {
+        LogContainerProvider, OnDeviceProfileChangeListener, FloatingHeaderRow {
 
     private static final IntProperty<PredictionRowView> TEXT_ALPHA =
             new IntProperty<PredictionRowView>("textAlpha") {
@@ -265,6 +271,29 @@ public class PredictionRowView extends LinearLayout implements
         mParent.onHeightUpdated();
     }
 
+    @Override
+    public void fillInLogContainerData(ItemInfo childInfo, LauncherLogProto.Target child,
+            ArrayList<LauncherLogProto.Target> parents) {
+        for (int i = 0; i < mPredictedApps.size(); i++) {
+            ItemInfoWithIcon appInfo = mPredictedApps.get(i);
+            if (appInfo == childInfo) {
+                child.predictedRank = i;
+                break;
+            }
+        }
+        parents.add(newContainerTarget(LauncherLogProto.ContainerType.PREDICTION));
+
+        // include where the prediction is coming this used to be Launcher#modifyUserEvent
+        LauncherLogProto.Target parent = newTarget(LauncherLogProto.Target.Type.CONTAINER);
+        LauncherState state = mLauncher.getStateManager().getState();
+        if (state == LauncherState.ALL_APPS) {
+            parent.containerType = LauncherLogProto.ContainerType.ALLAPPS;
+        } else if (state == OVERVIEW) {
+            parent.containerType = LauncherLogProto.ContainerType.TASKSWITCHER;
+        }
+        parents.add(parent);
+    }
+
     public void setTextAlpha(int textAlpha) {
         mIconLastSetTextAlpha = textAlpha;
         if (getAlpha() < 1 && textAlpha > 0) {
diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
index 380735044d..151a113d1e 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
@@ -55,6 +55,7 @@ import com.android.launcher3.popup.SystemShortcut;
 import com.android.launcher3.touch.ItemLongClickListener;
 import com.android.launcher3.uioverrides.PredictedAppIcon;
 import com.android.launcher3.uioverrides.QuickstepLauncher;
+import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.launcher3.util.OnboardingPrefs;
 import com.android.launcher3.views.ArrowTipView;
 import com.android.launcher3.views.Snackbar;
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
index a2e3bdf8a0..bce73cd4e4 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
@@ -16,7 +16,6 @@
 package com.android.launcher3.uioverrides.states;
 
 import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
-import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_ALLAPPS;
 import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
 
 import android.content.Context;
@@ -24,6 +23,7 @@ import android.content.Context;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.allapps.AllAppsContainerView;
+import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 
 /**
  * Definition for AllApps state
@@ -40,7 +40,7 @@ public class AllAppsState extends LauncherState {
     };
 
     public AllAppsState(int id) {
-        super(id, LAUNCHER_STATE_ALLAPPS, STATE_FLAGS);
+        super(id, ContainerType.ALLAPPS, STATE_FLAGS);
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
index 4b4f955204..8ff05f2aaa 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
@@ -15,13 +15,12 @@
  */
 package com.android.launcher3.uioverrides.states;
 
-import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
-
 import android.content.Context;
 
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.allapps.AllAppsTransitionController;
+import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.quickstep.util.LayoutUtils;
 import com.android.quickstep.views.RecentsView;
 
@@ -34,7 +33,7 @@ public class BackgroundAppState extends OverviewState {
             | FLAG_WORKSPACE_INACCESSIBLE | FLAG_NON_INTERACTIVE | FLAG_CLOSE_POPUPS;
 
     public BackgroundAppState(int id) {
-        this(id, LAUNCHER_STATE_BACKGROUND);
+        this(id, LauncherLogProto.ContainerType.TASKSWITCHER);
     }
 
     protected BackgroundAppState(int id, int logContainer) {
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java
index 41c689d16d..fc0dcd5119 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java
@@ -15,14 +15,13 @@
  */
 package com.android.launcher3.uioverrides.states;
 
-import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW;
-
 import android.content.Context;
 import android.graphics.Rect;
 
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
+import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.quickstep.views.RecentsView;
 
 /**
@@ -35,7 +34,7 @@ public class OverviewModalTaskState extends OverviewState {
             FLAG_DISABLE_RESTORE | FLAG_OVERVIEW_UI | FLAG_WORKSPACE_INACCESSIBLE;
 
     public OverviewModalTaskState(int id) {
-        super(id, LAUNCHER_STATE_OVERVIEW, STATE_FLAGS);
+        super(id, ContainerType.OVERVIEW, STATE_FLAGS);
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
index 525ff5816d..bbe7821864 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -16,7 +16,6 @@
 package com.android.launcher3.uioverrides.states;
 
 import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
-import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW;
 import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
 import static com.android.quickstep.SysUINavigationMode.hideShelfInTwoButtonLandscape;
 import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
@@ -30,6 +29,7 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.Workspace;
+import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.util.LayoutUtils;
 import com.android.quickstep.views.RecentsView;
@@ -51,7 +51,7 @@ public class OverviewState extends LauncherState {
     }
 
     protected OverviewState(int id, int stateFlags) {
-        this(id, LAUNCHER_STATE_OVERVIEW, stateFlags);
+        this(id, ContainerType.TASKSWITCHER, stateFlags);
     }
 
     protected OverviewState(int id, int logContainer, int stateFlags) {
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java
index 51e72dacdc..2c7373e206 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java
@@ -15,9 +15,8 @@
  */
 package com.android.launcher3.uioverrides.states;
 
-import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
-
 import com.android.launcher3.Launcher;
+import com.android.launcher3.userevent.nano.LauncherLogProto;
 
 /**
  * State to indicate we are about to launch a recent task. Note that this state is only used when
@@ -27,7 +26,7 @@ import com.android.launcher3.Launcher;
 public class QuickSwitchState extends BackgroundAppState {
 
     public QuickSwitchState(int id) {
-        super(id, LAUNCHER_STATE_BACKGROUND);
+        super(id, LauncherLogProto.ContainerType.APP);
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeEdgeSwipeController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeEdgeSwipeController.java
index 7a0f634b45..bef191ef8f 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeEdgeSwipeController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeEdgeSwipeController.java
@@ -12,6 +12,8 @@ import com.android.launcher3.LauncherState;
 import com.android.launcher3.states.StateAnimationConfig.AnimationFlags;
 import com.android.launcher3.touch.AbstractStateChangeTouchController;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
+import com.android.launcher3.userevent.nano.LauncherLogProto;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
 import com.android.quickstep.SystemUiProxy;
 
 /**
@@ -43,6 +45,11 @@ public class LandscapeEdgeSwipeController extends AbstractStateChangeTouchContro
         return draggingFromNav ? OVERVIEW : NORMAL;
     }
 
+    @Override
+    protected int getLogContainerTypeForNormalState(MotionEvent ev) {
+        return LauncherLogProto.ContainerType.NAVBAR;
+    }
+
     @Override
     protected float getShiftRange() {
         return mLauncher.getDragLayer().getWidth();
@@ -58,8 +65,13 @@ public class LandscapeEdgeSwipeController extends AbstractStateChangeTouchContro
     }
 
     @Override
-    protected void onSwipeInteractionCompleted(LauncherState targetState) {
-        super.onSwipeInteractionCompleted(targetState);
+    protected int getDirectionForLog() {
+        return mLauncher.getDeviceProfile().isSeascape() ? Direction.RIGHT : Direction.LEFT;
+    }
+
+    @Override
+    protected void onSwipeInteractionCompleted(LauncherState targetState, int logAction) {
+        super.onSwipeInteractionCompleted(targetState, logAction);
         if (mStartState == NORMAL && targetState == OVERVIEW) {
             SystemUiProxy.INSTANCE.get(mLauncher).onOverviewShown(true, TAG);
         }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
index d210bc6851..76168440a8 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
@@ -45,9 +45,12 @@ import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.compat.AccessibilityManagerCompat;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.graphics.OverviewScrim;
+import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
+import com.android.launcher3.userevent.nano.LauncherLogProto;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
 import com.android.launcher3.util.TouchController;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
 import com.android.quickstep.util.AssistantUtilities;
@@ -208,6 +211,7 @@ public class NavBarToHomeTouchController implements TouchController,
     @Override
     public void onDragEnd(float velocity) {
         boolean fling = mSwipeDetector.isFling(velocity);
+        final int logAction = fling ? Touch.FLING : Touch.SWIPE;
         float progress = mCurrentAnimation.getProgressFraction();
         float interpolatedProgress = PULLBACK_INTERPOLATOR.getInterpolation(progress);
         boolean success = interpolatedProgress >= SUCCESS_TRANSITION_PROGRESS
@@ -226,7 +230,7 @@ public class NavBarToHomeTouchController implements TouchController,
                         () -> onSwipeInteractionCompleted(mEndState));
             }
             if (mStartState != mEndState) {
-                logHomeGesture();
+                // TODO: add to WW log
             }
             AbstractFloatingView topOpenView = AbstractFloatingView.getTopOpenView(mLauncher);
             if (topOpenView != null) {
@@ -251,10 +255,17 @@ public class NavBarToHomeTouchController implements TouchController,
         AccessibilityManagerCompat.sendStateEventToTest(mLauncher, targetState.ordinal);
     }
 
-    private void logHomeGesture() {
+    private void logStateChange(int startContainerType, int logAction) {
+        mLauncher.getUserEventDispatcher().logStateChangeAction(logAction,
+                LauncherLogProto.Action.Direction.UP,
+                mSwipeDetector.getDownX(), mSwipeDetector.getDownY(),
+                LauncherLogProto.ContainerType.NAVBAR,
+                startContainerType,
+                mEndState.containerType,
+                mLauncher.getWorkspace().getCurrentPage());
         mLauncher.getStatsLogManager().logger()
-                .withSrcState(mStartState.statsLogOrdinal)
-                .withDstState(mEndState.statsLogOrdinal)
+                .withSrcState(StatsLogManager.containerTypeToAtomState(mStartState.containerType))
+                .withDstState(StatsLogManager.containerTypeToAtomState(mEndState.containerType))
                 .log(LAUNCHER_HOME_GESTURE);
     }
 }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
index 2a3bdbfcb8..c78d4741d8 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -49,6 +49,7 @@ import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.graphics.OverviewScrim;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.testing.TestProtocol;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
 import com.android.launcher3.util.VibratorWrapper;
 import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
@@ -206,7 +207,7 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
 
     private void maybeSwipeInteractionToOverviewComplete() {
         if (mReachedOverview && mDetector.isSettlingState()) {
-            onSwipeInteractionCompleted(OVERVIEW);
+            onSwipeInteractionCompleted(OVERVIEW, Touch.SWIPE);
         }
     }
 
@@ -250,7 +251,7 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
     private void goToOverviewOrHomeOnDragEnd(float velocity) {
         boolean goToHomeInsteadOfOverview = !mMotionPauseDetector.isPaused();
         if (goToHomeInsteadOfOverview) {
-            new OverviewToHomeAnim(mLauncher, ()-> onSwipeInteractionCompleted(NORMAL))
+            new OverviewToHomeAnim(mLauncher, ()-> onSwipeInteractionCompleted(NORMAL, Touch.FLING))
                     .animateWithVelocity(velocity);
         }
         if (mReachedOverview) {
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
index f378848a71..a6a3497f04 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
@@ -57,9 +57,13 @@ import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.graphics.OverviewScrim;
+import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.touch.BaseSwipeDetector;
 import com.android.launcher3.touch.BothAxesSwipeDetector;
+import com.android.launcher3.userevent.nano.LauncherLogProto;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
 import com.android.launcher3.util.TouchController;
 import com.android.launcher3.util.VibratorWrapper;
 import com.android.quickstep.AnimatedFloat;
@@ -283,6 +287,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
         boolean horizontalFling = mSwipeDetector.isFling(velocity.x);
         boolean verticalFling = mSwipeDetector.isFling(velocity.y);
         boolean noFling = !horizontalFling && !verticalFling;
+        int logAction = noFling ? Touch.SWIPE : Touch.FLING;
         if (mMotionPauseDetector.isPaused() && noFling) {
             cancelAnimations();
 
@@ -293,7 +298,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
             overviewAnim.addListener(new AnimatorListenerAdapter() {
                 @Override
                 public void onAnimationEnd(Animator animation) {
-                    onAnimationToStateCompleted(OVERVIEW);
+                    onAnimationToStateCompleted(OVERVIEW, logAction);
                 }
             });
             overviewAnim.start();
@@ -388,7 +393,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
         }
 
         nonOverviewAnim.setDuration(Math.max(xDuration, yDuration));
-        mNonOverviewAnim.setEndAction(() -> onAnimationToStateCompleted(targetState));
+        mNonOverviewAnim.setEndAction(() -> onAnimationToStateCompleted(targetState, logAction));
 
         cancelAnimations();
         xOverviewAnim.start();
@@ -396,17 +401,27 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
         nonOverviewAnim.start();
     }
 
-    private void onAnimationToStateCompleted(LauncherState targetState) {
+    private void onAnimationToStateCompleted(LauncherState targetState, int logAction) {
+        mLauncher.getUserEventDispatcher().logStateChangeAction(logAction,
+                getDirectionForLog(), mSwipeDetector.getDownX(), mSwipeDetector.getDownY(),
+                LauncherLogProto.ContainerType.NAVBAR,
+                mStartState.containerType,
+                targetState.containerType,
+                mLauncher.getWorkspace().getCurrentPage());
         mLauncher.getStatsLogManager().logger()
                 .withSrcState(LAUNCHER_STATE_HOME)
-                .withDstState(targetState.statsLogOrdinal)
-                .log(getLauncherAtomEvent(mStartState.statsLogOrdinal, targetState.statsLogOrdinal,
+                .withDstState(StatsLogManager.containerTypeToAtomState(targetState.containerType))
+                .log(getLauncherAtomEvent(mStartState.containerType, targetState.containerType,
                         targetState.ordinal > mStartState.ordinal
                                 ? LAUNCHER_UNKNOWN_SWIPEUP
                                 : LAUNCHER_UNKNOWN_SWIPEDOWN));
         mLauncher.getStateManager().goToState(targetState, false, this::clearState);
     }
 
+    private int getDirectionForLog() {
+        return Utilities.isRtl(mLauncher.getResources()) ? Direction.LEFT : Direction.RIGHT;
+    }
+
     private void cancelAnimations() {
         if (mNonOverviewAnim != null) {
             mNonOverviewAnim.getAnimationPlayer().cancel();
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java
index 45e5e2fb7c..90911684ec 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java
@@ -25,6 +25,7 @@ import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.quickstep.TouchInteractionService;
 import com.android.quickstep.views.RecentsView;
 
@@ -72,4 +73,9 @@ public class OverviewToAllAppsTouchController extends PortraitStatesTouchControl
         }
         return fromState;
     }
+
+    @Override
+    protected int getLogContainerTypeForNormalState(MotionEvent ev) {
+        return LauncherLogProto.ContainerType.WORKSPACE;
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
index 037d9889fd..059a703075 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
@@ -48,6 +48,8 @@ import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.AbstractStateChangeTouchController;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
 import com.android.launcher3.uioverrides.states.OverviewState;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
+import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.TouchInteractionService;
 import com.android.quickstep.util.LayoutUtils;
@@ -170,6 +172,11 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
         return fromState;
     }
 
+    @Override
+    protected int getLogContainerTypeForNormalState(MotionEvent ev) {
+        return isTouchOverHotseat(mLauncher, ev) ? ContainerType.HOTSEAT : ContainerType.WORKSPACE;
+    }
+
     private StateAnimationConfig getNormalToOverviewAnimation() {
         mAllAppsInterpolatorWrapper.baseInterpolator = LINEAR;
 
@@ -278,7 +285,7 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
 
     private void cancelPendingAnim() {
         if (mPendingAnimation != null) {
-            mPendingAnimation.finish(false);
+            mPendingAnimation.finish(false, Touch.SWIPE);
             mPendingAnimation = null;
         }
     }
@@ -313,8 +320,8 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
     }
 
     @Override
-    protected void onSwipeInteractionCompleted(LauncherState targetState) {
-        super.onSwipeInteractionCompleted(targetState);
+    protected void onSwipeInteractionCompleted(LauncherState targetState, int logAction) {
+        super.onSwipeInteractionCompleted(targetState, logAction);
         if (mStartState == NORMAL && targetState == OVERVIEW) {
             SystemUiProxy.INSTANCE.get(mLauncher).onOverviewShown(true, TAG);
         }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
index b8c2030852..c643858e5c 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
@@ -21,7 +21,6 @@ import static com.android.launcher3.anim.Interpolators.ACCEL_2;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
 import static com.android.launcher3.anim.Interpolators.INSTANT;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
-import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE;
@@ -42,6 +41,8 @@ import com.android.launcher3.Utilities;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.touch.AbstractStateChangeTouchController;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
+import com.android.launcher3.userevent.nano.LauncherLogProto;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.SystemUiProxy;
@@ -91,14 +92,14 @@ public class QuickSwitchTouchController extends AbstractStateChangeTouchControll
     @Override
     public void onDragStart(boolean start, float startDisplacement) {
         super.onDragStart(start, startDisplacement);
-        mStartContainerType = LAUNCHER_STATE_BACKGROUND;
+        mStartContainerType = LauncherLogProto.ContainerType.NAVBAR;
         ActivityManagerWrapper.getInstance()
                 .closeSystemWindows(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
     }
 
     @Override
-    protected void onSwipeInteractionCompleted(LauncherState targetState) {
-        super.onSwipeInteractionCompleted(targetState);
+    protected void onSwipeInteractionCompleted(LauncherState targetState, int logAction) {
+        super.onSwipeInteractionCompleted(targetState, logAction);
     }
 
     @Override
@@ -152,4 +153,14 @@ public class QuickSwitchTouchController extends AbstractStateChangeTouchControll
     protected float getShiftRange() {
         return mLauncher.getDeviceProfile().widthPx / 2f;
     }
+
+    @Override
+    protected int getLogContainerTypeForNormalState(MotionEvent ev) {
+        return LauncherLogProto.ContainerType.NAVBAR;
+    }
+
+    @Override
+    protected int getDirectionForLog() {
+        return Utilities.isRtl(mLauncher.getResources()) ? Direction.LEFT : Direction.RIGHT;
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java
index fe69c9b87d..16bd9ed384 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java
@@ -15,12 +15,10 @@
  */
 package com.android.launcher3.uioverrides.touchcontrollers;
 
-import static android.view.MotionEvent.ACTION_CANCEL;
 import static android.view.MotionEvent.ACTION_DOWN;
 import static android.view.MotionEvent.ACTION_MOVE;
 import static android.view.MotionEvent.ACTION_UP;
-
-import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SWIPE_DOWN_WORKSPACE_NOTISHADE_OPEN;
+import static android.view.MotionEvent.ACTION_CANCEL;
 
 import android.graphics.PointF;
 import android.util.SparseArray;
@@ -33,9 +31,12 @@ import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
+import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.launcher3.util.TouchController;
-import com.android.quickstep.SystemUiProxy;
 
+import com.android.quickstep.SystemUiProxy;
 import java.io.PrintWriter;
 
 /**
@@ -132,8 +133,9 @@ public class StatusBarTouchController implements TouchController {
         int action = ev.getAction();
         if (action == ACTION_UP || action == ACTION_CANCEL) {
             dispatchTouchEvent(ev);
-            mLauncher.getStatsLogManager().logger()
-                    .log(LAUNCHER_SWIPE_DOWN_WORKSPACE_NOTISHADE_OPEN);
+            mLauncher.getUserEventDispatcher().logActionOnContainer(action == ACTION_UP ?
+                    Touch.FLING : Touch.SWIPE, Direction.DOWN, ContainerType.WORKSPACE,
+                    mLauncher.getWorkspace().getCurrentPage());
             setWindowSlippery(false);
             return true;
         }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
index 186caf6dc1..df6194d4b2 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
@@ -36,6 +36,7 @@ import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.touch.BaseSwipeDetector;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
 import com.android.launcher3.util.FlingBlockCheck;
 import com.android.launcher3.util.TouchController;
 import com.android.launcher3.views.BaseDragLayer;
@@ -202,7 +203,7 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
             mCurrentAnimation.setPlayFraction(0);
         }
         if (mPendingAnimation != null) {
-            mPendingAnimation.finish(false);
+            mPendingAnimation.finish(false, Touch.SWIPE);
             mPendingAnimation = null;
         }
 
@@ -284,6 +285,7 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
     public void onDragEnd(float velocity) {
         boolean fling = mDetector.isFling(velocity);
         final boolean goingToEnd;
+        final int logAction;
         boolean blockedFling = fling && mFlingBlockCheck.isBlocked();
         if (blockedFling) {
             fling = false;
@@ -292,9 +294,11 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
         float progress = mCurrentAnimation.getProgressFraction();
         float interpolatedProgress = mCurrentAnimation.getInterpolatedProgress();
         if (fling) {
+            logAction = Touch.FLING;
             boolean goingUp = orientationHandler.isGoingUp(velocity, mIsRtl);
             goingToEnd = goingUp == mCurrentAnimationIsGoingUp;
         } else {
+            logAction = Touch.SWIPE;
             goingToEnd = interpolatedProgress > SUCCESS_TRANSITION_PROGRESS;
         }
         long animationDuration = BaseSwipeDetector.calculateDuration(
@@ -303,14 +307,14 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
             animationDuration *= LauncherAnimUtils.blockedFlingDurationFactor(velocity);
         }
 
-        mCurrentAnimation.setEndAction(() -> onCurrentAnimationEnd(goingToEnd));
+        mCurrentAnimation.setEndAction(() -> onCurrentAnimationEnd(goingToEnd, logAction));
         mCurrentAnimation.startWithVelocity(mActivity, goingToEnd,
                 velocity, mEndDisplacement, animationDuration);
     }
 
-    private void onCurrentAnimationEnd(boolean wasSuccess) {
+    private void onCurrentAnimationEnd(boolean wasSuccess, int logAction) {
         if (mPendingAnimation != null) {
-            mPendingAnimation.finish(wasSuccess);
+            mPendingAnimation.finish(wasSuccess, logAction);
             mPendingAnimation = null;
         }
         clearState();
@@ -322,7 +326,7 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
         mTaskBeingDragged = null;
         mCurrentAnimation = null;
         if (mPendingAnimation != null) {
-            mPendingAnimation.finish(false);
+            mPendingAnimation.finish(false, Touch.SWIPE);
             mPendingAnimation = null;
         }
     }
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 5e05a7dbe1..26ad3778a7 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -75,8 +75,12 @@ import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.logging.StatsLogManager.StatsLogger;
+import com.android.launcher3.logging.UserEventDispatcher;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.testing.TestProtocol;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
+import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.launcher3.util.TraceHelper;
 import com.android.launcher3.util.VibratorWrapper;
 import com.android.launcher3.util.WindowBounds;
@@ -97,7 +101,6 @@ import com.android.quickstep.views.TaskView;
 import com.android.systemui.shared.recents.model.ThumbnailData;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.InputConsumerController;
-import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
 import com.android.systemui.shared.system.LatencyTrackerCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 import com.android.systemui.shared.system.TaskInfoCompat;
@@ -216,7 +219,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
 
     private boolean mPassedOverviewThreshold;
     private boolean mGestureStarted;
-    private boolean mLogDirectionUpOrLeft = true;
+    private int mLogAction = Touch.SWIPE;
+    private int mLogDirection = Direction.UP;
     private PointF mDownPos;
     private boolean mIsLikelyToStartNewTask;
 
@@ -430,13 +434,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                 mOnDeferredActivityLaunch);
 
         mGestureState.runOnceAtState(STATE_END_TARGET_SET,
-                () -> {
-                    mDeviceState.getRotationTouchHelper()
-                            .onEndTargetCalculated(mGestureState.getEndTarget(),
-                                    mActivityInterface);
-
-                    mRecentsView.onGestureEndTargetCalculated(mGestureState.getEndTarget());
-                });
+                () -> mDeviceState.getRotationTouchHelper().
+                        onEndTargetCalculated(mGestureState.getEndTarget(),
+                                mActivityInterface));
 
         notifyGestureStartedAsync();
     }
@@ -741,6 +741,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
     public void onGestureCancelled() {
         updateDisplacement(0);
         mStateCallback.setStateOnUiThread(STATE_GESTURE_COMPLETED);
+        mLogAction = Touch.SWIPE_NOOP;
         handleNormalGestureEnd(0, false, new PointF(), true /* isCancel */);
     }
 
@@ -756,11 +757,13 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         boolean isFling = mGestureStarted && !mIsMotionPaused
                 && Math.abs(endVelocity) > flingThreshold;
         mStateCallback.setStateOnUiThread(STATE_GESTURE_COMPLETED);
+
+        mLogAction = isFling ? Touch.FLING : Touch.SWIPE;
         boolean isVelocityVertical = Math.abs(velocity.y) > Math.abs(velocity.x);
         if (isVelocityVertical) {
-            mLogDirectionUpOrLeft = velocity.y < 0;
+            mLogDirection = velocity.y < 0 ? Direction.UP : Direction.DOWN;
         } else {
-            mLogDirectionUpOrLeft = velocity.x < 0;
+            mLogDirection = velocity.x < 0 ? Direction.LEFT : Direction.RIGHT;
         }
         mDownPos = downPos;
         handleNormalGestureEnd(endVelocity, isFling, velocity, false /* isCancel */);
@@ -972,7 +975,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                 break;
             case LAST_TASK:
             case NEW_TASK:
-                event = mLogDirectionUpOrLeft ? LAUNCHER_QUICKSWITCH_LEFT
+                event = (mLogDirection == Direction.LEFT)
+                        ? LAUNCHER_QUICKSWITCH_LEFT
                         : LAUNCHER_QUICKSWITCH_RIGHT;
                 break;
             default:
@@ -980,10 +984,12 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         }
         StatsLogger logger = StatsLogManager.newInstance(mContext).logger()
                 .withSrcState(LAUNCHER_STATE_BACKGROUND)
-                .withDstState(endTarget.containerType);
+                .withDstState(StatsLogManager.containerTypeToAtomState(endTarget.containerType));
         if (targetTask != null) {
             logger.withItemInfo(targetTask.getItemInfo());
         }
+        logger.log(event);
+
 
         DeviceProfile dp = mDp;
         if (dp == null || mDownPos == null) {
@@ -993,8 +999,12 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         int pageIndex = endTarget == LAST_TASK
                 ? LOG_NO_OP_PAGE_INDEX
                 : mRecentsView.getNextPage();
-        // TODO: set correct container using the pageIndex
-        logger.log(event);
+        UserEventDispatcher.newInstance(mContext).logStateChangeAction(
+                mLogAction, mLogDirection,
+                (int) mDownPos.x, (int) mDownPos.y,
+                ContainerType.NAVBAR, ContainerType.APP,
+                endTarget.containerType,
+                pageIndex);
     }
 
     /** Animates to the given progress, where 0 is the current app and 1 is overview. */
@@ -1131,12 +1141,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         anim.addOnUpdateListener((r, p) -> {
             updateSysUiFlags(Math.max(p, mCurrentShift.value));
         });
-        final int cuj = InteractionJankMonitorWrapper.CUJ_APP_CLOSE_TO_HOME;
         anim.addAnimatorListener(new AnimationSuccessListener() {
             @Override
             public void onAnimationStart(Animator animation) {
                 Trace.beginAsyncSection(TRANSITION_OPEN_LAUNCHER, 0);
-                InteractionJankMonitorWrapper.begin(cuj);
                 if (mActivity != null) {
                     removeLiveTileOverlay();
                 }
@@ -1150,13 +1158,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                 // Make sure recents is in its final state
                 maybeUpdateRecentsAttachedState(false);
                 mActivityInterface.onSwipeUpToHomeComplete(mDeviceState);
-                InteractionJankMonitorWrapper.end(cuj);
-            }
-
-            @Override
-            public void onAnimationCancel(Animator animation) {
-                super.onAnimationCancel(animation);
-                InteractionJankMonitorWrapper.cancel(cuj);
             }
 
             @Override
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index d35e270dd5..8b108ac299 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -152,6 +152,11 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
     public abstract void onExitOverview(RotationTouchHelper deviceState,
             Runnable exitRunnable);
 
+    /**
+     * Used for containerType in {@link com.android.launcher3.logging.UserEventDispatcher}
+     */
+    public abstract int getContainerType();
+
     public abstract boolean isInLiveTileMode();
 
     public abstract void onLaunchTaskFailed();
diff --git a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
index 2885abff1b..3898f0b0ca 100644
--- a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
@@ -28,6 +28,7 @@ import androidx.annotation.Nullable;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.R;
 import com.android.launcher3.touch.PagedOrientationHandler;
+import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.quickstep.fallback.RecentsState;
 import com.android.quickstep.util.ActivityInitListener;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
@@ -143,6 +144,15 @@ public final class FallbackActivityInterface extends
         // no-op, fake landscape not supported for 3P
     }
 
+    @Override
+    public int getContainerType() {
+        RecentsActivity activity = getCreatedActivity();
+        boolean visible = activity != null && activity.isStarted() && activity.hasWindowFocus();
+        return visible
+                ? LauncherLogProto.ContainerType.OTHER_LAUNCHER_APP
+                : LauncherLogProto.ContainerType.APP;
+    }
+
     @Override
     public boolean isInLiveTileMode() {
         return false;
diff --git a/quickstep/src/com/android/quickstep/GestureState.java b/quickstep/src/com/android/quickstep/GestureState.java
index 9c23c8320b..00b5eb9880 100644
--- a/quickstep/src/com/android/quickstep/GestureState.java
+++ b/quickstep/src/com/android/quickstep/GestureState.java
@@ -15,9 +15,6 @@
  */
 package com.android.quickstep;
 
-import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
-import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
-import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW;
 import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;
 
 import android.annotation.TargetApi;
@@ -26,6 +23,7 @@ import android.content.Intent;
 import android.os.Build;
 
 import com.android.launcher3.statemanager.StatefulActivity;
+import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.quickstep.util.ActiveGestureLog;
 import com.android.systemui.shared.recents.model.ThumbnailData;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
@@ -46,13 +44,13 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL
      * Defines the end targets of a gesture and the associated state.
      */
     public enum GestureEndTarget {
-        HOME(true, LAUNCHER_STATE_HOME, false),
+        HOME(true, ContainerType.WORKSPACE, false),
 
-        RECENTS(true, LAUNCHER_STATE_OVERVIEW, true),
+        RECENTS(true, ContainerType.TASKSWITCHER, true),
 
-        NEW_TASK(false, LAUNCHER_STATE_BACKGROUND, true),
+        NEW_TASK(false, ContainerType.APP, true),
 
-        LAST_TASK(false, LAUNCHER_STATE_BACKGROUND, true);
+        LAST_TASK(false, ContainerType.APP, true);
 
         GestureEndTarget(boolean isLauncher, int containerType,
                 boolean recentsAttachedToAppWindow) {
diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
index 98b8455e51..036d473060 100644
--- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
@@ -44,6 +44,7 @@ import com.android.launcher3.statehandlers.DepthController.ClampedDepthProperty;
 import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.PagedOrientationHandler;
+import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.util.ActivityInitListener;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
@@ -207,6 +208,10 @@ public final class LauncherActivityInterface extends
             return false;
         }
 
+        launcher.getUserEventDispatcher().logActionCommand(
+                LauncherLogProto.Action.Command.RECENTS_BUTTON,
+                getContainerType(),
+                LauncherLogProto.ContainerType.TASKSWITCHER);
         launcher.getStateManager().goToState(OVERVIEW,
                 launcher.getStateManager().shouldAnimateStateChange(), onCompleteCallback);
         return true;
@@ -247,6 +252,13 @@ public final class LauncherActivityInterface extends
         return true;
     }
 
+    @Override
+    public int getContainerType() {
+        final Launcher launcher = getVisibleLauncher();
+        return launcher != null ? launcher.getStateManager().getState().containerType
+                : LauncherLogProto.ContainerType.APP;
+    }
+
     @Override
     public boolean isInLiveTileMode() {
         Launcher launcher = getCreatedActivity();
diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
index b1b9396658..365cff576a 100644
--- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
@@ -30,6 +30,7 @@ import android.view.ViewConfiguration;
 import androidx.annotation.BinderThread;
 
 import com.android.launcher3.statemanager.StatefulActivity;
+import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.quickstep.util.ActivityInitListener;
 import com.android.quickstep.util.RemoteAnimationProvider;
 import com.android.quickstep.views.RecentsView;
@@ -46,6 +47,7 @@ public class OverviewCommandHelper {
 
     private final Context mContext;
     private final RecentsAnimationDeviceState mDeviceState;
+    private final RecentsModel mRecentsModel;
     private final OverviewComponentObserver mOverviewComponentObserver;
 
     private long mLastToggleTime;
@@ -54,6 +56,7 @@ public class OverviewCommandHelper {
             OverviewComponentObserver observer) {
         mContext = context;
         mDeviceState = deviceState;
+        mRecentsModel = RecentsModel.INSTANCE.get(mContext);
         mOverviewComponentObserver = observer;
     }
 
@@ -147,6 +150,7 @@ public class OverviewCommandHelper {
         private final AppToOverviewAnimationProvider<T> mAnimationProvider;
 
         private final long mToggleClickedTime = SystemClock.uptimeMillis();
+        private boolean mUserEventLogged;
         private ActivityInitListener mListener;
 
         public RecentsActivityCommand() {
@@ -156,7 +160,7 @@ public class OverviewCommandHelper {
                     ActivityManagerWrapper.getInstance().getRunningTask(), mDeviceState);
 
             // Preload the plan
-            RecentsModel.INSTANCE.get(mContext).getTasks(null);
+            mRecentsModel.getTasks(null);
         }
 
         @Override
@@ -208,6 +212,13 @@ public class OverviewCommandHelper {
 
         private boolean onActivityReady(Boolean wasVisible) {
             final T activity = mActivityInterface.getCreatedActivity();
+            if (!mUserEventLogged) {
+                activity.getUserEventDispatcher().logActionCommand(
+                        LauncherLogProto.Action.Command.RECENTS_BUTTON,
+                        mActivityInterface.getContainerType(),
+                        LauncherLogProto.ContainerType.TASKSWITCHER);
+                mUserEventLogged = true;
+            }
             return mAnimationProvider.onActivityReady(activity, wasVisible);
         }
 
diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index 2f55f14a9b..6f2f9fb523 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -41,10 +41,7 @@ import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherAnimationRunner;
-import com.android.launcher3.LauncherAnimationRunner.AnimationResult;
 import com.android.launcher3.R;
-import com.android.launcher3.WrappedAnimationRunnerImpl;
-import com.android.launcher3.WrappedLauncherAnimationRunner;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.compat.AccessibilityManagerCompat;
@@ -90,9 +87,6 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
 
     private StateManager<RecentsState> mStateManager;
 
-    // Strong refs to runners which are cleared when the activity is destroyed
-    private WrappedAnimationRunnerImpl mActivityLaunchAnimationRunner;
-
     /**
      * Init drag layer and overview panel views.
      */
@@ -124,6 +118,7 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
          * etc.)
          */
     protected void onHandleConfigChanged() {
+        mUserEventDispatcher = null;
         initDeviceProfile();
 
         AbstractFloatingView.closeOpenViews(this, true,
@@ -175,11 +170,8 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
         }
 
         final TaskView taskView = (TaskView) v;
-        mActivityLaunchAnimationRunner = new WrappedAnimationRunnerImpl() {
-            @Override
-            public Handler getHandler() {
-                return mUiHandler;
-            }
+        RemoteAnimationRunnerCompat runner = new LauncherAnimationRunner(mUiHandler,
+                true /* startAtFrontOfQueue */) {
 
             @Override
             public void onCreateAnimation(RemoteAnimationTargetCompat[] appTargets,
@@ -190,10 +182,8 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
                 result.setAnimation(anim, RecentsActivity.this);
             }
         };
-        final LauncherAnimationRunner wrapper = new WrappedLauncherAnimationRunner<>(
-                mActivityLaunchAnimationRunner, true /* startAtFrontOfQueue */);
         return ActivityOptionsCompat.makeRemoteAnimation(new RemoteAnimationAdapterCompat(
-                wrapper, RECENTS_LAUNCH_DURATION,
+                runner, RECENTS_LAUNCH_DURATION,
                 RECENTS_LAUNCH_DURATION - STATUS_BAR_TRANSITION_DURATION
                         - STATUS_BAR_TRANSITION_PRE_DELAY));
     }
@@ -298,7 +288,6 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
     protected void onDestroy() {
         super.onDestroy();
         ACTIVITY_TRACKER.onActivityDestroyed(this);
-        mActivityLaunchAnimationRunner = null;
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/RecentsModel.java b/quickstep/src/com/android/quickstep/RecentsModel.java
index d47217b770..6c302ae5d7 100644
--- a/quickstep/src/com/android/quickstep/RecentsModel.java
+++ b/quickstep/src/com/android/quickstep/RecentsModel.java
@@ -18,6 +18,7 @@ package com.android.quickstep;
 import static android.os.Process.THREAD_PRIORITY_BACKGROUND;
 
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+import static com.android.launcher3.util.Executors.createAndStartNewLooper;
 import static com.android.quickstep.TaskUtils.checkCurrentOrManagedUserId;
 
 import android.annotation.TargetApi;
@@ -25,11 +26,11 @@ import android.app.ActivityManager;
 import android.content.ComponentCallbacks2;
 import android.content.Context;
 import android.os.Build;
+import android.os.Looper;
 import android.os.Process;
 import android.os.UserHandle;
 
 import com.android.launcher3.icons.IconProvider;
-import com.android.launcher3.util.Executors.SimpleThreadFactory;
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.recents.model.ThumbnailData;
@@ -39,8 +40,6 @@ import com.android.systemui.shared.system.TaskStackChangeListener;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
 import java.util.function.Consumer;
 
 /**
@@ -53,9 +52,6 @@ public class RecentsModel extends TaskStackChangeListener {
     public static final MainThreadInitializedObject<RecentsModel> INSTANCE =
             new MainThreadInitializedObject<>(RecentsModel::new);
 
-    private static final Executor RECENTS_MODEL_EXECUTOR = Executors.newSingleThreadExecutor(
-            new SimpleThreadFactory("TaskThumbnailIconCache-", THREAD_PRIORITY_BACKGROUND));
-
     private final List<TaskVisualsChangeListener> mThumbnailChangeListeners = new ArrayList<>();
     private final Context mContext;
 
@@ -65,10 +61,12 @@ public class RecentsModel extends TaskStackChangeListener {
 
     private RecentsModel(Context context) {
         mContext = context;
+        Looper looper =
+                createAndStartNewLooper("TaskThumbnailIconCache", THREAD_PRIORITY_BACKGROUND);
         mTaskList = new RecentTasksList(MAIN_EXECUTOR,
                 new KeyguardManagerCompat(context), ActivityManagerWrapper.getInstance());
-        mIconCache = new TaskIconCache(context, RECENTS_MODEL_EXECUTOR);
-        mThumbnailCache = new TaskThumbnailCache(context, RECENTS_MODEL_EXECUTOR);
+        mIconCache = new TaskIconCache(context, looper);
+        mThumbnailCache = new TaskThumbnailCache(context, looper);
 
         ActivityManagerWrapper.getInstance().registerTaskStackListener(this);
         IconProvider.registerIconChangeListener(context,
diff --git a/quickstep/src/com/android/quickstep/TaskIconCache.java b/quickstep/src/com/android/quickstep/TaskIconCache.java
index 65e89cfa2f..7ff799ec55 100644
--- a/quickstep/src/com/android/quickstep/TaskIconCache.java
+++ b/quickstep/src/com/android/quickstep/TaskIconCache.java
@@ -17,6 +17,7 @@ package com.android.quickstep;
 
 import static com.android.launcher3.FastBitmapDrawable.newIcon;
 import static com.android.launcher3.uioverrides.QuickstepLauncher.GO_LOW_RAM_RECENTS_ENABLED;
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 
 import android.app.ActivityManager.TaskDescription;
 import android.content.Context;
@@ -26,6 +27,8 @@ import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
+import android.os.Handler;
+import android.os.Looper;
 import android.os.UserHandle;
 import android.util.SparseArray;
 import android.view.accessibility.AccessibilityManager;
@@ -34,11 +37,12 @@ import androidx.annotation.WorkerThread;
 
 import com.android.launcher3.FastBitmapDrawable;
 import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.IconProvider;
 import com.android.launcher3.icons.LauncherIcons;
+import com.android.launcher3.icons.cache.HandlerRunnable;
 import com.android.launcher3.util.Preconditions;
-import com.android.quickstep.util.CancellableTask;
 import com.android.quickstep.util.TaskKeyLruCache;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.recents.model.Task.TaskKey;
@@ -46,7 +50,6 @@ import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.PackageManagerWrapper;
 import com.android.systemui.shared.system.TaskDescriptionCompat;
 
-import java.util.concurrent.Executor;
 import java.util.function.Consumer;
 
 /**
@@ -54,7 +57,7 @@ import java.util.function.Consumer;
  */
 public class TaskIconCache {
 
-    private final Executor mBgExecutor;
+    private final Handler mBackgroundHandler;
     private final AccessibilityManager mAccessibilityManager;
 
     private final Context mContext;
@@ -62,9 +65,9 @@ public class TaskIconCache {
     private final SparseArray<BitmapInfo> mDefaultIcons = new SparseArray<>();
     private final IconProvider mIconProvider;
 
-    public TaskIconCache(Context context, Executor bgExecutor) {
+    public TaskIconCache(Context context, Looper backgroundLooper) {
         mContext = context;
-        mBgExecutor = bgExecutor;
+        mBackgroundHandler = new Handler(backgroundLooper);
         mAccessibilityManager = context.getSystemService(AccessibilityManager.class);
 
         Resources res = context.getResources();
@@ -80,27 +83,31 @@ public class TaskIconCache {
      * @param callback The callback to receive the task after its data has been populated.
      * @return A cancelable handle to the request
      */
-    public CancellableTask updateIconInBackground(Task task, Consumer<Task> callback) {
+    public IconLoadRequest updateIconInBackground(Task task, Consumer<Task> callback) {
         Preconditions.assertUIThread();
         if (task.icon != null) {
             // Nothing to load, the icon is already loaded
             callback.accept(task);
             return null;
         }
-        CancellableTask<TaskCacheEntry> request = new CancellableTask<TaskCacheEntry>() {
-            @Override
-            public TaskCacheEntry getResultOnBg() {
-                return getCacheEntry(task);
-            }
 
+        IconLoadRequest request = new IconLoadRequest(mBackgroundHandler) {
             @Override
-            public void handleResult(TaskCacheEntry result) {
-                task.icon = result.icon;
-                task.titleDescription = result.contentDescription;
-                callback.accept(task);
+            public void run() {
+                TaskCacheEntry entry = getCacheEntry(task);
+                if (isCanceled()) {
+                    // We don't call back to the provided callback in this case
+                    return;
+                }
+                MAIN_EXECUTOR.execute(() -> {
+                    task.icon = entry.icon;
+                    task.titleDescription = entry.contentDescription;
+                    callback.accept(task);
+                    onEnd();
+                });
             }
         };
-        mBgExecutor.execute(request);
+        Utilities.postAsyncCallback(mBackgroundHandler, request);
         return request;
     }
 
@@ -113,8 +120,9 @@ public class TaskIconCache {
     }
 
     void invalidateCacheEntries(String pkg, UserHandle handle) {
-        mBgExecutor.execute(() -> mIconCache.removeAll(key ->
-                pkg.equals(key.getPackageName()) && handle.getIdentifier() == key.userId));
+        Utilities.postAsyncCallback(mBackgroundHandler,
+                () -> mIconCache.removeAll(key ->
+                        pkg.equals(key.getPackageName()) && handle.getIdentifier() == key.userId));
     }
 
     @WorkerThread
@@ -200,6 +208,12 @@ public class TaskIconCache {
         }
     }
 
+    public static abstract class IconLoadRequest extends HandlerRunnable {
+        IconLoadRequest(Handler handler) {
+            super(handler, null);
+        }
+    }
+
     private static class TaskCacheEntry {
         public Drawable icon;
         public String contentDescription = "";
diff --git a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
index 65bb0f35d1..2b55b805c6 100644
--- a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
@@ -21,6 +21,7 @@ import static android.view.Display.DEFAULT_DISPLAY;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_SELECTIONS;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SYSTEM_SHORTCUT_FREE_FORM_TAP;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SYSTEM_SHORTCUT_SPLIT_SCREEN_TAP;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.TAP;
 
 import android.app.Activity;
 import android.app.ActivityOptions;
@@ -38,6 +39,7 @@ import com.android.launcher3.logging.StatsLogManager.LauncherEvent;
 import com.android.launcher3.model.WellbeingModel;
 import com.android.launcher3.popup.SystemShortcut;
 import com.android.launcher3.popup.SystemShortcut.AppInfo;
+import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.launcher3.util.Executors;
 import com.android.launcher3.util.InstantAppResolver;
 import com.android.quickstep.views.RecentsView;
@@ -226,6 +228,8 @@ public interface TaskShortcutFactory {
 
         @Override
         protected boolean onActivityStarted(BaseDraggingActivity activity) {
+            activity.getUserEventDispatcher().logActionOnControl(TAP,
+                    LauncherLogProto.ControlType.SPLIT_SCREEN_TARGET);
             return true;
         }
     };
diff --git a/quickstep/src/com/android/quickstep/TaskThumbnailCache.java b/quickstep/src/com/android/quickstep/TaskThumbnailCache.java
index a8a0219594..2b7a8ec250 100644
--- a/quickstep/src/com/android/quickstep/TaskThumbnailCache.java
+++ b/quickstep/src/com/android/quickstep/TaskThumbnailCache.java
@@ -15,12 +15,17 @@
  */
 package com.android.quickstep;
 
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+
 import android.content.Context;
 import android.content.res.Resources;
+import android.os.Handler;
+import android.os.Looper;
 
 import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.icons.cache.HandlerRunnable;
 import com.android.launcher3.util.Preconditions;
-import com.android.quickstep.util.CancellableTask;
 import com.android.quickstep.util.TaskKeyLruCache;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.recents.model.Task.TaskKey;
@@ -28,12 +33,11 @@ import com.android.systemui.shared.recents.model.ThumbnailData;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 
 import java.util.ArrayList;
-import java.util.concurrent.Executor;
 import java.util.function.Consumer;
 
 public class TaskThumbnailCache {
 
-    private final Executor mBgExecutor;
+    private final Handler mBackgroundHandler;
 
     private final int mCacheSize;
     private final TaskKeyLruCache<ThumbnailData> mCache;
@@ -90,8 +94,8 @@ public class TaskThumbnailCache {
         }
     }
 
-    public TaskThumbnailCache(Context context, Executor bgExecutor) {
-        mBgExecutor = bgExecutor;
+    public TaskThumbnailCache(Context context, Looper backgroundLooper) {
+        mBackgroundHandler = new Handler(backgroundLooper);
         mHighResLoadingState = new HighResLoadingState(context);
 
         Resources res = context.getResources();
@@ -126,7 +130,7 @@ public class TaskThumbnailCache {
      * @param callback The callback to receive the task after its data has been populated.
      * @return A cancelable handle to the request
      */
-    public CancellableTask updateThumbnailInBackground(
+    public ThumbnailLoadRequest updateThumbnailInBackground(
             Task task, Consumer<ThumbnailData> callback) {
         Preconditions.assertUIThread();
 
@@ -138,13 +142,14 @@ public class TaskThumbnailCache {
             return null;
         }
 
+
         return updateThumbnailInBackground(task.key, !mHighResLoadingState.isEnabled(), t -> {
             task.thumbnail = t;
             callback.accept(t);
         });
     }
 
-    private CancellableTask updateThumbnailInBackground(TaskKey key, boolean lowResolution,
+    private ThumbnailLoadRequest updateThumbnailInBackground(TaskKey key, boolean lowResolution,
             Consumer<ThumbnailData> callback) {
         Preconditions.assertUIThread();
 
@@ -155,20 +160,26 @@ public class TaskThumbnailCache {
             return null;
         }
 
-        CancellableTask<ThumbnailData> request = new CancellableTask<ThumbnailData>() {
+        ThumbnailLoadRequest request = new ThumbnailLoadRequest(mBackgroundHandler,
+                lowResolution) {
             @Override
-            public ThumbnailData getResultOnBg() {
-                return ActivityManagerWrapper.getInstance().getTaskThumbnail(
+            public void run() {
+                ThumbnailData thumbnail = ActivityManagerWrapper.getInstance().getTaskThumbnail(
                         key.id, lowResolution);
-            }
 
-            @Override
-            public void handleResult(ThumbnailData result) {
-                mCache.put(key, result);
-                callback.accept(result);
+                MAIN_EXECUTOR.execute(() -> {
+                    if (isCanceled()) {
+                        // We don't call back to the provided callback in this case
+                        return;
+                    }
+
+                    mCache.put(key, thumbnail);
+                    callback.accept(thumbnail);
+                    onEnd();
+                });
             }
         };
-        mBgExecutor.execute(request);
+        Utilities.postAsyncCallback(mBackgroundHandler, request);
         return request;
     }
 
@@ -207,6 +218,15 @@ public class TaskThumbnailCache {
         return mEnableTaskSnapshotPreloading && mHighResLoadingState.mVisible;
     }
 
+    public static abstract class ThumbnailLoadRequest extends HandlerRunnable {
+        public final boolean mLowResolution;
+
+        ThumbnailLoadRequest(Handler handler, boolean lowResolution) {
+            super(handler, null);
+            mLowResolution = lowResolution;
+        }
+    }
+
     /**
      * @return Whether device supports low-res thumbnails. Low-res files are an optimization
      * for faster load times of snapshots. Devices can optionally disable low-res files so that
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 3e05b07074..df93e0b6a2 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -20,7 +20,6 @@ import static android.view.MotionEvent.ACTION_CANCEL;
 import static android.view.MotionEvent.ACTION_DOWN;
 import static android.view.MotionEvent.ACTION_UP;
 
-import static com.android.launcher3.config.FeatureFlags.ASSISTANT_GIVES_LAUNCHER_FOCUS;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.quickstep.GestureState.DEFAULT_STATE;
@@ -688,7 +687,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
         final boolean disableHorizontalSwipe = mDeviceState.isInExclusionRegion(event);
         return new OtherActivityInputConsumer(this, mDeviceState, mTaskAnimationManager,
                 gestureState, shouldDefer, this::onConsumerInactive,
-                mInputMonitorCompat, mInputEventReceiver, disableHorizontalSwipe, factory);
+                mInputMonitorCompat, disableHorizontalSwipe, factory);
     }
 
     private InputConsumer createDeviceLockedInputConsumer(GestureState gestureState) {
@@ -710,10 +709,8 @@ public class TouchInteractionService extends Service implements PluginListener<O
 
         if (activity.getRootView().hasWindowFocus()
                 || previousGestureState.isRunningAnimationToLauncher()
-                || (ASSISTANT_GIVES_LAUNCHER_FOCUS.get()
-                    && forceOverviewInputConsumer)
-                || (ENABLE_QUICKSTEP_LIVE_TILE.get())
-                    && gestureState.getActivityInterface().isInLiveTileMode()) {
+                || (FeatureFlags.ASSISTANT_GIVES_LAUNCHER_FOCUS.get()
+                    && forceOverviewInputConsumer)) {
             return new OverviewInputConsumer(gestureState, activity, mInputMonitorCompat,
                     false /* startingInActivityBounds */);
         } else {
@@ -737,8 +734,6 @@ public class TouchInteractionService extends Service implements PluginListener<O
     private void reset() {
         mConsumer = mUncheckedConsumer = mResetGestureInputConsumer;
         mGestureState = DEFAULT_STATE;
-        // By default, use batching of the input events
-        mInputEventReceiver.setBatchingEnabled(true);
     }
 
     private void preloadOverview(boolean fromInit) {
diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
index 8f2356c696..f5f525965f 100644
--- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
+++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
@@ -15,7 +15,6 @@
  */
 package com.android.quickstep.fallback;
 
-import static com.android.quickstep.GestureState.GestureEndTarget.RECENTS;
 import static com.android.quickstep.fallback.RecentsState.DEFAULT;
 import static com.android.quickstep.fallback.RecentsState.MODAL_TASK;
 
@@ -28,7 +27,6 @@ import android.util.AttributeSet;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.statemanager.StateManager.StateListener;
 import com.android.quickstep.FallbackActivityInterface;
-import com.android.quickstep.GestureState;
 import com.android.quickstep.RecentsActivity;
 import com.android.quickstep.views.OverviewActionsView;
 import com.android.quickstep.views.RecentsView;
@@ -76,14 +74,14 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity>
     }
 
     /**
-     * When the gesture ends and we're going to recents view, we also remove the temporary
+     * When the gesture ends and recents view become interactive, we also remove the temporary
      * invisible tile added for the home task. This also pushes the remaining tiles back
      * to the center.
      */
     @Override
-    public void onGestureEndTargetCalculated(GestureState.GestureEndTarget endTarget) {
-        super.onGestureEndTargetCalculated(endTarget);
-        if (mHomeTaskInfo != null && endTarget == RECENTS) {
+    public void onGestureAnimationEnd() {
+        super.onGestureAnimationEnd();
+        if (mHomeTaskInfo != null) {
             TaskView tv = getTaskView(mHomeTaskInfo.taskId);
             if (tv != null) {
                 PendingAnimation pa = createTaskDismissAnimation(tv, true, false, 150);
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java
index 580e4ec807..89e6931ed9 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java
@@ -25,6 +25,12 @@ import static android.view.MotionEvent.ACTION_POINTER_UP;
 import static android.view.MotionEvent.ACTION_UP;
 
 import static com.android.launcher3.Utilities.squaredHypot;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction.UPLEFT;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction.UPRIGHT;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.FLING;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.SWIPE;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.SWIPE_NOOP;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType.NAVBAR;
 
 import android.animation.ValueAnimator;
 import android.content.Context;
@@ -41,6 +47,7 @@ import android.view.ViewConfiguration;
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.R;
 import com.android.launcher3.anim.Interpolators;
+import com.android.launcher3.logging.UserEventDispatcher;
 import com.android.quickstep.BaseActivityInterface;
 import com.android.quickstep.GestureState;
 import com.android.quickstep.InputConsumer;
@@ -73,6 +80,7 @@ public class AssistantInputConsumer extends DelegateInputConsumer {
     private float mTimeFraction;
     private long mDragTime;
     private float mLastProgress;
+    private int mDirection;
     private BaseActivityInterface mActivityInterface;
 
     private final float mDragDistThreshold;
@@ -189,6 +197,8 @@ public class AssistantInputConsumer extends DelegateInputConsumer {
                 if (mState != STATE_DELEGATE_ACTIVE && !mLaunchedAssistant) {
                     ValueAnimator animator = ValueAnimator.ofFloat(mLastProgress, 0)
                         .setDuration(RETRACT_ANIMATION_DURATION_MS);
+                    UserEventDispatcher.newInstance(mContext).logActionOnContainer(
+                        SWIPE_NOOP, mDirection, NAVBAR);
                     animator.addUpdateListener(valueAnimator -> {
                         float progress = (float) valueAnimator.getAnimatedValue();
                         SystemUiProxy.INSTANCE.get(mContext).onAssistantProgress(progress);
@@ -213,7 +223,7 @@ public class AssistantInputConsumer extends DelegateInputConsumer {
             mLastProgress = Math.min(mDistance * 1f / mDragDistThreshold, 1) * mTimeFraction;
             if (mDistance >= mDragDistThreshold && mTimeFraction >= 1) {
                 SystemUiProxy.INSTANCE.get(mContext).onAssistantGestureCompletion(0);
-                startAssistantInternal();
+                startAssistantInternal(SWIPE);
 
                 Bundle args = new Bundle();
                 args.putInt(OPA_BUNDLE_TRIGGER, OPA_BUNDLE_TRIGGER_DIAG_SWIPE_GESTURE);
@@ -226,7 +236,10 @@ public class AssistantInputConsumer extends DelegateInputConsumer {
         }
     }
 
-    private void startAssistantInternal() {
+    private void startAssistantInternal(int gestureType) {
+        UserEventDispatcher.newInstance(mContext)
+            .logActionOnContainer(gestureType, mDirection, NAVBAR);
+
         BaseDraggingActivity launcherActivity = mActivityInterface.getCreatedActivity();
         if (launcherActivity != null) {
             launcherActivity.getRootView().performHapticFeedback(
@@ -240,6 +253,7 @@ public class AssistantInputConsumer extends DelegateInputConsumer {
      */
     private boolean isValidAssistantGestureAngle(float deltaX, float deltaY) {
         float angle = (float) Math.toDegrees(Math.atan2(deltaY, deltaX));
+        mDirection = angle > 90 ? UPLEFT : UPRIGHT;
 
         // normalize so that angle is measured clockwise from horizontal in the bottom right corner
         // and counterclockwise from horizontal in the bottom left corner
@@ -258,7 +272,7 @@ public class AssistantInputConsumer extends DelegateInputConsumer {
                 mLastProgress = 1;
                 SystemUiProxy.INSTANCE.get(mContext).onAssistantGestureCompletion(
                     (float) Math.sqrt(velocityX * velocityX + velocityY * velocityY));
-                startAssistantInternal();
+                startAssistantInternal(FLING);
 
                 Bundle args = new Bundle();
                 args.putInt(INVOCATION_TYPE_KEY, INVOCATION_TYPE_GESTURE);
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
index 35dbee9490..b1a1133885 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
@@ -67,7 +67,6 @@ import com.android.quickstep.util.CachedEventDispatcher;
 import com.android.quickstep.util.MotionPauseDetector;
 import com.android.quickstep.util.NavBarPosition;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
-import com.android.systemui.shared.system.InputChannelCompat.InputEventReceiver;
 import com.android.systemui.shared.system.InputMonitorCompat;
 
 import java.util.function.Consumer;
@@ -93,7 +92,6 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
     private RecentsAnimationCallbacks mActiveCallbacks;
     private final CachedEventDispatcher mRecentsViewDispatcher = new CachedEventDispatcher();
     private final InputMonitorCompat mInputMonitorCompat;
-    private final InputEventReceiver mInputEventReceiver;
     private final BaseActivityInterface mActivityInterface;
 
     private final AbsSwipeUpHandler.Factory mHandlerFactory;
@@ -137,8 +135,8 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
     public OtherActivityInputConsumer(Context base, RecentsAnimationDeviceState deviceState,
             TaskAnimationManager taskAnimationManager, GestureState gestureState,
             boolean isDeferredDownTarget, Consumer<OtherActivityInputConsumer> onCompleteCallback,
-            InputMonitorCompat inputMonitorCompat, InputEventReceiver inputEventReceiver,
-            boolean disableHorizontalSwipe, Factory handlerFactory) {
+            InputMonitorCompat inputMonitorCompat, boolean disableHorizontalSwipe,
+            Factory handlerFactory) {
         super(base);
         mDeviceState = deviceState;
         mNavBarPosition = mDeviceState.getNavBarPosition();
@@ -156,7 +154,6 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
         mOnCompleteCallback = onCompleteCallback;
         mVelocityTracker = VelocityTracker.obtain();
         mInputMonitorCompat = inputMonitorCompat;
-        mInputEventReceiver = inputEventReceiver;
 
         boolean continuingPreviousGesture = mTaskAnimationManager.isRecentsAnimationRunning();
         mIsDeferredDownTarget = !continuingPreviousGesture && isDeferredDownTarget;
@@ -218,9 +215,6 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
 
         switch (ev.getActionMasked()) {
             case ACTION_DOWN: {
-                // Until we detect the gesture, handle events as we receive them
-                mInputEventReceiver.setBatchingEnabled(false);
-
                 Object traceToken = TraceHelper.INSTANCE.beginSection(DOWN_EVT,
                         FLAG_CHECK_FOR_RACE_CONDITIONS);
                 mActivePointerId = ev.getPointerId(0);
@@ -357,8 +351,6 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
         }
         TestLogging.recordEvent(TestProtocol.SEQUENCE_PILFER, "pilferPointers");
         mInputMonitorCompat.pilferPointers();
-        // Once we detect the gesture, we can enable batching to reduce further updates
-        mInputEventReceiver.setBatchingEnabled(true);
 
         mActivityInterface.closeOverlay();
         ActivityManagerWrapper.getInstance().closeSystemWindows(
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java
index 924b32c015..1c77a0593d 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java
@@ -15,7 +15,6 @@
  */
 package com.android.quickstep.inputconsumers;
 
-import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE;
 
@@ -28,6 +27,9 @@ import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.logger.LauncherAtom;
 import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.TestProtocol;
+import com.android.launcher3.userevent.nano.LauncherLogProto;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
 import com.android.quickstep.GestureState;
 import com.android.quickstep.InputConsumer;
 import com.android.quickstep.RecentsAnimationDeviceState;
@@ -80,12 +82,17 @@ public class OverviewWithoutFocusInputConsumer implements InputConsumer,
         mContext.startActivity(mGestureState.getHomeIntent());
         ActiveGestureLog.INSTANCE.addLog("startQuickstep");
         BaseActivity activity = BaseDraggingActivity.fromContext(mContext);
-        int state = (mGestureState != null && mGestureState.getEndTarget() != null)
+        int pageIndex = -1; // This number doesn't reflect workspace page index.
+                            // It only indicates that launcher client screen was shown.
+        int containerType = (mGestureState != null && mGestureState.getEndTarget() != null)
                 ? mGestureState.getEndTarget().containerType
-                : LAUNCHER_STATE_HOME;
+                : LauncherLogProto.ContainerType.WORKSPACE;
+        activity.getUserEventDispatcher().logActionOnContainer(
+                wasFling ? Touch.FLING : Touch.SWIPE, Direction.UP, containerType, pageIndex);
+        activity.getUserEventDispatcher().setPreviousHomeGesture(true);
         activity.getStatsLogManager().logger()
-                .withSrcState(LAUNCHER_STATE_BACKGROUND)
-                .withDstState(state)
+                .withSrcState(LAUNCHER_STATE_HOME)
+                .withDstState(LAUNCHER_STATE_HOME)
                 .withContainerInfo(LauncherAtom.ContainerInfo.newBuilder()
                         .setWorkspace(
                                 LauncherAtom.WorkspaceContainer.newBuilder()
diff --git a/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialFragment.java
index 16886ec177..70181fb9ca 100644
--- a/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialFragment.java
@@ -24,7 +24,7 @@ import com.android.quickstep.interaction.TutorialController.TutorialType;
 /** Shows the Home gesture interactive tutorial. */
 public class AssistantGestureTutorialFragment extends TutorialFragment {
     @Override
-    Integer getHandAnimationResId() {
+    int getHandAnimationResId() {
         return R.drawable.assistant_gesture;
     }
 
diff --git a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java
index 41db684d44..bef50ea8df 100644
--- a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java
@@ -24,7 +24,7 @@ import com.android.quickstep.interaction.TutorialController.TutorialType;
 /** Shows the Back gesture interactive tutorial. */
 public class BackGestureTutorialFragment extends TutorialFragment {
     @Override
-    Integer getHandAnimationResId() {
+    int getHandAnimationResId() {
         return R.drawable.back_gesture;
     }
 
diff --git a/quickstep/src/com/android/quickstep/interaction/EdgeBackGestureHandler.java b/quickstep/src/com/android/quickstep/interaction/EdgeBackGestureHandler.java
index 9489bac266..e4b348e51b 100644
--- a/quickstep/src/com/android/quickstep/interaction/EdgeBackGestureHandler.java
+++ b/quickstep/src/com/android/quickstep/interaction/EdgeBackGestureHandler.java
@@ -143,10 +143,6 @@ public class EdgeBackGestureHandler implements OnTouchListener {
         return false;
     }
 
-    boolean onInterceptTouch(MotionEvent motionEvent) {
-        return isWithinTouchRegion((int) motionEvent.getX(), (int) motionEvent.getY());
-    }
-
     private boolean isWithinTouchRegion(int x, int y) {
         // Disallow if too far from the edge
         if (x > mEdgeWidth + mLeftInset && x < (mDisplaySize.x - mEdgeWidth - mRightInset)) {
diff --git a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialFragment.java
index 63595a5283..e2a9d1276c 100644
--- a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialFragment.java
@@ -21,7 +21,7 @@ import com.android.quickstep.interaction.TutorialController.TutorialType;
 /** Shows the Home gesture interactive tutorial. */
 public class HomeGestureTutorialFragment extends TutorialFragment {
     @Override
-    Integer getHandAnimationResId() {
+    int getHandAnimationResId() {
         return R.drawable.home_gesture;
     }
 
diff --git a/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java b/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java
index d1b0a7088f..f897ecc01a 100644
--- a/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java
+++ b/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java
@@ -250,12 +250,6 @@ public class NavBarGestureHandler implements OnTouchListener,
         return intercepted;
     }
 
-    boolean onInterceptTouch(MotionEvent event) {
-        return mAssistantLeftRegion.contains(event.getX(), event.getY())
-                || mAssistantRightRegion.contains(event.getX(), event.getY())
-                || event.getY() >= mDisplaySize.y - mBottomGestureHeight;
-    }
-
     protected void onMotionPauseDetected() {
         VibratorWrapper.INSTANCE.get(mContext).vibrate(OVERVIEW_HAPTIC);
     }
diff --git a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java
index 93200bb21d..3357b70497 100644
--- a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java
@@ -21,7 +21,7 @@ import com.android.quickstep.interaction.TutorialController.TutorialType;
 /** Shows the Overview gesture interactive tutorial. */
 public class OverviewGestureTutorialFragment extends TutorialFragment {
     @Override
-    Integer getHandAnimationResId() {
+    int getHandAnimationResId() {
         return R.drawable.overview_gesture;
     }
 
diff --git a/quickstep/src/com/android/quickstep/interaction/RootSandboxLayout.java b/quickstep/src/com/android/quickstep/interaction/RootSandboxLayout.java
deleted file mode 100644
index db1afc2012..0000000000
--- a/quickstep/src/com/android/quickstep/interaction/RootSandboxLayout.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.quickstep.interaction;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.widget.RelativeLayout;
-
-import androidx.fragment.app.FragmentManager;
-
-/** Root layout that TutorialFragment uses to intercept motion events. */
-public class RootSandboxLayout extends RelativeLayout {
-    public RootSandboxLayout(Context context) {
-        super(context);
-    }
-
-    public RootSandboxLayout(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public RootSandboxLayout(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    @Override
-    public boolean onInterceptTouchEvent(MotionEvent motionEvent) {
-        return ((TutorialFragment) FragmentManager.findFragment(this))
-                .onInterceptTouch(motionEvent);
-    }
-}
diff --git a/quickstep/src/com/android/quickstep/interaction/SandboxLauncherRenderer.java b/quickstep/src/com/android/quickstep/interaction/SandboxLauncherRenderer.java
deleted file mode 100644
index 80ffe6609e..0000000000
--- a/quickstep/src/com/android/quickstep/interaction/SandboxLauncherRenderer.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.quickstep.interaction;
-
-import android.content.Context;
-import android.view.View;
-
-import com.android.launcher3.InvariantDeviceProfile;
-import com.android.launcher3.graphics.LauncherPreviewRenderer;
-
-/** Renders a fake Launcher for use in the Sandbox. */
-class SandboxLauncherRenderer extends LauncherPreviewRenderer {
-    SandboxLauncherRenderer(Context context, InvariantDeviceProfile idp, boolean migrated) {
-        super(context, idp, migrated);
-    }
-
-    @Override
-    public boolean shouldShowRealLauncherPreview() {
-        return false;
-    }
-
-    @Override
-    public boolean shouldShowQsb() {
-        return false;
-    }
-
-    @Override
-    public View.OnLongClickListener getWorkspaceChildOnLongClickListener() {
-        return null;
-    }
-}
diff --git a/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java b/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java
deleted file mode 100644
index d54efc56e5..0000000000
--- a/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.quickstep.interaction;
-
-import android.graphics.PointF;
-import android.view.View;
-
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.R;
-import com.android.quickstep.interaction.EdgeBackGestureHandler.BackGestureResult;
-import com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult;
-
-/** A {@link TutorialController} for the Sandbox Mode. */
-public class SandboxModeTutorialController extends SwipeUpGestureTutorialController {
-
-    SandboxModeTutorialController(SandboxModeTutorialFragment fragment, TutorialType tutorialType) {
-        super(fragment, tutorialType);
-    }
-
-    @Nullable
-    @Override
-    Integer getTitleStringId() {
-        return R.string.sandbox_mode_title;
-    }
-
-    @Nullable
-    @Override
-    Integer getSubtitleStringId() {
-        return R.string.sandbox_mode_subtitle;
-    }
-
-    @Nullable
-    @Override
-    Integer getActionButtonStringId() {
-        return R.string.gesture_tutorial_action_button_label_done;
-    }
-
-    @Override
-    void onActionButtonClicked(View button) {
-        mTutorialFragment.closeTutorial();
-    }
-
-    @Override
-    public void onBackGestureAttempted(BackGestureResult result) {
-        switch (result) {
-            case BACK_COMPLETED_FROM_LEFT:
-            case BACK_COMPLETED_FROM_RIGHT:
-                showRippleEffect(null);
-                showFeedback(R.string.sandbox_mode_back_gesture_feedback_successful);
-                break;
-            case BACK_CANCELLED_FROM_RIGHT:
-                showFeedback(R.string.back_gesture_feedback_cancelled_right_edge);
-                break;
-            case BACK_CANCELLED_FROM_LEFT:
-                showFeedback(R.string.back_gesture_feedback_cancelled_left_edge);
-                break;
-            case BACK_NOT_STARTED_TOO_FAR_FROM_EDGE:
-                showFeedback(R.string.sandbox_mode_back_gesture_feedback_swipe_too_far_from_edge);
-                break;
-        }
-    }
-
-    @Override
-    public void onNavBarGestureAttempted(NavBarGestureResult result, PointF finalVelocity) {
-        switch (result) {
-            case ASSISTANT_COMPLETED:
-                showRippleEffect(null);
-                showFeedback(R.string.sandbox_mode_assistant_gesture_feedback_successful);
-                break;
-            case HOME_GESTURE_COMPLETED:
-                animateFakeTaskViewHome(finalVelocity, () -> {
-                    showFeedback(R.string.sandbox_mode_home_gesture_feedback_successful);
-                });
-                break;
-            case OVERVIEW_GESTURE_COMPLETED:
-                fadeOutFakeTaskView(true, () -> {
-                    showFeedback(R.string.sandbox_mode_overview_gesture_feedback_successful);
-                });
-                break;
-            case HOME_OR_OVERVIEW_NOT_STARTED_WRONG_SWIPE_DIRECTION:
-            case HOME_OR_OVERVIEW_CANCELLED:
-            case HOME_NOT_STARTED_TOO_FAR_FROM_EDGE:
-            case OVERVIEW_NOT_STARTED_TOO_FAR_FROM_EDGE:
-                showFeedback(R.string.home_gesture_feedback_swipe_too_far_from_edge);
-                break;
-        }
-    }
-}
diff --git a/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialFragment.java
deleted file mode 100644
index 955a2f7d2e..0000000000
--- a/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialFragment.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.quickstep.interaction;
-
-import android.view.MotionEvent;
-import android.view.View;
-
-import com.android.quickstep.interaction.TutorialController.TutorialType;
-
-/** Shows the general navigation gesture sandbox environment. */
-public class SandboxModeTutorialFragment extends TutorialFragment {
-
-    @Override
-    TutorialController createController(TutorialType type) {
-        return new SandboxModeTutorialController(this, type);
-    }
-
-    @Override
-    Class<? extends TutorialController> getControllerClass() {
-        return SandboxModeTutorialController.class;
-    }
-
-    @Override
-    public boolean onTouch(View view, MotionEvent motionEvent) {
-        if (motionEvent.getAction() == MotionEvent.ACTION_DOWN && mTutorialController != null) {
-            mTutorialController.setRippleHotspot(motionEvent.getX(), motionEvent.getY());
-        }
-        return super.onTouch(view, motionEvent);
-    }
-}
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
index 2198ade105..73f1f8cb8c 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
@@ -47,12 +47,11 @@ abstract class TutorialController implements BackGestureAttemptCallback,
     final TextView mTitleTextView;
     final TextView mSubtitleTextView;
     final TextView mFeedbackView;
-    final View mLauncherView;
     final ClipIconView mFakeIconView;
     final View mFakeTaskView;
     final View mRippleView;
     final RippleDrawable mRippleDrawable;
-    @Nullable final TutorialHandAnimation mHandCoachingAnimation;
+    final TutorialHandAnimation mHandCoachingAnimation;
     final ImageView mHandCoachingView;
     final Button mActionTextButton;
     final Button mActionButton;
@@ -69,7 +68,6 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         mTitleTextView = rootView.findViewById(R.id.gesture_tutorial_fragment_title_view);
         mSubtitleTextView = rootView.findViewById(R.id.gesture_tutorial_fragment_subtitle_view);
         mFeedbackView = rootView.findViewById(R.id.gesture_tutorial_fragment_feedback_view);
-        mLauncherView = tutorialFragment.getLauncherView();
         mFakeIconView = rootView.findViewById(R.id.gesture_tutorial_fake_icon_view);
         mFakeTaskView = rootView.findViewById(R.id.gesture_tutorial_fake_task_view);
         mRippleView = rootView.findViewById(R.id.gesture_tutorial_ripple_view);
@@ -145,16 +143,13 @@ abstract class TutorialController implements BackGestureAttemptCallback,
     void onActionTextButtonClicked(View button) {}
 
     void showHandCoachingAnimation() {
-        if (isComplete() || mHandCoachingAnimation == null) {
+        if (isComplete()) {
             return;
         }
         mHandCoachingAnimation.startLoopedAnimation(mTutorialType);
     }
 
     void hideHandCoachingAnimation() {
-        if (mHandCoachingAnimation == null) {
-            return;
-        }
         mHandCoachingAnimation.stop();
         mHandCoachingView.setVisibility(View.INVISIBLE);
     }
@@ -167,10 +162,8 @@ abstract class TutorialController implements BackGestureAttemptCallback,
 
         if (isComplete()) {
             hideHandCoachingAnimation();
-            mLauncherView.setVisibility(View.INVISIBLE);
         } else {
             showHandCoachingAnimation();
-            mLauncherView.setVisibility(View.VISIBLE);
         }
     }
 
@@ -213,8 +206,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         return mTutorialType == TutorialType.BACK_NAVIGATION_COMPLETE
                 || mTutorialType == TutorialType.HOME_NAVIGATION_COMPLETE
                 || mTutorialType == TutorialType.OVERVIEW_NAVIGATION_COMPLETE
-                || mTutorialType == TutorialType.ASSISTANT_COMPLETE
-                || mTutorialType == TutorialType.SANDBOX_MODE;
+                || mTutorialType == TutorialType.ASSISTANT_COMPLETE;
     }
 
     /** Denotes the type of the tutorial. */
@@ -227,7 +219,6 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         OVERVIEW_NAVIGATION,
         OVERVIEW_NAVIGATION_COMPLETE,
         ASSISTANT,
-        ASSISTANT_COMPLETE,
-        SANDBOX_MODE
+        ASSISTANT_COMPLETE
     }
 }
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
index f297d5a835..9a8264d098 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
@@ -31,7 +31,6 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
-import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.R;
 import com.android.quickstep.interaction.TutorialController.TutorialType;
 
@@ -43,10 +42,9 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
     TutorialType mTutorialType;
     @Nullable TutorialController mTutorialController = null;
     View mRootView;
-    @Nullable TutorialHandAnimation mHandCoachingAnimation = null;
+    TutorialHandAnimation mHandCoachingAnimation;
     EdgeBackGestureHandler mEdgeBackGestureHandler;
     NavBarGestureHandler mNavBarGestureHandler;
-    private View mLauncherView;
 
     public static TutorialFragment newInstance(TutorialType tutorialType) {
         TutorialFragment fragment = getFragmentForTutorialType(tutorialType);
@@ -76,17 +74,13 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
             case ASSISTANT:
             case ASSISTANT_COMPLETE:
                 return new AssistantGestureTutorialFragment();
-            case SANDBOX_MODE:
-                return new SandboxModeTutorialFragment();
             default:
                 Log.e(LOG_TAG, "Failed to find an appropriate fragment for " + tutorialType.name());
         }
         return null;
     }
 
-    @Nullable Integer getHandAnimationResId() {
-        return null;
-    }
+    abstract int getHandAnimationResId();
 
     abstract TutorialController createController(TutorialType type);
 
@@ -120,14 +114,8 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
             return insets;
         });
         mRootView.setOnTouchListener(this);
-        Integer handAnimationResId = getHandAnimationResId();
-        if (handAnimationResId != null) {
-            mHandCoachingAnimation =
-                new TutorialHandAnimation(getContext(), mRootView, handAnimationResId);
-        }
-        InvariantDeviceProfile dp = InvariantDeviceProfile.INSTANCE.get(getContext());
-        mLauncherView = new SandboxLauncherRenderer(getContext(), dp, true).getRenderedView();
-        ((ViewGroup) mRootView).addView(mLauncherView, 0);
+        mHandCoachingAnimation = new TutorialHandAnimation(getContext(), mRootView,
+                getHandAnimationResId());
         return mRootView;
     }
 
@@ -140,25 +128,16 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
     @Override
     public void onPause() {
         super.onPause();
-
-        if (mHandCoachingAnimation != null) {
-            mHandCoachingAnimation.stop();
-        }
+        mHandCoachingAnimation.stop();
     }
 
     @Override
     public boolean onTouch(View view, MotionEvent motionEvent) {
-        // Note: Using logical-or to ensure both functions get called.
+        // Note: Using logical or to ensure both functions get called.
         return mEdgeBackGestureHandler.onTouch(view, motionEvent)
                 | mNavBarGestureHandler.onTouch(view, motionEvent);
     }
 
-    boolean onInterceptTouch(MotionEvent motionEvent) {
-        // Note: Using logical-or to ensure both functions get called.
-        return mEdgeBackGestureHandler.onInterceptTouch(motionEvent)
-                | mNavBarGestureHandler.onInterceptTouch(motionEvent);
-    }
-
     void onAttachedToWindow() {
         mEdgeBackGestureHandler.setViewGroupParent((ViewGroup) getRootView());
     }
@@ -189,11 +168,7 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
         return mRootView;
     }
 
-    View getLauncherView() {
-        return mLauncherView;
-    }
-
-    @Nullable TutorialHandAnimation getHandAnimation() {
+    TutorialHandAnimation getHandAnimation() {
         return mHandCoachingAnimation;
     }
 
diff --git a/quickstep/src/com/android/quickstep/util/CancellableTask.java b/quickstep/src/com/android/quickstep/util/CancellableTask.java
deleted file mode 100644
index a6e2e81589..0000000000
--- a/quickstep/src/com/android/quickstep/util/CancellableTask.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.quickstep.util;
-
-import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-
-import androidx.annotation.UiThread;
-import androidx.annotation.WorkerThread;
-
-/**
- * Utility class to executore a task on background and post the result on UI thread
- */
-public abstract class CancellableTask<T> implements Runnable {
-
-    private boolean mCancelled = false;
-
-    @Override
-    public final void run() {
-        if (mCancelled) {
-            return;
-        }
-        T result = getResultOnBg();
-        if (mCancelled) {
-            return;
-        }
-        MAIN_EXECUTOR.execute(() -> {
-            if (mCancelled) {
-                return;
-            }
-            handleResult(result);
-        });
-    }
-
-    /**
-     * Called on the worker thread to process the request. The return object is passed to
-     * {@link #handleResult(Object)}
-     */
-    @WorkerThread
-    public abstract T getResultOnBg();
-
-    /**
-     * Called on the UI thread to handle the final result.
-     * @param result
-     */
-    @UiThread
-    public abstract void handleResult(T result);
-
-    /**
-     * Cancels the request. If it is called before {@link #handleResult(Object)}, that method
-     * will not be called
-     */
-    public void cancel() {
-        mCancelled = true;
-    }
-}
diff --git a/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java b/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
index 1031c5b080..4a298d3bad 100644
--- a/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
+++ b/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
@@ -18,10 +18,8 @@ package com.android.quickstep.util;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.anim.Interpolators.DEACCEL;
-import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 import static com.android.launcher3.anim.Interpolators.FINAL_FRAME;
 import static com.android.launcher3.anim.Interpolators.INSTANT;
-import static com.android.launcher3.anim.Interpolators.clampToProgress;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_COMPONENTS;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_ACTIONS_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE;
@@ -112,7 +110,7 @@ public class OverviewToHomeAnim {
         boolean isLayoutNaturalToLauncher = recentsView.getPagedOrientationHandler()
                 .isLayoutNaturalToLauncher();
         config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, isLayoutNaturalToLauncher
-                ? clampToProgress(FAST_OUT_SLOW_IN, 0, 0.75f) : FINAL_FRAME);
+                ? DEACCEL : FINAL_FRAME);
         config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, FINAL_FRAME);
         config.setInterpolator(ANIM_OVERVIEW_SCALE, FINAL_FRAME);
         config.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, INSTANT);
diff --git a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
index de44e07bae..df9b0cf435 100644
--- a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
+++ b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
@@ -23,6 +23,7 @@ import static android.view.Surface.ROTATION_180;
 import static android.view.Surface.ROTATION_270;
 import static android.view.Surface.ROTATION_90;
 
+import static com.android.launcher3.logging.LoggerUtils.extractObjectNameAndAddress;
 import static com.android.launcher3.states.RotationHelper.ALLOW_ROTATION_PREFERENCE_KEY;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
@@ -71,7 +72,6 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
 
     private static final String TAG = "RecentsOrientedState";
     private static final boolean DEBUG = false;
-    private static final String DELIMITER_DOT = "\\.";
 
     private ContentObserver mSystemAutoRotateObserver = new ContentObserver(new Handler()) {
         @Override
@@ -534,13 +534,4 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
                 ? idp.landscapeProfile
                 : idp.portraitProfile;
     }
-
-    /**
-     * String conversion for only the helpful parts of {@link Object#toString()} method
-     * @param stringToExtract "foo.bar.baz.MyObject@1234"
-     * @return "MyObject@1234"
-     */
-    private static String extractObjectNameAndAddress(String stringToExtract) {
-        return stringToExtract.substring(stringToExtract.lastIndexOf(DELIMITER_DOT));
-    }
 }
diff --git a/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java b/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java
index 19c6588877..04308c80cb 100644
--- a/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java
+++ b/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java
@@ -21,8 +21,6 @@ import android.content.Context;
 import android.os.Handler;
 
 import com.android.launcher3.LauncherAnimationRunner;
-import com.android.launcher3.LauncherAnimationRunner.AnimationResult;
-import com.android.launcher3.WrappedAnimationRunnerImpl;
 import com.android.launcher3.WrappedLauncherAnimationRunner;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
 import com.android.systemui.shared.system.RemoteAnimationAdapterCompat;
@@ -30,17 +28,14 @@ import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
 public abstract class RemoteAnimationProvider {
 
-    WrappedAnimationRunnerImpl mAnimationRunner;
+    LauncherAnimationRunner mAnimationRunner;
 
     public abstract AnimatorSet createWindowAnimation(RemoteAnimationTargetCompat[] appTargets,
             RemoteAnimationTargetCompat[] wallpaperTargets);
 
     ActivityOptions toActivityOptions(Handler handler, long duration, Context context) {
-        mAnimationRunner = new WrappedAnimationRunnerImpl() {
-            @Override
-            public Handler getHandler() {
-                return handler;
-            }
+        mAnimationRunner = new LauncherAnimationRunner(handler,
+                false /* startAtFrontOfQueue */) {
 
             @Override
             public void onCreateAnimation(RemoteAnimationTargetCompat[] appTargets,
@@ -50,6 +45,7 @@ public abstract class RemoteAnimationProvider {
         };
         final LauncherAnimationRunner wrapper = new WrappedLauncherAnimationRunner(
                 mAnimationRunner, false /* startAtFrontOfQueue */);
+
         return ActivityOptionsCompat.makeRemoteAnimation(
                 new RemoteAnimationAdapterCompat(wrapper, duration, 0));
     }
diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index 3a54bd61aa..903e87a7f8 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -278,6 +278,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
             int start = mOrientationState.getOrientationHandler()
                     .getPrimaryValue(mTaskRect.left, mTaskRect.top);
             mScrollState.screenCenter = start + mScrollState.scroll + mScrollState.halfPageSize;
+            mScrollState.pageParentScale = recentsViewScale.value;
             mScrollState.updateInterpolation(start);
             mCurveScale = TaskView.getCurveScaleForInterpolation(mScrollState.linearInterpolation);
         }
@@ -296,9 +297,9 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
         mMatrix.postTranslate(insets.left, insets.top);
         mMatrix.postScale(scale, scale);
 
-        // Apply TaskView matrix: scale, translate, scroll
-        mMatrix.postScale(mCurveScale, mCurveScale, taskWidth / 2, taskHeight / 2);
+        // Apply TaskView matrix: translate, scale, scroll
         mMatrix.postTranslate(mTaskRect.left, mTaskRect.top + mOffsetY);
+        mMatrix.postScale(mCurveScale, mCurveScale, taskWidth / 2, taskHeight / 2);
         mOrientationState.getOrientationHandler().set(
                 mMatrix, MATRIX_POST_TRANSLATE, mScrollState.scroll);
 
diff --git a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
index 95bde801bf..b06d4bc355 100644
--- a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
+++ b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
@@ -42,6 +42,7 @@ import androidx.annotation.StringRes;
 import com.android.launcher3.BaseActivity;
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.R;
+import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.systemui.shared.recents.model.Task;
 
 import java.time.Duration;
@@ -216,8 +217,8 @@ public final class DigitalWellBeingToast {
                     view, 0, 0,
                     view.getWidth(), view.getHeight());
             activity.startActivity(intent, options.toBundle());
-
-            // TODO: add WW logging on the app usage settings click.
+            activity.getUserEventDispatcher().logActionOnControl(LauncherLogProto.Action.Touch.TAP,
+                    LauncherLogProto.ControlType.APP_USAGE_SETTINGS, view);
         } catch (ActivityNotFoundException e) {
             Log.e(TAG, "Failed to open app usage settings for task "
                     + mTask.getTopComponent().getPackageName(), e);
diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
index 52a7466429..b338bd07ee 100644
--- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
@@ -36,6 +36,7 @@ import android.view.Surface;
 import android.widget.FrameLayout;
 
 import com.android.launcher3.BaseQuickstepLauncher;
+import com.android.launcher3.Hotseat;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.StateManager.StateListener;
@@ -176,8 +177,14 @@ public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher>
 
     @Override
     protected boolean shouldStealTouchFromSiblingsBelow(MotionEvent ev) {
-        return mActivity.getStateManager().getState().overviewUi
-                && super.shouldStealTouchFromSiblingsBelow(ev);
+        if (ev.getAction() == MotionEvent.ACTION_DOWN) {
+            // Allow touches to go through to the hotseat.
+            Hotseat hotseat = mActivity.getHotseat();
+            boolean touchingHotseat = hotseat.isShown()
+                    && mActivity.getDragLayer().isEventOverView(hotseat, ev, this);
+            return !touchingHotseat;
+        }
+        return super.shouldStealTouchFromSiblingsBelow(ev);
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
index b8e07cb189..2a6c9e92db 100644
--- a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
+++ b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
@@ -54,6 +54,7 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
             HIDDEN_UNSUPPORTED_NAVIGATION,
             HIDDEN_NON_ZERO_ROTATION,
             HIDDEN_NO_TASKS,
+            HIDDEN_GESTURE_RUNNING,
             HIDDEN_NO_RECENTS})
     @Retention(RetentionPolicy.SOURCE)
     public @interface ActionsHiddenFlags { }
@@ -61,7 +62,8 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
     public static final int HIDDEN_UNSUPPORTED_NAVIGATION = 1 << 0;
     public static final int HIDDEN_NON_ZERO_ROTATION = 1 << 1;
     public static final int HIDDEN_NO_TASKS = 1 << 2;
-    public static final int HIDDEN_NO_RECENTS = 1 << 3;
+    public static final int HIDDEN_GESTURE_RUNNING = 1 << 3;
+    public static final int HIDDEN_NO_RECENTS = 1 << 4;
 
     @IntDef(flag = true, value = {
             DISABLED_SCROLLING,
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 7a8e11df78..0362377399 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -35,14 +35,16 @@ import static com.android.launcher3.anim.Interpolators.ACCEL_2;
 import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
-import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_CLEAR_ALL;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_DISMISS_SWIPE_UP;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_SWIPE_DOWN;
 import static com.android.launcher3.statehandlers.DepthController.DEPTH;
 import static com.android.launcher3.uioverrides.touchcontrollers.TaskViewTouchController.SUCCESS_TRANSITION_PROGRESS;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.TAP;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.ControlType.CLEAR_ALL_BUTTON;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW;
 import static com.android.quickstep.TaskUtils.checkCurrentOrManagedUserId;
+import static com.android.quickstep.views.OverviewActionsView.HIDDEN_GESTURE_RUNNING;
 import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NON_ZERO_ROTATION;
 import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NO_RECENTS;
 import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NO_TASKS;
@@ -107,6 +109,7 @@ import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.touch.PagedOrientationHandler.CurveProperties;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.DynamicResource;
 import com.android.launcher3.util.MultiValueAlpha;
@@ -115,7 +118,6 @@ import com.android.launcher3.util.ResourceBasedOverride.Overrides;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.util.ViewPool;
 import com.android.quickstep.BaseActivityInterface;
-import com.android.quickstep.GestureState;
 import com.android.quickstep.RecentsAnimationController;
 import com.android.quickstep.RecentsAnimationTargets;
 import com.android.quickstep.RecentsModel;
@@ -1127,6 +1129,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         setEnableDrawingLiveTile(false);
         setRunningTaskHidden(true);
         setRunningTaskIconScaledDown(true);
+        mActionsView.updateHiddenFlags(HIDDEN_GESTURE_RUNNING, true);
     }
 
     /**
@@ -1180,14 +1183,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     }
 
     /**
-     * Called when a gesture from an app has finished, and an end target has been determined.
-     */
-    public void onGestureEndTargetCalculated(GestureState.GestureEndTarget endTarget) {
-
-    }
-
-    /**
-     * Called when a gesture from an app has finished, and the animation to the target has ended.
+     * Called when a gesture from an app has finished.
      */
     public void onGestureAnimationEnd() {
         if (mOrientationState.setGestureActive(false)) {
@@ -1326,6 +1322,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     }
 
     private void animateActionsViewIn() {
+        mActionsView.updateHiddenFlags(HIDDEN_GESTURE_RUNNING, false);
         ObjectAnimator anim = ObjectAnimator.ofFloat(
                 mActionsView.getVisibilityAlpha(), MultiValueAlpha.VALUE, 0, 1);
         anim.setDuration(TaskView.SCALE_ICON_DURATION);
@@ -1410,12 +1407,13 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
          * Updates linearInterpolation for the provided child position
          */
         public void updateInterpolation(float childStart) {
-            float pageCenter = childStart + halfPageSize;
+            float scaledHalfPageSize = halfPageSize / pageParentScale;
+            float pageCenter = childStart + scaledHalfPageSize;
             float distanceFromScreenCenter = screenCenter - pageCenter;
             // How far the page has to move from the center to be offscreen, taking into account
             // the EDGE_SCALE_DOWN_FACTOR that will be applied at that position.
             float distanceToReachEdge = halfScreenSize
-                    + halfPageSize * (1 - TaskView.EDGE_SCALE_DOWN_FACTOR);
+                    + scaledHalfPageSize * (1 - TaskView.EDGE_SCALE_DOWN_FACTOR);
             linearInterpolation = Math.min(1,
                     Math.abs(distanceFromScreenCenter) / distanceToReachEdge);
         }
@@ -1461,7 +1459,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     public PendingAnimation createTaskDismissAnimation(TaskView taskView, boolean animateTaskView,
             boolean shouldRemoveTask, long duration) {
         if (mPendingAnimation != null) {
-            mPendingAnimation.finish(false);
+            mPendingAnimation.finish(false, Touch.SWIPE);
         }
         PendingAnimation anim = new PendingAnimation(duration);
 
@@ -1623,7 +1621,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     protected void runDismissAnimation(PendingAnimation pendingAnim) {
         AnimatorPlaybackController controller = pendingAnim.createPlaybackController();
         controller.dispatchOnStart();
-        controller.setEndAction(() -> pendingAnim.finish(true));
+        controller.setEndAction(() -> pendingAnim.finish(true, Touch.SWIPE));
         controller.getAnimationPlayer().setInterpolator(FAST_OUT_SLOW_IN);
         controller.start();
     }
@@ -1636,7 +1634,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     @SuppressWarnings("unused")
     private void dismissAllTasks(View view) {
         runDismissAnimation(createAllTasksDismissAnimation(DISMISS_TASK_DURATION));
-        mActivity.getStatsLogManager().logger().log(LAUNCHER_TASK_CLEAR_ALL);
+        mActivity.getUserEventDispatcher().logActionOnControl(TAP, CLEAR_ALL_BUTTON);
     }
 
     private void dismissCurrentTask() {
@@ -2161,12 +2159,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                         tv.notifyTaskLaunchFailed(TAG);
                     }
                 };
-                if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
-                    finishRecentsAnimation(false /* toRecents */, null);
-                    onLaunchResult.accept(true /* success */);
-                } else {
-                    tv.launchTask(false, onLaunchResult, getHandler());
-                }
+                tv.launchTask(false, onLaunchResult, getHandler());
                 Task task = tv.getTask();
                 if (task != null) {
                     mActivity.getStatsLogManager().logger().withItemInfo(tv.getItemInfo())
diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
index 4aff7e3211..d47eba6408 100644
--- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
@@ -16,7 +16,6 @@
 
 package com.android.quickstep.views;
 
-import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.quickstep.views.TaskThumbnailView.DIM_ALPHA;
 
 import android.animation.Animator;
@@ -230,16 +229,7 @@ public class TaskMenuView extends AbstractFloatingView {
                 menuOptionView.findViewById(R.id.icon), menuOptionView.findViewById(R.id.text));
         LayoutParams lp = (LayoutParams) menuOptionView.getLayoutParams();
         mTaskView.getPagedOrientationHandler().setLayoutParamsForTaskMenuOptionItem(lp);
-        menuOptionView.setOnClickListener(view -> {
-            if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
-                RecentsView recentsView = mTaskView.getRecentsView();
-                recentsView.switchToScreenshot(null,
-                        () -> recentsView.finishRecentsAnimation(true /* toRecents */,
-                                () -> menuOption.onClick(view)));
-            } else {
-                menuOption.onClick(view);
-            }
-        });
+        menuOptionView.setOnClickListener(menuOption);
         mOptionLayout.addView(menuOptionView);
     }
 
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 3d6d423077..321821b573 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -73,11 +73,15 @@ import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.anim.PendingAnimation;
+import com.android.launcher3.logging.UserEventDispatcher;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.popup.SystemShortcut;
 import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.PagedOrientationHandler;
+import com.android.launcher3.userevent.nano.LauncherLogProto;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.TransformingTouchDelegate;
 import com.android.launcher3.util.ViewPool.Reusable;
@@ -86,7 +90,6 @@ import com.android.quickstep.TaskIconCache;
 import com.android.quickstep.TaskOverlayFactory;
 import com.android.quickstep.TaskThumbnailCache;
 import com.android.quickstep.TaskUtils;
-import com.android.quickstep.util.CancellableTask;
 import com.android.quickstep.util.RecentsOrientedState;
 import com.android.quickstep.util.TaskCornerRadius;
 import com.android.quickstep.views.RecentsView.PageCallbacks;
@@ -186,8 +189,8 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     private boolean mShowScreenshot;
 
     // The current background requests to load the task thumbnail and icon
-    private CancellableTask mThumbnailLoadRequest;
-    private CancellableTask mIconLoadRequest;
+    private TaskThumbnailCache.ThumbnailLoadRequest mThumbnailLoadRequest;
+    private TaskIconCache.IconLoadRequest mIconLoadRequest;
 
     // Order in which the footers appear. Lower order appear below higher order.
     public static final int INDEX_DIGITAL_WELLBEING_TOAST = 0;
@@ -217,7 +220,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
             }
             if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
                 if (isRunningTask()) {
-                    // TODO: Replace this animation with createRecentsWindowAnimator
                     createLaunchAnimationForRunningTask().start();
                 } else {
                     launchTask(true /* animate */);
@@ -363,7 +365,10 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         final PendingAnimation pendingAnimation = getRecentsView().createTaskLaunchAnimation(
                 this, RECENTS_LAUNCH_DURATION, TOUCH_RESPONSE_INTERPOLATOR);
         AnimatorPlaybackController currentAnimation = pendingAnimation.createPlaybackController();
-        currentAnimation.setEndAction(() -> pendingAnimation.finish(true));
+        currentAnimation.setEndAction(() -> {
+            pendingAnimation.finish(true, Touch.SWIPE);
+            launchTask(false);
+        });
         return currentAnimation;
     }
 
@@ -386,6 +391,20 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
 
     public void launchTask(boolean animate, boolean freezeTaskList, Consumer<Boolean> resultCallback,
             Handler resultCallbackHandler) {
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+            if (isRunningTask()) {
+                getRecentsView().finishRecentsAnimation(false /* toRecents */,
+                        () -> resultCallbackHandler.post(() -> resultCallback.accept(true)));
+            } else {
+                launchTaskInternal(animate, freezeTaskList, resultCallback, resultCallbackHandler);
+            }
+        } else {
+            launchTaskInternal(animate, freezeTaskList, resultCallback, resultCallbackHandler);
+        }
+    }
+
+    private void launchTaskInternal(boolean animate, boolean freezeTaskList,
+            Consumer<Boolean> resultCallback, Handler resultCallbackHandler) {
         if (mTask != null) {
             final ActivityOptions opts;
             TestLogging.recordEvent(
@@ -462,13 +481,15 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         }
     }
 
-    private boolean showTaskMenu() {
+    private boolean showTaskMenu(int action) {
         if (!getRecentsView().isClearAllHidden()) {
             getRecentsView().snapToPage(getRecentsView().indexOfChild(this));
         } else {
             mMenuView = TaskMenuView.showForTask(this);
             mActivity.getStatsLogManager().logger().withItemInfo(getItemInfo())
                     .log(LAUNCHER_TASK_ICON_TAP_OR_LONGPRESS);
+            UserEventDispatcher.newInstance(getContext()).logActionOnItem(action, Direction.NONE,
+                    LauncherLogProto.ItemType.TASK_ICON);
             if (mMenuView != null) {
                 mMenuView.addOnAttachStateChangeListener(mTaskMenuStateListener);
             }
@@ -479,10 +500,10 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     private void setIcon(Drawable icon) {
         if (icon != null) {
             mIconView.setDrawable(icon);
-            mIconView.setOnClickListener(v -> showTaskMenu());
+            mIconView.setOnClickListener(v -> showTaskMenu(Touch.TAP));
             mIconView.setOnLongClickListener(v -> {
                 requestDisallowInterceptTouchEvent(true);
-                return showTaskMenu();
+                return showTaskMenu(Touch.LONGPRESS);
             });
         } else {
             mIconView.setDrawable(null);
diff --git a/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java b/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java
index 2a7da7eca8..ccfa3fc0fb 100644
--- a/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java
+++ b/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java
@@ -3,8 +3,6 @@ package com.android.quickstep;
 import static androidx.test.InstrumentationRegistry.getInstrumentation;
 
 import static com.android.launcher3.LauncherState.OVERVIEW;
-import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUBMIT;
-import static com.android.launcher3.util.rule.TestStabilityRule.UNBUNDLED_POSTSUBMIT;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -13,12 +11,12 @@ import static org.junit.Assert.assertTrue;
 import android.app.PendingIntent;
 import android.app.usage.UsageStatsManager;
 import android.content.Intent;
+import android.os.Build;
 
 import androidx.test.filters.LargeTest;
 import androidx.test.runner.AndroidJUnit4;
 
 import com.android.launcher3.Launcher;
-import com.android.launcher3.util.rule.TestStabilityRule;
 import com.android.quickstep.views.DigitalWellBeingToast;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
@@ -36,6 +34,9 @@ public class DigitalWellBeingToastTest extends AbstractQuickStepTest {
 
     @Test
     public void testToast() throws Exception {
+        // b/150303529
+        if (Build.MODEL.contains("Cuttlefish")) return;
+
         startAppFast(CALCULATOR_PACKAGE);
 
         final UsageStatsManager usageStatsManager =
diff --git a/res/layout/search_result_icon_row.xml b/res/layout/search_result_icon_row.xml
deleted file mode 100644
index 5ecc0c27b6..0000000000
--- a/res/layout/search_result_icon_row.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.launcher3.views.SearchResultIconRow xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res-auto"
-    style="@style/BaseIcon"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:drawablePadding="@dimen/dynamic_grid_icon_drawable_padding"
-    android:gravity="start|center_vertical"
-    android:textAlignment="viewStart"
-    android:textColor="?android:attr/textColorPrimary"
-    android:textSize="16sp"
-    android:padding="@dimen/dynamic_grid_edge_margin"
-    launcher:iconDisplay="hero_app"
-    launcher:layoutHorizontal="true"
-    >
-
-</com.android.launcher3.views.SearchResultIconRow>
\ No newline at end of file
diff --git a/res/layout/search_result_shortcut.xml b/res/layout/search_result_shortcut.xml
new file mode 100644
index 0000000000..c350c973da
--- /dev/null
+++ b/res/layout/search_result_shortcut.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.launcher3.views.SearchResultShortcut xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
+    android:padding="@dimen/dynamic_grid_edge_margin">
+
+    <com.android.launcher3.BubbleTextView
+        android:id="@+id/bubble_text"
+        style="@style/BaseIcon"
+        android:drawablePadding="@dimen/dynamic_grid_icon_drawable_padding"
+        android:gravity="start|center_vertical"
+        android:textAlignment="viewStart"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="16sp"
+        android:layout_height="wrap_content"
+        launcher:iconDisplay="hero_app"
+        launcher:layoutHorizontal="true" />
+
+    <View
+        android:id="@+id/icon"
+        android:layout_width="@dimen/deep_shortcut_icon_size"
+        android:layout_height="@dimen/deep_shortcut_icon_size"
+        android:layout_gravity="start|center_vertical"
+        android:background="@drawable/ic_deepshortcut_placeholder" />
+
+</com.android.launcher3.views.SearchResultShortcut>
\ No newline at end of file
diff --git a/res/layout/search_result_suggest.xml b/res/layout/search_result_suggest.xml
deleted file mode 100644
index c5d96f03ea..0000000000
--- a/res/layout/search_result_suggest.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.launcher3.views.SearchResultSuggestRow xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/TextHeadline"
-    android:id="@+id/section_title"
-    android:background="?android:attr/selectableItemBackground"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:gravity="center_vertical"
-    android:padding="4dp"
-    android:minHeight="48dp"
-    android:textColor="?android:attr/textColorPrimary"
-    android:textSize="14sp">
-
-    <TextView
-        android:id="@+id/title"
-        style="@style/TextTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingStart="8dp"
-        android:layout_marginBottom="4dp"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textSize="14sp" />
-
-</com.android.launcher3.views.SearchResultSuggestRow>
\ No newline at end of file
diff --git a/res/layout/search_result_thumbnail.xml b/res/layout/search_result_thumbnail.xml
deleted file mode 100644
index 0cc5a29f60..0000000000
--- a/res/layout/search_result_thumbnail.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.launcher3.views.ThumbnailSearchResultView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="125dp"
-    android:layout_height="125dp"/>
\ No newline at end of file
diff --git a/res/values/config.xml b/res/values/config.xml
index 46b8c23a62..325b62f9dc 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -59,6 +59,7 @@
     <bool name="hotseat_transpose_layout_with_orientation">true</bool>
 
     <!-- Various classes overriden by projects/build flavors. -->
+    <string name="user_event_dispatcher_class" translatable="false"></string>
     <string name="folder_name_provider_class" translatable="false"></string>
     <string name="stats_log_manager_class" translatable="false"></string>
     <string name="app_transition_manager_class" translatable="false"></string>
diff --git a/robolectric_tests/src/com/android/launcher3/secondarydisplay/SDWorkModeTest.java b/robolectric_tests/src/com/android/launcher3/secondarydisplay/SDWorkModeTest.java
index baae2a6a80..0ca5ce6f44 100644
--- a/robolectric_tests/src/com/android/launcher3/secondarydisplay/SDWorkModeTest.java
+++ b/robolectric_tests/src/com/android/launcher3/secondarydisplay/SDWorkModeTest.java
@@ -21,6 +21,7 @@ import static com.android.launcher3.util.Preconditions.assertNotNull;
 
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
 
 import android.content.Context;
 import android.os.UserManager;
@@ -29,6 +30,8 @@ import android.provider.Settings;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.allapps.AllAppsPagedView;
 import com.android.launcher3.allapps.AllAppsRecyclerView;
+import com.android.launcher3.logging.UserEventDispatcher;
+import com.android.launcher3.shadows.ShadowOverrides;
 import com.android.launcher3.util.LauncherLayoutBuilder;
 import com.android.launcher3.util.LauncherModelHelper;
 
@@ -66,6 +69,8 @@ public class SDWorkModeTest {
         mModelHelper = new LauncherModelHelper();
         mTargetContext = RuntimeEnvironment.application;
         mIdp = InvariantDeviceProfile.INSTANCE.get(mTargetContext);
+        ShadowOverrides.setProvider(UserEventDispatcher.class,
+                c -> mock(UserEventDispatcher.class));
         Settings.Global.putFloat(mTargetContext.getContentResolver(),
                 Settings.Global.WINDOW_ANIMATION_SCALE, 0);
 
diff --git a/robolectric_tests/src/com/android/launcher3/ui/LauncherUIScrollTest.java b/robolectric_tests/src/com/android/launcher3/ui/LauncherUIScrollTest.java
index 957ae77eee..d330d10133 100644
--- a/robolectric_tests/src/com/android/launcher3/ui/LauncherUIScrollTest.java
+++ b/robolectric_tests/src/com/android/launcher3/ui/LauncherUIScrollTest.java
@@ -20,6 +20,7 @@ import static com.android.launcher3.util.LauncherUIHelper.doLayout;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
+import static org.mockito.Mockito.mock;
 
 import android.content.Context;
 import android.os.SystemClock;
@@ -35,6 +36,8 @@ import com.android.launcher3.LauncherState;
 import com.android.launcher3.folder.Folder;
 import com.android.launcher3.folder.FolderIcon;
 import com.android.launcher3.folder.FolderPagedView;
+import com.android.launcher3.logging.UserEventDispatcher;
+import com.android.launcher3.shadows.ShadowOverrides;
 import com.android.launcher3.util.LauncherLayoutBuilder;
 import com.android.launcher3.util.LauncherLayoutBuilder.FolderBuilder;
 import com.android.launcher3.util.LauncherModelHelper;
@@ -67,6 +70,8 @@ public class LauncherUIScrollTest {
         mModelHelper = new LauncherModelHelper();
         mTargetContext = RuntimeEnvironment.application;
         mIdp = InvariantDeviceProfile.INSTANCE.get(mTargetContext);
+        ShadowOverrides.setProvider(UserEventDispatcher.class,
+                c -> mock(UserEventDispatcher.class));
 
         Settings.Global.putFloat(mTargetContext.getContentResolver(),
                 Settings.Global.WINDOW_ANIMATION_SCALE, 0);
diff --git a/src/com/android/launcher3/BaseActivity.java b/src/com/android/launcher3/BaseActivity.java
index 5e50e278f0..310c306f19 100644
--- a/src/com/android/launcher3/BaseActivity.java
+++ b/src/com/android/launcher3/BaseActivity.java
@@ -37,6 +37,8 @@ import androidx.annotation.IntDef;
 
 import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
 import com.android.launcher3.logging.StatsLogManager;
+import com.android.launcher3.logging.UserEventDispatcher;
+import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.launcher3.util.SystemUiController;
 import com.android.launcher3.util.ViewCache;
 import com.android.launcher3.views.ActivityContext;
@@ -80,6 +82,7 @@ public abstract class BaseActivity extends Activity implements ActivityContext {
             new ArrayList<>();
 
     protected DeviceProfile mDeviceProfile;
+    protected UserEventDispatcher mUserEventDispatcher;
     protected StatsLogManager mStatsLogManager;
     protected SystemUiController mSystemUiController;
 
@@ -141,6 +144,8 @@ public abstract class BaseActivity extends Activity implements ActivityContext {
         return mDeviceProfile;
     }
 
+    public void modifyUserEvent(LauncherLogProto.LauncherEvent event) {}
+
     public final StatsLogManager getStatsLogManager() {
         if (mStatsLogManager == null) {
             mStatsLogManager = StatsLogManager.newInstance(this);
@@ -148,6 +153,13 @@ public abstract class BaseActivity extends Activity implements ActivityContext {
         return mStatsLogManager;
     }
 
+    public final UserEventDispatcher getUserEventDispatcher() {
+        if (mUserEventDispatcher == null) {
+            mUserEventDispatcher = UserEventDispatcher.newInstance(this);
+        }
+        return mUserEventDispatcher;
+    }
+
     public SystemUiController getSystemUiController() {
         if (mSystemUiController == null) {
             mSystemUiController = new SystemUiController(getWindow());
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 1e5a9e44d5..06bb263f23 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -23,7 +23,6 @@ import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
-import android.animation.ValueAnimator;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
@@ -31,8 +30,6 @@ import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.PointF;
-import android.graphics.PorterDuff.Mode;
-import android.graphics.PorterDuffColorFilter;
 import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
@@ -46,8 +43,6 @@ import android.view.View;
 import android.view.ViewDebug;
 import android.widget.TextView;
 
-import androidx.core.graphics.ColorUtils;
-
 import com.android.launcher3.Launcher.OnResumeCallback;
 import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
 import com.android.launcher3.dot.DotInfo;
@@ -55,7 +50,6 @@ import com.android.launcher3.dragndrop.DraggableView;
 import com.android.launcher3.folder.FolderIcon;
 import com.android.launcher3.graphics.IconPalette;
 import com.android.launcher3.graphics.IconShape;
-import com.android.launcher3.graphics.PlaceHolderIconDrawable;
 import com.android.launcher3.graphics.PreloadIconDrawable;
 import com.android.launcher3.icons.DotRenderer;
 import com.android.launcher3.icons.IconCache.IconLoadRequest;
@@ -65,7 +59,6 @@ import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.model.data.PromiseAppInfo;
-import com.android.launcher3.model.data.RemoteActionItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.util.SafeCloseable;
 import com.android.launcher3.views.ActivityContext;
@@ -91,8 +84,6 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
     private final PointF mTranslationForReorderBounce = new PointF(0, 0);
     private final PointF mTranslationForReorderPreview = new PointF(0, 0);
 
-    private static final int ICON_UPDATE_ANIMATION_DURATION = 375;
-
     private float mScaleForReorderBounce = 1f;
 
     private static final Property<BubbleTextView, Float> DOT_SCALE_PROPERTY
@@ -301,14 +292,6 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         verifyHighRes();
     }
 
-    /**
-     * Apply label and tag using a {@link RemoteActionItemInfo}
-     */
-    public void applyFromRemoteActionInfo(RemoteActionItemInfo remoteActionItemInfo) {
-        applyIconAndLabel(remoteActionItemInfo);
-        setTag(remoteActionItemInfo);
-    }
-
     private void applyIconAndLabel(ItemInfoWithIcon info) {
         FastBitmapDrawable iconDrawable = newIcon(getContext(), info);
         mDotParams.color = IconPalette.getMutedColor(info.bitmap.color, 0.54f);
@@ -653,14 +636,11 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         mDisableRelayout = mIcon != null;
 
         icon.setBounds(0, 0, mIconSize, mIconSize);
-
-        updateIcon(icon);
-
-        // If the current icon is a placeholder color, animate its update.
-        if (mIcon != null && mIcon instanceof PlaceHolderIconDrawable) {
-            animateIconUpdate((PlaceHolderIconDrawable) mIcon, icon);
+        if (mLayoutHorizontal) {
+            setCompoundDrawablesRelative(icon, null, null, null);
+        } else {
+            setCompoundDrawables(null, icon, null, null);
         }
-
         mDisableRelayout = false;
     }
 
@@ -690,8 +670,6 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
                 mActivity.invalidateParent(info);
             } else if (info instanceof PackageItemInfo) {
                 applyFromItemInfoWithIcon((PackageItemInfo) info);
-            } else if (info instanceof RemoteActionItemInfo) {
-                applyFromRemoteActionInfo((RemoteActionItemInfo) info);
             }
 
             mDisableRelayout = false;
@@ -798,33 +776,4 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
             ((FastBitmapDrawable) mIcon).setScale(1f);
         }
     }
-
-    private void updateIcon(Drawable newIcon) {
-        if (mLayoutHorizontal) {
-            setCompoundDrawablesRelative(newIcon, null, null, null);
-        } else {
-            setCompoundDrawables(null, newIcon, null, null);
-        }
-    }
-
-    private static void animateIconUpdate(PlaceHolderIconDrawable oldIcon, Drawable newIcon) {
-        int placeholderColor = oldIcon.mPaint.getColor();
-        int originalAlpha = Color.alpha(placeholderColor);
-
-        ValueAnimator iconUpdateAnimation = ValueAnimator.ofInt(originalAlpha, 0);
-        iconUpdateAnimation.setDuration(ICON_UPDATE_ANIMATION_DURATION);
-        iconUpdateAnimation.addUpdateListener(valueAnimator -> {
-            int newAlpha = (int) valueAnimator.getAnimatedValue();
-            int newColor = ColorUtils.setAlphaComponent(placeholderColor, newAlpha);
-
-            newIcon.setColorFilter(new PorterDuffColorFilter(newColor, Mode.SRC_ATOP));
-        });
-        iconUpdateAnimation.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                newIcon.setColorFilter(null);
-            }
-        });
-        iconUpdateAnimation.start();
-    }
 }
diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
index df005e6357..09827d664b 100644
--- a/src/com/android/launcher3/ButtonDropTarget.java
+++ b/src/com/android/launcher3/ButtonDropTarget.java
@@ -47,6 +47,7 @@ import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.dragndrop.DragView;
 import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.util.Thunk;
 
@@ -394,4 +395,6 @@ public abstract class ButtonDropTarget extends TextView
                 TextUtils.TruncateAt.END);
         return !mText.equals(displayedText);
     }
+
+    public abstract Target getDropTargetForLogging();
 }
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 2809bd5a96..1cd201f99e 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -323,8 +323,11 @@ public class CellLayout extends ViewGroup {
 
     @Override
     public boolean onInterceptTouchEvent(MotionEvent ev) {
-        return mTouchHelper != null
-                || (mInterceptTouchListener != null && mInterceptTouchListener.onTouch(this, ev));
+        if (mTouchHelper != null
+                || (mInterceptTouchListener != null && mInterceptTouchListener.onTouch(this, ev))) {
+            return true;
+        }
+        return false;
     }
 
     public void enableHardwareLayer(boolean hasLayer) {
diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java
index cc119c9361..28574972ad 100644
--- a/src/com/android/launcher3/DeleteDropTarget.java
+++ b/src/com/android/launcher3/DeleteDropTarget.java
@@ -18,7 +18,8 @@ package com.android.launcher3;
 
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ITEM_DROPPED_ON_CANCEL;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ITEM_DROPPED_ON_REMOVE;
-import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_UNDO;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.TAP;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.ControlType.UNDO;
 
 import android.content.Context;
 import android.text.TextUtils;
@@ -27,19 +28,22 @@ import android.view.View;
 
 import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
 import com.android.launcher3.dragndrop.DragOptions;
+import com.android.launcher3.logging.LoggerUtils;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.model.ModelWriter;
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.launcher3.userevent.nano.LauncherLogProto.ControlType;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
 import com.android.launcher3.views.Snackbar;
 
 public class DeleteDropTarget extends ButtonDropTarget {
 
     private final StatsLogManager mStatsLogManager;
 
-    private StatsLogManager.LauncherEvent mLauncherEvent;
+    private int mControlType = ControlType.DEFAULT_CONTROLTYPE;
 
     public DeleteDropTarget(Context context, AttributeSet attrs) {
         this(context, attrs, 0);
@@ -111,8 +115,8 @@ public class DeleteDropTarget extends ButtonDropTarget {
      * Set mControlType depending on the drag item.
      */
     private void setControlTypeBasedOnDragSource(ItemInfo item) {
-        mLauncherEvent = item.id != ItemInfo.NO_ID ? LAUNCHER_ITEM_DROPPED_ON_REMOVE
-                : LAUNCHER_ITEM_DROPPED_ON_CANCEL;
+        mControlType = item.id != ItemInfo.NO_ID ? ControlType.REMOVE_TARGET
+                : ControlType.CANCEL_TARGET;
     }
 
     @Override
@@ -123,7 +127,8 @@ public class DeleteDropTarget extends ButtonDropTarget {
         }
         super.onDrop(d, options);
         mStatsLogManager.logger().withInstanceId(d.logInstanceId)
-                .log(mLauncherEvent);
+                .log(mControlType == ControlType.REMOVE_TARGET ? LAUNCHER_ITEM_DROPPED_ON_REMOVE
+                        : LAUNCHER_ITEM_DROPPED_ON_CANCEL);
     }
 
     @Override
@@ -136,7 +141,7 @@ public class DeleteDropTarget extends ButtonDropTarget {
             Runnable onUndoClicked = () -> {
                 mLauncher.setPageToBindSynchronously(itemPage);
                 modelWriter.abortDelete();
-                mLauncher.getStatsLogManager().logger().log(LAUNCHER_UNDO);
+                mLauncher.getUserEventDispatcher().logActionOnControl(TAP, UNDO);
             };
             Snackbar.show(mLauncher, R.string.item_removed, R.string.undo,
                     modelWriter::commitDelete, onUndoClicked);
@@ -156,4 +161,11 @@ public class DeleteDropTarget extends ButtonDropTarget {
         mLauncher.getDragLayer()
                 .announceForAccessibility(getContext().getString(R.string.item_removed));
     }
+
+    @Override
+    public Target getDropTargetForLogging() {
+        Target t = LoggerUtils.newTarget(Target.Type.CONTROL);
+        t.controlType = mControlType;
+        return t;
+    }
 }
diff --git a/src/com/android/launcher3/FastBitmapDrawable.java b/src/com/android/launcher3/FastBitmapDrawable.java
index 139d4a85e4..d3b86ded80 100644
--- a/src/com/android/launcher3/FastBitmapDrawable.java
+++ b/src/com/android/launcher3/FastBitmapDrawable.java
@@ -33,8 +33,6 @@ import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.util.Property;
 
-import androidx.annotation.Nullable;
-
 import com.android.launcher3.graphics.PlaceHolderIconDrawable;
 import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
@@ -56,8 +54,6 @@ public class FastBitmapDrawable extends Drawable {
     protected Bitmap mBitmap;
     protected final int mIconColor;
 
-    @Nullable private ColorFilter mColorFilter;
-
     private boolean mIsPressed;
     private boolean mIsDisabled;
     private float mDisabledAlpha = 1f;
@@ -119,8 +115,7 @@ public class FastBitmapDrawable extends Drawable {
 
     @Override
     public void setColorFilter(ColorFilter cf) {
-        mColorFilter = cf;
-        updateFilter();
+        // No op
     }
 
     @Override
@@ -270,7 +265,7 @@ public class FastBitmapDrawable extends Drawable {
      * Updates the paint to reflect the current brightness and saturation.
      */
     protected void updateFilter() {
-        mPaint.setColorFilter(mIsDisabled ? getDisabledColorFilter() : mColorFilter);
+        mPaint.setColorFilter(mIsDisabled ? getDisabledColorFilter() : null);
         invalidateSelf();
     }
 
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index 6547b53940..51f3819460 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -16,6 +16,8 @@
 
 package com.android.launcher3;
 
+import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
+
 import android.content.Context;
 import android.graphics.Rect;
 import android.util.AttributeSet;
@@ -25,10 +27,14 @@ import android.view.ViewDebug;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
-/**
- * View class that represents the bottom row of the home screen.
- */
-public class Hotseat extends CellLayout implements Insettable {
+import com.android.launcher3.logging.StatsLogUtils.LogContainerProvider;
+import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.userevent.nano.LauncherLogProto;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
+
+import java.util.ArrayList;
+
+public class Hotseat extends CellLayout implements LogContainerProvider, Insettable {
 
     @ViewDebug.ExportedProperty(category = "launcher")
     private boolean mHasVerticalHotseat;
@@ -72,6 +78,15 @@ public class Hotseat extends CellLayout implements Insettable {
         }
     }
 
+    @Override
+    public void fillInLogContainerData(ItemInfo childInfo, Target child,
+            ArrayList<Target> parents) {
+        child.rank = childInfo.rank;
+        child.gridX = childInfo.cellX;
+        child.gridY = childInfo.cellY;
+        parents.add(newContainerTarget(LauncherLogProto.ContainerType.HOTSEAT));
+    }
+
     @Override
     public void setInsets(Rect insets) {
         FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) getLayoutParams();
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 4b75a33fc1..90566f3ce8 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -18,7 +18,6 @@ package com.android.launcher3;
 
 import static android.content.pm.ActivityInfo.CONFIG_ORIENTATION;
 import static android.content.pm.ActivityInfo.CONFIG_SCREEN_SIZE;
-import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO;
 import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED;
 
 import static com.android.launcher3.AbstractFloatingView.TYPE_ALL;
@@ -37,10 +36,11 @@ import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.SPRING_LOADED;
 import static com.android.launcher3.Utilities.postAsyncCallback;
 import static com.android.launcher3.dragndrop.DragLayer.ALPHA_INDEX_LAUNCHER_LOAD;
+import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
-import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ONRESUME;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ONSTOP;
+import static com.android.launcher3.logging.StatsLogManager.containerTypeToAtomState;
 import static com.android.launcher3.model.ItemInstallQueue.FLAG_ACTIVITY_PAUSED;
 import static com.android.launcher3.model.ItemInstallQueue.FLAG_DRAG_AND_DROP;
 import static com.android.launcher3.model.ItemInstallQueue.FLAG_LOADER_RUNNING;
@@ -70,7 +70,6 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.database.sqlite.SQLiteDatabase;
-import android.graphics.Bitmap;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.CancellationSignal;
@@ -89,10 +88,9 @@ import android.view.Menu;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager.LayoutParams;
+import android.view.WindowManager;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.animation.OvershootInterpolator;
-import android.widget.ImageView;
 import android.widget.Toast;
 
 import androidx.annotation.CallSuper;
@@ -119,13 +117,13 @@ import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.dragndrop.DragView;
 import com.android.launcher3.folder.FolderGridOrganizer;
 import com.android.launcher3.folder.FolderIcon;
-import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.keyboard.CustomActionsPopup;
 import com.android.launcher3.keyboard.ViewGroupFocusHelper;
 import com.android.launcher3.logger.LauncherAtom;
 import com.android.launcher3.logging.FileLog;
 import com.android.launcher3.logging.StatsLogManager;
+import com.android.launcher3.logging.UserEventDispatcher;
 import com.android.launcher3.model.BgDataModel.Callbacks;
 import com.android.launcher3.model.ItemInstallQueue;
 import com.android.launcher3.model.ModelUtils;
@@ -153,6 +151,9 @@ import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.AllAppsSwipeController;
 import com.android.launcher3.touch.ItemClickHandler;
 import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Action;
+import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
 import com.android.launcher3.util.ActivityResultInfo;
 import com.android.launcher3.util.ActivityTracker;
 import com.android.launcher3.util.ComponentKey;
@@ -268,8 +269,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     private static final int APPS_VIEW_ALPHA_CHANNEL_INDEX = 1;
     private static final int SCRIM_VIEW_ALPHA_CHANNEL_INDEX = 0;
 
-    private static final int THEME_CROSS_FADE_ANIMATION_DURATION = 375;
-
     private LauncherAppTransitionManager mAppTransitionManager;
     private Configuration mOldConfig;
 
@@ -401,7 +400,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
         inflateRootView(R.layout.launcher);
         setupViews();
-        crossFadeWithPreviousAppearance();
         mPopupDataProvider = new PopupDataProvider(this::updateNotificationDots);
 
         mAppTransitionManager = LauncherAppTransitionManager.newInstance(this);
@@ -478,7 +476,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
                 () -> getStateManager().goToState(NORMAL));
 
         if (Utilities.ATLEAST_R) {
-            getWindow().setSoftInputMode(LayoutParams.SOFT_INPUT_ADJUST_NOTHING);
+            getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING);
         }
 
         mLifecycleRegistry = new LifecycleRegistry(this);
@@ -556,6 +554,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     }
 
     private void onIdpChanged(InvariantDeviceProfile idp) {
+        mUserEventDispatcher = null;
 
         initDeviceProfile(idp);
         dispatchDeviceProfileChanged();
@@ -911,7 +910,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
             mOverlayManager.onActivityStopped(this);
         }
 
-        logStopAndResume(false /* isResume */);
+        logStopAndResume(Action.Command.STOP);
         mAppWidgetHost.setListenIfResumed(false);
         NotificationListener.removeNotificationsChangedListener();
     }
@@ -933,7 +932,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     @Override
     @CallSuper
     protected void onDeferredResumed() {
-        logStopAndResume(true /* isResume */);
+        logStopAndResume(Action.Command.RESUME);
 
         // Process any items that were added while Launcher was away.
         ItemInstallQueue.INSTANCE.get(this)
@@ -950,28 +949,32 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
     protected void handlePendingActivityRequest() { }
 
-    private void logStopAndResume(boolean isResume) {
+    private void logStopAndResume(int command) {
         if (mPendingExecutor != null) return;
         int pageIndex = mWorkspace.isOverlayShown() ? -1 : mWorkspace.getCurrentPage();
-        int statsLogOrdinal = mStateManager.getState().statsLogOrdinal;
+        int containerType = mStateManager.getState().containerType;
 
         StatsLogManager.EventEnum event;
         StatsLogManager.StatsLogger logger = getStatsLogManager().logger();
-        if (isResume) {
+        if (command == Action.Command.RESUME) {
             logger.withSrcState(LAUNCHER_STATE_BACKGROUND)
-                .withDstState(mStateManager.getState().statsLogOrdinal);
+                .withDstState(containerTypeToAtomState(mStateManager.getState().containerType));
             event = LAUNCHER_ONRESUME;
         } else { /* command == Action.Command.STOP */
-            logger.withSrcState(mStateManager.getState().statsLogOrdinal)
+            logger.withSrcState(containerTypeToAtomState(mStateManager.getState().containerType))
                     .withDstState(LAUNCHER_STATE_BACKGROUND);
             event = LAUNCHER_ONSTOP;
         }
 
-        if (statsLogOrdinal == LAUNCHER_STATE_HOME && mWorkspace != null) {
+        if (containerType == ContainerType.WORKSPACE && mWorkspace != null) {
+            getUserEventDispatcher().logActionCommand(command,
+                    containerType, -1, pageIndex);
             logger.withContainerInfo(LauncherAtom.ContainerInfo.newBuilder()
                     .setWorkspace(
                             LauncherAtom.WorkspaceContainer.newBuilder()
                                     .setPageIndex(pageIndex)).build());
+        } else {
+            getUserEventDispatcher().logActionCommand(command, containerType, -1);
         }
         logger.log(event);
     }
@@ -1361,18 +1364,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         closeContextMenu();
     }
 
-    @Override
-    public Object onRetainNonConfigurationInstance() {
-        int width = mDragLayer.getWidth();
-        int height = mDragLayer.getHeight();
-
-        if (width <= 0 || height <= 0) {
-            return null;
-        }
-
-        return BitmapRenderer.createHardwareBitmap(width, height, mDragLayer::draw);
-    }
-
     public AllAppsTransitionController getAllAppsController() {
         return mAllAppsController;
     }
@@ -1473,6 +1464,11 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
             }
 
             // Handle HOME_INTENT
+            UserEventDispatcher ued = getUserEventDispatcher();
+            Target target = newContainerTarget(mStateManager.getState().containerType);
+            target.pageIndex = mWorkspace.getCurrentPage();
+            ued.logActionCommand(Action.Command.HOME_INTENT, target,
+                    newContainerTarget(ContainerType.WORKSPACE));
             hideKeyboard();
 
             if (mLauncherCallbacks != null) {
@@ -2762,40 +2758,4 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
         void onLauncherResume();
     }
-
-    /**
-     * Cross-fades the launcher's updated appearance with its previous appearance.
-     *
-     * This method is used to cross-fade UI updates on activity creation, specifically dark mode
-     * updates.
-     */
-    private void crossFadeWithPreviousAppearance() {
-        Bitmap previousAppearanceBitmap = (Bitmap) getLastNonConfigurationInstance();
-
-        if (previousAppearanceBitmap == null) {
-            return;
-        }
-
-        ImageView crossFadeHelper = new ImageView(this);
-
-        crossFadeHelper.setImageBitmap(previousAppearanceBitmap);
-        crossFadeHelper.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
-
-        InsettableFrameLayout.LayoutParams layoutParams = new InsettableFrameLayout.LayoutParams(
-                InsettableFrameLayout.LayoutParams.MATCH_PARENT,
-                InsettableFrameLayout.LayoutParams.MATCH_PARENT);
-
-        layoutParams.ignoreInsets = true;
-
-        crossFadeHelper.setLayoutParams(layoutParams);
-
-        getRootView().addView(crossFadeHelper);
-
-        crossFadeHelper
-                .animate()
-                .setDuration(THEME_CROSS_FADE_ANIMATION_DURATION)
-                .alpha(0f)
-                .withEndAction(() -> getRootView().removeView(crossFadeHelper))
-                .start();
-    }
 }
diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index a4181c53c9..bfe327e40d 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -105,7 +105,7 @@ public class LauncherAppState {
         new Handler().post( () -> mInvariantDeviceProfile.verifyConfigChangedInBackground(context));
 
         mInstallSessionTracker = InstallSessionHelper.INSTANCE.get(context)
-                .registerInstallTracker(mModel);
+                .registerInstallTracker(mModel, MODEL_EXECUTOR);
 
         // Register an observer to rebind the notification listener when dots are re-enabled.
         mNotificationDotsObserver =
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java
index eba0ac9633..b6bc500a58 100644
--- a/src/com/android/launcher3/LauncherState.java
+++ b/src/com/android/launcher3/LauncherState.java
@@ -16,7 +16,6 @@
 package com.android.launcher3;
 
 import static com.android.launcher3.anim.Interpolators.ACCEL_2;
-import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
 import static com.android.launcher3.testing.TestProtocol.ALL_APPS_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.BACKGROUND_APP_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.HINT_STATE_ORDINAL;
@@ -36,6 +35,7 @@ import com.android.launcher3.states.SpringLoadedState;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.uioverrides.states.AllAppsState;
 import com.android.launcher3.uioverrides.states.OverviewState;
+import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 
 import java.util.Arrays;
 
@@ -97,7 +97,7 @@ public abstract class LauncherState implements BaseState<LauncherState> {
      * TODO: Create a separate class for NORMAL state.
      */
     public static final LauncherState NORMAL = new LauncherState(NORMAL_STATE_ORDINAL,
-            LAUNCHER_STATE_HOME,
+            ContainerType.WORKSPACE,
             FLAG_DISABLE_RESTORE | FLAG_WORKSPACE_ICONS_CAN_BE_DRAGGED | FLAG_HIDE_BACK_BUTTON |
                     FLAG_HAS_SYS_UI_SCRIM) {
         @Override
@@ -126,9 +126,9 @@ public abstract class LauncherState implements BaseState<LauncherState> {
     public final int ordinal;
 
     /**
-     * Used for {@link com.android.launcher3.logging.StatsLogManager}
+     * Used for containerType in {@link com.android.launcher3.logging.UserEventDispatcher}
      */
-    public final int statsLogOrdinal;
+    public final int containerType;
 
     /**
      * True if the state has overview panel visible.
@@ -137,8 +137,8 @@ public abstract class LauncherState implements BaseState<LauncherState> {
 
     private final int mFlags;
 
-    public LauncherState(int id, int statsLogOrdinal, int flags) {
-        this.statsLogOrdinal = statsLogOrdinal;
+    public LauncherState(int id, int containerType, int flags) {
+        this.containerType = containerType;
         this.mFlags = flags;
         this.overviewUi = (flags & FLAG_OVERVIEW_UI) != 0;
         this.ordinal = id;
diff --git a/src/com/android/launcher3/SecondaryDropTarget.java b/src/com/android/launcher3/SecondaryDropTarget.java
index 92b88e6186..2df7f5ad20 100644
--- a/src/com/android/launcher3/SecondaryDropTarget.java
+++ b/src/com/android/launcher3/SecondaryDropTarget.java
@@ -37,11 +37,14 @@ import com.android.launcher3.Launcher.OnResumeCallback;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.logging.FileLog;
+import com.android.launcher3.logging.LoggerUtils;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.logging.StatsLogManager.StatsLogger;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
+import com.android.launcher3.userevent.nano.LauncherLogProto.ControlType;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.launcher3.util.Themes;
 
@@ -131,6 +134,19 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList
         return mCurrentAccessibilityAction;
     }
 
+    @Override
+    public Target getDropTargetForLogging() {
+        Target t = LoggerUtils.newTarget(Target.Type.CONTROL);
+        if (mCurrentAccessibilityAction == UNINSTALL) {
+            t.controlType = ControlType.UNINSTALL_TARGET;
+        } else if (mCurrentAccessibilityAction == DISMISS_PREDICTION) {
+            t.controlType = ControlType.DISMISS_PREDICTION;
+        } else {
+            t.controlType = ControlType.SETTINGS_BUTTON;
+        }
+        return t;
+    }
+
     @Override
     protected boolean supportsDrop(ItemInfo info) {
         return supportsAccessibilityDrop(info, getViewUnderDrag(info));
diff --git a/src/com/android/launcher3/SessionCommitReceiver.java b/src/com/android/launcher3/SessionCommitReceiver.java
index 1bbbb2b59e..007e5f5370 100644
--- a/src/com/android/launcher3/SessionCommitReceiver.java
+++ b/src/com/android/launcher3/SessionCommitReceiver.java
@@ -25,11 +25,8 @@ import android.content.pm.PackageManager;
 import android.os.UserHandle;
 import android.text.TextUtils;
 
-import androidx.annotation.WorkerThread;
-
 import com.android.launcher3.model.ItemInstallQueue;
 import com.android.launcher3.pm.InstallSessionHelper;
-import com.android.launcher3.util.Executors;
 
 /**
  * BroadcastReceiver to handle session commit intent.
@@ -41,11 +38,6 @@ public class SessionCommitReceiver extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        Executors.MODEL_EXECUTOR.execute(() -> processIntent(context, intent));
-    }
-
-    @WorkerThread
-    private static void processIntent(Context context, Intent intent) {
         if (!isEnabled(context)) {
             // User has decided to not add icons on homescreen.
             return;
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 43ccb7990c..dea2a8dfd2 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -133,10 +133,6 @@ public final class Utilities {
     public static final String EXTRA_WALLPAPER_OFFSET = "com.android.launcher3.WALLPAPER_OFFSET";
     public static final String EXTRA_WALLPAPER_FLAVOR = "com.android.launcher3.WALLPAPER_FLAVOR";
 
-    // An intent extra to indicate the launch source by launcher.
-    public static final String EXTRA_WALLPAPER_LAUNCH_SOURCE =
-            "com.android.wallpaper.LAUNCH_SOURCE";
-
     public static boolean IS_RUNNING_IN_TEST_HARNESS =
                     ActivityManager.isRunningInTestHarness();
 
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 98328cf8af..45aaa1b673 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -85,6 +85,7 @@ import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.logger.LauncherAtom;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.logging.StatsLogManager.LauncherEvent;
+import com.android.launcher3.logging.UserEventDispatcher;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
@@ -96,6 +97,8 @@ import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.touch.WorkspaceTouchListener;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Action;
+import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.launcher3.util.Executors;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.IntSparseArrayMap;
@@ -1001,6 +1004,8 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
     public void onOverlayScrollChanged(float scroll) {
         if (Float.compare(scroll, 1f) == 0) {
             if (!mOverlayShown) {
+                mLauncher.getUserEventDispatcher().logActionOnContainer(Action.Touch.SWIPE,
+                        Action.Direction.LEFT, ContainerType.WORKSPACE, 0);
                 mLauncher.getStatsLogManager().logger()
                         .withSrcState(LAUNCHER_STATE_HOME)
                         .withDstState(LAUNCHER_STATE_HOME)
@@ -1015,16 +1020,20 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
             // Not announcing the overlay page for accessibility since it announces itself.
         } else if (Float.compare(scroll, 0f) == 0) {
             if (mOverlayShown) {
-                // TODO: this is logged unnecessarily on home gesture.
-                mLauncher.getStatsLogManager().logger()
-                        .withSrcState(LAUNCHER_STATE_HOME)
-                        .withDstState(LAUNCHER_STATE_HOME)
-                        .withContainerInfo(LauncherAtom.ContainerInfo.newBuilder()
-                                .setWorkspace(
-                                        LauncherAtom.WorkspaceContainer.newBuilder()
-                                                .setPageIndex(-1))
-                                .build())
-                        .log(LAUNCHER_SWIPERIGHT);
+                UserEventDispatcher ued = mLauncher.getUserEventDispatcher();
+                if (!ued.isPreviousHomeGesture()) {
+                    mLauncher.getUserEventDispatcher().logActionOnContainer(Action.Touch.SWIPE,
+                        Action.Direction.RIGHT, ContainerType.WORKSPACE, -1);
+                    mLauncher.getStatsLogManager().logger()
+                            .withSrcState(LAUNCHER_STATE_HOME)
+                            .withDstState(LAUNCHER_STATE_HOME)
+                            .withContainerInfo(LauncherAtom.ContainerInfo.newBuilder()
+                                    .setWorkspace(
+                                            LauncherAtom.WorkspaceContainer.newBuilder()
+                                                    .setPageIndex(-1))
+                                    .build())
+                            .log(LAUNCHER_SWIPERIGHT);
+                }
             } else if (Float.compare(mOverlayTranslation, 0f) != 0) {
                 // When arriving to 0 overscroll from non-zero overscroll, announce page for
                 // accessibility since default announcements were disabled while in overscroll
@@ -1115,8 +1124,12 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
     protected void notifyPageSwitchListener(int prevPage) {
         super.notifyPageSwitchListener(prevPage);
         if (prevPage != mCurrentPage) {
+            int swipeDirection = (prevPage < mCurrentPage)
+                    ? Action.Direction.RIGHT : Action.Direction.LEFT;
             StatsLogManager.EventEnum event = (prevPage < mCurrentPage)
                     ? LAUNCHER_SWIPERIGHT : LAUNCHER_SWIPELEFT;
+            mLauncher.getUserEventDispatcher().logActionOnContainer(Action.Touch.SWIPE,
+                    swipeDirection, ContainerType.WORKSPACE, prevPage);
             mLauncher.getStatsLogManager().logger()
                     .withSrcState(LAUNCHER_STATE_HOME)
                     .withDstState(LAUNCHER_STATE_HOME)
@@ -1162,6 +1175,13 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         computeScrollHelper(false);
     }
 
+    @Override
+    protected void determineScrollingStart(MotionEvent ev, float touchSlopScale) {
+        if (!isSwitchingState()) {
+            super.determineScrollingStart(ev, touchSlopScale);
+        }
+    }
+
     @Override
     public void announceForAccessibility(CharSequence text) {
         // Don't announce if apps is on top of us.
diff --git a/src/com/android/launcher3/WorkspaceLayoutManager.java b/src/com/android/launcher3/WorkspaceLayoutManager.java
index d6302ce580..ea887cc5eb 100644
--- a/src/com/android/launcher3/WorkspaceLayoutManager.java
+++ b/src/com/android/launcher3/WorkspaceLayoutManager.java
@@ -130,16 +130,12 @@ public interface WorkspaceLayoutManager {
         }
 
         child.setHapticFeedbackEnabled(false);
-        child.setOnLongClickListener(getWorkspaceChildOnLongClickListener());
+        child.setOnLongClickListener(ItemLongClickListener.INSTANCE_WORKSPACE);
         if (child instanceof DropTarget) {
             onAddDropTarget((DropTarget) child);
         }
     }
 
-    default View.OnLongClickListener getWorkspaceChildOnLongClickListener() {
-        return ItemLongClickListener.INSTANCE_WORKSPACE;
-    }
-
     Hotseat getHotseat();
 
     CellLayout getScreenWithId(int screenId);
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index 8bc8e53af3..d1340faf23 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -92,14 +92,10 @@ public class AllAppsGridAdapter extends
 
     public static final int VIEW_TYPE_SEARCH_SLICE = 1 << 9;
 
-    public static final int VIEW_TYPE_SEARCH_ICON_ROW = 1 << 10;
+    public static final int VIEW_TYPE_SEARCH_SHORTCUT = 1 << 10;
 
     public static final int VIEW_TYPE_SEARCH_PEOPLE = 1 << 11;
 
-    public static final int VIEW_TYPE_SEARCH_THUMBNAIL = 1 << 12;
-
-    public static final int VIEW_TYPE_SEARCH_SUGGEST = 1 << 13;
-
     // Common view type masks
     public static final int VIEW_TYPE_MASK_DIVIDER = VIEW_TYPE_ALL_APPS_DIVIDER;
     public static final int VIEW_TYPE_MASK_ICON = VIEW_TYPE_ICON;
@@ -190,9 +186,7 @@ public class AllAppsGridAdapter extends
                     || viewType == VIEW_TYPE_SEARCH_SLICE
                     || viewType == VIEW_TYPE_SEARCH_ROW
                     || viewType == VIEW_TYPE_SEARCH_PEOPLE
-                    || viewType == VIEW_TYPE_SEARCH_THUMBNAIL
-                    || viewType == VIEW_TYPE_SEARCH_ICON_ROW
-                    || viewType == VIEW_TYPE_SEARCH_SUGGEST;
+                    || viewType == VIEW_TYPE_SEARCH_SHORTCUT;
         }
     }
 
@@ -203,7 +197,6 @@ public class AllAppsGridAdapter extends
      */
     public static class AdapterItemWithPayload<T> extends AdapterItem {
         private T mPayload;
-        private String mSearchSessionId;
         private AllAppsSearchPlugin mPlugin;
         private IntConsumer mSelectionHandler;
 
@@ -225,14 +218,6 @@ public class AllAppsGridAdapter extends
             mSelectionHandler = runnable;
         }
 
-        public void setSearchSessionId(String searchSessionId) {
-            mSearchSessionId = searchSessionId;
-        }
-
-        public String getSearchSessionId() {
-            return mSearchSessionId;
-        }
-
         public IntConsumer getSelectionHandler() {
             return mSelectionHandler;
         }
@@ -240,8 +225,6 @@ public class AllAppsGridAdapter extends
         public T getPayload() {
             return mPayload;
         }
-
-
     }
 
     /**
@@ -324,21 +307,15 @@ public class AllAppsGridAdapter extends
 
         @Override
         public int getSpanSize(int position) {
-            int viewType = mApps.getAdapterItems().get(position).viewType;
-            if (isIconViewType(viewType)) {
-                return 1 * SPAN_MULTIPLIER;
-            } else if (viewType == VIEW_TYPE_SEARCH_THUMBNAIL) {
-                return mAppsPerRow;
+            if (isIconViewType(mApps.getAdapterItems().get(position).viewType)) {
+                return 1;
             } else {
                 // Section breaks span the full width
-                return mAppsPerRow * SPAN_MULTIPLIER;
+                return mAppsPerRow;
             }
         }
     }
 
-    // multiplier to support adapter item column count that is not mAppsPerRow.
-    public static final int SPAN_MULTIPLIER = 3;
-
     private final BaseDraggingActivity mLauncher;
     private final LayoutInflater mLayoutInflater;
     private final AlphabeticalAppsList mApps;
@@ -375,7 +352,7 @@ public class AllAppsGridAdapter extends
 
     public void setAppsPerRow(int appsPerRow) {
         mAppsPerRow = appsPerRow;
-        mGridLayoutMgr.setSpanCount(mAppsPerRow * SPAN_MULTIPLIER);
+        mGridLayoutMgr.setSpanCount(mAppsPerRow);
     }
 
     /**
@@ -461,18 +438,12 @@ public class AllAppsGridAdapter extends
             case VIEW_TYPE_SEARCH_SLICE:
                 return new ViewHolder(mLayoutInflater.inflate(
                         R.layout.search_result_slice, parent, false));
-            case VIEW_TYPE_SEARCH_ICON_ROW:
+            case VIEW_TYPE_SEARCH_SHORTCUT:
                 return new ViewHolder(mLayoutInflater.inflate(
-                        R.layout.search_result_icon_row, parent, false));
+                        R.layout.search_result_shortcut, parent, false));
             case VIEW_TYPE_SEARCH_PEOPLE:
                 return new ViewHolder(mLayoutInflater.inflate(
                         R.layout.search_result_people_item, parent, false));
-            case VIEW_TYPE_SEARCH_THUMBNAIL:
-                return new ViewHolder(mLayoutInflater.inflate(
-                        R.layout.search_result_thumbnail, parent, false));
-            case VIEW_TYPE_SEARCH_SUGGEST:
-                return new ViewHolder(mLayoutInflater.inflate(
-                        R.layout.search_result_suggest, parent, false));
             default:
                 throw new RuntimeException("Unexpected view type");
         }
@@ -493,27 +464,24 @@ public class AllAppsGridAdapter extends
                 //TODO: replace with custom TopHitBubbleTextView with support for both shortcut
                 // and apps
                 if (adapterItem instanceof AdapterItemWithPayload) {
-                    AdapterItemWithPayload item = (AdapterItemWithPayload) adapterItem;
-                    item.setSelectionHandler(type -> {
+                    AdapterItemWithPayload withPayload = (AdapterItemWithPayload) adapterItem;
+                    IntConsumer selectionHandler = type -> {
                         SearchTargetEvent e = new SearchTargetEvent(SearchTarget.ItemType.APP,
-                                type, item.position, item.getSearchSessionId());
+                                type);
                         e.bundle = HeroSearchResultView.getAppBundle(info);
-                        if (item.getPlugin() != null) {
-                            item.getPlugin().notifySearchTargetEvent(e);
+                        if (withPayload.getPlugin() != null) {
+                            withPayload.getPlugin().notifySearchTargetEvent(e);
                         }
-                    });
+                    };
                     icon.setOnClickListener(view -> {
-                        item.getSelectionHandler().accept(SearchTargetEvent.SELECT);
+                        selectionHandler.accept(SearchTargetEvent.SELECT);
                         mOnIconClickListener.onClick(view);
                     });
                     icon.setOnLongClickListener(view -> {
-                        item.getSelectionHandler().accept(SearchTargetEvent.SELECT);
+                        selectionHandler.accept(SearchTargetEvent.LONG_PRESS);
                         return mOnIconLongClickListener.onLongClick(view);
                     });
-                }
-                else {
-                    icon.setOnClickListener(mOnIconClickListener);
-                    icon.setOnLongClickListener(mOnIconLongClickListener);
+                    withPayload.setSelectionHandler(selectionHandler);
                 }
                 break;
             case VIEW_TYPE_EMPTY_SEARCH:
@@ -532,22 +500,20 @@ public class AllAppsGridAdapter extends
                 break;
             case VIEW_TYPE_SEARCH_SLICE:
                 SliceView sliceView = (SliceView) holder.itemView;
-                AdapterItemWithPayload<Uri> slicePayload =
+                AdapterItemWithPayload<Uri> item =
                         (AdapterItemWithPayload<Uri>) mApps.getAdapterItems().get(position);
                 sliceView.setOnSliceActionListener((info1, s) -> {
-                    if (slicePayload.getPlugin() != null) {
+                    if (item.getPlugin() != null) {
                         SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
                                 SearchTarget.ItemType.SETTINGS_SLICE,
-                                SearchTargetEvent.CHILD_SELECT, slicePayload.position,
-                                slicePayload.getSearchSessionId());
+                                SearchTargetEvent.CHILD_SELECT);
                         searchTargetEvent.bundle = new Bundle();
-                        searchTargetEvent.bundle.putParcelable("uri", slicePayload.getPayload());
-                        slicePayload.getPlugin().notifySearchTargetEvent(searchTargetEvent);
+                        searchTargetEvent.bundle.putParcelable("uri", item.getPayload());
+                        item.getPlugin().notifySearchTargetEvent(searchTargetEvent);
                     }
                 });
                 try {
-                    LiveData<Slice> liveData = SliceLiveData.fromUri(mLauncher,
-                            slicePayload.getPayload());
+                    LiveData<Slice> liveData = SliceLiveData.fromUri(mLauncher, item.getPayload());
                     liveData.observe((Launcher) mLauncher, sliceView);
                     sliceView.setTag(liveData);
                 } catch (Exception ignored) {
@@ -557,14 +523,11 @@ public class AllAppsGridAdapter extends
             case VIEW_TYPE_SEARCH_ROW_WITH_BUTTON:
             case VIEW_TYPE_SEARCH_HERO_APP:
             case VIEW_TYPE_SEARCH_ROW:
-            case VIEW_TYPE_SEARCH_ICON_ROW:
+            case VIEW_TYPE_SEARCH_SHORTCUT:
             case VIEW_TYPE_SEARCH_PEOPLE:
-            case VIEW_TYPE_SEARCH_THUMBNAIL:
-            case VIEW_TYPE_SEARCH_SUGGEST:
-                AdapterItemWithPayload item =
-                        (AdapterItemWithPayload) mApps.getAdapterItems().get(position);
                 PayloadResultHandler payloadResultView = (PayloadResultHandler) holder.itemView;
-                payloadResultView.setup(item);
+                payloadResultView.applyAdapterInfo(
+                        (AdapterItemWithPayload) mApps.getAdapterItems().get(position));
                 break;
             case VIEW_TYPE_ALL_APPS_DIVIDER:
                 // nothing to do
@@ -578,8 +541,8 @@ public class AllAppsGridAdapter extends
         if (!FeatureFlags.ENABLE_DEVICE_SEARCH.get()) return;
         if (holder.itemView instanceof BubbleTextView) {
             BubbleTextView icon = (BubbleTextView) holder.itemView;
-            icon.setOnClickListener(null);
-            icon.setOnLongClickListener(null);
+            icon.setOnClickListener(mOnIconClickListener);
+            icon.setOnLongClickListener(mOnIconLongClickListener);
         } else if (holder.itemView instanceof SliceView) {
             SliceView sliceView = (SliceView) holder.itemView;
             sliceView.setOnSliceActionListener(null);
@@ -590,6 +553,7 @@ public class AllAppsGridAdapter extends
         }
     }
 
+
     @Override
     public boolean onFailedToRecycleView(ViewHolder holder) {
         // Always recycle and we will reset the view when it is bound
diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
index 72b6d94192..13a93ff0cc 100644
--- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
@@ -19,6 +19,8 @@ import static android.view.View.MeasureSpec.EXACTLY;
 import static android.view.View.MeasureSpec.UNSPECIFIED;
 import static android.view.View.MeasureSpec.makeMeasureSpec;
 
+import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
+
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Canvas;
@@ -36,6 +38,10 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsGridAdapter.AppsGridLayoutManager;
+import com.android.launcher3.logging.StatsLogUtils.LogContainerProvider;
+import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
 import com.android.launcher3.views.RecyclerViewFastScroller;
 
 import java.util.ArrayList;
@@ -44,7 +50,7 @@ import java.util.List;
 /**
  * A RecyclerView with custom fast scroll support for the all apps view.
  */
-public class AllAppsRecyclerView extends BaseRecyclerView {
+public class AllAppsRecyclerView extends BaseRecyclerView implements LogContainerProvider {
 
     private AlphabeticalAppsList mApps;
     private final int mNumAppsPerRow;
@@ -170,6 +176,13 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
         mAutoSizedOverlays.clear();
     }
 
+    @Override
+    public void fillInLogContainerData(ItemInfo childInfo, Target child,
+            ArrayList<Target> parents) {
+        parents.add(newContainerTarget(
+                getApps().hasFilter() ? ContainerType.SEARCHRESULT : ContainerType.ALLAPPS));
+    }
+
     public void onSearchResultsChanged() {
         // Always scroll the view to the top so the user can see the changed results
         scrollToTop();
diff --git a/src/com/android/launcher3/allapps/DiscoveryBounce.java b/src/com/android/launcher3/allapps/DiscoveryBounce.java
index 0005db88c8..14595ca941 100644
--- a/src/com/android/launcher3/allapps/DiscoveryBounce.java
+++ b/src/com/android/launcher3/allapps/DiscoveryBounce.java
@@ -18,6 +18,8 @@ package com.android.launcher3.allapps;
 
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType.HOTSEAT;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType.PREDICTION;
 
 import android.animation.Animator;
 import android.animation.AnimatorInflater;
@@ -118,10 +120,10 @@ public class DiscoveryBounce extends AbstractFloatingView {
         return (type & TYPE_DISCOVERY_BOUNCE) != 0;
     }
 
-    private void show() {
+    private void show(int containerType) {
         mIsOpen = true;
         mLauncher.getDragLayer().addView(this);
-        // TODO: add WW log for discovery bounce tip show event.
+        mLauncher.getUserEventDispatcher().logActionBounceTip(containerType);
     }
 
     public static void showForHomeIfNeeded(Launcher launcher) {
@@ -144,7 +146,7 @@ public class DiscoveryBounce extends AbstractFloatingView {
         }
         onboardingPrefs.incrementEventCount(OnboardingPrefs.HOME_BOUNCE_COUNT);
 
-        new DiscoveryBounce(launcher, 0).show();
+        new DiscoveryBounce(launcher, 0).show(HOTSEAT);
     }
 
     public static void showForOverviewIfNeeded(Launcher launcher,
@@ -177,7 +179,7 @@ public class DiscoveryBounce extends AbstractFloatingView {
         onboardingPrefs.incrementEventCount(OnboardingPrefs.SHELF_BOUNCE_COUNT);
 
         new DiscoveryBounce(launcher, (1 - OVERVIEW.getVerticalProgress(launcher)))
-                .show();
+                .show(PREDICTION);
     }
 
     /**
diff --git a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
index d7fa5bc479..3320189a1d 100644
--- a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
+++ b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
@@ -35,8 +35,6 @@ import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.systemui.plugins.AllAppsSearchPlugin;
-import com.android.systemui.plugins.shared.SearchTarget;
-import com.android.systemui.plugins.shared.SearchTargetEvent;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -215,44 +213,6 @@ public class AllAppsSearchBarController
         /**
          * Updates View using Adapter's payload
          */
-
-        default void setup(AdapterItemWithPayload<T> adapterItemWithPayload) {
-            Object[] targetInfo = getTargetInfo();
-            if (targetInfo != null) {
-                targetInfo[0] = adapterItemWithPayload.getSearchSessionId();
-                targetInfo[1] = adapterItemWithPayload.position;
-            }
-            applyAdapterInfo(adapterItemWithPayload);
-        }
-
         void applyAdapterInfo(AdapterItemWithPayload<T> adapterItemWithPayload);
-
-        /**
-         * Gets object created by {@link PayloadResultHandler#createTargetInfo()}
-         */
-        Object[] getTargetInfo();
-
-        /**
-         * Creates a wrapper object to hold searchSessionId and item position
-         */
-        default Object[] createTargetInfo() {
-            return new Object[2];
-        }
-
-        /**
-         * Generates a SearchTargetEvent object for a PayloadHandlerView
-         */
-        default SearchTargetEvent getSearchTargetEvent(SearchTarget.ItemType itemType,
-                int eventType) {
-            Object[] targetInfo = getTargetInfo();
-            if (targetInfo == null) return null;
-
-            String searchSessionId = (String) targetInfo[0];
-            int position = (int) targetInfo[1];
-            return new SearchTargetEvent(itemType, eventType,
-                    position, searchSessionId);
-        }
     }
-
-
 }
\ No newline at end of file
diff --git a/src/com/android/launcher3/anim/PendingAnimation.java b/src/com/android/launcher3/anim/PendingAnimation.java
index 6dd316ed60..53625756b8 100644
--- a/src/com/android/launcher3/anim/PendingAnimation.java
+++ b/src/com/android/launcher3/anim/PendingAnimation.java
@@ -73,9 +73,9 @@ public class PendingAnimation implements PropertySetter {
         addAnimationHoldersRecur(a, mDuration, springProperty, mAnimHolders);
     }
 
-    public void finish(boolean isSuccess) {
+    public void finish(boolean isSuccess, int logAction) {
         for (Consumer<EndState> listeners : mEndListeners) {
-            listeners.accept(new EndState(isSuccess));
+            listeners.accept(new EndState(isSuccess, logAction));
         }
         mEndListeners.clear();
     }
@@ -164,7 +164,7 @@ public class PendingAnimation implements PropertySetter {
 
     /**
      * Add a listener of receiving the end state.
-     * Note that the listeners are called as a result of calling {@link #finish(boolean)}
+     * Note that the listeners are called as a result of calling {@link #finish(boolean, int)}
      * and not automatically
      */
     public void addEndListener(Consumer<EndState> listener) {
@@ -173,9 +173,11 @@ public class PendingAnimation implements PropertySetter {
 
     public static class EndState {
         public boolean isSuccess;
+        public int logAction;
 
-        public EndState(boolean isSuccess) {
+        public EndState(boolean isSuccess, int logAction) {
             this.isSuccess = isSuccess;
+            this.logAction = logAction;
         }
     }
 }
diff --git a/src/com/android/launcher3/dragndrop/AddItemActivity.java b/src/com/android/launcher3/dragndrop/AddItemActivity.java
index 42e247aa9b..2d625c5373 100644
--- a/src/com/android/launcher3/dragndrop/AddItemActivity.java
+++ b/src/com/android/launcher3/dragndrop/AddItemActivity.java
@@ -16,11 +16,10 @@
 
 package com.android.launcher3.dragndrop;
 
-import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ADD_EXTERNAL_ITEM_BACK;
-import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ADD_EXTERNAL_ITEM_CANCELLED;
-import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ADD_EXTERNAL_ITEM_DRAGGED;
-import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ADD_EXTERNAL_ITEM_PLACED_AUTOMATICALLY;
-import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ADD_EXTERNAL_ITEM_START;
+import static com.android.launcher3.logging.LoggerUtils.newCommandAction;
+import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
+import static com.android.launcher3.logging.LoggerUtils.newItemTarget;
+import static com.android.launcher3.logging.LoggerUtils.newLauncherEvent;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
 import android.annotation.TargetApi;
@@ -50,10 +49,11 @@ import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherAppWidgetHost;
 import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.R;
-import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.model.ItemInstallQueue;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.pm.PinRequestHelper;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Action;
+import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.launcher3.util.InstantAppResolver;
 import com.android.launcher3.views.BaseDragLayer;
 import com.android.launcher3.widget.PendingAddShortcutInfo;
@@ -125,7 +125,7 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
         // savedInstanceState is null when the activity is created the first time (i.e., avoids
         // duplicate logging during rotation)
         if (savedInstanceState == null) {
-            logCommand(LAUNCHER_ADD_EXTERNAL_ITEM_START);
+            logCommand(Action.Command.ENTRY);
         }
     }
 
@@ -178,7 +178,6 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
         startActivity(homeIntent,
                 ActivityOptions.makeCustomAnimation(this, 0, android.R.anim.fade_out)
                         .toBundle());
-        logCommand(LAUNCHER_ADD_EXTERNAL_ITEM_DRAGGED);
         mFinishOnPause = true;
         return false;
     }
@@ -241,7 +240,7 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
      * Called when the cancel button is clicked.
      */
     public void onCancelClick(View v) {
-        logCommand(LAUNCHER_ADD_EXTERNAL_ITEM_CANCELLED);
+        logCommand(Action.Command.CANCEL);
         finish();
     }
 
@@ -251,7 +250,7 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
     public void onPlaceAutomaticallyClick(View v) {
         if (mRequest.getRequestType() == PinItemRequest.REQUEST_TYPE_SHORTCUT) {
             ItemInstallQueue.INSTANCE.get(this).queueItem(mRequest.getShortcutInfo());
-            logCommand(LAUNCHER_ADD_EXTERNAL_ITEM_PLACED_AUTOMATICALLY);
+            logCommand(Action.Command.CONFIRM);
             mRequest.accept();
             finish();
             return;
@@ -275,13 +274,13 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
                 .queueItem(mRequest.getAppWidgetProviderInfo(this), widgetId);
         mWidgetOptions.putInt(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId);
         mRequest.accept(mWidgetOptions);
-        logCommand(LAUNCHER_ADD_EXTERNAL_ITEM_PLACED_AUTOMATICALLY);
+        logCommand(Action.Command.CONFIRM);
         finish();
     }
 
     @Override
     public void onBackPressed() {
-        logCommand(LAUNCHER_ADD_EXTERNAL_ITEM_BACK);
+        logCommand(Action.Command.BACK);
         super.onBackPressed();
     }
 
@@ -321,7 +320,10 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
         throw new UnsupportedOperationException();
     }
 
-    private void logCommand(StatsLogManager.EventEnum command) {
-        getStatsLogManager().logger().log(command);
+    private void logCommand(int command) {
+        getUserEventDispatcher().dispatchUserEvent(newLauncherEvent(
+                newCommandAction(command),
+                newItemTarget(mWidgetCell.getWidgetView(), mInstantAppResolver),
+                newContainerTarget(ContainerType.PINITEM)), null);
     }
 }
diff --git a/src/com/android/launcher3/dragndrop/DragController.java b/src/com/android/launcher3/dragndrop/DragController.java
index 1cfe6acf05..ef666f0acd 100644
--- a/src/com/android/launcher3/dragndrop/DragController.java
+++ b/src/com/android/launcher3/dragndrop/DragController.java
@@ -206,6 +206,7 @@ public class DragController implements DragDriver.EventListener, TouchController
         }
 
         handleMoveEvent(mLastTouch.x, mLastTouch.y);
+        mLauncher.getUserEventDispatcher().resetActionDurationMillis();
 
         if (!mLauncher.isTouchInProgress() && options.simulatedDndStartPoint == null) {
             // If it is an internal drag and the touch is already complete, cancel immediately
@@ -543,6 +544,7 @@ public class DragController implements DragDriver.EventListener, TouchController
             }
         }
         final View dropTargetAsView = dropTarget instanceof View ? (View) dropTarget : null;
+        mLauncher.getUserEventDispatcher().logDragNDrop(mDragObject, dropTargetAsView);
         dispatchDropComplete(dropTargetAsView, accepted);
     }
 
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index 63fa391d43..281598a48b 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -23,6 +23,7 @@ import static com.android.launcher3.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent;
 import static com.android.launcher3.config.FeatureFlags.ALWAYS_USE_HARDWARE_OPTIMIZATION_FOR_FOLDER_ANIMATIONS;
+import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_FOLDER_CONVERTED_TO_ICON;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_FOLDER_LABEL_UPDATED;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ITEM_DROP_COMPLETED;
@@ -94,6 +95,7 @@ import com.android.launcher3.model.data.FolderInfo.FolderListener;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pageindicators.PageIndicatorDots;
+import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.launcher3.util.Executors;
 import com.android.launcher3.util.Thunk;
 import com.android.launcher3.views.ClipPathView;
@@ -597,6 +599,15 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
      * is played.
      */
     private void animateOpen(List<WorkspaceItemInfo> items, int pageNo) {
+        animateOpen(items, pageNo, false);
+    }
+
+    /**
+     * Opens the user folder described by the specified tag. The opening of the folder
+     * is animated relative to the specified View. If the View is null, no animation
+     * is played.
+     */
+    private void animateOpen(List<WorkspaceItemInfo> items, int pageNo, boolean skipUserEventLog) {
         Folder openFolder = getOpen(mLauncher);
         if (openFolder != null && openFolder != this) {
             // Close any open folder before opening a folder.
@@ -646,6 +657,14 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
                 mState = STATE_OPEN;
                 announceAccessibilityChanges();
 
+                if (!skipUserEventLog) {
+                    mLauncher.getUserEventDispatcher().logActionOnItem(
+                            LauncherLogProto.Action.Touch.TAP,
+                            LauncherLogProto.Action.Direction.NONE,
+                            LauncherLogProto.ItemType.FOLDER_ICON, mInfo.cellX, mInfo.cellY);
+                }
+
+
                 mContent.setFocusOnFirstChild();
             }
         });
@@ -1494,6 +1513,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
                 }
 
                 statsLogger.log(LAUNCHER_FOLDER_LABEL_UPDATED);
+                logFolderLabelState(mFromLabelState, toLabelState);
                 mFolderName.dispatchBackKey();
             }
         }
@@ -1624,7 +1644,8 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
                         return true;
                     }
                 } else {
-                    // TODO: add ww log if need to gather tap outside to close folder
+                    mLauncher.getUserEventDispatcher().logActionTapOutside(
+                            newContainerTarget(LauncherLogProto.ContainerType.FOLDER));
                     close(true);
                     return true;
                 }
@@ -1659,6 +1680,17 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         return mContent;
     }
 
+    /**
+     * Logs current folder label info.
+     *
+     * @deprecated This method is only used for log validation and soon will be removed.
+     */
+    @Deprecated
+    public void logFolderLabelState(FromState fromState, ToState toState) {
+        mLauncher.getUserEventDispatcher()
+                .logLauncherEvent(mInfo.getFolderLabelStateLauncherEvent(fromState, toState));
+    }
+
     /** Returns the height of the current folder's bottom edge from the bottom of the screen. */
     private int getHeightFromBottom() {
         DragLayer.LayoutParams layoutParams = (DragLayer.LayoutParams) getLayoutParams();
diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java
index 3296eed5ca..32d061cb42 100644
--- a/src/com/android/launcher3/folder/FolderIcon.java
+++ b/src/com/android/launcher3/folder/FolderIcon.java
@@ -478,6 +478,7 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
                 // event is assumed to be folder creation on the server side.
                 .withEditText(newTitle.toString())
                 .log(LAUNCHER_FOLDER_AUTO_LABELED);
+        mFolder.logFolderLabelState(fromState, ToState.TO_SUGGESTION0);
     }
 
 
diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index effb3a4a0c..cd84c96171 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -513,7 +513,8 @@ public class LauncherPreviewRenderer extends ContextThemeWrapper
         }
 
         // Setup search view
-        SearchUiManager searchUiManager = mRootView.findViewById(R.id.search_container_all_apps);
+        SearchUiManager searchUiManager =
+                mRootView.findViewById(R.id.search_container_all_apps);
         mRootView.findViewById(R.id.apps_view).setTranslationY(
                 mDp.heightPx - searchUiManager.getScrollRangeDelta(mInsets));
         ViewGroup searchView = (ViewGroup) searchUiManager;
diff --git a/src/com/android/launcher3/logging/LoggerUtils.java b/src/com/android/launcher3/logging/LoggerUtils.java
new file mode 100644
index 0000000000..cd4f034e83
--- /dev/null
+++ b/src/com/android/launcher3/logging/LoggerUtils.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.logging;
+
+import android.util.ArrayMap;
+import android.util.SparseArray;
+import android.view.View;
+
+import com.android.launcher3.ButtonDropTarget;
+import com.android.launcher3.LauncherSettings;
+import com.android.launcher3.model.data.AppInfo;
+import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.userevent.nano.LauncherLogExtensions.TargetExtension;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Action;
+import com.android.launcher3.userevent.nano.LauncherLogProto.ItemType;
+import com.android.launcher3.userevent.nano.LauncherLogProto.LauncherEvent;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
+import com.android.launcher3.util.InstantAppResolver;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+
+/**
+ * Helper methods for logging.
+ */
+public class LoggerUtils {
+    private static final ArrayMap<Class, SparseArray<String>> sNameCache = new ArrayMap<>();
+    private static final String UNKNOWN = "UNKNOWN";
+    private static final int DEFAULT_PREDICTED_RANK = 10000;
+    private static final String DELIMITER_DOT = "\\.";
+
+    public static String getFieldName(int value, Class c) {
+        SparseArray<String> cache;
+        synchronized (sNameCache) {
+            cache = sNameCache.get(c);
+            if (cache == null) {
+                cache = new SparseArray<>();
+                for (Field f : c.getDeclaredFields()) {
+                    if (f.getType() == int.class && Modifier.isStatic(f.getModifiers())) {
+                        try {
+                            f.setAccessible(true);
+                            cache.put(f.getInt(null), f.getName());
+                        } catch (IllegalAccessException e) {
+                            // Ignore
+                        }
+                    }
+                }
+                sNameCache.put(c, cache);
+            }
+        }
+        String result = cache.get(value);
+        return result != null ? result : UNKNOWN;
+    }
+
+    public static Target newItemTarget(int itemType) {
+        Target t = newTarget(Target.Type.ITEM);
+        t.itemType = itemType;
+        return t;
+    }
+
+    public static Target newItemTarget(View v, InstantAppResolver instantAppResolver) {
+        return (v != null) && (v.getTag() instanceof ItemInfo)
+                ? newItemTarget((ItemInfo) v.getTag(), instantAppResolver)
+                : newTarget(Target.Type.ITEM);
+    }
+
+    public static Target newItemTarget(ItemInfo info, InstantAppResolver instantAppResolver) {
+        Target t = newTarget(Target.Type.ITEM);
+        switch (info.itemType) {
+            case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION:
+                t.itemType = (instantAppResolver != null && info instanceof AppInfo
+                        && instantAppResolver.isInstantApp(((AppInfo) info)))
+                        ? ItemType.WEB_APP
+                        : ItemType.APP_ICON;
+                t.predictedRank = DEFAULT_PREDICTED_RANK;
+                break;
+            case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT:
+                t.itemType = ItemType.SHORTCUT;
+                t.predictedRank = DEFAULT_PREDICTED_RANK;
+                break;
+            case LauncherSettings.Favorites.ITEM_TYPE_FOLDER:
+                t.itemType = ItemType.FOLDER_ICON;
+                break;
+            case LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET:
+                t.itemType = ItemType.WIDGET;
+                break;
+            case LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT:
+                t.itemType = ItemType.DEEPSHORTCUT;
+                t.predictedRank = DEFAULT_PREDICTED_RANK;
+                break;
+        }
+        return t;
+    }
+
+    public static Target newDropTarget(View v) {
+        if (!(v instanceof ButtonDropTarget)) {
+            return newTarget(Target.Type.CONTAINER);
+        }
+        if (v instanceof ButtonDropTarget) {
+            return ((ButtonDropTarget) v).getDropTargetForLogging();
+        }
+        return newTarget(Target.Type.CONTROL);
+    }
+
+    public static Target newTarget(int targetType, TargetExtension extension) {
+        Target t = new Target();
+        t.type = targetType;
+        t.extension = extension;
+        return t;
+    }
+
+    public static Target newTarget(int targetType) {
+        Target t = new Target();
+        t.type = targetType;
+        return t;
+    }
+
+    public static Target newControlTarget(int controlType) {
+        Target t = newTarget(Target.Type.CONTROL);
+        t.controlType = controlType;
+        return t;
+    }
+
+    public static Target newContainerTarget(int containerType) {
+        Target t = newTarget(Target.Type.CONTAINER);
+        t.containerType = containerType;
+        return t;
+    }
+
+    public static Action newAction(int type) {
+        Action a = new Action();
+        a.type = type;
+        return a;
+    }
+
+    public static Action newCommandAction(int command) {
+        Action a = newAction(Action.Type.COMMAND);
+        a.command = command;
+        return a;
+    }
+
+    public static Action newTouchAction(int touch) {
+        Action a = newAction(Action.Type.TOUCH);
+        a.touch = touch;
+        return a;
+    }
+
+    public static LauncherEvent newLauncherEvent(Action action, Target... srcTargets) {
+        LauncherEvent event = new LauncherEvent();
+        event.srcTarget = srcTargets;
+        event.action = action;
+        return event;
+    }
+
+    /**
+     * Creates LauncherEvent using Action and ArrayList of Targets
+     */
+    public static LauncherEvent newLauncherEvent(Action action, ArrayList<Target> targets) {
+        Target[] targetsArray = new Target[targets.size()];
+        targets.toArray(targetsArray);
+        return newLauncherEvent(action, targetsArray);
+    }
+
+    /**
+     * String conversion for only the helpful parts of {@link Object#toString()} method
+     * @param stringToExtract "foo.bar.baz.MyObject@1234"
+     * @return "MyObject@1234"
+     */
+    public static String extractObjectNameAndAddress(String stringToExtract) {
+        String[] superStringParts = stringToExtract.split(DELIMITER_DOT);
+        if (superStringParts.length == 0) {
+            return "";
+        }
+        return superStringParts[superStringParts.length - 1];
+    }
+}
diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index 2c5bf320ad..ec1c3ef779 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -27,6 +27,7 @@ import com.android.launcher3.logger.LauncherAtom.ContainerInfo;
 import com.android.launcher3.logger.LauncherAtom.FromState;
 import com.android.launcher3.logger.LauncherAtom.ToState;
 import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.userevent.LauncherLogProto;
 import com.android.launcher3.util.ResourceBasedOverride;
 
 import java.util.List;
@@ -50,22 +51,40 @@ public class StatsLogManager implements ResourceBasedOverride {
     public static final int LAUNCHER_STATE_UNCHANGED = 5;
 
     /**
-     * Returns event enum based on the two state transition information when swipe
+     * Returns proper launcher state enum for {@link StatsLogManager}(to be removed during
+     * UserEventDispatcher cleanup)
+     */
+    public static int containerTypeToAtomState(int containerType) {
+        switch (containerType) {
+            case LauncherLogProto.ContainerType.ALLAPPS_VALUE:
+                return LAUNCHER_STATE_ALLAPPS;
+            case LauncherLogProto.ContainerType.OVERVIEW_VALUE:
+                return LAUNCHER_STATE_OVERVIEW;
+            case LauncherLogProto.ContainerType.WORKSPACE_VALUE:
+                return LAUNCHER_STATE_HOME;
+            case LauncherLogProto.ContainerType.APP_VALUE:
+                return LAUNCHER_STATE_BACKGROUND;
+        }
+        return LAUNCHER_STATE_UNSPECIFIED;
+    }
+
+    /**
+     * Returns event enum based on the two {@link ContainerType} transition information when swipe
      * gesture happens(to be removed during UserEventDispatcher cleanup).
      */
-    public static EventEnum getLauncherAtomEvent(int startState,
-            int targetState, EventEnum fallbackEvent) {
-        if (startState == LAUNCHER_STATE_HOME
-                && targetState == LAUNCHER_STATE_HOME) {
+    public static EventEnum getLauncherAtomEvent(int startContainerType,
+            int targetContainerType, EventEnum fallbackEvent) {
+        if (startContainerType == LauncherLogProto.ContainerType.WORKSPACE.getNumber()
+                && targetContainerType == LauncherLogProto.ContainerType.WORKSPACE.getNumber()) {
             return LAUNCHER_HOME_GESTURE;
-        } else if (startState != LAUNCHER_STATE_OVERVIEW
-                && targetState == LAUNCHER_STATE_OVERVIEW) {
+        } else if (startContainerType != LauncherLogProto.ContainerType.TASKSWITCHER.getNumber()
+                && targetContainerType == LauncherLogProto.ContainerType.TASKSWITCHER.getNumber()) {
             return LAUNCHER_OVERVIEW_GESTURE;
-        } else if (startState != LAUNCHER_STATE_ALLAPPS
-                && targetState == LAUNCHER_STATE_ALLAPPS) {
+        } else if (startContainerType != LauncherLogProto.ContainerType.ALLAPPS.getNumber()
+                && targetContainerType == LauncherLogProto.ContainerType.ALLAPPS.getNumber()) {
             return LAUNCHER_ALLAPPS_OPEN_UP;
-        } else if (startState == LAUNCHER_STATE_ALLAPPS
-                && targetState != LAUNCHER_STATE_ALLAPPS) {
+        } else if (startContainerType == LauncherLogProto.ContainerType.ALLAPPS.getNumber()
+                && targetContainerType != LauncherLogProto.ContainerType.ALLAPPS.getNumber()) {
             return LAUNCHER_ALLAPPS_CLOSE_DOWN;
         }
         return fallbackEvent; // TODO fix
@@ -303,38 +322,7 @@ public class StatsLogManager implements ResourceBasedOverride {
         LAUNCHER_FOLDER_CONVERTED_TO_ICON(628),
 
         @UiEvent(doc = "A hotseat prediction item was pinned")
-        LAUNCHER_HOTSEAT_PREDICTION_PINNED(629),
-
-        @UiEvent(doc = "Activity to add external item was started")
-        LAUNCHER_ADD_EXTERNAL_ITEM_START(641),
-
-        @UiEvent(doc = "Activity to add external item was cancelled")
-        LAUNCHER_ADD_EXTERNAL_ITEM_CANCELLED(642),
-
-        @UiEvent(doc = "Activity to add external item was backed out")
-        LAUNCHER_ADD_EXTERNAL_ITEM_BACK(643),
-
-        @UiEvent(doc = "Item was placed automatically in external item addition flow")
-        LAUNCHER_ADD_EXTERNAL_ITEM_PLACED_AUTOMATICALLY(644),
-
-        @UiEvent(doc = "Item was dragged in external item addition flow")
-        LAUNCHER_ADD_EXTERNAL_ITEM_DRAGGED(645),
-
-        @UiEvent(doc = "Undo event was tapped.")
-        LAUNCHER_UNDO(648),
-
-        @UiEvent(doc = "Task switcher clear all target was tapped.")
-        LAUNCHER_TASK_CLEAR_ALL(649),
-
-        @UiEvent(doc = "Task preview was long pressed.")
-        LAUNCHER_TASK_PREVIEW_LONGPRESS(650),
-
-        @UiEvent(doc = "User swiped down on workspace (triggering noti shade to open).")
-        LAUNCHER_SWIPE_DOWN_WORKSPACE_NOTISHADE_OPEN(651),
-
-        @UiEvent(doc = "Notification dismissed by swiping right.")
-        LAUNCHER_NOTIFICATION_DISMISSED(652),
-        ;
+        LAUNCHER_HOTSEAT_PREDICTION_PINNED(629);
 
         // ADD MORE
 
diff --git a/src/com/android/launcher3/logging/StatsLogUtils.java b/src/com/android/launcher3/logging/StatsLogUtils.java
new file mode 100644
index 0000000000..a5cc7ea305
--- /dev/null
+++ b/src/com/android/launcher3/logging/StatsLogUtils.java
@@ -0,0 +1,49 @@
+package com.android.launcher3.logging;
+
+import android.view.View;
+import android.view.ViewParent;
+
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
+
+import java.util.ArrayList;
+
+public class StatsLogUtils {
+    private final static int MAXIMUM_VIEW_HIERARCHY_LEVEL = 5;
+
+    /**
+     * Implemented by containers to provide a container source for a given child.
+     */
+    public interface LogContainerProvider {
+
+        /**
+         * Populates parent container targets for an item
+         */
+        void fillInLogContainerData(ItemInfo childInfo, Target child, ArrayList<Target> parents);
+    }
+
+    /**
+     * Recursively finds the parent of the given child which implements IconLogInfoProvider
+     */
+    public static LogContainerProvider getLaunchProviderRecursive(@Nullable View v) {
+        ViewParent parent;
+        if (v != null) {
+            parent = v.getParent();
+        } else {
+            return null;
+        }
+
+        // Optimization to only check up to 5 parents.
+        int count = MAXIMUM_VIEW_HIERARCHY_LEVEL;
+        while (parent != null && count-- > 0) {
+            if (parent instanceof LogContainerProvider) {
+                return (LogContainerProvider) parent;
+            } else {
+                parent = parent.getParent();
+            }
+        }
+        return null;
+    }
+}
diff --git a/src/com/android/launcher3/logging/UserEventDispatcher.java b/src/com/android/launcher3/logging/UserEventDispatcher.java
new file mode 100644
index 0000000000..a40cc263db
--- /dev/null
+++ b/src/com/android/launcher3/logging/UserEventDispatcher.java
@@ -0,0 +1,373 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.logging;
+
+import static com.android.launcher3.logging.LoggerUtils.newAction;
+import static com.android.launcher3.logging.LoggerUtils.newCommandAction;
+import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
+import static com.android.launcher3.logging.LoggerUtils.newDropTarget;
+import static com.android.launcher3.logging.LoggerUtils.newItemTarget;
+import static com.android.launcher3.logging.LoggerUtils.newLauncherEvent;
+import static com.android.launcher3.logging.LoggerUtils.newTarget;
+import static com.android.launcher3.logging.LoggerUtils.newTouchAction;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.ItemType;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.TipType;
+
+import static java.util.Optional.ofNullable;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.SystemClock;
+import android.util.Log;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.DropTarget;
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.logging.StatsLogUtils.LogContainerProvider;
+import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.userevent.LauncherLogProto;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Action;
+import com.android.launcher3.userevent.nano.LauncherLogProto.LauncherEvent;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
+import com.android.launcher3.util.InstantAppResolver;
+import com.android.launcher3.util.LogConfig;
+import com.android.launcher3.util.ResourceBasedOverride;
+
+import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.nano.InvalidProtocolBufferNanoException;
+import com.google.protobuf.nano.MessageNano;
+
+import java.util.ArrayList;
+import java.util.UUID;
+
+/**
+ * Manages the creation of {@link LauncherEvent}.
+ * To debug this class, execute following command before side loading a new apk.
+ * <p>
+ * $ adb shell setprop log.tag.UserEvent VERBOSE
+ */
+public class UserEventDispatcher implements ResourceBasedOverride {
+
+    private static final String TAG = "UserEvent";
+    private static final boolean IS_VERBOSE = Utilities.isPropertyEnabled(LogConfig.USEREVENT);
+    private static final String UUID_STORAGE = "uuid";
+
+    /**
+     * A factory method for UserEventDispatcher
+     */
+    public static UserEventDispatcher newInstance(Context context) {
+        SharedPreferences sharedPrefs = Utilities.getDevicePrefs(context);
+        String uuidStr = sharedPrefs.getString(UUID_STORAGE, null);
+        if (uuidStr == null) {
+            uuidStr = UUID.randomUUID().toString();
+            sharedPrefs.edit().putString(UUID_STORAGE, uuidStr).apply();
+        }
+        UserEventDispatcher ued = Overrides.getObject(UserEventDispatcher.class,
+                context.getApplicationContext(), R.string.user_event_dispatcher_class);
+        ued.mUuidStr = uuidStr;
+        ued.mInstantAppResolver = InstantAppResolver.newInstance(context);
+        return ued;
+    }
+
+
+    /**
+     * Fills in the container data on the given event if the given view is not null.
+     *
+     * @return whether container data was added.
+     */
+    private boolean fillLogContainer(@Nullable View v, Target child,
+            @Nullable ArrayList<Target> targets) {
+        LogContainerProvider firstParent = StatsLogUtils.getLaunchProviderRecursive(v);
+        if (v == null || !(v.getTag() instanceof ItemInfo) || firstParent == null) {
+            return false;
+        }
+        final ItemInfo itemInfo = (ItemInfo) v.getTag();
+        firstParent.fillInLogContainerData(itemInfo, child, targets);
+        return true;
+    }
+
+    protected void onFillInLogContainerData(@NonNull ItemInfo itemInfo, @NonNull Target target,
+            @NonNull ArrayList<Target> targets) {
+    }
+
+    private boolean mSessionStarted;
+    private long mElapsedContainerMillis;
+    private long mElapsedSessionMillis;
+    private long mActionDurationMillis;
+    private String mUuidStr;
+    protected InstantAppResolver mInstantAppResolver;
+    private boolean mAppOrTaskLaunch;
+    private boolean mPreviousHomeGesture;
+
+    private void fillComponentInfo(Target target, ComponentName cn) {
+        if (cn != null) {
+            target.packageNameHash = (mUuidStr + cn.getPackageName()).hashCode();
+            target.componentHash = (mUuidStr + cn.flattenToString()).hashCode();
+        }
+    }
+
+    public void logActionCommand(int command, int srcContainerType, int dstContainerType) {
+        logActionCommand(command, newContainerTarget(srcContainerType),
+                dstContainerType >= 0 ? newContainerTarget(dstContainerType) : null);
+    }
+
+    public void logActionCommand(int command, int srcContainerType, int dstContainerType,
+            int pageIndex) {
+        Target srcTarget = newContainerTarget(srcContainerType);
+        srcTarget.pageIndex = pageIndex;
+        logActionCommand(command, srcTarget,
+                dstContainerType >= 0 ? newContainerTarget(dstContainerType) : null);
+    }
+
+    public void logActionCommand(int command, Target srcTarget, Target dstTarget) {
+        LauncherEvent event = newLauncherEvent(newCommandAction(command), srcTarget);
+        if (command == Action.Command.STOP) {
+            if (mAppOrTaskLaunch || !mSessionStarted) {
+                mSessionStarted = false;
+                return;
+            }
+        }
+
+        if (dstTarget != null) {
+            event.destTarget = new Target[1];
+            event.destTarget[0] = dstTarget;
+            event.action.isStateChange = true;
+        }
+        dispatchUserEvent(event, null);
+    }
+
+    public void logActionOnControl(int action, int controlType) {
+        logActionOnControl(action, controlType, null);
+    }
+
+    public void logActionOnControl(int action, int controlType, int parentContainerType) {
+        logActionOnControl(action, controlType, null, parentContainerType);
+    }
+
+    /**
+     * Logs control action with proper parent hierarchy
+     */
+    public void logActionOnControl(int actionType, int controlType,
+            @Nullable View controlInContainer, int... parentTypes) {
+        Target control = newTarget(Target.Type.CONTROL);
+        control.controlType = controlType;
+        Action action = newAction(actionType);
+
+        ArrayList<Target> targets = makeTargetsList(control);
+        if (controlInContainer != null) {
+            fillLogContainer(controlInContainer, control, targets);
+        }
+        for (int parentContainerType : parentTypes) {
+            if (parentContainerType < 0) continue;
+            targets.add(newContainerTarget(parentContainerType));
+        }
+        LauncherEvent event = newLauncherEvent(action, targets);
+        if (actionType == Action.Touch.DRAGDROP) {
+            event.actionDurationMillis = SystemClock.uptimeMillis() - mActionDurationMillis;
+        }
+        dispatchUserEvent(event, null);
+    }
+
+    public void logActionTapOutside(Target target) {
+        LauncherEvent event = newLauncherEvent(newTouchAction(Action.Type.TOUCH),
+                target);
+        event.action.isOutside = true;
+        dispatchUserEvent(event, null);
+    }
+
+    public void logActionBounceTip(int containerType) {
+        LauncherEvent event = newLauncherEvent(newAction(Action.Type.TIP),
+                newContainerTarget(containerType));
+        event.srcTarget[0].tipType = TipType.BOUNCE;
+        dispatchUserEvent(event, null);
+    }
+
+    public void logActionOnContainer(int action, int dir, int containerType) {
+        logActionOnContainer(action, dir, containerType, 0);
+    }
+
+    public void logActionOnContainer(int action, int dir, int containerType, int pageIndex) {
+        LauncherEvent event = newLauncherEvent(newTouchAction(action),
+                newContainerTarget(containerType));
+        event.action.dir = dir;
+        event.srcTarget[0].pageIndex = pageIndex;
+        dispatchUserEvent(event, null);
+    }
+
+    /**
+     * Used primarily for swipe up and down when state changes when swipe up happens from the
+     * navbar bezel, the {@param srcChildContainerType} is NAVBAR and
+     * {@param srcParentContainerType} is either one of the two
+     * (1) WORKSPACE: if the launcher is the foreground activity
+     * (2) APP: if another app was the foreground activity
+     */
+    public void logStateChangeAction(int action, int dir, int downX, int downY,
+            int srcChildTargetType, int srcParentContainerType, int dstContainerType,
+            int pageIndex) {
+        LauncherEvent event;
+        if (srcChildTargetType == ItemType.TASK) {
+            event = newLauncherEvent(newTouchAction(action),
+                    newItemTarget(srcChildTargetType),
+                    newContainerTarget(srcParentContainerType));
+        } else {
+            event = newLauncherEvent(newTouchAction(action),
+                    newContainerTarget(srcChildTargetType),
+                    newContainerTarget(srcParentContainerType));
+        }
+        event.destTarget = new Target[1];
+        event.destTarget[0] = newContainerTarget(dstContainerType);
+        event.action.dir = dir;
+        event.action.isStateChange = true;
+        event.srcTarget[0].pageIndex = pageIndex;
+        event.srcTarget[0].spanX = downX;
+        event.srcTarget[0].spanY = downY;
+        dispatchUserEvent(event, null);
+    }
+
+    public void logActionOnItem(int action, int dir, int itemType) {
+        logActionOnItem(action, dir, itemType, null, null);
+    }
+
+    /**
+     * Creates new {@link LauncherEvent} of ITEM target type with input arguments and dispatches it.
+     *
+     * @param touchAction ENUM value of {@link LauncherLogProto.Action.Touch} Action
+     * @param dir         ENUM value of {@link LauncherLogProto.Action.Direction} Action
+     * @param itemType    ENUM value of {@link LauncherLogProto.ItemType}
+     * @param gridX       Nullable X coordinate of item's position on the workspace grid
+     * @param gridY       Nullable Y coordinate of item's position on the workspace grid
+     */
+    public void logActionOnItem(int touchAction, int dir, int itemType,
+            @Nullable Integer gridX, @Nullable Integer gridY) {
+        Target itemTarget = newTarget(Target.Type.ITEM);
+        itemTarget.itemType = itemType;
+        ofNullable(gridX).ifPresent(value -> itemTarget.gridX = value);
+        ofNullable(gridY).ifPresent(value -> itemTarget.gridY = value);
+        LauncherEvent event = newLauncherEvent(newTouchAction(touchAction), itemTarget);
+        event.action.dir = dir;
+        dispatchUserEvent(event, null);
+    }
+
+    /**
+     * Logs proto lite version of LauncherEvent object to clearcut.
+     */
+    public void logLauncherEvent(
+            com.android.launcher3.userevent.LauncherLogProto.LauncherEvent launcherEvent) {
+
+        if (mPreviousHomeGesture) {
+            mPreviousHomeGesture = false;
+        }
+        mAppOrTaskLaunch = false;
+        launcherEvent.toBuilder()
+                .setElapsedContainerMillis(SystemClock.uptimeMillis() - mElapsedContainerMillis)
+                .setElapsedSessionMillis(
+                        SystemClock.uptimeMillis() - mElapsedSessionMillis).build();
+        try {
+            dispatchUserEvent(LauncherEvent.parseFrom(launcherEvent.toByteArray()), null);
+        } catch (InvalidProtocolBufferNanoException e) {
+            throw new RuntimeException("Cannot convert LauncherEvent from Lite to Nano version.");
+        }
+    }
+
+    public void logDeepShortcutsOpen(View icon) {
+        ItemInfo info = (ItemInfo) icon.getTag();
+        Target child = newItemTarget(info, mInstantAppResolver);
+        ArrayList<Target> targets = makeTargetsList(child);
+        fillLogContainer(icon, child, targets);
+        dispatchUserEvent(newLauncherEvent(newTouchAction(Action.Touch.TAP), targets), null);
+    }
+
+    public void logDragNDrop(DropTarget.DragObject dragObj, View dropTargetAsView) {
+        Target srcChild = newItemTarget(dragObj.originalDragInfo, mInstantAppResolver);
+        ArrayList<Target> srcTargets = makeTargetsList(srcChild);
+
+
+        Target destChild = newItemTarget(dragObj.originalDragInfo, mInstantAppResolver);
+        ArrayList<Target> destTargets = makeTargetsList(destChild);
+
+        //dragObj.dragSource.fillInLogContainerData(dragObj.originalDragInfo, srcChild, srcTargets);
+        if (dropTargetAsView instanceof LogContainerProvider) {
+            ((LogContainerProvider) dropTargetAsView).fillInLogContainerData(dragObj.dragInfo,
+                    destChild, destTargets);
+        }
+        else {
+            destTargets.add(newDropTarget(dropTargetAsView));
+        }
+        LauncherEvent event = newLauncherEvent(newTouchAction(Action.Touch.DRAGDROP), srcTargets);
+        Target[] destTargetsArray = new Target[destTargets.size()];
+        destTargets.toArray(destTargetsArray);
+        event.destTarget = destTargetsArray;
+
+        event.actionDurationMillis = SystemClock.uptimeMillis() - mActionDurationMillis;
+        dispatchUserEvent(event, null);
+    }
+
+    public final void startSession() {
+        mSessionStarted = true;
+        mElapsedSessionMillis = SystemClock.uptimeMillis();
+        mElapsedContainerMillis = SystemClock.uptimeMillis();
+    }
+
+    public final void setPreviousHomeGesture(boolean homeGesture) {
+        mPreviousHomeGesture = homeGesture;
+    }
+
+    public final boolean isPreviousHomeGesture() {
+        return mPreviousHomeGesture;
+    }
+
+    public final void resetActionDurationMillis() {
+        mActionDurationMillis = SystemClock.uptimeMillis();
+    }
+
+    public void dispatchUserEvent(LauncherEvent ev, Intent intent) {
+        if (mPreviousHomeGesture) {
+            mPreviousHomeGesture = false;
+        }
+        mAppOrTaskLaunch = false;
+        ev.elapsedContainerMillis = SystemClock.uptimeMillis() - mElapsedContainerMillis;
+        ev.elapsedSessionMillis = SystemClock.uptimeMillis() - mElapsedSessionMillis;
+        if (!IS_VERBOSE) {
+            return;
+        }
+        LauncherLogProto.LauncherEvent liteLauncherEvent;
+        try {
+            liteLauncherEvent =
+                    LauncherLogProto.LauncherEvent.parseFrom(MessageNano.toByteArray(ev));
+        } catch (InvalidProtocolBufferException e) {
+            throw new RuntimeException("Cannot parse LauncherEvent from Nano to Lite version");
+        }
+        Log.d(TAG, liteLauncherEvent.toString());
+    }
+
+    /**
+     * Constructs an ArrayList with targets
+     */
+    public static ArrayList<Target> makeTargetsList(Target... targets) {
+        ArrayList<Target> result = new ArrayList<>();
+        for (Target target : targets) {
+            result.add(target);
+        }
+        return result;
+    }
+}
diff --git a/src/com/android/launcher3/model/data/FolderInfo.java b/src/com/android/launcher3/model/data/FolderInfo.java
index 06a2c92dab..41ccbd7054 100644
--- a/src/com/android/launcher3/model/data/FolderInfo.java
+++ b/src/com/android/launcher3/model/data/FolderInfo.java
@@ -20,9 +20,15 @@ import static android.text.TextUtils.isEmpty;
 
 import static androidx.core.util.Preconditions.checkNotNull;
 
+import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_DESKTOP;
+import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT;
 import static com.android.launcher3.logger.LauncherAtom.Attribute.EMPTY_LABEL;
 import static com.android.launcher3.logger.LauncherAtom.Attribute.MANUAL_LABEL;
 import static com.android.launcher3.logger.LauncherAtom.Attribute.SUGGESTED_LABEL;
+import static com.android.launcher3.userevent.LauncherLogProto.Target.FromFolderLabelState.FROM_CUSTOM;
+import static com.android.launcher3.userevent.LauncherLogProto.Target.FromFolderLabelState.FROM_EMPTY;
+import static com.android.launcher3.userevent.LauncherLogProto.Target.FromFolderLabelState.FROM_FOLDER_LABEL_STATE_UNSPECIFIED;
+import static com.android.launcher3.userevent.LauncherLogProto.Target.FromFolderLabelState.FROM_SUGGESTED;
 
 import android.os.Process;
 
@@ -37,6 +43,10 @@ import com.android.launcher3.logger.LauncherAtom.Attribute;
 import com.android.launcher3.logger.LauncherAtom.FromState;
 import com.android.launcher3.logger.LauncherAtom.ToState;
 import com.android.launcher3.model.ModelWriter;
+import com.android.launcher3.userevent.LauncherLogProto;
+import com.android.launcher3.userevent.LauncherLogProto.Target;
+import com.android.launcher3.userevent.LauncherLogProto.Target.FromFolderLabelState;
+import com.android.launcher3.userevent.LauncherLogProto.Target.ToFolderLabelState;
 import com.android.launcher3.util.ContentWriter;
 
 import java.util.ArrayList;
@@ -349,4 +359,113 @@ public class FolderInfo extends ItemInfo {
         }
         return LauncherAtom.ToState.TO_STATE_UNSPECIFIED;
     }
+
+    /**
+     * Returns {@link LauncherLogProto.LauncherEvent} to log current folder label info.
+     *
+     * @deprecated This method is used only for validation purpose and soon will be removed.
+     */
+    @Deprecated
+    public LauncherLogProto.LauncherEvent getFolderLabelStateLauncherEvent(FromState fromState,
+            ToState toState) {
+        return LauncherLogProto.LauncherEvent.newBuilder()
+                .setAction(LauncherLogProto.Action
+                        .newBuilder()
+                        .setType(LauncherLogProto.Action.Type.SOFT_KEYBOARD))
+                .addSrcTarget(Target
+                        .newBuilder()
+                        .setType(Target.Type.ITEM)
+                        .setItemType(LauncherLogProto.ItemType.EDITTEXT)
+                        .setFromFolderLabelState(convertFolderLabelState(fromState))
+                        .setToFolderLabelState(convertFolderLabelState(toState)))
+                .addSrcTarget(Target.newBuilder()
+                        .setType(Target.Type.CONTAINER)
+                        .setContainerType(LauncherLogProto.ContainerType.FOLDER)
+                        .setPageIndex(screenId)
+                        .setGridX(cellX)
+                        .setGridY(cellY)
+                        .setCardinality(contents.size()))
+                .addSrcTarget(newParentContainerTarget())
+                .build();
+    }
+
+    /**
+     * @deprecated This method is used only for validation purpose and soon will be removed.
+     */
+    @Deprecated
+    private Target.Builder newParentContainerTarget() {
+        Target.Builder builder = Target.newBuilder().setType(Target.Type.CONTAINER);
+        switch (container) {
+            case CONTAINER_HOTSEAT:
+                return builder.setContainerType(LauncherLogProto.ContainerType.HOTSEAT);
+            case CONTAINER_DESKTOP:
+                return builder.setContainerType(LauncherLogProto.ContainerType.WORKSPACE);
+            default:
+                throw new AssertionError(String
+                        .format("Expected container to be either %s or %s but found %s.",
+                                CONTAINER_HOTSEAT,
+                                CONTAINER_DESKTOP,
+                                container));
+        }
+    }
+
+    /**
+     * @deprecated This method is used only for validation purpose and soon will be removed.
+     */
+    @Deprecated
+    private static FromFolderLabelState convertFolderLabelState(FromState fromState) {
+        switch (fromState) {
+            case FROM_EMPTY:
+                return FROM_EMPTY;
+            case FROM_SUGGESTED:
+                return FROM_SUGGESTED;
+            case FROM_CUSTOM:
+                return FROM_CUSTOM;
+            default:
+                return FROM_FOLDER_LABEL_STATE_UNSPECIFIED;
+        }
+    }
+
+    /**
+     * @deprecated This method is used only for validation purpose and soon will be removed.
+     */
+    @Deprecated
+    private static ToFolderLabelState convertFolderLabelState(ToState toState) {
+        switch (toState) {
+            case UNCHANGED:
+                return ToFolderLabelState.UNCHANGED;
+            case TO_SUGGESTION0:
+                return ToFolderLabelState.TO_SUGGESTION0_WITH_VALID_PRIMARY;
+            case TO_SUGGESTION1_WITH_VALID_PRIMARY:
+                return ToFolderLabelState.TO_SUGGESTION1_WITH_VALID_PRIMARY;
+            case TO_SUGGESTION1_WITH_EMPTY_PRIMARY:
+                return ToFolderLabelState.TO_SUGGESTION1_WITH_EMPTY_PRIMARY;
+            case TO_SUGGESTION2_WITH_VALID_PRIMARY:
+                return ToFolderLabelState.TO_SUGGESTION2_WITH_VALID_PRIMARY;
+            case TO_SUGGESTION2_WITH_EMPTY_PRIMARY:
+                return ToFolderLabelState.TO_SUGGESTION2_WITH_EMPTY_PRIMARY;
+            case TO_SUGGESTION3_WITH_VALID_PRIMARY:
+                return ToFolderLabelState.TO_SUGGESTION3_WITH_VALID_PRIMARY;
+            case TO_SUGGESTION3_WITH_EMPTY_PRIMARY:
+                return ToFolderLabelState.TO_SUGGESTION3_WITH_EMPTY_PRIMARY;
+            case TO_EMPTY_WITH_VALID_PRIMARY:
+                return ToFolderLabelState.TO_EMPTY_WITH_VALID_PRIMARY;
+            case TO_EMPTY_WITH_VALID_SUGGESTIONS_AND_EMPTY_PRIMARY:
+                return ToFolderLabelState.TO_EMPTY_WITH_VALID_SUGGESTIONS_AND_EMPTY_PRIMARY;
+            case TO_EMPTY_WITH_EMPTY_SUGGESTIONS:
+                return ToFolderLabelState.TO_EMPTY_WITH_EMPTY_SUGGESTIONS;
+            case TO_EMPTY_WITH_SUGGESTIONS_DISABLED:
+                return ToFolderLabelState.TO_EMPTY_WITH_SUGGESTIONS_DISABLED;
+            case TO_CUSTOM_WITH_VALID_PRIMARY:
+                return ToFolderLabelState.TO_CUSTOM_WITH_VALID_PRIMARY;
+            case TO_CUSTOM_WITH_VALID_SUGGESTIONS_AND_EMPTY_PRIMARY:
+                return ToFolderLabelState.TO_CUSTOM_WITH_VALID_SUGGESTIONS_AND_EMPTY_PRIMARY;
+            case TO_CUSTOM_WITH_EMPTY_SUGGESTIONS:
+                return ToFolderLabelState.TO_CUSTOM_WITH_EMPTY_SUGGESTIONS;
+            case TO_CUSTOM_WITH_SUGGESTIONS_DISABLED:
+                return ToFolderLabelState.TO_CUSTOM_WITH_SUGGESTIONS_DISABLED;
+            default:
+                return ToFolderLabelState.TO_FOLDER_LABEL_STATE_UNSPECIFIED;
+        }
+    }
 }
diff --git a/src/com/android/launcher3/model/data/RemoteActionItemInfo.java b/src/com/android/launcher3/model/data/RemoteActionItemInfo.java
deleted file mode 100644
index 81f7f3a0a2..0000000000
--- a/src/com/android/launcher3/model/data/RemoteActionItemInfo.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.model.data;
-
-import android.app.RemoteAction;
-import android.os.Process;
-
-/**
- * Represents a launchable {@link RemoteAction}
- */
-public class RemoteActionItemInfo extends ItemInfoWithIcon {
-
-    private final RemoteAction mRemoteAction;
-    private final String mToken;
-    private final boolean mShouldStart;
-
-    public RemoteActionItemInfo(RemoteAction remoteAction, String token, boolean shouldStart) {
-        mShouldStart = shouldStart;
-        mToken = token;
-        mRemoteAction = remoteAction;
-        title = remoteAction.getTitle();
-        user = Process.myUserHandle();
-    }
-
-    public RemoteActionItemInfo(RemoteActionItemInfo info) {
-        super(info);
-        this.mShouldStart = info.mShouldStart;
-        this.mRemoteAction = info.mRemoteAction;
-        this.mToken = info.mToken;
-    }
-
-    @Override
-    public ItemInfoWithIcon clone() {
-        return new RemoteActionItemInfo(this);
-    }
-
-    public RemoteAction getRemoteAction() {
-        return mRemoteAction;
-    }
-
-    public String getToken() {
-        return mToken;
-    }
-
-    /**
-     * Getter method for mShouldStart
-     */
-    public boolean shouldStartInLauncher() {
-        return mShouldStart;
-    }
-}
diff --git a/src/com/android/launcher3/notification/NotificationMainView.java b/src/com/android/launcher3/notification/NotificationMainView.java
index 9b065233b9..32f060ba85 100644
--- a/src/com/android/launcher3/notification/NotificationMainView.java
+++ b/src/com/android/launcher3/notification/NotificationMainView.java
@@ -17,7 +17,6 @@
 package com.android.launcher3.notification;
 
 import static com.android.launcher3.anim.Interpolators.scrollInterpolatorForVelocity;
-import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_NOTIFICATION_DISMISSED;
 
 import android.animation.Animator;
 import android.animation.ObjectAnimator;
@@ -42,6 +41,7 @@ import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.touch.BaseSwipeDetector;
 import com.android.launcher3.touch.OverScroll;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
+import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.launcher3.util.Themes;
 
 /**
@@ -168,7 +168,10 @@ public class NotificationMainView extends FrameLayout implements SingleAxisSwipe
         Launcher launcher = Launcher.getLauncher(getContext());
         launcher.getPopupDataProvider().cancelNotification(
                 mNotificationInfo.notificationKey);
-        launcher.getStatsLogManager().logger().log(LAUNCHER_NOTIFICATION_DISMISSED);
+        launcher.getUserEventDispatcher().logActionOnItem(
+                LauncherLogProto.Action.Touch.SWIPE,
+                LauncherLogProto.Action.Direction.RIGHT, // Assume all swipes are right for logging.
+                LauncherLogProto.ItemType.NOTIFICATION);
     }
 
     // SingleAxisSwipeDetector.Listener's
diff --git a/src/com/android/launcher3/pm/InstallSessionHelper.java b/src/com/android/launcher3/pm/InstallSessionHelper.java
index fa25114d49..753a6dd85e 100644
--- a/src/com/android/launcher3/pm/InstallSessionHelper.java
+++ b/src/com/android/launcher3/pm/InstallSessionHelper.java
@@ -17,7 +17,6 @@
 package com.android.launcher3.pm;
 
 import static com.android.launcher3.Utilities.getPrefs;
-import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
@@ -32,7 +31,6 @@ import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
-import androidx.annotation.WorkerThread;
 
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.SessionCommitReceiver;
@@ -41,10 +39,10 @@ import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.ItemInstallQueue;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.IntSet;
+import com.android.launcher3.util.LooperExecutor;
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.launcher3.util.PackageUserKey;
-import com.android.launcher3.util.Preconditions;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -67,27 +65,27 @@ public class InstallSessionHelper {
 
     private final LauncherApps mLauncherApps;
     private final Context mAppContext;
+    private final IntSet mPromiseIconIds;
 
     private final PackageInstaller mInstaller;
     private final HashMap<String, Boolean> mSessionVerifiedMap = new HashMap<>();
 
-    private IntSet mPromiseIconIds;
-
     public InstallSessionHelper(Context context) {
         mInstaller = context.getPackageManager().getPackageInstaller();
         mAppContext = context.getApplicationContext();
         mLauncherApps = context.getSystemService(LauncherApps.class);
-    }
 
-    @WorkerThread
-    private IntSet getPromiseIconIds() {
-        Preconditions.assertWorkerThread();
-        if (mPromiseIconIds != null) {
-            return mPromiseIconIds;
-        }
         mPromiseIconIds = IntSet.wrap(IntArray.fromConcatString(
-                getPrefs(mAppContext).getString(PROMISE_ICON_IDS, "")));
+                getPrefs(context).getString(PROMISE_ICON_IDS, "")));
 
+        cleanUpPromiseIconIds();
+    }
+
+    public static UserHandle getUserHandle(SessionInfo info) {
+        return Utilities.ATLEAST_Q ? info.getUser() : Process.myUserHandle();
+    }
+
+    protected void cleanUpPromiseIconIds() {
         IntArray existingIds = new IntArray();
         for (SessionInfo info : getActiveSessions().values()) {
             existingIds.add(info.getSessionId());
@@ -102,7 +100,6 @@ public class InstallSessionHelper {
         for (int i = idsToRemove.size() - 1; i >= 0; --i) {
             mPromiseIconIds.getArray().removeValue(idsToRemove.get(i));
         }
-        return mPromiseIconIds;
     }
 
     public HashMap<PackageUserKey, SessionInfo> getActiveSessions() {
@@ -129,7 +126,7 @@ public class InstallSessionHelper {
 
     private void updatePromiseIconPrefs() {
         getPrefs(mAppContext).edit()
-                .putString(PROMISE_ICON_IDS, getPromiseIconIds().getArray().toConcatString())
+                .putString(PROMISE_ICON_IDS, mPromiseIconIds.getArray().toConcatString())
                 .apply();
     }
 
@@ -187,15 +184,13 @@ public class InstallSessionHelper {
         return info.getInstallReason() == PackageManager.INSTALL_REASON_DEVICE_RESTORE;
     }
 
-    @WorkerThread
     public boolean promiseIconAddedForId(int sessionId) {
-        return getPromiseIconIds().contains(sessionId);
+        return mPromiseIconIds.contains(sessionId);
     }
 
-    @WorkerThread
     public void removePromiseIconId(int sessionId) {
-        if (promiseIconAddedForId(sessionId)) {
-            getPromiseIconIds().getArray().removeValue(sessionId);
+        if (mPromiseIconIds.contains(sessionId)) {
+            mPromiseIconIds.getArray().removeValue(sessionId);
             updatePromiseIconPrefs();
         }
     }
@@ -208,7 +203,6 @@ public class InstallSessionHelper {
      * - The app is not already installed
      * - A promise icon for the session has not already been created
      */
-    @WorkerThread
     void tryQueuePromiseAppIcon(PackageInstaller.SessionInfo sessionInfo) {
         if (FeatureFlags.PROMISE_APPS_NEW_INSTALLS.get()
                 && SessionCommitReceiver.isEnabled(mAppContext)
@@ -216,24 +210,25 @@ public class InstallSessionHelper {
                 && sessionInfo.getInstallReason() == PackageManager.INSTALL_REASON_USER
                 && sessionInfo.getAppIcon() != null
                 && !TextUtils.isEmpty(sessionInfo.getAppLabel())
-                && !promiseIconAddedForId(sessionInfo.getSessionId())
+                && !mPromiseIconIds.contains(sessionInfo.getSessionId())
                 && new PackageManagerHelper(mAppContext).getApplicationInfo(
                         sessionInfo.getAppPackageName(), getUserHandle(sessionInfo), 0) == null) {
             ItemInstallQueue.INSTANCE.get(mAppContext)
                     .queueItem(sessionInfo.getAppPackageName(), getUserHandle(sessionInfo));
 
-            getPromiseIconIds().add(sessionInfo.getSessionId());
+            mPromiseIconIds.add(sessionInfo.getSessionId());
             updatePromiseIconPrefs();
         }
     }
 
-    public InstallSessionTracker registerInstallTracker(InstallSessionTracker.Callback callback) {
+    public InstallSessionTracker registerInstallTracker(
+            InstallSessionTracker.Callback callback, LooperExecutor executor) {
         InstallSessionTracker tracker = new InstallSessionTracker(this, callback);
 
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
-            mInstaller.registerSessionCallback(tracker, MODEL_EXECUTOR.getHandler());
+            mInstaller.registerSessionCallback(tracker, executor.getHandler());
         } else {
-            mLauncherApps.registerPackageInstallerSessionCallback(MODEL_EXECUTOR, tracker);
+            mLauncherApps.registerPackageInstallerSessionCallback(executor, tracker);
         }
         return tracker;
     }
@@ -245,8 +240,4 @@ public class InstallSessionHelper {
             mLauncherApps.unregisterPackageInstallerSessionCallback(tracker);
         }
     }
-
-    public static UserHandle getUserHandle(SessionInfo info) {
-        return Utilities.ATLEAST_Q ? info.getUser() : Process.myUserHandle();
-    }
 }
diff --git a/src/com/android/launcher3/pm/InstallSessionTracker.java b/src/com/android/launcher3/pm/InstallSessionTracker.java
index b0b907ab19..eb3ca7366b 100644
--- a/src/com/android/launcher3/pm/InstallSessionTracker.java
+++ b/src/com/android/launcher3/pm/InstallSessionTracker.java
@@ -24,11 +24,8 @@ import android.content.pm.PackageInstaller.SessionInfo;
 import android.os.UserHandle;
 import android.util.SparseArray;
 
-import androidx.annotation.WorkerThread;
-
 import com.android.launcher3.util.PackageUserKey;
 
-@WorkerThread
 public class InstallSessionTracker extends PackageInstaller.SessionCallback {
 
     // Lazily initialized
diff --git a/src/com/android/launcher3/pm/UserCache.java b/src/com/android/launcher3/pm/UserCache.java
index 5ade22be5e..2d7d6b092a 100644
--- a/src/com/android/launcher3/pm/UserCache.java
+++ b/src/com/android/launcher3/pm/UserCache.java
@@ -60,9 +60,6 @@ public class UserCache {
     private void onUsersChanged(Intent intent) {
         enableAndResetCache();
         mUserChangeListeners.forEach(Runnable::run);
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.WORK_PROFILE_REMOVED, "profile changed", new Exception());
-        }
     }
 
     /**
@@ -107,6 +104,9 @@ public class UserCache {
                 mUsers = null;
                 mUserToSerialMap = null;
             }
+            if (TestProtocol.sDebugTracing) {
+                Log.d(TestProtocol.WORK_PROFILE_REMOVED, "Work profile removed", new Exception());
+            }
         }
     }
 
diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java
index 90285c470b..d5b32fccd1 100644
--- a/src/com/android/launcher3/popup/ArrowPopup.java
+++ b/src/com/android/launcher3/popup/ArrowPopup.java
@@ -151,52 +151,32 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
      * @param viewsToFlip number of views from the top to to flip in case of reverse order
      */
     protected void reorderAndShow(int viewsToFlip) {
-        setupForDisplay();
-        boolean reverseOrder = mIsAboveIcon;
-        if (reverseOrder) {
-            reverseOrder(viewsToFlip);
-        }
-        onInflationComplete(reverseOrder);
-        addArrow();
-        animateOpen();
-    }
-
-    /**
-     * Shows the popup at the desired location.
-     */
-    protected void show() {
-        setupForDisplay();
-        onInflationComplete(false);
-        addArrow();
-        animateOpen();
-    }
-
-    private void setupForDisplay() {
         setVisibility(View.INVISIBLE);
         mIsOpen = true;
         getPopupContainer().addView(this);
         orientAboutObject();
-    }
 
-    private void reverseOrder(int viewsToFlip) {
-        int count = getChildCount();
-        ArrayList<View> allViews = new ArrayList<>(count);
-        for (int i = 0; i < count; i++) {
-            if (i == viewsToFlip) {
-                Collections.reverse(allViews);
+        boolean reverseOrder = mIsAboveIcon;
+        if (reverseOrder) {
+            int count = getChildCount();
+            ArrayList<View> allViews = new ArrayList<>(count);
+            for (int i = 0; i < count; i++) {
+                if (i == viewsToFlip) {
+                    Collections.reverse(allViews);
+                }
+                allViews.add(getChildAt(i));
+            }
+            Collections.reverse(allViews);
+            removeAllViews();
+            for (int i = 0; i < count; i++) {
+                addView(allViews.get(i));
             }
-            allViews.add(getChildAt(i));
-        }
-        Collections.reverse(allViews);
-        removeAllViews();
-        for (int i = 0; i < count; i++) {
-            addView(allViews.get(i));
-        }
 
-        orientAboutObject();
-    }
+            orientAboutObject();
+        }
+        onInflationComplete(reverseOrder);
 
-    private void addArrow() {
+        // Add the arrow.
         final Resources res = getResources();
         final int arrowCenterOffset = res.getDimensionPixelSize(isAlignedWithStart()
                 ? R.dimen.popup_arrow_horizontal_center_start
@@ -234,6 +214,8 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
 
         mArrow.setPivotX(arrowLp.width / 2);
         mArrow.setPivotY(mIsAboveIcon ? arrowLp.height : 0);
+
+        animateOpen();
     }
 
     protected boolean isAlignedWithStart() {
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index 6d92b8b627..26b32b8195 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -19,8 +19,10 @@ package com.android.launcher3.popup;
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_SHORTCUTS;
 import static com.android.launcher3.Utilities.squaredHypot;
 import static com.android.launcher3.Utilities.squaredTouchSlop;
+import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
 import static com.android.launcher3.popup.PopupPopulator.MAX_SHORTCUTS;
 import static com.android.launcher3.popup.PopupPopulator.MAX_SHORTCUTS_IF_NOTIFICATIONS;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
 import android.animation.AnimatorSet;
@@ -158,7 +160,8 @@ public class PopupContainerWithArrow<T extends BaseDraggingActivity> extends Arr
         if (ev.getAction() == MotionEvent.ACTION_DOWN) {
             BaseDragLayer dl = getPopupContainer();
             if (!dl.isEventOverView(this, ev)) {
-                // TODO: add WW log if want to log if tap closed deep shortcut container.
+                mLauncher.getUserEventDispatcher().logActionTapOutside(
+                        newContainerTarget(ContainerType.DEEPSHORTCUTS));
                 close(true);
 
                 // We let touches on the original icon go through so that users can launch
@@ -432,9 +435,7 @@ public class PopupContainerWithArrow<T extends BaseDraggingActivity> extends Arr
                     // Make sure we keep the original icon hidden while it is being dragged.
                     mOriginalIcon.setVisibility(INVISIBLE);
                 } else {
-                    // TODO: add WW logging if want to add logging for long press on popup
-                    //  container.
-                    //  mLauncher.getUserEventDispatcher().logDeepShortcutsOpen(mOriginalIcon);
+                    mLauncher.getUserEventDispatcher().logDeepShortcutsOpen(mOriginalIcon);
                     if (!mIsAboveIcon) {
                         // Show the icon but keep the text hidden.
                         mOriginalIcon.setVisibility(VISIBLE);
diff --git a/src/com/android/launcher3/popup/RemoteActionShortcut.java b/src/com/android/launcher3/popup/RemoteActionShortcut.java
index 7c393ad1e2..61829c002b 100644
--- a/src/com/android/launcher3/popup/RemoteActionShortcut.java
+++ b/src/com/android/launcher3/popup/RemoteActionShortcut.java
@@ -37,6 +37,7 @@ import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.userevent.nano.LauncherLogProto;
 
 @TargetApi(Build.VERSION_CODES.Q)
 public class RemoteActionShortcut extends SystemShortcut<BaseDraggingActivity> {
@@ -106,6 +107,9 @@ public class RemoteActionShortcut extends SystemShortcut<BaseDraggingActivity> {
                     Toast.LENGTH_SHORT)
                     .show();
         }
+
+        mTarget.getUserEventDispatcher().logActionOnControl(LauncherLogProto.Action.Touch.TAP,
+                LauncherLogProto.ControlType.REMOTE_ACTION_SHORTCUT, view);
     }
 
     @Override
diff --git a/src/com/android/launcher3/popup/SystemShortcut.java b/src/com/android/launcher3/popup/SystemShortcut.java
index 577fe4afaa..81302ac1f7 100644
--- a/src/com/android/launcher3/popup/SystemShortcut.java
+++ b/src/com/android/launcher3/popup/SystemShortcut.java
@@ -21,6 +21,8 @@ import com.android.launcher3.R;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Action;
+import com.android.launcher3.userevent.nano.LauncherLogProto.ControlType;
 import com.android.launcher3.util.InstantAppResolver;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.launcher3.util.PackageUserKey;
@@ -115,6 +117,8 @@ public abstract class SystemShortcut<T extends BaseDraggingActivity> extends Ite
                     (WidgetsBottomSheet) mTarget.getLayoutInflater().inflate(
                             R.layout.widgets_bottom_sheet, mTarget.getDragLayer(), false);
             widgetsBottomSheet.populateAndShow(mItemInfo);
+            mTarget.getUserEventDispatcher().logActionOnControl(Action.Touch.TAP,
+                    ControlType.WIDGETS_BUTTON, view);
             mTarget.getStatsLogManager().logger().withItemInfo(mItemInfo)
                     .log(LAUNCHER_SYSTEM_SHORTCUT_WIDGETS_TAP);
         }
@@ -135,6 +139,8 @@ public abstract class SystemShortcut<T extends BaseDraggingActivity> extends Ite
             Rect sourceBounds = mTarget.getViewBounds(view);
             new PackageManagerHelper(mTarget).startDetailsActivityForInfo(
                     mItemInfo, sourceBounds, ActivityOptions.makeBasic().toBundle());
+            mTarget.getUserEventDispatcher().logActionOnControl(Action.Touch.TAP,
+                    ControlType.APPINFO_TARGET, view);
             mTarget.getStatsLogManager().logger().withItemInfo(mItemInfo)
                     .log(LAUNCHER_SYSTEM_SHORTCUT_APP_INFO_TAP);
         }
diff --git a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
index f4b059d8d8..4baecb7c56 100644
--- a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
+++ b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
@@ -306,15 +306,6 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
             return true;
         });
         sandboxCategory.addPreference(launchAssistantTutorialPreference);
-        Preference launchSandboxModeTutorialPreference = new Preference(context);
-        launchSandboxModeTutorialPreference.setKey("launchSandboxMode");
-        launchSandboxModeTutorialPreference.setTitle("Launch Sandbox Mode");
-        launchSandboxModeTutorialPreference.setSummary("Practice navigation gestures");
-        launchSandboxModeTutorialPreference.setOnPreferenceClickListener(preference -> {
-            startActivity(launchSandboxIntent.putExtra("tutorial_type", "SANDBOX_MODE"));
-            return true;
-        });
-        sandboxCategory.addPreference(launchSandboxModeTutorialPreference);
     }
 
     private String toName(String action) {
diff --git a/src/com/android/launcher3/states/HintState.java b/src/com/android/launcher3/states/HintState.java
index fd1d965982..b8a184fcfc 100644
--- a/src/com/android/launcher3/states/HintState.java
+++ b/src/com/android/launcher3/states/HintState.java
@@ -15,12 +15,11 @@
  */
 package com.android.launcher3.states;
 
-import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
-
 import android.content.Context;
 
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
+import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 
 /**
  * Scale down workspace/hotseat to hint at going to either overview (on pause) or first home screen.
@@ -31,7 +30,7 @@ public class HintState extends LauncherState {
             | FLAG_HAS_SYS_UI_SCRIM;
 
     public HintState(int id) {
-        super(id, LAUNCHER_STATE_HOME, STATE_FLAGS);
+        super(id, ContainerType.DEFAULT_CONTAINERTYPE, STATE_FLAGS);
     }
 
     @Override
diff --git a/src/com/android/launcher3/states/SpringLoadedState.java b/src/com/android/launcher3/states/SpringLoadedState.java
index 45172b56ef..2a4f887503 100644
--- a/src/com/android/launcher3/states/SpringLoadedState.java
+++ b/src/com/android/launcher3/states/SpringLoadedState.java
@@ -15,8 +15,6 @@
  */
 package com.android.launcher3.states;
 
-import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
-
 import android.content.Context;
 import android.graphics.Rect;
 
@@ -24,6 +22,7 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.Workspace;
+import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 
 /**
  * Definition for spring loaded state used during drag and drop.
@@ -36,7 +35,7 @@ public class SpringLoadedState extends LauncherState {
             | FLAG_HIDE_BACK_BUTTON;
 
     public SpringLoadedState(int id) {
-        super(id, LAUNCHER_STATE_HOME, STATE_FLAGS);
+        super(id, ContainerType.WORKSPACE, STATE_FLAGS);
     }
 
     @Override
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index 9fd53e2563..8ee5a6e533 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -21,9 +21,6 @@ import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.anim.Interpolators.scrollInterpolatorForVelocity;
 import static com.android.launcher3.config.FeatureFlags.UNSTABLE_SPRINGS;
-import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_ALLAPPS;
-import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
-import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_UNKNOWN_SWIPEDOWN;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_UNKNOWN_SWIPEUP;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_COMPONENTS;
@@ -55,6 +52,9 @@ import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.states.StateAnimationConfig.AnimationFlags;
 import com.android.launcher3.testing.TestProtocol;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
+import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.launcher3.util.FlingBlockCheck;
 import com.android.launcher3.util.TouchController;
 
@@ -190,6 +190,11 @@ public abstract class AbstractStateChangeTouchController
 
     protected abstract float initCurrentAnimation(@AnimationFlags int animComponents);
 
+    /**
+     * Returns the container that the touch started from when leaving NORMAL state.
+     */
+    protected abstract int getLogContainerTypeForNormalState(MotionEvent ev);
+
     private boolean reinitCurrentAnimation(boolean reachedToState, boolean isDragTowardPositive) {
         LauncherState newFromState = mFromState == null ? mLauncher.getStateManager().getState()
                 : reachedToState ? mToState : mFromState;
@@ -302,11 +307,11 @@ public abstract class AbstractStateChangeTouchController
     public boolean onDrag(float displacement, MotionEvent ev) {
         if (!mIsLogContainerSet) {
             if (mStartState == ALL_APPS) {
-                mStartContainerType = LAUNCHER_STATE_ALLAPPS;
+                mStartContainerType = ContainerType.ALLAPPS;
             } else if (mStartState == NORMAL) {
-                mStartContainerType = LAUNCHER_STATE_HOME;
+                mStartContainerType = getLogContainerTypeForNormalState(ev);
             } else if (mStartState == OVERVIEW) {
-                mStartContainerType = LAUNCHER_STATE_OVERVIEW;
+                mStartContainerType = ContainerType.TASKSWITCHER;
             }
             mIsLogContainerSet = true;
         }
@@ -396,6 +401,7 @@ public abstract class AbstractStateChangeTouchController
     @Override
     public void onDragEnd(float velocity) {
         boolean fling = mDetector.isFling(velocity);
+        final int logAction = fling ? Touch.FLING : Touch.SWIPE;
 
         boolean blockedFling = fling && mFlingBlockCheck.isBlocked();
         if (blockedFling) {
@@ -452,7 +458,7 @@ public abstract class AbstractStateChangeTouchController
             }
         }
 
-        mCurrentAnimation.setEndAction(() -> onSwipeInteractionCompleted(targetState));
+        mCurrentAnimation.setEndAction(() -> onSwipeInteractionCompleted(targetState, logAction));
         ValueAnimator anim = mCurrentAnimation.getAnimationPlayer();
         anim.setFloatValues(startProgress, endProgress);
         maybeUpdateAtomicAnim(mFromState, targetState, targetState == mToState ? 1f : 0f);
@@ -516,7 +522,11 @@ public abstract class AbstractStateChangeTouchController
                 .setInterpolator(scrollInterpolatorForVelocity(velocity));
     }
 
-    protected void onSwipeInteractionCompleted(LauncherState targetState) {
+    protected int getDirectionForLog() {
+        return mToState.ordinal > mFromState.ordinal ? Direction.UP : Direction.DOWN;
+    }
+
+    protected void onSwipeInteractionCompleted(LauncherState targetState, int logAction) {
         if (mAtomicComponentsController != null) {
             mAtomicComponentsController.getAnimationPlayer().end();
             mAtomicComponentsController = null;
@@ -525,18 +535,18 @@ public abstract class AbstractStateChangeTouchController
         boolean shouldGoToTargetState = true;
         if (mPendingAnimation != null) {
             boolean reachedTarget = mToState == targetState;
-            mPendingAnimation.finish(reachedTarget);
+            mPendingAnimation.finish(reachedTarget, logAction);
             mPendingAnimation = null;
             shouldGoToTargetState = !reachedTarget;
         }
         if (shouldGoToTargetState) {
-            goToTargetState(targetState);
+            goToTargetState(targetState, logAction);
         }
     }
 
-    protected void goToTargetState(LauncherState targetState) {
+    protected void goToTargetState(LauncherState targetState, int logAction) {
         if (targetState != mStartState) {
-            logReachedState(targetState);
+            logReachedState(logAction, targetState);
         }
         if (!mLauncher.isInState(targetState)) {
             // If we're already in the target state, don't jump to it at the end of the animation in
@@ -546,18 +556,24 @@ public abstract class AbstractStateChangeTouchController
         mLauncher.getDragLayer().getScrim().createSysuiMultiplierAnim(1f).setDuration(0).start();
     }
 
-    private void logReachedState(LauncherState targetState) {
+    private void logReachedState(int logAction, LauncherState targetState) {
         // Transition complete. log the action
+        mLauncher.getUserEventDispatcher().logStateChangeAction(logAction,
+                getDirectionForLog(), mDetector.getDownX(), mDetector.getDownY(),
+                mStartContainerType /* e.g., hotseat */,
+                mStartState.containerType /* e.g., workspace */,
+                targetState.containerType,
+                mLauncher.getWorkspace().getCurrentPage());
         mLauncher.getStatsLogManager().logger()
-                .withSrcState(mStartState.statsLogOrdinal)
-                .withDstState(targetState.statsLogOrdinal)
+                .withSrcState(StatsLogManager.containerTypeToAtomState(mStartState.containerType))
+                .withDstState(StatsLogManager.containerTypeToAtomState(targetState.containerType))
                 .withContainerInfo(LauncherAtom.ContainerInfo.newBuilder()
                         .setWorkspace(
                                 LauncherAtom.WorkspaceContainer.newBuilder()
                                         .setPageIndex(mLauncher.getWorkspace().getCurrentPage()))
                         .build())
-                .log(StatsLogManager.getLauncherAtomEvent(mStartState.statsLogOrdinal,
-                            targetState.statsLogOrdinal, mToState.ordinal > mFromState.ordinal
+                .log(StatsLogManager.getLauncherAtomEvent(mStartState.containerType,
+                            targetState.containerType, mToState.ordinal > mFromState.ordinal
                                     ? LAUNCHER_UNKNOWN_SWIPEUP
                                     : LAUNCHER_UNKNOWN_SWIPEDOWN));
     }
diff --git a/src/com/android/launcher3/touch/AllAppsSwipeController.java b/src/com/android/launcher3/touch/AllAppsSwipeController.java
index f9dcf2d2e9..4a202b65d8 100644
--- a/src/com/android/launcher3/touch/AllAppsSwipeController.java
+++ b/src/com/android/launcher3/touch/AllAppsSwipeController.java
@@ -24,6 +24,7 @@ import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.states.StateAnimationConfig.AnimationFlags;
+import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 
 /**
  * TouchController to switch between NORMAL and ALL_APPS state.
@@ -68,6 +69,12 @@ public class AllAppsSwipeController extends AbstractStateChangeTouchController {
         return fromState;
     }
 
+    @Override
+    protected int getLogContainerTypeForNormalState(MotionEvent ev) {
+        return mLauncher.getDragLayer().isEventOverView(mLauncher.getHotseat(), mTouchDownEvent)
+                ? ContainerType.HOTSEAT : ContainerType.WORKSPACE;
+    }
+
     @Override
     protected float initCurrentAnimation(@AnimationFlags int animComponents) {
         float range = getShiftRange();
diff --git a/src/com/android/launcher3/touch/ItemClickHandler.java b/src/com/android/launcher3/touch/ItemClickHandler.java
index d56391da3d..61d6f7d804 100644
--- a/src/com/android/launcher3/touch/ItemClickHandler.java
+++ b/src/com/android/launcher3/touch/ItemClickHandler.java
@@ -25,9 +25,7 @@ import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_DISABLED_SA
 import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_DISABLED_SUSPENDED;
 
 import android.app.AlertDialog;
-import android.app.PendingIntent;
 import android.content.Intent;
-import android.content.IntentSender;
 import android.content.pm.LauncherApps;
 import android.content.pm.PackageInstaller.SessionInfo;
 import android.os.Process;
@@ -51,7 +49,6 @@ import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.model.data.PromiseAppInfo;
-import com.android.launcher3.model.data.RemoteActionItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pm.InstallSessionHelper;
 import com.android.launcher3.testing.TestLogging;
@@ -239,27 +236,6 @@ public class ItemClickHandler {
         startAppShortcutOrInfoActivity(v, shortcut, launcher);
     }
 
-    /**
-     * Event handler for a {@link android.app.RemoteAction} click
-     *
-     */
-    public static void onClickRemoteAction(Launcher launcher,
-            RemoteActionItemInfo remoteActionInfo) {
-        try {
-            PendingIntent pendingIntent = remoteActionInfo.getRemoteAction().getActionIntent();
-            if (remoteActionInfo.shouldStartInLauncher()) {
-                launcher.startIntentSenderForResult(pendingIntent.getIntentSender(), 0, null, 0, 0,
-                        0);
-            } else {
-                pendingIntent.send();
-            }
-        } catch (PendingIntent.CanceledException | IntentSender.SendIntentException e) {
-            Toast.makeText(launcher,
-                    launcher.getResources().getText(R.string.shortcut_not_available),
-                    Toast.LENGTH_SHORT).show();
-        }
-    }
-
     private static void startAppShortcutOrInfoActivity(View v, ItemInfo item, Launcher launcher) {
         TestLogging.recordEvent(
                 TestProtocol.SEQUENCE_MAIN, "start: startAppShortcutOrInfoActivity");
diff --git a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
index 17f02be5b4..fb02f79c49 100644
--- a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
+++ b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
@@ -72,6 +72,7 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
         out.halfPageSize = view.getNormalChildHeight() / 2;
         out.halfScreenSize = view.getMeasuredHeight() / 2;
         out.screenCenter = insets.top + view.getPaddingTop() + out.scroll + out.halfPageSize;
+        out.pageParentScale = view.getScaleY();
     }
 
     @Override
diff --git a/src/com/android/launcher3/touch/PagedOrientationHandler.java b/src/com/android/launcher3/touch/PagedOrientationHandler.java
index 114b75acec..354d78d0ac 100644
--- a/src/com/android/launcher3/touch/PagedOrientationHandler.java
+++ b/src/com/android/launcher3/touch/PagedOrientationHandler.java
@@ -112,6 +112,7 @@ public interface PagedOrientationHandler {
         public int halfPageSize;
         public int screenCenter;
         public int halfScreenSize;
+        public float pageParentScale;
     }
 
     class ChildBounds {
diff --git a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
index 5f5b2d1feb..06479e6b6a 100644
--- a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
+++ b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
@@ -70,6 +70,7 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
         out.halfPageSize = view.getNormalChildWidth() / 2;
         out.halfScreenSize = view.getMeasuredWidth() / 2;
         out.screenCenter = insets.left + view.getPaddingLeft() + out.scroll + out.halfPageSize;
+        out.pageParentScale = view.getScaleX();
     }
 
     @Override
diff --git a/src/com/android/launcher3/util/Executors.java b/src/com/android/launcher3/util/Executors.java
index a85ae458ed..0a32734fca 100644
--- a/src/com/android/launcher3/util/Executors.java
+++ b/src/com/android/launcher3/util/Executors.java
@@ -20,10 +20,8 @@ import android.os.Looper;
 import android.os.Process;
 
 import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * Various different executors used in Launcher
@@ -85,29 +83,4 @@ public class Executors {
      */
     public static final LooperExecutor MODEL_EXECUTOR =
             new LooperExecutor(createAndStartNewLooper("launcher-loader"));
-
-    /**
-     * A simple ThreadFactory to set the thread name and priority when used with executors.
-     */
-    public static class SimpleThreadFactory implements ThreadFactory {
-
-        private final int mPriority;
-        private final String mNamePrefix;
-
-        private final AtomicInteger mCount = new AtomicInteger(0);
-
-        public SimpleThreadFactory(String namePrefix, int priority) {
-            mNamePrefix = namePrefix;
-            mPriority = priority;
-        }
-
-        @Override
-        public Thread newThread(Runnable runnable) {
-            Thread t = new Thread(() -> {
-                Process.setThreadPriority(mPriority);
-                runnable.run();
-            }, mNamePrefix + mCount.incrementAndGet());
-            return t;
-        }
-    }
 }
diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java
index d9a14e9e3f..52a82f8e93 100644
--- a/src/com/android/launcher3/views/FloatingIconView.java
+++ b/src/com/android/launcher3/views/FloatingIconView.java
@@ -15,6 +15,7 @@
  */
 package com.android.launcher3.views;
 
+import static com.android.launcher3.LauncherAnimUtils.DRAWABLE_ALPHA;
 import static com.android.launcher3.Utilities.getBadge;
 import static com.android.launcher3.Utilities.getFullDrawable;
 import static com.android.launcher3.config.FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM;
@@ -22,6 +23,9 @@ import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 import static com.android.launcher3.views.IconLabelDotView.setIconAndDotVisible;
 
 import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.Canvas;
@@ -70,6 +74,7 @@ public class FloatingIconView extends FrameLayout implements
     private static @Nullable IconLoadResult sIconLoadResult;
 
     public static final float SHAPE_PROGRESS_DURATION = 0.10f;
+    private static final int FADE_DURATION_MS = 200;
     private static final RectF sTmpRectF = new RectF();
     private static final Object[] sTmpObjArray = new Object[1];
 
@@ -84,9 +89,6 @@ public class FloatingIconView extends FrameLayout implements
 
     private IconLoadResult mIconLoadResult;
 
-    // Draw the drawable of the BubbleTextView behind ClipIconView to reveal the built in shadow.
-    private View mBtvDrawable;
-
     private ClipIconView mClipIconView;
     private @Nullable Drawable mBadge;
 
@@ -96,6 +98,7 @@ public class FloatingIconView extends FrameLayout implements
 
     private final Rect mFinalDrawableBounds = new Rect();
 
+    private AnimatorSet mFadeAnimatorSet;
     private ListenerView mListenerView;
     private Runnable mFastFinishRunnable;
 
@@ -113,8 +116,6 @@ public class FloatingIconView extends FrameLayout implements
         mIsRtl = Utilities.isRtl(getResources());
         mListenerView = new ListenerView(context, attrs);
         mClipIconView = new ClipIconView(context, attrs);
-        mBtvDrawable = new ImageView(context, attrs);
-        addView(mBtvDrawable);
         addView(mClipIconView);
         setWillNotDraw(false);
     }
@@ -175,7 +176,6 @@ public class FloatingIconView extends FrameLayout implements
         setLayoutParams(lp);
 
         mClipIconView.setLayoutParams(new FrameLayout.LayoutParams(lp.width, lp.height));
-        mBtvDrawable.setLayoutParams(new FrameLayout.LayoutParams(lp.width, lp.height));
     }
 
     private void updatePosition(RectF pos, InsettableFrameLayout.LayoutParams lp) {
@@ -292,8 +292,6 @@ public class FloatingIconView extends FrameLayout implements
         drawable = drawable == null ? null : drawable.getConstantState().newDrawable();
         int iconOffset = getOffsetForIconBounds(l, drawable, pos);
         synchronized (iconLoadResult) {
-            iconLoadResult.btvDrawable = btvIcon == null || drawable == btvIcon
-                    ? null : btvIcon.getConstantState().newDrawable();
             iconLoadResult.drawable = drawable;
             iconLoadResult.badge = badge;
             iconLoadResult.iconOffset = iconOffset;
@@ -313,8 +311,7 @@ public class FloatingIconView extends FrameLayout implements
      * @param iconOffset The amount of offset needed to match this view with the original view.
      */
     @UiThread
-    private void setIcon(@Nullable Drawable drawable, @Nullable Drawable badge,
-            @Nullable Drawable btvIcon, int iconOffset) {
+    private void setIcon(@Nullable Drawable drawable, @Nullable Drawable badge, int iconOffset) {
         final InsettableFrameLayout.LayoutParams lp =
                 (InsettableFrameLayout.LayoutParams) getLayoutParams();
         mBadge = badge;
@@ -345,10 +342,6 @@ public class FloatingIconView extends FrameLayout implements
                 mBadge.setBounds(0, 0, clipViewOgWidth, clipViewOgHeight);
             }
         }
-
-        if (!mIsOpening && btvIcon != null) {
-            mBtvDrawable.setBackground(btvIcon);
-        }
         invalidate();
     }
 
@@ -367,7 +360,7 @@ public class FloatingIconView extends FrameLayout implements
         synchronized (mIconLoadResult) {
             if (mIconLoadResult.isIconLoaded) {
                 setIcon(mIconLoadResult.drawable, mIconLoadResult.badge,
-                        mIconLoadResult.btvDrawable, mIconLoadResult.iconOffset);
+                        mIconLoadResult.iconOffset);
                 setIconAndDotVisible(originalView, false);
             } else {
                 mIconLoadResult.onIconLoaded = () -> {
@@ -376,7 +369,7 @@ public class FloatingIconView extends FrameLayout implements
                     }
 
                     setIcon(mIconLoadResult.drawable, mIconLoadResult.badge,
-                            mIconLoadResult.btvDrawable, mIconLoadResult.iconOffset);
+                            mIconLoadResult.iconOffset);
 
                     setVisibility(VISIBLE);
                     setIconAndDotVisible(originalView, false);
@@ -441,6 +434,10 @@ public class FloatingIconView extends FrameLayout implements
             mEndRunnable.run();
             mEndRunnable = null;
         }
+        if (mFadeAnimatorSet != null) {
+            mFadeAnimatorSet.end();
+            mFadeAnimatorSet = null;
+        }
     }
 
     @Override
@@ -549,16 +546,8 @@ public class FloatingIconView extends FrameLayout implements
                     setIconAndDotVisible(originalView, true);
                     view.finish(dragLayer);
                 } else {
-                    originalView.setVisibility(VISIBLE);
-                    if (originalView instanceof IconLabelDotView) {
-                        setIconAndDotVisible(originalView, true);
-                    }
-                    if (originalView instanceof BubbleTextView) {
-                        BubbleTextView btv = (BubbleTextView) originalView;
-                        btv.setIconVisible(true);
-                        btv.setForceHideDot(true);
-                    }
-                    view.finish(dragLayer);
+                    view.mFadeAnimatorSet = view.createFadeAnimation(originalView, dragLayer);
+                    view.mFadeAnimatorSet.start();
                 }
             } else {
                 view.finish(dragLayer);
@@ -575,6 +564,47 @@ public class FloatingIconView extends FrameLayout implements
         return view;
     }
 
+    private AnimatorSet createFadeAnimation(View originalView, DragLayer dragLayer) {
+        AnimatorSet fade = new AnimatorSet();
+        fade.setDuration(FADE_DURATION_MS);
+        fade.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+                originalView.setVisibility(VISIBLE);
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                finish(dragLayer);
+            }
+        });
+
+        if (originalView instanceof IconLabelDotView) {
+            fade.addListener(new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationEnd(Animator animation) {
+                    setIconAndDotVisible(originalView, true);
+                }
+            });
+        }
+
+        if (originalView instanceof BubbleTextView) {
+            BubbleTextView btv = (BubbleTextView) originalView;
+            fade.addListener(new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationStart(Animator animation) {
+                    btv.setIconVisible(true);
+                    btv.setForceHideDot(true);
+                }
+            });
+            fade.play(ObjectAnimator.ofInt(btv.getIcon(), DRAWABLE_ALPHA, 0, 255));
+        } else if (!(originalView instanceof FolderIcon)) {
+            fade.play(ObjectAnimator.ofFloat(originalView, ALPHA, 0f, 1f));
+        }
+
+        return fade;
+    }
+
     private void finish(DragLayer dragLayer) {
         ((ViewGroup) dragLayer.getParent()).removeView(this);
         dragLayer.removeView(mListenerView);
@@ -598,7 +628,11 @@ public class FloatingIconView extends FrameLayout implements
         mLoadIconSignal = null;
         mEndRunnable = null;
         mFinalDrawableBounds.setEmpty();
+        if (mFadeAnimatorSet != null) {
+            mFadeAnimatorSet.cancel();
+        }
         mPositionOut = null;
+        mFadeAnimatorSet = null;
         mListenerView.setListener(null);
         mOriginalIcon = null;
         mOnTargetChangeRunnable = null;
@@ -606,13 +640,11 @@ public class FloatingIconView extends FrameLayout implements
         sTmpObjArray[0] = null;
         mIconLoadResult = null;
         mClipIconView.recycle();
-        mBtvDrawable.setBackground(null);
         mFastFinishRunnable = null;
     }
 
     private static class IconLoadResult {
         final ItemInfo itemInfo;
-        Drawable btvDrawable;
         Drawable drawable;
         Drawable badge;
         int iconOffset;
diff --git a/src/com/android/launcher3/views/HeroSearchResultView.java b/src/com/android/launcher3/views/HeroSearchResultView.java
index dd322d921a..a8e1c6b30c 100644
--- a/src/com/android/launcher3/views/HeroSearchResultView.java
+++ b/src/com/android/launcher3/views/HeroSearchResultView.java
@@ -16,16 +16,12 @@
 package com.android.launcher3.views;
 
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS;
-import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.ShortcutInfo;
 import android.graphics.Point;
 import android.os.Bundle;
 import android.util.AttributeSet;
-import android.util.Pair;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
@@ -35,10 +31,9 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.DragSource;
 import com.android.launcher3.DropTarget;
 import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
-import com.android.launcher3.allapps.search.AllAppsSearchBarController.PayloadResultHandler;
+import com.android.launcher3.allapps.search.AllAppsSearchBarController;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.dragndrop.DraggableView;
 import com.android.launcher3.graphics.DragPreviewProvider;
@@ -58,10 +53,9 @@ import java.util.List;
  * A view representing a high confidence app search result that includes shortcuts
  */
 public class HeroSearchResultView extends LinearLayout implements DragSource,
-        PayloadResultHandler<List<Pair<ShortcutInfo, ItemInfoWithIcon>>> {
+        AllAppsSearchBarController.PayloadResultHandler<List<ItemInfoWithIcon>> {
 
     public static final int MAX_SHORTCUTS_COUNT = 2;
-    private final Object[] mTargetInfo = createTargetInfo();
     BubbleTextView mBubbleTextView;
     View mIconView;
     BubbleTextView[] mDeepShortcutTextViews = new BubbleTextView[2];
@@ -108,7 +102,7 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
                             grid.allAppsIconSizePx));
             bubbleTextView.setOnClickListener(view -> {
                 WorkspaceItemInfo itemInfo = (WorkspaceItemInfo) bubbleTextView.getTag();
-                SearchTargetEvent event = getSearchTargetEvent(
+                SearchTargetEvent event = new SearchTargetEvent(
                         SearchTarget.ItemType.APP_HERO,
                         SearchTargetEvent.CHILD_SELECT);
                 event.bundle = getAppBundle(itemInfo);
@@ -125,36 +119,21 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
      * Apply {@link ItemInfo} for appIcon and shortcut Icons
      */
     @Override
-    public void applyAdapterInfo(
-            AdapterItemWithPayload<List<Pair<ShortcutInfo, ItemInfoWithIcon>>> adapterItem) {
+    public void applyAdapterInfo(AdapterItemWithPayload<List<ItemInfoWithIcon>> adapterItem) {
         mBubbleTextView.applyFromApplicationInfo(adapterItem.appInfo);
         mIconView.setBackground(mBubbleTextView.getIcon());
         mIconView.setTag(adapterItem.appInfo);
-        List<Pair<ShortcutInfo, ItemInfoWithIcon>> shortcutDetails = adapterItem.getPayload();
-        LauncherAppState appState = LauncherAppState.getInstance(getContext());
+        List<ItemInfoWithIcon> shorcutInfos = adapterItem.getPayload();
         for (int i = 0; i < mDeepShortcutTextViews.length; i++) {
-            BubbleTextView shortcutView = mDeepShortcutTextViews[i];
-            mDeepShortcutTextViews[i].setVisibility(shortcutDetails.size() > i ? VISIBLE : GONE);
-            if (i < shortcutDetails.size()) {
-                Pair<ShortcutInfo, ItemInfoWithIcon> p = shortcutDetails.get(i);
-                //apply ItemInfo and prepare view
-                shortcutView.applyFromWorkspaceItem((WorkspaceItemInfo) p.second);
-                MODEL_EXECUTOR.execute(() -> {
-                    // load unbadged shortcut in background and update view when icon ready
-                    appState.getIconCache().getUnbadgedShortcutIcon(p.second, p.first);
-                    MAIN_EXECUTOR.post(() -> shortcutView.reapplyItemInfo(p.second));
-                });
+            mDeepShortcutTextViews[i].setVisibility(shorcutInfos.size() > i ? VISIBLE : GONE);
+            if (i < shorcutInfos.size()) {
+                mDeepShortcutTextViews[i].applyFromItemInfoWithIcon(shorcutInfos.get(i));
             }
         }
         mPlugin = adapterItem.getPlugin();
         adapterItem.setSelectionHandler(this::handleSelection);
     }
 
-    @Override
-    public Object[] getTargetInfo() {
-        return mTargetInfo;
-    }
-
     @Override
     public void onDropCompleted(View target, DropTarget.DragObject d, boolean success) {
         mBubbleTextView.setVisibility(VISIBLE);
@@ -190,7 +169,7 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
             mLauncher.getWorkspace().beginDragShared(mContainer.mBubbleTextView,
                     draggableView, mContainer, itemInfo, previewProvider, new DragOptions());
 
-            SearchTargetEvent event = mContainer.getSearchTargetEvent(
+            SearchTargetEvent event = new SearchTargetEvent(
                     SearchTarget.ItemType.APP_HERO, SearchTargetEvent.LONG_PRESS);
             event.bundle = getAppBundle(itemInfo);
             if (mContainer.mPlugin != null) {
@@ -207,7 +186,7 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
         Launcher launcher = Launcher.getLauncher(getContext());
         launcher.startActivitySafely(this, itemInfo.getIntent(), itemInfo);
 
-        SearchTargetEvent event = getSearchTargetEvent(
+        SearchTargetEvent event = new SearchTargetEvent(
                 SearchTarget.ItemType.APP_HERO, eventType);
         event.bundle = getAppBundle(itemInfo);
         if (mPlugin != null) {
diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java
index 80f0981af5..3ec20d57a1 100644
--- a/src/com/android/launcher3/views/OptionsPopupView.java
+++ b/src/com/android/launcher3/views/OptionsPopupView.java
@@ -16,7 +16,6 @@
 package com.android.launcher3.views;
 
 import static com.android.launcher3.Utilities.EXTRA_WALLPAPER_FLAVOR;
-import static com.android.launcher3.Utilities.EXTRA_WALLPAPER_LAUNCH_SOURCE;
 import static com.android.launcher3.Utilities.EXTRA_WALLPAPER_OFFSET;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.IGNORE;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SETTINGS_BUTTON_TAP_OR_LONGPRESS;
@@ -133,7 +132,7 @@ public class OptionsPopupView extends ArrowPopup
             view.setOnLongClickListener(popup);
             popup.mItemMap.put(view, item);
         }
-        popup.show();
+        popup.reorderAndShow(popup.getChildCount());
     }
 
     @VisibleForTesting
@@ -212,8 +211,7 @@ public class OptionsPopupView extends ArrowPopup
         Intent intent = new Intent(Intent.ACTION_SET_WALLPAPER)
                 .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
                 .putExtra(EXTRA_WALLPAPER_OFFSET,
-                        launcher.getWorkspace().getWallpaperOffsetForCenterPage())
-                .putExtra(EXTRA_WALLPAPER_LAUNCH_SOURCE, "app_launched_launcher");
+                        launcher.getWorkspace().getWallpaperOffsetForCenterPage());
         if (!Utilities.existsStyleWallpapers(launcher)) {
             intent.putExtra(EXTRA_WALLPAPER_FLAVOR, "wallpaper_only");
         } else {
diff --git a/src/com/android/launcher3/views/SearchResultIconRow.java b/src/com/android/launcher3/views/SearchResultIconRow.java
deleted file mode 100644
index 313ae5e611..0000000000
--- a/src/com/android/launcher3/views/SearchResultIconRow.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.views;
-
-import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
-import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
-
-import android.app.RemoteAction;
-import android.content.Context;
-import android.content.pm.ShortcutInfo;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.os.Bundle;
-import android.util.AttributeSet;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
-import com.android.launcher3.allapps.search.AllAppsSearchBarController;
-import com.android.launcher3.icons.LauncherIcons;
-import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.model.data.ItemInfoWithIcon;
-import com.android.launcher3.model.data.RemoteActionItemInfo;
-import com.android.launcher3.model.data.WorkspaceItemInfo;
-import com.android.launcher3.touch.ItemClickHandler;
-import com.android.systemui.plugins.AllAppsSearchPlugin;
-import com.android.systemui.plugins.shared.SearchTarget;
-import com.android.systemui.plugins.shared.SearchTarget.ItemType;
-import com.android.systemui.plugins.shared.SearchTargetEvent;
-
-/**
- * A view representing a stand alone shortcut search result
- */
-public class SearchResultIconRow extends DoubleShadowBubbleTextView implements
-        AllAppsSearchBarController.PayloadResultHandler<SearchTarget> {
-
-    private final Object[] mTargetInfo = createTargetInfo();
-    private ShortcutInfo mShortcutInfo;
-    private AllAppsSearchPlugin mPlugin;
-    private AdapterItemWithPayload<SearchTarget> mAdapterItem;
-
-
-    public SearchResultIconRow(@NonNull Context context) {
-        super(context);
-    }
-
-    public SearchResultIconRow(@NonNull Context context,
-            @Nullable AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public SearchResultIconRow(@NonNull Context context, @Nullable AttributeSet attrs,
-            int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    @Override
-    public void applyAdapterInfo(AdapterItemWithPayload<SearchTarget> adapterItemWithPayload) {
-        if (mAdapterItem != null) {
-            mAdapterItem.setSelectionHandler(null);
-        }
-        mAdapterItem = adapterItemWithPayload;
-        SearchTarget payload = adapterItemWithPayload.getPayload();
-        mPlugin = adapterItemWithPayload.getPlugin();
-
-        if (payload.mRemoteAction != null) {
-            prepareUsingRemoteAction(payload.mRemoteAction,
-                    payload.bundle.getString(SearchTarget.REMOTE_ACTION_TOKEN),
-                    payload.bundle.getBoolean(SearchTarget.REMOTE_ACTION_SHOULD_START));
-        } else {
-            prepareUsingShortcutInfo(payload.shortcuts.get(0));
-        }
-        setOnClickListener(v -> handleSelection(SearchTargetEvent.SELECT));
-        adapterItemWithPayload.setSelectionHandler(this::handleSelection);
-    }
-
-    private void prepareUsingShortcutInfo(ShortcutInfo shortcutInfo) {
-        mShortcutInfo = shortcutInfo;
-        WorkspaceItemInfo workspaceItemInfo = new WorkspaceItemInfo(mShortcutInfo, getContext());
-        applyFromWorkspaceItem(workspaceItemInfo);
-        LauncherAppState launcherAppState = LauncherAppState.getInstance(getContext());
-        MODEL_EXECUTOR.execute(() -> {
-            launcherAppState.getIconCache().getShortcutIcon(workspaceItemInfo, mShortcutInfo);
-            reapplyItemInfoAsync(workspaceItemInfo);
-        });
-    }
-
-    private void prepareUsingRemoteAction(RemoteAction remoteAction, String token, boolean start) {
-        RemoteActionItemInfo itemInfo = new RemoteActionItemInfo(remoteAction, token, start);
-
-        applyFromRemoteActionInfo(itemInfo);
-        UI_HELPER_EXECUTOR.post(() -> {
-            // If the Drawable from the remote action is not AdaptiveBitmap, styling will not work.
-            try (LauncherIcons li = LauncherIcons.obtain(getContext())) {
-                Drawable d = itemInfo.getRemoteAction().getIcon().loadDrawable(getContext());
-                itemInfo.bitmap = li.createBadgedIconBitmap(d, itemInfo.user,
-                        Build.VERSION.SDK_INT);
-                reapplyItemInfoAsync(itemInfo);
-            }
-        });
-
-    }
-
-    void reapplyItemInfoAsync(ItemInfoWithIcon itemInfoWithIcon) {
-        MAIN_EXECUTOR.post(() -> reapplyItemInfo(itemInfoWithIcon));
-    }
-
-    @Override
-    public Object[] getTargetInfo() {
-        return mTargetInfo;
-    }
-
-    private void handleSelection(int eventType) {
-        ItemInfo itemInfo = (ItemInfo) getTag();
-        Launcher launcher = Launcher.getLauncher(getContext());
-        final SearchTargetEvent searchTargetEvent;
-        if (itemInfo instanceof WorkspaceItemInfo) {
-            ItemClickHandler.onClickAppShortcut(this, (WorkspaceItemInfo) itemInfo, launcher);
-            searchTargetEvent = getSearchTargetEvent(SearchTarget.ItemType.SHORTCUT,
-                    eventType);
-            searchTargetEvent.shortcut = mShortcutInfo;
-        } else {
-            RemoteActionItemInfo remoteItemInfo = (RemoteActionItemInfo) itemInfo;
-            ItemClickHandler.onClickRemoteAction(launcher, remoteItemInfo);
-            searchTargetEvent = getSearchTargetEvent(ItemType.ACTION,
-                    eventType);
-            searchTargetEvent.bundle = new Bundle();
-            searchTargetEvent.remoteAction = remoteItemInfo.getRemoteAction();
-            searchTargetEvent.bundle.putBoolean(SearchTarget.REMOTE_ACTION_SHOULD_START,
-                    remoteItemInfo.shouldStartInLauncher());
-            searchTargetEvent.bundle.putString(SearchTarget.REMOTE_ACTION_TOKEN,
-                    remoteItemInfo.getToken());
-        }
-        if (mPlugin != null) {
-            mPlugin.notifySearchTargetEvent(searchTargetEvent);
-        }
-    }
-}
diff --git a/src/com/android/launcher3/views/SearchResultPeopleView.java b/src/com/android/launcher3/views/SearchResultPeopleView.java
index 0c9a22f672..6e45e88b32 100644
--- a/src/com/android/launcher3/views/SearchResultPeopleView.java
+++ b/src/com/android/launcher3/views/SearchResultPeopleView.java
@@ -15,6 +15,9 @@
  */
 package com.android.launcher3.views;
 
+import static android.content.Intent.URI_ALLOW_UNSAFE;
+import static android.content.Intent.URI_ANDROID_APP_SCHEME;
+
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
@@ -25,6 +28,7 @@ import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.os.Bundle;
 import android.util.AttributeSet;
 import android.view.View;
@@ -46,6 +50,7 @@ import com.android.systemui.plugins.AllAppsSearchPlugin;
 import com.android.systemui.plugins.shared.SearchTarget;
 import com.android.systemui.plugins.shared.SearchTargetEvent;
 
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 
 /**
@@ -61,8 +66,8 @@ public class SearchResultPeopleView extends LinearLayout implements
     private TextView mTitleView;
     private ImageButton[] mProviderButtons = new ImageButton[3];
     private AllAppsSearchPlugin mPlugin;
-    private Intent mIntent;
-    private final Object[] mTargetInfo = createTargetInfo();
+    private Uri mContactUri;
+
 
     public SearchResultPeopleView(Context context) {
         this(context, null, 0);
@@ -104,7 +109,7 @@ public class SearchResultPeopleView extends LinearLayout implements
         Bundle payload = adapterItemWithPayload.getPayload();
         mPlugin = adapterItemWithPayload.getPlugin();
         mTitleView.setText(payload.getString("title"));
-        mIntent = payload.getParcelable("intent");
+        mContactUri = payload.getParcelable("contact_uri");
         Bitmap icon = payload.getParcelable("icon");
         if (icon != null) {
             RoundedBitmapDrawable d = RoundedBitmapDrawableFactory.create(getResources(), icon);
@@ -120,20 +125,25 @@ public class SearchResultPeopleView extends LinearLayout implements
         for (int i = 0; i < mProviderButtons.length; i++) {
             ImageButton button = mProviderButtons[i];
             if (providers != null && i < providers.size()) {
-                Bundle provider = providers.get(i);
-                Intent intent = provider.getParcelable("intent");
-                setupProviderButton(button, provider, intent, adapterItemWithPayload);
-                String pkg = provider.getString("package_name");
-                UI_HELPER_EXECUTOR.post(() -> {
-                    try {
-                        ApplicationInfo applicationInfo = mPackageManager.getApplicationInfo(
-                                pkg, 0);
-                        Drawable appIcon = applicationInfo.loadIcon(mPackageManager);
-                        MAIN_EXECUTOR.post(() -> button.setImageDrawable(appIcon));
-                    } catch (PackageManager.NameNotFoundException ignored) {
-                    }
-
-                });
+                try {
+                    Bundle provider = providers.get(i);
+                    Intent intent = Intent.parseUri(provider.getString("intent_uri_str"),
+                            URI_ANDROID_APP_SCHEME | URI_ALLOW_UNSAFE);
+                    setupProviderButton(button, provider, intent);
+                    String pkg = provider.getString("package_name");
+                    UI_HELPER_EXECUTOR.post(() -> {
+                        try {
+                            ApplicationInfo applicationInfo = mPackageManager.getApplicationInfo(
+                                    pkg, 0);
+                            Drawable appIcon = applicationInfo.loadIcon(mPackageManager);
+                            MAIN_EXECUTOR.post(()-> button.setImageDrawable(appIcon));
+                        } catch (PackageManager.NameNotFoundException ignored) {
+                        }
+
+                    });
+                } catch (URISyntaxException ex) {
+                    button.setVisibility(GONE);
+                }
             } else {
                 button.setVisibility(GONE);
             }
@@ -141,21 +151,15 @@ public class SearchResultPeopleView extends LinearLayout implements
         adapterItemWithPayload.setSelectionHandler(this::handleSelection);
     }
 
-    @Override
-    public Object[] getTargetInfo() {
-        return mTargetInfo;
-    }
-
-    private void setupProviderButton(ImageButton button, Bundle provider, Intent intent,
-            AllAppsGridAdapter.AdapterItem adapterItem) {
+    private void setupProviderButton(ImageButton button, Bundle provider, Intent intent) {
         Launcher launcher = Launcher.getLauncher(getContext());
         button.setOnClickListener(b -> {
             launcher.startActivitySafely(b, intent, null);
-            SearchTargetEvent searchTargetEvent = getSearchTargetEvent(
+            SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
                     SearchTarget.ItemType.PEOPLE,
                     SearchTargetEvent.CHILD_SELECT);
             searchTargetEvent.bundle = new Bundle();
-            searchTargetEvent.bundle.putParcelable("intent", mIntent);
+            searchTargetEvent.bundle.putParcelable("contact_uri", mContactUri);
             searchTargetEvent.bundle.putBundle("provider", provider);
             if (mPlugin != null) {
                 mPlugin.notifySearchTargetEvent(searchTargetEvent);
@@ -165,13 +169,14 @@ public class SearchResultPeopleView extends LinearLayout implements
 
 
     private void handleSelection(int eventType) {
-        if (mIntent != null) {
+        if (mContactUri != null) {
             Launcher launcher = Launcher.getLauncher(getContext());
-            launcher.startActivitySafely(this, mIntent, null);
-            SearchTargetEvent searchTargetEvent = getSearchTargetEvent(SearchTarget.ItemType.PEOPLE,
-                    eventType);
+            launcher.startActivitySafely(this, new Intent(Intent.ACTION_VIEW, mContactUri).setFlags(
+                    Intent.FLAG_ACTIVITY_NEW_TASK), null);
+            SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
+                    SearchTarget.ItemType.PEOPLE, eventType);
             searchTargetEvent.bundle = new Bundle();
-            searchTargetEvent.bundle.putParcelable("intent", mIntent);
+            searchTargetEvent.bundle.putParcelable("contact_uri", mContactUri);
             if (mPlugin != null) {
                 mPlugin.notifySearchTargetEvent(searchTargetEvent);
             }
diff --git a/src/com/android/launcher3/views/SearchResultPlayItem.java b/src/com/android/launcher3/views/SearchResultPlayItem.java
index ff3ecc8bc3..8624609f80 100644
--- a/src/com/android/launcher3/views/SearchResultPlayItem.java
+++ b/src/com/android/launcher3/views/SearchResultPlayItem.java
@@ -58,8 +58,6 @@ public class SearchResultPlayItem extends LinearLayout implements
     private String mPackageName;
     private boolean mIsInstantGame;
     private AllAppsSearchPlugin mPlugin;
-    private final Object[] mTargetInfo = createTargetInfo();
-
 
     public SearchResultPlayItem(Context context) {
         this(context, null, 0);
@@ -127,11 +125,6 @@ public class SearchResultPlayItem extends LinearLayout implements
         });
     }
 
-    @Override
-    public Object[] getTargetInfo() {
-        return mTargetInfo;
-    }
-
     private void showIfNecessary(TextView textView, @Nullable String string) {
         if (string == null || string.isEmpty()) {
             textView.setVisibility(GONE);
@@ -167,7 +160,7 @@ public class SearchResultPlayItem extends LinearLayout implements
     }
 
     private void logSearchEvent(int eventType) {
-        SearchTargetEvent searchTargetEvent = getSearchTargetEvent(
+        SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
                 SearchTarget.ItemType.PLAY_RESULTS, eventType);
         searchTargetEvent.bundle = new Bundle();
         searchTargetEvent.bundle.putString("package_name", mPackageName);
diff --git a/src/com/android/launcher3/views/SearchResultShortcut.java b/src/com/android/launcher3/views/SearchResultShortcut.java
new file mode 100644
index 0000000000..307cf34c7d
--- /dev/null
+++ b/src/com/android/launcher3/views/SearchResultShortcut.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.views;
+
+import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
+
+import android.content.Context;
+import android.content.pm.ShortcutInfo;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.BubbleTextView;
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.R;
+import com.android.launcher3.allapps.AllAppsGridAdapter;
+import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.launcher3.touch.ItemClickHandler;
+import com.android.systemui.plugins.AllAppsSearchPlugin;
+import com.android.systemui.plugins.shared.SearchTarget;
+import com.android.systemui.plugins.shared.SearchTargetEvent;
+
+/**
+ * A view representing a stand alone shortcut search result
+ */
+public class SearchResultShortcut extends FrameLayout implements
+        AllAppsSearchBarController.PayloadResultHandler<SearchTarget> {
+
+    private BubbleTextView mBubbleTextView;
+    private View mIconView;
+    private ShortcutInfo mShortcutInfo;
+    private AllAppsSearchPlugin mPlugin;
+
+    public SearchResultShortcut(@NonNull Context context) {
+        super(context);
+    }
+
+    public SearchResultShortcut(@NonNull Context context,
+            @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public SearchResultShortcut(@NonNull Context context, @Nullable AttributeSet attrs,
+            int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        Launcher launcher = Launcher.getLauncher(getContext());
+        DeviceProfile grid = launcher.getDeviceProfile();
+        mIconView = findViewById(R.id.icon);
+        ViewGroup.LayoutParams iconParams = mIconView.getLayoutParams();
+        iconParams.height = grid.allAppsIconSizePx;
+        iconParams.width = grid.allAppsIconSizePx;
+        mBubbleTextView = findViewById(R.id.bubble_text);
+        setOnClickListener(v -> handleSelection(SearchTargetEvent.SELECT));
+    }
+
+    @Override
+    public void applyAdapterInfo(
+            AllAppsGridAdapter.AdapterItemWithPayload<SearchTarget> adapterItemWithPayload) {
+        SearchTarget payload = adapterItemWithPayload.getPayload();
+        mPlugin = adapterItemWithPayload.getPlugin();
+        mShortcutInfo = payload.shortcuts.get(0);
+        WorkspaceItemInfo workspaceItemInfo = new WorkspaceItemInfo(mShortcutInfo, getContext());
+        mBubbleTextView.applyFromWorkspaceItem(workspaceItemInfo);
+        mIconView.setBackground(mBubbleTextView.getIcon());
+        LauncherAppState launcherAppState = LauncherAppState.getInstance(getContext());
+        MODEL_EXECUTOR.execute(() -> {
+            launcherAppState.getIconCache().getShortcutIcon(workspaceItemInfo, mShortcutInfo);
+            mBubbleTextView.applyFromWorkspaceItem(workspaceItemInfo);
+            mIconView.setBackground(mBubbleTextView.getIcon());
+        });
+        adapterItemWithPayload.setSelectionHandler(this::handleSelection);
+    }
+
+    private void handleSelection(int eventType) {
+        WorkspaceItemInfo itemInfo = (WorkspaceItemInfo) mBubbleTextView.getTag();
+        ItemClickHandler.onClickAppShortcut(this, itemInfo, Launcher.getLauncher(getContext()));
+
+        SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
+                SearchTarget.ItemType.SHORTCUT, eventType);
+        searchTargetEvent.shortcut = mShortcutInfo;
+        if (mPlugin != null) {
+            mPlugin.notifySearchTargetEvent(searchTargetEvent);
+        }
+    }
+}
diff --git a/src/com/android/launcher3/views/SearchResultSuggestRow.java b/src/com/android/launcher3/views/SearchResultSuggestRow.java
deleted file mode 100644
index b5abbcc724..0000000000
--- a/src/com/android/launcher3/views/SearchResultSuggestRow.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.views;
-
-import static com.android.systemui.plugins.shared.SearchTarget.ItemType.SUGGEST;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.Launcher;
-import com.android.launcher3.R;
-import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
-import com.android.launcher3.allapps.search.AllAppsSearchBarController;
-import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.model.data.RemoteActionItemInfo;
-import com.android.launcher3.touch.ItemClickHandler;
-import com.android.systemui.plugins.AllAppsSearchPlugin;
-import com.android.systemui.plugins.shared.SearchTarget;
-import com.android.systemui.plugins.shared.SearchTargetEvent;
-
-/**
- * A view representing a fallback search suggestion row.
- */
-public class SearchResultSuggestRow extends LinearLayout implements
-        View.OnClickListener, AllAppsSearchBarController.PayloadResultHandler<SearchTarget> {
-
-    private final Object[] mTargetInfo = createTargetInfo();
-    private AllAppsSearchPlugin mPlugin;
-    private AdapterItemWithPayload<SearchTarget> mAdapterItem;
-    private TextView mTitle;
-
-
-    public SearchResultSuggestRow(@NonNull Context context) {
-        super(context);
-    }
-
-    public SearchResultSuggestRow(@NonNull Context context,
-            @Nullable AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public SearchResultSuggestRow(@NonNull Context context, @Nullable AttributeSet attrs,
-            int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        mTitle = findViewById(R.id.title);
-        setOnClickListener(this);
-    }
-    @Override
-    public void applyAdapterInfo(AdapterItemWithPayload<SearchTarget> adapterItemWithPayload) {
-        mAdapterItem = adapterItemWithPayload;
-        SearchTarget payload = adapterItemWithPayload.getPayload();
-        mPlugin = adapterItemWithPayload.getPlugin();
-
-        if (payload.mRemoteAction != null) {
-            RemoteActionItemInfo itemInfo = new RemoteActionItemInfo(payload.mRemoteAction,
-                    payload.bundle.getString(SearchTarget.REMOTE_ACTION_TOKEN),
-                    payload.bundle.getBoolean(SearchTarget.REMOTE_ACTION_SHOULD_START));
-            setTag(itemInfo);
-        }
-        showIfAvailable(mTitle, payload.mRemoteAction.getTitle().toString());
-        setOnClickListener(v -> handleSelection(SearchTargetEvent.SELECT));
-        adapterItemWithPayload.setSelectionHandler(this::handleSelection);
-    }
-
-    @Override
-    public Object[] getTargetInfo() {
-        return mTargetInfo;
-    }
-
-    private void handleSelection(int eventType) {
-        ItemInfo itemInfo = (ItemInfo) getTag();
-        Launcher launcher = Launcher.getLauncher(getContext());
-        if (itemInfo instanceof  RemoteActionItemInfo) return;
-
-        RemoteActionItemInfo remoteItemInfo = (RemoteActionItemInfo) itemInfo;
-        ItemClickHandler.onClickRemoteAction(launcher, remoteItemInfo);
-        SearchTargetEvent searchTargetEvent = getSearchTargetEvent(SUGGEST, eventType);
-        searchTargetEvent.bundle = new Bundle();
-        searchTargetEvent.remoteAction = remoteItemInfo.getRemoteAction();
-        searchTargetEvent.bundle.putBoolean(SearchTarget.REMOTE_ACTION_SHOULD_START,
-                remoteItemInfo.shouldStartInLauncher());
-        searchTargetEvent.bundle.putString(SearchTarget.REMOTE_ACTION_TOKEN,
-                remoteItemInfo.getToken());
-
-        if (mPlugin != null) {
-            mPlugin.notifySearchTargetEvent(searchTargetEvent);
-        }
-    }
-
-    @Override
-    public void onClick(View view) {
-        handleSelection(SearchTargetEvent.SELECT);
-    }
-
-    private void showIfAvailable(TextView view, @Nullable String string) {
-        System.out.println("Plugin suggest string:" + string);
-        if (TextUtils.isEmpty(string)) {
-            view.setVisibility(GONE);
-        } else {
-            System.out.println("Plugin suggest string:" + string);
-            view.setVisibility(VISIBLE);
-            view.setText(string);
-        }
-    }
-}
diff --git a/src/com/android/launcher3/views/SearchSectionHeaderView.java b/src/com/android/launcher3/views/SearchSectionHeaderView.java
index 0fe0a43ff5..d439ee3d68 100644
--- a/src/com/android/launcher3/views/SearchSectionHeaderView.java
+++ b/src/com/android/launcher3/views/SearchSectionHeaderView.java
@@ -52,9 +52,4 @@ public class SearchSectionHeaderView extends TextView implements
             setVisibility(INVISIBLE);
         }
     }
-
-    @Override
-    public Object[] getTargetInfo() {
-        return null;
-    }
 }
diff --git a/src/com/android/launcher3/views/SearchSettingsRowView.java b/src/com/android/launcher3/views/SearchSettingsRowView.java
index a1a0172547..93bcee2585 100644
--- a/src/com/android/launcher3/views/SearchSettingsRowView.java
+++ b/src/com/android/launcher3/views/SearchSettingsRowView.java
@@ -48,8 +48,6 @@ public class SearchSettingsRowView extends LinearLayout implements
     private TextView mBreadcrumbsView;
     private Intent mIntent;
     private AllAppsSearchPlugin mPlugin;
-    private final Object[] mTargetInfo = createTargetInfo();
-
 
     public SearchSettingsRowView(@NonNull Context context) {
         super(context);
@@ -89,11 +87,6 @@ public class SearchSettingsRowView extends LinearLayout implements
         adapterItemWithPayload.setSelectionHandler(this::handleSelection);
     }
 
-    @Override
-    public Object[] getTargetInfo() {
-        return mTargetInfo;
-    }
-
     private void showIfAvailable(TextView view, @Nullable String string) {
         if (TextUtils.isEmpty(string)) {
             view.setVisibility(GONE);
@@ -115,7 +108,7 @@ public class SearchSettingsRowView extends LinearLayout implements
         Launcher launcher = Launcher.getLauncher(getContext());
         launcher.startActivityForResult(mIntent, 0);
 
-        SearchTargetEvent searchTargetEvent = getSearchTargetEvent(
+        SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
                 SearchTarget.ItemType.SETTINGS_ROW, eventType);
         searchTargetEvent.bundle = new Bundle();
         searchTargetEvent.bundle.putParcelable("intent", mIntent);
diff --git a/src/com/android/launcher3/views/ThumbnailSearchResultView.java b/src/com/android/launcher3/views/ThumbnailSearchResultView.java
deleted file mode 100644
index bbc47739f3..0000000000
--- a/src/com/android/launcher3/views/ThumbnailSearchResultView.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.views;
-
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
-import android.net.Uri;
-import android.util.AttributeSet;
-
-import androidx.core.graphics.drawable.RoundedBitmapDrawable;
-import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
-
-import com.android.launcher3.Launcher;
-import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
-import com.android.launcher3.allapps.search.AllAppsSearchBarController;
-import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.model.data.RemoteActionItemInfo;
-import com.android.launcher3.model.data.WorkspaceItemInfo;
-import com.android.launcher3.touch.ItemClickHandler;
-import com.android.launcher3.util.Themes;
-import com.android.systemui.plugins.AllAppsSearchPlugin;
-import com.android.systemui.plugins.shared.SearchTarget;
-import com.android.systemui.plugins.shared.SearchTargetEvent;
-
-/**
- * A view representing a high confidence app search result that includes shortcuts
- */
-public class ThumbnailSearchResultView extends androidx.appcompat.widget.AppCompatImageView
-        implements AllAppsSearchBarController.PayloadResultHandler<SearchTarget> {
-
-    private final Object[] mTargetInfo = createTargetInfo();
-    AllAppsSearchPlugin mPlugin;
-    int mPosition;
-
-    public ThumbnailSearchResultView(Context context) {
-        super(context);
-    }
-
-    public ThumbnailSearchResultView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public ThumbnailSearchResultView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    private void handleSelection(int eventType) {
-        Launcher launcher = Launcher.getLauncher(getContext());
-        ItemInfo itemInfo = (ItemInfo) getTag();
-        if (itemInfo instanceof RemoteActionItemInfo) {
-            RemoteActionItemInfo remoteItemInfo = (RemoteActionItemInfo) itemInfo;
-            ItemClickHandler.onClickRemoteAction(launcher, remoteItemInfo);
-        } else {
-            ItemClickHandler.onClickAppShortcut(this, (WorkspaceItemInfo) itemInfo, launcher);
-        }
-        if (mPlugin != null) {
-            SearchTargetEvent event = getSearchTargetEvent(
-                    SearchTarget.ItemType.SCREENSHOT, eventType);
-            mPlugin.notifySearchTargetEvent(event);
-        }
-    }
-
-    @Override
-    public void applyAdapterInfo(AdapterItemWithPayload<SearchTarget> adapterItem) {
-        Launcher launcher = Launcher.getLauncher(getContext());
-        mPosition = adapterItem.position;
-
-        SearchTarget target = adapterItem.getPayload();
-        Bitmap bitmap;
-        if (target.mRemoteAction != null) {
-            RemoteActionItemInfo itemInfo = new RemoteActionItemInfo(target.mRemoteAction,
-                    target.bundle.getString(SearchTarget.REMOTE_ACTION_TOKEN),
-                    target.bundle.getBoolean(SearchTarget.REMOTE_ACTION_SHOULD_START));
-            ItemClickHandler.onClickRemoteAction(launcher, itemInfo);
-            bitmap = ((BitmapDrawable) target.mRemoteAction.getIcon()
-                    .loadDrawable(getContext())).getBitmap();
-            setTag(itemInfo);
-        } else {
-            bitmap = (Bitmap) target.bundle.getParcelable("bitmap");
-            WorkspaceItemInfo itemInfo = new WorkspaceItemInfo();
-            itemInfo.intent = new Intent(Intent.ACTION_VIEW)
-                    .setData(Uri.parse(target.bundle.getString("uri")))
-                    .setType("image/*")
-                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            setTag(itemInfo);
-        }
-        RoundedBitmapDrawable drawable = RoundedBitmapDrawableFactory.create(null, bitmap);
-        drawable.setCornerRadius(Themes.getDialogCornerRadius(getContext()));
-        setImageDrawable(drawable);
-        setOnClickListener(v -> handleSelection(SearchTargetEvent.SELECT));
-        mPlugin = adapterItem.getPlugin();
-        adapterItem.setSelectionHandler(this::handleSelection);
-    }
-
-    @Override
-    public Object[] getTargetInfo() {
-        return mTargetInfo;
-    }
-}
diff --git a/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java b/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
index aa3ab8f7e0..4fa670f44a 100644
--- a/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
+++ b/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
@@ -32,7 +32,7 @@ import java.util.function.Consumer;
 @ProvidesInterface(action = AllAppsSearchPlugin.ACTION, version = AllAppsSearchPlugin.VERSION)
 public interface AllAppsSearchPlugin extends Plugin {
     String ACTION = "com.android.systemui.action.PLUGIN_ALL_APPS_SEARCH_ACTIONS";
-    int VERSION = 7;
+    int VERSION = 6;
 
     void setup(Activity activity, View view);
 
@@ -42,12 +42,6 @@ public interface AllAppsSearchPlugin extends Plugin {
     void onStateTransitionStart(int fromState, int toState);
     void onStateTransitionComplete(int state);
 
-    /**
-     * Send launcher window focus and visibility changed signals.
-     */
-    void onWindowFocusChanged(boolean hasFocus);
-    void onWindowVisibilityChanged(int visibility);
-
     /**
      * Send signal when user starts typing, perform search, when search ends
      */
diff --git a/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java b/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
index 3f0dc39cc1..c6b8300499 100644
--- a/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
+++ b/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
@@ -15,7 +15,6 @@
  */
 package com.android.systemui.plugins.shared;
 
-import android.app.RemoteAction;
 import android.content.pm.ShortcutInfo;
 import android.os.Bundle;
 
@@ -26,69 +25,17 @@ import java.util.List;
  */
 public class SearchTarget implements Comparable<SearchTarget> {
 
-
-    /**
-     * A bundle key for boolean value of whether remote action should be started in launcher or not
-     */
-    public static final String REMOTE_ACTION_SHOULD_START = "should_start_for_result";
-    public static final String REMOTE_ACTION_TOKEN = "action_token";
-
-
     public enum ViewType {
-
-        /**
-         * Consists of N number of icons. (N: launcher column count)
-         */
         TOP_HIT(0),
-
-        /**
-         * Consists of 1 icon and two subsidiary icons.
-         */
         HERO(1),
-
-        /**
-         * Main/sub/breadcrumb texts are rendered.
-         */
         DETAIL(2),
-
-        /**
-         * Consists of an icon, three detail strings.
-         */
         ROW(3),
-
-        /**
-         * Consists of an icon, three detail strings and a button.
-         */
         ROW_WITH_BUTTON(4),
-
-        /**
-         * Consists of a single slice view
-         */
         SLICE(5),
-
-        /**
-         * Similar to hero section.
-         */
         SHORTCUT(6),
-
-        /**
-         * Person icon and handling app icons are rendered.
-         */
-        PEOPLE(7),
-
-        /**
-         * N number of 1x1 ratio thumbnail is rendered.
-         * (current N = 3)
-         */
-        THUMBNAIL(8),
-
-        /**
-         * Fallback search icon and relevant text is rendered.
-         */
-        SUGGEST(9);
+        PEOPLE(7);
 
         private final int mId;
-
         ViewType(int id) {
             mId = id;
         }
@@ -105,15 +52,9 @@ public class SearchTarget implements Comparable<SearchTarget> {
         APP(3, "", ViewType.TOP_HIT),
         APP_HERO(4, "", ViewType.HERO),
         SHORTCUT(5, "Shortcuts", ViewType.SHORTCUT),
-        PEOPLE(6, "People", ViewType.PEOPLE),
-        SCREENSHOT(7, "Screenshots", ViewType.THUMBNAIL),
-        ACTION(8, "Actions", ViewType.SHORTCUT),
-        SUGGEST(9, "Fallback Search", ViewType.SUGGEST),
-        CHROME_TAB(10, "Chrome Tab", ViewType.SHORTCUT);
+        PEOPLE(6, "People", ViewType.PEOPLE);
 
         private final int mId;
-
-        /** Used to render section title. */
         private final String mTitle;
         private final ViewType mViewType;
 
@@ -140,21 +81,19 @@ public class SearchTarget implements Comparable<SearchTarget> {
     public List<ShortcutInfo> shortcuts;
     public Bundle bundle;
     public float score;
-    public String mSessionId;
-    public RemoteAction mRemoteAction;
 
     /**
      * Constructor to create the search target. Bundle is currently temporary to hold
      * search target primitives that cannot be expressed as java primitive objects
      * or AOSP native objects.
+     *
      */
     public SearchTarget(ItemType itemType, List<ShortcutInfo> shortcuts,
-            Bundle bundle, float score, String sessionId) {
+            Bundle bundle, float score) {
         this.type = itemType;
         this.shortcuts = shortcuts;
         this.bundle = bundle;
         this.score = score;
-        this.mSessionId = sessionId;
     }
 
     @Override
diff --git a/src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java b/src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java
index 5016abc1e9..ac4bc333c6 100644
--- a/src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java
+++ b/src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java
@@ -15,7 +15,6 @@
  */
 package com.android.systemui.plugins.shared;
 
-import android.app.RemoteAction;
 import android.content.pm.ShortcutInfo;
 import android.os.Bundle;
 
@@ -30,17 +29,12 @@ public class SearchTargetEvent {
 
     public SearchTarget.ItemType type;
     public ShortcutInfo shortcut;
-    public RemoteAction remoteAction;
     public int eventType;
     public Bundle bundle;
-    public int index;
-    public String sessionIdentifier;
+    public float score;
 
-    public SearchTargetEvent(SearchTarget.ItemType itemType, int eventType, int index,
-            String sessionId) {
+    public SearchTargetEvent(SearchTarget.ItemType itemType, int eventType) {
         this.type = itemType;
         this.eventType = eventType;
-        this.index = index;
-        this.sessionIdentifier = sessionId;
     }
 }
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java b/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java
index a4e53a1cc0..ec3f93ff1b 100644
--- a/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java
+++ b/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java
@@ -16,13 +16,13 @@
 package com.android.launcher3.uioverrides.states;
 
 import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
-import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_ALLAPPS;
 
 import android.content.Context;
 
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
+import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 
 /**
  * Definition for AllApps state
@@ -41,7 +41,7 @@ public class AllAppsState extends LauncherState {
     };
 
     public AllAppsState(int id) {
-        super(id, LAUNCHER_STATE_ALLAPPS, STATE_FLAGS);
+        super(id, ContainerType.ALLAPPS, STATE_FLAGS);
     }
 
     @Override
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java b/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java
index da5a94f6fd..d102bccaad 100644
--- a/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -15,11 +15,10 @@
  */
 package com.android.launcher3.uioverrides.states;
 
-import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW;
-
 import android.content.Context;
 
 import com.android.launcher3.LauncherState;
+import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 
 /**
  * Definition for overview state
@@ -27,7 +26,7 @@ import com.android.launcher3.LauncherState;
 public class OverviewState extends LauncherState {
 
     public OverviewState(int id) {
-        super(id, LAUNCHER_STATE_OVERVIEW, FLAG_DISABLE_RESTORE);
+        super(id, ContainerType.WORKSPACE, FLAG_DISABLE_RESTORE);
     }
 
     @Override
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index e118481570..5e42d9b988 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -279,8 +279,6 @@ public abstract class AbstractLauncherUiTest {
         if (userManager != null) {
             for (UserHandle userHandle : userManager.getUserProfiles()) {
                 if (!userHandle.isSystem()) {
-                    Log.d(TestProtocol.WORK_PROFILE_REMOVED,
-                            "removing user " + userHandle.getIdentifier());
                     mDevice.executeShellCommand("pm remove-user " + userHandle.getIdentifier());
                 }
             }
diff --git a/tests/src/com/android/launcher3/ui/WorkTabTest.java b/tests/src/com/android/launcher3/ui/WorkTabTest.java
index 8d594de926..f5f93c429f 100644
--- a/tests/src/com/android/launcher3/ui/WorkTabTest.java
+++ b/tests/src/com/android/launcher3/ui/WorkTabTest.java
@@ -55,9 +55,7 @@ public class WorkTabTest extends AbstractLauncherUiTest {
     private static final int WORK_PAGE = AllAppsContainerView.AdapterHolder.WORK;
 
     @Before
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
+    public void createWorkProfile() throws Exception {
         String output =
                 mDevice.executeShellCommand(
                         "pm create-user --profileOf 0 --managed TestProfile");
@@ -138,8 +136,7 @@ public class WorkTabTest extends AbstractLauncherUiTest {
         });
 
         executeOnLauncher(launcher -> Log.d(TestProtocol.WORK_PROFILE_REMOVED,
-                "work profile status (" + mProfileUserId + ") :"
-                        + launcher.getAppsView().isWorkTabVisible()));
+                "Work profile status: " + launcher.getAppsView().isPersonalTabVisible()));
 
         // verify work edu is seen next
         waitForLauncherCondition("Launcher did not show the next edu screen", l ->
-- 
GitLab


From 0c943966d373d8ae7eef2b08e88ac44bf57d8a8d Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 5 Oct 2020 10:23:27 -0700
Subject: [PATCH 0220/1664] Add null check for input receiver before updating
 batching

- A change in the system (ie. sysui crash or nav mode change) could
  cause the input monitor to be disposed before the swipe animation
  settles

Bug: 170121063
Test: Kill sysui while swiping up

Change-Id: I1417b109fecdb98fae6197c7038dbe9307470853
---
 .../src/com/android/quickstep/TouchInteractionService.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 7bf8fbafac..d3c4f55e9a 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -732,8 +732,11 @@ public class TouchInteractionService extends Service implements PluginListener<O
     private void reset() {
         mConsumer = mUncheckedConsumer = mResetGestureInputConsumer;
         mGestureState = DEFAULT_STATE;
-        // By default, use batching of the input events
-        mInputEventReceiver.setBatchingEnabled(true);
+        // By default, use batching of the input events, but check receiver before using in the rare
+        // case that the monitor was disposed before the swipe settled
+        if (mInputEventReceiver != null) {
+            mInputEventReceiver.setBatchingEnabled(true);
+        }
     }
 
     private void preloadOverview(boolean fromInit) {
-- 
GitLab


From 4c14f4b9eda8332347c81e0cf51c5de4dbc06399 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Mon, 5 Oct 2020 10:50:00 -0700
Subject: [PATCH 0221/1664] Avoid double search item highlight

Change-Id: Ic2e28b18f6d5e3ed32cd5646bc3bb4789c378e57
---
 .../android/launcher3/appprediction/PredictionRowView.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
index d3c4c3d62d..1855267f78 100644
--- a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
+++ b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
@@ -152,6 +152,10 @@ public class PredictionRowView extends LinearLayout implements
 
     private void updateVisibility() {
         setVisibility(mPredictionsEnabled ? VISIBLE : GONE);
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && mLauncher.getAppsView() != null
+                && mLauncher.getAppsView().getActiveRecyclerView() != null) {
+            mLauncher.getAppsView().invalidate();
+        }
     }
 
     @Override
-- 
GitLab


From b6aff1f56d55a36256446ec3970d92e9da39b98c Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Mon, 5 Oct 2020 16:08:35 -0700
Subject: [PATCH 0222/1664] Fix NPE inside RecentsOrientedState

Bug: 169963211
Change-Id: I86dd337dc1b862f3fa99b91b47fa250076233f96
---
 .../src/com/android/quickstep/util/RecentsOrientedState.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
index 5f0ef83382..bb84380edd 100644
--- a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
+++ b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
@@ -539,6 +539,7 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
      * @return "MyObject@1234"
      */
     private static String extractObjectNameAndAddress(String stringToExtract) {
-        return stringToExtract.substring(stringToExtract.lastIndexOf(DELIMITER_DOT));
+        int index = stringToExtract.lastIndexOf(DELIMITER_DOT);
+        return index >= 0 ? stringToExtract.substring(index) : "";
     }
 }
-- 
GitLab


From 3cf264f498e37c482fa4c559bf48ffa791279585 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Tue, 22 Sep 2020 12:58:38 -0700
Subject: [PATCH 0223/1664] Prevent hotseat updates if it is visible to the
 user.

Test: manual

Fixes: 168653219

Changing app icons under the user's finger could be disruptive. Added a checks for whether the hotseatand all apps predictions are visible and callbacks to update them when they become hidden.

Change-Id: Ib9e6e904e9f662ecfaeea6a2fe21d1d81ba39b96
---
 .../appprediction/PredictionRowView.java      | 21 +++++++++++++++++++
 .../HotseatPredictionController.java          | 20 ++++++++++++++++++
 src/com/android/launcher3/Hotseat.java        | 19 +++++++++++++++++
 3 files changed, 60 insertions(+)

diff --git a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
index 5b066c6be6..e7880fd739 100644
--- a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
+++ b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
@@ -108,6 +108,8 @@ public class PredictionRowView extends LinearLayout implements
 
     AllAppsSectionDecorator.SectionDecorationHandler mDecorationHandler;
 
+    @Nullable private List<ItemInfo> mPendingPredictedItems;
+
     public PredictionRowView(@NonNull Context context) {
         this(context, null);
     }
@@ -203,6 +205,16 @@ public class PredictionRowView extends LinearLayout implements
      * we can optimize by swapping them in place.
      */
     public void setPredictedApps(List<ItemInfo> items) {
+        if (isShown() && getWindowVisibility() == View.VISIBLE) {
+            mPendingPredictedItems = items;
+            return;
+        }
+
+        applyPredictedApps(items);
+    }
+
+    private void applyPredictedApps(List<ItemInfo> items) {
+        mPendingPredictedItems = null;
         mPredictedApps.clear();
         items.stream()
                 .filter(itemInfo -> itemInfo instanceof WorkspaceItemInfo)
@@ -341,4 +353,13 @@ public class PredictionRowView extends LinearLayout implements
     public View getFocusedChild() {
         return getChildAt(0);
     }
+
+    @Override
+    public void onVisibilityAggregated(boolean isVisible) {
+        super.onVisibilityAggregated(isVisible);
+
+        if (mPendingPredictedItems != null && !isVisible) {
+            applyPredictedApps(mPendingPredictedItems);
+        }
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
index 380735044d..76bab596ac 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
@@ -251,6 +251,26 @@ public class HotseatPredictionController implements DragController.DragListener,
      * Sets or updates the predicted items
      */
     public void setPredictedItems(FixedContainerItems items) {
+        if (mHotseat.isShown() && mHotseat.getWindowVisibility() == View.VISIBLE) {
+            mHotseat.setOnVisibilityAggregatedCallback((isVisible) -> {
+                if (isVisible) {
+                    return;
+                }
+                mHotseat.setOnVisibilityAggregatedCallback(null);
+
+                applyPredictedItems(items);
+            });
+        } else {
+            mHotseat.setOnVisibilityAggregatedCallback(null);
+
+            applyPredictedItems(items);
+        }
+    }
+
+    /**
+     * Sets or updates the predicted items only once the hotseat becomes hidden to the user
+     */
+    private void applyPredictedItems(FixedContainerItems items) {
         mPredictedItems = items.items;
         if (mPredictedItems.isEmpty()) {
             HotseatRestoreHelper.restoreBackup(mLauncher);
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index 6547b53940..e4bdb395e1 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -25,6 +25,10 @@ import android.view.ViewDebug;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
+import androidx.annotation.Nullable;
+
+import java.util.function.Consumer;
+
 /**
  * View class that represents the bottom row of the home screen.
  */
@@ -34,6 +38,7 @@ public class Hotseat extends CellLayout implements Insettable {
     private boolean mHasVerticalHotseat;
     private Workspace mWorkspace;
     private boolean mSendTouchToWorkspace;
+    @Nullable private Consumer<Boolean> mOnVisibilityAggregatedCallback;
 
     public Hotseat(Context context) {
         this(context, null);
@@ -129,4 +134,18 @@ public class Hotseat extends CellLayout implements Insettable {
         }
         return event.getY() > getCellHeight();
     }
+
+    @Override
+    public void onVisibilityAggregated(boolean isVisible) {
+        super.onVisibilityAggregated(isVisible);
+
+        if (mOnVisibilityAggregatedCallback != null) {
+            mOnVisibilityAggregatedCallback.accept(isVisible);
+        }
+    }
+
+    /** Sets a callback to be called onVisibilityAggregated */
+    public void setOnVisibilityAggregatedCallback(@Nullable Consumer<Boolean> callback) {
+        mOnVisibilityAggregatedCallback = callback;
+    }
 }
-- 
GitLab


From 8ed9707cf3a4300cb61942f08f0752c80eed086b Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Mon, 14 Sep 2020 23:25:37 -0700
Subject: [PATCH 0224/1664] [Live Tile] Support launching another task (other
 than the current running task) in Overview

- Get rid of the defer cancelation logic
- Render animation on the task view of the task being launched upon task view appeared callback
- Finish the recents animation upon the end of the recents window animation

Fixes: 164926736
Test: manual
Change-Id: Ibffb6a9c74c235efc8615a22b0306551532c7b61
---
 .../LauncherAppTransitionManagerImpl.java     |  61 +---------
 .../android/quickstep/AbsSwipeUpHandler.java  | 114 ++++++++++++------
 .../quickstep/RecentsAnimationController.java |  18 ---
 .../quickstep/TaskAnimationManager.java       |  38 +++---
 .../com/android/quickstep/TaskViewUtils.java  |  70 ++++++++++-
 5 files changed, 174 insertions(+), 127 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
index 38adf39444..ae4bd96997 100644
--- a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
@@ -16,14 +16,10 @@
 
 package com.android.launcher3;
 
-import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.anim.Interpolators.AGGRESSIVE_EASE;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
-import static com.android.quickstep.TaskViewUtils.createRecentsWindowAnimator;
 import static com.android.quickstep.TaskViewUtils.findTaskViewToLaunch;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.content.Context;
@@ -32,11 +28,8 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.android.launcher3.anim.AnimatorPlaybackController;
-import com.android.launcher3.anim.Interpolators;
-import com.android.launcher3.anim.PendingAnimation;
+import com.android.quickstep.TaskViewUtils;
 import com.android.quickstep.views.RecentsView;
-import com.android.quickstep.views.TaskView;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
 /**
@@ -53,60 +46,16 @@ public final class LauncherAppTransitionManagerImpl extends QuickstepAppTransiti
     protected boolean isLaunchingFromRecents(@NonNull View v,
             @Nullable RemoteAnimationTargetCompat[] targets) {
         return mLauncher.getStateManager().getState().overviewUi
-                && findTaskViewToLaunch(mLauncher, v, targets) != null;
+                && findTaskViewToLaunch(mLauncher.getOverviewPanel(), v, targets) != null;
     }
 
     @Override
     protected void composeRecentsLaunchAnimator(@NonNull AnimatorSet anim, @NonNull View v,
             @NonNull RemoteAnimationTargetCompat[] appTargets,
             @NonNull RemoteAnimationTargetCompat[] wallpaperTargets, boolean launcherClosing) {
-        RecentsView recentsView = mLauncher.getOverviewPanel();
-        boolean skipLauncherChanges = !launcherClosing;
-
-        TaskView taskView = findTaskViewToLaunch(mLauncher, v, appTargets);
-        PendingAnimation pa = new PendingAnimation(RECENTS_LAUNCH_DURATION);
-        createRecentsWindowAnimator(taskView, skipLauncherChanges, appTargets, wallpaperTargets,
-                mLauncher.getDepthController(), pa);
-        anim.play(pa.buildAnim());
-
-        Animator childStateAnimation = null;
-        // Found a visible recents task that matches the opening app, lets launch the app from there
-        Animator launcherAnim;
-        final AnimatorListenerAdapter windowAnimEndListener;
-        if (launcherClosing) {
-            launcherAnim = recentsView.createAdjacentPageAnimForTaskLaunch(taskView);
-            launcherAnim.setInterpolator(Interpolators.TOUCH_RESPONSE_INTERPOLATOR);
-            launcherAnim.setDuration(RECENTS_LAUNCH_DURATION);
-
-            // Make sure recents gets fixed up by resetting task alphas and scales, etc.
-            windowAnimEndListener = new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationEnd(Animator animation) {
-                    mLauncher.getStateManager().moveToRestState();
-                    mLauncher.getStateManager().reapplyState();
-                }
-            };
-        } else {
-            AnimatorPlaybackController controller =
-                    mLauncher.getStateManager().createAnimationToNewWorkspace(NORMAL,
-                            RECENTS_LAUNCH_DURATION);
-            controller.dispatchOnStart();
-            childStateAnimation = controller.getTarget();
-            launcherAnim = controller.getAnimationPlayer().setDuration(RECENTS_LAUNCH_DURATION);
-            windowAnimEndListener = new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationEnd(Animator animation) {
-                    mLauncher.getStateManager().goToState(NORMAL, false);
-                }
-            };
-        }
-        anim.play(launcherAnim);
-
-        // Set the current animation first, before adding windowAnimEndListener. Setting current
-        // animation adds some listeners which need to be called before windowAnimEndListener
-        // (the ordering of listeners matter in this case).
-        mLauncher.getStateManager().setCurrentAnimation(anim, childStateAnimation);
-        anim.addListener(windowAnimEndListener);
+        TaskViewUtils.composeRecentsLaunchAnimator(anim, v, appTargets, wallpaperTargets,
+                launcherClosing, mLauncher.getStateManager(), mLauncher.getOverviewPanel(),
+                mLauncher.getDepthController());
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 5e05a7dbe1..941a10b6de 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -41,10 +41,14 @@ import static com.android.quickstep.GestureState.STATE_END_TARGET_ANIMATION_FINI
 import static com.android.quickstep.GestureState.STATE_END_TARGET_SET;
 import static com.android.quickstep.GestureState.STATE_RECENTS_SCROLLING_FINISHED;
 import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;
+import static com.android.quickstep.TaskUtils.taskIsATargetWithMode;
 import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD;
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME;
+import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_CLOSING;
 
 import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
 import android.animation.ValueAnimator;
 import android.annotation.TargetApi;
 import android.app.ActivityManager;
@@ -104,6 +108,7 @@ import com.android.systemui.shared.system.TaskInfoCompat;
 import com.android.systemui.shared.system.TaskStackChangeListener;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.function.Consumer;
 
 /**
@@ -1370,17 +1375,64 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
     private void setupLauncherUiAfterSwipeUpToRecentsAnimation() {
         endLauncherTransitionController();
         mActivityInterface.onSwipeUpToRecentsComplete();
-        if (mRecentsAnimationController != null) {
-            mRecentsAnimationController.setDeferCancelUntilNextTransition(true /* defer */,
-                    true /* screenshot */);
-        }
         mRecentsView.onSwipeUpAnimationSuccess();
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+            mTaskAnimationManager.setLaunchOtherTaskInLiveTileModeHandler(
+                    this::launchOtherTaskInLiveTileMode);
+        }
 
         SystemUiProxy.INSTANCE.get(mContext).onOverviewShown(false, TAG);
         doLogGesture(RECENTS, mRecentsView.getCurrentPageTaskView());
         reset();
     }
 
+    private void launchOtherTaskInLiveTileMode(RemoteAnimationTargetCompat appearedTaskTarget) {
+        TaskView taskView = mRecentsView.getTaskView(appearedTaskTarget.taskId);
+        if (taskView == null) {
+            return;
+        }
+
+        RemoteAnimationTargetCompat[] apps = Arrays.copyOf(
+                mRecentsAnimationTargets.apps,
+                mRecentsAnimationTargets.apps.length + 1);
+        apps[apps.length - 1] = appearedTaskTarget;
+        boolean launcherClosing =
+                taskIsATargetWithMode(apps, mActivity.getTaskId(), MODE_CLOSING);
+
+        AnimatorSet anim = new AnimatorSet();
+        TaskViewUtils.composeRecentsLaunchAnimator(
+                anim, taskView, apps,
+                mRecentsAnimationTargets.wallpapers, launcherClosing,
+                mActivity.getStateManager(), mRecentsView,
+                mActivityInterface.getDepthController());
+        anim.addListener(new AnimatorListenerAdapter(){
+
+            @Override
+            public void onAnimationEnd(Animator animator) {
+                cleanUp(false);
+            }
+
+            @Override
+            public void onAnimationCancel(Animator animator) {
+                cleanUp(true);
+            }
+
+            private void cleanUp(boolean canceled) {
+                if (mRecentsAnimationController != null) {
+                    mRecentsAnimationController.finish(false /* toRecents */,
+                            null /* onFinishComplete */);
+                    if (canceled) {
+                        mRecentsAnimationController = null;
+                    } else {
+                        mActivityInterface.onLaunchTaskSuccess();
+                    }
+                    ActiveGestureLog.INSTANCE.addLog("finishRecentsAnimation", false);
+                }
+            }
+        });
+        anim.start();
+    }
+
     private void addLiveTileOverlay() {
         if (LiveTileOverlay.INSTANCE.attach(mActivity.getRootView().getOverlay())) {
             mRecentsView.setLiveTileOverlayAttached(true);
@@ -1438,39 +1490,33 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
 
     protected void startNewTask(Consumer<Boolean> resultCallback) {
         // Launch the task user scrolled to (mRecentsView.getNextPage()).
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
-            // We finish recents animation inside launchTask() when live tile is enabled.
-            mRecentsView.getNextPageTaskView().launchTask(false /* animate */,
-                    true /* freezeTaskList */);
-        } else {
-            if (!mCanceled) {
-                TaskView nextTask = mRecentsView.getNextPageTaskView();
-                if (nextTask != null) {
-                    int taskId = nextTask.getTask().key.id;
-                    mGestureState.updateLastStartedTaskId(taskId);
-                    boolean hasTaskPreviouslyAppeared = mGestureState.getPreviouslyAppearedTaskIds()
-                            .contains(taskId);
-                    nextTask.launchTask(false /* animate */, true /* freezeTaskList */,
-                            success -> {
-                                resultCallback.accept(success);
-                                if (success) {
-                                    if (hasTaskPreviouslyAppeared) {
-                                        onRestartPreviouslyAppearedTask();
-                                    }
-                                } else {
-                                    mActivityInterface.onLaunchTaskFailed();
-                                    nextTask.notifyTaskLaunchFailed(TAG);
-                                    mRecentsAnimationController.finish(true /* toRecents */, null);
+        if (!mCanceled) {
+            TaskView nextTask = mRecentsView.getNextPageTaskView();
+            if (nextTask != null) {
+                int taskId = nextTask.getTask().key.id;
+                mGestureState.updateLastStartedTaskId(taskId);
+                boolean hasTaskPreviouslyAppeared = mGestureState.getPreviouslyAppearedTaskIds()
+                        .contains(taskId);
+                nextTask.launchTask(false /* animate */, true /* freezeTaskList */,
+                        success -> {
+                            resultCallback.accept(success);
+                            if (success) {
+                                if (hasTaskPreviouslyAppeared) {
+                                    onRestartPreviouslyAppearedTask();
                                 }
-                            }, MAIN_EXECUTOR.getHandler());
-                } else {
-                    mActivityInterface.onLaunchTaskFailed();
-                    Toast.makeText(mContext, R.string.activity_not_available, LENGTH_SHORT).show();
-                    mRecentsAnimationController.finish(true /* toRecents */, null);
-                }
+                            } else {
+                                mActivityInterface.onLaunchTaskFailed();
+                                nextTask.notifyTaskLaunchFailed(TAG);
+                                mRecentsAnimationController.finish(true /* toRecents */, null);
+                            }
+                        }, MAIN_EXECUTOR.getHandler());
+            } else {
+                mActivityInterface.onLaunchTaskFailed();
+                Toast.makeText(mContext, R.string.activity_not_available, LENGTH_SHORT).show();
+                mRecentsAnimationController.finish(true /* toRecents */, null);
             }
-            mCanceled = false;
         }
+        mCanceled = false;
     }
 
     /**
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationController.java b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
index 51f5e5d785..21e6689072 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationController.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
@@ -88,24 +88,6 @@ public class RecentsAnimationController {
         }
     }
 
-    /**
-     * Notifies the controller that we want to defer cancel until the next app transition starts.
-     * If {@param screenshot} is set, then we will receive a screenshot on the next
-     * {@link RecentsAnimationCallbacks#onAnimationCanceled(ThumbnailData)} and we must also call
-     * {@link #cleanupScreenshot()} when that screenshot is no longer used.
-     */
-    public void setDeferCancelUntilNextTransition(boolean defer, boolean screenshot) {
-        mController.setDeferCancelUntilNextTransition(defer, screenshot);
-    }
-
-    /**
-     * Cleans up the screenshot previously returned from
-     * {@link RecentsAnimationCallbacks#onAnimationCanceled(ThumbnailData)}.
-     */
-    public void cleanupScreenshot() {
-        UI_HELPER_EXECUTOR.execute(() -> mController.cleanupScreenshot());
-    }
-
     /**
      * Remove task remote animation target from
      * {@link RecentsAnimationCallbacks#onTaskAppeared(RemoteAnimationTargetCompat)}}.
diff --git a/quickstep/src/com/android/quickstep/TaskAnimationManager.java b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
index cad51f4cc6..f38c1ea886 100644
--- a/quickstep/src/com/android/quickstep/TaskAnimationManager.java
+++ b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
@@ -17,6 +17,7 @@ package com.android.quickstep;
 
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+import static com.android.quickstep.GestureState.GestureEndTarget.RECENTS;
 import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_INITIALIZED;
 import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_STARTED;
 
@@ -31,6 +32,8 @@ import com.android.systemui.shared.recents.model.ThumbnailData;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
+import java.util.function.Consumer;
+
 public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAnimationListener {
 
     private RecentsAnimationController mController;
@@ -39,6 +42,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
     // Temporary until we can hook into gesture state events
     private GestureState mLastGestureState;
     private RemoteAnimationTargetCompat mLastAppearedTaskTarget;
+    private Consumer<RemoteAnimationTargetCompat> mLaunchOtherTaskHandler;
 
     /**
      * Preloads the recents animation.
@@ -88,22 +92,21 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
 
             @Override
             public void onRecentsAnimationCanceled(ThumbnailData thumbnailData) {
-                if (thumbnailData != null) {
-                    // If a screenshot is provided, switch to the screenshot before cleaning up
-                    activityInterface.switchRunningTaskViewToScreenshot(thumbnailData,
-                            () -> cleanUpRecentsAnimation(thumbnailData));
-                } else {
-                    cleanUpRecentsAnimation(null /* canceledThumbnail */);
-                }
+                cleanUpRecentsAnimation();
             }
 
             @Override
             public void onRecentsAnimationFinished(RecentsAnimationController controller) {
-                cleanUpRecentsAnimation(null /* canceledThumbnail */);
+                cleanUpRecentsAnimation();
             }
 
             @Override
             public void onTaskAppeared(RemoteAnimationTargetCompat appearedTaskTarget) {
+                if (mLaunchOtherTaskHandler != null
+                        && mLastGestureState.getEndTarget() == RECENTS) {
+                    mLaunchOtherTaskHandler.accept(appearedTaskTarget);
+                    return;
+                }
                 if (mController != null) {
                     if (mLastAppearedTaskTarget == null
                             || appearedTaskTarget.taskId != mLastAppearedTaskTarget.taskId) {
@@ -137,6 +140,15 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
         return mCallbacks;
     }
 
+    /**
+     * The passed-in handler is used to render side task launch animation in recents in live tile
+     * mode.
+     */
+    public void setLaunchOtherTaskInLiveTileModeHandler(
+            Consumer<RemoteAnimationTargetCompat> handler) {
+        mLaunchOtherTaskHandler = handler;
+    }
+
     /**
      * Finishes the running recents animation.
      */
@@ -146,7 +158,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
             Utilities.postAsyncCallback(MAIN_EXECUTOR.getHandler(), toHome
                     ? mController::finishAnimationToHome
                     : mController::finishAnimationToApp);
-            cleanUpRecentsAnimation(null /* canceledThumbnail */);
+            cleanUpRecentsAnimation();
         }
     }
 
@@ -173,12 +185,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
     /**
      * Cleans up the recents animation entirely.
      */
-    private void cleanUpRecentsAnimation(ThumbnailData canceledThumbnail) {
-        // Clean up the screenshot if necessary
-        if (mController != null && canceledThumbnail != null) {
-            mController.cleanupScreenshot();
-        }
-
+    private void cleanUpRecentsAnimation() {
         // Release all the target leashes
         if (mTargets != null) {
             mTargets.release();
@@ -194,6 +201,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
         mTargets = null;
         mLastGestureState = null;
         mLastAppearedTaskTarget = null;
+        mLaunchOtherTaskHandler = null;
     }
 
     public void dump() {
diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java
index a5af1814d9..7299c3899e 100644
--- a/quickstep/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java
@@ -17,15 +17,20 @@ package com.android.quickstep;
 
 import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA;
 import static com.android.launcher3.LauncherState.BACKGROUND_APP;
+import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.QuickstepAppTransitionManagerImpl.RECENTS_LAUNCH_DURATION;
 import static com.android.launcher3.Utilities.getDescendantCoordRelativeToAncestor;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.Interpolators.TOUCH_RESPONSE_INTERPOLATOR;
 import static com.android.launcher3.anim.Interpolators.clampToProgress;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.statehandlers.DepthController.DEPTH;
+import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_CLOSING;
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_OPENING;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
 import android.annotation.TargetApi;
 import android.content.ComponentName;
 import android.content.Context;
@@ -35,12 +40,16 @@ import android.graphics.RectF;
 import android.os.Build;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+
 import com.android.launcher3.BaseActivity;
-import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.anim.AnimatorPlaybackController;
+import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.statehandlers.DepthController;
+import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.util.DisplayController;
 import com.android.quickstep.util.SurfaceTransactionApplier;
 import com.android.quickstep.util.TaskViewSimulator;
@@ -67,8 +76,7 @@ public final class TaskViewUtils {
      * opening remote target (which we don't get until onAnimationStart) will resolve to a TaskView.
      */
     public static TaskView findTaskViewToLaunch(
-            BaseDraggingActivity activity, View v, RemoteAnimationTargetCompat[] targets) {
-        RecentsView recentsView = activity.getOverviewPanel();
+            RecentsView recentsView, View v, RemoteAnimationTargetCompat[] targets) {
         if (v instanceof TaskView) {
             TaskView taskView = (TaskView) v;
             return recentsView.isTaskViewVisible(taskView) ? taskView : null;
@@ -130,7 +138,8 @@ public final class TaskViewUtils {
 
         SurfaceTransactionApplier applier = new SurfaceTransactionApplier(v);
         final RemoteAnimationTargets targets =
-                new RemoteAnimationTargets(appTargets, wallpaperTargets, MODE_OPENING);
+                new RemoteAnimationTargets(appTargets, wallpaperTargets,
+                        ENABLE_QUICKSTEP_LIVE_TILE.get() ? MODE_CLOSING : MODE_OPENING);
         targets.addReleaseCheck(applier);
 
         TransformParams params = new TransformParams()
@@ -235,4 +244,57 @@ public final class TaskViewUtils {
                     TOUCH_RESPONSE_INTERPOLATOR);
         }
     }
+
+    public static void composeRecentsLaunchAnimator(@NonNull AnimatorSet anim, @NonNull View v,
+            @NonNull RemoteAnimationTargetCompat[] appTargets,
+            @NonNull RemoteAnimationTargetCompat[] wallpaperTargets, boolean launcherClosing,
+            @NonNull StateManager stateManager, @NonNull RecentsView recentsView,
+            @NonNull DepthController depthController) {
+        boolean skipLauncherChanges = !launcherClosing;
+
+        TaskView taskView = findTaskViewToLaunch(recentsView, v, appTargets);
+        PendingAnimation pa = new PendingAnimation(RECENTS_LAUNCH_DURATION);
+        createRecentsWindowAnimator(taskView, skipLauncherChanges, appTargets, wallpaperTargets,
+                depthController, pa);
+        anim.play(pa.buildAnim());
+
+        Animator childStateAnimation = null;
+        // Found a visible recents task that matches the opening app, lets launch the app from there
+        Animator launcherAnim;
+        final AnimatorListenerAdapter windowAnimEndListener;
+        if (launcherClosing) {
+            launcherAnim = recentsView.createAdjacentPageAnimForTaskLaunch(taskView);
+            launcherAnim.setInterpolator(Interpolators.TOUCH_RESPONSE_INTERPOLATOR);
+            launcherAnim.setDuration(RECENTS_LAUNCH_DURATION);
+
+            // Make sure recents gets fixed up by resetting task alphas and scales, etc.
+            windowAnimEndListener = new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationEnd(Animator animation) {
+                    stateManager.moveToRestState();
+                    stateManager.reapplyState();
+                }
+            };
+        } else {
+            AnimatorPlaybackController controller =
+                    stateManager.createAnimationToNewWorkspace(NORMAL,
+                            RECENTS_LAUNCH_DURATION);
+            controller.dispatchOnStart();
+            childStateAnimation = controller.getTarget();
+            launcherAnim = controller.getAnimationPlayer().setDuration(RECENTS_LAUNCH_DURATION);
+            windowAnimEndListener = new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationEnd(Animator animation) {
+                    stateManager.goToState(NORMAL, false);
+                }
+            };
+        }
+        anim.play(launcherAnim);
+
+        // Set the current animation first, before adding windowAnimEndListener. Setting current
+        // animation adds some listeners which need to be called before windowAnimEndListener
+        // (the ordering of listeners matter in this case).
+        stateManager.setCurrentAnimation(anim, childStateAnimation);
+        anim.addListener(windowAnimEndListener);
+    }
 }
-- 
GitLab


From be17bdcd221f501c45876abe2249c1007858d0c0 Mon Sep 17 00:00:00 2001
From: jayaprakashs <jayaprakashs@google.com>
Date: Mon, 5 Oct 2020 09:01:52 -0700
Subject: [PATCH 0225/1664] [Search] Add logging to People and badding as to
 icons.

Change-Id: I65948a2faca436216a94aa46139d425b8eade827
---
 .../views/SearchResultPeopleView.java         | 77 ++++++++++++++-----
 1 file changed, 59 insertions(+), 18 deletions(-)

diff --git a/src/com/android/launcher3/views/SearchResultPeopleView.java b/src/com/android/launcher3/views/SearchResultPeopleView.java
index 0c9a22f672..f20b08016f 100644
--- a/src/com/android/launcher3/views/SearchResultPeopleView.java
+++ b/src/com/android/launcher3/views/SearchResultPeopleView.java
@@ -23,9 +23,12 @@ import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
+import android.graphics.Canvas;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.os.Bundle;
+import android.os.Process;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageButton;
@@ -41,7 +44,8 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsGridAdapter;
 import com.android.launcher3.allapps.search.AllAppsSearchBarController;
-import com.android.launcher3.util.Themes;
+import com.android.launcher3.icons.BitmapInfo;
+import com.android.launcher3.icons.LauncherIcons;
 import com.android.systemui.plugins.AllAppsSearchPlugin;
 import com.android.systemui.plugins.shared.SearchTarget;
 import com.android.systemui.plugins.shared.SearchTargetEvent;
@@ -105,15 +109,14 @@ public class SearchResultPeopleView extends LinearLayout implements
         mPlugin = adapterItemWithPayload.getPlugin();
         mTitleView.setText(payload.getString("title"));
         mIntent = payload.getParcelable("intent");
-        Bitmap icon = payload.getParcelable("icon");
-        if (icon != null) {
-            RoundedBitmapDrawable d = RoundedBitmapDrawableFactory.create(getResources(), icon);
-            float radius = Themes.getDialogCornerRadius(getContext());
-            d.setCornerRadius(radius);
-            d.setBounds(0, 0, mIconSize, mIconSize);
-            BitmapDrawable bitmapDrawable = new BitmapDrawable(getResources(),
-                    Bitmap.createScaledBitmap(icon, mIconSize, mIconSize, false));
-            mIconView.setBackground(d);
+        Bitmap contactIcon = payload.getParcelable("icon");
+        try (LauncherIcons li = LauncherIcons.obtain(getContext())) {
+            BitmapInfo badgeInfo = li.createBadgedIconBitmap(
+                    getAppIcon(mIntent.getPackage()), Process.myUserHandle(),
+                    Build.VERSION.SDK_INT);
+            setIcon(li.badgeBitmap(roundBitmap(contactIcon), badgeInfo).icon, false);
+        } catch (Exception e) {
+            setIcon(contactIcon, true);
         }
 
         ArrayList<Bundle> providers = payload.getParcelableArrayList("providers");
@@ -123,17 +126,14 @@ public class SearchResultPeopleView extends LinearLayout implements
                 Bundle provider = providers.get(i);
                 Intent intent = provider.getParcelable("intent");
                 setupProviderButton(button, provider, intent, adapterItemWithPayload);
-                String pkg = provider.getString("package_name");
                 UI_HELPER_EXECUTOR.post(() -> {
-                    try {
-                        ApplicationInfo applicationInfo = mPackageManager.getApplicationInfo(
-                                pkg, 0);
-                        Drawable appIcon = applicationInfo.loadIcon(mPackageManager);
+                    String pkg = provider.getString("package_name");
+                    Drawable appIcon = getAppIcon(pkg);
+                    if (appIcon != null) {
                         MAIN_EXECUTOR.post(() -> button.setImageDrawable(appIcon));
-                    } catch (PackageManager.NameNotFoundException ignored) {
                     }
-
                 });
+                button.setVisibility(VISIBLE);
             } else {
                 button.setVisibility(GONE);
             }
@@ -141,6 +141,45 @@ public class SearchResultPeopleView extends LinearLayout implements
         adapterItemWithPayload.setSelectionHandler(this::handleSelection);
     }
 
+    /**
+     *  Normalizes the bitmap to look like rounded App Icon
+     *  TODO(b/170234747) to support styling, generate adaptive icon drawable and generate
+     *  bitmap from it.
+     */
+    private Bitmap roundBitmap(Bitmap icon) {
+        final RoundedBitmapDrawable d = RoundedBitmapDrawableFactory.create(getResources(), icon);
+        d.setCornerRadius(R.attr.folderIconRadius);
+        d.setBounds(0, 0, mIconSize, mIconSize);
+        final Bitmap bitmap = Bitmap.createBitmap(d.getBounds().width(), d.getBounds().height(),
+                Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        d.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+        d.draw(canvas);
+        return bitmap;
+    }
+
+    private void setIcon(Bitmap icon, Boolean round) {
+        if (round) {
+            RoundedBitmapDrawable d = RoundedBitmapDrawableFactory.create(getResources(), icon);
+            d.setCornerRadius(R.attr.folderIconRadius);
+            d.setBounds(0, 0, mIconSize, mIconSize);
+            mIconView.setBackground(d);
+        } else {
+            mIconView.setBackground(new BitmapDrawable(getResources(), icon));
+        }
+    }
+
+
+    private Drawable getAppIcon(String pkg) {
+        try {
+            ApplicationInfo applicationInfo = mPackageManager.getApplicationInfo(
+                    pkg, 0);
+            return applicationInfo.loadIcon(mPackageManager);
+        } catch (PackageManager.NameNotFoundException ignored) {
+            return null;
+        }
+    }
+
     @Override
     public Object[] getTargetInfo() {
         return mTargetInfo;
@@ -155,7 +194,8 @@ public class SearchResultPeopleView extends LinearLayout implements
                     SearchTarget.ItemType.PEOPLE,
                     SearchTargetEvent.CHILD_SELECT);
             searchTargetEvent.bundle = new Bundle();
-            searchTargetEvent.bundle.putParcelable("intent", mIntent);
+            searchTargetEvent.bundle.putParcelable("intent", intent);
+            searchTargetEvent.bundle.putString("title", mTitleView.getText().toString());
             searchTargetEvent.bundle.putBundle("provider", provider);
             if (mPlugin != null) {
                 mPlugin.notifySearchTargetEvent(searchTargetEvent);
@@ -172,6 +212,7 @@ public class SearchResultPeopleView extends LinearLayout implements
                     eventType);
             searchTargetEvent.bundle = new Bundle();
             searchTargetEvent.bundle.putParcelable("intent", mIntent);
+            searchTargetEvent.bundle.putString("title", mTitleView.getText().toString());
             if (mPlugin != null) {
                 mPlugin.notifySearchTargetEvent(searchTargetEvent);
             }
-- 
GitLab


From 565ed4ff69b534812818a2b9aa8789a1aea210eb Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Wed, 30 Sep 2020 10:42:07 -0700
Subject: [PATCH 0226/1664] Update Search UI

[preview attached to bug]

Bug: 169438169
Test: Manual
Change-Id: I085f3dd38ac373c1afab82a637ec08715a6e0cc5
---
 res/drawable/ic_allapps_search.xml                          | 2 +-
 res/layout/all_apps.xml                                     | 6 ++----
 res/values/strings.xml                                      | 2 +-
 .../android/launcher3/allapps/AllAppsSectionDecorator.java  | 4 ++--
 src/com/android/launcher3/views/ScrimView.java              | 2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/res/drawable/ic_allapps_search.xml b/res/drawable/ic_allapps_search.xml
index 2aeb9479bd..c0e20f1bb8 100644
--- a/res/drawable/ic_allapps_search.xml
+++ b/res/drawable/ic_allapps_search.xml
@@ -19,6 +19,6 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path
-        android:fillColor="?android:attr/colorAccent"
+        android:fillColor="?android:attr/textColorTertiary"
         android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
 </vector>
diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml
index 67ec6641db..0041c9a7c8 100644
--- a/res/layout/all_apps.xml
+++ b/res/layout/all_apps.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2016 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,8 +15,7 @@
 <!-- The top and bottom paddings are defined in this container, but since we want
      the list view to span the full width (for touch interception purposes), we
      will bake the left/right padding into that view's background itself. -->
-<com.android.launcher3.allapps.LauncherAllAppsContainerView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher3.allapps.LauncherAllAppsContainerView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/apps_view"
     android:theme="?attr/allAppsTheme"
     android:layout_width="match_parent"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6ab81501f4..6c58c0eff5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -59,7 +59,7 @@
     <!-- Search bar text in the apps view. [CHAR_LIMIT=50] -->
     <string name="all_apps_search_bar_hint">Search apps</string>
     <!-- Search bar text in the apps view. [CHAR_LIMIT=50] -->
-    <string name="all_apps_on_device_search_bar_hint">Search this phone and more...</string>
+    <string name="all_apps_on_device_search_bar_hint">Search this phone and more…</string>
     <!-- Loading apps text. [CHAR_LIMIT=50] -->
     <string name="all_apps_loading_message">Loading apps&#8230;</string>
     <!-- No-search-results text. [CHAR_LIMIT=50] -->
diff --git a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
index 0214c3547d..f2a1f852be 100644
--- a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
+++ b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
@@ -101,8 +101,8 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
      * Handles grouping and drawing of items in the same all apps sections.
      */
     public static class SectionDecorationHandler {
-        private static final int FILL_ALPHA = (int) (.3f * 255);
-        private static final int FOCUS_ALPHA = (int) (.8f * 255);
+        private static final int FILL_ALPHA = 0;
+        private static final int FOCUS_ALPHA = (int) (.9f * 255);
 
         protected RectF mBounds = new RectF();
         private final boolean mIsFullWidth;
diff --git a/src/com/android/launcher3/views/ScrimView.java b/src/com/android/launcher3/views/ScrimView.java
index 77cec80fd7..15ff2f575b 100644
--- a/src/com/android/launcher3/views/ScrimView.java
+++ b/src/com/android/launcher3/views/ScrimView.java
@@ -42,7 +42,7 @@ import com.android.launcher3.util.Themes;
  */
 public class ScrimView<T extends Launcher> extends View implements Insettable, OnChangeListener {
 
-    private static final float SCRIM_ALPHA = .75f;
+    private static final float SCRIM_ALPHA = .8f;
     protected final T mLauncher;
     private final WallpaperColorInfo mWallpaperColorInfo;
     protected final int mEndScrim;
-- 
GitLab


From 0ebbc18803aaf8ef2f6db7d628d7ae1ce322e842 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Tue, 6 Oct 2020 14:52:27 -0700
Subject: [PATCH 0227/1664] Removing tracing for a gone flake

Bug: 156044202
Change-Id: Ice142bb941fee7b731f46c2073fab17d83bbc871
---
 tests/tapl/com/android/launcher3/tapl/Background.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/Background.java b/tests/tapl/com/android/launcher3/tapl/Background.java
index c9c846fc1a..153b3ceefb 100644
--- a/tests/tapl/com/android/launcher3/tapl/Background.java
+++ b/tests/tapl/com/android/launcher3/tapl/Background.java
@@ -88,10 +88,6 @@ public class Background extends LauncherInstrumentation.VisibleContainer {
                                 ? LauncherInstrumentation.GestureScope.INSIDE_TO_OUTSIDE
                                 : LauncherInstrumentation.GestureScope.OUTSIDE_WITH_PILFER;
 
-                // b/156044202
-                mLauncher.log("Hierarchy before swiping up to overview:");
-                mLauncher.dumpViewHierarchy();
-
                 mLauncher.sendPointer(
                         downTime, downTime, MotionEvent.ACTION_DOWN, start, gestureScope);
                 mLauncher.executeAndWaitForLauncherEvent(
-- 
GitLab


From 1fddddb4f30505e0fc9bb2e7c0d88b38ad900e54 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 29 Sep 2020 17:29:06 -0700
Subject: [PATCH 0228/1664] Update launcher_trace.proto for quick switch

Sample output from one entry:
entry {
  elapsed_realtime_nanos: 440461382888540
  launcher {
    touch_interaction_service {
      service_connected: true
      overview_component_obvserver {
        overview_activity_started: true
        overview_activity_resumed: false
      }
      input_consumer {
        name: "TYPE_OTHER_ACTIVITY:TYPE_ONE_HANDED"
        swipe_handler {
          gesture_state {
            endTarget: NEW_TASK
          }
          is_recents_attached_to_app_window: true
          scroll_offset: 846
          app_to_overview_progress: 0
        }
      }
    }
  }
}

Bug: 167259591
Change-Id: I7f199d88f1d736efcea6b9165b8c4b77a5d27c58
---
 protos/launcher_trace.proto                   | 36 +++++++++++++++++++
 .../android/quickstep/AbsSwipeUpHandler.java  | 24 +++++++++++++
 .../quickstep/BaseActivityInterface.java      |  9 +++++
 .../com/android/quickstep/GestureState.java   | 32 +++++++++++++----
 .../com/android/quickstep/InputConsumer.java  | 20 +++++++++++
 .../quickstep/OverviewComponentObserver.java  | 15 ++++++++
 .../quickstep/TouchInteractionService.java    |  6 ++++
 .../inputconsumers/DelegateInputConsumer.java |  6 ++++
 .../OtherActivityInputConsumer.java           |  8 +++++
 9 files changed, 150 insertions(+), 6 deletions(-)

diff --git a/protos/launcher_trace.proto b/protos/launcher_trace.proto
index c6f3543c09..65fcfe512b 100644
--- a/protos/launcher_trace.proto
+++ b/protos/launcher_trace.proto
@@ -28,4 +28,40 @@ message LauncherTraceProto {
 message TouchInteractionServiceProto {
 
     optional bool service_connected = 1;
+    optional OverviewComponentObserverProto overview_component_obvserver = 2;
+    optional InputConsumerProto input_consumer = 3;
+}
+
+message OverviewComponentObserverProto {
+
+    optional bool overview_activity_started = 1;
+    optional bool overview_activity_resumed = 2;
+}
+
+message InputConsumerProto {
+
+    optional string name = 1;
+    optional SwipeHandlerProto swipe_handler = 2;
+}
+
+message SwipeHandlerProto {
+
+    optional GestureStateProto gesture_state = 1;
+    optional bool is_recents_attached_to_app_window = 2;
+    optional int32 scroll_offset = 3;
+    // Swipe up progress from 0 (app) to 1 (overview); can be > 1 if swiping past overview.
+    optional float app_to_overview_progress = 4;
+}
+
+message GestureStateProto {
+
+    optional GestureEndTarget endTarget = 1 [default = UNSET];
+
+    enum GestureEndTarget {
+        UNSET = 0;
+        HOME = 1;
+        RECENTS = 2;
+        NEW_TASK = 3;
+        LAST_TASK = 4;
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 5e05a7dbe1..cee9854880 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -77,6 +77,8 @@ import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.logging.StatsLogManager.StatsLogger;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.testing.TestProtocol;
+import com.android.launcher3.tracing.InputConsumerProto;
+import com.android.launcher3.tracing.SwipeHandlerProto;
 import com.android.launcher3.util.TraceHelper;
 import com.android.launcher3.util.VibratorWrapper;
 import com.android.launcher3.util.WindowBounds;
@@ -88,6 +90,7 @@ import com.android.quickstep.util.ActivityInitListener;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
 import com.android.quickstep.util.InputConsumerProxy;
 import com.android.quickstep.util.MotionPauseDetector;
+import com.android.quickstep.util.ProtoTracer;
 import com.android.quickstep.util.RectFSpringAnim;
 import com.android.quickstep.util.SurfaceTransactionApplier;
 import com.android.quickstep.util.TransformParams;
@@ -1556,6 +1559,27 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
             }
             mTaskViewSimulator.apply(mTransformParams);
         }
+        ProtoTracer.INSTANCE.get(mContext).scheduleFrameUpdate();
+    }
+
+    /**
+     * Used for winscope tracing, see launcher_trace.proto
+     * @see com.android.systemui.shared.tracing.ProtoTraceable#writeToProto
+     * @param inputConsumerProto The parent of this proto message.
+     */
+    public void writeToProto(InputConsumerProto.Builder inputConsumerProto) {
+        SwipeHandlerProto.Builder swipeHandlerProto = SwipeHandlerProto.newBuilder();
+
+        mGestureState.writeToProto(swipeHandlerProto);
+
+        swipeHandlerProto.setIsRecentsAttachedToAppWindow(
+                mAnimationFactory.isRecentsAttachedToAppWindow());
+        swipeHandlerProto.setScrollOffset(mRecentsView == null
+                ? 0
+                : mRecentsView.getScrollOffset());
+        swipeHandlerProto.setAppToOverviewProgress(mCurrentShift.value);
+
+        inputConsumerProto.setSwipeHandler(swipeHandlerProto);
     }
 
     public interface Factory {
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index d35e270dd5..9089ae5f96 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -297,6 +297,10 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
          * @param animate Whether to animate recents to/from its new attached state.
          */
         default void setRecentsAttachedToAppWindow(boolean attached, boolean animate) { }
+
+        default boolean isRecentsAttachedToAppWindow() {
+            return false;
+        }
     }
 
     class DefaultAnimationFactory implements AnimationFactory {
@@ -388,6 +392,11 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
             fadeAnim.setDuration(animate ? RECENTS_ATTACH_DURATION : 0).start();
         }
 
+        @Override
+        public boolean isRecentsAttachedToAppWindow() {
+            return mIsAttachedToWindow;
+        }
+
         protected void createBackgroundToOverviewAnim(ACTIVITY_TYPE activity, PendingAnimation pa) {
             //  Scale down recents from being full screen to being in overview.
             RecentsView recentsView = activity.getOverviewPanel();
diff --git a/quickstep/src/com/android/quickstep/GestureState.java b/quickstep/src/com/android/quickstep/GestureState.java
index 9c23c8320b..f7889964d7 100644
--- a/quickstep/src/com/android/quickstep/GestureState.java
+++ b/quickstep/src/com/android/quickstep/GestureState.java
@@ -26,6 +26,8 @@ import android.content.Intent;
 import android.os.Build;
 
 import com.android.launcher3.statemanager.StatefulActivity;
+import com.android.launcher3.tracing.GestureStateProto;
+import com.android.launcher3.tracing.SwipeHandlerProto;
 import com.android.quickstep.util.ActiveGestureLog;
 import com.android.systemui.shared.recents.model.ThumbnailData;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
@@ -46,19 +48,22 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL
      * Defines the end targets of a gesture and the associated state.
      */
     public enum GestureEndTarget {
-        HOME(true, LAUNCHER_STATE_HOME, false),
+        HOME(true, LAUNCHER_STATE_HOME, false, GestureStateProto.GestureEndTarget.HOME),
 
-        RECENTS(true, LAUNCHER_STATE_OVERVIEW, true),
+        RECENTS(true, LAUNCHER_STATE_OVERVIEW, true, GestureStateProto.GestureEndTarget.RECENTS),
 
-        NEW_TASK(false, LAUNCHER_STATE_BACKGROUND, true),
+        NEW_TASK(false, LAUNCHER_STATE_BACKGROUND, true,
+                GestureStateProto.GestureEndTarget.NEW_TASK),
 
-        LAST_TASK(false, LAUNCHER_STATE_BACKGROUND, true);
+        LAST_TASK(false, LAUNCHER_STATE_BACKGROUND, true,
+                GestureStateProto.GestureEndTarget.LAST_TASK);
 
-        GestureEndTarget(boolean isLauncher, int containerType,
-                boolean recentsAttachedToAppWindow) {
+        GestureEndTarget(boolean isLauncher, int containerType, boolean recentsAttachedToAppWindow,
+                GestureStateProto.GestureEndTarget protoEndTarget) {
             this.isLauncher = isLauncher;
             this.containerType = containerType;
             this.recentsAttachedToAppWindow = recentsAttachedToAppWindow;
+            this.protoEndTarget = protoEndTarget;
         }
 
         /** Whether the target is in the launcher activity. Implicitly, if the end target is going
@@ -68,6 +73,8 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL
         public final int containerType;
         /** Whether RecentsView should be attached to the window as we animate to this target */
         public final boolean recentsAttachedToAppWindow;
+        /** The GestureStateProto enum value, used for winscope tracing. See launcher_trace.proto */
+        public final GestureStateProto.GestureEndTarget protoEndTarget;
     }
 
     private static final String TAG = "GestureState";
@@ -345,4 +352,17 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL
         pw.println("  lastStartedTaskId=" + mLastStartedTaskId);
         pw.println("  isRecentsAnimationRunning=" + isRecentsAnimationRunning());
     }
+
+    /**
+     * Used for winscope tracing, see launcher_trace.proto
+     * @see com.android.systemui.shared.tracing.ProtoTraceable#writeToProto
+     * @param swipeHandlerProto The parent of this proto message.
+     */
+    public void writeToProto(SwipeHandlerProto.Builder swipeHandlerProto) {
+        GestureStateProto.Builder gestureStateProto = GestureStateProto.newBuilder();
+        gestureStateProto.setEndTarget(mEndTarget == null
+                ? GestureStateProto.GestureEndTarget.UNSET
+                : mEndTarget.protoEndTarget);
+        swipeHandlerProto.setGestureState(gestureStateProto);
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/InputConsumer.java b/quickstep/src/com/android/quickstep/InputConsumer.java
index 67711c0810..0b2a057eb8 100644
--- a/quickstep/src/com/android/quickstep/InputConsumer.java
+++ b/quickstep/src/com/android/quickstep/InputConsumer.java
@@ -21,6 +21,9 @@ import android.view.InputEvent;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 
+import com.android.launcher3.tracing.InputConsumerProto;
+import com.android.launcher3.tracing.TouchInteractionServiceProto;
+
 @TargetApi(Build.VERSION_CODES.O)
 public interface InputConsumer {
 
@@ -116,4 +119,21 @@ public interface InputConsumer {
         }
         return name.toString();
     }
+
+    /**
+     * Used for winscope tracing, see launcher_trace.proto
+     * @see com.android.systemui.shared.tracing.ProtoTraceable#writeToProto
+     * @param serviceProto The parent of this proto message.
+     */
+    default void writeToProto(TouchInteractionServiceProto.Builder serviceProto) {
+        InputConsumerProto.Builder inputConsumerProto = InputConsumerProto.newBuilder();
+        inputConsumerProto.setName(getName());
+        writeToProtoInternal(inputConsumerProto);
+        serviceProto.setInputConsumer(inputConsumerProto);
+    }
+
+    /**
+     * @see #writeToProto - allows subclasses to write additional info to the proto.
+     */
+    default void writeToProtoInternal(InputConsumerProto.Builder inputConsumerProto) {}
 }
diff --git a/quickstep/src/com/android/quickstep/OverviewComponentObserver.java b/quickstep/src/com/android/quickstep/OverviewComponentObserver.java
index 07f838b1bb..49feef0862 100644
--- a/quickstep/src/com/android/quickstep/OverviewComponentObserver.java
+++ b/quickstep/src/com/android/quickstep/OverviewComponentObserver.java
@@ -35,6 +35,8 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.util.SparseIntArray;
 
+import com.android.launcher3.tracing.OverviewComponentObserverProto;
+import com.android.launcher3.tracing.TouchInteractionServiceProto;
 import com.android.launcher3.util.SimpleBroadcastReceiver;
 import com.android.systemui.shared.system.PackageManagerWrapper;
 
@@ -262,4 +264,17 @@ public final class OverviewComponentObserver {
         pw.println("  overviewIntent=" + mOverviewIntent);
         pw.println("  homeIntent=" + mCurrentHomeIntent);
     }
+
+    /**
+     * Used for winscope tracing, see launcher_trace.proto
+     * @see com.android.systemui.shared.tracing.ProtoTraceable#writeToProto
+     * @param serviceProto The parent of this proto message.
+     */
+    public void writeToProto(TouchInteractionServiceProto.Builder serviceProto) {
+        OverviewComponentObserverProto.Builder overviewComponentObserver =
+                OverviewComponentObserverProto.newBuilder();
+        overviewComponentObserver.setOverviewActivityStarted(mActivityInterface.isStarted());
+        overviewComponentObserver.setOverviewActivityResumed(mActivityInterface.isResumed());
+        serviceProto.setOverviewComponentObvserver(overviewComponentObserver);
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 7bf8fbafac..627fa2ab12 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -890,6 +890,12 @@ public class TouchInteractionService extends Service implements PluginListener<O
         TouchInteractionServiceProto.Builder serviceProto =
             TouchInteractionServiceProto.newBuilder();
         serviceProto.setServiceConnected(true);
+
+        if (mOverviewComponentObserver != null) {
+            mOverviewComponentObserver.writeToProto(serviceProto);
+        }
+        mConsumer.writeToProto(serviceProto);
+
         proto.setTouchInteractionService(serviceProto);
     }
 }
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/DelegateInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/DelegateInputConsumer.java
index 67a15a756b..8da2fd3fed 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/DelegateInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/DelegateInputConsumer.java
@@ -4,6 +4,7 @@ import android.view.MotionEvent;
 
 import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.TestProtocol;
+import com.android.launcher3.tracing.InputConsumerProto;
 import com.android.quickstep.InputConsumer;
 import com.android.systemui.shared.system.InputMonitorCompat;
 
@@ -53,4 +54,9 @@ public abstract class DelegateInputConsumer implements InputConsumer {
         mDelegate.onMotionEvent(event);
         event.recycle();
     }
+
+    @Override
+    public void writeToProtoInternal(InputConsumerProto.Builder inputConsumerProto) {
+        mDelegate.writeToProtoInternal(inputConsumerProto);
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
index 35dbee9490..82f489f680 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
@@ -51,6 +51,7 @@ import androidx.annotation.UiThread;
 import com.android.launcher3.R;
 import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.TestProtocol;
+import com.android.launcher3.tracing.InputConsumerProto;
 import com.android.launcher3.util.Preconditions;
 import com.android.launcher3.util.TraceHelper;
 import com.android.quickstep.AbsSwipeUpHandler;
@@ -478,4 +479,11 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
     public boolean allowInterceptByParent() {
         return !mPassedPilferInputSlop || mGestureState.hasState(STATE_OVERSCROLL_WINDOW_CREATED);
     }
+
+    @Override
+    public void writeToProtoInternal(InputConsumerProto.Builder inputConsumerProto) {
+        if (mInteractionHandler != null) {
+            mInteractionHandler.writeToProto(inputConsumerProto);
+        }
+    }
 }
-- 
GitLab


From 9d4a96ed029fdad1e369d5eedd082938f0dc9e01 Mon Sep 17 00:00:00 2001
From: Riddle Hsu <riddlehsu@google.com>
Date: Wed, 30 Sep 2020 00:32:04 +0800
Subject: [PATCH 0229/1664] Add latency metrics for recents gesture

Pass the touch down time to RecentsAnimation#startRecentsActivity.

Bug: 169221287
Test: Enable statsd log: "adb shell cmd stats print-logs"
      Touch gesture navigation bar.
      adb logcat | grep statsd | grep "(48)"
      The line may contain 0x100000->4[I] 0x110000->20[I]
      that means 4=by recents and 20=latency 20ms.
Change-Id: I81ee804895b7712f4d925736f5b4694c11a12cbe
(cherry picked from commit 63623967b83edad56db58173ebb6687c685b9177)
---
 quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 5 +++++
 .../com/android/quickstep/RecentsAnimationCallbacks.java   | 7 +++++++
 .../src/com/android/quickstep/TaskAnimationManager.java    | 5 +++--
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index dbf75fa154..85995a998f 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1476,6 +1476,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         mGestureEndCallback = gestureEndCallback;
     }
 
+    @Override
+    public long getStartTouchTime() {
+        return mTouchTimeMs;
+    }
+
     protected void linkRecentsViewScroll() {
         SurfaceTransactionApplier.create(mRecentsView, applier -> {
             mTransformParams.setSyncTransactionApplier(applier);
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java b/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java
index a21c7140de..f319b943c6 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java
@@ -160,5 +160,12 @@ public class RecentsAnimationCallbacks implements
          * Callback made when a task started from the recents is ready for an app transition.
          */
         default void onTaskAppeared(RemoteAnimationTargetCompat appearedTaskTarget) {}
+
+        /**
+         * The time in milliseconds of the touch event that starts the recents animation.
+         */
+        default long getStartTouchTime() {
+            return 0;
+        }
     }
 }
diff --git a/quickstep/src/com/android/quickstep/TaskAnimationManager.java b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
index f38c1ea886..797797f3d4 100644
--- a/quickstep/src/com/android/quickstep/TaskAnimationManager.java
+++ b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
@@ -50,7 +50,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
     public void preloadRecentsAnimation(Intent intent) {
         // Pass null animation handler to indicate this start is for preloading
         UI_HELPER_EXECUTOR.execute(() -> ActivityManagerWrapper.getInstance()
-                .startRecentsActivity(intent, null, null, null, null));
+                .startRecentsActivity(intent, 0, null, null, null));
     }
 
     /**
@@ -119,10 +119,11 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
                 }
             }
         });
+        final long eventTime = listener.getStartTouchTime();
         mCallbacks.addListener(gestureState);
         mCallbacks.addListener(listener);
         UI_HELPER_EXECUTOR.execute(() -> ActivityManagerWrapper.getInstance()
-                .startRecentsActivity(intent, null, mCallbacks, null, null));
+                .startRecentsActivity(intent, eventTime, mCallbacks, null, null));
         gestureState.setState(STATE_RECENTS_ANIMATION_INITIALIZED);
         return mCallbacks;
     }
-- 
GitLab


From 222afb970434c7972589adfc509bd2c256ca6556 Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Fri, 2 Oct 2020 13:51:36 -0700
Subject: [PATCH 0230/1664] Comply with the ISystemUiProxy.aidl change

Two methods are added to support communications between Launcher and
SysUI when user swipes an auto PiP-able Activity to home.

Bug: 143965596
Test: N/A
Change-Id: I2c73a287a094e882bde3cd71c27f9f66ae20e64a
(cherry picked from commit 88ddae38db924f700082a113670ce5a719116a95)
---
 .../com/android/quickstep/SystemUiProxy.java  | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index 2666869136..a214d81e76 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -17,7 +17,10 @@ package com.android.quickstep;
 
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 
+import android.app.PictureInPictureParams;
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.pm.ActivityInfo;
 import android.graphics.Bitmap;
 import android.graphics.Insets;
 import android.graphics.Rect;
@@ -380,4 +383,29 @@ public class SystemUiProxy implements ISystemUiProxy {
             }
         }
     }
+
+    @Override
+    public Rect startSwipePipToHome(ComponentName componentName, ActivityInfo activityInfo,
+            PictureInPictureParams pictureInPictureParams, int launcherRotation, int shelfHeight) {
+        if (mSystemUiProxy != null) {
+            try {
+                return mSystemUiProxy.startSwipePipToHome(componentName, activityInfo,
+                        pictureInPictureParams, launcherRotation, shelfHeight);
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call startSwipePipToHome", e);
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public void stopSwipePipToHome(ComponentName componentName, Rect destinationBounds) {
+        if (mSystemUiProxy != null) {
+            try {
+                mSystemUiProxy.stopSwipePipToHome(componentName, destinationBounds);
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call stopSwipePipToHome");
+            }
+        }
+    }
 }
-- 
GitLab


From 4b7f38b8fa004b514244304fcc07ff514a2fa46b Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Tue, 6 Oct 2020 18:37:46 -0700
Subject: [PATCH 0231/1664] Align fallback result query with result text

screenshot: https://screenshot.googleplex.com/6Daj5vdmz2jmznX
bug: 169438169
test: Manual
Change-Id: Ie621ed3c834aec5e9467607da4f685d05d152183
---
 res/layout/search_result_icon_row.xml         |   2 +-
 res/layout/search_result_play_item.xml        |   1 -
 res/layout/search_result_suggest.xml          |  37 +++--
 res/layout/search_section_title.xml           |   1 +
 res/values/attrs.xml                          |   7 +
 src/com/android/launcher3/BubbleTextView.java |   2 +-
 .../allapps/AllAppsTransitionController.java  |  21 ++-
 .../launcher3/views/HeroSearchResultView.java |   2 -
 .../launcher3/views/SearchResultIconRow.java  |  86 +++++++++---
 .../views/SearchResultSuggestRow.java         | 132 ------------------
 10 files changed, 100 insertions(+), 191 deletions(-)
 delete mode 100644 src/com/android/launcher3/views/SearchResultSuggestRow.java

diff --git a/res/layout/search_result_icon_row.xml b/res/layout/search_result_icon_row.xml
index 5ecc0c27b6..ef3c8b2857 100644
--- a/res/layout/search_result_icon_row.xml
+++ b/res/layout/search_result_icon_row.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Projectza
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/layout/search_result_play_item.xml b/res/layout/search_result_play_item.xml
index 4e82eafc61..cdb793c19d 100644
--- a/res/layout/search_result_play_item.xml
+++ b/res/layout/search_result_play_item.xml
@@ -67,7 +67,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="start|center_vertical"
-        android:background="?android:attr/selectableItemBackground"
         android:text="@string/search_action_try_now">
     </Button>
 
diff --git a/res/layout/search_result_suggest.xml b/res/layout/search_result_suggest.xml
index c5d96f03ea..a3227cb9fa 100644
--- a/res/layout/search_result_suggest.xml
+++ b/res/layout/search_result_suggest.xml
@@ -12,27 +12,24 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher3.views.SearchResultSuggestRow xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/TextHeadline"
-    android:id="@+id/section_title"
-    android:background="?android:attr/selectableItemBackground"
+<com.android.launcher3.views.SearchResultIconRow xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto"
+    style="@style/BaseIcon"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:gravity="center_vertical"
-    android:padding="4dp"
-    android:minHeight="48dp"
+    android:orientation="horizontal"
+    android:gravity="start|center_vertical"
+    android:textAlignment="viewStart"
     android:textColor="?android:attr/textColorPrimary"
-    android:textSize="14sp">
+    android:textSize="16sp"
+    android:padding="@dimen/dynamic_grid_edge_margin"
+    launcher:iconDisplay="hero_app"
+    android:drawableTint="?android:attr/textColorPrimary"
+    launcher:customIcon="@drawable/ic_allapps_search"
+    launcher:iconSizeOverride="24dp"
+    launcher:matchTextInsetWithQuery="true"
+    launcher:layoutHorizontal="true"
+    android:drawablePadding="@dimen/dynamic_grid_icon_drawable_padding"
+    >
 
-    <TextView
-        android:id="@+id/title"
-        style="@style/TextTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingStart="8dp"
-        android:layout_marginBottom="4dp"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textSize="14sp" />
-
-</com.android.launcher3.views.SearchResultSuggestRow>
\ No newline at end of file
+</com.android.launcher3.views.SearchResultIconRow>
\ No newline at end of file
diff --git a/res/layout/search_section_title.xml b/res/layout/search_section_title.xml
index 941901591c..c541631cd1 100644
--- a/res/layout/search_section_title.xml
+++ b/res/layout/search_section_title.xml
@@ -18,6 +18,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:fontFamily="@style/TextHeadline"
+    android:textStyle="bold"
     android:padding="4dp"
     android:textColor="?android:attr/textColorPrimary"
     android:textSize="14sp" />
\ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index acb8221d7c..6b0f30082c 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -69,6 +69,13 @@
         <attr name="folderDotColor" />
     </declare-styleable>
 
+    <declare-styleable name="SearchResultIconRow">
+        <attr name="customIcon" format="reference" />
+        <attr name="matchTextInsetWithQuery" format="boolean" />
+    </declare-styleable>
+
+
+
     <declare-styleable name="ShadowInfo">
         <attr name="ambientShadowColor" format="color" />
         <attr name="ambientShadowBlur" format="dimension" />
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 1e5a9e44d5..817d02827c 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -627,7 +627,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
     /**
      * Sets the icon for this view based on the layout direction.
      */
-    private void setIcon(Drawable icon) {
+    protected void setIcon(Drawable icon) {
         if (mIsIconVisible) {
             applyCompoundDrawables(icon);
         }
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 4195a056fe..0c488a609b 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -68,16 +68,16 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
     public static final FloatProperty<AllAppsTransitionController> ALL_APPS_PROGRESS =
             new FloatProperty<AllAppsTransitionController>("allAppsProgress") {
 
-        @Override
-        public Float get(AllAppsTransitionController controller) {
-            return controller.mProgress;
-        }
+                @Override
+                public Float get(AllAppsTransitionController controller) {
+                    return controller.mProgress;
+                }
 
-        @Override
-        public void setValue(AllAppsTransitionController controller, float progress) {
-            controller.setProgress(progress);
-        }
-    };
+                @Override
+                public void setValue(AllAppsTransitionController controller, float progress) {
+                    controller.setProgress(progress);
+                }
+            };
 
     private static final int APPS_VIEW_ALPHA_CHANNEL_INDEX = 0;
 
@@ -133,7 +133,6 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
      * in xml-based animations which also handle updating the appropriate UI.
      *
      * @param progress value between 0 and 1, 0 shows all apps and 1 shows workspace
-     *
      * @see #setState(LauncherState)
      * @see #setStateWithAnimation(LauncherState, StateAnimationConfig, PendingAnimation)
      */
@@ -238,7 +237,7 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
             mInsetController = new AllAppsInsetTransitionController(mShiftRange, mAppsView);
             mLauncher.getSystemUiController().updateUiState(UI_STATE_ALLAPPS,
                     View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+                            | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
         }
     }
 
diff --git a/src/com/android/launcher3/views/HeroSearchResultView.java b/src/com/android/launcher3/views/HeroSearchResultView.java
index dd322d921a..91337ba824 100644
--- a/src/com/android/launcher3/views/HeroSearchResultView.java
+++ b/src/com/android/launcher3/views/HeroSearchResultView.java
@@ -96,8 +96,6 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
             launcher.getItemOnClickListener().onClick(view);
         });
         mBubbleTextView.setOnLongClickListener(new HeroItemDragHandler(getContext(), this));
-        setLayoutParams(
-                new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, grid.allAppsCellHeightPx));
 
 
         mDeepShortcutTextViews[0] = findViewById(R.id.shortcut_0);
diff --git a/src/com/android/launcher3/views/SearchResultIconRow.java b/src/com/android/launcher3/views/SearchResultIconRow.java
index 6438d1dbe4..c73eeaefdf 100644
--- a/src/com/android/launcher3/views/SearchResultIconRow.java
+++ b/src/com/android/launcher3/views/SearchResultIconRow.java
@@ -22,16 +22,19 @@ import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import android.app.RemoteAction;
 import android.content.Context;
 import android.content.pm.ShortcutInfo;
+import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.AttributeSet;
+import android.widget.EditText;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
 import com.android.launcher3.allapps.search.AllAppsSearchBarController;
 import com.android.launcher3.icons.BitmapInfo;
@@ -53,25 +56,51 @@ public class SearchResultIconRow extends DoubleShadowBubbleTextView implements
         AllAppsSearchBarController.PayloadResultHandler<SearchTarget> {
 
     private final Object[] mTargetInfo = createTargetInfo();
+    private final int mCustomIconResId;
+    private final boolean mMatchesInset;
+
     private ShortcutInfo mShortcutInfo;
     private AllAppsSearchPlugin mPlugin;
     private AdapterItemWithPayload<SearchTarget> mAdapterItem;
 
 
     public SearchResultIconRow(@NonNull Context context) {
-        super(context);
+        this(context, null, 0);
     }
 
     public SearchResultIconRow(@NonNull Context context,
             @Nullable AttributeSet attrs) {
-        super(context, attrs);
+        this(context, attrs, 0);
     }
 
     public SearchResultIconRow(@NonNull Context context, @Nullable AttributeSet attrs,
             int defStyleAttr) {
         super(context, attrs, defStyleAttr);
+        TypedArray a = context.obtainStyledAttributes(attrs,
+                R.styleable.SearchResultIconRow, defStyleAttr, 0);
+        mCustomIconResId = a.getResourceId(R.styleable.SearchResultIconRow_customIcon, 0);
+        mMatchesInset = a.getBoolean(R.styleable.SearchResultIconRow_matchTextInsetWithQuery,
+                false);
+
+        a.recycle();
     }
 
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        Launcher launcher = Launcher.getLauncher(getContext());
+        if (mMatchesInset && launcher.getAppsView() != null && getParent() != null) {
+            EditText editText = launcher.getAppsView().getSearchUiManager().getEditText();
+            if (editText != null) {
+                int counterOffset = getIconSize() + getCompoundDrawablePadding() / 2;
+                setPadding(editText.getLeft() - counterOffset, getPaddingTop(),
+                        getPaddingRight(), getPaddingBottom());
+            }
+        }
+    }
+
+
     @Override
     public void applyAdapterInfo(AdapterItemWithPayload<SearchTarget> adapterItemWithPayload) {
         if (mAdapterItem != null) {
@@ -98,10 +127,12 @@ public class SearchResultIconRow extends DoubleShadowBubbleTextView implements
         WorkspaceItemInfo workspaceItemInfo = new WorkspaceItemInfo(mShortcutInfo, getContext());
         applyFromWorkspaceItem(workspaceItemInfo);
         LauncherAppState launcherAppState = LauncherAppState.getInstance(getContext());
-        MODEL_EXECUTOR.execute(() -> {
-            launcherAppState.getIconCache().getShortcutIcon(workspaceItemInfo, mShortcutInfo);
-            reapplyItemInfoAsync(workspaceItemInfo);
-        });
+        if (!loadIconFromResource()) {
+            MODEL_EXECUTOR.execute(() -> {
+                launcherAppState.getIconCache().getShortcutIcon(workspaceItemInfo, mShortcutInfo);
+                reapplyItemInfoAsync(workspaceItemInfo);
+            });
+        }
     }
 
     private void prepareUsingRemoteAction(RemoteAction remoteAction, String token, boolean start,
@@ -109,25 +140,34 @@ public class SearchResultIconRow extends DoubleShadowBubbleTextView implements
         RemoteActionItemInfo itemInfo = new RemoteActionItemInfo(remoteAction, token, start);
 
         applyFromRemoteActionInfo(itemInfo);
-        UI_HELPER_EXECUTOR.post(() -> {
-            // If the Drawable from the remote action is not AdaptiveBitmap, styling will not work.
-            try (LauncherIcons li = LauncherIcons.obtain(getContext())) {
-                Drawable d = itemInfo.getRemoteAction().getIcon().loadDrawable(getContext());
-                BitmapInfo bitmap = li.createBadgedIconBitmap(d, itemInfo.user,
-                        Build.VERSION.SDK_INT);
-
-                if (useIconToBadge) {
-                    BitmapInfo placeholder = li.createIconBitmap(
-                            itemInfo.getRemoteAction().getTitle().toString().substring(0, 1),
-                            bitmap.color);
-                    itemInfo.bitmap = li.badgeBitmap(placeholder.icon, bitmap);
-                } else {
-                    itemInfo.bitmap = bitmap;
+        if (!loadIconFromResource()) {
+            UI_HELPER_EXECUTOR.post(() -> {
+                // If the Drawable from the remote action is not AdaptiveBitmap, styling will not
+                // work.
+                try (LauncherIcons li = LauncherIcons.obtain(getContext())) {
+                    Drawable d = itemInfo.getRemoteAction().getIcon().loadDrawable(getContext());
+                    BitmapInfo bitmap = li.createBadgedIconBitmap(d, itemInfo.user,
+                            Build.VERSION.SDK_INT);
+
+                    if (useIconToBadge) {
+                        BitmapInfo placeholder = li.createIconBitmap(
+                                itemInfo.getRemoteAction().getTitle().toString().substring(0, 1),
+                                bitmap.color);
+                        itemInfo.bitmap = li.badgeBitmap(placeholder.icon, bitmap);
+                    } else {
+                        itemInfo.bitmap = bitmap;
+                    }
+                    reapplyItemInfoAsync(itemInfo);
                 }
-                reapplyItemInfoAsync(itemInfo);
-            }
-        });
+            });
+        }
+
+    }
 
+    private boolean loadIconFromResource() {
+        if (mCustomIconResId == 0) return false;
+        setIcon(Launcher.getLauncher(getContext()).getDrawable(mCustomIconResId));
+        return true;
     }
 
     void reapplyItemInfoAsync(ItemInfoWithIcon itemInfoWithIcon) {
diff --git a/src/com/android/launcher3/views/SearchResultSuggestRow.java b/src/com/android/launcher3/views/SearchResultSuggestRow.java
deleted file mode 100644
index 6543c76cfb..0000000000
--- a/src/com/android/launcher3/views/SearchResultSuggestRow.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.views;
-
-import static com.android.systemui.plugins.shared.SearchTarget.ItemType.SUGGEST;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.Launcher;
-import com.android.launcher3.R;
-import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
-import com.android.launcher3.allapps.search.AllAppsSearchBarController;
-import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.model.data.RemoteActionItemInfo;
-import com.android.launcher3.touch.ItemClickHandler;
-import com.android.systemui.plugins.AllAppsSearchPlugin;
-import com.android.systemui.plugins.shared.SearchTarget;
-import com.android.systemui.plugins.shared.SearchTargetEvent;
-
-/**
- * A view representing a fallback search suggestion row.
- */
-public class SearchResultSuggestRow extends LinearLayout implements
-        View.OnClickListener, AllAppsSearchBarController.PayloadResultHandler<SearchTarget> {
-
-    private final Object[] mTargetInfo = createTargetInfo();
-    private AllAppsSearchPlugin mPlugin;
-    private AdapterItemWithPayload<SearchTarget> mAdapterItem;
-    private TextView mTitle;
-
-
-    public SearchResultSuggestRow(@NonNull Context context) {
-        super(context);
-    }
-
-    public SearchResultSuggestRow(@NonNull Context context,
-            @Nullable AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public SearchResultSuggestRow(@NonNull Context context, @Nullable AttributeSet attrs,
-            int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        mTitle = findViewById(R.id.title);
-        setOnClickListener(this);
-    }
-    @Override
-    public void applyAdapterInfo(AdapterItemWithPayload<SearchTarget> adapterItemWithPayload) {
-        mAdapterItem = adapterItemWithPayload;
-        SearchTarget payload = adapterItemWithPayload.getPayload();
-        mPlugin = adapterItemWithPayload.getPlugin();
-
-        if (payload.mRemoteAction != null) {
-            RemoteActionItemInfo itemInfo = new RemoteActionItemInfo(payload.mRemoteAction,
-                    payload.bundle.getString(SearchTarget.REMOTE_ACTION_TOKEN),
-                    payload.bundle.getBoolean(SearchTarget.REMOTE_ACTION_SHOULD_START));
-            setTag(itemInfo);
-        }
-        showIfAvailable(mTitle, payload.mRemoteAction.getTitle().toString());
-        setOnClickListener(v -> handleSelection(SearchTargetEvent.SELECT));
-        adapterItemWithPayload.setSelectionHandler(this::handleSelection);
-    }
-
-    @Override
-    public Object[] getTargetInfo() {
-        return mTargetInfo;
-    }
-
-    private void handleSelection(int eventType) {
-        ItemInfo itemInfo = (ItemInfo) getTag();
-        Launcher launcher = Launcher.getLauncher(getContext());
-
-        if (!(itemInfo instanceof  RemoteActionItemInfo)) return;
-
-        RemoteActionItemInfo remoteItemInfo = (RemoteActionItemInfo) itemInfo;
-        ItemClickHandler.onClickRemoteAction(launcher, remoteItemInfo);
-        SearchTargetEvent searchTargetEvent = getSearchTargetEvent(SUGGEST, eventType);
-        searchTargetEvent.bundle = new Bundle();
-        searchTargetEvent.remoteAction = remoteItemInfo.getRemoteAction();
-        searchTargetEvent.bundle.putBoolean(SearchTarget.REMOTE_ACTION_SHOULD_START,
-                remoteItemInfo.shouldStartInLauncher());
-        searchTargetEvent.bundle.putString(SearchTarget.REMOTE_ACTION_TOKEN,
-                remoteItemInfo.getToken());
-
-        if (mPlugin != null) {
-            mPlugin.notifySearchTargetEvent(searchTargetEvent);
-        }
-    }
-
-    @Override
-    public void onClick(View view) {
-        handleSelection(SearchTargetEvent.SELECT);
-    }
-
-    private void showIfAvailable(TextView view, @Nullable String string) {
-        System.out.println("Plugin suggest string:" + string);
-        if (TextUtils.isEmpty(string)) {
-            view.setVisibility(GONE);
-        } else {
-            System.out.println("Plugin suggest string:" + string);
-            view.setVisibility(VISIBLE);
-            view.setText(string);
-        }
-    }
-}
-- 
GitLab


From 7a6e4c931f13b369bfa4328196b4632d6d848a19 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Tue, 6 Oct 2020 14:09:16 -0700
Subject: [PATCH 0232/1664] Annotating Quick Switch CUJ for 3-button mode

Bug: 169221288
Change-Id: Ief62345fe6004dde699f44aa0c90329b7cd84e8b
---
 .../quickstep/OverviewCommandHelper.java        |  4 ++++
 .../com/android/quickstep/TaskViewUtils.java    | 15 ++++++++++++++-
 .../android/quickstep/views/RecentsView.java    | 17 ++++++++++++-----
 .../com/android/quickstep/views/TaskView.java   | 10 ++++++++++
 4 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
index b1b9396658..9f7871a29c 100644
--- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
@@ -35,6 +35,7 @@ import com.android.quickstep.util.RemoteAnimationProvider;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
+import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
 import com.android.systemui.shared.system.LatencyTrackerCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
@@ -174,6 +175,9 @@ public class OverviewCommandHelper {
                 return;
             }
 
+            InteractionJankMonitorWrapper.begin(
+                    InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH, 2000 /* ms timout */);
+
             // Otherwise, start overview.
             mListener = mActivityInterface.createActivityInitListener(this::onActivityReady);
             mListener.registerAndStartActivity(mOverviewComponentObserver.getOverviewIntent(),
diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java
index 7299c3899e..5520ef7751 100644
--- a/quickstep/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java
@@ -44,6 +44,7 @@ import androidx.annotation.NonNull;
 
 import com.android.launcher3.BaseActivity;
 import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.anim.PendingAnimation;
@@ -58,6 +59,7 @@ import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskThumbnailView;
 import com.android.quickstep.views.TaskView;
 import com.android.systemui.shared.recents.model.Task;
+import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
 /**
@@ -135,6 +137,8 @@ public final class TaskViewUtils {
             RemoteAnimationTargetCompat[] appTargets,
             RemoteAnimationTargetCompat[] wallpaperTargets, DepthController depthController,
             PendingAnimation out) {
+        boolean isQuickSwitch = v.isEndQuickswitchCuj();
+        v.setEndQuickswitchCuj(false);
 
         SurfaceTransactionApplier applier = new SurfaceTransactionApplier(v);
         final RemoteAnimationTargets targets =
@@ -232,10 +236,19 @@ public final class TaskViewUtils {
             });
         }
 
-        out.addListener(new AnimatorListenerAdapter() {
+        out.addListener(new AnimationSuccessListener() {
+            @Override
+            public void onAnimationSuccess(Animator animator) {
+                if (isQuickSwitch) {
+                    InteractionJankMonitorWrapper.end(
+                            InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH);
+                }
+            }
+
             @Override
             public void onAnimationEnd(Animator animation) {
                 targets.release();
+                super.onAnimationEnd(animation);
             }
         });
 
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 7a8e11df78..a817bd3b5c 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1292,19 +1292,26 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     }
 
     public void showNextTask() {
-        TaskView runningTaskView = getRunningTaskView();
+        final TaskView runningTaskView = getRunningTaskView();
+        final TaskView targetTask;
+
         if (runningTaskView == null) {
             // Launch the first task
             if (getTaskViewCount() > 0) {
-                getTaskViewAt(0).launchTask(true);
+                targetTask = getTaskViewAt(0);
+            } else {
+                return;
             }
         } else {
-            if (getNextTaskView() != null) {
-                getNextTaskView().launchTask(true);
+            final TaskView nextTask = getNextTaskView();
+            if (nextTask != null) {
+                targetTask = nextTask;
             } else {
-                runningTaskView.launchTask(true);
+                targetTask = runningTaskView;
             }
         }
+        targetTask.setEndQuickswitchCuj(true);
+        targetTask.launchTask(true);
     }
 
     public void setRunningTaskIconScaledDown(boolean isScaledDown) {
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 686f8785c5..54a793c8e0 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -189,6 +189,8 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     private CancellableTask mThumbnailLoadRequest;
     private CancellableTask mIconLoadRequest;
 
+    private boolean mEndQuickswitchCuj;
+
     // Order in which the footers appear. Lower order appear below higher order.
     public static final int INDEX_DIGITAL_WELLBEING_TOAST = 0;
     private final FooterWrapper[] mFooters = new FooterWrapper[2];
@@ -807,6 +809,14 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         return false;
     }
 
+    public boolean isEndQuickswitchCuj() {
+        return mEndQuickswitchCuj;
+    }
+
+    public void setEndQuickswitchCuj(boolean endQuickswitchCuj) {
+        mEndQuickswitchCuj = endQuickswitchCuj;
+    }
+
     private static final class TaskOutlineProvider extends ViewOutlineProvider {
 
         private final int mMarginTop;
-- 
GitLab


From 68d7a6e5b28af8cc55bdae7efc24cc7ebee81257 Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Wed, 7 Oct 2020 14:27:17 -0700
Subject: [PATCH 0233/1664] Adds feature flag for BC Smartspace.

Change-Id: Iaf9fb7507d0ccd004a4e00188c75dadd6a059246
---
 src/com/android/launcher3/config/FeatureFlags.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 4175280991..58b0a87468 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -156,10 +156,14 @@ public final class FeatureFlags {
             "ENABLE_DATABASE_RESTORE", true,
             "Enable database restore when new restore session is created");
 
-    public static final BooleanFlag ENABLE_UNIVERSAL_SMARTSPACE = getDebugFlag(
-            "ENABLE_UNIVERSAL_SMARTSPACE", false,
+    public static final BooleanFlag ENABLE_SMARTSPACE_UNIVERSAL = getDebugFlag(
+            "ENABLE_SMARTSPACE_UNIVERSAL", false,
             "Replace Smartspace with a version rendered by System UI.");
 
+    public static final BooleanFlag ENABLE_SMARTSPACE_BLUECHIP = getDebugFlag(
+            "ENABLE_SMARTSPACE_BLUECHIP", false,
+            "Replace Smartspace with the Bluechip version. Ignored if ENABLE_SMARTSPACE_UNIVERSAL is enabled.");
+
     public static final BooleanFlag ENABLE_SYSTEM_VELOCITY_PROVIDER = getDebugFlag(
             "ENABLE_SYSTEM_VELOCITY_PROVIDER", true,
             "Use system VelocityTracker's algorithm for motion pause detection.");
-- 
GitLab


From ab9ad20be600d1cbdc6b54a491d5fbb4c2cf9c16 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Wed, 7 Oct 2020 15:18:24 -0700
Subject: [PATCH 0234/1664] Search UI cleanup

- offset all apps header padding with search input margin
- avoid check shouldDraw check on HeaderRow. (race condition)

Bug: 170263425
Change-Id: I11a1fbb448aa6afd18ec0984af9bb8b1d7600f69
---
 .../android/launcher3/allapps/FloatingHeaderView.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/allapps/FloatingHeaderView.java b/src/com/android/launcher3/allapps/FloatingHeaderView.java
index 11d3fb995a..4bb6a00dd0 100644
--- a/src/com/android/launcher3/allapps/FloatingHeaderView.java
+++ b/src/com/android/launcher3/allapps/FloatingHeaderView.java
@@ -111,8 +111,8 @@ public class FloatingHeaderView extends LinearLayout implements
 
     public FloatingHeaderView(@NonNull Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
-        mHeaderTopPadding = context.getResources()
-                .getDimensionPixelSize(R.dimen.all_apps_header_top_padding);
+        mHeaderTopPadding = FeatureFlags.ENABLE_DEVICE_SEARCH.get() ? 0 :
+                context.getResources().getDimensionPixelSize(R.dimen.all_apps_header_top_padding);
     }
 
     @Override
@@ -130,6 +130,7 @@ public class FloatingHeaderView extends LinearLayout implements
             }
         }
         mFixedRows = rows.toArray(new FloatingHeaderRow[rows.size()]);
+        setPadding(0, mHeaderTopPadding, 0, 0);
         mAllRows = mFixedRows;
     }
 
@@ -199,7 +200,7 @@ public class FloatingHeaderView extends LinearLayout implements
     public View getFocusedChild() {
         if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
             for (FloatingHeaderRow row : mAllRows) {
-                if (row.hasVisibleContent() && row.shouldDraw()) {
+                if (row.hasVisibleContent()) {
                     return row.getFocusedChild();
                 }
             }
@@ -247,7 +248,9 @@ public class FloatingHeaderView extends LinearLayout implements
 
     public int getMaxTranslation() {
         if (mMaxTranslation == 0 && mTabsHidden) {
-            return getResources().getDimensionPixelSize(R.dimen.all_apps_search_bar_bottom_padding);
+            int paddingOffset = getResources().getDimensionPixelSize(
+                    R.dimen.all_apps_search_bar_bottom_padding);
+            return FeatureFlags.ENABLE_DEVICE_SEARCH.get() ? 0 : paddingOffset;
         } else if (mMaxTranslation > 0 && mTabsHidden) {
             return mMaxTranslation + getPaddingTop();
         } else {
-- 
GitLab


From 16045060c35639aea85afc572bea768d16e6c9f9 Mon Sep 17 00:00:00 2001
From: Hilary Huo <hhuo@google.com>
Date: Thu, 8 Oct 2020 10:18:41 -0700
Subject: [PATCH 0235/1664] [pixel-search] add escape hatch

Change-Id: I33ffea1fc0859564955380d7d1db317293d1a2cb
---
 .../android/launcher3/model/data/RemoteActionItemInfo.java    | 4 ++++
 src/com/android/launcher3/views/SearchResultIconRow.java      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/model/data/RemoteActionItemInfo.java b/src/com/android/launcher3/model/data/RemoteActionItemInfo.java
index 81f7f3a0a2..d988bf9641 100644
--- a/src/com/android/launcher3/model/data/RemoteActionItemInfo.java
+++ b/src/com/android/launcher3/model/data/RemoteActionItemInfo.java
@@ -61,4 +61,8 @@ public class RemoteActionItemInfo extends ItemInfoWithIcon {
     public boolean shouldStartInLauncher() {
         return mShouldStart;
     }
+
+    public boolean isEscapeHatch() {
+        return mToken.contains("item_type:[ESCAPE_HATCH]");
+    }
 }
diff --git a/src/com/android/launcher3/views/SearchResultIconRow.java b/src/com/android/launcher3/views/SearchResultIconRow.java
index c73eeaefdf..6d9c86a9a7 100644
--- a/src/com/android/launcher3/views/SearchResultIconRow.java
+++ b/src/com/android/launcher3/views/SearchResultIconRow.java
@@ -140,7 +140,7 @@ public class SearchResultIconRow extends DoubleShadowBubbleTextView implements
         RemoteActionItemInfo itemInfo = new RemoteActionItemInfo(remoteAction, token, start);
 
         applyFromRemoteActionInfo(itemInfo);
-        if (!loadIconFromResource()) {
+        if (itemInfo.isEscapeHatch() || !loadIconFromResource()) {
             UI_HELPER_EXECUTOR.post(() -> {
                 // If the Drawable from the remote action is not AdaptiveBitmap, styling will not
                 // work.
-- 
GitLab


From 8d5b118060bff7f7518a9a14c0be5d265621f14c Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Thu, 8 Oct 2020 13:11:25 -0700
Subject: [PATCH 0236/1664] Revert PredictionRow shuoldDraw check

+ Show Rounded play result icons

Bug: 168805872
Test: Manual
Change-Id: I663c7f7ca1f1ac072e5e9c441deabef7c3fbd97b
---
 .../appprediction/PredictionRowView.java      |  2 +-
 .../search/AllAppsSearchBarController.java    |  2 +-
 .../launcher3/views/SearchResultPlayItem.java | 41 +++++++++++++++++--
 3 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
index b5ba8a6161..dbdfd8d410 100644
--- a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
+++ b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
@@ -184,7 +184,7 @@ public class PredictionRowView extends LinearLayout implements
 
     @Override
     public boolean shouldDraw() {
-        return getVisibility() == VISIBLE;
+        return getVisibility() != GONE;
     }
 
     @Override
diff --git a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
index d7fa5bc479..82c4db4da3 100644
--- a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
+++ b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
@@ -114,7 +114,7 @@ public class AllAppsSearchBarController
     @Override
     public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
         if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
-            if (actionId == EditorInfo.IME_ACTION_SEARCH) {
+            if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_GO) {
                 // selectFocusedView should return SearchTargetEvent that is passed onto onClick
                 if (Launcher.getLauncher(mLauncher).getAppsView().selectFocusedView(v)) {
                     return true;
diff --git a/src/com/android/launcher3/views/SearchResultPlayItem.java b/src/com/android/launcher3/views/SearchResultPlayItem.java
index ff3ecc8bc3..d05a29eab9 100644
--- a/src/com/android/launcher3/views/SearchResultPlayItem.java
+++ b/src/com/android/launcher3/views/SearchResultPlayItem.java
@@ -21,6 +21,11 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.Rect;
+import android.graphics.RectF;
 import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
 import android.os.Bundle;
@@ -38,6 +43,7 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
 import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+import com.android.launcher3.icons.BitmapRenderer;
 import com.android.systemui.plugins.AllAppsSearchPlugin;
 import com.android.systemui.plugins.shared.SearchTarget;
 import com.android.systemui.plugins.shared.SearchTargetEvent;
@@ -50,6 +56,10 @@ import java.net.URL;
  */
 public class SearchResultPlayItem extends LinearLayout implements
         AllAppsSearchBarController.PayloadResultHandler<Bundle> {
+
+    private static final int BITMAP_CROP_MASK_COLOR = 0xff424242;
+    private static final float ICON_RADIUS_FACTOR = .5f;
+
     private final DeviceProfile mDeviceProfile;
     private View mIconView;
     private TextView mTitleView;
@@ -60,6 +70,8 @@ public class SearchResultPlayItem extends LinearLayout implements
     private AllAppsSearchPlugin mPlugin;
     private final Object[] mTargetInfo = createTargetInfo();
 
+    final Paint mIconPaint = new Paint();
+
 
     public SearchResultPlayItem(Context context) {
         this(context, null, 0);
@@ -109,7 +121,6 @@ public class SearchResultPlayItem extends LinearLayout implements
 //        TODO: Should use a generic type to get values b/165320033
         showIfNecessary(mDetailViews[0], bundle.getString("price"));
         showIfNecessary(mDetailViews[1], bundle.getString("rating"));
-        showIfNecessary(mDetailViews[2], bundle.getString("category"));
 
         mIconView.setBackgroundResource(R.drawable.ic_deepshortcut_placeholder);
         UI_HELPER_EXECUTOR.execute(() -> {
@@ -118,8 +129,9 @@ public class SearchResultPlayItem extends LinearLayout implements
                 URL url = new URL(bundle.getString("icon_url"));
                 Bitmap bitmap = BitmapFactory.decodeStream(url.openStream());
                 BitmapDrawable bitmapDrawable = new BitmapDrawable(getResources(),
-                        Bitmap.createScaledBitmap(bitmap, mDeviceProfile.allAppsIconSizePx,
-                                mDeviceProfile.allAppsIconSizePx, false));
+                        Bitmap.createScaledBitmap(getRoundedBitmap(bitmap),
+                                mDeviceProfile.allAppsIconSizePx, mDeviceProfile.allAppsIconSizePx,
+                                false));
                 mIconView.post(() -> mIconView.setBackground(bitmapDrawable));
             } catch (IOException e) {
                 e.printStackTrace();
@@ -127,6 +139,29 @@ public class SearchResultPlayItem extends LinearLayout implements
         });
     }
 
+
+    private Bitmap getRoundedBitmap(Bitmap bitmap) {
+        int iconSize = bitmap.getWidth();
+
+        Bitmap output = BitmapRenderer.createHardwareBitmap(iconSize, iconSize, (canvas) -> {
+            final Rect rect = new Rect(0, 0, iconSize, iconSize);
+            final RectF rectF = new RectF(rect);
+
+            mIconPaint.setAntiAlias(true);
+            canvas.drawARGB(0, 0, 0, 0);
+            mIconPaint.setColor(BITMAP_CROP_MASK_COLOR);
+            int radius = (int) (iconSize * ICON_RADIUS_FACTOR);
+            canvas.drawRoundRect(rectF, radius, radius, mIconPaint);
+
+            mIconPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
+            canvas.drawBitmap(bitmap, rect, rect, mIconPaint);
+        });
+
+        return output;
+
+    }
+
+
     @Override
     public Object[] getTargetInfo() {
         return mTargetInfo;
-- 
GitLab


From 692d2109a6702706d24b3b819d115882f7362509 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Thu, 8 Oct 2020 18:42:48 -0700
Subject: [PATCH 0237/1664] invalidate itemDecoration on predictedRow focus
 draw

Change-Id: I66c731f00ae1c1292c51ff281957f05fd2d70dfa
---
 .../android/launcher3/appprediction/PredictionRowView.java | 7 ++-----
 src/com/android/launcher3/allapps/FloatingHeaderView.java  | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
index dbdfd8d410..37336d180e 100644
--- a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
+++ b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
@@ -148,10 +148,6 @@ public class PredictionRowView extends LinearLayout implements
 
     private void updateVisibility() {
         setVisibility(mPredictionsEnabled ? VISIBLE : GONE);
-        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && mLauncher.getAppsView() != null
-                && mLauncher.getAppsView().getActiveRecyclerView() != null) {
-            mLauncher.getAppsView().invalidate();
-        }
     }
 
     @Override
@@ -170,6 +166,7 @@ public class PredictionRowView extends LinearLayout implements
             }
             mDecorationHandler.onDraw(canvas);
             mDecorationHandler.onFocusDraw(canvas, getFocusedChild());
+            mLauncher.getAppsView().getActiveRecyclerView().invalidateItemDecorations();
         }
         mFocusHelper.draw(canvas);
         super.dispatchDraw(canvas);
@@ -184,7 +181,7 @@ public class PredictionRowView extends LinearLayout implements
 
     @Override
     public boolean shouldDraw() {
-        return getVisibility() != GONE;
+        return getVisibility() == VISIBLE;
     }
 
     @Override
diff --git a/src/com/android/launcher3/allapps/FloatingHeaderView.java b/src/com/android/launcher3/allapps/FloatingHeaderView.java
index 4bb6a00dd0..813db7d0a0 100644
--- a/src/com/android/launcher3/allapps/FloatingHeaderView.java
+++ b/src/com/android/launcher3/allapps/FloatingHeaderView.java
@@ -200,7 +200,7 @@ public class FloatingHeaderView extends LinearLayout implements
     public View getFocusedChild() {
         if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
             for (FloatingHeaderRow row : mAllRows) {
-                if (row.hasVisibleContent()) {
+                if (row.hasVisibleContent() && row.shouldDraw()) {
                     return row.getFocusedChild();
                 }
             }
-- 
GitLab


From b5334e3f07f0561808a2d6e9bba55f1e3a89191e Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Fri, 9 Oct 2020 00:50:48 -0700
Subject: [PATCH 0238/1664] Improve search section header

Change-Id: I47cf207f0d0ab792c0e7a47c9d1185eec087ec88
---
 res/layout/search_section_title.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/res/layout/search_section_title.xml b/res/layout/search_section_title.xml
index c541631cd1..b7ba83e71b 100644
--- a/res/layout/search_section_title.xml
+++ b/res/layout/search_section_title.xml
@@ -17,8 +17,9 @@
     android:id="@+id/section_title"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:fontFamily="@style/TextHeadline"
-    android:textStyle="bold"
-    android:padding="4dp"
+    style="@style/TextHeadline"
+    android:paddingStart="4dp"
+    android:paddingBottom="2dp"
+    android:paddingTop="12dp"
     android:textColor="?android:attr/textColorPrimary"
-    android:textSize="14sp" />
\ No newline at end of file
+    android:textSize="18sp" />
\ No newline at end of file
-- 
GitLab


From 1b9e199b3d9c81c793758d96bb03e0c51c1b3fb1 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Thu, 8 Oct 2020 15:50:22 -0400
Subject: [PATCH 0239/1664] Fix hotseat and prediction row to allow updates
 when empty.

Rotating the screen in the homescreen empties the hotseat, however it does not get populated while it is visible to the user. The user should not be able to see an empty hotseat or prediction row if predictions are available. It should therefore be possible to populate these when they are empty even if they are visible to the user.

Change-Id: I8e5252bd29050c2cd9d443aedcb3f3e305c0e2d7
---
 .../android/launcher3/appprediction/PredictionRowView.java    | 2 +-
 .../launcher3/hybridhotseat/HotseatPredictionController.java  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
index 37336d180e..f313d7539e 100644
--- a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
+++ b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
@@ -206,7 +206,7 @@ public class PredictionRowView extends LinearLayout implements
      * we can optimize by swapping them in place.
      */
     public void setPredictedApps(List<ItemInfo> items) {
-        if (isShown() && getWindowVisibility() == View.VISIBLE) {
+        if (!mLauncher.isWorkspaceLoading() && isShown() && getWindowVisibility() == View.VISIBLE) {
             mPendingPredictedItems = items;
             return;
         }
diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
index 76bab596ac..d3b7e22299 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
@@ -251,7 +251,9 @@ public class HotseatPredictionController implements DragController.DragListener,
      * Sets or updates the predicted items
      */
     public void setPredictedItems(FixedContainerItems items) {
-        if (mHotseat.isShown() && mHotseat.getWindowVisibility() == View.VISIBLE) {
+        if (!mLauncher.isWorkspaceLoading()
+                && mHotseat.isShown()
+                && mHotseat.getWindowVisibility() == View.VISIBLE) {
             mHotseat.setOnVisibilityAggregatedCallback((isVisible) -> {
                 if (isVisible) {
                     return;
-- 
GitLab


From 979da64d8254599c332d83bf94f3f1fc3fe45fef Mon Sep 17 00:00:00 2001
From: Riddle Hsu <riddlehsu@google.com>
Date: Tue, 22 Sep 2020 21:52:40 +0800
Subject: [PATCH 0240/1664] Add app start source info of apps launched from
 launcher

Bug: 166614700
Test: Enable statsd log: "adb shell cmd stats print-logs"
      adb logcat | grep statsd | grep "(48)"
      The line may contain 0x100000->1[I] 0x110000->10[I]
      that means 1=from launcher and 10=latency 10ms.
Change-Id: Iddaff7066b66e241ba58ec87129ddbe2c531dc7e
(cherry picked from commit 7bdf3574a3bff06a377b4364877687bfa7619d06)
---
 .../com/android/launcher3/BaseQuickstepLauncher.java | 12 ++++++++++++
 src/com/android/launcher3/Launcher.java              |  7 ++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 54c2383be9..44d43c6784 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -26,10 +26,12 @@ import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
 
 import android.animation.AnimatorSet;
 import android.animation.ValueAnimator;
+import android.app.ActivityOptions;
 import android.content.Intent;
 import android.content.IntentSender;
 import android.os.Bundle;
 import android.os.CancellationSignal;
+import android.view.View;
 
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.WellbeingModel;
@@ -51,6 +53,7 @@ import com.android.quickstep.util.RemoteFadeOutAnimationListener;
 import com.android.quickstep.views.OverviewActionsView;
 import com.android.quickstep.views.RecentsView;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
+import com.android.systemui.shared.system.ActivityOptionsCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
 import java.util.stream.Stream;
@@ -306,6 +309,15 @@ public abstract class BaseQuickstepLauncher extends Launcher
                 Stream.of(WellbeingModel.SHORTCUT_FACTORY));
     }
 
+    @Override
+    public ActivityOptions getActivityLaunchOptions(View v) {
+        ActivityOptions activityOptions = super.getActivityLaunchOptions(v);
+        if (activityOptions != null && mLastTouchUpTime > 0) {
+            ActivityOptionsCompat.setLauncherSourceInfo(activityOptions, mLastTouchUpTime);
+        }
+        return activityOptions;
+    }
+
     public void setHintUserWillBeActive() {
         addActivityFlags(ACTIVITY_STATE_USER_WILL_BE_ACTIVE);
     }
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 4b75a33fc1..ab8d7a5a69 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -77,6 +77,7 @@ import android.os.CancellationSignal;
 import android.os.Parcelable;
 import android.os.Process;
 import android.os.StrictMode;
+import android.os.SystemClock;
 import android.text.TextUtils;
 import android.text.method.TextKeyListener;
 import android.util.Log;
@@ -350,7 +351,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     private boolean mDeferOverlayCallbacks;
     private final Runnable mDeferredOverlayCallbacks = this::checkIfOverlayStillDeferred;
 
-    private long mLastTouchUpTime = -1;
+    protected long mLastTouchUpTime = -1;
     private boolean mTouchInProgress;
 
     private SafeCloseable mUserChangedCallbackCloseable;
@@ -1828,7 +1829,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
                 mTouchInProgress = true;
                 break;
             case MotionEvent.ACTION_UP:
-                mLastTouchUpTime = System.currentTimeMillis();
+                mLastTouchUpTime = ev.getEventTime();
                 // Follow through
             case MotionEvent.ACTION_CANCEL:
                 mTouchInProgress = false;
@@ -2461,7 +2462,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         if (mDragController.isDragging()) {
             return false;
         } else {
-            return (System.currentTimeMillis() - mLastTouchUpTime)
+            return (SystemClock.uptimeMillis() - mLastTouchUpTime)
                     > (NEW_APPS_ANIMATION_INACTIVE_TIMEOUT_SECONDS * 1000);
         }
     }
-- 
GitLab


From 0471b9836c9e382dc14bdc3abdf8502fb2b9f266 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 23 Sep 2020 13:54:37 -0700
Subject: [PATCH 0241/1664] Using FrameCallbacks instead of windowCallbacks for
 surface removal

WindowCallbacks is called during the draw pass, before the frame has
been sent to the surfaceFlinger. Frame callback will provide a closer
approximation for when the frame is actually rendered on screen.

Bug: 141126144
Change-Id: I62aab526c2ca24b00b5e7b312b36080f26c7b439
---
 .../android/quickstep/AbsSwipeUpHandler.java  |  2 +-
 .../src/com/android/quickstep/ViewUtils.java  | 86 ++++++++++++-------
 .../android/quickstep/views/RecentsView.java  |  2 +-
 3 files changed, 55 insertions(+), 35 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index dbf75fa154..678278e2b4 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1336,7 +1336,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                 if (taskView != null && !mCanceled) {
                     // Defer finishing the animation until the next launcher frame with the
                     // new thumbnail
-                    finishTransitionPosted = ViewUtils.postDraw(taskView,
+                    finishTransitionPosted = ViewUtils.postFrameDrawn(taskView,
                             () -> mStateCallback.setStateOnUiThread(STATE_SCREENSHOT_CAPTURED),
                             this::isCanceled);
                 }
diff --git a/quickstep/src/com/android/quickstep/ViewUtils.java b/quickstep/src/com/android/quickstep/ViewUtils.java
index cbb6ad4188..184ab17ae2 100644
--- a/quickstep/src/com/android/quickstep/ViewUtils.java
+++ b/quickstep/src/com/android/quickstep/ViewUtils.java
@@ -15,21 +15,23 @@
  */
 package com.android.quickstep;
 
-import android.graphics.Canvas;
+import android.os.Handler;
 import android.view.View;
 
-import com.android.systemui.shared.system.WindowCallbacksCompat;
+import com.android.launcher3.Utilities;
+import com.android.systemui.shared.system.ViewRootImplCompat;
 
 import java.util.function.BooleanSupplier;
+import java.util.function.LongConsumer;
 
 /**
  * Utility class for helpful methods related to {@link View} objects.
  */
 public class ViewUtils {
 
-    /** See {@link #postDraw(View, Runnable, BooleanSupplier)}} */
-    public static boolean postDraw(View view, Runnable onFinishRunnable) {
-        return postDraw(view, onFinishRunnable, () -> false);
+    /** See {@link #postFrameDrawn(View, Runnable, BooleanSupplier)}} */
+    public static boolean postFrameDrawn(View view, Runnable onFinishRunnable) {
+        return postFrameDrawn(view, onFinishRunnable, () -> false);
     }
 
     /**
@@ -38,37 +40,55 @@ public class ViewUtils {
      *
      * @param onFinishRunnable runnable to be run right after the view finishes drawing.
      */
-    public static boolean postDraw(View view, Runnable onFinishRunnable, BooleanSupplier canceled) {
-        // Defer finishing the animation until the next launcher frame with the
-        // new thumbnail
-        return new WindowCallbacksCompat(view) {
-            // The number of frames to defer until we actually finish the animation
-            private int mDeferFrameCount = 2;
+    public static boolean postFrameDrawn(
+            View view, Runnable onFinishRunnable, BooleanSupplier canceled) {
+        return new FrameHandler(view, onFinishRunnable, canceled).schedule();
+    }
+
+    private static class FrameHandler implements LongConsumer {
+
+        final ViewRootImplCompat mViewRoot;
+        final Runnable mFinishCallback;
+        final BooleanSupplier mCancelled;
+        final Handler mHandler;
+
+        int mDeferFrameCount = 1;
+
+        FrameHandler(View view, Runnable finishCallback, BooleanSupplier cancelled) {
+            mViewRoot = new ViewRootImplCompat(view);
+            mFinishCallback = finishCallback;
+            mCancelled = cancelled;
+            mHandler = new Handler();
+        }
 
-            @Override
-            public void onPostDraw(Canvas canvas) {
-                // If we were cancelled after this was attached, do not update
-                // the state.
-                if (canceled.getAsBoolean()) {
-                    detach();
-                    return;
-                }
+        @Override
+        public void accept(long l) {
+            Utilities.postAsyncCallback(mHandler, this::onFrame);
+        }
 
-                if (mDeferFrameCount > 0) {
-                    mDeferFrameCount--;
-                    // Workaround, detach and reattach to invalidate the root node for
-                    // another draw
-                    detach();
-                    attach();
-                    view.invalidate();
-                    return;
-                }
+        private void onFrame() {
+            if (mCancelled.getAsBoolean()) {
+                return;
+            }
+
+            if (mDeferFrameCount > 0) {
+                mDeferFrameCount--;
+                schedule();
+                return;
+            }
+
+            if (mFinishCallback != null) {
+                mFinishCallback.run();
+            }
+        }
 
-                if (onFinishRunnable != null) {
-                    onFinishRunnable.run();
-                }
-                detach();
+        private boolean schedule() {
+            if (mViewRoot.isValid()) {
+                mViewRoot.registerRtFrameCallback(this);
+                mViewRoot.getView().invalidate();
+                return true;
             }
-        }.attach();
+            return false;
+        }
     }
 }
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 7a8e11df78..47abf04f5e 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2442,7 +2442,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             } else {
                 taskView.getThumbnail().refresh();
             }
-            ViewUtils.postDraw(taskView, onFinishRunnable);
+            ViewUtils.postFrameDrawn(taskView, onFinishRunnable);
         } else {
             onFinishRunnable.run();
         }
-- 
GitLab


From 2de606fe731573c081fd2d6ba166e21ea6aa2e9c Mon Sep 17 00:00:00 2001
From: Yogisha Dixit <ydixit@google.com>
Date: Mon, 12 Oct 2020 15:36:07 +0100
Subject: [PATCH 0242/1664] Delete the minimal database to force refresh.

Bug: 169771796
Test: manual
Change-Id: Ic2188bb162f295c208346861fddc137ace19ddcb
---
 .../src/com/android/launcher3/model/WellbeingModel.java     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/quickstep/src/com/android/launcher3/model/WellbeingModel.java b/quickstep/src/com/android/launcher3/model/WellbeingModel.java
index a9fc1aa085..995c4b04d4 100644
--- a/quickstep/src/com/android/launcher3/model/WellbeingModel.java
+++ b/quickstep/src/com/android/launcher3/model/WellbeingModel.java
@@ -148,6 +148,12 @@ public final class WellbeingModel extends BgObjectWithLooper {
             if (!FeatureFlags.ENABLE_MINIMAL_DEVICE.get()) {
                 return;
             }
+
+            // Temporary bug fix for b/169771796. Wellbeing provides the layout configuration when
+            // minimal device is enabled. We always want to reload the configuration from Wellbeing
+            // since the layout configuration might have changed.
+            mContext.deleteDatabase(DB_NAME_MINIMAL_DEVICE);
+
             final Bundle extras = new Bundle();
             String dbFile;
             if (isInMinimalDeviceMode()) {
-- 
GitLab


From 9a6145efb85f2bbdaccc07166a55e22c15fe27db Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Mon, 12 Oct 2020 09:33:00 -0700
Subject: [PATCH 0243/1664] Introduce shortcut container for hotseat event
 reporting

Bug: 170636685
Test: Manual
Change-Id: I5abeb17976bbafdc8cc74fb8b9a586d544c682fc
---
 .../src/com/android/launcher3/model/AppEventProducer.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/quickstep/src/com/android/launcher3/model/AppEventProducer.java b/quickstep/src/com/android/launcher3/model/AppEventProducer.java
index 364a321f75..58937c3350 100644
--- a/quickstep/src/com/android/launcher3/model/AppEventProducer.java
+++ b/quickstep/src/com/android/launcher3/model/AppEventProducer.java
@@ -250,6 +250,9 @@ public class AppEventProducer implements StatsLogConsumer {
             case PREDICTION_CONTAINER: {
                 return "predictions";
             }
+            case SHORTCUTS_CONTAINER: {
+                return "shortcuts";
+            }
             case FOLDER: {
                 FolderContainer fc = ci.getFolder();
                 switch (fc.getParentContainerCase()) {
-- 
GitLab


From 2d7bfc8782e9ed01178672aeb09ba2a6a07f4f4c Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Mon, 12 Oct 2020 12:09:22 -0700
Subject: [PATCH 0244/1664] Fix shadowRadius not being used in swipe up
 animation.

Bug: 168608912
Change-Id: I08f7bb057237e5061d5f1fc29afb488b204ee385
---
 quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
index a46de1f601..7406dea486 100644
--- a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
+++ b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
@@ -261,7 +261,7 @@ public abstract class SwipeUpAnimationLogic {
             mTransformParams
                     .setTargetAlpha(getWindowAlpha(progress))
                     .setCornerRadius(cornerRadius)
-                    .setShadowRadius(mMaxShadowRadius);
+                    .setShadowRadius(shadowRadius);
 
             mTransformParams.applySurfaceParams(mTransformParams.createSurfaceParams(this));
             mAnimationFactory.update(currentRect, progress, mMatrix.mapRadius(cornerRadius));
-- 
GitLab


From 2afcab804b638ff3b9da5bad40c8f70bdcaae78d Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Mon, 12 Oct 2020 15:38:14 -0700
Subject: [PATCH 0245/1664] Search UI clean up

- Resolve spacing issue when work profile is installed
- Cache play icons and use icon shape
- Only draw focus indicator for the first result

Bug: 170487752
Bug: 170665892
Change-Id: I864d2e796786637132e127ef9b418c0a76c74d6e
---
 res/layout/all_apps_tabs.xml                  |  1 -
 .../allapps/AllAppsContainerView.java         |  4 ---
 .../launcher3/allapps/AllAppsPagedView.java   |  5 +++
 .../allapps/AllAppsSectionDecorator.java      |  6 +++-
 .../launcher3/views/SearchResultPlayItem.java | 31 ++++++++++---------
 5 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/res/layout/all_apps_tabs.xml b/res/layout/all_apps_tabs.xml
index 2accd2d21f..c684881195 100644
--- a/res/layout/all_apps_tabs.xml
+++ b/res/layout/all_apps_tabs.xml
@@ -26,7 +26,6 @@
     android:clipChildren="true"
     android:clipToPadding="false"
     android:descendantFocusability="afterDescendants"
-    android:paddingTop="@dimen/all_apps_header_top_padding"
     launcher:pageIndicator="@+id/tabs" >
 
     <include layout="@layout/all_apps_rv_layout" />
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 5079469f4a..75ab00a7dd 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -585,10 +585,6 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         int padding = mHeader.getMaxTranslation();
         for (int i = 0; i < mAH.length; i++) {
             mAH[i].padding.top = padding;
-            if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && mUsingTabs) {
-                //add extra space between tabs and recycler view
-                mAH[i].padding.top += mLauncher.getDeviceProfile().edgeMarginPx;
-            }
             mAH[i].applyPadding();
         }
     }
diff --git a/src/com/android/launcher3/allapps/AllAppsPagedView.java b/src/com/android/launcher3/allapps/AllAppsPagedView.java
index f640c3e8d0..eae9c0a6b6 100644
--- a/src/com/android/launcher3/allapps/AllAppsPagedView.java
+++ b/src/com/android/launcher3/allapps/AllAppsPagedView.java
@@ -20,6 +20,8 @@ import android.util.AttributeSet;
 import android.view.MotionEvent;
 
 import com.android.launcher3.PagedView;
+import com.android.launcher3.R;
+import com.android.launcher3.config.FeatureFlags;
 
 public class AllAppsPagedView extends PagedView<PersonalWorkSlidingTabStrip> {
 
@@ -37,6 +39,9 @@ public class AllAppsPagedView extends PagedView<PersonalWorkSlidingTabStrip> {
 
     public AllAppsPagedView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
+        int topPadding = FeatureFlags.ENABLE_DEVICE_SEARCH.get() ? 0
+                : context.getResources().getDimensionPixelOffset(
+                        R.dimen.all_apps_header_top_padding);
     }
 
     @Override
diff --git a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
index f2a1f852be..c131697c89 100644
--- a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
+++ b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
@@ -26,6 +26,7 @@ import androidx.core.graphics.ColorUtils;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.launcher3.R;
+import com.android.launcher3.allapps.AllAppsGridAdapter.AppsGridLayoutManager;
 import com.android.launcher3.allapps.search.SearchSectionInfo;
 import com.android.launcher3.util.Themes;
 
@@ -90,7 +91,10 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
         if (mAppsView.getFloatingHeaderView().getFocusedChild() == null
                 && mAppsView.getApps().getFocusedChild() != null) {
             int index = mAppsView.getApps().getFocusedChildIndex();
-            if (index >= 0 && index < parent.getChildCount()) {
+            AppsGridLayoutManager layoutManager = (AppsGridLayoutManager)
+                    mAppsView.getActiveRecyclerView().getLayoutManager();
+            if (layoutManager.findFirstVisibleItemPosition() == index
+                    && index < parent.getChildCount()) {
                 decorationHandler.onFocusDraw(c, parent.getChildAt(index));
             }
         }
diff --git a/src/com/android/launcher3/views/SearchResultPlayItem.java b/src/com/android/launcher3/views/SearchResultPlayItem.java
index d05a29eab9..c7133fd8d8 100644
--- a/src/com/android/launcher3/views/SearchResultPlayItem.java
+++ b/src/com/android/launcher3/views/SearchResultPlayItem.java
@@ -44,12 +44,14 @@ import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
 import com.android.launcher3.allapps.search.AllAppsSearchBarController;
 import com.android.launcher3.icons.BitmapRenderer;
+import com.android.launcher3.util.Themes;
 import com.android.systemui.plugins.AllAppsSearchPlugin;
 import com.android.systemui.plugins.shared.SearchTarget;
 import com.android.systemui.plugins.shared.SearchTargetEvent;
 
 import java.io.IOException;
 import java.net.URL;
+import java.net.URLConnection;
 
 /**
  * A View representing a PlayStore item.
@@ -58,7 +60,6 @@ public class SearchResultPlayItem extends LinearLayout implements
         AllAppsSearchBarController.PayloadResultHandler<Bundle> {
 
     private static final int BITMAP_CROP_MASK_COLOR = 0xff424242;
-    private static final float ICON_RADIUS_FACTOR = .5f;
 
     private final DeviceProfile mDeviceProfile;
     private View mIconView;
@@ -71,6 +72,7 @@ public class SearchResultPlayItem extends LinearLayout implements
     private final Object[] mTargetInfo = createTargetInfo();
 
     final Paint mIconPaint = new Paint();
+    final Rect mTempRect = new Rect();
 
 
     public SearchResultPlayItem(Context context) {
@@ -125,13 +127,15 @@ public class SearchResultPlayItem extends LinearLayout implements
         mIconView.setBackgroundResource(R.drawable.ic_deepshortcut_placeholder);
         UI_HELPER_EXECUTOR.execute(() -> {
             try {
-//                TODO: Handle caching
                 URL url = new URL(bundle.getString("icon_url"));
-                Bitmap bitmap = BitmapFactory.decodeStream(url.openStream());
-                BitmapDrawable bitmapDrawable = new BitmapDrawable(getResources(),
-                        Bitmap.createScaledBitmap(getRoundedBitmap(bitmap),
-                                mDeviceProfile.allAppsIconSizePx, mDeviceProfile.allAppsIconSizePx,
-                                false));
+                URLConnection con = url.openConnection();
+//                TODO: monitor memory and investigate if it's better to use glide
+                con.addRequestProperty("Cache-Control", "max-age: 0");
+                con.setUseCaches(true);
+                Bitmap bitmap = BitmapFactory.decodeStream(con.getInputStream());
+                BitmapDrawable bitmapDrawable = new BitmapDrawable(getResources(), getRoundedBitmap(
+                        Bitmap.createScaledBitmap(bitmap, mDeviceProfile.allAppsIconSizePx,
+                                mDeviceProfile.allAppsIconSizePx, false)));
                 mIconView.post(() -> mIconView.setBackground(bitmapDrawable));
             } catch (IOException e) {
                 e.printStackTrace();
@@ -141,24 +145,23 @@ public class SearchResultPlayItem extends LinearLayout implements
 
 
     private Bitmap getRoundedBitmap(Bitmap bitmap) {
-        int iconSize = bitmap.getWidth();
+        final int iconSize = bitmap.getWidth();
+        final float radius = Themes.getDialogCornerRadius(getContext());
 
         Bitmap output = BitmapRenderer.createHardwareBitmap(iconSize, iconSize, (canvas) -> {
-            final Rect rect = new Rect(0, 0, iconSize, iconSize);
-            final RectF rectF = new RectF(rect);
+            mTempRect.set(0, 0, iconSize, iconSize);
+            final RectF rectF = new RectF(mTempRect);
 
             mIconPaint.setAntiAlias(true);
+            mIconPaint.reset();
             canvas.drawARGB(0, 0, 0, 0);
             mIconPaint.setColor(BITMAP_CROP_MASK_COLOR);
-            int radius = (int) (iconSize * ICON_RADIUS_FACTOR);
             canvas.drawRoundRect(rectF, radius, radius, mIconPaint);
 
             mIconPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
-            canvas.drawBitmap(bitmap, rect, rect, mIconPaint);
+            canvas.drawBitmap(bitmap, mTempRect, mTempRect, mIconPaint);
         });
-
         return output;
-
     }
 
 
-- 
GitLab


From 26c1105fa04c2bcc156051e51df90a6a253349bb Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Tue, 13 Oct 2020 01:12:03 -0700
Subject: [PATCH 0246/1664] [search api part 1] Setup centralized
 SearchEventTracker

- Rename AdapterItemWIthPayload to SearchAdapterItem, PayloadResultHandler to SearchTargetHandler
- Setup SliceViewWrapper for self contained slices

Bug: 170702596
Change-Id: I0baf984ec8123c95011abcc17372f8d055e98ad7
---
 .../allapps/AllAppsContainerView.java         |  21 ++--
 .../launcher3/allapps/AllAppsGridAdapter.java | 119 +++++++-----------
 .../launcher3/allapps/AllAppsPagedView.java   |   9 +-
 .../search/AllAppsSearchBarController.java    |  30 +++--
 .../allapps/search/SearchEventTracker.java    |  91 ++++++++++++++
 .../launcher3/views/HeroSearchResultView.java |  73 ++++++-----
 .../launcher3/views/SearchResultIconRow.java  |  38 ++----
 .../views/SearchResultPeopleView.java         |  55 ++++----
 .../launcher3/views/SearchResultPlayItem.java |  72 +++++------
 .../views/SearchSectionHeaderView.java        |   8 +-
 .../views/SearchSettingsRowView.java          |  21 ++--
 .../launcher3/views/SearchSliceWrapper.java   |  91 ++++++++++++++
 .../views/ThumbnailSearchResultView.java      |  28 ++---
 13 files changed, 393 insertions(+), 263 deletions(-)
 create mode 100644 src/com/android/launcher3/allapps/search/SearchEventTracker.java
 create mode 100644 src/com/android/launcher3/views/SearchSliceWrapper.java

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 75ab00a7dd..5d5e017372 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -16,7 +16,7 @@
 package com.android.launcher3.allapps;
 
 import static com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItem;
-import static com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
+import static com.android.launcher3.allapps.AllAppsGridAdapter.SearchAdapterItem;
 import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_HAS_SHORTCUT_PERMISSION;
 import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_QUIET_MODE_CHANGE_PERMISSION;
 import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_QUIET_MODE_ENABLED;
@@ -57,6 +57,7 @@ import com.android.launcher3.Insettable;
 import com.android.launcher3.InsettableFrameLayout;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.allapps.search.SearchEventTracker;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.keyboard.FocusedItemDecorator;
 import com.android.launcher3.model.data.AppInfo;
@@ -67,9 +68,7 @@ import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.RecyclerViewFastScroller;
 import com.android.launcher3.views.SpringRelativeLayout;
-import com.android.systemui.plugins.shared.SearchTargetEvent;
-
-import java.util.function.IntConsumer;
+import com.android.systemui.plugins.shared.SearchTarget;
 
 /**
  * The all apps view container.
@@ -546,13 +545,9 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
             return mLauncher.startActivitySafely(v, headerItem.getIntent(), headerItem);
         }
         AdapterItem focusedItem = getActiveRecyclerView().getApps().getFocusedChild();
-        if (focusedItem instanceof AdapterItemWithPayload) {
-            IntConsumer onSelection =
-                    ((AdapterItemWithPayload) focusedItem).getSelectionHandler();
-            if (onSelection != null) {
-                onSelection.accept(SearchTargetEvent.QUICK_SELECT);
-                return true;
-            }
+        if (focusedItem instanceof SearchAdapterItem) {
+            SearchTarget searchTarget = ((SearchAdapterItem) focusedItem).getSearchTarget();
+            SearchEventTracker.INSTANCE.get(getContext()).quickSelect(searchTarget);
         }
         if (focusedItem.appInfo != null) {
             ItemInfo itemInfo = focusedItem.appInfo;
@@ -585,6 +580,10 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         int padding = mHeader.getMaxTranslation();
         for (int i = 0; i < mAH.length; i++) {
             mAH[i].padding.top = padding;
+            if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && mUsingTabs) {
+                //add extra space between tabs and recycler view
+                mAH[i].padding.top += mLauncher.getDeviceProfile().edgeMarginPx;
+            }
             mAH[i].applyPadding();
         }
     }
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index 8bc8e53af3..603e9df16c 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -20,8 +20,6 @@ import static com.android.launcher3.touch.ItemLongClickListener.INSTANCE_ALL_APP
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
-import android.net.Uri;
-import android.os.Bundle;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -37,29 +35,25 @@ import androidx.annotation.Nullable;
 import androidx.core.view.accessibility.AccessibilityEventCompat;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
 import androidx.core.view.accessibility.AccessibilityRecordCompat;
-import androidx.lifecycle.LiveData;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.slice.Slice;
-import androidx.slice.widget.SliceLiveData;
 import androidx.slice.widget.SliceView;
 
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.BubbleTextView;
-import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
-import com.android.launcher3.allapps.search.AllAppsSearchBarController.PayloadResultHandler;
+import com.android.launcher3.allapps.search.AllAppsSearchBarController.SearchTargetHandler;
+import com.android.launcher3.allapps.search.SearchEventTracker;
 import com.android.launcher3.allapps.search.SearchSectionInfo;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.launcher3.views.HeroSearchResultView;
-import com.android.systemui.plugins.AllAppsSearchPlugin;
+import com.android.launcher3.views.SearchSliceWrapper;
 import com.android.systemui.plugins.shared.SearchTarget;
 import com.android.systemui.plugins.shared.SearchTargetEvent;
 
 import java.util.List;
-import java.util.function.IntConsumer;
 
 /**
  * The grid view adapter of all the apps.
@@ -201,28 +195,13 @@ public class AllAppsGridAdapter extends
      *
      * @param <T> Play load Type
      */
-    public static class AdapterItemWithPayload<T> extends AdapterItem {
-        private T mPayload;
+    public static class SearchAdapterItem extends AdapterItem {
+        private SearchTarget mSearchTarget;
         private String mSearchSessionId;
-        private AllAppsSearchPlugin mPlugin;
-        private IntConsumer mSelectionHandler;
 
-        public AllAppsSearchPlugin getPlugin() {
-            return mPlugin;
-        }
-
-        public void setPlugin(AllAppsSearchPlugin plugin) {
-            mPlugin = plugin;
-        }
-
-        public AdapterItemWithPayload(T payload, int type, AllAppsSearchPlugin plugin) {
-            mPayload = payload;
+        public SearchAdapterItem(SearchTarget searchTarget, int type) {
+            mSearchTarget = searchTarget;
             viewType = type;
-            mPlugin = plugin;
-        }
-
-        public void setSelectionHandler(IntConsumer runnable) {
-            mSelectionHandler = runnable;
         }
 
         public void setSearchSessionId(String searchSessionId) {
@@ -233,15 +212,9 @@ public class AllAppsGridAdapter extends
             return mSearchSessionId;
         }
 
-        public IntConsumer getSelectionHandler() {
-            return mSelectionHandler;
-        }
-
-        public T getPayload() {
-            return mPayload;
+        public SearchTarget getSearchTarget() {
+            return mSearchTarget;
         }
-
-
     }
 
     /**
@@ -492,26 +465,35 @@ public class AllAppsGridAdapter extends
                 }
                 //TODO: replace with custom TopHitBubbleTextView with support for both shortcut
                 // and apps
-                if (adapterItem instanceof AdapterItemWithPayload) {
-                    AdapterItemWithPayload item = (AdapterItemWithPayload) adapterItem;
-                    item.setSelectionHandler(type -> {
-                        SearchTargetEvent e = new SearchTargetEvent(SearchTarget.ItemType.APP,
-                                type, item.position, item.getSearchSessionId());
-                        e.bundle = HeroSearchResultView.getAppBundle(info);
-                        if (item.getPlugin() != null) {
-                            item.getPlugin().notifySearchTargetEvent(e);
+                if (adapterItem instanceof SearchAdapterItem) {
+                    SearchAdapterItem item = (SearchAdapterItem) adapterItem;
+                    SearchTargetHandler searchTargetHandler = new SearchTargetHandler() {
+                        @Override
+                        public void applySearchTarget(SearchTarget searchTarget) {
+                            // Does nothing
                         }
-                    });
+
+                        @Override
+                        public void handleSelection(int type) {
+                            SearchTargetEvent e = new SearchTargetEvent(SearchTarget.ItemType.APP,
+                                    type, item.position, item.getSearchSessionId());
+                            e.bundle = HeroSearchResultView.getAppBundle(info);
+                            SearchEventTracker.INSTANCE.get(mLauncher).notifySearchTargetEvent(e);
+                        }
+                    };
+                    SearchEventTracker.INSTANCE.get(mLauncher).registerWeakHandler(
+                            ((SearchAdapterItem) adapterItem).getSearchTarget(),
+                            searchTargetHandler);
+
                     icon.setOnClickListener(view -> {
-                        item.getSelectionHandler().accept(SearchTargetEvent.SELECT);
+                        searchTargetHandler.handleSelection(SearchTargetEvent.SELECT);
                         mOnIconClickListener.onClick(view);
                     });
                     icon.setOnLongClickListener(view -> {
-                        item.getSelectionHandler().accept(SearchTargetEvent.SELECT);
+                        searchTargetHandler.handleSelection(SearchTargetEvent.LONG_PRESS);
                         return mOnIconLongClickListener.onLongClick(view);
                     });
-                }
-                else {
+                } else {
                     icon.setOnClickListener(mOnIconClickListener);
                     icon.setOnLongClickListener(mOnIconLongClickListener);
                 }
@@ -532,26 +514,12 @@ public class AllAppsGridAdapter extends
                 break;
             case VIEW_TYPE_SEARCH_SLICE:
                 SliceView sliceView = (SliceView) holder.itemView;
-                AdapterItemWithPayload<Uri> slicePayload =
-                        (AdapterItemWithPayload<Uri>) mApps.getAdapterItems().get(position);
-                sliceView.setOnSliceActionListener((info1, s) -> {
-                    if (slicePayload.getPlugin() != null) {
-                        SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
-                                SearchTarget.ItemType.SETTINGS_SLICE,
-                                SearchTargetEvent.CHILD_SELECT, slicePayload.position,
-                                slicePayload.getSearchSessionId());
-                        searchTargetEvent.bundle = new Bundle();
-                        searchTargetEvent.bundle.putParcelable("uri", slicePayload.getPayload());
-                        slicePayload.getPlugin().notifySearchTargetEvent(searchTargetEvent);
-                    }
-                });
-                try {
-                    LiveData<Slice> liveData = SliceLiveData.fromUri(mLauncher,
-                            slicePayload.getPayload());
-                    liveData.observe((Launcher) mLauncher, sliceView);
-                    sliceView.setTag(liveData);
-                } catch (Exception ignored) {
-                }
+                SearchAdapterItem slicePayload = (SearchAdapterItem) mApps.getAdapterItems().get(
+                        position);
+                SearchTarget searchTarget = slicePayload.getSearchTarget();
+                sliceView.setTag(new SearchSliceWrapper(mLauncher, sliceView, searchTarget,
+                        slicePayload.getSearchSessionId(), slicePayload.position));
+
                 break;
             case VIEW_TYPE_SEARCH_CORPUS_TITLE:
             case VIEW_TYPE_SEARCH_ROW_WITH_BUTTON:
@@ -561,9 +529,9 @@ public class AllAppsGridAdapter extends
             case VIEW_TYPE_SEARCH_PEOPLE:
             case VIEW_TYPE_SEARCH_THUMBNAIL:
             case VIEW_TYPE_SEARCH_SUGGEST:
-                AdapterItemWithPayload item =
-                        (AdapterItemWithPayload) mApps.getAdapterItems().get(position);
-                PayloadResultHandler payloadResultView = (PayloadResultHandler) holder.itemView;
+                SearchAdapterItem item =
+                        (SearchAdapterItem) mApps.getAdapterItems().get(position);
+                SearchTargetHandler payloadResultView = (SearchTargetHandler) holder.itemView;
                 payloadResultView.setup(item);
                 break;
             case VIEW_TYPE_ALL_APPS_DIVIDER:
@@ -582,11 +550,10 @@ public class AllAppsGridAdapter extends
             icon.setOnLongClickListener(null);
         } else if (holder.itemView instanceof SliceView) {
             SliceView sliceView = (SliceView) holder.itemView;
-            sliceView.setOnSliceActionListener(null);
-            if (sliceView.getTag() instanceof LiveData) {
-                LiveData sliceLiveData = (LiveData) sliceView.getTag();
-                sliceLiveData.removeObservers((Launcher) mLauncher);
+            if (sliceView.getTag() instanceof SearchSliceWrapper) {
+                ((SearchSliceWrapper) sliceView.getTag()).destroy();
             }
+            sliceView.setTag(null);
         }
     }
 
diff --git a/src/com/android/launcher3/allapps/AllAppsPagedView.java b/src/com/android/launcher3/allapps/AllAppsPagedView.java
index eae9c0a6b6..e2550f597a 100644
--- a/src/com/android/launcher3/allapps/AllAppsPagedView.java
+++ b/src/com/android/launcher3/allapps/AllAppsPagedView.java
@@ -25,11 +25,11 @@ import com.android.launcher3.config.FeatureFlags;
 
 public class AllAppsPagedView extends PagedView<PersonalWorkSlidingTabStrip> {
 
-  final static float START_DAMPING_TOUCH_SLOP_ANGLE = (float) Math.PI / 6;
-  final static float MAX_SWIPE_ANGLE = (float) Math.PI / 3;
-  final static float TOUCH_SLOP_DAMPING_FACTOR = 4;
+    static final float START_DAMPING_TOUCH_SLOP_ANGLE = (float) Math.PI / 6;
+    static final float MAX_SWIPE_ANGLE = (float) Math.PI / 3;
+    static final float TOUCH_SLOP_DAMPING_FACTOR = 4;
 
-  public AllAppsPagedView(Context context) {
+    public AllAppsPagedView(Context context) {
         this(context, null);
     }
 
@@ -42,6 +42,7 @@ public class AllAppsPagedView extends PagedView<PersonalWorkSlidingTabStrip> {
         int topPadding = FeatureFlags.ENABLE_DEVICE_SEARCH.get() ? 0
                 : context.getResources().getDimensionPixelOffset(
                         R.dimen.all_apps_header_top_padding);
+        setPadding(0, topPadding, 0, 0);
     }
 
     @Override
diff --git a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
index 82c4db4da3..6ba0421d57 100644
--- a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
+++ b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
@@ -31,7 +31,7 @@ import com.android.launcher3.ExtendedEditText;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.allapps.AllAppsGridAdapter;
-import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
+import com.android.launcher3.allapps.AllAppsGridAdapter.SearchAdapterItem;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.systemui.plugins.AllAppsSearchPlugin;
@@ -211,26 +211,31 @@ public class AllAppsSearchBarController
      *
      * @param <T> Type of payload
      */
-    public interface PayloadResultHandler<T> {
+    public interface SearchTargetHandler {
         /**
          * Updates View using Adapter's payload
          */
 
-        default void setup(AdapterItemWithPayload<T> adapterItemWithPayload) {
+        default void setup(SearchAdapterItem searchAdapterItem) {
             Object[] targetInfo = getTargetInfo();
             if (targetInfo != null) {
-                targetInfo[0] = adapterItemWithPayload.getSearchSessionId();
-                targetInfo[1] = adapterItemWithPayload.position;
+                targetInfo[0] = searchAdapterItem.getSearchSessionId();
+                targetInfo[1] = searchAdapterItem.position;
             }
-            applyAdapterInfo(adapterItemWithPayload);
+            applySearchTarget(searchAdapterItem.getSearchTarget());
         }
 
-        void applyAdapterInfo(AdapterItemWithPayload<T> adapterItemWithPayload);
+        /**
+         * Update view using values from {@link SearchTarget}
+         */
+        void applySearchTarget(SearchTarget searchTarget);
 
         /**
-         * Gets object created by {@link PayloadResultHandler#createTargetInfo()}
+         * Gets object created by {@link SearchTargetHandler#createTargetInfo()}
          */
-        Object[] getTargetInfo();
+        default Object[] getTargetInfo() {
+            return null;
+        }
 
         /**
          * Creates a wrapper object to hold searchSessionId and item position
@@ -252,6 +257,13 @@ public class AllAppsSearchBarController
             return new SearchTargetEvent(itemType, eventType,
                     position, searchSessionId);
         }
+
+        /**
+         * Handles selection of SearchTarget
+         */
+        default void handleSelection(int eventType) {
+        }
+
     }
 
 
diff --git a/src/com/android/launcher3/allapps/search/SearchEventTracker.java b/src/com/android/launcher3/allapps/search/SearchEventTracker.java
new file mode 100644
index 0000000000..6bcde6c53b
--- /dev/null
+++ b/src/com/android/launcher3/allapps/search/SearchEventTracker.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.allapps.search;
+
+import android.content.Context;
+
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.allapps.search.AllAppsSearchBarController.SearchTargetHandler;
+import com.android.launcher3.util.MainThreadInitializedObject;
+import com.android.systemui.plugins.AllAppsSearchPlugin;
+import com.android.systemui.plugins.shared.SearchTarget;
+import com.android.systemui.plugins.shared.SearchTargetEvent;
+
+import java.util.WeakHashMap;
+
+/**
+ * A singleton class to track and report search events to search provider
+ */
+public class SearchEventTracker {
+    @Nullable
+    private AllAppsSearchPlugin mPlugin;
+    private final WeakHashMap<SearchTarget, SearchTargetHandler>
+            mCallbacks = new WeakHashMap<>();
+
+    public static final MainThreadInitializedObject<SearchEventTracker> INSTANCE =
+            new MainThreadInitializedObject<>(SearchEventTracker::new);
+
+    private SearchEventTracker(Context context) {
+    }
+
+    /**
+     * Returns instance of SearchEventTracker
+     */
+    public static SearchEventTracker getInstance(Context context) {
+        return SearchEventTracker.INSTANCE.get(context);
+    }
+
+    /**
+     * Sets current connected plugin for event reporting
+     */
+    public void setPlugin(@Nullable AllAppsSearchPlugin plugin) {
+        mPlugin = plugin;
+    }
+
+    /**
+     * Sends SearchTargetEvent to search provider
+     */
+    public void notifySearchTargetEvent(SearchTargetEvent searchTargetEvent) {
+        if (mPlugin != null) {
+            mPlugin.notifySearchTargetEvent(searchTargetEvent);
+        }
+    }
+
+    /**
+     * Registers a {@link SearchTargetHandler} to handle quick launch for specified SearchTarget.
+     */
+    public void registerWeakHandler(SearchTarget searchTarget, SearchTargetHandler targetHandler) {
+        mCallbacks.put(searchTarget, targetHandler);
+    }
+
+    /**
+     * Handles quick select for SearchTarget
+     */
+    public void quickSelect(SearchTarget searchTarget) {
+        SearchTargetHandler searchTargetHandler = mCallbacks.get(searchTarget);
+        if (searchTargetHandler != null) {
+            searchTargetHandler.handleSelection(SearchTargetEvent.QUICK_SELECT);
+        }
+    }
+
+    /**
+     * flushes all registered quick select handlers
+     */
+    public void clearHandlers() {
+        mCallbacks.clear();
+    }
+}
diff --git a/src/com/android/launcher3/views/HeroSearchResultView.java b/src/com/android/launcher3/views/HeroSearchResultView.java
index 91337ba824..9e56e00d60 100644
--- a/src/com/android/launcher3/views/HeroSearchResultView.java
+++ b/src/com/android/launcher3/views/HeroSearchResultView.java
@@ -19,11 +19,13 @@ import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APP
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ShortcutInfo;
 import android.graphics.Point;
 import android.os.Bundle;
+import android.os.UserHandle;
 import android.util.AttributeSet;
 import android.util.Pair;
 import android.view.View;
@@ -37,8 +39,9 @@ import com.android.launcher3.DropTarget;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
-import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
-import com.android.launcher3.allapps.search.AllAppsSearchBarController.PayloadResultHandler;
+import com.android.launcher3.allapps.AllAppsStore;
+import com.android.launcher3.allapps.search.AllAppsSearchBarController.SearchTargetHandler;
+import com.android.launcher3.allapps.search.SearchEventTracker;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.dragndrop.DraggableView;
 import com.android.launcher3.graphics.DragPreviewProvider;
@@ -48,24 +51,25 @@ import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.shortcuts.ShortcutDragPreviewProvider;
 import com.android.launcher3.touch.ItemLongClickListener;
-import com.android.systemui.plugins.AllAppsSearchPlugin;
+import com.android.launcher3.util.ComponentKey;
 import com.android.systemui.plugins.shared.SearchTarget;
 import com.android.systemui.plugins.shared.SearchTargetEvent;
 
-import java.util.List;
+import java.util.ArrayList;
 
 /**
  * A view representing a high confidence app search result that includes shortcuts
  */
-public class HeroSearchResultView extends LinearLayout implements DragSource,
-        PayloadResultHandler<List<Pair<ShortcutInfo, ItemInfoWithIcon>>> {
+public class HeroSearchResultView extends LinearLayout implements DragSource, SearchTargetHandler {
 
     public static final int MAX_SHORTCUTS_COUNT = 2;
+    public static final String SHORTCUTS_KEY = "shortcut_infos";
+
+
     private final Object[] mTargetInfo = createTargetInfo();
     BubbleTextView mBubbleTextView;
     View mIconView;
     BubbleTextView[] mDeepShortcutTextViews = new BubbleTextView[2];
-    AllAppsSearchPlugin mPlugin;
 
     public HeroSearchResultView(Context context) {
         super(context);
@@ -111,30 +115,35 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
                         SearchTargetEvent.CHILD_SELECT);
                 event.bundle = getAppBundle(itemInfo);
                 event.bundle.putString("shortcut_id", itemInfo.getDeepShortcutId());
-                if (mPlugin != null) {
-                    mPlugin.notifySearchTargetEvent(event);
-                }
                 launcher.getItemOnClickListener().onClick(view);
             });
         }
     }
 
-    /**
-     * Apply {@link ItemInfo} for appIcon and shortcut Icons
-     */
     @Override
-    public void applyAdapterInfo(
-            AdapterItemWithPayload<List<Pair<ShortcutInfo, ItemInfoWithIcon>>> adapterItem) {
-        mBubbleTextView.applyFromApplicationInfo(adapterItem.appInfo);
+    public void applySearchTarget(SearchTarget searchTarget) {
+        AppInfo appInfo = getAppInfo(searchTarget.bundle);
+//        TODO: replace this with searchTarget.shortcuts
+        ArrayList<ShortcutInfo> infos = searchTarget.bundle.getParcelableArrayList(
+                SHORTCUTS_KEY);
+
+        ArrayList<Pair<ShortcutInfo, ItemInfoWithIcon>> shortcuts = new ArrayList<>();
+        for (int i = 0; infos != null && i < infos.size() && i < MAX_SHORTCUTS_COUNT; i++) {
+            ShortcutInfo shortcutInfo = infos.get(i);
+            ItemInfoWithIcon si = new WorkspaceItemInfo(shortcutInfo, getContext());
+            shortcuts.add(new Pair<>(shortcutInfo, si));
+        }
+
+
+        mBubbleTextView.applyFromApplicationInfo(appInfo);
         mIconView.setBackground(mBubbleTextView.getIcon());
-        mIconView.setTag(adapterItem.appInfo);
-        List<Pair<ShortcutInfo, ItemInfoWithIcon>> shortcutDetails = adapterItem.getPayload();
+        mIconView.setTag(appInfo);
         LauncherAppState appState = LauncherAppState.getInstance(getContext());
         for (int i = 0; i < mDeepShortcutTextViews.length; i++) {
             BubbleTextView shortcutView = mDeepShortcutTextViews[i];
-            mDeepShortcutTextViews[i].setVisibility(shortcutDetails.size() > i ? VISIBLE : GONE);
-            if (i < shortcutDetails.size()) {
-                Pair<ShortcutInfo, ItemInfoWithIcon> p = shortcutDetails.get(i);
+            mDeepShortcutTextViews[i].setVisibility(shortcuts.size() > i ? VISIBLE : GONE);
+            if (i < shortcuts.size()) {
+                Pair<ShortcutInfo, ItemInfoWithIcon> p = shortcuts.get(i);
                 //apply ItemInfo and prepare view
                 shortcutView.applyFromWorkspaceItem((WorkspaceItemInfo) p.second);
                 MODEL_EXECUTOR.execute(() -> {
@@ -144,8 +153,14 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
                 });
             }
         }
-        mPlugin = adapterItem.getPlugin();
-        adapterItem.setSelectionHandler(this::handleSelection);
+        SearchEventTracker.INSTANCE.get(getContext()).registerWeakHandler(searchTarget, this);
+    }
+
+    private AppInfo getAppInfo(Bundle bundle) {
+        AllAppsStore apps = Launcher.getLauncher(getContext()).getAppsView().getAppsStore();
+        ComponentName cn = bundle.getParcelable("component_name");
+        UserHandle userHandle = bundle.getParcelable("user_handle");
+        return (cn != null) ? apps.getApp(new ComponentKey(cn, userHandle)) : null;
     }
 
     @Override
@@ -191,15 +206,13 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
             SearchTargetEvent event = mContainer.getSearchTargetEvent(
                     SearchTarget.ItemType.APP_HERO, SearchTargetEvent.LONG_PRESS);
             event.bundle = getAppBundle(itemInfo);
-            if (mContainer.mPlugin != null) {
-                mContainer.mPlugin.notifySearchTargetEvent(event);
-            }
-
+            SearchEventTracker.INSTANCE.get(mLauncher).notifySearchTargetEvent(event);
             return false;
         }
     }
 
-    private void handleSelection(int eventType) {
+    @Override
+    public void handleSelection(int eventType) {
         ItemInfo itemInfo = (ItemInfo) mBubbleTextView.getTag();
         if (itemInfo == null) return;
         Launcher launcher = Launcher.getLauncher(getContext());
@@ -208,9 +221,7 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
         SearchTargetEvent event = getSearchTargetEvent(
                 SearchTarget.ItemType.APP_HERO, eventType);
         event.bundle = getAppBundle(itemInfo);
-        if (mPlugin != null) {
-            mPlugin.notifySearchTargetEvent(event);
-        }
+        SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(event);
     }
 
     /**
diff --git a/src/com/android/launcher3/views/SearchResultIconRow.java b/src/com/android/launcher3/views/SearchResultIconRow.java
index 6d9c86a9a7..ddeefaff3a 100644
--- a/src/com/android/launcher3/views/SearchResultIconRow.java
+++ b/src/com/android/launcher3/views/SearchResultIconRow.java
@@ -35,8 +35,8 @@ import androidx.annotation.Nullable;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
-import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
 import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+import com.android.launcher3.allapps.search.SearchEventTracker;
 import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.model.data.ItemInfo;
@@ -44,7 +44,6 @@ import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.RemoteActionItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.touch.ItemClickHandler;
-import com.android.systemui.plugins.AllAppsSearchPlugin;
 import com.android.systemui.plugins.shared.SearchTarget;
 import com.android.systemui.plugins.shared.SearchTarget.ItemType;
 import com.android.systemui.plugins.shared.SearchTargetEvent;
@@ -53,15 +52,13 @@ import com.android.systemui.plugins.shared.SearchTargetEvent;
  * A view representing a stand alone shortcut search result
  */
 public class SearchResultIconRow extends DoubleShadowBubbleTextView implements
-        AllAppsSearchBarController.PayloadResultHandler<SearchTarget> {
+        AllAppsSearchBarController.SearchTargetHandler {
 
     private final Object[] mTargetInfo = createTargetInfo();
     private final int mCustomIconResId;
     private final boolean mMatchesInset;
 
     private ShortcutInfo mShortcutInfo;
-    private AllAppsSearchPlugin mPlugin;
-    private AdapterItemWithPayload<SearchTarget> mAdapterItem;
 
 
     public SearchResultIconRow(@NonNull Context context) {
@@ -100,26 +97,18 @@ public class SearchResultIconRow extends DoubleShadowBubbleTextView implements
         }
     }
 
-
     @Override
-    public void applyAdapterInfo(AdapterItemWithPayload<SearchTarget> adapterItemWithPayload) {
-        if (mAdapterItem != null) {
-            mAdapterItem.setSelectionHandler(null);
-        }
-        mAdapterItem = adapterItemWithPayload;
-        SearchTarget payload = adapterItemWithPayload.getPayload();
-        mPlugin = adapterItemWithPayload.getPlugin();
-
-        if (payload.mRemoteAction != null) {
-            prepareUsingRemoteAction(payload.mRemoteAction,
-                    payload.bundle.getString(SearchTarget.REMOTE_ACTION_TOKEN),
-                    payload.bundle.getBoolean(SearchTarget.REMOTE_ACTION_SHOULD_START),
-                    payload.type == ItemType.ACTION);
+    public void applySearchTarget(SearchTarget searchTarget) {
+        if (searchTarget.mRemoteAction != null) {
+            prepareUsingRemoteAction(searchTarget.mRemoteAction,
+                    searchTarget.bundle.getString(SearchTarget.REMOTE_ACTION_TOKEN),
+                    searchTarget.bundle.getBoolean(SearchTarget.REMOTE_ACTION_SHOULD_START),
+                    searchTarget.type == ItemType.ACTION);
         } else {
-            prepareUsingShortcutInfo(payload.shortcuts.get(0));
+            prepareUsingShortcutInfo(searchTarget.shortcuts.get(0));
         }
         setOnClickListener(v -> handleSelection(SearchTargetEvent.SELECT));
-        adapterItemWithPayload.setSelectionHandler(this::handleSelection);
+        SearchEventTracker.INSTANCE.get(getContext()).registerWeakHandler(searchTarget, this);
     }
 
     private void prepareUsingShortcutInfo(ShortcutInfo shortcutInfo) {
@@ -179,7 +168,8 @@ public class SearchResultIconRow extends DoubleShadowBubbleTextView implements
         return mTargetInfo;
     }
 
-    private void handleSelection(int eventType) {
+    @Override
+    public void handleSelection(int eventType) {
         ItemInfo itemInfo = (ItemInfo) getTag();
         Launcher launcher = Launcher.getLauncher(getContext());
         final SearchTargetEvent searchTargetEvent;
@@ -200,8 +190,6 @@ public class SearchResultIconRow extends DoubleShadowBubbleTextView implements
             searchTargetEvent.bundle.putString(SearchTarget.REMOTE_ACTION_TOKEN,
                     remoteItemInfo.getToken());
         }
-        if (mPlugin != null) {
-            mPlugin.notifySearchTargetEvent(searchTargetEvent);
-        }
+        SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(searchTargetEvent);
     }
 }
diff --git a/src/com/android/launcher3/views/SearchResultPeopleView.java b/src/com/android/launcher3/views/SearchResultPeopleView.java
index f20b08016f..18bc99a3f9 100644
--- a/src/com/android/launcher3/views/SearchResultPeopleView.java
+++ b/src/com/android/launcher3/views/SearchResultPeopleView.java
@@ -42,11 +42,10 @@ import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
-import com.android.launcher3.allapps.AllAppsGridAdapter;
 import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+import com.android.launcher3.allapps.search.SearchEventTracker;
 import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.LauncherIcons;
-import com.android.systemui.plugins.AllAppsSearchPlugin;
 import com.android.systemui.plugins.shared.SearchTarget;
 import com.android.systemui.plugins.shared.SearchTargetEvent;
 
@@ -56,7 +55,7 @@ import java.util.ArrayList;
  * A view representing a single people search result in all apps
  */
 public class SearchResultPeopleView extends LinearLayout implements
-        AllAppsSearchBarController.PayloadResultHandler<Bundle> {
+        AllAppsSearchBarController.SearchTargetHandler {
 
     private final int mIconSize;
     private final int mButtonSize;
@@ -64,7 +63,6 @@ public class SearchResultPeopleView extends LinearLayout implements
     private View mIconView;
     private TextView mTitleView;
     private ImageButton[] mProviderButtons = new ImageButton[3];
-    private AllAppsSearchPlugin mPlugin;
     private Intent mIntent;
     private final Object[] mTargetInfo = createTargetInfo();
 
@@ -103,10 +101,8 @@ public class SearchResultPeopleView extends LinearLayout implements
     }
 
     @Override
-    public void applyAdapterInfo(
-            AllAppsGridAdapter.AdapterItemWithPayload<Bundle> adapterItemWithPayload) {
-        Bundle payload = adapterItemWithPayload.getPayload();
-        mPlugin = adapterItemWithPayload.getPlugin();
+    public void applySearchTarget(SearchTarget searchTarget) {
+        Bundle payload = searchTarget.bundle;
         mTitleView.setText(payload.getString("title"));
         mIntent = payload.getParcelable("intent");
         Bitmap contactIcon = payload.getParcelable("icon");
@@ -125,7 +121,7 @@ public class SearchResultPeopleView extends LinearLayout implements
             if (providers != null && i < providers.size()) {
                 Bundle provider = providers.get(i);
                 Intent intent = provider.getParcelable("intent");
-                setupProviderButton(button, provider, intent, adapterItemWithPayload);
+                setupProviderButton(button, provider, intent);
                 UI_HELPER_EXECUTOR.post(() -> {
                     String pkg = provider.getString("package_name");
                     Drawable appIcon = getAppIcon(pkg);
@@ -138,13 +134,13 @@ public class SearchResultPeopleView extends LinearLayout implements
                 button.setVisibility(GONE);
             }
         }
-        adapterItemWithPayload.setSelectionHandler(this::handleSelection);
+        SearchEventTracker.INSTANCE.get(getContext()).registerWeakHandler(searchTarget, this);
     }
 
     /**
-     *  Normalizes the bitmap to look like rounded App Icon
-     *  TODO(b/170234747) to support styling, generate adaptive icon drawable and generate
-     *  bitmap from it.
+     * Normalizes the bitmap to look like rounded App Icon
+     * TODO(b/170234747) to support styling, generate adaptive icon drawable and generate
+     * bitmap from it.
      */
     private Bitmap roundBitmap(Bitmap icon) {
         final RoundedBitmapDrawable d = RoundedBitmapDrawableFactory.create(getResources(), icon);
@@ -185,37 +181,32 @@ public class SearchResultPeopleView extends LinearLayout implements
         return mTargetInfo;
     }
 
-    private void setupProviderButton(ImageButton button, Bundle provider, Intent intent,
-            AllAppsGridAdapter.AdapterItem adapterItem) {
+    private void setupProviderButton(ImageButton button, Bundle provider, Intent intent) {
         Launcher launcher = Launcher.getLauncher(getContext());
         button.setOnClickListener(b -> {
             launcher.startActivitySafely(b, intent, null);
-            SearchTargetEvent searchTargetEvent = getSearchTargetEvent(
+            SearchTargetEvent event = getSearchTargetEvent(
                     SearchTarget.ItemType.PEOPLE,
                     SearchTargetEvent.CHILD_SELECT);
-            searchTargetEvent.bundle = new Bundle();
-            searchTargetEvent.bundle.putParcelable("intent", intent);
-            searchTargetEvent.bundle.putString("title", mTitleView.getText().toString());
-            searchTargetEvent.bundle.putBundle("provider", provider);
-            if (mPlugin != null) {
-                mPlugin.notifySearchTargetEvent(searchTargetEvent);
-            }
+            event.bundle = new Bundle();
+            event.bundle.putParcelable("intent", intent);
+            event.bundle.putString("title", mTitleView.getText().toString());
+            event.bundle.putBundle("provider", provider);
+            SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(event);
         });
     }
 
-
-    private void handleSelection(int eventType) {
+    @Override
+    public void handleSelection(int eventType) {
         if (mIntent != null) {
             Launcher launcher = Launcher.getLauncher(getContext());
             launcher.startActivitySafely(this, mIntent, null);
-            SearchTargetEvent searchTargetEvent = getSearchTargetEvent(SearchTarget.ItemType.PEOPLE,
+            SearchTargetEvent event = getSearchTargetEvent(SearchTarget.ItemType.PEOPLE,
                     eventType);
-            searchTargetEvent.bundle = new Bundle();
-            searchTargetEvent.bundle.putParcelable("intent", mIntent);
-            searchTargetEvent.bundle.putString("title", mTitleView.getText().toString());
-            if (mPlugin != null) {
-                mPlugin.notifySearchTargetEvent(searchTargetEvent);
-            }
+            event.bundle = new Bundle();
+            event.bundle.putParcelable("intent", mIntent);
+            event.bundle.putString("title", mTitleView.getText().toString());
+            SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(event);
         }
     }
 }
diff --git a/src/com/android/launcher3/views/SearchResultPlayItem.java b/src/com/android/launcher3/views/SearchResultPlayItem.java
index c7133fd8d8..39a83045e4 100644
--- a/src/com/android/launcher3/views/SearchResultPlayItem.java
+++ b/src/com/android/launcher3/views/SearchResultPlayItem.java
@@ -41,11 +41,10 @@ import androidx.annotation.Nullable;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
-import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
 import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+import com.android.launcher3.allapps.search.SearchEventTracker;
 import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.util.Themes;
-import com.android.systemui.plugins.AllAppsSearchPlugin;
 import com.android.systemui.plugins.shared.SearchTarget;
 import com.android.systemui.plugins.shared.SearchTargetEvent;
 
@@ -57,22 +56,19 @@ import java.net.URLConnection;
  * A View representing a PlayStore item.
  */
 public class SearchResultPlayItem extends LinearLayout implements
-        AllAppsSearchBarController.PayloadResultHandler<Bundle> {
+        AllAppsSearchBarController.SearchTargetHandler {
 
     private static final int BITMAP_CROP_MASK_COLOR = 0xff424242;
-
+    final Paint mIconPaint = new Paint();
+    final Rect mTempRect = new Rect();
     private final DeviceProfile mDeviceProfile;
+    private final Object[] mTargetInfo = createTargetInfo();
     private View mIconView;
     private TextView mTitleView;
     private TextView[] mDetailViews = new TextView[3];
     private Button mPreviewButton;
     private String mPackageName;
     private boolean mIsInstantGame;
-    private AllAppsSearchPlugin mPlugin;
-    private final Object[] mTargetInfo = createTargetInfo();
-
-    final Paint mIconPaint = new Paint();
-    final Rect mTempRect = new Rect();
 
 
     public SearchResultPlayItem(Context context) {
@@ -108,11 +104,32 @@ public class SearchResultPlayItem extends LinearLayout implements
 
     }
 
+
+    private Bitmap getRoundedBitmap(Bitmap bitmap) {
+        final int iconSize = bitmap.getWidth();
+        final float radius = Themes.getDialogCornerRadius(getContext());
+
+        Bitmap output = BitmapRenderer.createHardwareBitmap(iconSize, iconSize, (canvas) -> {
+            mTempRect.set(0, 0, iconSize, iconSize);
+            final RectF rectF = new RectF(mTempRect);
+
+            mIconPaint.setAntiAlias(true);
+            mIconPaint.reset();
+            canvas.drawARGB(0, 0, 0, 0);
+            mIconPaint.setColor(BITMAP_CROP_MASK_COLOR);
+            canvas.drawRoundRect(rectF, radius, radius, mIconPaint);
+
+            mIconPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
+            canvas.drawBitmap(bitmap, mTempRect, mTempRect, mIconPaint);
+        });
+        return output;
+    }
+
+
     @Override
-    public void applyAdapterInfo(AdapterItemWithPayload<Bundle> adapterItemWithPayload) {
-        Bundle bundle = adapterItemWithPayload.getPayload();
-        mPlugin = adapterItemWithPayload.getPlugin();
-        adapterItemWithPayload.setSelectionHandler(this::handleSelection);
+    public void applySearchTarget(SearchTarget searchTarget) {
+        Bundle bundle = searchTarget.bundle;
+        SearchEventTracker.INSTANCE.get(getContext()).registerWeakHandler(searchTarget, this);
         if (bundle.getString("package", "").equals(mPackageName)) {
             return;
         }
@@ -143,28 +160,6 @@ public class SearchResultPlayItem extends LinearLayout implements
         });
     }
 
-
-    private Bitmap getRoundedBitmap(Bitmap bitmap) {
-        final int iconSize = bitmap.getWidth();
-        final float radius = Themes.getDialogCornerRadius(getContext());
-
-        Bitmap output = BitmapRenderer.createHardwareBitmap(iconSize, iconSize, (canvas) -> {
-            mTempRect.set(0, 0, iconSize, iconSize);
-            final RectF rectF = new RectF(mTempRect);
-
-            mIconPaint.setAntiAlias(true);
-            mIconPaint.reset();
-            canvas.drawARGB(0, 0, 0, 0);
-            mIconPaint.setColor(BITMAP_CROP_MASK_COLOR);
-            canvas.drawRoundRect(rectF, radius, radius, mIconPaint);
-
-            mIconPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
-            canvas.drawBitmap(bitmap, mTempRect, mTempRect, mIconPaint);
-        });
-        return output;
-    }
-
-
     @Override
     public Object[] getTargetInfo() {
         return mTargetInfo;
@@ -179,7 +174,8 @@ public class SearchResultPlayItem extends LinearLayout implements
         }
     }
 
-    private void handleSelection(int eventType) {
+    @Override
+    public void handleSelection(int eventType) {
         if (mPackageName == null) return;
         Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(
                 "https://play.google.com/store/apps/details?id="
@@ -209,8 +205,6 @@ public class SearchResultPlayItem extends LinearLayout implements
                 SearchTarget.ItemType.PLAY_RESULTS, eventType);
         searchTargetEvent.bundle = new Bundle();
         searchTargetEvent.bundle.putString("package_name", mPackageName);
-        if (mPlugin != null) {
-            mPlugin.notifySearchTargetEvent(searchTargetEvent);
-        }
+        SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(searchTargetEvent);
     }
 }
diff --git a/src/com/android/launcher3/views/SearchSectionHeaderView.java b/src/com/android/launcher3/views/SearchSectionHeaderView.java
index 0fe0a43ff5..370b92148c 100644
--- a/src/com/android/launcher3/views/SearchSectionHeaderView.java
+++ b/src/com/android/launcher3/views/SearchSectionHeaderView.java
@@ -21,14 +21,14 @@ import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 
-import com.android.launcher3.allapps.AllAppsGridAdapter;
 import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+import com.android.systemui.plugins.shared.SearchTarget;
 
 /**
  * Header text view that shows a title for a given section in All apps search
  */
 public class SearchSectionHeaderView extends TextView implements
-        AllAppsSearchBarController.PayloadResultHandler<String> {
+        AllAppsSearchBarController.SearchTargetHandler {
     public SearchSectionHeaderView(Context context) {
         super(context);
     }
@@ -43,8 +43,8 @@ public class SearchSectionHeaderView extends TextView implements
     }
 
     @Override
-    public void applyAdapterInfo(AllAppsGridAdapter.AdapterItemWithPayload<String> adapterItem) {
-        String title = adapterItem.getPayload();
+    public void applySearchTarget(SearchTarget searchTarget) {
+        String title = searchTarget.type.getTitle();
         if (title == null || !title.isEmpty()) {
             setText(title);
             setVisibility(VISIBLE);
diff --git a/src/com/android/launcher3/views/SearchSettingsRowView.java b/src/com/android/launcher3/views/SearchSettingsRowView.java
index a1a0172547..ac69548840 100644
--- a/src/com/android/launcher3/views/SearchSettingsRowView.java
+++ b/src/com/android/launcher3/views/SearchSettingsRowView.java
@@ -29,9 +29,8 @@ import androidx.annotation.Nullable;
 
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
-import com.android.launcher3.allapps.AllAppsGridAdapter;
 import com.android.launcher3.allapps.search.AllAppsSearchBarController;
-import com.android.systemui.plugins.AllAppsSearchPlugin;
+import com.android.launcher3.allapps.search.SearchEventTracker;
 import com.android.systemui.plugins.shared.SearchTarget;
 import com.android.systemui.plugins.shared.SearchTargetEvent;
 
@@ -41,13 +40,12 @@ import java.util.ArrayList;
  * A row of tappable TextViews with a breadcrumb for settings search.
  */
 public class SearchSettingsRowView extends LinearLayout implements
-        View.OnClickListener, AllAppsSearchBarController.PayloadResultHandler<Bundle> {
+        View.OnClickListener, AllAppsSearchBarController.SearchTargetHandler {
 
     private TextView mTitleView;
     private TextView mDescriptionView;
     private TextView mBreadcrumbsView;
     private Intent mIntent;
-    private AllAppsSearchPlugin mPlugin;
     private final Object[] mTargetInfo = createTargetInfo();
 
 
@@ -75,10 +73,8 @@ public class SearchSettingsRowView extends LinearLayout implements
     }
 
     @Override
-    public void applyAdapterInfo(
-            AllAppsGridAdapter.AdapterItemWithPayload<Bundle> adapterItemWithPayload) {
-        Bundle bundle = adapterItemWithPayload.getPayload();
-        mPlugin = adapterItemWithPayload.getPlugin();
+    public void applySearchTarget(SearchTarget searchTarget) {
+        Bundle bundle = searchTarget.bundle;
         mIntent = bundle.getParcelable("intent");
         showIfAvailable(mTitleView, bundle.getString("title"));
         showIfAvailable(mDescriptionView, bundle.getString("description"));
@@ -86,7 +82,7 @@ public class SearchSettingsRowView extends LinearLayout implements
         //TODO: implement RTL friendly breadcrumbs view
         showIfAvailable(mBreadcrumbsView, breadcrumbs != null
                 ? String.join(" > ", breadcrumbs) : null);
-        adapterItemWithPayload.setSelectionHandler(this::handleSelection);
+        SearchEventTracker.INSTANCE.get(getContext()).registerWeakHandler(searchTarget, this);
     }
 
     @Override
@@ -108,7 +104,8 @@ public class SearchSettingsRowView extends LinearLayout implements
         handleSelection(SearchTargetEvent.SELECT);
     }
 
-    private void handleSelection(int eventType) {
+    @Override
+    public void handleSelection(int eventType) {
         if (mIntent == null) return;
         // TODO: create ItemInfo object and then use it to call startActivityForResult for proper
         //  WW logging
@@ -119,8 +116,6 @@ public class SearchSettingsRowView extends LinearLayout implements
                 SearchTarget.ItemType.SETTINGS_ROW, eventType);
         searchTargetEvent.bundle = new Bundle();
         searchTargetEvent.bundle.putParcelable("intent", mIntent);
-        if (mPlugin != null) {
-            mPlugin.notifySearchTargetEvent(searchTargetEvent);
-        }
+        SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(searchTargetEvent);
     }
 }
diff --git a/src/com/android/launcher3/views/SearchSliceWrapper.java b/src/com/android/launcher3/views/SearchSliceWrapper.java
new file mode 100644
index 0000000000..b088237034
--- /dev/null
+++ b/src/com/android/launcher3/views/SearchSliceWrapper.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.views;
+
+import android.content.Context;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.LiveData;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.widget.EventInfo;
+import androidx.slice.widget.SliceLiveData;
+import androidx.slice.widget.SliceView;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.allapps.search.SearchEventTracker;
+import com.android.systemui.plugins.shared.SearchTarget;
+import com.android.systemui.plugins.shared.SearchTargetEvent;
+
+/**
+ * A Wrapper class for {@link SliceView} search results
+ */
+public class SearchSliceWrapper implements SliceView.OnSliceActionListener {
+
+    private static final String TAG = "SearchSliceController";
+    private static final String URI_EXTRA_KEY = "slice_uri";
+
+
+    private final Launcher mLauncher;
+    private final SearchTarget mSearchTarget;
+    private final SliceView mSliceView;
+    //TODO: remove these as we move to tracking search results individually with unique ID
+    private final int mPosition;
+    private final String mSessionId;
+    private LiveData<Slice> mSliceLiveData;
+
+    public SearchSliceWrapper(Context context, SliceView sliceView,
+            SearchTarget searchTarget, String sessionId, int position) {
+        mLauncher = Launcher.getLauncher(context);
+        mPosition = position;
+        mSessionId = sessionId;
+        mSearchTarget = searchTarget;
+        mSliceView = sliceView;
+        sliceView.setOnSliceActionListener(this);
+        try {
+            mSliceLiveData = SliceLiveData.fromUri(mLauncher, getSliceUri());
+            mSliceLiveData.observe((Launcher) mLauncher, sliceView);
+        } catch (Exception ex) {
+            Log.e(TAG, "unable to bind slice", ex);
+        }
+    }
+
+    /**
+     * Unregisters event handlers and removes lifecycle observer
+     */
+    public void destroy() {
+        mSliceView.setOnSliceActionListener(null);
+        mSliceLiveData.removeObservers(mLauncher);
+    }
+
+    @Override
+    public void onSliceAction(@NonNull EventInfo info, @NonNull SliceItem item) {
+        SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
+                SearchTarget.ItemType.SETTINGS_SLICE,
+                SearchTargetEvent.CHILD_SELECT, mPosition,
+                mSessionId);
+        searchTargetEvent.bundle = new Bundle();
+        searchTargetEvent.bundle.putParcelable(URI_EXTRA_KEY, getSliceUri());
+        SearchEventTracker.INSTANCE.get(mLauncher).notifySearchTargetEvent(searchTargetEvent);
+    }
+
+    private Uri getSliceUri() {
+        return mSearchTarget.bundle.getParcelable(URI_EXTRA_KEY);
+    }
+}
diff --git a/src/com/android/launcher3/views/ThumbnailSearchResultView.java b/src/com/android/launcher3/views/ThumbnailSearchResultView.java
index 81bcad97ed..21212327b6 100644
--- a/src/com/android/launcher3/views/ThumbnailSearchResultView.java
+++ b/src/com/android/launcher3/views/ThumbnailSearchResultView.java
@@ -26,14 +26,13 @@ import androidx.core.graphics.drawable.RoundedBitmapDrawable;
 import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
 
 import com.android.launcher3.Launcher;
-import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
 import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+import com.android.launcher3.allapps.search.SearchEventTracker;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.RemoteActionItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.touch.ItemClickHandler;
 import com.android.launcher3.util.Themes;
-import com.android.systemui.plugins.AllAppsSearchPlugin;
 import com.android.systemui.plugins.shared.SearchTarget;
 import com.android.systemui.plugins.shared.SearchTargetEvent;
 
@@ -41,11 +40,9 @@ import com.android.systemui.plugins.shared.SearchTargetEvent;
  * A view representing a high confidence app search result that includes shortcuts
  */
 public class ThumbnailSearchResultView extends androidx.appcompat.widget.AppCompatImageView
-        implements AllAppsSearchBarController.PayloadResultHandler<SearchTarget> {
+        implements AllAppsSearchBarController.SearchTargetHandler {
 
     private final Object[] mTargetInfo = createTargetInfo();
-    AllAppsSearchPlugin mPlugin;
-    int mPosition;
 
     public ThumbnailSearchResultView(Context context) {
         super(context);
@@ -59,7 +56,8 @@ public class ThumbnailSearchResultView extends androidx.appcompat.widget.AppComp
         super(context, attrs, defStyleAttr);
     }
 
-    private void handleSelection(int eventType) {
+    @Override
+    public void handleSelection(int eventType) {
         Launcher launcher = Launcher.getLauncher(getContext());
         ItemInfo itemInfo = (ItemInfo) getTag();
         if (itemInfo instanceof RemoteActionItemInfo) {
@@ -68,26 +66,19 @@ public class ThumbnailSearchResultView extends androidx.appcompat.widget.AppComp
         } else {
             ItemClickHandler.onClickAppShortcut(this, (WorkspaceItemInfo) itemInfo, launcher);
         }
-        if (mPlugin != null) {
-            SearchTargetEvent event = getSearchTargetEvent(
-                    SearchTarget.ItemType.SCREENSHOT, eventType);
-            mPlugin.notifySearchTargetEvent(event);
-        }
+        SearchTargetEvent e = getSearchTargetEvent(SearchTarget.ItemType.SCREENSHOT, eventType);
+        SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(e);
     }
 
     @Override
-    public void applyAdapterInfo(AdapterItemWithPayload<SearchTarget> adapterItem) {
-        Launcher launcher = Launcher.getLauncher(getContext());
-        mPosition = adapterItem.position;
-
-        SearchTarget target = adapterItem.getPayload();
+    public void applySearchTarget(SearchTarget target) {
         Bitmap bitmap;
         if (target.mRemoteAction != null) {
             RemoteActionItemInfo itemInfo = new RemoteActionItemInfo(target.mRemoteAction,
                     target.bundle.getString(SearchTarget.REMOTE_ACTION_TOKEN),
                     target.bundle.getBoolean(SearchTarget.REMOTE_ACTION_SHOULD_START));
             bitmap = ((BitmapDrawable) target.mRemoteAction.getIcon()
-                .loadDrawable(getContext())).getBitmap();
+                    .loadDrawable(getContext())).getBitmap();
             Bitmap crop = Bitmap.createBitmap(bitmap, 0,
                     bitmap.getHeight() / 2 - bitmap.getWidth() / 2,
                     bitmap.getWidth(), bitmap.getWidth());
@@ -106,8 +97,7 @@ public class ThumbnailSearchResultView extends androidx.appcompat.widget.AppComp
         drawable.setCornerRadius(Themes.getDialogCornerRadius(getContext()));
         setImageDrawable(drawable);
         setOnClickListener(v -> handleSelection(SearchTargetEvent.SELECT));
-        mPlugin = adapterItem.getPlugin();
-        adapterItem.setSelectionHandler(this::handleSelection);
+        SearchEventTracker.INSTANCE.get(getContext()).registerWeakHandler(target, this);
     }
 
     @Override
-- 
GitLab


From d5bbe6809dcc056fbfc307909b171651f0fb3044 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Wed, 14 Oct 2020 15:39:38 -0700
Subject: [PATCH 0247/1664] Rename shrotcut container to deep-shrotcuts

Change-Id: If94f0dfa447235f3b1a652f7b6c749695b42d97c
---
 quickstep/src/com/android/launcher3/model/AppEventProducer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/model/AppEventProducer.java b/quickstep/src/com/android/launcher3/model/AppEventProducer.java
index 58937c3350..9944270c95 100644
--- a/quickstep/src/com/android/launcher3/model/AppEventProducer.java
+++ b/quickstep/src/com/android/launcher3/model/AppEventProducer.java
@@ -251,7 +251,7 @@ public class AppEventProducer implements StatsLogConsumer {
                 return "predictions";
             }
             case SHORTCUTS_CONTAINER: {
-                return "shortcuts";
+                return "deep-shortcuts";
             }
             case FOLDER: {
                 FolderContainer fc = ci.getFolder();
-- 
GitLab


From cf0b275a48d3c9f91a346f7fc24b9604f6dde25a Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Tue, 6 Oct 2020 09:33:40 -0400
Subject: [PATCH 0248/1664] Add the ability to specify a list of tutorial steps
 in the gesture sandbox tutorial intent.

Added tutorial_steps string array in the intent to allow specifying an ordered list of tutorial steps.

Change-Id: Ic42a65598a74a64f8441a22f58c6cd988a5762e3
---
 .../AssistantGestureTutorialController.java   |  8 +-
 .../BackGestureTutorialController.java        |  8 +-
 .../interaction/GestureSandboxActivity.java   | 76 ++++++++++++++++---
 .../HomeGestureTutorialController.java        |  9 ++-
 .../OverviewGestureTutorialController.java    |  9 ++-
 .../interaction/TutorialFragment.java         | 24 ++++++
 .../settings/DeveloperOptionsFragment.java    | 19 +++--
 7 files changed, 131 insertions(+), 22 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialController.java
index 6862f071bc..5c81e5f37b 100644
--- a/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialController.java
@@ -104,7 +104,13 @@ final class AssistantGestureTutorialController extends TutorialController {
                         hideFeedback();
                         hideHandCoachingAnimation();
                         showRippleEffect(
-                                () -> mTutorialFragment.changeController(ASSISTANT_COMPLETE));
+                                () -> {
+                                    if (mTutorialFragment.isTutorialComplete()) {
+                                        mTutorialFragment.changeController(ASSISTANT_COMPLETE);
+                                    } else {
+                                        mTutorialFragment.continueTutorial();
+                                    }
+                                });
                         break;
                     case ASSISTANT_NOT_STARTED_BAD_ANGLE:
                         showFeedback(R.string.assistant_gesture_feedback_swipe_not_diagonal);
diff --git a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
index 921e5681c6..161e015481 100644
--- a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
@@ -130,7 +130,13 @@ final class BackGestureTutorialController extends TutorialController {
                 hideFeedback();
                 hideHandCoachingAnimation();
                 showRippleEffect(
-                        () -> mTutorialFragment.changeController(BACK_NAVIGATION_COMPLETE));
+                        () -> {
+                            if (mTutorialFragment.isTutorialComplete()) {
+                                mTutorialFragment.changeController(BACK_NAVIGATION_COMPLETE);
+                            } else {
+                                mTutorialFragment.continueTutorial();
+                            }
+                        });
                 break;
             case BACK_CANCELLED_FROM_LEFT:
                 showFeedback(R.string.back_gesture_feedback_cancelled_left_edge);
diff --git a/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java b/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java
index f8d9d8d502..8b6777b6ac 100644
--- a/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java
+++ b/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java
@@ -15,8 +15,6 @@
  */
 package com.android.quickstep.interaction;
 
-import static com.android.quickstep.interaction.TutorialFragment.KEY_TUTORIAL_TYPE;
-
 import android.graphics.Color;
 import android.graphics.Rect;
 import android.os.Bundle;
@@ -25,11 +23,14 @@ import android.view.Display;
 import android.view.View;
 import android.view.Window;
 
+import androidx.annotation.NonNull;
 import androidx.fragment.app.FragmentActivity;
 
 import com.android.launcher3.R;
 import com.android.quickstep.interaction.TutorialController.TutorialType;
 
+import java.util.ArrayDeque;
+import java.util.Deque;
 import java.util.List;
 
 /** Shows the gesture interactive sandbox in full screen mode. */
@@ -37,6 +38,9 @@ public class GestureSandboxActivity extends FragmentActivity {
 
     private static final String LOG_TAG = "GestureSandboxActivity";
 
+    private static final String KEY_TUTORIAL_STEPS = "tutorial_steps";
+
+    private Deque<TutorialType> mTutorialSteps;
     private TutorialFragment mFragment;
 
     @Override
@@ -45,7 +49,9 @@ public class GestureSandboxActivity extends FragmentActivity {
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.gesture_tutorial_activity);
 
-        mFragment = TutorialFragment.newInstance(getTutorialType(getIntent().getExtras()));
+        Bundle args = savedInstanceState == null ? getIntent().getExtras() : savedInstanceState;
+        mTutorialSteps = getTutorialSteps(args);
+        mFragment = TutorialFragment.newInstance(mTutorialSteps.pop());
         getSupportFragmentManager().beginTransaction()
                 .add(R.id.gesture_tutorial_fragment_container, mFragment)
                 .commit();
@@ -72,17 +78,65 @@ public class GestureSandboxActivity extends FragmentActivity {
         }
     }
 
-    private TutorialType getTutorialType(Bundle extras) {
-        TutorialType defaultType = TutorialType.RIGHT_EDGE_BACK_NAVIGATION;
+    @Override
+    protected void onSaveInstanceState(@NonNull Bundle savedInstanceState) {
+        savedInstanceState.putStringArray(KEY_TUTORIAL_STEPS, getTutorialStepNames());
+        super.onSaveInstanceState(savedInstanceState);
+    }
+
+    /** Returns true iff there aren't anymore tutorial types to display to the user. */
+    public boolean isTutorialComplete() {
+        return mTutorialSteps.isEmpty();
+    }
 
-        if (extras == null || !extras.containsKey(KEY_TUTORIAL_TYPE)) {
-            return defaultType;
+    /**
+     * Replaces the current TutorialFragment, continuing to the next tutorial step if there is one.
+     *
+     * If there is no following step, the tutorial is closed.
+     */
+    public void continueTutorial() {
+        if (isTutorialComplete()) {
+            mFragment.closeTutorial();
+            return;
         }
-        try {
-            return TutorialType.valueOf(extras.getString(KEY_TUTORIAL_TYPE, ""));
-        } catch (IllegalArgumentException e) {
-            return defaultType;
+        mFragment = TutorialFragment.newInstance(mTutorialSteps.pop());
+        getSupportFragmentManager().beginTransaction()
+            .replace(R.id.gesture_tutorial_fragment_container, mFragment)
+            .runOnCommit(() -> mFragment.onAttachedToWindow())
+            .commit();
+    }
+
+    private String[] getTutorialStepNames() {
+        String[] tutorialStepNames = new String[mTutorialSteps.size()];
+
+        int i = 0;
+        for (TutorialType tutorialStep : mTutorialSteps) {
+            tutorialStepNames[i++] = tutorialStep.name();
         }
+
+        return tutorialStepNames;
+    }
+
+    private Deque<TutorialType> getTutorialSteps(Bundle extras) {
+        Deque<TutorialType> defaultSteps = new ArrayDeque<>();
+        defaultSteps.push(TutorialType.RIGHT_EDGE_BACK_NAVIGATION);
+
+        if (extras == null || !extras.containsKey(KEY_TUTORIAL_STEPS)) {
+            return defaultSteps;
+        }
+
+        String[] tutorialStepNames = extras.getStringArray(KEY_TUTORIAL_STEPS);
+
+        if (tutorialStepNames == null) {
+            return defaultSteps;
+        }
+
+        Deque<TutorialType> tutorialSteps = new ArrayDeque<>();
+        for (String tutorialStepName : tutorialStepNames) {
+            tutorialSteps.addLast(TutorialType.valueOf(tutorialStepName));
+        }
+
+        return tutorialSteps;
     }
 
     private void hideSystemUI() {
diff --git a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
index 0edabd45c5..95352d1a23 100644
--- a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
@@ -94,8 +94,13 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll
             case HOME_NAVIGATION:
                 switch (result) {
                     case HOME_GESTURE_COMPLETED: {
-                        animateFakeTaskViewHome(finalVelocity, () ->
-                                mTutorialFragment.changeController(HOME_NAVIGATION_COMPLETE));
+                        animateFakeTaskViewHome(finalVelocity, () -> {
+                            if (mTutorialFragment.isTutorialComplete()) {
+                                mTutorialFragment.changeController(HOME_NAVIGATION_COMPLETE);
+                            } else {
+                                mTutorialFragment.continueTutorial();
+                            }
+                        });
                         break;
                     }
                     case HOME_NOT_STARTED_TOO_FAR_FROM_EDGE:
diff --git a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
index c636ebaea9..45cbd0b571 100644
--- a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
@@ -104,8 +104,13 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont
                         showFeedback(R.string.overview_gesture_feedback_swipe_too_far_from_edge);
                         break;
                     case OVERVIEW_GESTURE_COMPLETED:
-                        fadeOutFakeTaskView(true, () ->
-                                mTutorialFragment.changeController(OVERVIEW_NAVIGATION_COMPLETE));
+                        fadeOutFakeTaskView(true, () -> {
+                            if (mTutorialFragment.isTutorialComplete()) {
+                                mTutorialFragment.changeController(OVERVIEW_NAVIGATION_COMPLETE);
+                            } else {
+                                mTutorialFragment.continueTutorial();
+                            }
+                        });
                         break;
                     case HOME_OR_OVERVIEW_NOT_STARTED_WRONG_SWIPE_DIRECTION:
                     case HOME_OR_OVERVIEW_CANCELLED:
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
index f297d5a835..608fe72ff9 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
@@ -54,6 +54,7 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
             fragment = new BackGestureTutorialFragment();
             tutorialType = TutorialType.RIGHT_EDGE_BACK_NAVIGATION;
         }
+
         Bundle args = new Bundle();
         args.putSerializable(KEY_TUTORIAL_TYPE, tutorialType);
         fragment.setArguments(args);
@@ -197,6 +198,20 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
         return mHandCoachingAnimation;
     }
 
+    void continueTutorial() {
+        if (!(getContext() instanceof GestureSandboxActivity)) {
+            closeTutorial();
+            return;
+        }
+        GestureSandboxActivity gestureSandboxActivity = (GestureSandboxActivity) getContext();
+
+        if (gestureSandboxActivity == null) {
+            closeTutorial();
+            return;
+        }
+        gestureSandboxActivity.continueTutorial();
+    }
+
     void closeTutorial() {
         FragmentActivity activity = getActivity();
         if (activity != null) {
@@ -207,4 +222,13 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
     void startSystemNavigationSetting() {
         startActivity(new Intent("com.android.settings.GESTURE_NAVIGATION_SETTINGS"));
     }
+
+    boolean isTutorialComplete() {
+        if (!(getContext() instanceof GestureSandboxActivity)) {
+            return true;
+        }
+        GestureSandboxActivity gestureSandboxActivity = (GestureSandboxActivity) getContext();
+
+        return gestureSandboxActivity == null || gestureSandboxActivity.isTutorialComplete();
+    }
 }
diff --git a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
index f4b059d8d8..47d214d0a8 100644
--- a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
+++ b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
@@ -275,7 +275,8 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
         launchBackTutorialPreference.setSummary("Learn how to use the Back gesture");
         launchBackTutorialPreference.setOnPreferenceClickListener(preference -> {
             startActivity(launchSandboxIntent.putExtra(
-                    "tutorial_type", "RIGHT_EDGE_BACK_NAVIGATION"));
+                    "tutorial_steps",
+                    new String[] {"RIGHT_EDGE_BACK_NAVIGATION"}));
             return true;
         });
         sandboxCategory.addPreference(launchBackTutorialPreference);
@@ -284,7 +285,9 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
         launchHomeTutorialPreference.setTitle("Launch Home Tutorial");
         launchHomeTutorialPreference.setSummary("Learn how to use the Home gesture");
         launchHomeTutorialPreference.setOnPreferenceClickListener(preference -> {
-            startActivity(launchSandboxIntent.putExtra("tutorial_type", "HOME_NAVIGATION"));
+            startActivity(launchSandboxIntent.putExtra(
+                    "tutorial_steps",
+                    new String[] {"HOME_NAVIGATION"}));
             return true;
         });
         sandboxCategory.addPreference(launchHomeTutorialPreference);
@@ -293,7 +296,9 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
         launchOverviewTutorialPreference.setTitle("Launch Overview Tutorial");
         launchOverviewTutorialPreference.setSummary("Learn how to use the Overview gesture");
         launchOverviewTutorialPreference.setOnPreferenceClickListener(preference -> {
-            startActivity(launchSandboxIntent.putExtra("tutorial_type", "OVERVIEW_NAVIGATION"));
+            startActivity(launchSandboxIntent.putExtra(
+                    "tutorial_steps",
+                    new String[] {"OVERVIEW_NAVIGATION"}));
             return true;
         });
         sandboxCategory.addPreference(launchOverviewTutorialPreference);
@@ -302,7 +307,9 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
         launchAssistantTutorialPreference.setTitle("Launch Assistant Tutorial");
         launchAssistantTutorialPreference.setSummary("Learn how to use the Assistant gesture");
         launchAssistantTutorialPreference.setOnPreferenceClickListener(preference -> {
-            startActivity(launchSandboxIntent.putExtra("tutorial_type", "ASSISTANT"));
+            startActivity(launchSandboxIntent.putExtra(
+                    "tutorial_steps",
+                    new String[] {"ASSISTANT"}));
             return true;
         });
         sandboxCategory.addPreference(launchAssistantTutorialPreference);
@@ -311,7 +318,9 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
         launchSandboxModeTutorialPreference.setTitle("Launch Sandbox Mode");
         launchSandboxModeTutorialPreference.setSummary("Practice navigation gestures");
         launchSandboxModeTutorialPreference.setOnPreferenceClickListener(preference -> {
-            startActivity(launchSandboxIntent.putExtra("tutorial_type", "SANDBOX_MODE"));
+            startActivity(launchSandboxIntent.putExtra(
+                    "tutorial_steps",
+                    new String[] {"SANDBOX_MODE"}));
             return true;
         });
         sandboxCategory.addPreference(launchSandboxModeTutorialPreference);
-- 
GitLab


From 702ed2788678ac744c768aad6a6302e7cf91a26b Mon Sep 17 00:00:00 2001
From: Pinyao Ting <pinyaoting@google.com>
Date: Wed, 14 Oct 2020 11:17:04 -0700
Subject: [PATCH 0249/1664] Fix the issue where shortcuts are removed in
 minimal device mode

When loading the workspace, Launcher pins/unpins shortcuts in comply
with the loaded workspace. Since minimal device mode creates a mostly
empty workspace, existing shortcuts are getting unpinned as a result.

To mitigate the issue this CL compares the db name and only invoke
sanitizeData when it matches the one defined in InvariantDeviceProfile.

Bug: 170611866
Test: manual
1. add some deep shortcut in workspace (e.g. long tap on chrome, drag
"incognito tab" to workspace)
2. opt-in to sunshine fishfood (g/sunshine-teamfood)
3. enable bedtime mode with minimal device in Settings -> Digital
Wellbeing -> Show Your Data -> Bedtime mode -> Customize -> minimal
device
4. toggle bedtime mode, wait for apps in minimal device to show, then
toggle off bedtime mode
5. verify the deep shortcut still exist

Change-Id: Ie18216ecb288e7481aa2404c4cb3ea418aee85cb
---
 src/com/android/launcher3/LauncherProvider.java |  3 +++
 src/com/android/launcher3/LauncherSettings.java |  2 ++
 src/com/android/launcher3/model/LoaderTask.java | 15 +++++++++++++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 2973cf7278..aeed16aa28 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -188,6 +188,9 @@ public class LauncherProvider extends ContentProvider {
 
         SQLiteDatabase db = mOpenHelper.getWritableDatabase();
         Cursor result = qb.query(db, projection, args.where, args.args, null, null, sortOrder);
+        final Bundle extra = new Bundle();
+        extra.putString(LauncherSettings.Settings.EXTRA_DB_NAME, mOpenHelper.getDatabaseName());
+        result.setExtras(extra);
         result.setNotificationUri(getContext().getContentResolver(), uri);
 
         return result;
diff --git a/src/com/android/launcher3/LauncherSettings.java b/src/com/android/launcher3/LauncherSettings.java
index 58a418edec..d2758f53ad 100644
--- a/src/com/android/launcher3/LauncherSettings.java
+++ b/src/com/android/launcher3/LauncherSettings.java
@@ -358,6 +358,8 @@ public class LauncherSettings {
 
         public static final String EXTRA_VALUE = "value";
 
+        public static final String EXTRA_DB_NAME = "db_name";
+
         public static Bundle call(ContentResolver cr, String method) {
             return call(cr, method, null /* arg */);
         }
diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index c0d5882b46..d47fafd40b 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -41,6 +41,7 @@ import android.content.pm.PackageInstaller.SessionInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ShortcutInfo;
 import android.net.Uri;
+import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.text.TextUtils;
@@ -130,6 +131,7 @@ public class LoaderTask implements Runnable {
 
     private final Set<PackageUserKey> mPendingPackages = new HashSet<>();
     private boolean mItemsDeleted = false;
+    private String mDbName;
 
     public LoaderTask(LauncherAppState app, AllAppsList bgAllAppsList, BgDataModel dataModel,
             ModelDelegate modelDelegate, LoaderResults results) {
@@ -274,7 +276,14 @@ public class LoaderTask implements Runnable {
             if (FeatureFlags.FOLDER_NAME_SUGGEST.get()) {
                 loadFolderNames();
             }
-            sanitizeData();
+
+            // Sanitize data re-syncs widgets/shortcuts based on the workspace loaded from db.
+            // sanitizeData should not be invoked if the workspace is loaded from a db different
+            // from the main db as defined in the invariant device profile.
+            // (e.g. both grid preview and minimal device mode uses a different db)
+            if (mApp.getInvariantDeviceProfile().dbFile.equals(mDbName)) {
+                sanitizeData();
+            }
 
             verifyNotStopped();
             updateHandler.finish();
@@ -349,7 +358,9 @@ public class LoaderTask implements Runnable {
             final LoaderCursor c = new LoaderCursor(
                     contentResolver.query(contentUri, null, selection, null, null), contentUri,
                     mApp, mUserManagerState);
-
+            final Bundle extras = c.getExtras();
+            mDbName = extras == null
+                    ? null : extras.getString(LauncherSettings.Settings.EXTRA_DB_NAME);
             try {
                 final int appWidgetIdIndex = c.getColumnIndexOrThrow(
                         LauncherSettings.Favorites.APPWIDGET_ID);
-- 
GitLab


From 314761a80819a6e64a136161f51eebb0f0528c4d Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Wed, 14 Oct 2020 10:15:07 -0700
Subject: [PATCH 0250/1664] Setup SearchResultIcon for single cell results

SearchResultIcon will be able to render apps, shortcuts and remote actions. It can also handle its own focused state drawing.

Screenshot: https://screenshot.googleplex.com/C3KgjJtLQTBPgaf

Bug: 170752716
Test: Manual
Change-Id: I460a9c128ea3f5814784e342c5d5fa5b7e310882
---
 AndroidManifest-common.xml                    |   1 +
 res/layout/all_apps_icon.xml                  |  15 +--
 res/layout/search_result_icon.xml             |  20 ++++
 res/values/styles.xml                         |  10 ++
 src/com/android/launcher3/BubbleTextView.java |  71 +++++++++++-
 .../launcher3/allapps/AllAppsGridAdapter.java |  69 +++---------
 .../allapps/AllAppsSectionDecorator.java      |  23 +++-
 .../launcher3/allapps/AllAppsStore.java       |  16 +++
 .../allapps/search/SearchEventTracker.java    |   4 +-
 .../launcher3/views/HeroSearchResultView.java |  13 +--
 .../android/launcher3/views/ScrimView.java    |   2 +-
 .../launcher3/views/SearchResultIcon.java     | 103 ++++++++++++++++++
 .../launcher3/views/SearchResultIconRow.java  |  10 ++
 13 files changed, 277 insertions(+), 80 deletions(-)
 create mode 100644 res/layout/search_result_icon.xml
 create mode 100644 src/com/android/launcher3/views/SearchResultIcon.java

diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index 97e3786a36..a47a500b8e 100644
--- a/AndroidManifest-common.xml
+++ b/AndroidManifest-common.xml
@@ -30,6 +30,7 @@
     with some minor changed based on the derivative app.
     -->
 
+    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.SET_WALLPAPER" />
     <uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />
diff --git a/res/layout/all_apps_icon.xml b/res/layout/all_apps_icon.xml
index 79fb6126ad..069954c56b 100644
--- a/res/layout/all_apps_icon.xml
+++ b/res/layout/all_apps_icon.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2015 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -13,16 +12,10 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher3.BubbleTextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher3.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto"
-    style="@style/BaseIcon"
+    style="@style/BaseIcon.AllApps"
     android:id="@+id/icon"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:stateListAnimator="@animator/all_apps_fastscroll_icon_anim"
     launcher:iconDisplay="all_apps"
-    launcher:centerVertically="true"
-    android:paddingLeft="@dimen/dynamic_grid_cell_padding_x"
-    android:paddingRight="@dimen/dynamic_grid_cell_padding_x" />
+    launcher:centerVertically="true" />
 
diff --git a/res/layout/search_result_icon.xml b/res/layout/search_result_icon.xml
new file mode 100644
index 0000000000..3c1dd49109
--- /dev/null
+++ b/res/layout/search_result_icon.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.launcher3.views.SearchResultIcon xmlns:launcher="http://schemas.android.com/apk/res-auto"
+    style="@style/BaseIcon.AllApps"
+    launcher:iconDisplay="all_apps"
+    launcher:centerVertically="true" />
+
diff --git a/res/values/styles.xml b/res/values/styles.xml
index fd3d873635..067cf7feac 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -223,6 +223,16 @@
         <item name="android:lines">1</item>
     </style>
 
+    <!-- Base theme for AllApps BubbleTextViews -->
+    <style name="BaseIcon.AllApps" parent="BaseIcon">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:stateListAnimator">@animator/all_apps_fastscroll_icon_anim</item>
+        <item name="android:paddingLeft">@dimen/dynamic_grid_cell_padding_x</item>
+        <item name="android:paddingRight">@dimen/dynamic_grid_cell_padding_x</item>
+    </style>
+
+
     <!-- Icon displayed on the workspace -->
     <style name="BaseIcon.Workspace" >
         <item name="android:shadowRadius">2.0</item>
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 817d02827c..6245637407 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -17,6 +17,7 @@
 package com.android.launcher3;
 
 import static com.android.launcher3.FastBitmapDrawable.newIcon;
+import static com.android.launcher3.graphics.IconShape.getShape;
 import static com.android.launcher3.graphics.PreloadIconDrawable.newPendingIcon;
 import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
 
@@ -27,15 +28,18 @@ import android.animation.ValueAnimator;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
+import android.graphics.BlurMaskFilter;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
+import android.graphics.Path;
 import android.graphics.PointF;
 import android.graphics.PorterDuff.Mode;
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
+import android.os.Process;
 import android.text.TextUtils.TruncateAt;
 import android.util.AttributeSet;
 import android.util.Property;
@@ -50,6 +54,8 @@ import androidx.core.graphics.ColorUtils;
 
 import com.android.launcher3.Launcher.OnResumeCallback;
 import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
+import com.android.launcher3.allapps.AllAppsSectionDecorator;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.dot.DotInfo;
 import com.android.launcher3.dragndrop.DraggableView;
 import com.android.launcher3.folder.FolderIcon;
@@ -60,6 +66,7 @@ import com.android.launcher3.graphics.PreloadIconDrawable;
 import com.android.launcher3.icons.DotRenderer;
 import com.android.launcher3.icons.IconCache.IconLoadRequest;
 import com.android.launcher3.icons.IconCache.ItemInfoUpdateReceiver;
+import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
@@ -79,7 +86,7 @@ import java.text.NumberFormat;
  * too aggressive.
  */
 public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, OnResumeCallback,
-        IconLabelDotView, DraggableView, Reorderable {
+        IconLabelDotView, DraggableView, Reorderable, AllAppsSectionDecorator.SelfDecoratingView {
 
     private static final int DISPLAY_WORKSPACE = 0;
     private static final int DISPLAY_ALL_APPS = 1;
@@ -87,6 +94,8 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
     private static final int DISPLAY_HERO_APP = 5;
 
     private static final int[] STATE_PRESSED = new int[]{android.R.attr.state_pressed};
+    private static final float HIGHLIGHT_SCALE = 1.16f;
+
 
     private final PointF mTranslationForReorderBounce = new PointF(0, 0);
     private final PointF mTranslationForReorderPreview = new PointF(0, 0);
@@ -95,6 +104,11 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
 
     private float mScaleForReorderBounce = 1f;
 
+    protected final Paint mHighlightPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+    private final Path mHighlightPath = new Path();
+    protected int mHighlightColor = Color.TRANSPARENT;
+    private final BlurMaskFilter mHighlightShadowFilter;
+
     private static final Property<BubbleTextView, Float> DOT_SCALE_PROPERTY
             = new Property<BubbleTextView, Float>(Float.TYPE, "dotScale") {
         @Override
@@ -208,6 +222,11 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         setEllipsize(TruncateAt.END);
         setAccessibilityDelegate(mActivity.getAccessibilityDelegate());
         setTextAlpha(1f);
+
+        int shadowSize = context.getResources().getDimensionPixelSize(
+                R.dimen.blur_size_click_shadow);
+        mHighlightShadowFilter = new BlurMaskFilter(shadowSize, BlurMaskFilter.Blur.INNER);
+
     }
 
     @Override
@@ -421,8 +440,38 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
 
     @Override
     public void onDraw(Canvas canvas) {
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && mHighlightColor != Color.TRANSPARENT) {
+            int count = canvas.save();
+            drawFocusHighlight(canvas);
+            canvas.restoreToCount(count);
+        }
         super.onDraw(canvas);
-        drawDotIfNecessary(canvas);
+    }
+
+    protected void drawFocusHighlight(Canvas canvas) {
+        boolean isBadged = getTag() instanceof ItemInfo && !Process.myUserHandle().equals(
+                ((ItemInfo) getTag()).user);
+        float insetScale = (HIGHLIGHT_SCALE - 1) / 2;
+        canvas.translate(-getIconSize() * insetScale, -insetScale * getIconSize());
+        float outlineSize = getIconSize() * HIGHLIGHT_SCALE;
+        mHighlightPath.reset();
+        mHighlightPaint.reset();
+        getIconBounds(mDotParams.iconBounds);
+        getShape().addToPath(mHighlightPath, mDotParams.iconBounds.left, mDotParams.iconBounds.top,
+                outlineSize / 2);
+        if (isBadged) {
+            float borderSize = outlineSize - getIconSize();
+            float badgeSize = LauncherIcons.getBadgeSizeForIconSize(getIconSize()) + borderSize;
+            float badgeInset = outlineSize - badgeSize;
+            getShape().addToPath(mHighlightPath, mDotParams.iconBounds.left + badgeInset,
+                    mDotParams.iconBounds.top + badgeInset, badgeSize / 2);
+        }
+        mHighlightPaint.setMaskFilter(mHighlightShadowFilter);
+        mHighlightPaint.setColor(mDotParams.color);
+        canvas.drawPath(mHighlightPath, mHighlightPaint);
+        mHighlightPaint.setMaskFilter(null);
+        mHighlightPaint.setColor(mHighlightColor);
+        canvas.drawPath(mHighlightPath, mHighlightPaint);
     }
 
     /**
@@ -787,10 +836,11 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
 
     @Override
     public SafeCloseable prepareDrawDragView() {
+        int highlightColor = mHighlightColor;
+        mHighlightColor = Color.TRANSPARENT;
         resetIconScale();
         setForceHideDot(true);
-        return () -> {
-        };
+        return () -> mHighlightColor = highlightColor;
     }
 
     private void resetIconScale() {
@@ -827,4 +877,17 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         });
         iconUpdateAnimation.start();
     }
+
+
+    @Override
+    public void decorate(int color) {
+        mHighlightColor = color;
+        invalidate();
+    }
+
+    @Override
+    public void removeDecoration() {
+        mHighlightColor = Color.TRANSPARENT;
+        invalidate();
+    }
 }
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index 603e9df16c..a1bf7ed5dc 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -43,15 +43,12 @@ import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.search.AllAppsSearchBarController.SearchTargetHandler;
-import com.android.launcher3.allapps.search.SearchEventTracker;
 import com.android.launcher3.allapps.search.SearchSectionInfo;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.util.PackageManagerHelper;
-import com.android.launcher3.views.HeroSearchResultView;
 import com.android.launcher3.views.SearchSliceWrapper;
 import com.android.systemui.plugins.shared.SearchTarget;
-import com.android.systemui.plugins.shared.SearchTargetEvent;
 
 import java.util.List;
 
@@ -94,9 +91,11 @@ public class AllAppsGridAdapter extends
 
     public static final int VIEW_TYPE_SEARCH_SUGGEST = 1 << 13;
 
+    public static final int VIEW_TYPE_SEARCH_ICON = 1 << 14;
+
     // Common view type masks
     public static final int VIEW_TYPE_MASK_DIVIDER = VIEW_TYPE_ALL_APPS_DIVIDER;
-    public static final int VIEW_TYPE_MASK_ICON = VIEW_TYPE_ICON;
+    public static final int VIEW_TYPE_MASK_ICON = VIEW_TYPE_ICON | VIEW_TYPE_SEARCH_ICON;
 
     /**
      * ViewHolder for each icon.
@@ -186,6 +185,7 @@ public class AllAppsGridAdapter extends
                     || viewType == VIEW_TYPE_SEARCH_PEOPLE
                     || viewType == VIEW_TYPE_SEARCH_THUMBNAIL
                     || viewType == VIEW_TYPE_SEARCH_ICON_ROW
+                    || viewType == VIEW_TYPE_SEARCH_ICON
                     || viewType == VIEW_TYPE_SEARCH_SUGGEST;
         }
     }
@@ -399,11 +399,8 @@ public class AllAppsGridAdapter extends
                         R.layout.all_apps_icon, parent, false);
                 icon.setLongPressTimeoutFactor(1f);
                 icon.setOnFocusChangeListener(mIconFocusListener);
-                if (!FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
-                    icon.setOnClickListener(mOnIconClickListener);
-                    icon.setOnLongClickListener(mOnIconLongClickListener);
-                }
-
+                icon.setOnClickListener(mOnIconClickListener);
+                icon.setOnLongClickListener(mOnIconLongClickListener);
                 // Ensure the all apps icon height matches the workspace icons in portrait mode.
                 icon.getLayoutParams().height = mLauncher.getDeviceProfile().allAppsCellHeightPx;
                 return new ViewHolder(icon);
@@ -419,6 +416,9 @@ public class AllAppsGridAdapter extends
             case VIEW_TYPE_ALL_APPS_DIVIDER:
                 return new ViewHolder(mLayoutInflater.inflate(
                         R.layout.all_apps_divider, parent, false));
+            case VIEW_TYPE_SEARCH_ICON:
+                return new ViewHolder(mLayoutInflater.inflate(
+                        R.layout.search_result_icon, parent, false));
             case VIEW_TYPE_SEARCH_CORPUS_TITLE:
                 return new ViewHolder(
                         mLayoutInflater.inflate(R.layout.search_section_title, parent, false));
@@ -453,6 +453,10 @@ public class AllAppsGridAdapter extends
 
     @Override
     public void onBindViewHolder(ViewHolder holder, int position) {
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()
+                && holder.itemView instanceof AllAppsSectionDecorator.SelfDecoratingView) {
+            ((AllAppsSectionDecorator.SelfDecoratingView) holder.itemView).removeDecoration();
+        }
         switch (holder.getItemViewType()) {
             case VIEW_TYPE_ICON:
                 AdapterItem adapterItem = mApps.getAdapterItems().get(position);
@@ -460,43 +464,6 @@ public class AllAppsGridAdapter extends
                 BubbleTextView icon = (BubbleTextView) holder.itemView;
                 icon.reset();
                 icon.applyFromApplicationInfo(info);
-                if (!FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
-                    break;
-                }
-                //TODO: replace with custom TopHitBubbleTextView with support for both shortcut
-                // and apps
-                if (adapterItem instanceof SearchAdapterItem) {
-                    SearchAdapterItem item = (SearchAdapterItem) adapterItem;
-                    SearchTargetHandler searchTargetHandler = new SearchTargetHandler() {
-                        @Override
-                        public void applySearchTarget(SearchTarget searchTarget) {
-                            // Does nothing
-                        }
-
-                        @Override
-                        public void handleSelection(int type) {
-                            SearchTargetEvent e = new SearchTargetEvent(SearchTarget.ItemType.APP,
-                                    type, item.position, item.getSearchSessionId());
-                            e.bundle = HeroSearchResultView.getAppBundle(info);
-                            SearchEventTracker.INSTANCE.get(mLauncher).notifySearchTargetEvent(e);
-                        }
-                    };
-                    SearchEventTracker.INSTANCE.get(mLauncher).registerWeakHandler(
-                            ((SearchAdapterItem) adapterItem).getSearchTarget(),
-                            searchTargetHandler);
-
-                    icon.setOnClickListener(view -> {
-                        searchTargetHandler.handleSelection(SearchTargetEvent.SELECT);
-                        mOnIconClickListener.onClick(view);
-                    });
-                    icon.setOnLongClickListener(view -> {
-                        searchTargetHandler.handleSelection(SearchTargetEvent.LONG_PRESS);
-                        return mOnIconLongClickListener.onLongClick(view);
-                    });
-                } else {
-                    icon.setOnClickListener(mOnIconClickListener);
-                    icon.setOnLongClickListener(mOnIconLongClickListener);
-                }
                 break;
             case VIEW_TYPE_EMPTY_SEARCH:
                 TextView emptyViewText = (TextView) holder.itemView;
@@ -525,6 +492,7 @@ public class AllAppsGridAdapter extends
             case VIEW_TYPE_SEARCH_ROW_WITH_BUTTON:
             case VIEW_TYPE_SEARCH_HERO_APP:
             case VIEW_TYPE_SEARCH_ROW:
+            case VIEW_TYPE_SEARCH_ICON:
             case VIEW_TYPE_SEARCH_ICON_ROW:
             case VIEW_TYPE_SEARCH_PEOPLE:
             case VIEW_TYPE_SEARCH_THUMBNAIL:
@@ -544,11 +512,10 @@ public class AllAppsGridAdapter extends
     public void onViewRecycled(@NonNull ViewHolder holder) {
         super.onViewRecycled(holder);
         if (!FeatureFlags.ENABLE_DEVICE_SEARCH.get()) return;
-        if (holder.itemView instanceof BubbleTextView) {
-            BubbleTextView icon = (BubbleTextView) holder.itemView;
-            icon.setOnClickListener(null);
-            icon.setOnLongClickListener(null);
-        } else if (holder.itemView instanceof SliceView) {
+        if (holder.itemView instanceof AllAppsSectionDecorator.SelfDecoratingView) {
+            ((AllAppsSectionDecorator.SelfDecoratingView) holder.itemView).removeDecoration();
+        }
+        if (holder.itemView instanceof SliceView) {
             SliceView sliceView = (SliceView) holder.itemView;
             if (sliceView.getTag() instanceof SearchSliceWrapper) {
                 ((SearchSliceWrapper) sliceView.getTag()).destroy();
diff --git a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
index c131697c89..3c81811e16 100644
--- a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
+++ b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
@@ -54,6 +54,9 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
         int i = 0;
         while (i < itemCount) {
             View view = parent.getChildAt(i);
+            if (view instanceof SelfDecoratingView) {
+                ((SelfDecoratingView) view).removeDecoration();
+            }
             int position = parent.getChildAdapterPosition(view);
             AllAppsGridAdapter.AdapterItem adapterItem = adapterItems.get(position);
             if (adapterItem.searchSectionInfo != null) {
@@ -93,7 +96,7 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
             int index = mAppsView.getApps().getFocusedChildIndex();
             AppsGridLayoutManager layoutManager = (AppsGridLayoutManager)
                     mAppsView.getActiveRecyclerView().getLayoutManager();
-            if (layoutManager.findFirstVisibleItemPosition() == index
+            if (layoutManager.findFirstVisibleItemPosition() <= index
                     && index < parent.getChildCount()) {
                 decorationHandler.onFocusDraw(c, parent.getChildAt(index));
             }
@@ -156,6 +159,10 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
             if (view == null) {
                 return;
             }
+            if (view instanceof SelfDecoratingView) {
+                ((SelfDecoratingView) view).decorate(mFocusColor);
+                return;
+            }
             mPaint.setColor(mFocusColor);
             canvas.drawRoundRect(view.getLeft(), view.getTop(),
                     view.getRight(), view.getBottom(), mRadius, mRadius, mPaint);
@@ -169,4 +176,18 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
         }
     }
 
+    /**
+     * An interface for a view to draw highlight indicator
+     */
+    public interface SelfDecoratingView {
+        /**
+         * Removes decorations drawing if focus is acquired by another view
+         */
+        void removeDecoration();
+
+        /**
+         * Draws highlight indicator on view.
+         */
+        void decorate(int focusColor);
+    }
 }
diff --git a/src/com/android/launcher3/allapps/AllAppsStore.java b/src/com/android/launcher3/allapps/AllAppsStore.java
index 3ae0a18137..50fb60a841 100644
--- a/src/com/android/launcher3/allapps/AllAppsStore.java
+++ b/src/com/android/launcher3/allapps/AllAppsStore.java
@@ -18,6 +18,8 @@ package com.android.launcher3.allapps;
 import static com.android.launcher3.model.data.AppInfo.COMPONENT_KEY_COMPARATOR;
 import static com.android.launcher3.model.data.AppInfo.EMPTY_ARRAY;
 
+import android.content.ComponentName;
+import android.os.UserHandle;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -27,6 +29,7 @@ import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.PromiseAppInfo;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.PackageUserKey;
+import com.android.systemui.plugins.shared.SearchTarget;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -86,6 +89,19 @@ public class AllAppsStore {
         return index < 0 ? null : mApps[index];
     }
 
+    /**
+     * Gets AppInfo from {@link SearchTarget}
+     * TODO: SearchTarget should have userHandle and ComponentKey members
+     */
+    public AppInfo getAppFromSearchTarget(SearchTarget searchTarget) {
+        ComponentName cn = searchTarget.bundle.getParcelable("component_name");
+        UserHandle userHandle = searchTarget.bundle.getParcelable("user_handle");
+        if (cn == null) {
+            throw new IllegalStateException("Component name is required for AppInfo");
+        }
+        return getApp(new ComponentKey(cn, userHandle));
+    }
+
     public void enableDeferUpdates(int flag) {
         mDeferUpdatesFlags |= flag;
     }
diff --git a/src/com/android/launcher3/allapps/search/SearchEventTracker.java b/src/com/android/launcher3/allapps/search/SearchEventTracker.java
index 6bcde6c53b..c276434ca8 100644
--- a/src/com/android/launcher3/allapps/search/SearchEventTracker.java
+++ b/src/com/android/launcher3/allapps/search/SearchEventTracker.java
@@ -15,6 +15,8 @@
  */
 package com.android.launcher3.allapps.search;
 
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+
 import android.content.Context;
 
 import androidx.annotation.Nullable;
@@ -61,7 +63,7 @@ public class SearchEventTracker {
      */
     public void notifySearchTargetEvent(SearchTargetEvent searchTargetEvent) {
         if (mPlugin != null) {
-            mPlugin.notifySearchTargetEvent(searchTargetEvent);
+            UI_HELPER_EXECUTOR.post(() -> mPlugin.notifySearchTargetEvent(searchTargetEvent));
         }
     }
 
diff --git a/src/com/android/launcher3/views/HeroSearchResultView.java b/src/com/android/launcher3/views/HeroSearchResultView.java
index 9e56e00d60..e2ba93b5db 100644
--- a/src/com/android/launcher3/views/HeroSearchResultView.java
+++ b/src/com/android/launcher3/views/HeroSearchResultView.java
@@ -19,13 +19,11 @@ import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APP
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ShortcutInfo;
 import android.graphics.Point;
 import android.os.Bundle;
-import android.os.UserHandle;
 import android.util.AttributeSet;
 import android.util.Pair;
 import android.view.View;
@@ -51,7 +49,6 @@ import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.shortcuts.ShortcutDragPreviewProvider;
 import com.android.launcher3.touch.ItemLongClickListener;
-import com.android.launcher3.util.ComponentKey;
 import com.android.systemui.plugins.shared.SearchTarget;
 import com.android.systemui.plugins.shared.SearchTargetEvent;
 
@@ -122,7 +119,8 @@ public class HeroSearchResultView extends LinearLayout implements DragSource, Se
 
     @Override
     public void applySearchTarget(SearchTarget searchTarget) {
-        AppInfo appInfo = getAppInfo(searchTarget.bundle);
+        AllAppsStore apps = Launcher.getLauncher(getContext()).getAppsView().getAppsStore();
+        AppInfo appInfo = apps.getAppFromSearchTarget(searchTarget);
 //        TODO: replace this with searchTarget.shortcuts
         ArrayList<ShortcutInfo> infos = searchTarget.bundle.getParcelableArrayList(
                 SHORTCUTS_KEY);
@@ -156,13 +154,6 @@ public class HeroSearchResultView extends LinearLayout implements DragSource, Se
         SearchEventTracker.INSTANCE.get(getContext()).registerWeakHandler(searchTarget, this);
     }
 
-    private AppInfo getAppInfo(Bundle bundle) {
-        AllAppsStore apps = Launcher.getLauncher(getContext()).getAppsView().getAppsStore();
-        ComponentName cn = bundle.getParcelable("component_name");
-        UserHandle userHandle = bundle.getParcelable("user_handle");
-        return (cn != null) ? apps.getApp(new ComponentKey(cn, userHandle)) : null;
-    }
-
     @Override
     public Object[] getTargetInfo() {
         return mTargetInfo;
diff --git a/src/com/android/launcher3/views/ScrimView.java b/src/com/android/launcher3/views/ScrimView.java
index 15ff2f575b..77cec80fd7 100644
--- a/src/com/android/launcher3/views/ScrimView.java
+++ b/src/com/android/launcher3/views/ScrimView.java
@@ -42,7 +42,7 @@ import com.android.launcher3.util.Themes;
  */
 public class ScrimView<T extends Launcher> extends View implements Insettable, OnChangeListener {
 
-    private static final float SCRIM_ALPHA = .8f;
+    private static final float SCRIM_ALPHA = .75f;
     protected final T mLauncher;
     private final WallpaperColorInfo mWallpaperColorInfo;
     protected final int mEndScrim;
diff --git a/src/com/android/launcher3/views/SearchResultIcon.java b/src/com/android/launcher3/views/SearchResultIcon.java
new file mode 100644
index 0000000000..e0f9ab751a
--- /dev/null
+++ b/src/com/android/launcher3/views/SearchResultIcon.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.views;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+
+import com.android.launcher3.BubbleTextView;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.allapps.AllAppsStore;
+import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+import com.android.launcher3.allapps.search.SearchEventTracker;
+import com.android.launcher3.model.data.AppInfo;
+import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.touch.ItemLongClickListener;
+import com.android.systemui.plugins.shared.SearchTarget;
+import com.android.systemui.plugins.shared.SearchTargetEvent;
+
+/**
+ * A {@link BubbleTextView} representing a single cell result in AllApps
+ */
+public class SearchResultIcon extends BubbleTextView implements
+        AllAppsSearchBarController.SearchTargetHandler, View.OnClickListener,
+        View.OnLongClickListener {
+    private final Object[] mTargetInfo = createTargetInfo();
+    private final Launcher mLauncher;
+
+    private SearchTarget mSearchTarget;
+
+    public SearchResultIcon(Context context) {
+        this(context, null, 0);
+    }
+
+    public SearchResultIcon(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public SearchResultIcon(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        mLauncher = Launcher.getLauncher(getContext());
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        setLongPressTimeoutFactor(1f);
+        setOnFocusChangeListener(mLauncher.getFocusHandler());
+        setOnClickListener(this);
+        setOnLongClickListener(this);
+        getLayoutParams().height = mLauncher.getDeviceProfile().allAppsCellHeightPx;
+    }
+
+    @Override
+    public void applySearchTarget(SearchTarget searchTarget) {
+        mSearchTarget = searchTarget;
+        AllAppsStore appsStore = mLauncher.getAppsView().getAppsStore();
+        if (searchTarget.type == SearchTarget.ItemType.APP) {
+            AppInfo appInfo = appsStore.getAppFromSearchTarget(searchTarget);
+            applyFromApplicationInfo(appInfo);
+        }
+    }
+
+    @Override
+    public Object[] getTargetInfo() {
+        return mTargetInfo;
+    }
+
+    @Override
+    public void handleSelection(int eventType) {
+        SearchTargetEvent event = getSearchTargetEvent(mSearchTarget.type,
+                eventType);
+        if (mSearchTarget.type.equals(SearchTarget.ItemType.APP)) {
+            event.bundle = HeroSearchResultView.getAppBundle((ItemInfo) getTag());
+        }
+        SearchEventTracker.INSTANCE.get(mLauncher).notifySearchTargetEvent(event);
+    }
+
+    @Override
+    public void onClick(View view) {
+        handleSelection(SearchTargetEvent.SELECT);
+        mLauncher.getItemOnClickListener().onClick(view);
+    }
+
+    @Override
+    public boolean onLongClick(View view) {
+        handleSelection(SearchTargetEvent.LONG_PRESS);
+        return ItemLongClickListener.INSTANCE_ALL_APPS.onLongClick(view);
+    }
+}
diff --git a/src/com/android/launcher3/views/SearchResultIconRow.java b/src/com/android/launcher3/views/SearchResultIconRow.java
index ddeefaff3a..5115f69534 100644
--- a/src/com/android/launcher3/views/SearchResultIconRow.java
+++ b/src/com/android/launcher3/views/SearchResultIconRow.java
@@ -23,6 +23,7 @@ import android.app.RemoteAction;
 import android.content.Context;
 import android.content.pm.ShortcutInfo;
 import android.content.res.TypedArray;
+import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
@@ -44,6 +45,7 @@ import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.RemoteActionItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.touch.ItemClickHandler;
+import com.android.launcher3.util.Themes;
 import com.android.systemui.plugins.shared.SearchTarget;
 import com.android.systemui.plugins.shared.SearchTarget.ItemType;
 import com.android.systemui.plugins.shared.SearchTargetEvent;
@@ -97,6 +99,14 @@ public class SearchResultIconRow extends DoubleShadowBubbleTextView implements
         }
     }
 
+    @Override
+    protected void drawFocusHighlight(Canvas canvas) {
+        mHighlightPaint.setColor(mHighlightColor);
+        float r = Themes.getDialogCornerRadius(getContext());
+        canvas.drawRoundRect(0, 0, getWidth(), getHeight(), r, r, mHighlightPaint);
+    }
+
+
     @Override
     public void applySearchTarget(SearchTarget searchTarget) {
         if (searchTarget.mRemoteAction != null) {
-- 
GitLab


From 0960b45dbc1b7a838ce047f0a6247f1c473796f5 Mon Sep 17 00:00:00 2001
From: Pinyao Ting <pinyaoting@google.com>
Date: Wed, 14 Oct 2020 11:17:04 -0700
Subject: [PATCH 0251/1664] Fix the issue where shortcuts are removed in
 minimal device mode

When loading the workspace, Launcher pins/unpins shortcuts in comply
with the loaded workspace. Since minimal device mode creates a mostly
empty workspace, existing shortcuts are getting unpinned as a result.

To mitigate the issue this CL compares the db name and only invoke
sanitizeData when it matches the one defined in InvariantDeviceProfile.

Bug: 170611866
Test: manual
1. add some deep shortcut in workspace (e.g. long tap on chrome, drag
"incognito tab" to workspace)
2. opt-in to sunshine fishfood (g/sunshine-teamfood)
3. enable bedtime mode with minimal device in Settings -> Digital
Wellbeing -> Show Your Data -> Bedtime mode -> Customize -> minimal
device
4. toggle bedtime mode, wait for apps in minimal device to show, then
toggle off bedtime mode
5. verify the deep shortcut still exist

Change-Id: Ie18216ecb288e7481aa2404c4cb3ea418aee85cb
(cherry picked from commit 702ed2788678ac744c768aad6a6302e7cf91a26b)
---
 src/com/android/launcher3/LauncherProvider.java |  3 +++
 src/com/android/launcher3/LauncherSettings.java |  2 ++
 src/com/android/launcher3/model/LoaderTask.java | 15 +++++++++++++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 2973cf7278..aeed16aa28 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -188,6 +188,9 @@ public class LauncherProvider extends ContentProvider {
 
         SQLiteDatabase db = mOpenHelper.getWritableDatabase();
         Cursor result = qb.query(db, projection, args.where, args.args, null, null, sortOrder);
+        final Bundle extra = new Bundle();
+        extra.putString(LauncherSettings.Settings.EXTRA_DB_NAME, mOpenHelper.getDatabaseName());
+        result.setExtras(extra);
         result.setNotificationUri(getContext().getContentResolver(), uri);
 
         return result;
diff --git a/src/com/android/launcher3/LauncherSettings.java b/src/com/android/launcher3/LauncherSettings.java
index 58a418edec..d2758f53ad 100644
--- a/src/com/android/launcher3/LauncherSettings.java
+++ b/src/com/android/launcher3/LauncherSettings.java
@@ -358,6 +358,8 @@ public class LauncherSettings {
 
         public static final String EXTRA_VALUE = "value";
 
+        public static final String EXTRA_DB_NAME = "db_name";
+
         public static Bundle call(ContentResolver cr, String method) {
             return call(cr, method, null /* arg */);
         }
diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index 2b4520b613..fb11ff3039 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -41,6 +41,7 @@ import android.content.pm.PackageInstaller.SessionInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ShortcutInfo;
 import android.net.Uri;
+import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.text.TextUtils;
@@ -129,6 +130,7 @@ public class LoaderTask implements Runnable {
 
     private final Set<PackageUserKey> mPendingPackages = new HashSet<>();
     private boolean mItemsDeleted = false;
+    private String mDbName;
 
     public LoaderTask(LauncherAppState app, AllAppsList bgAllAppsList, BgDataModel dataModel,
             ModelDelegate modelDelegate, LoaderResults results) {
@@ -273,7 +275,14 @@ public class LoaderTask implements Runnable {
             if (FeatureFlags.FOLDER_NAME_SUGGEST.get()) {
                 loadFolderNames();
             }
-            sanitizeData();
+
+            // Sanitize data re-syncs widgets/shortcuts based on the workspace loaded from db.
+            // sanitizeData should not be invoked if the workspace is loaded from a db different
+            // from the main db as defined in the invariant device profile.
+            // (e.g. both grid preview and minimal device mode uses a different db)
+            if (mApp.getInvariantDeviceProfile().dbFile.equals(mDbName)) {
+                sanitizeData();
+            }
 
             verifyNotStopped();
             updateHandler.finish();
@@ -347,7 +356,9 @@ public class LoaderTask implements Runnable {
             final LoaderCursor c = new LoaderCursor(
                     contentResolver.query(contentUri, null, selection, null, null), contentUri,
                     mApp, mUserManagerState);
-
+            final Bundle extras = c.getExtras();
+            mDbName = extras == null
+                    ? null : extras.getString(LauncherSettings.Settings.EXTRA_DB_NAME);
             try {
                 final int appWidgetIdIndex = c.getColumnIndexOrThrow(
                         LauncherSettings.Favorites.APPWIDGET_ID);
-- 
GitLab


From 9228ff53c2fb26850b7bd92d86214a6aaebb11d3 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Mon, 12 Oct 2020 13:43:51 -0700
Subject: [PATCH 0252/1664] Trimming activity and task label

Bug: 170648272
Change-Id: Icd099acee65305e0aa0f98a2a301a0df8a27cf07
---
 .../com/android/quickstep/TaskIconCache.java  | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/TaskIconCache.java b/quickstep/src/com/android/quickstep/TaskIconCache.java
index 65e89cfa2f..dd0ed8f349 100644
--- a/quickstep/src/com/android/quickstep/TaskIconCache.java
+++ b/quickstep/src/com/android/quickstep/TaskIconCache.java
@@ -21,12 +21,14 @@ import static com.android.launcher3.uioverrides.QuickstepLauncher.GO_LOW_RAM_REC
 import android.app.ActivityManager.TaskDescription;
 import android.content.Context;
 import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.UserHandle;
+import android.text.TextUtils;
 import android.util.SparseArray;
 import android.view.accessibility.AccessibilityManager;
 
@@ -34,6 +36,7 @@ import androidx.annotation.WorkerThread;
 
 import com.android.launcher3.FastBitmapDrawable;
 import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.IconProvider;
 import com.android.launcher3.icons.LauncherIcons;
@@ -42,7 +45,6 @@ import com.android.quickstep.util.CancellableTask;
 import com.android.quickstep.util.TaskKeyLruCache;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.recents.model.Task.TaskKey;
-import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.PackageManagerWrapper;
 import com.android.systemui.shared.system.TaskDescriptionCompat;
 
@@ -163,9 +165,8 @@ public class TaskIconCache {
                         key.getComponent(), key.userId);
             }
             if (activityInfo != null) {
-                entry.contentDescription = ActivityManagerWrapper.getInstance()
-                        .getBadgedContentDescription(activityInfo, task.key.userId,
-                                task.taskDescription);
+                entry.contentDescription = getBadgedContentDescription(
+                        activityInfo, task.key.userId, task.taskDescription);
             }
         }
 
@@ -173,6 +174,21 @@ public class TaskIconCache {
         return entry;
     }
 
+    private String getBadgedContentDescription(ActivityInfo info, int userId, TaskDescription td) {
+        PackageManager pm = mContext.getPackageManager();
+        String taskLabel = td == null ? null : Utilities.trim(td.getLabel());
+        if (TextUtils.isEmpty(taskLabel)) {
+            taskLabel = Utilities.trim(info.loadLabel(pm));
+        }
+
+        String applicationLabel = Utilities.trim(info.applicationInfo.loadLabel(pm));
+        String badgedApplicationLabel = userId != UserHandle.myUserId()
+                ? pm.getUserBadgedLabel(applicationLabel, UserHandle.of(userId)).toString()
+                : applicationLabel;
+        return applicationLabel.equals(taskLabel)
+                ? badgedApplicationLabel : badgedApplicationLabel + " " + taskLabel;
+    }
+
     @WorkerThread
     private Drawable getDefaultIcon(int userId) {
         synchronized (mDefaultIcons) {
-- 
GitLab


From a68ac3e5dd23095cea7c872c0ff1c5042d1695ba Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Fri, 16 Oct 2020 10:48:28 -0700
Subject: [PATCH 0253/1664] Removing condition for CUJ tracing/metrics

Is doesn't reflect whether jank monitors is collecting metrics,
which will eventually be always true anyways.

Change-Id: Iaebdc838ed2b2cebd32c8c48d7e45bdd93f76fb4
---
 .../QuickstepAppTransitionManagerImpl.java    | 46 +++++++++----------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
index df1833d200..54a753c07f 100644
--- a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
@@ -802,33 +802,31 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
     }
 
     private void addCujInstrumentation(Animator anim, int cuj, String transition) {
-        if (Trace.isEnabled()) {
-            anim.addListener(new AnimationSuccessListener() {
-                @Override
-                public void onAnimationStart(Animator animation) {
-                    Trace.beginAsyncSection(transition, 0);
-                    InteractionJankMonitorWrapper.begin(cuj);
-                    super.onAnimationStart(animation);
-                }
+        anim.addListener(new AnimationSuccessListener() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+                Trace.beginAsyncSection(transition, 0);
+                InteractionJankMonitorWrapper.begin(cuj);
+                super.onAnimationStart(animation);
+            }
 
-                @Override
-                public void onAnimationCancel(Animator animation) {
-                    super.onAnimationCancel(animation);
-                    InteractionJankMonitorWrapper.cancel(cuj);
-                }
+            @Override
+            public void onAnimationCancel(Animator animation) {
+                super.onAnimationCancel(animation);
+                InteractionJankMonitorWrapper.cancel(cuj);
+            }
 
-                @Override
-                public void onAnimationSuccess(Animator animator) {
-                    InteractionJankMonitorWrapper.end(cuj);
-                }
+            @Override
+            public void onAnimationSuccess(Animator animator) {
+                InteractionJankMonitorWrapper.end(cuj);
+            }
 
-                @Override
-                public void onAnimationEnd(Animator animation) {
-                    super.onAnimationEnd(animation);
-                    Trace.endAsyncSection(TRANSITION_OPEN_LAUNCHER, 0);
-                }
-            });
-        }
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                super.onAnimationEnd(animation);
+                Trace.endAsyncSection(TRANSITION_OPEN_LAUNCHER, 0);
+            }
+        });
     }
 
     /**
-- 
GitLab


From 1f79eeda76246534697e92740defc7f73c3c8d14 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Fri, 16 Oct 2020 02:01:31 -0700
Subject: [PATCH 0254/1664] Remove hardcoded itemTypes from SearchTarget

- Introduces componentName and userHandle members to SearchTarget
- SearchTargetEvent now has searchTarget member
- Builder pattern for SearchTarget and SearchTargetEvent
- Search backend should add headers manually instead of launcher inferring sections

Bug: 171026321
Test: Manual
Change-Id: I28e0455e82b925277a17703b9aa061c8f9f15262
---
 .../launcher3/allapps/AllAppsGridAdapter.java |  16 +-
 .../launcher3/allapps/AllAppsStore.java       |  16 --
 .../search/AllAppsSearchBarController.java    |  44 ----
 .../allapps/search/SearchSectionInfo.java     |  12 +-
 .../launcher3/views/HeroSearchResultView.java |  60 ++---
 .../launcher3/views/SearchResultIcon.java     |  25 +-
 .../launcher3/views/SearchResultIconRow.java  |  59 ++---
 .../views/SearchResultPeopleView.java         |  35 ++-
 .../launcher3/views/SearchResultPlayItem.java |  20 +-
 .../views/SearchSectionHeaderView.java        |   9 +-
 .../views/SearchSettingsRowView.java          |  20 +-
 .../launcher3/views/SearchSliceWrapper.java   |  23 +-
 .../views/ThumbnailSearchResultView.java      |  37 +--
 .../systemui/plugins/shared/SearchTarget.java | 218 +++++++++---------
 .../plugins/shared/SearchTargetEvent.java     |  76 ++++--
 15 files changed, 296 insertions(+), 374 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index a1bf7ed5dc..f7731915e3 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -192,26 +192,15 @@ public class AllAppsGridAdapter extends
 
     /**
      * Extension of AdapterItem that contains an extra payload specific to item
-     *
-     * @param <T> Play load Type
      */
     public static class SearchAdapterItem extends AdapterItem {
         private SearchTarget mSearchTarget;
-        private String mSearchSessionId;
 
         public SearchAdapterItem(SearchTarget searchTarget, int type) {
             mSearchTarget = searchTarget;
             viewType = type;
         }
 
-        public void setSearchSessionId(String searchSessionId) {
-            mSearchSessionId = searchSessionId;
-        }
-
-        public String getSearchSessionId() {
-            return mSearchSessionId;
-        }
-
         public SearchTarget getSearchTarget() {
             return mSearchTarget;
         }
@@ -484,8 +473,7 @@ public class AllAppsGridAdapter extends
                 SearchAdapterItem slicePayload = (SearchAdapterItem) mApps.getAdapterItems().get(
                         position);
                 SearchTarget searchTarget = slicePayload.getSearchTarget();
-                sliceView.setTag(new SearchSliceWrapper(mLauncher, sliceView, searchTarget,
-                        slicePayload.getSearchSessionId(), slicePayload.position));
+                sliceView.setTag(new SearchSliceWrapper(mLauncher, sliceView, searchTarget));
 
                 break;
             case VIEW_TYPE_SEARCH_CORPUS_TITLE:
@@ -500,7 +488,7 @@ public class AllAppsGridAdapter extends
                 SearchAdapterItem item =
                         (SearchAdapterItem) mApps.getAdapterItems().get(position);
                 SearchTargetHandler payloadResultView = (SearchTargetHandler) holder.itemView;
-                payloadResultView.setup(item);
+                payloadResultView.applySearchTarget(item.getSearchTarget());
                 break;
             case VIEW_TYPE_ALL_APPS_DIVIDER:
                 // nothing to do
diff --git a/src/com/android/launcher3/allapps/AllAppsStore.java b/src/com/android/launcher3/allapps/AllAppsStore.java
index 50fb60a841..3ae0a18137 100644
--- a/src/com/android/launcher3/allapps/AllAppsStore.java
+++ b/src/com/android/launcher3/allapps/AllAppsStore.java
@@ -18,8 +18,6 @@ package com.android.launcher3.allapps;
 import static com.android.launcher3.model.data.AppInfo.COMPONENT_KEY_COMPARATOR;
 import static com.android.launcher3.model.data.AppInfo.EMPTY_ARRAY;
 
-import android.content.ComponentName;
-import android.os.UserHandle;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -29,7 +27,6 @@ import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.PromiseAppInfo;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.PackageUserKey;
-import com.android.systemui.plugins.shared.SearchTarget;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -89,19 +86,6 @@ public class AllAppsStore {
         return index < 0 ? null : mApps[index];
     }
 
-    /**
-     * Gets AppInfo from {@link SearchTarget}
-     * TODO: SearchTarget should have userHandle and ComponentKey members
-     */
-    public AppInfo getAppFromSearchTarget(SearchTarget searchTarget) {
-        ComponentName cn = searchTarget.bundle.getParcelable("component_name");
-        UserHandle userHandle = searchTarget.bundle.getParcelable("user_handle");
-        if (cn == null) {
-            throw new IllegalStateException("Component name is required for AppInfo");
-        }
-        return getApp(new ComponentKey(cn, userHandle));
-    }
-
     public void enableDeferUpdates(int flag) {
         mDeferUpdatesFlags |= flag;
     }
diff --git a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
index 6ba0421d57..9e6ca3403b 100644
--- a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
+++ b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
@@ -31,12 +31,10 @@ import com.android.launcher3.ExtendedEditText;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.allapps.AllAppsGridAdapter;
-import com.android.launcher3.allapps.AllAppsGridAdapter.SearchAdapterItem;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.systemui.plugins.AllAppsSearchPlugin;
 import com.android.systemui.plugins.shared.SearchTarget;
-import com.android.systemui.plugins.shared.SearchTargetEvent;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -208,56 +206,14 @@ public class AllAppsSearchBarController
 
     /**
      * An interface for supporting dynamic search results
-     *
-     * @param <T> Type of payload
      */
     public interface SearchTargetHandler {
-        /**
-         * Updates View using Adapter's payload
-         */
-
-        default void setup(SearchAdapterItem searchAdapterItem) {
-            Object[] targetInfo = getTargetInfo();
-            if (targetInfo != null) {
-                targetInfo[0] = searchAdapterItem.getSearchSessionId();
-                targetInfo[1] = searchAdapterItem.position;
-            }
-            applySearchTarget(searchAdapterItem.getSearchTarget());
-        }
 
         /**
          * Update view using values from {@link SearchTarget}
          */
         void applySearchTarget(SearchTarget searchTarget);
 
-        /**
-         * Gets object created by {@link SearchTargetHandler#createTargetInfo()}
-         */
-        default Object[] getTargetInfo() {
-            return null;
-        }
-
-        /**
-         * Creates a wrapper object to hold searchSessionId and item position
-         */
-        default Object[] createTargetInfo() {
-            return new Object[2];
-        }
-
-        /**
-         * Generates a SearchTargetEvent object for a PayloadHandlerView
-         */
-        default SearchTargetEvent getSearchTargetEvent(SearchTarget.ItemType itemType,
-                int eventType) {
-            Object[] targetInfo = getTargetInfo();
-            if (targetInfo == null) return null;
-
-            String searchSessionId = (String) targetInfo[0];
-            int position = (int) targetInfo[1];
-            return new SearchTargetEvent(itemType, eventType,
-                    position, searchSessionId);
-        }
-
         /**
          * Handles selection of SearchTarget
          */
diff --git a/src/com/android/launcher3/allapps/search/SearchSectionInfo.java b/src/com/android/launcher3/allapps/search/SearchSectionInfo.java
index e026e8449d..464df68c96 100644
--- a/src/com/android/launcher3/allapps/search/SearchSectionInfo.java
+++ b/src/com/android/launcher3/allapps/search/SearchSectionInfo.java
@@ -22,7 +22,7 @@ import com.android.launcher3.allapps.AllAppsSectionDecorator.SectionDecorationHa
  */
 public class SearchSectionInfo {
 
-    private String mTitle;
+    private String mSectionId;
     private SectionDecorationHandler mDecorationHandler;
 
     public int getPosStart() {
@@ -48,8 +48,8 @@ public class SearchSectionInfo {
         this(null);
     }
 
-    public SearchSectionInfo(String title) {
-        mTitle = title;
+    public SearchSectionInfo(String sectionId) {
+        mSectionId = sectionId;
     }
 
     public void setDecorationHandler(SectionDecorationHandler sectionDecorationHandler) {
@@ -62,9 +62,9 @@ public class SearchSectionInfo {
     }
 
     /**
-     * Returns the section's title
+     * Returns the section's ID
      */
-    public String getTitle() {
-        return mTitle == null ? "" : mTitle;
+    public String getSectionId() {
+        return mSectionId == null ? "" : mSectionId;
     }
 }
diff --git a/src/com/android/launcher3/views/HeroSearchResultView.java b/src/com/android/launcher3/views/HeroSearchResultView.java
index e2ba93b5db..a098df9f31 100644
--- a/src/com/android/launcher3/views/HeroSearchResultView.java
+++ b/src/com/android/launcher3/views/HeroSearchResultView.java
@@ -20,10 +20,8 @@ import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
 import android.content.Context;
-import android.content.Intent;
 import android.content.pm.ShortcutInfo;
 import android.graphics.Point;
-import android.os.Bundle;
 import android.util.AttributeSet;
 import android.util.Pair;
 import android.view.View;
@@ -49,24 +47,28 @@ import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.shortcuts.ShortcutDragPreviewProvider;
 import com.android.launcher3.touch.ItemLongClickListener;
+import com.android.launcher3.util.ComponentKey;
 import com.android.systemui.plugins.shared.SearchTarget;
 import com.android.systemui.plugins.shared.SearchTargetEvent;
 
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * A view representing a high confidence app search result that includes shortcuts
+ * TODO (sfufa@) consolidate this with SearchResultIconRow
  */
 public class HeroSearchResultView extends LinearLayout implements DragSource, SearchTargetHandler {
 
+    public static final String TARGET_TYPE_HERO_APP = "hero_app";
+
     public static final int MAX_SHORTCUTS_COUNT = 2;
-    public static final String SHORTCUTS_KEY = "shortcut_infos";
 
+    private SearchTarget mSearchTarget;
+    private BubbleTextView mBubbleTextView;
+    private View mIconView;
+    private BubbleTextView[] mDeepShortcutTextViews = new BubbleTextView[2];
 
-    private final Object[] mTargetInfo = createTargetInfo();
-    BubbleTextView mBubbleTextView;
-    View mIconView;
-    BubbleTextView[] mDeepShortcutTextViews = new BubbleTextView[2];
 
     public HeroSearchResultView(Context context) {
         super(context);
@@ -107,11 +109,9 @@ public class HeroSearchResultView extends LinearLayout implements DragSource, Se
                             grid.allAppsIconSizePx));
             bubbleTextView.setOnClickListener(view -> {
                 WorkspaceItemInfo itemInfo = (WorkspaceItemInfo) bubbleTextView.getTag();
-                SearchTargetEvent event = getSearchTargetEvent(
-                        SearchTarget.ItemType.APP_HERO,
-                        SearchTargetEvent.CHILD_SELECT);
-                event.bundle = getAppBundle(itemInfo);
-                event.bundle.putString("shortcut_id", itemInfo.getDeepShortcutId());
+                SearchTargetEvent event = new SearchTargetEvent.Builder(mSearchTarget,
+                        SearchTargetEvent.CHILD_SELECT).setShortcutPosition(itemInfo.rank).build();
+                SearchEventTracker.getInstance(getContext()).notifySearchTargetEvent(event);
                 launcher.getItemOnClickListener().onClick(view);
             });
         }
@@ -119,20 +119,20 @@ public class HeroSearchResultView extends LinearLayout implements DragSource, Se
 
     @Override
     public void applySearchTarget(SearchTarget searchTarget) {
+        mSearchTarget = searchTarget;
         AllAppsStore apps = Launcher.getLauncher(getContext()).getAppsView().getAppsStore();
-        AppInfo appInfo = apps.getAppFromSearchTarget(searchTarget);
-//        TODO: replace this with searchTarget.shortcuts
-        ArrayList<ShortcutInfo> infos = searchTarget.bundle.getParcelableArrayList(
-                SHORTCUTS_KEY);
+        AppInfo appInfo = apps.getApp(new ComponentKey(searchTarget.getComponentName(),
+                searchTarget.getUserHandle()));
+        List<ShortcutInfo> infos = mSearchTarget.getShortcutInfos();
 
         ArrayList<Pair<ShortcutInfo, ItemInfoWithIcon>> shortcuts = new ArrayList<>();
         for (int i = 0; infos != null && i < infos.size() && i < MAX_SHORTCUTS_COUNT; i++) {
             ShortcutInfo shortcutInfo = infos.get(i);
             ItemInfoWithIcon si = new WorkspaceItemInfo(shortcutInfo, getContext());
+            si.rank = i;
             shortcuts.add(new Pair<>(shortcutInfo, si));
         }
 
-
         mBubbleTextView.applyFromApplicationInfo(appInfo);
         mIconView.setBackground(mBubbleTextView.getIcon());
         mIconView.setTag(appInfo);
@@ -154,11 +154,6 @@ public class HeroSearchResultView extends LinearLayout implements DragSource, Se
         SearchEventTracker.INSTANCE.get(getContext()).registerWeakHandler(searchTarget, this);
     }
 
-    @Override
-    public Object[] getTargetInfo() {
-        return mTargetInfo;
-    }
-
     @Override
     public void onDropCompleted(View target, DropTarget.DragObject d, boolean success) {
         mBubbleTextView.setVisibility(VISIBLE);
@@ -194,9 +189,8 @@ public class HeroSearchResultView extends LinearLayout implements DragSource, Se
             mLauncher.getWorkspace().beginDragShared(mContainer.mBubbleTextView,
                     draggableView, mContainer, itemInfo, previewProvider, new DragOptions());
 
-            SearchTargetEvent event = mContainer.getSearchTargetEvent(
-                    SearchTarget.ItemType.APP_HERO, SearchTargetEvent.LONG_PRESS);
-            event.bundle = getAppBundle(itemInfo);
+            SearchTargetEvent event = new SearchTargetEvent.Builder(mContainer.mSearchTarget,
+                    SearchTargetEvent.LONG_PRESS).build();
             SearchEventTracker.INSTANCE.get(mLauncher).notifySearchTargetEvent(event);
             return false;
         }
@@ -209,19 +203,7 @@ public class HeroSearchResultView extends LinearLayout implements DragSource, Se
         Launcher launcher = Launcher.getLauncher(getContext());
         launcher.startActivitySafely(this, itemInfo.getIntent(), itemInfo);
 
-        SearchTargetEvent event = getSearchTargetEvent(
-                SearchTarget.ItemType.APP_HERO, eventType);
-        event.bundle = getAppBundle(itemInfo);
-        SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(event);
-    }
-
-    /**
-     * Helper method to generate {@link SearchTargetEvent} bundle from {@link ItemInfo}
-     */
-    public static Bundle getAppBundle(ItemInfo itemInfo) {
-        Bundle b = new Bundle();
-        b.putParcelable(Intent.EXTRA_COMPONENT_NAME, itemInfo.getTargetComponent());
-        b.putParcelable(Intent.EXTRA_USER, itemInfo.user);
-        return b;
+        SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(
+                new SearchTargetEvent.Builder(mSearchTarget, eventType).build());
     }
 }
diff --git a/src/com/android/launcher3/views/SearchResultIcon.java b/src/com/android/launcher3/views/SearchResultIcon.java
index e0f9ab751a..51214aec0b 100644
--- a/src/com/android/launcher3/views/SearchResultIcon.java
+++ b/src/com/android/launcher3/views/SearchResultIcon.java
@@ -25,8 +25,8 @@ import com.android.launcher3.allapps.AllAppsStore;
 import com.android.launcher3.allapps.search.AllAppsSearchBarController;
 import com.android.launcher3.allapps.search.SearchEventTracker;
 import com.android.launcher3.model.data.AppInfo;
-import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.touch.ItemLongClickListener;
+import com.android.launcher3.util.ComponentKey;
 import com.android.systemui.plugins.shared.SearchTarget;
 import com.android.systemui.plugins.shared.SearchTargetEvent;
 
@@ -36,7 +36,10 @@ import com.android.systemui.plugins.shared.SearchTargetEvent;
 public class SearchResultIcon extends BubbleTextView implements
         AllAppsSearchBarController.SearchTargetHandler, View.OnClickListener,
         View.OnLongClickListener {
-    private final Object[] mTargetInfo = createTargetInfo();
+
+
+    public static final String TARGET_TYPE_APP = "app";
+
     private final Launcher mLauncher;
 
     private SearchTarget mSearchTarget;
@@ -68,25 +71,17 @@ public class SearchResultIcon extends BubbleTextView implements
     public void applySearchTarget(SearchTarget searchTarget) {
         mSearchTarget = searchTarget;
         AllAppsStore appsStore = mLauncher.getAppsView().getAppsStore();
-        if (searchTarget.type == SearchTarget.ItemType.APP) {
-            AppInfo appInfo = appsStore.getAppFromSearchTarget(searchTarget);
+        if (searchTarget.getItemType().equals(TARGET_TYPE_APP)) {
+            AppInfo appInfo = appsStore.getApp(new ComponentKey(searchTarget.getComponentName(),
+                    searchTarget.getUserHandle()));
             applyFromApplicationInfo(appInfo);
         }
     }
 
-    @Override
-    public Object[] getTargetInfo() {
-        return mTargetInfo;
-    }
-
     @Override
     public void handleSelection(int eventType) {
-        SearchTargetEvent event = getSearchTargetEvent(mSearchTarget.type,
-                eventType);
-        if (mSearchTarget.type.equals(SearchTarget.ItemType.APP)) {
-            event.bundle = HeroSearchResultView.getAppBundle((ItemInfo) getTag());
-        }
-        SearchEventTracker.INSTANCE.get(mLauncher).notifySearchTargetEvent(event);
+        SearchEventTracker.INSTANCE.get(mLauncher).notifySearchTargetEvent(
+                new SearchTargetEvent.Builder(mSearchTarget, eventType).build());
     }
 
     @Override
diff --git a/src/com/android/launcher3/views/SearchResultIconRow.java b/src/com/android/launcher3/views/SearchResultIconRow.java
index 5115f69534..5fb36b9da9 100644
--- a/src/com/android/launcher3/views/SearchResultIconRow.java
+++ b/src/com/android/launcher3/views/SearchResultIconRow.java
@@ -26,7 +26,6 @@ import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.os.Bundle;
 import android.util.AttributeSet;
 import android.widget.EditText;
 
@@ -47,7 +46,6 @@ import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.touch.ItemClickHandler;
 import com.android.launcher3.util.Themes;
 import com.android.systemui.plugins.shared.SearchTarget;
-import com.android.systemui.plugins.shared.SearchTarget.ItemType;
 import com.android.systemui.plugins.shared.SearchTargetEvent;
 
 /**
@@ -56,11 +54,19 @@ import com.android.systemui.plugins.shared.SearchTargetEvent;
 public class SearchResultIconRow extends DoubleShadowBubbleTextView implements
         AllAppsSearchBarController.SearchTargetHandler {
 
-    private final Object[] mTargetInfo = createTargetInfo();
+
+    public static final String TARGET_TYPE_REMOTE_ACTION = "remote_action";
+    public static final String TARGET_TYPE_SUGGEST = "suggest";
+    public static final String TARGET_TYPE_SHORTCUT = "shortcut";
+
+
+    public static final String REMOTE_ACTION_SHOULD_START = "should_start_for_result";
+    public static final String REMOTE_ACTION_TOKEN = "action_token";
+
     private final int mCustomIconResId;
     private final boolean mMatchesInset;
 
-    private ShortcutInfo mShortcutInfo;
+    private SearchTarget mSearchTarget;
 
 
     public SearchResultIconRow(@NonNull Context context) {
@@ -109,26 +115,28 @@ public class SearchResultIconRow extends DoubleShadowBubbleTextView implements
 
     @Override
     public void applySearchTarget(SearchTarget searchTarget) {
-        if (searchTarget.mRemoteAction != null) {
-            prepareUsingRemoteAction(searchTarget.mRemoteAction,
-                    searchTarget.bundle.getString(SearchTarget.REMOTE_ACTION_TOKEN),
-                    searchTarget.bundle.getBoolean(SearchTarget.REMOTE_ACTION_SHOULD_START),
-                    searchTarget.type == ItemType.ACTION);
-        } else {
-            prepareUsingShortcutInfo(searchTarget.shortcuts.get(0));
+        mSearchTarget = searchTarget;
+        String type = searchTarget.getItemType();
+        if (type.equals(TARGET_TYPE_REMOTE_ACTION) || type.equals(TARGET_TYPE_SUGGEST)) {
+            prepareUsingRemoteAction(searchTarget.getRemoteAction(),
+                    searchTarget.getExtras().getString(REMOTE_ACTION_TOKEN),
+                    searchTarget.getExtras().getBoolean(REMOTE_ACTION_SHOULD_START),
+                    type.equals(TARGET_TYPE_SUGGEST));
+
+        } else if (type.equals(TARGET_TYPE_SHORTCUT)) {
+            prepareUsingShortcutInfo(searchTarget.getShortcutInfos().get(0));
         }
         setOnClickListener(v -> handleSelection(SearchTargetEvent.SELECT));
         SearchEventTracker.INSTANCE.get(getContext()).registerWeakHandler(searchTarget, this);
     }
 
     private void prepareUsingShortcutInfo(ShortcutInfo shortcutInfo) {
-        mShortcutInfo = shortcutInfo;
-        WorkspaceItemInfo workspaceItemInfo = new WorkspaceItemInfo(mShortcutInfo, getContext());
+        WorkspaceItemInfo workspaceItemInfo = new WorkspaceItemInfo(shortcutInfo, getContext());
         applyFromWorkspaceItem(workspaceItemInfo);
         LauncherAppState launcherAppState = LauncherAppState.getInstance(getContext());
         if (!loadIconFromResource()) {
             MODEL_EXECUTOR.execute(() -> {
-                launcherAppState.getIconCache().getShortcutIcon(workspaceItemInfo, mShortcutInfo);
+                launcherAppState.getIconCache().getShortcutIcon(workspaceItemInfo, shortcutInfo);
                 reapplyItemInfoAsync(workspaceItemInfo);
             });
         }
@@ -173,33 +181,16 @@ public class SearchResultIconRow extends DoubleShadowBubbleTextView implements
         MAIN_EXECUTOR.post(() -> reapplyItemInfo(itemInfoWithIcon));
     }
 
-    @Override
-    public Object[] getTargetInfo() {
-        return mTargetInfo;
-    }
-
     @Override
     public void handleSelection(int eventType) {
         ItemInfo itemInfo = (ItemInfo) getTag();
         Launcher launcher = Launcher.getLauncher(getContext());
-        final SearchTargetEvent searchTargetEvent;
         if (itemInfo instanceof WorkspaceItemInfo) {
             ItemClickHandler.onClickAppShortcut(this, (WorkspaceItemInfo) itemInfo, launcher);
-            searchTargetEvent = getSearchTargetEvent(SearchTarget.ItemType.SHORTCUT,
-                    eventType);
-            searchTargetEvent.shortcut = mShortcutInfo;
         } else {
-            RemoteActionItemInfo remoteItemInfo = (RemoteActionItemInfo) itemInfo;
-            ItemClickHandler.onClickRemoteAction(launcher, remoteItemInfo);
-            searchTargetEvent = getSearchTargetEvent(ItemType.ACTION,
-                    eventType);
-            searchTargetEvent.bundle = new Bundle();
-            searchTargetEvent.remoteAction = remoteItemInfo.getRemoteAction();
-            searchTargetEvent.bundle.putBoolean(SearchTarget.REMOTE_ACTION_SHOULD_START,
-                    remoteItemInfo.shouldStartInLauncher());
-            searchTargetEvent.bundle.putString(SearchTarget.REMOTE_ACTION_TOKEN,
-                    remoteItemInfo.getToken());
+            ItemClickHandler.onClickRemoteAction(launcher, (RemoteActionItemInfo) itemInfo);
         }
-        SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(searchTargetEvent);
+        SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(
+                new SearchTargetEvent.Builder(mSearchTarget, eventType).build());
     }
 }
diff --git a/src/com/android/launcher3/views/SearchResultPeopleView.java b/src/com/android/launcher3/views/SearchResultPeopleView.java
index 18bc99a3f9..e499bd5b66 100644
--- a/src/com/android/launcher3/views/SearchResultPeopleView.java
+++ b/src/com/android/launcher3/views/SearchResultPeopleView.java
@@ -57,6 +57,8 @@ import java.util.ArrayList;
 public class SearchResultPeopleView extends LinearLayout implements
         AllAppsSearchBarController.SearchTargetHandler {
 
+    public static final String TARGET_TYPE_PEOPLE = "people";
+
     private final int mIconSize;
     private final int mButtonSize;
     private final PackageManager mPackageManager;
@@ -64,7 +66,9 @@ public class SearchResultPeopleView extends LinearLayout implements
     private TextView mTitleView;
     private ImageButton[] mProviderButtons = new ImageButton[3];
     private Intent mIntent;
-    private final Object[] mTargetInfo = createTargetInfo();
+
+
+    private SearchTarget mSearchTarget;
 
     public SearchResultPeopleView(Context context) {
         this(context, null, 0);
@@ -102,7 +106,8 @@ public class SearchResultPeopleView extends LinearLayout implements
 
     @Override
     public void applySearchTarget(SearchTarget searchTarget) {
-        Bundle payload = searchTarget.bundle;
+        mSearchTarget = searchTarget;
+        Bundle payload = searchTarget.getExtras();
         mTitleView.setText(payload.getString("title"));
         mIntent = payload.getParcelable("intent");
         Bitmap contactIcon = payload.getParcelable("icon");
@@ -176,23 +181,15 @@ public class SearchResultPeopleView extends LinearLayout implements
         }
     }
 
-    @Override
-    public Object[] getTargetInfo() {
-        return mTargetInfo;
-    }
-
     private void setupProviderButton(ImageButton button, Bundle provider, Intent intent) {
         Launcher launcher = Launcher.getLauncher(getContext());
         button.setOnClickListener(b -> {
             launcher.startActivitySafely(b, intent, null);
-            SearchTargetEvent event = getSearchTargetEvent(
-                    SearchTarget.ItemType.PEOPLE,
-                    SearchTargetEvent.CHILD_SELECT);
-            event.bundle = new Bundle();
-            event.bundle.putParcelable("intent", intent);
-            event.bundle.putString("title", mTitleView.getText().toString());
-            event.bundle.putBundle("provider", provider);
-            SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(event);
+            Bundle bundle = new Bundle();
+            bundle.putBundle("provider", provider);
+            SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(
+                    new SearchTargetEvent.Builder(mSearchTarget,
+                            SearchTargetEvent.CHILD_SELECT).setExtras(bundle).build());
         });
     }
 
@@ -201,12 +198,8 @@ public class SearchResultPeopleView extends LinearLayout implements
         if (mIntent != null) {
             Launcher launcher = Launcher.getLauncher(getContext());
             launcher.startActivitySafely(this, mIntent, null);
-            SearchTargetEvent event = getSearchTargetEvent(SearchTarget.ItemType.PEOPLE,
-                    eventType);
-            event.bundle = new Bundle();
-            event.bundle.putParcelable("intent", mIntent);
-            event.bundle.putString("title", mTitleView.getText().toString());
-            SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(event);
+            SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(
+                    new SearchTargetEvent.Builder(mSearchTarget, eventType).build());
         }
     }
 }
diff --git a/src/com/android/launcher3/views/SearchResultPlayItem.java b/src/com/android/launcher3/views/SearchResultPlayItem.java
index 39a83045e4..6d85955f91 100644
--- a/src/com/android/launcher3/views/SearchResultPlayItem.java
+++ b/src/com/android/launcher3/views/SearchResultPlayItem.java
@@ -58,11 +58,12 @@ import java.net.URLConnection;
 public class SearchResultPlayItem extends LinearLayout implements
         AllAppsSearchBarController.SearchTargetHandler {
 
+    public static final String TARGET_TYPE_PLAY = "play";
+
     private static final int BITMAP_CROP_MASK_COLOR = 0xff424242;
     final Paint mIconPaint = new Paint();
     final Rect mTempRect = new Rect();
     private final DeviceProfile mDeviceProfile;
-    private final Object[] mTargetInfo = createTargetInfo();
     private View mIconView;
     private TextView mTitleView;
     private TextView[] mDetailViews = new TextView[3];
@@ -70,6 +71,8 @@ public class SearchResultPlayItem extends LinearLayout implements
     private String mPackageName;
     private boolean mIsInstantGame;
 
+    private SearchTarget mSearchTarget;
+
 
     public SearchResultPlayItem(Context context) {
         this(context, null, 0);
@@ -128,7 +131,8 @@ public class SearchResultPlayItem extends LinearLayout implements
 
     @Override
     public void applySearchTarget(SearchTarget searchTarget) {
-        Bundle bundle = searchTarget.bundle;
+        mSearchTarget = searchTarget;
+        Bundle bundle = searchTarget.getExtras();
         SearchEventTracker.INSTANCE.get(getContext()).registerWeakHandler(searchTarget, this);
         if (bundle.getString("package", "").equals(mPackageName)) {
             return;
@@ -160,11 +164,6 @@ public class SearchResultPlayItem extends LinearLayout implements
         });
     }
 
-    @Override
-    public Object[] getTargetInfo() {
-        return mTargetInfo;
-    }
-
     private void showIfNecessary(TextView textView, @Nullable String string) {
         if (string == null || string.isEmpty()) {
             textView.setVisibility(GONE);
@@ -201,10 +200,7 @@ public class SearchResultPlayItem extends LinearLayout implements
     }
 
     private void logSearchEvent(int eventType) {
-        SearchTargetEvent searchTargetEvent = getSearchTargetEvent(
-                SearchTarget.ItemType.PLAY_RESULTS, eventType);
-        searchTargetEvent.bundle = new Bundle();
-        searchTargetEvent.bundle.putString("package_name", mPackageName);
-        SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(searchTargetEvent);
+        SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(
+                new SearchTargetEvent.Builder(mSearchTarget, eventType).build());
     }
 }
diff --git a/src/com/android/launcher3/views/SearchSectionHeaderView.java b/src/com/android/launcher3/views/SearchSectionHeaderView.java
index 370b92148c..326c23d1dc 100644
--- a/src/com/android/launcher3/views/SearchSectionHeaderView.java
+++ b/src/com/android/launcher3/views/SearchSectionHeaderView.java
@@ -29,6 +29,8 @@ import com.android.systemui.plugins.shared.SearchTarget;
  */
 public class SearchSectionHeaderView extends TextView implements
         AllAppsSearchBarController.SearchTargetHandler {
+    public static final String TARGET_TYPE_SECTION_HEADER = "section_header";
+
     public SearchSectionHeaderView(Context context) {
         super(context);
     }
@@ -44,7 +46,7 @@ public class SearchSectionHeaderView extends TextView implements
 
     @Override
     public void applySearchTarget(SearchTarget searchTarget) {
-        String title = searchTarget.type.getTitle();
+        String title = searchTarget.getExtras().getString("title");
         if (title == null || !title.isEmpty()) {
             setText(title);
             setVisibility(VISIBLE);
@@ -52,9 +54,4 @@ public class SearchSectionHeaderView extends TextView implements
             setVisibility(INVISIBLE);
         }
     }
-
-    @Override
-    public Object[] getTargetInfo() {
-        return null;
-    }
 }
diff --git a/src/com/android/launcher3/views/SearchSettingsRowView.java b/src/com/android/launcher3/views/SearchSettingsRowView.java
index ac69548840..30f686c86e 100644
--- a/src/com/android/launcher3/views/SearchSettingsRowView.java
+++ b/src/com/android/launcher3/views/SearchSettingsRowView.java
@@ -42,11 +42,14 @@ import java.util.ArrayList;
 public class SearchSettingsRowView extends LinearLayout implements
         View.OnClickListener, AllAppsSearchBarController.SearchTargetHandler {
 
+    public static final String TARGET_TYPE_SETTINGS_ROW = "settings_row";
+
+
     private TextView mTitleView;
     private TextView mDescriptionView;
     private TextView mBreadcrumbsView;
     private Intent mIntent;
-    private final Object[] mTargetInfo = createTargetInfo();
+    private SearchTarget mSearchTarget;
 
 
     public SearchSettingsRowView(@NonNull Context context) {
@@ -74,7 +77,8 @@ public class SearchSettingsRowView extends LinearLayout implements
 
     @Override
     public void applySearchTarget(SearchTarget searchTarget) {
-        Bundle bundle = searchTarget.bundle;
+        mSearchTarget = searchTarget;
+        Bundle bundle = searchTarget.getExtras();
         mIntent = bundle.getParcelable("intent");
         showIfAvailable(mTitleView, bundle.getString("title"));
         showIfAvailable(mDescriptionView, bundle.getString("description"));
@@ -85,11 +89,6 @@ public class SearchSettingsRowView extends LinearLayout implements
         SearchEventTracker.INSTANCE.get(getContext()).registerWeakHandler(searchTarget, this);
     }
 
-    @Override
-    public Object[] getTargetInfo() {
-        return mTargetInfo;
-    }
-
     private void showIfAvailable(TextView view, @Nullable String string) {
         if (TextUtils.isEmpty(string)) {
             view.setVisibility(GONE);
@@ -112,10 +111,7 @@ public class SearchSettingsRowView extends LinearLayout implements
         Launcher launcher = Launcher.getLauncher(getContext());
         launcher.startActivityForResult(mIntent, 0);
 
-        SearchTargetEvent searchTargetEvent = getSearchTargetEvent(
-                SearchTarget.ItemType.SETTINGS_ROW, eventType);
-        searchTargetEvent.bundle = new Bundle();
-        searchTargetEvent.bundle.putParcelable("intent", mIntent);
-        SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(searchTargetEvent);
+        SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(
+                new SearchTargetEvent.Builder(mSearchTarget, eventType).build());
     }
 }
diff --git a/src/com/android/launcher3/views/SearchSliceWrapper.java b/src/com/android/launcher3/views/SearchSliceWrapper.java
index b088237034..f8a7dc08d6 100644
--- a/src/com/android/launcher3/views/SearchSliceWrapper.java
+++ b/src/com/android/launcher3/views/SearchSliceWrapper.java
@@ -17,7 +17,6 @@ package com.android.launcher3.views;
 
 import android.content.Context;
 import android.net.Uri;
-import android.os.Bundle;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
@@ -38,6 +37,8 @@ import com.android.systemui.plugins.shared.SearchTargetEvent;
  */
 public class SearchSliceWrapper implements SliceView.OnSliceActionListener {
 
+    public static final String TARGET_TYPE_SLICE = "settings_slice";
+
     private static final String TAG = "SearchSliceController";
     private static final String URI_EXTRA_KEY = "slice_uri";
 
@@ -45,16 +46,10 @@ public class SearchSliceWrapper implements SliceView.OnSliceActionListener {
     private final Launcher mLauncher;
     private final SearchTarget mSearchTarget;
     private final SliceView mSliceView;
-    //TODO: remove these as we move to tracking search results individually with unique ID
-    private final int mPosition;
-    private final String mSessionId;
     private LiveData<Slice> mSliceLiveData;
 
-    public SearchSliceWrapper(Context context, SliceView sliceView,
-            SearchTarget searchTarget, String sessionId, int position) {
+    public SearchSliceWrapper(Context context, SliceView sliceView, SearchTarget searchTarget) {
         mLauncher = Launcher.getLauncher(context);
-        mPosition = position;
-        mSessionId = sessionId;
         mSearchTarget = searchTarget;
         mSliceView = sliceView;
         sliceView.setOnSliceActionListener(this);
@@ -76,16 +71,12 @@ public class SearchSliceWrapper implements SliceView.OnSliceActionListener {
 
     @Override
     public void onSliceAction(@NonNull EventInfo info, @NonNull SliceItem item) {
-        SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
-                SearchTarget.ItemType.SETTINGS_SLICE,
-                SearchTargetEvent.CHILD_SELECT, mPosition,
-                mSessionId);
-        searchTargetEvent.bundle = new Bundle();
-        searchTargetEvent.bundle.putParcelable(URI_EXTRA_KEY, getSliceUri());
-        SearchEventTracker.INSTANCE.get(mLauncher).notifySearchTargetEvent(searchTargetEvent);
+        SearchEventTracker.INSTANCE.get(mLauncher).notifySearchTargetEvent(
+                new SearchTargetEvent.Builder(mSearchTarget,
+                        SearchTargetEvent.CHILD_SELECT).build());
     }
 
     private Uri getSliceUri() {
-        return mSearchTarget.bundle.getParcelable(URI_EXTRA_KEY);
+        return mSearchTarget.getExtras().getParcelable(URI_EXTRA_KEY);
     }
 }
diff --git a/src/com/android/launcher3/views/ThumbnailSearchResultView.java b/src/com/android/launcher3/views/ThumbnailSearchResultView.java
index 21212327b6..d11b1ef8bd 100644
--- a/src/com/android/launcher3/views/ThumbnailSearchResultView.java
+++ b/src/com/android/launcher3/views/ThumbnailSearchResultView.java
@@ -15,6 +15,9 @@
  */
 package com.android.launcher3.views;
 
+import static com.android.launcher3.views.SearchResultIconRow.REMOTE_ACTION_SHOULD_START;
+import static com.android.launcher3.views.SearchResultIconRow.REMOTE_ACTION_TOKEN;
+
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -42,7 +45,10 @@ import com.android.systemui.plugins.shared.SearchTargetEvent;
 public class ThumbnailSearchResultView extends androidx.appcompat.widget.AppCompatImageView
         implements AllAppsSearchBarController.SearchTargetHandler {
 
-    private final Object[] mTargetInfo = createTargetInfo();
+    public static final String TARGET_TYPE_SCREENSHOT = "screenshot";
+    public static final String TARGET_TYPE_SCREENSHOT_LEGACY = "screenshot_legacy";
+
+    private SearchTarget mSearchTarget;
 
     public ThumbnailSearchResultView(Context context) {
         super(context);
@@ -66,29 +72,29 @@ public class ThumbnailSearchResultView extends androidx.appcompat.widget.AppComp
         } else {
             ItemClickHandler.onClickAppShortcut(this, (WorkspaceItemInfo) itemInfo, launcher);
         }
-        SearchTargetEvent e = getSearchTargetEvent(SearchTarget.ItemType.SCREENSHOT, eventType);
-        SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(e);
+        SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(
+                new SearchTargetEvent.Builder(mSearchTarget, eventType).build());
     }
 
     @Override
     public void applySearchTarget(SearchTarget target) {
+        mSearchTarget = target;
         Bitmap bitmap;
-        if (target.mRemoteAction != null) {
-            RemoteActionItemInfo itemInfo = new RemoteActionItemInfo(target.mRemoteAction,
-                    target.bundle.getString(SearchTarget.REMOTE_ACTION_TOKEN),
-                    target.bundle.getBoolean(SearchTarget.REMOTE_ACTION_SHOULD_START));
-            bitmap = ((BitmapDrawable) target.mRemoteAction.getIcon()
+        if (target.getRemoteAction() != null) {
+            RemoteActionItemInfo itemInfo = new RemoteActionItemInfo(target.getRemoteAction(),
+                    target.getExtras().getString(REMOTE_ACTION_TOKEN),
+                    target.getExtras().getBoolean(REMOTE_ACTION_SHOULD_START));
+            bitmap = ((BitmapDrawable) target.getRemoteAction().getIcon()
                     .loadDrawable(getContext())).getBitmap();
-            Bitmap crop = Bitmap.createBitmap(bitmap, 0,
+            // crop
+            bitmap = Bitmap.createBitmap(bitmap, 0,
                     bitmap.getHeight() / 2 - bitmap.getWidth() / 2,
                     bitmap.getWidth(), bitmap.getWidth());
-            bitmap = crop;
-            setTag(itemInfo);
         } else {
-            bitmap = (Bitmap) target.bundle.getParcelable("bitmap");
+            bitmap = (Bitmap) target.getExtras().getParcelable("bitmap");
             WorkspaceItemInfo itemInfo = new WorkspaceItemInfo();
             itemInfo.intent = new Intent(Intent.ACTION_VIEW)
-                    .setData(Uri.parse(target.bundle.getString("uri")))
+                    .setData(Uri.parse(target.getExtras().getString("uri")))
                     .setType("image/*")
                     .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             setTag(itemInfo);
@@ -99,9 +105,4 @@ public class ThumbnailSearchResultView extends androidx.appcompat.widget.AppComp
         setOnClickListener(v -> handleSelection(SearchTargetEvent.SELECT));
         SearchEventTracker.INSTANCE.get(getContext()).registerWeakHandler(target, this);
     }
-
-    @Override
-    public Object[] getTargetInfo() {
-        return mTargetInfo;
-    }
 }
diff --git a/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java b/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
index 3f0dc39cc1..2c7972e908 100644
--- a/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
+++ b/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
@@ -16,8 +16,10 @@
 package com.android.systemui.plugins.shared;
 
 import android.app.RemoteAction;
+import android.content.ComponentName;
 import android.content.pm.ShortcutInfo;
 import android.os.Bundle;
+import android.os.UserHandle;
 
 import java.util.List;
 
@@ -26,139 +28,145 @@ import java.util.List;
  */
 public class SearchTarget implements Comparable<SearchTarget> {
 
+    private final String mItemId;
+    private final String mItemType;
+    private final float mScore;
+
+    private final ComponentName mComponentName;
+    private final UserHandle mUserHandle;
+    private final List<ShortcutInfo> mShortcutInfos;
+    //TODO: (sfufa) replace with a list of a custom type
+    private final RemoteAction mRemoteAction;
+    private final Bundle mExtras;
+
+    private SearchTarget(String itemId, String itemType, float score,
+            ComponentName componentName, UserHandle userHandle, List<ShortcutInfo> shortcutInfos,
+            RemoteAction remoteAction, Bundle extras) {
+        mItemId = itemId;
+        mItemType = itemType;
+        mScore = score;
+        mComponentName = componentName;
+        mUserHandle = userHandle;
+        mShortcutInfos = shortcutInfos;
+        mExtras = extras;
+        mRemoteAction = remoteAction;
+    }
 
-    /**
-     * A bundle key for boolean value of whether remote action should be started in launcher or not
-     */
-    public static final String REMOTE_ACTION_SHOULD_START = "should_start_for_result";
-    public static final String REMOTE_ACTION_TOKEN = "action_token";
+    public String getItemId() {
+        return mItemId;
+    }
 
+    public String getItemType() {
+        return mItemType;
+    }
 
-    public enum ViewType {
+    public ComponentName getComponentName() {
+        return mComponentName;
+    }
 
-        /**
-         * Consists of N number of icons. (N: launcher column count)
-         */
-        TOP_HIT(0),
+    public UserHandle getUserHandle() {
+        return mUserHandle;
+    }
 
-        /**
-         * Consists of 1 icon and two subsidiary icons.
-         */
-        HERO(1),
+    public float getScore() {
+        return mScore;
+    }
 
-        /**
-         * Main/sub/breadcrumb texts are rendered.
-         */
-        DETAIL(2),
+    public List<ShortcutInfo> getShortcutInfos() {
+        return mShortcutInfos;
+    }
 
-        /**
-         * Consists of an icon, three detail strings.
-         */
-        ROW(3),
+    public Bundle getExtras() {
+        return mExtras;
+    }
 
-        /**
-         * Consists of an icon, three detail strings and a button.
-         */
-        ROW_WITH_BUTTON(4),
+    public RemoteAction getRemoteAction() {
+        return mRemoteAction;
+    }
 
-        /**
-         * Consists of a single slice view
-         */
-        SLICE(5),
+    @Override
+    public int compareTo(SearchTarget o) {
+        return Float.compare(o.mScore, mScore);
+    }
 
-        /**
-         * Similar to hero section.
-         */
-        SHORTCUT(6),
+    /**
+     * A builder for {@link SearchTarget}
+     */
+    public static final class Builder {
 
-        /**
-         * Person icon and handling app icons are rendered.
-         */
-        PEOPLE(7),
 
-        /**
-         * N number of 1x1 ratio thumbnail is rendered.
-         * (current N = 3)
-         */
-        THUMBNAIL(8),
+        private String mItemId;
+
+        private final String mItemType;
+        private final float mScore;
 
-        /**
-         * Fallback search icon and relevant text is rendered.
-         */
-        SUGGEST(9);
 
-        private final int mId;
+        private ComponentName mComponentName;
+        private UserHandle mUserHandle;
+        private List<ShortcutInfo> mShortcutInfos;
+        private Bundle mExtras;
+        private RemoteAction mRemoteAction;
 
-        ViewType(int id) {
-            mId = id;
+        public Builder(String itemType, float score) {
+            this(itemType, score, null, null);
         }
 
-        public int get() {
-            return mId;
+        public Builder(String itemType, float score, ComponentName cn,
+                UserHandle user) {
+            mItemType = itemType;
+            mScore = score;
+            mComponentName = cn;
+            mUserHandle = user;
         }
-    }
 
-    public enum ItemType {
-        PLAY_RESULTS(0, "Play Store", ViewType.DETAIL),
-        SETTINGS_ROW(1, "Settings", ViewType.ROW),
-        SETTINGS_SLICE(2, "Settings", ViewType.SLICE),
-        APP(3, "", ViewType.TOP_HIT),
-        APP_HERO(4, "", ViewType.HERO),
-        SHORTCUT(5, "Shortcuts", ViewType.SHORTCUT),
-        PEOPLE(6, "People", ViewType.PEOPLE),
-        SCREENSHOT(7, "Screenshots", ViewType.THUMBNAIL),
-        ACTION(8, "Actions", ViewType.SHORTCUT),
-        SUGGEST(9, "Fallback Search", ViewType.SUGGEST),
-        CHROME_TAB(10, "Chrome Tab", ViewType.SHORTCUT);
-
-        private final int mId;
-
-        /** Used to render section title. */
-        private final String mTitle;
-        private final ViewType mViewType;
-
-        ItemType(int id, String title, ViewType type) {
-            mId = id;
-            mTitle = title;
-            mViewType = type;
+        public String getItemId() {
+            return mItemId;
         }
 
-        public ViewType getViewType() {
-            return mViewType;
+        public float getScore() {
+            return mScore;
         }
 
-        public String getTitle() {
-            return mTitle;
+        public Builder setItemId(String itemId) {
+            mItemId = itemId;
+            return this;
         }
 
-        public int getId() {
-            return mId;
+        public Builder setComponentName(ComponentName componentName) {
+            mComponentName = componentName;
+            return this;
+        }
+
+        public Builder setUserHandle(UserHandle userHandle) {
+            mUserHandle = userHandle;
+            return this;
         }
-    }
 
-    public ItemType type;
-    public List<ShortcutInfo> shortcuts;
-    public Bundle bundle;
-    public float score;
-    public String mSessionId;
-    public RemoteAction mRemoteAction;
+        public Builder setShortcutInfos(List<ShortcutInfo> shortcutInfos) {
+            mShortcutInfos = shortcutInfos;
+            return this;
+        }
 
-    /**
-     * Constructor to create the search target. Bundle is currently temporary to hold
-     * search target primitives that cannot be expressed as java primitive objects
-     * or AOSP native objects.
-     */
-    public SearchTarget(ItemType itemType, List<ShortcutInfo> shortcuts,
-            Bundle bundle, float score, String sessionId) {
-        this.type = itemType;
-        this.shortcuts = shortcuts;
-        this.bundle = bundle;
-        this.score = score;
-        this.mSessionId = sessionId;
-    }
+        public Builder setExtras(Bundle extras) {
+            mExtras = extras;
+            return this;
+        }
 
-    @Override
-    public int compareTo(SearchTarget o) {
-        return Float.compare(o.score, score);
+        public Builder setRemoteAction(RemoteAction remoteAction) {
+            mRemoteAction = remoteAction;
+            return this;
+        }
+
+        /**
+         * Builds a {@link SearchTarget}
+         */
+        public SearchTarget build() {
+            if (mItemId == null) {
+                throw new IllegalStateException("Item ID is required for building SearchTarget");
+            }
+            return new SearchTarget(mItemId, mItemType, mScore, mComponentName, mUserHandle,
+                    mShortcutInfos,
+                    mRemoteAction, mExtras);
+        }
     }
 }
diff --git a/src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java b/src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java
index 5016abc1e9..290fe54a27 100644
--- a/src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java
+++ b/src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java
@@ -15,32 +15,76 @@
  */
 package com.android.systemui.plugins.shared;
 
-import android.app.RemoteAction;
-import android.content.pm.ShortcutInfo;
 import android.os.Bundle;
 
 /**
  * Event used for the feedback loop to the plugin. (and future aiai)
  */
 public class SearchTargetEvent {
+    public static final int POSITION_NONE = -1;
+
     public static final int SELECT = 0;
     public static final int QUICK_SELECT = 1;
     public static final int LONG_PRESS = 2;
     public static final int CHILD_SELECT = 3;
 
-    public SearchTarget.ItemType type;
-    public ShortcutInfo shortcut;
-    public RemoteAction remoteAction;
-    public int eventType;
-    public Bundle bundle;
-    public int index;
-    public String sessionIdentifier;
-
-    public SearchTargetEvent(SearchTarget.ItemType itemType, int eventType, int index,
-            String sessionId) {
-        this.type = itemType;
-        this.eventType = eventType;
-        this.index = index;
-        this.sessionIdentifier = sessionId;
+    private final SearchTarget mSearchTarget;
+    private final int mEventType;
+    private final int mShortcutPosition;
+    private final Bundle mExtras;
+
+    public SearchTargetEvent(SearchTarget searchTarget, int eventType, int shortcutPosition,
+            Bundle extras) {
+        mSearchTarget = searchTarget;
+        mEventType = eventType;
+        mShortcutPosition = shortcutPosition;
+        mExtras = extras;
+    }
+
+
+    public SearchTarget getSearchTarget() {
+        return mSearchTarget;
+    }
+
+    public int getShortcutPosition() {
+        return mShortcutPosition;
+    }
+
+    public int getEventType() {
+        return mEventType;
     }
+
+    public Bundle getExtras() {
+        return mExtras;
+    }
+
+    /**
+     * A builder for {@link SearchTarget}
+     */
+    public static final class Builder {
+        private final SearchTarget mSearchTarget;
+        private final int mEventType;
+        private int mShortcutPosition = POSITION_NONE;
+        private Bundle mExtras;
+
+        public Builder(SearchTarget searchTarget, int eventType) {
+            mSearchTarget = searchTarget;
+            mEventType = eventType;
+        }
+
+        public Builder setShortcutPosition(int shortcutPosition) {
+            mShortcutPosition = shortcutPosition;
+            return this;
+        }
+
+        public Builder setExtras(Bundle extras) {
+            mExtras = extras;
+            return this;
+        }
+
+        public SearchTargetEvent build() {
+            return new SearchTargetEvent(mSearchTarget, mEventType, mShortcutPosition, mExtras);
+        }
+    }
+
 }
-- 
GitLab


From 13a2a010decd87eeaf8932430c692f587d2de165 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Sun, 18 Oct 2020 21:19:57 -0700
Subject: [PATCH 0255/1664] Handle IME event for SearchResultIcon

Bug: 171131394
Test: Manual
Change-Id: I2ed1c61053c78aaecc3324418229d69634a72ae4
---
 src/com/android/launcher3/views/SearchResultIcon.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/launcher3/views/SearchResultIcon.java b/src/com/android/launcher3/views/SearchResultIcon.java
index 51214aec0b..7d9f534782 100644
--- a/src/com/android/launcher3/views/SearchResultIcon.java
+++ b/src/com/android/launcher3/views/SearchResultIcon.java
@@ -71,6 +71,7 @@ public class SearchResultIcon extends BubbleTextView implements
     public void applySearchTarget(SearchTarget searchTarget) {
         mSearchTarget = searchTarget;
         AllAppsStore appsStore = mLauncher.getAppsView().getAppsStore();
+        SearchEventTracker.getInstance(getContext()).registerWeakHandler(mSearchTarget, this);
         if (searchTarget.getItemType().equals(TARGET_TYPE_APP)) {
             AppInfo appInfo = appsStore.getApp(new ComponentKey(searchTarget.getComponentName(),
                     searchTarget.getUserHandle()));
-- 
GitLab


From 71f24588c0a66449a0c68bcb360a8c671914ce75 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Mon, 19 Oct 2020 10:19:31 -0700
Subject: [PATCH 0256/1664] Call click event on IME quick select for
 SearchResultIcon

Bug: 171131394
Change-Id: I8a703e8d0ca10570e3f774510610d3fb4c0eaab8
---
 src/com/android/launcher3/views/SearchResultIcon.java     | 5 +++--
 src/com/android/launcher3/views/SearchResultPlayItem.java | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/views/SearchResultIcon.java b/src/com/android/launcher3/views/SearchResultIcon.java
index 51214aec0b..f4a8a72128 100644
--- a/src/com/android/launcher3/views/SearchResultIcon.java
+++ b/src/com/android/launcher3/views/SearchResultIcon.java
@@ -80,6 +80,7 @@ public class SearchResultIcon extends BubbleTextView implements
 
     @Override
     public void handleSelection(int eventType) {
+        mLauncher.getItemOnClickListener().onClick(this);
         SearchEventTracker.INSTANCE.get(mLauncher).notifySearchTargetEvent(
                 new SearchTargetEvent.Builder(mSearchTarget, eventType).build());
     }
@@ -87,12 +88,12 @@ public class SearchResultIcon extends BubbleTextView implements
     @Override
     public void onClick(View view) {
         handleSelection(SearchTargetEvent.SELECT);
-        mLauncher.getItemOnClickListener().onClick(view);
     }
 
     @Override
     public boolean onLongClick(View view) {
-        handleSelection(SearchTargetEvent.LONG_PRESS);
+        SearchEventTracker.INSTANCE.get(mLauncher).notifySearchTargetEvent(
+                new SearchTargetEvent.Builder(mSearchTarget, SearchTargetEvent.LONG_PRESS).build());
         return ItemLongClickListener.INSTANCE_ALL_APPS.onLongClick(view);
     }
 }
diff --git a/src/com/android/launcher3/views/SearchResultPlayItem.java b/src/com/android/launcher3/views/SearchResultPlayItem.java
index 6d85955f91..86ed436f53 100644
--- a/src/com/android/launcher3/views/SearchResultPlayItem.java
+++ b/src/com/android/launcher3/views/SearchResultPlayItem.java
@@ -104,7 +104,6 @@ public class SearchResultPlayItem extends LinearLayout implements
         iconParams.height = mDeviceProfile.allAppsIconSizePx;
         iconParams.width = mDeviceProfile.allAppsIconSizePx;
         setOnClickListener(view -> handleSelection(SearchTargetEvent.SELECT));
-
     }
 
 
-- 
GitLab


From 10274682339bb60cb24c50536b4f48f921970f3c Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Mon, 19 Oct 2020 19:06:52 -0700
Subject: [PATCH 0257/1664] Makes Plugin Settings gear adjust to dark mode.

It wasn't visible in dark mode before because it was
black on black. This makes it adjust automatically.

Change-Id: I5176cffc01842509ddafc4f30ff5029a0c4b8050
---
 res/layout/switch_preference_with_settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/layout/switch_preference_with_settings.xml b/res/layout/switch_preference_with_settings.xml
index d3195610d7..cd51833d9c 100644
--- a/res/layout/switch_preference_with_settings.xml
+++ b/res/layout/switch_preference_with_settings.xml
@@ -26,7 +26,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/ic_setting"
-        android:tint="@android:color/black"
+        android:forceDarkAllowed="true"
         android:padding="12dp"
         android:background="?android:attr/selectableItemBackgroundBorderless" />
 
-- 
GitLab


From caa1e9c39978cb3b467b5ac441eb39b5e883fa2e Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Mon, 12 Oct 2020 13:56:02 -0700
Subject: [PATCH 0258/1664] Search query method should support multiple
 consumers

Bug: 170488559
Change-Id: I64bef9523d3c3950c4ca3a4b9ce1d506d1672200
---
 .../allapps/AlphabeticalAppsList.java         | 61 +++++++++++--------
 .../search/AllAppsSearchBarController.java    | 13 +++-
 .../search/AppsSearchContainerLayout.java     | 12 +++-
 .../allapps/search/AppsSearchPipeline.java    |  6 +-
 .../search/DefaultAppSearchAlgorithm.java     |  6 +-
 .../allapps/search/SearchPipeline.java        |  7 ++-
 .../systemui/plugins/AllAppsSearchPlugin.java | 19 +++++-
 7 files changed, 85 insertions(+), 39 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
index 8c059d5fce..2450787e49 100644
--- a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
+++ b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
@@ -178,16 +178,46 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
     /**
      * Sets results list for search
      */
-    public boolean setSearchResults(ArrayList<AdapterItem> f) {
-        if (f == null || mSearchResults != f) {
-            boolean same = mSearchResults != null && mSearchResults.equals(f);
-            mSearchResults = f;
+    public boolean setSearchResults(ArrayList<AdapterItem> results) {
+        if (results == null || mSearchResults != results) {
+            boolean same = mSearchResults != null && mSearchResults.equals(results);
+            mSearchResults = results;
             onAppsUpdated();
             return !same;
         }
         return false;
     }
 
+    public boolean appendSearchResults(ArrayList<AdapterItem> results) {
+        if (mSearchResults != null && results != null && results.size() > 0) {
+            updateSearchAdapterItems(results, mSearchResults.size());
+            refreshRecyclerView();
+            return true;
+        }
+        return false;
+    }
+
+    void updateSearchAdapterItems(ArrayList<AdapterItem> list, int offset) {
+        SearchSectionInfo lastSection = null;
+        for (int i = 0; i < list.size(); i++) {
+            AdapterItem adapterItem = list.get(i);
+            adapterItem.position = offset + i;
+            mAdapterItems.add(adapterItem);
+            if (adapterItem.searchSectionInfo != lastSection) {
+                if (adapterItem.searchSectionInfo != null) {
+                    adapterItem.searchSectionInfo.setPosStart(adapterItem.position);
+                }
+                if (lastSection != null) {
+                    lastSection.setPosEnd(adapterItem.position - 1);
+                }
+                lastSection = adapterItem.searchSectionInfo;
+            }
+            if (adapterItem.isCountedForAccessibility()) {
+                mAccessibilityResultsCount++;
+            }
+        }
+    }
+
     /**
      * Updates internals when the set of apps are updated.
      */
@@ -294,28 +324,7 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
             }
             appSection.setPosEnd(mApps.isEmpty() ? appSection.getPosStart() : position - 1);
         } else {
-            List<AppInfo> appInfos = new ArrayList<>();
-            SearchSectionInfo lastSection = null;
-            for (int i = 0; i < mSearchResults.size(); i++) {
-                AdapterItem adapterItem = mSearchResults.get(i);
-                adapterItem.position = i;
-                mAdapterItems.add(adapterItem);
-                if (adapterItem.searchSectionInfo != lastSection) {
-                    if (adapterItem.searchSectionInfo != null) {
-                        adapterItem.searchSectionInfo.setPosStart(i);
-                    }
-                    if (lastSection != null) {
-                        lastSection.setPosEnd(i - 1);
-                    }
-                    lastSection = adapterItem.searchSectionInfo;
-                }
-                if (AllAppsGridAdapter.isIconViewType(adapterItem.viewType)) {
-                    appInfos.add(adapterItem.appInfo);
-                }
-                if (adapterItem.isCountedForAccessibility()) {
-                    mAccessibilityResultsCount++;
-                }
-            }
+            updateSearchAdapterItems(mSearchResults, 0);
             if (!FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
                 // Append the search market item
                 if (hasNoFilteredResults()) {
diff --git a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
index 9e6ca3403b..bc5a5f2cf1 100644
--- a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
+++ b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
@@ -30,7 +30,7 @@ import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.ExtendedEditText;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.allapps.AllAppsGridAdapter;
+import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItem;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.systemui.plugins.AllAppsSearchPlugin;
@@ -194,9 +194,16 @@ public class AllAppsSearchBarController
         /**
          * Called when the search from primary source is complete.
          *
-         * @param items sorted list of search result adapter items.
+         * @param items sorted list of search result adapter items
          */
-        void onSearchResult(String query, ArrayList<AllAppsGridAdapter.AdapterItem> items);
+        void onSearchResult(String query, ArrayList<AdapterItem> items);
+
+        /**
+         * Called when the search from secondary source is complete.
+         *
+         * @param items sorted list of search result adapter items
+         */
+        void onAppendSearchResult(String query, ArrayList<AdapterItem> items);
 
         /**
          * Called when the search results should be cleared.
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
index 7518521255..000ccbb13a 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
@@ -42,7 +42,7 @@ import com.android.launcher3.Insettable;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsContainerView;
-import com.android.launcher3.allapps.AllAppsGridAdapter;
+import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItem;
 import com.android.launcher3.allapps.AllAppsStore;
 import com.android.launcher3.allapps.AlphabeticalAppsList;
 import com.android.launcher3.allapps.SearchUiManager;
@@ -173,7 +173,7 @@ public class AppsSearchContainerLayout extends ExtendedEditText
     }
 
     @Override
-    public void onSearchResult(String query, ArrayList<AllAppsGridAdapter.AdapterItem> items) {
+    public void onSearchResult(String query, ArrayList<AdapterItem> items) {
         if (items != null) {
             mApps.setSearchResults(items);
             notifyResultChanged();
@@ -181,6 +181,14 @@ public class AppsSearchContainerLayout extends ExtendedEditText
         }
     }
 
+    @Override
+    public void onAppendSearchResult(String query, ArrayList<AdapterItem> items) {
+        if (items != null) {
+            mApps.appendSearchResults(items);
+            notifyResultChanged();
+        }
+    }
+
     @Override
     public void clearSearchResult() {
         if (mApps.setSearchResults(null)) {
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java b/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
index dc9c1559d5..84688e1737 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
@@ -16,6 +16,7 @@
 package com.android.launcher3.allapps.search;
 
 import android.content.Context;
+import android.os.CancellationSignal;
 
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItem;
@@ -47,11 +48,12 @@ public class AppsSearchPipeline implements SearchPipeline {
     }
 
     @Override
-    public void performSearch(String query, Consumer<ArrayList<AdapterItem>> callback) {
+    public void query(String input, Consumer<ArrayList<AdapterItem>> callback,
+            CancellationSignal cancellationSignal) {
         mLauncherAppState.getModel().enqueueModelUpdateTask(new BaseModelUpdateTask() {
             @Override
             public void execute(LauncherAppState app, BgDataModel dataModel, AllAppsList apps) {
-                List<AppInfo> matchingResults = getTitleMatchResult(apps.data, query);
+                List<AppInfo> matchingResults = getTitleMatchResult(apps.data, input);
                 callback.accept(getAdapterItems(matchingResults));
             }
         });
diff --git a/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java b/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java
index 5ed7de54fa..3bddace8f8 100644
--- a/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java
+++ b/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java
@@ -46,8 +46,10 @@ public class DefaultAppSearchAlgorithm implements SearchAlgorithm {
     @Override
     public void doSearch(final String query,
             final AllAppsSearchBarController.Callbacks callback) {
-        mAppsSearchPipeline.performSearch(query,
-                results -> mResultHandler.post(() -> callback.onSearchResult(query, results)));
+        mAppsSearchPipeline.query(query,
+                results -> mResultHandler.post(
+                        () -> callback.onSearchResult(query, results)),
+                null);
     }
 
     public static boolean matches(AppInfo info, String query, StringMatcher matcher) {
diff --git a/src/com/android/launcher3/allapps/search/SearchPipeline.java b/src/com/android/launcher3/allapps/search/SearchPipeline.java
index 545f0e3fa2..3516a41724 100644
--- a/src/com/android/launcher3/allapps/search/SearchPipeline.java
+++ b/src/com/android/launcher3/allapps/search/SearchPipeline.java
@@ -15,6 +15,8 @@
  */
 package com.android.launcher3.allapps.search;
 
+import android.os.CancellationSignal;
+
 import com.android.launcher3.allapps.AllAppsGridAdapter;
 
 import java.util.ArrayList;
@@ -23,10 +25,13 @@ import java.util.function.Consumer;
 /**
  * An interface for handling search within pipeline
  */
+// Remove when System Service API is added.
 public interface SearchPipeline {
 
     /**
      * Perform query
      */
-    void performSearch(String query, Consumer<ArrayList<AllAppsGridAdapter.AdapterItem>> cb);
+    void query(String input,
+            Consumer<ArrayList<AllAppsGridAdapter.AdapterItem>> callback,
+            CancellationSignal cancellationSignal);
 }
diff --git a/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java b/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
index aa3ab8f7e0..5cc238da23 100644
--- a/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
+++ b/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
@@ -17,6 +17,8 @@
 package com.android.systemui.plugins;
 
 import android.app.Activity;
+import android.os.Bundle;
+import android.os.CancellationSignal;
 import android.view.View;
 
 import com.android.systemui.plugins.annotations.ProvidesInterface;
@@ -32,7 +34,7 @@ import java.util.function.Consumer;
 @ProvidesInterface(action = AllAppsSearchPlugin.ACTION, version = AllAppsSearchPlugin.VERSION)
 public interface AllAppsSearchPlugin extends Plugin {
     String ACTION = "com.android.systemui.action.PLUGIN_ALL_APPS_SEARCH_ACTIONS";
-    int VERSION = 7;
+    int VERSION = 8;
 
     void setup(Activity activity, View view);
 
@@ -49,10 +51,21 @@ public interface AllAppsSearchPlugin extends Plugin {
     void onWindowVisibilityChanged(int visibility);
 
     /**
-     * Send signal when user starts typing, perform search, when search ends
+     * Send signal when user starts typing, perform search, notify search target
+     * event when search ends.
      */
     void startedSearchSession();
-    void performSearch(String query, Consumer<List<SearchTarget>> results);
+
+    /**
+     * Main function that triggers search.
+     *
+     * @param input string that has been typed by a user
+     * @param inputArgs extra info that may be relevant for the input query
+     * @param results contains the result that will be rendered in all apps search surface
+     * @param cancellationSignal {@link CancellationSignal} can be used to share status of current
+     */
+    void query(String input, Bundle inputArgs, Consumer<List<SearchTarget>> results,
+            CancellationSignal cancellationSignal);
 
     /**
      * Send over search target interaction events to Plugin
-- 
GitLab


From f6b05068d901d4e989b2e107c06f9c7a6e7b113f Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Tue, 20 Oct 2020 00:19:29 -0700
Subject: [PATCH 0259/1664] Invert the badging

Bug: 171171594
Change-Id: If84fdc03254105c843e16f39f479505b16e1cd5f
---
 src/com/android/launcher3/views/SearchResultIconRow.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/views/SearchResultIconRow.java b/src/com/android/launcher3/views/SearchResultIconRow.java
index 5fb36b9da9..fe904ff115 100644
--- a/src/com/android/launcher3/views/SearchResultIconRow.java
+++ b/src/com/android/launcher3/views/SearchResultIconRow.java
@@ -121,7 +121,7 @@ public class SearchResultIconRow extends DoubleShadowBubbleTextView implements
             prepareUsingRemoteAction(searchTarget.getRemoteAction(),
                     searchTarget.getExtras().getString(REMOTE_ACTION_TOKEN),
                     searchTarget.getExtras().getBoolean(REMOTE_ACTION_SHOULD_START),
-                    type.equals(TARGET_TYPE_SUGGEST));
+                    type.equals(TARGET_TYPE_REMOTE_ACTION));
 
         } else if (type.equals(TARGET_TYPE_SHORTCUT)) {
             prepareUsingShortcutInfo(searchTarget.getShortcutInfos().get(0));
-- 
GitLab


From 6c666fb1961da4e8ee3b1705efe0c6d6fb63ad0c Mon Sep 17 00:00:00 2001
From: alexmang <alexmang@google.com>
Date: Fri, 24 Jul 2020 21:13:24 -0700
Subject: [PATCH 0260/1664] Add a feature flag to expand smartspace to three
 rows

In order to experiment with presenting more predicted content to the
workspace I have added a flag to expand smartspace to two rows.

This CL does not include any app relocation. If an app lives in a space
the expanded smartspace will occupy, it will be removed from workspace.

Change-Id: I38354dc81a34a495828cf7a69ddb04cc137e2e4e
---
 src/com/android/launcher3/Workspace.java           | 9 ++++++++-
 src/com/android/launcher3/config/FeatureFlags.java | 4 ++++
 src/com/android/launcher3/model/LoaderCursor.java  | 3 ++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 98328cf8af..254f9cdabd 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -139,6 +139,10 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
 
     public static final int DEFAULT_PAGE = 0;
 
+    private static final int DEFAULT_SMARTSPACE_HEIGHT = 1;
+
+    private static final int EXPANDED_SMARTSPACE_HEIGHT = 2;
+
     private LayoutTransition mLayoutTransition;
     @Thunk final WallpaperManager mWallpaperManager;
 
@@ -507,7 +511,10 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
                     .inflate(R.layout.search_container_workspace, firstPage, false);
         }
 
-        CellLayout.LayoutParams lp = new CellLayout.LayoutParams(0, 0, firstPage.getCountX(), 1);
+        int cellVSpan = FeatureFlags.EXPANDED_SMARTSPACE.get()
+                ? EXPANDED_SMARTSPACE_HEIGHT : DEFAULT_SMARTSPACE_HEIGHT;
+        CellLayout.LayoutParams lp = new CellLayout.LayoutParams(0, 0, firstPage.getCountX(),
+                cellVSpan);
         lp.canReorder = false;
         if (!firstPage.addViewToCellLayout(qsb, 0, R.id.search_container_workspace, lp, true)) {
             Log.e(TAG, "Failed to add to item at (0, 0) to CellLayout");
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 58b0a87468..7e27dade46 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -185,6 +185,10 @@ public final class FeatureFlags {
             "ENABLE_MINIMAL_DEVICE", true,
             "Allow user to toggle minimal device mode in launcher.");
 
+    public static final BooleanFlag EXPANDED_SMARTSPACE = new DeviceFlag(
+            "EXPANDED_SMARTSPACE", false, "Expands smartspace height to two rows. "
+              + "Any apps occupying the first row will be removed from workspace.");
+
     public static void initialize(Context context) {
         synchronized (sDebugFlags) {
             for (DebugFlag flag : sDebugFlags) {
diff --git a/src/com/android/launcher3/model/LoaderCursor.java b/src/com/android/launcher3/model/LoaderCursor.java
index a27ac2391d..532834eeb8 100644
--- a/src/com/android/launcher3/model/LoaderCursor.java
+++ b/src/com/android/launcher3/model/LoaderCursor.java
@@ -445,7 +445,8 @@ public class LoaderCursor extends CursorWrapper {
             if (item.screenId == Workspace.FIRST_SCREEN_ID) {
                 // Mark the first row as occupied (if the feature is enabled)
                 // in order to account for the QSB.
-                screen.markCells(0, 0, countX + 1, 1, FeatureFlags.QSB_ON_FIRST_SCREEN);
+                int spanY = FeatureFlags.EXPANDED_SMARTSPACE.get() ? 2 : 1;
+                screen.markCells(0, 0, countX + 1, spanY, FeatureFlags.QSB_ON_FIRST_SCREEN);
             }
             occupied.put(item.screenId, screen);
         }
-- 
GitLab


From acfac6187dd9d13d55b566a77a5da867a1813573 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Mon, 19 Oct 2020 18:00:39 +0100
Subject: [PATCH 0261/1664] Use Diplay.getMetrics in DisplayController

- This is a workaround of b/163815566, where DisplayMetrics is stale
  when onDisplayChanged is called.
- Instead of relying on stale DisplayConext, get the DisplayMetrics
  from the Display directly.
- Also optimized how DisplayController.Info is created by passing in
  Display only
- Use mDisplayContext.getDisplay directly if availalbe

Bug: 163815566, 160544577
Test: DPI looks correct on device boot
Change-Id: I2a7454bb8cf2073ce592e8662781b87fc998444f
(cherry picked from commit 177c38243dc3bf245d1f7db3c265dfb56522f441)
---
 .../launcher3/InvariantDeviceProfile.java     |  2 +-
 .../launcher3/util/DisplayController.java     | 37 +++++++++++--------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index 370bd6ffc8..ff53b5fae6 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -201,7 +201,7 @@ public class InvariantDeviceProfile {
                 DisplayController.getDefaultDisplay(context).getInfo(),
                 getPredefinedDeviceProfiles(context, gridName));
 
-        Info myInfo = new Info(context, display);
+        Info myInfo = new Info(display);
         DisplayOption myDisplayOption = invDistWeightedInterpolate(
                 myInfo, getPredefinedDeviceProfiles(context, gridName));
 
diff --git a/src/com/android/launcher3/util/DisplayController.java b/src/com/android/launcher3/util/DisplayController.java
index 355c949325..3ab736a814 100644
--- a/src/com/android/launcher3/util/DisplayController.java
+++ b/src/com/android/launcher3/util/DisplayController.java
@@ -31,6 +31,8 @@ import android.view.Display;
 
 import androidx.annotation.VisibleForTesting;
 
+import com.android.launcher3.Utilities;
+
 import java.util.ArrayList;
 
 /**
@@ -157,13 +159,13 @@ public class DisplayController implements DisplayListener {
         private final ArrayList<DisplayInfoChangeListener> mListeners = new ArrayList<>();
         private DisplayController.Info mInfo;
 
-        private DisplayHolder(Context displayContext) {
+        private DisplayHolder(Context displayContext, Display display) {
             mDisplayContext = displayContext;
             // Note that the Display object must be obtained from DisplayManager which is
             // associated to the display context, so the Display is isolated from Activity and
             // Application to provide the actual state of device that excludes the additional
             // adjustment and override.
-            mInfo = new DisplayController.Info(mDisplayContext);
+            mInfo = new DisplayController.Info(display);
             mId = mInfo.id;
         }
 
@@ -180,22 +182,31 @@ public class DisplayController implements DisplayListener {
         }
 
         protected void handleOnChange() {
+            Display display = Utilities.ATLEAST_R
+                    ? mDisplayContext.getDisplay()
+                    : mDisplayContext
+                        .getSystemService(DisplayManager.class)
+                        .getDisplay(mId);
+            if (display == null) {
+                return;
+            }
+
             Info oldInfo = mInfo;
-            Info info = new Info(mDisplayContext);
+            Info newInfo = new Info(display);
 
             int change = 0;
-            if (info.hasDifferentSize(oldInfo)) {
+            if (newInfo.hasDifferentSize(oldInfo)) {
                 change |= CHANGE_SIZE;
             }
-            if (oldInfo.rotation != info.rotation) {
+            if (newInfo.rotation != oldInfo.rotation) {
                 change |= CHANGE_ROTATION;
             }
-            if (info.singleFrameMs != oldInfo.singleFrameMs) {
+            if (newInfo.singleFrameMs != oldInfo.singleFrameMs) {
                 change |= CHANGE_FRAME_DELAY;
             }
 
             if (change != 0) {
-                mInfo = info;
+                mInfo = newInfo;
                 final int flags = change;
                 MAIN_EXECUTOR.execute(() -> notifyChange(flags));
             }
@@ -216,7 +227,7 @@ public class DisplayController implements DisplayListener {
             // Use application context to create display context so that it can have its own
             // Resources.
             Context displayContext = context.getApplicationContext().createDisplayContext(display);
-            return new DisplayHolder(displayContext);
+            return new DisplayHolder(displayContext, display);
         }
     }
 
@@ -244,12 +255,7 @@ public class DisplayController implements DisplayListener {
             this.metrics = metrics;
         }
 
-        private Info(Context context) {
-            this(context, context.getSystemService(DisplayManager.class)
-                    .getDisplay(DEFAULT_DISPLAY));
-        }
-
-        public Info(Context context, Display display) {
+        public Info(Display display) {
             id = display.getDisplayId();
             rotation = display.getRotation();
 
@@ -262,7 +268,8 @@ public class DisplayController implements DisplayListener {
             display.getRealSize(realSize);
             display.getCurrentSizeRange(smallestSize, largestSize);
 
-            metrics = context.getResources().getDisplayMetrics();
+            metrics = new DisplayMetrics();
+            display.getMetrics(metrics);
         }
 
         private boolean hasDifferentSize(Info info) {
-- 
GitLab


From 70e8b157219e9090ba5e47fdfa51b2b92e98449d Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Wed, 7 Oct 2020 23:00:06 -0700
Subject: [PATCH 0262/1664] Minor stylistic changes in Workspace.java.

Change-Id: Ib07611f27cbc427d11abccd8b74ea144485752f7
---
 src/com/android/launcher3/Workspace.java | 62 ++++++++++++------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 98328cf8af..dfff358daf 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2078,40 +2078,40 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         mLastReorderY = -1;
     }
 
-   /*
-    *
-    * Convert the 2D coordinate xy from the parent View's coordinate space to this CellLayout's
-    * coordinate space. The argument xy is modified with the return result.
-    */
-   private void mapPointFromSelfToChild(View v, float[] xy) {
-       xy[0] = xy[0] - v.getLeft();
-       xy[1] = xy[1] - v.getTop();
-   }
-
-   boolean isPointInSelfOverHotseat(int x, int y) {
-       mTempFXY[0] = x;
-       mTempFXY[1] = y;
-       mLauncher.getDragLayer().getDescendantCoordRelativeToSelf(this, mTempFXY, true);
-       View hotseat = mLauncher.getHotseat();
-       return mTempFXY[0] >= hotseat.getLeft() &&
-               mTempFXY[0] <= hotseat.getRight() &&
-               mTempFXY[1] >= hotseat.getTop() &&
-               mTempFXY[1] <= hotseat.getBottom();
-   }
+    /*
+     *
+     * Convert the 2D coordinate xy from the parent View's coordinate space to this CellLayout's
+     * coordinate space. The argument xy is modified with the return result.
+     */
+    private void mapPointFromSelfToChild(View v, float[] xy) {
+        xy[0] = xy[0] - v.getLeft();
+        xy[1] = xy[1] - v.getTop();
+    }
+
+    boolean isPointInSelfOverHotseat(int x, int y) {
+        mTempFXY[0] = x;
+        mTempFXY[1] = y;
+        mLauncher.getDragLayer().getDescendantCoordRelativeToSelf(this, mTempFXY, true);
+        View hotseat = mLauncher.getHotseat();
+        return mTempFXY[0] >= hotseat.getLeft()
+                && mTempFXY[0] <= hotseat.getRight()
+                && mTempFXY[1] >= hotseat.getTop()
+                && mTempFXY[1] <= hotseat.getBottom();
+    }
 
     /**
      * Updates the point in {@param xy} to point to the co-ordinate space of {@param layout}
      * @param layout either hotseat of a page in workspace
      * @param xy the point location in workspace co-ordinate space
      */
-   private void mapPointFromDropLayout(CellLayout layout, float[] xy) {
-       if (mLauncher.isHotseatLayout(layout)) {
-           mLauncher.getDragLayer().getDescendantCoordRelativeToSelf(this, xy, true);
-           mLauncher.getDragLayer().mapCoordInSelfToDescendant(layout, xy);
-       } else {
-           mapPointFromSelfToChild(layout, xy);
-       }
-   }
+    private void mapPointFromDropLayout(CellLayout layout, float[] xy) {
+        if (mLauncher.isHotseatLayout(layout)) {
+            mLauncher.getDragLayer().getDescendantCoordRelativeToSelf(this, xy, true);
+            mLauncher.getDragLayer().mapCoordInSelfToDescendant(layout, xy);
+        } else {
+            mapPointFromSelfToChild(layout, xy);
+        }
+    }
 
     private boolean isDragWidget(DragObject d) {
         return (d.dragInfo instanceof LauncherAppWidgetInfo ||
@@ -2393,9 +2393,9 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
             spanY = mDragInfo.spanY;
         }
 
-        final int container = mLauncher.isHotseatLayout(cellLayout) ?
-                LauncherSettings.Favorites.CONTAINER_HOTSEAT :
-                    LauncherSettings.Favorites.CONTAINER_DESKTOP;
+        final int container = mLauncher.isHotseatLayout(cellLayout)
+                ? LauncherSettings.Favorites.CONTAINER_HOTSEAT
+                : LauncherSettings.Favorites.CONTAINER_DESKTOP;
         final int screenId = getIdForScreen(cellLayout);
         if (!mLauncher.isHotseatLayout(cellLayout)
                 && screenId != getScreenIdForPageIndex(mCurrentPage)
-- 
GitLab


From 8b488ccc2e433a708c8b06f0b6866f2a305e4b0a Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Wed, 14 Oct 2020 12:13:04 -0700
Subject: [PATCH 0263/1664] [Live Tile] Support launching running task
 animation

Fixes: 170338170
Test: manual
Change-Id: I2526b7cfbacaea7899b8e2ed233f913630071d36
---
 .../com/android/quickstep/TaskViewUtils.java  | 50 +++++++++++++++----
 .../quickstep/views/LiveTileOverlay.java      | 26 +++++-----
 .../android/quickstep/views/RecentsView.java  |  8 +++
 .../com/android/quickstep/views/TaskView.java | 36 +++++++++----
 4 files changed, 87 insertions(+), 33 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java
index 5520ef7751..46c77681ae 100644
--- a/quickstep/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java
@@ -41,6 +41,7 @@ import android.os.Build;
 import android.view.View;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.android.launcher3.BaseActivity;
 import com.android.launcher3.DeviceProfile;
@@ -129,6 +130,21 @@ public final class TaskViewUtils {
         return taskView;
     }
 
+    public static void createRecentsWindowAnimator(TaskView v, boolean skipViewChanges,
+            RemoteAnimationTargetCompat[] appTargets,
+            RemoteAnimationTargetCompat[] wallpaperTargets, DepthController depthController,
+            PendingAnimation out) {
+        boolean isRunningTask = v.isRunningTask();
+        TransformParams params = null;
+        TaskViewSimulator tsv = null;
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && isRunningTask) {
+            params = v.getRecentsView().getLiveTileParams();
+            tsv = v.getRecentsView().getLiveTileTaskViewSimulator();
+        }
+        createRecentsWindowAnimator(v, skipViewChanges, appTargets, wallpaperTargets,
+                depthController, out, params, tsv);
+    }
+
     /**
      * Creates an animation that controls the window of the opening targets for the recents launch
      * animation.
@@ -136,19 +152,25 @@ public final class TaskViewUtils {
     public static void createRecentsWindowAnimator(TaskView v, boolean skipViewChanges,
             RemoteAnimationTargetCompat[] appTargets,
             RemoteAnimationTargetCompat[] wallpaperTargets, DepthController depthController,
-            PendingAnimation out) {
+            PendingAnimation out, @Nullable TransformParams params,
+            @Nullable TaskViewSimulator tsv) {
         boolean isQuickSwitch = v.isEndQuickswitchCuj();
         v.setEndQuickswitchCuj(false);
 
-        SurfaceTransactionApplier applier = new SurfaceTransactionApplier(v);
+        boolean inLiveTileMode =
+                ENABLE_QUICKSTEP_LIVE_TILE.get() && v.getRecentsView().getRunningTaskIndex() != -1;
         final RemoteAnimationTargets targets =
                 new RemoteAnimationTargets(appTargets, wallpaperTargets,
-                        ENABLE_QUICKSTEP_LIVE_TILE.get() ? MODE_CLOSING : MODE_OPENING);
-        targets.addReleaseCheck(applier);
+                        inLiveTileMode ? MODE_CLOSING : MODE_OPENING);
+
+        if (params == null) {
+            SurfaceTransactionApplier applier = new SurfaceTransactionApplier(v);
+            targets.addReleaseCheck(applier);
 
-        TransformParams params = new TransformParams()
+            params = new TransformParams()
                     .setSyncTransactionApplier(applier)
                     .setTargetSet(targets);
+        }
 
         final RecentsView recentsView = v.getRecentsView();
         int taskIndex = recentsView.indexOfChild(v);
@@ -162,8 +184,9 @@ public final class TaskViewUtils {
         int displayRotation = DisplayController.getDefaultDisplay(context).getInfo().rotation;
 
         TaskViewSimulator topMostSimulator = null;
-        if (targets.apps.length > 0) {
-            TaskViewSimulator tsv = new TaskViewSimulator(context, recentsView.getSizeStrategy());
+
+        if (tsv == null && targets.apps.length > 0) {
+            tsv = new TaskViewSimulator(context, recentsView.getSizeStrategy());
             tsv.setDp(dp);
             tsv.setLayoutRotation(displayRotation, displayRotation);
             tsv.setPreview(targets.apps[targets.apps.length - 1]);
@@ -171,19 +194,24 @@ public final class TaskViewUtils {
             tsv.recentsViewScale.value = 1;
             tsv.setScroll(startScroll);
 
+            // Fade in the task during the initial 20% of the animation
+            out.addFloat(params, TransformParams.TARGET_ALPHA, 0, 1,
+                    clampToProgress(LINEAR, 0, 0.2f));
+        }
+
+        if (tsv != null) {
             out.setFloat(tsv.fullScreenProgress,
                     AnimatedFloat.VALUE, 1, TOUCH_RESPONSE_INTERPOLATOR);
             out.setFloat(tsv.recentsViewScale,
                     AnimatedFloat.VALUE, tsv.getFullScreenScale(), TOUCH_RESPONSE_INTERPOLATOR);
             out.setInt(tsv, TaskViewSimulator.SCROLL, 0, TOUCH_RESPONSE_INTERPOLATOR);
 
-            out.addOnFrameCallback(() -> tsv.apply(params));
+            TaskViewSimulator finalTsv = tsv;
+            TransformParams finalParams = params;
+            out.addOnFrameCallback(() -> finalTsv.apply(finalParams));
             topMostSimulator = tsv;
         }
 
-        // Fade in the task during the initial 20% of the animation
-        out.addFloat(params, TransformParams.TARGET_ALPHA, 0, 1, clampToProgress(LINEAR, 0, 0.2f));
-
         if (!skipViewChanges && parallaxCenterAndAdjacentTask && topMostSimulator != null) {
             out.addFloat(v, VIEW_ALPHA, 1, 0, clampToProgress(LINEAR, 0.2f, 0.4f));
 
diff --git a/quickstep/src/com/android/quickstep/views/LiveTileOverlay.java b/quickstep/src/com/android/quickstep/views/LiveTileOverlay.java
index c6c2d7e4f0..f6eb0e224b 100644
--- a/quickstep/src/com/android/quickstep/views/LiveTileOverlay.java
+++ b/quickstep/src/com/android/quickstep/views/LiveTileOverlay.java
@@ -65,6 +65,10 @@ public class LiveTileOverlay extends Drawable {
         invalidateSelf();
     }
 
+    public void update(float left, float top, float right, float bottom) {
+        mCurrentRect.set(left, top, right, bottom);
+    }
+
     public void setIcon(Drawable icon) {
         mIcon = icon;
     }
@@ -94,18 +98,16 @@ public class LiveTileOverlay extends Drawable {
 
     @Override
     public void draw(Canvas canvas) {
-        if (mCurrentRect != null) {
-            canvas.drawRoundRect(mCurrentRect, mCornerRadius, mCornerRadius, mPaint);
-            if (mIcon != null && mIconAnimationProgress > 0f) {
-                canvas.save();
-                float scale = Interpolators.clampToProgress(FAST_OUT_SLOW_IN, 0f,
-                        1f).getInterpolation(mIconAnimationProgress);
-                canvas.translate(mCurrentRect.centerX() - mIcon.getBounds().width() / 2 * scale,
-                        mCurrentRect.top - mIcon.getBounds().height() / 2 * scale);
-                canvas.scale(scale, scale);
-                mIcon.draw(canvas);
-                canvas.restore();
-            }
+        canvas.drawRoundRect(mCurrentRect, mCornerRadius, mCornerRadius, mPaint);
+        if (mIcon != null && mIconAnimationProgress > 0f) {
+            canvas.save();
+            float scale = Interpolators.clampToProgress(FAST_OUT_SLOW_IN, 0f,
+                    1f).getInterpolation(mIconAnimationProgress);
+            canvas.translate(mCurrentRect.centerX() - mIcon.getBounds().width() / 2 * scale,
+                    mCurrentRect.top - mIcon.getBounds().height() / 2 * scale);
+            canvas.scale(scale, scale);
+            mIcon.draw(canvas);
+            canvas.restore();
         }
     }
 
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 2158e03e7e..4c967068a0 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -876,6 +876,10 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             mLiveTileTaskViewSimulator.fullScreenProgress.value = 0;
             mLiveTileTaskViewSimulator.recentsViewScale.value = 1;
             mLiveTileTaskViewSimulator.setOffsetY(0);
+
+            // Reset the live tile rect
+            DeviceProfile deviceProfile = mActivity.getDeviceProfile();
+            LiveTileOverlay.INSTANCE.update(0, 0, deviceProfile.widthPx, deviceProfile.heightPx);
         }
         if (mRunningTaskTileHidden) {
             setRunningTaskHidden(mRunningTaskTileHidden);
@@ -2264,6 +2268,10 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         return mLiveTileTaskViewSimulator;
     }
 
+    public TransformParams getLiveTileParams() {
+        return mLiveTileParams;
+    }
+
     // TODO: To be removed in a follow up CL
     public void setRecentsAnimationTargets(RecentsAnimationController recentsAnimationController,
             RecentsAnimationTargets recentsAnimationTargets) {
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 54a793c8e0..5154018f6c 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -39,6 +39,7 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.TimeInterpolator;
 import android.animation.ValueAnimator;
@@ -65,7 +66,6 @@ import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.FrameLayout;
 import android.widget.Toast;
 
-import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.R;
@@ -75,6 +75,7 @@ import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.popup.SystemShortcut;
+import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.PagedOrientationHandler;
@@ -82,10 +83,12 @@ import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.TransformingTouchDelegate;
 import com.android.launcher3.util.ViewPool.Reusable;
 import com.android.quickstep.RecentsModel;
+import com.android.quickstep.RemoteAnimationTargets;
 import com.android.quickstep.TaskIconCache;
 import com.android.quickstep.TaskOverlayFactory;
 import com.android.quickstep.TaskThumbnailCache;
 import com.android.quickstep.TaskUtils;
+import com.android.quickstep.TaskViewUtils;
 import com.android.quickstep.util.CancellableTask;
 import com.android.quickstep.util.RecentsOrientedState;
 import com.android.quickstep.util.TaskCornerRadius;
@@ -175,7 +178,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     private float mCurveScale;
     private float mFullscreenProgress;
     private final FullscreenDrawParams mCurrentFullscreenParams;
-    private final BaseDraggingActivity mActivity;
+    private final StatefulActivity mActivity;
 
     private ObjectAnimator mIconAndDimAnimator;
     private float mIconScaleAnimStartProgress = 0;
@@ -212,18 +215,31 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
 
     public TaskView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        mActivity = BaseDraggingActivity.fromContext(context);
+        mActivity = StatefulActivity.fromContext(context);
         setOnClickListener((view) -> {
             if (getTask() == null) {
                 return;
             }
-            if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
-                if (isRunningTask()) {
-                    // TODO: Replace this animation with createRecentsWindowAnimator
-                    createLaunchAnimationForRunningTask().start();
-                } else {
-                    launchTask(true /* animate */);
-                }
+            if (ENABLE_QUICKSTEP_LIVE_TILE.get() && isRunningTask()) {
+                RecentsView recentsView = getRecentsView();
+                RemoteAnimationTargets targets = recentsView.getLiveTileParams().getTargetSet();
+                recentsView.getLiveTileTaskViewSimulator().setDrawsBelowRecents(false);
+
+                AnimatorSet anim = new AnimatorSet();
+                TaskViewUtils.composeRecentsLaunchAnimator(
+                        anim, this, targets.apps,
+                        targets.wallpapers, true /* launcherClosing */,
+                        mActivity.getStateManager(), recentsView,
+                        recentsView.getDepthController());
+                anim.addListener(new AnimatorListenerAdapter() {
+
+                    @Override
+                    public void onAnimationEnd(Animator animator) {
+                        recentsView.getLiveTileTaskViewSimulator().setDrawsBelowRecents(true);
+                        recentsView.finishRecentsAnimation(false, null);
+                    }
+                });
+                anim.start();
             } else {
                 launchTask(true /* animate */);
             }
-- 
GitLab


From 0731273d5409149fca32dfb2ad76eab45f6ea79a Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Wed, 21 Oct 2020 12:03:40 -0700
Subject: [PATCH 0264/1664] Track live tile better by considering resistance
 animation

Fixes: 170338029
Test: Manual
Change-Id: I66536bae567aa94385d5e0352cec9d46d512927a
---
 quickstep/src/com/android/quickstep/views/RecentsView.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 4c967068a0..826555c24b 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -230,6 +230,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                     view.setScaleX(scale);
                     view.setScaleY(scale);
                     view.mLastComputedTaskPushOutDistance = null;
+                    view.mLiveTileTaskViewSimulator.recentsViewScale.value = scale;
                     view.updatePageOffsets();
                     view.setTaskViewsSecondaryTranslation(view.mTaskViewsSecondaryTranslation);
                 }
@@ -1990,6 +1991,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             TaskView task = getTaskViewAt(i);
             mOrientationHandler.getSecondaryViewTranslate().set(task, translation / getScaleY());
         }
+        mLiveTileTaskViewSimulator.recentsViewSecondaryTranslation.value = translation;
     }
 
     /**
-- 
GitLab


From f5ce80b8a0a1636fc8159475177a07b281492c88 Mon Sep 17 00:00:00 2001
From: Hilary Huo <hhuo@google.com>
Date: Wed, 14 Oct 2020 16:35:55 -0700
Subject: [PATCH 0265/1664] [pixel-search] Latency analysis, add logging
 statement in launcher

Bug: b/170675311
Change-Id: I229ace399085bea1c3f9535eb713edd329dff8bd
---
 src/com/android/launcher3/allapps/AllAppsRecyclerView.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
index 72b6d94192..1fa43d00e2 100644
--- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
@@ -24,6 +24,7 @@ import android.content.res.Resources;
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.util.SparseIntArray;
 import android.view.MotionEvent;
 import android.view.View;
@@ -45,6 +46,8 @@ import java.util.List;
  * A RecyclerView with custom fast scroll support for the all apps view.
  */
 public class AllAppsRecyclerView extends BaseRecyclerView {
+    private static final String TAG = "AllAppsContainerView";
+    private static final boolean DEBUG = true;
 
     private AlphabeticalAppsList mApps;
     private final int mNumAppsPerRow;
@@ -131,7 +134,9 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
         if (mEmptySearchBackground != null && mEmptySearchBackground.getAlpha() > 0) {
             mEmptySearchBackground.draw(c);
         }
-
+        if (DEBUG) {
+            Log.d(TAG, "onDraw at = " + System.currentTimeMillis());
+        }
         super.onDraw(c);
     }
 
-- 
GitLab


From 932a327ebf0587b8324b9fea7d31328b2f6719a8 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Wed, 21 Oct 2020 23:29:00 -0700
Subject: [PATCH 0266/1664] Consider overscroll adjustment of RecentsView for
 live tile

Fixes: 171450807
Test: manual
Change-Id: I83eebf1f6b61c67f289db51aabe5a971815d0df1
---
 .../src/com/android/quickstep/AbsSwipeUpHandler.java | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index cc109f608c..4628daba10 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -618,13 +618,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
 
         updateSysUiFlags(mCurrentShift.value);
         applyWindowTransform();
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
-            if (mRecentsAnimationTargets != null) {
-                LiveTileOverlay.INSTANCE.update(
-                        mTaskViewSimulator.getCurrentRect(),
-                        mTaskViewSimulator.getCurrentCornerRadius());
-            }
-        }
 
         updateLauncherTransitionProgress();
     }
@@ -1616,6 +1609,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
             }
             mTaskViewSimulator.apply(mTransformParams);
         }
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && mRecentsAnimationTargets != null) {
+            LiveTileOverlay.INSTANCE.update(
+                    mTaskViewSimulator.getCurrentRect(),
+                    mTaskViewSimulator.getCurrentCornerRadius());
+        }
         ProtoTracer.INSTANCE.get(mContext).scheduleFrameUpdate();
     }
 
-- 
GitLab


From 0ee7ffca7f3b71c4b8eca6562ddddd48f03cca92 Mon Sep 17 00:00:00 2001
From: Marcin Oczeretko <marcinoc@google.com>
Date: Thu, 8 Oct 2020 16:05:08 +0100
Subject: [PATCH 0267/1664] Update LatencyTracker usage in Launcher

Test: manual - flashed the phone and verified the logging and statsd sampling with default settings
Bug: 131859447, 162927074
Change-Id: I2d0c9fd479654c62841c714eb39f88f84e8ab114
---
 quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 7 ++-----
 .../src/com/android/quickstep/OverviewCommandHelper.java   | 6 ++----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index ef7a8f6477..202aa0dd62 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -473,11 +473,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
 
         Object traceToken = TraceHelper.INSTANCE.beginSection("logToggleRecents",
                 TraceHelper.FLAG_IGNORE_BINDERS);
-        // Only used in debug builds
-        if (LatencyTrackerCompat.isEnabled(mContext)) {
-            LatencyTrackerCompat.logToggleRecents(
-                    (int) (mLauncherFrameDrawnTime - mTouchTimeMs));
-        }
+        LatencyTrackerCompat.logToggleRecents(
+                mContext, (int) (mLauncherFrameDrawnTime - mTouchTimeMs));
         TraceHelper.INSTANCE.endSection(traceToken);
 
         // This method is only called when STATE_GESTURE_STARTED is set, so we can enable the
diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
index 365cff576a..86136873ef 100644
--- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
@@ -224,10 +224,8 @@ public class OverviewCommandHelper {
 
         private AnimatorSet createWindowAnimation(RemoteAnimationTargetCompat[] appTargets,
                 RemoteAnimationTargetCompat[] wallpaperTargets) {
-            if (LatencyTrackerCompat.isEnabled(mContext)) {
-                LatencyTrackerCompat.logToggleRecents(
-                        (int) (SystemClock.uptimeMillis() - mToggleClickedTime));
-            }
+            LatencyTrackerCompat.logToggleRecents(
+                    mContext, (int) (SystemClock.uptimeMillis() - mToggleClickedTime));
 
             mListener.unregister();
 
-- 
GitLab


From ff39fd3e14329db22ef34da32b9116fbe39af6f1 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Thu, 22 Oct 2020 11:14:10 -0700
Subject: [PATCH 0268/1664] Removing workaround for battery defender

The bug is supposed to be fixed.

Bug: 151613234
Change-Id: I8e803ead29e08e68fa75f61b5ad0e1198c9228ec
---
 .../launcher3/ui/AbstractLauncherUiTest.java     | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index e118481570..d3fc89e6be 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -234,25 +234,11 @@ public abstract class AbstractLauncherUiTest {
         return mDevice;
     }
 
-    private boolean hasSystemUiObject(String resId) {
-        return mDevice.hasObject(By.res(SYSTEMUI_PACKAGE, resId));
-    }
-
     @Before
     public void setUp() throws Exception {
-        Log.d(TAG, "Before disabling battery defender");
-        mDevice.executeShellCommand("setprop vendor.battery.defender.disable 1");
-        Log.d(TAG, "Before enabling stay awake");
-        mDevice.executeShellCommand("settings put global stay_on_while_plugged_in 3");
-        for (int i = 0; i < 10 && hasSystemUiObject("keyguard_status_view"); ++i) {
-            Log.d(TAG, "Before unlocking the phone");
-            mDevice.executeShellCommand("input keyevent 82");
-            mDevice.waitForIdle();
-        }
-        Assert.assertTrue("Keyguard still visible",
+        Assert.assertTrue("Keyguard is visible",
                 mDevice.wait(
                         Until.gone(By.res(SYSTEMUI_PACKAGE, "keyguard_status_view")), 60000));
-        Log.d(TAG, "Keyguard is not visible");
 
         final String launcherPackageName = mDevice.getLauncherPackageName();
         try {
-- 
GitLab


From e4bc2af04b20d542ce631ae67d785359adae40c5 Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Tue, 6 Oct 2020 14:55:06 -0700
Subject: [PATCH 0269/1664] Improve PIP enter transition w/ gesture nav (3/N)

Directly transition Activity to PiP mode in launcher if the Activity
claims auto-pip support. Video is taken by commenting out the
requirement of setting the auto-pip flag.

Note that we need app to actively push up-to-dated
PictureInPictureParams to the framework, otherwise we won't be get
- PictureInPictureParams on first entering
- Staled PictureInPictureParams if the aspect ratio is changed

Video: http://rcll/aaaaaabFQoRHlzixHdtY/abenIxLFI1pZzF2O8t4TbS
Bug: 143965596
Test: see demo videos
Change-Id: Iea9a6ff39a79431ac1afa14aea812c500b3ca3b2
---
 .../android/quickstep/AbsSwipeUpHandler.java  | 115 +++++++++++--
 .../quickstep/LauncherSwipeHandlerV2.java     |   6 +
 .../quickstep/RecentsAnimationController.java |  14 ++
 .../quickstep/SwipeUpAnimationLogic.java      |   8 +
 .../util/SwipePipToHomeAnimator.java          | 162 ++++++++++++++++++
 5 files changed, 289 insertions(+), 16 deletions(-)
 create mode 100644 quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index ef7a8f6477..cac1a817ed 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -45,6 +45,7 @@ import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHO
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME;
 
 import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
 import android.animation.ValueAnimator;
 import android.annotation.TargetApi;
 import android.app.ActivityManager;
@@ -92,8 +93,10 @@ import com.android.quickstep.util.ActivityInitListener;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
 import com.android.quickstep.util.InputConsumerProxy;
 import com.android.quickstep.util.MotionPauseDetector;
+import com.android.quickstep.util.RecentsOrientedState;
 import com.android.quickstep.util.RectFSpringAnim;
 import com.android.quickstep.util.SurfaceTransactionApplier;
+import com.android.quickstep.util.SwipePipToHomeAnimator;
 import com.android.quickstep.util.TransformParams;
 import com.android.quickstep.views.LiveTileOverlay;
 import com.android.quickstep.views.RecentsView;
@@ -229,6 +232,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
 
     private final Runnable mOnDeferredActivityLaunch = this::onDeferredActivityLaunch;
 
+    private static final long SWIPE_PIP_TO_HOME_DURATION = 425;
+    private SwipePipToHomeAnimator mSwipePipToHomeAnimator;
+    protected boolean mIsSwipingPipToHome;
+
     public AbsSwipeUpHandler(Context context, RecentsAnimationDeviceState deviceState,
             TaskAnimationManager taskAnimationManager, GestureState gestureState,
             long touchTimeMs, boolean continuingLastGesture,
@@ -1049,25 +1056,44 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
 
         if (mGestureState.getEndTarget() == HOME) {
             mTaskViewSimulator.setDrawsBelowRecents(false);
+            getOrientationHandler().adjustFloatingIconStartVelocity(velocityPxPerMs);
+            final RemoteAnimationTargetCompat runningTaskTarget = mRecentsAnimationTargets != null
+                    ? mRecentsAnimationTargets.findTask(mGestureState.getRunningTaskId())
+                    : null;
             HomeAnimationFactory homeAnimFactory = createHomeAnimationFactory(duration);
-            RectFSpringAnim windowAnim = createWindowAnimationToHome(start, homeAnimFactory);
-            windowAnim.addAnimatorListener(new AnimationSuccessListener() {
-                @Override
-                public void onAnimationSuccess(Animator animator) {
-                    if (mRecentsAnimationController == null) {
-                        // If the recents animation is interrupted, we still end the running
-                        // animation (not canceled) so this is still called. In that case, we can
-                        // skip doing any future work here for the current gesture.
-                        return;
+            mIsSwipingPipToHome = homeAnimFactory.supportSwipePipToHome()
+                    && runningTaskTarget != null
+                    && runningTaskTarget.pictureInPictureParams != null
+                    && runningTaskTarget.pictureInPictureParams.isAutoEnterEnabled()
+                    && runningTaskTarget.pictureInPictureParams.getSourceRectHint() != null;
+            if (mIsSwipingPipToHome) {
+                mSwipePipToHomeAnimator = getSwipePipToHomeAnimator(
+                        homeAnimFactory, runningTaskTarget);
+                mSwipePipToHomeAnimator.setDuration(SWIPE_PIP_TO_HOME_DURATION);
+                mSwipePipToHomeAnimator.setInterpolator(interpolator);
+                mSwipePipToHomeAnimator.setFloatValues(0f, 1f);
+                mSwipePipToHomeAnimator.start();
+                mRunningWindowAnim = RunningWindowAnim.wrap(mSwipePipToHomeAnimator);
+            } else {
+                mSwipePipToHomeAnimator = null;
+                RectFSpringAnim windowAnim = createWindowAnimationToHome(start, homeAnimFactory);
+                windowAnim.addAnimatorListener(new AnimationSuccessListener() {
+                    @Override
+                    public void onAnimationSuccess(Animator animator) {
+                        if (mRecentsAnimationController == null) {
+                            // If the recents animation is interrupted, we still end the running
+                            // animation (not canceled) so this is still called. In that case,
+                            // we can skip doing any future work here for the current gesture.
+                            return;
+                        }
+                        // Finalize the state and notify of the change
+                        mGestureState.setState(STATE_END_TARGET_ANIMATION_FINISHED);
                     }
-                    // Finalize the state and notify of the change
-                    mGestureState.setState(STATE_END_TARGET_ANIMATION_FINISHED);
-                }
-            });
-            getOrientationHandler().adjustFloatingIconStartVelocity(velocityPxPerMs);
-            windowAnim.start(mContext, velocityPxPerMs);
+                });
+                windowAnim.start(mContext, velocityPxPerMs);
+                mRunningWindowAnim = RunningWindowAnim.wrap(windowAnim);
+            }
             homeAnimFactory.playAtomicAnimation(velocityPxPerMs.y);
-            mRunningWindowAnim = RunningWindowAnim.wrap(windowAnim);
             mLauncherTransitionController = null;
         } else {
             ValueAnimator windowAnim = mCurrentShift.animateToValue(start, end);
@@ -1111,6 +1137,46 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         }
     }
 
+    private SwipePipToHomeAnimator getSwipePipToHomeAnimator(HomeAnimationFactory homeAnimFactory,
+            RemoteAnimationTargetCompat runningTaskTarget) {
+        // Directly animate the app to PiP (picture-in-picture) mode
+        final ActivityManager.RunningTaskInfo taskInfo = mGestureState.getRunningTask();
+        final RecentsOrientedState orientationState = mTaskViewSimulator.getOrientationState();
+        final Rect destinationBounds = SystemUiProxy.INSTANCE.get(mContext)
+                .startSwipePipToHome(taskInfo.topActivity, taskInfo.topActivityInfo,
+                        runningTaskTarget.pictureInPictureParams,
+                        orientationState.getRecentsActivityRotation(),
+                        mDp.hotseatBarSizePx);
+        final SwipePipToHomeAnimator swipePipToHomeAnimator = new SwipePipToHomeAnimator(
+                runningTaskTarget.taskId,
+                taskInfo.topActivity,
+                runningTaskTarget.leash.getSurfaceControl(),
+                runningTaskTarget.pictureInPictureParams.getSourceRectHint(),
+                taskInfo.configuration.windowConfiguration.getBounds(),
+                destinationBounds);
+        swipePipToHomeAnimator.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+                // Ensure Launcher ends in NORMAL state, we intentionally skip other callbacks
+                // since they are not relevant in this swipe-pip-to-home case.
+                homeAnimFactory.createActivityAnimationToHome().dispatchOnStart();
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                if (mRecentsAnimationController == null) {
+                    // If the recents animation is interrupted, we still end the running
+                    // animation (not canceled) so this is still called. In that case, we can
+                    // skip doing any future work here for the current gesture.
+                    return;
+                }
+                // Finalize the state and notify of the change
+                mGestureState.setState(STATE_END_TARGET_ANIMATION_FINISHED);
+            }
+        });
+        return swipePipToHomeAnimator;
+    }
+
     private void computeRecentsScrollIfInvisible() {
         if (mRecentsView != null && mRecentsView.getVisibility() != View.VISIBLE) {
             // Views typically don't compute scroll when invisible as an optimization,
@@ -1359,6 +1425,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
             // If there are no targets or the animation not started, then there is nothing to finish
             mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);
         } else {
+            maybeFinishSwipePipToHome();
             finishRecentsControllerToHome(
                     () -> mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED));
         }
@@ -1366,6 +1433,22 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         doLogGesture(HOME, mRecentsView == null ? null : mRecentsView.getCurrentPageTaskView());
     }
 
+    /**
+     * Resets the {@link #mIsSwipingPipToHome} and notifies SysUI that transition is finished
+     * if applicable. This should happen before {@link #finishRecentsControllerToHome(Runnable)}.
+     */
+    private void maybeFinishSwipePipToHome() {
+        if (mIsSwipingPipToHome && mSwipePipToHomeAnimator != null) {
+            SystemUiProxy.INSTANCE.get(mContext).stopSwipePipToHome(
+                    mSwipePipToHomeAnimator.getComponentName(),
+                    mSwipePipToHomeAnimator.getDestinationBounds());
+            mRecentsAnimationController.setFinishTaskBounds(
+                    mSwipePipToHomeAnimator.getTaskId(),
+                    mSwipePipToHomeAnimator.getDestinationBounds());
+            mIsSwipingPipToHome = false;
+        }
+    }
+
     protected abstract void finishRecentsControllerToHome(Runnable callback);
 
     private void setupLauncherUiAfterSwipeUpToRecentsAnimation() {
diff --git a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
index 44114558e5..842fb84ff9 100644
--- a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
+++ b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
@@ -56,6 +56,7 @@ public class LauncherSwipeHandlerV2 extends
             final TaskView runningTaskView = mRecentsView.getRunningTaskView();
             final View workspaceView;
             if (runningTaskView != null
+                    && !mIsSwipingPipToHome
                     && runningTaskView.getTask().key.getComponent() != null) {
                 workspaceView = mActivity.getWorkspace().getFirstMatchForAppClose(
                         runningTaskView.getTask().key.getComponent().getPackageName(),
@@ -140,5 +141,10 @@ public class LauncherSwipeHandlerV2 extends
             new StaggeredWorkspaceAnim(mActivity, velocity,
                     true /* animateOverviewScrim */).start();
         }
+
+        @Override
+        public boolean supportSwipePipToHome() {
+            return true;
+        }
     }
 }
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationController.java b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
index 51f5e5d785..20e251552c 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationController.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
@@ -18,6 +18,8 @@ package com.android.quickstep;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
+import android.graphics.Rect;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.UiThread;
 
@@ -155,6 +157,18 @@ public class RecentsAnimationController {
         });
     }
 
+    /**
+     * Sets the final bounds on a Task. This is used by Launcher to notify the system that
+     * animating Activity to PiP has completed and the associated task surface should be updated
+     * accordingly. This should be called before `finish`
+     * @param taskId for which the leash should be updated
+     * @param destinationBounds bounds of the final PiP window
+     */
+    public void setFinishTaskBounds(int taskId, Rect destinationBounds) {
+        UI_HELPER_EXECUTOR.execute(
+                () -> mController.setFinishTaskBounds(taskId, destinationBounds));
+    }
+
     /**
      * Enables the input consumer to start intercepting touches in the app window.
      */
diff --git a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
index b6eaa1c7b6..18cd29dc6f 100644
--- a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
+++ b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
@@ -159,6 +159,14 @@ public abstract class SwipeUpAnimationLogic {
         public void update(RectF currentRect, float progress, float radius) { }
 
         public void onCancel() { }
+
+        /**
+         * @return {@code true} if this factory supports animating an Activity to PiP window on
+         * swiping up to home.
+         */
+        public boolean supportSwipePipToHome() {
+            return false;
+        }
     }
 
     /**
diff --git a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
new file mode 100644
index 0000000000..02b5dfe146
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.quickstep.util;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.RectEvaluator;
+import android.animation.ValueAnimator;
+import android.content.ComponentName;
+import android.graphics.Matrix;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.view.SurfaceControl;
+
+import androidx.annotation.NonNull;
+
+/**
+ * An {@link Animator} that animates an Activity to PiP (picture-in-picture) window when
+ * swiping up (in gesture navigation mode). Note that this class is derived from
+ * {@link com.android.wm.shell.pip.PipAnimationController.PipTransitionAnimator}.
+ *
+ * TODO: consider sharing this class including the animator and leash operations between
+ * Launcher and SysUI. Also, there should be one source of truth for the corner radius of the
+ * PiP window, which would ideally be on SysUI side as well.
+ */
+public class SwipePipToHomeAnimator extends ValueAnimator implements
+        ValueAnimator.AnimatorUpdateListener {
+    private final int mTaskId;
+    private final ComponentName mComponentName;
+    private final SurfaceControl mLeash;
+    private final Rect mStartBounds = new Rect();
+    private final Rect mDestinationBounds = new Rect();
+    private final SurfaceTransactionHelper mSurfaceTransactionHelper;
+
+    /** for calculating the transform in {@link #onAnimationUpdate(ValueAnimator)} */
+    private final RectEvaluator mRectEvaluator = new RectEvaluator(new Rect());
+    private final RectEvaluator mInsetsEvaluator = new RectEvaluator(new Rect());
+    private final Rect mSourceHintRectInsets = new Rect();
+    private final Rect mSourceInsets = new Rect();
+
+    /**
+     * Flag to avoid the double-end problem since the leash would have been released
+     * after the first end call and any further operations upon it would lead to NPE.
+     */
+    private boolean mHasAnimationEnded;
+
+    public SwipePipToHomeAnimator(int taskId,
+            @NonNull ComponentName componentName,
+            @NonNull SurfaceControl leash,
+            @NonNull Rect sourceRectHint,
+            @NonNull Rect startBounds,
+            @NonNull Rect destinationBounds) {
+        mTaskId = taskId;
+        mComponentName = componentName;
+        mLeash = leash;
+        mStartBounds.set(startBounds);
+        mDestinationBounds.set(destinationBounds);
+        mSurfaceTransactionHelper = new SurfaceTransactionHelper();
+
+        mSourceHintRectInsets.set(sourceRectHint.left - startBounds.left,
+                sourceRectHint.top - startBounds.top,
+                startBounds.right - sourceRectHint.right,
+                startBounds.bottom - sourceRectHint.bottom);
+
+        addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                SwipePipToHomeAnimator.this.onAnimationEnd();
+            }
+        });
+        addUpdateListener(this);
+    }
+
+    @Override
+    public void onAnimationUpdate(ValueAnimator animator) {
+        if (mHasAnimationEnded) return;
+
+        final float fraction = animator.getAnimatedFraction();
+        final Rect bounds = mRectEvaluator.evaluate(fraction, mStartBounds, mDestinationBounds);
+        final Rect insets = mInsetsEvaluator.evaluate(fraction, mSourceInsets,
+                mSourceHintRectInsets);
+        final SurfaceControl.Transaction tx = new SurfaceControl.Transaction();
+        mSurfaceTransactionHelper.scaleAndCrop(tx, mLeash, mStartBounds, bounds, insets);
+        tx.setCornerRadius(mLeash, 0).apply();
+    }
+
+    public int getTaskId() {
+        return mTaskId;
+    }
+
+    public ComponentName getComponentName() {
+        return mComponentName;
+    }
+
+    public Rect getDestinationBounds() {
+        return mDestinationBounds;
+    }
+
+    private void onAnimationEnd() {
+        if (mHasAnimationEnded) return;
+
+        final SurfaceControl.Transaction tx = new SurfaceControl.Transaction();
+        mSurfaceTransactionHelper.resetScale(tx, mLeash, mDestinationBounds);
+        mSurfaceTransactionHelper.crop(tx, mLeash, mDestinationBounds);
+        tx.setCornerRadius(mLeash, 0).apply();
+        mHasAnimationEnded = true;
+    }
+
+    /**
+     * Slim version of {@link com.android.wm.shell.pip.PipSurfaceTransactionHelper}
+     */
+    private static final class SurfaceTransactionHelper {
+        private final Matrix mTmpTransform = new Matrix();
+        private final float[] mTmpFloat9 = new float[9];
+        private final RectF mTmpSourceRectF = new RectF();
+        private final Rect mTmpDestinationRect = new Rect();
+
+        private void scaleAndCrop(SurfaceControl.Transaction tx, SurfaceControl leash,
+                Rect sourceBounds, Rect destinationBounds, Rect insets) {
+            mTmpSourceRectF.set(sourceBounds);
+            mTmpDestinationRect.set(sourceBounds);
+            mTmpDestinationRect.inset(insets);
+            // Scale by the shortest edge and offset such that the top/left of the scaled inset
+            // source rect aligns with the top/left of the destination bounds
+            final float scale = sourceBounds.width() <= sourceBounds.height()
+                    ? (float) destinationBounds.width() / sourceBounds.width()
+                    : (float) destinationBounds.height() / sourceBounds.height();
+            final float left = destinationBounds.left - insets.left * scale;
+            final float top = destinationBounds.top - insets.top * scale;
+            mTmpTransform.setScale(scale, scale);
+            tx.setMatrix(leash, mTmpTransform, mTmpFloat9)
+                    .setWindowCrop(leash, mTmpDestinationRect)
+                    .setPosition(leash, left, top);
+        }
+
+        private void resetScale(SurfaceControl.Transaction tx, SurfaceControl leash,
+                Rect destinationBounds) {
+            tx.setMatrix(leash, Matrix.IDENTITY_MATRIX, mTmpFloat9)
+                    .setPosition(leash, destinationBounds.left, destinationBounds.top);
+        }
+
+        private void crop(SurfaceControl.Transaction tx, SurfaceControl leash,
+                Rect destinationBounds) {
+            tx.setWindowCrop(leash, destinationBounds.width(), destinationBounds.height())
+                    .setPosition(leash, destinationBounds.left, destinationBounds.top);
+        }
+    }
+}
-- 
GitLab


From 1cc12ebc121f289db3e481aa5f9c4b72514ad52f Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Thu, 22 Oct 2020 13:59:09 -0700
Subject: [PATCH 0270/1664] End the attaching animation early when we settle on
 the end target

The attaching animation can take longer than the transition to recents
when you let go, and the ADJACENT_PAGE_OFFSET calculation is different
when there's a running task vs not. So after the transition to recents
ended, the calculation of the still playing attaching animation would
change, causing the jump you see in the bug. Now we make sure to end
the attaching animation if it's still running when we settle on an
end target to avoid this issue.

Fixes: 168563692
Change-Id: I3f37aecf9c93f2ec63dbdce561e7f5ba11be89cc
---
 quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index cc109f608c..239c0e4d0e 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -800,6 +800,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
     }
 
     private void onSettledOnEndTarget() {
+        // Fast-finish the attaching animation if it's still running.
+        maybeUpdateRecentsAttachedState(false);
         final GestureEndTarget endTarget = mGestureState.getEndTarget();
         switch (endTarget) {
             case HOME:
-- 
GitLab


From cb403d9e5235c7323bc2fdffe6a264d17bb6d0a6 Mon Sep 17 00:00:00 2001
From: Pinyao Ting <pinyaoting@google.com>
Date: Thu, 22 Oct 2020 16:07:08 -0700
Subject: [PATCH 0271/1664] flip default value of minimal device feature flag

Test: manual
Change-Id: Iaf46dffb935bdf4b46e7c57d547bdc697250ec56
---
 src/com/android/launcher3/config/FeatureFlags.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 58b0a87468..4beaf6e17a 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -182,7 +182,7 @@ public final class FeatureFlags {
             "Uses a separate recents activity instead of using the integrated recents+Launcher UI");
 
     public static final BooleanFlag ENABLE_MINIMAL_DEVICE = getDebugFlag(
-            "ENABLE_MINIMAL_DEVICE", true,
+            "ENABLE_MINIMAL_DEVICE", false,
             "Allow user to toggle minimal device mode in launcher.");
 
     public static void initialize(Context context) {
-- 
GitLab


From f99351888c3e5a128559678304fefd647472bc7f Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 23 Oct 2020 09:26:44 -0700
Subject: [PATCH 0272/1664] Revert "Revert "Merge commit
 '8d14dbe041199d611839140f1c9285fd4174e9f4' ...""

This reverts commit 087a9e39b663dade90d8dfd74300e42575649b87.

Change-Id: I05b17a6e4aaaef6de3c2fa26aad45a39eb2833f9
---
 Android.mk                                    |   8 -
 build.gradle                                  |  24 +-
 protos/launcher_log.proto                     | 245 ------------
 .../res/layout/gesture_tutorial_fragment.xml  |   9 +-
 quickstep/res/values/strings.xml              |  15 +
 .../launcher3/BaseQuickstepLauncher.java      |   8 +
 .../launcher3/LauncherAnimationRunner.java    |   3 +-
 .../QuickstepAppTransitionManagerImpl.java    |  75 ++--
 .../appprediction/PredictionRowView.java      |  31 +-
 .../HotseatPredictionController.java          |   1 -
 .../uioverrides/states/AllAppsState.java      |   4 +-
 .../states/BackgroundAppState.java            |   5 +-
 .../states/OverviewModalTaskState.java        |   5 +-
 .../uioverrides/states/OverviewState.java     |   4 +-
 .../uioverrides/states/QuickSwitchState.java  |   5 +-
 .../LandscapeEdgeSwipeController.java         |  16 +-
 .../NavBarToHomeTouchController.java          |  19 +-
 ...ButtonNavbarToOverviewTouchController.java |   5 +-
 .../NoButtonQuickSwitchTouchController.java   |  25 +-
 .../OverviewToAllAppsTouchController.java     |   6 -
 .../PortraitStatesTouchController.java        |  13 +-
 .../QuickSwitchTouchController.java           |  19 +-
 .../StatusBarTouchController.java             |  14 +-
 .../TaskViewTouchController.java              |  14 +-
 .../android/quickstep/AbsSwipeUpHandler.java  |  49 ++-
 .../quickstep/BaseActivityInterface.java      |   5 -
 .../quickstep/FallbackActivityInterface.java  |  10 -
 .../com/android/quickstep/GestureState.java   |  12 +-
 .../quickstep/LauncherActivityInterface.java  |  12 -
 .../quickstep/OverviewCommandHelper.java      |  13 +-
 .../android/quickstep/RecentsActivity.java    |  19 +-
 .../com/android/quickstep/RecentsModel.java   |  14 +-
 .../com/android/quickstep/TaskIconCache.java  |  50 +--
 .../quickstep/TaskShortcutFactory.java        |   4 -
 .../android/quickstep/TaskThumbnailCache.java |  52 +--
 .../quickstep/TouchInteractionService.java    |  11 +-
 .../fallback/FallbackRecentsView.java         |  10 +-
 .../AssistantInputConsumer.java               |  20 +-
 .../OtherActivityInputConsumer.java           |  12 +-
 .../OverviewWithoutFocusInputConsumer.java    |  17 +-
 .../AssistantGestureTutorialFragment.java     |   2 +-
 .../BackGestureTutorialFragment.java          |   2 +-
 .../interaction/EdgeBackGestureHandler.java   |   4 +
 .../HomeGestureTutorialFragment.java          |   2 +-
 .../interaction/NavBarGestureHandler.java     |   6 +
 .../OverviewGestureTutorialFragment.java      |   2 +-
 .../interaction/RootSandboxLayout.java        |  44 +++
 .../interaction/SandboxLauncherRenderer.java  |  44 +++
 .../SandboxModeTutorialController.java        | 102 +++++
 .../SandboxModeTutorialFragment.java          |  43 ++
 .../interaction/TutorialController.java       |  17 +-
 .../interaction/TutorialFragment.java         |  39 +-
 .../quickstep/util/CancellableTask.java       |  68 ++++
 .../quickstep/util/OverviewToHomeAnim.java    |   4 +-
 .../quickstep/util/RecentsOrientedState.java  |  11 +-
 .../util/RemoteAnimationProvider.java         |  12 +-
 .../quickstep/util/TaskViewSimulator.java     |   5 +-
 .../views/DigitalWellBeingToast.java          |   5 +-
 .../quickstep/views/LauncherRecentsView.java  |  11 +-
 .../quickstep/views/OverviewActionsView.java  |   4 +-
 .../android/quickstep/views/RecentsView.java  |  35 +-
 .../android/quickstep/views/TaskMenuView.java |  12 +-
 .../com/android/quickstep/views/TaskView.java |  37 +-
 .../quickstep/DigitalWellBeingToastTest.java  |   7 +-
 res/layout/search_result_icon_row.xml         |  31 ++
 res/layout/search_result_shortcut.xml         |  42 --
 res/layout/search_result_suggest.xml          |  38 ++
 res/layout/search_result_thumbnail.xml        |  19 +
 res/values/config.xml                         |   1 -
 .../secondarydisplay/SDWorkModeTest.java      |   5 -
 .../launcher3/ui/LauncherUIScrollTest.java    |   5 -
 src/com/android/launcher3/BaseActivity.java   |  12 -
 src/com/android/launcher3/BubbleTextView.java |  59 ++-
 .../android/launcher3/ButtonDropTarget.java   |   3 -
 src/com/android/launcher3/CellLayout.java     |   7 +-
 .../android/launcher3/DeleteDropTarget.java   |  24 +-
 .../android/launcher3/FastBitmapDrawable.java |   9 +-
 src/com/android/launcher3/Hotseat.java        |  23 +-
 src/com/android/launcher3/Launcher.java       |  92 +++--
 .../android/launcher3/LauncherAppState.java   |   2 +-
 src/com/android/launcher3/LauncherState.java  |  12 +-
 .../launcher3/SecondaryDropTarget.java        |  16 -
 .../launcher3/SessionCommitReceiver.java      |   8 +
 src/com/android/launcher3/Utilities.java      |   4 +
 src/com/android/launcher3/Workspace.java      |  40 +-
 .../launcher3/WorkspaceLayoutManager.java     |   6 +-
 .../launcher3/allapps/AllAppsGridAdapter.java |  94 +++--
 .../allapps/AllAppsRecyclerView.java          |  15 +-
 .../launcher3/allapps/DiscoveryBounce.java    |  10 +-
 .../search/AllAppsSearchBarController.java    |  40 ++
 .../launcher3/anim/PendingAnimation.java      |  10 +-
 .../launcher3/dragndrop/AddItemActivity.java  |  30 +-
 .../launcher3/dragndrop/DragController.java   |   2 -
 src/com/android/launcher3/folder/Folder.java  |  34 +-
 .../android/launcher3/folder/FolderIcon.java  |   1 -
 .../graphics/LauncherPreviewRenderer.java     |   3 +-
 .../launcher3/logging/LoggerUtils.java        | 190 ---------
 .../launcher3/logging/StatsLogManager.java    |  74 ++--
 .../launcher3/logging/StatsLogUtils.java      |  49 ---
 .../logging/UserEventDispatcher.java          | 373 ------------------
 .../launcher3/model/data/FolderInfo.java      | 119 ------
 .../model/data/RemoteActionItemInfo.java      |  64 +++
 .../notification/NotificationMainView.java    |   7 +-
 .../launcher3/pm/InstallSessionHelper.java    |  51 ++-
 .../launcher3/pm/InstallSessionTracker.java   |   3 +
 src/com/android/launcher3/pm/UserCache.java   |   6 +-
 .../android/launcher3/popup/ArrowPopup.java   |  58 ++-
 .../popup/PopupContainerWithArrow.java        |   9 +-
 .../launcher3/popup/RemoteActionShortcut.java |   4 -
 .../launcher3/popup/SystemShortcut.java       |   6 -
 .../settings/DeveloperOptionsFragment.java    |   9 +
 .../android/launcher3/states/HintState.java   |   5 +-
 .../launcher3/states/SpringLoadedState.java   |   5 +-
 .../AbstractStateChangeTouchController.java   |  50 +--
 .../touch/AllAppsSwipeController.java         |   7 -
 .../launcher3/touch/ItemClickHandler.java     |  24 ++
 .../touch/LandscapePagedViewHandler.java      |   1 -
 .../touch/PagedOrientationHandler.java        |   1 -
 .../touch/PortraitPagedViewHandler.java       |   1 -
 src/com/android/launcher3/util/Executors.java |  27 ++
 .../launcher3/views/FloatingIconView.java     |  88 ++---
 .../launcher3/views/HeroSearchResultView.java |  41 +-
 .../launcher3/views/OptionsPopupView.java     |   6 +-
 .../launcher3/views/SearchResultIconRow.java  | 155 ++++++++
 .../views/SearchResultPeopleView.java         |  67 ++--
 .../launcher3/views/SearchResultPlayItem.java |   9 +-
 .../launcher3/views/SearchResultShortcut.java | 110 ------
 .../views/SearchResultSuggestRow.java         | 131 ++++++
 .../views/SearchSectionHeaderView.java        |   5 +
 .../views/SearchSettingsRowView.java          |   9 +-
 .../views/ThumbnailSearchResultView.java      | 114 ++++++
 .../systemui/plugins/AllAppsSearchPlugin.java |   8 +-
 .../systemui/plugins/shared/SearchTarget.java |  69 +++-
 .../plugins/shared/SearchTargetEvent.java     |  10 +-
 .../uioverrides/states/AllAppsState.java      |   4 +-
 .../uioverrides/states/OverviewState.java     |   5 +-
 .../launcher3/ui/AbstractLauncherUiTest.java  |   2 +
 .../com/android/launcher3/ui/WorkTabTest.java |   7 +-
 138 files changed, 1945 insertions(+), 2136 deletions(-)
 delete mode 100644 protos/launcher_log.proto
 create mode 100644 quickstep/src/com/android/quickstep/interaction/RootSandboxLayout.java
 create mode 100644 quickstep/src/com/android/quickstep/interaction/SandboxLauncherRenderer.java
 create mode 100644 quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java
 create mode 100644 quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialFragment.java
 create mode 100644 quickstep/src/com/android/quickstep/util/CancellableTask.java
 create mode 100644 res/layout/search_result_icon_row.xml
 delete mode 100644 res/layout/search_result_shortcut.xml
 create mode 100644 res/layout/search_result_suggest.xml
 create mode 100644 res/layout/search_result_thumbnail.xml
 delete mode 100644 src/com/android/launcher3/logging/LoggerUtils.java
 delete mode 100644 src/com/android/launcher3/logging/StatsLogUtils.java
 delete mode 100644 src/com/android/launcher3/logging/UserEventDispatcher.java
 create mode 100644 src/com/android/launcher3/model/data/RemoteActionItemInfo.java
 create mode 100644 src/com/android/launcher3/views/SearchResultIconRow.java
 delete mode 100644 src/com/android/launcher3/views/SearchResultShortcut.java
 create mode 100644 src/com/android/launcher3/views/SearchResultSuggestRow.java
 create mode 100644 src/com/android/launcher3/views/ThumbnailSearchResultView.java

diff --git a/Android.mk b/Android.mk
index 25f5412d21..349a134d75 100644
--- a/Android.mk
+++ b/Android.mk
@@ -36,18 +36,12 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
     launcher_log_protos_lite
 
 LOCAL_SRC_FILES := \
-    $(call all-proto-files-under, protos) \
-    $(call all-proto-files-under, proto_overrides) \
     $(call all-java-files-under, src_build_config) \
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
 LOCAL_PROGUARD_ENABLED := disabled
 
-LOCAL_PROTOC_OPTIMIZE_TYPE := nano
-LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/ --proto_path=$(LOCAL_PATH)/proto_overrides/
-LOCAL_PROTO_JAVA_OUTPUT_PARAMS := enum_style=java
-
 LOCAL_SDK_VERSION := current
 LOCAL_MIN_SDK_VERSION := 26
 LOCAL_MODULE := Launcher3CommonDepsLib
@@ -135,7 +129,6 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_STATIC_JAVA_LIBRARIES := \
     SystemUI-statsd \
     SystemUISharedLib \
-    launcherprotosnano \
     launcher_log_protos_lite
 ifneq (,$(wildcard frameworks/base))
   LOCAL_PRIVATE_PLATFORM_APIS := true
@@ -203,7 +196,6 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_STATIC_JAVA_LIBRARIES := \
     SystemUI-statsd \
     SystemUISharedLib \
-    launcherprotosnano \
     launcher_log_protos_lite
 ifneq (,$(wildcard frameworks/base))
   LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/build.gradle b/build.gradle
index 534ca65115..28a05d569c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -82,7 +82,6 @@ android {
             manifest.srcFile 'AndroidManifest-common.xml'
             proto {
                 srcDir 'protos/'
-                srcDir 'proto_overrides/'
             }
         }
 
@@ -150,7 +149,6 @@ dependencies {
     implementation "androidx.preference:preference:${ANDROID_X_VERSION}"
     implementation project(':IconLoader')
     withQuickstepImplementation project(':SharedLibWrapper')
-    implementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/libs", include: 'launcher_protos.jar')
 
     // Recents lib dependency
     withQuickstepImplementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/quickstep/libs", include: 'sysui_shared.jar')
@@ -171,20 +169,16 @@ dependencies {
 protobuf {
     // Configure the protoc executable
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.0.0'
-
-        generateProtoTasks {
-            all().each { task ->
-                task.builtins {
-                    remove java
-                    javanano {
-                        option "java_package=launcher_log_extension.proto|com.android.launcher3.userevent.nano"
-                        option "java_package=launcher_log.proto|com.android.launcher3.userevent.nano"
-                        option "java_package=launcher_dump.proto|com.android.launcher3.model.nano"
-                        option "enum_style=java"
-                    }
+        artifact = "com.google.protobuf:protoc:${protocVersion}"
+    }
+    generateProtoTasks {
+        all().each { task ->
+            task.builtins {
+                remove java
+                java {
+                    option "lite"
                 }
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/protos/launcher_log.proto b/protos/launcher_log.proto
deleted file mode 100644
index 9423cb2642..0000000000
--- a/protos/launcher_log.proto
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-syntax = "proto2";
-
-import "launcher_log_extension.proto";
-
-option java_package = "com.android.launcher3.userevent";
-option java_outer_classname = "LauncherLogProto";
-
-package userevent;
-
-message Target {
-  enum Type {
-    NONE = 0;
-    ITEM = 1;
-    CONTROL = 2;
-    CONTAINER = 3;
-  }
-
-  optional Type type = 1;
-
-  // For container type and item type
-  // Used mainly for ContainerType.FOLDER, ItemType.*
-  optional int32 page_index = 2;
-  optional int32 rank = 3;
-  optional int32 grid_x = 4;
-  optional int32 grid_y = 5;
-
-  // For container types only
-  optional ContainerType container_type = 6;
-  optional int32 cardinality = 7;
-
-  // For control types only
-  optional ControlType control_type = 8;
-
-  // For item types only
-  optional ItemType item_type = 9;
-  optional int32 package_name_hash = 10;
-  optional int32 component_hash = 11;      // Used for ItemType.WIDGET
-  optional int32 intent_hash = 12;         // Used for ItemType.SHORTCUT
-  optional int32 span_x = 13 [default = 1];// Used for ItemType.WIDGET
-  optional int32 span_y = 14 [default = 1];// Used for ItemType.WIDGET
-  optional int32 predictedRank = 15;
-  optional TargetExtension extension = 16;
-  optional TipType tip_type = 17;
-  optional int32 search_query_length = 18;
-  optional bool is_work_app = 19;
-  optional FromFolderLabelState from_folder_label_state = 20;
-  optional ToFolderLabelState to_folder_label_state = 21;
-
-  // Note: proto does not support duplicate enum values, even if they belong to different enum type.
-  // Hence "FROM" and "TO" prefix added.
-  enum FromFolderLabelState {
-    FROM_FOLDER_LABEL_STATE_UNSPECIFIED = 0;
-    FROM_EMPTY = 1;
-    FROM_CUSTOM = 2;
-    FROM_SUGGESTED = 3;
-  }
-
-  enum ToFolderLabelState {
-    TO_FOLDER_LABEL_STATE_UNSPECIFIED = 0;
-    TO_SUGGESTION0_WITH_VALID_PRIMARY = 1;
-    TO_SUGGESTION1_WITH_VALID_PRIMARY = 2;
-    TO_SUGGESTION1_WITH_EMPTY_PRIMARY = 3;
-    TO_SUGGESTION2_WITH_VALID_PRIMARY = 4;
-    TO_SUGGESTION2_WITH_EMPTY_PRIMARY = 5;
-    TO_SUGGESTION3_WITH_VALID_PRIMARY = 6;
-    TO_SUGGESTION3_WITH_EMPTY_PRIMARY = 7;
-    TO_EMPTY_WITH_VALID_SUGGESTIONS = 8 [deprecated = true];
-    TO_EMPTY_WITH_VALID_PRIMARY = 15;
-    TO_EMPTY_WITH_VALID_SUGGESTIONS_AND_EMPTY_PRIMARY = 16;
-    TO_EMPTY_WITH_EMPTY_SUGGESTIONS = 9;
-    TO_EMPTY_WITH_SUGGESTIONS_DISABLED = 10;
-    TO_CUSTOM_WITH_VALID_SUGGESTIONS = 11 [deprecated = true];
-    TO_CUSTOM_WITH_VALID_PRIMARY = 17;
-    TO_CUSTOM_WITH_VALID_SUGGESTIONS_AND_EMPTY_PRIMARY = 18;
-    TO_CUSTOM_WITH_EMPTY_SUGGESTIONS = 12;
-    TO_CUSTOM_WITH_SUGGESTIONS_DISABLED = 13;
-    UNCHANGED = 14;
-  }
-}
-
-// Used to define what type of item a Target would represent.
-enum ItemType {
-  DEFAULT_ITEMTYPE = 0;
-  APP_ICON = 1;
-  SHORTCUT = 2;
-  WIDGET = 3;
-  FOLDER_ICON = 4;
-  DEEPSHORTCUT = 5;
-  SEARCHBOX = 6;
-  EDITTEXT = 7;
-  NOTIFICATION = 8;
-  TASK = 9;         // Each page of Recents UI (QuickStep)
-  WEB_APP = 10;
-  TASK_ICON = 11;
-}
-
-// Used to define what type of container a Target would represent.
-enum ContainerType {
-  DEFAULT_CONTAINERTYPE = 0;
-  WORKSPACE = 1;
-  HOTSEAT = 2;
-  FOLDER = 3;
-  ALLAPPS = 4;
-  WIDGETS = 5;
-  OVERVIEW = 6;   // Zoomed out workspace (without QuickStep)
-  PREDICTION = 7;
-  SEARCHRESULT = 8;
-  DEEPSHORTCUTS = 9;
-  PINITEM = 10;    // confirmation screen
-  NAVBAR = 11;
-  TASKSWITCHER = 12; // Recents UI Container (QuickStep)
-  APP = 13; // Foreground activity is another app (QuickStep)
-  TIP = 14; // Onboarding texts (QuickStep)
-  OTHER_LAUNCHER_APP = 15;
-}
-
-// Used to define what type of control a Target would represent.
-enum ControlType {
-  DEFAULT_CONTROLTYPE = 0;
-  ALL_APPS_BUTTON = 1;
-  WIDGETS_BUTTON = 2;
-  WALLPAPER_BUTTON = 3;
-  SETTINGS_BUTTON = 4;
-  REMOVE_TARGET = 5;
-  UNINSTALL_TARGET = 6;
-  APPINFO_TARGET = 7;
-  RESIZE_HANDLE = 8;
-  VERTICAL_SCROLL = 9;
-  HOME_INTENT = 10; // Deprecated, use enum Command instead
-  BACK_BUTTON = 11;
-  QUICK_SCRUB_BUTTON = 12;
-  CLEAR_ALL_BUTTON = 13;
-  CANCEL_TARGET = 14;
-  TASK_PREVIEW = 15;
-  SPLIT_SCREEN_TARGET = 16;
-  REMOTE_ACTION_SHORTCUT = 17;
-  APP_USAGE_SETTINGS = 18;
-  BACK_GESTURE = 19;
-  UNDO = 20;
-  DISMISS_PREDICTION = 21;
-  HYBRID_HOTSEAT_ACCEPTED = 22;
-  HYBRID_HOTSEAT_CANCELED = 23;
-  OVERVIEW_ACTIONS_SHARE_BUTTON = 24;
-  OVERVIEW_ACTIONS_SCREENSHOT_BUTTON = 25;
-  OVERVIEW_ACTIONS_SELECT_BUTTON = 26;
-  SELECT_MODE_CLOSE_BUTTON = 27;
-  SELECT_MODE_ITEM = 28;
-}
-
-enum TipType {
-  DEFAULT_NONE = 0;
-  BOUNCE = 1;
-  SWIPE_UP_TEXT = 2;
-  QUICK_SCRUB_TEXT = 3;
-  PREDICTION_TEXT = 4;
-  DWB_TOAST = 5;
-  HYBRID_HOTSEAT = 6;
-}
-
-// Used to define the action component of the LauncherEvent.
-message Action {
-  enum Type {
-    TOUCH = 0;
-    AUTOMATED = 1;
-    COMMAND = 2;
-    TIP = 3;
-    SOFT_KEYBOARD = 4;
-    // HARD_KEYBOARD, ASSIST
-  }
-
-  enum Touch {
-    TAP = 0;
-    LONGPRESS = 1;
-    DRAGDROP = 2;
-    SWIPE = 3;
-    FLING = 4;
-    PINCH = 5;
-    SWIPE_NOOP = 6;
-  }
-
-  enum Direction {
-    NONE = 0;
-    UP = 1;
-    DOWN = 2;
-    LEFT = 3;
-    RIGHT = 4;
-    UPRIGHT = 5;
-    UPLEFT = 6;
-  }
-  enum Command {
-    HOME_INTENT = 0;
-    BACK = 1;
-    ENTRY = 2;          // Indicates entry to one of Launcher container type target
-                        // not using the HOME_INTENT
-    CANCEL = 3;         // Indicates that a confirmation screen was cancelled
-    CONFIRM = 4;        // Indicates thata confirmation screen was accepted
-    STOP = 5;           // Indicates onStop() was called (screen time out, power off)
-    RECENTS_BUTTON = 6; // Indicates that Recents button was pressed
-    RESUME = 7;         // Indicates onResume() was called
-  }
-
-  optional Type type = 1;
-  optional Touch touch = 2;
-  optional Direction dir = 3;
-  optional Command command = 4;
-  // Log if the action was performed on outside of the container
-  optional bool is_outside = 5;
-  optional bool is_state_change = 6;
-}
-
-//
-// Context free grammar of typical user interaction:
-//         Action (Touch) + Target
-//         Action (Touch) + Target + Target
-//
-message LauncherEvent {
-  required Action action = 1;
-  // List of targets that touch actions can be operated on.
-  repeated Target src_target = 2;
-  repeated Target dest_target = 3;
-
-  optional int64 action_duration_millis = 4;
-  optional int64 elapsed_container_millis = 5;
-  optional int64 elapsed_session_millis = 6;
-
-  optional bool is_in_multi_window_mode = 7 [deprecated = true];
-  optional bool is_in_landscape_mode = 8 [deprecated = true];
-
-  optional LauncherEventExtension extension = 9;
-}
diff --git a/quickstep/res/layout/gesture_tutorial_fragment.xml b/quickstep/res/layout/gesture_tutorial_fragment.xml
index 43bf0ea966..52475dfc8a 100644
--- a/quickstep/res/layout/gesture_tutorial_fragment.xml
+++ b/quickstep/res/layout/gesture_tutorial_fragment.xml
@@ -13,7 +13,8 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.quickstep.interaction.RootSandboxLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?android:attr/colorBackground">
@@ -93,11 +94,11 @@
         style="@style/TextAppearance.GestureTutorial.Feedback"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_above="@id/gesture_tutorial_fragment_action_button"
+        android:layout_below="@id/gesture_tutorial_fragment_titles_container"
         android:layout_centerHorizontal="true"
         android:layout_marginStart="@dimen/gesture_tutorial_feedback_margin_start_end"
         android:layout_marginEnd="@dimen/gesture_tutorial_feedback_margin_start_end"
-        android:layout_marginBottom="10dp"/>
+        android:layout_marginTop="40dp"/>
 
     <!-- android:stateListAnimator="@null" removes shadow and normal on click behavior (increase
          of elevation and shadow) which is replaced by ripple effect in android:foreground -->
@@ -126,4 +127,4 @@
         android:background="@null"
         android:foreground="?android:attr/selectableItemBackgroundBorderless"
         android:stateListAnimator="@null"/>
-</RelativeLayout>
\ No newline at end of file
+</com.android.quickstep.interaction.RootSandboxLayout>
\ No newline at end of file
diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml
index 86120e3b97..4b45b10d4d 100644
--- a/quickstep/res/values/strings.xml
+++ b/quickstep/res/values/strings.xml
@@ -149,6 +149,21 @@
     <!-- Feedback shown during interactive parts of Assistant gesture tutorial when the gesture doesn't go far enough. [CHAR LIMIT=100] -->
     <string name="assistant_gesture_feedback_swipe_not_long_enough" translatable="false">Try swiping further</string>
 
+    <!-- Title shown in sandbox mode part of gesture tutorial. [CHAR LIMIT=30] -->
+    <string name="sandbox_mode_title" translatable="false">Sandbox Mode</string>
+    <!-- Subtitle shown in sandbox mode part of gesture tutorial. [CHAR LIMIT=60] -->
+    <string name="sandbox_mode_subtitle" translatable="false">Try any navigation gesture</string>
+    <!-- Feedback shown in sandbox mode when the back gesture is successfully issued. [CHAR LIMIT=60] -->
+    <string name="sandbox_mode_back_gesture_feedback_successful" translatable="false">Back gesture successful</string>
+    <!-- Feedback shown in sandbox mode when the assistant gesture is a successfully issued. [CHAR LIMIT=60] -->
+    <string name="sandbox_mode_assistant_gesture_feedback_successful" translatable="false">Assistant gesture successful</string>
+    <!-- Feedback shown in sandbox mode when the home gesture is a successfully issued. [CHAR LIMIT=60] -->
+    <string name="sandbox_mode_home_gesture_feedback_successful" translatable="false">Home gesture successful</string>
+    <!-- Feedback shown in sandbox mode when the overview gesture is a successfully issued. [CHAR LIMIT=60] -->
+    <string name="sandbox_mode_overview_gesture_feedback_successful" translatable="false">Overview gesture successful</string>
+    <!-- Feedback shown in sandbox mode when the back gesture swipe is too far from the edge. [CHAR LIMIT=60] -->
+    <string name="sandbox_mode_back_gesture_feedback_swipe_too_far_from_edge" translatable="false">Make sure you swipe from the left/right edge of the screen</string>
+
     <!-- Title shown on the confirmation screen after successful gesture. [CHAR LIMIT=30] -->
     <string name="gesture_tutorial_confirm_title" translatable="false">All set</string>
     <!-- Button text shown on a button on the confirm screen to leave the tutorial. [CHAR LIMIT=14] -->
diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index bc3b4ab0ef..44d43c6784 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -22,6 +22,8 @@ import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY;
 
+import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
+
 import android.animation.AnimatorSet;
 import android.animation.ValueAnimator;
 import android.app.ActivityOptions;
@@ -319,4 +321,10 @@ public abstract class BaseQuickstepLauncher extends Launcher
     public void setHintUserWillBeActive() {
         addActivityFlags(ACTIVITY_STATE_USER_WILL_BE_ACTIVE);
     }
+
+    @Override
+    public void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        InteractionJankMonitorWrapper.init(getWindow().getDecorView());
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
index b35b33c418..5c8463c2a7 100644
--- a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
+++ b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
@@ -34,8 +34,7 @@ import com.android.systemui.shared.system.RemoteAnimationRunnerCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
 @TargetApi(Build.VERSION_CODES.P)
-public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCompat,
-        WrappedAnimationRunnerImpl {
+public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCompat {
 
     private static final String TAG = "LauncherAnimationRunner";
 
diff --git a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
index b53e834db4..057c0f4aaa 100644
--- a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
@@ -66,6 +66,7 @@ import androidx.annotation.Nullable;
 
 import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
 import com.android.launcher3.allapps.AllAppsTransitionController;
+import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.shortcuts.DeepShortcutView;
@@ -81,6 +82,7 @@ import com.android.quickstep.util.StaggeredWorkspaceAnim;
 import com.android.quickstep.util.SurfaceTransactionApplier;
 import com.android.systemui.shared.system.ActivityCompat;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
+import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
 import com.android.systemui.shared.system.QuickStepContract;
 import com.android.systemui.shared.system.RemoteAnimationAdapterCompat;
 import com.android.systemui.shared.system.RemoteAnimationDefinitionCompat;
@@ -795,6 +797,36 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                 == PackageManager.PERMISSION_GRANTED;
     }
 
+    private void addCujInstrumentation(Animator anim, int cuj, String transition) {
+        if (Trace.isEnabled()) {
+            anim.addListener(new AnimationSuccessListener() {
+                @Override
+                public void onAnimationStart(Animator animation) {
+                    Trace.beginAsyncSection(transition, 0);
+                    InteractionJankMonitorWrapper.begin(cuj);
+                    super.onAnimationStart(animation);
+                }
+
+                @Override
+                public void onAnimationCancel(Animator animation) {
+                    super.onAnimationCancel(animation);
+                    InteractionJankMonitorWrapper.cancel(cuj);
+                }
+
+                @Override
+                public void onAnimationSuccess(Animator animator) {
+                    InteractionJankMonitorWrapper.end(cuj);
+                }
+
+                @Override
+                public void onAnimationEnd(Animator animation) {
+                    super.onAnimationEnd(animation);
+                    Trace.endAsyncSection(TRANSITION_OPEN_LAUNCHER, 0);
+                }
+            });
+        }
+    }
+
     /**
      * Remote animation runner for animation from the app to Launcher, including recents.
      */
@@ -859,21 +891,9 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                 // is initialized.
                 if (launcherIsATargetWithMode(appTargets, MODE_OPENING)
                         || mLauncher.isForceInvisible()) {
-                    if (Trace.isEnabled()) {
-                        anim.addListener(new AnimatorListenerAdapter() {
-                            @Override
-                            public void onAnimationStart(Animator animation) {
-                                Trace.beginAsyncSection(TRANSITION_OPEN_LAUNCHER, 0);
-                                super.onAnimationStart(animation);
-                            }
-
-                            @Override
-                            public void onAnimationEnd(Animator animation) {
-                                super.onAnimationEnd(animation);
-                                Trace.endAsyncSection(TRANSITION_OPEN_LAUNCHER, 0);
-                            }
-                        });
-                    }
+                    addCujInstrumentation(
+                            anim, InteractionJankMonitorWrapper.CUJ_APP_CLOSE_TO_HOME,
+                            TRANSITION_OPEN_LAUNCHER);
                     // Only register the content animation for cancellation when state changes
                     mLauncher.getStateManager().setCurrentAnimation(anim);
 
@@ -942,25 +962,12 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                         launcherClosing);
             }
 
-            if (Trace.isEnabled()) {
-                final String section =
-                        launchingFromRecents
-                                ? TRANSITION_LAUNCH_FROM_RECENTS : TRANSITION_LAUNCH_FROM_ICON;
-
-                anim.addListener(new AnimatorListenerAdapter() {
-                    @Override
-                    public void onAnimationStart(Animator animation) {
-                        Trace.beginAsyncSection(section, 0);
-                        super.onAnimationStart(animation);
-                    }
-
-                    @Override
-                    public void onAnimationEnd(Animator animation) {
-                        super.onAnimationEnd(animation);
-                        Trace.endAsyncSection(section, 0);
-                    }
-                });
-            }
+            addCujInstrumentation(anim,
+                    launchingFromRecents
+                            ? InteractionJankMonitorWrapper.CUJ_APP_LAUNCH_FROM_RECENTS
+                            : InteractionJankMonitorWrapper.CUJ_APP_LAUNCH_FROM_ICON,
+                    launchingFromRecents
+                            ? TRANSITION_LAUNCH_FROM_RECENTS : TRANSITION_LAUNCH_FROM_ICON);
 
             if (launcherClosing) {
                 anim.addListener(mForceInvisibleListener);
diff --git a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
index d3c4c3d62d..5b066c6be6 100644
--- a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
+++ b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
@@ -16,11 +16,8 @@
 
 package com.android.launcher3.appprediction;
 
-import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
-import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
-import static com.android.launcher3.logging.LoggerUtils.newTarget;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -43,7 +40,6 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsSectionDecorator;
 import com.android.launcher3.allapps.FloatingHeaderRow;
@@ -53,13 +49,11 @@ import com.android.launcher3.anim.PropertySetter;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.keyboard.FocusIndicatorHelper;
 import com.android.launcher3.keyboard.FocusIndicatorHelper.SimpleFocusIndicatorHelper;
-import com.android.launcher3.logging.StatsLogUtils.LogContainerProvider;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.touch.ItemClickHandler;
 import com.android.launcher3.touch.ItemLongClickListener;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.launcher3.util.Themes;
 import com.android.quickstep.AnimatedFloat;
 
@@ -68,7 +62,7 @@ import java.util.List;
 
 @TargetApi(Build.VERSION_CODES.P)
 public class PredictionRowView extends LinearLayout implements
-        LogContainerProvider, OnDeviceProfileChangeListener, FloatingHeaderRow {
+        OnDeviceProfileChangeListener, FloatingHeaderRow {
 
     private static final IntProperty<PredictionRowView> TEXT_ALPHA =
             new IntProperty<PredictionRowView>("textAlpha") {
@@ -271,29 +265,6 @@ public class PredictionRowView extends LinearLayout implements
         mParent.onHeightUpdated();
     }
 
-    @Override
-    public void fillInLogContainerData(ItemInfo childInfo, LauncherLogProto.Target child,
-            ArrayList<LauncherLogProto.Target> parents) {
-        for (int i = 0; i < mPredictedApps.size(); i++) {
-            ItemInfoWithIcon appInfo = mPredictedApps.get(i);
-            if (appInfo == childInfo) {
-                child.predictedRank = i;
-                break;
-            }
-        }
-        parents.add(newContainerTarget(LauncherLogProto.ContainerType.PREDICTION));
-
-        // include where the prediction is coming this used to be Launcher#modifyUserEvent
-        LauncherLogProto.Target parent = newTarget(LauncherLogProto.Target.Type.CONTAINER);
-        LauncherState state = mLauncher.getStateManager().getState();
-        if (state == LauncherState.ALL_APPS) {
-            parent.containerType = LauncherLogProto.ContainerType.ALLAPPS;
-        } else if (state == OVERVIEW) {
-            parent.containerType = LauncherLogProto.ContainerType.TASKSWITCHER;
-        }
-        parents.add(parent);
-    }
-
     public void setTextAlpha(int textAlpha) {
         mIconLastSetTextAlpha = textAlpha;
         if (getAlpha() < 1 && textAlpha > 0) {
diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
index 151a113d1e..380735044d 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
@@ -55,7 +55,6 @@ import com.android.launcher3.popup.SystemShortcut;
 import com.android.launcher3.touch.ItemLongClickListener;
 import com.android.launcher3.uioverrides.PredictedAppIcon;
 import com.android.launcher3.uioverrides.QuickstepLauncher;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.launcher3.util.OnboardingPrefs;
 import com.android.launcher3.views.ArrowTipView;
 import com.android.launcher3.views.Snackbar;
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
index bce73cd4e4..a2e3bdf8a0 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
@@ -16,6 +16,7 @@
 package com.android.launcher3.uioverrides.states;
 
 import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_ALLAPPS;
 import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
 
 import android.content.Context;
@@ -23,7 +24,6 @@ import android.content.Context;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.allapps.AllAppsContainerView;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 
 /**
  * Definition for AllApps state
@@ -40,7 +40,7 @@ public class AllAppsState extends LauncherState {
     };
 
     public AllAppsState(int id) {
-        super(id, ContainerType.ALLAPPS, STATE_FLAGS);
+        super(id, LAUNCHER_STATE_ALLAPPS, STATE_FLAGS);
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
index 8ff05f2aaa..4b4f955204 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
@@ -15,12 +15,13 @@
  */
 package com.android.launcher3.uioverrides.states;
 
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
+
 import android.content.Context;
 
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.allapps.AllAppsTransitionController;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.quickstep.util.LayoutUtils;
 import com.android.quickstep.views.RecentsView;
 
@@ -33,7 +34,7 @@ public class BackgroundAppState extends OverviewState {
             | FLAG_WORKSPACE_INACCESSIBLE | FLAG_NON_INTERACTIVE | FLAG_CLOSE_POPUPS;
 
     public BackgroundAppState(int id) {
-        this(id, LauncherLogProto.ContainerType.TASKSWITCHER);
+        this(id, LAUNCHER_STATE_BACKGROUND);
     }
 
     protected BackgroundAppState(int id, int logContainer) {
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java
index fc0dcd5119..41c689d16d 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java
@@ -15,13 +15,14 @@
  */
 package com.android.launcher3.uioverrides.states;
 
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW;
+
 import android.content.Context;
 import android.graphics.Rect;
 
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.quickstep.views.RecentsView;
 
 /**
@@ -34,7 +35,7 @@ public class OverviewModalTaskState extends OverviewState {
             FLAG_DISABLE_RESTORE | FLAG_OVERVIEW_UI | FLAG_WORKSPACE_INACCESSIBLE;
 
     public OverviewModalTaskState(int id) {
-        super(id, ContainerType.OVERVIEW, STATE_FLAGS);
+        super(id, LAUNCHER_STATE_OVERVIEW, STATE_FLAGS);
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
index bbe7821864..525ff5816d 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -16,6 +16,7 @@
 package com.android.launcher3.uioverrides.states;
 
 import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW;
 import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
 import static com.android.quickstep.SysUINavigationMode.hideShelfInTwoButtonLandscape;
 import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
@@ -29,7 +30,6 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.Workspace;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.util.LayoutUtils;
 import com.android.quickstep.views.RecentsView;
@@ -51,7 +51,7 @@ public class OverviewState extends LauncherState {
     }
 
     protected OverviewState(int id, int stateFlags) {
-        this(id, ContainerType.TASKSWITCHER, stateFlags);
+        this(id, LAUNCHER_STATE_OVERVIEW, stateFlags);
     }
 
     protected OverviewState(int id, int logContainer, int stateFlags) {
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java
index 2c7373e206..51e72dacdc 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java
@@ -15,8 +15,9 @@
  */
 package com.android.launcher3.uioverrides.states;
 
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
+
 import com.android.launcher3.Launcher;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 
 /**
  * State to indicate we are about to launch a recent task. Note that this state is only used when
@@ -26,7 +27,7 @@ import com.android.launcher3.userevent.nano.LauncherLogProto;
 public class QuickSwitchState extends BackgroundAppState {
 
     public QuickSwitchState(int id) {
-        super(id, LauncherLogProto.ContainerType.APP);
+        super(id, LAUNCHER_STATE_BACKGROUND);
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeEdgeSwipeController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeEdgeSwipeController.java
index bef191ef8f..7a0f634b45 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeEdgeSwipeController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeEdgeSwipeController.java
@@ -12,8 +12,6 @@ import com.android.launcher3.LauncherState;
 import com.android.launcher3.states.StateAnimationConfig.AnimationFlags;
 import com.android.launcher3.touch.AbstractStateChangeTouchController;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
 import com.android.quickstep.SystemUiProxy;
 
 /**
@@ -45,11 +43,6 @@ public class LandscapeEdgeSwipeController extends AbstractStateChangeTouchContro
         return draggingFromNav ? OVERVIEW : NORMAL;
     }
 
-    @Override
-    protected int getLogContainerTypeForNormalState(MotionEvent ev) {
-        return LauncherLogProto.ContainerType.NAVBAR;
-    }
-
     @Override
     protected float getShiftRange() {
         return mLauncher.getDragLayer().getWidth();
@@ -65,13 +58,8 @@ public class LandscapeEdgeSwipeController extends AbstractStateChangeTouchContro
     }
 
     @Override
-    protected int getDirectionForLog() {
-        return mLauncher.getDeviceProfile().isSeascape() ? Direction.RIGHT : Direction.LEFT;
-    }
-
-    @Override
-    protected void onSwipeInteractionCompleted(LauncherState targetState, int logAction) {
-        super.onSwipeInteractionCompleted(targetState, logAction);
+    protected void onSwipeInteractionCompleted(LauncherState targetState) {
+        super.onSwipeInteractionCompleted(targetState);
         if (mStartState == NORMAL && targetState == OVERVIEW) {
             SystemUiProxy.INSTANCE.get(mLauncher).onOverviewShown(true, TAG);
         }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
index 76168440a8..d210bc6851 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
@@ -45,12 +45,9 @@ import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.compat.AccessibilityManagerCompat;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.graphics.OverviewScrim;
-import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
 import com.android.launcher3.util.TouchController;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
 import com.android.quickstep.util.AssistantUtilities;
@@ -211,7 +208,6 @@ public class NavBarToHomeTouchController implements TouchController,
     @Override
     public void onDragEnd(float velocity) {
         boolean fling = mSwipeDetector.isFling(velocity);
-        final int logAction = fling ? Touch.FLING : Touch.SWIPE;
         float progress = mCurrentAnimation.getProgressFraction();
         float interpolatedProgress = PULLBACK_INTERPOLATOR.getInterpolation(progress);
         boolean success = interpolatedProgress >= SUCCESS_TRANSITION_PROGRESS
@@ -230,7 +226,7 @@ public class NavBarToHomeTouchController implements TouchController,
                         () -> onSwipeInteractionCompleted(mEndState));
             }
             if (mStartState != mEndState) {
-                // TODO: add to WW log
+                logHomeGesture();
             }
             AbstractFloatingView topOpenView = AbstractFloatingView.getTopOpenView(mLauncher);
             if (topOpenView != null) {
@@ -255,17 +251,10 @@ public class NavBarToHomeTouchController implements TouchController,
         AccessibilityManagerCompat.sendStateEventToTest(mLauncher, targetState.ordinal);
     }
 
-    private void logStateChange(int startContainerType, int logAction) {
-        mLauncher.getUserEventDispatcher().logStateChangeAction(logAction,
-                LauncherLogProto.Action.Direction.UP,
-                mSwipeDetector.getDownX(), mSwipeDetector.getDownY(),
-                LauncherLogProto.ContainerType.NAVBAR,
-                startContainerType,
-                mEndState.containerType,
-                mLauncher.getWorkspace().getCurrentPage());
+    private void logHomeGesture() {
         mLauncher.getStatsLogManager().logger()
-                .withSrcState(StatsLogManager.containerTypeToAtomState(mStartState.containerType))
-                .withDstState(StatsLogManager.containerTypeToAtomState(mEndState.containerType))
+                .withSrcState(mStartState.statsLogOrdinal)
+                .withDstState(mEndState.statsLogOrdinal)
                 .log(LAUNCHER_HOME_GESTURE);
     }
 }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
index c78d4741d8..2a3bdbfcb8 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -49,7 +49,6 @@ import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.graphics.OverviewScrim;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.testing.TestProtocol;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
 import com.android.launcher3.util.VibratorWrapper;
 import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
@@ -207,7 +206,7 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
 
     private void maybeSwipeInteractionToOverviewComplete() {
         if (mReachedOverview && mDetector.isSettlingState()) {
-            onSwipeInteractionCompleted(OVERVIEW, Touch.SWIPE);
+            onSwipeInteractionCompleted(OVERVIEW);
         }
     }
 
@@ -251,7 +250,7 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
     private void goToOverviewOrHomeOnDragEnd(float velocity) {
         boolean goToHomeInsteadOfOverview = !mMotionPauseDetector.isPaused();
         if (goToHomeInsteadOfOverview) {
-            new OverviewToHomeAnim(mLauncher, ()-> onSwipeInteractionCompleted(NORMAL, Touch.FLING))
+            new OverviewToHomeAnim(mLauncher, ()-> onSwipeInteractionCompleted(NORMAL))
                     .animateWithVelocity(velocity);
         }
         if (mReachedOverview) {
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
index a6a3497f04..f378848a71 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
@@ -57,13 +57,9 @@ import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.graphics.OverviewScrim;
-import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.touch.BaseSwipeDetector;
 import com.android.launcher3.touch.BothAxesSwipeDetector;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
 import com.android.launcher3.util.TouchController;
 import com.android.launcher3.util.VibratorWrapper;
 import com.android.quickstep.AnimatedFloat;
@@ -287,7 +283,6 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
         boolean horizontalFling = mSwipeDetector.isFling(velocity.x);
         boolean verticalFling = mSwipeDetector.isFling(velocity.y);
         boolean noFling = !horizontalFling && !verticalFling;
-        int logAction = noFling ? Touch.SWIPE : Touch.FLING;
         if (mMotionPauseDetector.isPaused() && noFling) {
             cancelAnimations();
 
@@ -298,7 +293,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
             overviewAnim.addListener(new AnimatorListenerAdapter() {
                 @Override
                 public void onAnimationEnd(Animator animation) {
-                    onAnimationToStateCompleted(OVERVIEW, logAction);
+                    onAnimationToStateCompleted(OVERVIEW);
                 }
             });
             overviewAnim.start();
@@ -393,7 +388,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
         }
 
         nonOverviewAnim.setDuration(Math.max(xDuration, yDuration));
-        mNonOverviewAnim.setEndAction(() -> onAnimationToStateCompleted(targetState, logAction));
+        mNonOverviewAnim.setEndAction(() -> onAnimationToStateCompleted(targetState));
 
         cancelAnimations();
         xOverviewAnim.start();
@@ -401,27 +396,17 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
         nonOverviewAnim.start();
     }
 
-    private void onAnimationToStateCompleted(LauncherState targetState, int logAction) {
-        mLauncher.getUserEventDispatcher().logStateChangeAction(logAction,
-                getDirectionForLog(), mSwipeDetector.getDownX(), mSwipeDetector.getDownY(),
-                LauncherLogProto.ContainerType.NAVBAR,
-                mStartState.containerType,
-                targetState.containerType,
-                mLauncher.getWorkspace().getCurrentPage());
+    private void onAnimationToStateCompleted(LauncherState targetState) {
         mLauncher.getStatsLogManager().logger()
                 .withSrcState(LAUNCHER_STATE_HOME)
-                .withDstState(StatsLogManager.containerTypeToAtomState(targetState.containerType))
-                .log(getLauncherAtomEvent(mStartState.containerType, targetState.containerType,
+                .withDstState(targetState.statsLogOrdinal)
+                .log(getLauncherAtomEvent(mStartState.statsLogOrdinal, targetState.statsLogOrdinal,
                         targetState.ordinal > mStartState.ordinal
                                 ? LAUNCHER_UNKNOWN_SWIPEUP
                                 : LAUNCHER_UNKNOWN_SWIPEDOWN));
         mLauncher.getStateManager().goToState(targetState, false, this::clearState);
     }
 
-    private int getDirectionForLog() {
-        return Utilities.isRtl(mLauncher.getResources()) ? Direction.LEFT : Direction.RIGHT;
-    }
-
     private void cancelAnimations() {
         if (mNonOverviewAnim != null) {
             mNonOverviewAnim.getAnimationPlayer().cancel();
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java
index 90911684ec..45e5e2fb7c 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java
@@ -25,7 +25,6 @@ import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.quickstep.TouchInteractionService;
 import com.android.quickstep.views.RecentsView;
 
@@ -73,9 +72,4 @@ public class OverviewToAllAppsTouchController extends PortraitStatesTouchControl
         }
         return fromState;
     }
-
-    @Override
-    protected int getLogContainerTypeForNormalState(MotionEvent ev) {
-        return LauncherLogProto.ContainerType.WORKSPACE;
-    }
 }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
index 059a703075..037d9889fd 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
@@ -48,8 +48,6 @@ import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.AbstractStateChangeTouchController;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
 import com.android.launcher3.uioverrides.states.OverviewState;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.TouchInteractionService;
 import com.android.quickstep.util.LayoutUtils;
@@ -172,11 +170,6 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
         return fromState;
     }
 
-    @Override
-    protected int getLogContainerTypeForNormalState(MotionEvent ev) {
-        return isTouchOverHotseat(mLauncher, ev) ? ContainerType.HOTSEAT : ContainerType.WORKSPACE;
-    }
-
     private StateAnimationConfig getNormalToOverviewAnimation() {
         mAllAppsInterpolatorWrapper.baseInterpolator = LINEAR;
 
@@ -285,7 +278,7 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
 
     private void cancelPendingAnim() {
         if (mPendingAnimation != null) {
-            mPendingAnimation.finish(false, Touch.SWIPE);
+            mPendingAnimation.finish(false);
             mPendingAnimation = null;
         }
     }
@@ -320,8 +313,8 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
     }
 
     @Override
-    protected void onSwipeInteractionCompleted(LauncherState targetState, int logAction) {
-        super.onSwipeInteractionCompleted(targetState, logAction);
+    protected void onSwipeInteractionCompleted(LauncherState targetState) {
+        super.onSwipeInteractionCompleted(targetState);
         if (mStartState == NORMAL && targetState == OVERVIEW) {
             SystemUiProxy.INSTANCE.get(mLauncher).onOverviewShown(true, TAG);
         }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
index c643858e5c..b8c2030852 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
@@ -21,6 +21,7 @@ import static com.android.launcher3.anim.Interpolators.ACCEL_2;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
 import static com.android.launcher3.anim.Interpolators.INSTANT;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE;
@@ -41,8 +42,6 @@ import com.android.launcher3.Utilities;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.touch.AbstractStateChangeTouchController;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.SystemUiProxy;
@@ -92,14 +91,14 @@ public class QuickSwitchTouchController extends AbstractStateChangeTouchControll
     @Override
     public void onDragStart(boolean start, float startDisplacement) {
         super.onDragStart(start, startDisplacement);
-        mStartContainerType = LauncherLogProto.ContainerType.NAVBAR;
+        mStartContainerType = LAUNCHER_STATE_BACKGROUND;
         ActivityManagerWrapper.getInstance()
                 .closeSystemWindows(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
     }
 
     @Override
-    protected void onSwipeInteractionCompleted(LauncherState targetState, int logAction) {
-        super.onSwipeInteractionCompleted(targetState, logAction);
+    protected void onSwipeInteractionCompleted(LauncherState targetState) {
+        super.onSwipeInteractionCompleted(targetState);
     }
 
     @Override
@@ -153,14 +152,4 @@ public class QuickSwitchTouchController extends AbstractStateChangeTouchControll
     protected float getShiftRange() {
         return mLauncher.getDeviceProfile().widthPx / 2f;
     }
-
-    @Override
-    protected int getLogContainerTypeForNormalState(MotionEvent ev) {
-        return LauncherLogProto.ContainerType.NAVBAR;
-    }
-
-    @Override
-    protected int getDirectionForLog() {
-        return Utilities.isRtl(mLauncher.getResources()) ? Direction.LEFT : Direction.RIGHT;
-    }
 }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java
index 16bd9ed384..fe69c9b87d 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java
@@ -15,10 +15,12 @@
  */
 package com.android.launcher3.uioverrides.touchcontrollers;
 
+import static android.view.MotionEvent.ACTION_CANCEL;
 import static android.view.MotionEvent.ACTION_DOWN;
 import static android.view.MotionEvent.ACTION_MOVE;
 import static android.view.MotionEvent.ACTION_UP;
-import static android.view.MotionEvent.ACTION_CANCEL;
+
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SWIPE_DOWN_WORKSPACE_NOTISHADE_OPEN;
 
 import android.graphics.PointF;
 import android.util.SparseArray;
@@ -31,12 +33,9 @@ import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.launcher3.util.TouchController;
-
 import com.android.quickstep.SystemUiProxy;
+
 import java.io.PrintWriter;
 
 /**
@@ -133,9 +132,8 @@ public class StatusBarTouchController implements TouchController {
         int action = ev.getAction();
         if (action == ACTION_UP || action == ACTION_CANCEL) {
             dispatchTouchEvent(ev);
-            mLauncher.getUserEventDispatcher().logActionOnContainer(action == ACTION_UP ?
-                    Touch.FLING : Touch.SWIPE, Direction.DOWN, ContainerType.WORKSPACE,
-                    mLauncher.getWorkspace().getCurrentPage());
+            mLauncher.getStatsLogManager().logger()
+                    .log(LAUNCHER_SWIPE_DOWN_WORKSPACE_NOTISHADE_OPEN);
             setWindowSlippery(false);
             return true;
         }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
index df6194d4b2..186caf6dc1 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
@@ -36,7 +36,6 @@ import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.touch.BaseSwipeDetector;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
 import com.android.launcher3.util.FlingBlockCheck;
 import com.android.launcher3.util.TouchController;
 import com.android.launcher3.views.BaseDragLayer;
@@ -203,7 +202,7 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
             mCurrentAnimation.setPlayFraction(0);
         }
         if (mPendingAnimation != null) {
-            mPendingAnimation.finish(false, Touch.SWIPE);
+            mPendingAnimation.finish(false);
             mPendingAnimation = null;
         }
 
@@ -285,7 +284,6 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
     public void onDragEnd(float velocity) {
         boolean fling = mDetector.isFling(velocity);
         final boolean goingToEnd;
-        final int logAction;
         boolean blockedFling = fling && mFlingBlockCheck.isBlocked();
         if (blockedFling) {
             fling = false;
@@ -294,11 +292,9 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
         float progress = mCurrentAnimation.getProgressFraction();
         float interpolatedProgress = mCurrentAnimation.getInterpolatedProgress();
         if (fling) {
-            logAction = Touch.FLING;
             boolean goingUp = orientationHandler.isGoingUp(velocity, mIsRtl);
             goingToEnd = goingUp == mCurrentAnimationIsGoingUp;
         } else {
-            logAction = Touch.SWIPE;
             goingToEnd = interpolatedProgress > SUCCESS_TRANSITION_PROGRESS;
         }
         long animationDuration = BaseSwipeDetector.calculateDuration(
@@ -307,14 +303,14 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
             animationDuration *= LauncherAnimUtils.blockedFlingDurationFactor(velocity);
         }
 
-        mCurrentAnimation.setEndAction(() -> onCurrentAnimationEnd(goingToEnd, logAction));
+        mCurrentAnimation.setEndAction(() -> onCurrentAnimationEnd(goingToEnd));
         mCurrentAnimation.startWithVelocity(mActivity, goingToEnd,
                 velocity, mEndDisplacement, animationDuration);
     }
 
-    private void onCurrentAnimationEnd(boolean wasSuccess, int logAction) {
+    private void onCurrentAnimationEnd(boolean wasSuccess) {
         if (mPendingAnimation != null) {
-            mPendingAnimation.finish(wasSuccess, logAction);
+            mPendingAnimation.finish(wasSuccess);
             mPendingAnimation = null;
         }
         clearState();
@@ -326,7 +322,7 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
         mTaskBeingDragged = null;
         mCurrentAnimation = null;
         if (mPendingAnimation != null) {
-            mPendingAnimation.finish(false, Touch.SWIPE);
+            mPendingAnimation.finish(false);
             mPendingAnimation = null;
         }
     }
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 5fc9cca3c5..91d4c64c78 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -76,12 +76,8 @@ import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.logging.StatsLogManager.StatsLogger;
-import com.android.launcher3.logging.UserEventDispatcher;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.testing.TestProtocol;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.launcher3.util.TraceHelper;
 import com.android.launcher3.util.VibratorWrapper;
 import com.android.launcher3.util.WindowBounds;
@@ -104,6 +100,7 @@ import com.android.quickstep.views.TaskView;
 import com.android.systemui.shared.recents.model.ThumbnailData;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.InputConsumerController;
+import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
 import com.android.systemui.shared.system.LatencyTrackerCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 import com.android.systemui.shared.system.TaskInfoCompat;
@@ -222,8 +219,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
 
     private boolean mPassedOverviewThreshold;
     private boolean mGestureStarted;
-    private int mLogAction = Touch.SWIPE;
-    private int mLogDirection = Direction.UP;
+    private boolean mLogDirectionUpOrLeft = true;
     private PointF mDownPos;
     private boolean mIsLikelyToStartNewTask;
 
@@ -441,9 +437,13 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                 mOnDeferredActivityLaunch);
 
         mGestureState.runOnceAtState(STATE_END_TARGET_SET,
-                () -> mDeviceState.getRotationTouchHelper().
-                        onEndTargetCalculated(mGestureState.getEndTarget(),
-                                mActivityInterface));
+                () -> {
+                    mDeviceState.getRotationTouchHelper()
+                            .onEndTargetCalculated(mGestureState.getEndTarget(),
+                                    mActivityInterface);
+
+                    mRecentsView.onGestureEndTargetCalculated(mGestureState.getEndTarget());
+                });
 
         notifyGestureStartedAsync();
     }
@@ -745,7 +745,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
     public void onGestureCancelled() {
         updateDisplacement(0);
         mStateCallback.setStateOnUiThread(STATE_GESTURE_COMPLETED);
-        mLogAction = Touch.SWIPE_NOOP;
         handleNormalGestureEnd(0, false, new PointF(), true /* isCancel */);
     }
 
@@ -761,13 +760,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         boolean isFling = mGestureStarted && !mIsMotionPaused
                 && Math.abs(endVelocity) > flingThreshold;
         mStateCallback.setStateOnUiThread(STATE_GESTURE_COMPLETED);
-
-        mLogAction = isFling ? Touch.FLING : Touch.SWIPE;
         boolean isVelocityVertical = Math.abs(velocity.y) > Math.abs(velocity.x);
         if (isVelocityVertical) {
-            mLogDirection = velocity.y < 0 ? Direction.UP : Direction.DOWN;
+            mLogDirectionUpOrLeft = velocity.y < 0;
         } else {
-            mLogDirection = velocity.x < 0 ? Direction.LEFT : Direction.RIGHT;
+            mLogDirectionUpOrLeft = velocity.x < 0;
         }
         mDownPos = downPos;
         handleNormalGestureEnd(endVelocity, isFling, velocity, false /* isCancel */);
@@ -979,8 +976,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                 break;
             case LAST_TASK:
             case NEW_TASK:
-                event = (mLogDirection == Direction.LEFT)
-                        ? LAUNCHER_QUICKSWITCH_LEFT
+                event = mLogDirectionUpOrLeft ? LAUNCHER_QUICKSWITCH_LEFT
                         : LAUNCHER_QUICKSWITCH_RIGHT;
                 break;
             default:
@@ -988,12 +984,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         }
         StatsLogger logger = StatsLogManager.newInstance(mContext).logger()
                 .withSrcState(LAUNCHER_STATE_BACKGROUND)
-                .withDstState(StatsLogManager.containerTypeToAtomState(endTarget.containerType));
+                .withDstState(endTarget.containerType);
         if (targetTask != null) {
             logger.withItemInfo(targetTask.getItemInfo());
         }
-        logger.log(event);
-
 
         DeviceProfile dp = mDp;
         if (dp == null || mDownPos == null) {
@@ -1003,12 +997,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         int pageIndex = endTarget == LAST_TASK
                 ? LOG_NO_OP_PAGE_INDEX
                 : mRecentsView.getNextPage();
-        UserEventDispatcher.newInstance(mContext).logStateChangeAction(
-                mLogAction, mLogDirection,
-                (int) mDownPos.x, (int) mDownPos.y,
-                ContainerType.NAVBAR, ContainerType.APP,
-                endTarget.containerType,
-                pageIndex);
+        // TODO: set correct container using the pageIndex
+        logger.log(event);
     }
 
     /** Animates to the given progress, where 0 is the current app and 1 is overview. */
@@ -1204,10 +1194,12 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         anim.addOnUpdateListener((r, p) -> {
             updateSysUiFlags(Math.max(p, mCurrentShift.value));
         });
+        final int cuj = InteractionJankMonitorWrapper.CUJ_APP_CLOSE_TO_HOME;
         anim.addAnimatorListener(new AnimationSuccessListener() {
             @Override
             public void onAnimationStart(Animator animation) {
                 Trace.beginAsyncSection(TRANSITION_OPEN_LAUNCHER, 0);
+                InteractionJankMonitorWrapper.begin(cuj);
                 if (mActivity != null) {
                     removeLiveTileOverlay();
                 }
@@ -1221,6 +1213,13 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                 // Make sure recents is in its final state
                 maybeUpdateRecentsAttachedState(false);
                 mActivityInterface.onSwipeUpToHomeComplete(mDeviceState);
+                InteractionJankMonitorWrapper.end(cuj);
+            }
+
+            @Override
+            public void onAnimationCancel(Animator animation) {
+                super.onAnimationCancel(animation);
+                InteractionJankMonitorWrapper.cancel(cuj);
             }
 
             @Override
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index 8b108ac299..d35e270dd5 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -152,11 +152,6 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
     public abstract void onExitOverview(RotationTouchHelper deviceState,
             Runnable exitRunnable);
 
-    /**
-     * Used for containerType in {@link com.android.launcher3.logging.UserEventDispatcher}
-     */
-    public abstract int getContainerType();
-
     public abstract boolean isInLiveTileMode();
 
     public abstract void onLaunchTaskFailed();
diff --git a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
index 3898f0b0ca..2885abff1b 100644
--- a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
@@ -28,7 +28,6 @@ import androidx.annotation.Nullable;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.R;
 import com.android.launcher3.touch.PagedOrientationHandler;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.quickstep.fallback.RecentsState;
 import com.android.quickstep.util.ActivityInitListener;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
@@ -144,15 +143,6 @@ public final class FallbackActivityInterface extends
         // no-op, fake landscape not supported for 3P
     }
 
-    @Override
-    public int getContainerType() {
-        RecentsActivity activity = getCreatedActivity();
-        boolean visible = activity != null && activity.isStarted() && activity.hasWindowFocus();
-        return visible
-                ? LauncherLogProto.ContainerType.OTHER_LAUNCHER_APP
-                : LauncherLogProto.ContainerType.APP;
-    }
-
     @Override
     public boolean isInLiveTileMode() {
         return false;
diff --git a/quickstep/src/com/android/quickstep/GestureState.java b/quickstep/src/com/android/quickstep/GestureState.java
index 00b5eb9880..9c23c8320b 100644
--- a/quickstep/src/com/android/quickstep/GestureState.java
+++ b/quickstep/src/com/android/quickstep/GestureState.java
@@ -15,6 +15,9 @@
  */
 package com.android.quickstep;
 
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW;
 import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;
 
 import android.annotation.TargetApi;
@@ -23,7 +26,6 @@ import android.content.Intent;
 import android.os.Build;
 
 import com.android.launcher3.statemanager.StatefulActivity;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.quickstep.util.ActiveGestureLog;
 import com.android.systemui.shared.recents.model.ThumbnailData;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
@@ -44,13 +46,13 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL
      * Defines the end targets of a gesture and the associated state.
      */
     public enum GestureEndTarget {
-        HOME(true, ContainerType.WORKSPACE, false),
+        HOME(true, LAUNCHER_STATE_HOME, false),
 
-        RECENTS(true, ContainerType.TASKSWITCHER, true),
+        RECENTS(true, LAUNCHER_STATE_OVERVIEW, true),
 
-        NEW_TASK(false, ContainerType.APP, true),
+        NEW_TASK(false, LAUNCHER_STATE_BACKGROUND, true),
 
-        LAST_TASK(false, ContainerType.APP, true);
+        LAST_TASK(false, LAUNCHER_STATE_BACKGROUND, true);
 
         GestureEndTarget(boolean isLauncher, int containerType,
                 boolean recentsAttachedToAppWindow) {
diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
index 036d473060..98b8455e51 100644
--- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
@@ -44,7 +44,6 @@ import com.android.launcher3.statehandlers.DepthController.ClampedDepthProperty;
 import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.PagedOrientationHandler;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.util.ActivityInitListener;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
@@ -208,10 +207,6 @@ public final class LauncherActivityInterface extends
             return false;
         }
 
-        launcher.getUserEventDispatcher().logActionCommand(
-                LauncherLogProto.Action.Command.RECENTS_BUTTON,
-                getContainerType(),
-                LauncherLogProto.ContainerType.TASKSWITCHER);
         launcher.getStateManager().goToState(OVERVIEW,
                 launcher.getStateManager().shouldAnimateStateChange(), onCompleteCallback);
         return true;
@@ -252,13 +247,6 @@ public final class LauncherActivityInterface extends
         return true;
     }
 
-    @Override
-    public int getContainerType() {
-        final Launcher launcher = getVisibleLauncher();
-        return launcher != null ? launcher.getStateManager().getState().containerType
-                : LauncherLogProto.ContainerType.APP;
-    }
-
     @Override
     public boolean isInLiveTileMode() {
         Launcher launcher = getCreatedActivity();
diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
index 86136873ef..30edf364ce 100644
--- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
@@ -30,7 +30,6 @@ import android.view.ViewConfiguration;
 import androidx.annotation.BinderThread;
 
 import com.android.launcher3.statemanager.StatefulActivity;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.quickstep.util.ActivityInitListener;
 import com.android.quickstep.util.RemoteAnimationProvider;
 import com.android.quickstep.views.RecentsView;
@@ -47,7 +46,6 @@ public class OverviewCommandHelper {
 
     private final Context mContext;
     private final RecentsAnimationDeviceState mDeviceState;
-    private final RecentsModel mRecentsModel;
     private final OverviewComponentObserver mOverviewComponentObserver;
 
     private long mLastToggleTime;
@@ -56,7 +54,6 @@ public class OverviewCommandHelper {
             OverviewComponentObserver observer) {
         mContext = context;
         mDeviceState = deviceState;
-        mRecentsModel = RecentsModel.INSTANCE.get(mContext);
         mOverviewComponentObserver = observer;
     }
 
@@ -150,7 +147,6 @@ public class OverviewCommandHelper {
         private final AppToOverviewAnimationProvider<T> mAnimationProvider;
 
         private final long mToggleClickedTime = SystemClock.uptimeMillis();
-        private boolean mUserEventLogged;
         private ActivityInitListener mListener;
 
         public RecentsActivityCommand() {
@@ -160,7 +156,7 @@ public class OverviewCommandHelper {
                     ActivityManagerWrapper.getInstance().getRunningTask(), mDeviceState);
 
             // Preload the plan
-            mRecentsModel.getTasks(null);
+            RecentsModel.INSTANCE.get(mContext).getTasks(null);
         }
 
         @Override
@@ -212,13 +208,6 @@ public class OverviewCommandHelper {
 
         private boolean onActivityReady(Boolean wasVisible) {
             final T activity = mActivityInterface.getCreatedActivity();
-            if (!mUserEventLogged) {
-                activity.getUserEventDispatcher().logActionCommand(
-                        LauncherLogProto.Action.Command.RECENTS_BUTTON,
-                        mActivityInterface.getContainerType(),
-                        LauncherLogProto.ContainerType.TASKSWITCHER);
-                mUserEventLogged = true;
-            }
             return mAnimationProvider.onActivityReady(activity, wasVisible);
         }
 
diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index 6f2f9fb523..2f55f14a9b 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -41,7 +41,10 @@ import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherAnimationRunner;
+import com.android.launcher3.LauncherAnimationRunner.AnimationResult;
 import com.android.launcher3.R;
+import com.android.launcher3.WrappedAnimationRunnerImpl;
+import com.android.launcher3.WrappedLauncherAnimationRunner;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.compat.AccessibilityManagerCompat;
@@ -87,6 +90,9 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
 
     private StateManager<RecentsState> mStateManager;
 
+    // Strong refs to runners which are cleared when the activity is destroyed
+    private WrappedAnimationRunnerImpl mActivityLaunchAnimationRunner;
+
     /**
      * Init drag layer and overview panel views.
      */
@@ -118,7 +124,6 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
          * etc.)
          */
     protected void onHandleConfigChanged() {
-        mUserEventDispatcher = null;
         initDeviceProfile();
 
         AbstractFloatingView.closeOpenViews(this, true,
@@ -170,8 +175,11 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
         }
 
         final TaskView taskView = (TaskView) v;
-        RemoteAnimationRunnerCompat runner = new LauncherAnimationRunner(mUiHandler,
-                true /* startAtFrontOfQueue */) {
+        mActivityLaunchAnimationRunner = new WrappedAnimationRunnerImpl() {
+            @Override
+            public Handler getHandler() {
+                return mUiHandler;
+            }
 
             @Override
             public void onCreateAnimation(RemoteAnimationTargetCompat[] appTargets,
@@ -182,8 +190,10 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
                 result.setAnimation(anim, RecentsActivity.this);
             }
         };
+        final LauncherAnimationRunner wrapper = new WrappedLauncherAnimationRunner<>(
+                mActivityLaunchAnimationRunner, true /* startAtFrontOfQueue */);
         return ActivityOptionsCompat.makeRemoteAnimation(new RemoteAnimationAdapterCompat(
-                runner, RECENTS_LAUNCH_DURATION,
+                wrapper, RECENTS_LAUNCH_DURATION,
                 RECENTS_LAUNCH_DURATION - STATUS_BAR_TRANSITION_DURATION
                         - STATUS_BAR_TRANSITION_PRE_DELAY));
     }
@@ -288,6 +298,7 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
     protected void onDestroy() {
         super.onDestroy();
         ACTIVITY_TRACKER.onActivityDestroyed(this);
+        mActivityLaunchAnimationRunner = null;
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/RecentsModel.java b/quickstep/src/com/android/quickstep/RecentsModel.java
index 6c302ae5d7..d47217b770 100644
--- a/quickstep/src/com/android/quickstep/RecentsModel.java
+++ b/quickstep/src/com/android/quickstep/RecentsModel.java
@@ -18,7 +18,6 @@ package com.android.quickstep;
 import static android.os.Process.THREAD_PRIORITY_BACKGROUND;
 
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-import static com.android.launcher3.util.Executors.createAndStartNewLooper;
 import static com.android.quickstep.TaskUtils.checkCurrentOrManagedUserId;
 
 import android.annotation.TargetApi;
@@ -26,11 +25,11 @@ import android.app.ActivityManager;
 import android.content.ComponentCallbacks2;
 import android.content.Context;
 import android.os.Build;
-import android.os.Looper;
 import android.os.Process;
 import android.os.UserHandle;
 
 import com.android.launcher3.icons.IconProvider;
+import com.android.launcher3.util.Executors.SimpleThreadFactory;
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.recents.model.ThumbnailData;
@@ -40,6 +39,8 @@ import com.android.systemui.shared.system.TaskStackChangeListener;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
 import java.util.function.Consumer;
 
 /**
@@ -52,6 +53,9 @@ public class RecentsModel extends TaskStackChangeListener {
     public static final MainThreadInitializedObject<RecentsModel> INSTANCE =
             new MainThreadInitializedObject<>(RecentsModel::new);
 
+    private static final Executor RECENTS_MODEL_EXECUTOR = Executors.newSingleThreadExecutor(
+            new SimpleThreadFactory("TaskThumbnailIconCache-", THREAD_PRIORITY_BACKGROUND));
+
     private final List<TaskVisualsChangeListener> mThumbnailChangeListeners = new ArrayList<>();
     private final Context mContext;
 
@@ -61,12 +65,10 @@ public class RecentsModel extends TaskStackChangeListener {
 
     private RecentsModel(Context context) {
         mContext = context;
-        Looper looper =
-                createAndStartNewLooper("TaskThumbnailIconCache", THREAD_PRIORITY_BACKGROUND);
         mTaskList = new RecentTasksList(MAIN_EXECUTOR,
                 new KeyguardManagerCompat(context), ActivityManagerWrapper.getInstance());
-        mIconCache = new TaskIconCache(context, looper);
-        mThumbnailCache = new TaskThumbnailCache(context, looper);
+        mIconCache = new TaskIconCache(context, RECENTS_MODEL_EXECUTOR);
+        mThumbnailCache = new TaskThumbnailCache(context, RECENTS_MODEL_EXECUTOR);
 
         ActivityManagerWrapper.getInstance().registerTaskStackListener(this);
         IconProvider.registerIconChangeListener(context,
diff --git a/quickstep/src/com/android/quickstep/TaskIconCache.java b/quickstep/src/com/android/quickstep/TaskIconCache.java
index 7ff799ec55..65e89cfa2f 100644
--- a/quickstep/src/com/android/quickstep/TaskIconCache.java
+++ b/quickstep/src/com/android/quickstep/TaskIconCache.java
@@ -17,7 +17,6 @@ package com.android.quickstep;
 
 import static com.android.launcher3.FastBitmapDrawable.newIcon;
 import static com.android.launcher3.uioverrides.QuickstepLauncher.GO_LOW_RAM_RECENTS_ENABLED;
-import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 
 import android.app.ActivityManager.TaskDescription;
 import android.content.Context;
@@ -27,8 +26,6 @@ import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.os.Handler;
-import android.os.Looper;
 import android.os.UserHandle;
 import android.util.SparseArray;
 import android.view.accessibility.AccessibilityManager;
@@ -37,12 +34,11 @@ import androidx.annotation.WorkerThread;
 
 import com.android.launcher3.FastBitmapDrawable;
 import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
 import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.IconProvider;
 import com.android.launcher3.icons.LauncherIcons;
-import com.android.launcher3.icons.cache.HandlerRunnable;
 import com.android.launcher3.util.Preconditions;
+import com.android.quickstep.util.CancellableTask;
 import com.android.quickstep.util.TaskKeyLruCache;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.recents.model.Task.TaskKey;
@@ -50,6 +46,7 @@ import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.PackageManagerWrapper;
 import com.android.systemui.shared.system.TaskDescriptionCompat;
 
+import java.util.concurrent.Executor;
 import java.util.function.Consumer;
 
 /**
@@ -57,7 +54,7 @@ import java.util.function.Consumer;
  */
 public class TaskIconCache {
 
-    private final Handler mBackgroundHandler;
+    private final Executor mBgExecutor;
     private final AccessibilityManager mAccessibilityManager;
 
     private final Context mContext;
@@ -65,9 +62,9 @@ public class TaskIconCache {
     private final SparseArray<BitmapInfo> mDefaultIcons = new SparseArray<>();
     private final IconProvider mIconProvider;
 
-    public TaskIconCache(Context context, Looper backgroundLooper) {
+    public TaskIconCache(Context context, Executor bgExecutor) {
         mContext = context;
-        mBackgroundHandler = new Handler(backgroundLooper);
+        mBgExecutor = bgExecutor;
         mAccessibilityManager = context.getSystemService(AccessibilityManager.class);
 
         Resources res = context.getResources();
@@ -83,31 +80,27 @@ public class TaskIconCache {
      * @param callback The callback to receive the task after its data has been populated.
      * @return A cancelable handle to the request
      */
-    public IconLoadRequest updateIconInBackground(Task task, Consumer<Task> callback) {
+    public CancellableTask updateIconInBackground(Task task, Consumer<Task> callback) {
         Preconditions.assertUIThread();
         if (task.icon != null) {
             // Nothing to load, the icon is already loaded
             callback.accept(task);
             return null;
         }
+        CancellableTask<TaskCacheEntry> request = new CancellableTask<TaskCacheEntry>() {
+            @Override
+            public TaskCacheEntry getResultOnBg() {
+                return getCacheEntry(task);
+            }
 
-        IconLoadRequest request = new IconLoadRequest(mBackgroundHandler) {
             @Override
-            public void run() {
-                TaskCacheEntry entry = getCacheEntry(task);
-                if (isCanceled()) {
-                    // We don't call back to the provided callback in this case
-                    return;
-                }
-                MAIN_EXECUTOR.execute(() -> {
-                    task.icon = entry.icon;
-                    task.titleDescription = entry.contentDescription;
-                    callback.accept(task);
-                    onEnd();
-                });
+            public void handleResult(TaskCacheEntry result) {
+                task.icon = result.icon;
+                task.titleDescription = result.contentDescription;
+                callback.accept(task);
             }
         };
-        Utilities.postAsyncCallback(mBackgroundHandler, request);
+        mBgExecutor.execute(request);
         return request;
     }
 
@@ -120,9 +113,8 @@ public class TaskIconCache {
     }
 
     void invalidateCacheEntries(String pkg, UserHandle handle) {
-        Utilities.postAsyncCallback(mBackgroundHandler,
-                () -> mIconCache.removeAll(key ->
-                        pkg.equals(key.getPackageName()) && handle.getIdentifier() == key.userId));
+        mBgExecutor.execute(() -> mIconCache.removeAll(key ->
+                pkg.equals(key.getPackageName()) && handle.getIdentifier() == key.userId));
     }
 
     @WorkerThread
@@ -208,12 +200,6 @@ public class TaskIconCache {
         }
     }
 
-    public static abstract class IconLoadRequest extends HandlerRunnable {
-        IconLoadRequest(Handler handler) {
-            super(handler, null);
-        }
-    }
-
     private static class TaskCacheEntry {
         public Drawable icon;
         public String contentDescription = "";
diff --git a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
index 2b55b805c6..65bb0f35d1 100644
--- a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
@@ -21,7 +21,6 @@ import static android.view.Display.DEFAULT_DISPLAY;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_SELECTIONS;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SYSTEM_SHORTCUT_FREE_FORM_TAP;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SYSTEM_SHORTCUT_SPLIT_SCREEN_TAP;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.TAP;
 
 import android.app.Activity;
 import android.app.ActivityOptions;
@@ -39,7 +38,6 @@ import com.android.launcher3.logging.StatsLogManager.LauncherEvent;
 import com.android.launcher3.model.WellbeingModel;
 import com.android.launcher3.popup.SystemShortcut;
 import com.android.launcher3.popup.SystemShortcut.AppInfo;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.launcher3.util.Executors;
 import com.android.launcher3.util.InstantAppResolver;
 import com.android.quickstep.views.RecentsView;
@@ -228,8 +226,6 @@ public interface TaskShortcutFactory {
 
         @Override
         protected boolean onActivityStarted(BaseDraggingActivity activity) {
-            activity.getUserEventDispatcher().logActionOnControl(TAP,
-                    LauncherLogProto.ControlType.SPLIT_SCREEN_TARGET);
             return true;
         }
     };
diff --git a/quickstep/src/com/android/quickstep/TaskThumbnailCache.java b/quickstep/src/com/android/quickstep/TaskThumbnailCache.java
index 2b7a8ec250..a8a0219594 100644
--- a/quickstep/src/com/android/quickstep/TaskThumbnailCache.java
+++ b/quickstep/src/com/android/quickstep/TaskThumbnailCache.java
@@ -15,17 +15,12 @@
  */
 package com.android.quickstep;
 
-import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-
 import android.content.Context;
 import android.content.res.Resources;
-import android.os.Handler;
-import android.os.Looper;
 
 import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
-import com.android.launcher3.icons.cache.HandlerRunnable;
 import com.android.launcher3.util.Preconditions;
+import com.android.quickstep.util.CancellableTask;
 import com.android.quickstep.util.TaskKeyLruCache;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.recents.model.Task.TaskKey;
@@ -33,11 +28,12 @@ import com.android.systemui.shared.recents.model.ThumbnailData;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 
 import java.util.ArrayList;
+import java.util.concurrent.Executor;
 import java.util.function.Consumer;
 
 public class TaskThumbnailCache {
 
-    private final Handler mBackgroundHandler;
+    private final Executor mBgExecutor;
 
     private final int mCacheSize;
     private final TaskKeyLruCache<ThumbnailData> mCache;
@@ -94,8 +90,8 @@ public class TaskThumbnailCache {
         }
     }
 
-    public TaskThumbnailCache(Context context, Looper backgroundLooper) {
-        mBackgroundHandler = new Handler(backgroundLooper);
+    public TaskThumbnailCache(Context context, Executor bgExecutor) {
+        mBgExecutor = bgExecutor;
         mHighResLoadingState = new HighResLoadingState(context);
 
         Resources res = context.getResources();
@@ -130,7 +126,7 @@ public class TaskThumbnailCache {
      * @param callback The callback to receive the task after its data has been populated.
      * @return A cancelable handle to the request
      */
-    public ThumbnailLoadRequest updateThumbnailInBackground(
+    public CancellableTask updateThumbnailInBackground(
             Task task, Consumer<ThumbnailData> callback) {
         Preconditions.assertUIThread();
 
@@ -142,14 +138,13 @@ public class TaskThumbnailCache {
             return null;
         }
 
-
         return updateThumbnailInBackground(task.key, !mHighResLoadingState.isEnabled(), t -> {
             task.thumbnail = t;
             callback.accept(t);
         });
     }
 
-    private ThumbnailLoadRequest updateThumbnailInBackground(TaskKey key, boolean lowResolution,
+    private CancellableTask updateThumbnailInBackground(TaskKey key, boolean lowResolution,
             Consumer<ThumbnailData> callback) {
         Preconditions.assertUIThread();
 
@@ -160,26 +155,20 @@ public class TaskThumbnailCache {
             return null;
         }
 
-        ThumbnailLoadRequest request = new ThumbnailLoadRequest(mBackgroundHandler,
-                lowResolution) {
+        CancellableTask<ThumbnailData> request = new CancellableTask<ThumbnailData>() {
             @Override
-            public void run() {
-                ThumbnailData thumbnail = ActivityManagerWrapper.getInstance().getTaskThumbnail(
+            public ThumbnailData getResultOnBg() {
+                return ActivityManagerWrapper.getInstance().getTaskThumbnail(
                         key.id, lowResolution);
+            }
 
-                MAIN_EXECUTOR.execute(() -> {
-                    if (isCanceled()) {
-                        // We don't call back to the provided callback in this case
-                        return;
-                    }
-
-                    mCache.put(key, thumbnail);
-                    callback.accept(thumbnail);
-                    onEnd();
-                });
+            @Override
+            public void handleResult(ThumbnailData result) {
+                mCache.put(key, result);
+                callback.accept(result);
             }
         };
-        Utilities.postAsyncCallback(mBackgroundHandler, request);
+        mBgExecutor.execute(request);
         return request;
     }
 
@@ -218,15 +207,6 @@ public class TaskThumbnailCache {
         return mEnableTaskSnapshotPreloading && mHighResLoadingState.mVisible;
     }
 
-    public static abstract class ThumbnailLoadRequest extends HandlerRunnable {
-        public final boolean mLowResolution;
-
-        ThumbnailLoadRequest(Handler handler, boolean lowResolution) {
-            super(handler, null);
-            mLowResolution = lowResolution;
-        }
-    }
-
     /**
      * @return Whether device supports low-res thumbnails. Low-res files are an optimization
      * for faster load times of snapshots. Devices can optionally disable low-res files so that
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index df93e0b6a2..3e05b07074 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -20,6 +20,7 @@ import static android.view.MotionEvent.ACTION_CANCEL;
 import static android.view.MotionEvent.ACTION_DOWN;
 import static android.view.MotionEvent.ACTION_UP;
 
+import static com.android.launcher3.config.FeatureFlags.ASSISTANT_GIVES_LAUNCHER_FOCUS;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.quickstep.GestureState.DEFAULT_STATE;
@@ -687,7 +688,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
         final boolean disableHorizontalSwipe = mDeviceState.isInExclusionRegion(event);
         return new OtherActivityInputConsumer(this, mDeviceState, mTaskAnimationManager,
                 gestureState, shouldDefer, this::onConsumerInactive,
-                mInputMonitorCompat, disableHorizontalSwipe, factory);
+                mInputMonitorCompat, mInputEventReceiver, disableHorizontalSwipe, factory);
     }
 
     private InputConsumer createDeviceLockedInputConsumer(GestureState gestureState) {
@@ -709,8 +710,10 @@ public class TouchInteractionService extends Service implements PluginListener<O
 
         if (activity.getRootView().hasWindowFocus()
                 || previousGestureState.isRunningAnimationToLauncher()
-                || (FeatureFlags.ASSISTANT_GIVES_LAUNCHER_FOCUS.get()
-                    && forceOverviewInputConsumer)) {
+                || (ASSISTANT_GIVES_LAUNCHER_FOCUS.get()
+                    && forceOverviewInputConsumer)
+                || (ENABLE_QUICKSTEP_LIVE_TILE.get())
+                    && gestureState.getActivityInterface().isInLiveTileMode()) {
             return new OverviewInputConsumer(gestureState, activity, mInputMonitorCompat,
                     false /* startingInActivityBounds */);
         } else {
@@ -734,6 +737,8 @@ public class TouchInteractionService extends Service implements PluginListener<O
     private void reset() {
         mConsumer = mUncheckedConsumer = mResetGestureInputConsumer;
         mGestureState = DEFAULT_STATE;
+        // By default, use batching of the input events
+        mInputEventReceiver.setBatchingEnabled(true);
     }
 
     private void preloadOverview(boolean fromInit) {
diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
index f5f525965f..8f2356c696 100644
--- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
+++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
@@ -15,6 +15,7 @@
  */
 package com.android.quickstep.fallback;
 
+import static com.android.quickstep.GestureState.GestureEndTarget.RECENTS;
 import static com.android.quickstep.fallback.RecentsState.DEFAULT;
 import static com.android.quickstep.fallback.RecentsState.MODAL_TASK;
 
@@ -27,6 +28,7 @@ import android.util.AttributeSet;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.statemanager.StateManager.StateListener;
 import com.android.quickstep.FallbackActivityInterface;
+import com.android.quickstep.GestureState;
 import com.android.quickstep.RecentsActivity;
 import com.android.quickstep.views.OverviewActionsView;
 import com.android.quickstep.views.RecentsView;
@@ -74,14 +76,14 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity>
     }
 
     /**
-     * When the gesture ends and recents view become interactive, we also remove the temporary
+     * When the gesture ends and we're going to recents view, we also remove the temporary
      * invisible tile added for the home task. This also pushes the remaining tiles back
      * to the center.
      */
     @Override
-    public void onGestureAnimationEnd() {
-        super.onGestureAnimationEnd();
-        if (mHomeTaskInfo != null) {
+    public void onGestureEndTargetCalculated(GestureState.GestureEndTarget endTarget) {
+        super.onGestureEndTargetCalculated(endTarget);
+        if (mHomeTaskInfo != null && endTarget == RECENTS) {
             TaskView tv = getTaskView(mHomeTaskInfo.taskId);
             if (tv != null) {
                 PendingAnimation pa = createTaskDismissAnimation(tv, true, false, 150);
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java
index 89e6931ed9..580e4ec807 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java
@@ -25,12 +25,6 @@ import static android.view.MotionEvent.ACTION_POINTER_UP;
 import static android.view.MotionEvent.ACTION_UP;
 
 import static com.android.launcher3.Utilities.squaredHypot;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction.UPLEFT;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction.UPRIGHT;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.FLING;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.SWIPE;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.SWIPE_NOOP;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType.NAVBAR;
 
 import android.animation.ValueAnimator;
 import android.content.Context;
@@ -47,7 +41,6 @@ import android.view.ViewConfiguration;
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.R;
 import com.android.launcher3.anim.Interpolators;
-import com.android.launcher3.logging.UserEventDispatcher;
 import com.android.quickstep.BaseActivityInterface;
 import com.android.quickstep.GestureState;
 import com.android.quickstep.InputConsumer;
@@ -80,7 +73,6 @@ public class AssistantInputConsumer extends DelegateInputConsumer {
     private float mTimeFraction;
     private long mDragTime;
     private float mLastProgress;
-    private int mDirection;
     private BaseActivityInterface mActivityInterface;
 
     private final float mDragDistThreshold;
@@ -197,8 +189,6 @@ public class AssistantInputConsumer extends DelegateInputConsumer {
                 if (mState != STATE_DELEGATE_ACTIVE && !mLaunchedAssistant) {
                     ValueAnimator animator = ValueAnimator.ofFloat(mLastProgress, 0)
                         .setDuration(RETRACT_ANIMATION_DURATION_MS);
-                    UserEventDispatcher.newInstance(mContext).logActionOnContainer(
-                        SWIPE_NOOP, mDirection, NAVBAR);
                     animator.addUpdateListener(valueAnimator -> {
                         float progress = (float) valueAnimator.getAnimatedValue();
                         SystemUiProxy.INSTANCE.get(mContext).onAssistantProgress(progress);
@@ -223,7 +213,7 @@ public class AssistantInputConsumer extends DelegateInputConsumer {
             mLastProgress = Math.min(mDistance * 1f / mDragDistThreshold, 1) * mTimeFraction;
             if (mDistance >= mDragDistThreshold && mTimeFraction >= 1) {
                 SystemUiProxy.INSTANCE.get(mContext).onAssistantGestureCompletion(0);
-                startAssistantInternal(SWIPE);
+                startAssistantInternal();
 
                 Bundle args = new Bundle();
                 args.putInt(OPA_BUNDLE_TRIGGER, OPA_BUNDLE_TRIGGER_DIAG_SWIPE_GESTURE);
@@ -236,10 +226,7 @@ public class AssistantInputConsumer extends DelegateInputConsumer {
         }
     }
 
-    private void startAssistantInternal(int gestureType) {
-        UserEventDispatcher.newInstance(mContext)
-            .logActionOnContainer(gestureType, mDirection, NAVBAR);
-
+    private void startAssistantInternal() {
         BaseDraggingActivity launcherActivity = mActivityInterface.getCreatedActivity();
         if (launcherActivity != null) {
             launcherActivity.getRootView().performHapticFeedback(
@@ -253,7 +240,6 @@ public class AssistantInputConsumer extends DelegateInputConsumer {
      */
     private boolean isValidAssistantGestureAngle(float deltaX, float deltaY) {
         float angle = (float) Math.toDegrees(Math.atan2(deltaY, deltaX));
-        mDirection = angle > 90 ? UPLEFT : UPRIGHT;
 
         // normalize so that angle is measured clockwise from horizontal in the bottom right corner
         // and counterclockwise from horizontal in the bottom left corner
@@ -272,7 +258,7 @@ public class AssistantInputConsumer extends DelegateInputConsumer {
                 mLastProgress = 1;
                 SystemUiProxy.INSTANCE.get(mContext).onAssistantGestureCompletion(
                     (float) Math.sqrt(velocityX * velocityX + velocityY * velocityY));
-                startAssistantInternal(FLING);
+                startAssistantInternal();
 
                 Bundle args = new Bundle();
                 args.putInt(INVOCATION_TYPE_KEY, INVOCATION_TYPE_GESTURE);
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
index b1a1133885..35dbee9490 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
@@ -67,6 +67,7 @@ import com.android.quickstep.util.CachedEventDispatcher;
 import com.android.quickstep.util.MotionPauseDetector;
 import com.android.quickstep.util.NavBarPosition;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
+import com.android.systemui.shared.system.InputChannelCompat.InputEventReceiver;
 import com.android.systemui.shared.system.InputMonitorCompat;
 
 import java.util.function.Consumer;
@@ -92,6 +93,7 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
     private RecentsAnimationCallbacks mActiveCallbacks;
     private final CachedEventDispatcher mRecentsViewDispatcher = new CachedEventDispatcher();
     private final InputMonitorCompat mInputMonitorCompat;
+    private final InputEventReceiver mInputEventReceiver;
     private final BaseActivityInterface mActivityInterface;
 
     private final AbsSwipeUpHandler.Factory mHandlerFactory;
@@ -135,8 +137,8 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
     public OtherActivityInputConsumer(Context base, RecentsAnimationDeviceState deviceState,
             TaskAnimationManager taskAnimationManager, GestureState gestureState,
             boolean isDeferredDownTarget, Consumer<OtherActivityInputConsumer> onCompleteCallback,
-            InputMonitorCompat inputMonitorCompat, boolean disableHorizontalSwipe,
-            Factory handlerFactory) {
+            InputMonitorCompat inputMonitorCompat, InputEventReceiver inputEventReceiver,
+            boolean disableHorizontalSwipe, Factory handlerFactory) {
         super(base);
         mDeviceState = deviceState;
         mNavBarPosition = mDeviceState.getNavBarPosition();
@@ -154,6 +156,7 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
         mOnCompleteCallback = onCompleteCallback;
         mVelocityTracker = VelocityTracker.obtain();
         mInputMonitorCompat = inputMonitorCompat;
+        mInputEventReceiver = inputEventReceiver;
 
         boolean continuingPreviousGesture = mTaskAnimationManager.isRecentsAnimationRunning();
         mIsDeferredDownTarget = !continuingPreviousGesture && isDeferredDownTarget;
@@ -215,6 +218,9 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
 
         switch (ev.getActionMasked()) {
             case ACTION_DOWN: {
+                // Until we detect the gesture, handle events as we receive them
+                mInputEventReceiver.setBatchingEnabled(false);
+
                 Object traceToken = TraceHelper.INSTANCE.beginSection(DOWN_EVT,
                         FLAG_CHECK_FOR_RACE_CONDITIONS);
                 mActivePointerId = ev.getPointerId(0);
@@ -351,6 +357,8 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
         }
         TestLogging.recordEvent(TestProtocol.SEQUENCE_PILFER, "pilferPointers");
         mInputMonitorCompat.pilferPointers();
+        // Once we detect the gesture, we can enable batching to reduce further updates
+        mInputEventReceiver.setBatchingEnabled(true);
 
         mActivityInterface.closeOverlay();
         ActivityManagerWrapper.getInstance().closeSystemWindows(
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java
index 1c77a0593d..924b32c015 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java
@@ -15,6 +15,7 @@
  */
 package com.android.quickstep.inputconsumers;
 
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE;
 
@@ -27,9 +28,6 @@ import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.logger.LauncherAtom;
 import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.TestProtocol;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
 import com.android.quickstep.GestureState;
 import com.android.quickstep.InputConsumer;
 import com.android.quickstep.RecentsAnimationDeviceState;
@@ -82,17 +80,12 @@ public class OverviewWithoutFocusInputConsumer implements InputConsumer,
         mContext.startActivity(mGestureState.getHomeIntent());
         ActiveGestureLog.INSTANCE.addLog("startQuickstep");
         BaseActivity activity = BaseDraggingActivity.fromContext(mContext);
-        int pageIndex = -1; // This number doesn't reflect workspace page index.
-                            // It only indicates that launcher client screen was shown.
-        int containerType = (mGestureState != null && mGestureState.getEndTarget() != null)
+        int state = (mGestureState != null && mGestureState.getEndTarget() != null)
                 ? mGestureState.getEndTarget().containerType
-                : LauncherLogProto.ContainerType.WORKSPACE;
-        activity.getUserEventDispatcher().logActionOnContainer(
-                wasFling ? Touch.FLING : Touch.SWIPE, Direction.UP, containerType, pageIndex);
-        activity.getUserEventDispatcher().setPreviousHomeGesture(true);
+                : LAUNCHER_STATE_HOME;
         activity.getStatsLogManager().logger()
-                .withSrcState(LAUNCHER_STATE_HOME)
-                .withDstState(LAUNCHER_STATE_HOME)
+                .withSrcState(LAUNCHER_STATE_BACKGROUND)
+                .withDstState(state)
                 .withContainerInfo(LauncherAtom.ContainerInfo.newBuilder()
                         .setWorkspace(
                                 LauncherAtom.WorkspaceContainer.newBuilder()
diff --git a/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialFragment.java
index 70181fb9ca..16886ec177 100644
--- a/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialFragment.java
@@ -24,7 +24,7 @@ import com.android.quickstep.interaction.TutorialController.TutorialType;
 /** Shows the Home gesture interactive tutorial. */
 public class AssistantGestureTutorialFragment extends TutorialFragment {
     @Override
-    int getHandAnimationResId() {
+    Integer getHandAnimationResId() {
         return R.drawable.assistant_gesture;
     }
 
diff --git a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java
index bef50ea8df..41db684d44 100644
--- a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java
@@ -24,7 +24,7 @@ import com.android.quickstep.interaction.TutorialController.TutorialType;
 /** Shows the Back gesture interactive tutorial. */
 public class BackGestureTutorialFragment extends TutorialFragment {
     @Override
-    int getHandAnimationResId() {
+    Integer getHandAnimationResId() {
         return R.drawable.back_gesture;
     }
 
diff --git a/quickstep/src/com/android/quickstep/interaction/EdgeBackGestureHandler.java b/quickstep/src/com/android/quickstep/interaction/EdgeBackGestureHandler.java
index e4b348e51b..9489bac266 100644
--- a/quickstep/src/com/android/quickstep/interaction/EdgeBackGestureHandler.java
+++ b/quickstep/src/com/android/quickstep/interaction/EdgeBackGestureHandler.java
@@ -143,6 +143,10 @@ public class EdgeBackGestureHandler implements OnTouchListener {
         return false;
     }
 
+    boolean onInterceptTouch(MotionEvent motionEvent) {
+        return isWithinTouchRegion((int) motionEvent.getX(), (int) motionEvent.getY());
+    }
+
     private boolean isWithinTouchRegion(int x, int y) {
         // Disallow if too far from the edge
         if (x > mEdgeWidth + mLeftInset && x < (mDisplaySize.x - mEdgeWidth - mRightInset)) {
diff --git a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialFragment.java
index e2a9d1276c..63595a5283 100644
--- a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialFragment.java
@@ -21,7 +21,7 @@ import com.android.quickstep.interaction.TutorialController.TutorialType;
 /** Shows the Home gesture interactive tutorial. */
 public class HomeGestureTutorialFragment extends TutorialFragment {
     @Override
-    int getHandAnimationResId() {
+    Integer getHandAnimationResId() {
         return R.drawable.home_gesture;
     }
 
diff --git a/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java b/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java
index f897ecc01a..d1b0a7088f 100644
--- a/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java
+++ b/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java
@@ -250,6 +250,12 @@ public class NavBarGestureHandler implements OnTouchListener,
         return intercepted;
     }
 
+    boolean onInterceptTouch(MotionEvent event) {
+        return mAssistantLeftRegion.contains(event.getX(), event.getY())
+                || mAssistantRightRegion.contains(event.getX(), event.getY())
+                || event.getY() >= mDisplaySize.y - mBottomGestureHeight;
+    }
+
     protected void onMotionPauseDetected() {
         VibratorWrapper.INSTANCE.get(mContext).vibrate(OVERVIEW_HAPTIC);
     }
diff --git a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java
index 3357b70497..93200bb21d 100644
--- a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java
@@ -21,7 +21,7 @@ import com.android.quickstep.interaction.TutorialController.TutorialType;
 /** Shows the Overview gesture interactive tutorial. */
 public class OverviewGestureTutorialFragment extends TutorialFragment {
     @Override
-    int getHandAnimationResId() {
+    Integer getHandAnimationResId() {
         return R.drawable.overview_gesture;
     }
 
diff --git a/quickstep/src/com/android/quickstep/interaction/RootSandboxLayout.java b/quickstep/src/com/android/quickstep/interaction/RootSandboxLayout.java
new file mode 100644
index 0000000000..db1afc2012
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/interaction/RootSandboxLayout.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.quickstep.interaction;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.widget.RelativeLayout;
+
+import androidx.fragment.app.FragmentManager;
+
+/** Root layout that TutorialFragment uses to intercept motion events. */
+public class RootSandboxLayout extends RelativeLayout {
+    public RootSandboxLayout(Context context) {
+        super(context);
+    }
+
+    public RootSandboxLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public RootSandboxLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent motionEvent) {
+        return ((TutorialFragment) FragmentManager.findFragment(this))
+                .onInterceptTouch(motionEvent);
+    }
+}
diff --git a/quickstep/src/com/android/quickstep/interaction/SandboxLauncherRenderer.java b/quickstep/src/com/android/quickstep/interaction/SandboxLauncherRenderer.java
new file mode 100644
index 0000000000..80ffe6609e
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/interaction/SandboxLauncherRenderer.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.quickstep.interaction;
+
+import android.content.Context;
+import android.view.View;
+
+import com.android.launcher3.InvariantDeviceProfile;
+import com.android.launcher3.graphics.LauncherPreviewRenderer;
+
+/** Renders a fake Launcher for use in the Sandbox. */
+class SandboxLauncherRenderer extends LauncherPreviewRenderer {
+    SandboxLauncherRenderer(Context context, InvariantDeviceProfile idp, boolean migrated) {
+        super(context, idp, migrated);
+    }
+
+    @Override
+    public boolean shouldShowRealLauncherPreview() {
+        return false;
+    }
+
+    @Override
+    public boolean shouldShowQsb() {
+        return false;
+    }
+
+    @Override
+    public View.OnLongClickListener getWorkspaceChildOnLongClickListener() {
+        return null;
+    }
+}
diff --git a/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java b/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java
new file mode 100644
index 0000000000..d54efc56e5
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.quickstep.interaction;
+
+import android.graphics.PointF;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.R;
+import com.android.quickstep.interaction.EdgeBackGestureHandler.BackGestureResult;
+import com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult;
+
+/** A {@link TutorialController} for the Sandbox Mode. */
+public class SandboxModeTutorialController extends SwipeUpGestureTutorialController {
+
+    SandboxModeTutorialController(SandboxModeTutorialFragment fragment, TutorialType tutorialType) {
+        super(fragment, tutorialType);
+    }
+
+    @Nullable
+    @Override
+    Integer getTitleStringId() {
+        return R.string.sandbox_mode_title;
+    }
+
+    @Nullable
+    @Override
+    Integer getSubtitleStringId() {
+        return R.string.sandbox_mode_subtitle;
+    }
+
+    @Nullable
+    @Override
+    Integer getActionButtonStringId() {
+        return R.string.gesture_tutorial_action_button_label_done;
+    }
+
+    @Override
+    void onActionButtonClicked(View button) {
+        mTutorialFragment.closeTutorial();
+    }
+
+    @Override
+    public void onBackGestureAttempted(BackGestureResult result) {
+        switch (result) {
+            case BACK_COMPLETED_FROM_LEFT:
+            case BACK_COMPLETED_FROM_RIGHT:
+                showRippleEffect(null);
+                showFeedback(R.string.sandbox_mode_back_gesture_feedback_successful);
+                break;
+            case BACK_CANCELLED_FROM_RIGHT:
+                showFeedback(R.string.back_gesture_feedback_cancelled_right_edge);
+                break;
+            case BACK_CANCELLED_FROM_LEFT:
+                showFeedback(R.string.back_gesture_feedback_cancelled_left_edge);
+                break;
+            case BACK_NOT_STARTED_TOO_FAR_FROM_EDGE:
+                showFeedback(R.string.sandbox_mode_back_gesture_feedback_swipe_too_far_from_edge);
+                break;
+        }
+    }
+
+    @Override
+    public void onNavBarGestureAttempted(NavBarGestureResult result, PointF finalVelocity) {
+        switch (result) {
+            case ASSISTANT_COMPLETED:
+                showRippleEffect(null);
+                showFeedback(R.string.sandbox_mode_assistant_gesture_feedback_successful);
+                break;
+            case HOME_GESTURE_COMPLETED:
+                animateFakeTaskViewHome(finalVelocity, () -> {
+                    showFeedback(R.string.sandbox_mode_home_gesture_feedback_successful);
+                });
+                break;
+            case OVERVIEW_GESTURE_COMPLETED:
+                fadeOutFakeTaskView(true, () -> {
+                    showFeedback(R.string.sandbox_mode_overview_gesture_feedback_successful);
+                });
+                break;
+            case HOME_OR_OVERVIEW_NOT_STARTED_WRONG_SWIPE_DIRECTION:
+            case HOME_OR_OVERVIEW_CANCELLED:
+            case HOME_NOT_STARTED_TOO_FAR_FROM_EDGE:
+            case OVERVIEW_NOT_STARTED_TOO_FAR_FROM_EDGE:
+                showFeedback(R.string.home_gesture_feedback_swipe_too_far_from_edge);
+                break;
+        }
+    }
+}
diff --git a/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialFragment.java
new file mode 100644
index 0000000000..955a2f7d2e
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialFragment.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.quickstep.interaction;
+
+import android.view.MotionEvent;
+import android.view.View;
+
+import com.android.quickstep.interaction.TutorialController.TutorialType;
+
+/** Shows the general navigation gesture sandbox environment. */
+public class SandboxModeTutorialFragment extends TutorialFragment {
+
+    @Override
+    TutorialController createController(TutorialType type) {
+        return new SandboxModeTutorialController(this, type);
+    }
+
+    @Override
+    Class<? extends TutorialController> getControllerClass() {
+        return SandboxModeTutorialController.class;
+    }
+
+    @Override
+    public boolean onTouch(View view, MotionEvent motionEvent) {
+        if (motionEvent.getAction() == MotionEvent.ACTION_DOWN && mTutorialController != null) {
+            mTutorialController.setRippleHotspot(motionEvent.getX(), motionEvent.getY());
+        }
+        return super.onTouch(view, motionEvent);
+    }
+}
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
index 73f1f8cb8c..2198ade105 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
@@ -47,11 +47,12 @@ abstract class TutorialController implements BackGestureAttemptCallback,
     final TextView mTitleTextView;
     final TextView mSubtitleTextView;
     final TextView mFeedbackView;
+    final View mLauncherView;
     final ClipIconView mFakeIconView;
     final View mFakeTaskView;
     final View mRippleView;
     final RippleDrawable mRippleDrawable;
-    final TutorialHandAnimation mHandCoachingAnimation;
+    @Nullable final TutorialHandAnimation mHandCoachingAnimation;
     final ImageView mHandCoachingView;
     final Button mActionTextButton;
     final Button mActionButton;
@@ -68,6 +69,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         mTitleTextView = rootView.findViewById(R.id.gesture_tutorial_fragment_title_view);
         mSubtitleTextView = rootView.findViewById(R.id.gesture_tutorial_fragment_subtitle_view);
         mFeedbackView = rootView.findViewById(R.id.gesture_tutorial_fragment_feedback_view);
+        mLauncherView = tutorialFragment.getLauncherView();
         mFakeIconView = rootView.findViewById(R.id.gesture_tutorial_fake_icon_view);
         mFakeTaskView = rootView.findViewById(R.id.gesture_tutorial_fake_task_view);
         mRippleView = rootView.findViewById(R.id.gesture_tutorial_ripple_view);
@@ -143,13 +145,16 @@ abstract class TutorialController implements BackGestureAttemptCallback,
     void onActionTextButtonClicked(View button) {}
 
     void showHandCoachingAnimation() {
-        if (isComplete()) {
+        if (isComplete() || mHandCoachingAnimation == null) {
             return;
         }
         mHandCoachingAnimation.startLoopedAnimation(mTutorialType);
     }
 
     void hideHandCoachingAnimation() {
+        if (mHandCoachingAnimation == null) {
+            return;
+        }
         mHandCoachingAnimation.stop();
         mHandCoachingView.setVisibility(View.INVISIBLE);
     }
@@ -162,8 +167,10 @@ abstract class TutorialController implements BackGestureAttemptCallback,
 
         if (isComplete()) {
             hideHandCoachingAnimation();
+            mLauncherView.setVisibility(View.INVISIBLE);
         } else {
             showHandCoachingAnimation();
+            mLauncherView.setVisibility(View.VISIBLE);
         }
     }
 
@@ -206,7 +213,8 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         return mTutorialType == TutorialType.BACK_NAVIGATION_COMPLETE
                 || mTutorialType == TutorialType.HOME_NAVIGATION_COMPLETE
                 || mTutorialType == TutorialType.OVERVIEW_NAVIGATION_COMPLETE
-                || mTutorialType == TutorialType.ASSISTANT_COMPLETE;
+                || mTutorialType == TutorialType.ASSISTANT_COMPLETE
+                || mTutorialType == TutorialType.SANDBOX_MODE;
     }
 
     /** Denotes the type of the tutorial. */
@@ -219,6 +227,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         OVERVIEW_NAVIGATION,
         OVERVIEW_NAVIGATION_COMPLETE,
         ASSISTANT,
-        ASSISTANT_COMPLETE
+        ASSISTANT_COMPLETE,
+        SANDBOX_MODE
     }
 }
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
index 9a8264d098..f297d5a835 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
@@ -31,6 +31,7 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
+import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.R;
 import com.android.quickstep.interaction.TutorialController.TutorialType;
 
@@ -42,9 +43,10 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
     TutorialType mTutorialType;
     @Nullable TutorialController mTutorialController = null;
     View mRootView;
-    TutorialHandAnimation mHandCoachingAnimation;
+    @Nullable TutorialHandAnimation mHandCoachingAnimation = null;
     EdgeBackGestureHandler mEdgeBackGestureHandler;
     NavBarGestureHandler mNavBarGestureHandler;
+    private View mLauncherView;
 
     public static TutorialFragment newInstance(TutorialType tutorialType) {
         TutorialFragment fragment = getFragmentForTutorialType(tutorialType);
@@ -74,13 +76,17 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
             case ASSISTANT:
             case ASSISTANT_COMPLETE:
                 return new AssistantGestureTutorialFragment();
+            case SANDBOX_MODE:
+                return new SandboxModeTutorialFragment();
             default:
                 Log.e(LOG_TAG, "Failed to find an appropriate fragment for " + tutorialType.name());
         }
         return null;
     }
 
-    abstract int getHandAnimationResId();
+    @Nullable Integer getHandAnimationResId() {
+        return null;
+    }
 
     abstract TutorialController createController(TutorialType type);
 
@@ -114,8 +120,14 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
             return insets;
         });
         mRootView.setOnTouchListener(this);
-        mHandCoachingAnimation = new TutorialHandAnimation(getContext(), mRootView,
-                getHandAnimationResId());
+        Integer handAnimationResId = getHandAnimationResId();
+        if (handAnimationResId != null) {
+            mHandCoachingAnimation =
+                new TutorialHandAnimation(getContext(), mRootView, handAnimationResId);
+        }
+        InvariantDeviceProfile dp = InvariantDeviceProfile.INSTANCE.get(getContext());
+        mLauncherView = new SandboxLauncherRenderer(getContext(), dp, true).getRenderedView();
+        ((ViewGroup) mRootView).addView(mLauncherView, 0);
         return mRootView;
     }
 
@@ -128,16 +140,25 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
     @Override
     public void onPause() {
         super.onPause();
-        mHandCoachingAnimation.stop();
+
+        if (mHandCoachingAnimation != null) {
+            mHandCoachingAnimation.stop();
+        }
     }
 
     @Override
     public boolean onTouch(View view, MotionEvent motionEvent) {
-        // Note: Using logical or to ensure both functions get called.
+        // Note: Using logical-or to ensure both functions get called.
         return mEdgeBackGestureHandler.onTouch(view, motionEvent)
                 | mNavBarGestureHandler.onTouch(view, motionEvent);
     }
 
+    boolean onInterceptTouch(MotionEvent motionEvent) {
+        // Note: Using logical-or to ensure both functions get called.
+        return mEdgeBackGestureHandler.onInterceptTouch(motionEvent)
+                | mNavBarGestureHandler.onInterceptTouch(motionEvent);
+    }
+
     void onAttachedToWindow() {
         mEdgeBackGestureHandler.setViewGroupParent((ViewGroup) getRootView());
     }
@@ -168,7 +189,11 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
         return mRootView;
     }
 
-    TutorialHandAnimation getHandAnimation() {
+    View getLauncherView() {
+        return mLauncherView;
+    }
+
+    @Nullable TutorialHandAnimation getHandAnimation() {
         return mHandCoachingAnimation;
     }
 
diff --git a/quickstep/src/com/android/quickstep/util/CancellableTask.java b/quickstep/src/com/android/quickstep/util/CancellableTask.java
new file mode 100644
index 0000000000..a6e2e81589
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/util/CancellableTask.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.quickstep.util;
+
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+
+import androidx.annotation.UiThread;
+import androidx.annotation.WorkerThread;
+
+/**
+ * Utility class to executore a task on background and post the result on UI thread
+ */
+public abstract class CancellableTask<T> implements Runnable {
+
+    private boolean mCancelled = false;
+
+    @Override
+    public final void run() {
+        if (mCancelled) {
+            return;
+        }
+        T result = getResultOnBg();
+        if (mCancelled) {
+            return;
+        }
+        MAIN_EXECUTOR.execute(() -> {
+            if (mCancelled) {
+                return;
+            }
+            handleResult(result);
+        });
+    }
+
+    /**
+     * Called on the worker thread to process the request. The return object is passed to
+     * {@link #handleResult(Object)}
+     */
+    @WorkerThread
+    public abstract T getResultOnBg();
+
+    /**
+     * Called on the UI thread to handle the final result.
+     * @param result
+     */
+    @UiThread
+    public abstract void handleResult(T result);
+
+    /**
+     * Cancels the request. If it is called before {@link #handleResult(Object)}, that method
+     * will not be called
+     */
+    public void cancel() {
+        mCancelled = true;
+    }
+}
diff --git a/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java b/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
index 4a298d3bad..1031c5b080 100644
--- a/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
+++ b/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
@@ -18,8 +18,10 @@ package com.android.quickstep.util;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.anim.Interpolators.DEACCEL;
+import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 import static com.android.launcher3.anim.Interpolators.FINAL_FRAME;
 import static com.android.launcher3.anim.Interpolators.INSTANT;
+import static com.android.launcher3.anim.Interpolators.clampToProgress;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_COMPONENTS;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_ACTIONS_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE;
@@ -110,7 +112,7 @@ public class OverviewToHomeAnim {
         boolean isLayoutNaturalToLauncher = recentsView.getPagedOrientationHandler()
                 .isLayoutNaturalToLauncher();
         config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, isLayoutNaturalToLauncher
-                ? DEACCEL : FINAL_FRAME);
+                ? clampToProgress(FAST_OUT_SLOW_IN, 0, 0.75f) : FINAL_FRAME);
         config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, FINAL_FRAME);
         config.setInterpolator(ANIM_OVERVIEW_SCALE, FINAL_FRAME);
         config.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, INSTANT);
diff --git a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
index df9b0cf435..de44e07bae 100644
--- a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
+++ b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
@@ -23,7 +23,6 @@ import static android.view.Surface.ROTATION_180;
 import static android.view.Surface.ROTATION_270;
 import static android.view.Surface.ROTATION_90;
 
-import static com.android.launcher3.logging.LoggerUtils.extractObjectNameAndAddress;
 import static com.android.launcher3.states.RotationHelper.ALLOW_ROTATION_PREFERENCE_KEY;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
@@ -72,6 +71,7 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
 
     private static final String TAG = "RecentsOrientedState";
     private static final boolean DEBUG = false;
+    private static final String DELIMITER_DOT = "\\.";
 
     private ContentObserver mSystemAutoRotateObserver = new ContentObserver(new Handler()) {
         @Override
@@ -534,4 +534,13 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
                 ? idp.landscapeProfile
                 : idp.portraitProfile;
     }
+
+    /**
+     * String conversion for only the helpful parts of {@link Object#toString()} method
+     * @param stringToExtract "foo.bar.baz.MyObject@1234"
+     * @return "MyObject@1234"
+     */
+    private static String extractObjectNameAndAddress(String stringToExtract) {
+        return stringToExtract.substring(stringToExtract.lastIndexOf(DELIMITER_DOT));
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java b/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java
index 04308c80cb..19c6588877 100644
--- a/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java
+++ b/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java
@@ -21,6 +21,8 @@ import android.content.Context;
 import android.os.Handler;
 
 import com.android.launcher3.LauncherAnimationRunner;
+import com.android.launcher3.LauncherAnimationRunner.AnimationResult;
+import com.android.launcher3.WrappedAnimationRunnerImpl;
 import com.android.launcher3.WrappedLauncherAnimationRunner;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
 import com.android.systemui.shared.system.RemoteAnimationAdapterCompat;
@@ -28,14 +30,17 @@ import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
 public abstract class RemoteAnimationProvider {
 
-    LauncherAnimationRunner mAnimationRunner;
+    WrappedAnimationRunnerImpl mAnimationRunner;
 
     public abstract AnimatorSet createWindowAnimation(RemoteAnimationTargetCompat[] appTargets,
             RemoteAnimationTargetCompat[] wallpaperTargets);
 
     ActivityOptions toActivityOptions(Handler handler, long duration, Context context) {
-        mAnimationRunner = new LauncherAnimationRunner(handler,
-                false /* startAtFrontOfQueue */) {
+        mAnimationRunner = new WrappedAnimationRunnerImpl() {
+            @Override
+            public Handler getHandler() {
+                return handler;
+            }
 
             @Override
             public void onCreateAnimation(RemoteAnimationTargetCompat[] appTargets,
@@ -45,7 +50,6 @@ public abstract class RemoteAnimationProvider {
         };
         final LauncherAnimationRunner wrapper = new WrappedLauncherAnimationRunner(
                 mAnimationRunner, false /* startAtFrontOfQueue */);
-
         return ActivityOptionsCompat.makeRemoteAnimation(
                 new RemoteAnimationAdapterCompat(wrapper, duration, 0));
     }
diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index 903e87a7f8..3a54bd61aa 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -278,7 +278,6 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
             int start = mOrientationState.getOrientationHandler()
                     .getPrimaryValue(mTaskRect.left, mTaskRect.top);
             mScrollState.screenCenter = start + mScrollState.scroll + mScrollState.halfPageSize;
-            mScrollState.pageParentScale = recentsViewScale.value;
             mScrollState.updateInterpolation(start);
             mCurveScale = TaskView.getCurveScaleForInterpolation(mScrollState.linearInterpolation);
         }
@@ -297,9 +296,9 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
         mMatrix.postTranslate(insets.left, insets.top);
         mMatrix.postScale(scale, scale);
 
-        // Apply TaskView matrix: translate, scale, scroll
-        mMatrix.postTranslate(mTaskRect.left, mTaskRect.top + mOffsetY);
+        // Apply TaskView matrix: scale, translate, scroll
         mMatrix.postScale(mCurveScale, mCurveScale, taskWidth / 2, taskHeight / 2);
+        mMatrix.postTranslate(mTaskRect.left, mTaskRect.top + mOffsetY);
         mOrientationState.getOrientationHandler().set(
                 mMatrix, MATRIX_POST_TRANSLATE, mScrollState.scroll);
 
diff --git a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
index b06d4bc355..95bde801bf 100644
--- a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
+++ b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
@@ -42,7 +42,6 @@ import androidx.annotation.StringRes;
 import com.android.launcher3.BaseActivity;
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.R;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.systemui.shared.recents.model.Task;
 
 import java.time.Duration;
@@ -217,8 +216,8 @@ public final class DigitalWellBeingToast {
                     view, 0, 0,
                     view.getWidth(), view.getHeight());
             activity.startActivity(intent, options.toBundle());
-            activity.getUserEventDispatcher().logActionOnControl(LauncherLogProto.Action.Touch.TAP,
-                    LauncherLogProto.ControlType.APP_USAGE_SETTINGS, view);
+
+            // TODO: add WW logging on the app usage settings click.
         } catch (ActivityNotFoundException e) {
             Log.e(TAG, "Failed to open app usage settings for task "
                     + mTask.getTopComponent().getPackageName(), e);
diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
index b338bd07ee..52a7466429 100644
--- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
@@ -36,7 +36,6 @@ import android.view.Surface;
 import android.widget.FrameLayout;
 
 import com.android.launcher3.BaseQuickstepLauncher;
-import com.android.launcher3.Hotseat;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.StateManager.StateListener;
@@ -177,14 +176,8 @@ public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher>
 
     @Override
     protected boolean shouldStealTouchFromSiblingsBelow(MotionEvent ev) {
-        if (ev.getAction() == MotionEvent.ACTION_DOWN) {
-            // Allow touches to go through to the hotseat.
-            Hotseat hotseat = mActivity.getHotseat();
-            boolean touchingHotseat = hotseat.isShown()
-                    && mActivity.getDragLayer().isEventOverView(hotseat, ev, this);
-            return !touchingHotseat;
-        }
-        return super.shouldStealTouchFromSiblingsBelow(ev);
+        return mActivity.getStateManager().getState().overviewUi
+                && super.shouldStealTouchFromSiblingsBelow(ev);
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
index 2a6c9e92db..b8e07cb189 100644
--- a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
+++ b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
@@ -54,7 +54,6 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
             HIDDEN_UNSUPPORTED_NAVIGATION,
             HIDDEN_NON_ZERO_ROTATION,
             HIDDEN_NO_TASKS,
-            HIDDEN_GESTURE_RUNNING,
             HIDDEN_NO_RECENTS})
     @Retention(RetentionPolicy.SOURCE)
     public @interface ActionsHiddenFlags { }
@@ -62,8 +61,7 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
     public static final int HIDDEN_UNSUPPORTED_NAVIGATION = 1 << 0;
     public static final int HIDDEN_NON_ZERO_ROTATION = 1 << 1;
     public static final int HIDDEN_NO_TASKS = 1 << 2;
-    public static final int HIDDEN_GESTURE_RUNNING = 1 << 3;
-    public static final int HIDDEN_NO_RECENTS = 1 << 4;
+    public static final int HIDDEN_NO_RECENTS = 1 << 3;
 
     @IntDef(flag = true, value = {
             DISABLED_SCROLLING,
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 0362377399..7a8e11df78 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -35,16 +35,14 @@ import static com.android.launcher3.anim.Interpolators.ACCEL_2;
 import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_CLEAR_ALL;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_DISMISS_SWIPE_UP;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_SWIPE_DOWN;
 import static com.android.launcher3.statehandlers.DepthController.DEPTH;
 import static com.android.launcher3.uioverrides.touchcontrollers.TaskViewTouchController.SUCCESS_TRANSITION_PROGRESS;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.TAP;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.ControlType.CLEAR_ALL_BUTTON;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW;
 import static com.android.quickstep.TaskUtils.checkCurrentOrManagedUserId;
-import static com.android.quickstep.views.OverviewActionsView.HIDDEN_GESTURE_RUNNING;
 import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NON_ZERO_ROTATION;
 import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NO_RECENTS;
 import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NO_TASKS;
@@ -109,7 +107,6 @@ import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.touch.PagedOrientationHandler.CurveProperties;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.DynamicResource;
 import com.android.launcher3.util.MultiValueAlpha;
@@ -118,6 +115,7 @@ import com.android.launcher3.util.ResourceBasedOverride.Overrides;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.util.ViewPool;
 import com.android.quickstep.BaseActivityInterface;
+import com.android.quickstep.GestureState;
 import com.android.quickstep.RecentsAnimationController;
 import com.android.quickstep.RecentsAnimationTargets;
 import com.android.quickstep.RecentsModel;
@@ -1129,7 +1127,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         setEnableDrawingLiveTile(false);
         setRunningTaskHidden(true);
         setRunningTaskIconScaledDown(true);
-        mActionsView.updateHiddenFlags(HIDDEN_GESTURE_RUNNING, true);
     }
 
     /**
@@ -1183,7 +1180,14 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     }
 
     /**
-     * Called when a gesture from an app has finished.
+     * Called when a gesture from an app has finished, and an end target has been determined.
+     */
+    public void onGestureEndTargetCalculated(GestureState.GestureEndTarget endTarget) {
+
+    }
+
+    /**
+     * Called when a gesture from an app has finished, and the animation to the target has ended.
      */
     public void onGestureAnimationEnd() {
         if (mOrientationState.setGestureActive(false)) {
@@ -1322,7 +1326,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     }
 
     private void animateActionsViewIn() {
-        mActionsView.updateHiddenFlags(HIDDEN_GESTURE_RUNNING, false);
         ObjectAnimator anim = ObjectAnimator.ofFloat(
                 mActionsView.getVisibilityAlpha(), MultiValueAlpha.VALUE, 0, 1);
         anim.setDuration(TaskView.SCALE_ICON_DURATION);
@@ -1407,13 +1410,12 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
          * Updates linearInterpolation for the provided child position
          */
         public void updateInterpolation(float childStart) {
-            float scaledHalfPageSize = halfPageSize / pageParentScale;
-            float pageCenter = childStart + scaledHalfPageSize;
+            float pageCenter = childStart + halfPageSize;
             float distanceFromScreenCenter = screenCenter - pageCenter;
             // How far the page has to move from the center to be offscreen, taking into account
             // the EDGE_SCALE_DOWN_FACTOR that will be applied at that position.
             float distanceToReachEdge = halfScreenSize
-                    + scaledHalfPageSize * (1 - TaskView.EDGE_SCALE_DOWN_FACTOR);
+                    + halfPageSize * (1 - TaskView.EDGE_SCALE_DOWN_FACTOR);
             linearInterpolation = Math.min(1,
                     Math.abs(distanceFromScreenCenter) / distanceToReachEdge);
         }
@@ -1459,7 +1461,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     public PendingAnimation createTaskDismissAnimation(TaskView taskView, boolean animateTaskView,
             boolean shouldRemoveTask, long duration) {
         if (mPendingAnimation != null) {
-            mPendingAnimation.finish(false, Touch.SWIPE);
+            mPendingAnimation.finish(false);
         }
         PendingAnimation anim = new PendingAnimation(duration);
 
@@ -1621,7 +1623,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     protected void runDismissAnimation(PendingAnimation pendingAnim) {
         AnimatorPlaybackController controller = pendingAnim.createPlaybackController();
         controller.dispatchOnStart();
-        controller.setEndAction(() -> pendingAnim.finish(true, Touch.SWIPE));
+        controller.setEndAction(() -> pendingAnim.finish(true));
         controller.getAnimationPlayer().setInterpolator(FAST_OUT_SLOW_IN);
         controller.start();
     }
@@ -1634,7 +1636,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     @SuppressWarnings("unused")
     private void dismissAllTasks(View view) {
         runDismissAnimation(createAllTasksDismissAnimation(DISMISS_TASK_DURATION));
-        mActivity.getUserEventDispatcher().logActionOnControl(TAP, CLEAR_ALL_BUTTON);
+        mActivity.getStatsLogManager().logger().log(LAUNCHER_TASK_CLEAR_ALL);
     }
 
     private void dismissCurrentTask() {
@@ -2159,7 +2161,12 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                         tv.notifyTaskLaunchFailed(TAG);
                     }
                 };
-                tv.launchTask(false, onLaunchResult, getHandler());
+                if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+                    finishRecentsAnimation(false /* toRecents */, null);
+                    onLaunchResult.accept(true /* success */);
+                } else {
+                    tv.launchTask(false, onLaunchResult, getHandler());
+                }
                 Task task = tv.getTask();
                 if (task != null) {
                     mActivity.getStatsLogManager().logger().withItemInfo(tv.getItemInfo())
diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
index d47eba6408..4aff7e3211 100644
--- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
@@ -16,6 +16,7 @@
 
 package com.android.quickstep.views;
 
+import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.quickstep.views.TaskThumbnailView.DIM_ALPHA;
 
 import android.animation.Animator;
@@ -229,7 +230,16 @@ public class TaskMenuView extends AbstractFloatingView {
                 menuOptionView.findViewById(R.id.icon), menuOptionView.findViewById(R.id.text));
         LayoutParams lp = (LayoutParams) menuOptionView.getLayoutParams();
         mTaskView.getPagedOrientationHandler().setLayoutParamsForTaskMenuOptionItem(lp);
-        menuOptionView.setOnClickListener(menuOption);
+        menuOptionView.setOnClickListener(view -> {
+            if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+                RecentsView recentsView = mTaskView.getRecentsView();
+                recentsView.switchToScreenshot(null,
+                        () -> recentsView.finishRecentsAnimation(true /* toRecents */,
+                                () -> menuOption.onClick(view)));
+            } else {
+                menuOption.onClick(view);
+            }
+        });
         mOptionLayout.addView(menuOptionView);
     }
 
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 321821b573..3d6d423077 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -73,15 +73,11 @@ import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.anim.PendingAnimation;
-import com.android.launcher3.logging.UserEventDispatcher;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.popup.SystemShortcut;
 import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.PagedOrientationHandler;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.TransformingTouchDelegate;
 import com.android.launcher3.util.ViewPool.Reusable;
@@ -90,6 +86,7 @@ import com.android.quickstep.TaskIconCache;
 import com.android.quickstep.TaskOverlayFactory;
 import com.android.quickstep.TaskThumbnailCache;
 import com.android.quickstep.TaskUtils;
+import com.android.quickstep.util.CancellableTask;
 import com.android.quickstep.util.RecentsOrientedState;
 import com.android.quickstep.util.TaskCornerRadius;
 import com.android.quickstep.views.RecentsView.PageCallbacks;
@@ -189,8 +186,8 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     private boolean mShowScreenshot;
 
     // The current background requests to load the task thumbnail and icon
-    private TaskThumbnailCache.ThumbnailLoadRequest mThumbnailLoadRequest;
-    private TaskIconCache.IconLoadRequest mIconLoadRequest;
+    private CancellableTask mThumbnailLoadRequest;
+    private CancellableTask mIconLoadRequest;
 
     // Order in which the footers appear. Lower order appear below higher order.
     public static final int INDEX_DIGITAL_WELLBEING_TOAST = 0;
@@ -220,6 +217,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
             }
             if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
                 if (isRunningTask()) {
+                    // TODO: Replace this animation with createRecentsWindowAnimator
                     createLaunchAnimationForRunningTask().start();
                 } else {
                     launchTask(true /* animate */);
@@ -365,10 +363,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         final PendingAnimation pendingAnimation = getRecentsView().createTaskLaunchAnimation(
                 this, RECENTS_LAUNCH_DURATION, TOUCH_RESPONSE_INTERPOLATOR);
         AnimatorPlaybackController currentAnimation = pendingAnimation.createPlaybackController();
-        currentAnimation.setEndAction(() -> {
-            pendingAnimation.finish(true, Touch.SWIPE);
-            launchTask(false);
-        });
+        currentAnimation.setEndAction(() -> pendingAnimation.finish(true));
         return currentAnimation;
     }
 
@@ -391,20 +386,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
 
     public void launchTask(boolean animate, boolean freezeTaskList, Consumer<Boolean> resultCallback,
             Handler resultCallbackHandler) {
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
-            if (isRunningTask()) {
-                getRecentsView().finishRecentsAnimation(false /* toRecents */,
-                        () -> resultCallbackHandler.post(() -> resultCallback.accept(true)));
-            } else {
-                launchTaskInternal(animate, freezeTaskList, resultCallback, resultCallbackHandler);
-            }
-        } else {
-            launchTaskInternal(animate, freezeTaskList, resultCallback, resultCallbackHandler);
-        }
-    }
-
-    private void launchTaskInternal(boolean animate, boolean freezeTaskList,
-            Consumer<Boolean> resultCallback, Handler resultCallbackHandler) {
         if (mTask != null) {
             final ActivityOptions opts;
             TestLogging.recordEvent(
@@ -481,15 +462,13 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         }
     }
 
-    private boolean showTaskMenu(int action) {
+    private boolean showTaskMenu() {
         if (!getRecentsView().isClearAllHidden()) {
             getRecentsView().snapToPage(getRecentsView().indexOfChild(this));
         } else {
             mMenuView = TaskMenuView.showForTask(this);
             mActivity.getStatsLogManager().logger().withItemInfo(getItemInfo())
                     .log(LAUNCHER_TASK_ICON_TAP_OR_LONGPRESS);
-            UserEventDispatcher.newInstance(getContext()).logActionOnItem(action, Direction.NONE,
-                    LauncherLogProto.ItemType.TASK_ICON);
             if (mMenuView != null) {
                 mMenuView.addOnAttachStateChangeListener(mTaskMenuStateListener);
             }
@@ -500,10 +479,10 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     private void setIcon(Drawable icon) {
         if (icon != null) {
             mIconView.setDrawable(icon);
-            mIconView.setOnClickListener(v -> showTaskMenu(Touch.TAP));
+            mIconView.setOnClickListener(v -> showTaskMenu());
             mIconView.setOnLongClickListener(v -> {
                 requestDisallowInterceptTouchEvent(true);
-                return showTaskMenu(Touch.LONGPRESS);
+                return showTaskMenu();
             });
         } else {
             mIconView.setDrawable(null);
diff --git a/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java b/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java
index ccfa3fc0fb..2a7da7eca8 100644
--- a/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java
+++ b/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java
@@ -3,6 +3,8 @@ package com.android.quickstep;
 import static androidx.test.InstrumentationRegistry.getInstrumentation;
 
 import static com.android.launcher3.LauncherState.OVERVIEW;
+import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUBMIT;
+import static com.android.launcher3.util.rule.TestStabilityRule.UNBUNDLED_POSTSUBMIT;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -11,12 +13,12 @@ import static org.junit.Assert.assertTrue;
 import android.app.PendingIntent;
 import android.app.usage.UsageStatsManager;
 import android.content.Intent;
-import android.os.Build;
 
 import androidx.test.filters.LargeTest;
 import androidx.test.runner.AndroidJUnit4;
 
 import com.android.launcher3.Launcher;
+import com.android.launcher3.util.rule.TestStabilityRule;
 import com.android.quickstep.views.DigitalWellBeingToast;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
@@ -34,9 +36,6 @@ public class DigitalWellBeingToastTest extends AbstractQuickStepTest {
 
     @Test
     public void testToast() throws Exception {
-        // b/150303529
-        if (Build.MODEL.contains("Cuttlefish")) return;
-
         startAppFast(CALCULATOR_PACKAGE);
 
         final UsageStatsManager usageStatsManager =
diff --git a/res/layout/search_result_icon_row.xml b/res/layout/search_result_icon_row.xml
new file mode 100644
index 0000000000..5ecc0c27b6
--- /dev/null
+++ b/res/layout/search_result_icon_row.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.launcher3.views.SearchResultIconRow xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto"
+    style="@style/BaseIcon"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:drawablePadding="@dimen/dynamic_grid_icon_drawable_padding"
+    android:gravity="start|center_vertical"
+    android:textAlignment="viewStart"
+    android:textColor="?android:attr/textColorPrimary"
+    android:textSize="16sp"
+    android:padding="@dimen/dynamic_grid_edge_margin"
+    launcher:iconDisplay="hero_app"
+    launcher:layoutHorizontal="true"
+    >
+
+</com.android.launcher3.views.SearchResultIconRow>
\ No newline at end of file
diff --git a/res/layout/search_result_shortcut.xml b/res/layout/search_result_shortcut.xml
deleted file mode 100644
index c350c973da..0000000000
--- a/res/layout/search_result_shortcut.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.launcher3.views.SearchResultShortcut xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:gravity="center_vertical"
-    android:padding="@dimen/dynamic_grid_edge_margin">
-
-    <com.android.launcher3.BubbleTextView
-        android:id="@+id/bubble_text"
-        style="@style/BaseIcon"
-        android:drawablePadding="@dimen/dynamic_grid_icon_drawable_padding"
-        android:gravity="start|center_vertical"
-        android:textAlignment="viewStart"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textSize="16sp"
-        android:layout_height="wrap_content"
-        launcher:iconDisplay="hero_app"
-        launcher:layoutHorizontal="true" />
-
-    <View
-        android:id="@+id/icon"
-        android:layout_width="@dimen/deep_shortcut_icon_size"
-        android:layout_height="@dimen/deep_shortcut_icon_size"
-        android:layout_gravity="start|center_vertical"
-        android:background="@drawable/ic_deepshortcut_placeholder" />
-
-</com.android.launcher3.views.SearchResultShortcut>
\ No newline at end of file
diff --git a/res/layout/search_result_suggest.xml b/res/layout/search_result_suggest.xml
new file mode 100644
index 0000000000..c5d96f03ea
--- /dev/null
+++ b/res/layout/search_result_suggest.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.launcher3.views.SearchResultSuggestRow xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/TextHeadline"
+    android:id="@+id/section_title"
+    android:background="?android:attr/selectableItemBackground"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:gravity="center_vertical"
+    android:padding="4dp"
+    android:minHeight="48dp"
+    android:textColor="?android:attr/textColorPrimary"
+    android:textSize="14sp">
+
+    <TextView
+        android:id="@+id/title"
+        style="@style/TextTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingStart="8dp"
+        android:layout_marginBottom="4dp"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="14sp" />
+
+</com.android.launcher3.views.SearchResultSuggestRow>
\ No newline at end of file
diff --git a/res/layout/search_result_thumbnail.xml b/res/layout/search_result_thumbnail.xml
new file mode 100644
index 0000000000..0cc5a29f60
--- /dev/null
+++ b/res/layout/search_result_thumbnail.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.launcher3.views.ThumbnailSearchResultView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="125dp"
+    android:layout_height="125dp"/>
\ No newline at end of file
diff --git a/res/values/config.xml b/res/values/config.xml
index 325b62f9dc..46b8c23a62 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -59,7 +59,6 @@
     <bool name="hotseat_transpose_layout_with_orientation">true</bool>
 
     <!-- Various classes overriden by projects/build flavors. -->
-    <string name="user_event_dispatcher_class" translatable="false"></string>
     <string name="folder_name_provider_class" translatable="false"></string>
     <string name="stats_log_manager_class" translatable="false"></string>
     <string name="app_transition_manager_class" translatable="false"></string>
diff --git a/robolectric_tests/src/com/android/launcher3/secondarydisplay/SDWorkModeTest.java b/robolectric_tests/src/com/android/launcher3/secondarydisplay/SDWorkModeTest.java
index 0ca5ce6f44..baae2a6a80 100644
--- a/robolectric_tests/src/com/android/launcher3/secondarydisplay/SDWorkModeTest.java
+++ b/robolectric_tests/src/com/android/launcher3/secondarydisplay/SDWorkModeTest.java
@@ -21,7 +21,6 @@ import static com.android.launcher3.util.Preconditions.assertNotNull;
 
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
 
 import android.content.Context;
 import android.os.UserManager;
@@ -30,8 +29,6 @@ import android.provider.Settings;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.allapps.AllAppsPagedView;
 import com.android.launcher3.allapps.AllAppsRecyclerView;
-import com.android.launcher3.logging.UserEventDispatcher;
-import com.android.launcher3.shadows.ShadowOverrides;
 import com.android.launcher3.util.LauncherLayoutBuilder;
 import com.android.launcher3.util.LauncherModelHelper;
 
@@ -69,8 +66,6 @@ public class SDWorkModeTest {
         mModelHelper = new LauncherModelHelper();
         mTargetContext = RuntimeEnvironment.application;
         mIdp = InvariantDeviceProfile.INSTANCE.get(mTargetContext);
-        ShadowOverrides.setProvider(UserEventDispatcher.class,
-                c -> mock(UserEventDispatcher.class));
         Settings.Global.putFloat(mTargetContext.getContentResolver(),
                 Settings.Global.WINDOW_ANIMATION_SCALE, 0);
 
diff --git a/robolectric_tests/src/com/android/launcher3/ui/LauncherUIScrollTest.java b/robolectric_tests/src/com/android/launcher3/ui/LauncherUIScrollTest.java
index d330d10133..957ae77eee 100644
--- a/robolectric_tests/src/com/android/launcher3/ui/LauncherUIScrollTest.java
+++ b/robolectric_tests/src/com/android/launcher3/ui/LauncherUIScrollTest.java
@@ -20,7 +20,6 @@ import static com.android.launcher3.util.LauncherUIHelper.doLayout;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
-import static org.mockito.Mockito.mock;
 
 import android.content.Context;
 import android.os.SystemClock;
@@ -36,8 +35,6 @@ import com.android.launcher3.LauncherState;
 import com.android.launcher3.folder.Folder;
 import com.android.launcher3.folder.FolderIcon;
 import com.android.launcher3.folder.FolderPagedView;
-import com.android.launcher3.logging.UserEventDispatcher;
-import com.android.launcher3.shadows.ShadowOverrides;
 import com.android.launcher3.util.LauncherLayoutBuilder;
 import com.android.launcher3.util.LauncherLayoutBuilder.FolderBuilder;
 import com.android.launcher3.util.LauncherModelHelper;
@@ -70,8 +67,6 @@ public class LauncherUIScrollTest {
         mModelHelper = new LauncherModelHelper();
         mTargetContext = RuntimeEnvironment.application;
         mIdp = InvariantDeviceProfile.INSTANCE.get(mTargetContext);
-        ShadowOverrides.setProvider(UserEventDispatcher.class,
-                c -> mock(UserEventDispatcher.class));
 
         Settings.Global.putFloat(mTargetContext.getContentResolver(),
                 Settings.Global.WINDOW_ANIMATION_SCALE, 0);
diff --git a/src/com/android/launcher3/BaseActivity.java b/src/com/android/launcher3/BaseActivity.java
index 310c306f19..5e50e278f0 100644
--- a/src/com/android/launcher3/BaseActivity.java
+++ b/src/com/android/launcher3/BaseActivity.java
@@ -37,8 +37,6 @@ import androidx.annotation.IntDef;
 
 import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
 import com.android.launcher3.logging.StatsLogManager;
-import com.android.launcher3.logging.UserEventDispatcher;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.launcher3.util.SystemUiController;
 import com.android.launcher3.util.ViewCache;
 import com.android.launcher3.views.ActivityContext;
@@ -82,7 +80,6 @@ public abstract class BaseActivity extends Activity implements ActivityContext {
             new ArrayList<>();
 
     protected DeviceProfile mDeviceProfile;
-    protected UserEventDispatcher mUserEventDispatcher;
     protected StatsLogManager mStatsLogManager;
     protected SystemUiController mSystemUiController;
 
@@ -144,8 +141,6 @@ public abstract class BaseActivity extends Activity implements ActivityContext {
         return mDeviceProfile;
     }
 
-    public void modifyUserEvent(LauncherLogProto.LauncherEvent event) {}
-
     public final StatsLogManager getStatsLogManager() {
         if (mStatsLogManager == null) {
             mStatsLogManager = StatsLogManager.newInstance(this);
@@ -153,13 +148,6 @@ public abstract class BaseActivity extends Activity implements ActivityContext {
         return mStatsLogManager;
     }
 
-    public final UserEventDispatcher getUserEventDispatcher() {
-        if (mUserEventDispatcher == null) {
-            mUserEventDispatcher = UserEventDispatcher.newInstance(this);
-        }
-        return mUserEventDispatcher;
-    }
-
     public SystemUiController getSystemUiController() {
         if (mSystemUiController == null) {
             mSystemUiController = new SystemUiController(getWindow());
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 06bb263f23..1e5a9e44d5 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -23,6 +23,7 @@ import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
+import android.animation.ValueAnimator;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
@@ -30,6 +31,8 @@ import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.PointF;
+import android.graphics.PorterDuff.Mode;
+import android.graphics.PorterDuffColorFilter;
 import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
@@ -43,6 +46,8 @@ import android.view.View;
 import android.view.ViewDebug;
 import android.widget.TextView;
 
+import androidx.core.graphics.ColorUtils;
+
 import com.android.launcher3.Launcher.OnResumeCallback;
 import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
 import com.android.launcher3.dot.DotInfo;
@@ -50,6 +55,7 @@ import com.android.launcher3.dragndrop.DraggableView;
 import com.android.launcher3.folder.FolderIcon;
 import com.android.launcher3.graphics.IconPalette;
 import com.android.launcher3.graphics.IconShape;
+import com.android.launcher3.graphics.PlaceHolderIconDrawable;
 import com.android.launcher3.graphics.PreloadIconDrawable;
 import com.android.launcher3.icons.DotRenderer;
 import com.android.launcher3.icons.IconCache.IconLoadRequest;
@@ -59,6 +65,7 @@ import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.model.data.PromiseAppInfo;
+import com.android.launcher3.model.data.RemoteActionItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.util.SafeCloseable;
 import com.android.launcher3.views.ActivityContext;
@@ -84,6 +91,8 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
     private final PointF mTranslationForReorderBounce = new PointF(0, 0);
     private final PointF mTranslationForReorderPreview = new PointF(0, 0);
 
+    private static final int ICON_UPDATE_ANIMATION_DURATION = 375;
+
     private float mScaleForReorderBounce = 1f;
 
     private static final Property<BubbleTextView, Float> DOT_SCALE_PROPERTY
@@ -292,6 +301,14 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         verifyHighRes();
     }
 
+    /**
+     * Apply label and tag using a {@link RemoteActionItemInfo}
+     */
+    public void applyFromRemoteActionInfo(RemoteActionItemInfo remoteActionItemInfo) {
+        applyIconAndLabel(remoteActionItemInfo);
+        setTag(remoteActionItemInfo);
+    }
+
     private void applyIconAndLabel(ItemInfoWithIcon info) {
         FastBitmapDrawable iconDrawable = newIcon(getContext(), info);
         mDotParams.color = IconPalette.getMutedColor(info.bitmap.color, 0.54f);
@@ -636,11 +653,14 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         mDisableRelayout = mIcon != null;
 
         icon.setBounds(0, 0, mIconSize, mIconSize);
-        if (mLayoutHorizontal) {
-            setCompoundDrawablesRelative(icon, null, null, null);
-        } else {
-            setCompoundDrawables(null, icon, null, null);
+
+        updateIcon(icon);
+
+        // If the current icon is a placeholder color, animate its update.
+        if (mIcon != null && mIcon instanceof PlaceHolderIconDrawable) {
+            animateIconUpdate((PlaceHolderIconDrawable) mIcon, icon);
         }
+
         mDisableRelayout = false;
     }
 
@@ -670,6 +690,8 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
                 mActivity.invalidateParent(info);
             } else if (info instanceof PackageItemInfo) {
                 applyFromItemInfoWithIcon((PackageItemInfo) info);
+            } else if (info instanceof RemoteActionItemInfo) {
+                applyFromRemoteActionInfo((RemoteActionItemInfo) info);
             }
 
             mDisableRelayout = false;
@@ -776,4 +798,33 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
             ((FastBitmapDrawable) mIcon).setScale(1f);
         }
     }
+
+    private void updateIcon(Drawable newIcon) {
+        if (mLayoutHorizontal) {
+            setCompoundDrawablesRelative(newIcon, null, null, null);
+        } else {
+            setCompoundDrawables(null, newIcon, null, null);
+        }
+    }
+
+    private static void animateIconUpdate(PlaceHolderIconDrawable oldIcon, Drawable newIcon) {
+        int placeholderColor = oldIcon.mPaint.getColor();
+        int originalAlpha = Color.alpha(placeholderColor);
+
+        ValueAnimator iconUpdateAnimation = ValueAnimator.ofInt(originalAlpha, 0);
+        iconUpdateAnimation.setDuration(ICON_UPDATE_ANIMATION_DURATION);
+        iconUpdateAnimation.addUpdateListener(valueAnimator -> {
+            int newAlpha = (int) valueAnimator.getAnimatedValue();
+            int newColor = ColorUtils.setAlphaComponent(placeholderColor, newAlpha);
+
+            newIcon.setColorFilter(new PorterDuffColorFilter(newColor, Mode.SRC_ATOP));
+        });
+        iconUpdateAnimation.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                newIcon.setColorFilter(null);
+            }
+        });
+        iconUpdateAnimation.start();
+    }
 }
diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
index 09827d664b..df005e6357 100644
--- a/src/com/android/launcher3/ButtonDropTarget.java
+++ b/src/com/android/launcher3/ButtonDropTarget.java
@@ -47,7 +47,6 @@ import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.dragndrop.DragView;
 import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.util.Thunk;
 
@@ -395,6 +394,4 @@ public abstract class ButtonDropTarget extends TextView
                 TextUtils.TruncateAt.END);
         return !mText.equals(displayedText);
     }
-
-    public abstract Target getDropTargetForLogging();
 }
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 1cd201f99e..2809bd5a96 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -323,11 +323,8 @@ public class CellLayout extends ViewGroup {
 
     @Override
     public boolean onInterceptTouchEvent(MotionEvent ev) {
-        if (mTouchHelper != null
-                || (mInterceptTouchListener != null && mInterceptTouchListener.onTouch(this, ev))) {
-            return true;
-        }
-        return false;
+        return mTouchHelper != null
+                || (mInterceptTouchListener != null && mInterceptTouchListener.onTouch(this, ev));
     }
 
     public void enableHardwareLayer(boolean hasLayer) {
diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java
index 28574972ad..cc119c9361 100644
--- a/src/com/android/launcher3/DeleteDropTarget.java
+++ b/src/com/android/launcher3/DeleteDropTarget.java
@@ -18,8 +18,7 @@ package com.android.launcher3;
 
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ITEM_DROPPED_ON_CANCEL;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ITEM_DROPPED_ON_REMOVE;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.TAP;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.ControlType.UNDO;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_UNDO;
 
 import android.content.Context;
 import android.text.TextUtils;
@@ -28,22 +27,19 @@ import android.view.View;
 
 import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
 import com.android.launcher3.dragndrop.DragOptions;
-import com.android.launcher3.logging.LoggerUtils;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.model.ModelWriter;
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ControlType;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
 import com.android.launcher3.views.Snackbar;
 
 public class DeleteDropTarget extends ButtonDropTarget {
 
     private final StatsLogManager mStatsLogManager;
 
-    private int mControlType = ControlType.DEFAULT_CONTROLTYPE;
+    private StatsLogManager.LauncherEvent mLauncherEvent;
 
     public DeleteDropTarget(Context context, AttributeSet attrs) {
         this(context, attrs, 0);
@@ -115,8 +111,8 @@ public class DeleteDropTarget extends ButtonDropTarget {
      * Set mControlType depending on the drag item.
      */
     private void setControlTypeBasedOnDragSource(ItemInfo item) {
-        mControlType = item.id != ItemInfo.NO_ID ? ControlType.REMOVE_TARGET
-                : ControlType.CANCEL_TARGET;
+        mLauncherEvent = item.id != ItemInfo.NO_ID ? LAUNCHER_ITEM_DROPPED_ON_REMOVE
+                : LAUNCHER_ITEM_DROPPED_ON_CANCEL;
     }
 
     @Override
@@ -127,8 +123,7 @@ public class DeleteDropTarget extends ButtonDropTarget {
         }
         super.onDrop(d, options);
         mStatsLogManager.logger().withInstanceId(d.logInstanceId)
-                .log(mControlType == ControlType.REMOVE_TARGET ? LAUNCHER_ITEM_DROPPED_ON_REMOVE
-                        : LAUNCHER_ITEM_DROPPED_ON_CANCEL);
+                .log(mLauncherEvent);
     }
 
     @Override
@@ -141,7 +136,7 @@ public class DeleteDropTarget extends ButtonDropTarget {
             Runnable onUndoClicked = () -> {
                 mLauncher.setPageToBindSynchronously(itemPage);
                 modelWriter.abortDelete();
-                mLauncher.getUserEventDispatcher().logActionOnControl(TAP, UNDO);
+                mLauncher.getStatsLogManager().logger().log(LAUNCHER_UNDO);
             };
             Snackbar.show(mLauncher, R.string.item_removed, R.string.undo,
                     modelWriter::commitDelete, onUndoClicked);
@@ -161,11 +156,4 @@ public class DeleteDropTarget extends ButtonDropTarget {
         mLauncher.getDragLayer()
                 .announceForAccessibility(getContext().getString(R.string.item_removed));
     }
-
-    @Override
-    public Target getDropTargetForLogging() {
-        Target t = LoggerUtils.newTarget(Target.Type.CONTROL);
-        t.controlType = mControlType;
-        return t;
-    }
 }
diff --git a/src/com/android/launcher3/FastBitmapDrawable.java b/src/com/android/launcher3/FastBitmapDrawable.java
index d3b86ded80..139d4a85e4 100644
--- a/src/com/android/launcher3/FastBitmapDrawable.java
+++ b/src/com/android/launcher3/FastBitmapDrawable.java
@@ -33,6 +33,8 @@ import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.util.Property;
 
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.graphics.PlaceHolderIconDrawable;
 import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
@@ -54,6 +56,8 @@ public class FastBitmapDrawable extends Drawable {
     protected Bitmap mBitmap;
     protected final int mIconColor;
 
+    @Nullable private ColorFilter mColorFilter;
+
     private boolean mIsPressed;
     private boolean mIsDisabled;
     private float mDisabledAlpha = 1f;
@@ -115,7 +119,8 @@ public class FastBitmapDrawable extends Drawable {
 
     @Override
     public void setColorFilter(ColorFilter cf) {
-        // No op
+        mColorFilter = cf;
+        updateFilter();
     }
 
     @Override
@@ -265,7 +270,7 @@ public class FastBitmapDrawable extends Drawable {
      * Updates the paint to reflect the current brightness and saturation.
      */
     protected void updateFilter() {
-        mPaint.setColorFilter(mIsDisabled ? getDisabledColorFilter() : null);
+        mPaint.setColorFilter(mIsDisabled ? getDisabledColorFilter() : mColorFilter);
         invalidateSelf();
     }
 
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index 51f3819460..6547b53940 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -16,8 +16,6 @@
 
 package com.android.launcher3;
 
-import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
-
 import android.content.Context;
 import android.graphics.Rect;
 import android.util.AttributeSet;
@@ -27,14 +25,10 @@ import android.view.ViewDebug;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
-import com.android.launcher3.logging.StatsLogUtils.LogContainerProvider;
-import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
-
-import java.util.ArrayList;
-
-public class Hotseat extends CellLayout implements LogContainerProvider, Insettable {
+/**
+ * View class that represents the bottom row of the home screen.
+ */
+public class Hotseat extends CellLayout implements Insettable {
 
     @ViewDebug.ExportedProperty(category = "launcher")
     private boolean mHasVerticalHotseat;
@@ -78,15 +72,6 @@ public class Hotseat extends CellLayout implements LogContainerProvider, Insetta
         }
     }
 
-    @Override
-    public void fillInLogContainerData(ItemInfo childInfo, Target child,
-            ArrayList<Target> parents) {
-        child.rank = childInfo.rank;
-        child.gridX = childInfo.cellX;
-        child.gridY = childInfo.cellY;
-        parents.add(newContainerTarget(LauncherLogProto.ContainerType.HOTSEAT));
-    }
-
     @Override
     public void setInsets(Rect insets) {
         FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) getLayoutParams();
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 4c5224b647..ab8d7a5a69 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -18,6 +18,7 @@ package com.android.launcher3;
 
 import static android.content.pm.ActivityInfo.CONFIG_ORIENTATION;
 import static android.content.pm.ActivityInfo.CONFIG_SCREEN_SIZE;
+import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO;
 import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED;
 
 import static com.android.launcher3.AbstractFloatingView.TYPE_ALL;
@@ -36,11 +37,10 @@ import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.SPRING_LOADED;
 import static com.android.launcher3.Utilities.postAsyncCallback;
 import static com.android.launcher3.dragndrop.DragLayer.ALPHA_INDEX_LAUNCHER_LOAD;
-import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ONRESUME;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ONSTOP;
-import static com.android.launcher3.logging.StatsLogManager.containerTypeToAtomState;
 import static com.android.launcher3.model.ItemInstallQueue.FLAG_ACTIVITY_PAUSED;
 import static com.android.launcher3.model.ItemInstallQueue.FLAG_DRAG_AND_DROP;
 import static com.android.launcher3.model.ItemInstallQueue.FLAG_LOADER_RUNNING;
@@ -70,6 +70,7 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.database.sqlite.SQLiteDatabase;
+import android.graphics.Bitmap;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.CancellationSignal;
@@ -89,9 +90,10 @@ import android.view.Menu;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
+import android.view.WindowManager.LayoutParams;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.animation.OvershootInterpolator;
+import android.widget.ImageView;
 import android.widget.Toast;
 
 import androidx.annotation.CallSuper;
@@ -118,13 +120,13 @@ import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.dragndrop.DragView;
 import com.android.launcher3.folder.FolderGridOrganizer;
 import com.android.launcher3.folder.FolderIcon;
+import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.keyboard.CustomActionsPopup;
 import com.android.launcher3.keyboard.ViewGroupFocusHelper;
 import com.android.launcher3.logger.LauncherAtom;
 import com.android.launcher3.logging.FileLog;
 import com.android.launcher3.logging.StatsLogManager;
-import com.android.launcher3.logging.UserEventDispatcher;
 import com.android.launcher3.model.BgDataModel.Callbacks;
 import com.android.launcher3.model.ItemInstallQueue;
 import com.android.launcher3.model.ModelUtils;
@@ -152,9 +154,6 @@ import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.AllAppsSwipeController;
 import com.android.launcher3.touch.ItemClickHandler;
 import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
 import com.android.launcher3.util.ActivityResultInfo;
 import com.android.launcher3.util.ActivityTracker;
 import com.android.launcher3.util.ComponentKey;
@@ -270,6 +269,8 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     private static final int APPS_VIEW_ALPHA_CHANNEL_INDEX = 1;
     private static final int SCRIM_VIEW_ALPHA_CHANNEL_INDEX = 0;
 
+    private static final int THEME_CROSS_FADE_ANIMATION_DURATION = 375;
+
     private LauncherAppTransitionManager mAppTransitionManager;
     private Configuration mOldConfig;
 
@@ -401,6 +402,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
         inflateRootView(R.layout.launcher);
         setupViews();
+        crossFadeWithPreviousAppearance();
         mPopupDataProvider = new PopupDataProvider(this::updateNotificationDots);
 
         mAppTransitionManager = LauncherAppTransitionManager.newInstance(this);
@@ -477,7 +479,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
                 () -> getStateManager().goToState(NORMAL));
 
         if (Utilities.ATLEAST_R) {
-            getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING);
+            getWindow().setSoftInputMode(LayoutParams.SOFT_INPUT_ADJUST_NOTHING);
         }
 
         mLifecycleRegistry = new LifecycleRegistry(this);
@@ -555,7 +557,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     }
 
     private void onIdpChanged(InvariantDeviceProfile idp) {
-        mUserEventDispatcher = null;
 
         initDeviceProfile(idp);
         dispatchDeviceProfileChanged();
@@ -911,7 +912,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
             mOverlayManager.onActivityStopped(this);
         }
 
-        logStopAndResume(Action.Command.STOP);
+        logStopAndResume(false /* isResume */);
         mAppWidgetHost.setListenIfResumed(false);
         NotificationListener.removeNotificationsChangedListener();
     }
@@ -933,7 +934,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     @Override
     @CallSuper
     protected void onDeferredResumed() {
-        logStopAndResume(Action.Command.RESUME);
+        logStopAndResume(true /* isResume */);
 
         // Process any items that were added while Launcher was away.
         ItemInstallQueue.INSTANCE.get(this)
@@ -950,32 +951,28 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
     protected void handlePendingActivityRequest() { }
 
-    private void logStopAndResume(int command) {
+    private void logStopAndResume(boolean isResume) {
         if (mPendingExecutor != null) return;
         int pageIndex = mWorkspace.isOverlayShown() ? -1 : mWorkspace.getCurrentPage();
-        int containerType = mStateManager.getState().containerType;
+        int statsLogOrdinal = mStateManager.getState().statsLogOrdinal;
 
         StatsLogManager.EventEnum event;
         StatsLogManager.StatsLogger logger = getStatsLogManager().logger();
-        if (command == Action.Command.RESUME) {
+        if (isResume) {
             logger.withSrcState(LAUNCHER_STATE_BACKGROUND)
-                .withDstState(containerTypeToAtomState(mStateManager.getState().containerType));
+                .withDstState(mStateManager.getState().statsLogOrdinal);
             event = LAUNCHER_ONRESUME;
         } else { /* command == Action.Command.STOP */
-            logger.withSrcState(containerTypeToAtomState(mStateManager.getState().containerType))
+            logger.withSrcState(mStateManager.getState().statsLogOrdinal)
                     .withDstState(LAUNCHER_STATE_BACKGROUND);
             event = LAUNCHER_ONSTOP;
         }
 
-        if (containerType == ContainerType.WORKSPACE && mWorkspace != null) {
-            getUserEventDispatcher().logActionCommand(command,
-                    containerType, -1, pageIndex);
+        if (statsLogOrdinal == LAUNCHER_STATE_HOME && mWorkspace != null) {
             logger.withContainerInfo(LauncherAtom.ContainerInfo.newBuilder()
                     .setWorkspace(
                             LauncherAtom.WorkspaceContainer.newBuilder()
                                     .setPageIndex(pageIndex)).build());
-        } else {
-            getUserEventDispatcher().logActionCommand(command, containerType, -1);
         }
         logger.log(event);
     }
@@ -1365,6 +1362,18 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         closeContextMenu();
     }
 
+    @Override
+    public Object onRetainNonConfigurationInstance() {
+        int width = mDragLayer.getWidth();
+        int height = mDragLayer.getHeight();
+
+        if (width <= 0 || height <= 0) {
+            return null;
+        }
+
+        return BitmapRenderer.createHardwareBitmap(width, height, mDragLayer::draw);
+    }
+
     public AllAppsTransitionController getAllAppsController() {
         return mAllAppsController;
     }
@@ -1465,11 +1474,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
             }
 
             // Handle HOME_INTENT
-            UserEventDispatcher ued = getUserEventDispatcher();
-            Target target = newContainerTarget(mStateManager.getState().containerType);
-            target.pageIndex = mWorkspace.getCurrentPage();
-            ued.logActionCommand(Action.Command.HOME_INTENT, target,
-                    newContainerTarget(ContainerType.WORKSPACE));
             hideKeyboard();
 
             if (mLauncherCallbacks != null) {
@@ -2759,4 +2763,40 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
         void onLauncherResume();
     }
+
+    /**
+     * Cross-fades the launcher's updated appearance with its previous appearance.
+     *
+     * This method is used to cross-fade UI updates on activity creation, specifically dark mode
+     * updates.
+     */
+    private void crossFadeWithPreviousAppearance() {
+        Bitmap previousAppearanceBitmap = (Bitmap) getLastNonConfigurationInstance();
+
+        if (previousAppearanceBitmap == null) {
+            return;
+        }
+
+        ImageView crossFadeHelper = new ImageView(this);
+
+        crossFadeHelper.setImageBitmap(previousAppearanceBitmap);
+        crossFadeHelper.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
+
+        InsettableFrameLayout.LayoutParams layoutParams = new InsettableFrameLayout.LayoutParams(
+                InsettableFrameLayout.LayoutParams.MATCH_PARENT,
+                InsettableFrameLayout.LayoutParams.MATCH_PARENT);
+
+        layoutParams.ignoreInsets = true;
+
+        crossFadeHelper.setLayoutParams(layoutParams);
+
+        getRootView().addView(crossFadeHelper);
+
+        crossFadeHelper
+                .animate()
+                .setDuration(THEME_CROSS_FADE_ANIMATION_DURATION)
+                .alpha(0f)
+                .withEndAction(() -> getRootView().removeView(crossFadeHelper))
+                .start();
+    }
 }
diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index bfe327e40d..a4181c53c9 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -105,7 +105,7 @@ public class LauncherAppState {
         new Handler().post( () -> mInvariantDeviceProfile.verifyConfigChangedInBackground(context));
 
         mInstallSessionTracker = InstallSessionHelper.INSTANCE.get(context)
-                .registerInstallTracker(mModel, MODEL_EXECUTOR);
+                .registerInstallTracker(mModel);
 
         // Register an observer to rebind the notification listener when dots are re-enabled.
         mNotificationDotsObserver =
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java
index b6bc500a58..eba0ac9633 100644
--- a/src/com/android/launcher3/LauncherState.java
+++ b/src/com/android/launcher3/LauncherState.java
@@ -16,6 +16,7 @@
 package com.android.launcher3;
 
 import static com.android.launcher3.anim.Interpolators.ACCEL_2;
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
 import static com.android.launcher3.testing.TestProtocol.ALL_APPS_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.BACKGROUND_APP_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.HINT_STATE_ORDINAL;
@@ -35,7 +36,6 @@ import com.android.launcher3.states.SpringLoadedState;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.uioverrides.states.AllAppsState;
 import com.android.launcher3.uioverrides.states.OverviewState;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 
 import java.util.Arrays;
 
@@ -97,7 +97,7 @@ public abstract class LauncherState implements BaseState<LauncherState> {
      * TODO: Create a separate class for NORMAL state.
      */
     public static final LauncherState NORMAL = new LauncherState(NORMAL_STATE_ORDINAL,
-            ContainerType.WORKSPACE,
+            LAUNCHER_STATE_HOME,
             FLAG_DISABLE_RESTORE | FLAG_WORKSPACE_ICONS_CAN_BE_DRAGGED | FLAG_HIDE_BACK_BUTTON |
                     FLAG_HAS_SYS_UI_SCRIM) {
         @Override
@@ -126,9 +126,9 @@ public abstract class LauncherState implements BaseState<LauncherState> {
     public final int ordinal;
 
     /**
-     * Used for containerType in {@link com.android.launcher3.logging.UserEventDispatcher}
+     * Used for {@link com.android.launcher3.logging.StatsLogManager}
      */
-    public final int containerType;
+    public final int statsLogOrdinal;
 
     /**
      * True if the state has overview panel visible.
@@ -137,8 +137,8 @@ public abstract class LauncherState implements BaseState<LauncherState> {
 
     private final int mFlags;
 
-    public LauncherState(int id, int containerType, int flags) {
-        this.containerType = containerType;
+    public LauncherState(int id, int statsLogOrdinal, int flags) {
+        this.statsLogOrdinal = statsLogOrdinal;
         this.mFlags = flags;
         this.overviewUi = (flags & FLAG_OVERVIEW_UI) != 0;
         this.ordinal = id;
diff --git a/src/com/android/launcher3/SecondaryDropTarget.java b/src/com/android/launcher3/SecondaryDropTarget.java
index 2df7f5ad20..92b88e6186 100644
--- a/src/com/android/launcher3/SecondaryDropTarget.java
+++ b/src/com/android/launcher3/SecondaryDropTarget.java
@@ -37,14 +37,11 @@ import com.android.launcher3.Launcher.OnResumeCallback;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.logging.FileLog;
-import com.android.launcher3.logging.LoggerUtils;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.logging.StatsLogManager.StatsLogger;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ControlType;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.launcher3.util.Themes;
 
@@ -134,19 +131,6 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList
         return mCurrentAccessibilityAction;
     }
 
-    @Override
-    public Target getDropTargetForLogging() {
-        Target t = LoggerUtils.newTarget(Target.Type.CONTROL);
-        if (mCurrentAccessibilityAction == UNINSTALL) {
-            t.controlType = ControlType.UNINSTALL_TARGET;
-        } else if (mCurrentAccessibilityAction == DISMISS_PREDICTION) {
-            t.controlType = ControlType.DISMISS_PREDICTION;
-        } else {
-            t.controlType = ControlType.SETTINGS_BUTTON;
-        }
-        return t;
-    }
-
     @Override
     protected boolean supportsDrop(ItemInfo info) {
         return supportsAccessibilityDrop(info, getViewUnderDrag(info));
diff --git a/src/com/android/launcher3/SessionCommitReceiver.java b/src/com/android/launcher3/SessionCommitReceiver.java
index 007e5f5370..1bbbb2b59e 100644
--- a/src/com/android/launcher3/SessionCommitReceiver.java
+++ b/src/com/android/launcher3/SessionCommitReceiver.java
@@ -25,8 +25,11 @@ import android.content.pm.PackageManager;
 import android.os.UserHandle;
 import android.text.TextUtils;
 
+import androidx.annotation.WorkerThread;
+
 import com.android.launcher3.model.ItemInstallQueue;
 import com.android.launcher3.pm.InstallSessionHelper;
+import com.android.launcher3.util.Executors;
 
 /**
  * BroadcastReceiver to handle session commit intent.
@@ -38,6 +41,11 @@ public class SessionCommitReceiver extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
+        Executors.MODEL_EXECUTOR.execute(() -> processIntent(context, intent));
+    }
+
+    @WorkerThread
+    private static void processIntent(Context context, Intent intent) {
         if (!isEnabled(context)) {
             // User has decided to not add icons on homescreen.
             return;
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index dea2a8dfd2..43ccb7990c 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -133,6 +133,10 @@ public final class Utilities {
     public static final String EXTRA_WALLPAPER_OFFSET = "com.android.launcher3.WALLPAPER_OFFSET";
     public static final String EXTRA_WALLPAPER_FLAVOR = "com.android.launcher3.WALLPAPER_FLAVOR";
 
+    // An intent extra to indicate the launch source by launcher.
+    public static final String EXTRA_WALLPAPER_LAUNCH_SOURCE =
+            "com.android.wallpaper.LAUNCH_SOURCE";
+
     public static boolean IS_RUNNING_IN_TEST_HARNESS =
                     ActivityManager.isRunningInTestHarness();
 
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 45aaa1b673..98328cf8af 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -85,7 +85,6 @@ import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.logger.LauncherAtom;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.logging.StatsLogManager.LauncherEvent;
-import com.android.launcher3.logging.UserEventDispatcher;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
@@ -97,8 +96,6 @@ import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.touch.WorkspaceTouchListener;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.launcher3.util.Executors;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.IntSparseArrayMap;
@@ -1004,8 +1001,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
     public void onOverlayScrollChanged(float scroll) {
         if (Float.compare(scroll, 1f) == 0) {
             if (!mOverlayShown) {
-                mLauncher.getUserEventDispatcher().logActionOnContainer(Action.Touch.SWIPE,
-                        Action.Direction.LEFT, ContainerType.WORKSPACE, 0);
                 mLauncher.getStatsLogManager().logger()
                         .withSrcState(LAUNCHER_STATE_HOME)
                         .withDstState(LAUNCHER_STATE_HOME)
@@ -1020,20 +1015,16 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
             // Not announcing the overlay page for accessibility since it announces itself.
         } else if (Float.compare(scroll, 0f) == 0) {
             if (mOverlayShown) {
-                UserEventDispatcher ued = mLauncher.getUserEventDispatcher();
-                if (!ued.isPreviousHomeGesture()) {
-                    mLauncher.getUserEventDispatcher().logActionOnContainer(Action.Touch.SWIPE,
-                        Action.Direction.RIGHT, ContainerType.WORKSPACE, -1);
-                    mLauncher.getStatsLogManager().logger()
-                            .withSrcState(LAUNCHER_STATE_HOME)
-                            .withDstState(LAUNCHER_STATE_HOME)
-                            .withContainerInfo(LauncherAtom.ContainerInfo.newBuilder()
-                                    .setWorkspace(
-                                            LauncherAtom.WorkspaceContainer.newBuilder()
-                                                    .setPageIndex(-1))
-                                    .build())
-                            .log(LAUNCHER_SWIPERIGHT);
-                }
+                // TODO: this is logged unnecessarily on home gesture.
+                mLauncher.getStatsLogManager().logger()
+                        .withSrcState(LAUNCHER_STATE_HOME)
+                        .withDstState(LAUNCHER_STATE_HOME)
+                        .withContainerInfo(LauncherAtom.ContainerInfo.newBuilder()
+                                .setWorkspace(
+                                        LauncherAtom.WorkspaceContainer.newBuilder()
+                                                .setPageIndex(-1))
+                                .build())
+                        .log(LAUNCHER_SWIPERIGHT);
             } else if (Float.compare(mOverlayTranslation, 0f) != 0) {
                 // When arriving to 0 overscroll from non-zero overscroll, announce page for
                 // accessibility since default announcements were disabled while in overscroll
@@ -1124,12 +1115,8 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
     protected void notifyPageSwitchListener(int prevPage) {
         super.notifyPageSwitchListener(prevPage);
         if (prevPage != mCurrentPage) {
-            int swipeDirection = (prevPage < mCurrentPage)
-                    ? Action.Direction.RIGHT : Action.Direction.LEFT;
             StatsLogManager.EventEnum event = (prevPage < mCurrentPage)
                     ? LAUNCHER_SWIPERIGHT : LAUNCHER_SWIPELEFT;
-            mLauncher.getUserEventDispatcher().logActionOnContainer(Action.Touch.SWIPE,
-                    swipeDirection, ContainerType.WORKSPACE, prevPage);
             mLauncher.getStatsLogManager().logger()
                     .withSrcState(LAUNCHER_STATE_HOME)
                     .withDstState(LAUNCHER_STATE_HOME)
@@ -1175,13 +1162,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         computeScrollHelper(false);
     }
 
-    @Override
-    protected void determineScrollingStart(MotionEvent ev, float touchSlopScale) {
-        if (!isSwitchingState()) {
-            super.determineScrollingStart(ev, touchSlopScale);
-        }
-    }
-
     @Override
     public void announceForAccessibility(CharSequence text) {
         // Don't announce if apps is on top of us.
diff --git a/src/com/android/launcher3/WorkspaceLayoutManager.java b/src/com/android/launcher3/WorkspaceLayoutManager.java
index ea887cc5eb..d6302ce580 100644
--- a/src/com/android/launcher3/WorkspaceLayoutManager.java
+++ b/src/com/android/launcher3/WorkspaceLayoutManager.java
@@ -130,12 +130,16 @@ public interface WorkspaceLayoutManager {
         }
 
         child.setHapticFeedbackEnabled(false);
-        child.setOnLongClickListener(ItemLongClickListener.INSTANCE_WORKSPACE);
+        child.setOnLongClickListener(getWorkspaceChildOnLongClickListener());
         if (child instanceof DropTarget) {
             onAddDropTarget((DropTarget) child);
         }
     }
 
+    default View.OnLongClickListener getWorkspaceChildOnLongClickListener() {
+        return ItemLongClickListener.INSTANCE_WORKSPACE;
+    }
+
     Hotseat getHotseat();
 
     CellLayout getScreenWithId(int screenId);
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index d1340faf23..8bc8e53af3 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -92,10 +92,14 @@ public class AllAppsGridAdapter extends
 
     public static final int VIEW_TYPE_SEARCH_SLICE = 1 << 9;
 
-    public static final int VIEW_TYPE_SEARCH_SHORTCUT = 1 << 10;
+    public static final int VIEW_TYPE_SEARCH_ICON_ROW = 1 << 10;
 
     public static final int VIEW_TYPE_SEARCH_PEOPLE = 1 << 11;
 
+    public static final int VIEW_TYPE_SEARCH_THUMBNAIL = 1 << 12;
+
+    public static final int VIEW_TYPE_SEARCH_SUGGEST = 1 << 13;
+
     // Common view type masks
     public static final int VIEW_TYPE_MASK_DIVIDER = VIEW_TYPE_ALL_APPS_DIVIDER;
     public static final int VIEW_TYPE_MASK_ICON = VIEW_TYPE_ICON;
@@ -186,7 +190,9 @@ public class AllAppsGridAdapter extends
                     || viewType == VIEW_TYPE_SEARCH_SLICE
                     || viewType == VIEW_TYPE_SEARCH_ROW
                     || viewType == VIEW_TYPE_SEARCH_PEOPLE
-                    || viewType == VIEW_TYPE_SEARCH_SHORTCUT;
+                    || viewType == VIEW_TYPE_SEARCH_THUMBNAIL
+                    || viewType == VIEW_TYPE_SEARCH_ICON_ROW
+                    || viewType == VIEW_TYPE_SEARCH_SUGGEST;
         }
     }
 
@@ -197,6 +203,7 @@ public class AllAppsGridAdapter extends
      */
     public static class AdapterItemWithPayload<T> extends AdapterItem {
         private T mPayload;
+        private String mSearchSessionId;
         private AllAppsSearchPlugin mPlugin;
         private IntConsumer mSelectionHandler;
 
@@ -218,6 +225,14 @@ public class AllAppsGridAdapter extends
             mSelectionHandler = runnable;
         }
 
+        public void setSearchSessionId(String searchSessionId) {
+            mSearchSessionId = searchSessionId;
+        }
+
+        public String getSearchSessionId() {
+            return mSearchSessionId;
+        }
+
         public IntConsumer getSelectionHandler() {
             return mSelectionHandler;
         }
@@ -225,6 +240,8 @@ public class AllAppsGridAdapter extends
         public T getPayload() {
             return mPayload;
         }
+
+
     }
 
     /**
@@ -307,15 +324,21 @@ public class AllAppsGridAdapter extends
 
         @Override
         public int getSpanSize(int position) {
-            if (isIconViewType(mApps.getAdapterItems().get(position).viewType)) {
-                return 1;
+            int viewType = mApps.getAdapterItems().get(position).viewType;
+            if (isIconViewType(viewType)) {
+                return 1 * SPAN_MULTIPLIER;
+            } else if (viewType == VIEW_TYPE_SEARCH_THUMBNAIL) {
+                return mAppsPerRow;
             } else {
                 // Section breaks span the full width
-                return mAppsPerRow;
+                return mAppsPerRow * SPAN_MULTIPLIER;
             }
         }
     }
 
+    // multiplier to support adapter item column count that is not mAppsPerRow.
+    public static final int SPAN_MULTIPLIER = 3;
+
     private final BaseDraggingActivity mLauncher;
     private final LayoutInflater mLayoutInflater;
     private final AlphabeticalAppsList mApps;
@@ -352,7 +375,7 @@ public class AllAppsGridAdapter extends
 
     public void setAppsPerRow(int appsPerRow) {
         mAppsPerRow = appsPerRow;
-        mGridLayoutMgr.setSpanCount(mAppsPerRow);
+        mGridLayoutMgr.setSpanCount(mAppsPerRow * SPAN_MULTIPLIER);
     }
 
     /**
@@ -438,12 +461,18 @@ public class AllAppsGridAdapter extends
             case VIEW_TYPE_SEARCH_SLICE:
                 return new ViewHolder(mLayoutInflater.inflate(
                         R.layout.search_result_slice, parent, false));
-            case VIEW_TYPE_SEARCH_SHORTCUT:
+            case VIEW_TYPE_SEARCH_ICON_ROW:
                 return new ViewHolder(mLayoutInflater.inflate(
-                        R.layout.search_result_shortcut, parent, false));
+                        R.layout.search_result_icon_row, parent, false));
             case VIEW_TYPE_SEARCH_PEOPLE:
                 return new ViewHolder(mLayoutInflater.inflate(
                         R.layout.search_result_people_item, parent, false));
+            case VIEW_TYPE_SEARCH_THUMBNAIL:
+                return new ViewHolder(mLayoutInflater.inflate(
+                        R.layout.search_result_thumbnail, parent, false));
+            case VIEW_TYPE_SEARCH_SUGGEST:
+                return new ViewHolder(mLayoutInflater.inflate(
+                        R.layout.search_result_suggest, parent, false));
             default:
                 throw new RuntimeException("Unexpected view type");
         }
@@ -464,24 +493,27 @@ public class AllAppsGridAdapter extends
                 //TODO: replace with custom TopHitBubbleTextView with support for both shortcut
                 // and apps
                 if (adapterItem instanceof AdapterItemWithPayload) {
-                    AdapterItemWithPayload withPayload = (AdapterItemWithPayload) adapterItem;
-                    IntConsumer selectionHandler = type -> {
+                    AdapterItemWithPayload item = (AdapterItemWithPayload) adapterItem;
+                    item.setSelectionHandler(type -> {
                         SearchTargetEvent e = new SearchTargetEvent(SearchTarget.ItemType.APP,
-                                type);
+                                type, item.position, item.getSearchSessionId());
                         e.bundle = HeroSearchResultView.getAppBundle(info);
-                        if (withPayload.getPlugin() != null) {
-                            withPayload.getPlugin().notifySearchTargetEvent(e);
+                        if (item.getPlugin() != null) {
+                            item.getPlugin().notifySearchTargetEvent(e);
                         }
-                    };
+                    });
                     icon.setOnClickListener(view -> {
-                        selectionHandler.accept(SearchTargetEvent.SELECT);
+                        item.getSelectionHandler().accept(SearchTargetEvent.SELECT);
                         mOnIconClickListener.onClick(view);
                     });
                     icon.setOnLongClickListener(view -> {
-                        selectionHandler.accept(SearchTargetEvent.LONG_PRESS);
+                        item.getSelectionHandler().accept(SearchTargetEvent.SELECT);
                         return mOnIconLongClickListener.onLongClick(view);
                     });
-                    withPayload.setSelectionHandler(selectionHandler);
+                }
+                else {
+                    icon.setOnClickListener(mOnIconClickListener);
+                    icon.setOnLongClickListener(mOnIconLongClickListener);
                 }
                 break;
             case VIEW_TYPE_EMPTY_SEARCH:
@@ -500,20 +532,22 @@ public class AllAppsGridAdapter extends
                 break;
             case VIEW_TYPE_SEARCH_SLICE:
                 SliceView sliceView = (SliceView) holder.itemView;
-                AdapterItemWithPayload<Uri> item =
+                AdapterItemWithPayload<Uri> slicePayload =
                         (AdapterItemWithPayload<Uri>) mApps.getAdapterItems().get(position);
                 sliceView.setOnSliceActionListener((info1, s) -> {
-                    if (item.getPlugin() != null) {
+                    if (slicePayload.getPlugin() != null) {
                         SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
                                 SearchTarget.ItemType.SETTINGS_SLICE,
-                                SearchTargetEvent.CHILD_SELECT);
+                                SearchTargetEvent.CHILD_SELECT, slicePayload.position,
+                                slicePayload.getSearchSessionId());
                         searchTargetEvent.bundle = new Bundle();
-                        searchTargetEvent.bundle.putParcelable("uri", item.getPayload());
-                        item.getPlugin().notifySearchTargetEvent(searchTargetEvent);
+                        searchTargetEvent.bundle.putParcelable("uri", slicePayload.getPayload());
+                        slicePayload.getPlugin().notifySearchTargetEvent(searchTargetEvent);
                     }
                 });
                 try {
-                    LiveData<Slice> liveData = SliceLiveData.fromUri(mLauncher, item.getPayload());
+                    LiveData<Slice> liveData = SliceLiveData.fromUri(mLauncher,
+                            slicePayload.getPayload());
                     liveData.observe((Launcher) mLauncher, sliceView);
                     sliceView.setTag(liveData);
                 } catch (Exception ignored) {
@@ -523,11 +557,14 @@ public class AllAppsGridAdapter extends
             case VIEW_TYPE_SEARCH_ROW_WITH_BUTTON:
             case VIEW_TYPE_SEARCH_HERO_APP:
             case VIEW_TYPE_SEARCH_ROW:
-            case VIEW_TYPE_SEARCH_SHORTCUT:
+            case VIEW_TYPE_SEARCH_ICON_ROW:
             case VIEW_TYPE_SEARCH_PEOPLE:
+            case VIEW_TYPE_SEARCH_THUMBNAIL:
+            case VIEW_TYPE_SEARCH_SUGGEST:
+                AdapterItemWithPayload item =
+                        (AdapterItemWithPayload) mApps.getAdapterItems().get(position);
                 PayloadResultHandler payloadResultView = (PayloadResultHandler) holder.itemView;
-                payloadResultView.applyAdapterInfo(
-                        (AdapterItemWithPayload) mApps.getAdapterItems().get(position));
+                payloadResultView.setup(item);
                 break;
             case VIEW_TYPE_ALL_APPS_DIVIDER:
                 // nothing to do
@@ -541,8 +578,8 @@ public class AllAppsGridAdapter extends
         if (!FeatureFlags.ENABLE_DEVICE_SEARCH.get()) return;
         if (holder.itemView instanceof BubbleTextView) {
             BubbleTextView icon = (BubbleTextView) holder.itemView;
-            icon.setOnClickListener(mOnIconClickListener);
-            icon.setOnLongClickListener(mOnIconLongClickListener);
+            icon.setOnClickListener(null);
+            icon.setOnLongClickListener(null);
         } else if (holder.itemView instanceof SliceView) {
             SliceView sliceView = (SliceView) holder.itemView;
             sliceView.setOnSliceActionListener(null);
@@ -553,7 +590,6 @@ public class AllAppsGridAdapter extends
         }
     }
 
-
     @Override
     public boolean onFailedToRecycleView(ViewHolder holder) {
         // Always recycle and we will reset the view when it is bound
diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
index 13a93ff0cc..72b6d94192 100644
--- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
@@ -19,8 +19,6 @@ import static android.view.View.MeasureSpec.EXACTLY;
 import static android.view.View.MeasureSpec.UNSPECIFIED;
 import static android.view.View.MeasureSpec.makeMeasureSpec;
 
-import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
-
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Canvas;
@@ -38,10 +36,6 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsGridAdapter.AppsGridLayoutManager;
-import com.android.launcher3.logging.StatsLogUtils.LogContainerProvider;
-import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
 import com.android.launcher3.views.RecyclerViewFastScroller;
 
 import java.util.ArrayList;
@@ -50,7 +44,7 @@ import java.util.List;
 /**
  * A RecyclerView with custom fast scroll support for the all apps view.
  */
-public class AllAppsRecyclerView extends BaseRecyclerView implements LogContainerProvider {
+public class AllAppsRecyclerView extends BaseRecyclerView {
 
     private AlphabeticalAppsList mApps;
     private final int mNumAppsPerRow;
@@ -176,13 +170,6 @@ public class AllAppsRecyclerView extends BaseRecyclerView implements LogContaine
         mAutoSizedOverlays.clear();
     }
 
-    @Override
-    public void fillInLogContainerData(ItemInfo childInfo, Target child,
-            ArrayList<Target> parents) {
-        parents.add(newContainerTarget(
-                getApps().hasFilter() ? ContainerType.SEARCHRESULT : ContainerType.ALLAPPS));
-    }
-
     public void onSearchResultsChanged() {
         // Always scroll the view to the top so the user can see the changed results
         scrollToTop();
diff --git a/src/com/android/launcher3/allapps/DiscoveryBounce.java b/src/com/android/launcher3/allapps/DiscoveryBounce.java
index 14595ca941..0005db88c8 100644
--- a/src/com/android/launcher3/allapps/DiscoveryBounce.java
+++ b/src/com/android/launcher3/allapps/DiscoveryBounce.java
@@ -18,8 +18,6 @@ package com.android.launcher3.allapps;
 
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType.HOTSEAT;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType.PREDICTION;
 
 import android.animation.Animator;
 import android.animation.AnimatorInflater;
@@ -120,10 +118,10 @@ public class DiscoveryBounce extends AbstractFloatingView {
         return (type & TYPE_DISCOVERY_BOUNCE) != 0;
     }
 
-    private void show(int containerType) {
+    private void show() {
         mIsOpen = true;
         mLauncher.getDragLayer().addView(this);
-        mLauncher.getUserEventDispatcher().logActionBounceTip(containerType);
+        // TODO: add WW log for discovery bounce tip show event.
     }
 
     public static void showForHomeIfNeeded(Launcher launcher) {
@@ -146,7 +144,7 @@ public class DiscoveryBounce extends AbstractFloatingView {
         }
         onboardingPrefs.incrementEventCount(OnboardingPrefs.HOME_BOUNCE_COUNT);
 
-        new DiscoveryBounce(launcher, 0).show(HOTSEAT);
+        new DiscoveryBounce(launcher, 0).show();
     }
 
     public static void showForOverviewIfNeeded(Launcher launcher,
@@ -179,7 +177,7 @@ public class DiscoveryBounce extends AbstractFloatingView {
         onboardingPrefs.incrementEventCount(OnboardingPrefs.SHELF_BOUNCE_COUNT);
 
         new DiscoveryBounce(launcher, (1 - OVERVIEW.getVerticalProgress(launcher)))
-                .show(PREDICTION);
+                .show();
     }
 
     /**
diff --git a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
index 3320189a1d..d7fa5bc479 100644
--- a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
+++ b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
@@ -35,6 +35,8 @@ import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.systemui.plugins.AllAppsSearchPlugin;
+import com.android.systemui.plugins.shared.SearchTarget;
+import com.android.systemui.plugins.shared.SearchTargetEvent;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -213,6 +215,44 @@ public class AllAppsSearchBarController
         /**
          * Updates View using Adapter's payload
          */
+
+        default void setup(AdapterItemWithPayload<T> adapterItemWithPayload) {
+            Object[] targetInfo = getTargetInfo();
+            if (targetInfo != null) {
+                targetInfo[0] = adapterItemWithPayload.getSearchSessionId();
+                targetInfo[1] = adapterItemWithPayload.position;
+            }
+            applyAdapterInfo(adapterItemWithPayload);
+        }
+
         void applyAdapterInfo(AdapterItemWithPayload<T> adapterItemWithPayload);
+
+        /**
+         * Gets object created by {@link PayloadResultHandler#createTargetInfo()}
+         */
+        Object[] getTargetInfo();
+
+        /**
+         * Creates a wrapper object to hold searchSessionId and item position
+         */
+        default Object[] createTargetInfo() {
+            return new Object[2];
+        }
+
+        /**
+         * Generates a SearchTargetEvent object for a PayloadHandlerView
+         */
+        default SearchTargetEvent getSearchTargetEvent(SearchTarget.ItemType itemType,
+                int eventType) {
+            Object[] targetInfo = getTargetInfo();
+            if (targetInfo == null) return null;
+
+            String searchSessionId = (String) targetInfo[0];
+            int position = (int) targetInfo[1];
+            return new SearchTargetEvent(itemType, eventType,
+                    position, searchSessionId);
+        }
     }
+
+
 }
\ No newline at end of file
diff --git a/src/com/android/launcher3/anim/PendingAnimation.java b/src/com/android/launcher3/anim/PendingAnimation.java
index 53625756b8..6dd316ed60 100644
--- a/src/com/android/launcher3/anim/PendingAnimation.java
+++ b/src/com/android/launcher3/anim/PendingAnimation.java
@@ -73,9 +73,9 @@ public class PendingAnimation implements PropertySetter {
         addAnimationHoldersRecur(a, mDuration, springProperty, mAnimHolders);
     }
 
-    public void finish(boolean isSuccess, int logAction) {
+    public void finish(boolean isSuccess) {
         for (Consumer<EndState> listeners : mEndListeners) {
-            listeners.accept(new EndState(isSuccess, logAction));
+            listeners.accept(new EndState(isSuccess));
         }
         mEndListeners.clear();
     }
@@ -164,7 +164,7 @@ public class PendingAnimation implements PropertySetter {
 
     /**
      * Add a listener of receiving the end state.
-     * Note that the listeners are called as a result of calling {@link #finish(boolean, int)}
+     * Note that the listeners are called as a result of calling {@link #finish(boolean)}
      * and not automatically
      */
     public void addEndListener(Consumer<EndState> listener) {
@@ -173,11 +173,9 @@ public class PendingAnimation implements PropertySetter {
 
     public static class EndState {
         public boolean isSuccess;
-        public int logAction;
 
-        public EndState(boolean isSuccess, int logAction) {
+        public EndState(boolean isSuccess) {
             this.isSuccess = isSuccess;
-            this.logAction = logAction;
         }
     }
 }
diff --git a/src/com/android/launcher3/dragndrop/AddItemActivity.java b/src/com/android/launcher3/dragndrop/AddItemActivity.java
index 2d625c5373..42e247aa9b 100644
--- a/src/com/android/launcher3/dragndrop/AddItemActivity.java
+++ b/src/com/android/launcher3/dragndrop/AddItemActivity.java
@@ -16,10 +16,11 @@
 
 package com.android.launcher3.dragndrop;
 
-import static com.android.launcher3.logging.LoggerUtils.newCommandAction;
-import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
-import static com.android.launcher3.logging.LoggerUtils.newItemTarget;
-import static com.android.launcher3.logging.LoggerUtils.newLauncherEvent;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ADD_EXTERNAL_ITEM_BACK;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ADD_EXTERNAL_ITEM_CANCELLED;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ADD_EXTERNAL_ITEM_DRAGGED;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ADD_EXTERNAL_ITEM_PLACED_AUTOMATICALLY;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ADD_EXTERNAL_ITEM_START;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
 import android.annotation.TargetApi;
@@ -49,11 +50,10 @@ import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherAppWidgetHost;
 import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.R;
+import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.model.ItemInstallQueue;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.pm.PinRequestHelper;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.launcher3.util.InstantAppResolver;
 import com.android.launcher3.views.BaseDragLayer;
 import com.android.launcher3.widget.PendingAddShortcutInfo;
@@ -125,7 +125,7 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
         // savedInstanceState is null when the activity is created the first time (i.e., avoids
         // duplicate logging during rotation)
         if (savedInstanceState == null) {
-            logCommand(Action.Command.ENTRY);
+            logCommand(LAUNCHER_ADD_EXTERNAL_ITEM_START);
         }
     }
 
@@ -178,6 +178,7 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
         startActivity(homeIntent,
                 ActivityOptions.makeCustomAnimation(this, 0, android.R.anim.fade_out)
                         .toBundle());
+        logCommand(LAUNCHER_ADD_EXTERNAL_ITEM_DRAGGED);
         mFinishOnPause = true;
         return false;
     }
@@ -240,7 +241,7 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
      * Called when the cancel button is clicked.
      */
     public void onCancelClick(View v) {
-        logCommand(Action.Command.CANCEL);
+        logCommand(LAUNCHER_ADD_EXTERNAL_ITEM_CANCELLED);
         finish();
     }
 
@@ -250,7 +251,7 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
     public void onPlaceAutomaticallyClick(View v) {
         if (mRequest.getRequestType() == PinItemRequest.REQUEST_TYPE_SHORTCUT) {
             ItemInstallQueue.INSTANCE.get(this).queueItem(mRequest.getShortcutInfo());
-            logCommand(Action.Command.CONFIRM);
+            logCommand(LAUNCHER_ADD_EXTERNAL_ITEM_PLACED_AUTOMATICALLY);
             mRequest.accept();
             finish();
             return;
@@ -274,13 +275,13 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
                 .queueItem(mRequest.getAppWidgetProviderInfo(this), widgetId);
         mWidgetOptions.putInt(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId);
         mRequest.accept(mWidgetOptions);
-        logCommand(Action.Command.CONFIRM);
+        logCommand(LAUNCHER_ADD_EXTERNAL_ITEM_PLACED_AUTOMATICALLY);
         finish();
     }
 
     @Override
     public void onBackPressed() {
-        logCommand(Action.Command.BACK);
+        logCommand(LAUNCHER_ADD_EXTERNAL_ITEM_BACK);
         super.onBackPressed();
     }
 
@@ -320,10 +321,7 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
         throw new UnsupportedOperationException();
     }
 
-    private void logCommand(int command) {
-        getUserEventDispatcher().dispatchUserEvent(newLauncherEvent(
-                newCommandAction(command),
-                newItemTarget(mWidgetCell.getWidgetView(), mInstantAppResolver),
-                newContainerTarget(ContainerType.PINITEM)), null);
+    private void logCommand(StatsLogManager.EventEnum command) {
+        getStatsLogManager().logger().log(command);
     }
 }
diff --git a/src/com/android/launcher3/dragndrop/DragController.java b/src/com/android/launcher3/dragndrop/DragController.java
index ef666f0acd..1cfe6acf05 100644
--- a/src/com/android/launcher3/dragndrop/DragController.java
+++ b/src/com/android/launcher3/dragndrop/DragController.java
@@ -206,7 +206,6 @@ public class DragController implements DragDriver.EventListener, TouchController
         }
 
         handleMoveEvent(mLastTouch.x, mLastTouch.y);
-        mLauncher.getUserEventDispatcher().resetActionDurationMillis();
 
         if (!mLauncher.isTouchInProgress() && options.simulatedDndStartPoint == null) {
             // If it is an internal drag and the touch is already complete, cancel immediately
@@ -544,7 +543,6 @@ public class DragController implements DragDriver.EventListener, TouchController
             }
         }
         final View dropTargetAsView = dropTarget instanceof View ? (View) dropTarget : null;
-        mLauncher.getUserEventDispatcher().logDragNDrop(mDragObject, dropTargetAsView);
         dispatchDropComplete(dropTargetAsView, accepted);
     }
 
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index 281598a48b..63fa391d43 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -23,7 +23,6 @@ import static com.android.launcher3.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent;
 import static com.android.launcher3.config.FeatureFlags.ALWAYS_USE_HARDWARE_OPTIMIZATION_FOR_FOLDER_ANIMATIONS;
-import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_FOLDER_CONVERTED_TO_ICON;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_FOLDER_LABEL_UPDATED;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ITEM_DROP_COMPLETED;
@@ -95,7 +94,6 @@ import com.android.launcher3.model.data.FolderInfo.FolderListener;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pageindicators.PageIndicatorDots;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.launcher3.util.Executors;
 import com.android.launcher3.util.Thunk;
 import com.android.launcher3.views.ClipPathView;
@@ -599,15 +597,6 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
      * is played.
      */
     private void animateOpen(List<WorkspaceItemInfo> items, int pageNo) {
-        animateOpen(items, pageNo, false);
-    }
-
-    /**
-     * Opens the user folder described by the specified tag. The opening of the folder
-     * is animated relative to the specified View. If the View is null, no animation
-     * is played.
-     */
-    private void animateOpen(List<WorkspaceItemInfo> items, int pageNo, boolean skipUserEventLog) {
         Folder openFolder = getOpen(mLauncher);
         if (openFolder != null && openFolder != this) {
             // Close any open folder before opening a folder.
@@ -657,14 +646,6 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
                 mState = STATE_OPEN;
                 announceAccessibilityChanges();
 
-                if (!skipUserEventLog) {
-                    mLauncher.getUserEventDispatcher().logActionOnItem(
-                            LauncherLogProto.Action.Touch.TAP,
-                            LauncherLogProto.Action.Direction.NONE,
-                            LauncherLogProto.ItemType.FOLDER_ICON, mInfo.cellX, mInfo.cellY);
-                }
-
-
                 mContent.setFocusOnFirstChild();
             }
         });
@@ -1513,7 +1494,6 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
                 }
 
                 statsLogger.log(LAUNCHER_FOLDER_LABEL_UPDATED);
-                logFolderLabelState(mFromLabelState, toLabelState);
                 mFolderName.dispatchBackKey();
             }
         }
@@ -1644,8 +1624,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
                         return true;
                     }
                 } else {
-                    mLauncher.getUserEventDispatcher().logActionTapOutside(
-                            newContainerTarget(LauncherLogProto.ContainerType.FOLDER));
+                    // TODO: add ww log if need to gather tap outside to close folder
                     close(true);
                     return true;
                 }
@@ -1680,17 +1659,6 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         return mContent;
     }
 
-    /**
-     * Logs current folder label info.
-     *
-     * @deprecated This method is only used for log validation and soon will be removed.
-     */
-    @Deprecated
-    public void logFolderLabelState(FromState fromState, ToState toState) {
-        mLauncher.getUserEventDispatcher()
-                .logLauncherEvent(mInfo.getFolderLabelStateLauncherEvent(fromState, toState));
-    }
-
     /** Returns the height of the current folder's bottom edge from the bottom of the screen. */
     private int getHeightFromBottom() {
         DragLayer.LayoutParams layoutParams = (DragLayer.LayoutParams) getLayoutParams();
diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java
index 32d061cb42..3296eed5ca 100644
--- a/src/com/android/launcher3/folder/FolderIcon.java
+++ b/src/com/android/launcher3/folder/FolderIcon.java
@@ -478,7 +478,6 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
                 // event is assumed to be folder creation on the server side.
                 .withEditText(newTitle.toString())
                 .log(LAUNCHER_FOLDER_AUTO_LABELED);
-        mFolder.logFolderLabelState(fromState, ToState.TO_SUGGESTION0);
     }
 
 
diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index cd84c96171..effb3a4a0c 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -513,8 +513,7 @@ public class LauncherPreviewRenderer extends ContextThemeWrapper
         }
 
         // Setup search view
-        SearchUiManager searchUiManager =
-                mRootView.findViewById(R.id.search_container_all_apps);
+        SearchUiManager searchUiManager = mRootView.findViewById(R.id.search_container_all_apps);
         mRootView.findViewById(R.id.apps_view).setTranslationY(
                 mDp.heightPx - searchUiManager.getScrollRangeDelta(mInsets));
         ViewGroup searchView = (ViewGroup) searchUiManager;
diff --git a/src/com/android/launcher3/logging/LoggerUtils.java b/src/com/android/launcher3/logging/LoggerUtils.java
deleted file mode 100644
index cd4f034e83..0000000000
--- a/src/com/android/launcher3/logging/LoggerUtils.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.logging;
-
-import android.util.ArrayMap;
-import android.util.SparseArray;
-import android.view.View;
-
-import com.android.launcher3.ButtonDropTarget;
-import com.android.launcher3.LauncherSettings;
-import com.android.launcher3.model.data.AppInfo;
-import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.userevent.nano.LauncherLogExtensions.TargetExtension;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ItemType;
-import com.android.launcher3.userevent.nano.LauncherLogProto.LauncherEvent;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
-import com.android.launcher3.util.InstantAppResolver;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-
-/**
- * Helper methods for logging.
- */
-public class LoggerUtils {
-    private static final ArrayMap<Class, SparseArray<String>> sNameCache = new ArrayMap<>();
-    private static final String UNKNOWN = "UNKNOWN";
-    private static final int DEFAULT_PREDICTED_RANK = 10000;
-    private static final String DELIMITER_DOT = "\\.";
-
-    public static String getFieldName(int value, Class c) {
-        SparseArray<String> cache;
-        synchronized (sNameCache) {
-            cache = sNameCache.get(c);
-            if (cache == null) {
-                cache = new SparseArray<>();
-                for (Field f : c.getDeclaredFields()) {
-                    if (f.getType() == int.class && Modifier.isStatic(f.getModifiers())) {
-                        try {
-                            f.setAccessible(true);
-                            cache.put(f.getInt(null), f.getName());
-                        } catch (IllegalAccessException e) {
-                            // Ignore
-                        }
-                    }
-                }
-                sNameCache.put(c, cache);
-            }
-        }
-        String result = cache.get(value);
-        return result != null ? result : UNKNOWN;
-    }
-
-    public static Target newItemTarget(int itemType) {
-        Target t = newTarget(Target.Type.ITEM);
-        t.itemType = itemType;
-        return t;
-    }
-
-    public static Target newItemTarget(View v, InstantAppResolver instantAppResolver) {
-        return (v != null) && (v.getTag() instanceof ItemInfo)
-                ? newItemTarget((ItemInfo) v.getTag(), instantAppResolver)
-                : newTarget(Target.Type.ITEM);
-    }
-
-    public static Target newItemTarget(ItemInfo info, InstantAppResolver instantAppResolver) {
-        Target t = newTarget(Target.Type.ITEM);
-        switch (info.itemType) {
-            case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION:
-                t.itemType = (instantAppResolver != null && info instanceof AppInfo
-                        && instantAppResolver.isInstantApp(((AppInfo) info)))
-                        ? ItemType.WEB_APP
-                        : ItemType.APP_ICON;
-                t.predictedRank = DEFAULT_PREDICTED_RANK;
-                break;
-            case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT:
-                t.itemType = ItemType.SHORTCUT;
-                t.predictedRank = DEFAULT_PREDICTED_RANK;
-                break;
-            case LauncherSettings.Favorites.ITEM_TYPE_FOLDER:
-                t.itemType = ItemType.FOLDER_ICON;
-                break;
-            case LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET:
-                t.itemType = ItemType.WIDGET;
-                break;
-            case LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT:
-                t.itemType = ItemType.DEEPSHORTCUT;
-                t.predictedRank = DEFAULT_PREDICTED_RANK;
-                break;
-        }
-        return t;
-    }
-
-    public static Target newDropTarget(View v) {
-        if (!(v instanceof ButtonDropTarget)) {
-            return newTarget(Target.Type.CONTAINER);
-        }
-        if (v instanceof ButtonDropTarget) {
-            return ((ButtonDropTarget) v).getDropTargetForLogging();
-        }
-        return newTarget(Target.Type.CONTROL);
-    }
-
-    public static Target newTarget(int targetType, TargetExtension extension) {
-        Target t = new Target();
-        t.type = targetType;
-        t.extension = extension;
-        return t;
-    }
-
-    public static Target newTarget(int targetType) {
-        Target t = new Target();
-        t.type = targetType;
-        return t;
-    }
-
-    public static Target newControlTarget(int controlType) {
-        Target t = newTarget(Target.Type.CONTROL);
-        t.controlType = controlType;
-        return t;
-    }
-
-    public static Target newContainerTarget(int containerType) {
-        Target t = newTarget(Target.Type.CONTAINER);
-        t.containerType = containerType;
-        return t;
-    }
-
-    public static Action newAction(int type) {
-        Action a = new Action();
-        a.type = type;
-        return a;
-    }
-
-    public static Action newCommandAction(int command) {
-        Action a = newAction(Action.Type.COMMAND);
-        a.command = command;
-        return a;
-    }
-
-    public static Action newTouchAction(int touch) {
-        Action a = newAction(Action.Type.TOUCH);
-        a.touch = touch;
-        return a;
-    }
-
-    public static LauncherEvent newLauncherEvent(Action action, Target... srcTargets) {
-        LauncherEvent event = new LauncherEvent();
-        event.srcTarget = srcTargets;
-        event.action = action;
-        return event;
-    }
-
-    /**
-     * Creates LauncherEvent using Action and ArrayList of Targets
-     */
-    public static LauncherEvent newLauncherEvent(Action action, ArrayList<Target> targets) {
-        Target[] targetsArray = new Target[targets.size()];
-        targets.toArray(targetsArray);
-        return newLauncherEvent(action, targetsArray);
-    }
-
-    /**
-     * String conversion for only the helpful parts of {@link Object#toString()} method
-     * @param stringToExtract "foo.bar.baz.MyObject@1234"
-     * @return "MyObject@1234"
-     */
-    public static String extractObjectNameAndAddress(String stringToExtract) {
-        String[] superStringParts = stringToExtract.split(DELIMITER_DOT);
-        if (superStringParts.length == 0) {
-            return "";
-        }
-        return superStringParts[superStringParts.length - 1];
-    }
-}
diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index ec1c3ef779..2c5bf320ad 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -27,7 +27,6 @@ import com.android.launcher3.logger.LauncherAtom.ContainerInfo;
 import com.android.launcher3.logger.LauncherAtom.FromState;
 import com.android.launcher3.logger.LauncherAtom.ToState;
 import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.userevent.LauncherLogProto;
 import com.android.launcher3.util.ResourceBasedOverride;
 
 import java.util.List;
@@ -51,40 +50,22 @@ public class StatsLogManager implements ResourceBasedOverride {
     public static final int LAUNCHER_STATE_UNCHANGED = 5;
 
     /**
-     * Returns proper launcher state enum for {@link StatsLogManager}(to be removed during
-     * UserEventDispatcher cleanup)
-     */
-    public static int containerTypeToAtomState(int containerType) {
-        switch (containerType) {
-            case LauncherLogProto.ContainerType.ALLAPPS_VALUE:
-                return LAUNCHER_STATE_ALLAPPS;
-            case LauncherLogProto.ContainerType.OVERVIEW_VALUE:
-                return LAUNCHER_STATE_OVERVIEW;
-            case LauncherLogProto.ContainerType.WORKSPACE_VALUE:
-                return LAUNCHER_STATE_HOME;
-            case LauncherLogProto.ContainerType.APP_VALUE:
-                return LAUNCHER_STATE_BACKGROUND;
-        }
-        return LAUNCHER_STATE_UNSPECIFIED;
-    }
-
-    /**
-     * Returns event enum based on the two {@link ContainerType} transition information when swipe
+     * Returns event enum based on the two state transition information when swipe
      * gesture happens(to be removed during UserEventDispatcher cleanup).
      */
-    public static EventEnum getLauncherAtomEvent(int startContainerType,
-            int targetContainerType, EventEnum fallbackEvent) {
-        if (startContainerType == LauncherLogProto.ContainerType.WORKSPACE.getNumber()
-                && targetContainerType == LauncherLogProto.ContainerType.WORKSPACE.getNumber()) {
+    public static EventEnum getLauncherAtomEvent(int startState,
+            int targetState, EventEnum fallbackEvent) {
+        if (startState == LAUNCHER_STATE_HOME
+                && targetState == LAUNCHER_STATE_HOME) {
             return LAUNCHER_HOME_GESTURE;
-        } else if (startContainerType != LauncherLogProto.ContainerType.TASKSWITCHER.getNumber()
-                && targetContainerType == LauncherLogProto.ContainerType.TASKSWITCHER.getNumber()) {
+        } else if (startState != LAUNCHER_STATE_OVERVIEW
+                && targetState == LAUNCHER_STATE_OVERVIEW) {
             return LAUNCHER_OVERVIEW_GESTURE;
-        } else if (startContainerType != LauncherLogProto.ContainerType.ALLAPPS.getNumber()
-                && targetContainerType == LauncherLogProto.ContainerType.ALLAPPS.getNumber()) {
+        } else if (startState != LAUNCHER_STATE_ALLAPPS
+                && targetState == LAUNCHER_STATE_ALLAPPS) {
             return LAUNCHER_ALLAPPS_OPEN_UP;
-        } else if (startContainerType == LauncherLogProto.ContainerType.ALLAPPS.getNumber()
-                && targetContainerType != LauncherLogProto.ContainerType.ALLAPPS.getNumber()) {
+        } else if (startState == LAUNCHER_STATE_ALLAPPS
+                && targetState != LAUNCHER_STATE_ALLAPPS) {
             return LAUNCHER_ALLAPPS_CLOSE_DOWN;
         }
         return fallbackEvent; // TODO fix
@@ -322,7 +303,38 @@ public class StatsLogManager implements ResourceBasedOverride {
         LAUNCHER_FOLDER_CONVERTED_TO_ICON(628),
 
         @UiEvent(doc = "A hotseat prediction item was pinned")
-        LAUNCHER_HOTSEAT_PREDICTION_PINNED(629);
+        LAUNCHER_HOTSEAT_PREDICTION_PINNED(629),
+
+        @UiEvent(doc = "Activity to add external item was started")
+        LAUNCHER_ADD_EXTERNAL_ITEM_START(641),
+
+        @UiEvent(doc = "Activity to add external item was cancelled")
+        LAUNCHER_ADD_EXTERNAL_ITEM_CANCELLED(642),
+
+        @UiEvent(doc = "Activity to add external item was backed out")
+        LAUNCHER_ADD_EXTERNAL_ITEM_BACK(643),
+
+        @UiEvent(doc = "Item was placed automatically in external item addition flow")
+        LAUNCHER_ADD_EXTERNAL_ITEM_PLACED_AUTOMATICALLY(644),
+
+        @UiEvent(doc = "Item was dragged in external item addition flow")
+        LAUNCHER_ADD_EXTERNAL_ITEM_DRAGGED(645),
+
+        @UiEvent(doc = "Undo event was tapped.")
+        LAUNCHER_UNDO(648),
+
+        @UiEvent(doc = "Task switcher clear all target was tapped.")
+        LAUNCHER_TASK_CLEAR_ALL(649),
+
+        @UiEvent(doc = "Task preview was long pressed.")
+        LAUNCHER_TASK_PREVIEW_LONGPRESS(650),
+
+        @UiEvent(doc = "User swiped down on workspace (triggering noti shade to open).")
+        LAUNCHER_SWIPE_DOWN_WORKSPACE_NOTISHADE_OPEN(651),
+
+        @UiEvent(doc = "Notification dismissed by swiping right.")
+        LAUNCHER_NOTIFICATION_DISMISSED(652),
+        ;
 
         // ADD MORE
 
diff --git a/src/com/android/launcher3/logging/StatsLogUtils.java b/src/com/android/launcher3/logging/StatsLogUtils.java
deleted file mode 100644
index a5cc7ea305..0000000000
--- a/src/com/android/launcher3/logging/StatsLogUtils.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.android.launcher3.logging;
-
-import android.view.View;
-import android.view.ViewParent;
-
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
-
-import java.util.ArrayList;
-
-public class StatsLogUtils {
-    private final static int MAXIMUM_VIEW_HIERARCHY_LEVEL = 5;
-
-    /**
-     * Implemented by containers to provide a container source for a given child.
-     */
-    public interface LogContainerProvider {
-
-        /**
-         * Populates parent container targets for an item
-         */
-        void fillInLogContainerData(ItemInfo childInfo, Target child, ArrayList<Target> parents);
-    }
-
-    /**
-     * Recursively finds the parent of the given child which implements IconLogInfoProvider
-     */
-    public static LogContainerProvider getLaunchProviderRecursive(@Nullable View v) {
-        ViewParent parent;
-        if (v != null) {
-            parent = v.getParent();
-        } else {
-            return null;
-        }
-
-        // Optimization to only check up to 5 parents.
-        int count = MAXIMUM_VIEW_HIERARCHY_LEVEL;
-        while (parent != null && count-- > 0) {
-            if (parent instanceof LogContainerProvider) {
-                return (LogContainerProvider) parent;
-            } else {
-                parent = parent.getParent();
-            }
-        }
-        return null;
-    }
-}
diff --git a/src/com/android/launcher3/logging/UserEventDispatcher.java b/src/com/android/launcher3/logging/UserEventDispatcher.java
deleted file mode 100644
index a40cc263db..0000000000
--- a/src/com/android/launcher3/logging/UserEventDispatcher.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.logging;
-
-import static com.android.launcher3.logging.LoggerUtils.newAction;
-import static com.android.launcher3.logging.LoggerUtils.newCommandAction;
-import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
-import static com.android.launcher3.logging.LoggerUtils.newDropTarget;
-import static com.android.launcher3.logging.LoggerUtils.newItemTarget;
-import static com.android.launcher3.logging.LoggerUtils.newLauncherEvent;
-import static com.android.launcher3.logging.LoggerUtils.newTarget;
-import static com.android.launcher3.logging.LoggerUtils.newTouchAction;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.ItemType;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.TipType;
-
-import static java.util.Optional.ofNullable;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.SystemClock;
-import android.util.Log;
-import android.view.View;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.DropTarget;
-import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
-import com.android.launcher3.logging.StatsLogUtils.LogContainerProvider;
-import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.userevent.LauncherLogProto;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action;
-import com.android.launcher3.userevent.nano.LauncherLogProto.LauncherEvent;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
-import com.android.launcher3.util.InstantAppResolver;
-import com.android.launcher3.util.LogConfig;
-import com.android.launcher3.util.ResourceBasedOverride;
-
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.nano.InvalidProtocolBufferNanoException;
-import com.google.protobuf.nano.MessageNano;
-
-import java.util.ArrayList;
-import java.util.UUID;
-
-/**
- * Manages the creation of {@link LauncherEvent}.
- * To debug this class, execute following command before side loading a new apk.
- * <p>
- * $ adb shell setprop log.tag.UserEvent VERBOSE
- */
-public class UserEventDispatcher implements ResourceBasedOverride {
-
-    private static final String TAG = "UserEvent";
-    private static final boolean IS_VERBOSE = Utilities.isPropertyEnabled(LogConfig.USEREVENT);
-    private static final String UUID_STORAGE = "uuid";
-
-    /**
-     * A factory method for UserEventDispatcher
-     */
-    public static UserEventDispatcher newInstance(Context context) {
-        SharedPreferences sharedPrefs = Utilities.getDevicePrefs(context);
-        String uuidStr = sharedPrefs.getString(UUID_STORAGE, null);
-        if (uuidStr == null) {
-            uuidStr = UUID.randomUUID().toString();
-            sharedPrefs.edit().putString(UUID_STORAGE, uuidStr).apply();
-        }
-        UserEventDispatcher ued = Overrides.getObject(UserEventDispatcher.class,
-                context.getApplicationContext(), R.string.user_event_dispatcher_class);
-        ued.mUuidStr = uuidStr;
-        ued.mInstantAppResolver = InstantAppResolver.newInstance(context);
-        return ued;
-    }
-
-
-    /**
-     * Fills in the container data on the given event if the given view is not null.
-     *
-     * @return whether container data was added.
-     */
-    private boolean fillLogContainer(@Nullable View v, Target child,
-            @Nullable ArrayList<Target> targets) {
-        LogContainerProvider firstParent = StatsLogUtils.getLaunchProviderRecursive(v);
-        if (v == null || !(v.getTag() instanceof ItemInfo) || firstParent == null) {
-            return false;
-        }
-        final ItemInfo itemInfo = (ItemInfo) v.getTag();
-        firstParent.fillInLogContainerData(itemInfo, child, targets);
-        return true;
-    }
-
-    protected void onFillInLogContainerData(@NonNull ItemInfo itemInfo, @NonNull Target target,
-            @NonNull ArrayList<Target> targets) {
-    }
-
-    private boolean mSessionStarted;
-    private long mElapsedContainerMillis;
-    private long mElapsedSessionMillis;
-    private long mActionDurationMillis;
-    private String mUuidStr;
-    protected InstantAppResolver mInstantAppResolver;
-    private boolean mAppOrTaskLaunch;
-    private boolean mPreviousHomeGesture;
-
-    private void fillComponentInfo(Target target, ComponentName cn) {
-        if (cn != null) {
-            target.packageNameHash = (mUuidStr + cn.getPackageName()).hashCode();
-            target.componentHash = (mUuidStr + cn.flattenToString()).hashCode();
-        }
-    }
-
-    public void logActionCommand(int command, int srcContainerType, int dstContainerType) {
-        logActionCommand(command, newContainerTarget(srcContainerType),
-                dstContainerType >= 0 ? newContainerTarget(dstContainerType) : null);
-    }
-
-    public void logActionCommand(int command, int srcContainerType, int dstContainerType,
-            int pageIndex) {
-        Target srcTarget = newContainerTarget(srcContainerType);
-        srcTarget.pageIndex = pageIndex;
-        logActionCommand(command, srcTarget,
-                dstContainerType >= 0 ? newContainerTarget(dstContainerType) : null);
-    }
-
-    public void logActionCommand(int command, Target srcTarget, Target dstTarget) {
-        LauncherEvent event = newLauncherEvent(newCommandAction(command), srcTarget);
-        if (command == Action.Command.STOP) {
-            if (mAppOrTaskLaunch || !mSessionStarted) {
-                mSessionStarted = false;
-                return;
-            }
-        }
-
-        if (dstTarget != null) {
-            event.destTarget = new Target[1];
-            event.destTarget[0] = dstTarget;
-            event.action.isStateChange = true;
-        }
-        dispatchUserEvent(event, null);
-    }
-
-    public void logActionOnControl(int action, int controlType) {
-        logActionOnControl(action, controlType, null);
-    }
-
-    public void logActionOnControl(int action, int controlType, int parentContainerType) {
-        logActionOnControl(action, controlType, null, parentContainerType);
-    }
-
-    /**
-     * Logs control action with proper parent hierarchy
-     */
-    public void logActionOnControl(int actionType, int controlType,
-            @Nullable View controlInContainer, int... parentTypes) {
-        Target control = newTarget(Target.Type.CONTROL);
-        control.controlType = controlType;
-        Action action = newAction(actionType);
-
-        ArrayList<Target> targets = makeTargetsList(control);
-        if (controlInContainer != null) {
-            fillLogContainer(controlInContainer, control, targets);
-        }
-        for (int parentContainerType : parentTypes) {
-            if (parentContainerType < 0) continue;
-            targets.add(newContainerTarget(parentContainerType));
-        }
-        LauncherEvent event = newLauncherEvent(action, targets);
-        if (actionType == Action.Touch.DRAGDROP) {
-            event.actionDurationMillis = SystemClock.uptimeMillis() - mActionDurationMillis;
-        }
-        dispatchUserEvent(event, null);
-    }
-
-    public void logActionTapOutside(Target target) {
-        LauncherEvent event = newLauncherEvent(newTouchAction(Action.Type.TOUCH),
-                target);
-        event.action.isOutside = true;
-        dispatchUserEvent(event, null);
-    }
-
-    public void logActionBounceTip(int containerType) {
-        LauncherEvent event = newLauncherEvent(newAction(Action.Type.TIP),
-                newContainerTarget(containerType));
-        event.srcTarget[0].tipType = TipType.BOUNCE;
-        dispatchUserEvent(event, null);
-    }
-
-    public void logActionOnContainer(int action, int dir, int containerType) {
-        logActionOnContainer(action, dir, containerType, 0);
-    }
-
-    public void logActionOnContainer(int action, int dir, int containerType, int pageIndex) {
-        LauncherEvent event = newLauncherEvent(newTouchAction(action),
-                newContainerTarget(containerType));
-        event.action.dir = dir;
-        event.srcTarget[0].pageIndex = pageIndex;
-        dispatchUserEvent(event, null);
-    }
-
-    /**
-     * Used primarily for swipe up and down when state changes when swipe up happens from the
-     * navbar bezel, the {@param srcChildContainerType} is NAVBAR and
-     * {@param srcParentContainerType} is either one of the two
-     * (1) WORKSPACE: if the launcher is the foreground activity
-     * (2) APP: if another app was the foreground activity
-     */
-    public void logStateChangeAction(int action, int dir, int downX, int downY,
-            int srcChildTargetType, int srcParentContainerType, int dstContainerType,
-            int pageIndex) {
-        LauncherEvent event;
-        if (srcChildTargetType == ItemType.TASK) {
-            event = newLauncherEvent(newTouchAction(action),
-                    newItemTarget(srcChildTargetType),
-                    newContainerTarget(srcParentContainerType));
-        } else {
-            event = newLauncherEvent(newTouchAction(action),
-                    newContainerTarget(srcChildTargetType),
-                    newContainerTarget(srcParentContainerType));
-        }
-        event.destTarget = new Target[1];
-        event.destTarget[0] = newContainerTarget(dstContainerType);
-        event.action.dir = dir;
-        event.action.isStateChange = true;
-        event.srcTarget[0].pageIndex = pageIndex;
-        event.srcTarget[0].spanX = downX;
-        event.srcTarget[0].spanY = downY;
-        dispatchUserEvent(event, null);
-    }
-
-    public void logActionOnItem(int action, int dir, int itemType) {
-        logActionOnItem(action, dir, itemType, null, null);
-    }
-
-    /**
-     * Creates new {@link LauncherEvent} of ITEM target type with input arguments and dispatches it.
-     *
-     * @param touchAction ENUM value of {@link LauncherLogProto.Action.Touch} Action
-     * @param dir         ENUM value of {@link LauncherLogProto.Action.Direction} Action
-     * @param itemType    ENUM value of {@link LauncherLogProto.ItemType}
-     * @param gridX       Nullable X coordinate of item's position on the workspace grid
-     * @param gridY       Nullable Y coordinate of item's position on the workspace grid
-     */
-    public void logActionOnItem(int touchAction, int dir, int itemType,
-            @Nullable Integer gridX, @Nullable Integer gridY) {
-        Target itemTarget = newTarget(Target.Type.ITEM);
-        itemTarget.itemType = itemType;
-        ofNullable(gridX).ifPresent(value -> itemTarget.gridX = value);
-        ofNullable(gridY).ifPresent(value -> itemTarget.gridY = value);
-        LauncherEvent event = newLauncherEvent(newTouchAction(touchAction), itemTarget);
-        event.action.dir = dir;
-        dispatchUserEvent(event, null);
-    }
-
-    /**
-     * Logs proto lite version of LauncherEvent object to clearcut.
-     */
-    public void logLauncherEvent(
-            com.android.launcher3.userevent.LauncherLogProto.LauncherEvent launcherEvent) {
-
-        if (mPreviousHomeGesture) {
-            mPreviousHomeGesture = false;
-        }
-        mAppOrTaskLaunch = false;
-        launcherEvent.toBuilder()
-                .setElapsedContainerMillis(SystemClock.uptimeMillis() - mElapsedContainerMillis)
-                .setElapsedSessionMillis(
-                        SystemClock.uptimeMillis() - mElapsedSessionMillis).build();
-        try {
-            dispatchUserEvent(LauncherEvent.parseFrom(launcherEvent.toByteArray()), null);
-        } catch (InvalidProtocolBufferNanoException e) {
-            throw new RuntimeException("Cannot convert LauncherEvent from Lite to Nano version.");
-        }
-    }
-
-    public void logDeepShortcutsOpen(View icon) {
-        ItemInfo info = (ItemInfo) icon.getTag();
-        Target child = newItemTarget(info, mInstantAppResolver);
-        ArrayList<Target> targets = makeTargetsList(child);
-        fillLogContainer(icon, child, targets);
-        dispatchUserEvent(newLauncherEvent(newTouchAction(Action.Touch.TAP), targets), null);
-    }
-
-    public void logDragNDrop(DropTarget.DragObject dragObj, View dropTargetAsView) {
-        Target srcChild = newItemTarget(dragObj.originalDragInfo, mInstantAppResolver);
-        ArrayList<Target> srcTargets = makeTargetsList(srcChild);
-
-
-        Target destChild = newItemTarget(dragObj.originalDragInfo, mInstantAppResolver);
-        ArrayList<Target> destTargets = makeTargetsList(destChild);
-
-        //dragObj.dragSource.fillInLogContainerData(dragObj.originalDragInfo, srcChild, srcTargets);
-        if (dropTargetAsView instanceof LogContainerProvider) {
-            ((LogContainerProvider) dropTargetAsView).fillInLogContainerData(dragObj.dragInfo,
-                    destChild, destTargets);
-        }
-        else {
-            destTargets.add(newDropTarget(dropTargetAsView));
-        }
-        LauncherEvent event = newLauncherEvent(newTouchAction(Action.Touch.DRAGDROP), srcTargets);
-        Target[] destTargetsArray = new Target[destTargets.size()];
-        destTargets.toArray(destTargetsArray);
-        event.destTarget = destTargetsArray;
-
-        event.actionDurationMillis = SystemClock.uptimeMillis() - mActionDurationMillis;
-        dispatchUserEvent(event, null);
-    }
-
-    public final void startSession() {
-        mSessionStarted = true;
-        mElapsedSessionMillis = SystemClock.uptimeMillis();
-        mElapsedContainerMillis = SystemClock.uptimeMillis();
-    }
-
-    public final void setPreviousHomeGesture(boolean homeGesture) {
-        mPreviousHomeGesture = homeGesture;
-    }
-
-    public final boolean isPreviousHomeGesture() {
-        return mPreviousHomeGesture;
-    }
-
-    public final void resetActionDurationMillis() {
-        mActionDurationMillis = SystemClock.uptimeMillis();
-    }
-
-    public void dispatchUserEvent(LauncherEvent ev, Intent intent) {
-        if (mPreviousHomeGesture) {
-            mPreviousHomeGesture = false;
-        }
-        mAppOrTaskLaunch = false;
-        ev.elapsedContainerMillis = SystemClock.uptimeMillis() - mElapsedContainerMillis;
-        ev.elapsedSessionMillis = SystemClock.uptimeMillis() - mElapsedSessionMillis;
-        if (!IS_VERBOSE) {
-            return;
-        }
-        LauncherLogProto.LauncherEvent liteLauncherEvent;
-        try {
-            liteLauncherEvent =
-                    LauncherLogProto.LauncherEvent.parseFrom(MessageNano.toByteArray(ev));
-        } catch (InvalidProtocolBufferException e) {
-            throw new RuntimeException("Cannot parse LauncherEvent from Nano to Lite version");
-        }
-        Log.d(TAG, liteLauncherEvent.toString());
-    }
-
-    /**
-     * Constructs an ArrayList with targets
-     */
-    public static ArrayList<Target> makeTargetsList(Target... targets) {
-        ArrayList<Target> result = new ArrayList<>();
-        for (Target target : targets) {
-            result.add(target);
-        }
-        return result;
-    }
-}
diff --git a/src/com/android/launcher3/model/data/FolderInfo.java b/src/com/android/launcher3/model/data/FolderInfo.java
index 41ccbd7054..06a2c92dab 100644
--- a/src/com/android/launcher3/model/data/FolderInfo.java
+++ b/src/com/android/launcher3/model/data/FolderInfo.java
@@ -20,15 +20,9 @@ import static android.text.TextUtils.isEmpty;
 
 import static androidx.core.util.Preconditions.checkNotNull;
 
-import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_DESKTOP;
-import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT;
 import static com.android.launcher3.logger.LauncherAtom.Attribute.EMPTY_LABEL;
 import static com.android.launcher3.logger.LauncherAtom.Attribute.MANUAL_LABEL;
 import static com.android.launcher3.logger.LauncherAtom.Attribute.SUGGESTED_LABEL;
-import static com.android.launcher3.userevent.LauncherLogProto.Target.FromFolderLabelState.FROM_CUSTOM;
-import static com.android.launcher3.userevent.LauncherLogProto.Target.FromFolderLabelState.FROM_EMPTY;
-import static com.android.launcher3.userevent.LauncherLogProto.Target.FromFolderLabelState.FROM_FOLDER_LABEL_STATE_UNSPECIFIED;
-import static com.android.launcher3.userevent.LauncherLogProto.Target.FromFolderLabelState.FROM_SUGGESTED;
 
 import android.os.Process;
 
@@ -43,10 +37,6 @@ import com.android.launcher3.logger.LauncherAtom.Attribute;
 import com.android.launcher3.logger.LauncherAtom.FromState;
 import com.android.launcher3.logger.LauncherAtom.ToState;
 import com.android.launcher3.model.ModelWriter;
-import com.android.launcher3.userevent.LauncherLogProto;
-import com.android.launcher3.userevent.LauncherLogProto.Target;
-import com.android.launcher3.userevent.LauncherLogProto.Target.FromFolderLabelState;
-import com.android.launcher3.userevent.LauncherLogProto.Target.ToFolderLabelState;
 import com.android.launcher3.util.ContentWriter;
 
 import java.util.ArrayList;
@@ -359,113 +349,4 @@ public class FolderInfo extends ItemInfo {
         }
         return LauncherAtom.ToState.TO_STATE_UNSPECIFIED;
     }
-
-    /**
-     * Returns {@link LauncherLogProto.LauncherEvent} to log current folder label info.
-     *
-     * @deprecated This method is used only for validation purpose and soon will be removed.
-     */
-    @Deprecated
-    public LauncherLogProto.LauncherEvent getFolderLabelStateLauncherEvent(FromState fromState,
-            ToState toState) {
-        return LauncherLogProto.LauncherEvent.newBuilder()
-                .setAction(LauncherLogProto.Action
-                        .newBuilder()
-                        .setType(LauncherLogProto.Action.Type.SOFT_KEYBOARD))
-                .addSrcTarget(Target
-                        .newBuilder()
-                        .setType(Target.Type.ITEM)
-                        .setItemType(LauncherLogProto.ItemType.EDITTEXT)
-                        .setFromFolderLabelState(convertFolderLabelState(fromState))
-                        .setToFolderLabelState(convertFolderLabelState(toState)))
-                .addSrcTarget(Target.newBuilder()
-                        .setType(Target.Type.CONTAINER)
-                        .setContainerType(LauncherLogProto.ContainerType.FOLDER)
-                        .setPageIndex(screenId)
-                        .setGridX(cellX)
-                        .setGridY(cellY)
-                        .setCardinality(contents.size()))
-                .addSrcTarget(newParentContainerTarget())
-                .build();
-    }
-
-    /**
-     * @deprecated This method is used only for validation purpose and soon will be removed.
-     */
-    @Deprecated
-    private Target.Builder newParentContainerTarget() {
-        Target.Builder builder = Target.newBuilder().setType(Target.Type.CONTAINER);
-        switch (container) {
-            case CONTAINER_HOTSEAT:
-                return builder.setContainerType(LauncherLogProto.ContainerType.HOTSEAT);
-            case CONTAINER_DESKTOP:
-                return builder.setContainerType(LauncherLogProto.ContainerType.WORKSPACE);
-            default:
-                throw new AssertionError(String
-                        .format("Expected container to be either %s or %s but found %s.",
-                                CONTAINER_HOTSEAT,
-                                CONTAINER_DESKTOP,
-                                container));
-        }
-    }
-
-    /**
-     * @deprecated This method is used only for validation purpose and soon will be removed.
-     */
-    @Deprecated
-    private static FromFolderLabelState convertFolderLabelState(FromState fromState) {
-        switch (fromState) {
-            case FROM_EMPTY:
-                return FROM_EMPTY;
-            case FROM_SUGGESTED:
-                return FROM_SUGGESTED;
-            case FROM_CUSTOM:
-                return FROM_CUSTOM;
-            default:
-                return FROM_FOLDER_LABEL_STATE_UNSPECIFIED;
-        }
-    }
-
-    /**
-     * @deprecated This method is used only for validation purpose and soon will be removed.
-     */
-    @Deprecated
-    private static ToFolderLabelState convertFolderLabelState(ToState toState) {
-        switch (toState) {
-            case UNCHANGED:
-                return ToFolderLabelState.UNCHANGED;
-            case TO_SUGGESTION0:
-                return ToFolderLabelState.TO_SUGGESTION0_WITH_VALID_PRIMARY;
-            case TO_SUGGESTION1_WITH_VALID_PRIMARY:
-                return ToFolderLabelState.TO_SUGGESTION1_WITH_VALID_PRIMARY;
-            case TO_SUGGESTION1_WITH_EMPTY_PRIMARY:
-                return ToFolderLabelState.TO_SUGGESTION1_WITH_EMPTY_PRIMARY;
-            case TO_SUGGESTION2_WITH_VALID_PRIMARY:
-                return ToFolderLabelState.TO_SUGGESTION2_WITH_VALID_PRIMARY;
-            case TO_SUGGESTION2_WITH_EMPTY_PRIMARY:
-                return ToFolderLabelState.TO_SUGGESTION2_WITH_EMPTY_PRIMARY;
-            case TO_SUGGESTION3_WITH_VALID_PRIMARY:
-                return ToFolderLabelState.TO_SUGGESTION3_WITH_VALID_PRIMARY;
-            case TO_SUGGESTION3_WITH_EMPTY_PRIMARY:
-                return ToFolderLabelState.TO_SUGGESTION3_WITH_EMPTY_PRIMARY;
-            case TO_EMPTY_WITH_VALID_PRIMARY:
-                return ToFolderLabelState.TO_EMPTY_WITH_VALID_PRIMARY;
-            case TO_EMPTY_WITH_VALID_SUGGESTIONS_AND_EMPTY_PRIMARY:
-                return ToFolderLabelState.TO_EMPTY_WITH_VALID_SUGGESTIONS_AND_EMPTY_PRIMARY;
-            case TO_EMPTY_WITH_EMPTY_SUGGESTIONS:
-                return ToFolderLabelState.TO_EMPTY_WITH_EMPTY_SUGGESTIONS;
-            case TO_EMPTY_WITH_SUGGESTIONS_DISABLED:
-                return ToFolderLabelState.TO_EMPTY_WITH_SUGGESTIONS_DISABLED;
-            case TO_CUSTOM_WITH_VALID_PRIMARY:
-                return ToFolderLabelState.TO_CUSTOM_WITH_VALID_PRIMARY;
-            case TO_CUSTOM_WITH_VALID_SUGGESTIONS_AND_EMPTY_PRIMARY:
-                return ToFolderLabelState.TO_CUSTOM_WITH_VALID_SUGGESTIONS_AND_EMPTY_PRIMARY;
-            case TO_CUSTOM_WITH_EMPTY_SUGGESTIONS:
-                return ToFolderLabelState.TO_CUSTOM_WITH_EMPTY_SUGGESTIONS;
-            case TO_CUSTOM_WITH_SUGGESTIONS_DISABLED:
-                return ToFolderLabelState.TO_CUSTOM_WITH_SUGGESTIONS_DISABLED;
-            default:
-                return ToFolderLabelState.TO_FOLDER_LABEL_STATE_UNSPECIFIED;
-        }
-    }
 }
diff --git a/src/com/android/launcher3/model/data/RemoteActionItemInfo.java b/src/com/android/launcher3/model/data/RemoteActionItemInfo.java
new file mode 100644
index 0000000000..81f7f3a0a2
--- /dev/null
+++ b/src/com/android/launcher3/model/data/RemoteActionItemInfo.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.model.data;
+
+import android.app.RemoteAction;
+import android.os.Process;
+
+/**
+ * Represents a launchable {@link RemoteAction}
+ */
+public class RemoteActionItemInfo extends ItemInfoWithIcon {
+
+    private final RemoteAction mRemoteAction;
+    private final String mToken;
+    private final boolean mShouldStart;
+
+    public RemoteActionItemInfo(RemoteAction remoteAction, String token, boolean shouldStart) {
+        mShouldStart = shouldStart;
+        mToken = token;
+        mRemoteAction = remoteAction;
+        title = remoteAction.getTitle();
+        user = Process.myUserHandle();
+    }
+
+    public RemoteActionItemInfo(RemoteActionItemInfo info) {
+        super(info);
+        this.mShouldStart = info.mShouldStart;
+        this.mRemoteAction = info.mRemoteAction;
+        this.mToken = info.mToken;
+    }
+
+    @Override
+    public ItemInfoWithIcon clone() {
+        return new RemoteActionItemInfo(this);
+    }
+
+    public RemoteAction getRemoteAction() {
+        return mRemoteAction;
+    }
+
+    public String getToken() {
+        return mToken;
+    }
+
+    /**
+     * Getter method for mShouldStart
+     */
+    public boolean shouldStartInLauncher() {
+        return mShouldStart;
+    }
+}
diff --git a/src/com/android/launcher3/notification/NotificationMainView.java b/src/com/android/launcher3/notification/NotificationMainView.java
index 32f060ba85..9b065233b9 100644
--- a/src/com/android/launcher3/notification/NotificationMainView.java
+++ b/src/com/android/launcher3/notification/NotificationMainView.java
@@ -17,6 +17,7 @@
 package com.android.launcher3.notification;
 
 import static com.android.launcher3.anim.Interpolators.scrollInterpolatorForVelocity;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_NOTIFICATION_DISMISSED;
 
 import android.animation.Animator;
 import android.animation.ObjectAnimator;
@@ -41,7 +42,6 @@ import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.touch.BaseSwipeDetector;
 import com.android.launcher3.touch.OverScroll;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.launcher3.util.Themes;
 
 /**
@@ -168,10 +168,7 @@ public class NotificationMainView extends FrameLayout implements SingleAxisSwipe
         Launcher launcher = Launcher.getLauncher(getContext());
         launcher.getPopupDataProvider().cancelNotification(
                 mNotificationInfo.notificationKey);
-        launcher.getUserEventDispatcher().logActionOnItem(
-                LauncherLogProto.Action.Touch.SWIPE,
-                LauncherLogProto.Action.Direction.RIGHT, // Assume all swipes are right for logging.
-                LauncherLogProto.ItemType.NOTIFICATION);
+        launcher.getStatsLogManager().logger().log(LAUNCHER_NOTIFICATION_DISMISSED);
     }
 
     // SingleAxisSwipeDetector.Listener's
diff --git a/src/com/android/launcher3/pm/InstallSessionHelper.java b/src/com/android/launcher3/pm/InstallSessionHelper.java
index 753a6dd85e..fa25114d49 100644
--- a/src/com/android/launcher3/pm/InstallSessionHelper.java
+++ b/src/com/android/launcher3/pm/InstallSessionHelper.java
@@ -17,6 +17,7 @@
 package com.android.launcher3.pm;
 
 import static com.android.launcher3.Utilities.getPrefs;
+import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
@@ -31,6 +32,7 @@ import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
+import androidx.annotation.WorkerThread;
 
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.SessionCommitReceiver;
@@ -39,10 +41,10 @@ import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.ItemInstallQueue;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.IntSet;
-import com.android.launcher3.util.LooperExecutor;
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.launcher3.util.PackageUserKey;
+import com.android.launcher3.util.Preconditions;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -65,27 +67,27 @@ public class InstallSessionHelper {
 
     private final LauncherApps mLauncherApps;
     private final Context mAppContext;
-    private final IntSet mPromiseIconIds;
 
     private final PackageInstaller mInstaller;
     private final HashMap<String, Boolean> mSessionVerifiedMap = new HashMap<>();
 
+    private IntSet mPromiseIconIds;
+
     public InstallSessionHelper(Context context) {
         mInstaller = context.getPackageManager().getPackageInstaller();
         mAppContext = context.getApplicationContext();
         mLauncherApps = context.getSystemService(LauncherApps.class);
-
-        mPromiseIconIds = IntSet.wrap(IntArray.fromConcatString(
-                getPrefs(context).getString(PROMISE_ICON_IDS, "")));
-
-        cleanUpPromiseIconIds();
     }
 
-    public static UserHandle getUserHandle(SessionInfo info) {
-        return Utilities.ATLEAST_Q ? info.getUser() : Process.myUserHandle();
-    }
+    @WorkerThread
+    private IntSet getPromiseIconIds() {
+        Preconditions.assertWorkerThread();
+        if (mPromiseIconIds != null) {
+            return mPromiseIconIds;
+        }
+        mPromiseIconIds = IntSet.wrap(IntArray.fromConcatString(
+                getPrefs(mAppContext).getString(PROMISE_ICON_IDS, "")));
 
-    protected void cleanUpPromiseIconIds() {
         IntArray existingIds = new IntArray();
         for (SessionInfo info : getActiveSessions().values()) {
             existingIds.add(info.getSessionId());
@@ -100,6 +102,7 @@ public class InstallSessionHelper {
         for (int i = idsToRemove.size() - 1; i >= 0; --i) {
             mPromiseIconIds.getArray().removeValue(idsToRemove.get(i));
         }
+        return mPromiseIconIds;
     }
 
     public HashMap<PackageUserKey, SessionInfo> getActiveSessions() {
@@ -126,7 +129,7 @@ public class InstallSessionHelper {
 
     private void updatePromiseIconPrefs() {
         getPrefs(mAppContext).edit()
-                .putString(PROMISE_ICON_IDS, mPromiseIconIds.getArray().toConcatString())
+                .putString(PROMISE_ICON_IDS, getPromiseIconIds().getArray().toConcatString())
                 .apply();
     }
 
@@ -184,13 +187,15 @@ public class InstallSessionHelper {
         return info.getInstallReason() == PackageManager.INSTALL_REASON_DEVICE_RESTORE;
     }
 
+    @WorkerThread
     public boolean promiseIconAddedForId(int sessionId) {
-        return mPromiseIconIds.contains(sessionId);
+        return getPromiseIconIds().contains(sessionId);
     }
 
+    @WorkerThread
     public void removePromiseIconId(int sessionId) {
-        if (mPromiseIconIds.contains(sessionId)) {
-            mPromiseIconIds.getArray().removeValue(sessionId);
+        if (promiseIconAddedForId(sessionId)) {
+            getPromiseIconIds().getArray().removeValue(sessionId);
             updatePromiseIconPrefs();
         }
     }
@@ -203,6 +208,7 @@ public class InstallSessionHelper {
      * - The app is not already installed
      * - A promise icon for the session has not already been created
      */
+    @WorkerThread
     void tryQueuePromiseAppIcon(PackageInstaller.SessionInfo sessionInfo) {
         if (FeatureFlags.PROMISE_APPS_NEW_INSTALLS.get()
                 && SessionCommitReceiver.isEnabled(mAppContext)
@@ -210,25 +216,24 @@ public class InstallSessionHelper {
                 && sessionInfo.getInstallReason() == PackageManager.INSTALL_REASON_USER
                 && sessionInfo.getAppIcon() != null
                 && !TextUtils.isEmpty(sessionInfo.getAppLabel())
-                && !mPromiseIconIds.contains(sessionInfo.getSessionId())
+                && !promiseIconAddedForId(sessionInfo.getSessionId())
                 && new PackageManagerHelper(mAppContext).getApplicationInfo(
                         sessionInfo.getAppPackageName(), getUserHandle(sessionInfo), 0) == null) {
             ItemInstallQueue.INSTANCE.get(mAppContext)
                     .queueItem(sessionInfo.getAppPackageName(), getUserHandle(sessionInfo));
 
-            mPromiseIconIds.add(sessionInfo.getSessionId());
+            getPromiseIconIds().add(sessionInfo.getSessionId());
             updatePromiseIconPrefs();
         }
     }
 
-    public InstallSessionTracker registerInstallTracker(
-            InstallSessionTracker.Callback callback, LooperExecutor executor) {
+    public InstallSessionTracker registerInstallTracker(InstallSessionTracker.Callback callback) {
         InstallSessionTracker tracker = new InstallSessionTracker(this, callback);
 
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
-            mInstaller.registerSessionCallback(tracker, executor.getHandler());
+            mInstaller.registerSessionCallback(tracker, MODEL_EXECUTOR.getHandler());
         } else {
-            mLauncherApps.registerPackageInstallerSessionCallback(executor, tracker);
+            mLauncherApps.registerPackageInstallerSessionCallback(MODEL_EXECUTOR, tracker);
         }
         return tracker;
     }
@@ -240,4 +245,8 @@ public class InstallSessionHelper {
             mLauncherApps.unregisterPackageInstallerSessionCallback(tracker);
         }
     }
+
+    public static UserHandle getUserHandle(SessionInfo info) {
+        return Utilities.ATLEAST_Q ? info.getUser() : Process.myUserHandle();
+    }
 }
diff --git a/src/com/android/launcher3/pm/InstallSessionTracker.java b/src/com/android/launcher3/pm/InstallSessionTracker.java
index eb3ca7366b..b0b907ab19 100644
--- a/src/com/android/launcher3/pm/InstallSessionTracker.java
+++ b/src/com/android/launcher3/pm/InstallSessionTracker.java
@@ -24,8 +24,11 @@ import android.content.pm.PackageInstaller.SessionInfo;
 import android.os.UserHandle;
 import android.util.SparseArray;
 
+import androidx.annotation.WorkerThread;
+
 import com.android.launcher3.util.PackageUserKey;
 
+@WorkerThread
 public class InstallSessionTracker extends PackageInstaller.SessionCallback {
 
     // Lazily initialized
diff --git a/src/com/android/launcher3/pm/UserCache.java b/src/com/android/launcher3/pm/UserCache.java
index 2d7d6b092a..5ade22be5e 100644
--- a/src/com/android/launcher3/pm/UserCache.java
+++ b/src/com/android/launcher3/pm/UserCache.java
@@ -60,6 +60,9 @@ public class UserCache {
     private void onUsersChanged(Intent intent) {
         enableAndResetCache();
         mUserChangeListeners.forEach(Runnable::run);
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.WORK_PROFILE_REMOVED, "profile changed", new Exception());
+        }
     }
 
     /**
@@ -104,9 +107,6 @@ public class UserCache {
                 mUsers = null;
                 mUserToSerialMap = null;
             }
-            if (TestProtocol.sDebugTracing) {
-                Log.d(TestProtocol.WORK_PROFILE_REMOVED, "Work profile removed", new Exception());
-            }
         }
     }
 
diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java
index d5b32fccd1..90285c470b 100644
--- a/src/com/android/launcher3/popup/ArrowPopup.java
+++ b/src/com/android/launcher3/popup/ArrowPopup.java
@@ -151,32 +151,52 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
      * @param viewsToFlip number of views from the top to to flip in case of reverse order
      */
     protected void reorderAndShow(int viewsToFlip) {
+        setupForDisplay();
+        boolean reverseOrder = mIsAboveIcon;
+        if (reverseOrder) {
+            reverseOrder(viewsToFlip);
+        }
+        onInflationComplete(reverseOrder);
+        addArrow();
+        animateOpen();
+    }
+
+    /**
+     * Shows the popup at the desired location.
+     */
+    protected void show() {
+        setupForDisplay();
+        onInflationComplete(false);
+        addArrow();
+        animateOpen();
+    }
+
+    private void setupForDisplay() {
         setVisibility(View.INVISIBLE);
         mIsOpen = true;
         getPopupContainer().addView(this);
         orientAboutObject();
+    }
 
-        boolean reverseOrder = mIsAboveIcon;
-        if (reverseOrder) {
-            int count = getChildCount();
-            ArrayList<View> allViews = new ArrayList<>(count);
-            for (int i = 0; i < count; i++) {
-                if (i == viewsToFlip) {
-                    Collections.reverse(allViews);
-                }
-                allViews.add(getChildAt(i));
+    private void reverseOrder(int viewsToFlip) {
+        int count = getChildCount();
+        ArrayList<View> allViews = new ArrayList<>(count);
+        for (int i = 0; i < count; i++) {
+            if (i == viewsToFlip) {
+                Collections.reverse(allViews);
             }
-            Collections.reverse(allViews);
-            removeAllViews();
-            for (int i = 0; i < count; i++) {
-                addView(allViews.get(i));
-            }
-
-            orientAboutObject();
+            allViews.add(getChildAt(i));
         }
-        onInflationComplete(reverseOrder);
+        Collections.reverse(allViews);
+        removeAllViews();
+        for (int i = 0; i < count; i++) {
+            addView(allViews.get(i));
+        }
+
+        orientAboutObject();
+    }
 
-        // Add the arrow.
+    private void addArrow() {
         final Resources res = getResources();
         final int arrowCenterOffset = res.getDimensionPixelSize(isAlignedWithStart()
                 ? R.dimen.popup_arrow_horizontal_center_start
@@ -214,8 +234,6 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
 
         mArrow.setPivotX(arrowLp.width / 2);
         mArrow.setPivotY(mIsAboveIcon ? arrowLp.height : 0);
-
-        animateOpen();
     }
 
     protected boolean isAlignedWithStart() {
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index 26b32b8195..6d92b8b627 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -19,10 +19,8 @@ package com.android.launcher3.popup;
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_SHORTCUTS;
 import static com.android.launcher3.Utilities.squaredHypot;
 import static com.android.launcher3.Utilities.squaredTouchSlop;
-import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
 import static com.android.launcher3.popup.PopupPopulator.MAX_SHORTCUTS;
 import static com.android.launcher3.popup.PopupPopulator.MAX_SHORTCUTS_IF_NOTIFICATIONS;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
 import android.animation.AnimatorSet;
@@ -160,8 +158,7 @@ public class PopupContainerWithArrow<T extends BaseDraggingActivity> extends Arr
         if (ev.getAction() == MotionEvent.ACTION_DOWN) {
             BaseDragLayer dl = getPopupContainer();
             if (!dl.isEventOverView(this, ev)) {
-                mLauncher.getUserEventDispatcher().logActionTapOutside(
-                        newContainerTarget(ContainerType.DEEPSHORTCUTS));
+                // TODO: add WW log if want to log if tap closed deep shortcut container.
                 close(true);
 
                 // We let touches on the original icon go through so that users can launch
@@ -435,7 +432,9 @@ public class PopupContainerWithArrow<T extends BaseDraggingActivity> extends Arr
                     // Make sure we keep the original icon hidden while it is being dragged.
                     mOriginalIcon.setVisibility(INVISIBLE);
                 } else {
-                    mLauncher.getUserEventDispatcher().logDeepShortcutsOpen(mOriginalIcon);
+                    // TODO: add WW logging if want to add logging for long press on popup
+                    //  container.
+                    //  mLauncher.getUserEventDispatcher().logDeepShortcutsOpen(mOriginalIcon);
                     if (!mIsAboveIcon) {
                         // Show the icon but keep the text hidden.
                         mOriginalIcon.setVisibility(VISIBLE);
diff --git a/src/com/android/launcher3/popup/RemoteActionShortcut.java b/src/com/android/launcher3/popup/RemoteActionShortcut.java
index 61829c002b..7c393ad1e2 100644
--- a/src/com/android/launcher3/popup/RemoteActionShortcut.java
+++ b/src/com/android/launcher3/popup/RemoteActionShortcut.java
@@ -37,7 +37,6 @@ import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
 
 @TargetApi(Build.VERSION_CODES.Q)
 public class RemoteActionShortcut extends SystemShortcut<BaseDraggingActivity> {
@@ -107,9 +106,6 @@ public class RemoteActionShortcut extends SystemShortcut<BaseDraggingActivity> {
                     Toast.LENGTH_SHORT)
                     .show();
         }
-
-        mTarget.getUserEventDispatcher().logActionOnControl(LauncherLogProto.Action.Touch.TAP,
-                LauncherLogProto.ControlType.REMOTE_ACTION_SHORTCUT, view);
     }
 
     @Override
diff --git a/src/com/android/launcher3/popup/SystemShortcut.java b/src/com/android/launcher3/popup/SystemShortcut.java
index 81302ac1f7..577fe4afaa 100644
--- a/src/com/android/launcher3/popup/SystemShortcut.java
+++ b/src/com/android/launcher3/popup/SystemShortcut.java
@@ -21,8 +21,6 @@ import com.android.launcher3.R;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ControlType;
 import com.android.launcher3.util.InstantAppResolver;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.launcher3.util.PackageUserKey;
@@ -117,8 +115,6 @@ public abstract class SystemShortcut<T extends BaseDraggingActivity> extends Ite
                     (WidgetsBottomSheet) mTarget.getLayoutInflater().inflate(
                             R.layout.widgets_bottom_sheet, mTarget.getDragLayer(), false);
             widgetsBottomSheet.populateAndShow(mItemInfo);
-            mTarget.getUserEventDispatcher().logActionOnControl(Action.Touch.TAP,
-                    ControlType.WIDGETS_BUTTON, view);
             mTarget.getStatsLogManager().logger().withItemInfo(mItemInfo)
                     .log(LAUNCHER_SYSTEM_SHORTCUT_WIDGETS_TAP);
         }
@@ -139,8 +135,6 @@ public abstract class SystemShortcut<T extends BaseDraggingActivity> extends Ite
             Rect sourceBounds = mTarget.getViewBounds(view);
             new PackageManagerHelper(mTarget).startDetailsActivityForInfo(
                     mItemInfo, sourceBounds, ActivityOptions.makeBasic().toBundle());
-            mTarget.getUserEventDispatcher().logActionOnControl(Action.Touch.TAP,
-                    ControlType.APPINFO_TARGET, view);
             mTarget.getStatsLogManager().logger().withItemInfo(mItemInfo)
                     .log(LAUNCHER_SYSTEM_SHORTCUT_APP_INFO_TAP);
         }
diff --git a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
index 4baecb7c56..f4b059d8d8 100644
--- a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
+++ b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
@@ -306,6 +306,15 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
             return true;
         });
         sandboxCategory.addPreference(launchAssistantTutorialPreference);
+        Preference launchSandboxModeTutorialPreference = new Preference(context);
+        launchSandboxModeTutorialPreference.setKey("launchSandboxMode");
+        launchSandboxModeTutorialPreference.setTitle("Launch Sandbox Mode");
+        launchSandboxModeTutorialPreference.setSummary("Practice navigation gestures");
+        launchSandboxModeTutorialPreference.setOnPreferenceClickListener(preference -> {
+            startActivity(launchSandboxIntent.putExtra("tutorial_type", "SANDBOX_MODE"));
+            return true;
+        });
+        sandboxCategory.addPreference(launchSandboxModeTutorialPreference);
     }
 
     private String toName(String action) {
diff --git a/src/com/android/launcher3/states/HintState.java b/src/com/android/launcher3/states/HintState.java
index b8a184fcfc..fd1d965982 100644
--- a/src/com/android/launcher3/states/HintState.java
+++ b/src/com/android/launcher3/states/HintState.java
@@ -15,11 +15,12 @@
  */
 package com.android.launcher3.states;
 
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
+
 import android.content.Context;
 
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 
 /**
  * Scale down workspace/hotseat to hint at going to either overview (on pause) or first home screen.
@@ -30,7 +31,7 @@ public class HintState extends LauncherState {
             | FLAG_HAS_SYS_UI_SCRIM;
 
     public HintState(int id) {
-        super(id, ContainerType.DEFAULT_CONTAINERTYPE, STATE_FLAGS);
+        super(id, LAUNCHER_STATE_HOME, STATE_FLAGS);
     }
 
     @Override
diff --git a/src/com/android/launcher3/states/SpringLoadedState.java b/src/com/android/launcher3/states/SpringLoadedState.java
index 2a4f887503..45172b56ef 100644
--- a/src/com/android/launcher3/states/SpringLoadedState.java
+++ b/src/com/android/launcher3/states/SpringLoadedState.java
@@ -15,6 +15,8 @@
  */
 package com.android.launcher3.states;
 
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
+
 import android.content.Context;
 import android.graphics.Rect;
 
@@ -22,7 +24,6 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.Workspace;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 
 /**
  * Definition for spring loaded state used during drag and drop.
@@ -35,7 +36,7 @@ public class SpringLoadedState extends LauncherState {
             | FLAG_HIDE_BACK_BUTTON;
 
     public SpringLoadedState(int id) {
-        super(id, ContainerType.WORKSPACE, STATE_FLAGS);
+        super(id, LAUNCHER_STATE_HOME, STATE_FLAGS);
     }
 
     @Override
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index 8ee5a6e533..9fd53e2563 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -21,6 +21,9 @@ import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.anim.Interpolators.scrollInterpolatorForVelocity;
 import static com.android.launcher3.config.FeatureFlags.UNSTABLE_SPRINGS;
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_ALLAPPS;
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_UNKNOWN_SWIPEDOWN;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_UNKNOWN_SWIPEUP;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_COMPONENTS;
@@ -52,9 +55,6 @@ import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.states.StateAnimationConfig.AnimationFlags;
 import com.android.launcher3.testing.TestProtocol;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
-import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.launcher3.util.FlingBlockCheck;
 import com.android.launcher3.util.TouchController;
 
@@ -190,11 +190,6 @@ public abstract class AbstractStateChangeTouchController
 
     protected abstract float initCurrentAnimation(@AnimationFlags int animComponents);
 
-    /**
-     * Returns the container that the touch started from when leaving NORMAL state.
-     */
-    protected abstract int getLogContainerTypeForNormalState(MotionEvent ev);
-
     private boolean reinitCurrentAnimation(boolean reachedToState, boolean isDragTowardPositive) {
         LauncherState newFromState = mFromState == null ? mLauncher.getStateManager().getState()
                 : reachedToState ? mToState : mFromState;
@@ -307,11 +302,11 @@ public abstract class AbstractStateChangeTouchController
     public boolean onDrag(float displacement, MotionEvent ev) {
         if (!mIsLogContainerSet) {
             if (mStartState == ALL_APPS) {
-                mStartContainerType = ContainerType.ALLAPPS;
+                mStartContainerType = LAUNCHER_STATE_ALLAPPS;
             } else if (mStartState == NORMAL) {
-                mStartContainerType = getLogContainerTypeForNormalState(ev);
+                mStartContainerType = LAUNCHER_STATE_HOME;
             } else if (mStartState == OVERVIEW) {
-                mStartContainerType = ContainerType.TASKSWITCHER;
+                mStartContainerType = LAUNCHER_STATE_OVERVIEW;
             }
             mIsLogContainerSet = true;
         }
@@ -401,7 +396,6 @@ public abstract class AbstractStateChangeTouchController
     @Override
     public void onDragEnd(float velocity) {
         boolean fling = mDetector.isFling(velocity);
-        final int logAction = fling ? Touch.FLING : Touch.SWIPE;
 
         boolean blockedFling = fling && mFlingBlockCheck.isBlocked();
         if (blockedFling) {
@@ -458,7 +452,7 @@ public abstract class AbstractStateChangeTouchController
             }
         }
 
-        mCurrentAnimation.setEndAction(() -> onSwipeInteractionCompleted(targetState, logAction));
+        mCurrentAnimation.setEndAction(() -> onSwipeInteractionCompleted(targetState));
         ValueAnimator anim = mCurrentAnimation.getAnimationPlayer();
         anim.setFloatValues(startProgress, endProgress);
         maybeUpdateAtomicAnim(mFromState, targetState, targetState == mToState ? 1f : 0f);
@@ -522,11 +516,7 @@ public abstract class AbstractStateChangeTouchController
                 .setInterpolator(scrollInterpolatorForVelocity(velocity));
     }
 
-    protected int getDirectionForLog() {
-        return mToState.ordinal > mFromState.ordinal ? Direction.UP : Direction.DOWN;
-    }
-
-    protected void onSwipeInteractionCompleted(LauncherState targetState, int logAction) {
+    protected void onSwipeInteractionCompleted(LauncherState targetState) {
         if (mAtomicComponentsController != null) {
             mAtomicComponentsController.getAnimationPlayer().end();
             mAtomicComponentsController = null;
@@ -535,18 +525,18 @@ public abstract class AbstractStateChangeTouchController
         boolean shouldGoToTargetState = true;
         if (mPendingAnimation != null) {
             boolean reachedTarget = mToState == targetState;
-            mPendingAnimation.finish(reachedTarget, logAction);
+            mPendingAnimation.finish(reachedTarget);
             mPendingAnimation = null;
             shouldGoToTargetState = !reachedTarget;
         }
         if (shouldGoToTargetState) {
-            goToTargetState(targetState, logAction);
+            goToTargetState(targetState);
         }
     }
 
-    protected void goToTargetState(LauncherState targetState, int logAction) {
+    protected void goToTargetState(LauncherState targetState) {
         if (targetState != mStartState) {
-            logReachedState(logAction, targetState);
+            logReachedState(targetState);
         }
         if (!mLauncher.isInState(targetState)) {
             // If we're already in the target state, don't jump to it at the end of the animation in
@@ -556,24 +546,18 @@ public abstract class AbstractStateChangeTouchController
         mLauncher.getDragLayer().getScrim().createSysuiMultiplierAnim(1f).setDuration(0).start();
     }
 
-    private void logReachedState(int logAction, LauncherState targetState) {
+    private void logReachedState(LauncherState targetState) {
         // Transition complete. log the action
-        mLauncher.getUserEventDispatcher().logStateChangeAction(logAction,
-                getDirectionForLog(), mDetector.getDownX(), mDetector.getDownY(),
-                mStartContainerType /* e.g., hotseat */,
-                mStartState.containerType /* e.g., workspace */,
-                targetState.containerType,
-                mLauncher.getWorkspace().getCurrentPage());
         mLauncher.getStatsLogManager().logger()
-                .withSrcState(StatsLogManager.containerTypeToAtomState(mStartState.containerType))
-                .withDstState(StatsLogManager.containerTypeToAtomState(targetState.containerType))
+                .withSrcState(mStartState.statsLogOrdinal)
+                .withDstState(targetState.statsLogOrdinal)
                 .withContainerInfo(LauncherAtom.ContainerInfo.newBuilder()
                         .setWorkspace(
                                 LauncherAtom.WorkspaceContainer.newBuilder()
                                         .setPageIndex(mLauncher.getWorkspace().getCurrentPage()))
                         .build())
-                .log(StatsLogManager.getLauncherAtomEvent(mStartState.containerType,
-                            targetState.containerType, mToState.ordinal > mFromState.ordinal
+                .log(StatsLogManager.getLauncherAtomEvent(mStartState.statsLogOrdinal,
+                            targetState.statsLogOrdinal, mToState.ordinal > mFromState.ordinal
                                     ? LAUNCHER_UNKNOWN_SWIPEUP
                                     : LAUNCHER_UNKNOWN_SWIPEDOWN));
     }
diff --git a/src/com/android/launcher3/touch/AllAppsSwipeController.java b/src/com/android/launcher3/touch/AllAppsSwipeController.java
index 4a202b65d8..f9dcf2d2e9 100644
--- a/src/com/android/launcher3/touch/AllAppsSwipeController.java
+++ b/src/com/android/launcher3/touch/AllAppsSwipeController.java
@@ -24,7 +24,6 @@ import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.states.StateAnimationConfig.AnimationFlags;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 
 /**
  * TouchController to switch between NORMAL and ALL_APPS state.
@@ -69,12 +68,6 @@ public class AllAppsSwipeController extends AbstractStateChangeTouchController {
         return fromState;
     }
 
-    @Override
-    protected int getLogContainerTypeForNormalState(MotionEvent ev) {
-        return mLauncher.getDragLayer().isEventOverView(mLauncher.getHotseat(), mTouchDownEvent)
-                ? ContainerType.HOTSEAT : ContainerType.WORKSPACE;
-    }
-
     @Override
     protected float initCurrentAnimation(@AnimationFlags int animComponents) {
         float range = getShiftRange();
diff --git a/src/com/android/launcher3/touch/ItemClickHandler.java b/src/com/android/launcher3/touch/ItemClickHandler.java
index 61d6f7d804..d56391da3d 100644
--- a/src/com/android/launcher3/touch/ItemClickHandler.java
+++ b/src/com/android/launcher3/touch/ItemClickHandler.java
@@ -25,7 +25,9 @@ import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_DISABLED_SA
 import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_DISABLED_SUSPENDED;
 
 import android.app.AlertDialog;
+import android.app.PendingIntent;
 import android.content.Intent;
+import android.content.IntentSender;
 import android.content.pm.LauncherApps;
 import android.content.pm.PackageInstaller.SessionInfo;
 import android.os.Process;
@@ -49,6 +51,7 @@ import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.model.data.PromiseAppInfo;
+import com.android.launcher3.model.data.RemoteActionItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pm.InstallSessionHelper;
 import com.android.launcher3.testing.TestLogging;
@@ -236,6 +239,27 @@ public class ItemClickHandler {
         startAppShortcutOrInfoActivity(v, shortcut, launcher);
     }
 
+    /**
+     * Event handler for a {@link android.app.RemoteAction} click
+     *
+     */
+    public static void onClickRemoteAction(Launcher launcher,
+            RemoteActionItemInfo remoteActionInfo) {
+        try {
+            PendingIntent pendingIntent = remoteActionInfo.getRemoteAction().getActionIntent();
+            if (remoteActionInfo.shouldStartInLauncher()) {
+                launcher.startIntentSenderForResult(pendingIntent.getIntentSender(), 0, null, 0, 0,
+                        0);
+            } else {
+                pendingIntent.send();
+            }
+        } catch (PendingIntent.CanceledException | IntentSender.SendIntentException e) {
+            Toast.makeText(launcher,
+                    launcher.getResources().getText(R.string.shortcut_not_available),
+                    Toast.LENGTH_SHORT).show();
+        }
+    }
+
     private static void startAppShortcutOrInfoActivity(View v, ItemInfo item, Launcher launcher) {
         TestLogging.recordEvent(
                 TestProtocol.SEQUENCE_MAIN, "start: startAppShortcutOrInfoActivity");
diff --git a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
index fb02f79c49..17f02be5b4 100644
--- a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
+++ b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
@@ -72,7 +72,6 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
         out.halfPageSize = view.getNormalChildHeight() / 2;
         out.halfScreenSize = view.getMeasuredHeight() / 2;
         out.screenCenter = insets.top + view.getPaddingTop() + out.scroll + out.halfPageSize;
-        out.pageParentScale = view.getScaleY();
     }
 
     @Override
diff --git a/src/com/android/launcher3/touch/PagedOrientationHandler.java b/src/com/android/launcher3/touch/PagedOrientationHandler.java
index 354d78d0ac..114b75acec 100644
--- a/src/com/android/launcher3/touch/PagedOrientationHandler.java
+++ b/src/com/android/launcher3/touch/PagedOrientationHandler.java
@@ -112,7 +112,6 @@ public interface PagedOrientationHandler {
         public int halfPageSize;
         public int screenCenter;
         public int halfScreenSize;
-        public float pageParentScale;
     }
 
     class ChildBounds {
diff --git a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
index 06479e6b6a..5f5b2d1feb 100644
--- a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
+++ b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
@@ -70,7 +70,6 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
         out.halfPageSize = view.getNormalChildWidth() / 2;
         out.halfScreenSize = view.getMeasuredWidth() / 2;
         out.screenCenter = insets.left + view.getPaddingLeft() + out.scroll + out.halfPageSize;
-        out.pageParentScale = view.getScaleX();
     }
 
     @Override
diff --git a/src/com/android/launcher3/util/Executors.java b/src/com/android/launcher3/util/Executors.java
index 0a32734fca..a85ae458ed 100644
--- a/src/com/android/launcher3/util/Executors.java
+++ b/src/com/android/launcher3/util/Executors.java
@@ -20,8 +20,10 @@ import android.os.Looper;
 import android.os.Process;
 
 import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * Various different executors used in Launcher
@@ -83,4 +85,29 @@ public class Executors {
      */
     public static final LooperExecutor MODEL_EXECUTOR =
             new LooperExecutor(createAndStartNewLooper("launcher-loader"));
+
+    /**
+     * A simple ThreadFactory to set the thread name and priority when used with executors.
+     */
+    public static class SimpleThreadFactory implements ThreadFactory {
+
+        private final int mPriority;
+        private final String mNamePrefix;
+
+        private final AtomicInteger mCount = new AtomicInteger(0);
+
+        public SimpleThreadFactory(String namePrefix, int priority) {
+            mNamePrefix = namePrefix;
+            mPriority = priority;
+        }
+
+        @Override
+        public Thread newThread(Runnable runnable) {
+            Thread t = new Thread(() -> {
+                Process.setThreadPriority(mPriority);
+                runnable.run();
+            }, mNamePrefix + mCount.incrementAndGet());
+            return t;
+        }
+    }
 }
diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java
index 52a82f8e93..d9a14e9e3f 100644
--- a/src/com/android/launcher3/views/FloatingIconView.java
+++ b/src/com/android/launcher3/views/FloatingIconView.java
@@ -15,7 +15,6 @@
  */
 package com.android.launcher3.views;
 
-import static com.android.launcher3.LauncherAnimUtils.DRAWABLE_ALPHA;
 import static com.android.launcher3.Utilities.getBadge;
 import static com.android.launcher3.Utilities.getFullDrawable;
 import static com.android.launcher3.config.FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM;
@@ -23,9 +22,6 @@ import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 import static com.android.launcher3.views.IconLabelDotView.setIconAndDotVisible;
 
 import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.Canvas;
@@ -74,7 +70,6 @@ public class FloatingIconView extends FrameLayout implements
     private static @Nullable IconLoadResult sIconLoadResult;
 
     public static final float SHAPE_PROGRESS_DURATION = 0.10f;
-    private static final int FADE_DURATION_MS = 200;
     private static final RectF sTmpRectF = new RectF();
     private static final Object[] sTmpObjArray = new Object[1];
 
@@ -89,6 +84,9 @@ public class FloatingIconView extends FrameLayout implements
 
     private IconLoadResult mIconLoadResult;
 
+    // Draw the drawable of the BubbleTextView behind ClipIconView to reveal the built in shadow.
+    private View mBtvDrawable;
+
     private ClipIconView mClipIconView;
     private @Nullable Drawable mBadge;
 
@@ -98,7 +96,6 @@ public class FloatingIconView extends FrameLayout implements
 
     private final Rect mFinalDrawableBounds = new Rect();
 
-    private AnimatorSet mFadeAnimatorSet;
     private ListenerView mListenerView;
     private Runnable mFastFinishRunnable;
 
@@ -116,6 +113,8 @@ public class FloatingIconView extends FrameLayout implements
         mIsRtl = Utilities.isRtl(getResources());
         mListenerView = new ListenerView(context, attrs);
         mClipIconView = new ClipIconView(context, attrs);
+        mBtvDrawable = new ImageView(context, attrs);
+        addView(mBtvDrawable);
         addView(mClipIconView);
         setWillNotDraw(false);
     }
@@ -176,6 +175,7 @@ public class FloatingIconView extends FrameLayout implements
         setLayoutParams(lp);
 
         mClipIconView.setLayoutParams(new FrameLayout.LayoutParams(lp.width, lp.height));
+        mBtvDrawable.setLayoutParams(new FrameLayout.LayoutParams(lp.width, lp.height));
     }
 
     private void updatePosition(RectF pos, InsettableFrameLayout.LayoutParams lp) {
@@ -292,6 +292,8 @@ public class FloatingIconView extends FrameLayout implements
         drawable = drawable == null ? null : drawable.getConstantState().newDrawable();
         int iconOffset = getOffsetForIconBounds(l, drawable, pos);
         synchronized (iconLoadResult) {
+            iconLoadResult.btvDrawable = btvIcon == null || drawable == btvIcon
+                    ? null : btvIcon.getConstantState().newDrawable();
             iconLoadResult.drawable = drawable;
             iconLoadResult.badge = badge;
             iconLoadResult.iconOffset = iconOffset;
@@ -311,7 +313,8 @@ public class FloatingIconView extends FrameLayout implements
      * @param iconOffset The amount of offset needed to match this view with the original view.
      */
     @UiThread
-    private void setIcon(@Nullable Drawable drawable, @Nullable Drawable badge, int iconOffset) {
+    private void setIcon(@Nullable Drawable drawable, @Nullable Drawable badge,
+            @Nullable Drawable btvIcon, int iconOffset) {
         final InsettableFrameLayout.LayoutParams lp =
                 (InsettableFrameLayout.LayoutParams) getLayoutParams();
         mBadge = badge;
@@ -342,6 +345,10 @@ public class FloatingIconView extends FrameLayout implements
                 mBadge.setBounds(0, 0, clipViewOgWidth, clipViewOgHeight);
             }
         }
+
+        if (!mIsOpening && btvIcon != null) {
+            mBtvDrawable.setBackground(btvIcon);
+        }
         invalidate();
     }
 
@@ -360,7 +367,7 @@ public class FloatingIconView extends FrameLayout implements
         synchronized (mIconLoadResult) {
             if (mIconLoadResult.isIconLoaded) {
                 setIcon(mIconLoadResult.drawable, mIconLoadResult.badge,
-                        mIconLoadResult.iconOffset);
+                        mIconLoadResult.btvDrawable, mIconLoadResult.iconOffset);
                 setIconAndDotVisible(originalView, false);
             } else {
                 mIconLoadResult.onIconLoaded = () -> {
@@ -369,7 +376,7 @@ public class FloatingIconView extends FrameLayout implements
                     }
 
                     setIcon(mIconLoadResult.drawable, mIconLoadResult.badge,
-                            mIconLoadResult.iconOffset);
+                            mIconLoadResult.btvDrawable, mIconLoadResult.iconOffset);
 
                     setVisibility(VISIBLE);
                     setIconAndDotVisible(originalView, false);
@@ -434,10 +441,6 @@ public class FloatingIconView extends FrameLayout implements
             mEndRunnable.run();
             mEndRunnable = null;
         }
-        if (mFadeAnimatorSet != null) {
-            mFadeAnimatorSet.end();
-            mFadeAnimatorSet = null;
-        }
     }
 
     @Override
@@ -546,8 +549,16 @@ public class FloatingIconView extends FrameLayout implements
                     setIconAndDotVisible(originalView, true);
                     view.finish(dragLayer);
                 } else {
-                    view.mFadeAnimatorSet = view.createFadeAnimation(originalView, dragLayer);
-                    view.mFadeAnimatorSet.start();
+                    originalView.setVisibility(VISIBLE);
+                    if (originalView instanceof IconLabelDotView) {
+                        setIconAndDotVisible(originalView, true);
+                    }
+                    if (originalView instanceof BubbleTextView) {
+                        BubbleTextView btv = (BubbleTextView) originalView;
+                        btv.setIconVisible(true);
+                        btv.setForceHideDot(true);
+                    }
+                    view.finish(dragLayer);
                 }
             } else {
                 view.finish(dragLayer);
@@ -564,47 +575,6 @@ public class FloatingIconView extends FrameLayout implements
         return view;
     }
 
-    private AnimatorSet createFadeAnimation(View originalView, DragLayer dragLayer) {
-        AnimatorSet fade = new AnimatorSet();
-        fade.setDuration(FADE_DURATION_MS);
-        fade.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationStart(Animator animation) {
-                originalView.setVisibility(VISIBLE);
-            }
-
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                finish(dragLayer);
-            }
-        });
-
-        if (originalView instanceof IconLabelDotView) {
-            fade.addListener(new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationEnd(Animator animation) {
-                    setIconAndDotVisible(originalView, true);
-                }
-            });
-        }
-
-        if (originalView instanceof BubbleTextView) {
-            BubbleTextView btv = (BubbleTextView) originalView;
-            fade.addListener(new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationStart(Animator animation) {
-                    btv.setIconVisible(true);
-                    btv.setForceHideDot(true);
-                }
-            });
-            fade.play(ObjectAnimator.ofInt(btv.getIcon(), DRAWABLE_ALPHA, 0, 255));
-        } else if (!(originalView instanceof FolderIcon)) {
-            fade.play(ObjectAnimator.ofFloat(originalView, ALPHA, 0f, 1f));
-        }
-
-        return fade;
-    }
-
     private void finish(DragLayer dragLayer) {
         ((ViewGroup) dragLayer.getParent()).removeView(this);
         dragLayer.removeView(mListenerView);
@@ -628,11 +598,7 @@ public class FloatingIconView extends FrameLayout implements
         mLoadIconSignal = null;
         mEndRunnable = null;
         mFinalDrawableBounds.setEmpty();
-        if (mFadeAnimatorSet != null) {
-            mFadeAnimatorSet.cancel();
-        }
         mPositionOut = null;
-        mFadeAnimatorSet = null;
         mListenerView.setListener(null);
         mOriginalIcon = null;
         mOnTargetChangeRunnable = null;
@@ -640,11 +606,13 @@ public class FloatingIconView extends FrameLayout implements
         sTmpObjArray[0] = null;
         mIconLoadResult = null;
         mClipIconView.recycle();
+        mBtvDrawable.setBackground(null);
         mFastFinishRunnable = null;
     }
 
     private static class IconLoadResult {
         final ItemInfo itemInfo;
+        Drawable btvDrawable;
         Drawable drawable;
         Drawable badge;
         int iconOffset;
diff --git a/src/com/android/launcher3/views/HeroSearchResultView.java b/src/com/android/launcher3/views/HeroSearchResultView.java
index a8e1c6b30c..dd322d921a 100644
--- a/src/com/android/launcher3/views/HeroSearchResultView.java
+++ b/src/com/android/launcher3/views/HeroSearchResultView.java
@@ -16,12 +16,16 @@
 package com.android.launcher3.views;
 
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS;
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ShortcutInfo;
 import android.graphics.Point;
 import android.os.Bundle;
 import android.util.AttributeSet;
+import android.util.Pair;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
@@ -31,9 +35,10 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.DragSource;
 import com.android.launcher3.DropTarget;
 import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
-import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+import com.android.launcher3.allapps.search.AllAppsSearchBarController.PayloadResultHandler;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.dragndrop.DraggableView;
 import com.android.launcher3.graphics.DragPreviewProvider;
@@ -53,9 +58,10 @@ import java.util.List;
  * A view representing a high confidence app search result that includes shortcuts
  */
 public class HeroSearchResultView extends LinearLayout implements DragSource,
-        AllAppsSearchBarController.PayloadResultHandler<List<ItemInfoWithIcon>> {
+        PayloadResultHandler<List<Pair<ShortcutInfo, ItemInfoWithIcon>>> {
 
     public static final int MAX_SHORTCUTS_COUNT = 2;
+    private final Object[] mTargetInfo = createTargetInfo();
     BubbleTextView mBubbleTextView;
     View mIconView;
     BubbleTextView[] mDeepShortcutTextViews = new BubbleTextView[2];
@@ -102,7 +108,7 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
                             grid.allAppsIconSizePx));
             bubbleTextView.setOnClickListener(view -> {
                 WorkspaceItemInfo itemInfo = (WorkspaceItemInfo) bubbleTextView.getTag();
-                SearchTargetEvent event = new SearchTargetEvent(
+                SearchTargetEvent event = getSearchTargetEvent(
                         SearchTarget.ItemType.APP_HERO,
                         SearchTargetEvent.CHILD_SELECT);
                 event.bundle = getAppBundle(itemInfo);
@@ -119,21 +125,36 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
      * Apply {@link ItemInfo} for appIcon and shortcut Icons
      */
     @Override
-    public void applyAdapterInfo(AdapterItemWithPayload<List<ItemInfoWithIcon>> adapterItem) {
+    public void applyAdapterInfo(
+            AdapterItemWithPayload<List<Pair<ShortcutInfo, ItemInfoWithIcon>>> adapterItem) {
         mBubbleTextView.applyFromApplicationInfo(adapterItem.appInfo);
         mIconView.setBackground(mBubbleTextView.getIcon());
         mIconView.setTag(adapterItem.appInfo);
-        List<ItemInfoWithIcon> shorcutInfos = adapterItem.getPayload();
+        List<Pair<ShortcutInfo, ItemInfoWithIcon>> shortcutDetails = adapterItem.getPayload();
+        LauncherAppState appState = LauncherAppState.getInstance(getContext());
         for (int i = 0; i < mDeepShortcutTextViews.length; i++) {
-            mDeepShortcutTextViews[i].setVisibility(shorcutInfos.size() > i ? VISIBLE : GONE);
-            if (i < shorcutInfos.size()) {
-                mDeepShortcutTextViews[i].applyFromItemInfoWithIcon(shorcutInfos.get(i));
+            BubbleTextView shortcutView = mDeepShortcutTextViews[i];
+            mDeepShortcutTextViews[i].setVisibility(shortcutDetails.size() > i ? VISIBLE : GONE);
+            if (i < shortcutDetails.size()) {
+                Pair<ShortcutInfo, ItemInfoWithIcon> p = shortcutDetails.get(i);
+                //apply ItemInfo and prepare view
+                shortcutView.applyFromWorkspaceItem((WorkspaceItemInfo) p.second);
+                MODEL_EXECUTOR.execute(() -> {
+                    // load unbadged shortcut in background and update view when icon ready
+                    appState.getIconCache().getUnbadgedShortcutIcon(p.second, p.first);
+                    MAIN_EXECUTOR.post(() -> shortcutView.reapplyItemInfo(p.second));
+                });
             }
         }
         mPlugin = adapterItem.getPlugin();
         adapterItem.setSelectionHandler(this::handleSelection);
     }
 
+    @Override
+    public Object[] getTargetInfo() {
+        return mTargetInfo;
+    }
+
     @Override
     public void onDropCompleted(View target, DropTarget.DragObject d, boolean success) {
         mBubbleTextView.setVisibility(VISIBLE);
@@ -169,7 +190,7 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
             mLauncher.getWorkspace().beginDragShared(mContainer.mBubbleTextView,
                     draggableView, mContainer, itemInfo, previewProvider, new DragOptions());
 
-            SearchTargetEvent event = new SearchTargetEvent(
+            SearchTargetEvent event = mContainer.getSearchTargetEvent(
                     SearchTarget.ItemType.APP_HERO, SearchTargetEvent.LONG_PRESS);
             event.bundle = getAppBundle(itemInfo);
             if (mContainer.mPlugin != null) {
@@ -186,7 +207,7 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
         Launcher launcher = Launcher.getLauncher(getContext());
         launcher.startActivitySafely(this, itemInfo.getIntent(), itemInfo);
 
-        SearchTargetEvent event = new SearchTargetEvent(
+        SearchTargetEvent event = getSearchTargetEvent(
                 SearchTarget.ItemType.APP_HERO, eventType);
         event.bundle = getAppBundle(itemInfo);
         if (mPlugin != null) {
diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java
index 3ec20d57a1..80f0981af5 100644
--- a/src/com/android/launcher3/views/OptionsPopupView.java
+++ b/src/com/android/launcher3/views/OptionsPopupView.java
@@ -16,6 +16,7 @@
 package com.android.launcher3.views;
 
 import static com.android.launcher3.Utilities.EXTRA_WALLPAPER_FLAVOR;
+import static com.android.launcher3.Utilities.EXTRA_WALLPAPER_LAUNCH_SOURCE;
 import static com.android.launcher3.Utilities.EXTRA_WALLPAPER_OFFSET;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.IGNORE;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SETTINGS_BUTTON_TAP_OR_LONGPRESS;
@@ -132,7 +133,7 @@ public class OptionsPopupView extends ArrowPopup
             view.setOnLongClickListener(popup);
             popup.mItemMap.put(view, item);
         }
-        popup.reorderAndShow(popup.getChildCount());
+        popup.show();
     }
 
     @VisibleForTesting
@@ -211,7 +212,8 @@ public class OptionsPopupView extends ArrowPopup
         Intent intent = new Intent(Intent.ACTION_SET_WALLPAPER)
                 .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
                 .putExtra(EXTRA_WALLPAPER_OFFSET,
-                        launcher.getWorkspace().getWallpaperOffsetForCenterPage());
+                        launcher.getWorkspace().getWallpaperOffsetForCenterPage())
+                .putExtra(EXTRA_WALLPAPER_LAUNCH_SOURCE, "app_launched_launcher");
         if (!Utilities.existsStyleWallpapers(launcher)) {
             intent.putExtra(EXTRA_WALLPAPER_FLAVOR, "wallpaper_only");
         } else {
diff --git a/src/com/android/launcher3/views/SearchResultIconRow.java b/src/com/android/launcher3/views/SearchResultIconRow.java
new file mode 100644
index 0000000000..313ae5e611
--- /dev/null
+++ b/src/com/android/launcher3/views/SearchResultIconRow.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.views;
+
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+
+import android.app.RemoteAction;
+import android.content.Context;
+import android.content.pm.ShortcutInfo;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.AttributeSet;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
+import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+import com.android.launcher3.icons.LauncherIcons;
+import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.ItemInfoWithIcon;
+import com.android.launcher3.model.data.RemoteActionItemInfo;
+import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.launcher3.touch.ItemClickHandler;
+import com.android.systemui.plugins.AllAppsSearchPlugin;
+import com.android.systemui.plugins.shared.SearchTarget;
+import com.android.systemui.plugins.shared.SearchTarget.ItemType;
+import com.android.systemui.plugins.shared.SearchTargetEvent;
+
+/**
+ * A view representing a stand alone shortcut search result
+ */
+public class SearchResultIconRow extends DoubleShadowBubbleTextView implements
+        AllAppsSearchBarController.PayloadResultHandler<SearchTarget> {
+
+    private final Object[] mTargetInfo = createTargetInfo();
+    private ShortcutInfo mShortcutInfo;
+    private AllAppsSearchPlugin mPlugin;
+    private AdapterItemWithPayload<SearchTarget> mAdapterItem;
+
+
+    public SearchResultIconRow(@NonNull Context context) {
+        super(context);
+    }
+
+    public SearchResultIconRow(@NonNull Context context,
+            @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public SearchResultIconRow(@NonNull Context context, @Nullable AttributeSet attrs,
+            int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    public void applyAdapterInfo(AdapterItemWithPayload<SearchTarget> adapterItemWithPayload) {
+        if (mAdapterItem != null) {
+            mAdapterItem.setSelectionHandler(null);
+        }
+        mAdapterItem = adapterItemWithPayload;
+        SearchTarget payload = adapterItemWithPayload.getPayload();
+        mPlugin = adapterItemWithPayload.getPlugin();
+
+        if (payload.mRemoteAction != null) {
+            prepareUsingRemoteAction(payload.mRemoteAction,
+                    payload.bundle.getString(SearchTarget.REMOTE_ACTION_TOKEN),
+                    payload.bundle.getBoolean(SearchTarget.REMOTE_ACTION_SHOULD_START));
+        } else {
+            prepareUsingShortcutInfo(payload.shortcuts.get(0));
+        }
+        setOnClickListener(v -> handleSelection(SearchTargetEvent.SELECT));
+        adapterItemWithPayload.setSelectionHandler(this::handleSelection);
+    }
+
+    private void prepareUsingShortcutInfo(ShortcutInfo shortcutInfo) {
+        mShortcutInfo = shortcutInfo;
+        WorkspaceItemInfo workspaceItemInfo = new WorkspaceItemInfo(mShortcutInfo, getContext());
+        applyFromWorkspaceItem(workspaceItemInfo);
+        LauncherAppState launcherAppState = LauncherAppState.getInstance(getContext());
+        MODEL_EXECUTOR.execute(() -> {
+            launcherAppState.getIconCache().getShortcutIcon(workspaceItemInfo, mShortcutInfo);
+            reapplyItemInfoAsync(workspaceItemInfo);
+        });
+    }
+
+    private void prepareUsingRemoteAction(RemoteAction remoteAction, String token, boolean start) {
+        RemoteActionItemInfo itemInfo = new RemoteActionItemInfo(remoteAction, token, start);
+
+        applyFromRemoteActionInfo(itemInfo);
+        UI_HELPER_EXECUTOR.post(() -> {
+            // If the Drawable from the remote action is not AdaptiveBitmap, styling will not work.
+            try (LauncherIcons li = LauncherIcons.obtain(getContext())) {
+                Drawable d = itemInfo.getRemoteAction().getIcon().loadDrawable(getContext());
+                itemInfo.bitmap = li.createBadgedIconBitmap(d, itemInfo.user,
+                        Build.VERSION.SDK_INT);
+                reapplyItemInfoAsync(itemInfo);
+            }
+        });
+
+    }
+
+    void reapplyItemInfoAsync(ItemInfoWithIcon itemInfoWithIcon) {
+        MAIN_EXECUTOR.post(() -> reapplyItemInfo(itemInfoWithIcon));
+    }
+
+    @Override
+    public Object[] getTargetInfo() {
+        return mTargetInfo;
+    }
+
+    private void handleSelection(int eventType) {
+        ItemInfo itemInfo = (ItemInfo) getTag();
+        Launcher launcher = Launcher.getLauncher(getContext());
+        final SearchTargetEvent searchTargetEvent;
+        if (itemInfo instanceof WorkspaceItemInfo) {
+            ItemClickHandler.onClickAppShortcut(this, (WorkspaceItemInfo) itemInfo, launcher);
+            searchTargetEvent = getSearchTargetEvent(SearchTarget.ItemType.SHORTCUT,
+                    eventType);
+            searchTargetEvent.shortcut = mShortcutInfo;
+        } else {
+            RemoteActionItemInfo remoteItemInfo = (RemoteActionItemInfo) itemInfo;
+            ItemClickHandler.onClickRemoteAction(launcher, remoteItemInfo);
+            searchTargetEvent = getSearchTargetEvent(ItemType.ACTION,
+                    eventType);
+            searchTargetEvent.bundle = new Bundle();
+            searchTargetEvent.remoteAction = remoteItemInfo.getRemoteAction();
+            searchTargetEvent.bundle.putBoolean(SearchTarget.REMOTE_ACTION_SHOULD_START,
+                    remoteItemInfo.shouldStartInLauncher());
+            searchTargetEvent.bundle.putString(SearchTarget.REMOTE_ACTION_TOKEN,
+                    remoteItemInfo.getToken());
+        }
+        if (mPlugin != null) {
+            mPlugin.notifySearchTargetEvent(searchTargetEvent);
+        }
+    }
+}
diff --git a/src/com/android/launcher3/views/SearchResultPeopleView.java b/src/com/android/launcher3/views/SearchResultPeopleView.java
index 6e45e88b32..0c9a22f672 100644
--- a/src/com/android/launcher3/views/SearchResultPeopleView.java
+++ b/src/com/android/launcher3/views/SearchResultPeopleView.java
@@ -15,9 +15,6 @@
  */
 package com.android.launcher3.views;
 
-import static android.content.Intent.URI_ALLOW_UNSAFE;
-import static android.content.Intent.URI_ANDROID_APP_SCHEME;
-
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
@@ -28,7 +25,6 @@ import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.net.Uri;
 import android.os.Bundle;
 import android.util.AttributeSet;
 import android.view.View;
@@ -50,7 +46,6 @@ import com.android.systemui.plugins.AllAppsSearchPlugin;
 import com.android.systemui.plugins.shared.SearchTarget;
 import com.android.systemui.plugins.shared.SearchTargetEvent;
 
-import java.net.URISyntaxException;
 import java.util.ArrayList;
 
 /**
@@ -66,8 +61,8 @@ public class SearchResultPeopleView extends LinearLayout implements
     private TextView mTitleView;
     private ImageButton[] mProviderButtons = new ImageButton[3];
     private AllAppsSearchPlugin mPlugin;
-    private Uri mContactUri;
-
+    private Intent mIntent;
+    private final Object[] mTargetInfo = createTargetInfo();
 
     public SearchResultPeopleView(Context context) {
         this(context, null, 0);
@@ -109,7 +104,7 @@ public class SearchResultPeopleView extends LinearLayout implements
         Bundle payload = adapterItemWithPayload.getPayload();
         mPlugin = adapterItemWithPayload.getPlugin();
         mTitleView.setText(payload.getString("title"));
-        mContactUri = payload.getParcelable("contact_uri");
+        mIntent = payload.getParcelable("intent");
         Bitmap icon = payload.getParcelable("icon");
         if (icon != null) {
             RoundedBitmapDrawable d = RoundedBitmapDrawableFactory.create(getResources(), icon);
@@ -125,25 +120,20 @@ public class SearchResultPeopleView extends LinearLayout implements
         for (int i = 0; i < mProviderButtons.length; i++) {
             ImageButton button = mProviderButtons[i];
             if (providers != null && i < providers.size()) {
-                try {
-                    Bundle provider = providers.get(i);
-                    Intent intent = Intent.parseUri(provider.getString("intent_uri_str"),
-                            URI_ANDROID_APP_SCHEME | URI_ALLOW_UNSAFE);
-                    setupProviderButton(button, provider, intent);
-                    String pkg = provider.getString("package_name");
-                    UI_HELPER_EXECUTOR.post(() -> {
-                        try {
-                            ApplicationInfo applicationInfo = mPackageManager.getApplicationInfo(
-                                    pkg, 0);
-                            Drawable appIcon = applicationInfo.loadIcon(mPackageManager);
-                            MAIN_EXECUTOR.post(()-> button.setImageDrawable(appIcon));
-                        } catch (PackageManager.NameNotFoundException ignored) {
-                        }
-
-                    });
-                } catch (URISyntaxException ex) {
-                    button.setVisibility(GONE);
-                }
+                Bundle provider = providers.get(i);
+                Intent intent = provider.getParcelable("intent");
+                setupProviderButton(button, provider, intent, adapterItemWithPayload);
+                String pkg = provider.getString("package_name");
+                UI_HELPER_EXECUTOR.post(() -> {
+                    try {
+                        ApplicationInfo applicationInfo = mPackageManager.getApplicationInfo(
+                                pkg, 0);
+                        Drawable appIcon = applicationInfo.loadIcon(mPackageManager);
+                        MAIN_EXECUTOR.post(() -> button.setImageDrawable(appIcon));
+                    } catch (PackageManager.NameNotFoundException ignored) {
+                    }
+
+                });
             } else {
                 button.setVisibility(GONE);
             }
@@ -151,15 +141,21 @@ public class SearchResultPeopleView extends LinearLayout implements
         adapterItemWithPayload.setSelectionHandler(this::handleSelection);
     }
 
-    private void setupProviderButton(ImageButton button, Bundle provider, Intent intent) {
+    @Override
+    public Object[] getTargetInfo() {
+        return mTargetInfo;
+    }
+
+    private void setupProviderButton(ImageButton button, Bundle provider, Intent intent,
+            AllAppsGridAdapter.AdapterItem adapterItem) {
         Launcher launcher = Launcher.getLauncher(getContext());
         button.setOnClickListener(b -> {
             launcher.startActivitySafely(b, intent, null);
-            SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
+            SearchTargetEvent searchTargetEvent = getSearchTargetEvent(
                     SearchTarget.ItemType.PEOPLE,
                     SearchTargetEvent.CHILD_SELECT);
             searchTargetEvent.bundle = new Bundle();
-            searchTargetEvent.bundle.putParcelable("contact_uri", mContactUri);
+            searchTargetEvent.bundle.putParcelable("intent", mIntent);
             searchTargetEvent.bundle.putBundle("provider", provider);
             if (mPlugin != null) {
                 mPlugin.notifySearchTargetEvent(searchTargetEvent);
@@ -169,14 +165,13 @@ public class SearchResultPeopleView extends LinearLayout implements
 
 
     private void handleSelection(int eventType) {
-        if (mContactUri != null) {
+        if (mIntent != null) {
             Launcher launcher = Launcher.getLauncher(getContext());
-            launcher.startActivitySafely(this, new Intent(Intent.ACTION_VIEW, mContactUri).setFlags(
-                    Intent.FLAG_ACTIVITY_NEW_TASK), null);
-            SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
-                    SearchTarget.ItemType.PEOPLE, eventType);
+            launcher.startActivitySafely(this, mIntent, null);
+            SearchTargetEvent searchTargetEvent = getSearchTargetEvent(SearchTarget.ItemType.PEOPLE,
+                    eventType);
             searchTargetEvent.bundle = new Bundle();
-            searchTargetEvent.bundle.putParcelable("contact_uri", mContactUri);
+            searchTargetEvent.bundle.putParcelable("intent", mIntent);
             if (mPlugin != null) {
                 mPlugin.notifySearchTargetEvent(searchTargetEvent);
             }
diff --git a/src/com/android/launcher3/views/SearchResultPlayItem.java b/src/com/android/launcher3/views/SearchResultPlayItem.java
index 8624609f80..ff3ecc8bc3 100644
--- a/src/com/android/launcher3/views/SearchResultPlayItem.java
+++ b/src/com/android/launcher3/views/SearchResultPlayItem.java
@@ -58,6 +58,8 @@ public class SearchResultPlayItem extends LinearLayout implements
     private String mPackageName;
     private boolean mIsInstantGame;
     private AllAppsSearchPlugin mPlugin;
+    private final Object[] mTargetInfo = createTargetInfo();
+
 
     public SearchResultPlayItem(Context context) {
         this(context, null, 0);
@@ -125,6 +127,11 @@ public class SearchResultPlayItem extends LinearLayout implements
         });
     }
 
+    @Override
+    public Object[] getTargetInfo() {
+        return mTargetInfo;
+    }
+
     private void showIfNecessary(TextView textView, @Nullable String string) {
         if (string == null || string.isEmpty()) {
             textView.setVisibility(GONE);
@@ -160,7 +167,7 @@ public class SearchResultPlayItem extends LinearLayout implements
     }
 
     private void logSearchEvent(int eventType) {
-        SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
+        SearchTargetEvent searchTargetEvent = getSearchTargetEvent(
                 SearchTarget.ItemType.PLAY_RESULTS, eventType);
         searchTargetEvent.bundle = new Bundle();
         searchTargetEvent.bundle.putString("package_name", mPackageName);
diff --git a/src/com/android/launcher3/views/SearchResultShortcut.java b/src/com/android/launcher3/views/SearchResultShortcut.java
deleted file mode 100644
index 307cf34c7d..0000000000
--- a/src/com/android/launcher3/views/SearchResultShortcut.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.views;
-
-import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
-
-import android.content.Context;
-import android.content.pm.ShortcutInfo;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.BubbleTextView;
-import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.R;
-import com.android.launcher3.allapps.AllAppsGridAdapter;
-import com.android.launcher3.allapps.search.AllAppsSearchBarController;
-import com.android.launcher3.model.data.WorkspaceItemInfo;
-import com.android.launcher3.touch.ItemClickHandler;
-import com.android.systemui.plugins.AllAppsSearchPlugin;
-import com.android.systemui.plugins.shared.SearchTarget;
-import com.android.systemui.plugins.shared.SearchTargetEvent;
-
-/**
- * A view representing a stand alone shortcut search result
- */
-public class SearchResultShortcut extends FrameLayout implements
-        AllAppsSearchBarController.PayloadResultHandler<SearchTarget> {
-
-    private BubbleTextView mBubbleTextView;
-    private View mIconView;
-    private ShortcutInfo mShortcutInfo;
-    private AllAppsSearchPlugin mPlugin;
-
-    public SearchResultShortcut(@NonNull Context context) {
-        super(context);
-    }
-
-    public SearchResultShortcut(@NonNull Context context,
-            @Nullable AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public SearchResultShortcut(@NonNull Context context, @Nullable AttributeSet attrs,
-            int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        Launcher launcher = Launcher.getLauncher(getContext());
-        DeviceProfile grid = launcher.getDeviceProfile();
-        mIconView = findViewById(R.id.icon);
-        ViewGroup.LayoutParams iconParams = mIconView.getLayoutParams();
-        iconParams.height = grid.allAppsIconSizePx;
-        iconParams.width = grid.allAppsIconSizePx;
-        mBubbleTextView = findViewById(R.id.bubble_text);
-        setOnClickListener(v -> handleSelection(SearchTargetEvent.SELECT));
-    }
-
-    @Override
-    public void applyAdapterInfo(
-            AllAppsGridAdapter.AdapterItemWithPayload<SearchTarget> adapterItemWithPayload) {
-        SearchTarget payload = adapterItemWithPayload.getPayload();
-        mPlugin = adapterItemWithPayload.getPlugin();
-        mShortcutInfo = payload.shortcuts.get(0);
-        WorkspaceItemInfo workspaceItemInfo = new WorkspaceItemInfo(mShortcutInfo, getContext());
-        mBubbleTextView.applyFromWorkspaceItem(workspaceItemInfo);
-        mIconView.setBackground(mBubbleTextView.getIcon());
-        LauncherAppState launcherAppState = LauncherAppState.getInstance(getContext());
-        MODEL_EXECUTOR.execute(() -> {
-            launcherAppState.getIconCache().getShortcutIcon(workspaceItemInfo, mShortcutInfo);
-            mBubbleTextView.applyFromWorkspaceItem(workspaceItemInfo);
-            mIconView.setBackground(mBubbleTextView.getIcon());
-        });
-        adapterItemWithPayload.setSelectionHandler(this::handleSelection);
-    }
-
-    private void handleSelection(int eventType) {
-        WorkspaceItemInfo itemInfo = (WorkspaceItemInfo) mBubbleTextView.getTag();
-        ItemClickHandler.onClickAppShortcut(this, itemInfo, Launcher.getLauncher(getContext()));
-
-        SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
-                SearchTarget.ItemType.SHORTCUT, eventType);
-        searchTargetEvent.shortcut = mShortcutInfo;
-        if (mPlugin != null) {
-            mPlugin.notifySearchTargetEvent(searchTargetEvent);
-        }
-    }
-}
diff --git a/src/com/android/launcher3/views/SearchResultSuggestRow.java b/src/com/android/launcher3/views/SearchResultSuggestRow.java
new file mode 100644
index 0000000000..b5abbcc724
--- /dev/null
+++ b/src/com/android/launcher3/views/SearchResultSuggestRow.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.views;
+
+import static com.android.systemui.plugins.shared.SearchTarget.ItemType.SUGGEST;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
+import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.RemoteActionItemInfo;
+import com.android.launcher3.touch.ItemClickHandler;
+import com.android.systemui.plugins.AllAppsSearchPlugin;
+import com.android.systemui.plugins.shared.SearchTarget;
+import com.android.systemui.plugins.shared.SearchTargetEvent;
+
+/**
+ * A view representing a fallback search suggestion row.
+ */
+public class SearchResultSuggestRow extends LinearLayout implements
+        View.OnClickListener, AllAppsSearchBarController.PayloadResultHandler<SearchTarget> {
+
+    private final Object[] mTargetInfo = createTargetInfo();
+    private AllAppsSearchPlugin mPlugin;
+    private AdapterItemWithPayload<SearchTarget> mAdapterItem;
+    private TextView mTitle;
+
+
+    public SearchResultSuggestRow(@NonNull Context context) {
+        super(context);
+    }
+
+    public SearchResultSuggestRow(@NonNull Context context,
+            @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public SearchResultSuggestRow(@NonNull Context context, @Nullable AttributeSet attrs,
+            int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mTitle = findViewById(R.id.title);
+        setOnClickListener(this);
+    }
+    @Override
+    public void applyAdapterInfo(AdapterItemWithPayload<SearchTarget> adapterItemWithPayload) {
+        mAdapterItem = adapterItemWithPayload;
+        SearchTarget payload = adapterItemWithPayload.getPayload();
+        mPlugin = adapterItemWithPayload.getPlugin();
+
+        if (payload.mRemoteAction != null) {
+            RemoteActionItemInfo itemInfo = new RemoteActionItemInfo(payload.mRemoteAction,
+                    payload.bundle.getString(SearchTarget.REMOTE_ACTION_TOKEN),
+                    payload.bundle.getBoolean(SearchTarget.REMOTE_ACTION_SHOULD_START));
+            setTag(itemInfo);
+        }
+        showIfAvailable(mTitle, payload.mRemoteAction.getTitle().toString());
+        setOnClickListener(v -> handleSelection(SearchTargetEvent.SELECT));
+        adapterItemWithPayload.setSelectionHandler(this::handleSelection);
+    }
+
+    @Override
+    public Object[] getTargetInfo() {
+        return mTargetInfo;
+    }
+
+    private void handleSelection(int eventType) {
+        ItemInfo itemInfo = (ItemInfo) getTag();
+        Launcher launcher = Launcher.getLauncher(getContext());
+        if (itemInfo instanceof  RemoteActionItemInfo) return;
+
+        RemoteActionItemInfo remoteItemInfo = (RemoteActionItemInfo) itemInfo;
+        ItemClickHandler.onClickRemoteAction(launcher, remoteItemInfo);
+        SearchTargetEvent searchTargetEvent = getSearchTargetEvent(SUGGEST, eventType);
+        searchTargetEvent.bundle = new Bundle();
+        searchTargetEvent.remoteAction = remoteItemInfo.getRemoteAction();
+        searchTargetEvent.bundle.putBoolean(SearchTarget.REMOTE_ACTION_SHOULD_START,
+                remoteItemInfo.shouldStartInLauncher());
+        searchTargetEvent.bundle.putString(SearchTarget.REMOTE_ACTION_TOKEN,
+                remoteItemInfo.getToken());
+
+        if (mPlugin != null) {
+            mPlugin.notifySearchTargetEvent(searchTargetEvent);
+        }
+    }
+
+    @Override
+    public void onClick(View view) {
+        handleSelection(SearchTargetEvent.SELECT);
+    }
+
+    private void showIfAvailable(TextView view, @Nullable String string) {
+        System.out.println("Plugin suggest string:" + string);
+        if (TextUtils.isEmpty(string)) {
+            view.setVisibility(GONE);
+        } else {
+            System.out.println("Plugin suggest string:" + string);
+            view.setVisibility(VISIBLE);
+            view.setText(string);
+        }
+    }
+}
diff --git a/src/com/android/launcher3/views/SearchSectionHeaderView.java b/src/com/android/launcher3/views/SearchSectionHeaderView.java
index d439ee3d68..0fe0a43ff5 100644
--- a/src/com/android/launcher3/views/SearchSectionHeaderView.java
+++ b/src/com/android/launcher3/views/SearchSectionHeaderView.java
@@ -52,4 +52,9 @@ public class SearchSectionHeaderView extends TextView implements
             setVisibility(INVISIBLE);
         }
     }
+
+    @Override
+    public Object[] getTargetInfo() {
+        return null;
+    }
 }
diff --git a/src/com/android/launcher3/views/SearchSettingsRowView.java b/src/com/android/launcher3/views/SearchSettingsRowView.java
index 93bcee2585..a1a0172547 100644
--- a/src/com/android/launcher3/views/SearchSettingsRowView.java
+++ b/src/com/android/launcher3/views/SearchSettingsRowView.java
@@ -48,6 +48,8 @@ public class SearchSettingsRowView extends LinearLayout implements
     private TextView mBreadcrumbsView;
     private Intent mIntent;
     private AllAppsSearchPlugin mPlugin;
+    private final Object[] mTargetInfo = createTargetInfo();
+
 
     public SearchSettingsRowView(@NonNull Context context) {
         super(context);
@@ -87,6 +89,11 @@ public class SearchSettingsRowView extends LinearLayout implements
         adapterItemWithPayload.setSelectionHandler(this::handleSelection);
     }
 
+    @Override
+    public Object[] getTargetInfo() {
+        return mTargetInfo;
+    }
+
     private void showIfAvailable(TextView view, @Nullable String string) {
         if (TextUtils.isEmpty(string)) {
             view.setVisibility(GONE);
@@ -108,7 +115,7 @@ public class SearchSettingsRowView extends LinearLayout implements
         Launcher launcher = Launcher.getLauncher(getContext());
         launcher.startActivityForResult(mIntent, 0);
 
-        SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
+        SearchTargetEvent searchTargetEvent = getSearchTargetEvent(
                 SearchTarget.ItemType.SETTINGS_ROW, eventType);
         searchTargetEvent.bundle = new Bundle();
         searchTargetEvent.bundle.putParcelable("intent", mIntent);
diff --git a/src/com/android/launcher3/views/ThumbnailSearchResultView.java b/src/com/android/launcher3/views/ThumbnailSearchResultView.java
new file mode 100644
index 0000000000..bbc47739f3
--- /dev/null
+++ b/src/com/android/launcher3/views/ThumbnailSearchResultView.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.views;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
+import android.net.Uri;
+import android.util.AttributeSet;
+
+import androidx.core.graphics.drawable.RoundedBitmapDrawable;
+import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
+import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.RemoteActionItemInfo;
+import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.launcher3.touch.ItemClickHandler;
+import com.android.launcher3.util.Themes;
+import com.android.systemui.plugins.AllAppsSearchPlugin;
+import com.android.systemui.plugins.shared.SearchTarget;
+import com.android.systemui.plugins.shared.SearchTargetEvent;
+
+/**
+ * A view representing a high confidence app search result that includes shortcuts
+ */
+public class ThumbnailSearchResultView extends androidx.appcompat.widget.AppCompatImageView
+        implements AllAppsSearchBarController.PayloadResultHandler<SearchTarget> {
+
+    private final Object[] mTargetInfo = createTargetInfo();
+    AllAppsSearchPlugin mPlugin;
+    int mPosition;
+
+    public ThumbnailSearchResultView(Context context) {
+        super(context);
+    }
+
+    public ThumbnailSearchResultView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public ThumbnailSearchResultView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    private void handleSelection(int eventType) {
+        Launcher launcher = Launcher.getLauncher(getContext());
+        ItemInfo itemInfo = (ItemInfo) getTag();
+        if (itemInfo instanceof RemoteActionItemInfo) {
+            RemoteActionItemInfo remoteItemInfo = (RemoteActionItemInfo) itemInfo;
+            ItemClickHandler.onClickRemoteAction(launcher, remoteItemInfo);
+        } else {
+            ItemClickHandler.onClickAppShortcut(this, (WorkspaceItemInfo) itemInfo, launcher);
+        }
+        if (mPlugin != null) {
+            SearchTargetEvent event = getSearchTargetEvent(
+                    SearchTarget.ItemType.SCREENSHOT, eventType);
+            mPlugin.notifySearchTargetEvent(event);
+        }
+    }
+
+    @Override
+    public void applyAdapterInfo(AdapterItemWithPayload<SearchTarget> adapterItem) {
+        Launcher launcher = Launcher.getLauncher(getContext());
+        mPosition = adapterItem.position;
+
+        SearchTarget target = adapterItem.getPayload();
+        Bitmap bitmap;
+        if (target.mRemoteAction != null) {
+            RemoteActionItemInfo itemInfo = new RemoteActionItemInfo(target.mRemoteAction,
+                    target.bundle.getString(SearchTarget.REMOTE_ACTION_TOKEN),
+                    target.bundle.getBoolean(SearchTarget.REMOTE_ACTION_SHOULD_START));
+            ItemClickHandler.onClickRemoteAction(launcher, itemInfo);
+            bitmap = ((BitmapDrawable) target.mRemoteAction.getIcon()
+                    .loadDrawable(getContext())).getBitmap();
+            setTag(itemInfo);
+        } else {
+            bitmap = (Bitmap) target.bundle.getParcelable("bitmap");
+            WorkspaceItemInfo itemInfo = new WorkspaceItemInfo();
+            itemInfo.intent = new Intent(Intent.ACTION_VIEW)
+                    .setData(Uri.parse(target.bundle.getString("uri")))
+                    .setType("image/*")
+                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            setTag(itemInfo);
+        }
+        RoundedBitmapDrawable drawable = RoundedBitmapDrawableFactory.create(null, bitmap);
+        drawable.setCornerRadius(Themes.getDialogCornerRadius(getContext()));
+        setImageDrawable(drawable);
+        setOnClickListener(v -> handleSelection(SearchTargetEvent.SELECT));
+        mPlugin = adapterItem.getPlugin();
+        adapterItem.setSelectionHandler(this::handleSelection);
+    }
+
+    @Override
+    public Object[] getTargetInfo() {
+        return mTargetInfo;
+    }
+}
diff --git a/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java b/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
index 4fa670f44a..aa3ab8f7e0 100644
--- a/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
+++ b/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
@@ -32,7 +32,7 @@ import java.util.function.Consumer;
 @ProvidesInterface(action = AllAppsSearchPlugin.ACTION, version = AllAppsSearchPlugin.VERSION)
 public interface AllAppsSearchPlugin extends Plugin {
     String ACTION = "com.android.systemui.action.PLUGIN_ALL_APPS_SEARCH_ACTIONS";
-    int VERSION = 6;
+    int VERSION = 7;
 
     void setup(Activity activity, View view);
 
@@ -42,6 +42,12 @@ public interface AllAppsSearchPlugin extends Plugin {
     void onStateTransitionStart(int fromState, int toState);
     void onStateTransitionComplete(int state);
 
+    /**
+     * Send launcher window focus and visibility changed signals.
+     */
+    void onWindowFocusChanged(boolean hasFocus);
+    void onWindowVisibilityChanged(int visibility);
+
     /**
      * Send signal when user starts typing, perform search, when search ends
      */
diff --git a/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java b/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
index c6b8300499..3f0dc39cc1 100644
--- a/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
+++ b/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
@@ -15,6 +15,7 @@
  */
 package com.android.systemui.plugins.shared;
 
+import android.app.RemoteAction;
 import android.content.pm.ShortcutInfo;
 import android.os.Bundle;
 
@@ -25,17 +26,69 @@ import java.util.List;
  */
 public class SearchTarget implements Comparable<SearchTarget> {
 
+
+    /**
+     * A bundle key for boolean value of whether remote action should be started in launcher or not
+     */
+    public static final String REMOTE_ACTION_SHOULD_START = "should_start_for_result";
+    public static final String REMOTE_ACTION_TOKEN = "action_token";
+
+
     public enum ViewType {
+
+        /**
+         * Consists of N number of icons. (N: launcher column count)
+         */
         TOP_HIT(0),
+
+        /**
+         * Consists of 1 icon and two subsidiary icons.
+         */
         HERO(1),
+
+        /**
+         * Main/sub/breadcrumb texts are rendered.
+         */
         DETAIL(2),
+
+        /**
+         * Consists of an icon, three detail strings.
+         */
         ROW(3),
+
+        /**
+         * Consists of an icon, three detail strings and a button.
+         */
         ROW_WITH_BUTTON(4),
+
+        /**
+         * Consists of a single slice view
+         */
         SLICE(5),
+
+        /**
+         * Similar to hero section.
+         */
         SHORTCUT(6),
-        PEOPLE(7);
+
+        /**
+         * Person icon and handling app icons are rendered.
+         */
+        PEOPLE(7),
+
+        /**
+         * N number of 1x1 ratio thumbnail is rendered.
+         * (current N = 3)
+         */
+        THUMBNAIL(8),
+
+        /**
+         * Fallback search icon and relevant text is rendered.
+         */
+        SUGGEST(9);
 
         private final int mId;
+
         ViewType(int id) {
             mId = id;
         }
@@ -52,9 +105,15 @@ public class SearchTarget implements Comparable<SearchTarget> {
         APP(3, "", ViewType.TOP_HIT),
         APP_HERO(4, "", ViewType.HERO),
         SHORTCUT(5, "Shortcuts", ViewType.SHORTCUT),
-        PEOPLE(6, "People", ViewType.PEOPLE);
+        PEOPLE(6, "People", ViewType.PEOPLE),
+        SCREENSHOT(7, "Screenshots", ViewType.THUMBNAIL),
+        ACTION(8, "Actions", ViewType.SHORTCUT),
+        SUGGEST(9, "Fallback Search", ViewType.SUGGEST),
+        CHROME_TAB(10, "Chrome Tab", ViewType.SHORTCUT);
 
         private final int mId;
+
+        /** Used to render section title. */
         private final String mTitle;
         private final ViewType mViewType;
 
@@ -81,19 +140,21 @@ public class SearchTarget implements Comparable<SearchTarget> {
     public List<ShortcutInfo> shortcuts;
     public Bundle bundle;
     public float score;
+    public String mSessionId;
+    public RemoteAction mRemoteAction;
 
     /**
      * Constructor to create the search target. Bundle is currently temporary to hold
      * search target primitives that cannot be expressed as java primitive objects
      * or AOSP native objects.
-     *
      */
     public SearchTarget(ItemType itemType, List<ShortcutInfo> shortcuts,
-            Bundle bundle, float score) {
+            Bundle bundle, float score, String sessionId) {
         this.type = itemType;
         this.shortcuts = shortcuts;
         this.bundle = bundle;
         this.score = score;
+        this.mSessionId = sessionId;
     }
 
     @Override
diff --git a/src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java b/src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java
index ac4bc333c6..5016abc1e9 100644
--- a/src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java
+++ b/src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java
@@ -15,6 +15,7 @@
  */
 package com.android.systemui.plugins.shared;
 
+import android.app.RemoteAction;
 import android.content.pm.ShortcutInfo;
 import android.os.Bundle;
 
@@ -29,12 +30,17 @@ public class SearchTargetEvent {
 
     public SearchTarget.ItemType type;
     public ShortcutInfo shortcut;
+    public RemoteAction remoteAction;
     public int eventType;
     public Bundle bundle;
-    public float score;
+    public int index;
+    public String sessionIdentifier;
 
-    public SearchTargetEvent(SearchTarget.ItemType itemType, int eventType) {
+    public SearchTargetEvent(SearchTarget.ItemType itemType, int eventType, int index,
+            String sessionId) {
         this.type = itemType;
         this.eventType = eventType;
+        this.index = index;
+        this.sessionIdentifier = sessionId;
     }
 }
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java b/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java
index ec3f93ff1b..a4e53a1cc0 100644
--- a/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java
+++ b/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java
@@ -16,13 +16,13 @@
 package com.android.launcher3.uioverrides.states;
 
 import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_ALLAPPS;
 
 import android.content.Context;
 
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 
 /**
  * Definition for AllApps state
@@ -41,7 +41,7 @@ public class AllAppsState extends LauncherState {
     };
 
     public AllAppsState(int id) {
-        super(id, ContainerType.ALLAPPS, STATE_FLAGS);
+        super(id, LAUNCHER_STATE_ALLAPPS, STATE_FLAGS);
     }
 
     @Override
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java b/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java
index d102bccaad..da5a94f6fd 100644
--- a/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -15,10 +15,11 @@
  */
 package com.android.launcher3.uioverrides.states;
 
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW;
+
 import android.content.Context;
 
 import com.android.launcher3.LauncherState;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 
 /**
  * Definition for overview state
@@ -26,7 +27,7 @@ import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 public class OverviewState extends LauncherState {
 
     public OverviewState(int id) {
-        super(id, ContainerType.WORKSPACE, FLAG_DISABLE_RESTORE);
+        super(id, LAUNCHER_STATE_OVERVIEW, FLAG_DISABLE_RESTORE);
     }
 
     @Override
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index 5e42d9b988..e118481570 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -279,6 +279,8 @@ public abstract class AbstractLauncherUiTest {
         if (userManager != null) {
             for (UserHandle userHandle : userManager.getUserProfiles()) {
                 if (!userHandle.isSystem()) {
+                    Log.d(TestProtocol.WORK_PROFILE_REMOVED,
+                            "removing user " + userHandle.getIdentifier());
                     mDevice.executeShellCommand("pm remove-user " + userHandle.getIdentifier());
                 }
             }
diff --git a/tests/src/com/android/launcher3/ui/WorkTabTest.java b/tests/src/com/android/launcher3/ui/WorkTabTest.java
index f5f93c429f..8d594de926 100644
--- a/tests/src/com/android/launcher3/ui/WorkTabTest.java
+++ b/tests/src/com/android/launcher3/ui/WorkTabTest.java
@@ -55,7 +55,9 @@ public class WorkTabTest extends AbstractLauncherUiTest {
     private static final int WORK_PAGE = AllAppsContainerView.AdapterHolder.WORK;
 
     @Before
-    public void createWorkProfile() throws Exception {
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
         String output =
                 mDevice.executeShellCommand(
                         "pm create-user --profileOf 0 --managed TestProfile");
@@ -136,7 +138,8 @@ public class WorkTabTest extends AbstractLauncherUiTest {
         });
 
         executeOnLauncher(launcher -> Log.d(TestProtocol.WORK_PROFILE_REMOVED,
-                "Work profile status: " + launcher.getAppsView().isPersonalTabVisible()));
+                "work profile status (" + mProfileUserId + ") :"
+                        + launcher.getAppsView().isWorkTabVisible()));
 
         // verify work edu is seen next
         waitForLauncherCondition("Launcher did not show the next edu screen", l ->
-- 
GitLab


From 84acb18dc2be57c527ea2d076bb548bfbe427170 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 23 Oct 2020 10:35:27 -0700
Subject: [PATCH 0273/1664] Fixing robo test compilation

Change-Id: I1b1192f4cbf1ea1916f2ec4cd607743b3483250a
---
 .../src/com/android/quickstep/util/TaskViewSimulatorTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/robolectric_tests/src/com/android/quickstep/util/TaskViewSimulatorTest.java b/quickstep/robolectric_tests/src/com/android/quickstep/util/TaskViewSimulatorTest.java
index 5491daae7b..6c88e55225 100644
--- a/quickstep/robolectric_tests/src/com/android/quickstep/util/TaskViewSimulatorTest.java
+++ b/quickstep/robolectric_tests/src/com/android/quickstep/util/TaskViewSimulatorTest.java
@@ -144,7 +144,7 @@ public class TaskViewSimulatorTest {
                     LauncherActivityInterface.INSTANCE);
             tvs.setDp(mDeviceProfile);
 
-            int launcherRotation = DisplayController.INSTANCE.get(mContext).getInfo().rotation;
+            int launcherRotation = DisplayController.getDefaultDisplay(mContext).getInfo().rotation;
             if (mAppRotation < 0) {
                 mAppRotation = launcherRotation;
             }
-- 
GitLab


From c1a785914a969c1dfcc84fe55652882910c4a284 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 23 Oct 2020 11:02:05 -0700
Subject: [PATCH 0274/1664] Add null check between calling
 onMotionPauseDetected() and Changed()

Some listeners such as ScreenPinnedInputConsumer only care about the
first pause detection and thus clear the MotionPauseDetector in
onMotionPauseDetected(). Because clear() sets mOnMotionPauseListener
to null, we need a second null check before onMotionPauseChanged().

Fixes: 169329910
Change-Id: I4fc30d67ad808a5b0c8feb10cc5392d7cae042b1
---
 .../src/com/android/quickstep/util/MotionPauseDetector.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java b/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java
index d0f6879b70..da5f59e755 100644
--- a/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java
+++ b/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java
@@ -193,7 +193,10 @@ public class MotionPauseDetector {
                 if (isFirstDetectedPause) {
                     mOnMotionPauseListener.onMotionPauseDetected();
                 }
-                mOnMotionPauseListener.onMotionPauseChanged(mIsPaused);
+                // Null check again as onMotionPauseDetected() maybe have called clear().
+                if (mOnMotionPauseListener != null) {
+                    mOnMotionPauseListener.onMotionPauseChanged(mIsPaused);
+                }
             }
         }
     }
-- 
GitLab


From fd54a8e84a6ec1436551b223e959090f83d854fa Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 23 Oct 2020 12:04:53 -0700
Subject: [PATCH 0275/1664] End the attaching animation early when we settle on
 the end target

The attaching animation can take longer than the transition to recents
when you let go, and the ADJACENT_PAGE_OFFSET calculation is different
when there's a running task vs not. So after the transition to recents
ended, the calculation of the still playing attaching animation would
change, causing the jump you see in the bug. Now we make sure to end
the attaching animation if it's still running when we settle on an
end target to avoid this issue.

Fixes: 168563692
Change-Id: I3f37aecf9c93f2ec63dbdce561e7f5ba11be89cc
Merged-In: I3f37aecf9c93f2ec63dbdce561e7f5ba11be89cc
(cherry picked from commit 1cc12ebc121f289db3e481aa5f9c4b72514ad52f)
---
 .../src/com/android/quickstep/BaseSwipeUpHandlerV2.java         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java
index a4ea9b4145..f4687884bf 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java
@@ -720,6 +720,8 @@ public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q exte
     }
 
     private void onSettledOnEndTarget() {
+        // Fast-finish the attaching animation if it's still running.
+        maybeUpdateRecentsAttachedState(false);
         switch (mGestureState.getEndTarget()) {
             case HOME:
                 mStateCallback.setState(STATE_SCALED_CONTROLLER_HOME | STATE_CAPTURE_SCREENSHOT);
-- 
GitLab


From 9c43bfa798d5e8e7f685a7a1c39190a6ed2fe3e1 Mon Sep 17 00:00:00 2001
From: Hilary Huo <hhuo@google.com>
Date: Fri, 23 Oct 2020 15:48:12 -0700
Subject: [PATCH 0276/1664] [pixel-search] URGENT: bug fix for teamfood: fix
 crash when tapping on a screenshot result

Bug: b/171596755
Change-Id: I125404dbe5a4e5f8e3bdc233e3a82db3dca48f42
---
 src/com/android/launcher3/views/ThumbnailSearchResultView.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/launcher3/views/ThumbnailSearchResultView.java b/src/com/android/launcher3/views/ThumbnailSearchResultView.java
index d11b1ef8bd..e929d7fbd8 100644
--- a/src/com/android/launcher3/views/ThumbnailSearchResultView.java
+++ b/src/com/android/launcher3/views/ThumbnailSearchResultView.java
@@ -90,6 +90,7 @@ public class ThumbnailSearchResultView extends androidx.appcompat.widget.AppComp
             bitmap = Bitmap.createBitmap(bitmap, 0,
                     bitmap.getHeight() / 2 - bitmap.getWidth() / 2,
                     bitmap.getWidth(), bitmap.getWidth());
+            setTag(itemInfo);
         } else {
             bitmap = (Bitmap) target.getExtras().getParcelable("bitmap");
             WorkspaceItemInfo itemInfo = new WorkspaceItemInfo();
-- 
GitLab


From 5b5f3c6609ea9d3ed10be72f5748b5bd302c20c6 Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Tue, 6 Oct 2020 14:55:06 -0700
Subject: [PATCH 0277/1664] Improve PIP enter transition w/ gesture nav (3/N)

Directly transition Activity to PiP mode in launcher if the Activity
claims auto-pip support. Video is taken by commenting out the
requirement of setting the auto-pip flag.

Note that we need app to actively push up-to-dated
PictureInPictureParams to the framework, otherwise we won't be get
- PictureInPictureParams on first entering
- Staled PictureInPictureParams if the aspect ratio is changed

Video: http://rcll/aaaaaabFQoRHlzixHdtY/abenIxLFI1pZzF2O8t4TbS
Bug: 143965596
Test: see demo videos
Change-Id: Iea9a6ff39a79431ac1afa14aea812c500b3ca3b2
---
 .../android/quickstep/AbsSwipeUpHandler.java  | 114 ++++++++++--
 .../quickstep/LauncherSwipeHandlerV2.java     |   6 +
 .../quickstep/RecentsAnimationController.java |  14 ++
 .../quickstep/SwipeUpAnimationLogic.java      |   8 +
 .../util/SwipePipToHomeAnimator.java          | 162 ++++++++++++++++++
 5 files changed, 288 insertions(+), 16 deletions(-)
 create mode 100644 quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 23d62b35dd..132f71a134 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -95,8 +95,10 @@ import com.android.quickstep.util.AnimatorControllerWithResistance;
 import com.android.quickstep.util.InputConsumerProxy;
 import com.android.quickstep.util.MotionPauseDetector;
 import com.android.quickstep.util.ProtoTracer;
+import com.android.quickstep.util.RecentsOrientedState;
 import com.android.quickstep.util.RectFSpringAnim;
 import com.android.quickstep.util.SurfaceTransactionApplier;
+import com.android.quickstep.util.SwipePipToHomeAnimator;
 import com.android.quickstep.util.TransformParams;
 import com.android.quickstep.views.LiveTileOverlay;
 import com.android.quickstep.views.RecentsView;
@@ -233,6 +235,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
 
     private final Runnable mOnDeferredActivityLaunch = this::onDeferredActivityLaunch;
 
+    private static final long SWIPE_PIP_TO_HOME_DURATION = 425;
+    private SwipePipToHomeAnimator mSwipePipToHomeAnimator;
+    protected boolean mIsSwipingPipToHome;
+
     public AbsSwipeUpHandler(Context context, RecentsAnimationDeviceState deviceState,
             TaskAnimationManager taskAnimationManager, GestureState gestureState,
             long touchTimeMs, boolean continuingLastGesture,
@@ -1048,25 +1054,44 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
 
         if (mGestureState.getEndTarget() == HOME) {
             mTaskViewSimulator.setDrawsBelowRecents(false);
+            getOrientationHandler().adjustFloatingIconStartVelocity(velocityPxPerMs);
+            final RemoteAnimationTargetCompat runningTaskTarget = mRecentsAnimationTargets != null
+                    ? mRecentsAnimationTargets.findTask(mGestureState.getRunningTaskId())
+                    : null;
             HomeAnimationFactory homeAnimFactory = createHomeAnimationFactory(duration);
-            RectFSpringAnim windowAnim = createWindowAnimationToHome(start, homeAnimFactory);
-            windowAnim.addAnimatorListener(new AnimationSuccessListener() {
-                @Override
-                public void onAnimationSuccess(Animator animator) {
-                    if (mRecentsAnimationController == null) {
-                        // If the recents animation is interrupted, we still end the running
-                        // animation (not canceled) so this is still called. In that case, we can
-                        // skip doing any future work here for the current gesture.
-                        return;
+            mIsSwipingPipToHome = homeAnimFactory.supportSwipePipToHome()
+                    && runningTaskTarget != null
+                    && runningTaskTarget.pictureInPictureParams != null
+                    && runningTaskTarget.pictureInPictureParams.isAutoEnterEnabled()
+                    && runningTaskTarget.pictureInPictureParams.getSourceRectHint() != null;
+            if (mIsSwipingPipToHome) {
+                mSwipePipToHomeAnimator = getSwipePipToHomeAnimator(
+                        homeAnimFactory, runningTaskTarget);
+                mSwipePipToHomeAnimator.setDuration(SWIPE_PIP_TO_HOME_DURATION);
+                mSwipePipToHomeAnimator.setInterpolator(interpolator);
+                mSwipePipToHomeAnimator.setFloatValues(0f, 1f);
+                mSwipePipToHomeAnimator.start();
+                mRunningWindowAnim = RunningWindowAnim.wrap(mSwipePipToHomeAnimator);
+            } else {
+                mSwipePipToHomeAnimator = null;
+                RectFSpringAnim windowAnim = createWindowAnimationToHome(start, homeAnimFactory);
+                windowAnim.addAnimatorListener(new AnimationSuccessListener() {
+                    @Override
+                    public void onAnimationSuccess(Animator animator) {
+                        if (mRecentsAnimationController == null) {
+                            // If the recents animation is interrupted, we still end the running
+                            // animation (not canceled) so this is still called. In that case,
+                            // we can skip doing any future work here for the current gesture.
+                            return;
+                        }
+                        // Finalize the state and notify of the change
+                        mGestureState.setState(STATE_END_TARGET_ANIMATION_FINISHED);
                     }
-                    // Finalize the state and notify of the change
-                    mGestureState.setState(STATE_END_TARGET_ANIMATION_FINISHED);
-                }
-            });
-            getOrientationHandler().adjustFloatingIconStartVelocity(velocityPxPerMs);
-            windowAnim.start(mContext, velocityPxPerMs);
+                });
+                windowAnim.start(mContext, velocityPxPerMs);
+                mRunningWindowAnim = RunningWindowAnim.wrap(windowAnim);
+            }
             homeAnimFactory.playAtomicAnimation(velocityPxPerMs.y);
-            mRunningWindowAnim = RunningWindowAnim.wrap(windowAnim);
             mLauncherTransitionController = null;
         } else {
             ValueAnimator windowAnim = mCurrentShift.animateToValue(start, end);
@@ -1110,6 +1135,46 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         }
     }
 
+    private SwipePipToHomeAnimator getSwipePipToHomeAnimator(HomeAnimationFactory homeAnimFactory,
+            RemoteAnimationTargetCompat runningTaskTarget) {
+        // Directly animate the app to PiP (picture-in-picture) mode
+        final ActivityManager.RunningTaskInfo taskInfo = mGestureState.getRunningTask();
+        final RecentsOrientedState orientationState = mTaskViewSimulator.getOrientationState();
+        final Rect destinationBounds = SystemUiProxy.INSTANCE.get(mContext)
+                .startSwipePipToHome(taskInfo.topActivity, taskInfo.topActivityInfo,
+                        runningTaskTarget.pictureInPictureParams,
+                        orientationState.getRecentsActivityRotation(),
+                        mDp.hotseatBarSizePx);
+        final SwipePipToHomeAnimator swipePipToHomeAnimator = new SwipePipToHomeAnimator(
+                runningTaskTarget.taskId,
+                taskInfo.topActivity,
+                runningTaskTarget.leash.getSurfaceControl(),
+                runningTaskTarget.pictureInPictureParams.getSourceRectHint(),
+                taskInfo.configuration.windowConfiguration.getBounds(),
+                destinationBounds);
+        swipePipToHomeAnimator.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+                // Ensure Launcher ends in NORMAL state, we intentionally skip other callbacks
+                // since they are not relevant in this swipe-pip-to-home case.
+                homeAnimFactory.createActivityAnimationToHome().dispatchOnStart();
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                if (mRecentsAnimationController == null) {
+                    // If the recents animation is interrupted, we still end the running
+                    // animation (not canceled) so this is still called. In that case, we can
+                    // skip doing any future work here for the current gesture.
+                    return;
+                }
+                // Finalize the state and notify of the change
+                mGestureState.setState(STATE_END_TARGET_ANIMATION_FINISHED);
+            }
+        });
+        return swipePipToHomeAnimator;
+    }
+
     private void computeRecentsScrollIfInvisible() {
         if (mRecentsView != null && mRecentsView.getVisibility() != View.VISIBLE) {
             // Views typically don't compute scroll when invisible as an optimization,
@@ -1367,6 +1432,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
             // If there are no targets or the animation not started, then there is nothing to finish
             mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);
         } else {
+            maybeFinishSwipePipToHome();
             finishRecentsControllerToHome(
                     () -> mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED));
         }
@@ -1374,6 +1440,22 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         doLogGesture(HOME, mRecentsView == null ? null : mRecentsView.getCurrentPageTaskView());
     }
 
+    /**
+     * Resets the {@link #mIsSwipingPipToHome} and notifies SysUI that transition is finished
+     * if applicable. This should happen before {@link #finishRecentsControllerToHome(Runnable)}.
+     */
+    private void maybeFinishSwipePipToHome() {
+        if (mIsSwipingPipToHome && mSwipePipToHomeAnimator != null) {
+            SystemUiProxy.INSTANCE.get(mContext).stopSwipePipToHome(
+                    mSwipePipToHomeAnimator.getComponentName(),
+                    mSwipePipToHomeAnimator.getDestinationBounds());
+            mRecentsAnimationController.setFinishTaskBounds(
+                    mSwipePipToHomeAnimator.getTaskId(),
+                    mSwipePipToHomeAnimator.getDestinationBounds());
+            mIsSwipingPipToHome = false;
+        }
+    }
+
     protected abstract void finishRecentsControllerToHome(Runnable callback);
 
     private void setupLauncherUiAfterSwipeUpToRecentsAnimation() {
diff --git a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
index 44114558e5..842fb84ff9 100644
--- a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
+++ b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
@@ -56,6 +56,7 @@ public class LauncherSwipeHandlerV2 extends
             final TaskView runningTaskView = mRecentsView.getRunningTaskView();
             final View workspaceView;
             if (runningTaskView != null
+                    && !mIsSwipingPipToHome
                     && runningTaskView.getTask().key.getComponent() != null) {
                 workspaceView = mActivity.getWorkspace().getFirstMatchForAppClose(
                         runningTaskView.getTask().key.getComponent().getPackageName(),
@@ -140,5 +141,10 @@ public class LauncherSwipeHandlerV2 extends
             new StaggeredWorkspaceAnim(mActivity, velocity,
                     true /* animateOverviewScrim */).start();
         }
+
+        @Override
+        public boolean supportSwipePipToHome() {
+            return true;
+        }
     }
 }
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationController.java b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
index 62bbf4d820..7de658c9d3 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationController.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
@@ -18,6 +18,8 @@ package com.android.quickstep;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
+import android.graphics.Rect;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.UiThread;
 
@@ -139,6 +141,18 @@ public class RecentsAnimationController {
         });
     }
 
+    /**
+     * Sets the final bounds on a Task. This is used by Launcher to notify the system that
+     * animating Activity to PiP has completed and the associated task surface should be updated
+     * accordingly. This should be called before `finish`
+     * @param taskId for which the leash should be updated
+     * @param destinationBounds bounds of the final PiP window
+     */
+    public void setFinishTaskBounds(int taskId, Rect destinationBounds) {
+        UI_HELPER_EXECUTOR.execute(
+                () -> mController.setFinishTaskBounds(taskId, destinationBounds));
+    }
+
     /**
      * Enables the input consumer to start intercepting touches in the app window.
      */
diff --git a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
index 7406dea486..8f7ec3bfa0 100644
--- a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
+++ b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
@@ -165,6 +165,14 @@ public abstract class SwipeUpAnimationLogic {
         public void update(RectF currentRect, float progress, float radius) { }
 
         public void onCancel() { }
+
+        /**
+         * @return {@code true} if this factory supports animating an Activity to PiP window on
+         * swiping up to home.
+         */
+        public boolean supportSwipePipToHome() {
+            return false;
+        }
     }
 
     /**
diff --git a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
new file mode 100644
index 0000000000..02b5dfe146
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.quickstep.util;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.RectEvaluator;
+import android.animation.ValueAnimator;
+import android.content.ComponentName;
+import android.graphics.Matrix;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.view.SurfaceControl;
+
+import androidx.annotation.NonNull;
+
+/**
+ * An {@link Animator} that animates an Activity to PiP (picture-in-picture) window when
+ * swiping up (in gesture navigation mode). Note that this class is derived from
+ * {@link com.android.wm.shell.pip.PipAnimationController.PipTransitionAnimator}.
+ *
+ * TODO: consider sharing this class including the animator and leash operations between
+ * Launcher and SysUI. Also, there should be one source of truth for the corner radius of the
+ * PiP window, which would ideally be on SysUI side as well.
+ */
+public class SwipePipToHomeAnimator extends ValueAnimator implements
+        ValueAnimator.AnimatorUpdateListener {
+    private final int mTaskId;
+    private final ComponentName mComponentName;
+    private final SurfaceControl mLeash;
+    private final Rect mStartBounds = new Rect();
+    private final Rect mDestinationBounds = new Rect();
+    private final SurfaceTransactionHelper mSurfaceTransactionHelper;
+
+    /** for calculating the transform in {@link #onAnimationUpdate(ValueAnimator)} */
+    private final RectEvaluator mRectEvaluator = new RectEvaluator(new Rect());
+    private final RectEvaluator mInsetsEvaluator = new RectEvaluator(new Rect());
+    private final Rect mSourceHintRectInsets = new Rect();
+    private final Rect mSourceInsets = new Rect();
+
+    /**
+     * Flag to avoid the double-end problem since the leash would have been released
+     * after the first end call and any further operations upon it would lead to NPE.
+     */
+    private boolean mHasAnimationEnded;
+
+    public SwipePipToHomeAnimator(int taskId,
+            @NonNull ComponentName componentName,
+            @NonNull SurfaceControl leash,
+            @NonNull Rect sourceRectHint,
+            @NonNull Rect startBounds,
+            @NonNull Rect destinationBounds) {
+        mTaskId = taskId;
+        mComponentName = componentName;
+        mLeash = leash;
+        mStartBounds.set(startBounds);
+        mDestinationBounds.set(destinationBounds);
+        mSurfaceTransactionHelper = new SurfaceTransactionHelper();
+
+        mSourceHintRectInsets.set(sourceRectHint.left - startBounds.left,
+                sourceRectHint.top - startBounds.top,
+                startBounds.right - sourceRectHint.right,
+                startBounds.bottom - sourceRectHint.bottom);
+
+        addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                SwipePipToHomeAnimator.this.onAnimationEnd();
+            }
+        });
+        addUpdateListener(this);
+    }
+
+    @Override
+    public void onAnimationUpdate(ValueAnimator animator) {
+        if (mHasAnimationEnded) return;
+
+        final float fraction = animator.getAnimatedFraction();
+        final Rect bounds = mRectEvaluator.evaluate(fraction, mStartBounds, mDestinationBounds);
+        final Rect insets = mInsetsEvaluator.evaluate(fraction, mSourceInsets,
+                mSourceHintRectInsets);
+        final SurfaceControl.Transaction tx = new SurfaceControl.Transaction();
+        mSurfaceTransactionHelper.scaleAndCrop(tx, mLeash, mStartBounds, bounds, insets);
+        tx.setCornerRadius(mLeash, 0).apply();
+    }
+
+    public int getTaskId() {
+        return mTaskId;
+    }
+
+    public ComponentName getComponentName() {
+        return mComponentName;
+    }
+
+    public Rect getDestinationBounds() {
+        return mDestinationBounds;
+    }
+
+    private void onAnimationEnd() {
+        if (mHasAnimationEnded) return;
+
+        final SurfaceControl.Transaction tx = new SurfaceControl.Transaction();
+        mSurfaceTransactionHelper.resetScale(tx, mLeash, mDestinationBounds);
+        mSurfaceTransactionHelper.crop(tx, mLeash, mDestinationBounds);
+        tx.setCornerRadius(mLeash, 0).apply();
+        mHasAnimationEnded = true;
+    }
+
+    /**
+     * Slim version of {@link com.android.wm.shell.pip.PipSurfaceTransactionHelper}
+     */
+    private static final class SurfaceTransactionHelper {
+        private final Matrix mTmpTransform = new Matrix();
+        private final float[] mTmpFloat9 = new float[9];
+        private final RectF mTmpSourceRectF = new RectF();
+        private final Rect mTmpDestinationRect = new Rect();
+
+        private void scaleAndCrop(SurfaceControl.Transaction tx, SurfaceControl leash,
+                Rect sourceBounds, Rect destinationBounds, Rect insets) {
+            mTmpSourceRectF.set(sourceBounds);
+            mTmpDestinationRect.set(sourceBounds);
+            mTmpDestinationRect.inset(insets);
+            // Scale by the shortest edge and offset such that the top/left of the scaled inset
+            // source rect aligns with the top/left of the destination bounds
+            final float scale = sourceBounds.width() <= sourceBounds.height()
+                    ? (float) destinationBounds.width() / sourceBounds.width()
+                    : (float) destinationBounds.height() / sourceBounds.height();
+            final float left = destinationBounds.left - insets.left * scale;
+            final float top = destinationBounds.top - insets.top * scale;
+            mTmpTransform.setScale(scale, scale);
+            tx.setMatrix(leash, mTmpTransform, mTmpFloat9)
+                    .setWindowCrop(leash, mTmpDestinationRect)
+                    .setPosition(leash, left, top);
+        }
+
+        private void resetScale(SurfaceControl.Transaction tx, SurfaceControl leash,
+                Rect destinationBounds) {
+            tx.setMatrix(leash, Matrix.IDENTITY_MATRIX, mTmpFloat9)
+                    .setPosition(leash, destinationBounds.left, destinationBounds.top);
+        }
+
+        private void crop(SurfaceControl.Transaction tx, SurfaceControl leash,
+                Rect destinationBounds) {
+            tx.setWindowCrop(leash, destinationBounds.width(), destinationBounds.height())
+                    .setPosition(leash, destinationBounds.left, destinationBounds.top);
+        }
+    }
+}
-- 
GitLab


From 6f4e65f62f09b9f44259998ec0ff1ed245ec3160 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Sun, 25 Oct 2020 22:26:04 -0700
Subject: [PATCH 0278/1664] Updating pip transition calls with shared lib

Bug: 143965596
Change-Id: I761726ca9666689d4359240b065997e3342eab65
---
 .../android/quickstep/AbsSwipeUpHandler.java  | 13 +++--
 .../util/SwipePipToHomeAnimator.java          | 56 +++----------------
 2 files changed, 16 insertions(+), 53 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 132f71a134..a1988a17fe 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1062,8 +1062,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
             mIsSwipingPipToHome = homeAnimFactory.supportSwipePipToHome()
                     && runningTaskTarget != null
                     && runningTaskTarget.pictureInPictureParams != null
-                    && runningTaskTarget.pictureInPictureParams.isAutoEnterEnabled()
-                    && runningTaskTarget.pictureInPictureParams.getSourceRectHint() != null;
+                    && TaskInfoCompat.isAutoEnterPipEnabled(
+                            runningTaskTarget.pictureInPictureParams)
+                    && TaskInfoCompat.getPipSourceRectHint(
+                            runningTaskTarget.pictureInPictureParams) != null;
             if (mIsSwipingPipToHome) {
                 mSwipePipToHomeAnimator = getSwipePipToHomeAnimator(
                         homeAnimFactory, runningTaskTarget);
@@ -1141,7 +1143,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         final ActivityManager.RunningTaskInfo taskInfo = mGestureState.getRunningTask();
         final RecentsOrientedState orientationState = mTaskViewSimulator.getOrientationState();
         final Rect destinationBounds = SystemUiProxy.INSTANCE.get(mContext)
-                .startSwipePipToHome(taskInfo.topActivity, taskInfo.topActivityInfo,
+                .startSwipePipToHome(taskInfo.topActivity,
+                        TaskInfoCompat.getTopActivityInfo(taskInfo),
                         runningTaskTarget.pictureInPictureParams,
                         orientationState.getRecentsActivityRotation(),
                         mDp.hotseatBarSizePx);
@@ -1149,8 +1152,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                 runningTaskTarget.taskId,
                 taskInfo.topActivity,
                 runningTaskTarget.leash.getSurfaceControl(),
-                runningTaskTarget.pictureInPictureParams.getSourceRectHint(),
-                taskInfo.configuration.windowConfiguration.getBounds(),
+                TaskInfoCompat.getPipSourceRectHint(runningTaskTarget.pictureInPictureParams),
+                TaskInfoCompat.getWindowConfigurationBounds(taskInfo),
                 destinationBounds);
         swipePipToHomeAnimator.addListener(new AnimatorListenerAdapter() {
             @Override
diff --git a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
index 02b5dfe146..87fee79547 100644
--- a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
+++ b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
@@ -21,13 +21,13 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.RectEvaluator;
 import android.animation.ValueAnimator;
 import android.content.ComponentName;
-import android.graphics.Matrix;
 import android.graphics.Rect;
-import android.graphics.RectF;
 import android.view.SurfaceControl;
 
 import androidx.annotation.NonNull;
 
+import com.android.systemui.shared.pip.PipSurfaceTransactionHelper;
+
 /**
  * An {@link Animator} that animates an Activity to PiP (picture-in-picture) window when
  * swiping up (in gesture navigation mode). Note that this class is derived from
@@ -44,7 +44,7 @@ public class SwipePipToHomeAnimator extends ValueAnimator implements
     private final SurfaceControl mLeash;
     private final Rect mStartBounds = new Rect();
     private final Rect mDestinationBounds = new Rect();
-    private final SurfaceTransactionHelper mSurfaceTransactionHelper;
+    private final PipSurfaceTransactionHelper mSurfaceTransactionHelper;
 
     /** for calculating the transform in {@link #onAnimationUpdate(ValueAnimator)} */
     private final RectEvaluator mRectEvaluator = new RectEvaluator(new Rect());
@@ -69,7 +69,7 @@ public class SwipePipToHomeAnimator extends ValueAnimator implements
         mLeash = leash;
         mStartBounds.set(startBounds);
         mDestinationBounds.set(destinationBounds);
-        mSurfaceTransactionHelper = new SurfaceTransactionHelper();
+        mSurfaceTransactionHelper = new PipSurfaceTransactionHelper();
 
         mSourceHintRectInsets.set(sourceRectHint.left - startBounds.left,
                 sourceRectHint.top - startBounds.top,
@@ -95,7 +95,8 @@ public class SwipePipToHomeAnimator extends ValueAnimator implements
                 mSourceHintRectInsets);
         final SurfaceControl.Transaction tx = new SurfaceControl.Transaction();
         mSurfaceTransactionHelper.scaleAndCrop(tx, mLeash, mStartBounds, bounds, insets);
-        tx.setCornerRadius(mLeash, 0).apply();
+        mSurfaceTransactionHelper.resetCornerRadius(tx, mLeash);
+        tx.apply();
     }
 
     public int getTaskId() {
@@ -114,49 +115,8 @@ public class SwipePipToHomeAnimator extends ValueAnimator implements
         if (mHasAnimationEnded) return;
 
         final SurfaceControl.Transaction tx = new SurfaceControl.Transaction();
-        mSurfaceTransactionHelper.resetScale(tx, mLeash, mDestinationBounds);
-        mSurfaceTransactionHelper.crop(tx, mLeash, mDestinationBounds);
-        tx.setCornerRadius(mLeash, 0).apply();
+        mSurfaceTransactionHelper.reset(tx, mLeash, mDestinationBounds);
+        tx.apply();
         mHasAnimationEnded = true;
     }
-
-    /**
-     * Slim version of {@link com.android.wm.shell.pip.PipSurfaceTransactionHelper}
-     */
-    private static final class SurfaceTransactionHelper {
-        private final Matrix mTmpTransform = new Matrix();
-        private final float[] mTmpFloat9 = new float[9];
-        private final RectF mTmpSourceRectF = new RectF();
-        private final Rect mTmpDestinationRect = new Rect();
-
-        private void scaleAndCrop(SurfaceControl.Transaction tx, SurfaceControl leash,
-                Rect sourceBounds, Rect destinationBounds, Rect insets) {
-            mTmpSourceRectF.set(sourceBounds);
-            mTmpDestinationRect.set(sourceBounds);
-            mTmpDestinationRect.inset(insets);
-            // Scale by the shortest edge and offset such that the top/left of the scaled inset
-            // source rect aligns with the top/left of the destination bounds
-            final float scale = sourceBounds.width() <= sourceBounds.height()
-                    ? (float) destinationBounds.width() / sourceBounds.width()
-                    : (float) destinationBounds.height() / sourceBounds.height();
-            final float left = destinationBounds.left - insets.left * scale;
-            final float top = destinationBounds.top - insets.top * scale;
-            mTmpTransform.setScale(scale, scale);
-            tx.setMatrix(leash, mTmpTransform, mTmpFloat9)
-                    .setWindowCrop(leash, mTmpDestinationRect)
-                    .setPosition(leash, left, top);
-        }
-
-        private void resetScale(SurfaceControl.Transaction tx, SurfaceControl leash,
-                Rect destinationBounds) {
-            tx.setMatrix(leash, Matrix.IDENTITY_MATRIX, mTmpFloat9)
-                    .setPosition(leash, destinationBounds.left, destinationBounds.top);
-        }
-
-        private void crop(SurfaceControl.Transaction tx, SurfaceControl leash,
-                Rect destinationBounds) {
-            tx.setWindowCrop(leash, destinationBounds.width(), destinationBounds.height())
-                    .setPosition(leash, destinationBounds.left, destinationBounds.top);
-        }
-    }
 }
-- 
GitLab


From 3ee70182271ec0cf1a379ec194b478b24f7e7f32 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Wed, 21 Oct 2020 14:01:53 -0400
Subject: [PATCH 0279/1664] Fix All Apps Search plugin shortcut icon redrawing
 issue.

BubbleTextViews animate the update from their placeholder icons to their high res icons. Added a field to allow restricting what BubbleTextViews' icon updates should be animated. Updated SearchResultIconRow to store the icon Drawable rather than the resource id to prevent unecessary redrawing.

Fixes: 170966269

Demo: https://drive.google.com/file/d/1FBdEl11mHZk1SpCMRY4XZAGt5TVZ01W4/view?usp=sharing

Change-Id: Ib55dafdf5b5fed00d343af5f95f3dd3f08c4ee8e
---
 src/com/android/launcher3/BubbleTextView.java  |  7 ++++++-
 .../launcher3/views/SearchResultIconRow.java   | 18 +++++++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 6245637407..1015a322e8 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -705,8 +705,13 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
 
         updateIcon(icon);
 
+        ItemInfo itemInfo = (ItemInfo) getTag();
+
         // If the current icon is a placeholder color, animate its update.
-        if (mIcon != null && mIcon instanceof PlaceHolderIconDrawable) {
+        if (mIcon != null
+                && mIcon instanceof PlaceHolderIconDrawable
+                && (itemInfo == null
+                    || itemInfo.itemType != LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT)) {
             animateIconUpdate((PlaceHolderIconDrawable) mIcon, icon);
         }
 
diff --git a/src/com/android/launcher3/views/SearchResultIconRow.java b/src/com/android/launcher3/views/SearchResultIconRow.java
index fe904ff115..bdbe890e8d 100644
--- a/src/com/android/launcher3/views/SearchResultIconRow.java
+++ b/src/com/android/launcher3/views/SearchResultIconRow.java
@@ -63,11 +63,11 @@ public class SearchResultIconRow extends DoubleShadowBubbleTextView implements
     public static final String REMOTE_ACTION_SHOULD_START = "should_start_for_result";
     public static final String REMOTE_ACTION_TOKEN = "action_token";
 
-    private final int mCustomIconResId;
     private final boolean mMatchesInset;
 
     private SearchTarget mSearchTarget;
 
+    @Nullable private Drawable mCustomIcon;
 
     public SearchResultIconRow(@NonNull Context context) {
         this(context, null, 0);
@@ -83,10 +83,15 @@ public class SearchResultIconRow extends DoubleShadowBubbleTextView implements
         super(context, attrs, defStyleAttr);
         TypedArray a = context.obtainStyledAttributes(attrs,
                 R.styleable.SearchResultIconRow, defStyleAttr, 0);
-        mCustomIconResId = a.getResourceId(R.styleable.SearchResultIconRow_customIcon, 0);
         mMatchesInset = a.getBoolean(R.styleable.SearchResultIconRow_matchTextInsetWithQuery,
                 false);
 
+        int customIconResId = a.getResourceId(R.styleable.SearchResultIconRow_customIcon, 0);
+
+        if (customIconResId != 0) {
+            mCustomIcon = Launcher.getLauncher(context).getDrawable(customIconResId);
+        }
+
         a.recycle();
     }
 
@@ -172,13 +177,16 @@ public class SearchResultIconRow extends DoubleShadowBubbleTextView implements
     }
 
     private boolean loadIconFromResource() {
-        if (mCustomIconResId == 0) return false;
-        setIcon(Launcher.getLauncher(getContext()).getDrawable(mCustomIconResId));
+        if (mCustomIcon == null) return false;
+        setIcon(mCustomIcon);
         return true;
     }
 
     void reapplyItemInfoAsync(ItemInfoWithIcon itemInfoWithIcon) {
-        MAIN_EXECUTOR.post(() -> reapplyItemInfo(itemInfoWithIcon));
+        MAIN_EXECUTOR.post(() -> {
+            reapplyItemInfo(itemInfoWithIcon);
+            mCustomIcon = getIcon();
+        });
     }
 
     @Override
-- 
GitLab


From 54aae4f95d59025433c6dd4f92edabafc5cdb7f0 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Mon, 26 Oct 2020 16:00:49 -0700
Subject: [PATCH 0280/1664] Finishing recents task before starting share
 screenshot flow

Bug: 170338559
Change-Id: Ieccdc492c7d1a60b47b90c6683e60e8a143ca80d
---
 .../android/quickstep/TaskOverlayFactory.java | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
index 3a47024592..6677724982 100644
--- a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
@@ -31,6 +31,7 @@ import android.os.Build;
 import android.view.View;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 
 import com.android.launcher3.BaseActivity;
@@ -157,9 +158,8 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
                 getActionsView().setCallbacks(new OverlayUICallbacks() {
                     @Override
                     public void onShare() {
-                        endLiveTileMode(isAllowedByPolicy);
                         if (isAllowedByPolicy) {
-                            mImageApi.startShareActivity();
+                            endLiveTileMode(mImageApi::startShareActivity);
                         } else {
                             showBlockedByPolicyMessage();
                         }
@@ -168,8 +168,7 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
                     @SuppressLint("NewApi")
                     @Override
                     public void onScreenshot() {
-                        endLiveTileMode(isAllowedByPolicy);
-                        saveScreenshot(task);
+                        endLiveTileMode(() -> saveScreenshot(task));
                     }
                 });
             }
@@ -178,17 +177,15 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
         /**
          * End rendering live tile in Overview.
          *
-         * @param showScreenshot if it's true, we take a screenshot and switch to it.
+         * @param callback callback to run, after switching to screenshot
          */
-        public void endLiveTileMode(boolean showScreenshot) {
+        public void endLiveTileMode(@NonNull Runnable callback) {
             if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
                 RecentsView recentsView = mThumbnailView.getTaskView().getRecentsView();
-                if (showScreenshot) {
-                    recentsView.switchToScreenshot(
-                            () -> recentsView.finishRecentsAnimation(true /* toRecents */, null));
-                } else {
-                    recentsView.finishRecentsAnimation(true /* toRecents */, null);
-                }
+                recentsView.switchToScreenshot(
+                        () -> recentsView.finishRecentsAnimation(true /* toRecents */, callback));
+            } else {
+                callback.run();
             }
         }
 
-- 
GitLab


From 4a97458253e958b2e4488610be81cb45a1369d9e Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Mon, 26 Oct 2020 17:00:36 -0700
Subject: [PATCH 0281/1664] Changes COMPILE_SDK to S.

Change-Id: I5d4d84027904a7d7861e897ace1f7ce9fc04f4a4
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 7a51375653..7f4c60911e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,4 +10,4 @@ PROTOBUF_CLASS_PATH=com.google.protobuf:protobuf-gradle-plugin:0.8.8
 PROTOBUF_DEPENDENCY=com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7
 
 BUILD_TOOLS_VERSION=28.0.3
-COMPILE_SDK=android-R
+COMPILE_SDK=android-S
-- 
GitLab


From 9fc27da5f8d7834e8ed35d399406ec36bb05caa1 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Fri, 23 Oct 2020 00:14:56 -0700
Subject: [PATCH 0282/1664] Settings/Play/Suggest layout polish

Bug: 170792963
Bug: 170750779
Change-Id: I69b09f5360e165c3b1b33e259cdd0f390ce6fa60
---
 res/layout/search_result_play_item.xml                   | 9 +++++++--
 res/layout/search_result_suggest.xml                     | 4 ++--
 .../android/launcher3/views/SearchSettingsRowView.java   | 1 -
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/res/layout/search_result_play_item.xml b/res/layout/search_result_play_item.xml
index cdb793c19d..d70c56a1de 100644
--- a/res/layout/search_result_play_item.xml
+++ b/res/layout/search_result_play_item.xml
@@ -16,7 +16,7 @@
 <com.android.launcher3.views.SearchResultPlayItem xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="8dp"
+    android:padding="4dp"
     android:orientation="horizontal">
     <View
         android:id="@+id/icon"
@@ -31,13 +31,18 @@
         android:layout_gravity="start|center_vertical"
         android:layout_weight="1"
         android:orientation="vertical"
-        android:padding="8dp">
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp">
 
         <TextView
             android:id="@+id/title_view"
             style="@style/TextHeadline"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:ellipsize="end"
             android:textAlignment="viewStart"
             android:textColor="?android:attr/textColorPrimary"
             android:textSize="16sp" />
diff --git a/res/layout/search_result_suggest.xml b/res/layout/search_result_suggest.xml
index a3227cb9fa..1d8c8039e6 100644
--- a/res/layout/search_result_suggest.xml
+++ b/res/layout/search_result_suggest.xml
@@ -21,12 +21,12 @@
     android:gravity="start|center_vertical"
     android:textAlignment="viewStart"
     android:textColor="?android:attr/textColorPrimary"
-    android:textSize="16sp"
+    android:textSize="18sp"
     android:padding="@dimen/dynamic_grid_edge_margin"
     launcher:iconDisplay="hero_app"
     android:drawableTint="?android:attr/textColorPrimary"
     launcher:customIcon="@drawable/ic_allapps_search"
-    launcher:iconSizeOverride="24dp"
+    launcher:iconSizeOverride="48dp"
     launcher:matchTextInsetWithQuery="true"
     launcher:layoutHorizontal="true"
     android:drawablePadding="@dimen/dynamic_grid_icon_drawable_padding"
diff --git a/src/com/android/launcher3/views/SearchSettingsRowView.java b/src/com/android/launcher3/views/SearchSettingsRowView.java
index 30f686c86e..f0884f88aa 100644
--- a/src/com/android/launcher3/views/SearchSettingsRowView.java
+++ b/src/com/android/launcher3/views/SearchSettingsRowView.java
@@ -81,7 +81,6 @@ public class SearchSettingsRowView extends LinearLayout implements
         Bundle bundle = searchTarget.getExtras();
         mIntent = bundle.getParcelable("intent");
         showIfAvailable(mTitleView, bundle.getString("title"));
-        showIfAvailable(mDescriptionView, bundle.getString("description"));
         ArrayList<String> breadcrumbs = bundle.getStringArrayList("breadcrumbs");
         //TODO: implement RTL friendly breadcrumbs view
         showIfAvailable(mBreadcrumbsView, breadcrumbs != null
-- 
GitLab


From b694a69f53cc9a6c01d2866a7d58142d8041670b Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 13 Oct 2020 13:37:28 -0700
Subject: [PATCH 0283/1664] Integrating snapshot logging in Launcher

> Workspace snapshot is logged when the workspace loads (at most once a day)
> Removing unnecessary thread jumping when logging folders
> Preference snapshot is logged on process start and whenever something changes

Change-Id: I93767de89b11522d843c0e8300d1f108c78f6d90
---
 .../model/QuickstepModelDelegate.java         |  47 ++++++
 .../QuickstepProcessInitializer.java          |  10 ++
 .../logging/SettingsChangeLogger.java         | 155 ++++++++++++++++++
 .../logging/StatsLogCompatManager.java        |  80 +--------
 res/values/attrs.xml                          |   8 +
 res/xml/launcher_preferences.xml              |  19 ++-
 src/com/android/launcher3/DropTarget.java     |   4 +-
 .../launcher3/logging/StatsLogManager.java    |   8 -
 .../android/launcher3/model/LoaderTask.java   |   1 +
 .../launcher3/model/ModelDelegate.java        |   6 +
 10 files changed, 247 insertions(+), 91 deletions(-)
 create mode 100644 quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java

diff --git a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
index be57dece79..c3f5c00d75 100644
--- a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
+++ b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
@@ -15,11 +15,15 @@
  */
 package com.android.launcher3.model;
 
+import static android.text.format.DateUtils.DAY_IN_MILLIS;
+import static android.text.format.DateUtils.formatElapsedTime;
+
 import static com.android.launcher3.InvariantDeviceProfile.CHANGE_FLAG_GRID;
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION;
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_PREDICTION;
 import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
 import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT;
+import static com.android.launcher3.Utilities.getDevicePrefs;
 import static com.android.launcher3.hybridhotseat.HotseatPredictionModel.convertDataModelToAppTargetBundle;
 
 import android.app.prediction.AppPredictionContext;
@@ -29,10 +33,12 @@ import android.app.prediction.AppTarget;
 import android.app.prediction.AppTargetEvent;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.pm.LauncherActivityInfo;
 import android.content.pm.LauncherApps;
 import android.content.pm.ShortcutInfo;
 import android.os.UserHandle;
+import android.util.Log;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
@@ -40,12 +46,16 @@ import androidx.annotation.WorkerThread;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile.OnIDPChangeListener;
 import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.logging.InstanceId;
+import com.android.launcher3.logging.InstanceIdSequence;
 import com.android.launcher3.model.BgDataModel.FixedContainerItems;
 import com.android.launcher3.model.data.AppInfo;
+import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.shortcuts.ShortcutKey;
 import com.android.launcher3.util.Executors;
+import com.android.launcher3.util.IntSparseArrayMap;
 import com.android.launcher3.util.PersistedItemArray;
 import com.android.quickstep.logging.StatsLogCompatManager;
 
@@ -61,6 +71,10 @@ import java.util.stream.IntStream;
 public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChangeListener {
 
     public static final String LAST_PREDICTION_ENABLED_STATE = "last_prediction_enabled_state";
+    private static final String LAST_SNAPSHOT_TIME_MILLIS = "LAST_SNAPSHOT_TIME_MILLIS";
+
+    private static final boolean IS_DEBUG = false;
+    private static final String TAG = "QuickstepModelDelegate";
 
     private final PredictorState mAllAppsState =
             new PredictorState(CONTAINER_PREDICTION, "all_apps_predictions");
@@ -81,6 +95,7 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
     }
 
     @Override
+    @WorkerThread
     public void loadItems(UserManagerState ums, Map<ShortcutKey, ShortcutInfo> pinnedShortcuts) {
         // TODO: Implement caching and preloading
         super.loadItems(ums, pinnedShortcuts);
@@ -105,6 +120,38 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
         recreatePredictors();
     }
 
+    @Override
+    @WorkerThread
+    public void modelLoadComplete() {
+        super.modelLoadComplete();
+
+        // Log snapshot of the model
+        SharedPreferences prefs = getDevicePrefs(mApp.getContext());
+        long lastSnapshotTimeMillis = prefs.getLong(LAST_SNAPSHOT_TIME_MILLIS, 0);
+        // Log snapshot only if previous snapshot was older than a day
+        long now = System.currentTimeMillis();
+        if (now - lastSnapshotTimeMillis < DAY_IN_MILLIS) {
+            if (IS_DEBUG) {
+                String elapsedTime = formatElapsedTime((now - lastSnapshotTimeMillis) / 1000);
+                Log.d(TAG, String.format(
+                        "Skipped snapshot logging since previous snapshot was %s old.",
+                        elapsedTime));
+            }
+        } else {
+            IntSparseArrayMap<ItemInfo> itemsIdMap;
+            synchronized (mDataModel) {
+                itemsIdMap = mDataModel.itemsIdMap.clone();
+            }
+            InstanceId instanceId = new InstanceIdSequence().newInstanceId();
+            for (ItemInfo info : itemsIdMap) {
+                FolderInfo parent = info.container > 0
+                        ? (FolderInfo) itemsIdMap.get(info.container) : null;
+                StatsLogCompatManager.writeSnapshot(info.buildProto(parent), instanceId);
+            }
+            prefs.edit().putLong(LAST_SNAPSHOT_TIME_MILLIS, now).apply();
+        }
+    }
+
     @Override
     public void validateData() {
         super.validateData();
diff --git a/quickstep/src/com/android/quickstep/QuickstepProcessInitializer.java b/quickstep/src/com/android/quickstep/QuickstepProcessInitializer.java
index 32268a49b5..80308a58e2 100644
--- a/quickstep/src/com/android/quickstep/QuickstepProcessInitializer.java
+++ b/quickstep/src/com/android/quickstep/QuickstepProcessInitializer.java
@@ -15,19 +15,25 @@
  */
 package com.android.quickstep;
 
+import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.UserManager;
 import android.util.Log;
 
 import com.android.launcher3.BuildConfig;
 import com.android.launcher3.MainProcessInitializer;
+import com.android.launcher3.util.Executors;
+import com.android.quickstep.logging.SettingsChangeLogger;
 import com.android.systemui.shared.system.ThreadedRendererCompat;
 
 @SuppressWarnings("unused")
+@TargetApi(Build.VERSION_CODES.R)
 public class QuickstepProcessInitializer extends MainProcessInitializer {
 
     private static final String TAG = "QuickstepProcessInitializer";
+    private static final int SETUP_DELAY_MILLIS = 5000;
 
     public QuickstepProcessInitializer(Context context) { }
 
@@ -51,5 +57,9 @@ public class QuickstepProcessInitializer extends MainProcessInitializer {
         // Elevate GPU priority for Quickstep and Remote animations.
         ThreadedRendererCompat.setContextPriority(
                 ThreadedRendererCompat.EGL_CONTEXT_PRIORITY_HIGH_IMG);
+
+        // Initialize settings logger after a default timeout
+        Executors.MAIN_EXECUTOR.getHandler()
+                .postDelayed(() -> new SettingsChangeLogger(context), SETUP_DELAY_MILLIS);
     }
 }
diff --git a/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java b/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java
new file mode 100644
index 0000000000..0bb0bbc6c8
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.quickstep.logging;
+
+import static com.android.launcher3.Utilities.getDevicePrefs;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_SCREEN_SUGGESTIONS_DISABLED;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_SCREEN_SUGGESTIONS_ENABLED;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_NOTIFICATION_DOT_DISABLED;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_NOTIFICATION_DOT_ENABLED;
+import static com.android.launcher3.model.QuickstepModelDelegate.LAST_PREDICTION_ENABLED_STATE;
+import static com.android.launcher3.util.SecureSettingsObserver.newNotificationSettingsObserver;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
+import android.content.res.TypedArray;
+import android.util.ArrayMap;
+import android.util.Log;
+import android.util.Xml;
+
+import com.android.launcher3.AutoInstallsLayout;
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.logging.InstanceIdSequence;
+import com.android.launcher3.logging.StatsLogManager;
+import com.android.launcher3.logging.StatsLogManager.StatsLogger;
+import com.android.launcher3.util.SecureSettingsObserver;
+import com.android.quickstep.SysUINavigationMode;
+import com.android.quickstep.SysUINavigationMode.Mode;
+import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+
+/**
+ * Utility class to log launcher settings changes
+ */
+public class SettingsChangeLogger implements
+        NavigationModeChangeListener, OnSharedPreferenceChangeListener {
+
+    private static final String TAG = "SettingsChangeLogger";
+    private static final String ROOT_TAG = "androidx.preference.PreferenceScreen";
+    private static final String BOOLEAN_PREF = "SwitchPreference";
+
+    private final Context mContext;
+    private final ArrayMap<String, LoggablePref> mLoggablePrefs;
+
+    private Mode mNavMode;
+    private boolean mNotificationDotsEnabled;
+
+    public SettingsChangeLogger(Context context) {
+        mContext = context;
+        mLoggablePrefs = loadPrefKeys(context);
+        mNavMode = SysUINavigationMode.INSTANCE.get(context).addModeChangeListener(this);
+
+        Utilities.getPrefs(context).registerOnSharedPreferenceChangeListener(this);
+        getDevicePrefs(context).registerOnSharedPreferenceChangeListener(this);
+
+        SecureSettingsObserver dotsObserver =
+                newNotificationSettingsObserver(context, this::onNotificationDotsChanged);
+        mNotificationDotsEnabled = dotsObserver.getValue();
+        dispatchUserEvent();
+
+    }
+
+    private static ArrayMap<String, LoggablePref> loadPrefKeys(Context context) {
+        XmlPullParser parser = context.getResources().getXml(R.xml.launcher_preferences);
+        ArrayMap<String, LoggablePref> result = new ArrayMap<>();
+
+        try {
+            AutoInstallsLayout.beginDocument(parser, ROOT_TAG);
+            final int depth = parser.getDepth();
+            int type;
+            while (((type = parser.next()) != XmlPullParser.END_TAG
+                    || parser.getDepth() > depth) && type != XmlPullParser.END_DOCUMENT) {
+                if (type != XmlPullParser.START_TAG) {
+                    continue;
+                }
+                if (BOOLEAN_PREF.equals(parser.getName())) {
+                    TypedArray a = context.obtainStyledAttributes(
+                            Xml.asAttributeSet(parser), R.styleable.LoggablePref);
+                    String key = a.getString(R.styleable.LoggablePref_android_key);
+                    LoggablePref pref = new LoggablePref();
+                    pref.defaultValue =
+                            a.getBoolean(R.styleable.LoggablePref_android_defaultValue, true);
+                    pref.eventIdOn = a.getInt(R.styleable.LoggablePref_logIdOn, 0);
+                    pref.eventIdOff = a.getInt(R.styleable.LoggablePref_logIdOff, 0);
+                    if (pref.eventIdOff > 0 && pref.eventIdOn > 0) {
+                        result.put(key, pref);
+                    }
+                }
+            }
+        } catch (XmlPullParserException | IOException e) {
+            Log.e(TAG, "Error parsing preference xml", e);
+        }
+        return result;
+    }
+
+    private void onNotificationDotsChanged(boolean isDotsEnabled) {
+        mNotificationDotsEnabled = isDotsEnabled;
+        dispatchUserEvent();
+    }
+
+    @Override
+    public void onNavigationModeChanged(Mode newMode) {
+        mNavMode = newMode;
+        dispatchUserEvent();
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
+        if (LAST_PREDICTION_ENABLED_STATE.equals(key) || mLoggablePrefs.containsKey(key)) {
+            dispatchUserEvent();
+        }
+    }
+
+    private void dispatchUserEvent() {
+        StatsLogger logger = StatsLogManager.newInstance(mContext).logger()
+                .withInstanceId(new InstanceIdSequence().newInstanceId());
+
+        logger.log(mNotificationDotsEnabled
+                ? LAUNCHER_NOTIFICATION_DOT_ENABLED
+                : LAUNCHER_NOTIFICATION_DOT_DISABLED);
+        logger.log(mNavMode.launcherEvent);
+        logger.log(getDevicePrefs(mContext).getBoolean(LAST_PREDICTION_ENABLED_STATE, true)
+                ? LAUNCHER_HOME_SCREEN_SUGGESTIONS_ENABLED
+                : LAUNCHER_HOME_SCREEN_SUGGESTIONS_DISABLED);
+
+        SharedPreferences prefs = Utilities.getPrefs(mContext);
+        mLoggablePrefs.forEach((key, lp) -> logger.log(() ->
+                prefs.getBoolean(key, lp.defaultValue) ? lp.eventIdOn : lp.eventIdOff));
+    }
+
+    private static class LoggablePref {
+        public boolean defaultValue;
+        public int eventIdOn;
+        public int eventIdOff;
+    }
+}
diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
index 059d158ae6..d949126981 100644
--- a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
+++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
@@ -16,10 +16,6 @@
 
 package com.android.quickstep.logging;
 
-import static android.text.format.DateUtils.DAY_IN_MILLIS;
-import static android.text.format.DateUtils.formatElapsedTime;
-
-import static com.android.launcher3.Utilities.getDevicePrefs;
 import static com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.FOLDER;
 import static com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.SEARCH_RESULT_CONTAINER;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WORKSPACE_SNAPSHOT;
@@ -28,8 +24,6 @@ import static com.android.systemui.shared.system.SysUiStatsLog.LAUNCHER_UICHANGE
 import static com.android.systemui.shared.system.SysUiStatsLog.LAUNCHER_UICHANGED__DST_STATE__HOME;
 import static com.android.systemui.shared.system.SysUiStatsLog.LAUNCHER_UICHANGED__DST_STATE__OVERVIEW;
 
-import static java.lang.System.currentTimeMillis;
-
 import android.content.Context;
 import android.util.Log;
 
@@ -44,22 +38,16 @@ import com.android.launcher3.logger.LauncherAtom.FolderIcon;
 import com.android.launcher3.logger.LauncherAtom.FromState;
 import com.android.launcher3.logger.LauncherAtom.ToState;
 import com.android.launcher3.logging.InstanceId;
-import com.android.launcher3.logging.InstanceIdSequence;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.model.AllAppsList;
 import com.android.launcher3.model.BaseModelUpdateTask;
 import com.android.launcher3.model.BgDataModel;
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.model.data.LauncherAppWidgetInfo;
-import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.util.Executors;
-import com.android.launcher3.util.IntSparseArrayMap;
 import com.android.launcher3.util.LogConfig;
 import com.android.systemui.shared.system.SysUiStatsLog;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Optional;
 import java.util.OptionalInt;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -78,7 +66,6 @@ public class StatsLogCompatManager extends StatsLogManager {
 
     private static final String TAG = "StatsLog";
     private static final boolean IS_VERBOSE = Utilities.isPropertyEnabled(LogConfig.STATSLOG);
-    private static final String LAST_SNAPSHOT_TIME_MILLIS = "LAST_SNAPSHOT_TIME_MILLIS";
     private static final InstanceId DEFAULT_INSTANCE_ID = InstanceId.fakeInstanceId(0);
     // LauncherAtom.ItemInfo.getDefaultInstance() should be used but until launcher proto migrates
     // from nano to lite, bake constant to prevent robo test failure.
@@ -101,71 +88,10 @@ public class StatsLogCompatManager extends StatsLogManager {
     }
 
     /**
-     * Logs impression of the current workspace with additional launcher events.
+     * Synchronously writes an itemInfo to stats log
      */
-    @Override
-    public void logSnapshot(List<EventEnum> extraEvents) {
-        LauncherAppState.getInstance(mContext).getModel().enqueueModelUpdateTask(
-                new SnapshotWorker(extraEvents));
-    }
-
-    private class SnapshotWorker extends BaseModelUpdateTask {
-        private final InstanceId mInstanceId;
-        private final List<EventEnum> mExtraEvents;
-
-        SnapshotWorker(List<EventEnum> extraEvents) {
-            mInstanceId = new InstanceIdSequence(1 << 20 /*InstanceId.INSTANCE_ID_MAX*/)
-                    .newInstanceId();
-            this.mExtraEvents = extraEvents;
-        }
-
-        @Override
-        public void execute(LauncherAppState app, BgDataModel dataModel, AllAppsList apps) {
-            long lastSnapshotTimeMillis = getDevicePrefs(mContext)
-                    .getLong(LAST_SNAPSHOT_TIME_MILLIS, 0);
-            // Log snapshot only if previous snapshot was older than a day
-            if (currentTimeMillis() - lastSnapshotTimeMillis < DAY_IN_MILLIS) {
-                if (IS_VERBOSE) {
-                    String elapsedTime = formatElapsedTime(
-                            (currentTimeMillis() - lastSnapshotTimeMillis) / 1000);
-                    Log.d(TAG, String.format(
-                            "Skipped snapshot logging since previous snapshot was %s old.",
-                            elapsedTime));
-                }
-                return;
-            }
-
-            IntSparseArrayMap<FolderInfo> folders = dataModel.folders.clone();
-            ArrayList<ItemInfo> workspaceItems = (ArrayList) dataModel.workspaceItems.clone();
-            ArrayList<LauncherAppWidgetInfo> appWidgets = (ArrayList) dataModel.appWidgets.clone();
-            for (ItemInfo info : workspaceItems) {
-                LauncherAtom.ItemInfo atomInfo = info.buildProto(null);
-                writeSnapshot(atomInfo, mInstanceId);
-            }
-            for (FolderInfo fInfo : folders) {
-                try {
-                    ArrayList<WorkspaceItemInfo> folderContents =
-                            (ArrayList) Executors.MAIN_EXECUTOR.submit(fInfo.contents::clone).get();
-                    for (ItemInfo info : folderContents) {
-                        LauncherAtom.ItemInfo atomInfo = info.buildProto(fInfo);
-                        writeSnapshot(atomInfo, mInstanceId);
-                    }
-                } catch (Exception e) {
-                }
-            }
-            for (ItemInfo info : appWidgets) {
-                LauncherAtom.ItemInfo atomInfo = info.buildProto(null);
-                writeSnapshot(atomInfo, mInstanceId);
-            }
-            mExtraEvents
-                    .forEach(eventName -> logger().withInstanceId(mInstanceId).log(eventName));
-
-            getDevicePrefs(mContext).edit()
-                    .putLong(LAST_SNAPSHOT_TIME_MILLIS, currentTimeMillis()).apply();
-        }
-    }
-
-    private void writeSnapshot(LauncherAtom.ItemInfo info, InstanceId instanceId) {
+    @WorkerThread
+    public static void writeSnapshot(LauncherAtom.ItemInfo info, InstanceId instanceId) {
         if (IS_VERBOSE) {
             Log.d(TAG, String.format("\nwriteSnapshot(%d):\n%s", instanceId.getId(), info));
         }
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 6b0f30082c..c3ad1eb823 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -174,6 +174,14 @@
         <attr name="canThumbDetach" format="boolean" />
     </declare-styleable>
 
+    <declare-styleable name="LoggablePref">
+        <attr name="android:key" />
+        <attr name="android:defaultValue" />
+        <!-- Ground truth of this Pref integer can be found in StatsLogManager -->
+        <attr name="logIdOn" format="integer" />
+        <attr name="logIdOff" format="integer" />
+    </declare-styleable>
+
     <declare-styleable name="PreviewFragment">
         <attr name="android:name" />
         <attr name="android:id" />
diff --git a/res/xml/launcher_preferences.xml b/res/xml/launcher_preferences.xml
index 7e7220813a..e4bea508b3 100644
--- a/res/xml/launcher_preferences.xml
+++ b/res/xml/launcher_preferences.xml
@@ -15,7 +15,8 @@
 -->
 
 <androidx.preference.PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto">
 
     <com.android.launcher3.settings.NotificationDotsPreference
         android:key="pref_icon_badging"
@@ -30,19 +31,31 @@
         </intent>
     </com.android.launcher3.settings.NotificationDotsPreference>
 
+    <!--
+      LAUNCHER_ADD_NEW_APPS_TO_HOME_SCREEN_ENABLED(613)
+      LAUNCHER_ADD_NEW_APPS_TO_HOME_SCREEN_DISABLED(614)
+    -->
     <SwitchPreference
         android:key="pref_add_icon_to_home"
         android:title="@string/auto_add_shortcuts_label"
         android:summary="@string/auto_add_shortcuts_description"
         android:defaultValue="true"
-        android:persistent="true" />
+        android:persistent="true"
+        launcher:logIdOn="613"
+        launcher:logIdOff="614" />
 
+    <!--
+      LAUNCHER_HOME_SCREEN_ROTATION_ENABLED(615)
+      LAUNCHER_HOME_SCREEN_ROTATION_DISABLED(616)
+    -->
     <SwitchPreference
         android:key="pref_allowRotation"
         android:title="@string/allow_rotation_title"
         android:summary="@string/allow_rotation_desc"
         android:defaultValue="@bool/allow_rotation"
-        android:persistent="true" />
+        android:persistent="true"
+        launcher:logIdOn="615"
+        launcher:logIdOff="616" />
 
     <androidx.preference.PreferenceScreen
         android:key="pref_developer_options"
diff --git a/src/com/android/launcher3/DropTarget.java b/src/com/android/launcher3/DropTarget.java
index fd4c30c6f2..70d84760fc 100644
--- a/src/com/android/launcher3/DropTarget.java
+++ b/src/com/android/launcher3/DropTarget.java
@@ -79,9 +79,7 @@ public interface DropTarget {
         public DraggableView originalView = null;
 
         /** Used for matching DROP event with its corresponding DRAG event on the server side. */
-        public final InstanceId logInstanceId =
-                new InstanceIdSequence(1 << 20 /*InstanceId.INSTANCE_ID_MAX*/)
-                    .newInstanceId();
+        public final InstanceId logInstanceId = new InstanceIdSequence().newInstanceId();
 
         public DragObject(Context context) {
             if (FeatureFlags.FOLDER_NAME_SUGGEST.get()) {
diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index 2c5bf320ad..7e90769143 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -29,8 +29,6 @@ import com.android.launcher3.logger.LauncherAtom.ToState;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.util.ResourceBasedOverride;
 
-import java.util.List;
-
 /**
  * Handles the user event logging in R+.
  *
@@ -463,10 +461,4 @@ public class StatsLogManager implements ResourceBasedOverride {
                 context.getApplicationContext(), R.string.stats_log_manager_class);
         return mgr;
     }
-
-    /**
-     * Logs impression of the current workspace with additional launcher events.
-     */
-    public void logSnapshot(List<EventEnum> additionalEvents) {
-    }
 }
diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index d47fafd40b..b108788061 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -289,6 +289,7 @@ public class LoaderTask implements Runnable {
             updateHandler.finish();
             logger.addSplit("finish icon update");
 
+            mModelDelegate.modelLoadComplete();
             transaction.commit();
         } catch (CancellationException e) {
             // Loader stopped, ignore
diff --git a/src/com/android/launcher3/model/ModelDelegate.java b/src/com/android/launcher3/model/ModelDelegate.java
index 3ed880906d..92bea5b14c 100644
--- a/src/com/android/launcher3/model/ModelDelegate.java
+++ b/src/com/android/launcher3/model/ModelDelegate.java
@@ -77,6 +77,12 @@ public class ModelDelegate implements ResourceBasedOverride {
     @WorkerThread
     public void workspaceLoadComplete() { }
 
+    /**
+     * Called at the end of model load task
+     */
+    @WorkerThread
+    public void modelLoadComplete() { }
+
     /**
      * Called when the delegate is no loner needed
      */
-- 
GitLab


From 55940ecfc70b87ddaf05f0cb181ecf7fc3aa6e8c Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Fri, 23 Oct 2020 22:37:51 -0700
Subject: [PATCH 0284/1664] Render and track live tile position when launching
 another app from Overview

Fixes: 165394366
Fixes: 170338328
Test: Manual
Change-Id: Idfcd423cbe062af33564eaa9e83ec21fbac0cdf9
---
 .../android/quickstep/AbsSwipeUpHandler.java  |  6 +--
 .../com/android/quickstep/TaskViewUtils.java  |  7 +++-
 .../quickstep/util/TaskViewSimulator.java     | 31 +++++++--------
 .../android/quickstep/views/RecentsView.java  | 38 ++++++++++++++-----
 .../touch/LandscapePagedViewHandler.java      |  8 ++--
 .../touch/PagedOrientationHandler.java        |  4 +-
 .../touch/PortraitPagedViewHandler.java       |  4 +-
 7 files changed, 58 insertions(+), 40 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index a1988a17fe..8286d87582 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -41,10 +41,8 @@ import static com.android.quickstep.GestureState.STATE_END_TARGET_ANIMATION_FINI
 import static com.android.quickstep.GestureState.STATE_END_TARGET_SET;
 import static com.android.quickstep.GestureState.STATE_RECENTS_SCROLLING_FINISHED;
 import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;
-import static com.android.quickstep.TaskUtils.taskIsATargetWithMode;
 import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD;
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME;
-import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_CLOSING;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -1485,13 +1483,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                 mRecentsAnimationTargets.apps,
                 mRecentsAnimationTargets.apps.length + 1);
         apps[apps.length - 1] = appearedTaskTarget;
-        boolean launcherClosing =
-                taskIsATargetWithMode(apps, mActivity.getTaskId(), MODE_CLOSING);
 
         AnimatorSet anim = new AnimatorSet();
         TaskViewUtils.composeRecentsLaunchAnimator(
                 anim, taskView, apps,
-                mRecentsAnimationTargets.wallpapers, launcherClosing,
+                mRecentsAnimationTargets.wallpapers, true /* launcherClosing */,
                 mActivity.getStateManager(), mRecentsView,
                 mActivityInterface.getDepthController());
         anim.addListener(new AnimatorListenerAdapter(){
diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java
index 46c77681ae..ed761cf640 100644
--- a/quickstep/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java
@@ -297,7 +297,6 @@ public final class TaskViewUtils {
         PendingAnimation pa = new PendingAnimation(RECENTS_LAUNCH_DURATION);
         createRecentsWindowAnimator(taskView, skipLauncherChanges, appTargets, wallpaperTargets,
                 depthController, pa);
-        anim.play(pa.buildAnim());
 
         Animator childStateAnimation = null;
         // Found a visible recents task that matches the opening app, lets launch the app from there
@@ -330,7 +329,11 @@ public final class TaskViewUtils {
                 }
             };
         }
-        anim.play(launcherAnim);
+        pa.add(launcherAnim);
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && recentsView.getRunningTaskIndex() != -1) {
+            pa.addOnFrameCallback(recentsView::redrawLiveTile);
+        }
+        anim.play(pa.buildAnim());
 
         // Set the current animation first, before adding windowAnimEndListener. Setting current
         // animation adds some listeners which need to be called before windowAnimEndListener
diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index 08fe48d5ce..61ba411363 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -52,16 +52,16 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
 
     public static final IntProperty<TaskViewSimulator> SCROLL =
             new IntProperty<TaskViewSimulator>("scroll") {
-        @Override
-        public void setValue(TaskViewSimulator simulator, int i) {
-            simulator.setScroll(i);
-        }
+                @Override
+                public void setValue(TaskViewSimulator simulator, int scroll) {
+                    simulator.setScroll(scroll);
+                }
 
-        @Override
-        public Integer get(TaskViewSimulator simulator) {
-            return simulator.mScrollState.scroll;
-        }
-    };
+                @Override
+                public Integer get(TaskViewSimulator simulator) {
+                    return simulator.mScrollState.scroll;
+                }
+            };
 
     private final Rect mTmpCropRect = new Rect();
     private final RectF mTempRectF = new RectF();
@@ -72,7 +72,6 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
     private final BaseActivityInterface mSizeStrategy;
 
     private final Rect mTaskRect = new Rect();
-    private float mOffsetY;
     private boolean mDrawsBelowRecents;
     private final PointF mPivot = new PointF();
     private DeviceProfile mDp;
@@ -89,6 +88,8 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
     // TaskView properties
     private final FullscreenDrawParams mCurrentFullscreenParams;
     private float mCurveScale = 1;
+    public final AnimatedFloat taskPrimaryTranslation = new AnimatedFloat();
+    public final AnimatedFloat taskSecondaryTranslation = new AnimatedFloat();
 
     // RecentsView properties
     public final AnimatedFloat recentsViewScale = new AnimatedFloat();
@@ -178,10 +179,6 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
         }
     }
 
-    public void setOffsetY(float offsetY) {
-        mOffsetY = offsetY;
-    }
-
     public void setDrawsBelowRecents(boolean drawsBelowRecents) {
         mDrawsBelowRecents = drawsBelowRecents;
     }
@@ -298,7 +295,11 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
 
         // Apply TaskView matrix: scale, translate, scroll
         mMatrix.postScale(mCurveScale, mCurveScale, taskWidth / 2, taskHeight / 2);
-        mMatrix.postTranslate(mTaskRect.left, mTaskRect.top + mOffsetY);
+        mMatrix.postTranslate(mTaskRect.left, mTaskRect.top);
+        mOrientationState.getOrientationHandler().set(mMatrix, MATRIX_POST_TRANSLATE,
+                taskPrimaryTranslation.value);
+        mOrientationState.getOrientationHandler().setSecondary(mMatrix, MATRIX_POST_TRANSLATE,
+                taskSecondaryTranslation.value);
         mOrientationState.getOrientationHandler().set(
                 mMatrix, MATRIX_POST_TRANSLATE, mScrollState.scroll);
 
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 826555c24b..264a182dc2 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -51,6 +51,7 @@ import android.animation.AnimatorSet;
 import android.animation.LayoutTransition;
 import android.animation.LayoutTransition.TransitionListener;
 import android.animation.ObjectAnimator;
+import android.animation.PropertyValuesHolder;
 import android.animation.ValueAnimator;
 import android.annotation.TargetApi;
 import android.app.ActivityManager.RunningTaskInfo;
@@ -99,7 +100,6 @@ import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.anim.PendingAnimation.EndState;
-import com.android.launcher3.anim.PropertyListBuilder;
 import com.android.launcher3.anim.SpringProperty;
 import com.android.launcher3.compat.AccessibilityManagerCompat;
 import com.android.launcher3.config.FeatureFlags;
@@ -114,6 +114,7 @@ import com.android.launcher3.util.OverScroller;
 import com.android.launcher3.util.ResourceBasedOverride.Overrides;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.util.ViewPool;
+import com.android.quickstep.AnimatedFloat;
 import com.android.quickstep.BaseActivityInterface;
 import com.android.quickstep.GestureState;
 import com.android.quickstep.RecentsAnimationController;
@@ -874,9 +875,10 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             // Since we reuse the same mLiveTileTaskViewSimulator in the RecentsView, we need
             // to reset the params after it settles in Overview from swipe up so that we don't
             // render with obsolete param values.
+            mLiveTileTaskViewSimulator.taskPrimaryTranslation.value = 0;
+            mLiveTileTaskViewSimulator.taskSecondaryTranslation.value = 0;
             mLiveTileTaskViewSimulator.fullScreenProgress.value = 0;
             mLiveTileTaskViewSimulator.recentsViewScale.value = 1;
-            mLiveTileTaskViewSimulator.setOffsetY(0);
 
             // Reset the live tile rect
             DeviceProfile deviceProfile = mActivity.getDeviceProfile();
@@ -1545,7 +1547,10 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
 
         if (ENABLE_QUICKSTEP_LIVE_TILE.get() && getRunningTaskView() == taskView) {
             anim.addOnFrameCallback(() -> {
-                mLiveTileTaskViewSimulator.setOffsetY(taskView.getTranslationY());
+                mLiveTileTaskViewSimulator.taskSecondaryTranslation.value =
+                        mOrientationHandler.getSecondaryValue(
+                                taskView.getTranslationX(),
+                                taskView.getTranslationY());
                 redrawLiveTile();
             });
         }
@@ -2090,22 +2095,35 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         boolean launchingCenterTask = taskIndex == centerTaskIndex;
 
         float toScale = getMaxScaleForFullScreen();
+        RecentsView recentsView = tv.getRecentsView();
         if (launchingCenterTask) {
-            RecentsView recentsView = tv.getRecentsView();
             anim.play(ObjectAnimator.ofFloat(recentsView, RECENTS_SCALE_PROPERTY, toScale));
             anim.play(ObjectAnimator.ofFloat(recentsView, FULLSCREEN_PROGRESS, 1));
         } else {
             // We are launching an adjacent task, so parallax the center and other adjacent task.
             float displacementX = tv.getWidth() * (toScale - tv.getCurveScale());
-            anim.play(ObjectAnimator.ofFloat(getPageAt(centerTaskIndex), TRANSLATION_X,
-                    mIsRtl ? -displacementX : displacementX));
+            float primaryTranslation = mIsRtl ? -displacementX : displacementX;
+            anim.play(ObjectAnimator.ofFloat(getPageAt(centerTaskIndex),
+                    mOrientationHandler.getPrimaryViewTranslate(), primaryTranslation));
+            int runningTaskIndex = recentsView.getRunningTaskIndex();
+            if (ENABLE_QUICKSTEP_LIVE_TILE.get() && runningTaskIndex != -1
+                    && runningTaskIndex != taskIndex) {
+                anim.play(ObjectAnimator.ofFloat(
+                        recentsView.getLiveTileTaskViewSimulator().taskPrimaryTranslation,
+                        AnimatedFloat.VALUE,
+                        primaryTranslation));
+            }
 
             int otherAdjacentTaskIndex = centerTaskIndex + (centerTaskIndex - taskIndex);
             if (otherAdjacentTaskIndex >= 0 && otherAdjacentTaskIndex < getPageCount()) {
-                anim.play(new PropertyListBuilder()
-                        .translationX(mIsRtl ? -displacementX : displacementX)
-                        .scale(1)
-                        .build(getPageAt(otherAdjacentTaskIndex)));
+                PropertyValuesHolder[] properties = new PropertyValuesHolder[3];
+                properties[0] = PropertyValuesHolder.ofFloat(
+                        mOrientationHandler.getPrimaryViewTranslate(), primaryTranslation);
+                properties[1] = PropertyValuesHolder.ofFloat(View.SCALE_X, 1);
+                properties[2] = PropertyValuesHolder.ofFloat(View.SCALE_Y, 1);
+
+                anim.play(ObjectAnimator.ofPropertyValuesHolder(getPageAt(otherAdjacentTaskIndex),
+                        properties));
             }
         }
         return anim;
diff --git a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
index 17f02be5b4..ad6710f8e2 100644
--- a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
+++ b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
@@ -42,13 +42,13 @@ import com.android.launcher3.util.OverScroller;
 public class LandscapePagedViewHandler implements PagedOrientationHandler {
 
     @Override
-    public int getPrimaryValue(int x, int y) {
-        return y;
+    public <T> T getPrimaryValue(T x, T y) {
+        return x;
     }
 
     @Override
-    public int getSecondaryValue(int x, int y) {
-        return x;
+    public <T> T getSecondaryValue(T x, T y) {
+        return y;
     }
 
     @Override
diff --git a/src/com/android/launcher3/touch/PagedOrientationHandler.java b/src/com/android/launcher3/touch/PagedOrientationHandler.java
index 114b75acec..a9c50cdffc 100644
--- a/src/com/android/launcher3/touch/PagedOrientationHandler.java
+++ b/src/com/android/launcher3/touch/PagedOrientationHandler.java
@@ -84,8 +84,8 @@ public interface PagedOrientationHandler {
     boolean getRecentsRtlSetting(Resources resources);
     float getDegreesRotated();
     int getRotation();
-    int getPrimaryValue(int x, int y);
-    int getSecondaryValue(int x, int y);
+    <T> T getPrimaryValue(T x, T y);
+    <T> T getSecondaryValue(T x, T y);
     void delegateScrollTo(PagedView pagedView, int secondaryScroll, int primaryScroll);
     /** Uses {@params pagedView}.getScroll[X|Y]() method for the secondary amount*/
     void delegateScrollTo(PagedView pagedView, int primaryScroll);
diff --git a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
index 5f5b2d1feb..587e35ad6c 100644
--- a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
+++ b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
@@ -40,12 +40,12 @@ import com.android.launcher3.util.OverScroller;
 public class PortraitPagedViewHandler implements PagedOrientationHandler {
 
     @Override
-    public int getPrimaryValue(int x, int y) {
+    public <T> T getPrimaryValue(T x, T y) {
         return x;
     }
 
     @Override
-    public int getSecondaryValue(int x, int y) {
+    public <T> T getSecondaryValue(T x, T y) {
         return y;
     }
 
-- 
GitLab


From b30adcb2322b82f7009019647967adf487e3ad8d Mon Sep 17 00:00:00 2001
From: Riddle Hsu <riddlehsu@google.com>
Date: Wed, 7 Oct 2020 15:57:44 +0800
Subject: [PATCH 0285/1664] Use event time of app side for latency metrics

There are 2 reasons not to use MotionEvent#getEventTime:
1. There is an existing TouchEventReported metric for touch latency.
2. In instrumentation test, the event time is set when creating
   the motion event for injection. It may cause the results to be
   5 times slower than the real case. That may lead to miss the
   cost from app to system.

Bug: 166614700
Test: Enable statsd log: "adb shell cmd stats print-logs"
      Touch gesture navigation bar or launch app from launcher.
      adb logcat | grep statsd | grep "(48)"
Change-Id: Ica5e7df685fe737bbc3ac60c3ec35bad15466726
---
 .../src/com/android/quickstep/AbsSwipeUpHandler.java  |  5 -----
 quickstep/src/com/android/quickstep/GestureState.java | 11 +++++++++++
 .../android/quickstep/RecentsAnimationCallbacks.java  |  7 -------
 .../com/android/quickstep/TaskAnimationManager.java   |  2 +-
 .../android/quickstep/TouchInteractionService.java    |  2 ++
 src/com/android/launcher3/Launcher.java               |  2 +-
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index cc109f608c..5d227beac0 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1479,11 +1479,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         mGestureEndCallback = gestureEndCallback;
     }
 
-    @Override
-    public long getStartTouchTime() {
-        return mTouchTimeMs;
-    }
-
     protected void linkRecentsViewScroll() {
         SurfaceTransactionApplier.create(mRecentsView, applier -> {
             mTransformParams.setSyncTransactionApplier(applier);
diff --git a/quickstep/src/com/android/quickstep/GestureState.java b/quickstep/src/com/android/quickstep/GestureState.java
index f7889964d7..8d67ee697a 100644
--- a/quickstep/src/com/android/quickstep/GestureState.java
+++ b/quickstep/src/com/android/quickstep/GestureState.java
@@ -142,6 +142,9 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL
     private Set<Integer> mPreviouslyAppearedTaskIds = new HashSet<>();
     private int mLastStartedTaskId = -1;
 
+    /** The time when the swipe up gesture is triggered. */
+    private long mSwipeUpStartTimeMs;
+
     public GestureState(OverviewComponentObserver componentObserver, int gestureId) {
         mHomeIntent = componentObserver.getHomeIntent();
         mOverviewIntent = componentObserver.getOverviewIntent();
@@ -343,6 +346,14 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL
         mStateCallback.setState(STATE_RECENTS_ANIMATION_ENDED);
     }
 
+    void setSwipeUpStartTimeMs(long uptimeMs) {
+        mSwipeUpStartTimeMs = uptimeMs;
+    }
+
+    long getSwipeUpStartTimeMs() {
+        return mSwipeUpStartTimeMs;
+    }
+
     public void dump(PrintWriter pw) {
         pw.println("GestureState:");
         pw.println("  gestureID=" + mGestureId);
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java b/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java
index f319b943c6..a21c7140de 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java
@@ -160,12 +160,5 @@ public class RecentsAnimationCallbacks implements
          * Callback made when a task started from the recents is ready for an app transition.
          */
         default void onTaskAppeared(RemoteAnimationTargetCompat appearedTaskTarget) {}
-
-        /**
-         * The time in milliseconds of the touch event that starts the recents animation.
-         */
-        default long getStartTouchTime() {
-            return 0;
-        }
     }
 }
diff --git a/quickstep/src/com/android/quickstep/TaskAnimationManager.java b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
index 797797f3d4..6f2f86eac2 100644
--- a/quickstep/src/com/android/quickstep/TaskAnimationManager.java
+++ b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
@@ -119,7 +119,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
                 }
             }
         });
-        final long eventTime = listener.getStartTouchTime();
+        final long eventTime = gestureState.getSwipeUpStartTimeMs();
         mCallbacks.addListener(gestureState);
         mCallbacks.addListener(listener);
         UI_HELPER_EXECUTOR.execute(() -> ActivityManagerWrapper.getInstance()
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index eebb0de660..c95ff02546 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -45,6 +45,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.Looper;
+import android.os.SystemClock;
 import android.util.Log;
 import android.view.Choreographer;
 import android.view.InputEvent;
@@ -447,6 +448,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
                 // onConsumerInactive and wipe the previous gesture state
                 GestureState prevGestureState = new GestureState(mGestureState);
                 GestureState newGestureState = createGestureState(mGestureState);
+                newGestureState.setSwipeUpStartTimeMs(SystemClock.uptimeMillis());
                 mConsumer.onConsumerAboutToBeSwitched();
                 mGestureState = newGestureState;
                 mConsumer = newConsumer(prevGestureState, mGestureState, event);
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index ab8d7a5a69..699734c0c5 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1829,7 +1829,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
                 mTouchInProgress = true;
                 break;
             case MotionEvent.ACTION_UP:
-                mLastTouchUpTime = ev.getEventTime();
+                mLastTouchUpTime = SystemClock.uptimeMillis();
                 // Follow through
             case MotionEvent.ACTION_CANCEL:
                 mTouchInProgress = false;
-- 
GitLab


From a34766a1764c682915961c0b670b02344264fc4d Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Tue, 27 Oct 2020 05:14:56 -0700
Subject: [PATCH 0286/1664] IME bounds after DOWN->UP Motion event sequence

Bug: 170739594

Change-Id: I1aa8dd2ced7c017e57d3c14c02d5b78900a46caa
---
 .../AllAppsInsetTransitionController.java     | 153 ++++++++++++++----
 .../AbstractStateChangeTouchController.java   |   2 +-
 2 files changed, 119 insertions(+), 36 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java b/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
index d7af5f1a7a..08d573f08b 100644
--- a/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
@@ -29,13 +29,15 @@ import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.core.os.BuildCompat;
 
+import com.android.launcher3.util.UiThreadHelper;
+
 /**
  * Handles IME over all apps to be synchronously transitioning along with the passed in
  * root inset.
  */
 public class AllAppsInsetTransitionController {
 
-    private static final boolean DEBUG = false;
+    private static final boolean DEBUG = true;
     private static final String TAG = "AllAppsInsetTransitionController";
     private static final Interpolator LINEAR = new LinearInterpolator();
 
@@ -53,6 +55,13 @@ public class AllAppsInsetTransitionController {
     private float mDown, mCurrent;
     private View mApps;
 
+    // Only purpose of these states is to keep track of fast fling transition
+    enum State {
+        RESET, DRAG_START_BOTTOM, FLING_END_TOP,
+        DRAG_START_TOP, FLING_END_BOTTOM
+    }
+    private State mState;
+
     public AllAppsInsetTransitionController(float allAppsHeight, View appsView) {
         mAllAppsHeight = allAppsHeight;
         mApps = appsView;
@@ -64,6 +73,11 @@ public class AllAppsInsetTransitionController {
         WindowInsets insets = mApps.getRootWindowInsets();
         if (insets == null) return;
 
+        boolean imeVisible = insets.isVisible(WindowInsets.Type.ime());
+
+        if (DEBUG) {
+            Log.d(TAG, "\nhide imeVisible=" +  imeVisible);
+        }
         if (insets.isVisible(WindowInsets.Type.ime())) {
             mApps.getWindowInsetsController().hide(WindowInsets.Type.ime());
         }
@@ -78,20 +92,23 @@ public class AllAppsInsetTransitionController {
     @RequiresApi(api = Build.VERSION_CODES.R)
     public void onDragStart(float progress) {
         if (!BuildCompat.isAtLeastR()) return;
-        onAnimationEnd(progress);
 
+        // Until getRootWindowInsets().isVisible(...) method returns correct value,
+        // only support InsetController based IME transition during swipe up and
+        // NOT swipe down
+        if (Float.compare(progress, 0f) == 0) return;
+
+        setState(true, false, progress);
         mDown = progress * mAllAppsHeight;
 
         // Below two values are sometimes incorrect. Possibly a platform bug
-        mDownInsetBottom = mApps.getRootWindowInsets().getInsets(WindowInsets.Type.ime()).bottom;
-        mShownAtDown = mApps.getRootWindowInsets().isVisible(WindowInsets.Type.ime());
+        // mDownInsetBottom = mApps.getRootWindowInsets().getInsets(WindowInsets.Type.ime()).bottom;
+        // mShownAtDown = mApps.getRootWindowInsets().isVisible(WindowInsets.Type.ime());
 
-        // override this value based on what it should actually be.
-        mShownAtDown = Float.compare(progress, 1f) == 0 ? false : true;
-        mDownInsetBottom = mShownAtDown ? mShownInsetBottom : mHiddenInsetBottom;
         if (DEBUG) {
-            Log.d(TAG, "\nonDragStart mDownInsets=" + mDownInsetBottom
-                    + " mShownAtDown =" + mShownAtDown);
+            Log.d(TAG, "\nonDragStart progress=" +  progress
+                    + " mDownInsets=" + mDownInsetBottom
+                    + " mShownAtDown=" + mShownAtDown);
         }
 
         mApps.getWindowInsetsController().controlWindowInsetsAnimation(
@@ -103,36 +120,62 @@ public class AllAppsInsetTransitionController {
                         if (DEBUG) {
                             Log.d(TAG, "Listener.onReady " + (mCurrentRequest == this));
                         }
-                        if (mCurrentRequest == this) {
-                            mAnimationController = controller;
-                        } else {
-                            controller.finish(mShownAtDown);
+                        if (controller != null) {
+                            if (mCurrentRequest == this && !handleFinishOnFling(controller)) {
+                                    mAnimationController = controller;
+                            } else {
+                                controller.finish(false /* just don't show */);
+                            }
                         }
                     }
 
                     @Override
                     public void onFinished(WindowInsetsAnimationController controller) {
                         // when screen lock happens, then this method get called
-                        mAnimationController.finish(false);
-                        mAnimationController = null;
                         if (DEBUG) {
-                            Log.d(TAG, "Listener.onFinished ctrl=" + controller);
+                            Log.d(TAG, "Listener.onFinished ctrl=" + controller
+                                    + " mAnimationController=" + mAnimationController);
+                        }
+                        if (mAnimationController != null) {
+                            mAnimationController.finish(true);
+                            mAnimationController = null;
                         }
                     }
 
                     @Override
                     public void onCancelled(@Nullable WindowInsetsAnimationController controller) {
+                        if (DEBUG) {
+                            Log.d(TAG, "Listener.onCancelled ctrl=" + controller
+                                    + " mAnimationController=" + mAnimationController);
+                        }
+                        if (mState == State.DRAG_START_BOTTOM) {
+                            mApps.getWindowInsetsController().show(WindowInsets.Type.ime());
+                        }
                         mAnimationController = null;
                         if (controller != null) {
-                            controller.finish(mShownAtDown);
-                        }
-                        if (DEBUG) {
-                            Log.d(TAG, "Listener.onCancelled ctrl=" + controller);
+                            controller.finish(true);
                         }
+
                     }
                 });
     }
 
+    /**
+     * If IME bounds after touch sequence finishes, call finish.
+     */
+    private boolean handleFinishOnFling(WindowInsetsAnimationController controller) {
+        if (!BuildCompat.isAtLeastR()) return false;
+
+        if (mState == State.FLING_END_TOP) {
+            controller.finish(true);
+            return true;
+        } else if (mState == State.FLING_END_BOTTOM) {
+            controller.finish(false);
+            return true;
+        }
+        return false;
+    }
+
     /**
      * Handles the translation using the progress.
      *
@@ -153,18 +196,17 @@ public class AllAppsInsetTransitionController {
 
         int inset = (int) (mDownInsetBottom + (mDown - mCurrent) - shift);
 
-        if (DEBUG) {
-            Log.d(TAG, "updateInset mCurrent=" + mCurrent + " mDown="
-                    + mDown + " hidden=" + mHiddenInsetBottom
-                    + " shown=" + mShownInsetBottom
-                    + " mDownInsets.bottom=" + mDownInsetBottom + " inset:" + inset
-                    + " shift: " + shift);
-        }
         final int start = mShownAtDown ? mShownInsetBottom : mHiddenInsetBottom;
         final int end = mShownAtDown ? mHiddenInsetBottom : mShownInsetBottom;
         inset = Math.max(inset, mHiddenInsetBottom);
         inset = Math.min(inset, mShownInsetBottom);
-        Log.d(TAG, "updateInset inset:" + inset);
+        if (DEBUG || false) {
+            Log.d(TAG, "updateInset mCurrent=" + mCurrent + " mDown="
+                    + mDown + " hidden=" + mHiddenInsetBottom
+                    + " shown=" + mShownInsetBottom
+                    + " mDownInsets.bottom=" + mDownInsetBottom + " inset=" + inset
+                    + " shift= " + shift);
+        }
 
         mAnimationController.setInsetsAndAlpha(
                 Insets.of(0, 0, 0, inset),
@@ -179,19 +221,60 @@ public class AllAppsInsetTransitionController {
     @RequiresApi(api = 30)
     public void onAnimationEnd(float progress) {
         if (DEBUG) {
-            Log.d(TAG, "endTranslation progress=" + progress
+            Log.d(TAG, "onAnimationEnd progress=" + progress
                     + " mAnimationController=" + mAnimationController);
         }
-
-        if (mAnimationController == null) return;
-
-        if (Float.compare(progress, 1f) == 0 /* bottom */) {
-            mAnimationController.finish(false /* gone */);
+        if (mState == null) {
+            // only called when launcher restarting.
+            UiThreadHelper.hideKeyboardAsync(mApps.getContext(), mApps.getWindowToken());
+        }
+        setState(false, true, progress);
+        if (mAnimationController == null) {
+            return;
         }
-        if (Float.compare(progress, 0f) == 0 /* top */) {
+
+        /* handle finish */
+        if (mState == State.FLING_END_TOP) {
             mAnimationController.finish(true /* show */);
+        } else {
+            if (Float.compare(progress, 1f) == 0 /* bottom */) {
+                mAnimationController.finish(false /* gone */);
+            } else {
+                mAnimationController.finish(mShownAtDown);
+            }
+        }
+        /* handle finish */
+
+        if (DEBUG) {
+            Log.d(TAG, "endTranslation progress=" + progress
+                    + " mAnimationController=" + mAnimationController);
         }
         mAnimationController = null;
         mCurrentRequest = null;
+        setState(false, false, progress);
+    }
+
+    private void setState(boolean start, boolean end, float progress) {
+        State state = State.RESET;
+        if (start && end) {
+            throw new IllegalStateException("drag start and end cannot happen in same call");
+        }
+        if (start) {
+            if (Float.compare(progress, 1f) == 0) {
+                state = State.DRAG_START_BOTTOM;
+            } else if (Float.compare(progress, 0f) == 0) {
+                state = State.DRAG_START_TOP;
+            }
+        } else if (end) {
+            if (Float.compare(progress, 1f) == 0 && mState == State.DRAG_START_TOP) {
+                state = State.FLING_END_BOTTOM;
+            } else if (Float.compare(progress, 0f) == 0 && mState == State.DRAG_START_BOTTOM) {
+                state = State.FLING_END_TOP;
+            }
+        }
+        if (DEBUG) {
+            Log.d(TAG, "setState " + mState + " -> " + state);
+        }
+        mState = state;
     }
 }
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index 9fd53e2563..57c0ad92af 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -266,7 +266,7 @@ public abstract class AbstractStateChangeTouchController
         if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && BuildCompat.isAtLeastR()
                 && (mToState == ALL_APPS || mToState == NORMAL)) {
             mLauncher.getAllAppsController().getInsetController().onDragStart(
-                    mToState == ALL_APPS ? 0 : 1);
+                    mFromState == NORMAL ? 1f : 0f);
         }
     }
 
-- 
GitLab


From f39f351a0db43c95083d98620670f2eaec52357a Mon Sep 17 00:00:00 2001
From: Pinyao Ting <pinyaoting@google.com>
Date: Wed, 28 Oct 2020 16:30:42 -0700
Subject: [PATCH 0287/1664] fix the issue widget id can be wrong after restore

Bug: 171774227
Test: manual testing
1. randomly add/remove widgets to workspace
2. create a backup (Settings > System > Backup)
3. reset the device
4. restore from the backup
5. verify all of the widgets are restored properly

Change-Id: Id65e474dd9349aca715d7e6b88f8d58bc63066ae
---
 .../launcher3/AppWidgetsRestoredReceiver.java  | 12 ++++++++----
 .../android/launcher3/LauncherSettings.java    |  6 ++++++
 .../android/launcher3/util/ContentWriter.java  | 18 +++++++++++++++---
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/com/android/launcher3/AppWidgetsRestoredReceiver.java b/src/com/android/launcher3/AppWidgetsRestoredReceiver.java
index a55c90d341..8bf027d4e5 100644
--- a/src/com/android/launcher3/AppWidgetsRestoredReceiver.java
+++ b/src/com/android/launcher3/AppWidgetsRestoredReceiver.java
@@ -86,13 +86,12 @@ public class AppWidgetsRestoredReceiver extends BroadcastReceiver {
             long mainProfileId = UserCache.INSTANCE.get(context)
                     .getSerialNumberForUser(myUserHandle());
             String oldWidgetId = Integer.toString(oldWidgetIds[i]);
-            int result = new ContentWriter(context, new ContentWriter.CommitParams(
-                    "appWidgetId=? and (restored & 1) = 1 and profileId=?",
-                    new String[] { oldWidgetId, Long.toString(mainProfileId) }))
+            final String where = "appWidgetId=? and (restored & 1) = 1 and profileId=?";
+            final String[] args = new String[] { oldWidgetId, Long.toString(mainProfileId) };
+            int result = new ContentWriter(context, new ContentWriter.CommitParams(where, args))
                     .put(LauncherSettings.Favorites.APPWIDGET_ID, newWidgetIds[i])
                     .put(LauncherSettings.Favorites.RESTORED, state)
                     .commit();
-
             if (result == 0) {
                 Cursor cursor = cr.query(Favorites.CONTENT_URI,
                         new String[] {Favorites.APPWIDGET_ID},
@@ -106,6 +105,11 @@ public class AppWidgetsRestoredReceiver extends BroadcastReceiver {
                     cursor.close();
                 }
             }
+            // attempt to update widget id in backup table as well
+            new ContentWriter(context, ContentWriter.CommitParams.backupCommitParams(where, args))
+                    .put(LauncherSettings.Favorites.APPWIDGET_ID, newWidgetIds[i])
+                    .put(LauncherSettings.Favorites.RESTORED, state)
+                    .commit();
         }
 
         LauncherAppState app = LauncherAppState.getInstanceNoCreate();
diff --git a/src/com/android/launcher3/LauncherSettings.java b/src/com/android/launcher3/LauncherSettings.java
index d2758f53ad..fe423ed1be 100644
--- a/src/com/android/launcher3/LauncherSettings.java
+++ b/src/com/android/launcher3/LauncherSettings.java
@@ -120,6 +120,12 @@ public class LauncherSettings {
         public static final Uri CONTENT_URI = Uri.parse("content://"
                 + LauncherProvider.AUTHORITY + "/" + TABLE_NAME);
 
+        /**
+         * The content:// style URL for "favorites_bakup" table
+         */
+        public static final Uri BACKUP_CONTENT_URI = Uri.parse("content://"
+                + LauncherProvider.AUTHORITY + "/" + BACKUP_TABLE_NAME);
+
         /**
          * The content:// style URL for "favorites_preview" table
          */
diff --git a/src/com/android/launcher3/util/ContentWriter.java b/src/com/android/launcher3/util/ContentWriter.java
index 30c9ff9cb0..ee64e9865d 100644
--- a/src/com/android/launcher3/util/ContentWriter.java
+++ b/src/com/android/launcher3/util/ContentWriter.java
@@ -113,14 +113,26 @@ public class ContentWriter {
 
     public static final class CommitParams {
 
-        final Uri mUri = LauncherSettings.Favorites.CONTENT_URI;
-        String mWhere;
-        String[] mSelectionArgs;
+        final Uri mUri;
+        final String mWhere;
+        final String[] mSelectionArgs;
 
         public CommitParams(String where, String[] selectionArgs) {
+            this(LauncherSettings.Favorites.CONTENT_URI, where, selectionArgs);
+        }
+
+        private CommitParams(Uri uri, String where, String[] selectionArgs) {
+            mUri = uri;
             mWhere = where;
             mSelectionArgs = selectionArgs;
         }
 
+        /**
+         * Creates commit params for backup table.
+         */
+        public static CommitParams backupCommitParams(String where, String[] selectionArgs) {
+            return new CommitParams(
+                    LauncherSettings.Favorites.BACKUP_CONTENT_URI, where, selectionArgs);
+        }
     }
 }
-- 
GitLab


From 991e8208cc610e46f84503a43537ace9d90e481c Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Wed, 28 Oct 2020 22:34:23 -0700
Subject: [PATCH 0288/1664] Quick fix from ag/12914139

Test: N/A
Change-Id: I0b8274f8a912d091cfbbebafdee220b5e46ee74f
---
 .../android/launcher3/touch/LandscapePagedViewHandler.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
index ad6710f8e2..1d7f747c02 100644
--- a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
+++ b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
@@ -43,12 +43,12 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
 
     @Override
     public <T> T getPrimaryValue(T x, T y) {
-        return x;
+        return y;
     }
 
     @Override
     public <T> T getSecondaryValue(T x, T y) {
-        return y;
+        return x;
     }
 
     @Override
-- 
GitLab


From 1e042652a8d13a7aa6452328a4ba77601d4b0e40 Mon Sep 17 00:00:00 2001
From: Tiger Huang <tigerhuang@google.com>
Date: Thu, 29 Oct 2020 21:05:06 +0800
Subject: [PATCH 0289/1664] Replace the system UI visibility with appearance
 (Launcher)

The system UI visibility has been deprecated.

Bug: 149813814
Test: atest TaskSnapshotControllerTest TaskSnapshotPersisterLoaderTest
Change-Id: Ic4ed6f6ea693bb9c484062a35bf4292e0edff0e5
---
 .../src/com/android/quickstep/views/TaskThumbnailView.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
index dfb3860280..445e49085b 100644
--- a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
@@ -16,6 +16,9 @@
 
 package com.android.quickstep.views;
 
+import static android.view.WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS;
+import static android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS;
+
 import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.systemui.shared.system.WindowManagerWrapper.WINDOWING_MODE_FULLSCREEN;
 
@@ -250,10 +253,10 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
     public int getSysUiStatusNavFlags() {
         if (mThumbnailData != null) {
             int flags = 0;
-            flags |= (mThumbnailData.systemUiVisibility & SYSTEM_UI_FLAG_LIGHT_STATUS_BAR) != 0
+            flags |= (mThumbnailData.appearance & APPEARANCE_LIGHT_STATUS_BARS) != 0
                     ? SystemUiController.FLAG_LIGHT_STATUS
                     : SystemUiController.FLAG_DARK_STATUS;
-            flags |= (mThumbnailData.systemUiVisibility & SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR) != 0
+            flags |= (mThumbnailData.appearance & APPEARANCE_LIGHT_NAVIGATION_BARS) != 0
                     ? SystemUiController.FLAG_LIGHT_NAV
                     : SystemUiController.FLAG_DARK_NAV;
             return flags;
-- 
GitLab


From fbfccf9e2d0d9e782c6fe8c6ccb1bc34fc4d4e83 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Wed, 28 Oct 2020 22:33:51 -0700
Subject: [PATCH 0290/1664] Handle the animation when restarting apps

Fixes: 170338921
Test: manual

Change-Id: I5a5722cb62fb53a68d140621ad79ed97f4d98571
---
 .../android/quickstep/AbsSwipeUpHandler.java  | 33 ++++++++++++++-----
 .../quickstep/RecentsAnimationTargets.java    |  9 +++++
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 6cf3c7ade9..43c088b585 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1020,7 +1020,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
 
     protected abstract HomeAnimationFactory createHomeAnimationFactory(long duration);
 
-    private TaskStackChangeListener mActivityRestartListener = new TaskStackChangeListener() {
+    private final TaskStackChangeListener mActivityRestartListener = new TaskStackChangeListener() {
         @Override
         public void onActivityRestartAttempt(ActivityManager.RunningTaskInfo task,
                 boolean homeTaskVisible, boolean clearedTask, boolean wasVisible) {
@@ -1459,13 +1459,33 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
 
     protected abstract void finishRecentsControllerToHome(Runnable callback);
 
+    private final TaskStackChangeListener mLiveTileRestartListener = new TaskStackChangeListener() {
+        @Override
+        public void onActivityRestartAttempt(ActivityManager.RunningTaskInfo task,
+                boolean homeTaskVisible, boolean clearedTask, boolean wasVisible) {
+            if (mRecentsAnimationTargets.hasTask(task.taskId)) {
+                launchOtherTaskInLiveTileMode(task.taskId, mRecentsAnimationTargets.apps);
+            }
+            ActivityManagerWrapper.getInstance().unregisterTaskStackListener(
+                    mLiveTileRestartListener);
+        }
+    };
+
     private void setupLauncherUiAfterSwipeUpToRecentsAnimation() {
         endLauncherTransitionController();
         mActivityInterface.onSwipeUpToRecentsComplete();
         mRecentsView.onSwipeUpAnimationSuccess();
         if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
             mTaskAnimationManager.setLaunchOtherTaskInLiveTileModeHandler(
-                    this::launchOtherTaskInLiveTileMode);
+                    appearedTaskTarget -> {
+                        RemoteAnimationTargetCompat[] apps = Arrays.copyOf(
+                                mRecentsAnimationTargets.apps,
+                                mRecentsAnimationTargets.apps.length + 1);
+                        apps[apps.length - 1] = appearedTaskTarget;
+                        launchOtherTaskInLiveTileMode(appearedTaskTarget.taskId, apps);
+                    });
+            ActivityManagerWrapper.getInstance().registerTaskStackListener(
+                    mLiveTileRestartListener);
         }
 
         SystemUiProxy.INSTANCE.get(mContext).onOverviewShown(false, TAG);
@@ -1473,17 +1493,12 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         reset();
     }
 
-    private void launchOtherTaskInLiveTileMode(RemoteAnimationTargetCompat appearedTaskTarget) {
-        TaskView taskView = mRecentsView.getTaskView(appearedTaskTarget.taskId);
+    private void launchOtherTaskInLiveTileMode(int taskId, RemoteAnimationTargetCompat[] apps) {
+        TaskView taskView = mRecentsView.getTaskView(taskId);
         if (taskView == null) {
             return;
         }
 
-        RemoteAnimationTargetCompat[] apps = Arrays.copyOf(
-                mRecentsAnimationTargets.apps,
-                mRecentsAnimationTargets.apps.length + 1);
-        apps[apps.length - 1] = appearedTaskTarget;
-
         AnimatorSet anim = new AnimatorSet();
         TaskViewUtils.composeRecentsLaunchAnimator(
                 anim, taskView, apps,
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationTargets.java b/quickstep/src/com/android/quickstep/RecentsAnimationTargets.java
index 718c5baa2c..da0a66431e 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationTargets.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationTargets.java
@@ -41,4 +41,13 @@ public class RecentsAnimationTargets extends RemoteAnimationTargets {
     public boolean hasTargets() {
         return unfilteredApps.length != 0;
     }
+
+    public boolean hasTask(int taskId) {
+        for (RemoteAnimationTargetCompat target : unfilteredApps) {
+            if (target.taskId == taskId) {
+                return true;
+            }
+        }
+        return false;
+    }
 }
-- 
GitLab


From 6dcba895816c3fa71cda7ec01b7c3628f6e52c49 Mon Sep 17 00:00:00 2001
From: Sreyas <sreyasr@google.com>
Date: Fri, 16 Oct 2020 23:40:09 -0700
Subject: [PATCH 0291/1664] Refactoring DigitalWellbeing Banner to not use
 footers.

Removing use of footers as they are no longer necessary. Refactoring DWB code to a separate class to be cleaner. Also fixes bug with DWB animating in twice.

Bug: 171317883
Bug: 171317874
Tested:Manual

Change-Id: I78c4e541e7afa76301c3afc373ab3fa251a2c3b0
---
 .../views/DigitalWellBeingToast.java          |  82 ++++++++--
 .../com/android/quickstep/views/TaskView.java | 154 +-----------------
 2 files changed, 77 insertions(+), 159 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
index 95bde801bf..6630aede3d 100644
--- a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
+++ b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
@@ -17,6 +17,8 @@
 package com.android.quickstep.views;
 
 import static android.provider.Settings.ACTION_APP_USAGE_SETTINGS;
+import static android.view.Gravity.BOTTOM;
+import static android.view.Gravity.CENTER_HORIZONTAL;
 
 import static com.android.launcher3.Utilities.prefixTextWithIcon;
 import static com.android.launcher3.util.Executors.THREAD_POOL_EXECUTOR;
@@ -27,6 +29,7 @@ import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.content.pm.LauncherApps;
 import android.content.pm.LauncherApps.AppUsageLimit;
+import android.graphics.Outline;
 import android.icu.text.MeasureFormat;
 import android.icu.text.MeasureFormat.FormatWidth;
 import android.icu.util.Measure;
@@ -35,6 +38,9 @@ import android.os.Build;
 import android.os.UserHandle;
 import android.util.Log;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewOutlineProvider;
+import android.widget.FrameLayout;
 import android.widget.TextView;
 
 import androidx.annotation.StringRes;
@@ -61,6 +67,10 @@ public final class DigitalWellBeingToast {
     private Task mTask;
     private boolean mHasLimit;
     private long mAppRemainingTimeMs;
+    private View mBanner;
+    private ViewOutlineProvider mOldBannerOutlineProvider;
+    private float mBannerOffsetPercentage;
+    private float mBannerAlpha = 1f;
 
     public DigitalWellBeingToast(BaseDraggingActivity activity, TaskView taskView) {
         mActivity = activity;
@@ -68,18 +78,10 @@ public final class DigitalWellBeingToast {
         mLauncherApps = activity.getSystemService(LauncherApps.class);
     }
 
-    private void setTaskFooter(View view) {
-        View oldFooter = mTaskView.setFooter(TaskView.INDEX_DIGITAL_WELLBEING_TOAST, view);
-        if (oldFooter != null) {
-            oldFooter.setOnClickListener(null);
-            mActivity.getViewCache().recycleView(R.layout.digital_wellbeing_toast, oldFooter);
-        }
-    }
-
     private void setNoLimit() {
         mHasLimit = false;
         mTaskView.setContentDescription(mTask.titleDescription);
-        setTaskFooter(null);
+        replaceBanner(null);
         mAppRemainingTimeMs = 0;
     }
 
@@ -90,7 +92,7 @@ public final class DigitalWellBeingToast {
                 mActivity, mTaskView);
         toast.setText(prefixTextWithIcon(mActivity, R.drawable.ic_hourglass_top, getText()));
         toast.setOnClickListener(this::openAppUsageSettings);
-        setTaskFooter(toast);
+        replaceBanner(toast);
 
         mTaskView.setContentDescription(
                 getContentDescriptionForTask(mTask, appUsageLimitTimeMs, appRemainingTimeMs));
@@ -233,4 +235,64 @@ public final class DigitalWellBeingToast {
                         getText(appRemainingTimeMs)) :
                 task.titleDescription;
     }
+
+    private void replaceBanner(View view) {
+        resetOldBanner();
+        setBanner(view);
+    }
+
+    private void resetOldBanner() {
+        if (mBanner != null) {
+            mBanner.setOutlineProvider(mOldBannerOutlineProvider);
+            mTaskView.removeView(mBanner);
+            mBanner.setOnClickListener(null);
+            mActivity.getViewCache().recycleView(R.layout.digital_wellbeing_toast, mBanner);
+        }
+    }
+
+    private void setBanner(View view) {
+        mBanner = view;
+        if (view != null) {
+            setupAndAddBanner();
+            setBannerOutline();
+        }
+    }
+
+    private void setupAndAddBanner() {
+        FrameLayout.LayoutParams layoutParams =
+                (FrameLayout.LayoutParams) mBanner.getLayoutParams();
+        layoutParams.gravity = BOTTOM | CENTER_HORIZONTAL;
+        layoutParams.bottomMargin = ((ViewGroup.MarginLayoutParams)
+                mTaskView.getThumbnail().getLayoutParams()).bottomMargin;
+        mBanner.setTranslationY(mBannerOffsetPercentage * mBanner.getHeight());
+        mBanner.setAlpha(mBannerAlpha);
+        mTaskView.addView(mBanner);
+    }
+
+    private void setBannerOutline() {
+        mOldBannerOutlineProvider = mBanner.getOutlineProvider();
+        mBanner.setOutlineProvider(new ViewOutlineProvider() {
+            @Override
+            public void getOutline(View view, Outline outline) {
+                mOldBannerOutlineProvider.getOutline(view, outline);
+                outline.offset(0, -Math.round(view.getTranslationY()));
+            }
+        });
+        mBanner.setClipToOutline(true);
+    }
+
+    void updateBannerOffset(float offsetPercentage) {
+        if (mBanner != null && mBannerOffsetPercentage != offsetPercentage) {
+            mBannerOffsetPercentage = offsetPercentage;
+            mBanner.setTranslationY(offsetPercentage * mBanner.getHeight());
+            mBanner.invalidateOutline();
+        }
+    }
+
+    void updateBannerAlpha(float alpha) {
+        if (mBanner != null && mBannerAlpha != alpha) {
+            mBannerAlpha = alpha;
+            mBanner.setAlpha(alpha);
+        }
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 5154018f6c..23da7835c8 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -42,7 +42,6 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.TimeInterpolator;
-import android.animation.ValueAnimator;
 import android.app.ActivityOptions;
 import android.content.Context;
 import android.content.Intent;
@@ -194,12 +193,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
 
     private boolean mEndQuickswitchCuj;
 
-    // Order in which the footers appear. Lower order appear below higher order.
-    public static final int INDEX_DIGITAL_WELLBEING_TOAST = 0;
-    private final FooterWrapper[] mFooters = new FooterWrapper[2];
-    private float mFooterVerticalOffset = 0;
-    private float mFooterAlpha = 1;
-    private int mStackHeight;
     private View mContextualChipWrapper;
     private View mContextualChip;
     private final float[] mIconCenterCoords = new float[2];
@@ -343,7 +336,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         if (mContextualChipWrapper != null) {
             mContextualChipWrapper.setAlpha(comp(modalness));
         }
-        updateFooterVerticalOffset(mFooterVerticalOffset);
+        mDigitalWellBeingToast.updateBannerOffset(modalness);
     }
 
     public TaskMenuView getMenuView() {
@@ -567,7 +560,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
             mContextualChip.setScaleX(scale);
             mContextualChip.setScaleY(scale);
         }
-        updateFooterVerticalOffset(1.0f - scale);
+        mDigitalWellBeingToast.updateBannerOffset(1f - scale);
     }
 
     public void setIconScaleAnimStartProgress(float startProgress) {
@@ -639,12 +632,9 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         mSnapshotView.setDimAlpha(curveInterpolation * MAX_PAGE_SCRIM_ALPHA);
         setCurveScale(curveScaleForCurveInterpolation);
 
-        mFooterAlpha = Utilities.boundToRange(1.0f - 2 * scrollState.linearInterpolation, 0f, 1f);
-        for (FooterWrapper footer : mFooters) {
-            if (footer != null) {
-                footer.mView.setAlpha(mFooterAlpha);
-            }
-        }
+        float dwbBannerAlpha = Utilities.boundToRange(1.0f - 2 * scrollState.linearInterpolation,
+                0f, 1f);
+        mDigitalWellBeingToast.updateBannerAlpha(dwbBannerAlpha);
 
         if (mMenuView != null) {
             PagedOrientationHandler pagedOrientationHandler = getPagedOrientationHandler();
@@ -656,57 +646,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         }
     }
 
-    /**
-     * Sets the footer at the specific index and returns the previously set footer.
-     */
-    public View setFooter(int index, View view) {
-        View oldFooter = null;
-
-        // If the footer are is already collapsed, do not animate entry
-        boolean shouldAnimateEntry = mFooterVerticalOffset <= 0;
-
-        if (mFooters[index] != null) {
-            oldFooter = mFooters[index].mView;
-            mFooters[index].release();
-            removeView(oldFooter);
-
-            // If we are replacing an existing footer, do not animate entry
-            shouldAnimateEntry = false;
-        }
-        if (view != null) {
-            int indexToAdd = getChildCount();
-            for (int i = index - 1; i >= 0; i--) {
-                if (mFooters[i] != null) {
-                    indexToAdd = indexOfChild(mFooters[i].mView);
-                    break;
-                }
-            }
-
-            addView(view, indexToAdd);
-            LayoutParams layoutParams = (LayoutParams) view.getLayoutParams();
-            layoutParams.gravity = BOTTOM | CENTER_HORIZONTAL;
-            layoutParams.bottomMargin =
-                    ((MarginLayoutParams) mSnapshotView.getLayoutParams()).bottomMargin;
-            view.setAlpha(mFooterAlpha);
-            mFooters[index] = new FooterWrapper(view);
-            if (shouldAnimateEntry) {
-                mFooters[index].animateEntry();
-            }
-        } else {
-            mFooters[index] = null;
-        }
-
-        mStackHeight = 0;
-        for (FooterWrapper footer : mFooters) {
-            if (footer != null) {
-                footer.setVerticalShift(mStackHeight);
-                mStackHeight += footer.mExpectedHeight;
-            }
-        }
-
-        return oldFooter;
-    }
-
     /**
      * Sets the contextual chip.
      *
@@ -780,24 +719,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
             SYSTEM_GESTURE_EXCLUSION_RECT.get(0).set(0, 0, getWidth(), getHeight());
             setSystemGestureExclusionRects(SYSTEM_GESTURE_EXCLUSION_RECT);
         }
-
-        mStackHeight = 0;
-        for (FooterWrapper footer : mFooters) {
-            if (footer != null) {
-                mStackHeight += footer.mView.getHeight();
-            }
-        }
-        updateFooterVerticalOffset(0);
-    }
-
-    private void updateFooterVerticalOffset(float offset) {
-        mFooterVerticalOffset = offset;
-
-        for (FooterWrapper footer : mFooters) {
-            if (footer != null) {
-                footer.updateFooterOffset();
-            }
-        }
     }
 
     public static float getCurveScaleForInterpolation(float linearInterpolation) {
@@ -860,71 +781,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         }
     }
 
-    private class FooterWrapper extends ViewOutlineProvider {
-
-        final View mView;
-        final ViewOutlineProvider mOldOutlineProvider;
-        final ViewOutlineProvider mDelegate;
-
-        final int mExpectedHeight;
-        final int mOldPaddingBottom;
-
-        int mAnimationOffset = 0;
-        int mEntryAnimationOffset = 0;
-
-        public FooterWrapper(View view) {
-            mView = view;
-            mOldOutlineProvider = view.getOutlineProvider();
-            mDelegate = mOldOutlineProvider == null
-                    ? ViewOutlineProvider.BACKGROUND : mOldOutlineProvider;
-
-            mExpectedHeight = getExpectedViewHeight(view);
-            mOldPaddingBottom = view.getPaddingBottom();
-
-            if (mOldOutlineProvider != null) {
-                view.setOutlineProvider(this);
-                view.setClipToOutline(true);
-            }
-        }
-
-        public void setVerticalShift(int shift) {
-            mView.setPadding(mView.getPaddingLeft(), mView.getPaddingTop(),
-                    mView.getPaddingRight(), mOldPaddingBottom + shift);
-        }
-
-        @Override
-        public void getOutline(View view, Outline outline) {
-            mDelegate.getOutline(view, outline);
-            outline.offset(0, -mAnimationOffset - mEntryAnimationOffset);
-        }
-
-        void updateFooterOffset() {
-            float offset = Utilities.or(mFooterVerticalOffset, mModalness);
-            mAnimationOffset = Math.round(mStackHeight * offset);
-            mView.setTranslationY(mAnimationOffset + mEntryAnimationOffset
-                    + mCurrentFullscreenParams.mCurrentDrawnInsets.bottom
-                    + mCurrentFullscreenParams.mCurrentDrawnInsets.top);
-            mView.invalidateOutline();
-        }
-
-        void release() {
-            mView.setOutlineProvider(mOldOutlineProvider);
-            setVerticalShift(0);
-        }
-
-        void animateEntry() {
-            ValueAnimator animator = ValueAnimator.ofFloat(0, 1);
-            animator.addUpdateListener(anim -> {
-               float factor = 1 - anim.getAnimatedFraction();
-               int totalShift = mExpectedHeight + mView.getPaddingBottom() - mOldPaddingBottom;
-                mEntryAnimationOffset = Math.round(factor * totalShift);
-                updateFooterOffset();
-            });
-            animator.setDuration(100);
-            animator.start();
-        }
-    }
-
     private int getExpectedViewHeight(View view) {
         int expectedHeight;
         int h = view.getLayoutParams().height;
-- 
GitLab


From c0ef31e38f2b73ca2d585f4eb7cb86ef97108e09 Mon Sep 17 00:00:00 2001
From: Vadim Tryshev <vadimt@google.com>
Date: Sat, 31 Oct 2020 01:50:29 +0000
Subject: [PATCH 0292/1664] Revert "Removing workaround for battery defender"

This reverts commit ff39fd3e14329db22ef34da32b9116fbe39af6f1.

Reason for revert: The CL coincided with a start of flakes "phone is locked". Let's revert and see if it fixed that. https://flakes-clusters.corp.google.com/#/?androidAtpBranch=git_master&androidAtpModule=com.google.android.apps.nexuslauncher.out_of_proc_tests&d=30&cid=9fd6b65c-e48c-4bc3-b19b-f5c610a1999a&maxResults=20

Change-Id: I90f8abbb1794c19593ed8a235a82c0e53030c0a2
---
 .../launcher3/ui/AbstractLauncherUiTest.java     | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index d3fc89e6be..e118481570 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -234,11 +234,25 @@ public abstract class AbstractLauncherUiTest {
         return mDevice;
     }
 
+    private boolean hasSystemUiObject(String resId) {
+        return mDevice.hasObject(By.res(SYSTEMUI_PACKAGE, resId));
+    }
+
     @Before
     public void setUp() throws Exception {
-        Assert.assertTrue("Keyguard is visible",
+        Log.d(TAG, "Before disabling battery defender");
+        mDevice.executeShellCommand("setprop vendor.battery.defender.disable 1");
+        Log.d(TAG, "Before enabling stay awake");
+        mDevice.executeShellCommand("settings put global stay_on_while_plugged_in 3");
+        for (int i = 0; i < 10 && hasSystemUiObject("keyguard_status_view"); ++i) {
+            Log.d(TAG, "Before unlocking the phone");
+            mDevice.executeShellCommand("input keyevent 82");
+            mDevice.waitForIdle();
+        }
+        Assert.assertTrue("Keyguard still visible",
                 mDevice.wait(
                         Until.gone(By.res(SYSTEMUI_PACKAGE, "keyguard_status_view")), 60000));
+        Log.d(TAG, "Keyguard is not visible");
 
         final String launcherPackageName = mDevice.getLauncherPackageName();
         try {
-- 
GitLab


From 22a5a684641f5e634ff5c36e788dde39d33a1380 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 2 Nov 2020 17:04:58 -0800
Subject: [PATCH 0293/1664] Fix a couple notificaiton dot issues

Fixes: 172010602 by adding drawDotIfNecessary() back to BubbleTextView
Fixes: 167272638 by overriding drawDotIfNecessary() to do nothing in
DeepShortcutTextView

Change-Id: I0bfbbc6e27dedac73ae97c5a084412ce1aba11e4
---
 src/com/android/launcher3/BubbleTextView.java               | 1 +
 .../android/launcher3/shortcuts/DeepShortcutTextView.java   | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 1015a322e8..5cd63721d3 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -446,6 +446,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
             canvas.restoreToCount(count);
         }
         super.onDraw(canvas);
+        drawDotIfNecessary(canvas);
     }
 
     protected void drawFocusHighlight(Canvas canvas) {
diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutTextView.java b/src/com/android/launcher3/shortcuts/DeepShortcutTextView.java
index eb685921d9..ad3f8df04b 100644
--- a/src/com/android/launcher3/shortcuts/DeepShortcutTextView.java
+++ b/src/com/android/launcher3/shortcuts/DeepShortcutTextView.java
@@ -132,6 +132,12 @@ public class DeepShortcutTextView extends BubbleTextView {
         mLoadingStatePlaceholder.draw(canvas);
     }
 
+    @Override
+    protected void drawDotIfNecessary(Canvas canvas) {
+        // This view (with the text label to the side of the icon) is not designed for a dot to be
+        // drawn on top of it, so never draw one even if a notification for this shortcut exists.
+    }
+
     private void showLoadingState(boolean loading) {
         if (loading == mShowLoadingState) {
             return;
-- 
GitLab


From a87f99a35ae37dc4520834a80976306e4c388e88 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Mon, 2 Nov 2020 20:45:06 -0800
Subject: [PATCH 0294/1664] [DO NOT MERGE] Add WW log for noti shade swipe down
 from home.

Bug: 171973663
Change-Id: I1e8ff20c62d4f91a05cb1cfc0337e351f2bc8885
---
 .../touchcontrollers/StatusBarTouchController.java            | 3 +++
 src/com/android/launcher3/logging/StatsLogManager.java        | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java
index 16bd9ed384..7a7cbb4d9b 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java
@@ -19,6 +19,7 @@ import static android.view.MotionEvent.ACTION_DOWN;
 import static android.view.MotionEvent.ACTION_MOVE;
 import static android.view.MotionEvent.ACTION_UP;
 import static android.view.MotionEvent.ACTION_CANCEL;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SWIPE_DOWN_WORKSPACE_NOTISHADE_OPEN;
 
 import android.graphics.PointF;
 import android.util.SparseArray;
@@ -136,6 +137,8 @@ public class StatusBarTouchController implements TouchController {
             mLauncher.getUserEventDispatcher().logActionOnContainer(action == ACTION_UP ?
                     Touch.FLING : Touch.SWIPE, Direction.DOWN, ContainerType.WORKSPACE,
                     mLauncher.getWorkspace().getCurrentPage());
+            mLauncher.getStatsLogManager().logger()
+                    .log(LAUNCHER_SWIPE_DOWN_WORKSPACE_NOTISHADE_OPEN);
             setWindowSlippery(false);
             return true;
         }
diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index e754618a10..c4a4c98699 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -319,8 +319,10 @@ public class StatsLogManager implements ResourceBasedOverride {
         LAUNCHER_NAVIGATION_MODE_GESTURE_BUTTON(625),
 
         @UiEvent(doc = "User tapped on image content in Overview Select mode.")
-        LAUNCHER_SELECT_MODE_IMAGE(627);
+        LAUNCHER_SELECT_MODE_IMAGE(627),
 
+        @UiEvent(doc = "User swiped down on workspace (triggering noti shade to open).")
+        LAUNCHER_SWIPE_DOWN_WORKSPACE_NOTISHADE_OPEN(651);
         // ADD MORE
 
         private final int mId;
-- 
GitLab


From 8cadc1281f4ef6a64d0bca9c7a9a0415e2e024af Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 4 Nov 2020 14:29:18 -0800
Subject: [PATCH 0295/1664] Using UI_HELPER_THREAD for various activity manager
 interactions

Bug: 170648272
Change-Id: Iec36389be5d747c5dc4d2bb2a8138758d48efa53
---
 .../com/android/launcher3/BaseQuickstepLauncher.java  | 11 ++++++-----
 .../launcher3/uioverrides/QuickstepLauncher.java      |  5 ++---
 .../touchcontrollers/NavBarToHomeTouchController.java |  5 ++---
 .../touchcontrollers/QuickSwitchTouchController.java  |  5 ++---
 .../com/android/quickstep/OverviewCommandHelper.java  |  6 ++----
 quickstep/src/com/android/quickstep/TaskUtils.java    | 11 +++++++++++
 .../inputconsumers/OtherActivityInputConsumer.java    |  4 ++--
 .../inputconsumers/OverviewInputConsumer.java         |  5 ++---
 .../src/com/android/quickstep/views/RecentsView.java  |  9 ++++-----
 9 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 44d43c6784..456727c069 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -19,11 +19,10 @@ import static com.android.launcher3.AbstractFloatingView.TYPE_ALL;
 import static com.android.launcher3.AbstractFloatingView.TYPE_HIDE_BACK_BUTTON;
 import static com.android.launcher3.LauncherState.FLAG_HIDE_BACK_BUTTON;
 import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY;
 
-import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
-
 import android.animation.AnimatorSet;
 import android.animation.ValueAnimator;
 import android.app.ActivityOptions;
@@ -48,12 +47,14 @@ import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;
 import com.android.quickstep.SystemUiProxy;
+import com.android.quickstep.TaskUtils;
 import com.android.quickstep.util.RemoteAnimationProvider;
 import com.android.quickstep.util.RemoteFadeOutAnimationListener;
 import com.android.quickstep.views.OverviewActionsView;
 import com.android.quickstep.views.RecentsView;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
+import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
 import java.util.stream.Stream;
@@ -123,7 +124,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
     @Override
     protected void onUiChangedWhileSleeping() {
         // Remove the snapshot because the content view may have obvious changes.
-        ActivityManagerWrapper.getInstance().invalidateHomeTaskSnapshot(this);
+        UI_HELPER_EXECUTOR.execute(
+                () -> ActivityManagerWrapper.getInstance().invalidateHomeTaskSnapshot(this));
     }
 
     @Override
@@ -203,8 +205,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
     @Override
     protected void closeOpenViews(boolean animate) {
         super.closeOpenViews(animate);
-        ActivityManagerWrapper.getInstance()
-                .closeSystemWindows(CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY);
+        TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY);
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index e808f8cb78..e02c0c35a6 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -74,10 +74,10 @@ import com.android.launcher3.util.UiThreadHelper.AsyncCommand;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.SystemUiProxy;
+import com.android.quickstep.TaskUtils;
 import com.android.quickstep.util.QuickstepOnboardingPrefs;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
-import com.android.systemui.shared.system.ActivityManagerWrapper;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
@@ -175,8 +175,7 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
 
     @Override
     protected void showAllAppsFromIntent(boolean alreadyOnHome) {
-        ActivityManagerWrapper.getInstance().closeSystemWindows(
-            CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY);
+        TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY);
         super.showAllAppsFromIntent(alreadyOnHome);
     }
 
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
index d210bc6851..5181a86960 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
@@ -49,11 +49,11 @@ import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
 import com.android.launcher3.util.TouchController;
+import com.android.quickstep.TaskUtils;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
 import com.android.quickstep.util.AssistantUtilities;
 import com.android.quickstep.util.OverviewToHomeAnim;
 import com.android.quickstep.views.RecentsView;
-import com.android.systemui.shared.system.ActivityManagerWrapper;
 
 /**
  * Handles swiping up on the nav bar to go home from launcher, e.g. overview or all apps.
@@ -233,8 +233,7 @@ public class NavBarToHomeTouchController implements TouchController,
                 AbstractFloatingView.closeAllOpenViews(mLauncher);
                 // TODO: add to WW log
             }
-            ActivityManagerWrapper.getInstance()
-                    .closeSystemWindows(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
+            TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
         } else {
             // Quickly return to the state we came from (we didn't move far).
             ValueAnimator anim = mCurrentAnimation.getAnimationPlayer();
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
index b8c2030852..d39b6f5d97 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
@@ -45,9 +45,9 @@ import com.android.launcher3.touch.SingleAxisSwipeDetector;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.SystemUiProxy;
+import com.android.quickstep.TaskUtils;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
-import com.android.systemui.shared.system.ActivityManagerWrapper;
 
 /**
  * Handles quick switching to a recent task from the home screen.
@@ -92,8 +92,7 @@ public class QuickSwitchTouchController extends AbstractStateChangeTouchControll
     public void onDragStart(boolean start, float startDisplacement) {
         super.onDragStart(start, startDisplacement);
         mStartContainerType = LAUNCHER_STATE_BACKGROUND;
-        ActivityManagerWrapper.getInstance()
-                .closeSystemWindows(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
+        TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
index 9f7871a29c..1badfbcb53 100644
--- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
@@ -65,16 +65,14 @@ public class OverviewCommandHelper {
             return;
         }
 
-        ActivityManagerWrapper.getInstance()
-                .closeSystemWindows(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
+        TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
         MAIN_EXECUTOR.execute(new RecentsActivityCommand<>());
     }
 
     @BinderThread
     public void onOverviewShown(boolean triggeredFromAltTab) {
         if (triggeredFromAltTab) {
-            ActivityManagerWrapper.getInstance()
-                    .closeSystemWindows(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
+            TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
         }
         MAIN_EXECUTOR.execute(new ShowRecentsCommand(triggeredFromAltTab));
     }
diff --git a/quickstep/src/com/android/quickstep/TaskUtils.java b/quickstep/src/com/android/quickstep/TaskUtils.java
index 04b488da9a..c9db1533ff 100644
--- a/quickstep/src/com/android/quickstep/TaskUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskUtils.java
@@ -16,6 +16,8 @@
 
 package com.android.quickstep;
 
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
@@ -27,6 +29,7 @@ import com.android.launcher3.pm.UserCache;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.systemui.shared.recents.model.Task;
+import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
 import java.util.List;
@@ -86,4 +89,12 @@ public final class TaskUtils {
         }
         return false;
     }
+
+    /**
+     * Requests that the system close any open system windows (including other SystemUI).
+     */
+    public static void closeSystemWindowsAsync(String reason) {
+        UI_HELPER_EXECUTOR.execute(
+                () -> ActivityManagerWrapper.getInstance().closeSystemWindows(reason));
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
index 82f489f680..f2f9fb7af6 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
@@ -63,6 +63,7 @@ import com.android.quickstep.RecentsAnimationCallbacks;
 import com.android.quickstep.RecentsAnimationDeviceState;
 import com.android.quickstep.RotationTouchHelper;
 import com.android.quickstep.TaskAnimationManager;
+import com.android.quickstep.TaskUtils;
 import com.android.quickstep.util.ActiveGestureLog;
 import com.android.quickstep.util.CachedEventDispatcher;
 import com.android.quickstep.util.MotionPauseDetector;
@@ -362,8 +363,7 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
         mInputEventReceiver.setBatchingEnabled(true);
 
         mActivityInterface.closeOverlay();
-        ActivityManagerWrapper.getInstance().closeSystemWindows(
-                CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
+        TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
 
         // Notify the handler that the gesture has actually started
         mInteractionHandler.onGestureStarted(isLikelyToStartNewTask);
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
index 32b1c580ba..f9c52f9f9b 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
@@ -32,8 +32,8 @@ import com.android.launcher3.views.BaseDragLayer;
 import com.android.quickstep.BaseActivityInterface;
 import com.android.quickstep.GestureState;
 import com.android.quickstep.InputConsumer;
+import com.android.quickstep.TaskUtils;
 import com.android.quickstep.util.ActiveGestureLog;
-import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.InputMonitorCompat;
 
 /**
@@ -91,8 +91,7 @@ public class OverviewInputConsumer<T extends StatefulActivity<?>>
             mTargetHandledTouch = true;
             if (!mStartingInActivityBounds) {
                 mActivityInterface.closeOverlay();
-                ActivityManagerWrapper.getInstance()
-                        .closeSystemWindows(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
+                TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
                 ActiveGestureLog.INSTANCE.addLog("startQuickstep");
             }
             if (mInputMonitor != null) {
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 264a182dc2..f35eb1fa5d 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -107,7 +107,6 @@ import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.touch.PagedOrientationHandler.CurveProperties;
-import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.DynamicResource;
 import com.android.launcher3.util.MultiValueAlpha;
 import com.android.launcher3.util.OverScroller;
@@ -124,7 +123,6 @@ import com.android.quickstep.RecentsModel.TaskVisualsChangeListener;
 import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.TaskOverlayFactory;
 import com.android.quickstep.TaskThumbnailCache;
-import com.android.quickstep.TaskUtils;
 import com.android.quickstep.ViewUtils;
 import com.android.quickstep.util.LayoutUtils;
 import com.android.quickstep.util.RecentsOrientedState;
@@ -1468,8 +1466,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
 
     private void removeTask(TaskView taskView, int index, EndState endState) {
         if (taskView.getTask() != null) {
-            ActivityManagerWrapper.getInstance().removeTask(taskView.getTask().key.id);
-            ComponentKey compKey = TaskUtils.getLaunchComponentKeyForTask(taskView.getTask().key);
+            UI_HELPER_EXECUTOR.execute(() ->
+                    ActivityManagerWrapper.getInstance().removeTask(taskView.getTask().key.id));
             mActivity.getStatsLogManager().logger().withItemInfo(taskView.getItemInfo())
                     .log(LAUNCHER_TASK_DISMISS_SWIPE_UP);
         }
@@ -1618,7 +1616,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mPendingAnimation.addEndListener((endState) -> {
             if (endState.isSuccess) {
                 // Remove all the task views now
-                ActivityManagerWrapper.getInstance().removeAllRecentTasks();
+                UI_HELPER_EXECUTOR.execute(
+                        ActivityManagerWrapper.getInstance()::removeAllRecentTasks);
                 removeTasksViewsAndClearAllButton();
                 startHome();
             }
-- 
GitLab


From ffa21961bfb373e9d2bd9773399bb7222062362d Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 4 Nov 2020 14:29:18 -0800
Subject: [PATCH 0296/1664] Using UI_HELPER_THREAD for various activity manager
 interactions

Bug: 170648272
Change-Id: Iec36389be5d747c5dc4d2bb2a8138758d48efa53
---
 .../com/android/launcher3/BaseQuickstepLauncher.java  | 11 ++++++-----
 .../launcher3/uioverrides/QuickstepLauncher.java      |  5 ++---
 .../touchcontrollers/NavBarToHomeTouchController.java |  5 ++---
 .../touchcontrollers/QuickSwitchTouchController.java  |  5 ++---
 .../com/android/quickstep/OverviewCommandHelper.java  |  6 ++----
 quickstep/src/com/android/quickstep/TaskUtils.java    | 11 +++++++++++
 .../inputconsumers/OtherActivityInputConsumer.java    |  4 ++--
 .../inputconsumers/OverviewInputConsumer.java         |  5 ++---
 .../src/com/android/quickstep/views/RecentsView.java  |  9 ++++-----
 9 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 44d43c6784..456727c069 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -19,11 +19,10 @@ import static com.android.launcher3.AbstractFloatingView.TYPE_ALL;
 import static com.android.launcher3.AbstractFloatingView.TYPE_HIDE_BACK_BUTTON;
 import static com.android.launcher3.LauncherState.FLAG_HIDE_BACK_BUTTON;
 import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY;
 
-import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
-
 import android.animation.AnimatorSet;
 import android.animation.ValueAnimator;
 import android.app.ActivityOptions;
@@ -48,12 +47,14 @@ import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;
 import com.android.quickstep.SystemUiProxy;
+import com.android.quickstep.TaskUtils;
 import com.android.quickstep.util.RemoteAnimationProvider;
 import com.android.quickstep.util.RemoteFadeOutAnimationListener;
 import com.android.quickstep.views.OverviewActionsView;
 import com.android.quickstep.views.RecentsView;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
+import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
 import java.util.stream.Stream;
@@ -123,7 +124,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
     @Override
     protected void onUiChangedWhileSleeping() {
         // Remove the snapshot because the content view may have obvious changes.
-        ActivityManagerWrapper.getInstance().invalidateHomeTaskSnapshot(this);
+        UI_HELPER_EXECUTOR.execute(
+                () -> ActivityManagerWrapper.getInstance().invalidateHomeTaskSnapshot(this));
     }
 
     @Override
@@ -203,8 +205,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
     @Override
     protected void closeOpenViews(boolean animate) {
         super.closeOpenViews(animate);
-        ActivityManagerWrapper.getInstance()
-                .closeSystemWindows(CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY);
+        TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY);
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index a284f5d5cd..950598cba5 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -74,10 +74,10 @@ import com.android.launcher3.util.UiThreadHelper.AsyncCommand;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.SystemUiProxy;
+import com.android.quickstep.TaskUtils;
 import com.android.quickstep.util.QuickstepOnboardingPrefs;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
-import com.android.systemui.shared.system.ActivityManagerWrapper;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
@@ -175,8 +175,7 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
 
     @Override
     protected void showAllAppsFromIntent(boolean alreadyOnHome) {
-        ActivityManagerWrapper.getInstance().closeSystemWindows(
-            CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY);
+        TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY);
         super.showAllAppsFromIntent(alreadyOnHome);
     }
 
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
index d210bc6851..5181a86960 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
@@ -49,11 +49,11 @@ import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
 import com.android.launcher3.util.TouchController;
+import com.android.quickstep.TaskUtils;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
 import com.android.quickstep.util.AssistantUtilities;
 import com.android.quickstep.util.OverviewToHomeAnim;
 import com.android.quickstep.views.RecentsView;
-import com.android.systemui.shared.system.ActivityManagerWrapper;
 
 /**
  * Handles swiping up on the nav bar to go home from launcher, e.g. overview or all apps.
@@ -233,8 +233,7 @@ public class NavBarToHomeTouchController implements TouchController,
                 AbstractFloatingView.closeAllOpenViews(mLauncher);
                 // TODO: add to WW log
             }
-            ActivityManagerWrapper.getInstance()
-                    .closeSystemWindows(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
+            TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
         } else {
             // Quickly return to the state we came from (we didn't move far).
             ValueAnimator anim = mCurrentAnimation.getAnimationPlayer();
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
index b8c2030852..d39b6f5d97 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
@@ -45,9 +45,9 @@ import com.android.launcher3.touch.SingleAxisSwipeDetector;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.SystemUiProxy;
+import com.android.quickstep.TaskUtils;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
-import com.android.systemui.shared.system.ActivityManagerWrapper;
 
 /**
  * Handles quick switching to a recent task from the home screen.
@@ -92,8 +92,7 @@ public class QuickSwitchTouchController extends AbstractStateChangeTouchControll
     public void onDragStart(boolean start, float startDisplacement) {
         super.onDragStart(start, startDisplacement);
         mStartContainerType = LAUNCHER_STATE_BACKGROUND;
-        ActivityManagerWrapper.getInstance()
-                .closeSystemWindows(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
+        TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
index a210f76c4f..43581ca592 100644
--- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
@@ -65,16 +65,14 @@ public class OverviewCommandHelper {
             return;
         }
 
-        ActivityManagerWrapper.getInstance()
-                .closeSystemWindows(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
+        TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
         MAIN_EXECUTOR.execute(new RecentsActivityCommand<>());
     }
 
     @BinderThread
     public void onOverviewShown(boolean triggeredFromAltTab) {
         if (triggeredFromAltTab) {
-            ActivityManagerWrapper.getInstance()
-                    .closeSystemWindows(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
+            TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
         }
         MAIN_EXECUTOR.execute(new ShowRecentsCommand(triggeredFromAltTab));
     }
diff --git a/quickstep/src/com/android/quickstep/TaskUtils.java b/quickstep/src/com/android/quickstep/TaskUtils.java
index 04b488da9a..c9db1533ff 100644
--- a/quickstep/src/com/android/quickstep/TaskUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskUtils.java
@@ -16,6 +16,8 @@
 
 package com.android.quickstep;
 
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
@@ -27,6 +29,7 @@ import com.android.launcher3.pm.UserCache;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.systemui.shared.recents.model.Task;
+import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
 import java.util.List;
@@ -86,4 +89,12 @@ public final class TaskUtils {
         }
         return false;
     }
+
+    /**
+     * Requests that the system close any open system windows (including other SystemUI).
+     */
+    public static void closeSystemWindowsAsync(String reason) {
+        UI_HELPER_EXECUTOR.execute(
+                () -> ActivityManagerWrapper.getInstance().closeSystemWindows(reason));
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
index 82f489f680..f2f9fb7af6 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
@@ -63,6 +63,7 @@ import com.android.quickstep.RecentsAnimationCallbacks;
 import com.android.quickstep.RecentsAnimationDeviceState;
 import com.android.quickstep.RotationTouchHelper;
 import com.android.quickstep.TaskAnimationManager;
+import com.android.quickstep.TaskUtils;
 import com.android.quickstep.util.ActiveGestureLog;
 import com.android.quickstep.util.CachedEventDispatcher;
 import com.android.quickstep.util.MotionPauseDetector;
@@ -362,8 +363,7 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
         mInputEventReceiver.setBatchingEnabled(true);
 
         mActivityInterface.closeOverlay();
-        ActivityManagerWrapper.getInstance().closeSystemWindows(
-                CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
+        TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
 
         // Notify the handler that the gesture has actually started
         mInteractionHandler.onGestureStarted(isLikelyToStartNewTask);
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
index 9bfe84f298..498e561360 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
@@ -32,8 +32,8 @@ import com.android.launcher3.views.BaseDragLayer;
 import com.android.quickstep.BaseActivityInterface;
 import com.android.quickstep.GestureState;
 import com.android.quickstep.InputConsumer;
+import com.android.quickstep.TaskUtils;
 import com.android.quickstep.util.ActiveGestureLog;
-import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.InputMonitorCompat;
 
 /**
@@ -91,8 +91,7 @@ public class OverviewInputConsumer<T extends StatefulActivity<?>>
             mTargetHandledTouch = true;
             if (!mStartingInActivityBounds) {
                 mActivityInterface.closeOverlay();
-                ActivityManagerWrapper.getInstance()
-                        .closeSystemWindows(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
+                TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
                 ActiveGestureLog.INSTANCE.addLog("startQuickstep");
             }
             if (mInputMonitor != null) {
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 826555c24b..af1f93a0c9 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -107,7 +107,6 @@ import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.touch.PagedOrientationHandler.CurveProperties;
-import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.DynamicResource;
 import com.android.launcher3.util.MultiValueAlpha;
 import com.android.launcher3.util.OverScroller;
@@ -123,7 +122,6 @@ import com.android.quickstep.RecentsModel.TaskVisualsChangeListener;
 import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.TaskOverlayFactory;
 import com.android.quickstep.TaskThumbnailCache;
-import com.android.quickstep.TaskUtils;
 import com.android.quickstep.ViewUtils;
 import com.android.quickstep.util.LayoutUtils;
 import com.android.quickstep.util.RecentsOrientedState;
@@ -1466,8 +1464,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
 
     private void removeTask(TaskView taskView, int index, EndState endState) {
         if (taskView.getTask() != null) {
-            ActivityManagerWrapper.getInstance().removeTask(taskView.getTask().key.id);
-            ComponentKey compKey = TaskUtils.getLaunchComponentKeyForTask(taskView.getTask().key);
+            UI_HELPER_EXECUTOR.execute(() ->
+                    ActivityManagerWrapper.getInstance().removeTask(taskView.getTask().key.id));
             mActivity.getStatsLogManager().logger().withItemInfo(taskView.getItemInfo())
                     .log(LAUNCHER_TASK_DISMISS_SWIPE_UP);
         }
@@ -1613,7 +1611,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mPendingAnimation.addEndListener((endState) -> {
             if (endState.isSuccess) {
                 // Remove all the task views now
-                ActivityManagerWrapper.getInstance().removeAllRecentTasks();
+                UI_HELPER_EXECUTOR.execute(
+                        ActivityManagerWrapper.getInstance()::removeAllRecentTasks);
                 removeTasksViewsAndClearAllButton();
                 startHome();
             }
-- 
GitLab


From d91bad956f10499265b022c407c6b1d28592dac6 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Thu, 5 Nov 2020 11:14:14 -0600
Subject: [PATCH 0297/1664] Add more logs for WorkTabTest flake investigation

Bug: 159671700
Change-Id: I92f64bafa756a65d3e63514474028b82b059e357
---
 tests/src/com/android/launcher3/ui/WorkTabTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/src/com/android/launcher3/ui/WorkTabTest.java b/tests/src/com/android/launcher3/ui/WorkTabTest.java
index 8d594de926..df0770d931 100644
--- a/tests/src/com/android/launcher3/ui/WorkTabTest.java
+++ b/tests/src/com/android/launcher3/ui/WorkTabTest.java
@@ -65,12 +65,13 @@ public class WorkTabTest extends AbstractLauncherUiTest {
 
         String[] tokens = output.split("\\s+");
         mProfileUserId = Integer.parseInt(tokens[tokens.length - 1]);
-
+        Log.d(TestProtocol.WORK_PROFILE_REMOVED, "Created new user uid" + mProfileUserId);
         mDevice.executeShellCommand("am start-user " + mProfileUserId);
     }
 
     @After
     public void removeWorkProfile() throws Exception {
+        Log.d(TestProtocol.WORK_PROFILE_REMOVED, "(teardown) removing uid" + mProfileUserId);
         mDevice.executeShellCommand("pm remove-user " + mProfileUserId);
     }
 
-- 
GitLab


From 6e5efb0929fac4f914efa2ceaaa6a7ef2fa4cf71 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Mon, 2 Nov 2020 11:31:59 -0600
Subject: [PATCH 0298/1664] Consolidate Hero search result with
 SearchResultIconRow

With this, we can now show app title and support drag/drop for shortcut results.

Bug: 172245107
preview: https://drive.google.com/file/d/1A4eKKTDPht-MDbfA2VFI3OuAO36fc3AS/view?usp=sharing
Change-Id: Icf94a2d23b44bfe5527aea71e27178906e5deb3e
---
 res/layout/search_result_hero_app.xml         |  74 ------
 res/layout/search_result_icon_row.xml         |  67 ++++-
 res/layout/search_result_suggest.xml          |   9 +-
 res/values/attrs.xml                          |  14 +-
 res/values/dimens.xml                         |   5 +
 .../launcher3/allapps/AllAppsGridAdapter.java |   7 -
 .../launcher3/touch/ItemClickHandler.java     |   2 +
 .../launcher3/views/HeroSearchResultView.java | 209 ---------------
 .../launcher3/views/SearchResultIcon.java     | 134 +++++++++-
 .../launcher3/views/SearchResultIconRow.java  | 239 ++++++++----------
 .../views/SearchResultSuggestion.java         |  62 +++++
 .../views/ThumbnailSearchResultView.java      |   5 +-
 12 files changed, 373 insertions(+), 454 deletions(-)
 delete mode 100644 res/layout/search_result_hero_app.xml
 delete mode 100644 src/com/android/launcher3/views/HeroSearchResultView.java
 create mode 100644 src/com/android/launcher3/views/SearchResultSuggestion.java

diff --git a/res/layout/search_result_hero_app.xml b/res/layout/search_result_hero_app.xml
deleted file mode 100644
index bd0e42b6a9..0000000000
--- a/res/layout/search_result_hero_app.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.launcher3.views.HeroSearchResultView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:gravity="center_vertical"
-    android:padding="@dimen/dynamic_grid_edge_margin">
-
-    <FrameLayout
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_gravity="center_vertical"
-        android:layout_weight="1">
-        <com.android.launcher3.BubbleTextView
-            android:id="@+id/bubble_text"
-            style="@style/BaseIcon"
-            android:drawablePadding="@dimen/dynamic_grid_icon_drawable_padding"
-            android:gravity="start|center_vertical"
-            android:textAlignment="viewStart"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textSize="16sp"
-            android:layout_height="wrap_content"
-            launcher:iconDisplay="hero_app"
-            launcher:layoutHorizontal="true"/>
-
-        <View
-            android:id="@+id/icon"
-            android:layout_width="@dimen/deep_shortcut_icon_size"
-            android:layout_height="@dimen/deep_shortcut_icon_size"
-            android:layout_gravity="start|center_vertical"
-            android:background="@drawable/ic_deepshortcut_placeholder"/>
-    </FrameLayout>
-
-    <com.android.launcher3.BubbleTextView
-        android:id="@+id/shortcut_0"
-        style="@style/BaseIcon"
-        android:layout_width="@dimen/deep_shortcut_icon_size"
-        android:layout_height="match_parent"
-        android:gravity="start|center_vertical"
-        android:textAlignment="center"
-        launcher:iconDisplay="shortcut_popup"
-        android:textSize="12sp"
-        launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size"
-        launcher:layoutHorizontal="false"/>
-
-    <com.android.launcher3.BubbleTextView
-        android:id="@+id/shortcut_1"
-        style="@style/BaseIcon"
-        android:layout_width="@dimen/deep_shortcut_icon_size"
-        android:layout_height="match_parent"
-        android:gravity="start|center_vertical"
-        android:textAlignment="center"
-        launcher:iconDisplay="shortcut_popup"
-        android:textSize="12sp"
-        launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size"
-        launcher:layoutHorizontal="false"/>
-
-</com.android.launcher3.views.HeroSearchResultView>
\ No newline at end of file
diff --git a/res/layout/search_result_icon_row.xml b/res/layout/search_result_icon_row.xml
index ef3c8b2857..b51896e8a7 100644
--- a/res/layout/search_result_icon_row.xml
+++ b/res/layout/search_result_icon_row.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Projectza
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,18 +14,61 @@
 -->
 <com.android.launcher3.views.SearchResultIconRow xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto"
-    style="@style/BaseIcon"
+    android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:drawablePadding="@dimen/dynamic_grid_icon_drawable_padding"
-    android:gravity="start|center_vertical"
-    android:textAlignment="viewStart"
-    android:textColor="?android:attr/textColorPrimary"
-    android:textSize="16sp"
-    android:padding="@dimen/dynamic_grid_edge_margin"
-    launcher:iconDisplay="hero_app"
-    launcher:layoutHorizontal="true"
-    >
+    android:padding="@dimen/dynamic_grid_edge_margin">
+
+    <com.android.launcher3.views.SearchResultIcon
+        android:layout_width="wrap_content"
+        android:id="@+id/icon"
+        launcher:iconDisplay="hero_app"
+        android:layout_height="wrap_content" />
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/dynamic_grid_edge_margin"
+        android:orientation="vertical"
+        android:layout_gravity="center_vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:id="@id/title"
+            android:layout_height="wrap_content"
+            android:gravity="start|center_vertical"
+            android:textAlignment="viewStart"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="@dimen/settings_hero_title_size" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:id="@+id/desc"
+            android:textColor="?android:attr/textColorTertiary"
+            android:textSize="@dimen/settings_hero_subtitle_size"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
+    <com.android.launcher3.BubbleTextView
+        android:id="@+id/shortcut_0"
+        style="@style/BaseIcon"
+        android:layout_width="@dimen/deep_shortcut_icon_size"
+        android:layout_height="match_parent"
+        android:gravity="start|center_vertical"
+        launcher:iconDisplay="shortcut_popup"
+        android:textSize="@dimen/settings_hero_subtitle_size"
+        launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size"
+        launcher:layoutHorizontal="false" />
+
+    <com.android.launcher3.BubbleTextView
+        android:id="@+id/shortcut_1"
+        style="@style/BaseIcon"
+        android:layout_width="@dimen/deep_shortcut_icon_size"
+        android:layout_height="match_parent"
+        launcher:iconDisplay="shortcut_popup"
+        android:textSize="@dimen/settings_hero_inline_button_size"
+        launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size"
+        launcher:layoutHorizontal="false" />
 
 </com.android.launcher3.views.SearchResultIconRow>
\ No newline at end of file
diff --git a/res/layout/search_result_suggest.xml b/res/layout/search_result_suggest.xml
index 1d8c8039e6..01e25d5893 100644
--- a/res/layout/search_result_suggest.xml
+++ b/res/layout/search_result_suggest.xml
@@ -12,7 +12,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher3.views.SearchResultIconRow xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher3.views.SearchResultSuggestion xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto"
     style="@style/BaseIcon"
     android:layout_width="match_parent"
@@ -26,10 +26,9 @@
     launcher:iconDisplay="hero_app"
     android:drawableTint="?android:attr/textColorPrimary"
     launcher:customIcon="@drawable/ic_allapps_search"
-    launcher:iconSizeOverride="48dp"
+    launcher:iconSizeOverride="24dp"
     launcher:matchTextInsetWithQuery="true"
     launcher:layoutHorizontal="true"
-    android:drawablePadding="@dimen/dynamic_grid_icon_drawable_padding"
-    >
+    android:drawablePadding="@dimen/dynamic_grid_icon_drawable_padding">
 
-</com.android.launcher3.views.SearchResultIconRow>
\ No newline at end of file
+</com.android.launcher3.views.SearchResultSuggestion>
\ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index c3ad1eb823..96c30b5f03 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 /* Copyright 2008, The Android Open Source Project
 **
 ** Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,13 +29,13 @@
     <attr name="isWorkspaceDarkText" format="boolean" />
     <attr name="workspaceTextColor" format="color" />
     <attr name="workspaceShadowColor" format="color" />
-    <attr name="workspaceAmbientShadowColor" format="color"/>
+    <attr name="workspaceAmbientShadowColor" format="color" />
     <attr name="workspaceKeyShadowColor" format="color" />
     <attr name="workspaceStatusBarScrim" format="reference" />
     <attr name="widgetsTheme" format="reference" />
     <attr name="loadingIconColor" format="color" />
-    <attr name="iconOnlyShortcutColor" format="color"/>
-    <attr name="eduHalfSheetBGColor" format="color"/>
+    <attr name="iconOnlyShortcutColor" format="color" />
+    <attr name="eduHalfSheetBGColor" format="color" />
 
     <attr name="folderDotColor" format="color" />
     <attr name="folderFillColor" format="color" />
@@ -69,13 +68,12 @@
         <attr name="folderDotColor" />
     </declare-styleable>
 
-    <declare-styleable name="SearchResultIconRow">
+    <declare-styleable name="SearchResultSuggestion">
         <attr name="customIcon" format="reference" />
         <attr name="matchTextInsetWithQuery" format="boolean" />
     </declare-styleable>
 
 
-
     <declare-styleable name="ShadowInfo">
         <attr name="ambientShadowColor" format="color" />
         <attr name="ambientShadowBlur" format="dimension" />
@@ -167,7 +165,7 @@
         <attr name="android:src" />
         <attr name="android:shadowColor" />
         <attr name="android:elevation" />
-        <attr name="darkTintColor" format="color"/>
+        <attr name="darkTintColor" format="color" />
     </declare-styleable>
 
     <declare-styleable name="RecyclerViewFastScroller">
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index f59f02f994..5387e1bad6 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -248,4 +248,9 @@
     <!-- Onboarding bottomsheet related -->
     <dimen name="bottom_sheet_edu_padding">24dp</dimen>
 
+    <!-- Search related -->
+    <dimen name="settings_hero_title_size">16sp</dimen>
+    <dimen name="settings_hero_subtitle_size">15sp</dimen>
+    <dimen name="settings_hero_inline_button_size">12sp</dimen>
+
 </resources>
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index f7731915e3..7018f20a55 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -75,8 +75,6 @@ public class AllAppsGridAdapter extends
 
     public static final int VIEW_TYPE_SEARCH_CORPUS_TITLE = 1 << 5;
 
-    public static final int VIEW_TYPE_SEARCH_HERO_APP = 1 << 6;
-
     public static final int VIEW_TYPE_SEARCH_ROW_WITH_BUTTON = 1 << 7;
 
     public static final int VIEW_TYPE_SEARCH_ROW = 1 << 8;
@@ -178,7 +176,6 @@ public class AllAppsGridAdapter extends
 
         boolean isCountedForAccessibility() {
             return viewType == VIEW_TYPE_ICON
-                    || viewType == VIEW_TYPE_SEARCH_HERO_APP
                     || viewType == VIEW_TYPE_SEARCH_ROW_WITH_BUTTON
                     || viewType == VIEW_TYPE_SEARCH_SLICE
                     || viewType == VIEW_TYPE_SEARCH_ROW
@@ -411,9 +408,6 @@ public class AllAppsGridAdapter extends
             case VIEW_TYPE_SEARCH_CORPUS_TITLE:
                 return new ViewHolder(
                         mLayoutInflater.inflate(R.layout.search_section_title, parent, false));
-            case VIEW_TYPE_SEARCH_HERO_APP:
-                return new ViewHolder(mLayoutInflater.inflate(
-                        R.layout.search_result_hero_app, parent, false));
             case VIEW_TYPE_SEARCH_ROW_WITH_BUTTON:
                 return new ViewHolder(mLayoutInflater.inflate(
                         R.layout.search_result_play_item, parent, false));
@@ -478,7 +472,6 @@ public class AllAppsGridAdapter extends
                 break;
             case VIEW_TYPE_SEARCH_CORPUS_TITLE:
             case VIEW_TYPE_SEARCH_ROW_WITH_BUTTON:
-            case VIEW_TYPE_SEARCH_HERO_APP:
             case VIEW_TYPE_SEARCH_ROW:
             case VIEW_TYPE_SEARCH_ICON:
             case VIEW_TYPE_SEARCH_ICON_ROW:
diff --git a/src/com/android/launcher3/touch/ItemClickHandler.java b/src/com/android/launcher3/touch/ItemClickHandler.java
index d56391da3d..9b9cb0a61b 100644
--- a/src/com/android/launcher3/touch/ItemClickHandler.java
+++ b/src/com/android/launcher3/touch/ItemClickHandler.java
@@ -96,6 +96,8 @@ public class ItemClickHandler {
             if (v instanceof PendingAppWidgetHostView) {
                 onClickPendingWidget((PendingAppWidgetHostView) v, launcher);
             }
+        } else if (tag instanceof RemoteActionItemInfo) {
+            onClickRemoteAction(launcher, (RemoteActionItemInfo) tag);
         }
     }
 
diff --git a/src/com/android/launcher3/views/HeroSearchResultView.java b/src/com/android/launcher3/views/HeroSearchResultView.java
deleted file mode 100644
index a098df9f31..0000000000
--- a/src/com/android/launcher3/views/HeroSearchResultView.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.views;
-
-import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS;
-import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
-
-import android.content.Context;
-import android.content.pm.ShortcutInfo;
-import android.graphics.Point;
-import android.util.AttributeSet;
-import android.util.Pair;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-
-import com.android.launcher3.BubbleTextView;
-import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.DragSource;
-import com.android.launcher3.DropTarget;
-import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.R;
-import com.android.launcher3.allapps.AllAppsStore;
-import com.android.launcher3.allapps.search.AllAppsSearchBarController.SearchTargetHandler;
-import com.android.launcher3.allapps.search.SearchEventTracker;
-import com.android.launcher3.dragndrop.DragOptions;
-import com.android.launcher3.dragndrop.DraggableView;
-import com.android.launcher3.graphics.DragPreviewProvider;
-import com.android.launcher3.model.data.AppInfo;
-import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.model.data.ItemInfoWithIcon;
-import com.android.launcher3.model.data.WorkspaceItemInfo;
-import com.android.launcher3.shortcuts.ShortcutDragPreviewProvider;
-import com.android.launcher3.touch.ItemLongClickListener;
-import com.android.launcher3.util.ComponentKey;
-import com.android.systemui.plugins.shared.SearchTarget;
-import com.android.systemui.plugins.shared.SearchTargetEvent;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A view representing a high confidence app search result that includes shortcuts
- * TODO (sfufa@) consolidate this with SearchResultIconRow
- */
-public class HeroSearchResultView extends LinearLayout implements DragSource, SearchTargetHandler {
-
-    public static final String TARGET_TYPE_HERO_APP = "hero_app";
-
-    public static final int MAX_SHORTCUTS_COUNT = 2;
-
-    private SearchTarget mSearchTarget;
-    private BubbleTextView mBubbleTextView;
-    private View mIconView;
-    private BubbleTextView[] mDeepShortcutTextViews = new BubbleTextView[2];
-
-
-    public HeroSearchResultView(Context context) {
-        super(context);
-    }
-
-    public HeroSearchResultView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public HeroSearchResultView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        Launcher launcher = Launcher.getLauncher(getContext());
-        DeviceProfile grid = launcher.getDeviceProfile();
-        mIconView = findViewById(R.id.icon);
-        ViewGroup.LayoutParams iconParams = mIconView.getLayoutParams();
-        iconParams.height = grid.allAppsIconSizePx;
-        iconParams.width = grid.allAppsIconSizePx;
-
-
-        mBubbleTextView = findViewById(R.id.bubble_text);
-        mBubbleTextView.setOnClickListener(view -> {
-            handleSelection(SearchTargetEvent.SELECT);
-            launcher.getItemOnClickListener().onClick(view);
-        });
-        mBubbleTextView.setOnLongClickListener(new HeroItemDragHandler(getContext(), this));
-
-
-        mDeepShortcutTextViews[0] = findViewById(R.id.shortcut_0);
-        mDeepShortcutTextViews[1] = findViewById(R.id.shortcut_1);
-        for (BubbleTextView bubbleTextView : mDeepShortcutTextViews) {
-            bubbleTextView.setLayoutParams(
-                    new LinearLayout.LayoutParams(grid.allAppsIconSizePx,
-                            grid.allAppsIconSizePx));
-            bubbleTextView.setOnClickListener(view -> {
-                WorkspaceItemInfo itemInfo = (WorkspaceItemInfo) bubbleTextView.getTag();
-                SearchTargetEvent event = new SearchTargetEvent.Builder(mSearchTarget,
-                        SearchTargetEvent.CHILD_SELECT).setShortcutPosition(itemInfo.rank).build();
-                SearchEventTracker.getInstance(getContext()).notifySearchTargetEvent(event);
-                launcher.getItemOnClickListener().onClick(view);
-            });
-        }
-    }
-
-    @Override
-    public void applySearchTarget(SearchTarget searchTarget) {
-        mSearchTarget = searchTarget;
-        AllAppsStore apps = Launcher.getLauncher(getContext()).getAppsView().getAppsStore();
-        AppInfo appInfo = apps.getApp(new ComponentKey(searchTarget.getComponentName(),
-                searchTarget.getUserHandle()));
-        List<ShortcutInfo> infos = mSearchTarget.getShortcutInfos();
-
-        ArrayList<Pair<ShortcutInfo, ItemInfoWithIcon>> shortcuts = new ArrayList<>();
-        for (int i = 0; infos != null && i < infos.size() && i < MAX_SHORTCUTS_COUNT; i++) {
-            ShortcutInfo shortcutInfo = infos.get(i);
-            ItemInfoWithIcon si = new WorkspaceItemInfo(shortcutInfo, getContext());
-            si.rank = i;
-            shortcuts.add(new Pair<>(shortcutInfo, si));
-        }
-
-        mBubbleTextView.applyFromApplicationInfo(appInfo);
-        mIconView.setBackground(mBubbleTextView.getIcon());
-        mIconView.setTag(appInfo);
-        LauncherAppState appState = LauncherAppState.getInstance(getContext());
-        for (int i = 0; i < mDeepShortcutTextViews.length; i++) {
-            BubbleTextView shortcutView = mDeepShortcutTextViews[i];
-            mDeepShortcutTextViews[i].setVisibility(shortcuts.size() > i ? VISIBLE : GONE);
-            if (i < shortcuts.size()) {
-                Pair<ShortcutInfo, ItemInfoWithIcon> p = shortcuts.get(i);
-                //apply ItemInfo and prepare view
-                shortcutView.applyFromWorkspaceItem((WorkspaceItemInfo) p.second);
-                MODEL_EXECUTOR.execute(() -> {
-                    // load unbadged shortcut in background and update view when icon ready
-                    appState.getIconCache().getUnbadgedShortcutIcon(p.second, p.first);
-                    MAIN_EXECUTOR.post(() -> shortcutView.reapplyItemInfo(p.second));
-                });
-            }
-        }
-        SearchEventTracker.INSTANCE.get(getContext()).registerWeakHandler(searchTarget, this);
-    }
-
-    @Override
-    public void onDropCompleted(View target, DropTarget.DragObject d, boolean success) {
-        mBubbleTextView.setVisibility(VISIBLE);
-        mBubbleTextView.setIconVisible(true);
-    }
-
-    private void setWillDrawIcon(boolean willDraw) {
-        mIconView.setVisibility(willDraw ? View.VISIBLE : View.INVISIBLE);
-    }
-
-    /**
-     * Drag and drop handler for popup items in Launcher activity
-     */
-    public static class HeroItemDragHandler implements OnLongClickListener {
-        private final Launcher mLauncher;
-        private final HeroSearchResultView mContainer;
-
-        HeroItemDragHandler(Context context, HeroSearchResultView container) {
-            mLauncher = Launcher.getLauncher(context);
-            mContainer = container;
-        }
-
-        @Override
-        public boolean onLongClick(View v) {
-            if (!ItemLongClickListener.canStartDrag(mLauncher)) return false;
-            mContainer.setWillDrawIcon(false);
-
-            DraggableView draggableView = DraggableView.ofType(DraggableView.DRAGGABLE_ICON);
-            WorkspaceItemInfo itemInfo = new WorkspaceItemInfo((AppInfo) v.getTag());
-            itemInfo.container = CONTAINER_ALL_APPS;
-            DragPreviewProvider previewProvider = new ShortcutDragPreviewProvider(
-                    mContainer.mIconView, new Point());
-            mLauncher.getWorkspace().beginDragShared(mContainer.mBubbleTextView,
-                    draggableView, mContainer, itemInfo, previewProvider, new DragOptions());
-
-            SearchTargetEvent event = new SearchTargetEvent.Builder(mContainer.mSearchTarget,
-                    SearchTargetEvent.LONG_PRESS).build();
-            SearchEventTracker.INSTANCE.get(mLauncher).notifySearchTargetEvent(event);
-            return false;
-        }
-    }
-
-    @Override
-    public void handleSelection(int eventType) {
-        ItemInfo itemInfo = (ItemInfo) mBubbleTextView.getTag();
-        if (itemInfo == null) return;
-        Launcher launcher = Launcher.getLauncher(getContext());
-        launcher.startActivitySafely(this, itemInfo.getIntent(), itemInfo);
-
-        SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(
-                new SearchTargetEvent.Builder(mSearchTarget, eventType).build());
-    }
-}
diff --git a/src/com/android/launcher3/views/SearchResultIcon.java b/src/com/android/launcher3/views/SearchResultIcon.java
index ea06d5b20f..0851b5432f 100644
--- a/src/com/android/launcher3/views/SearchResultIcon.java
+++ b/src/com/android/launcher3/views/SearchResultIcon.java
@@ -15,16 +15,35 @@
  */
 package com.android.launcher3.views;
 
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+
+import android.app.RemoteAction;
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.pm.ShortcutInfo;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.os.UserHandle;
 import android.util.AttributeSet;
 import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.UiThread;
 
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.allapps.AllAppsStore;
 import com.android.launcher3.allapps.search.AllAppsSearchBarController;
 import com.android.launcher3.allapps.search.SearchEventTracker;
+import com.android.launcher3.icons.BitmapInfo;
+import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.model.data.AppInfo;
+import com.android.launcher3.model.data.ItemInfoWithIcon;
+import com.android.launcher3.model.data.RemoteActionItemInfo;
+import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.touch.ItemLongClickListener;
 import com.android.launcher3.util.ComponentKey;
 import com.android.systemui.plugins.shared.SearchTarget;
@@ -39,6 +58,17 @@ public class SearchResultIcon extends BubbleTextView implements
 
 
     public static final String TARGET_TYPE_APP = "app";
+    public static final String TARGET_TYPE_HERO_APP = "hero_app";
+    public static final String TARGET_TYPE_SHORTCUT = "shortcut";
+    public static final String TARGET_TYPE_REMOTE_ACTION = "remote_action";
+    public static final String TARGET_TYPE_SUGGEST = "suggest";
+
+    public static final String REMOTE_ACTION_SHOULD_START = "should_start_for_result";
+    public static final String REMOTE_ACTION_TOKEN = "action_token";
+
+
+    private static final String[] LONG_PRESS_SUPPORTED_TYPES =
+            new String[]{TARGET_TYPE_APP, TARGET_TYPE_SHORTCUT, TARGET_TYPE_HERO_APP};
 
     private final Launcher mLauncher;
 
@@ -64,26 +94,96 @@ public class SearchResultIcon extends BubbleTextView implements
         setOnFocusChangeListener(mLauncher.getFocusHandler());
         setOnClickListener(this);
         setOnLongClickListener(this);
-        getLayoutParams().height = mLauncher.getDeviceProfile().allAppsCellHeightPx;
+        setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+                mLauncher.getDeviceProfile().allAppsCellHeightPx));
     }
 
     @Override
     public void applySearchTarget(SearchTarget searchTarget) {
         mSearchTarget = searchTarget;
-        AllAppsStore appsStore = mLauncher.getAppsView().getAppsStore();
         SearchEventTracker.getInstance(getContext()).registerWeakHandler(mSearchTarget, this);
-        if (searchTarget.getItemType().equals(TARGET_TYPE_APP)) {
-            AppInfo appInfo = appsStore.getApp(new ComponentKey(searchTarget.getComponentName(),
-                    searchTarget.getUserHandle()));
-            applyFromApplicationInfo(appInfo);
+        switch (searchTarget.getItemType()) {
+            case TARGET_TYPE_APP:
+            case TARGET_TYPE_HERO_APP:
+                prepareUsingApp(searchTarget.getComponentName(), searchTarget.getUserHandle());
+                break;
+            case TARGET_TYPE_SHORTCUT:
+                prepareUsingShortcutInfo(searchTarget.getShortcutInfos().get(0));
+                break;
+            case TARGET_TYPE_REMOTE_ACTION:
+            case TARGET_TYPE_SUGGEST:
+                prepareUsingRemoteAction(searchTarget.getRemoteAction(),
+                        searchTarget.getExtras().getString(REMOTE_ACTION_TOKEN),
+                        searchTarget.getExtras().getBoolean(REMOTE_ACTION_SHOULD_START),
+                        searchTarget.getItemType().equals(TARGET_TYPE_REMOTE_ACTION));
+                break;
         }
     }
 
+    private void prepareUsingApp(ComponentName componentName, UserHandle userHandle) {
+        AllAppsStore appsStore = mLauncher.getAppsView().getAppsStore();
+        AppInfo appInfo = appsStore.getApp(new ComponentKey(componentName, userHandle));
+        applyFromApplicationInfo(appInfo);
+    }
+
+
+    private void prepareUsingShortcutInfo(ShortcutInfo shortcutInfo) {
+        WorkspaceItemInfo workspaceItemInfo = new WorkspaceItemInfo(shortcutInfo, getContext());
+        applyFromWorkspaceItem(workspaceItemInfo);
+        LauncherAppState launcherAppState = LauncherAppState.getInstance(getContext());
+        MODEL_EXECUTOR.execute(() -> {
+            launcherAppState.getIconCache().getShortcutIcon(workspaceItemInfo, shortcutInfo);
+            reapplyItemInfoAsync(workspaceItemInfo);
+        });
+    }
+
+    private void prepareUsingRemoteAction(RemoteAction remoteAction, String token, boolean start,
+            boolean useIconToBadge) {
+        RemoteActionItemInfo itemInfo = new RemoteActionItemInfo(remoteAction, token, start);
+
+        applyFromRemoteActionInfo(itemInfo);
+        if (!loadIconFromResource()) {
+            UI_HELPER_EXECUTOR.post(() -> {
+                // If the Drawable from the remote action is not AdaptiveBitmap, styling will not
+                // work.
+                try (LauncherIcons li = LauncherIcons.obtain(getContext())) {
+                    Drawable d = itemInfo.getRemoteAction().getIcon().loadDrawable(getContext());
+                    BitmapInfo bitmap = li.createBadgedIconBitmap(d, itemInfo.user,
+                            Build.VERSION.SDK_INT);
+
+                    if (useIconToBadge) {
+                        BitmapInfo placeholder = li.createIconBitmap(
+                                itemInfo.getRemoteAction().getTitle().toString().substring(0, 1),
+                                bitmap.color);
+                        itemInfo.bitmap = li.badgeBitmap(placeholder.icon, bitmap);
+                    } else {
+                        itemInfo.bitmap = bitmap;
+                    }
+                    reapplyItemInfoAsync(itemInfo);
+                }
+            });
+        }
+    }
+
+    @UiThread
+    void reapplyItemInfoAsync(ItemInfoWithIcon itemInfoWithIcon) {
+        MAIN_EXECUTOR.post(() -> reapplyItemInfo(itemInfoWithIcon));
+    }
+
+
     @Override
     public void handleSelection(int eventType) {
         mLauncher.getItemOnClickListener().onClick(this);
-        SearchEventTracker.INSTANCE.get(mLauncher).notifySearchTargetEvent(
-                new SearchTargetEvent.Builder(mSearchTarget, eventType).build());
+        reportEvent(eventType);
+    }
+
+    private void reportEvent(int eventType) {
+        SearchTargetEvent.Builder b = new SearchTargetEvent.Builder(mSearchTarget, eventType);
+        if (mSearchTarget.getItemType().equals(TARGET_TYPE_SHORTCUT)) {
+            b.setShortcutPosition(0);
+        }
+        SearchEventTracker.INSTANCE.get(mLauncher).notifySearchTargetEvent(b.build());
+
     }
 
     @Override
@@ -93,8 +193,22 @@ public class SearchResultIcon extends BubbleTextView implements
 
     @Override
     public boolean onLongClick(View view) {
-        SearchEventTracker.INSTANCE.get(mLauncher).notifySearchTargetEvent(
-                new SearchTargetEvent.Builder(mSearchTarget, SearchTargetEvent.LONG_PRESS).build());
+        if (!supportsLongPress(mSearchTarget.getItemType())) {
+            return false;
+        }
+        reportEvent(SearchTargetEvent.LONG_PRESS);
         return ItemLongClickListener.INSTANCE_ALL_APPS.onLongClick(view);
+
+    }
+
+    private boolean supportsLongPress(String type) {
+        for (String t : LONG_PRESS_SUPPORTED_TYPES) {
+            if (t.equals(type)) return true;
+        }
+        return false;
+    }
+
+    protected boolean loadIconFromResource() {
+        return false;
     }
 }
diff --git a/src/com/android/launcher3/views/SearchResultIconRow.java b/src/com/android/launcher3/views/SearchResultIconRow.java
index bdbe890e8d..03332c1501 100644
--- a/src/com/android/launcher3/views/SearchResultIconRow.java
+++ b/src/com/android/launcher3/views/SearchResultIconRow.java
@@ -17,188 +17,173 @@ package com.android.launcher3.views;
 
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
-import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
-import android.app.RemoteAction;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.ShortcutInfo;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
+import android.os.UserHandle;
 import android.util.AttributeSet;
-import android.widget.EditText;
+import android.util.Pair;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.search.AllAppsSearchBarController;
 import com.android.launcher3.allapps.search.SearchEventTracker;
-import com.android.launcher3.icons.BitmapInfo;
-import com.android.launcher3.icons.LauncherIcons;
-import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
-import com.android.launcher3.model.data.RemoteActionItemInfo;
+import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
-import com.android.launcher3.touch.ItemClickHandler;
-import com.android.launcher3.util.Themes;
 import com.android.systemui.plugins.shared.SearchTarget;
 import com.android.systemui.plugins.shared.SearchTargetEvent;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
- * A view representing a stand alone shortcut search result
+ * A full width representation of {@link SearchResultIcon} with a secondary label and inline
+ * shortcuts
  */
-public class SearchResultIconRow extends DoubleShadowBubbleTextView implements
-        AllAppsSearchBarController.SearchTargetHandler {
-
-
-    public static final String TARGET_TYPE_REMOTE_ACTION = "remote_action";
-    public static final String TARGET_TYPE_SUGGEST = "suggest";
-    public static final String TARGET_TYPE_SHORTCUT = "shortcut";
-
+public class SearchResultIconRow extends LinearLayout implements
+        AllAppsSearchBarController.SearchTargetHandler, View.OnClickListener,
+        View.OnLongClickListener {
+    public static final int MAX_SHORTCUTS_COUNT = 2;
 
-    public static final String REMOTE_ACTION_SHOULD_START = "should_start_for_result";
-    public static final String REMOTE_ACTION_TOKEN = "action_token";
 
-    private final boolean mMatchesInset;
+    private final Launcher mLauncher;
+    private final LauncherAppState mLauncherAppState;
+    private SearchResultIcon mResultIcon;
+    private TextView mTitleView;
+    private TextView mDescriptionView;
+    private BubbleTextView[] mShortcutViews = new BubbleTextView[2];
 
     private SearchTarget mSearchTarget;
+    private PackageItemInfo mProviderInfo;
 
-    @Nullable private Drawable mCustomIcon;
 
-    public SearchResultIconRow(@NonNull Context context) {
+    public SearchResultIconRow(Context context) {
         this(context, null, 0);
     }
 
-    public SearchResultIconRow(@NonNull Context context,
+    public SearchResultIconRow(Context context,
             @Nullable AttributeSet attrs) {
         this(context, attrs, 0);
     }
 
-    public SearchResultIconRow(@NonNull Context context, @Nullable AttributeSet attrs,
-            int defStyleAttr) {
+    public SearchResultIconRow(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        TypedArray a = context.obtainStyledAttributes(attrs,
-                R.styleable.SearchResultIconRow, defStyleAttr, 0);
-        mMatchesInset = a.getBoolean(R.styleable.SearchResultIconRow_matchTextInsetWithQuery,
-                false);
-
-        int customIconResId = a.getResourceId(R.styleable.SearchResultIconRow_customIcon, 0);
-
-        if (customIconResId != 0) {
-            mCustomIcon = Launcher.getLauncher(context).getDrawable(customIconResId);
-        }
-
-        a.recycle();
+        mLauncher = Launcher.getLauncher(getContext());
+        mLauncherAppState = LauncherAppState.getInstance(getContext());
     }
 
-
     @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        Launcher launcher = Launcher.getLauncher(getContext());
-        if (mMatchesInset && launcher.getAppsView() != null && getParent() != null) {
-            EditText editText = launcher.getAppsView().getSearchUiManager().getEditText();
-            if (editText != null) {
-                int counterOffset = getIconSize() + getCompoundDrawablePadding() / 2;
-                setPadding(editText.getLeft() - counterOffset, getPaddingTop(),
-                        getPaddingRight(), getPaddingBottom());
-            }
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        int iconSize = mLauncher.getDeviceProfile().allAppsIconSizePx;
+
+        mResultIcon = findViewById(R.id.icon);
+        mTitleView = findViewById(R.id.title);
+        mDescriptionView = findViewById(R.id.desc);
+        mShortcutViews[0] = findViewById(R.id.shortcut_0);
+        mShortcutViews[1] = findViewById(R.id.shortcut_1);
+        mResultIcon.getLayoutParams().height = iconSize;
+        mResultIcon.getLayoutParams().width = iconSize;
+        for (BubbleTextView bubbleTextView : mShortcutViews) {
+            ViewGroup.LayoutParams lp = bubbleTextView.getLayoutParams();
+            lp.width = iconSize;
+            bubbleTextView.setOnClickListener(view -> {
+                WorkspaceItemInfo itemInfo = (WorkspaceItemInfo) bubbleTextView.getTag();
+                SearchTargetEvent event = new SearchTargetEvent.Builder(mSearchTarget,
+                        SearchTargetEvent.CHILD_SELECT).setShortcutPosition(itemInfo.rank).build();
+                SearchEventTracker.getInstance(getContext()).notifySearchTargetEvent(event);
+                mLauncher.getItemOnClickListener().onClick(view);
+            });
         }
+        setOnClickListener(this);
+        setOnLongClickListener(this);
     }
 
-    @Override
-    protected void drawFocusHighlight(Canvas canvas) {
-        mHighlightPaint.setColor(mHighlightColor);
-        float r = Themes.getDialogCornerRadius(getContext());
-        canvas.drawRoundRect(0, 0, getWidth(), getHeight(), r, r, mHighlightPaint);
-    }
-
-
     @Override
     public void applySearchTarget(SearchTarget searchTarget) {
         mSearchTarget = searchTarget;
-        String type = searchTarget.getItemType();
-        if (type.equals(TARGET_TYPE_REMOTE_ACTION) || type.equals(TARGET_TYPE_SUGGEST)) {
-            prepareUsingRemoteAction(searchTarget.getRemoteAction(),
-                    searchTarget.getExtras().getString(REMOTE_ACTION_TOKEN),
-                    searchTarget.getExtras().getBoolean(REMOTE_ACTION_SHOULD_START),
-                    type.equals(TARGET_TYPE_REMOTE_ACTION));
-
-        } else if (type.equals(TARGET_TYPE_SHORTCUT)) {
-            prepareUsingShortcutInfo(searchTarget.getShortcutInfos().get(0));
+        mResultIcon.applySearchTarget(searchTarget);
+        mResultIcon.setTextVisibility(false);
+        mTitleView.setText(mResultIcon.getText());
+        String itemType = searchTarget.getItemType();
+        boolean showDesc = itemType.equals(SearchResultIcon.TARGET_TYPE_SHORTCUT);
+        mDescriptionView.setVisibility(showDesc ? VISIBLE : GONE);
+
+        if (itemType.equals(SearchResultIcon.TARGET_TYPE_SHORTCUT)) {
+            ShortcutInfo shortcutInfo = searchTarget.getShortcutInfos().get(0);
+            setProviderDetails(new ComponentName(shortcutInfo.getPackage(), ""),
+                    shortcutInfo.getUserHandle());
+        } else if (itemType.equals(SearchResultIcon.TARGET_TYPE_HERO_APP)) {
+            showInlineShortcuts(mSearchTarget.getShortcutInfos());
         }
-        setOnClickListener(v -> handleSelection(SearchTargetEvent.SELECT));
-        SearchEventTracker.INSTANCE.get(getContext()).registerWeakHandler(searchTarget, this);
-    }
-
-    private void prepareUsingShortcutInfo(ShortcutInfo shortcutInfo) {
-        WorkspaceItemInfo workspaceItemInfo = new WorkspaceItemInfo(shortcutInfo, getContext());
-        applyFromWorkspaceItem(workspaceItemInfo);
-        LauncherAppState launcherAppState = LauncherAppState.getInstance(getContext());
-        if (!loadIconFromResource()) {
-            MODEL_EXECUTOR.execute(() -> {
-                launcherAppState.getIconCache().getShortcutIcon(workspaceItemInfo, shortcutInfo);
-                reapplyItemInfoAsync(workspaceItemInfo);
-            });
+        if (!itemType.equals(SearchResultIcon.TARGET_TYPE_HERO_APP)) {
+            showInlineShortcuts(new ArrayList<>());
         }
     }
 
-    private void prepareUsingRemoteAction(RemoteAction remoteAction, String token, boolean start,
-            boolean useIconToBadge) {
-        RemoteActionItemInfo itemInfo = new RemoteActionItemInfo(remoteAction, token, start);
-
-        applyFromRemoteActionInfo(itemInfo);
-        if (itemInfo.isEscapeHatch() || !loadIconFromResource()) {
-            UI_HELPER_EXECUTOR.post(() -> {
-                // If the Drawable from the remote action is not AdaptiveBitmap, styling will not
-                // work.
-                try (LauncherIcons li = LauncherIcons.obtain(getContext())) {
-                    Drawable d = itemInfo.getRemoteAction().getIcon().loadDrawable(getContext());
-                    BitmapInfo bitmap = li.createBadgedIconBitmap(d, itemInfo.user,
-                            Build.VERSION.SDK_INT);
-
-                    if (useIconToBadge) {
-                        BitmapInfo placeholder = li.createIconBitmap(
-                                itemInfo.getRemoteAction().getTitle().toString().substring(0, 1),
-                                bitmap.color);
-                        itemInfo.bitmap = li.badgeBitmap(placeholder.icon, bitmap);
-                    } else {
-                        itemInfo.bitmap = bitmap;
-                    }
-                    reapplyItemInfoAsync(itemInfo);
-                }
-            });
+    private void showInlineShortcuts(List<ShortcutInfo> infos) {
+        if (infos == null) return;
+        ArrayList<Pair<ShortcutInfo, ItemInfoWithIcon>> shortcuts = new ArrayList<>();
+        for (int i = 0; infos != null && i < infos.size() && i < MAX_SHORTCUTS_COUNT; i++) {
+            ShortcutInfo shortcutInfo = infos.get(i);
+            ItemInfoWithIcon si = new WorkspaceItemInfo(shortcutInfo, getContext());
+            si.rank = i;
+            shortcuts.add(new Pair<>(shortcutInfo, si));
         }
 
+        for (int i = 0; i < mShortcutViews.length; i++) {
+            BubbleTextView shortcutView = mShortcutViews[i];
+            mShortcutViews[i].setVisibility(shortcuts.size() > i ? VISIBLE : GONE);
+            if (i < shortcuts.size()) {
+                Pair<ShortcutInfo, ItemInfoWithIcon> p = shortcuts.get(i);
+                //apply ItemInfo and prepare view
+                shortcutView.applyFromWorkspaceItem((WorkspaceItemInfo) p.second);
+                MODEL_EXECUTOR.execute(() -> {
+                    // load unbadged shortcut in background and update view when icon ready
+                    mLauncherAppState.getIconCache().getUnbadgedShortcutIcon(p.second, p.first);
+                    MAIN_EXECUTOR.post(() -> shortcutView.reapplyItemInfo(p.second));
+                });
+            }
+        }
     }
 
-    private boolean loadIconFromResource() {
-        if (mCustomIcon == null) return false;
-        setIcon(mCustomIcon);
-        return true;
-    }
 
-    void reapplyItemInfoAsync(ItemInfoWithIcon itemInfoWithIcon) {
-        MAIN_EXECUTOR.post(() -> {
-            reapplyItemInfo(itemInfoWithIcon);
-            mCustomIcon = getIcon();
+    private void setProviderDetails(ComponentName componentName, UserHandle userHandle) {
+        PackageItemInfo packageItemInfo = new PackageItemInfo(componentName.getPackageName());
+        if (mProviderInfo == packageItemInfo) return;
+        MODEL_EXECUTOR.post(() -> {
+            packageItemInfo.user = userHandle;
+            mLauncherAppState.getIconCache().getTitleAndIconForApp(packageItemInfo, true);
+            MAIN_EXECUTOR.post(() -> {
+                mDescriptionView.setText(packageItemInfo.title);
+                mProviderInfo = packageItemInfo;
+            });
         });
     }
 
     @Override
     public void handleSelection(int eventType) {
-        ItemInfo itemInfo = (ItemInfo) getTag();
-        Launcher launcher = Launcher.getLauncher(getContext());
-        if (itemInfo instanceof WorkspaceItemInfo) {
-            ItemClickHandler.onClickAppShortcut(this, (WorkspaceItemInfo) itemInfo, launcher);
-        } else {
-            ItemClickHandler.onClickRemoteAction(launcher, (RemoteActionItemInfo) itemInfo);
-        }
-        SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(
-                new SearchTargetEvent.Builder(mSearchTarget, eventType).build());
+        mResultIcon.handleSelection(eventType);
+    }
+
+    @Override
+    public void onClick(View view) {
+        mResultIcon.performClick();
+    }
+
+    @Override
+    public boolean onLongClick(View view) {
+        mResultIcon.performLongClick();
+        return false;
     }
 }
diff --git a/src/com/android/launcher3/views/SearchResultSuggestion.java b/src/com/android/launcher3/views/SearchResultSuggestion.java
new file mode 100644
index 0000000000..ab94bf0342
--- /dev/null
+++ b/src/com/android/launcher3/views/SearchResultSuggestion.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.views;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.view.ViewGroup;
+
+import com.android.launcher3.R;
+
+/**
+ * {@link SearchResultIconRow} with custom drawable resource
+ */
+public class SearchResultSuggestion extends SearchResultIcon {
+
+    private final Drawable mCustomIcon;
+
+    public SearchResultSuggestion(Context context) {
+        this(context, null, 0);
+    }
+
+    public SearchResultSuggestion(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public SearchResultSuggestion(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+
+        TypedArray a = context.obtainStyledAttributes(attrs,
+                R.styleable.SearchResultSuggestion, defStyle, 0);
+        mCustomIcon = a.getDrawable(R.styleable.SearchResultSuggestion_customIcon);
+        a.recycle();
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        ViewGroup.LayoutParams lp = getLayoutParams();
+        lp.height = BaseDragLayer.LayoutParams.WRAP_CONTENT;
+    }
+
+    @Override
+    protected boolean loadIconFromResource() {
+        setIcon(mCustomIcon);
+        return true;
+    }
+}
diff --git a/src/com/android/launcher3/views/ThumbnailSearchResultView.java b/src/com/android/launcher3/views/ThumbnailSearchResultView.java
index e929d7fbd8..f213f229a8 100644
--- a/src/com/android/launcher3/views/ThumbnailSearchResultView.java
+++ b/src/com/android/launcher3/views/ThumbnailSearchResultView.java
@@ -15,8 +15,9 @@
  */
 package com.android.launcher3.views;
 
-import static com.android.launcher3.views.SearchResultIconRow.REMOTE_ACTION_SHOULD_START;
-import static com.android.launcher3.views.SearchResultIconRow.REMOTE_ACTION_TOKEN;
+
+import static com.android.launcher3.views.SearchResultIcon.REMOTE_ACTION_SHOULD_START;
+import static com.android.launcher3.views.SearchResultIcon.REMOTE_ACTION_TOKEN;
 
 import android.content.Context;
 import android.content.Intent;
-- 
GitLab


From ff9e7d6aa96cf5d95ed4c06383c6b4b5beadb31e Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 21 Oct 2020 15:42:05 -0700
Subject: [PATCH 0299/1664] Removing separate Cancel and End callbacks and
 using AnimationListener instead

This removes the additional step of invoking these callbacks separately

Change-Id: I0b60047a44f179ba725f15b1e791e336884869c9
---
 .../NavBarToHomeTouchController.java          |  7 +--
 ...ButtonNavbarToOverviewTouchController.java |  9 ++--
 .../NoButtonQuickSwitchTouchController.java   | 11 +++--
 .../PortraitStatesTouchController.java        | 29 +++++------
 .../QuickSwitchTouchController.java           |  4 +-
 .../TaskViewTouchController.java              | 36 ++++----------
 .../android/quickstep/views/RecentsView.java  | 48 ++++++++-----------
 .../com/android/quickstep/views/TaskView.java |  9 ++--
 .../android/launcher3/LauncherAnimUtils.java  | 26 +++++++++-
 .../AllAppsInsetTransitionController.java     | 18 +++----
 .../anim/AnimatorPlaybackController.java      | 35 --------------
 .../launcher3/anim/PendingAnimation.java      | 48 ++++++++++++-------
 .../AbstractStateChangeTouchController.java   | 34 ++++++-------
 13 files changed, 141 insertions(+), 173 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
index 5181a86960..f73e2f2f0a 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
@@ -17,6 +17,8 @@ package com.android.launcher3.uioverrides.touchcontrollers;
 
 import static com.android.launcher3.AbstractFloatingView.TYPE_ALL;
 import static com.android.launcher3.AbstractFloatingView.TYPE_ALL_APPS_EDU;
+import static com.android.launcher3.LauncherAnimUtils.SUCCESS_TRANSITION_PROGRESS;
+import static com.android.launcher3.LauncherAnimUtils.newCancelListener;
 import static com.android.launcher3.LauncherState.ALL_APPS;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS;
@@ -24,7 +26,6 @@ import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_ALL_APPS_EDU;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE;
-import static com.android.launcher3.touch.AbstractStateChangeTouchController.SUCCESS_TRANSITION_PROGRESS;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
 
 import android.animation.ValueAnimator;
@@ -186,8 +187,8 @@ public class NavBarToHomeTouchController implements TouchController,
         if (topView != null) {
             topView.addHintCloseAnim(mPullbackDistance, PULLBACK_INTERPOLATOR, builder);
         }
-        mCurrentAnimation = builder.createPlaybackController()
-                .setOnCancelRunnable(this::clearState);
+        mCurrentAnimation = builder.createPlaybackController();
+        mCurrentAnimation.getTarget().addListener(newCancelListener(this::clearState));
     }
 
     private void clearState() {
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
index 2a3bdbfcb8..702c519ace 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -16,6 +16,7 @@
 
 package com.android.launcher3.uioverrides.touchcontrollers;
 
+import static com.android.launcher3.LauncherAnimUtils.newCancelListener;
 import static com.android.launcher3.LauncherState.ALL_APPS;
 import static com.android.launcher3.LauncherState.HINT_STATE;
 import static com.android.launcher3.LauncherState.NORMAL;
@@ -191,15 +192,17 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
             return;
         }
         mNormalToHintOverviewScrimAnimator = null;
-        mCurrentAnimation.dispatchOnCancelWithoutCancelRunnable(() -> {
+        mCurrentAnimation.getTarget().addListener(newCancelListener(() ->
             mLauncher.getStateManager().goToState(OVERVIEW, true, () -> {
                 mOverviewResistYAnim = AnimatorControllerWithResistance
                         .createRecentsResistanceFromOverviewAnim(mLauncher, null)
                         .createPlaybackController();
                 mReachedOverview = true;
                 maybeSwipeInteractionToOverviewComplete();
-            });
-        });
+            })));
+
+        mCurrentAnimation.getTarget().removeListener(mClearStateOnCancelListener);
+        mCurrentAnimation.dispatchOnCancel();
         mStartedOverview = true;
         VibratorWrapper.INSTANCE.get(mLauncher).vibrate(OVERVIEW_HAPTIC);
     }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
index f378848a71..df433f8cc0 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
@@ -15,6 +15,7 @@
  */
 package com.android.launcher3.uioverrides.touchcontrollers;
 
+import static com.android.launcher3.LauncherAnimUtils.newCancelListener;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.OVERVIEW_BUTTONS;
@@ -44,6 +45,7 @@ import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
 
 import android.animation.Animator;
+import android.animation.Animator.AnimatorListener;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ValueAnimator;
 import android.graphics.PointF;
@@ -92,6 +94,8 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
     private final MotionPauseDetector mMotionPauseDetector;
     private final float mMotionPauseMinDisplacement;
     private final LauncherRecentsView mRecentsView;
+    protected final AnimatorListener mClearStateOnCancelListener =
+            newCancelListener(this::clearState);
 
     private boolean mNoIntercept;
     private LauncherState mStartState;
@@ -204,8 +208,8 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
         config.duration = (long) (Math.max(mXRange, mYRange) * 2);
         config.animFlags = config.animFlags | SKIP_OVERVIEW;
         mNonOverviewAnim = mLauncher.getStateManager()
-                .createAnimationToNewWorkspace(toState, config)
-                .setOnCancelRunnable(this::clearState);
+                .createAnimationToNewWorkspace(toState, config);
+        mNonOverviewAnim.getTarget().addListener(mClearStateOnCancelListener);
     }
 
     private void setupOverviewAnimators() {
@@ -379,7 +383,8 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
             if (canceled) {
                 // Let the state manager know that the animation didn't go to the target state,
                 // but don't clean up yet (we already clean up when the animation completes).
-                mNonOverviewAnim.dispatchOnCancelWithoutCancelRunnable();
+                mNonOverviewAnim.getTarget().removeListener(mClearStateOnCancelListener);
+                mNonOverviewAnim.dispatchOnCancel();
             }
             float startProgress = mNonOverviewAnim.getProgressFraction();
             float endProgress = canceled ? 0 : 1;
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
index 037d9889fd..3c9b808f2f 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
@@ -245,29 +245,29 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
         config.animFlags = animFlags;
         config.duration = maxAccuracy;
 
-        cancelPendingAnim();
+        if (mCurrentAnimation != null) {
+            mCurrentAnimation.getTarget().removeListener(mClearStateOnCancelListener);
+            mCurrentAnimation.dispatchOnCancel();
+        }
 
+        mGoingBetweenStates = true;
         if (mFromState == OVERVIEW && mToState == NORMAL
                 && mOverviewPortraitStateTouchHelper.shouldSwipeDownReturnToApp()) {
             // Reset the state manager, when changing the interaction mode
             mLauncher.getStateManager().goToState(OVERVIEW, false /* animate */);
-            mPendingAnimation = mOverviewPortraitStateTouchHelper
-                    .createSwipeDownToTaskAppAnimation(maxAccuracy, Interpolators.LINEAR);
-            Runnable onCancelRunnable = () -> {
-                cancelPendingAnim();
-                clearState();
-            };
-            mCurrentAnimation = mPendingAnimation.createPlaybackController()
-                    .setOnCancelRunnable(onCancelRunnable);
+            mGoingBetweenStates = false;
+            mCurrentAnimation = mOverviewPortraitStateTouchHelper
+                    .createSwipeDownToTaskAppAnimation(maxAccuracy, Interpolators.LINEAR)
+                    .createPlaybackController();
             mLauncher.getStateManager().setCurrentUserControlledAnimation(mCurrentAnimation);
             RecentsView recentsView = mLauncher.getOverviewPanel();
             totalShift = LayoutUtils.getShelfTrackingDistance(mLauncher,
                     mLauncher.getDeviceProfile(), recentsView.getPagedOrientationHandler());
         } else {
             mCurrentAnimation = mLauncher.getStateManager()
-                    .createAnimationToNewWorkspace(mToState, config)
-                    .setOnCancelRunnable(this::clearState);
+                    .createAnimationToNewWorkspace(mToState, config);
         }
+        mCurrentAnimation.getTarget().addListener(mClearStateOnCancelListener);
 
         if (totalShift == 0) {
             totalShift = Math.signum(mFromState.ordinal - mToState.ordinal)
@@ -276,13 +276,6 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
         return 1 / totalShift;
     }
 
-    private void cancelPendingAnim() {
-        if (mPendingAnimation != null) {
-            mPendingAnimation.finish(false);
-            mPendingAnimation = null;
-        }
-    }
-
     @Override
     protected void updateSwipeCompleteAnimation(ValueAnimator animator, long expectedDuration,
             LauncherState targetState, float velocity, boolean isFling) {
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
index d39b6f5d97..fc9e1bbfe5 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
@@ -106,8 +106,8 @@ public class QuickSwitchTouchController extends AbstractStateChangeTouchControll
         setupInterpolators(config);
         config.duration = (long) (getShiftRange() * 2);
         mCurrentAnimation = mLauncher.getStateManager()
-                .createAnimationToNewWorkspace(mToState, config)
-                .setOnCancelRunnable(this::clearState);
+                .createAnimationToNewWorkspace(mToState, config);
+        mCurrentAnimation.getTarget().addListener(mClearStateOnCancelListener);
         mCurrentAnimation.getAnimationPlayer().addUpdateListener(valueAnimator ->
                 updateFullscreenProgress((Float) valueAnimator.getAnimatedValue()));
         return 1 / getShiftRange();
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
index 186caf6dc1..97296957fe 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
@@ -16,6 +16,7 @@
 package com.android.launcher3.uioverrides.touchcontrollers;
 
 import static com.android.launcher3.AbstractFloatingView.TYPE_ACCESSIBLE;
+import static com.android.launcher3.LauncherAnimUtils.SUCCESS_TRANSITION_PROGRESS;
 import static com.android.launcher3.touch.SingleAxisSwipeDetector.DIRECTION_BOTH;
 import static com.android.launcher3.touch.SingleAxisSwipeDetector.DIRECTION_NEGATIVE;
 import static com.android.launcher3.touch.SingleAxisSwipeDetector.DIRECTION_POSITIVE;
@@ -50,16 +51,12 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
         extends AnimatorListenerAdapter implements TouchController,
         SingleAxisSwipeDetector.Listener {
 
-    // Progress after which the transition is assumed to be a success in case user does not fling
-    public static final float SUCCESS_TRANSITION_PROGRESS = 0.5f;
-
     protected final T mActivity;
     private final SingleAxisSwipeDetector mDetector;
     private final RecentsView mRecentsView;
     private final int[] mTempCords = new int[2];
     private final boolean mIsRtl;
 
-    private PendingAnimation mPendingAnimation;
     private AnimatorPlaybackController mCurrentAnimation;
     private boolean mCurrentAnimationIsGoingUp;
 
@@ -200,10 +197,8 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
         }
         if (mCurrentAnimation != null) {
             mCurrentAnimation.setPlayFraction(0);
-        }
-        if (mPendingAnimation != null) {
-            mPendingAnimation.finish(false);
-            mPendingAnimation = null;
+            mCurrentAnimation.getTarget().removeListener(this);
+            mCurrentAnimation.dispatchOnCancel();
         }
 
         PagedOrientationHandler orientationHandler = mRecentsView.getPagedOrientationHandler();
@@ -216,15 +211,16 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
         // The interpolator controlling the most prominent visual movement. We use this to determine
         // whether we passed SUCCESS_TRANSITION_PROGRESS.
         final Interpolator currentInterpolator;
+        PendingAnimation pa;
         if (goingUp) {
             currentInterpolator = Interpolators.LINEAR;
-            mPendingAnimation = mRecentsView.createTaskDismissAnimation(mTaskBeingDragged,
+            pa = mRecentsView.createTaskDismissAnimation(mTaskBeingDragged,
                     true /* animateTaskView */, true /* removeTask */, maxDuration);
 
             mEndDisplacement = -secondaryTaskDimension;
         } else {
             currentInterpolator = Interpolators.ZOOM_IN;
-            mPendingAnimation = mRecentsView.createTaskLaunchAnimation(
+            pa = mRecentsView.createTaskLaunchAnimation(
                     mTaskBeingDragged, maxDuration, currentInterpolator);
 
             // Since the thumbnail is what is filling the screen, based the end displacement on it.
@@ -234,12 +230,8 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
             mEndDisplacement = secondaryLayerDimension - mTempCords[1];
         }
         mEndDisplacement *= verticalFactor;
+        mCurrentAnimation = pa.createPlaybackController();
 
-        if (mCurrentAnimation != null) {
-            mCurrentAnimation.setOnCancelRunnable(null);
-        }
-        mCurrentAnimation = mPendingAnimation.createPlaybackController()
-                .setOnCancelRunnable(this::clearState);
         // Setting this interpolator doesn't affect the visual motion, but is used to determine
         // whether we successfully reached the target state in onDragEnd().
         mCurrentAnimation.getTarget().setInterpolator(currentInterpolator);
@@ -303,27 +295,15 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
             animationDuration *= LauncherAnimUtils.blockedFlingDurationFactor(velocity);
         }
 
-        mCurrentAnimation.setEndAction(() -> onCurrentAnimationEnd(goingToEnd));
+        mCurrentAnimation.setEndAction(this::clearState);
         mCurrentAnimation.startWithVelocity(mActivity, goingToEnd,
                 velocity, mEndDisplacement, animationDuration);
     }
 
-    private void onCurrentAnimationEnd(boolean wasSuccess) {
-        if (mPendingAnimation != null) {
-            mPendingAnimation.finish(wasSuccess);
-            mPendingAnimation = null;
-        }
-        clearState();
-    }
-
     private void clearState() {
         mDetector.finishedScrolling();
         mDetector.setDetectableScrollConditions(0, false);
         mTaskBeingDragged = null;
         mCurrentAnimation = null;
-        if (mPendingAnimation != null) {
-            mPendingAnimation.finish(false);
-            mPendingAnimation = null;
-        }
     }
 }
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index f35eb1fa5d..7efa5bd8c4 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -22,6 +22,7 @@ import static android.view.View.MeasureSpec.makeMeasureSpec;
 
 import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS;
 import static com.android.launcher3.InvariantDeviceProfile.CHANGE_FLAG_ICON_PARAMS;
+import static com.android.launcher3.LauncherAnimUtils.SUCCESS_TRANSITION_PROGRESS;
 import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA;
 import static com.android.launcher3.LauncherState.BACKGROUND_APP;
 import static com.android.launcher3.LauncherState.OVERVIEW_MODAL_TASK;
@@ -39,7 +40,6 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_DISMISS_SWIPE_UP;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_SWIPE_DOWN;
 import static com.android.launcher3.statehandlers.DepthController.DEPTH;
-import static com.android.launcher3.uioverrides.touchcontrollers.TaskViewTouchController.SUCCESS_TRANSITION_PROGRESS;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW;
 import static com.android.quickstep.TaskUtils.checkCurrentOrManagedUserId;
@@ -99,7 +99,6 @@ import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
-import com.android.launcher3.anim.PendingAnimation.EndState;
 import com.android.launcher3.anim.SpringProperty;
 import com.android.launcher3.compat.AccessibilityManagerCompat;
 import com.android.launcher3.config.FeatureFlags;
@@ -772,7 +771,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
 
     protected void applyLoadPlan(ArrayList<Task> tasks) {
         if (mPendingAnimation != null) {
-            mPendingAnimation.addEndListener((endState) -> applyLoadPlan(tasks));
+            mPendingAnimation.addEndListener(success -> applyLoadPlan(tasks));
             return;
         }
 
@@ -1464,19 +1463,10 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                 verticalFactor * secondaryTaskDimension).setDuration(duration), LINEAR, sp);
     }
 
-    private void removeTask(TaskView taskView, int index, EndState endState) {
-        if (taskView.getTask() != null) {
-            UI_HELPER_EXECUTOR.execute(() ->
-                    ActivityManagerWrapper.getInstance().removeTask(taskView.getTask().key.id));
-            mActivity.getStatsLogManager().logger().withItemInfo(taskView.getItemInfo())
-                    .log(LAUNCHER_TASK_DISMISS_SWIPE_UP);
-        }
-    }
-
     public PendingAnimation createTaskDismissAnimation(TaskView taskView, boolean animateTaskView,
             boolean shouldRemoveTask, long duration) {
         if (mPendingAnimation != null) {
-            mPendingAnimation.finish(false);
+            mPendingAnimation.createPlaybackController().dispatchOnCancel();
         }
         PendingAnimation anim = new PendingAnimation(duration);
 
@@ -1559,22 +1549,27 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         }
 
         mPendingAnimation = anim;
-        mPendingAnimation.addEndListener(new Consumer<EndState>() {
+        mPendingAnimation.addEndListener(new Consumer<Boolean>() {
             @Override
-            public void accept(EndState endState) {
-                if (ENABLE_QUICKSTEP_LIVE_TILE.get() &&
-                        taskView.isRunningTask() && endState.isSuccess) {
-                    finishRecentsAnimation(true /* toHome */, () -> onEnd(endState));
+            public void accept(Boolean success) {
+                if (ENABLE_QUICKSTEP_LIVE_TILE.get() && taskView.isRunningTask() && success) {
+                    finishRecentsAnimation(true /* toHome */, () -> onEnd(success));
                 } else {
-                    onEnd(endState);
+                    onEnd(success);
                 }
             }
 
             @SuppressWarnings("WrongCall")
-            private void onEnd(EndState endState) {
-                if (endState.isSuccess) {
+            private void onEnd(boolean success) {
+                if (success) {
                     if (shouldRemoveTask) {
-                        removeTask(taskView, draggedIndex, endState);
+                        if (taskView.getTask() != null) {
+                            UI_HELPER_EXECUTOR.execute(() -> ActivityManagerWrapper.getInstance()
+                                    .removeTask(taskView.getTask().key.id));
+                            mActivity.getStatsLogManager().logger()
+                                    .withItemInfo(taskView.getItemInfo())
+                                    .log(LAUNCHER_TASK_DISMISS_SWIPE_UP);
+                        }
                     }
 
                     int pageToSnapTo = mCurrentPage;
@@ -1613,8 +1608,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         }
 
         mPendingAnimation = anim;
-        mPendingAnimation.addEndListener((endState) -> {
-            if (endState.isSuccess) {
+        mPendingAnimation.addEndListener(isSuccess -> {
+            if (isSuccess) {
                 // Remove all the task views now
                 UI_HELPER_EXECUTOR.execute(
                         ActivityManagerWrapper.getInstance()::removeAllRecentTasks);
@@ -1642,7 +1637,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     protected void runDismissAnimation(PendingAnimation pendingAnim) {
         AnimatorPlaybackController controller = pendingAnim.createPlaybackController();
         controller.dispatchOnStart();
-        controller.setEndAction(() -> pendingAnim.finish(true));
         controller.getAnimationPlayer().setInterpolator(FAST_OUT_SLOW_IN);
         controller.start();
     }
@@ -2186,8 +2180,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             mLiveTileTaskViewSimulator.addOverviewToAppAnim(mPendingAnimation, interpolator);
             mPendingAnimation.addOnFrameCallback(this::redrawLiveTile);
         }
-        mPendingAnimation.addEndListener((endState) -> {
-            if (endState.isSuccess) {
+        mPendingAnimation.addEndListener(isSuccess -> {
+            if (isSuccess) {
                 Consumer<Boolean> onLaunchResult = (result) -> {
                     onTaskLaunchAnimationEnd(result);
                     if (!result) {
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 5154018f6c..1b85b2ea8d 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -72,7 +72,6 @@ import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.Interpolators;
-import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.popup.SystemShortcut;
 import com.android.launcher3.statemanager.StatefulActivity;
@@ -380,11 +379,9 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     }
 
     public AnimatorPlaybackController createLaunchAnimationForRunningTask() {
-        final PendingAnimation pendingAnimation = getRecentsView().createTaskLaunchAnimation(
-                this, RECENTS_LAUNCH_DURATION, TOUCH_RESPONSE_INTERPOLATOR);
-        AnimatorPlaybackController currentAnimation = pendingAnimation.createPlaybackController();
-        currentAnimation.setEndAction(() -> pendingAnimation.finish(true));
-        return currentAnimation;
+        return getRecentsView().createTaskLaunchAnimation(
+                this, RECENTS_LAUNCH_DURATION, TOUCH_RESPONSE_INTERPOLATOR)
+                .createPlaybackController();
     }
 
     public void launchTask(boolean animate) {
diff --git a/src/com/android/launcher3/LauncherAnimUtils.java b/src/com/android/launcher3/LauncherAnimUtils.java
index d9cf7f19b3..803f8d2c3d 100644
--- a/src/com/android/launcher3/LauncherAnimUtils.java
+++ b/src/com/android/launcher3/LauncherAnimUtils.java
@@ -16,6 +16,9 @@
 
 package com.android.launcher3;
 
+import android.animation.Animator;
+import android.animation.Animator.AnimatorListener;
+import android.animation.AnimatorListenerAdapter;
 import android.graphics.drawable.Drawable;
 import android.util.FloatProperty;
 import android.util.IntProperty;
@@ -29,8 +32,8 @@ public class LauncherAnimUtils {
      */
     public static final int SPRING_LOADED_EXIT_DELAY = 500;
 
-    // The progress of an animation to all apps must be at least this far along to snap to all apps.
-    public static final float MIN_PROGRESS_TO_ALL_APPS = 0.5f;
+    // Progress after which the transition is assumed to be a success
+    public static final float SUCCESS_TRANSITION_PROGRESS = 0.5f;
 
     public static final IntProperty<Drawable> DRAWABLE_ALPHA =
             new IntProperty<Drawable>("drawableAlpha") {
@@ -131,4 +134,23 @@ public class LauncherAnimUtils {
                             return view.getAlpha();
                         }
                     };
+
+    /**
+     * Utility method to create an {@link AnimatorListener} which executes a callback on animation
+     * cancel.
+     */
+    public static AnimatorListener newCancelListener(Runnable callback) {
+        return new AnimatorListenerAdapter() {
+
+            boolean mDispatched = false;
+
+            @Override
+            public void onAnimationCancel(Animator animation) {
+                if (!mDispatched) {
+                    mDispatched = true;
+                    callback.run();
+                }
+            }
+        };
+    }
 }
diff --git a/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java b/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
index 08d573f08b..01d01ea35e 100644
--- a/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
@@ -15,6 +15,7 @@
  */
 package com.android.launcher3.allapps;
 
+import android.annotation.TargetApi;
 import android.graphics.Insets;
 import android.os.Build;
 import android.util.Log;
@@ -26,9 +27,8 @@ import android.view.animation.Interpolator;
 import android.view.animation.LinearInterpolator;
 
 import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
-import androidx.core.os.BuildCompat;
 
+import com.android.launcher3.Utilities;
 import com.android.launcher3.util.UiThreadHelper;
 
 /**
@@ -68,7 +68,7 @@ public class AllAppsInsetTransitionController {
     }
 
     public void hide() {
-        if (!BuildCompat.isAtLeastR()) return;
+        if (!Utilities.ATLEAST_R) return;
 
         WindowInsets insets = mApps.getRootWindowInsets();
         if (insets == null) return;
@@ -89,9 +89,9 @@ public class AllAppsInsetTransitionController {
      *
      * @param progress value between 0..1
      */
-    @RequiresApi(api = Build.VERSION_CODES.R)
+    @TargetApi(Build.VERSION_CODES.R)
     public void onDragStart(float progress) {
-        if (!BuildCompat.isAtLeastR()) return;
+        if (!Utilities.ATLEAST_R) return;
 
         // Until getRootWindowInsets().isVisible(...) method returns correct value,
         // only support InsetController based IME transition during swipe up and
@@ -164,7 +164,7 @@ public class AllAppsInsetTransitionController {
      * If IME bounds after touch sequence finishes, call finish.
      */
     private boolean handleFinishOnFling(WindowInsetsAnimationController controller) {
-        if (!BuildCompat.isAtLeastR()) return false;
+        if (!Utilities.ATLEAST_R) return false;
 
         if (mState == State.FLING_END_TOP) {
             controller.finish(true);
@@ -181,9 +181,9 @@ public class AllAppsInsetTransitionController {
      *
      * @param progress value between 0..1
      */
-    @RequiresApi(api = 30)
+    @TargetApi(Build.VERSION_CODES.R)
     public void setProgress(float progress) {
-        if (!BuildCompat.isAtLeastR()) return;
+        if (!Utilities.ATLEAST_R) return;
         // progress that equals to 0 or 1 is error prone. Do not use them.
         // Instead use onDragStart and onAnimationEnd
         if (mAnimationController == null || progress <= 0f || progress >= 1f) return;
@@ -218,7 +218,7 @@ public class AllAppsInsetTransitionController {
      *
      * @param progress value between 0..1
      */
-    @RequiresApi(api = 30)
+    @TargetApi(Build.VERSION_CODES.R)
     public void onAnimationEnd(float progress) {
         if (DEBUG) {
             Log.d(TAG, "onAnimationEnd progress=" + progress
diff --git a/src/com/android/launcher3/anim/AnimatorPlaybackController.java b/src/com/android/launcher3/anim/AnimatorPlaybackController.java
index dcdfb6e51a..edaf51dbc6 100644
--- a/src/com/android/launcher3/anim/AnimatorPlaybackController.java
+++ b/src/com/android/launcher3/anim/AnimatorPlaybackController.java
@@ -29,8 +29,6 @@ import android.animation.TimeInterpolator;
 import android.animation.ValueAnimator;
 import android.content.Context;
 
-import androidx.annotation.Nullable;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -72,7 +70,6 @@ public class AnimatorPlaybackController implements ValueAnimator.AnimatorUpdateL
     private Runnable mEndAction;
 
     protected boolean mTargetCancelled = false;
-    protected Runnable mOnCancelRunnable;
 
     /** package private */
     AnimatorPlaybackController(AnimatorSet anim, long duration, ArrayList<Holder> childAnims) {
@@ -88,16 +85,11 @@ public class AnimatorPlaybackController implements ValueAnimator.AnimatorUpdateL
             @Override
             public void onAnimationCancel(Animator animation) {
                 mTargetCancelled = true;
-                if (mOnCancelRunnable != null) {
-                    mOnCancelRunnable.run();
-                    mOnCancelRunnable = null;
-                }
             }
 
             @Override
             public void onAnimationEnd(Animator animation) {
                 mTargetCancelled = false;
-                mOnCancelRunnable = null;
             }
 
             @Override
@@ -269,33 +261,6 @@ public class AnimatorPlaybackController implements ValueAnimator.AnimatorUpdateL
         }
     }
 
-    /** @see #dispatchOnCancelWithoutCancelRunnable(Runnable) */
-    public void dispatchOnCancelWithoutCancelRunnable() {
-        dispatchOnCancelWithoutCancelRunnable(null);
-    }
-
-    /**
-     * Sets mOnCancelRunnable = null before dispatching the cancel and restoring the runnable. This
-     * is intended to be used only if you need to cancel but want to defer cleaning up yourself.
-     * @param callback An optional callback to run after dispatching the cancel but before resetting
-     *                 the onCancelRunnable.
-     */
-    public void dispatchOnCancelWithoutCancelRunnable(@Nullable Runnable callback) {
-        Runnable onCancel = mOnCancelRunnable;
-        setOnCancelRunnable(null);
-        dispatchOnCancel();
-        if (callback != null) {
-            callback.run();
-        }
-        setOnCancelRunnable(onCancel);
-    }
-
-
-    public AnimatorPlaybackController setOnCancelRunnable(Runnable runnable) {
-        mOnCancelRunnable = runnable;
-        return this;
-    }
-
     public void dispatchOnStart() {
         callListenerCommandRecursively(mAnim, AnimatorListener::onAnimationStart);
     }
diff --git a/src/com/android/launcher3/anim/PendingAnimation.java b/src/com/android/launcher3/anim/PendingAnimation.java
index 6dd316ed60..4e90c9e67f 100644
--- a/src/com/android/launcher3/anim/PendingAnimation.java
+++ b/src/com/android/launcher3/anim/PendingAnimation.java
@@ -15,10 +15,12 @@
  */
 package com.android.launcher3.anim;
 
+import static com.android.launcher3.LauncherAnimUtils.SUCCESS_TRANSITION_PROGRESS;
 import static com.android.launcher3.anim.AnimatorPlaybackController.addAnimationHoldersRecur;
 
 import android.animation.Animator;
 import android.animation.Animator.AnimatorListener;
+import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.TimeInterpolator;
@@ -43,8 +45,6 @@ import java.util.function.Consumer;
  */
 public class PendingAnimation implements PropertySetter {
 
-    private final ArrayList<Consumer<EndState>> mEndListeners = new ArrayList<>();
-
     private final ArrayList<Holder> mAnimHolders = new ArrayList<>();
     private final AnimatorSet mAnim;
     private final long mDuration;
@@ -73,13 +73,6 @@ public class PendingAnimation implements PropertySetter {
         addAnimationHoldersRecur(a, mDuration, springProperty, mAnimHolders);
     }
 
-    public void finish(boolean isSuccess) {
-        for (Consumer<EndState> listeners : mEndListeners) {
-            listeners.accept(new EndState(isSuccess));
-        }
-        mEndListeners.clear();
-    }
-
     @Override
     public void setViewAlpha(View view, float alpha, TimeInterpolator interpolator) {
         if (view == null || view.getAlpha() == alpha) {
@@ -163,19 +156,38 @@ public class PendingAnimation implements PropertySetter {
     }
 
     /**
-     * Add a listener of receiving the end state.
-     * Note that the listeners are called as a result of calling {@link #finish(boolean)}
-     * and not automatically
+     * Add a listener of receiving the success/failure callback in the end.
      */
-    public void addEndListener(Consumer<EndState> listener) {
-        mEndListeners.add(listener);
+    public void addEndListener(Consumer<Boolean> listener) {
+        if (mProgressAnimator == null) {
+            mProgressAnimator = ValueAnimator.ofFloat(0, 1);
+        }
+        mProgressAnimator.addListener(new EndStateCallbackWrapper(listener));
     }
 
-    public static class EndState {
-        public boolean isSuccess;
+    private static class EndStateCallbackWrapper extends AnimatorListenerAdapter {
+
+        private final Consumer<Boolean> mListener;
+        private boolean mCalled = false;
+
+        EndStateCallbackWrapper(Consumer<Boolean> listener) {
+            mListener = listener;
+        }
+
+        @Override
+        public void onAnimationCancel(Animator animation) {
+            if (!mCalled) {
+                mCalled = true;
+                mListener.accept(false);
+            }
+        }
 
-        public EndState(boolean isSuccess) {
-            this.isSuccess = isSuccess;
+        @Override
+        public void onAnimationEnd(Animator animation) {
+            if (!mCalled) {
+                ValueAnimator anim = (ValueAnimator) animation;
+                mListener.accept(anim.getAnimatedFraction() > SUCCESS_TRANSITION_PROGRESS);
+            }
         }
     }
 }
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index 57c0ad92af..a9d0e614e4 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -15,7 +15,8 @@
  */
 package com.android.launcher3.touch;
 
-import static com.android.launcher3.LauncherAnimUtils.MIN_PROGRESS_TO_ALL_APPS;
+import static com.android.launcher3.LauncherAnimUtils.SUCCESS_TRANSITION_PROGRESS;
+import static com.android.launcher3.LauncherAnimUtils.newCancelListener;
 import static com.android.launcher3.LauncherState.ALL_APPS;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
@@ -32,6 +33,7 @@ import static com.android.launcher3.states.StateAnimationConfig.PLAY_NON_ATOMIC;
 import static com.android.launcher3.util.DisplayController.getSingleFrameMs;
 
 import android.animation.Animator;
+import android.animation.Animator.AnimatorListener;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ValueAnimator;
@@ -48,7 +50,6 @@ import com.android.launcher3.LauncherState;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.AnimatorPlaybackController;
-import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.logger.LauncherAtom;
 import com.android.launcher3.logging.StatsLogManager;
@@ -64,9 +65,6 @@ import com.android.launcher3.util.TouchController;
 public abstract class AbstractStateChangeTouchController
         implements TouchController, SingleAxisSwipeDetector.Listener {
 
-    // Progress after which the transition is assumed to be a success in case user does not fling
-    public static final float SUCCESS_TRANSITION_PROGRESS = 0.5f;
-
     /**
      * Play an atomic recents animation when the progress from NORMAL to OVERVIEW reaches this.
      */
@@ -77,6 +75,9 @@ public abstract class AbstractStateChangeTouchController
     protected final SingleAxisSwipeDetector mDetector;
     protected final SingleAxisSwipeDetector.Direction mSwipeDirection;
 
+    protected final AnimatorListener mClearStateOnCancelListener =
+            newCancelListener(this::clearState);
+
     private boolean mNoIntercept;
     private boolean mIsLogContainerSet;
     protected int mStartContainerType;
@@ -85,7 +86,7 @@ public abstract class AbstractStateChangeTouchController
     protected LauncherState mFromState;
     protected LauncherState mToState;
     protected AnimatorPlaybackController mCurrentAnimation;
-    protected PendingAnimation mPendingAnimation;
+    protected boolean mGoingBetweenStates = true;
 
     private float mStartProgress;
     // Ratio of transition process [0, 1] to drag displacement (px)
@@ -209,7 +210,7 @@ public abstract class AbstractStateChangeTouchController
         mStartProgress = 0;
         mPassedOverviewAtomicThreshold = false;
         if (mCurrentAnimation != null) {
-            mCurrentAnimation.setOnCancelRunnable(null);
+            mCurrentAnimation.getTarget().removeListener(mClearStateOnCancelListener);
         }
         int animComponents = goingBetweenNormalAndOverview(mFromState, mToState)
                 ? PLAY_NON_ATOMIC : ANIM_ALL_COMPONENTS;
@@ -237,7 +238,7 @@ public abstract class AbstractStateChangeTouchController
             LauncherState toState) {
         return (fromState == NORMAL || fromState == OVERVIEW)
                 && (toState == NORMAL || toState == OVERVIEW)
-                && mPendingAnimation == null;
+                && mGoingBetweenStates;
     }
 
     @Override
@@ -412,9 +413,8 @@ public abstract class AbstractStateChangeTouchController
                             ? mToState : mFromState;
             // snap to top or bottom using the release velocity
         } else {
-            float successProgress = mToState == ALL_APPS
-                    ? MIN_PROGRESS_TO_ALL_APPS : SUCCESS_TRANSITION_PROGRESS;
-            targetState = (interpolatedProgress > successProgress) ? mToState : mFromState;
+            targetState =
+                    (interpolatedProgress > SUCCESS_TRANSITION_PROGRESS) ? mToState : mFromState;
         }
 
         final float endProgress;
@@ -438,7 +438,8 @@ public abstract class AbstractStateChangeTouchController
         } else {
             // Let the state manager know that the animation didn't go to the target state,
             // but don't cancel ourselves (we already clean up when the animation completes).
-            mCurrentAnimation.dispatchOnCancelWithoutCancelRunnable();
+            mCurrentAnimation.getTarget().removeListener(mClearStateOnCancelListener);
+            mCurrentAnimation.dispatchOnCancel();
 
             endProgress = 0;
             if (progress <= 0) {
@@ -522,13 +523,7 @@ public abstract class AbstractStateChangeTouchController
             mAtomicComponentsController = null;
         }
         clearState();
-        boolean shouldGoToTargetState = true;
-        if (mPendingAnimation != null) {
-            boolean reachedTarget = mToState == targetState;
-            mPendingAnimation.finish(reachedTarget);
-            mPendingAnimation = null;
-            shouldGoToTargetState = !reachedTarget;
-        }
+        boolean shouldGoToTargetState = mGoingBetweenStates || (mToState != targetState);
         if (shouldGoToTargetState) {
             goToTargetState(targetState);
         }
@@ -568,6 +563,7 @@ public abstract class AbstractStateChangeTouchController
             mAtomicAnim.cancel();
             mAtomicAnim = null;
         }
+        mGoingBetweenStates = true;
         mScheduleResumeAtomicComponent = false;
         mDetector.finishedScrolling();
         mDetector.setDetectableScrollConditions(0, false);
-- 
GitLab


From d15915f5fd677ccef710198f6bad8a97e3eb4efd Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Thu, 5 Nov 2020 18:06:10 -0800
Subject: [PATCH 0300/1664] Fixes invalid ids for UiEvents:
 LAUNCHER_FOLDER_CONVERTED_TO_ICON, LAUNCHER_HOTSEAT_PREDICTION_PINNED

Bug: 169100235

Change-Id: I1cae4e61b97947c5a7e56daeaccac0ece55f021c
---
 .../android/launcher3/logging/StatsLogManager.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index 7e90769143..0b445bca4e 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -297,12 +297,6 @@ public class StatsLogManager implements ResourceBasedOverride {
         @UiEvent(doc = "User tapped on image content in Overview Select mode.")
         LAUNCHER_SELECT_MODE_IMAGE(627),
 
-        @UiEvent(doc = "A folder was replaced by a single item")
-        LAUNCHER_FOLDER_CONVERTED_TO_ICON(628),
-
-        @UiEvent(doc = "A hotseat prediction item was pinned")
-        LAUNCHER_HOTSEAT_PREDICTION_PINNED(629),
-
         @UiEvent(doc = "Activity to add external item was started")
         LAUNCHER_ADD_EXTERNAL_ITEM_START(641),
 
@@ -318,6 +312,12 @@ public class StatsLogManager implements ResourceBasedOverride {
         @UiEvent(doc = "Item was dragged in external item addition flow")
         LAUNCHER_ADD_EXTERNAL_ITEM_DRAGGED(645),
 
+        @UiEvent(doc = "A folder was replaced by a single item")
+        LAUNCHER_FOLDER_CONVERTED_TO_ICON(646),
+
+        @UiEvent(doc = "A hotseat prediction item was pinned")
+        LAUNCHER_HOTSEAT_PREDICTION_PINNED(647),
+
         @UiEvent(doc = "Undo event was tapped.")
         LAUNCHER_UNDO(648),
 
-- 
GitLab


From 984e0d0a634a16fbdd77c5bdfc016f24e4fbdf90 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Mon, 2 Nov 2020 13:45:08 -0600
Subject: [PATCH 0301/1664] Show settings icon at start of settings results

Bug: 170792963
Test: Manual
Screenshot: https://screenshot.googleplex.com/MVBtDZGtQ3aChwU
Change-Id: I16a28a7bd9e3129b40102e020cd7c0111e6fe29b
---
 res/layout/search_result_icon_row.xml         |  8 +-
 res/layout/search_result_settings_row.xml     | 70 ++++++++--------
 res/layout/search_result_slice.xml            | 31 +++++--
 res/values/dimens.xml                         |  9 +-
 .../launcher3/allapps/AllAppsGridAdapter.java | 18 +---
 ...er.java => SearchResultSettingsSlice.java} | 83 +++++++++++++++----
 .../views/SearchSettingsRowView.java          | 49 +++++++++--
 7 files changed, 181 insertions(+), 87 deletions(-)
 rename src/com/android/launcher3/views/{SearchSliceWrapper.java => SearchResultSettingsSlice.java} (50%)

diff --git a/res/layout/search_result_icon_row.xml b/res/layout/search_result_icon_row.xml
index b51896e8a7..280bbc992c 100644
--- a/res/layout/search_result_icon_row.xml
+++ b/res/layout/search_result_icon_row.xml
@@ -40,13 +40,13 @@
             android:gravity="start|center_vertical"
             android:textAlignment="viewStart"
             android:textColor="?android:attr/textColorPrimary"
-            android:textSize="@dimen/settings_hero_title_size" />
+            android:textSize="@dimen/search_hero_title_size" />
 
         <TextView
             android:layout_width="wrap_content"
             android:id="@+id/desc"
             android:textColor="?android:attr/textColorTertiary"
-            android:textSize="@dimen/settings_hero_subtitle_size"
+            android:textSize="@dimen/search_hero_subtitle_size"
             android:layout_height="wrap_content" />
     </LinearLayout>
 
@@ -57,7 +57,7 @@
         android:layout_height="match_parent"
         android:gravity="start|center_vertical"
         launcher:iconDisplay="shortcut_popup"
-        android:textSize="@dimen/settings_hero_subtitle_size"
+        android:textSize="@dimen/search_hero_subtitle_size"
         launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size"
         launcher:layoutHorizontal="false" />
 
@@ -67,7 +67,7 @@
         android:layout_width="@dimen/deep_shortcut_icon_size"
         android:layout_height="match_parent"
         launcher:iconDisplay="shortcut_popup"
-        android:textSize="@dimen/settings_hero_inline_button_size"
+        android:textSize="@dimen/search_hero_inline_button_size"
         launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size"
         launcher:layoutHorizontal="false" />
 
diff --git a/res/layout/search_result_settings_row.xml b/res/layout/search_result_settings_row.xml
index 19daf346e2..05f7561628 100644
--- a/res/layout/search_result_settings_row.xml
+++ b/res/layout/search_result_settings_row.xml
@@ -18,40 +18,42 @@
     android:background="?android:attr/selectableItemBackground"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
+    android:orientation="horizontal"
     android:gravity="center_vertical"
-    android:padding="4dp"
-    android:minHeight="48dp"
-    android:textColor="?android:attr/textColorPrimary"
-    android:textSize="14sp">
-
-    <TextView
-        android:id="@+id/title"
-        style="@style/TextTitle"
-        android:layout_width="wrap_content"
+    android:padding="@dimen/dynamic_grid_cell_padding_x"
+    android:textColor="?android:attr/textColorPrimary">
+
+    <View
+        android:layout_width="@dimen/search_settings_icon_size"
+        android:src="@drawable/ic_setting"
+        android:id="@+id/icon"
+        android:layout_height="@dimen/search_settings_icon_size" />
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:orientation="vertical"
+        android:paddingRight="@dimen/dynamic_grid_cell_padding_x"
+        android:paddingLeft="@dimen/dynamic_grid_cell_padding_x"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textSize="16sp" />
-
-    <TextView
-        android:id="@+id/description"
-        style="@style/TextTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textSize="14sp" />
-
-    <TextView
-        android:id="@+id/breadcrumbs"
-        style="@style/TextTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        android:alpha=".7"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="14sp" />
-
-
+        android:layout_weight="1">
+
+
+        <TextView
+            android:id="@+id/title"
+            style="@style/TextTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/search_line_spacing"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="@dimen/search_hero_title_size" />
+
+        <TextView
+            android:id="@+id/breadcrumbs"
+            style="@style/TextTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="@dimen/search_hero_subtitle_size" />
+    </LinearLayout>
 </com.android.launcher3.views.SearchSettingsRowView>
\ No newline at end of file
diff --git a/res/layout/search_result_slice.xml b/res/layout/search_result_slice.xml
index ea1d49a56d..24d75e9eb6 100644
--- a/res/layout/search_result_slice.xml
+++ b/res/layout/search_result_slice.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -13,7 +12,29 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<androidx.slice.widget.SliceView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher3.views.SearchResultSettingsSlice xmlns:android="http://schemas.android.com/apk/res/android"
+    android:paddingHorizontal="@dimen/dynamic_grid_cell_padding_x"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingHorizontal="4dp" />
\ No newline at end of file
+    android:layout_height="wrap_content">
+
+    <FrameLayout
+        android:layout_width="wrap_content"
+        android:paddingTop="@dimen/search_settings_icon_vertical_offset"
+        android:layout_height="wrap_content">
+
+        <View
+            android:layout_width="@dimen/search_settings_icon_size"
+            android:src="@drawable/ic_setting"
+            android:id="@+id/icon"
+            android:layout_height="@dimen/search_settings_icon_size" />
+    </FrameLayout>
+
+    <androidx.slice.widget.SliceView
+        android:id="@+id/slice"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_marginStart="@dimen/dynamic_grid_cell_padding_x"
+        android:layout_width="0dp" />
+
+</com.android.launcher3.views.SearchResultSettingsSlice>
+
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 5387e1bad6..7df3f774e5 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -249,8 +249,11 @@
     <dimen name="bottom_sheet_edu_padding">24dp</dimen>
 
     <!-- Search related -->
-    <dimen name="settings_hero_title_size">16sp</dimen>
-    <dimen name="settings_hero_subtitle_size">15sp</dimen>
-    <dimen name="settings_hero_inline_button_size">12sp</dimen>
+    <dimen name="search_hero_title_size">16sp</dimen>
+    <dimen name="search_hero_subtitle_size">15sp</dimen>
+    <dimen name="search_hero_inline_button_size">12sp</dimen>
+    <dimen name="search_settings_icon_size">36dp</dimen>
+    <dimen name="search_settings_icon_vertical_offset">16dp</dimen>
+    <dimen name="search_line_spacing">4dp</dimen>
 
 </resources>
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index 7018f20a55..434bc1453d 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -37,7 +37,6 @@ import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
 import androidx.core.view.accessibility.AccessibilityRecordCompat;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.slice.widget.SliceView;
 
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.BubbleTextView;
@@ -47,7 +46,6 @@ import com.android.launcher3.allapps.search.SearchSectionInfo;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.util.PackageManagerHelper;
-import com.android.launcher3.views.SearchSliceWrapper;
 import com.android.systemui.plugins.shared.SearchTarget;
 
 import java.util.List;
@@ -461,17 +459,10 @@ public class AllAppsGridAdapter extends
                 } else {
                     searchView.setVisibility(View.GONE);
                 }
-                break;
-            case VIEW_TYPE_SEARCH_SLICE:
-                SliceView sliceView = (SliceView) holder.itemView;
-                SearchAdapterItem slicePayload = (SearchAdapterItem) mApps.getAdapterItems().get(
-                        position);
-                SearchTarget searchTarget = slicePayload.getSearchTarget();
-                sliceView.setTag(new SearchSliceWrapper(mLauncher, sliceView, searchTarget));
-
                 break;
             case VIEW_TYPE_SEARCH_CORPUS_TITLE:
             case VIEW_TYPE_SEARCH_ROW_WITH_BUTTON:
+            case VIEW_TYPE_SEARCH_SLICE:
             case VIEW_TYPE_SEARCH_ROW:
             case VIEW_TYPE_SEARCH_ICON:
             case VIEW_TYPE_SEARCH_ICON_ROW:
@@ -496,13 +487,6 @@ public class AllAppsGridAdapter extends
         if (holder.itemView instanceof AllAppsSectionDecorator.SelfDecoratingView) {
             ((AllAppsSectionDecorator.SelfDecoratingView) holder.itemView).removeDecoration();
         }
-        if (holder.itemView instanceof SliceView) {
-            SliceView sliceView = (SliceView) holder.itemView;
-            if (sliceView.getTag() instanceof SearchSliceWrapper) {
-                ((SearchSliceWrapper) sliceView.getTag()).destroy();
-            }
-            sliceView.setTag(null);
-        }
     }
 
     @Override
diff --git a/src/com/android/launcher3/views/SearchSliceWrapper.java b/src/com/android/launcher3/views/SearchResultSettingsSlice.java
similarity index 50%
rename from src/com/android/launcher3/views/SearchSliceWrapper.java
rename to src/com/android/launcher3/views/SearchResultSettingsSlice.java
index f8a7dc08d6..2d726e79d4 100644
--- a/src/com/android/launcher3/views/SearchSliceWrapper.java
+++ b/src/com/android/launcher3/views/SearchResultSettingsSlice.java
@@ -17,9 +17,13 @@ package com.android.launcher3.views;
 
 import android.content.Context;
 import android.net.Uri;
+import android.util.AttributeSet;
 import android.util.Log;
+import android.view.View;
+import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.lifecycle.LiveData;
 import androidx.slice.Slice;
 import androidx.slice.SliceItem;
@@ -28,55 +32,98 @@ import androidx.slice.widget.SliceLiveData;
 import androidx.slice.widget.SliceView;
 
 import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+import com.android.launcher3.allapps.search.AllAppsSearchBarController;
 import com.android.launcher3.allapps.search.SearchEventTracker;
 import com.android.systemui.plugins.shared.SearchTarget;
 import com.android.systemui.plugins.shared.SearchTargetEvent;
 
 /**
- * A Wrapper class for {@link SliceView} search results
+ * A slice view wrapper with settings app icon at start
  */
-public class SearchSliceWrapper implements SliceView.OnSliceActionListener {
+public class SearchResultSettingsSlice extends LinearLayout implements
+        AllAppsSearchBarController.SearchTargetHandler, SliceView.OnSliceActionListener {
+
 
     public static final String TARGET_TYPE_SLICE = "settings_slice";
 
     private static final String TAG = "SearchSliceController";
     private static final String URI_EXTRA_KEY = "slice_uri";
 
-
-    private final Launcher mLauncher;
-    private final SearchTarget mSearchTarget;
-    private final SliceView mSliceView;
+    private SliceView mSliceView;
+    private View mIcon;
     private LiveData<Slice> mSliceLiveData;
+    private SearchTarget mSearchTarget;
+    private Launcher mLauncher;
+
+    public SearchResultSettingsSlice(Context context) {
+        this(context, null, 0);
+    }
 
-    public SearchSliceWrapper(Context context, SliceView sliceView, SearchTarget searchTarget) {
-        mLauncher = Launcher.getLauncher(context);
+    public SearchResultSettingsSlice(Context context,
+            @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public SearchResultSettingsSlice(Context context, @Nullable AttributeSet attrs,
+            int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mLauncher = Launcher.getLauncher(getContext());
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mSliceView = findViewById(R.id.slice);
+        mIcon = findViewById(R.id.icon);
+        SearchSettingsRowView.applySettingsIcon(mLauncher, mIcon);
+    }
+
+    @Override
+    public void applySearchTarget(SearchTarget searchTarget) {
+        reset();
         mSearchTarget = searchTarget;
-        mSliceView = sliceView;
-        sliceView.setOnSliceActionListener(this);
         try {
             mSliceLiveData = SliceLiveData.fromUri(mLauncher, getSliceUri());
-            mSliceLiveData.observe((Launcher) mLauncher, sliceView);
+            mSliceLiveData.observe(mLauncher, mSliceView);
         } catch (Exception ex) {
             Log.e(TAG, "unable to bind slice", ex);
         }
     }
 
-    /**
-     * Unregisters event handlers and removes lifecycle observer
-     */
-    public void destroy() {
-        mSliceView.setOnSliceActionListener(null);
-        mSliceLiveData.removeObservers(mLauncher);
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        mSliceView.setOnSliceActionListener(this);
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        reset();
     }
 
     @Override
-    public void onSliceAction(@NonNull EventInfo info, @NonNull SliceItem item) {
+    public void handleSelection(int eventType) {
         SearchEventTracker.INSTANCE.get(mLauncher).notifySearchTargetEvent(
                 new SearchTargetEvent.Builder(mSearchTarget,
                         SearchTargetEvent.CHILD_SELECT).build());
     }
 
+    private void reset() {
+        mSliceView.setOnSliceActionListener(null);
+        if (mSliceLiveData != null) {
+            mSliceLiveData.removeObservers(mLauncher);
+        }
+    }
+
+    @Override
+    public void onSliceAction(@NonNull EventInfo eventInfo, @NonNull SliceItem sliceItem) {
+        handleSelection(SearchTargetEvent.CHILD_SELECT);
+    }
+
     private Uri getSliceUri() {
         return mSearchTarget.getExtras().getParcelable(URI_EXTRA_KEY);
     }
+
 }
diff --git a/src/com/android/launcher3/views/SearchSettingsRowView.java b/src/com/android/launcher3/views/SearchSettingsRowView.java
index f0884f88aa..160ee6514b 100644
--- a/src/com/android/launcher3/views/SearchSettingsRowView.java
+++ b/src/com/android/launcher3/views/SearchSettingsRowView.java
@@ -15,8 +15,14 @@
  */
 package com.android.launcher3.views;
 
+import static com.android.launcher3.FastBitmapDrawable.newIcon;
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
+
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.AttributeSet;
@@ -27,38 +33,41 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.android.launcher3.FastBitmapDrawable;
 import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.search.AllAppsSearchBarController;
 import com.android.launcher3.allapps.search.SearchEventTracker;
+import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.systemui.plugins.shared.SearchTarget;
 import com.android.systemui.plugins.shared.SearchTargetEvent;
 
 import java.util.ArrayList;
+import java.util.List;
 
 /**
- * A row of tappable TextViews with a breadcrumb for settings search.
+ * A row of clickable TextViews with a breadcrumb for settings search.
  */
 public class SearchSettingsRowView extends LinearLayout implements
         View.OnClickListener, AllAppsSearchBarController.SearchTargetHandler {
 
     public static final String TARGET_TYPE_SETTINGS_ROW = "settings_row";
 
-
+    private View mIconView;
     private TextView mTitleView;
-    private TextView mDescriptionView;
     private TextView mBreadcrumbsView;
     private Intent mIntent;
     private SearchTarget mSearchTarget;
 
 
     public SearchSettingsRowView(@NonNull Context context) {
-        super(context);
+        this(context, null, 0);
     }
 
     public SearchSettingsRowView(@NonNull Context context,
             @Nullable AttributeSet attrs) {
-        super(context, attrs);
+        this(context, attrs, 0);
     }
 
     public SearchSettingsRowView(@NonNull Context context, @Nullable AttributeSet attrs,
@@ -69,10 +78,11 @@ public class SearchSettingsRowView extends LinearLayout implements
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
+        mIconView = findViewById(R.id.icon);
         mTitleView = findViewById(R.id.title);
-        mDescriptionView = findViewById(R.id.description);
         mBreadcrumbsView = findViewById(R.id.breadcrumbs);
         setOnClickListener(this);
+        applySettingsIcon(Launcher.getLauncher(getContext()), mIconView);
     }
 
     @Override
@@ -81,6 +91,7 @@ public class SearchSettingsRowView extends LinearLayout implements
         Bundle bundle = searchTarget.getExtras();
         mIntent = bundle.getParcelable("intent");
         showIfAvailable(mTitleView, bundle.getString("title"));
+        mIconView.setContentDescription(bundle.getString("title"));
         ArrayList<String> breadcrumbs = bundle.getStringArrayList("breadcrumbs");
         //TODO: implement RTL friendly breadcrumbs view
         showIfAvailable(mBreadcrumbsView, breadcrumbs != null
@@ -113,4 +124,30 @@ public class SearchSettingsRowView extends LinearLayout implements
         SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(
                 new SearchTargetEvent.Builder(mSearchTarget, eventType).build());
     }
+
+    /**
+     * Requests settings app icon from {@link com.android.launcher3.icons.IconCache} and applies
+     * to to view
+     */
+    public static void applySettingsIcon(Launcher launcher, View view) {
+        LauncherAppState appState = LauncherAppState.getInstance(launcher);
+        MODEL_EXECUTOR.post(() -> {
+            PackageItemInfo packageItemInfo = new PackageItemInfo(getSettingsPackageName(launcher));
+            appState.getIconCache().getTitleAndIconForApp(packageItemInfo, false);
+            MAIN_EXECUTOR.post(() -> {
+                FastBitmapDrawable iconDrawable = newIcon(appState.getContext(), packageItemInfo);
+                view.setBackground(iconDrawable);
+            });
+        });
+    }
+
+    private static String getSettingsPackageName(Launcher launcher) {
+        Intent intent = new Intent(android.provider.Settings.ACTION_SETTINGS);
+        List<ResolveInfo> resolveInfos = launcher.getPackageManager().queryIntentActivities(intent,
+                PackageManager.MATCH_DEFAULT_ONLY);
+        if (resolveInfos.size() == 0) {
+            return "";
+        }
+        return resolveInfos.get(0).activityInfo.packageName;
+    }
 }
-- 
GitLab


From 37432444fc61921b5cba9940a23a8d6c6a63d067 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Sun, 1 Nov 2020 13:06:43 -0800
Subject: [PATCH 0302/1664] Initial setup for widgets in Search

LiveSearchManager creates AppWidgetHost when user starts a new search session and destroys it when user returns to home. In addition, it also manages the creation and caching of PlaceholderSearchWidget which can be used to create AppWidgetHostViews.
Bug: 168321831
Test: Manual

Change-Id: I06a893028e55aa6e0702a4f1cd7a2edbb1f61671
---
 res/layout/search_result_widget_live.xml      |   5 +
 .../launcher3/AppWidgetResizeFrame.java       |   2 +-
 src/com/android/launcher3/Launcher.java       |  10 ++
 .../launcher3/allapps/AllAppsGridAdapter.java |  13 +-
 .../allapps/AllAppsTransitionController.java  |   4 +
 .../allapps/search/LiveSearchManager.java     | 125 ++++++++++++++++
 .../search/SearchWidgetInfoContainer.java     |  79 ++++++++++
 .../launcher3/views/SearchResultWidget.java   | 135 ++++++++++++++++++
 8 files changed, 371 insertions(+), 2 deletions(-)
 create mode 100644 res/layout/search_result_widget_live.xml
 create mode 100644 src/com/android/launcher3/allapps/search/LiveSearchManager.java
 create mode 100644 src/com/android/launcher3/allapps/search/SearchWidgetInfoContainer.java
 create mode 100644 src/com/android/launcher3/views/SearchResultWidget.java

diff --git a/res/layout/search_result_widget_live.xml b/res/layout/search_result_widget_live.xml
new file mode 100644
index 0000000000..0dd8a06c9a
--- /dev/null
+++ b/res/layout/search_result_widget_live.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.android.launcher3.views.SearchResultWidget android:layout_height="wrap_content"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:gravity="center"
+    android:layout_width="match_parent" />
\ No newline at end of file
diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java
index 168d9c479c..bc3e341806 100644
--- a/src/com/android/launcher3/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher3/AppWidgetResizeFrame.java
@@ -36,7 +36,7 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
     private static final Rect sTmpRect = new Rect();
 
     // Represents the cell size on the grid in the two orientations.
-    private static final MainThreadInitializedObject<Point[]> CELL_SIZE =
+    public static final MainThreadInitializedObject<Point[]> CELL_SIZE =
             new MainThreadInitializedObject<>(c -> {
                 InvariantDeviceProfile inv = LauncherAppState.getIDP(c);
                 return new Point[] {inv.landscapeProfile.getCellSize(),
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 699734c0c5..38ebe14d01 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -111,6 +111,7 @@ import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.allapps.AllAppsStore;
 import com.android.launcher3.allapps.AllAppsTransitionController;
 import com.android.launcher3.allapps.DiscoveryBounce;
+import com.android.launcher3.allapps.search.LiveSearchManager;
 import com.android.launcher3.anim.PropertyListBuilder;
 import com.android.launcher3.compat.AccessibilityManagerCompat;
 import com.android.launcher3.config.FeatureFlags;
@@ -276,6 +277,8 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
     private LifecycleRegistry mLifecycleRegistry;
 
+    private LiveSearchManager mLiveSearchManager;
+
     @Thunk
     Workspace mWorkspace;
     @Thunk
@@ -389,6 +392,8 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         mIconCache = app.getIconCache();
         mAccessibilityDelegate = new LauncherAccessibilityDelegate(this);
 
+        mLiveSearchManager = new LiveSearchManager(this);
+
         mDragController = new DragController(this);
         mAllAppsController = new AllAppsTransitionController(this);
         mStateManager = new StateManager<>(this, NORMAL);
@@ -492,6 +497,10 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         return mLifecycleRegistry;
     }
 
+    public LiveSearchManager getLiveSearchManager() {
+        return mLiveSearchManager;
+    }
+
     protected LauncherOverlayManager getDefaultOverlay() {
         return new LauncherOverlayManager() { };
     }
@@ -1583,6 +1592,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         mAppTransitionManager.unregisterRemoteAnimations();
         mUserChangedCallbackCloseable.close();
         mLifecycleRegistry.setCurrentState(Lifecycle.State.DESTROYED);
+        mLiveSearchManager.stop();
     }
 
     public LauncherAccessibilityDelegate getAccessibilityDelegate() {
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index 434bc1453d..5b4268111b 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -46,6 +46,7 @@ import com.android.launcher3.allapps.search.SearchSectionInfo;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.util.PackageManagerHelper;
+import com.android.launcher3.views.SearchResultWidget;
 import com.android.systemui.plugins.shared.SearchTarget;
 
 import java.util.List;
@@ -89,6 +90,8 @@ public class AllAppsGridAdapter extends
 
     public static final int VIEW_TYPE_SEARCH_ICON = 1 << 14;
 
+    public static final int VIEW_TYPE_SEARCH_WIDGET_LIVE = 1 << 15;
+
     // Common view type masks
     public static final int VIEW_TYPE_MASK_DIVIDER = VIEW_TYPE_ALL_APPS_DIVIDER;
     public static final int VIEW_TYPE_MASK_ICON = VIEW_TYPE_ICON | VIEW_TYPE_SEARCH_ICON;
@@ -181,7 +184,8 @@ public class AllAppsGridAdapter extends
                     || viewType == VIEW_TYPE_SEARCH_THUMBNAIL
                     || viewType == VIEW_TYPE_SEARCH_ICON_ROW
                     || viewType == VIEW_TYPE_SEARCH_ICON
-                    || viewType == VIEW_TYPE_SEARCH_SUGGEST;
+                    || viewType == VIEW_TYPE_SEARCH_SUGGEST
+                    || viewType == VIEW_TYPE_SEARCH_WIDGET_LIVE;
         }
     }
 
@@ -427,6 +431,9 @@ public class AllAppsGridAdapter extends
             case VIEW_TYPE_SEARCH_SUGGEST:
                 return new ViewHolder(mLayoutInflater.inflate(
                         R.layout.search_result_suggest, parent, false));
+            case VIEW_TYPE_SEARCH_WIDGET_LIVE:
+                return new ViewHolder(mLayoutInflater.inflate(
+                        R.layout.search_result_widget_live, parent, false));
             default:
                 throw new RuntimeException("Unexpected view type");
         }
@@ -469,6 +476,7 @@ public class AllAppsGridAdapter extends
             case VIEW_TYPE_SEARCH_PEOPLE:
             case VIEW_TYPE_SEARCH_THUMBNAIL:
             case VIEW_TYPE_SEARCH_SUGGEST:
+            case VIEW_TYPE_SEARCH_WIDGET_LIVE:
                 SearchAdapterItem item =
                         (SearchAdapterItem) mApps.getAdapterItems().get(position);
                 SearchTargetHandler payloadResultView = (SearchTargetHandler) holder.itemView;
@@ -487,6 +495,9 @@ public class AllAppsGridAdapter extends
         if (holder.itemView instanceof AllAppsSectionDecorator.SelfDecoratingView) {
             ((AllAppsSectionDecorator.SelfDecoratingView) holder.itemView).removeDecoration();
         }
+        if (holder.itemView instanceof SearchResultWidget) {
+            ((SearchResultWidget) holder.itemView).removeListener();
+        }
     }
 
     @Override
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 0c488a609b..f9ab196792 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -264,11 +264,15 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
         if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && BuildCompat.isAtLeastR()) {
             mInsetController.onAnimationEnd(mProgress);
             if (Float.compare(mProgress, 0f) == 0) {
+                mLauncher.getLiveSearchManager().start();
                 EditText editText = mAppsView.getSearchUiManager().getEditText();
                 if (editText != null) {
                     editText.requestFocus();
                 }
             }
+            else {
+                mLauncher.getLiveSearchManager().stop();
+            }
             // TODO: should make the controller hide synchronously
         }
     }
diff --git a/src/com/android/launcher3/allapps/search/LiveSearchManager.java b/src/com/android/launcher3/allapps/search/LiveSearchManager.java
new file mode 100644
index 0000000000..e8a00d958a
--- /dev/null
+++ b/src/com/android/launcher3/allapps/search/LiveSearchManager.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.allapps.search;
+
+import static com.android.launcher3.widget.WidgetHostViewLoader.getDefaultOptionsForWidget;
+
+import android.appwidget.AppWidgetHost;
+import android.appwidget.AppWidgetHostView;
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProviderInfo;
+import android.content.ComponentName;
+import android.content.Context;
+import android.os.Bundle;
+import android.os.UserHandle;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherAppWidgetProviderInfo;
+import com.android.launcher3.util.ComponentKey;
+import com.android.launcher3.widget.PendingAddWidgetInfo;
+
+import java.util.HashMap;
+
+/**
+ * Manages Lifecycle for Live search results
+ */
+public class LiveSearchManager {
+
+    public static final int SEARCH_APPWIDGET_HOST_ID = 2048;
+
+    private final Launcher mLauncher;
+    private final AppWidgetManager mAppWidgetManger;
+    private HashMap<ComponentKey, SearchWidgetInfoContainer> mWidgetPlaceholders = new HashMap<>();
+    private SearchWidgetHost mSearchWidgetHost;
+
+    public LiveSearchManager(Launcher launcher) {
+        mLauncher = launcher;
+        mAppWidgetManger = AppWidgetManager.getInstance(launcher);
+    }
+
+    /**
+     * Creates new {@link AppWidgetHostView} from {@link AppWidgetProviderInfo}. Caches views for
+     * quicker result within the same search session
+     */
+    public SearchWidgetInfoContainer getPlaceHolderWidget(AppWidgetProviderInfo providerInfo) {
+        if (mSearchWidgetHost == null) {
+            throw new RuntimeException("AppWidgetHost has not been created yet");
+        }
+
+        ComponentName provider = providerInfo.provider;
+        UserHandle userHandle = providerInfo.getProfile();
+
+        ComponentKey key = new ComponentKey(provider, userHandle);
+        SearchWidgetInfoContainer view = mWidgetPlaceholders.getOrDefault(key, null);
+        if (mWidgetPlaceholders.containsKey(key)) {
+            return mWidgetPlaceholders.get(key);
+        }
+        LauncherAppWidgetProviderInfo pinfo = LauncherAppWidgetProviderInfo.fromProviderInfo(
+                mLauncher, providerInfo);
+        PendingAddWidgetInfo pendingAddWidgetInfo = new PendingAddWidgetInfo(pinfo);
+
+        Bundle options = getDefaultOptionsForWidget(mLauncher, pendingAddWidgetInfo);
+        int appWidgetId = mSearchWidgetHost.allocateAppWidgetId();
+        boolean success = mAppWidgetManger.bindAppWidgetIdIfAllowed(appWidgetId, userHandle,
+                provider, options);
+        if (!success) {
+            mWidgetPlaceholders.put(key, null);
+            return null;
+        }
+
+        view = (SearchWidgetInfoContainer) mSearchWidgetHost.createView(mLauncher, appWidgetId,
+                providerInfo);
+        view.setTag(pendingAddWidgetInfo);
+        mWidgetPlaceholders.put(key, view);
+        return view;
+    }
+
+    /**
+     * Start search session
+     */
+    public void start() {
+        stop();
+        mSearchWidgetHost = new SearchWidgetHost(mLauncher);
+        mSearchWidgetHost.startListening();
+    }
+
+    /**
+     * Stop search session
+     */
+    public void stop() {
+        if (mSearchWidgetHost != null) {
+            mSearchWidgetHost.stopListening();
+            mSearchWidgetHost.deleteHost();
+            for (SearchWidgetInfoContainer placeholder : mWidgetPlaceholders.values()) {
+                placeholder.clearListeners();
+            }
+            mWidgetPlaceholders.clear();
+            mSearchWidgetHost = null;
+        }
+    }
+
+    static class SearchWidgetHost extends AppWidgetHost {
+        SearchWidgetHost(Context context) {
+            super(context, SEARCH_APPWIDGET_HOST_ID);
+        }
+
+        @Override
+        protected AppWidgetHostView onCreateView(Context context, int appWidgetId,
+                AppWidgetProviderInfo appWidget) {
+            return new SearchWidgetInfoContainer(context);
+        }
+    }
+}
diff --git a/src/com/android/launcher3/allapps/search/SearchWidgetInfoContainer.java b/src/com/android/launcher3/allapps/search/SearchWidgetInfoContainer.java
new file mode 100644
index 0000000000..b5c22688e5
--- /dev/null
+++ b/src/com/android/launcher3/allapps/search/SearchWidgetInfoContainer.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.allapps.search;
+
+import android.appwidget.AppWidgetHostView;
+import android.appwidget.AppWidgetProviderInfo;
+import android.content.Context;
+import android.widget.RemoteViews;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A placeholder {@link AppWidgetHostView} used for managing widget search results
+ */
+public class SearchWidgetInfoContainer extends AppWidgetHostView {
+    private int mAppWidgetId;
+    private AppWidgetProviderInfo mProviderInfo;
+    private RemoteViews mViews;
+    private List<AppWidgetHostView> mListeners = new ArrayList<>();
+
+    public SearchWidgetInfoContainer(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void setAppWidget(int appWidgetId, AppWidgetProviderInfo info) {
+        mAppWidgetId = appWidgetId;
+        mProviderInfo = info;
+        for (AppWidgetHostView listener : mListeners) {
+            listener.setAppWidget(mAppWidgetId, mProviderInfo);
+        }
+    }
+
+    @Override
+    public void updateAppWidget(RemoteViews remoteViews) {
+        mViews = remoteViews;
+        for (AppWidgetHostView listener : mListeners) {
+            listener.updateAppWidget(remoteViews);
+        }
+    }
+
+    /**
+     * Create a live {@link AppWidgetHostView} from placeholder
+     */
+    public void attachWidget(AppWidgetHostView hv) {
+        hv.setTag(getTag());
+        hv.setAppWidget(mAppWidgetId, mProviderInfo);
+        hv.updateAppWidget(mViews);
+        mListeners.add(hv);
+    }
+
+    /**
+     * stops AppWidgetHostView from getting updates
+     */
+    public void detachWidget(AppWidgetHostView hostView) {
+        mListeners.remove(hostView);
+    }
+
+    /**
+     * Removes all AppWidgetHost update listeners
+     */
+    public void clearListeners() {
+        mListeners.clear();
+    }
+}
diff --git a/src/com/android/launcher3/views/SearchResultWidget.java b/src/com/android/launcher3/views/SearchResultWidget.java
new file mode 100644
index 0000000000..65131be1a7
--- /dev/null
+++ b/src/com/android/launcher3/views/SearchResultWidget.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.views;
+
+import android.appwidget.AppWidgetHostView;
+import android.appwidget.AppWidgetProviderInfo;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.widget.RelativeLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.AppWidgetResizeFrame;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+import com.android.launcher3.allapps.search.SearchEventTracker;
+import com.android.launcher3.allapps.search.SearchWidgetInfoContainer;
+import com.android.launcher3.widget.PendingAddWidgetInfo;
+import com.android.systemui.plugins.shared.SearchTarget;
+import com.android.systemui.plugins.shared.SearchTargetEvent;
+
+/**
+ * displays live version of a widget upon receiving {@link AppWidgetProviderInfo} from Search
+ * provider
+ */
+public class SearchResultWidget extends RelativeLayout implements
+        AllAppsSearchBarController.SearchTargetHandler {
+
+    private static final String TAG = "SearchResultWidget";
+
+    public static final String TARGET_TYPE_WIDGET_LIVE = "widget";
+
+    private final Launcher mLauncher;
+    private final AppWidgetHostView mHostView;
+
+    private SearchTarget mSearchTarget;
+    private AppWidgetProviderInfo mProviderInfo;
+
+    private SearchWidgetInfoContainer mInfoContainer;
+
+    public SearchResultWidget(@NonNull Context context) {
+        this(context, null, 0);
+    }
+
+    public SearchResultWidget(@NonNull Context context,
+            @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public SearchResultWidget(@NonNull Context context, @Nullable AttributeSet attrs,
+            int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mHostView = new AppWidgetHostView(context);
+        mLauncher = Launcher.getLauncher(context);
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        addView(mHostView);
+    }
+
+    @Override
+    public void applySearchTarget(SearchTarget searchTarget) {
+        if (searchTarget.getExtras() == null
+                || searchTarget.getExtras().getParcelable("provider") == null) {
+            setVisibility(GONE);
+            return;
+        }
+        AppWidgetProviderInfo providerInfo = searchTarget.getExtras().getParcelable("provider");
+        if (mProviderInfo != null && providerInfo.provider.equals(mProviderInfo.provider)
+                && providerInfo.getProfile().equals(mProviderInfo.getProfile())) {
+            return;
+        }
+        removeListener();
+
+        mSearchTarget = searchTarget;
+        mProviderInfo = providerInfo;
+
+        mInfoContainer = mLauncher.getLiveSearchManager().getPlaceHolderWidget(providerInfo);
+        if (mInfoContainer == null) {
+            setVisibility(GONE);
+            return;
+        }
+        setVisibility(VISIBLE);
+        mInfoContainer.attachWidget(mHostView);
+        PendingAddWidgetInfo info = (PendingAddWidgetInfo) mHostView.getTag();
+        int[] size = mLauncher.getWorkspace().estimateItemSize(info);
+        mHostView.getLayoutParams().width = size[0];
+        mHostView.getLayoutParams().height = size[1];
+        AppWidgetResizeFrame.updateWidgetSizeRanges(mHostView, mLauncher, info.spanX,
+                info.spanY);
+        mHostView.requestLayout();
+
+
+    }
+
+    /**
+     * Stops hostView from getting updates on a widget provider
+     */
+    public void removeListener() {
+        if (mInfoContainer != null) {
+            mInfoContainer.detachWidget(mHostView);
+        }
+    }
+
+    @Override
+    public void handleSelection(int eventType) {
+        SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(
+                new SearchTargetEvent.Builder(mSearchTarget, eventType).build());
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent ev) {
+        if (ev.getAction() == MotionEvent.ACTION_DOWN) {
+            handleSelection(SearchTargetEvent.CHILD_SELECT);
+        }
+        return super.onInterceptTouchEvent(ev);
+    }
+}
-- 
GitLab


From 003859cdd02abf061f0f2b84b2a0092925fa02fc Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Mon, 9 Nov 2020 01:38:05 -0800
Subject: [PATCH 0303/1664] Show remote action's description in
 SearchResultIconRow

Validated against Pixel Tips corpus

Change-Id: I3c3f8eb69007a97e55e2ef08e7f4e0b800bfe247
---
 res/layout/search_result_icon_row.xml                    | 2 ++
 src/com/android/launcher3/views/SearchResultIconRow.java | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/res/layout/search_result_icon_row.xml b/res/layout/search_result_icon_row.xml
index 280bbc992c..81c23e4c90 100644
--- a/res/layout/search_result_icon_row.xml
+++ b/res/layout/search_result_icon_row.xml
@@ -38,6 +38,7 @@
             android:id="@id/title"
             android:layout_height="wrap_content"
             android:gravity="start|center_vertical"
+            android:maxLines="1"
             android:textAlignment="viewStart"
             android:textColor="?android:attr/textColorPrimary"
             android:textSize="@dimen/search_hero_title_size" />
@@ -45,6 +46,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:id="@+id/desc"
+            android:maxLines="1"
             android:textColor="?android:attr/textColorTertiary"
             android:textSize="@dimen/search_hero_subtitle_size"
             android:layout_height="wrap_content" />
diff --git a/src/com/android/launcher3/views/SearchResultIconRow.java b/src/com/android/launcher3/views/SearchResultIconRow.java
index 03332c1501..ecf5054d8b 100644
--- a/src/com/android/launcher3/views/SearchResultIconRow.java
+++ b/src/com/android/launcher3/views/SearchResultIconRow.java
@@ -22,6 +22,7 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.ShortcutInfo;
 import android.os.UserHandle;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Pair;
 import android.view.View;
@@ -125,6 +126,12 @@ public class SearchResultIconRow extends LinearLayout implements
                     shortcutInfo.getUserHandle());
         } else if (itemType.equals(SearchResultIcon.TARGET_TYPE_HERO_APP)) {
             showInlineShortcuts(mSearchTarget.getShortcutInfos());
+        } else if (itemType.equals(SearchResultIcon.TARGET_TYPE_REMOTE_ACTION)) {
+            CharSequence desc = mSearchTarget.getRemoteAction().getContentDescription();
+            if (!TextUtils.isEmpty(desc)) {
+                mDescriptionView.setVisibility(VISIBLE);
+                mDescriptionView.setText(desc);
+            }
         }
         if (!itemType.equals(SearchResultIcon.TARGET_TYPE_HERO_APP)) {
             showInlineShortcuts(new ArrayList<>());
-- 
GitLab


From 20d99c5229ab51f1c04014b5cdebc83a10fae8fd Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Mon, 9 Nov 2020 16:16:26 -0600
Subject: [PATCH 0304/1664] Support drag/drop on live widget search results

Preview: https://drive.google.com/file/d/1p0BMoQTaatwcslzPWoD5W_ZWQms5GpSp/view?usp=sharing

Bug: 168321831
Test: Manual
Change-Id: I237546a884083372d5d1ca80f500504b9fd9ba86
---
 .../launcher3/views/SearchResultWidget.java   | 77 +++++++++++++++++--
 1 file changed, 72 insertions(+), 5 deletions(-)

diff --git a/src/com/android/launcher3/views/SearchResultWidget.java b/src/com/android/launcher3/views/SearchResultWidget.java
index 65131be1a7..7d539553f0 100644
--- a/src/com/android/launcher3/views/SearchResultWidget.java
+++ b/src/com/android/launcher3/views/SearchResultWidget.java
@@ -18,18 +18,25 @@ package com.android.launcher3.views;
 import android.appwidget.AppWidgetHostView;
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
+import android.graphics.Rect;
 import android.util.AttributeSet;
+import android.view.GestureDetector;
 import android.view.MotionEvent;
+import android.view.View;
 import android.widget.RelativeLayout;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.android.launcher3.AppWidgetResizeFrame;
+import com.android.launcher3.CheckLongPressHelper;
+import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.allapps.search.AllAppsSearchBarController;
 import com.android.launcher3.allapps.search.SearchEventTracker;
 import com.android.launcher3.allapps.search.SearchWidgetInfoContainer;
+import com.android.launcher3.dragndrop.DraggableView;
+import com.android.launcher3.touch.ItemLongClickListener;
 import com.android.launcher3.widget.PendingAddWidgetInfo;
 import com.android.systemui.plugins.shared.SearchTarget;
 import com.android.systemui.plugins.shared.SearchTargetEvent;
@@ -39,14 +46,19 @@ import com.android.systemui.plugins.shared.SearchTargetEvent;
  * provider
  */
 public class SearchResultWidget extends RelativeLayout implements
-        AllAppsSearchBarController.SearchTargetHandler {
+        AllAppsSearchBarController.SearchTargetHandler, DraggableView, View.OnLongClickListener {
 
     private static final String TAG = "SearchResultWidget";
 
     public static final String TARGET_TYPE_WIDGET_LIVE = "widget";
 
+    private final Rect mWidgetOffset = new Rect();
+
     private final Launcher mLauncher;
+    private final CheckLongPressHelper mLongPressHelper;
+    private final GestureDetector mClickDetector;
     private final AppWidgetHostView mHostView;
+    private final float mScaleToFit;
 
     private SearchTarget mSearchTarget;
     private AppWidgetProviderInfo mProviderInfo;
@@ -65,8 +77,18 @@ public class SearchResultWidget extends RelativeLayout implements
     public SearchResultWidget(@NonNull Context context, @Nullable AttributeSet attrs,
             int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        mHostView = new AppWidgetHostView(context);
         mLauncher = Launcher.getLauncher(context);
+        mHostView = new AppWidgetHostView(context);
+        DeviceProfile grid = mLauncher.getDeviceProfile();
+        mScaleToFit = Math.min(grid.appWidgetScale.x, grid.appWidgetScale.y);
+
+        // detect tap event on widget container for search target event reporting
+        mClickDetector = new GestureDetector(context,
+                new ClickListener(() -> handleSelection(SearchTargetEvent.CHILD_SELECT)));
+
+        mLongPressHelper = new CheckLongPressHelper(this);
+        mLongPressHelper.setLongPressTimeoutFactor(1);
+        setOnLongClickListener(this);
     }
 
     @Override
@@ -106,8 +128,7 @@ public class SearchResultWidget extends RelativeLayout implements
         AppWidgetResizeFrame.updateWidgetSizeRanges(mHostView, mLauncher, info.spanX,
                 info.spanY);
         mHostView.requestLayout();
-
-
+        setTag(info);
     }
 
     /**
@@ -127,9 +148,55 @@ public class SearchResultWidget extends RelativeLayout implements
 
     @Override
     public boolean onInterceptTouchEvent(MotionEvent ev) {
-        if (ev.getAction() == MotionEvent.ACTION_DOWN) {
+        mLongPressHelper.onTouchEvent(ev);
+        mClickDetector.onTouchEvent(ev);
+        if (ev.getAction() == MotionEvent.ACTION_UP && !mLongPressHelper.hasPerformedLongPress()) {
             handleSelection(SearchTargetEvent.CHILD_SELECT);
         }
         return super.onInterceptTouchEvent(ev);
     }
+
+
+    @Override
+    public void cancelLongPress() {
+        super.cancelLongPress();
+        mLongPressHelper.cancelLongPress();
+    }
+
+    @Override
+    public int getViewType() {
+        return DraggableView.DRAGGABLE_WIDGET;
+    }
+
+    @Override
+    public void getSourceVisualDragBounds(Rect bounds) {
+        mHostView.getHitRect(mWidgetOffset);
+        int width = (int) (mHostView.getMeasuredWidth() * mScaleToFit);
+        int height = (int) (mHostView.getMeasuredHeight() * mScaleToFit);
+        bounds.set(mWidgetOffset.left,
+                mWidgetOffset.top,
+                width + mWidgetOffset.left,
+                height + mWidgetOffset.top);
+    }
+
+    @Override
+    public boolean onLongClick(View view) {
+        ItemLongClickListener.INSTANCE_ALL_APPS.onLongClick(view);
+        handleSelection(SearchTargetEvent.LONG_PRESS);
+        return false;
+    }
+
+    static class ClickListener extends GestureDetector.SimpleOnGestureListener {
+        private final Runnable mCb;
+
+        ClickListener(Runnable cb) {
+            mCb = cb;
+        }
+
+        @Override
+        public boolean onSingleTapConfirmed(MotionEvent e) {
+            mCb.run();
+            return super.onSingleTapConfirmed(e);
+        }
+    }
 }
-- 
GitLab


From 1818fb7a6efc2993b74f951dc0868a680334f02f Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Mon, 9 Nov 2020 14:32:48 -0800
Subject: [PATCH 0305/1664] Dismissing popup if the underlying icon no longer
 supports it

Bug: 168641545
Change-Id: Ia4f44819af02397efaead935db3fc8e305e47ba7
---
 src/com/android/launcher3/Launcher.java               |  3 +++
 .../launcher3/popup/PopupContainerWithArrow.java      | 11 +++++++++++
 .../secondarydisplay/SecondaryDisplayLauncher.java    |  2 ++
 3 files changed, 16 insertions(+)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 38ebe14d01..aa123f6b26 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2497,6 +2497,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     @Override
     public void bindAllApplications(AppInfo[] apps, int flags) {
         mAppsView.getAppsStore().setApps(apps, flags);
+        PopupContainerWithArrow.dismissInvalidPopup(this);
     }
 
     /**
@@ -2528,6 +2529,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     public void bindWorkspaceItemsChanged(List<WorkspaceItemInfo> updated) {
         if (!updated.isEmpty()) {
             mWorkspace.updateShortcuts(updated);
+            PopupContainerWithArrow.dismissInvalidPopup(this);
         }
     }
 
@@ -2552,6 +2554,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     public void bindWorkspaceComponentsRemoved(final ItemInfoMatcher matcher) {
         mWorkspace.removeItemsByMatcher(matcher);
         mDragController.onAppsRemoved(matcher);
+        PopupContainerWithArrow.dismissInvalidPopup(this);
     }
 
     @Override
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index 6d92b8b627..59930ff850 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -599,6 +599,17 @@ public class PopupContainerWithArrow<T extends BaseDraggingActivity> extends Arr
         }
     }
 
+    /**
+     * Dismisses the popup if it is no longer valid
+     */
+    public static void dismissInvalidPopup(BaseDraggingActivity activity) {
+        PopupContainerWithArrow popup = getOpen(activity);
+        if (popup != null && (!popup.mOriginalIcon.isAttachedToWindow()
+                || !canShow(popup.mOriginalIcon, (ItemInfo) popup.mOriginalIcon.getTag()))) {
+            popup.animateClose();
+        }
+    }
+
     /**
      * Handler to control drag-and-drop for popup items
      */
diff --git a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
index 2b04365ddc..2adf8ce25a 100644
--- a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
+++ b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
@@ -39,6 +39,7 @@ import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.model.data.PromiseAppInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.launcher3.popup.PopupContainerWithArrow;
 import com.android.launcher3.popup.PopupDataProvider;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.IntArray;
@@ -296,6 +297,7 @@ public class SecondaryDisplayLauncher extends BaseDraggingActivity
     @Override
     public void bindAllApplications(AppInfo[] apps, int flags) {
         mAppsView.getAppsStore().setApps(apps, flags);
+        PopupContainerWithArrow.dismissInvalidPopup(this);
     }
 
     public PopupDataProvider getPopupDataProvider() {
-- 
GitLab


From 3116dc918fa9b1a318596d1caaf40ece03bd00a1 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Mon, 9 Nov 2020 16:30:07 -0600
Subject: [PATCH 0306/1664] Resolve search scroll hightlight issue

After getting the index of the first item that should be highlighted, Section decorator should not assume getChildAt(index) will return item at position. Instead use findViewHolderForAdapterPosition.

Bug: 170665892
Change-Id: Id81d021bde8868184013e8d51e49af7842b64125
---
 res/layout/search_result_settings_row.xml                      | 1 +
 src/com/android/launcher3/allapps/AllAppsGridAdapter.java      | 3 +--
 src/com/android/launcher3/allapps/AllAppsSectionDecorator.java | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/res/layout/search_result_settings_row.xml b/res/layout/search_result_settings_row.xml
index 05f7561628..22c08bf58f 100644
--- a/res/layout/search_result_settings_row.xml
+++ b/res/layout/search_result_settings_row.xml
@@ -44,6 +44,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/search_line_spacing"
+            android:maxLines="1"
             android:textColor="?android:attr/textColorPrimary"
             android:textSize="@dimen/search_hero_title_size" />
 
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index 5b4268111b..d04935223b 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -184,8 +184,7 @@ public class AllAppsGridAdapter extends
                     || viewType == VIEW_TYPE_SEARCH_THUMBNAIL
                     || viewType == VIEW_TYPE_SEARCH_ICON_ROW
                     || viewType == VIEW_TYPE_SEARCH_ICON
-                    || viewType == VIEW_TYPE_SEARCH_SUGGEST
-                    || viewType == VIEW_TYPE_SEARCH_WIDGET_LIVE;
+                    || viewType == VIEW_TYPE_SEARCH_SUGGEST;
         }
     }
 
diff --git a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
index 3c81811e16..1d31975114 100644
--- a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
+++ b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
@@ -98,7 +98,8 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
                     mAppsView.getActiveRecyclerView().getLayoutManager();
             if (layoutManager.findFirstVisibleItemPosition() <= index
                     && index < parent.getChildCount()) {
-                decorationHandler.onFocusDraw(c, parent.getChildAt(index));
+                RecyclerView.ViewHolder vh = parent.findViewHolderForAdapterPosition(index);
+                if (vh != null) decorationHandler.onFocusDraw(c, vh.itemView);
             }
         }
         decorationHandler.reset();
-- 
GitLab


From 1cd6a5f30e66d12bdebaa3a4357cf5cd123494d8 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 5 Nov 2020 13:00:56 -0800
Subject: [PATCH 0307/1664] Fixing app-to-overview animation in 3 button mode

Instead of copying orientation state information from RecentsView
to taskViewSimulator, using the same state object, so that new
properties (like RecentsRotation and flags) are automatically covered

Bug: 162881482
Change-Id: I02d0a710a6ecc4a3cebd0fcc4c49032127df1ce3
---
 .../util/RecentsOrientedStateTest.java        | 89 +++++++++++++++++++
 .../quickstep/util/TaskViewSimulatorTest.java |  2 +-
 .../android/quickstep/AbsSwipeUpHandler.java  |  3 +-
 .../AppToOverviewAnimationProvider.java       |  3 +-
 .../quickstep/SwipeUpAnimationLogic.java      |  2 +-
 .../com/android/quickstep/TaskViewUtils.java  | 11 +--
 .../quickstep/util/RecentsOrientedState.java  | 54 ++++++-----
 .../quickstep/util/TaskViewSimulator.java     | 28 +++---
 .../android/quickstep/views/RecentsView.java  | 26 +++---
 9 files changed, 156 insertions(+), 62 deletions(-)
 create mode 100644 quickstep/robolectric_tests/src/com/android/quickstep/util/RecentsOrientedStateTest.java

diff --git a/quickstep/robolectric_tests/src/com/android/quickstep/util/RecentsOrientedStateTest.java b/quickstep/robolectric_tests/src/com/android/quickstep/util/RecentsOrientedStateTest.java
new file mode 100644
index 0000000000..656379f10f
--- /dev/null
+++ b/quickstep/robolectric_tests/src/com/android/quickstep/util/RecentsOrientedStateTest.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.quickstep.util;
+
+import static android.view.Surface.ROTATION_0;
+import static android.view.Surface.ROTATION_180;
+import static android.view.Surface.ROTATION_90;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+import android.content.Context;
+
+import com.android.quickstep.FallbackActivityInterface;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.LooperMode;
+import org.robolectric.annotation.LooperMode.Mode;
+
+/**
+ * Tests for {@link RecentsOrientedState}
+ */
+@RunWith(RobolectricTestRunner.class)
+@LooperMode(Mode.PAUSED)
+public class RecentsOrientedStateTest {
+
+    private RecentsOrientedState mR1, mR2;
+
+    @Before
+    public void setup() {
+        Context context = RuntimeEnvironment.application;
+        mR1 = new RecentsOrientedState(context, FallbackActivityInterface.INSTANCE, i -> { });
+        mR2 = new RecentsOrientedState(context, FallbackActivityInterface.INSTANCE, i -> { });
+        assertEquals(mR1.getStateId(), mR2.getStateId());
+    }
+
+    @Test
+    public void stateId_changesWithFlags() {
+        mR1.setGestureActive(true);
+        mR2.setGestureActive(false);
+        assertNotEquals(mR1.getStateId(), mR2.getStateId());
+
+        mR2.setGestureActive(true);
+        assertEquals(mR1.getStateId(), mR2.getStateId());
+    }
+
+    @Test
+    public void stateId_changesWithRecentsRotation() {
+        mR1.setRecentsRotation(ROTATION_90);
+        mR2.setRecentsRotation(ROTATION_180);
+        assertNotEquals(mR1.getStateId(), mR2.getStateId());
+
+        mR2.setRecentsRotation(ROTATION_90);
+        assertEquals(mR1.getStateId(), mR2.getStateId());
+    }
+
+    @Test
+    public void stateId_changesWithDisplayRotation() {
+        mR1.update(ROTATION_0, ROTATION_90);
+        mR2.update(ROTATION_0, ROTATION_180);
+        assertNotEquals(mR1.getStateId(), mR2.getStateId());
+
+        mR2.update(ROTATION_90, ROTATION_90);
+        assertNotEquals(mR1.getStateId(), mR2.getStateId());
+
+        mR2.update(ROTATION_90, ROTATION_0);
+        assertNotEquals(mR1.getStateId(), mR2.getStateId());
+
+        mR2.update(ROTATION_0, ROTATION_90);
+        assertEquals(mR1.getStateId(), mR2.getStateId());
+    }
+}
diff --git a/quickstep/robolectric_tests/src/com/android/quickstep/util/TaskViewSimulatorTest.java b/quickstep/robolectric_tests/src/com/android/quickstep/util/TaskViewSimulatorTest.java
index 6c88e55225..688f323d75 100644
--- a/quickstep/robolectric_tests/src/com/android/quickstep/util/TaskViewSimulatorTest.java
+++ b/quickstep/robolectric_tests/src/com/android/quickstep/util/TaskViewSimulatorTest.java
@@ -148,7 +148,7 @@ public class TaskViewSimulatorTest {
             if (mAppRotation < 0) {
                 mAppRotation = launcherRotation;
             }
-            tvs.setLayoutRotation(launcherRotation, mAppRotation);
+            tvs.getOrientationState().update(launcherRotation, mAppRotation);
             if (mAppInsets == null) {
                 mAppInsets = new Rect(mLauncherInsets);
             }
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 43c088b585..041f67981d 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -378,7 +378,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         if (mStateCallback.hasStates(STATE_HANDLER_INVALIDATED)) {
             return;
         }
-        mTaskViewSimulator.setRecentsRotation(mActivity.getDisplay().getRotation());
+        mTaskViewSimulator.setOrientationState(mRecentsView.getPagedViewOrientedState());
 
         // If we've already ended the gesture and are going home, don't prepare recents UI,
         // as that will set the state as BACKGROUND_APP, overriding the animation to NORMAL.
@@ -686,6 +686,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
             dp.updateInsets(targets.homeContentInsets);
             dp.updateIsSeascape(mContext);
             initTransitionEndpoints(dp);
+            mTaskViewSimulator.getOrientationState().setMultiWindowMode(dp.isMultiWindowMode);
         }
 
         // Notify when the animation starts
diff --git a/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java b/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java
index 55f542461c..efd4530c14 100644
--- a/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java
+++ b/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java
@@ -132,9 +132,8 @@ final class AppToOverviewAnimationProvider<T extends StatefulActivity<?>> extend
 
         TaskViewSimulator tsv = new TaskViewSimulator(mActivity, mRecentsView.getSizeStrategy());
         tsv.setDp(mActivity.getDeviceProfile());
+        tsv.setOrientationState(mRecentsView.getPagedViewOrientedState());
         tsv.setPreview(runningTaskTarget);
-        tsv.setLayoutRotation(mRecentsView.getPagedViewOrientedState().getTouchRotation(),
-                mRecentsView.getPagedViewOrientedState().getDisplayRotation());
 
         TransformParams params = new TransformParams()
                 .setTargetSet(targets)
diff --git a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
index 8f7ec3bfa0..4bb1bb565e 100644
--- a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
+++ b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
@@ -79,7 +79,7 @@ public abstract class SwipeUpAnimationLogic {
         mTaskViewSimulator = new TaskViewSimulator(context, gestureState.getActivityInterface());
         mTransformParams = transformParams;
 
-        mTaskViewSimulator.setLayoutRotation(
+        mTaskViewSimulator.getOrientationState().update(
                 mDeviceState.getRotationTouchHelper().getCurrentActiveRotation(),
                 mDeviceState.getRotationTouchHelper().getDisplayRotation());
         mTaskViewSimulator.setDrawsBelowRecents(true);
diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java
index ed761cf640..2aed76afcb 100644
--- a/quickstep/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java
@@ -179,16 +179,17 @@ public final class TaskViewUtils {
 
         Context context = v.getContext();
         DeviceProfile dp = BaseActivity.fromContext(context).getDeviceProfile();
-        // RecentsView never updates the display rotation until swipe-up so the value may be stale.
-        // Use the display value instead.
-        int displayRotation = DisplayController.getDefaultDisplay(context).getInfo().rotation;
-
         TaskViewSimulator topMostSimulator = null;
 
         if (tsv == null && targets.apps.length > 0) {
             tsv = new TaskViewSimulator(context, recentsView.getSizeStrategy());
             tsv.setDp(dp);
-            tsv.setLayoutRotation(displayRotation, displayRotation);
+
+            // RecentsView never updates the display rotation until swipe-up so the value may
+            // be stale. Use the display value instead.
+            int displayRotation = DisplayController.getDefaultDisplay(context).getInfo().rotation;
+            tsv.getOrientationState().update(displayRotation, displayRotation);
+
             tsv.setPreview(targets.apps[targets.apps.length - 1]);
             tsv.fullScreenProgress.value = 0;
             tsv.recentsViewScale.value = 1;
diff --git a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
index bb84380edd..e273aeb81f 100644
--- a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
+++ b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
@@ -72,7 +72,6 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
 
     private static final String TAG = "RecentsOrientedState";
     private static final boolean DEBUG = false;
-    private static final String DELIMITER_DOT = "\\.";
 
     private ContentObserver mSystemAutoRotateObserver =
             newContentObserver(new Handler(), t -> updateAutoRotateSetting());
@@ -129,6 +128,9 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
     private int mFlags;
     private int mPreviousRotation = ROTATION_0;
 
+    // Combined int which encodes the full state.
+    private int mStateId = 0;
+
     /**
      * @param rotationChangeListener Callback for receiving rotation events when rotation watcher
      *                              is enabled
@@ -169,7 +171,7 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
      */
     public boolean setRecentsRotation(@SurfaceRotation int recentsRotation) {
         mRecentsRotation = recentsRotation;
-        return update(mTouchRotation, mDisplayRotation);
+        return updateHandler();
     }
 
     /**
@@ -183,8 +185,7 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
      * Sets if the swipe up gesture is currently running or not
      */
     public boolean setGestureActive(boolean isGestureActive) {
-        setFlag(FLAG_SWIPE_UP_NOT_RUNNING, !isGestureActive);
-        return update(mTouchRotation, mDisplayRotation);
+        return setFlag(FLAG_SWIPE_UP_NOT_RUNNING, !isGestureActive);
     }
 
     /**
@@ -201,14 +202,13 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
         mDisplayRotation = displayRotation;
         mTouchRotation = touchRotation;
         mPreviousRotation = touchRotation;
+        return updateHandler();
+    }
 
-        PagedOrientationHandler oldHandler = mOrientationHandler;
+    private boolean updateHandler() {
         if (mRecentsActivityRotation == mTouchRotation
                 || (canRecentsActivityRotate() && (mFlags & FLAG_SWIPE_UP_NOT_RUNNING) != 0)) {
             mOrientationHandler = PagedOrientationHandler.PORTRAIT;
-            if (DEBUG) {
-                Log.d(TAG, "current RecentsOrientedState: " + this);
-            }
         } else if (mTouchRotation == ROTATION_90) {
             mOrientationHandler = PagedOrientationHandler.LANDSCAPE;
         } else if (mTouchRotation == ROTATION_270) {
@@ -219,19 +219,26 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
         if (DEBUG) {
             Log.d(TAG, "current RecentsOrientedState: " + this);
         }
-        return oldHandler != mOrientationHandler;
+
+        int oldStateId = mStateId;
+        // Each SurfaceRotation value takes two bits
+        mStateId = (((((mFlags << 2)
+                | mDisplayRotation) << 2)
+                | mTouchRotation) << 3)
+                | (mRecentsRotation < 0 ? 7 : mRecentsRotation);
+        return mStateId != oldStateId;
     }
 
     @SurfaceRotation
     private int inferRecentsActivityRotation(@SurfaceRotation int displayRotation) {
         if (isRecentsActivityRotationAllowed()) {
-            return mRecentsRotation < ROTATION_0 ? displayRotation : mRecentsRotation;
+            return mRecentsRotation < 0 ? displayRotation : mRecentsRotation;
         } else {
             return ROTATION_0;
         }
     }
 
-    private void setFlag(int mask, boolean enabled) {
+    private boolean setFlag(int mask, boolean enabled) {
         boolean wasRotationEnabled = !TestProtocol.sDisableSensorRotation
                 && (mFlags & VALUE_ROTATION_WATCHER_ENABLED) == VALUE_ROTATION_WATCHER_ENABLED
                 && !canRecentsActivityRotate();
@@ -253,6 +260,7 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
                 }
             });
         }
+        return updateHandler();
     }
 
     @Override
@@ -327,6 +335,13 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
         return mRecentsActivityRotation;
     }
 
+    /**
+     * Returns an id that can be used to tracking internal changes
+     */
+    public int getStateId() {
+        return mStateId;
+    }
+
     public boolean isMultipleOrientationSupportedByDevice() {
         return (mFlags & MASK_MULTIPLE_ORIENTATION_SUPPORTED_BY_DEVICE)
                 == MASK_MULTIPLE_ORIENTATION_SUPPORTED_BY_DEVICE;
@@ -509,14 +524,15 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
     public String toString() {
         boolean systemRotationOn = (mFlags & FLAG_SYSTEM_ROTATION_ALLOWED) != 0;
         return "["
-                + "this=" + extractObjectNameAndAddress(super.toString())
-                + " mOrientationHandler=" +
-                    extractObjectNameAndAddress(mOrientationHandler.toString())
+                + "this=" + nameAndAddress(this)
+                + " mOrientationHandler=" + nameAndAddress(mOrientationHandler)
                 + " mDisplayRotation=" + mDisplayRotation
                 + " mTouchRotation=" + mTouchRotation
                 + " mRecentsActivityRotation=" + mRecentsActivityRotation
+                + " mRecentsRotation=" + mRecentsRotation
                 + " isRecentsActivityRotationAllowed=" + isRecentsActivityRotationAllowed()
                 + " mSystemRotation=" + systemRotationOn
+                + " mStateId=" + mStateId
                 + " mFlags=" + mFlags
                 + "]";
     }
@@ -533,13 +549,7 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
                 : idp.portraitProfile;
     }
 
-    /**
-     * String conversion for only the helpful parts of {@link Object#toString()} method
-     * @param stringToExtract "foo.bar.baz.MyObject@1234"
-     * @return "MyObject@1234"
-     */
-    private static String extractObjectNameAndAddress(String stringToExtract) {
-        int index = stringToExtract.lastIndexOf(DELIMITER_DOT);
-        return index >= 0 ? stringToExtract.substring(index) : "";
+    private static String nameAndAddress(Object obj) {
+        return obj.getClass().getSimpleName() + "@" + obj.hashCode();
     }
 }
diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index 61ba411363..2f4bb8ed9d 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -23,7 +23,6 @@ import static com.android.systemui.shared.system.WindowManagerWrapper.WINDOWING_
 
 import android.animation.TimeInterpolator;
 import android.content.Context;
-import android.content.res.Configuration;
 import android.graphics.Matrix;
 import android.graphics.Point;
 import android.graphics.PointF;
@@ -31,6 +30,8 @@ import android.graphics.Rect;
 import android.graphics.RectF;
 import android.util.IntProperty;
 
+import androidx.annotation.NonNull;
+
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.PendingAnimation;
@@ -67,10 +68,12 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
     private final RectF mTempRectF = new RectF();
     private final float[] mTempPoint = new float[2];
 
-    private final RecentsOrientedState mOrientationState;
     private final Context mContext;
     private final BaseActivityInterface mSizeStrategy;
 
+    @NonNull
+    private RecentsOrientedState mOrientationState;
+
     private final Rect mTaskRect = new Rect();
     private boolean mDrawsBelowRecents;
     private final PointF mPivot = new PointF();
@@ -100,6 +103,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
     // Cached calculations
     private boolean mLayoutValid = false;
     private boolean mScrollValid = false;
+    private int mOrientationStateId;
 
     public TaskViewSimulator(Context context, BaseActivityInterface sizeStrategy) {
         mContext = context;
@@ -107,8 +111,8 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
 
         mOrientationState = new RecentsOrientedState(context, sizeStrategy, i -> { });
         mOrientationState.setGestureActive(true);
-
         mCurrentFullscreenParams = new FullscreenDrawParams(context);
+        mOrientationStateId = mOrientationState.getStateId();
     }
 
     /**
@@ -116,23 +120,14 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
      */
     public void setDp(DeviceProfile dp) {
         mDp = dp;
-        mOrientationState.setMultiWindowMode(mDp.isMultiWindowMode);
-        mLayoutValid = false;
-    }
-
-    /**
-     * @see com.android.quickstep.views.RecentsView#setLayoutRotation(int, int)
-     */
-    public void setLayoutRotation(int touchRotation, int displayRotation) {
-        mOrientationState.update(touchRotation, displayRotation);
         mLayoutValid = false;
     }
 
     /**
-     * @see com.android.quickstep.views.RecentsView#onConfigurationChanged(Configuration)
+     * Sets the orientation state used for this animation
      */
-    public void setRecentsRotation(int recentsRotation) {
-        mOrientationState.setRecentsRotation(recentsRotation);
+    public void setOrientationState(@NonNull RecentsOrientedState orientationState) {
+        mOrientationState = orientationState;
         mLayoutValid = false;
     }
 
@@ -251,8 +246,9 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
         if (mDp == null || mThumbnailPosition.isEmpty()) {
             return;
         }
-        if (!mLayoutValid) {
+        if (!mLayoutValid || mOrientationStateId != mOrientationState.getStateId()) {
             mLayoutValid = true;
+            mOrientationStateId = mOrientationState.getStateId();
 
             getFullScreenScale();
             mThumbnailData.rotation = mOrientationState.getDisplayRotation();
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 7efa5bd8c4..f281296ee2 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -89,6 +89,7 @@ import android.widget.ListView;
 import androidx.annotation.Nullable;
 
 import com.android.launcher3.BaseActivity;
+import com.android.launcher3.BaseActivity.MultiWindowModeChangedListener;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Insettable;
 import com.android.launcher3.InvariantDeviceProfile;
@@ -239,7 +240,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                 }
             };
 
-    protected RecentsOrientedState mOrientationState;
+    protected final RecentsOrientedState mOrientationState;
     protected final BaseActivityInterface mSizeStrategy;
     protected RecentsAnimationController mRecentsAnimationController;
     protected SurfaceTransactionApplier mSyncTransactionApplier;
@@ -408,17 +409,18 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     private int mTaskViewStartIndex = 0;
     private OverviewActionsView mActionsView;
 
-    private BaseActivity.MultiWindowModeChangedListener mMultiWindowModeChangedListener =
-            (inMultiWindowMode) -> {
-                if (mOrientationState != null) {
+    private MultiWindowModeChangedListener mMultiWindowModeChangedListener =
+            new MultiWindowModeChangedListener() {
+                @Override
+                public void onMultiWindowModeChanged(boolean inMultiWindowMode) {
                     mOrientationState.setMultiWindowMode(inMultiWindowMode);
                     setLayoutRotation(mOrientationState.getTouchRotation(),
                             mOrientationState.getDisplayRotation());
                     updateChildTaskOrientations();
-                }
-                if (!inMultiWindowMode && mOverviewStateEnabled) {
-                    // TODO: Re-enable layout transitions for addition of the unpinned task
-                    reloadIfNeeded();
+                    if (!inMultiWindowMode && mOverviewStateEnabled) {
+                        // TODO: Re-enable layout transitions for addition of the unpinned task
+                        reloadIfNeeded();
+                    }
                 }
             };
 
@@ -476,9 +478,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
 
         mLiveTileTaskViewSimulator = new TaskViewSimulator(getContext(), getSizeStrategy());
         mLiveTileTaskViewSimulator.recentsViewScale.value = 1;
-        mLiveTileTaskViewSimulator.setLayoutRotation(getPagedViewOrientedState().getTouchRotation(),
-                getPagedViewOrientedState().getDisplayRotation());
-        mLiveTileTaskViewSimulator.setRecentsRotation(rotation);
+        mLiveTileTaskViewSimulator.setOrientationState(mOrientationState);
         mLiveTileTaskViewSimulator.setDrawsBelowRecents(true);
     }
 
@@ -1763,7 +1763,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         if (mOrientationState.setRecentsRotation(rotation)) {
             updateOrientationHandler();
         }
-        mLiveTileTaskViewSimulator.setRecentsRotation(rotation);
+
         // If overview is in modal state when rotate, reset it to overview state without running
         // animation.
         if (mActivity.isInState(OVERVIEW_MODAL_TASK)) {
@@ -1798,8 +1798,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         requestLayout();
         // Reapply the current page to update page scrolls.
         setCurrentPage(mCurrentPage);
-        mLiveTileTaskViewSimulator.setLayoutRotation(getPagedViewOrientedState().getTouchRotation(),
-                getPagedViewOrientedState().getDisplayRotation());
     }
 
     public RecentsOrientedState getPagedViewOrientedState() {
-- 
GitLab


From 81de07e405bdab1a694c140cfd2a2b572201367a Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Mon, 9 Nov 2020 15:58:21 -0600
Subject: [PATCH 0308/1664] Polish search result icons

SearchResultIconRow consumes a loaded ItemInfoWithIcon from its child SearchResult and updates other siblings with itemInfo.

preview: https://drive.google.com/file/d/1ijZsR5Q6M0DeZdlRJWpRb4AKmmTLBElY/view?usp=sharing
Change-Id: Ibb3fb697494749fd2e886dcdaa93241767a65944
---
 .../launcher3/views/SearchResultIcon.java     | 75 ++++++++++---------
 .../launcher3/views/SearchResultIconRow.java  | 13 +++-
 .../views/SearchResultSuggestion.java         |  6 +-
 3 files changed, 51 insertions(+), 43 deletions(-)

diff --git a/src/com/android/launcher3/views/SearchResultIcon.java b/src/com/android/launcher3/views/SearchResultIcon.java
index 0851b5432f..51c741b342 100644
--- a/src/com/android/launcher3/views/SearchResultIcon.java
+++ b/src/com/android/launcher3/views/SearchResultIcon.java
@@ -30,8 +30,6 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
 
-import androidx.annotation.UiThread;
-
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
@@ -49,6 +47,8 @@ import com.android.launcher3.util.ComponentKey;
 import com.android.systemui.plugins.shared.SearchTarget;
 import com.android.systemui.plugins.shared.SearchTargetEvent;
 
+import java.util.function.Consumer;
+
 /**
  * A {@link BubbleTextView} representing a single cell result in AllApps
  */
@@ -61,7 +61,6 @@ public class SearchResultIcon extends BubbleTextView implements
     public static final String TARGET_TYPE_HERO_APP = "hero_app";
     public static final String TARGET_TYPE_SHORTCUT = "shortcut";
     public static final String TARGET_TYPE_REMOTE_ACTION = "remote_action";
-    public static final String TARGET_TYPE_SUGGEST = "suggest";
 
     public static final String REMOTE_ACTION_SHOULD_START = "should_start_for_result";
     public static final String REMOTE_ACTION_TOKEN = "action_token";
@@ -73,6 +72,7 @@ public class SearchResultIcon extends BubbleTextView implements
     private final Launcher mLauncher;
 
     private SearchTarget mSearchTarget;
+    private Consumer<ItemInfoWithIcon> mOnItemInfoChanged;
 
     public SearchResultIcon(Context context) {
         this(context, null, 0);
@@ -98,6 +98,15 @@ public class SearchResultIcon extends BubbleTextView implements
                 mLauncher.getDeviceProfile().allAppsCellHeightPx));
     }
 
+    /**
+     * Applies search target with a ItemInfoWithIcon consumer to be called after itemInfo is
+     * constructed
+     */
+    public void applySearchTarget(SearchTarget searchTarget, Consumer<ItemInfoWithIcon> cb) {
+        mOnItemInfoChanged = cb;
+        applySearchTarget(searchTarget);
+    }
+
     @Override
     public void applySearchTarget(SearchTarget searchTarget) {
         mSearchTarget = searchTarget;
@@ -111,7 +120,6 @@ public class SearchResultIcon extends BubbleTextView implements
                 prepareUsingShortcutInfo(searchTarget.getShortcutInfos().get(0));
                 break;
             case TARGET_TYPE_REMOTE_ACTION:
-            case TARGET_TYPE_SUGGEST:
                 prepareUsingRemoteAction(searchTarget.getRemoteAction(),
                         searchTarget.getExtras().getString(REMOTE_ACTION_TOKEN),
                         searchTarget.getExtras().getBoolean(REMOTE_ACTION_SHOULD_START),
@@ -124,53 +132,45 @@ public class SearchResultIcon extends BubbleTextView implements
         AllAppsStore appsStore = mLauncher.getAppsView().getAppsStore();
         AppInfo appInfo = appsStore.getApp(new ComponentKey(componentName, userHandle));
         applyFromApplicationInfo(appInfo);
+        notifyItemInfoChanged(appInfo);
     }
 
 
     private void prepareUsingShortcutInfo(ShortcutInfo shortcutInfo) {
         WorkspaceItemInfo workspaceItemInfo = new WorkspaceItemInfo(shortcutInfo, getContext());
-        applyFromWorkspaceItem(workspaceItemInfo);
+        notifyItemInfoChanged(workspaceItemInfo);
         LauncherAppState launcherAppState = LauncherAppState.getInstance(getContext());
         MODEL_EXECUTOR.execute(() -> {
             launcherAppState.getIconCache().getShortcutIcon(workspaceItemInfo, shortcutInfo);
-            reapplyItemInfoAsync(workspaceItemInfo);
+            MAIN_EXECUTOR.post(() -> applyFromWorkspaceItem(workspaceItemInfo));
         });
     }
 
     private void prepareUsingRemoteAction(RemoteAction remoteAction, String token, boolean start,
             boolean useIconToBadge) {
         RemoteActionItemInfo itemInfo = new RemoteActionItemInfo(remoteAction, token, start);
-
-        applyFromRemoteActionInfo(itemInfo);
-        if (!loadIconFromResource()) {
-            UI_HELPER_EXECUTOR.post(() -> {
-                // If the Drawable from the remote action is not AdaptiveBitmap, styling will not
-                // work.
-                try (LauncherIcons li = LauncherIcons.obtain(getContext())) {
-                    Drawable d = itemInfo.getRemoteAction().getIcon().loadDrawable(getContext());
-                    BitmapInfo bitmap = li.createBadgedIconBitmap(d, itemInfo.user,
-                            Build.VERSION.SDK_INT);
-
-                    if (useIconToBadge) {
-                        BitmapInfo placeholder = li.createIconBitmap(
-                                itemInfo.getRemoteAction().getTitle().toString().substring(0, 1),
-                                bitmap.color);
-                        itemInfo.bitmap = li.badgeBitmap(placeholder.icon, bitmap);
-                    } else {
-                        itemInfo.bitmap = bitmap;
-                    }
-                    reapplyItemInfoAsync(itemInfo);
+        notifyItemInfoChanged(itemInfo);
+        UI_HELPER_EXECUTOR.post(() -> {
+            // If the Drawable from the remote action is not AdaptiveBitmap, styling will not
+            // work.
+            try (LauncherIcons li = LauncherIcons.obtain(getContext())) {
+                Drawable d = itemInfo.getRemoteAction().getIcon().loadDrawable(getContext());
+                BitmapInfo bitmap = li.createBadgedIconBitmap(d, itemInfo.user,
+                        Build.VERSION.SDK_INT);
+
+                if (useIconToBadge) {
+                    BitmapInfo placeholder = li.createIconBitmap(
+                            itemInfo.getRemoteAction().getTitle().toString().substring(0, 1),
+                            bitmap.color);
+                    itemInfo.bitmap = li.badgeBitmap(placeholder.icon, bitmap);
+                } else {
+                    itemInfo.bitmap = bitmap;
                 }
-            });
-        }
-    }
-
-    @UiThread
-    void reapplyItemInfoAsync(ItemInfoWithIcon itemInfoWithIcon) {
-        MAIN_EXECUTOR.post(() -> reapplyItemInfo(itemInfoWithIcon));
+            }
+            MAIN_EXECUTOR.post(() -> applyFromRemoteActionInfo(itemInfo));
+        });
     }
 
-
     @Override
     public void handleSelection(int eventType) {
         mLauncher.getItemOnClickListener().onClick(this);
@@ -208,7 +208,10 @@ public class SearchResultIcon extends BubbleTextView implements
         return false;
     }
 
-    protected boolean loadIconFromResource() {
-        return false;
+    private void notifyItemInfoChanged(ItemInfoWithIcon itemInfoWithIcon) {
+        if (mOnItemInfoChanged != null) {
+            mOnItemInfoChanged.accept(itemInfoWithIcon);
+            mOnItemInfoChanged = null;
+        }
     }
 }
diff --git a/src/com/android/launcher3/views/SearchResultIconRow.java b/src/com/android/launcher3/views/SearchResultIconRow.java
index ecf5054d8b..e3c7661166 100644
--- a/src/com/android/launcher3/views/SearchResultIconRow.java
+++ b/src/com/android/launcher3/views/SearchResultIconRow.java
@@ -46,6 +46,7 @@ import com.android.systemui.plugins.shared.SearchTargetEvent;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Consumer;
 
 /**
  * A full width representation of {@link SearchResultIcon} with a secondary label and inline
@@ -53,7 +54,7 @@ import java.util.List;
  */
 public class SearchResultIconRow extends LinearLayout implements
         AllAppsSearchBarController.SearchTargetHandler, View.OnClickListener,
-        View.OnLongClickListener {
+        View.OnLongClickListener, Consumer<ItemInfoWithIcon> {
     public static final int MAX_SHORTCUTS_COUNT = 2;
 
 
@@ -95,6 +96,7 @@ public class SearchResultIconRow extends LinearLayout implements
         mShortcutViews[1] = findViewById(R.id.shortcut_1);
         mResultIcon.getLayoutParams().height = iconSize;
         mResultIcon.getLayoutParams().width = iconSize;
+        mResultIcon.setTextVisibility(false);
         for (BubbleTextView bubbleTextView : mShortcutViews) {
             ViewGroup.LayoutParams lp = bubbleTextView.getLayoutParams();
             lp.width = iconSize;
@@ -113,9 +115,7 @@ public class SearchResultIconRow extends LinearLayout implements
     @Override
     public void applySearchTarget(SearchTarget searchTarget) {
         mSearchTarget = searchTarget;
-        mResultIcon.applySearchTarget(searchTarget);
-        mResultIcon.setTextVisibility(false);
-        mTitleView.setText(mResultIcon.getText());
+        mResultIcon.applySearchTarget(searchTarget, this);
         String itemType = searchTarget.getItemType();
         boolean showDesc = itemType.equals(SearchResultIcon.TARGET_TYPE_SHORTCUT);
         mDescriptionView.setVisibility(showDesc ? VISIBLE : GONE);
@@ -138,6 +138,11 @@ public class SearchResultIconRow extends LinearLayout implements
         }
     }
 
+    @Override
+    public void accept(ItemInfoWithIcon itemInfoWithIcon) {
+        mTitleView.setText(itemInfoWithIcon.title);
+    }
+
     private void showInlineShortcuts(List<ShortcutInfo> infos) {
         if (infos == null) return;
         ArrayList<Pair<ShortcutInfo, ItemInfoWithIcon>> shortcuts = new ArrayList<>();
diff --git a/src/com/android/launcher3/views/SearchResultSuggestion.java b/src/com/android/launcher3/views/SearchResultSuggestion.java
index ab94bf0342..c67b1cf7f3 100644
--- a/src/com/android/launcher3/views/SearchResultSuggestion.java
+++ b/src/com/android/launcher3/views/SearchResultSuggestion.java
@@ -28,6 +28,7 @@ import com.android.launcher3.R;
  */
 public class SearchResultSuggestion extends SearchResultIcon {
 
+    public static final String TARGET_TYPE_SUGGEST = "suggest";
     private final Drawable mCustomIcon;
 
     public SearchResultSuggestion(Context context) {
@@ -55,8 +56,7 @@ public class SearchResultSuggestion extends SearchResultIcon {
     }
 
     @Override
-    protected boolean loadIconFromResource() {
-        setIcon(mCustomIcon);
-        return true;
+    protected void setIcon(Drawable icon) {
+        super.setIcon(mCustomIcon);
     }
 }
-- 
GitLab


From 3a4caed1f3df5b4b56b1e0d0271f8dd341620842 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Mon, 9 Nov 2020 22:19:37 -0800
Subject: [PATCH 0309/1664] Fix NPE inside getFocusdChild

Bug: 172883035
Change-Id: Iea3e07165cdaa45031ee5bbc11add5c115cab366
---
 src/com/android/launcher3/allapps/AlphabeticalAppsList.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
index 2450787e49..354f97c0a9 100644
--- a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
+++ b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
@@ -132,6 +132,9 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
      * Returns the child adapter item with IME launch focus.
      */
     public AdapterItem getFocusedChild() {
+        if (mAdapterItems.size() == 0) {
+            return null;
+        }
         return mAdapterItems.get(getFocusedChildIndex());
     }
 
-- 
GitLab


From 90a43a5f00d19bb8f81d76ff3154a555db8f832a Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Mon, 9 Nov 2020 23:46:09 -0800
Subject: [PATCH 0310/1664] IME stability

Bug: 170739594

Change-Id: Ib667c6dfb321411d59e728a1f34d4803f7293f05
---
 .../AllAppsInsetTransitionController.java     | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java b/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
index 01d01ea35e..93da1c0dd6 100644
--- a/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
@@ -57,7 +57,8 @@ public class AllAppsInsetTransitionController {
 
     // Only purpose of these states is to keep track of fast fling transition
     enum State {
-        RESET, DRAG_START_BOTTOM, FLING_END_TOP,
+        RESET, DRAG_START_BOTTOM, DRAG_START_BOTTOM_IME_CANCELLED,
+        FLING_END_TOP, FLING_END_TOP_IME_CANCELLED,
         DRAG_START_TOP, FLING_END_BOTTOM
     }
     private State mState;
@@ -149,13 +150,12 @@ public class AllAppsInsetTransitionController {
                                     + " mAnimationController=" + mAnimationController);
                         }
                         if (mState == State.DRAG_START_BOTTOM) {
-                            mApps.getWindowInsetsController().show(WindowInsets.Type.ime());
+                            mState = State.DRAG_START_BOTTOM_IME_CANCELLED;
                         }
                         mAnimationController = null;
                         if (controller != null) {
                             controller.finish(true);
                         }
-
                     }
                 });
     }
@@ -200,7 +200,7 @@ public class AllAppsInsetTransitionController {
         final int end = mShownAtDown ? mHiddenInsetBottom : mShownInsetBottom;
         inset = Math.max(inset, mHiddenInsetBottom);
         inset = Math.min(inset, mShownInsetBottom);
-        if (DEBUG || false) {
+        if (DEBUG && false) {
             Log.d(TAG, "updateInset mCurrent=" + mCurrent + " mDown="
                     + mDown + " hidden=" + mHiddenInsetBottom
                     + " shown=" + mShownInsetBottom
@@ -228,8 +228,14 @@ public class AllAppsInsetTransitionController {
             // only called when launcher restarting.
             UiThreadHelper.hideKeyboardAsync(mApps.getContext(), mApps.getWindowToken());
         }
+
         setState(false, true, progress);
+
+
         if (mAnimationController == null) {
+            if (mState == State.FLING_END_TOP_IME_CANCELLED) {
+                mApps.getWindowInsetsController().show(WindowInsets.Type.ime());
+            }
             return;
         }
 
@@ -268,8 +274,12 @@ public class AllAppsInsetTransitionController {
         } else if (end) {
             if (Float.compare(progress, 1f) == 0 && mState == State.DRAG_START_TOP) {
                 state = State.FLING_END_BOTTOM;
-            } else if (Float.compare(progress, 0f) == 0 && mState == State.DRAG_START_BOTTOM) {
-                state = State.FLING_END_TOP;
+            } else if (Float.compare(progress, 0f) == 0) {
+                if (mState == State.DRAG_START_BOTTOM) {
+                    state = State.FLING_END_TOP;
+                } else if (mState == State.DRAG_START_BOTTOM_IME_CANCELLED) {
+                    state = State.FLING_END_TOP_IME_CANCELLED;
+                }
             }
         }
         if (DEBUG) {
-- 
GitLab


From ffd2b6d25eccac2ec9f69ccfac3883d4c80a8c1b Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Mon, 9 Nov 2020 19:04:43 -0600
Subject: [PATCH 0311/1664] Search support for widgets with config activity

Shows widget preview in search if widget requires config.

preview: https://drive.google.com/file/d/1q1ROu7-OUGfskDMRxXPNQMdr3T-WMMkv/view?usp=sharing
Bug: 168321831
Test: Manual
Change-Id: I6c1c168ebac4ce33a4234e8a417eba789f664f43
---
 res/layout/search_result_widget_preview.xml   |   8 +
 .../launcher3/allapps/AllAppsGridAdapter.java |   9 +-
 .../views/SearchResultWidgetPreview.java      | 141 ++++++++++++++++++
 .../launcher3/widget/BaseWidgetSheet.java     |  30 ++--
 4 files changed, 176 insertions(+), 12 deletions(-)
 create mode 100644 res/layout/search_result_widget_preview.xml
 create mode 100644 src/com/android/launcher3/views/SearchResultWidgetPreview.java

diff --git a/res/layout/search_result_widget_preview.xml b/res/layout/search_result_widget_preview.xml
new file mode 100644
index 0000000000..942b199b7f
--- /dev/null
+++ b/res/layout/search_result_widget_preview.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.android.launcher3.views.SearchResultWidgetPreview xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:padding="@dimen/dynamic_grid_cell_padding_x"
+    android:layout_height="wrap_content">
+    <include layout="@layout/widget_cell" android:id="@+id/widget_cell"/>
+<!--    <include layout="@layout/widget_cell_content" />-->
+</com.android.launcher3.views.SearchResultWidgetPreview>
\ No newline at end of file
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index d04935223b..3c88288160 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -92,6 +92,8 @@ public class AllAppsGridAdapter extends
 
     public static final int VIEW_TYPE_SEARCH_WIDGET_LIVE = 1 << 15;
 
+    public static final int VIEW_TYPE_SEARCH_WIDGET_PREVIEW = 1 << 16;
+
     // Common view type masks
     public static final int VIEW_TYPE_MASK_DIVIDER = VIEW_TYPE_ALL_APPS_DIVIDER;
     public static final int VIEW_TYPE_MASK_ICON = VIEW_TYPE_ICON | VIEW_TYPE_SEARCH_ICON;
@@ -287,7 +289,8 @@ public class AllAppsGridAdapter extends
             int viewType = mApps.getAdapterItems().get(position).viewType;
             if (isIconViewType(viewType)) {
                 return 1 * SPAN_MULTIPLIER;
-            } else if (viewType == VIEW_TYPE_SEARCH_THUMBNAIL) {
+            } else if (viewType == VIEW_TYPE_SEARCH_THUMBNAIL
+                    || viewType == VIEW_TYPE_SEARCH_WIDGET_PREVIEW) {
                 return mAppsPerRow;
             } else {
                 // Section breaks span the full width
@@ -433,6 +436,9 @@ public class AllAppsGridAdapter extends
             case VIEW_TYPE_SEARCH_WIDGET_LIVE:
                 return new ViewHolder(mLayoutInflater.inflate(
                         R.layout.search_result_widget_live, parent, false));
+            case VIEW_TYPE_SEARCH_WIDGET_PREVIEW:
+                return new ViewHolder(mLayoutInflater.inflate(
+                        R.layout.search_result_widget_preview, parent, false));
             default:
                 throw new RuntimeException("Unexpected view type");
         }
@@ -476,6 +482,7 @@ public class AllAppsGridAdapter extends
             case VIEW_TYPE_SEARCH_THUMBNAIL:
             case VIEW_TYPE_SEARCH_SUGGEST:
             case VIEW_TYPE_SEARCH_WIDGET_LIVE:
+            case VIEW_TYPE_SEARCH_WIDGET_PREVIEW:
                 SearchAdapterItem item =
                         (SearchAdapterItem) mApps.getAdapterItems().get(position);
                 SearchTargetHandler payloadResultView = (SearchTargetHandler) holder.itemView;
diff --git a/src/com/android/launcher3/views/SearchResultWidgetPreview.java b/src/com/android/launcher3/views/SearchResultWidgetPreview.java
new file mode 100644
index 0000000000..c11c232307
--- /dev/null
+++ b/src/com/android/launcher3/views/SearchResultWidgetPreview.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.views;
+
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
+
+import android.appwidget.AppWidgetProviderInfo;
+import android.content.Context;
+import android.graphics.Point;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.Toast;
+
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.LauncherAppWidgetProviderInfo;
+import com.android.launcher3.R;
+import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+import com.android.launcher3.allapps.search.SearchEventTracker;
+import com.android.launcher3.dragndrop.DragOptions;
+import com.android.launcher3.model.WidgetItem;
+import com.android.launcher3.touch.ItemLongClickListener;
+import com.android.launcher3.widget.BaseWidgetSheet;
+import com.android.launcher3.widget.PendingItemDragHelper;
+import com.android.launcher3.widget.WidgetCell;
+import com.android.launcher3.widget.WidgetImageView;
+import com.android.systemui.plugins.shared.SearchTarget;
+import com.android.systemui.plugins.shared.SearchTargetEvent;
+
+/**
+ * displays preview of a widget upon receiving {@link AppWidgetProviderInfo} from Search provider
+ */
+public class SearchResultWidgetPreview extends LinearLayout implements
+        AllAppsSearchBarController.SearchTargetHandler, View.OnLongClickListener,
+        View.OnClickListener {
+
+    public static final String TARGET_TYPE_WIDGET_PREVIEW = "widget_preview";
+    private final Launcher mLauncher;
+    private final LauncherAppState mAppState;
+    private WidgetCell mWidgetCell;
+    private Toast mWidgetToast;
+
+    private SearchTarget mSearchTarget;
+
+
+    public SearchResultWidgetPreview(Context context) {
+        this(context, null, 0);
+    }
+
+    public SearchResultWidgetPreview(Context context,
+            @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public SearchResultWidgetPreview(Context context, @Nullable AttributeSet attrs,
+            int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mLauncher = Launcher.getLauncher(context);
+        mAppState = LauncherAppState.getInstance(context);
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mWidgetCell = findViewById(R.id.widget_cell);
+        mWidgetCell.setOnLongClickListener(this);
+        mWidgetCell.setOnClickListener(this);
+    }
+
+    @Override
+    public void applySearchTarget(SearchTarget searchTarget) {
+        if (searchTarget.getExtras() == null
+                || searchTarget.getExtras().getParcelable("provider") == null) {
+            setVisibility(GONE);
+            return;
+        }
+        mSearchTarget = searchTarget;
+        AppWidgetProviderInfo providerInfo = searchTarget.getExtras().getParcelable("provider");
+        LauncherAppWidgetProviderInfo pInfo = LauncherAppWidgetProviderInfo.fromProviderInfo(
+                getContext(), providerInfo);
+        MODEL_EXECUTOR.post(() -> {
+            WidgetItem widgetItem = new WidgetItem(pInfo, mLauncher.getDeviceProfile().inv,
+                    mAppState.getIconCache());
+            MAIN_EXECUTOR.post(() -> {
+                mWidgetCell.applyFromCellItem(widgetItem, mAppState.getWidgetCache());
+                mWidgetCell.ensurePreview();
+            });
+        });
+
+    }
+
+    @Override
+    public boolean onLongClick(View view) {
+        view.cancelLongPress();
+        if (!ItemLongClickListener.canStartDrag(mLauncher)) return false;
+        if (mWidgetCell.getTag() == null) return false;
+
+        WidgetImageView imageView = mWidgetCell.getWidgetView();
+        if (imageView.getBitmap() == null) {
+            return false;
+        }
+
+        int[] loc = new int[2];
+        mLauncher.getDragLayer().getLocationInDragLayer(imageView, loc);
+
+        new PendingItemDragHelper(mWidgetCell).startDrag(
+                imageView.getBitmapBounds(), imageView.getBitmap().getWidth(), imageView.getWidth(),
+                new Point(loc[0], loc[1]), mLauncher.getAppsView(), new DragOptions());
+        handleSelection(SearchTargetEvent.LONG_PRESS);
+        return true;
+    }
+
+    @Override
+    public void onClick(View view) {
+        mWidgetToast = BaseWidgetSheet.showWidgetToast(getContext(), mWidgetToast);
+        handleSelection(SearchTargetEvent.SELECT);
+    }
+
+    @Override
+    public void handleSelection(int eventType) {
+        SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(
+                new SearchTargetEvent.Builder(mSearchTarget, eventType).build());
+    }
+}
diff --git a/src/com/android/launcher3/widget/BaseWidgetSheet.java b/src/com/android/launcher3/widget/BaseWidgetSheet.java
index 01af96cb33..a38e90dfd8 100644
--- a/src/com/android/launcher3/widget/BaseWidgetSheet.java
+++ b/src/com/android/launcher3/widget/BaseWidgetSheet.java
@@ -42,7 +42,7 @@ import com.android.launcher3.views.AbstractSlideInView;
 /**
  * Base class for various widgets popup
  */
-abstract class BaseWidgetSheet extends AbstractSlideInView
+public abstract class BaseWidgetSheet extends AbstractSlideInView
         implements OnClickListener, OnLongClickListener, DragSource,
         PopupDataProvider.PopupDataChangeListener {
 
@@ -74,16 +74,7 @@ abstract class BaseWidgetSheet extends AbstractSlideInView
 
     @Override
     public final void onClick(View v) {
-        // Let the user know that they have to long press to add a widget
-        if (mWidgetInstructionToast != null) {
-            mWidgetInstructionToast.cancel();
-        }
-
-        CharSequence msg = Utilities.wrapForTts(
-                getContext().getText(R.string.long_press_widget_to_add),
-                getContext().getString(R.string.long_accessible_way_to_add));
-        mWidgetInstructionToast = Toast.makeText(getContext(), msg, Toast.LENGTH_SHORT);
-        mWidgetInstructionToast.show();
+        mWidgetInstructionToast = showWidgetToast(getContext(), mWidgetInstructionToast);
     }
 
     @Override
@@ -146,4 +137,21 @@ abstract class BaseWidgetSheet extends AbstractSlideInView
     protected SystemUiController getSystemUiController() {
         return mLauncher.getSystemUiController();
     }
+
+    /**
+     * Show Widget tap toast prompting user to drag instead
+     */
+    public static Toast showWidgetToast(Context context, Toast toast) {
+        // Let the user know that they have to long press to add a widget
+        if (toast != null) {
+            toast.cancel();
+        }
+
+        CharSequence msg = Utilities.wrapForTts(
+                context.getText(R.string.long_press_widget_to_add),
+                context.getString(R.string.long_accessible_way_to_add));
+        toast = Toast.makeText(context, msg, Toast.LENGTH_SHORT);
+        toast.show();
+        return toast;
+    }
 }
-- 
GitLab


From 5278e85c4c207c937949cfb2cef99077475c8ce9 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Tue, 10 Nov 2020 10:39:54 -0800
Subject: [PATCH 0312/1664] People row text size fix

Change-Id: I912f8d41bf49215988f37a2405086bf4d737af99
---
 res/layout/search_result_people_item.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/layout/search_result_people_item.xml b/res/layout/search_result_people_item.xml
index a603941dfa..7526f6f10f 100644
--- a/res/layout/search_result_people_item.xml
+++ b/res/layout/search_result_people_item.xml
@@ -29,6 +29,7 @@
         android:layout_width="0dp"
         android:textColor="?android:attr/textColorPrimary"
         android:id="@+id/title"
+        android:textSize="@dimen/search_hero_title_size"
         android:layout_height="wrap_content"
         android:layout_weight="1" />
 
-- 
GitLab


From ae1997b9d51f996dff41bd792a33176a112b1ef2 Mon Sep 17 00:00:00 2001
From: Pinyao Ting <pinyaoting@google.com>
Date: Tue, 10 Nov 2020 16:53:25 -0800
Subject: [PATCH 0313/1664] Include more error logging for widget restore

Bug: 171774227
Test: manually tested complete backup & restore flow
Change-Id: Ieb4b39d80a24b4dff377ee74d24d9010acd0daca
---
 src/com/android/launcher3/Launcher.java         | 4 +++-
 src/com/android/launcher3/LauncherProvider.java | 6 ++++++
 src/com/android/launcher3/model/LoaderTask.java | 6 +++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index aa123f6b26..058eca8293 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2340,7 +2340,9 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
             if (item.restoreStatus == LauncherAppWidgetInfo.RESTORE_COMPLETED) {
                 // Verify that we own the widget
                 if (appWidgetInfo == null) {
-                    FileLog.e(TAG, "Removing invalid widget: id=" + item.appWidgetId);
+                    FileLog.e(TAG, "Removing invalid widget: id=" + item.appWidgetId
+                            + ",title=" + item.title
+                            + ",providerName=" + item.providerName.toShortString());
                     getModelWriter().deleteWidgetInfo(item, getAppWidgetHost());
                     return null;
                 }
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index aeed16aa28..6af248cd78 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -85,6 +85,7 @@ import java.util.Arrays;
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 public class LauncherProvider extends ContentProvider {
     private static final String TAG = "LauncherProvider";
@@ -931,6 +932,11 @@ public class LauncherProvider extends ContentProvider {
             final IntSet validWidgets = IntSet.wrap(LauncherDbUtils.queryIntArray(db,
                     Favorites.TABLE_NAME, Favorites.APPWIDGET_ID,
                     "itemType=" + Favorites.ITEM_TYPE_APPWIDGET, null, null));
+            final String allWidgetIds = Arrays.stream(allWidgets).mapToObj(String::valueOf)
+                    .collect(Collectors.joining(","));
+            final String validWidgetIds = validWidgets.getArray().toConcatString();
+            FileLog.d(TAG, "All widget ids: " + allWidgetIds);
+            FileLog.d(TAG, "Valid widget ids: " + validWidgetIds);
             for (int widgetId : allWidgets) {
                 if (!validWidgets.contains(widgetId)) {
                     try {
diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index b108788061..80a684d86e 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -745,7 +745,11 @@ public class LoaderTask implements Runnable {
                                             + "span=" + appWidgetInfo.spanX + "x"
                                             + appWidgetInfo.spanY + " minSpan="
                                             + widgetProviderInfo.minSpanX + "x"
-                                            + widgetProviderInfo.minSpanY);
+                                            + widgetProviderInfo.minSpanY
+                                            + ", appWidgetInfo.provider="
+                                            + appWidgetInfo.providerName.toShortString()
+                                            + ", widgetProviderInfo.provider="
+                                            + widgetProviderInfo.provider.toShortString());
                                     continue;
                                 }
                                 if (!c.isOnWorkspaceOrHotseat()) {
-- 
GitLab


From c25bc0335b29a0e36d5e8586cb61781e91aff36e Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Wed, 11 Nov 2020 10:24:34 -0600
Subject: [PATCH 0314/1664] Fix OutOfBounds issue on getFocusedChild

In cases where search only shows items that don't require focus highlighting,getFocusedChildIndex returns -1.

Bug: 13023194
Change-Id: I6145ae26e3953c5fc4fd1ed1696eb931017cac0f
---
 src/com/android/launcher3/allapps/AlphabeticalAppsList.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
index 354f97c0a9..f235199d12 100644
--- a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
+++ b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
@@ -132,7 +132,7 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
      * Returns the child adapter item with IME launch focus.
      */
     public AdapterItem getFocusedChild() {
-        if (mAdapterItems.size() == 0) {
+        if (mAdapterItems.size() == 0 || getFocusedChildIndex() != -1) {
             return null;
         }
         return mAdapterItems.get(getFocusedChildIndex());
-- 
GitLab


From 437513d5ef7ae1b57bb874e7225587b0cfdc48e3 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Wed, 11 Nov 2020 11:42:03 -0600
Subject: [PATCH 0315/1664] Federate SliveLiveData for Search results

Instead of every slice result creating its own live data, we should manage a single SliceLiveData per url that SliceViews can observe.

Bug: 173022319
Test: Manual
Change-Id: Ieaf599aadfac40450be4f39657d3cefb70644e0c
---
 .../allapps/search/LiveSearchManager.java     | 27 ++++++++++++++++++-
 .../views/SearchResultSettingsSlice.java      |  5 ++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/allapps/search/LiveSearchManager.java b/src/com/android/launcher3/allapps/search/LiveSearchManager.java
index e8a00d958a..ec33908c75 100644
--- a/src/com/android/launcher3/allapps/search/LiveSearchManager.java
+++ b/src/com/android/launcher3/allapps/search/LiveSearchManager.java
@@ -23,9 +23,14 @@ import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.ComponentName;
 import android.content.Context;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.UserHandle;
 
+import androidx.lifecycle.LiveData;
+import androidx.slice.Slice;
+import androidx.slice.widget.SliceLiveData;
+
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.util.ComponentKey;
@@ -42,7 +47,9 @@ public class LiveSearchManager {
 
     private final Launcher mLauncher;
     private final AppWidgetManager mAppWidgetManger;
-    private HashMap<ComponentKey, SearchWidgetInfoContainer> mWidgetPlaceholders = new HashMap<>();
+    private final HashMap<ComponentKey, SearchWidgetInfoContainer> mWidgetPlaceholders =
+            new HashMap<>();
+    private final HashMap<Uri, LiveData<Slice>> mUriSliceMap = new HashMap<>();
     private SearchWidgetHost mSearchWidgetHost;
 
     public LiveSearchManager(Launcher launcher) {
@@ -87,6 +94,20 @@ public class LiveSearchManager {
         return view;
     }
 
+    /**
+     * Creates {@link LiveData<Slice>} from Slice Uri. Caches created live data to be reused
+     * within the same search session. Removes previous observers when new SliceView request a
+     * live data for observation.
+     */
+    public LiveData<Slice> getSliceForUri(Uri sliceUri) {
+        LiveData<Slice> sliceLiveData = mUriSliceMap.getOrDefault(sliceUri, null);
+        if (sliceLiveData == null) {
+            sliceLiveData = SliceLiveData.fromUri(mLauncher, sliceUri);
+            mUriSliceMap.put(sliceUri, sliceLiveData);
+        }
+        return sliceLiveData;
+    }
+
     /**
      * Start search session
      */
@@ -109,6 +130,10 @@ public class LiveSearchManager {
             mWidgetPlaceholders.clear();
             mSearchWidgetHost = null;
         }
+        for (LiveData<Slice> liveData : mUriSliceMap.values()) {
+            liveData.removeObservers(mLauncher);
+        }
+        mUriSliceMap.clear();
     }
 
     static class SearchWidgetHost extends AppWidgetHost {
diff --git a/src/com/android/launcher3/views/SearchResultSettingsSlice.java b/src/com/android/launcher3/views/SearchResultSettingsSlice.java
index 2d726e79d4..29e6c1b8cf 100644
--- a/src/com/android/launcher3/views/SearchResultSettingsSlice.java
+++ b/src/com/android/launcher3/views/SearchResultSettingsSlice.java
@@ -28,7 +28,6 @@ import androidx.lifecycle.LiveData;
 import androidx.slice.Slice;
 import androidx.slice.SliceItem;
 import androidx.slice.widget.EventInfo;
-import androidx.slice.widget.SliceLiveData;
 import androidx.slice.widget.SliceView;
 
 import com.android.launcher3.Launcher;
@@ -54,7 +53,7 @@ public class SearchResultSettingsSlice extends LinearLayout implements
     private View mIcon;
     private LiveData<Slice> mSliceLiveData;
     private SearchTarget mSearchTarget;
-    private Launcher mLauncher;
+    private final Launcher mLauncher;
 
     public SearchResultSettingsSlice(Context context) {
         this(context, null, 0);
@@ -84,7 +83,7 @@ public class SearchResultSettingsSlice extends LinearLayout implements
         reset();
         mSearchTarget = searchTarget;
         try {
-            mSliceLiveData = SliceLiveData.fromUri(mLauncher, getSliceUri());
+            mSliceLiveData = mLauncher.getLiveSearchManager().getSliceForUri(getSliceUri());
             mSliceLiveData.observe(mLauncher, mSliceView);
         } catch (Exception ex) {
             Log.e(TAG, "unable to bind slice", ex);
-- 
GitLab


From af0391f9b25bcf7070b537b4e9cc95fcea8c441a Mon Sep 17 00:00:00 2001
From: Pinyao Ting <pinyaoting@google.com>
Date: Tue, 10 Nov 2020 16:53:25 -0800
Subject: [PATCH 0316/1664] Include more error logging for widget restore

Bug: 171774227
Test: manually tested complete backup & restore flow
Change-Id: Ieb4b39d80a24b4dff377ee74d24d9010acd0daca
(cherry picked from commit ae1997b9d51f996dff41bd792a33176a112b1ef2)
---
 src/com/android/launcher3/Launcher.java         | 4 +++-
 src/com/android/launcher3/LauncherProvider.java | 6 ++++++
 src/com/android/launcher3/model/LoaderTask.java | 6 +++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 699734c0c5..59365a55d4 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2330,7 +2330,9 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
             if (item.restoreStatus == LauncherAppWidgetInfo.RESTORE_COMPLETED) {
                 // Verify that we own the widget
                 if (appWidgetInfo == null) {
-                    FileLog.e(TAG, "Removing invalid widget: id=" + item.appWidgetId);
+                    FileLog.e(TAG, "Removing invalid widget: id=" + item.appWidgetId
+                            + ",title=" + item.title
+                            + ",providerName=" + item.providerName.toShortString());
                     getModelWriter().deleteWidgetInfo(item, getAppWidgetHost());
                     return null;
                 }
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index aeed16aa28..6af248cd78 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -85,6 +85,7 @@ import java.util.Arrays;
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 public class LauncherProvider extends ContentProvider {
     private static final String TAG = "LauncherProvider";
@@ -931,6 +932,11 @@ public class LauncherProvider extends ContentProvider {
             final IntSet validWidgets = IntSet.wrap(LauncherDbUtils.queryIntArray(db,
                     Favorites.TABLE_NAME, Favorites.APPWIDGET_ID,
                     "itemType=" + Favorites.ITEM_TYPE_APPWIDGET, null, null));
+            final String allWidgetIds = Arrays.stream(allWidgets).mapToObj(String::valueOf)
+                    .collect(Collectors.joining(","));
+            final String validWidgetIds = validWidgets.getArray().toConcatString();
+            FileLog.d(TAG, "All widget ids: " + allWidgetIds);
+            FileLog.d(TAG, "Valid widget ids: " + validWidgetIds);
             for (int widgetId : allWidgets) {
                 if (!validWidgets.contains(widgetId)) {
                     try {
diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index b108788061..80a684d86e 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -745,7 +745,11 @@ public class LoaderTask implements Runnable {
                                             + "span=" + appWidgetInfo.spanX + "x"
                                             + appWidgetInfo.spanY + " minSpan="
                                             + widgetProviderInfo.minSpanX + "x"
-                                            + widgetProviderInfo.minSpanY);
+                                            + widgetProviderInfo.minSpanY
+                                            + ", appWidgetInfo.provider="
+                                            + appWidgetInfo.providerName.toShortString()
+                                            + ", widgetProviderInfo.provider="
+                                            + widgetProviderInfo.provider.toShortString());
                                     continue;
                                 }
                                 if (!c.isOnWorkspaceOrHotseat()) {
-- 
GitLab


From 0112a3d4341f82269f6e5e4a4f2f10dd9b5cb59d Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 11 Nov 2020 12:20:59 -0800
Subject: [PATCH 0317/1664] Fixing animation cancelled not called if gesture
 was not initiated

Previously, in case of a tap in the gesture region, swipeHandler was not
explicitly cancelling the launcher state animation. It was getting reset
bucause launcher gets onStop immediately after that.
But in some cases, it may not get onStop (if the top activity finishes),
which leaves the Launcher UI in a broken state

Bug: 172842997
Change-Id: Iff7b1e5b8f67b2f4dd8096b88c4cd97115ec912a
---
 quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 041f67981d..5ba3f6a96d 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -123,7 +123,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         RecentsAnimationCallbacks.RecentsAnimationListener {
     private static final String TAG = "AbsSwipeUpHandler";
 
-    private static final String[] STATE_NAMES = DEBUG_STATES ? new String[16] : null;
+    private static final String[] STATE_NAMES = DEBUG_STATES ? new String[17] : null;
 
     protected final BaseActivityInterface<?, T> mActivityInterface;
     protected final InputConsumerProxy mInputConsumerProxy;
@@ -185,6 +185,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
             getFlagForIndex(14, "STATE_START_NEW_TASK");
     private static final int STATE_CURRENT_TASK_FINISHED =
             getFlagForIndex(15, "STATE_CURRENT_TASK_FINISHED");
+    private static final int STATE_FINISH_WITH_NO_END =
+            getFlagForIndex(16, "STATE_FINISH_WITH_NO_END");
 
     private static final int LAUNCHER_UI_STATES =
             STATE_LAUNCHER_PRESENT | STATE_LAUNCHER_DRAWN | STATE_LAUNCHER_STARTED;
@@ -306,6 +308,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                 this::invalidateHandlerWithLauncher);
         mStateCallback.runOnceAtState(STATE_HANDLER_INVALIDATED | STATE_RESUME_LAST_TASK,
                 this::notifyTransitionCancelled);
+        mStateCallback.runOnceAtState(STATE_HANDLER_INVALIDATED | STATE_FINISH_WITH_NO_END,
+                this::notifyTransitionCancelled);
 
         if (!ENABLE_QUICKSTEP_LIVE_TILE.get()) {
             mStateCallback.addChangeListener(STATE_APP_CONTROLLER_RECEIVED | STATE_LAUNCHER_PRESENT
@@ -1257,6 +1261,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         if (mGestureState.getEndTarget() != null && !mGestureState.isRunningAnimationToLauncher()) {
             cancelCurrentAnimation();
         } else {
+            mStateCallback.setStateOnUiThread(STATE_FINISH_WITH_NO_END);
             reset();
         }
     }
-- 
GitLab


From 986ea0da6037ed9f3c0e2dcba95358bad6ff7778 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 5 Nov 2020 17:07:35 -0800
Subject: [PATCH 0318/1664] Fixing Robolectic model tests

Some tests were broken because of refactoring in LauncherModel.

Change-Id: I55aa32d75a4d16338796a1b1765717fd72ba4b33
---
 .../launcher3/BaseQuickstepLauncher.java        |  4 +++-
 robolectric_tests/Android.mk                    |  2 +-
 .../folder/FolderNameProviderTest.java          | 12 +++++++++---
 .../android/launcher3/logging/FileLogTest.java  | 17 +++--------------
 .../model/ModelMultiCallbacksTest.java          |  6 ++++--
 .../secondarydisplay/SDWorkModeTest.java        |  5 +----
 .../launcher3/shadows/ShadowLooperExecutor.java | 11 +++++++++++
 .../launcher3/util/LauncherModelHelper.java     |  8 ++++++--
 8 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 456727c069..c724318c2d 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -326,6 +326,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
     @Override
     public void onAttachedToWindow() {
         super.onAttachedToWindow();
-        InteractionJankMonitorWrapper.init(getWindow().getDecorView());
+        if (Utilities.ATLEAST_R) {
+            InteractionJankMonitorWrapper.init(getWindow().getDecorView());
+        }
     }
 }
diff --git a/robolectric_tests/Android.mk b/robolectric_tests/Android.mk
index 3fa9b0ab63..836ded5d25 100644
--- a/robolectric_tests/Android.mk
+++ b/robolectric_tests/Android.mk
@@ -59,4 +59,4 @@ LOCAL_INSTRUMENT_SOURCE_DIRS := packages/apps/Launcher3/src
 
 LOCAL_ROBOTEST_TIMEOUT := 36000
 
-include prebuilts/misc/common/robolectric/4.3.1/run_robotests.mk
+include prebuilts/misc/common/robolectric/4.4/run_robotests.mk
diff --git a/robolectric_tests/src/com/android/launcher3/folder/FolderNameProviderTest.java b/robolectric_tests/src/com/android/launcher3/folder/FolderNameProviderTest.java
index b7ba10696f..2a94d9bc73 100644
--- a/robolectric_tests/src/com/android/launcher3/folder/FolderNameProviderTest.java
+++ b/robolectric_tests/src/com/android/launcher3/folder/FolderNameProviderTest.java
@@ -25,16 +25,20 @@ import android.os.UserHandle;
 
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.launcher3.util.Executors;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.LooperMode;
+import org.robolectric.annotation.LooperMode.Mode;
 
 import java.util.ArrayList;
 
 @RunWith(RobolectricTestRunner.class)
+@LooperMode(Mode.PAUSED)
 public final class FolderNameProviderTest {
     private Context mContext;
     private WorkspaceItemInfo mItem1;
@@ -58,18 +62,20 @@ public final class FolderNameProviderTest {
     }
 
     @Test
-    public void getSuggestedFolderName_workAssignedToEnd() {
+    public void getSuggestedFolderName_workAssignedToEnd() throws Exception {
         ArrayList<WorkspaceItemInfo> list = new ArrayList<>();
         list.add(mItem1);
         list.add(mItem2);
         FolderNameInfos nameInfos = new FolderNameInfos();
-        new FolderNameProvider().getSuggestedFolderName(mContext, list, nameInfos);
+        Executors.MODEL_EXECUTOR.submit(() ->
+                new FolderNameProvider().getSuggestedFolderName(mContext, list, nameInfos)).get();
         assertEquals("Work", nameInfos.getLabels()[0]);
 
         nameInfos.setLabel(0, "candidate1", 1.0f);
         nameInfos.setLabel(1, "candidate2", 1.0f);
         nameInfos.setLabel(2, "candidate3", 1.0f);
-        new FolderNameProvider().getSuggestedFolderName(mContext, list, nameInfos);
+        Executors.MODEL_EXECUTOR.submit(() ->
+                new FolderNameProvider().getSuggestedFolderName(mContext, list, nameInfos)).get();
         assertEquals("Work", nameInfos.getLabels()[3]);
         assertTrue(nameInfos.hasSuggestions());
         assertTrue(nameInfos.hasPrimary());
diff --git a/robolectric_tests/src/com/android/launcher3/logging/FileLogTest.java b/robolectric_tests/src/com/android/launcher3/logging/FileLogTest.java
index c892618a9d..01b23ba966 100644
--- a/robolectric_tests/src/com/android/launcher3/logging/FileLogTest.java
+++ b/robolectric_tests/src/com/android/launcher3/logging/FileLogTest.java
@@ -9,8 +9,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
-import org.robolectric.util.Scheduler;
+import org.robolectric.annotation.LooperMode;
+import org.robolectric.annotation.LooperMode.Mode;
 
 import java.io.File;
 import java.io.PrintWriter;
@@ -21,11 +21,10 @@ import java.util.Calendar;
  * Tests for {@link FileLog}
  */
 @RunWith(RobolectricTestRunner.class)
+@LooperMode(Mode.PAUSED)
 public class FileLogTest {
 
     private File mTempDir;
-    private boolean mTestActive;
-
     @Before
     public void setUp() {
         int count = 0;
@@ -35,14 +34,6 @@ public class FileLogTest {
         } while (!mTempDir.mkdir());
 
         FileLog.setDir(mTempDir);
-
-        mTestActive = true;
-        Scheduler scheduler = Shadows.shadowOf(FileLog.getHandler().getLooper()).getScheduler();
-        new Thread(() -> {
-            while (mTestActive) {
-                scheduler.advanceToLastPostedRunnable();
-            }
-        }).start();
     }
 
     @After
@@ -52,8 +43,6 @@ public class FileLogTest {
             new File(mTempDir, "log-" + i).delete();
         }
         mTempDir.delete();
-
-        mTestActive = false;
     }
 
     @Test
diff --git a/robolectric_tests/src/com/android/launcher3/model/ModelMultiCallbacksTest.java b/robolectric_tests/src/com/android/launcher3/model/ModelMultiCallbacksTest.java
index 87fe3c086b..aab6c25f1c 100644
--- a/robolectric_tests/src/com/android/launcher3/model/ModelMultiCallbacksTest.java
+++ b/robolectric_tests/src/com/android/launcher3/model/ModelMultiCallbacksTest.java
@@ -30,6 +30,7 @@ import com.android.launcher3.PagedView;
 import com.android.launcher3.model.BgDataModel.Callbacks;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.shadows.ShadowLooperExecutor;
 import com.android.launcher3.util.Executors;
 import com.android.launcher3.util.LauncherLayoutBuilder;
 import com.android.launcher3.util.LauncherModelHelper;
@@ -43,8 +44,8 @@ import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.LooperMode;
 import org.robolectric.annotation.LooperMode.Mode;
+import org.robolectric.shadow.api.Shadow;
 import org.robolectric.shadows.ShadowPackageManager;
-import org.robolectric.util.ReflectionHelpers;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -74,7 +75,8 @@ public class ModelMultiCallbacksTest {
         // Since robolectric tests run on main thread, we run the loader-UI calls on a temp thread,
         // so that we can wait appropriately for the loader to complete.
         mTempMainExecutor = new LooperExecutor(createAndStartNewForegroundLooper("tempMain"));
-        ReflectionHelpers.setField(mModelHelper.getModel(), "mMainExecutor", mTempMainExecutor);
+        ShadowLooperExecutor sle = Shadow.extract(Executors.MAIN_EXECUTOR);
+        sle.setHandler(mTempMainExecutor.getHandler());
     }
 
     @Test
diff --git a/robolectric_tests/src/com/android/launcher3/secondarydisplay/SDWorkModeTest.java b/robolectric_tests/src/com/android/launcher3/secondarydisplay/SDWorkModeTest.java
index baae2a6a80..e3694aeddc 100644
--- a/robolectric_tests/src/com/android/launcher3/secondarydisplay/SDWorkModeTest.java
+++ b/robolectric_tests/src/com/android/launcher3/secondarydisplay/SDWorkModeTest.java
@@ -59,8 +59,6 @@ public class SDWorkModeTest {
     private InvariantDeviceProfile mIdp;
     private LauncherModelHelper mModelHelper;
 
-    private LauncherLayoutBuilder mLayoutBuilder;
-
     @Before
     public void setup() throws Exception {
         mModelHelper = new LauncherModelHelper();
@@ -70,7 +68,6 @@ public class SDWorkModeTest {
                 Settings.Global.WINDOW_ANIMATION_SCALE, 0);
 
         mModelHelper.installApp(TEST_PACKAGE);
-        mLayoutBuilder = new LauncherLayoutBuilder();
     }
 
     @Test
@@ -86,7 +83,7 @@ public class SDWorkModeTest {
     public void testAllAppsList_workProfile() throws Exception {
         ShadowUserManager sum = Shadow.extract(mTargetContext.getSystemService(UserManager.class));
         sum.addUser(SYSTEM_USER, "me", FLAG_SYSTEM);
-        sum.addUser(WORK_PROFILE_ID, "work", FLAG_PROFILE);
+        sum.addProfile(SYSTEM_USER, WORK_PROFILE_ID, "work", FLAG_PROFILE);
 
         SecondaryDisplayLauncher launcher = loadLauncher();
         launcher.showAppDrawer(true);
diff --git a/robolectric_tests/src/com/android/launcher3/shadows/ShadowLooperExecutor.java b/robolectric_tests/src/com/android/launcher3/shadows/ShadowLooperExecutor.java
index a3b7dc706f..57eda7eae8 100644
--- a/robolectric_tests/src/com/android/launcher3/shadows/ShadowLooperExecutor.java
+++ b/robolectric_tests/src/com/android/launcher3/shadows/ShadowLooperExecutor.java
@@ -23,6 +23,8 @@ import static org.robolectric.util.ReflectionHelpers.setField;
 
 import android.os.Handler;
 
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.util.LooperExecutor;
 
 import org.robolectric.annotation.Implementation;
@@ -37,8 +39,13 @@ public class ShadowLooperExecutor {
 
     @RealObject private LooperExecutor mRealExecutor;
 
+    private Handler mOverriddenHandler;
+
     @Implementation
     protected Handler getHandler() {
+        if (mOverriddenHandler != null) {
+            return mOverriddenHandler;
+        }
         Handler handler = directlyOn(mRealExecutor, LooperExecutor.class, "getHandler");
         Thread thread = handler.getLooper().getThread();
         if (!thread.isAlive()) {
@@ -49,4 +56,8 @@ public class ShadowLooperExecutor {
         }
         return directlyOn(mRealExecutor, LooperExecutor.class, "getHandler");
     }
+
+    public void setHandler(@Nullable Handler handler) {
+        mOverriddenHandler = handler;
+    }
 }
diff --git a/robolectric_tests/src/com/android/launcher3/util/LauncherModelHelper.java b/robolectric_tests/src/com/android/launcher3/util/LauncherModelHelper.java
index f2b3071c95..849f98b8ff 100644
--- a/robolectric_tests/src/com/android/launcher3/util/LauncherModelHelper.java
+++ b/robolectric_tests/src/com/android/launcher3/util/LauncherModelHelper.java
@@ -48,10 +48,12 @@ import com.android.launcher3.model.BgDataModel.Callbacks;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.pm.UserCache;
+import com.android.launcher3.shadows.ShadowLooperExecutor;
 
 import org.mockito.ArgumentCaptor;
 import org.robolectric.Robolectric;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadow.api.Shadow;
 import org.robolectric.shadows.ShadowContentResolver;
 import org.robolectric.shadows.ShadowPackageManager;
 import org.robolectric.util.ReflectionHelpers;
@@ -403,14 +405,16 @@ public class LauncherModelHelper {
     public void loadModelSync() throws ExecutionException, InterruptedException {
         // Since robolectric tests run on main thread, we run the loader-UI calls on a temp thread,
         // so that we can wait appropriately for the loader to complete.
-        ReflectionHelpers.setField(getModel(), "mMainExecutor", Executors.UI_HELPER_EXECUTOR);
+        ShadowLooperExecutor sle = Shadow.extract(Executors.MAIN_EXECUTOR);
+        sle.setHandler(Executors.UI_HELPER_EXECUTOR.getHandler());
 
         Callbacks mockCb = mock(Callbacks.class);
         getModel().addCallbacksAndLoad(mockCb);
 
         Executors.MODEL_EXECUTOR.submit(() -> { }).get();
         Executors.UI_HELPER_EXECUTOR.submit(() -> { }).get();
-        ReflectionHelpers.setField(getModel(), "mMainExecutor", Executors.MAIN_EXECUTOR);
+
+        sle.setHandler(null);
         getModel().removeCallbacks(mockCb);
     }
 
-- 
GitLab


From 7bbec50031ed4f482d615e9516ec5be5432cb565 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Thu, 29 Oct 2020 11:39:24 -0400
Subject: [PATCH 0319/1664] Fix AllAppsSearchPlugin icon redrawing without
 special-casing.

Preventing icon animations in deep shortcuts fixed the icon redrawing issue in the all apps search page, however other icons could still be redrawn, yet could not be special-cased without removing icon update animations altogether. Added logic to only animate icon updates outside of the all apps search page.

Demo: https://drive.google.com/file/d/1ReT2O_1tV20terY0Jr1NJGxIxPblHCK4/view?usp=sharing

Change-Id: Ibe0b43801ec5340c3551125aef13170d569d2c55
---
 src/com/android/launcher3/BubbleTextView.java | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 5cd63721d3..3eb52adf1a 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -171,6 +171,8 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
 
     private IconLoadRequest mIconLoadRequest;
 
+    private boolean mEnableIconUpdateAnimation = false;
+
     public BubbleTextView(Context context) {
         this(context, null, 0);
     }
@@ -697,6 +699,10 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         applyCompoundDrawables(icon);
     }
 
+    protected boolean iconUpdateAnimationEnabled() {
+        return mEnableIconUpdateAnimation;
+    }
+
     protected void applyCompoundDrawables(Drawable icon) {
         // If we had already set an icon before, disable relayout as the icon size is the
         // same as before.
@@ -706,13 +712,10 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
 
         updateIcon(icon);
 
-        ItemInfo itemInfo = (ItemInfo) getTag();
-
         // If the current icon is a placeholder color, animate its update.
         if (mIcon != null
                 && mIcon instanceof PlaceHolderIconDrawable
-                && (itemInfo == null
-                    || itemInfo.itemType != LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT)) {
+                && iconUpdateAnimationEnabled()) {
             animateIconUpdate((PlaceHolderIconDrawable) mIcon, icon);
         }
 
@@ -734,6 +737,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         if (getTag() == info) {
             mIconLoadRequest = null;
             mDisableRelayout = true;
+            mEnableIconUpdateAnimation = true;
 
             // Optimization: Starting in N, pre-uploads the bitmap to RenderThread.
             info.bitmap.icon.prepareToDraw();
@@ -750,6 +754,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
             }
 
             mDisableRelayout = false;
+            mEnableIconUpdateAnimation = false;
         }
     }
 
-- 
GitLab


From 64154ead741628755b08395b5403e4c0da9735d8 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Fri, 6 Nov 2020 13:09:09 -0500
Subject: [PATCH 0320/1664] Fix hotseat predicted app update regression.

Hotseat predicted app updates were only being allowed then the hotseat was invisible or when the workspace was loading. This was too strict. Changed the logic to ignore hotseat visibility when the workspace is loading, when there are empty spots in the hotseat and when the predicted items are unchanged. This ensures the hotseat always has the intended number of icons and that icons can be updated in-place.

Fixes: 172597819

Demo: https://drive.google.com/file/d/100svnqX048Da7vues2p-vvQNN6sIF8v4/view?usp=sharing
Change-Id: I2f93ff44618c0282a6411918c34d70f75ec73b73
---
 .../launcher3/hybridhotseat/HotseatPredictionController.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
index d3b7e22299..4953138bee 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
@@ -251,7 +251,10 @@ public class HotseatPredictionController implements DragController.DragListener,
      * Sets or updates the predicted items
      */
     public void setPredictedItems(FixedContainerItems items) {
-        if (!mLauncher.isWorkspaceLoading()
+        boolean shouldIgnoreVisibility = mLauncher.isWorkspaceLoading()
+                || mPredictedItems.equals(items.items)
+                || mHotseat.getShortcutsAndWidgets().getChildCount() < mHotSeatItemsCount;
+        if (!shouldIgnoreVisibility
                 && mHotseat.isShown()
                 && mHotseat.getWindowVisibility() == View.VISIBLE) {
             mHotseat.setOnVisibilityAggregatedCallback((isVisible) -> {
-- 
GitLab


From 4dd0fb173bde07fd057bc1f9fdf89417ddaec148 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Wed, 11 Nov 2020 19:25:09 -0800
Subject: [PATCH 0321/1664] Removing blocking call during
 cuj_LAUNCHER_APP_LAUNCH_FROM_ICON

This is a part of Blue Chip de-janking effort and is
a P0 item in our CUJ list.

In the last frame of the app-open animation, we have
a
android.view.IRemoteAnimationFinishedCallback$Stub$Proxy.onAnimationFinished call
which is blocking and prone to lock contention in WindowManager.

Moving the call to after the animation.

Bug: 173072373
Change-Id: If5eb6469900d1892b861eda6d6b4807d90630b6b
---
 .../src/com/android/launcher3/LauncherAnimationRunner.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
index 75355c9b4e..069fe2dcd1 100644
--- a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
+++ b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
@@ -17,6 +17,7 @@ package com.android.launcher3;
 
 import static com.android.launcher3.Utilities.postAsyncCallback;
 import static com.android.launcher3.util.DisplayController.getSingleFrameMs;
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.systemui.shared.recents.utilities.Utilities.postAtFrontOfQueueAsynchronously;
 
 import android.animation.Animator;
@@ -62,7 +63,7 @@ public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCo
         Runnable r = () -> {
             finishExistingAnimation();
             mAnimationResult = new AnimationResult(() -> {
-                runnable.run();
+                UI_HELPER_EXECUTOR.execute(runnable);
                 mAnimationResult = null;
             });
             onCreateAnimation(appTargets, wallpaperTargets, mAnimationResult);
-- 
GitLab


From 2c86122fa4fed91a02faad25dd40b2da31766d1d Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Wed, 11 Nov 2020 09:48:24 -0600
Subject: [PATCH 0322/1664] Resolve auto close on widget swipe

Bug: 172891360
Test: Manual
Change-Id: Icb384b6dc5ec9a29b6a9a7811b862a2d83ca11a7
(cherry picked from commit 5fa6f3ce503cde51687985ebc9dee6f163b9b1ea)
---
 .../launcher3/allapps/AlphabeticalAppsList.java        |  2 +-
 .../android/launcher3/views/SearchResultWidget.java    | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
index f235199d12..1dc10fea1f 100644
--- a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
+++ b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
@@ -132,7 +132,7 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
      * Returns the child adapter item with IME launch focus.
      */
     public AdapterItem getFocusedChild() {
-        if (mAdapterItems.size() == 0 || getFocusedChildIndex() != -1) {
+        if (mAdapterItems.size() == 0 || getFocusedChildIndex() == -1) {
             return null;
         }
         return mAdapterItems.get(getFocusedChildIndex());
diff --git a/src/com/android/launcher3/views/SearchResultWidget.java b/src/com/android/launcher3/views/SearchResultWidget.java
index 7d539553f0..f76de3d2cf 100644
--- a/src/com/android/launcher3/views/SearchResultWidget.java
+++ b/src/com/android/launcher3/views/SearchResultWidget.java
@@ -150,12 +150,14 @@ public class SearchResultWidget extends RelativeLayout implements
     public boolean onInterceptTouchEvent(MotionEvent ev) {
         mLongPressHelper.onTouchEvent(ev);
         mClickDetector.onTouchEvent(ev);
-        if (ev.getAction() == MotionEvent.ACTION_UP && !mLongPressHelper.hasPerformedLongPress()) {
-            handleSelection(SearchTargetEvent.CHILD_SELECT);
-        }
-        return super.onInterceptTouchEvent(ev);
+        return mLongPressHelper.hasPerformedLongPress();
     }
 
+    @Override
+    public boolean onTouchEvent(MotionEvent ev) {
+        mLongPressHelper.onTouchEvent(ev);
+        return true;
+    }
 
     @Override
     public void cancelLongPress() {
-- 
GitLab


From 0da8d424e81ad74cccaac3b4ec442539fce3bfb8 Mon Sep 17 00:00:00 2001
From: Sreyas <sreyasr@google.com>
Date: Fri, 28 Aug 2020 10:59:00 -0700
Subject: [PATCH 0323/1664] Make modal based UI changes in TaskView only if
 modalness changes.

Fixes issue with jittery displaying of suggestion chip, when entering overview.
Merging into master manually as automerger failed.
Tested:Manual

Change-Id: I8228c51b22d550cb8f0aa559f997060b571763f1
(cherry picked from commit ed5e43bd254eb3434a4f5bb20ad07168e6e374d5)
---
 quickstep/src/com/android/quickstep/views/TaskView.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 8440391f4a..323034898d 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -323,6 +323,9 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
      * @param modalness [0, 1] 0 being in context with other tasks, 1 being shown on its own.
      */
     public void setModalness(float modalness) {
+        if (mModalness == modalness) {
+            return;
+        }
         mModalness = modalness;
         mIconView.setAlpha(comp(modalness));
         if (mContextualChip != null) {
-- 
GitLab


From ce7f9f2ae1ed241a7f6c2d4453c136a77b615e9c Mon Sep 17 00:00:00 2001
From: John Li <lijohn@google.com>
Date: Fri, 25 Sep 2020 18:48:52 +0800
Subject: [PATCH 0324/1664] Haptic effect on alphabetical scroll in Pixel
 Launcher

Bug: 169397156
Test: manual
Change-Id: Id0c51ac9e9ca7d0f3aaf9b490874de6ee0e97a28
---
 src/com/android/launcher3/views/RecyclerViewFastScroller.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/android/launcher3/views/RecyclerViewFastScroller.java b/src/com/android/launcher3/views/RecyclerViewFastScroller.java
index 6a8333233c..804fb3e68e 100644
--- a/src/com/android/launcher3/views/RecyclerViewFastScroller.java
+++ b/src/com/android/launcher3/views/RecyclerViewFastScroller.java
@@ -16,6 +16,8 @@
 
 package com.android.launcher3.views;
 
+import static android.view.HapticFeedbackConstants.CLOCK_TICK;
+
 import android.animation.ObjectAnimator;
 import android.content.Context;
 import android.content.res.Resources;
@@ -288,6 +290,7 @@ public class RecyclerViewFastScroller extends View {
         if (!sectionName.equals(mPopupSectionName)) {
             mPopupSectionName = sectionName;
             mPopupView.setText(sectionName);
+            performHapticFeedback(CLOCK_TICK);
         }
         animatePopupVisibility(!sectionName.isEmpty());
         mLastTouchY = boundedY;
-- 
GitLab


From 3751be0f1cf608ce8384ef1efcd1bf6cb554ef15 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 13 Nov 2020 13:48:51 -0800
Subject: [PATCH 0325/1664] Removing obsolete shadows

Change-Id: I9dcaa69e4e86130642be15e3585f5898dd866839
---
 .../config/robolectric.properties             |  5 --
 .../launcher3/model/BackupRestoreTest.java    |  4 +-
 .../LShadowApplicationPackageManager.java     | 36 ------------
 .../launcher3/shadows/LShadowBitmap.java      | 36 ------------
 .../launcher3/shadows/LShadowTypeface.java    | 38 -------------
 .../launcher3/shadows/LShadowUserManager.java | 53 ------------------
 .../shadows/LShadowWallpaperManager.java      | 56 -------------------
 .../util/LauncherTestApplication.java         |  4 --
 8 files changed, 2 insertions(+), 230 deletions(-)
 delete mode 100644 robolectric_tests/src/com/android/launcher3/shadows/LShadowApplicationPackageManager.java
 delete mode 100644 robolectric_tests/src/com/android/launcher3/shadows/LShadowBitmap.java
 delete mode 100644 robolectric_tests/src/com/android/launcher3/shadows/LShadowTypeface.java
 delete mode 100644 robolectric_tests/src/com/android/launcher3/shadows/LShadowUserManager.java
 delete mode 100644 robolectric_tests/src/com/android/launcher3/shadows/LShadowWallpaperManager.java

diff --git a/robolectric_tests/config/robolectric.properties b/robolectric_tests/config/robolectric.properties
index a8e0cb3acd..4e811f36ff 100644
--- a/robolectric_tests/config/robolectric.properties
+++ b/robolectric_tests/config/robolectric.properties
@@ -1,15 +1,10 @@
 sdk=29
 shadows= \
-    com.android.launcher3.shadows.LShadowApplicationPackageManager \
     com.android.launcher3.shadows.LShadowAppPredictionManager \
     com.android.launcher3.shadows.LShadowAppWidgetManager \
     com.android.launcher3.shadows.LShadowBackupManager \
-    com.android.launcher3.shadows.LShadowBitmap \
     com.android.launcher3.shadows.LShadowDisplay \
     com.android.launcher3.shadows.LShadowLauncherApps \
-    com.android.launcher3.shadows.LShadowTypeface \
-    com.android.launcher3.shadows.LShadowUserManager \
-    com.android.launcher3.shadows.LShadowWallpaperManager \
     com.android.launcher3.shadows.ShadowDeviceFlag \
     com.android.launcher3.shadows.ShadowLooperExecutor \
     com.android.launcher3.shadows.ShadowMainThreadInitializedObject \
diff --git a/robolectric_tests/src/com/android/launcher3/model/BackupRestoreTest.java b/robolectric_tests/src/com/android/launcher3/model/BackupRestoreTest.java
index 90313abe1d..8baf5a3f27 100644
--- a/robolectric_tests/src/com/android/launcher3/model/BackupRestoreTest.java
+++ b/robolectric_tests/src/com/android/launcher3/model/BackupRestoreTest.java
@@ -41,7 +41,6 @@ import android.os.UserManager;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.provider.RestoreDbTask;
 import com.android.launcher3.shadows.LShadowBackupManager;
-import com.android.launcher3.shadows.LShadowUserManager;
 import com.android.launcher3.util.LauncherModelHelper;
 
 import org.junit.Before;
@@ -51,6 +50,7 @@ import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.LooperMode;
 import org.robolectric.shadow.api.Shadow;
+import org.robolectric.shadows.ShadowUserManager;
 
 /**
  * Tests to verify backup and restore flow.
@@ -68,7 +68,7 @@ public class BackupRestoreTest {
     private static final int FLAG_SYSTEM = 0x00000800;
     private static final int FLAG_PROFILE = 0x00001000;
 
-    private LShadowUserManager mUserManager;
+    private ShadowUserManager mUserManager;
     private BackupManager mBackupManager;
     private LauncherModelHelper mModelHelper;
     private SQLiteDatabase mDb;
diff --git a/robolectric_tests/src/com/android/launcher3/shadows/LShadowApplicationPackageManager.java b/robolectric_tests/src/com/android/launcher3/shadows/LShadowApplicationPackageManager.java
deleted file mode 100644
index da8b91986f..0000000000
--- a/robolectric_tests/src/com/android/launcher3/shadows/LShadowApplicationPackageManager.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.shadows;
-
-import android.os.Process;
-import android.os.UserHandle;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.shadows.ShadowApplicationPackageManager;
-
-/**
- * Shadow for {@link ShadowApplicationPackageManager} which create mock predictors
- */
-@Implements(className = "android.app.ApplicationPackageManager")
-public class LShadowApplicationPackageManager extends ShadowApplicationPackageManager {
-
-    @Implementation
-    public CharSequence getUserBadgedLabel(CharSequence label, UserHandle user) {
-        return Process.myUserHandle().equals(user) ? label : "Work " + label;
-    }
-}
diff --git a/robolectric_tests/src/com/android/launcher3/shadows/LShadowBitmap.java b/robolectric_tests/src/com/android/launcher3/shadows/LShadowBitmap.java
deleted file mode 100644
index abd90bb8f6..0000000000
--- a/robolectric_tests/src/com/android/launcher3/shadows/LShadowBitmap.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.shadows;
-
-import android.graphics.Bitmap;
-import android.graphics.Paint;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.shadows.ShadowBitmap;
-
-/**
- * Extension of {@link ShadowBitmap} with missing shadow methods
- */
-@Implements(value = Bitmap.class)
-public class LShadowBitmap extends ShadowBitmap {
-
-    @Implementation
-    protected Bitmap extractAlpha(Paint paint, int[] offsetXY) {
-        return extractAlpha();
-    }
-}
diff --git a/robolectric_tests/src/com/android/launcher3/shadows/LShadowTypeface.java b/robolectric_tests/src/com/android/launcher3/shadows/LShadowTypeface.java
deleted file mode 100644
index 0e7c1deba0..0000000000
--- a/robolectric_tests/src/com/android/launcher3/shadows/LShadowTypeface.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.shadows;
-
-import android.graphics.Typeface;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.shadows.ShadowTypeface;
-
-/**
- * Extension of {@link ShadowTypeface} with missing shadow methods
- */
-@Implements(Typeface.class)
-public class LShadowTypeface extends ShadowTypeface {
-
-    @Implementation
-    public static Typeface create(Typeface family, int weight, boolean italic) {
-        int style = italic ? Typeface.ITALIC : Typeface.NORMAL;
-        if (weight >= 400) {
-            style |= Typeface.BOLD;
-        }
-        return create(family, style);
-    }
-}
diff --git a/robolectric_tests/src/com/android/launcher3/shadows/LShadowUserManager.java b/robolectric_tests/src/com/android/launcher3/shadows/LShadowUserManager.java
deleted file mode 100644
index edf8edbb43..0000000000
--- a/robolectric_tests/src/com/android/launcher3/shadows/LShadowUserManager.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.shadows;
-
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.util.SparseBooleanArray;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.shadows.ShadowUserManager;
-
-/**
- * Extension of {@link ShadowUserManager} with missing shadow methods
- */
-@Implements(value = UserManager.class)
-public class LShadowUserManager extends ShadowUserManager {
-
-    private final SparseBooleanArray mQuietUsers = new SparseBooleanArray();
-    private final SparseBooleanArray mLockedUsers = new SparseBooleanArray();
-
-    @Implementation
-    protected boolean isQuietModeEnabled(UserHandle userHandle) {
-        return mQuietUsers.get(userHandle.hashCode());
-    }
-
-    public void setQuietModeEnabled(UserHandle userHandle, boolean enabled) {
-        mQuietUsers.put(userHandle.hashCode(), enabled);
-    }
-
-    @Implementation
-    protected boolean isUserUnlocked(UserHandle userHandle) {
-        return !mLockedUsers.get(userHandle.hashCode());
-    }
-
-    public void setUserLocked(UserHandle userHandle, boolean enabled) {
-        mLockedUsers.put(userHandle.hashCode(), enabled);
-    }
-}
diff --git a/robolectric_tests/src/com/android/launcher3/shadows/LShadowWallpaperManager.java b/robolectric_tests/src/com/android/launcher3/shadows/LShadowWallpaperManager.java
deleted file mode 100644
index d60251c901..0000000000
--- a/robolectric_tests/src/com/android/launcher3/shadows/LShadowWallpaperManager.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.shadows;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-
-import android.app.WallpaperManager;
-import android.content.Context;
-
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.shadows.ShadowUserManager;
-import org.robolectric.shadows.ShadowWallpaperManager;
-
-/**
- * Extension of {@link ShadowUserManager} with missing shadow methods
- */
-@Implements(WallpaperManager.class)
-public class LShadowWallpaperManager extends ShadowWallpaperManager {
-
-    @Implementation
-    protected static WallpaperManager getInstance(Context context) {
-        return context.getSystemService(WallpaperManager.class);
-    }
-
-    /**
-     * Remove this once the fix for
-     * https://github.com/robolectric/robolectric/issues/5285
-     * is available
-     */
-    public static void initializeMock() {
-        WallpaperManager wm = mock(WallpaperManager.class);
-        ShadowApplication shadowApplication = Shadows.shadowOf(RuntimeEnvironment.application);
-        shadowApplication.setSystemService(Context.WALLPAPER_SERVICE, wm);
-        doReturn(0).when(wm).getDesiredMinimumWidth();
-        doReturn(0).when(wm).getDesiredMinimumHeight();
-    }
-}
diff --git a/robolectric_tests/src/com/android/launcher3/util/LauncherTestApplication.java b/robolectric_tests/src/com/android/launcher3/util/LauncherTestApplication.java
index 6dd4df8377..efac15098c 100644
--- a/robolectric_tests/src/com/android/launcher3/util/LauncherTestApplication.java
+++ b/robolectric_tests/src/com/android/launcher3/util/LauncherTestApplication.java
@@ -19,7 +19,6 @@ import static org.mockito.Mockito.mock;
 
 import android.app.Application;
 
-import com.android.launcher3.shadows.LShadowWallpaperManager;
 import com.android.launcher3.shadows.ShadowMainThreadInitializedObject;
 import com.android.launcher3.shadows.ShadowOverrides;
 import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
@@ -37,9 +36,6 @@ public class LauncherTestApplication extends Application implements TestLifecycl
 
         // Disable plugins
         PluginManagerWrapper.INSTANCE.initializeForTesting(mock(PluginManagerWrapper.class));
-
-        // Initialize mock wallpaper manager
-        LShadowWallpaperManager.initializeMock();
     }
 
     @Override
-- 
GitLab


From d41dfd3288c3bd2d833a7c103524b976d70d74dd Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Thu, 19 Nov 2020 12:54:46 -0600
Subject: [PATCH 0326/1664] hide app results if app info can't be found

Bug: 173673806
Change-Id: I337912a354ba4374240c4be1c3f2595c4228ec74
---
 src/com/android/launcher3/views/SearchResultIcon.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/com/android/launcher3/views/SearchResultIcon.java b/src/com/android/launcher3/views/SearchResultIcon.java
index 51c741b342..9bcfb8c6eb 100644
--- a/src/com/android/launcher3/views/SearchResultIcon.java
+++ b/src/com/android/launcher3/views/SearchResultIcon.java
@@ -111,6 +111,7 @@ public class SearchResultIcon extends BubbleTextView implements
     public void applySearchTarget(SearchTarget searchTarget) {
         mSearchTarget = searchTarget;
         SearchEventTracker.getInstance(getContext()).registerWeakHandler(mSearchTarget, this);
+        setVisibility(VISIBLE);
         switch (searchTarget.getItemType()) {
             case TARGET_TYPE_APP:
             case TARGET_TYPE_HERO_APP:
@@ -131,6 +132,10 @@ public class SearchResultIcon extends BubbleTextView implements
     private void prepareUsingApp(ComponentName componentName, UserHandle userHandle) {
         AllAppsStore appsStore = mLauncher.getAppsView().getAppsStore();
         AppInfo appInfo = appsStore.getApp(new ComponentKey(componentName, userHandle));
+        if (appInfo == null) {
+            setVisibility(GONE);
+            return;
+        }
         applyFromApplicationInfo(appInfo);
         notifyItemInfoChanged(appInfo);
     }
-- 
GitLab


From daa731f1fe79ca55ffbf75c92f9a90aa332e7be0 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Tue, 17 Nov 2020 10:26:22 -0800
Subject: [PATCH 0327/1664] Removing binder call from the gesture injection

This causes jank under lock contention stress.

Test: local
Bug: 173072373
Change-Id: I3a44e510254f6d651cedb91f72e1789ae97d9b67
---
 .../com/android/launcher3/tapl/LauncherInstrumentation.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 22833ec16d..3c89cfd14b 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -105,6 +105,7 @@ public final class LauncherInstrumentation {
     static final Pattern EVENT_TOUCH_DOWN_TIS = getTouchEventPatternTIS("ACTION_DOWN");
     static final Pattern EVENT_TOUCH_UP_TIS = getTouchEventPatternTIS("ACTION_UP");
     private final String mLauncherPackage;
+    private final boolean mIsLauncher3;
 
     // Types for launcher containers that the user is interacting with. "Background" is a
     // pseudo-container corresponding to inactive launcher covered by another app.
@@ -205,6 +206,7 @@ public final class LauncherInstrumentation {
     public LauncherInstrumentation(Instrumentation instrumentation) {
         mInstrumentation = instrumentation;
         mDevice = UiDevice.getInstance(instrumentation);
+        mIsLauncher3 = "com.android.launcher3".equals(getLauncherPackageName());
 
         // Launcher should run in test harness so that custom accessibility protocol between
         // Launcher and TAPL is enabled. In-process tests enable this protocol with a direct call
@@ -1396,7 +1398,7 @@ public final class LauncherInstrumentation {
     }
 
     boolean isLauncher3() {
-        return "com.android.launcher3".equals(getLauncherPackageName());
+        return mIsLauncher3;
     }
 
     void expectEvent(String sequence, Pattern expected) {
-- 
GitLab


From e5d2ad8e34027476a6a2ded5c2733ec3b765ee2f Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Mon, 16 Nov 2020 11:14:55 -0600
Subject: [PATCH 0328/1664] Even more logs for flaky work test

Bug: 159671700
Change-Id: I009f243b5e3076d15bc89a4755d5ddb9a5b3119e
---
 .../com/android/launcher3/ui/WorkTabTest.java  | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/tests/src/com/android/launcher3/ui/WorkTabTest.java b/tests/src/com/android/launcher3/ui/WorkTabTest.java
index df0770d931..1e1cf04dfd 100644
--- a/tests/src/com/android/launcher3/ui/WorkTabTest.java
+++ b/tests/src/com/android/launcher3/ui/WorkTabTest.java
@@ -45,6 +45,7 @@ import org.junit.runner.RunWith;
 
 import java.util.List;
 import java.util.Objects;
+import java.util.concurrent.atomic.AtomicInteger;
 
 @LargeTest
 @RunWith(AndroidJUnit4.class)
@@ -71,7 +72,8 @@ public class WorkTabTest extends AbstractLauncherUiTest {
 
     @After
     public void removeWorkProfile() throws Exception {
-        Log.d(TestProtocol.WORK_PROFILE_REMOVED, "(teardown) removing uid" + mProfileUserId);
+        Log.d(TestProtocol.WORK_PROFILE_REMOVED, "(teardown) removing uid" + mProfileUserId,
+                new Exception());
         mDevice.executeShellCommand("pm remove-user " + mProfileUserId);
     }
 
@@ -142,12 +144,16 @@ public class WorkTabTest extends AbstractLauncherUiTest {
                 "work profile status (" + mProfileUserId + ") :"
                         + launcher.getAppsView().isWorkTabVisible()));
 
+        AtomicInteger attempt = new AtomicInteger(0);
         // verify work edu is seen next
-        waitForLauncherCondition("Launcher did not show the next edu screen", l ->
-                ((AllAppsPagedView) l.getAppsView().getContentView()).getCurrentPage() == WORK_PAGE
-                        && ((TextView) workEduView.findViewById(
-                        R.id.content_text)).getText().equals(
-                        l.getResources().getString(R.string.work_profile_edu_work_apps)));
+        waitForLauncherCondition("Launcher did not show the next edu screen", l -> {
+            Log.d(TestProtocol.WORK_PROFILE_REMOVED,
+                    "running test attempt" + attempt.getAndIncrement());
+            return ((AllAppsPagedView) l.getAppsView().getContentView()).getCurrentPage()
+                    == WORK_PAGE && ((TextView) workEduView.findViewById(
+                    R.id.content_text)).getText().equals(
+                    l.getResources().getString(R.string.work_profile_edu_work_apps));
+        });
     }
 
     @Test
-- 
GitLab


From 6c1fa64a1dd64407644b4138cc5c0f426a3f4421 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Fri, 20 Nov 2020 15:43:02 -0800
Subject: [PATCH 0329/1664] Fixing jank in launching app from recents

Moving expensive actions from the last
frame's rendering.

This reduces the max frame time from > 16 ms
to <= 8 ms, which is good for now.

Test: Trace, metrics
Bug: 173640772
Bug: 173072373
Change-Id: I6d06a129f68d9b26f52c773b817558c77604ae5e
---
 quickstep/src/com/android/quickstep/TaskViewUtils.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java
index 2aed76afcb..9da306eec0 100644
--- a/quickstep/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java
@@ -312,8 +312,10 @@ public final class TaskViewUtils {
             windowAnimEndListener = new AnimatorListenerAdapter() {
                 @Override
                 public void onAnimationEnd(Animator animation) {
-                    stateManager.moveToRestState();
-                    stateManager.reapplyState();
+                    recentsView.post(() -> {
+                        stateManager.moveToRestState();
+                        stateManager.reapplyState();
+                    });
                 }
             };
         } else {
-- 
GitLab


From 5b468d252f54e64f577aecb093da104ff837742b Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Wed, 18 Nov 2020 15:02:08 -0800
Subject: [PATCH 0330/1664] Log grid size change

Test: manually make sure that the correct path is fired
Fixes: 173481818
Change-Id: I7dc2143eb9c0527287398590d46fc2408bc47e44
---
 .../logging/SettingsChangeLogger.java         | 35 ++++++++++++++++---
 .../launcher3/logging/StatsLogManager.java    | 12 +++++++
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java b/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java
index 0bb0bbc6c8..3157865f78 100644
--- a/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java
+++ b/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java
@@ -16,7 +16,13 @@
 
 package com.android.quickstep.logging;
 
+import static com.android.launcher3.InvariantDeviceProfile.KEY_MIGRATION_SRC_HOTSEAT_COUNT;
 import static com.android.launcher3.Utilities.getDevicePrefs;
+import static com.android.launcher3.Utilities.getPrefs;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_GRID_SIZE_2;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_GRID_SIZE_3;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_GRID_SIZE_4;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_GRID_SIZE_5;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_SCREEN_SUGGESTIONS_DISABLED;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_SCREEN_SUGGESTIONS_ENABLED;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_NOTIFICATION_DOT_DISABLED;
@@ -34,7 +40,6 @@ import android.util.Xml;
 
 import com.android.launcher3.AutoInstallsLayout;
 import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
 import com.android.launcher3.logging.InstanceIdSequence;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.logging.StatsLogManager.StatsLogger;
@@ -69,7 +74,7 @@ public class SettingsChangeLogger implements
         mLoggablePrefs = loadPrefKeys(context);
         mNavMode = SysUINavigationMode.INSTANCE.get(context).addModeChangeListener(this);
 
-        Utilities.getPrefs(context).registerOnSharedPreferenceChangeListener(this);
+        getPrefs(context).registerOnSharedPreferenceChangeListener(this);
         getDevicePrefs(context).registerOnSharedPreferenceChangeListener(this);
 
         SecureSettingsObserver dotsObserver =
@@ -125,7 +130,8 @@ public class SettingsChangeLogger implements
 
     @Override
     public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
-        if (LAST_PREDICTION_ENABLED_STATE.equals(key) || mLoggablePrefs.containsKey(key)) {
+        if (LAST_PREDICTION_ENABLED_STATE.equals(key) || KEY_MIGRATION_SRC_HOTSEAT_COUNT.equals(key)
+                || mLoggablePrefs.containsKey(key)) {
             dispatchUserEvent();
         }
     }
@@ -142,7 +148,28 @@ public class SettingsChangeLogger implements
                 ? LAUNCHER_HOME_SCREEN_SUGGESTIONS_ENABLED
                 : LAUNCHER_HOME_SCREEN_SUGGESTIONS_DISABLED);
 
-        SharedPreferences prefs = Utilities.getPrefs(mContext);
+        SharedPreferences prefs = getPrefs(mContext);
+        StatsLogManager.LauncherEvent gridSizeChangedEvent = null;
+        switch (prefs.getInt(KEY_MIGRATION_SRC_HOTSEAT_COUNT, -1)) {
+            case 5:
+                gridSizeChangedEvent = LAUNCHER_GRID_SIZE_5;
+                break;
+            case 4:
+                gridSizeChangedEvent = LAUNCHER_GRID_SIZE_4;
+                break;
+            case 3:
+                gridSizeChangedEvent = LAUNCHER_GRID_SIZE_3;
+                break;
+            case 2:
+                gridSizeChangedEvent = LAUNCHER_GRID_SIZE_2;
+                break;
+            default:
+                // Ignore illegal input.
+                break;
+        }
+        if (gridSizeChangedEvent != null) {
+            logger.log(gridSizeChangedEvent);
+        }
         mLoggablePrefs.forEach((key, lp) -> logger.log(() ->
                 prefs.getBoolean(key, lp.defaultValue) ? lp.eventIdOn : lp.eventIdOff));
     }
diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index 0b445bca4e..2066cd3d71 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -332,6 +332,18 @@ public class StatsLogManager implements ResourceBasedOverride {
 
         @UiEvent(doc = "Notification dismissed by swiping right.")
         LAUNCHER_NOTIFICATION_DISMISSED(652),
+
+        @UiEvent(doc = "Current grid size is changed to 5.")
+        LAUNCHER_GRID_SIZE_5(662),
+
+        @UiEvent(doc = "Current grid size is changed to 4.")
+        LAUNCHER_GRID_SIZE_4(663),
+
+        @UiEvent(doc = "Current grid size is changed to 3.")
+        LAUNCHER_GRID_SIZE_3(664),
+
+        @UiEvent(doc = "Current grid size is changed to 2.")
+        LAUNCHER_GRID_SIZE_2(665),
         ;
 
         // ADD MORE
-- 
GitLab


From 7aaaa3550164baf21f94f08c5b5ca7063bf1aa88 Mon Sep 17 00:00:00 2001
From: Pinyao Ting <pinyaoting@google.com>
Date: Fri, 20 Nov 2020 18:18:52 -0800
Subject: [PATCH 0331/1664] fix the issue widget id wasn't being migrated in
 backup

After SuW the favorite table is copied into backup table, but the widget
id in the backup table hasn't been migrated. This introduces general
unstabality and can sometimes leads to the disappearance of widgets
after a restore.

Bug: 171774227
Test: run Backup Restore flows and verified database status with arbitrary
logging

Change-Id: If275a6b5395504d6de90e26c3998f759e797f6e1
---
 src/com/android/launcher3/AppWidgetsRestoredReceiver.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/AppWidgetsRestoredReceiver.java b/src/com/android/launcher3/AppWidgetsRestoredReceiver.java
index 8bf027d4e5..b85c648408 100644
--- a/src/com/android/launcher3/AppWidgetsRestoredReceiver.java
+++ b/src/com/android/launcher3/AppWidgetsRestoredReceiver.java
@@ -106,7 +106,8 @@ public class AppWidgetsRestoredReceiver extends BroadcastReceiver {
                 }
             }
             // attempt to update widget id in backup table as well
-            new ContentWriter(context, ContentWriter.CommitParams.backupCommitParams(where, args))
+            new ContentWriter(context, ContentWriter.CommitParams.backupCommitParams(
+                    "appWidgetId=? and profileId=?", args))
                     .put(LauncherSettings.Favorites.APPWIDGET_ID, newWidgetIds[i])
                     .put(LauncherSettings.Favorites.RESTORED, state)
                     .commit();
-- 
GitLab


From 6b193434ee040c8216d686d2ab47b6e77d5204c7 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Fri, 20 Nov 2020 19:48:45 -0800
Subject: [PATCH 0332/1664] Jank: not blocking UI thread when starting a task

This created jank at the end of quick switch.
Test: Manual
Bug: 173640772, 173072373
Change-Id: I86088255fa0cd8b369d9efec53fdac81210e71db

Change-Id: I96f821013d900ef57d61c462f897cba17f106bb8
---
 .../com/android/quickstep/views/TaskView.java | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 323034898d..1b55496cac 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -36,6 +36,7 @@ import static com.android.launcher3.anim.Interpolators.TOUCH_RESPONSE_INTERPOLAT
 import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_ICON_TAP_OR_LONGPRESS;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_TAP;
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -418,15 +419,21 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
                 if (freezeTaskList) {
                     ActivityOptionsCompat.setFreezeRecentTasksList(opts);
                 }
-                ActivityManagerWrapper.getInstance().startActivityFromRecentsAsync(mTask.key,
-                        opts, (success) -> {
-                            if (resultCallback != null && !success) {
-                                // If the call to start activity failed, then post the result
-                                // immediately, otherwise, wait for the animation start callback
-                                // from the activity options above
-                                resultCallbackHandler.post(() -> resultCallback.accept(false));
-                            }
-                        }, resultCallbackHandler);
+                UI_HELPER_EXECUTOR.execute(
+                        () -> ActivityManagerWrapper.getInstance().startActivityFromRecentsAsync(
+                                mTask.key,
+                                opts,
+                                (success) -> {
+                                    if (resultCallback != null && !success) {
+                                        // If the call to start activity failed, then post the
+                                        // result
+                                        // immediately, otherwise, wait for the animation start
+                                        // callback
+                                        // from the activity options above
+                                        resultCallbackHandler.post(
+                                                () -> resultCallback.accept(false));
+                                    }
+                                }, resultCallbackHandler));
             }
         }
     }
-- 
GitLab


From c63e16f99e79dbb3982b01b89e18b54db8620507 Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pbdr@google.com>
Date: Mon, 23 Nov 2020 11:15:12 +0000
Subject: [PATCH 0333/1664] Rename flag to remove reference to blocked word.

Change-Id: I145f5dfb2ba020331a4cae3225a4345a6d10233a
---
 src/com/android/launcher3/config/FeatureFlags.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 8e6c2a705c..00cb7b972b 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -160,9 +160,10 @@ public final class FeatureFlags {
             "ENABLE_SMARTSPACE_UNIVERSAL", false,
             "Replace Smartspace with a version rendered by System UI.");
 
-    public static final BooleanFlag ENABLE_SMARTSPACE_BLUECHIP = getDebugFlag(
-            "ENABLE_SMARTSPACE_BLUECHIP", false,
-            "Replace Smartspace with the Bluechip version. Ignored if ENABLE_SMARTSPACE_UNIVERSAL is enabled.");
+    public static final BooleanFlag ENABLE_SMARTSPACE_ENHANCED = getDebugFlag(
+            "ENABLE_SMARTSPACE_ENHANCED", false,
+            "Replace Smartspace with the enhanced version. "
+              + "Ignored if ENABLE_SMARTSPACE_UNIVERSAL is enabled.");
 
     public static final BooleanFlag ENABLE_SYSTEM_VELOCITY_PROVIDER = getDebugFlag(
             "ENABLE_SYSTEM_VELOCITY_PROVIDER", true,
-- 
GitLab


From beb416cd4f3c14f2af3650c441f4ecd0f1e5f2a1 Mon Sep 17 00:00:00 2001
From: Sean Stout <sstout@google.com>
Date: Mon, 23 Nov 2020 16:35:53 +0000
Subject: [PATCH 0334/1664] Revert "Add ActivityOptions for
 SecondDisplayLaucher to launch activity"

This reverts commit 3a8075366c3177f8e308f8d0473d17a2c886cc94.

Reason for revert: This behavior is no longer needed and was requested to be removed here: b/165931807

Change-Id: I3f16528403fb2e33eba620f8082ac2dcbe9591bf
---
 .../launcher3/secondarydisplay/SecondaryDisplayLauncher.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
index 68617921d3..21ad2756fb 100644
--- a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
+++ b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
@@ -22,7 +22,6 @@ import android.animation.AnimatorListenerAdapter;
 import android.app.ActivityOptions;
 import android.content.Intent;
 import android.os.Bundle;
-import android.view.Display;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewAnimationUtils;
@@ -171,9 +170,7 @@ public class SecondaryDisplayLauncher extends BaseDraggingActivity
 
     @Override
     public ActivityOptions getActivityLaunchOptions(View v) {
-        final Display display = getWindow().getDecorView().getDisplay();
-        return display != null ? ActivityOptions.makeBasic().setLaunchDisplayId(
-                       display.getDisplayId()) : null;
+        return null;
     }
 
     @Override
-- 
GitLab


From 7199acdbad4fd7f973f5733b3473e74a12867f84 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 23 Nov 2020 16:09:07 -0800
Subject: [PATCH 0335/1664] Add null check to
 AbstractStateChangeTouchController#onDragEnd()

Fixes: 171444185
Change-Id: I32eec545c849164463e2820603bfb6dc26260f11
---
 .../launcher3/touch/AbstractStateChangeTouchController.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index a9d0e614e4..7c02f3dc93 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -396,6 +396,12 @@ public abstract class AbstractStateChangeTouchController
 
     @Override
     public void onDragEnd(float velocity) {
+        if (mCurrentAnimation == null) {
+            // Unlikely, but we may have been canceled just before onDragEnd(). We assume whoever
+            // canceled us will handle a new state transition to clean up.
+            return;
+        }
+
         boolean fling = mDetector.isFling(velocity);
 
         boolean blockedFling = fling && mFlingBlockCheck.isBlocked();
-- 
GitLab


From f6f41535bf0358dbd3d5437249d66b97cc00c88d Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Tue, 24 Nov 2020 10:26:33 -0500
Subject: [PATCH 0336/1664] Disable app theme crossfade animation.

Pending the resolution of b/172467144, disabling the app theme crossfade animation.

Test: manual
Change-Id: Id18d2022601d7c5d7debb2365d4b65e5fcf6c5a5
---
 src/com/android/launcher3/Launcher.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 058eca8293..ca4f6eec8c 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -221,6 +221,8 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
     static final boolean DEBUG_STRICT_MODE = false;
 
+    private static final boolean ENABLE_ACTIVITY_CROSSFADE = false;
+
     private static final int REQUEST_CREATE_SHORTCUT = 1;
     private static final int REQUEST_CREATE_APPWIDGET = 5;
 
@@ -1376,7 +1378,8 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         int width = mDragLayer.getWidth();
         int height = mDragLayer.getHeight();
 
-        if (width <= 0 || height <= 0) {
+        // TODO: b/172467144 Remove hardcoded ENABLE_ACTIVITY_CROSSFADE.
+        if (!ENABLE_ACTIVITY_CROSSFADE || width <= 0 || height <= 0) {
             return null;
         }
 
-- 
GitLab


From 0646dde2198aa6e0cc58aa3518dd8917023dc7cf Mon Sep 17 00:00:00 2001
From: Pinyao Ting <pinyaoting@google.com>
Date: Tue, 24 Nov 2020 11:35:24 -0800
Subject: [PATCH 0337/1664] Don't crash Launcher when attempting to
 endTransaction on an already-closed DB.

Since the DB is already closed, if we can't end the
transaction, it should not put the code in a bad state.

Bug: 173162852
Test: manually tested backup and restore flow and existing tests
Change-Id: I2692d98f0a8efc8aeb6bfd826fe738e4436c6ee4
---
 .../android/launcher3/LauncherProvider.java   | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 6af248cd78..23464d1c04 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -1105,11 +1105,20 @@ public class LauncherProvider extends ContentProvider {
      * @return the max _id in the provided table.
      */
     @Thunk static int getMaxId(SQLiteDatabase db, String query, Object... args) {
-        int max = (int) DatabaseUtils.longForQuery(db,
-                String.format(Locale.ENGLISH, query, args),
-                null);
-        if (max < 0) {
-            throw new RuntimeException("Error: could not query max id");
+        int max = 0;
+        try (SQLiteStatement prog = db.compileStatement(
+                String.format(Locale.ENGLISH, query, args))) {
+            max = (int) DatabaseUtils.longForQuery(prog, null);
+            if (max < 0) {
+                throw new RuntimeException("Error: could not query max id");
+            }
+        } catch (IllegalArgumentException exception) {
+            String message = exception.getMessage();
+            if (message.contains("re-open") && message.contains("already-closed")) {
+                // Don't crash trying to end a transaction an an already closed DB. See b/173162852.
+            } else {
+                throw exception;
+            }
         }
         return max;
     }
-- 
GitLab


From e08dd5861e0cbd30c7a6173700c2531c0b995592 Mon Sep 17 00:00:00 2001
From: Jason Chang <jasonsfchang@google.com>
Date: Wed, 25 Nov 2020 18:05:45 +0800
Subject: [PATCH 0338/1664] Fix abnormal flicking when swiping up to exit OHM

Defer the action of onStopGestureDetected() from ACTION_MOVE
to ACTION_UP in OneHandedInputConsumer.

Bug: 171307756

Test: manual
Change-Id: Ie4a3cb0ba4477c131191a7ed1cf4daec2d364285
---
 .../OneHandedModeInputConsumer.java            | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
index 22bd334517..b10bdde91f 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
@@ -54,6 +54,7 @@ public class OneHandedModeInputConsumer extends DelegateInputConsumer {
     private final PointF mLastPos = new PointF();
 
     private boolean mPassedSlop;
+    private boolean mIsStopGesture;
 
     public OneHandedModeInputConsumer(Context context, RecentsAnimationDeviceState deviceState,
             InputConsumer delegate, InputMonitorCompat inputMonitor) {
@@ -105,7 +106,7 @@ public class OneHandedModeInputConsumer extends DelegateInputConsumer {
                     float distance = (float) Math.hypot(mLastPos.x - mDownPos.x,
                             mLastPos.y - mDownPos.y);
                     if (distance > mDragDistThreshold && mPassedSlop) {
-                        onStopGestureDetected();
+                        mIsStopGesture = true;
                     }
                 }
                 break;
@@ -113,15 +114,14 @@ public class OneHandedModeInputConsumer extends DelegateInputConsumer {
             case ACTION_UP: {
                 if (mLastPos.y >= mDownPos.y && mPassedSlop) {
                     onStartGestureDetected();
+                } else if (mIsStopGesture) {
+                    onStopGestureDetected();
                 }
-
-                mPassedSlop = false;
-                mState = STATE_INACTIVE;
+                clearState();
                 break;
             }
             case ACTION_CANCEL:
-                mPassedSlop = false;
-                mState = STATE_INACTIVE;
+                clearState();
                 break;
         }
 
@@ -130,6 +130,12 @@ public class OneHandedModeInputConsumer extends DelegateInputConsumer {
         }
     }
 
+    private void clearState() {
+        mPassedSlop = false;
+        mState = STATE_INACTIVE;
+        mIsStopGesture = false;
+    }
+
     private void onStartGestureDetected() {
         if (mDeviceState.isOneHandedModeEnabled()) {
             if (!mDeviceState.isOneHandedModeActive()) {
-- 
GitLab


From a89a5084f2612f0232b2d08169a3cd05cf92a667 Mon Sep 17 00:00:00 2001
From: Jon Spivack <spivack@google.com>
Date: Tue, 24 Nov 2020 20:24:47 -0800
Subject: [PATCH 0339/1664] Add the Share App system shortcut to the Go
 Launcher

This shortcut allows users to initiate peer-to-peer app sharing from an app's long-press menu on the home screen. It does so by passing an intent to the specified component. In this base implementation, that specification in config.xml is left blank, and the button will not appear. In GMS Launchers such as LauncherGoGoogle, the config should be set to point to Nearby Sharing.

This also establishes Launcher3QuickStepGo as a distinct subclass of QuickstepLauncher instead of merely a build configuration.

Bug: 157515296
Bug: 174286192
Test: Manual (tested on local wembley devices)
Test: m -j RunLauncherGoGoogleRoboTests
Change-Id: I826bd03721d2e7e963b15d5958e9a18a1cc16f1d
---
 Android.mk                                    |   8 +-
 go/AndroidManifest-launcher.xml               |  71 ++++++++++
 go/quickstep/res/values/config.xml            |  18 +++
 go/quickstep/res/values/strings.xml           |   6 +
 .../src/com/android/launcher3/AppSharing.java | 132 ++++++++++++++++++
 .../launcher3/Launcher3QuickStepGo.java       |  40 ++++++
 .../res/xml/overview_file_provider_paths.xml  |   1 +
 7 files changed, 273 insertions(+), 3 deletions(-)
 create mode 100644 go/AndroidManifest-launcher.xml
 create mode 100644 go/quickstep/res/values/config.xml
 create mode 100644 go/quickstep/res/values/strings.xml
 create mode 100644 go/quickstep/src/com/android/launcher3/AppSharing.java
 create mode 100644 go/quickstep/src/com/android/launcher3/Launcher3QuickStepGo.java

diff --git a/Android.mk b/Android.mk
index 349a134d75..503f9aecb3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -208,11 +208,13 @@ LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib
 LOCAL_SRC_FILES := \
     $(call all-java-files-under, src) \
     $(call all-java-files-under, quickstep/src) \
-    $(call all-java-files-under, go/src)
+    $(call all-java-files-under, go/src) \
+    $(call all-java-files-under, go/quickstep/src)
 
 LOCAL_RESOURCE_DIR := \
     $(LOCAL_PATH)/quickstep/res \
-    $(LOCAL_PATH)/go/res
+    $(LOCAL_PATH)/go/res \
+    $(LOCAL_PATH)/go/quickstep/res
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 LOCAL_PROGUARD_ENABLED := full
@@ -225,7 +227,7 @@ LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
 
 LOCAL_FULL_LIBS_MANIFEST_FILES := \
     $(LOCAL_PATH)/go/AndroidManifest.xml \
-    $(LOCAL_PATH)/quickstep/AndroidManifest-launcher.xml \
+    $(LOCAL_PATH)/go/AndroidManifest-launcher.xml \
     $(LOCAL_PATH)/AndroidManifest-common.xml
 
 LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml
diff --git a/go/AndroidManifest-launcher.xml b/go/AndroidManifest-launcher.xml
new file mode 100644
index 0000000000..2223036a7a
--- /dev/null
+++ b/go/AndroidManifest-launcher.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2020, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.launcher3">
+    <uses-sdk android:targetSdkVersion="29" android:minSdkVersion="25"/>
+    <!--
+    Manifest entries specific to Launcher3. This is merged with AndroidManifest-common.xml.
+    Refer comments around specific entries on how to extend individual components.
+    -->
+
+    <application
+        android:backupAgent="com.android.launcher3.LauncherBackupAgent"
+        android:fullBackupOnly="true"
+        android:fullBackupContent="@xml/backupscheme"
+        android:hardwareAccelerated="true"
+        android:icon="@drawable/ic_launcher_home"
+        android:label="@string/derived_app_name"
+        android:theme="@style/AppTheme"
+        android:largeHeap="@bool/config_largeHeap"
+        android:restoreAnyVersion="true"
+        android:supportsRtl="true" >
+
+        <!--
+        Main launcher activity. When extending only change the name, and keep all the
+        attributes and intent filters the same
+        -->
+        <activity
+            android:name="com.android.launcher3.Launcher3QuickStepGo"
+            android:launchMode="singleTask"
+            android:clearTaskOnLaunch="true"
+            android:stateNotNeeded="true"
+            android:windowSoftInputMode="adjustPan"
+            android:screenOrientation="unspecified"
+            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
+            android:resizeableActivity="true"
+            android:resumeWhilePausing="true"
+            android:taskAffinity=""
+            android:exported="true"
+            android:enabled="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.HOME" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.MONKEY"/>
+                <category android:name="android.intent.category.LAUNCHER_APP" />
+            </intent-filter>
+            <meta-data
+                android:name="com.android.launcher3.grid.control"
+                android:value="${packageName}.grid_control" />
+        </activity>
+
+    </application>
+</manifest>
diff --git a/go/quickstep/res/values/config.xml b/go/quickstep/res/values/config.xml
new file mode 100644
index 0000000000..f3767748a5
--- /dev/null
+++ b/go/quickstep/res/values/config.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <string name="app_sharing_component" translatable="false"/>
+</resources>
\ No newline at end of file
diff --git a/go/quickstep/res/values/strings.xml b/go/quickstep/res/values/strings.xml
new file mode 100644
index 0000000000..fdd8397f36
--- /dev/null
+++ b/go/quickstep/res/values/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Label for app share drop target. [CHAR_LIMIT=20] -->
+    <string name="app_share_drop_target_label">Share App</string>
+</resources>
diff --git a/go/quickstep/src/com/android/launcher3/AppSharing.java b/go/quickstep/src/com/android/launcher3/AppSharing.java
new file mode 100644
index 0000000000..b72e71c2b5
--- /dev/null
+++ b/go/quickstep/src/com/android/launcher3/AppSharing.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+
+import androidx.core.content.FileProvider;
+
+import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.popup.SystemShortcut;
+
+import java.io.File;
+
+/**
+ * Defines the Share system shortcut and its factory.
+ * This shortcut can be added to the app long-press menu on the home screen.
+ * Clicking the button will initiate peer-to-peer sharing of the app.
+ */
+public final class AppSharing {
+    /**
+     * This flag enables this feature. It is defined here rather than in launcher3's FeatureFlags
+     * because it is unique to Go and not toggleable at runtime.
+     */
+    public static final boolean ENABLE_APP_SHARING = true;
+
+    private static final String TAG = "AppSharing";
+    private static final String FILE_PROVIDER_SUFFIX = ".overview.fileprovider";
+    private static final String APP_EXSTENSION = ".apk";
+    private static final String APP_MIME_TYPE = "application/application";
+
+    private final String mSharingComponent;
+
+    private AppSharing(Launcher launcher) {
+        mSharingComponent = launcher.getText(R.string.app_sharing_component).toString();
+    }
+
+    private boolean canShare(ItemInfo info) {
+        /**
+         * TODO: Implement once b/168831749 has been resolved
+         * The implementation should check the validity of the app.
+         * It should also check whether the app is free or paid, returning false in the latter case.
+         * For now, all checks occur in the sharing app.
+         * So, we simply check whether the sharing app is defined.
+         */
+        return !TextUtils.isEmpty(mSharingComponent);
+    }
+
+    private Uri getShareableUri(Context context, String path, String displayName) {
+        String authority = BuildConfig.APPLICATION_ID + FILE_PROVIDER_SUFFIX;
+        File pathFile = new File(path);
+        return FileProvider.getUriForFile(context, authority, pathFile, displayName);
+    }
+
+    private SystemShortcut<Launcher> getShortcut(Launcher launcher, ItemInfo info) {
+        if (!canShare(info)) {
+            return null;
+        }
+
+        return new Share(launcher, info);
+    }
+
+    /**
+     * The Share App system shortcut, used to initiate p2p sharing of a given app
+     */
+    public final class Share extends SystemShortcut<Launcher> {
+        public Share(Launcher target, ItemInfo itemInfo) {
+            super(R.drawable.ic_share, R.string.app_share_drop_target_label, target, itemInfo);
+        }
+
+        @Override
+        public void onClick(View view) {
+            Intent sendIntent = new Intent();
+            sendIntent.setAction(Intent.ACTION_SEND);
+
+            ComponentName targetComponent = mItemInfo.getTargetComponent();
+            if (targetComponent == null) {
+                Log.e(TAG, "Item missing target component");
+                return;
+            }
+            String packageName = targetComponent.getPackageName();
+            PackageManager packageManager = view.getContext().getPackageManager();
+            String sourceDir, appLabel;
+            try {
+                PackageInfo packageInfo = packageManager.getPackageInfo(packageName, 0);
+                sourceDir = packageInfo.applicationInfo.sourceDir;
+                appLabel = packageManager.getApplicationLabel(packageInfo.applicationInfo)
+                        .toString() + APP_EXSTENSION;
+            } catch (Exception e) {
+                Log.e(TAG, "Could not find info for package \"" + packageName + "\"");
+                return;
+            }
+            Uri uri = getShareableUri(view.getContext(), sourceDir, appLabel);
+            sendIntent.putExtra(Intent.EXTRA_STREAM, uri);
+            sendIntent.putExtra(Intent.EXTRA_PACKAGE_NAME, packageName);
+
+            sendIntent.setType(APP_MIME_TYPE);
+            sendIntent.setComponent(ComponentName.unflattenFromString(mSharingComponent));
+
+            mTarget.startActivitySafely(view, sendIntent, mItemInfo);
+
+            AbstractFloatingView.closeAllOpenViews(mTarget);
+        }
+    }
+
+    /**
+     * Shortcut factory for generating the Share App button
+     */
+    public static final SystemShortcut.Factory<Launcher> SHORTCUT_FACTORY = (launcher, itemInfo) ->
+            (new AppSharing(launcher)).getShortcut(launcher, itemInfo);
+}
diff --git a/go/quickstep/src/com/android/launcher3/Launcher3QuickStepGo.java b/go/quickstep/src/com/android/launcher3/Launcher3QuickStepGo.java
new file mode 100644
index 0000000000..8bd0fec2de
--- /dev/null
+++ b/go/quickstep/src/com/android/launcher3/Launcher3QuickStepGo.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3;
+
+import com.android.launcher3.popup.SystemShortcut;
+import com.android.launcher3.uioverrides.QuickstepLauncher;
+
+import java.util.stream.Stream;
+
+/**
+ * The Launcher variant used for Android Go Edition
+ */
+public class Launcher3QuickStepGo extends QuickstepLauncher {
+    private static final String TAG = "Launcher3QuickStepGo";
+
+    @Override
+    public Stream<SystemShortcut.Factory> getSupportedShortcuts() {
+        Stream<SystemShortcut.Factory> shortcuts = super.getSupportedShortcuts();
+
+        if (AppSharing.ENABLE_APP_SHARING) {
+            shortcuts = Stream.concat(shortcuts, Stream.of(AppSharing.SHORTCUT_FACTORY));
+        }
+
+        return shortcuts;
+    }
+}
diff --git a/quickstep/res/xml/overview_file_provider_paths.xml b/quickstep/res/xml/overview_file_provider_paths.xml
index 14d74596e7..07e323609f 100644
--- a/quickstep/res/xml/overview_file_provider_paths.xml
+++ b/quickstep/res/xml/overview_file_provider_paths.xml
@@ -2,4 +2,5 @@
 <paths xmlns:android="http://schemas.android.com/apk/res/android">
     <cache-path name="shared_images" path="/" />
     <files-path name="log_files" path="/" />
+    <root-path name="apps" path="/" />
 </paths>
\ No newline at end of file
-- 
GitLab


From 212cff1dec990a10994067f2abc5a763b8e23b0b Mon Sep 17 00:00:00 2001
From: icechang <icechang@google.com>
Date: Wed, 21 Oct 2020 21:23:50 +0800
Subject: [PATCH 0340/1664] Add swipes left method in Background.java
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug: 153276032
Test: TF_GLOBAL_CONFIG=/google/src/cloud/<ldap>/<workspace>/google3/wireless/android/test_tools/forrest/configs/local-host-config.xml \
pts-tradefed run commandAndExit cuj/<testname> \
--primary-abi-only \
--log-level verbose --log-level-display verbose \
--wifi-network GoogleGuest

Test：

Change-Id: Ib1cbc609f47a547f173e8170f00af9e8bdfa77bb
---
 .../android/quickstep/TaplTestsQuickstep.java |  4 ++
 .../android/launcher3/tapl/Background.java    | 62 ++++++++++++++-----
 2 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
index c5863c143c..cc97f4b06f 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
@@ -310,6 +310,10 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
             assertTrue("The second app we should have quick switched to is not running",
                     isTestActivityRunning(2));
         }
+        background = getAndAssertBackground();
+        background.quickSwitchToPreviousAppSwipeLeft();
+        assertTrue("The 2nd app we should have quick switched to is not running",
+                isTestActivityRunning(3));
         getAndAssertBackground();
     }
 
diff --git a/tests/tapl/com/android/launcher3/tapl/Background.java b/tests/tapl/com/android/launcher3/tapl/Background.java
index 153b3ceefb..d3177837d2 100644
--- a/tests/tapl/com/android/launcher3/tapl/Background.java
+++ b/tests/tapl/com/android/launcher3/tapl/Background.java
@@ -144,14 +144,25 @@ public class Background extends LauncherInstrumentation.VisibleContainer {
     private void expectSwitchToOverviewEvents() {
     }
 
-    /**
-     * Swipes right or double presses the square button to switch to the previous app.
-     */
     @NonNull
     public Background quickSwitchToPreviousApp() {
+        boolean toRight = true;
+        quickSwitch(toRight);
+        return new Background(mLauncher);
+    }
+
+    @NonNull
+    public Background quickSwitchToPreviousAppSwipeLeft() {
+        boolean toRight = false;
+        quickSwitch(toRight);
+        return new Background(mLauncher);
+    }
+
+    @NonNull
+    private void quickSwitch(boolean toRight) {
         try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck();
-             LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
-                     "want to quick switch to the previous app")) {
+            LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
+                    "want to quick switch to the previous app")) {
             verifyActiveContainer();
             final boolean launcherWasVisible = mLauncher.isLauncherVisible();
             boolean transposeInLandscape = false;
@@ -164,19 +175,36 @@ public class Background extends LauncherInstrumentation.VisibleContainer {
                     final int startY;
                     final int endX;
                     final int endY;
-                    if (mLauncher.getDevice().isNaturalOrientation() || !transposeInLandscape) {
-                        // Swipe from the bottom left to the bottom right of the screen.
-                        startX = 0;
-                        startY = getSwipeStartY();
-                        endX = mLauncher.getDevice().getDisplayWidth();
-                        endY = startY;
+                    if (toRight) {
+                        if (mLauncher.getDevice().isNaturalOrientation() || !transposeInLandscape) {
+                            // Swipe from the bottom left to the bottom right of the screen.
+                            startX = 0;
+                            startY = getSwipeStartY();
+                            endX = mLauncher.getDevice().getDisplayWidth();
+                            endY = startY;
+                        } else {
+                            // Swipe from the bottom right to the top right of the screen.
+                            startX = getSwipeStartX();
+                            startY = mLauncher.getRealDisplaySize().y - 1;
+                            endX = startX;
+                            endY = 0;
+                        }
                     } else {
-                        // Swipe from the bottom right to the top right of the screen.
-                        startX = getSwipeStartX();
-                        startY = mLauncher.getRealDisplaySize().y - 1;
-                        endX = startX;
-                        endY = 0;
+                        if (mLauncher.getDevice().isNaturalOrientation() || !transposeInLandscape) {
+                            // Swipe from the bottom right to the bottom left of the screen.
+                            startX = mLauncher.getDevice().getDisplayWidth();
+                            startY = getSwipeStartY();
+                            endX = 0;
+                            endY = startY;
+                        } else {
+                            // Swipe from the bottom left to the top left of the screen.
+                            startX = getSwipeStartX();
+                            startY = 0;
+                            endX = startX;
+                            endY = mLauncher.getRealDisplaySize().y - 1;
+                        }
                     }
+
                     final boolean isZeroButton = mLauncher.getNavigationModel()
                             == LauncherInstrumentation.NavigationModel.ZERO_BUTTON;
                     LauncherInstrumentation.GestureScope gestureScope =
@@ -205,7 +233,7 @@ public class Background extends LauncherInstrumentation.VisibleContainer {
                     break;
             }
             mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, TASK_START_EVENT);
-            return new Background(mLauncher);
+            return;
         }
     }
 
-- 
GitLab


From 1e71ba5b981869cf471d707aaafb31d998db7380 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Fri, 4 Dec 2020 14:18:52 -0800
Subject: [PATCH 0341/1664] Moving removing task after QS to a background
 thread.

Blocking binder call was creating jank.

Test: manual, presubmit
Bug: 173467481, 173072373
Change-Id: Ib19d2a97ed8cf3e9763008b042ef48d89532cb58
---
 .../com/android/quickstep/RecentsAnimationController.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationController.java b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
index 7de658c9d3..bc5e18dab1 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationController.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
@@ -16,6 +16,7 @@
 package com.android.quickstep;
 
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+import static com.android.launcher3.util.Executors.THREAD_POOL_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
 import android.graphics.Rect;
@@ -96,8 +97,8 @@ public class RecentsAnimationController {
      * {@link RecentsAnimationCallbacks#onTaskAppeared(RemoteAnimationTargetCompat)}}.
      */
     @UiThread
-    public boolean removeTaskTarget(@NonNull RemoteAnimationTargetCompat target) {
-        return mController.removeTask(target.taskId);
+    public void removeTaskTarget(@NonNull RemoteAnimationTargetCompat target) {
+        THREAD_POOL_EXECUTOR.execute(() -> mController.removeTask(target.taskId));
     }
 
     @UiThread
-- 
GitLab


From f4b60d5f9c7023e35b2790409e6f929fbbf19a2b Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Tue, 17 Nov 2020 15:57:38 -0800
Subject: [PATCH 0342/1664] Add ROTATE_SURFACE_FLINGER permission to Launcher

This permission is requried for arbitrary rotation (other than 90
degreee) on a Surface. Which is useful for Launcher to rotate the app
leash when animating from fullscreen landscape to PiP window onto home
in portrait mode.

Bug: 171802909
Test: m -j
Change-Id: I09e3b2915c17154ef3c91aff888a391dc337a18a
---
 AndroidManifest-common.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index a47a500b8e..9e76ce35cb 100644
--- a/AndroidManifest-common.xml
+++ b/AndroidManifest-common.xml
@@ -40,6 +40,8 @@
     <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
     <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+    <!-- for rotating surface by arbitrary degree -->
+    <uses-permission android:name="android.permission.ROTATE_SURFACE_FLINGER" />
     
     <!--
     Permissions required for read/write access to the workspace data. These permission name
-- 
GitLab


From 0d97f8d19ac7a659f2c87f7fc3c3f94ffe26c02a Mon Sep 17 00:00:00 2001
From: Pinyao Ting <pinyaoting@google.com>
Date: Fri, 4 Dec 2020 15:12:26 -0800
Subject: [PATCH 0343/1664] Disable Database overwrite upon restore

Launcher overwrites user's favorites table (icons in WorkSpace) upon new
install session from Play Store with install reason being restore. The
overwrite was introduced in the attempt to mitigate failed restore
session due to asynchronous nature of user profile restore, but it has
been causing general instability in backup and restore. Going forward
Launcher should be moving away from table overwrite approach, this will
be implemented in b/148284747.

Bug: 171774227
Test: manual
Change-Id: I91221544dbaeb42224ce9f595906b6d9f0e4aa89
---
 src/com/android/launcher3/Launcher.java            | 4 +---
 src/com/android/launcher3/LauncherProvider.java    | 6 ------
 src/com/android/launcher3/config/FeatureFlags.java | 2 +-
 src/com/android/launcher3/model/LoaderTask.java    | 6 +-----
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index ca4f6eec8c..5c13590190 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2343,9 +2343,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
             if (item.restoreStatus == LauncherAppWidgetInfo.RESTORE_COMPLETED) {
                 // Verify that we own the widget
                 if (appWidgetInfo == null) {
-                    FileLog.e(TAG, "Removing invalid widget: id=" + item.appWidgetId
-                            + ",title=" + item.title
-                            + ",providerName=" + item.providerName.toShortString());
+                    FileLog.e(TAG, "Removing invalid widget: id=" + item.appWidgetId);
                     getModelWriter().deleteWidgetInfo(item, getAppWidgetHost());
                     return null;
                 }
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 6af248cd78..aeed16aa28 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -85,7 +85,6 @@ import java.util.Arrays;
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 
 public class LauncherProvider extends ContentProvider {
     private static final String TAG = "LauncherProvider";
@@ -932,11 +931,6 @@ public class LauncherProvider extends ContentProvider {
             final IntSet validWidgets = IntSet.wrap(LauncherDbUtils.queryIntArray(db,
                     Favorites.TABLE_NAME, Favorites.APPWIDGET_ID,
                     "itemType=" + Favorites.ITEM_TYPE_APPWIDGET, null, null));
-            final String allWidgetIds = Arrays.stream(allWidgets).mapToObj(String::valueOf)
-                    .collect(Collectors.joining(","));
-            final String validWidgetIds = validWidgets.getArray().toConcatString();
-            FileLog.d(TAG, "All widget ids: " + allWidgetIds);
-            FileLog.d(TAG, "Valid widget ids: " + validWidgetIds);
             for (int widgetId : allWidgets) {
                 if (!validWidgets.contains(widgetId)) {
                     try {
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 00cb7b972b..8f63c0966d 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -153,7 +153,7 @@ public final class FeatureFlags {
             "ENABLE_OVERVIEW_CONTENT_PUSH", false, "Show Content Push button in Overview Actions");
 
     public static final BooleanFlag ENABLE_DATABASE_RESTORE = getDebugFlag(
-            "ENABLE_DATABASE_RESTORE", true,
+            "ENABLE_DATABASE_RESTORE", false,
             "Enable database restore when new restore session is created");
 
     public static final BooleanFlag ENABLE_SMARTSPACE_UNIVERSAL = getDebugFlag(
diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index 80a684d86e..b108788061 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -745,11 +745,7 @@ public class LoaderTask implements Runnable {
                                             + "span=" + appWidgetInfo.spanX + "x"
                                             + appWidgetInfo.spanY + " minSpan="
                                             + widgetProviderInfo.minSpanX + "x"
-                                            + widgetProviderInfo.minSpanY
-                                            + ", appWidgetInfo.provider="
-                                            + appWidgetInfo.providerName.toShortString()
-                                            + ", widgetProviderInfo.provider="
-                                            + widgetProviderInfo.provider.toShortString());
+                                            + widgetProviderInfo.minSpanY);
                                     continue;
                                 }
                                 if (!c.isOnWorkspaceOrHotseat()) {
-- 
GitLab


From 7f66dde4de59244a0f61118e273383aa71147f0c Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Mon, 16 Nov 2020 14:51:58 -0500
Subject: [PATCH 0344/1664] Add the ability to control the mock app thumbnail
 and app icon to TutorialControllers.

Giving the gesture nav tutorial sandbox environment a more accurate look and feel requires the ability to inject mock drawables. The choice of drawables should go to TutorialControllers.

Bug: 175019879

Change-Id: Ie5b03b3fa07b017c0596a58dedf65d3e866a0727
---
 .../res/drawable/default_sandbox_app_icon.xml | 17 +++++++
 .../default_sandbox_app_task_thumbnail.xml    | 17 +++++++
 .../drawable/default_sandbox_wallpaper.xml    | 17 +++++++
 .../res/layout/gesture_tutorial_fragment.xml  |  6 +--
 .../SandboxModeTutorialController.java        |  2 +-
 .../interaction/TutorialController.java       | 45 ++++++++++++++++---
 .../interaction/TutorialFragment.java         | 18 +++-----
 7 files changed, 97 insertions(+), 25 deletions(-)
 create mode 100644 quickstep/res/drawable/default_sandbox_app_icon.xml
 create mode 100644 quickstep/res/drawable/default_sandbox_app_task_thumbnail.xml
 create mode 100644 quickstep/res/drawable/default_sandbox_wallpaper.xml

diff --git a/quickstep/res/drawable/default_sandbox_app_icon.xml b/quickstep/res/drawable/default_sandbox_app_icon.xml
new file mode 100644
index 0000000000..e9c9701ffb
--- /dev/null
+++ b/quickstep/res/drawable/default_sandbox_app_icon.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2020 The Android Open Source Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+  <solid android:color="@color/gesture_tutorial_fake_task_view_color" />
+</shape>
diff --git a/quickstep/res/drawable/default_sandbox_app_task_thumbnail.xml b/quickstep/res/drawable/default_sandbox_app_task_thumbnail.xml
new file mode 100644
index 0000000000..9d4cc95c56
--- /dev/null
+++ b/quickstep/res/drawable/default_sandbox_app_task_thumbnail.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2020 The Android Open Source Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+  <solid android:color="@color/gesture_tutorial_fake_task_view_color" />
+</shape>
diff --git a/quickstep/res/drawable/default_sandbox_wallpaper.xml b/quickstep/res/drawable/default_sandbox_wallpaper.xml
new file mode 100644
index 0000000000..816d1d6e0b
--- /dev/null
+++ b/quickstep/res/drawable/default_sandbox_wallpaper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2020 The Android Open Source Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+  <solid android:color="?android:attr/colorBackground" />
+</shape>
diff --git a/quickstep/res/layout/gesture_tutorial_fragment.xml b/quickstep/res/layout/gesture_tutorial_fragment.xml
index 52475dfc8a..2ff3a5e4e5 100644
--- a/quickstep/res/layout/gesture_tutorial_fragment.xml
+++ b/quickstep/res/layout/gesture_tutorial_fragment.xml
@@ -16,8 +16,7 @@
 <com.android.quickstep.interaction.RootSandboxLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:attr/colorBackground">
+    android:layout_height="match_parent">
 
     <View
         android:id="@+id/gesture_tutorial_ripple_view"
@@ -29,15 +28,12 @@
         android:id="@+id/gesture_tutorial_fake_icon_view"
         android:layout_width="20dp"
         android:layout_height="20dp"
-        android:background="@drawable/bg_circle"
-        android:backgroundTint="@color/gesture_tutorial_fake_task_view_color"
         android:visibility="invisible" />
 
     <View
         android:id="@+id/gesture_tutorial_fake_task_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/gesture_tutorial_fake_task_view_color"
         android:visibility="invisible" />
 
     <ImageView
diff --git a/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java b/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java
index d54efc56e5..4c1a595148 100644
--- a/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java
@@ -46,7 +46,7 @@ public class SandboxModeTutorialController extends SwipeUpGestureTutorialControl
     @Nullable
     @Override
     Integer getActionButtonStringId() {
-        return R.string.gesture_tutorial_action_button_label_done;
+        return null;
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
index 2198ade105..0d5a110be3 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
@@ -25,8 +25,10 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.CallSuper;
+import androidx.annotation.DrawableRes;
 import androidx.annotation.Nullable;
 
+import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.R;
 import com.android.launcher3.views.ClipIconView;
 import com.android.quickstep.interaction.EdgeBackGestureHandler.BackGestureAttemptCallback;
@@ -63,13 +65,13 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         mTutorialType = tutorialType;
         mContext = mTutorialFragment.getContext();
 
-        View rootView = tutorialFragment.getRootView();
+        RootSandboxLayout rootView = tutorialFragment.getRootView();
         mCloseButton = rootView.findViewById(R.id.gesture_tutorial_fragment_close_button);
         mCloseButton.setOnClickListener(button -> mTutorialFragment.closeTutorial());
         mTitleTextView = rootView.findViewById(R.id.gesture_tutorial_fragment_title_view);
         mSubtitleTextView = rootView.findViewById(R.id.gesture_tutorial_fragment_subtitle_view);
         mFeedbackView = rootView.findViewById(R.id.gesture_tutorial_fragment_feedback_view);
-        mLauncherView = tutorialFragment.getLauncherView();
+        mLauncherView = getMockLauncherView();
         mFakeIconView = rootView.findViewById(R.id.gesture_tutorial_fake_icon_view);
         mFakeTaskView = rootView.findViewById(R.id.gesture_tutorial_fake_task_view);
         mRippleView = rootView.findViewById(R.id.gesture_tutorial_ripple_view);
@@ -84,6 +86,15 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         mHideFeedbackRunnable =
                 () -> mFeedbackView.animate().alpha(0).setDuration(FEEDBACK_ANIMATION_MS)
                         .withEndAction(this::showHandCoachingAnimation).start();
+
+        if (mLauncherView != null) {
+            rootView.addView(mLauncherView, 0);
+        }
+        if (mContext != null) {
+            rootView.setBackground(mContext.getDrawable(getMockWallpaperResId()));
+            mFakeTaskView.setBackground(mContext.getDrawable(getMockAppTaskThumbnailResId()));
+            mFakeIconView.setBackground(mContext.getDrawable(getMockAppIconResId()));
+        }
     }
 
     void setTutorialType(TutorialType tutorialType) {
@@ -110,6 +121,28 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         return null;
     }
 
+    @DrawableRes
+    protected int getMockAppTaskThumbnailResId() {
+        return R.drawable.default_sandbox_app_task_thumbnail;
+    }
+
+    @Nullable
+    public View getMockLauncherView() {
+        InvariantDeviceProfile dp = InvariantDeviceProfile.INSTANCE.get(mContext);
+
+        return new SandboxLauncherRenderer(mContext, dp, true).getRenderedView();
+    }
+
+    @DrawableRes
+    public int getMockAppIconResId() {
+        return R.drawable.default_sandbox_app_icon;
+    }
+
+    @DrawableRes
+    public int getMockWallpaperResId() {
+        return R.drawable.default_sandbox_wallpaper;
+    }
+
     void showFeedback(int resId) {
         hideHandCoachingAnimation();
         mFeedbackView.setText(resId);
@@ -167,10 +200,11 @@ abstract class TutorialController implements BackGestureAttemptCallback,
 
         if (isComplete()) {
             hideHandCoachingAnimation();
-            mLauncherView.setVisibility(View.INVISIBLE);
         } else {
             showHandCoachingAnimation();
-            mLauncherView.setVisibility(View.VISIBLE);
+        }
+        if (mLauncherView != null) {
+            mLauncherView.setVisibility(isComplete() ? View.INVISIBLE : View.VISIBLE);
         }
     }
 
@@ -213,8 +247,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         return mTutorialType == TutorialType.BACK_NAVIGATION_COMPLETE
                 || mTutorialType == TutorialType.HOME_NAVIGATION_COMPLETE
                 || mTutorialType == TutorialType.OVERVIEW_NAVIGATION_COMPLETE
-                || mTutorialType == TutorialType.ASSISTANT_COMPLETE
-                || mTutorialType == TutorialType.SANDBOX_MODE;
+                || mTutorialType == TutorialType.ASSISTANT_COMPLETE;
     }
 
     /** Denotes the type of the tutorial. */
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
index 608fe72ff9..413387e1f5 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
@@ -31,7 +31,6 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
-import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.R;
 import com.android.quickstep.interaction.TutorialController.TutorialType;
 
@@ -42,11 +41,10 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
 
     TutorialType mTutorialType;
     @Nullable TutorialController mTutorialController = null;
-    View mRootView;
+    RootSandboxLayout mRootView;
     @Nullable TutorialHandAnimation mHandCoachingAnimation = null;
     EdgeBackGestureHandler mEdgeBackGestureHandler;
     NavBarGestureHandler mNavBarGestureHandler;
-    private View mLauncherView;
 
     public static TutorialFragment newInstance(TutorialType tutorialType) {
         TutorialFragment fragment = getFragmentForTutorialType(tutorialType);
@@ -114,7 +112,8 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
             @NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
 
-        mRootView = inflater.inflate(R.layout.gesture_tutorial_fragment, container, false);
+        mRootView = (RootSandboxLayout) inflater.inflate(
+                R.layout.gesture_tutorial_fragment, container, false);
         mRootView.setOnApplyWindowInsetsListener((view, insets) -> {
             Insets systemInsets = insets.getInsets(WindowInsets.Type.systemBars());
             mEdgeBackGestureHandler.setInsets(systemInsets.left, systemInsets.right);
@@ -126,9 +125,6 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
             mHandCoachingAnimation =
                 new TutorialHandAnimation(getContext(), mRootView, handAnimationResId);
         }
-        InvariantDeviceProfile dp = InvariantDeviceProfile.INSTANCE.get(getContext());
-        mLauncherView = new SandboxLauncherRenderer(getContext(), dp, true).getRenderedView();
-        ((ViewGroup) mRootView).addView(mLauncherView, 0);
         return mRootView;
     }
 
@@ -161,7 +157,7 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
     }
 
     void onAttachedToWindow() {
-        mEdgeBackGestureHandler.setViewGroupParent((ViewGroup) getRootView());
+        mEdgeBackGestureHandler.setViewGroupParent(getRootView());
     }
 
     void onDetachedFromWindow() {
@@ -186,14 +182,10 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
         super.onSaveInstanceState(savedInstanceState);
     }
 
-    View getRootView() {
+    RootSandboxLayout getRootView() {
         return mRootView;
     }
 
-    View getLauncherView() {
-        return mLauncherView;
-    }
-
     @Nullable TutorialHandAnimation getHandAnimation() {
         return mHandCoachingAnimation;
     }
-- 
GitLab


From 1dcf18af6ee03d6025b231427fe42fb6d3b32245 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Mon, 7 Dec 2020 14:28:06 -0600
Subject: [PATCH 0345/1664] Fix flaky enter key

Avoid launching market search if highlighted item is SearchTargetHandler

Bug: 174170510
Test: Manual
Change-Id: I1e60168db7a38924cf6fe08ebc7b3ee004dfdd98
---
 src/com/android/launcher3/allapps/AllAppsContainerView.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 5d5e017372..558c6a81a5 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -548,6 +548,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         if (focusedItem instanceof SearchAdapterItem) {
             SearchTarget searchTarget = ((SearchAdapterItem) focusedItem).getSearchTarget();
             SearchEventTracker.INSTANCE.get(getContext()).quickSelect(searchTarget);
+            return true;
         }
         if (focusedItem.appInfo != null) {
             ItemInfo itemInfo = focusedItem.appInfo;
-- 
GitLab


From c4bef358b070b01be6fe9cfd18f8b1b0c666b395 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 28 Oct 2020 00:13:03 -0700
Subject: [PATCH 0346/1664] DO NOT MERGE Revert "Defer recreation until
 resumed"

Bug: 171707437
Test: Repro steps in bug

This reverts commit 3f8d868110b426e40e09ece8b305fd84c1dde60c.

Change-Id: I909ab701c674fe975982a7de06dc9e89dcd03aea
(cherry picked from commit 272f4541f98e314758c1cd90c96f3d42023db6a7)
---
 src/com/android/launcher3/BaseDraggingActivity.java | 13 +------------
 src/com/android/launcher3/Launcher.java             |  1 -
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java
index 0d90602278..52f0a4a612 100644
--- a/src/com/android/launcher3/BaseDraggingActivity.java
+++ b/src/com/android/launcher3/BaseDraggingActivity.java
@@ -42,7 +42,6 @@ import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 
-import com.android.launcher3.Launcher.OnResumeCallback;
 import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.logging.InstanceId;
 import com.android.launcher3.logging.InstanceIdSequence;
@@ -108,20 +107,10 @@ public abstract class BaseDraggingActivity extends BaseActivity
 
     private void updateTheme() {
         if (mThemeRes != Themes.getActivityThemeRes(this)) {
-            // Workaround (b/162812884): The system currently doesn't allow recreating an activity
-            // when it is not resumed, in such a case defer recreation until it is possible
-            if (hasBeenResumed()) {
-                recreate();
-            } else {
-                addOnResumeCallback(this::recreate);
-            }
+            recreate();
         }
     }
 
-    protected void addOnResumeCallback(OnResumeCallback callback) {
-        // To be overridden
-    }
-
     @Override
     public void onActionModeStarted(ActionMode mode) {
         super.onActionModeStarted(mode);
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 5c13590190..44f6ee17c3 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1977,7 +1977,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         return result;
     }
 
-    @Override
     public void addOnResumeCallback(OnResumeCallback callback) {
         mOnResumeCallbacks.add(callback);
     }
-- 
GitLab


From 6c0c61acd8e81be312e1edda5f9a3c85a0718746 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 8 Dec 2020 19:19:56 -0800
Subject: [PATCH 0347/1664] Keeping Launcher in overview UI if activity is
 restarting due to UI mode changes

Test: Verified Launcher behavior locally
Bug: 148988542
Change-Id: Id83e5e0892666af1420e8f8c711b83f1ea355188
---
 src/com/android/launcher3/Launcher.java       | 30 +++++++++++++------
 .../statemanager/StatefulActivity.java        |  4 ++-
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 5c13590190..0accfec353 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -18,6 +18,7 @@ package com.android.launcher3;
 
 import static android.content.pm.ActivityInfo.CONFIG_ORIENTATION;
 import static android.content.pm.ActivityInfo.CONFIG_SCREEN_SIZE;
+import static android.content.pm.ActivityInfo.CONFIG_UI_MODE;
 import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO;
 import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED;
 
@@ -1136,7 +1137,11 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         int stateOrdinal = savedState.getInt(RUNTIME_STATE, NORMAL.ordinal);
         LauncherState[] stateValues = LauncherState.values();
         LauncherState state = stateValues[stateOrdinal];
-        if (!state.shouldDisableRestore()) {
+
+        NonConfigInstance lastInstance = (NonConfigInstance) getLastNonConfigurationInstance();
+        boolean forceRestore = lastInstance != null
+                && (lastInstance.config.diff(mOldConfig) & CONFIG_UI_MODE) != 0;
+        if (forceRestore || !state.shouldDisableRestore()) {
             mStateManager.goToState(state, false /* animated */);
         }
 
@@ -1375,15 +1380,18 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
     @Override
     public Object onRetainNonConfigurationInstance() {
+        NonConfigInstance instance = new NonConfigInstance();
+        instance.config = new Configuration(mOldConfig);
+
         int width = mDragLayer.getWidth();
         int height = mDragLayer.getHeight();
 
         // TODO: b/172467144 Remove hardcoded ENABLE_ACTIVITY_CROSSFADE.
-        if (!ENABLE_ACTIVITY_CROSSFADE || width <= 0 || height <= 0) {
-            return null;
+        if (ENABLE_ACTIVITY_CROSSFADE && width > 0 && height > 0) {
+            instance.snapshot =
+                    BitmapRenderer.createHardwareBitmap(width, height, mDragLayer::draw);
         }
-
-        return BitmapRenderer.createHardwareBitmap(width, height, mDragLayer::draw);
+        return instance;
     }
 
     public AllAppsTransitionController getAllAppsController() {
@@ -2787,15 +2795,14 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
      * updates.
      */
     private void crossFadeWithPreviousAppearance() {
-        Bitmap previousAppearanceBitmap = (Bitmap) getLastNonConfigurationInstance();
+        NonConfigInstance lastInstance = (NonConfigInstance) getLastNonConfigurationInstance();
 
-        if (previousAppearanceBitmap == null) {
+        if (lastInstance == null || lastInstance.snapshot == null) {
             return;
         }
 
         ImageView crossFadeHelper = new ImageView(this);
-
-        crossFadeHelper.setImageBitmap(previousAppearanceBitmap);
+        crossFadeHelper.setImageBitmap(lastInstance.snapshot);
         crossFadeHelper.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
 
         InsettableFrameLayout.LayoutParams layoutParams = new InsettableFrameLayout.LayoutParams(
@@ -2815,4 +2822,9 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
                 .withEndAction(() -> getRootView().removeView(crossFadeHelper))
                 .start();
     }
+
+    private static class NonConfigInstance {
+        public Configuration config;
+        public Bitmap snapshot;
+    }
 }
diff --git a/src/com/android/launcher3/statemanager/StatefulActivity.java b/src/com/android/launcher3/statemanager/StatefulActivity.java
index dbe5f42e31..601e117f1c 100644
--- a/src/com/android/launcher3/statemanager/StatefulActivity.java
+++ b/src/com/android/launcher3/statemanager/StatefulActivity.java
@@ -121,7 +121,9 @@ public abstract class StatefulActivity<STATE_TYPE extends BaseState<STATE_TYPE>>
         final int origDragLayerChildCount = dragLayer.getChildCount();
         super.onStop();
 
-        getStateManager().moveToRestState();
+        if (!isChangingConfigurations()) {
+            getStateManager().moveToRestState();
+        }
 
         // Workaround for b/78520668, explicitly trim memory once UI is hidden
         onTrimMemory(TRIM_MEMORY_UI_HIDDEN);
-- 
GitLab


From ff6d94dd922756bc024d847dc8d41f72996bfbc9 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 28 Oct 2020 00:13:57 -0700
Subject: [PATCH 0348/1664] DO NOT MERGE Revert "Handle uiMode changes"

Bug: 171707437
Test: Repro steps on bug

This reverts commit 0ad7b172e67294d76e4fc8785336badb9d0a8344.

Change-Id: If30cbb6c155e879dc8307a0a4a06dfb548b389a1
(cherry picked from commit 4b4341d3a7df63796f09c9162a5678a865686134)
---
 AndroidManifest.xml                    | 2 +-
 quickstep/AndroidManifest-launcher.xml | 2 +-
 quickstep/AndroidManifest.xml          | 2 +-
 tests/AndroidManifest-common.xml       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 97bce9c1d7..56a25954ee 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -49,7 +49,7 @@
             android:stateNotNeeded="true"
             android:windowSoftInputMode="adjustPan"
             android:screenOrientation="unspecified"
-            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize"
             android:resizeableActivity="true"
             android:resumeWhilePausing="true"
             android:taskAffinity=""
diff --git a/quickstep/AndroidManifest-launcher.xml b/quickstep/AndroidManifest-launcher.xml
index 19f85e4c1f..53910e344b 100644
--- a/quickstep/AndroidManifest-launcher.xml
+++ b/quickstep/AndroidManifest-launcher.xml
@@ -49,7 +49,7 @@
             android:stateNotNeeded="true"
             android:windowSoftInputMode="adjustPan"
             android:screenOrientation="unspecified"
-            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize"
             android:resizeableActivity="true"
             android:resumeWhilePausing="true"
             android:taskAffinity=""
diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml
index 5be32a89b4..4e7c3fa75b 100644
--- a/quickstep/AndroidManifest.xml
+++ b/quickstep/AndroidManifest.xml
@@ -59,7 +59,7 @@
              android:stateNotNeeded="true"
              android:theme="@style/LauncherTheme"
              android:screenOrientation="unspecified"
-             android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
+             android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize"
              android:resizeableActivity="true"
              android:resumeWhilePausing="true"
              android:taskAffinity=""/>
diff --git a/tests/AndroidManifest-common.xml b/tests/AndroidManifest-common.xml
index bc6356ffa6..f243f279eb 100644
--- a/tests/AndroidManifest-common.xml
+++ b/tests/AndroidManifest-common.xml
@@ -98,7 +98,7 @@
         <activity
             android:name="com.android.launcher3.testcomponent.TestLauncherActivity"
             android:clearTaskOnLaunch="true"
-            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize"
             android:enabled="false"
             android:label="Test launcher"
             android:launchMode="singleTask"
-- 
GitLab


From f985f13ec1c74eda9dc84d8a67b9f43f52963e11 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Tue, 8 Dec 2020 22:32:14 -0800
Subject: [PATCH 0349/1664] Render animation for launching settings in live
 tile mode

Right now the animation is pretty basic. Will need to fine tune it.

Fixes: 172626326
Test: manual
Change-Id: Ibc64f6a988e1c7ad3f32732e1db2f0f29489e3f9
---
 .../android/quickstep/AbsSwipeUpHandler.java  | 43 ++++++++++++++-----
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index c59c045991..4dbc0f3c0c 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -19,7 +19,9 @@ import static android.widget.Toast.LENGTH_SHORT;
 
 import static com.android.launcher3.BaseActivity.INVISIBLE_BY_STATE_HANDLER;
 import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS;
+import static com.android.launcher3.QuickstepAppTransitionManagerImpl.RECENTS_LAUNCH_DURATION;
 import static com.android.launcher3.QuickstepAppTransitionManagerImpl.TRANSITION_OPEN_LAUNCHER;
+import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.anim.Interpolators.DEACCEL;
 import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
@@ -52,6 +54,7 @@ import android.annotation.TargetApi;
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Matrix;
 import android.graphics.PointF;
 import android.graphics.Rect;
 import android.os.Build;
@@ -92,7 +95,7 @@ import com.android.quickstep.util.ActivityInitListener;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
 import com.android.quickstep.util.InputConsumerProxy;
 import com.android.quickstep.util.MotionPauseDetector;
-import com.android.quickstep.util.RecentsOrientedState;
+import com.android.quickstep.util.MultiValueUpdateListener;
 import com.android.quickstep.util.ProtoTracer;
 import com.android.quickstep.util.RecentsOrientedState;
 import com.android.quickstep.util.RectFSpringAnim;
@@ -108,6 +111,7 @@ import com.android.systemui.shared.system.InputConsumerController;
 import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
 import com.android.systemui.shared.system.LatencyTrackerCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
+import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
 import com.android.systemui.shared.system.TaskInfoCompat;
 import com.android.systemui.shared.system.TaskStackChangeListener;
 
@@ -1498,17 +1502,36 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
     }
 
     private void launchOtherTaskInLiveTileMode(int taskId, RemoteAnimationTargetCompat[] apps) {
+        AnimatorSet anim = new AnimatorSet();
         TaskView taskView = mRecentsView.getTaskView(taskId);
-        if (taskView == null) {
-            return;
+        if (taskView == null || !mRecentsView.isTaskViewVisible(taskView)) {
+            // TODO: Refine this animation.
+            SurfaceTransactionApplier surfaceApplier =
+                    new SurfaceTransactionApplier(mActivity.getDragLayer());
+            ValueAnimator appAnimator = ValueAnimator.ofFloat(0, 1);
+            appAnimator.setDuration(RECENTS_LAUNCH_DURATION);
+            appAnimator.setInterpolator(ACCEL_DEACCEL);
+            appAnimator.addUpdateListener(new MultiValueUpdateListener() {
+                @Override
+                public void onUpdate(float percent) {
+                    SurfaceParams.Builder builder = new SurfaceParams.Builder(
+                            apps[apps.length - 1].leash);
+                    Matrix matrix = new Matrix();
+                    matrix.postScale(percent, percent);
+                    matrix.postTranslate(mDp.widthPx * (1 - percent) / 2,
+                            mDp.heightPx * (1 - percent) / 2);
+                    builder.withAlpha(percent).withMatrix(matrix);
+                    surfaceApplier.scheduleApply(builder.build());
+                }
+            });
+            anim.play(appAnimator);
+        } else {
+            TaskViewUtils.composeRecentsLaunchAnimator(
+                    anim, taskView, apps,
+                    mRecentsAnimationTargets.wallpapers, true /* launcherClosing */,
+                    mActivity.getStateManager(), mRecentsView,
+                    mActivityInterface.getDepthController());
         }
-
-        AnimatorSet anim = new AnimatorSet();
-        TaskViewUtils.composeRecentsLaunchAnimator(
-                anim, taskView, apps,
-                mRecentsAnimationTargets.wallpapers, true /* launcherClosing */,
-                mActivity.getStateManager(), mRecentsView,
-                mActivityInterface.getDepthController());
         anim.addListener(new AnimatorListenerAdapter(){
 
             @Override
-- 
GitLab


From 2ea01e4871c346222a83ea91fb9a3c091e85b07b Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Wed, 2 Dec 2020 13:48:18 -0600
Subject: [PATCH 0350/1664] Separate QSB from on device search

Bug: 175125073
[Preview attached to BR]

Change-Id: If967d95e32b58263ede5eb8a3c1b773cef789f28
---
 res/values/config.xml                          |  1 +
 src/com/android/launcher3/Hotseat.java         | 18 +++++++++++++++---
 src/com/android/launcher3/LauncherState.java   | 18 +++++++++++-------
 .../launcher3/ShortcutAndWidgetContainer.java  |  7 ++++---
 .../search/AppsSearchContainerLayout.java      |  4 +++-
 5 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/res/values/config.xml b/res/values/config.xml
index 46b8c23a62..41d1a12059 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -111,6 +111,7 @@
     <!-- QSB IDs. DO not change -->
     <item type="id" name="search_container_workspace" />
     <item type="id" name="search_container_all_apps" />
+    <item type="id" name="search_container_hotseat" />
 
     <!-- Recents -->
     <item type="id" name="overview_panel"/>
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index e4bdb395e1..4f4f2a75dd 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -27,6 +27,8 @@ import android.widget.FrameLayout;
 
 import androidx.annotation.Nullable;
 
+import com.android.launcher3.config.FeatureFlags;
+
 import java.util.function.Consumer;
 
 /**
@@ -38,7 +40,8 @@ public class Hotseat extends CellLayout implements Insettable {
     private boolean mHasVerticalHotseat;
     private Workspace mWorkspace;
     private boolean mSendTouchToWorkspace;
-    @Nullable private Consumer<Boolean> mOnVisibilityAggregatedCallback;
+    @Nullable
+    private Consumer<Boolean> mOnVisibilityAggregatedCallback;
 
     public Hotseat(Context context) {
         this(context, null);
@@ -73,8 +76,9 @@ public class Hotseat extends CellLayout implements Insettable {
         if (hasVerticalHotseat) {
             setGridSize(1, idp.numHotseatIcons);
         } else {
-            setGridSize(idp.numHotseatIcons, 1);
+            setGridSize(idp.numHotseatIcons, FeatureFlags.ENABLE_DEVICE_SEARCH.get() ? 2 : 1);
         }
+        showInlineQsb();
     }
 
     @Override
@@ -97,7 +101,11 @@ public class Hotseat extends CellLayout implements Insettable {
             lp.height = grid.hotseatBarSizePx + insets.bottom;
         }
         Rect padding = grid.getHotseatLayoutPadding();
-        setPadding(padding.left, padding.top, padding.right, padding.bottom);
+        int paddingBottom = padding.bottom;
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && !grid.isVerticalBarLayout()) {
+            paddingBottom -= grid.hotseatBarBottomPaddingPx;
+        }
+        setPadding(padding.left, padding.top, padding.right, paddingBottom);
 
         setLayoutParams(lp);
         InsettableFrameLayout.dispatchInsets(this, insets);
@@ -148,4 +156,8 @@ public class Hotseat extends CellLayout implements Insettable {
     public void setOnVisibilityAggregatedCallback(@Nullable Consumer<Boolean> callback) {
         mOnVisibilityAggregatedCallback = callback;
     }
+
+    protected void showInlineQsb() {
+        //Does nothing
+    }
 }
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java
index eba0ac9633..79476fc536 100644
--- a/src/com/android/launcher3/LauncherState.java
+++ b/src/com/android/launcher3/LauncherState.java
@@ -29,6 +29,7 @@ import static com.android.launcher3.testing.TestProtocol.SPRING_LOADED_STATE_ORD
 import android.content.Context;
 import android.view.animation.Interpolator;
 
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.statemanager.BaseState;
 import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.states.HintState;
@@ -168,9 +169,9 @@ public abstract class LauncherState implements BaseState<LauncherState> {
 
     /**
      * Returns an array of two elements.
-     *   The first specifies the scale for the overview
-     *   The second is the factor ([0, 1], 0 => center-screen; 1 => offscreen) by which overview
-     *   should be shifted horizontally.
+     * The first specifies the scale for the overview
+     * The second is the factor ([0, 1], 0 => center-screen; 1 => offscreen) by which overview
+     * should be shifted horizontally.
      */
     public float[] getOverviewScaleAndOffset(Launcher launcher) {
         return launcher.getNormalOverviewScaleAndOffset();
@@ -185,10 +186,12 @@ public abstract class LauncherState implements BaseState<LauncherState> {
     }
 
     public int getVisibleElements(Launcher launcher) {
-        if (launcher.getDeviceProfile().isVerticalBarLayout()) {
-            return HOTSEAT_ICONS | VERTICAL_SWIPE_INDICATOR;
+        int flags = HOTSEAT_ICONS | VERTICAL_SWIPE_INDICATOR;
+        if (!FeatureFlags.ENABLE_DEVICE_SEARCH.get()
+                && !launcher.getDeviceProfile().isVerticalBarLayout()) {
+            flags |= HOTSEAT_SEARCH_BOX;
         }
-        return HOTSEAT_ICONS | HOTSEAT_SEARCH_BOX | VERTICAL_SWIPE_INDICATOR;
+        return flags;
     }
 
     /**
@@ -229,6 +232,7 @@ public abstract class LauncherState implements BaseState<LauncherState> {
 
     /**
      * Returns the amount of blur and wallpaper zoom for this state with {@param isMultiWindowMode}.
+     *
      * @see #getDepth(Context).
      */
     public final float getDepth(Context context, boolean isMultiWindowMode) {
@@ -255,7 +259,7 @@ public abstract class LauncherState implements BaseState<LauncherState> {
         return new PageAlphaProvider(ACCEL_2) {
             @Override
             public float getPageAlpha(int pageIndex) {
-                return  pageIndex != centerPage ? 0 : 1f;
+                return pageIndex != centerPage ? 0 : 1f;
             }
         };
     }
diff --git a/src/com/android/launcher3/ShortcutAndWidgetContainer.java b/src/com/android/launcher3/ShortcutAndWidgetContainer.java
index 6326b7ac6d..ee0c7bb2f9 100644
--- a/src/com/android/launcher3/ShortcutAndWidgetContainer.java
+++ b/src/com/android/launcher3/ShortcutAndWidgetContainer.java
@@ -36,7 +36,8 @@ public class ShortcutAndWidgetContainer extends ViewGroup {
     // return an (x, y) value from helper functions. Do NOT use them to maintain other state.
     private final int[] mTmpCellXY = new int[2];
 
-    @ContainerType private final int mContainerType;
+    @ContainerType
+    private final int mContainerType;
     private final WallpaperManager mWallpaperManager;
 
     private int mCellWidth;
@@ -44,7 +45,7 @@ public class ShortcutAndWidgetContainer extends ViewGroup {
 
     private int mCountX;
 
-    private ActivityContext mActivity;
+    private final ActivityContext mActivity;
     private boolean mInvertIfRtl = false;
 
     public ShortcutAndWidgetContainer(Context context, @ContainerType int containerType) {
@@ -79,7 +80,7 @@ public class ShortcutAndWidgetContainer extends ViewGroup {
         int count = getChildCount();
 
         int widthSpecSize = MeasureSpec.getSize(widthMeasureSpec);
-        int heightSpecSize =  MeasureSpec.getSize(heightMeasureSpec);
+        int heightSpecSize = MeasureSpec.getSize(heightMeasureSpec);
         setMeasuredDimension(widthSpecSize, heightSpecSize);
 
         for (int i = 0; i < count; i++) {
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
index 000ccbb13a..bd2f04d4ee 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
@@ -47,6 +47,7 @@ import com.android.launcher3.allapps.AllAppsStore;
 import com.android.launcher3.allapps.AlphabeticalAppsList;
 import com.android.launcher3.allapps.SearchUiManager;
 import com.android.launcher3.anim.PropertySetter;
+import com.android.launcher3.config.FeatureFlags;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -215,7 +216,8 @@ public class AppsSearchContainerLayout extends ExtendedEditText
 
     @Override
     public float getScrollRangeDelta(Rect insets) {
-        if (mLauncher.getDeviceProfile().isVerticalBarLayout()) {
+        if (mLauncher.getDeviceProfile().isVerticalBarLayout()
+                || FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
             return 0;
         } else {
             return insets.bottom + insets.top;
-- 
GitLab


From 3b55aab715de0d83c7036b16b17983a2aa494204 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Wed, 9 Dec 2020 11:43:18 -0800
Subject: [PATCH 0351/1664] Adding tracing for app-to-overview

It will help finding jank in the quick switch
scenario.

Also removing tracing for cases when it's done
by the jank monitor.

Test: manual
Bug: 174892351
Change-Id: I16fc784ddb52203dba54eab2700b5a04a10088ff
---
 .../QuickstepAppTransitionManagerImpl.java     | 18 +++---------------
 .../android/quickstep/AbsSwipeUpHandler.java   |  9 ---------
 .../quickstep/OverviewCommandHelper.java       |  9 +++++++++
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
index 3e9f82b6cc..cc3b7b6a64 100644
--- a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
@@ -57,7 +57,6 @@ import android.graphics.drawable.Drawable;
 import android.os.CancellationSignal;
 import android.os.Handler;
 import android.os.Looper;
-import android.os.Trace;
 import android.util.Pair;
 import android.view.View;
 
@@ -140,7 +139,6 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
 
     // Progress = 0: All apps is fully pulled up, Progress = 1: All apps is fully pulled down.
     public static final float ALL_APPS_PROGRESS_OFF_SCREEN = 1.3059858f;
-    public static final String TRANSITION_OPEN_LAUNCHER = "transition:OpenLauncher";
 
     protected final BaseQuickstepLauncher mLauncher;
 
@@ -805,11 +803,10 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                 == PackageManager.PERMISSION_GRANTED;
     }
 
-    private void addCujInstrumentation(Animator anim, int cuj, String transition) {
+    private void addCujInstrumentation(Animator anim, int cuj) {
         anim.addListener(new AnimationSuccessListener() {
             @Override
             public void onAnimationStart(Animator animation) {
-                Trace.beginAsyncSection(transition, 0);
                 InteractionJankMonitorWrapper.begin(cuj);
                 super.onAnimationStart(animation);
             }
@@ -824,12 +821,6 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
             public void onAnimationSuccess(Animator animator) {
                 InteractionJankMonitorWrapper.end(cuj);
             }
-
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                super.onAnimationEnd(animation);
-                Trace.endAsyncSection(TRANSITION_OPEN_LAUNCHER, 0);
-            }
         });
     }
 
@@ -898,8 +889,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                 if (launcherIsATargetWithMode(appTargets, MODE_OPENING)
                         || mLauncher.isForceInvisible()) {
                     addCujInstrumentation(
-                            anim, InteractionJankMonitorWrapper.CUJ_APP_CLOSE_TO_HOME,
-                            TRANSITION_OPEN_LAUNCHER);
+                            anim, InteractionJankMonitorWrapper.CUJ_APP_CLOSE_TO_HOME);
                     // Only register the content animation for cancellation when state changes
                     mLauncher.getStateManager().setCurrentAnimation(anim);
 
@@ -971,9 +961,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
             addCujInstrumentation(anim,
                     launchingFromRecents
                             ? InteractionJankMonitorWrapper.CUJ_APP_LAUNCH_FROM_RECENTS
-                            : InteractionJankMonitorWrapper.CUJ_APP_LAUNCH_FROM_ICON,
-                    launchingFromRecents
-                            ? TRANSITION_LAUNCH_FROM_RECENTS : TRANSITION_LAUNCH_FROM_ICON);
+                            : InteractionJankMonitorWrapper.CUJ_APP_LAUNCH_FROM_ICON);
 
             if (launcherClosing) {
                 anim.addListener(mForceInvisibleListener);
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 4dbc0f3c0c..5838aa814e 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -20,7 +20,6 @@ import static android.widget.Toast.LENGTH_SHORT;
 import static com.android.launcher3.BaseActivity.INVISIBLE_BY_STATE_HANDLER;
 import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS;
 import static com.android.launcher3.QuickstepAppTransitionManagerImpl.RECENTS_LAUNCH_DURATION;
-import static com.android.launcher3.QuickstepAppTransitionManagerImpl.TRANSITION_OPEN_LAUNCHER;
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.anim.Interpolators.DEACCEL;
 import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
@@ -59,7 +58,6 @@ import android.graphics.PointF;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.SystemClock;
-import android.os.Trace;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
@@ -1217,7 +1215,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         anim.addAnimatorListener(new AnimationSuccessListener() {
             @Override
             public void onAnimationStart(Animator animation) {
-                Trace.beginAsyncSection(TRANSITION_OPEN_LAUNCHER, 0);
                 InteractionJankMonitorWrapper.begin(cuj);
                 if (mActivity != null) {
                     removeLiveTileOverlay();
@@ -1240,12 +1237,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                 super.onAnimationCancel(animation);
                 InteractionJankMonitorWrapper.cancel(cuj);
             }
-
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                super.onAnimationEnd(animation);
-                Trace.endAsyncSection(TRANSITION_OPEN_LAUNCHER, 0);
-            }
         });
         if (mRecentsAnimationTargets != null) {
             mRecentsAnimationTargets.addReleaseCheck(anim);
diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
index 43581ca592..2559a6f22e 100644
--- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
@@ -25,6 +25,7 @@ import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build;
 import android.os.SystemClock;
+import android.os.Trace;
 import android.view.ViewConfiguration;
 
 import androidx.annotation.BinderThread;
@@ -141,6 +142,7 @@ public class OverviewCommandHelper {
 
     private class RecentsActivityCommand<T extends StatefulActivity<?>> implements Runnable {
 
+        private static final String TRANSITION_NAME = "Transition:toOverview";
         protected final BaseActivityInterface<?, T> mActivityInterface;
         private final long mCreateTime;
         private final AppToOverviewAnimationProvider<T> mAnimationProvider;
@@ -223,9 +225,16 @@ public class OverviewCommandHelper {
             AnimatorSet animatorSet = mAnimationProvider.createWindowAnimation(appTargets,
                     wallpaperTargets);
             animatorSet.addListener(new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationStart(Animator animation) {
+                    Trace.beginAsyncSection(TRANSITION_NAME, 0);
+                    super.onAnimationStart(animation);
+                }
+
                 @Override
                 public void onAnimationEnd(Animator animation) {
                     onTransitionComplete();
+                    Trace.endAsyncSection(TRANSITION_NAME, 0);
                 }
             });
             return animatorSet;
-- 
GitLab


From 4b2403bbdf41399ab6319a7f9626ff7f7d23c986 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Wed, 9 Dec 2020 11:11:14 -0800
Subject: [PATCH 0352/1664] Fix NPE inside SEarchResultThumbnailView on
 cropping Bug: 175161949 Test: builds. Created screenshot of landscape portion
 and verified

Change-Id: Ib80147bcb40cf73364e8bed91f38019716aa71c8
---
 .../launcher3/views/ThumbnailSearchResultView.java   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/views/ThumbnailSearchResultView.java b/src/com/android/launcher3/views/ThumbnailSearchResultView.java
index f213f229a8..573d48f799 100644
--- a/src/com/android/launcher3/views/ThumbnailSearchResultView.java
+++ b/src/com/android/launcher3/views/ThumbnailSearchResultView.java
@@ -88,9 +88,15 @@ public class ThumbnailSearchResultView extends androidx.appcompat.widget.AppComp
             bitmap = ((BitmapDrawable) target.getRemoteAction().getIcon()
                     .loadDrawable(getContext())).getBitmap();
             // crop
-            bitmap = Bitmap.createBitmap(bitmap, 0,
-                    bitmap.getHeight() / 2 - bitmap.getWidth() / 2,
-                    bitmap.getWidth(), bitmap.getWidth());
+            if (bitmap.getWidth() < bitmap.getHeight()) {
+                bitmap = Bitmap.createBitmap(bitmap, 0,
+                        bitmap.getHeight() / 2 - bitmap.getWidth() / 2,
+                        bitmap.getWidth(), bitmap.getWidth());
+            } else {
+                bitmap = Bitmap.createBitmap(bitmap, bitmap.getWidth() / 2 - bitmap.getHeight() / 2,
+                        0,
+                        bitmap.getHeight(), bitmap.getHeight());
+            }
             setTag(itemInfo);
         } else {
             bitmap = (Bitmap) target.getExtras().getParcelable("bitmap");
-- 
GitLab


From b8df6a573a35dcd199c6a77227ff07c3f3e53b95 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Thu, 10 Dec 2020 11:01:27 -0600
Subject: [PATCH 0353/1664] Resolve Flaky work tab tests

In cases where test execution and launcher relayout overlap, mLauncher.getAppsView().getContentView() returns a recyclerview instead of pagedView. This is resolved when rebindAdapters is later called with showTabs=true. The issue here is we are keeping a stale value of mLauncher.getAppsView().getContentView() in WorkEduView which is problematic as pagedView is required to set the right tab index for the test.

This behavior also affects work testWorkEduIntermittent as we need to verify the a pagedView is visible before text execution.
Bug: 149867607
Bug: 159671700
Test: flake -t com.android.launcher3.ui.WorkTabTest

Change-Id: I4b0968d6b9daa5c8fe741d4b1ed090f9c7acabed
---
 .../android/launcher3/views/WorkEduView.java    | 17 +++++++++--------
 .../com/android/launcher3/ui/WorkTabTest.java   |  7 ++++++-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/com/android/launcher3/views/WorkEduView.java b/src/com/android/launcher3/views/WorkEduView.java
index d6737db725..03d3026069 100644
--- a/src/com/android/launcher3/views/WorkEduView.java
+++ b/src/com/android/launcher3/views/WorkEduView.java
@@ -60,7 +60,6 @@ public class WorkEduView extends AbstractSlideInView
     private View mViewWrapper;
     private Button mProceedButton;
     private TextView mContentText;
-    private AllAppsPagedView mAllAppsPagedView;
 
     private int mNextWorkEduStep = WORK_EDU_PERSONAL_APPS;
 
@@ -101,13 +100,10 @@ public class WorkEduView extends AbstractSlideInView
 
         // make sure layout does not shrink when we change the text
         mContentText.post(() -> mContentText.setMinLines(mContentText.getLineCount()));
-        if (mLauncher.getAppsView().getContentView() instanceof AllAppsPagedView) {
-            mAllAppsPagedView = (AllAppsPagedView) mLauncher.getAppsView().getContentView();
-        }
 
         mProceedButton.setOnClickListener(view -> {
-            if (mAllAppsPagedView != null) {
-                mAllAppsPagedView.snapToPage(AllAppsContainerView.AdapterHolder.WORK);
+            if (getAllAppsPagedView() != null) {
+                getAllAppsPagedView().snapToPage(AllAppsContainerView.AdapterHolder.WORK);
             }
             goToWorkTab(true);
         });
@@ -155,8 +151,8 @@ public class WorkEduView extends AbstractSlideInView
     }
 
     private void goToFirstPage() {
-        if (mAllAppsPagedView != null) {
-            mAllAppsPagedView.snapToPageImmediately(AllAppsContainerView.AdapterHolder.MAIN);
+        if (getAllAppsPagedView() != null) {
+            getAllAppsPagedView().snapToPageImmediately(AllAppsContainerView.AdapterHolder.MAIN);
         }
     }
 
@@ -171,6 +167,11 @@ public class WorkEduView extends AbstractSlideInView
         mOpenCloseAnimator.start();
     }
 
+    private AllAppsPagedView getAllAppsPagedView() {
+        View v =  mLauncher.getAppsView().getContentView();
+        return  (v instanceof AllAppsPagedView)  ? (AllAppsPagedView) v : null;
+    }
+
     /**
      * Checks if user has not seen onboarding UI yet and shows it when user navigates to all apps
      */
diff --git a/tests/src/com/android/launcher3/ui/WorkTabTest.java b/tests/src/com/android/launcher3/ui/WorkTabTest.java
index 1e1cf04dfd..ac0d355704 100644
--- a/tests/src/com/android/launcher3/ui/WorkTabTest.java
+++ b/tests/src/com/android/launcher3/ui/WorkTabTest.java
@@ -82,6 +82,7 @@ public class WorkTabTest extends AbstractLauncherUiTest {
         mDevice.pressHome();
         waitForLauncherCondition("Launcher didn't start", Objects::nonNull);
         executeOnLauncher(launcher -> launcher.getStateManager().goToState(ALL_APPS));
+        waitForState("Launcher internal state didn't switch to All Apps", () -> ALL_APPS);
         waitForLauncherCondition("Personal tab is missing",
                 launcher -> launcher.getAppsView().isPersonalTabVisible(), 60000);
         waitForLauncherCondition("Work tab is missing",
@@ -180,6 +181,10 @@ public class WorkTabTest extends AbstractLauncherUiTest {
         // open work tab
         executeOnLauncher(launcher -> launcher.getStateManager().goToState(ALL_APPS));
         waitForState("Launcher did not switch to all apps", () -> ALL_APPS);
+        waitForLauncherCondition("Work tab not setup",
+                launcher -> launcher.getAppsView().getContentView() instanceof AllAppsPagedView,
+                60000);
+
         executeOnLauncher(launcher -> {
             AllAppsPagedView pagedView = (AllAppsPagedView) launcher.getAppsView().getContentView();
             pagedView.setCurrentPage(WORK_PAGE);
@@ -199,7 +204,7 @@ public class WorkTabTest extends AbstractLauncherUiTest {
             DragLayer dragLayer = l.getDragLayer();
             return dragLayer.getChildCount() > 0 && dragLayer.getChildAt(
                     dragLayer.getChildCount() - 1) instanceof WorkEduView;
-        });
+        }, 6000);
         return getFromLauncher(launcher -> (WorkEduView) launcher.getDragLayer().getChildAt(
                 launcher.getDragLayer().getChildCount() - 1));
     }
-- 
GitLab


From 5794fa1aba3d1b7e4fd3dd9d54110dcb566bdcb6 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Mon, 7 Dec 2020 18:36:01 -0800
Subject: [PATCH 0354/1664] Jank: taking screenshot in helper thread for quick
 switch

This operation is prone to lock contention.

Test: Manual
Bug: 173640772, 173072373
Change-Id: I86088255fa0cd8b369d9efec53fdac81210e71db
---
 .../android/quickstep/AbsSwipeUpHandler.java  | 64 +++++++++++++------
 1 file changed, 43 insertions(+), 21 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 4dbc0f3c0c..6cac7f9ce8 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -33,6 +33,7 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_QUICKSWITCH_RIGHT;
 import static com.android.launcher3.util.DisplayController.getSingleFrameMs;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW;
 import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;
 import static com.android.quickstep.GestureState.GestureEndTarget.HOME;
@@ -1395,34 +1396,55 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
             if (mRecentsAnimationController != null) {
                 // Update the screenshot of the task
                 if (mTaskSnapshot == null) {
-                    mTaskSnapshot = mRecentsAnimationController.screenshotTask(runningTaskId);
-                }
-                final TaskView taskView;
-                if (mGestureState.getEndTarget() == HOME) {
-                    // Capture the screenshot before finishing the transition to home to ensure it's
-                    // taken in the correct orientation, but no need to update the thumbnail.
-                    taskView = null;
-                } else {
-                    taskView = mRecentsView.updateThumbnail(runningTaskId, mTaskSnapshot);
-                }
-                if (taskView != null && !mCanceled) {
-                    // Defer finishing the animation until the next launcher frame with the
-                    // new thumbnail
-                    finishTransitionPosted = ViewUtils.postFrameDrawn(taskView,
-                            () -> mStateCallback.setStateOnUiThread(STATE_SCREENSHOT_CAPTURED),
-                            this::isCanceled);
+                    UI_HELPER_EXECUTOR.execute(() -> {
+                        final ThumbnailData taskSnapshot =
+                                mRecentsAnimationController.screenshotTask(runningTaskId);
+                        MAIN_EXECUTOR.execute(() -> {
+                            mTaskSnapshot = taskSnapshot;
+                            if (!updateThumbnail(runningTaskId)) {
+                                setScreenshotCapturedState();
+                            }
+                        });
+                    });
+                    return;
                 }
+                finishTransitionPosted = updateThumbnail(runningTaskId);
             }
             if (!finishTransitionPosted) {
-                // If we haven't posted a draw callback, set the state immediately.
-                Object traceToken = TraceHelper.INSTANCE.beginSection(SCREENSHOT_CAPTURED_EVT,
-                        TraceHelper.FLAG_CHECK_FOR_RACE_CONDITIONS);
-                mStateCallback.setStateOnUiThread(STATE_SCREENSHOT_CAPTURED);
-                TraceHelper.INSTANCE.endSection(traceToken);
+                setScreenshotCapturedState();
             }
         }
     }
 
+    // Returns whether finish transition was posted.
+    private boolean updateThumbnail(int runningTaskId) {
+        boolean finishTransitionPosted = false;
+        final TaskView taskView;
+        if (mGestureState.getEndTarget() == HOME) {
+            // Capture the screenshot before finishing the transition to home to ensure it's
+            // taken in the correct orientation, but no need to update the thumbnail.
+            taskView = null;
+        } else {
+            taskView = mRecentsView.updateThumbnail(runningTaskId, mTaskSnapshot);
+        }
+        if (taskView != null && !mCanceled) {
+            // Defer finishing the animation until the next launcher frame with the
+            // new thumbnail
+            finishTransitionPosted = ViewUtils.postFrameDrawn(taskView,
+                    () -> mStateCallback.setStateOnUiThread(STATE_SCREENSHOT_CAPTURED),
+                    this::isCanceled);
+        }
+        return finishTransitionPosted;
+    }
+
+    private void setScreenshotCapturedState() {
+        // If we haven't posted a draw callback, set the state immediately.
+        Object traceToken = TraceHelper.INSTANCE.beginSection(SCREENSHOT_CAPTURED_EVT,
+                TraceHelper.FLAG_CHECK_FOR_RACE_CONDITIONS);
+        mStateCallback.setStateOnUiThread(STATE_SCREENSHOT_CAPTURED);
+        TraceHelper.INSTANCE.endSection(traceToken);
+    }
+
     private void finishCurrentTransitionToRecents() {
         if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
             mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);
-- 
GitLab


From 4b77e83a42e308a1c7dfe455f3f062874ab71ff2 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Thu, 10 Dec 2020 15:46:02 -0800
Subject: [PATCH 0355/1664] Not using blocking call to populate task title for
 logging

For now, passing null title

Bug: 175048504, 173072373
Test: presubmit
Change-Id: Ia2ed5433be9490d71786c98b8244f1c76e4e3088
---
 quickstep/src/com/android/quickstep/views/TaskView.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 1b55496cac..d94e623ad4 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -251,13 +251,14 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
      * Builds proto for logging
      */
     public WorkspaceItemInfo getItemInfo() {
-        ComponentKey componentKey = TaskUtils.getLaunchComponentKeyForTask(getTask().key);
+        final Task task = getTask();
+        ComponentKey componentKey = TaskUtils.getLaunchComponentKeyForTask(task.key);
         WorkspaceItemInfo stubInfo = new WorkspaceItemInfo();
         stubInfo.itemType = LauncherSettings.Favorites.ITEM_TYPE_TASK;
         stubInfo.container = LauncherSettings.Favorites.CONTAINER_TASKSWITCHER;
         stubInfo.user = componentKey.user;
         stubInfo.intent = new Intent().setComponent(componentKey.componentName);
-        stubInfo.title = TaskUtils.getTitle(getContext(), getTask());
+        stubInfo.title = task.title;
         stubInfo.screenId = getRecentsView().indexOfChild(this);
         return stubInfo;
     }
-- 
GitLab


From cfcefb0c47552c149d4c614d04ea3a560c5f7d23 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 10 Dec 2020 16:22:41 -0800
Subject: [PATCH 0356/1664] Synchronizing model data access

Test: Presubmit
Bug: 173328873
Change-Id: Ifc1724e17ebfa2ee5f21bb3f272986b8a14fdbc1
---
 .../hybridhotseat/HotseatPredictionModel.java   |  3 +--
 .../graphics/LauncherPreviewRenderer.java       | 12 +++++++-----
 .../android/launcher3/model/BgDataModel.java    | 10 ++++++++++
 src/com/android/launcher3/model/LoaderTask.java | 17 +++++++----------
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionModel.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionModel.java
index 8f31c22d15..080633a653 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionModel.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionModel.java
@@ -52,8 +52,7 @@ public class HotseatPredictionModel {
     public static Bundle convertDataModelToAppTargetBundle(Context context, BgDataModel dataModel) {
         Bundle bundle = new Bundle();
         ArrayList<AppTargetEvent> events = new ArrayList<>();
-        ArrayList<ItemInfo> workspaceItems = new ArrayList<>(dataModel.workspaceItems);
-        workspaceItems.addAll(dataModel.appWidgets);
+        ArrayList<ItemInfo> workspaceItems = dataModel.getAllWorkspaceItems();
         for (ItemInfo item : workspaceItems) {
             AppTarget target = getAppTargetFromInfo(context, item);
             if (target != null && !isTrackedForPrediction(item)) continue;
diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index effb3a4a0c..efc1201bba 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -629,11 +629,13 @@ public class LauncherPreviewRenderer extends ContextThemeWrapper
         private WorkspaceResult(BgDataModel dataModel,
                 WidgetsModel widgetsModel,
                 Map<ComponentKey, AppWidgetProviderInfo> widgetProviderInfoMap) {
-            mWorkspaceItems = dataModel.workspaceItems;
-            mAppWidgets = dataModel.appWidgets;
-            mHotseatPredictions = dataModel.extraItems.get(CONTAINER_HOTSEAT_PREDICTION);
-            mWidgetsModel = widgetsModel;
-            mWidgetProvidersMap = widgetProviderInfoMap;
+            synchronized (dataModel) {
+                mWorkspaceItems = dataModel.workspaceItems;
+                mAppWidgets = dataModel.appWidgets;
+                mHotseatPredictions = dataModel.extraItems.get(CONTAINER_HOTSEAT_PREDICTION);
+                mWidgetsModel = widgetsModel;
+                mWidgetProvidersMap = widgetProviderInfoMap;
+            }
         }
     }
 }
diff --git a/src/com/android/launcher3/model/BgDataModel.java b/src/com/android/launcher3/model/BgDataModel.java
index 49b40edb76..c217a475a1 100644
--- a/src/com/android/launcher3/model/BgDataModel.java
+++ b/src/com/android/launcher3/model/BgDataModel.java
@@ -375,6 +375,16 @@ public class BgDataModel {
         }
     }
 
+    /**
+     * Returns a list containing all workspace items including widgets.
+     */
+    public synchronized ArrayList<ItemInfo> getAllWorkspaceItems() {
+        ArrayList<ItemInfo> items = new ArrayList<>(workspaceItems.size() + appWidgets.size());
+        items.addAll(workspaceItems);
+        items.addAll(appWidgets);
+        return items;
+    }
+
     /**
      * Calls the provided {@code op} for all workspaceItems in the in-memory model (both persisted
      * items and dynamic/predicted items for the provided {@code userHandle}.
diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index b108788061..8e085ce52d 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -166,12 +166,7 @@ public class LoaderTask implements Runnable {
 
     private void sendFirstScreenActiveInstallsBroadcast() {
         ArrayList<ItemInfo> firstScreenItems = new ArrayList<>();
-
-        ArrayList<ItemInfo> allItems = new ArrayList<>();
-        synchronized (mBgDataModel) {
-            allItems.addAll(mBgDataModel.workspaceItems);
-            allItems.addAll(mBgDataModel.appWidgets);
-        }
+        ArrayList<ItemInfo> allItems = mBgDataModel.getAllWorkspaceItems();
         // Screen set is never empty
         final int firstScreen = mBgDataModel.collectWorkspaceScreens().get(0);
 
@@ -858,10 +853,12 @@ public class LoaderTask implements Runnable {
                     .call(contentResolver,
                             LauncherSettings.Settings.METHOD_DELETE_EMPTY_FOLDERS)
                     .getIntArray(LauncherSettings.Settings.EXTRA_VALUE);
-            for (int folderId : deletedFolderIds) {
-                mBgDataModel.workspaceItems.remove(mBgDataModel.folders.get(folderId));
-                mBgDataModel.folders.remove(folderId);
-                mBgDataModel.itemsIdMap.remove(folderId);
+            synchronized (mBgDataModel) {
+                for (int folderId : deletedFolderIds) {
+                    mBgDataModel.workspaceItems.remove(mBgDataModel.folders.get(folderId));
+                    mBgDataModel.folders.remove(folderId);
+                    mBgDataModel.itemsIdMap.remove(folderId);
+                }
             }
 
             // Remove any ghost widgets
-- 
GitLab


From e98f980a9826be66c8e8adf495a94478d4636025 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 10 Dec 2020 16:58:23 -0800
Subject: [PATCH 0357/1664] Ignoring crash if the 3p icon surface is no longer
 valid

Test: Verified on device locally
Change-Id: I5684731c3a66d5690f83878f3c4726d859349bd4
---
 .../src/com/android/quickstep/FallbackSwipeHandler.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
index ffb05dfed7..901040dcc6 100644
--- a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
+++ b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
@@ -294,8 +294,12 @@ public class FallbackSwipeHandler extends
             if (mSurfaceControl != null) {
                 currentRect.roundOut(mTempRect);
                 Transaction t = new Transaction();
-                t.setGeometry(mSurfaceControl, null, mTempRect, Surface.ROTATION_0);
-                t.apply();
+                try {
+                    t.setGeometry(mSurfaceControl, null, mTempRect, Surface.ROTATION_0);
+                    t.apply();
+                } catch (RuntimeException e) {
+                    // Ignore
+                }
             }
         }
 
-- 
GitLab


From 73dcc9878d2874fc9f3bbf5fc8f8818f28243ade Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Fri, 11 Dec 2020 14:14:46 -0800
Subject: [PATCH 0358/1664] Add FeatureFlag for ENABLE_FOUR_COLUMNS.

Will be paired with new device profile used to dogfood
upcoming grid changes.

Bug: 175329686
Change-Id: Iab08d9ed0dec14fd6a05c4485ac4e066533d2540
---
 src/com/android/launcher3/InvariantDeviceProfile.java | 4 ++++
 src/com/android/launcher3/config/FeatureFlags.java    | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index ff53b5fae6..1d88e83f16 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -19,6 +19,7 @@ package com.android.launcher3;
 import static com.android.launcher3.Utilities.getDevicePrefs;
 import static com.android.launcher3.Utilities.getPointString;
 import static com.android.launcher3.config.FeatureFlags.APPLY_CONFIG_AT_RUNTIME;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_FOUR_COLUMNS;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.PackageManagerHelper.getPackageFilter;
 
@@ -215,6 +216,9 @@ public class InvariantDeviceProfile {
     }
 
     public static String getCurrentGridName(Context context) {
+        if (ENABLE_FOUR_COLUMNS.get()) {
+            return ENABLE_FOUR_COLUMNS.key;
+        }
         return Utilities.isGridOptionsEnabled(context)
                 ? Utilities.getPrefs(context).getString(KEY_IDP_GRID_NAME, null) : null;
     }
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 8f63c0966d..883eab0159 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -190,6 +190,10 @@ public final class FeatureFlags {
             "EXPANDED_SMARTSPACE", false, "Expands smartspace height to two rows. "
               + "Any apps occupying the first row will be removed from workspace.");
 
+    public static final BooleanFlag ENABLE_FOUR_COLUMNS = new DeviceFlag(
+            "ENABLE_FOUR_COLUMNS", false, "Uses 4 columns in launcher grid."
+            + "Warning: This will permanently alter your home screen items and is not reversible.");
+
     public static void initialize(Context context) {
         synchronized (sDebugFlags) {
             for (DebugFlag flag : sDebugFlags) {
-- 
GitLab


From e3386502cf0c26ad20ca2029239abc4b02a57c8b Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 11 Dec 2020 15:18:33 -0800
Subject: [PATCH 0359/1664] Fix TaskViewTouchController crash in seascape

Previously, we were using scroll direction POSITIVE as a catch all
to mean "up" but in seascape, we actually want NEGATIVE. Added
getUpDirection() to capture that. Tried to clarify the code a bit
by putting all the methods used solely by TaskViewTouchController
together with documentation. It's still pretty confusing and feels
redundant, but couldn't think of an obvious way to simplify.

Test: Swipe up and down on a task in all permutations of:
- 3 button mode
- Gesture navigation
- Portrait
- Landscape
- Seascape
- LTR
- RTL
- Home rotation allowed
- Home rotation disallowed

Fixes: 174009771
Fixes: 173567204
Change-Id: Id0f8d6f4365d888eb46182d8544d18206795dfb8
---
 .../TaskViewTouchController.java              | 25 +++++++----
 .../touch/LandscapePagedViewHandler.java      | 40 ++++++++++-------
 .../touch/PagedOrientationHandler.java        | 13 ++++--
 .../touch/PortraitPagedViewHandler.java       | 44 ++++++++++++-------
 .../touch/SeascapePagedViewHandler.java       | 37 +++++++++++-----
 .../touch/SingleAxisSwipeDetector.java        | 14 ++++--
 6 files changed, 115 insertions(+), 58 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
index 97296957fe..9a3a67f859 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
@@ -18,8 +18,6 @@ package com.android.launcher3.uioverrides.touchcontrollers;
 import static com.android.launcher3.AbstractFloatingView.TYPE_ACCESSIBLE;
 import static com.android.launcher3.LauncherAnimUtils.SUCCESS_TRANSITION_PROGRESS;
 import static com.android.launcher3.touch.SingleAxisSwipeDetector.DIRECTION_BOTH;
-import static com.android.launcher3.touch.SingleAxisSwipeDetector.DIRECTION_NEGATIVE;
-import static com.android.launcher3.touch.SingleAxisSwipeDetector.DIRECTION_POSITIVE;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -59,6 +57,8 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
 
     private AnimatorPlaybackController mCurrentAnimation;
     private boolean mCurrentAnimationIsGoingUp;
+    private boolean mAllowGoingUp;
+    private boolean mAllowGoingDown;
 
     private boolean mNoIntercept;
 
@@ -74,7 +74,7 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
         mRecentsView = activity.getOverviewPanel();
         mIsRtl = Utilities.isRtl(activity.getResources());
         SingleAxisSwipeDetector.Direction dir =
-            mRecentsView.getPagedOrientationHandler().getOppositeSwipeDirection();
+                mRecentsView.getPagedOrientationHandler().getUpDownSwipeDirection();
         mDetector = new SingleAxisSwipeDetector(activity, this, dir);
     }
 
@@ -148,15 +148,24 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
                             break;
                         }
                         mTaskBeingDragged = view;
+                        int upDirection = mRecentsView.getPagedOrientationHandler()
+                                .getUpDirection(mIsRtl);
                         if (!SysUINavigationMode.getMode(mActivity).hasGestures) {
                             // Don't allow swipe down to open if we don't support swipe up
                             // to enter overview.
-                            directionsToDetectScroll = DIRECTION_POSITIVE;
+                            directionsToDetectScroll = upDirection;
+                            mAllowGoingUp = true;
+                            mAllowGoingDown = false;
                         } else {
                             // The task can be dragged up to dismiss it,
                             // and down to open if it's the current page.
-                            directionsToDetectScroll = i == mRecentsView.getCurrentPage()
-                                    ? DIRECTION_BOTH : DIRECTION_POSITIVE;
+                            mAllowGoingUp = true;
+                            if (i == mRecentsView.getCurrentPage()) {
+                                mAllowGoingDown = true;
+                                directionsToDetectScroll = DIRECTION_BOTH;
+                            } else {
+                                directionsToDetectScroll = upDirection;
+                            }
                         }
                         break;
                     }
@@ -189,9 +198,7 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
             // No need to init
             return;
         }
-        int scrollDirections = mDetector.getScrollDirections();
-        if (goingUp && ((scrollDirections & DIRECTION_POSITIVE) == 0)
-                || !goingUp && ((scrollDirections & DIRECTION_NEGATIVE) == 0)) {
+        if ((goingUp && !mAllowGoingUp) || (!goingUp && !mAllowGoingDown)) {
             // Trying to re-init in an unsupported direction.
             return;
         }
diff --git a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
index 1d7f747c02..f05f15e01d 100644
--- a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
+++ b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
@@ -74,11 +74,6 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
         out.screenCenter = insets.top + view.getPaddingTop() + out.scroll + out.halfPageSize;
     }
 
-    @Override
-    public boolean isGoingUp(float displacement, boolean isRtl) {
-        return isRtl ? displacement < 0 : displacement > 0;
-    }
-
     @Override
     public boolean isLayoutNaturalToLauncher() {
         return false;
@@ -214,11 +209,6 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
         return view.getHeight() - view.getPaddingBottom() - insets.bottom;
     }
 
-    @Override
-    public SingleAxisSwipeDetector.Direction getOppositeSwipeDirection() {
-        return HORIZONTAL;
-    }
-
     @Override
     public int getPrimaryTranslationDirectionFactor() {
         return -1;
@@ -228,11 +218,6 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
         return 1;
     }
 
-    @Override
-    public int getTaskDragDisplacementFactor(boolean isRtl) {
-        return isRtl ? 1 : -1;
-    }
-
     @Override
     public float getTaskMenuX(float x, View thumbnailView) {
         return thumbnailView.getMeasuredWidth() + x;
@@ -261,6 +246,31 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
         lp.weight = 1;
     }
 
+    /* ---------- The following are only used by TaskViewTouchHandler. ---------- */
+
+    @Override
+    public SingleAxisSwipeDetector.Direction getUpDownSwipeDirection() {
+        return HORIZONTAL;
+    }
+
+    @Override
+    public int getUpDirection(boolean isRtl) {
+        return isRtl ? SingleAxisSwipeDetector.DIRECTION_NEGATIVE
+                : SingleAxisSwipeDetector.DIRECTION_POSITIVE;
+    }
+
+    @Override
+    public boolean isGoingUp(float displacement, boolean isRtl) {
+        return isRtl ? displacement < 0 : displacement > 0;
+    }
+
+    @Override
+    public int getTaskDragDisplacementFactor(boolean isRtl) {
+        return isRtl ? 1 : -1;
+    }
+
+    /* -------------------- */
+
     @Override
     public ChildBounds getChildBounds(View child, int childStart, int pageCenter,
         boolean layoutChild) {
diff --git a/src/com/android/launcher3/touch/PagedOrientationHandler.java b/src/com/android/launcher3/touch/PagedOrientationHandler.java
index a9c50cdffc..b9acfa3ca8 100644
--- a/src/com/android/launcher3/touch/PagedOrientationHandler.java
+++ b/src/com/android/launcher3/touch/PagedOrientationHandler.java
@@ -75,10 +75,8 @@ public interface PagedOrientationHandler {
     int getCenterForPage(View view, Rect insets);
     int getScrollOffsetStart(View view, Rect insets);
     int getScrollOffsetEnd(View view, Rect insets);
-    SingleAxisSwipeDetector.Direction getOppositeSwipeDirection();
     int getPrimaryTranslationDirectionFactor();
     int getSecondaryTranslationDirectionFactor();
-    int getTaskDragDisplacementFactor(boolean isRtl);
     ChildBounds getChildBounds(View child, int childStart, int pageCenter, boolean layoutChild);
     void setMaxScroll(AccessibilityEvent event, int maxScroll);
     boolean getRecentsRtlSetting(Resources resources);
@@ -92,7 +90,6 @@ public interface PagedOrientationHandler {
     void delegateScrollBy(PagedView pagedView, int unboundedScroll, int x, int y);
     void scrollerStartScroll(OverScroller scroller, int newPosition);
     void getCurveProperties(PagedView view, Rect insets, CurveProperties out);
-    boolean isGoingUp(float displacement, boolean isRtl);
     boolean isLayoutNaturalToLauncher();
     float getTaskMenuX(float x, View thumbnailView);
     float getTaskMenuY(float y, View thumbnailView);
@@ -101,6 +98,16 @@ public interface PagedOrientationHandler {
     void setLayoutParamsForTaskMenuOptionItem(LinearLayout.LayoutParams lp);
     int getDistanceToBottomOfRect(DeviceProfile dp, Rect rect);
 
+    // The following are only used by TaskViewTouchHandler.
+    /** @return Either VERTICAL or HORIZONTAL. */
+    SingleAxisSwipeDetector.Direction getUpDownSwipeDirection();
+    /** @return Given {@link #getUpDownSwipeDirection()}, whether POSITIVE or NEGATIVE is up. */
+    int getUpDirection(boolean isRtl);
+    /** @return Whether the displacement is going towards the top of the screen. */
+    boolean isGoingUp(float displacement, boolean isRtl);
+    /** @return Either 1 or -1, a factor to multiply by so the animation goes the correct way. */
+    int getTaskDragDisplacementFactor(boolean isRtl);
+
     /**
      * Maps the velocity from the coordinate plane of the foreground app to that
      * of Launcher's (which now will always be portrait)
diff --git a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
index 587e35ad6c..3663b5fcd3 100644
--- a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
+++ b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
@@ -72,12 +72,6 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
         out.screenCenter = insets.left + view.getPaddingLeft() + out.scroll + out.halfPageSize;
     }
 
-    @Override
-    public boolean isGoingUp(float displacement, boolean isRtl) {
-        // Ignore rtl since it only affects X value displacement, Y displacement doesn't change
-        return displacement < 0;
-    }
-
     @Override
     public boolean isLayoutNaturalToLauncher() {
         return true;
@@ -211,11 +205,6 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
         return view.getWidth() - view.getPaddingRight() - insets.right;
     }
 
-    @Override
-    public SingleAxisSwipeDetector.Direction getOppositeSwipeDirection() {
-        return VERTICAL;
-    }
-
     @Override
     public int getPrimaryTranslationDirectionFactor() {
         return 1;
@@ -225,12 +214,6 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
         return -1;
     }
 
-    @Override
-    public int getTaskDragDisplacementFactor(boolean isRtl) {
-        // Ignore rtl since it only affects X value displacement, Y displacement doesn't change
-        return 1;
-    }
-
     @Override
     public float getTaskMenuX(float x, View thumbnailView) {
         return x;
@@ -257,6 +240,33 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
         // no-op, defaults are fine
     }
 
+    /* ---------- The following are only used by TaskViewTouchHandler. ---------- */
+
+    @Override
+    public SingleAxisSwipeDetector.Direction getUpDownSwipeDirection() {
+        return VERTICAL;
+    }
+
+    @Override
+    public int getUpDirection(boolean isRtl) {
+        // Ignore rtl since it only affects X value displacement, Y displacement doesn't change
+        return SingleAxisSwipeDetector.DIRECTION_POSITIVE;
+    }
+
+    @Override
+    public boolean isGoingUp(float displacement, boolean isRtl) {
+        // Ignore rtl since it only affects X value displacement, Y displacement doesn't change
+        return displacement < 0;
+    }
+
+    @Override
+    public int getTaskDragDisplacementFactor(boolean isRtl) {
+        // Ignore rtl since it only affects X value displacement, Y displacement doesn't change
+        return 1;
+    }
+
+    /* -------------------- */
+
     @Override
     public ChildBounds getChildBounds(View child, int childStart, int pageCenter,
         boolean layoutChild) {
diff --git a/src/com/android/launcher3/touch/SeascapePagedViewHandler.java b/src/com/android/launcher3/touch/SeascapePagedViewHandler.java
index 60d19d9beb..54af029266 100644
--- a/src/com/android/launcher3/touch/SeascapePagedViewHandler.java
+++ b/src/com/android/launcher3/touch/SeascapePagedViewHandler.java
@@ -16,6 +16,8 @@
 
 package com.android.launcher3.touch;
 
+import static com.android.launcher3.touch.SingleAxisSwipeDetector.HORIZONTAL;
+
 import android.content.res.Resources;
 import android.graphics.PointF;
 import android.graphics.Rect;
@@ -32,11 +34,6 @@ public class SeascapePagedViewHandler extends LandscapePagedViewHandler {
         return -1;
     }
 
-    @Override
-    public int getTaskDragDisplacementFactor(boolean isRtl) {
-        return isRtl ? -1 : 1;
-    }
-
     @Override
     public boolean getRecentsRtlSetting(Resources resources) {
         return Utilities.isRtl(resources);
@@ -52,11 +49,6 @@ public class SeascapePagedViewHandler extends LandscapePagedViewHandler {
         return Surface.ROTATION_270;
     }
 
-    @Override
-    public boolean isGoingUp(float displacement, boolean isRtl) {
-        return isRtl ? displacement > 0 : displacement < 0;
-    }
-
     @Override
     public void adjustFloatingIconStartVelocity(PointF velocity) {
         float oldX = velocity.x;
@@ -78,4 +70,29 @@ public class SeascapePagedViewHandler extends LandscapePagedViewHandler {
     public int getDistanceToBottomOfRect(DeviceProfile dp, Rect rect) {
         return dp.widthPx - rect.right;
     }
+
+    /* ---------- The following are only used by TaskViewTouchHandler. ---------- */
+
+    @Override
+    public SingleAxisSwipeDetector.Direction getUpDownSwipeDirection() {
+        return HORIZONTAL;
+    }
+
+    @Override
+    public int getUpDirection(boolean isRtl) {
+        return isRtl ? SingleAxisSwipeDetector.DIRECTION_POSITIVE
+                : SingleAxisSwipeDetector.DIRECTION_NEGATIVE;
+    }
+
+    @Override
+    public boolean isGoingUp(float displacement, boolean isRtl) {
+        return isRtl ? displacement > 0 : displacement < 0;
+    }
+
+    @Override
+    public int getTaskDragDisplacementFactor(boolean isRtl) {
+        return isRtl ? -1 : 1;
+    }
+
+    /* -------------------- */
 }
diff --git a/src/com/android/launcher3/touch/SingleAxisSwipeDetector.java b/src/com/android/launcher3/touch/SingleAxisSwipeDetector.java
index 875eefbc58..ddb4b0f6ea 100644
--- a/src/com/android/launcher3/touch/SingleAxisSwipeDetector.java
+++ b/src/com/android/launcher3/touch/SingleAxisSwipeDetector.java
@@ -60,6 +60,11 @@ public class SingleAxisSwipeDetector extends BaseSwipeDetector {
             return direction.x;
         }
 
+        @NonNull
+        @Override
+        public String toString() {
+            return "VERTICAL";
+        }
     };
 
     public static final Direction HORIZONTAL = new Direction() {
@@ -86,6 +91,11 @@ public class SingleAxisSwipeDetector extends BaseSwipeDetector {
             return direction.y;
         }
 
+        @NonNull
+        @Override
+        public String toString() {
+            return "HORIZONTAL";
+        }
     };
 
     private final Direction mDir;
@@ -117,10 +127,6 @@ public class SingleAxisSwipeDetector extends BaseSwipeDetector {
         mIgnoreSlopWhenSettling = ignoreSlop;
     }
 
-    public int getScrollDirections() {
-        return mScrollDirections;
-    }
-
     /**
      * Returns if the start drag was towards the positive direction or negative.
      *
-- 
GitLab


From c610f26404b7b4e2062a806187b607ee30a9a6d7 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Fri, 11 Dec 2020 19:40:55 -0800
Subject: [PATCH 0360/1664] Removing unused tracing

Test: presubmit
Bug: 139891609
Change-Id: I30b432d329d6606b3d955409c167bddbacce8a37
---
 .../uioverrides/QuickstepLauncher.java        |  8 -------
 .../NavBarToHomeTouchController.java          | 20 ----------------
 ...ButtonNavbarToOverviewTouchController.java |  8 -------
 .../android/quickstep/AbsSwipeUpHandler.java  |  8 -------
 .../quickstep/TouchInteractionService.java    |  4 ----
 .../inputconsumers/OverviewInputConsumer.java |  4 ----
 .../quickstep/util/MotionPauseDetector.java   | 14 -----------
 .../launcher3/testing/TestProtocol.java       |  1 -
 .../AbstractStateChangeTouchController.java   |  3 ---
 .../launcher3/touch/BaseSwipeDetector.java    |  5 ----
 .../touch/SingleAxisSwipeDetector.java        | 11 ---------
 .../launcher3/views/BaseDragLayer.java        |  8 -------
 .../launcher3/views/FloatingIconView.java     | 10 --------
 .../android/launcher3/views/ListenerView.java | 23 -------------------
 14 files changed, 127 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 950598cba5..2d704f801e 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -35,7 +35,6 @@ import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SY
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
-import android.util.Log;
 import android.view.View;
 
 import com.android.launcher3.BaseQuickstepLauncher;
@@ -55,7 +54,6 @@ import com.android.launcher3.model.BgDataModel.FixedContainerItems;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.popup.SystemShortcut;
 import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory;
-import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.uioverrides.states.QuickstepAtomicAnimationFactory;
 import com.android.launcher3.uioverrides.touchcontrollers.LandscapeEdgeSwipeController;
 import com.android.launcher3.uioverrides.touchcontrollers.NavBarToHomeTouchController;
@@ -273,9 +271,6 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
 
     @Override
     public TouchController[] createTouchControllers() {
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "createTouchControllers.1");
-        }
         Mode mode = SysUINavigationMode.getMode(this);
 
         ArrayList<TouchController> list = new ArrayList<>();
@@ -283,9 +278,6 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
         if (mode == NO_BUTTON) {
             list.add(new NoButtonQuickSwitchTouchController(this));
             list.add(new NavBarToHomeTouchController(this));
-            if (TestProtocol.sDebugTracing) {
-                Log.d(TestProtocol.PAUSE_NOT_DETECTED, "createTouchControllers.2");
-            }
             list.add(new NoButtonNavbarToOverviewTouchController(this));
         } else {
             if (getDeviceProfile().isVerticalBarLayout()) {
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
index f73e2f2f0a..6b9c34028a 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
@@ -29,7 +29,6 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
 
 import android.animation.ValueAnimator;
-import android.util.Log;
 import android.view.MotionEvent;
 import android.view.animation.Interpolator;
 
@@ -47,7 +46,6 @@ import com.android.launcher3.compat.AccessibilityManagerCompat;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.graphics.OverviewScrim;
 import com.android.launcher3.states.StateAnimationConfig;
-import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
 import com.android.launcher3.util.TouchController;
 import com.android.quickstep.TaskUtils;
@@ -103,37 +101,19 @@ public class NavBarToHomeTouchController implements TouchController,
     }
 
     private boolean canInterceptTouch(MotionEvent ev) {
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "NavBarToHomeTouchController.canInterceptTouch "
-                    + ev);
-        }
         boolean cameFromNavBar = (ev.getEdgeFlags() & Utilities.EDGE_NAV_BAR) != 0;
         if (!cameFromNavBar) {
             return false;
         }
         if (mStartState.overviewUi || mStartState == ALL_APPS) {
-            if (TestProtocol.sDebugTracing) {
-                Log.d(TestProtocol.PAUSE_NOT_DETECTED,
-                        "NavBarToHomeTouchController.canInterceptTouch true 1 "
-                                + mStartState.overviewUi + " " + (mStartState == ALL_APPS));
-            }
             return true;
         }
         int typeToClose = ENABLE_ALL_APPS_EDU.get() ? TYPE_ALL & ~TYPE_ALL_APPS_EDU : TYPE_ALL;
         if (AbstractFloatingView.getTopOpenViewWithType(mLauncher, typeToClose) != null) {
-            if (TestProtocol.sDebugTracing) {
-                Log.d(TestProtocol.PAUSE_NOT_DETECTED,
-                        "NavBarToHomeTouchController.canInterceptTouch true 2 "
-                                + AbstractFloatingView.getTopOpenView(mLauncher), new Exception());
-            }
             return true;
         }
         if (FeatureFlags.ASSISTANT_GIVES_LAUNCHER_FOCUS.get()
                 && AssistantUtilities.isExcludedAssistantRunning()) {
-            if (TestProtocol.sDebugTracing) {
-                Log.d(TestProtocol.PAUSE_NOT_DETECTED,
-                        "NavBarToHomeTouchController.canInterceptTouch true 3");
-            }
             return true;
         }
         return false;
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
index 702c519ace..addfe927e8 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -37,7 +37,6 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_O
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.graphics.PointF;
-import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
@@ -49,7 +48,6 @@ import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.graphics.OverviewScrim;
 import com.android.launcher3.states.StateAnimationConfig;
-import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.VibratorWrapper;
 import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
@@ -90,9 +88,6 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
         mRecentsView = l.getOverviewPanel();
         mMotionPauseDetector = new MotionPauseDetector(l);
         mMotionPauseMinDisplacement = ViewConfiguration.get(l).getScaledTouchSlop();
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "NoButtonNavbarToOverviewTouchController.ctor");
-        }
     }
 
     @Override
@@ -221,9 +216,6 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
 
     @Override
     public boolean onDrag(float yDisplacement, float xDisplacement, MotionEvent event) {
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "NoButtonNavbarToOverviewTouchController");
-        }
         if (mStartedOverview) {
             if (!mReachedOverview) {
                 mStartDisplacement.set(xDisplacement, yDisplacement);
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 4ed2425690..41b8901c19 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -59,7 +59,6 @@ import android.graphics.PointF;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.SystemClock;
-import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnApplyWindowInsetsListener;
@@ -80,7 +79,6 @@ import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.logging.StatsLogManager.StatsLogger;
 import com.android.launcher3.statemanager.StatefulActivity;
-import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.tracing.InputConsumerProto;
 import com.android.launcher3.tracing.SwipeHandlerProto;
 import com.android.launcher3.util.TraceHelper;
@@ -324,13 +322,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
 
     protected boolean onActivityInit(Boolean alreadyOnHome) {
         T createdActivity = mActivityInterface.getCreatedActivity();
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "BaseSwipeUpHandler.1");
-        }
         if (createdActivity != null) {
-            if (TestProtocol.sDebugTracing) {
-                Log.d(TestProtocol.PAUSE_NOT_DETECTED, "BaseSwipeUpHandler.2");
-            }
             initTransitionEndpoints(createdActivity.getDeviceProfile());
         }
         final T activity = mActivityInterface.getCreatedActivity();
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 8ce1f51400..1e0a00aec8 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -627,10 +627,6 @@ public class TouchInteractionService extends Service implements PluginListener<O
     }
 
     private void handleOrientationSetup(InputConsumer baseInputConsumer) {
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "handleOrientationSetup.1");
-        }
-
         baseInputConsumer.notifyOrientationSetup();
     }
 
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
index 498e561360..aad70c4218 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
@@ -18,7 +18,6 @@ package com.android.quickstep.inputconsumers;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
 
-import android.util.Log;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 
@@ -80,9 +79,6 @@ public class OverviewInputConsumer<T extends StatefulActivity<?>>
             ev.setEdgeFlags(flags | Utilities.EDGE_NAV_BAR);
         }
         ev.offsetLocation(-mLocationOnScreen[0], -mLocationOnScreen[1]);
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "OverviewInputConsumer");
-        }
         boolean handled = mTarget.proxyTouchEvent(ev, mStartingInActivityBounds);
         ev.offsetLocation(mLocationOnScreen[0], mLocationOnScreen[1]);
         ev.setEdgeFlags(flags);
diff --git a/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java b/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java
index da5f59e755..8cde5f2659 100644
--- a/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java
+++ b/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java
@@ -19,14 +19,12 @@ import static com.android.launcher3.config.FeatureFlags.ENABLE_SYSTEM_VELOCITY_P
 
 import android.content.Context;
 import android.content.res.Resources;
-import android.util.Log;
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
 
 import com.android.launcher3.Alarm;
 import com.android.launcher3.R;
 import com.android.launcher3.compat.AccessibilityManagerCompat;
-import com.android.launcher3.testing.TestProtocol;
 
 /**
  * Given positions along x- or y-axis, tracks velocity and acceleration and determines when there is
@@ -87,9 +85,6 @@ public class MotionPauseDetector {
         mSpeedSlow = res.getDimension(R.dimen.motion_pause_detector_speed_slow);
         mSpeedSomewhatFast = res.getDimension(R.dimen.motion_pause_detector_speed_somewhat_fast);
         mSpeedFast = res.getDimension(R.dimen.motion_pause_detector_speed_fast);
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "creating alarm");
-        }
         mForcePauseTimeout = new Alarm();
         mForcePauseTimeout.setOnAlarmListener(alarm -> updatePaused(true /* isPaused */));
         mMakePauseHarderToTrigger = makePauseHarderToTrigger;
@@ -126,9 +121,6 @@ public class MotionPauseDetector {
      * @param pointerIndex Index for the pointer being tracked in the motion event
      */
     public void addPosition(MotionEvent ev, int pointerIndex) {
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "setting alarm");
-        }
         mForcePauseTimeout.setAlarm(mMakePauseHarderToTrigger
                 ? HARDER_TRIGGER_TIMEOUT
                 : FORCE_PAUSE_TIMEOUT);
@@ -176,9 +168,6 @@ public class MotionPauseDetector {
     }
 
     private void updatePaused(boolean isPaused) {
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "updatePaused: " + isPaused);
-        }
         if (mDisallowPause) {
             isPaused = false;
         }
@@ -207,9 +196,6 @@ public class MotionPauseDetector {
         setOnMotionPauseListener(null);
         mIsPaused = mHasEverBeenPaused = false;
         mSlowStartTime = 0;
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "canceling alarm");
-        }
         mForcePauseTimeout.cancelAlarm();
     }
 
diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java
index b2d008119e..218172b6b2 100644
--- a/src/com/android/launcher3/testing/TestProtocol.java
+++ b/src/com/android/launcher3/testing/TestProtocol.java
@@ -103,7 +103,6 @@ public final class TestProtocol {
     public static final String REQUEST_MOCK_SENSOR_ROTATION = "mock-sensor-rotation";
 
     public static final String PERMANENT_DIAG_TAG = "TaplTarget";
-    public static final String PAUSE_NOT_DETECTED = "b/139891609";
     public static final String OVERIEW_NOT_ALLAPPS = "b/156095088";
     public static final String NO_SWIPE_TO_HOME = "b/158017601";
     public static final String WORK_PROFILE_REMOVED = "b/159671700";
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index 7c02f3dc93..23baaf08cc 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -172,9 +172,6 @@ public abstract class AbstractStateChangeTouchController
 
     @Override
     public final boolean onControllerTouchEvent(MotionEvent ev) {
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "onControllerTouchEvent");
-        }
         return mDetector.onTouchEvent(ev);
     }
 
diff --git a/src/com/android/launcher3/touch/BaseSwipeDetector.java b/src/com/android/launcher3/touch/BaseSwipeDetector.java
index 01b33d8bf3..1276ece7e2 100644
--- a/src/com/android/launcher3/touch/BaseSwipeDetector.java
+++ b/src/com/android/launcher3/touch/BaseSwipeDetector.java
@@ -26,8 +26,6 @@ import android.view.ViewConfiguration;
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 
-import com.android.launcher3.testing.TestProtocol;
-
 import java.util.LinkedList;
 import java.util.Queue;
 
@@ -175,9 +173,6 @@ public abstract class BaseSwipeDetector {
                 if (mState != ScrollState.DRAGGING && shouldScrollStart(mDisplacement)) {
                     setState(ScrollState.DRAGGING);
                 }
-                if (TestProtocol.sDebugTracing) {
-                    Log.d(TestProtocol.PAUSE_NOT_DETECTED, "before report dragging");
-                }
                 if (mState == ScrollState.DRAGGING) {
                     reportDragging(ev);
                 }
diff --git a/src/com/android/launcher3/touch/SingleAxisSwipeDetector.java b/src/com/android/launcher3/touch/SingleAxisSwipeDetector.java
index 875eefbc58..d72548619f 100644
--- a/src/com/android/launcher3/touch/SingleAxisSwipeDetector.java
+++ b/src/com/android/launcher3/touch/SingleAxisSwipeDetector.java
@@ -17,7 +17,6 @@ package com.android.launcher3.touch;
 
 import android.content.Context;
 import android.graphics.PointF;
-import android.util.Log;
 import android.view.MotionEvent;
 import android.view.ViewConfiguration;
 
@@ -25,7 +24,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.launcher3.Utilities;
-import com.android.launcher3.testing.TestProtocol;
 
 /**
  * One dimensional scroll/drag/swipe gesture detector (either HORIZONTAL or VERTICAL).
@@ -105,11 +103,6 @@ public class SingleAxisSwipeDetector extends BaseSwipeDetector {
         super(config, isRtl);
         mListener = l;
         mDir = dir;
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "SingleAxisSwipeDetector.ctor "
-                    + l.getClass().getSimpleName()
-                    + " @ " + android.util.Log.getStackTraceString(new Throwable()));
-        }
     }
 
     public void setDetectableScrollConditions(int scrollDirectionFlags, boolean ignoreSlop) {
@@ -161,10 +154,6 @@ public class SingleAxisSwipeDetector extends BaseSwipeDetector {
 
     @Override
     protected void reportDraggingInternal(PointF displacement, MotionEvent event) {
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "SingleAxisSwipeDetector "
-                    + mListener.getClass().getSimpleName());
-        }
         mListener.onDrag(mDir.extractDirection(displacement),
                 mDir.extractOrthogonalDirection(displacement), event);
     }
diff --git a/src/com/android/launcher3/views/BaseDragLayer.java b/src/com/android/launcher3/views/BaseDragLayer.java
index 2be827b01a..5464dd8ec9 100644
--- a/src/com/android/launcher3/views/BaseDragLayer.java
+++ b/src/com/android/launcher3/views/BaseDragLayer.java
@@ -33,7 +33,6 @@ import android.graphics.Rect;
 import android.graphics.RectF;
 import android.os.Build;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.util.Property;
 import android.view.MotionEvent;
 import android.view.View;
@@ -49,7 +48,6 @@ import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.InsettableFrameLayout;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.MultiValueAlpha;
 import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;
 import com.android.launcher3.util.SimpleBroadcastReceiver;
@@ -191,12 +189,6 @@ public abstract class BaseDragLayer<T extends Context & ActivityContext>
     }
 
     private TouchController findControllerToHandleTouch(MotionEvent ev) {
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "findControllerToHandleTouch ev=" + ev
-                    + ", isEventInLauncher=" + isEventInLauncher(ev)
-                    + ", topOpenView=" + AbstractFloatingView.getTopOpenView(mActivity));
-        }
-
         AbstractFloatingView topView = AbstractFloatingView.getTopOpenView(mActivity);
         if (topView != null
                 && (isEventInLauncher(ev) || topView.canInterceptEventsInSystemGestureRegion())
diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java
index d9a14e9e3f..1857c5a7b4 100644
--- a/src/com/android/launcher3/views/FloatingIconView.java
+++ b/src/com/android/launcher3/views/FloatingIconView.java
@@ -55,7 +55,6 @@ import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.popup.SystemShortcut;
 import com.android.launcher3.shortcuts.DeepShortcutView;
-import com.android.launcher3.testing.TestProtocol;
 
 /**
  * A view that is created to look like another view with the purpose of creating fluid animations.
@@ -534,11 +533,6 @@ public class FloatingIconView extends FrameLayout implements
         view.setVisibility(INVISIBLE);
         parent.addView(view);
         dragLayer.addView(view.mListenerView);
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "getFloatingIconView. listenerView "
-                    + "added to dragLayer. listenerView=" + view.mListenerView + ", fiv=" + view,
-                    new Exception());
-        }
         view.mListenerView.setListener(view::fastFinish);
 
         view.mEndRunnable = () -> {
@@ -578,10 +572,6 @@ public class FloatingIconView extends FrameLayout implements
     private void finish(DragLayer dragLayer) {
         ((ViewGroup) dragLayer.getParent()).removeView(this);
         dragLayer.removeView(mListenerView);
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "listenerView removed from dragLayer. "
-                    + "listenerView=" + mListenerView + ", fiv=" + this, new Exception());
-        }
         recycle();
         mLauncher.getViewCache().recycleView(R.layout.floating_icon_view, this);
     }
diff --git a/src/com/android/launcher3/views/ListenerView.java b/src/com/android/launcher3/views/ListenerView.java
index 6e3f0ce690..b2df0ee805 100644
--- a/src/com/android/launcher3/views/ListenerView.java
+++ b/src/com/android/launcher3/views/ListenerView.java
@@ -17,13 +17,11 @@ package com.android.launcher3.views;
 
 import android.content.Context;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 
 import com.android.launcher3.AbstractFloatingView;
-import com.android.launcher3.testing.TestProtocol;
 
 /**
  * An invisible AbstractFloatingView that can run a callback when it is being closed.
@@ -38,20 +36,12 @@ public class ListenerView extends AbstractFloatingView {
     }
 
     public void setListener(Runnable listener) {
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "ListenerView setListener lv=" + this
-                    + ", listener=" + listener, new Exception());
-        }
         mCloseListener = listener;
     }
 
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "ListenerView onAttachedToWindow lv=" + this,
-                    new Exception());
-        }
         mIsOpen = true;
     }
 
@@ -59,19 +49,10 @@ public class ListenerView extends AbstractFloatingView {
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
         mIsOpen = false;
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "ListenerView onDetachedFromView lv=" + this,
-                    new Exception());
-        }
     }
 
     @Override
     protected void handleClose(boolean animate) {
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "ListenerView handeClose lv=" + this
-                    + ", mIsOpen=" + mIsOpen + ", mCloseListener=" + mCloseListener
-                    + ", getParent()=" + getParent(), new Exception());
-        }
         if (mIsOpen) {
             if (mCloseListener != null) {
                 mCloseListener.run();
@@ -91,10 +72,6 @@ public class ListenerView extends AbstractFloatingView {
 
     @Override
     public boolean onControllerInterceptTouchEvent(MotionEvent ev) {
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "ListenerView touchEvent lv=" + this
-                    + ", ev=" + ev, new Exception());
-        }
         if (ev.getAction() == MotionEvent.ACTION_DOWN) {
             handleClose(false);
         }
-- 
GitLab


From fee1b25feeafa523a09bb2161ca590cdc0307d0c Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Mon, 14 Dec 2020 12:30:38 -0800
Subject: [PATCH 0361/1664]  Fixing PendingArgs not cleared when going home

Bug: 174781600
Test: manual
Change-Id: I2f192b0f60d843b49b290fa70b76f562fca81e36
---
 .../com/android/launcher3/BaseQuickstepLauncher.java  | 11 ++++++++---
 src/com/android/launcher3/Launcher.java               |  7 ++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index c724318c2d..f02acab838 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -167,9 +167,14 @@ public abstract class BaseQuickstepLauncher extends Launcher
     }
 
     @Override
-    protected void handlePendingActivityRequest() {
-        super.handlePendingActivityRequest();
-        if (mPendingActivityRequestCode != -1 && isInState(NORMAL)) {
+    public void onStateSetEnd(LauncherState state) {
+        super.onStateSetEnd(state);
+        handlePendingActivityRequest();
+    }
+
+    private void handlePendingActivityRequest() {
+        if (mPendingActivityRequestCode != -1 && isInState(NORMAL)
+                && ((getActivityFlags() & ACTIVITY_STATE_DEFERRED_RESUMED) != 0)) {
             // Remove any active ProxyActivityStarter task and send RESULT_CANCELED to Launcher.
             onActivityResult(mPendingActivityRequestCode, RESULT_CANCELED, null);
             // ProxyActivityStarter is started with clear task to reset the task after which it
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index ea98157877..e099d852f3 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -961,8 +961,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         DiscoveryBounce.showForHomeIfNeeded(this);
     }
 
-    protected void handlePendingActivityRequest() { }
-
     private void logStopAndResume(boolean isResume) {
         if (mPendingExecutor != null) return;
         int pageIndex = mWorkspace.isOverlayShown() ? -1 : mWorkspace.getCurrentPage();
@@ -1053,7 +1051,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
     @Override
     public void onStateSetEnd(LauncherState state) {
-        super.onStateSetStart(state);
+        super.onStateSetEnd(state);
         getAppWidgetHost().setResumed(state == LauncherState.NORMAL);
         getWorkspace().setClipChildren(!state.hasFlag(FLAG_MULTI_PAGE));
 
@@ -1479,8 +1477,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
                 if (!isInState(NORMAL)) {
                     // Only change state, if not already the same. This prevents cancelling any
                     // animations running as part of resume
-                    mStateManager.goToState(NORMAL, mStateManager.shouldAnimateStateChange(),
-                            this::handlePendingActivityRequest);
+                    mStateManager.goToState(NORMAL, mStateManager.shouldAnimateStateChange());
                 }
 
                 // Reset the apps view
-- 
GitLab


From 51d9ab7a22d128e8732f475951ce1f8642a09084 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Fri, 11 Dec 2020 14:39:50 -0800
Subject: [PATCH 0362/1664] Match the live tile cut out to the correct task
 view position in landscape mode

Bug: 171838067
Test: test live tile in landscape mode

Change-Id: I12c375305e19917a53e30d9e40dc709f828ad4a6
---
 .../android/quickstep/AbsSwipeUpHandler.java  |  2 +
 .../quickstep/util/RecentsOrientedState.java  | 23 ++++++++++
 .../quickstep/util/TaskViewSimulator.java     |  7 ++-
 .../quickstep/views/LiveTileOverlay.java      | 43 ++++++++++++++++++-
 4 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 4dbc0f3c0c..48d4679c80 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1733,6 +1733,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
             LiveTileOverlay.INSTANCE.update(
                     mTaskViewSimulator.getCurrentRect(),
                     mTaskViewSimulator.getCurrentCornerRadius());
+            LiveTileOverlay.INSTANCE.setRotation(
+                    mRecentsView.getPagedViewOrientedState().getDisplayRotation());
         }
         ProtoTracer.INSTANCE.get(mContext).scheduleFrameUpdate();
     }
diff --git a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
index e273aeb81f..facc99aafa 100644
--- a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
+++ b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
@@ -519,6 +519,29 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
         }
     }
 
+    /**
+     * Contrary to {@link #postDisplayRotation}.
+     */
+    public static void preDisplayRotation(@SurfaceRotation int displayRotation,
+            float screenWidth, float screenHeight, Matrix out) {
+        switch (displayRotation) {
+            case ROTATION_0:
+                return;
+            case ROTATION_90:
+                out.postRotate(90);
+                out.postTranslate(screenWidth, 0);
+                break;
+            case ROTATION_180:
+                out.postRotate(180);
+                out.postTranslate(screenHeight, screenWidth);
+                break;
+            case ROTATION_270:
+                out.postRotate(270);
+                out.postTranslate(0, screenHeight);
+                break;
+        }
+    }
+
     @NonNull
     @Override
     public String toString() {
diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index 2f4bb8ed9d..5a7f541e5a 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -19,6 +19,7 @@ import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TI
 import static com.android.launcher3.states.RotationHelper.deltaRotation;
 import static com.android.launcher3.touch.PagedOrientationHandler.MATRIX_POST_TRANSLATE;
 import static com.android.quickstep.util.RecentsOrientedState.postDisplayRotation;
+import static com.android.quickstep.util.RecentsOrientedState.preDisplayRotation;
 import static com.android.systemui.shared.system.WindowManagerWrapper.WINDOWING_MODE_FULLSCREEN;
 
 import android.animation.TimeInterpolator;
@@ -80,6 +81,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
     private DeviceProfile mDp;
 
     private final Matrix mMatrix = new Matrix();
+    private final Matrix mMatrixTmp = new Matrix();
     private final Point mRunningTargetWindowPosition = new Point();
 
     // Thumbnail view properties
@@ -211,7 +213,10 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
      */
     public RectF getCurrentRect() {
         RectF result = getCurrentCropRect();
-        mMatrix.mapRect(result);
+        mMatrixTmp.set(mMatrix);
+        preDisplayRotation(mOrientationState.getDisplayRotation(), mDp.widthPx, mDp.heightPx,
+                mMatrixTmp);
+        mMatrixTmp.mapRect(result);
         return result;
     }
 
diff --git a/quickstep/src/com/android/quickstep/views/LiveTileOverlay.java b/quickstep/src/com/android/quickstep/views/LiveTileOverlay.java
index f6eb0e224b..747c3f28a1 100644
--- a/quickstep/src/com/android/quickstep/views/LiveTileOverlay.java
+++ b/quickstep/src/com/android/quickstep/views/LiveTileOverlay.java
@@ -1,5 +1,10 @@
 package com.android.quickstep.views;
 
+import static android.view.Surface.ROTATION_0;
+import static android.view.Surface.ROTATION_180;
+import static android.view.Surface.ROTATION_270;
+import static android.view.Surface.ROTATION_90;
+
 import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 
@@ -19,6 +24,7 @@ import android.util.FloatProperty;
 import android.view.ViewOverlay;
 
 import com.android.launcher3.anim.Interpolators;
+import com.android.quickstep.util.RecentsOrientedState.SurfaceRotation;
 
 public class LiveTileOverlay extends Drawable {
 
@@ -43,6 +49,8 @@ public class LiveTileOverlay extends Drawable {
     private final RectF mCurrentRect = new RectF();
     private final Rect mBoundsRect = new Rect();
 
+    private @SurfaceRotation int mRotation = ROTATION_0;
+
     private float mCornerRadius;
     private Drawable mIcon;
     private Animator mIconAnimator;
@@ -69,6 +77,10 @@ public class LiveTileOverlay extends Drawable {
         mCurrentRect.set(left, top, right, bottom);
     }
 
+    public void setRotation(@SurfaceRotation int rotation) {
+        mRotation = rotation;
+    }
+
     public void setIcon(Drawable icon) {
         mIcon = icon;
     }
@@ -103,8 +115,35 @@ public class LiveTileOverlay extends Drawable {
             canvas.save();
             float scale = Interpolators.clampToProgress(FAST_OUT_SLOW_IN, 0f,
                     1f).getInterpolation(mIconAnimationProgress);
-            canvas.translate(mCurrentRect.centerX() - mIcon.getBounds().width() / 2 * scale,
-                    mCurrentRect.top - mIcon.getBounds().height() / 2 * scale);
+
+            int iconRadius = mIcon.getBounds().width() / 2;
+            float dx = 0;
+            float dy = 0;
+
+            switch (mRotation) {
+                case ROTATION_0:
+                    dx = mCurrentRect.centerX() - iconRadius * scale;
+                    dy = mCurrentRect.top - iconRadius * scale;
+                    break;
+                case ROTATION_90:
+                    dx = mCurrentRect.right - iconRadius * scale;
+                    dy = mCurrentRect.centerY() - iconRadius * scale;
+                    break;
+                case ROTATION_270:
+                    dx = mCurrentRect.left - iconRadius * scale;
+                    dy = mCurrentRect.centerY() - iconRadius * scale;
+                    break;
+                case ROTATION_180:
+                    dx = mCurrentRect.centerX() - iconRadius * scale;
+                    dy = mCurrentRect.bottom - iconRadius * scale;
+                    break;
+            }
+
+            int rotationDegrees = mRotation * 90;
+            if (mRotation == ROTATION_90 || mRotation == ROTATION_270) {
+                canvas.rotate(rotationDegrees, dx + iconRadius, dy + iconRadius);
+            }
+            canvas.translate(dx, dy);
             canvas.scale(scale, scale);
             mIcon.draw(canvas);
             canvas.restore();
-- 
GitLab


From dad74879cc69bd69e6150d147214ae9fa6e23510 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Mon, 14 Dec 2020 15:42:44 -0800
Subject: [PATCH 0363/1664] Using default timeout for 3-button QS

It's 5 sec, and it works better both
for test runs under stress and for
users in the field that invoke the gesture
slowly.

Test: presubmit
Bug: 169221288
Change-Id: If1d04b63e3d490d7865b9141fc3be34a21693c39
---
 quickstep/src/com/android/quickstep/OverviewCommandHelper.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
index 2559a6f22e..fd9c315f78 100644
--- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
@@ -175,8 +175,7 @@ public class OverviewCommandHelper {
                 return;
             }
 
-            InteractionJankMonitorWrapper.begin(
-                    InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH, 2000 /* ms timout */);
+            InteractionJankMonitorWrapper.begin(InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH);
 
             // Otherwise, start overview.
             mListener = mActivityInterface.createActivityInitListener(this::onActivityReady);
-- 
GitLab


From 0d9cb19453d1314ae7d4a6a7b3a8031d309888ef Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Mon, 14 Dec 2020 19:57:59 -0800
Subject: [PATCH 0364/1664] Checking menu item test to improve test fail diags

Test: atest
Bug: 75641613
Change-Id: Idb5c7fe744e4a3e69ee0fdb59d1a5a58bc6ce0b2
---
 tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
index a39f21599b..1648bddcd8 100644
--- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
+++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
@@ -299,7 +299,9 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
                     launcher -> assertTrue("Launcher internal state didn't switch to Showing Menu",
                             isOptionsPopupVisible(launcher)));
 
-            menu.getMenuItem(1).launch(getAppPackageName());
+            final AppIconMenuItem menuItem = menu.getMenuItem(1);
+            assertEquals("Wrong menu item", "Shortcut 2", menuItem.getText());
+            menuItem.launch(getAppPackageName());
         } finally {
             allApps.unfreeze();
         }
@@ -342,6 +344,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
                     openMenu().
                     getMenuItem(0);
             final String shortcutName = menuItem.getText();
+            assertEquals("Wrong menu item", "Shortcut 3", shortcutName);
 
             menuItem.dragToWorkspace(false, false);
             mLauncher.getWorkspace().getWorkspaceAppIcon(shortcutName).launch(getAppPackageName());
-- 
GitLab


From 5aad9d87d795876d755b1f07bf231cd688a739f5 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Tue, 15 Dec 2020 10:47:44 -0500
Subject: [PATCH 0365/1664] Temporarily disable visibility-gated hotseat and
 prediction row updates.

Pending a resolution in b/174174514, disabling the visibility-gating of hotseat and all app prediction row updates. Updates will be allowed regardless of visibility.

Test: manual
Change-Id: I10e4dae9aad9af7b799fdad3b231c734e383b493
---
 .../launcher3/appprediction/PredictionRowView.java     |  5 ++++-
 .../hybridhotseat/HotseatPredictionController.java     |  4 +++-
 src/com/android/launcher3/Launcher.java                |  7 +++----
 src/com/android/launcher3/config/FeatureFlags.java     | 10 ++++++++++
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
index f313d7539e..f53a5efe95 100644
--- a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
+++ b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
@@ -206,7 +206,10 @@ public class PredictionRowView extends LinearLayout implements
      * we can optimize by swapping them in place.
      */
     public void setPredictedApps(List<ItemInfo> items) {
-        if (!mLauncher.isWorkspaceLoading() && isShown() && getWindowVisibility() == View.VISIBLE) {
+        if (!FeatureFlags.ENABLE_APP_PREDICTIONS_WHILE_VISIBLE.get()
+                && !mLauncher.isWorkspaceLoading()
+                && isShown()
+                && getWindowVisibility() == View.VISIBLE) {
             mPendingPredictedItems = items;
             return;
         }
diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
index 4953138bee..b2de4c95ad 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
@@ -42,6 +42,7 @@ import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimationSuccessListener;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.dragndrop.DragController;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.graphics.DragPreviewProvider;
@@ -251,7 +252,8 @@ public class HotseatPredictionController implements DragController.DragListener,
      * Sets or updates the predicted items
      */
     public void setPredictedItems(FixedContainerItems items) {
-        boolean shouldIgnoreVisibility = mLauncher.isWorkspaceLoading()
+        boolean shouldIgnoreVisibility = FeatureFlags.ENABLE_APP_PREDICTIONS_WHILE_VISIBLE.get()
+                || mLauncher.isWorkspaceLoading()
                 || mPredictedItems.equals(items.items)
                 || mHotseat.getShortcutsAndWidgets().getChildCount() < mHotSeatItemsCount;
         if (!shouldIgnoreVisibility
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index e099d852f3..a96fabd66e 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -222,8 +222,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
     static final boolean DEBUG_STRICT_MODE = false;
 
-    private static final boolean ENABLE_ACTIVITY_CROSSFADE = false;
-
     private static final int REQUEST_CREATE_SHORTCUT = 1;
     private static final int REQUEST_CREATE_APPWIDGET = 5;
 
@@ -1384,8 +1382,9 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         int width = mDragLayer.getWidth();
         int height = mDragLayer.getHeight();
 
-        // TODO: b/172467144 Remove hardcoded ENABLE_ACTIVITY_CROSSFADE.
-        if (ENABLE_ACTIVITY_CROSSFADE && width > 0 && height > 0) {
+        if (FeatureFlags.ENABLE_LAUNCHER_ACTIVITY_THEME_CROSSFADE.get()
+                && width > 0
+                && height > 0) {
             instance.snapshot =
                     BitmapRenderer.createHardwareBitmap(width, height, mDragLayer::draw);
         }
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 883eab0159..839f0f4453 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -194,6 +194,16 @@ public final class FeatureFlags {
             "ENABLE_FOUR_COLUMNS", false, "Uses 4 columns in launcher grid."
             + "Warning: This will permanently alter your home screen items and is not reversible.");
 
+    // TODO: b/172467144 Remove ENABLE_LAUNCHER_ACTIVITY_THEME_CROSSFADE feature flag.
+    public static final BooleanFlag ENABLE_LAUNCHER_ACTIVITY_THEME_CROSSFADE = new DeviceFlag(
+            "ENABLE_LAUNCHER_ACTIVITY_THEME_CROSSFADE", false, "Enables a "
+            + "crossfade animation when the system these changes.");
+
+    // TODO: b/174174514 Remove ENABLE_APP_PREDICTIONS_WHILE_VISIBLE feature flag.
+    public static final BooleanFlag ENABLE_APP_PREDICTIONS_WHILE_VISIBLE = new DeviceFlag(
+            "ENABLE_APP_PREDICTIONS_WHILE_VISIBLE", true, "Allows app "
+            + "predictions to be updated while they are visible to the user.");
+
     public static void initialize(Context context) {
         synchronized (sDebugFlags) {
             for (DebugFlag flag : sDebugFlags) {
-- 
GitLab


From 6025dfe1ab39c35852abf048be4108b6d85f11e9 Mon Sep 17 00:00:00 2001
From: Jason Chang <jasonsfchang@google.com>
Date: Wed, 16 Dec 2020 19:50:53 +0800
Subject: [PATCH 0366/1664] Fix swipe for notification default should be on
 instead of off

Set newOneHandedSettingsObserver() defaut value 0 to prevent
blocking swipe-down notification's OneHandedModeInputConsumer
.onStartGestureDetected() when device first booting.

Bug: 175084985

Test: rebuild ROM image and manual
Change-Id: I5fe7d4036ac74682ae72cf210e8b40c63ceb53e1
---
 src/com/android/launcher3/util/SecureSettingsObserver.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/util/SecureSettingsObserver.java b/src/com/android/launcher3/util/SecureSettingsObserver.java
index 4b2242907b..9fe72ad80a 100644
--- a/src/com/android/launcher3/util/SecureSettingsObserver.java
+++ b/src/com/android/launcher3/util/SecureSettingsObserver.java
@@ -88,7 +88,7 @@ public class SecureSettingsObserver extends ContentObserver {
     public static SecureSettingsObserver newOneHandedSettingsObserver(Context context,
             OnChangeListener listener) {
         return new SecureSettingsObserver(
-                context.getContentResolver(), listener, ONE_HANDED_ENABLED, 1);
+                context.getContentResolver(), listener, ONE_HANDED_ENABLED, 0);
     }
 
     /**
-- 
GitLab


From b956a03067ec07f15530cd0b0451d02a57a15507 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 15 Dec 2020 13:20:40 -0800
Subject: [PATCH 0367/1664] Fix some task view fling calculations

- Map to progress 1 instead of dividing by 0 if expectedDuration == 0
- Map to starting progress one frame ahead based on velocity
- Change direction of velocity so it's in the same direction as the
  task progress (0 is down and 1 is up).

Change-Id: I5ac3f8a0d6c616bd303ac1a902242964bb33d3c7
---
 .../TaskViewTouchController.java              |  3 +-
 .../anim/AnimatorPlaybackController.java      | 39 +++++++++++++------
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
index 97296957fe..caa34d103e 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
@@ -297,7 +297,8 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
 
         mCurrentAnimation.setEndAction(this::clearState);
         mCurrentAnimation.startWithVelocity(mActivity, goingToEnd,
-                velocity, mEndDisplacement, animationDuration);
+                velocity * orientationHandler.getSecondaryTranslationDirectionFactor(),
+                mEndDisplacement, animationDuration);
     }
 
     private void clearState() {
diff --git a/src/com/android/launcher3/anim/AnimatorPlaybackController.java b/src/com/android/launcher3/anim/AnimatorPlaybackController.java
index edaf51dbc6..f6d1651cb6 100644
--- a/src/com/android/launcher3/anim/AnimatorPlaybackController.java
+++ b/src/com/android/launcher3/anim/AnimatorPlaybackController.java
@@ -29,6 +29,8 @@ import android.animation.TimeInterpolator;
 import android.animation.ValueAnimator;
 import android.content.Context;
 
+import com.android.launcher3.Utilities;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -133,15 +135,20 @@ public class AnimatorPlaybackController implements ValueAnimator.AnimatorUpdateL
 
     /**
      * Starts playing the animation with the provided velocity optionally playing any
-     * physics based animations
+     * physics based animations.
+     * @param goingToEnd Whether we are going to the end (progress = 1) or not (progress = 0).
+     * @param velocityPxPerMs The velocity at which to start the animation, in pixels / millisecond.
+     * @param endDistance The distance (pixels) that the animation will travel from progress 0 to 1.
+     * @param animationDuration The duration of the non-physics based animation.
      */
     public void startWithVelocity(Context context, boolean goingToEnd,
-            float velocity, float scale, long animationDuration) {
-        float scaleInverse = 1 / Math.abs(scale);
-        float scaledVelocity = velocity * scaleInverse;
+            float velocityPxPerMs, float endDistance, long animationDuration) {
+        float distanceInverse = 1 / Math.abs(endDistance);
+        float velocityProgressPerMs = velocityPxPerMs * distanceInverse;
 
+        float oneFrameProgress = velocityProgressPerMs * getSingleFrameMs(context);
         float nextFrameProgress = boundToRange(getProgressFraction()
-                + scaledVelocity * getSingleFrameMs(context), 0f, 1f);
+                + oneFrameProgress, 0f, 1f);
 
         // Update setters for spring
         int springFlag = goingToEnd
@@ -154,8 +161,8 @@ public class AnimatorPlaybackController implements ValueAnimator.AnimatorUpdateL
                 SpringAnimationBuilder s = new SpringAnimationBuilder(context)
                         .setStartValue(mCurrentFraction)
                         .setEndValue(goingToEnd ? 1 : 0)
-                        .setStartVelocity(scaledVelocity)
-                        .setMinimumVisibleChange(scaleInverse)
+                        .setStartVelocity(velocityProgressPerMs)
+                        .setMinimumVisibleChange(distanceInverse)
                         .setDampingRatio(h.springProperty.mDampingRatio)
                         .setStiffness(h.springProperty.mStiffness)
                         .computeParams();
@@ -164,8 +171,18 @@ public class AnimatorPlaybackController implements ValueAnimator.AnimatorUpdateL
                 springDuration = Math.max(expectedDurationL, springDuration);
 
                 float expectedDuration = expectedDurationL;
-                h.mapper = (progress, globalEndProgress) ->
-                        mAnimationPlayer.getCurrentPlayTime() / expectedDuration;
+                h.mapper = (progress, globalEndProgress) -> {
+                    if (expectedDuration <= 0 || oneFrameProgress >= 1) {
+                        return 1;
+                    } else {
+                        // Start from one frame ahead of the current position.
+                        return Utilities.mapToRange(
+                                mAnimationPlayer.getCurrentPlayTime() / expectedDuration,
+                                0, 1,
+                                Math.abs(oneFrameProgress), 1,
+                                LINEAR);
+                    }
+                };
                 h.anim.setInterpolator(s::getInterpolatedValue);
             }
         }
@@ -174,7 +191,7 @@ public class AnimatorPlaybackController implements ValueAnimator.AnimatorUpdateL
 
         if (springDuration <= animationDuration) {
             mAnimationPlayer.setDuration(animationDuration);
-            mAnimationPlayer.setInterpolator(scrollInterpolatorForVelocity(velocity));
+            mAnimationPlayer.setInterpolator(scrollInterpolatorForVelocity(velocityPxPerMs));
         } else {
             // Since spring requires more time to run, we let the other animations play with
             // current time and interpolation and by clamping the duration.
@@ -182,7 +199,7 @@ public class AnimatorPlaybackController implements ValueAnimator.AnimatorUpdateL
 
             float cutOff = animationDuration / (float) springDuration;
             mAnimationPlayer.setInterpolator(
-                    clampToProgress(scrollInterpolatorForVelocity(velocity), 0, cutOff));
+                    clampToProgress(scrollInterpolatorForVelocity(velocityPxPerMs), 0, cutOff));
         }
         mAnimationPlayer.start();
     }
-- 
GitLab


From bc3ec9fb664e5ea1dd0bcaba361cf0b0eb7974bf Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Tue, 15 Dec 2020 18:56:54 -0800
Subject: [PATCH 0368/1664] Place recents above app only after the initial
 touch down

The problem is that currently upon touch down we place recents above app, before recents view is visible, so instead home screen is revealed.

Here is the breakdown:
Initial touch down -> app on top
First move event -> updateFinalShift -> recents on top
End target = home -> app on top

Fixes: 175423704
Test: manual
Change-Id: I81a4fea34c983ac2e6921f4e3515ef3193201069
---
 quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java     | 1 +
 quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 3c6299fcc3..201dfe7a1a 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -724,6 +724,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         setIsLikelyToStartNewTask(isLikelyToStartNewTask, false /* animate */);
         mStateCallback.setStateOnUiThread(STATE_GESTURE_STARTED);
         mGestureStarted = true;
+        mTaskViewSimulator.setDrawsBelowRecents(true);
     }
 
     /**
diff --git a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
index 4bb1bb565e..f696efe094 100644
--- a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
+++ b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
@@ -82,7 +82,6 @@ public abstract class SwipeUpAnimationLogic {
         mTaskViewSimulator.getOrientationState().update(
                 mDeviceState.getRotationTouchHelper().getCurrentActiveRotation(),
                 mDeviceState.getRotationTouchHelper().getDisplayRotation());
-        mTaskViewSimulator.setDrawsBelowRecents(true);
 
         mMaxShadowRadius = context.getResources().getDimensionPixelSize(R.dimen.max_shadow_radius);
         mTransformParams.setShadowRadius(mMaxShadowRadius);
-- 
GitLab


From f20a330a5c0e29483822b94df2d7fcaf84d0e994 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Tue, 15 Dec 2020 16:42:29 -0800
Subject: [PATCH 0369/1664] Instrumenting app-to-pip CUJ.

Bug: 169221267
Test: manual, presubmit
Change-Id: I7fed51af63665ba9b0596f7f01bf3182643fb0a3
---
 .../util/SwipePipToHomeAnimator.java          | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
index 87fee79547..16ca43d4c6 100644
--- a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
+++ b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
@@ -16,8 +16,9 @@
 
 package com.android.quickstep.util;
 
+import static com.android.systemui.shared.system.InteractionJankMonitorWrapper.CUJ_APP_CLOSE_TO_PIP;
+
 import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
 import android.animation.RectEvaluator;
 import android.animation.ValueAnimator;
 import android.content.ComponentName;
@@ -26,7 +27,9 @@ import android.view.SurfaceControl;
 
 import androidx.annotation.NonNull;
 
+import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.systemui.shared.pip.PipSurfaceTransactionHelper;
+import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
 
 /**
  * An {@link Animator} that animates an Activity to PiP (picture-in-picture) window when
@@ -76,9 +79,27 @@ public class SwipePipToHomeAnimator extends ValueAnimator implements
                 startBounds.right - sourceRectHint.right,
                 startBounds.bottom - sourceRectHint.bottom);
 
-        addListener(new AnimatorListenerAdapter() {
+        addListener(new AnimationSuccessListener() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+                InteractionJankMonitorWrapper.begin(CUJ_APP_CLOSE_TO_PIP);
+                super.onAnimationStart(animation);
+            }
+
+            @Override
+            public void onAnimationCancel(Animator animation) {
+                super.onAnimationCancel(animation);
+                InteractionJankMonitorWrapper.cancel(CUJ_APP_CLOSE_TO_PIP);
+            }
+
+            @Override
+            public void onAnimationSuccess(Animator animator) {
+                InteractionJankMonitorWrapper.end(CUJ_APP_CLOSE_TO_PIP);
+            }
+
             @Override
             public void onAnimationEnd(Animator animation) {
+                if (!mHasAnimationEnded) super.onAnimationEnd(animation);
                 SwipePipToHomeAnimator.this.onAnimationEnd();
             }
         });
-- 
GitLab


From 0f6b6cc7a20ad82a6907ab837996065278c9fb2e Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Tue, 17 Nov 2020 13:24:01 -0800
Subject: [PATCH 0370/1664] Add transition when swiping from fullscreen to
 enter PiP

There are some artifacts actually come from test app implementation
- when in landscape fullscreen, sourceRectHint would include the black
  background on both sides
- when settled in PiP, app does the transition which causes the final
  glitch
Would address these later in the test app itself

Video: http://rcll/aaaaaabFQoRHlzixHdtY/cOco1yoMXwFzSifFqQET9U
Video: http://rcll/aaaaaabFQoRHlzixHdtY/f3IWG09DRO9aUNnzqSdPLU
Bug: 171802909
Test: see video
Change-Id: I783e51e78277b1179a7e8de50050b7c9e1a6de17
---
 .../android/quickstep/AbsSwipeUpHandler.java  | 20 +++-
 .../quickstep/SwipeUpAnimationLogic.java      | 29 ++++--
 .../util/SwipePipToHomeAnimator.java          | 93 +++++++++++++++++--
 3 files changed, 122 insertions(+), 20 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 201dfe7a1a..f82bc2d698 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -15,6 +15,9 @@
  */
 package com.android.quickstep;
 
+import static android.view.Surface.ROTATION_0;
+import static android.view.Surface.ROTATION_270;
+import static android.view.Surface.ROTATION_90;
 import static android.widget.Toast.LENGTH_SHORT;
 
 import static com.android.launcher3.BaseActivity.INVISIBLE_BY_STATE_HANDLER;
@@ -1065,7 +1068,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                             runningTaskTarget.pictureInPictureParams) != null;
             if (mIsSwipingPipToHome) {
                 mSwipePipToHomeAnimator = getSwipePipToHomeAnimator(
-                        homeAnimFactory, runningTaskTarget);
+                        homeAnimFactory, runningTaskTarget, start);
                 mSwipePipToHomeAnimator.setDuration(SWIPE_PIP_TO_HOME_DURATION);
                 mSwipePipToHomeAnimator.setInterpolator(interpolator);
                 mSwipePipToHomeAnimator.setFloatValues(0f, 1f);
@@ -1135,23 +1138,34 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
     }
 
     private SwipePipToHomeAnimator getSwipePipToHomeAnimator(HomeAnimationFactory homeAnimFactory,
-            RemoteAnimationTargetCompat runningTaskTarget) {
+            RemoteAnimationTargetCompat runningTaskTarget, float startProgress) {
         // Directly animate the app to PiP (picture-in-picture) mode
         final ActivityManager.RunningTaskInfo taskInfo = mGestureState.getRunningTask();
         final RecentsOrientedState orientationState = mTaskViewSimulator.getOrientationState();
+        final int windowRotation = orientationState.getDisplayRotation();
+        final int homeRotation = orientationState.getRecentsActivityRotation();
         final Rect destinationBounds = SystemUiProxy.INSTANCE.get(mContext)
                 .startSwipePipToHome(taskInfo.topActivity,
                         TaskInfoCompat.getTopActivityInfo(taskInfo),
                         runningTaskTarget.pictureInPictureParams,
-                        orientationState.getRecentsActivityRotation(),
+                        homeRotation,
                         mDp.hotseatBarSizePx);
+        final Rect startBounds = new Rect();
+        updateProgressForStartRect(new Matrix(), startProgress).round(startBounds);
         final SwipePipToHomeAnimator swipePipToHomeAnimator = new SwipePipToHomeAnimator(
                 runningTaskTarget.taskId,
                 taskInfo.topActivity,
                 runningTaskTarget.leash.getSurfaceControl(),
                 TaskInfoCompat.getPipSourceRectHint(runningTaskTarget.pictureInPictureParams),
                 TaskInfoCompat.getWindowConfigurationBounds(taskInfo),
+                startBounds,
                 destinationBounds);
+        // We would assume home and app window always in the same rotation While homeRotation
+        // is not ROTATION_0 (which implies the rotation is turned on in launcher settings).
+        if (homeRotation == ROTATION_0
+                && (windowRotation == ROTATION_90 || windowRotation == ROTATION_270)) {
+            swipePipToHomeAnimator.setFromRotation(mTaskViewSimulator, windowRotation);
+        }
         swipePipToHomeAnimator.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationStart(Animator animation) {
diff --git a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
index f696efe094..c0087b0e5f 100644
--- a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
+++ b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
@@ -174,6 +174,24 @@ public abstract class SwipeUpAnimationLogic {
         }
     }
 
+    /**
+     * Update with start progress for window animation to home.
+     * @param outMatrix {@link Matrix} to map a rect in Launcher space to window space.
+     * @param startProgress The progress of {@link #mCurrentShift} to start thw window from.
+     * @return {@link RectF} represents the bounds as starting point in window space.
+     */
+    protected RectF updateProgressForStartRect(Matrix outMatrix, float startProgress) {
+        mCurrentShift.updateValue(startProgress);
+        mTaskViewSimulator.apply(mTransformParams.setProgress(startProgress));
+        RectF cropRectF = new RectF(mTaskViewSimulator.getCurrentCropRect());
+
+        mTaskViewSimulator.applyWindowToHomeRotation(outMatrix);
+
+        final RectF startRect = new RectF(cropRectF);
+        mTaskViewSimulator.getCurrentMatrix().mapRect(startRect);
+        return startRect;
+    }
+
     /**
      * Creates an animation that transforms the current app window into the home app.
      * @param startProgress The progress of {@link #mCurrentShift} to start the window from.
@@ -183,16 +201,11 @@ public abstract class SwipeUpAnimationLogic {
             HomeAnimationFactory homeAnimationFactory) {
         final RectF targetRect = homeAnimationFactory.getWindowTargetRect();
 
-        mCurrentShift.updateValue(startProgress);
-        mTaskViewSimulator.apply(mTransformParams.setProgress(startProgress));
-        RectF cropRectF = new RectF(mTaskViewSimulator.getCurrentCropRect());
-
-        // Matrix to map a rect in Launcher space to window space
         Matrix homeToWindowPositionMap = new Matrix();
-        mTaskViewSimulator.applyWindowToHomeRotation(homeToWindowPositionMap);
+        final RectF startRect = updateProgressForStartRect(
+                homeToWindowPositionMap, startProgress);
+        RectF cropRectF = new RectF(mTaskViewSimulator.getCurrentCropRect());
 
-        final RectF startRect = new RectF(cropRectF);
-        mTaskViewSimulator.getCurrentMatrix().mapRect(startRect);
         // Move the startRect to Launcher space as floatingIconView runs in Launcher
         Matrix windowToHomePositionMap = new Matrix();
         homeToWindowPositionMap.invert(windowToHomePositionMap);
diff --git a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
index 16ca43d4c6..8fbd645be4 100644
--- a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
+++ b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
@@ -22,7 +22,11 @@ import android.animation.Animator;
 import android.animation.RectEvaluator;
 import android.animation.ValueAnimator;
 import android.content.ComponentName;
+import android.graphics.Matrix;
 import android.graphics.Rect;
+import android.graphics.RectF;
+import android.util.Log;
+import android.view.Surface;
 import android.view.SurfaceControl;
 
 import androidx.annotation.NonNull;
@@ -42,9 +46,12 @@ import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
  */
 public class SwipePipToHomeAnimator extends ValueAnimator implements
         ValueAnimator.AnimatorUpdateListener {
+    private static final String TAG = SwipePipToHomeAnimator.class.getSimpleName();
+
     private final int mTaskId;
     private final ComponentName mComponentName;
     private final SurfaceControl mLeash;
+    private final Rect mAppBounds = new Rect();
     private final Rect mStartBounds = new Rect();
     private final Rect mDestinationBounds = new Rect();
     private final PipSurfaceTransactionHelper mSurfaceTransactionHelper;
@@ -55,29 +62,50 @@ public class SwipePipToHomeAnimator extends ValueAnimator implements
     private final Rect mSourceHintRectInsets = new Rect();
     private final Rect mSourceInsets = new Rect();
 
+    /** for rotation via {@link #setFromRotation(TaskViewSimulator, int)} */
+    private @RecentsOrientedState.SurfaceRotation int mFromRotation = Surface.ROTATION_0;
+    private final Rect mDestinationBoundsTransformed = new Rect();
+    private final Rect mDestinationBoundsAnimation = new Rect();
+
     /**
      * Flag to avoid the double-end problem since the leash would have been released
      * after the first end call and any further operations upon it would lead to NPE.
      */
     private boolean mHasAnimationEnded;
 
+    /**
+     * @param taskId Task id associated with this animator, see also {@link #getTaskId()}
+     * @param componentName Component associated with this animator,
+     *                      see also {@link #getComponentName()}
+     * @param leash {@link SurfaceControl} this animator operates on
+     * @param sourceRectHint See the definition in {@link android.app.PictureInPictureParams}
+     * @param appBounds Bounds of the application, sourceRectHint is based on this bounds
+     * @param startBounds Bounds of the application when this animator starts. This can be
+     *                    different from the appBounds if user has swiped a certain distance and
+     *                    Launcher has performed transform on the leash.
+     * @param destinationBounds Bounds of the destination this animator ends to
+     */
     public SwipePipToHomeAnimator(int taskId,
             @NonNull ComponentName componentName,
             @NonNull SurfaceControl leash,
             @NonNull Rect sourceRectHint,
+            @NonNull Rect appBounds,
             @NonNull Rect startBounds,
             @NonNull Rect destinationBounds) {
         mTaskId = taskId;
         mComponentName = componentName;
         mLeash = leash;
+        mAppBounds.set(appBounds);
         mStartBounds.set(startBounds);
         mDestinationBounds.set(destinationBounds);
+        mDestinationBoundsTransformed.set(mDestinationBounds);
+        mDestinationBoundsAnimation.set(mDestinationBounds);
         mSurfaceTransactionHelper = new PipSurfaceTransactionHelper();
 
-        mSourceHintRectInsets.set(sourceRectHint.left - startBounds.left,
-                sourceRectHint.top - startBounds.top,
-                startBounds.right - sourceRectHint.right,
-                startBounds.bottom - sourceRectHint.bottom);
+        mSourceHintRectInsets.set(sourceRectHint.left - appBounds.left,
+                sourceRectHint.top - appBounds.top,
+                appBounds.right - sourceRectHint.right,
+                appBounds.bottom - sourceRectHint.bottom);
 
         addListener(new AnimationSuccessListener() {
             @Override
@@ -106,16 +134,62 @@ public class SwipePipToHomeAnimator extends ValueAnimator implements
         addUpdateListener(this);
     }
 
+    /** sets the from rotation if it's different from the target rotation. */
+    public void setFromRotation(TaskViewSimulator taskViewSimulator,
+            @RecentsOrientedState.SurfaceRotation int fromRotation) {
+        if (fromRotation != Surface.ROTATION_90 && fromRotation != Surface.ROTATION_270) {
+            Log.wtf(TAG, "Not a supported rotation, rotation=" + fromRotation);
+            return;
+        }
+        mFromRotation = fromRotation;
+        final Matrix matrix = new Matrix();
+        taskViewSimulator.applyWindowToHomeRotation(matrix);
+
+        // map the destination bounds into window space. mDestinationBounds is always calculated
+        // in the final home space and the animation runs in original window space.
+        final RectF transformed = new RectF(mDestinationBounds);
+        matrix.mapRect(transformed, new RectF(mDestinationBounds));
+        transformed.round(mDestinationBoundsTransformed);
+
+        // set the animation destination bounds for RectEvaluator calculation.
+        // bounds and insets are calculated as if the transition is from mAppBounds to
+        // mDestinationBoundsAnimation, separated from rotate / scale / position.
+        mDestinationBoundsAnimation.set(mAppBounds.left, mAppBounds.top,
+                mAppBounds.left + mDestinationBounds.width(),
+                mAppBounds.top + mDestinationBounds.height());
+    }
+
     @Override
     public void onAnimationUpdate(ValueAnimator animator) {
         if (mHasAnimationEnded) return;
 
         final float fraction = animator.getAnimatedFraction();
-        final Rect bounds = mRectEvaluator.evaluate(fraction, mStartBounds, mDestinationBounds);
+        final Rect bounds = mRectEvaluator.evaluate(fraction, mStartBounds,
+                mDestinationBoundsAnimation);
         final Rect insets = mInsetsEvaluator.evaluate(fraction, mSourceInsets,
                 mSourceHintRectInsets);
-        final SurfaceControl.Transaction tx = new SurfaceControl.Transaction();
-        mSurfaceTransactionHelper.scaleAndCrop(tx, mLeash, mStartBounds, bounds, insets);
+        final SurfaceControl.Transaction tx =
+                PipSurfaceTransactionHelper.newSurfaceControlTransaction();
+        if (mFromRotation == Surface.ROTATION_90 || mFromRotation == Surface.ROTATION_270) {
+            final float degree, positionX, positionY;
+            if (mFromRotation == Surface.ROTATION_90) {
+                degree = -90 * fraction;
+                positionX = fraction * (mDestinationBoundsTransformed.left - mAppBounds.left)
+                        + mAppBounds.left;
+                positionY = fraction * (mDestinationBoundsTransformed.bottom - mAppBounds.top)
+                        + mAppBounds.top;
+            } else {
+                degree = 90 * fraction;
+                positionX = fraction * (mDestinationBoundsTransformed.right - mAppBounds.left)
+                        + mAppBounds.left;
+                positionY = fraction * (mDestinationBoundsTransformed.top - mAppBounds.top)
+                        + mAppBounds.top;
+            }
+            mSurfaceTransactionHelper.scaleAndRotate(tx, mLeash, mAppBounds, bounds, insets,
+                    degree, positionX, positionY);
+        } else {
+            mSurfaceTransactionHelper.scaleAndCrop(tx, mLeash, mAppBounds, bounds, insets);
+        }
         mSurfaceTransactionHelper.resetCornerRadius(tx, mLeash);
         tx.apply();
     }
@@ -135,8 +209,9 @@ public class SwipePipToHomeAnimator extends ValueAnimator implements
     private void onAnimationEnd() {
         if (mHasAnimationEnded) return;
 
-        final SurfaceControl.Transaction tx = new SurfaceControl.Transaction();
-        mSurfaceTransactionHelper.reset(tx, mLeash, mDestinationBounds);
+        final SurfaceControl.Transaction tx =
+                PipSurfaceTransactionHelper.newSurfaceControlTransaction();
+        mSurfaceTransactionHelper.reset(tx, mLeash, mDestinationBoundsTransformed, mFromRotation);
         tx.apply();
         mHasAnimationEnded = true;
     }
-- 
GitLab


From 20bbaa3390fc6e0f91de164c6c22199adacca2ee Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Tue, 15 Dec 2020 15:33:25 -0500
Subject: [PATCH 0371/1664] Add additional fake task views on overview gesture
 completion.

Added motion pause listening to animate an additional fake task view on overview gestures in the sandbox.

Test: manual

Demo: https://drive.google.com/file/d/1EpewbIAxiMUEz0Fqdfbok5q9xpWS6NWz/view?usp=sharing
Change-Id: Ifd0aed0a2bbb3204ae32c833b8466952679700e3
---
 ...lt_sandbox_app_previous_task_thumbnail.xml | 17 ++++++
 .../res/layout/gesture_tutorial_fragment.xml  |  8 +++
 .../interaction/NavBarGestureHandler.java     | 15 ++++-
 .../SwipeUpGestureTutorialController.java     | 61 ++++++++++++++++---
 .../interaction/TutorialController.java       | 10 +++
 res/values/colors.xml                         |  1 +
 src/com/android/launcher3/Utilities.java      |  5 ++
 7 files changed, 105 insertions(+), 12 deletions(-)
 create mode 100644 quickstep/res/drawable/default_sandbox_app_previous_task_thumbnail.xml

diff --git a/quickstep/res/drawable/default_sandbox_app_previous_task_thumbnail.xml b/quickstep/res/drawable/default_sandbox_app_previous_task_thumbnail.xml
new file mode 100644
index 0000000000..9c9549779e
--- /dev/null
+++ b/quickstep/res/drawable/default_sandbox_app_previous_task_thumbnail.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2020 The Android Open Source Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+  <solid android:color="@color/gesture_tutorial_fake_previous_task_view_color" />
+</shape>
diff --git a/quickstep/res/layout/gesture_tutorial_fragment.xml b/quickstep/res/layout/gesture_tutorial_fragment.xml
index 2ff3a5e4e5..9d06dfbe68 100644
--- a/quickstep/res/layout/gesture_tutorial_fragment.xml
+++ b/quickstep/res/layout/gesture_tutorial_fragment.xml
@@ -30,6 +30,14 @@
         android:layout_height="20dp"
         android:visibility="invisible" />
 
+    <View
+        android:id="@+id/gesture_tutorial_fake_previous_task_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleX="0.98"
+        android:scaleY="0.98"
+        android:visibility="invisible" />
+
     <View
         android:id="@+id/gesture_tutorial_fake_task_view"
         android:layout_width="match_parent"
diff --git a/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java b/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java
index d1b0a7088f..a9a9e2a104 100644
--- a/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java
+++ b/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java
@@ -56,7 +56,7 @@ import com.android.systemui.shared.system.QuickStepContract;
 
 /** Utility class to handle Home and Assistant gestures. */
 public class NavBarGestureHandler implements OnTouchListener,
-        TriggerSwipeUpTouchTracker.OnSwipeUpListener {
+        TriggerSwipeUpTouchTracker.OnSwipeUpListener, MotionPauseDetector.OnMotionPauseListener {
 
     private static final String LOG_TAG = "NavBarGestureHandler";
     private static final long RETRACT_GESTURE_ANIMATION_DURATION_MS = 300;
@@ -181,7 +181,7 @@ public class NavBarGestureHandler implements OnTouchListener,
                 mLaunchedAssistant = false;
                 mSwipeUpTouchTracker.init();
                 mMotionPauseDetector.clear();
-                mMotionPauseDetector.setOnMotionPauseListener(this::onMotionPauseDetected);
+                mMotionPauseDetector.setOnMotionPauseListener(this);
                 break;
             case MotionEvent.ACTION_MOVE:
                 mLastPos.set(event.getX(), event.getY());
@@ -256,7 +256,13 @@ public class NavBarGestureHandler implements OnTouchListener,
                 || event.getY() >= mDisplaySize.y - mBottomGestureHeight;
     }
 
-    protected void onMotionPauseDetected() {
+    @Override
+    public void onMotionPauseChanged(boolean isPaused) {
+        mGestureCallback.onMotionPaused(isPaused);
+    }
+
+    @Override
+    public void onMotionPauseDetected() {
         VibratorWrapper.INSTANCE.get(mContext).vibrate(OVERVIEW_HAPTIC);
     }
 
@@ -311,6 +317,9 @@ public class NavBarGestureHandler implements OnTouchListener,
         /** Called whenever any touch is completed. */
         void onNavBarGestureAttempted(NavBarGestureResult result, PointF finalVelocity);
 
+        /** Called when a motion stops or resumes */
+        default void onMotionPaused(boolean isPaused) {}
+
         /** Indicates how far a touch originating in the nav bar has moved from the nav bar. */
         default void setNavBarGestureProgress(@Nullable Float displacement) {}
 
diff --git a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
index 865b66e64b..68c63bf611 100644
--- a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
@@ -61,16 +61,21 @@ import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.
 
 @TargetApi(Build.VERSION_CODES.R)
 abstract class SwipeUpGestureTutorialController extends TutorialController {
-    private final ViewSwipeUpAnimation mViewSwipeUpAnimation;
+
+    private static final int FAKE_PREVIOUS_TASK_MARGIN = Utilities.dpToPx(12);
+
+    private final ViewSwipeUpAnimation mTaskViewSwipeUpAnimation;
     private float mFakeTaskViewRadius;
     private Rect mFakeTaskViewRect = new Rect();
     private RunningWindowAnim mRunningWindowAnim;
+    private boolean mShowTasks = false;
+    private boolean mShowPreviousTasks = false;
 
     SwipeUpGestureTutorialController(TutorialFragment tutorialFragment, TutorialType tutorialType) {
         super(tutorialFragment, tutorialType);
         RecentsAnimationDeviceState deviceState = new RecentsAnimationDeviceState(mContext);
         OverviewComponentObserver observer = new OverviewComponentObserver(mContext, deviceState);
-        mViewSwipeUpAnimation = new ViewSwipeUpAnimation(mContext, deviceState,
+        mTaskViewSwipeUpAnimation = new ViewSwipeUpAnimation(mContext, deviceState,
                 new GestureState(observer, -1));
         observer.onDestroy();
         deviceState.destroy();
@@ -83,16 +88,22 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
                 .getWindowInsets()
                 .getInsets(WindowInsets.Type.systemBars());
         dp.updateInsets(new Rect(insets.left, insets.top, insets.right, insets.bottom));
-        mViewSwipeUpAnimation.initDp(dp);
+        mTaskViewSwipeUpAnimation.initDp(dp);
 
         mFakeTaskViewRadius = QuickStepContract.getWindowCornerRadius(mContext.getResources());
-        mFakeTaskView.setClipToOutline(true);
-        mFakeTaskView.setOutlineProvider(new ViewOutlineProvider() {
+
+        ViewOutlineProvider outlineProvider = new ViewOutlineProvider() {
             @Override
             public void getOutline(View view, Outline outline) {
                 outline.setRoundRect(mFakeTaskViewRect, mFakeTaskViewRadius);
             }
-        });
+        };
+
+        mFakeTaskView.setClipToOutline(true);
+        mFakeTaskView.setOutlineProvider(outlineProvider);
+
+        mFakePreviousTaskView.setClipToOutline(true);
+        mFakePreviousTaskView.setOutlineProvider(outlineProvider);
     }
 
     private void cancelRunningAnimation() {
@@ -114,16 +125,22 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
                 mFakeIconView.setVisibility(View.INVISIBLE);
                 mFakeTaskView.setVisibility(View.INVISIBLE);
                 mFakeTaskView.setAlpha(1);
+                mFakePreviousTaskView.setVisibility(View.INVISIBLE);
+                mFakePreviousTaskView.setAlpha(1);
+                mShowTasks = false;
+                mShowPreviousTasks = false;
                 mRunningWindowAnim = null;
             }
         };
         if (toOverviewFirst) {
-            anim.setFloat(mViewSwipeUpAnimation.getCurrentShift(), AnimatedFloat.VALUE, 1, ACCEL);
+            anim.setFloat(mTaskViewSwipeUpAnimation
+                    .getCurrentShift(), AnimatedFloat.VALUE, 1, ACCEL);
             anim.addListener(new AnimatorListenerAdapter() {
                 @Override
                 public void onAnimationEnd(Animator animation, boolean isReverse) {
                     PendingAnimation fadeAnim = new PendingAnimation(300);
                     fadeAnim.setViewAlpha(mFakeTaskView, 0, ACCEL);
+                    fadeAnim.setViewAlpha(mFakePreviousTaskView, 0, ACCEL);
                     fadeAnim.addListener(resetTaskView);
                     AnimatorSet animset = fadeAnim.buildAnim();
                     animset.setStartDelay(100);
@@ -133,6 +150,7 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
             });
         } else {
             anim.setViewAlpha(mFakeTaskView, 0, ACCEL);
+            anim.setViewAlpha(mFakePreviousTaskView, 0, ACCEL);
             anim.setViewAlpha(mFakeIconView, 0, ACCEL);
             anim.addListener(resetTaskView);
         }
@@ -148,8 +166,10 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
         hideFeedback();
         hideHandCoachingAnimation();
         cancelRunningAnimation();
+        mFakePreviousTaskView.setVisibility(View.INVISIBLE);
+        mShowPreviousTasks = false;
         RectFSpringAnim rectAnim =
-                mViewSwipeUpAnimation.handleSwipeUpToHome(finalVelocity);
+                mTaskViewSwipeUpAnimation.handleSwipeUpToHome(finalVelocity);
         // After home animation finishes, fade out and run onEndRunnable.
         rectAnim.addAnimatorListener(AnimationSuccessListener.forRunnable(
                 () -> fadeOutFakeTaskView(false, onEndRunnable)));
@@ -161,11 +181,31 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
         if (displacement == null || mTutorialType == HOME_NAVIGATION_COMPLETE
                 || mTutorialType == OVERVIEW_NAVIGATION_COMPLETE) {
             mFakeTaskView.setVisibility(View.INVISIBLE);
+            mFakePreviousTaskView.setVisibility(View.INVISIBLE);
         } else {
+            mShowTasks = true;
             mFakeTaskView.setVisibility(View.VISIBLE);
+            if (mShowPreviousTasks) {
+                mFakePreviousTaskView.setVisibility(View.VISIBLE);
+            }
             if (mRunningWindowAnim == null) {
-                mViewSwipeUpAnimation.updateDisplacement(displacement);
+                mTaskViewSwipeUpAnimation.updateDisplacement(displacement);
+            }
+        }
+    }
+
+    @Override
+    public void onMotionPaused(boolean unused) {
+        if (mShowTasks) {
+            if (!mShowPreviousTasks) {
+                mFakePreviousTaskView.setTranslationX(
+                        -(2 * mFakePreviousTaskView.getWidth() + FAKE_PREVIOUS_TASK_MARGIN));
+                mFakePreviousTaskView.animate()
+                    .setDuration(300)
+                    .translationX(-(mFakePreviousTaskView.getWidth() + FAKE_PREVIOUS_TASK_MARGIN))
+                    .start();
             }
+            mShowPreviousTasks = true;
         }
     }
 
@@ -232,6 +272,7 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
                             false /* isVerticalBarLayout */);
                     mFakeIconView.setAlpha(1);
                     mFakeTaskView.setAlpha(getWindowAlpha(progress));
+                    mFakePreviousTaskView.setAlpha(getWindowAlpha(progress));
                 }
 
                 @Override
@@ -258,9 +299,11 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
         public void applySurfaceParams(SurfaceParams[] params) {
             SurfaceParams p = params[0];
             mFakeTaskView.setAnimationMatrix(p.matrix);
+            mFakePreviousTaskView.setAnimationMatrix(p.matrix);
             mFakeTaskViewRect.set(p.windowCrop);
             mFakeTaskViewRadius = p.cornerRadius;
             mFakeTaskView.invalidateOutline();
+            mFakePreviousTaskView.invalidateOutline();
         }
     }
 }
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
index 0d5a110be3..12d2efcb8c 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
@@ -52,6 +52,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
     final View mLauncherView;
     final ClipIconView mFakeIconView;
     final View mFakeTaskView;
+    final View mFakePreviousTaskView;
     final View mRippleView;
     final RippleDrawable mRippleDrawable;
     @Nullable final TutorialHandAnimation mHandCoachingAnimation;
@@ -74,6 +75,8 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         mLauncherView = getMockLauncherView();
         mFakeIconView = rootView.findViewById(R.id.gesture_tutorial_fake_icon_view);
         mFakeTaskView = rootView.findViewById(R.id.gesture_tutorial_fake_task_view);
+        mFakePreviousTaskView =
+                rootView.findViewById(R.id.gesture_tutorial_fake_previous_task_view);
         mRippleView = rootView.findViewById(R.id.gesture_tutorial_ripple_view);
         mRippleDrawable = (RippleDrawable) mRippleView.getBackground();
         mHandCoachingAnimation = tutorialFragment.getHandAnimation();
@@ -93,6 +96,8 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         if (mContext != null) {
             rootView.setBackground(mContext.getDrawable(getMockWallpaperResId()));
             mFakeTaskView.setBackground(mContext.getDrawable(getMockAppTaskThumbnailResId()));
+            mFakePreviousTaskView.setBackground(
+                    mContext.getDrawable(getMockPreviousAppTaskThumbnailResId()));
             mFakeIconView.setBackground(mContext.getDrawable(getMockAppIconResId()));
         }
     }
@@ -126,6 +131,11 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         return R.drawable.default_sandbox_app_task_thumbnail;
     }
 
+    @DrawableRes
+    protected int getMockPreviousAppTaskThumbnailResId() {
+        return R.drawable.default_sandbox_app_previous_task_thumbnail;
+    }
+
     @Nullable
     public View getMockLauncherView() {
         InvariantDeviceProfile dp = InvariantDeviceProfile.INSTANCE.get(mContext);
diff --git a/res/values/colors.xml b/res/values/colors.xml
index f56fbaaace..78c2df69e0 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -37,6 +37,7 @@
 
     <color name="gesture_tutorial_ripple_color">#A0C2F9</color> <!-- Light Blue -->
     <color name="gesture_tutorial_fake_task_view_color">#6DA1FF</color> <!-- Light Blue -->
+    <color name="gesture_tutorial_fake_previous_task_view_color">#9CCC65</color> <!-- Light Green -->
     <color name="gesture_tutorial_action_button_label_color">#FFFFFFFF</color>
     <color name="gesture_tutorial_primary_color">#1A73E8</color> <!-- Blue -->
 </resources>
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 1e023dfc0a..5c2f35b981 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -404,6 +404,11 @@ public final class Utilities {
         return (size / densityRatio);
     }
 
+    /** Converts a dp value to pixels for the current device. */
+    public static int dpToPx(float dp) {
+        return (int) (dp * Resources.getSystem().getDisplayMetrics().density);
+    }
+
     public static int pxFromSp(float size, DisplayMetrics metrics) {
         return (int) Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP,
                 size, metrics));
-- 
GitLab


From 6e0b00d15ce47892f57bd5c1b9326b90c3450024 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Sun, 27 Dec 2020 15:56:09 -0600
Subject: [PATCH 0372/1664] Remove Second consumer from
 AllAppsSearchBarController

Bug: 175125073
Test: Manual
Change-Id: I34abf0b999e58e034705a1c0696e8fcd88020b28
---
 .../allapps/search/AllAppsSearchBarController.java   |  4 +---
 .../allapps/search/AppsSearchContainerLayout.java    | 12 ++----------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
index bc5a5f2cf1..9886745417 100644
--- a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
+++ b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
@@ -15,7 +15,6 @@
  */
 package com.android.launcher3.allapps.search;
 
-import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -37,7 +36,6 @@ import com.android.systemui.plugins.AllAppsSearchPlugin;
 import com.android.systemui.plugins.shared.SearchTarget;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.function.Consumer;
 
 /**
@@ -63,7 +61,7 @@ public class AllAppsSearchBarController
      */
     public final void initialize(
             SearchAlgorithm searchAlgorithm, ExtendedEditText input,
-            BaseDraggingActivity launcher, Callbacks cb, Consumer<List<Bundle>> secondaryCb) {
+            BaseDraggingActivity launcher, Callbacks cb) {
         mCb = cb;
         mLauncher = launcher;
 
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
index bd2f04d4ee..4f79fb8b6b 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
@@ -24,7 +24,6 @@ import static com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTO
 
 import android.content.Context;
 import android.graphics.Rect;
-import android.os.Bundle;
 import android.text.Selection;
 import android.text.SpannableStringBuilder;
 import android.text.method.TextKeyListener;
@@ -50,15 +49,13 @@ import com.android.launcher3.anim.PropertySetter;
 import com.android.launcher3.config.FeatureFlags;
 
 import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Consumer;
 
 /**
  * Layout to contain the All-apps search UI.
  */
 public class AppsSearchContainerLayout extends ExtendedEditText
         implements SearchUiManager, AllAppsSearchBarController.Callbacks,
-        AllAppsStore.OnUpdateListener, Insettable, Consumer<List<Bundle>> {
+        AllAppsStore.OnUpdateListener, Insettable {
 
     private final BaseDraggingActivity mLauncher;
     private final AllAppsSearchBarController mSearchBarController;
@@ -141,7 +138,7 @@ public class AppsSearchContainerLayout extends ExtendedEditText
         mAppsView = appsView;
         mSearchBarController.initialize(
                 new DefaultAppSearchAlgorithm(mLauncher, LauncherAppState.getInstance(mLauncher)),
-                this, mLauncher, this, this);
+                this, mLauncher, this);
     }
 
     @Override
@@ -234,9 +231,4 @@ public class AppsSearchContainerLayout extends ExtendedEditText
     public EditText getEditText() {
         return this;
     }
-
-    @Override
-    public void accept(List<Bundle> bundles) {
-        // TODO: Render the result on mAppsView object
-    }
 }
-- 
GitLab


From 9b1e77377b22de9ab200f755550d2a4a4f5b099f Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 9 Dec 2020 16:23:24 -0800
Subject: [PATCH 0373/1664] Removing shelf from 2-button gesture mode

Test: Manual
Bug: 175137718
Change-Id: Ifb64b4dcac53252aefa8ee0bd6434f90f1d868b7
---
 quickstep/res/values/dimens.xml               |  2 -
 .../launcher3/BaseQuickstepLauncher.java      | 17 +----
 .../uioverrides/QuickstepLauncher.java        | 42 +++++-----
 .../uioverrides/states/AllAppsState.java      |  4 +-
 .../uioverrides/states/OverviewState.java     | 31 +-------
 .../QuickstepAtomicAnimationFactory.java      | 64 +---------------
 ...ButtonNavbarToOverviewTouchController.java |  2 +-
 .../OverviewToAllAppsTouchController.java     | 75 ------------------
 .../PortraitStatesTouchController.java        | 30 ++------
 ...uttonNavbarToOverviewTouchController.java} | 38 ++++++++--
 .../quickstep/BaseActivityInterface.java      | 23 ++----
 .../quickstep/FallbackActivityInterface.java  |  8 +-
 .../quickstep/LauncherActivityInterface.java  | 69 ++++-------------
 .../android/quickstep/RecentsActivity.java    |  3 +-
 .../RecentsAnimationDeviceState.java          |  3 +-
 .../quickstep/SysUINavigationMode.java        | 13 ----
 .../android/quickstep/util/LayoutUtils.java   | 17 +----
 .../util/QuickstepOnboardingPrefs.java        | 22 ------
 .../util/RecentsAtomicAnimationFactory.java   |  9 +--
 .../quickstep/util/RecentsOrientedState.java  |  7 +-
 .../quickstep/views/OverviewActionsView.java  | 15 +---
 .../quickstep/views/ShelfScrimView.java       | 27 ++-----
 .../android/quickstep/TaplTestsQuickstep.java | 76 +++----------------
 res/layout/launcher.xml                       |  9 +--
 .../launcher3/allapps/DiscoveryBounce.java    | 35 ---------
 .../launcher3/util/OnboardingPrefs.java       |  4 -
 .../tapl/LauncherInstrumentation.java         | 19 +----
 27 files changed, 116 insertions(+), 548 deletions(-)
 delete mode 100644 quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java
 rename quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/{LandscapeEdgeSwipeController.java => TwoButtonNavbarToOverviewTouchController.java} (56%)

diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index c7c0c7ed73..727fbd3ea1 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -55,11 +55,9 @@
 
     <!-- Total space (start + end) between the task card and the edge of the screen
          in various configurations -->
-    <dimen name="task_card_vert_space">40dp</dimen>
     <dimen name="task_card_menu_option_vertical_padding">8dp</dimen>
     <dimen name="task_card_menu_shadow_height">3dp</dimen>
     <dimen name="task_card_menu_horizontal_padding">0dp</dimen>
-    <dimen name="portrait_task_card_horz_space">136dp</dimen>
     <dimen name="portrait_task_card_horz_space_big_overview">96dp</dimen>
     <dimen name="portrait_modal_task_card_horz_space">60dp</dimen>
     <dimen name="landscape_task_card_horz_space">200dp</dimen>
diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index f02acab838..4204597c03 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -20,7 +20,6 @@ import static com.android.launcher3.AbstractFloatingView.TYPE_HIDE_BACK_BUTTON;
 import static com.android.launcher3.LauncherState.FLAG_HIDE_BACK_BUTTON;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
-import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY;
 
 import android.animation.AnimatorSet;
@@ -93,7 +92,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
     @Override
     public void onNavigationModeChanged(Mode newMode) {
         getDragLayer().recreateControllers();
-        if (mActionsView != null && isOverviewActionsEnabled()) {
+        if (mActionsView != null) {
             mActionsView.updateVerticalMargin(newMode);
         }
     }
@@ -190,17 +189,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
         SysUINavigationMode.INSTANCE.get(this).updateMode();
         mActionsView = findViewById(R.id.overview_actions_view);
         ((RecentsView) getOverviewPanel()).init(mActionsView);
-
-        if (isOverviewActionsEnabled()) {
-            // Overview is above all other launcher elements, including qsb, so move it to the top.
-            getOverviewPanel().bringToFront();
-            mActionsView.bringToFront();
-            mActionsView.updateVerticalMargin(SysUINavigationMode.getMode(this));
-        }
-    }
-
-    private boolean isOverviewActionsEnabled() {
-        return removeShelfFromOverview(this);
+        mActionsView.updateVerticalMargin(SysUINavigationMode.getMode(this));
     }
 
     public <T extends OverviewActionsView> T getActionsView() {
@@ -251,7 +240,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
 
     @Override
     public float[] getNormalOverviewScaleAndOffset() {
-        return SysUINavigationMode.getMode(this) == Mode.NO_BUTTON
+        return SysUINavigationMode.getMode(this).hasGestures
                 ? new float[] {1, 1} : new float[] {1.1f, 0};
     }
 
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 2d704f801e..8c3b57abc9 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -29,7 +29,6 @@ import static com.android.launcher3.testing.TestProtocol.HINT_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.OVERVIEW_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.QUICK_SWITCH_STATE_ORDINAL;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY;
 
 import android.content.Intent;
@@ -43,7 +42,6 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.Workspace;
-import com.android.launcher3.allapps.DiscoveryBounce;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.appprediction.PredictionRowView;
 import com.android.launcher3.config.FeatureFlags;
@@ -55,16 +53,15 @@ import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.popup.SystemShortcut;
 import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory;
 import com.android.launcher3.uioverrides.states.QuickstepAtomicAnimationFactory;
-import com.android.launcher3.uioverrides.touchcontrollers.LandscapeEdgeSwipeController;
 import com.android.launcher3.uioverrides.touchcontrollers.NavBarToHomeTouchController;
 import com.android.launcher3.uioverrides.touchcontrollers.NoButtonNavbarToOverviewTouchController;
 import com.android.launcher3.uioverrides.touchcontrollers.NoButtonQuickSwitchTouchController;
-import com.android.launcher3.uioverrides.touchcontrollers.OverviewToAllAppsTouchController;
 import com.android.launcher3.uioverrides.touchcontrollers.PortraitStatesTouchController;
 import com.android.launcher3.uioverrides.touchcontrollers.QuickSwitchTouchController;
 import com.android.launcher3.uioverrides.touchcontrollers.StatusBarTouchController;
 import com.android.launcher3.uioverrides.touchcontrollers.TaskViewTouchController;
 import com.android.launcher3.uioverrides.touchcontrollers.TransposedQuickSwitchTouchController;
+import com.android.launcher3.uioverrides.touchcontrollers.TwoButtonNavbarToOverviewTouchController;
 import com.android.launcher3.util.OnboardingPrefs;
 import com.android.launcher3.util.TouchController;
 import com.android.launcher3.util.UiThreadHelper;
@@ -240,9 +237,6 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
                 break;
             }
             case OVERVIEW_STATE_ORDINAL: {
-                RecentsView recentsView = getOverviewPanel();
-                DiscoveryBounce.showForOverviewIfNeeded(this,
-                        recentsView.getPagedOrientationHandler());
                 RecentsView rv = getOverviewPanel();
                 sendCustomAccessibilityEvent(
                         rv.getPageAt(rv.getCurrentPage()), TYPE_VIEW_FOCUSED, null);
@@ -275,24 +269,22 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
 
         ArrayList<TouchController> list = new ArrayList<>();
         list.add(getDragController());
-        if (mode == NO_BUTTON) {
-            list.add(new NoButtonQuickSwitchTouchController(this));
-            list.add(new NavBarToHomeTouchController(this));
-            list.add(new NoButtonNavbarToOverviewTouchController(this));
-        } else {
-            if (getDeviceProfile().isVerticalBarLayout()) {
-                list.add(new OverviewToAllAppsTouchController(this));
-                list.add(new LandscapeEdgeSwipeController(this));
-                if (mode.hasGestures) {
-                    list.add(new TransposedQuickSwitchTouchController(this));
-                }
-            } else {
-                list.add(new PortraitStatesTouchController(this,
-                        mode.hasGestures /* allowDragToOverview */));
-                if (mode.hasGestures) {
-                    list.add(new QuickSwitchTouchController(this));
-                }
-            }
+        switch (mode) {
+            case NO_BUTTON:
+                list.add(new NoButtonQuickSwitchTouchController(this));
+                list.add(new NavBarToHomeTouchController(this));
+                list.add(new NoButtonNavbarToOverviewTouchController(this));
+                break;
+            case TWO_BUTTONS:
+                list.add(new TwoButtonNavbarToOverviewTouchController(this));
+                list.add(getDeviceProfile().isVerticalBarLayout()
+                        ? new TransposedQuickSwitchTouchController(this)
+                        : new QuickSwitchTouchController(this));
+                list.add(new PortraitStatesTouchController(this));
+                break;
+            case THREE_BUTTONS:
+            default:
+                list.add(new PortraitStatesTouchController(this));
         }
 
         if (!getDeviceProfile().isMultiWindowMode) {
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
index a2e3bdf8a0..37c774b657 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
@@ -17,7 +17,6 @@ package com.android.launcher3.uioverrides.states;
 
 import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_ALLAPPS;
-import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
 
 import android.content.Context;
 
@@ -84,8 +83,7 @@ public class AllAppsState extends LauncherState {
 
     @Override
     public float[] getOverviewScaleAndOffset(Launcher launcher) {
-        float offset = removeShelfFromOverview(launcher) ? 1 : 0;
-        return new float[] {0.9f, offset};
+        return new float[] {0.9f, 1};
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
index 525ff5816d..b295e79d04 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -18,8 +18,6 @@ package com.android.launcher3.uioverrides.states;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW;
 import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
-import static com.android.quickstep.SysUINavigationMode.hideShelfInTwoButtonLandscape;
-import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
 
 import android.content.Context;
 import android.graphics.Rect;
@@ -105,7 +103,7 @@ public class OverviewState extends LauncherState {
 
     @Override
     public ScaleAndTranslation getQsbScaleAndTranslation(Launcher launcher) {
-        if (this == OVERVIEW && removeShelfFromOverview(launcher)) {
+        if (this == OVERVIEW) {
             // Treat the QSB as part of the hotseat so they move together.
             return getHotseatScaleAndTranslation(launcher);
         }
@@ -124,18 +122,7 @@ public class OverviewState extends LauncherState {
 
     @Override
     public int getVisibleElements(Launcher launcher) {
-        RecentsView recentsView = launcher.getOverviewPanel();
-        if (removeShelfFromOverview(launcher) ||
-                hideShelfInTwoButtonLandscape(launcher, recentsView.getPagedOrientationHandler())) {
-            return OVERVIEW_BUTTONS;
-        } else if (launcher.getDeviceProfile().isVerticalBarLayout()) {
-            return VERTICAL_SWIPE_INDICATOR | OVERVIEW_BUTTONS;
-        } else {
-            boolean hasAllAppsHeaderExtra = launcher.getAppsView() != null
-                    && launcher.getAppsView().getFloatingHeaderView().hasVisibleContent();
-            return HOTSEAT_SEARCH_BOX | VERTICAL_SWIPE_INDICATOR | OVERVIEW_BUTTONS
-                    | (hasAllAppsHeaderExtra ? ALL_APPS_HEADER_EXTRA : HOTSEAT_ICONS);
-        }
+        return OVERVIEW_BUTTONS;
     }
 
     @Override
@@ -143,20 +130,6 @@ public class OverviewState extends LauncherState {
         return 0.5f;
     }
 
-    @Override
-    public float getVerticalProgress(Launcher launcher) {
-        if ((getVisibleElements(launcher) & ALL_APPS_HEADER_EXTRA) == 0) {
-            // We have no all apps content, so we're still at the fully down progress.
-            return super.getVerticalProgress(launcher);
-        }
-        return getDefaultVerticalProgress(launcher);
-    }
-
-    public static float getDefaultVerticalProgress(Launcher launcher) {
-        return 1 - (getDefaultSwipeHeight(launcher)
-                / launcher.getAllAppsController().getShiftRange());
-    }
-
     @Override
     public String getDescription(Launcher launcher) {
         return launcher.getString(R.string.accessibility_recent_apps);
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
index 77fd103a6c..efb91c6905 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
@@ -17,9 +17,7 @@ package com.android.launcher3.uioverrides.states;
 
 import static android.view.View.VISIBLE;
 
-import static com.android.launcher3.LauncherState.BACKGROUND_APP;
 import static com.android.launcher3.LauncherState.HINT_STATE;
-import static com.android.launcher3.LauncherState.HOTSEAT_ICONS;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.WorkspaceStateTransitionAnimation.getSpringScaleAnimator;
@@ -30,9 +28,7 @@ import static com.android.launcher3.anim.Interpolators.DEACCEL_1_7;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
 import static com.android.launcher3.anim.Interpolators.FINAL_FRAME;
 import static com.android.launcher3.anim.Interpolators.INSTANT;
-import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
-import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_7;
 import static com.android.launcher3.anim.Interpolators.clampToProgress;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_DEPTH;
@@ -44,23 +40,17 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_F
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_TRANSLATE;
 import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
-import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
 import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
 
-import android.animation.Animator;
-import android.animation.AnimatorSet;
 import android.animation.ValueAnimator;
 import android.view.View;
-import android.view.animation.Interpolator;
 
 import com.android.launcher3.CellLayout;
 import com.android.launcher3.Hotseat;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
-import com.android.launcher3.LauncherState.ScaleAndTranslation;
 import com.android.launcher3.Workspace;
 import com.android.launcher3.allapps.AllAppsContainerView;
-import com.android.launcher3.allapps.AllAppsTransitionController;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.uioverrides.QuickstepLauncher;
 import com.android.quickstep.SysUINavigationMode;
@@ -76,57 +66,12 @@ public class QuickstepAtomicAnimationFactory extends
     // Scale recents takes before animating in
     private static final float RECENTS_PREPARE_SCALE = 1.33f;
 
-    public static final int INDEX_SHELF_ANIM = RecentsAtomicAnimationFactory.NEXT_INDEX + 0;
-
-    private static final int MY_ANIM_COUNT = 1;
-    protected static final int NEXT_INDEX = RecentsAtomicAnimationFactory.NEXT_INDEX
-            + MY_ANIM_COUNT;
-
     // Due to use of physics, duration may differ between devices so we need to calculate and
     // cache the value.
     private int mHintToNormalDuration = -1;
 
     public QuickstepAtomicAnimationFactory(QuickstepLauncher activity) {
-        super(activity, MY_ANIM_COUNT);
-    }
-
-    @Override
-    public Animator createStateElementAnimation(int index, float... values) {
-        switch (index) {
-            case INDEX_SHELF_ANIM: {
-                AllAppsTransitionController aatc = mActivity.getAllAppsController();
-                Animator springAnim = aatc.createSpringAnimation(values);
-
-                if ((OVERVIEW.getVisibleElements(mActivity) & HOTSEAT_ICONS) != 0) {
-                    // Translate hotseat with the shelf until reaching overview.
-                    float overviewProgress = OVERVIEW.getVerticalProgress(mActivity);
-                    ScaleAndTranslation sat = OVERVIEW.getHotseatScaleAndTranslation(mActivity);
-                    float shiftRange = aatc.getShiftRange();
-                    if (values.length == 1) {
-                        values = new float[] {aatc.getProgress(), values[0]};
-                    }
-                    ValueAnimator hotseatAnim = ValueAnimator.ofFloat(values);
-                    hotseatAnim.addUpdateListener(anim -> {
-                        float progress = (Float) anim.getAnimatedValue();
-                        if (progress >= overviewProgress || mActivity.isInState(BACKGROUND_APP)) {
-                            float hotseatShift = (progress - overviewProgress) * shiftRange;
-                            mActivity.getHotseat().setTranslationY(hotseatShift + sat.translationY);
-                        }
-                    });
-                    hotseatAnim.setInterpolator(LINEAR);
-                    hotseatAnim.setDuration(springAnim.getDuration());
-
-                    AnimatorSet anim = new AnimatorSet();
-                    anim.play(hotseatAnim);
-                    anim.play(springAnim);
-                    return anim;
-                }
-
-                return springAnim;
-            }
-            default:
-                return super.createStateElementAnimation(index, values);
-        }
+        super(activity);
     }
 
     @Override
@@ -191,11 +136,8 @@ public class QuickstepAtomicAnimationFactory extends
             config.setInterpolator(ANIM_ALL_APPS_FADE, OVERSHOOT_1_2);
             config.setInterpolator(ANIM_OVERVIEW_SCALE, OVERSHOOT_1_2);
             config.setInterpolator(ANIM_DEPTH, OVERSHOOT_1_2);
-            Interpolator translationInterpolator = removeShelfFromOverview(mActivity)
-                    ? OVERSHOOT_1_2
-                    : OVERSHOOT_1_7;
-            config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, translationInterpolator);
-            config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, translationInterpolator);
+            config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, OVERSHOOT_1_2);
+            config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, OVERSHOOT_1_2);
         } else if (fromState == HINT_STATE && toState == NORMAL) {
             config.setInterpolator(ANIM_DEPTH, DEACCEL_3);
             if (mHintToNormalDuration == -1) {
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
index addfe927e8..45cb46f96a 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -84,7 +84,7 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
     private ObjectAnimator mNormalToHintOverviewScrimAnimator;
 
     public NoButtonNavbarToOverviewTouchController(Launcher l) {
-        super(l, false /* allowDragToOverview */);
+        super(l);
         mRecentsView = l.getOverviewPanel();
         mMotionPauseDetector = new MotionPauseDetector(l);
         mMotionPauseMinDisplacement = ViewConfiguration.get(l).getScaledTouchSlop();
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java
deleted file mode 100644
index 45e5e2fb7c..0000000000
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.uioverrides.touchcontrollers;
-
-import static com.android.launcher3.LauncherState.ALL_APPS;
-import static com.android.launcher3.LauncherState.NORMAL;
-import static com.android.launcher3.LauncherState.OVERVIEW;
-
-import android.view.MotionEvent;
-
-import com.android.launcher3.AbstractFloatingView;
-import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherState;
-import com.android.launcher3.Utilities;
-import com.android.quickstep.TouchInteractionService;
-import com.android.quickstep.views.RecentsView;
-
-/**
- * Touch controller from going from OVERVIEW to ALL_APPS.
- *
- * This is used in landscape mode. It is also used in portrait mode for the fallback recents.
- */
-public class OverviewToAllAppsTouchController extends PortraitStatesTouchController {
-
-    public OverviewToAllAppsTouchController(Launcher l) {
-        super(l, true /* allowDragToOverview */);
-    }
-
-    @Override
-    protected boolean canInterceptTouch(MotionEvent ev) {
-        if (mCurrentAnimation != null) {
-            // If we are already animating from a previous state, we can intercept.
-            return true;
-        }
-        if (AbstractFloatingView.getTopOpenView(mLauncher) != null) {
-            return false;
-        }
-        if (mLauncher.isInState(ALL_APPS)) {
-            // In all-apps only listen if the container cannot scroll itself
-            return mLauncher.getAppsView().shouldContainerScroll(ev);
-        } else if (mLauncher.isInState(NORMAL)) {
-            return (ev.getEdgeFlags() & Utilities.EDGE_NAV_BAR) == 0;
-        } else if (mLauncher.isInState(OVERVIEW)) {
-            RecentsView rv = mLauncher.getOverviewPanel();
-            return ev.getY() > (rv.getBottom() - rv.getPaddingBottom());
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    protected LauncherState getTargetState(LauncherState fromState, boolean isDragTowardPositive) {
-        if (fromState == ALL_APPS && !isDragTowardPositive) {
-            // Should swipe down go to OVERVIEW instead?
-            return TouchInteractionService.isConnected() ?
-                    mLauncher.getStateManager().getLastState() : NORMAL;
-        } else if (isDragTowardPositive) {
-            return ALL_APPS;
-        }
-        return fromState;
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
index 3c9b808f2f..73f4ff2ba4 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
@@ -28,8 +28,6 @@ import static com.android.launcher3.config.FeatureFlags.UNSTABLE_SPRINGS;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_VERTICAL_PROGRESS;
-import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
-import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
 
 import android.animation.TimeInterpolator;
 import android.animation.ValueAnimator;
@@ -49,7 +47,6 @@ import com.android.launcher3.touch.AbstractStateChangeTouchController;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
 import com.android.launcher3.uioverrides.states.OverviewState;
 import com.android.quickstep.SystemUiProxy;
-import com.android.quickstep.TouchInteractionService;
 import com.android.quickstep.util.LayoutUtils;
 import com.android.quickstep.views.RecentsView;
 
@@ -74,21 +71,18 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
 
     private final InterpolatorWrapper mAllAppsInterpolatorWrapper = new InterpolatorWrapper();
 
-    private final boolean mAllowDragToOverview;
-
     // If true, we will finish the current animation instantly on second touch.
     private boolean mFinishFastOnSecondTouch;
 
-    public PortraitStatesTouchController(Launcher l, boolean allowDragToOverview) {
+    public PortraitStatesTouchController(Launcher l) {
         super(l, SingleAxisSwipeDetector.VERTICAL);
         mOverviewPortraitStateTouchHelper = new PortraitOverviewStateTouchHelper(l);
-        mAllowDragToOverview = allowDragToOverview;
     }
 
     @Override
     protected boolean canInterceptTouch(MotionEvent ev) {
         // If we are swiping to all apps instead of overview, allow it from anywhere.
-        boolean interceptAnywhere = mLauncher.isInState(NORMAL) && !mAllowDragToOverview;
+        boolean interceptAnywhere = mLauncher.isInState(NORMAL);
         if (mCurrentAnimation != null) {
             if (mFinishFastOnSecondTouch) {
                 mCurrentAnimation.getAnimationPlayer().end();
@@ -135,37 +129,23 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
             Log.d(TestProtocol.OVERIEW_NOT_ALLAPPS, "PortraitStatesTouchController.getTargetState");
         }
         if (fromState == ALL_APPS && !isDragTowardPositive) {
-            // Should swipe down go to OVERVIEW instead?
             if (TestProtocol.sDebugTracing) {
                 Log.d(TestProtocol.OVERIEW_NOT_ALLAPPS,
                         "PortraitStatesTouchController.getTargetState 1");
             }
-            if (removeShelfFromOverview(mLauncher)) {
-                // Don't allow swiping down to overview.
-                return NORMAL;
-            }
-            return TouchInteractionService.isConnected() ?
-                    mLauncher.getStateManager().getLastState() : NORMAL;
+            return NORMAL;
         } else if (fromState == OVERVIEW) {
             if (TestProtocol.sDebugTracing) {
                 Log.d(TestProtocol.OVERIEW_NOT_ALLAPPS,
                         "PortraitStatesTouchController.getTargetState 2");
             }
-            LauncherState positiveDragTarget = ALL_APPS;
-            if (removeShelfFromOverview(mLauncher)) {
-                // Don't allow swiping up to all apps.
-                positiveDragTarget = OVERVIEW;
-            }
-            return isDragTowardPositive ? positiveDragTarget : NORMAL;
+            return isDragTowardPositive ? OVERVIEW : NORMAL;
         } else if (fromState == NORMAL && isDragTowardPositive) {
             if (TestProtocol.sDebugTracing) {
                 Log.d(TestProtocol.OVERIEW_NOT_ALLAPPS,
                         "PortraitStatesTouchController.getTargetState 3");
             }
-            int stateFlags = SystemUiProxy.INSTANCE.get(mLauncher).getLastSystemUiStateFlags();
-            return mAllowDragToOverview && TouchInteractionService.isConnected()
-                    && (stateFlags & SYSUI_STATE_OVERVIEW_DISABLED) == 0
-                    ? OVERVIEW : ALL_APPS;
+            return ALL_APPS;
         }
         return fromState;
     }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeEdgeSwipeController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarToOverviewTouchController.java
similarity index 56%
rename from quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeEdgeSwipeController.java
rename to quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarToOverviewTouchController.java
index 7a0f634b45..ff4bfe6759 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeEdgeSwipeController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarToOverviewTouchController.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.android.launcher3.uioverrides.touchcontrollers;
 
 import static com.android.launcher3.LauncherState.NORMAL;
@@ -15,14 +30,15 @@ import com.android.launcher3.touch.SingleAxisSwipeDetector;
 import com.android.quickstep.SystemUiProxy;
 
 /**
- * Touch controller for handling edge swipes in landscape/seascape UI
+ * Touch controller for handling edge swipes in 2-button mode
  */
-public class LandscapeEdgeSwipeController extends AbstractStateChangeTouchController {
+public class TwoButtonNavbarToOverviewTouchController extends AbstractStateChangeTouchController {
 
-    private static final String TAG = "LandscapeEdgeSwipeCtrl";
+    private static final String TAG = "2BtnNavbarTouchCtrl";
 
-    public LandscapeEdgeSwipeController(Launcher l) {
-        super(l, SingleAxisSwipeDetector.HORIZONTAL);
+    public TwoButtonNavbarToOverviewTouchController(Launcher l) {
+        super(l, l.getDeviceProfile().isVerticalBarLayout()
+                ? SingleAxisSwipeDetector.HORIZONTAL : SingleAxisSwipeDetector.VERTICAL);
     }
 
     @Override
@@ -39,13 +55,19 @@ public class LandscapeEdgeSwipeController extends AbstractStateChangeTouchContro
 
     @Override
     protected LauncherState getTargetState(LauncherState fromState, boolean isDragTowardPositive) {
-        boolean draggingFromNav = mLauncher.getDeviceProfile().isSeascape() == isDragTowardPositive;
-        return draggingFromNav ? OVERVIEW : NORMAL;
+        if (mLauncher.getDeviceProfile().isVerticalBarLayout()) {
+            boolean draggingFromNav =
+                    mLauncher.getDeviceProfile().isSeascape() == isDragTowardPositive;
+            return draggingFromNav ? OVERVIEW : NORMAL;
+        } else {
+            return isDragTowardPositive ? OVERVIEW : NORMAL;
+        }
     }
 
     @Override
     protected float getShiftRange() {
-        return mLauncher.getDragLayer().getWidth();
+        return mLauncher.getDeviceProfile().isVerticalBarLayout()
+                ? mLauncher.getDragLayer().getWidth() : super.getShiftRange();
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index 9089ae5f96..b4f20d10d5 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -20,8 +20,6 @@ import static com.android.launcher3.anim.Interpolators.INSTANT;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.quickstep.AbsSwipeUpHandler.RECENTS_ATTACH_DURATION;
 import static com.android.quickstep.SysUINavigationMode.getMode;
-import static com.android.quickstep.SysUINavigationMode.hideShelfInTwoButtonLandscape;
-import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
 import static com.android.quickstep.util.RecentsAtomicAnimationFactory.INDEX_RECENTS_FADE_ANIM;
 import static com.android.quickstep.util.RecentsAtomicAnimationFactory.INDEX_RECENTS_TRANSLATE_X_ANIM;
 import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET;
@@ -186,33 +184,26 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
      */
     public final void calculateTaskSize(Context context, DeviceProfile dp, Rect outRect,
             PagedOrientationHandler orientedState) {
-        calculateTaskSize(context, dp, getExtraSpace(context, dp, orientedState),
-                outRect, orientedState);
+        calculateTaskSize(context, dp, getExtraSpace(context, dp, orientedState), outRect);
     }
 
     protected abstract float getExtraSpace(Context context, DeviceProfile dp,
             PagedOrientationHandler orientedState);
 
-    private void calculateTaskSize(
-            Context context, DeviceProfile dp, float extraVerticalSpace, Rect outRect,
-            PagedOrientationHandler orientationHandler) {
+    private void calculateTaskSize(Context context, DeviceProfile dp, float extraVerticalSpace,
+            Rect outRect) {
         Resources res = context.getResources();
-        final boolean showLargeTaskSize = showOverviewActions(context) ||
-                hideShelfInTwoButtonLandscape(context, orientationHandler);
 
         final int paddingResId;
         if (dp.isMultiWindowMode) {
             paddingResId = R.dimen.multi_window_task_card_horz_space;
         } else if (dp.isVerticalBarLayout()) {
             paddingResId = R.dimen.landscape_task_card_horz_space;
-        } else if (showLargeTaskSize) {
-            paddingResId = R.dimen.portrait_task_card_horz_space_big_overview;
         } else {
-            paddingResId = R.dimen.portrait_task_card_horz_space;
+            paddingResId = R.dimen.portrait_task_card_horz_space_big_overview;
         }
         float paddingHorz = res.getDimension(paddingResId);
-        float paddingVert = showLargeTaskSize
-                ? 0 : res.getDimension(R.dimen.task_card_vert_space);
+        float paddingVert = 0;
 
         calculateTaskSizeInternal(context, dp, extraVerticalSpace, paddingHorz, paddingVert,
                 res.getDimension(R.dimen.task_thumbnail_top_margin), outRect);
@@ -405,8 +396,4 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
             pa.addFloat(recentsView, FULLSCREEN_PROGRESS, 1, 0, LINEAR);
         }
     }
-
-    protected static boolean showOverviewActions(Context context) {
-        return removeShelfFromOverview(context);
-    }
 }
diff --git a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
index 2885abff1b..96e4f38b43 100644
--- a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
@@ -58,9 +58,7 @@ public final class FallbackActivityInterface extends
         calculateTaskSize(context, dp, outRect, orientationHandler);
         if (dp.isVerticalBarLayout()
                 && SysUINavigationMode.INSTANCE.get(context).getMode() != NO_BUTTON) {
-            Rect targetInsets = dp.getInsets();
-            int hotseatInset = dp.isSeascape() ? targetInsets.left : targetInsets.right;
-            return dp.hotseatBarSizePx + hotseatInset;
+            return dp.isSeascape() ? outRect.left : (dp.widthPx - outRect.right);
         } else {
             return dp.heightPx - outRect.bottom;
         }
@@ -161,8 +159,6 @@ public final class FallbackActivityInterface extends
     @Override
     protected float getExtraSpace(Context context, DeviceProfile dp,
             PagedOrientationHandler orientationHandler) {
-        return showOverviewActions(context)
-                ? context.getResources().getDimensionPixelSize(R.dimen.overview_actions_height)
-                : 0;
+        return context.getResources().getDimensionPixelSize(R.dimen.overview_actions_height);
     }
 }
diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
index 98b8455e51..9f435f5311 100644
--- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
@@ -18,10 +18,7 @@ package com.android.quickstep;
 import static com.android.launcher3.LauncherState.BACKGROUND_APP;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
-import static com.android.launcher3.uioverrides.states.QuickstepAtomicAnimationFactory.INDEX_SHELF_ANIM;
 import static com.android.quickstep.SysUINavigationMode.getMode;
-import static com.android.quickstep.SysUINavigationMode.hideShelfInTwoButtonLandscape;
-import static com.android.quickstep.util.LayoutUtils.getDefaultSwipeHeight;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -37,7 +34,6 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherInitListener;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
-import com.android.launcher3.allapps.DiscoveryBounce;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statehandlers.DepthController.ClampedDepthProperty;
@@ -72,25 +68,12 @@ public final class LauncherActivityInterface extends
             PagedOrientationHandler orientationHandler) {
         calculateTaskSize(context, dp, outRect, orientationHandler);
         if (dp.isVerticalBarLayout() && SysUINavigationMode.getMode(context) != Mode.NO_BUTTON) {
-            Rect targetInsets = dp.getInsets();
-            int hotseatInset = dp.isSeascape() ? targetInsets.left : targetInsets.right;
-            return dp.hotseatBarSizePx + hotseatInset;
+            return dp.isSeascape() ? outRect.left : (dp.widthPx - outRect.right);
         } else {
             return LayoutUtils.getShelfTrackingDistance(context, dp, orientationHandler);
         }
     }
 
-    @Override
-    public void onSwipeUpToRecentsComplete() {
-        super.onSwipeUpToRecentsComplete();
-        Launcher launcher = getCreatedActivity();
-        if (launcher != null) {
-            RecentsView recentsView = launcher.getOverviewPanel();
-            DiscoveryBounce.showForOverviewIfNeeded(launcher,
-                    recentsView.getPagedOrientationHandler());
-        }
-    }
-
     @Override
     public void onSwipeUpToHomeComplete(RecentsAnimationDeviceState deviceState) {
         Launcher launcher = getCreatedActivity();
@@ -123,16 +106,6 @@ public final class LauncherActivityInterface extends
                     PendingAnimation pa) {
                 super.createBackgroundToOverviewAnim(activity, pa);
 
-                if (!activity.getDeviceProfile().isVerticalBarLayout()
-                        && SysUINavigationMode.getMode(activity) != Mode.NO_BUTTON) {
-                    // Don't animate the shelf when the mode is NO_BUTTON, because we
-                    // update it atomically.
-                    pa.add(activity.getStateManager().createStateElementAnimation(
-                            INDEX_SHELF_ANIM,
-                            BACKGROUND_APP.getVerticalProgress(activity),
-                            OVERVIEW.getVerticalProgress(activity)));
-                }
-
                 // Animate the blur and wallpaper zoom
                 float fromDepthRatio = BACKGROUND_APP.getDepth(activity);
                 float toDepthRatio = OVERVIEW.getDepth(activity);
@@ -280,35 +253,21 @@ public final class LauncherActivityInterface extends
     @Override
     protected float getExtraSpace(Context context, DeviceProfile dp,
             PagedOrientationHandler orientationHandler) {
-        if ((dp.isVerticalBarLayout() && !showOverviewActions(context))
-                || hideShelfInTwoButtonLandscape(context, orientationHandler)) {
-            return 0;
-        } else {
-            Resources res = context.getResources();
-            if (showOverviewActions(context)) {
-                //TODO: this needs to account for the swipe gesture height and accessibility
-                // UI when shown.
-                float actionsBottomMargin = 0;
-                if (!dp.isVerticalBarLayout()) {
-                    if (getMode(context) == Mode.THREE_BUTTONS) {
-                        actionsBottomMargin = res.getDimensionPixelSize(
-                            R.dimen.overview_actions_bottom_margin_three_button);
-                    } else {
-                        actionsBottomMargin = res.getDimensionPixelSize(
-                            R.dimen.overview_actions_bottom_margin_gesture);
-                    }
-                }
-                float actionsHeight = actionsBottomMargin
-                        + res.getDimensionPixelSize(R.dimen.overview_actions_height);
-                return actionsHeight;
+        Resources res = context.getResources();
+        //TODO: this needs to account for the swipe gesture height and accessibility
+        // UI when shown.
+        float actionsBottomMargin = 0;
+        if (!dp.isVerticalBarLayout()) {
+            if (getMode(context) == Mode.THREE_BUTTONS) {
+                actionsBottomMargin = res.getDimensionPixelSize(
+                    R.dimen.overview_actions_bottom_margin_three_button);
             } else {
-                return getDefaultSwipeHeight(context, dp) + dp.workspacePageIndicatorHeight
-                        + res.getDimensionPixelSize(
-                        R.dimen.dynamic_grid_hotseat_extra_vertical_size)
-                        + res.getDimensionPixelSize(
-                        R.dimen.dynamic_grid_hotseat_bottom_padding);
+                actionsBottomMargin = res.getDimensionPixelSize(
+                    R.dimen.overview_actions_bottom_margin_gesture);
             }
         }
+        float actionsHeight = actionsBottomMargin
+                + res.getDimensionPixelSize(R.dimen.overview_actions_height);
+        return actionsHeight;
     }
-
 }
\ No newline at end of file
diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index 2f55f14a9b..d050030e74 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -65,7 +65,6 @@ import com.android.quickstep.views.OverviewActionsView;
 import com.android.quickstep.views.TaskView;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
 import com.android.systemui.shared.system.RemoteAnimationAdapterCompat;
-import com.android.systemui.shared.system.RemoteAnimationRunnerCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
 import java.io.FileDescriptor;
@@ -332,7 +331,7 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
 
     @Override
     public AtomicAnimationFactory<RecentsState> createAtomicAnimationFactory() {
-        return new RecentsAtomicAnimationFactory<>(this, 0);
+        return new RecentsAtomicAnimationFactory<>(this);
     }
 
     private AnimatorListenerAdapter resetStateListener() {
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index d8064a2153..960abeb61b 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -21,7 +21,6 @@ import static com.android.launcher3.util.DisplayController.DisplayHolder.CHANGE_
 import static com.android.launcher3.util.DisplayController.DisplayHolder.CHANGE_FRAME_DELAY;
 import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
 import static com.android.quickstep.SysUINavigationMode.Mode.THREE_BUTTONS;
-import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_CLICKABLE;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BUBBLES_EXPANDED;
@@ -296,7 +295,7 @@ public class RecentsAnimationDeviceState implements
      * @return whether the current nav mode has some gestures (either 2 or 0 button mode).
      */
     public boolean isGesturalNavMode() {
-        return mMode == TWO_BUTTONS || mMode == NO_BUTTON;
+        return mMode.hasGestures;
     }
 
     /**
diff --git a/quickstep/src/com/android/quickstep/SysUINavigationMode.java b/quickstep/src/com/android/quickstep/SysUINavigationMode.java
index 6b502186e9..71bf1bbef7 100644
--- a/quickstep/src/com/android/quickstep/SysUINavigationMode.java
+++ b/quickstep/src/com/android/quickstep/SysUINavigationMode.java
@@ -29,7 +29,6 @@ import android.util.Log;
 
 import com.android.launcher3.ResourceUtils;
 import com.android.launcher3.logging.StatsLogManager.LauncherEvent;
-import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.util.MainThreadInitializedObject;
 
 import java.io.PrintWriter;
@@ -170,18 +169,6 @@ public class SysUINavigationMode {
         return mMode;
     }
 
-    /** @return Whether we can remove the shelf from overview. */
-    public static boolean removeShelfFromOverview(Context context) {
-        // The shelf is core to the two-button mode model, so we need to continue supporting it.
-        return getMode(context) != Mode.TWO_BUTTONS;
-    }
-
-    public static boolean hideShelfInTwoButtonLandscape(Context context,
-            PagedOrientationHandler pagedOrientationHandler) {
-        return  getMode(context) == Mode.TWO_BUTTONS &&
-                !pagedOrientationHandler.isLayoutNaturalToLauncher();
-    }
-
     public void dump(PrintWriter pw) {
         pw.println("SysUINavigationMode:");
         pw.println("  mode=" + mMode.name());
diff --git a/quickstep/src/com/android/quickstep/util/LayoutUtils.java b/quickstep/src/com/android/quickstep/util/LayoutUtils.java
index b88a195de4..8834dc2c6c 100644
--- a/quickstep/src/com/android/quickstep/util/LayoutUtils.java
+++ b/quickstep/src/com/android/quickstep/util/LayoutUtils.java
@@ -15,15 +15,12 @@
  */
 package com.android.quickstep.util;
 
-import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
-
 import android.content.Context;
 import android.graphics.Rect;
 import android.view.View;
 import android.view.ViewGroup;
 
 import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.R;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.quickstep.LauncherActivityInterface;
 import com.android.quickstep.SysUINavigationMode;
@@ -44,16 +41,10 @@ public class LayoutUtils {
     public static int getShelfTrackingDistance(Context context, DeviceProfile dp,
             PagedOrientationHandler orientationHandler) {
         // Track the bottom of the window.
-        if (removeShelfFromOverview(context)) {
-            Rect taskSize = new Rect();
-            LauncherActivityInterface.INSTANCE.calculateTaskSize(context, dp, taskSize,
-                    orientationHandler);
-            return orientationHandler.getDistanceToBottomOfRect(dp, taskSize);
-        }
-        int shelfHeight = dp.hotseatBarSizePx + dp.getInsets().bottom;
-        int spaceBetweenShelfAndRecents = (int) context.getResources().getDimension(
-                R.dimen.task_card_vert_space);
-        return shelfHeight + spaceBetweenShelfAndRecents;
+        Rect taskSize = new Rect();
+        LauncherActivityInterface.INSTANCE.calculateTaskSize(
+                context, dp, taskSize, orientationHandler);
+        return orientationHandler.getDistanceToBottomOfRect(dp, taskSize);
     }
 
     /**
diff --git a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
index b10adb43b5..a85f0d2c49 100644
--- a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
+++ b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
@@ -22,7 +22,6 @@ import static com.android.launcher3.LauncherState.HINT_STATE;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
-import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
 
 import android.content.SharedPreferences;
 
@@ -64,27 +63,6 @@ public class QuickstepOnboardingPrefs extends OnboardingPrefs<QuickstepLauncher>
             });
         }
 
-        boolean shelfBounceSeen = getBoolean(SHELF_BOUNCE_SEEN);
-        if (!shelfBounceSeen && removeShelfFromOverview(launcher)) {
-            // There's no shelf in overview, so don't bounce it (can't get to all apps anyway).
-            shelfBounceSeen = true;
-            mSharedPrefs.edit().putBoolean(SHELF_BOUNCE_SEEN, shelfBounceSeen).apply();
-        }
-        if (!shelfBounceSeen) {
-            stateManager.addStateListener(new StateListener<LauncherState>() {
-                @Override
-                public void onStateTransitionComplete(LauncherState finalState) {
-                    LauncherState prevState = stateManager.getLastState();
-
-                    if ((finalState == ALL_APPS && prevState == OVERVIEW) ||
-                            hasReachedMaxCount(SHELF_BOUNCE_COUNT)) {
-                        mSharedPrefs.edit().putBoolean(SHELF_BOUNCE_SEEN, true).apply();
-                        stateManager.removeStateListener(this);
-                    }
-                }
-            });
-        }
-
         if (FeatureFlags.ENABLE_HYBRID_HOTSEAT.get() && !hasReachedMaxCount(
                 HOTSEAT_DISCOVERY_TIP_COUNT)) {
             stateManager.addStateListener(new StateListener<LauncherState>() {
diff --git a/quickstep/src/com/android/quickstep/util/RecentsAtomicAnimationFactory.java b/quickstep/src/com/android/quickstep/util/RecentsAtomicAnimationFactory.java
index 5b0d50317f..ba70bf70a4 100644
--- a/quickstep/src/com/android/quickstep/util/RecentsAtomicAnimationFactory.java
+++ b/quickstep/src/com/android/quickstep/util/RecentsAtomicAnimationFactory.java
@@ -32,16 +32,11 @@ public class RecentsAtomicAnimationFactory<ACTIVITY_TYPE extends StatefulActivit
     public static final int INDEX_RECENTS_TRANSLATE_X_ANIM = AtomicAnimationFactory.NEXT_INDEX + 1;
 
     private static final int MY_ANIM_COUNT = 2;
-    protected static final int NEXT_INDEX = AtomicAnimationFactory.NEXT_INDEX + MY_ANIM_COUNT;
 
     protected final ACTIVITY_TYPE mActivity;
 
-    /**
-     * @param extraAnims number of animations supported by the subclass. This should not include
-     *                  the 2 animations supported by this class.
-     */
-    public RecentsAtomicAnimationFactory(ACTIVITY_TYPE activity, int extraAnims) {
-        super(MY_ANIM_COUNT + extraAnims);
+    public RecentsAtomicAnimationFactory(ACTIVITY_TYPE activity) {
+        super(MY_ANIM_COUNT);
         mActivity = activity;
     }
 
diff --git a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
index facc99aafa..dd3e31fa2a 100644
--- a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
+++ b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
@@ -26,7 +26,6 @@ import static android.view.Surface.ROTATION_90;
 import static com.android.launcher3.Utilities.newContentObserver;
 import static com.android.launcher3.states.RotationHelper.ALLOW_ROTATION_PREFERENCE_KEY;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
-import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
 
 import static java.lang.annotation.RetentionPolicy.SOURCE;
 
@@ -55,7 +54,6 @@ import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.util.WindowBounds;
 import com.android.quickstep.BaseActivityInterface;
-import com.android.quickstep.SysUINavigationMode;
 
 import java.lang.annotation.Retention;
 import java.util.function.IntConsumer;
@@ -281,10 +279,7 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
     }
 
     private void initFlags() {
-        SysUINavigationMode.Mode currentMode = SysUINavigationMode.getMode(mContext);
-        boolean rotationWatcherSupported = mOrientationListener.canDetectOrientation() &&
-                currentMode != TWO_BUTTONS;
-        setFlag(FLAG_ROTATION_WATCHER_SUPPORTED, rotationWatcherSupported);
+        setFlag(FLAG_ROTATION_WATCHER_SUPPORTED, mOrientationListener.canDetectOrientation());
 
         // initialize external flags
         updateAutoRotateSetting();
diff --git a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
index b8e07cb189..8fb7e03da8 100644
--- a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
+++ b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
@@ -17,7 +17,6 @@
 package com.android.quickstep.views;
 
 import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_SHARE;
-import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
 
 import android.content.Context;
 import android.content.res.Configuration;
@@ -51,17 +50,15 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
     private final Rect mInsets = new Rect();
 
     @IntDef(flag = true, value = {
-            HIDDEN_UNSUPPORTED_NAVIGATION,
             HIDDEN_NON_ZERO_ROTATION,
             HIDDEN_NO_TASKS,
             HIDDEN_NO_RECENTS})
     @Retention(RetentionPolicy.SOURCE)
     public @interface ActionsHiddenFlags { }
 
-    public static final int HIDDEN_UNSUPPORTED_NAVIGATION = 1 << 0;
-    public static final int HIDDEN_NON_ZERO_ROTATION = 1 << 1;
-    public static final int HIDDEN_NO_TASKS = 1 << 2;
-    public static final int HIDDEN_NO_RECENTS = 1 << 3;
+    public static final int HIDDEN_NON_ZERO_ROTATION = 1 << 0;
+    public static final int HIDDEN_NO_TASKS = 1 << 1;
+    public static final int HIDDEN_NO_RECENTS = 1 << 2;
 
     @IntDef(flag = true, value = {
             DISABLED_SCROLLING,
@@ -137,12 +134,6 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
         }
     }
 
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        updateHiddenFlags(HIDDEN_UNSUPPORTED_NAVIGATION, !removeShelfFromOverview(getContext()));
-    }
-
     @Override
     protected void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
diff --git a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java b/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
index e6613ebe80..db04fc034c 100644
--- a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
+++ b/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
@@ -15,7 +15,6 @@
  */
 package com.android.quickstep.views;
 
-import static com.android.launcher3.LauncherState.ALL_APPS_HEADER_EXTRA;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.anim.Interpolators.ACCEL;
 import static com.android.launcher3.anim.Interpolators.ACCEL_2;
@@ -30,7 +29,6 @@ import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.Path.Direction;
 import android.graphics.Path.Op;
-import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.view.animation.Interpolator;
 
@@ -45,7 +43,6 @@ import com.android.launcher3.views.ScrimView;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;
-import com.android.quickstep.util.LayoutUtils;
 
 /**
  * Scrim used for all-apps and shelf in Overview
@@ -149,25 +146,11 @@ public class ShelfScrimView extends ScrimView<BaseQuickstepLauncher>
             mRemainingScreenPathValid = false;
             mShiftRange = mLauncher.getAllAppsController().getShiftRange();
 
-            Context context = getContext();
-            if ((OVERVIEW.getVisibleElements(mLauncher) & ALL_APPS_HEADER_EXTRA) == 0) {
-                if (SysUINavigationMode.removeShelfFromOverview(context)) {
-                    // Fade in all apps background quickly to distinguish from swiping from nav bar.
-                    mMidAlpha = Themes.getAttrInteger(context, R.attr.allAppsInterimScrimAlpha);
-                    mMidProgress = OverviewState.getDefaultVerticalProgress(mLauncher);
-                } else {
-                    mMidAlpha = 0;
-                    mMidProgress = 1;
-                }
-            } else {
-                mMidAlpha = Themes.getAttrInteger(context, R.attr.allAppsInterimScrimAlpha);
-                mMidProgress =  OVERVIEW.getVerticalProgress(mLauncher);
-                Rect hotseatPadding = dp.getHotseatLayoutPadding();
-                int hotseatSize = dp.hotseatBarSizePx + dp.getInsets().bottom
-                        + hotseatPadding.bottom + hotseatPadding.top;
-                float dragHandleTop =
-                        Math.min(hotseatSize, LayoutUtils.getDefaultSwipeHeight(context, dp));
-            }
+            // Fade in all apps background quickly to distinguish from swiping from nav bar.
+            mMidAlpha = Themes.getAttrInteger(getContext(), R.attr.allAppsInterimScrimAlpha);
+            mMidProgress = 1 - (OverviewState.getDefaultSwipeHeight(mLauncher)
+                    / mLauncher.getAllAppsController().getShiftRange());
+
             mTopOffset = dp.getInsets().top;
             mShelfTopAtThreshold = mShiftRange * SCRIM_CATCHUP_THRESHOLD + mTopOffset;
         }
diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
index cc97f4b06f..0fe5432ceb 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
@@ -31,14 +31,11 @@ import androidx.test.uiautomator.Until;
 
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
-import com.android.launcher3.tapl.AllApps;
-import com.android.launcher3.tapl.AllAppsFromOverview;
 import com.android.launcher3.tapl.Background;
 import com.android.launcher3.tapl.LauncherInstrumentation.NavigationModel;
 import com.android.launcher3.tapl.Overview;
 import com.android.launcher3.tapl.OverviewActions;
 import com.android.launcher3.tapl.OverviewTask;
-import com.android.launcher3.tapl.TestHelpers;
 import com.android.launcher3.ui.TaplTestsLauncher3;
 import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch;
 import com.android.quickstep.views.RecentsView;
@@ -93,19 +90,6 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
                 isInState(() -> LauncherState.ALL_APPS));
     }
 
-    @Test
-    public void testAllAppsFromOverview() throws Exception {
-        if (!mLauncher.hasAllAppsInOverview()) {
-            return;
-        }
-
-        // Test opening all apps from Overview.
-        assertNotNull("switchToAllApps() returned null",
-                mLauncher.getWorkspace().switchToOverview().switchToAllApps());
-
-        TaplTestsLauncher3.runAllAppsTest(this, mLauncher.getAllAppsFromOverview());
-    }
-
     @Test
     @PortraitLandscape
     public void testOverview() throws Exception {
@@ -159,28 +143,6 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
                 launcher -> assertEquals("Dismissing a task didn't remove 1 task from Overview",
                         numTasks - 1, getTaskCount(launcher)));
 
-        if (mLauncher.hasAllAppsInOverview() && (!TestHelpers.isInLauncherProcess()
-                || getFromLauncher(launcher -> !launcher.getDeviceProfile().isLandscape))) {
-            // Test switching to all apps and back.
-            final AllAppsFromOverview allApps = overview.switchToAllApps();
-            assertNotNull("overview.switchToAllApps() returned null (1)", allApps);
-            assertTrue("Launcher internal state is not All Apps (1)",
-                    isInState(() -> LauncherState.ALL_APPS));
-
-            overview = allApps.switchBackToOverview();
-            assertNotNull("allApps.switchBackToOverview() returned null", overview);
-            assertTrue("Launcher internal state didn't switch to Overview",
-                    isInState(() -> LauncherState.OVERVIEW));
-
-            // Test UIDevice.pressBack()
-            overview.switchToAllApps();
-            assertNotNull("overview.switchToAllApps() returned null (2)", allApps);
-            assertTrue("Launcher internal state is not All Apps (2)",
-                    isInState(() -> LauncherState.ALL_APPS));
-            mDevice.pressBack();
-            mLauncher.getOverview();
-        }
-
         // Test UIDevice.pressHome, once we are in AllApps.
         mDevice.pressHome();
         waitForState("Launcher internal state didn't switch to Home", () -> LauncherState.NORMAL);
@@ -200,19 +162,17 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
     @NavigationModeSwitch
     @PortraitLandscape
     public void testOverviewActions() throws Exception {
-        if (mLauncher.getNavigationModel() != NavigationModel.TWO_BUTTON) {
-            // Experimenting for b/165029151:
-            final Overview overview = mLauncher.pressHome().switchToOverview();
-            if (overview.hasTasks()) overview.dismissAllTasks();
-            mLauncher.pressHome();
-            //
-
-            startTestAppsWithCheck();
-            OverviewActions actionsView =
-                    mLauncher.pressHome().switchToOverview().getOverviewActions();
-            actionsView.clickAndDismissScreenshot();
-            actionsView.clickAndDismissShare();
-        }
+        // Experimenting for b/165029151:
+        final Overview overview = mLauncher.pressHome().switchToOverview();
+        if (overview.hasTasks()) overview.dismissAllTasks();
+        mLauncher.pressHome();
+        //
+
+        startTestAppsWithCheck();
+        OverviewActions actionsView =
+                mLauncher.pressHome().switchToOverview().getOverviewActions();
+        actionsView.clickAndDismissScreenshot();
+        actionsView.clickAndDismissShare();
     }
 
     private int getCurrentOverviewPage(Launcher launcher) {
@@ -223,20 +183,6 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
         return launcher.<RecentsView>getOverviewPanel().getTaskViewCount();
     }
 
-    @Test
-    public void testAppIconLaunchFromAllAppsFromOverview() throws Exception {
-        if (!mLauncher.hasAllAppsInOverview()) {
-            return;
-        }
-
-        final AllApps allApps =
-                mLauncher.getWorkspace().switchToOverview().switchToAllApps();
-        assertTrue("Launcher internal state is not All Apps",
-                isInState(() -> LauncherState.ALL_APPS));
-
-        TaplTestsLauncher3.runIconLaunchFromAllAppsTest(this, allApps);
-    }
-
     @Test
     @NavigationModeSwitch
     @PortraitLandscape
diff --git a/res/layout/launcher.xml b/res/layout/launcher.xml
index 0c18c8a2ba..8451b77bc0 100644
--- a/res/layout/launcher.xml
+++ b/res/layout/launcher.xml
@@ -49,11 +49,6 @@
             android:id="@+id/hotseat"
             layout="@layout/hotseat" />
 
-        <include
-            android:id="@+id/overview_panel"
-            layout="@layout/overview_panel" />
-
-
         <!-- Keep these behind the workspace so that they are not visible when
          we go into AllApps -->
         <com.android.launcher3.pageindicators.WorkspacePageIndicator
@@ -77,6 +72,10 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
+        <include
+            android:id="@+id/overview_panel"
+            layout="@layout/overview_panel" />
+
     </com.android.launcher3.dragndrop.DragLayer>
 
 </com.android.launcher3.LauncherRootView>
diff --git a/src/com/android/launcher3/allapps/DiscoveryBounce.java b/src/com/android/launcher3/allapps/DiscoveryBounce.java
index 0005db88c8..d8ef18e754 100644
--- a/src/com/android/launcher3/allapps/DiscoveryBounce.java
+++ b/src/com/android/launcher3/allapps/DiscoveryBounce.java
@@ -17,7 +17,6 @@
 package com.android.launcher3.allapps;
 
 import static com.android.launcher3.LauncherState.NORMAL;
-import static com.android.launcher3.LauncherState.OVERVIEW;
 
 import android.animation.Animator;
 import android.animation.AnimatorInflater;
@@ -32,7 +31,6 @@ import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.statemanager.StateManager.StateListener;
-import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.util.OnboardingPrefs;
 
 /**
@@ -147,39 +145,6 @@ public class DiscoveryBounce extends AbstractFloatingView {
         new DiscoveryBounce(launcher, 0).show();
     }
 
-    public static void showForOverviewIfNeeded(Launcher launcher,
-                                               PagedOrientationHandler orientationHandler) {
-        showForOverviewIfNeeded(launcher, true, orientationHandler);
-    }
-
-    private static void showForOverviewIfNeeded(Launcher launcher, boolean withDelay,
-                                                PagedOrientationHandler orientationHandler) {
-        OnboardingPrefs onboardingPrefs = launcher.getOnboardingPrefs();
-        if (!launcher.isInState(OVERVIEW)
-                || !launcher.hasBeenResumed()
-                || launcher.isForceInvisible()
-                || launcher.getDeviceProfile().isVerticalBarLayout()
-                || !orientationHandler.isLayoutNaturalToLauncher()
-                || onboardingPrefs.getBoolean(OnboardingPrefs.SHELF_BOUNCE_SEEN)
-                || launcher.getSystemService(UserManager.class).isDemoUser()
-                || Utilities.IS_RUNNING_IN_TEST_HARNESS) {
-            return;
-        }
-
-        if (withDelay) {
-            new Handler().postDelayed(() -> showForOverviewIfNeeded(launcher, false,
-                    orientationHandler), DELAY_MS);
-            return;
-        } else if (AbstractFloatingView.getTopOpenView(launcher) != null) {
-            // TODO: Move these checks to the top and call this method after invalidate handler.
-            return;
-        }
-        onboardingPrefs.incrementEventCount(OnboardingPrefs.SHELF_BOUNCE_COUNT);
-
-        new DiscoveryBounce(launcher, (1 - OVERVIEW.getVerticalProgress(launcher)))
-                .show();
-    }
-
     /**
      * A wrapper around {@link AllAppsTransitionController} allowing a fixed shift in the value.
      */
diff --git a/src/com/android/launcher3/util/OnboardingPrefs.java b/src/com/android/launcher3/util/OnboardingPrefs.java
index 1b33197879..539768ecc2 100644
--- a/src/com/android/launcher3/util/OnboardingPrefs.java
+++ b/src/com/android/launcher3/util/OnboardingPrefs.java
@@ -33,7 +33,6 @@ import java.util.Map;
 public class OnboardingPrefs<T extends Launcher> {
 
     public static final String HOME_BOUNCE_SEEN = "launcher.apps_view_shown";
-    public static final String SHELF_BOUNCE_SEEN = "launcher.shelf_bounce_seen";
     public static final String HOME_BOUNCE_COUNT = "launcher.home_bounce_count";
     public static final String SHELF_BOUNCE_COUNT = "launcher.shelf_bounce_count";
     public static final String HOTSEAT_DISCOVERY_TIP_COUNT = "launcher.hotseat_discovery_tip_count";
@@ -44,7 +43,6 @@ public class OnboardingPrefs<T extends Launcher> {
      */
     @StringDef(value = {
             HOME_BOUNCE_SEEN,
-            SHELF_BOUNCE_SEEN,
             HOTSEAT_LONGPRESS_TIP_SEEN
     })
     @Retention(RetentionPolicy.SOURCE)
@@ -55,7 +53,6 @@ public class OnboardingPrefs<T extends Launcher> {
      */
     @StringDef(value = {
             HOME_BOUNCE_COUNT,
-            SHELF_BOUNCE_COUNT,
             HOTSEAT_DISCOVERY_TIP_COUNT
     })
     @Retention(RetentionPolicy.SOURCE)
@@ -65,7 +62,6 @@ public class OnboardingPrefs<T extends Launcher> {
     static {
         Map<String, Integer> maxCounts = new ArrayMap<>(4);
         maxCounts.put(HOME_BOUNCE_COUNT, 3);
-        maxCounts.put(SHELF_BOUNCE_COUNT, 3);
         maxCounts.put(HOTSEAT_DISCOVERY_TIP_COUNT, 5);
         MAX_COUNTS = Collections.unmodifiableMap(maxCounts);
     }
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 3c89cfd14b..e2a442db9b 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -595,11 +595,7 @@ public final class LauncherInstrumentation {
                     return waitForLauncherObject(APPS_RES_ID);
                 }
                 case OVERVIEW: {
-                    if (hasAllAppsInOverview()) {
-                        waitForLauncherObject(APPS_RES_ID);
-                    } else {
-                        waitUntilLauncherObjectGone(APPS_RES_ID);
-                    }
+                    waitUntilLauncherObjectGone(APPS_RES_ID);
                     waitUntilLauncherObjectGone(WORKSPACE_RES_ID);
                     waitUntilLauncherObjectGone(WIDGETS_RES_ID);
 
@@ -1297,19 +1293,6 @@ public final class LauncherInstrumentation {
         getTestInfo(TestProtocol.REQUEST_ENABLE_DEBUG_TRACING);
     }
 
-    public boolean hasAllAppsInOverview() {
-        // Vertical bar layouts don't contain all apps
-        if (!mDevice.isNaturalOrientation()) {
-            return false;
-        }
-        // Portrait two button (quickstep) always has all apps.
-        if (getNavigationModel() == NavigationModel.TWO_BUTTON) {
-            return true;
-        }
-        // ...otherwise there are overview actions, which hide all apps
-        return false;
-    }
-
     boolean overviewShareEnabled() {
         return getTestInfo(TestProtocol.REQUEST_OVERVIEW_SHARE_ENABLED).getBoolean(
                 TestProtocol.TEST_INFO_RESPONSE_FIELD);
-- 
GitLab


From f4bb052ca076fc2fb8d6f29140252b6154c984e1 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Thu, 22 Oct 2020 11:14:10 -0700
Subject: [PATCH 0374/1664] Removing workaround for battery defender

The bug is supposed to be fixed.

Bug: 151613234
Change-Id: I8e803ead29e08e68fa75f61b5ad0e1198c9228ec
(cherry picked from commit ff39fd3e14329db22ef34da32b9116fbe39af6f1)
---
 .../launcher3/ui/AbstractLauncherUiTest.java     | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index e118481570..d3fc89e6be 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -234,25 +234,11 @@ public abstract class AbstractLauncherUiTest {
         return mDevice;
     }
 
-    private boolean hasSystemUiObject(String resId) {
-        return mDevice.hasObject(By.res(SYSTEMUI_PACKAGE, resId));
-    }
-
     @Before
     public void setUp() throws Exception {
-        Log.d(TAG, "Before disabling battery defender");
-        mDevice.executeShellCommand("setprop vendor.battery.defender.disable 1");
-        Log.d(TAG, "Before enabling stay awake");
-        mDevice.executeShellCommand("settings put global stay_on_while_plugged_in 3");
-        for (int i = 0; i < 10 && hasSystemUiObject("keyguard_status_view"); ++i) {
-            Log.d(TAG, "Before unlocking the phone");
-            mDevice.executeShellCommand("input keyevent 82");
-            mDevice.waitForIdle();
-        }
-        Assert.assertTrue("Keyguard still visible",
+        Assert.assertTrue("Keyguard is visible",
                 mDevice.wait(
                         Until.gone(By.res(SYSTEMUI_PACKAGE, "keyguard_status_view")), 60000));
-        Log.d(TAG, "Keyguard is not visible");
 
         final String launcherPackageName = mDevice.getLauncherPackageName();
         try {
-- 
GitLab


From 84269d349d093b6b0bd2b68e2306f7e0475cd4f5 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Mon, 16 Nov 2020 13:25:46 -0500
Subject: [PATCH 0375/1664] Add UI updates for incremental app installs.

1. Changed Preload Icon UI to be grayscale while the app is not startable.
2. Added progress bar for when app is installed but still ownloading.
3. Updated Preload Icon progress and click handling to use new incremental api.

Progress bar color updates will follow in a separate CL.

Demo: https://drive.google.com/file/d/1H1EvtTorLeJwC1eiq10tm-TT81YZ6osk/view?usp=sharing

Bug: 171008815

Test: manual

Change-Id: I5874a5146d79a8c91d7d90ff0b9c1c427a3c95dd
---
 .../PackageInstallStateChangedTaskTest.java   |  2 +-
 src/com/android/launcher3/BubbleTextView.java | 50 ++++++----
 src/com/android/launcher3/Launcher.java       |  5 +-
 src/com/android/launcher3/LauncherModel.java  | 10 ++
 src/com/android/launcher3/Utilities.java      |  7 +-
 src/com/android/launcher3/Workspace.java      |  2 +-
 .../launcher3/allapps/AllAppsStore.java       | 12 ++-
 .../launcher3/folder/PreviewItemManager.java  |  6 +-
 .../graphics/PreloadIconDrawable.java         |  4 +-
 .../model/AddWorkspaceItemsTask.java          |  5 +-
 .../android/launcher3/model/AllAppsList.java  | 33 ++++---
 .../android/launcher3/model/BgDataModel.java  |  7 +-
 .../android/launcher3/model/LoaderCursor.java | 23 +++--
 .../android/launcher3/model/LoaderTask.java   | 24 ++++-
 ...PackageIncrementalDownloadUpdatedTask.java | 79 +++++++++++++++
 .../model/PackageInstallStateChangedTask.java | 21 ++--
 .../android/launcher3/model/data/AppInfo.java | 40 +++++++-
 .../model/data/ItemInfoWithIcon.java          | 97 +++++++++++++++++++
 .../launcher3/model/data/PromiseAppInfo.java  | 54 -----------
 .../model/data/WorkspaceItemInfo.java         | 25 +----
 .../launcher3/pm/PackageInstallInfo.java      |  4 +-
 .../SecondaryDisplayLauncher.java             | 14 +--
 .../launcher3/touch/ItemClickHandler.java     | 19 ++--
 .../launcher3/util/PackageManagerHelper.java  | 20 +++-
 24 files changed, 400 insertions(+), 163 deletions(-)
 create mode 100644 src/com/android/launcher3/model/PackageIncrementalDownloadUpdatedTask.java
 delete mode 100644 src/com/android/launcher3/model/data/PromiseAppInfo.java

diff --git a/robolectric_tests/src/com/android/launcher3/model/PackageInstallStateChangedTaskTest.java b/robolectric_tests/src/com/android/launcher3/model/PackageInstallStateChangedTaskTest.java
index e43df21ae9..412ace03ff 100644
--- a/robolectric_tests/src/com/android/launcher3/model/PackageInstallStateChangedTaskTest.java
+++ b/robolectric_tests/src/com/android/launcher3/model/PackageInstallStateChangedTaskTest.java
@@ -67,7 +67,7 @@ public class PackageInstallStateChangedTaskTest {
         for (ItemInfo info : mModelHelper.getBgDataModel().itemsIdMap) {
             if (info instanceof WorkspaceItemInfo) {
                 assertEquals(updates.contains(info.id) ? progress: 0,
-                        ((WorkspaceItemInfo) info).getInstallProgress());
+                        ((WorkspaceItemInfo) info).getProgressLevel());
             } else {
                 assertEquals(updates.contains(info.id) ? progress: -1,
                         ((LauncherAppWidgetInfo) info).installProgress);
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 3eb52adf1a..f44f88b098 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -50,6 +50,7 @@ import android.view.View;
 import android.view.ViewDebug;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
 import androidx.core.graphics.ColorUtils;
 
 import com.android.launcher3.Launcher.OnResumeCallback;
@@ -71,7 +72,6 @@ import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.PackageItemInfo;
-import com.android.launcher3.model.data.PromiseAppInfo;
 import com.android.launcher3.model.data.RemoteActionItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.util.SafeCloseable;
@@ -287,10 +287,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
     public void applyFromWorkspaceItem(WorkspaceItemInfo info, boolean promiseStateChanged) {
         applyIconAndLabel(info);
         setTag(info);
-        if (promiseStateChanged || (info.hasPromiseIconUi())) {
-            applyPromiseState(promiseStateChanged);
-        }
-
+        applyLoadingState(promiseStateChanged);
         applyDotState(info, false /* animate */);
     }
 
@@ -303,9 +300,8 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         // Verify high res immediately
         verifyHighRes();
 
-        if (info instanceof PromiseAppInfo) {
-            PromiseAppInfo promiseAppInfo = (PromiseAppInfo) info;
-            applyProgressLevel(promiseAppInfo.level);
+        if ((info.runtimeStatusFlags & ItemInfoWithIcon.FLAG_SHOW_DOWNLOAD_PROGRESS_MASK) != 0) {
+            applyProgressLevel(info.getProgressLevel());
         }
         applyDotState(info, false /* animate */);
     }
@@ -335,6 +331,10 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         mDotParams.color = IconPalette.getMutedColor(info.bitmap.color, 0.54f);
 
         setIcon(iconDrawable);
+        applyLabel(info);
+    }
+
+    private void applyLabel(ItemInfoWithIcon info) {
         setText(info.title);
         if (info.contentDescription != null) {
             setContentDescription(info.isDisabled()
@@ -595,21 +595,35 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         mLongPressHelper.cancelLongPress();
     }
 
-    public void applyPromiseState(boolean promiseStateChanged) {
+    /** Applies the loading progress value to the progress bar.
+     *
+     * If this app is installing, the progress bar will be updated with the installation progress.
+     * If this app is installed and downloading incrementally, the progress bar will be updated
+     * with the total download progress.
+     */
+    public void applyLoadingState(boolean promiseStateChanged) {
         if (getTag() instanceof WorkspaceItemInfo) {
             WorkspaceItemInfo info = (WorkspaceItemInfo) getTag();
-            final boolean isPromise = info.hasPromiseIconUi();
-            final int progressLevel = isPromise ?
-                    ((info.hasStatusFlag(WorkspaceItemInfo.FLAG_INSTALL_SESSION_ACTIVE) ?
-                            info.getInstallProgress() : 0)) : 100;
-
-            PreloadIconDrawable preloadDrawable = applyProgressLevel(progressLevel);
-            if (preloadDrawable != null && promiseStateChanged) {
-                preloadDrawable.maybePerformFinishedAnimation();
+            int progressLevel = info.getProgressLevel();
+            if ((info.runtimeStatusFlags & ItemInfoWithIcon.FLAG_INCREMENTAL_DOWNLOAD_ACTIVE)
+                    != 0) {
+                updateProgressBarUi(progressLevel, progressLevel == 100);
+            } else if (info.hasPromiseIconUi() || (info.runtimeStatusFlags
+                        & ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE) != 0) {
+                updateProgressBarUi(progressLevel, promiseStateChanged);
             }
         }
     }
 
+    private void updateProgressBarUi(int progressLevel, boolean maybePerformFinishedAnimation) {
+        PreloadIconDrawable preloadDrawable = applyProgressLevel(progressLevel);
+        if (preloadDrawable != null && maybePerformFinishedAnimation) {
+            preloadDrawable.maybePerformFinishedAnimation();
+        }
+    }
+
+    /** Applies the given progress level to the this icon's progress bar. */
+    @Nullable
     public PreloadIconDrawable applyProgressLevel(int progressLevel) {
         if (getTag() instanceof ItemInfoWithIcon) {
             ItemInfoWithIcon info = (ItemInfoWithIcon) getTag();
@@ -629,9 +643,11 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
                 if (mIcon instanceof PreloadIconDrawable) {
                     preloadDrawable = (PreloadIconDrawable) mIcon;
                     preloadDrawable.setLevel(progressLevel);
+                    preloadDrawable.setIsDisabled(!info.isAppStartable());
                 } else {
                     preloadDrawable = newPendingIcon(getContext(), info);
                     preloadDrawable.setLevel(progressLevel);
+                    preloadDrawable.setIsDisabled(!info.isAppStartable());
                     setIcon(preloadDrawable);
                 }
                 return preloadDrawable;
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index e099d852f3..4d1b76610c 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -137,7 +137,6 @@ import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
-import com.android.launcher3.model.data.PromiseAppInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.notification.NotificationListener;
 import com.android.launcher3.pm.PinRequestHelper;
@@ -2517,8 +2516,8 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     }
 
     @Override
-    public void bindPromiseAppProgressUpdated(PromiseAppInfo app) {
-        mAppsView.getAppsStore().updatePromiseAppProgress(app);
+    public void bindIncrementalDownloadProgressUpdated(AppInfo app) {
+        mAppsView.getAppsStore().updateProgressBar(app);
     }
 
     @Override
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 8458152146..e89b9b060a 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -48,6 +48,7 @@ import com.android.launcher3.model.LoaderResults;
 import com.android.launcher3.model.LoaderTask;
 import com.android.launcher3.model.ModelDelegate;
 import com.android.launcher3.model.ModelWriter;
+import com.android.launcher3.model.PackageIncrementalDownloadUpdatedTask;
 import com.android.launcher3.model.PackageInstallStateChangedTask;
 import com.android.launcher3.model.PackageUpdatedTask;
 import com.android.launcher3.model.ShortcutsChangedTask;
@@ -195,6 +196,15 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi
                 PackageUpdatedTask.OP_UNSUSPEND, user, packageNames));
     }
 
+    @Override
+    public void onPackageLoadingProgressChanged(
+                String packageName, UserHandle user, float progress) {
+        if (Utilities.ATLEAST_S) {
+            enqueueModelUpdateTask(new PackageIncrementalDownloadUpdatedTask(
+                    packageName, user, progress));
+        }
+    }
+
     @Override
     public void onShortcutsChanged(String packageName, List<ShortcutInfo> shortcuts,
             UserHandle user) {
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 5c2f35b981..df5d23428d 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -107,12 +107,13 @@ public final class Utilities {
     public static final String[] EMPTY_STRING_ARRAY = new String[0];
     public static final Person[] EMPTY_PERSON_ARRAY = new Person[0];
 
-    public static final boolean ATLEAST_R = BuildCompat.isAtLeastR();
+    public static final boolean ATLEAST_P = Build.VERSION.SDK_INT >= Build.VERSION_CODES.P;
 
     public static final boolean ATLEAST_Q = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q;
 
-    public static final boolean ATLEAST_P =
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.P;
+    public static final boolean ATLEAST_R = Build.VERSION.SDK_INT >= Build.VERSION_CODES.R;
+
+    public static final boolean ATLEAST_S = BuildCompat.isAtLeastS();
 
     /**
      * Set on a motion event dispatched from the nav bar. See {@link MotionEvent#setEdgeFlags(int)}.
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 777ea3c7d5..65eba20672 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -3154,7 +3154,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         ItemOperator op = (info, v) -> {
             if (info instanceof WorkspaceItemInfo && v instanceof BubbleTextView
                     && updates.contains(info)) {
-                ((BubbleTextView) v).applyPromiseState(false /* promiseStateChanged */);
+                ((BubbleTextView) v).applyLoadingState(false /* promiseStateChanged */);
             } else if (v instanceof PendingAppWidgetHostView
                     && info instanceof LauncherAppWidgetInfo
                     && updates.contains(info)) {
diff --git a/src/com/android/launcher3/allapps/AllAppsStore.java b/src/com/android/launcher3/allapps/AllAppsStore.java
index 3ae0a18137..00bdb70c4a 100644
--- a/src/com/android/launcher3/allapps/AllAppsStore.java
+++ b/src/com/android/launcher3/allapps/AllAppsStore.java
@@ -24,7 +24,6 @@ import android.view.ViewGroup;
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.model.data.PromiseAppInfo;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.PackageUserKey;
 
@@ -145,10 +144,17 @@ public class AllAppsStore {
         });
     }
 
-    public void updatePromiseAppProgress(PromiseAppInfo app) {
+    /**
+     * Sets the AppInfo's associated icon's progress bar.
+     *
+     * If this app is installed and supports incremental downloads, the progress bar will be updated
+     * the app's total download progress. Otherwise, the progress bar will be updated to the app's
+     * installation progress.
+     */
+    public void updateProgressBar(AppInfo app) {
         updateAllIcons((child) -> {
             if (child.getTag() == app) {
-                child.applyProgressLevel(app.level);
+                child.applyProgressLevel(app.getProgressLevel());
             }
         });
     }
diff --git a/src/com/android/launcher3/folder/PreviewItemManager.java b/src/com/android/launcher3/folder/PreviewItemManager.java
index 7f8a15c927..9ae7faf988 100644
--- a/src/com/android/launcher3/folder/PreviewItemManager.java
+++ b/src/com/android/launcher3/folder/PreviewItemManager.java
@@ -39,6 +39,7 @@ import androidx.annotation.NonNull;
 
 import com.android.launcher3.Utilities;
 import com.android.launcher3.graphics.PreloadIconDrawable;
+import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.views.ActivityContext;
 
@@ -394,9 +395,10 @@ public class PreviewItemManager {
     }
 
     private void setDrawable(PreviewItemDrawingParams p, WorkspaceItemInfo item) {
-        if (item.hasPromiseIconUi()) {
+        if (item.hasPromiseIconUi() || (item.runtimeStatusFlags
+                    & ItemInfoWithIcon.FLAG_SHOW_DOWNLOAD_PROGRESS_MASK) != 0) {
             PreloadIconDrawable drawable = newPendingIcon(mContext, item);
-            drawable.setLevel(item.getInstallProgress());
+            drawable.setLevel(item.getProgressLevel());
             p.drawable = drawable;
         } else {
             p.drawable = newIcon(mContext, item);
diff --git a/src/com/android/launcher3/graphics/PreloadIconDrawable.java b/src/com/android/launcher3/graphics/PreloadIconDrawable.java
index e85b056376..9971990267 100644
--- a/src/com/android/launcher3/graphics/PreloadIconDrawable.java
+++ b/src/com/android/launcher3/graphics/PreloadIconDrawable.java
@@ -117,6 +117,8 @@ public class PreloadIconDrawable extends FastBitmapDrawable {
         mIndicatorColor = IconPalette.getPreloadProgressColor(context, mIconColor);
 
         setInternalProgress(0);
+
+        setIsDisabled(!info.isAppStartable());
     }
 
     @Override
@@ -266,14 +268,12 @@ public class PreloadIconDrawable extends FastBitmapDrawable {
             mIconScale = SMALL_SCALE;
             mScaledTrackPath.reset();
             mTrackAlpha = MAX_PAINT_ALPHA;
-            setIsDisabled(true);
         }
 
         if (progress < 1 && progress > 0) {
             mPathMeasure.getSegment(0, progress * mTrackLength, mScaledProgressPath, true);
             mIconScale = SMALL_SCALE;
             mTrackAlpha = MAX_PAINT_ALPHA;
-            setIsDisabled(true);
         } else if (progress >= 1) {
             setIsDisabled(mItem.isDisabled());
             mScaledTrackPath.set(mScaledProgressPath);
diff --git a/src/com/android/launcher3/model/AddWorkspaceItemsTask.java b/src/com/android/launcher3/model/AddWorkspaceItemsTask.java
index c236fa6dec..56dbbd33da 100644
--- a/src/com/android/launcher3/model/AddWorkspaceItemsTask.java
+++ b/src/com/android/launcher3/model/AddWorkspaceItemsTask.java
@@ -34,6 +34,7 @@ import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pm.InstallSessionHelper;
+import com.android.launcher3.pm.PackageInstallInfo;
 import com.android.launcher3.util.GridOccupancy;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.PackageManagerHelper;
@@ -132,7 +133,9 @@ public class AddWorkspaceItemsTask extends BaseModelUpdateTask {
                             continue;
                         }
                     } else {
-                        workspaceInfo.setInstallProgress((int) sessionInfo.getProgress());
+                        workspaceInfo.setProgressLevel(
+                                (int) (sessionInfo.getProgress() * 100),
+                                PackageInstallInfo.STATUS_INSTALLING);
                     }
 
                     if (hasActivity) {
diff --git a/src/com/android/launcher3/model/AllAppsList.java b/src/com/android/launcher3/model/AllAppsList.java
index 2695e66591..8d5cf7422f 100644
--- a/src/com/android/launcher3/model/AllAppsList.java
+++ b/src/com/android/launcher3/model/AllAppsList.java
@@ -21,11 +21,11 @@ import static com.android.launcher3.model.data.AppInfo.EMPTY_ARRAY;
 
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.LauncherActivityInfo;
 import android.content.pm.LauncherApps;
 import android.os.LocaleList;
-import android.os.Process;
 import android.os.UserHandle;
 import android.util.Log;
 
@@ -37,7 +37,6 @@ import com.android.launcher3.compat.AlphabeticIndexCompat;
 import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.model.BgDataModel.Callbacks;
 import com.android.launcher3.model.data.AppInfo;
-import com.android.launcher3.model.data.PromiseAppInfo;
 import com.android.launcher3.pm.PackageInstallInfo;
 import com.android.launcher3.util.FlagOp;
 import com.android.launcher3.util.ItemInfoMatcher;
@@ -150,7 +149,7 @@ public class AllAppsList {
                 .getApplicationInfo(installInfo.packageName, installInfo.user, 0);
         // only if not yet installed
         if (applicationInfo == null) {
-            PromiseAppInfo info = new PromiseAppInfo(installInfo);
+            AppInfo info = new AppInfo(installInfo);
             mIconCache.getTitleAndIcon(info, info.usingLowResIcon());
             info.sectionName = mIndex.computeSectionName(info.title);
 
@@ -159,24 +158,26 @@ public class AllAppsList {
         }
     }
 
-    public PromiseAppInfo updatePromiseInstallInfo(PackageInstallInfo installInfo) {
-        UserHandle user = Process.myUserHandle();
-        for (int i=0; i < data.size(); i++) {
+    /** Updates the given PackageInstallInfo's associated AppInfo's installation info. */
+    public List<AppInfo> updatePromiseInstallInfo(PackageInstallInfo installInfo) {
+        List<AppInfo> updatedAppInfos = new ArrayList<>();
+        UserHandle user = installInfo.user;
+        for (int i = data.size() - 1; i >= 0; i--) {
             final AppInfo appInfo = data.get(i);
             final ComponentName tgtComp = appInfo.getTargetComponent();
             if (tgtComp != null && tgtComp.getPackageName().equals(installInfo.packageName)
-                    && appInfo.user.equals(user)
-                    && appInfo instanceof PromiseAppInfo) {
-                final PromiseAppInfo promiseAppInfo = (PromiseAppInfo) appInfo;
-                if (installInfo.state == PackageInstallInfo.STATUS_INSTALLING) {
-                    promiseAppInfo.level = installInfo.progress;
-                    return promiseAppInfo;
+                    && appInfo.user.equals(user)) {
+                if (installInfo.state == PackageInstallInfo.STATUS_INSTALLED_DOWNLOADING
+                            || installInfo.state == PackageInstallInfo.STATUS_INSTALLING) {
+                    appInfo.setProgressLevel(installInfo);
+
+                    updatedAppInfos.add(appInfo);
                 } else if (installInfo.state == PackageInstallInfo.STATUS_FAILED) {
                     removeApp(i);
                 }
             }
         }
-        return null;
+        return updatedAppInfos;
     }
 
     private void removeApp(int index) {
@@ -268,8 +269,14 @@ public class AllAppsList {
                 if (applicationInfo == null) {
                     add(new AppInfo(context, info, user), info);
                 } else {
+                    Intent launchIntent = AppInfo.makeLaunchIntent(info);
+
                     mIconCache.getTitleAndIcon(applicationInfo, info, true /* useLowResIcon */);
                     applicationInfo.sectionName = mIndex.computeSectionName(applicationInfo.title);
+                    applicationInfo.setProgressLevel(
+                            PackageManagerHelper.getLoadingProgress(info),
+                            PackageInstallInfo.STATUS_INSTALLED_DOWNLOADING);
+                    applicationInfo.intent = launchIntent;
 
                     mDataChanged = true;
                 }
diff --git a/src/com/android/launcher3/model/BgDataModel.java b/src/com/android/launcher3/model/BgDataModel.java
index c217a475a1..2d860a41d3 100644
--- a/src/com/android/launcher3/model/BgDataModel.java
+++ b/src/com/android/launcher3/model/BgDataModel.java
@@ -39,7 +39,6 @@ import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
-import com.android.launcher3.model.data.PromiseAppInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pm.UserCache;
 import com.android.launcher3.shortcuts.ShortcutKey;
@@ -459,7 +458,11 @@ public class BgDataModel {
         void preAddApps();
         void bindAppsAdded(IntArray newScreens,
                 ArrayList<ItemInfo> addNotAnimated, ArrayList<ItemInfo> addAnimated);
-        void bindPromiseAppProgressUpdated(PromiseAppInfo app);
+
+        /**
+         * Binds updated incremental download progress
+         */
+        void bindIncrementalDownloadProgressUpdated(AppInfo app);
         void bindWorkspaceItemsChanged(List<WorkspaceItemInfo> updated);
         void bindWidgetsRestored(ArrayList<LauncherAppWidgetInfo> widgets);
         void bindRestoreItemsChange(HashSet<ItemInfo> updates);
diff --git a/src/com/android/launcher3/model/LoaderCursor.java b/src/com/android/launcher3/model/LoaderCursor.java
index 532834eeb8..19d9af98dc 100644
--- a/src/com/android/launcher3/model/LoaderCursor.java
+++ b/src/com/android/launcher3/model/LoaderCursor.java
@@ -35,11 +35,13 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.util.LongSparseArray;
 
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherSettings;
+import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.Workspace;
 import com.android.launcher3.config.FeatureFlags;
@@ -92,6 +94,9 @@ public class LoaderCursor extends CursorWrapper {
     private final int restoredIndex;
     private final int intentIndex;
 
+    @Nullable
+    private LauncherActivityInfo mActivityInfo;
+
     // Properties loaded per iteration
     public long serialNumber;
     public UserHandle user;
@@ -132,6 +137,8 @@ public class LoaderCursor extends CursorWrapper {
     public boolean moveToNext() {
         boolean result = super.moveToNext();
         if (result) {
+            mActivityInfo = null;
+
             // Load common properties.
             itemType = getInt(itemTypeIndex);
             container = getInt(containerIndex);
@@ -245,6 +252,10 @@ public class LoaderCursor extends CursorWrapper {
         return info;
     }
 
+    public LauncherActivityInfo getLauncherActivityInfo() {
+        return mActivityInfo;
+    }
+
     /**
      * Make an WorkspaceItemInfo object for a shortcut that is an application.
      */
@@ -264,25 +275,25 @@ public class LoaderCursor extends CursorWrapper {
         Intent newIntent = new Intent(Intent.ACTION_MAIN, null);
         newIntent.addCategory(Intent.CATEGORY_LAUNCHER);
         newIntent.setComponent(componentName);
-        LauncherActivityInfo lai = mContext.getSystemService(LauncherApps.class)
+        mActivityInfo = mContext.getSystemService(LauncherApps.class)
                 .resolveActivity(newIntent, user);
-        if ((lai == null) && !allowMissingTarget) {
+        if ((mActivityInfo == null) && !allowMissingTarget) {
             Log.d(TAG, "Missing activity found in getShortcutInfo: " + componentName);
             return null;
         }
 
         final WorkspaceItemInfo info = new WorkspaceItemInfo();
-        info.itemType = LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
+        info.itemType = Favorites.ITEM_TYPE_APPLICATION;
         info.user = user;
         info.intent = newIntent;
 
-        mIconCache.getTitleAndIcon(info, lai, useLowResIcon);
+        mIconCache.getTitleAndIcon(info, mActivityInfo, useLowResIcon);
         if (mIconCache.isDefaultIcon(info.bitmap, user)) {
             loadIcon(info);
         }
 
-        if (lai != null) {
-            AppInfo.updateRuntimeFlagsForActivityTarget(info, lai);
+        if (mActivityInfo != null) {
+            AppInfo.updateRuntimeFlagsForActivityTarget(info, mActivityInfo);
         }
 
         // from the db
diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index 8e085ce52d..f74c8b5c1c 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -69,6 +69,7 @@ import com.android.launcher3.logging.FileLog;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
@@ -591,11 +592,24 @@ public class LoaderTask implements Runnable {
                                 if (c.restoreFlag != 0 && !TextUtils.isEmpty(targetPkg)) {
                                     tempPackageKey.update(targetPkg, c.user);
                                     SessionInfo si = installingPkgs.get(tempPackageKey);
-                                    if (si == null) {
-                                        info.status &= ~WorkspaceItemInfo.FLAG_INSTALL_SESSION_ACTIVE;
-                                    } else {
-                                        info.setInstallProgress((int) (si.getProgress() * 100));
-                                    }
+                                        LauncherActivityInfo activityInfo =
+                                                c.getLauncherActivityInfo();
+                                        if (si == null) {
+                                            info.runtimeStatusFlags &=
+                                                    ~ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE;
+                                        } else if (activityInfo == null) {
+                                            int installProgress = (int) (si.getProgress() * 100);
+
+                                            info.setProgressLevel(
+                                                    installProgress,
+                                                    PackageInstallInfo.STATUS_INSTALLING);
+                                        } else {
+                                            info.setProgressLevel(
+                                                    PackageManagerHelper
+                                                            .getLoadingProgress(activityInfo),
+                                                    PackageInstallInfo
+                                                            .STATUS_INSTALLED_DOWNLOADING);
+                                        }
                                 }
 
                                 c.checkAndAddItem(info, mBgDataModel);
diff --git a/src/com/android/launcher3/model/PackageIncrementalDownloadUpdatedTask.java b/src/com/android/launcher3/model/PackageIncrementalDownloadUpdatedTask.java
new file mode 100644
index 0000000000..e3e87693b1
--- /dev/null
+++ b/src/com/android/launcher3/model/PackageIncrementalDownloadUpdatedTask.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.model;
+
+import android.content.ComponentName;
+import android.os.UserHandle;
+
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.model.data.AppInfo;
+import com.android.launcher3.model.data.ItemInfoWithIcon;
+import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.launcher3.pm.PackageInstallInfo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Handles updates due to incremental download progress updates.
+ */
+public class PackageIncrementalDownloadUpdatedTask extends BaseModelUpdateTask {
+
+    private final UserHandle mUser;
+    private final int mProgress;
+    private final String mPackageName;
+
+    public PackageIncrementalDownloadUpdatedTask(
+            String packageName, UserHandle user, float progress) {
+        mUser = user;
+        mProgress = 1 - progress > 0.001 ? (int) (100 * progress) : 100;
+        mPackageName = packageName;
+    }
+
+    @Override
+    public void execute(LauncherAppState app, BgDataModel dataModel, AllAppsList appsList) {
+        PackageInstallInfo downloadInfo = new PackageInstallInfo(
+                mPackageName,
+                PackageInstallInfo.STATUS_INSTALLED_DOWNLOADING,
+                mProgress,
+                mUser);
+
+        synchronized (appsList) {
+            List<AppInfo> updatedAppInfos = appsList.updatePromiseInstallInfo(downloadInfo);
+            if (!updatedAppInfos.isEmpty()) {
+                for (AppInfo appInfo : updatedAppInfos) {
+                    appInfo.runtimeStatusFlags &= ~ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE;
+                    scheduleCallbackTask(
+                            c -> c.bindIncrementalDownloadProgressUpdated(appInfo));
+                }
+            }
+            bindApplicationsIfNeeded();
+        }
+
+        final ArrayList<WorkspaceItemInfo> updatedWorkspaceItems = new ArrayList<>();
+        synchronized (dataModel) {
+            dataModel.forAllWorkspaceItemInfos(mUser, si -> {
+                ComponentName cn = si.getTargetComponent();
+                if ((cn != null) && cn.getPackageName().equals(mPackageName)) {
+                    si.runtimeStatusFlags &= ~ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE;
+                    si.setProgressLevel(downloadInfo);
+                    updatedWorkspaceItems.add(si);
+                }
+            });
+        }
+        bindUpdatedWorkspaceItems(updatedWorkspaceItems);
+    }
+}
diff --git a/src/com/android/launcher3/model/PackageInstallStateChangedTask.java b/src/com/android/launcher3/model/PackageInstallStateChangedTask.java
index 8369c48e5c..8215edd90b 100644
--- a/src/com/android/launcher3/model/PackageInstallStateChangedTask.java
+++ b/src/com/android/launcher3/model/PackageInstallStateChangedTask.java
@@ -20,14 +20,15 @@ import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 
 import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
-import com.android.launcher3.model.data.PromiseAppInfo;
-import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pm.PackageInstallInfo;
 import com.android.launcher3.util.InstantAppResolver;
 
 import java.util.HashSet;
+import java.util.List;
 
 /**
  * Handles changes due to a sessions updates for a currently installing app.
@@ -59,9 +60,11 @@ public class PackageInstallStateChangedTask extends BaseModelUpdateTask {
         }
 
         synchronized (apps) {
-            PromiseAppInfo updated = apps.updatePromiseInstallInfo(mInstallInfo);
-            if (updated != null) {
-                scheduleCallbackTask(c -> c.bindPromiseAppProgressUpdated(updated));
+            List<AppInfo> updatedAppInfos = apps.updatePromiseInstallInfo(mInstallInfo);
+            if (!updatedAppInfos.isEmpty()) {
+                for (AppInfo appInfo : updatedAppInfos) {
+                    scheduleCallbackTask(c -> c.bindIncrementalDownloadProgressUpdated(appInfo));
+                }
             }
             bindApplicationsIfNeeded();
         }
@@ -71,11 +74,13 @@ public class PackageInstallStateChangedTask extends BaseModelUpdateTask {
             dataModel.forAllWorkspaceItemInfos(mInstallInfo.user, si -> {
                 ComponentName cn = si.getTargetComponent();
                 if (si.hasPromiseIconUi() && (cn != null)
-                        && mInstallInfo.packageName.equals(cn.getPackageName())) {
-                    si.setInstallProgress(mInstallInfo.progress);
+                        && cn.getPackageName().equals(mInstallInfo.packageName)) {
+                    int installProgress = mInstallInfo.progress;
+
+                    si.setProgressLevel(installProgress, PackageInstallInfo.STATUS_INSTALLING);
                     if (mInstallInfo.state == PackageInstallInfo.STATUS_FAILED) {
                         // Mark this info as broken.
-                        si.status &= ~WorkspaceItemInfo.FLAG_INSTALL_SESSION_ACTIVE;
+                        si.runtimeStatusFlags &= ~ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE;
                     }
                     updates.add(si);
                 }
diff --git a/src/com/android/launcher3/model/data/AppInfo.java b/src/com/android/launcher3/model/data/AppInfo.java
index aee1f2a65b..39247c221f 100644
--- a/src/com/android/launcher3/model/data/AppInfo.java
+++ b/src/com/android/launcher3/model/data/AppInfo.java
@@ -28,10 +28,13 @@ import android.os.Process;
 import android.os.UserHandle;
 import android.os.UserManager;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.pm.PackageInstallInfo;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.PackageManagerHelper;
 
@@ -104,13 +107,37 @@ public class AppInfo extends ItemInfoWithIcon {
         this.intent = intent;
     }
 
+    public AppInfo(@NonNull PackageInstallInfo installInfo) {
+        componentName = installInfo.componentName;
+        intent = new Intent(Intent.ACTION_MAIN)
+            .addCategory(Intent.CATEGORY_LAUNCHER)
+            .setComponent(componentName)
+            .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
+        user = installInfo.user;
+    }
+
     @Override
     protected String dumpProperties() {
         return super.dumpProperties() + " componentName=" + componentName;
     }
 
     public WorkspaceItemInfo makeWorkspaceItem() {
-        return new WorkspaceItemInfo(this);
+        WorkspaceItemInfo workspaceItemInfo = new WorkspaceItemInfo(this);
+
+        if ((runtimeStatusFlags & FLAG_INSTALL_SESSION_ACTIVE) != 0) {
+            // We need to update the component name when the apk is installed
+            workspaceItemInfo.status |= WorkspaceItemInfo.FLAG_AUTOINSTALL_ICON;
+            // Since the user is manually placing it on homescreen, it should not be auto-removed
+            // later
+            workspaceItemInfo.status |= WorkspaceItemInfo.FLAG_RESTORE_STARTED;
+            workspaceItemInfo.status |= FLAG_INSTALL_SESSION_ACTIVE;
+        }
+        if ((runtimeStatusFlags & FLAG_INCREMENTAL_DOWNLOAD_ACTIVE) != 0) {
+            workspaceItemInfo.runtimeStatusFlags |= FLAG_INCREMENTAL_DOWNLOAD_ACTIVE;
+        }
+
+        return workspaceItemInfo;
     }
 
     public ComponentKey toComponentKey() {
@@ -129,6 +156,12 @@ public class AppInfo extends ItemInfoWithIcon {
                         | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
     }
 
+    @Nullable
+    @Override
+    public ComponentName getTargetComponent() {
+        return componentName;
+    }
+
     public static void updateRuntimeFlagsForActivityTarget(
             ItemInfoWithIcon info, LauncherActivityInfo lai) {
         ApplicationInfo appInfo = lai.getApplicationInfo();
@@ -143,6 +176,11 @@ public class AppInfo extends ItemInfoWithIcon {
             // The icon for a non-primary user is badged, hence it's not exactly an adaptive icon.
             info.runtimeStatusFlags |= FLAG_ADAPTIVE_ICON;
         }
+
+        // Sets the progress level, installation and incremental download flags.
+        info.setProgressLevel(
+                PackageManagerHelper.getLoadingProgress(lai),
+                PackageInstallInfo.STATUS_INSTALLED);
     }
 
     @Override
diff --git a/src/com/android/launcher3/model/data/ItemInfoWithIcon.java b/src/com/android/launcher3/model/data/ItemInfoWithIcon.java
index d95f94f79f..b8a71d33e0 100644
--- a/src/com/android/launcher3/model/data/ItemInfoWithIcon.java
+++ b/src/com/android/launcher3/model/data/ItemInfoWithIcon.java
@@ -16,7 +16,15 @@
 
 package com.android.launcher3.model.data;
 
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.icons.BitmapInfo;
+import com.android.launcher3.pm.PackageInstallInfo;
+import com.android.launcher3.util.PackageManagerHelper;
 
 /**
  * Represents an ItemInfo which also holds an icon.
@@ -87,12 +95,35 @@ public abstract class ItemInfoWithIcon extends ItemInfo {
      */
     public static final int FLAG_ICON_BADGED = 1 << 9;
 
+    /**
+     * The icon is being installed. If {@link WorkspaceItemInfo#FLAG_RESTORED_ICON} or
+     * {@link WorkspaceItemInfo#FLAG_AUTOINSTALL_ICON} is set, then the icon is either being
+     * installed or is in a broken state.
+     */
+    public static final int FLAG_INSTALL_SESSION_ACTIVE = 1 << 10;
+
+    /**
+     * This icon is still being downloaded.
+     */
+    public static final int FLAG_INCREMENTAL_DOWNLOAD_ACTIVE = 1 << 11;
+
+    public static final int FLAG_SHOW_DOWNLOAD_PROGRESS_MASK = FLAG_INSTALL_SESSION_ACTIVE
+            | FLAG_INCREMENTAL_DOWNLOAD_ACTIVE;
+
     /**
      * Status associated with the system state of the underlying item. This is calculated every
      * time a new info is created and not persisted on the disk.
      */
     public int runtimeStatusFlags = 0;
 
+    /**
+     * The download progress of the package that this shortcut represents. For legacy apps, this
+     * will always be the installation progress. For apps that support incremental downloads, this
+     * will only match be the installation progress until the app is installed, then this will the
+     * total download progress.
+     */
+    private int mProgressLevel = 100;
+
     protected ItemInfoWithIcon() { }
 
     protected ItemInfoWithIcon(ItemInfoWithIcon info) {
@@ -113,6 +144,72 @@ public abstract class ItemInfoWithIcon extends ItemInfo {
         return bitmap.isLowRes();
     }
 
+    /**
+     * Returns whether the app this shortcut represents is able to be started. For legacy apps,
+     * this returns whether it is fully installed. For apps that support incremental downloads,
+     * this returns whether the app is either fully downloaded or has installed and is downloading
+     * incrementally.
+     */
+    public boolean isAppStartable() {
+        return ((runtimeStatusFlags & FLAG_INSTALL_SESSION_ACTIVE) == 0)
+                && (((runtimeStatusFlags & FLAG_INCREMENTAL_DOWNLOAD_ACTIVE) != 0)
+                    || mProgressLevel == 100);
+    }
+
+    /**
+     * Returns the download progress for the app this shortcut represents. If this app is not yet
+     * installed or does not support incremental downloads, this will return the installation
+     * progress.
+     */
+    public int getProgressLevel() {
+        if ((runtimeStatusFlags & FLAG_SHOW_DOWNLOAD_PROGRESS_MASK) != 0) {
+            return mProgressLevel;
+        }
+        return 100;
+    }
+
+    /**
+     * Sets the download progress for the app this shortcut represents. If this app is not yet
+     * installed or does not support incremental downloads, this will set
+     * {@code FLAG_INSTALL_SESSION_ACTIVE}. If this app is downloading incrementally, this will
+     * set {@code FLAG_INCREMENTAL_DOWNLOAD_ACTIVE}. Otherwise, this will remove both flags.
+     */
+    public void setProgressLevel(PackageInstallInfo installInfo) {
+        setProgressLevel(installInfo.progress, installInfo.state);
+    }
+
+    /**
+     * Sets the download progress for the app this shortcut represents.
+     */
+    public void setProgressLevel(int progress, int status) {
+        if (status == PackageInstallInfo.STATUS_INSTALLING) {
+            mProgressLevel = progress;
+            runtimeStatusFlags = progress < 100
+                    ? runtimeStatusFlags | FLAG_INSTALL_SESSION_ACTIVE
+                    : runtimeStatusFlags & ~FLAG_INSTALL_SESSION_ACTIVE;
+        } else if (status == PackageInstallInfo.STATUS_INSTALLED_DOWNLOADING) {
+            mProgressLevel = progress;
+            runtimeStatusFlags = runtimeStatusFlags & ~FLAG_INSTALL_SESSION_ACTIVE;
+            runtimeStatusFlags = progress < 100
+                    ? runtimeStatusFlags | FLAG_INCREMENTAL_DOWNLOAD_ACTIVE
+                    : runtimeStatusFlags & ~FLAG_INCREMENTAL_DOWNLOAD_ACTIVE;
+        } else {
+            mProgressLevel = status == PackageInstallInfo.STATUS_INSTALLED ? 100 : 0;
+            runtimeStatusFlags = runtimeStatusFlags & ~FLAG_INSTALL_SESSION_ACTIVE;
+            runtimeStatusFlags = runtimeStatusFlags & ~FLAG_INCREMENTAL_DOWNLOAD_ACTIVE;
+        }
+    }
+
+    /** Creates an intent to that launches the app store at this app's page. */
+    @Nullable
+    public Intent getMarketIntent(Context context) {
+        ComponentName componentName = getTargetComponent();
+
+        return componentName != null
+                ? new PackageManagerHelper(context).getMarketIntent(componentName.getPackageName())
+                : null;
+    }
+
     /**
      * @return a copy of this
      */
diff --git a/src/com/android/launcher3/model/data/PromiseAppInfo.java b/src/com/android/launcher3/model/data/PromiseAppInfo.java
deleted file mode 100644
index b6231ede19..0000000000
--- a/src/com/android/launcher3/model/data/PromiseAppInfo.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.model.data;
-
-import android.content.Context;
-import android.content.Intent;
-
-import androidx.annotation.NonNull;
-
-import com.android.launcher3.pm.PackageInstallInfo;
-import com.android.launcher3.util.PackageManagerHelper;
-
-public class PromiseAppInfo extends AppInfo {
-
-    public int level = 0;
-
-    public PromiseAppInfo(@NonNull PackageInstallInfo installInfo) {
-        componentName = installInfo.componentName;
-        intent = new Intent(Intent.ACTION_MAIN)
-                .addCategory(Intent.CATEGORY_LAUNCHER)
-                .setComponent(componentName)
-                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
-                        | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
-    }
-
-    @Override
-    public WorkspaceItemInfo makeWorkspaceItem() {
-        WorkspaceItemInfo shortcut = new WorkspaceItemInfo(this);
-        shortcut.setInstallProgress(level);
-        // We need to update the component name when the apk is installed
-        shortcut.status |= WorkspaceItemInfo.FLAG_AUTOINSTALL_ICON;
-        // Since the user is manually placing it on homescreen, it should not be auto-removed later
-        shortcut.status |= WorkspaceItemInfo.FLAG_RESTORE_STARTED;
-        return shortcut;
-    }
-
-    public Intent getMarketIntent(Context context) {
-        return new PackageManagerHelper(context).getMarketIntent(componentName.getPackageName());
-    }
-}
diff --git a/src/com/android/launcher3/model/data/WorkspaceItemInfo.java b/src/com/android/launcher3/model/data/WorkspaceItemInfo.java
index 1e1d093b13..690e904a02 100644
--- a/src/com/android/launcher3/model/data/WorkspaceItemInfo.java
+++ b/src/com/android/launcher3/model/data/WorkspaceItemInfo.java
@@ -57,21 +57,15 @@ public class WorkspaceItemInfo extends ItemInfoWithIcon {
      */
     public static final int FLAG_AUTOINSTALL_ICON = 1 << 1;
 
-    /**
-     * The icon is being installed. If {@link #FLAG_RESTORED_ICON} or {@link #FLAG_AUTOINSTALL_ICON}
-     * is set, then the icon is either being installed or is in a broken state.
-     */
-    public static final int FLAG_INSTALL_SESSION_ACTIVE = 1 << 2;
-
     /**
      * Indicates that the widget restore has started.
      */
-    public static final int FLAG_RESTORE_STARTED = 1 << 3;
+    public static final int FLAG_RESTORE_STARTED = 1 << 2;
 
     /**
      * Web UI supported.
      */
-    public static final int FLAG_SUPPORTS_WEB_UI = 1 << 4;
+    public static final int FLAG_SUPPORTS_WEB_UI = 1 << 3;
 
     /**
      * The intent used to start the application.
@@ -98,11 +92,6 @@ public class WorkspaceItemInfo extends ItemInfoWithIcon {
      */
     @NonNull private String[] personKeys = Utilities.EMPTY_STRING_ARRAY;
 
-    /**
-     * The installation progress [0-100] of the package that this shortcut represents.
-     */
-    private int mInstallProgress;
-
 
     public WorkspaceItemInfo() {
         itemType = LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT;
@@ -114,7 +103,6 @@ public class WorkspaceItemInfo extends ItemInfoWithIcon {
         intent = new Intent(info.intent);
         iconResource = info.iconResource;
         status = info.status;
-        mInstallProgress = info.mInstallProgress;
         personKeys = info.personKeys.clone();
     }
 
@@ -168,15 +156,6 @@ public class WorkspaceItemInfo extends ItemInfoWithIcon {
         return isPromise() && !hasStatusFlag(FLAG_SUPPORTS_WEB_UI);
     }
 
-    public int getInstallProgress() {
-        return mInstallProgress;
-    }
-
-    public void setInstallProgress(int progress) {
-        mInstallProgress = progress;
-        status |= FLAG_INSTALL_SESSION_ACTIVE;
-    }
-
     public void updateFromDeepShortcutInfo(ShortcutInfo shortcutInfo, Context context) {
         // {@link ShortcutInfo#getActivity} can change during an update. Recreate the intent
         intent = ShortcutKey.makeIntent(shortcutInfo);
diff --git a/src/com/android/launcher3/pm/PackageInstallInfo.java b/src/com/android/launcher3/pm/PackageInstallInfo.java
index 7997d16756..fad904f968 100644
--- a/src/com/android/launcher3/pm/PackageInstallInfo.java
+++ b/src/com/android/launcher3/pm/PackageInstallInfo.java
@@ -25,7 +25,8 @@ public final class PackageInstallInfo {
 
     public static final int STATUS_INSTALLED = 0;
     public static final int STATUS_INSTALLING = 1;
-    public static final int STATUS_FAILED = 2;
+    public static final int STATUS_INSTALLED_DOWNLOADING = 2;
+    public static final int STATUS_FAILED = 3;
 
     public final ComponentName componentName;
     public final String packageName;
@@ -56,5 +57,4 @@ public final class PackageInstallInfo {
     public static PackageInstallInfo fromState(int state, String packageName, UserHandle user) {
         return new PackageInstallInfo(packageName, state, 0 /* progress */, user);
     }
-
 }
diff --git a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
index b496608ac5..026634529f 100644
--- a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
+++ b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
@@ -35,8 +35,8 @@ import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.model.BgDataModel;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
-import com.android.launcher3.model.data.PromiseAppInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.popup.PopupContainerWithArrow;
 import com.android.launcher3.popup.PopupDataProvider;
@@ -215,8 +215,8 @@ public class SecondaryDisplayLauncher extends BaseDraggingActivity
             ArrayList<ItemInfo> addAnimated) { }
 
     @Override
-    public void bindPromiseAppProgressUpdated(PromiseAppInfo app) {
-        mAppsView.getAppsStore().updatePromiseAppProgress(app);
+    public void bindIncrementalDownloadProgressUpdated(AppInfo app) {
+        mAppsView.getAppsStore().updateProgressBar(app);
     }
 
     @Override
@@ -315,9 +315,11 @@ public class SecondaryDisplayLauncher extends BaseDraggingActivity
         if (tag instanceof ItemInfo) {
             ItemInfo item = (ItemInfo) tag;
             Intent intent;
-            if (item instanceof PromiseAppInfo) {
-                PromiseAppInfo promiseAppInfo = (PromiseAppInfo) item;
-                intent = promiseAppInfo.getMarketIntent(this);
+            if (item instanceof ItemInfoWithIcon
+                    && (((ItemInfoWithIcon) item).runtimeStatusFlags
+                        & ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE) != 0) {
+                ItemInfoWithIcon appInfo = (ItemInfoWithIcon) item;
+                intent = appInfo.getMarketIntent(this);
             } else {
                 intent = item.getIntent();
             }
diff --git a/src/com/android/launcher3/touch/ItemClickHandler.java b/src/com/android/launcher3/touch/ItemClickHandler.java
index 9b9cb0a61b..41587357f5 100644
--- a/src/com/android/launcher3/touch/ItemClickHandler.java
+++ b/src/com/android/launcher3/touch/ItemClickHandler.java
@@ -49,8 +49,8 @@ import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
-import com.android.launcher3.model.data.PromiseAppInfo;
 import com.android.launcher3.model.data.RemoteActionItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pm.InstallSessionHelper;
@@ -231,8 +231,12 @@ public class ItemClickHandler {
                     ? shortcut.getIntent().getComponent().getPackageName()
                     : shortcut.getIntent().getPackage();
             if (!TextUtils.isEmpty(packageName)) {
-                onClickPendingAppItem(v, launcher, packageName,
-                        shortcut.hasStatusFlag(WorkspaceItemInfo.FLAG_INSTALL_SESSION_ACTIVE));
+                onClickPendingAppItem(
+                        v,
+                        launcher,
+                        packageName,
+                        (shortcut.runtimeStatusFlags
+                                & ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE) != 0);
                 return;
             }
         }
@@ -266,9 +270,12 @@ public class ItemClickHandler {
         TestLogging.recordEvent(
                 TestProtocol.SEQUENCE_MAIN, "start: startAppShortcutOrInfoActivity");
         Intent intent;
-        if (item instanceof PromiseAppInfo) {
-            PromiseAppInfo promiseAppInfo = (PromiseAppInfo) item;
-            intent = promiseAppInfo.getMarketIntent(launcher);
+        if (item instanceof ItemInfoWithIcon
+                && (((ItemInfoWithIcon) item).runtimeStatusFlags
+                    & ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE) != 0) {
+            ItemInfoWithIcon appInfo = (ItemInfoWithIcon) item;
+            intent = new PackageManagerHelper(launcher)
+                    .getMarketIntent(appInfo.getTargetComponent().getPackageName());
         } else {
             intent = item.getIntent();
         }
diff --git a/src/com/android/launcher3/util/PackageManagerHelper.java b/src/com/android/launcher3/util/PackageManagerHelper.java
index 523545af43..7b264275d4 100644
--- a/src/com/android/launcher3/util/PackageManagerHelper.java
+++ b/src/com/android/launcher3/util/PackageManagerHelper.java
@@ -45,10 +45,11 @@ import android.widget.Toast;
 
 import com.android.launcher3.PendingAddItemInfo;
 import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
-import com.android.launcher3.model.data.PromiseAppInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 
 import java.net.URISyntaxException;
@@ -200,9 +201,12 @@ public class PackageManagerHelper {
      * Starts the details activity for {@code info}
      */
     public void startDetailsActivityForInfo(ItemInfo info, Rect sourceBounds, Bundle opts) {
-        if (info instanceof PromiseAppInfo) {
-            PromiseAppInfo promiseAppInfo = (PromiseAppInfo) info;
-            mContext.startActivity(promiseAppInfo.getMarketIntent(mContext));
+        if (info instanceof ItemInfoWithIcon
+                && (((ItemInfoWithIcon) info).runtimeStatusFlags
+                    & ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE) != 0) {
+            ItemInfoWithIcon appInfo = (ItemInfoWithIcon) info;
+            mContext.startActivity(new PackageManagerHelper(mContext)
+                    .getMarketIntent(appInfo.getTargetComponent().getPackageName()));
             return;
         }
         ComponentName componentName = null;
@@ -319,4 +323,12 @@ public class PackageManagerHelper {
         }
         return false;
     }
+
+    /** Returns the incremental download progress for the given shortcut's app. */
+    public static int getLoadingProgress(LauncherActivityInfo info) {
+        if (Utilities.ATLEAST_S) {
+            return (int) (100 * info.getLoadingProgress());
+        }
+        return 100;
+    }
 }
-- 
GitLab


From 5c953ed47d5233c07eda76daee137225a436798d Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 5 Jan 2021 12:52:34 -0800
Subject: [PATCH 0376/1664] Disabling fling gesture for assistant over deferred
 region

Fixing missing trigger when using fling gesture

Bug: 130186141
Bug: 175839420
Test: Verified fling does not work over keyboard dismiss button
Change-Id: Id15320122cf9183c591416962634561a1ddc6fa0
---
 .../quickstep/OverviewComponentObserver.java  |  5 ---
 .../RecentsAnimationDeviceState.java          | 10 ++++-
 .../quickstep/TouchInteractionService.java    | 11 ++----
 .../AssistantInputConsumer.java               | 38 +++++++++----------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/OverviewComponentObserver.java b/quickstep/src/com/android/quickstep/OverviewComponentObserver.java
index 49feef0862..7bf7712fd0 100644
--- a/quickstep/src/com/android/quickstep/OverviewComponentObserver.java
+++ b/quickstep/src/com/android/quickstep/OverviewComponentObserver.java
@@ -23,7 +23,6 @@ import static android.content.Intent.ACTION_PACKAGE_REMOVED;
 import static com.android.launcher3.config.FeatureFlags.SEPARATE_RECENTS_ACTIVITY;
 import static com.android.launcher3.util.PackageManagerHelper.getPackageFilter;
 import static com.android.systemui.shared.system.PackageManagerWrapper.ACTION_PREFERRED_ACTIVITY_CHANGED;
-import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_ASSIST_GESTURE_CONSTRAINED;
 
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -119,10 +118,6 @@ public final class OverviewComponentObserver {
         updateOverviewTargets();
     }
 
-    public boolean assistantGestureIsConstrained() {
-        return (mDeviceState.getSystemUiStateFlags() & SYSUI_STATE_ASSIST_GESTURE_CONSTRAINED) != 0;
-    }
-
     /**
      * Update overview intent and {@link BaseActivityInterface} based off the current launcher home
      * component.
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index d8064a2153..fb195f8a6f 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -24,6 +24,7 @@ import static com.android.quickstep.SysUINavigationMode.Mode.THREE_BUTTONS;
 import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_CLICKABLE;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_ASSIST_GESTURE_CONSTRAINED;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BUBBLES_EXPANDED;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_GLOBAL_ACTIONS_SHOWING;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_HOME_DISABLED;
@@ -374,7 +375,7 @@ public class RecentsAnimationDeviceState implements
      * @return the system ui state flags.
      */
     // TODO(141886704): See if we can remove this
-    public @SystemUiStateFlags int getSystemUiStateFlags() {
+    public int getSystemUiStateFlags() {
         return mSystemUiStateFlags;
     }
 
@@ -406,6 +407,13 @@ public class RecentsAnimationDeviceState implements
         return (mSystemUiStateFlags & SYSUI_STATE_SCREEN_PINNING) != 0;
     }
 
+    /**
+     * @return whether assistant gesture is constraint
+     */
+    public boolean isAssistantGestureIsConstrained() {
+        return (mSystemUiStateFlags & SYSUI_STATE_ASSIST_GESTURE_CONSTRAINED) != 0;
+    }
+
     /**
      * @return whether the bubble stack is expanded
      */
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 1e0a00aec8..e59035cf5a 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -466,7 +466,8 @@ public class TouchInteractionService extends Service implements PluginListener<O
                             this,
                             mGestureState,
                             InputConsumer.NO_OP, mInputMonitorCompat,
-                            mOverviewComponentObserver.assistantGestureIsConstrained());
+                            mDeviceState,
+                            event);
                 } else if (mDeviceState.canTriggerOneHandedAction(event)
                     && !mDeviceState.isOneHandedModeActive()) {
                     // Consume gesture event for triggering one handed feature.
@@ -563,12 +564,8 @@ public class TouchInteractionService extends Service implements PluginListener<O
         }
         if (mDeviceState.isFullyGesturalNavMode()) {
             if (mDeviceState.canTriggerAssistantAction(event, newGestureState.getRunningTask())) {
-                base = new AssistantInputConsumer(
-                    this,
-                    newGestureState,
-                    base,
-                    mInputMonitorCompat,
-                    mOverviewComponentObserver.assistantGestureIsConstrained());
+                base = new AssistantInputConsumer(this, newGestureState, base, mInputMonitorCompat,
+                        mDeviceState, event);
             }
 
             if (FeatureFlags.ENABLE_QUICK_CAPTURE_GESTURE.get()) {
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java
index 580e4ec807..a3cd7dffb2 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java
@@ -44,9 +44,12 @@ import com.android.launcher3.anim.Interpolators;
 import com.android.quickstep.BaseActivityInterface;
 import com.android.quickstep.GestureState;
 import com.android.quickstep.InputConsumer;
+import com.android.quickstep.RecentsAnimationDeviceState;
 import com.android.quickstep.SystemUiProxy;
 import com.android.systemui.shared.system.InputMonitorCompat;
 
+import java.util.function.Consumer;
+
 /**
  * Touch consumer for handling events to launch assistant from launcher
  */
@@ -81,19 +84,18 @@ public class AssistantInputConsumer extends DelegateInputConsumer {
     private final int mAngleThreshold;
     private final float mSquaredSlop;
     private final Context mContext;
-    private final GestureDetector mGestureDetector;
-    private final boolean mIsAssistGestureConstrained;
+    private final Consumer<MotionEvent> mGestureDetector;
 
     public AssistantInputConsumer(
             Context context,
             GestureState gestureState,
             InputConsumer delegate,
             InputMonitorCompat inputMonitor,
-            boolean isAssistGestureConstrained) {
+            RecentsAnimationDeviceState deviceState,
+            MotionEvent startEvent) {
         super(delegate, inputMonitor);
         final Resources res = context.getResources();
         mContext = context;
-        mIsAssistGestureConstrained = isAssistGestureConstrained;
         mDragDistThreshold = res.getDimension(R.dimen.gestures_assistant_drag_threshold);
         mFlingDistThreshold = res.getDimension(R.dimen.gestures_assistant_fling_threshold);
         mTimeThreshold = res.getInteger(R.integer.assistant_gesture_min_time_threshold);
@@ -104,7 +106,11 @@ public class AssistantInputConsumer extends DelegateInputConsumer {
         mSquaredSlop = slop * slop;
         mActivityInterface = gestureState.getActivityInterface();
 
-        mGestureDetector = new GestureDetector(context, new AssistantGestureListener());
+        boolean flingDisabled = deviceState.isAssistantGestureIsConstrained()
+                || deviceState.isInDeferredGestureRegion(startEvent);
+        mGestureDetector = flingDisabled
+                ? ev -> { }
+                : new GestureDetector(context, new AssistantGestureListener())::onTouchEvent;
     }
 
     @Override
@@ -201,7 +207,7 @@ public class AssistantInputConsumer extends DelegateInputConsumer {
                 break;
         }
 
-        mGestureDetector.onTouchEvent(ev);
+        mGestureDetector.accept(ev);
 
         if (mState != STATE_ACTIVE) {
             mDelegate.onMotionEvent(ev);
@@ -214,12 +220,6 @@ public class AssistantInputConsumer extends DelegateInputConsumer {
             if (mDistance >= mDragDistThreshold && mTimeFraction >= 1) {
                 SystemUiProxy.INSTANCE.get(mContext).onAssistantGestureCompletion(0);
                 startAssistantInternal();
-
-                Bundle args = new Bundle();
-                args.putInt(OPA_BUNDLE_TRIGGER, OPA_BUNDLE_TRIGGER_DIAG_SWIPE_GESTURE);
-                args.putInt(INVOCATION_TYPE_KEY, INVOCATION_TYPE_GESTURE);
-                SystemUiProxy.INSTANCE.get(mContext).startAssistant(args);
-                mLaunchedAssistant = true;
             } else {
                 SystemUiProxy.INSTANCE.get(mContext).onAssistantProgress(mLastProgress);
             }
@@ -233,6 +233,12 @@ public class AssistantInputConsumer extends DelegateInputConsumer {
                 13, // HapticFeedbackConstants.GESTURE_END
                 HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING);
         }
+
+        Bundle args = new Bundle();
+        args.putInt(OPA_BUNDLE_TRIGGER, OPA_BUNDLE_TRIGGER_DIAG_SWIPE_GESTURE);
+        args.putInt(INVOCATION_TYPE_KEY, INVOCATION_TYPE_GESTURE);
+        SystemUiProxy.INSTANCE.get(mContext).startAssistant(args);
+        mLaunchedAssistant = true;
     }
 
     /**
@@ -250,8 +256,7 @@ public class AssistantInputConsumer extends DelegateInputConsumer {
     private class AssistantGestureListener extends SimpleOnGestureListener {
         @Override
         public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
-            if (!mIsAssistGestureConstrained
-                && isValidAssistantGestureAngle(velocityX, -velocityY)
+            if (isValidAssistantGestureAngle(velocityX, -velocityY)
                     && mDistance >= mFlingDistThreshold
                     && !mLaunchedAssistant
                     && mState != STATE_DELEGATE_ACTIVE) {
@@ -259,11 +264,6 @@ public class AssistantInputConsumer extends DelegateInputConsumer {
                 SystemUiProxy.INSTANCE.get(mContext).onAssistantGestureCompletion(
                     (float) Math.sqrt(velocityX * velocityX + velocityY * velocityY));
                 startAssistantInternal();
-
-                Bundle args = new Bundle();
-                args.putInt(INVOCATION_TYPE_KEY, INVOCATION_TYPE_GESTURE);
-                SystemUiProxy.INSTANCE.get(mContext).startAssistant(args);
-                mLaunchedAssistant = true;
             }
             return true;
         }
-- 
GitLab


From 5a7d6d682af662270ef81b3c47032fb930fb00d7 Mon Sep 17 00:00:00 2001
From: Becky Qiu <xuqiu@google.com>
Date: Tue, 5 Jan 2021 13:28:28 -0800
Subject: [PATCH 0377/1664] [Overview Sharing] Add a feature flag for overview
 sharing.

Bug: 169772466, 169799864
Test: local
Change-Id: Ie386f660d24feb8d0f3ed15ccf946c005d436986
---
 src/com/android/launcher3/config/FeatureFlags.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 883eab0159..1585697146 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -149,6 +149,10 @@ public final class FeatureFlags {
     public static final BooleanFlag ENABLE_OVERVIEW_SHARE = getDebugFlag(
             "ENABLE_OVERVIEW_SHARE", false, "Show Share button in Overview Actions");
 
+    public static final BooleanFlag ENABLE_OVERVIEW_SHARING_TO_PEOPLE = getDebugFlag(
+            "ENABLE_OVERVIEW_SHARING_TO_PEOPLE", false,
+            "Show indicators for content on Overview to share with top people. ");
+
     public static final BooleanFlag ENABLE_OVERVIEW_CONTENT_PUSH = getDebugFlag(
             "ENABLE_OVERVIEW_CONTENT_PUSH", false, "Show Content Push button in Overview Actions");
 
-- 
GitLab


From da5e714ca14d9df231c0b1dc81c8370ecd94be96 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Thu, 17 Dec 2020 11:25:44 -0500
Subject: [PATCH 0378/1664] Fix homescreen deep shortcuts text spanning two
 rows.

Deep shortcut text can span two lines on certain languages. Set translation character limits and increased options popup width.

Fixes: 175698383

Test: manual

Screenshot: https://screenshot.googleplex.com/4BArwKVSFg3VbTc.png
Change-Id: I263b859246fa6475591a65f92189e41a920beefe
---
 res/layout/system_shortcut.xml | 2 +-
 res/values/dimens.xml          | 2 +-
 res/values/strings.xml         | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/layout/system_shortcut.xml b/res/layout/system_shortcut.xml
index 881df1bb80..c620e2af57 100644
--- a/res/layout/system_shortcut.xml
+++ b/res/layout/system_shortcut.xml
@@ -30,7 +30,7 @@
         android:paddingStart="@dimen/deep_shortcuts_text_padding_start"
         android:paddingEnd="@dimen/popup_padding_end"
         android:textSize="14sp"
-        android:maxLines="2"
+        android:maxLines="1"
         android:textColor="?android:attr/textColorPrimary"
         launcher:iconDisplay="shortcut_popup"
         launcher:layoutHorizontal="true"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 7df3f774e5..cf51f77707 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -167,7 +167,7 @@
 
 <!-- Deep shortcuts -->
     <dimen name="deep_shortcuts_elevation">9dp</dimen>
-    <dimen name="bg_popup_item_width">220dp</dimen>
+    <dimen name="bg_popup_item_width">260dp</dimen>
     <dimen name="bg_popup_item_height">56dp</dimen>
     <dimen name="bg_popup_item_condensed_height">48dp</dimen>
     <dimen name="pre_drag_view_scale">6dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6c58c0eff5..3425f919c5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -182,13 +182,13 @@
     <string name="folder_name_format_overflow">Folder: <xliff:g id="name" example="Games">%1$s</xliff:g>, <xliff:g id="size" example="2">%2$d</xliff:g> or more items</string>
 
     <!-- Strings for the customization mode -->
-    <!-- Text for widget add button -->
+    <!-- Text for widget add button [CHAR LIMIT=30]-->
     <string name="widget_button_text">Widgets</string>
-    <!-- Text for wallpaper change button -->
+    <!-- Text for wallpaper change button [CHAR LIMIT=30]-->
     <string name="wallpaper_button_text">Wallpapers</string>
-    <!-- Text for wallpaper change button -->
+    <!-- Text for wallpaper change button [CHAR LIMIT=30]-->
     <string name="styles_wallpaper_button_text">Styles &amp; wallpapers</string>
-    <!-- Text for settings button [CHAR LIMIT=20]-->
+    <!-- Text for settings button [CHAR LIMIT=30]-->
     <string name="settings_button_text">Home settings</string>
     <!-- Message shown when a feature is disabled by the administrator -->
     <string name="msg_disabled_by_admin">Disabled by your admin</string>
-- 
GitLab


From be5af2de6b9e9cc40716f4d440f42e2cf2afcdf0 Mon Sep 17 00:00:00 2001
From: Jason Chang <jasonsfchang@google.com>
Date: Thu, 24 Dec 2020 16:34:19 +0800
Subject: [PATCH 0379/1664] Fix triggering One-handed mode introduces gesture
 conflict issues (2/n)

Define a new larger gesture height instead of replacing
existing navigation_bar_gesture_height with RRO.

Bug: 159580663

Test: manual
Change-Id: Icdd70b28d9b2629171fb60a0c9d603f6a69f076a
---
 .../OrientationTouchTransformer.java          |  9 +++++++-
 .../quickstep/SysUINavigationMode.java        | 21 ++++++++++++++++---
 src/com/android/launcher3/ResourceUtils.java  |  2 ++
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
index eb33f98dad..b258a10c85 100644
--- a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
+++ b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
@@ -66,6 +66,7 @@ class OrientationTouchTransformer {
     private final RectF mOneHandedModeRegion = new RectF();
     private int mCurrentDisplayRotation;
     private int mNavBarGesturalHeight;
+    private int mNavBarLargerGesturalHeight;
     private boolean mEnableMultipleRegions;
     private Resources mResources;
     private OrientationRectF mLastRectTouched;
@@ -106,6 +107,9 @@ class OrientationTouchTransformer {
         mMode = mode;
         mContractInfo = contractInfo;
         mNavBarGesturalHeight = getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE);
+        mNavBarLargerGesturalHeight = ResourceUtils.getDimenByName(
+                ResourceUtils.NAVBAR_BOTTOM_GESTURE_LARGER_SIZE, resources,
+                mNavBarGesturalHeight);
     }
 
     private void refreshTouchRegion(Info info, Resources newRes) {
@@ -234,6 +238,7 @@ class OrientationTouchTransformer {
         Point size = display.realSize;
         int rotation = display.rotation;
         int touchHeight = mNavBarGesturalHeight;
+        int largerGesturalHeight = mNavBarLargerGesturalHeight;
         OrientationRectF orientationRectF =
                 new OrientationRectF(0, 0, size.x, size.y, rotation);
         if (mMode == SysUINavigationMode.Mode.NO_BUTTON) {
@@ -256,7 +261,8 @@ class OrientationTouchTransformer {
             }
         }
         // One handed gestural only active on portrait mode
-        mOneHandedModeRegion.set(0, orientationRectF.bottom - touchHeight, size.x, size.y);
+        mOneHandedModeRegion.set(0, orientationRectF.bottom - mNavBarLargerGesturalHeight,
+                size.x, size.y);
 
         return orientationRectF;
     }
@@ -378,6 +384,7 @@ class OrientationTouchTransformer {
         }
         pw.println(regions.toString());
         pw.println("  mNavBarGesturalHeight=" + mNavBarGesturalHeight);
+        pw.println("  mNavBarLargerGesturalHeight=" + mNavBarLargerGesturalHeight);
         pw.println("  mOneHandedModeRegion=" + mOneHandedModeRegion);
     }
 
diff --git a/quickstep/src/com/android/quickstep/SysUINavigationMode.java b/quickstep/src/com/android/quickstep/SysUINavigationMode.java
index 6b502186e9..9bf0cfe6f2 100644
--- a/quickstep/src/com/android/quickstep/SysUINavigationMode.java
+++ b/quickstep/src/com/android/quickstep/SysUINavigationMode.java
@@ -74,6 +74,7 @@ public class SysUINavigationMode {
     private Mode mMode;
 
     private int mNavBarGesturalHeight;
+    private int mNavBarLargerGesturalHeight;
 
     private final List<NavigationModeChangeListener> mChangeListeners = new ArrayList<>();
     private final List<OneHandedModeChangeListener> mOneHandedOverlayChangeListeners =
@@ -113,6 +114,17 @@ public class SysUINavigationMode {
 
         if (mNavBarGesturalHeight != newGesturalHeight) {
             mNavBarGesturalHeight = newGesturalHeight;
+        }
+
+        int newLargerGesturalHeight = ResourceUtils.getDimenByName(
+                ResourceUtils.NAVBAR_BOTTOM_GESTURE_LARGER_SIZE, mContext.getResources(),
+                INVALID_RESOURCE_HANDLE);
+        if (newLargerGesturalHeight == INVALID_RESOURCE_HANDLE) {
+            Log.e(TAG, "Failed to get system resource ID. Incompatible framework version?");
+            return;
+        }
+        if (mNavBarLargerGesturalHeight != newLargerGesturalHeight) {
+            mNavBarLargerGesturalHeight = newLargerGesturalHeight;
             dispatchOneHandedOverlayChange();
         }
     }
@@ -123,6 +135,9 @@ public class SysUINavigationMode {
         mNavBarGesturalHeight = ResourceUtils.getDimenByName(
                 ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE, mContext.getResources(),
                 INVALID_RESOURCE_HANDLE);
+        mNavBarLargerGesturalHeight = ResourceUtils.getDimenByName(
+                ResourceUtils.NAVBAR_BOTTOM_GESTURE_LARGER_SIZE, mContext.getResources(),
+                mNavBarGesturalHeight);
 
         if (modeInt == INVALID_RESOURCE_HANDLE) {
             Log.e(TAG, "Failed to get system resource ID. Incompatible framework version?");
@@ -144,7 +159,7 @@ public class SysUINavigationMode {
 
     private void dispatchOneHandedOverlayChange() {
         for (OneHandedModeChangeListener listener : mOneHandedOverlayChangeListeners) {
-            listener.onOneHandedModeChanged(mNavBarGesturalHeight);
+            listener.onOneHandedModeChanged(mNavBarLargerGesturalHeight);
         }
     }
 
@@ -159,7 +174,7 @@ public class SysUINavigationMode {
 
     public int addOneHandedOverlayChangeListener(OneHandedModeChangeListener listener) {
         mOneHandedOverlayChangeListeners.add(listener);
-        return mNavBarGesturalHeight;
+        return mNavBarLargerGesturalHeight;
     }
 
     public void removeOneHandedOverlayChangeListener(OneHandedModeChangeListener listener) {
@@ -195,4 +210,4 @@ public class SysUINavigationMode {
     public interface OneHandedModeChangeListener {
         void onOneHandedModeChanged(int newGesturalHeight);
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/launcher3/ResourceUtils.java b/src/com/android/launcher3/ResourceUtils.java
index c9fb75a2db..f60e1f8137 100644
--- a/src/com/android/launcher3/ResourceUtils.java
+++ b/src/com/android/launcher3/ResourceUtils.java
@@ -25,6 +25,8 @@ public class ResourceUtils {
     public static final int INVALID_RESOURCE_HANDLE = -1;
     public static final String NAVBAR_LANDSCAPE_LEFT_RIGHT_SIZE = "navigation_bar_width";
     public static final String NAVBAR_BOTTOM_GESTURE_SIZE = "navigation_bar_gesture_height";
+    public static final String NAVBAR_BOTTOM_GESTURE_LARGER_SIZE =
+            "navigation_bar_gesture_larger_height";
 
     public static int getNavbarSize(String resName, Resources res) {
         return getDimenByName(resName, res, DEFAULT_NAVBAR_VALUE);
-- 
GitLab


From 229497d1820f49450687bbc558041df97d0bf779 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Thu, 7 Jan 2021 19:44:44 +0000
Subject: [PATCH 0380/1664] Revert "Add UI updates for incremental app
 installs."

This reverts commit 84269d349d093b6b0bd2b68e2306f7e0475cd4f5.

Reason for revert: causes b/176884453 and b/176992421

Change-Id: I3398674a0acbad8329df5d341ae074ac073a6bf9
---
 .../PackageInstallStateChangedTaskTest.java   |  2 +-
 src/com/android/launcher3/BubbleTextView.java | 50 ++++------
 src/com/android/launcher3/Launcher.java       |  5 +-
 src/com/android/launcher3/LauncherModel.java  | 10 --
 src/com/android/launcher3/Utilities.java      |  7 +-
 src/com/android/launcher3/Workspace.java      |  2 +-
 .../launcher3/allapps/AllAppsStore.java       | 12 +--
 .../launcher3/folder/PreviewItemManager.java  |  6 +-
 .../graphics/PreloadIconDrawable.java         |  4 +-
 .../model/AddWorkspaceItemsTask.java          |  5 +-
 .../android/launcher3/model/AllAppsList.java  | 33 +++----
 .../android/launcher3/model/BgDataModel.java  |  7 +-
 .../android/launcher3/model/LoaderCursor.java | 23 ++---
 .../android/launcher3/model/LoaderTask.java   | 24 +----
 ...PackageIncrementalDownloadUpdatedTask.java | 79 ---------------
 .../model/PackageInstallStateChangedTask.java | 21 ++--
 .../android/launcher3/model/data/AppInfo.java | 40 +-------
 .../model/data/ItemInfoWithIcon.java          | 97 -------------------
 .../launcher3/model/data/PromiseAppInfo.java  | 54 +++++++++++
 .../model/data/WorkspaceItemInfo.java         | 25 ++++-
 .../launcher3/pm/PackageInstallInfo.java      |  4 +-
 .../SecondaryDisplayLauncher.java             | 14 ++-
 .../launcher3/touch/ItemClickHandler.java     | 19 ++--
 .../launcher3/util/PackageManagerHelper.java  | 20 +---
 24 files changed, 163 insertions(+), 400 deletions(-)
 delete mode 100644 src/com/android/launcher3/model/PackageIncrementalDownloadUpdatedTask.java
 create mode 100644 src/com/android/launcher3/model/data/PromiseAppInfo.java

diff --git a/robolectric_tests/src/com/android/launcher3/model/PackageInstallStateChangedTaskTest.java b/robolectric_tests/src/com/android/launcher3/model/PackageInstallStateChangedTaskTest.java
index 412ace03ff..e43df21ae9 100644
--- a/robolectric_tests/src/com/android/launcher3/model/PackageInstallStateChangedTaskTest.java
+++ b/robolectric_tests/src/com/android/launcher3/model/PackageInstallStateChangedTaskTest.java
@@ -67,7 +67,7 @@ public class PackageInstallStateChangedTaskTest {
         for (ItemInfo info : mModelHelper.getBgDataModel().itemsIdMap) {
             if (info instanceof WorkspaceItemInfo) {
                 assertEquals(updates.contains(info.id) ? progress: 0,
-                        ((WorkspaceItemInfo) info).getProgressLevel());
+                        ((WorkspaceItemInfo) info).getInstallProgress());
             } else {
                 assertEquals(updates.contains(info.id) ? progress: -1,
                         ((LauncherAppWidgetInfo) info).installProgress);
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index f44f88b098..3eb52adf1a 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -50,7 +50,6 @@ import android.view.View;
 import android.view.ViewDebug;
 import android.widget.TextView;
 
-import androidx.annotation.Nullable;
 import androidx.core.graphics.ColorUtils;
 
 import com.android.launcher3.Launcher.OnResumeCallback;
@@ -72,6 +71,7 @@ import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.PackageItemInfo;
+import com.android.launcher3.model.data.PromiseAppInfo;
 import com.android.launcher3.model.data.RemoteActionItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.util.SafeCloseable;
@@ -287,7 +287,10 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
     public void applyFromWorkspaceItem(WorkspaceItemInfo info, boolean promiseStateChanged) {
         applyIconAndLabel(info);
         setTag(info);
-        applyLoadingState(promiseStateChanged);
+        if (promiseStateChanged || (info.hasPromiseIconUi())) {
+            applyPromiseState(promiseStateChanged);
+        }
+
         applyDotState(info, false /* animate */);
     }
 
@@ -300,8 +303,9 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         // Verify high res immediately
         verifyHighRes();
 
-        if ((info.runtimeStatusFlags & ItemInfoWithIcon.FLAG_SHOW_DOWNLOAD_PROGRESS_MASK) != 0) {
-            applyProgressLevel(info.getProgressLevel());
+        if (info instanceof PromiseAppInfo) {
+            PromiseAppInfo promiseAppInfo = (PromiseAppInfo) info;
+            applyProgressLevel(promiseAppInfo.level);
         }
         applyDotState(info, false /* animate */);
     }
@@ -331,10 +335,6 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         mDotParams.color = IconPalette.getMutedColor(info.bitmap.color, 0.54f);
 
         setIcon(iconDrawable);
-        applyLabel(info);
-    }
-
-    private void applyLabel(ItemInfoWithIcon info) {
         setText(info.title);
         if (info.contentDescription != null) {
             setContentDescription(info.isDisabled()
@@ -595,35 +595,21 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         mLongPressHelper.cancelLongPress();
     }
 
-    /** Applies the loading progress value to the progress bar.
-     *
-     * If this app is installing, the progress bar will be updated with the installation progress.
-     * If this app is installed and downloading incrementally, the progress bar will be updated
-     * with the total download progress.
-     */
-    public void applyLoadingState(boolean promiseStateChanged) {
+    public void applyPromiseState(boolean promiseStateChanged) {
         if (getTag() instanceof WorkspaceItemInfo) {
             WorkspaceItemInfo info = (WorkspaceItemInfo) getTag();
-            int progressLevel = info.getProgressLevel();
-            if ((info.runtimeStatusFlags & ItemInfoWithIcon.FLAG_INCREMENTAL_DOWNLOAD_ACTIVE)
-                    != 0) {
-                updateProgressBarUi(progressLevel, progressLevel == 100);
-            } else if (info.hasPromiseIconUi() || (info.runtimeStatusFlags
-                        & ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE) != 0) {
-                updateProgressBarUi(progressLevel, promiseStateChanged);
+            final boolean isPromise = info.hasPromiseIconUi();
+            final int progressLevel = isPromise ?
+                    ((info.hasStatusFlag(WorkspaceItemInfo.FLAG_INSTALL_SESSION_ACTIVE) ?
+                            info.getInstallProgress() : 0)) : 100;
+
+            PreloadIconDrawable preloadDrawable = applyProgressLevel(progressLevel);
+            if (preloadDrawable != null && promiseStateChanged) {
+                preloadDrawable.maybePerformFinishedAnimation();
             }
         }
     }
 
-    private void updateProgressBarUi(int progressLevel, boolean maybePerformFinishedAnimation) {
-        PreloadIconDrawable preloadDrawable = applyProgressLevel(progressLevel);
-        if (preloadDrawable != null && maybePerformFinishedAnimation) {
-            preloadDrawable.maybePerformFinishedAnimation();
-        }
-    }
-
-    /** Applies the given progress level to the this icon's progress bar. */
-    @Nullable
     public PreloadIconDrawable applyProgressLevel(int progressLevel) {
         if (getTag() instanceof ItemInfoWithIcon) {
             ItemInfoWithIcon info = (ItemInfoWithIcon) getTag();
@@ -643,11 +629,9 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
                 if (mIcon instanceof PreloadIconDrawable) {
                     preloadDrawable = (PreloadIconDrawable) mIcon;
                     preloadDrawable.setLevel(progressLevel);
-                    preloadDrawable.setIsDisabled(!info.isAppStartable());
                 } else {
                     preloadDrawable = newPendingIcon(getContext(), info);
                     preloadDrawable.setLevel(progressLevel);
-                    preloadDrawable.setIsDisabled(!info.isAppStartable());
                     setIcon(preloadDrawable);
                 }
                 return preloadDrawable;
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 4d1b76610c..e099d852f3 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -137,6 +137,7 @@ import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
+import com.android.launcher3.model.data.PromiseAppInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.notification.NotificationListener;
 import com.android.launcher3.pm.PinRequestHelper;
@@ -2516,8 +2517,8 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     }
 
     @Override
-    public void bindIncrementalDownloadProgressUpdated(AppInfo app) {
-        mAppsView.getAppsStore().updateProgressBar(app);
+    public void bindPromiseAppProgressUpdated(PromiseAppInfo app) {
+        mAppsView.getAppsStore().updatePromiseAppProgress(app);
     }
 
     @Override
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index e89b9b060a..8458152146 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -48,7 +48,6 @@ import com.android.launcher3.model.LoaderResults;
 import com.android.launcher3.model.LoaderTask;
 import com.android.launcher3.model.ModelDelegate;
 import com.android.launcher3.model.ModelWriter;
-import com.android.launcher3.model.PackageIncrementalDownloadUpdatedTask;
 import com.android.launcher3.model.PackageInstallStateChangedTask;
 import com.android.launcher3.model.PackageUpdatedTask;
 import com.android.launcher3.model.ShortcutsChangedTask;
@@ -196,15 +195,6 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi
                 PackageUpdatedTask.OP_UNSUSPEND, user, packageNames));
     }
 
-    @Override
-    public void onPackageLoadingProgressChanged(
-                String packageName, UserHandle user, float progress) {
-        if (Utilities.ATLEAST_S) {
-            enqueueModelUpdateTask(new PackageIncrementalDownloadUpdatedTask(
-                    packageName, user, progress));
-        }
-    }
-
     @Override
     public void onShortcutsChanged(String packageName, List<ShortcutInfo> shortcuts,
             UserHandle user) {
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index df5d23428d..5c2f35b981 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -107,13 +107,12 @@ public final class Utilities {
     public static final String[] EMPTY_STRING_ARRAY = new String[0];
     public static final Person[] EMPTY_PERSON_ARRAY = new Person[0];
 
-    public static final boolean ATLEAST_P = Build.VERSION.SDK_INT >= Build.VERSION_CODES.P;
+    public static final boolean ATLEAST_R = BuildCompat.isAtLeastR();
 
     public static final boolean ATLEAST_Q = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q;
 
-    public static final boolean ATLEAST_R = Build.VERSION.SDK_INT >= Build.VERSION_CODES.R;
-
-    public static final boolean ATLEAST_S = BuildCompat.isAtLeastS();
+    public static final boolean ATLEAST_P =
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.P;
 
     /**
      * Set on a motion event dispatched from the nav bar. See {@link MotionEvent#setEdgeFlags(int)}.
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 65eba20672..777ea3c7d5 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -3154,7 +3154,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         ItemOperator op = (info, v) -> {
             if (info instanceof WorkspaceItemInfo && v instanceof BubbleTextView
                     && updates.contains(info)) {
-                ((BubbleTextView) v).applyLoadingState(false /* promiseStateChanged */);
+                ((BubbleTextView) v).applyPromiseState(false /* promiseStateChanged */);
             } else if (v instanceof PendingAppWidgetHostView
                     && info instanceof LauncherAppWidgetInfo
                     && updates.contains(info)) {
diff --git a/src/com/android/launcher3/allapps/AllAppsStore.java b/src/com/android/launcher3/allapps/AllAppsStore.java
index 00bdb70c4a..3ae0a18137 100644
--- a/src/com/android/launcher3/allapps/AllAppsStore.java
+++ b/src/com/android/launcher3/allapps/AllAppsStore.java
@@ -24,6 +24,7 @@ import android.view.ViewGroup;
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.PromiseAppInfo;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.PackageUserKey;
 
@@ -144,17 +145,10 @@ public class AllAppsStore {
         });
     }
 
-    /**
-     * Sets the AppInfo's associated icon's progress bar.
-     *
-     * If this app is installed and supports incremental downloads, the progress bar will be updated
-     * the app's total download progress. Otherwise, the progress bar will be updated to the app's
-     * installation progress.
-     */
-    public void updateProgressBar(AppInfo app) {
+    public void updatePromiseAppProgress(PromiseAppInfo app) {
         updateAllIcons((child) -> {
             if (child.getTag() == app) {
-                child.applyProgressLevel(app.getProgressLevel());
+                child.applyProgressLevel(app.level);
             }
         });
     }
diff --git a/src/com/android/launcher3/folder/PreviewItemManager.java b/src/com/android/launcher3/folder/PreviewItemManager.java
index 9ae7faf988..7f8a15c927 100644
--- a/src/com/android/launcher3/folder/PreviewItemManager.java
+++ b/src/com/android/launcher3/folder/PreviewItemManager.java
@@ -39,7 +39,6 @@ import androidx.annotation.NonNull;
 
 import com.android.launcher3.Utilities;
 import com.android.launcher3.graphics.PreloadIconDrawable;
-import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.views.ActivityContext;
 
@@ -395,10 +394,9 @@ public class PreviewItemManager {
     }
 
     private void setDrawable(PreviewItemDrawingParams p, WorkspaceItemInfo item) {
-        if (item.hasPromiseIconUi() || (item.runtimeStatusFlags
-                    & ItemInfoWithIcon.FLAG_SHOW_DOWNLOAD_PROGRESS_MASK) != 0) {
+        if (item.hasPromiseIconUi()) {
             PreloadIconDrawable drawable = newPendingIcon(mContext, item);
-            drawable.setLevel(item.getProgressLevel());
+            drawable.setLevel(item.getInstallProgress());
             p.drawable = drawable;
         } else {
             p.drawable = newIcon(mContext, item);
diff --git a/src/com/android/launcher3/graphics/PreloadIconDrawable.java b/src/com/android/launcher3/graphics/PreloadIconDrawable.java
index 9971990267..e85b056376 100644
--- a/src/com/android/launcher3/graphics/PreloadIconDrawable.java
+++ b/src/com/android/launcher3/graphics/PreloadIconDrawable.java
@@ -117,8 +117,6 @@ public class PreloadIconDrawable extends FastBitmapDrawable {
         mIndicatorColor = IconPalette.getPreloadProgressColor(context, mIconColor);
 
         setInternalProgress(0);
-
-        setIsDisabled(!info.isAppStartable());
     }
 
     @Override
@@ -268,12 +266,14 @@ public class PreloadIconDrawable extends FastBitmapDrawable {
             mIconScale = SMALL_SCALE;
             mScaledTrackPath.reset();
             mTrackAlpha = MAX_PAINT_ALPHA;
+            setIsDisabled(true);
         }
 
         if (progress < 1 && progress > 0) {
             mPathMeasure.getSegment(0, progress * mTrackLength, mScaledProgressPath, true);
             mIconScale = SMALL_SCALE;
             mTrackAlpha = MAX_PAINT_ALPHA;
+            setIsDisabled(true);
         } else if (progress >= 1) {
             setIsDisabled(mItem.isDisabled());
             mScaledTrackPath.set(mScaledProgressPath);
diff --git a/src/com/android/launcher3/model/AddWorkspaceItemsTask.java b/src/com/android/launcher3/model/AddWorkspaceItemsTask.java
index 56dbbd33da..c236fa6dec 100644
--- a/src/com/android/launcher3/model/AddWorkspaceItemsTask.java
+++ b/src/com/android/launcher3/model/AddWorkspaceItemsTask.java
@@ -34,7 +34,6 @@ import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pm.InstallSessionHelper;
-import com.android.launcher3.pm.PackageInstallInfo;
 import com.android.launcher3.util.GridOccupancy;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.PackageManagerHelper;
@@ -133,9 +132,7 @@ public class AddWorkspaceItemsTask extends BaseModelUpdateTask {
                             continue;
                         }
                     } else {
-                        workspaceInfo.setProgressLevel(
-                                (int) (sessionInfo.getProgress() * 100),
-                                PackageInstallInfo.STATUS_INSTALLING);
+                        workspaceInfo.setInstallProgress((int) sessionInfo.getProgress());
                     }
 
                     if (hasActivity) {
diff --git a/src/com/android/launcher3/model/AllAppsList.java b/src/com/android/launcher3/model/AllAppsList.java
index 8d5cf7422f..2695e66591 100644
--- a/src/com/android/launcher3/model/AllAppsList.java
+++ b/src/com/android/launcher3/model/AllAppsList.java
@@ -21,11 +21,11 @@ import static com.android.launcher3.model.data.AppInfo.EMPTY_ARRAY;
 
 import android.content.ComponentName;
 import android.content.Context;
-import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.LauncherActivityInfo;
 import android.content.pm.LauncherApps;
 import android.os.LocaleList;
+import android.os.Process;
 import android.os.UserHandle;
 import android.util.Log;
 
@@ -37,6 +37,7 @@ import com.android.launcher3.compat.AlphabeticIndexCompat;
 import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.model.BgDataModel.Callbacks;
 import com.android.launcher3.model.data.AppInfo;
+import com.android.launcher3.model.data.PromiseAppInfo;
 import com.android.launcher3.pm.PackageInstallInfo;
 import com.android.launcher3.util.FlagOp;
 import com.android.launcher3.util.ItemInfoMatcher;
@@ -149,7 +150,7 @@ public class AllAppsList {
                 .getApplicationInfo(installInfo.packageName, installInfo.user, 0);
         // only if not yet installed
         if (applicationInfo == null) {
-            AppInfo info = new AppInfo(installInfo);
+            PromiseAppInfo info = new PromiseAppInfo(installInfo);
             mIconCache.getTitleAndIcon(info, info.usingLowResIcon());
             info.sectionName = mIndex.computeSectionName(info.title);
 
@@ -158,26 +159,24 @@ public class AllAppsList {
         }
     }
 
-    /** Updates the given PackageInstallInfo's associated AppInfo's installation info. */
-    public List<AppInfo> updatePromiseInstallInfo(PackageInstallInfo installInfo) {
-        List<AppInfo> updatedAppInfos = new ArrayList<>();
-        UserHandle user = installInfo.user;
-        for (int i = data.size() - 1; i >= 0; i--) {
+    public PromiseAppInfo updatePromiseInstallInfo(PackageInstallInfo installInfo) {
+        UserHandle user = Process.myUserHandle();
+        for (int i=0; i < data.size(); i++) {
             final AppInfo appInfo = data.get(i);
             final ComponentName tgtComp = appInfo.getTargetComponent();
             if (tgtComp != null && tgtComp.getPackageName().equals(installInfo.packageName)
-                    && appInfo.user.equals(user)) {
-                if (installInfo.state == PackageInstallInfo.STATUS_INSTALLED_DOWNLOADING
-                            || installInfo.state == PackageInstallInfo.STATUS_INSTALLING) {
-                    appInfo.setProgressLevel(installInfo);
-
-                    updatedAppInfos.add(appInfo);
+                    && appInfo.user.equals(user)
+                    && appInfo instanceof PromiseAppInfo) {
+                final PromiseAppInfo promiseAppInfo = (PromiseAppInfo) appInfo;
+                if (installInfo.state == PackageInstallInfo.STATUS_INSTALLING) {
+                    promiseAppInfo.level = installInfo.progress;
+                    return promiseAppInfo;
                 } else if (installInfo.state == PackageInstallInfo.STATUS_FAILED) {
                     removeApp(i);
                 }
             }
         }
-        return updatedAppInfos;
+        return null;
     }
 
     private void removeApp(int index) {
@@ -269,14 +268,8 @@ public class AllAppsList {
                 if (applicationInfo == null) {
                     add(new AppInfo(context, info, user), info);
                 } else {
-                    Intent launchIntent = AppInfo.makeLaunchIntent(info);
-
                     mIconCache.getTitleAndIcon(applicationInfo, info, true /* useLowResIcon */);
                     applicationInfo.sectionName = mIndex.computeSectionName(applicationInfo.title);
-                    applicationInfo.setProgressLevel(
-                            PackageManagerHelper.getLoadingProgress(info),
-                            PackageInstallInfo.STATUS_INSTALLED_DOWNLOADING);
-                    applicationInfo.intent = launchIntent;
 
                     mDataChanged = true;
                 }
diff --git a/src/com/android/launcher3/model/BgDataModel.java b/src/com/android/launcher3/model/BgDataModel.java
index 2d860a41d3..c217a475a1 100644
--- a/src/com/android/launcher3/model/BgDataModel.java
+++ b/src/com/android/launcher3/model/BgDataModel.java
@@ -39,6 +39,7 @@ import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
+import com.android.launcher3.model.data.PromiseAppInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pm.UserCache;
 import com.android.launcher3.shortcuts.ShortcutKey;
@@ -458,11 +459,7 @@ public class BgDataModel {
         void preAddApps();
         void bindAppsAdded(IntArray newScreens,
                 ArrayList<ItemInfo> addNotAnimated, ArrayList<ItemInfo> addAnimated);
-
-        /**
-         * Binds updated incremental download progress
-         */
-        void bindIncrementalDownloadProgressUpdated(AppInfo app);
+        void bindPromiseAppProgressUpdated(PromiseAppInfo app);
         void bindWorkspaceItemsChanged(List<WorkspaceItemInfo> updated);
         void bindWidgetsRestored(ArrayList<LauncherAppWidgetInfo> widgets);
         void bindRestoreItemsChange(HashSet<ItemInfo> updates);
diff --git a/src/com/android/launcher3/model/LoaderCursor.java b/src/com/android/launcher3/model/LoaderCursor.java
index 19d9af98dc..532834eeb8 100644
--- a/src/com/android/launcher3/model/LoaderCursor.java
+++ b/src/com/android/launcher3/model/LoaderCursor.java
@@ -35,13 +35,11 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.util.LongSparseArray;
 
-import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherSettings;
-import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.Workspace;
 import com.android.launcher3.config.FeatureFlags;
@@ -94,9 +92,6 @@ public class LoaderCursor extends CursorWrapper {
     private final int restoredIndex;
     private final int intentIndex;
 
-    @Nullable
-    private LauncherActivityInfo mActivityInfo;
-
     // Properties loaded per iteration
     public long serialNumber;
     public UserHandle user;
@@ -137,8 +132,6 @@ public class LoaderCursor extends CursorWrapper {
     public boolean moveToNext() {
         boolean result = super.moveToNext();
         if (result) {
-            mActivityInfo = null;
-
             // Load common properties.
             itemType = getInt(itemTypeIndex);
             container = getInt(containerIndex);
@@ -252,10 +245,6 @@ public class LoaderCursor extends CursorWrapper {
         return info;
     }
 
-    public LauncherActivityInfo getLauncherActivityInfo() {
-        return mActivityInfo;
-    }
-
     /**
      * Make an WorkspaceItemInfo object for a shortcut that is an application.
      */
@@ -275,25 +264,25 @@ public class LoaderCursor extends CursorWrapper {
         Intent newIntent = new Intent(Intent.ACTION_MAIN, null);
         newIntent.addCategory(Intent.CATEGORY_LAUNCHER);
         newIntent.setComponent(componentName);
-        mActivityInfo = mContext.getSystemService(LauncherApps.class)
+        LauncherActivityInfo lai = mContext.getSystemService(LauncherApps.class)
                 .resolveActivity(newIntent, user);
-        if ((mActivityInfo == null) && !allowMissingTarget) {
+        if ((lai == null) && !allowMissingTarget) {
             Log.d(TAG, "Missing activity found in getShortcutInfo: " + componentName);
             return null;
         }
 
         final WorkspaceItemInfo info = new WorkspaceItemInfo();
-        info.itemType = Favorites.ITEM_TYPE_APPLICATION;
+        info.itemType = LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
         info.user = user;
         info.intent = newIntent;
 
-        mIconCache.getTitleAndIcon(info, mActivityInfo, useLowResIcon);
+        mIconCache.getTitleAndIcon(info, lai, useLowResIcon);
         if (mIconCache.isDefaultIcon(info.bitmap, user)) {
             loadIcon(info);
         }
 
-        if (mActivityInfo != null) {
-            AppInfo.updateRuntimeFlagsForActivityTarget(info, mActivityInfo);
+        if (lai != null) {
+            AppInfo.updateRuntimeFlagsForActivityTarget(info, lai);
         }
 
         // from the db
diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index f74c8b5c1c..8e085ce52d 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -69,7 +69,6 @@ import com.android.launcher3.logging.FileLog;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
@@ -592,24 +591,11 @@ public class LoaderTask implements Runnable {
                                 if (c.restoreFlag != 0 && !TextUtils.isEmpty(targetPkg)) {
                                     tempPackageKey.update(targetPkg, c.user);
                                     SessionInfo si = installingPkgs.get(tempPackageKey);
-                                        LauncherActivityInfo activityInfo =
-                                                c.getLauncherActivityInfo();
-                                        if (si == null) {
-                                            info.runtimeStatusFlags &=
-                                                    ~ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE;
-                                        } else if (activityInfo == null) {
-                                            int installProgress = (int) (si.getProgress() * 100);
-
-                                            info.setProgressLevel(
-                                                    installProgress,
-                                                    PackageInstallInfo.STATUS_INSTALLING);
-                                        } else {
-                                            info.setProgressLevel(
-                                                    PackageManagerHelper
-                                                            .getLoadingProgress(activityInfo),
-                                                    PackageInstallInfo
-                                                            .STATUS_INSTALLED_DOWNLOADING);
-                                        }
+                                    if (si == null) {
+                                        info.status &= ~WorkspaceItemInfo.FLAG_INSTALL_SESSION_ACTIVE;
+                                    } else {
+                                        info.setInstallProgress((int) (si.getProgress() * 100));
+                                    }
                                 }
 
                                 c.checkAndAddItem(info, mBgDataModel);
diff --git a/src/com/android/launcher3/model/PackageIncrementalDownloadUpdatedTask.java b/src/com/android/launcher3/model/PackageIncrementalDownloadUpdatedTask.java
deleted file mode 100644
index e3e87693b1..0000000000
--- a/src/com/android/launcher3/model/PackageIncrementalDownloadUpdatedTask.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.model;
-
-import android.content.ComponentName;
-import android.os.UserHandle;
-
-import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.model.data.AppInfo;
-import com.android.launcher3.model.data.ItemInfoWithIcon;
-import com.android.launcher3.model.data.WorkspaceItemInfo;
-import com.android.launcher3.pm.PackageInstallInfo;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Handles updates due to incremental download progress updates.
- */
-public class PackageIncrementalDownloadUpdatedTask extends BaseModelUpdateTask {
-
-    private final UserHandle mUser;
-    private final int mProgress;
-    private final String mPackageName;
-
-    public PackageIncrementalDownloadUpdatedTask(
-            String packageName, UserHandle user, float progress) {
-        mUser = user;
-        mProgress = 1 - progress > 0.001 ? (int) (100 * progress) : 100;
-        mPackageName = packageName;
-    }
-
-    @Override
-    public void execute(LauncherAppState app, BgDataModel dataModel, AllAppsList appsList) {
-        PackageInstallInfo downloadInfo = new PackageInstallInfo(
-                mPackageName,
-                PackageInstallInfo.STATUS_INSTALLED_DOWNLOADING,
-                mProgress,
-                mUser);
-
-        synchronized (appsList) {
-            List<AppInfo> updatedAppInfos = appsList.updatePromiseInstallInfo(downloadInfo);
-            if (!updatedAppInfos.isEmpty()) {
-                for (AppInfo appInfo : updatedAppInfos) {
-                    appInfo.runtimeStatusFlags &= ~ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE;
-                    scheduleCallbackTask(
-                            c -> c.bindIncrementalDownloadProgressUpdated(appInfo));
-                }
-            }
-            bindApplicationsIfNeeded();
-        }
-
-        final ArrayList<WorkspaceItemInfo> updatedWorkspaceItems = new ArrayList<>();
-        synchronized (dataModel) {
-            dataModel.forAllWorkspaceItemInfos(mUser, si -> {
-                ComponentName cn = si.getTargetComponent();
-                if ((cn != null) && cn.getPackageName().equals(mPackageName)) {
-                    si.runtimeStatusFlags &= ~ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE;
-                    si.setProgressLevel(downloadInfo);
-                    updatedWorkspaceItems.add(si);
-                }
-            });
-        }
-        bindUpdatedWorkspaceItems(updatedWorkspaceItems);
-    }
-}
diff --git a/src/com/android/launcher3/model/PackageInstallStateChangedTask.java b/src/com/android/launcher3/model/PackageInstallStateChangedTask.java
index 8215edd90b..8369c48e5c 100644
--- a/src/com/android/launcher3/model/PackageInstallStateChangedTask.java
+++ b/src/com/android/launcher3/model/PackageInstallStateChangedTask.java
@@ -20,15 +20,14 @@ import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 
 import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
+import com.android.launcher3.model.data.PromiseAppInfo;
+import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pm.PackageInstallInfo;
 import com.android.launcher3.util.InstantAppResolver;
 
 import java.util.HashSet;
-import java.util.List;
 
 /**
  * Handles changes due to a sessions updates for a currently installing app.
@@ -60,11 +59,9 @@ public class PackageInstallStateChangedTask extends BaseModelUpdateTask {
         }
 
         synchronized (apps) {
-            List<AppInfo> updatedAppInfos = apps.updatePromiseInstallInfo(mInstallInfo);
-            if (!updatedAppInfos.isEmpty()) {
-                for (AppInfo appInfo : updatedAppInfos) {
-                    scheduleCallbackTask(c -> c.bindIncrementalDownloadProgressUpdated(appInfo));
-                }
+            PromiseAppInfo updated = apps.updatePromiseInstallInfo(mInstallInfo);
+            if (updated != null) {
+                scheduleCallbackTask(c -> c.bindPromiseAppProgressUpdated(updated));
             }
             bindApplicationsIfNeeded();
         }
@@ -74,13 +71,11 @@ public class PackageInstallStateChangedTask extends BaseModelUpdateTask {
             dataModel.forAllWorkspaceItemInfos(mInstallInfo.user, si -> {
                 ComponentName cn = si.getTargetComponent();
                 if (si.hasPromiseIconUi() && (cn != null)
-                        && cn.getPackageName().equals(mInstallInfo.packageName)) {
-                    int installProgress = mInstallInfo.progress;
-
-                    si.setProgressLevel(installProgress, PackageInstallInfo.STATUS_INSTALLING);
+                        && mInstallInfo.packageName.equals(cn.getPackageName())) {
+                    si.setInstallProgress(mInstallInfo.progress);
                     if (mInstallInfo.state == PackageInstallInfo.STATUS_FAILED) {
                         // Mark this info as broken.
-                        si.runtimeStatusFlags &= ~ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE;
+                        si.status &= ~WorkspaceItemInfo.FLAG_INSTALL_SESSION_ACTIVE;
                     }
                     updates.add(si);
                 }
diff --git a/src/com/android/launcher3/model/data/AppInfo.java b/src/com/android/launcher3/model/data/AppInfo.java
index 39247c221f..aee1f2a65b 100644
--- a/src/com/android/launcher3/model/data/AppInfo.java
+++ b/src/com/android/launcher3/model/data/AppInfo.java
@@ -28,13 +28,10 @@ import android.os.Process;
 import android.os.UserHandle;
 import android.os.UserManager;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.pm.PackageInstallInfo;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.PackageManagerHelper;
 
@@ -107,37 +104,13 @@ public class AppInfo extends ItemInfoWithIcon {
         this.intent = intent;
     }
 
-    public AppInfo(@NonNull PackageInstallInfo installInfo) {
-        componentName = installInfo.componentName;
-        intent = new Intent(Intent.ACTION_MAIN)
-            .addCategory(Intent.CATEGORY_LAUNCHER)
-            .setComponent(componentName)
-            .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
-                | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
-        user = installInfo.user;
-    }
-
     @Override
     protected String dumpProperties() {
         return super.dumpProperties() + " componentName=" + componentName;
     }
 
     public WorkspaceItemInfo makeWorkspaceItem() {
-        WorkspaceItemInfo workspaceItemInfo = new WorkspaceItemInfo(this);
-
-        if ((runtimeStatusFlags & FLAG_INSTALL_SESSION_ACTIVE) != 0) {
-            // We need to update the component name when the apk is installed
-            workspaceItemInfo.status |= WorkspaceItemInfo.FLAG_AUTOINSTALL_ICON;
-            // Since the user is manually placing it on homescreen, it should not be auto-removed
-            // later
-            workspaceItemInfo.status |= WorkspaceItemInfo.FLAG_RESTORE_STARTED;
-            workspaceItemInfo.status |= FLAG_INSTALL_SESSION_ACTIVE;
-        }
-        if ((runtimeStatusFlags & FLAG_INCREMENTAL_DOWNLOAD_ACTIVE) != 0) {
-            workspaceItemInfo.runtimeStatusFlags |= FLAG_INCREMENTAL_DOWNLOAD_ACTIVE;
-        }
-
-        return workspaceItemInfo;
+        return new WorkspaceItemInfo(this);
     }
 
     public ComponentKey toComponentKey() {
@@ -156,12 +129,6 @@ public class AppInfo extends ItemInfoWithIcon {
                         | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
     }
 
-    @Nullable
-    @Override
-    public ComponentName getTargetComponent() {
-        return componentName;
-    }
-
     public static void updateRuntimeFlagsForActivityTarget(
             ItemInfoWithIcon info, LauncherActivityInfo lai) {
         ApplicationInfo appInfo = lai.getApplicationInfo();
@@ -176,11 +143,6 @@ public class AppInfo extends ItemInfoWithIcon {
             // The icon for a non-primary user is badged, hence it's not exactly an adaptive icon.
             info.runtimeStatusFlags |= FLAG_ADAPTIVE_ICON;
         }
-
-        // Sets the progress level, installation and incremental download flags.
-        info.setProgressLevel(
-                PackageManagerHelper.getLoadingProgress(lai),
-                PackageInstallInfo.STATUS_INSTALLED);
     }
 
     @Override
diff --git a/src/com/android/launcher3/model/data/ItemInfoWithIcon.java b/src/com/android/launcher3/model/data/ItemInfoWithIcon.java
index b8a71d33e0..d95f94f79f 100644
--- a/src/com/android/launcher3/model/data/ItemInfoWithIcon.java
+++ b/src/com/android/launcher3/model/data/ItemInfoWithIcon.java
@@ -16,15 +16,7 @@
 
 package com.android.launcher3.model.data;
 
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-
-import androidx.annotation.Nullable;
-
 import com.android.launcher3.icons.BitmapInfo;
-import com.android.launcher3.pm.PackageInstallInfo;
-import com.android.launcher3.util.PackageManagerHelper;
 
 /**
  * Represents an ItemInfo which also holds an icon.
@@ -95,35 +87,12 @@ public abstract class ItemInfoWithIcon extends ItemInfo {
      */
     public static final int FLAG_ICON_BADGED = 1 << 9;
 
-    /**
-     * The icon is being installed. If {@link WorkspaceItemInfo#FLAG_RESTORED_ICON} or
-     * {@link WorkspaceItemInfo#FLAG_AUTOINSTALL_ICON} is set, then the icon is either being
-     * installed or is in a broken state.
-     */
-    public static final int FLAG_INSTALL_SESSION_ACTIVE = 1 << 10;
-
-    /**
-     * This icon is still being downloaded.
-     */
-    public static final int FLAG_INCREMENTAL_DOWNLOAD_ACTIVE = 1 << 11;
-
-    public static final int FLAG_SHOW_DOWNLOAD_PROGRESS_MASK = FLAG_INSTALL_SESSION_ACTIVE
-            | FLAG_INCREMENTAL_DOWNLOAD_ACTIVE;
-
     /**
      * Status associated with the system state of the underlying item. This is calculated every
      * time a new info is created and not persisted on the disk.
      */
     public int runtimeStatusFlags = 0;
 
-    /**
-     * The download progress of the package that this shortcut represents. For legacy apps, this
-     * will always be the installation progress. For apps that support incremental downloads, this
-     * will only match be the installation progress until the app is installed, then this will the
-     * total download progress.
-     */
-    private int mProgressLevel = 100;
-
     protected ItemInfoWithIcon() { }
 
     protected ItemInfoWithIcon(ItemInfoWithIcon info) {
@@ -144,72 +113,6 @@ public abstract class ItemInfoWithIcon extends ItemInfo {
         return bitmap.isLowRes();
     }
 
-    /**
-     * Returns whether the app this shortcut represents is able to be started. For legacy apps,
-     * this returns whether it is fully installed. For apps that support incremental downloads,
-     * this returns whether the app is either fully downloaded or has installed and is downloading
-     * incrementally.
-     */
-    public boolean isAppStartable() {
-        return ((runtimeStatusFlags & FLAG_INSTALL_SESSION_ACTIVE) == 0)
-                && (((runtimeStatusFlags & FLAG_INCREMENTAL_DOWNLOAD_ACTIVE) != 0)
-                    || mProgressLevel == 100);
-    }
-
-    /**
-     * Returns the download progress for the app this shortcut represents. If this app is not yet
-     * installed or does not support incremental downloads, this will return the installation
-     * progress.
-     */
-    public int getProgressLevel() {
-        if ((runtimeStatusFlags & FLAG_SHOW_DOWNLOAD_PROGRESS_MASK) != 0) {
-            return mProgressLevel;
-        }
-        return 100;
-    }
-
-    /**
-     * Sets the download progress for the app this shortcut represents. If this app is not yet
-     * installed or does not support incremental downloads, this will set
-     * {@code FLAG_INSTALL_SESSION_ACTIVE}. If this app is downloading incrementally, this will
-     * set {@code FLAG_INCREMENTAL_DOWNLOAD_ACTIVE}. Otherwise, this will remove both flags.
-     */
-    public void setProgressLevel(PackageInstallInfo installInfo) {
-        setProgressLevel(installInfo.progress, installInfo.state);
-    }
-
-    /**
-     * Sets the download progress for the app this shortcut represents.
-     */
-    public void setProgressLevel(int progress, int status) {
-        if (status == PackageInstallInfo.STATUS_INSTALLING) {
-            mProgressLevel = progress;
-            runtimeStatusFlags = progress < 100
-                    ? runtimeStatusFlags | FLAG_INSTALL_SESSION_ACTIVE
-                    : runtimeStatusFlags & ~FLAG_INSTALL_SESSION_ACTIVE;
-        } else if (status == PackageInstallInfo.STATUS_INSTALLED_DOWNLOADING) {
-            mProgressLevel = progress;
-            runtimeStatusFlags = runtimeStatusFlags & ~FLAG_INSTALL_SESSION_ACTIVE;
-            runtimeStatusFlags = progress < 100
-                    ? runtimeStatusFlags | FLAG_INCREMENTAL_DOWNLOAD_ACTIVE
-                    : runtimeStatusFlags & ~FLAG_INCREMENTAL_DOWNLOAD_ACTIVE;
-        } else {
-            mProgressLevel = status == PackageInstallInfo.STATUS_INSTALLED ? 100 : 0;
-            runtimeStatusFlags = runtimeStatusFlags & ~FLAG_INSTALL_SESSION_ACTIVE;
-            runtimeStatusFlags = runtimeStatusFlags & ~FLAG_INCREMENTAL_DOWNLOAD_ACTIVE;
-        }
-    }
-
-    /** Creates an intent to that launches the app store at this app's page. */
-    @Nullable
-    public Intent getMarketIntent(Context context) {
-        ComponentName componentName = getTargetComponent();
-
-        return componentName != null
-                ? new PackageManagerHelper(context).getMarketIntent(componentName.getPackageName())
-                : null;
-    }
-
     /**
      * @return a copy of this
      */
diff --git a/src/com/android/launcher3/model/data/PromiseAppInfo.java b/src/com/android/launcher3/model/data/PromiseAppInfo.java
new file mode 100644
index 0000000000..b6231ede19
--- /dev/null
+++ b/src/com/android/launcher3/model/data/PromiseAppInfo.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.model.data;
+
+import android.content.Context;
+import android.content.Intent;
+
+import androidx.annotation.NonNull;
+
+import com.android.launcher3.pm.PackageInstallInfo;
+import com.android.launcher3.util.PackageManagerHelper;
+
+public class PromiseAppInfo extends AppInfo {
+
+    public int level = 0;
+
+    public PromiseAppInfo(@NonNull PackageInstallInfo installInfo) {
+        componentName = installInfo.componentName;
+        intent = new Intent(Intent.ACTION_MAIN)
+                .addCategory(Intent.CATEGORY_LAUNCHER)
+                .setComponent(componentName)
+                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                        | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
+    }
+
+    @Override
+    public WorkspaceItemInfo makeWorkspaceItem() {
+        WorkspaceItemInfo shortcut = new WorkspaceItemInfo(this);
+        shortcut.setInstallProgress(level);
+        // We need to update the component name when the apk is installed
+        shortcut.status |= WorkspaceItemInfo.FLAG_AUTOINSTALL_ICON;
+        // Since the user is manually placing it on homescreen, it should not be auto-removed later
+        shortcut.status |= WorkspaceItemInfo.FLAG_RESTORE_STARTED;
+        return shortcut;
+    }
+
+    public Intent getMarketIntent(Context context) {
+        return new PackageManagerHelper(context).getMarketIntent(componentName.getPackageName());
+    }
+}
diff --git a/src/com/android/launcher3/model/data/WorkspaceItemInfo.java b/src/com/android/launcher3/model/data/WorkspaceItemInfo.java
index 690e904a02..1e1d093b13 100644
--- a/src/com/android/launcher3/model/data/WorkspaceItemInfo.java
+++ b/src/com/android/launcher3/model/data/WorkspaceItemInfo.java
@@ -57,15 +57,21 @@ public class WorkspaceItemInfo extends ItemInfoWithIcon {
      */
     public static final int FLAG_AUTOINSTALL_ICON = 1 << 1;
 
+    /**
+     * The icon is being installed. If {@link #FLAG_RESTORED_ICON} or {@link #FLAG_AUTOINSTALL_ICON}
+     * is set, then the icon is either being installed or is in a broken state.
+     */
+    public static final int FLAG_INSTALL_SESSION_ACTIVE = 1 << 2;
+
     /**
      * Indicates that the widget restore has started.
      */
-    public static final int FLAG_RESTORE_STARTED = 1 << 2;
+    public static final int FLAG_RESTORE_STARTED = 1 << 3;
 
     /**
      * Web UI supported.
      */
-    public static final int FLAG_SUPPORTS_WEB_UI = 1 << 3;
+    public static final int FLAG_SUPPORTS_WEB_UI = 1 << 4;
 
     /**
      * The intent used to start the application.
@@ -92,6 +98,11 @@ public class WorkspaceItemInfo extends ItemInfoWithIcon {
      */
     @NonNull private String[] personKeys = Utilities.EMPTY_STRING_ARRAY;
 
+    /**
+     * The installation progress [0-100] of the package that this shortcut represents.
+     */
+    private int mInstallProgress;
+
 
     public WorkspaceItemInfo() {
         itemType = LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT;
@@ -103,6 +114,7 @@ public class WorkspaceItemInfo extends ItemInfoWithIcon {
         intent = new Intent(info.intent);
         iconResource = info.iconResource;
         status = info.status;
+        mInstallProgress = info.mInstallProgress;
         personKeys = info.personKeys.clone();
     }
 
@@ -156,6 +168,15 @@ public class WorkspaceItemInfo extends ItemInfoWithIcon {
         return isPromise() && !hasStatusFlag(FLAG_SUPPORTS_WEB_UI);
     }
 
+    public int getInstallProgress() {
+        return mInstallProgress;
+    }
+
+    public void setInstallProgress(int progress) {
+        mInstallProgress = progress;
+        status |= FLAG_INSTALL_SESSION_ACTIVE;
+    }
+
     public void updateFromDeepShortcutInfo(ShortcutInfo shortcutInfo, Context context) {
         // {@link ShortcutInfo#getActivity} can change during an update. Recreate the intent
         intent = ShortcutKey.makeIntent(shortcutInfo);
diff --git a/src/com/android/launcher3/pm/PackageInstallInfo.java b/src/com/android/launcher3/pm/PackageInstallInfo.java
index fad904f968..7997d16756 100644
--- a/src/com/android/launcher3/pm/PackageInstallInfo.java
+++ b/src/com/android/launcher3/pm/PackageInstallInfo.java
@@ -25,8 +25,7 @@ public final class PackageInstallInfo {
 
     public static final int STATUS_INSTALLED = 0;
     public static final int STATUS_INSTALLING = 1;
-    public static final int STATUS_INSTALLED_DOWNLOADING = 2;
-    public static final int STATUS_FAILED = 3;
+    public static final int STATUS_FAILED = 2;
 
     public final ComponentName componentName;
     public final String packageName;
@@ -57,4 +56,5 @@ public final class PackageInstallInfo {
     public static PackageInstallInfo fromState(int state, String packageName, UserHandle user) {
         return new PackageInstallInfo(packageName, state, 0 /* progress */, user);
     }
+
 }
diff --git a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
index 026634529f..b496608ac5 100644
--- a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
+++ b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
@@ -35,8 +35,8 @@ import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.model.BgDataModel;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
+import com.android.launcher3.model.data.PromiseAppInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.popup.PopupContainerWithArrow;
 import com.android.launcher3.popup.PopupDataProvider;
@@ -215,8 +215,8 @@ public class SecondaryDisplayLauncher extends BaseDraggingActivity
             ArrayList<ItemInfo> addAnimated) { }
 
     @Override
-    public void bindIncrementalDownloadProgressUpdated(AppInfo app) {
-        mAppsView.getAppsStore().updateProgressBar(app);
+    public void bindPromiseAppProgressUpdated(PromiseAppInfo app) {
+        mAppsView.getAppsStore().updatePromiseAppProgress(app);
     }
 
     @Override
@@ -315,11 +315,9 @@ public class SecondaryDisplayLauncher extends BaseDraggingActivity
         if (tag instanceof ItemInfo) {
             ItemInfo item = (ItemInfo) tag;
             Intent intent;
-            if (item instanceof ItemInfoWithIcon
-                    && (((ItemInfoWithIcon) item).runtimeStatusFlags
-                        & ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE) != 0) {
-                ItemInfoWithIcon appInfo = (ItemInfoWithIcon) item;
-                intent = appInfo.getMarketIntent(this);
+            if (item instanceof PromiseAppInfo) {
+                PromiseAppInfo promiseAppInfo = (PromiseAppInfo) item;
+                intent = promiseAppInfo.getMarketIntent(this);
             } else {
                 intent = item.getIntent();
             }
diff --git a/src/com/android/launcher3/touch/ItemClickHandler.java b/src/com/android/launcher3/touch/ItemClickHandler.java
index 41587357f5..9b9cb0a61b 100644
--- a/src/com/android/launcher3/touch/ItemClickHandler.java
+++ b/src/com/android/launcher3/touch/ItemClickHandler.java
@@ -49,8 +49,8 @@ import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
+import com.android.launcher3.model.data.PromiseAppInfo;
 import com.android.launcher3.model.data.RemoteActionItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pm.InstallSessionHelper;
@@ -231,12 +231,8 @@ public class ItemClickHandler {
                     ? shortcut.getIntent().getComponent().getPackageName()
                     : shortcut.getIntent().getPackage();
             if (!TextUtils.isEmpty(packageName)) {
-                onClickPendingAppItem(
-                        v,
-                        launcher,
-                        packageName,
-                        (shortcut.runtimeStatusFlags
-                                & ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE) != 0);
+                onClickPendingAppItem(v, launcher, packageName,
+                        shortcut.hasStatusFlag(WorkspaceItemInfo.FLAG_INSTALL_SESSION_ACTIVE));
                 return;
             }
         }
@@ -270,12 +266,9 @@ public class ItemClickHandler {
         TestLogging.recordEvent(
                 TestProtocol.SEQUENCE_MAIN, "start: startAppShortcutOrInfoActivity");
         Intent intent;
-        if (item instanceof ItemInfoWithIcon
-                && (((ItemInfoWithIcon) item).runtimeStatusFlags
-                    & ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE) != 0) {
-            ItemInfoWithIcon appInfo = (ItemInfoWithIcon) item;
-            intent = new PackageManagerHelper(launcher)
-                    .getMarketIntent(appInfo.getTargetComponent().getPackageName());
+        if (item instanceof PromiseAppInfo) {
+            PromiseAppInfo promiseAppInfo = (PromiseAppInfo) item;
+            intent = promiseAppInfo.getMarketIntent(launcher);
         } else {
             intent = item.getIntent();
         }
diff --git a/src/com/android/launcher3/util/PackageManagerHelper.java b/src/com/android/launcher3/util/PackageManagerHelper.java
index 7b264275d4..523545af43 100644
--- a/src/com/android/launcher3/util/PackageManagerHelper.java
+++ b/src/com/android/launcher3/util/PackageManagerHelper.java
@@ -45,11 +45,10 @@ import android.widget.Toast;
 
 import com.android.launcher3.PendingAddItemInfo;
 import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
+import com.android.launcher3.model.data.PromiseAppInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 
 import java.net.URISyntaxException;
@@ -201,12 +200,9 @@ public class PackageManagerHelper {
      * Starts the details activity for {@code info}
      */
     public void startDetailsActivityForInfo(ItemInfo info, Rect sourceBounds, Bundle opts) {
-        if (info instanceof ItemInfoWithIcon
-                && (((ItemInfoWithIcon) info).runtimeStatusFlags
-                    & ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE) != 0) {
-            ItemInfoWithIcon appInfo = (ItemInfoWithIcon) info;
-            mContext.startActivity(new PackageManagerHelper(mContext)
-                    .getMarketIntent(appInfo.getTargetComponent().getPackageName()));
+        if (info instanceof PromiseAppInfo) {
+            PromiseAppInfo promiseAppInfo = (PromiseAppInfo) info;
+            mContext.startActivity(promiseAppInfo.getMarketIntent(mContext));
             return;
         }
         ComponentName componentName = null;
@@ -323,12 +319,4 @@ public class PackageManagerHelper {
         }
         return false;
     }
-
-    /** Returns the incremental download progress for the given shortcut's app. */
-    public static int getLoadingProgress(LauncherActivityInfo info) {
-        if (Utilities.ATLEAST_S) {
-            return (int) (100 * info.getLoadingProgress());
-        }
-        return 100;
-    }
 }
-- 
GitLab


From 12d8222124ea9f24e8dd7daa7336ae04b4074ce3 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Thu, 7 Jan 2021 14:50:52 -0800
Subject: [PATCH 0381/1664] Starting CUJ_APP_CLOSE_TO_HOME metric earlier

Now starting it at the very start of the gesture.

Test: Manual
Bug: 174892351
Change-Id: I9c36b4e4ae51302fc1c6b99b825358fb647cd310
---
 .../android/quickstep/AbsSwipeUpHandler.java  | 21 ++++++++-----------
 .../quickstep/RecentsAnimationController.java |  1 +
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index f82bc2d698..5f196feaa1 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -723,6 +723,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
     public void onGestureStarted(boolean isLikelyToStartNewTask) {
         InteractionJankMonitorWrapper.begin(
                 InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH, 2000 /* ms timeout */);
+        InteractionJankMonitorWrapper.begin(
+                InteractionJankMonitorWrapper.CUJ_APP_CLOSE_TO_HOME);
         notifyGestureStartedAsync();
         setIsLikelyToStartNewTask(isLikelyToStartNewTask, false /* animate */);
         mStateCallback.setStateOnUiThread(STATE_GESTURE_STARTED);
@@ -802,6 +804,13 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         // Fast-finish the attaching animation if it's still running.
         maybeUpdateRecentsAttachedState(false);
         final GestureEndTarget endTarget = mGestureState.getEndTarget();
+        if (endTarget != NEW_TASK) {
+            InteractionJankMonitorWrapper.cancel(InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH);
+        }
+        if (endTarget != HOME) {
+            InteractionJankMonitorWrapper.cancel(
+                    InteractionJankMonitorWrapper.CUJ_APP_CLOSE_TO_HOME);
+        }
         switch (endTarget) {
             case HOME:
                 mStateCallback.setState(STATE_SCALED_CONTROLLER_HOME | STATE_CAPTURE_SCREENSHOT);
@@ -820,9 +829,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                 break;
         }
         ActiveGestureLog.INSTANCE.addLog("onSettledOnEndTarget " + endTarget);
-        if (endTarget != NEW_TASK) {
-            InteractionJankMonitorWrapper.cancel(InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH);
-        }
     }
 
     /** @return Whether this was the task we were waiting to appear, and thus handled it. */
@@ -1219,11 +1225,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         anim.addOnUpdateListener((r, p) -> {
             updateSysUiFlags(Math.max(p, mCurrentShift.value));
         });
-        final int cuj = InteractionJankMonitorWrapper.CUJ_APP_CLOSE_TO_HOME;
         anim.addAnimatorListener(new AnimationSuccessListener() {
             @Override
             public void onAnimationStart(Animator animation) {
-                InteractionJankMonitorWrapper.begin(cuj);
                 if (mActivity != null) {
                     removeLiveTileOverlay();
                 }
@@ -1237,13 +1241,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                 // Make sure recents is in its final state
                 maybeUpdateRecentsAttachedState(false);
                 mActivityInterface.onSwipeUpToHomeComplete(mDeviceState);
-                InteractionJankMonitorWrapper.end(cuj);
-            }
-
-            @Override
-            public void onAnimationCancel(Animator animation) {
-                super.onAnimationCancel(animation);
-                InteractionJankMonitorWrapper.cancel(cuj);
             }
         });
         if (mRecentsAnimationTargets != null) {
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationController.java b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
index bc5e18dab1..646c5a0592 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationController.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
@@ -136,6 +136,7 @@ public class RecentsAnimationController {
         UI_HELPER_EXECUTOR.execute(() -> {
             mController.finish(toRecents, sendUserLeaveHint);
             InteractionJankMonitorWrapper.end(InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH);
+            InteractionJankMonitorWrapper.end(InteractionJankMonitorWrapper.CUJ_APP_CLOSE_TO_HOME);
             if (callback != null) {
                 MAIN_EXECUTOR.execute(callback);
             }
-- 
GitLab


From f19c57970680e9424b9c3c30eac1f856f20c8c4c Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Tue, 22 Dec 2020 15:20:14 -0800
Subject: [PATCH 0382/1664] Disable default IME in all apps if
 DISABLE_INITIAL_IME_IN_ALLAPPS is on

Bug: 173447266
Test: manual
Change-Id: Ib5c03b20cc7f09fdc2d066dd20fb7ccbb1e154f5
---
 .../launcher3/allapps/AllAppsTransitionController.java | 10 +++++++---
 src/com/android/launcher3/config/FeatureFlags.java     |  3 +++
 .../touch/AbstractStateChangeTouchController.java      |  4 +++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index f9ab196792..c03619e198 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -142,7 +142,8 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
         float shiftCurrent = progress * mShiftRange;
 
         mAppsView.setTranslationY(shiftCurrent);
-        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()
+                && !FeatureFlags.DISABLE_INITIAL_IME_IN_ALLAPPS.get()) {
             mInsetController.setProgress(progress);
         }
     }
@@ -233,7 +234,9 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
     public void setupViews(AllAppsContainerView appsView, ScrimView scrimView) {
         mAppsView = appsView;
         mScrimView = scrimView;
-        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && BuildCompat.isAtLeastR()) {
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()
+                && !FeatureFlags.DISABLE_INITIAL_IME_IN_ALLAPPS.get()
+                && BuildCompat.isAtLeastR()) {
             mInsetController = new AllAppsInsetTransitionController(mShiftRange, mAppsView);
             mLauncher.getSystemUiController().updateUiState(UI_STATE_ALLAPPS,
                     View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
@@ -261,7 +264,8 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
         if (Float.compare(mProgress, 1f) == 0) {
             mAppsView.reset(false /* animate */);
         }
-        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && BuildCompat.isAtLeastR()) {
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()
+                && !FeatureFlags.DISABLE_INITIAL_IME_IN_ALLAPPS.get() && BuildCompat.isAtLeastR()) {
             mInsetController.onAnimationEnd(mProgress);
             if (Float.compare(mProgress, 0f) == 0) {
                 mLauncher.getLiveSearchManager().start();
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 883eab0159..bd5b30eba1 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -98,6 +98,9 @@ public final class FeatureFlags {
     public static final BooleanFlag ENABLE_DEVICE_SEARCH = getDebugFlag(
             "ENABLE_DEVICE_SEARCH", false, "Allows on device search in all apps");
 
+    public static final BooleanFlag DISABLE_INITIAL_IME_IN_ALLAPPS = getDebugFlag(
+            "DISABLE_INITIAL_IME_IN_ALLAPPS", false, "Disable default IME state in all apps");
+
     public static final BooleanFlag FOLDER_NAME_SUGGEST = new DeviceFlag(
             "FOLDER_NAME_SUGGEST", true,
             "Suggests folder names instead of blank text.");
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index 23baaf08cc..10cd04cfcf 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -261,7 +261,9 @@ public abstract class AbstractStateChangeTouchController
         mCanBlockFling = mFromState == NORMAL;
         mFlingBlockCheck.unblockFling();
         // Must be called after all the animation controllers have been paused
-        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && BuildCompat.isAtLeastR()
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()
+                && !FeatureFlags.DISABLE_INITIAL_IME_IN_ALLAPPS.get()
+                && BuildCompat.isAtLeastR()
                 && (mToState == ALL_APPS || mToState == NORMAL)) {
             mLauncher.getAllAppsController().getInsetController().onDragStart(
                     mFromState == NORMAL ? 1f : 0f);
-- 
GitLab


From e0484de39a46f15006f0eec4ece5be5b78b4fa0f Mon Sep 17 00:00:00 2001
From: Bernardo Rufino <brufino@google.com>
Date: Mon, 11 Jan 2021 18:39:26 +0000
Subject: [PATCH 0383/1664] Add BROADCAST_CLOSE_SYSTEM_DIALOGS to recents
 package

It uses AM.closeSystemDialogs() and should have the permission. I had
created the protection level in ag/13090697 but forgot to actually
request the permission.

Bug: 177228919
Bug: 159105552
Test: atest CloseSystemDialogsTest
Test: atest android.server.wm.WindowMetricsActivityTests#testMetricsMatchesLayoutOnActivityOnCreate
Change-Id: I661dac17f2160ed36adb1a193e739c200169a37d
---
 quickstep/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml
index 4e7c3fa75b..8dab9150c4 100644
--- a/quickstep/AndroidManifest.xml
+++ b/quickstep/AndroidManifest.xml
@@ -27,6 +27,7 @@
         android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
         android:protectionLevel="signatureOrSystem" />
 
+    <uses-permission android:name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS" />
     <uses-permission android:name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS"/>
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
-- 
GitLab


From f725e955cb58771847ec1e073686af8f17eb8218 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Mon, 11 Jan 2021 15:01:58 -0500
Subject: [PATCH 0384/1664] Refactor app open code.

Move all the logic that calculate the app open float properties
to a separate class.

This is in preparation for the new app launch properties.

Change-Id: I1a008b2ea1379cbf667c5ad3ad58ece04bd88185
---
 quickstep/res/values/dimens.xml               |   1 -
 .../QuickstepAppTransitionManagerImpl.java    | 142 ++++++++++--------
 2 files changed, 82 insertions(+), 61 deletions(-)

diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 727fbd3ea1..551f7b0eb1 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -45,7 +45,6 @@
 
     <!-- Launcher app transition -->
     <dimen name="content_trans_y">50dp</dimen>
-    <dimen name="workspace_trans_y">50dp</dimen>
     <dimen name="closing_window_trans_y">115dp</dimen>
 
     <dimen name="recents_empty_message_text_size">16sp</dimen>
diff --git a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
index cc3b7b6a64..108006b5f0 100644
--- a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
@@ -33,7 +33,6 @@ import static com.android.launcher3.config.FeatureFlags.KEYGUARD_ANIMATION;
 import static com.android.launcher3.config.FeatureFlags.SEPARATE_RECENTS_ACTIVITY;
 import static com.android.launcher3.dragndrop.DragLayer.ALPHA_INDEX_TRANSITIONS;
 import static com.android.launcher3.statehandlers.DepthController.DEPTH;
-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;
@@ -149,7 +148,6 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
     private final boolean mIsRtl;
 
     private final float mContentTransY;
-    private final float mWorkspaceTransY;
     private final float mClosingWindowTransY;
     private final float mMaxShadowRadius;
 
@@ -183,7 +181,6 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
 
         Resources res = mLauncher.getResources();
         mContentTransY = res.getDimensionPixelSize(R.dimen.content_trans_y);
-        mWorkspaceTransY = res.getDimensionPixelSize(R.dimen.workspace_trans_y);
         mClosingWindowTransY = res.getDimensionPixelSize(R.dimen.closing_window_trans_y);
         mMaxShadowRadius = res.getDimensionPixelSize(R.dimen.max_shadow_radius);
 
@@ -457,39 +454,11 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                 new SurfaceTransactionApplier(floatingView);
         openingTargets.addReleaseCheck(surfaceApplier);
 
-        // Scale the app icon to take up the entire screen. This simplifies the math when
-        // animating the app window position / scale.
-        float smallestSize = Math.min(windowTargetBounds.height(), windowTargetBounds.width());
-        float maxScaleX = smallestSize / bounds.width();
-        float maxScaleY = smallestSize / bounds.height();
-        float scale = Math.max(maxScaleX, maxScaleY);
-        float startScale = 1f;
-        if (v instanceof BubbleTextView && !(v.getParent() instanceof DeepShortcutView)) {
-            Drawable dr = ((BubbleTextView) v).getIcon();
-            if (dr instanceof FastBitmapDrawable) {
-                startScale = ((FastBitmapDrawable) dr).getAnimatedScale();
-            }
-        }
-        final float initialStartScale = startScale;
-
         int[] dragLayerBounds = new int[2];
         mDragLayer.getLocationOnScreen(dragLayerBounds);
 
-        // Animate the app icon to the center of the window bounds in screen coordinates.
-        float centerX = windowTargetBounds.centerX() - dragLayerBounds[0];
-        float centerY = windowTargetBounds.centerY() - dragLayerBounds[1];
-
-        float dX = centerX - bounds.centerX();
-        float dY = centerY - bounds.centerY();
-
-        boolean useUpwardAnimation = bounds.top > centerY
-                || Math.abs(dY) < mLauncher.getDeviceProfile().cellHeightPx;
-        final long xDuration = useUpwardAnimation ? APP_LAUNCH_CURVED_DURATION
-                : APP_LAUNCH_DOWN_DURATION;
-        final long yDuration = useUpwardAnimation ? APP_LAUNCH_DURATION
-                : APP_LAUNCH_DOWN_CURVED_DURATION;
-        final long alphaDuration = useUpwardAnimation ? APP_LAUNCH_ALPHA_DURATION
-                : APP_LAUNCH_ALPHA_DOWN_DURATION;
+        AnimOpenProperties prop = new AnimOpenProperties(mLauncher.getResources(), mDeviceProfile,
+                windowTargetBounds, bounds, v, dragLayerBounds);
 
         RectF targetBounds = new RectF(windowTargetBounds);
         RectF iconBounds = new RectF();
@@ -511,39 +480,28 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
             }
         });
 
-        float shapeRevealDuration = APP_LAUNCH_DURATION * SHAPE_PROGRESS_DURATION;
-
-        final float startCrop;
-        final float endCrop;
-        if (mDeviceProfile.isVerticalBarLayout()) {
-            startCrop = windowTargetBounds.height();
-            endCrop = windowTargetBounds.width();
-        } else {
-            startCrop = windowTargetBounds.width();
-            endCrop = windowTargetBounds.height();
-        }
-
         final float initialWindowRadius = supportsRoundedCornersOnWindows(mLauncher.getResources())
-                ? startCrop / 2f : 0f;
-        final float windowRadius = mDeviceProfile.isMultiWindowMode
+                ? prop.startCrop / 2f : 0f;
+        final float finalWindowRadius = mDeviceProfile.isMultiWindowMode
                 ? 0 : getWindowCornerRadius(mLauncher.getResources());
+
         appAnimator.addUpdateListener(new MultiValueUpdateListener() {
-            FloatProp mDx = new FloatProp(0, dX, 0, xDuration, AGGRESSIVE_EASE);
-            FloatProp mDy = new FloatProp(0, dY, 0, yDuration, AGGRESSIVE_EASE);
-            FloatProp mScale = new FloatProp(initialStartScale, scale, 0, APP_LAUNCH_DURATION,
+            FloatProp mDx = new FloatProp(0, prop.dX, 0, prop.xDuration, AGGRESSIVE_EASE);
+            FloatProp mDy = new FloatProp(0, prop.dY, 0, prop.yDuration, AGGRESSIVE_EASE);
+            FloatProp mScale = new FloatProp(prop.initialAppIconScale,
+                    prop.finalAppIconScale, 0, APP_LAUNCH_DURATION, EXAGGERATED_EASE);
+            FloatProp mIconAlpha = new FloatProp(prop.iconAlphaStart, 0f,
+                    APP_LAUNCH_ALPHA_START_DELAY, prop.alphaDuration, LINEAR);
+            FloatProp mCroppedSize = new FloatProp(prop.startCrop, prop.endCrop, 0, CROP_DURATION,
                     EXAGGERATED_EASE);
-            FloatProp mIconAlpha = new FloatProp(1f, 0f, APP_LAUNCH_ALPHA_START_DELAY,
-                    alphaDuration, LINEAR);
-            FloatProp mCroppedSize = new FloatProp(startCrop, endCrop, 0, CROP_DURATION,
-                    EXAGGERATED_EASE);
-            FloatProp mWindowRadius = new FloatProp(initialWindowRadius, windowRadius, 0,
+            FloatProp mWindowRadius = new FloatProp(initialWindowRadius, finalWindowRadius, 0,
                     RADIUS_DURATION, EXAGGERATED_EASE);
             FloatProp mShadowRadius = new FloatProp(0, mMaxShadowRadius, 0,
                     APP_LAUNCH_DURATION, EXAGGERATED_EASE);
 
             @Override
             public void onUpdate(float percent) {
-                // Calculate the size.
+                // Calculate the size of the scaled icon.
                 float width = bounds.width() * mScale.value;
                 float height = bounds.height() * mScale.value;
 
@@ -559,7 +517,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                 }
                 crop.set(0, 0, cropWidth, cropHeight);
 
-                // Scale the size to match the crop.
+                // Scale the size of the icon to match the size of the window crop.
                 float scaleX = width / cropWidth;
                 float scaleY = height / cropHeight;
                 float scale = Math.min(1f, Math.max(scaleX, scaleY));
@@ -569,7 +527,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                 float offsetX  = (scaledCropWidth - width) / 2;
                 float offsetY = (scaledCropHeight - height) / 2;
 
-                // Calculate the window position.
+                // Calculate the window position to match the icon position.
                 temp.set(bounds);
                 temp.offset(dragLayerBounds[0], dragLayerBounds[1]);
                 temp.offset(mDx.value, mDy.value);
@@ -586,8 +544,6 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                 iconBounds.right += offsetX;
                 iconBounds.bottom += offsetY;
 
-                float croppedHeight = (windowTargetBounds.height() - crop.height()) * scale;
-                float croppedWidth = (windowTargetBounds.width() - crop.width()) * scale;
                 SurfaceParams[] params = new SurfaceParams[appTargets.length];
                 for (int i = appTargets.length - 1; i >= 0; i--) {
                     RemoteAnimationTargetCompat target = appTargets[i];
@@ -970,4 +926,70 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
             result.setAnimation(anim, mLauncher);
         }
     }
+
+    /**
+     * Class that holds all the variables for the app open animation.
+     */
+    static class AnimOpenProperties {
+
+        public final float startCrop;
+        public final float endCrop;
+
+        public final float dX;
+        public final float dY;
+
+        public final long xDuration;
+        public final long yDuration;
+        public final long alphaDuration;
+
+        public final float initialAppIconScale;
+        public final float finalAppIconScale;
+
+        public final float iconAlphaStart;
+
+        AnimOpenProperties(Resources r, DeviceProfile dp, Rect windowTargetBounds,
+                RectF launcherIconBounds, View view, int[] dragLayerBounds) {
+            // Scale the app icon to take up the entire screen. This simplifies the math when
+            // animating the app window position / scale.
+            float smallestSize = Math.min(windowTargetBounds.height(), windowTargetBounds.width());
+            float maxScaleX = smallestSize / launcherIconBounds.width();
+            float maxScaleY = smallestSize / launcherIconBounds.height();
+            float iconStartScale = 1f;
+            if (view instanceof BubbleTextView && !(view.getParent() instanceof DeepShortcutView)) {
+                Drawable dr = ((BubbleTextView) view).getIcon();
+                if (dr instanceof FastBitmapDrawable) {
+                    iconStartScale = ((FastBitmapDrawable) dr).getAnimatedScale();
+                }
+            }
+
+            initialAppIconScale = iconStartScale;
+            finalAppIconScale = Math.max(maxScaleX, maxScaleY);
+
+            // Animate the app icon to the center of the window bounds in screen coordinates.
+            float centerX = windowTargetBounds.centerX() - dragLayerBounds[0];
+            float centerY = windowTargetBounds.centerY() - dragLayerBounds[1];
+
+            dX = centerX - launcherIconBounds.centerX();
+            dY = centerY - launcherIconBounds.centerY();
+
+            boolean useUpwardAnimation = launcherIconBounds.top > centerY
+                    || Math.abs(dY) < dp.cellHeightPx;
+            xDuration = useUpwardAnimation ? APP_LAUNCH_CURVED_DURATION
+                    : APP_LAUNCH_DOWN_DURATION;
+            yDuration = useUpwardAnimation ? APP_LAUNCH_DURATION
+                    : APP_LAUNCH_DOWN_CURVED_DURATION;
+            alphaDuration = useUpwardAnimation ? APP_LAUNCH_ALPHA_DURATION
+                    : APP_LAUNCH_ALPHA_DOWN_DURATION;
+
+            if (dp.isVerticalBarLayout()) {
+                startCrop = windowTargetBounds.height();
+                endCrop = windowTargetBounds.width();
+            } else {
+                startCrop = windowTargetBounds.width();
+                endCrop = windowTargetBounds.height();
+            }
+
+            iconAlphaStart = 1f;
+        }
+    }
 }
-- 
GitLab


From 9515c8b1c8c265c93de0c643363634f1f670fa85 Mon Sep 17 00:00:00 2001
From: Tiger Huang <tigerhuang@google.com>
Date: Wed, 13 Jan 2021 02:26:47 +0800
Subject: [PATCH 0385/1664] Allow system gesture while ignoring bar visibility

The system gesture is allowed while BEHAVIOR_DEFAULT is applied.

Bug: 168913586
Test: WindowInsetsTests
Change-Id: I840e7cb3e35be6fe53e5cd808b97af24de1e3fb7
---
 .../src/com/android/quickstep/RecentsAnimationDeviceState.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index 74b56e9c40..4301377808 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -24,6 +24,7 @@ import static com.android.quickstep.SysUINavigationMode.Mode.THREE_BUTTONS;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_CLICKABLE;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_ASSIST_GESTURE_CONSTRAINED;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BUBBLES_EXPANDED;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_GLOBAL_ACTIONS_SHOWING;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_HOME_DISABLED;
@@ -383,6 +384,7 @@ public class RecentsAnimationDeviceState implements
      */
     public boolean canStartSystemGesture() {
         boolean canStartWithNavHidden = (mSystemUiStateFlags & SYSUI_STATE_NAV_BAR_HIDDEN) == 0
+                || (mSystemUiStateFlags & SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY) != 0
                 || mRotationTouchHelper.isTaskListFrozen();
         return canStartWithNavHidden
                 && (mSystemUiStateFlags & SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED) == 0
-- 
GitLab


From 6a5f431a7b27fb81ec8cd15a3f81cd8c9649d249 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Tue, 12 Jan 2021 19:30:02 +0000
Subject: [PATCH 0386/1664] Revert "Revert "Add UI updates for incremental app
 installs.""

This reverts commit 229497d1820f49450687bbc558041df97d0bf779.

Reason for revert: Patching bugs

Fixes: 176901235, 176992421, 176884453

Test: manual

Change-Id: I57e13a15e72284564a10761966732ee31d15fd08
---
 .../PackageInstallStateChangedTaskTest.java   |  2 +-
 src/com/android/launcher3/BubbleTextView.java | 50 ++++++----
 src/com/android/launcher3/Launcher.java       |  5 +-
 src/com/android/launcher3/LauncherModel.java  | 10 ++
 src/com/android/launcher3/Utilities.java      |  7 +-
 src/com/android/launcher3/Workspace.java      |  2 +-
 .../launcher3/allapps/AllAppsStore.java       | 12 ++-
 .../launcher3/folder/PreviewItemManager.java  |  6 +-
 .../graphics/PreloadIconDrawable.java         |  4 +-
 .../model/AddWorkspaceItemsTask.java          |  5 +-
 .../android/launcher3/model/AllAppsList.java  | 33 ++++---
 .../android/launcher3/model/BgDataModel.java  |  7 +-
 .../android/launcher3/model/LoaderCursor.java | 23 +++--
 .../android/launcher3/model/LoaderTask.java   | 24 ++++-
 ...PackageIncrementalDownloadUpdatedTask.java | 79 +++++++++++++++
 .../model/PackageInstallStateChangedTask.java | 21 ++--
 .../android/launcher3/model/data/AppInfo.java | 40 +++++++-
 .../model/data/ItemInfoWithIcon.java          | 97 +++++++++++++++++++
 .../launcher3/model/data/PromiseAppInfo.java  | 54 -----------
 .../model/data/WorkspaceItemInfo.java         | 25 +----
 .../launcher3/pm/PackageInstallInfo.java      |  4 +-
 .../SecondaryDisplayLauncher.java             | 14 +--
 .../launcher3/touch/ItemClickHandler.java     | 19 ++--
 .../launcher3/util/PackageManagerHelper.java  | 20 +++-
 24 files changed, 400 insertions(+), 163 deletions(-)
 create mode 100644 src/com/android/launcher3/model/PackageIncrementalDownloadUpdatedTask.java
 delete mode 100644 src/com/android/launcher3/model/data/PromiseAppInfo.java

diff --git a/robolectric_tests/src/com/android/launcher3/model/PackageInstallStateChangedTaskTest.java b/robolectric_tests/src/com/android/launcher3/model/PackageInstallStateChangedTaskTest.java
index e43df21ae9..412ace03ff 100644
--- a/robolectric_tests/src/com/android/launcher3/model/PackageInstallStateChangedTaskTest.java
+++ b/robolectric_tests/src/com/android/launcher3/model/PackageInstallStateChangedTaskTest.java
@@ -67,7 +67,7 @@ public class PackageInstallStateChangedTaskTest {
         for (ItemInfo info : mModelHelper.getBgDataModel().itemsIdMap) {
             if (info instanceof WorkspaceItemInfo) {
                 assertEquals(updates.contains(info.id) ? progress: 0,
-                        ((WorkspaceItemInfo) info).getInstallProgress());
+                        ((WorkspaceItemInfo) info).getProgressLevel());
             } else {
                 assertEquals(updates.contains(info.id) ? progress: -1,
                         ((LauncherAppWidgetInfo) info).installProgress);
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 3eb52adf1a..f44f88b098 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -50,6 +50,7 @@ import android.view.View;
 import android.view.ViewDebug;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
 import androidx.core.graphics.ColorUtils;
 
 import com.android.launcher3.Launcher.OnResumeCallback;
@@ -71,7 +72,6 @@ import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.PackageItemInfo;
-import com.android.launcher3.model.data.PromiseAppInfo;
 import com.android.launcher3.model.data.RemoteActionItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.util.SafeCloseable;
@@ -287,10 +287,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
     public void applyFromWorkspaceItem(WorkspaceItemInfo info, boolean promiseStateChanged) {
         applyIconAndLabel(info);
         setTag(info);
-        if (promiseStateChanged || (info.hasPromiseIconUi())) {
-            applyPromiseState(promiseStateChanged);
-        }
-
+        applyLoadingState(promiseStateChanged);
         applyDotState(info, false /* animate */);
     }
 
@@ -303,9 +300,8 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         // Verify high res immediately
         verifyHighRes();
 
-        if (info instanceof PromiseAppInfo) {
-            PromiseAppInfo promiseAppInfo = (PromiseAppInfo) info;
-            applyProgressLevel(promiseAppInfo.level);
+        if ((info.runtimeStatusFlags & ItemInfoWithIcon.FLAG_SHOW_DOWNLOAD_PROGRESS_MASK) != 0) {
+            applyProgressLevel(info.getProgressLevel());
         }
         applyDotState(info, false /* animate */);
     }
@@ -335,6 +331,10 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         mDotParams.color = IconPalette.getMutedColor(info.bitmap.color, 0.54f);
 
         setIcon(iconDrawable);
+        applyLabel(info);
+    }
+
+    private void applyLabel(ItemInfoWithIcon info) {
         setText(info.title);
         if (info.contentDescription != null) {
             setContentDescription(info.isDisabled()
@@ -595,21 +595,35 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         mLongPressHelper.cancelLongPress();
     }
 
-    public void applyPromiseState(boolean promiseStateChanged) {
+    /** Applies the loading progress value to the progress bar.
+     *
+     * If this app is installing, the progress bar will be updated with the installation progress.
+     * If this app is installed and downloading incrementally, the progress bar will be updated
+     * with the total download progress.
+     */
+    public void applyLoadingState(boolean promiseStateChanged) {
         if (getTag() instanceof WorkspaceItemInfo) {
             WorkspaceItemInfo info = (WorkspaceItemInfo) getTag();
-            final boolean isPromise = info.hasPromiseIconUi();
-            final int progressLevel = isPromise ?
-                    ((info.hasStatusFlag(WorkspaceItemInfo.FLAG_INSTALL_SESSION_ACTIVE) ?
-                            info.getInstallProgress() : 0)) : 100;
-
-            PreloadIconDrawable preloadDrawable = applyProgressLevel(progressLevel);
-            if (preloadDrawable != null && promiseStateChanged) {
-                preloadDrawable.maybePerformFinishedAnimation();
+            int progressLevel = info.getProgressLevel();
+            if ((info.runtimeStatusFlags & ItemInfoWithIcon.FLAG_INCREMENTAL_DOWNLOAD_ACTIVE)
+                    != 0) {
+                updateProgressBarUi(progressLevel, progressLevel == 100);
+            } else if (info.hasPromiseIconUi() || (info.runtimeStatusFlags
+                        & ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE) != 0) {
+                updateProgressBarUi(progressLevel, promiseStateChanged);
             }
         }
     }
 
+    private void updateProgressBarUi(int progressLevel, boolean maybePerformFinishedAnimation) {
+        PreloadIconDrawable preloadDrawable = applyProgressLevel(progressLevel);
+        if (preloadDrawable != null && maybePerformFinishedAnimation) {
+            preloadDrawable.maybePerformFinishedAnimation();
+        }
+    }
+
+    /** Applies the given progress level to the this icon's progress bar. */
+    @Nullable
     public PreloadIconDrawable applyProgressLevel(int progressLevel) {
         if (getTag() instanceof ItemInfoWithIcon) {
             ItemInfoWithIcon info = (ItemInfoWithIcon) getTag();
@@ -629,9 +643,11 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
                 if (mIcon instanceof PreloadIconDrawable) {
                     preloadDrawable = (PreloadIconDrawable) mIcon;
                     preloadDrawable.setLevel(progressLevel);
+                    preloadDrawable.setIsDisabled(!info.isAppStartable());
                 } else {
                     preloadDrawable = newPendingIcon(getContext(), info);
                     preloadDrawable.setLevel(progressLevel);
+                    preloadDrawable.setIsDisabled(!info.isAppStartable());
                     setIcon(preloadDrawable);
                 }
                 return preloadDrawable;
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index a96fabd66e..5b55c4b435 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -137,7 +137,6 @@ import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
-import com.android.launcher3.model.data.PromiseAppInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.notification.NotificationListener;
 import com.android.launcher3.pm.PinRequestHelper;
@@ -2516,8 +2515,8 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     }
 
     @Override
-    public void bindPromiseAppProgressUpdated(PromiseAppInfo app) {
-        mAppsView.getAppsStore().updatePromiseAppProgress(app);
+    public void bindIncrementalDownloadProgressUpdated(AppInfo app) {
+        mAppsView.getAppsStore().updateProgressBar(app);
     }
 
     @Override
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 8458152146..e89b9b060a 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -48,6 +48,7 @@ import com.android.launcher3.model.LoaderResults;
 import com.android.launcher3.model.LoaderTask;
 import com.android.launcher3.model.ModelDelegate;
 import com.android.launcher3.model.ModelWriter;
+import com.android.launcher3.model.PackageIncrementalDownloadUpdatedTask;
 import com.android.launcher3.model.PackageInstallStateChangedTask;
 import com.android.launcher3.model.PackageUpdatedTask;
 import com.android.launcher3.model.ShortcutsChangedTask;
@@ -195,6 +196,15 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi
                 PackageUpdatedTask.OP_UNSUSPEND, user, packageNames));
     }
 
+    @Override
+    public void onPackageLoadingProgressChanged(
+                String packageName, UserHandle user, float progress) {
+        if (Utilities.ATLEAST_S) {
+            enqueueModelUpdateTask(new PackageIncrementalDownloadUpdatedTask(
+                    packageName, user, progress));
+        }
+    }
+
     @Override
     public void onShortcutsChanged(String packageName, List<ShortcutInfo> shortcuts,
             UserHandle user) {
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 5c2f35b981..df5d23428d 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -107,12 +107,13 @@ public final class Utilities {
     public static final String[] EMPTY_STRING_ARRAY = new String[0];
     public static final Person[] EMPTY_PERSON_ARRAY = new Person[0];
 
-    public static final boolean ATLEAST_R = BuildCompat.isAtLeastR();
+    public static final boolean ATLEAST_P = Build.VERSION.SDK_INT >= Build.VERSION_CODES.P;
 
     public static final boolean ATLEAST_Q = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q;
 
-    public static final boolean ATLEAST_P =
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.P;
+    public static final boolean ATLEAST_R = Build.VERSION.SDK_INT >= Build.VERSION_CODES.R;
+
+    public static final boolean ATLEAST_S = BuildCompat.isAtLeastS();
 
     /**
      * Set on a motion event dispatched from the nav bar. See {@link MotionEvent#setEdgeFlags(int)}.
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 777ea3c7d5..65eba20672 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -3154,7 +3154,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         ItemOperator op = (info, v) -> {
             if (info instanceof WorkspaceItemInfo && v instanceof BubbleTextView
                     && updates.contains(info)) {
-                ((BubbleTextView) v).applyPromiseState(false /* promiseStateChanged */);
+                ((BubbleTextView) v).applyLoadingState(false /* promiseStateChanged */);
             } else if (v instanceof PendingAppWidgetHostView
                     && info instanceof LauncherAppWidgetInfo
                     && updates.contains(info)) {
diff --git a/src/com/android/launcher3/allapps/AllAppsStore.java b/src/com/android/launcher3/allapps/AllAppsStore.java
index 3ae0a18137..00bdb70c4a 100644
--- a/src/com/android/launcher3/allapps/AllAppsStore.java
+++ b/src/com/android/launcher3/allapps/AllAppsStore.java
@@ -24,7 +24,6 @@ import android.view.ViewGroup;
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.model.data.PromiseAppInfo;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.PackageUserKey;
 
@@ -145,10 +144,17 @@ public class AllAppsStore {
         });
     }
 
-    public void updatePromiseAppProgress(PromiseAppInfo app) {
+    /**
+     * Sets the AppInfo's associated icon's progress bar.
+     *
+     * If this app is installed and supports incremental downloads, the progress bar will be updated
+     * the app's total download progress. Otherwise, the progress bar will be updated to the app's
+     * installation progress.
+     */
+    public void updateProgressBar(AppInfo app) {
         updateAllIcons((child) -> {
             if (child.getTag() == app) {
-                child.applyProgressLevel(app.level);
+                child.applyProgressLevel(app.getProgressLevel());
             }
         });
     }
diff --git a/src/com/android/launcher3/folder/PreviewItemManager.java b/src/com/android/launcher3/folder/PreviewItemManager.java
index 7f8a15c927..9ae7faf988 100644
--- a/src/com/android/launcher3/folder/PreviewItemManager.java
+++ b/src/com/android/launcher3/folder/PreviewItemManager.java
@@ -39,6 +39,7 @@ import androidx.annotation.NonNull;
 
 import com.android.launcher3.Utilities;
 import com.android.launcher3.graphics.PreloadIconDrawable;
+import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.views.ActivityContext;
 
@@ -394,9 +395,10 @@ public class PreviewItemManager {
     }
 
     private void setDrawable(PreviewItemDrawingParams p, WorkspaceItemInfo item) {
-        if (item.hasPromiseIconUi()) {
+        if (item.hasPromiseIconUi() || (item.runtimeStatusFlags
+                    & ItemInfoWithIcon.FLAG_SHOW_DOWNLOAD_PROGRESS_MASK) != 0) {
             PreloadIconDrawable drawable = newPendingIcon(mContext, item);
-            drawable.setLevel(item.getInstallProgress());
+            drawable.setLevel(item.getProgressLevel());
             p.drawable = drawable;
         } else {
             p.drawable = newIcon(mContext, item);
diff --git a/src/com/android/launcher3/graphics/PreloadIconDrawable.java b/src/com/android/launcher3/graphics/PreloadIconDrawable.java
index e85b056376..9971990267 100644
--- a/src/com/android/launcher3/graphics/PreloadIconDrawable.java
+++ b/src/com/android/launcher3/graphics/PreloadIconDrawable.java
@@ -117,6 +117,8 @@ public class PreloadIconDrawable extends FastBitmapDrawable {
         mIndicatorColor = IconPalette.getPreloadProgressColor(context, mIconColor);
 
         setInternalProgress(0);
+
+        setIsDisabled(!info.isAppStartable());
     }
 
     @Override
@@ -266,14 +268,12 @@ public class PreloadIconDrawable extends FastBitmapDrawable {
             mIconScale = SMALL_SCALE;
             mScaledTrackPath.reset();
             mTrackAlpha = MAX_PAINT_ALPHA;
-            setIsDisabled(true);
         }
 
         if (progress < 1 && progress > 0) {
             mPathMeasure.getSegment(0, progress * mTrackLength, mScaledProgressPath, true);
             mIconScale = SMALL_SCALE;
             mTrackAlpha = MAX_PAINT_ALPHA;
-            setIsDisabled(true);
         } else if (progress >= 1) {
             setIsDisabled(mItem.isDisabled());
             mScaledTrackPath.set(mScaledProgressPath);
diff --git a/src/com/android/launcher3/model/AddWorkspaceItemsTask.java b/src/com/android/launcher3/model/AddWorkspaceItemsTask.java
index c236fa6dec..56dbbd33da 100644
--- a/src/com/android/launcher3/model/AddWorkspaceItemsTask.java
+++ b/src/com/android/launcher3/model/AddWorkspaceItemsTask.java
@@ -34,6 +34,7 @@ import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pm.InstallSessionHelper;
+import com.android.launcher3.pm.PackageInstallInfo;
 import com.android.launcher3.util.GridOccupancy;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.PackageManagerHelper;
@@ -132,7 +133,9 @@ public class AddWorkspaceItemsTask extends BaseModelUpdateTask {
                             continue;
                         }
                     } else {
-                        workspaceInfo.setInstallProgress((int) sessionInfo.getProgress());
+                        workspaceInfo.setProgressLevel(
+                                (int) (sessionInfo.getProgress() * 100),
+                                PackageInstallInfo.STATUS_INSTALLING);
                     }
 
                     if (hasActivity) {
diff --git a/src/com/android/launcher3/model/AllAppsList.java b/src/com/android/launcher3/model/AllAppsList.java
index 2695e66591..8d5cf7422f 100644
--- a/src/com/android/launcher3/model/AllAppsList.java
+++ b/src/com/android/launcher3/model/AllAppsList.java
@@ -21,11 +21,11 @@ import static com.android.launcher3.model.data.AppInfo.EMPTY_ARRAY;
 
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.LauncherActivityInfo;
 import android.content.pm.LauncherApps;
 import android.os.LocaleList;
-import android.os.Process;
 import android.os.UserHandle;
 import android.util.Log;
 
@@ -37,7 +37,6 @@ import com.android.launcher3.compat.AlphabeticIndexCompat;
 import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.model.BgDataModel.Callbacks;
 import com.android.launcher3.model.data.AppInfo;
-import com.android.launcher3.model.data.PromiseAppInfo;
 import com.android.launcher3.pm.PackageInstallInfo;
 import com.android.launcher3.util.FlagOp;
 import com.android.launcher3.util.ItemInfoMatcher;
@@ -150,7 +149,7 @@ public class AllAppsList {
                 .getApplicationInfo(installInfo.packageName, installInfo.user, 0);
         // only if not yet installed
         if (applicationInfo == null) {
-            PromiseAppInfo info = new PromiseAppInfo(installInfo);
+            AppInfo info = new AppInfo(installInfo);
             mIconCache.getTitleAndIcon(info, info.usingLowResIcon());
             info.sectionName = mIndex.computeSectionName(info.title);
 
@@ -159,24 +158,26 @@ public class AllAppsList {
         }
     }
 
-    public PromiseAppInfo updatePromiseInstallInfo(PackageInstallInfo installInfo) {
-        UserHandle user = Process.myUserHandle();
-        for (int i=0; i < data.size(); i++) {
+    /** Updates the given PackageInstallInfo's associated AppInfo's installation info. */
+    public List<AppInfo> updatePromiseInstallInfo(PackageInstallInfo installInfo) {
+        List<AppInfo> updatedAppInfos = new ArrayList<>();
+        UserHandle user = installInfo.user;
+        for (int i = data.size() - 1; i >= 0; i--) {
             final AppInfo appInfo = data.get(i);
             final ComponentName tgtComp = appInfo.getTargetComponent();
             if (tgtComp != null && tgtComp.getPackageName().equals(installInfo.packageName)
-                    && appInfo.user.equals(user)
-                    && appInfo instanceof PromiseAppInfo) {
-                final PromiseAppInfo promiseAppInfo = (PromiseAppInfo) appInfo;
-                if (installInfo.state == PackageInstallInfo.STATUS_INSTALLING) {
-                    promiseAppInfo.level = installInfo.progress;
-                    return promiseAppInfo;
+                    && appInfo.user.equals(user)) {
+                if (installInfo.state == PackageInstallInfo.STATUS_INSTALLED_DOWNLOADING
+                            || installInfo.state == PackageInstallInfo.STATUS_INSTALLING) {
+                    appInfo.setProgressLevel(installInfo);
+
+                    updatedAppInfos.add(appInfo);
                 } else if (installInfo.state == PackageInstallInfo.STATUS_FAILED) {
                     removeApp(i);
                 }
             }
         }
-        return null;
+        return updatedAppInfos;
     }
 
     private void removeApp(int index) {
@@ -268,8 +269,14 @@ public class AllAppsList {
                 if (applicationInfo == null) {
                     add(new AppInfo(context, info, user), info);
                 } else {
+                    Intent launchIntent = AppInfo.makeLaunchIntent(info);
+
                     mIconCache.getTitleAndIcon(applicationInfo, info, true /* useLowResIcon */);
                     applicationInfo.sectionName = mIndex.computeSectionName(applicationInfo.title);
+                    applicationInfo.setProgressLevel(
+                            PackageManagerHelper.getLoadingProgress(info),
+                            PackageInstallInfo.STATUS_INSTALLED_DOWNLOADING);
+                    applicationInfo.intent = launchIntent;
 
                     mDataChanged = true;
                 }
diff --git a/src/com/android/launcher3/model/BgDataModel.java b/src/com/android/launcher3/model/BgDataModel.java
index c217a475a1..2d860a41d3 100644
--- a/src/com/android/launcher3/model/BgDataModel.java
+++ b/src/com/android/launcher3/model/BgDataModel.java
@@ -39,7 +39,6 @@ import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
-import com.android.launcher3.model.data.PromiseAppInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pm.UserCache;
 import com.android.launcher3.shortcuts.ShortcutKey;
@@ -459,7 +458,11 @@ public class BgDataModel {
         void preAddApps();
         void bindAppsAdded(IntArray newScreens,
                 ArrayList<ItemInfo> addNotAnimated, ArrayList<ItemInfo> addAnimated);
-        void bindPromiseAppProgressUpdated(PromiseAppInfo app);
+
+        /**
+         * Binds updated incremental download progress
+         */
+        void bindIncrementalDownloadProgressUpdated(AppInfo app);
         void bindWorkspaceItemsChanged(List<WorkspaceItemInfo> updated);
         void bindWidgetsRestored(ArrayList<LauncherAppWidgetInfo> widgets);
         void bindRestoreItemsChange(HashSet<ItemInfo> updates);
diff --git a/src/com/android/launcher3/model/LoaderCursor.java b/src/com/android/launcher3/model/LoaderCursor.java
index 532834eeb8..19d9af98dc 100644
--- a/src/com/android/launcher3/model/LoaderCursor.java
+++ b/src/com/android/launcher3/model/LoaderCursor.java
@@ -35,11 +35,13 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.util.LongSparseArray;
 
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherSettings;
+import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.Workspace;
 import com.android.launcher3.config.FeatureFlags;
@@ -92,6 +94,9 @@ public class LoaderCursor extends CursorWrapper {
     private final int restoredIndex;
     private final int intentIndex;
 
+    @Nullable
+    private LauncherActivityInfo mActivityInfo;
+
     // Properties loaded per iteration
     public long serialNumber;
     public UserHandle user;
@@ -132,6 +137,8 @@ public class LoaderCursor extends CursorWrapper {
     public boolean moveToNext() {
         boolean result = super.moveToNext();
         if (result) {
+            mActivityInfo = null;
+
             // Load common properties.
             itemType = getInt(itemTypeIndex);
             container = getInt(containerIndex);
@@ -245,6 +252,10 @@ public class LoaderCursor extends CursorWrapper {
         return info;
     }
 
+    public LauncherActivityInfo getLauncherActivityInfo() {
+        return mActivityInfo;
+    }
+
     /**
      * Make an WorkspaceItemInfo object for a shortcut that is an application.
      */
@@ -264,25 +275,25 @@ public class LoaderCursor extends CursorWrapper {
         Intent newIntent = new Intent(Intent.ACTION_MAIN, null);
         newIntent.addCategory(Intent.CATEGORY_LAUNCHER);
         newIntent.setComponent(componentName);
-        LauncherActivityInfo lai = mContext.getSystemService(LauncherApps.class)
+        mActivityInfo = mContext.getSystemService(LauncherApps.class)
                 .resolveActivity(newIntent, user);
-        if ((lai == null) && !allowMissingTarget) {
+        if ((mActivityInfo == null) && !allowMissingTarget) {
             Log.d(TAG, "Missing activity found in getShortcutInfo: " + componentName);
             return null;
         }
 
         final WorkspaceItemInfo info = new WorkspaceItemInfo();
-        info.itemType = LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
+        info.itemType = Favorites.ITEM_TYPE_APPLICATION;
         info.user = user;
         info.intent = newIntent;
 
-        mIconCache.getTitleAndIcon(info, lai, useLowResIcon);
+        mIconCache.getTitleAndIcon(info, mActivityInfo, useLowResIcon);
         if (mIconCache.isDefaultIcon(info.bitmap, user)) {
             loadIcon(info);
         }
 
-        if (lai != null) {
-            AppInfo.updateRuntimeFlagsForActivityTarget(info, lai);
+        if (mActivityInfo != null) {
+            AppInfo.updateRuntimeFlagsForActivityTarget(info, mActivityInfo);
         }
 
         // from the db
diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index 8e085ce52d..f74c8b5c1c 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -69,6 +69,7 @@ import com.android.launcher3.logging.FileLog;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
@@ -591,11 +592,24 @@ public class LoaderTask implements Runnable {
                                 if (c.restoreFlag != 0 && !TextUtils.isEmpty(targetPkg)) {
                                     tempPackageKey.update(targetPkg, c.user);
                                     SessionInfo si = installingPkgs.get(tempPackageKey);
-                                    if (si == null) {
-                                        info.status &= ~WorkspaceItemInfo.FLAG_INSTALL_SESSION_ACTIVE;
-                                    } else {
-                                        info.setInstallProgress((int) (si.getProgress() * 100));
-                                    }
+                                        LauncherActivityInfo activityInfo =
+                                                c.getLauncherActivityInfo();
+                                        if (si == null) {
+                                            info.runtimeStatusFlags &=
+                                                    ~ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE;
+                                        } else if (activityInfo == null) {
+                                            int installProgress = (int) (si.getProgress() * 100);
+
+                                            info.setProgressLevel(
+                                                    installProgress,
+                                                    PackageInstallInfo.STATUS_INSTALLING);
+                                        } else {
+                                            info.setProgressLevel(
+                                                    PackageManagerHelper
+                                                            .getLoadingProgress(activityInfo),
+                                                    PackageInstallInfo
+                                                            .STATUS_INSTALLED_DOWNLOADING);
+                                        }
                                 }
 
                                 c.checkAndAddItem(info, mBgDataModel);
diff --git a/src/com/android/launcher3/model/PackageIncrementalDownloadUpdatedTask.java b/src/com/android/launcher3/model/PackageIncrementalDownloadUpdatedTask.java
new file mode 100644
index 0000000000..e3e87693b1
--- /dev/null
+++ b/src/com/android/launcher3/model/PackageIncrementalDownloadUpdatedTask.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.model;
+
+import android.content.ComponentName;
+import android.os.UserHandle;
+
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.model.data.AppInfo;
+import com.android.launcher3.model.data.ItemInfoWithIcon;
+import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.launcher3.pm.PackageInstallInfo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Handles updates due to incremental download progress updates.
+ */
+public class PackageIncrementalDownloadUpdatedTask extends BaseModelUpdateTask {
+
+    private final UserHandle mUser;
+    private final int mProgress;
+    private final String mPackageName;
+
+    public PackageIncrementalDownloadUpdatedTask(
+            String packageName, UserHandle user, float progress) {
+        mUser = user;
+        mProgress = 1 - progress > 0.001 ? (int) (100 * progress) : 100;
+        mPackageName = packageName;
+    }
+
+    @Override
+    public void execute(LauncherAppState app, BgDataModel dataModel, AllAppsList appsList) {
+        PackageInstallInfo downloadInfo = new PackageInstallInfo(
+                mPackageName,
+                PackageInstallInfo.STATUS_INSTALLED_DOWNLOADING,
+                mProgress,
+                mUser);
+
+        synchronized (appsList) {
+            List<AppInfo> updatedAppInfos = appsList.updatePromiseInstallInfo(downloadInfo);
+            if (!updatedAppInfos.isEmpty()) {
+                for (AppInfo appInfo : updatedAppInfos) {
+                    appInfo.runtimeStatusFlags &= ~ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE;
+                    scheduleCallbackTask(
+                            c -> c.bindIncrementalDownloadProgressUpdated(appInfo));
+                }
+            }
+            bindApplicationsIfNeeded();
+        }
+
+        final ArrayList<WorkspaceItemInfo> updatedWorkspaceItems = new ArrayList<>();
+        synchronized (dataModel) {
+            dataModel.forAllWorkspaceItemInfos(mUser, si -> {
+                ComponentName cn = si.getTargetComponent();
+                if ((cn != null) && cn.getPackageName().equals(mPackageName)) {
+                    si.runtimeStatusFlags &= ~ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE;
+                    si.setProgressLevel(downloadInfo);
+                    updatedWorkspaceItems.add(si);
+                }
+            });
+        }
+        bindUpdatedWorkspaceItems(updatedWorkspaceItems);
+    }
+}
diff --git a/src/com/android/launcher3/model/PackageInstallStateChangedTask.java b/src/com/android/launcher3/model/PackageInstallStateChangedTask.java
index 8369c48e5c..8215edd90b 100644
--- a/src/com/android/launcher3/model/PackageInstallStateChangedTask.java
+++ b/src/com/android/launcher3/model/PackageInstallStateChangedTask.java
@@ -20,14 +20,15 @@ import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 
 import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
-import com.android.launcher3.model.data.PromiseAppInfo;
-import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pm.PackageInstallInfo;
 import com.android.launcher3.util.InstantAppResolver;
 
 import java.util.HashSet;
+import java.util.List;
 
 /**
  * Handles changes due to a sessions updates for a currently installing app.
@@ -59,9 +60,11 @@ public class PackageInstallStateChangedTask extends BaseModelUpdateTask {
         }
 
         synchronized (apps) {
-            PromiseAppInfo updated = apps.updatePromiseInstallInfo(mInstallInfo);
-            if (updated != null) {
-                scheduleCallbackTask(c -> c.bindPromiseAppProgressUpdated(updated));
+            List<AppInfo> updatedAppInfos = apps.updatePromiseInstallInfo(mInstallInfo);
+            if (!updatedAppInfos.isEmpty()) {
+                for (AppInfo appInfo : updatedAppInfos) {
+                    scheduleCallbackTask(c -> c.bindIncrementalDownloadProgressUpdated(appInfo));
+                }
             }
             bindApplicationsIfNeeded();
         }
@@ -71,11 +74,13 @@ public class PackageInstallStateChangedTask extends BaseModelUpdateTask {
             dataModel.forAllWorkspaceItemInfos(mInstallInfo.user, si -> {
                 ComponentName cn = si.getTargetComponent();
                 if (si.hasPromiseIconUi() && (cn != null)
-                        && mInstallInfo.packageName.equals(cn.getPackageName())) {
-                    si.setInstallProgress(mInstallInfo.progress);
+                        && cn.getPackageName().equals(mInstallInfo.packageName)) {
+                    int installProgress = mInstallInfo.progress;
+
+                    si.setProgressLevel(installProgress, PackageInstallInfo.STATUS_INSTALLING);
                     if (mInstallInfo.state == PackageInstallInfo.STATUS_FAILED) {
                         // Mark this info as broken.
-                        si.status &= ~WorkspaceItemInfo.FLAG_INSTALL_SESSION_ACTIVE;
+                        si.runtimeStatusFlags &= ~ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE;
                     }
                     updates.add(si);
                 }
diff --git a/src/com/android/launcher3/model/data/AppInfo.java b/src/com/android/launcher3/model/data/AppInfo.java
index aee1f2a65b..39247c221f 100644
--- a/src/com/android/launcher3/model/data/AppInfo.java
+++ b/src/com/android/launcher3/model/data/AppInfo.java
@@ -28,10 +28,13 @@ import android.os.Process;
 import android.os.UserHandle;
 import android.os.UserManager;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.pm.PackageInstallInfo;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.PackageManagerHelper;
 
@@ -104,13 +107,37 @@ public class AppInfo extends ItemInfoWithIcon {
         this.intent = intent;
     }
 
+    public AppInfo(@NonNull PackageInstallInfo installInfo) {
+        componentName = installInfo.componentName;
+        intent = new Intent(Intent.ACTION_MAIN)
+            .addCategory(Intent.CATEGORY_LAUNCHER)
+            .setComponent(componentName)
+            .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
+        user = installInfo.user;
+    }
+
     @Override
     protected String dumpProperties() {
         return super.dumpProperties() + " componentName=" + componentName;
     }
 
     public WorkspaceItemInfo makeWorkspaceItem() {
-        return new WorkspaceItemInfo(this);
+        WorkspaceItemInfo workspaceItemInfo = new WorkspaceItemInfo(this);
+
+        if ((runtimeStatusFlags & FLAG_INSTALL_SESSION_ACTIVE) != 0) {
+            // We need to update the component name when the apk is installed
+            workspaceItemInfo.status |= WorkspaceItemInfo.FLAG_AUTOINSTALL_ICON;
+            // Since the user is manually placing it on homescreen, it should not be auto-removed
+            // later
+            workspaceItemInfo.status |= WorkspaceItemInfo.FLAG_RESTORE_STARTED;
+            workspaceItemInfo.status |= FLAG_INSTALL_SESSION_ACTIVE;
+        }
+        if ((runtimeStatusFlags & FLAG_INCREMENTAL_DOWNLOAD_ACTIVE) != 0) {
+            workspaceItemInfo.runtimeStatusFlags |= FLAG_INCREMENTAL_DOWNLOAD_ACTIVE;
+        }
+
+        return workspaceItemInfo;
     }
 
     public ComponentKey toComponentKey() {
@@ -129,6 +156,12 @@ public class AppInfo extends ItemInfoWithIcon {
                         | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
     }
 
+    @Nullable
+    @Override
+    public ComponentName getTargetComponent() {
+        return componentName;
+    }
+
     public static void updateRuntimeFlagsForActivityTarget(
             ItemInfoWithIcon info, LauncherActivityInfo lai) {
         ApplicationInfo appInfo = lai.getApplicationInfo();
@@ -143,6 +176,11 @@ public class AppInfo extends ItemInfoWithIcon {
             // The icon for a non-primary user is badged, hence it's not exactly an adaptive icon.
             info.runtimeStatusFlags |= FLAG_ADAPTIVE_ICON;
         }
+
+        // Sets the progress level, installation and incremental download flags.
+        info.setProgressLevel(
+                PackageManagerHelper.getLoadingProgress(lai),
+                PackageInstallInfo.STATUS_INSTALLED);
     }
 
     @Override
diff --git a/src/com/android/launcher3/model/data/ItemInfoWithIcon.java b/src/com/android/launcher3/model/data/ItemInfoWithIcon.java
index d95f94f79f..b8a71d33e0 100644
--- a/src/com/android/launcher3/model/data/ItemInfoWithIcon.java
+++ b/src/com/android/launcher3/model/data/ItemInfoWithIcon.java
@@ -16,7 +16,15 @@
 
 package com.android.launcher3.model.data;
 
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.icons.BitmapInfo;
+import com.android.launcher3.pm.PackageInstallInfo;
+import com.android.launcher3.util.PackageManagerHelper;
 
 /**
  * Represents an ItemInfo which also holds an icon.
@@ -87,12 +95,35 @@ public abstract class ItemInfoWithIcon extends ItemInfo {
      */
     public static final int FLAG_ICON_BADGED = 1 << 9;
 
+    /**
+     * The icon is being installed. If {@link WorkspaceItemInfo#FLAG_RESTORED_ICON} or
+     * {@link WorkspaceItemInfo#FLAG_AUTOINSTALL_ICON} is set, then the icon is either being
+     * installed or is in a broken state.
+     */
+    public static final int FLAG_INSTALL_SESSION_ACTIVE = 1 << 10;
+
+    /**
+     * This icon is still being downloaded.
+     */
+    public static final int FLAG_INCREMENTAL_DOWNLOAD_ACTIVE = 1 << 11;
+
+    public static final int FLAG_SHOW_DOWNLOAD_PROGRESS_MASK = FLAG_INSTALL_SESSION_ACTIVE
+            | FLAG_INCREMENTAL_DOWNLOAD_ACTIVE;
+
     /**
      * Status associated with the system state of the underlying item. This is calculated every
      * time a new info is created and not persisted on the disk.
      */
     public int runtimeStatusFlags = 0;
 
+    /**
+     * The download progress of the package that this shortcut represents. For legacy apps, this
+     * will always be the installation progress. For apps that support incremental downloads, this
+     * will only match be the installation progress until the app is installed, then this will the
+     * total download progress.
+     */
+    private int mProgressLevel = 100;
+
     protected ItemInfoWithIcon() { }
 
     protected ItemInfoWithIcon(ItemInfoWithIcon info) {
@@ -113,6 +144,72 @@ public abstract class ItemInfoWithIcon extends ItemInfo {
         return bitmap.isLowRes();
     }
 
+    /**
+     * Returns whether the app this shortcut represents is able to be started. For legacy apps,
+     * this returns whether it is fully installed. For apps that support incremental downloads,
+     * this returns whether the app is either fully downloaded or has installed and is downloading
+     * incrementally.
+     */
+    public boolean isAppStartable() {
+        return ((runtimeStatusFlags & FLAG_INSTALL_SESSION_ACTIVE) == 0)
+                && (((runtimeStatusFlags & FLAG_INCREMENTAL_DOWNLOAD_ACTIVE) != 0)
+                    || mProgressLevel == 100);
+    }
+
+    /**
+     * Returns the download progress for the app this shortcut represents. If this app is not yet
+     * installed or does not support incremental downloads, this will return the installation
+     * progress.
+     */
+    public int getProgressLevel() {
+        if ((runtimeStatusFlags & FLAG_SHOW_DOWNLOAD_PROGRESS_MASK) != 0) {
+            return mProgressLevel;
+        }
+        return 100;
+    }
+
+    /**
+     * Sets the download progress for the app this shortcut represents. If this app is not yet
+     * installed or does not support incremental downloads, this will set
+     * {@code FLAG_INSTALL_SESSION_ACTIVE}. If this app is downloading incrementally, this will
+     * set {@code FLAG_INCREMENTAL_DOWNLOAD_ACTIVE}. Otherwise, this will remove both flags.
+     */
+    public void setProgressLevel(PackageInstallInfo installInfo) {
+        setProgressLevel(installInfo.progress, installInfo.state);
+    }
+
+    /**
+     * Sets the download progress for the app this shortcut represents.
+     */
+    public void setProgressLevel(int progress, int status) {
+        if (status == PackageInstallInfo.STATUS_INSTALLING) {
+            mProgressLevel = progress;
+            runtimeStatusFlags = progress < 100
+                    ? runtimeStatusFlags | FLAG_INSTALL_SESSION_ACTIVE
+                    : runtimeStatusFlags & ~FLAG_INSTALL_SESSION_ACTIVE;
+        } else if (status == PackageInstallInfo.STATUS_INSTALLED_DOWNLOADING) {
+            mProgressLevel = progress;
+            runtimeStatusFlags = runtimeStatusFlags & ~FLAG_INSTALL_SESSION_ACTIVE;
+            runtimeStatusFlags = progress < 100
+                    ? runtimeStatusFlags | FLAG_INCREMENTAL_DOWNLOAD_ACTIVE
+                    : runtimeStatusFlags & ~FLAG_INCREMENTAL_DOWNLOAD_ACTIVE;
+        } else {
+            mProgressLevel = status == PackageInstallInfo.STATUS_INSTALLED ? 100 : 0;
+            runtimeStatusFlags = runtimeStatusFlags & ~FLAG_INSTALL_SESSION_ACTIVE;
+            runtimeStatusFlags = runtimeStatusFlags & ~FLAG_INCREMENTAL_DOWNLOAD_ACTIVE;
+        }
+    }
+
+    /** Creates an intent to that launches the app store at this app's page. */
+    @Nullable
+    public Intent getMarketIntent(Context context) {
+        ComponentName componentName = getTargetComponent();
+
+        return componentName != null
+                ? new PackageManagerHelper(context).getMarketIntent(componentName.getPackageName())
+                : null;
+    }
+
     /**
      * @return a copy of this
      */
diff --git a/src/com/android/launcher3/model/data/PromiseAppInfo.java b/src/com/android/launcher3/model/data/PromiseAppInfo.java
deleted file mode 100644
index b6231ede19..0000000000
--- a/src/com/android/launcher3/model/data/PromiseAppInfo.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.model.data;
-
-import android.content.Context;
-import android.content.Intent;
-
-import androidx.annotation.NonNull;
-
-import com.android.launcher3.pm.PackageInstallInfo;
-import com.android.launcher3.util.PackageManagerHelper;
-
-public class PromiseAppInfo extends AppInfo {
-
-    public int level = 0;
-
-    public PromiseAppInfo(@NonNull PackageInstallInfo installInfo) {
-        componentName = installInfo.componentName;
-        intent = new Intent(Intent.ACTION_MAIN)
-                .addCategory(Intent.CATEGORY_LAUNCHER)
-                .setComponent(componentName)
-                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
-                        | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
-    }
-
-    @Override
-    public WorkspaceItemInfo makeWorkspaceItem() {
-        WorkspaceItemInfo shortcut = new WorkspaceItemInfo(this);
-        shortcut.setInstallProgress(level);
-        // We need to update the component name when the apk is installed
-        shortcut.status |= WorkspaceItemInfo.FLAG_AUTOINSTALL_ICON;
-        // Since the user is manually placing it on homescreen, it should not be auto-removed later
-        shortcut.status |= WorkspaceItemInfo.FLAG_RESTORE_STARTED;
-        return shortcut;
-    }
-
-    public Intent getMarketIntent(Context context) {
-        return new PackageManagerHelper(context).getMarketIntent(componentName.getPackageName());
-    }
-}
diff --git a/src/com/android/launcher3/model/data/WorkspaceItemInfo.java b/src/com/android/launcher3/model/data/WorkspaceItemInfo.java
index 1e1d093b13..690e904a02 100644
--- a/src/com/android/launcher3/model/data/WorkspaceItemInfo.java
+++ b/src/com/android/launcher3/model/data/WorkspaceItemInfo.java
@@ -57,21 +57,15 @@ public class WorkspaceItemInfo extends ItemInfoWithIcon {
      */
     public static final int FLAG_AUTOINSTALL_ICON = 1 << 1;
 
-    /**
-     * The icon is being installed. If {@link #FLAG_RESTORED_ICON} or {@link #FLAG_AUTOINSTALL_ICON}
-     * is set, then the icon is either being installed or is in a broken state.
-     */
-    public static final int FLAG_INSTALL_SESSION_ACTIVE = 1 << 2;
-
     /**
      * Indicates that the widget restore has started.
      */
-    public static final int FLAG_RESTORE_STARTED = 1 << 3;
+    public static final int FLAG_RESTORE_STARTED = 1 << 2;
 
     /**
      * Web UI supported.
      */
-    public static final int FLAG_SUPPORTS_WEB_UI = 1 << 4;
+    public static final int FLAG_SUPPORTS_WEB_UI = 1 << 3;
 
     /**
      * The intent used to start the application.
@@ -98,11 +92,6 @@ public class WorkspaceItemInfo extends ItemInfoWithIcon {
      */
     @NonNull private String[] personKeys = Utilities.EMPTY_STRING_ARRAY;
 
-    /**
-     * The installation progress [0-100] of the package that this shortcut represents.
-     */
-    private int mInstallProgress;
-
 
     public WorkspaceItemInfo() {
         itemType = LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT;
@@ -114,7 +103,6 @@ public class WorkspaceItemInfo extends ItemInfoWithIcon {
         intent = new Intent(info.intent);
         iconResource = info.iconResource;
         status = info.status;
-        mInstallProgress = info.mInstallProgress;
         personKeys = info.personKeys.clone();
     }
 
@@ -168,15 +156,6 @@ public class WorkspaceItemInfo extends ItemInfoWithIcon {
         return isPromise() && !hasStatusFlag(FLAG_SUPPORTS_WEB_UI);
     }
 
-    public int getInstallProgress() {
-        return mInstallProgress;
-    }
-
-    public void setInstallProgress(int progress) {
-        mInstallProgress = progress;
-        status |= FLAG_INSTALL_SESSION_ACTIVE;
-    }
-
     public void updateFromDeepShortcutInfo(ShortcutInfo shortcutInfo, Context context) {
         // {@link ShortcutInfo#getActivity} can change during an update. Recreate the intent
         intent = ShortcutKey.makeIntent(shortcutInfo);
diff --git a/src/com/android/launcher3/pm/PackageInstallInfo.java b/src/com/android/launcher3/pm/PackageInstallInfo.java
index 7997d16756..fad904f968 100644
--- a/src/com/android/launcher3/pm/PackageInstallInfo.java
+++ b/src/com/android/launcher3/pm/PackageInstallInfo.java
@@ -25,7 +25,8 @@ public final class PackageInstallInfo {
 
     public static final int STATUS_INSTALLED = 0;
     public static final int STATUS_INSTALLING = 1;
-    public static final int STATUS_FAILED = 2;
+    public static final int STATUS_INSTALLED_DOWNLOADING = 2;
+    public static final int STATUS_FAILED = 3;
 
     public final ComponentName componentName;
     public final String packageName;
@@ -56,5 +57,4 @@ public final class PackageInstallInfo {
     public static PackageInstallInfo fromState(int state, String packageName, UserHandle user) {
         return new PackageInstallInfo(packageName, state, 0 /* progress */, user);
     }
-
 }
diff --git a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
index b496608ac5..026634529f 100644
--- a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
+++ b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
@@ -35,8 +35,8 @@ import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.model.BgDataModel;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
-import com.android.launcher3.model.data.PromiseAppInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.popup.PopupContainerWithArrow;
 import com.android.launcher3.popup.PopupDataProvider;
@@ -215,8 +215,8 @@ public class SecondaryDisplayLauncher extends BaseDraggingActivity
             ArrayList<ItemInfo> addAnimated) { }
 
     @Override
-    public void bindPromiseAppProgressUpdated(PromiseAppInfo app) {
-        mAppsView.getAppsStore().updatePromiseAppProgress(app);
+    public void bindIncrementalDownloadProgressUpdated(AppInfo app) {
+        mAppsView.getAppsStore().updateProgressBar(app);
     }
 
     @Override
@@ -315,9 +315,11 @@ public class SecondaryDisplayLauncher extends BaseDraggingActivity
         if (tag instanceof ItemInfo) {
             ItemInfo item = (ItemInfo) tag;
             Intent intent;
-            if (item instanceof PromiseAppInfo) {
-                PromiseAppInfo promiseAppInfo = (PromiseAppInfo) item;
-                intent = promiseAppInfo.getMarketIntent(this);
+            if (item instanceof ItemInfoWithIcon
+                    && (((ItemInfoWithIcon) item).runtimeStatusFlags
+                        & ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE) != 0) {
+                ItemInfoWithIcon appInfo = (ItemInfoWithIcon) item;
+                intent = appInfo.getMarketIntent(this);
             } else {
                 intent = item.getIntent();
             }
diff --git a/src/com/android/launcher3/touch/ItemClickHandler.java b/src/com/android/launcher3/touch/ItemClickHandler.java
index 9b9cb0a61b..41587357f5 100644
--- a/src/com/android/launcher3/touch/ItemClickHandler.java
+++ b/src/com/android/launcher3/touch/ItemClickHandler.java
@@ -49,8 +49,8 @@ import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
-import com.android.launcher3.model.data.PromiseAppInfo;
 import com.android.launcher3.model.data.RemoteActionItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pm.InstallSessionHelper;
@@ -231,8 +231,12 @@ public class ItemClickHandler {
                     ? shortcut.getIntent().getComponent().getPackageName()
                     : shortcut.getIntent().getPackage();
             if (!TextUtils.isEmpty(packageName)) {
-                onClickPendingAppItem(v, launcher, packageName,
-                        shortcut.hasStatusFlag(WorkspaceItemInfo.FLAG_INSTALL_SESSION_ACTIVE));
+                onClickPendingAppItem(
+                        v,
+                        launcher,
+                        packageName,
+                        (shortcut.runtimeStatusFlags
+                                & ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE) != 0);
                 return;
             }
         }
@@ -266,9 +270,12 @@ public class ItemClickHandler {
         TestLogging.recordEvent(
                 TestProtocol.SEQUENCE_MAIN, "start: startAppShortcutOrInfoActivity");
         Intent intent;
-        if (item instanceof PromiseAppInfo) {
-            PromiseAppInfo promiseAppInfo = (PromiseAppInfo) item;
-            intent = promiseAppInfo.getMarketIntent(launcher);
+        if (item instanceof ItemInfoWithIcon
+                && (((ItemInfoWithIcon) item).runtimeStatusFlags
+                    & ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE) != 0) {
+            ItemInfoWithIcon appInfo = (ItemInfoWithIcon) item;
+            intent = new PackageManagerHelper(launcher)
+                    .getMarketIntent(appInfo.getTargetComponent().getPackageName());
         } else {
             intent = item.getIntent();
         }
diff --git a/src/com/android/launcher3/util/PackageManagerHelper.java b/src/com/android/launcher3/util/PackageManagerHelper.java
index 523545af43..7b264275d4 100644
--- a/src/com/android/launcher3/util/PackageManagerHelper.java
+++ b/src/com/android/launcher3/util/PackageManagerHelper.java
@@ -45,10 +45,11 @@ import android.widget.Toast;
 
 import com.android.launcher3.PendingAddItemInfo;
 import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
-import com.android.launcher3.model.data.PromiseAppInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 
 import java.net.URISyntaxException;
@@ -200,9 +201,12 @@ public class PackageManagerHelper {
      * Starts the details activity for {@code info}
      */
     public void startDetailsActivityForInfo(ItemInfo info, Rect sourceBounds, Bundle opts) {
-        if (info instanceof PromiseAppInfo) {
-            PromiseAppInfo promiseAppInfo = (PromiseAppInfo) info;
-            mContext.startActivity(promiseAppInfo.getMarketIntent(mContext));
+        if (info instanceof ItemInfoWithIcon
+                && (((ItemInfoWithIcon) info).runtimeStatusFlags
+                    & ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE) != 0) {
+            ItemInfoWithIcon appInfo = (ItemInfoWithIcon) info;
+            mContext.startActivity(new PackageManagerHelper(mContext)
+                    .getMarketIntent(appInfo.getTargetComponent().getPackageName()));
             return;
         }
         ComponentName componentName = null;
@@ -319,4 +323,12 @@ public class PackageManagerHelper {
         }
         return false;
     }
+
+    /** Returns the incremental download progress for the given shortcut's app. */
+    public static int getLoadingProgress(LauncherActivityInfo info) {
+        if (Utilities.ATLEAST_S) {
+            return (int) (100 * info.getLoadingProgress());
+        }
+        return 100;
+    }
 }
-- 
GitLab


From b803f7e2cb8dbaab2c1453693c61155c03fd90c8 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Tue, 12 Jan 2021 11:40:27 -0800
Subject: [PATCH 0387/1664] Add UI updates for incremental app installs.

1. Changed Preload Icon UI to be grayscale while the app is not startable.
2. Added progress bar for when app is installed but still ownloading.
3. Updated Preload Icon progress and click handling to use new incremental api.

Progress bar color updates will follow in a separate CL.

Demo: https://drive.google.com/file/d/1H1EvtTorLeJwC1eiq10tm-TT81YZ6osk/view?usp=sharing

Fixes: 176901235,176992421,176884453

Test: manual
Change-Id: Ie0575dc56c33c5d6ecd6c5cbf00666b96d6dcb16
---
 src/com/android/launcher3/model/AllAppsList.java         | 9 +++++++--
 src/com/android/launcher3/model/PackageUpdatedTask.java  | 2 ++
 src/com/android/launcher3/model/data/AppInfo.java        | 3 +--
 .../android/launcher3/model/data/ItemInfoWithIcon.java   | 6 ++++--
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/com/android/launcher3/model/AllAppsList.java b/src/com/android/launcher3/model/AllAppsList.java
index 8d5cf7422f..c57c3e495a 100644
--- a/src/com/android/launcher3/model/AllAppsList.java
+++ b/src/com/android/launcher3/model/AllAppsList.java
@@ -26,6 +26,7 @@ import android.content.pm.ApplicationInfo;
 import android.content.pm.LauncherActivityInfo;
 import android.content.pm.LauncherApps;
 import android.os.LocaleList;
+import android.os.Process;
 import android.os.UserHandle;
 import android.util.Log;
 
@@ -161,14 +162,18 @@ public class AllAppsList {
     /** Updates the given PackageInstallInfo's associated AppInfo's installation info. */
     public List<AppInfo> updatePromiseInstallInfo(PackageInstallInfo installInfo) {
         List<AppInfo> updatedAppInfos = new ArrayList<>();
-        UserHandle user = installInfo.user;
+        UserHandle user = Process.myUserHandle();
         for (int i = data.size() - 1; i >= 0; i--) {
             final AppInfo appInfo = data.get(i);
             final ComponentName tgtComp = appInfo.getTargetComponent();
             if (tgtComp != null && tgtComp.getPackageName().equals(installInfo.packageName)
                     && appInfo.user.equals(user)) {
                 if (installInfo.state == PackageInstallInfo.STATUS_INSTALLED_DOWNLOADING
-                            || installInfo.state == PackageInstallInfo.STATUS_INSTALLING) {
+                        || installInfo.state == PackageInstallInfo.STATUS_INSTALLING) {
+                    if (appInfo.isAppStartable()
+                            && installInfo.state == PackageInstallInfo.STATUS_INSTALLING) {
+                        continue;
+                    }
                     appInfo.setProgressLevel(installInfo);
 
                     updatedAppInfos.add(appInfo);
diff --git a/src/com/android/launcher3/model/PackageUpdatedTask.java b/src/com/android/launcher3/model/PackageUpdatedTask.java
index 896bfb666e..3275d59488 100644
--- a/src/com/android/launcher3/model/PackageUpdatedTask.java
+++ b/src/com/android/launcher3/model/PackageUpdatedTask.java
@@ -38,6 +38,7 @@ import com.android.launcher3.logging.FileLog;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.launcher3.pm.PackageInstallInfo;
 import com.android.launcher3.pm.UserCache;
 import com.android.launcher3.shortcuts.ShortcutRequest;
 import com.android.launcher3.util.FlagOp;
@@ -246,6 +247,7 @@ public class PackageUpdatedTask extends BaseModelUpdateTask {
 
                         if (isNewApkAvailable
                                 && si.itemType == Favorites.ITEM_TYPE_APPLICATION) {
+                            si.setProgressLevel(100, PackageInstallInfo.STATUS_INSTALLED);
                             iconCache.getTitleAndIcon(si, si.usingLowResIcon());
                             infoUpdated = true;
                         }
diff --git a/src/com/android/launcher3/model/data/AppInfo.java b/src/com/android/launcher3/model/data/AppInfo.java
index 39247c221f..dde0cf4674 100644
--- a/src/com/android/launcher3/model/data/AppInfo.java
+++ b/src/com/android/launcher3/model/data/AppInfo.java
@@ -94,8 +94,6 @@ public class AppInfo extends ItemInfoWithIcon {
         componentName = info.componentName;
         title = Utilities.trim(info.title);
         intent = new Intent(info.intent);
-        user = info.user;
-        runtimeStatusFlags = info.runtimeStatusFlags;
     }
 
     @VisibleForTesting
@@ -114,6 +112,7 @@ public class AppInfo extends ItemInfoWithIcon {
             .setComponent(componentName)
             .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
                 | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
+        setProgressLevel(installInfo);
         user = installInfo.user;
     }
 
diff --git a/src/com/android/launcher3/model/data/ItemInfoWithIcon.java b/src/com/android/launcher3/model/data/ItemInfoWithIcon.java
index b8a71d33e0..d95e7080de 100644
--- a/src/com/android/launcher3/model/data/ItemInfoWithIcon.java
+++ b/src/com/android/launcher3/model/data/ItemInfoWithIcon.java
@@ -129,7 +129,9 @@ public abstract class ItemInfoWithIcon extends ItemInfo {
     protected ItemInfoWithIcon(ItemInfoWithIcon info) {
         super(info);
         bitmap = info.bitmap;
+        mProgressLevel = info.mProgressLevel;
         runtimeStatusFlags = info.runtimeStatusFlags;
+        user = info.user;
     }
 
     @Override
@@ -195,8 +197,8 @@ public abstract class ItemInfoWithIcon extends ItemInfo {
                     : runtimeStatusFlags & ~FLAG_INCREMENTAL_DOWNLOAD_ACTIVE;
         } else {
             mProgressLevel = status == PackageInstallInfo.STATUS_INSTALLED ? 100 : 0;
-            runtimeStatusFlags = runtimeStatusFlags & ~FLAG_INSTALL_SESSION_ACTIVE;
-            runtimeStatusFlags = runtimeStatusFlags & ~FLAG_INCREMENTAL_DOWNLOAD_ACTIVE;
+            runtimeStatusFlags &= ~FLAG_INSTALL_SESSION_ACTIVE;
+            runtimeStatusFlags &= ~FLAG_INCREMENTAL_DOWNLOAD_ACTIVE;
         }
     }
 
-- 
GitLab


From fd58d23cdffa05d488e3fe65ca1f53b72bc40661 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Tue, 12 Jan 2021 12:59:39 -0600
Subject: [PATCH 0388/1664] Migrate from Plugin SearchTarget to API search
 Target  [1/3]

Setup architecture for separation between aosp and quickstep search as setup for switch to android.app.SearchTarget

Bug: 177223401
Test: manual
Change-Id: Iefd069a34d5e5551bf731e9171958e93377774aa
---
 .../res}/layout/search_result_icon.xml        |   2 +-
 .../res}/layout/search_result_icon_row.xml    |   6 +-
 .../res}/layout/search_result_people_item.xml |   4 +-
 .../res}/layout/search_result_play_item.xml   |   4 +-
 .../layout/search_result_settings_row.xml     |   4 +-
 .../res}/layout/search_result_slice.xml       |   4 +-
 .../res}/layout/search_result_suggest.xml     |   4 +-
 .../res}/layout/search_result_thumbnail.xml   |   2 +-
 .../res}/layout/search_result_widget_live.xml |   2 +-
 .../layout/search_result_widget_preview.xml   |   4 +-
 .../res}/layout/search_section_title.xml      |   2 +-
 .../search/DeviceSearchAdapterProvider.java   | 110 +++++++++++++++
 .../launcher3/search/SearchAdapterItem.java   |  59 +++++++++
 .../launcher3}/search/SearchEventTracker.java |   3 +-
 .../launcher3/search}/SearchResultIcon.java   |   6 +-
 .../search}/SearchResultIconRow.java          |   6 +-
 .../search}/SearchResultPeopleView.java       |   6 +-
 .../search}/SearchResultPlayItem.java         |   6 +-
 .../search}/SearchResultSettingsSlice.java    |   6 +-
 .../search}/SearchResultSuggestion.java       |   3 +-
 .../launcher3/search}/SearchResultWidget.java |   6 +-
 .../search}/SearchResultWidgetPreview.java    |   6 +-
 .../search}/SearchSectionHeaderView.java      |   5 +-
 .../search}/SearchSettingsRowView.java        |   6 +-
 .../launcher3/search/SearchTargetHandler.java |  37 ++++++
 .../search}/ThumbnailSearchResultView.java    |  10 +-
 .../uioverrides/QuickstepLauncher.java        |   7 +
 .../android/quickstep/RecentsActivity.java    |   2 +
 .../launcher3/BaseDraggingActivity.java       |  12 +-
 .../allapps/AllAppsContainerView.java         |  15 ++-
 .../launcher3/allapps/AllAppsGridAdapter.java | 125 +++---------------
 .../allapps/AllAppsRecyclerView.java          |   1 -
 .../search/AllAppsSearchBarController.java    |  19 ---
 .../search/DefaultSearchAdapterProvider.java  |  53 ++++++++
 .../allapps/search/SearchAdapterProvider.java |  65 +++++++++
 35 files changed, 413 insertions(+), 199 deletions(-)
 rename {res => quickstep/res}/layout/search_result_icon.xml (88%)
 rename {res => quickstep/res}/layout/search_result_icon_row.xml (93%)
 rename {res => quickstep/res}/layout/search_result_people_item.xml (93%)
 rename {res => quickstep/res}/layout/search_result_play_item.xml (94%)
 rename {res => quickstep/res}/layout/search_result_settings_row.xml (93%)
 rename {res => quickstep/res}/layout/search_result_slice.xml (89%)
 rename {res => quickstep/res}/layout/search_result_suggest.xml (89%)
 rename {res => quickstep/res}/layout/search_result_thumbnail.xml (93%)
 rename {res => quickstep/res}/layout/search_result_widget_live.xml (66%)
 rename {res => quickstep/res}/layout/search_result_widget_preview.xml (64%)
 rename {res => quickstep/res}/layout/search_section_title.xml (89%)
 create mode 100644 quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
 create mode 100644 quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
 rename {src/com/android/launcher3/allapps => quickstep/src/com/android/launcher3}/search/SearchEventTracker.java (95%)
 rename {src/com/android/launcher3/views => quickstep/src/com/android/launcher3/search}/SearchResultIcon.java (97%)
 rename {src/com/android/launcher3/views => quickstep/src/com/android/launcher3/search}/SearchResultIconRow.java (96%)
 rename {src/com/android/launcher3/views => quickstep/src/com/android/launcher3/search}/SearchResultPeopleView.java (97%)
 rename {src/com/android/launcher3/views => quickstep/src/com/android/launcher3/search}/SearchResultPlayItem.java (97%)
 rename {src/com/android/launcher3/views => quickstep/src/com/android/launcher3/search}/SearchResultSettingsSlice.java (93%)
 rename {src/com/android/launcher3/views => quickstep/src/com/android/launcher3/search}/SearchResultSuggestion.java (95%)
 rename {src/com/android/launcher3/views => quickstep/src/com/android/launcher3/search}/SearchResultWidget.java (96%)
 rename {src/com/android/launcher3/views => quickstep/src/com/android/launcher3/search}/SearchResultWidgetPreview.java (95%)
 rename {src/com/android/launcher3/views => quickstep/src/com/android/launcher3/search}/SearchSectionHeaderView.java (91%)
 rename {src/com/android/launcher3/views => quickstep/src/com/android/launcher3/search}/SearchSettingsRowView.java (95%)
 create mode 100644 quickstep/src/com/android/launcher3/search/SearchTargetHandler.java
 rename {src/com/android/launcher3/views => quickstep/src/com/android/launcher3/search}/ThumbnailSearchResultView.java (91%)
 create mode 100644 src/com/android/launcher3/allapps/search/DefaultSearchAdapterProvider.java
 create mode 100644 src/com/android/launcher3/allapps/search/SearchAdapterProvider.java

diff --git a/res/layout/search_result_icon.xml b/quickstep/res/layout/search_result_icon.xml
similarity index 88%
rename from res/layout/search_result_icon.xml
rename to quickstep/res/layout/search_result_icon.xml
index 3c1dd49109..e1b6dfd371 100644
--- a/res/layout/search_result_icon.xml
+++ b/quickstep/res/layout/search_result_icon.xml
@@ -13,7 +13,7 @@
      limitations under the License.
 -->
 
-<com.android.launcher3.views.SearchResultIcon xmlns:launcher="http://schemas.android.com/apk/res-auto"
+<com.android.launcher3.search.SearchResultIcon xmlns:launcher="http://schemas.android.com/apk/res-auto"
     style="@style/BaseIcon.AllApps"
     launcher:iconDisplay="all_apps"
     launcher:centerVertically="true" />
diff --git a/res/layout/search_result_icon_row.xml b/quickstep/res/layout/search_result_icon_row.xml
similarity index 93%
rename from res/layout/search_result_icon_row.xml
rename to quickstep/res/layout/search_result_icon_row.xml
index 81c23e4c90..1393b87d58 100644
--- a/res/layout/search_result_icon_row.xml
+++ b/quickstep/res/layout/search_result_icon_row.xml
@@ -12,14 +12,14 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher3.views.SearchResultIconRow xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher3.search.SearchResultIconRow xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto"
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="@dimen/dynamic_grid_edge_margin">
 
-    <com.android.launcher3.views.SearchResultIcon
+    <com.android.launcher3.search.SearchResultIcon
         android:layout_width="wrap_content"
         android:id="@+id/icon"
         launcher:iconDisplay="hero_app"
@@ -73,4 +73,4 @@
         launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size"
         launcher:layoutHorizontal="false" />
 
-</com.android.launcher3.views.SearchResultIconRow>
\ No newline at end of file
+</com.android.launcher3.search.SearchResultIconRow>
\ No newline at end of file
diff --git a/res/layout/search_result_people_item.xml b/quickstep/res/layout/search_result_people_item.xml
similarity index 93%
rename from res/layout/search_result_people_item.xml
rename to quickstep/res/layout/search_result_people_item.xml
index 7526f6f10f..964300dd20 100644
--- a/res/layout/search_result_people_item.xml
+++ b/quickstep/res/layout/search_result_people_item.xml
@@ -12,7 +12,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher3.views.SearchResultPeopleView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher3.search.SearchResultPeopleView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:gravity="center_vertical"
     android:layout_height="wrap_content"
@@ -60,4 +60,4 @@
         android:layout_width="@dimen/deep_shortcut_icon_size"
         android:layout_height="@dimen/deep_shortcut_icon_size" />
 
-</com.android.launcher3.views.SearchResultPeopleView>
\ No newline at end of file
+</com.android.launcher3.search.SearchResultPeopleView>
\ No newline at end of file
diff --git a/res/layout/search_result_play_item.xml b/quickstep/res/layout/search_result_play_item.xml
similarity index 94%
rename from res/layout/search_result_play_item.xml
rename to quickstep/res/layout/search_result_play_item.xml
index d70c56a1de..ecd67b104a 100644
--- a/res/layout/search_result_play_item.xml
+++ b/quickstep/res/layout/search_result_play_item.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher3.views.SearchResultPlayItem xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher3.search.SearchResultPlayItem xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="4dp"
@@ -76,4 +76,4 @@
     </Button>
 
 
-</com.android.launcher3.views.SearchResultPlayItem>
+</com.android.launcher3.search.SearchResultPlayItem>
diff --git a/res/layout/search_result_settings_row.xml b/quickstep/res/layout/search_result_settings_row.xml
similarity index 93%
rename from res/layout/search_result_settings_row.xml
rename to quickstep/res/layout/search_result_settings_row.xml
index 22c08bf58f..33c9592d1c 100644
--- a/res/layout/search_result_settings_row.xml
+++ b/quickstep/res/layout/search_result_settings_row.xml
@@ -12,7 +12,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher3.views.SearchSettingsRowView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher3.search.SearchSettingsRowView xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/TextHeadline"
     android:id="@+id/section_title"
     android:background="?android:attr/selectableItemBackground"
@@ -57,4 +57,4 @@
             android:textColor="?android:attr/textColorSecondary"
             android:textSize="@dimen/search_hero_subtitle_size" />
     </LinearLayout>
-</com.android.launcher3.views.SearchSettingsRowView>
\ No newline at end of file
+</com.android.launcher3.search.SearchSettingsRowView>
\ No newline at end of file
diff --git a/res/layout/search_result_slice.xml b/quickstep/res/layout/search_result_slice.xml
similarity index 89%
rename from res/layout/search_result_slice.xml
rename to quickstep/res/layout/search_result_slice.xml
index 24d75e9eb6..f7dcfce0ee 100644
--- a/res/layout/search_result_slice.xml
+++ b/quickstep/res/layout/search_result_slice.xml
@@ -12,7 +12,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher3.views.SearchResultSettingsSlice xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher3.search.SearchResultSettingsSlice xmlns:android="http://schemas.android.com/apk/res/android"
     android:paddingHorizontal="@dimen/dynamic_grid_cell_padding_x"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
@@ -36,5 +36,5 @@
         android:layout_marginStart="@dimen/dynamic_grid_cell_padding_x"
         android:layout_width="0dp" />
 
-</com.android.launcher3.views.SearchResultSettingsSlice>
+</com.android.launcher3.search.SearchResultSettingsSlice>
 
diff --git a/res/layout/search_result_suggest.xml b/quickstep/res/layout/search_result_suggest.xml
similarity index 89%
rename from res/layout/search_result_suggest.xml
rename to quickstep/res/layout/search_result_suggest.xml
index 01e25d5893..eb5313c36b 100644
--- a/res/layout/search_result_suggest.xml
+++ b/quickstep/res/layout/search_result_suggest.xml
@@ -12,7 +12,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher3.views.SearchResultSuggestion xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher3.search.SearchResultSuggestion xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto"
     style="@style/BaseIcon"
     android:layout_width="match_parent"
@@ -31,4 +31,4 @@
     launcher:layoutHorizontal="true"
     android:drawablePadding="@dimen/dynamic_grid_icon_drawable_padding">
 
-</com.android.launcher3.views.SearchResultSuggestion>
\ No newline at end of file
+</com.android.launcher3.search.SearchResultSuggestion>
\ No newline at end of file
diff --git a/res/layout/search_result_thumbnail.xml b/quickstep/res/layout/search_result_thumbnail.xml
similarity index 93%
rename from res/layout/search_result_thumbnail.xml
rename to quickstep/res/layout/search_result_thumbnail.xml
index 0cc5a29f60..0f253360f0 100644
--- a/res/layout/search_result_thumbnail.xml
+++ b/quickstep/res/layout/search_result_thumbnail.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher3.views.ThumbnailSearchResultView
+<com.android.launcher3.search.ThumbnailSearchResultView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="125dp"
     android:layout_height="125dp"/>
\ No newline at end of file
diff --git a/res/layout/search_result_widget_live.xml b/quickstep/res/layout/search_result_widget_live.xml
similarity index 66%
rename from res/layout/search_result_widget_live.xml
rename to quickstep/res/layout/search_result_widget_live.xml
index 0dd8a06c9a..ffbad55838 100644
--- a/res/layout/search_result_widget_live.xml
+++ b/quickstep/res/layout/search_result_widget_live.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.android.launcher3.views.SearchResultWidget android:layout_height="wrap_content"
+<com.android.launcher3.search.SearchResultWidget android:layout_height="wrap_content"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:gravity="center"
     android:layout_width="match_parent" />
\ No newline at end of file
diff --git a/res/layout/search_result_widget_preview.xml b/quickstep/res/layout/search_result_widget_preview.xml
similarity index 64%
rename from res/layout/search_result_widget_preview.xml
rename to quickstep/res/layout/search_result_widget_preview.xml
index 942b199b7f..7af24a136d 100644
--- a/res/layout/search_result_widget_preview.xml
+++ b/quickstep/res/layout/search_result_widget_preview.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.android.launcher3.views.SearchResultWidgetPreview xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher3.search.SearchResultWidgetPreview xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:padding="@dimen/dynamic_grid_cell_padding_x"
     android:layout_height="wrap_content">
     <include layout="@layout/widget_cell" android:id="@+id/widget_cell"/>
 <!--    <include layout="@layout/widget_cell_content" />-->
-</com.android.launcher3.views.SearchResultWidgetPreview>
\ No newline at end of file
+</com.android.launcher3.search.SearchResultWidgetPreview>
\ No newline at end of file
diff --git a/res/layout/search_section_title.xml b/quickstep/res/layout/search_section_title.xml
similarity index 89%
rename from res/layout/search_section_title.xml
rename to quickstep/res/layout/search_section_title.xml
index b7ba83e71b..5842e574fc 100644
--- a/res/layout/search_section_title.xml
+++ b/quickstep/res/layout/search_section_title.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher3.views.SearchSectionHeaderView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher3.search.SearchSectionHeaderView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/section_title"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java b/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
new file mode 100644
index 0000000000..da325c7705
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.search;
+
+import static com.android.launcher3.allapps.AllAppsGridAdapter.VIEW_TYPE_ICON;
+
+import android.util.SparseIntArray;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+import com.android.launcher3.allapps.AllAppsGridAdapter;
+import com.android.launcher3.allapps.search.SearchAdapterProvider;
+import com.android.systemui.plugins.shared.SearchTarget;
+
+/**
+ * Provides views for on-device search results
+ */
+public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
+
+    public static final int VIEW_TYPE_SEARCH_CORPUS_TITLE = 1 << 5;
+    public static final int VIEW_TYPE_SEARCH_ROW_WITH_BUTTON = 1 << 7;
+    public static final int VIEW_TYPE_SEARCH_ROW = 1 << 8;
+    public static final int VIEW_TYPE_SEARCH_SLICE = 1 << 9;
+    public static final int VIEW_TYPE_SEARCH_ICON_ROW = 1 << 10;
+    public static final int VIEW_TYPE_SEARCH_PEOPLE = 1 << 11;
+    public static final int VIEW_TYPE_SEARCH_THUMBNAIL = 1 << 12;
+    public static final int VIEW_TYPE_SEARCH_SUGGEST = 1 << 13;
+    public static final int VIEW_TYPE_SEARCH_ICON = (1 << 14) | VIEW_TYPE_ICON;
+    public static final int VIEW_TYPE_SEARCH_WIDGET_LIVE = 1 << 15;
+    public static final int VIEW_TYPE_SEARCH_WIDGET_PREVIEW = 1 << 16;
+
+
+    private final SparseIntArray mViewTypeToLayoutMap = new SparseIntArray();
+
+    public DeviceSearchAdapterProvider(Launcher launcher) {
+        super(launcher);
+
+        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_ICON, R.layout.search_result_icon);
+        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_CORPUS_TITLE, R.layout.search_section_title);
+        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_ROW_WITH_BUTTON,
+                R.layout.search_result_play_item);
+        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_ROW, R.layout.search_result_settings_row);
+        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_SLICE, R.layout.search_result_slice);
+        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_ICON_ROW, R.layout.search_result_icon_row);
+        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_PEOPLE, R.layout.search_result_people_item);
+        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_THUMBNAIL, R.layout.search_result_thumbnail);
+        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_SUGGEST, R.layout.search_result_suggest);
+        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_WIDGET_LIVE, R.layout.search_result_widget_live);
+        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_WIDGET_PREVIEW,
+                R.layout.search_result_widget_preview);
+    }
+
+    @Override
+    public void onBindView(AllAppsGridAdapter.ViewHolder holder, int position) {
+        SearchAdapterItem item = (SearchAdapterItem) Launcher.getLauncher(mLauncher)
+                .getAppsView().getApps().getAdapterItems().get(position);
+        SearchTargetHandler
+                payloadResultView =
+                (SearchTargetHandler) holder.itemView;
+        payloadResultView.applySearchTarget(item.getSearchTarget());
+    }
+
+    @Override
+    public boolean isSearchView(int viewType) {
+        return mViewTypeToLayoutMap.get(viewType, -1) != -1;
+    }
+
+    @Override
+    public AllAppsGridAdapter.ViewHolder onCreateViewHolder(LayoutInflater inflater,
+            ViewGroup parent, int viewType) {
+        return new AllAppsGridAdapter.ViewHolder(inflater.inflate(
+                mViewTypeToLayoutMap.get(viewType), parent, false));
+    }
+
+    @Override
+    public int getGridSpanSize(int viewType, int appsPerRow) {
+        if (viewType == VIEW_TYPE_SEARCH_THUMBNAIL
+                || viewType == VIEW_TYPE_SEARCH_WIDGET_PREVIEW) {
+            return appsPerRow;
+        }
+        return super.getGridSpanSize(viewType, appsPerRow);
+    }
+
+
+    @Override
+    public boolean onAdapterItemSelected(AllAppsGridAdapter.AdapterItem focusedItem) {
+        if (focusedItem instanceof SearchTargetHandler) {
+            SearchTarget searchTarget = ((SearchAdapterItem) focusedItem).getSearchTarget();
+            SearchEventTracker.INSTANCE.get(mLauncher).quickSelect(searchTarget);
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java b/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
new file mode 100644
index 0000000000..b79e073da8
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.search;
+
+import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_ICON;
+import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_ICON_ROW;
+import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_PEOPLE;
+import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_ROW;
+import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_ROW_WITH_BUTTON;
+import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_SLICE;
+import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_SUGGEST;
+import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_THUMBNAIL;
+import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_WIDGET_LIVE;
+import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_WIDGET_PREVIEW;
+
+import com.android.launcher3.allapps.AllAppsGridAdapter;
+import com.android.systemui.plugins.shared.SearchTarget;
+
+/**
+ * Extension of AdapterItem that contains an extra payload specific to item
+ */
+public class SearchAdapterItem extends AllAppsGridAdapter.AdapterItem {
+    private SearchTarget mSearchTarget;
+
+
+    private static final int AVAILABLE_FOR_ACCESSIBILITY = VIEW_TYPE_SEARCH_ROW_WITH_BUTTON
+            | VIEW_TYPE_SEARCH_SLICE | VIEW_TYPE_SEARCH_ROW | VIEW_TYPE_SEARCH_PEOPLE
+            | VIEW_TYPE_SEARCH_THUMBNAIL | VIEW_TYPE_SEARCH_ICON_ROW | VIEW_TYPE_SEARCH_ICON
+            | VIEW_TYPE_SEARCH_WIDGET_PREVIEW | VIEW_TYPE_SEARCH_WIDGET_LIVE
+            | VIEW_TYPE_SEARCH_SUGGEST;
+
+    public SearchAdapterItem(SearchTarget searchTarget, int type) {
+        mSearchTarget = searchTarget;
+        viewType = type;
+    }
+
+    public SearchTarget getSearchTarget() {
+        return mSearchTarget;
+    }
+
+    @Override
+    protected boolean isCountedForAccessibility() {
+        return (AVAILABLE_FOR_ACCESSIBILITY & viewType) == viewType;
+    }
+}
diff --git a/src/com/android/launcher3/allapps/search/SearchEventTracker.java b/quickstep/src/com/android/launcher3/search/SearchEventTracker.java
similarity index 95%
rename from src/com/android/launcher3/allapps/search/SearchEventTracker.java
rename to quickstep/src/com/android/launcher3/search/SearchEventTracker.java
index c276434ca8..efb7b19bea 100644
--- a/src/com/android/launcher3/allapps/search/SearchEventTracker.java
+++ b/quickstep/src/com/android/launcher3/search/SearchEventTracker.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.launcher3.allapps.search;
+package com.android.launcher3.search;
 
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
@@ -21,7 +21,6 @@ import android.content.Context;
 
 import androidx.annotation.Nullable;
 
-import com.android.launcher3.allapps.search.AllAppsSearchBarController.SearchTargetHandler;
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.systemui.plugins.AllAppsSearchPlugin;
 import com.android.systemui.plugins.shared.SearchTarget;
diff --git a/src/com/android/launcher3/views/SearchResultIcon.java b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
similarity index 97%
rename from src/com/android/launcher3/views/SearchResultIcon.java
rename to quickstep/src/com/android/launcher3/search/SearchResultIcon.java
index 9bcfb8c6eb..1aa89eecc5 100644
--- a/src/com/android/launcher3/views/SearchResultIcon.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.launcher3.views;
+package com.android.launcher3.search;
 
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
@@ -34,8 +34,6 @@ import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.allapps.AllAppsStore;
-import com.android.launcher3.allapps.search.AllAppsSearchBarController;
-import com.android.launcher3.allapps.search.SearchEventTracker;
 import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.model.data.AppInfo;
@@ -53,7 +51,7 @@ import java.util.function.Consumer;
  * A {@link BubbleTextView} representing a single cell result in AllApps
  */
 public class SearchResultIcon extends BubbleTextView implements
-        AllAppsSearchBarController.SearchTargetHandler, View.OnClickListener,
+        SearchTargetHandler, View.OnClickListener,
         View.OnLongClickListener {
 
 
diff --git a/src/com/android/launcher3/views/SearchResultIconRow.java b/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
similarity index 96%
rename from src/com/android/launcher3/views/SearchResultIconRow.java
rename to quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
index e3c7661166..b3dfbe28af 100644
--- a/src/com/android/launcher3/views/SearchResultIconRow.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.launcher3.views;
+package com.android.launcher3.search;
 
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
@@ -36,8 +36,6 @@ import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
-import com.android.launcher3.allapps.search.AllAppsSearchBarController;
-import com.android.launcher3.allapps.search.SearchEventTracker;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
@@ -53,7 +51,7 @@ import java.util.function.Consumer;
  * shortcuts
  */
 public class SearchResultIconRow extends LinearLayout implements
-        AllAppsSearchBarController.SearchTargetHandler, View.OnClickListener,
+        SearchTargetHandler, View.OnClickListener,
         View.OnLongClickListener, Consumer<ItemInfoWithIcon> {
     public static final int MAX_SHORTCUTS_COUNT = 2;
 
diff --git a/src/com/android/launcher3/views/SearchResultPeopleView.java b/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java
similarity index 97%
rename from src/com/android/launcher3/views/SearchResultPeopleView.java
rename to quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java
index e499bd5b66..e856531ee4 100644
--- a/src/com/android/launcher3/views/SearchResultPeopleView.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.launcher3.views;
+package com.android.launcher3.search;
 
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
@@ -42,8 +42,6 @@ import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
-import com.android.launcher3.allapps.search.AllAppsSearchBarController;
-import com.android.launcher3.allapps.search.SearchEventTracker;
 import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.LauncherIcons;
 import com.android.systemui.plugins.shared.SearchTarget;
@@ -55,7 +53,7 @@ import java.util.ArrayList;
  * A view representing a single people search result in all apps
  */
 public class SearchResultPeopleView extends LinearLayout implements
-        AllAppsSearchBarController.SearchTargetHandler {
+        SearchTargetHandler {
 
     public static final String TARGET_TYPE_PEOPLE = "people";
 
diff --git a/src/com/android/launcher3/views/SearchResultPlayItem.java b/quickstep/src/com/android/launcher3/search/SearchResultPlayItem.java
similarity index 97%
rename from src/com/android/launcher3/views/SearchResultPlayItem.java
rename to quickstep/src/com/android/launcher3/search/SearchResultPlayItem.java
index 86ed436f53..33c933077b 100644
--- a/src/com/android/launcher3/views/SearchResultPlayItem.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultPlayItem.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.launcher3.views;
+package com.android.launcher3.search;
 
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
@@ -41,8 +41,6 @@ import androidx.annotation.Nullable;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
-import com.android.launcher3.allapps.search.AllAppsSearchBarController;
-import com.android.launcher3.allapps.search.SearchEventTracker;
 import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.util.Themes;
 import com.android.systemui.plugins.shared.SearchTarget;
@@ -56,7 +54,7 @@ import java.net.URLConnection;
  * A View representing a PlayStore item.
  */
 public class SearchResultPlayItem extends LinearLayout implements
-        AllAppsSearchBarController.SearchTargetHandler {
+        SearchTargetHandler {
 
     public static final String TARGET_TYPE_PLAY = "play";
 
diff --git a/src/com/android/launcher3/views/SearchResultSettingsSlice.java b/quickstep/src/com/android/launcher3/search/SearchResultSettingsSlice.java
similarity index 93%
rename from src/com/android/launcher3/views/SearchResultSettingsSlice.java
rename to quickstep/src/com/android/launcher3/search/SearchResultSettingsSlice.java
index 29e6c1b8cf..826b653989 100644
--- a/src/com/android/launcher3/views/SearchResultSettingsSlice.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultSettingsSlice.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.launcher3.views;
+package com.android.launcher3.search;
 
 import android.content.Context;
 import android.net.Uri;
@@ -32,8 +32,6 @@ import androidx.slice.widget.SliceView;
 
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
-import com.android.launcher3.allapps.search.AllAppsSearchBarController;
-import com.android.launcher3.allapps.search.SearchEventTracker;
 import com.android.systemui.plugins.shared.SearchTarget;
 import com.android.systemui.plugins.shared.SearchTargetEvent;
 
@@ -41,7 +39,7 @@ import com.android.systemui.plugins.shared.SearchTargetEvent;
  * A slice view wrapper with settings app icon at start
  */
 public class SearchResultSettingsSlice extends LinearLayout implements
-        AllAppsSearchBarController.SearchTargetHandler, SliceView.OnSliceActionListener {
+        SearchTargetHandler, SliceView.OnSliceActionListener {
 
 
     public static final String TARGET_TYPE_SLICE = "settings_slice";
diff --git a/src/com/android/launcher3/views/SearchResultSuggestion.java b/quickstep/src/com/android/launcher3/search/SearchResultSuggestion.java
similarity index 95%
rename from src/com/android/launcher3/views/SearchResultSuggestion.java
rename to quickstep/src/com/android/launcher3/search/SearchResultSuggestion.java
index c67b1cf7f3..6a6bd1b14a 100644
--- a/src/com/android/launcher3/views/SearchResultSuggestion.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultSuggestion.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.launcher3.views;
+package com.android.launcher3.search;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -22,6 +22,7 @@ import android.util.AttributeSet;
 import android.view.ViewGroup;
 
 import com.android.launcher3.R;
+import com.android.launcher3.views.BaseDragLayer;
 
 /**
  * {@link SearchResultIconRow} with custom drawable resource
diff --git a/src/com/android/launcher3/views/SearchResultWidget.java b/quickstep/src/com/android/launcher3/search/SearchResultWidget.java
similarity index 96%
rename from src/com/android/launcher3/views/SearchResultWidget.java
rename to quickstep/src/com/android/launcher3/search/SearchResultWidget.java
index f76de3d2cf..ba26d852e7 100644
--- a/src/com/android/launcher3/views/SearchResultWidget.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultWidget.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.launcher3.views;
+package com.android.launcher3.search;
 
 import android.appwidget.AppWidgetHostView;
 import android.appwidget.AppWidgetProviderInfo;
@@ -32,8 +32,6 @@ import com.android.launcher3.AppWidgetResizeFrame;
 import com.android.launcher3.CheckLongPressHelper;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
-import com.android.launcher3.allapps.search.AllAppsSearchBarController;
-import com.android.launcher3.allapps.search.SearchEventTracker;
 import com.android.launcher3.allapps.search.SearchWidgetInfoContainer;
 import com.android.launcher3.dragndrop.DraggableView;
 import com.android.launcher3.touch.ItemLongClickListener;
@@ -46,7 +44,7 @@ import com.android.systemui.plugins.shared.SearchTargetEvent;
  * provider
  */
 public class SearchResultWidget extends RelativeLayout implements
-        AllAppsSearchBarController.SearchTargetHandler, DraggableView, View.OnLongClickListener {
+        SearchTargetHandler, DraggableView, View.OnLongClickListener {
 
     private static final String TAG = "SearchResultWidget";
 
diff --git a/src/com/android/launcher3/views/SearchResultWidgetPreview.java b/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java
similarity index 95%
rename from src/com/android/launcher3/views/SearchResultWidgetPreview.java
rename to quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java
index c11c232307..0d790252de 100644
--- a/src/com/android/launcher3/views/SearchResultWidgetPreview.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.launcher3.views;
+package com.android.launcher3.search;
 
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
@@ -32,8 +32,6 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.R;
-import com.android.launcher3.allapps.search.AllAppsSearchBarController;
-import com.android.launcher3.allapps.search.SearchEventTracker;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.touch.ItemLongClickListener;
@@ -48,7 +46,7 @@ import com.android.systemui.plugins.shared.SearchTargetEvent;
  * displays preview of a widget upon receiving {@link AppWidgetProviderInfo} from Search provider
  */
 public class SearchResultWidgetPreview extends LinearLayout implements
-        AllAppsSearchBarController.SearchTargetHandler, View.OnLongClickListener,
+        SearchTargetHandler, View.OnLongClickListener,
         View.OnClickListener {
 
     public static final String TARGET_TYPE_WIDGET_PREVIEW = "widget_preview";
diff --git a/src/com/android/launcher3/views/SearchSectionHeaderView.java b/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java
similarity index 91%
rename from src/com/android/launcher3/views/SearchSectionHeaderView.java
rename to quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java
index 326c23d1dc..a552366d1c 100644
--- a/src/com/android/launcher3/views/SearchSectionHeaderView.java
+++ b/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.launcher3.views;
+package com.android.launcher3.search;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -21,14 +21,13 @@ import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 
-import com.android.launcher3.allapps.search.AllAppsSearchBarController;
 import com.android.systemui.plugins.shared.SearchTarget;
 
 /**
  * Header text view that shows a title for a given section in All apps search
  */
 public class SearchSectionHeaderView extends TextView implements
-        AllAppsSearchBarController.SearchTargetHandler {
+        SearchTargetHandler {
     public static final String TARGET_TYPE_SECTION_HEADER = "section_header";
 
     public SearchSectionHeaderView(Context context) {
diff --git a/src/com/android/launcher3/views/SearchSettingsRowView.java b/quickstep/src/com/android/launcher3/search/SearchSettingsRowView.java
similarity index 95%
rename from src/com/android/launcher3/views/SearchSettingsRowView.java
rename to quickstep/src/com/android/launcher3/search/SearchSettingsRowView.java
index 160ee6514b..dc5c2f183e 100644
--- a/src/com/android/launcher3/views/SearchSettingsRowView.java
+++ b/quickstep/src/com/android/launcher3/search/SearchSettingsRowView.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.launcher3.views;
+package com.android.launcher3.search;
 
 import static com.android.launcher3.FastBitmapDrawable.newIcon;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
@@ -37,8 +37,6 @@ import com.android.launcher3.FastBitmapDrawable;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
-import com.android.launcher3.allapps.search.AllAppsSearchBarController;
-import com.android.launcher3.allapps.search.SearchEventTracker;
 import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.systemui.plugins.shared.SearchTarget;
 import com.android.systemui.plugins.shared.SearchTargetEvent;
@@ -50,7 +48,7 @@ import java.util.List;
  * A row of clickable TextViews with a breadcrumb for settings search.
  */
 public class SearchSettingsRowView extends LinearLayout implements
-        View.OnClickListener, AllAppsSearchBarController.SearchTargetHandler {
+        View.OnClickListener, SearchTargetHandler {
 
     public static final String TARGET_TYPE_SETTINGS_ROW = "settings_row";
 
diff --git a/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java b/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java
new file mode 100644
index 0000000000..347c7d46fc
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.search;
+
+import com.android.systemui.plugins.shared.SearchTarget;
+
+/**
+ * An interface for supporting dynamic search results
+ */
+public interface SearchTargetHandler {
+
+    /**
+     * Update view using values from {@link SearchTarget}
+     */
+    void applySearchTarget(SearchTarget searchTarget);
+
+    /**
+     * Handles selection of SearchTarget
+     */
+    default void handleSelection(int eventType) {
+    }
+
+}
diff --git a/src/com/android/launcher3/views/ThumbnailSearchResultView.java b/quickstep/src/com/android/launcher3/search/ThumbnailSearchResultView.java
similarity index 91%
rename from src/com/android/launcher3/views/ThumbnailSearchResultView.java
rename to quickstep/src/com/android/launcher3/search/ThumbnailSearchResultView.java
index 573d48f799..c100d6ad32 100644
--- a/src/com/android/launcher3/views/ThumbnailSearchResultView.java
+++ b/quickstep/src/com/android/launcher3/search/ThumbnailSearchResultView.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.launcher3.views;
+package com.android.launcher3.search;
 
 
-import static com.android.launcher3.views.SearchResultIcon.REMOTE_ACTION_SHOULD_START;
-import static com.android.launcher3.views.SearchResultIcon.REMOTE_ACTION_TOKEN;
+import static com.android.launcher3.search.SearchResultIcon.REMOTE_ACTION_SHOULD_START;
+import static com.android.launcher3.search.SearchResultIcon.REMOTE_ACTION_TOKEN;
 
 import android.content.Context;
 import android.content.Intent;
@@ -30,8 +30,6 @@ import androidx.core.graphics.drawable.RoundedBitmapDrawable;
 import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
 
 import com.android.launcher3.Launcher;
-import com.android.launcher3.allapps.search.AllAppsSearchBarController;
-import com.android.launcher3.allapps.search.SearchEventTracker;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.RemoteActionItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
@@ -44,7 +42,7 @@ import com.android.systemui.plugins.shared.SearchTargetEvent;
  * A view representing a high confidence app search result that includes shortcuts
  */
 public class ThumbnailSearchResultView extends androidx.appcompat.widget.AppCompatImageView
-        implements AllAppsSearchBarController.SearchTargetHandler {
+        implements SearchTargetHandler {
 
     public static final String TARGET_TYPE_SCREENSHOT = "screenshot";
     public static final String TARGET_TYPE_SCREENSHOT_LEGACY = "screenshot_legacy";
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 8c3b57abc9..d345165e78 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -42,6 +42,7 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.Workspace;
+import com.android.launcher3.allapps.search.SearchAdapterProvider;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.appprediction.PredictionRowView;
 import com.android.launcher3.config.FeatureFlags;
@@ -51,6 +52,7 @@ import com.android.launcher3.logging.StatsLogManager.StatsLogger;
 import com.android.launcher3.model.BgDataModel.FixedContainerItems;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.popup.SystemShortcut;
+import com.android.launcher3.search.DeviceSearchAdapterProvider;
 import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory;
 import com.android.launcher3.uioverrides.states.QuickstepAtomicAnimationFactory;
 import com.android.launcher3.uioverrides.touchcontrollers.NavBarToHomeTouchController;
@@ -263,6 +265,11 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
         }
     }
 
+    @Override
+    public SearchAdapterProvider createSearchAdapterProvider() {
+        return new DeviceSearchAdapterProvider(this);
+    }
+
     @Override
     public TouchController[] createTouchControllers() {
         Mode mode = SysUINavigationMode.getMode(this);
diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index d050030e74..c37fd84516 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -45,6 +45,7 @@ import com.android.launcher3.LauncherAnimationRunner.AnimationResult;
 import com.android.launcher3.R;
 import com.android.launcher3.WrappedAnimationRunnerImpl;
 import com.android.launcher3.WrappedLauncherAnimationRunner;
+import com.android.launcher3.allapps.search.SearchAdapterProvider;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.compat.AccessibilityManagerCompat;
@@ -91,6 +92,7 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
 
     // Strong refs to runners which are cleared when the activity is destroyed
     private WrappedAnimationRunnerImpl mActivityLaunchAnimationRunner;
+    private SearchAdapterProvider mSearchAdapterProvider;
 
     /**
      * Init drag layer and overview panel views.
diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java
index 52f0a4a612..33af4d7983 100644
--- a/src/com/android/launcher3/BaseDraggingActivity.java
+++ b/src/com/android/launcher3/BaseDraggingActivity.java
@@ -43,6 +43,8 @@ import android.widget.Toast;
 import androidx.annotation.Nullable;
 
 import com.android.launcher3.LauncherSettings.Favorites;
+import com.android.launcher3.allapps.search.DefaultSearchAdapterProvider;
+import com.android.launcher3.allapps.search.SearchAdapterProvider;
 import com.android.launcher3.logging.InstanceId;
 import com.android.launcher3.logging.InstanceIdSequence;
 import com.android.launcher3.model.data.ItemInfo;
@@ -187,7 +189,7 @@ public abstract class BaseDraggingActivity extends BaseActivity
                 logAppLaunch(item, instanceId);
             }
             return true;
-        } catch (NullPointerException|ActivityNotFoundException|SecurityException e) {
+        } catch (NullPointerException | ActivityNotFoundException | SecurityException e) {
             Toast.makeText(this, R.string.activity_not_found, Toast.LENGTH_SHORT).show();
             Log.e(TAG, "Unable to launch. tag=" + item + " intent=" + intent, e);
         }
@@ -290,4 +292,12 @@ public abstract class BaseDraggingActivity extends BaseActivity
         display.getSize(mwSize);
         return new WindowBounds(new Rect(0, 0, mwSize.x, mwSize.y), new Rect());
     }
+
+    /**
+     * Creates and returns {@link SearchAdapterProvider} for build variant specific search result
+     * views
+     */
+    public SearchAdapterProvider createSearchAdapterProvider() {
+        return new DefaultSearchAdapterProvider(this);
+    }
 }
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 558c6a81a5..b016df189b 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -16,7 +16,6 @@
 package com.android.launcher3.allapps;
 
 import static com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItem;
-import static com.android.launcher3.allapps.AllAppsGridAdapter.SearchAdapterItem;
 import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_HAS_SHORTCUT_PERMISSION;
 import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_QUIET_MODE_CHANGE_PERMISSION;
 import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_QUIET_MODE_ENABLED;
@@ -57,7 +56,7 @@ import com.android.launcher3.Insettable;
 import com.android.launcher3.InsettableFrameLayout;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.allapps.search.SearchEventTracker;
+import com.android.launcher3.allapps.search.SearchAdapterProvider;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.keyboard.FocusedItemDecorator;
 import com.android.launcher3.model.data.AppInfo;
@@ -68,7 +67,6 @@ import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.RecyclerViewFastScroller;
 import com.android.launcher3.views.SpringRelativeLayout;
-import com.android.systemui.plugins.shared.SearchTarget;
 
 /**
  * The all apps view container.
@@ -110,6 +108,8 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
 
     private Rect mInsets = new Rect();
 
+    SearchAdapterProvider mSearchAdapterProvider;
+
     public AllAppsContainerView(Context context) {
         this(context, null);
     }
@@ -124,6 +124,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         mLauncher = BaseDraggingActivity.fromContext(context);
         mLauncher.addOnDeviceProfileChangeListener(this);
 
+        mSearchAdapterProvider = mLauncher.createSearchAdapterProvider();
         mSearchQueryBuilder = new SpannableStringBuilder();
         Selection.setSelection(mSearchQueryBuilder, 0);
 
@@ -141,6 +142,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         addSpringView(R.id.all_apps_tabs_view_pager);
 
         mMultiValueAlpha = new MultiValueAlpha(this, ALPHA_CHANNEL_COUNT);
+
     }
 
     /**
@@ -545,9 +547,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
             return mLauncher.startActivitySafely(v, headerItem.getIntent(), headerItem);
         }
         AdapterItem focusedItem = getActiveRecyclerView().getApps().getFocusedChild();
-        if (focusedItem instanceof SearchAdapterItem) {
-            SearchTarget searchTarget = ((SearchAdapterItem) focusedItem).getSearchTarget();
-            SearchEventTracker.INSTANCE.get(getContext()).quickSelect(searchTarget);
+        if (mSearchAdapterProvider.onAdapterItemSelected(focusedItem)) {
             return true;
         }
         if (focusedItem.appInfo != null) {
@@ -677,7 +677,8 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         AdapterHolder(boolean isWork) {
             mIsWork = isWork;
             appsList = new AlphabeticalAppsList(mLauncher, mAllAppsStore, isWork);
-            adapter = new AllAppsGridAdapter(mLauncher, getLayoutInflater(), appsList);
+            adapter = new AllAppsGridAdapter(mLauncher, getLayoutInflater(), appsList,
+                    mSearchAdapterProvider);
             appsList.setAdapter(adapter);
             layoutManager = adapter.getLayoutManager();
         }
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index 3c88288160..715c142ac9 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -41,13 +41,11 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.R;
-import com.android.launcher3.allapps.search.AllAppsSearchBarController.SearchTargetHandler;
+import com.android.launcher3.allapps.search.SearchAdapterProvider;
 import com.android.launcher3.allapps.search.SearchSectionInfo;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.util.PackageManagerHelper;
-import com.android.launcher3.views.SearchResultWidget;
-import com.android.systemui.plugins.shared.SearchTarget;
 
 import java.util.List;
 
@@ -72,31 +70,11 @@ public class AllAppsGridAdapter extends
     // A divider that separates the apps list and the search market button
     public static final int VIEW_TYPE_ALL_APPS_DIVIDER = 1 << 4;
 
-    public static final int VIEW_TYPE_SEARCH_CORPUS_TITLE = 1 << 5;
-
-    public static final int VIEW_TYPE_SEARCH_ROW_WITH_BUTTON = 1 << 7;
-
-    public static final int VIEW_TYPE_SEARCH_ROW = 1 << 8;
-
-    public static final int VIEW_TYPE_SEARCH_SLICE = 1 << 9;
-
-    public static final int VIEW_TYPE_SEARCH_ICON_ROW = 1 << 10;
-
-    public static final int VIEW_TYPE_SEARCH_PEOPLE = 1 << 11;
-
-    public static final int VIEW_TYPE_SEARCH_THUMBNAIL = 1 << 12;
-
-    public static final int VIEW_TYPE_SEARCH_SUGGEST = 1 << 13;
-
-    public static final int VIEW_TYPE_SEARCH_ICON = 1 << 14;
-
-    public static final int VIEW_TYPE_SEARCH_WIDGET_LIVE = 1 << 15;
-
-    public static final int VIEW_TYPE_SEARCH_WIDGET_PREVIEW = 1 << 16;
-
     // Common view type masks
     public static final int VIEW_TYPE_MASK_DIVIDER = VIEW_TYPE_ALL_APPS_DIVIDER;
-    public static final int VIEW_TYPE_MASK_ICON = VIEW_TYPE_ICON | VIEW_TYPE_SEARCH_ICON;
+    public static final int VIEW_TYPE_MASK_ICON = VIEW_TYPE_ICON;
+
+    private final SearchAdapterProvider mSearchAdapterProvider;
 
     /**
      * ViewHolder for each icon.
@@ -177,32 +155,8 @@ public class AllAppsGridAdapter extends
             return item;
         }
 
-        boolean isCountedForAccessibility() {
-            return viewType == VIEW_TYPE_ICON
-                    || viewType == VIEW_TYPE_SEARCH_ROW_WITH_BUTTON
-                    || viewType == VIEW_TYPE_SEARCH_SLICE
-                    || viewType == VIEW_TYPE_SEARCH_ROW
-                    || viewType == VIEW_TYPE_SEARCH_PEOPLE
-                    || viewType == VIEW_TYPE_SEARCH_THUMBNAIL
-                    || viewType == VIEW_TYPE_SEARCH_ICON_ROW
-                    || viewType == VIEW_TYPE_SEARCH_ICON
-                    || viewType == VIEW_TYPE_SEARCH_SUGGEST;
-        }
-    }
-
-    /**
-     * Extension of AdapterItem that contains an extra payload specific to item
-     */
-    public static class SearchAdapterItem extends AdapterItem {
-        private SearchTarget mSearchTarget;
-
-        public SearchAdapterItem(SearchTarget searchTarget, int type) {
-            mSearchTarget = searchTarget;
-            viewType = type;
-        }
-
-        public SearchTarget getSearchTarget() {
-            return mSearchTarget;
+        protected boolean isCountedForAccessibility() {
+            return viewType == VIEW_TYPE_ICON || viewType == VIEW_TYPE_SEARCH_MARKET;
         }
     }
 
@@ -289,9 +243,8 @@ public class AllAppsGridAdapter extends
             int viewType = mApps.getAdapterItems().get(position).viewType;
             if (isIconViewType(viewType)) {
                 return 1 * SPAN_MULTIPLIER;
-            } else if (viewType == VIEW_TYPE_SEARCH_THUMBNAIL
-                    || viewType == VIEW_TYPE_SEARCH_WIDGET_PREVIEW) {
-                return mAppsPerRow;
+            } else if (mSearchAdapterProvider.isSearchView(viewType)) {
+                return mSearchAdapterProvider.getGridSpanSize(viewType, mAppsPerRow);
             } else {
                 // Section breaks span the full width
                 return mAppsPerRow * SPAN_MULTIPLIER;
@@ -321,7 +274,7 @@ public class AllAppsGridAdapter extends
     private Intent mMarketSearchIntent;
 
     public AllAppsGridAdapter(BaseDraggingActivity launcher, LayoutInflater inflater,
-            AlphabeticalAppsList apps) {
+            AlphabeticalAppsList apps, SearchAdapterProvider searchAdapterProvider) {
         Resources res = launcher.getResources();
         mLauncher = launcher;
         mApps = apps;
@@ -334,6 +287,8 @@ public class AllAppsGridAdapter extends
         mOnIconClickListener = launcher.getItemOnClickListener();
 
         setAppsPerRow(mLauncher.getDeviceProfile().inv.numAllAppsColumns);
+
+        mSearchAdapterProvider = searchAdapterProvider;
     }
 
     public void setAppsPerRow(int appsPerRow) {
@@ -406,40 +361,11 @@ public class AllAppsGridAdapter extends
             case VIEW_TYPE_ALL_APPS_DIVIDER:
                 return new ViewHolder(mLayoutInflater.inflate(
                         R.layout.all_apps_divider, parent, false));
-            case VIEW_TYPE_SEARCH_ICON:
-                return new ViewHolder(mLayoutInflater.inflate(
-                        R.layout.search_result_icon, parent, false));
-            case VIEW_TYPE_SEARCH_CORPUS_TITLE:
-                return new ViewHolder(
-                        mLayoutInflater.inflate(R.layout.search_section_title, parent, false));
-            case VIEW_TYPE_SEARCH_ROW_WITH_BUTTON:
-                return new ViewHolder(mLayoutInflater.inflate(
-                        R.layout.search_result_play_item, parent, false));
-            case VIEW_TYPE_SEARCH_ROW:
-                return new ViewHolder(mLayoutInflater.inflate(
-                        R.layout.search_result_settings_row, parent, false));
-            case VIEW_TYPE_SEARCH_SLICE:
-                return new ViewHolder(mLayoutInflater.inflate(
-                        R.layout.search_result_slice, parent, false));
-            case VIEW_TYPE_SEARCH_ICON_ROW:
-                return new ViewHolder(mLayoutInflater.inflate(
-                        R.layout.search_result_icon_row, parent, false));
-            case VIEW_TYPE_SEARCH_PEOPLE:
-                return new ViewHolder(mLayoutInflater.inflate(
-                        R.layout.search_result_people_item, parent, false));
-            case VIEW_TYPE_SEARCH_THUMBNAIL:
-                return new ViewHolder(mLayoutInflater.inflate(
-                        R.layout.search_result_thumbnail, parent, false));
-            case VIEW_TYPE_SEARCH_SUGGEST:
-                return new ViewHolder(mLayoutInflater.inflate(
-                        R.layout.search_result_suggest, parent, false));
-            case VIEW_TYPE_SEARCH_WIDGET_LIVE:
-                return new ViewHolder(mLayoutInflater.inflate(
-                        R.layout.search_result_widget_live, parent, false));
-            case VIEW_TYPE_SEARCH_WIDGET_PREVIEW:
-                return new ViewHolder(mLayoutInflater.inflate(
-                        R.layout.search_result_widget_preview, parent, false));
             default:
+                if (mSearchAdapterProvider.isSearchView(viewType)) {
+                    return mSearchAdapterProvider.onCreateViewHolder(mLayoutInflater, parent,
+                            viewType);
+                }
                 throw new RuntimeException("Unexpected view type");
         }
     }
@@ -472,25 +398,11 @@ public class AllAppsGridAdapter extends
                     searchView.setVisibility(View.GONE);
                 }
                 break;
-            case VIEW_TYPE_SEARCH_CORPUS_TITLE:
-            case VIEW_TYPE_SEARCH_ROW_WITH_BUTTON:
-            case VIEW_TYPE_SEARCH_SLICE:
-            case VIEW_TYPE_SEARCH_ROW:
-            case VIEW_TYPE_SEARCH_ICON:
-            case VIEW_TYPE_SEARCH_ICON_ROW:
-            case VIEW_TYPE_SEARCH_PEOPLE:
-            case VIEW_TYPE_SEARCH_THUMBNAIL:
-            case VIEW_TYPE_SEARCH_SUGGEST:
-            case VIEW_TYPE_SEARCH_WIDGET_LIVE:
-            case VIEW_TYPE_SEARCH_WIDGET_PREVIEW:
-                SearchAdapterItem item =
-                        (SearchAdapterItem) mApps.getAdapterItems().get(position);
-                SearchTargetHandler payloadResultView = (SearchTargetHandler) holder.itemView;
-                payloadResultView.applySearchTarget(item.getSearchTarget());
-                break;
             case VIEW_TYPE_ALL_APPS_DIVIDER:
                 // nothing to do
                 break;
+            default:
+                mSearchAdapterProvider.onBindView(holder, position);
         }
     }
 
@@ -501,9 +413,6 @@ public class AllAppsGridAdapter extends
         if (holder.itemView instanceof AllAppsSectionDecorator.SelfDecoratingView) {
             ((AllAppsSectionDecorator.SelfDecoratingView) holder.itemView).removeDecoration();
         }
-        if (holder.itemView instanceof SearchResultWidget) {
-            ((SearchResultWidget) holder.itemView).removeListener();
-        }
     }
 
     @Override
diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
index 1fa43d00e2..e61b95d070 100644
--- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
@@ -104,7 +104,6 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
         pool.setMaxRecycledViews(AllAppsGridAdapter.VIEW_TYPE_ALL_APPS_DIVIDER, 1);
         pool.setMaxRecycledViews(AllAppsGridAdapter.VIEW_TYPE_SEARCH_MARKET, 1);
         pool.setMaxRecycledViews(AllAppsGridAdapter.VIEW_TYPE_ICON, approxRows * mNumAppsPerRow);
-        pool.setMaxRecycledViews(AllAppsGridAdapter.VIEW_TYPE_SEARCH_CORPUS_TITLE, 1);
 
         mViewHeights.clear();
         mViewHeights.put(AllAppsGridAdapter.VIEW_TYPE_ICON, grid.allAppsCellHeightPx);
diff --git a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
index bc5a5f2cf1..f09f1cabd0 100644
--- a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
+++ b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
@@ -34,7 +34,6 @@ import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItem;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.systemui.plugins.AllAppsSearchPlugin;
-import com.android.systemui.plugins.shared.SearchTarget;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -211,23 +210,5 @@ public class AllAppsSearchBarController
         void clearSearchResult();
     }
 
-    /**
-     * An interface for supporting dynamic search results
-     */
-    public interface SearchTargetHandler {
-
-        /**
-         * Update view using values from {@link SearchTarget}
-         */
-        void applySearchTarget(SearchTarget searchTarget);
-
-        /**
-         * Handles selection of SearchTarget
-         */
-        default void handleSelection(int eventType) {
-        }
-
-    }
-
 
 }
\ No newline at end of file
diff --git a/src/com/android/launcher3/allapps/search/DefaultSearchAdapterProvider.java b/src/com/android/launcher3/allapps/search/DefaultSearchAdapterProvider.java
new file mode 100644
index 0000000000..e3c178b937
--- /dev/null
+++ b/src/com/android/launcher3/allapps/search/DefaultSearchAdapterProvider.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.allapps.search;
+
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import com.android.launcher3.BaseDraggingActivity;
+import com.android.launcher3.allapps.AllAppsGridAdapter;
+
+/**
+ * Provides views for local search results
+ */
+public class DefaultSearchAdapterProvider extends SearchAdapterProvider {
+
+    public DefaultSearchAdapterProvider(BaseDraggingActivity launcher) {
+        super(launcher);
+    }
+
+    @Override
+    public void onBindView(AllAppsGridAdapter.ViewHolder holder, int position) {
+
+    }
+
+    @Override
+    public boolean isSearchView(int viewType) {
+        return false;
+    }
+
+    @Override
+    public AllAppsGridAdapter.ViewHolder onCreateViewHolder(LayoutInflater layoutInflater,
+            ViewGroup parent, int viewType) {
+        return null;
+    }
+
+    @Override
+    public boolean onAdapterItemSelected(AllAppsGridAdapter.AdapterItem focusedItem) {
+        return false;
+    }
+}
diff --git a/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java b/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
new file mode 100644
index 0000000000..1c7247aadb
--- /dev/null
+++ b/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.allapps.search;
+
+
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import com.android.launcher3.BaseDraggingActivity;
+import com.android.launcher3.allapps.AllAppsGridAdapter;
+
+/**
+ * A UI expansion wrapper providing for search results
+ */
+public abstract class SearchAdapterProvider {
+
+    protected final BaseDraggingActivity mLauncher;
+
+    public SearchAdapterProvider(BaseDraggingActivity launcher) {
+        mLauncher = launcher;
+    }
+
+    /**
+     * Called from RecyclerView.Adapter#onBindViewHolder
+     */
+    public abstract void onBindView(AllAppsGridAdapter.ViewHolder holder, int position);
+
+    /**
+     * Returns whether or not viewType can be handled by searchProvider
+     */
+    public abstract boolean isSearchView(int viewType);
+
+    /**
+     * Called from RecyclerView.Adapter#onCreateViewHolder
+     */
+    public abstract AllAppsGridAdapter.ViewHolder onCreateViewHolder(LayoutInflater layoutInflater,
+            ViewGroup parent, int viewType);
+
+    /**
+     * Returns how many cells a view should span
+     */
+    public int getGridSpanSize(int viewType, int appsPerRow) {
+        return appsPerRow * AllAppsGridAdapter.SPAN_MULTIPLIER;
+    }
+
+    /**
+     * handles selection event on search adapter item. Returns false if provider can not handle
+     * event
+     */
+    public abstract boolean onAdapterItemSelected(AllAppsGridAdapter.AdapterItem focusedItem);
+}
-- 
GitLab


From a5f289a6059a6655ec5fb2406ec8c4f4f7caf665 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Wed, 13 Jan 2021 10:26:00 -0600
Subject: [PATCH 0389/1664] Increase timeout and additional logs for
 WorkTabTest#testWorkEduFlow

Bug: 159671700
Test: WorkTabTest#testWorkEduFlow
Change-Id: I5c015fbb9555be0e3e74c721873da4edd0393c8a
---
 tests/src/com/android/launcher3/ui/WorkTabTest.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/src/com/android/launcher3/ui/WorkTabTest.java b/tests/src/com/android/launcher3/ui/WorkTabTest.java
index ac0d355704..aef26ae3d0 100644
--- a/tests/src/com/android/launcher3/ui/WorkTabTest.java
+++ b/tests/src/com/android/launcher3/ui/WorkTabTest.java
@@ -150,11 +150,15 @@ public class WorkTabTest extends AbstractLauncherUiTest {
         waitForLauncherCondition("Launcher did not show the next edu screen", l -> {
             Log.d(TestProtocol.WORK_PROFILE_REMOVED,
                     "running test attempt" + attempt.getAndIncrement());
+            if (!(l.getAppsView().getContentView() instanceof AllAppsPagedView)) {
+                Log.d(TestProtocol.WORK_PROFILE_REMOVED, "Work tab not setup. Skipping test");
+                return false;
+            }
             return ((AllAppsPagedView) l.getAppsView().getContentView()).getCurrentPage()
                     == WORK_PAGE && ((TextView) workEduView.findViewById(
                     R.id.content_text)).getText().equals(
                     l.getResources().getString(R.string.work_profile_edu_work_apps));
-        });
+        }, 60000);
     }
 
     @Test
-- 
GitLab


From 6478fa649a36ab81da1aa0db8aa51b2819f19879 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Fri, 4 Dec 2020 23:00:01 +0100
Subject: [PATCH 0390/1664] Migrate FrameTracker to use ST Jank information
 (2/2)

Test: FrameTrackerTest
Test: Systrace, perform CUJ
Bug: 174755489
Change-Id: I6abecbd9b244f443c9df389938d82427f9584037
---
 .../com/android/launcher3/BaseQuickstepLauncher.java   |  8 --------
 .../launcher3/QuickstepAppTransitionManagerImpl.java   |  2 +-
 .../src/com/android/quickstep/AbsSwipeUpHandler.java   | 10 ++++++----
 .../com/android/quickstep/OverviewCommandHelper.java   |  4 +++-
 .../android/quickstep/util/SwipePipToHomeAnimator.java |  6 ++++--
 5 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 4204597c03..3643d6d7e3 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -316,12 +316,4 @@ public abstract class BaseQuickstepLauncher extends Launcher
     public void setHintUserWillBeActive() {
         addActivityFlags(ACTIVITY_STATE_USER_WILL_BE_ACTIVE);
     }
-
-    @Override
-    public void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        if (Utilities.ATLEAST_R) {
-            InteractionJankMonitorWrapper.init(getWindow().getDecorView());
-        }
-    }
 }
diff --git a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
index 108006b5f0..8e6a5b628b 100644
--- a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
@@ -763,7 +763,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
         anim.addListener(new AnimationSuccessListener() {
             @Override
             public void onAnimationStart(Animator animation) {
-                InteractionJankMonitorWrapper.begin(cuj);
+                InteractionJankMonitorWrapper.begin(mDragLayer, cuj);
                 super.onAnimationStart(animation);
             }
 
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 5f196feaa1..a7e4741c07 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -721,9 +721,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
 
     @UiThread
     public void onGestureStarted(boolean isLikelyToStartNewTask) {
-        InteractionJankMonitorWrapper.begin(
+        InteractionJankMonitorWrapper.begin(mRecentsView,
                 InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH, 2000 /* ms timeout */);
-        InteractionJankMonitorWrapper.begin(
+        InteractionJankMonitorWrapper.begin(mRecentsView,
                 InteractionJankMonitorWrapper.CUJ_APP_CLOSE_TO_HOME);
         notifyGestureStartedAsync();
         setIsLikelyToStartNewTask(isLikelyToStartNewTask, false /* animate */);
@@ -805,7 +805,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         maybeUpdateRecentsAttachedState(false);
         final GestureEndTarget endTarget = mGestureState.getEndTarget();
         if (endTarget != NEW_TASK) {
-            InteractionJankMonitorWrapper.cancel(InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH);
+            InteractionJankMonitorWrapper.cancel(
+                    InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH);
         }
         if (endTarget != HOME) {
             InteractionJankMonitorWrapper.cancel(
@@ -1165,7 +1166,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                 TaskInfoCompat.getPipSourceRectHint(runningTaskTarget.pictureInPictureParams),
                 TaskInfoCompat.getWindowConfigurationBounds(taskInfo),
                 startBounds,
-                destinationBounds);
+                destinationBounds,
+                mRecentsView);
         // We would assume home and app window always in the same rotation While homeRotation
         // is not ROTATION_0 (which implies the rotation is turned on in launcher settings).
         if (homeRotation == ROTATION_0
diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
index fd9c315f78..ec6e303830 100644
--- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
@@ -175,7 +175,9 @@ public class OverviewCommandHelper {
                 return;
             }
 
-            InteractionJankMonitorWrapper.begin(InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH);
+            InteractionJankMonitorWrapper.begin(
+                    mActivityInterface.getCreatedActivity().getRootView(),
+                    InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH);
 
             // Otherwise, start overview.
             mListener = mActivityInterface.createActivityInitListener(this::onActivityReady);
diff --git a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
index 8fbd645be4..378f25b7dc 100644
--- a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
+++ b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
@@ -28,6 +28,7 @@ import android.graphics.RectF;
 import android.util.Log;
 import android.view.Surface;
 import android.view.SurfaceControl;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 
@@ -91,7 +92,8 @@ public class SwipePipToHomeAnimator extends ValueAnimator implements
             @NonNull Rect sourceRectHint,
             @NonNull Rect appBounds,
             @NonNull Rect startBounds,
-            @NonNull Rect destinationBounds) {
+            @NonNull Rect destinationBounds,
+            @NonNull View view) {
         mTaskId = taskId;
         mComponentName = componentName;
         mLeash = leash;
@@ -110,7 +112,7 @@ public class SwipePipToHomeAnimator extends ValueAnimator implements
         addListener(new AnimationSuccessListener() {
             @Override
             public void onAnimationStart(Animator animation) {
-                InteractionJankMonitorWrapper.begin(CUJ_APP_CLOSE_TO_PIP);
+                InteractionJankMonitorWrapper.begin(view, CUJ_APP_CLOSE_TO_PIP);
                 super.onAnimationStart(animation);
             }
 
-- 
GitLab


From a60d1f9be7eb041a3988c7906815043ba065b465 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Tue, 12 Jan 2021 20:39:46 -0600
Subject: [PATCH 0391/1664] Migrate from Plugin SearchTarget to API search
 Target [2/3]

- Adds support for android.app.search.SearchTarget in plugin while maintaining plugin SearchTarget support
- Introduces SEARCH_TARGET_LEGACY temporary to switch between plugin and sdk variants.
- Maps resultType and layoutType pairs to the appropriate view

Bug: 177223401
Test: Manual
Change-Id: If8d4bb7c21c47a12447dcb0c56eed8781bd21e54
---
 .../search/DeviceSearchAdapterProvider.java   | 34 ++++++++++++---
 .../launcher3/search/SearchAdapterItem.java   | 15 ++++++-
 .../launcher3/search/SearchEventTracker.java  | 17 ++++----
 .../launcher3/search/SearchResultIcon.java    | 25 +++++++----
 .../launcher3/search/SearchResultIconRow.java | 13 +++---
 .../search/SearchResultPeopleView.java        | 16 +++----
 .../search/SearchResultPlayItem.java          | 14 +++---
 .../search/SearchResultSettingsSlice.java     | 14 +++---
 .../launcher3/search/SearchResultWidget.java  | 14 +++---
 .../search/SearchResultWidgetPreview.java     | 14 +++---
 .../search/SearchSectionHeaderView.java       |  4 +-
 .../search/SearchSettingsRowView.java         | 12 +++---
 .../launcher3/search/SearchTargetHandler.java | 15 +++++--
 .../search/ThumbnailSearchResultView.java     | 12 +++---
 .../uioverrides/QuickstepLauncher.java        |  5 ++-
 .../launcher3/BaseDraggingActivity.java       |  3 +-
 .../allapps/AllAppsContainerView.java         |  6 ++-
 .../launcher3/config/FeatureFlags.java        |  4 ++
 .../systemui/plugins/AllAppsSearchPlugin.java | 43 +++++++++++++++----
 ...vent.java => SearchTargetEventLegacy.java} | 23 ++++++----
 ...rchTarget.java => SearchTargetLegacy.java} | 17 +++++---
 21 files changed, 209 insertions(+), 111 deletions(-)
 rename src_plugins/com/android/systemui/plugins/shared/{SearchTargetEvent.java => SearchTargetEventLegacy.java} (76%)
 rename src_plugins/com/android/systemui/plugins/shared/{SearchTarget.java => SearchTargetLegacy.java} (89%)

diff --git a/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java b/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
index da325c7705..9ce196ef84 100644
--- a/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
+++ b/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
@@ -18,15 +18,18 @@ package com.android.launcher3.search;
 
 import static com.android.launcher3.allapps.AllAppsGridAdapter.VIEW_TYPE_ICON;
 
+import android.app.search.SearchTarget;
 import android.util.SparseIntArray;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
+import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.allapps.AllAppsGridAdapter;
 import com.android.launcher3.allapps.search.SearchAdapterProvider;
-import com.android.systemui.plugins.shared.SearchTarget;
+import com.android.launcher3.config.FeatureFlags;
+import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
 /**
  * Provides views for on-device search results
@@ -45,11 +48,13 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
     public static final int VIEW_TYPE_SEARCH_WIDGET_LIVE = 1 << 15;
     public static final int VIEW_TYPE_SEARCH_WIDGET_PREVIEW = 1 << 16;
 
+    private final AllAppsContainerView mAppsView;
 
     private final SparseIntArray mViewTypeToLayoutMap = new SparseIntArray();
 
-    public DeviceSearchAdapterProvider(Launcher launcher) {
+    public DeviceSearchAdapterProvider(Launcher launcher, AllAppsContainerView appsView) {
         super(launcher);
+        mAppsView = appsView;
 
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_ICON, R.layout.search_result_icon);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_CORPUS_TITLE, R.layout.search_section_title);
@@ -68,12 +73,16 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
 
     @Override
     public void onBindView(AllAppsGridAdapter.ViewHolder holder, int position) {
-        SearchAdapterItem item = (SearchAdapterItem) Launcher.getLauncher(mLauncher)
-                .getAppsView().getApps().getAdapterItems().get(position);
+        SearchAdapterItem item = (SearchAdapterItem) mAppsView.getApps().getAdapterItems().get(
+                position);
         SearchTargetHandler
                 payloadResultView =
                 (SearchTargetHandler) holder.itemView;
-        payloadResultView.applySearchTarget(item.getSearchTarget());
+        if (FeatureFlags.SEARCH_TARGET_LEGACY.get()) {
+            payloadResultView.applySearchTarget(item.getSearchTargetLegacy());
+        } else {
+            payloadResultView.applySearchTarget(item.getSearchTarget());
+        }
     }
 
     @Override
@@ -101,10 +110,23 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
     @Override
     public boolean onAdapterItemSelected(AllAppsGridAdapter.AdapterItem focusedItem) {
         if (focusedItem instanceof SearchTargetHandler) {
-            SearchTarget searchTarget = ((SearchAdapterItem) focusedItem).getSearchTarget();
+            SearchTargetLegacy searchTarget = ((SearchAdapterItem) focusedItem)
+                    .getSearchTargetLegacy();
             SearchEventTracker.INSTANCE.get(mLauncher).quickSelect(searchTarget);
             return true;
         }
         return false;
     }
+
+    /**
+     * Determines what view type should be used to present search target.
+     * Returns -1 if viewType is not found
+     */
+    public int getViewTypeForSearchTarget(SearchTarget t) {
+        //TODO: Replace with values from :SearchUi
+        if (t.getResultType() == 1 && t.getLayoutType().equals("icon")) {
+            return VIEW_TYPE_SEARCH_ICON;
+        }
+        return -1;
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java b/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
index b79e073da8..258d97750b 100644
--- a/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
+++ b/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
@@ -27,13 +27,16 @@ import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_WIDGET_LIVE;
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_WIDGET_PREVIEW;
 
+import android.app.search.SearchTarget;
+
 import com.android.launcher3.allapps.AllAppsGridAdapter;
-import com.android.systemui.plugins.shared.SearchTarget;
+import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
 /**
  * Extension of AdapterItem that contains an extra payload specific to item
  */
 public class SearchAdapterItem extends AllAppsGridAdapter.AdapterItem {
+    private SearchTargetLegacy mSearchTargetLegacy;
     private SearchTarget mSearchTarget;
 
 
@@ -43,11 +46,21 @@ public class SearchAdapterItem extends AllAppsGridAdapter.AdapterItem {
             | VIEW_TYPE_SEARCH_WIDGET_PREVIEW | VIEW_TYPE_SEARCH_WIDGET_LIVE
             | VIEW_TYPE_SEARCH_SUGGEST;
 
+    public SearchAdapterItem(SearchTargetLegacy searchTargetLegacy, int type) {
+        mSearchTargetLegacy = searchTargetLegacy;
+        viewType = type;
+    }
+
+
     public SearchAdapterItem(SearchTarget searchTarget, int type) {
         mSearchTarget = searchTarget;
         viewType = type;
     }
 
+    public SearchTargetLegacy getSearchTargetLegacy() {
+        return mSearchTargetLegacy;
+    }
+
     public SearchTarget getSearchTarget() {
         return mSearchTarget;
     }
diff --git a/quickstep/src/com/android/launcher3/search/SearchEventTracker.java b/quickstep/src/com/android/launcher3/search/SearchEventTracker.java
index efb7b19bea..90fe661df4 100644
--- a/quickstep/src/com/android/launcher3/search/SearchEventTracker.java
+++ b/quickstep/src/com/android/launcher3/search/SearchEventTracker.java
@@ -23,8 +23,8 @@ import androidx.annotation.Nullable;
 
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.systemui.plugins.AllAppsSearchPlugin;
-import com.android.systemui.plugins.shared.SearchTarget;
-import com.android.systemui.plugins.shared.SearchTargetEvent;
+import com.android.systemui.plugins.shared.SearchTargetEventLegacy;
+import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
 import java.util.WeakHashMap;
 
@@ -34,7 +34,7 @@ import java.util.WeakHashMap;
 public class SearchEventTracker {
     @Nullable
     private AllAppsSearchPlugin mPlugin;
-    private final WeakHashMap<SearchTarget, SearchTargetHandler>
+    private final WeakHashMap<SearchTargetLegacy, SearchTargetHandler>
             mCallbacks = new WeakHashMap<>();
 
     public static final MainThreadInitializedObject<SearchEventTracker> INSTANCE =
@@ -60,26 +60,27 @@ public class SearchEventTracker {
     /**
      * Sends SearchTargetEvent to search provider
      */
-    public void notifySearchTargetEvent(SearchTargetEvent searchTargetEvent) {
+    public void notifySearchTargetEvent(SearchTargetEventLegacy searchTargetEvent) {
         if (mPlugin != null) {
-            UI_HELPER_EXECUTOR.post(() -> mPlugin.notifySearchTargetEvent(searchTargetEvent));
+            UI_HELPER_EXECUTOR.post(() -> mPlugin.notifySearchTargetEventLegacy(searchTargetEvent));
         }
     }
 
     /**
      * Registers a {@link SearchTargetHandler} to handle quick launch for specified SearchTarget.
      */
-    public void registerWeakHandler(SearchTarget searchTarget, SearchTargetHandler targetHandler) {
+    public void registerWeakHandler(SearchTargetLegacy searchTarget,
+            SearchTargetHandler targetHandler) {
         mCallbacks.put(searchTarget, targetHandler);
     }
 
     /**
      * Handles quick select for SearchTarget
      */
-    public void quickSelect(SearchTarget searchTarget) {
+    public void quickSelect(SearchTargetLegacy searchTarget) {
         SearchTargetHandler searchTargetHandler = mCallbacks.get(searchTarget);
         if (searchTargetHandler != null) {
-            searchTargetHandler.handleSelection(SearchTargetEvent.QUICK_SELECT);
+            searchTargetHandler.handleSelection(SearchTargetEventLegacy.QUICK_SELECT);
         }
     }
 
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
index 1aa89eecc5..e4d737c44f 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
@@ -20,6 +20,7 @@ import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
 import android.app.RemoteAction;
+import android.app.search.SearchTarget;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.ShortcutInfo;
@@ -42,8 +43,8 @@ import com.android.launcher3.model.data.RemoteActionItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.touch.ItemLongClickListener;
 import com.android.launcher3.util.ComponentKey;
-import com.android.systemui.plugins.shared.SearchTarget;
-import com.android.systemui.plugins.shared.SearchTargetEvent;
+import com.android.systemui.plugins.shared.SearchTargetEventLegacy;
+import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
 import java.util.function.Consumer;
 
@@ -69,7 +70,7 @@ public class SearchResultIcon extends BubbleTextView implements
 
     private final Launcher mLauncher;
 
-    private SearchTarget mSearchTarget;
+    private SearchTargetLegacy mSearchTarget;
     private Consumer<ItemInfoWithIcon> mOnItemInfoChanged;
 
     public SearchResultIcon(Context context) {
@@ -100,13 +101,13 @@ public class SearchResultIcon extends BubbleTextView implements
      * Applies search target with a ItemInfoWithIcon consumer to be called after itemInfo is
      * constructed
      */
-    public void applySearchTarget(SearchTarget searchTarget, Consumer<ItemInfoWithIcon> cb) {
+    public void applySearchTarget(SearchTargetLegacy searchTarget, Consumer<ItemInfoWithIcon> cb) {
         mOnItemInfoChanged = cb;
         applySearchTarget(searchTarget);
     }
 
     @Override
-    public void applySearchTarget(SearchTarget searchTarget) {
+    public void applySearchTarget(SearchTargetLegacy searchTarget) {
         mSearchTarget = searchTarget;
         SearchEventTracker.getInstance(getContext()).registerWeakHandler(mSearchTarget, this);
         setVisibility(VISIBLE);
@@ -127,9 +128,16 @@ public class SearchResultIcon extends BubbleTextView implements
         }
     }
 
+    @Override
+    public void applySearchTarget(SearchTarget searchTarget) {
+        prepareUsingApp(new ComponentName(searchTarget.getPackageName(),
+                searchTarget.getExtras().getString("class")), searchTarget.getUserHandle());
+    }
+
     private void prepareUsingApp(ComponentName componentName, UserHandle userHandle) {
         AllAppsStore appsStore = mLauncher.getAppsView().getAppsStore();
         AppInfo appInfo = appsStore.getApp(new ComponentKey(componentName, userHandle));
+
         if (appInfo == null) {
             setVisibility(GONE);
             return;
@@ -181,7 +189,8 @@ public class SearchResultIcon extends BubbleTextView implements
     }
 
     private void reportEvent(int eventType) {
-        SearchTargetEvent.Builder b = new SearchTargetEvent.Builder(mSearchTarget, eventType);
+        SearchTargetEventLegacy.Builder b = new SearchTargetEventLegacy.Builder(mSearchTarget,
+                eventType);
         if (mSearchTarget.getItemType().equals(TARGET_TYPE_SHORTCUT)) {
             b.setShortcutPosition(0);
         }
@@ -191,7 +200,7 @@ public class SearchResultIcon extends BubbleTextView implements
 
     @Override
     public void onClick(View view) {
-        handleSelection(SearchTargetEvent.SELECT);
+        handleSelection(SearchTargetEventLegacy.SELECT);
     }
 
     @Override
@@ -199,7 +208,7 @@ public class SearchResultIcon extends BubbleTextView implements
         if (!supportsLongPress(mSearchTarget.getItemType())) {
             return false;
         }
-        reportEvent(SearchTargetEvent.LONG_PRESS);
+        reportEvent(SearchTargetEventLegacy.LONG_PRESS);
         return ItemLongClickListener.INSTANCE_ALL_APPS.onLongClick(view);
 
     }
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java b/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
index b3dfbe28af..8c491d27d1 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
@@ -39,8 +39,8 @@ import com.android.launcher3.R;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
-import com.android.systemui.plugins.shared.SearchTarget;
-import com.android.systemui.plugins.shared.SearchTargetEvent;
+import com.android.systemui.plugins.shared.SearchTargetEventLegacy;
+import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -63,7 +63,7 @@ public class SearchResultIconRow extends LinearLayout implements
     private TextView mDescriptionView;
     private BubbleTextView[] mShortcutViews = new BubbleTextView[2];
 
-    private SearchTarget mSearchTarget;
+    private SearchTargetLegacy mSearchTarget;
     private PackageItemInfo mProviderInfo;
 
 
@@ -100,8 +100,9 @@ public class SearchResultIconRow extends LinearLayout implements
             lp.width = iconSize;
             bubbleTextView.setOnClickListener(view -> {
                 WorkspaceItemInfo itemInfo = (WorkspaceItemInfo) bubbleTextView.getTag();
-                SearchTargetEvent event = new SearchTargetEvent.Builder(mSearchTarget,
-                        SearchTargetEvent.CHILD_SELECT).setShortcutPosition(itemInfo.rank).build();
+                SearchTargetEventLegacy event = new SearchTargetEventLegacy.Builder(mSearchTarget,
+                        SearchTargetEventLegacy.CHILD_SELECT).setShortcutPosition(
+                        itemInfo.rank).build();
                 SearchEventTracker.getInstance(getContext()).notifySearchTargetEvent(event);
                 mLauncher.getItemOnClickListener().onClick(view);
             });
@@ -111,7 +112,7 @@ public class SearchResultIconRow extends LinearLayout implements
     }
 
     @Override
-    public void applySearchTarget(SearchTarget searchTarget) {
+    public void applySearchTarget(SearchTargetLegacy searchTarget) {
         mSearchTarget = searchTarget;
         mResultIcon.applySearchTarget(searchTarget, this);
         String itemType = searchTarget.getItemType();
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java b/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java
index e856531ee4..8caa51c07f 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java
@@ -44,8 +44,8 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.LauncherIcons;
-import com.android.systemui.plugins.shared.SearchTarget;
-import com.android.systemui.plugins.shared.SearchTargetEvent;
+import com.android.systemui.plugins.shared.SearchTargetEventLegacy;
+import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
 import java.util.ArrayList;
 
@@ -66,7 +66,7 @@ public class SearchResultPeopleView extends LinearLayout implements
     private Intent mIntent;
 
 
-    private SearchTarget mSearchTarget;
+    private SearchTargetLegacy mSearchTarget;
 
     public SearchResultPeopleView(Context context) {
         this(context, null, 0);
@@ -99,11 +99,11 @@ public class SearchResultPeopleView extends LinearLayout implements
             button.getLayoutParams().width = mButtonSize;
             button.getLayoutParams().height = mButtonSize;
         }
-        setOnClickListener(v -> handleSelection(SearchTargetEvent.SELECT));
+        setOnClickListener(v -> handleSelection(SearchTargetEventLegacy.SELECT));
     }
 
     @Override
-    public void applySearchTarget(SearchTarget searchTarget) {
+    public void applySearchTarget(SearchTargetLegacy searchTarget) {
         mSearchTarget = searchTarget;
         Bundle payload = searchTarget.getExtras();
         mTitleView.setText(payload.getString("title"));
@@ -186,8 +186,8 @@ public class SearchResultPeopleView extends LinearLayout implements
             Bundle bundle = new Bundle();
             bundle.putBundle("provider", provider);
             SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(
-                    new SearchTargetEvent.Builder(mSearchTarget,
-                            SearchTargetEvent.CHILD_SELECT).setExtras(bundle).build());
+                    new SearchTargetEventLegacy.Builder(mSearchTarget,
+                            SearchTargetEventLegacy.CHILD_SELECT).setExtras(bundle).build());
         });
     }
 
@@ -197,7 +197,7 @@ public class SearchResultPeopleView extends LinearLayout implements
             Launcher launcher = Launcher.getLauncher(getContext());
             launcher.startActivitySafely(this, mIntent, null);
             SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(
-                    new SearchTargetEvent.Builder(mSearchTarget, eventType).build());
+                    new SearchTargetEventLegacy.Builder(mSearchTarget, eventType).build());
         }
     }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultPlayItem.java b/quickstep/src/com/android/launcher3/search/SearchResultPlayItem.java
index 33c933077b..3bb821f958 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultPlayItem.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultPlayItem.java
@@ -43,8 +43,8 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.util.Themes;
-import com.android.systemui.plugins.shared.SearchTarget;
-import com.android.systemui.plugins.shared.SearchTargetEvent;
+import com.android.systemui.plugins.shared.SearchTargetEventLegacy;
+import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
 import java.io.IOException;
 import java.net.URL;
@@ -69,7 +69,7 @@ public class SearchResultPlayItem extends LinearLayout implements
     private String mPackageName;
     private boolean mIsInstantGame;
 
-    private SearchTarget mSearchTarget;
+    private SearchTargetLegacy mSearchTarget;
 
 
     public SearchResultPlayItem(Context context) {
@@ -101,7 +101,7 @@ public class SearchResultPlayItem extends LinearLayout implements
         ViewGroup.LayoutParams iconParams = mIconView.getLayoutParams();
         iconParams.height = mDeviceProfile.allAppsIconSizePx;
         iconParams.width = mDeviceProfile.allAppsIconSizePx;
-        setOnClickListener(view -> handleSelection(SearchTargetEvent.SELECT));
+        setOnClickListener(view -> handleSelection(SearchTargetEventLegacy.SELECT));
     }
 
 
@@ -127,7 +127,7 @@ public class SearchResultPlayItem extends LinearLayout implements
 
 
     @Override
-    public void applySearchTarget(SearchTarget searchTarget) {
+    public void applySearchTarget(SearchTargetLegacy searchTarget) {
         mSearchTarget = searchTarget;
         Bundle bundle = searchTarget.getExtras();
         SearchEventTracker.INSTANCE.get(getContext()).registerWeakHandler(searchTarget, this);
@@ -193,11 +193,11 @@ public class SearchResultPlayItem extends LinearLayout implements
         intent.putExtra("callerId", getContext().getPackageName());
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         getContext().startActivity(intent);
-        logSearchEvent(SearchTargetEvent.CHILD_SELECT);
+        logSearchEvent(SearchTargetEventLegacy.CHILD_SELECT);
     }
 
     private void logSearchEvent(int eventType) {
         SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(
-                new SearchTargetEvent.Builder(mSearchTarget, eventType).build());
+                new SearchTargetEventLegacy.Builder(mSearchTarget, eventType).build());
     }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultSettingsSlice.java b/quickstep/src/com/android/launcher3/search/SearchResultSettingsSlice.java
index 826b653989..80ad305af8 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultSettingsSlice.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultSettingsSlice.java
@@ -32,8 +32,8 @@ import androidx.slice.widget.SliceView;
 
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
-import com.android.systemui.plugins.shared.SearchTarget;
-import com.android.systemui.plugins.shared.SearchTargetEvent;
+import com.android.systemui.plugins.shared.SearchTargetEventLegacy;
+import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
 /**
  * A slice view wrapper with settings app icon at start
@@ -50,7 +50,7 @@ public class SearchResultSettingsSlice extends LinearLayout implements
     private SliceView mSliceView;
     private View mIcon;
     private LiveData<Slice> mSliceLiveData;
-    private SearchTarget mSearchTarget;
+    private SearchTargetLegacy mSearchTarget;
     private final Launcher mLauncher;
 
     public SearchResultSettingsSlice(Context context) {
@@ -77,7 +77,7 @@ public class SearchResultSettingsSlice extends LinearLayout implements
     }
 
     @Override
-    public void applySearchTarget(SearchTarget searchTarget) {
+    public void applySearchTarget(SearchTargetLegacy searchTarget) {
         reset();
         mSearchTarget = searchTarget;
         try {
@@ -103,8 +103,8 @@ public class SearchResultSettingsSlice extends LinearLayout implements
     @Override
     public void handleSelection(int eventType) {
         SearchEventTracker.INSTANCE.get(mLauncher).notifySearchTargetEvent(
-                new SearchTargetEvent.Builder(mSearchTarget,
-                        SearchTargetEvent.CHILD_SELECT).build());
+                new SearchTargetEventLegacy.Builder(mSearchTarget,
+                        SearchTargetEventLegacy.CHILD_SELECT).build());
     }
 
     private void reset() {
@@ -116,7 +116,7 @@ public class SearchResultSettingsSlice extends LinearLayout implements
 
     @Override
     public void onSliceAction(@NonNull EventInfo eventInfo, @NonNull SliceItem sliceItem) {
-        handleSelection(SearchTargetEvent.CHILD_SELECT);
+        handleSelection(SearchTargetEventLegacy.CHILD_SELECT);
     }
 
     private Uri getSliceUri() {
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultWidget.java b/quickstep/src/com/android/launcher3/search/SearchResultWidget.java
index ba26d852e7..4fe92296d5 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultWidget.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultWidget.java
@@ -36,8 +36,8 @@ import com.android.launcher3.allapps.search.SearchWidgetInfoContainer;
 import com.android.launcher3.dragndrop.DraggableView;
 import com.android.launcher3.touch.ItemLongClickListener;
 import com.android.launcher3.widget.PendingAddWidgetInfo;
-import com.android.systemui.plugins.shared.SearchTarget;
-import com.android.systemui.plugins.shared.SearchTargetEvent;
+import com.android.systemui.plugins.shared.SearchTargetEventLegacy;
+import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
 /**
  * displays live version of a widget upon receiving {@link AppWidgetProviderInfo} from Search
@@ -58,7 +58,7 @@ public class SearchResultWidget extends RelativeLayout implements
     private final AppWidgetHostView mHostView;
     private final float mScaleToFit;
 
-    private SearchTarget mSearchTarget;
+    private SearchTargetLegacy mSearchTarget;
     private AppWidgetProviderInfo mProviderInfo;
 
     private SearchWidgetInfoContainer mInfoContainer;
@@ -82,7 +82,7 @@ public class SearchResultWidget extends RelativeLayout implements
 
         // detect tap event on widget container for search target event reporting
         mClickDetector = new GestureDetector(context,
-                new ClickListener(() -> handleSelection(SearchTargetEvent.CHILD_SELECT)));
+                new ClickListener(() -> handleSelection(SearchTargetEventLegacy.CHILD_SELECT)));
 
         mLongPressHelper = new CheckLongPressHelper(this);
         mLongPressHelper.setLongPressTimeoutFactor(1);
@@ -96,7 +96,7 @@ public class SearchResultWidget extends RelativeLayout implements
     }
 
     @Override
-    public void applySearchTarget(SearchTarget searchTarget) {
+    public void applySearchTarget(SearchTargetLegacy searchTarget) {
         if (searchTarget.getExtras() == null
                 || searchTarget.getExtras().getParcelable("provider") == null) {
             setVisibility(GONE);
@@ -141,7 +141,7 @@ public class SearchResultWidget extends RelativeLayout implements
     @Override
     public void handleSelection(int eventType) {
         SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(
-                new SearchTargetEvent.Builder(mSearchTarget, eventType).build());
+                new SearchTargetEventLegacy.Builder(mSearchTarget, eventType).build());
     }
 
     @Override
@@ -182,7 +182,7 @@ public class SearchResultWidget extends RelativeLayout implements
     @Override
     public boolean onLongClick(View view) {
         ItemLongClickListener.INSTANCE_ALL_APPS.onLongClick(view);
-        handleSelection(SearchTargetEvent.LONG_PRESS);
+        handleSelection(SearchTargetEventLegacy.LONG_PRESS);
         return false;
     }
 
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java b/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java
index 0d790252de..5effbe594e 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java
@@ -39,8 +39,8 @@ import com.android.launcher3.widget.BaseWidgetSheet;
 import com.android.launcher3.widget.PendingItemDragHelper;
 import com.android.launcher3.widget.WidgetCell;
 import com.android.launcher3.widget.WidgetImageView;
-import com.android.systemui.plugins.shared.SearchTarget;
-import com.android.systemui.plugins.shared.SearchTargetEvent;
+import com.android.systemui.plugins.shared.SearchTargetEventLegacy;
+import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
 /**
  * displays preview of a widget upon receiving {@link AppWidgetProviderInfo} from Search provider
@@ -55,7 +55,7 @@ public class SearchResultWidgetPreview extends LinearLayout implements
     private WidgetCell mWidgetCell;
     private Toast mWidgetToast;
 
-    private SearchTarget mSearchTarget;
+    private SearchTargetLegacy mSearchTarget;
 
 
     public SearchResultWidgetPreview(Context context) {
@@ -83,7 +83,7 @@ public class SearchResultWidgetPreview extends LinearLayout implements
     }
 
     @Override
-    public void applySearchTarget(SearchTarget searchTarget) {
+    public void applySearchTarget(SearchTargetLegacy searchTarget) {
         if (searchTarget.getExtras() == null
                 || searchTarget.getExtras().getParcelable("provider") == null) {
             setVisibility(GONE);
@@ -121,19 +121,19 @@ public class SearchResultWidgetPreview extends LinearLayout implements
         new PendingItemDragHelper(mWidgetCell).startDrag(
                 imageView.getBitmapBounds(), imageView.getBitmap().getWidth(), imageView.getWidth(),
                 new Point(loc[0], loc[1]), mLauncher.getAppsView(), new DragOptions());
-        handleSelection(SearchTargetEvent.LONG_PRESS);
+        handleSelection(SearchTargetEventLegacy.LONG_PRESS);
         return true;
     }
 
     @Override
     public void onClick(View view) {
         mWidgetToast = BaseWidgetSheet.showWidgetToast(getContext(), mWidgetToast);
-        handleSelection(SearchTargetEvent.SELECT);
+        handleSelection(SearchTargetEventLegacy.SELECT);
     }
 
     @Override
     public void handleSelection(int eventType) {
         SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(
-                new SearchTargetEvent.Builder(mSearchTarget, eventType).build());
+                new SearchTargetEventLegacy.Builder(mSearchTarget, eventType).build());
     }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java b/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java
index a552366d1c..eb40938ecf 100644
--- a/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java
+++ b/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java
@@ -21,7 +21,7 @@ import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 
-import com.android.systemui.plugins.shared.SearchTarget;
+import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
 /**
  * Header text view that shows a title for a given section in All apps search
@@ -44,7 +44,7 @@ public class SearchSectionHeaderView extends TextView implements
     }
 
     @Override
-    public void applySearchTarget(SearchTarget searchTarget) {
+    public void applySearchTarget(SearchTargetLegacy searchTarget) {
         String title = searchTarget.getExtras().getString("title");
         if (title == null || !title.isEmpty()) {
             setText(title);
diff --git a/quickstep/src/com/android/launcher3/search/SearchSettingsRowView.java b/quickstep/src/com/android/launcher3/search/SearchSettingsRowView.java
index dc5c2f183e..8306e3b555 100644
--- a/quickstep/src/com/android/launcher3/search/SearchSettingsRowView.java
+++ b/quickstep/src/com/android/launcher3/search/SearchSettingsRowView.java
@@ -38,8 +38,8 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.model.data.PackageItemInfo;
-import com.android.systemui.plugins.shared.SearchTarget;
-import com.android.systemui.plugins.shared.SearchTargetEvent;
+import com.android.systemui.plugins.shared.SearchTargetEventLegacy;
+import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -56,7 +56,7 @@ public class SearchSettingsRowView extends LinearLayout implements
     private TextView mTitleView;
     private TextView mBreadcrumbsView;
     private Intent mIntent;
-    private SearchTarget mSearchTarget;
+    private SearchTargetLegacy mSearchTarget;
 
 
     public SearchSettingsRowView(@NonNull Context context) {
@@ -84,7 +84,7 @@ public class SearchSettingsRowView extends LinearLayout implements
     }
 
     @Override
-    public void applySearchTarget(SearchTarget searchTarget) {
+    public void applySearchTarget(SearchTargetLegacy searchTarget) {
         mSearchTarget = searchTarget;
         Bundle bundle = searchTarget.getExtras();
         mIntent = bundle.getParcelable("intent");
@@ -108,7 +108,7 @@ public class SearchSettingsRowView extends LinearLayout implements
 
     @Override
     public void onClick(View view) {
-        handleSelection(SearchTargetEvent.SELECT);
+        handleSelection(SearchTargetEventLegacy.SELECT);
     }
 
     @Override
@@ -120,7 +120,7 @@ public class SearchSettingsRowView extends LinearLayout implements
         launcher.startActivityForResult(mIntent, 0);
 
         SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(
-                new SearchTargetEvent.Builder(mSearchTarget, eventType).build());
+                new SearchTargetEventLegacy.Builder(mSearchTarget, eventType).build());
     }
 
     /**
diff --git a/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java b/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java
index 347c7d46fc..9ff057f0bf 100644
--- a/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java
+++ b/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java
@@ -16,7 +16,9 @@
 
 package com.android.launcher3.search;
 
-import com.android.systemui.plugins.shared.SearchTarget;
+import android.app.search.SearchTarget;
+
+import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
 /**
  * An interface for supporting dynamic search results
@@ -24,9 +26,16 @@ import com.android.systemui.plugins.shared.SearchTarget;
 public interface SearchTargetHandler {
 
     /**
-     * Update view using values from {@link SearchTarget}
+     * Update view using values from {@link SearchTargetLegacy}
+     */
+    void applySearchTarget(SearchTargetLegacy searchTarget);
+
+    /**
+     * Update view using values from {@link SearchTargetLegacy}
      */
-    void applySearchTarget(SearchTarget searchTarget);
+    default void applySearchTarget(SearchTarget searchTarget){
+
+    }
 
     /**
      * Handles selection of SearchTarget
diff --git a/quickstep/src/com/android/launcher3/search/ThumbnailSearchResultView.java b/quickstep/src/com/android/launcher3/search/ThumbnailSearchResultView.java
index c100d6ad32..44f70575b6 100644
--- a/quickstep/src/com/android/launcher3/search/ThumbnailSearchResultView.java
+++ b/quickstep/src/com/android/launcher3/search/ThumbnailSearchResultView.java
@@ -35,8 +35,8 @@ import com.android.launcher3.model.data.RemoteActionItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.touch.ItemClickHandler;
 import com.android.launcher3.util.Themes;
-import com.android.systemui.plugins.shared.SearchTarget;
-import com.android.systemui.plugins.shared.SearchTargetEvent;
+import com.android.systemui.plugins.shared.SearchTargetEventLegacy;
+import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
 /**
  * A view representing a high confidence app search result that includes shortcuts
@@ -47,7 +47,7 @@ public class ThumbnailSearchResultView extends androidx.appcompat.widget.AppComp
     public static final String TARGET_TYPE_SCREENSHOT = "screenshot";
     public static final String TARGET_TYPE_SCREENSHOT_LEGACY = "screenshot_legacy";
 
-    private SearchTarget mSearchTarget;
+    private SearchTargetLegacy mSearchTarget;
 
     public ThumbnailSearchResultView(Context context) {
         super(context);
@@ -72,11 +72,11 @@ public class ThumbnailSearchResultView extends androidx.appcompat.widget.AppComp
             ItemClickHandler.onClickAppShortcut(this, (WorkspaceItemInfo) itemInfo, launcher);
         }
         SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(
-                new SearchTargetEvent.Builder(mSearchTarget, eventType).build());
+                new SearchTargetEventLegacy.Builder(mSearchTarget, eventType).build());
     }
 
     @Override
-    public void applySearchTarget(SearchTarget target) {
+    public void applySearchTarget(SearchTargetLegacy target) {
         mSearchTarget = target;
         Bitmap bitmap;
         if (target.getRemoteAction() != null) {
@@ -108,7 +108,7 @@ public class ThumbnailSearchResultView extends androidx.appcompat.widget.AppComp
         RoundedBitmapDrawable drawable = RoundedBitmapDrawableFactory.create(null, bitmap);
         drawable.setCornerRadius(Themes.getDialogCornerRadius(getContext()));
         setImageDrawable(drawable);
-        setOnClickListener(v -> handleSelection(SearchTargetEvent.SELECT));
+        setOnClickListener(v -> handleSelection(SearchTargetEventLegacy.SELECT));
         SearchEventTracker.INSTANCE.get(getContext()).registerWeakHandler(target, this);
     }
 }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index d345165e78..3be1ced810 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -42,6 +42,7 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.Workspace;
+import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.allapps.search.SearchAdapterProvider;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.appprediction.PredictionRowView;
@@ -266,8 +267,8 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
     }
 
     @Override
-    public SearchAdapterProvider createSearchAdapterProvider() {
-        return new DeviceSearchAdapterProvider(this);
+    public SearchAdapterProvider createSearchAdapterProvider(AllAppsContainerView appsView) {
+        return new DeviceSearchAdapterProvider(this, appsView);
     }
 
     @Override
diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java
index 33af4d7983..5bfde15a04 100644
--- a/src/com/android/launcher3/BaseDraggingActivity.java
+++ b/src/com/android/launcher3/BaseDraggingActivity.java
@@ -43,6 +43,7 @@ import android.widget.Toast;
 import androidx.annotation.Nullable;
 
 import com.android.launcher3.LauncherSettings.Favorites;
+import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.allapps.search.DefaultSearchAdapterProvider;
 import com.android.launcher3.allapps.search.SearchAdapterProvider;
 import com.android.launcher3.logging.InstanceId;
@@ -297,7 +298,7 @@ public abstract class BaseDraggingActivity extends BaseActivity
      * Creates and returns {@link SearchAdapterProvider} for build variant specific search result
      * views
      */
-    public SearchAdapterProvider createSearchAdapterProvider() {
+    public SearchAdapterProvider createSearchAdapterProvider(AllAppsContainerView allapps) {
         return new DefaultSearchAdapterProvider(this);
     }
 }
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index b016df189b..4d51d70e7b 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -124,7 +124,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         mLauncher = BaseDraggingActivity.fromContext(context);
         mLauncher.addOnDeviceProfileChangeListener(this);
 
-        mSearchAdapterProvider = mLauncher.createSearchAdapterProvider();
+        mSearchAdapterProvider = mLauncher.createSearchAdapterProvider(this);
         mSearchQueryBuilder = new SpannableStringBuilder();
         Selection.setSelection(mSearchQueryBuilder, 0);
 
@@ -569,6 +569,10 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         return null;
     }
 
+    public SearchAdapterProvider getSearchAdapterProvider() {
+        return mSearchAdapterProvider;
+    }
+
     public RecyclerViewFastScroller getScrollBar() {
         AllAppsRecyclerView rv = getActiveRecyclerView();
         return rv == null ? null : rv.getScrollbar();
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 24df653ca0..2455706d7d 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -98,6 +98,10 @@ public final class FeatureFlags {
     public static final BooleanFlag ENABLE_DEVICE_SEARCH = getDebugFlag(
             "ENABLE_DEVICE_SEARCH", false, "Allows on device search in all apps");
 
+    public static final BooleanFlag SEARCH_TARGET_LEGACY = getDebugFlag(
+            "SEARCH_TARGET_LEGACY", true,
+            "Use SearchTarget provided by plugin lib (only during migration)");
+
     public static final BooleanFlag DISABLE_INITIAL_IME_IN_ALLAPPS = getDebugFlag(
             "DISABLE_INITIAL_IME_IN_ALLAPPS", false, "Disable default IME state in all apps");
 
diff --git a/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java b/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
index 5cc238da23..0b48c07d01 100644
--- a/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
+++ b/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
@@ -19,11 +19,12 @@ package com.android.systemui.plugins;
 import android.app.Activity;
 import android.os.Bundle;
 import android.os.CancellationSignal;
+import android.os.Parcelable;
 import android.view.View;
 
 import com.android.systemui.plugins.annotations.ProvidesInterface;
-import com.android.systemui.plugins.shared.SearchTarget;
-import com.android.systemui.plugins.shared.SearchTargetEvent;
+import com.android.systemui.plugins.shared.SearchTargetEventLegacy;
+import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
 import java.util.List;
 import java.util.function.Consumer;
@@ -34,20 +35,25 @@ import java.util.function.Consumer;
 @ProvidesInterface(action = AllAppsSearchPlugin.ACTION, version = AllAppsSearchPlugin.VERSION)
 public interface AllAppsSearchPlugin extends Plugin {
     String ACTION = "com.android.systemui.action.PLUGIN_ALL_APPS_SEARCH_ACTIONS";
-    int VERSION = 8;
+    int VERSION = 9;
 
-    void setup(Activity activity, View view);
+    /**
+     * init plugin
+     */
+    void setup(Activity activity, View view, boolean useLegacy);
 
     /**
      * Send launcher state related signals.
      */
     void onStateTransitionStart(int fromState, int toState);
+
     void onStateTransitionComplete(int state);
 
     /**
      * Send launcher window focus and visibility changed signals.
      */
     void onWindowFocusChanged(boolean hasFocus);
+
     void onWindowVisibilityChanged(int visibility);
 
     /**
@@ -59,22 +65,41 @@ public interface AllAppsSearchPlugin extends Plugin {
     /**
      * Main function that triggers search.
      *
-     * @param input string that has been typed by a user
-     * @param inputArgs extra info that may be relevant for the input query
-     * @param results contains the result that will be rendered in all apps search surface
+     * @param input              string that has been typed by a user
+     * @param inputArgs          extra info that may be relevant for the input query
+     * @param results            contains the result that will be rendered in all apps search
+     *                           surface
+     * @param cancellationSignal {@link CancellationSignal} can be used to share status of current
+     */
+    void queryLegacy(String input, Bundle inputArgs, Consumer<List<SearchTargetLegacy>> results,
+            CancellationSignal cancellationSignal);
+
+    /**
+     * Main function that triggers search.
+     *
+     * @param input              string that has been typed by a user
+     * @param inputArgs          extra info that may be relevant for the input query
+     * @param results            contains the result that will be rendered in all apps search
+     *                           surface
      * @param cancellationSignal {@link CancellationSignal} can be used to share status of current
      */
-    void query(String input, Bundle inputArgs, Consumer<List<SearchTarget>> results,
+    void query(String input, Bundle inputArgs, Consumer<List<Parcelable>> results,
             CancellationSignal cancellationSignal);
 
     /**
      * Send over search target interaction events to Plugin
      */
-    void notifySearchTargetEvent(SearchTargetEvent event);
+    void notifySearchTargetEventLegacy(SearchTargetEventLegacy event);
+
+    /**
+     * Send over search target interaction events to Plugin
+     */
+    void notifySearchTargetEvent(Parcelable event);
 
     /**
      * Launcher activity lifecycle callbacks
      */
     void onResume(int state);
+
     void onStop(int state);
 }
\ No newline at end of file
diff --git a/src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java b/src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java
similarity index 76%
rename from src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java
rename to src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java
index 290fe54a27..7fbd6ac814 100644
--- a/src_plugins/com/android/systemui/plugins/shared/SearchTargetEvent.java
+++ b/src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java
@@ -19,8 +19,11 @@ import android.os.Bundle;
 
 /**
  * Event used for the feedback loop to the plugin. (and future aiai)
+ *
+ * @deprecated Use SearchTargetEvent
  */
-public class SearchTargetEvent {
+@Deprecated
+public class SearchTargetEventLegacy {
     public static final int POSITION_NONE = -1;
 
     public static final int SELECT = 0;
@@ -28,12 +31,13 @@ public class SearchTargetEvent {
     public static final int LONG_PRESS = 2;
     public static final int CHILD_SELECT = 3;
 
-    private final SearchTarget mSearchTarget;
+    private final SearchTargetLegacy mSearchTarget;
     private final int mEventType;
     private final int mShortcutPosition;
     private final Bundle mExtras;
 
-    public SearchTargetEvent(SearchTarget searchTarget, int eventType, int shortcutPosition,
+    public SearchTargetEventLegacy(SearchTargetLegacy searchTarget, int eventType,
+            int shortcutPosition,
             Bundle extras) {
         mSearchTarget = searchTarget;
         mEventType = eventType;
@@ -42,7 +46,7 @@ public class SearchTargetEvent {
     }
 
 
-    public SearchTarget getSearchTarget() {
+    public SearchTargetLegacy getSearchTarget() {
         return mSearchTarget;
     }
 
@@ -59,15 +63,15 @@ public class SearchTargetEvent {
     }
 
     /**
-     * A builder for {@link SearchTarget}
+     * A builder for {@link SearchTargetLegacy}
      */
     public static final class Builder {
-        private final SearchTarget mSearchTarget;
+        private final SearchTargetLegacy mSearchTarget;
         private final int mEventType;
         private int mShortcutPosition = POSITION_NONE;
         private Bundle mExtras;
 
-        public Builder(SearchTarget searchTarget, int eventType) {
+        public Builder(SearchTargetLegacy searchTarget, int eventType) {
             mSearchTarget = searchTarget;
             mEventType = eventType;
         }
@@ -82,8 +86,9 @@ public class SearchTargetEvent {
             return this;
         }
 
-        public SearchTargetEvent build() {
-            return new SearchTargetEvent(mSearchTarget, mEventType, mShortcutPosition, mExtras);
+        public SearchTargetEventLegacy build() {
+            return new SearchTargetEventLegacy(mSearchTarget, mEventType, mShortcutPosition,
+                    mExtras);
         }
     }
 
diff --git a/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java b/src_plugins/com/android/systemui/plugins/shared/SearchTargetLegacy.java
similarity index 89%
rename from src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
rename to src_plugins/com/android/systemui/plugins/shared/SearchTargetLegacy.java
index 2c7972e908..2a6ba8829f 100644
--- a/src_plugins/com/android/systemui/plugins/shared/SearchTarget.java
+++ b/src_plugins/com/android/systemui/plugins/shared/SearchTargetLegacy.java
@@ -25,8 +25,11 @@ import java.util.List;
 
 /**
  * Used to return all apps search targets.
+ *
+ * @deprecated Use SearchTarget
  */
-public class SearchTarget implements Comparable<SearchTarget> {
+@Deprecated
+public class SearchTargetLegacy implements Comparable<SearchTargetLegacy> {
 
     private final String mItemId;
     private final String mItemType;
@@ -39,7 +42,7 @@ public class SearchTarget implements Comparable<SearchTarget> {
     private final RemoteAction mRemoteAction;
     private final Bundle mExtras;
 
-    private SearchTarget(String itemId, String itemType, float score,
+    private SearchTargetLegacy(String itemId, String itemType, float score,
             ComponentName componentName, UserHandle userHandle, List<ShortcutInfo> shortcutInfos,
             RemoteAction remoteAction, Bundle extras) {
         mItemId = itemId;
@@ -85,12 +88,12 @@ public class SearchTarget implements Comparable<SearchTarget> {
     }
 
     @Override
-    public int compareTo(SearchTarget o) {
+    public int compareTo(SearchTargetLegacy o) {
         return Float.compare(o.mScore, mScore);
     }
 
     /**
-     * A builder for {@link SearchTarget}
+     * A builder for {@link SearchTargetLegacy}
      */
     public static final class Builder {
 
@@ -158,13 +161,13 @@ public class SearchTarget implements Comparable<SearchTarget> {
         }
 
         /**
-         * Builds a {@link SearchTarget}
+         * Builds a {@link SearchTargetLegacy}
          */
-        public SearchTarget build() {
+        public SearchTargetLegacy build() {
             if (mItemId == null) {
                 throw new IllegalStateException("Item ID is required for building SearchTarget");
             }
-            return new SearchTarget(mItemId, mItemType, mScore, mComponentName, mUserHandle,
+            return new SearchTargetLegacy(mItemId, mItemType, mScore, mComponentName, mUserHandle,
                     mShortcutInfos,
                     mRemoteAction, mExtras);
         }
-- 
GitLab


From c37058976dfa8e89026df5a58bde27e08c021f6b Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Wed, 13 Jan 2021 11:34:16 -0800
Subject: [PATCH 0392/1664] Generating Hdumps for more leaks

Test: presubmits
Bug: 177065099
Change-Id: I386229cf92a925d2953952ed0fab6c44dcdc61f0
---
 tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index d3fc89e6be..37dd4d27c0 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -150,7 +150,7 @@ public abstract class AbstractLauncherUiTest {
         return "Activity leak detector has found leaked activities, " + dumpHprofData() + ".";
     }
 
-    private static String dumpHprofData() {
+    public static String dumpHprofData() {
         try {
             final String fileName = getInstrumentation().getTargetContext().getFilesDir().getPath()
                     + "/ActivityLeakHeapDump.hprof";
-- 
GitLab


From d7f7f52ddac0e288f3632f29ede63748c04d7ce5 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 13 Jan 2021 13:55:33 -0800
Subject: [PATCH 0393/1664] Waiting until the launcher change is propagater
 before test

Bug: 143488140
Test: Presubmit
Change-Id: Ie3f35a1e58b784d078a305814bd682beaae1f4cb
---
 .../quickstep/FallbackRecentsTest.java        | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
index b9e0f628ab..475953bd9b 100644
--- a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
+++ b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
@@ -23,6 +23,7 @@ import static com.android.launcher3.tapl.LauncherInstrumentation.WAIT_TIME_MS;
 import static com.android.launcher3.tapl.TestHelpers.getHomeIntentInPackage;
 import static com.android.launcher3.tapl.TestHelpers.getLauncherInMyProcess;
 import static com.android.launcher3.ui.AbstractLauncherUiTest.DEFAULT_ACTIVITY_TIMEOUT;
+import static com.android.launcher3.ui.AbstractLauncherUiTest.DEFAULT_BROADCAST_TIMEOUT_SECS;
 import static com.android.launcher3.ui.AbstractLauncherUiTest.DEFAULT_UI_TIMEOUT;
 import static com.android.launcher3.ui.AbstractLauncherUiTest.resolveSystemApp;
 import static com.android.launcher3.ui.AbstractLauncherUiTest.startAppFast;
@@ -66,6 +67,8 @@ import org.junit.rules.TestRule;
 import org.junit.runner.RunWith;
 import org.junit.runners.model.Statement;
 
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
@@ -112,11 +115,16 @@ public class FallbackRecentsTest {
             @Override
             public void evaluate() throws Throwable {
                 TestCommandReceiver.callCommand(TestCommandReceiver.ENABLE_TEST_LAUNCHER);
+                OverviewUpdateHandler updateHandler =
+                        MAIN_EXECUTOR.submit(OverviewUpdateHandler::new).get();
                 UiDevice.getInstance(getInstrumentation()).executeShellCommand(
                         getLauncherCommand(mOtherLauncherActivity));
+                updateHandler.mChangeCounter
+                        .await(DEFAULT_BROADCAST_TIMEOUT_SECS, TimeUnit.SECONDS);
                 try {
                     base.evaluate();
                 } finally {
+                    MAIN_EXECUTOR.submit(updateHandler::destroy).get();
                     TestCommandReceiver.callCommand(TestCommandReceiver.DISABLE_TEST_LAUNCHER);
                     UiDevice.getInstance(getInstrumentation()).executeShellCommand(
                             getLauncherCommand(getLauncherInMyProcess()));
@@ -241,4 +249,30 @@ public class FallbackRecentsTest {
     private int getTaskCount(RecentsActivity recents) {
         return recents.<RecentsView>getOverviewPanel().getTaskViewCount();
     }
+
+    private class OverviewUpdateHandler {
+
+        final RecentsAnimationDeviceState mRads;
+        final OverviewComponentObserver mObserver;
+        final CountDownLatch mChangeCounter;
+
+        OverviewUpdateHandler() {
+            Context ctx = getInstrumentation().getTargetContext();
+            mRads = new RecentsAnimationDeviceState(ctx);
+            mObserver = new OverviewComponentObserver(ctx, mRads);
+            mChangeCounter = new CountDownLatch(1);
+            if (mObserver.getHomeIntent().getComponent()
+                    .getPackageName().equals(mOtherLauncherActivity.packageName)) {
+                // Home already same
+                mChangeCounter.countDown();
+            } else {
+                mObserver.setOverviewChangeListener(b -> mChangeCounter.countDown());
+            }
+        }
+
+        void destroy() {
+            mObserver.onDestroy();
+            mRads.destroy();
+        }
+    }
 }
-- 
GitLab


From 9d44e81062ee6707fbd2ba1ffa42b22d0cd14755 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 13 Jan 2021 15:37:59 -0800
Subject: [PATCH 0394/1664] Temporarily disable jank tracing

Bug: 174755489
Test: Temporarily fix NPE
Change-Id: Ifeae83a307f396c25d0d072abe19e8cf8493c427
---
 .../src/com/android/quickstep/AbsSwipeUpHandler.java     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index a7e4741c07..3d5b1c6b83 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -721,10 +721,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
 
     @UiThread
     public void onGestureStarted(boolean isLikelyToStartNewTask) {
-        InteractionJankMonitorWrapper.begin(mRecentsView,
-                InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH, 2000 /* ms timeout */);
-        InteractionJankMonitorWrapper.begin(mRecentsView,
-                InteractionJankMonitorWrapper.CUJ_APP_CLOSE_TO_HOME);
+        // Temporarily disable this until we have a view that we can use
+        // InteractionJankMonitorWrapper.begin(mRecentsView,
+        //         InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH, 2000 /* ms timeout */);
+        // InteractionJankMonitorWrapper.begin(mRecentsView,
+        //         InteractionJankMonitorWrapper.CUJ_APP_CLOSE_TO_HOME);
         notifyGestureStartedAsync();
         setIsLikelyToStartNewTask(isLikelyToStartNewTask, false /* animate */);
         mStateCallback.setStateOnUiThread(STATE_GESTURE_STARTED);
-- 
GitLab


From 42203bec0a51da8263d3845b1d3bac3864bbd1d8 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Wed, 13 Jan 2021 15:48:25 -0800
Subject: [PATCH 0395/1664] Include searchui library to Launcher3CommonLib

Change-Id: Ib66e028d3cf36a113aaca7511c53944e663ecd2d
---
 Android.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 503f9aecb3..ed420393dc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -33,7 +33,8 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     LauncherPluginLib \
-    launcher_log_protos_lite
+    launcher_log_protos_lite \
+    search_ui
 
 LOCAL_SRC_FILES := \
     $(call all-java-files-under, src_build_config) \
-- 
GitLab


From 53e3b14029af24a56a18acf3ab42b98366f08049 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 13 Jan 2021 16:18:34 -0800
Subject: [PATCH 0396/1664] Preventing crash when a gesture starts after home
 activity change but before the update has been received by Launcher

Bug: 175645691
Test: Verified using a test launcher
Change-Id: I3f726894bdc941878bb8f8eba7c4701e1218c0dd
---
 .../src/com/android/quickstep/FallbackSwipeHandler.java  | 8 +++++++-
 .../com/android/quickstep/OverviewComponentObserver.java | 5 ++---
 quickstep/src/com/android/quickstep/RecentsActivity.java | 5 ++---
 .../inputconsumers/DeviceLockedInputConsumer.java        | 5 ++---
 .../OverviewWithoutFocusInputConsumer.java               | 8 +++++++-
 .../src/com/android/launcher3/util/LauncherUIHelper.java | 7 +++----
 src/com/android/launcher3/Utilities.java                 | 9 +++++++++
 7 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
index 901040dcc6..a80c111d69 100644
--- a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
+++ b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
@@ -22,12 +22,14 @@ import static com.android.launcher3.GestureNavContract.EXTRA_GESTURE_CONTRACT;
 import static com.android.launcher3.GestureNavContract.EXTRA_ICON_POSITION;
 import static com.android.launcher3.GestureNavContract.EXTRA_ICON_SURFACE;
 import static com.android.launcher3.GestureNavContract.EXTRA_REMOTE_CALLBACK;
+import static com.android.launcher3.Utilities.createHomeIntent;
 import static com.android.launcher3.anim.Interpolators.ACCEL;
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME;
 
 import android.animation.ObjectAnimator;
 import android.annotation.TargetApi;
 import android.app.ActivityOptions;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Matrix;
@@ -126,7 +128,11 @@ public class FallbackSwipeHandler extends
         ActivityOptions options = ActivityOptions.makeCustomAnimation(mContext, 0, 0);
         Intent intent = new Intent(mGestureState.getHomeIntent());
         mActiveAnimationFactory.addGestureContract(intent);
-        mContext.startActivity(intent, options.toBundle());
+        try {
+            mContext.startActivity(intent, options.toBundle());
+        } catch (NullPointerException | ActivityNotFoundException | SecurityException e) {
+            mContext.startActivity(createHomeIntent());
+        }
         return mActiveAnimationFactory;
     }
 
diff --git a/quickstep/src/com/android/quickstep/OverviewComponentObserver.java b/quickstep/src/com/android/quickstep/OverviewComponentObserver.java
index 7bf7712fd0..fb8f9fe31d 100644
--- a/quickstep/src/com/android/quickstep/OverviewComponentObserver.java
+++ b/quickstep/src/com/android/quickstep/OverviewComponentObserver.java
@@ -20,6 +20,7 @@ import static android.content.Intent.ACTION_PACKAGE_ADDED;
 import static android.content.Intent.ACTION_PACKAGE_CHANGED;
 import static android.content.Intent.ACTION_PACKAGE_REMOVED;
 
+import static com.android.launcher3.Utilities.createHomeIntent;
 import static com.android.launcher3.config.FeatureFlags.SEPARATE_RECENTS_ACTIVITY;
 import static com.android.launcher3.util.PackageManagerHelper.getPackageFilter;
 import static com.android.systemui.shared.system.PackageManagerWrapper.ACTION_PREFERRED_ACTIVITY_CHANGED;
@@ -74,9 +75,7 @@ public final class OverviewComponentObserver {
     public OverviewComponentObserver(Context context, RecentsAnimationDeviceState deviceState) {
         mContext = context;
         mDeviceState = deviceState;
-        mCurrentHomeIntent = new Intent(Intent.ACTION_MAIN)
-                .addCategory(Intent.CATEGORY_HOME)
-                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        mCurrentHomeIntent = createHomeIntent();
         mMyHomeIntent = new Intent(mCurrentHomeIntent).setPackage(mContext.getPackageName());
         ResolveInfo info = context.getPackageManager().resolveActivity(mMyHomeIntent, 0);
         ComponentName myHomeComponent =
diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index d050030e74..d6f896a24e 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -21,6 +21,7 @@ import static android.content.pm.ActivityInfo.CONFIG_SCREEN_SIZE;
 import static com.android.launcher3.QuickstepAppTransitionManagerImpl.RECENTS_LAUNCH_DURATION;
 import static com.android.launcher3.QuickstepAppTransitionManagerImpl.STATUS_BAR_TRANSITION_DURATION;
 import static com.android.launcher3.QuickstepAppTransitionManagerImpl.STATUS_BAR_TRANSITION_PRE_DELAY;
+import static com.android.launcher3.Utilities.createHomeIntent;
 import static com.android.launcher3.testing.TestProtocol.OVERVIEW_STATE_ORDINAL;
 import static com.android.quickstep.TaskUtils.taskIsATargetWithMode;
 import static com.android.quickstep.TaskViewUtils.createRecentsWindowAnimator;
@@ -307,9 +308,7 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
     }
 
     public void startHome() {
-        startActivity(new Intent(Intent.ACTION_MAIN)
-                .addCategory(Intent.CATEGORY_HOME)
-                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+        startActivity(createHomeIntent());
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
index 5aaea0009e..85ecab15a1 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
@@ -19,6 +19,7 @@ import static android.view.MotionEvent.ACTION_CANCEL;
 import static android.view.MotionEvent.ACTION_POINTER_DOWN;
 import static android.view.MotionEvent.ACTION_UP;
 
+import static com.android.launcher3.Utilities.createHomeIntent;
 import static com.android.launcher3.Utilities.squaredHypot;
 import static com.android.launcher3.Utilities.squaredTouchSlop;
 import static com.android.launcher3.util.VelocityUtils.PX_PER_MS;
@@ -203,9 +204,7 @@ public class DeviceLockedInputConsumer implements InputConsumer,
                 public void onAnimationEnd(Animator animation) {
                     if (dismissTask) {
                         // For now, just start the home intent so user is prompted to unlock the device.
-                        mContext.startActivity(new Intent(Intent.ACTION_MAIN)
-                                .addCategory(Intent.CATEGORY_HOME)
-                                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+                        mContext.startActivity(createHomeIntent());
                         mHomeLaunched = true;
                     }
                     mStateCallback.setState(STATE_HANDLER_INVALIDATED);
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java
index 924b32c015..864e08da46 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java
@@ -15,10 +15,12 @@
  */
 package com.android.quickstep.inputconsumers;
 
+import static com.android.launcher3.Utilities.createHomeIntent;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE;
 
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.graphics.PointF;
 import android.view.MotionEvent;
@@ -77,7 +79,11 @@ public class OverviewWithoutFocusInputConsumer implements InputConsumer,
 
     @Override
     public void onSwipeUp(boolean wasFling, PointF finalVelocity) {
-        mContext.startActivity(mGestureState.getHomeIntent());
+        try {
+            mContext.startActivity(mGestureState.getHomeIntent());
+        } catch (NullPointerException | ActivityNotFoundException | SecurityException e) {
+            mContext.startActivity(createHomeIntent());
+        }
         ActiveGestureLog.INSTANCE.addLog("startQuickstep");
         BaseActivity activity = BaseDraggingActivity.fromContext(mContext);
         int state = (mGestureState != null && mGestureState.getEndTarget() != null)
diff --git a/robolectric_tests/src/com/android/launcher3/util/LauncherUIHelper.java b/robolectric_tests/src/com/android/launcher3/util/LauncherUIHelper.java
index f019a2019d..fdddab49ce 100644
--- a/robolectric_tests/src/com/android/launcher3/util/LauncherUIHelper.java
+++ b/robolectric_tests/src/com/android/launcher3/util/LauncherUIHelper.java
@@ -18,6 +18,8 @@ package com.android.launcher3.util;
 import static android.view.View.MeasureSpec.EXACTLY;
 import static android.view.View.MeasureSpec.makeMeasureSpec;
 
+import static com.android.launcher3.Utilities.createHomeIntent;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -46,10 +48,7 @@ public class LauncherUIHelper {
      */
     public static String getLauncherClassName() {
         Context context = RuntimeEnvironment.application;
-        Intent homeIntent = new Intent(Intent.ACTION_MAIN)
-                .addCategory(Intent.CATEGORY_HOME)
-                .setPackage(context.getPackageName())
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        Intent homeIntent = createHomeIntent().setPackage(context.getPackageName());
 
         List<ResolveInfo> launchers = context.getPackageManager()
                 .queryIntentActivities(homeIntent, 0);
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 5c2f35b981..42d6b1246c 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -459,6 +459,15 @@ public final class Utilities {
         return Math.max(lowerBound, Math.min(value, upperBound));
     }
 
+    /**
+     * Returns an intent for starting the default home activity
+     */
+    public static Intent createHomeIntent() {
+        return new Intent(Intent.ACTION_MAIN)
+                .addCategory(Intent.CATEGORY_HOME)
+                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+    }
+
     /**
      * Wraps a message with a TTS span, so that a different message is spoken than
      * what is getting displayed.
-- 
GitLab


From e138389214cda4d6cfa7af0620f20ca1b5373ca8 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Tue, 12 Jan 2021 16:22:18 +0000
Subject: [PATCH 0397/1664] Flag FLAG_MULTIPLE_ORIENTATION_SUPPORTED_BY_DENSITY
 false when allow_rotation is set

Bug: 177312556
Change-Id: I22e28b60be68b9cf7bb064d801854d0093920c9e
---
 .../src/com/android/quickstep/util/RecentsOrientedState.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
index dd3e31fa2a..a89aaf4b3c 100644
--- a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
+++ b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
@@ -49,6 +49,7 @@ import androidx.annotation.NonNull;
 
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile;
+import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.PagedOrientationHandler;
@@ -156,7 +157,8 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
         Resources res = context.getResources();
         int originalSmallestWidth = res.getConfiguration().smallestScreenWidthDp
                 * res.getDisplayMetrics().densityDpi / DENSITY_DEVICE_STABLE;
-        if (originalSmallestWidth < 600) {
+        if (originalSmallestWidth < 600 && !mContext.getResources().getBoolean(
+                R.bool.allow_rotation)) {
             mFlags |= FLAG_MULTIPLE_ORIENTATION_SUPPORTED_BY_DENSITY;
         }
         mFlags |= FLAG_SWIPE_UP_NOT_RUNNING;
-- 
GitLab


From b198d46f9ca68736e04345db645c238305cc5430 Mon Sep 17 00:00:00 2001
From: Becky Qiu <xuqiu@google.com>
Date: Wed, 13 Jan 2021 12:09:47 -0800
Subject: [PATCH 0398/1664] [Overview Sharing] Create the share function for
 sharing image in overview.

Bug: 169772466, 169799864
Test: local
Change-Id: Iaac49fa396e68f7392b59f6f9b8854cc1abe270b
---
 .../android/quickstep/ImageActionsApi.java    | 11 +++++++
 .../quickstep/util/ImageActionUtils.java      | 32 +++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/ImageActionsApi.java b/quickstep/src/com/android/quickstep/ImageActionsApi.java
index ba8ba3328b..b04905ca60 100644
--- a/quickstep/src/com/android/quickstep/ImageActionsApi.java
+++ b/quickstep/src/com/android/quickstep/ImageActionsApi.java
@@ -22,11 +22,14 @@ import static android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.quickstep.util.ImageActionUtils.persistBitmapAndStartActivity;
 
+import android.app.prediction.AppTarget;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ShortcutInfo;
 import android.graphics.Bitmap;
 import android.graphics.Insets;
 import android.graphics.Rect;
+import android.graphics.RectF;
 import android.util.Log;
 
 import androidx.annotation.Nullable;
@@ -96,4 +99,12 @@ public class ImageActionsApi {
         ImageActionUtils.saveScreenshot(mSystemUiProxy, screenshot, screenshotBounds, visibleInsets,
                 task);
     }
+
+    /**
+     * Share the image when user taps on overview share targets.
+     */
+    @UiThread
+    public void shareImage(RectF rectF, ShortcutInfo shortcutInfo, AppTarget appTarget) {
+        ImageActionUtils.shareImage(mContext, mBitmapSupplier, rectF, shortcutInfo, appTarget, TAG);
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/util/ImageActionUtils.java b/quickstep/src/com/android/quickstep/util/ImageActionUtils.java
index e998e9a7ef..d022085877 100644
--- a/quickstep/src/com/android/quickstep/util/ImageActionUtils.java
+++ b/quickstep/src/com/android/quickstep/util/ImageActionUtils.java
@@ -22,15 +22,19 @@ import static android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION;
 import static com.android.launcher3.util.Executors.THREAD_POOL_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
+import android.app.prediction.AppTarget;
 import android.content.ClipData;
 import android.content.ClipDescription;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ShortcutInfo;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Insets;
 import android.graphics.Picture;
 import android.graphics.Rect;
+import android.graphics.RectF;
 import android.net.Uri;
 import android.util.Log;
 
@@ -70,6 +74,34 @@ public class ImageActionUtils {
                 screenshotBounds, visibleInsets, task);
     }
 
+    /**
+     * Launch the activity to share image for overview sharing. This is to share cropped bitmap
+     * with specific share targets (with shortcutInfo and appTarget) rendered in overview.
+     */
+    @UiThread
+    public static void shareImage(Context context, Supplier<Bitmap> bitmapSupplier, RectF rectF,
+            ShortcutInfo shortcutInfo, AppTarget appTarget, String tag) {
+        if (bitmapSupplier.get() == null) {
+            return;
+        }
+        Rect crop = new Rect();
+        rectF.round(crop);
+        Intent intent = new Intent();
+        Uri uri =  getImageUri(bitmapSupplier.get(), crop, context, tag);
+        ClipData clipdata = new ClipData(new ClipDescription("content",
+                new String[]{"image/png"}),
+                new ClipData.Item(uri));
+        intent.setAction(Intent.ACTION_SEND)
+            .setComponent(new ComponentName(appTarget.getPackageName(), appTarget.getClassName()))
+            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            .addFlags(FLAG_GRANT_READ_URI_PERMISSION)
+            .setType("image/png")
+            .putExtra(Intent.EXTRA_STREAM, uri)
+            .putExtra(Intent.EXTRA_SHORTCUT_ID, shortcutInfo.getId())
+            .setClipData(clipdata);
+        context.startActivity(intent);
+    }
+
     /**
      * Launch the activity to share image.
      */
-- 
GitLab


From 5b97b40eb1be1489bef93acc965f1f019afc4cc6 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Thu, 14 Jan 2021 13:42:35 -0800
Subject: [PATCH 0399/1664] Skipping QS metrics if activity is not created

Test: presubmit
Bug: 177472265
Change-Id: Ic92adbe589736d16ab8687ea761c32919d8c186b
---
 .../src/com/android/quickstep/OverviewCommandHelper.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
index ec6e303830..985389ea7d 100644
--- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
@@ -175,9 +175,12 @@ public class OverviewCommandHelper {
                 return;
             }
 
-            InteractionJankMonitorWrapper.begin(
-                    mActivityInterface.getCreatedActivity().getRootView(),
-                    InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH);
+            final T activity = mActivityInterface.getCreatedActivity();
+            if (activity != null) {
+                InteractionJankMonitorWrapper.begin(
+                        activity.getRootView(),
+                        InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH);
+            }
 
             // Otherwise, start overview.
             mListener = mActivityInterface.createActivityInitListener(this::onActivityReady);
-- 
GitLab


From 7e40d6b25a4ccafcb4e09a054c9390c0e9e143b9 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Mon, 11 Jan 2021 18:59:22 -0500
Subject: [PATCH 0400/1664] Added new app launch crop / positioning.

New app launch crops the app window from the center, which is meant
to align with the centered icon in the new preview window, and then
it "reveals" the rest of the app window from center to out.

Code is behind same prop as the shell starting surface.

To enable:
- adb shell set prop persist.debug.shell_starting_surface true
- reboot

Bug: 177264697
Change-Id: I78f2eab216d4bb40dedae245f47a89fe677dd6e9
---
 .../QuickstepAppTransitionManagerImpl.java    | 152 +++++++++++-------
 1 file changed, 98 insertions(+), 54 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
index 108006b5f0..cb439d5dea 100644
--- a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
@@ -56,6 +56,7 @@ import android.graphics.drawable.Drawable;
 import android.os.CancellationSignal;
 import android.os.Handler;
 import android.os.Looper;
+import android.os.SystemProperties;
 import android.util.Pair;
 import android.view.View;
 
@@ -99,6 +100,9 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
 
     private static final String TAG = "QuickstepTransition";
 
+    private static final boolean ENABLE_SHELL_STARTING_SURFACE =
+            SystemProperties.getBoolean("persist.debug.shell_starting_surface", false);
+
     /** Duration of status bar animations. */
     public static final int STATUS_BAR_TRANSITION_DURATION = 120;
 
@@ -442,9 +446,9 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
             RemoteAnimationTargetCompat[] appTargets,
             RemoteAnimationTargetCompat[] wallpaperTargets,
             Rect windowTargetBounds, boolean toggleVisibility) {
-        RectF bounds = new RectF();
+        RectF launcherIconBounds = new RectF();
         FloatingIconView floatingView = FloatingIconView.getFloatingIconView(mLauncher, v,
-                toggleVisibility, bounds, true /* isOpening */);
+                toggleVisibility, launcherIconBounds, true /* isOpening */);
         Rect crop = new Rect();
         Matrix matrix = new Matrix();
 
@@ -458,11 +462,17 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
         mDragLayer.getLocationOnScreen(dragLayerBounds);
 
         AnimOpenProperties prop = new AnimOpenProperties(mLauncher.getResources(), mDeviceProfile,
-                windowTargetBounds, bounds, v, dragLayerBounds);
+                windowTargetBounds, launcherIconBounds, v, dragLayerBounds[0], dragLayerBounds[1]);
+        int left = (int) (prop.cropCenterXStart - prop.cropWidthStart / 2);
+        int top = (int) (prop.cropCenterYStart - prop.cropHeightStart / 2);
+        int right = (int) (left + prop.cropWidthStart);
+        int bottom = (int) (top + prop.cropHeightStart);
+        // Set the crop here so we can calculate the corner radius below.
+        crop.set(left, top, right, bottom);
 
         RectF targetBounds = new RectF(windowTargetBounds);
-        RectF iconBounds = new RectF();
-        RectF temp = new RectF();
+        RectF floatingIconBounds = new RectF();
+        RectF tmpRectF = new RectF();
         Point tmpPos = new Point();
 
         AnimatorSet animatorSet = new AnimatorSet();
@@ -481,68 +491,79 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
         });
 
         final float initialWindowRadius = supportsRoundedCornersOnWindows(mLauncher.getResources())
-                ? prop.startCrop / 2f : 0f;
+                ? Math.max(crop.width(), crop.height()) / 2f
+                : 0f;
         final float finalWindowRadius = mDeviceProfile.isMultiWindowMode
                 ? 0 : getWindowCornerRadius(mLauncher.getResources());
 
         appAnimator.addUpdateListener(new MultiValueUpdateListener() {
             FloatProp mDx = new FloatProp(0, prop.dX, 0, prop.xDuration, AGGRESSIVE_EASE);
             FloatProp mDy = new FloatProp(0, prop.dY, 0, prop.yDuration, AGGRESSIVE_EASE);
-            FloatProp mScale = new FloatProp(prop.initialAppIconScale,
+
+            FloatProp mIconScaleToFitScreen = new FloatProp(prop.initialAppIconScale,
                     prop.finalAppIconScale, 0, APP_LAUNCH_DURATION, EXAGGERATED_EASE);
             FloatProp mIconAlpha = new FloatProp(prop.iconAlphaStart, 0f,
                     APP_LAUNCH_ALPHA_START_DELAY, prop.alphaDuration, LINEAR);
-            FloatProp mCroppedSize = new FloatProp(prop.startCrop, prop.endCrop, 0, CROP_DURATION,
-                    EXAGGERATED_EASE);
+
             FloatProp mWindowRadius = new FloatProp(initialWindowRadius, finalWindowRadius, 0,
                     RADIUS_DURATION, EXAGGERATED_EASE);
             FloatProp mShadowRadius = new FloatProp(0, mMaxShadowRadius, 0,
                     APP_LAUNCH_DURATION, EXAGGERATED_EASE);
 
+            FloatProp mCropRectCenterX = new FloatProp(prop.cropCenterXStart, prop.cropCenterXEnd,
+                    0, CROP_DURATION, EXAGGERATED_EASE);
+            FloatProp mCropRectCenterY = new FloatProp(prop.cropCenterYStart, prop.cropCenterYEnd,
+                    0, CROP_DURATION, EXAGGERATED_EASE);
+            FloatProp mCropRectWidth = new FloatProp(prop.cropWidthStart, prop.cropWidthEnd, 0,
+                    CROP_DURATION, EXAGGERATED_EASE);
+            FloatProp mCropRectHeight = new FloatProp(prop.cropHeightStart, prop.cropHeightEnd, 0,
+                    CROP_DURATION, EXAGGERATED_EASE);
+
             @Override
             public void onUpdate(float percent) {
                 // Calculate the size of the scaled icon.
-                float width = bounds.width() * mScale.value;
-                float height = bounds.height() * mScale.value;
-
-                // Animate the crop so that it starts off as a square.
-                final int cropWidth;
-                final int cropHeight;
-                if (mDeviceProfile.isVerticalBarLayout()) {
-                    cropWidth = (int) mCroppedSize.value;
-                    cropHeight = windowTargetBounds.height();
-                } else {
-                    cropWidth = windowTargetBounds.width();
-                    cropHeight = (int) mCroppedSize.value;
-                }
-                crop.set(0, 0, cropWidth, cropHeight);
+                float iconWidth = launcherIconBounds.width() * mIconScaleToFitScreen.value;
+                float iconHeight = launcherIconBounds.height() * mIconScaleToFitScreen.value;
+
+                int left = (int) (mCropRectCenterX.value - mCropRectWidth.value / 2);
+                int top = (int) (mCropRectCenterY.value - mCropRectHeight.value / 2);
+                int right = (int) (left + mCropRectWidth.value);
+                int bottom = (int) (top + mCropRectHeight.value);
+                crop.set(left, top, right, bottom);
+
+                final int windowCropWidth = crop.width();
+                final int windowCropHeight = crop.height();
 
                 // Scale the size of the icon to match the size of the window crop.
-                float scaleX = width / cropWidth;
-                float scaleY = height / cropHeight;
+                float scaleX = iconWidth / windowCropWidth;
+                float scaleY = iconHeight / windowCropHeight;
                 float scale = Math.min(1f, Math.max(scaleX, scaleY));
 
-                float scaledCropWidth = cropWidth * scale;
-                float scaledCropHeight = cropHeight * scale;
-                float offsetX  = (scaledCropWidth - width) / 2;
-                float offsetY = (scaledCropHeight - height) / 2;
+                float scaledCropWidth = windowCropWidth * scale;
+                float scaledCropHeight = windowCropHeight * scale;
+                float offsetX  = (scaledCropWidth - iconWidth) / 2;
+                float offsetY = (scaledCropHeight - iconHeight) / 2;
 
                 // Calculate the window position to match the icon position.
-                temp.set(bounds);
-                temp.offset(dragLayerBounds[0], dragLayerBounds[1]);
-                temp.offset(mDx.value, mDy.value);
-                Utilities.scaleRectFAboutCenter(temp, mScale.value);
-                float windowTransX0 = temp.left - offsetX;
-                float windowTransY0 = temp.top - offsetY;
+                tmpRectF.set(launcherIconBounds);
+                tmpRectF.offset(dragLayerBounds[0], dragLayerBounds[1]);
+                tmpRectF.offset(mDx.value, mDy.value);
+                Utilities.scaleRectFAboutCenter(tmpRectF, mIconScaleToFitScreen.value);
+                float windowTransX0 = tmpRectF.left - offsetX;
+                float windowTransY0 = tmpRectF.top - offsetY;
+                if (ENABLE_SHELL_STARTING_SURFACE) {
+                    windowTransX0 -= crop.left * scale;
+                    windowTransY0 -= crop.top * scale;
+                }
 
                 // Calculate the icon position.
-                iconBounds.set(bounds);
-                iconBounds.offset(mDx.value, mDy.value);
-                Utilities.scaleRectFAboutCenter(iconBounds, mScale.value);
-                iconBounds.left -= offsetX;
-                iconBounds.top -= offsetY;
-                iconBounds.right += offsetX;
-                iconBounds.bottom += offsetY;
+                floatingIconBounds.set(launcherIconBounds);
+                floatingIconBounds.offset(mDx.value, mDy.value);
+                Utilities.scaleRectFAboutCenter(floatingIconBounds, mIconScaleToFitScreen.value);
+                floatingIconBounds.left -= offsetX;
+                floatingIconBounds.top -= offsetY;
+                floatingIconBounds.right += offsetX;
+                floatingIconBounds.bottom += offsetY;
 
                 SurfaceParams[] params = new SurfaceParams[appTargets.length];
                 for (int i = appTargets.length - 1; i >= 0; i--) {
@@ -553,7 +574,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                         matrix.setScale(scale, scale);
                         matrix.postTranslate(windowTransX0, windowTransY0);
 
-                        floatingView.update(iconBounds, mIconAlpha.value, percent, 0f,
+                        floatingView.update(floatingIconBounds, mIconAlpha.value, percent, 0f,
                                 mWindowRadius.value * scale, true /* isOpening */);
                         builder.withMatrix(matrix)
                                 .withWindowCrop(crop)
@@ -932,8 +953,15 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
      */
     static class AnimOpenProperties {
 
-        public final float startCrop;
-        public final float endCrop;
+        public final int cropCenterXStart;
+        public final int cropCenterYStart;
+        public final int cropWidthStart;
+        public final int cropHeightStart;
+
+        public final int cropCenterXEnd;
+        public final int cropCenterYEnd;
+        public final int cropWidthEnd;
+        public final int cropHeightEnd;
 
         public final float dX;
         public final float dY;
@@ -948,7 +976,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
         public final float iconAlphaStart;
 
         AnimOpenProperties(Resources r, DeviceProfile dp, Rect windowTargetBounds,
-                RectF launcherIconBounds, View view, int[] dragLayerBounds) {
+                RectF launcherIconBounds, View view, int dragLayerLeft, int dragLayerTop) {
             // Scale the app icon to take up the entire screen. This simplifies the math when
             // animating the app window position / scale.
             float smallestSize = Math.min(windowTargetBounds.height(), windowTargetBounds.width());
@@ -966,8 +994,8 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
             finalAppIconScale = Math.max(maxScaleX, maxScaleY);
 
             // Animate the app icon to the center of the window bounds in screen coordinates.
-            float centerX = windowTargetBounds.centerX() - dragLayerBounds[0];
-            float centerY = windowTargetBounds.centerY() - dragLayerBounds[1];
+            float centerX = windowTargetBounds.centerX() - dragLayerLeft;
+            float centerY = windowTargetBounds.centerY() - dragLayerTop;
 
             dX = centerX - launcherIconBounds.centerX();
             dY = centerY - launcherIconBounds.centerY();
@@ -981,15 +1009,31 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
             alphaDuration = useUpwardAnimation ? APP_LAUNCH_ALPHA_DURATION
                     : APP_LAUNCH_ALPHA_DOWN_DURATION;
 
-            if (dp.isVerticalBarLayout()) {
-                startCrop = windowTargetBounds.height();
-                endCrop = windowTargetBounds.width();
+            if (ENABLE_SHELL_STARTING_SURFACE) {
+                iconAlphaStart = 0;
+
+                // TOOD: Share value from shell when available.
+                final float windowIconSize = Utilities.pxFromSp(108, r.getDisplayMetrics());
+
+                cropCenterXStart = windowTargetBounds.centerX();
+                cropCenterYStart = windowTargetBounds.centerY();
+
+                cropWidthStart = (int) windowIconSize;
+                cropHeightStart = (int) windowIconSize;
             } else {
-                startCrop = windowTargetBounds.width();
-                endCrop = windowTargetBounds.height();
+                iconAlphaStart = 1;
+
+                cropWidthStart = cropHeightStart =
+                        Math.min(windowTargetBounds.width(), windowTargetBounds.height());
+                cropCenterXStart = cropCenterYStart =
+                        Math.min(windowTargetBounds.centerX(), windowTargetBounds.centerY());
             }
 
-            iconAlphaStart = 1f;
+            cropWidthEnd = windowTargetBounds.width();
+            cropHeightEnd = windowTargetBounds.height();
+
+            cropCenterXEnd = windowTargetBounds.centerX();
+            cropCenterYEnd = windowTargetBounds.centerY();
         }
     }
 }
-- 
GitLab


From e733e79946058b749476f22284043757d3508111 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 14 Jan 2021 14:16:09 -0800
Subject: [PATCH 0401/1664] Fixing preview rendering in device search mode

When the flag is disabled, search box may not show in preview

Bug: 177500166
Test: Presubmit
Change-Id: I064ba6ca22e71030056a4ceafea27e6ef0517d01
---
 res/layout/launcher_preview_layout.xml        | 19 ++-----------------
 .../graphics/LauncherPreviewRenderer.java     | 11 -----------
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/res/layout/launcher_preview_layout.xml b/res/layout/launcher_preview_layout.xml
index 4a20c705b6..16916800f3 100644
--- a/res/layout/launcher_preview_layout.xml
+++ b/res/layout/launcher_preview_layout.xml
@@ -29,23 +29,8 @@
         launcher:containerType="workspace"
         launcher:pageIndicator="@+id/page_indicator"/>
 
-    <com.android.launcher3.Hotseat
+    <include
         android:id="@+id/hotseat"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:importantForAccessibility="no"
-        android:theme="@style/HomeScreenElementTheme"
-        launcher:containerType="hotseat" />
-
-    <com.android.launcher3.InsettableFrameLayout
-        android:id="@+id/apps_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" >
-
-        <include
-            android:id="@id/search_container_all_apps"
-            layout="@layout/search_container_all_apps"/>
-
-    </com.android.launcher3.InsettableFrameLayout>
+        layout="@layout/hotseat" />
 
 </com.android.launcher3.InsettableFrameLayout>
\ No newline at end of file
diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index efc1201bba..3a9986ee42 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -64,7 +64,6 @@ import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.R;
 import com.android.launcher3.WorkspaceLayoutManager;
-import com.android.launcher3.allapps.SearchUiManager;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.folder.FolderIcon;
 import com.android.launcher3.icons.BaseIconFactory;
@@ -512,16 +511,6 @@ public class LauncherPreviewRenderer extends ContextThemeWrapper
             mWorkspace.addViewToCellLayout(qsb, 0, R.id.search_container_workspace, lp, true);
         }
 
-        // Setup search view
-        SearchUiManager searchUiManager = mRootView.findViewById(R.id.search_container_all_apps);
-        mRootView.findViewById(R.id.apps_view).setTranslationY(
-                mDp.heightPx - searchUiManager.getScrollRangeDelta(mInsets));
-        ViewGroup searchView = (ViewGroup) searchUiManager;
-        searchView.setEnabled(false);
-        for (int i = 0; i < searchView.getChildCount(); i++) {
-            searchView.getChildAt(i).setEnabled(false);
-        }
-
         measureView(mRootView, mDp.widthPx, mDp.heightPx);
         dispatchVisibilityAggregated(mRootView, true);
         measureView(mRootView, mDp.widthPx, mDp.heightPx);
-- 
GitLab


From f48097f2702a4102bffe31a58384a9e9def10652 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Thu, 14 Jan 2021 19:43:28 -0800
Subject: [PATCH 0402/1664] Correctly generating heap dumps for OOP tests

Not trying to dump the test process :)

Still using Debug.dumpHprofData for inproc because
using shell command for inproc can deadlock.

Test: manual
Bug: 177065099
Change-Id: I4b581954a01ecc8a1427409baa030aaa3b70d6b5
---
 .../android/launcher3/ui/AbstractLauncherUiTest.java  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index 37dd4d27c0..1854fc7e94 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -100,6 +100,7 @@ public abstract class AbstractLauncherUiTest {
     private static final String TAG = "AbstractLauncherUiTest";
 
     private static String sStrictmodeDetectedActivityLeak;
+    private static boolean sDumpWasGenerated = false;
     private static boolean sActivityLeakReported;
     private static final String SYSTEMUI_PACKAGE = "com.android.systemui";
     protected static final ActivityLeakTracker ACTIVITY_LEAK_TRACKER = new ActivityLeakTracker();
@@ -151,10 +152,18 @@ public abstract class AbstractLauncherUiTest {
     }
 
     public static String dumpHprofData() {
+        if (sDumpWasGenerated) return "dump has already been generated by another test";
         try {
             final String fileName = getInstrumentation().getTargetContext().getFilesDir().getPath()
                     + "/ActivityLeakHeapDump.hprof";
-            Debug.dumpHprofData(fileName);
+            if (TestHelpers.isInLauncherProcess()) {
+                Debug.dumpHprofData(fileName);
+            } else {
+                final UiDevice device = UiDevice.getInstance(getInstrumentation());
+                device.executeShellCommand(
+                        "am dumpheap " + device.getLauncherPackageName() + " " + fileName);
+            }
+            sDumpWasGenerated = true;
             return "memory dump filename: " + fileName;
         } catch (Throwable e) {
             Log.e(TAG, "dumpHprofData failed", e);
-- 
GitLab


From 10a2b9c8af67f68a8c1be1d07bbe258f439f7578 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 15 Jan 2021 10:39:34 -0800
Subject: [PATCH 0403/1664] Separate TaskView translationX into dismiss +
 offset translations

- Previously, these both setTranslationX() directly, meaning one
  could clobber the other. Now they are set independently and
  aggregated to setTranslationX().
- For fake landscape, we actually are setting translationY, so
  had to create both translationX and translationY properties, and
  set the appropriate one via the current orientation handler's
  "primary" dimension.

Fixes: 176766821
Change-Id: I00ed0bd73dbea00f4018de62260ed35f4d6966a5
---
 .../android/quickstep/views/RecentsView.java  | 11 ++-
 .../com/android/quickstep/views/TaskView.java | 99 +++++++++++++++++++
 2 files changed, 107 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index f281296ee2..2f2b566e32 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -72,7 +72,6 @@ import android.text.StaticLayout;
 import android.text.TextPaint;
 import android.util.AttributeSet;
 import android.util.FloatProperty;
-import android.util.Property;
 import android.util.SparseBooleanArray;
 import android.view.HapticFeedbackConstants;
 import android.view.KeyEvent;
@@ -1515,7 +1514,9 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                 }
                 int scrollDiff = newScroll[i] - oldScroll[i] + offset;
                 if (scrollDiff != 0) {
-                    Property translationProperty = mOrientationHandler.getPrimaryViewTranslate();
+                    FloatProperty translationProperty = child instanceof TaskView
+                            ? ((TaskView) child).getPrimaryFillDismissGapTranslationProperty()
+                            : mOrientationHandler.getPrimaryViewTranslate();
 
                     ResourceProvider rp = DynamicResource.provider(mActivity);
                     SpringProperty sp = new SpringProperty(SpringProperty.FLAG_CAN_SPRING_ON_END)
@@ -1927,7 +1928,11 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                             ? modalLeftOffsetSize
                             : modalRightOffsetSize;
             float totalTranslation = translation + modalTranslation;
-            mOrientationHandler.getPrimaryViewTranslate().set(getChildAt(i),
+            View child = getChildAt(i);
+            FloatProperty translationProperty = child instanceof TaskView
+                    ? ((TaskView) child).getPrimaryTaskOffsetTranslationProperty()
+                    : mOrientationHandler.getPrimaryViewTranslate();
+            translationProperty.set(child,
                     totalTranslation * mOrientationHandler.getPrimaryTranslationDirectionFactor());
         }
         updateCurveProperties();
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index d94e623ad4..b791d29540 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -152,6 +152,58 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
                 }
             };
 
+    private static final FloatProperty<TaskView> FILL_DISMISS_GAP_TRANSLATION_X =
+            new FloatProperty<TaskView>("fillDismissGapTranslationX") {
+                @Override
+                public void setValue(TaskView taskView, float v) {
+                    taskView.setFillDismissGapTranslationX(v);
+                }
+
+                @Override
+                public Float get(TaskView taskView) {
+                    return taskView.mFillDismissGapTranslationX;
+                }
+            };
+
+    private static final FloatProperty<TaskView> FILL_DISMISS_GAP_TRANSLATION_Y =
+            new FloatProperty<TaskView>("fillDismissGapTranslationY") {
+                @Override
+                public void setValue(TaskView taskView, float v) {
+                    taskView.setFillDismissGapTranslationY(v);
+                }
+
+                @Override
+                public Float get(TaskView taskView) {
+                    return taskView.mFillDismissGapTranslationY;
+                }
+            };
+
+    private static final FloatProperty<TaskView> TASK_OFFSET_TRANSLATION_X =
+            new FloatProperty<TaskView>("taskOffsetTranslationX") {
+                @Override
+                public void setValue(TaskView taskView, float v) {
+                    taskView.setTaskOffsetTranslationX(v);
+                }
+
+                @Override
+                public Float get(TaskView taskView) {
+                    return taskView.mTaskOffsetTranslationX;
+                }
+            };
+
+    private static final FloatProperty<TaskView> TASK_OFFSET_TRANSLATION_Y =
+            new FloatProperty<TaskView>("taskOffsetTranslationY") {
+                @Override
+                public void setValue(TaskView taskView, float v) {
+                    taskView.setTaskOffsetTranslationY(v);
+                }
+
+                @Override
+                public Float get(TaskView taskView) {
+                    return taskView.mTaskOffsetTranslationY;
+                }
+            };
+
     private final OnAttachStateChangeListener mTaskMenuStateListener =
             new OnAttachStateChangeListener() {
                 @Override
@@ -179,6 +231,13 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     private final FullscreenDrawParams mCurrentFullscreenParams;
     private final StatefulActivity mActivity;
 
+    // Various causes of changing primary translation, which we aggregate to setTranslationX/Y().
+    // TODO: We should do this for secondary translation properties as well.
+    private float mFillDismissGapTranslationX;
+    private float mFillDismissGapTranslationY;
+    private float mTaskOffsetTranslationX;
+    private float mTaskOffsetTranslationY;
+
     private ObjectAnimator mIconAndDimAnimator;
     private float mIconScaleAnimStartProgress = 0;
     private float mFocusTransitionProgress = 1;
@@ -601,6 +660,8 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
 
     protected void resetViewTransforms() {
         setCurveScale(1);
+        mFillDismissGapTranslationX = mTaskOffsetTranslationX = 0f;
+        mFillDismissGapTranslationY = mTaskOffsetTranslationY = 0f;
         setTranslationX(0f);
         setTranslationY(0f);
         setTranslationZ(0);
@@ -745,6 +806,44 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         return mCurveScale;
     }
 
+    private void setFillDismissGapTranslationX(float x) {
+        mFillDismissGapTranslationX = x;
+        applyTranslationX();
+    }
+
+    private void setFillDismissGapTranslationY(float y) {
+        mFillDismissGapTranslationY = y;
+        applyTranslationY();
+    }
+
+    private void setTaskOffsetTranslationX(float x) {
+        mTaskOffsetTranslationX = x;
+        applyTranslationX();
+    }
+
+    private void setTaskOffsetTranslationY(float y) {
+        mTaskOffsetTranslationY = y;
+        applyTranslationY();
+    }
+
+    private void applyTranslationX() {
+        setTranslationX(mFillDismissGapTranslationX + mTaskOffsetTranslationX);
+    }
+
+    private void applyTranslationY() {
+        setTranslationY(mFillDismissGapTranslationY + mTaskOffsetTranslationY);
+    }
+
+    public FloatProperty<TaskView> getPrimaryFillDismissGapTranslationProperty() {
+        return getPagedOrientationHandler().getPrimaryValue(
+                FILL_DISMISS_GAP_TRANSLATION_X, FILL_DISMISS_GAP_TRANSLATION_Y);
+    }
+
+    public FloatProperty<TaskView> getPrimaryTaskOffsetTranslationProperty() {
+        return getPagedOrientationHandler().getPrimaryValue(
+                TASK_OFFSET_TRANSLATION_X, TASK_OFFSET_TRANSLATION_Y);
+    }
+
     @Override
     public boolean hasOverlappingRendering() {
         // TODO: Clip-out the icon region from the thumbnail, since they are overlapping.
-- 
GitLab


From ed86cb19bcafcffd186f3c84c963ad1cb104aadd Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Fri, 15 Jan 2021 13:58:03 -0800
Subject: [PATCH 0404/1664] Adding debug tracing for Device.wait

I suspect it may wait for a period of time less than
the specified one, causing flakes.

Test: presubmit
Bug: 177318681
Change-Id: I0be8790c6ee9a5831767fe83c36054ed5a84f8d7
---
 .../com/android/quickstep/FallbackRecentsTest.java |  4 ++--
 .../launcher3/ui/AbstractLauncherUiTest.java       |  5 ++---
 .../com/android/launcher3/tapl/Launchable.java     |  3 +--
 .../launcher3/tapl/LauncherInstrumentation.java    |  2 +-
 .../com/android/launcher3/tapl/TestHelpers.java    | 14 ++++++++++++++
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
index b9e0f628ab..f4065b885a 100644
--- a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
+++ b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
@@ -213,7 +213,7 @@ public class FallbackRecentsTest {
         OverviewTask task = overview.getCurrentTask();
         assertNotNull("overview.getCurrentTask() returned null (1)", task);
         assertNotNull("OverviewTask.open returned null", task.open());
-        assertTrue("Test activity didn't open from Overview", mDevice.wait(Until.hasObject(
+        assertTrue("Test activity didn't open from Overview", TestHelpers.wait(Until.hasObject(
                 By.pkg(getAppPackageName()).text("TestActivity2")),
                 DEFAULT_UI_TIMEOUT));
 
@@ -230,7 +230,7 @@ public class FallbackRecentsTest {
 
         // Test dismissing all tasks.
         pressHomeAndGoToOverview().dismissAllTasks();
-        assertTrue("Fallback Launcher not visible", mDevice.wait(Until.hasObject(By.pkg(
+        assertTrue("Fallback Launcher not visible", TestHelpers.wait(Until.hasObject(By.pkg(
                 mOtherLauncherActivity.packageName)), WAIT_TIME_MS));
     }
 
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index 37dd4d27c0..b57f3a5fb6 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -237,7 +237,7 @@ public abstract class AbstractLauncherUiTest {
     @Before
     public void setUp() throws Exception {
         Assert.assertTrue("Keyguard is visible",
-                mDevice.wait(
+                TestHelpers.wait(
                         Until.gone(By.res(SYSTEMUI_PACKAGE, "keyguard_status_view")), 60000));
 
         final String launcherPackageName = mDevice.getLauncherPackageName();
@@ -470,8 +470,7 @@ public abstract class AbstractLauncherUiTest {
         }
         getInstrumentation().getTargetContext().startActivity(intent);
         assertTrue("App didn't start: " + selector,
-                UiDevice.getInstance(getInstrumentation())
-                        .wait(Until.hasObject(selector), DEFAULT_UI_TIMEOUT));
+                TestHelpers.wait(Until.hasObject(selector), DEFAULT_UI_TIMEOUT));
     }
 
     public static ActivityInfo resolveSystemAppInfo(String category) {
diff --git a/tests/tapl/com/android/launcher3/tapl/Launchable.java b/tests/tapl/com/android/launcher3/tapl/Launchable.java
index 093c024732..3fc83ff926 100644
--- a/tests/tapl/com/android/launcher3/tapl/Launchable.java
+++ b/tests/tapl/com/android/launcher3/tapl/Launchable.java
@@ -68,8 +68,7 @@ abstract class Launchable {
 
         mLauncher.assertTrue(
                 "App didn't start: " + label,
-                mLauncher.getDevice().wait(Until.hasObject(selector),
-                        LauncherInstrumentation.WAIT_TIME_MS));
+                TestHelpers.wait(Until.hasObject(selector), LauncherInstrumentation.WAIT_TIME_MS));
         return new Background(mLauncher);
     }
 
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index e2a442db9b..0c8f610928 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -933,7 +933,7 @@ public final class LauncherInstrumentation {
 
     @NonNull
     UiObject2 waitForAndroidObject(String resId) {
-        final UiObject2 object = mDevice.wait(
+        final UiObject2 object = TestHelpers.wait(
                 Until.findObject(By.res(ANDROID_PACKAGE, resId)), WAIT_TIME_MS);
         assertNotNull("Can't find a android object with id: " + resId, object);
         return object;
diff --git a/tests/tapl/com/android/launcher3/tapl/TestHelpers.java b/tests/tapl/com/android/launcher3/tapl/TestHelpers.java
index b8791e8fa8..7f6062f72a 100644
--- a/tests/tapl/com/android/launcher3/tapl/TestHelpers.java
+++ b/tests/tapl/com/android/launcher3/tapl/TestHelpers.java
@@ -27,6 +27,11 @@ import android.content.pm.ActivityInfo;
 import android.content.pm.ResolveInfo;
 import android.content.res.Resources;
 import android.os.DropBoxManager;
+import android.os.SystemClock;
+import android.util.Log;
+
+import androidx.test.uiautomator.SearchCondition;
+import androidx.test.uiautomator.UiDevice;
 
 import org.junit.Assert;
 
@@ -35,6 +40,7 @@ import java.util.List;
 
 public class TestHelpers {
 
+    private static final String TAG = "Tapl";
     private static Boolean sIsInLauncherProcess;
 
     public static boolean isInLauncherProcess() {
@@ -154,4 +160,12 @@ public class TestHelpers {
             return null;
         }
     }
+
+    public static <R> R wait(SearchCondition<R> condition, long timeout) {
+        Log.d(TAG,
+                "TestHelpers.wait, condition=" + timeout + ", time=" + SystemClock.uptimeMillis());
+        final R result = UiDevice.getInstance(getInstrumentation()).wait(condition, timeout);
+        Log.d(TAG, "TestHelpers.wait, result=" + result + ", time=" + SystemClock.uptimeMillis());
+        return result;
+    }
 }
-- 
GitLab


From 81aaa265f4c315c31bd93f895a13910d3dd00011 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Fri, 15 Jan 2021 18:46:04 -0800
Subject: [PATCH 0405/1664] Resolving a leak of activity via
 SharedPreferencesImpl.MemoryCommitResult

Test: presubmit
Bug: 177065099
Change-Id: I751c21d5915d20c1c27dd5f15b5c096e87963103
---
 src/com/android/launcher3/states/RotationHelper.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/states/RotationHelper.java b/src/com/android/launcher3/states/RotationHelper.java
index ecf4f36c52..ba28e82425 100644
--- a/src/com/android/launcher3/states/RotationHelper.java
+++ b/src/com/android/launcher3/states/RotationHelper.java
@@ -51,7 +51,7 @@ public class RotationHelper implements OnSharedPreferenceChangeListener {
     public static final int REQUEST_ROTATE = 1;
     public static final int REQUEST_LOCK = 2;
 
-    private final Activity mActivity;
+    private Activity mActivity;
     private final SharedPreferences mSharedPrefs;
 
     private boolean mIgnoreAutoRotateSettings;
@@ -95,6 +95,7 @@ public class RotationHelper implements OnSharedPreferenceChangeListener {
 
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String s) {
+        if (mDestroyed) return;
         boolean wasRotationEnabled = mHomeRotationEnabled;
         mHomeRotationEnabled = mSharedPrefs.getBoolean(ALLOW_ROTATION_PREFERENCE_KEY,
                 getAllowRotationDefaultValue());
@@ -141,6 +142,7 @@ public class RotationHelper implements OnSharedPreferenceChangeListener {
     public void destroy() {
         if (!mDestroyed) {
             mDestroyed = true;
+            mActivity = null;
             if (mSharedPrefs != null) {
                 mSharedPrefs.unregisterOnSharedPreferenceChangeListener(this);
             }
-- 
GitLab


From d9abb1767db0c005a17779272e1448a9d9e1a9ff Mon Sep 17 00:00:00 2001
From: "[1;3C" <erosky@google.com>
Date: Mon, 30 Nov 2020 13:32:22 -0800
Subject: [PATCH 0406/1664] Support launcher animations in new transition
 system

Hook up the shell-transitions RemoteTransition to
launcher.

Bug: 169035082
Test: Launch an app from a launcher icon and observe
Change-Id: Ie327c11bbc59f19fb969f159f8380c10e4a84e50
---
 proguard.flags                                |  5 ++-
 .../QuickstepAppTransitionManagerImpl.java    | 43 ++++++++++++++++++-
 .../quickstep/BaseActivityInterface.java      |  5 +++
 .../quickstep/LauncherActivityInterface.java  |  9 +++-
 .../com/android/quickstep/SystemUiProxy.java  | 23 ++++++++++
 .../quickstep/TouchInteractionService.java    |  6 +++
 src/com/android/launcher3/Launcher.java       |  1 +
 .../LauncherAppTransitionManager.java         | 14 ++++++
 8 files changed, 101 insertions(+), 5 deletions(-)

diff --git a/proguard.flags b/proguard.flags
index 37b80938fa..a45018346a 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -45,9 +45,10 @@
 
 # BUG(70852369): Surpress additional warnings after changing from Proguard to R8
 -dontwarn android.app.**
--dontwarn android.view.**
--dontwarn android.os.**
 -dontwarn android.graphics.**
+-dontwarn android.os.**
+-dontwarn android.view.**
+-dontwarn android.window.**
 
 # Ignore warnings for hidden utility classes referenced from the shared lib
 -dontwarn com.android.internal.util.**
diff --git a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
index 99c4dbaaad..2d9d0920e5 100644
--- a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
@@ -75,6 +75,7 @@ import com.android.launcher3.util.MultiValueAlpha;
 import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;
 import com.android.launcher3.views.FloatingIconView;
 import com.android.quickstep.RemoteAnimationTargets;
+import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.util.MultiValueUpdateListener;
 import com.android.quickstep.util.RemoteAnimationProvider;
 import com.android.quickstep.util.StaggeredWorkspaceAnim;
@@ -87,6 +88,7 @@ import com.android.systemui.shared.system.RemoteAnimationAdapterCompat;
 import com.android.systemui.shared.system.RemoteAnimationDefinitionCompat;
 import com.android.systemui.shared.system.RemoteAnimationRunnerCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
+import com.android.systemui.shared.system.RemoteTransitionCompat;
 import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
 import com.android.systemui.shared.system.WindowManagerWrapper;
 
@@ -163,6 +165,9 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
     private WrappedAnimationRunnerImpl mAppLaunchRunner;
     private WrappedAnimationRunnerImpl mKeyguardGoingAwayRunner;
 
+    private WrappedAnimationRunnerImpl mWallpaperOpenTransitionRunner;
+    private RemoteTransitionCompat mLauncherOpenTransition;
+
     private final AnimatorListenerAdapter mForceInvisibleListener = new AnimatorListenerAdapter() {
         @Override
         public void onAnimationStart(Animator animation) {
@@ -582,10 +587,11 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                                 .withCornerRadius(mWindowRadius.value)
                                 .withShadowRadius(mShadowRadius.value);
                     } else {
-                        tmpPos.set(target.position.x, target.position.y);
                         if (target.localBounds != null) {
                             final Rect localBounds = target.localBounds;
                             tmpPos.set(target.localBounds.left, target.localBounds.top);
+                        } else {
+                            tmpPos.set(target.position.x, target.position.y);
                         }
 
                         matrix.setTranslate(tmpPos.x, tmpPos.y);
@@ -656,6 +662,24 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
         }
     }
 
+    /**
+     * Registers remote animations used when closing apps to home screen.
+     */
+    @Override
+    public void registerRemoteTransitions() {
+        if (SEPARATE_RECENTS_ACTIVITY.get()) {
+            return;
+        }
+        if (hasControlRemoteAppTransitionPermission()) {
+            mWallpaperOpenTransitionRunner = createWallpaperOpenRunner(false /* fromUnlock */);
+            mLauncherOpenTransition = RemoteAnimationAdapterCompat.buildRemoteTransition(
+                    new WrappedLauncherAnimationRunner<>(mWallpaperOpenTransitionRunner,
+                            false /* startAtFrontOfQueue */));
+            mLauncherOpenTransition.addHomeOpenCheck();
+            SystemUiProxy.INSTANCE.getNoCreate().registerRemoteTransition(mLauncherOpenTransition);
+        }
+    }
+
     /**
      * Unregisters all remote animations.
      */
@@ -675,6 +699,20 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
         }
     }
 
+    @Override
+    public void unregisterRemoteTransitions() {
+        if (SEPARATE_RECENTS_ACTIVITY.get()) {
+            return;
+        }
+        if (hasControlRemoteAppTransitionPermission()) {
+            if (mLauncherOpenTransition == null) return;
+            SystemUiProxy.INSTANCE.getNoCreate().unregisterRemoteTransition(
+                    mLauncherOpenTransition);
+            mLauncherOpenTransition = null;
+            mWallpaperOpenTransitionRunner = null;
+        }
+    }
+
     private boolean launcherIsATargetWithMode(RemoteAnimationTargetCompat[] targets, int mode) {
         return taskIsATargetWithMode(targets, mLauncher.getTaskId(), mode);
     }
@@ -742,9 +780,10 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                     RemoteAnimationTargetCompat target = appTargets[i];
                     SurfaceParams.Builder builder = new SurfaceParams.Builder(target.leash);
 
-                    tmpPos.set(target.position.x, target.position.y);
                     if (target.localBounds != null) {
                         tmpPos.set(target.localBounds.left, target.localBounds.top);
+                    } else {
+                        tmpPos.set(target.position.x, target.position.y);
                     }
 
                     if (target.mode == MODE_CLOSING) {
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index b4f20d10d5..5bed929fb4 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -396,4 +396,9 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
             pa.addFloat(recentsView, FULLSCREEN_PROGRESS, 1, 0, LINEAR);
         }
     }
+
+    /** Called when OverviewService is bound to this process */
+    void onOverviewServiceBound() {
+        // Do nothing
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
index 9f435f5311..7630bc4f5b 100644
--- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
@@ -270,4 +270,11 @@ public final class LauncherActivityInterface extends
                 + res.getDimensionPixelSize(R.dimen.overview_actions_height);
         return actionsHeight;
     }
-}
\ No newline at end of file
+
+    @Override
+    void onOverviewServiceBound() {
+        final BaseQuickstepLauncher activity = getCreatedActivity();
+        if (activity == null) return;
+        activity.getAppTransitionManager().registerRemoteTransitions();
+    }
+}
diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index a214d81e76..ca55468a9f 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -35,6 +35,7 @@ import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.systemui.shared.recents.IPinnedStackAnimationListener;
 import com.android.systemui.shared.recents.ISystemUiProxy;
 import com.android.systemui.shared.recents.model.Task;
+import com.android.systemui.shared.system.RemoteTransitionCompat;
 
 /**
  * Holds the reference to SystemUI.
@@ -408,4 +409,26 @@ public class SystemUiProxy implements ISystemUiProxy {
             }
         }
     }
+
+    @Override
+    public void registerRemoteTransition(RemoteTransitionCompat remoteTransition) {
+        if (mSystemUiProxy != null) {
+            try {
+                mSystemUiProxy.registerRemoteTransition(remoteTransition);
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call registerRemoteTransition");
+            }
+        }
+    }
+
+    @Override
+    public void unregisterRemoteTransition(RemoteTransitionCompat remoteTransition) {
+        if (mSystemUiProxy != null) {
+            try {
+                mSystemUiProxy.unregisterRemoteTransition(remoteTransition);
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call registerRemoteTransition");
+            }
+        }
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index e59035cf5a..1f7cec5bd2 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -136,6 +136,12 @@ public class TouchInteractionService extends Service implements PluginListener<O
                 SystemUiProxy.INSTANCE.get(TouchInteractionService.this).setProxy(proxy);
                 TouchInteractionService.this.initInputMonitor();
                 preloadOverview(true /* fromInit */);
+                mDeviceState.runOnUserUnlocked(() -> {
+                    final BaseActivityInterface ai =
+                            mOverviewComponentObserver.getActivityInterface();
+                    if (ai == null) return;
+                    ai.onOverviewServiceBound();
+                });
             });
             sIsInitialized = true;
         }
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 5b55c4b435..0274775244 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1596,6 +1596,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
         mOverlayManager.onActivityDestroyed(this);
         mAppTransitionManager.unregisterRemoteAnimations();
+        mAppTransitionManager.unregisterRemoteTransitions();
         mUserChangedCallbackCloseable.close();
         mLifecycleRegistry.setCurrentState(Lifecycle.State.DESTROYED);
         mLiveSearchManager.stop();
diff --git a/src/com/android/launcher3/LauncherAppTransitionManager.java b/src/com/android/launcher3/LauncherAppTransitionManager.java
index 24e0d14c9e..ac3ad9f8fd 100644
--- a/src/com/android/launcher3/LauncherAppTransitionManager.java
+++ b/src/com/android/launcher3/LauncherAppTransitionManager.java
@@ -67,4 +67,18 @@ public class LauncherAppTransitionManager implements ResourceBasedOverride {
     public void unregisterRemoteAnimations() {
         // Do nothing
     }
+
+    /**
+     * Registers remote transitions for certain system transitions.
+     */
+    public void registerRemoteTransitions() {
+        // Do nothing
+    }
+
+    /**
+     * Unregisters all remote transitions.
+     */
+    public void unregisterRemoteTransitions() {
+        // Do nothing
+    }
 }
-- 
GitLab


From d6bc1292317e16e6d24d8f571a45ce8ecfa3113e Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Thu, 14 Jan 2021 23:44:17 +0000
Subject: [PATCH 0407/1664] Ensure setRequestedOrientation is called when
 unfolding the device

- In RotationHelper, mLastActivityFlags defaults to -1, which is the same value as SCREEN_ORIENTATION_UNSPECIFIED. When the screen is folded, a new instance of RotationHelper is created, which attempts to reset setRequestedOrientation to SCREEN_ORIENTATION_UNSPECIFIED. But SCREEN_ORIENTATION_UNSPECIFIED is equal to mLastActivityFlags, and the call is skipped.
- The simpel fix is to default mLastActivityFlags to something else that is not a a valid value of setRequestedOrientation

Bug: 177320461
Change-Id: I1ca284149598745bfa612ee12e4da3b940b60288
(cherry picked from commit 8aa592f44620a8f57fa104819f8bba57c4360f95)
---
 src/com/android/launcher3/states/RotationHelper.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/states/RotationHelper.java b/src/com/android/launcher3/states/RotationHelper.java
index ecf4f36c52..0638861f2e 100644
--- a/src/com/android/launcher3/states/RotationHelper.java
+++ b/src/com/android/launcher3/states/RotationHelper.java
@@ -76,7 +76,8 @@ public class RotationHelper implements OnSharedPreferenceChangeListener {
     private boolean mInitialized;
     private boolean mDestroyed;
 
-    private int mLastActivityFlags = -1;
+    // Initialize mLastActivityFlags to a value not used by SCREEN_ORIENTATION flags
+    private int mLastActivityFlags = -999;
 
     public RotationHelper(Activity activity) {
         mActivity = activity;
-- 
GitLab


From 6e60380abb66c904ac4a291a64ab6224acd8be40 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Tue, 19 Jan 2021 19:50:18 +0000
Subject: [PATCH 0408/1664] Revert "Add UI updates for incremental app
 installs."

This reverts commit b803f7e2cb8dbaab2c1453693c61155c03fd90c8.

Reason for revert: causes b/177642572

Change-Id: I48b85e8495734a2d3a7b477dfb20929879465b6a
---
 src/com/android/launcher3/model/AllAppsList.java         | 9 ++-------
 src/com/android/launcher3/model/PackageUpdatedTask.java  | 2 --
 src/com/android/launcher3/model/data/AppInfo.java        | 3 ++-
 .../android/launcher3/model/data/ItemInfoWithIcon.java   | 6 ++----
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/com/android/launcher3/model/AllAppsList.java b/src/com/android/launcher3/model/AllAppsList.java
index c57c3e495a..8d5cf7422f 100644
--- a/src/com/android/launcher3/model/AllAppsList.java
+++ b/src/com/android/launcher3/model/AllAppsList.java
@@ -26,7 +26,6 @@ import android.content.pm.ApplicationInfo;
 import android.content.pm.LauncherActivityInfo;
 import android.content.pm.LauncherApps;
 import android.os.LocaleList;
-import android.os.Process;
 import android.os.UserHandle;
 import android.util.Log;
 
@@ -162,18 +161,14 @@ public class AllAppsList {
     /** Updates the given PackageInstallInfo's associated AppInfo's installation info. */
     public List<AppInfo> updatePromiseInstallInfo(PackageInstallInfo installInfo) {
         List<AppInfo> updatedAppInfos = new ArrayList<>();
-        UserHandle user = Process.myUserHandle();
+        UserHandle user = installInfo.user;
         for (int i = data.size() - 1; i >= 0; i--) {
             final AppInfo appInfo = data.get(i);
             final ComponentName tgtComp = appInfo.getTargetComponent();
             if (tgtComp != null && tgtComp.getPackageName().equals(installInfo.packageName)
                     && appInfo.user.equals(user)) {
                 if (installInfo.state == PackageInstallInfo.STATUS_INSTALLED_DOWNLOADING
-                        || installInfo.state == PackageInstallInfo.STATUS_INSTALLING) {
-                    if (appInfo.isAppStartable()
-                            && installInfo.state == PackageInstallInfo.STATUS_INSTALLING) {
-                        continue;
-                    }
+                            || installInfo.state == PackageInstallInfo.STATUS_INSTALLING) {
                     appInfo.setProgressLevel(installInfo);
 
                     updatedAppInfos.add(appInfo);
diff --git a/src/com/android/launcher3/model/PackageUpdatedTask.java b/src/com/android/launcher3/model/PackageUpdatedTask.java
index 3275d59488..896bfb666e 100644
--- a/src/com/android/launcher3/model/PackageUpdatedTask.java
+++ b/src/com/android/launcher3/model/PackageUpdatedTask.java
@@ -38,7 +38,6 @@ import com.android.launcher3.logging.FileLog;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
-import com.android.launcher3.pm.PackageInstallInfo;
 import com.android.launcher3.pm.UserCache;
 import com.android.launcher3.shortcuts.ShortcutRequest;
 import com.android.launcher3.util.FlagOp;
@@ -247,7 +246,6 @@ public class PackageUpdatedTask extends BaseModelUpdateTask {
 
                         if (isNewApkAvailable
                                 && si.itemType == Favorites.ITEM_TYPE_APPLICATION) {
-                            si.setProgressLevel(100, PackageInstallInfo.STATUS_INSTALLED);
                             iconCache.getTitleAndIcon(si, si.usingLowResIcon());
                             infoUpdated = true;
                         }
diff --git a/src/com/android/launcher3/model/data/AppInfo.java b/src/com/android/launcher3/model/data/AppInfo.java
index dde0cf4674..39247c221f 100644
--- a/src/com/android/launcher3/model/data/AppInfo.java
+++ b/src/com/android/launcher3/model/data/AppInfo.java
@@ -94,6 +94,8 @@ public class AppInfo extends ItemInfoWithIcon {
         componentName = info.componentName;
         title = Utilities.trim(info.title);
         intent = new Intent(info.intent);
+        user = info.user;
+        runtimeStatusFlags = info.runtimeStatusFlags;
     }
 
     @VisibleForTesting
@@ -112,7 +114,6 @@ public class AppInfo extends ItemInfoWithIcon {
             .setComponent(componentName)
             .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
                 | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
-        setProgressLevel(installInfo);
         user = installInfo.user;
     }
 
diff --git a/src/com/android/launcher3/model/data/ItemInfoWithIcon.java b/src/com/android/launcher3/model/data/ItemInfoWithIcon.java
index d95e7080de..b8a71d33e0 100644
--- a/src/com/android/launcher3/model/data/ItemInfoWithIcon.java
+++ b/src/com/android/launcher3/model/data/ItemInfoWithIcon.java
@@ -129,9 +129,7 @@ public abstract class ItemInfoWithIcon extends ItemInfo {
     protected ItemInfoWithIcon(ItemInfoWithIcon info) {
         super(info);
         bitmap = info.bitmap;
-        mProgressLevel = info.mProgressLevel;
         runtimeStatusFlags = info.runtimeStatusFlags;
-        user = info.user;
     }
 
     @Override
@@ -197,8 +195,8 @@ public abstract class ItemInfoWithIcon extends ItemInfo {
                     : runtimeStatusFlags & ~FLAG_INCREMENTAL_DOWNLOAD_ACTIVE;
         } else {
             mProgressLevel = status == PackageInstallInfo.STATUS_INSTALLED ? 100 : 0;
-            runtimeStatusFlags &= ~FLAG_INSTALL_SESSION_ACTIVE;
-            runtimeStatusFlags &= ~FLAG_INCREMENTAL_DOWNLOAD_ACTIVE;
+            runtimeStatusFlags = runtimeStatusFlags & ~FLAG_INSTALL_SESSION_ACTIVE;
+            runtimeStatusFlags = runtimeStatusFlags & ~FLAG_INCREMENTAL_DOWNLOAD_ACTIVE;
         }
     }
 
-- 
GitLab


From 64bb8946c7a7eebee9354398f6c1c7597788ede8 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 14 Jan 2021 13:58:51 -0800
Subject: [PATCH 0409/1664] Adding all-apps onboarding popup for 2-button mode

Bug: 177402588
Bug: 175137718
Test: Verified on device

Change-Id: Idc1c81add3b11451ef43f25163829f9ffcde131a
---
 .../uioverrides/QuickstepLauncher.java        |  4 +-
 ...va => TwoButtonNavbarTouchController.java} | 59 +++++++++++++++++--
 .../launcher3/util/OnboardingPrefs.java       |  1 -
 3 files changed, 56 insertions(+), 8 deletions(-)
 rename quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/{TwoButtonNavbarToOverviewTouchController.java => TwoButtonNavbarTouchController.java} (59%)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 3be1ced810..5c684658de 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -64,7 +64,7 @@ import com.android.launcher3.uioverrides.touchcontrollers.QuickSwitchTouchContro
 import com.android.launcher3.uioverrides.touchcontrollers.StatusBarTouchController;
 import com.android.launcher3.uioverrides.touchcontrollers.TaskViewTouchController;
 import com.android.launcher3.uioverrides.touchcontrollers.TransposedQuickSwitchTouchController;
-import com.android.launcher3.uioverrides.touchcontrollers.TwoButtonNavbarToOverviewTouchController;
+import com.android.launcher3.uioverrides.touchcontrollers.TwoButtonNavbarTouchController;
 import com.android.launcher3.util.OnboardingPrefs;
 import com.android.launcher3.util.TouchController;
 import com.android.launcher3.util.UiThreadHelper;
@@ -284,7 +284,7 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
                 list.add(new NoButtonNavbarToOverviewTouchController(this));
                 break;
             case TWO_BUTTONS:
-                list.add(new TwoButtonNavbarToOverviewTouchController(this));
+                list.add(new TwoButtonNavbarTouchController(this));
                 list.add(getDeviceProfile().isVerticalBarLayout()
                         ? new TransposedQuickSwitchTouchController(this)
                         : new QuickSwitchTouchController(this));
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java
similarity index 59%
rename from quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarToOverviewTouchController.java
rename to quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java
index ff4bfe6759..6271a44b53 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarToOverviewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java
@@ -15,10 +15,13 @@
  */
 package com.android.launcher3.uioverrides.touchcontrollers;
 
+import static com.android.launcher3.AbstractFloatingView.TYPE_ALL_APPS_EDU;
+import static com.android.launcher3.AbstractFloatingView.getOpenView;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.Utilities.EDGE_NAV_BAR;
 
+import android.animation.ValueAnimator;
 import android.view.MotionEvent;
 
 import com.android.launcher3.AbstractFloatingView;
@@ -28,42 +31,79 @@ import com.android.launcher3.states.StateAnimationConfig.AnimationFlags;
 import com.android.launcher3.touch.AbstractStateChangeTouchController;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
 import com.android.quickstep.SystemUiProxy;
+import com.android.quickstep.views.AllAppsEduView;
 
 /**
  * Touch controller for handling edge swipes in 2-button mode
  */
-public class TwoButtonNavbarToOverviewTouchController extends AbstractStateChangeTouchController {
+public class TwoButtonNavbarTouchController extends AbstractStateChangeTouchController {
+
+    private static final int MAX_NUM_SWIPES_TO_TRIGGER_EDU = 3;
 
     private static final String TAG = "2BtnNavbarTouchCtrl";
 
-    public TwoButtonNavbarToOverviewTouchController(Launcher l) {
+    private final boolean mIsTransposed;
+
+    // If true, we will finish the current animation instantly on second touch.
+    private boolean mFinishFastOnSecondTouch;
+
+    private int mContinuousTouchCount = 0;
+
+    public TwoButtonNavbarTouchController(Launcher l) {
         super(l, l.getDeviceProfile().isVerticalBarLayout()
                 ? SingleAxisSwipeDetector.HORIZONTAL : SingleAxisSwipeDetector.VERTICAL);
+        mIsTransposed = l.getDeviceProfile().isVerticalBarLayout();
     }
 
     @Override
     protected boolean canInterceptTouch(MotionEvent ev) {
+        boolean canIntercept = canInterceptTouchInternal(ev);
+        if (!canIntercept) {
+            mContinuousTouchCount = 0;
+        }
+        return canIntercept;
+    }
+
+    private boolean canInterceptTouchInternal(MotionEvent ev) {
         if (mCurrentAnimation != null) {
+            if (mFinishFastOnSecondTouch) {
+                mCurrentAnimation.getAnimationPlayer().end();
+            }
+
             // If we are already animating from a previous state, we can intercept.
             return true;
         }
         if (AbstractFloatingView.getTopOpenView(mLauncher) != null) {
             return false;
         }
-        return mLauncher.isInState(NORMAL) && (ev.getEdgeFlags() & EDGE_NAV_BAR) != 0;
+        if ((ev.getEdgeFlags() & EDGE_NAV_BAR) == 0) {
+            return false;
+        }
+        if (!mIsTransposed && mLauncher.isInState(OVERVIEW)) {
+            return true;
+        }
+        return mLauncher.isInState(NORMAL);
     }
 
     @Override
     protected LauncherState getTargetState(LauncherState fromState, boolean isDragTowardPositive) {
-        if (mLauncher.getDeviceProfile().isVerticalBarLayout()) {
+        if (mIsTransposed) {
             boolean draggingFromNav =
                     mLauncher.getDeviceProfile().isSeascape() == isDragTowardPositive;
             return draggingFromNav ? OVERVIEW : NORMAL;
         } else {
-            return isDragTowardPositive ? OVERVIEW : NORMAL;
+            return isDragTowardPositive ^ (fromState == OVERVIEW) ? OVERVIEW : NORMAL;
         }
     }
 
+    @Override
+    protected void updateSwipeCompleteAnimation(ValueAnimator animator, long expectedDuration,
+            LauncherState targetState, float velocity, boolean isFling) {
+        super.updateSwipeCompleteAnimation(animator, expectedDuration, targetState,
+                velocity, isFling);
+        mFinishFastOnSecondTouch = !mIsTransposed && mFromState == NORMAL;
+    }
+
     @Override
     protected float getShiftRange() {
         return mLauncher.getDeviceProfile().isVerticalBarLayout()
@@ -82,8 +122,17 @@ public class TwoButtonNavbarToOverviewTouchController extends AbstractStateChang
     @Override
     protected void onSwipeInteractionCompleted(LauncherState targetState) {
         super.onSwipeInteractionCompleted(targetState);
+        if (!mIsTransposed) {
+            mContinuousTouchCount++;
+        }
         if (mStartState == NORMAL && targetState == OVERVIEW) {
             SystemUiProxy.INSTANCE.get(mLauncher).onOverviewShown(true, TAG);
+        } else if (targetState == NORMAL
+                && mContinuousTouchCount >= MAX_NUM_SWIPES_TO_TRIGGER_EDU) {
+            mContinuousTouchCount = 0;
+            if (getOpenView(mLauncher, TYPE_ALL_APPS_EDU) == null) {
+                AllAppsEduView.show(mLauncher);
+            }
         }
     }
 }
diff --git a/src/com/android/launcher3/util/OnboardingPrefs.java b/src/com/android/launcher3/util/OnboardingPrefs.java
index 539768ecc2..14df0f3ae2 100644
--- a/src/com/android/launcher3/util/OnboardingPrefs.java
+++ b/src/com/android/launcher3/util/OnboardingPrefs.java
@@ -34,7 +34,6 @@ public class OnboardingPrefs<T extends Launcher> {
 
     public static final String HOME_BOUNCE_SEEN = "launcher.apps_view_shown";
     public static final String HOME_BOUNCE_COUNT = "launcher.home_bounce_count";
-    public static final String SHELF_BOUNCE_COUNT = "launcher.shelf_bounce_count";
     public static final String HOTSEAT_DISCOVERY_TIP_COUNT = "launcher.hotseat_discovery_tip_count";
     public static final String HOTSEAT_LONGPRESS_TIP_SEEN = "launcher.hotseat_longpress_tip_seen";
 
-- 
GitLab


From bdf4f7129919467e79beb25daaa41879b9622fd5 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Wed, 13 Jan 2021 11:05:12 -0600
Subject: [PATCH 0410/1664]  Migrate from Plugin SearchTarget to API search
 Target [3/3]

- Implement SearchServicePipeline which utilizes system Search services for AllAppsSearch Results
- Parse android.app.search.SearchTarget handling for Shortcut, Slice, Settings and Play results
- Aggregate SearchTargets to a tree structure for in-line Search Results

Bug: 177223401
Test: Manual
Change-Id: Iddc0f3691578fd332cd2df643a237b29f3eccd0d
---
 .../search/DeviceSearchAdapterProvider.java   |  27 +++-
 .../launcher3/search/SearchAdapterItem.java   |   7 +
 .../launcher3/search/SearchResultIcon.java    |  30 +++-
 .../launcher3/search/SearchResultIconRow.java |  12 ++
 .../search/SearchResultPlayItem.java          | 126 +++++++---------
 .../search/SearchResultSettingsSlice.java     |  15 ++
 .../search/SearchSectionHeaderView.java       |   9 ++
 .../search/SearchServicePipeline.java         | 137 ++++++++++++++++++
 .../search/SearchSettingsRowView.java         |  10 ++
 .../launcher3/search/SearchTargetHandler.java |   9 +-
 .../uioverrides/QuickstepLauncher.java        |   1 +
 .../launcher3/allapps/SearchUiManager.java    |   5 +
 .../launcher3/config/FeatureFlags.java        |   5 +-
 13 files changed, 301 insertions(+), 92 deletions(-)
 create mode 100644 quickstep/src/com/android/launcher3/search/SearchServicePipeline.java

diff --git a/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java b/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
index 9ce196ef84..3343cf5d69 100644
--- a/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
+++ b/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
@@ -23,6 +23,8 @@ import android.util.SparseIntArray;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
+import com.android.app.search.LayoutType;
+import com.android.app.search.ResultType;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsContainerView;
@@ -78,10 +80,10 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
         SearchTargetHandler
                 payloadResultView =
                 (SearchTargetHandler) holder.itemView;
-        if (FeatureFlags.SEARCH_TARGET_LEGACY.get()) {
+        if (!FeatureFlags.USE_SEARCH_API.get()) {
             payloadResultView.applySearchTarget(item.getSearchTargetLegacy());
         } else {
-            payloadResultView.applySearchTarget(item.getSearchTarget());
+            payloadResultView.applySearchTarget(item.getSearchTarget(), item.getInlineItems());
         }
     }
 
@@ -123,9 +125,24 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
      * Returns -1 if viewType is not found
      */
     public int getViewTypeForSearchTarget(SearchTarget t) {
-        //TODO: Replace with values from :SearchUi
-        if (t.getResultType() == 1 && t.getLayoutType().equals("icon")) {
-            return VIEW_TYPE_SEARCH_ICON;
+        if (t.getLayoutType().equals(LayoutType.TEXT_HEADER)) {
+            return VIEW_TYPE_SEARCH_CORPUS_TITLE;
+        }
+        switch (t.getResultType()) {
+            case ResultType.APPLICATION:
+                if (t.getLayoutType().equals(LayoutType.ICON_SINGLE_VERTICAL_TEXT)) {
+                    return VIEW_TYPE_SEARCH_ICON;
+                }
+                break;
+            case ResultType.SETTING:
+                if (t.getLayoutType().equals(LayoutType.ICON_SLICE)) {
+                    return VIEW_TYPE_SEARCH_SLICE;
+                }
+                return VIEW_TYPE_SEARCH_ROW;
+            case ResultType.SHORTCUT:
+                return VIEW_TYPE_SEARCH_ICON_ROW;
+            case ResultType.PLAY:
+                return VIEW_TYPE_SEARCH_ROW_WITH_BUTTON;
         }
         return -1;
     }
diff --git a/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java b/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
index 258d97750b..65ac3f9ceb 100644
--- a/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
+++ b/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
@@ -32,12 +32,16 @@ import android.app.search.SearchTarget;
 import com.android.launcher3.allapps.AllAppsGridAdapter;
 import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Extension of AdapterItem that contains an extra payload specific to item
  */
 public class SearchAdapterItem extends AllAppsGridAdapter.AdapterItem {
     private SearchTargetLegacy mSearchTargetLegacy;
     private SearchTarget mSearchTarget;
+    private List<SearchTarget> mInlineItems = new ArrayList<>();
 
 
     private static final int AVAILABLE_FOR_ACCESSIBILITY = VIEW_TYPE_SEARCH_ROW_WITH_BUTTON
@@ -65,6 +69,9 @@ public class SearchAdapterItem extends AllAppsGridAdapter.AdapterItem {
         return mSearchTarget;
     }
 
+    public List<SearchTarget> getInlineItems() {
+        return mInlineItems;
+    }
     @Override
     protected boolean isCountedForAccessibility() {
         return (AVAILABLE_FOR_ACCESSIBILITY & viewType) == viewType;
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
index e4d737c44f..d5fe0e8456 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
@@ -31,10 +31,12 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.android.app.search.ResultType;
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.allapps.AllAppsStore;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.model.data.AppInfo;
@@ -46,6 +48,7 @@ import com.android.launcher3.util.ComponentKey;
 import com.android.systemui.plugins.shared.SearchTargetEventLegacy;
 import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
+import java.util.List;
 import java.util.function.Consumer;
 
 /**
@@ -128,10 +131,27 @@ public class SearchResultIcon extends BubbleTextView implements
         }
     }
 
+    /**
+     * Applies {@link SearchTarget} to view. registers a consumer after a corresponding
+     * {@link ItemInfoWithIcon} is created
+     */
+    public void applySearchTarget(SearchTarget searchTarget, List<SearchTarget> inlineItems,
+            Consumer<ItemInfoWithIcon> cb) {
+        mOnItemInfoChanged = cb;
+        applySearchTarget(searchTarget, inlineItems);
+    }
+
     @Override
-    public void applySearchTarget(SearchTarget searchTarget) {
-        prepareUsingApp(new ComponentName(searchTarget.getPackageName(),
-                searchTarget.getExtras().getString("class")), searchTarget.getUserHandle());
+    public void applySearchTarget(SearchTarget parentTarget, List<SearchTarget> children) {
+        switch (parentTarget.getResultType()) {
+            case ResultType.APPLICATION:
+                prepareUsingApp(new ComponentName(parentTarget.getPackageName(),
+                        parentTarget.getExtras().getString("class")), parentTarget.getUserHandle());
+                break;
+            case ResultType.SHORTCUT:
+                prepareUsingShortcutInfo(parentTarget.getShortcutInfo());
+                break;
+        }
     }
 
     private void prepareUsingApp(ComponentName componentName, UserHandle userHandle) {
@@ -185,7 +205,9 @@ public class SearchResultIcon extends BubbleTextView implements
     @Override
     public void handleSelection(int eventType) {
         mLauncher.getItemOnClickListener().onClick(this);
-        reportEvent(eventType);
+        if (!FeatureFlags.USE_SEARCH_API.get()) {
+            reportEvent(eventType);
+        }
     }
 
     private void reportEvent(int eventType) {
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java b/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
index 8c491d27d1..80d543a23c 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
@@ -18,6 +18,7 @@ package com.android.launcher3.search;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
+import android.app.search.SearchTarget;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.ShortcutInfo;
@@ -32,6 +33,7 @@ import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 
+import com.android.app.search.ResultType;
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
@@ -111,6 +113,16 @@ public class SearchResultIconRow extends LinearLayout implements
         setOnLongClickListener(this);
     }
 
+    @Override
+    public void applySearchTarget(SearchTarget parentTarget, List<SearchTarget> children) {
+        mResultIcon.applySearchTarget(parentTarget, children, this);
+        if (parentTarget.getResultType() == ResultType.SHORTCUT) {
+            ShortcutInfo shortcutInfo = parentTarget.getShortcutInfo();
+            setProviderDetails(new ComponentName(shortcutInfo.getPackage(), ""),
+                    shortcutInfo.getUserHandle());
+        }
+    }
+
     @Override
     public void applySearchTarget(SearchTargetLegacy searchTarget) {
         mSearchTarget = searchTarget;
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultPlayItem.java b/quickstep/src/com/android/launcher3/search/SearchResultPlayItem.java
index 3bb821f958..840bde9952 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultPlayItem.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultPlayItem.java
@@ -17,6 +17,8 @@ package com.android.launcher3.search;
 
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
+import android.app.search.SearchAction;
+import android.app.search.SearchTarget;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -27,8 +29,6 @@ import android.graphics.PorterDuffXfermode;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.drawable.BitmapDrawable;
-import android.net.Uri;
-import android.os.Bundle;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
@@ -43,12 +43,11 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.util.Themes;
-import com.android.systemui.plugins.shared.SearchTargetEventLegacy;
-import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
 import java.io.IOException;
 import java.net.URL;
 import java.net.URLConnection;
+import java.util.List;
 
 /**
  * A View representing a PlayStore item.
@@ -67,9 +66,8 @@ public class SearchResultPlayItem extends LinearLayout implements
     private TextView[] mDetailViews = new TextView[3];
     private Button mPreviewButton;
     private String mPackageName;
-    private boolean mIsInstantGame;
-
-    private SearchTargetLegacy mSearchTarget;
+    private Intent mIntent;
+    private Intent mSecondaryIntent;
 
 
     public SearchResultPlayItem(Context context) {
@@ -93,7 +91,7 @@ public class SearchResultPlayItem extends LinearLayout implements
         mIconView = findViewById(R.id.icon);
         mTitleView = findViewById(R.id.title_view);
         mPreviewButton = findViewById(R.id.try_button);
-        mPreviewButton.setOnClickListener(view -> launchInstantGame());
+        mPreviewButton.setOnClickListener(view -> launchIntent(mSecondaryIntent));
         mDetailViews[0] = findViewById(R.id.detail_0);
         mDetailViews[1] = findViewById(R.id.detail_1);
         mDetailViews[2] = findViewById(R.id.detail_2);
@@ -101,53 +99,47 @@ public class SearchResultPlayItem extends LinearLayout implements
         ViewGroup.LayoutParams iconParams = mIconView.getLayoutParams();
         iconParams.height = mDeviceProfile.allAppsIconSizePx;
         iconParams.width = mDeviceProfile.allAppsIconSizePx;
-        setOnClickListener(view -> handleSelection(SearchTargetEventLegacy.SELECT));
+        setOnClickListener(view -> launchIntent(mIntent));
     }
 
-
-    private Bitmap getRoundedBitmap(Bitmap bitmap) {
-        final int iconSize = bitmap.getWidth();
-        final float radius = Themes.getDialogCornerRadius(getContext());
-
-        Bitmap output = BitmapRenderer.createHardwareBitmap(iconSize, iconSize, (canvas) -> {
-            mTempRect.set(0, 0, iconSize, iconSize);
-            final RectF rectF = new RectF(mTempRect);
-
-            mIconPaint.setAntiAlias(true);
-            mIconPaint.reset();
-            canvas.drawARGB(0, 0, 0, 0);
-            mIconPaint.setColor(BITMAP_CROP_MASK_COLOR);
-            canvas.drawRoundRect(rectF, radius, radius, mIconPaint);
-
-            mIconPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
-            canvas.drawBitmap(bitmap, mTempRect, mTempRect, mIconPaint);
-        });
-        return output;
+    private void showIfNecessary(TextView textView, @Nullable String string) {
+        if (string == null || string.isEmpty()) {
+            textView.setVisibility(GONE);
+        } else {
+            textView.setText(string);
+            textView.setVisibility(VISIBLE);
+        }
     }
 
+    private void launchIntent(Intent intent) {
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        getContext().startActivity(intent);
+    }
 
     @Override
-    public void applySearchTarget(SearchTargetLegacy searchTarget) {
-        mSearchTarget = searchTarget;
-        Bundle bundle = searchTarget.getExtras();
-        SearchEventTracker.INSTANCE.get(getContext()).registerWeakHandler(searchTarget, this);
-        if (bundle.getString("package", "").equals(mPackageName)) {
+    public void applySearchTarget(SearchTarget parentTarget, List<SearchTarget> children) {
+        if (parentTarget.getPackageName().equals(mPackageName)) {
             return;
         }
-        mIsInstantGame = bundle.getBoolean("instant_game", false);
-        mPackageName = bundle.getString("package");
-        mPreviewButton.setVisibility(mIsInstantGame ? VISIBLE : GONE);
-        mTitleView.setText(bundle.getString("title"));
-//        TODO: Should use a generic type to get values b/165320033
-        showIfNecessary(mDetailViews[0], bundle.getString("price"));
-        showIfNecessary(mDetailViews[1], bundle.getString("rating"));
+        mPackageName = parentTarget.getPackageName();
+        SearchAction action = parentTarget.getSearchAction();
+        mTitleView.setText(action.getTitle());
+        showIfNecessary(mDetailViews[0], action.getSubtitle().toString());
+        mIntent = action.getIntent();
 
         mIconView.setBackgroundResource(R.drawable.ic_deepshortcut_placeholder);
+        loadIcon(action.getIcon().getUri().toString());
+
+        mSecondaryIntent = children.size() == 1 ? children.get(0).getSearchAction().getIntent()
+                : null;
+        mPreviewButton.setVisibility(mSecondaryIntent == null ? GONE : VISIBLE);
+    }
+
+    private void loadIcon(String iconUrl) {
         UI_HELPER_EXECUTOR.execute(() -> {
             try {
-                URL url = new URL(bundle.getString("icon_url"));
+                URL url = new URL(iconUrl);
                 URLConnection con = url.openConnection();
-//                TODO: monitor memory and investigate if it's better to use glide
                 con.addRequestProperty("Cache-Control", "max-age: 0");
                 con.setUseCaches(true);
                 Bitmap bitmap = BitmapFactory.decodeStream(con.getInputStream());
@@ -161,43 +153,23 @@ public class SearchResultPlayItem extends LinearLayout implements
         });
     }
 
-    private void showIfNecessary(TextView textView, @Nullable String string) {
-        if (string == null || string.isEmpty()) {
-            textView.setVisibility(GONE);
-        } else {
-            textView.setText(string);
-            textView.setVisibility(VISIBLE);
-        }
-    }
+    private Bitmap getRoundedBitmap(Bitmap bitmap) {
+        final int iconSize = bitmap.getWidth();
+        final float radius = Themes.getDialogCornerRadius(getContext());
 
-    @Override
-    public void handleSelection(int eventType) {
-        if (mPackageName == null) return;
-        Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(
-                "https://play.google.com/store/apps/details?id="
-                        + mPackageName));
-        i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        getContext().startActivity(i);
-        logSearchEvent(eventType);
-    }
+        Bitmap output = BitmapRenderer.createHardwareBitmap(iconSize, iconSize, (canvas) -> {
+            mTempRect.set(0, 0, iconSize, iconSize);
+            final RectF rectF = new RectF(mTempRect);
 
-    private void launchInstantGame() {
-        if (!mIsInstantGame) return;
-        Intent intent = new Intent(Intent.ACTION_VIEW);
-        String referrer = "Pixel_Launcher";
-        String id = mPackageName;
-        String deepLinkUrl = "market://details?id=" + id + "&launch=true&referrer=" + referrer;
-        intent.setPackage("com.android.vending");
-        intent.setData(Uri.parse(deepLinkUrl));
-        intent.putExtra("overlay", true);
-        intent.putExtra("callerId", getContext().getPackageName());
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        getContext().startActivity(intent);
-        logSearchEvent(SearchTargetEventLegacy.CHILD_SELECT);
-    }
+            mIconPaint.setAntiAlias(true);
+            mIconPaint.reset();
+            canvas.drawARGB(0, 0, 0, 0);
+            mIconPaint.setColor(BITMAP_CROP_MASK_COLOR);
+            canvas.drawRoundRect(rectF, radius, radius, mIconPaint);
 
-    private void logSearchEvent(int eventType) {
-        SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(
-                new SearchTargetEventLegacy.Builder(mSearchTarget, eventType).build());
+            mIconPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
+            canvas.drawBitmap(bitmap, mTempRect, mTempRect, mIconPaint);
+        });
+        return output;
     }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultSettingsSlice.java b/quickstep/src/com/android/launcher3/search/SearchResultSettingsSlice.java
index 80ad305af8..bf50b67491 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultSettingsSlice.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultSettingsSlice.java
@@ -15,6 +15,7 @@
  */
 package com.android.launcher3.search;
 
+import android.app.search.SearchTarget;
 import android.content.Context;
 import android.net.Uri;
 import android.util.AttributeSet;
@@ -35,6 +36,8 @@ import com.android.launcher3.R;
 import com.android.systemui.plugins.shared.SearchTargetEventLegacy;
 import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
+import java.util.List;
+
 /**
  * A slice view wrapper with settings app icon at start
  */
@@ -88,6 +91,18 @@ public class SearchResultSettingsSlice extends LinearLayout implements
         }
     }
 
+    @Override
+    public void applySearchTarget(SearchTarget parentTarget, List<SearchTarget> children) {
+        reset();
+        try {
+            mSliceLiveData = mLauncher.getLiveSearchManager().getSliceForUri(
+                    parentTarget.getSliceUri());
+            mSliceLiveData.observe(mLauncher, mSliceView);
+        } catch (Exception ex) {
+            Log.e(TAG, "unable to bind slice", ex);
+        }
+    }
+
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
diff --git a/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java b/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java
index eb40938ecf..ccc38dbbbd 100644
--- a/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java
+++ b/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java
@@ -15,6 +15,7 @@
  */
 package com.android.launcher3.search;
 
+import android.app.search.SearchTarget;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.widget.TextView;
@@ -23,6 +24,8 @@ import androidx.annotation.Nullable;
 
 import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
+import java.util.List;
+
 /**
  * Header text view that shows a title for a given section in All apps search
  */
@@ -53,4 +56,10 @@ public class SearchSectionHeaderView extends TextView implements
             setVisibility(INVISIBLE);
         }
     }
+
+    @Override
+    public void applySearchTarget(SearchTarget parentTarget, List<SearchTarget> children) {
+        setText(parentTarget.getSearchAction().getTitle());
+        setVisibility(VISIBLE);
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java b/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java
new file mode 100644
index 0000000000..6585213b65
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.search;
+
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+
+import android.app.search.Query;
+import android.app.search.SearchContext;
+import android.app.search.SearchSession;
+import android.app.search.SearchTarget;
+import android.app.search.SearchUiManager;
+import android.content.Context;
+import android.os.CancellationSignal;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.app.search.ResultType;
+import com.android.launcher3.allapps.AllAppsGridAdapter;
+import com.android.launcher3.allapps.AllAppsSectionDecorator;
+import com.android.launcher3.allapps.search.SearchPipeline;
+import com.android.launcher3.allapps.search.SearchSectionInfo;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.function.Consumer;
+
+/**
+ * Search pipeline utilizing {@link android.app.search.SearchUiManager}
+ */
+public class SearchServicePipeline implements SearchPipeline {
+    private static final int SUPPORTED_RESULT_TYPES =
+            ResultType.APPLICATION | ResultType.SHORTCUT | ResultType.PLAY | ResultType.PEOPLE
+                    | ResultType.SETTING;
+    private static final int REQUEST_TIMEOUT = 200;
+    private static final String TAG = "SearchServicePipeline";
+
+
+    private final Context mContext;
+    private final SearchSession mSession;
+    private final DeviceSearchAdapterProvider mAdapterProvider;
+
+    private boolean mCanceled = false;
+
+
+    public SearchServicePipeline(Context context, DeviceSearchAdapterProvider adapterProvider) {
+        mContext = context;
+        mAdapterProvider = adapterProvider;
+        SearchUiManager manager = context.getSystemService(SearchUiManager.class);
+        mSession = manager.createSearchSession(
+                new SearchContext(SUPPORTED_RESULT_TYPES, REQUEST_TIMEOUT, null));
+    }
+
+    @Override
+    public void query(String input, Consumer<ArrayList<AllAppsGridAdapter.AdapterItem>> callback,
+            CancellationSignal cancellationSignal) {
+        mCanceled = false;
+        Query query = new Query(input, System.currentTimeMillis(), null);
+        mSession.query(query, UI_HELPER_EXECUTOR, items -> {
+            if (!mCanceled) {
+                callback.accept(this.onResult(items));
+            }
+            Log.w(TAG, "Ignoring results due to cancel signal");
+        });
+    }
+
+    /**
+     * Given A list of search Targets, pairs a group of search targets to a AdapterItem that can
+     * be inflated in AllAppsRecyclerView
+     */
+    private ArrayList<AllAppsGridAdapter.AdapterItem> onResult(List<SearchTarget> searchTargets) {
+        HashMap<String, SearchAdapterItem> adapterMap = new LinkedHashMap<>();
+        List<SearchTarget> unmappedChildren = new ArrayList<>();
+        SearchSectionInfo section = new SearchSectionInfo();
+        section.setDecorationHandler(
+                new AllAppsSectionDecorator.SectionDecorationHandler(mContext, true));
+        for (SearchTarget target : searchTargets) {
+            if (!TextUtils.isEmpty(target.getParentId())) {
+                if (!addChildToParent(target, adapterMap)) {
+                    unmappedChildren.add(target);
+                }
+                continue;
+            }
+            int viewType = mAdapterProvider.getViewTypeForSearchTarget(target);
+            if (viewType != -1) {
+                SearchAdapterItem adapterItem = new SearchAdapterItem(target, viewType);
+                adapterItem.searchSectionInfo = section;
+                adapterMap.put(target.getId(), adapterItem);
+            }
+        }
+        for (SearchTarget s : unmappedChildren) {
+            if (!addChildToParent(s, adapterMap)) {
+                Log.w(TAG,
+                        "Unable to pair child " + s.getId() + " to parent " + s.getParentId());
+            }
+        }
+        return new ArrayList<>(adapterMap.values());
+    }
+
+    /**
+     * Adds a child SearchTarget to a collection of searchTarget children with a shared parentId.
+     * Returns false if no parent searchTarget with id=$parentId does not exists.
+     */
+    private boolean addChildToParent(SearchTarget target, HashMap<String, SearchAdapterItem> map) {
+        if (!map.containsKey(target.getParentId())) return false;
+        map.get(target.getParentId()).getInlineItems().add(target);
+        return true;
+    }
+
+    /**
+     * Unregister callbacks and destroy search session
+     */
+    public void destroy() {
+        mSession.destroy();
+    }
+
+    /**
+     * Cancels current ongoing search request.
+     */
+    public void cancel() {
+        mCanceled = true;
+    }
+}
diff --git a/quickstep/src/com/android/launcher3/search/SearchSettingsRowView.java b/quickstep/src/com/android/launcher3/search/SearchSettingsRowView.java
index 8306e3b555..6fc0046b12 100644
--- a/quickstep/src/com/android/launcher3/search/SearchSettingsRowView.java
+++ b/quickstep/src/com/android/launcher3/search/SearchSettingsRowView.java
@@ -19,6 +19,8 @@ import static com.android.launcher3.FastBitmapDrawable.newIcon;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
+import android.app.search.SearchAction;
+import android.app.search.SearchTarget;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -97,6 +99,14 @@ public class SearchSettingsRowView extends LinearLayout implements
         SearchEventTracker.INSTANCE.get(getContext()).registerWeakHandler(searchTarget, this);
     }
 
+    @Override
+    public void applySearchTarget(SearchTarget parentTarget, List<SearchTarget> children) {
+        SearchAction action = parentTarget.getSearchAction();
+        mIconView.setContentDescription(action.getTitle());
+        showIfAvailable(mTitleView, action.getTitle().toString());
+        showIfAvailable(mBreadcrumbsView, action.getSubtitle().toString());
+    }
+
     private void showIfAvailable(TextView view, @Nullable String string) {
         if (TextUtils.isEmpty(string)) {
             view.setVisibility(GONE);
diff --git a/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java b/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java
index 9ff057f0bf..e72578dcd3 100644
--- a/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java
+++ b/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java
@@ -20,6 +20,8 @@ import android.app.search.SearchTarget;
 
 import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
+import java.util.List;
+
 /**
  * An interface for supporting dynamic search results
  */
@@ -28,13 +30,14 @@ public interface SearchTargetHandler {
     /**
      * Update view using values from {@link SearchTargetLegacy}
      */
-    void applySearchTarget(SearchTargetLegacy searchTarget);
+    default void applySearchTarget(SearchTargetLegacy searchTarget) {
+    }
+
 
     /**
      * Update view using values from {@link SearchTargetLegacy}
      */
-    default void applySearchTarget(SearchTarget searchTarget){
-
+    default void applySearchTarget(SearchTarget parentTarget, List<SearchTarget> children) {
     }
 
     /**
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 3be1ced810..4f62d2face 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -220,6 +220,7 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
     @Override
     public void onDestroy() {
         super.onDestroy();
+        getAppsView().getSearchUiManager().destroy();
         if (mHotseatPredictionController != null) {
             mHotseatPredictionController.destroy();
             mHotseatPredictionController = null;
diff --git a/src/com/android/launcher3/allapps/SearchUiManager.java b/src/com/android/launcher3/allapps/SearchUiManager.java
index aa056a01f4..f9260868f5 100644
--- a/src/com/android/launcher3/allapps/SearchUiManager.java
+++ b/src/com/android/launcher3/allapps/SearchUiManager.java
@@ -58,6 +58,11 @@ public interface SearchUiManager {
     void setContentVisibility(int visibleElements, PropertySetter setter,
             Interpolator interpolator);
 
+    /**
+     * Called when activity is destroyed. Used to close search system services
+     */
+    default void destroy(){}
+
     /**
      * Returns true if the QSB should be visible for the given set of visible elements
      */
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 2455706d7d..81174d814d 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -98,9 +98,8 @@ public final class FeatureFlags {
     public static final BooleanFlag ENABLE_DEVICE_SEARCH = getDebugFlag(
             "ENABLE_DEVICE_SEARCH", false, "Allows on device search in all apps");
 
-    public static final BooleanFlag SEARCH_TARGET_LEGACY = getDebugFlag(
-            "SEARCH_TARGET_LEGACY", true,
-            "Use SearchTarget provided by plugin lib (only during migration)");
+    public static final BooleanFlag USE_SEARCH_API = getDebugFlag(
+            "USE_SEARCH_API", true, "Use SearchUIManager api for device search");
 
     public static final BooleanFlag DISABLE_INITIAL_IME_IN_ALLAPPS = getDebugFlag(
             "DISABLE_INITIAL_IME_IN_ALLAPPS", false, "Disable default IME state in all apps");
-- 
GitLab


From 203f5968812ed1ea3ddd066130eba57d77a9700b Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 19 Jan 2021 12:33:05 -0800
Subject: [PATCH 0411/1664] Fixing unrelated icons getting removed during
 sesison failure

Bug: 177642572
Test: Verified on device
Change-Id: Ia17f7f151b503f95c643c690f2fc11d624911f3e
---
 src/com/android/launcher3/model/AllAppsList.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/model/AllAppsList.java b/src/com/android/launcher3/model/AllAppsList.java
index c57c3e495a..d4fa2789d5 100644
--- a/src/com/android/launcher3/model/AllAppsList.java
+++ b/src/com/android/launcher3/model/AllAppsList.java
@@ -26,7 +26,6 @@ import android.content.pm.ApplicationInfo;
 import android.content.pm.LauncherActivityInfo;
 import android.content.pm.LauncherApps;
 import android.os.LocaleList;
-import android.os.Process;
 import android.os.UserHandle;
 import android.util.Log;
 
@@ -162,7 +161,7 @@ public class AllAppsList {
     /** Updates the given PackageInstallInfo's associated AppInfo's installation info. */
     public List<AppInfo> updatePromiseInstallInfo(PackageInstallInfo installInfo) {
         List<AppInfo> updatedAppInfos = new ArrayList<>();
-        UserHandle user = Process.myUserHandle();
+        UserHandle user = installInfo.user;
         for (int i = data.size() - 1; i >= 0; i--) {
             final AppInfo appInfo = data.get(i);
             final ComponentName tgtComp = appInfo.getTargetComponent();
@@ -177,7 +176,8 @@ public class AllAppsList {
                     appInfo.setProgressLevel(installInfo);
 
                     updatedAppInfos.add(appInfo);
-                } else if (installInfo.state == PackageInstallInfo.STATUS_FAILED) {
+                } else if (installInfo.state == PackageInstallInfo.STATUS_FAILED
+                        && !appInfo.isAppStartable()) {
                     removeApp(i);
                 }
             }
-- 
GitLab


From 952471f675e99484294e673003b103104e273aab Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Tue, 19 Jan 2021 15:06:56 -0800
Subject: [PATCH 0412/1664] Removing automatic failure investigator

It wasn't updated for a while,
creates a false impression that the failure
is already tracked, and hopefully soon
will be replaced by new clustering.

Test: presubmit
Bug: 161478674
Change-Id: Icc3716c1f534867d5e4b21d18c9cede273da8704
---
 .../quickstep/FallbackRecentsTest.java        |   4 +-
 .../launcher3/ui/AbstractLauncherUiTest.java  |   6 +-
 .../util/rule/FailureInvestigator.java        | 121 ------------------
 .../util/rule/FailureRewriterRule.java        |  47 -------
 4 files changed, 3 insertions(+), 175 deletions(-)
 delete mode 100644 tests/src/com/android/launcher3/util/rule/FailureInvestigator.java
 delete mode 100644 tests/src/com/android/launcher3/util/rule/FailureRewriterRule.java

diff --git a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
index b9e0f628ab..2960b36b4b 100644
--- a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
+++ b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
@@ -55,7 +55,6 @@ import com.android.launcher3.tapl.OverviewTask;
 import com.android.launcher3.tapl.TestHelpers;
 import com.android.launcher3.testcomponent.TestCommandReceiver;
 import com.android.launcher3.util.Wait;
-import com.android.launcher3.util.rule.FailureRewriterRule;
 import com.android.launcher3.util.rule.FailureWatcher;
 import com.android.quickstep.views.RecentsView;
 
@@ -100,8 +99,7 @@ public class FallbackRecentsTest {
         }
 
         mOrderSensitiveRules = RuleChain
-                .outerRule(new FailureRewriterRule())
-                .around(new NavigationModeSwitchRule(mLauncher))
+                .outerRule(new NavigationModeSwitchRule(mLauncher))
                 .around(new FailureWatcher(mDevice));
 
         mOtherLauncherActivity = context.getPackageManager().queryIntentActivities(
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index 37dd4d27c0..fc567ac080 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -63,7 +63,6 @@ import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.LooperExecutor;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.launcher3.util.Wait;
-import com.android.launcher3.util.rule.FailureRewriterRule;
 import com.android.launcher3.util.rule.FailureWatcher;
 import com.android.launcher3.util.rule.LauncherActivityRule;
 import com.android.launcher3.util.rule.ShellCommandRule;
@@ -224,9 +223,8 @@ public abstract class AbstractLauncherUiTest {
     }
 
     @Rule
-    public TestRule mOrderSensitiveRules = RuleChain.
-            outerRule(new FailureRewriterRule())
-            .around(new TestStabilityRule())
+    public TestRule mOrderSensitiveRules = RuleChain
+            .outerRule(new TestStabilityRule())
             .around(mActivityMonitor)
             .around(getRulesInsideActivityMonitor());
 
diff --git a/tests/src/com/android/launcher3/util/rule/FailureInvestigator.java b/tests/src/com/android/launcher3/util/rule/FailureInvestigator.java
deleted file mode 100644
index 77546de3cc..0000000000
--- a/tests/src/com/android/launcher3/util/rule/FailureInvestigator.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.util.rule;
-
-import static androidx.test.InstrumentationRegistry.getInstrumentation;
-
-import android.os.SystemClock;
-
-import androidx.test.uiautomator.UiDevice;
-
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.regex.Pattern;
-
-class FailureInvestigator {
-    private static boolean matches(String regex, CharSequence string) {
-        return Pattern.compile(regex).matcher(string).find();
-    }
-
-    static class LogcatMatch {
-        String logcatPattern;
-        int bug;
-
-        LogcatMatch(String logcatPattern, int bug) {
-            this.logcatPattern = logcatPattern;
-            this.bug = bug;
-        }
-    }
-
-    static class ExceptionMatch {
-        String exceptionPattern;
-        LogcatMatch[] logcatMatches;
-
-        ExceptionMatch(String exceptionPattern, LogcatMatch[] logcatMatches) {
-            this.exceptionPattern = exceptionPattern;
-            this.logcatMatches = logcatMatches;
-        }
-    }
-
-    private static final ExceptionMatch[] EXCEPTION_MATCHES = {
-            new ExceptionMatch(
-                    "java.lang.AssertionError: http://go/tapl : Tests are broken by a "
-                            + "non-Launcher system error: (Phone is locked|Screen is empty)",
-                    new LogcatMatch[]{
-                            new LogcatMatch(
-                                    "BroadcastQueue: Can't deliver broadcast to com.android"
-                                            + ".systemui.*Crashing it",
-                                    147845913),
-                            new LogcatMatch(
-                                    "Attempt to invoke virtual method 'boolean android\\"
-                                            + ".graphics\\.Bitmap\\.isRecycled\\(\\)' on a null "
-                                            + "object reference",
-                                    148424291),
-                            new LogcatMatch(
-                                    "java\\.lang\\.IllegalArgumentException\\: Ranking map "
-                                            + "doesn't contain key",
-                                    148570537),
-                    }),
-            new ExceptionMatch("Launcher didn't initialize",
-                    new LogcatMatch[]{
-                            new LogcatMatch(
-                                    "ActivityManager: Reason: executing service com.google"
-                                            + ".android.apps.nexuslauncher/com.android.launcher3"
-                                            + ".notification.NotificationListener",
-                                    148238677),
-                    }),
-    };
-
-    static int getBugForFailure(CharSequence exception) {
-        if ("com.google.android.setupwizard".equals(
-                UiDevice.getInstance(getInstrumentation()).getLauncherPackageName())) {
-            return 145935261;
-        }
-
-        final String logSinceBoot;
-        try {
-            final String systemBootTime =
-                    new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS").format(
-                            new Date(System.currentTimeMillis() - SystemClock.elapsedRealtime()));
-
-            logSinceBoot =
-                    UiDevice.getInstance(getInstrumentation())
-                            .executeShellCommand("logcat -d -t " + systemBootTime.replace(" ", ""));
-        } catch (IOException | OutOfMemoryError e) {
-            return 0;
-        }
-
-        if (matches("android\\:\\:uirenderer\\:\\:renderthread\\:\\:EglManager\\:\\:swapBuffers",
-                logSinceBoot)) {
-            return 148529608;
-        }
-
-        for (ExceptionMatch exceptionMatch : EXCEPTION_MATCHES) {
-            if (matches(exceptionMatch.exceptionPattern, exception)) {
-                for (LogcatMatch logcatMatch : exceptionMatch.logcatMatches) {
-                    if (matches(logcatMatch.logcatPattern, logSinceBoot)) {
-                        return logcatMatch.bug;
-                    }
-                }
-                break;
-            }
-        }
-
-        return 0;
-    }
-}
diff --git a/tests/src/com/android/launcher3/util/rule/FailureRewriterRule.java b/tests/src/com/android/launcher3/util/rule/FailureRewriterRule.java
deleted file mode 100644
index 99ddee419b..0000000000
--- a/tests/src/com/android/launcher3/util/rule/FailureRewriterRule.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.util.rule;
-
-import android.util.Log;
-
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
-
-public class FailureRewriterRule implements TestRule {
-    private static final String TAG = "FailureRewriter";
-
-    @Override
-    public Statement apply(Statement base, Description description) {
-        return new Statement() {
-            @Override
-            public void evaluate() throws Throwable {
-                try {
-                    base.evaluate();
-                } catch (Throwable e) {
-                    final int bug = FailureInvestigator.getBugForFailure(e.toString());
-                    if (bug == 0) throw e;
-
-                    Log.e(TAG, "Known bug found for the original failure "
-                            + android.util.Log.getStackTraceString(e));
-                    throw new AssertionError(
-                            "Detected a failure that matches a known bug b/" + bug);
-                }
-            }
-        };
-    }
-}
-- 
GitLab


From 9918e94c036550efd17dff63689b932ed9001645 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Wed, 20 Jan 2021 00:42:03 +0000
Subject: [PATCH 0413/1664] Revert "Revert "Add UI updates for incremental app
 installs.""

This reverts commit 6e60380abb66c904ac4a291a64ab6224acd8be40.

Reason for revert: revert was unnecesary

Change-Id: I021769e929d3026b23c5f644e2ee629cec21a301
---
 src/com/android/launcher3/model/AllAppsList.java         | 9 +++++++--
 src/com/android/launcher3/model/PackageUpdatedTask.java  | 2 ++
 src/com/android/launcher3/model/data/AppInfo.java        | 3 +--
 .../android/launcher3/model/data/ItemInfoWithIcon.java   | 6 ++++--
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/com/android/launcher3/model/AllAppsList.java b/src/com/android/launcher3/model/AllAppsList.java
index 8d5cf7422f..c57c3e495a 100644
--- a/src/com/android/launcher3/model/AllAppsList.java
+++ b/src/com/android/launcher3/model/AllAppsList.java
@@ -26,6 +26,7 @@ import android.content.pm.ApplicationInfo;
 import android.content.pm.LauncherActivityInfo;
 import android.content.pm.LauncherApps;
 import android.os.LocaleList;
+import android.os.Process;
 import android.os.UserHandle;
 import android.util.Log;
 
@@ -161,14 +162,18 @@ public class AllAppsList {
     /** Updates the given PackageInstallInfo's associated AppInfo's installation info. */
     public List<AppInfo> updatePromiseInstallInfo(PackageInstallInfo installInfo) {
         List<AppInfo> updatedAppInfos = new ArrayList<>();
-        UserHandle user = installInfo.user;
+        UserHandle user = Process.myUserHandle();
         for (int i = data.size() - 1; i >= 0; i--) {
             final AppInfo appInfo = data.get(i);
             final ComponentName tgtComp = appInfo.getTargetComponent();
             if (tgtComp != null && tgtComp.getPackageName().equals(installInfo.packageName)
                     && appInfo.user.equals(user)) {
                 if (installInfo.state == PackageInstallInfo.STATUS_INSTALLED_DOWNLOADING
-                            || installInfo.state == PackageInstallInfo.STATUS_INSTALLING) {
+                        || installInfo.state == PackageInstallInfo.STATUS_INSTALLING) {
+                    if (appInfo.isAppStartable()
+                            && installInfo.state == PackageInstallInfo.STATUS_INSTALLING) {
+                        continue;
+                    }
                     appInfo.setProgressLevel(installInfo);
 
                     updatedAppInfos.add(appInfo);
diff --git a/src/com/android/launcher3/model/PackageUpdatedTask.java b/src/com/android/launcher3/model/PackageUpdatedTask.java
index 896bfb666e..3275d59488 100644
--- a/src/com/android/launcher3/model/PackageUpdatedTask.java
+++ b/src/com/android/launcher3/model/PackageUpdatedTask.java
@@ -38,6 +38,7 @@ import com.android.launcher3.logging.FileLog;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.launcher3.pm.PackageInstallInfo;
 import com.android.launcher3.pm.UserCache;
 import com.android.launcher3.shortcuts.ShortcutRequest;
 import com.android.launcher3.util.FlagOp;
@@ -246,6 +247,7 @@ public class PackageUpdatedTask extends BaseModelUpdateTask {
 
                         if (isNewApkAvailable
                                 && si.itemType == Favorites.ITEM_TYPE_APPLICATION) {
+                            si.setProgressLevel(100, PackageInstallInfo.STATUS_INSTALLED);
                             iconCache.getTitleAndIcon(si, si.usingLowResIcon());
                             infoUpdated = true;
                         }
diff --git a/src/com/android/launcher3/model/data/AppInfo.java b/src/com/android/launcher3/model/data/AppInfo.java
index 39247c221f..dde0cf4674 100644
--- a/src/com/android/launcher3/model/data/AppInfo.java
+++ b/src/com/android/launcher3/model/data/AppInfo.java
@@ -94,8 +94,6 @@ public class AppInfo extends ItemInfoWithIcon {
         componentName = info.componentName;
         title = Utilities.trim(info.title);
         intent = new Intent(info.intent);
-        user = info.user;
-        runtimeStatusFlags = info.runtimeStatusFlags;
     }
 
     @VisibleForTesting
@@ -114,6 +112,7 @@ public class AppInfo extends ItemInfoWithIcon {
             .setComponent(componentName)
             .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
                 | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
+        setProgressLevel(installInfo);
         user = installInfo.user;
     }
 
diff --git a/src/com/android/launcher3/model/data/ItemInfoWithIcon.java b/src/com/android/launcher3/model/data/ItemInfoWithIcon.java
index b8a71d33e0..d95e7080de 100644
--- a/src/com/android/launcher3/model/data/ItemInfoWithIcon.java
+++ b/src/com/android/launcher3/model/data/ItemInfoWithIcon.java
@@ -129,7 +129,9 @@ public abstract class ItemInfoWithIcon extends ItemInfo {
     protected ItemInfoWithIcon(ItemInfoWithIcon info) {
         super(info);
         bitmap = info.bitmap;
+        mProgressLevel = info.mProgressLevel;
         runtimeStatusFlags = info.runtimeStatusFlags;
+        user = info.user;
     }
 
     @Override
@@ -195,8 +197,8 @@ public abstract class ItemInfoWithIcon extends ItemInfo {
                     : runtimeStatusFlags & ~FLAG_INCREMENTAL_DOWNLOAD_ACTIVE;
         } else {
             mProgressLevel = status == PackageInstallInfo.STATUS_INSTALLED ? 100 : 0;
-            runtimeStatusFlags = runtimeStatusFlags & ~FLAG_INSTALL_SESSION_ACTIVE;
-            runtimeStatusFlags = runtimeStatusFlags & ~FLAG_INCREMENTAL_DOWNLOAD_ACTIVE;
+            runtimeStatusFlags &= ~FLAG_INSTALL_SESSION_ACTIVE;
+            runtimeStatusFlags &= ~FLAG_INCREMENTAL_DOWNLOAD_ACTIVE;
         }
     }
 
-- 
GitLab


From fa8731489cfae347d4f51bc35d857ecbb766fdad Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Tue, 19 Jan 2021 18:05:12 -0800
Subject: [PATCH 0414/1664] Checking mRecentsAnimationController for null-ness

Now that we screenshot asynchronously.

Test: presubmit
Bug: 175708969
Change-Id: I27661b7a889661c91e480edb7fb3d536e34d4c68
---
 quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 3d5b1c6b83..d648dd6400 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1395,6 +1395,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                 // Update the screenshot of the task
                 if (mTaskSnapshot == null) {
                     UI_HELPER_EXECUTOR.execute(() -> {
+                        if (mRecentsAnimationController == null) return;
                         final ThumbnailData taskSnapshot =
                                 mRecentsAnimationController.screenshotTask(runningTaskId);
                         MAIN_EXECUTOR.execute(() -> {
-- 
GitLab


From d772198157178b612b0f7a1083ed2cb8fc05782e Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Wed, 20 Jan 2021 11:25:29 -0500
Subject: [PATCH 0415/1664] Do not apply shadows to app window if target is
 transluscent.

Bug: 148938447
Test: Open disabled work profile app. Swipe away to close.
Change-Id: I54fabbe06615cf2f492c1a4aa68b597b5d132584
---
 .../QuickstepAppTransitionManagerImpl.java    | 32 +++++++++++--------
 .../quickstep/SwipeUpAnimationLogic.java      |  2 +-
 .../quickstep/util/TaskViewSimulator.java     |  2 +-
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
index 99c4dbaaad..23f2bf53c9 100644
--- a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
@@ -253,6 +253,18 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
             @NonNull RemoteAnimationTargetCompat[] appTargets,
             @NonNull RemoteAnimationTargetCompat[] wallpaperTargets, boolean launcherClosing);
 
+    private boolean areAllTargetsTranslucent(@NonNull RemoteAnimationTargetCompat[] targets) {
+        boolean isAllOpeningTargetTrs = true;
+        for (int i = 0; i < targets.length; i++) {
+            RemoteAnimationTargetCompat target = targets[i];
+            if (target.mode == MODE_OPENING) {
+                isAllOpeningTargetTrs &= target.isTranslucent;
+            }
+            if (!isAllOpeningTargetTrs) break;
+        }
+        return isAllOpeningTargetTrs;
+    }
+
     /**
      * Compose the animations for a launch from the app icon.
      *
@@ -270,16 +282,8 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
         mLauncher.getStateManager().setCurrentAnimation(anim);
 
         Rect windowTargetBounds = getWindowTargetBounds(appTargets);
-        boolean isAllOpeningTargetTrs = true;
-        for (int i = 0; i < appTargets.length; i++) {
-            RemoteAnimationTargetCompat target = appTargets[i];
-            if (target.mode == MODE_OPENING) {
-                isAllOpeningTargetTrs &= target.isTranslucent;
-            }
-            if (!isAllOpeningTargetTrs) break;
-        }
         anim.play(getOpeningWindowAnimators(v, appTargets, wallpaperTargets, windowTargetBounds,
-                !isAllOpeningTargetTrs));
+                areAllTargetsTranslucent(appTargets)));
         if (launcherClosing) {
             Pair<AnimatorSet, Runnable> launcherContentAnimator =
                     getLauncherContentAnimator(true /* isAppOpening */,
@@ -445,10 +449,10 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
     private Animator getOpeningWindowAnimators(View v,
             RemoteAnimationTargetCompat[] appTargets,
             RemoteAnimationTargetCompat[] wallpaperTargets,
-            Rect windowTargetBounds, boolean toggleVisibility) {
+            Rect windowTargetBounds, boolean appTargetsAreTranslucent) {
         RectF launcherIconBounds = new RectF();
         FloatingIconView floatingView = FloatingIconView.getFloatingIconView(mLauncher, v,
-                toggleVisibility, launcherIconBounds, true /* isOpening */);
+                !appTargetsAreTranslucent, launcherIconBounds, true /* isOpening */);
         Rect crop = new Rect();
         Matrix matrix = new Matrix();
 
@@ -495,6 +499,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                 : 0f;
         final float finalWindowRadius = mDeviceProfile.isMultiWindowMode
                 ? 0 : getWindowCornerRadius(mLauncher.getResources());
+        final float finalShadowRadius = appTargetsAreTranslucent ? 0 : mMaxShadowRadius;
 
         appAnimator.addUpdateListener(new MultiValueUpdateListener() {
             FloatProp mDx = new FloatProp(0, prop.dX, 0, prop.xDuration, AGGRESSIVE_EASE);
@@ -507,7 +512,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
 
             FloatProp mWindowRadius = new FloatProp(initialWindowRadius, finalWindowRadius, 0,
                     RADIUS_DURATION, EXAGGERATED_EASE);
-            FloatProp mShadowRadius = new FloatProp(0, mMaxShadowRadius, 0,
+            FloatProp mShadowRadius = new FloatProp(0, finalShadowRadius, 0,
                     APP_LAUNCH_DURATION, EXAGGERATED_EASE);
 
             FloatProp mCropRectCenterX = new FloatProp(prop.cropCenterXStart, prop.cropCenterXEnd,
@@ -727,12 +732,13 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
         int duration = CLOSING_TRANSITION_DURATION_MS;
         float windowCornerRadius = mDeviceProfile.isMultiWindowMode
                 ? 0 : getWindowCornerRadius(mLauncher.getResources());
+        float startShadowRadius = areAllTargetsTranslucent(appTargets) ? 0 : mMaxShadowRadius;
         closingAnimator.setDuration(duration);
         closingAnimator.addUpdateListener(new MultiValueUpdateListener() {
             FloatProp mDy = new FloatProp(0, mClosingWindowTransY, 0, duration, DEACCEL_1_7);
             FloatProp mScale = new FloatProp(1f, 1f, 0, duration, DEACCEL_1_7);
             FloatProp mAlpha = new FloatProp(1f, 0f, 25, 125, LINEAR);
-            FloatProp mShadowRadius = new FloatProp(mMaxShadowRadius, 0, 0, duration,
+            FloatProp mShadowRadius = new FloatProp(startShadowRadius, 0, 0, duration,
                     DEACCEL_1_7);
 
             @Override
diff --git a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
index c0087b0e5f..ca73041ca6 100644
--- a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
+++ b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
@@ -293,7 +293,7 @@ public abstract class SwipeUpAnimationLogic {
             builder.withMatrix(mMatrix)
                     .withWindowCrop(mCropRect)
                     .withCornerRadius(params.getCornerRadius())
-                    .withShadowRadius(params.getShadowRadius());
+                    .withShadowRadius(app.isTranslucent ? 0 : params.getShadowRadius());
         }
 
         @Override
diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index 5a7f541e5a..65bcf26305 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -325,7 +325,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
         builder.withMatrix(mMatrix)
                 .withWindowCrop(mTmpCropRect)
                 .withCornerRadius(getCurrentCornerRadius())
-                .withShadowRadius(params.getShadowRadius());
+                .withShadowRadius(app.isTranslucent ? 0 : params.getShadowRadius());
 
         if (ENABLE_QUICKSTEP_LIVE_TILE.get() && params.getRecentsSurface() != null) {
             // When relativeLayer = 0, it reverts the surfaces back to the original order.
-- 
GitLab


From df449d71e9ba93ec9e62705d17b6fa6a16462125 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Wed, 20 Jan 2021 14:59:38 +0000
Subject: [PATCH 0416/1664] Update RecentsActivityRotation when device rotate

- When rotating device, RecentsOrientedState.setRecentsRotation is called without updating mRecentsActivityRotation, leaving a stale orientation to be used by other components

Bug: 176913754
Change-Id: Ieb7b6cd31a6f77809ac6d222b8d0d68d6015ce01
---
 .../src/com/android/quickstep/util/RecentsOrientedState.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
index a89aaf4b3c..a3ee9122a7 100644
--- a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
+++ b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
@@ -198,7 +198,6 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
      */
     public boolean update(
             @SurfaceRotation int touchRotation, @SurfaceRotation int displayRotation) {
-        mRecentsActivityRotation = inferRecentsActivityRotation(displayRotation);
         mDisplayRotation = displayRotation;
         mTouchRotation = touchRotation;
         mPreviousRotation = touchRotation;
@@ -206,6 +205,7 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
     }
 
     private boolean updateHandler() {
+        mRecentsActivityRotation = inferRecentsActivityRotation(mDisplayRotation);
         if (mRecentsActivityRotation == mTouchRotation
                 || (canRecentsActivityRotate() && (mFlags & FLAG_SWIPE_UP_NOT_RUNNING) != 0)) {
             mOrientationHandler = PagedOrientationHandler.PORTRAIT;
-- 
GitLab


From e824438570b2ef69c555de101ad3d078e6634e95 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Wed, 20 Jan 2021 10:10:46 -0800
Subject: [PATCH 0417/1664] Add check to prevent adding duplicate pending
 install icons onto the worksapce.

Test: manual

Change-Id: Ifa1bbe39278a7a4f7a385204efcbb815c2a59ca3
---
 .../launcher3/model/ItemInstallQueue.java     | 33 +++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/model/ItemInstallQueue.java b/src/com/android/launcher3/model/ItemInstallQueue.java
index 5e48a0ff2e..d09bf81e17 100644
--- a/src/com/android/launcher3/model/ItemInstallQueue.java
+++ b/src/com/android/launcher3/model/ItemInstallQueue.java
@@ -104,8 +104,10 @@ public class ItemInstallQueue {
     @WorkerThread
     private void addToQueue(PendingInstallShortcutInfo info) {
         ensureQueueLoaded();
-        mItems.add(info);
-        mStorage.write(mContext, mItems);
+        if (!mItems.contains(info)) {
+            mItems.add(info);
+            mStorage.write(mContext, mItems);
+        }
     }
 
     @WorkerThread
@@ -303,6 +305,33 @@ public class ItemInstallQueue {
             }
             return null;
         }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (obj instanceof PendingInstallShortcutInfo) {
+                PendingInstallShortcutInfo other = (PendingInstallShortcutInfo) obj;
+
+                boolean userMatches = user.equals(other.user);
+                boolean itemTypeMatches = itemType == other.itemType;
+                boolean intentMatches = intent.toUri(0).equals(other.intent.toUri(0));
+                boolean shortcutInfoMatches = shortcutInfo == null
+                        ? other.shortcutInfo == null
+                        : other.shortcutInfo != null
+                            && shortcutInfo.getId().equals(other.shortcutInfo.getId())
+                            && shortcutInfo.getPackage().equals(other.shortcutInfo.getPackage());
+                boolean providerInfoMatches = providerInfo == null
+                        ? other.providerInfo == null
+                        : other.providerInfo != null
+                            && providerInfo.provider.equals(other.providerInfo.provider);
+
+                return userMatches
+                        && itemTypeMatches
+                        && intentMatches
+                        && shortcutInfoMatches
+                        && providerInfoMatches;
+            }
+            return false;
+        }
     }
 
     private static String getIntentPackage(Intent intent) {
-- 
GitLab


From 745272111c432a37283ef74ba900677ed7789ef9 Mon Sep 17 00:00:00 2001
From: Ashwini Oruganti <ashfall@google.com>
Date: Fri, 22 Jan 2021 22:17:21 +0000
Subject: [PATCH 0418/1664] Add FLAG_IMMUTABLE to PendingIntent

PIs need a mutability flag on creation. See go/immutable-pendingintents for more context.

Change-Id: I7ac6a76fd501f36adddfd5bf85f0216a37fa9637
Test: TH
---
 .../src/com/android/quickstep/TouchInteractionService.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 1f7cec5bd2..196cae754d 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -360,7 +360,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
                     getString(R.string.all_apps_label),
                     getString(R.string.all_apps_label),
                     PendingIntent.getActivity(this, SYSTEM_ACTION_ID_ALL_APPS, intent,
-                            PendingIntent.FLAG_UPDATE_CURRENT));
+                            PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE));
             am.registerSystemAction(allAppsAction, SYSTEM_ACTION_ID_ALL_APPS);
         } else {
             am.unregisterSystemAction(SYSTEM_ACTION_ID_ALL_APPS);
-- 
GitLab


From 8f09aa3438a5b5b8e1d14f88025215af748b4a91 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Fri, 22 Jan 2021 17:49:13 -0500
Subject: [PATCH 0419/1664] Fix IllegalArgumentException for Float.NaN in
 ClipIconView.

Bug: 173703326
Test: not able to repo bug but this prevents the code from
      executing in bad case
Change-Id: I3701c040e72e6ce37a624b10bb82b2200935e283
---
 src/com/android/launcher3/views/ClipIconView.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/com/android/launcher3/views/ClipIconView.java b/src/com/android/launcher3/views/ClipIconView.java
index fab0bd4a0a..4e82336b09 100644
--- a/src/com/android/launcher3/views/ClipIconView.java
+++ b/src/com/android/launcher3/views/ClipIconView.java
@@ -161,6 +161,11 @@ public class ClipIconView extends View implements ClipPathView {
         float scaleY = rect.height() / minSize;
         float scale = Math.max(1f, Math.min(scaleX, scaleY));
 
+        if (Float.isNaN(scale)) {
+            // Views are no longer laid out, do not update.
+            return;
+        }
+
         update(rect, progress, shapeProgressStart, cornerRadius, isOpening, scale,
                 minSize, lp, isVerticalBarLayout, dp);
 
-- 
GitLab


From f26e90aa3502dc677e88b8ab49d7066b1ce4cb59 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 22 Dec 2020 12:40:09 -0600
Subject: [PATCH 0420/1664] Add empty Taskbar views and initial
 TaskbarController

Guarded by a FeatureFlag.

Bug: 171917176
Change-Id: I7145c7ae68282bf53552502798fe758c8c0e285d
---
 quickstep/AndroidManifest.xml                 |   1 +
 quickstep/res/layout/taskbar.xml              |  29 +++++
 quickstep/res/values/colors.xml               |   3 +
 quickstep/res/values/dimens.xml               |   3 +
 .../launcher3/BaseQuickstepLauncher.java      |  38 +++++-
 .../taskbar/TaskbarContainerView.java         |  46 ++++++++
 .../launcher3/taskbar/TaskbarController.java  | 111 ++++++++++++++++++
 .../launcher3/taskbar/TaskbarView.java        |  46 ++++++++
 .../launcher3/config/FeatureFlags.java        |   3 +
 9 files changed, 279 insertions(+), 1 deletion(-)
 create mode 100644 quickstep/res/layout/taskbar.xml
 create mode 100644 quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
 create mode 100644 quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
 create mode 100644 quickstep/src/com/android/launcher3/taskbar/TaskbarView.java

diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml
index 8dab9150c4..d95cc01427 100644
--- a/quickstep/AndroidManifest.xml
+++ b/quickstep/AndroidManifest.xml
@@ -32,6 +32,7 @@
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
     <uses-permission android:name="${packageName}.permission.HOTSEAT_EDU" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
     <application android:backupAgent="com.android.launcher3.LauncherBackupAgent"
          android:fullBackupOnly="true"
diff --git a/quickstep/res/layout/taskbar.xml b/quickstep/res/layout/taskbar.xml
new file mode 100644
index 0000000000..5f1046df4e
--- /dev/null
+++ b/quickstep/res/layout/taskbar.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.launcher3.taskbar.TaskbarContainerView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/taskbar_container"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <com.android.launcher3.taskbar.TaskbarView
+        android:id="@+id/taskbar_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@color/taskbar_background"/>
+
+</com.android.launcher3.taskbar.TaskbarContainerView>
\ No newline at end of file
diff --git a/quickstep/res/values/colors.xml b/quickstep/res/values/colors.xml
index 449fe108ef..3bc8ddc0a8 100644
--- a/quickstep/res/values/colors.xml
+++ b/quickstep/res/values/colors.xml
@@ -24,4 +24,7 @@
     <color name="all_apps_label_text_dark">#61FFFFFF</color>
     <color name="all_apps_prediction_row_separator">#3c000000</color>
     <color name="all_apps_prediction_row_separator_dark">#3cffffff</color>
+
+    <!-- Taskbar -->
+    <color name="taskbar_background">#101010</color>
 </resources>
\ No newline at end of file
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 551f7b0eb1..4272f50b56 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -119,4 +119,7 @@
 
     <!-- Minimum distance to swipe to trigger accessibility gesture -->
     <dimen name="accessibility_gesture_min_swipe_distance">80dp</dimen>
+
+    <!-- Taskbar -->
+    <dimen name="taskbar_size">48dp</dimen>
 </resources>
diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 3643d6d7e3..2518f423ca 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -19,6 +19,7 @@ import static com.android.launcher3.AbstractFloatingView.TYPE_ALL;
 import static com.android.launcher3.AbstractFloatingView.TYPE_HIDE_BACK_BUTTON;
 import static com.android.launcher3.LauncherState.FLAG_HIDE_BACK_BUTTON;
 import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.util.DisplayController.DisplayHolder.CHANGE_SIZE;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY;
 
@@ -29,8 +30,11 @@ import android.content.Intent;
 import android.content.IntentSender;
 import android.os.Bundle;
 import android.os.CancellationSignal;
+import android.view.LayoutInflater;
 import android.view.View;
 
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.WellbeingModel;
 import com.android.launcher3.popup.SystemShortcut;
@@ -39,7 +43,10 @@ import com.android.launcher3.proxy.StartActivityParams;
 import com.android.launcher3.statehandlers.BackButtonAlphaHandler;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
+import com.android.launcher3.taskbar.TaskbarContainerView;
+import com.android.launcher3.taskbar.TaskbarController;
 import com.android.launcher3.uioverrides.RecentsViewStateController;
+import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.UiThreadHelper;
 import com.android.quickstep.RecentsModel;
 import com.android.quickstep.SysUINavigationMode;
@@ -53,7 +60,6 @@ import com.android.quickstep.views.OverviewActionsView;
 import com.android.quickstep.views.RecentsView;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
-import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
 import java.util.stream.Stream;
@@ -75,6 +81,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
 
     private OverviewActionsView mActionsView;
 
+    private @Nullable TaskbarController mTaskbarController;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -86,6 +94,11 @@ public abstract class BaseQuickstepLauncher extends Launcher
     @Override
     public void onDestroy() {
         SysUINavigationMode.INSTANCE.get(this).removeModeChangeListener(this);
+
+        if (mTaskbarController != null) {
+            mTaskbarController.cleanup();
+        }
+
         super.onDestroy();
     }
 
@@ -190,6 +203,29 @@ public abstract class BaseQuickstepLauncher extends Launcher
         mActionsView = findViewById(R.id.overview_actions_view);
         ((RecentsView) getOverviewPanel()).init(mActionsView);
         mActionsView.updateVerticalMargin(SysUINavigationMode.getMode(this));
+
+        addTaskbarIfNecessary();
+    }
+
+    @Override
+    public void onDisplayInfoChanged(DisplayController.Info info, int flags) {
+        super.onDisplayInfoChanged(info, flags);
+        if ((flags & CHANGE_SIZE) != 0) {
+            addTaskbarIfNecessary();
+        }
+    }
+
+    private void addTaskbarIfNecessary() {
+        if (mTaskbarController != null) {
+            mTaskbarController.cleanup();
+            mTaskbarController = null;
+        }
+        if (FeatureFlags.ENABLE_TASKBAR.get() && mDeviceProfile.isTablet) {
+            TaskbarContainerView taskbarContainer = (TaskbarContainerView) LayoutInflater.from(this)
+                    .inflate(R.layout.taskbar, null, false);
+            mTaskbarController = new TaskbarController(this, taskbarContainer);
+            mTaskbarController.init();
+        }
     }
 
     public <T extends OverviewActionsView> T getActionsView() {
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
new file mode 100644
index 0000000000..0093e66859
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.taskbar;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.FrameLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+/**
+ * Top-level ViewGroup that hosts the TaskbarView as well as Views created by it such as Folder.
+ */
+public class TaskbarContainerView extends FrameLayout {
+    public TaskbarContainerView(@NonNull Context context) {
+        this(context, null);
+    }
+
+    public TaskbarContainerView(@NonNull Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public TaskbarContainerView(@NonNull Context context, @Nullable AttributeSet attrs,
+            int defStyleAttr) {
+        this(context, attrs, defStyleAttr, 0);
+    }
+
+    public TaskbarContainerView(@NonNull Context context, @Nullable AttributeSet attrs,
+            int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+}
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
new file mode 100644
index 0000000000..7be1b9275a
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.taskbar;
+
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
+import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
+
+import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_BOTTOM_TAPPABLE_ELEMENT;
+import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_EXTRA_NAVIGATION_BAR;
+
+import android.graphics.PixelFormat;
+import android.graphics.Point;
+import android.view.Gravity;
+import android.view.WindowManager;
+
+import com.android.launcher3.BaseQuickstepLauncher;
+import com.android.launcher3.R;
+import com.android.systemui.shared.system.WindowManagerWrapper;
+
+/**
+ * Interfaces with Launcher/WindowManager/SystemUI to determine what to show in TaskbarView.
+ */
+public class TaskbarController {
+
+    private static final String WINDOW_TITLE = "Taskbar";
+
+    private final TaskbarContainerView mTaskbarContainerView;
+    private final TaskbarView mTaskbarView;
+    private final BaseQuickstepLauncher mLauncher;
+    private final WindowManager mWindowManager;
+    // Layout width and height of the Taskbar in the default state.
+    private final Point mTaskbarSize;
+
+    private WindowManager.LayoutParams mWindowLayoutParams;
+
+    public TaskbarController(BaseQuickstepLauncher launcher,
+            TaskbarContainerView taskbarContainerView) {
+        mLauncher = launcher;
+        mTaskbarContainerView = taskbarContainerView;
+        mTaskbarView = mTaskbarContainerView.findViewById(R.id.taskbar_view);
+        mWindowManager = mLauncher.getWindowManager();
+        mTaskbarSize = new Point(MATCH_PARENT,
+                mLauncher.getResources().getDimensionPixelSize(R.dimen.taskbar_size));
+    }
+
+    /**
+     * Initializes the Taskbar, including adding it to the screen.
+     */
+    public void init() {
+        addToWindowManager();
+    }
+
+    /**
+     * Removes the Taskbar from the screen, and removes any obsolete listeners etc.
+     */
+    public void cleanup() {
+        removeFromWindowManager();
+    }
+
+    private void removeFromWindowManager() {
+        if (mTaskbarContainerView.isAttachedToWindow()) {
+            mWindowManager.removeViewImmediate(mTaskbarContainerView);
+        }
+    }
+
+    private void addToWindowManager() {
+        removeFromWindowManager();
+
+        final int gravity = Gravity.BOTTOM;
+
+        mWindowLayoutParams = new WindowManager.LayoutParams(
+                mTaskbarSize.x,
+                mTaskbarSize.y,
+                TYPE_APPLICATION_OVERLAY,
+                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
+                PixelFormat.TRANSLUCENT);
+        mWindowLayoutParams.setTitle(WINDOW_TITLE);
+        mWindowLayoutParams.packageName = mLauncher.getPackageName();
+        mWindowLayoutParams.gravity = gravity;
+        mWindowLayoutParams.setFitInsetsTypes(0);
+        mWindowLayoutParams.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING;
+        mWindowLayoutParams.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
+
+        WindowManagerWrapper wmWrapper = WindowManagerWrapper.getInstance();
+        wmWrapper.setProvidesInsetsTypes(
+                mWindowLayoutParams,
+                new int[] { ITYPE_EXTRA_NAVIGATION_BAR, ITYPE_BOTTOM_TAPPABLE_ELEMENT }
+        );
+
+        TaskbarContainerView.LayoutParams taskbarLayoutParams =
+                new TaskbarContainerView.LayoutParams(mTaskbarSize.x, mTaskbarSize.y);
+        taskbarLayoutParams.gravity = gravity;
+        mTaskbarView.setLayoutParams(taskbarLayoutParams);
+
+        mWindowManager.addView(mTaskbarContainerView, mWindowLayoutParams);
+    }
+}
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
new file mode 100644
index 0000000000..5df8d5f9cc
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.taskbar;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.LinearLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+/**
+ * Hosts the Taskbar content such as Hotseat and Recent Apps. Drawn on top of other apps.
+ */
+public class TaskbarView extends LinearLayout {
+    public TaskbarView(@NonNull Context context) {
+        this(context, null);
+    }
+
+    public TaskbarView(@NonNull Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public TaskbarView(@NonNull Context context, @Nullable AttributeSet attrs,
+            int defStyleAttr) {
+        this(context, attrs, defStyleAttr, 0);
+    }
+
+    public TaskbarView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr,
+            int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+}
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 81174d814d..1c5c222084 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -214,6 +214,9 @@ public final class FeatureFlags {
             "ENABLE_APP_PREDICTIONS_WHILE_VISIBLE", true, "Allows app "
             + "predictions to be updated while they are visible to the user.");
 
+    public static final BooleanFlag ENABLE_TASKBAR = new DeviceFlag(
+            "ENABLE_TASKBAR", false, "Allows a system Taskbar to be shown on larger devices.");
+
     public static void initialize(Context context) {
         synchronized (sDebugFlags) {
             for (DebugFlag flag : sDebugFlags) {
-- 
GitLab


From c28201876503b53b8525abcc09723bf3add34f98 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Fri, 22 Jan 2021 11:47:25 -0600
Subject: [PATCH 0421/1664] Consolidate Search result UIs

- Allow SearchAction to be represented by SearchResultIcon and SearchResultIconRow
- Fix tap enter to launch regression
- Remove Plugin Pipeline

Bug: 177223401
Test: Manual
Change-Id: Id1d445f6af3f80f840d567165051188c78230ed0
---
 .../res/layout/search_result_icon_row.xml     |   7 +-
 .../res/layout/search_result_play_item.xml    |  79 --------
 .../res/layout/search_result_settings_row.xml |  60 ------
 quickstep/res/layout/search_result_slice.xml  |  16 +-
 .../search/DeviceSearchAdapterProvider.java   |  58 +++---
 .../launcher3/search/SearchAdapterItem.java   |  12 +-
 .../launcher3/search/SearchEventTracker.java  |  93 ----------
 .../launcher3/search/SearchResultIcon.java    | 169 +++++++----------
 .../launcher3/search/SearchResultIconRow.java | 170 ++++++-----------
 ...sSlice.java => SearchResultIconSlice.java} |  60 +++---
 .../search/SearchResultPeopleView.java        |  16 --
 .../search/SearchResultPlayItem.java          | 175 ------------------
 .../launcher3/search/SearchResultWidget.java  |  11 +-
 .../search/SearchResultWidgetPreview.java     |   9 -
 .../search/SearchSectionHeaderView.java       |  14 --
 .../search/SearchSettingsRowView.java         | 161 ----------------
 .../launcher3/search/SearchTargetHandler.java |   8 +-
 .../search/ThumbnailSearchResultView.java     |  73 +-------
 src/com/android/launcher3/BubbleTextView.java |  21 ++-
 .../allapps/AllAppsContainerView.java         |  11 +-
 .../search/AllAppsSearchBarController.java    |  17 +-
 .../search/DefaultSearchAdapterProvider.java  |   3 +-
 .../allapps/search/SearchAdapterProvider.java |   4 +-
 .../model/data/RemoteActionItemInfo.java      |  68 -------
 .../model/data/SearchActionItemInfo.java      | 112 +++++++++++
 .../launcher3/touch/ItemClickHandler.java     |  44 +++--
 26 files changed, 365 insertions(+), 1106 deletions(-)
 delete mode 100644 quickstep/res/layout/search_result_play_item.xml
 delete mode 100644 quickstep/res/layout/search_result_settings_row.xml
 delete mode 100644 quickstep/src/com/android/launcher3/search/SearchEventTracker.java
 rename quickstep/src/com/android/launcher3/search/{SearchResultSettingsSlice.java => SearchResultIconSlice.java} (69%)
 delete mode 100644 quickstep/src/com/android/launcher3/search/SearchResultPlayItem.java
 delete mode 100644 quickstep/src/com/android/launcher3/search/SearchSettingsRowView.java
 delete mode 100644 src/com/android/launcher3/model/data/RemoteActionItemInfo.java
 create mode 100644 src/com/android/launcher3/model/data/SearchActionItemInfo.java

diff --git a/quickstep/res/layout/search_result_icon_row.xml b/quickstep/res/layout/search_result_icon_row.xml
index 1393b87d58..2119fc3425 100644
--- a/quickstep/res/layout/search_result_icon_row.xml
+++ b/quickstep/res/layout/search_result_icon_row.xml
@@ -45,14 +45,14 @@
 
         <TextView
             android:layout_width="wrap_content"
-            android:id="@+id/desc"
+            android:id="@+id/subtitle"
             android:maxLines="1"
             android:textColor="?android:attr/textColorTertiary"
             android:textSize="@dimen/search_hero_subtitle_size"
             android:layout_height="wrap_content" />
     </LinearLayout>
 
-    <com.android.launcher3.BubbleTextView
+    <com.android.launcher3.search.SearchResultIcon
         android:id="@+id/shortcut_0"
         style="@style/BaseIcon"
         android:layout_width="@dimen/deep_shortcut_icon_size"
@@ -63,7 +63,7 @@
         launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size"
         launcher:layoutHorizontal="false" />
 
-    <com.android.launcher3.BubbleTextView
+    <com.android.launcher3.search.SearchResultIcon
         android:id="@+id/shortcut_1"
         style="@style/BaseIcon"
         android:layout_width="@dimen/deep_shortcut_icon_size"
@@ -72,5 +72,4 @@
         android:textSize="@dimen/search_hero_inline_button_size"
         launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size"
         launcher:layoutHorizontal="false" />
-
 </com.android.launcher3.search.SearchResultIconRow>
\ No newline at end of file
diff --git a/quickstep/res/layout/search_result_play_item.xml b/quickstep/res/layout/search_result_play_item.xml
deleted file mode 100644
index ecd67b104a..0000000000
--- a/quickstep/res/layout/search_result_play_item.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.launcher3.search.SearchResultPlayItem xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="4dp"
-    android:orientation="horizontal">
-    <View
-        android:id="@+id/icon"
-        android:layout_width="@dimen/deep_shortcut_icon_size"
-        android:layout_height="@dimen/deep_shortcut_icon_size"
-        android:layout_gravity="start|center_vertical"
-        android:background="@drawable/ic_deepshortcut_placeholder" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="start|center_vertical"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingTop="4dp"
-        android:paddingBottom="4dp"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp">
-
-        <TextView
-            android:id="@+id/title_view"
-            style="@style/TextHeadline"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxLines="1"
-            android:ellipsize="end"
-            android:textAlignment="viewStart"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textSize="16sp" />
-
-        <TextView
-            android:id="@+id/detail_0"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="?android:attr/textColorPrimary" />
-
-        <TextView
-            android:id="@+id/detail_1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="?android:attr/textColorPrimary"
-            android:visibility="gone" />
-
-        <TextView
-            android:id="@+id/detail_2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="?android:attr/textColorPrimary"
-            android:visibility="gone" />
-    </LinearLayout>
-    <Button
-        android:id="@+id/try_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="start|center_vertical"
-        android:text="@string/search_action_try_now">
-    </Button>
-
-
-</com.android.launcher3.search.SearchResultPlayItem>
diff --git a/quickstep/res/layout/search_result_settings_row.xml b/quickstep/res/layout/search_result_settings_row.xml
deleted file mode 100644
index 33c9592d1c..0000000000
--- a/quickstep/res/layout/search_result_settings_row.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.launcher3.search.SearchSettingsRowView xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/TextHeadline"
-    android:id="@+id/section_title"
-    android:background="?android:attr/selectableItemBackground"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:gravity="center_vertical"
-    android:padding="@dimen/dynamic_grid_cell_padding_x"
-    android:textColor="?android:attr/textColorPrimary">
-
-    <View
-        android:layout_width="@dimen/search_settings_icon_size"
-        android:src="@drawable/ic_setting"
-        android:id="@+id/icon"
-        android:layout_height="@dimen/search_settings_icon_size" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:orientation="vertical"
-        android:paddingRight="@dimen/dynamic_grid_cell_padding_x"
-        android:paddingLeft="@dimen/dynamic_grid_cell_padding_x"
-        android:layout_height="wrap_content"
-        android:layout_weight="1">
-
-
-        <TextView
-            android:id="@+id/title"
-            style="@style/TextTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/search_line_spacing"
-            android:maxLines="1"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textSize="@dimen/search_hero_title_size" />
-
-        <TextView
-            android:id="@+id/breadcrumbs"
-            style="@style/TextTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            android:textColor="?android:attr/textColorSecondary"
-            android:textSize="@dimen/search_hero_subtitle_size" />
-    </LinearLayout>
-</com.android.launcher3.search.SearchSettingsRowView>
\ No newline at end of file
diff --git a/quickstep/res/layout/search_result_slice.xml b/quickstep/res/layout/search_result_slice.xml
index f7dcfce0ee..4f884ff30c 100644
--- a/quickstep/res/layout/search_result_slice.xml
+++ b/quickstep/res/layout/search_result_slice.xml
@@ -12,21 +12,21 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher3.search.SearchResultSettingsSlice xmlns:android="http://schemas.android.com/apk/res/android"
-    android:paddingHorizontal="@dimen/dynamic_grid_cell_padding_x"
+<com.android.launcher3.search.SearchResultIconSlice xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto"
+    android:padding="@dimen/dynamic_grid_edge_margin"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <FrameLayout
         android:layout_width="wrap_content"
-        android:paddingTop="@dimen/search_settings_icon_vertical_offset"
         android:layout_height="wrap_content">
 
-        <View
-            android:layout_width="@dimen/search_settings_icon_size"
-            android:src="@drawable/ic_setting"
+        <com.android.launcher3.search.SearchResultIcon
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:id="@+id/icon"
-            android:layout_height="@dimen/search_settings_icon_size" />
+            launcher:iconDisplay="hero_app" />
     </FrameLayout>
 
     <androidx.slice.widget.SliceView
@@ -36,5 +36,5 @@
         android:layout_marginStart="@dimen/dynamic_grid_cell_padding_x"
         android:layout_width="0dp" />
 
-</com.android.launcher3.search.SearchResultSettingsSlice>
+</com.android.launcher3.search.SearchResultIconSlice>
 
diff --git a/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java b/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
index 3343cf5d69..834a624fef 100644
--- a/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
+++ b/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
@@ -21,17 +21,16 @@ import static com.android.launcher3.allapps.AllAppsGridAdapter.VIEW_TYPE_ICON;
 import android.app.search.SearchTarget;
 import android.util.SparseIntArray;
 import android.view.LayoutInflater;
+import android.view.View;
 import android.view.ViewGroup;
 
 import com.android.app.search.LayoutType;
-import com.android.app.search.ResultType;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.allapps.AllAppsGridAdapter;
 import com.android.launcher3.allapps.search.SearchAdapterProvider;
 import com.android.launcher3.config.FeatureFlags;
-import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
 /**
  * Provides views for on-device search results
@@ -39,14 +38,12 @@ import com.android.systemui.plugins.shared.SearchTargetLegacy;
 public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
 
     public static final int VIEW_TYPE_SEARCH_CORPUS_TITLE = 1 << 5;
-    public static final int VIEW_TYPE_SEARCH_ROW_WITH_BUTTON = 1 << 7;
-    public static final int VIEW_TYPE_SEARCH_ROW = 1 << 8;
-    public static final int VIEW_TYPE_SEARCH_SLICE = 1 << 9;
-    public static final int VIEW_TYPE_SEARCH_ICON_ROW = 1 << 10;
+    public static final int VIEW_TYPE_SEARCH_SLICE = 1 << 7;
+    public static final int VIEW_TYPE_SEARCH_ICON = (1 << 8) | VIEW_TYPE_ICON;
+    public static final int VIEW_TYPE_SEARCH_ICON_ROW = (1 << 9);
     public static final int VIEW_TYPE_SEARCH_PEOPLE = 1 << 11;
     public static final int VIEW_TYPE_SEARCH_THUMBNAIL = 1 << 12;
     public static final int VIEW_TYPE_SEARCH_SUGGEST = 1 << 13;
-    public static final int VIEW_TYPE_SEARCH_ICON = (1 << 14) | VIEW_TYPE_ICON;
     public static final int VIEW_TYPE_SEARCH_WIDGET_LIVE = 1 << 15;
     public static final int VIEW_TYPE_SEARCH_WIDGET_PREVIEW = 1 << 16;
 
@@ -58,13 +55,10 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
         super(launcher);
         mAppsView = appsView;
 
-        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_ICON, R.layout.search_result_icon);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_CORPUS_TITLE, R.layout.search_section_title);
-        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_ROW_WITH_BUTTON,
-                R.layout.search_result_play_item);
-        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_ROW, R.layout.search_result_settings_row);
-        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_SLICE, R.layout.search_result_slice);
+        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_ICON, R.layout.search_result_icon);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_ICON_ROW, R.layout.search_result_icon_row);
+        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_SLICE, R.layout.search_result_slice);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_PEOPLE, R.layout.search_result_people_item);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_THUMBNAIL, R.layout.search_result_thumbnail);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_SUGGEST, R.layout.search_result_suggest);
@@ -110,12 +104,9 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
 
 
     @Override
-    public boolean onAdapterItemSelected(AllAppsGridAdapter.AdapterItem focusedItem) {
-        if (focusedItem instanceof SearchTargetHandler) {
-            SearchTargetLegacy searchTarget = ((SearchAdapterItem) focusedItem)
-                    .getSearchTargetLegacy();
-            SearchEventTracker.INSTANCE.get(mLauncher).quickSelect(searchTarget);
-            return true;
+    public boolean onAdapterItemSelected(AllAppsGridAdapter.AdapterItem adapterItem, View view) {
+        if (view instanceof SearchTargetHandler) {
+            return ((SearchTargetHandler) view).quickSelect();
         }
         return false;
     }
@@ -125,25 +116,20 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
      * Returns -1 if viewType is not found
      */
     public int getViewTypeForSearchTarget(SearchTarget t) {
-        if (t.getLayoutType().equals(LayoutType.TEXT_HEADER)) {
-            return VIEW_TYPE_SEARCH_CORPUS_TITLE;
-        }
-        switch (t.getResultType()) {
-            case ResultType.APPLICATION:
-                if (t.getLayoutType().equals(LayoutType.ICON_SINGLE_VERTICAL_TEXT)) {
-                    return VIEW_TYPE_SEARCH_ICON;
-                }
-                break;
-            case ResultType.SETTING:
-                if (t.getLayoutType().equals(LayoutType.ICON_SLICE)) {
-                    return VIEW_TYPE_SEARCH_SLICE;
-                }
-                return VIEW_TYPE_SEARCH_ROW;
-            case ResultType.SHORTCUT:
+        switch (t.getLayoutType()) {
+            case LayoutType.TEXT_HEADER:
+                return VIEW_TYPE_SEARCH_CORPUS_TITLE;
+            case LayoutType.ICON_SINGLE_VERTICAL_TEXT:
+                return VIEW_TYPE_SEARCH_ICON;
+            case LayoutType.ICON_SLICE:
+                return VIEW_TYPE_SEARCH_SLICE;
+            case LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT_BUTTON:
+            case LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT:
+            case LayoutType.ICON_SINGLE_HORIZONTAL_TEXT:
                 return VIEW_TYPE_SEARCH_ICON_ROW;
-            case ResultType.PLAY:
-                return VIEW_TYPE_SEARCH_ROW_WITH_BUTTON;
+            default:
+                return -1;
+
         }
-        return -1;
     }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java b/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
index 65ac3f9ceb..01b1999807 100644
--- a/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
+++ b/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
@@ -19,8 +19,6 @@ package com.android.launcher3.search;
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_ICON;
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_ICON_ROW;
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_PEOPLE;
-import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_ROW;
-import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_ROW_WITH_BUTTON;
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_SLICE;
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_SUGGEST;
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_THUMBNAIL;
@@ -44,11 +42,11 @@ public class SearchAdapterItem extends AllAppsGridAdapter.AdapterItem {
     private List<SearchTarget> mInlineItems = new ArrayList<>();
 
 
-    private static final int AVAILABLE_FOR_ACCESSIBILITY = VIEW_TYPE_SEARCH_ROW_WITH_BUTTON
-            | VIEW_TYPE_SEARCH_SLICE | VIEW_TYPE_SEARCH_ROW | VIEW_TYPE_SEARCH_PEOPLE
-            | VIEW_TYPE_SEARCH_THUMBNAIL | VIEW_TYPE_SEARCH_ICON_ROW | VIEW_TYPE_SEARCH_ICON
-            | VIEW_TYPE_SEARCH_WIDGET_PREVIEW | VIEW_TYPE_SEARCH_WIDGET_LIVE
-            | VIEW_TYPE_SEARCH_SUGGEST;
+    private static final int AVAILABLE_FOR_ACCESSIBILITY =
+            VIEW_TYPE_SEARCH_SLICE | VIEW_TYPE_SEARCH_PEOPLE | VIEW_TYPE_SEARCH_THUMBNAIL
+                    | VIEW_TYPE_SEARCH_ICON_ROW | VIEW_TYPE_SEARCH_ICON
+                    | VIEW_TYPE_SEARCH_WIDGET_PREVIEW | VIEW_TYPE_SEARCH_WIDGET_LIVE
+                    | VIEW_TYPE_SEARCH_SUGGEST;
 
     public SearchAdapterItem(SearchTargetLegacy searchTargetLegacy, int type) {
         mSearchTargetLegacy = searchTargetLegacy;
diff --git a/quickstep/src/com/android/launcher3/search/SearchEventTracker.java b/quickstep/src/com/android/launcher3/search/SearchEventTracker.java
deleted file mode 100644
index 90fe661df4..0000000000
--- a/quickstep/src/com/android/launcher3/search/SearchEventTracker.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.search;
-
-import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
-
-import android.content.Context;
-
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.util.MainThreadInitializedObject;
-import com.android.systemui.plugins.AllAppsSearchPlugin;
-import com.android.systemui.plugins.shared.SearchTargetEventLegacy;
-import com.android.systemui.plugins.shared.SearchTargetLegacy;
-
-import java.util.WeakHashMap;
-
-/**
- * A singleton class to track and report search events to search provider
- */
-public class SearchEventTracker {
-    @Nullable
-    private AllAppsSearchPlugin mPlugin;
-    private final WeakHashMap<SearchTargetLegacy, SearchTargetHandler>
-            mCallbacks = new WeakHashMap<>();
-
-    public static final MainThreadInitializedObject<SearchEventTracker> INSTANCE =
-            new MainThreadInitializedObject<>(SearchEventTracker::new);
-
-    private SearchEventTracker(Context context) {
-    }
-
-    /**
-     * Returns instance of SearchEventTracker
-     */
-    public static SearchEventTracker getInstance(Context context) {
-        return SearchEventTracker.INSTANCE.get(context);
-    }
-
-    /**
-     * Sets current connected plugin for event reporting
-     */
-    public void setPlugin(@Nullable AllAppsSearchPlugin plugin) {
-        mPlugin = plugin;
-    }
-
-    /**
-     * Sends SearchTargetEvent to search provider
-     */
-    public void notifySearchTargetEvent(SearchTargetEventLegacy searchTargetEvent) {
-        if (mPlugin != null) {
-            UI_HELPER_EXECUTOR.post(() -> mPlugin.notifySearchTargetEventLegacy(searchTargetEvent));
-        }
-    }
-
-    /**
-     * Registers a {@link SearchTargetHandler} to handle quick launch for specified SearchTarget.
-     */
-    public void registerWeakHandler(SearchTargetLegacy searchTarget,
-            SearchTargetHandler targetHandler) {
-        mCallbacks.put(searchTarget, targetHandler);
-    }
-
-    /**
-     * Handles quick select for SearchTarget
-     */
-    public void quickSelect(SearchTargetLegacy searchTarget) {
-        SearchTargetHandler searchTargetHandler = mCallbacks.get(searchTarget);
-        if (searchTargetHandler != null) {
-            searchTargetHandler.handleSelection(SearchTargetEventLegacy.QUICK_SELECT);
-        }
-    }
-
-    /**
-     * flushes all registered quick select handlers
-     */
-    public void clearHandlers() {
-        mCallbacks.clear();
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
index d5fe0e8456..0b8d3cb88a 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
@@ -17,15 +17,16 @@ package com.android.launcher3.search;
 
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
-import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
-import android.app.RemoteAction;
+import android.app.search.SearchAction;
 import android.app.search.SearchTarget;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.ShortcutInfo;
 import android.graphics.drawable.Drawable;
+import android.graphics.drawable.Icon;
 import android.os.Build;
+import android.os.Bundle;
 import android.os.UserHandle;
 import android.util.AttributeSet;
 import android.view.View;
@@ -36,17 +37,14 @@ import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.allapps.AllAppsStore;
-import com.android.launcher3.config.FeatureFlags;
-import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
-import com.android.launcher3.model.data.RemoteActionItemInfo;
+import com.android.launcher3.model.data.PackageItemInfo;
+import com.android.launcher3.model.data.SearchActionItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.touch.ItemLongClickListener;
 import com.android.launcher3.util.ComponentKey;
-import com.android.systemui.plugins.shared.SearchTargetEventLegacy;
-import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
 import java.util.List;
 import java.util.function.Consumer;
@@ -58,22 +56,11 @@ public class SearchResultIcon extends BubbleTextView implements
         SearchTargetHandler, View.OnClickListener,
         View.OnLongClickListener {
 
-
-    public static final String TARGET_TYPE_APP = "app";
-    public static final String TARGET_TYPE_HERO_APP = "hero_app";
-    public static final String TARGET_TYPE_SHORTCUT = "shortcut";
-    public static final String TARGET_TYPE_REMOTE_ACTION = "remote_action";
-
-    public static final String REMOTE_ACTION_SHOULD_START = "should_start_for_result";
-    public static final String REMOTE_ACTION_TOKEN = "action_token";
-
-
-    private static final String[] LONG_PRESS_SUPPORTED_TYPES =
-            new String[]{TARGET_TYPE_APP, TARGET_TYPE_SHORTCUT, TARGET_TYPE_HERO_APP};
+    private static final String BUNDLE_EXTRA_SHOULD_START = "should_start";
+    private static final String BUNDLE_EXTRA_SHOULD_START_FOR_RESULT = "should_start_for_result";
 
     private final Launcher mLauncher;
 
-    private SearchTargetLegacy mSearchTarget;
     private Consumer<ItemInfoWithIcon> mOnItemInfoChanged;
 
     public SearchResultIcon(Context context) {
@@ -89,6 +76,8 @@ public class SearchResultIcon extends BubbleTextView implements
         mLauncher = Launcher.getLauncher(getContext());
     }
 
+    private boolean mLongPressSupported;
+
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
@@ -100,37 +89,6 @@ public class SearchResultIcon extends BubbleTextView implements
                 mLauncher.getDeviceProfile().allAppsCellHeightPx));
     }
 
-    /**
-     * Applies search target with a ItemInfoWithIcon consumer to be called after itemInfo is
-     * constructed
-     */
-    public void applySearchTarget(SearchTargetLegacy searchTarget, Consumer<ItemInfoWithIcon> cb) {
-        mOnItemInfoChanged = cb;
-        applySearchTarget(searchTarget);
-    }
-
-    @Override
-    public void applySearchTarget(SearchTargetLegacy searchTarget) {
-        mSearchTarget = searchTarget;
-        SearchEventTracker.getInstance(getContext()).registerWeakHandler(mSearchTarget, this);
-        setVisibility(VISIBLE);
-        switch (searchTarget.getItemType()) {
-            case TARGET_TYPE_APP:
-            case TARGET_TYPE_HERO_APP:
-                prepareUsingApp(searchTarget.getComponentName(), searchTarget.getUserHandle());
-                break;
-            case TARGET_TYPE_SHORTCUT:
-                prepareUsingShortcutInfo(searchTarget.getShortcutInfos().get(0));
-                break;
-            case TARGET_TYPE_REMOTE_ACTION:
-                prepareUsingRemoteAction(searchTarget.getRemoteAction(),
-                        searchTarget.getExtras().getString(REMOTE_ACTION_TOKEN),
-                        searchTarget.getExtras().getBoolean(REMOTE_ACTION_SHOULD_START),
-                        searchTarget.getItemType().equals(TARGET_TYPE_REMOTE_ACTION));
-                break;
-        }
-    }
-
     /**
      * Applies {@link SearchTarget} to view. registers a consumer after a corresponding
      * {@link ItemInfoWithIcon} is created
@@ -147,13 +105,61 @@ public class SearchResultIcon extends BubbleTextView implements
             case ResultType.APPLICATION:
                 prepareUsingApp(new ComponentName(parentTarget.getPackageName(),
                         parentTarget.getExtras().getString("class")), parentTarget.getUserHandle());
+                mLongPressSupported = true;
                 break;
             case ResultType.SHORTCUT:
                 prepareUsingShortcutInfo(parentTarget.getShortcutInfo());
+                mLongPressSupported = true;
+                break;
+            default:
+                prepareUsingSearchAction(parentTarget);
+                mLongPressSupported = false;
                 break;
         }
     }
 
+    private void prepareUsingSearchAction(SearchTarget searchTarget) {
+        SearchAction searchAction = searchTarget.getSearchAction();
+        Bundle extras = searchAction.getExtras();
+        SearchActionItemInfo itemInfo = new SearchActionItemInfo(searchAction.getIcon(),
+                searchTarget.getPackageName(), searchTarget.getUserHandle(),
+                searchAction.getTitle());
+        itemInfo.setIntent(searchAction.getIntent());
+        itemInfo.setPendingIntent(searchAction.getPendingIntent());
+
+        //TODO: remove this after flags are introduced in SearchAction. Settings results require
+        // startActivityForResult
+        boolean isSettingsResult = searchTarget.getResultType() == ResultType.SETTING;
+        if ((extras != null && extras.getBoolean(BUNDLE_EXTRA_SHOULD_START_FOR_RESULT))
+                || isSettingsResult) {
+            itemInfo.setFlags(SearchActionItemInfo.FLAG_SHOULD_START_FOR_RESULT);
+        } else if (extras != null && extras.getBoolean(BUNDLE_EXTRA_SHOULD_START)) {
+            itemInfo.setFlags(SearchActionItemInfo.FLAG_SHOULD_START);
+        }
+
+
+        notifyItemInfoChanged(itemInfo);
+        LauncherAppState appState = LauncherAppState.getInstance(mLauncher);
+        MODEL_EXECUTOR.post(() -> {
+            try (LauncherIcons li = LauncherIcons.obtain(getContext())) {
+                Icon icon = searchTarget.getSearchAction().getIcon();
+                Drawable d;
+                if (icon == null) {
+                    PackageItemInfo pkgInfo = new PackageItemInfo(searchTarget.getPackageName());
+                    pkgInfo.user = searchTarget.getUserHandle();
+                    appState.getIconCache().getTitleAndIconForApp(pkgInfo, false);
+                    itemInfo.bitmap = pkgInfo.bitmap;
+                } else {
+                    d = itemInfo.getIcon().loadDrawable(getContext());
+                    itemInfo.bitmap = li.createBadgedIconBitmap(d, itemInfo.user,
+                            Build.VERSION.SDK_INT);
+                }
+
+            }
+            MAIN_EXECUTOR.post(() -> applyFromSearchActionItemInfo(itemInfo));
+        });
+    }
+
     private void prepareUsingApp(ComponentName componentName, UserHandle userHandle) {
         AllAppsStore appsStore = mLauncher.getAppsView().getAppsStore();
         AppInfo appInfo = appsStore.getApp(new ComponentKey(componentName, userHandle));
@@ -177,69 +183,26 @@ public class SearchResultIcon extends BubbleTextView implements
         });
     }
 
-    private void prepareUsingRemoteAction(RemoteAction remoteAction, String token, boolean start,
-            boolean useIconToBadge) {
-        RemoteActionItemInfo itemInfo = new RemoteActionItemInfo(remoteAction, token, start);
-        notifyItemInfoChanged(itemInfo);
-        UI_HELPER_EXECUTOR.post(() -> {
-            // If the Drawable from the remote action is not AdaptiveBitmap, styling will not
-            // work.
-            try (LauncherIcons li = LauncherIcons.obtain(getContext())) {
-                Drawable d = itemInfo.getRemoteAction().getIcon().loadDrawable(getContext());
-                BitmapInfo bitmap = li.createBadgedIconBitmap(d, itemInfo.user,
-                        Build.VERSION.SDK_INT);
-
-                if (useIconToBadge) {
-                    BitmapInfo placeholder = li.createIconBitmap(
-                            itemInfo.getRemoteAction().getTitle().toString().substring(0, 1),
-                            bitmap.color);
-                    itemInfo.bitmap = li.badgeBitmap(placeholder.icon, bitmap);
-                } else {
-                    itemInfo.bitmap = bitmap;
-                }
-            }
-            MAIN_EXECUTOR.post(() -> applyFromRemoteActionInfo(itemInfo));
-        });
-    }
-
     @Override
-    public void handleSelection(int eventType) {
-        mLauncher.getItemOnClickListener().onClick(this);
-        if (!FeatureFlags.USE_SEARCH_API.get()) {
-            reportEvent(eventType);
-        }
-    }
-
-    private void reportEvent(int eventType) {
-        SearchTargetEventLegacy.Builder b = new SearchTargetEventLegacy.Builder(mSearchTarget,
-                eventType);
-        if (mSearchTarget.getItemType().equals(TARGET_TYPE_SHORTCUT)) {
-            b.setShortcutPosition(0);
-        }
-        SearchEventTracker.INSTANCE.get(mLauncher).notifySearchTargetEvent(b.build());
-
+    public boolean quickSelect() {
+        //TODO: event reporting
+        this.performClick();
+        return true;
     }
 
     @Override
     public void onClick(View view) {
-        handleSelection(SearchTargetEventLegacy.SELECT);
+        //TODO: event reporting
+        mLauncher.getItemOnClickListener().onClick(this);
     }
 
     @Override
     public boolean onLongClick(View view) {
-        if (!supportsLongPress(mSearchTarget.getItemType())) {
+        //TODO: event reporting
+        if (!mLongPressSupported) {
             return false;
         }
-        reportEvent(SearchTargetEventLegacy.LONG_PRESS);
-        return ItemLongClickListener.INSTANCE_ALL_APPS.onLongClick(view);
-
-    }
-
-    private boolean supportsLongPress(String type) {
-        for (String t : LONG_PRESS_SUPPORTED_TYPES) {
-            if (t.equals(type)) return true;
-        }
-        return false;
+        return ItemLongClickListener.INSTANCE_ALL_APPS.onLongClick(this);
     }
 
     private void notifyItemInfoChanged(ItemInfoWithIcon itemInfoWithIcon) {
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java b/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
index 80d543a23c..4fb668e81d 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
@@ -19,56 +19,42 @@ import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
 import android.app.search.SearchTarget;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.ShortcutInfo;
-import android.os.UserHandle;
 import android.text.TextUtils;
 import android.util.AttributeSet;
-import android.util.Pair;
-import android.view.View;
-import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 
-import com.android.app.search.ResultType;
-import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.PackageItemInfo;
-import com.android.launcher3.model.data.WorkspaceItemInfo;
-import com.android.systemui.plugins.shared.SearchTargetEventLegacy;
-import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.function.Consumer;
 
 /**
  * A full width representation of {@link SearchResultIcon} with a secondary label and inline
- * shortcuts
+ * SearchTargets
  */
-public class SearchResultIconRow extends LinearLayout implements
-        SearchTargetHandler, View.OnClickListener,
-        View.OnLongClickListener, Consumer<ItemInfoWithIcon> {
-    public static final int MAX_SHORTCUTS_COUNT = 2;
+public class SearchResultIconRow extends LinearLayout implements SearchTargetHandler {
 
+    public static final int MAX_INLINE_ITEMS = 2;
 
-    private final Launcher mLauncher;
+    protected final Launcher mLauncher;
     private final LauncherAppState mLauncherAppState;
     private SearchResultIcon mResultIcon;
+
     private TextView mTitleView;
-    private TextView mDescriptionView;
-    private BubbleTextView[] mShortcutViews = new BubbleTextView[2];
+    private TextView mSubTitleView;
+    private final SearchResultIcon[] mInlineIcons = new SearchResultIcon[MAX_INLINE_ITEMS];
 
-    private SearchTargetLegacy mSearchTarget;
     private PackageItemInfo mProviderInfo;
 
-
     public SearchResultIconRow(Context context) {
         this(context, null, 0);
     }
@@ -84,129 +70,87 @@ public class SearchResultIconRow extends LinearLayout implements
         mLauncherAppState = LauncherAppState.getInstance(getContext());
     }
 
+    protected int getIconSize() {
+        return mLauncher.getDeviceProfile().allAppsIconSizePx;
+    }
+
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
-        int iconSize = mLauncher.getDeviceProfile().allAppsIconSizePx;
+
+        int iconSize = getIconSize();
 
         mResultIcon = findViewById(R.id.icon);
         mTitleView = findViewById(R.id.title);
-        mDescriptionView = findViewById(R.id.desc);
-        mShortcutViews[0] = findViewById(R.id.shortcut_0);
-        mShortcutViews[1] = findViewById(R.id.shortcut_1);
+        mSubTitleView = findViewById(R.id.subtitle);
+        mSubTitleView.setVisibility(GONE);
         mResultIcon.getLayoutParams().height = iconSize;
         mResultIcon.getLayoutParams().width = iconSize;
         mResultIcon.setTextVisibility(false);
-        for (BubbleTextView bubbleTextView : mShortcutViews) {
-            ViewGroup.LayoutParams lp = bubbleTextView.getLayoutParams();
-            lp.width = iconSize;
-            bubbleTextView.setOnClickListener(view -> {
-                WorkspaceItemInfo itemInfo = (WorkspaceItemInfo) bubbleTextView.getTag();
-                SearchTargetEventLegacy event = new SearchTargetEventLegacy.Builder(mSearchTarget,
-                        SearchTargetEventLegacy.CHILD_SELECT).setShortcutPosition(
-                        itemInfo.rank).build();
-                SearchEventTracker.getInstance(getContext()).notifySearchTargetEvent(event);
-                mLauncher.getItemOnClickListener().onClick(view);
-            });
-        }
-        setOnClickListener(this);
-        setOnLongClickListener(this);
-    }
 
-    @Override
-    public void applySearchTarget(SearchTarget parentTarget, List<SearchTarget> children) {
-        mResultIcon.applySearchTarget(parentTarget, children, this);
-        if (parentTarget.getResultType() == ResultType.SHORTCUT) {
-            ShortcutInfo shortcutInfo = parentTarget.getShortcutInfo();
-            setProviderDetails(new ComponentName(shortcutInfo.getPackage(), ""),
-                    shortcutInfo.getUserHandle());
+        mInlineIcons[0] = findViewById(R.id.shortcut_0);
+        mInlineIcons[1] = findViewById(R.id.shortcut_1);
+        for (SearchResultIcon inlineIcon : mInlineIcons) {
+            inlineIcon.getLayoutParams().width = getIconSize();
         }
+
+        setOnClickListener(mResultIcon);
+        setOnLongClickListener(mResultIcon);
     }
 
     @Override
-    public void applySearchTarget(SearchTargetLegacy searchTarget) {
-        mSearchTarget = searchTarget;
-        mResultIcon.applySearchTarget(searchTarget, this);
-        String itemType = searchTarget.getItemType();
-        boolean showDesc = itemType.equals(SearchResultIcon.TARGET_TYPE_SHORTCUT);
-        mDescriptionView.setVisibility(showDesc ? VISIBLE : GONE);
-
-        if (itemType.equals(SearchResultIcon.TARGET_TYPE_SHORTCUT)) {
-            ShortcutInfo shortcutInfo = searchTarget.getShortcutInfos().get(0);
-            setProviderDetails(new ComponentName(shortcutInfo.getPackage(), ""),
-                    shortcutInfo.getUserHandle());
-        } else if (itemType.equals(SearchResultIcon.TARGET_TYPE_HERO_APP)) {
-            showInlineShortcuts(mSearchTarget.getShortcutInfos());
-        } else if (itemType.equals(SearchResultIcon.TARGET_TYPE_REMOTE_ACTION)) {
-            CharSequence desc = mSearchTarget.getRemoteAction().getContentDescription();
-            if (!TextUtils.isEmpty(desc)) {
-                mDescriptionView.setVisibility(VISIBLE);
-                mDescriptionView.setText(desc);
-            }
-        }
-        if (!itemType.equals(SearchResultIcon.TARGET_TYPE_HERO_APP)) {
-            showInlineShortcuts(new ArrayList<>());
+    public void applySearchTarget(SearchTarget parentTarget, List<SearchTarget> children) {
+        mResultIcon.applySearchTarget(parentTarget, children, this::onItemInfoCreated);
+        if (parentTarget.getShortcutInfo() != null) {
+            updateWithShortcutInfo(parentTarget.getShortcutInfo());
+        } else if (parentTarget.getSearchAction() != null) {
+            showSubtitleIfNeeded(parentTarget.getSearchAction().getSubtitle());
         }
+        showInlineItems(children);
     }
 
     @Override
-    public void accept(ItemInfoWithIcon itemInfoWithIcon) {
-        mTitleView.setText(itemInfoWithIcon.title);
+    public boolean quickSelect() {
+        this.performClick();
+        return true;
     }
 
-    private void showInlineShortcuts(List<ShortcutInfo> infos) {
-        if (infos == null) return;
-        ArrayList<Pair<ShortcutInfo, ItemInfoWithIcon>> shortcuts = new ArrayList<>();
-        for (int i = 0; infos != null && i < infos.size() && i < MAX_SHORTCUTS_COUNT; i++) {
-            ShortcutInfo shortcutInfo = infos.get(i);
-            ItemInfoWithIcon si = new WorkspaceItemInfo(shortcutInfo, getContext());
-            si.rank = i;
-            shortcuts.add(new Pair<>(shortcutInfo, si));
-        }
-
-        for (int i = 0; i < mShortcutViews.length; i++) {
-            BubbleTextView shortcutView = mShortcutViews[i];
-            mShortcutViews[i].setVisibility(shortcuts.size() > i ? VISIBLE : GONE);
-            if (i < shortcuts.size()) {
-                Pair<ShortcutInfo, ItemInfoWithIcon> p = shortcuts.get(i);
-                //apply ItemInfo and prepare view
-                shortcutView.applyFromWorkspaceItem((WorkspaceItemInfo) p.second);
-                MODEL_EXECUTOR.execute(() -> {
-                    // load unbadged shortcut in background and update view when icon ready
-                    mLauncherAppState.getIconCache().getUnbadgedShortcutIcon(p.second, p.first);
-                    MAIN_EXECUTOR.post(() -> shortcutView.reapplyItemInfo(p.second));
-                });
-            }
-        }
-    }
-
-
-    private void setProviderDetails(ComponentName componentName, UserHandle userHandle) {
-        PackageItemInfo packageItemInfo = new PackageItemInfo(componentName.getPackageName());
-        if (mProviderInfo == packageItemInfo) return;
+    private void updateWithShortcutInfo(ShortcutInfo shortcutInfo) {
+        PackageItemInfo packageItemInfo = new PackageItemInfo(shortcutInfo.getPackage());
+        if (packageItemInfo.equals(mProviderInfo)) return;
         MODEL_EXECUTOR.post(() -> {
-            packageItemInfo.user = userHandle;
             mLauncherAppState.getIconCache().getTitleAndIconForApp(packageItemInfo, true);
             MAIN_EXECUTOR.post(() -> {
-                mDescriptionView.setText(packageItemInfo.title);
+                showSubtitleIfNeeded(packageItemInfo.title);
                 mProviderInfo = packageItemInfo;
             });
         });
     }
 
-    @Override
-    public void handleSelection(int eventType) {
-        mResultIcon.handleSelection(eventType);
+
+    protected void showSubtitleIfNeeded(CharSequence subTitle) {
+        if (!TextUtils.isEmpty(subTitle)) {
+            mSubTitleView.setText(subTitle);
+            mSubTitleView.setVisibility(VISIBLE);
+        } else {
+            mSubTitleView.setVisibility(GONE);
+        }
     }
 
-    @Override
-    public void onClick(View view) {
-        mResultIcon.performClick();
+
+    protected void showInlineItems(List<SearchTarget> children) {
+        for (int i = 0; i < MAX_INLINE_ITEMS; i++) {
+            if (i < children.size()) {
+                mInlineIcons[i].applySearchTarget(children.get(0), new ArrayList<>());
+                mInlineIcons[i].setVisibility(VISIBLE);
+            } else {
+                mInlineIcons[i].setVisibility(GONE);
+            }
+        }
     }
 
-    @Override
-    public boolean onLongClick(View view) {
-        mResultIcon.performLongClick();
-        return false;
+    protected void onItemInfoCreated(ItemInfoWithIcon info) {
+        setTag(info);
+        mTitleView.setText(info.title);
     }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultSettingsSlice.java b/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java
similarity index 69%
rename from quickstep/src/com/android/launcher3/search/SearchResultSettingsSlice.java
rename to quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java
index bf50b67491..e6c952fcb6 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultSettingsSlice.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java
@@ -15,12 +15,13 @@
  */
 package com.android.launcher3.search;
 
+import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
+
 import android.app.search.SearchTarget;
 import android.content.Context;
 import android.net.Uri;
 import android.util.AttributeSet;
 import android.util.Log;
-import android.view.View;
 import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
@@ -32,40 +33,39 @@ import androidx.slice.widget.EventInfo;
 import androidx.slice.widget.SliceView;
 
 import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
-import com.android.systemui.plugins.shared.SearchTargetEventLegacy;
+import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
  * A slice view wrapper with settings app icon at start
  */
-public class SearchResultSettingsSlice extends LinearLayout implements
+public class SearchResultIconSlice extends LinearLayout implements
         SearchTargetHandler, SliceView.OnSliceActionListener {
 
-
-    public static final String TARGET_TYPE_SLICE = "settings_slice";
-
     private static final String TAG = "SearchSliceController";
     private static final String URI_EXTRA_KEY = "slice_uri";
 
     private SliceView mSliceView;
-    private View mIcon;
+    private SearchResultIcon mIcon;
     private LiveData<Slice> mSliceLiveData;
     private SearchTargetLegacy mSearchTarget;
     private final Launcher mLauncher;
 
-    public SearchResultSettingsSlice(Context context) {
+    public SearchResultIconSlice(Context context) {
         this(context, null, 0);
     }
 
-    public SearchResultSettingsSlice(Context context,
+    public SearchResultIconSlice(Context context,
             @Nullable AttributeSet attrs) {
         this(context, attrs, 0);
     }
 
-    public SearchResultSettingsSlice(Context context, @Nullable AttributeSet attrs,
+    public SearchResultIconSlice(Context context, @Nullable AttributeSet attrs,
             int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         mLauncher = Launcher.getLauncher(getContext());
@@ -76,24 +76,16 @@ public class SearchResultSettingsSlice extends LinearLayout implements
         super.onFinishInflate();
         mSliceView = findViewById(R.id.slice);
         mIcon = findViewById(R.id.icon);
-        SearchSettingsRowView.applySettingsIcon(mLauncher, mIcon);
-    }
-
-    @Override
-    public void applySearchTarget(SearchTargetLegacy searchTarget) {
-        reset();
-        mSearchTarget = searchTarget;
-        try {
-            mSliceLiveData = mLauncher.getLiveSearchManager().getSliceForUri(getSliceUri());
-            mSliceLiveData.observe(mLauncher, mSliceView);
-        } catch (Exception ex) {
-            Log.e(TAG, "unable to bind slice", ex);
-        }
+        mIcon.setTextVisibility(false);
+        int iconSize = mLauncher.getDeviceProfile().iconSizePx;
+        mIcon.getLayoutParams().height = iconSize;
+        mIcon.getLayoutParams().width = iconSize;
     }
 
     @Override
     public void applySearchTarget(SearchTarget parentTarget, List<SearchTarget> children) {
         reset();
+        updateIcon(parentTarget, children);
         try {
             mSliceLiveData = mLauncher.getLiveSearchManager().getSliceForUri(
                     parentTarget.getSliceUri());
@@ -103,6 +95,20 @@ public class SearchResultSettingsSlice extends LinearLayout implements
         }
     }
 
+    private void updateIcon(SearchTarget parentTarget, List<SearchTarget> children) {
+        if (children.size() == 1) {
+            mIcon.applySearchTarget(children.get(0), new ArrayList<>());
+        } else {
+            LauncherAppState appState = LauncherAppState.getInstance(getContext());
+            MODEL_EXECUTOR.post(() -> {
+                PackageItemInfo pkgItem = new PackageItemInfo(parentTarget.getPackageName());
+                pkgItem.user = parentTarget.getUserHandle();
+                appState.getIconCache().getTitleAndIconForApp(pkgItem, false);
+                mIcon.applyFromItemInfoWithIcon(pkgItem);
+            });
+        }
+    }
+
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
@@ -115,12 +121,6 @@ public class SearchResultSettingsSlice extends LinearLayout implements
         reset();
     }
 
-    @Override
-    public void handleSelection(int eventType) {
-        SearchEventTracker.INSTANCE.get(mLauncher).notifySearchTargetEvent(
-                new SearchTargetEventLegacy.Builder(mSearchTarget,
-                        SearchTargetEventLegacy.CHILD_SELECT).build());
-    }
 
     private void reset() {
         mSliceView.setOnSliceActionListener(null);
@@ -131,7 +131,7 @@ public class SearchResultSettingsSlice extends LinearLayout implements
 
     @Override
     public void onSliceAction(@NonNull EventInfo eventInfo, @NonNull SliceItem sliceItem) {
-        handleSelection(SearchTargetEventLegacy.CHILD_SELECT);
+        //TODO: event reporting
     }
 
     private Uri getSliceUri() {
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java b/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java
index 8caa51c07f..f3355daeae 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java
@@ -44,7 +44,6 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.LauncherIcons;
-import com.android.systemui.plugins.shared.SearchTargetEventLegacy;
 import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
 import java.util.ArrayList;
@@ -99,7 +98,6 @@ public class SearchResultPeopleView extends LinearLayout implements
             button.getLayoutParams().width = mButtonSize;
             button.getLayoutParams().height = mButtonSize;
         }
-        setOnClickListener(v -> handleSelection(SearchTargetEventLegacy.SELECT));
     }
 
     @Override
@@ -137,7 +135,6 @@ public class SearchResultPeopleView extends LinearLayout implements
                 button.setVisibility(GONE);
             }
         }
-        SearchEventTracker.INSTANCE.get(getContext()).registerWeakHandler(searchTarget, this);
     }
 
     /**
@@ -185,19 +182,6 @@ public class SearchResultPeopleView extends LinearLayout implements
             launcher.startActivitySafely(b, intent, null);
             Bundle bundle = new Bundle();
             bundle.putBundle("provider", provider);
-            SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(
-                    new SearchTargetEventLegacy.Builder(mSearchTarget,
-                            SearchTargetEventLegacy.CHILD_SELECT).setExtras(bundle).build());
         });
     }
-
-    @Override
-    public void handleSelection(int eventType) {
-        if (mIntent != null) {
-            Launcher launcher = Launcher.getLauncher(getContext());
-            launcher.startActivitySafely(this, mIntent, null);
-            SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(
-                    new SearchTargetEventLegacy.Builder(mSearchTarget, eventType).build());
-        }
-    }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultPlayItem.java b/quickstep/src/com/android/launcher3/search/SearchResultPlayItem.java
deleted file mode 100644
index 840bde9952..0000000000
--- a/quickstep/src/com/android/launcher3/search/SearchResultPlayItem.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.search;
-
-import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
-
-import android.app.search.SearchAction;
-import android.app.search.SearchTarget;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.graphics.drawable.BitmapDrawable;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.Launcher;
-import com.android.launcher3.R;
-import com.android.launcher3.icons.BitmapRenderer;
-import com.android.launcher3.util.Themes;
-
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.List;
-
-/**
- * A View representing a PlayStore item.
- */
-public class SearchResultPlayItem extends LinearLayout implements
-        SearchTargetHandler {
-
-    public static final String TARGET_TYPE_PLAY = "play";
-
-    private static final int BITMAP_CROP_MASK_COLOR = 0xff424242;
-    final Paint mIconPaint = new Paint();
-    final Rect mTempRect = new Rect();
-    private final DeviceProfile mDeviceProfile;
-    private View mIconView;
-    private TextView mTitleView;
-    private TextView[] mDetailViews = new TextView[3];
-    private Button mPreviewButton;
-    private String mPackageName;
-    private Intent mIntent;
-    private Intent mSecondaryIntent;
-
-
-    public SearchResultPlayItem(Context context) {
-        this(context, null, 0);
-    }
-
-    public SearchResultPlayItem(Context context,
-            @Nullable AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public SearchResultPlayItem(Context context, @Nullable AttributeSet attrs,
-            int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        mDeviceProfile = Launcher.getLauncher(getContext()).getDeviceProfile();
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        mIconView = findViewById(R.id.icon);
-        mTitleView = findViewById(R.id.title_view);
-        mPreviewButton = findViewById(R.id.try_button);
-        mPreviewButton.setOnClickListener(view -> launchIntent(mSecondaryIntent));
-        mDetailViews[0] = findViewById(R.id.detail_0);
-        mDetailViews[1] = findViewById(R.id.detail_1);
-        mDetailViews[2] = findViewById(R.id.detail_2);
-
-        ViewGroup.LayoutParams iconParams = mIconView.getLayoutParams();
-        iconParams.height = mDeviceProfile.allAppsIconSizePx;
-        iconParams.width = mDeviceProfile.allAppsIconSizePx;
-        setOnClickListener(view -> launchIntent(mIntent));
-    }
-
-    private void showIfNecessary(TextView textView, @Nullable String string) {
-        if (string == null || string.isEmpty()) {
-            textView.setVisibility(GONE);
-        } else {
-            textView.setText(string);
-            textView.setVisibility(VISIBLE);
-        }
-    }
-
-    private void launchIntent(Intent intent) {
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        getContext().startActivity(intent);
-    }
-
-    @Override
-    public void applySearchTarget(SearchTarget parentTarget, List<SearchTarget> children) {
-        if (parentTarget.getPackageName().equals(mPackageName)) {
-            return;
-        }
-        mPackageName = parentTarget.getPackageName();
-        SearchAction action = parentTarget.getSearchAction();
-        mTitleView.setText(action.getTitle());
-        showIfNecessary(mDetailViews[0], action.getSubtitle().toString());
-        mIntent = action.getIntent();
-
-        mIconView.setBackgroundResource(R.drawable.ic_deepshortcut_placeholder);
-        loadIcon(action.getIcon().getUri().toString());
-
-        mSecondaryIntent = children.size() == 1 ? children.get(0).getSearchAction().getIntent()
-                : null;
-        mPreviewButton.setVisibility(mSecondaryIntent == null ? GONE : VISIBLE);
-    }
-
-    private void loadIcon(String iconUrl) {
-        UI_HELPER_EXECUTOR.execute(() -> {
-            try {
-                URL url = new URL(iconUrl);
-                URLConnection con = url.openConnection();
-                con.addRequestProperty("Cache-Control", "max-age: 0");
-                con.setUseCaches(true);
-                Bitmap bitmap = BitmapFactory.decodeStream(con.getInputStream());
-                BitmapDrawable bitmapDrawable = new BitmapDrawable(getResources(), getRoundedBitmap(
-                        Bitmap.createScaledBitmap(bitmap, mDeviceProfile.allAppsIconSizePx,
-                                mDeviceProfile.allAppsIconSizePx, false)));
-                mIconView.post(() -> mIconView.setBackground(bitmapDrawable));
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        });
-    }
-
-    private Bitmap getRoundedBitmap(Bitmap bitmap) {
-        final int iconSize = bitmap.getWidth();
-        final float radius = Themes.getDialogCornerRadius(getContext());
-
-        Bitmap output = BitmapRenderer.createHardwareBitmap(iconSize, iconSize, (canvas) -> {
-            mTempRect.set(0, 0, iconSize, iconSize);
-            final RectF rectF = new RectF(mTempRect);
-
-            mIconPaint.setAntiAlias(true);
-            mIconPaint.reset();
-            canvas.drawARGB(0, 0, 0, 0);
-            mIconPaint.setColor(BITMAP_CROP_MASK_COLOR);
-            canvas.drawRoundRect(rectF, radius, radius, mIconPaint);
-
-            mIconPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
-            canvas.drawBitmap(bitmap, mTempRect, mTempRect, mIconPaint);
-        });
-        return output;
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultWidget.java b/quickstep/src/com/android/launcher3/search/SearchResultWidget.java
index 4fe92296d5..c6bdb68204 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultWidget.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultWidget.java
@@ -36,7 +36,6 @@ import com.android.launcher3.allapps.search.SearchWidgetInfoContainer;
 import com.android.launcher3.dragndrop.DraggableView;
 import com.android.launcher3.touch.ItemLongClickListener;
 import com.android.launcher3.widget.PendingAddWidgetInfo;
-import com.android.systemui.plugins.shared.SearchTargetEventLegacy;
 import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
 /**
@@ -82,7 +81,8 @@ public class SearchResultWidget extends RelativeLayout implements
 
         // detect tap event on widget container for search target event reporting
         mClickDetector = new GestureDetector(context,
-                new ClickListener(() -> handleSelection(SearchTargetEventLegacy.CHILD_SELECT)));
+                new ClickListener(() -> {
+                }));
 
         mLongPressHelper = new CheckLongPressHelper(this);
         mLongPressHelper.setLongPressTimeoutFactor(1);
@@ -138,12 +138,6 @@ public class SearchResultWidget extends RelativeLayout implements
         }
     }
 
-    @Override
-    public void handleSelection(int eventType) {
-        SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(
-                new SearchTargetEventLegacy.Builder(mSearchTarget, eventType).build());
-    }
-
     @Override
     public boolean onInterceptTouchEvent(MotionEvent ev) {
         mLongPressHelper.onTouchEvent(ev);
@@ -182,7 +176,6 @@ public class SearchResultWidget extends RelativeLayout implements
     @Override
     public boolean onLongClick(View view) {
         ItemLongClickListener.INSTANCE_ALL_APPS.onLongClick(view);
-        handleSelection(SearchTargetEventLegacy.LONG_PRESS);
         return false;
     }
 
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java b/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java
index 5effbe594e..22f0b76159 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java
@@ -39,7 +39,6 @@ import com.android.launcher3.widget.BaseWidgetSheet;
 import com.android.launcher3.widget.PendingItemDragHelper;
 import com.android.launcher3.widget.WidgetCell;
 import com.android.launcher3.widget.WidgetImageView;
-import com.android.systemui.plugins.shared.SearchTargetEventLegacy;
 import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
 /**
@@ -121,19 +120,11 @@ public class SearchResultWidgetPreview extends LinearLayout implements
         new PendingItemDragHelper(mWidgetCell).startDrag(
                 imageView.getBitmapBounds(), imageView.getBitmap().getWidth(), imageView.getWidth(),
                 new Point(loc[0], loc[1]), mLauncher.getAppsView(), new DragOptions());
-        handleSelection(SearchTargetEventLegacy.LONG_PRESS);
         return true;
     }
 
     @Override
     public void onClick(View view) {
         mWidgetToast = BaseWidgetSheet.showWidgetToast(getContext(), mWidgetToast);
-        handleSelection(SearchTargetEventLegacy.SELECT);
-    }
-
-    @Override
-    public void handleSelection(int eventType) {
-        SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(
-                new SearchTargetEventLegacy.Builder(mSearchTarget, eventType).build());
     }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java b/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java
index ccc38dbbbd..e015122315 100644
--- a/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java
+++ b/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java
@@ -22,8 +22,6 @@ import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 
-import com.android.systemui.plugins.shared.SearchTargetLegacy;
-
 import java.util.List;
 
 /**
@@ -31,7 +29,6 @@ import java.util.List;
  */
 public class SearchSectionHeaderView extends TextView implements
         SearchTargetHandler {
-    public static final String TARGET_TYPE_SECTION_HEADER = "section_header";
 
     public SearchSectionHeaderView(Context context) {
         super(context);
@@ -46,17 +43,6 @@ public class SearchSectionHeaderView extends TextView implements
         super(context, attrs, styleAttr);
     }
 
-    @Override
-    public void applySearchTarget(SearchTargetLegacy searchTarget) {
-        String title = searchTarget.getExtras().getString("title");
-        if (title == null || !title.isEmpty()) {
-            setText(title);
-            setVisibility(VISIBLE);
-        } else {
-            setVisibility(INVISIBLE);
-        }
-    }
-
     @Override
     public void applySearchTarget(SearchTarget parentTarget, List<SearchTarget> children) {
         setText(parentTarget.getSearchAction().getTitle());
diff --git a/quickstep/src/com/android/launcher3/search/SearchSettingsRowView.java b/quickstep/src/com/android/launcher3/search/SearchSettingsRowView.java
deleted file mode 100644
index 6fc0046b12..0000000000
--- a/quickstep/src/com/android/launcher3/search/SearchSettingsRowView.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.search;
-
-import static com.android.launcher3.FastBitmapDrawable.newIcon;
-import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
-
-import android.app.search.SearchAction;
-import android.app.search.SearchTarget;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.FastBitmapDrawable;
-import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.R;
-import com.android.launcher3.model.data.PackageItemInfo;
-import com.android.systemui.plugins.shared.SearchTargetEventLegacy;
-import com.android.systemui.plugins.shared.SearchTargetLegacy;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A row of clickable TextViews with a breadcrumb for settings search.
- */
-public class SearchSettingsRowView extends LinearLayout implements
-        View.OnClickListener, SearchTargetHandler {
-
-    public static final String TARGET_TYPE_SETTINGS_ROW = "settings_row";
-
-    private View mIconView;
-    private TextView mTitleView;
-    private TextView mBreadcrumbsView;
-    private Intent mIntent;
-    private SearchTargetLegacy mSearchTarget;
-
-
-    public SearchSettingsRowView(@NonNull Context context) {
-        this(context, null, 0);
-    }
-
-    public SearchSettingsRowView(@NonNull Context context,
-            @Nullable AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public SearchSettingsRowView(@NonNull Context context, @Nullable AttributeSet attrs,
-            int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        mIconView = findViewById(R.id.icon);
-        mTitleView = findViewById(R.id.title);
-        mBreadcrumbsView = findViewById(R.id.breadcrumbs);
-        setOnClickListener(this);
-        applySettingsIcon(Launcher.getLauncher(getContext()), mIconView);
-    }
-
-    @Override
-    public void applySearchTarget(SearchTargetLegacy searchTarget) {
-        mSearchTarget = searchTarget;
-        Bundle bundle = searchTarget.getExtras();
-        mIntent = bundle.getParcelable("intent");
-        showIfAvailable(mTitleView, bundle.getString("title"));
-        mIconView.setContentDescription(bundle.getString("title"));
-        ArrayList<String> breadcrumbs = bundle.getStringArrayList("breadcrumbs");
-        //TODO: implement RTL friendly breadcrumbs view
-        showIfAvailable(mBreadcrumbsView, breadcrumbs != null
-                ? String.join(" > ", breadcrumbs) : null);
-        SearchEventTracker.INSTANCE.get(getContext()).registerWeakHandler(searchTarget, this);
-    }
-
-    @Override
-    public void applySearchTarget(SearchTarget parentTarget, List<SearchTarget> children) {
-        SearchAction action = parentTarget.getSearchAction();
-        mIconView.setContentDescription(action.getTitle());
-        showIfAvailable(mTitleView, action.getTitle().toString());
-        showIfAvailable(mBreadcrumbsView, action.getSubtitle().toString());
-    }
-
-    private void showIfAvailable(TextView view, @Nullable String string) {
-        if (TextUtils.isEmpty(string)) {
-            view.setVisibility(GONE);
-        } else {
-            view.setVisibility(VISIBLE);
-            view.setText(string);
-        }
-    }
-
-    @Override
-    public void onClick(View view) {
-        handleSelection(SearchTargetEventLegacy.SELECT);
-    }
-
-    @Override
-    public void handleSelection(int eventType) {
-        if (mIntent == null) return;
-        // TODO: create ItemInfo object and then use it to call startActivityForResult for proper
-        //  WW logging
-        Launcher launcher = Launcher.getLauncher(getContext());
-        launcher.startActivityForResult(mIntent, 0);
-
-        SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(
-                new SearchTargetEventLegacy.Builder(mSearchTarget, eventType).build());
-    }
-
-    /**
-     * Requests settings app icon from {@link com.android.launcher3.icons.IconCache} and applies
-     * to to view
-     */
-    public static void applySettingsIcon(Launcher launcher, View view) {
-        LauncherAppState appState = LauncherAppState.getInstance(launcher);
-        MODEL_EXECUTOR.post(() -> {
-            PackageItemInfo packageItemInfo = new PackageItemInfo(getSettingsPackageName(launcher));
-            appState.getIconCache().getTitleAndIconForApp(packageItemInfo, false);
-            MAIN_EXECUTOR.post(() -> {
-                FastBitmapDrawable iconDrawable = newIcon(appState.getContext(), packageItemInfo);
-                view.setBackground(iconDrawable);
-            });
-        });
-    }
-
-    private static String getSettingsPackageName(Launcher launcher) {
-        Intent intent = new Intent(android.provider.Settings.ACTION_SETTINGS);
-        List<ResolveInfo> resolveInfos = launcher.getPackageManager().queryIntentActivities(intent,
-                PackageManager.MATCH_DEFAULT_ONLY);
-        if (resolveInfos.size() == 0) {
-            return "";
-        }
-        return resolveInfos.get(0).activityInfo.packageName;
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java b/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java
index e72578dcd3..67502f675f 100644
--- a/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java
+++ b/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java
@@ -29,7 +29,10 @@ public interface SearchTargetHandler {
 
     /**
      * Update view using values from {@link SearchTargetLegacy}
+     *
+     * @deprecated Use {@link SearchTargetHandler#applySearchTarget(SearchTarget, List)} instead
      */
+    @Deprecated
     default void applySearchTarget(SearchTargetLegacy searchTarget) {
     }
 
@@ -41,9 +44,10 @@ public interface SearchTargetHandler {
     }
 
     /**
-     * Handles selection of SearchTarget
+     * Handle IME quick select event. returns whether event was handled.
      */
-    default void handleSelection(int eventType) {
+    default boolean quickSelect() {
+        return false;
     }
 
 }
diff --git a/quickstep/src/com/android/launcher3/search/ThumbnailSearchResultView.java b/quickstep/src/com/android/launcher3/search/ThumbnailSearchResultView.java
index 44f70575b6..7108d63a1f 100644
--- a/quickstep/src/com/android/launcher3/search/ThumbnailSearchResultView.java
+++ b/quickstep/src/com/android/launcher3/search/ThumbnailSearchResultView.java
@@ -16,27 +16,11 @@
 package com.android.launcher3.search;
 
 
-import static com.android.launcher3.search.SearchResultIcon.REMOTE_ACTION_SHOULD_START;
-import static com.android.launcher3.search.SearchResultIcon.REMOTE_ACTION_TOKEN;
-
+import android.app.search.SearchTarget;
 import android.content.Context;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
-import android.net.Uri;
 import android.util.AttributeSet;
 
-import androidx.core.graphics.drawable.RoundedBitmapDrawable;
-import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
-
-import com.android.launcher3.Launcher;
-import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.model.data.RemoteActionItemInfo;
-import com.android.launcher3.model.data.WorkspaceItemInfo;
-import com.android.launcher3.touch.ItemClickHandler;
-import com.android.launcher3.util.Themes;
-import com.android.systemui.plugins.shared.SearchTargetEventLegacy;
-import com.android.systemui.plugins.shared.SearchTargetLegacy;
+import java.util.List;
 
 /**
  * A view representing a high confidence app search result that includes shortcuts
@@ -44,11 +28,6 @@ import com.android.systemui.plugins.shared.SearchTargetLegacy;
 public class ThumbnailSearchResultView extends androidx.appcompat.widget.AppCompatImageView
         implements SearchTargetHandler {
 
-    public static final String TARGET_TYPE_SCREENSHOT = "screenshot";
-    public static final String TARGET_TYPE_SCREENSHOT_LEGACY = "screenshot_legacy";
-
-    private SearchTargetLegacy mSearchTarget;
-
     public ThumbnailSearchResultView(Context context) {
         super(context);
     }
@@ -62,53 +41,7 @@ public class ThumbnailSearchResultView extends androidx.appcompat.widget.AppComp
     }
 
     @Override
-    public void handleSelection(int eventType) {
-        Launcher launcher = Launcher.getLauncher(getContext());
-        ItemInfo itemInfo = (ItemInfo) getTag();
-        if (itemInfo instanceof RemoteActionItemInfo) {
-            RemoteActionItemInfo remoteItemInfo = (RemoteActionItemInfo) itemInfo;
-            ItemClickHandler.onClickRemoteAction(launcher, remoteItemInfo);
-        } else {
-            ItemClickHandler.onClickAppShortcut(this, (WorkspaceItemInfo) itemInfo, launcher);
-        }
-        SearchEventTracker.INSTANCE.get(getContext()).notifySearchTargetEvent(
-                new SearchTargetEventLegacy.Builder(mSearchTarget, eventType).build());
-    }
+    public void applySearchTarget(SearchTarget parentTarget, List<SearchTarget> children) {
 
-    @Override
-    public void applySearchTarget(SearchTargetLegacy target) {
-        mSearchTarget = target;
-        Bitmap bitmap;
-        if (target.getRemoteAction() != null) {
-            RemoteActionItemInfo itemInfo = new RemoteActionItemInfo(target.getRemoteAction(),
-                    target.getExtras().getString(REMOTE_ACTION_TOKEN),
-                    target.getExtras().getBoolean(REMOTE_ACTION_SHOULD_START));
-            bitmap = ((BitmapDrawable) target.getRemoteAction().getIcon()
-                    .loadDrawable(getContext())).getBitmap();
-            // crop
-            if (bitmap.getWidth() < bitmap.getHeight()) {
-                bitmap = Bitmap.createBitmap(bitmap, 0,
-                        bitmap.getHeight() / 2 - bitmap.getWidth() / 2,
-                        bitmap.getWidth(), bitmap.getWidth());
-            } else {
-                bitmap = Bitmap.createBitmap(bitmap, bitmap.getWidth() / 2 - bitmap.getHeight() / 2,
-                        0,
-                        bitmap.getHeight(), bitmap.getHeight());
-            }
-            setTag(itemInfo);
-        } else {
-            bitmap = (Bitmap) target.getExtras().getParcelable("bitmap");
-            WorkspaceItemInfo itemInfo = new WorkspaceItemInfo();
-            itemInfo.intent = new Intent(Intent.ACTION_VIEW)
-                    .setData(Uri.parse(target.getExtras().getString("uri")))
-                    .setType("image/*")
-                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            setTag(itemInfo);
-        }
-        RoundedBitmapDrawable drawable = RoundedBitmapDrawableFactory.create(null, bitmap);
-        drawable.setCornerRadius(Themes.getDialogCornerRadius(getContext()));
-        setImageDrawable(drawable);
-        setOnClickListener(v -> handleSelection(SearchTargetEventLegacy.SELECT));
-        SearchEventTracker.INSTANCE.get(getContext()).registerWeakHandler(target, this);
     }
 }
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index f44f88b098..22eb15a8e2 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -72,7 +72,7 @@ import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.PackageItemInfo;
-import com.android.launcher3.model.data.RemoteActionItemInfo;
+import com.android.launcher3.model.data.SearchActionItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.util.SafeCloseable;
 import com.android.launcher3.views.ActivityContext;
@@ -319,14 +319,14 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
     }
 
     /**
-     * Apply label and tag using a {@link RemoteActionItemInfo}
+     * Apply label and tag using a {@link SearchActionItemInfo}
      */
-    public void applyFromRemoteActionInfo(RemoteActionItemInfo remoteActionItemInfo) {
-        applyIconAndLabel(remoteActionItemInfo);
-        setTag(remoteActionItemInfo);
+    public void applyFromSearchActionItemInfo(SearchActionItemInfo searchActionItemInfo) {
+        applyIconAndLabel(searchActionItemInfo);
+        setTag(searchActionItemInfo);
     }
 
-    private void applyIconAndLabel(ItemInfoWithIcon info) {
+    protected void applyIconAndLabel(ItemInfoWithIcon info) {
         FastBitmapDrawable iconDrawable = newIcon(getContext(), info);
         mDotParams.color = IconPalette.getMutedColor(info.bitmap.color, 0.54f);
 
@@ -595,7 +595,8 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         mLongPressHelper.cancelLongPress();
     }
 
-    /** Applies the loading progress value to the progress bar.
+    /**
+     * Applies the loading progress value to the progress bar.
      *
      * If this app is installing, the progress bar will be updated with the installation progress.
      * If this app is installed and downloading incrementally, the progress bar will be updated
@@ -609,7 +610,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
                     != 0) {
                 updateProgressBarUi(progressLevel, progressLevel == 100);
             } else if (info.hasPromiseIconUi() || (info.runtimeStatusFlags
-                        & ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE) != 0) {
+                    & ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE) != 0) {
                 updateProgressBarUi(progressLevel, promiseStateChanged);
             }
         }
@@ -765,8 +766,8 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
                 mActivity.invalidateParent(info);
             } else if (info instanceof PackageItemInfo) {
                 applyFromItemInfoWithIcon((PackageItemInfo) info);
-            } else if (info instanceof RemoteActionItemInfo) {
-                applyFromRemoteActionInfo((RemoteActionItemInfo) info);
+            } else if (info instanceof SearchActionItemInfo) {
+                applyFromSearchActionItemInfo((SearchActionItemInfo) info);
             }
 
             mDisableRelayout = false;
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 4d51d70e7b..20f7c231fb 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -547,10 +547,15 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
             return mLauncher.startActivitySafely(v, headerItem.getIntent(), headerItem);
         }
         AdapterItem focusedItem = getActiveRecyclerView().getApps().getFocusedChild();
-        if (mSearchAdapterProvider.onAdapterItemSelected(focusedItem)) {
-            return true;
+        if (focusedItem != null) {
+            View focusedView = getActiveRecyclerView().getLayoutManager()
+                    .findViewByPosition(focusedItem.position);
+            if (focusedView != null && mSearchAdapterProvider.onAdapterItemSelected(focusedItem,
+                    focusedView)) {
+                return true;
+            }
         }
-        if (focusedItem.appInfo != null) {
+        if (focusedItem != null && focusedItem.appInfo != null) {
             ItemInfo itemInfo = focusedItem.appInfo;
             return mLauncher.startActivitySafely(v, itemInfo.getIntent(), itemInfo);
         }
diff --git a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
index 522f1d488a..198c4b2bfb 100644
--- a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
+++ b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
@@ -32,10 +32,8 @@ import com.android.launcher3.Utilities;
 import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItem;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.util.PackageManagerHelper;
-import com.android.systemui.plugins.AllAppsSearchPlugin;
 
 import java.util.ArrayList;
-import java.util.function.Consumer;
 
 /**
  * An interface to a search box that AllApps can command.
@@ -74,10 +72,7 @@ public class AllAppsSearchBarController
 
     @Override
     public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-        if (mSearchAlgorithm instanceof PluginWrapper) {
-            ((PluginWrapper) mSearchAlgorithm).runOnPluginIfConnected(
-                    AllAppsSearchPlugin::startedSearchSession);
-        }
+        // Do nothing
     }
 
     @Override
@@ -173,16 +168,6 @@ public class AllAppsSearchBarController
         return mInput.isFocused();
     }
 
-    /**
-     * A wrapper setup for running essential calls to plugin from search controller
-     */
-    public interface PluginWrapper {
-        /**
-         * executes call if plugin is connected
-         */
-        void runOnPluginIfConnected(Consumer<AllAppsSearchPlugin> plugin);
-    }
-
     /**
      * Callback for getting search results.
      */
diff --git a/src/com/android/launcher3/allapps/search/DefaultSearchAdapterProvider.java b/src/com/android/launcher3/allapps/search/DefaultSearchAdapterProvider.java
index e3c178b937..330ec6806b 100644
--- a/src/com/android/launcher3/allapps/search/DefaultSearchAdapterProvider.java
+++ b/src/com/android/launcher3/allapps/search/DefaultSearchAdapterProvider.java
@@ -16,6 +16,7 @@
 package com.android.launcher3.allapps.search;
 
 import android.view.LayoutInflater;
+import android.view.View;
 import android.view.ViewGroup;
 
 import com.android.launcher3.BaseDraggingActivity;
@@ -47,7 +48,7 @@ public class DefaultSearchAdapterProvider extends SearchAdapterProvider {
     }
 
     @Override
-    public boolean onAdapterItemSelected(AllAppsGridAdapter.AdapterItem focusedItem) {
+    public boolean onAdapterItemSelected(AllAppsGridAdapter.AdapterItem adapterItem, View view) {
         return false;
     }
 }
diff --git a/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java b/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
index 1c7247aadb..511de3096f 100644
--- a/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
+++ b/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
@@ -18,6 +18,7 @@ package com.android.launcher3.allapps.search;
 
 
 import android.view.LayoutInflater;
+import android.view.View;
 import android.view.ViewGroup;
 
 import com.android.launcher3.BaseDraggingActivity;
@@ -61,5 +62,6 @@ public abstract class SearchAdapterProvider {
      * handles selection event on search adapter item. Returns false if provider can not handle
      * event
      */
-    public abstract boolean onAdapterItemSelected(AllAppsGridAdapter.AdapterItem focusedItem);
+    public abstract boolean onAdapterItemSelected(AllAppsGridAdapter.AdapterItem adapterItem,
+            View view);
 }
diff --git a/src/com/android/launcher3/model/data/RemoteActionItemInfo.java b/src/com/android/launcher3/model/data/RemoteActionItemInfo.java
deleted file mode 100644
index d988bf9641..0000000000
--- a/src/com/android/launcher3/model/data/RemoteActionItemInfo.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.model.data;
-
-import android.app.RemoteAction;
-import android.os.Process;
-
-/**
- * Represents a launchable {@link RemoteAction}
- */
-public class RemoteActionItemInfo extends ItemInfoWithIcon {
-
-    private final RemoteAction mRemoteAction;
-    private final String mToken;
-    private final boolean mShouldStart;
-
-    public RemoteActionItemInfo(RemoteAction remoteAction, String token, boolean shouldStart) {
-        mShouldStart = shouldStart;
-        mToken = token;
-        mRemoteAction = remoteAction;
-        title = remoteAction.getTitle();
-        user = Process.myUserHandle();
-    }
-
-    public RemoteActionItemInfo(RemoteActionItemInfo info) {
-        super(info);
-        this.mShouldStart = info.mShouldStart;
-        this.mRemoteAction = info.mRemoteAction;
-        this.mToken = info.mToken;
-    }
-
-    @Override
-    public ItemInfoWithIcon clone() {
-        return new RemoteActionItemInfo(this);
-    }
-
-    public RemoteAction getRemoteAction() {
-        return mRemoteAction;
-    }
-
-    public String getToken() {
-        return mToken;
-    }
-
-    /**
-     * Getter method for mShouldStart
-     */
-    public boolean shouldStartInLauncher() {
-        return mShouldStart;
-    }
-
-    public boolean isEscapeHatch() {
-        return mToken.contains("item_type:[ESCAPE_HATCH]");
-    }
-}
diff --git a/src/com/android/launcher3/model/data/SearchActionItemInfo.java b/src/com/android/launcher3/model/data/SearchActionItemInfo.java
new file mode 100644
index 0000000000..1831ffd803
--- /dev/null
+++ b/src/com/android/launcher3/model/data/SearchActionItemInfo.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.model.data;
+
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.graphics.drawable.Icon;
+import android.os.Process;
+import android.os.UserHandle;
+
+/**
+ * Represents a SearchAction with in launcher
+ */
+public class SearchActionItemInfo extends ItemInfoWithIcon {
+
+    public static final int FLAG_SHOULD_START = 1 << 1;
+    public static final int FLAG_SHOULD_START_FOR_RESULT = FLAG_SHOULD_START | 1 << 2;
+
+    private final String mFallbackPackageName;
+
+    private int mFlags = 0;
+    private final Icon mIcon;
+
+    private Intent mIntent;
+
+    private PendingIntent mPendingIntent;
+
+    public SearchActionItemInfo(Icon icon, String packageName, UserHandle user,
+            CharSequence title) {
+        this.user = user == null ? Process.myUserHandle() : user;
+        this.title = title;
+        mFallbackPackageName = packageName;
+        mIcon = icon;
+    }
+
+    public SearchActionItemInfo(SearchActionItemInfo info) {
+        super(info);
+        mIcon = info.mIcon;
+        mFallbackPackageName = info.mFallbackPackageName;
+        mFlags = info.mFlags;
+        title = info.title;
+    }
+
+    public void setFlags(int flags) {
+        mFlags = flags;
+    }
+
+    public int getFlags() {
+        return mFlags;
+    }
+
+    @Override
+    public Intent getIntent() {
+        return mIntent;
+    }
+
+    /**
+     * Setter for mIntent with assertion for null value mPendingIntent
+     */
+    public void setIntent(Intent intent) {
+        if (mPendingIntent != null && intent != null) {
+            throw new RuntimeException(
+                    "SearchActionItemInfo can only have either an Intent or a PendingIntent");
+        }
+        mIntent = intent;
+    }
+
+    public PendingIntent getPendingIntent() {
+        return mPendingIntent;
+    }
+
+    /**
+     * Setter of mPendingIntent with assertion for null value mIntent
+     */
+    public void setPendingIntent(PendingIntent pendingIntent) {
+        if (mIntent != null && pendingIntent != null) {
+            throw new RuntimeException(
+                    "SearchActionItemInfo can only have either an Intent or a PendingIntent");
+        }
+        mPendingIntent = pendingIntent;
+    }
+
+
+    /**
+     * Returns if a flag is set on instance
+     */
+    public boolean hasFlag(int flag) {
+        return (mFlags & flag) == flag;
+    }
+
+    @Override
+    public ItemInfoWithIcon clone() {
+        return new SearchActionItemInfo(this);
+    }
+
+    public Icon getIcon() {
+        return mIcon;
+    }
+}
diff --git a/src/com/android/launcher3/touch/ItemClickHandler.java b/src/com/android/launcher3/touch/ItemClickHandler.java
index 41587357f5..d9483e56c2 100644
--- a/src/com/android/launcher3/touch/ItemClickHandler.java
+++ b/src/com/android/launcher3/touch/ItemClickHandler.java
@@ -51,7 +51,7 @@ import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
-import com.android.launcher3.model.data.RemoteActionItemInfo;
+import com.android.launcher3.model.data.SearchActionItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pm.InstallSessionHelper;
 import com.android.launcher3.testing.TestLogging;
@@ -96,8 +96,8 @@ public class ItemClickHandler {
             if (v instanceof PendingAppWidgetHostView) {
                 onClickPendingWidget((PendingAppWidgetHostView) v, launcher);
             }
-        } else if (tag instanceof RemoteActionItemInfo) {
-            onClickRemoteAction(launcher, (RemoteActionItemInfo) tag);
+        } else if (tag instanceof SearchActionItemInfo) {
+            onClickSearchAction(launcher, (SearchActionItemInfo) tag);
         }
     }
 
@@ -246,23 +246,31 @@ public class ItemClickHandler {
     }
 
     /**
-     * Event handler for a {@link android.app.RemoteAction} click
-     *
+     * Event handler for a {@link SearchActionItemInfo} click
      */
-    public static void onClickRemoteAction(Launcher launcher,
-            RemoteActionItemInfo remoteActionInfo) {
-        try {
-            PendingIntent pendingIntent = remoteActionInfo.getRemoteAction().getActionIntent();
-            if (remoteActionInfo.shouldStartInLauncher()) {
-                launcher.startIntentSenderForResult(pendingIntent.getIntentSender(), 0, null, 0, 0,
-                        0);
+    public static void onClickSearchAction(Launcher launcher, SearchActionItemInfo itemInfo) {
+        if (itemInfo.getIntent() != null) {
+            if (itemInfo.hasFlag(SearchActionItemInfo.FLAG_SHOULD_START_FOR_RESULT)) {
+                launcher.startActivityForResult(itemInfo.getIntent(), 0);
             } else {
-                pendingIntent.send();
+                launcher.startActivity(itemInfo.getIntent());
+            }
+        } else if (itemInfo.getPendingIntent() != null) {
+            try {
+                PendingIntent pendingIntent = itemInfo.getPendingIntent();
+                if (!itemInfo.hasFlag(SearchActionItemInfo.FLAG_SHOULD_START)) {
+                    pendingIntent.send();
+                } else if (itemInfo.hasFlag(SearchActionItemInfo.FLAG_SHOULD_START_FOR_RESULT)) {
+                    launcher.startIntentSenderForResult(pendingIntent.getIntentSender(), 0, null, 0,
+                            0, 0);
+                } else {
+                    launcher.startIntentSender(pendingIntent.getIntentSender(), null, 0, 0, 0);
+                }
+            } catch (PendingIntent.CanceledException | IntentSender.SendIntentException e) {
+                Toast.makeText(launcher,
+                        launcher.getResources().getText(R.string.shortcut_not_available),
+                        Toast.LENGTH_SHORT).show();
             }
-        } catch (PendingIntent.CanceledException | IntentSender.SendIntentException e) {
-            Toast.makeText(launcher,
-                    launcher.getResources().getText(R.string.shortcut_not_available),
-                    Toast.LENGTH_SHORT).show();
         }
     }
 
@@ -272,7 +280,7 @@ public class ItemClickHandler {
         Intent intent;
         if (item instanceof ItemInfoWithIcon
                 && (((ItemInfoWithIcon) item).runtimeStatusFlags
-                    & ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE) != 0) {
+                & ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE) != 0) {
             ItemInfoWithIcon appInfo = (ItemInfoWithIcon) item;
             intent = new PackageManagerHelper(launcher)
                     .getMarketIntent(appInfo.getTargetComponent().getPackageName());
-- 
GitLab


From 6fa63473e197e0abf6664a3899555019a829e119 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Mon, 25 Jan 2021 15:30:26 -0500
Subject: [PATCH 0422/1664] Fix bug where dragview gets stuck on screen.

* Since the BubbleTextViews views do not have a listener, the long press
  was still getting triggered even though it was in a pressed state.
* We only trigger long press if the view is not pressed or if there is no listener.
* A listener is only added for widgets, and for long press wiidgets are not
  pressed state.

Bug: 162636845
Test: manual test, repo steps in bug
Change-Id: Ia9df12cf31a0844403d69ddacebf2bdbc5c59d3b
---
 src/com/android/launcher3/CheckLongPressHelper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/CheckLongPressHelper.java b/src/com/android/launcher3/CheckLongPressHelper.java
index ff405ece3e..c707df04c0 100644
--- a/src/com/android/launcher3/CheckLongPressHelper.java
+++ b/src/com/android/launcher3/CheckLongPressHelper.java
@@ -115,7 +115,7 @@ public class CheckLongPressHelper {
     private void triggerLongPress() {
         if ((mView.getParent() != null)
                 && mView.hasWindowFocus()
-                && (!mView.isPressed() || mListener == null)
+                && (!mView.isPressed() || mListener != null)
                 && !mHasPerformedLongPress) {
             boolean handled;
             if (mListener != null) {
-- 
GitLab


From 062a8fd979e6e161218ecc7a0478a2d1d568e85c Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Tue, 19 Jan 2021 13:12:10 -0600
Subject: [PATCH 0423/1664]  Introduce feature education for AllApps Search

Preview: https://drive.google.com/file/d/1eXf3K6kFh0bHcYlpwW_voSRjY9RQalJN/view?usp=sharing&resourcekey=0-IABjrtXM5JhHvSf-7yc4tg

Edu can be dismissed permanently by pressing "Got it" button or typing. Swiping down defers edu until next visit to all apps

- Move fallback search to quickstep
Bug: 178100472
Test: Manual

Change-Id: I920aab366330758e81f8b9fa62736abf82fe5cac
---
 .../res/layout/fallback_search_input.xml      |  35 +++
 quickstep/res/layout/search_edu_view.xml      |  73 ++++++
 quickstep/res/values/strings.xml              |   9 +
 .../launcher3/search/DeviceSearchEdu.java     | 221 ++++++++++++++++++
 .../search/FallbackSearchInputView.java       | 140 +++++++++++
 .../util/QuickstepOnboardingPrefs.java        |  15 ++
 .../AllAppsInsetTransitionController.java     |  24 +-
 .../allapps/AllAppsTransitionController.java  |   5 +-
 .../launcher3/util/OnboardingPrefs.java       |   4 +-
 .../launcher3/views/AbstractSlideInView.java  |   3 +-
 10 files changed, 520 insertions(+), 9 deletions(-)
 create mode 100644 quickstep/res/layout/fallback_search_input.xml
 create mode 100644 quickstep/res/layout/search_edu_view.xml
 create mode 100644 quickstep/src/com/android/launcher3/search/DeviceSearchEdu.java
 create mode 100644 quickstep/src/com/android/launcher3/search/FallbackSearchInputView.java

diff --git a/quickstep/res/layout/fallback_search_input.xml b/quickstep/res/layout/fallback_search_input.xml
new file mode 100644
index 0000000000..0fb2924d96
--- /dev/null
+++ b/quickstep/res/layout/fallback_search_input.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.launcher3.search.FallbackSearchInputView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_vertical"
+    android:layout_marginLeft="48dp"
+    android:layout_marginRight="48dp"
+    android:background="@android:color/transparent"
+    android:focusableInTouchMode="true"
+    android:gravity="start|center_vertical"
+    android:inputType="textNoSuggestions"
+    android:imeOptions="actionSearch|flagNoExtractUi"
+    android:maxLines="1"
+    android:privateImeOptions="bc_search"
+    android:scrollHorizontally="true"
+    android:singleLine="true"
+    android:textColor="?android:attr/textColorSecondary"
+    android:textColorHint="?android:attr/textColorTertiary"
+    android:textSize="16sp" />
\ No newline at end of file
diff --git a/quickstep/res/layout/search_edu_view.xml b/quickstep/res/layout/search_edu_view.xml
new file mode 100644
index 0000000000..d89f5c7fb9
--- /dev/null
+++ b/quickstep/res/layout/search_edu_view.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.launcher3.search.DeviceSearchEdu
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_horizontal"
+    android:orientation="vertical">
+
+
+    <FrameLayout
+        android:layout_height="wrap_content"
+        android:id="@+id/search_box_wrapper"
+        android:layout_width="match_parent">
+
+        <include
+            layout="@layout/fallback_search_input"
+            android:id="@+id/mock_search_box" />
+    </FrameLayout>
+
+    <LinearLayout
+        android:layout_height="wrap_content"
+        android:id="@+id/edu_wrapper"
+        android:padding="24dp"
+        android:layout_marginTop="40dp"
+        android:orientation="vertical"
+        android:layout_width="match_parent">
+
+        <TextView
+            style="@style/TextHeadline"
+            android:layout_width="match_parent"
+            android:gravity="center"
+            android:textSize="24sp"
+            android:textColor="?android:attr/textColorPrimary"
+            android:layout_height="wrap_content"
+            android:text="@string/search_edu_primary" />
+
+        <TextView
+            style="@style/TextHeadline"
+            android:layout_width="match_parent"
+            android:gravity="center"
+            android:textSize="18sp"
+            android:layout_marginTop="30dp"
+            android:textColor="?android:attr/textColorPrimary"
+            android:layout_height="wrap_content"
+            android:text="@string/search_edu_secondary" />
+
+        <Button
+            android:id="@+id/dismiss_edu"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/dynamic_grid_edge_margin"
+            android:background="?android:attr/selectableItemBackground"
+            android:layout_height="wrap_content"
+            android:textColor="?android:attr/textColorPrimary"
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:text="@string/search_edu_dismiss" />
+
+    </LinearLayout>
+
+</com.android.launcher3.search.DeviceSearchEdu>
\ No newline at end of file
diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml
index 4b45b10d4d..9a4487c70d 100644
--- a/quickstep/res/values/strings.xml
+++ b/quickstep/res/values/strings.xml
@@ -93,6 +93,15 @@
     <!-- content description for hotseat items -->
     <string name="hotseat_prediction_content_description">Predicted app: <xliff:g id="title" example="Chrome">%1$s</xliff:g></string>
 
+    <!-- primary educational text shown for first time search users -->
+    <string name="search_edu_primary">Search your phone for apps, people, settings and more!</string>
+    <!-- secondary educational text shown for first time search users -->
+    <string name="search_edu_secondary">Tap keyboard search button to launch the first search
+        result.</string>
+
+    <!-- Dismiss button string for search education view -->
+    <string name="search_edu_dismiss">Got it.</string>
+
     <!-- Title shown during interactive part of Back gesture tutorial for right edge. [CHAR LIMIT=30] -->
     <string name="back_gesture_tutorial_playground_title_swipe_inward_right_edge" translatable="false">Try the back gesture</string>
     <!-- Subtitle shown during interactive parts of Back gesture tutorial for right edge. [CHAR LIMIT=60] -->
diff --git a/quickstep/src/com/android/launcher3/search/DeviceSearchEdu.java b/quickstep/src/com/android/launcher3/search/DeviceSearchEdu.java
new file mode 100644
index 0000000000..425e557ecb
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/search/DeviceSearchEdu.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.search;
+
+import static com.android.launcher3.util.OnboardingPrefs.SEARCH_EDU_SEEN;
+
+import android.animation.PropertyValuesHolder;
+import android.content.Context;
+import android.graphics.Rect;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.util.AttributeSet;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import androidx.core.graphics.ColorUtils;
+
+import com.android.launcher3.AbstractFloatingView;
+import com.android.launcher3.Insettable;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherState;
+import com.android.launcher3.R;
+import com.android.launcher3.anim.Interpolators;
+import com.android.launcher3.statemanager.StateManager;
+import com.android.launcher3.util.Themes;
+import com.android.launcher3.views.AbstractSlideInView;
+
+/**
+ * Feature education for on-device Search. Shown the first time user opens AllApps Search
+ */
+public class DeviceSearchEdu extends AbstractSlideInView implements
+        StateManager.StateListener<LauncherState>, TextWatcher, Insettable,
+        TextView.OnEditorActionListener {
+
+    private static final long ANIMATION_DURATION = 350;
+    private static final int ANIMATION_CONTENT_TRANSLATION = 200;
+
+    private EditText mEduInput;
+
+    private View mInputWrapper;
+    private EditText mSearchInput;
+
+    private boolean mSwitchFocusOnDismiss;
+
+
+    public DeviceSearchEdu(Context context) {
+        this(context, null, 0);
+    }
+
+    public DeviceSearchEdu(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public DeviceSearchEdu(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+
+    private void close(boolean animate, boolean markAsSeen) {
+        handleClose(animate);
+        if (markAsSeen) {
+            mLauncher.getOnboardingPrefs().markChecked(SEARCH_EDU_SEEN);
+        }
+    }
+
+    @Override
+    protected void handleClose(boolean animate) {
+        handleClose(animate, ANIMATION_DURATION);
+        mLauncher.getStateManager().removeStateListener(this);
+    }
+
+    @Override
+    protected boolean isOfType(int type) {
+        return false;
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mSearchInput = mLauncher.getAppsView().getSearchUiManager().getEditText();
+        mInputWrapper = findViewById(R.id.search_box_wrapper);
+        mContent = findViewById(R.id.edu_wrapper);
+
+        mEduInput = findViewById(R.id.mock_search_box);
+        mEduInput.setHint(R.string.all_apps_on_device_search_bar_hint);
+        mEduInput.addTextChangedListener(this);
+        if (mSearchInput != null) {
+            mEduInput.getLayoutParams().height = mSearchInput.getHeight();
+            mEduInput.setOnEditorActionListener(this);
+        } else {
+            mEduInput.setVisibility(INVISIBLE);
+        }
+
+        findViewById(R.id.dismiss_edu).setOnClickListener((view) -> {
+            mSwitchFocusOnDismiss = true;
+            close(true, true);
+        });
+    }
+
+    private void showInternal() {
+        mLauncher.getStateManager().addStateListener(this);
+        AbstractFloatingView.closeAllOpenViews(mLauncher);
+        attachToContainer();
+        if (mSearchInput != null) {
+            Rect r = mLauncher.getViewBounds(mSearchInput);
+            mEduInput.requestFocus();
+            InputMethodManager imm = mLauncher.getSystemService(InputMethodManager.class);
+            imm.showSoftInput(mEduInput, InputMethodManager.SHOW_IMPLICIT);
+            ((LayoutParams) mInputWrapper.getLayoutParams()).setMargins(0, r.top, 0, 0);
+        }
+        animateOpen();
+    }
+
+    @Override
+    protected int getScrimColor(Context context) {
+        return ColorUtils.setAlphaComponent(Themes.getAttrColor(context, R.attr.allAppsScrimColor),
+                230);
+    }
+
+    protected void setTranslationShift(float translationShift) {
+        mTranslationShift = translationShift;
+        mContent.setAlpha(getBoxedProgress(1 - mTranslationShift, .25f, 1));
+        mContent.setTranslationY(ANIMATION_CONTENT_TRANSLATION * translationShift);
+        if (mColorScrim != null) {
+            mColorScrim.setAlpha(getBoxedProgress(1 - mTranslationShift, 0, .75f));
+        }
+    }
+
+    /**
+     * Given input [0-1], returns progress within bounds [min,max] allowing for staged animations
+     */
+    private float getBoxedProgress(float input, float min, float max) {
+        if (input < min) return 0;
+        if (input > max) return 1;
+        return (input - min) / (max - min);
+    }
+
+    private void animateOpen() {
+        if (mIsOpen || mOpenCloseAnimator.isRunning()) {
+            return;
+        }
+        mIsOpen = true;
+        mOpenCloseAnimator.setValues(
+                PropertyValuesHolder.ofFloat(TRANSLATION_SHIFT, TRANSLATION_SHIFT_OPENED));
+        mOpenCloseAnimator.setInterpolator(Interpolators.FAST_OUT_SLOW_IN);
+        mOpenCloseAnimator.setDuration(ANIMATION_DURATION);
+        mOpenCloseAnimator.start();
+    }
+
+    /**
+     * Show On-device search education view.
+     */
+    public static void show(Launcher launcher) {
+        LayoutInflater layoutInflater = LayoutInflater.from(launcher);
+        ((DeviceSearchEdu) layoutInflater.inflate(
+                R.layout.search_edu_view, launcher.getDragLayer(),
+                false)).showInternal();
+    }
+
+    @Override
+    public void onStateTransitionStart(LauncherState toState) {
+        close(true, false);
+    }
+
+    @Override
+    protected void onCloseComplete() {
+        super.onCloseComplete();
+        if (mSearchInput != null && mSwitchFocusOnDismiss) {
+            mSearchInput.requestFocus();
+            mSearchInput.setSelection(mSearchInput.getText().length());
+        }
+    }
+
+    @Override
+    public void afterTextChanged(Editable editable) {
+        //Does nothing
+    }
+
+    @Override
+    public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+        //Does nothing
+    }
+
+    @Override
+    public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+        if (mSearchInput != null) {
+            mSearchInput.setText(charSequence.toString());
+            mSwitchFocusOnDismiss = true;
+            close(true, true);
+        }
+    }
+
+    @Override
+    public void setInsets(Rect insets) {
+
+    }
+
+    @Override
+    public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) {
+        mSearchInput.onEditorAction(i);
+        close(true, true);
+        return true;
+    }
+}
diff --git a/quickstep/src/com/android/launcher3/search/FallbackSearchInputView.java b/quickstep/src/com/android/launcher3/search/FallbackSearchInputView.java
new file mode 100644
index 0000000000..7b106228a8
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/search/FallbackSearchInputView.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.search;
+
+import static com.android.launcher3.LauncherState.ALL_APPS;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+
+import com.android.launcher3.ExtendedEditText;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.allapps.AllAppsContainerView;
+import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItem;
+import com.android.launcher3.allapps.AllAppsStore;
+import com.android.launcher3.allapps.AlphabeticalAppsList;
+import com.android.launcher3.allapps.FloatingHeaderView;
+import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+import com.android.launcher3.allapps.search.SearchAlgorithm;
+
+import java.util.ArrayList;
+
+/**
+ * A search view shown in all apps for on device search
+ */
+public class FallbackSearchInputView extends ExtendedEditText
+        implements AllAppsSearchBarController.Callbacks, AllAppsStore.OnUpdateListener {
+
+    private final AllAppsSearchBarController mSearchBarController;
+
+    private AlphabeticalAppsList mApps;
+    private Runnable mOnResultsChanged;
+    private AllAppsContainerView mAppsView;
+
+    public FallbackSearchInputView(Context context) {
+        this(context, null);
+    }
+
+    public FallbackSearchInputView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public FallbackSearchInputView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mSearchBarController = new AllAppsSearchBarController();
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        Launcher.getLauncher(getContext()).getAppsView().getAppsStore().addUpdateListener(this);
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        Launcher.getLauncher(getContext()).getAppsView().getAppsStore().removeUpdateListener(this);
+    }
+
+    /**
+     * Initializes SearchInput
+     */
+    public void initialize(AllAppsContainerView appsView, SearchAlgorithm algo, Runnable changed) {
+        mOnResultsChanged = changed;
+        mApps = appsView.getApps();
+        mAppsView = appsView;
+        mSearchBarController.initialize(algo, this, Launcher.getLauncher(getContext()), this);
+    }
+
+    @Override
+    public void onSearchResult(String query, ArrayList<AdapterItem> items) {
+        if (mApps != null && getParent() != null) {
+            mApps.setSearchResults(items);
+            notifyResultChanged();
+            collapseAppsViewHeader(true);
+            mAppsView.setLastSearchQuery(query);
+        }
+    }
+
+    @Override
+    public void onAppendSearchResult(String query, ArrayList<AdapterItem> items) {
+        if (mApps != null && getParent() != null) {
+            mApps.appendSearchResults(items);
+            notifyResultChanged();
+        }
+    }
+
+    @Override
+    public void clearSearchResult() {
+        if (getParent() != null && mApps != null) {
+            mApps.setSearchResults(null);
+            notifyResultChanged();
+            collapseAppsViewHeader(false);
+            mAppsView.onClearSearchResult();
+        }
+    }
+
+    @Override
+    public void onAppsUpdated() {
+        mSearchBarController.refreshSearchResult();
+    }
+
+    private void collapseAppsViewHeader(boolean collapse) {
+        FloatingHeaderView header = mAppsView.getFloatingHeaderView();
+        if (header != null) {
+            header.setCollapsed(collapse);
+        }
+    }
+
+    private void notifyResultChanged() {
+        if (mOnResultsChanged != null) {
+            mOnResultsChanged.run();
+        }
+        mAppsView.onSearchResultsChanged();
+    }
+
+    @Override
+    protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
+        // TODO: Consider animating the state transition here
+        if (focused) {
+            // Getting focus will open the keyboard. Go to the all-apps state, so that the input
+            // box is at the top and there is enough space below to show search results.
+            Launcher.getLauncher(getContext()).getStateManager().goToState(ALL_APPS, false);
+        }
+        super.onFocusChanged(focused, direction, previouslyFocusedRect);
+    }
+}
diff --git a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
index a85f0d2c49..9ee9f0094a 100644
--- a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
+++ b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
@@ -29,6 +29,7 @@ import com.android.launcher3.LauncherState;
 import com.android.launcher3.Workspace;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.hybridhotseat.HotseatPredictionController;
+import com.android.launcher3.search.DeviceSearchEdu;
 import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.statemanager.StateManager.StateListener;
 import com.android.launcher3.uioverrides.QuickstepLauncher;
@@ -41,6 +42,7 @@ import com.android.quickstep.views.AllAppsEduView;
  */
 public class QuickstepOnboardingPrefs extends OnboardingPrefs<QuickstepLauncher> {
 
+
     public QuickstepOnboardingPrefs(QuickstepLauncher launcher, SharedPreferences sharedPrefs) {
         super(launcher, sharedPrefs);
 
@@ -131,5 +133,18 @@ public class QuickstepOnboardingPrefs extends OnboardingPrefs<QuickstepLauncher>
                 }
             });
         }
+
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && !getBoolean(SEARCH_EDU_SEEN)) {
+            stateManager.addStateListener(new StateListener<LauncherState>() {
+                @Override
+                public void onStateTransitionStart(LauncherState toState) {
+                    if (toState == ALL_APPS) {
+                        mLauncher.getAllAppsController().getInsetController().setSearchEduRunnable(
+                                () -> DeviceSearchEdu.show(launcher));
+                        stateManager.removeStateListener(this);
+                    }
+                }
+            });
+        }
     }
 }
diff --git a/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java b/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
index 93da1c0dd6..1cf98e1c9b 100644
--- a/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
@@ -44,6 +44,8 @@ public class AllAppsInsetTransitionController {
     private WindowInsetsAnimationController mAnimationController;
     private WindowInsetsAnimationControlListener mCurrentRequest;
 
+    private Runnable mSearchEduRunnable;
+
     private float mAllAppsHeight;
 
     private int mDownInsetBottom;
@@ -55,12 +57,28 @@ public class AllAppsInsetTransitionController {
     private float mDown, mCurrent;
     private View mApps;
 
+    /**
+     *
+     */
+    public boolean showSearchEduIfNecessary() {
+        if (mSearchEduRunnable == null) {
+            return false;
+        }
+        mSearchEduRunnable.run();
+        return true;
+    }
+
+    public void setSearchEduRunnable(Runnable eduRunnable) {
+        mSearchEduRunnable = eduRunnable;
+    }
+
     // Only purpose of these states is to keep track of fast fling transition
     enum State {
         RESET, DRAG_START_BOTTOM, DRAG_START_BOTTOM_IME_CANCELLED,
         FLING_END_TOP, FLING_END_TOP_IME_CANCELLED,
         DRAG_START_TOP, FLING_END_BOTTOM
     }
+
     private State mState;
 
     public AllAppsInsetTransitionController(float allAppsHeight, View appsView) {
@@ -77,7 +95,7 @@ public class AllAppsInsetTransitionController {
         boolean imeVisible = insets.isVisible(WindowInsets.Type.ime());
 
         if (DEBUG) {
-            Log.d(TAG, "\nhide imeVisible=" +  imeVisible);
+            Log.d(TAG, "\nhide imeVisible=" + imeVisible);
         }
         if (insets.isVisible(WindowInsets.Type.ime())) {
             mApps.getWindowInsetsController().hide(WindowInsets.Type.ime());
@@ -107,7 +125,7 @@ public class AllAppsInsetTransitionController {
         // mShownAtDown = mApps.getRootWindowInsets().isVisible(WindowInsets.Type.ime());
 
         if (DEBUG) {
-            Log.d(TAG, "\nonDragStart progress=" +  progress
+            Log.d(TAG, "\nonDragStart progress=" + progress
                     + " mDownInsets=" + mDownInsetBottom
                     + " mShownAtDown=" + mShownAtDown);
         }
@@ -123,7 +141,7 @@ public class AllAppsInsetTransitionController {
                         }
                         if (controller != null) {
                             if (mCurrentRequest == this && !handleFinishOnFling(controller)) {
-                                    mAnimationController = controller;
+                                mAnimationController = controller;
                             } else {
                                 controller.finish(false /* just don't show */);
                             }
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index c03619e198..2f805fd550 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -270,11 +270,10 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
             if (Float.compare(mProgress, 0f) == 0) {
                 mLauncher.getLiveSearchManager().start();
                 EditText editText = mAppsView.getSearchUiManager().getEditText();
-                if (editText != null) {
+                if (editText != null && !mInsetController.showSearchEduIfNecessary()) {
                     editText.requestFocus();
                 }
-            }
-            else {
+            } else {
                 mLauncher.getLiveSearchManager().stop();
             }
             // TODO: should make the controller hide synchronously
diff --git a/src/com/android/launcher3/util/OnboardingPrefs.java b/src/com/android/launcher3/util/OnboardingPrefs.java
index 14df0f3ae2..2e279fa7d3 100644
--- a/src/com/android/launcher3/util/OnboardingPrefs.java
+++ b/src/com/android/launcher3/util/OnboardingPrefs.java
@@ -36,13 +36,15 @@ public class OnboardingPrefs<T extends Launcher> {
     public static final String HOME_BOUNCE_COUNT = "launcher.home_bounce_count";
     public static final String HOTSEAT_DISCOVERY_TIP_COUNT = "launcher.hotseat_discovery_tip_count";
     public static final String HOTSEAT_LONGPRESS_TIP_SEEN = "launcher.hotseat_longpress_tip_seen";
+    public static final String SEARCH_EDU_SEEN = "launcher.search_edu";
 
     /**
      * Events that either have happened or have not (booleans).
      */
     @StringDef(value = {
             HOME_BOUNCE_SEEN,
-            HOTSEAT_LONGPRESS_TIP_SEEN
+            HOTSEAT_LONGPRESS_TIP_SEEN,
+            SEARCH_EDU_SEEN
     })
     @Retention(RetentionPolicy.SOURCE)
     public @interface EventBoolKey {}
diff --git a/src/com/android/launcher3/views/AbstractSlideInView.java b/src/com/android/launcher3/views/AbstractSlideInView.java
index 11c10293e4..e08f881bab 100644
--- a/src/com/android/launcher3/views/AbstractSlideInView.java
+++ b/src/com/android/launcher3/views/AbstractSlideInView.java
@@ -64,7 +64,7 @@ public abstract class AbstractSlideInView extends AbstractFloatingView
     protected final ObjectAnimator mOpenCloseAnimator;
 
     protected View mContent;
-    private final View mColorScrim;
+    protected final View mColorScrim;
     protected Interpolator mScrollInterpolator;
 
     // range [0, 1], 0=> completely open, 1=> completely closed
@@ -216,7 +216,6 @@ public abstract class AbstractSlideInView extends AbstractFloatingView
         return mLauncher.getDragLayer();
     }
 
-
     protected static View createColorScrim(Context context, int bgColor) {
         View view = new View(context);
         view.forceHasOverlappingRendering(false);
-- 
GitLab


From 417bd72b71d6e97c2030653ea56626b5235d1e0e Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Tue, 26 Jan 2021 15:22:18 +0000
Subject: [PATCH 0424/1664] Revert "Use Diplay.getMetrics in DisplayController"

This reverts commit acfac6187dd9d13d55b566a77a5da867a1813573.

Reason for revert: b/176656141

Bug: 176656141
Change-Id: Ic28e50779811d18450000efc2cdfd8184a931bbb
---
 .../launcher3/InvariantDeviceProfile.java     |  2 +-
 .../launcher3/util/DisplayController.java     | 37 ++++++++-----------
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index 1d88e83f16..5fd9e01b2e 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -202,7 +202,7 @@ public class InvariantDeviceProfile {
                 DisplayController.getDefaultDisplay(context).getInfo(),
                 getPredefinedDeviceProfiles(context, gridName));
 
-        Info myInfo = new Info(display);
+        Info myInfo = new Info(context, display);
         DisplayOption myDisplayOption = invDistWeightedInterpolate(
                 myInfo, getPredefinedDeviceProfiles(context, gridName));
 
diff --git a/src/com/android/launcher3/util/DisplayController.java b/src/com/android/launcher3/util/DisplayController.java
index 3ab736a814..355c949325 100644
--- a/src/com/android/launcher3/util/DisplayController.java
+++ b/src/com/android/launcher3/util/DisplayController.java
@@ -31,8 +31,6 @@ import android.view.Display;
 
 import androidx.annotation.VisibleForTesting;
 
-import com.android.launcher3.Utilities;
-
 import java.util.ArrayList;
 
 /**
@@ -159,13 +157,13 @@ public class DisplayController implements DisplayListener {
         private final ArrayList<DisplayInfoChangeListener> mListeners = new ArrayList<>();
         private DisplayController.Info mInfo;
 
-        private DisplayHolder(Context displayContext, Display display) {
+        private DisplayHolder(Context displayContext) {
             mDisplayContext = displayContext;
             // Note that the Display object must be obtained from DisplayManager which is
             // associated to the display context, so the Display is isolated from Activity and
             // Application to provide the actual state of device that excludes the additional
             // adjustment and override.
-            mInfo = new DisplayController.Info(display);
+            mInfo = new DisplayController.Info(mDisplayContext);
             mId = mInfo.id;
         }
 
@@ -182,31 +180,22 @@ public class DisplayController implements DisplayListener {
         }
 
         protected void handleOnChange() {
-            Display display = Utilities.ATLEAST_R
-                    ? mDisplayContext.getDisplay()
-                    : mDisplayContext
-                        .getSystemService(DisplayManager.class)
-                        .getDisplay(mId);
-            if (display == null) {
-                return;
-            }
-
             Info oldInfo = mInfo;
-            Info newInfo = new Info(display);
+            Info info = new Info(mDisplayContext);
 
             int change = 0;
-            if (newInfo.hasDifferentSize(oldInfo)) {
+            if (info.hasDifferentSize(oldInfo)) {
                 change |= CHANGE_SIZE;
             }
-            if (newInfo.rotation != oldInfo.rotation) {
+            if (oldInfo.rotation != info.rotation) {
                 change |= CHANGE_ROTATION;
             }
-            if (newInfo.singleFrameMs != oldInfo.singleFrameMs) {
+            if (info.singleFrameMs != oldInfo.singleFrameMs) {
                 change |= CHANGE_FRAME_DELAY;
             }
 
             if (change != 0) {
-                mInfo = newInfo;
+                mInfo = info;
                 final int flags = change;
                 MAIN_EXECUTOR.execute(() -> notifyChange(flags));
             }
@@ -227,7 +216,7 @@ public class DisplayController implements DisplayListener {
             // Use application context to create display context so that it can have its own
             // Resources.
             Context displayContext = context.getApplicationContext().createDisplayContext(display);
-            return new DisplayHolder(displayContext, display);
+            return new DisplayHolder(displayContext);
         }
     }
 
@@ -255,7 +244,12 @@ public class DisplayController implements DisplayListener {
             this.metrics = metrics;
         }
 
-        public Info(Display display) {
+        private Info(Context context) {
+            this(context, context.getSystemService(DisplayManager.class)
+                    .getDisplay(DEFAULT_DISPLAY));
+        }
+
+        public Info(Context context, Display display) {
             id = display.getDisplayId();
             rotation = display.getRotation();
 
@@ -268,8 +262,7 @@ public class DisplayController implements DisplayListener {
             display.getRealSize(realSize);
             display.getCurrentSizeRange(smallestSize, largestSize);
 
-            metrics = new DisplayMetrics();
-            display.getMetrics(metrics);
+            metrics = context.getResources().getDisplayMetrics();
         }
 
         private boolean hasDifferentSize(Info info) {
-- 
GitLab


From 29cd32706681a2790e0b461fe589c4496d73199a Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Tue, 26 Jan 2021 15:06:11 -0800
Subject: [PATCH 0425/1664] Inherit theme colors on app drawer and folder

This way, changes on Theme.DeviceDefault will be reflected on launcher
as well.

Bug: 173561945
Test: visual
Change-Id: I297560253242476f34c47fcd845c44e96873a8b2
(cherry picked from commit fc82c5a92076116b16d0b1b6c4eb6acf5120b8bb)
---
 res/values/styles.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 067cf7feac..dc7182fe90 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -31,7 +31,7 @@
 
     <style name="LauncherTheme" parent="@style/BaseLauncherTheme">
         <item name="android:textColorSecondary">#DE000000</item>
-        <item name="allAppsScrimColor">#FFFFFFFF</item>
+        <item name="allAppsScrimColor">?android:attr/colorBackgroundFloating</item>
         <item name="allAppsInterimScrimAlpha">46</item>
         <item name="allAppsNavBarScrimColor">#66FFFFFF</item>
         <item name="allAppsTheme">@style/AllAppsTheme</item>
@@ -47,9 +47,9 @@
         <item name="workspaceStatusBarScrim">@drawable/workspace_bg</item>
         <item name="widgetsTheme">@style/WidgetContainerTheme</item>
         <item name="folderDotColor">?android:attr/colorPrimary</item>
-        <item name="folderFillColor">#CDFFFFFF</item>
+        <item name="folderFillColor">?android:attr/colorBackground</item>
         <item name="folderIconBorderColor">?android:attr/colorPrimary</item>
-        <item name="folderTextColor">#FF212121</item>
+        <item name="folderTextColor">?android:attr/textColorPrimary</item>
         <item name="folderHintColor">#89616161</item>
         <item name="loadingIconColor">#CCFFFFFF</item>
         <item name="iconOnlyShortcutColor">?android:attr/textColorSecondary</item>
@@ -94,7 +94,7 @@
         <item name="android:textColorHint">#A0FFFFFF</item>
         <item name="android:colorControlHighlight">#A0FFFFFF</item>
         <item name="android:colorPrimary">#FF212121</item>
-        <item name="allAppsScrimColor">#FF000000</item>
+        <item name="allAppsScrimColor">?android:attr/colorBackgroundFloating</item>
         <item name="allAppsInterimScrimAlpha">102</item>
         <item name="allAppsNavBarScrimColor">#80000000</item>
         <item name="allAppsTheme">@style/AllAppsTheme.Dark</item>
@@ -102,10 +102,10 @@
         <item name="popupColorSecondary">#202124</item>
         <item name="popupColorTertiary">#757575</item> <!-- Gray 600 -->
         <item name="widgetsTheme">@style/WidgetContainerTheme.Dark</item>
-        <item name="folderDotColor">#FF464646</item>
-        <item name="folderFillColor">#DD3C4043</item> <!-- 87% GM2 800 -->
-        <item name="folderIconBorderColor">#FF80868B</item>
-        <item name="folderTextColor">@android:color/white</item>
+        <item name="folderDotColor">?android:attr/colorPrimary</item>
+        <item name="folderFillColor">?android:attr/colorBackground</item>
+        <item name="folderIconBorderColor">?android:attr/colorPrimary</item>
+        <item name="folderTextColor">?android:attr/textColorPrimary</item>
         <item name="folderHintColor">#89CCCCCC</item>
         <item name="isMainColorDark">true</item>
         <item name="loadingIconColor">#99FFFFFF</item>
-- 
GitLab


From 311f8badcbb98de863b8e9484faea221768cc43f Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 26 Jan 2021 13:17:41 -0800
Subject: [PATCH 0426/1664] Enabling plugins on Launcher debug builds

Test: Verified on device
Change-Id: I1ffeee62ad96b18ee8006349afaf14b067f56a69
---
 .../launcher3/uioverrides/plugins/PluginInitializerImpl.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginInitializerImpl.java b/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginInitializerImpl.java
index 7beb9db841..d14e8efdd6 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginInitializerImpl.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginInitializerImpl.java
@@ -19,6 +19,7 @@ import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 import android.content.Context;
 import android.os.Looper;
 
+import com.android.launcher3.Utilities;
 import com.android.systemui.shared.plugins.PluginInitializer;
 
 public class PluginInitializerImpl implements PluginInitializer {
@@ -44,4 +45,8 @@ public class PluginInitializerImpl implements PluginInitializer {
     @Override
     public void handleWtfs() {
     }
+
+    public boolean isDebuggable() {
+        return Utilities.IS_DEBUG_DEVICE;
+    }
 }
-- 
GitLab


From f72c36801748cf0c32d70341f94b895ec8a3b2b7 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Mon, 11 Jan 2021 13:59:07 -0800
Subject: [PATCH 0427/1664] Adding quickstep specific permissions to Launcher

Bug: 177096054
Test: Manual
Change-Id: Ife5d7c8207e70e4b184b18fcfe71548ec9616dd4
---
 quickstep/AndroidManifest.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml
index d95cc01427..9c14b8510e 100644
--- a/quickstep/AndroidManifest.xml
+++ b/quickstep/AndroidManifest.xml
@@ -31,6 +31,15 @@
     <uses-permission android:name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS"/>
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
+    <uses-permission android:name="android.permission.START_TASKS_FROM_RECENTS"/>
+    <uses-permission android:name="android.permission.REMOVE_TASKS"/>
+    <uses-permission android:name="android.permission.MANAGE_ACTIVITY_TASKS"/>
+    <uses-permission android:name="android.permission.STATUS_BAR"/>
+    <uses-permission android:name="android.permission.STOP_APP_SWITCHES"/>
+    <uses-permission android:name="android.permission.SET_ORIENTATION"/>
+    <uses-permission android:name="android.permission.READ_FRAME_BUFFER"/>
+    <uses-permission android:name="android.permission.MANAGE_ACCESSIBILITY"/>
+
     <uses-permission android:name="${packageName}.permission.HOTSEAT_EDU" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
-- 
GitLab


From 7575cca264263b209a109188b813c74dff6b93a9 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Fri, 22 Jan 2021 20:31:50 -0800
Subject: [PATCH 0428/1664] Support ACTION/THUMBNAIL/SUGGEST corpus for
 rendering rendering

Hookup notifyEvent for metrics, on device intelligence.


Bug: 178454668
Bug: 178455221

Test: manual (See attached screenshots in the bug)

Change-Id: I652b4f2b0644a4726ccc3e01ce4c945a719f96a8
Signed-off-by: Hyunyoung Song <hyunyoungs@google.com>
---
 .../res/layout/search_result_suggest.xml      |  34 ----
 .../res/layout/search_result_thumbnail.xml    |   2 +-
 .../search/DeviceSearchAdapterProvider.java   |  35 ++--
 .../launcher3/search/SearchAdapterItem.java   |   5 +-
 .../launcher3/search/SearchResultIcon.java    |  89 ++++++---
 .../launcher3/search/SearchResultIconRow.java |  19 +-
 .../search/SearchResultIconSlice.java         |  32 +--
 .../search/SearchResultPeopleView.java        |  18 +-
 .../search/SearchResultSuggestion.java        |  63 ------
 .../search/SearchResultThumbnailView.java     |  99 ++++++++++
 .../launcher3/search/SearchResultWidget.java  |  57 ++----
 .../search/SearchResultWidgetPreview.java     |  31 +--
 .../search/SearchSectionHeaderView.java       |  17 +-
 .../search/SearchServicePipeline.java         |  26 ++-
 .../search/SearchSessionTracker.java          |  76 ++++++++
 .../launcher3/search/SearchTargetHandler.java |  27 ++-
 .../launcher3/search/SearchTargetUtil.java    | 184 ++++++++++++++++++
 .../search/ThumbnailSearchResultView.java     |  47 -----
 .../allapps/search/SearchAdapterProvider.java |   1 -
 .../model/data/SearchActionItemInfo.java      |  29 ++-
 .../launcher3/touch/ItemClickHandler.java     |   6 +-
 21 files changed, 583 insertions(+), 314 deletions(-)
 delete mode 100644 quickstep/res/layout/search_result_suggest.xml
 delete mode 100644 quickstep/src/com/android/launcher3/search/SearchResultSuggestion.java
 create mode 100644 quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java
 create mode 100644 quickstep/src/com/android/launcher3/search/SearchSessionTracker.java
 create mode 100644 quickstep/src/com/android/launcher3/search/SearchTargetUtil.java
 delete mode 100644 quickstep/src/com/android/launcher3/search/ThumbnailSearchResultView.java

diff --git a/quickstep/res/layout/search_result_suggest.xml b/quickstep/res/layout/search_result_suggest.xml
deleted file mode 100644
index eb5313c36b..0000000000
--- a/quickstep/res/layout/search_result_suggest.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.launcher3.search.SearchResultSuggestion xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res-auto"
-    style="@style/BaseIcon"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:gravity="start|center_vertical"
-    android:textAlignment="viewStart"
-    android:textColor="?android:attr/textColorPrimary"
-    android:textSize="18sp"
-    android:padding="@dimen/dynamic_grid_edge_margin"
-    launcher:iconDisplay="hero_app"
-    android:drawableTint="?android:attr/textColorPrimary"
-    launcher:customIcon="@drawable/ic_allapps_search"
-    launcher:iconSizeOverride="24dp"
-    launcher:matchTextInsetWithQuery="true"
-    launcher:layoutHorizontal="true"
-    android:drawablePadding="@dimen/dynamic_grid_icon_drawable_padding">
-
-</com.android.launcher3.search.SearchResultSuggestion>
\ No newline at end of file
diff --git a/quickstep/res/layout/search_result_thumbnail.xml b/quickstep/res/layout/search_result_thumbnail.xml
index 0f253360f0..5062b76164 100644
--- a/quickstep/res/layout/search_result_thumbnail.xml
+++ b/quickstep/res/layout/search_result_thumbnail.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher3.search.ThumbnailSearchResultView
+<com.android.launcher3.search.SearchResultThumbnailView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="125dp"
     android:layout_height="125dp"/>
\ No newline at end of file
diff --git a/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java b/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
index 834a624fef..1e6243ce76 100644
--- a/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
+++ b/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
@@ -18,7 +18,11 @@ package com.android.launcher3.search;
 
 import static com.android.launcher3.allapps.AllAppsGridAdapter.VIEW_TYPE_ICON;
 
+import android.app.search.Query;
+import android.app.search.SearchSession;
 import android.app.search.SearchTarget;
+import android.app.search.SearchTargetEvent;
+import android.util.Log;
 import android.util.SparseIntArray;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -30,7 +34,6 @@ import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.allapps.AllAppsGridAdapter;
 import com.android.launcher3.allapps.search.SearchAdapterProvider;
-import com.android.launcher3.config.FeatureFlags;
 
 /**
  * Provides views for on-device search results
@@ -43,12 +46,12 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
     public static final int VIEW_TYPE_SEARCH_ICON_ROW = (1 << 9);
     public static final int VIEW_TYPE_SEARCH_PEOPLE = 1 << 11;
     public static final int VIEW_TYPE_SEARCH_THUMBNAIL = 1 << 12;
-    public static final int VIEW_TYPE_SEARCH_SUGGEST = 1 << 13;
     public static final int VIEW_TYPE_SEARCH_WIDGET_LIVE = 1 << 15;
     public static final int VIEW_TYPE_SEARCH_WIDGET_PREVIEW = 1 << 16;
 
-    private final AllAppsContainerView mAppsView;
+    private static final String TAG = "SearchServiceAdapterProvider";
 
+    private final AllAppsContainerView mAppsView;
     private final SparseIntArray mViewTypeToLayoutMap = new SparseIntArray();
 
     public DeviceSearchAdapterProvider(Launcher launcher, AllAppsContainerView appsView) {
@@ -61,7 +64,6 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_SLICE, R.layout.search_result_slice);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_PEOPLE, R.layout.search_result_people_item);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_THUMBNAIL, R.layout.search_result_thumbnail);
-        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_SUGGEST, R.layout.search_result_suggest);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_WIDGET_LIVE, R.layout.search_result_widget_live);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_WIDGET_PREVIEW,
                 R.layout.search_result_widget_preview);
@@ -74,11 +76,7 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
         SearchTargetHandler
                 payloadResultView =
                 (SearchTargetHandler) holder.itemView;
-        if (!FeatureFlags.USE_SEARCH_API.get()) {
-            payloadResultView.applySearchTarget(item.getSearchTargetLegacy());
-        } else {
-            payloadResultView.applySearchTarget(item.getSearchTarget(), item.getInlineItems());
-        }
+        payloadResultView.apply(item.getSearchTarget(), item.getInlineItems());
     }
 
     @Override
@@ -113,7 +111,8 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
 
     /**
      * Determines what view type should be used to present search target.
-     * Returns -1 if viewType is not found
+     * Returns -1 if viewType is not found or if required field is not present
+     * to render the viewType.
      */
     public int getViewTypeForSearchTarget(SearchTarget t) {
         switch (t.getLayoutType()) {
@@ -122,14 +121,20 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
             case LayoutType.ICON_SINGLE_VERTICAL_TEXT:
                 return VIEW_TYPE_SEARCH_ICON;
             case LayoutType.ICON_SLICE:
-                return VIEW_TYPE_SEARCH_SLICE;
-            case LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT_BUTTON:
+                if (t.getSliceUri() != null) {
+                    return VIEW_TYPE_SEARCH_SLICE;
+                }
+                Log.w(TAG, "Dropping as LayoutType.ICON_SLICE target doesn't contain sliceUri.");
             case LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT:
             case LayoutType.ICON_SINGLE_HORIZONTAL_TEXT:
                 return VIEW_TYPE_SEARCH_ICON_ROW;
-            default:
-                return -1;
-
+            case LayoutType.THUMBNAIL:
+                if (t.getSearchAction() != null) {
+                    return VIEW_TYPE_SEARCH_THUMBNAIL;
+                }
+                Log.w(TAG, "Dropping as LayoutType.THUMBNAIL target doesn't contain searchAction.");
         }
+
+        return -1;
     }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java b/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
index 01b1999807..0eb3edb555 100644
--- a/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
+++ b/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
@@ -20,7 +20,6 @@ import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_ICON_ROW;
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_PEOPLE;
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_SLICE;
-import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_SUGGEST;
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_THUMBNAIL;
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_WIDGET_LIVE;
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_WIDGET_PREVIEW;
@@ -45,15 +44,13 @@ public class SearchAdapterItem extends AllAppsGridAdapter.AdapterItem {
     private static final int AVAILABLE_FOR_ACCESSIBILITY =
             VIEW_TYPE_SEARCH_SLICE | VIEW_TYPE_SEARCH_PEOPLE | VIEW_TYPE_SEARCH_THUMBNAIL
                     | VIEW_TYPE_SEARCH_ICON_ROW | VIEW_TYPE_SEARCH_ICON
-                    | VIEW_TYPE_SEARCH_WIDGET_PREVIEW | VIEW_TYPE_SEARCH_WIDGET_LIVE
-                    | VIEW_TYPE_SEARCH_SUGGEST;
+                    | VIEW_TYPE_SEARCH_WIDGET_PREVIEW | VIEW_TYPE_SEARCH_WIDGET_LIVE;
 
     public SearchAdapterItem(SearchTargetLegacy searchTargetLegacy, int type) {
         mSearchTargetLegacy = searchTargetLegacy;
         viewType = type;
     }
 
-
     public SearchAdapterItem(SearchTarget searchTarget, int type) {
         mSearchTarget = searchTarget;
         viewType = type;
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
index 0b8d3cb88a..3d89ac5e27 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
@@ -15,11 +15,18 @@
  */
 package com.android.launcher3.search;
 
+import static com.android.launcher3.model.data.SearchActionItemInfo.FLAG_BADGE_FROM_ICON;
+import static com.android.launcher3.model.data.SearchActionItemInfo.FLAG_PRIMARY_ICON_FROM_TITLE;
+import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_BADGE_FROM_ICON;
+import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE;
+import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_SHOULD_START;
+import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_SHOULD_START_FOR_RESULT;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
 import android.app.search.SearchAction;
 import android.app.search.SearchTarget;
+import android.app.search.SearchTargetEvent;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.ShortcutInfo;
@@ -37,12 +44,14 @@ import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.allapps.AllAppsStore;
+import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.model.data.SearchActionItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.launcher3.touch.ItemClickHandler;
 import com.android.launcher3.touch.ItemLongClickListener;
 import com.android.launcher3.util.ComponentKey;
 
@@ -52,17 +61,14 @@ import java.util.function.Consumer;
 /**
  * A {@link BubbleTextView} representing a single cell result in AllApps
  */
-public class SearchResultIcon extends BubbleTextView implements
-        SearchTargetHandler, View.OnClickListener,
-        View.OnLongClickListener {
-
-    private static final String BUNDLE_EXTRA_SHOULD_START = "should_start";
-    private static final String BUNDLE_EXTRA_SHOULD_START_FOR_RESULT = "should_start_for_result";
+public class SearchResultIcon extends BubbleTextView implements SearchTargetHandler {
 
     private final Launcher mLauncher;
 
+    private String mTargetId;
     private Consumer<ItemInfoWithIcon> mOnItemInfoChanged;
 
+
     public SearchResultIcon(Context context) {
         this(context, null, 0);
     }
@@ -96,34 +102,34 @@ public class SearchResultIcon extends BubbleTextView implements
     public void applySearchTarget(SearchTarget searchTarget, List<SearchTarget> inlineItems,
             Consumer<ItemInfoWithIcon> cb) {
         mOnItemInfoChanged = cb;
-        applySearchTarget(searchTarget, inlineItems);
+        apply(searchTarget, inlineItems);
     }
 
     @Override
-    public void applySearchTarget(SearchTarget parentTarget, List<SearchTarget> children) {
-        switch (parentTarget.getResultType()) {
-            case ResultType.APPLICATION:
-                prepareUsingApp(new ComponentName(parentTarget.getPackageName(),
-                        parentTarget.getExtras().getString("class")), parentTarget.getUserHandle());
-                mLongPressSupported = true;
-                break;
-            case ResultType.SHORTCUT:
-                prepareUsingShortcutInfo(parentTarget.getShortcutInfo());
-                mLongPressSupported = true;
-                break;
-            default:
-                prepareUsingSearchAction(parentTarget);
-                mLongPressSupported = false;
-                break;
+    public void apply(SearchTarget parentTarget, List<SearchTarget> children) {
+        mTargetId = parentTarget.getId();
+        if (parentTarget.getShortcutInfo() != null) {
+            prepareUsingShortcutInfo(parentTarget.getShortcutInfo());
+            mLongPressSupported = true;
+        } else if (parentTarget.getSearchAction() != null) {
+            prepareUsingSearchAction(parentTarget);
+            mLongPressSupported = false;
+        } else {
+            prepareUsingApp(new ComponentName(parentTarget.getPackageName(),
+                    parentTarget.getExtras().getString(SearchTargetUtil.EXTRA_CLASS)),
+                    parentTarget.getUserHandle());
+            mLongPressSupported = true;
         }
     }
 
     private void prepareUsingSearchAction(SearchTarget searchTarget) {
         SearchAction searchAction = searchTarget.getSearchAction();
         Bundle extras = searchAction.getExtras();
+
         SearchActionItemInfo itemInfo = new SearchActionItemInfo(searchAction.getIcon(),
                 searchTarget.getPackageName(), searchTarget.getUserHandle(),
-                searchAction.getTitle());
+                searchAction.getTitle()
+        );
         itemInfo.setIntent(searchAction.getIntent());
         itemInfo.setPendingIntent(searchAction.getPendingIntent());
 
@@ -136,7 +142,12 @@ public class SearchResultIcon extends BubbleTextView implements
         } else if (extras != null && extras.getBoolean(BUNDLE_EXTRA_SHOULD_START)) {
             itemInfo.setFlags(SearchActionItemInfo.FLAG_SHOULD_START);
         }
-
+        if (extras != null && extras.getBoolean(BUNDLE_EXTRA_BADGE_FROM_ICON)) {
+            itemInfo.setFlags(FLAG_BADGE_FROM_ICON);
+        }
+        if (extras != null && extras.getBoolean(BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE)) {
+            itemInfo.setFlags(FLAG_PRIMARY_ICON_FROM_TITLE);
+        }
 
         notifyItemInfoChanged(itemInfo);
         LauncherAppState appState = LauncherAppState.getInstance(mLauncher);
@@ -144,17 +155,33 @@ public class SearchResultIcon extends BubbleTextView implements
             try (LauncherIcons li = LauncherIcons.obtain(getContext())) {
                 Icon icon = searchTarget.getSearchAction().getIcon();
                 Drawable d;
+                // This bitmapInfo can be used as main icon or as a badge
+                BitmapInfo bitmapInfo;
                 if (icon == null) {
                     PackageItemInfo pkgInfo = new PackageItemInfo(searchTarget.getPackageName());
                     pkgInfo.user = searchTarget.getUserHandle();
                     appState.getIconCache().getTitleAndIconForApp(pkgInfo, false);
-                    itemInfo.bitmap = pkgInfo.bitmap;
+                    bitmapInfo = pkgInfo.bitmap;
                 } else {
                     d = itemInfo.getIcon().loadDrawable(getContext());
-                    itemInfo.bitmap = li.createBadgedIconBitmap(d, itemInfo.user,
+                    bitmapInfo = li.createBadgedIconBitmap(d, itemInfo.user,
                             Build.VERSION.SDK_INT);
                 }
 
+                BitmapInfo bitmapMainIcon;
+                if (itemInfo.hasFlags(FLAG_PRIMARY_ICON_FROM_TITLE)) {
+                    bitmapMainIcon = li.createIconBitmap(
+                            String.valueOf(itemInfo.title.charAt(0)),
+                            bitmapInfo.color);
+                } else {
+                    bitmapMainIcon = bitmapInfo;
+                }
+                if (itemInfo.hasFlags(FLAG_BADGE_FROM_ICON)) {
+                    itemInfo.bitmap = li.badgeBitmap(bitmapMainIcon.icon, bitmapInfo);
+                } else {
+                    itemInfo.bitmap = bitmapInfo;
+                }
+
             }
             MAIN_EXECUTOR.post(() -> applyFromSearchActionItemInfo(itemInfo));
         });
@@ -185,26 +212,28 @@ public class SearchResultIcon extends BubbleTextView implements
 
     @Override
     public boolean quickSelect() {
-        //TODO: event reporting
         this.performClick();
+        notifyEvent(mLauncher, mTargetId, SearchTargetEvent.ACTION_LAUNCH_KEYBOARD_FOCUS);
         return true;
     }
 
     @Override
     public void onClick(View view) {
-        //TODO: event reporting
-        mLauncher.getItemOnClickListener().onClick(this);
+        ItemClickHandler.INSTANCE.onClick(view);
+        notifyEvent(mLauncher, mTargetId, SearchTargetEvent.ACTION_LAUNCH_TOUCH);
     }
 
     @Override
     public boolean onLongClick(View view) {
-        //TODO: event reporting
         if (!mLongPressSupported) {
             return false;
         }
+        notifyEvent(mLauncher, mTargetId, SearchTargetEvent.ACTION_LONGPRESS);
         return ItemLongClickListener.INSTANCE_ALL_APPS.onLongClick(this);
     }
 
+
+
     private void notifyItemInfoChanged(ItemInfoWithIcon itemInfoWithIcon) {
         if (mOnItemInfoChanged != null) {
             mOnItemInfoChanged.accept(itemInfoWithIcon);
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java b/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
index 4fb668e81d..66214f36bf 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
@@ -23,6 +23,7 @@ import android.content.Context;
 import android.content.pm.ShortcutInfo;
 import android.text.TextUtils;
 import android.util.AttributeSet;
+import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -92,6 +93,7 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan
         mInlineIcons[1] = findViewById(R.id.shortcut_1);
         for (SearchResultIcon inlineIcon : mInlineIcons) {
             inlineIcon.getLayoutParams().width = getIconSize();
+            // TODO: inlineIcon.setOnClickListener();
         }
 
         setOnClickListener(mResultIcon);
@@ -99,7 +101,7 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan
     }
 
     @Override
-    public void applySearchTarget(SearchTarget parentTarget, List<SearchTarget> children) {
+    public void apply(SearchTarget parentTarget, List<SearchTarget> children) {
         mResultIcon.applySearchTarget(parentTarget, children, this::onItemInfoCreated);
         if (parentTarget.getShortcutInfo() != null) {
             updateWithShortcutInfo(parentTarget.getShortcutInfo());
@@ -127,7 +129,6 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan
         });
     }
 
-
     protected void showSubtitleIfNeeded(CharSequence subTitle) {
         if (!TextUtils.isEmpty(subTitle)) {
             mSubTitleView.setText(subTitle);
@@ -137,11 +138,10 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan
         }
     }
 
-
     protected void showInlineItems(List<SearchTarget> children) {
         for (int i = 0; i < MAX_INLINE_ITEMS; i++) {
             if (i < children.size()) {
-                mInlineIcons[i].applySearchTarget(children.get(0), new ArrayList<>());
+                mInlineIcons[i].apply(children.get(0), new ArrayList<>());
                 mInlineIcons[i].setVisibility(VISIBLE);
             } else {
                 mInlineIcons[i].setVisibility(GONE);
@@ -153,4 +153,15 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan
         setTag(info);
         mTitleView.setText(info.title);
     }
+
+    @Override
+    public void onClick(View view) {
+        // do nothing.
+    }
+
+    @Override
+    public boolean onLongClick(View view) {
+        // do nothing.
+        return false;
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java b/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java
index e6c952fcb6..f6e5eba9a3 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java
@@ -18,10 +18,11 @@ package com.android.launcher3.search;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
 import android.app.search.SearchTarget;
+import android.app.search.SearchTargetEvent;
 import android.content.Context;
-import android.net.Uri;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.view.View;
 import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
@@ -36,7 +37,6 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.model.data.PackageItemInfo;
-import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -44,17 +44,17 @@ import java.util.List;
 /**
  * A slice view wrapper with settings app icon at start
  */
-public class SearchResultIconSlice extends LinearLayout implements
-        SearchTargetHandler, SliceView.OnSliceActionListener {
+public class SearchResultIconSlice extends LinearLayout implements SearchTargetHandler,
+        SliceView.OnSliceActionListener {
 
     private static final String TAG = "SearchSliceController";
-    private static final String URI_EXTRA_KEY = "slice_uri";
+
+    private final Launcher mLauncher;
 
     private SliceView mSliceView;
     private SearchResultIcon mIcon;
     private LiveData<Slice> mSliceLiveData;
-    private SearchTargetLegacy mSearchTarget;
-    private final Launcher mLauncher;
+    private String mTargetId;
 
     public SearchResultIconSlice(Context context) {
         this(context, null, 0);
@@ -83,7 +83,8 @@ public class SearchResultIconSlice extends LinearLayout implements
     }
 
     @Override
-    public void applySearchTarget(SearchTarget parentTarget, List<SearchTarget> children) {
+    public void apply(SearchTarget parentTarget, List<SearchTarget> children) {
+        mTargetId = parentTarget.getId();
         reset();
         updateIcon(parentTarget, children);
         try {
@@ -97,7 +98,7 @@ public class SearchResultIconSlice extends LinearLayout implements
 
     private void updateIcon(SearchTarget parentTarget, List<SearchTarget> children) {
         if (children.size() == 1) {
-            mIcon.applySearchTarget(children.get(0), new ArrayList<>());
+            mIcon.apply(children.get(0), new ArrayList<>());
         } else {
             LauncherAppState appState = LauncherAppState.getInstance(getContext());
             MODEL_EXECUTOR.post(() -> {
@@ -121,7 +122,6 @@ public class SearchResultIconSlice extends LinearLayout implements
         reset();
     }
 
-
     private void reset() {
         mSliceView.setOnSliceActionListener(null);
         if (mSliceLiveData != null) {
@@ -131,11 +131,17 @@ public class SearchResultIconSlice extends LinearLayout implements
 
     @Override
     public void onSliceAction(@NonNull EventInfo eventInfo, @NonNull SliceItem sliceItem) {
-        //TODO: event reporting
+        notifyEvent(mLauncher, mTargetId, SearchTargetEvent.ACTION_TAP);
     }
 
-    private Uri getSliceUri() {
-        return mSearchTarget.getExtras().getParcelable(URI_EXTRA_KEY);
+    @Override
+    public void onClick(View view) {
+        notifyEvent(mLauncher, mTargetId, SearchTargetEvent.ACTION_LONGPRESS);
     }
 
+    @Override
+    public boolean onLongClick(View view) {
+        // do nothing
+        return false;
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java b/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java
index f3355daeae..99e6aa561c 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java
@@ -18,6 +18,7 @@ package com.android.launcher3.search;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
+import android.app.search.SearchTargetEvent;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
@@ -51,8 +52,7 @@ import java.util.ArrayList;
 /**
  * A view representing a single people search result in all apps
  */
-public class SearchResultPeopleView extends LinearLayout implements
-        SearchTargetHandler {
+public class SearchResultPeopleView extends LinearLayout implements SearchTargetHandler {
 
     public static final String TARGET_TYPE_PEOPLE = "people";
 
@@ -64,7 +64,6 @@ public class SearchResultPeopleView extends LinearLayout implements
     private ImageButton[] mProviderButtons = new ImageButton[3];
     private Intent mIntent;
 
-
     private SearchTargetLegacy mSearchTarget;
 
     public SearchResultPeopleView(Context context) {
@@ -100,6 +99,7 @@ public class SearchResultPeopleView extends LinearLayout implements
         }
     }
 
+    /*
     @Override
     public void applySearchTarget(SearchTargetLegacy searchTarget) {
         mSearchTarget = searchTarget;
@@ -136,6 +136,7 @@ public class SearchResultPeopleView extends LinearLayout implements
             }
         }
     }
+    */
 
     /**
      * Normalizes the bitmap to look like rounded App Icon
@@ -184,4 +185,15 @@ public class SearchResultPeopleView extends LinearLayout implements
             bundle.putBundle("provider", provider);
         });
     }
+
+    @Override
+    public void onClick(View view) {
+        // do nothing.
+    }
+
+    @Override
+    public boolean onLongClick(View view) {
+        // do nothing.
+        return false;
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultSuggestion.java b/quickstep/src/com/android/launcher3/search/SearchResultSuggestion.java
deleted file mode 100644
index 6a6bd1b14a..0000000000
--- a/quickstep/src/com/android/launcher3/search/SearchResultSuggestion.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.search;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.drawable.Drawable;
-import android.util.AttributeSet;
-import android.view.ViewGroup;
-
-import com.android.launcher3.R;
-import com.android.launcher3.views.BaseDragLayer;
-
-/**
- * {@link SearchResultIconRow} with custom drawable resource
- */
-public class SearchResultSuggestion extends SearchResultIcon {
-
-    public static final String TARGET_TYPE_SUGGEST = "suggest";
-    private final Drawable mCustomIcon;
-
-    public SearchResultSuggestion(Context context) {
-        this(context, null, 0);
-    }
-
-    public SearchResultSuggestion(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public SearchResultSuggestion(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-
-        TypedArray a = context.obtainStyledAttributes(attrs,
-                R.styleable.SearchResultSuggestion, defStyle, 0);
-        mCustomIcon = a.getDrawable(R.styleable.SearchResultSuggestion_customIcon);
-        a.recycle();
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        ViewGroup.LayoutParams lp = getLayoutParams();
-        lp.height = BaseDragLayer.LayoutParams.WRAP_CONTENT;
-    }
-
-    @Override
-    protected void setIcon(Drawable icon) {
-        super.setIcon(mCustomIcon);
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java b/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java
new file mode 100644
index 0000000000..b1cbe7d36f
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.search;
+
+
+import android.app.search.SearchTarget;
+import android.app.search.SearchTargetEvent;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
+import android.util.AttributeSet;
+import android.view.View;
+
+import androidx.core.graphics.drawable.RoundedBitmapDrawable;
+import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.model.data.SearchActionItemInfo;
+import com.android.launcher3.touch.ItemClickHandler;
+import com.android.launcher3.util.Themes;
+
+import java.util.List;
+
+/**
+ * A view representing a high confidence app search result that includes shortcuts
+ */
+public class SearchResultThumbnailView extends androidx.appcompat.widget.AppCompatImageView
+        implements SearchTargetHandler {
+
+    private SearchTarget mSearchTarget;
+    private SearchResultIcon mResultIcon;
+
+    public SearchResultThumbnailView(Context context) {
+        super(context);
+    }
+
+    public SearchResultThumbnailView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public SearchResultThumbnailView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    public void apply(SearchTarget parentTarget, List<SearchTarget> children) {
+        mSearchTarget = parentTarget;
+        Bitmap bitmap;
+
+        SearchActionItemInfo itemInfo = new SearchActionItemInfo(
+                parentTarget.getSearchAction().getIcon(),
+                parentTarget.getPackageName(),
+                parentTarget.getUserHandle(),
+                parentTarget.getSearchAction().getTitle());
+        bitmap = ((BitmapDrawable) itemInfo.getIcon()
+                .loadDrawable(getContext())).getBitmap();
+        // crop
+        if (bitmap.getWidth() < bitmap.getHeight()) {
+            bitmap = Bitmap.createBitmap(bitmap, 0,
+                    bitmap.getHeight() / 2 - bitmap.getWidth() / 2,
+                    bitmap.getWidth(), bitmap.getWidth());
+        } else {
+            bitmap = Bitmap.createBitmap(bitmap, bitmap.getWidth() / 2 - bitmap.getHeight() / 2,
+                    0,
+                    bitmap.getHeight(), bitmap.getHeight());
+        }
+        setTag(itemInfo);
+
+        RoundedBitmapDrawable drawable = RoundedBitmapDrawableFactory.create(null, bitmap);
+        drawable.setCornerRadius(Themes.getDialogCornerRadius(getContext()));
+        setImageDrawable(drawable);
+    }
+
+    @Override
+    public void onClick(View view) {
+        ItemClickHandler.onClickSearchAction(Launcher.getLauncher(getContext()),
+                (SearchActionItemInfo) view.getTag());
+        notifyEvent(getContext(), mSearchTarget.getId(), SearchTargetEvent.ACTION_LAUNCH_TOUCH);
+    }
+
+    @Override
+    public boolean onLongClick(View view) {
+        // do nothing.
+        return false;
+    }
+}
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultWidget.java b/quickstep/src/com/android/launcher3/search/SearchResultWidget.java
index c6bdb68204..69da515152 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultWidget.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultWidget.java
@@ -15,6 +15,8 @@
  */
 package com.android.launcher3.search;
 
+import android.app.search.SearchTarget;
+import android.app.search.SearchTargetEvent;
 import android.appwidget.AppWidgetHostView;
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
@@ -28,22 +30,19 @@ import android.widget.RelativeLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.android.launcher3.AppWidgetResizeFrame;
 import com.android.launcher3.CheckLongPressHelper;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.allapps.search.SearchWidgetInfoContainer;
 import com.android.launcher3.dragndrop.DraggableView;
 import com.android.launcher3.touch.ItemLongClickListener;
-import com.android.launcher3.widget.PendingAddWidgetInfo;
-import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
 /**
  * displays live version of a widget upon receiving {@link AppWidgetProviderInfo} from Search
  * provider
  */
 public class SearchResultWidget extends RelativeLayout implements
-        SearchTargetHandler, DraggableView, View.OnLongClickListener {
+        SearchTargetHandler, DraggableView {
 
     private static final String TAG = "SearchResultWidget";
 
@@ -57,7 +56,7 @@ public class SearchResultWidget extends RelativeLayout implements
     private final AppWidgetHostView mHostView;
     private final float mScaleToFit;
 
-    private SearchTargetLegacy mSearchTarget;
+    private SearchTarget mSearchTarget;
     private AppWidgetProviderInfo mProviderInfo;
 
     private SearchWidgetInfoContainer mInfoContainer;
@@ -81,9 +80,7 @@ public class SearchResultWidget extends RelativeLayout implements
 
         // detect tap event on widget container for search target event reporting
         mClickDetector = new GestureDetector(context,
-                new ClickListener(() -> {
-                }));
-
+                new ClickListener(() -> handleSelection(SearchTargetEvent.ACTION_LAUNCH_TOUCH)));
         mLongPressHelper = new CheckLongPressHelper(this);
         mLongPressHelper.setLongPressTimeoutFactor(1);
         setOnLongClickListener(this);
@@ -95,40 +92,6 @@ public class SearchResultWidget extends RelativeLayout implements
         addView(mHostView);
     }
 
-    @Override
-    public void applySearchTarget(SearchTargetLegacy searchTarget) {
-        if (searchTarget.getExtras() == null
-                || searchTarget.getExtras().getParcelable("provider") == null) {
-            setVisibility(GONE);
-            return;
-        }
-        AppWidgetProviderInfo providerInfo = searchTarget.getExtras().getParcelable("provider");
-        if (mProviderInfo != null && providerInfo.provider.equals(mProviderInfo.provider)
-                && providerInfo.getProfile().equals(mProviderInfo.getProfile())) {
-            return;
-        }
-        removeListener();
-
-        mSearchTarget = searchTarget;
-        mProviderInfo = providerInfo;
-
-        mInfoContainer = mLauncher.getLiveSearchManager().getPlaceHolderWidget(providerInfo);
-        if (mInfoContainer == null) {
-            setVisibility(GONE);
-            return;
-        }
-        setVisibility(VISIBLE);
-        mInfoContainer.attachWidget(mHostView);
-        PendingAddWidgetInfo info = (PendingAddWidgetInfo) mHostView.getTag();
-        int[] size = mLauncher.getWorkspace().estimateItemSize(info);
-        mHostView.getLayoutParams().width = size[0];
-        mHostView.getLayoutParams().height = size[1];
-        AppWidgetResizeFrame.updateWidgetSizeRanges(mHostView, mLauncher, info.spanX,
-                info.spanY);
-        mHostView.requestLayout();
-        setTag(info);
-    }
-
     /**
      * Stops hostView from getting updates on a widget provider
      */
@@ -138,6 +101,11 @@ public class SearchResultWidget extends RelativeLayout implements
         }
     }
 
+    public void handleSelection(int eventType) {
+        SearchSessionTracker.INSTANCE.get(getContext()).notifyEvent(
+                new SearchTargetEvent.Builder("search target id", eventType).build());
+    }
+
     @Override
     public boolean onInterceptTouchEvent(MotionEvent ev) {
         mLongPressHelper.onTouchEvent(ev);
@@ -179,6 +147,11 @@ public class SearchResultWidget extends RelativeLayout implements
         return false;
     }
 
+    @Override
+    public void onClick(View view) {
+        // do nothing.
+    }
+
     static class ClickListener extends GestureDetector.SimpleOnGestureListener {
         private final Runnable mCb;
 
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java b/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java
index 22f0b76159..c9fc8e17c4 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java
@@ -18,6 +18,8 @@ package com.android.launcher3.search;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
+import android.app.search.SearchTarget;
+import android.app.search.SearchTargetEvent;
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
 import android.graphics.Point;
@@ -39,22 +41,20 @@ import com.android.launcher3.widget.BaseWidgetSheet;
 import com.android.launcher3.widget.PendingItemDragHelper;
 import com.android.launcher3.widget.WidgetCell;
 import com.android.launcher3.widget.WidgetImageView;
-import com.android.systemui.plugins.shared.SearchTargetLegacy;
+
+import java.util.List;
 
 /**
  * displays preview of a widget upon receiving {@link AppWidgetProviderInfo} from Search provider
  */
-public class SearchResultWidgetPreview extends LinearLayout implements
-        SearchTargetHandler, View.OnLongClickListener,
-        View.OnClickListener {
+public class SearchResultWidgetPreview extends LinearLayout implements SearchTargetHandler {
 
-    public static final String TARGET_TYPE_WIDGET_PREVIEW = "widget_preview";
     private final Launcher mLauncher;
     private final LauncherAppState mAppState;
     private WidgetCell mWidgetCell;
     private Toast mWidgetToast;
 
-    private SearchTargetLegacy mSearchTarget;
+    private SearchTarget mSearchTarget;
 
 
     public SearchResultWidgetPreview(Context context) {
@@ -82,14 +82,9 @@ public class SearchResultWidgetPreview extends LinearLayout implements
     }
 
     @Override
-    public void applySearchTarget(SearchTargetLegacy searchTarget) {
-        if (searchTarget.getExtras() == null
-                || searchTarget.getExtras().getParcelable("provider") == null) {
-            setVisibility(GONE);
-            return;
-        }
-        mSearchTarget = searchTarget;
-        AppWidgetProviderInfo providerInfo = searchTarget.getExtras().getParcelable("provider");
+    public void apply(SearchTarget parentTarget, List<SearchTarget> children) {
+        mSearchTarget = parentTarget;
+        AppWidgetProviderInfo providerInfo = parentTarget.getAppWidgetProviderInfo();
         LauncherAppWidgetProviderInfo pInfo = LauncherAppWidgetProviderInfo.fromProviderInfo(
                 getContext(), providerInfo);
         MODEL_EXECUTOR.post(() -> {
@@ -100,7 +95,6 @@ public class SearchResultWidgetPreview extends LinearLayout implements
                 mWidgetCell.ensurePreview();
             });
         });
-
     }
 
     @Override
@@ -120,11 +114,18 @@ public class SearchResultWidgetPreview extends LinearLayout implements
         new PendingItemDragHelper(mWidgetCell).startDrag(
                 imageView.getBitmapBounds(), imageView.getBitmap().getWidth(), imageView.getWidth(),
                 new Point(loc[0], loc[1]), mLauncher.getAppsView(), new DragOptions());
+        handleSelection(SearchTargetEvent.ACTION_LONGPRESS);
         return true;
     }
 
     @Override
     public void onClick(View view) {
         mWidgetToast = BaseWidgetSheet.showWidgetToast(getContext(), mWidgetToast);
+        handleSelection(SearchTargetEvent.ACTION_LAUNCH_TOUCH);
+    }
+
+    public void handleSelection(int eventType) {
+        SearchSessionTracker.INSTANCE.get(getContext()).notifyEvent(
+                new SearchTargetEvent.Builder(mSearchTarget.getId(), eventType).build());
     }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java b/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java
index e015122315..d7c5c5d157 100644
--- a/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java
+++ b/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java
@@ -18,6 +18,7 @@ package com.android.launcher3.search;
 import android.app.search.SearchTarget;
 import android.content.Context;
 import android.util.AttributeSet;
+import android.view.View;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
@@ -27,8 +28,7 @@ import java.util.List;
 /**
  * Header text view that shows a title for a given section in All apps search
  */
-public class SearchSectionHeaderView extends TextView implements
-        SearchTargetHandler {
+public class SearchSectionHeaderView extends TextView implements SearchTargetHandler {
 
     public SearchSectionHeaderView(Context context) {
         super(context);
@@ -44,8 +44,19 @@ public class SearchSectionHeaderView extends TextView implements
     }
 
     @Override
-    public void applySearchTarget(SearchTarget parentTarget, List<SearchTarget> children) {
+    public void apply(SearchTarget parentTarget, List<SearchTarget> children) {
         setText(parentTarget.getSearchAction().getTitle());
         setVisibility(VISIBLE);
     }
+
+    @Override
+    public void onClick(View view) {
+        // do nothing.
+    }
+
+    @Override
+    public boolean onLongClick(View view) {
+        // do nothing.
+        return false;
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java b/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java
index 6585213b65..197aecbc28 100644
--- a/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java
+++ b/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java
@@ -15,8 +15,6 @@
  */
 package com.android.launcher3.search;
 
-import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
-
 import android.app.search.Query;
 import android.app.search.SearchContext;
 import android.app.search.SearchSession;
@@ -27,6 +25,8 @@ import android.os.CancellationSignal;
 import android.text.TextUtils;
 import android.util.Log;
 
+import androidx.annotation.WorkerThread;
+
 import com.android.app.search.ResultType;
 import com.android.launcher3.allapps.AllAppsGridAdapter;
 import com.android.launcher3.allapps.AllAppsSectionDecorator;
@@ -39,6 +39,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.function.Consumer;
 
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+
 /**
  * Search pipeline utilizing {@link android.app.search.SearchUiManager}
  */
@@ -46,10 +48,11 @@ public class SearchServicePipeline implements SearchPipeline {
     private static final int SUPPORTED_RESULT_TYPES =
             ResultType.APPLICATION | ResultType.SHORTCUT | ResultType.PLAY | ResultType.PEOPLE
                     | ResultType.SETTING;
+
+    private static final boolean DEBUG = true;
     private static final int REQUEST_TIMEOUT = 200;
     private static final String TAG = "SearchServicePipeline";
 
-
     private final Context mContext;
     private final SearchSession mSession;
     private final DeviceSearchAdapterProvider mAdapterProvider;
@@ -63,16 +66,22 @@ public class SearchServicePipeline implements SearchPipeline {
         SearchUiManager manager = context.getSystemService(SearchUiManager.class);
         mSession = manager.createSearchSession(
                 new SearchContext(SUPPORTED_RESULT_TYPES, REQUEST_TIMEOUT, null));
+        SearchSessionTracker.getInstance(context).setSearchSession(mSession);
     }
 
+    @WorkerThread
     @Override
     public void query(String input, Consumer<ArrayList<AllAppsGridAdapter.AdapterItem>> callback,
             CancellationSignal cancellationSignal) {
         mCanceled = false;
         Query query = new Query(input, System.currentTimeMillis(), null);
-        mSession.query(query, UI_HELPER_EXECUTOR, items -> {
+        mSession.query(query, UI_HELPER_EXECUTOR, targets -> {
             if (!mCanceled) {
-                callback.accept(this.onResult(items));
+                if (DEBUG) {
+                    printSearchTargets(input, targets);
+                }
+                SearchSessionTracker.getInstance(mContext).setQuery(query);
+                callback.accept(this.onResult(targets));
             }
             Log.w(TAG, "Ignoring results due to cancel signal");
         });
@@ -111,6 +120,13 @@ public class SearchServicePipeline implements SearchPipeline {
         return new ArrayList<>(adapterMap.values());
     }
 
+    private void printSearchTargets(String query, List<SearchTarget> results) {
+        Log.d(TAG, " query=" + query + " size=" + results.size());
+        for (SearchTarget s : results) {
+            Log.d(TAG, "layoutType=" + s.getLayoutType() + " resultType=" + s.getResultType());
+        }
+    }
+
     /**
      * Adds a child SearchTarget to a collection of searchTarget children with a shared parentId.
      * Returns false if no parent searchTarget with id=$parentId does not exists.
diff --git a/quickstep/src/com/android/launcher3/search/SearchSessionTracker.java b/quickstep/src/com/android/launcher3/search/SearchSessionTracker.java
new file mode 100644
index 0000000000..3079965cb9
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/search/SearchSessionTracker.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.search;
+
+import android.app.search.Query;
+import android.app.search.SearchSession;
+import android.app.search.SearchTarget;
+import android.app.search.SearchTargetEvent;
+import android.content.Context;
+import android.util.Log;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
+
+import com.android.launcher3.util.MainThreadInitializedObject;
+
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+
+/**
+ * A singleton class to track and report search events back to SearchSession
+ */
+public class SearchSessionTracker {
+
+    private static final String TAG = "SearchSessionTracker";
+
+    @Nullable
+    private SearchSession mSession;
+    private Query mQuery;
+
+    public static final MainThreadInitializedObject<SearchSessionTracker> INSTANCE =
+            new MainThreadInitializedObject<>(SearchSessionTracker::new);
+
+    private SearchSessionTracker(Context context) {
+    }
+
+    /**
+     * Returns instance of SearchSessionTracker
+     */
+    public static SearchSessionTracker getInstance(Context context) {
+        return SearchSessionTracker.INSTANCE.get(context);
+    }
+
+    @WorkerThread
+    public void setSearchSession(SearchSession session) {
+        mSession = session;
+    }
+
+    @WorkerThread
+    public void setQuery(Query query) {
+        mQuery = query;
+    }
+
+    /**
+     * Send the user event handling back to the {@link SearchSession} object.
+     */
+    public void notifyEvent(SearchTargetEvent event) {
+        if (mSession == null) {
+            Log.d(TAG, "Dropping event " + event.getTargetId());
+        }
+        Log.d(TAG, "notifyEvent:" + mQuery.getInput() + ":" + event.getTargetId());
+        UI_HELPER_EXECUTOR.post(() -> mSession.notifyEvent(mQuery, event));
+    }
+}
diff --git a/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java b/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java
index 67502f675f..0e7b8f20c9 100644
--- a/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java
+++ b/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java
@@ -17,31 +17,22 @@
 package com.android.launcher3.search;
 
 import android.app.search.SearchTarget;
-
-import com.android.systemui.plugins.shared.SearchTargetLegacy;
+import android.app.search.SearchTargetEvent;
+import android.content.Context;
+import android.view.View;
 
 import java.util.List;
+import java.util.function.Consumer;
 
 /**
  * An interface for supporting dynamic search results
  */
-public interface SearchTargetHandler {
-
-    /**
-     * Update view using values from {@link SearchTargetLegacy}
-     *
-     * @deprecated Use {@link SearchTargetHandler#applySearchTarget(SearchTarget, List)} instead
-     */
-    @Deprecated
-    default void applySearchTarget(SearchTargetLegacy searchTarget) {
-    }
-
+public interface SearchTargetHandler extends View.OnClickListener, View.OnLongClickListener {
 
     /**
-     * Update view using values from {@link SearchTargetLegacy}
+     * Update view using values from {@link SearchTarget}
      */
-    default void applySearchTarget(SearchTarget parentTarget, List<SearchTarget> children) {
-    }
+    default void apply(SearchTarget parentTarget, List<SearchTarget> children) { }
 
     /**
      * Handle IME quick select event. returns whether event was handled.
@@ -50,4 +41,8 @@ public interface SearchTargetHandler {
         return false;
     }
 
+    default void notifyEvent(Context context, String id, int eventType) {
+        SearchTargetEvent.Builder builder = new SearchTargetEvent.Builder(id, eventType);
+        SearchSessionTracker.getInstance(context).notifyEvent(builder.build());
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java b/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java
new file mode 100644
index 0000000000..ceef429595
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.search;
+
+import android.app.PendingIntent;
+import android.app.search.SearchAction;
+import android.app.search.SearchTarget;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ShortcutInfo;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.drawable.Icon;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Process;
+import android.os.UserHandle;
+
+import com.android.app.search.ResultType;
+
+import static com.android.app.search.LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT;
+import static com.android.app.search.LayoutType.ICON_SINGLE_HORIZONTAL_TEXT;
+import static com.android.app.search.LayoutType.THUMBNAIL;
+import static com.android.app.search.ResultType.ACTION;
+import static com.android.app.search.ResultType.SCREENSHOT;
+import static com.android.app.search.ResultType.SUGGEST;
+
+public class SearchTargetUtil {
+
+    public static final String BUNDLE_EXTRA_SHOULD_START = "should_start";
+    public static final String BUNDLE_EXTRA_SHOULD_START_FOR_RESULT = "should_start_for_result";
+    public static final String BUNDLE_EXTRA_BADGE_FROM_ICON = "badge_from_icon";
+    public static final String BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE = "primary_icon_from_title";
+
+    public static final String EXTRA_CLASS = "class";
+
+    private static final String TITLE = " title: weather ";
+    private static final String SUBTITLE = " subtitle: 68 degrees ";
+    private static final String PACKAGE2 = "com.google.android.gm";
+    private static final UserHandle USERHANDLE = Process.myUserHandle();
+
+
+    /**
+     * Generate SearchTargetUtil for ICON_DOUBLE_HORIZONTAL_TEXT layout type.
+     *
+       targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction(
+           mContext, "red", Color.RED));
+       targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction(
+           mContext, "yellow", Color.YELLOW));
+     */
+    public static SearchTarget generateIconDoubleHorizontalText_SearchAction(
+            Context context, String id, int color) {
+        SearchTarget.Builder builder =
+                new SearchTarget.Builder(ACTION, ICON_DOUBLE_HORIZONTAL_TEXT, id)
+                        .setPackageName(PACKAGE2) /* required */
+                        .setUserHandle(USERHANDLE); /* required */
+
+        Intent intent = new Intent("com.google.android.googlequicksearchbox.GENERIC_QUERY");
+        intent.putExtra("query", "weather");
+        intent.putExtra("full_screen", false);
+        PendingIntent pendingIntent =
+                PendingIntent.getActivity(
+                        context, 1, intent,
+                        PendingIntent.FLAG_UPDATE_CURRENT);
+
+        Bitmap bitmap = Bitmap.createBitmap(200, 200, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        canvas.drawColor(color);
+        Icon icon = Icon.createWithAdaptiveBitmap(bitmap);
+
+        Bundle b = new Bundle();
+        b.putBoolean(BUNDLE_EXTRA_SHOULD_START_FOR_RESULT, true);
+        b.putBoolean(BUNDLE_EXTRA_BADGE_FROM_ICON, true);
+        b.putBoolean(BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE, true);
+
+        builder.setSearchAction(new SearchAction.Builder(id, id + TITLE)
+                .setSubtitle(id + SUBTITLE)
+                .setPendingIntent(pendingIntent)
+                .setIcon(icon)
+                .setExtras(b)
+                .build());
+        return builder.build();
+    }
+
+    /**
+     *  Inside SearchServicePipeline, add following samples to test the search target.
+     *
+     * targets.add(SearchTargetUtil.generateThumbnail_SearchAction("blue", Color.BLUE));
+     * targets.add(SearchTargetUtil.generateThumbnail_SearchAction("red", Color.RED));
+     * targets.add(SearchTargetUtil.generateThumbnail_SearchAction("green", Color.GREEN));
+     */
+    public static SearchTarget generateThumbnail_SearchAction(String id, int color) {
+        SearchTarget.Builder builder =
+                new SearchTarget.Builder(SCREENSHOT, THUMBNAIL, id)
+                        .setPackageName(PACKAGE2) /* required */
+                        .setUserHandle(USERHANDLE); /* required */
+
+
+        Intent intent = new Intent(Intent.ACTION_VIEW)
+                .setData(Uri.parse("uri blah blah"))
+                .setType("image/*")
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+        Bitmap bitmap = Bitmap.createBitmap(1000, 500, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        canvas.drawColor(color);
+        Icon icon = Icon.createWithBitmap(bitmap);
+
+        builder.setSearchAction(new SearchAction.Builder(id, TITLE)
+                .setSubtitle(SUBTITLE)
+                .setIcon(icon)
+                .setIntent(intent)
+                .build());
+        return builder.build();
+
+    }
+
+    /**
+     *
+     * targets.add(SearchTargetUtil.generateIconHorizontalText_SearchAction(
+     *     mContext, "red", Color.RED));
+     * targets.add(SearchTargetUtil.generateIconHorizontalText_SearchAction(
+     *     mContext, "yellow", Color.YELLOW));
+     */
+    public static SearchTarget generateIconHorizontalText_SearchAction(
+            Context context, String id, int color) {
+        String fallbackQuery = "How to make cookie";
+        SearchTarget.Builder builder =
+                new SearchTarget.Builder(SUGGEST, ICON_SINGLE_HORIZONTAL_TEXT, id)
+                        .setPackageName(PACKAGE2) /* required */
+                        .setUserHandle(USERHANDLE); /* required */
+
+        Intent intent3 = new Intent("com.google.android.googlequicksearchbox.GENERIC_QUERY");
+        intent3.putExtra("query", fallbackQuery);
+        intent3.putExtra("full_screen", false);
+        PendingIntent pendingIntent3 =
+                PendingIntent.getActivity(
+                        context, 1, intent3,
+                        PendingIntent.FLAG_UPDATE_CURRENT);
+
+        Bitmap bitmap = Bitmap.createBitmap(200, 200, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        canvas.drawColor(color);
+        Icon icon = Icon.createWithAdaptiveBitmap(bitmap);
+
+        Bundle extra = new Bundle();
+        extra.putBoolean(BUNDLE_EXTRA_SHOULD_START_FOR_RESULT, true);
+
+        SearchAction searchAction = new SearchAction.Builder(id, fallbackQuery)
+                .setPendingIntent(pendingIntent3)
+                .setIcon(icon)
+                .setExtras(extra)
+                .build();
+        return builder.setSearchAction(searchAction).build();
+    }
+
+
+    /**
+     * Generate SearchTargetUtil for ICON_DOUBLE_HORIZONTAL_TEXT layout type.
+     */
+    public static SearchTarget generateIconDoubleHorizontalText_ShortcutInfo(Context context) {
+        String id = "23456";
+        SearchTarget.Builder builder =
+                new SearchTarget.Builder(ResultType.SHORTCUT, ICON_DOUBLE_HORIZONTAL_TEXT, id)
+                        .setPackageName("com.google.android.gm") /* required */
+                        .setUserHandle(UserHandle.CURRENT); /* required */
+
+        builder.setShortcutInfo(new ShortcutInfo.Builder(context, id).build());
+        return builder.build();
+    }
+}
diff --git a/quickstep/src/com/android/launcher3/search/ThumbnailSearchResultView.java b/quickstep/src/com/android/launcher3/search/ThumbnailSearchResultView.java
deleted file mode 100644
index 7108d63a1f..0000000000
--- a/quickstep/src/com/android/launcher3/search/ThumbnailSearchResultView.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.search;
-
-
-import android.app.search.SearchTarget;
-import android.content.Context;
-import android.util.AttributeSet;
-
-import java.util.List;
-
-/**
- * A view representing a high confidence app search result that includes shortcuts
- */
-public class ThumbnailSearchResultView extends androidx.appcompat.widget.AppCompatImageView
-        implements SearchTargetHandler {
-
-    public ThumbnailSearchResultView(Context context) {
-        super(context);
-    }
-
-    public ThumbnailSearchResultView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public ThumbnailSearchResultView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    @Override
-    public void applySearchTarget(SearchTarget parentTarget, List<SearchTarget> children) {
-
-    }
-}
diff --git a/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java b/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
index 511de3096f..a79ec437fb 100644
--- a/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
+++ b/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
@@ -16,7 +16,6 @@
 
 package com.android.launcher3.allapps.search;
 
-
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/com/android/launcher3/model/data/SearchActionItemInfo.java b/src/com/android/launcher3/model/data/SearchActionItemInfo.java
index 1831ffd803..36afe50fa1 100644
--- a/src/com/android/launcher3/model/data/SearchActionItemInfo.java
+++ b/src/com/android/launcher3/model/data/SearchActionItemInfo.java
@@ -21,6 +21,8 @@ import android.graphics.drawable.Icon;
 import android.os.Process;
 import android.os.UserHandle;
 
+import androidx.annotation.Nullable;
+
 /**
  * Represents a SearchAction with in launcher
  */
@@ -28,9 +30,10 @@ public class SearchActionItemInfo extends ItemInfoWithIcon {
 
     public static final int FLAG_SHOULD_START = 1 << 1;
     public static final int FLAG_SHOULD_START_FOR_RESULT = FLAG_SHOULD_START | 1 << 2;
+    public static final int FLAG_BADGE_FROM_ICON = 1 << 3;
+    public static final int FLAG_PRIMARY_ICON_FROM_TITLE = 1 << 4;
 
     private final String mFallbackPackageName;
-
     private int mFlags = 0;
     private final Icon mIcon;
 
@@ -54,12 +57,15 @@ public class SearchActionItemInfo extends ItemInfoWithIcon {
         title = info.title;
     }
 
-    public void setFlags(int flags) {
-        mFlags = flags;
+    /**
+     * Returns if multiple flags are all available.
+     */
+    public boolean hasFlags(int flags) {
+        return (mFlags & flags) != 0;
     }
 
-    public int getFlags() {
-        return mFlags;
+    public void setFlags(int flags) {
+        mFlags |= flags ;
     }
 
     @Override
@@ -93,20 +99,13 @@ public class SearchActionItemInfo extends ItemInfoWithIcon {
         mPendingIntent = pendingIntent;
     }
 
-
-    /**
-     * Returns if a flag is set on instance
-     */
-    public boolean hasFlag(int flag) {
-        return (mFlags & flag) == flag;
+    @Nullable
+    public Icon getIcon() {
+        return mIcon;
     }
 
     @Override
     public ItemInfoWithIcon clone() {
         return new SearchActionItemInfo(this);
     }
-
-    public Icon getIcon() {
-        return mIcon;
-    }
 }
diff --git a/src/com/android/launcher3/touch/ItemClickHandler.java b/src/com/android/launcher3/touch/ItemClickHandler.java
index d9483e56c2..3122c68304 100644
--- a/src/com/android/launcher3/touch/ItemClickHandler.java
+++ b/src/com/android/launcher3/touch/ItemClickHandler.java
@@ -250,7 +250,7 @@ public class ItemClickHandler {
      */
     public static void onClickSearchAction(Launcher launcher, SearchActionItemInfo itemInfo) {
         if (itemInfo.getIntent() != null) {
-            if (itemInfo.hasFlag(SearchActionItemInfo.FLAG_SHOULD_START_FOR_RESULT)) {
+            if (itemInfo.hasFlags(SearchActionItemInfo.FLAG_SHOULD_START_FOR_RESULT)) {
                 launcher.startActivityForResult(itemInfo.getIntent(), 0);
             } else {
                 launcher.startActivity(itemInfo.getIntent());
@@ -258,9 +258,9 @@ public class ItemClickHandler {
         } else if (itemInfo.getPendingIntent() != null) {
             try {
                 PendingIntent pendingIntent = itemInfo.getPendingIntent();
-                if (!itemInfo.hasFlag(SearchActionItemInfo.FLAG_SHOULD_START)) {
+                if (!itemInfo.hasFlags(SearchActionItemInfo.FLAG_SHOULD_START)) {
                     pendingIntent.send();
-                } else if (itemInfo.hasFlag(SearchActionItemInfo.FLAG_SHOULD_START_FOR_RESULT)) {
+                } else if (itemInfo.hasFlags(SearchActionItemInfo.FLAG_SHOULD_START_FOR_RESULT)) {
                     launcher.startIntentSenderForResult(pendingIntent.getIntentSender(), 0, null, 0,
                             0, 0);
                 } else {
-- 
GitLab


From 15b0f700fee9842f73dc314831787051e1119142 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Tue, 26 Jan 2021 16:16:29 -0800
Subject: [PATCH 0429/1664] Temporary fix to disable task#onClickListener
 during transition to overview

The root cause is InputConsumerProxy not getting events during the transition. Will need to investigate more, but since we dont allow interaction with TaskView during the transition currently, apply this temporary fix to unblock

Bug: 175039524
Test: manual
Change-Id: Ifc3eb0569cf3a60d193e91bf70519a0737afb90a
---
 .../src/com/android/quickstep/AbsSwipeUpHandler.java |  4 ++++
 .../src/com/android/quickstep/views/TaskView.java    | 12 ++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index d648dd6400..13b7d8db9b 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -970,6 +970,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                 }
                 duration = Math.max(duration, mRecentsView.getScroller().getDuration());
             }
+            if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+                mRecentsView.getRunningTaskView().setIsClickableAsLiveTile(false);
+            }
         }
 
         // Let RecentsView handle the scrolling to the task, which we launch in startNewTask()
@@ -1447,6 +1450,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
     private void finishCurrentTransitionToRecents() {
         if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
             mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);
+            mRecentsView.getRunningTaskView().setIsClickableAsLiveTile(true);
         } else if (!hasTargets() || mRecentsAnimationController == null) {
             // If there are no targets or the animation not started, then there is nothing to finish
             mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index b791d29540..e8f590f28d 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -257,6 +257,8 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     private final float[] mIconCenterCoords = new float[2];
     private final float[] mChipCenterCoords = new float[2];
 
+    private boolean mIsClickableAsLiveTile = true;
+
     public TaskView(Context context) {
         this(context, null);
     }
@@ -273,6 +275,11 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
                 return;
             }
             if (ENABLE_QUICKSTEP_LIVE_TILE.get() && isRunningTask()) {
+                if (!mIsClickableAsLiveTile) {
+                    return;
+                }
+
+                mIsClickableAsLiveTile = false;
                 RecentsView recentsView = getRecentsView();
                 RemoteAnimationTargets targets = recentsView.getLiveTileParams().getTargetSet();
                 recentsView.getLiveTileTaskViewSimulator().setDrawsBelowRecents(false);
@@ -289,6 +296,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
                     public void onAnimationEnd(Animator animator) {
                         recentsView.getLiveTileTaskViewSimulator().setDrawsBelowRecents(true);
                         recentsView.finishRecentsAnimation(false, null);
+                        mIsClickableAsLiveTile = true;
                     }
                 });
                 anim.start();
@@ -348,6 +356,10 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         return false;
     }
 
+    public void setIsClickableAsLiveTile(boolean isClickableAsLiveTile) {
+        mIsClickableAsLiveTile = isClickableAsLiveTile;
+    }
+
     private void computeAndSetIconTouchDelegate() {
         float iconHalfSize = mIconView.getWidth() / 2f;
         mIconCenterCoords[0] = mIconCenterCoords[1] = iconHalfSize;
-- 
GitLab


From 7690e9460c83bc6b4ca1c32b45ca9f966b71b6e6 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Wed, 27 Jan 2021 14:57:11 -0600
Subject: [PATCH 0430/1664] Fix persistent   device search edu

Test: Manual
Bug: 177223401
Change-Id: Ic028c8f0f01db81f650289963c936ef798a14eae
---
 .../android/quickstep/util/QuickstepOnboardingPrefs.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
index 9ee9f0094a..cb81d36b4e 100644
--- a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
+++ b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
@@ -27,6 +27,7 @@ import android.content.SharedPreferences;
 
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.Workspace;
+import com.android.launcher3.allapps.AllAppsInsetTransitionController;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.hybridhotseat.HotseatPredictionController;
 import com.android.launcher3.search.DeviceSearchEdu;
@@ -139,8 +140,12 @@ public class QuickstepOnboardingPrefs extends OnboardingPrefs<QuickstepLauncher>
                 @Override
                 public void onStateTransitionStart(LauncherState toState) {
                     if (toState == ALL_APPS) {
-                        mLauncher.getAllAppsController().getInsetController().setSearchEduRunnable(
-                                () -> DeviceSearchEdu.show(launcher));
+                        AllAppsInsetTransitionController insetTransitionController =
+                                mLauncher.getAllAppsController().getInsetController();
+                        insetTransitionController.setSearchEduRunnable(() -> {
+                            DeviceSearchEdu.show(launcher);
+                            insetTransitionController.setSearchEduRunnable(null);
+                        });
                         stateManager.removeStateListener(this);
                     }
                 }
-- 
GitLab


From 0455d146a1b0c6f79a1b8d14505cf871df37205b Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Wed, 27 Jan 2021 14:05:01 -0800
Subject: [PATCH 0431/1664] Fix missing grid for devices that upgrade from R

Fixes: 178435615
Test: TODO
Change-Id: I9894b88485daf5b641b4674a5abff05e0f53138b
---
 AndroidManifest-common.xml                                    | 2 +-
 src/com/android/launcher3/Utilities.java                      | 4 ++--
 ...idOptionsProvider.java => GridCustomizationsProvider.java} | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename src/com/android/launcher3/graphics/{GridOptionsProvider.java => GridCustomizationsProvider.java} (97%)

diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index 9e76ce35cb..4fd2e4075c 100644
--- a/AndroidManifest-common.xml
+++ b/AndroidManifest-common.xml
@@ -141,7 +141,7 @@
         TODO: Add proper permissions
         -->
         <provider
-            android:name="com.android.launcher3.graphics.GridOptionsProvider"
+            android:name="com.android.launcher3.graphics.GridCustomizationsProvider"
             android:authorities="${packageName}.grid_control"
             android:exported="true" />
 
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 8066aa656d..51d8e665d0 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -67,7 +67,7 @@ import android.view.animation.Interpolator;
 import androidx.core.os.BuildCompat;
 
 import com.android.launcher3.dragndrop.FolderAdaptiveIcon;
-import com.android.launcher3.graphics.GridOptionsProvider;
+import com.android.launcher3.graphics.GridCustomizationsProvider;
 import com.android.launcher3.graphics.TintedDrawableSpan;
 import com.android.launcher3.icons.IconProvider;
 import com.android.launcher3.icons.LauncherIcons;
@@ -520,7 +520,7 @@ public final class Utilities {
     public static boolean isGridOptionsEnabled(Context context) {
         return isComponentEnabled(context.getPackageManager(),
                 context.getPackageName(),
-                GridOptionsProvider.class.getName());
+                GridCustomizationsProvider.class.getName());
     }
 
     private static boolean isComponentEnabled(PackageManager pm, String pkgName, String clsName) {
diff --git a/src/com/android/launcher3/graphics/GridOptionsProvider.java b/src/com/android/launcher3/graphics/GridCustomizationsProvider.java
similarity index 97%
rename from src/com/android/launcher3/graphics/GridOptionsProvider.java
rename to src/com/android/launcher3/graphics/GridCustomizationsProvider.java
index 08d7e4c65e..cb42e7aa05 100644
--- a/src/com/android/launcher3/graphics/GridOptionsProvider.java
+++ b/src/com/android/launcher3/graphics/GridCustomizationsProvider.java
@@ -40,9 +40,9 @@ import java.util.List;
  *     /default_grid: Call update to set the current grid, with values
  *          name: name of the grid to apply
  */
-public class GridOptionsProvider extends ContentProvider {
+public class GridCustomizationsProvider extends ContentProvider {
 
-    private static final String TAG = "GridOptionsProvider";
+    private static final String TAG = "GridCustomizationsProvider";
 
     private static final String KEY_NAME = "name";
     private static final String KEY_ROWS = "rows";
-- 
GitLab


From bfc0c38157736282129d548e79e16c32793ef87a Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 27 Jan 2021 15:16:59 -0800
Subject: [PATCH 0432/1664] Updating ItemInfoMatcher to work with java streams

Adding support for bulk removing items from a folder icon.
This fixes workspace item removal when a folder gets replaced
to an icon during the delete operation.

- Lets say user has a folder with the same app twice.
- User disables that app.
- Launcher removes all shorcuts of that app

However, because we call "replaceFolderWithFinalItem" during
this removal, we end up creating a new shortcut that does
not get tracked by the removal, so the user is left with
an enabled icon of the disabled app.

Bug: 162378169
Test: manual test, repo steps in bug
Change-Id: Iaf6550894c156b3b5ec2a5aa58bab76a4a28819e
---
 src/com/android/launcher3/Workspace.java      | 54 ++++++++-----------
 src/com/android/launcher3/folder/Folder.java  |  6 +--
 .../android/launcher3/folder/FolderIcon.java  |  4 +-
 .../android/launcher3/model/ModelWriter.java  |  5 +-
 .../launcher3/model/data/FolderInfo.java      | 19 +++++--
 .../launcher3/util/ItemInfoMatcher.java       | 38 +++----------
 6 files changed, 53 insertions(+), 73 deletions(-)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 65eba20672..8a45c81d97 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -111,9 +111,11 @@ import com.android.launcher3.widget.WidgetManagerHelper;
 import com.android.systemui.plugins.shared.LauncherOverlayManager.LauncherOverlay;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 /**
  * The workspace is a wide area with a wallpaper and a finite number of pages.
@@ -3002,38 +3004,27 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
      * shortcuts are not removed.
      */
     public void removeItemsByMatcher(final ItemInfoMatcher matcher) {
-        for (final CellLayout layoutParent: getWorkspaceAndHotseatCellLayouts()) {
-            final ViewGroup layout = layoutParent.getShortcutsAndWidgets();
-
-            IntSparseArrayMap<View> idToViewMap = new IntSparseArrayMap<>();
-            ArrayList<ItemInfo> items = new ArrayList<>();
-            for (int j = 0; j < layout.getChildCount(); j++) {
-                final View view = layout.getChildAt(j);
-                if (view.getTag() instanceof ItemInfo) {
-                    ItemInfo item = (ItemInfo) view.getTag();
-                    items.add(item);
-                    idToViewMap.put(item.id, view);
-                }
-            }
-
-            for (ItemInfo itemToRemove : matcher.filterItemInfos(items)) {
-                View child = idToViewMap.get(itemToRemove.id);
-
-                if (child != null) {
-                    // Note: We can not remove the view directly from CellLayoutChildren as this
-                    // does not re-mark the spaces as unoccupied.
-                    layoutParent.removeViewInLayout(child);
+        for (CellLayout layout : getWorkspaceAndHotseatCellLayouts()) {
+            ShortcutAndWidgetContainer container = layout.getShortcutsAndWidgets();
+            // Iterate in reverse order as we are removing items
+            for (int i = container.getChildCount() - 1; i >= 0; i--) {
+                View child = container.getChildAt(i);
+                ItemInfo info = (ItemInfo) child.getTag();
+
+                if (matcher.matchesInfo(info)) {
+                    layout.removeViewInLayout(child);
                     if (child instanceof DropTarget) {
                         mDragController.removeDropTarget((DropTarget) child);
                     }
-                } else if (itemToRemove.container >= 0) {
-                    // The item may belong to a folder.
-                    View parent = idToViewMap.get(itemToRemove.container);
-                    if (parent instanceof FolderIcon) {
-                        FolderInfo folderInfo = (FolderInfo) parent.getTag();
-                        folderInfo.remove((WorkspaceItemInfo) itemToRemove, false);
-                        if (((FolderIcon) parent).getFolder().isOpen()) {
-                            ((FolderIcon) parent).getFolder().close(false /* animate */);
+                } else if (child instanceof FolderIcon) {
+                    FolderInfo folderInfo = (FolderInfo) info;
+                    List<WorkspaceItemInfo> matches = folderInfo.contents.stream()
+                            .filter(matcher::matchesInfo)
+                            .collect(Collectors.toList());
+                    if (!matches.isEmpty()) {
+                        folderInfo.removeAll(matches, false);
+                        if (((FolderIcon) child).getFolder().isOpen()) {
+                            ((FolderIcon) child).getFolder().close(false /* animate */);
                         }
                     }
                 }
@@ -3143,9 +3134,8 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
     }
 
     public void removeAbandonedPromise(String packageName, UserHandle user) {
-        HashSet<String> packages = new HashSet<>(1);
-        packages.add(packageName);
-        ItemInfoMatcher matcher = ItemInfoMatcher.ofPackages(packages, user);
+        ItemInfoMatcher matcher = ItemInfoMatcher.ofPackages(
+                Collections.singleton(packageName), user);
         mLauncher.getModelWriter().deleteItemsFromDatabase(matcher);
         removeItemsByMatcher(matcher);
     }
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index 63fa391d43..61938d1719 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -1394,10 +1394,10 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         mItemsInvalidated = true;
     }
 
-    public void onRemove(WorkspaceItemInfo item) {
+    @Override
+    public void onRemove(List<WorkspaceItemInfo> items) {
         mItemsInvalidated = true;
-        View v = getViewForInfo(item);
-        mContent.removeItem(v);
+        items.stream().map(this::getViewForInfo).forEach(mContent::removeItem);
         if (mState == STATE_ANIMATING) {
             mRearrangeOnClose = true;
         } else {
diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java
index 3296eed5ca..fe310f626c 100644
--- a/src/com/android/launcher3/folder/FolderIcon.java
+++ b/src/com/android/launcher3/folder/FolderIcon.java
@@ -695,9 +695,9 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
     }
 
     @Override
-    public void onRemove(WorkspaceItemInfo item) {
+    public void onRemove(List<WorkspaceItemInfo> items) {
         boolean wasDotted = mDotInfo.hasDot();
-        mDotInfo.subtractDotInfo(mActivity.getDotInfoForItem(item));
+        items.stream().map(mActivity::getDotInfoForItem).forEach(mDotInfo::subtractDotInfo);
         boolean isDotted = mDotInfo.hasDot();
         updateDotScale(wasDotted, isDotted);
         setContentDescription(getAccessiblityTitle(mInfo.title));
diff --git a/src/com/android/launcher3/model/ModelWriter.java b/src/com/android/launcher3/model/ModelWriter.java
index 2c99df7a81..f7b43d6bec 100644
--- a/src/com/android/launcher3/model/ModelWriter.java
+++ b/src/com/android/launcher3/model/ModelWriter.java
@@ -51,6 +51,7 @@ import java.util.List;
 import java.util.concurrent.Executor;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
 
 /**
  * Class for handling model updates.
@@ -259,7 +260,9 @@ public class ModelWriter {
      * Removes all the items from the database matching {@param matcher}.
      */
     public void deleteItemsFromDatabase(ItemInfoMatcher matcher) {
-        deleteItemsFromDatabase(matcher.filterItemInfos(mBgDataModel.itemsIdMap));
+        deleteItemsFromDatabase(StreamSupport.stream(mBgDataModel.itemsIdMap.spliterator(), false)
+                        .filter(matcher::matchesInfo)
+                        .collect(Collectors.toList()));
     }
 
     /**
diff --git a/src/com/android/launcher3/model/data/FolderInfo.java b/src/com/android/launcher3/model/data/FolderInfo.java
index 06a2c92dab..cc783f7a5e 100644
--- a/src/com/android/launcher3/model/data/FolderInfo.java
+++ b/src/com/android/launcher3/model/data/FolderInfo.java
@@ -40,6 +40,8 @@ import com.android.launcher3.model.ModelWriter;
 import com.android.launcher3.util.ContentWriter;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import java.util.OptionalInt;
 import java.util.stream.IntStream;
 
@@ -137,9 +139,16 @@ public class FolderInfo extends ItemInfo {
      * @param item
      */
     public void remove(WorkspaceItemInfo item, boolean animate) {
-        contents.remove(item);
+        removeAll(Collections.singletonList(item), animate);
+    }
+
+    /**
+     * Remove all matching app or shortcut. Does not change the DB.
+     */
+    public void removeAll(List<WorkspaceItemInfo> items, boolean animate) {
+        contents.removeAll(items);
         for (int i = 0; i < mListeners.size(); i++) {
-            mListeners.get(i).onRemove(item);
+            mListeners.get(i).onRemove(items);
         }
         itemsChanged(animate);
     }
@@ -166,9 +175,9 @@ public class FolderInfo extends ItemInfo {
     }
 
     public interface FolderListener {
-        public void onAdd(WorkspaceItemInfo item, int rank);
-        public void onRemove(WorkspaceItemInfo item);
-        public void onItemsChanged(boolean animate);
+        void onAdd(WorkspaceItemInfo item, int rank);
+        void onRemove(List<WorkspaceItemInfo> item);
+        void onItemsChanged(boolean animate);
     }
 
     public boolean hasOption(int optionFlag) {
diff --git a/src/com/android/launcher3/util/ItemInfoMatcher.java b/src/com/android/launcher3/util/ItemInfoMatcher.java
index d26bb5779e..354609d463 100644
--- a/src/com/android/launcher3/util/ItemInfoMatcher.java
+++ b/src/com/android/launcher3/util/ItemInfoMatcher.java
@@ -20,10 +20,7 @@ import android.content.ComponentName;
 import android.os.UserHandle;
 
 import com.android.launcher3.LauncherSettings.Favorites;
-import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.model.data.LauncherAppWidgetInfo;
-import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.shortcuts.ShortcutKey;
 
 import java.util.HashSet;
@@ -37,34 +34,15 @@ public interface ItemInfoMatcher {
     boolean matches(ItemInfo info, ComponentName cn);
 
     /**
-     * Filters {@param infos} to those satisfying the {@link #matches(ItemInfo, ComponentName)}.
+     * Returns true if the itemInfo matches this check
      */
-    default HashSet<ItemInfo> filterItemInfos(Iterable<ItemInfo> infos) {
-        HashSet<ItemInfo> filtered = new HashSet<>();
-        for (ItemInfo i : infos) {
-            if (i instanceof WorkspaceItemInfo) {
-                WorkspaceItemInfo info = (WorkspaceItemInfo) i;
-                ComponentName cn = info.getTargetComponent();
-                if (cn != null && matches(info, cn)) {
-                    filtered.add(info);
-                }
-            } else if (i instanceof FolderInfo) {
-                FolderInfo info = (FolderInfo) i;
-                for (WorkspaceItemInfo s : info.contents) {
-                    ComponentName cn = s.getTargetComponent();
-                    if (cn != null && matches(s, cn)) {
-                        filtered.add(s);
-                    }
-                }
-            } else if (i instanceof LauncherAppWidgetInfo) {
-                LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) i;
-                ComponentName cn = info.providerName;
-                if (cn != null && matches(info, cn)) {
-                    filtered.add(info);
-                }
-            }
+    default boolean matchesInfo(ItemInfo info) {
+        if (info != null) {
+            ComponentName cn = info.getTargetComponent();
+            return cn != null && matches(info, cn);
+        } else {
+            return false;
         }
-        return filtered;
     }
 
     /**
@@ -96,7 +74,7 @@ public interface ItemInfoMatcher {
         return (info, cn) -> components.contains(cn) && info.user.equals(user);
     }
 
-    static ItemInfoMatcher ofPackages(HashSet<String> packageNames, UserHandle user) {
+    static ItemInfoMatcher ofPackages(Set<String> packageNames, UserHandle user) {
         return (info, cn) -> packageNames.contains(cn.getPackageName()) && info.user.equals(user);
     }
 
-- 
GitLab


From e7915e138d7db8625d52c60d06a751b900be56f9 Mon Sep 17 00:00:00 2001
From: Sreyas <sreyasr@google.com>
Date: Wed, 20 Jan 2021 18:01:20 -0800
Subject: [PATCH 0433/1664] Refactoring startShareActivity to allow crop to be
 passed in.

This is necessary to start a share activity based on a single image from Launcher.
Bug: 169772466, 169799864

Change-Id: I8a2baaa978a83f289e558dcd5d9be5ca6a164b2f
---
 quickstep/src/com/android/quickstep/ImageActionsApi.java    | 4 ++--
 quickstep/src/com/android/quickstep/TaskOverlayFactory.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/ImageActionsApi.java b/quickstep/src/com/android/quickstep/ImageActionsApi.java
index b04905ca60..cb4d53a82b 100644
--- a/quickstep/src/com/android/quickstep/ImageActionsApi.java
+++ b/quickstep/src/com/android/quickstep/ImageActionsApi.java
@@ -83,8 +83,8 @@ public class ImageActionsApi {
      * Share the image this api was constructed with.
      */
     @UiThread
-    public void startShareActivity() {
-        ImageActionUtils.startShareActivity(mContext, mBitmapSupplier, null, null, TAG);
+    public void startShareActivity(Rect crop) {
+        ImageActionUtils.startShareActivity(mContext, mBitmapSupplier, crop, null, TAG);
     }
 
     /**
diff --git a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
index 6677724982..93ebd5aa26 100644
--- a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
@@ -159,7 +159,7 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
                     @Override
                     public void onShare() {
                         if (isAllowedByPolicy) {
-                            endLiveTileMode(mImageApi::startShareActivity);
+                            endLiveTileMode(() -> mImageApi.startShareActivity(null));
                         } else {
                             showBlockedByPolicyMessage();
                         }
-- 
GitLab


From 068de1685c7121a31f7bbfab4a4e297c6d9a1726 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Thu, 14 Jan 2021 18:44:52 -0800
Subject: [PATCH 0434/1664] Skipping swipe metrics if recents view doesn't
 exist

This will skip generating metrics for fallback recents,
which is not a big loss

Test: manual
Bug: 177472265
Change-Id: I0e167ddc3276246510ea5a22ba04dfd53a8d4eac
---
 .../src/com/android/quickstep/AbsSwipeUpHandler.java  | 11 ++++++-----
 .../quickstep/QuickstepProcessInitializer.java        |  7 ++++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index d648dd6400..38cf09f2d5 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -721,11 +721,12 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
 
     @UiThread
     public void onGestureStarted(boolean isLikelyToStartNewTask) {
-        // Temporarily disable this until we have a view that we can use
-        // InteractionJankMonitorWrapper.begin(mRecentsView,
-        //         InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH, 2000 /* ms timeout */);
-        // InteractionJankMonitorWrapper.begin(mRecentsView,
-        //         InteractionJankMonitorWrapper.CUJ_APP_CLOSE_TO_HOME);
+        if (mRecentsView != null) {
+            InteractionJankMonitorWrapper.begin(mRecentsView,
+                    InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH, 2000 /* ms timeout */);
+            InteractionJankMonitorWrapper.begin(mRecentsView,
+                    InteractionJankMonitorWrapper.CUJ_APP_CLOSE_TO_HOME);
+        }
         notifyGestureStartedAsync();
         setIsLikelyToStartNewTask(isLikelyToStartNewTask, false /* animate */);
         mStateCallback.setStateOnUiThread(STATE_GESTURE_STARTED);
diff --git a/quickstep/src/com/android/quickstep/QuickstepProcessInitializer.java b/quickstep/src/com/android/quickstep/QuickstepProcessInitializer.java
index 80308a58e2..65847f11bb 100644
--- a/quickstep/src/com/android/quickstep/QuickstepProcessInitializer.java
+++ b/quickstep/src/com/android/quickstep/QuickstepProcessInitializer.java
@@ -26,6 +26,7 @@ import com.android.launcher3.BuildConfig;
 import com.android.launcher3.MainProcessInitializer;
 import com.android.launcher3.util.Executors;
 import com.android.quickstep.logging.SettingsChangeLogger;
+import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
 import com.android.systemui.shared.system.ThreadedRendererCompat;
 
 @SuppressWarnings("unused")
@@ -35,7 +36,11 @@ public class QuickstepProcessInitializer extends MainProcessInitializer {
     private static final String TAG = "QuickstepProcessInitializer";
     private static final int SETUP_DELAY_MILLIS = 5000;
 
-    public QuickstepProcessInitializer(Context context) { }
+    public QuickstepProcessInitializer(Context context) {
+        // Fake call to create an instance of InteractionJankMonitor to avoid binder calls during
+        // its initialization during transitions.
+        InteractionJankMonitorWrapper.cancel(-1);
+    }
 
     @Override
     protected void init(Context context) {
-- 
GitLab


From f1bcf7a4ddd1dbfa6ba649f195cf8d5cac4a7032 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Tue, 26 Jan 2021 13:39:27 -0800
Subject: [PATCH 0435/1664] Turn ENABLE_DEVICE_SEARCH to DeviceConfig flag

Change-Id: I6e161bf36b315613bd2f13886cf4ef50470469b0
(cherry picked from commit 650fe52313d9a35de32ad94bb8910bd8d47dc74c)
---
 src/com/android/launcher3/config/FeatureFlags.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 1c5c222084..086d665fcb 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -95,7 +95,7 @@ public final class FeatureFlags {
             "ENABLE_SUGGESTED_ACTIONS_OVERVIEW", true, "Show chip hints on the overview screen");
 
 
-    public static final BooleanFlag ENABLE_DEVICE_SEARCH = getDebugFlag(
+    public static final BooleanFlag ENABLE_DEVICE_SEARCH = new DeviceFlag(
             "ENABLE_DEVICE_SEARCH", false, "Allows on device search in all apps");
 
     public static final BooleanFlag USE_SEARCH_API = getDebugFlag(
-- 
GitLab


From eca678835a0b67c62aa37059a54147755e39be5d Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Thu, 28 Jan 2021 02:47:12 -0800
Subject: [PATCH 0436/1664] Make Thumbnail search result launch intents

Bug: 178454668
Test: Manual
Change-Id: If82724d9ddedce205b2f754023dd989d20f49eab
---
 .../launcher3/search/SearchResultThumbnailView.java  | 12 ++++++++++++
 .../android/launcher3/search/SearchTargetUtil.java   |  1 +
 2 files changed, 13 insertions(+)

diff --git a/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java b/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java
index b1cbe7d36f..dd9546171e 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java
@@ -23,6 +23,7 @@ import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.util.AttributeSet;
 import android.view.View;
+import android.view.ViewGroup;
 
 import androidx.core.graphics.drawable.RoundedBitmapDrawable;
 import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
@@ -55,6 +56,14 @@ public class SearchResultThumbnailView extends androidx.appcompat.widget.AppComp
         super(context, attrs, defStyleAttr);
     }
 
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        setOnFocusChangeListener(Launcher.getLauncher(getContext()).getFocusHandler());
+        setOnClickListener(this);
+        setOnLongClickListener(this);
+    }
+
     @Override
     public void apply(SearchTarget parentTarget, List<SearchTarget> children) {
         mSearchTarget = parentTarget;
@@ -65,6 +74,9 @@ public class SearchResultThumbnailView extends androidx.appcompat.widget.AppComp
                 parentTarget.getPackageName(),
                 parentTarget.getUserHandle(),
                 parentTarget.getSearchAction().getTitle());
+        itemInfo.setIntent(parentTarget.getSearchAction().getIntent());
+        itemInfo.setPendingIntent(parentTarget.getSearchAction().getPendingIntent());
+
         bitmap = ((BitmapDrawable) itemInfo.getIcon()
                 .loadDrawable(getContext())).getBitmap();
         // crop
diff --git a/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java b/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java
index ceef429595..95f4f58a80 100644
--- a/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java
+++ b/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java
@@ -112,6 +112,7 @@ public class SearchTargetUtil {
         Intent intent = new Intent(Intent.ACTION_VIEW)
                 .setData(Uri.parse("uri blah blah"))
                 .setType("image/*")
+                .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
                 .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
         Bitmap bitmap = Bitmap.createBitmap(1000, 500, Bitmap.Config.ARGB_8888);
-- 
GitLab


From 7c1e37cce1327a83ff0ad52ecc6e822e7fe02874 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Thu, 28 Jan 2021 06:13:39 -0600
Subject: [PATCH 0437/1664] Migrate Widgets to new Search API

Test: Manual

Bug: 168321831
Bug: 177223401
Change-Id: Ide276002a47f2345fbe535adbcb3acdc2fbc1233
---
 .../res/layout/search_result_widget_live.xml  | 42 ++++++++++++-
 .../search/DeviceSearchAdapterProvider.java   |  9 ++-
 .../launcher3/search/SearchResultIconRow.java |  1 +
 .../launcher3/search/SearchResultWidget.java  | 61 +++++++++++++++----
 .../search/SearchResultWidgetPreview.java     | 14 ++---
 5 files changed, 103 insertions(+), 24 deletions(-)

diff --git a/quickstep/res/layout/search_result_widget_live.xml b/quickstep/res/layout/search_result_widget_live.xml
index ffbad55838..f2ac6cde9b 100644
--- a/quickstep/res/layout/search_result_widget_live.xml
+++ b/quickstep/res/layout/search_result_widget_live.xml
@@ -1,5 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.android.launcher3.search.SearchResultWidget android:layout_height="wrap_content"
+<com.android.launcher3.search.SearchResultWidget
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingVertical="@dimen/widget_section_vertical_padding"
+    android:layout_marginBottom="@dimen/widget_section_vertical_padding"
     android:gravity="center"
-    android:layout_width="match_parent" />
\ No newline at end of file
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:orientation="horizontal"
+        android:layout_height="wrap_content">
+
+        <com.android.launcher3.BubbleTextView
+            android:id="@+id/widget_provider"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/widget_section_height"
+            android:drawablePadding="@dimen/widget_section_horizontal_padding"
+            android:focusable="true"
+            android:gravity="start|center_vertical"
+            android:paddingHorizontal="@dimen/widget_section_horizontal_padding"
+            android:paddingVertical="@dimen/widget_section_horizontal_padding"
+            android:singleLine="true"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="16sp"
+            android:textAlignment="viewStart"
+            launcher:iconDisplay="widget_section"
+            launcher:layoutHorizontal="true"
+            launcher:iconSizeOverride="@dimen/widget_section_icon_size" />
+
+        <TextView
+            android:id="@+id/widget_label"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/widget_section_height"
+            android:textSize="16sp" />
+
+    </LinearLayout>
+
+</com.android.launcher3.search.SearchResultWidget>
\ No newline at end of file
diff --git a/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java b/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
index 1e6243ce76..02be0b94ed 100644
--- a/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
+++ b/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
@@ -18,10 +18,7 @@ package com.android.launcher3.search;
 
 import static com.android.launcher3.allapps.AllAppsGridAdapter.VIEW_TYPE_ICON;
 
-import android.app.search.Query;
-import android.app.search.SearchSession;
 import android.app.search.SearchTarget;
-import android.app.search.SearchTargetEvent;
 import android.util.Log;
 import android.util.SparseIntArray;
 import android.view.LayoutInflater;
@@ -125,6 +122,7 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
                     return VIEW_TYPE_SEARCH_SLICE;
                 }
                 Log.w(TAG, "Dropping as LayoutType.ICON_SLICE target doesn't contain sliceUri.");
+                break;
             case LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT:
             case LayoutType.ICON_SINGLE_HORIZONTAL_TEXT:
                 return VIEW_TYPE_SEARCH_ICON_ROW;
@@ -133,6 +131,11 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
                     return VIEW_TYPE_SEARCH_THUMBNAIL;
                 }
                 Log.w(TAG, "Dropping as LayoutType.THUMBNAIL target doesn't contain searchAction.");
+                break;
+            case LayoutType.WIDGET_PREVIEW:
+                return VIEW_TYPE_SEARCH_WIDGET_PREVIEW;
+            case LayoutType.WIDGET_LIVE:
+                return VIEW_TYPE_SEARCH_WIDGET_LIVE;
         }
 
         return -1;
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java b/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
index 66214f36bf..eafbc73f11 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
@@ -102,6 +102,7 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan
 
     @Override
     public void apply(SearchTarget parentTarget, List<SearchTarget> children) {
+        showSubtitleIfNeeded(null);
         mResultIcon.applySearchTarget(parentTarget, children, this::onItemInfoCreated);
         if (parentTarget.getShortcutInfo() != null) {
             updateWithShortcutInfo(parentTarget.getShortcutInfo());
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultWidget.java b/quickstep/src/com/android/launcher3/search/SearchResultWidget.java
index 69da515152..da1495930e 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultWidget.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultWidget.java
@@ -25,28 +25,34 @@ import android.util.AttributeSet;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.View;
-import android.widget.RelativeLayout;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.android.launcher3.AppWidgetResizeFrame;
+import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.CheckLongPressHelper;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
 import com.android.launcher3.allapps.search.SearchWidgetInfoContainer;
 import com.android.launcher3.dragndrop.DraggableView;
+import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.touch.ItemLongClickListener;
+import com.android.launcher3.widget.PendingAddWidgetInfo;
+
+import java.util.List;
+
 
 /**
  * displays live version of a widget upon receiving {@link AppWidgetProviderInfo} from Search
  * provider
  */
-public class SearchResultWidget extends RelativeLayout implements
-        SearchTargetHandler, DraggableView {
-
-    private static final String TAG = "SearchResultWidget";
+public class SearchResultWidget extends LinearLayout implements SearchTargetHandler, DraggableView,
+        View.OnLongClickListener {
 
-    public static final String TARGET_TYPE_WIDGET_LIVE = "widget";
 
     private final Rect mWidgetOffset = new Rect();
 
@@ -56,10 +62,9 @@ public class SearchResultWidget extends RelativeLayout implements
     private final AppWidgetHostView mHostView;
     private final float mScaleToFit;
 
-    private SearchTarget mSearchTarget;
-    private AppWidgetProviderInfo mProviderInfo;
-
     private SearchWidgetInfoContainer mInfoContainer;
+    private BubbleTextView mWidgetProvider;
+    private TextView mWidgetLabel;
 
     public SearchResultWidget(@NonNull Context context) {
         this(context, null, 0);
@@ -80,7 +85,8 @@ public class SearchResultWidget extends RelativeLayout implements
 
         // detect tap event on widget container for search target event reporting
         mClickDetector = new GestureDetector(context,
-                new ClickListener(() -> handleSelection(SearchTargetEvent.ACTION_LAUNCH_TOUCH)));
+                new ClickListener(
+                        () -> reportEvent(SearchTargetEvent.ACTION_LAUNCH_TOUCH)));
         mLongPressHelper = new CheckLongPressHelper(this);
         mLongPressHelper.setLongPressTimeoutFactor(1);
         setOnLongClickListener(this);
@@ -89,9 +95,42 @@ public class SearchResultWidget extends RelativeLayout implements
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
+        mWidgetProvider = findViewById(R.id.widget_provider);
+        mWidgetLabel = findViewById(R.id.widget_label);
         addView(mHostView);
     }
 
+    @Override
+    public void apply(SearchTarget parentTarget, List<SearchTarget> children) {
+        AppWidgetProviderInfo providerInfo = parentTarget.getAppWidgetProviderInfo();
+        removeListener();
+
+        showWidgetInfo(providerInfo);
+        mInfoContainer = mLauncher.getLiveSearchManager().getPlaceHolderWidget(providerInfo);
+        if (mInfoContainer == null) {
+            setVisibility(GONE);
+            return;
+        }
+        setVisibility(VISIBLE);
+        mInfoContainer.attachWidget(mHostView);
+        PendingAddWidgetInfo info = (PendingAddWidgetInfo) mHostView.getTag();
+        int[] size = mLauncher.getWorkspace().estimateItemSize(info);
+        mHostView.getLayoutParams().width = size[0];
+        mHostView.getLayoutParams().height = size[1];
+        AppWidgetResizeFrame.updateWidgetSizeRanges(mHostView, mLauncher, info.spanX,
+                info.spanY);
+        mHostView.requestLayout();
+        setTag(info);
+    }
+
+    private void showWidgetInfo(AppWidgetProviderInfo providerInfo) {
+        String title = providerInfo.loadLabel(mLauncher.getPackageManager());
+        PackageItemInfo pinfo = new PackageItemInfo(providerInfo.provider.getPackageName());
+        pinfo.user = providerInfo.getProfile();
+        mWidgetProvider.applyFromItemInfoWithIcon(pinfo);
+        mWidgetLabel.setText(title);
+    }
+
     /**
      * Stops hostView from getting updates on a widget provider
      */
@@ -101,7 +140,7 @@ public class SearchResultWidget extends RelativeLayout implements
         }
     }
 
-    public void handleSelection(int eventType) {
+    private void reportEvent(int eventType) {
         SearchSessionTracker.INSTANCE.get(getContext()).notifyEvent(
                 new SearchTargetEvent.Builder("search target id", eventType).build());
     }
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java b/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java
index c9fc8e17c4..1786baf47c 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java
@@ -54,9 +54,7 @@ public class SearchResultWidgetPreview extends LinearLayout implements SearchTar
     private WidgetCell mWidgetCell;
     private Toast mWidgetToast;
 
-    private SearchTarget mSearchTarget;
-
-
+    private String mTargetId;
     public SearchResultWidgetPreview(Context context) {
         this(context, null, 0);
     }
@@ -83,7 +81,7 @@ public class SearchResultWidgetPreview extends LinearLayout implements SearchTar
 
     @Override
     public void apply(SearchTarget parentTarget, List<SearchTarget> children) {
-        mSearchTarget = parentTarget;
+        mTargetId = parentTarget.getId();
         AppWidgetProviderInfo providerInfo = parentTarget.getAppWidgetProviderInfo();
         LauncherAppWidgetProviderInfo pInfo = LauncherAppWidgetProviderInfo.fromProviderInfo(
                 getContext(), providerInfo);
@@ -114,18 +112,18 @@ public class SearchResultWidgetPreview extends LinearLayout implements SearchTar
         new PendingItemDragHelper(mWidgetCell).startDrag(
                 imageView.getBitmapBounds(), imageView.getBitmap().getWidth(), imageView.getWidth(),
                 new Point(loc[0], loc[1]), mLauncher.getAppsView(), new DragOptions());
-        handleSelection(SearchTargetEvent.ACTION_LONGPRESS);
+        reportEvent(SearchTargetEvent.ACTION_LONGPRESS);
         return true;
     }
 
     @Override
     public void onClick(View view) {
         mWidgetToast = BaseWidgetSheet.showWidgetToast(getContext(), mWidgetToast);
-        handleSelection(SearchTargetEvent.ACTION_LAUNCH_TOUCH);
+        reportEvent(SearchTargetEvent.ACTION_LAUNCH_TOUCH);
     }
 
-    public void handleSelection(int eventType) {
+    private void reportEvent(int eventType) {
         SearchSessionTracker.INSTANCE.get(getContext()).notifyEvent(
-                new SearchTargetEvent.Builder(mSearchTarget.getId(), eventType).build());
+                new SearchTargetEvent.Builder(mTargetId, eventType).build());
     }
 }
-- 
GitLab


From f19a809f72ef8d1595ec82cbef295bec078ea207 Mon Sep 17 00:00:00 2001
From: "[1;3C" <erosky@google.com>
Date: Wed, 9 Dec 2020 13:28:22 -0800
Subject: [PATCH 0438/1664] Map shell transition to recents animation

This hooks up the essential start/finish. One thing to note
is that it uses the normal startActivity rather than a special
startRecents call for shell transitions.

Bug: 162503077
Test: Enable shell transit. Open an app, use gesture to open
      recents.
Change-Id: Ia51fa8baeb43bf3fa768b25a840b629ec94e16a1
---
 .../quickstep/TaskAnimationManager.java       | 23 +++++++++++++++++--
 .../quickstep/TouchInteractionService.java    |  2 +-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/TaskAnimationManager.java b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
index 6f2f86eac2..02c27636fc 100644
--- a/quickstep/src/com/android/quickstep/TaskAnimationManager.java
+++ b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
@@ -21,7 +21,10 @@ import static com.android.quickstep.GestureState.GestureEndTarget.RECENTS;
 import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_INITIALIZED;
 import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_STARTED;
 
+import android.content.Context;
 import android.content.Intent;
+import android.os.Bundle;
+import android.os.SystemProperties;
 import android.util.Log;
 
 import androidx.annotation.UiThread;
@@ -30,11 +33,15 @@ import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.systemui.shared.recents.model.ThumbnailData;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
+import com.android.systemui.shared.system.ActivityOptionsCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
+import com.android.systemui.shared.system.RemoteTransitionCompat;
 
 import java.util.function.Consumer;
 
 public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAnimationListener {
+    public static final boolean ENABLE_SHELL_TRANSITIONS =
+            SystemProperties.getBoolean("persist.debug.shell_transit", false);
 
     private RecentsAnimationController mController;
     private RecentsAnimationCallbacks mCallbacks;
@@ -43,7 +50,11 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
     private GestureState mLastGestureState;
     private RemoteAnimationTargetCompat mLastAppearedTaskTarget;
     private Consumer<RemoteAnimationTargetCompat> mLaunchOtherTaskHandler;
+    private Context mCtx;
 
+    TaskAnimationManager(Context ctx) {
+        mCtx = ctx;
+    }
     /**
      * Preloads the recents animation.
      */
@@ -122,8 +133,16 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
         final long eventTime = gestureState.getSwipeUpStartTimeMs();
         mCallbacks.addListener(gestureState);
         mCallbacks.addListener(listener);
-        UI_HELPER_EXECUTOR.execute(() -> ActivityManagerWrapper.getInstance()
-                .startRecentsActivity(intent, eventTime, mCallbacks, null, null));
+
+        if (ENABLE_SHELL_TRANSITIONS) {
+            RemoteTransitionCompat transition = new RemoteTransitionCompat(mCallbacks,
+                    mController != null ? mController.getController() : null);
+            Bundle options = ActivityOptionsCompat.makeRemoteTransition(transition).toBundle();
+            mCtx.startActivity(intent, options);
+        } else {
+            UI_HELPER_EXECUTOR.execute(() -> ActivityManagerWrapper.getInstance()
+                    .startRecentsActivity(intent, eventTime, mCallbacks, null, null));
+        }
         gestureState.setState(STATE_RECENTS_ANIMATION_INITIALIZED);
         return mCallbacks;
     }
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 196cae754d..0f409374bb 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -309,7 +309,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
 
     @UiThread
     public void onUserUnlocked() {
-        mTaskAnimationManager = new TaskAnimationManager();
+        mTaskAnimationManager = new TaskAnimationManager(this);
         mOverviewComponentObserver = new OverviewComponentObserver(this, mDeviceState);
         mOverviewCommandHelper = new OverviewCommandHelper(this, mDeviceState,
                 mOverviewComponentObserver);
-- 
GitLab


From 78fb71458f1ff6ad3fcd3c65560aab83326fd516 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Wed, 27 Jan 2021 16:54:45 -0800
Subject: [PATCH 0439/1664] Fix incorrect launcher loading.

Apps that were installed and downloading incrementally would be shown as fully downloaded on reboot. Updated LoaderTask and AppInfo.updateRuntimeFlagsForActivityTarget to account for this.

Fixes: 178528867

Test: manual with hardcoded values

Change-Id: I088e43ae886b4157bad9f4fa8d40373cf7f8235a
(cherry picked from commit 6d0fec8ac774679eeed95a623bfda863db66fd66)
---
 src/com/android/launcher3/model/LoaderTask.java | 17 ++++++++---------
 .../android/launcher3/model/data/AppInfo.java   |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index f74c8b5c1c..8438622dca 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -588,27 +588,26 @@ public class LoaderTask implements Runnable {
                                 if (isSafeMode && !isSystemApp(context, intent)) {
                                     info.runtimeStatusFlags |= FLAG_DISABLED_SAFEMODE;
                                 }
+                                    LauncherActivityInfo activityInfo = c.getLauncherActivityInfo();
+                                    if (activityInfo != null) {
+                                        info.setProgressLevel(
+                                                PackageManagerHelper
+                                                    .getLoadingProgress(activityInfo),
+                                                PackageInstallInfo.STATUS_INSTALLED_DOWNLOADING);
+                                    }
 
                                 if (c.restoreFlag != 0 && !TextUtils.isEmpty(targetPkg)) {
                                     tempPackageKey.update(targetPkg, c.user);
                                     SessionInfo si = installingPkgs.get(tempPackageKey);
-                                        LauncherActivityInfo activityInfo =
-                                                c.getLauncherActivityInfo();
                                         if (si == null) {
                                             info.runtimeStatusFlags &=
-                                                    ~ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE;
+                                                ~ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE;
                                         } else if (activityInfo == null) {
                                             int installProgress = (int) (si.getProgress() * 100);
 
                                             info.setProgressLevel(
                                                     installProgress,
                                                     PackageInstallInfo.STATUS_INSTALLING);
-                                        } else {
-                                            info.setProgressLevel(
-                                                    PackageManagerHelper
-                                                            .getLoadingProgress(activityInfo),
-                                                    PackageInstallInfo
-                                                            .STATUS_INSTALLED_DOWNLOADING);
                                         }
                                 }
 
diff --git a/src/com/android/launcher3/model/data/AppInfo.java b/src/com/android/launcher3/model/data/AppInfo.java
index dde0cf4674..7f70bade3c 100644
--- a/src/com/android/launcher3/model/data/AppInfo.java
+++ b/src/com/android/launcher3/model/data/AppInfo.java
@@ -179,7 +179,7 @@ public class AppInfo extends ItemInfoWithIcon {
         // Sets the progress level, installation and incremental download flags.
         info.setProgressLevel(
                 PackageManagerHelper.getLoadingProgress(lai),
-                PackageInstallInfo.STATUS_INSTALLED);
+                PackageInstallInfo.STATUS_INSTALLED_DOWNLOADING);
     }
 
     @Override
-- 
GitLab


From d9b6d6a86f28ce757160f10a2bd32d3527516af5 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Thu, 28 Jan 2021 16:16:33 -0800
Subject: [PATCH 0440/1664] Check whether the running task view is non null
 before setting it to be not clickable for live tile

Fixes: 178746755
Test: N/A
Change-Id: Ia8d8bc48a31e4d1babcb948bb27717d14cdb1247
---
 quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 5a2d6daac0..39a3a7c40c 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1451,7 +1451,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
     private void finishCurrentTransitionToRecents() {
         if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
             mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);
-            mRecentsView.getRunningTaskView().setIsClickableAsLiveTile(true);
+            final TaskView runningTaskView = mRecentsView.getRunningTaskView();
+            if (runningTaskView != null) {
+                runningTaskView.setIsClickableAsLiveTile(true);
+            }
         } else if (!hasTargets() || mRecentsAnimationController == null) {
             // If there are no targets or the animation not started, then there is nothing to finish
             mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);
-- 
GitLab


From b40b98db3a6eb7f75207a835b4c637d2b53de09a Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Thu, 21 Jan 2021 14:41:07 -0800
Subject: [PATCH 0441/1664] Update FloatingIconView to display
 PreloadIconDrawables during swipe home animations.

Swiping up to go home on an app that is downloading incrementally would cause a jittery animation. Updated FloatingIconView to animate directly to a PreloadIconDrawable.

Demo: https://drive.google.com/file/d/1ddr8OGR4c1ZneyQ0VkkAAxGpwNcP8Wyn/view?usp=sharing

Fixes: 177685929

Test: manual
Change-Id: I4cd2daa18f6d3fed42a9b666063e0b1c1c46e5d9
(cherry picked from commit b8cab8d8786a7de6adfcd5b77af9408e832ed0c2)
---
 src/com/android/launcher3/BubbleTextView.java | 88 ++++++++++++-------
 .../android/launcher3/FastBitmapDrawable.java |  6 +-
 .../launcher3/allapps/AllAppsStore.java       |  2 +-
 .../graphics/PreloadIconDrawable.java         | 44 +++++++++-
 .../launcher3/icons/ClockDrawableWrapper.java |  2 +-
 .../launcher3/views/FloatingIconView.java     | 25 +++++-
 6 files changed, 124 insertions(+), 43 deletions(-)

diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 22eb15a8e2..575d6cd8e6 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -301,7 +301,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         verifyHighRes();
 
         if ((info.runtimeStatusFlags & ItemInfoWithIcon.FLAG_SHOW_DOWNLOAD_PROGRESS_MASK) != 0) {
-            applyProgressLevel(info.getProgressLevel());
+            applyProgressLevel();
         }
         applyDotState(info, false /* animate */);
     }
@@ -603,21 +603,20 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
      * with the total download progress.
      */
     public void applyLoadingState(boolean promiseStateChanged) {
-        if (getTag() instanceof WorkspaceItemInfo) {
+        if (getTag() instanceof ItemInfoWithIcon) {
             WorkspaceItemInfo info = (WorkspaceItemInfo) getTag();
-            int progressLevel = info.getProgressLevel();
             if ((info.runtimeStatusFlags & ItemInfoWithIcon.FLAG_INCREMENTAL_DOWNLOAD_ACTIVE)
                     != 0) {
-                updateProgressBarUi(progressLevel, progressLevel == 100);
+                updateProgressBarUi(info.getProgressLevel() == 100);
             } else if (info.hasPromiseIconUi() || (info.runtimeStatusFlags
-                    & ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE) != 0) {
-                updateProgressBarUi(progressLevel, promiseStateChanged);
+                        & ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE) != 0) {
+                updateProgressBarUi(promiseStateChanged);
             }
         }
     }
 
-    private void updateProgressBarUi(int progressLevel, boolean maybePerformFinishedAnimation) {
-        PreloadIconDrawable preloadDrawable = applyProgressLevel(progressLevel);
+    private void updateProgressBarUi(boolean maybePerformFinishedAnimation) {
+        PreloadIconDrawable preloadDrawable = applyProgressLevel();
         if (preloadDrawable != null && maybePerformFinishedAnimation) {
             preloadDrawable.maybePerformFinishedAnimation();
         }
@@ -625,38 +624,59 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
 
     /** Applies the given progress level to the this icon's progress bar. */
     @Nullable
-    public PreloadIconDrawable applyProgressLevel(int progressLevel) {
-        if (getTag() instanceof ItemInfoWithIcon) {
-            ItemInfoWithIcon info = (ItemInfoWithIcon) getTag();
-            if (progressLevel >= 100) {
-                setContentDescription(info.contentDescription != null
-                        ? info.contentDescription : "");
-            } else if (progressLevel > 0) {
-                setContentDescription(getContext()
-                        .getString(R.string.app_downloading_title, info.title,
-                                NumberFormat.getPercentInstance().format(progressLevel * 0.01)));
+    public PreloadIconDrawable applyProgressLevel() {
+        if (!(getTag() instanceof ItemInfoWithIcon)) {
+            return null;
+        }
+
+        ItemInfoWithIcon info = (ItemInfoWithIcon) getTag();
+        int progressLevel = info.getProgressLevel();
+        if (progressLevel >= 100) {
+            setContentDescription(info.contentDescription != null
+                    ? info.contentDescription : "");
+        } else if (progressLevel > 0) {
+            setContentDescription(getContext()
+                    .getString(R.string.app_downloading_title, info.title,
+                            NumberFormat.getPercentInstance().format(progressLevel * 0.01)));
+        } else {
+            setContentDescription(getContext()
+                    .getString(R.string.app_waiting_download_title, info.title));
+        }
+        if (mIcon != null) {
+            PreloadIconDrawable preloadIconDrawable;
+            if (mIcon instanceof PreloadIconDrawable) {
+                preloadIconDrawable = (PreloadIconDrawable) mIcon;
+                preloadIconDrawable.setLevel(progressLevel);
+                preloadIconDrawable.setIsDisabled(!info.isAppStartable());
             } else {
-                setContentDescription(getContext()
-                        .getString(R.string.app_waiting_download_title, info.title));
-            }
-            if (mIcon != null) {
-                final PreloadIconDrawable preloadDrawable;
-                if (mIcon instanceof PreloadIconDrawable) {
-                    preloadDrawable = (PreloadIconDrawable) mIcon;
-                    preloadDrawable.setLevel(progressLevel);
-                    preloadDrawable.setIsDisabled(!info.isAppStartable());
-                } else {
-                    preloadDrawable = newPendingIcon(getContext(), info);
-                    preloadDrawable.setLevel(progressLevel);
-                    preloadDrawable.setIsDisabled(!info.isAppStartable());
-                    setIcon(preloadDrawable);
-                }
-                return preloadDrawable;
+                preloadIconDrawable = makePreloadIcon();
+                setIcon(preloadIconDrawable);
             }
+            return preloadIconDrawable;
         }
         return null;
     }
 
+    /**
+     * Creates a PreloadIconDrawable with the appropriate progress level without mutating this
+     * object.
+     */
+    @Nullable
+    public PreloadIconDrawable makePreloadIcon() {
+        if (!(getTag() instanceof ItemInfoWithIcon)) {
+            return null;
+        }
+
+        ItemInfoWithIcon info = (ItemInfoWithIcon) getTag();
+        int progressLevel = info.getProgressLevel();
+        final PreloadIconDrawable preloadDrawable = newPendingIcon(getContext(), info);
+
+        preloadDrawable.setLevel(progressLevel);
+        preloadDrawable.setIsDisabled(!info.isAppStartable());
+
+        return preloadDrawable;
+    }
+
     public void applyDotState(ItemInfo itemInfo, boolean animate) {
         if (mIcon instanceof FastBitmapDrawable) {
             boolean wasDotted = mDotInfo != null;
diff --git a/src/com/android/launcher3/FastBitmapDrawable.java b/src/com/android/launcher3/FastBitmapDrawable.java
index 139d4a85e4..b1fe4a235c 100644
--- a/src/com/android/launcher3/FastBitmapDrawable.java
+++ b/src/com/android/launcher3/FastBitmapDrawable.java
@@ -276,15 +276,15 @@ public class FastBitmapDrawable extends Drawable {
 
     @Override
     public ConstantState getConstantState() {
-        return new MyConstantState(mBitmap, mIconColor, mIsDisabled);
+        return new FastBitmapConstantState(mBitmap, mIconColor, mIsDisabled);
     }
 
-    protected static class MyConstantState extends ConstantState {
+    protected static class FastBitmapConstantState extends ConstantState {
         protected final Bitmap mBitmap;
         protected final int mIconColor;
         protected final boolean mIsDisabled;
 
-        public MyConstantState(Bitmap bitmap, int color, boolean isDisabled) {
+        public FastBitmapConstantState(Bitmap bitmap, int color, boolean isDisabled) {
             mBitmap = bitmap;
             mIconColor = color;
             mIsDisabled = isDisabled;
diff --git a/src/com/android/launcher3/allapps/AllAppsStore.java b/src/com/android/launcher3/allapps/AllAppsStore.java
index 00bdb70c4a..769cb5e31b 100644
--- a/src/com/android/launcher3/allapps/AllAppsStore.java
+++ b/src/com/android/launcher3/allapps/AllAppsStore.java
@@ -154,7 +154,7 @@ public class AllAppsStore {
     public void updateProgressBar(AppInfo app) {
         updateAllIcons((child) -> {
             if (child.getTag() == app) {
-                child.applyProgressLevel(app.getProgressLevel());
+                child.applyProgressLevel();
             }
         });
     }
diff --git a/src/com/android/launcher3/graphics/PreloadIconDrawable.java b/src/com/android/launcher3/graphics/PreloadIconDrawable.java
index 9971990267..304d49692e 100644
--- a/src/com/android/launcher3/graphics/PreloadIconDrawable.java
+++ b/src/com/android/launcher3/graphics/PreloadIconDrawable.java
@@ -105,6 +105,10 @@ public class PreloadIconDrawable extends FastBitmapDrawable {
     private ObjectAnimator mCurrentAnim;
 
     public PreloadIconDrawable(ItemInfoWithIcon info, Context context) {
+        this(info, IconPalette.getPreloadProgressColor(context, info.bitmap.color));
+    }
+
+    public PreloadIconDrawable(ItemInfoWithIcon info, int indicatorColor) {
         super(info.bitmap);
         mItem = info;
         mShapePath = getShapePath();
@@ -114,7 +118,7 @@ public class PreloadIconDrawable extends FastBitmapDrawable {
         mProgressPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG);
         mProgressPaint.setStyle(Paint.Style.STROKE);
         mProgressPaint.setStrokeCap(Paint.Cap.ROUND);
-        mIndicatorColor = IconPalette.getPreloadProgressColor(context, mIconColor);
+        mIndicatorColor = indicatorColor;
 
         setInternalProgress(0);
 
@@ -297,4 +301,42 @@ public class PreloadIconDrawable extends FastBitmapDrawable {
     public static PreloadIconDrawable newPendingIcon(Context context, ItemInfoWithIcon info) {
         return new PreloadIconDrawable(info, context);
     }
+
+    @Override
+    public ConstantState getConstantState() {
+        return new PreloadIconConstantState(
+                mBitmap, mIconColor, !mItem.isAppStartable(), mItem, mIndicatorColor);
+    }
+
+    protected static class PreloadIconConstantState extends FastBitmapConstantState {
+
+        protected final ItemInfoWithIcon mInfo;
+        protected final int mIndicatorColor;
+        protected final int mLevel;
+
+        public PreloadIconConstantState(
+                Bitmap bitmap,
+                int iconColor,
+                boolean isDisabled,
+                ItemInfoWithIcon info,
+                int indicatorcolor) {
+            super(bitmap, iconColor, isDisabled);
+            mInfo = info;
+            mIndicatorColor = indicatorcolor;
+            mLevel = info.getProgressLevel();
+        }
+
+        @Override
+        public PreloadIconDrawable newDrawable() {
+            PreloadIconDrawable drawable = new PreloadIconDrawable(mInfo, mIndicatorColor);
+            drawable.setLevel(mLevel);
+            drawable.setIsDisabled(mIsDisabled);
+            return drawable;
+        }
+
+        @Override
+        public int getChangingConfigurations() {
+            return 0;
+        }
+    }
 }
diff --git a/src/com/android/launcher3/icons/ClockDrawableWrapper.java b/src/com/android/launcher3/icons/ClockDrawableWrapper.java
index b7dd092ab4..1bd252ba45 100644
--- a/src/com/android/launcher3/icons/ClockDrawableWrapper.java
+++ b/src/com/android/launcher3/icons/ClockDrawableWrapper.java
@@ -308,7 +308,7 @@ public class ClockDrawableWrapper extends AdaptiveIconDrawable implements Bitmap
             return new ClockConstantState(mInfo, isDisabled());
         }
 
-        private static class ClockConstantState extends MyConstantState {
+        private static class ClockConstantState extends FastBitmapConstantState {
 
             private final ClockBitmapInfo mInfo;
 
diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java
index 1857c5a7b4..23c3722aca 100644
--- a/src/com/android/launcher3/views/FloatingIconView.java
+++ b/src/com/android/launcher3/views/FloatingIconView.java
@@ -51,8 +51,10 @@ import com.android.launcher3.Utilities;
 import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.dragndrop.FolderAdaptiveIcon;
 import com.android.launcher3.folder.FolderIcon;
+import com.android.launcher3.graphics.PreloadIconDrawable;
 import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.popup.SystemShortcut;
 import com.android.launcher3.shortcuts.DeepShortcutView;
 
@@ -252,12 +254,26 @@ public class FloatingIconView extends FrameLayout implements
     @SuppressWarnings("WrongThread")
     private static void getIconResult(Launcher l, View originalView, ItemInfo info, RectF pos,
             IconLoadResult iconLoadResult) {
-        Drawable drawable = null;
+        Drawable drawable;
+        Drawable btvIcon;
         Drawable badge = null;
         boolean supportsAdaptiveIcons = ADAPTIVE_ICON_WINDOW_ANIM.get()
                 && !info.isDisabled(); // Use original icon for disabled icons.
-        Drawable btvIcon = originalView instanceof BubbleTextView
-                ? ((BubbleTextView) originalView).getIcon() : null;
+
+        if (originalView instanceof BubbleTextView) {
+            BubbleTextView btv = (BubbleTextView) originalView;
+
+            if (info instanceof ItemInfoWithIcon
+                    && (((ItemInfoWithIcon) info).runtimeStatusFlags
+                        & ItemInfoWithIcon.FLAG_SHOW_DOWNLOAD_PROGRESS_MASK) != 0) {
+                btvIcon = btv.makePreloadIcon();
+            } else {
+                btvIcon = btv.getIcon();
+            }
+        } else {
+            btvIcon = null;
+        }
+
         if (info instanceof SystemShortcut) {
             if (originalView instanceof ImageView) {
                 drawable = ((ImageView) originalView).getDrawable();
@@ -266,6 +282,9 @@ public class FloatingIconView extends FrameLayout implements
             } else {
                 drawable = originalView.getBackground();
             }
+        } else if (btvIcon instanceof PreloadIconDrawable) {
+            // Force the progress bar to display.
+            drawable = btvIcon;
         } else {
             int width = (int) pos.width();
             int height = (int) pos.height();
-- 
GitLab


From 954bb63899e27f1cf85f14896f0597f58661f10e Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Wed, 27 Jan 2021 14:03:51 -0800
Subject: [PATCH 0442/1664] Fix launcher flicker when unlocking on seascape.

Test: manual

Fixes: 160544577

Launcher flickers if it is locked on portrait, then unlocked on seascape. DisplayController.Info was consistenly being updated late causing launcher to unlock in lanscape then switching to seascape with enough frames in-between for the user to notice. Updated DisplayController to properly update its rotation info and updated DeviceProfile to force an info update when checking if the device is in seascape orientation.

demo: https://drive.google.com/file/d/1JBCvK3brLwOSTC4k56GSxeYozl5x0k7X/view?usp=sharing
Change-Id: Idce139f0e16cb686684c0d3a460c4ec9e5ae466a
---
 src/com/android/launcher3/DeviceProfile.java  |  5 ++--
 .../launcher3/util/DisplayController.java     | 24 +++++++++++++++----
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 12ce9f3448..f681d75eef 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -607,8 +607,9 @@ public class DeviceProfile {
      */
     public boolean updateIsSeascape(Context context) {
         if (isVerticalBarLayout()) {
-            boolean isSeascape = DisplayController.getDefaultDisplay(context).getInfo().rotation
-                    == Surface.ROTATION_270;
+            // Check an up-to-date info.
+            boolean isSeascape = DisplayController.getDefaultDisplay(context)
+                    .createInfoForContext(context).rotation == Surface.ROTATION_270;
             if (mIsSeascape != isSeascape) {
                 mIsSeascape = isSeascape;
                 return true;
diff --git a/src/com/android/launcher3/util/DisplayController.java b/src/com/android/launcher3/util/DisplayController.java
index 355c949325..3b7bcc285a 100644
--- a/src/com/android/launcher3/util/DisplayController.java
+++ b/src/com/android/launcher3/util/DisplayController.java
@@ -31,6 +31,8 @@ import android.view.Display;
 
 import androidx.annotation.VisibleForTesting;
 
+import com.android.launcher3.Utilities;
+
 import java.util.ArrayList;
 
 /**
@@ -179,23 +181,35 @@ public class DisplayController implements DisplayListener {
             return mInfo;
         }
 
+        /** Creates and up-to-date DisplayController.Info for the given context. */
+        public Info createInfoForContext(Context context) {
+            Display display = Utilities.ATLEAST_R
+                    ? context.getDisplay()
+                    : context
+                        .getSystemService(DisplayManager.class)
+                        .getDisplay(mId);
+            return display == null
+                    ? new Info(context)
+                    : new Info(context, display);
+        }
+
         protected void handleOnChange() {
             Info oldInfo = mInfo;
-            Info info = new Info(mDisplayContext);
+            Info newInfo = createInfoForContext(mDisplayContext);
 
             int change = 0;
-            if (info.hasDifferentSize(oldInfo)) {
+            if (newInfo.hasDifferentSize(oldInfo)) {
                 change |= CHANGE_SIZE;
             }
-            if (oldInfo.rotation != info.rotation) {
+            if (newInfo.rotation != oldInfo.rotation) {
                 change |= CHANGE_ROTATION;
             }
-            if (info.singleFrameMs != oldInfo.singleFrameMs) {
+            if (newInfo.singleFrameMs != oldInfo.singleFrameMs) {
                 change |= CHANGE_FRAME_DELAY;
             }
 
             if (change != 0) {
-                mInfo = info;
+                mInfo = newInfo;
                 final int flags = change;
                 MAIN_EXECUTOR.execute(() -> notifyChange(flags));
             }
-- 
GitLab


From f28db55c96716acf443af0b370c6f67646757f8a Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Thu, 28 Jan 2021 05:52:25 -0600
Subject: [PATCH 0443/1664] Support people search results

+ Introduce temporary workaround icon loading with URLConnection for play results

Manual: go/search-action-icon

Bug: 177223401
Test: Manual
Change-Id: Ie8e7963447640d98abb9830ec05f26b28ec58345
---
 .../res/layout/search_result_icon_row.xml     |  19 +-
 .../res/layout/search_result_people_item.xml  |  63 ------
 .../search/DeviceSearchAdapterProvider.java   |   3 +-
 .../launcher3/search/SearchAdapterItem.java   |   8 +-
 .../launcher3/search/SearchResultIcon.java    | 131 ++++++++----
 .../launcher3/search/SearchResultIconRow.java |  24 +--
 .../search/SearchResultIconSlice.java         |  12 --
 .../search/SearchResultPeopleView.java        | 199 ------------------
 .../search/SearchResultThumbnailView.java     |   9 +-
 .../launcher3/search/SearchResultWidget.java  |   4 -
 .../search/SearchResultWidgetPreview.java     |   3 +-
 .../search/SearchSectionHeaderView.java       |  12 --
 .../search/SearchServicePipeline.java         |   4 +-
 .../launcher3/search/SearchTargetHandler.java |   4 +-
 .../launcher3/search/SearchTargetUtil.java    |  33 ++-
 .../model/data/SearchActionItemInfo.java      |   2 +-
 .../shared/SearchTargetEventLegacy.java       |   2 +-
 17 files changed, 144 insertions(+), 388 deletions(-)
 delete mode 100644 quickstep/res/layout/search_result_people_item.xml
 delete mode 100644 quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java

diff --git a/quickstep/res/layout/search_result_icon_row.xml b/quickstep/res/layout/search_result_icon_row.xml
index 2119fc3425..81190cfc56 100644
--- a/quickstep/res/layout/search_result_icon_row.xml
+++ b/quickstep/res/layout/search_result_icon_row.xml
@@ -57,9 +57,10 @@
         style="@style/BaseIcon"
         android:layout_width="@dimen/deep_shortcut_icon_size"
         android:layout_height="match_parent"
-        android:gravity="start|center_vertical"
+        android:layout_marginStart="4dp"
+        android:gravity="center"
         launcher:iconDisplay="shortcut_popup"
-        android:textSize="@dimen/search_hero_subtitle_size"
+        android:textSize="@dimen/search_hero_inline_button_size"
         launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size"
         launcher:layoutHorizontal="false" />
 
@@ -68,6 +69,20 @@
         style="@style/BaseIcon"
         android:layout_width="@dimen/deep_shortcut_icon_size"
         android:layout_height="match_parent"
+        android:layout_marginStart="4dp"
+        android:gravity="center"
+        launcher:iconDisplay="shortcut_popup"
+        android:textSize="@dimen/search_hero_inline_button_size"
+        launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size"
+        launcher:layoutHorizontal="false" />
+
+    <com.android.launcher3.search.SearchResultIcon
+        android:id="@+id/shortcut_2"
+        style="@style/BaseIcon"
+        android:layout_width="@dimen/deep_shortcut_icon_size"
+        android:layout_height="match_parent"
+        android:layout_marginStart="4dp"
+        android:gravity="center"
         launcher:iconDisplay="shortcut_popup"
         android:textSize="@dimen/search_hero_inline_button_size"
         launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size"
diff --git a/quickstep/res/layout/search_result_people_item.xml b/quickstep/res/layout/search_result_people_item.xml
deleted file mode 100644
index 964300dd20..0000000000
--- a/quickstep/res/layout/search_result_people_item.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.launcher3.search.SearchResultPeopleView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:gravity="center_vertical"
-    android:layout_height="wrap_content"
-    android:padding="8dp"
-    android:orientation="horizontal">
-
-    <View
-        android:id="@+id/icon"
-        android:layout_marginRight="8dp"
-        android:layout_width="@dimen/deep_shortcut_icon_size"
-        android:layout_height="@dimen/deep_shortcut_icon_size" />
-
-    <TextView
-        android:layout_width="0dp"
-        android:textColor="?android:attr/textColorPrimary"
-        android:id="@+id/title"
-        android:textSize="@dimen/search_hero_title_size"
-        android:layout_height="wrap_content"
-        android:layout_weight="1" />
-
-    <ImageButton
-        android:id="@+id/provider_0"
-        android:scaleType="fitCenter"
-        android:adjustViewBounds="true"
-        android:layout_margin="5dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:layout_width="@dimen/deep_shortcut_icon_size"
-        android:layout_height="@dimen/deep_shortcut_icon_size" />
-
-    <ImageButton
-        android:id="@+id/provider_1"
-        android:layout_margin="5dp"
-        android:scaleType="fitCenter"
-        android:adjustViewBounds="true"
-        android:background="?android:attr/selectableItemBackground"
-        android:layout_width="@dimen/deep_shortcut_icon_size"
-        android:layout_height="@dimen/deep_shortcut_icon_size" />
-
-    <ImageButton
-        android:id="@+id/provider_2"
-        android:layout_margin="5dp"
-        android:scaleType="fitCenter"
-        android:adjustViewBounds="true"
-        android:background="?android:attr/selectableItemBackground"
-        android:layout_width="@dimen/deep_shortcut_icon_size"
-        android:layout_height="@dimen/deep_shortcut_icon_size" />
-
-</com.android.launcher3.search.SearchResultPeopleView>
\ No newline at end of file
diff --git a/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java b/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
index 02be0b94ed..acf6c150cf 100644
--- a/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
+++ b/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
@@ -41,7 +41,6 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
     public static final int VIEW_TYPE_SEARCH_SLICE = 1 << 7;
     public static final int VIEW_TYPE_SEARCH_ICON = (1 << 8) | VIEW_TYPE_ICON;
     public static final int VIEW_TYPE_SEARCH_ICON_ROW = (1 << 9);
-    public static final int VIEW_TYPE_SEARCH_PEOPLE = 1 << 11;
     public static final int VIEW_TYPE_SEARCH_THUMBNAIL = 1 << 12;
     public static final int VIEW_TYPE_SEARCH_WIDGET_LIVE = 1 << 15;
     public static final int VIEW_TYPE_SEARCH_WIDGET_PREVIEW = 1 << 16;
@@ -59,7 +58,6 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_ICON, R.layout.search_result_icon);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_ICON_ROW, R.layout.search_result_icon_row);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_SLICE, R.layout.search_result_slice);
-        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_PEOPLE, R.layout.search_result_people_item);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_THUMBNAIL, R.layout.search_result_thumbnail);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_WIDGET_LIVE, R.layout.search_result_widget_live);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_WIDGET_PREVIEW,
@@ -125,6 +123,7 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
                 break;
             case LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT:
             case LayoutType.ICON_SINGLE_HORIZONTAL_TEXT:
+            case LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT_BUTTON:
                 return VIEW_TYPE_SEARCH_ICON_ROW;
             case LayoutType.THUMBNAIL:
                 if (t.getSearchAction() != null) {
diff --git a/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java b/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
index 0eb3edb555..b402f61979 100644
--- a/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
+++ b/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
@@ -18,7 +18,6 @@ package com.android.launcher3.search;
 
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_ICON;
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_ICON_ROW;
-import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_PEOPLE;
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_SLICE;
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_THUMBNAIL;
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_WIDGET_LIVE;
@@ -42,9 +41,10 @@ public class SearchAdapterItem extends AllAppsGridAdapter.AdapterItem {
 
 
     private static final int AVAILABLE_FOR_ACCESSIBILITY =
-            VIEW_TYPE_SEARCH_SLICE | VIEW_TYPE_SEARCH_PEOPLE | VIEW_TYPE_SEARCH_THUMBNAIL
-                    | VIEW_TYPE_SEARCH_ICON_ROW | VIEW_TYPE_SEARCH_ICON
-                    | VIEW_TYPE_SEARCH_WIDGET_PREVIEW | VIEW_TYPE_SEARCH_WIDGET_LIVE;
+            VIEW_TYPE_SEARCH_SLICE | VIEW_TYPE_SEARCH_THUMBNAIL | VIEW_TYPE_SEARCH_ICON_ROW
+                    | VIEW_TYPE_SEARCH_ICON | VIEW_TYPE_SEARCH_WIDGET_PREVIEW
+                    | VIEW_TYPE_SEARCH_WIDGET_LIVE;
+
 
     public SearchAdapterItem(SearchTargetLegacy searchTargetLegacy, int type) {
         mSearchTargetLegacy = searchTargetLegacy;
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
index 3d89ac5e27..c353d7aa3c 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
@@ -15,12 +15,9 @@
  */
 package com.android.launcher3.search;
 
-import static com.android.launcher3.model.data.SearchActionItemInfo.FLAG_BADGE_FROM_ICON;
+import static com.android.launcher3.model.data.SearchActionItemInfo.FLAG_BADGE_WITH_PACKAGE;
 import static com.android.launcher3.model.data.SearchActionItemInfo.FLAG_PRIMARY_ICON_FROM_TITLE;
-import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_BADGE_FROM_ICON;
 import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE;
-import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_SHOULD_START;
-import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_SHOULD_START_FOR_RESULT;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
@@ -30,9 +27,14 @@ import android.app.search.SearchTargetEvent;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.ShortcutInfo;
-import android.graphics.drawable.Drawable;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.Rect;
+import android.graphics.RectF;
 import android.graphics.drawable.Icon;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.util.AttributeSet;
@@ -45,6 +47,7 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.allapps.AllAppsStore;
 import com.android.launcher3.icons.BitmapInfo;
+import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
@@ -54,14 +57,25 @@ import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.touch.ItemClickHandler;
 import com.android.launcher3.touch.ItemLongClickListener;
 import com.android.launcher3.util.ComponentKey;
+import com.android.launcher3.util.Themes;
 
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLConnection;
 import java.util.List;
 import java.util.function.Consumer;
 
 /**
  * A {@link BubbleTextView} representing a single cell result in AllApps
  */
-public class SearchResultIcon extends BubbleTextView implements SearchTargetHandler {
+public class SearchResultIcon extends BubbleTextView implements
+        SearchTargetHandler, View.OnClickListener,
+        View.OnLongClickListener {
+
+    //Play store thumbnail process workaround
+    private final Rect mTempRect = new Rect();
+    private final Paint mIconPaint = new Paint();
+    private static final int BITMAP_CROP_MASK_COLOR = 0xff424242;
 
     private final Launcher mLauncher;
 
@@ -99,7 +113,7 @@ public class SearchResultIcon extends BubbleTextView implements SearchTargetHand
      * Applies {@link SearchTarget} to view. registers a consumer after a corresponding
      * {@link ItemInfoWithIcon} is created
      */
-    public void applySearchTarget(SearchTarget searchTarget, List<SearchTarget> inlineItems,
+    public void apply(SearchTarget searchTarget, List<SearchTarget> inlineItems,
             Consumer<ItemInfoWithIcon> cb) {
         mOnItemInfoChanged = cb;
         apply(searchTarget, inlineItems);
@@ -115,8 +129,8 @@ public class SearchResultIcon extends BubbleTextView implements SearchTargetHand
             prepareUsingSearchAction(parentTarget);
             mLongPressSupported = false;
         } else {
-            prepareUsingApp(new ComponentName(parentTarget.getPackageName(),
-                    parentTarget.getExtras().getString(SearchTargetUtil.EXTRA_CLASS)),
+            String className = parentTarget.getExtras().getString(SearchTargetUtil.EXTRA_CLASS);
+            prepareUsingApp(new ComponentName(parentTarget.getPackageName(), className),
                     parentTarget.getUserHandle());
             mLongPressSupported = true;
         }
@@ -136,14 +150,17 @@ public class SearchResultIcon extends BubbleTextView implements SearchTargetHand
         //TODO: remove this after flags are introduced in SearchAction. Settings results require
         // startActivityForResult
         boolean isSettingsResult = searchTarget.getResultType() == ResultType.SETTING;
-        if ((extras != null && extras.getBoolean(BUNDLE_EXTRA_SHOULD_START_FOR_RESULT))
+        if ((extras != null && extras.getBoolean(
+                SearchTargetUtil.BUNDLE_EXTRA_SHOULD_START_FOR_RESULT))
                 || isSettingsResult) {
             itemInfo.setFlags(SearchActionItemInfo.FLAG_SHOULD_START_FOR_RESULT);
-        } else if (extras != null && extras.getBoolean(BUNDLE_EXTRA_SHOULD_START)) {
+        } else if (extras != null && extras.getBoolean(
+                SearchTargetUtil.BUNDLE_EXTRA_SHOULD_START)) {
             itemInfo.setFlags(SearchActionItemInfo.FLAG_SHOULD_START);
         }
-        if (extras != null && extras.getBoolean(BUNDLE_EXTRA_BADGE_FROM_ICON)) {
-            itemInfo.setFlags(FLAG_BADGE_FROM_ICON);
+        if (extras != null && extras.getBoolean(
+                SearchTargetUtil.BUNDLE_EXTRA_BADGE_WITH_PACKAGE)) {
+            itemInfo.setFlags(FLAG_BADGE_WITH_PACKAGE);
         }
         if (extras != null && extras.getBoolean(BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE)) {
             itemInfo.setFlags(FLAG_PRIMARY_ICON_FROM_TITLE);
@@ -154,39 +171,76 @@ public class SearchResultIcon extends BubbleTextView implements SearchTargetHand
         MODEL_EXECUTOR.post(() -> {
             try (LauncherIcons li = LauncherIcons.obtain(getContext())) {
                 Icon icon = searchTarget.getSearchAction().getIcon();
-                Drawable d;
-                // This bitmapInfo can be used as main icon or as a badge
-                BitmapInfo bitmapInfo;
-                if (icon == null) {
-                    PackageItemInfo pkgInfo = new PackageItemInfo(searchTarget.getPackageName());
-                    pkgInfo.user = searchTarget.getUserHandle();
-                    appState.getIconCache().getTitleAndIconForApp(pkgInfo, false);
-                    bitmapInfo = pkgInfo.bitmap;
-                } else {
-                    d = itemInfo.getIcon().loadDrawable(getContext());
-                    bitmapInfo = li.createBadgedIconBitmap(d, itemInfo.user,
-                            Build.VERSION.SDK_INT);
-                }
-
-                BitmapInfo bitmapMainIcon;
+                BitmapInfo pkgBitmap = getPackageBitmap(appState, searchTarget);
                 if (itemInfo.hasFlags(FLAG_PRIMARY_ICON_FROM_TITLE)) {
-                    bitmapMainIcon = li.createIconBitmap(
-                            String.valueOf(itemInfo.title.charAt(0)),
-                            bitmapInfo.color);
-                } else {
-                    bitmapMainIcon = bitmapInfo;
-                }
-                if (itemInfo.hasFlags(FLAG_BADGE_FROM_ICON)) {
-                    itemInfo.bitmap = li.badgeBitmap(bitmapMainIcon.icon, bitmapInfo);
+                    // create a bitmap with first char if FLAG_PRIMARY_ICON_FROM_TITLE is set
+                    itemInfo.bitmap = li.createIconBitmap(String.valueOf(itemInfo.title.charAt(0)),
+                            pkgBitmap.color);
+                } else if (icon == null) {
+                    // Use default icon from package name
+                    itemInfo.bitmap = pkgBitmap;
                 } else {
-                    itemInfo.bitmap = bitmapInfo;
+                    boolean isPlayResult = searchTarget.getResultType() == ResultType.PLAY;
+                    if (isPlayResult) {
+                        Bitmap b = getPlayResultBitmap(searchAction.getIcon());
+                        itemInfo.bitmap = b == null
+                                ? BitmapInfo.LOW_RES_INFO : BitmapInfo.fromBitmap(b);
+                    } else {
+                        itemInfo.bitmap = li.createBadgedIconBitmap(icon.loadDrawable(getContext()),
+                                itemInfo.user, false);
+                    }
                 }
 
+                // badge with package name
+                if (itemInfo.hasFlags(FLAG_BADGE_WITH_PACKAGE) && itemInfo.bitmap != pkgBitmap) {
+                    itemInfo.bitmap = li.badgeBitmap(itemInfo.bitmap.icon, pkgBitmap);
+                }
             }
             MAIN_EXECUTOR.post(() -> applyFromSearchActionItemInfo(itemInfo));
         });
     }
 
+    private static BitmapInfo getPackageBitmap(LauncherAppState appState, SearchTarget target) {
+        PackageItemInfo pkgInfo = new PackageItemInfo(target.getPackageName());
+        pkgInfo.user = target.getUserHandle();
+        appState.getIconCache().getTitleAndIconForApp(pkgInfo, false);
+        return pkgInfo.bitmap;
+    }
+
+    private Bitmap getPlayResultBitmap(Icon icon) {
+        try {
+            int iconSize = getIconSize();
+            URL url = new URL(icon.getUri().toString());
+            URLConnection con = url.openConnection();
+            con.addRequestProperty("Cache-Control", "max-age: 0");
+            con.setUseCaches(true);
+            Bitmap bitmap = BitmapFactory.decodeStream(con.getInputStream());
+            return getRoundedBitmap(Bitmap.createScaledBitmap(bitmap, iconSize, iconSize, false));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private Bitmap getRoundedBitmap(Bitmap bitmap) {
+        final int iconSize = bitmap.getWidth();
+        final float radius = Themes.getDialogCornerRadius(getContext());
+
+        return BitmapRenderer.createHardwareBitmap(iconSize, iconSize, (canvas) -> {
+            mTempRect.set(0, 0, iconSize, iconSize);
+            final RectF rectF = new RectF(mTempRect);
+
+            mIconPaint.setAntiAlias(true);
+            mIconPaint.reset();
+            canvas.drawARGB(0, 0, 0, 0);
+            mIconPaint.setColor(BITMAP_CROP_MASK_COLOR);
+            canvas.drawRoundRect(rectF, radius, radius, mIconPaint);
+
+            mIconPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
+            canvas.drawBitmap(bitmap, mTempRect, mTempRect, mIconPaint);
+        });
+    }
+
     private void prepareUsingApp(ComponentName componentName, UserHandle userHandle) {
         AllAppsStore appsStore = mLauncher.getAppsView().getAppsStore();
         AppInfo appInfo = appsStore.getApp(new ComponentKey(componentName, userHandle));
@@ -233,7 +287,6 @@ public class SearchResultIcon extends BubbleTextView implements SearchTargetHand
     }
 
 
-
     private void notifyItemInfoChanged(ItemInfoWithIcon itemInfoWithIcon) {
         if (mOnItemInfoChanged != null) {
             mOnItemInfoChanged.accept(itemInfoWithIcon);
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java b/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
index eafbc73f11..7c3ed69a00 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
@@ -23,7 +23,6 @@ import android.content.Context;
 import android.content.pm.ShortcutInfo;
 import android.text.TextUtils;
 import android.util.AttributeSet;
-import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -44,15 +43,15 @@ import java.util.List;
  */
 public class SearchResultIconRow extends LinearLayout implements SearchTargetHandler {
 
-    public static final int MAX_INLINE_ITEMS = 2;
+    public static final int MAX_INLINE_ITEMS = 3;
 
     protected final Launcher mLauncher;
     private final LauncherAppState mLauncherAppState;
-    private SearchResultIcon mResultIcon;
+    protected SearchResultIcon mResultIcon;
 
     private TextView mTitleView;
     private TextView mSubTitleView;
-    private final SearchResultIcon[] mInlineIcons = new SearchResultIcon[MAX_INLINE_ITEMS];
+    protected final SearchResultIcon[] mInlineIcons = new SearchResultIcon[MAX_INLINE_ITEMS];
 
     private PackageItemInfo mProviderInfo;
 
@@ -91,9 +90,9 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan
 
         mInlineIcons[0] = findViewById(R.id.shortcut_0);
         mInlineIcons[1] = findViewById(R.id.shortcut_1);
+        mInlineIcons[2] = findViewById(R.id.shortcut_2);
         for (SearchResultIcon inlineIcon : mInlineIcons) {
             inlineIcon.getLayoutParams().width = getIconSize();
-            // TODO: inlineIcon.setOnClickListener();
         }
 
         setOnClickListener(mResultIcon);
@@ -103,7 +102,7 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan
     @Override
     public void apply(SearchTarget parentTarget, List<SearchTarget> children) {
         showSubtitleIfNeeded(null);
-        mResultIcon.applySearchTarget(parentTarget, children, this::onItemInfoCreated);
+        mResultIcon.apply(parentTarget, children, this::onItemInfoCreated);
         if (parentTarget.getShortcutInfo() != null) {
             updateWithShortcutInfo(parentTarget.getShortcutInfo());
         } else if (parentTarget.getSearchAction() != null) {
@@ -142,7 +141,7 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan
     protected void showInlineItems(List<SearchTarget> children) {
         for (int i = 0; i < MAX_INLINE_ITEMS; i++) {
             if (i < children.size()) {
-                mInlineIcons[i].apply(children.get(0), new ArrayList<>());
+                mInlineIcons[i].apply(children.get(i), new ArrayList<>());
                 mInlineIcons[i].setVisibility(VISIBLE);
             } else {
                 mInlineIcons[i].setVisibility(GONE);
@@ -154,15 +153,4 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan
         setTag(info);
         mTitleView.setText(info.title);
     }
-
-    @Override
-    public void onClick(View view) {
-        // do nothing.
-    }
-
-    @Override
-    public boolean onLongClick(View view) {
-        // do nothing.
-        return false;
-    }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java b/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java
index f6e5eba9a3..0ea2f8b86e 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java
@@ -22,7 +22,6 @@ import android.app.search.SearchTargetEvent;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.util.Log;
-import android.view.View;
 import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
@@ -133,15 +132,4 @@ public class SearchResultIconSlice extends LinearLayout implements SearchTargetH
     public void onSliceAction(@NonNull EventInfo eventInfo, @NonNull SliceItem sliceItem) {
         notifyEvent(mLauncher, mTargetId, SearchTargetEvent.ACTION_TAP);
     }
-
-    @Override
-    public void onClick(View view) {
-        notifyEvent(mLauncher, mTargetId, SearchTargetEvent.ACTION_LONGPRESS);
-    }
-
-    @Override
-    public boolean onLongClick(View view) {
-        // do nothing
-        return false;
-    }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java b/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java
deleted file mode 100644
index 99e6aa561c..0000000000
--- a/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.search;
-
-import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
-
-import android.app.search.SearchTargetEvent;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Process;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.ImageButton;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import androidx.annotation.Nullable;
-import androidx.core.graphics.drawable.RoundedBitmapDrawable;
-import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
-
-import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.Launcher;
-import com.android.launcher3.R;
-import com.android.launcher3.icons.BitmapInfo;
-import com.android.launcher3.icons.LauncherIcons;
-import com.android.systemui.plugins.shared.SearchTargetLegacy;
-
-import java.util.ArrayList;
-
-/**
- * A view representing a single people search result in all apps
- */
-public class SearchResultPeopleView extends LinearLayout implements SearchTargetHandler {
-
-    public static final String TARGET_TYPE_PEOPLE = "people";
-
-    private final int mIconSize;
-    private final int mButtonSize;
-    private final PackageManager mPackageManager;
-    private View mIconView;
-    private TextView mTitleView;
-    private ImageButton[] mProviderButtons = new ImageButton[3];
-    private Intent mIntent;
-
-    private SearchTargetLegacy mSearchTarget;
-
-    public SearchResultPeopleView(Context context) {
-        this(context, null, 0);
-    }
-
-    public SearchResultPeopleView(Context context,
-            @Nullable AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public SearchResultPeopleView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        DeviceProfile deviceProfile = Launcher.getLauncher(getContext()).getDeviceProfile();
-        mPackageManager = getContext().getPackageManager();
-        mIconSize = deviceProfile.iconSizePx;
-        mButtonSize = (int) (deviceProfile.iconSizePx / 1.5f);
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        mIconView = findViewById(R.id.icon);
-        mIconView.getLayoutParams().height = mIconSize;
-        mIconView.getLayoutParams().width = mIconSize;
-        mTitleView = findViewById(R.id.title);
-        mProviderButtons[0] = findViewById(R.id.provider_0);
-        mProviderButtons[1] = findViewById(R.id.provider_1);
-        mProviderButtons[2] = findViewById(R.id.provider_2);
-        for (ImageButton button : mProviderButtons) {
-            button.getLayoutParams().width = mButtonSize;
-            button.getLayoutParams().height = mButtonSize;
-        }
-    }
-
-    /*
-    @Override
-    public void applySearchTarget(SearchTargetLegacy searchTarget) {
-        mSearchTarget = searchTarget;
-        Bundle payload = searchTarget.getExtras();
-        mTitleView.setText(payload.getString("title"));
-        mIntent = payload.getParcelable("intent");
-        Bitmap contactIcon = payload.getParcelable("icon");
-        try (LauncherIcons li = LauncherIcons.obtain(getContext())) {
-            BitmapInfo badgeInfo = li.createBadgedIconBitmap(
-                    getAppIcon(mIntent.getPackage()), Process.myUserHandle(),
-                    Build.VERSION.SDK_INT);
-            setIcon(li.badgeBitmap(roundBitmap(contactIcon), badgeInfo).icon, false);
-        } catch (Exception e) {
-            setIcon(contactIcon, true);
-        }
-
-        ArrayList<Bundle> providers = payload.getParcelableArrayList("providers");
-        for (int i = 0; i < mProviderButtons.length; i++) {
-            ImageButton button = mProviderButtons[i];
-            if (providers != null && i < providers.size()) {
-                Bundle provider = providers.get(i);
-                Intent intent = provider.getParcelable("intent");
-                setupProviderButton(button, provider, intent);
-                UI_HELPER_EXECUTOR.post(() -> {
-                    String pkg = provider.getString("package_name");
-                    Drawable appIcon = getAppIcon(pkg);
-                    if (appIcon != null) {
-                        MAIN_EXECUTOR.post(() -> button.setImageDrawable(appIcon));
-                    }
-                });
-                button.setVisibility(VISIBLE);
-            } else {
-                button.setVisibility(GONE);
-            }
-        }
-    }
-    */
-
-    /**
-     * Normalizes the bitmap to look like rounded App Icon
-     * TODO(b/170234747) to support styling, generate adaptive icon drawable and generate
-     * bitmap from it.
-     */
-    private Bitmap roundBitmap(Bitmap icon) {
-        final RoundedBitmapDrawable d = RoundedBitmapDrawableFactory.create(getResources(), icon);
-        d.setCornerRadius(R.attr.folderIconRadius);
-        d.setBounds(0, 0, mIconSize, mIconSize);
-        final Bitmap bitmap = Bitmap.createBitmap(d.getBounds().width(), d.getBounds().height(),
-                Bitmap.Config.ARGB_8888);
-        Canvas canvas = new Canvas(bitmap);
-        d.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
-        d.draw(canvas);
-        return bitmap;
-    }
-
-    private void setIcon(Bitmap icon, Boolean round) {
-        if (round) {
-            RoundedBitmapDrawable d = RoundedBitmapDrawableFactory.create(getResources(), icon);
-            d.setCornerRadius(R.attr.folderIconRadius);
-            d.setBounds(0, 0, mIconSize, mIconSize);
-            mIconView.setBackground(d);
-        } else {
-            mIconView.setBackground(new BitmapDrawable(getResources(), icon));
-        }
-    }
-
-
-    private Drawable getAppIcon(String pkg) {
-        try {
-            ApplicationInfo applicationInfo = mPackageManager.getApplicationInfo(
-                    pkg, 0);
-            return applicationInfo.loadIcon(mPackageManager);
-        } catch (PackageManager.NameNotFoundException ignored) {
-            return null;
-        }
-    }
-
-    private void setupProviderButton(ImageButton button, Bundle provider, Intent intent) {
-        Launcher launcher = Launcher.getLauncher(getContext());
-        button.setOnClickListener(b -> {
-            launcher.startActivitySafely(b, intent, null);
-            Bundle bundle = new Bundle();
-            bundle.putBundle("provider", provider);
-        });
-    }
-
-    @Override
-    public void onClick(View view) {
-        // do nothing.
-    }
-
-    @Override
-    public boolean onLongClick(View view) {
-        // do nothing.
-        return false;
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java b/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java
index b1cbe7d36f..81e9c758a0 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java
@@ -38,10 +38,9 @@ import java.util.List;
  * A view representing a high confidence app search result that includes shortcuts
  */
 public class SearchResultThumbnailView extends androidx.appcompat.widget.AppCompatImageView
-        implements SearchTargetHandler {
+        implements SearchTargetHandler, View.OnClickListener {
 
     private SearchTarget mSearchTarget;
-    private SearchResultIcon mResultIcon;
 
     public SearchResultThumbnailView(Context context) {
         super(context);
@@ -90,10 +89,4 @@ public class SearchResultThumbnailView extends androidx.appcompat.widget.AppComp
                 (SearchActionItemInfo) view.getTag());
         notifyEvent(getContext(), mSearchTarget.getId(), SearchTargetEvent.ACTION_LAUNCH_TOUCH);
     }
-
-    @Override
-    public boolean onLongClick(View view) {
-        // do nothing.
-        return false;
-    }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultWidget.java b/quickstep/src/com/android/launcher3/search/SearchResultWidget.java
index da1495930e..4c64265cc3 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultWidget.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultWidget.java
@@ -186,10 +186,6 @@ public class SearchResultWidget extends LinearLayout implements SearchTargetHand
         return false;
     }
 
-    @Override
-    public void onClick(View view) {
-        // do nothing.
-    }
 
     static class ClickListener extends GestureDetector.SimpleOnGestureListener {
         private final Runnable mCb;
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java b/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java
index 1786baf47c..5bf19087d8 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java
@@ -47,7 +47,8 @@ import java.util.List;
 /**
  * displays preview of a widget upon receiving {@link AppWidgetProviderInfo} from Search provider
  */
-public class SearchResultWidgetPreview extends LinearLayout implements SearchTargetHandler {
+public class SearchResultWidgetPreview extends LinearLayout implements SearchTargetHandler,
+        View.OnClickListener, View.OnLongClickListener {
 
     private final Launcher mLauncher;
     private final LauncherAppState mAppState;
diff --git a/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java b/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java
index d7c5c5d157..9276841734 100644
--- a/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java
+++ b/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java
@@ -18,7 +18,6 @@ package com.android.launcher3.search;
 import android.app.search.SearchTarget;
 import android.content.Context;
 import android.util.AttributeSet;
-import android.view.View;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
@@ -48,15 +47,4 @@ public class SearchSectionHeaderView extends TextView implements SearchTargetHan
         setText(parentTarget.getSearchAction().getTitle());
         setVisibility(VISIBLE);
     }
-
-    @Override
-    public void onClick(View view) {
-        // do nothing.
-    }
-
-    @Override
-    public boolean onLongClick(View view) {
-        // do nothing.
-        return false;
-    }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java b/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java
index 197aecbc28..fac6ba7474 100644
--- a/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java
+++ b/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java
@@ -15,6 +15,8 @@
  */
 package com.android.launcher3.search;
 
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+
 import android.app.search.Query;
 import android.app.search.SearchContext;
 import android.app.search.SearchSession;
@@ -39,8 +41,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.function.Consumer;
 
-import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
-
 /**
  * Search pipeline utilizing {@link android.app.search.SearchUiManager}
  */
diff --git a/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java b/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java
index 0e7b8f20c9..acf6f8a02a 100644
--- a/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java
+++ b/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java
@@ -19,15 +19,13 @@ package com.android.launcher3.search;
 import android.app.search.SearchTarget;
 import android.app.search.SearchTargetEvent;
 import android.content.Context;
-import android.view.View;
 
 import java.util.List;
-import java.util.function.Consumer;
 
 /**
  * An interface for supporting dynamic search results
  */
-public interface SearchTargetHandler extends View.OnClickListener, View.OnLongClickListener {
+public interface SearchTargetHandler {
 
     /**
      * Update view using values from {@link SearchTarget}
diff --git a/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java b/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java
index ceef429595..c036f19f96 100644
--- a/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java
+++ b/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java
@@ -15,6 +15,13 @@
  */
 package com.android.launcher3.search;
 
+import static com.android.app.search.LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT;
+import static com.android.app.search.LayoutType.ICON_SINGLE_HORIZONTAL_TEXT;
+import static com.android.app.search.LayoutType.THUMBNAIL;
+import static com.android.app.search.ResultType.ACTION;
+import static com.android.app.search.ResultType.SCREENSHOT;
+import static com.android.app.search.ResultType.SUGGEST;
+
 import android.app.PendingIntent;
 import android.app.search.SearchAction;
 import android.app.search.SearchTarget;
@@ -31,18 +38,11 @@ import android.os.UserHandle;
 
 import com.android.app.search.ResultType;
 
-import static com.android.app.search.LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT;
-import static com.android.app.search.LayoutType.ICON_SINGLE_HORIZONTAL_TEXT;
-import static com.android.app.search.LayoutType.THUMBNAIL;
-import static com.android.app.search.ResultType.ACTION;
-import static com.android.app.search.ResultType.SCREENSHOT;
-import static com.android.app.search.ResultType.SUGGEST;
-
 public class SearchTargetUtil {
 
     public static final String BUNDLE_EXTRA_SHOULD_START = "should_start";
     public static final String BUNDLE_EXTRA_SHOULD_START_FOR_RESULT = "should_start_for_result";
-    public static final String BUNDLE_EXTRA_BADGE_FROM_ICON = "badge_from_icon";
+    public static final String BUNDLE_EXTRA_BADGE_WITH_PACKAGE = "badge_with_package";
     public static final String BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE = "primary_icon_from_title";
 
     public static final String EXTRA_CLASS = "class";
@@ -56,10 +56,10 @@ public class SearchTargetUtil {
     /**
      * Generate SearchTargetUtil for ICON_DOUBLE_HORIZONTAL_TEXT layout type.
      *
-       targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction(
-           mContext, "red", Color.RED));
-       targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction(
-           mContext, "yellow", Color.YELLOW));
+     * targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction(
+     * mContext, "red", Color.RED));
+     * targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction(
+     * mContext, "yellow", Color.YELLOW));
      */
     public static SearchTarget generateIconDoubleHorizontalText_SearchAction(
             Context context, String id, int color) {
@@ -83,7 +83,7 @@ public class SearchTargetUtil {
 
         Bundle b = new Bundle();
         b.putBoolean(BUNDLE_EXTRA_SHOULD_START_FOR_RESULT, true);
-        b.putBoolean(BUNDLE_EXTRA_BADGE_FROM_ICON, true);
+        b.putBoolean(BUNDLE_EXTRA_BADGE_WITH_PACKAGE, true);
         b.putBoolean(BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE, true);
 
         builder.setSearchAction(new SearchAction.Builder(id, id + TITLE)
@@ -96,7 +96,7 @@ public class SearchTargetUtil {
     }
 
     /**
-     *  Inside SearchServicePipeline, add following samples to test the search target.
+     * Inside SearchServicePipeline, add following samples to test the search target.
      *
      * targets.add(SearchTargetUtil.generateThumbnail_SearchAction("blue", Color.BLUE));
      * targets.add(SearchTargetUtil.generateThumbnail_SearchAction("red", Color.RED));
@@ -129,11 +129,10 @@ public class SearchTargetUtil {
     }
 
     /**
-     *
      * targets.add(SearchTargetUtil.generateIconHorizontalText_SearchAction(
-     *     mContext, "red", Color.RED));
+     * mContext, "red", Color.RED));
      * targets.add(SearchTargetUtil.generateIconHorizontalText_SearchAction(
-     *     mContext, "yellow", Color.YELLOW));
+     * mContext, "yellow", Color.YELLOW));
      */
     public static SearchTarget generateIconHorizontalText_SearchAction(
             Context context, String id, int color) {
diff --git a/src/com/android/launcher3/model/data/SearchActionItemInfo.java b/src/com/android/launcher3/model/data/SearchActionItemInfo.java
index 36afe50fa1..8469569c25 100644
--- a/src/com/android/launcher3/model/data/SearchActionItemInfo.java
+++ b/src/com/android/launcher3/model/data/SearchActionItemInfo.java
@@ -30,7 +30,7 @@ public class SearchActionItemInfo extends ItemInfoWithIcon {
 
     public static final int FLAG_SHOULD_START = 1 << 1;
     public static final int FLAG_SHOULD_START_FOR_RESULT = FLAG_SHOULD_START | 1 << 2;
-    public static final int FLAG_BADGE_FROM_ICON = 1 << 3;
+    public static final int FLAG_BADGE_WITH_PACKAGE = 1 << 3;
     public static final int FLAG_PRIMARY_ICON_FROM_TITLE = 1 << 4;
 
     private final String mFallbackPackageName;
diff --git a/src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java b/src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java
index 7fbd6ac814..0fc61f04dc 100644
--- a/src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java
+++ b/src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java
@@ -20,7 +20,7 @@ import android.os.Bundle;
 /**
  * Event used for the feedback loop to the plugin. (and future aiai)
  *
- * @deprecated Use SearchTargetEvent
+ * @deprecated Use {@link android.app.search.SearchTargetEvent}
  */
 @Deprecated
 public class SearchTargetEventLegacy {
-- 
GitLab


From 170a6b7b984a0eaa88d77c58d4cdf143e7e2a029 Mon Sep 17 00:00:00 2001
From: Darryl Johnson <darryljohnson@google.com>
Date: Fri, 29 Jan 2021 20:51:38 +0000
Subject: [PATCH 0444/1664] Revert "Support people search results"

This reverts commit f28db55c96716acf443af0b370c6f67646757f8a.

Reason for revert: Possible cause of b/178836393

Change-Id: I0e787f02377a5b8fa723816978c61927af67665a
---
 .../res/layout/search_result_icon_row.xml     |  19 +-
 .../res/layout/search_result_people_item.xml  |  63 ++++++
 .../search/DeviceSearchAdapterProvider.java   |   3 +-
 .../launcher3/search/SearchAdapterItem.java   |   8 +-
 .../launcher3/search/SearchResultIcon.java    | 131 ++++--------
 .../launcher3/search/SearchResultIconRow.java |  24 ++-
 .../search/SearchResultIconSlice.java         |  12 ++
 .../search/SearchResultPeopleView.java        | 199 ++++++++++++++++++
 .../search/SearchResultThumbnailView.java     |   9 +-
 .../launcher3/search/SearchResultWidget.java  |   4 +
 .../search/SearchResultWidgetPreview.java     |   3 +-
 .../search/SearchSectionHeaderView.java       |  12 ++
 .../search/SearchServicePipeline.java         |   4 +-
 .../launcher3/search/SearchTargetHandler.java |   4 +-
 .../launcher3/search/SearchTargetUtil.java    |  33 +--
 .../model/data/SearchActionItemInfo.java      |   2 +-
 .../shared/SearchTargetEventLegacy.java       |   2 +-
 17 files changed, 388 insertions(+), 144 deletions(-)
 create mode 100644 quickstep/res/layout/search_result_people_item.xml
 create mode 100644 quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java

diff --git a/quickstep/res/layout/search_result_icon_row.xml b/quickstep/res/layout/search_result_icon_row.xml
index 81190cfc56..2119fc3425 100644
--- a/quickstep/res/layout/search_result_icon_row.xml
+++ b/quickstep/res/layout/search_result_icon_row.xml
@@ -57,10 +57,9 @@
         style="@style/BaseIcon"
         android:layout_width="@dimen/deep_shortcut_icon_size"
         android:layout_height="match_parent"
-        android:layout_marginStart="4dp"
-        android:gravity="center"
+        android:gravity="start|center_vertical"
         launcher:iconDisplay="shortcut_popup"
-        android:textSize="@dimen/search_hero_inline_button_size"
+        android:textSize="@dimen/search_hero_subtitle_size"
         launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size"
         launcher:layoutHorizontal="false" />
 
@@ -69,20 +68,6 @@
         style="@style/BaseIcon"
         android:layout_width="@dimen/deep_shortcut_icon_size"
         android:layout_height="match_parent"
-        android:layout_marginStart="4dp"
-        android:gravity="center"
-        launcher:iconDisplay="shortcut_popup"
-        android:textSize="@dimen/search_hero_inline_button_size"
-        launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size"
-        launcher:layoutHorizontal="false" />
-
-    <com.android.launcher3.search.SearchResultIcon
-        android:id="@+id/shortcut_2"
-        style="@style/BaseIcon"
-        android:layout_width="@dimen/deep_shortcut_icon_size"
-        android:layout_height="match_parent"
-        android:layout_marginStart="4dp"
-        android:gravity="center"
         launcher:iconDisplay="shortcut_popup"
         android:textSize="@dimen/search_hero_inline_button_size"
         launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size"
diff --git a/quickstep/res/layout/search_result_people_item.xml b/quickstep/res/layout/search_result_people_item.xml
new file mode 100644
index 0000000000..964300dd20
--- /dev/null
+++ b/quickstep/res/layout/search_result_people_item.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.launcher3.search.SearchResultPeopleView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:gravity="center_vertical"
+    android:layout_height="wrap_content"
+    android:padding="8dp"
+    android:orientation="horizontal">
+
+    <View
+        android:id="@+id/icon"
+        android:layout_marginRight="8dp"
+        android:layout_width="@dimen/deep_shortcut_icon_size"
+        android:layout_height="@dimen/deep_shortcut_icon_size" />
+
+    <TextView
+        android:layout_width="0dp"
+        android:textColor="?android:attr/textColorPrimary"
+        android:id="@+id/title"
+        android:textSize="@dimen/search_hero_title_size"
+        android:layout_height="wrap_content"
+        android:layout_weight="1" />
+
+    <ImageButton
+        android:id="@+id/provider_0"
+        android:scaleType="fitCenter"
+        android:adjustViewBounds="true"
+        android:layout_margin="5dp"
+        android:background="?android:attr/selectableItemBackground"
+        android:layout_width="@dimen/deep_shortcut_icon_size"
+        android:layout_height="@dimen/deep_shortcut_icon_size" />
+
+    <ImageButton
+        android:id="@+id/provider_1"
+        android:layout_margin="5dp"
+        android:scaleType="fitCenter"
+        android:adjustViewBounds="true"
+        android:background="?android:attr/selectableItemBackground"
+        android:layout_width="@dimen/deep_shortcut_icon_size"
+        android:layout_height="@dimen/deep_shortcut_icon_size" />
+
+    <ImageButton
+        android:id="@+id/provider_2"
+        android:layout_margin="5dp"
+        android:scaleType="fitCenter"
+        android:adjustViewBounds="true"
+        android:background="?android:attr/selectableItemBackground"
+        android:layout_width="@dimen/deep_shortcut_icon_size"
+        android:layout_height="@dimen/deep_shortcut_icon_size" />
+
+</com.android.launcher3.search.SearchResultPeopleView>
\ No newline at end of file
diff --git a/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java b/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
index acf6c150cf..02be0b94ed 100644
--- a/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
+++ b/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
@@ -41,6 +41,7 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
     public static final int VIEW_TYPE_SEARCH_SLICE = 1 << 7;
     public static final int VIEW_TYPE_SEARCH_ICON = (1 << 8) | VIEW_TYPE_ICON;
     public static final int VIEW_TYPE_SEARCH_ICON_ROW = (1 << 9);
+    public static final int VIEW_TYPE_SEARCH_PEOPLE = 1 << 11;
     public static final int VIEW_TYPE_SEARCH_THUMBNAIL = 1 << 12;
     public static final int VIEW_TYPE_SEARCH_WIDGET_LIVE = 1 << 15;
     public static final int VIEW_TYPE_SEARCH_WIDGET_PREVIEW = 1 << 16;
@@ -58,6 +59,7 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_ICON, R.layout.search_result_icon);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_ICON_ROW, R.layout.search_result_icon_row);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_SLICE, R.layout.search_result_slice);
+        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_PEOPLE, R.layout.search_result_people_item);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_THUMBNAIL, R.layout.search_result_thumbnail);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_WIDGET_LIVE, R.layout.search_result_widget_live);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_WIDGET_PREVIEW,
@@ -123,7 +125,6 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
                 break;
             case LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT:
             case LayoutType.ICON_SINGLE_HORIZONTAL_TEXT:
-            case LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT_BUTTON:
                 return VIEW_TYPE_SEARCH_ICON_ROW;
             case LayoutType.THUMBNAIL:
                 if (t.getSearchAction() != null) {
diff --git a/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java b/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
index b402f61979..0eb3edb555 100644
--- a/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
+++ b/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
@@ -18,6 +18,7 @@ package com.android.launcher3.search;
 
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_ICON;
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_ICON_ROW;
+import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_PEOPLE;
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_SLICE;
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_THUMBNAIL;
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_WIDGET_LIVE;
@@ -41,10 +42,9 @@ public class SearchAdapterItem extends AllAppsGridAdapter.AdapterItem {
 
 
     private static final int AVAILABLE_FOR_ACCESSIBILITY =
-            VIEW_TYPE_SEARCH_SLICE | VIEW_TYPE_SEARCH_THUMBNAIL | VIEW_TYPE_SEARCH_ICON_ROW
-                    | VIEW_TYPE_SEARCH_ICON | VIEW_TYPE_SEARCH_WIDGET_PREVIEW
-                    | VIEW_TYPE_SEARCH_WIDGET_LIVE;
-
+            VIEW_TYPE_SEARCH_SLICE | VIEW_TYPE_SEARCH_PEOPLE | VIEW_TYPE_SEARCH_THUMBNAIL
+                    | VIEW_TYPE_SEARCH_ICON_ROW | VIEW_TYPE_SEARCH_ICON
+                    | VIEW_TYPE_SEARCH_WIDGET_PREVIEW | VIEW_TYPE_SEARCH_WIDGET_LIVE;
 
     public SearchAdapterItem(SearchTargetLegacy searchTargetLegacy, int type) {
         mSearchTargetLegacy = searchTargetLegacy;
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
index c353d7aa3c..3d89ac5e27 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
@@ -15,9 +15,12 @@
  */
 package com.android.launcher3.search;
 
-import static com.android.launcher3.model.data.SearchActionItemInfo.FLAG_BADGE_WITH_PACKAGE;
+import static com.android.launcher3.model.data.SearchActionItemInfo.FLAG_BADGE_FROM_ICON;
 import static com.android.launcher3.model.data.SearchActionItemInfo.FLAG_PRIMARY_ICON_FROM_TITLE;
+import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_BADGE_FROM_ICON;
 import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE;
+import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_SHOULD_START;
+import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_SHOULD_START_FOR_RESULT;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
@@ -27,14 +30,9 @@ import android.app.search.SearchTargetEvent;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.ShortcutInfo;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Rect;
-import android.graphics.RectF;
+import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Icon;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.util.AttributeSet;
@@ -47,7 +45,6 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.allapps.AllAppsStore;
 import com.android.launcher3.icons.BitmapInfo;
-import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
@@ -57,25 +54,14 @@ import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.touch.ItemClickHandler;
 import com.android.launcher3.touch.ItemLongClickListener;
 import com.android.launcher3.util.ComponentKey;
-import com.android.launcher3.util.Themes;
 
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLConnection;
 import java.util.List;
 import java.util.function.Consumer;
 
 /**
  * A {@link BubbleTextView} representing a single cell result in AllApps
  */
-public class SearchResultIcon extends BubbleTextView implements
-        SearchTargetHandler, View.OnClickListener,
-        View.OnLongClickListener {
-
-    //Play store thumbnail process workaround
-    private final Rect mTempRect = new Rect();
-    private final Paint mIconPaint = new Paint();
-    private static final int BITMAP_CROP_MASK_COLOR = 0xff424242;
+public class SearchResultIcon extends BubbleTextView implements SearchTargetHandler {
 
     private final Launcher mLauncher;
 
@@ -113,7 +99,7 @@ public class SearchResultIcon extends BubbleTextView implements
      * Applies {@link SearchTarget} to view. registers a consumer after a corresponding
      * {@link ItemInfoWithIcon} is created
      */
-    public void apply(SearchTarget searchTarget, List<SearchTarget> inlineItems,
+    public void applySearchTarget(SearchTarget searchTarget, List<SearchTarget> inlineItems,
             Consumer<ItemInfoWithIcon> cb) {
         mOnItemInfoChanged = cb;
         apply(searchTarget, inlineItems);
@@ -129,8 +115,8 @@ public class SearchResultIcon extends BubbleTextView implements
             prepareUsingSearchAction(parentTarget);
             mLongPressSupported = false;
         } else {
-            String className = parentTarget.getExtras().getString(SearchTargetUtil.EXTRA_CLASS);
-            prepareUsingApp(new ComponentName(parentTarget.getPackageName(), className),
+            prepareUsingApp(new ComponentName(parentTarget.getPackageName(),
+                    parentTarget.getExtras().getString(SearchTargetUtil.EXTRA_CLASS)),
                     parentTarget.getUserHandle());
             mLongPressSupported = true;
         }
@@ -150,17 +136,14 @@ public class SearchResultIcon extends BubbleTextView implements
         //TODO: remove this after flags are introduced in SearchAction. Settings results require
         // startActivityForResult
         boolean isSettingsResult = searchTarget.getResultType() == ResultType.SETTING;
-        if ((extras != null && extras.getBoolean(
-                SearchTargetUtil.BUNDLE_EXTRA_SHOULD_START_FOR_RESULT))
+        if ((extras != null && extras.getBoolean(BUNDLE_EXTRA_SHOULD_START_FOR_RESULT))
                 || isSettingsResult) {
             itemInfo.setFlags(SearchActionItemInfo.FLAG_SHOULD_START_FOR_RESULT);
-        } else if (extras != null && extras.getBoolean(
-                SearchTargetUtil.BUNDLE_EXTRA_SHOULD_START)) {
+        } else if (extras != null && extras.getBoolean(BUNDLE_EXTRA_SHOULD_START)) {
             itemInfo.setFlags(SearchActionItemInfo.FLAG_SHOULD_START);
         }
-        if (extras != null && extras.getBoolean(
-                SearchTargetUtil.BUNDLE_EXTRA_BADGE_WITH_PACKAGE)) {
-            itemInfo.setFlags(FLAG_BADGE_WITH_PACKAGE);
+        if (extras != null && extras.getBoolean(BUNDLE_EXTRA_BADGE_FROM_ICON)) {
+            itemInfo.setFlags(FLAG_BADGE_FROM_ICON);
         }
         if (extras != null && extras.getBoolean(BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE)) {
             itemInfo.setFlags(FLAG_PRIMARY_ICON_FROM_TITLE);
@@ -171,76 +154,39 @@ public class SearchResultIcon extends BubbleTextView implements
         MODEL_EXECUTOR.post(() -> {
             try (LauncherIcons li = LauncherIcons.obtain(getContext())) {
                 Icon icon = searchTarget.getSearchAction().getIcon();
-                BitmapInfo pkgBitmap = getPackageBitmap(appState, searchTarget);
-                if (itemInfo.hasFlags(FLAG_PRIMARY_ICON_FROM_TITLE)) {
-                    // create a bitmap with first char if FLAG_PRIMARY_ICON_FROM_TITLE is set
-                    itemInfo.bitmap = li.createIconBitmap(String.valueOf(itemInfo.title.charAt(0)),
-                            pkgBitmap.color);
-                } else if (icon == null) {
-                    // Use default icon from package name
-                    itemInfo.bitmap = pkgBitmap;
+                Drawable d;
+                // This bitmapInfo can be used as main icon or as a badge
+                BitmapInfo bitmapInfo;
+                if (icon == null) {
+                    PackageItemInfo pkgInfo = new PackageItemInfo(searchTarget.getPackageName());
+                    pkgInfo.user = searchTarget.getUserHandle();
+                    appState.getIconCache().getTitleAndIconForApp(pkgInfo, false);
+                    bitmapInfo = pkgInfo.bitmap;
                 } else {
-                    boolean isPlayResult = searchTarget.getResultType() == ResultType.PLAY;
-                    if (isPlayResult) {
-                        Bitmap b = getPlayResultBitmap(searchAction.getIcon());
-                        itemInfo.bitmap = b == null
-                                ? BitmapInfo.LOW_RES_INFO : BitmapInfo.fromBitmap(b);
-                    } else {
-                        itemInfo.bitmap = li.createBadgedIconBitmap(icon.loadDrawable(getContext()),
-                                itemInfo.user, false);
-                    }
+                    d = itemInfo.getIcon().loadDrawable(getContext());
+                    bitmapInfo = li.createBadgedIconBitmap(d, itemInfo.user,
+                            Build.VERSION.SDK_INT);
                 }
 
-                // badge with package name
-                if (itemInfo.hasFlags(FLAG_BADGE_WITH_PACKAGE) && itemInfo.bitmap != pkgBitmap) {
-                    itemInfo.bitmap = li.badgeBitmap(itemInfo.bitmap.icon, pkgBitmap);
+                BitmapInfo bitmapMainIcon;
+                if (itemInfo.hasFlags(FLAG_PRIMARY_ICON_FROM_TITLE)) {
+                    bitmapMainIcon = li.createIconBitmap(
+                            String.valueOf(itemInfo.title.charAt(0)),
+                            bitmapInfo.color);
+                } else {
+                    bitmapMainIcon = bitmapInfo;
+                }
+                if (itemInfo.hasFlags(FLAG_BADGE_FROM_ICON)) {
+                    itemInfo.bitmap = li.badgeBitmap(bitmapMainIcon.icon, bitmapInfo);
+                } else {
+                    itemInfo.bitmap = bitmapInfo;
                 }
+
             }
             MAIN_EXECUTOR.post(() -> applyFromSearchActionItemInfo(itemInfo));
         });
     }
 
-    private static BitmapInfo getPackageBitmap(LauncherAppState appState, SearchTarget target) {
-        PackageItemInfo pkgInfo = new PackageItemInfo(target.getPackageName());
-        pkgInfo.user = target.getUserHandle();
-        appState.getIconCache().getTitleAndIconForApp(pkgInfo, false);
-        return pkgInfo.bitmap;
-    }
-
-    private Bitmap getPlayResultBitmap(Icon icon) {
-        try {
-            int iconSize = getIconSize();
-            URL url = new URL(icon.getUri().toString());
-            URLConnection con = url.openConnection();
-            con.addRequestProperty("Cache-Control", "max-age: 0");
-            con.setUseCaches(true);
-            Bitmap bitmap = BitmapFactory.decodeStream(con.getInputStream());
-            return getRoundedBitmap(Bitmap.createScaledBitmap(bitmap, iconSize, iconSize, false));
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    private Bitmap getRoundedBitmap(Bitmap bitmap) {
-        final int iconSize = bitmap.getWidth();
-        final float radius = Themes.getDialogCornerRadius(getContext());
-
-        return BitmapRenderer.createHardwareBitmap(iconSize, iconSize, (canvas) -> {
-            mTempRect.set(0, 0, iconSize, iconSize);
-            final RectF rectF = new RectF(mTempRect);
-
-            mIconPaint.setAntiAlias(true);
-            mIconPaint.reset();
-            canvas.drawARGB(0, 0, 0, 0);
-            mIconPaint.setColor(BITMAP_CROP_MASK_COLOR);
-            canvas.drawRoundRect(rectF, radius, radius, mIconPaint);
-
-            mIconPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
-            canvas.drawBitmap(bitmap, mTempRect, mTempRect, mIconPaint);
-        });
-    }
-
     private void prepareUsingApp(ComponentName componentName, UserHandle userHandle) {
         AllAppsStore appsStore = mLauncher.getAppsView().getAppsStore();
         AppInfo appInfo = appsStore.getApp(new ComponentKey(componentName, userHandle));
@@ -287,6 +233,7 @@ public class SearchResultIcon extends BubbleTextView implements
     }
 
 
+
     private void notifyItemInfoChanged(ItemInfoWithIcon itemInfoWithIcon) {
         if (mOnItemInfoChanged != null) {
             mOnItemInfoChanged.accept(itemInfoWithIcon);
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java b/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
index 7c3ed69a00..eafbc73f11 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
@@ -23,6 +23,7 @@ import android.content.Context;
 import android.content.pm.ShortcutInfo;
 import android.text.TextUtils;
 import android.util.AttributeSet;
+import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -43,15 +44,15 @@ import java.util.List;
  */
 public class SearchResultIconRow extends LinearLayout implements SearchTargetHandler {
 
-    public static final int MAX_INLINE_ITEMS = 3;
+    public static final int MAX_INLINE_ITEMS = 2;
 
     protected final Launcher mLauncher;
     private final LauncherAppState mLauncherAppState;
-    protected SearchResultIcon mResultIcon;
+    private SearchResultIcon mResultIcon;
 
     private TextView mTitleView;
     private TextView mSubTitleView;
-    protected final SearchResultIcon[] mInlineIcons = new SearchResultIcon[MAX_INLINE_ITEMS];
+    private final SearchResultIcon[] mInlineIcons = new SearchResultIcon[MAX_INLINE_ITEMS];
 
     private PackageItemInfo mProviderInfo;
 
@@ -90,9 +91,9 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan
 
         mInlineIcons[0] = findViewById(R.id.shortcut_0);
         mInlineIcons[1] = findViewById(R.id.shortcut_1);
-        mInlineIcons[2] = findViewById(R.id.shortcut_2);
         for (SearchResultIcon inlineIcon : mInlineIcons) {
             inlineIcon.getLayoutParams().width = getIconSize();
+            // TODO: inlineIcon.setOnClickListener();
         }
 
         setOnClickListener(mResultIcon);
@@ -102,7 +103,7 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan
     @Override
     public void apply(SearchTarget parentTarget, List<SearchTarget> children) {
         showSubtitleIfNeeded(null);
-        mResultIcon.apply(parentTarget, children, this::onItemInfoCreated);
+        mResultIcon.applySearchTarget(parentTarget, children, this::onItemInfoCreated);
         if (parentTarget.getShortcutInfo() != null) {
             updateWithShortcutInfo(parentTarget.getShortcutInfo());
         } else if (parentTarget.getSearchAction() != null) {
@@ -141,7 +142,7 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan
     protected void showInlineItems(List<SearchTarget> children) {
         for (int i = 0; i < MAX_INLINE_ITEMS; i++) {
             if (i < children.size()) {
-                mInlineIcons[i].apply(children.get(i), new ArrayList<>());
+                mInlineIcons[i].apply(children.get(0), new ArrayList<>());
                 mInlineIcons[i].setVisibility(VISIBLE);
             } else {
                 mInlineIcons[i].setVisibility(GONE);
@@ -153,4 +154,15 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan
         setTag(info);
         mTitleView.setText(info.title);
     }
+
+    @Override
+    public void onClick(View view) {
+        // do nothing.
+    }
+
+    @Override
+    public boolean onLongClick(View view) {
+        // do nothing.
+        return false;
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java b/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java
index 0ea2f8b86e..f6e5eba9a3 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java
@@ -22,6 +22,7 @@ import android.app.search.SearchTargetEvent;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.view.View;
 import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
@@ -132,4 +133,15 @@ public class SearchResultIconSlice extends LinearLayout implements SearchTargetH
     public void onSliceAction(@NonNull EventInfo eventInfo, @NonNull SliceItem sliceItem) {
         notifyEvent(mLauncher, mTargetId, SearchTargetEvent.ACTION_TAP);
     }
+
+    @Override
+    public void onClick(View view) {
+        notifyEvent(mLauncher, mTargetId, SearchTargetEvent.ACTION_LONGPRESS);
+    }
+
+    @Override
+    public boolean onLongClick(View view) {
+        // do nothing
+        return false;
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java b/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java
new file mode 100644
index 0000000000..99e6aa561c
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java
@@ -0,0 +1,199 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.search;
+
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+
+import android.app.search.SearchTargetEvent;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Process;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.core.graphics.drawable.RoundedBitmapDrawable;
+import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
+
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+import com.android.launcher3.icons.BitmapInfo;
+import com.android.launcher3.icons.LauncherIcons;
+import com.android.systemui.plugins.shared.SearchTargetLegacy;
+
+import java.util.ArrayList;
+
+/**
+ * A view representing a single people search result in all apps
+ */
+public class SearchResultPeopleView extends LinearLayout implements SearchTargetHandler {
+
+    public static final String TARGET_TYPE_PEOPLE = "people";
+
+    private final int mIconSize;
+    private final int mButtonSize;
+    private final PackageManager mPackageManager;
+    private View mIconView;
+    private TextView mTitleView;
+    private ImageButton[] mProviderButtons = new ImageButton[3];
+    private Intent mIntent;
+
+    private SearchTargetLegacy mSearchTarget;
+
+    public SearchResultPeopleView(Context context) {
+        this(context, null, 0);
+    }
+
+    public SearchResultPeopleView(Context context,
+            @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public SearchResultPeopleView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        DeviceProfile deviceProfile = Launcher.getLauncher(getContext()).getDeviceProfile();
+        mPackageManager = getContext().getPackageManager();
+        mIconSize = deviceProfile.iconSizePx;
+        mButtonSize = (int) (deviceProfile.iconSizePx / 1.5f);
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mIconView = findViewById(R.id.icon);
+        mIconView.getLayoutParams().height = mIconSize;
+        mIconView.getLayoutParams().width = mIconSize;
+        mTitleView = findViewById(R.id.title);
+        mProviderButtons[0] = findViewById(R.id.provider_0);
+        mProviderButtons[1] = findViewById(R.id.provider_1);
+        mProviderButtons[2] = findViewById(R.id.provider_2);
+        for (ImageButton button : mProviderButtons) {
+            button.getLayoutParams().width = mButtonSize;
+            button.getLayoutParams().height = mButtonSize;
+        }
+    }
+
+    /*
+    @Override
+    public void applySearchTarget(SearchTargetLegacy searchTarget) {
+        mSearchTarget = searchTarget;
+        Bundle payload = searchTarget.getExtras();
+        mTitleView.setText(payload.getString("title"));
+        mIntent = payload.getParcelable("intent");
+        Bitmap contactIcon = payload.getParcelable("icon");
+        try (LauncherIcons li = LauncherIcons.obtain(getContext())) {
+            BitmapInfo badgeInfo = li.createBadgedIconBitmap(
+                    getAppIcon(mIntent.getPackage()), Process.myUserHandle(),
+                    Build.VERSION.SDK_INT);
+            setIcon(li.badgeBitmap(roundBitmap(contactIcon), badgeInfo).icon, false);
+        } catch (Exception e) {
+            setIcon(contactIcon, true);
+        }
+
+        ArrayList<Bundle> providers = payload.getParcelableArrayList("providers");
+        for (int i = 0; i < mProviderButtons.length; i++) {
+            ImageButton button = mProviderButtons[i];
+            if (providers != null && i < providers.size()) {
+                Bundle provider = providers.get(i);
+                Intent intent = provider.getParcelable("intent");
+                setupProviderButton(button, provider, intent);
+                UI_HELPER_EXECUTOR.post(() -> {
+                    String pkg = provider.getString("package_name");
+                    Drawable appIcon = getAppIcon(pkg);
+                    if (appIcon != null) {
+                        MAIN_EXECUTOR.post(() -> button.setImageDrawable(appIcon));
+                    }
+                });
+                button.setVisibility(VISIBLE);
+            } else {
+                button.setVisibility(GONE);
+            }
+        }
+    }
+    */
+
+    /**
+     * Normalizes the bitmap to look like rounded App Icon
+     * TODO(b/170234747) to support styling, generate adaptive icon drawable and generate
+     * bitmap from it.
+     */
+    private Bitmap roundBitmap(Bitmap icon) {
+        final RoundedBitmapDrawable d = RoundedBitmapDrawableFactory.create(getResources(), icon);
+        d.setCornerRadius(R.attr.folderIconRadius);
+        d.setBounds(0, 0, mIconSize, mIconSize);
+        final Bitmap bitmap = Bitmap.createBitmap(d.getBounds().width(), d.getBounds().height(),
+                Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        d.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+        d.draw(canvas);
+        return bitmap;
+    }
+
+    private void setIcon(Bitmap icon, Boolean round) {
+        if (round) {
+            RoundedBitmapDrawable d = RoundedBitmapDrawableFactory.create(getResources(), icon);
+            d.setCornerRadius(R.attr.folderIconRadius);
+            d.setBounds(0, 0, mIconSize, mIconSize);
+            mIconView.setBackground(d);
+        } else {
+            mIconView.setBackground(new BitmapDrawable(getResources(), icon));
+        }
+    }
+
+
+    private Drawable getAppIcon(String pkg) {
+        try {
+            ApplicationInfo applicationInfo = mPackageManager.getApplicationInfo(
+                    pkg, 0);
+            return applicationInfo.loadIcon(mPackageManager);
+        } catch (PackageManager.NameNotFoundException ignored) {
+            return null;
+        }
+    }
+
+    private void setupProviderButton(ImageButton button, Bundle provider, Intent intent) {
+        Launcher launcher = Launcher.getLauncher(getContext());
+        button.setOnClickListener(b -> {
+            launcher.startActivitySafely(b, intent, null);
+            Bundle bundle = new Bundle();
+            bundle.putBundle("provider", provider);
+        });
+    }
+
+    @Override
+    public void onClick(View view) {
+        // do nothing.
+    }
+
+    @Override
+    public boolean onLongClick(View view) {
+        // do nothing.
+        return false;
+    }
+}
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java b/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java
index 81e9c758a0..b1cbe7d36f 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java
@@ -38,9 +38,10 @@ import java.util.List;
  * A view representing a high confidence app search result that includes shortcuts
  */
 public class SearchResultThumbnailView extends androidx.appcompat.widget.AppCompatImageView
-        implements SearchTargetHandler, View.OnClickListener {
+        implements SearchTargetHandler {
 
     private SearchTarget mSearchTarget;
+    private SearchResultIcon mResultIcon;
 
     public SearchResultThumbnailView(Context context) {
         super(context);
@@ -89,4 +90,10 @@ public class SearchResultThumbnailView extends androidx.appcompat.widget.AppComp
                 (SearchActionItemInfo) view.getTag());
         notifyEvent(getContext(), mSearchTarget.getId(), SearchTargetEvent.ACTION_LAUNCH_TOUCH);
     }
+
+    @Override
+    public boolean onLongClick(View view) {
+        // do nothing.
+        return false;
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultWidget.java b/quickstep/src/com/android/launcher3/search/SearchResultWidget.java
index 4c64265cc3..da1495930e 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultWidget.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultWidget.java
@@ -186,6 +186,10 @@ public class SearchResultWidget extends LinearLayout implements SearchTargetHand
         return false;
     }
 
+    @Override
+    public void onClick(View view) {
+        // do nothing.
+    }
 
     static class ClickListener extends GestureDetector.SimpleOnGestureListener {
         private final Runnable mCb;
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java b/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java
index 5bf19087d8..1786baf47c 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java
@@ -47,8 +47,7 @@ import java.util.List;
 /**
  * displays preview of a widget upon receiving {@link AppWidgetProviderInfo} from Search provider
  */
-public class SearchResultWidgetPreview extends LinearLayout implements SearchTargetHandler,
-        View.OnClickListener, View.OnLongClickListener {
+public class SearchResultWidgetPreview extends LinearLayout implements SearchTargetHandler {
 
     private final Launcher mLauncher;
     private final LauncherAppState mAppState;
diff --git a/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java b/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java
index 9276841734..d7c5c5d157 100644
--- a/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java
+++ b/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java
@@ -18,6 +18,7 @@ package com.android.launcher3.search;
 import android.app.search.SearchTarget;
 import android.content.Context;
 import android.util.AttributeSet;
+import android.view.View;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
@@ -47,4 +48,15 @@ public class SearchSectionHeaderView extends TextView implements SearchTargetHan
         setText(parentTarget.getSearchAction().getTitle());
         setVisibility(VISIBLE);
     }
+
+    @Override
+    public void onClick(View view) {
+        // do nothing.
+    }
+
+    @Override
+    public boolean onLongClick(View view) {
+        // do nothing.
+        return false;
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java b/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java
index fac6ba7474..197aecbc28 100644
--- a/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java
+++ b/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java
@@ -15,8 +15,6 @@
  */
 package com.android.launcher3.search;
 
-import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
-
 import android.app.search.Query;
 import android.app.search.SearchContext;
 import android.app.search.SearchSession;
@@ -41,6 +39,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.function.Consumer;
 
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+
 /**
  * Search pipeline utilizing {@link android.app.search.SearchUiManager}
  */
diff --git a/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java b/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java
index acf6f8a02a..0e7b8f20c9 100644
--- a/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java
+++ b/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java
@@ -19,13 +19,15 @@ package com.android.launcher3.search;
 import android.app.search.SearchTarget;
 import android.app.search.SearchTargetEvent;
 import android.content.Context;
+import android.view.View;
 
 import java.util.List;
+import java.util.function.Consumer;
 
 /**
  * An interface for supporting dynamic search results
  */
-public interface SearchTargetHandler {
+public interface SearchTargetHandler extends View.OnClickListener, View.OnLongClickListener {
 
     /**
      * Update view using values from {@link SearchTarget}
diff --git a/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java b/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java
index c036f19f96..ceef429595 100644
--- a/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java
+++ b/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java
@@ -15,13 +15,6 @@
  */
 package com.android.launcher3.search;
 
-import static com.android.app.search.LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT;
-import static com.android.app.search.LayoutType.ICON_SINGLE_HORIZONTAL_TEXT;
-import static com.android.app.search.LayoutType.THUMBNAIL;
-import static com.android.app.search.ResultType.ACTION;
-import static com.android.app.search.ResultType.SCREENSHOT;
-import static com.android.app.search.ResultType.SUGGEST;
-
 import android.app.PendingIntent;
 import android.app.search.SearchAction;
 import android.app.search.SearchTarget;
@@ -38,11 +31,18 @@ import android.os.UserHandle;
 
 import com.android.app.search.ResultType;
 
+import static com.android.app.search.LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT;
+import static com.android.app.search.LayoutType.ICON_SINGLE_HORIZONTAL_TEXT;
+import static com.android.app.search.LayoutType.THUMBNAIL;
+import static com.android.app.search.ResultType.ACTION;
+import static com.android.app.search.ResultType.SCREENSHOT;
+import static com.android.app.search.ResultType.SUGGEST;
+
 public class SearchTargetUtil {
 
     public static final String BUNDLE_EXTRA_SHOULD_START = "should_start";
     public static final String BUNDLE_EXTRA_SHOULD_START_FOR_RESULT = "should_start_for_result";
-    public static final String BUNDLE_EXTRA_BADGE_WITH_PACKAGE = "badge_with_package";
+    public static final String BUNDLE_EXTRA_BADGE_FROM_ICON = "badge_from_icon";
     public static final String BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE = "primary_icon_from_title";
 
     public static final String EXTRA_CLASS = "class";
@@ -56,10 +56,10 @@ public class SearchTargetUtil {
     /**
      * Generate SearchTargetUtil for ICON_DOUBLE_HORIZONTAL_TEXT layout type.
      *
-     * targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction(
-     * mContext, "red", Color.RED));
-     * targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction(
-     * mContext, "yellow", Color.YELLOW));
+       targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction(
+           mContext, "red", Color.RED));
+       targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction(
+           mContext, "yellow", Color.YELLOW));
      */
     public static SearchTarget generateIconDoubleHorizontalText_SearchAction(
             Context context, String id, int color) {
@@ -83,7 +83,7 @@ public class SearchTargetUtil {
 
         Bundle b = new Bundle();
         b.putBoolean(BUNDLE_EXTRA_SHOULD_START_FOR_RESULT, true);
-        b.putBoolean(BUNDLE_EXTRA_BADGE_WITH_PACKAGE, true);
+        b.putBoolean(BUNDLE_EXTRA_BADGE_FROM_ICON, true);
         b.putBoolean(BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE, true);
 
         builder.setSearchAction(new SearchAction.Builder(id, id + TITLE)
@@ -96,7 +96,7 @@ public class SearchTargetUtil {
     }
 
     /**
-     * Inside SearchServicePipeline, add following samples to test the search target.
+     *  Inside SearchServicePipeline, add following samples to test the search target.
      *
      * targets.add(SearchTargetUtil.generateThumbnail_SearchAction("blue", Color.BLUE));
      * targets.add(SearchTargetUtil.generateThumbnail_SearchAction("red", Color.RED));
@@ -129,10 +129,11 @@ public class SearchTargetUtil {
     }
 
     /**
+     *
      * targets.add(SearchTargetUtil.generateIconHorizontalText_SearchAction(
-     * mContext, "red", Color.RED));
+     *     mContext, "red", Color.RED));
      * targets.add(SearchTargetUtil.generateIconHorizontalText_SearchAction(
-     * mContext, "yellow", Color.YELLOW));
+     *     mContext, "yellow", Color.YELLOW));
      */
     public static SearchTarget generateIconHorizontalText_SearchAction(
             Context context, String id, int color) {
diff --git a/src/com/android/launcher3/model/data/SearchActionItemInfo.java b/src/com/android/launcher3/model/data/SearchActionItemInfo.java
index 8469569c25..36afe50fa1 100644
--- a/src/com/android/launcher3/model/data/SearchActionItemInfo.java
+++ b/src/com/android/launcher3/model/data/SearchActionItemInfo.java
@@ -30,7 +30,7 @@ public class SearchActionItemInfo extends ItemInfoWithIcon {
 
     public static final int FLAG_SHOULD_START = 1 << 1;
     public static final int FLAG_SHOULD_START_FOR_RESULT = FLAG_SHOULD_START | 1 << 2;
-    public static final int FLAG_BADGE_WITH_PACKAGE = 1 << 3;
+    public static final int FLAG_BADGE_FROM_ICON = 1 << 3;
     public static final int FLAG_PRIMARY_ICON_FROM_TITLE = 1 << 4;
 
     private final String mFallbackPackageName;
diff --git a/src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java b/src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java
index 0fc61f04dc..7fbd6ac814 100644
--- a/src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java
+++ b/src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java
@@ -20,7 +20,7 @@ import android.os.Bundle;
 /**
  * Event used for the feedback loop to the plugin. (and future aiai)
  *
- * @deprecated Use {@link android.app.search.SearchTargetEvent}
+ * @deprecated Use SearchTargetEvent
  */
 @Deprecated
 public class SearchTargetEventLegacy {
-- 
GitLab


From d683d98b34ffa75111f556f3b6950e89ba1fd13c Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 23 Dec 2020 16:12:18 -0600
Subject: [PATCH 0445/1664] Animate taskbar background alpha and visibility
 alpha

Setup codepath to animate the Taskbar when going to and from Launcher,
primarily by listening for pause/resume signals but also hints from
gesture nav and AppToOverviewAnimationProvider.

Additionally, add TaskbarStateHandler to listen for Launcher state
changes if Taskbar is enabled. Combined, the end behavior is:

- Background alpha is 0 when Launcher is resumed, and 1 when Launcher
  is paused (we can make this animation more interesting later).
- Taskbar is always visible when Launcher is paused, otherwise its
  visibility is determined by multiple factors: LauncherState and
  whether the IME is showing.

Bug: 171917176
Change-Id: I7856fc979931c9d12d714dee11d179fd1b5a6968
---
 .../launcher3/BaseQuickstepLauncher.java      | 20 +++-
 .../QuickstepAppTransitionManagerImpl.java    |  2 +-
 .../launcher3/taskbar/TaskbarController.java  | 97 +++++++++++++++++++
 .../taskbar/TaskbarStateHandler.java          | 77 +++++++++++++++
 .../launcher3/taskbar/TaskbarView.java        | 13 +++
 .../taskbar/TaskbarVisibilityController.java  | 95 ++++++++++++++++++
 .../states/BackgroundAppState.java            |  4 +-
 .../uioverrides/states/QuickSwitchState.java  |  2 +-
 .../QuickstepAtomicAnimationFactory.java      |  3 +
 .../android/quickstep/AbsSwipeUpHandler.java  |  2 +
 .../AppToOverviewAnimationProvider.java       |  6 ++
 .../quickstep/BaseActivityInterface.java      | 20 ++++
 .../quickstep/LauncherActivityInterface.java  | 34 +++++++
 .../quickstep/TouchInteractionService.java    |  8 +-
 .../util/StaggeredWorkspaceAnim.java          |  4 +-
 src/com/android/launcher3/LauncherState.java  |  3 +-
 .../launcher3/states/SpringLoadedState.java   |  5 +
 .../states/StateAnimationConfig.java          |  8 +-
 18 files changed, 392 insertions(+), 11 deletions(-)
 create mode 100644 quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java
 create mode 100644 quickstep/src/com/android/launcher3/taskbar/TaskbarVisibilityController.java

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 2518f423ca..09a3cfd184 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -45,6 +45,7 @@ import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
 import com.android.launcher3.taskbar.TaskbarContainerView;
 import com.android.launcher3.taskbar.TaskbarController;
+import com.android.launcher3.taskbar.TaskbarStateHandler;
 import com.android.launcher3.uioverrides.RecentsViewStateController;
 import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.UiThreadHelper;
@@ -82,6 +83,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
     private OverviewActionsView mActionsView;
 
     private @Nullable TaskbarController mTaskbarController;
+    private final TaskbarStateHandler mTaskbarStateHandler = new TaskbarStateHandler(this);
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -245,13 +247,23 @@ public abstract class BaseQuickstepLauncher extends Launcher
                 getWorkspace(),
                 getDepthController(),
                 new RecentsViewStateController(this),
-                new BackButtonAlphaHandler(this)};
+                new BackButtonAlphaHandler(this),
+                getTaskbarStateHandler(),
+        };
     }
 
     public DepthController getDepthController() {
         return mDepthController;
     }
 
+    public @Nullable TaskbarController getTaskbarController() {
+        return mTaskbarController;
+    }
+
+    public TaskbarStateHandler getTaskbarStateHandler() {
+        return mTaskbarStateHandler;
+    }
+
     @Override
     public void useFadeOutAnimationForLauncherStart(CancellationSignal signal) {
         QuickstepAppTransitionManagerImpl appTransitionManager =
@@ -296,6 +308,12 @@ public abstract class BaseQuickstepLauncher extends Launcher
             mDepthController.setActivityStarted(isStarted());
         }
 
+        if ((changeBits & ACTIVITY_STATE_RESUMED) != 0) {
+            if (mTaskbarController != null) {
+                mTaskbarController.onLauncherResumedOrPaused(hasBeenResumed());
+            }
+        }
+
         super.onActivityFlagsChanged(changeBits);
     }
 
diff --git a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
index 470a4426ab..36c8bb8b99 100644
--- a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
@@ -139,7 +139,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
     private static final int LAUNCHER_RESUME_START_DELAY = 100;
     private static final int CLOSING_TRANSITION_DURATION_MS = 250;
 
-    protected static final int CONTENT_ALPHA_DURATION = 217;
+    public static final int CONTENT_ALPHA_DURATION = 217;
     protected static final int CONTENT_TRANSLATION_DURATION = 350;
 
     // Progress = 0: All apps is fully pulled up, Progress = 1: All apps is fully pulled down.
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index 7be1b9275a..bdf7f8ad08 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -22,13 +22,22 @@ import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
 import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_BOTTOM_TAPPABLE_ELEMENT;
 import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_EXTRA_NAVIGATION_BAR;
 
+import android.animation.Animator;
 import android.graphics.PixelFormat;
 import android.graphics.Point;
 import android.view.Gravity;
 import android.view.WindowManager;
 
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.BaseQuickstepLauncher;
+import com.android.launcher3.LauncherState;
+import com.android.launcher3.QuickstepAppTransitionManagerImpl;
 import com.android.launcher3.R;
+import com.android.launcher3.anim.AlphaUpdateListener;
+import com.android.launcher3.anim.PendingAnimation;
+import com.android.launcher3.states.StateAnimationConfig;
+import com.android.quickstep.AnimatedFloat;
 import com.android.systemui.shared.system.WindowManagerWrapper;
 
 /**
@@ -44,7 +53,10 @@ public class TaskbarController {
     private final WindowManager mWindowManager;
     // Layout width and height of the Taskbar in the default state.
     private final Point mTaskbarSize;
+    private final TaskbarStateHandler mTaskbarStateHandler;
+    private final TaskbarVisibilityController mTaskbarVisibilityController;
 
+    // Initialized in init().
     private WindowManager.LayoutParams mWindowLayoutParams;
 
     public TaskbarController(BaseQuickstepLauncher launcher,
@@ -55,6 +67,24 @@ public class TaskbarController {
         mWindowManager = mLauncher.getWindowManager();
         mTaskbarSize = new Point(MATCH_PARENT,
                 mLauncher.getResources().getDimensionPixelSize(R.dimen.taskbar_size));
+        mTaskbarStateHandler = mLauncher.getTaskbarStateHandler();
+        mTaskbarVisibilityController = new TaskbarVisibilityController(mLauncher,
+                createTaskbarVisibilityControllerCallbacks());
+    }
+
+    private TaskbarVisibilityControllerCallbacks createTaskbarVisibilityControllerCallbacks() {
+        return new TaskbarVisibilityControllerCallbacks() {
+            @Override
+            public void updateTaskbarBackgroundAlpha(float alpha) {
+                mTaskbarView.setBackgroundAlpha(alpha);
+            }
+
+            @Override
+            public void updateTaskbarVisibilityAlpha(float alpha) {
+                mTaskbarContainerView.setAlpha(alpha);
+                AlphaUpdateListener.updateVisibility(mTaskbarContainerView);
+            }
+        };
     }
 
     /**
@@ -62,6 +92,17 @@ public class TaskbarController {
      */
     public void init() {
         addToWindowManager();
+        mTaskbarStateHandler.setTaskbarCallbacks(createTaskbarStateHandlerCallbacks());
+        mTaskbarVisibilityController.init();
+    }
+
+    private TaskbarStateHandlerCallbacks createTaskbarStateHandlerCallbacks() {
+        return new TaskbarStateHandlerCallbacks() {
+            @Override
+            public AnimatedFloat getAlphaTarget() {
+                return mTaskbarVisibilityController.getTaskbarVisibilityForLauncherState();
+            }
+        };
     }
 
     /**
@@ -69,6 +110,8 @@ public class TaskbarController {
      */
     public void cleanup() {
         removeFromWindowManager();
+        mTaskbarStateHandler.setTaskbarCallbacks(null);
+        mTaskbarVisibilityController.cleanup();
     }
 
     private void removeFromWindowManager() {
@@ -108,4 +151,58 @@ public class TaskbarController {
 
         mWindowManager.addView(mTaskbarContainerView, mWindowLayoutParams);
     }
+
+    /**
+     * Should be called from onResume() and onPause(), and animates the Taskbar accordingly.
+     */
+    public void onLauncherResumedOrPaused(boolean isResumed) {
+        long duration = QuickstepAppTransitionManagerImpl.CONTENT_ALPHA_DURATION;
+        final Animator anim;
+        if (isResumed) {
+            anim = createAnimToLauncher(null, duration);
+        } else {
+            anim = createAnimToApp(duration);
+        }
+        anim.start();
+    }
+
+    /**
+     * Create Taskbar animation when going from an app to Launcher.
+     * @param toState If known, the state we will end up in when reaching Launcher.
+     */
+    public Animator createAnimToLauncher(@Nullable LauncherState toState, long duration) {
+        PendingAnimation anim = new PendingAnimation(duration);
+        anim.add(mTaskbarVisibilityController.createAnimToBackgroundAlpha(0, duration));
+        if (toState != null) {
+            mTaskbarStateHandler.setStateWithAnimation(toState, new StateAnimationConfig(), anim);
+        }
+        return anim.buildAnim();
+    }
+
+    private Animator createAnimToApp(long duration) {
+        return mTaskbarVisibilityController.createAnimToBackgroundAlpha(1, duration);
+    }
+
+    /**
+     * Should be called when the IME visibility changes, so we can hide/show Taskbar accordingly.
+     */
+    public void setIsImeVisible(boolean isImeVisible) {
+        mTaskbarVisibilityController.animateToVisibilityForIme(isImeVisible ? 0 : 1);
+    }
+
+    /**
+     * Contains methods that TaskbarStateHandler can call to interface with TaskbarController.
+     */
+    protected interface TaskbarStateHandlerCallbacks {
+        AnimatedFloat getAlphaTarget();
+    }
+
+    /**
+     * Contains methods that TaskbarVisibilityController can call to interface with
+     * TaskbarController.
+     */
+    protected interface TaskbarVisibilityControllerCallbacks {
+        void updateTaskbarBackgroundAlpha(float alpha);
+        void updateTaskbarVisibilityAlpha(float alpha);
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java
new file mode 100644
index 0000000000..b4b5d8b3fe
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.taskbar;
+
+import static com.android.launcher3.LauncherState.TASKBAR;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_TASKBAR_FADE;
+import static com.android.launcher3.states.StateAnimationConfig.SKIP_TASKBAR;
+
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.BaseQuickstepLauncher;
+import com.android.launcher3.LauncherState;
+import com.android.launcher3.anim.Interpolators;
+import com.android.launcher3.anim.PendingAnimation;
+import com.android.launcher3.statemanager.StateManager;
+import com.android.launcher3.states.StateAnimationConfig;
+import com.android.quickstep.AnimatedFloat;
+
+/**
+ * StateHandler to animate Taskbar according to Launcher's state machine. Does nothing if Taskbar
+ * isn't present (i.e. {@link #setTaskbarCallbacks} is never called).
+ */
+public class TaskbarStateHandler implements StateManager.StateHandler<LauncherState> {
+
+    private final BaseQuickstepLauncher mLauncher;
+
+    // Contains Taskbar-related methods and fields we should aniamte. If null, don't do anything.
+    private @Nullable TaskbarController.TaskbarStateHandlerCallbacks mTaskbarCallbacks = null;
+
+    public TaskbarStateHandler(BaseQuickstepLauncher launcher) {
+        mLauncher = launcher;
+    }
+
+    public void setTaskbarCallbacks(TaskbarController.TaskbarStateHandlerCallbacks callbacks) {
+        mTaskbarCallbacks = callbacks;
+    }
+
+    @Override
+    public void setState(LauncherState state) {
+        if (mTaskbarCallbacks == null) {
+            return;
+        }
+
+        AnimatedFloat alphaTarget = mTaskbarCallbacks.getAlphaTarget();
+        boolean isTaskbarVisible = (state.getVisibleElements(mLauncher) & TASKBAR) != 0;
+        alphaTarget.updateValue(isTaskbarVisible ? 1f : 0f);
+    }
+
+    @Override
+    public void setStateWithAnimation(LauncherState toState, StateAnimationConfig config,
+            PendingAnimation animation) {
+        if (mTaskbarCallbacks == null) {
+            return;
+        }
+        if (config.hasAnimationFlag(SKIP_TASKBAR)) {
+            return;
+        }
+
+        AnimatedFloat alphaTarget = mTaskbarCallbacks.getAlphaTarget();
+        boolean isTaskbarVisible = (toState.getVisibleElements(mLauncher) & TASKBAR) != 0;
+        animation.setFloat(alphaTarget, AnimatedFloat.VALUE, isTaskbarVisible ? 1f : 0f,
+                config.getInterpolator(ANIM_TASKBAR_FADE, Interpolators.LINEAR));
+    }
+}
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
index 5df8d5f9cc..bf6e946f0d 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
@@ -16,6 +16,7 @@
 package com.android.launcher3.taskbar;
 
 import android.content.Context;
+import android.graphics.drawable.ColorDrawable;
 import android.util.AttributeSet;
 import android.widget.LinearLayout;
 
@@ -26,6 +27,9 @@ import androidx.annotation.Nullable;
  * Hosts the Taskbar content such as Hotseat and Recent Apps. Drawn on top of other apps.
  */
 public class TaskbarView extends LinearLayout {
+
+    private final ColorDrawable mBackgroundDrawable;
+
     public TaskbarView(@NonNull Context context) {
         this(context, null);
     }
@@ -42,5 +46,14 @@ public class TaskbarView extends LinearLayout {
     public TaskbarView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr,
             int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
+        mBackgroundDrawable = (ColorDrawable) getBackground();
+    }
+
+    /**
+     * Sets the alpha of the background color behind all the Taskbar contents.
+     * @param alpha 0 is fully transparent, 1 is fully opaque.
+     */
+    public void setBackgroundAlpha(float alpha) {
+        mBackgroundDrawable.setAlpha((int) (alpha * 255));
     }
 }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarVisibilityController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarVisibilityController.java
new file mode 100644
index 0000000000..4cf55d8771
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarVisibilityController.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.taskbar;
+
+import static com.android.launcher3.LauncherState.TASKBAR;
+
+import android.animation.Animator;
+
+import com.android.launcher3.BaseQuickstepLauncher;
+import com.android.quickstep.AnimatedFloat;
+import com.android.quickstep.SystemUiProxy;
+import com.android.systemui.shared.system.QuickStepContract;
+
+/**
+ * Works with TaskbarController to update the TaskbarView's alpha based on LauncherState, whether
+ * Launcher is in the foreground, etc.
+ */
+public class TaskbarVisibilityController {
+
+    private static final long IME_VISIBILITY_ALPHA_DURATION = 120;
+
+    private final BaseQuickstepLauncher mLauncher;
+    private final TaskbarController.TaskbarVisibilityControllerCallbacks mTaskbarCallbacks;
+
+    // Background alpha.
+    private AnimatedFloat mTaskbarBackgroundAlpha = new AnimatedFloat(
+            this::onTaskbarBackgroundAlphaChanged);
+
+    // Overall visibility.
+    private AnimatedFloat mTaskbarVisibilityAlphaForLauncherState = new AnimatedFloat(
+            this::updateVisibilityAlpha);
+    private AnimatedFloat mTaskbarVisibilityAlphaForIme = new AnimatedFloat(
+            this::updateVisibilityAlpha);
+
+    public TaskbarVisibilityController(BaseQuickstepLauncher launcher,
+            TaskbarController.TaskbarVisibilityControllerCallbacks taskbarCallbacks) {
+        mLauncher = launcher;
+        mTaskbarCallbacks = taskbarCallbacks;
+    }
+
+    protected void init() {
+        mTaskbarBackgroundAlpha.updateValue(mLauncher.hasBeenResumed() ? 0f : 1f);
+        boolean isVisibleForLauncherState = (mLauncher.getStateManager().getState()
+                .getVisibleElements(mLauncher) & TASKBAR) != 0;
+        mTaskbarVisibilityAlphaForLauncherState.updateValue(isVisibleForLauncherState ? 1f : 0f);
+        boolean isImeVisible = (SystemUiProxy.INSTANCE.get(mLauncher).getLastSystemUiStateFlags()
+                & QuickStepContract.SYSUI_STATE_IME_SHOWING) != 0;
+        mTaskbarVisibilityAlphaForIme.updateValue(isImeVisible ? 0f : 1f);
+    }
+
+    protected void cleanup() {
+    }
+
+    protected AnimatedFloat getTaskbarVisibilityForLauncherState() {
+        return mTaskbarVisibilityAlphaForLauncherState;
+    }
+
+    protected Animator createAnimToBackgroundAlpha(float toAlpha, long duration) {
+        return mTaskbarBackgroundAlpha.animateToValue(mTaskbarBackgroundAlpha.value, toAlpha)
+                .setDuration(duration);
+    }
+
+    protected void animateToVisibilityForIme(float toAlpha) {
+        mTaskbarVisibilityAlphaForIme.animateToValue(mTaskbarVisibilityAlphaForIme.value, toAlpha)
+                .setDuration(IME_VISIBILITY_ALPHA_DURATION).start();
+    }
+
+    private void onTaskbarBackgroundAlphaChanged() {
+        mTaskbarCallbacks.updateTaskbarBackgroundAlpha(mTaskbarBackgroundAlpha.value);
+        updateVisibilityAlpha();
+    }
+
+    private void updateVisibilityAlpha() {
+        // We use mTaskbarBackgroundAlpha as a proxy for whether Launcher is resumed/paused, the
+        // assumption being that Taskbar should always be visible regardless of the current
+        // LauncherState if Launcher is paused.
+        float alphaDueToLauncher = Math.max(mTaskbarBackgroundAlpha.value,
+                mTaskbarVisibilityAlphaForLauncherState.value);
+        float alphaDueToOther = mTaskbarVisibilityAlphaForIme.value;
+        mTaskbarCallbacks.updateTaskbarVisibilityAlpha(alphaDueToLauncher * alphaDueToOther);
+    }
+}
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
index 4b4f955204..2cf65af3ed 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
@@ -69,7 +69,9 @@ public class BackgroundAppState extends OverviewState {
     @Override
     public int getVisibleElements(Launcher launcher) {
         return super.getVisibleElements(launcher)
-                & ~OVERVIEW_BUTTONS & ~VERTICAL_SWIPE_INDICATOR;
+                & ~OVERVIEW_BUTTONS
+                & ~VERTICAL_SWIPE_INDICATOR
+                | TASKBAR;
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java
index 51e72dacdc..965f474b51 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java
@@ -40,6 +40,6 @@ public class QuickSwitchState extends BackgroundAppState {
 
     @Override
     public int getVisibleElements(Launcher launcher) {
-        return NONE;
+        return TASKBAR;
     }
 }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
index efb91c6905..69b8aca3ef 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
@@ -36,6 +36,7 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FA
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_TASKBAR_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_TRANSLATE;
@@ -80,6 +81,7 @@ public class QuickstepAtomicAnimationFactory extends
         if (toState == NORMAL && fromState == OVERVIEW) {
             config.setInterpolator(ANIM_WORKSPACE_SCALE, DEACCEL);
             config.setInterpolator(ANIM_WORKSPACE_FADE, ACCEL);
+            config.setInterpolator(ANIM_TASKBAR_FADE, ACCEL);
             config.setInterpolator(ANIM_ALL_APPS_FADE, ACCEL);
             config.setInterpolator(ANIM_OVERVIEW_SCALE, clampToProgress(ACCEL, 0, 0.9f));
             config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, ACCEL_DEACCEL);
@@ -138,6 +140,7 @@ public class QuickstepAtomicAnimationFactory extends
             config.setInterpolator(ANIM_DEPTH, OVERSHOOT_1_2);
             config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, OVERSHOOT_1_2);
             config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, OVERSHOOT_1_2);
+            config.setInterpolator(ANIM_TASKBAR_FADE, OVERSHOOT_1_2);
         } else if (fromState == HINT_STATE && toState == NORMAL) {
             config.setInterpolator(ANIM_DEPTH, DEACCEL_3);
             if (mHintToNormalDuration == -1) {
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 39a3a7c40c..6bcc4bfdce 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1062,6 +1062,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         if (mGestureState.getEndTarget().isLauncher) {
             ActivityManagerWrapper.getInstance().registerTaskStackListener(
                     mActivityRestartListener);
+
+            mActivityInterface.onAnimateToLauncher(mGestureState.getEndTarget(), duration);
         }
 
         if (mGestureState.getEndTarget() == HOME) {
diff --git a/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java b/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java
index efd4530c14..d159fa0904 100644
--- a/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java
+++ b/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java
@@ -33,6 +33,7 @@ import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.StatefulActivity;
+import com.android.launcher3.taskbar.TaskbarController;
 import com.android.quickstep.util.RemoteAnimationProvider;
 import com.android.quickstep.util.SurfaceTransactionApplier;
 import com.android.quickstep.util.TaskViewSimulator;
@@ -119,6 +120,11 @@ final class AppToOverviewAnimationProvider<T extends StatefulActivity<?>> extend
                     OVERVIEW.getDepth(mActivity), TOUCH_RESPONSE_INTERPOLATOR);
         }
 
+        TaskbarController taskbarController = mActivityInterface.getTaskbarController();
+        if (taskbarController != null) {
+            pa.add(taskbarController.createAnimToLauncher(OVERVIEW, getRecentsLaunchDuration()));
+        }
+
         RemoteAnimationTargets targets = new RemoteAnimationTargets(appTargets,
                 wallpaperTargets, MODE_CLOSING);
 
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index 5bed929fb4..5f6e59fa11 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -45,6 +45,7 @@ import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.BaseState;
 import com.android.launcher3.statemanager.StatefulActivity;
+import com.android.launcher3.taskbar.TaskbarController;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.util.WindowBounds;
 import com.android.quickstep.SysUINavigationMode.Mode;
@@ -121,6 +122,11 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
         return null;
     }
 
+    @Nullable
+    public TaskbarController getTaskbarController() {
+        return null;
+    }
+
     public final boolean isResumed() {
         ACTIVITY_TYPE activity = getCreatedActivity();
         return activity != null && activity.hasBeenResumed();
@@ -276,6 +282,20 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
         return overviewActionsHeight;
     }
 
+    /**
+     * Called when the gesture ends and the animation starts towards the given target. No-op by
+     * default, but subclasses can override to add an additional animation with the same duration.
+     */
+    public void onAnimateToLauncher(GestureState.GestureEndTarget endTarget, long duration) {
+    }
+
+    /**
+     * See {@link com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags}
+     * @param systemUiStateFlags The latest SystemUiStateFlags
+     */
+    public void onSystemUiFlagsChanged(int systemUiStateFlags) {
+    }
+
     public interface AnimationFactory {
 
         void createActivityInterface(long transitionLength);
diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
index 7630bc4f5b..deb86ec2c3 100644
--- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
@@ -16,9 +16,11 @@
 package com.android.quickstep;
 
 import static com.android.launcher3.LauncherState.BACKGROUND_APP;
+import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.quickstep.SysUINavigationMode.getMode;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -38,8 +40,10 @@ import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statehandlers.DepthController.ClampedDepthProperty;
 import com.android.launcher3.statemanager.StateManager;
+import com.android.launcher3.taskbar.TaskbarController;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.PagedOrientationHandler;
+import com.android.quickstep.GestureState.GestureEndTarget;
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.util.ActivityInitListener;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
@@ -154,6 +158,16 @@ public final class LauncherActivityInterface extends
         return launcher.getDepthController();
     }
 
+    @Nullable
+    @Override
+    public TaskbarController getTaskbarController() {
+        BaseQuickstepLauncher launcher = getCreatedActivity();
+        if (launcher == null) {
+            return null;
+        }
+        return launcher.getTaskbarController();
+    }
+
     @Nullable
     @Override
     public RecentsView getVisibleRecentsView() {
@@ -277,4 +291,24 @@ public final class LauncherActivityInterface extends
         if (activity == null) return;
         activity.getAppTransitionManager().registerRemoteTransitions();
     }
+
+    @Override
+    public void onAnimateToLauncher(GestureEndTarget endTarget, long duration) {
+        TaskbarController taskbarController = getTaskbarController();
+        if (taskbarController == null) {
+            return;
+        }
+        LauncherState toState = endTarget == GestureEndTarget.RECENTS ? OVERVIEW : NORMAL;
+        taskbarController.createAnimToLauncher(toState, duration).start();
+    }
+
+    @Override
+    public void onSystemUiFlagsChanged(int systemUiStateFlags) {
+        TaskbarController taskbarController = getTaskbarController();
+        if (taskbarController == null) {
+            return;
+        }
+        boolean isImeVisible = (systemUiStateFlags & SYSUI_STATE_IME_SHOWING) != 0;
+        taskbarController.setIsImeVisible(isImeVisible);
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 0f409374bb..a98fc1c338 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -370,12 +370,14 @@ public class TouchInteractionService extends Service implements PluginListener<O
     @UiThread
     private void onSystemUiFlagsChanged() {
         if (mDeviceState.isUserUnlocked()) {
-            SystemUiProxy.INSTANCE.get(this).setLastSystemUiStateFlags(
-                    mDeviceState.getSystemUiStateFlags());
+            int systemUiStateFlags = mDeviceState.getSystemUiStateFlags();
+            SystemUiProxy.INSTANCE.get(this).setLastSystemUiStateFlags(systemUiStateFlags);
             mOverviewComponentObserver.onSystemUiStateChanged();
+            mOverviewComponentObserver.getActivityInterface().onSystemUiFlagsChanged(
+                    systemUiStateFlags);
 
             // Update the tracing state
-            if ((mDeviceState.getSystemUiStateFlags() & SYSUI_STATE_TRACING_ENABLED) != 0) {
+            if ((systemUiStateFlags & SYSUI_STATE_TRACING_ENABLED) != 0) {
                 Log.d(TAG, "Starting tracing.");
                 ProtoTracer.INSTANCE.get(this).start();
             } else {
diff --git a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
index 41203319b1..5bae3c77c1 100644
--- a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
+++ b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
@@ -24,6 +24,7 @@ import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_COMPONENTS;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_DEPTH_CONTROLLER;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
+import static com.android.launcher3.states.StateAnimationConfig.SKIP_TASKBAR;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -158,7 +159,8 @@ public class StaggeredWorkspaceAnim {
      */
     private void prepareToAnimate(Launcher launcher, boolean animateOverviewScrim) {
         StateAnimationConfig config = new StateAnimationConfig();
-        config.animFlags = ANIM_ALL_COMPONENTS | SKIP_OVERVIEW | SKIP_DEPTH_CONTROLLER;
+        config.animFlags = ANIM_ALL_COMPONENTS | SKIP_OVERVIEW | SKIP_DEPTH_CONTROLLER
+                | SKIP_TASKBAR;
         config.duration = 0;
         // setRecentsAttachedToAppWindow() will animate recents out.
         launcher.getStateManager().createAtomicAnimation(BACKGROUND_APP, NORMAL, config).start();
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java
index 79476fc536..f9a1ded355 100644
--- a/src/com/android/launcher3/LauncherState.java
+++ b/src/com/android/launcher3/LauncherState.java
@@ -57,6 +57,7 @@ public abstract class LauncherState implements BaseState<LauncherState> {
     public static final int ALL_APPS_CONTENT = 1 << 4;
     public static final int VERTICAL_SWIPE_INDICATOR = 1 << 5;
     public static final int OVERVIEW_BUTTONS = 1 << 6;
+    public static final int TASKBAR = 1 << 7;
 
     /** Mask of all the items that are contained in the apps view. */
     public static final int APPS_VIEW_ITEM_MASK =
@@ -186,7 +187,7 @@ public abstract class LauncherState implements BaseState<LauncherState> {
     }
 
     public int getVisibleElements(Launcher launcher) {
-        int flags = HOTSEAT_ICONS | VERTICAL_SWIPE_INDICATOR;
+        int flags = HOTSEAT_ICONS | VERTICAL_SWIPE_INDICATOR | TASKBAR;
         if (!FeatureFlags.ENABLE_DEVICE_SEARCH.get()
                 && !launcher.getDeviceProfile().isVerticalBarLayout()) {
             flags |= HOTSEAT_SEARCH_BOX;
diff --git a/src/com/android/launcher3/states/SpringLoadedState.java b/src/com/android/launcher3/states/SpringLoadedState.java
index 45172b56ef..44bcc34588 100644
--- a/src/com/android/launcher3/states/SpringLoadedState.java
+++ b/src/com/android/launcher3/states/SpringLoadedState.java
@@ -90,4 +90,9 @@ public class SpringLoadedState extends LauncherState {
     public float getWorkspaceScrimAlpha(Launcher launcher) {
         return 0.3f;
     }
+
+    @Override
+    public int getVisibleElements(Launcher launcher) {
+        return super.getVisibleElements(launcher) & ~TASKBAR;
+    }
 }
diff --git a/src/com/android/launcher3/states/StateAnimationConfig.java b/src/com/android/launcher3/states/StateAnimationConfig.java
index 8b7217709f..ec949ebffd 100644
--- a/src/com/android/launcher3/states/StateAnimationConfig.java
+++ b/src/com/android/launcher3/states/StateAnimationConfig.java
@@ -37,7 +37,8 @@ public class StateAnimationConfig {
             PLAY_ATOMIC_OVERVIEW_SCALE,
             PLAY_ATOMIC_OVERVIEW_PEEK,
             SKIP_OVERVIEW,
-            SKIP_DEPTH_CONTROLLER
+            SKIP_DEPTH_CONTROLLER,
+            SKIP_TASKBAR,
     })
     @Retention(RetentionPolicy.SOURCE)
     public @interface AnimationFlags {}
@@ -46,6 +47,7 @@ public class StateAnimationConfig {
     public static final int PLAY_ATOMIC_OVERVIEW_PEEK = 1 << 2;
     public static final int SKIP_OVERVIEW = 1 << 3;
     public static final int SKIP_DEPTH_CONTROLLER = 1 << 4;
+    public static final int SKIP_TASKBAR = 1 << 5;
 
     public long duration;
     public boolean userControlled;
@@ -72,6 +74,7 @@ public class StateAnimationConfig {
             ANIM_OVERVIEW_MODAL,
             ANIM_DEPTH,
             ANIM_OVERVIEW_ACTIONS_FADE,
+            ANIM_TASKBAR_FADE,
     })
     @Retention(RetentionPolicy.SOURCE)
     public @interface AnimType {}
@@ -91,8 +94,9 @@ public class StateAnimationConfig {
     public static final int ANIM_OVERVIEW_MODAL = 13;
     public static final int ANIM_DEPTH = 14;
     public static final int ANIM_OVERVIEW_ACTIONS_FADE = 15;
+    public static final int ANIM_TASKBAR_FADE = 16;
 
-    private static final int ANIM_TYPES_COUNT = 16;
+    private static final int ANIM_TYPES_COUNT = 17;
 
     protected final Interpolator[] mInterpolators = new Interpolator[ANIM_TYPES_COUNT];
 
-- 
GitLab


From 1ab83de48eb6b5ccc1a2487f7178aba135c0ddc9 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Thu, 28 Jan 2021 05:52:25 -0600
Subject: [PATCH 0446/1664] Support people search results

+ Introduce temporary workaround icon loading with URLConnection for play results

Manual: go/search-action-icon

Bug: 177223401
Test: Manual
Change-Id: I3b597faaad38e8cd1419065b80b359720baf52b0
---
 .../res/layout/search_result_icon_row.xml     |  19 +-
 .../res/layout/search_result_people_item.xml  |  63 ------
 .../search/DeviceSearchAdapterProvider.java   |   3 +-
 .../launcher3/search/SearchAdapterItem.java   |   8 +-
 .../launcher3/search/SearchResultIcon.java    | 131 ++++++++----
 .../launcher3/search/SearchResultIconRow.java |  24 +--
 .../search/SearchResultIconSlice.java         |  12 --
 .../search/SearchResultPeopleView.java        | 199 ------------------
 .../search/SearchResultThumbnailView.java     |  11 +-
 .../launcher3/search/SearchResultWidget.java  |   4 -
 .../search/SearchResultWidgetPreview.java     |   3 +-
 .../search/SearchSectionHeaderView.java       |  12 --
 .../search/SearchServicePipeline.java         |   4 +-
 .../launcher3/search/SearchTargetHandler.java |   4 +-
 .../launcher3/search/SearchTargetUtil.java    |  33 ++-
 .../model/data/SearchActionItemInfo.java      |   2 +-
 .../shared/SearchTargetEventLegacy.java       |   2 +-
 17 files changed, 144 insertions(+), 390 deletions(-)
 delete mode 100644 quickstep/res/layout/search_result_people_item.xml
 delete mode 100644 quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java

diff --git a/quickstep/res/layout/search_result_icon_row.xml b/quickstep/res/layout/search_result_icon_row.xml
index 2119fc3425..81190cfc56 100644
--- a/quickstep/res/layout/search_result_icon_row.xml
+++ b/quickstep/res/layout/search_result_icon_row.xml
@@ -57,9 +57,10 @@
         style="@style/BaseIcon"
         android:layout_width="@dimen/deep_shortcut_icon_size"
         android:layout_height="match_parent"
-        android:gravity="start|center_vertical"
+        android:layout_marginStart="4dp"
+        android:gravity="center"
         launcher:iconDisplay="shortcut_popup"
-        android:textSize="@dimen/search_hero_subtitle_size"
+        android:textSize="@dimen/search_hero_inline_button_size"
         launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size"
         launcher:layoutHorizontal="false" />
 
@@ -68,6 +69,20 @@
         style="@style/BaseIcon"
         android:layout_width="@dimen/deep_shortcut_icon_size"
         android:layout_height="match_parent"
+        android:layout_marginStart="4dp"
+        android:gravity="center"
+        launcher:iconDisplay="shortcut_popup"
+        android:textSize="@dimen/search_hero_inline_button_size"
+        launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size"
+        launcher:layoutHorizontal="false" />
+
+    <com.android.launcher3.search.SearchResultIcon
+        android:id="@+id/shortcut_2"
+        style="@style/BaseIcon"
+        android:layout_width="@dimen/deep_shortcut_icon_size"
+        android:layout_height="match_parent"
+        android:layout_marginStart="4dp"
+        android:gravity="center"
         launcher:iconDisplay="shortcut_popup"
         android:textSize="@dimen/search_hero_inline_button_size"
         launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size"
diff --git a/quickstep/res/layout/search_result_people_item.xml b/quickstep/res/layout/search_result_people_item.xml
deleted file mode 100644
index 964300dd20..0000000000
--- a/quickstep/res/layout/search_result_people_item.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.launcher3.search.SearchResultPeopleView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:gravity="center_vertical"
-    android:layout_height="wrap_content"
-    android:padding="8dp"
-    android:orientation="horizontal">
-
-    <View
-        android:id="@+id/icon"
-        android:layout_marginRight="8dp"
-        android:layout_width="@dimen/deep_shortcut_icon_size"
-        android:layout_height="@dimen/deep_shortcut_icon_size" />
-
-    <TextView
-        android:layout_width="0dp"
-        android:textColor="?android:attr/textColorPrimary"
-        android:id="@+id/title"
-        android:textSize="@dimen/search_hero_title_size"
-        android:layout_height="wrap_content"
-        android:layout_weight="1" />
-
-    <ImageButton
-        android:id="@+id/provider_0"
-        android:scaleType="fitCenter"
-        android:adjustViewBounds="true"
-        android:layout_margin="5dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:layout_width="@dimen/deep_shortcut_icon_size"
-        android:layout_height="@dimen/deep_shortcut_icon_size" />
-
-    <ImageButton
-        android:id="@+id/provider_1"
-        android:layout_margin="5dp"
-        android:scaleType="fitCenter"
-        android:adjustViewBounds="true"
-        android:background="?android:attr/selectableItemBackground"
-        android:layout_width="@dimen/deep_shortcut_icon_size"
-        android:layout_height="@dimen/deep_shortcut_icon_size" />
-
-    <ImageButton
-        android:id="@+id/provider_2"
-        android:layout_margin="5dp"
-        android:scaleType="fitCenter"
-        android:adjustViewBounds="true"
-        android:background="?android:attr/selectableItemBackground"
-        android:layout_width="@dimen/deep_shortcut_icon_size"
-        android:layout_height="@dimen/deep_shortcut_icon_size" />
-
-</com.android.launcher3.search.SearchResultPeopleView>
\ No newline at end of file
diff --git a/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java b/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
index 02be0b94ed..acf6c150cf 100644
--- a/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
+++ b/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
@@ -41,7 +41,6 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
     public static final int VIEW_TYPE_SEARCH_SLICE = 1 << 7;
     public static final int VIEW_TYPE_SEARCH_ICON = (1 << 8) | VIEW_TYPE_ICON;
     public static final int VIEW_TYPE_SEARCH_ICON_ROW = (1 << 9);
-    public static final int VIEW_TYPE_SEARCH_PEOPLE = 1 << 11;
     public static final int VIEW_TYPE_SEARCH_THUMBNAIL = 1 << 12;
     public static final int VIEW_TYPE_SEARCH_WIDGET_LIVE = 1 << 15;
     public static final int VIEW_TYPE_SEARCH_WIDGET_PREVIEW = 1 << 16;
@@ -59,7 +58,6 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_ICON, R.layout.search_result_icon);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_ICON_ROW, R.layout.search_result_icon_row);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_SLICE, R.layout.search_result_slice);
-        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_PEOPLE, R.layout.search_result_people_item);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_THUMBNAIL, R.layout.search_result_thumbnail);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_WIDGET_LIVE, R.layout.search_result_widget_live);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_WIDGET_PREVIEW,
@@ -125,6 +123,7 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
                 break;
             case LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT:
             case LayoutType.ICON_SINGLE_HORIZONTAL_TEXT:
+            case LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT_BUTTON:
                 return VIEW_TYPE_SEARCH_ICON_ROW;
             case LayoutType.THUMBNAIL:
                 if (t.getSearchAction() != null) {
diff --git a/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java b/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
index 0eb3edb555..b402f61979 100644
--- a/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
+++ b/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
@@ -18,7 +18,6 @@ package com.android.launcher3.search;
 
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_ICON;
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_ICON_ROW;
-import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_PEOPLE;
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_SLICE;
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_THUMBNAIL;
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_WIDGET_LIVE;
@@ -42,9 +41,10 @@ public class SearchAdapterItem extends AllAppsGridAdapter.AdapterItem {
 
 
     private static final int AVAILABLE_FOR_ACCESSIBILITY =
-            VIEW_TYPE_SEARCH_SLICE | VIEW_TYPE_SEARCH_PEOPLE | VIEW_TYPE_SEARCH_THUMBNAIL
-                    | VIEW_TYPE_SEARCH_ICON_ROW | VIEW_TYPE_SEARCH_ICON
-                    | VIEW_TYPE_SEARCH_WIDGET_PREVIEW | VIEW_TYPE_SEARCH_WIDGET_LIVE;
+            VIEW_TYPE_SEARCH_SLICE | VIEW_TYPE_SEARCH_THUMBNAIL | VIEW_TYPE_SEARCH_ICON_ROW
+                    | VIEW_TYPE_SEARCH_ICON | VIEW_TYPE_SEARCH_WIDGET_PREVIEW
+                    | VIEW_TYPE_SEARCH_WIDGET_LIVE;
+
 
     public SearchAdapterItem(SearchTargetLegacy searchTargetLegacy, int type) {
         mSearchTargetLegacy = searchTargetLegacy;
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
index 3d89ac5e27..c353d7aa3c 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
@@ -15,12 +15,9 @@
  */
 package com.android.launcher3.search;
 
-import static com.android.launcher3.model.data.SearchActionItemInfo.FLAG_BADGE_FROM_ICON;
+import static com.android.launcher3.model.data.SearchActionItemInfo.FLAG_BADGE_WITH_PACKAGE;
 import static com.android.launcher3.model.data.SearchActionItemInfo.FLAG_PRIMARY_ICON_FROM_TITLE;
-import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_BADGE_FROM_ICON;
 import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE;
-import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_SHOULD_START;
-import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_SHOULD_START_FOR_RESULT;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
@@ -30,9 +27,14 @@ import android.app.search.SearchTargetEvent;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.ShortcutInfo;
-import android.graphics.drawable.Drawable;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.Rect;
+import android.graphics.RectF;
 import android.graphics.drawable.Icon;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.util.AttributeSet;
@@ -45,6 +47,7 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.allapps.AllAppsStore;
 import com.android.launcher3.icons.BitmapInfo;
+import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
@@ -54,14 +57,25 @@ import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.touch.ItemClickHandler;
 import com.android.launcher3.touch.ItemLongClickListener;
 import com.android.launcher3.util.ComponentKey;
+import com.android.launcher3.util.Themes;
 
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLConnection;
 import java.util.List;
 import java.util.function.Consumer;
 
 /**
  * A {@link BubbleTextView} representing a single cell result in AllApps
  */
-public class SearchResultIcon extends BubbleTextView implements SearchTargetHandler {
+public class SearchResultIcon extends BubbleTextView implements
+        SearchTargetHandler, View.OnClickListener,
+        View.OnLongClickListener {
+
+    //Play store thumbnail process workaround
+    private final Rect mTempRect = new Rect();
+    private final Paint mIconPaint = new Paint();
+    private static final int BITMAP_CROP_MASK_COLOR = 0xff424242;
 
     private final Launcher mLauncher;
 
@@ -99,7 +113,7 @@ public class SearchResultIcon extends BubbleTextView implements SearchTargetHand
      * Applies {@link SearchTarget} to view. registers a consumer after a corresponding
      * {@link ItemInfoWithIcon} is created
      */
-    public void applySearchTarget(SearchTarget searchTarget, List<SearchTarget> inlineItems,
+    public void apply(SearchTarget searchTarget, List<SearchTarget> inlineItems,
             Consumer<ItemInfoWithIcon> cb) {
         mOnItemInfoChanged = cb;
         apply(searchTarget, inlineItems);
@@ -115,8 +129,8 @@ public class SearchResultIcon extends BubbleTextView implements SearchTargetHand
             prepareUsingSearchAction(parentTarget);
             mLongPressSupported = false;
         } else {
-            prepareUsingApp(new ComponentName(parentTarget.getPackageName(),
-                    parentTarget.getExtras().getString(SearchTargetUtil.EXTRA_CLASS)),
+            String className = parentTarget.getExtras().getString(SearchTargetUtil.EXTRA_CLASS);
+            prepareUsingApp(new ComponentName(parentTarget.getPackageName(), className),
                     parentTarget.getUserHandle());
             mLongPressSupported = true;
         }
@@ -136,14 +150,17 @@ public class SearchResultIcon extends BubbleTextView implements SearchTargetHand
         //TODO: remove this after flags are introduced in SearchAction. Settings results require
         // startActivityForResult
         boolean isSettingsResult = searchTarget.getResultType() == ResultType.SETTING;
-        if ((extras != null && extras.getBoolean(BUNDLE_EXTRA_SHOULD_START_FOR_RESULT))
+        if ((extras != null && extras.getBoolean(
+                SearchTargetUtil.BUNDLE_EXTRA_SHOULD_START_FOR_RESULT))
                 || isSettingsResult) {
             itemInfo.setFlags(SearchActionItemInfo.FLAG_SHOULD_START_FOR_RESULT);
-        } else if (extras != null && extras.getBoolean(BUNDLE_EXTRA_SHOULD_START)) {
+        } else if (extras != null && extras.getBoolean(
+                SearchTargetUtil.BUNDLE_EXTRA_SHOULD_START)) {
             itemInfo.setFlags(SearchActionItemInfo.FLAG_SHOULD_START);
         }
-        if (extras != null && extras.getBoolean(BUNDLE_EXTRA_BADGE_FROM_ICON)) {
-            itemInfo.setFlags(FLAG_BADGE_FROM_ICON);
+        if (extras != null && extras.getBoolean(
+                SearchTargetUtil.BUNDLE_EXTRA_BADGE_WITH_PACKAGE)) {
+            itemInfo.setFlags(FLAG_BADGE_WITH_PACKAGE);
         }
         if (extras != null && extras.getBoolean(BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE)) {
             itemInfo.setFlags(FLAG_PRIMARY_ICON_FROM_TITLE);
@@ -154,39 +171,76 @@ public class SearchResultIcon extends BubbleTextView implements SearchTargetHand
         MODEL_EXECUTOR.post(() -> {
             try (LauncherIcons li = LauncherIcons.obtain(getContext())) {
                 Icon icon = searchTarget.getSearchAction().getIcon();
-                Drawable d;
-                // This bitmapInfo can be used as main icon or as a badge
-                BitmapInfo bitmapInfo;
-                if (icon == null) {
-                    PackageItemInfo pkgInfo = new PackageItemInfo(searchTarget.getPackageName());
-                    pkgInfo.user = searchTarget.getUserHandle();
-                    appState.getIconCache().getTitleAndIconForApp(pkgInfo, false);
-                    bitmapInfo = pkgInfo.bitmap;
-                } else {
-                    d = itemInfo.getIcon().loadDrawable(getContext());
-                    bitmapInfo = li.createBadgedIconBitmap(d, itemInfo.user,
-                            Build.VERSION.SDK_INT);
-                }
-
-                BitmapInfo bitmapMainIcon;
+                BitmapInfo pkgBitmap = getPackageBitmap(appState, searchTarget);
                 if (itemInfo.hasFlags(FLAG_PRIMARY_ICON_FROM_TITLE)) {
-                    bitmapMainIcon = li.createIconBitmap(
-                            String.valueOf(itemInfo.title.charAt(0)),
-                            bitmapInfo.color);
-                } else {
-                    bitmapMainIcon = bitmapInfo;
-                }
-                if (itemInfo.hasFlags(FLAG_BADGE_FROM_ICON)) {
-                    itemInfo.bitmap = li.badgeBitmap(bitmapMainIcon.icon, bitmapInfo);
+                    // create a bitmap with first char if FLAG_PRIMARY_ICON_FROM_TITLE is set
+                    itemInfo.bitmap = li.createIconBitmap(String.valueOf(itemInfo.title.charAt(0)),
+                            pkgBitmap.color);
+                } else if (icon == null) {
+                    // Use default icon from package name
+                    itemInfo.bitmap = pkgBitmap;
                 } else {
-                    itemInfo.bitmap = bitmapInfo;
+                    boolean isPlayResult = searchTarget.getResultType() == ResultType.PLAY;
+                    if (isPlayResult) {
+                        Bitmap b = getPlayResultBitmap(searchAction.getIcon());
+                        itemInfo.bitmap = b == null
+                                ? BitmapInfo.LOW_RES_INFO : BitmapInfo.fromBitmap(b);
+                    } else {
+                        itemInfo.bitmap = li.createBadgedIconBitmap(icon.loadDrawable(getContext()),
+                                itemInfo.user, false);
+                    }
                 }
 
+                // badge with package name
+                if (itemInfo.hasFlags(FLAG_BADGE_WITH_PACKAGE) && itemInfo.bitmap != pkgBitmap) {
+                    itemInfo.bitmap = li.badgeBitmap(itemInfo.bitmap.icon, pkgBitmap);
+                }
             }
             MAIN_EXECUTOR.post(() -> applyFromSearchActionItemInfo(itemInfo));
         });
     }
 
+    private static BitmapInfo getPackageBitmap(LauncherAppState appState, SearchTarget target) {
+        PackageItemInfo pkgInfo = new PackageItemInfo(target.getPackageName());
+        pkgInfo.user = target.getUserHandle();
+        appState.getIconCache().getTitleAndIconForApp(pkgInfo, false);
+        return pkgInfo.bitmap;
+    }
+
+    private Bitmap getPlayResultBitmap(Icon icon) {
+        try {
+            int iconSize = getIconSize();
+            URL url = new URL(icon.getUri().toString());
+            URLConnection con = url.openConnection();
+            con.addRequestProperty("Cache-Control", "max-age: 0");
+            con.setUseCaches(true);
+            Bitmap bitmap = BitmapFactory.decodeStream(con.getInputStream());
+            return getRoundedBitmap(Bitmap.createScaledBitmap(bitmap, iconSize, iconSize, false));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private Bitmap getRoundedBitmap(Bitmap bitmap) {
+        final int iconSize = bitmap.getWidth();
+        final float radius = Themes.getDialogCornerRadius(getContext());
+
+        return BitmapRenderer.createHardwareBitmap(iconSize, iconSize, (canvas) -> {
+            mTempRect.set(0, 0, iconSize, iconSize);
+            final RectF rectF = new RectF(mTempRect);
+
+            mIconPaint.setAntiAlias(true);
+            mIconPaint.reset();
+            canvas.drawARGB(0, 0, 0, 0);
+            mIconPaint.setColor(BITMAP_CROP_MASK_COLOR);
+            canvas.drawRoundRect(rectF, radius, radius, mIconPaint);
+
+            mIconPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
+            canvas.drawBitmap(bitmap, mTempRect, mTempRect, mIconPaint);
+        });
+    }
+
     private void prepareUsingApp(ComponentName componentName, UserHandle userHandle) {
         AllAppsStore appsStore = mLauncher.getAppsView().getAppsStore();
         AppInfo appInfo = appsStore.getApp(new ComponentKey(componentName, userHandle));
@@ -233,7 +287,6 @@ public class SearchResultIcon extends BubbleTextView implements SearchTargetHand
     }
 
 
-
     private void notifyItemInfoChanged(ItemInfoWithIcon itemInfoWithIcon) {
         if (mOnItemInfoChanged != null) {
             mOnItemInfoChanged.accept(itemInfoWithIcon);
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java b/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
index eafbc73f11..7c3ed69a00 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
@@ -23,7 +23,6 @@ import android.content.Context;
 import android.content.pm.ShortcutInfo;
 import android.text.TextUtils;
 import android.util.AttributeSet;
-import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -44,15 +43,15 @@ import java.util.List;
  */
 public class SearchResultIconRow extends LinearLayout implements SearchTargetHandler {
 
-    public static final int MAX_INLINE_ITEMS = 2;
+    public static final int MAX_INLINE_ITEMS = 3;
 
     protected final Launcher mLauncher;
     private final LauncherAppState mLauncherAppState;
-    private SearchResultIcon mResultIcon;
+    protected SearchResultIcon mResultIcon;
 
     private TextView mTitleView;
     private TextView mSubTitleView;
-    private final SearchResultIcon[] mInlineIcons = new SearchResultIcon[MAX_INLINE_ITEMS];
+    protected final SearchResultIcon[] mInlineIcons = new SearchResultIcon[MAX_INLINE_ITEMS];
 
     private PackageItemInfo mProviderInfo;
 
@@ -91,9 +90,9 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan
 
         mInlineIcons[0] = findViewById(R.id.shortcut_0);
         mInlineIcons[1] = findViewById(R.id.shortcut_1);
+        mInlineIcons[2] = findViewById(R.id.shortcut_2);
         for (SearchResultIcon inlineIcon : mInlineIcons) {
             inlineIcon.getLayoutParams().width = getIconSize();
-            // TODO: inlineIcon.setOnClickListener();
         }
 
         setOnClickListener(mResultIcon);
@@ -103,7 +102,7 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan
     @Override
     public void apply(SearchTarget parentTarget, List<SearchTarget> children) {
         showSubtitleIfNeeded(null);
-        mResultIcon.applySearchTarget(parentTarget, children, this::onItemInfoCreated);
+        mResultIcon.apply(parentTarget, children, this::onItemInfoCreated);
         if (parentTarget.getShortcutInfo() != null) {
             updateWithShortcutInfo(parentTarget.getShortcutInfo());
         } else if (parentTarget.getSearchAction() != null) {
@@ -142,7 +141,7 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan
     protected void showInlineItems(List<SearchTarget> children) {
         for (int i = 0; i < MAX_INLINE_ITEMS; i++) {
             if (i < children.size()) {
-                mInlineIcons[i].apply(children.get(0), new ArrayList<>());
+                mInlineIcons[i].apply(children.get(i), new ArrayList<>());
                 mInlineIcons[i].setVisibility(VISIBLE);
             } else {
                 mInlineIcons[i].setVisibility(GONE);
@@ -154,15 +153,4 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan
         setTag(info);
         mTitleView.setText(info.title);
     }
-
-    @Override
-    public void onClick(View view) {
-        // do nothing.
-    }
-
-    @Override
-    public boolean onLongClick(View view) {
-        // do nothing.
-        return false;
-    }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java b/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java
index f6e5eba9a3..0ea2f8b86e 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java
@@ -22,7 +22,6 @@ import android.app.search.SearchTargetEvent;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.util.Log;
-import android.view.View;
 import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
@@ -133,15 +132,4 @@ public class SearchResultIconSlice extends LinearLayout implements SearchTargetH
     public void onSliceAction(@NonNull EventInfo eventInfo, @NonNull SliceItem sliceItem) {
         notifyEvent(mLauncher, mTargetId, SearchTargetEvent.ACTION_TAP);
     }
-
-    @Override
-    public void onClick(View view) {
-        notifyEvent(mLauncher, mTargetId, SearchTargetEvent.ACTION_LONGPRESS);
-    }
-
-    @Override
-    public boolean onLongClick(View view) {
-        // do nothing
-        return false;
-    }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java b/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java
deleted file mode 100644
index 99e6aa561c..0000000000
--- a/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.search;
-
-import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
-
-import android.app.search.SearchTargetEvent;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Process;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.ImageButton;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import androidx.annotation.Nullable;
-import androidx.core.graphics.drawable.RoundedBitmapDrawable;
-import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
-
-import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.Launcher;
-import com.android.launcher3.R;
-import com.android.launcher3.icons.BitmapInfo;
-import com.android.launcher3.icons.LauncherIcons;
-import com.android.systemui.plugins.shared.SearchTargetLegacy;
-
-import java.util.ArrayList;
-
-/**
- * A view representing a single people search result in all apps
- */
-public class SearchResultPeopleView extends LinearLayout implements SearchTargetHandler {
-
-    public static final String TARGET_TYPE_PEOPLE = "people";
-
-    private final int mIconSize;
-    private final int mButtonSize;
-    private final PackageManager mPackageManager;
-    private View mIconView;
-    private TextView mTitleView;
-    private ImageButton[] mProviderButtons = new ImageButton[3];
-    private Intent mIntent;
-
-    private SearchTargetLegacy mSearchTarget;
-
-    public SearchResultPeopleView(Context context) {
-        this(context, null, 0);
-    }
-
-    public SearchResultPeopleView(Context context,
-            @Nullable AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public SearchResultPeopleView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        DeviceProfile deviceProfile = Launcher.getLauncher(getContext()).getDeviceProfile();
-        mPackageManager = getContext().getPackageManager();
-        mIconSize = deviceProfile.iconSizePx;
-        mButtonSize = (int) (deviceProfile.iconSizePx / 1.5f);
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        mIconView = findViewById(R.id.icon);
-        mIconView.getLayoutParams().height = mIconSize;
-        mIconView.getLayoutParams().width = mIconSize;
-        mTitleView = findViewById(R.id.title);
-        mProviderButtons[0] = findViewById(R.id.provider_0);
-        mProviderButtons[1] = findViewById(R.id.provider_1);
-        mProviderButtons[2] = findViewById(R.id.provider_2);
-        for (ImageButton button : mProviderButtons) {
-            button.getLayoutParams().width = mButtonSize;
-            button.getLayoutParams().height = mButtonSize;
-        }
-    }
-
-    /*
-    @Override
-    public void applySearchTarget(SearchTargetLegacy searchTarget) {
-        mSearchTarget = searchTarget;
-        Bundle payload = searchTarget.getExtras();
-        mTitleView.setText(payload.getString("title"));
-        mIntent = payload.getParcelable("intent");
-        Bitmap contactIcon = payload.getParcelable("icon");
-        try (LauncherIcons li = LauncherIcons.obtain(getContext())) {
-            BitmapInfo badgeInfo = li.createBadgedIconBitmap(
-                    getAppIcon(mIntent.getPackage()), Process.myUserHandle(),
-                    Build.VERSION.SDK_INT);
-            setIcon(li.badgeBitmap(roundBitmap(contactIcon), badgeInfo).icon, false);
-        } catch (Exception e) {
-            setIcon(contactIcon, true);
-        }
-
-        ArrayList<Bundle> providers = payload.getParcelableArrayList("providers");
-        for (int i = 0; i < mProviderButtons.length; i++) {
-            ImageButton button = mProviderButtons[i];
-            if (providers != null && i < providers.size()) {
-                Bundle provider = providers.get(i);
-                Intent intent = provider.getParcelable("intent");
-                setupProviderButton(button, provider, intent);
-                UI_HELPER_EXECUTOR.post(() -> {
-                    String pkg = provider.getString("package_name");
-                    Drawable appIcon = getAppIcon(pkg);
-                    if (appIcon != null) {
-                        MAIN_EXECUTOR.post(() -> button.setImageDrawable(appIcon));
-                    }
-                });
-                button.setVisibility(VISIBLE);
-            } else {
-                button.setVisibility(GONE);
-            }
-        }
-    }
-    */
-
-    /**
-     * Normalizes the bitmap to look like rounded App Icon
-     * TODO(b/170234747) to support styling, generate adaptive icon drawable and generate
-     * bitmap from it.
-     */
-    private Bitmap roundBitmap(Bitmap icon) {
-        final RoundedBitmapDrawable d = RoundedBitmapDrawableFactory.create(getResources(), icon);
-        d.setCornerRadius(R.attr.folderIconRadius);
-        d.setBounds(0, 0, mIconSize, mIconSize);
-        final Bitmap bitmap = Bitmap.createBitmap(d.getBounds().width(), d.getBounds().height(),
-                Bitmap.Config.ARGB_8888);
-        Canvas canvas = new Canvas(bitmap);
-        d.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
-        d.draw(canvas);
-        return bitmap;
-    }
-
-    private void setIcon(Bitmap icon, Boolean round) {
-        if (round) {
-            RoundedBitmapDrawable d = RoundedBitmapDrawableFactory.create(getResources(), icon);
-            d.setCornerRadius(R.attr.folderIconRadius);
-            d.setBounds(0, 0, mIconSize, mIconSize);
-            mIconView.setBackground(d);
-        } else {
-            mIconView.setBackground(new BitmapDrawable(getResources(), icon));
-        }
-    }
-
-
-    private Drawable getAppIcon(String pkg) {
-        try {
-            ApplicationInfo applicationInfo = mPackageManager.getApplicationInfo(
-                    pkg, 0);
-            return applicationInfo.loadIcon(mPackageManager);
-        } catch (PackageManager.NameNotFoundException ignored) {
-            return null;
-        }
-    }
-
-    private void setupProviderButton(ImageButton button, Bundle provider, Intent intent) {
-        Launcher launcher = Launcher.getLauncher(getContext());
-        button.setOnClickListener(b -> {
-            launcher.startActivitySafely(b, intent, null);
-            Bundle bundle = new Bundle();
-            bundle.putBundle("provider", provider);
-        });
-    }
-
-    @Override
-    public void onClick(View view) {
-        // do nothing.
-    }
-
-    @Override
-    public boolean onLongClick(View view) {
-        // do nothing.
-        return false;
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java b/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java
index dd9546171e..8803c9841a 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java
@@ -23,7 +23,6 @@ import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.util.AttributeSet;
 import android.view.View;
-import android.view.ViewGroup;
 
 import androidx.core.graphics.drawable.RoundedBitmapDrawable;
 import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
@@ -39,10 +38,9 @@ import java.util.List;
  * A view representing a high confidence app search result that includes shortcuts
  */
 public class SearchResultThumbnailView extends androidx.appcompat.widget.AppCompatImageView
-        implements SearchTargetHandler {
+        implements SearchTargetHandler, View.OnClickListener {
 
     private SearchTarget mSearchTarget;
-    private SearchResultIcon mResultIcon;
 
     public SearchResultThumbnailView(Context context) {
         super(context);
@@ -61,7 +59,6 @@ public class SearchResultThumbnailView extends androidx.appcompat.widget.AppComp
         super.onFinishInflate();
         setOnFocusChangeListener(Launcher.getLauncher(getContext()).getFocusHandler());
         setOnClickListener(this);
-        setOnLongClickListener(this);
     }
 
     @Override
@@ -102,10 +99,4 @@ public class SearchResultThumbnailView extends androidx.appcompat.widget.AppComp
                 (SearchActionItemInfo) view.getTag());
         notifyEvent(getContext(), mSearchTarget.getId(), SearchTargetEvent.ACTION_LAUNCH_TOUCH);
     }
-
-    @Override
-    public boolean onLongClick(View view) {
-        // do nothing.
-        return false;
-    }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultWidget.java b/quickstep/src/com/android/launcher3/search/SearchResultWidget.java
index da1495930e..4c64265cc3 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultWidget.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultWidget.java
@@ -186,10 +186,6 @@ public class SearchResultWidget extends LinearLayout implements SearchTargetHand
         return false;
     }
 
-    @Override
-    public void onClick(View view) {
-        // do nothing.
-    }
 
     static class ClickListener extends GestureDetector.SimpleOnGestureListener {
         private final Runnable mCb;
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java b/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java
index 1786baf47c..5bf19087d8 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java
@@ -47,7 +47,8 @@ import java.util.List;
 /**
  * displays preview of a widget upon receiving {@link AppWidgetProviderInfo} from Search provider
  */
-public class SearchResultWidgetPreview extends LinearLayout implements SearchTargetHandler {
+public class SearchResultWidgetPreview extends LinearLayout implements SearchTargetHandler,
+        View.OnClickListener, View.OnLongClickListener {
 
     private final Launcher mLauncher;
     private final LauncherAppState mAppState;
diff --git a/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java b/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java
index d7c5c5d157..9276841734 100644
--- a/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java
+++ b/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java
@@ -18,7 +18,6 @@ package com.android.launcher3.search;
 import android.app.search.SearchTarget;
 import android.content.Context;
 import android.util.AttributeSet;
-import android.view.View;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
@@ -48,15 +47,4 @@ public class SearchSectionHeaderView extends TextView implements SearchTargetHan
         setText(parentTarget.getSearchAction().getTitle());
         setVisibility(VISIBLE);
     }
-
-    @Override
-    public void onClick(View view) {
-        // do nothing.
-    }
-
-    @Override
-    public boolean onLongClick(View view) {
-        // do nothing.
-        return false;
-    }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java b/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java
index 197aecbc28..fac6ba7474 100644
--- a/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java
+++ b/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java
@@ -15,6 +15,8 @@
  */
 package com.android.launcher3.search;
 
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+
 import android.app.search.Query;
 import android.app.search.SearchContext;
 import android.app.search.SearchSession;
@@ -39,8 +41,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.function.Consumer;
 
-import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
-
 /**
  * Search pipeline utilizing {@link android.app.search.SearchUiManager}
  */
diff --git a/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java b/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java
index 0e7b8f20c9..acf6f8a02a 100644
--- a/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java
+++ b/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java
@@ -19,15 +19,13 @@ package com.android.launcher3.search;
 import android.app.search.SearchTarget;
 import android.app.search.SearchTargetEvent;
 import android.content.Context;
-import android.view.View;
 
 import java.util.List;
-import java.util.function.Consumer;
 
 /**
  * An interface for supporting dynamic search results
  */
-public interface SearchTargetHandler extends View.OnClickListener, View.OnLongClickListener {
+public interface SearchTargetHandler {
 
     /**
      * Update view using values from {@link SearchTarget}
diff --git a/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java b/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java
index 95f4f58a80..0abed036e3 100644
--- a/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java
+++ b/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java
@@ -15,6 +15,13 @@
  */
 package com.android.launcher3.search;
 
+import static com.android.app.search.LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT;
+import static com.android.app.search.LayoutType.ICON_SINGLE_HORIZONTAL_TEXT;
+import static com.android.app.search.LayoutType.THUMBNAIL;
+import static com.android.app.search.ResultType.ACTION;
+import static com.android.app.search.ResultType.SCREENSHOT;
+import static com.android.app.search.ResultType.SUGGEST;
+
 import android.app.PendingIntent;
 import android.app.search.SearchAction;
 import android.app.search.SearchTarget;
@@ -31,18 +38,11 @@ import android.os.UserHandle;
 
 import com.android.app.search.ResultType;
 
-import static com.android.app.search.LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT;
-import static com.android.app.search.LayoutType.ICON_SINGLE_HORIZONTAL_TEXT;
-import static com.android.app.search.LayoutType.THUMBNAIL;
-import static com.android.app.search.ResultType.ACTION;
-import static com.android.app.search.ResultType.SCREENSHOT;
-import static com.android.app.search.ResultType.SUGGEST;
-
 public class SearchTargetUtil {
 
     public static final String BUNDLE_EXTRA_SHOULD_START = "should_start";
     public static final String BUNDLE_EXTRA_SHOULD_START_FOR_RESULT = "should_start_for_result";
-    public static final String BUNDLE_EXTRA_BADGE_FROM_ICON = "badge_from_icon";
+    public static final String BUNDLE_EXTRA_BADGE_WITH_PACKAGE = "badge_with_package";
     public static final String BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE = "primary_icon_from_title";
 
     public static final String EXTRA_CLASS = "class";
@@ -56,10 +56,10 @@ public class SearchTargetUtil {
     /**
      * Generate SearchTargetUtil for ICON_DOUBLE_HORIZONTAL_TEXT layout type.
      *
-       targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction(
-           mContext, "red", Color.RED));
-       targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction(
-           mContext, "yellow", Color.YELLOW));
+     * targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction(
+     * mContext, "red", Color.RED));
+     * targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction(
+     * mContext, "yellow", Color.YELLOW));
      */
     public static SearchTarget generateIconDoubleHorizontalText_SearchAction(
             Context context, String id, int color) {
@@ -83,7 +83,7 @@ public class SearchTargetUtil {
 
         Bundle b = new Bundle();
         b.putBoolean(BUNDLE_EXTRA_SHOULD_START_FOR_RESULT, true);
-        b.putBoolean(BUNDLE_EXTRA_BADGE_FROM_ICON, true);
+        b.putBoolean(BUNDLE_EXTRA_BADGE_WITH_PACKAGE, true);
         b.putBoolean(BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE, true);
 
         builder.setSearchAction(new SearchAction.Builder(id, id + TITLE)
@@ -96,7 +96,7 @@ public class SearchTargetUtil {
     }
 
     /**
-     *  Inside SearchServicePipeline, add following samples to test the search target.
+     * Inside SearchServicePipeline, add following samples to test the search target.
      *
      * targets.add(SearchTargetUtil.generateThumbnail_SearchAction("blue", Color.BLUE));
      * targets.add(SearchTargetUtil.generateThumbnail_SearchAction("red", Color.RED));
@@ -130,11 +130,10 @@ public class SearchTargetUtil {
     }
 
     /**
-     *
      * targets.add(SearchTargetUtil.generateIconHorizontalText_SearchAction(
-     *     mContext, "red", Color.RED));
+     * mContext, "red", Color.RED));
      * targets.add(SearchTargetUtil.generateIconHorizontalText_SearchAction(
-     *     mContext, "yellow", Color.YELLOW));
+     * mContext, "yellow", Color.YELLOW));
      */
     public static SearchTarget generateIconHorizontalText_SearchAction(
             Context context, String id, int color) {
diff --git a/src/com/android/launcher3/model/data/SearchActionItemInfo.java b/src/com/android/launcher3/model/data/SearchActionItemInfo.java
index 36afe50fa1..8469569c25 100644
--- a/src/com/android/launcher3/model/data/SearchActionItemInfo.java
+++ b/src/com/android/launcher3/model/data/SearchActionItemInfo.java
@@ -30,7 +30,7 @@ public class SearchActionItemInfo extends ItemInfoWithIcon {
 
     public static final int FLAG_SHOULD_START = 1 << 1;
     public static final int FLAG_SHOULD_START_FOR_RESULT = FLAG_SHOULD_START | 1 << 2;
-    public static final int FLAG_BADGE_FROM_ICON = 1 << 3;
+    public static final int FLAG_BADGE_WITH_PACKAGE = 1 << 3;
     public static final int FLAG_PRIMARY_ICON_FROM_TITLE = 1 << 4;
 
     private final String mFallbackPackageName;
diff --git a/src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java b/src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java
index 7fbd6ac814..0fc61f04dc 100644
--- a/src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java
+++ b/src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java
@@ -20,7 +20,7 @@ import android.os.Bundle;
 /**
  * Event used for the feedback loop to the plugin. (and future aiai)
  *
- * @deprecated Use SearchTargetEvent
+ * @deprecated Use {@link android.app.search.SearchTargetEvent}
  */
 @Deprecated
 public class SearchTargetEventLegacy {
-- 
GitLab


From 11b5f6053f321eccfd27ce394d7902a324a8351b Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 29 Jan 2021 17:01:19 -0800
Subject: [PATCH 0447/1664] Removing unused keyboard handling code

Bug: 178781566
Test: Presubmit
Change-Id: I997a7980f4ae2cef1e599ca2cadffc56df5f296e
---
 .../launcher3/AppWidgetResizeFrame.java       |  13 +-
 src/com/android/launcher3/FocusHelper.java    | 567 ------------------
 .../android/launcher3/util/FocusLogic.java    | 553 -----------------
 3 files changed, 11 insertions(+), 1122 deletions(-)
 delete mode 100644 src/com/android/launcher3/FocusHelper.java
 delete mode 100644 src/com/android/launcher3/util/FocusLogic.java

diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java
index bc3e341806..8df5412d37 100644
--- a/src/com/android/launcher3/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher3/AppWidgetResizeFrame.java
@@ -21,7 +21,6 @@ import android.view.ViewGroup;
 
 import com.android.launcher3.accessibility.DragViewStateAnnouncer;
 import com.android.launcher3.dragndrop.DragLayer;
-import com.android.launcher3.util.FocusLogic;
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.launcher3.widget.LauncherAppWidgetHostView;
 
@@ -476,7 +475,7 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
     @Override
     public boolean onKey(View v, int keyCode, KeyEvent event) {
         // Clear the frame and give focus to the widget host view when a directional key is pressed.
-        if (FocusLogic.shouldConsume(keyCode)) {
+        if (shouldConsume(keyCode)) {
             close(false);
             mWidgetView.requestFocus();
             return true;
@@ -599,4 +598,14 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
             return moveEnd ? out.size() - size() : size() - out.size();
         }
     }
+
+    /**
+     * Returns true only if this utility class handles the key code.
+     */
+    public static boolean shouldConsume(int keyCode) {
+        return (keyCode == KeyEvent.KEYCODE_DPAD_LEFT || keyCode == KeyEvent.KEYCODE_DPAD_RIGHT
+                || keyCode == KeyEvent.KEYCODE_DPAD_UP || keyCode == KeyEvent.KEYCODE_DPAD_DOWN
+                || keyCode == KeyEvent.KEYCODE_MOVE_HOME || keyCode == KeyEvent.KEYCODE_MOVE_END
+                || keyCode == KeyEvent.KEYCODE_PAGE_UP || keyCode == KeyEvent.KEYCODE_PAGE_DOWN);
+    }
 }
diff --git a/src/com/android/launcher3/FocusHelper.java b/src/com/android/launcher3/FocusHelper.java
deleted file mode 100644
index e5aecf7be1..0000000000
--- a/src/com/android/launcher3/FocusHelper.java
+++ /dev/null
@@ -1,567 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3;
-
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.SoundEffectConstants;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.android.launcher3.config.FeatureFlags;
-import com.android.launcher3.folder.Folder;
-import com.android.launcher3.folder.FolderPagedView;
-import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.util.FocusLogic;
-import com.android.launcher3.util.Thunk;
-
-/**
- * A keyboard listener we set on all the workspace icons.
- */
-class IconKeyEventListener implements View.OnKeyListener {
-    @Override
-    public boolean onKey(View v, int keyCode, KeyEvent event) {
-        return FocusHelper.handleIconKeyEvent(v, keyCode, event);
-    }
-}
-
-/**
- * A keyboard listener we set on all the hotseat buttons.
- */
-class HotseatIconKeyEventListener implements View.OnKeyListener {
-    @Override
-    public boolean onKey(View v, int keyCode, KeyEvent event) {
-        return FocusHelper.handleHotseatButtonKeyEvent(v, keyCode, event);
-    }
-}
-
-/**
- * A keyboard listener we set on full screen pages (e.g. custom content).
- */
-class FullscreenKeyEventListener implements View.OnKeyListener {
-    @Override
-    public boolean onKey(View v, int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_DPAD_LEFT || keyCode == KeyEvent.KEYCODE_DPAD_RIGHT
-                || keyCode == KeyEvent.KEYCODE_PAGE_DOWN || keyCode == KeyEvent.KEYCODE_PAGE_UP) {
-            // Handle the key event just like a workspace icon would in these cases. In this case,
-            // it will basically act as if there is a single icon in the top left (so you could
-            // think of the fullscreen page as a focusable fullscreen widget).
-            return FocusHelper.handleIconKeyEvent(v, keyCode, event);
-        }
-        return false;
-    }
-}
-
-/**
- * TODO: Reevaluate if this is still required
- */
-public class FocusHelper {
-
-    private static final String TAG = "FocusHelper";
-    private static final boolean DEBUG = false;
-
-    /**
-     * Handles key events in paged folder.
-     */
-    public static class PagedFolderKeyEventListener implements View.OnKeyListener {
-
-        private final Folder mFolder;
-
-        public PagedFolderKeyEventListener(Folder folder) {
-            mFolder = folder;
-        }
-
-        @Override
-        public boolean onKey(View v, int keyCode, KeyEvent e) {
-            boolean consume = FocusLogic.shouldConsume(keyCode);
-            if (e.getAction() == KeyEvent.ACTION_UP) {
-                return consume;
-            }
-            if (DEBUG) {
-                Log.v(TAG, String.format("Handle ALL Folders keyevent=[%s].",
-                        KeyEvent.keyCodeToString(keyCode)));
-            }
-
-            if (!(v.getParent() instanceof ShortcutAndWidgetContainer)) {
-                if (FeatureFlags.IS_STUDIO_BUILD) {
-                    throw new IllegalStateException("Parent of the focused item is not supported.");
-                } else {
-                    return false;
-                }
-            }
-
-            // Initialize variables.
-            final ShortcutAndWidgetContainer itemContainer = (ShortcutAndWidgetContainer) v.getParent();
-            final CellLayout cellLayout = (CellLayout) itemContainer.getParent();
-
-            final int iconIndex = itemContainer.indexOfChild(v);
-            final FolderPagedView pagedView = (FolderPagedView) cellLayout.getParent();
-
-            final int pageIndex = pagedView.indexOfChild(cellLayout);
-            final int pageCount = pagedView.getPageCount();
-            final boolean isLayoutRtl = Utilities.isRtl(v.getResources());
-
-            int[][] matrix = FocusLogic.createSparseMatrix(cellLayout);
-            // Process focus.
-            int newIconIndex = FocusLogic.handleKeyEvent(keyCode, matrix, iconIndex, pageIndex,
-                    pageCount, isLayoutRtl);
-            if (newIconIndex == FocusLogic.NOOP) {
-                handleNoopKey(keyCode, v);
-                return consume;
-            }
-            ShortcutAndWidgetContainer newParent = null;
-            View child = null;
-
-            switch (newIconIndex) {
-                case FocusLogic.PREVIOUS_PAGE_RIGHT_COLUMN:
-                case FocusLogic.PREVIOUS_PAGE_LEFT_COLUMN:
-                    newParent = getCellLayoutChildrenForIndex(pagedView, pageIndex - 1);
-                    if (newParent != null) {
-                        int row = ((CellLayout.LayoutParams) v.getLayoutParams()).cellY;
-                        pagedView.snapToPage(pageIndex - 1);
-                        child = newParent.getChildAt(
-                                ((newIconIndex == FocusLogic.PREVIOUS_PAGE_LEFT_COLUMN)
-                                    ^ newParent.invertLayoutHorizontally()) ? 0 : matrix.length - 1,
-                                row);
-                    }
-                    break;
-                case FocusLogic.PREVIOUS_PAGE_FIRST_ITEM:
-                    newParent = getCellLayoutChildrenForIndex(pagedView, pageIndex - 1);
-                    if (newParent != null) {
-                        pagedView.snapToPage(pageIndex - 1);
-                        child = newParent.getChildAt(0, 0);
-                    }
-                    break;
-                case FocusLogic.PREVIOUS_PAGE_LAST_ITEM:
-                    newParent = getCellLayoutChildrenForIndex(pagedView, pageIndex - 1);
-                    if (newParent != null) {
-                        pagedView.snapToPage(pageIndex - 1);
-                        child = newParent.getChildAt(matrix.length - 1, matrix[0].length - 1);
-                    }
-                    break;
-                case FocusLogic.NEXT_PAGE_FIRST_ITEM:
-                    newParent = getCellLayoutChildrenForIndex(pagedView, pageIndex + 1);
-                    if (newParent != null) {
-                        pagedView.snapToPage(pageIndex + 1);
-                        child = newParent.getChildAt(0, 0);
-                    }
-                    break;
-                case FocusLogic.NEXT_PAGE_LEFT_COLUMN:
-                case FocusLogic.NEXT_PAGE_RIGHT_COLUMN:
-                    newParent = getCellLayoutChildrenForIndex(pagedView, pageIndex + 1);
-                    if (newParent != null) {
-                        pagedView.snapToPage(pageIndex + 1);
-                        child = FocusLogic.getAdjacentChildInNextFolderPage(
-                                newParent, v, newIconIndex);
-                    }
-                    break;
-                case FocusLogic.CURRENT_PAGE_FIRST_ITEM:
-                    child = cellLayout.getChildAt(0, 0);
-                    break;
-                case FocusLogic.CURRENT_PAGE_LAST_ITEM:
-                    child = pagedView.getLastItem();
-                    break;
-                default: // Go to some item on the current page.
-                    child = itemContainer.getChildAt(newIconIndex);
-                    break;
-            }
-            if (child != null) {
-                child.requestFocus();
-                playSoundEffect(keyCode, v);
-            } else {
-                handleNoopKey(keyCode, v);
-            }
-            return consume;
-        }
-
-        public void handleNoopKey(int keyCode, View v) {
-            if (keyCode == KeyEvent.KEYCODE_DPAD_DOWN) {
-                mFolder.mFolderName.requestFocus();
-                playSoundEffect(keyCode, v);
-            }
-        }
-    }
-
-    /**
-     * Handles key events in the workspace hotseat (bottom of the screen).
-     * <p>Currently we don't special case for the phone UI in different orientations, even though
-     * the hotseat is on the side in landscape mode. This is to ensure that accessibility
-     * consistency is maintained across rotations.
-     */
-    static boolean handleHotseatButtonKeyEvent(View v, int keyCode, KeyEvent e) {
-        boolean consume = FocusLogic.shouldConsume(keyCode);
-        if (e.getAction() == KeyEvent.ACTION_UP || !consume) {
-            return consume;
-        }
-
-        final Launcher launcher = Launcher.getLauncher(v.getContext());
-        final DeviceProfile profile = launcher.getDeviceProfile();
-
-        if (DEBUG) {
-            Log.v(TAG, String.format(
-                    "Handle HOTSEAT BUTTONS keyevent=[%s] on hotseat buttons, isVertical=%s",
-                    KeyEvent.keyCodeToString(keyCode), profile.isVerticalBarLayout()));
-        }
-
-        // Initialize the variables.
-        final Workspace workspace = (Workspace) v.getRootView().findViewById(R.id.workspace);
-        final ShortcutAndWidgetContainer hotseatParent = (ShortcutAndWidgetContainer) v.getParent();
-        final CellLayout hotseatLayout = (CellLayout) hotseatParent.getParent();
-
-        final ItemInfo itemInfo = (ItemInfo) v.getTag();
-        int pageIndex = workspace.getNextPage();
-        int pageCount = workspace.getChildCount();
-        int iconIndex = hotseatParent.indexOfChild(v);
-        int iconRank = ((CellLayout.LayoutParams) hotseatLayout.getShortcutsAndWidgets()
-                .getChildAt(iconIndex).getLayoutParams()).cellX;
-
-        final CellLayout iconLayout = (CellLayout) workspace.getChildAt(pageIndex);
-        if (iconLayout == null) {
-            // This check is to guard against cases where key strokes rushes in when workspace
-            // child creation/deletion is still in flux. (e.g., during drop or fling
-            // animation.)
-            return consume;
-        }
-        final ViewGroup iconParent = iconLayout.getShortcutsAndWidgets();
-
-        ViewGroup parent = null;
-        int[][] matrix = null;
-
-        if (keyCode == KeyEvent.KEYCODE_DPAD_UP &&
-                !profile.isVerticalBarLayout()) {
-            matrix = FocusLogic.createSparseMatrixWithHotseat(iconLayout, hotseatLayout, profile);
-            iconIndex += iconParent.getChildCount();
-            parent = iconParent;
-        } else if (keyCode == KeyEvent.KEYCODE_DPAD_LEFT &&
-                profile.isVerticalBarLayout()) {
-            matrix = FocusLogic.createSparseMatrixWithHotseat(iconLayout, hotseatLayout, profile);
-            iconIndex += iconParent.getChildCount();
-            parent = iconParent;
-        } else if (keyCode == KeyEvent.KEYCODE_DPAD_RIGHT &&
-                profile.isVerticalBarLayout()) {
-            keyCode = KeyEvent.KEYCODE_PAGE_DOWN;
-        } else {
-            // For other KEYCODE_DPAD_LEFT and KEYCODE_DPAD_RIGHT navigation, do not use the
-            // matrix extended with hotseat.
-            matrix = FocusLogic.createSparseMatrix(hotseatLayout);
-            parent = hotseatParent;
-        }
-
-        // Process the focus.
-        int newIconIndex = FocusLogic.handleKeyEvent(keyCode, matrix, iconIndex, pageIndex,
-                pageCount, Utilities.isRtl(v.getResources()));
-
-        View newIcon = null;
-        switch (newIconIndex) {
-            case FocusLogic.NEXT_PAGE_FIRST_ITEM:
-                parent = getCellLayoutChildrenForIndex(workspace, pageIndex + 1);
-                newIcon = parent.getChildAt(0);
-                // TODO(hyunyoungs): handle cases where the child is not an icon but
-                // a folder or a widget.
-                workspace.snapToPage(pageIndex + 1);
-                break;
-            case FocusLogic.PREVIOUS_PAGE_FIRST_ITEM:
-                parent = getCellLayoutChildrenForIndex(workspace, pageIndex - 1);
-                newIcon = parent.getChildAt(0);
-                // TODO(hyunyoungs): handle cases where the child is not an icon but
-                // a folder or a widget.
-                workspace.snapToPage(pageIndex - 1);
-                break;
-            case FocusLogic.PREVIOUS_PAGE_LAST_ITEM:
-                parent = getCellLayoutChildrenForIndex(workspace, pageIndex - 1);
-                newIcon = parent.getChildAt(parent.getChildCount() - 1);
-                // TODO(hyunyoungs): handle cases where the child is not an icon but
-                // a folder or a widget.
-                workspace.snapToPage(pageIndex - 1);
-                break;
-            case FocusLogic.PREVIOUS_PAGE_LEFT_COLUMN:
-            case FocusLogic.PREVIOUS_PAGE_RIGHT_COLUMN:
-                // Go to the previous page but keep the focus on the same hotseat icon.
-                workspace.snapToPage(pageIndex - 1);
-                break;
-            case FocusLogic.NEXT_PAGE_LEFT_COLUMN:
-            case FocusLogic.NEXT_PAGE_RIGHT_COLUMN:
-                // Go to the next page but keep the focus on the same hotseat icon.
-                workspace.snapToPage(pageIndex + 1);
-                break;
-        }
-        if (parent == iconParent && newIconIndex >= iconParent.getChildCount()) {
-            newIconIndex -= iconParent.getChildCount();
-        }
-        if (parent != null) {
-            if (newIcon == null && newIconIndex >= 0) {
-                newIcon = parent.getChildAt(newIconIndex);
-            }
-            if (newIcon != null) {
-                newIcon.requestFocus();
-                playSoundEffect(keyCode, v);
-            }
-        }
-        return consume;
-    }
-
-    /**
-     * Handles key events in a workspace containing icons.
-     */
-    static boolean handleIconKeyEvent(View v, int keyCode, KeyEvent e) {
-        boolean consume = FocusLogic.shouldConsume(keyCode);
-        if (e.getAction() == KeyEvent.ACTION_UP || !consume) {
-            return consume;
-        }
-
-        Launcher launcher = Launcher.getLauncher(v.getContext());
-        DeviceProfile profile = launcher.getDeviceProfile();
-
-        if (DEBUG) {
-            Log.v(TAG, String.format("Handle WORKSPACE ICONS keyevent=[%s] isVerticalBar=%s",
-                    KeyEvent.keyCodeToString(keyCode), profile.isVerticalBarLayout()));
-        }
-
-        // Initialize the variables.
-        ShortcutAndWidgetContainer parent = (ShortcutAndWidgetContainer) v.getParent();
-        CellLayout iconLayout = (CellLayout) parent.getParent();
-        final Workspace workspace = (Workspace) iconLayout.getParent();
-        final ViewGroup dragLayer = (ViewGroup) workspace.getParent();
-        final ViewGroup tabs = (ViewGroup) dragLayer.findViewById(R.id.drop_target_bar);
-        final Hotseat hotseat = (Hotseat) dragLayer.findViewById(R.id.hotseat);
-
-        final ItemInfo itemInfo = (ItemInfo) v.getTag();
-        final int iconIndex = parent.indexOfChild(v);
-        final int pageIndex = workspace.indexOfChild(iconLayout);
-        final int pageCount = workspace.getChildCount();
-
-        CellLayout hotseatLayout = (CellLayout) hotseat.getChildAt(0);
-        ShortcutAndWidgetContainer hotseatParent = hotseatLayout.getShortcutsAndWidgets();
-        int[][] matrix;
-
-        // KEYCODE_DPAD_DOWN in portrait (KEYCODE_DPAD_RIGHT in landscape) is the only key allowed
-        // to take a user to the hotseat. For other dpad navigation, do not use the matrix extended
-        // with the hotseat.
-        if (keyCode == KeyEvent.KEYCODE_DPAD_DOWN && !profile.isVerticalBarLayout()) {
-            matrix = FocusLogic.createSparseMatrixWithHotseat(iconLayout, hotseatLayout, profile);
-        } else if (keyCode == KeyEvent.KEYCODE_DPAD_RIGHT &&
-                profile.isVerticalBarLayout()) {
-            matrix = FocusLogic.createSparseMatrixWithHotseat(iconLayout, hotseatLayout, profile);
-        } else {
-            matrix = FocusLogic.createSparseMatrix(iconLayout);
-        }
-
-        // Process the focus.
-        int newIconIndex = FocusLogic.handleKeyEvent(keyCode, matrix, iconIndex, pageIndex,
-                pageCount, Utilities.isRtl(v.getResources()));
-        boolean isRtl = Utilities.isRtl(v.getResources());
-        View newIcon = null;
-        CellLayout workspaceLayout = (CellLayout) workspace.getChildAt(pageIndex);
-        switch (newIconIndex) {
-            case FocusLogic.NOOP:
-                if (keyCode == KeyEvent.KEYCODE_DPAD_UP) {
-                    newIcon = tabs;
-                }
-                break;
-            case FocusLogic.PREVIOUS_PAGE_RIGHT_COLUMN:
-            case FocusLogic.NEXT_PAGE_RIGHT_COLUMN:
-                int newPageIndex = pageIndex - 1;
-                if (newIconIndex == FocusLogic.NEXT_PAGE_RIGHT_COLUMN) {
-                    newPageIndex = pageIndex + 1;
-                }
-                int row = ((CellLayout.LayoutParams) v.getLayoutParams()).cellY;
-                parent = getCellLayoutChildrenForIndex(workspace, newPageIndex);
-                if (parent != null) {
-                    iconLayout = (CellLayout) parent.getParent();
-                    matrix = FocusLogic.createSparseMatrixWithPivotColumn(iconLayout,
-                            iconLayout.getCountX(), row);
-                    newIconIndex = FocusLogic.handleKeyEvent(keyCode, matrix, FocusLogic.PIVOT,
-                            newPageIndex, pageCount, Utilities.isRtl(v.getResources()));
-                    if (newIconIndex == FocusLogic.NEXT_PAGE_FIRST_ITEM) {
-                        newIcon = handleNextPageFirstItem(workspace, hotseatLayout, pageIndex,
-                                isRtl);
-                    } else if (newIconIndex == FocusLogic.PREVIOUS_PAGE_LAST_ITEM) {
-                        newIcon = handlePreviousPageLastItem(workspace, hotseatLayout, pageIndex,
-                                isRtl);
-                    } else {
-                        newIcon = parent.getChildAt(newIconIndex);
-                    }
-                }
-                break;
-            case FocusLogic.PREVIOUS_PAGE_FIRST_ITEM:
-                workspaceLayout = (CellLayout) workspace.getChildAt(pageIndex - 1);
-                newIcon = getFirstFocusableIconInReadingOrder(workspaceLayout, isRtl);
-                if (newIcon == null) {
-                    // Check the hotseat if no focusable item was found on the workspace.
-                    newIcon = getFirstFocusableIconInReadingOrder(hotseatLayout, isRtl);
-                    workspace.snapToPage(pageIndex - 1);
-                }
-                break;
-            case FocusLogic.PREVIOUS_PAGE_LAST_ITEM:
-                newIcon = handlePreviousPageLastItem(workspace, hotseatLayout, pageIndex, isRtl);
-                break;
-            case FocusLogic.NEXT_PAGE_FIRST_ITEM:
-                newIcon = handleNextPageFirstItem(workspace, hotseatLayout, pageIndex, isRtl);
-                break;
-            case FocusLogic.NEXT_PAGE_LEFT_COLUMN:
-            case FocusLogic.PREVIOUS_PAGE_LEFT_COLUMN:
-                newPageIndex = pageIndex + 1;
-                if (newIconIndex == FocusLogic.PREVIOUS_PAGE_LEFT_COLUMN) {
-                    newPageIndex = pageIndex - 1;
-                }
-                row = ((CellLayout.LayoutParams) v.getLayoutParams()).cellY;
-                parent = getCellLayoutChildrenForIndex(workspace, newPageIndex);
-                if (parent != null) {
-                    iconLayout = (CellLayout) parent.getParent();
-                    matrix = FocusLogic.createSparseMatrixWithPivotColumn(iconLayout, -1, row);
-                    newIconIndex = FocusLogic.handleKeyEvent(keyCode, matrix, FocusLogic.PIVOT,
-                            newPageIndex, pageCount, Utilities.isRtl(v.getResources()));
-                    if (newIconIndex == FocusLogic.NEXT_PAGE_FIRST_ITEM) {
-                        newIcon = handleNextPageFirstItem(workspace, hotseatLayout, pageIndex,
-                                isRtl);
-                    } else if (newIconIndex == FocusLogic.PREVIOUS_PAGE_LAST_ITEM) {
-                        newIcon = handlePreviousPageLastItem(workspace, hotseatLayout, pageIndex,
-                                isRtl);
-                    } else {
-                        newIcon = parent.getChildAt(newIconIndex);
-                    }
-                }
-                break;
-            case FocusLogic.CURRENT_PAGE_FIRST_ITEM:
-                newIcon = getFirstFocusableIconInReadingOrder(workspaceLayout, isRtl);
-                if (newIcon == null) {
-                    // Check the hotseat if no focusable item was found on the workspace.
-                    newIcon = getFirstFocusableIconInReadingOrder(hotseatLayout, isRtl);
-                }
-                break;
-            case FocusLogic.CURRENT_PAGE_LAST_ITEM:
-                newIcon = getFirstFocusableIconInReverseReadingOrder(workspaceLayout, isRtl);
-                if (newIcon == null) {
-                    // Check the hotseat if no focusable item was found on the workspace.
-                    newIcon = getFirstFocusableIconInReverseReadingOrder(hotseatLayout, isRtl);
-                }
-                break;
-            default:
-                // current page, some item.
-                if (0 <= newIconIndex && newIconIndex < parent.getChildCount()) {
-                    newIcon = parent.getChildAt(newIconIndex);
-                } else if (parent.getChildCount() <= newIconIndex &&
-                        newIconIndex < parent.getChildCount() + hotseatParent.getChildCount()) {
-                    newIcon = hotseatParent.getChildAt(newIconIndex - parent.getChildCount());
-                }
-                break;
-        }
-        if (newIcon != null) {
-            newIcon.requestFocus();
-            playSoundEffect(keyCode, v);
-        }
-        return consume;
-    }
-
-    //
-    // Helper methods.
-    //
-
-    /**
-     * Private helper method to get the CellLayoutChildren given a CellLayout index.
-     */
-    @Thunk static ShortcutAndWidgetContainer getCellLayoutChildrenForIndex(
-            ViewGroup container, int i) {
-        CellLayout parent = (CellLayout) container.getChildAt(i);
-        return parent.getShortcutsAndWidgets();
-    }
-
-    /**
-     * Helper method to be used for playing sound effects.
-     */
-    @Thunk static void playSoundEffect(int keyCode, View v) {
-        switch (keyCode) {
-            case KeyEvent.KEYCODE_DPAD_LEFT:
-                v.playSoundEffect(SoundEffectConstants.NAVIGATION_LEFT);
-                break;
-            case KeyEvent.KEYCODE_DPAD_RIGHT:
-                v.playSoundEffect(SoundEffectConstants.NAVIGATION_RIGHT);
-                break;
-            case KeyEvent.KEYCODE_DPAD_DOWN:
-            case KeyEvent.KEYCODE_PAGE_DOWN:
-            case KeyEvent.KEYCODE_MOVE_END:
-                v.playSoundEffect(SoundEffectConstants.NAVIGATION_DOWN);
-                break;
-            case KeyEvent.KEYCODE_DPAD_UP:
-            case KeyEvent.KEYCODE_PAGE_UP:
-            case KeyEvent.KEYCODE_MOVE_HOME:
-                v.playSoundEffect(SoundEffectConstants.NAVIGATION_UP);
-                break;
-            default:
-                break;
-        }
-    }
-
-    private static View handlePreviousPageLastItem(Workspace workspace, CellLayout hotseatLayout,
-            int pageIndex, boolean isRtl) {
-        if (pageIndex - 1 < 0) {
-            return null;
-        }
-        CellLayout workspaceLayout = (CellLayout) workspace.getChildAt(pageIndex - 1);
-        View newIcon = getFirstFocusableIconInReverseReadingOrder(workspaceLayout, isRtl);
-        if (newIcon == null) {
-            // Check the hotseat if no focusable item was found on the workspace.
-            newIcon = getFirstFocusableIconInReverseReadingOrder(hotseatLayout,isRtl);
-            workspace.snapToPage(pageIndex - 1);
-        }
-        return newIcon;
-    }
-
-    private static View handleNextPageFirstItem(Workspace workspace, CellLayout hotseatLayout,
-            int pageIndex, boolean isRtl) {
-        if (pageIndex + 1 >= workspace.getPageCount()) {
-            return null;
-        }
-        CellLayout workspaceLayout = (CellLayout) workspace.getChildAt(pageIndex + 1);
-        View newIcon = getFirstFocusableIconInReadingOrder(workspaceLayout, isRtl);
-        if (newIcon == null) {
-            // Check the hotseat if no focusable item was found on the workspace.
-            newIcon = getFirstFocusableIconInReadingOrder(hotseatLayout, isRtl);
-            workspace.snapToPage(pageIndex + 1);
-        }
-        return newIcon;
-    }
-
-    private static View getFirstFocusableIconInReadingOrder(CellLayout cellLayout, boolean isRtl) {
-        View icon;
-        int countX = cellLayout.getCountX();
-        for (int y = 0; y < cellLayout.getCountY(); y++) {
-            int increment = isRtl ? -1 : 1;
-            for (int x = isRtl ? countX - 1 : 0; 0 <= x && x < countX; x += increment) {
-                if ((icon = cellLayout.getChildAt(x, y)) != null && icon.isFocusable()) {
-                    return icon;
-                }
-            }
-        }
-        return null;
-    }
-
-    private static View getFirstFocusableIconInReverseReadingOrder(CellLayout cellLayout,
-            boolean isRtl) {
-        View icon;
-        int countX = cellLayout.getCountX();
-        for (int y = cellLayout.getCountY() - 1; y >= 0; y--) {
-            int increment = isRtl ? 1 : -1;
-            for (int x = isRtl ? 0 : countX - 1; 0 <= x && x < countX; x += increment) {
-                if ((icon = cellLayout.getChildAt(x, y)) != null && icon.isFocusable()) {
-                    return icon;
-                }
-            }
-        }
-        return null;
-    }
-}
diff --git a/src/com/android/launcher3/util/FocusLogic.java b/src/com/android/launcher3/util/FocusLogic.java
deleted file mode 100644
index 4f4cccd7a9..0000000000
--- a/src/com/android/launcher3/util/FocusLogic.java
+++ /dev/null
@@ -1,553 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.util;
-
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.android.launcher3.CellLayout;
-import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.ShortcutAndWidgetContainer;
-import com.android.launcher3.config.FeatureFlags;
-
-import java.util.Arrays;
-
-/**
- * Calculates the next item that a {@link KeyEvent} should change the focus to.
- *<p>
- * Note, this utility class calculates everything regards to icon index and its (x,y) coordinates.
- * Currently supports:
- * <ul>
- *  <li> full matrix of cells that are 1x1
- *  <li> sparse matrix of cells that are 1x1
- *     [ 1][  ][ 2][  ]
- *     [  ][  ][ 3][  ]
- *     [  ][ 4][  ][  ]
- *     [  ][ 5][ 6][ 7]
- * </ul>
- * *<p>
- * For testing, one can use a BT keyboard, or use following adb command.
- * ex. $ adb shell input keyevent 20 // KEYCODE_DPAD_LEFT
- */
-public class FocusLogic {
-
-    private static final String TAG = "FocusLogic";
-    private static final boolean DEBUG = false;
-
-    /** Item and page index related constant used by {@link #handleKeyEvent}. */
-    public static final int NOOP = -1;
-
-    public static final int PREVIOUS_PAGE_RIGHT_COLUMN  = -2;
-    public static final int PREVIOUS_PAGE_FIRST_ITEM    = -3;
-    public static final int PREVIOUS_PAGE_LAST_ITEM     = -4;
-    public static final int PREVIOUS_PAGE_LEFT_COLUMN   = -5;
-
-    public static final int CURRENT_PAGE_FIRST_ITEM     = -6;
-    public static final int CURRENT_PAGE_LAST_ITEM      = -7;
-
-    public static final int NEXT_PAGE_FIRST_ITEM        = -8;
-    public static final int NEXT_PAGE_LEFT_COLUMN       = -9;
-    public static final int NEXT_PAGE_RIGHT_COLUMN      = -10;
-
-    public static final int ALL_APPS_COLUMN = -11;
-
-    // Matrix related constant.
-    public static final int EMPTY = -1;
-    public static final int PIVOT = 100;
-
-    /**
-     * Returns true only if this utility class handles the key code.
-     */
-    public static boolean shouldConsume(int keyCode) {
-        return (keyCode == KeyEvent.KEYCODE_DPAD_LEFT || keyCode == KeyEvent.KEYCODE_DPAD_RIGHT ||
-                keyCode == KeyEvent.KEYCODE_DPAD_UP || keyCode == KeyEvent.KEYCODE_DPAD_DOWN ||
-                keyCode == KeyEvent.KEYCODE_MOVE_HOME || keyCode == KeyEvent.KEYCODE_MOVE_END ||
-                keyCode == KeyEvent.KEYCODE_PAGE_UP || keyCode == KeyEvent.KEYCODE_PAGE_DOWN);
-    }
-
-    public static int handleKeyEvent(int keyCode, int [][] map, int iconIdx, int pageIndex,
-            int pageCount, boolean isRtl) {
-
-        int cntX = map == null ? -1 : map.length;
-        int cntY = map == null ? -1 : map[0].length;
-
-        if (DEBUG) {
-            Log.v(TAG, String.format(
-                    "handleKeyEvent START: cntX=%d, cntY=%d, iconIdx=%d, pageIdx=%d, pageCnt=%d",
-                    cntX, cntY, iconIdx, pageIndex, pageCount));
-        }
-
-        int newIndex = NOOP;
-        switch (keyCode) {
-            case KeyEvent.KEYCODE_DPAD_LEFT:
-                newIndex = handleDpadHorizontal(iconIdx, cntX, cntY, map, -1 /*increment*/, isRtl);
-                if (!isRtl && newIndex == NOOP && pageIndex > 0) {
-                    newIndex = PREVIOUS_PAGE_RIGHT_COLUMN;
-                } else if (isRtl && newIndex == NOOP && pageIndex < pageCount - 1) {
-                    newIndex = NEXT_PAGE_RIGHT_COLUMN;
-                }
-                break;
-            case KeyEvent.KEYCODE_DPAD_RIGHT:
-                newIndex = handleDpadHorizontal(iconIdx, cntX, cntY, map, 1 /*increment*/, isRtl);
-                if (!isRtl && newIndex == NOOP && pageIndex < pageCount - 1) {
-                    newIndex = NEXT_PAGE_LEFT_COLUMN;
-                } else if (isRtl && newIndex == NOOP && pageIndex > 0) {
-                    newIndex = PREVIOUS_PAGE_LEFT_COLUMN;
-                }
-                break;
-            case KeyEvent.KEYCODE_DPAD_DOWN:
-                newIndex = handleDpadVertical(iconIdx, cntX, cntY, map, 1  /*increment*/);
-                break;
-            case KeyEvent.KEYCODE_DPAD_UP:
-                newIndex = handleDpadVertical(iconIdx, cntX, cntY, map, -1  /*increment*/);
-                break;
-            case KeyEvent.KEYCODE_MOVE_HOME:
-                newIndex = handleMoveHome();
-                break;
-            case KeyEvent.KEYCODE_MOVE_END:
-                newIndex = handleMoveEnd();
-                break;
-            case KeyEvent.KEYCODE_PAGE_DOWN:
-                newIndex = handlePageDown(pageIndex, pageCount);
-                break;
-            case KeyEvent.KEYCODE_PAGE_UP:
-                newIndex = handlePageUp(pageIndex);
-                break;
-            default:
-                break;
-        }
-
-        if (DEBUG) {
-            Log.v(TAG, String.format("handleKeyEvent FINISH: index [%d -> %s]",
-                    iconIdx, getStringIndex(newIndex)));
-        }
-        return newIndex;
-    }
-
-    /**
-     * Returns a matrix of size (m x n) that has been initialized with {@link #EMPTY}.
-     *
-     * @param m                 number of columns in the matrix
-     * @param n                 number of rows in the matrix
-     */
-    // TODO: get rid of dynamic matrix creation.
-    private static int[][] createFullMatrix(int m, int n) {
-        int[][] matrix = new int [m][n];
-
-        for (int i=0; i < m;i++) {
-            Arrays.fill(matrix[i], EMPTY);
-        }
-        return matrix;
-    }
-
-    /**
-     * Returns a matrix of size same as the {@link CellLayout} dimension that is initialized with the
-     * index of the child view.
-     */
-    // TODO: get rid of the dynamic matrix creation
-    public static int[][] createSparseMatrix(CellLayout layout) {
-        ShortcutAndWidgetContainer parent = layout.getShortcutsAndWidgets();
-        final int m = layout.getCountX();
-        final int n = layout.getCountY();
-        final boolean invert = parent.invertLayoutHorizontally();
-
-        int[][] matrix = createFullMatrix(m, n);
-
-        // Iterate thru the children.
-        for (int i = 0; i < parent.getChildCount(); i++ ) {
-            View cell = parent.getChildAt(i);
-            if (!cell.isFocusable()) {
-                continue;
-            }
-            int cx = ((CellLayout.LayoutParams) cell.getLayoutParams()).cellX;
-            int cy = ((CellLayout.LayoutParams) cell.getLayoutParams()).cellY;
-            int x = invert ? (m - cx - 1) : cx;
-            if (x < m && cy < n) { // check if view fits into matrix, else skip
-                matrix[x][cy] = i;
-            }
-        }
-        if (DEBUG) {
-            printMatrix(matrix);
-        }
-        return matrix;
-    }
-
-    /**
-     * Creates a sparse matrix that merges the icon and hotseat view group using the cell layout.
-     * The size of the returning matrix is [icon column count x (icon + hotseat row count)]
-     * in portrait orientation. In landscape, [(icon + hotseat) column count x (icon row count)]
-     */
-    // TODO: get rid of the dynamic matrix creation
-    public static int[][] createSparseMatrixWithHotseat(
-            CellLayout iconLayout, CellLayout hotseatLayout, DeviceProfile dp) {
-
-        ViewGroup iconParent = iconLayout.getShortcutsAndWidgets();
-        ViewGroup hotseatParent = hotseatLayout.getShortcutsAndWidgets();
-
-        boolean isHotseatHorizontal = !dp.isVerticalBarLayout();
-
-        int m, n;
-        if (isHotseatHorizontal) {
-            m = hotseatLayout.getCountX();
-            n = iconLayout.getCountY() + hotseatLayout.getCountY();
-        } else {
-            m = iconLayout.getCountX() + hotseatLayout.getCountX();
-            n = hotseatLayout.getCountY();
-        }
-        int[][] matrix = createFullMatrix(m, n);
-        // Iterate through the children of the workspace.
-        for (int i = 0; i < iconParent.getChildCount(); i++) {
-            View cell = iconParent.getChildAt(i);
-            if (!cell.isFocusable()) {
-                continue;
-            }
-            int cx = ((CellLayout.LayoutParams) cell.getLayoutParams()).cellX;
-            int cy = ((CellLayout.LayoutParams) cell.getLayoutParams()).cellY;
-            matrix[cx][cy] = i;
-        }
-
-        // Iterate thru the children of the hotseat.
-        for (int i = hotseatParent.getChildCount() - 1; i >= 0; i--) {
-            if (isHotseatHorizontal) {
-                int cx = ((CellLayout.LayoutParams)
-                        hotseatParent.getChildAt(i).getLayoutParams()).cellX;
-                matrix[cx][iconLayout.getCountY()] = iconParent.getChildCount() + i;
-            } else {
-                int cy = ((CellLayout.LayoutParams)
-                        hotseatParent.getChildAt(i).getLayoutParams()).cellY;
-                matrix[iconLayout.getCountX()][cy] = iconParent.getChildCount() + i;
-            }
-        }
-        if (DEBUG) {
-            printMatrix(matrix);
-        }
-        return matrix;
-    }
-
-    /**
-     * Creates a sparse matrix that merges the icon of previous/next page and last column of
-     * current page. When left key is triggered on the leftmost column, sparse matrix is created
-     * that combines previous page matrix and an extra column on the right. Likewise, when right
-     * key is triggered on the rightmost column, sparse matrix is created that combines this column
-     * on the 0th column and the next page matrix.
-     *
-     * @param pivotX    x coordinate of the focused item in the current page
-     * @param pivotY    y coordinate of the focused item in the current page
-     */
-    // TODO: get rid of the dynamic matrix creation
-    public static int[][] createSparseMatrixWithPivotColumn(CellLayout iconLayout,
-            int pivotX, int pivotY) {
-
-        ViewGroup iconParent = iconLayout.getShortcutsAndWidgets();
-
-        int[][] matrix = createFullMatrix(iconLayout.getCountX() + 1, iconLayout.getCountY());
-
-        // Iterate thru the children of the top parent.
-        for (int i = 0; i < iconParent.getChildCount(); i++) {
-            View cell = iconParent.getChildAt(i);
-            if (!cell.isFocusable()) {
-                continue;
-            }
-            int cx = ((CellLayout.LayoutParams) cell.getLayoutParams()).cellX;
-            int cy = ((CellLayout.LayoutParams) cell.getLayoutParams()).cellY;
-            if (pivotX < 0) {
-                matrix[cx - pivotX][cy] = i;
-            } else {
-                matrix[cx][cy] = i;
-            }
-        }
-
-        if (pivotX < 0) {
-            matrix[0][pivotY] = PIVOT;
-        } else {
-            matrix[pivotX][pivotY] = PIVOT;
-        }
-        if (DEBUG) {
-            printMatrix(matrix);
-        }
-        return matrix;
-    }
-
-    //
-    // key event handling methods.
-    //
-
-    /**
-     * Calculates icon that has is closest to the horizontal axis in reference to the cur icon.
-     *
-     * Example of the check order for KEYCODE_DPAD_RIGHT:
-     * [  ][  ][13][14][15]
-     * [  ][ 6][ 8][10][12]
-     * [ X][ 1][ 2][ 3][ 4]
-     * [  ][ 5][ 7][ 9][11]
-     */
-    // TODO: add unit tests to verify all permutation.
-    private static int handleDpadHorizontal(int iconIdx, int cntX, int cntY,
-            int[][] matrix, int increment, boolean isRtl) {
-        if(matrix == null) {
-            throw new IllegalStateException("Dpad navigation requires a matrix.");
-        }
-        int newIconIndex = NOOP;
-
-        int xPos = -1;
-        int yPos = -1;
-        // Figure out the location of the icon.
-        for (int i = 0; i < cntX; i++) {
-            for (int j = 0; j < cntY; j++) {
-                if (matrix[i][j] == iconIdx) {
-                    xPos = i;
-                    yPos = j;
-                }
-            }
-        }
-        if (DEBUG) {
-            Log.v(TAG, String.format("\thandleDpadHorizontal: \t[x, y]=[%d, %d] iconIndex=%d",
-                    xPos, yPos, iconIdx));
-        }
-
-        // Rule1: check first in the horizontal direction
-        for (int x = xPos + increment; 0 <= x && x < cntX; x += increment) {
-            if ((newIconIndex = inspectMatrix(x, yPos, cntX, cntY, matrix)) != NOOP
-                    && newIconIndex != ALL_APPS_COLUMN) {
-                return newIconIndex;
-            }
-        }
-
-        // Rule2: check (x1-n, yPos + increment),   (x1-n, yPos - increment)
-        //              (x2-n, yPos + 2*increment), (x2-n, yPos - 2*increment)
-        int nextYPos1;
-        int nextYPos2;
-        boolean haveCrossedAllAppsColumn1 = false;
-        boolean haveCrossedAllAppsColumn2 = false;
-        int x = -1;
-        for (int coeff = 1; coeff < cntY; coeff++) {
-            nextYPos1 = yPos + coeff * increment;
-            nextYPos2 = yPos - coeff * increment;
-            x = xPos + increment * coeff;
-            if (inspectMatrix(x, nextYPos1, cntX, cntY, matrix) == ALL_APPS_COLUMN) {
-                haveCrossedAllAppsColumn1 = true;
-            }
-            if (inspectMatrix(x, nextYPos2, cntX, cntY, matrix) == ALL_APPS_COLUMN) {
-                haveCrossedAllAppsColumn2 = true;
-            }
-            for (; 0 <= x && x < cntX; x += increment) {
-                int offset1 = haveCrossedAllAppsColumn1 && x < cntX - 1 ? increment : 0;
-                newIconIndex = inspectMatrix(x, nextYPos1 + offset1, cntX, cntY, matrix);
-                if (newIconIndex != NOOP) {
-                    return newIconIndex;
-                }
-                int offset2 = haveCrossedAllAppsColumn2 && x < cntX - 1 ? -increment : 0;
-                newIconIndex = inspectMatrix(x, nextYPos2 + offset2, cntX, cntY, matrix);
-                if (newIconIndex != NOOP) {
-                    return newIconIndex;
-                }
-            }
-        }
-
-        // Rule3: if switching between pages, do a brute-force search to find an item that was
-        //        missed by rules 1 and 2 (such as when going from a bottom right icon to top left)
-        if (iconIdx == PIVOT) {
-            if (isRtl) {
-                return increment < 0 ? NEXT_PAGE_FIRST_ITEM : PREVIOUS_PAGE_LAST_ITEM;
-            }
-            return increment < 0 ? PREVIOUS_PAGE_LAST_ITEM : NEXT_PAGE_FIRST_ITEM;
-        }
-        return newIconIndex;
-    }
-
-    /**
-     * Calculates icon that is closest to the vertical axis in reference to the current icon.
-     *
-     * Example of the check order for KEYCODE_DPAD_DOWN:
-     * [  ][  ][  ][ X][  ][  ][  ]
-     * [  ][  ][ 5][ 1][ 4][  ][  ]
-     * [  ][10][ 7][ 2][ 6][ 9][  ]
-     * [14][12][ 9][ 3][ 8][11][13]
-     */
-    // TODO: add unit tests to verify all permutation.
-    private static int handleDpadVertical(int iconIndex, int cntX, int cntY,
-            int [][] matrix, int increment) {
-        int newIconIndex = NOOP;
-        if(matrix == null) {
-            throw new IllegalStateException("Dpad navigation requires a matrix.");
-        }
-
-        int xPos = -1;
-        int yPos = -1;
-        // Figure out the location of the icon.
-        for (int i = 0; i< cntX; i++) {
-            for (int j = 0; j < cntY; j++) {
-                if (matrix[i][j] == iconIndex) {
-                    xPos = i;
-                    yPos = j;
-                }
-            }
-        }
-
-        if (DEBUG) {
-            Log.v(TAG, String.format("\thandleDpadVertical: \t[x, y]=[%d, %d] iconIndex=%d",
-                    xPos, yPos, iconIndex));
-        }
-
-        // Rule1: check first in the dpad direction
-        for (int y = yPos + increment; 0 <= y && y <cntY && 0 <= y; y += increment) {
-            if ((newIconIndex = inspectMatrix(xPos, y, cntX, cntY, matrix)) != NOOP
-                    && newIconIndex != ALL_APPS_COLUMN) {
-                return newIconIndex;
-            }
-        }
-
-        // Rule2: check (xPos + increment, y_(1-n)),   (xPos - increment, y_(1-n))
-        //              (xPos + 2*increment, y_(2-n))), (xPos - 2*increment, y_(2-n))
-        int nextXPos1;
-        int nextXPos2;
-        boolean haveCrossedAllAppsColumn1 = false;
-        boolean haveCrossedAllAppsColumn2 = false;
-        int y = -1;
-        for (int coeff = 1; coeff < cntX; coeff++) {
-            nextXPos1 = xPos + coeff * increment;
-            nextXPos2 = xPos - coeff * increment;
-            y = yPos + increment * coeff;
-            if (inspectMatrix(nextXPos1, y, cntX, cntY, matrix) == ALL_APPS_COLUMN) {
-                haveCrossedAllAppsColumn1 = true;
-            }
-            if (inspectMatrix(nextXPos2, y, cntX, cntY, matrix) == ALL_APPS_COLUMN) {
-                haveCrossedAllAppsColumn2 = true;
-            }
-            for (; 0 <= y && y < cntY; y = y + increment) {
-                int offset1 = haveCrossedAllAppsColumn1 && y < cntY - 1 ? increment : 0;
-                newIconIndex = inspectMatrix(nextXPos1 + offset1, y, cntX, cntY, matrix);
-                if (newIconIndex != NOOP) {
-                    return newIconIndex;
-                }
-                int offset2 = haveCrossedAllAppsColumn2 && y < cntY - 1 ? -increment : 0;
-                newIconIndex = inspectMatrix(nextXPos2 + offset2, y, cntX, cntY, matrix);
-                if (newIconIndex != NOOP) {
-                    return newIconIndex;
-                }
-            }
-        }
-        return newIconIndex;
-    }
-
-    private static int handleMoveHome() {
-        return CURRENT_PAGE_FIRST_ITEM;
-    }
-
-    private static int handleMoveEnd() {
-        return CURRENT_PAGE_LAST_ITEM;
-    }
-
-    private static int handlePageDown(int pageIndex, int pageCount) {
-        if (pageIndex < pageCount -1) {
-            return NEXT_PAGE_FIRST_ITEM;
-        }
-        return CURRENT_PAGE_LAST_ITEM;
-    }
-
-    private static int handlePageUp(int pageIndex) {
-        if (pageIndex > 0) {
-            return PREVIOUS_PAGE_FIRST_ITEM;
-        } else {
-            return CURRENT_PAGE_FIRST_ITEM;
-        }
-    }
-
-    //
-    // Helper methods.
-    //
-
-    private static boolean isValid(int xPos, int yPos, int countX, int countY) {
-        return (0 <= xPos && xPos < countX && 0 <= yPos && yPos < countY);
-    }
-
-    private static int inspectMatrix(int x, int y, int cntX, int cntY, int[][] matrix) {
-        int newIconIndex = NOOP;
-        if (isValid(x, y, cntX, cntY)) {
-            if (matrix[x][y] != -1) {
-                newIconIndex = matrix[x][y];
-                if (DEBUG) {
-                    Log.v(TAG, String.format("\t\tinspect: \t[x, y]=[%d, %d] %d",
-                            x, y, matrix[x][y]));
-                }
-                return newIconIndex;
-            }
-        }
-        return newIconIndex;
-    }
-
-    /**
-     * Only used for debugging.
-     */
-    private static String getStringIndex(int index) {
-        switch(index) {
-            case NOOP: return "NOOP";
-            case PREVIOUS_PAGE_FIRST_ITEM:  return "PREVIOUS_PAGE_FIRST";
-            case PREVIOUS_PAGE_LAST_ITEM:   return "PREVIOUS_PAGE_LAST";
-            case PREVIOUS_PAGE_RIGHT_COLUMN:return "PREVIOUS_PAGE_RIGHT_COLUMN";
-            case CURRENT_PAGE_FIRST_ITEM:   return "CURRENT_PAGE_FIRST";
-            case CURRENT_PAGE_LAST_ITEM:    return "CURRENT_PAGE_LAST";
-            case NEXT_PAGE_FIRST_ITEM:      return "NEXT_PAGE_FIRST";
-            case NEXT_PAGE_LEFT_COLUMN:     return "NEXT_PAGE_LEFT_COLUMN";
-            case ALL_APPS_COLUMN:           return "ALL_APPS_COLUMN";
-            default:
-                return Integer.toString(index);
-        }
-    }
-
-    /**
-     * Only used for debugging.
-     */
-    private static void printMatrix(int[][] matrix) {
-        Log.v(TAG, "\tprintMap:");
-        int m = matrix.length;
-        int n = matrix[0].length;
-
-        for (int j=0; j < n; j++) {
-            String colY = "\t\t";
-            for (int i=0; i < m; i++) {
-                colY +=  String.format("%3d",matrix[i][j]);
-            }
-            Log.v(TAG, colY);
-        }
-    }
-
-    /**
-     * @param edgeColumn the column of the new icon. either {@link #NEXT_PAGE_LEFT_COLUMN} or
-     * {@link #NEXT_PAGE_RIGHT_COLUMN}
-     * @return the view adjacent to {@param oldView} in the {@param nextPage} of the folder.
-     */
-    public static View getAdjacentChildInNextFolderPage(
-            ShortcutAndWidgetContainer nextPage, View oldView, int edgeColumn) {
-        final int newRow = ((CellLayout.LayoutParams) oldView.getLayoutParams()).cellY;
-
-        int column = (edgeColumn == NEXT_PAGE_LEFT_COLUMN) ^ nextPage.invertLayoutHorizontally()
-                ? 0 : (((CellLayout) nextPage.getParent()).getCountX() - 1);
-
-        for (; column >= 0; column--) {
-            for (int row = newRow; row >= 0; row--) {
-                View newView = nextPage.getChildAt(column, row);
-                if (newView != null) {
-                    return newView;
-                }
-            }
-        }
-        return null;
-    }
-}
-- 
GitLab


From 5f7f4cb35d3e7bf3ae222e4c46fd0c61749ed9ca Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Thu, 28 Jan 2021 13:51:23 -0800
Subject: [PATCH 0448/1664] State download information in content description
 whether or not there was an update.

Talkback wasn't announcing the incremental download/install progress if the progress wasn't updated. Updated BubbleTextView to update the content description with the incremental download/install info if the progress bar should be shown.

Fixes: 149444435

Test: manual
Change-Id: I3efe6e31cec389da4119a2179a341aedd074a0b7
---
 res/values/strings.xml                        |  2 ++
 src/com/android/launcher3/BubbleTextView.java | 26 ++++++++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3425f919c5..447c9ac568 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -232,6 +232,8 @@
     <string name="abandoned_promise_explanation">The app for this icon isn\'t installed.
         You can remove it, or search for the app and install it manually.
     </string>
+    <!-- Title for an app which is being installed. -->
+    <string name="app_installing_title"><xliff:g id="name" example="Messenger">%1$s</xliff:g> installing, <xliff:g id="progress" example="30%">%2$s</xliff:g> complete</string>
     <!-- Title for an app which is being downloaded. -->
     <string name="app_downloading_title"><xliff:g id="name" example="Messenger">%1$s</xliff:g> downloading, <xliff:g id="progress" example="30%">%2$s</xliff:g> complete</string>
     <!-- Title for an app whose download has been started. -->
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 575d6cd8e6..ecda501f1f 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -289,6 +289,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         setTag(info);
         applyLoadingState(promiseStateChanged);
         applyDotState(info, false /* animate */);
+        setDownloadStateContentDescription(info, info.getProgressLevel());
     }
 
     public void applyFromApplicationInfo(AppInfo info) {
@@ -304,6 +305,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
             applyProgressLevel();
         }
         applyDotState(info, false /* animate */);
+        setDownloadStateContentDescription(info, info.getProgressLevel());
     }
 
     /**
@@ -316,6 +318,8 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
 
         // Verify high res immediately
         verifyHighRes();
+
+        setDownloadStateContentDescription(info, info.getProgressLevel());
     }
 
     /**
@@ -635,9 +639,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
             setContentDescription(info.contentDescription != null
                     ? info.contentDescription : "");
         } else if (progressLevel > 0) {
-            setContentDescription(getContext()
-                    .getString(R.string.app_downloading_title, info.title,
-                            NumberFormat.getPercentInstance().format(progressLevel * 0.01)));
+            setDownloadStateContentDescription(info, progressLevel);
         } else {
             setContentDescription(getContext()
                     .getString(R.string.app_waiting_download_title, info.title));
@@ -713,6 +715,24 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         }
     }
 
+    private void setDownloadStateContentDescription(ItemInfoWithIcon info, int progressLevel) {
+        if ((info.runtimeStatusFlags & ItemInfoWithIcon.FLAG_SHOW_DOWNLOAD_PROGRESS_MASK)
+                != 0) {
+            String percentageString = NumberFormat.getPercentInstance()
+                    .format(progressLevel * 0.01);
+            if ((info.runtimeStatusFlags & ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE) != 0) {
+                setContentDescription(getContext()
+                        .getString(
+                            R.string.app_installing_title, info.title, percentageString));
+            } else if ((info.runtimeStatusFlags
+                    & ItemInfoWithIcon.FLAG_INCREMENTAL_DOWNLOAD_ACTIVE) != 0) {
+                setContentDescription(getContext()
+                        .getString(
+                            R.string.app_downloading_title, info.title, percentageString));
+            }
+        }
+    }
+
     /**
      * Sets the icon for this view based on the layout direction.
      */
-- 
GitLab


From 2b14f4bfd4e435689528dabdd7d82726f4406caa Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Mon, 1 Feb 2021 14:13:00 -0800
Subject: [PATCH 0449/1664] Allows a plugin Settings activity to designate
 plugins it supports.

The activity can add categories to its intent filter which
match the actions of the plugins it supports. The Settings
icon is only shown next to these plugins.

This is useful if an app (e.g. SupportApp) implements
multiple plugins which may each want their own settings.

Note: If any settings activity in an app specifies
categories of plugin it supports, any other settings
activities in the same app must also provide categories
of their plugins to disambiguate.

Test: Manually with SupportApp (including mix of plugins
with and without Settings activities) and AwarenessSpace
plugin (with a non-categorized settings activity).

Change-Id: If3ab7b5f7f916fd3f6b05b89cf1a22c9d21403cc
---
 .../settings/DeveloperOptionsFragment.java    | 60 +++++++++++--------
 1 file changed, 35 insertions(+), 25 deletions(-)

diff --git a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
index 47d214d0a8..c9fb956617 100644
--- a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
+++ b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
@@ -15,7 +15,10 @@
  */
 package com.android.launcher3.settings;
 
+import static android.content.pm.PackageManager.GET_RESOLVED_FILTER;
 import static android.content.pm.PackageManager.MATCH_DISABLED_COMPONENTS;
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
 
 import static com.android.launcher3.uioverrides.plugins.PluginManagerWrapper.PLUGIN_CHANGED;
 import static com.android.launcher3.uioverrides.plugins.PluginManagerWrapper.pluginEnabledKey;
@@ -26,10 +29,8 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -130,7 +131,7 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         EditText filterBox = view.findViewById(R.id.filter_box);
-        filterBox.setVisibility(View.VISIBLE);
+        filterBox.setVisibility(VISIBLE);
         filterBox.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
@@ -212,7 +213,7 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
 
         Set<String> pluginActions = manager.getPluginActions();
 
-        ArrayMap<Pair<String, String>, ArrayList<Pair<String, ServiceInfo>>> plugins =
+        ArrayMap<Pair<String, String>, ArrayList<Pair<String, ResolveInfo>>> plugins =
                 new ArrayMap<>();
 
         Set<String> pluginPermissionApps = pm.getPackagesHoldingPermissions(
@@ -224,7 +225,7 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
         for (String action : pluginActions) {
             String name = toName(action);
             List<ResolveInfo> result = pm.queryIntentServices(
-                    new Intent(action), MATCH_DISABLED_COMPONENTS);
+                    new Intent(action), MATCH_DISABLED_COMPONENTS | GET_RESOLVED_FILTER);
             for (ResolveInfo info : result) {
                 String packageName = info.serviceInfo.packageName;
                 if (!pluginPermissionApps.contains(packageName)) {
@@ -235,7 +236,7 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
                 if (!plugins.containsKey(key)) {
                     plugins.put(key, new ArrayList<>());
                 }
-                plugins.get(key).add(Pair.create(name, info.serviceInfo));
+                plugins.get(key).add(Pair.create(name, info));
             }
         }
 
@@ -243,11 +244,11 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
         plugins.forEach((key, si) -> {
             String packageName = key.first;
             List<ComponentName> componentNames = si.stream()
-                    .map(p -> new ComponentName(packageName, p.second.name))
+                    .map(p -> new ComponentName(packageName, p.second.serviceInfo.name))
                     .collect(Collectors.toList());
             if (!componentNames.isEmpty()) {
                 SwitchPreference pref = new PluginPreference(
-                        prefContext, si.get(0).second.applicationInfo, enabler, componentNames);
+                        prefContext, si.get(0).second, enabler, componentNames);
                 pref.setSummary("Plugins: "
                         + si.stream().map(p -> p.first).collect(Collectors.joining(", ")));
                 mPluginsCategory.addPreference(pref);
@@ -341,21 +342,33 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
     }
 
     private static class PluginPreference extends SwitchPreference {
-        private final boolean mHasSettings;
-        private final PreferenceDataStore mPluginEnabler;
         private final String mPackageName;
+        private final ResolveInfo mSettingsInfo;
+        private final PreferenceDataStore mPluginEnabler;
         private final List<ComponentName> mComponentNames;
 
-        PluginPreference(Context prefContext, ApplicationInfo info,
+        PluginPreference(Context prefContext, ResolveInfo pluginInfo,
                 PreferenceDataStore pluginEnabler, List<ComponentName> componentNames) {
             super(prefContext);
             PackageManager pm = prefContext.getPackageManager();
-            mHasSettings = pm.resolveActivity(new Intent(ACTION_PLUGIN_SETTINGS)
-                    .setPackage(info.packageName), 0) != null;
-            mPackageName = info.packageName;
-            mComponentNames = componentNames;
+            mPackageName = pluginInfo.serviceInfo.applicationInfo.packageName;
+            Intent settingsIntent = new Intent(ACTION_PLUGIN_SETTINGS).setPackage(mPackageName);
+            // If any Settings activity in app has category filters, set plugin action as category.
+            List<ResolveInfo> settingsInfos =
+                    pm.queryIntentActivities(settingsIntent, GET_RESOLVED_FILTER);
+            if (pluginInfo.filter != null) {
+                for (ResolveInfo settingsInfo : settingsInfos) {
+                    if (settingsInfo.filter != null && settingsInfo.filter.countCategories() > 0) {
+                        settingsIntent.addCategory(pluginInfo.filter.getAction(0));
+                        break;
+                    }
+                }
+            }
+
+            mSettingsInfo = pm.resolveActivity(settingsIntent, 0);
             mPluginEnabler = pluginEnabler;
-            setTitle(info.loadLabel(pm));
+            mComponentNames = componentNames;
+            setTitle(pluginInfo.loadLabel(pm));
             setChecked(isPluginEnabled());
             setWidgetLayoutResource(R.layout.switch_preference_with_settings);
         }
@@ -396,17 +409,14 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
         @Override
         public void onBindViewHolder(PreferenceViewHolder holder) {
             super.onBindViewHolder(holder);
-            holder.findViewById(R.id.settings).setVisibility(mHasSettings ? View.VISIBLE
-                    : View.GONE);
-            holder.findViewById(R.id.divider).setVisibility(mHasSettings ? View.VISIBLE
-                    : View.GONE);
+            boolean hasSettings = mSettingsInfo != null;
+            holder.findViewById(R.id.settings).setVisibility(hasSettings ? VISIBLE : GONE);
+            holder.findViewById(R.id.divider).setVisibility(hasSettings ? VISIBLE : GONE);
             holder.findViewById(R.id.settings).setOnClickListener(v -> {
-                ResolveInfo result = v.getContext().getPackageManager().resolveActivity(
-                        new Intent(ACTION_PLUGIN_SETTINGS).setPackage(mPackageName), 0);
-                if (result != null) {
+                if (hasSettings) {
                     v.getContext().startActivity(new Intent().setComponent(
-                            new ComponentName(result.activityInfo.packageName,
-                                    result.activityInfo.name)));
+                            new ComponentName(mSettingsInfo.activityInfo.packageName,
+                                    mSettingsInfo.activityInfo.name)));
                 }
             });
             holder.itemView.setOnLongClickListener(v -> {
-- 
GitLab


From 794fe4f58ea5dfa7f1e8e4e245f00ff9e951168d Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 11 Jan 2021 14:54:23 -0600
Subject: [PATCH 0450/1664] Add Hotseat items to Taskbar

- Currently supports WorkspaceItemInfo (e.g. normal app icons
  including hotseat predictions and pinned deep shortcuts).
- Currently doesn't support Folders, Notification dots, or
  long press.

Some technical details:
- Always allow HotseatPredictionController updates given the
  Hotseat is always showing even when Launcher is stopped.
- Represent Taskbar Hotseat items as BubbleTextViews, to
  allow for normal click handling etc. When the hotseat is
  updated, we reuse the same BubbleTextViews that were
  initially inflated, and just reapply the new info.
- Add new BubbleTextView iconDisplay for Taskbar, to allow
  for different treatment such as icon size.

Bug: 171917176
Change-Id: I325eb39051f2dc69228b39b5c40ed0cbdad8e200
---
 quickstep/res/layout/taskbar.xml              |  4 +-
 quickstep/res/layout/taskbar_app_icon.xml     | 17 ++++
 .../res/layout/taskbar_predicted_app_icon.xml | 17 ++++
 quickstep/res/values/dimens.xml               |  3 +
 quickstep/res/values/styles.xml               |  6 ++
 .../launcher3/BaseQuickstepLauncher.java      |  9 ++
 .../QuickstepAppTransitionManagerImpl.java    |  8 +-
 .../HotseatPredictionController.java          | 13 ++-
 .../launcher3/taskbar/TaskbarController.java  | 57 ++++++++++++
 .../taskbar/TaskbarHotseatController.java     | 90 +++++++++++++++++++
 .../launcher3/taskbar/TaskbarView.java        | 76 ++++++++++++++++
 .../uioverrides/PredictedAppIcon.java         |  5 +-
 res/values/attrs.xml                          |  1 +
 src/com/android/launcher3/BubbleTextView.java |  9 +-
 src/com/android/launcher3/Launcher.java       | 14 +++
 .../LauncherAppTransitionManager.java         |  2 +-
 .../launcher3/touch/ItemClickHandler.java     |  2 +-
 17 files changed, 323 insertions(+), 10 deletions(-)
 create mode 100644 quickstep/res/layout/taskbar_app_icon.xml
 create mode 100644 quickstep/res/layout/taskbar_predicted_app_icon.xml
 create mode 100644 quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java

diff --git a/quickstep/res/layout/taskbar.xml b/quickstep/res/layout/taskbar.xml
index 5f1046df4e..b124b33290 100644
--- a/quickstep/res/layout/taskbar.xml
+++ b/quickstep/res/layout/taskbar.xml
@@ -24,6 +24,8 @@
         android:id="@+id/taskbar_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@color/taskbar_background"/>
+        android:background="@color/taskbar_background"
+        android:gravity="center"
+        android:animateLayoutChanges="true"/>
 
 </com.android.launcher3.taskbar.TaskbarContainerView>
\ No newline at end of file
diff --git a/quickstep/res/layout/taskbar_app_icon.xml b/quickstep/res/layout/taskbar_app_icon.xml
new file mode 100644
index 0000000000..6fefdb69dc
--- /dev/null
+++ b/quickstep/res/layout/taskbar_app_icon.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.launcher3.views.DoubleShadowBubbleTextView style="@style/BaseIcon.Workspace.Taskbar" />
diff --git a/quickstep/res/layout/taskbar_predicted_app_icon.xml b/quickstep/res/layout/taskbar_predicted_app_icon.xml
new file mode 100644
index 0000000000..211ebc80cd
--- /dev/null
+++ b/quickstep/res/layout/taskbar_predicted_app_icon.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.launcher3.uioverrides.PredictedAppIcon style="@style/BaseIcon.Workspace.Taskbar" />
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 4272f50b56..f082b83c4a 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -122,4 +122,7 @@
 
     <!-- Taskbar -->
     <dimen name="taskbar_size">48dp</dimen>
+    <dimen name="taskbar_icon_size">32dp</dimen>
+    <!-- Note that this applies to both sides of all icons, so visible space is double this. -->
+    <dimen name="taskbar_icon_spacing">14dp</dimen>
 </resources>
diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml
index 8d054b4be5..5a353f0a59 100644
--- a/quickstep/res/values/styles.xml
+++ b/quickstep/res/values/styles.xml
@@ -85,4 +85,10 @@
         <item name="android:drawablePadding">8dp</item>
         <item name="android:textAllCaps">false</item>
     </style>
+
+    <!-- Icon displayed on the taskbar -->
+    <style name="BaseIcon.Workspace.Taskbar" >
+        <item name="iconDisplay">taskbar</item>
+        <item name="iconSizeOverride">@dimen/taskbar_icon_size</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 09a3cfd184..cbe0eb0795 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -264,6 +264,11 @@ public abstract class BaseQuickstepLauncher extends Launcher
         return mTaskbarStateHandler;
     }
 
+    @Override
+    public boolean isViewInTaskbar(View v) {
+        return mTaskbarController != null && mTaskbarController.isViewInTaskbar(v);
+    }
+
     @Override
     public void useFadeOutAnimationForLauncherStart(CancellationSignal signal) {
         QuickstepAppTransitionManagerImpl appTransitionManager =
@@ -350,6 +355,10 @@ public abstract class BaseQuickstepLauncher extends Launcher
         // populating workspace.
         // TODO: Find a better place for this
         WellbeingModel.INSTANCE.get(this);
+
+        if (mTaskbarController != null) {
+            mTaskbarController.onHotseatUpdated();
+        }
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
index 36c8bb8b99..876cabc61b 100644
--- a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
@@ -202,9 +202,10 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
     }
 
     @Override
-    public boolean supportsAdaptiveIconAnimation() {
+    public boolean supportsAdaptiveIconAnimation(View clickedView) {
         return hasControlRemoteAppTransitionPermission()
-                && FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM.get();
+                && FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM.get()
+                && !mLauncher.isViewInTaskbar(clickedView);
     }
 
     /**
@@ -972,9 +973,12 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                     launcherIsATargetWithMode(appTargets, MODE_CLOSING);
 
             final boolean launchingFromRecents = isLaunchingFromRecents(mV, appTargets);
+            final boolean launchingFromTaskbar = mLauncher.isViewInTaskbar(mV);
             if (launchingFromRecents) {
                 composeRecentsLaunchAnimator(anim, mV, appTargets, wallpaperTargets,
                         launcherClosing);
+            } else if (launchingFromTaskbar) {
+                // TODO
             } else {
                 composeIconLaunchAnimator(anim, mV, appTargets, wallpaperTargets,
                         launcherClosing);
diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
index b2de4c95ad..aa6601b8c8 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
@@ -37,7 +37,6 @@ import com.android.launcher3.DragSource;
 import com.android.launcher3.DropTarget;
 import com.android.launcher3.Hotseat;
 import com.android.launcher3.InvariantDeviceProfile;
-import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
@@ -75,7 +74,7 @@ public class HotseatPredictionController implements DragController.DragListener,
 
     private int mHotSeatItemsCount;
 
-    private Launcher mLauncher;
+    private QuickstepLauncher mLauncher;
     private final Hotseat mHotseat;
 
     private List<ItemInfo> mPredictedItems = Collections.emptyList();
@@ -108,7 +107,7 @@ public class HotseatPredictionController implements DragController.DragListener,
         return true;
     };
 
-    public HotseatPredictionController(Launcher launcher) {
+    public HotseatPredictionController(QuickstepLauncher launcher) {
         mLauncher = launcher;
         mHotseat = launcher.getHotseat();
         mHotSeatItemsCount = mLauncher.getDeviceProfile().inv.numHotseatIcons;
@@ -229,6 +228,10 @@ public class HotseatPredictionController implements DragController.DragListener,
         } else {
             if (callback != null) callback.run();
         }
+
+        if (mLauncher.getTaskbarController() != null) {
+            mLauncher.getTaskbarController().onHotseatUpdated();
+        }
     }
 
     /**
@@ -242,6 +245,10 @@ public class HotseatPredictionController implements DragController.DragListener,
      * start and pauses predicted apps update on the hotseat
      */
     public void setPauseUIUpdate(boolean paused) {
+        if (mLauncher.getTaskbarController() != null) {
+            // Taskbar is present, always allow updates since hotseat is still visible.
+            return;
+        }
         mUIUpdatePaused = paused;
         if (!paused) {
             fillGapsWithPrediction();
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index bdf7f8ad08..f91bfb78fc 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -26,6 +26,7 @@ import android.animation.Animator;
 import android.graphics.PixelFormat;
 import android.graphics.Point;
 import android.view.Gravity;
+import android.view.View;
 import android.view.WindowManager;
 
 import androidx.annotation.Nullable;
@@ -36,7 +37,9 @@ import com.android.launcher3.QuickstepAppTransitionManagerImpl;
 import com.android.launcher3.R;
 import com.android.launcher3.anim.AlphaUpdateListener;
 import com.android.launcher3.anim.PendingAnimation;
+import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.states.StateAnimationConfig;
+import com.android.launcher3.touch.ItemClickHandler;
 import com.android.quickstep.AnimatedFloat;
 import com.android.systemui.shared.system.WindowManagerWrapper;
 
@@ -55,6 +58,7 @@ public class TaskbarController {
     private final Point mTaskbarSize;
     private final TaskbarStateHandler mTaskbarStateHandler;
     private final TaskbarVisibilityController mTaskbarVisibilityController;
+    private final TaskbarHotseatController mHotseatController;
 
     // Initialized in init().
     private WindowManager.LayoutParams mWindowLayoutParams;
@@ -64,12 +68,15 @@ public class TaskbarController {
         mLauncher = launcher;
         mTaskbarContainerView = taskbarContainerView;
         mTaskbarView = mTaskbarContainerView.findViewById(R.id.taskbar_view);
+        mTaskbarView.setCallbacks(createTaskbarViewCallbacks());
         mWindowManager = mLauncher.getWindowManager();
         mTaskbarSize = new Point(MATCH_PARENT,
                 mLauncher.getResources().getDimensionPixelSize(R.dimen.taskbar_size));
         mTaskbarStateHandler = mLauncher.getTaskbarStateHandler();
         mTaskbarVisibilityController = new TaskbarVisibilityController(mLauncher,
                 createTaskbarVisibilityControllerCallbacks());
+        mHotseatController = new TaskbarHotseatController(mLauncher,
+                createTaskbarHotseatControllerCallbacks());
     }
 
     private TaskbarVisibilityControllerCallbacks createTaskbarVisibilityControllerCallbacks() {
@@ -87,13 +94,33 @@ public class TaskbarController {
         };
     }
 
+    private TaskbarViewCallbacks createTaskbarViewCallbacks() {
+        return new TaskbarViewCallbacks() {
+            @Override
+            public View.OnClickListener getItemOnClickListener() {
+                return ItemClickHandler.INSTANCE;
+            }
+        };
+    }
+
+    private TaskbarHotseatControllerCallbacks createTaskbarHotseatControllerCallbacks() {
+        return new TaskbarHotseatControllerCallbacks() {
+            @Override
+            public void updateHotseatItems(ItemInfo[] hotseatItemInfos) {
+                mTaskbarView.updateHotseatItems(hotseatItemInfos);
+            }
+        };
+    }
+
     /**
      * Initializes the Taskbar, including adding it to the screen.
      */
     public void init() {
+        mTaskbarView.init(mHotseatController.getNumHotseatIcons());
         addToWindowManager();
         mTaskbarStateHandler.setTaskbarCallbacks(createTaskbarStateHandlerCallbacks());
         mTaskbarVisibilityController.init();
+        mHotseatController.init();
     }
 
     private TaskbarStateHandlerCallbacks createTaskbarStateHandlerCallbacks() {
@@ -109,9 +136,11 @@ public class TaskbarController {
      * Removes the Taskbar from the screen, and removes any obsolete listeners etc.
      */
     public void cleanup() {
+        mTaskbarView.cleanup();
         removeFromWindowManager();
         mTaskbarStateHandler.setTaskbarCallbacks(null);
         mTaskbarVisibilityController.cleanup();
+        mHotseatController.cleanup();
     }
 
     private void removeFromWindowManager() {
@@ -190,6 +219,20 @@ public class TaskbarController {
         mTaskbarVisibilityController.animateToVisibilityForIme(isImeVisible ? 0 : 1);
     }
 
+    /**
+     * Should be called when one or more items in the Hotseat have changed.
+     */
+    public void onHotseatUpdated() {
+        mHotseatController.onHotseatUpdated();
+    }
+
+    /**
+     * @return Whether the given View is in the same window as Taskbar.
+     */
+    public boolean isViewInTaskbar(View v) {
+        return mTaskbarContainerView.getWindowId().equals(v.getWindowId());
+    }
+
     /**
      * Contains methods that TaskbarStateHandler can call to interface with TaskbarController.
      */
@@ -205,4 +248,18 @@ public class TaskbarController {
         void updateTaskbarBackgroundAlpha(float alpha);
         void updateTaskbarVisibilityAlpha(float alpha);
     }
+
+    /**
+     * Contains methods that TaskbarView can call to interface with TaskbarController.
+     */
+    protected interface TaskbarViewCallbacks {
+        View.OnClickListener getItemOnClickListener();
+    }
+
+    /**
+     * Contains methods that TaskbarHotseatController can call to interface with TaskbarController.
+     */
+    protected interface TaskbarHotseatControllerCallbacks {
+        void updateHotseatItems(ItemInfo[] hotseatItemInfos);
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java
new file mode 100644
index 0000000000..4dc051aaa9
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.taskbar;
+
+import android.view.View;
+
+import com.android.launcher3.BaseQuickstepLauncher;
+import com.android.launcher3.CellLayout;
+import com.android.launcher3.DropTarget;
+import com.android.launcher3.Hotseat;
+import com.android.launcher3.ShortcutAndWidgetContainer;
+import com.android.launcher3.dragndrop.DragController;
+import com.android.launcher3.dragndrop.DragOptions;
+import com.android.launcher3.model.data.ItemInfo;
+
+/**
+ * Works with TaskbarController to update the TaskbarView's Hotseat items.
+ */
+public class TaskbarHotseatController {
+
+    private final BaseQuickstepLauncher mLauncher;
+    private final Hotseat mHotseat;
+    private final TaskbarController.TaskbarHotseatControllerCallbacks mTaskbarCallbacks;
+    private final int mNumHotseatIcons;
+
+    private final DragController.DragListener mDragListener = new DragController.DragListener() {
+        @Override
+        public void onDragStart(DropTarget.DragObject dragObject, DragOptions options) {
+        }
+
+        @Override
+        public void onDragEnd() {
+            onHotseatUpdated();
+        }
+    };
+
+    public TaskbarHotseatController(BaseQuickstepLauncher launcher,
+            TaskbarController.TaskbarHotseatControllerCallbacks taskbarCallbacks) {
+        mLauncher = launcher;
+        mHotseat = mLauncher.getHotseat();
+        mTaskbarCallbacks = taskbarCallbacks;
+        mNumHotseatIcons = mLauncher.getDeviceProfile().inv.numHotseatIcons;
+    }
+
+    protected void init() {
+        mLauncher.getDragController().addDragListener(mDragListener);
+    }
+
+    protected void cleanup() {
+        mLauncher.getDragController().removeDragListener(mDragListener);
+    }
+
+    /**
+     * Called when any Hotseat item changes, and reports the new list of items to TaskbarController.
+     */
+    protected void onHotseatUpdated() {
+        ShortcutAndWidgetContainer shortcutsAndWidgets = mHotseat.getShortcutsAndWidgets();
+        ItemInfo[] hotseatItemInfos = new ItemInfo[mNumHotseatIcons];
+        for (int i = 0; i < shortcutsAndWidgets.getChildCount(); i++) {
+            View child = shortcutsAndWidgets.getChildAt(i);
+            Object tag = shortcutsAndWidgets.getChildAt(i).getTag();
+            if (tag instanceof ItemInfo) {
+                ItemInfo itemInfo = (ItemInfo) tag;
+                CellLayout.LayoutParams lp = (CellLayout.LayoutParams) child.getLayoutParams();
+                // Since the hotseat might be laid out vertically or horizontally, use whichever
+                // index is higher.
+                hotseatItemInfos[Math.max(lp.cellX, lp.cellY)] = itemInfo;
+            }
+        }
+
+        mTaskbarCallbacks.updateHotseatItems(hotseatItemInfos);
+    }
+
+    protected int getNumHotseatIcons() {
+        return mNumHotseatIcons;
+    }
+}
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
index bf6e946f0d..0d82810935 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
@@ -16,19 +16,35 @@
 package com.android.launcher3.taskbar;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.graphics.drawable.ColorDrawable;
 import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
 import android.widget.LinearLayout;
 
+import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.android.launcher3.BubbleTextView;
+import com.android.launcher3.R;
+import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.WorkspaceItemInfo;
+
 /**
  * Hosts the Taskbar content such as Hotseat and Recent Apps. Drawn on top of other apps.
  */
 public class TaskbarView extends LinearLayout {
 
     private final ColorDrawable mBackgroundDrawable;
+    private final int mItemMarginLeftRight;
+
+    // Initialized in init().
+    private int mHotseatStartIndex;
+    private int mHotseatEndIndex;
+
+    private TaskbarController.TaskbarViewCallbacks mControllerCallbacks;
 
     public TaskbarView(@NonNull Context context) {
         this(context, null);
@@ -46,7 +62,24 @@ public class TaskbarView extends LinearLayout {
     public TaskbarView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr,
             int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
+
+        Resources resources = getResources();
         mBackgroundDrawable = (ColorDrawable) getBackground();
+        mItemMarginLeftRight = resources.getDimensionPixelSize(R.dimen.taskbar_icon_spacing);
+    }
+
+    protected void setCallbacks(TaskbarController.TaskbarViewCallbacks taskbarViewCallbacks) {
+        mControllerCallbacks = taskbarViewCallbacks;
+    }
+
+    protected void init(int numHotseatIcons) {
+        mHotseatStartIndex = 0;
+        mHotseatEndIndex = mHotseatStartIndex + numHotseatIcons - 1;
+        updateHotseatItems(new ItemInfo[numHotseatIcons]);
+    }
+
+    protected void cleanup() {
+        removeAllViews();
     }
 
     /**
@@ -56,4 +89,47 @@ public class TaskbarView extends LinearLayout {
     public void setBackgroundAlpha(float alpha) {
         mBackgroundDrawable.setAlpha((int) (alpha * 255));
     }
+
+    /**
+     * Inflates/binds the Hotseat views to show in the Taskbar given their ItemInfos.
+     */
+    protected void updateHotseatItems(ItemInfo[] hotseatItemInfos) {
+        for (int i = 0; i < hotseatItemInfos.length; i++) {
+            ItemInfo hotseatItemInfo = hotseatItemInfos[i];
+            int hotseatIndex = mHotseatStartIndex + i;
+            View hotseatView = getChildAt(hotseatIndex);
+
+            // Replace any Hotseat views with the appropriate type if it's not already that type.
+            final int expectedLayoutResId;
+            if (hotseatItemInfo != null && hotseatItemInfo.isPredictedItem()) {
+                expectedLayoutResId = R.layout.taskbar_predicted_app_icon;
+            } else {
+                expectedLayoutResId = R.layout.taskbar_app_icon;
+            }
+            if (hotseatView == null || hotseatView.getSourceLayoutResId() != expectedLayoutResId) {
+                removeView(hotseatView);
+                BubbleTextView btv = (BubbleTextView) inflate(expectedLayoutResId);
+                LayoutParams lp = new LayoutParams(btv.getIconSize(), btv.getIconSize());
+                lp.setMargins(mItemMarginLeftRight, 0, mItemMarginLeftRight, 0);
+                hotseatView = btv;
+                addView(hotseatView, hotseatIndex, lp);
+            }
+
+            // Apply the Hotseat ItemInfos, or hide the view if there is none for a given index.
+            if (hotseatView instanceof BubbleTextView
+                    && hotseatItemInfo instanceof WorkspaceItemInfo) {
+                ((BubbleTextView) hotseatView).applyFromWorkspaceItem(
+                        (WorkspaceItemInfo) hotseatItemInfo);
+                hotseatView.setVisibility(VISIBLE);
+                hotseatView.setOnClickListener(mControllerCallbacks.getItemOnClickListener());
+            } else {
+                hotseatView.setVisibility(GONE);
+                hotseatView.setOnClickListener(null);
+            }
+        }
+    }
+
+    private View inflate(@LayoutRes int layoutResId) {
+        return LayoutInflater.from(getContext()).inflate(layoutResId, this, false);
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
index 597c17b4e2..22c4a7eba3 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
@@ -184,7 +184,10 @@ public class PredictedAppIcon extends DoubleShadowBubbleTextView implements
     }
 
     private int getOutlineOffsetY() {
-        return getPaddingTop() + mDeviceProfile.folderIconOffsetYPx;
+        if (mDisplay != DISPLAY_TASKBAR) {
+            return getPaddingTop() + mDeviceProfile.folderIconOffsetYPx;
+        }
+        return (getMeasuredHeight() / 2) - mNormalizedIconRadius;
     }
 
     private void drawEffect(Canvas canvas, boolean isBadged) {
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 96c30b5f03..e593fb497d 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -57,6 +57,7 @@
             <enum name="widget_section" value="3" />
             <enum name="shortcut_popup" value="4" />
             <enum name="hero_app" value="5" />
+            <enum name="taskbar" value="6" />
         </attr>
         <attr name="centerVertically" format="boolean" />
     </declare-styleable>
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index ecda501f1f..140340af62 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -92,6 +92,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
     private static final int DISPLAY_ALL_APPS = 1;
     private static final int DISPLAY_FOLDER = 2;
     private static final int DISPLAY_HERO_APP = 5;
+    protected static final int DISPLAY_TASKBAR = 6;
 
     private static final int[] STATE_PRESSED = new int[]{android.R.attr.state_pressed};
     private static final float HIGHLIGHT_SCALE = 1.16f;
@@ -140,7 +141,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
     private Drawable mIcon;
     private boolean mCenterVertically;
 
-    private final int mDisplay;
+    protected final int mDisplay;
 
     private final CheckLongPressHelper mLongPressHelper;
 
@@ -206,6 +207,8 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
             defaultIconSize = grid.folderChildIconSizePx;
         } else if (mDisplay == DISPLAY_HERO_APP) {
             defaultIconSize = grid.allAppsIconSizePx;
+        } else if (mDisplay == DISPLAY_TASKBAR) {
+            defaultIconSize = grid.iconSizePx;
         } else {
             // widget_selection or shortcut_popup
             defaultIconSize = grid.iconSizePx;
@@ -487,6 +490,10 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
      * @param canvas The canvas to draw to.
      */
     protected void drawDotIfNecessary(Canvas canvas) {
+        if (mDisplay == DISPLAY_TASKBAR) {
+            // TODO: support notification dots in Taskbar
+            return;
+        }
         if (!mForceHideDot && (hasDot() || mDotParams.scale > 0)) {
             getIconBounds(mDotParams.iconBounds);
             Utilities.scaleRectAboutCenter(mDotParams.iconBounds,
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 0274775244..2334267fd9 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1917,6 +1917,13 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
     @Override
     public boolean startActivitySafely(View v, Intent intent, ItemInfo item) {
+        if (isViewInTaskbar(v)) {
+            // Start the activity without the hacky workarounds below, which assume the View was
+            // clicked when Launcher was resumed and will be hidden until Launcher is re-resumed
+            // (this isn't the case for Taskbar).
+            return super.startActivitySafely(v, intent, item);
+        }
+
         if (!hasBeenResumed()) {
             // Workaround an issue where the WM launch animation is clobbered when finishing the
             // recents animation into launcher. Defer launching the activity until Launcher is
@@ -2818,6 +2825,13 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
                 .start();
     }
 
+    /**
+     * @return Whether the View is in the same window as the Taskbar window.
+     */
+    public boolean isViewInTaskbar(View v) {
+        return false;
+    }
+
     private static class NonConfigInstance {
         public Configuration config;
         public Bitmap snapshot;
diff --git a/src/com/android/launcher3/LauncherAppTransitionManager.java b/src/com/android/launcher3/LauncherAppTransitionManager.java
index ac3ad9f8fd..0fa441a279 100644
--- a/src/com/android/launcher3/LauncherAppTransitionManager.java
+++ b/src/com/android/launcher3/LauncherAppTransitionManager.java
@@ -50,7 +50,7 @@ public class LauncherAppTransitionManager implements ResourceBasedOverride {
         return ActivityOptions.makeClipRevealAnimation(v, left, top, width, height);
     }
 
-    public boolean supportsAdaptiveIconAnimation() {
+    public boolean supportsAdaptiveIconAnimation(View clickedView) {
         return false;
     }
 
diff --git a/src/com/android/launcher3/touch/ItemClickHandler.java b/src/com/android/launcher3/touch/ItemClickHandler.java
index 3122c68304..2647d6fec4 100644
--- a/src/com/android/launcher3/touch/ItemClickHandler.java
+++ b/src/com/android/launcher3/touch/ItemClickHandler.java
@@ -302,7 +302,7 @@ public class ItemClickHandler {
                 intent.setPackage(null);
             }
         }
-        if (v != null && launcher.getAppTransitionManager().supportsAdaptiveIconAnimation()) {
+        if (v != null && launcher.getAppTransitionManager().supportsAdaptiveIconAnimation(v)) {
             // Preload the icon to reduce latency b/w swapping the floating view with the original.
             FloatingIconView.fetchIcon(launcher, v, item, true /* isOpening */);
         }
-- 
GitLab


From b11e4d517d5f80f26ceb22e79030aace712ff5e2 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 22 Jan 2021 11:49:11 -0800
Subject: [PATCH 0451/1664] Delegate Taskbar touches to nearest view to ensure
 48x48dp touch size

In TaskbarView#onTouchEvent(), which is only reached if a Taskbar
icon didn't already consuem the event, check each child to see if
the event occurs within a 48x48dp bounding box, and delegate the
event and subsequent events to it until UP or CANCEL.

Bug: 171917176
Change-Id: I7afafe0835828ab9213ec6abfe4e88ad7b9af3c4
---
 quickstep/res/values/dimens.xml               |  1 +
 .../launcher3/taskbar/TaskbarView.java        | 81 +++++++++++++++++++
 2 files changed, 82 insertions(+)

diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index f082b83c4a..39a7d09649 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -123,6 +123,7 @@
     <!-- Taskbar -->
     <dimen name="taskbar_size">48dp</dimen>
     <dimen name="taskbar_icon_size">32dp</dimen>
+    <dimen name="taskbar_icon_touch_size">48dp</dimen>
     <!-- Note that this applies to both sides of all icons, so visible space is double this. -->
     <dimen name="taskbar_icon_spacing">14dp</dimen>
 </resources>
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
index 0d82810935..adcfaec102 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
@@ -17,10 +17,13 @@ package com.android.launcher3.taskbar;
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.graphics.RectF;
 import android.graphics.drawable.ColorDrawable;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewConfiguration;
 import android.widget.LinearLayout;
 
 import androidx.annotation.LayoutRes;
@@ -39,6 +42,10 @@ public class TaskbarView extends LinearLayout {
 
     private final ColorDrawable mBackgroundDrawable;
     private final int mItemMarginLeftRight;
+    private final int mIconTouchSize;
+    private final int mTouchSlop;
+    private final RectF mTempDelegateBounds = new RectF();
+    private final RectF mDelegateSlopBounds = new RectF();
 
     // Initialized in init().
     private int mHotseatStartIndex;
@@ -46,6 +53,10 @@ public class TaskbarView extends LinearLayout {
 
     private TaskbarController.TaskbarViewCallbacks mControllerCallbacks;
 
+    // Delegate touches to the closest view if within mIconTouchSize.
+    private boolean mDelegateTargeted;
+    private View mDelegateView;
+
     public TaskbarView(@NonNull Context context) {
         this(context, null);
     }
@@ -66,6 +77,8 @@ public class TaskbarView extends LinearLayout {
         Resources resources = getResources();
         mBackgroundDrawable = (ColorDrawable) getBackground();
         mItemMarginLeftRight = resources.getDimensionPixelSize(R.dimen.taskbar_icon_spacing);
+        mIconTouchSize = resources.getDimensionPixelSize(R.dimen.taskbar_icon_touch_size);
+        mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
     }
 
     protected void setCallbacks(TaskbarController.TaskbarViewCallbacks taskbarViewCallbacks) {
@@ -129,6 +142,74 @@ public class TaskbarView extends LinearLayout {
         }
     }
 
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        boolean handled = delegateTouchIfNecessary(event);
+        return super.onTouchEvent(event) || handled;
+    }
+
+    /**
+     * User touched the Taskbar background. Determine whether the touch is close enough to a view
+     * that we should forward the touches to it.
+     * @return Whether a delegate view was chosen and it handled the touch event.
+     */
+    private boolean delegateTouchIfNecessary(MotionEvent event) {
+        final float x = event.getX();
+        final float y = event.getY();
+        if (mDelegateView == null && event.getAction() == MotionEvent.ACTION_DOWN) {
+            for (int i = 0; i < getChildCount(); i++) {
+                View child = getChildAt(i);
+                if (!child.isShown() || !child.isClickable()) {
+                    continue;
+                }
+                int childCenterX = child.getLeft() + child.getWidth() / 2;
+                int childCenterY = child.getTop() + child.getHeight() / 2;
+                mTempDelegateBounds.set(
+                        childCenterX - mIconTouchSize / 2f,
+                        childCenterY - mIconTouchSize / 2f,
+                        childCenterX + mIconTouchSize / 2f,
+                        childCenterY + mIconTouchSize / 2f);
+                mDelegateTargeted = mTempDelegateBounds.contains(x, y);
+                if (mDelegateTargeted) {
+                    mDelegateView = child;
+                    mDelegateSlopBounds.set(mTempDelegateBounds);
+                    mDelegateSlopBounds.inset(-mTouchSlop, -mTouchSlop);
+                    break;
+                }
+            }
+        }
+
+        boolean sendToDelegate = mDelegateTargeted;
+        boolean inBounds = true;
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_MOVE:
+                inBounds = mDelegateSlopBounds.contains(x, y);
+                break;
+            case MotionEvent.ACTION_UP:
+            case MotionEvent.ACTION_CANCEL:
+                mDelegateTargeted = false;
+                break;
+        }
+
+        boolean handled = false;
+        if (sendToDelegate) {
+            if (inBounds) {
+                // Offset event coordinates to be inside the target view
+                event.setLocation(mDelegateView.getWidth() / 2f, mDelegateView.getHeight() / 2f);
+            } else {
+                // Offset event coordinates to be outside the target view (in case it does
+                // something like tracking pressed state)
+                event.setLocation(-mTouchSlop * 2, -mTouchSlop * 2);
+            }
+            handled = mDelegateView.dispatchTouchEvent(event);
+            // Cleanup if this was the last event to send to the delegate.
+            if (!mDelegateTargeted) {
+                mDelegateView = null;
+            }
+        }
+        return handled;
+    }
+
     private View inflate(@LayoutRes int layoutResId) {
         return LayoutInflater.from(getContext()).inflate(layoutResId, this, false);
     }
-- 
GitLab


From e747278ee8e81bcb23715d471876fa6a861422c2 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 22 Jan 2021 18:45:04 -0800
Subject: [PATCH 0452/1664] Support drag and drop from Taskbar

- Long clicking a BubbleTextView in Taskbar will start a system drag
  and drop operation, setting the original view invisible meanwhile.
- Defer gesture navigation when starting over a Taskbar item, and
  cancel any started gesture if a Taskbar drag and drop starts.

Bug: 171917176
Change-Id: If5049071fbf1755f545ee937daa4edabd869f00d
---
 quickstep/res/values/dimens.xml               |   1 +
 .../launcher3/taskbar/TaskbarController.java  |  21 +++
 .../taskbar/TaskbarDragController.java        | 133 ++++++++++++++++++
 .../launcher3/taskbar/TaskbarView.java        |  86 ++++++++---
 .../quickstep/BaseActivityInterface.java      |   7 +
 .../quickstep/LauncherActivityInterface.java  |  19 +++
 .../quickstep/TouchInteractionService.java    |   7 +-
 7 files changed, 254 insertions(+), 20 deletions(-)
 create mode 100644 quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java

diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 39a7d09649..39cc0b891c 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -124,6 +124,7 @@
     <dimen name="taskbar_size">48dp</dimen>
     <dimen name="taskbar_icon_size">32dp</dimen>
     <dimen name="taskbar_icon_touch_size">48dp</dimen>
+    <dimen name="taskbar_icon_drag_icon_size">54dp</dimen>
     <!-- Note that this applies to both sides of all icons, so visible space is double this. -->
     <dimen name="taskbar_icon_spacing">14dp</dimen>
 </resources>
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index f91bfb78fc..7608645a63 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -26,6 +26,7 @@ import android.animation.Animator;
 import android.graphics.PixelFormat;
 import android.graphics.Point;
 import android.view.Gravity;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.WindowManager;
 
@@ -59,6 +60,7 @@ public class TaskbarController {
     private final TaskbarStateHandler mTaskbarStateHandler;
     private final TaskbarVisibilityController mTaskbarVisibilityController;
     private final TaskbarHotseatController mHotseatController;
+    private final TaskbarDragController mDragController;
 
     // Initialized in init().
     private WindowManager.LayoutParams mWindowLayoutParams;
@@ -77,6 +79,7 @@ public class TaskbarController {
                 createTaskbarVisibilityControllerCallbacks());
         mHotseatController = new TaskbarHotseatController(mLauncher,
                 createTaskbarHotseatControllerCallbacks());
+        mDragController = new TaskbarDragController(mLauncher);
     }
 
     private TaskbarVisibilityControllerCallbacks createTaskbarVisibilityControllerCallbacks() {
@@ -100,6 +103,11 @@ public class TaskbarController {
             public View.OnClickListener getItemOnClickListener() {
                 return ItemClickHandler.INSTANCE;
             }
+
+            @Override
+            public View.OnLongClickListener getItemOnLongClickListener() {
+                return mDragController::startDragOnLongClick;
+            }
         };
     }
 
@@ -226,6 +234,18 @@ public class TaskbarController {
         mHotseatController.onHotseatUpdated();
     }
 
+    /**
+     * @param ev MotionEvent in screen coordinates.
+     * @return Whether any Taskbar item could handle the given MotionEvent if given the chance.
+     */
+    public boolean isEventOverAnyTaskbarItem(MotionEvent ev) {
+        return mTaskbarView.isEventOverAnyItem(ev);
+    }
+
+    public boolean isDraggingItem() {
+        return mTaskbarView.isDraggingItem();
+    }
+
     /**
      * @return Whether the given View is in the same window as Taskbar.
      */
@@ -254,6 +274,7 @@ public class TaskbarController {
      */
     protected interface TaskbarViewCallbacks {
         View.OnClickListener getItemOnClickListener();
+        View.OnLongClickListener getItemOnLongClickListener();
     }
 
     /**
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
new file mode 100644
index 0000000000..2318ff96b6
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.taskbar;
+
+import static android.view.View.INVISIBLE;
+import static android.view.View.VISIBLE;
+
+import android.content.ClipData;
+import android.content.ClipDescription;
+import android.content.Intent;
+import android.content.pm.LauncherApps;
+import android.content.res.Resources;
+import android.graphics.Canvas;
+import android.graphics.Point;
+import android.view.DragEvent;
+import android.view.View;
+
+import com.android.launcher3.BaseQuickstepLauncher;
+import com.android.launcher3.BubbleTextView;
+import com.android.launcher3.LauncherSettings;
+import com.android.launcher3.R;
+import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.systemui.shared.system.ClipDescriptionCompat;
+import com.android.systemui.shared.system.LauncherAppsCompat;
+
+/**
+ * Handles long click on Taskbar items to start a system drag and drop operation.
+ */
+public class TaskbarDragController {
+
+    private final BaseQuickstepLauncher mLauncher;
+    private final int mDragIconSize;
+
+    public TaskbarDragController(BaseQuickstepLauncher launcher) {
+        mLauncher = launcher;
+        Resources resources = mLauncher.getResources();
+        mDragIconSize = resources.getDimensionPixelSize(R.dimen.taskbar_icon_drag_icon_size);
+    }
+
+    /**
+     * Attempts to start a system drag and drop operation for the given View, using its tag to
+     * generate the ClipDescription and Intent.
+     * @return Whether {@link View#startDragAndDrop} started successfully.
+     */
+    protected boolean startDragOnLongClick(View view) {
+        if (!(view instanceof BubbleTextView)) {
+            return false;
+        }
+
+        BubbleTextView btv = (BubbleTextView) view;
+
+        View.DragShadowBuilder shadowBuilder = new View.DragShadowBuilder(view) {
+            @Override
+            public void onProvideShadowMetrics(Point shadowSize, Point shadowTouchPoint) {
+                shadowSize.set(mDragIconSize, mDragIconSize);
+                // TODO: should be based on last touch point on the icon.
+                shadowTouchPoint.set(shadowSize.x / 2, shadowSize.y / 2);
+            }
+
+            @Override
+            public void onDrawShadow(Canvas canvas) {
+                canvas.save();
+                float scale = (float) mDragIconSize / btv.getIconSize();
+                canvas.scale(scale, scale);
+                btv.getIcon().draw(canvas);
+                canvas.restore();
+            }
+        };
+
+        Object tag = view.getTag();
+        ClipDescription clipDescription = null;
+        Intent intent = null;
+        if (tag instanceof WorkspaceItemInfo) {
+            WorkspaceItemInfo item = (WorkspaceItemInfo) tag;
+            LauncherApps launcherApps = mLauncher.getSystemService(LauncherApps.class);
+            clipDescription = new ClipDescription(item.title,
+                    new String[] {
+                            item.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT
+                                    ? ClipDescriptionCompat.MIMETYPE_APPLICATION_SHORTCUT
+                                    : ClipDescriptionCompat.MIMETYPE_APPLICATION_ACTIVITY
+                    });
+            intent = new Intent();
+            if (item.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT) {
+                intent.putExtra(Intent.EXTRA_PACKAGE_NAME, item.getIntent().getPackage());
+                intent.putExtra(Intent.EXTRA_SHORTCUT_ID, item.getDeepShortcutId());
+            } else {
+                intent.putExtra(ClipDescriptionCompat.EXTRA_PENDING_INTENT,
+                        LauncherAppsCompat.getMainActivityLaunchIntent(launcherApps,
+                                item.getIntent().getComponent(), null, item.user));
+            }
+            intent.putExtra(Intent.EXTRA_USER, item.user);
+        }
+
+        if (clipDescription != null && intent != null) {
+            ClipData clipData = new ClipData(clipDescription, new ClipData.Item(intent));
+            view.setOnDragListener(getDraggedViewDragListener());
+            return view.startDragAndDrop(clipData, shadowBuilder, null /* localState */,
+                    View.DRAG_FLAG_GLOBAL | View.DRAG_FLAG_OPAQUE);
+        }
+        return false;
+    }
+
+    /**
+     * Hide the original Taskbar item while it is being dragged.
+     */
+    private View.OnDragListener getDraggedViewDragListener() {
+        return (view, dragEvent) -> {
+            switch (dragEvent.getAction()) {
+                case DragEvent.ACTION_DRAG_STARTED:
+                    view.setVisibility(INVISIBLE);
+                    return true;
+                case DragEvent.ACTION_DRAG_ENDED:
+                    view.setVisibility(VISIBLE);
+                    view.setOnDragListener(null);
+                    return true;
+            }
+            return false;
+        };
+    }
+}
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
index adcfaec102..c98f09ca0f 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
@@ -20,6 +20,7 @@ import android.content.res.Resources;
 import android.graphics.RectF;
 import android.graphics.drawable.ColorDrawable;
 import android.util.AttributeSet;
+import android.view.DragEvent;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -46,6 +47,7 @@ public class TaskbarView extends LinearLayout {
     private final int mTouchSlop;
     private final RectF mTempDelegateBounds = new RectF();
     private final RectF mDelegateSlopBounds = new RectF();
+    private final int[] mTempOutLocation = new int[2];
 
     // Initialized in init().
     private int mHotseatStartIndex;
@@ -57,6 +59,8 @@ public class TaskbarView extends LinearLayout {
     private boolean mDelegateTargeted;
     private View mDelegateView;
 
+    private boolean mIsDraggingItem;
+
     public TaskbarView(@NonNull Context context) {
         this(context, null);
     }
@@ -135,9 +139,12 @@ public class TaskbarView extends LinearLayout {
                         (WorkspaceItemInfo) hotseatItemInfo);
                 hotseatView.setVisibility(VISIBLE);
                 hotseatView.setOnClickListener(mControllerCallbacks.getItemOnClickListener());
+                hotseatView.setOnLongClickListener(
+                        mControllerCallbacks.getItemOnLongClickListener());
             } else {
                 hotseatView.setVisibility(GONE);
                 hotseatView.setOnClickListener(null);
+                hotseatView.setOnLongClickListener(null);
             }
         }
     }
@@ -157,25 +164,12 @@ public class TaskbarView extends LinearLayout {
         final float x = event.getX();
         final float y = event.getY();
         if (mDelegateView == null && event.getAction() == MotionEvent.ACTION_DOWN) {
-            for (int i = 0; i < getChildCount(); i++) {
-                View child = getChildAt(i);
-                if (!child.isShown() || !child.isClickable()) {
-                    continue;
-                }
-                int childCenterX = child.getLeft() + child.getWidth() / 2;
-                int childCenterY = child.getTop() + child.getHeight() / 2;
-                mTempDelegateBounds.set(
-                        childCenterX - mIconTouchSize / 2f,
-                        childCenterY - mIconTouchSize / 2f,
-                        childCenterX + mIconTouchSize / 2f,
-                        childCenterY + mIconTouchSize / 2f);
-                mDelegateTargeted = mTempDelegateBounds.contains(x, y);
-                if (mDelegateTargeted) {
-                    mDelegateView = child;
-                    mDelegateSlopBounds.set(mTempDelegateBounds);
-                    mDelegateSlopBounds.inset(-mTouchSlop, -mTouchSlop);
-                    break;
-                }
+            View delegateView = findDelegateView(x, y);
+            if (delegateView != null) {
+                mDelegateTargeted = true;
+                mDelegateView = delegateView;
+                mDelegateSlopBounds.set(mTempDelegateBounds);
+                mDelegateSlopBounds.inset(-mTouchSlop, -mTouchSlop);
             }
         }
 
@@ -210,6 +204,60 @@ public class TaskbarView extends LinearLayout {
         return handled;
     }
 
+    /**
+     * Return an item whose touch bounds contain the given coordinates,
+     * or null if no such item exists.
+     *
+     * Also sets {@link #mTempDelegateBounds} to be the touch bounds of the chosen delegate view.
+     */
+    private @Nullable View findDelegateView(float x, float y) {
+        for (int i = 0; i < getChildCount(); i++) {
+            View child = getChildAt(i);
+            if (!child.isShown() || !child.isClickable()) {
+                continue;
+            }
+            int childCenterX = child.getLeft() + child.getWidth() / 2;
+            int childCenterY = child.getTop() + child.getHeight() / 2;
+            mTempDelegateBounds.set(
+                    childCenterX - mIconTouchSize / 2f,
+                    childCenterY - mIconTouchSize / 2f,
+                    childCenterX + mIconTouchSize / 2f,
+                    childCenterY + mIconTouchSize / 2f);
+            if (mTempDelegateBounds.contains(x, y)) {
+                return child;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Returns whether the given MotionEvent, *in screen coorindates*, is within any Taskbar item's
+     * touch bounds.
+     */
+    public boolean isEventOverAnyItem(MotionEvent ev) {
+        getLocationOnScreen(mTempOutLocation);
+        float xInOurCoordinates = ev.getX() - mTempOutLocation[0];
+        float yInOurCoorindates = ev.getY() - mTempOutLocation[1];
+        return findDelegateView(xInOurCoordinates, yInOurCoorindates) != null;
+    }
+
+    @Override
+    public boolean onDragEvent(DragEvent event) {
+        switch (event.getAction()) {
+            case DragEvent.ACTION_DRAG_STARTED:
+                mIsDraggingItem = true;
+                return true;
+            case DragEvent.ACTION_DRAG_ENDED:
+                mIsDraggingItem = false;
+                break;
+        }
+        return super.onDragEvent(event);
+    }
+
+    public boolean isDraggingItem() {
+        return mIsDraggingItem;
+    }
+
     private View inflate(@LayoutRes int layoutResId) {
         return LayoutInflater.from(getContext()).inflate(layoutResId, this, false);
     }
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index 5f6e59fa11..ce14197c2e 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -153,6 +153,13 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
         return deviceState.isInDeferredGestureRegion(ev);
     }
 
+    /**
+     * @return Whether the gesture in progress should be cancelled.
+     */
+    public boolean shouldCancelCurrentGesture() {
+        return false;
+    }
+
     public abstract void onExitOverview(RotationTouchHelper deviceState,
             Runnable exitRunnable);
 
diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
index deb86ec2c3..8b0d782913 100644
--- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
@@ -26,6 +26,7 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Rect;
 import android.util.Log;
+import android.view.MotionEvent;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
@@ -311,4 +312,22 @@ public final class LauncherActivityInterface extends
         boolean isImeVisible = (systemUiStateFlags & SYSUI_STATE_IME_SHOWING) != 0;
         taskbarController.setIsImeVisible(isImeVisible);
     }
+
+    @Override
+    public boolean deferStartingActivity(RecentsAnimationDeviceState deviceState, MotionEvent ev) {
+        TaskbarController taskbarController = getTaskbarController();
+        if (taskbarController == null) {
+            return super.deferStartingActivity(deviceState, ev);
+        }
+        return taskbarController.isEventOverAnyTaskbarItem(ev);
+    }
+
+    @Override
+    public boolean shouldCancelCurrentGesture() {
+        TaskbarController taskbarController = getTaskbarController();
+        if (taskbarController == null) {
+            return super.shouldCancelCurrentGesture();
+        }
+        return taskbarController.isDraggingItem();
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index a98fc1c338..8ebea33e72 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -514,9 +514,14 @@ public class TouchInteractionService extends Service implements PluginListener<O
             }
         }
 
-        boolean cleanUpConsumer = (action == ACTION_UP || action == ACTION_CANCEL)
+        boolean cancelGesture = mGestureState.getActivityInterface() != null
+                && mGestureState.getActivityInterface().shouldCancelCurrentGesture();
+        boolean cleanUpConsumer = (action == ACTION_UP || action == ACTION_CANCEL || cancelGesture)
                 && mConsumer != null
                 && !mConsumer.getActiveConsumerInHierarchy().isConsumerDetachedFromGesture();
+        if (cancelGesture) {
+            event.setAction(ACTION_CANCEL);
+        }
         mUncheckedConsumer.onMotionEvent(event);
 
         if (cleanUpConsumer) {
-- 
GitLab


From 5809a40f3ed091af74c5209a09a628fa2b5beb76 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Tue, 2 Feb 2021 01:19:18 -0800
Subject: [PATCH 0453/1664] Fix issue of slice icon being rendered on
 non-UIthread

Bug: 178989579
Test: Manual

Change-Id: I23aa5055c8f07ee9877c1f3ce51cb280ac38a2b7
---
 .../android/launcher3/search/SearchResultIconSlice.java   | 3 ++-
 src/com/android/launcher3/BubbleTextView.java             | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java b/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java
index 0ea2f8b86e..c441e2291b 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java
@@ -15,6 +15,7 @@
  */
 package com.android.launcher3.search;
 
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
 import android.app.search.SearchTarget;
@@ -104,7 +105,7 @@ public class SearchResultIconSlice extends LinearLayout implements SearchTargetH
                 PackageItemInfo pkgItem = new PackageItemInfo(parentTarget.getPackageName());
                 pkgItem.user = parentTarget.getUserHandle();
                 appState.getIconCache().getTitleAndIconForApp(pkgItem, false);
-                mIcon.applyFromItemInfoWithIcon(pkgItem);
+                MAIN_EXECUTOR.post(() -> mIcon.applyFromItemInfoWithIcon(pkgItem));
             });
         }
     }
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 140340af62..5007ffc7be 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -51,6 +51,7 @@ import android.view.ViewDebug;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
 import androidx.core.graphics.ColorUtils;
 
 import com.android.launcher3.Launcher.OnResumeCallback;
@@ -271,6 +272,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         mDotScaleAnim.start();
     }
 
+    @UiThread
     public void applyFromWorkspaceItem(WorkspaceItemInfo info) {
         applyFromWorkspaceItem(info, false);
     }
@@ -287,6 +289,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         }
     }
 
+    @UiThread
     public void applyFromWorkspaceItem(WorkspaceItemInfo info, boolean promiseStateChanged) {
         applyIconAndLabel(info);
         setTag(info);
@@ -295,6 +298,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         setDownloadStateContentDescription(info, info.getProgressLevel());
     }
 
+    @UiThread
     public void applyFromApplicationInfo(AppInfo info) {
         applyIconAndLabel(info);
 
@@ -314,6 +318,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
     /**
      * Apply label and tag using a generic {@link ItemInfoWithIcon}
      */
+    @UiThread
     public void applyFromItemInfoWithIcon(ItemInfoWithIcon info) {
         applyIconAndLabel(info);
         // We don't need to check the info since it's not a WorkspaceItemInfo
@@ -328,11 +333,13 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
     /**
      * Apply label and tag using a {@link SearchActionItemInfo}
      */
+    @UiThread
     public void applyFromSearchActionItemInfo(SearchActionItemInfo searchActionItemInfo) {
         applyIconAndLabel(searchActionItemInfo);
         setTag(searchActionItemInfo);
     }
 
+    @UiThread
     protected void applyIconAndLabel(ItemInfoWithIcon info) {
         FastBitmapDrawable iconDrawable = newIcon(getContext(), info);
         mDotParams.color = IconPalette.getMutedColor(info.bitmap.color, 0.54f);
@@ -341,6 +348,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         applyLabel(info);
     }
 
+    @UiThread
     private void applyLabel(ItemInfoWithIcon info) {
         setText(info.title);
         if (info.contentDescription != null) {
-- 
GitLab


From 035bb22298b0e8705cf1a67017a923a2c98bafc6 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Mon, 1 Feb 2021 20:34:27 -0800
Subject: [PATCH 0454/1664] [Live Tile] Fix a bunch of issues related to touch
 input

Here are the issues
- Touch down again during transition of quick switch brings back the previous app
- During transition to overview, touch down on task / in the background area results in weird behaviors

These issues related to touch input are caused by the z-ordering of app and launcher. Because in the current implementation we place launcher on top upon initial swipe up, during the transition (to overview / quick switch), any touch event goes directly to launcher instead of the overview input consumer (where it normally goes to in the non-live tile case), resulting in these weird behaviors mentioned above.

The reason we put app below launcher upon swipe up is to render task view icon earlier (before swipe up settles into overview), which, is not as critical (we don't have the feature now), and we can find other ways to make that happen.

So here are the proposed changes
- Place app on top upon swipe up. Only place launcher on top after transition to overview.
- Remove the temporary fix to disable click for live tile task during transition.
- Remove icon logic in live tile overlay (in this change I only removed the call, but let me know if it's preferred that they are completely removed from LiveTileOverlay in this change)

Test: manual
Fixes: 178640174
Fixes: 175039524
Change-Id: Ib97804c8bbc487bc55160719375c0f2ff3ba7fd3
---
 .../src/com/android/quickstep/AbsSwipeUpHandler.java   | 10 ----------
 .../com/android/quickstep/views/LiveTileOverlay.java   |  5 +++++
 .../src/com/android/quickstep/views/TaskView.java      |  4 ----
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 6bcc4bfdce..36b51cdf1c 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -731,7 +731,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         setIsLikelyToStartNewTask(isLikelyToStartNewTask, false /* animate */);
         mStateCallback.setStateOnUiThread(STATE_GESTURE_STARTED);
         mGestureStarted = true;
-        mTaskViewSimulator.setDrawsBelowRecents(true);
     }
 
     /**
@@ -958,7 +957,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         if (endTarget == HOME) {
             duration = Math.max(MIN_OVERSHOOT_DURATION, duration);
         } else if (endTarget == RECENTS) {
-            LiveTileOverlay.INSTANCE.startIconAnimation();
             if (mRecentsView != null) {
                 int nearestPage = mRecentsView.getPageNearestToCenterOfScreen();
                 if (mRecentsView.getNextPage() != nearestPage) {
@@ -971,9 +969,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                 }
                 duration = Math.max(duration, mRecentsView.getScroller().getDuration());
             }
-            if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
-                mRecentsView.getRunningTaskView().setIsClickableAsLiveTile(false);
-            }
         }
 
         // Let RecentsView handle the scrolling to the task, which we launch in startNewTask()
@@ -1067,7 +1062,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         }
 
         if (mGestureState.getEndTarget() == HOME) {
-            mTaskViewSimulator.setDrawsBelowRecents(false);
             getOrientationHandler().adjustFloatingIconStartVelocity(velocityPxPerMs);
             final RemoteAnimationTargetCompat runningTaskTarget = mRecentsAnimationTargets != null
                     ? mRecentsAnimationTargets.findTask(mGestureState.getRunningTaskId())
@@ -1453,10 +1447,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
     private void finishCurrentTransitionToRecents() {
         if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
             mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);
-            final TaskView runningTaskView = mRecentsView.getRunningTaskView();
-            if (runningTaskView != null) {
-                runningTaskView.setIsClickableAsLiveTile(true);
-            }
         } else if (!hasTargets() || mRecentsAnimationController == null) {
             // If there are no targets or the animation not started, then there is nothing to finish
             mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);
diff --git a/quickstep/src/com/android/quickstep/views/LiveTileOverlay.java b/quickstep/src/com/android/quickstep/views/LiveTileOverlay.java
index 747c3f28a1..8210ab0ca8 100644
--- a/quickstep/src/com/android/quickstep/views/LiveTileOverlay.java
+++ b/quickstep/src/com/android/quickstep/views/LiveTileOverlay.java
@@ -85,6 +85,11 @@ public class LiveTileOverlay extends Drawable {
         mIcon = icon;
     }
 
+    // TODO: consider cleaning this up and drawing icon in another way. Previously we place app
+    // below launcher during the initial swipe up and render the icon in this live tile overlay.
+    // However, this resulted in a bunch of touch input issues caused by Launcher getting the input
+    // events during transition (to overview / to another app (quick switch). So now our new
+    // solution places app on top in live tile until it fully settles in Overview.
     public void startIconAnimation() {
         if (mIconAnimator != null) {
             mIconAnimator.cancel();
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index e8f590f28d..59cf3b2b8b 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -356,10 +356,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         return false;
     }
 
-    public void setIsClickableAsLiveTile(boolean isClickableAsLiveTile) {
-        mIsClickableAsLiveTile = isClickableAsLiveTile;
-    }
-
     private void computeAndSetIconTouchDelegate() {
         float iconHalfSize = mIconView.getWidth() / 2f;
         mIconCenterCoords[0] = mIconCenterCoords[1] = iconHalfSize;
-- 
GitLab


From 2e292b634366e3a0ec453b5f0e271eac76cb3c8a Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Wed, 6 Jan 2021 11:02:39 -0500
Subject: [PATCH 0455/1664] Update PreloadIconDrawable colors when an app is
 not startable.

Updated the progress bar and progress track colors when the app is not startable to increase contrast.

Demo: https://drive.google.com/file/d/1iHYBeHgWsItY6edO3NT1RYuXjdKNlEKH/view?usp=sharing

Test: manual

Bug: 171005849

Change-Id: I97bc4e3299108b1e8ef47b498fb3431293f57ad2
---
 .../graphics/PreloadIconDrawable.java         | 88 +++++++++++++++----
 src/com/android/launcher3/util/Themes.java    |  5 ++
 2 files changed, 78 insertions(+), 15 deletions(-)

diff --git a/src/com/android/launcher3/graphics/PreloadIconDrawable.java b/src/com/android/launcher3/graphics/PreloadIconDrawable.java
index 304d49692e..ce824df3e6 100644
--- a/src/com/android/launcher3/graphics/PreloadIconDrawable.java
+++ b/src/com/android/launcher3/graphics/PreloadIconDrawable.java
@@ -24,6 +24,7 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.content.Context;
+import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Matrix;
@@ -34,10 +35,12 @@ import android.graphics.Rect;
 import android.util.Pair;
 import android.util.Property;
 import android.util.SparseArray;
+import android.view.ContextThemeWrapper;
 
 import com.android.launcher3.FastBitmapDrawable;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
+import com.android.launcher3.util.Themes;
 
 import java.lang.ref.WeakReference;
 
@@ -77,6 +80,9 @@ public class PreloadIconDrawable extends FastBitmapDrawable {
     private static final SparseArray<WeakReference<Pair<Path, Bitmap>>> sShadowCache =
             new SparseArray<>();
 
+    private static final int PRELOAD_ACCENT_COLOR_INDEX = 0;
+    private static final int PRELOAD_BACKGROUND_COLOR_INDEX = 1;
+
     private final Matrix mTmpMatrix = new Matrix();
     private final PathMeasure mPathMeasure = new PathMeasure();
 
@@ -91,6 +97,9 @@ public class PreloadIconDrawable extends FastBitmapDrawable {
 
     private Bitmap mShadowBitmap;
     private final int mIndicatorColor;
+    private final int mSystemAccentColor;
+    private final int mSystemBackgroundColor;
+    private final boolean mIsDarkMode;
 
     private int mTrackAlpha;
     private float mTrackLength;
@@ -104,11 +113,23 @@ public class PreloadIconDrawable extends FastBitmapDrawable {
 
     private ObjectAnimator mCurrentAnim;
 
+    private boolean mIsStartable;
+
     public PreloadIconDrawable(ItemInfoWithIcon info, Context context) {
-        this(info, IconPalette.getPreloadProgressColor(context, info.bitmap.color));
+        this(
+                info,
+                IconPalette.getPreloadProgressColor(context, info.bitmap.color),
+                getPreloadColors(context),
+            (context.getResources().getConfiguration().uiMode
+                    & Configuration.UI_MODE_NIGHT_MASK
+                    & Configuration.UI_MODE_NIGHT_YES) != 0) /* isDarkMode */;
     }
 
-    public PreloadIconDrawable(ItemInfoWithIcon info, int indicatorColor) {
+    public PreloadIconDrawable(
+            ItemInfoWithIcon info,
+            int indicatorColor,
+            int[] preloadColors,
+            boolean isDarkMode) {
         super(info.bitmap);
         mItem = info;
         mShapePath = getShapePath();
@@ -120,9 +141,12 @@ public class PreloadIconDrawable extends FastBitmapDrawable {
         mProgressPaint.setStrokeCap(Paint.Cap.ROUND);
         mIndicatorColor = indicatorColor;
 
-        setInternalProgress(0);
+        mSystemAccentColor = preloadColors[PRELOAD_ACCENT_COLOR_INDEX];
+        mSystemBackgroundColor = preloadColors[PRELOAD_BACKGROUND_COLOR_INDEX];
+        mIsDarkMode = isDarkMode;
 
-        setIsDisabled(!info.isAppStartable());
+        setInternalProgress(info.getProgressLevel());
+        setIsStartable(info.isAppStartable());
     }
 
     @Override
@@ -148,7 +172,7 @@ public class PreloadIconDrawable extends FastBitmapDrawable {
     }
 
     private Bitmap getShadowBitmap(int width, int height, float shadowRadius) {
-        int key = (width << 16) | height;
+        int key = ((width << 16) | height) * (mIsDarkMode ? -1 : 1);
         WeakReference<Pair<Path, Bitmap>> shadowRef = sShadowCache.get(key);
         Pair<Path, Bitmap> cache = shadowRef != null ? shadowRef.get() : null;
         Bitmap shadow = cache != null && cache.first.equals(mShapePath) ? cache.second : null;
@@ -157,8 +181,9 @@ public class PreloadIconDrawable extends FastBitmapDrawable {
         }
         shadow = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
         Canvas c = new Canvas(shadow);
-        mProgressPaint.setShadowLayer(shadowRadius, 0, 0, COLOR_SHADOW);
-        mProgressPaint.setColor(COLOR_TRACK);
+        mProgressPaint.setShadowLayer(shadowRadius, 0, 0, mIsStartable
+                ? COLOR_SHADOW : mSystemAccentColor);
+        mProgressPaint.setColor(mIsStartable ? COLOR_TRACK : mSystemBackgroundColor);
         mProgressPaint.setAlpha(MAX_PAINT_ALPHA);
         c.drawPath(mScaledTrackPath, mProgressPaint);
         mProgressPaint.clearShadowLayer();
@@ -176,7 +201,7 @@ public class PreloadIconDrawable extends FastBitmapDrawable {
         }
 
         // Draw track.
-        mProgressPaint.setColor(mIndicatorColor);
+        mProgressPaint.setColor(mIsStartable ? mIndicatorColor : mSystemAccentColor);
         mProgressPaint.setAlpha(mTrackAlpha);
         if (mShadowBitmap != null) {
             canvas.drawBitmap(mShadowBitmap, bounds.left, bounds.top, mProgressPaint);
@@ -215,6 +240,14 @@ public class PreloadIconDrawable extends FastBitmapDrawable {
         return !mRanFinishAnimation;
     }
 
+    /** Sets whether this icon should display the startable app UI. */
+    public void setIsStartable(boolean isStartable) {
+        if (mIsStartable != isStartable) {
+            mIsStartable = isStartable;
+            setIsDisabled(!isStartable);
+        }
+    }
+
     private void updateInternalState(float finalProgress, boolean shouldAnimate, boolean isFinish) {
         if (mCurrentAnim != null) {
             mCurrentAnim.cancel();
@@ -295,6 +328,18 @@ public class PreloadIconDrawable extends FastBitmapDrawable {
         invalidateSelf();
     }
 
+    private static int[] getPreloadColors(Context context) {
+        Context dayNightThemeContext = new ContextThemeWrapper(
+                context, android.R.style.Theme_DeviceDefault_DayNight);
+        int[] preloadColors = new int[2];
+
+        preloadColors[PRELOAD_ACCENT_COLOR_INDEX] = Themes.getColorAccent(dayNightThemeContext);
+        preloadColors[PRELOAD_BACKGROUND_COLOR_INDEX] = Themes.getColorBackgroundFloating(
+                dayNightThemeContext);
+
+        return preloadColors;
+    }
+
     /**
      * Returns a FastBitmapDrawable with the icon.
      */
@@ -305,13 +350,21 @@ public class PreloadIconDrawable extends FastBitmapDrawable {
     @Override
     public ConstantState getConstantState() {
         return new PreloadIconConstantState(
-                mBitmap, mIconColor, !mItem.isAppStartable(), mItem, mIndicatorColor);
+                mBitmap,
+                mIconColor,
+                !mItem.isAppStartable(),
+                mItem,
+                mIndicatorColor,
+                new int[] {mSystemAccentColor, mSystemBackgroundColor},
+                mIsDarkMode);
     }
 
     protected static class PreloadIconConstantState extends FastBitmapConstantState {
 
         protected final ItemInfoWithIcon mInfo;
         protected final int mIndicatorColor;
+        protected final int[] mPreloadColors;
+        protected final boolean mIsDarkMode;
         protected final int mLevel;
 
         public PreloadIconConstantState(
@@ -319,19 +372,24 @@ public class PreloadIconDrawable extends FastBitmapDrawable {
                 int iconColor,
                 boolean isDisabled,
                 ItemInfoWithIcon info,
-                int indicatorcolor) {
+                int indicatorColor,
+                int[] preloadColors,
+                boolean isDarkMode) {
             super(bitmap, iconColor, isDisabled);
             mInfo = info;
-            mIndicatorColor = indicatorcolor;
+            mIndicatorColor = indicatorColor;
+            mPreloadColors = preloadColors;
+            mIsDarkMode = isDarkMode;
             mLevel = info.getProgressLevel();
         }
 
         @Override
         public PreloadIconDrawable newDrawable() {
-            PreloadIconDrawable drawable = new PreloadIconDrawable(mInfo, mIndicatorColor);
-            drawable.setLevel(mLevel);
-            drawable.setIsDisabled(mIsDisabled);
-            return drawable;
+            return new PreloadIconDrawable(
+                    mInfo,
+                    mIndicatorColor,
+                    mPreloadColors,
+                    mIsDarkMode);
         }
 
         @Override
diff --git a/src/com/android/launcher3/util/Themes.java b/src/com/android/launcher3/util/Themes.java
index b74686fbd3..55d17fc9c0 100644
--- a/src/com/android/launcher3/util/Themes.java
+++ b/src/com/android/launcher3/util/Themes.java
@@ -81,6 +81,11 @@ public class Themes {
         return getAttrColor(context, android.R.attr.colorAccent);
     }
 
+    /** Returns the floating background color attribute. */
+    public static int getColorBackgroundFloating(Context context) {
+        return getAttrColor(context, android.R.attr.colorBackgroundFloating);
+    }
+
     public static int getAttrColor(Context context, int attr) {
         TypedArray ta = context.obtainStyledAttributes(new int[]{attr});
         int colorAccent = ta.getColor(0, 0);
-- 
GitLab


From 50165042edc5954bc71c3e66b60cb87748784f8f Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Fri, 29 Jan 2021 23:35:22 -0800
Subject: [PATCH 0456/1664] Logs stack trace when IME doesn't get attached when
 all apps swipes up

Bug: 178904132
Test: Manual

Change-Id: I3b62a1a8e927ca8bac4db07053f781260fbff515
---
 .../allapps/AllAppsInsetTransitionController.java          | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java b/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
index 1cf98e1c9b..f6e54aaec4 100644
--- a/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
@@ -164,8 +164,11 @@ public class AllAppsInsetTransitionController {
                     @Override
                     public void onCancelled(@Nullable WindowInsetsAnimationController controller) {
                         if (DEBUG) {
-                            Log.d(TAG, "Listener.onCancelled ctrl=" + controller
-                                    + " mAnimationController=" + mAnimationController);
+                            // Keep the verbose logging to chase down IME not showing up issue.
+                            // b/178904132
+                            Log.e(TAG, "Listener.onCancelled ctrl=" + controller
+                                    + " mAnimationController=" + mAnimationController,
+                                    new Exception());
                         }
                         if (mState == State.DRAG_START_BOTTOM) {
                             mState = State.DRAG_START_BOTTOM_IME_CANCELLED;
-- 
GitLab


From 7239df725803e965d6e5ee6c6136e4904e939d83 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Mon, 1 Feb 2021 21:18:15 -0800
Subject: [PATCH 0457/1664] Support shorter height row layout / Disable
 ICON_SLICE

Bug: 178815297
Bug: 178128837
Bug: 178823469

Test: manual, attached screenshot on the bugreport

Change-Id: Ie69c8928f5acc430320cfc5c85547195866e829e
---
 .../res/layout/search_result_icon_row.xml     |   8 +-
 .../layout/search_result_small_icon_row.xml   |  73 ++++++++
 .../search/DeviceSearchAdapterProvider.java   |  19 +-
 .../launcher3/search/SearchAdapterItem.java   |  24 +--
 .../launcher3/search/SearchResultIconRow.java |  14 +-
 .../search/SearchResultSmallIconRow.java      | 142 ++++++++++++++
 .../launcher3/search/SearchTargetUtil.java    |  36 ++--
 .../launcher3/config/FeatureFlags.java        |   6 +-
 .../systemui/plugins/AllAppsSearchPlugin.java | 105 -----------
 .../shared/SearchTargetEventLegacy.java       |  95 ----------
 .../plugins/shared/SearchTargetLegacy.java    | 175 ------------------
 11 files changed, 279 insertions(+), 418 deletions(-)
 create mode 100644 quickstep/res/layout/search_result_small_icon_row.xml
 create mode 100644 quickstep/src/com/android/launcher3/search/SearchResultSmallIconRow.java
 delete mode 100644 src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
 delete mode 100644 src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java
 delete mode 100644 src_plugins/com/android/systemui/plugins/shared/SearchTargetLegacy.java

diff --git a/quickstep/res/layout/search_result_icon_row.xml b/quickstep/res/layout/search_result_icon_row.xml
index 81190cfc56..084920a8e6 100644
--- a/quickstep/res/layout/search_result_icon_row.xml
+++ b/quickstep/res/layout/search_result_icon_row.xml
@@ -20,10 +20,10 @@
     android:padding="@dimen/dynamic_grid_edge_margin">
 
     <com.android.launcher3.search.SearchResultIcon
-        android:layout_width="wrap_content"
         android:id="@+id/icon"
-        launcher:iconDisplay="hero_app"
-        android:layout_height="wrap_content" />
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        launcher:iconDisplay="hero_app" />
 
     <LinearLayout
         android:layout_width="0dp"
@@ -34,8 +34,8 @@
         android:layout_gravity="center_vertical">
 
         <TextView
-            android:layout_width="wrap_content"
             android:id="@id/title"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="start|center_vertical"
             android:maxLines="1"
diff --git a/quickstep/res/layout/search_result_small_icon_row.xml b/quickstep/res/layout/search_result_small_icon_row.xml
new file mode 100644
index 0000000000..41856feeb5
--- /dev/null
+++ b/quickstep/res/layout/search_result_small_icon_row.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.launcher3.search.SearchResultSmallIconRow
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="@dimen/dynamic_grid_edge_margin">
+
+    <com.android.launcher3.search.SearchResultIcon
+        android:id="@+id/icon"
+        style="@style/BaseIcon"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:drawablePadding="@dimen/dynamic_grid_icon_drawable_padding"
+        android:drawableTint="?android:attr/textColorPrimary"
+        android:padding="@dimen/dynamic_grid_edge_margin"
+        launcher:iconDisplay="hero_app"
+        launcher:iconSizeOverride="48dp"
+        launcher:matchTextInsetWithQuery="true"
+        launcher:layoutHorizontal="true" />
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:orientation="horizontal"
+        android:padding="@dimen/dynamic_grid_edge_margin" >
+
+        <TextView
+            android:id="@id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="start|center_vertical"
+            android:maxLines="1"
+            android:paddingEnd="4dp"
+            android:textAlignment="viewStart"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="@dimen/search_hero_title_size" />
+        <TextView
+            android:id="@+id/delimeter"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="start|center_vertical"
+            android:maxLines="1"
+            android:text="\u2022"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="@dimen/search_hero_subtitle_size" />
+        <TextView
+            android:id="@+id/subtitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:paddingStart="4dp"
+            android:textColor="?android:attr/textColorTertiary"
+            android:textSize="@dimen/search_hero_subtitle_size" />
+    </LinearLayout>
+</com.android.launcher3.search.SearchResultSmallIconRow>
\ No newline at end of file
diff --git a/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java b/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
index acf6c150cf..4a656c1acb 100644
--- a/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
+++ b/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
@@ -16,6 +16,7 @@
 
 package com.android.launcher3.search;
 
+import static com.android.launcher3.allapps.AllAppsGridAdapter.VIEW_TYPE_ALL_APPS_DIVIDER;
 import static com.android.launcher3.allapps.AllAppsGridAdapter.VIEW_TYPE_ICON;
 
 import android.app.search.SearchTarget;
@@ -31,6 +32,7 @@ import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.allapps.AllAppsGridAdapter;
 import com.android.launcher3.allapps.search.SearchAdapterProvider;
+import com.android.launcher3.config.FeatureFlags;
 
 /**
  * Provides views for on-device search results
@@ -41,11 +43,12 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
     public static final int VIEW_TYPE_SEARCH_SLICE = 1 << 7;
     public static final int VIEW_TYPE_SEARCH_ICON = (1 << 8) | VIEW_TYPE_ICON;
     public static final int VIEW_TYPE_SEARCH_ICON_ROW = (1 << 9);
+    public static final int VIEW_TYPE_SEARCH_SMALL_ICON_ROW = (1 << 10);
     public static final int VIEW_TYPE_SEARCH_THUMBNAIL = 1 << 12;
     public static final int VIEW_TYPE_SEARCH_WIDGET_LIVE = 1 << 15;
     public static final int VIEW_TYPE_SEARCH_WIDGET_PREVIEW = 1 << 16;
 
-    private static final String TAG = "SearchServiceAdapterProvider";
+    private static final String TAG = "SearchServiceAdapter";
 
     private final AllAppsContainerView mAppsView;
     private final SparseIntArray mViewTypeToLayoutMap = new SparseIntArray();
@@ -57,11 +60,13 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_CORPUS_TITLE, R.layout.search_section_title);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_ICON, R.layout.search_result_icon);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_ICON_ROW, R.layout.search_result_icon_row);
+        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_SMALL_ICON_ROW, R.layout.search_result_small_icon_row);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_SLICE, R.layout.search_result_slice);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_THUMBNAIL, R.layout.search_result_thumbnail);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_WIDGET_LIVE, R.layout.search_result_widget_live);
         mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_WIDGET_PREVIEW,
                 R.layout.search_result_widget_preview);
+        mViewTypeToLayoutMap.put(VIEW_TYPE_ALL_APPS_DIVIDER, R.layout.all_apps_divider);
     }
 
     @Override
@@ -116,25 +121,33 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
             case LayoutType.ICON_SINGLE_VERTICAL_TEXT:
                 return VIEW_TYPE_SEARCH_ICON;
             case LayoutType.ICON_SLICE:
+                if (FeatureFlags.DISABLE_SLICE_IN_ALLAPPS.get()) {
+                    return -1;
+                }
                 if (t.getSliceUri() != null) {
                     return VIEW_TYPE_SEARCH_SLICE;
                 }
-                Log.w(TAG, "Dropping as LayoutType.ICON_SLICE target doesn't contain sliceUri.");
+                Log.w(TAG, "LayoutType.ICON_SLICE target doesn't contain sliceUri.");
                 break;
             case LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT:
             case LayoutType.ICON_SINGLE_HORIZONTAL_TEXT:
             case LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT_BUTTON:
+            case LayoutType.ICON_HORIZONTAL_TEXT:
                 return VIEW_TYPE_SEARCH_ICON_ROW;
+            case LayoutType.SMALL_ICON_HORIZONTAL_TEXT:
+                return VIEW_TYPE_SEARCH_SMALL_ICON_ROW;
             case LayoutType.THUMBNAIL:
                 if (t.getSearchAction() != null) {
                     return VIEW_TYPE_SEARCH_THUMBNAIL;
                 }
-                Log.w(TAG, "Dropping as LayoutType.THUMBNAIL target doesn't contain searchAction.");
+                Log.w(TAG, "LayoutType.THUMBNAIL target doesn't contain searchAction.");
                 break;
             case LayoutType.WIDGET_PREVIEW:
                 return VIEW_TYPE_SEARCH_WIDGET_PREVIEW;
             case LayoutType.WIDGET_LIVE:
                 return VIEW_TYPE_SEARCH_WIDGET_LIVE;
+            case LayoutType.DIVIDER:
+                return VIEW_TYPE_ALL_APPS_DIVIDER;
         }
 
         return -1;
diff --git a/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java b/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
index b402f61979..8983c4f3b8 100644
--- a/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
+++ b/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
@@ -18,6 +18,7 @@ package com.android.launcher3.search;
 
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_ICON;
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_ICON_ROW;
+import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_SMALL_ICON_ROW;
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_SLICE;
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_THUMBNAIL;
 import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_WIDGET_LIVE;
@@ -26,7 +27,6 @@ import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE
 import android.app.search.SearchTarget;
 
 import com.android.launcher3.allapps.AllAppsGridAdapter;
-import com.android.systemui.plugins.shared.SearchTargetLegacy;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -35,31 +35,23 @@ import java.util.List;
  * Extension of AdapterItem that contains an extra payload specific to item
  */
 public class SearchAdapterItem extends AllAppsGridAdapter.AdapterItem {
-    private SearchTargetLegacy mSearchTargetLegacy;
     private SearchTarget mSearchTarget;
     private List<SearchTarget> mInlineItems = new ArrayList<>();
 
 
-    private static final int AVAILABLE_FOR_ACCESSIBILITY =
-            VIEW_TYPE_SEARCH_SLICE | VIEW_TYPE_SEARCH_THUMBNAIL | VIEW_TYPE_SEARCH_ICON_ROW
-                    | VIEW_TYPE_SEARCH_ICON | VIEW_TYPE_SEARCH_WIDGET_PREVIEW
-                    | VIEW_TYPE_SEARCH_WIDGET_LIVE;
-
-
-    public SearchAdapterItem(SearchTargetLegacy searchTargetLegacy, int type) {
-        mSearchTargetLegacy = searchTargetLegacy;
-        viewType = type;
-    }
+    private static final int AVAILABLE_FOR_ACCESSIBILITY = VIEW_TYPE_SEARCH_SLICE
+            | VIEW_TYPE_SEARCH_THUMBNAIL
+            | VIEW_TYPE_SEARCH_ICON_ROW
+            | VIEW_TYPE_SEARCH_ICON
+            | VIEW_TYPE_SEARCH_SMALL_ICON_ROW
+            | VIEW_TYPE_SEARCH_WIDGET_PREVIEW
+            | VIEW_TYPE_SEARCH_WIDGET_LIVE;
 
     public SearchAdapterItem(SearchTarget searchTarget, int type) {
         mSearchTarget = searchTarget;
         viewType = type;
     }
 
-    public SearchTargetLegacy getSearchTargetLegacy() {
-        return mSearchTargetLegacy;
-    }
-
     public SearchTarget getSearchTarget() {
         return mSearchTarget;
     }
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java b/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
index 7c3ed69a00..12a1a1cd34 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
@@ -46,12 +46,12 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan
     public static final int MAX_INLINE_ITEMS = 3;
 
     protected final Launcher mLauncher;
-    private final LauncherAppState mLauncherAppState;
-    protected SearchResultIcon mResultIcon;
+    protected final SearchResultIcon[] mInlineIcons = new SearchResultIcon[MAX_INLINE_ITEMS];
+    private SearchResultIcon mResultIcon;
 
+    private final LauncherAppState mLauncherAppState;
     private TextView mTitleView;
     private TextView mSubTitleView;
-    protected final SearchResultIcon[] mInlineIcons = new SearchResultIcon[MAX_INLINE_ITEMS];
 
     private PackageItemInfo mProviderInfo;
 
@@ -77,13 +77,14 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
-
         int iconSize = getIconSize();
 
         mResultIcon = findViewById(R.id.icon);
+
         mTitleView = findViewById(R.id.title);
         mSubTitleView = findViewById(R.id.subtitle);
         mSubTitleView.setVisibility(GONE);
+
         mResultIcon.getLayoutParams().height = iconSize;
         mResultIcon.getLayoutParams().width = iconSize;
         mResultIcon.setTextVisibility(false);
@@ -94,15 +95,16 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan
         for (SearchResultIcon inlineIcon : mInlineIcons) {
             inlineIcon.getLayoutParams().width = getIconSize();
         }
-
         setOnClickListener(mResultIcon);
         setOnLongClickListener(mResultIcon);
     }
 
     @Override
     public void apply(SearchTarget parentTarget, List<SearchTarget> children) {
-        showSubtitleIfNeeded(null);
         mResultIcon.apply(parentTarget, children, this::onItemInfoCreated);
+
+        showSubtitleIfNeeded(null);
+
         if (parentTarget.getShortcutInfo() != null) {
             updateWithShortcutInfo(parentTarget.getShortcutInfo());
         } else if (parentTarget.getSearchAction() != null) {
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultSmallIconRow.java b/quickstep/src/com/android/launcher3/search/SearchResultSmallIconRow.java
new file mode 100644
index 0000000000..ca8aa81ecb
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/search/SearchResultSmallIconRow.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.search;
+
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
+
+import android.app.search.SearchTarget;
+import android.content.Context;
+import android.content.pm.ShortcutInfo;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.R;
+import com.android.launcher3.model.data.ItemInfoWithIcon;
+import com.android.launcher3.model.data.PackageItemInfo;
+
+import java.util.List;
+
+/**
+ * A full width representation of {@link SearchResultIcon} with a secondary label and inline
+ * SearchTargets
+ */
+public class SearchResultSmallIconRow extends LinearLayout implements SearchTargetHandler {
+
+    protected final Launcher mLauncher;
+    private final LauncherAppState mLauncherAppState;
+    protected SearchResultIcon mResultIcon;
+
+    private TextView mTitleView;
+    private TextView mDelimeterView;
+    private TextView mSubTitleView;
+
+    private PackageItemInfo mProviderInfo;
+
+    public SearchResultSmallIconRow(Context context) {
+        this(context, null, 0);
+    }
+
+    public SearchResultSmallIconRow(Context context,
+            @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public SearchResultSmallIconRow(Context context,
+            @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mLauncher = Launcher.getLauncher(getContext());
+        mLauncherAppState = LauncherAppState.getInstance(getContext());
+    }
+
+    protected int getIconSize() {
+        return mLauncher.getDeviceProfile().allAppsIconSizePx;
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        int iconSize = getIconSize();
+
+        mResultIcon = findViewById(R.id.icon);
+
+        mTitleView = findViewById(R.id.title);
+        mDelimeterView = findViewById(R.id.delimeter);
+        mDelimeterView.setVisibility(GONE);
+        mSubTitleView = findViewById(R.id.subtitle);
+        mSubTitleView.setVisibility(GONE);
+
+        mResultIcon.getLayoutParams().height = iconSize;
+        mResultIcon.getLayoutParams().width = iconSize;
+        mResultIcon.setTextVisibility(false);
+
+        setOnClickListener(mResultIcon);
+        setOnLongClickListener(mResultIcon);
+    }
+
+    @Override
+    public void apply(SearchTarget parentTarget, List<SearchTarget> children) {
+        mResultIcon.apply(parentTarget, children, this::onItemInfoCreated);
+
+        showSubtitleIfNeeded(null);
+
+        if (parentTarget.getShortcutInfo() != null) {
+            updateWithShortcutInfo(parentTarget.getShortcutInfo());
+        } else if (parentTarget.getSearchAction() != null) {
+            showSubtitleIfNeeded(parentTarget.getSearchAction().getSubtitle());
+        }
+    }
+
+    @Override
+    public boolean quickSelect() {
+        this.performClick();
+        return true;
+    }
+
+    private void updateWithShortcutInfo(ShortcutInfo shortcutInfo) {
+        PackageItemInfo packageItemInfo = new PackageItemInfo(shortcutInfo.getPackage());
+        if (packageItemInfo.equals(mProviderInfo)) return;
+        MODEL_EXECUTOR.post(() -> {
+            mLauncherAppState.getIconCache().getTitleAndIconForApp(packageItemInfo, true);
+            MAIN_EXECUTOR.post(() -> {
+                showSubtitleIfNeeded(packageItemInfo.title);
+                mProviderInfo = packageItemInfo;
+            });
+        });
+    }
+
+    protected void showSubtitleIfNeeded(CharSequence subTitle) {
+        if (!TextUtils.isEmpty(subTitle)) {
+            mSubTitleView.setText(subTitle);
+            mSubTitleView.setVisibility(VISIBLE);
+            mDelimeterView.setVisibility(VISIBLE);
+
+        } else {
+            mSubTitleView.setVisibility(GONE);
+        }
+    }
+
+    protected void onItemInfoCreated(ItemInfoWithIcon info) {
+        setTag(info);
+        mTitleView.setText(info.title);
+    }
+}
diff --git a/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java b/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java
index 0abed036e3..ede3b9d143 100644
--- a/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java
+++ b/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java
@@ -13,10 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.android.launcher3.search;
 
-import static com.android.app.search.LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT;
-import static com.android.app.search.LayoutType.ICON_SINGLE_HORIZONTAL_TEXT;
+import static com.android.app.search.LayoutType.DIVIDER;
+import static com.android.app.search.LayoutType.ICON_HORIZONTAL_TEXT;
+import static com.android.app.search.LayoutType.SMALL_ICON_HORIZONTAL_TEXT;
 import static com.android.app.search.LayoutType.THUMBNAIL;
 import static com.android.app.search.ResultType.ACTION;
 import static com.android.app.search.ResultType.SCREENSHOT;
@@ -54,17 +56,17 @@ public class SearchTargetUtil {
 
 
     /**
-     * Generate SearchTargetUtil for ICON_DOUBLE_HORIZONTAL_TEXT layout type.
+     * Generate SearchTargetUtil for ICON_HORIZONTAL_TEXT layout type.
      *
      * targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction(
      * mContext, "red", Color.RED));
      * targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction(
      * mContext, "yellow", Color.YELLOW));
      */
-    public static SearchTarget generateIconDoubleHorizontalText_SearchAction(
+    public static SearchTarget generateIcoHorizontalText_usingSearchAction(
             Context context, String id, int color) {
         SearchTarget.Builder builder =
-                new SearchTarget.Builder(ACTION, ICON_DOUBLE_HORIZONTAL_TEXT, id)
+                new SearchTarget.Builder(ACTION, ICON_HORIZONTAL_TEXT, id)
                         .setPackageName(PACKAGE2) /* required */
                         .setUserHandle(USERHANDLE); /* required */
 
@@ -102,7 +104,7 @@ public class SearchTargetUtil {
      * targets.add(SearchTargetUtil.generateThumbnail_SearchAction("red", Color.RED));
      * targets.add(SearchTargetUtil.generateThumbnail_SearchAction("green", Color.GREEN));
      */
-    public static SearchTarget generateThumbnail_SearchAction(String id, int color) {
+    public static SearchTarget generateThumbnail_usingSearchAction(String id, int color) {
         SearchTarget.Builder builder =
                 new SearchTarget.Builder(SCREENSHOT, THUMBNAIL, id)
                         .setPackageName(PACKAGE2) /* required */
@@ -130,16 +132,19 @@ public class SearchTargetUtil {
     }
 
     /**
+     * Generate SearchTargetUtil for SMALL_ICON_HORIZONTAL_TEXT layout type.
+     *
      * targets.add(SearchTargetUtil.generateIconHorizontalText_SearchAction(
      * mContext, "red", Color.RED));
      * targets.add(SearchTargetUtil.generateIconHorizontalText_SearchAction(
      * mContext, "yellow", Color.YELLOW));
      */
-    public static SearchTarget generateIconHorizontalText_SearchAction(
+    public static SearchTarget generateSmallIconHorizontalText_usingSearchAction(
             Context context, String id, int color) {
-        String fallbackQuery = "How to make cookie";
+        String title = "Ask the assistant";
+        String fallbackQuery = "sourdough bread";
         SearchTarget.Builder builder =
-                new SearchTarget.Builder(SUGGEST, ICON_SINGLE_HORIZONTAL_TEXT, id)
+                new SearchTarget.Builder(SUGGEST, SMALL_ICON_HORIZONTAL_TEXT, id)
                         .setPackageName(PACKAGE2) /* required */
                         .setUserHandle(USERHANDLE); /* required */
 
@@ -159,7 +164,8 @@ public class SearchTargetUtil {
         Bundle extra = new Bundle();
         extra.putBoolean(BUNDLE_EXTRA_SHOULD_START_FOR_RESULT, true);
 
-        SearchAction searchAction = new SearchAction.Builder(id, fallbackQuery)
+        SearchAction searchAction = new SearchAction.Builder(id, title)
+                .setSubtitle(fallbackQuery)
                 .setPendingIntent(pendingIntent3)
                 .setIcon(icon)
                 .setExtras(extra)
@@ -167,6 +173,14 @@ public class SearchTargetUtil {
         return builder.setSearchAction(searchAction).build();
     }
 
+    public static SearchTarget generateDivider() {
+        SearchTarget.Builder builder =
+                new SearchTarget.Builder(SUGGEST, DIVIDER, "divider")
+                        .setPackageName("") /* required but not used*/
+                        .setUserHandle(USERHANDLE); /* required */
+        return builder.build();
+    }
+
 
     /**
      * Generate SearchTargetUtil for ICON_DOUBLE_HORIZONTAL_TEXT layout type.
@@ -174,7 +188,7 @@ public class SearchTargetUtil {
     public static SearchTarget generateIconDoubleHorizontalText_ShortcutInfo(Context context) {
         String id = "23456";
         SearchTarget.Builder builder =
-                new SearchTarget.Builder(ResultType.SHORTCUT, ICON_DOUBLE_HORIZONTAL_TEXT, id)
+                new SearchTarget.Builder(ResultType.SHORTCUT, SMALL_ICON_HORIZONTAL_TEXT, id)
                         .setPackageName("com.google.android.gm") /* required */
                         .setUserHandle(UserHandle.CURRENT); /* required */
 
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 086d665fcb..b61799f79c 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -98,12 +98,12 @@ public final class FeatureFlags {
     public static final BooleanFlag ENABLE_DEVICE_SEARCH = new DeviceFlag(
             "ENABLE_DEVICE_SEARCH", false, "Allows on device search in all apps");
 
-    public static final BooleanFlag USE_SEARCH_API = getDebugFlag(
-            "USE_SEARCH_API", true, "Use SearchUIManager api for device search");
-
     public static final BooleanFlag DISABLE_INITIAL_IME_IN_ALLAPPS = getDebugFlag(
             "DISABLE_INITIAL_IME_IN_ALLAPPS", false, "Disable default IME state in all apps");
 
+    public static final BooleanFlag DISABLE_SLICE_IN_ALLAPPS = getDebugFlag(
+            "DISABLE_SLICE_IN_ALLAPPS", true, "Disable slice in all apps");
+
     public static final BooleanFlag FOLDER_NAME_SUGGEST = new DeviceFlag(
             "FOLDER_NAME_SUGGEST", true,
             "Suggests folder names instead of blank text.");
diff --git a/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java b/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
deleted file mode 100644
index 0b48c07d01..0000000000
--- a/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.systemui.plugins;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.os.CancellationSignal;
-import android.os.Parcelable;
-import android.view.View;
-
-import com.android.systemui.plugins.annotations.ProvidesInterface;
-import com.android.systemui.plugins.shared.SearchTargetEventLegacy;
-import com.android.systemui.plugins.shared.SearchTargetLegacy;
-
-import java.util.List;
-import java.util.function.Consumer;
-
-/**
- * Implement this plugin interface to fetch search result data from the plugin side.
- */
-@ProvidesInterface(action = AllAppsSearchPlugin.ACTION, version = AllAppsSearchPlugin.VERSION)
-public interface AllAppsSearchPlugin extends Plugin {
-    String ACTION = "com.android.systemui.action.PLUGIN_ALL_APPS_SEARCH_ACTIONS";
-    int VERSION = 9;
-
-    /**
-     * init plugin
-     */
-    void setup(Activity activity, View view, boolean useLegacy);
-
-    /**
-     * Send launcher state related signals.
-     */
-    void onStateTransitionStart(int fromState, int toState);
-
-    void onStateTransitionComplete(int state);
-
-    /**
-     * Send launcher window focus and visibility changed signals.
-     */
-    void onWindowFocusChanged(boolean hasFocus);
-
-    void onWindowVisibilityChanged(int visibility);
-
-    /**
-     * Send signal when user starts typing, perform search, notify search target
-     * event when search ends.
-     */
-    void startedSearchSession();
-
-    /**
-     * Main function that triggers search.
-     *
-     * @param input              string that has been typed by a user
-     * @param inputArgs          extra info that may be relevant for the input query
-     * @param results            contains the result that will be rendered in all apps search
-     *                           surface
-     * @param cancellationSignal {@link CancellationSignal} can be used to share status of current
-     */
-    void queryLegacy(String input, Bundle inputArgs, Consumer<List<SearchTargetLegacy>> results,
-            CancellationSignal cancellationSignal);
-
-    /**
-     * Main function that triggers search.
-     *
-     * @param input              string that has been typed by a user
-     * @param inputArgs          extra info that may be relevant for the input query
-     * @param results            contains the result that will be rendered in all apps search
-     *                           surface
-     * @param cancellationSignal {@link CancellationSignal} can be used to share status of current
-     */
-    void query(String input, Bundle inputArgs, Consumer<List<Parcelable>> results,
-            CancellationSignal cancellationSignal);
-
-    /**
-     * Send over search target interaction events to Plugin
-     */
-    void notifySearchTargetEventLegacy(SearchTargetEventLegacy event);
-
-    /**
-     * Send over search target interaction events to Plugin
-     */
-    void notifySearchTargetEvent(Parcelable event);
-
-    /**
-     * Launcher activity lifecycle callbacks
-     */
-    void onResume(int state);
-
-    void onStop(int state);
-}
\ No newline at end of file
diff --git a/src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java b/src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java
deleted file mode 100644
index 0fc61f04dc..0000000000
--- a/src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.systemui.plugins.shared;
-
-import android.os.Bundle;
-
-/**
- * Event used for the feedback loop to the plugin. (and future aiai)
- *
- * @deprecated Use {@link android.app.search.SearchTargetEvent}
- */
-@Deprecated
-public class SearchTargetEventLegacy {
-    public static final int POSITION_NONE = -1;
-
-    public static final int SELECT = 0;
-    public static final int QUICK_SELECT = 1;
-    public static final int LONG_PRESS = 2;
-    public static final int CHILD_SELECT = 3;
-
-    private final SearchTargetLegacy mSearchTarget;
-    private final int mEventType;
-    private final int mShortcutPosition;
-    private final Bundle mExtras;
-
-    public SearchTargetEventLegacy(SearchTargetLegacy searchTarget, int eventType,
-            int shortcutPosition,
-            Bundle extras) {
-        mSearchTarget = searchTarget;
-        mEventType = eventType;
-        mShortcutPosition = shortcutPosition;
-        mExtras = extras;
-    }
-
-
-    public SearchTargetLegacy getSearchTarget() {
-        return mSearchTarget;
-    }
-
-    public int getShortcutPosition() {
-        return mShortcutPosition;
-    }
-
-    public int getEventType() {
-        return mEventType;
-    }
-
-    public Bundle getExtras() {
-        return mExtras;
-    }
-
-    /**
-     * A builder for {@link SearchTargetLegacy}
-     */
-    public static final class Builder {
-        private final SearchTargetLegacy mSearchTarget;
-        private final int mEventType;
-        private int mShortcutPosition = POSITION_NONE;
-        private Bundle mExtras;
-
-        public Builder(SearchTargetLegacy searchTarget, int eventType) {
-            mSearchTarget = searchTarget;
-            mEventType = eventType;
-        }
-
-        public Builder setShortcutPosition(int shortcutPosition) {
-            mShortcutPosition = shortcutPosition;
-            return this;
-        }
-
-        public Builder setExtras(Bundle extras) {
-            mExtras = extras;
-            return this;
-        }
-
-        public SearchTargetEventLegacy build() {
-            return new SearchTargetEventLegacy(mSearchTarget, mEventType, mShortcutPosition,
-                    mExtras);
-        }
-    }
-
-}
diff --git a/src_plugins/com/android/systemui/plugins/shared/SearchTargetLegacy.java b/src_plugins/com/android/systemui/plugins/shared/SearchTargetLegacy.java
deleted file mode 100644
index 2a6ba8829f..0000000000
--- a/src_plugins/com/android/systemui/plugins/shared/SearchTargetLegacy.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.systemui.plugins.shared;
-
-import android.app.RemoteAction;
-import android.content.ComponentName;
-import android.content.pm.ShortcutInfo;
-import android.os.Bundle;
-import android.os.UserHandle;
-
-import java.util.List;
-
-/**
- * Used to return all apps search targets.
- *
- * @deprecated Use SearchTarget
- */
-@Deprecated
-public class SearchTargetLegacy implements Comparable<SearchTargetLegacy> {
-
-    private final String mItemId;
-    private final String mItemType;
-    private final float mScore;
-
-    private final ComponentName mComponentName;
-    private final UserHandle mUserHandle;
-    private final List<ShortcutInfo> mShortcutInfos;
-    //TODO: (sfufa) replace with a list of a custom type
-    private final RemoteAction mRemoteAction;
-    private final Bundle mExtras;
-
-    private SearchTargetLegacy(String itemId, String itemType, float score,
-            ComponentName componentName, UserHandle userHandle, List<ShortcutInfo> shortcutInfos,
-            RemoteAction remoteAction, Bundle extras) {
-        mItemId = itemId;
-        mItemType = itemType;
-        mScore = score;
-        mComponentName = componentName;
-        mUserHandle = userHandle;
-        mShortcutInfos = shortcutInfos;
-        mExtras = extras;
-        mRemoteAction = remoteAction;
-    }
-
-    public String getItemId() {
-        return mItemId;
-    }
-
-    public String getItemType() {
-        return mItemType;
-    }
-
-    public ComponentName getComponentName() {
-        return mComponentName;
-    }
-
-    public UserHandle getUserHandle() {
-        return mUserHandle;
-    }
-
-    public float getScore() {
-        return mScore;
-    }
-
-    public List<ShortcutInfo> getShortcutInfos() {
-        return mShortcutInfos;
-    }
-
-    public Bundle getExtras() {
-        return mExtras;
-    }
-
-    public RemoteAction getRemoteAction() {
-        return mRemoteAction;
-    }
-
-    @Override
-    public int compareTo(SearchTargetLegacy o) {
-        return Float.compare(o.mScore, mScore);
-    }
-
-    /**
-     * A builder for {@link SearchTargetLegacy}
-     */
-    public static final class Builder {
-
-
-        private String mItemId;
-
-        private final String mItemType;
-        private final float mScore;
-
-
-        private ComponentName mComponentName;
-        private UserHandle mUserHandle;
-        private List<ShortcutInfo> mShortcutInfos;
-        private Bundle mExtras;
-        private RemoteAction mRemoteAction;
-
-        public Builder(String itemType, float score) {
-            this(itemType, score, null, null);
-        }
-
-        public Builder(String itemType, float score, ComponentName cn,
-                UserHandle user) {
-            mItemType = itemType;
-            mScore = score;
-            mComponentName = cn;
-            mUserHandle = user;
-        }
-
-        public String getItemId() {
-            return mItemId;
-        }
-
-        public float getScore() {
-            return mScore;
-        }
-
-        public Builder setItemId(String itemId) {
-            mItemId = itemId;
-            return this;
-        }
-
-        public Builder setComponentName(ComponentName componentName) {
-            mComponentName = componentName;
-            return this;
-        }
-
-        public Builder setUserHandle(UserHandle userHandle) {
-            mUserHandle = userHandle;
-            return this;
-        }
-
-        public Builder setShortcutInfos(List<ShortcutInfo> shortcutInfos) {
-            mShortcutInfos = shortcutInfos;
-            return this;
-        }
-
-        public Builder setExtras(Bundle extras) {
-            mExtras = extras;
-            return this;
-        }
-
-        public Builder setRemoteAction(RemoteAction remoteAction) {
-            mRemoteAction = remoteAction;
-            return this;
-        }
-
-        /**
-         * Builds a {@link SearchTargetLegacy}
-         */
-        public SearchTargetLegacy build() {
-            if (mItemId == null) {
-                throw new IllegalStateException("Item ID is required for building SearchTarget");
-            }
-            return new SearchTargetLegacy(mItemId, mItemType, mScore, mComponentName, mUserHandle,
-                    mShortcutInfos,
-                    mRemoteAction, mExtras);
-        }
-    }
-}
-- 
GitLab


From 7786595ae565ccd48efc87422508f2ff93b1b7e8 Mon Sep 17 00:00:00 2001
From: Wale Ogunwale <ogunwale@google.com>
Date: Wed, 3 Feb 2021 07:39:20 -0800
Subject: [PATCH 0458/1664] Launcher3: Added shared lib APIs for Launcher to
 use split-screen APIs.

Bug: 179176511
Test: presubmits!
Change-Id: Ib66cd533676ec28c3b18549d2b9931cdb2263654
---
 .../com/android/quickstep/SystemUiProxy.java  | 84 +++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index ca55468a9f..85b21e09aa 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -17,6 +17,7 @@ package com.android.quickstep;
 
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 
+import android.app.PendingIntent;
 import android.app.PictureInPictureParams;
 import android.content.ComponentName;
 import android.content.Context;
@@ -24,15 +25,18 @@ import android.content.pm.ActivityInfo;
 import android.graphics.Bitmap;
 import android.graphics.Insets;
 import android.graphics.Rect;
+import android.os.Binder;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.IBinder.DeathRecipient;
 import android.os.RemoteException;
+import android.os.UserHandle;
 import android.util.Log;
 import android.view.MotionEvent;
 
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.systemui.shared.recents.IPinnedStackAnimationListener;
+import com.android.systemui.shared.recents.ISplitScreenListener;
 import com.android.systemui.shared.recents.ISystemUiProxy;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.system.RemoteTransitionCompat;
@@ -431,4 +435,84 @@ public class SystemUiProxy implements ISystemUiProxy {
             }
         }
     }
+
+    @Override
+    public void registerSplitScreenListener(ISplitScreenListener listener) {
+        if (mSystemUiProxy != null) {
+            try {
+                mSystemUiProxy.registerSplitScreenListener(listener);
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call registerSplitScreenListener");
+            }
+        }
+    }
+
+    @Override
+    public void unregisterSplitScreenListener(ISplitScreenListener listener) {
+        if (mSystemUiProxy != null) {
+            try {
+                mSystemUiProxy.unregisterSplitScreenListener(listener);
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call unregisterSplitScreenListener");
+            }
+        }
+    }
+
+    @Override
+    public void setSideStageVisibility(boolean visible) {
+        if (mSystemUiProxy != null) {
+            try {
+                mSystemUiProxy.setSideStageVisibility(visible);
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call setSideStageVisibility");
+            }
+        }
+    }
+
+    @Override
+    public void exitSplitScreen() {
+        if (mSystemUiProxy != null) {
+            try {
+                mSystemUiProxy.exitSplitScreen();
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call exitSplitScreen");
+            }
+        }
+    }
+
+    @Override
+    public void startTask(int taskId, int stage, int position, Bundle options) {
+        if (mSystemUiProxy != null) {
+            try {
+                mSystemUiProxy.startTask(taskId, stage, position, options);
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call startTask");
+            }
+        }
+    }
+
+    @Override
+    public void startShortcut(String packageName, String shortcutId, int stage, int position,
+            Bundle options, UserHandle user) {
+        if (mSystemUiProxy != null) {
+            try {
+                mSystemUiProxy.startShortcut(packageName, shortcutId, stage, position, options,
+                        user);
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call startShortcut");
+            }
+        }
+    }
+
+    @Override
+    public void startIntent(PendingIntent intent, int stage, int position, Bundle options) {
+        if (mSystemUiProxy != null) {
+            try {
+                mSystemUiProxy.startIntent(intent, stage, position, options);
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call startIntent");
+            }
+        }
+    }
+
 }
-- 
GitLab


From cbeb13d6c7f93ec0d510a7d77e7bcdb2b46beb2b Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Wed, 27 Jan 2021 14:45:58 -0800
Subject: [PATCH 0459/1664] [AA+] Log app launches from AA+ search result
 container.

This change will update westworld logs for app launches from AA+ search result. Updates log's container info from AllAppsContainer -> AllAppsPlusSearchResultContainer.

Bug: 178562918
Change-Id: I9ffca27fea42951a57640ef36717c04ff0251506
---
 Android.bp                                    | 20 +++++++++
 Android.mk                                    | 10 ++---
 build.gradle                                  |  4 +-
 protos/launcher_atom.proto                    |  3 ++
 .../launcher_atom_extension.proto             | 31 +++++++++++++
 .../launcher_atom_extension.proto             | 34 +++++++++++++++
 .../launcher3/search/SearchResultIcon.java    | 43 ++++++++++++++++---
 .../logging/StatsLogCompatManager.java        |  5 +++
 .../launcher3/model/data/ItemInfo.java        |  2 +-
 9 files changed, 138 insertions(+), 14 deletions(-)
 create mode 100644 protos_overrides/launcher_atom_extension.proto
 create mode 100644 quickstep/protos_overrides/launcher_atom_extension.proto

diff --git a/Android.bp b/Android.bp
index b20b307a5c..a720658f9f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -36,17 +36,37 @@ java_library_static {
     name: "launcher_log_protos_lite",
     srcs: [
         "protos/*.proto",
+        "protos_overrides/*.proto",
     ],
     sdk_version: "current",
     proto: {
         type: "lite",
         local_include_dirs:[
             "protos",
+            "protos_overrides",
         ],
     },
     static_libs: ["libprotobuf-java-lite"],
 }
 
+java_library_static {
+    name: "launcher_quickstep_log_protos_lite",
+    srcs: [
+        "quickstep/protos_overrides/*.proto",
+    ],
+    sdk_version: "current",
+    proto: {
+        type: "lite",
+        local_include_dirs:[
+            "quickstep/protos_overrides",
+        ],
+    },
+    static_libs: [
+      "libprotobuf-java-lite",
+      "launcher_log_protos_lite"
+      ],
+}
+
 java_library {
     name: "LauncherPluginLib",
 
diff --git a/Android.mk b/Android.mk
index ed420393dc..19ad328187 100644
--- a/Android.mk
+++ b/Android.mk
@@ -33,7 +33,7 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     LauncherPluginLib \
-    launcher_log_protos_lite \
+    launcher_quickstep_log_protos_lite \
     search_ui
 
 LOCAL_SRC_FILES := \
@@ -65,7 +65,7 @@ LOCAL_SRC_FILES := \
     $(call all-java-files-under, src_shortcuts_overrides) \
     $(call all-java-files-under, src_ui_overrides) \
     $(call all-java-files-under, ext_tests/src)
-    
+
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/ext_tests/res
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
@@ -129,8 +129,7 @@ LOCAL_MODULE_TAGS := optional
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     SystemUI-statsd \
-    SystemUISharedLib \
-    launcher_log_protos_lite
+    SystemUISharedLib
 ifneq (,$(wildcard frameworks/base))
   LOCAL_PRIVATE_PLATFORM_APIS := true
 else
@@ -196,8 +195,7 @@ LOCAL_MODULE_TAGS := optional
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     SystemUI-statsd \
-    SystemUISharedLib \
-    launcher_log_protos_lite
+    SystemUISharedLib
 ifneq (,$(wildcard frameworks/base))
   LOCAL_PRIVATE_PLATFORM_APIS := true
 else
diff --git a/build.gradle b/build.gradle
index 28a05d569c..a7eef13a3d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -81,7 +81,7 @@ android {
             java.srcDirs = ['src', 'src_plugins']
             manifest.srcFile 'AndroidManifest-common.xml'
             proto {
-                srcDir 'protos/'
+                srcDirs = ['protos/', 'protos_overrides/']
             }
         }
 
@@ -181,4 +181,4 @@ protobuf {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/protos/launcher_atom.proto b/protos/launcher_atom.proto
index cd229ae015..b4c6138671 100644
--- a/protos/launcher_atom.proto
+++ b/protos/launcher_atom.proto
@@ -18,6 +18,8 @@ syntax = "proto2";
 option java_package = "com.android.launcher3.logger";
 option java_outer_classname = "LauncherAtom";
 
+import "launcher_atom_extension.proto";
+
 //
 // ItemInfos
 message ItemInfo {
@@ -55,6 +57,7 @@ message ContainerInfo {
     SettingsContainer settings_container = 9;
     PredictedHotseatContainer predicted_hotseat_container = 10;
     TaskSwitcherContainer task_switcher_container = 11;
+    ExtendedContainers extended_containers = 20;
   }
 }
 
diff --git a/protos_overrides/launcher_atom_extension.proto b/protos_overrides/launcher_atom_extension.proto
new file mode 100644
index 0000000000..a07daf844c
--- /dev/null
+++ b/protos_overrides/launcher_atom_extension.proto
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+syntax = "proto2";
+
+option java_package = "com.android.launcher3.logger";
+option java_outer_classname = "LauncherAtomExtensions";
+
+
+// This proto file contains placeholder messages that can be overridden by
+// other Launcher variants.
+// Variants could have its own launcher_atom_extension.proto file(should have
+// same messages declared here but with different implementation); when building
+// variant's apk launcher_atom.proto will reference variant's extension file,
+// essentially overriding this file.
+
+
+// Wrapper message for additional containers used in variants.
+message ExtendedContainers {}
diff --git a/quickstep/protos_overrides/launcher_atom_extension.proto b/quickstep/protos_overrides/launcher_atom_extension.proto
new file mode 100644
index 0000000000..2766acf539
--- /dev/null
+++ b/quickstep/protos_overrides/launcher_atom_extension.proto
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+syntax = "proto2";
+
+option java_package = "com.android.launcher3.logger";
+option java_outer_classname = "LauncherAtomExtensions";
+
+
+// Wrapper message for containers used at the quickstep level.
+// Message name should match with launcher_atom_extension.proto message at
+// the AOSP level.
+message ExtendedContainers {
+
+  oneof Container{
+    DeviceSearchResultContainer device_search_result_container = 1;
+  }
+}
+
+// Represents on-device search result container.
+message DeviceSearchResultContainer{
+}
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
index c353d7aa3c..521174be32 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
@@ -49,6 +49,9 @@ import com.android.launcher3.allapps.AllAppsStore;
 import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.icons.LauncherIcons;
+import com.android.launcher3.logger.LauncherAtom.ContainerInfo;
+import com.android.launcher3.logger.LauncherAtomExtensions.DeviceSearchResultContainer;
+import com.android.launcher3.logger.LauncherAtomExtensions.ExtendedContainers;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.PackageItemInfo;
@@ -142,8 +145,14 @@ public class SearchResultIcon extends BubbleTextView implements
 
         SearchActionItemInfo itemInfo = new SearchActionItemInfo(searchAction.getIcon(),
                 searchTarget.getPackageName(), searchTarget.getUserHandle(),
-                searchAction.getTitle()
-        );
+                searchAction.getTitle()) {
+            // Workaround to log ItemInfo with DeviceSearchResultContainer without
+            // updating ItemInfo.container field.
+            @Override
+            protected ContainerInfo getContainerInfo() {
+                return buildDeviceSearchResultContainer();
+            }
+        };
         itemInfo.setIntent(searchAction.getIntent());
         itemInfo.setPendingIntent(searchAction.getPendingIntent());
 
@@ -243,7 +252,15 @@ public class SearchResultIcon extends BubbleTextView implements
 
     private void prepareUsingApp(ComponentName componentName, UserHandle userHandle) {
         AllAppsStore appsStore = mLauncher.getAppsView().getAppsStore();
-        AppInfo appInfo = appsStore.getApp(new ComponentKey(componentName, userHandle));
+        AppInfo appInfo = new AppInfo(
+                appsStore.getApp(new ComponentKey(componentName, userHandle))) {
+            // Workaround to log ItemInfo with DeviceSearchResultContainer without
+            // updating ItemInfo.container field.
+            @Override
+            protected ContainerInfo getContainerInfo() {
+                return buildDeviceSearchResultContainer();
+            }
+        };
 
         if (appInfo == null) {
             setVisibility(GONE);
@@ -253,9 +270,15 @@ public class SearchResultIcon extends BubbleTextView implements
         notifyItemInfoChanged(appInfo);
     }
 
-
     private void prepareUsingShortcutInfo(ShortcutInfo shortcutInfo) {
-        WorkspaceItemInfo workspaceItemInfo = new WorkspaceItemInfo(shortcutInfo, getContext());
+        WorkspaceItemInfo workspaceItemInfo = new WorkspaceItemInfo(shortcutInfo, getContext()) {
+            // Workaround to log ItemInfo with DeviceSearchResultContainer without
+            // updating ItemInfo.container field.
+            @Override
+            protected ContainerInfo getContainerInfo() {
+                return buildDeviceSearchResultContainer();
+            }
+        };
         notifyItemInfoChanged(workspaceItemInfo);
         LauncherAppState launcherAppState = LauncherAppState.getInstance(getContext());
         MODEL_EXECUTOR.execute(() -> {
@@ -293,4 +316,14 @@ public class SearchResultIcon extends BubbleTextView implements
             mOnItemInfoChanged = null;
         }
     }
+
+    private static ContainerInfo buildDeviceSearchResultContainer() {
+        return ContainerInfo.newBuilder().setExtendedContainers(
+                ExtendedContainers
+                        .newBuilder()
+                        .setDeviceSearchResultContainer(
+                                DeviceSearchResultContainer
+                                        .newBuilder()))
+                .build();
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
index d949126981..d22496d56f 100644
--- a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
+++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
@@ -16,6 +16,7 @@
 
 package com.android.quickstep.logging;
 
+import static com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.EXTENDED_CONTAINERS;
 import static com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.FOLDER;
 import static com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.SEARCH_RESULT_CONTAINER;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WORKSPACE_SNAPSHOT;
@@ -72,6 +73,7 @@ public class StatsLogCompatManager extends StatsLogManager {
     private static final int DEFAULT_PAGE_INDEX = -2;
     private static final int FOLDER_HIERARCHY_OFFSET = 100;
     private static final int SEARCH_RESULT_HIERARCHY_OFFSET = 200;
+    private static final int EXTENDED_CONTAINERS_HIERARCHY_OFFSET = 300;
 
     public static final CopyOnWriteArrayList<StatsLogConsumer> LOGS_CONSUMER =
             new CopyOnWriteArrayList<>();
@@ -397,6 +399,9 @@ public class StatsLogCompatManager extends StatsLogManager {
         } else if (info.getContainerInfo().getContainerCase() == SEARCH_RESULT_CONTAINER) {
             return info.getContainerInfo().getSearchResultContainer().getParentContainerCase()
                     .getNumber() + SEARCH_RESULT_HIERARCHY_OFFSET;
+        } else if (info.getContainerInfo().getContainerCase() == EXTENDED_CONTAINERS) {
+            return info.getContainerInfo().getExtendedContainers().getContainerCase().getNumber()
+                    + EXTENDED_CONTAINERS_HIERARCHY_OFFSET;
         } else {
             return info.getContainerInfo().getContainerCase().getNumber();
         }
diff --git a/src/com/android/launcher3/model/data/ItemInfo.java b/src/com/android/launcher3/model/data/ItemInfo.java
index b11b419dde..2fc902336d 100644
--- a/src/com/android/launcher3/model/data/ItemInfo.java
+++ b/src/com/android/launcher3/model/data/ItemInfo.java
@@ -225,7 +225,7 @@ public class ItemInfo {
     protected String dumpProperties() {
         return "id=" + id
                 + " type=" + LauncherSettings.Favorites.itemTypeToString(itemType)
-                + " container=" + LauncherSettings.Favorites.containerToString(container)
+                + " container=" + getContainerInfo()
                 + " targetComponent=" + getTargetComponent()
                 + " screen=" + screenId
                 + " cell(" + cellX + "," + cellY + ")"
-- 
GitLab


From f4d19f4614cf2f15a5f9f1ad46e7204bc515dbb5 Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Wed, 27 Jan 2021 19:05:12 -0800
Subject: [PATCH 0460/1664] [AA+] Log app launches from
 DeviceSearchResultContainer with instance ID.

This InstanceId is used to recreate the AA+ session on the server side.

Bug: 178562918
Change-Id: I1bba94417d3a142351e2470bb6153707d2cadb11
---
 .../android/launcher3/search/SearchResultIcon.java  |  6 +++---
 .../launcher3/uioverrides/QuickstepLauncher.java    | 12 ++++++++++++
 .../launcher3/allapps/search/LiveSearchManager.java | 13 +++++++++++++
 src/com/android/launcher3/model/data/ItemInfo.java  |  5 ++++-
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
index 521174be32..f7d5f45bfa 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
@@ -149,7 +149,7 @@ public class SearchResultIcon extends BubbleTextView implements
             // Workaround to log ItemInfo with DeviceSearchResultContainer without
             // updating ItemInfo.container field.
             @Override
-            protected ContainerInfo getContainerInfo() {
+            public ContainerInfo getContainerInfo() {
                 return buildDeviceSearchResultContainer();
             }
         };
@@ -257,7 +257,7 @@ public class SearchResultIcon extends BubbleTextView implements
             // Workaround to log ItemInfo with DeviceSearchResultContainer without
             // updating ItemInfo.container field.
             @Override
-            protected ContainerInfo getContainerInfo() {
+            public ContainerInfo getContainerInfo() {
                 return buildDeviceSearchResultContainer();
             }
         };
@@ -275,7 +275,7 @@ public class SearchResultIcon extends BubbleTextView implements
             // Workaround to log ItemInfo with DeviceSearchResultContainer without
             // updating ItemInfo.container field.
             @Override
-            protected ContainerInfo getContainerInfo() {
+            public ContainerInfo getContainerInfo() {
                 return buildDeviceSearchResultContainer();
             }
         };
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index a00ce56e6a..ee00ed2207 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -24,6 +24,8 @@ import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.OVERVIEW_MODAL_TASK;
 import static com.android.launcher3.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent;
+import static com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.EXTENDED_CONTAINERS;
+import static com.android.launcher3.logger.LauncherAtomExtensions.ExtendedContainers.ContainerCase.DEVICE_SEARCH_RESULT_CONTAINER;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_APP_LAUNCH_TAP;
 import static com.android.launcher3.testing.TestProtocol.HINT_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.OVERVIEW_STATE_ORDINAL;
@@ -81,6 +83,7 @@ import java.io.FileDescriptor;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Stream;
 
 public class QuickstepLauncher extends BaseQuickstepLauncher {
@@ -105,6 +108,15 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
 
     @Override
     protected void logAppLaunch(ItemInfo info, InstanceId instanceId) {
+        // If the app launch is from DeviceSearchResultContainer then add the InstanceId from
+        // LiveSearchManager to recreate the AllApps search session on the server side.
+        Optional<InstanceId> logInstanceId = this.getLiveSearchManager().getLogInstanceId();
+        if (info.getContainerInfo().getContainerCase() == EXTENDED_CONTAINERS
+                && info.getContainerInfo().getExtendedContainers().getContainerCase()
+                == DEVICE_SEARCH_RESULT_CONTAINER && logInstanceId.isPresent()) {
+            instanceId = logInstanceId.get();
+        }
+
         StatsLogger logger = getStatsLogManager()
                 .logger().withItemInfo(info).withInstanceId(instanceId);
 
diff --git a/src/com/android/launcher3/allapps/search/LiveSearchManager.java b/src/com/android/launcher3/allapps/search/LiveSearchManager.java
index ec33908c75..c2f0b960c8 100644
--- a/src/com/android/launcher3/allapps/search/LiveSearchManager.java
+++ b/src/com/android/launcher3/allapps/search/LiveSearchManager.java
@@ -33,10 +33,13 @@ import androidx.slice.widget.SliceLiveData;
 
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppWidgetProviderInfo;
+import com.android.launcher3.logging.InstanceId;
+import com.android.launcher3.logging.InstanceIdSequence;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.widget.PendingAddWidgetInfo;
 
 import java.util.HashMap;
+import java.util.Optional;
 
 /**
  * Manages Lifecycle for Live search results
@@ -51,6 +54,7 @@ public class LiveSearchManager {
             new HashMap<>();
     private final HashMap<Uri, LiveData<Slice>> mUriSliceMap = new HashMap<>();
     private SearchWidgetHost mSearchWidgetHost;
+    private InstanceId mLogInstanceId;
 
     public LiveSearchManager(Launcher launcher) {
         mLauncher = launcher;
@@ -113,6 +117,7 @@ public class LiveSearchManager {
      */
     public void start() {
         stop();
+        mLogInstanceId = new InstanceIdSequence().newInstanceId();
         mSearchWidgetHost = new SearchWidgetHost(mLauncher);
         mSearchWidgetHost.startListening();
     }
@@ -136,6 +141,14 @@ public class LiveSearchManager {
         mUriSliceMap.clear();
     }
 
+    /**
+     * Returns {@link InstanceId} that should be used for logging events within search session, if
+     * available.
+     */
+    public Optional<InstanceId> getLogInstanceId() {
+        return Optional.ofNullable(mLogInstanceId);
+    }
+
     static class SearchWidgetHost extends AppWidgetHost {
         SearchWidgetHost(Context context) {
             super(context, SEARCH_APPWIDGET_HOST_ID);
diff --git a/src/com/android/launcher3/model/data/ItemInfo.java b/src/com/android/launcher3/model/data/ItemInfo.java
index 2fc902336d..3851ab044d 100644
--- a/src/com/android/launcher3/model/data/ItemInfo.java
+++ b/src/com/android/launcher3/model/data/ItemInfo.java
@@ -352,7 +352,10 @@ public class ItemInfo {
         return itemBuilder;
     }
 
-    protected ContainerInfo getContainerInfo() {
+    /**
+     * Returns {@link ContainerInfo} used when logging this item.
+     */
+    public ContainerInfo getContainerInfo() {
         switch (container) {
             case CONTAINER_HOTSEAT:
                 return ContainerInfo.newBuilder()
-- 
GitLab


From b245c552d4b6a11e60d16777521f77ee1a4e591c Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 3 Feb 2021 12:55:57 -0800
Subject: [PATCH 0461/1664] Updating predictions if hotseat items get
 removed/added as a result of model callback

Bug: 179284787
Test: Verified on device
Change-Id: Iecfc7f291f54aacccc6d2afe674ccd2f20e2035d
---
 .../launcher3/BaseQuickstepLauncher.java      |  4 -
 .../HotseatPredictionController.java          | 90 ++++++++++++-------
 .../uioverrides/QuickstepLauncher.java        | 15 +++-
 3 files changed, 74 insertions(+), 35 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index cbe0eb0795..edcd0a203a 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -355,10 +355,6 @@ public abstract class BaseQuickstepLauncher extends Launcher
         // populating workspace.
         // TODO: Find a better place for this
         WellbeingModel.INSTANCE.get(this);
-
-        if (mTaskbarController != null) {
-            mTaskbarController.onHotseatUpdated();
-        }
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
index aa6601b8c8..88cfacb3a6 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
@@ -20,6 +20,7 @@ import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.hybridhotseat.HotseatEduController.getSettingsIntent;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOTSEAT_PREDICTION_PINNED;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOTSEAT_RANKED;
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
@@ -70,7 +71,11 @@ import java.util.stream.Collectors;
  */
 public class HotseatPredictionController implements DragController.DragListener,
         SystemShortcut.Factory<QuickstepLauncher>, InvariantDeviceProfile.OnIDPChangeListener,
-        DragSource {
+        DragSource, ViewGroup.OnHierarchyChangeListener {
+
+    private static final int FLAG_UPDATE_PAUSED = 1 << 0;
+    private static final int FLAG_DRAG_IN_PROGRESS = 1 << 1;
+    private static final int FLAG_FILL_IN_PROGRESS = 1 << 2;
 
     private int mHotSeatItemsCount;
 
@@ -80,8 +85,7 @@ public class HotseatPredictionController implements DragController.DragListener,
     private List<ItemInfo> mPredictedItems = Collections.emptyList();
 
     private AnimatorSet mIconRemoveAnimators;
-    private boolean mUIUpdatePaused = false;
-    private boolean mDragInProgress = false;
+    private int mPauseFlags = 0;
 
     private List<PredictedAppIcon.PredictedIconOutlineDrawing> mOutlineDrawings = new ArrayList<>();
 
@@ -114,6 +118,30 @@ public class HotseatPredictionController implements DragController.DragListener,
         mLauncher.getDragController().addDragListener(this);
 
         launcher.getDeviceProfile().inv.addOnChangeListener(this);
+        mHotseat.getShortcutsAndWidgets().setOnHierarchyChangeListener(this);
+    }
+
+    @Override
+    public void onChildViewAdded(View parent, View child) {
+        onHotseatHierarchyChanged();
+    }
+
+    @Override
+    public void onChildViewRemoved(View parent, View child) {
+        onHotseatHierarchyChanged();
+    }
+
+    private void onHotseatHierarchyChanged() {
+        if (mPauseFlags == 0 && !mLauncher.isWorkspaceLoading()) {
+            // Post update after a single frame to avoid layout within layout
+            MAIN_EXECUTOR.getHandler().post(this::updateFillIfNotLoading);
+        }
+    }
+
+    private void updateFillIfNotLoading() {
+        if (mPauseFlags == 0 && !mLauncher.isWorkspaceLoading()) {
+            fillGapsWithPrediction(true);
+        }
     }
 
     /**
@@ -160,11 +188,11 @@ public class HotseatPredictionController implements DragController.DragListener,
     }
 
     private void fillGapsWithPrediction() {
-        fillGapsWithPrediction(false, null);
+        fillGapsWithPrediction(false);
     }
 
-    private void fillGapsWithPrediction(boolean animate, Runnable callback) {
-        if (mUIUpdatePaused || mDragInProgress) {
+    private void fillGapsWithPrediction(boolean animate) {
+        if (mPauseFlags != 0) {
             return;
         }
 
@@ -175,12 +203,14 @@ public class HotseatPredictionController implements DragController.DragListener,
             mIconRemoveAnimators.addListener(new AnimationSuccessListener() {
                 @Override
                 public void onAnimationSuccess(Animator animator) {
-                    fillGapsWithPrediction(animate, callback);
+                    fillGapsWithPrediction(animate);
                     mIconRemoveAnimators.removeListener(this);
                 }
             });
             return;
         }
+
+        mPauseFlags |= FLAG_FILL_IN_PROGRESS;
         for (int rank = 0; rank < mHotSeatItemsCount; rank++) {
             View child = mHotseat.getChildAt(
                     mHotseat.getCellXFromOrder(rank),
@@ -207,10 +237,12 @@ public class HotseatPredictionController implements DragController.DragListener,
             }
             preparePredictionInfo(predictedItem, rank);
         }
-        bindItems(newItems, animate, callback);
+        bindItems(newItems, animate);
+
+        mPauseFlags &= ~FLAG_FILL_IN_PROGRESS;
     }
 
-    private void bindItems(List<WorkspaceItemInfo> itemsToAdd, boolean animate, Runnable callback) {
+    private void bindItems(List<WorkspaceItemInfo> itemsToAdd, boolean animate) {
         AnimatorSet animationSet = new AnimatorSet();
         for (WorkspaceItemInfo item : itemsToAdd) {
             PredictedAppIcon icon = PredictedAppIcon.createIcon(mHotseat, item);
@@ -221,12 +253,11 @@ public class HotseatPredictionController implements DragController.DragListener,
             }
         }
         if (animate) {
-            if (callback != null) {
-                animationSet.addListener(AnimationSuccessListener.forRunnable(callback));
-            }
+            animationSet.addListener(AnimationSuccessListener
+                    .forRunnable(this::removeOutlineDrawings));
             animationSet.start();
         } else {
-            if (callback != null) callback.run();
+            removeOutlineDrawings();
         }
 
         if (mLauncher.getTaskbarController() != null) {
@@ -234,6 +265,16 @@ public class HotseatPredictionController implements DragController.DragListener,
         }
     }
 
+    private void removeOutlineDrawings() {
+        if (mOutlineDrawings.isEmpty()) return;
+        for (PredictedAppIcon.PredictedIconOutlineDrawing outlineDrawing : mOutlineDrawings) {
+            mHotseat.removeDelegatedCellDrawing(outlineDrawing);
+        }
+        mHotseat.invalidate();
+        mOutlineDrawings.clear();
+    }
+
+
     /**
      * Unregisters callbacks and frees resources
      */
@@ -245,11 +286,9 @@ public class HotseatPredictionController implements DragController.DragListener,
      * start and pauses predicted apps update on the hotseat
      */
     public void setPauseUIUpdate(boolean paused) {
-        if (mLauncher.getTaskbarController() != null) {
-            // Taskbar is present, always allow updates since hotseat is still visible.
-            return;
-        }
-        mUIUpdatePaused = paused;
+        mPauseFlags = paused
+                ? (mPauseFlags | FLAG_UPDATE_PAUSED)
+                : (mPauseFlags & ~FLAG_UPDATE_PAUSED);
         if (!paused) {
             fillGapsWithPrediction();
         }
@@ -365,14 +404,14 @@ public class HotseatPredictionController implements DragController.DragListener,
         for (PredictedAppIcon.PredictedIconOutlineDrawing outlineDrawing : mOutlineDrawings) {
             mHotseat.addDelegatedCellDrawing(outlineDrawing);
         }
-        mDragInProgress = true;
+        mPauseFlags |= FLAG_DRAG_IN_PROGRESS;
         mHotseat.invalidate();
     }
 
     @Override
     public void onDragEnd() {
-        mDragInProgress = false;
-        fillGapsWithPrediction(true, this::removeOutlineDrawings);
+        mPauseFlags &= ~FLAG_DRAG_IN_PROGRESS;
+        fillGapsWithPrediction(true);
     }
 
     @Nullable
@@ -393,15 +432,6 @@ public class HotseatPredictionController implements DragController.DragListener,
         itemInfo.screenId = rank;
     }
 
-    private void removeOutlineDrawings() {
-        if (mOutlineDrawings.isEmpty()) return;
-        for (PredictedAppIcon.PredictedIconOutlineDrawing outlineDrawing : mOutlineDrawings) {
-            mHotseat.removeDelegatedCellDrawing(outlineDrawing);
-        }
-        mHotseat.invalidate();
-        mOutlineDrawings.clear();
-    }
-
     @Override
     public void onIdpChanged(int changeFlags, InvariantDeviceProfile profile) {
         this.mHotSeatItemsCount = profile.numHotseatIcons;
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index a00ce56e6a..3a26f25e56 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -17,6 +17,7 @@ package com.android.launcher3.uioverrides;
 
 import static android.view.accessibility.AccessibilityEvent.TYPE_VIEW_FOCUSED;
 
+import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT;
 import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
 import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT;
 import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT;
@@ -52,6 +53,7 @@ import com.android.launcher3.logging.InstanceId;
 import com.android.launcher3.logging.StatsLogManager.StatsLogger;
 import com.android.launcher3.model.BgDataModel.FixedContainerItems;
 import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.popup.SystemShortcut;
 import com.android.launcher3.search.DeviceSearchAdapterProvider;
 import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory;
@@ -80,6 +82,7 @@ import com.android.quickstep.views.TaskView;
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 import java.util.stream.Stream;
 
@@ -152,7 +155,8 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
     @Override
     public boolean startActivitySafely(View v, Intent intent, ItemInfo item) {
         if (mHotseatPredictionController != null) {
-            mHotseatPredictionController.setPauseUIUpdate(true);
+            // Only pause is taskbar controller is not present
+            mHotseatPredictionController.setPauseUIUpdate(getTaskbarController() == null);
         }
         return super.startActivitySafely(v, intent, item);
     }
@@ -217,6 +221,15 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
         }
     }
 
+    @Override
+    public void bindWorkspaceItemsChanged(List<WorkspaceItemInfo> updated) {
+        super.bindWorkspaceItemsChanged(updated);
+        if (getTaskbarController() != null && updated.stream()
+                .filter(w -> w.container == CONTAINER_HOTSEAT).findFirst().isPresent()) {
+            getTaskbarController().onHotseatUpdated();
+        }
+    }
+
     @Override
     public void onDestroy() {
         super.onDestroy();
-- 
GitLab


From 0983b8070d5e22a5d0b83bad8d318dc4ad76ae3a Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 29 Jan 2021 14:00:38 -0800
Subject: [PATCH 0462/1664] Catching generic app start exceptions in
 ProxyActivity

Bug: 178815863
Test: None
Change-Id: I39ae2879e107160d552625db2946a439ee14440b
---
 .../launcher3/proxy/ProxyActivityStarter.java    | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/proxy/ProxyActivityStarter.java b/quickstep/src/com/android/launcher3/proxy/ProxyActivityStarter.java
index e302b4f152..4d7cc85ed1 100644
--- a/quickstep/src/com/android/launcher3/proxy/ProxyActivityStarter.java
+++ b/quickstep/src/com/android/launcher3/proxy/ProxyActivityStarter.java
@@ -17,6 +17,7 @@
 package com.android.launcher3.proxy;
 
 import android.app.Activity;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentSender.SendIntentException;
@@ -48,19 +49,20 @@ public class ProxyActivityStarter extends Activity {
             return;
         }
 
-        if (mParams.intent != null) {
-            startActivityForResult(mParams.intent, mParams.requestCode, mParams.options);
-            return;
-        } else if (mParams.intentSender != null) {
-            try {
+        try {
+            if (mParams.intent != null) {
+                startActivityForResult(mParams.intent, mParams.requestCode, mParams.options);
+                return;
+            } else if (mParams.intentSender != null) {
                 startIntentSenderForResult(mParams.intentSender, mParams.requestCode,
                         mParams.fillInIntent, mParams.flagsMask, mParams.flagsValues,
                         mParams.extraFlags,
                         mParams.options);
                 return;
-            } catch (SendIntentException e) {
-                mParams.deliverResult(this, RESULT_CANCELED, null);
             }
+        } catch (NullPointerException | ActivityNotFoundException | SecurityException
+                | SendIntentException e) {
+            mParams.deliverResult(this, RESULT_CANCELED, null);
         }
         finishAndRemoveTask();
     }
-- 
GitLab


From ce79488572b5c5cbc1f2710eee195937dfbcad74 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Wed, 3 Feb 2021 13:35:42 -0800
Subject: [PATCH 0463/1664] Make sure that RemoteAnimationTargets is not null
 when redrawLiveTile()

Fixes: 179289159
Test: manual
Change-Id: I3a5d283582f0899d98717bbbdd146925cc0a4a93
---
 quickstep/src/com/android/quickstep/views/RecentsView.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 2f2b566e32..d9d0a936b2 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2277,7 +2277,9 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     }
 
     public void redrawLiveTile() {
-        mLiveTileTaskViewSimulator.apply(mLiveTileParams);
+        if (mLiveTileParams.getTargetSet() != null) {
+            mLiveTileTaskViewSimulator.apply(mLiveTileParams);
+        }
     }
 
     public TaskViewSimulator getLiveTileTaskViewSimulator() {
-- 
GitLab


From 04ebcf468627c87e4a103959735260fe2bea5998 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Wed, 3 Feb 2021 15:31:51 -0800
Subject: [PATCH 0464/1664] Postponing registering widget listener

For the swipe-to-home gesture, the call will happen
after the animation.

This fixes jank during swiping up from an ap
to home.

Also renaming some methods for clarity.

Bug: 175048504, 173072373
Test: tracing
Change-Id: I070b23edb633d2ac0985d5eb9f75c789f8569772
---
 src/com/android/launcher3/Launcher.java       |  8 +-
 .../launcher3/LauncherAppWidgetHost.java      | 77 +++++++++----------
 2 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 0274775244..c7d17a858a 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -922,7 +922,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         }
 
         logStopAndResume(false /* isResume */);
-        mAppWidgetHost.setListenIfResumed(false);
+        mAppWidgetHost.setActivityStarted(false);
         NotificationListener.removeNotificationsChangedListener();
     }
 
@@ -935,7 +935,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
             mOverlayManager.onActivityStarted(this);
         }
 
-        mAppWidgetHost.setListenIfResumed(true);
+        mAppWidgetHost.setActivityStarted(true);
         TraceHelper.INSTANCE.endSection(traceToken);
         mLifecycleRegistry.setCurrentState(Lifecycle.State.STARTED);
     }
@@ -956,6 +956,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         NotificationListener.setNotificationsChangedListener(mPopupDataProvider);
 
         DiscoveryBounce.showForHomeIfNeeded(this);
+        mAppWidgetHost.setActivityResumed(true);
     }
 
     private void logStopAndResume(boolean isResume) {
@@ -1049,7 +1050,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     @Override
     public void onStateSetEnd(LauncherState state) {
         super.onStateSetEnd(state);
-        getAppWidgetHost().setResumed(state == LauncherState.NORMAL);
+        getAppWidgetHost().setStateIsNormal(state == LauncherState.NORMAL);
         getWorkspace().setClipChildren(!state.hasFlag(FLAG_MULTI_PAGE));
 
         finishAutoCancelActionMode();
@@ -1108,6 +1109,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         if (!mDeferOverlayCallbacks) {
             mOverlayManager.onActivityPaused(this);
         }
+        mAppWidgetHost.setActivityResumed(false);
     }
 
     class LauncherOverlayCallbacksImpl implements LauncherOverlayCallbacks {
diff --git a/src/com/android/launcher3/LauncherAppWidgetHost.java b/src/com/android/launcher3/LauncherAppWidgetHost.java
index 7ea68512ee..fea26df7da 100644
--- a/src/com/android/launcher3/LauncherAppWidgetHost.java
+++ b/src/com/android/launcher3/LauncherAppWidgetHost.java
@@ -49,8 +49,11 @@ import java.util.function.IntConsumer;
 public class LauncherAppWidgetHost extends AppWidgetHost {
 
     private static final int FLAG_LISTENING = 1;
-    private static final int FLAG_RESUMED = 1 << 1;
-    private static final int FLAG_LISTEN_IF_RESUMED = 1 << 2;
+    private static final int FLAG_STATE_IS_NORMAL = 1 << 1;
+    private static final int FLAG_ACTIVITY_STARTED = 1 << 2;
+    private static final int FLAG_ACTIVITY_RESUMED = 1 << 3;
+    private static final int FLAGS_SHOULD_LISTEN =
+            FLAG_STATE_IS_NORMAL | FLAG_ACTIVITY_STARTED | FLAG_ACTIVITY_RESUMED;
 
     public static final int APPWIDGET_HOST_ID = 1024;
 
@@ -59,7 +62,7 @@ public class LauncherAppWidgetHost extends AppWidgetHost {
     private final SparseArray<PendingAppWidgetHostView> mPendingViews = new SparseArray<>();
 
     private final Context mContext;
-    private int mFlags = FLAG_RESUMED;
+    private int mFlags = FLAG_STATE_IS_NORMAL;
 
     private IntConsumer mAppWidgetRemovedCallback = null;
 
@@ -130,49 +133,45 @@ public class LauncherAppWidgetHost extends AppWidgetHost {
     }
 
     /**
-     * Updates the resumed state of the host.
-     * When a host is not resumed, it defers calls to startListening until host is resumed again.
-     * But if the host was already listening, it will not call stopListening.
-     *
-     * @see #setListenIfResumed(boolean)
+     * Sets or unsets a flag the can change whether the widget host should be in the listening
+     * state.
      */
-    public void setResumed(boolean isResumed) {
-        if (isResumed == ((mFlags & FLAG_RESUMED) != 0)) {
-            return;
-        }
-        if (isResumed) {
-            mFlags |= FLAG_RESUMED;
-            // Start listening if we were supposed to start listening on resume
-            if ((mFlags & FLAG_LISTEN_IF_RESUMED) != 0 && (mFlags & FLAG_LISTENING) == 0) {
-                startListening();
-            }
+    private void setShouldListenFlag(int flag, boolean on) {
+        if (on) {
+            mFlags |= flag;
         } else {
-            mFlags &= ~FLAG_RESUMED;
+            mFlags &= ~flag;
+        }
+
+        final boolean listening = isListening();
+        if (!listening && (mFlags & FLAGS_SHOULD_LISTEN) == FLAGS_SHOULD_LISTEN) {
+            // Postpone starting listening until all flags are on.
+            startListening();
+        } else if (listening && (mFlags & FLAG_ACTIVITY_STARTED) == 0) {
+            // Postpone stopping listening until the activity is stopped.
+            stopListening();
         }
     }
 
     /**
-     * Updates the listening state of the host. If the host is not resumed, startListening is
-     * deferred until next resume.
-     *
-     * @see #setResumed(boolean)
+     * Registers an "entering/leaving Normal state" event.
      */
-    public void setListenIfResumed(boolean listenIfResumed) {
-        if (listenIfResumed == ((mFlags & FLAG_LISTEN_IF_RESUMED) != 0)) {
-            return;
-        }
-        if (listenIfResumed) {
-            mFlags |= FLAG_LISTEN_IF_RESUMED;
-            if ((mFlags & FLAG_RESUMED) != 0) {
-                // If we are resumed, start listening immediately. Note we do not check for
-                // duplicate calls before calling startListening as startListening is safe to call
-                // multiple times.
-                startListening();
-            }
-        } else {
-            mFlags &= ~FLAG_LISTEN_IF_RESUMED;
-            stopListening();
-        }
+    public void setStateIsNormal(boolean isNormal) {
+        setShouldListenFlag(FLAG_STATE_IS_NORMAL, isNormal);
+    }
+
+    /**
+     * Registers an "activity started/stopped" event.
+     */
+    public void setActivityStarted(boolean isStarted) {
+        setShouldListenFlag(FLAG_ACTIVITY_STARTED, isStarted);
+    }
+
+    /**
+     * Registers an "activity paused/resumed" event.
+     */
+    public void setActivityResumed(boolean isResumed) {
+        setShouldListenFlag(FLAG_ACTIVITY_RESUMED, isResumed);
     }
 
     @Override
-- 
GitLab


From 1b4d5034fbf56b227ec9697d0d43b3e3d085670d Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Wed, 3 Feb 2021 13:05:21 -0800
Subject: [PATCH 0465/1664] Fix icon flicker on transition from installing, to
 installed, to downloading incrementally.

When an app finished downloading, we assumed that its progress level was 100%. This caused flicker in apps that supported incremental downloads. Added a check for the total download progress on app installation.

demo: https://drive.google.com/file/d/11NwwhHj_4rmDFwpsb8gTX-uA5YSinjSj/view?usp=sharing

Fixes: 178745816

Test: manual

Change-Id: I08328296db2ce2c2242fc4fe87158ff4b911c659
---
 .../android/launcher3/model/AllAppsList.java   | 16 ++++++++++++----
 .../launcher3/model/PackageUpdatedTask.java    | 18 +++++++++++++++---
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/com/android/launcher3/model/AllAppsList.java b/src/com/android/launcher3/model/AllAppsList.java
index d4fa2789d5..e3e4b6911f 100644
--- a/src/com/android/launcher3/model/AllAppsList.java
+++ b/src/com/android/launcher3/model/AllAppsList.java
@@ -203,11 +203,16 @@ public class AllAppsList {
     /**
      * Add the icons for the supplied apk called packageName.
      */
-    public void addPackage(Context context, String packageName, UserHandle user) {
-        for (LauncherActivityInfo info : context.getSystemService(LauncherApps.class)
-                .getActivityList(packageName, user)) {
+    public List<LauncherActivityInfo> addPackage(
+            Context context, String packageName, UserHandle user) {
+        List<LauncherActivityInfo> activities = context.getSystemService(LauncherApps.class)
+                .getActivityList(packageName, user);
+
+        for (LauncherActivityInfo info : activities) {
             add(new AppInfo(context, info, user), info);
         }
+
+        return activities;
     }
 
     /**
@@ -250,7 +255,8 @@ public class AllAppsList {
     /**
      * Add and remove icons for this package which has been updated.
      */
-    public void updatePackage(Context context, String packageName, UserHandle user) {
+    public List<LauncherActivityInfo> updatePackage(
+            Context context, String packageName, UserHandle user) {
         final List<LauncherActivityInfo> matches = context.getSystemService(LauncherApps.class)
                 .getActivityList(packageName, user);
         if (matches.size() > 0) {
@@ -297,6 +303,8 @@ public class AllAppsList {
                 }
             }
         }
+
+        return matches;
     }
 
     /**
diff --git a/src/com/android/launcher3/model/PackageUpdatedTask.java b/src/com/android/launcher3/model/PackageUpdatedTask.java
index 3275d59488..f13a109926 100644
--- a/src/com/android/launcher3/model/PackageUpdatedTask.java
+++ b/src/com/android/launcher3/model/PackageUpdatedTask.java
@@ -22,6 +22,7 @@ import static com.android.launcher3.model.data.WorkspaceItemInfo.FLAG_RESTORED_I
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.LauncherActivityInfo;
 import android.content.pm.LauncherApps;
 import android.content.pm.ShortcutInfo;
 import android.os.UserHandle;
@@ -51,6 +52,7 @@ import com.android.launcher3.util.SafeCloseable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 
@@ -95,6 +97,7 @@ public class PackageUpdatedTask extends BaseModelUpdateTask {
                 ? ItemInfoMatcher.ofUser(mUser) // We want to update all packages for this user
                 : ItemInfoMatcher.ofPackages(packageSet, mUser);
         final HashSet<ComponentName> removedComponents = new HashSet<>();
+        final HashMap<String, List<LauncherActivityInfo>> activitiesLists = new HashMap<>();
 
         switch (mOp) {
             case OP_ADD: {
@@ -104,7 +107,8 @@ public class PackageUpdatedTask extends BaseModelUpdateTask {
                     if (FeatureFlags.PROMISE_APPS_IN_ALL_APPS.get()) {
                         appsList.removePackage(packages[i], mUser);
                     }
-                    appsList.addPackage(context, packages[i], mUser);
+                    activitiesLists.put(
+                            packages[i], appsList.addPackage(context, packages[i], mUser));
                 }
                 flagOp = FlagOp.removeFlag(WorkspaceItemInfo.FLAG_DISABLED_NOT_AVAILABLE);
                 break;
@@ -115,7 +119,8 @@ public class PackageUpdatedTask extends BaseModelUpdateTask {
                     for (int i = 0; i < N; i++) {
                         if (DEBUG) Log.d(TAG, "mAllAppsList.updatePackage " + packages[i]);
                         iconCache.updateIconsForPkg(packages[i], mUser);
-                        appsList.updatePackage(context, packages[i], mUser);
+                        activitiesLists.put(
+                                packages[i], appsList.updatePackage(context, packages[i], mUser));
                         app.getWidgetCache().removePackage(packages[i], mUser);
                     }
                 }
@@ -247,7 +252,14 @@ public class PackageUpdatedTask extends BaseModelUpdateTask {
 
                         if (isNewApkAvailable
                                 && si.itemType == Favorites.ITEM_TYPE_APPLICATION) {
-                            si.setProgressLevel(100, PackageInstallInfo.STATUS_INSTALLED);
+                            List<LauncherActivityInfo> activities = activitiesLists.get(
+                                    packageName);
+                            si.setProgressLevel(
+                                    activities == null || activities.isEmpty()
+                                            ? 100
+                                            : PackageManagerHelper.getLoadingProgress(
+                                                    activities.get(0)),
+                                    PackageInstallInfo.STATUS_INSTALLED_DOWNLOADING);
                             iconCache.getTitleAndIcon(si, si.usingLowResIcon());
                             infoUpdated = true;
                         }
-- 
GitLab


From aaa42bd0e85f21c78d999c20adb819d77b6df731 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 27 Jan 2021 16:27:15 -0800
Subject: [PATCH 0466/1664] Add recent tasks to Taskbar

- Also adds a divider between Hotseat and Recents
- Dedupes Recents from Hotseat

Test: Open some recent tasks, ensure they are deduped
from Hotseat and also handle < 2 tasks.

Bug: 171917176
Change-Id: Ia782c6ccbcda94cfd844aad04dc3d25a3f072c2b
---
 quickstep/res/layout/taskbar_divider.xml      |  23 ++++
 quickstep/res/values/colors.xml               |   1 +
 quickstep/res/values/dimens.xml               |   2 +
 .../launcher3/taskbar/TaskbarController.java  | 102 +++++++++++++++-
 .../taskbar/TaskbarDragController.java        |  11 ++
 .../taskbar/TaskbarRecentsController.java     | 114 ++++++++++++++++++
 .../launcher3/taskbar/TaskbarView.java        | 101 +++++++++++++++-
 src/com/android/launcher3/BubbleTextView.java |  10 ++
 8 files changed, 361 insertions(+), 3 deletions(-)
 create mode 100644 quickstep/res/layout/taskbar_divider.xml
 create mode 100644 quickstep/src/com/android/launcher3/taskbar/TaskbarRecentsController.java

diff --git a/quickstep/res/layout/taskbar_divider.xml b/quickstep/res/layout/taskbar_divider.xml
new file mode 100644
index 0000000000..6e1aa1e3d5
--- /dev/null
+++ b/quickstep/res/layout/taskbar_divider.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<View
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="@dimen/taskbar_divider_thickness"
+    android:layout_height="@dimen/taskbar_divider_height"
+    android:layout_marginStart="@dimen/taskbar_icon_spacing"
+    android:layout_marginEnd="@dimen/taskbar_icon_spacing"
+    android:background="@color/taskbar_divider" />
\ No newline at end of file
diff --git a/quickstep/res/values/colors.xml b/quickstep/res/values/colors.xml
index 3bc8ddc0a8..54730f100e 100644
--- a/quickstep/res/values/colors.xml
+++ b/quickstep/res/values/colors.xml
@@ -27,4 +27,5 @@
 
     <!-- Taskbar -->
     <color name="taskbar_background">#101010</color>
+    <color name="taskbar_divider">#C0C0C0</color>
 </resources>
\ No newline at end of file
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 39cc0b891c..0f40775995 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -127,4 +127,6 @@
     <dimen name="taskbar_icon_drag_icon_size">54dp</dimen>
     <!-- Note that this applies to both sides of all icons, so visible space is double this. -->
     <dimen name="taskbar_icon_spacing">14dp</dimen>
+    <dimen name="taskbar_divider_thickness">1dp</dimen>
+    <dimen name="taskbar_divider_height">24dp</dimen>
 </resources>
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index 7608645a63..6a74aac2ba 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -23,6 +23,8 @@ import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_BOTT
 import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_EXTRA_NAVIGATION_BAR;
 
 import android.animation.Animator;
+import android.app.ActivityOptions;
+import android.content.ComponentName;
 import android.graphics.PixelFormat;
 import android.graphics.Point;
 import android.view.Gravity;
@@ -42,8 +44,13 @@ import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.touch.ItemClickHandler;
 import com.android.quickstep.AnimatedFloat;
+import com.android.systemui.shared.recents.model.Task;
+import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.WindowManagerWrapper;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Interfaces with Launcher/WindowManager/SystemUI to determine what to show in TaskbarView.
  */
@@ -60,11 +67,17 @@ public class TaskbarController {
     private final TaskbarStateHandler mTaskbarStateHandler;
     private final TaskbarVisibilityController mTaskbarVisibilityController;
     private final TaskbarHotseatController mHotseatController;
+    private final TaskbarRecentsController mRecentsController;
     private final TaskbarDragController mDragController;
 
     // Initialized in init().
     private WindowManager.LayoutParams mWindowLayoutParams;
 
+    // Contains all loaded Tasks, not yet deduped from Hotseat items.
+    private List<Task> mLatestLoadedRecentTasks;
+    // Contains all loaded Hotseat items.
+    private ItemInfo[] mLatestLoadedHotseatItems;
+
     public TaskbarController(BaseQuickstepLauncher launcher,
             TaskbarContainerView taskbarContainerView) {
         mLauncher = launcher;
@@ -79,6 +92,8 @@ public class TaskbarController {
                 createTaskbarVisibilityControllerCallbacks());
         mHotseatController = new TaskbarHotseatController(mLauncher,
                 createTaskbarHotseatControllerCallbacks());
+        mRecentsController = new TaskbarRecentsController(mLauncher,
+                createTaskbarRecentsControllerCallbacks());
         mDragController = new TaskbarDragController(mLauncher);
     }
 
@@ -101,7 +116,16 @@ public class TaskbarController {
         return new TaskbarViewCallbacks() {
             @Override
             public View.OnClickListener getItemOnClickListener() {
-                return ItemClickHandler.INSTANCE;
+                return view -> {
+                    Object tag = view.getTag();
+                    if (tag instanceof Task) {
+                        Task task = (Task) tag;
+                        ActivityManagerWrapper.getInstance().startActivityFromRecents(task.key,
+                                ActivityOptions.makeBasic());
+                    } else {
+                        ItemClickHandler.INSTANCE.onClick(view);
+                    }
+                };
             }
 
             @Override
@@ -116,6 +140,23 @@ public class TaskbarController {
             @Override
             public void updateHotseatItems(ItemInfo[] hotseatItemInfos) {
                 mTaskbarView.updateHotseatItems(hotseatItemInfos);
+                mLatestLoadedHotseatItems = hotseatItemInfos;
+                dedupeAndUpdateRecentItems();
+            }
+        };
+    }
+
+    private TaskbarRecentsControllerCallbacks createTaskbarRecentsControllerCallbacks() {
+        return new TaskbarRecentsControllerCallbacks() {
+            @Override
+            public void updateRecentItems(ArrayList<Task> recentTasks) {
+                mLatestLoadedRecentTasks = recentTasks;
+                dedupeAndUpdateRecentItems();
+            }
+
+            @Override
+            public void updateRecentTaskAtIndex(int taskIndex, Task task) {
+                mTaskbarView.updateRecentTaskAtIndex(taskIndex, task);
             }
         };
     }
@@ -124,11 +165,13 @@ public class TaskbarController {
      * Initializes the Taskbar, including adding it to the screen.
      */
     public void init() {
-        mTaskbarView.init(mHotseatController.getNumHotseatIcons());
+        mTaskbarView.init(mHotseatController.getNumHotseatIcons(),
+                mRecentsController.getNumRecentIcons());
         addToWindowManager();
         mTaskbarStateHandler.setTaskbarCallbacks(createTaskbarStateHandlerCallbacks());
         mTaskbarVisibilityController.init();
         mHotseatController.init();
+        mRecentsController.init();
     }
 
     private TaskbarStateHandlerCallbacks createTaskbarStateHandlerCallbacks() {
@@ -149,6 +192,7 @@ public class TaskbarController {
         mTaskbarStateHandler.setTaskbarCallbacks(null);
         mTaskbarVisibilityController.cleanup();
         mHotseatController.cleanup();
+        mRecentsController.cleanup();
     }
 
     private void removeFromWindowManager() {
@@ -246,6 +290,52 @@ public class TaskbarController {
         return mTaskbarView.isDraggingItem();
     }
 
+    private void dedupeAndUpdateRecentItems() {
+        if (mLatestLoadedRecentTasks == null || mLatestLoadedHotseatItems == null) {
+            return;
+        }
+
+        final int numRecentIcons = mRecentsController.getNumRecentIcons();
+
+        // From most recent to least recently opened.
+        List<Task> dedupedTasksInDescendingOrder = new ArrayList<>();
+        for (int i = mLatestLoadedRecentTasks.size() - 1; i >= 0; i--) {
+            Task task = mLatestLoadedRecentTasks.get(i);
+            boolean isTaskInHotseat = false;
+            for (ItemInfo hotseatItem : mLatestLoadedHotseatItems) {
+                if (hotseatItem == null) {
+                    continue;
+                }
+                ComponentName hotseatActivity = hotseatItem.getTargetComponent();
+                if (hotseatActivity != null && task.key.sourceComponent.getPackageName()
+                        .equals(hotseatActivity.getPackageName())) {
+                    isTaskInHotseat = true;
+                    break;
+                }
+            }
+            if (!isTaskInHotseat) {
+                dedupedTasksInDescendingOrder.add(task);
+                if (dedupedTasksInDescendingOrder.size() == numRecentIcons) {
+                    break;
+                }
+            }
+        }
+
+        // TaskbarView expects an array of all the recent tasks to show, in the order to show them.
+        // So we create an array of the proper size, then fill it in such that the most recent items
+        // are at the end. If there aren't enough elements to fill the array, leave them null.
+        Task[] tasksArray = new Task[numRecentIcons];
+        for (int i = 0; i < tasksArray.length; i++) {
+            Task task = i >= dedupedTasksInDescendingOrder.size()
+                    ? null
+                    : dedupedTasksInDescendingOrder.get(i);
+            tasksArray[tasksArray.length - 1 - i] = task;
+        }
+
+        mTaskbarView.updateRecentTasks(tasksArray);
+        mRecentsController.loadIconsForTasks(tasksArray);
+    }
+
     /**
      * @return Whether the given View is in the same window as Taskbar.
      */
@@ -283,4 +373,12 @@ public class TaskbarController {
     protected interface TaskbarHotseatControllerCallbacks {
         void updateHotseatItems(ItemInfo[] hotseatItemInfos);
     }
+
+    /**
+     * Contains methods that TaskbarRecentsController can call to interface with TaskbarController.
+     */
+    protected interface TaskbarRecentsControllerCallbacks {
+        void updateRecentItems(ArrayList<Task> recentTasks);
+        void updateRecentTaskAtIndex(int taskIndex, Task task);
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
index 2318ff96b6..baec8998f3 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
@@ -25,6 +25,7 @@ import android.content.pm.LauncherApps;
 import android.content.res.Resources;
 import android.graphics.Canvas;
 import android.graphics.Point;
+import android.os.UserHandle;
 import android.view.DragEvent;
 import android.view.View;
 
@@ -33,6 +34,7 @@ import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.R;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.system.ClipDescriptionCompat;
 import com.android.systemui.shared.system.LauncherAppsCompat;
 
@@ -102,6 +104,15 @@ public class TaskbarDragController {
                                 item.getIntent().getComponent(), null, item.user));
             }
             intent.putExtra(Intent.EXTRA_USER, item.user);
+        } else if (tag instanceof Task) {
+            Task task = (Task) tag;
+            clipDescription = new ClipDescription(task.titleDescription,
+                    new String[] {
+                            ClipDescriptionCompat.MIMETYPE_APPLICATION_TASK
+                    });
+            intent = new Intent();
+            intent.putExtra(ClipDescriptionCompat.EXTRA_TASK_ID, task.key.id);
+            intent.putExtra(Intent.EXTRA_USER, UserHandle.of(task.key.userId));
         }
 
         if (clipDescription != null && intent != null) {
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarRecentsController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarRecentsController.java
new file mode 100644
index 0000000000..9d4e000da0
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarRecentsController.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.taskbar;
+
+import com.android.launcher3.BaseQuickstepLauncher;
+import com.android.quickstep.RecentsModel;
+import com.android.quickstep.util.CancellableTask;
+import com.android.systemui.shared.recents.model.Task;
+import com.android.systemui.shared.system.TaskStackChangeListener;
+import com.android.systemui.shared.system.TaskStackChangeListeners;
+
+import java.util.ArrayList;
+
+/**
+ * Works with TaskbarController to update the TaskbarView's Recent items.
+ */
+public class TaskbarRecentsController {
+
+    private final int mNumRecentIcons = 2;
+    private final BaseQuickstepLauncher mLauncher;
+    private final TaskbarController.TaskbarRecentsControllerCallbacks mTaskbarCallbacks;
+    private final RecentsModel mRecentsModel;
+
+    private final TaskStackChangeListener mTaskStackChangeListener = new TaskStackChangeListener() {
+        @Override
+        public void onTaskStackChanged() {
+            reloadRecentTasksIfNeeded();
+        }
+    };
+
+    // TODO: add TaskbarVisualsChangedListener as well (for calendar/clock?)
+
+    // Used to keep track of the last requested task list id, so that we do not request to load the
+    // tasks again if we have already requested it and the task list has not changed
+    private int mTaskListChangeId = -1;
+
+    // The current background requests to load the task icons
+    private CancellableTask[] mIconLoadRequests = new CancellableTask[mNumRecentIcons];
+
+    public TaskbarRecentsController(BaseQuickstepLauncher launcher,
+            TaskbarController.TaskbarRecentsControllerCallbacks taskbarCallbacks) {
+        mLauncher = launcher;
+        mTaskbarCallbacks = taskbarCallbacks;
+        mRecentsModel = RecentsModel.INSTANCE.get(mLauncher);
+    }
+
+    protected void init() {
+        TaskStackChangeListeners.getInstance().registerTaskStackListener(mTaskStackChangeListener);
+        reloadRecentTasksIfNeeded();
+    }
+
+    protected void cleanup() {
+        TaskStackChangeListeners.getInstance().unregisterTaskStackListener(
+                mTaskStackChangeListener);
+        cancelAllPendingIconLoadTasks();
+    }
+
+    private void reloadRecentTasksIfNeeded() {
+        if (!mRecentsModel.isTaskListValid(mTaskListChangeId)) {
+            mTaskListChangeId = mRecentsModel.getTasks(this::onRecentTasksChanged);
+        }
+    }
+
+    private void cancelAllPendingIconLoadTasks() {
+        for (int i = 0; i < mIconLoadRequests.length; i++) {
+            if (mIconLoadRequests[i] != null) {
+                mIconLoadRequests[i].cancel();
+            }
+            mIconLoadRequests[i] = null;
+        }
+    }
+
+    private void onRecentTasksChanged(ArrayList<Task> tasks) {
+        mTaskbarCallbacks.updateRecentItems(tasks);
+    }
+
+    /**
+     * For each Task, loads its icon from the cache in the background, then calls
+     * {@link TaskbarController.TaskbarRecentsControllerCallbacks#updateRecentTaskAtIndex}.
+     */
+    protected void loadIconsForTasks(Task[] tasks) {
+        cancelAllPendingIconLoadTasks();
+        for (int i = 0; i < tasks.length; i++) {
+            Task task = tasks[i];
+            if (task == null) {
+                continue;
+            }
+            final int taskIndex = i;
+            mIconLoadRequests[i] = mRecentsModel.getIconCache().updateIconInBackground(
+                    task, updatedTask -> onTaskIconLoaded(task, taskIndex));
+        }
+    }
+
+    private void onTaskIconLoaded(Task task, int taskIndex) {
+        mTaskbarCallbacks.updateRecentTaskAtIndex(taskIndex, task);
+    }
+
+    protected int getNumRecentIcons() {
+        return mNumRecentIcons;
+    }
+}
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
index c98f09ca0f..d8f3bb595e 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
@@ -19,6 +19,7 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.RectF;
 import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.DragEvent;
 import android.view.LayoutInflater;
@@ -35,6 +36,7 @@ import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.R;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.systemui.shared.recents.model.Task;
 
 /**
  * Hosts the Taskbar content such as Hotseat and Recent Apps. Drawn on top of other apps.
@@ -52,6 +54,9 @@ public class TaskbarView extends LinearLayout {
     // Initialized in init().
     private int mHotseatStartIndex;
     private int mHotseatEndIndex;
+    private View mHotseatRecentsDivider;
+    private int mRecentsStartIndex;
+    private int mRecentsEndIndex;
 
     private TaskbarController.TaskbarViewCallbacks mControllerCallbacks;
 
@@ -89,10 +94,17 @@ public class TaskbarView extends LinearLayout {
         mControllerCallbacks = taskbarViewCallbacks;
     }
 
-    protected void init(int numHotseatIcons) {
+    protected void init(int numHotseatIcons, int numRecentIcons) {
         mHotseatStartIndex = 0;
         mHotseatEndIndex = mHotseatStartIndex + numHotseatIcons - 1;
         updateHotseatItems(new ItemInfo[numHotseatIcons]);
+
+        int dividerIndex = mHotseatEndIndex + 1;
+        mHotseatRecentsDivider = addDivider(dividerIndex);
+
+        mRecentsStartIndex = dividerIndex + 1;
+        mRecentsEndIndex = mRecentsStartIndex + numRecentIcons - 1;
+        updateRecentTasks(new Task[numRecentIcons]);
     }
 
     protected void cleanup() {
@@ -147,6 +159,93 @@ public class TaskbarView extends LinearLayout {
                 hotseatView.setOnLongClickListener(null);
             }
         }
+
+        updateHotseatRecentsDividerVisibility();
+    }
+
+    private View addDivider(int dividerIndex) {
+        View divider = inflate(R.layout.taskbar_divider);
+        addView(divider, dividerIndex);
+        return divider;
+    }
+
+    /**
+     * Inflates/binds the Recents items to show in the Taskbar given their Tasks.
+     */
+    protected void updateRecentTasks(Task[] tasks) {
+        for (int i = 0; i < tasks.length; i++) {
+            Task task = tasks[i];
+            int recentsIndex = mRecentsStartIndex + i;
+            View recentsView = getChildAt(recentsIndex);
+
+            // Inflate empty icon Views.
+            if (recentsView == null) {
+                BubbleTextView btv = (BubbleTextView) inflate(R.layout.taskbar_app_icon);
+                LayoutParams lp = new LayoutParams(btv.getIconSize(), btv.getIconSize());
+                lp.setMargins(mItemMarginLeftRight, 0, mItemMarginLeftRight, 0);
+                recentsView = btv;
+                addView(recentsView, recentsIndex, lp);
+            }
+
+            // Apply the Task, or hide the view if there is none for a given index.
+            if (recentsView instanceof BubbleTextView && task != null) {
+                applyTaskToBubbleTextView((BubbleTextView) recentsView, task);
+                recentsView.setVisibility(VISIBLE);
+                recentsView.setOnClickListener(mControllerCallbacks.getItemOnClickListener());
+                recentsView.setOnLongClickListener(
+                        mControllerCallbacks.getItemOnLongClickListener());
+            } else {
+                recentsView.setVisibility(GONE);
+                recentsView.setOnClickListener(null);
+                recentsView.setOnLongClickListener(null);
+            }
+        }
+
+        updateHotseatRecentsDividerVisibility();
+    }
+
+    private void applyTaskToBubbleTextView(BubbleTextView btv, Task task) {
+        if (task.icon != null) {
+            Drawable icon = task.icon.getConstantState().newDrawable().mutate();
+            btv.applyIconAndLabel(icon, task.titleDescription);
+        }
+        btv.setTag(task);
+    }
+
+    protected void updateRecentTaskAtIndex(int taskIndex, Task task) {
+        View taskView = getChildAt(mRecentsStartIndex + taskIndex);
+        if (taskView instanceof BubbleTextView) {
+            applyTaskToBubbleTextView((BubbleTextView) taskView, task);
+        }
+    }
+
+    /**
+     * Make the divider VISIBLE between the Hotseat and Recents if there is at least one icon in
+     * each, otherwise make it GONE.
+     */
+    private void updateHotseatRecentsDividerVisibility() {
+        if (mHotseatRecentsDivider == null) {
+            return;
+        }
+
+        boolean hasAtLeastOneHotseatItem = false;
+        for (int i = mHotseatStartIndex; i <= mHotseatEndIndex; i++) {
+            if (getChildAt(i).getVisibility() != GONE) {
+                hasAtLeastOneHotseatItem = true;
+                break;
+            }
+        }
+
+        boolean hasAtLeastOneRecentItem = false;
+        for (int i = mRecentsStartIndex; i <= mRecentsEndIndex; i++) {
+            if (getChildAt(i).getVisibility() != GONE) {
+                hasAtLeastOneRecentItem = true;
+                break;
+            }
+        }
+
+        mHotseatRecentsDivider.setVisibility(hasAtLeastOneHotseatItem && hasAtLeastOneRecentItem
+                ? VISIBLE : GONE);
     }
 
     @Override
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 5007ffc7be..6f446ad910 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -358,6 +358,16 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         }
     }
 
+    /**
+     * Directly set the icon and label.
+     */
+    @UiThread
+    public void applyIconAndLabel(Drawable icon, CharSequence label) {
+        setIcon(icon);
+        setText(label);
+        setContentDescription(label);
+    }
+
     /**
      * Overrides the default long press timeout.
      */
-- 
GitLab


From 4e2c25a788f1b0eae6a472c6749fdadfcf046b84 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Wed, 3 Feb 2021 16:20:04 +0000
Subject: [PATCH 0467/1664] Ensure isTablet is only enable when simulated
 landscape is disabled

- Tablet UI (e.g. grid overview and two panel workspace) is built with assumption that simulated landscape is disabled, make sure this is the case in DeviceProfile
- This is usually true as swDPs is generally smaller than sw used to determine xml files

Bug: 174464656
Test: Try different combination of smallest width and Display Size, isTablet is only set when allow_rotation is true
Change-Id: I3ee1c76909f29b6f14c4032be812bb8c9ea7e827
---
 src/com/android/launcher3/DeviceProfile.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index f681d75eef..4d5bd5d95f 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -168,8 +168,10 @@ public class DeviceProfile {
         // Constants from resources
         float swDPs = Utilities.dpiFromPx(
                 Math.min(info.smallestSize.x, info.smallestSize.y), info.metrics);
-        isTablet = swDPs >= TABLET_MIN_DPS;
-        isLargeTablet = swDPs >= LARGE_TABLET_MIN_DPS;
+        boolean allowRotation = context.getResources().getBoolean(R.bool.allow_rotation);
+        // Tablet UI is built with assumption that simulated landscape is disabled.
+        isTablet = allowRotation && swDPs >= TABLET_MIN_DPS;
+        isLargeTablet = isTablet && swDPs >= LARGE_TABLET_MIN_DPS;
         isPhone = !isTablet && !isLargeTablet;
         aspectRatio = ((float) Math.max(widthPx, heightPx)) / Math.min(widthPx, heightPx);
         boolean isTallDevice = Float.compare(aspectRatio, TALL_DEVICE_ASPECT_RATIO_THRESHOLD) >= 0;
-- 
GitLab


From 63fc59b80108125eb405af7f245cc9711634ec5e Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Thu, 4 Feb 2021 08:36:08 -0800
Subject: [PATCH 0468/1664] Use SYSTEM_APPLICATION_OVERLAY instead of
 SYSTEM_ALERT_WINDOW for Taskbar

Test: Taskbar still shows up and works, can't hide it from Settings
Bug: 169054709
Change-Id: I0d2f9be8a0af2242472d8406bbc31a6aecaa9285
---
 quickstep/AndroidManifest.xml                                   | 2 +-
 .../src/com/android/launcher3/taskbar/TaskbarController.java    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml
index 9c14b8510e..7431551710 100644
--- a/quickstep/AndroidManifest.xml
+++ b/quickstep/AndroidManifest.xml
@@ -41,7 +41,7 @@
     <uses-permission android:name="android.permission.MANAGE_ACCESSIBILITY"/>
 
     <uses-permission android:name="${packageName}.permission.HOTSEAT_EDU" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+    <uses-permission android:name="android.permission.SYSTEM_APPLICATION_OVERLAY" />
 
     <application android:backupAgent="com.android.launcher3.LauncherBackupAgent"
          android:fullBackupOnly="true"
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index 6a74aac2ba..2433e77916 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -218,6 +218,7 @@ public class TaskbarController {
         mWindowLayoutParams.setFitInsetsTypes(0);
         mWindowLayoutParams.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING;
         mWindowLayoutParams.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
+        mWindowLayoutParams.setSystemApplicationOverlay(true);
 
         WindowManagerWrapper wmWrapper = WindowManagerWrapper.getInstance();
         wmWrapper.setProvidesInsetsTypes(
-- 
GitLab


From 3a39b564349cf87d45f7181e6b3d1555ccbd1c5b Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Thu, 4 Feb 2021 13:05:07 -0600
Subject: [PATCH 0469/1664] Only show OOBE once

Bug: 179333425
Test: Manual
Change-Id: I23de8fffa31ae06b0f4feccfb75144c7c55143c2
---
 .../launcher3/search/DeviceSearchEdu.java        | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/search/DeviceSearchEdu.java b/quickstep/src/com/android/launcher3/search/DeviceSearchEdu.java
index 425e557ecb..71270cc94a 100644
--- a/quickstep/src/com/android/launcher3/search/DeviceSearchEdu.java
+++ b/quickstep/src/com/android/launcher3/search/DeviceSearchEdu.java
@@ -73,11 +73,9 @@ public class DeviceSearchEdu extends AbstractSlideInView implements
     }
 
 
-    private void close(boolean animate, boolean markAsSeen) {
-        handleClose(animate);
-        if (markAsSeen) {
-            mLauncher.getOnboardingPrefs().markChecked(SEARCH_EDU_SEEN);
-        }
+    private void dismiss() {
+        handleClose(true);
+        mLauncher.getOnboardingPrefs().markChecked(SEARCH_EDU_SEEN);
     }
 
     @Override
@@ -110,7 +108,7 @@ public class DeviceSearchEdu extends AbstractSlideInView implements
 
         findViewById(R.id.dismiss_edu).setOnClickListener((view) -> {
             mSwitchFocusOnDismiss = true;
-            close(true, true);
+            dismiss();
         });
     }
 
@@ -176,7 +174,7 @@ public class DeviceSearchEdu extends AbstractSlideInView implements
 
     @Override
     public void onStateTransitionStart(LauncherState toState) {
-        close(true, false);
+        dismiss();
     }
 
     @Override
@@ -203,7 +201,7 @@ public class DeviceSearchEdu extends AbstractSlideInView implements
         if (mSearchInput != null) {
             mSearchInput.setText(charSequence.toString());
             mSwitchFocusOnDismiss = true;
-            close(true, true);
+            dismiss();
         }
     }
 
@@ -215,7 +213,7 @@ public class DeviceSearchEdu extends AbstractSlideInView implements
     @Override
     public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) {
         mSearchInput.onEditorAction(i);
-        close(true, true);
+        dismiss();
         return true;
     }
 }
-- 
GitLab


From 79e52fc23b68d300b497c1506aeeb9727ac25f39 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 3 Feb 2021 10:22:28 -0800
Subject: [PATCH 0470/1664] Moving slice loading on a background thread

> Also fixing slice icon loading, such that the request is cancelled
  if views are recycled quickly
> Loading widget label on dg thread and cancelling request if views
  are recycled quickly.

Bug: 179068415
Test: verified locally
Change-Id: Id5a524e2bf596862330a8170394aef9ffd708544
---
 .../search/SearchResultIconSlice.java         |  38 +--
 .../launcher3/search/SearchResultWidget.java  |  31 ++-
 src/com/android/launcher3/BubbleTextView.java |   4 +-
 src/com/android/launcher3/Launcher.java       |  27 +--
 .../allapps/AllAppsTransitionController.java  |   3 -
 .../allapps/search/LiveSearchManager.java     | 220 ++++++++++++++----
 .../search/SearchWidgetInfoContainer.java     |   6 -
 .../android/launcher3/icons/IconCache.java    |  35 ++-
 8 files changed, 235 insertions(+), 129 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java b/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java
index c441e2291b..4bf34324a7 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java
@@ -15,28 +15,22 @@
  */
 package com.android.launcher3.search;
 
-import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
-
 import android.app.search.SearchTarget;
 import android.app.search.SearchTargetEvent;
 import android.content.Context;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.lifecycle.LiveData;
-import androidx.slice.Slice;
 import androidx.slice.SliceItem;
 import androidx.slice.widget.EventInfo;
 import androidx.slice.widget.SliceView;
 
 import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.model.data.PackageItemInfo;
+import com.android.launcher3.util.SafeCloseable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -47,13 +41,11 @@ import java.util.List;
 public class SearchResultIconSlice extends LinearLayout implements SearchTargetHandler,
         SliceView.OnSliceActionListener {
 
-    private static final String TAG = "SearchSliceController";
-
     private final Launcher mLauncher;
 
     private SliceView mSliceView;
     private SearchResultIcon mIcon;
-    private LiveData<Slice> mSliceLiveData;
+    private SafeCloseable mSliceSession;
     private String mTargetId;
 
     public SearchResultIconSlice(Context context) {
@@ -87,26 +79,20 @@ public class SearchResultIconSlice extends LinearLayout implements SearchTargetH
         mTargetId = parentTarget.getId();
         reset();
         updateIcon(parentTarget, children);
-        try {
-            mSliceLiveData = mLauncher.getLiveSearchManager().getSliceForUri(
-                    parentTarget.getSliceUri());
-            mSliceLiveData.observe(mLauncher, mSliceView);
-        } catch (Exception ex) {
-            Log.e(TAG, "unable to bind slice", ex);
-        }
+        mSliceSession = mLauncher.getLiveSearchManager()
+                .addObserver(parentTarget.getSliceUri(), mSliceView);
     }
 
     private void updateIcon(SearchTarget parentTarget, List<SearchTarget> children) {
         if (children.size() == 1) {
             mIcon.apply(children.get(0), new ArrayList<>());
         } else {
-            LauncherAppState appState = LauncherAppState.getInstance(getContext());
-            MODEL_EXECUTOR.post(() -> {
-                PackageItemInfo pkgItem = new PackageItemInfo(parentTarget.getPackageName());
-                pkgItem.user = parentTarget.getUserHandle();
-                appState.getIconCache().getTitleAndIconForApp(pkgItem, false);
-                MAIN_EXECUTOR.post(() -> mIcon.applyFromItemInfoWithIcon(pkgItem));
-            });
+            PackageItemInfo pkgItem = new PackageItemInfo(parentTarget.getPackageName());
+            pkgItem.user = parentTarget.getUserHandle();
+            if (!pkgItem.equals(mIcon.getTag())) {
+                // The icon will load and apply high res icon automatically
+                mIcon.applyFromItemInfoWithIcon(pkgItem);
+            }
         }
     }
 
@@ -124,8 +110,8 @@ public class SearchResultIconSlice extends LinearLayout implements SearchTargetH
 
     private void reset() {
         mSliceView.setOnSliceActionListener(null);
-        if (mSliceLiveData != null) {
-            mSliceLiveData.removeObservers(mLauncher);
+        if (mSliceSession != null) {
+            mSliceSession.close();
         }
     }
 
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultWidget.java b/quickstep/src/com/android/launcher3/search/SearchResultWidget.java
index 4c64265cc3..e22f6ab992 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultWidget.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultWidget.java
@@ -15,6 +15,9 @@
  */
 package com.android.launcher3.search;
 
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
+
 import android.app.search.SearchTarget;
 import android.app.search.SearchTargetEvent;
 import android.appwidget.AppWidgetHostView;
@@ -36,16 +39,19 @@ import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.CheckLongPressHelper;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.allapps.search.SearchWidgetInfoContainer;
 import com.android.launcher3.dragndrop.DraggableView;
+import com.android.launcher3.icons.cache.HandlerRunnable;
 import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.touch.ItemLongClickListener;
 import com.android.launcher3.widget.PendingAddWidgetInfo;
 
 import java.util.List;
 
-
 /**
  * displays live version of a widget upon receiving {@link AppWidgetProviderInfo} from Search
  * provider
@@ -63,6 +69,7 @@ public class SearchResultWidget extends LinearLayout implements SearchTargetHand
     private final float mScaleToFit;
 
     private SearchWidgetInfoContainer mInfoContainer;
+    private HandlerRunnable mLabelRequest;
     private BubbleTextView mWidgetProvider;
     private TextView mWidgetLabel;
 
@@ -124,11 +131,18 @@ public class SearchResultWidget extends LinearLayout implements SearchTargetHand
     }
 
     private void showWidgetInfo(AppWidgetProviderInfo providerInfo) {
-        String title = providerInfo.loadLabel(mLauncher.getPackageManager());
         PackageItemInfo pinfo = new PackageItemInfo(providerInfo.provider.getPackageName());
         pinfo.user = providerInfo.getProfile();
         mWidgetProvider.applyFromItemInfoWithIcon(pinfo);
-        mWidgetLabel.setText(title);
+
+        mLabelRequest = new HandlerRunnable<>(
+                MODEL_EXECUTOR.getHandler(),
+                () -> LauncherAppState.getInstance(mLauncher).getIconCache()
+                        .getTitleNoCache(LauncherAppWidgetProviderInfo
+                                .fromProviderInfo(mLauncher, providerInfo)),
+                MAIN_EXECUTOR,
+                mWidgetLabel::setText);
+        Utilities.postAsyncCallback(MODEL_EXECUTOR.getHandler(), mLabelRequest);
     }
 
     /**
@@ -137,9 +151,20 @@ public class SearchResultWidget extends LinearLayout implements SearchTargetHand
     public void removeListener() {
         if (mInfoContainer != null) {
             mInfoContainer.detachWidget(mHostView);
+            mInfoContainer = null;
+        }
+        if (mLabelRequest != null) {
+            mLabelRequest.cancel();
+            mLabelRequest = null;
         }
     }
 
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        removeListener();
+    }
+
     private void reportEvent(int eventType) {
         SearchSessionTracker.INSTANCE.get(getContext()).notifyEvent(
                 new SearchTargetEvent.Builder("search target id", eventType).build());
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 5007ffc7be..2367249163 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -66,9 +66,9 @@ import com.android.launcher3.graphics.IconShape;
 import com.android.launcher3.graphics.PlaceHolderIconDrawable;
 import com.android.launcher3.graphics.PreloadIconDrawable;
 import com.android.launcher3.icons.DotRenderer;
-import com.android.launcher3.icons.IconCache.IconLoadRequest;
 import com.android.launcher3.icons.IconCache.ItemInfoUpdateReceiver;
 import com.android.launcher3.icons.LauncherIcons;
+import com.android.launcher3.icons.cache.HandlerRunnable;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
@@ -171,7 +171,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
     @ViewDebug.ExportedProperty(category = "launcher")
     private boolean mDisableRelayout = false;
 
-    private IconLoadRequest mIconLoadRequest;
+    private HandlerRunnable mIconLoadRequest;
 
     private boolean mEnableIconUpdateAnimation = false;
 
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 2334267fd9..36963f19dd 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -98,13 +98,9 @@ import android.widget.ImageView;
 import android.widget.Toast;
 
 import androidx.annotation.CallSuper;
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.annotation.VisibleForTesting;
-import androidx.lifecycle.Lifecycle;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.lifecycle.LifecycleRegistry;
 
 import com.android.launcher3.DropTarget.DragObject;
 import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
@@ -211,8 +207,7 @@ import java.util.stream.Stream;
  * Default launcher application.
  */
 public class Launcher extends StatefulActivity<LauncherState> implements LauncherExterns,
-        Callbacks, InvariantDeviceProfile.OnIDPChangeListener, PluginListener<OverlayPlugin>,
-        LifecycleOwner {
+        Callbacks, InvariantDeviceProfile.OnIDPChangeListener, PluginListener<OverlayPlugin> {
     public static final String TAG = "Launcher";
 
     public static final ActivityTracker<Launcher> ACTIVITY_TRACKER = new ActivityTracker<>();
@@ -275,8 +270,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     private LauncherAppTransitionManager mAppTransitionManager;
     private Configuration mOldConfig;
 
-    private LifecycleRegistry mLifecycleRegistry;
-
     private LiveSearchManager mLiveSearchManager;
 
     @Thunk
@@ -392,12 +385,12 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         mIconCache = app.getIconCache();
         mAccessibilityDelegate = new LauncherAccessibilityDelegate(this);
 
-        mLiveSearchManager = new LiveSearchManager(this);
-
         mDragController = new DragController(this);
         mAllAppsController = new AllAppsTransitionController(this);
         mStateManager = new StateManager<>(this, NORMAL);
 
+        mLiveSearchManager = new LiveSearchManager(this);
+
         mOnboardingPrefs = createOnboardingPrefs(mSharedPrefs);
 
         mAppWidgetManager = new WidgetManagerHelper(this);
@@ -486,15 +479,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         if (Utilities.ATLEAST_R) {
             getWindow().setSoftInputMode(LayoutParams.SOFT_INPUT_ADJUST_NOTHING);
         }
-
-        mLifecycleRegistry = new LifecycleRegistry(this);
-        mLifecycleRegistry.setCurrentState(Lifecycle.State.CREATED);
-    }
-
-    @NonNull
-    @Override
-    public Lifecycle getLifecycle() {
-        return mLifecycleRegistry;
     }
 
     public LiveSearchManager getLiveSearchManager() {
@@ -913,7 +897,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
     @Override
     protected void onStop() {
-        mLifecycleRegistry.setCurrentState(Lifecycle.State.CREATED);
         super.onStop();
         if (mDeferOverlayCallbacks) {
             checkIfOverlayStillDeferred();
@@ -937,7 +920,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
         mAppWidgetHost.setListenIfResumed(true);
         TraceHelper.INSTANCE.endSection(traceToken);
-        mLifecycleRegistry.setCurrentState(Lifecycle.State.STARTED);
     }
 
     @Override
@@ -1091,7 +1073,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         }
 
         TraceHelper.INSTANCE.endSection(traceToken);
-        mLifecycleRegistry.setCurrentState(Lifecycle.State.RESUMED);
     }
 
     @Override
@@ -1099,7 +1080,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         // Ensure that items added to Launcher are queued until Launcher returns
         ItemInstallQueue.INSTANCE.get(this).pauseModelPush(FLAG_ACTIVITY_PAUSED);
 
-        mLifecycleRegistry.setCurrentState(Lifecycle.State.STARTED);
         super.onPause();
         mDragController.cancelDrag();
         mLastTouchUpTime = -1;
@@ -1598,7 +1578,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         mAppTransitionManager.unregisterRemoteAnimations();
         mAppTransitionManager.unregisterRemoteTransitions();
         mUserChangedCallbackCloseable.close();
-        mLifecycleRegistry.setCurrentState(Lifecycle.State.DESTROYED);
         mLiveSearchManager.stop();
     }
 
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 2f805fd550..a4e1f271fb 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -268,13 +268,10 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
                 && !FeatureFlags.DISABLE_INITIAL_IME_IN_ALLAPPS.get() && BuildCompat.isAtLeastR()) {
             mInsetController.onAnimationEnd(mProgress);
             if (Float.compare(mProgress, 0f) == 0) {
-                mLauncher.getLiveSearchManager().start();
                 EditText editText = mAppsView.getSearchUiManager().getEditText();
                 if (editText != null && !mInsetController.showSearchEduIfNecessary()) {
                     editText.requestFocus();
                 }
-            } else {
-                mLauncher.getLiveSearchManager().stop();
             }
             // TODO: should make the controller hide synchronously
         }
diff --git a/src/com/android/launcher3/allapps/search/LiveSearchManager.java b/src/com/android/launcher3/allapps/search/LiveSearchManager.java
index c2f0b960c8..71aedb8272 100644
--- a/src/com/android/launcher3/allapps/search/LiveSearchManager.java
+++ b/src/com/android/launcher3/allapps/search/LiveSearchManager.java
@@ -15,8 +15,14 @@
  */
 package com.android.launcher3.allapps.search;
 
+import static com.android.launcher3.LauncherState.ALL_APPS;
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+import static com.android.launcher3.util.Executors.THREAD_POOL_EXECUTOR;
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.launcher3.widget.WidgetHostViewLoader.getDefaultOptionsForWidget;
 
+import android.app.Activity;
+import android.app.Application.ActivityLifecycleCallbacks;
 import android.appwidget.AppWidgetHost;
 import android.appwidget.AppWidgetHostView;
 import android.appwidget.AppWidgetManager;
@@ -26,39 +32,49 @@ import android.content.Context;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.UserHandle;
+import android.util.Log;
 
-import androidx.lifecycle.LiveData;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
+import androidx.annotation.WorkerThread;
+import androidx.lifecycle.Observer;
 import androidx.slice.Slice;
-import androidx.slice.widget.SliceLiveData;
+import androidx.slice.SliceViewManager;
+import androidx.slice.SliceViewManager.SliceCallback;
 
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppWidgetProviderInfo;
+import com.android.launcher3.LauncherState;
 import com.android.launcher3.logging.InstanceId;
-import com.android.launcher3.logging.InstanceIdSequence;
+import com.android.launcher3.statemanager.StateManager.StateListener;
 import com.android.launcher3.util.ComponentKey;
+import com.android.launcher3.util.SafeCloseable;
 import com.android.launcher3.widget.PendingAddWidgetInfo;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Optional;
 
 /**
  * Manages Lifecycle for Live search results
  */
-public class LiveSearchManager {
+public class LiveSearchManager implements StateListener<LauncherState> {
+
+    private static final String TAG = "LiveSearchManager";
 
     public static final int SEARCH_APPWIDGET_HOST_ID = 2048;
 
     private final Launcher mLauncher;
-    private final AppWidgetManager mAppWidgetManger;
+    private final HashMap<Uri, SliceLifeCycle> mUriSliceMap = new HashMap<>();
+
     private final HashMap<ComponentKey, SearchWidgetInfoContainer> mWidgetPlaceholders =
             new HashMap<>();
-    private final HashMap<Uri, LiveData<Slice>> mUriSliceMap = new HashMap<>();
     private SearchWidgetHost mSearchWidgetHost;
     private InstanceId mLogInstanceId;
 
     public LiveSearchManager(Launcher launcher) {
         mLauncher = launcher;
-        mAppWidgetManger = AppWidgetManager.getInstance(launcher);
+        mLauncher.getStateManager().addStateListener(this);
     }
 
     /**
@@ -67,78 +83,80 @@ public class LiveSearchManager {
      */
     public SearchWidgetInfoContainer getPlaceHolderWidget(AppWidgetProviderInfo providerInfo) {
         if (mSearchWidgetHost == null) {
-            throw new RuntimeException("AppWidgetHost has not been created yet");
+            mSearchWidgetHost = new SearchWidgetHost(mLauncher);
+            mSearchWidgetHost.startListening();
         }
 
         ComponentName provider = providerInfo.provider;
         UserHandle userHandle = providerInfo.getProfile();
 
         ComponentKey key = new ComponentKey(provider, userHandle);
-        SearchWidgetInfoContainer view = mWidgetPlaceholders.getOrDefault(key, null);
         if (mWidgetPlaceholders.containsKey(key)) {
             return mWidgetPlaceholders.get(key);
         }
+
         LauncherAppWidgetProviderInfo pinfo = LauncherAppWidgetProviderInfo.fromProviderInfo(
                 mLauncher, providerInfo);
         PendingAddWidgetInfo pendingAddWidgetInfo = new PendingAddWidgetInfo(pinfo);
 
         Bundle options = getDefaultOptionsForWidget(mLauncher, pendingAddWidgetInfo);
         int appWidgetId = mSearchWidgetHost.allocateAppWidgetId();
-        boolean success = mAppWidgetManger.bindAppWidgetIdIfAllowed(appWidgetId, userHandle,
-                provider, options);
+        boolean success = AppWidgetManager.getInstance(mLauncher)
+                .bindAppWidgetIdIfAllowed(appWidgetId, userHandle, provider, options);
         if (!success) {
+            mSearchWidgetHost.deleteAppWidgetId(appWidgetId);
             mWidgetPlaceholders.put(key, null);
             return null;
         }
 
-        view = (SearchWidgetInfoContainer) mSearchWidgetHost.createView(mLauncher, appWidgetId,
-                providerInfo);
+        SearchWidgetInfoContainer view = (SearchWidgetInfoContainer) mSearchWidgetHost.createView(
+                mLauncher, appWidgetId, providerInfo);
         view.setTag(pendingAddWidgetInfo);
         mWidgetPlaceholders.put(key, view);
         return view;
     }
 
-    /**
-     * Creates {@link LiveData<Slice>} from Slice Uri. Caches created live data to be reused
-     * within the same search session. Removes previous observers when new SliceView request a
-     * live data for observation.
-     */
-    public LiveData<Slice> getSliceForUri(Uri sliceUri) {
-        LiveData<Slice> sliceLiveData = mUriSliceMap.getOrDefault(sliceUri, null);
-        if (sliceLiveData == null) {
-            sliceLiveData = SliceLiveData.fromUri(mLauncher, sliceUri);
-            mUriSliceMap.put(sliceUri, sliceLiveData);
-        }
-        return sliceLiveData;
-    }
-
-    /**
-     * Start search session
-     */
-    public void start() {
-        stop();
-        mLogInstanceId = new InstanceIdSequence().newInstanceId();
-        mSearchWidgetHost = new SearchWidgetHost(mLauncher);
-        mSearchWidgetHost.startListening();
-    }
-
     /**
      * Stop search session
      */
     public void stop() {
+        clearWidgetHost();
+    }
+
+    private void clearWidgetHost() {
         if (mSearchWidgetHost != null) {
             mSearchWidgetHost.stopListening();
+            mSearchWidgetHost.clearViews();
             mSearchWidgetHost.deleteHost();
-            for (SearchWidgetInfoContainer placeholder : mWidgetPlaceholders.values()) {
-                placeholder.clearListeners();
-            }
             mWidgetPlaceholders.clear();
             mSearchWidgetHost = null;
         }
-        for (LiveData<Slice> liveData : mUriSliceMap.values()) {
-            liveData.removeObservers(mLauncher);
+    }
+
+    @Override
+    public void onStateTransitionComplete(LauncherState finalState) {
+        if (finalState != ALL_APPS) {
+            // Clear all search session related objects
+            mUriSliceMap.values().forEach(SliceLifeCycle::destroy);
+            mUriSliceMap.clear();
+
+            clearWidgetHost();
         }
-        mUriSliceMap.clear();
+    }
+
+    /**
+     * Adds a new observer for the provided uri and returns a callback to cancel this observer
+     */
+    public SafeCloseable addObserver(Uri uri, Observer<Slice> listener) {
+        SliceLifeCycle slc = mUriSliceMap.get(uri);
+        if (slc == null) {
+            slc = new SliceLifeCycle(uri, mLauncher);
+            mUriSliceMap.put(uri, slc);
+        }
+        slc.addListener(listener);
+
+        final SliceLifeCycle sliceLifeCycle = slc;
+        return () -> sliceLifeCycle.removeListener(listener);
     }
 
     /**
@@ -159,5 +177,121 @@ public class LiveSearchManager {
                 AppWidgetProviderInfo appWidget) {
             return new SearchWidgetInfoContainer(context);
         }
+
+        @Override
+        public void clearViews() {
+            super.clearViews();
+        }
+    }
+
+    private static class SliceLifeCycle
+            implements ActivityLifecycleCallbacks, SliceCallback {
+
+        private final Uri mUri;
+        private final Launcher mLauncher;
+        private final SliceViewManager mSliceViewManager;
+        private final ArrayList<Observer<Slice>> mListeners = new ArrayList<>();
+
+        private boolean mDestroyed = false;
+        private boolean mWasListening = false;
+
+        SliceLifeCycle(Uri uri, Launcher launcher) {
+            mUri = uri;
+            mLauncher = launcher;
+            mSliceViewManager = SliceViewManager.getInstance(launcher);
+            launcher.registerActivityLifecycleCallbacks(this);
+
+            if (launcher.isDestroyed()) {
+                onActivityDestroyed(launcher);
+            } else if (launcher.isStarted()) {
+                onActivityStarted(launcher);
+            }
+        }
+
+        @Override
+        public void onActivityDestroyed(Activity activity) {
+            destroy();
+        }
+
+        @Override
+        public void onActivityStarted(Activity activity) {
+            updateListening();
+        }
+
+        @Override
+        public void onActivityStopped(Activity activity) {
+            updateListening();
+        }
+
+        private void updateListening() {
+            boolean isListening = mDestroyed
+                    ? false
+                    : (mLauncher.isStarted() && !mListeners.isEmpty());
+            UI_HELPER_EXECUTOR.execute(() -> uploadListeningBg(isListening));
+        }
+
+        @WorkerThread
+        private void uploadListeningBg(boolean isListening) {
+            if (mWasListening != isListening) {
+                mWasListening = isListening;
+                if (isListening) {
+                    mSliceViewManager.registerSliceCallback(mUri, MAIN_EXECUTOR, this);
+                    // Update slice one-time on the different thread so that we can display
+                    // multiple slices in parallel
+                    THREAD_POOL_EXECUTOR.execute(this::updateSlice);
+                } else {
+                    mSliceViewManager.unregisterSliceCallback(mUri, this);
+                }
+            }
+        }
+
+        @UiThread
+        private void addListener(Observer<Slice> listener) {
+            mListeners.add(listener);
+            updateListening();
+        }
+
+        @UiThread
+        private void removeListener(Observer<Slice> listener) {
+            mListeners.remove(listener);
+            updateListening();
+        }
+
+        @WorkerThread
+        private void updateSlice() {
+            try {
+                Slice s = mSliceViewManager.bindSlice(mUri);
+                MAIN_EXECUTOR.execute(() -> onSliceUpdated(s));
+            } catch (Exception e) {
+                Log.d(TAG, "Error fetching slice", e);
+            }
+        }
+
+        @UiThread
+        @Override
+        public void onSliceUpdated(@Nullable Slice s) {
+            mListeners.forEach(l -> l.onChanged(s));
+        }
+
+        private void destroy() {
+            if (mDestroyed) {
+                return;
+            }
+            mDestroyed = true;
+            mLauncher.unregisterActivityLifecycleCallbacks(this);
+            mListeners.clear();
+        }
+
+        @Override
+        public void onActivityCreated(Activity activity, Bundle bundle) { }
+
+        @Override
+        public void onActivityPaused(Activity activity) { }
+
+        @Override
+        public void onActivityResumed(Activity activity) { }
+
+        @Override
+        public void onActivitySaveInstanceState(Activity activity, Bundle bundle) { }
     }
 }
diff --git a/src/com/android/launcher3/allapps/search/SearchWidgetInfoContainer.java b/src/com/android/launcher3/allapps/search/SearchWidgetInfoContainer.java
index b5c22688e5..8e5f8cb9c0 100644
--- a/src/com/android/launcher3/allapps/search/SearchWidgetInfoContainer.java
+++ b/src/com/android/launcher3/allapps/search/SearchWidgetInfoContainer.java
@@ -70,10 +70,4 @@ public class SearchWidgetInfoContainer extends AppWidgetHostView {
         mListeners.remove(hostView);
     }
 
-    /**
-     * Removes all AppWidgetHost update listeners
-     */
-    public void clearListeners() {
-        mListeners.clear();
-    }
 }
diff --git a/src/com/android/launcher3/icons/IconCache.java b/src/com/android/launcher3/icons/IconCache.java
index 80135571b2..61f2c2adae 100644
--- a/src/com/android/launcher3/icons/IconCache.java
+++ b/src/com/android/launcher3/icons/IconCache.java
@@ -31,7 +31,6 @@ import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ShortcutInfo;
 import android.graphics.drawable.Drawable;
-import android.os.Handler;
 import android.os.Process;
 import android.os.UserHandle;
 import android.util.Log;
@@ -134,7 +133,7 @@ public class IconCache extends BaseIconCache {
      * Fetches high-res icon for the provided ItemInfo and updates the caller when done.
      * @return a request ID that can be used to cancel the request.
      */
-    public IconLoadRequest updateIconInBackground(final ItemInfoUpdateReceiver caller,
+    public HandlerRunnable updateIconInBackground(final ItemInfoUpdateReceiver caller,
             final ItemInfoWithIcon info) {
         Preconditions.assertUIThread();
         if (mPendingIconRequestCount <= 0) {
@@ -142,20 +141,18 @@ public class IconCache extends BaseIconCache {
         }
         mPendingIconRequestCount ++;
 
-        IconLoadRequest request = new IconLoadRequest(mWorkerHandler, this::onIconRequestEnd) {
-            @Override
-            public void run() {
-                if (info instanceof AppInfo || info instanceof WorkspaceItemInfo) {
-                    getTitleAndIcon(info, false);
-                } else if (info instanceof PackageItemInfo) {
-                    getTitleAndIconForApp((PackageItemInfo) info, false);
-                }
-                MAIN_EXECUTOR.execute(() -> {
-                    caller.reapplyItemInfo(info);
-                    onEnd();
-                });
-            }
-        };
+        HandlerRunnable<ItemInfoWithIcon> request = new HandlerRunnable<>(mWorkerHandler,
+                () -> {
+                    if (info instanceof AppInfo || info instanceof WorkspaceItemInfo) {
+                        getTitleAndIcon(info, false);
+                    } else if (info instanceof PackageItemInfo) {
+                        getTitleAndIconForApp((PackageItemInfo) info, false);
+                    }
+                    return info;
+                },
+                MAIN_EXECUTOR,
+                caller::reapplyItemInfo,
+                this::onIconRequestEnd);
         Utilities.postAsyncCallback(mWorkerHandler, request);
         return request;
     }
@@ -336,12 +333,6 @@ public class IconCache extends BaseIconCache {
         return super.getEntryFromDB(cacheKey, entry, lowRes);
     }
 
-    public static abstract class IconLoadRequest extends HandlerRunnable {
-        IconLoadRequest(Handler handler, Runnable endRunnable) {
-            super(handler, endRunnable);
-        }
-    }
-
     /**
      * Interface for receiving itemInfo with high-res icon.
      */
-- 
GitLab


From 4fc871f9776606799538fe08bfd62069e692d206 Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Wed, 3 Feb 2021 14:55:23 -0800
Subject: [PATCH 0471/1664] [AA+] Add LAUNCHER_ALLAPPS_ENTRY,
 LAUNCHER_ALLAPPS_EXIT events.

This would help us to define clear start and end events for AllApps sessions on the server side.

Bug: 178562918
Change-Id: I77f236c9bc1a21e868545b1309e47d91d6fc1d96
---
 .../allapps/search/LiveSearchManager.java     | 19 +++++++++++++++++++
 .../launcher3/logging/StatsLogManager.java    |  6 ++++++
 2 files changed, 25 insertions(+)

diff --git a/src/com/android/launcher3/allapps/search/LiveSearchManager.java b/src/com/android/launcher3/allapps/search/LiveSearchManager.java
index 71aedb8272..e52c79049f 100644
--- a/src/com/android/launcher3/allapps/search/LiveSearchManager.java
+++ b/src/com/android/launcher3/allapps/search/LiveSearchManager.java
@@ -16,6 +16,8 @@
 package com.android.launcher3.allapps.search;
 
 import static com.android.launcher3.LauncherState.ALL_APPS;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_ENTRY;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_EXIT;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.THREAD_POOL_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
@@ -46,6 +48,8 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.logging.InstanceId;
+import com.android.launcher3.logging.InstanceIdSequence;
+import com.android.launcher3.logging.StatsLogManager.StatsLogger;
 import com.android.launcher3.statemanager.StateManager.StateListener;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.SafeCloseable;
@@ -71,6 +75,7 @@ public class LiveSearchManager implements StateListener<LauncherState> {
             new HashMap<>();
     private SearchWidgetHost mSearchWidgetHost;
     private InstanceId mLogInstanceId;
+    private LauncherState mPrevLauncherState;
 
     public LiveSearchManager(Launcher launcher) {
         mLauncher = launcher;
@@ -133,6 +138,11 @@ public class LiveSearchManager implements StateListener<LauncherState> {
         }
     }
 
+    @Override
+    public void onStateTransitionStart(LauncherState toState) {
+        mPrevLauncherState = mLauncher.getStateManager().getCurrentStableState();
+    }
+
     @Override
     public void onStateTransitionComplete(LauncherState finalState) {
         if (finalState != ALL_APPS) {
@@ -142,6 +152,15 @@ public class LiveSearchManager implements StateListener<LauncherState> {
 
             clearWidgetHost();
         }
+
+        StatsLogger logger = mLauncher.getStatsLogManager().logger();
+        if (finalState.equals(ALL_APPS)) {
+            mLogInstanceId = new InstanceIdSequence().newInstanceId();
+            logger.withInstanceId(mLogInstanceId).log(LAUNCHER_ALLAPPS_ENTRY);
+        } else if (mPrevLauncherState.equals(ALL_APPS)) {
+            logger.withInstanceId(mLogInstanceId).log(LAUNCHER_ALLAPPS_EXIT);
+            mLogInstanceId = null;
+        }
     }
 
     /**
diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index 2066cd3d71..0292d20ef5 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -344,6 +344,12 @@ public class StatsLogManager implements ResourceBasedOverride {
 
         @UiEvent(doc = "Current grid size is changed to 2.")
         LAUNCHER_GRID_SIZE_2(665),
+
+        @UiEvent(doc = "Launcher entered into AllApps state.")
+        LAUNCHER_ALLAPPS_ENTRY(692),
+
+        @UiEvent(doc = "Launcher exited from AllApps state.")
+        LAUNCHER_ALLAPPS_EXIT(693),
         ;
 
         // ADD MORE
-- 
GitLab


From 993fed23465a10bc76f46948f8910154fafa2496 Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Thu, 4 Feb 2021 15:40:45 -0800
Subject: [PATCH 0472/1664] Style updates

- Make pop ups use system colors
- Text colors in dark theme should also use system colors

Test: visual
Bug: 179427049
Change-Id: I9c0eb2b6970ff9bf66fe1d5c0040b10bfa2087b0
---
 res/values-v31/colors.xml | 33 +++++++++++++++++++++++++++++++++
 res/values/colors.xml     | 15 +++++++++++++++
 res/values/styles.xml     | 24 ++++++++++++------------
 3 files changed, 60 insertions(+), 12 deletions(-)
 create mode 100644 res/values-v31/colors.xml

diff --git a/res/values-v31/colors.xml b/res/values-v31/colors.xml
new file mode 100644
index 0000000000..b8600a60ed
--- /dev/null
+++ b/res/values-v31/colors.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 2021, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources>
+    <color name="popup_color_primary_light">@android:color/system_main_50</color>
+    <color name="popup_color_secondary_light">@android:color/system_main_100</color>
+    <color name="popup_color_tertiary_light">@android:color/system_main_300</color>
+    <color name="popup_color_primary_dark">@android:color/system_main_800</color>
+    <color name="popup_color_secondary_dark">@android:color/system_main_900</color>
+    <color name="popup_color_tertiary_dark">@android:color/system_main_700</color>
+
+    <color name="workspace_text_color_light">@android:color/system_main_50</color>
+    <color name="workspace_text_color_dark">@android:color/system_main_900</color>
+
+    <color name="text_color_primary_dark">@android:color/system_main_50</color>
+    <color name="text_color_secondary_dark">@android:color/system_main_200</color>
+    <color name="text_color_tertiary_dark">@android:color/system_main_400</color>
+</resources>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 78c2df69e0..0b30253327 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -40,4 +40,19 @@
     <color name="gesture_tutorial_fake_previous_task_view_color">#9CCC65</color> <!-- Light Green -->
     <color name="gesture_tutorial_action_button_label_color">#FFFFFFFF</color>
     <color name="gesture_tutorial_primary_color">#1A73E8</color> <!-- Blue -->
+
+    <color name="popup_color_primary_light">#FFF</color>
+    <color name="popup_color_secondary_light">#F1F3F4</color>
+    <color name="popup_color_tertiary_light">#E0E0E0</color> <!-- Gray 300 -->
+    <color name="popup_color_primary_dark">#3C4043</color> <!-- Gray 800 -->
+    <color name="popup_color_secondary_dark">#202124</color>
+    <color name="popup_color_tertiary_dark">#757575</color> <!-- Gray 600 -->
+
+    <color name="workspace_text_color_light">#FFF</color>
+    <color name="workspace_text_color_dark">#FF212121</color>
+
+    <color name="text_color_primary_dark">#FFFFFFFF</color>
+    <color name="text_color_secondary_dark">#FFFFFFFF</color>
+    <color name="text_color_tertiary_dark">#CCFFFFFF</color>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index dc7182fe90..adc22381a8 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -35,12 +35,12 @@
         <item name="allAppsInterimScrimAlpha">46</item>
         <item name="allAppsNavBarScrimColor">#66FFFFFF</item>
         <item name="allAppsTheme">@style/AllAppsTheme</item>
-        <item name="popupColorPrimary">#FFF</item>
-        <item name="popupColorSecondary">#F1F3F4</item>
-        <item name="popupColorTertiary">#E0E0E0</item> <!-- Gray 300 -->
+        <item name="popupColorPrimary">@color/popup_color_primary_light</item>
+        <item name="popupColorSecondary">@color/popup_color_secondary_light</item>
+        <item name="popupColorTertiary">@color/popup_color_tertiary_light</item>
         <item name="isMainColorDark">false</item>
         <item name="isWorkspaceDarkText">false</item>
-        <item name="workspaceTextColor">@android:color/white</item>
+        <item name="workspaceTextColor">@color/workspace_text_color_light</item>
         <item name="workspaceShadowColor">#B0000000</item>
         <item name="workspaceAmbientShadowColor">#33000000</item>
         <item name="workspaceKeyShadowColor">#44000000</item>
@@ -74,7 +74,7 @@
     </style>
 
     <style name="LauncherTheme.DarkText" parent="@style/LauncherTheme">
-        <item name="workspaceTextColor">#FF212121</item>
+        <item name="workspaceTextColor">@color/workspace_text_color_dark</item>
         <item name="allAppsInterimScrimAlpha">128</item>
         <item name="workspaceShadowColor">@android:color/transparent</item>
         <item name="workspaceAmbientShadowColor">@android:color/transparent</item>
@@ -88,9 +88,9 @@
     </style>
 
     <style name="LauncherTheme.Dark" parent="@style/LauncherTheme">
-        <item name="android:textColorPrimary">#FFFFFFFF</item>
-        <item name="android:textColorSecondary">#FFFFFFFF</item>
-        <item name="android:textColorTertiary">#CCFFFFFF</item>
+        <item name="android:textColorPrimary">@color/text_color_primary_dark</item>
+        <item name="android:textColorSecondary">@color/text_color_secondary_dark</item>
+        <item name="android:textColorTertiary">@color/text_color_tertiary_dark</item>
         <item name="android:textColorHint">#A0FFFFFF</item>
         <item name="android:colorControlHighlight">#A0FFFFFF</item>
         <item name="android:colorPrimary">#FF212121</item>
@@ -98,9 +98,9 @@
         <item name="allAppsInterimScrimAlpha">102</item>
         <item name="allAppsNavBarScrimColor">#80000000</item>
         <item name="allAppsTheme">@style/AllAppsTheme.Dark</item>
-        <item name="popupColorPrimary">#3C4043</item> <!-- Gray 800 -->
-        <item name="popupColorSecondary">#202124</item>
-        <item name="popupColorTertiary">#757575</item> <!-- Gray 600 -->
+        <item name="popupColorPrimary">@color/popup_color_primary_dark</item>
+        <item name="popupColorSecondary">@color/popup_color_secondary_dark</item>
+        <item name="popupColorTertiary">@color/popup_color_tertiary_dark</item>
         <item name="widgetsTheme">@style/WidgetContainerTheme.Dark</item>
         <item name="folderDotColor">?android:attr/colorPrimary</item>
         <item name="folderFillColor">?android:attr/colorBackground</item>
@@ -125,7 +125,7 @@
         <item name="allAppsInterimScrimAlpha">25</item>
         <item name="folderFillColor">#CDFFFFFF</item>
         <item name="folderTextColor">?attr/workspaceTextColor</item>
-        <item name="workspaceTextColor">#FF212121</item>
+        <item name="workspaceTextColor">@color/workspace_text_color_dark</item>
         <item name="workspaceShadowColor">@android:color/transparent</item>
         <item name="workspaceAmbientShadowColor">@android:color/transparent</item>
         <item name="workspaceKeyShadowColor">@android:color/transparent</item>
-- 
GitLab


From 350e1dbb0f12cb18d9163b3936f51dbfd6e72590 Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Mon, 1 Feb 2021 13:52:14 -0800
Subject: [PATCH 0473/1664] Creates BcSmartspaceDataPlugin interface to provide
 mock data to BC Smartspace.

Bug: 178536734
Test: Manually using implementation in SupportApp
Change-Id: Ia1cfbbf2944ca5f92e9e7144076eb15878e164d1
Merged-In: Ia1cfbbf2944ca5f92e9e7144076eb15878e164d1
---
 .../plugins/BcSmartspaceDataPlugin.java       | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 src_plugins/com/android/systemui/plugins/BcSmartspaceDataPlugin.java

diff --git a/src_plugins/com/android/systemui/plugins/BcSmartspaceDataPlugin.java b/src_plugins/com/android/systemui/plugins/BcSmartspaceDataPlugin.java
new file mode 100644
index 0000000000..b90e43bc64
--- /dev/null
+++ b/src_plugins/com/android/systemui/plugins/BcSmartspaceDataPlugin.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.plugins;
+
+import android.os.Parcelable;
+
+import com.android.systemui.plugins.annotations.ProvidesInterface;
+
+import java.util.List;
+
+/**
+ * Interface to provide SmartspaceTargets to BcSmartspace.
+ */
+@ProvidesInterface(action = BcSmartspaceDataPlugin.ACTION, version = BcSmartspaceDataPlugin.VERSION)
+public interface BcSmartspaceDataPlugin extends Plugin {
+    String ACTION = "com.android.systemui.action.PLUGIN_BC_SMARTSPACE_DATA";
+    int VERSION = 1;
+
+    /** Register a listener to get Smartspace data. */
+    void registerListener(SmartspaceTargetListener listener);
+
+    /** Unregister a listener. */
+    void unregisterListener(SmartspaceTargetListener listener);
+
+    /** Provides Smartspace data to registered listeners. */
+    interface SmartspaceTargetListener {
+        /** Each Parcelable is a SmartspaceTarget that represents a card. */
+        void onSmartspaceTargetsUpdated(List<Parcelable> targets);
+    }
+}
-- 
GitLab


From da74a4451158315743129690dec92c9d15183362 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Thu, 4 Feb 2021 20:57:59 -0800
Subject: [PATCH 0474/1664] Enable slice again

Bug: 179068415
Test: manual
Change-Id: Ib2e8d17d91488719eb439fd55c8b24e62338fc94
---
 .../android/launcher3/search/DeviceSearchAdapterProvider.java  | 3 ---
 src/com/android/launcher3/config/FeatureFlags.java             | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java b/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
index 4a656c1acb..d415c36ff7 100644
--- a/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
+++ b/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
@@ -121,9 +121,6 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
             case LayoutType.ICON_SINGLE_VERTICAL_TEXT:
                 return VIEW_TYPE_SEARCH_ICON;
             case LayoutType.ICON_SLICE:
-                if (FeatureFlags.DISABLE_SLICE_IN_ALLAPPS.get()) {
-                    return -1;
-                }
                 if (t.getSliceUri() != null) {
                     return VIEW_TYPE_SEARCH_SLICE;
                 }
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index b61799f79c..ac0083c1ee 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -101,9 +101,6 @@ public final class FeatureFlags {
     public static final BooleanFlag DISABLE_INITIAL_IME_IN_ALLAPPS = getDebugFlag(
             "DISABLE_INITIAL_IME_IN_ALLAPPS", false, "Disable default IME state in all apps");
 
-    public static final BooleanFlag DISABLE_SLICE_IN_ALLAPPS = getDebugFlag(
-            "DISABLE_SLICE_IN_ALLAPPS", true, "Disable slice in all apps");
-
     public static final BooleanFlag FOLDER_NAME_SUGGEST = new DeviceFlag(
             "FOLDER_NAME_SUGGEST", true,
             "Suggests folder names instead of blank text.");
-- 
GitLab


From 681154e53380fbea834d229b0e9238cb5a6d0a5a Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Fri, 5 Feb 2021 00:27:59 -0800
Subject: [PATCH 0475/1664] After AA+Search Edu, bring up IME

Bug: 179154570
Test: Manual

Change-Id: I2d010103dd37b84b3672ba0d6ff5897373991585
---
 .../src/com/android/launcher3/search/DeviceSearchEdu.java     | 1 +
 .../launcher3/allapps/AllAppsInsetTransitionController.java   | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/quickstep/src/com/android/launcher3/search/DeviceSearchEdu.java b/quickstep/src/com/android/launcher3/search/DeviceSearchEdu.java
index 425e557ecb..7013704d3e 100644
--- a/quickstep/src/com/android/launcher3/search/DeviceSearchEdu.java
+++ b/quickstep/src/com/android/launcher3/search/DeviceSearchEdu.java
@@ -83,6 +83,7 @@ public class DeviceSearchEdu extends AbstractSlideInView implements
     @Override
     protected void handleClose(boolean animate) {
         handleClose(animate, ANIMATION_DURATION);
+        mLauncher.getAllAppsController().getInsetController().show();
         mLauncher.getStateManager().removeStateListener(this);
     }
 
diff --git a/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java b/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
index f6e54aaec4..b34c8b8150 100644
--- a/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
@@ -86,6 +86,10 @@ public class AllAppsInsetTransitionController {
         mApps = appsView;
     }
 
+    public void show() {
+        mApps.getWindowInsetsController().show(WindowInsets.Type.ime());
+    }
+
     public void hide() {
         if (!Utilities.ATLEAST_R) return;
 
-- 
GitLab


From 192f662963916ae437d8a06b2c3d3514b8fcdf41 Mon Sep 17 00:00:00 2001
From: Issei Suzuki <issei@google.com>
Date: Thu, 4 Feb 2021 14:23:42 +0100
Subject: [PATCH 0476/1664] Make keyguard exit animation to remote animation.

The change is disabled by default. To enable remote animation, one needs
to set a property and to restart the WMS.

% adb root
% adb shell setprop persist.wm.enable_remote_keyguard_animation 1
% adb reboot

Test: Existing tests pass.
Bug: 175686676
Bug: 179122467
Exempt-From-Owner-Approval: The owner already gave +2 on the exactly same CL.
Change-Id: I3054ce4bbb296f09ab8bc12595f2ad17b32db7b4
---
 .../launcher3/LauncherAnimationRunner.java    | 26 +++++++++++++++----
 .../QuickstepAppTransitionManagerImpl.java    | 11 +++++---
 .../launcher3/WrappedAnimationRunnerImpl.java |  4 ++-
 .../WrappedLauncherAnimationRunner.java       | 10 ++++---
 .../android/quickstep/RecentsActivity.java    |  7 +++--
 .../util/RemoteAnimationProvider.java         |  7 +++--
 6 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
index 034d51ff38..588d676ac7 100644
--- a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
+++ b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
@@ -56,17 +56,22 @@ public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCo
         return mHandler;
     }
 
-    // Called only in R+ platform
+    // Called only in S+ platform
     @BinderThread
-    public void onAnimationStart(RemoteAnimationTargetCompat[] appTargets,
-            RemoteAnimationTargetCompat[] wallpaperTargets, Runnable runnable) {
+    public void onAnimationStart(
+            int transit,
+            RemoteAnimationTargetCompat[] appTargets,
+            RemoteAnimationTargetCompat[] wallpaperTargets,
+            RemoteAnimationTargetCompat[] nonAppTargets,
+            Runnable runnable) {
         Runnable r = () -> {
             finishExistingAnimation();
             mAnimationResult = new AnimationResult(() -> {
                 UI_HELPER_EXECUTOR.execute(runnable);
                 mAnimationResult = null;
             });
-            onCreateAnimation(appTargets, wallpaperTargets, mAnimationResult);
+            onCreateAnimation(transit, appTargets, wallpaperTargets, nonAppTargets,
+                    mAnimationResult);
         };
         if (mStartAtFrontOfQueue) {
             postAtFrontOfQueueAsynchronously(mHandler, r);
@@ -75,6 +80,14 @@ public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCo
         }
     }
 
+    // Called only in R platform
+    @BinderThread
+    public void onAnimationStart(RemoteAnimationTargetCompat[] appTargets,
+            RemoteAnimationTargetCompat[] wallpaperTargets, Runnable runnable) {
+        onAnimationStart(0 /* transit */, appTargets, wallpaperTargets,
+                new RemoteAnimationTargetCompat[0], runnable);
+    }
+
     // Called only in Q platform
     @BinderThread
     @Deprecated
@@ -88,8 +101,11 @@ public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCo
      */
     @UiThread
     public abstract void onCreateAnimation(
+            int transit,
             RemoteAnimationTargetCompat[] appTargets,
-            RemoteAnimationTargetCompat[] wallpaperTargets, AnimationResult result);
+            RemoteAnimationTargetCompat[] wallpaperTargets,
+            RemoteAnimationTargetCompat[] nonAppTargets,
+            AnimationResult result);
 
     @UiThread
     private void finishExistingAnimation() {
diff --git a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
index 876cabc61b..c4b696157c 100644
--- a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
@@ -866,8 +866,10 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
         }
 
         @Override
-        public void onCreateAnimation(RemoteAnimationTargetCompat[] appTargets,
+        public void onCreateAnimation(int transit,
+                RemoteAnimationTargetCompat[] appTargets,
                 RemoteAnimationTargetCompat[] wallpaperTargets,
+                RemoteAnimationTargetCompat[] nonAppTargets,
                 LauncherAnimationRunner.AnimationResult result) {
             if (mLauncher.isDestroyed()) {
                 AnimatorSet anim = new AnimatorSet();
@@ -880,7 +882,8 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                 // If launcher is not resumed, wait until new async-frame after resume
                 mLauncher.addOnResumeCallback(() ->
                         postAsyncCallback(mHandler, () ->
-                                onCreateAnimation(appTargets, wallpaperTargets, result)));
+                                onCreateAnimation(transit, appTargets, wallpaperTargets,
+                                        nonAppTargets, result)));
                 return;
             }
 
@@ -964,8 +967,10 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
         }
 
         @Override
-        public void onCreateAnimation(RemoteAnimationTargetCompat[] appTargets,
+        public void onCreateAnimation(int transit,
+                RemoteAnimationTargetCompat[] appTargets,
                 RemoteAnimationTargetCompat[] wallpaperTargets,
+                RemoteAnimationTargetCompat[] nonAppTargets,
                 LauncherAnimationRunner.AnimationResult result) {
             AnimatorSet anim = new AnimatorSet();
 
diff --git a/quickstep/src/com/android/launcher3/WrappedAnimationRunnerImpl.java b/quickstep/src/com/android/launcher3/WrappedAnimationRunnerImpl.java
index da2aee4386..03cc28e49b 100644
--- a/quickstep/src/com/android/launcher3/WrappedAnimationRunnerImpl.java
+++ b/quickstep/src/com/android/launcher3/WrappedAnimationRunnerImpl.java
@@ -26,7 +26,9 @@ import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
  */
 public interface WrappedAnimationRunnerImpl {
     Handler getHandler();
-    void onCreateAnimation(RemoteAnimationTargetCompat[] appTargets,
+    void onCreateAnimation(int transit,
+            RemoteAnimationTargetCompat[] appTargets,
             RemoteAnimationTargetCompat[] wallpaperTargets,
+            RemoteAnimationTargetCompat[] nonAppTargets,
             LauncherAnimationRunner.AnimationResult result);
 }
diff --git a/quickstep/src/com/android/launcher3/WrappedLauncherAnimationRunner.java b/quickstep/src/com/android/launcher3/WrappedLauncherAnimationRunner.java
index 1753b62ca3..1e1631bed9 100644
--- a/quickstep/src/com/android/launcher3/WrappedLauncherAnimationRunner.java
+++ b/quickstep/src/com/android/launcher3/WrappedLauncherAnimationRunner.java
@@ -46,11 +46,15 @@ public class WrappedLauncherAnimationRunner<R extends WrappedAnimationRunnerImpl
     }
 
     @Override
-    public void onCreateAnimation(RemoteAnimationTargetCompat[] appTargets,
-            RemoteAnimationTargetCompat[] wallpaperTargets, AnimationResult result) {
+    public void onCreateAnimation(int transit,
+            RemoteAnimationTargetCompat[] appTargets,
+            RemoteAnimationTargetCompat[] wallpaperTargets,
+            RemoteAnimationTargetCompat[] nonAppTargets,
+            AnimationResult result) {
         R animationRunnerImpl = mImpl.get();
         if (animationRunnerImpl != null) {
-            animationRunnerImpl.onCreateAnimation(appTargets, wallpaperTargets, result);
+            animationRunnerImpl.onCreateAnimation(transit, appTargets, wallpaperTargets,
+                    nonAppTargets, result);
         }
     }
 }
diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index 7beeae263c..8aa0842f0e 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -184,8 +184,11 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
             }
 
             @Override
-            public void onCreateAnimation(RemoteAnimationTargetCompat[] appTargets,
-                    RemoteAnimationTargetCompat[] wallpaperTargets, AnimationResult result) {
+            public void onCreateAnimation(int transit,
+                    RemoteAnimationTargetCompat[] appTargets,
+                    RemoteAnimationTargetCompat[] wallpaperTargets,
+                    RemoteAnimationTargetCompat[] nonAppTargets,
+                    AnimationResult result) {
                 AnimatorSet anim = composeRecentsLaunchAnimator(taskView, appTargets,
                         wallpaperTargets);
                 anim.addListener(resetStateListener());
diff --git a/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java b/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java
index 19c6588877..3adb459aeb 100644
--- a/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java
+++ b/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java
@@ -43,8 +43,11 @@ public abstract class RemoteAnimationProvider {
             }
 
             @Override
-            public void onCreateAnimation(RemoteAnimationTargetCompat[] appTargets,
-                    RemoteAnimationTargetCompat[] wallpaperTargets, AnimationResult result) {
+            public void onCreateAnimation(int transit,
+                    RemoteAnimationTargetCompat[] appTargets,
+                    RemoteAnimationTargetCompat[] wallpaperTargets,
+                    RemoteAnimationTargetCompat[] nonApps,
+                    AnimationResult result) {
                 result.setAnimation(createWindowAnimation(appTargets, wallpaperTargets), context);
             }
         };
-- 
GitLab


From 734be0b5ae03b33fe19fa68a2a9af8304d418de3 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 2 Feb 2021 11:04:25 -0800
Subject: [PATCH 0477/1664] Add OnComputeInsetsListener to TaskbarContainerView

Instead of updating visibility of TaskbarContainerView, keep it
VISIBLE but with alpha 0, and update touchableInsets to allow
touches to pass through. This avoids sending insets changed
when Taskbar is hidden.

Test: Swipe to Overview, no jumping/jank due to insets change;
also tap where Taskbar would be and ensure it doesn't launch

Bug: 171917176
Change-Id: I9ccb4335e0301f34eec459657f3bbaf88b0d8a52
---
 .../taskbar/TaskbarContainerView.java         | 48 +++++++++++++++++++
 .../launcher3/taskbar/TaskbarController.java  |  4 +-
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
index 0093e66859..3b361c4a38 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
@@ -15,6 +15,9 @@
  */
 package com.android.launcher3.taskbar;
 
+import static com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo.TOUCHABLE_INSETS_FRAME;
+import static com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo.TOUCHABLE_INSETS_REGION;
+
 import android.content.Context;
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
@@ -22,10 +25,18 @@ import android.widget.FrameLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.android.launcher3.anim.AlphaUpdateListener;
+import com.android.systemui.shared.system.ViewTreeObserverWrapper;
+
 /**
  * Top-level ViewGroup that hosts the TaskbarView as well as Views created by it such as Folder.
  */
 public class TaskbarContainerView extends FrameLayout {
+
+    // Initialized in init.
+    private TaskbarView mTaskbarView;
+    private ViewTreeObserverWrapper.OnComputeInsetsListener mTaskbarInsetsComputer;
+
     public TaskbarContainerView(@NonNull Context context) {
         this(context, null);
     }
@@ -43,4 +54,41 @@ public class TaskbarContainerView extends FrameLayout {
             int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
     }
+
+    protected void init(TaskbarView taskbarView) {
+        mTaskbarView = taskbarView;
+        mTaskbarInsetsComputer = createTaskbarInsetsComputer();
+    }
+
+    private ViewTreeObserverWrapper.OnComputeInsetsListener createTaskbarInsetsComputer() {
+        return insetsInfo -> {
+            if (getAlpha() < AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD) {
+                // We're invisible, let touches pass through us.
+                insetsInfo.touchableRegion.setEmpty();
+                insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION);
+            } else {
+                 // We're visible again, accept touches anywhere in our bounds.
+                insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_FRAME);
+            }
+        };
+    }
+
+    protected void cleanup() {
+        ViewTreeObserverWrapper.removeOnComputeInsetsListener(mTaskbarInsetsComputer);
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        ViewTreeObserverWrapper.addOnComputeInsetsListener(getViewTreeObserver(),
+                mTaskbarInsetsComputer);
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+
+        cleanup();
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index 2433e77916..260428dbc2 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -38,7 +38,6 @@ import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.QuickstepAppTransitionManagerImpl;
 import com.android.launcher3.R;
-import com.android.launcher3.anim.AlphaUpdateListener;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.states.StateAnimationConfig;
@@ -107,7 +106,6 @@ public class TaskbarController {
             @Override
             public void updateTaskbarVisibilityAlpha(float alpha) {
                 mTaskbarContainerView.setAlpha(alpha);
-                AlphaUpdateListener.updateVisibility(mTaskbarContainerView);
             }
         };
     }
@@ -167,6 +165,7 @@ public class TaskbarController {
     public void init() {
         mTaskbarView.init(mHotseatController.getNumHotseatIcons(),
                 mRecentsController.getNumRecentIcons());
+        mTaskbarContainerView.init(mTaskbarView);
         addToWindowManager();
         mTaskbarStateHandler.setTaskbarCallbacks(createTaskbarStateHandlerCallbacks());
         mTaskbarVisibilityController.init();
@@ -188,6 +187,7 @@ public class TaskbarController {
      */
     public void cleanup() {
         mTaskbarView.cleanup();
+        mTaskbarContainerView.cleanup();
         removeFromWindowManager();
         mTaskbarStateHandler.setTaskbarCallbacks(null);
         mTaskbarVisibilityController.cleanup();
-- 
GitLab


From ead22a52577f9cda982af2ff3e62e2ee2d0fdd86 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 2 Feb 2021 23:21:55 -0800
Subject: [PATCH 0478/1664] Removing released features

Bug: 179224463
Test: Presubmit
Change-Id: I6aa989fa8e52398112cca2c7f4bed0ae69881f7b
---
 .../hybridhotseat/HotseatEduActivity.java     |   3 +-
 .../hybridhotseat/HotseatFileLog.java         | 128 ------------------
 .../HotseatPredictionController.java          |  12 --
 .../uioverrides/PredictedAppIcon.java         |   2 +-
 .../uioverrides/QuickstepLauncher.java        |  33 ++---
 .../quickstep/util/MotionPauseDetector.java   |  75 ++--------
 .../util/QuickstepOnboardingPrefs.java        |   3 +-
 .../launcher3/InvariantDeviceProfile.java     |   9 +-
 .../launcher3/config/FeatureFlags.java        |  10 --
 .../android/launcher3/logging/FileLog.java    |   3 +-
 10 files changed, 27 insertions(+), 251 deletions(-)
 delete mode 100644 quickstep/src/com/android/launcher3/hybridhotseat/HotseatFileLog.java

diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduActivity.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduActivity.java
index c968de96a4..3a1a2f7ae2 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduActivity.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduActivity.java
@@ -29,7 +29,6 @@ import com.android.launcher3.util.ActivityTracker;
  */
 public class HotseatEduActivity extends Activity {
 
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -49,7 +48,7 @@ public class HotseatEduActivity extends Activity {
         @Override
         public boolean init(BaseActivity activity, boolean alreadyOnHome) {
             QuickstepLauncher launcher = (QuickstepLauncher) activity;
-            if (launcher != null && launcher.getHotseatPredictionController() != null) {
+            if (launcher != null) {
                 launcher.getHotseatPredictionController().showEdu();
             }
             return false;
diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatFileLog.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatFileLog.java
deleted file mode 100644
index 20e1edc05f..0000000000
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatFileLog.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.hybridhotseat;
-
-import android.content.Context;
-import android.os.Handler;
-import android.util.Log;
-
-import com.android.launcher3.logging.FileLog;
-import com.android.launcher3.util.Executors;
-import com.android.launcher3.util.MainThreadInitializedObject;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.PrintWriter;
-import java.text.DateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-/**
- * Helper class to allow hot seat file logging
- */
-public class HotseatFileLog {
-
-    public static final int LOG_DAYS = 10;
-    private static final String FILE_NAME_PREFIX = "hotseat-log-";
-    private static final DateFormat DATE_FORMAT =
-            DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
-    public static final MainThreadInitializedObject<HotseatFileLog> INSTANCE =
-            new MainThreadInitializedObject<>(HotseatFileLog::new);
-
-
-    private final Handler mHandler = new Handler(
-            Executors.createAndStartNewLooper("hotseat-logger"));
-    private final File mLogsDir;
-    private PrintWriter mCurrentWriter;
-    private String mFileName;
-
-    private HotseatFileLog(Context context) {
-        mLogsDir = context.getFilesDir();
-    }
-
-    /**
-     * Prints log values to disk
-     */
-    public void log(String tag, String msg) {
-        String out = String.format("%s %s %s", DATE_FORMAT.format(new Date()), tag, msg);
-
-        mHandler.post(() -> {
-            synchronized (this) {
-                PrintWriter writer = getWriter();
-                if (writer != null) {
-                    writer.println(out);
-                }
-            }
-        });
-    }
-
-    private PrintWriter getWriter() {
-        Calendar cal = Calendar.getInstance();
-        String fName = FILE_NAME_PREFIX + (cal.get(Calendar.DAY_OF_YEAR) % 10);
-        if (fName.equals(mFileName)) return mCurrentWriter;
-
-        boolean append = false;
-        File logFile = new File(mLogsDir, fName);
-        if (logFile.exists()) {
-            Calendar modifiedTime = Calendar.getInstance();
-            modifiedTime.setTimeInMillis(logFile.lastModified());
-
-            // If the file was modified more that 36 hours ago, purge the file.
-            // We use instead of 24 to account for day-365 followed by day-1
-            modifiedTime.add(Calendar.HOUR, 36);
-            append = cal.before(modifiedTime);
-        }
-
-
-        if (mCurrentWriter != null) {
-            mCurrentWriter.close();
-        }
-        try {
-            mCurrentWriter = new PrintWriter(new FileWriter(logFile, append));
-            mFileName = fName;
-        } catch (Exception ex) {
-            Log.e("HotseatLogs", "Error writing logs to file", ex);
-            closeWriter();
-        }
-        return mCurrentWriter;
-    }
-
-
-    private synchronized void closeWriter() {
-        mFileName = null;
-        if (mCurrentWriter != null) {
-            mCurrentWriter.close();
-        }
-        mCurrentWriter = null;
-    }
-
-
-    /**
-     * Returns a list of all log files
-     */
-    public synchronized File[] getLogFiles() {
-        File[] files = new File[LOG_DAYS + FileLog.LOG_DAYS];
-        //include file log files here
-        System.arraycopy(FileLog.getLogFiles(), 0, files, 0, FileLog.LOG_DAYS);
-
-        closeWriter();
-        for (int i = 0; i < LOG_DAYS; i++) {
-            files[FileLog.LOG_DAYS + i] = new File(mLogsDir, FILE_NAME_PREFIX + i);
-        }
-        return files;
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
index 88cfacb3a6..5e81fbaf08 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
@@ -26,7 +26,6 @@ import android.animation.Animator;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.content.ComponentName;
-import android.os.Process;
 import android.view.HapticFeedbackConstants;
 import android.view.View;
 import android.view.ViewGroup;
@@ -40,7 +39,6 @@ import com.android.launcher3.Hotseat;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.dragndrop.DragController;
@@ -446,16 +444,6 @@ public class HotseatPredictionController implements DragController.DragListener,
      * Logs rank info based on current list of predicted items
      */
     public void logLaunchedAppRankingInfo(@NonNull ItemInfo itemInfo, InstanceId instanceId) {
-        if (Utilities.IS_DEBUG_DEVICE) {
-            final String pkg = itemInfo.getTargetComponent() != null
-                    ? itemInfo.getTargetComponent().getPackageName() : "unknown";
-            HotseatFileLog.INSTANCE.get(mLauncher).log("UserEvent",
-                    "appLaunch: packageName:" + pkg + ",isWorkApp:" + (itemInfo.user != null
-                            && !Process.myUserHandle().equals(itemInfo.user))
-                            + ",launchLocation:" + itemInfo.container);
-        }
-
-
         ComponentName targetCN = itemInfo.getTargetComponent();
         if (targetCN == null) {
             return;
diff --git a/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
index 22c4a7eba3..2d501257c3 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
@@ -160,7 +160,7 @@ public class PredictedAppIcon extends DoubleShadowBubbleTextView implements
     public boolean performAccessibilityAction(int action, ItemInfo info) {
         QuickstepLauncher launcher = Launcher.cast(Launcher.getLauncher(getContext()));
         if (action == PIN_PREDICTION) {
-            if (launcher == null || launcher.getHotseatPredictionController() == null) {
+            if (launcher == null) {
                 return false;
             }
             HotseatPredictionController controller = launcher.getHotseatPredictionController();
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 9a1e707baa..6098b520be 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -49,7 +49,6 @@ import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.allapps.search.SearchAdapterProvider;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.appprediction.PredictionRowView;
-import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.hybridhotseat.HotseatPredictionController;
 import com.android.launcher3.logging.InstanceId;
 import com.android.launcher3.logging.StatsLogManager.StatsLogger;
@@ -104,9 +103,7 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
     @Override
     protected void setupViews() {
         super.setupViews();
-        if (FeatureFlags.ENABLE_HYBRID_HOTSEAT.get()) {
-            mHotseatPredictionController = new HotseatPredictionController(this);
-        }
+        mHotseatPredictionController = new HotseatPredictionController(this);
     }
 
     @Override
@@ -141,9 +138,7 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
         }
         logger.log(LAUNCHER_APP_LAUNCH_TAP);
 
-        if (mHotseatPredictionController != null) {
-            mHotseatPredictionController.logLaunchedAppRankingInfo(info, instanceId);
-        }
+        mHotseatPredictionController.logLaunchedAppRankingInfo(info, instanceId);
     }
 
     /**
@@ -166,10 +161,8 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
 
     @Override
     public boolean startActivitySafely(View v, Intent intent, ItemInfo item) {
-        if (mHotseatPredictionController != null) {
-            // Only pause is taskbar controller is not present
-            mHotseatPredictionController.setPauseUIUpdate(getTaskbarController() == null);
-        }
+        // Only pause is taskbar controller is not present
+        mHotseatPredictionController.setPauseUIUpdate(getTaskbarController() == null);
         return super.startActivitySafely(v, intent, item);
     }
 
@@ -181,7 +174,7 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
             onStateOrResumeChanging((getActivityFlags() & ACTIVITY_STATE_TRANSITION_ACTIVE) == 0);
         }
 
-        if (mHotseatPredictionController != null && ((changeBits & ACTIVITY_STATE_STARTED) != 0
+        if (((changeBits & ACTIVITY_STATE_STARTED) != 0
                 || (changeBits & getActivityFlags() & ACTIVITY_STATE_DEFERRED_RESUMED) != 0)) {
             mHotseatPredictionController.setPauseUIUpdate(false);
         }
@@ -195,12 +188,8 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
 
     @Override
     public Stream<SystemShortcut.Factory> getSupportedShortcuts() {
-        if (mHotseatPredictionController != null) {
-            return Stream.concat(super.getSupportedShortcuts(),
-                    Stream.of(mHotseatPredictionController));
-        } else {
-            return super.getSupportedShortcuts();
-        }
+        return Stream.concat(
+                super.getSupportedShortcuts(), Stream.of(mHotseatPredictionController));
     }
 
     /**
@@ -227,8 +216,7 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
             mAllAppsPredictions = item;
             getAppsView().getFloatingHeaderView().findFixedRowByType(PredictionRowView.class)
                     .setPredictedApps(item.items);
-        } else if (item.containerId == Favorites.CONTAINER_HOTSEAT_PREDICTION
-                && mHotseatPredictionController != null) {
+        } else if (item.containerId == Favorites.CONTAINER_HOTSEAT_PREDICTION) {
             mHotseatPredictionController.setPredictedItems(item);
         }
     }
@@ -246,10 +234,7 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
     public void onDestroy() {
         super.onDestroy();
         getAppsView().getSearchUiManager().destroy();
-        if (mHotseatPredictionController != null) {
-            mHotseatPredictionController.destroy();
-            mHotseatPredictionController = null;
-        }
+        mHotseatPredictionController.destroy();
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java b/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java
index 8cde5f2659..8151d412ab 100644
--- a/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java
+++ b/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java
@@ -15,8 +15,6 @@
  */
 package com.android.quickstep.util;
 
-import static com.android.launcher3.config.FeatureFlags.ENABLE_SYSTEM_VELOCITY_PROVIDER;
-
 import android.content.Context;
 import android.content.res.Resources;
 import android.view.MotionEvent;
@@ -51,7 +49,7 @@ public class MotionPauseDetector {
     private final Alarm mForcePauseTimeout;
     private final boolean mMakePauseHarderToTrigger;
     private final Context mContext;
-    private final VelocityProvider mVelocityProvider;
+    private final SystemVelocityProvider mVelocityProvider;
 
     private Float mPreviousVelocity = null;
 
@@ -88,8 +86,7 @@ public class MotionPauseDetector {
         mForcePauseTimeout = new Alarm();
         mForcePauseTimeout.setOnAlarmListener(alarm -> updatePaused(true /* isPaused */));
         mMakePauseHarderToTrigger = makePauseHarderToTrigger;
-        mVelocityProvider = ENABLE_SYSTEM_VELOCITY_PROVIDER.get()
-                ? new SystemVelocityProvider(axis) : new LinearVelocityProvider(axis);
+        mVelocityProvider = new SystemVelocityProvider(axis);
     }
 
     /**
@@ -124,8 +121,8 @@ public class MotionPauseDetector {
         mForcePauseTimeout.setAlarm(mMakePauseHarderToTrigger
                 ? HARDER_TRIGGER_TIMEOUT
                 : FORCE_PAUSE_TIMEOUT);
-        Float newVelocity = mVelocityProvider.addMotionEvent(ev, pointerIndex);
-        if (newVelocity != null && mPreviousVelocity != null) {
+        float newVelocity = mVelocityProvider.addMotionEvent(ev, pointerIndex);
+        if (mPreviousVelocity != null) {
             checkMotionPaused(newVelocity, mPreviousVelocity, ev.getEventTime());
         }
         mPreviousVelocity = newVelocity;
@@ -210,58 +207,7 @@ public class MotionPauseDetector {
         default void onMotionPauseChanged(boolean isPaused) { }
     }
 
-    /**
-     * Interface to abstract out velocity calculations
-     */
-    protected interface VelocityProvider {
-
-        /**
-         * Adds a new motion events, and returns the velocity at this point, or null if
-         * the velocity is not available
-         */
-        Float addMotionEvent(MotionEvent ev, int pointer);
-
-        /**
-         * Clears all stored motion event records
-         */
-        void clear();
-    }
-
-    private static class LinearVelocityProvider implements VelocityProvider {
-
-        private Long mPreviousTime = null;
-        private Float mPreviousPosition = null;
-
-        private final int mAxis;
-
-        LinearVelocityProvider(int axis) {
-            mAxis = axis;
-        }
-
-        @Override
-        public Float addMotionEvent(MotionEvent ev, int pointer) {
-            long time = ev.getEventTime();
-            float position = ev.getAxisValue(mAxis, pointer);
-            Float velocity = null;
-
-            if (mPreviousTime != null && mPreviousPosition != null) {
-                long changeInTime = Math.max(1, time - mPreviousTime);
-                float changeInPosition = position - mPreviousPosition;
-                velocity = changeInPosition / changeInTime;
-            }
-            mPreviousTime = time;
-            mPreviousPosition = position;
-            return velocity;
-        }
-
-        @Override
-        public void clear() {
-            mPreviousTime = null;
-            mPreviousPosition = null;
-        }
-    }
-
-    private static class SystemVelocityProvider implements VelocityProvider {
+    private static class SystemVelocityProvider {
 
         private final VelocityTracker mVelocityTracker;
         private final int mAxis;
@@ -271,8 +217,11 @@ public class MotionPauseDetector {
             mAxis = axis;
         }
 
-        @Override
-        public Float addMotionEvent(MotionEvent ev, int pointer) {
+        /**
+         * Adds a new motion events, and returns the velocity at this point, or null if
+         * the velocity is not available
+         */
+        public float addMotionEvent(MotionEvent ev, int pointer) {
             mVelocityTracker.addMovement(ev);
             mVelocityTracker.computeCurrentVelocity(1); // px / ms
             return mAxis == MotionEvent.AXIS_X
@@ -280,7 +229,9 @@ public class MotionPauseDetector {
                     : mVelocityTracker.getYVelocity(pointer);
         }
 
-        @Override
+        /**
+         * Clears all stored motion event records
+         */
         public void clear() {
             mVelocityTracker.clear();
         }
diff --git a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
index cb81d36b4e..b316423911 100644
--- a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
+++ b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
@@ -66,8 +66,7 @@ public class QuickstepOnboardingPrefs extends OnboardingPrefs<QuickstepLauncher>
             });
         }
 
-        if (FeatureFlags.ENABLE_HYBRID_HOTSEAT.get() && !hasReachedMaxCount(
-                HOTSEAT_DISCOVERY_TIP_COUNT)) {
+        if (!hasReachedMaxCount(HOTSEAT_DISCOVERY_TIP_COUNT)) {
             stateManager.addStateListener(new StateListener<LauncherState>() {
                 boolean mFromAllApps = false;
 
diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index 5fd9e01b2e..aa3ef9b139 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -18,7 +18,6 @@ package com.android.launcher3;
 
 import static com.android.launcher3.Utilities.getDevicePrefs;
 import static com.android.launcher3.Utilities.getPointString;
-import static com.android.launcher3.config.FeatureFlags.APPLY_CONFIG_AT_RUNTIME;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_FOUR_COLUMNS;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.PackageManagerHelper.getPackageFilter;
@@ -174,8 +173,7 @@ public class InvariantDeviceProfile {
                 .putString(KEY_MIGRATION_SRC_WORKSPACE_SIZE, getPointString(numColumns, numRows))
                 .apply();
 
-        mConfigMonitor = new ConfigMonitor(context,
-                APPLY_CONFIG_AT_RUNTIME.get() ? this::onConfigChanged : this::killProcess);
+        mConfigMonitor = new ConfigMonitor(context, this::onConfigChanged);
         mOverlayMonitor = new OverlayMonitor(context);
     }
 
@@ -317,11 +315,6 @@ public class InvariantDeviceProfile {
         mChangeListeners.remove(listener);
     }
 
-    private void killProcess(Context context) {
-        Log.e("ConfigMonitor", "restarting launcher");
-        android.os.Process.killProcess(android.os.Process.myPid());
-    }
-
     public void verifyConfigChangedInBackground(final Context context) {
         String savedIconMaskPath = getDevicePrefs(context).getString(KEY_ICON_PATH_REF, "");
         // Good place to check if grid size changed in themepicker when launcher was dead.
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index b61799f79c..625aafb68a 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -72,9 +72,6 @@ public final class FeatureFlags {
             "PROMISE_APPS_NEW_INSTALLS", true,
             "Adds a promise icon to the home screen for new install sessions.");
 
-    public static final BooleanFlag APPLY_CONFIG_AT_RUNTIME = getDebugFlag(
-            "APPLY_CONFIG_AT_RUNTIME", true, "Apply display changes dynamically");
-
     public static final BooleanFlag QUICKSTEP_SPRINGS = getDebugFlag(
             "QUICKSTEP_SPRINGS", true, "Enable springs for quickstep animations");
 
@@ -133,9 +130,6 @@ public final class FeatureFlags {
             "ASSISTANT_GIVES_LAUNCHER_FOCUS", false,
             "Allow Launcher to handle nav bar gestures while Assistant is running over it");
 
-    public static final BooleanFlag ENABLE_HYBRID_HOTSEAT = getDebugFlag(
-            "ENABLE_HYBRID_HOTSEAT", true, "Fill gaps in hotseat with predicted apps");
-
     public static final BooleanFlag HOTSEAT_MIGRATE_TO_FOLDER = getDebugFlag(
             "HOTSEAT_MIGRATE_TO_FOLDER", false, "Should move hotseat items into a folder");
 
@@ -175,10 +169,6 @@ public final class FeatureFlags {
             "Replace Smartspace with the enhanced version. "
               + "Ignored if ENABLE_SMARTSPACE_UNIVERSAL is enabled.");
 
-    public static final BooleanFlag ENABLE_SYSTEM_VELOCITY_PROVIDER = getDebugFlag(
-            "ENABLE_SYSTEM_VELOCITY_PROVIDER", true,
-            "Use system VelocityTracker's algorithm for motion pause detection.");
-
     public static final BooleanFlag ALWAYS_USE_HARDWARE_OPTIMIZATION_FOR_FOLDER_ANIMATIONS =
             getDebugFlag(
             "ALWAYS_USE_HARDWARE_OPTIMIZATION_FOR_FOLDER_ANIMATIONS", false,
diff --git a/src/com/android/launcher3/logging/FileLog.java b/src/com/android/launcher3/logging/FileLog.java
index 6bc1ecb126..cdd0bda49e 100644
--- a/src/com/android/launcher3/logging/FileLog.java
+++ b/src/com/android/launcher3/logging/FileLog.java
@@ -10,7 +10,6 @@ import android.util.Pair;
 
 import androidx.annotation.VisibleForTesting;
 
-import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.util.IOUtils;
 
 import java.io.BufferedReader;
@@ -43,7 +42,7 @@ public final class FileLog {
     private static Handler sHandler = null;
     private static File sLogsDirectory = null;
 
-    public static final int LOG_DAYS = FeatureFlags.ENABLE_HYBRID_HOTSEAT.get() ? 10 : 4;
+    public static final int LOG_DAYS = 4;
 
     public static void setDir(File logsDir) {
         if (ENABLED) {
-- 
GitLab


From a4647b681fcdd270f22708c6e0400638eb40fdf5 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 2 Feb 2021 13:45:34 -0800
Subject: [PATCH 0479/1664] Adding support for keyboard based drag and drop

For keyboard DnD, we use Accessible DnD implementation.
A placeholder FloatingView draws the focus indicator
for the virtual views

Test: Visible
Bug: 178781566
Change-Id: I632fc7377dffa1e05e3f0a9c3ad18641deb5a1a4
---
 res/layout/keyboard_drag_and_drop.xml         |  34 ++
 res/values/dimens.xml                         |   1 +
 .../launcher3/AbstractFloatingView.java       |  11 +-
 .../android/launcher3/ButtonDropTarget.java   |   2 +-
 src/com/android/launcher3/CellLayout.java     |   7 +
 src/com/android/launcher3/DropTargetBar.java  |  12 +-
 src/com/android/launcher3/Launcher.java       |   3 +-
 .../DragAndDropAccessibilityDelegate.java     |  44 ++-
 .../LauncherAccessibilityDelegate.java        |  34 +-
 .../ShortcutMenuAccessibilityDelegate.java    |   2 +-
 .../WorkspaceAccessibilityHelper.java         |  28 --
 .../launcher3/dragndrop/DragLayer.java        |  10 -
 .../launcher3/dragndrop/DragOptions.java      |   3 +
 .../keyboard/CustomActionsPopup.java          |   3 +-
 .../keyboard/FocusIndicatorHelper.java        | 217 +----------
 .../keyboard/ItemFocusIndicatorHelper.java    | 252 +++++++++++++
 .../keyboard/KeyboardDragAndDropView.java     | 342 ++++++++++++++++++
 .../launcher3/views/BaseDragLayer.java        |   6 -
 18 files changed, 723 insertions(+), 288 deletions(-)
 create mode 100644 res/layout/keyboard_drag_and_drop.xml
 create mode 100644 src/com/android/launcher3/keyboard/ItemFocusIndicatorHelper.java
 create mode 100644 src/com/android/launcher3/keyboard/KeyboardDragAndDropView.java

diff --git a/res/layout/keyboard_drag_and_drop.xml b/res/layout/keyboard_drag_and_drop.xml
new file mode 100644
index 0000000000..e9463c40a0
--- /dev/null
+++ b/res/layout/keyboard_drag_and_drop.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.launcher3.keyboard.KeyboardDragAndDropView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:focusable="true"
+    android:orientation="vertical"
+    android:elevation="6dp">
+
+    <TextView
+        android:id="@+id/label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:background="?attr/folderFillColor"
+        android:padding="8dp"
+        android:textColor="?attr/folderTextColor"
+        />
+
+</com.android.launcher3.keyboard.KeyboardDragAndDropView>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index cf51f77707..eaf7a5ff8c 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -139,6 +139,7 @@
     <dimen name="drag_flingToDeleteMinVelocity">-1500dp</dimen>
 
     <dimen name="spring_loaded_panel_border">1dp</dimen>
+    <dimen name="keyboard_drag_stroke_width">4dp</dimen>
 
 <!-- Folders -->
     <dimen name="page_indicator_dot_size">8dp</dimen>
diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java
index 3c34444b28..6037c96f82 100644
--- a/src/com/android/launcher3/AbstractFloatingView.java
+++ b/src/com/android/launcher3/AbstractFloatingView.java
@@ -76,17 +76,18 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
     public static final int TYPE_SNACKBAR = 1 << 7;
     public static final int TYPE_LISTENER = 1 << 8;
     public static final int TYPE_ALL_APPS_EDU = 1 << 9;
+    public static final int TYPE_DRAG_DROP_POPUP = 1 << 10;
 
     // Popups related to quickstep UI
-    public static final int TYPE_TASK_MENU = 1 << 10;
-    public static final int TYPE_OPTIONS_POPUP = 1 << 11;
-    public static final int TYPE_ICON_SURFACE = 1 << 12;
+    public static final int TYPE_TASK_MENU = 1 << 11;
+    public static final int TYPE_OPTIONS_POPUP = 1 << 12;
+    public static final int TYPE_ICON_SURFACE = 1 << 13;
 
     public static final int TYPE_ALL = TYPE_FOLDER | TYPE_ACTION_POPUP
             | TYPE_WIDGETS_BOTTOM_SHEET | TYPE_WIDGET_RESIZE_FRAME | TYPE_WIDGETS_FULL_SHEET
             | TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE | TYPE_TASK_MENU
             | TYPE_OPTIONS_POPUP | TYPE_SNACKBAR | TYPE_LISTENER | TYPE_ALL_APPS_EDU
-            | TYPE_ICON_SURFACE;
+            | TYPE_ICON_SURFACE | TYPE_DRAG_DROP_POPUP;
 
     // Type of popups which should be kept open during launcher rebind
     public static final int TYPE_REBIND_SAFE = TYPE_WIDGETS_FULL_SHEET
@@ -103,7 +104,7 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
     // These view all have particular operation associated with swipe down interaction.
     public static final int TYPE_STATUS_BAR_SWIPE_DOWN_DISALLOW = TYPE_WIDGETS_BOTTOM_SHEET |
             TYPE_WIDGETS_FULL_SHEET | TYPE_WIDGET_RESIZE_FRAME | TYPE_ON_BOARD_POPUP |
-            TYPE_DISCOVERY_BOUNCE | TYPE_TASK_MENU ;
+            TYPE_DISCOVERY_BOUNCE | TYPE_TASK_MENU | TYPE_DRAG_DROP_POPUP;
 
     protected boolean mIsOpen;
 
diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
index df005e6357..459b9a841e 100644
--- a/src/com/android/launcher3/ButtonDropTarget.java
+++ b/src/com/android/launcher3/ButtonDropTarget.java
@@ -240,7 +240,7 @@ public abstract class ButtonDropTarget extends TextView
 
     @Override
     public void onDragStart(DropTarget.DragObject dragObject, DragOptions options) {
-        mActive = supportsDrop(dragObject.dragInfo);
+        mActive = !options.isKeyboardDrag && supportsDrop(dragObject.dragInfo);
         mDrawable.setColorFilter(null);
         if (mCurrentColorAnim != null) {
             mCurrentColorAnim.cancel();
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 2809bd5a96..452207db3b 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -312,6 +312,13 @@ public class CellLayout extends ViewGroup {
         }
     }
 
+    /**
+     * Returns the currently set accessibility delegate
+     */
+    public DragAndDropAccessibilityDelegate getDragAndDropAccessibilityDelegate() {
+        return mTouchHelper;
+    }
+
     @Override
     public boolean dispatchHoverEvent(MotionEvent event) {
         // Always attempt to dispatch hover events to accessibility first.
diff --git a/src/com/android/launcher3/DropTargetBar.java b/src/com/android/launcher3/DropTargetBar.java
index ca001a35b2..c7684939db 100644
--- a/src/com/android/launcher3/DropTargetBar.java
+++ b/src/com/android/launcher3/DropTargetBar.java
@@ -131,7 +131,10 @@ public class DropTargetBar extends FrameLayout
         int width = MeasureSpec.getSize(widthMeasureSpec);
         int height = MeasureSpec.getSize(heightMeasureSpec);
 
-        if (mIsVertical) {
+        int visibleCount = getVisibleButtonsCount();
+        if (visibleCount == 0) {
+            // do nothing
+        } else if (mIsVertical) {
             int widthSpec = MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY);
             int heightSpec = MeasureSpec.makeMeasureSpec(height, MeasureSpec.AT_MOST);
 
@@ -142,7 +145,6 @@ public class DropTargetBar extends FrameLayout
                 }
             }
         } else {
-            int visibleCount = getVisibleButtonsCount();
             int availableWidth = width / visibleCount;
             boolean textVisible = true;
             for (ButtonDropTarget buttons : mDropTargets) {
@@ -165,7 +167,10 @@ public class DropTargetBar extends FrameLayout
 
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-        if (mIsVertical) {
+        int visibleCount = getVisibleButtonsCount();
+        if (visibleCount == 0) {
+            // do nothing
+        } else if (mIsVertical) {
             int gap = getResources().getDimensionPixelSize(R.dimen.drop_target_vertical_gap);
             int start = gap;
             int end;
@@ -178,7 +183,6 @@ public class DropTargetBar extends FrameLayout
                 }
             }
         } else {
-            int visibleCount = getVisibleButtonsCount();
             int frameSize = (right - left) / visibleCount;
 
             int start = frameSize / 2;
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 0274775244..70a0be9f56 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2681,7 +2681,8 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
                             && focusedView.getTag() instanceof ItemInfo
                             && mAccessibilityDelegate.performAction(focusedView,
                             (ItemInfo) focusedView.getTag(),
-                            LauncherAccessibilityDelegate.DEEP_SHORTCUTS)) {
+                            LauncherAccessibilityDelegate.DEEP_SHORTCUTS,
+                            true)) {
                         PopupContainerWithArrow.getOpen(this).requestFocus();
                         return true;
                     }
diff --git a/src/com/android/launcher3/accessibility/DragAndDropAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/DragAndDropAccessibilityDelegate.java
index ddb547ffb7..d0fc17534e 100644
--- a/src/com/android/launcher3/accessibility/DragAndDropAccessibilityDelegate.java
+++ b/src/com/android/launcher3/accessibility/DragAndDropAccessibilityDelegate.java
@@ -31,6 +31,7 @@ import androidx.customview.widget.ExploreByTouchHelper;
 import com.android.launcher3.CellLayout;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
+import com.android.launcher3.dragndrop.DragLayer;
 
 import java.util.List;
 
@@ -41,30 +42,32 @@ public abstract class DragAndDropAccessibilityDelegate extends ExploreByTouchHel
         implements OnClickListener, OnHoverListener {
     protected static final int INVALID_POSITION = -1;
 
-    private static final int[] sTempArray = new int[2];
+    protected final Rect mTempRect = new Rect();
+    protected final int[] mTempCords = new int[2];
 
     protected final CellLayout mView;
     protected final Context mContext;
     protected final LauncherAccessibilityDelegate mDelegate;
-
-    private final Rect mTempRect = new Rect();
+    protected final DragLayer mDragLayer;
 
     public DragAndDropAccessibilityDelegate(CellLayout forView) {
         super(forView);
         mView = forView;
         mContext = mView.getContext();
-        mDelegate = Launcher.getLauncher(mContext).getAccessibilityDelegate();
+        Launcher launcher = Launcher.getLauncher(mContext);
+        mDelegate = launcher.getAccessibilityDelegate();
+        mDragLayer = launcher.getDragLayer();
     }
 
     @Override
-    protected int getVirtualViewAt(float x, float y) {
+    public int getVirtualViewAt(float x, float y) {
         if (x < 0 || y < 0 || x > mView.getMeasuredWidth() || y > mView.getMeasuredHeight()) {
             return INVALID_ID;
         }
-        mView.pointToCellExact((int) x, (int) y, sTempArray);
+        mView.pointToCellExact((int) x, (int) y, mTempCords);
 
         // Map cell to id
-        int id = sTempArray[0] + sTempArray[1] * mView.getCountX();
+        int id = mTempCords[0] + mTempCords[1] * mView.getCountX();
         return intersectsValidDropTarget(id);
     }
 
@@ -75,7 +78,7 @@ public abstract class DragAndDropAccessibilityDelegate extends ExploreByTouchHel
     protected abstract int intersectsValidDropTarget(int id);
 
     @Override
-    protected void getVisibleVirtualViews(List<Integer> virtualViews) {
+    public void getVisibleVirtualViews(List<Integer> virtualViews) {
         // We create a virtual view for each cell of the grid
         // The cell ids correspond to cells in reading order.
         int nCells = mView.getCountX() * mView.getCountY();
@@ -88,7 +91,7 @@ public abstract class DragAndDropAccessibilityDelegate extends ExploreByTouchHel
     }
 
     @Override
-    protected boolean onPerformActionForVirtualView(int viewId, int action, Bundle args) {
+    public boolean onPerformActionForVirtualView(int viewId, int action, Bundle args) {
         if (action == AccessibilityNodeInfoCompat.ACTION_CLICK && viewId != INVALID_ID) {
             String confirmation = getConfirmationForIconDrop(viewId);
             mDelegate.handleAccessibleDrop(mView, getItemBounds(viewId), confirmation);
@@ -112,13 +115,25 @@ public abstract class DragAndDropAccessibilityDelegate extends ExploreByTouchHel
     }
 
     @Override
-    protected void onPopulateNodeForVirtualView(int id, AccessibilityNodeInfoCompat node) {
+    public void onPopulateNodeForVirtualView(int id, AccessibilityNodeInfoCompat node) {
         if (id == INVALID_ID) {
             throw new IllegalArgumentException("Invalid virtual view id");
         }
 
         node.setContentDescription(getLocationDescriptionForIconDrop(id));
-        node.setBoundsInParent(getItemBounds(id));
+
+        Rect itemBounds = getItemBounds(id);
+        node.setBoundsInParent(itemBounds);
+
+        // ExploreByTouchHelper does not currently handle view scale.
+        // Update BoundsInScreen to appropriate value.
+        mTempCords[0] = mTempCords[1] = 0;
+        float scale = mDragLayer.getDescendantCoordRelativeToSelf(mView, mTempCords);
+        mTempRect.left = mTempCords[0] + (int) (itemBounds.left * scale);
+        mTempRect.right = mTempCords[0] + (int) (itemBounds.right * scale);
+        mTempRect.top = mTempCords[1] + (int) (itemBounds.top * scale);
+        mTempRect.bottom = mTempCords[1] + (int) (itemBounds.bottom * scale);
+        node.setBoundsInScreen(mTempRect);
 
         node.addAction(AccessibilityNodeInfoCompat.ACTION_CLICK);
         node.setClickable(true);
@@ -130,6 +145,13 @@ public abstract class DragAndDropAccessibilityDelegate extends ExploreByTouchHel
         return dispatchHoverEvent(motionEvent);
     }
 
+    /**
+     * Returns the target host container
+     */
+    public View getHost() {
+        return mView;
+    }
+
     protected abstract String getLocationDescriptionForIconDrop(int id);
 
     protected abstract String getConfirmationForIconDrop(int id);
diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
index 136d43ea73..6fac79aa7e 100644
--- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
+++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
@@ -34,6 +34,7 @@ import com.android.launcher3.dragndrop.DragController.DragListener;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.folder.Folder;
 import com.android.launcher3.keyboard.CustomActionsPopup;
+import com.android.launcher3.keyboard.KeyboardDragAndDropView;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
@@ -107,10 +108,6 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
                 launcher.getText(R.string.shortcuts_menu_with_notifications_description)));
     }
 
-    public void addAccessibilityAction(int action, int actionLabel) {
-        mActions.put(action, new AccessibilityAction(action, mLauncher.getText(actionLabel)));
-    }
-
     @Override
     public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) {
         super.onInitializeAccessibilityNodeInfo(host, info);
@@ -139,7 +136,7 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
         }
 
         // Do not add move actions for keyboard request as this uses virtual nodes.
-        if (!fromKeyboard && itemSupportsAccessibleDrag(item)) {
+        if (itemSupportsAccessibleDrag(item)) {
             info.addAction(mActions.get(MOVE));
 
             if (item.container >= 0) {
@@ -178,13 +175,17 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
     @Override
     public boolean performAccessibilityAction(View host, int action, Bundle args) {
         if ((host.getTag() instanceof ItemInfo)
-                && performAction(host, (ItemInfo) host.getTag(), action)) {
+                && performAction(host, (ItemInfo) host.getTag(), action, false)) {
             return true;
         }
         return super.performAccessibilityAction(host, action, args);
     }
 
-    public boolean performAction(final View host, final ItemInfo item, int action) {
+    /**
+     * Performs the provided action on the host
+     */
+    public boolean performAction(final View host, final ItemInfo item, int action,
+            boolean fromKeyboard) {
         if (action == ACTION_LONG_CLICK) {
             if (PopupContainerWithArrow.canShow(host, item)) {
                 // Long press should be consumed for workspace items, and it should invoke the
@@ -205,7 +206,7 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
             return true;
         }
         if (action == MOVE) {
-            beginAccessibleDrag(host, item);
+            return beginAccessibleDrag(host, item, fromKeyboard);
         } else if (action == ADD_TO_WORKSPACE) {
             final int[] coordinates = new int[2];
             final int screenId = findSpaceOnWorkspace(item, coordinates);
@@ -406,7 +407,11 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
         }
     }
 
-    public void beginAccessibleDrag(View item, ItemInfo info) {
+    private boolean beginAccessibleDrag(View item, ItemInfo info, boolean fromKeyboard) {
+        if (!itemSupportsAccessibleDrag(info)) {
+            return false;
+        }
+
         mDragInfo = new DragInfo();
         mDragInfo.info = info;
         mDragInfo.item = item;
@@ -423,8 +428,17 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
 
         DragOptions options = new DragOptions();
         options.isAccessibleDrag = true;
+        options.isKeyboardDrag = fromKeyboard;
         options.simulatedDndStartPoint = new Point(pos.centerX(), pos.centerY());
-        ItemLongClickListener.beginDrag(item, mLauncher, info, options);
+
+        if (fromKeyboard) {
+            KeyboardDragAndDropView popup = (KeyboardDragAndDropView) mLauncher.getLayoutInflater()
+                    .inflate(R.layout.keyboard_drag_and_drop, mLauncher.getDragLayer(), false);
+            popup.showForIcon(item, info, options);
+        } else {
+            ItemLongClickListener.beginDrag(item, mLauncher, info, options);
+        }
+        return true;
     }
 
     @Override
diff --git a/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java
index d4ba11ef68..aaaff98e18 100644
--- a/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java
+++ b/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java
@@ -59,7 +59,7 @@ public class ShortcutMenuAccessibilityDelegate extends LauncherAccessibilityDele
     }
 
     @Override
-    public boolean performAction(View host, ItemInfo item, int action) {
+    public boolean performAction(View host, ItemInfo item, int action, boolean fromKeyboard) {
         if (action == ADD_TO_WORKSPACE) {
             if (!(host.getParent() instanceof DeepShortcutView)) {
                 return false;
diff --git a/src/com/android/launcher3/accessibility/WorkspaceAccessibilityHelper.java b/src/com/android/launcher3/accessibility/WorkspaceAccessibilityHelper.java
index 65a261de82..a331924f22 100644
--- a/src/com/android/launcher3/accessibility/WorkspaceAccessibilityHelper.java
+++ b/src/com/android/launcher3/accessibility/WorkspaceAccessibilityHelper.java
@@ -17,17 +17,12 @@
 package com.android.launcher3.accessibility;
 
 import android.content.Context;
-import android.graphics.Rect;
 import android.text.TextUtils;
 import android.view.View;
 
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
-
 import com.android.launcher3.CellLayout;
-import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.accessibility.LauncherAccessibilityDelegate.DragType;
-import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
@@ -38,9 +33,6 @@ import com.android.launcher3.model.data.WorkspaceItemInfo;
  */
 public class WorkspaceAccessibilityHelper extends DragAndDropAccessibilityDelegate {
 
-    private final Rect mTempRect = new Rect();
-    private final int[] mTempCords = new int[2];
-
     public WorkspaceAccessibilityHelper(CellLayout layout) {
         super(layout);
     }
@@ -134,26 +126,6 @@ public class WorkspaceAccessibilityHelper extends DragAndDropAccessibilityDelega
         }
         return "";
     }
-
-    @Override
-    protected void onPopulateNodeForVirtualView(int id, AccessibilityNodeInfoCompat node) {
-        super.onPopulateNodeForVirtualView(id, node);
-
-
-        // ExploreByTouchHelper does not currently handle view scale.
-        // Update BoundsInScreen to appropriate value.
-        DragLayer dragLayer = Launcher.getLauncher(mView.getContext()).getDragLayer();
-        mTempCords[0] = mTempCords[1] = 0;
-        float scale = dragLayer.getDescendantCoordRelativeToSelf(mView, mTempCords);
-
-        node.getBoundsInParent(mTempRect);
-        mTempRect.left = mTempCords[0] + (int) (mTempRect.left * scale);
-        mTempRect.right = mTempCords[0] + (int) (mTempRect.right * scale);
-        mTempRect.top = mTempCords[1] + (int) (mTempRect.top * scale);
-        mTempRect.bottom = mTempCords[1] + (int) (mTempRect.bottom * scale);
-        node.setBoundsInScreen(mTempRect);
-    }
-
     @Override
     protected String getLocationDescriptionForIconDrop(int id) {
         int x = id % mView.getCountX();
diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java
index ddf44cab3b..e71c12d433 100644
--- a/src/com/android/launcher3/dragndrop/DragLayer.java
+++ b/src/com/android/launcher3/dragndrop/DragLayer.java
@@ -85,9 +85,6 @@ public class DragLayer extends BaseDragLayer<Launcher> {
     private final WorkspaceAndHotseatScrim mWorkspaceScrim;
     private final OverviewScrim mOverviewScrim;
 
-    // View that should handle move events
-    private View mMoveTarget;
-
     /**
      * Used to create a new DragLayer from XML.
      *
@@ -109,7 +106,6 @@ public class DragLayer extends BaseDragLayer<Launcher> {
     public void setup(DragController dragController, Workspace workspace) {
         mDragController = dragController;
         mWorkspaceScrim.setWorkspace(workspace);
-        mMoveTarget = workspace;
         recreateControllers();
     }
 
@@ -214,12 +210,6 @@ public class DragLayer extends BaseDragLayer<Launcher> {
         }
     }
 
-    @Override
-    public boolean dispatchUnhandledMove(View focused, int direction) {
-        return super.dispatchUnhandledMove(focused, direction)
-                || mMoveTarget.dispatchUnhandledMove(focused, direction);
-    }
-
     @Override
     public boolean dispatchTouchEvent(MotionEvent ev) {
         ev.offsetLocation(getTranslationX(), 0);
diff --git a/src/com/android/launcher3/dragndrop/DragOptions.java b/src/com/android/launcher3/dragndrop/DragOptions.java
index 959602beb4..e8ff8da058 100644
--- a/src/com/android/launcher3/dragndrop/DragOptions.java
+++ b/src/com/android/launcher3/dragndrop/DragOptions.java
@@ -28,6 +28,9 @@ public class DragOptions {
     /** Whether or not an accessible drag operation is in progress. */
     public boolean isAccessibleDrag = false;
 
+    /** Whether or not the drag operation is controlled by keyboard. */
+    public boolean isKeyboardDrag = false;
+
     /**
      * Specifies the start location for a simulated DnD (like system drag or accessibility drag),
      * null when using internal DnD
diff --git a/src/com/android/launcher3/keyboard/CustomActionsPopup.java b/src/com/android/launcher3/keyboard/CustomActionsPopup.java
index 800598e23f..77ce4a8c88 100644
--- a/src/com/android/launcher3/keyboard/CustomActionsPopup.java
+++ b/src/com/android/launcher3/keyboard/CustomActionsPopup.java
@@ -88,6 +88,7 @@ public class CustomActionsPopup implements OnMenuItemClickListener {
 
     @Override
     public boolean onMenuItemClick(MenuItem menuItem) {
-        return mDelegate.performAction(mIcon, (ItemInfo) mIcon.getTag(), menuItem.getItemId());
+        return mDelegate.performAction(mIcon, (ItemInfo) mIcon.getTag(), menuItem.getItemId(),
+                true);
     }
 }
diff --git a/src/com/android/launcher3/keyboard/FocusIndicatorHelper.java b/src/com/android/launcher3/keyboard/FocusIndicatorHelper.java
index ae7ad106b8..83003ffb14 100644
--- a/src/com/android/launcher3/keyboard/FocusIndicatorHelper.java
+++ b/src/com/android/launcher3/keyboard/FocusIndicatorHelper.java
@@ -16,233 +16,30 @@
 
 package com.android.launcher3.keyboard;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.ObjectAnimator;
-import android.animation.PropertyValuesHolder;
-import android.animation.RectEvaluator;
-import android.animation.ValueAnimator;
-import android.animation.ValueAnimator.AnimatorUpdateListener;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
 import android.graphics.Rect;
-import android.util.Property;
 import android.view.View;
 import android.view.View.OnFocusChangeListener;
 
 import com.android.launcher3.R;
-import com.android.launcher3.config.FeatureFlags;
-import com.android.launcher3.util.Themes;
 
 /**
  * A helper class to draw background of a focused view.
  */
-public abstract class FocusIndicatorHelper implements
-        OnFocusChangeListener, AnimatorUpdateListener {
-
-    private static final float MIN_VISIBLE_ALPHA = 0.2f;
-    private static final long ANIM_DURATION = 150;
-
-    public static final Property<FocusIndicatorHelper, Float> ALPHA =
-            new Property<FocusIndicatorHelper, Float>(Float.TYPE, "alpha") {
-                @Override
-                public void set(FocusIndicatorHelper object, Float value) {
-                    object.setAlpha(value);
-                }
-
-                @Override
-                public Float get(FocusIndicatorHelper object) {
-                    return object.mAlpha;
-                }
-            };
-
-    public static final Property<FocusIndicatorHelper, Float> SHIFT =
-            new Property<FocusIndicatorHelper, Float>(
-                    Float.TYPE, "shift") {
-
-                @Override
-                public void set(FocusIndicatorHelper object, Float value) {
-                    object.mShift = value;
-                }
-
-                @Override
-                public Float get(FocusIndicatorHelper object) {
-                    return object.mShift;
-                }
-            };
-
-    private static final RectEvaluator RECT_EVALUATOR = new RectEvaluator(new Rect());
-    private static final Rect sTempRect1 = new Rect();
-    private static final Rect sTempRect2 = new Rect();
-
-    private final View mContainer;
-    private final Paint mPaint;
-    private final int mMaxAlpha;
-
-    private final Rect mDirtyRect = new Rect();
-    private boolean mIsDirty = false;
-
-    private View mLastFocusedView;
-
-    private View mCurrentView;
-    private View mTargetView;
-    /**
-     * The fraction indicating the position of the focusRect between {@link #mCurrentView}
-     * & {@link #mTargetView}
-     */
-    private float mShift;
-
-    private ObjectAnimator mCurrentAnimation;
-    private float mAlpha;
-    private float mRadius;
+public abstract class FocusIndicatorHelper extends ItemFocusIndicatorHelper<View>
+        implements OnFocusChangeListener {
 
     public FocusIndicatorHelper(View container) {
-        mContainer = container;
-
-        mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-        int color = container.getResources().getColor(R.color.focused_background);
-        mMaxAlpha = Color.alpha(color);
-        mPaint.setColor(0xFF000000 | color);
-
-        setAlpha(0);
-        mShift = 0;
-        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
-            mRadius = Themes.getDialogCornerRadius(container.getContext());
-        }
-    }
-
-    protected void setAlpha(float alpha) {
-        mAlpha = alpha;
-        mPaint.setAlpha((int) (mAlpha * mMaxAlpha));
-    }
-
-    @Override
-    public void onAnimationUpdate(ValueAnimator animation) {
-        invalidateDirty();
-    }
-
-    protected void invalidateDirty() {
-        if (mIsDirty) {
-            mContainer.invalidate(mDirtyRect);
-            mIsDirty = false;
-        }
-
-        Rect newRect = getDrawRect();
-        if (newRect != null) {
-            mContainer.invalidate(newRect);
-        }
-    }
-
-    public void draw(Canvas c) {
-        if (mAlpha <= 0) return;
-
-        Rect newRect = getDrawRect();
-        if (newRect != null) {
-            mDirtyRect.set(newRect);
-            c.drawRoundRect((float) mDirtyRect.left, (float) mDirtyRect.top,
-                    (float) mDirtyRect.right, (float) mDirtyRect.bottom,
-                    mRadius, mRadius, mPaint);
-            mIsDirty = true;
-        }
-    }
-
-    private Rect getDrawRect() {
-        if (mCurrentView != null && mCurrentView.isAttachedToWindow()) {
-            viewToRect(mCurrentView, sTempRect1);
-
-            if (mShift > 0 && mTargetView != null) {
-                viewToRect(mTargetView, sTempRect2);
-                return RECT_EVALUATOR.evaluate(mShift, sTempRect1, sTempRect2);
-            } else {
-                return sTempRect1;
-            }
-        }
-        return null;
+        super(container, container.getResources().getColor(R.color.focused_background));
     }
 
     @Override
     public void onFocusChange(View v, boolean hasFocus) {
-        if (hasFocus) {
-            endCurrentAnimation();
-
-            if (mAlpha > MIN_VISIBLE_ALPHA) {
-                mTargetView = v;
-
-                mCurrentAnimation = ObjectAnimator.ofPropertyValuesHolder(this,
-                        PropertyValuesHolder.ofFloat(ALPHA, 1),
-                        PropertyValuesHolder.ofFloat(SHIFT, 1));
-                mCurrentAnimation.addListener(new ViewSetListener(v, true));
-            } else {
-                setCurrentView(v);
-
-                mCurrentAnimation = ObjectAnimator.ofPropertyValuesHolder(this,
-                        PropertyValuesHolder.ofFloat(ALPHA, 1));
-            }
-
-            mLastFocusedView = v;
-        } else {
-            if (mLastFocusedView == v) {
-                mLastFocusedView = null;
-                endCurrentAnimation();
-                mCurrentAnimation = ObjectAnimator.ofPropertyValuesHolder(this,
-                        PropertyValuesHolder.ofFloat(ALPHA, 0));
-                mCurrentAnimation.addListener(new ViewSetListener(null, false));
-            }
-        }
-
-        // invalidate once
-        invalidateDirty();
-
-        mLastFocusedView = hasFocus ? v : null;
-        if (mCurrentAnimation != null) {
-            mCurrentAnimation.addUpdateListener(this);
-            mCurrentAnimation.setDuration(ANIM_DURATION).start();
-        }
-    }
-
-    protected void endCurrentAnimation() {
-        if (mCurrentAnimation != null) {
-            mCurrentAnimation.cancel();
-            mCurrentAnimation = null;
-        }
-    }
-
-    protected void setCurrentView(View v) {
-        mCurrentView = v;
-        mShift = 0;
-        mTargetView = null;
+        changeFocus(v, hasFocus);
     }
 
-    /**
-     * Gets the position of {@param v} relative to {@link #mContainer}.
-     */
-    public abstract void viewToRect(View v, Rect outRect);
-
-    private class ViewSetListener extends AnimatorListenerAdapter {
-        private final View mViewToSet;
-        private final boolean mCallOnCancel;
-        private boolean mCalled = false;
-
-        public ViewSetListener(View v, boolean callOnCancel) {
-            mViewToSet = v;
-            mCallOnCancel = callOnCancel;
-        }
-
-        @Override
-        public void onAnimationCancel(Animator animation) {
-            if (!mCallOnCancel) {
-                mCalled = true;
-            }
-        }
-
-        @Override
-        public void onAnimationEnd(Animator animation) {
-            if (!mCalled) {
-                setCurrentView(mViewToSet);
-                mCalled = true;
-            }
-        }
+    @Override
+    protected boolean shouldDraw(View item) {
+        return item.isAttachedToWindow();
     }
 
     /**
diff --git a/src/com/android/launcher3/keyboard/ItemFocusIndicatorHelper.java b/src/com/android/launcher3/keyboard/ItemFocusIndicatorHelper.java
new file mode 100644
index 0000000000..57fab2d06c
--- /dev/null
+++ b/src/com/android/launcher3/keyboard/ItemFocusIndicatorHelper.java
@@ -0,0 +1,252 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.keyboard;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.ObjectAnimator;
+import android.animation.PropertyValuesHolder;
+import android.animation.RectEvaluator;
+import android.animation.ValueAnimator;
+import android.animation.ValueAnimator.AnimatorUpdateListener;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.util.FloatProperty;
+import android.view.View;
+
+import com.android.launcher3.config.FeatureFlags;
+import com.android.launcher3.util.Themes;
+
+/**
+ * A helper class to draw background of a focused item.
+ * @param <T> Item type
+ */
+public abstract class ItemFocusIndicatorHelper<T> implements AnimatorUpdateListener {
+
+    private static final float MIN_VISIBLE_ALPHA = 0.2f;
+    private static final long ANIM_DURATION = 150;
+
+    public static final FloatProperty<ItemFocusIndicatorHelper> ALPHA =
+            new FloatProperty<ItemFocusIndicatorHelper>("alpha") {
+
+                @Override
+                public void setValue(ItemFocusIndicatorHelper object, float value) {
+                    object.setAlpha(value);
+                }
+
+                @Override
+                public Float get(ItemFocusIndicatorHelper object) {
+                    return object.mAlpha;
+                }
+            };
+
+    public static final FloatProperty<ItemFocusIndicatorHelper> SHIFT =
+            new FloatProperty<ItemFocusIndicatorHelper>("shift") {
+
+                @Override
+                public void setValue(ItemFocusIndicatorHelper object, float value) {
+                    object.mShift = value;
+                }
+
+                @Override
+                public Float get(ItemFocusIndicatorHelper object) {
+                    return object.mShift;
+                }
+            };
+
+    private static final RectEvaluator RECT_EVALUATOR = new RectEvaluator(new Rect());
+    private static final Rect sTempRect1 = new Rect();
+    private static final Rect sTempRect2 = new Rect();
+
+    private final View mContainer;
+    protected final Paint mPaint;
+    private final int mMaxAlpha;
+
+    private final Rect mDirtyRect = new Rect();
+    private boolean mIsDirty = false;
+
+    private T mLastFocusedItem;
+
+    private T mCurrentItem;
+    private T mTargetItem;
+    /**
+     * The fraction indicating the position of the focusRect between {@link #mCurrentItem}
+     * & {@link #mTargetItem}
+     */
+    private float mShift;
+
+    private ObjectAnimator mCurrentAnimation;
+    private float mAlpha;
+    private float mRadius;
+
+    public ItemFocusIndicatorHelper(View container, int color) {
+        mContainer = container;
+
+        mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        mMaxAlpha = Color.alpha(color);
+        mPaint.setColor(0xFF000000 | color);
+
+        setAlpha(0);
+        mShift = 0;
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
+            mRadius = Themes.getDialogCornerRadius(container.getContext());
+        }
+    }
+
+    protected void setAlpha(float alpha) {
+        mAlpha = alpha;
+        mPaint.setAlpha((int) (mAlpha * mMaxAlpha));
+    }
+
+    @Override
+    public void onAnimationUpdate(ValueAnimator animation) {
+        invalidateDirty();
+    }
+
+    protected void invalidateDirty() {
+        if (mIsDirty) {
+            mContainer.invalidate(mDirtyRect);
+            mIsDirty = false;
+        }
+
+        Rect newRect = getDrawRect();
+        if (newRect != null) {
+            mContainer.invalidate(newRect);
+        }
+    }
+
+    /**
+     * Draws the indicator on the canvas
+     */
+    public void draw(Canvas c) {
+        if (mAlpha <= 0) return;
+
+        Rect newRect = getDrawRect();
+        if (newRect != null) {
+            mDirtyRect.set(newRect);
+            c.drawRoundRect((float) mDirtyRect.left, (float) mDirtyRect.top,
+                    (float) mDirtyRect.right, (float) mDirtyRect.bottom,
+                    mRadius, mRadius, mPaint);
+            mIsDirty = true;
+        }
+    }
+
+    private Rect getDrawRect() {
+        if (mCurrentItem != null && shouldDraw(mCurrentItem)) {
+            viewToRect(mCurrentItem, sTempRect1);
+
+            if (mShift > 0 && mTargetItem != null) {
+                viewToRect(mTargetItem, sTempRect2);
+                return RECT_EVALUATOR.evaluate(mShift, sTempRect1, sTempRect2);
+            } else {
+                return sTempRect1;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Returns true if the provided item is valid
+     */
+    protected boolean shouldDraw(T item) {
+        return true;
+    }
+
+    protected void changeFocus(T item, boolean hasFocus) {
+        if (hasFocus) {
+            endCurrentAnimation();
+
+            if (mAlpha > MIN_VISIBLE_ALPHA) {
+                mTargetItem = item;
+
+                mCurrentAnimation = ObjectAnimator.ofPropertyValuesHolder(this,
+                        PropertyValuesHolder.ofFloat(ALPHA, 1),
+                        PropertyValuesHolder.ofFloat(SHIFT, 1));
+                mCurrentAnimation.addListener(new ViewSetListener(item, true));
+            } else {
+                setCurrentItem(item);
+
+                mCurrentAnimation = ObjectAnimator.ofPropertyValuesHolder(this,
+                        PropertyValuesHolder.ofFloat(ALPHA, 1));
+            }
+
+            mLastFocusedItem = item;
+        } else {
+            if (mLastFocusedItem == item) {
+                mLastFocusedItem = null;
+                endCurrentAnimation();
+                mCurrentAnimation = ObjectAnimator.ofPropertyValuesHolder(this,
+                        PropertyValuesHolder.ofFloat(ALPHA, 0));
+                mCurrentAnimation.addListener(new ViewSetListener(null, false));
+            }
+        }
+
+        // invalidate once
+        invalidateDirty();
+
+        mLastFocusedItem = hasFocus ? item : null;
+        if (mCurrentAnimation != null) {
+            mCurrentAnimation.addUpdateListener(this);
+            mCurrentAnimation.setDuration(ANIM_DURATION).start();
+        }
+    }
+
+    protected void endCurrentAnimation() {
+        if (mCurrentAnimation != null) {
+            mCurrentAnimation.cancel();
+            mCurrentAnimation = null;
+        }
+    }
+
+    protected void setCurrentItem(T item) {
+        mCurrentItem = item;
+        mShift = 0;
+        mTargetItem = null;
+    }
+
+    /**
+     * Gets the position of the item relative to {@link #mContainer}.
+     */
+    public abstract void viewToRect(T item, Rect outRect);
+
+    private class ViewSetListener extends AnimatorListenerAdapter {
+        private final T mItemToSet;
+        private final boolean mCallOnCancel;
+        private boolean mCalled = false;
+
+        ViewSetListener(T item, boolean callOnCancel) {
+            mItemToSet = item;
+            mCallOnCancel = callOnCancel;
+        }
+
+        @Override
+        public void onAnimationCancel(Animator animation) {
+            if (!mCallOnCancel) {
+                mCalled = true;
+            }
+        }
+
+        @Override
+        public void onAnimationEnd(Animator animation) {
+            if (!mCalled) {
+                setCurrentItem(mItemToSet);
+                mCalled = true;
+            }
+        }
+    }
+}
diff --git a/src/com/android/launcher3/keyboard/KeyboardDragAndDropView.java b/src/com/android/launcher3/keyboard/KeyboardDragAndDropView.java
new file mode 100644
index 0000000000..a6c897f169
--- /dev/null
+++ b/src/com/android/launcher3/keyboard/KeyboardDragAndDropView.java
@@ -0,0 +1,342 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.keyboard;
+
+import static android.app.Activity.DEFAULT_KEYS_SEARCH_LOCAL;
+
+import static com.android.launcher3.LauncherState.SPRING_LOADED;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint.Style;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.util.AttributeSet;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewParent;
+import android.widget.TextView;
+
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+
+import com.android.launcher3.AbstractFloatingView;
+import com.android.launcher3.CellLayout;
+import com.android.launcher3.Insettable;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherState;
+import com.android.launcher3.PagedView;
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.accessibility.DragAndDropAccessibilityDelegate;
+import com.android.launcher3.dragndrop.DragOptions;
+import com.android.launcher3.folder.Folder;
+import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.statemanager.StateManager.StateListener;
+import com.android.launcher3.touch.ItemLongClickListener;
+import com.android.launcher3.util.Themes;
+
+import java.util.ArrayList;
+import java.util.Objects;
+import java.util.function.ToIntBiFunction;
+import java.util.function.ToIntFunction;
+
+/**
+ * A floating view to allow keyboard navigation across virtual nodes
+ */
+public class KeyboardDragAndDropView extends AbstractFloatingView
+        implements Insettable, StateListener<LauncherState> {
+
+    private static final long MINOR_AXIS_WEIGHT = 13;
+
+    private final ArrayList<Integer> mIntList = new ArrayList<>();
+    private final ArrayList<DragAndDropAccessibilityDelegate> mDelegates = new ArrayList<>();
+    private final ArrayList<VirtualNodeInfo> mNodes = new ArrayList<>();
+
+    private final Rect mTempRect = new Rect();
+    private final Rect mTempRect2 = new Rect();
+    private final AccessibilityNodeInfoCompat mTempNodeInfo = AccessibilityNodeInfoCompat.obtain();
+
+    private final RectFocusIndicator mFocusIndicator;
+
+    private final Launcher mLauncher;
+    private VirtualNodeInfo mCurrentSelection;
+
+
+    public KeyboardDragAndDropView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public KeyboardDragAndDropView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mLauncher = Launcher.getLauncher(context);
+        mFocusIndicator = new RectFocusIndicator(this);
+        setWillNotDraw(false);
+    }
+
+    @Override
+    protected void handleClose(boolean animate) {
+        mLauncher.getDragLayer().removeView(this);
+        mLauncher.getStateManager().removeStateListener(this);
+        mLauncher.setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
+        mIsOpen = false;
+    }
+
+    @Override
+    protected boolean isOfType(int type) {
+        return (type & TYPE_DRAG_DROP_POPUP) != 0;
+    }
+
+    @Override
+    public boolean onControllerInterceptTouchEvent(MotionEvent ev) {
+        // Consume all touch
+        return true;
+    }
+
+    @Override
+    public void setInsets(Rect insets) {
+        setPadding(insets.left, insets.top, insets.right, insets.bottom);
+    }
+
+    @Override
+    public void onStateTransitionStart(LauncherState toState) {
+        if (toState != SPRING_LOADED) {
+            close(false);
+        }
+    }
+
+    @Override
+    public void onStateTransitionComplete(LauncherState finalState) {
+        if (mCurrentSelection != null) {
+            setCurrentSelection(mCurrentSelection);
+        }
+    }
+
+    private void setCurrentSelection(VirtualNodeInfo nodeInfo) {
+        mCurrentSelection = nodeInfo;
+        ((TextView) findViewById(R.id.label))
+                .setText(nodeInfo.populate(mTempNodeInfo).getContentDescription());
+
+        Rect bounds = new Rect();
+        mTempNodeInfo.getBoundsInParent(bounds);
+        View host = nodeInfo.delegate.getHost();
+        ViewParent parent = host.getParent();
+        if (parent instanceof PagedView) {
+            PagedView pv = (PagedView) parent;
+            int pageIndex = pv.indexOfChild(host);
+
+            pv.setCurrentPage(pageIndex);
+            bounds.offset(pv.getScrollX() - pv.getScrollForPage(pageIndex), 0);
+        }
+        float[] pos = new float[] {bounds.left, bounds.top, bounds.right, bounds.bottom};
+        Utilities.getDescendantCoordRelativeToAncestor(host, mLauncher.getDragLayer(), pos, true);
+
+        new RectF(pos[0], pos[1], pos[2], pos[3]).roundOut(bounds);
+        mFocusIndicator.changeFocus(bounds, true);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        mFocusIndicator.draw(canvas);
+    }
+
+    @Override
+    public boolean dispatchUnhandledMove(View focused, int direction) {
+        VirtualNodeInfo nodeInfo = getNextSelection(direction);
+        if (nodeInfo == null) {
+            return false;
+        }
+        setCurrentSelection(nodeInfo);
+        return true;
+    }
+
+    /**
+     * Focus finding logic:
+     * Collect all virtual nodes in reading order (used for forward and backwards).
+     * Then find the closest view by comparing the distances spatially. Since it is a move
+     * operation. consider all cell sizes to be approximately of the same size.
+     */
+    private VirtualNodeInfo getNextSelection(int direction) {
+        // Collect all virtual nodes
+        mDelegates.clear();
+        mNodes.clear();
+
+        Folder openFolder = Folder.getOpen(mLauncher);
+        PagedView pv = openFolder == null ? mLauncher.getWorkspace() : openFolder.getContent();
+        int count = pv.getPageCount();
+        for (int i = 0; i < count; i++) {
+            mDelegates.add(((CellLayout) pv.getChildAt(i)).getDragAndDropAccessibilityDelegate());
+        }
+        if (openFolder == null) {
+            mDelegates.add(pv.getNextPage() + 1,
+                    mLauncher.getHotseat().getDragAndDropAccessibilityDelegate());
+        }
+        mDelegates.forEach(delegate -> {
+            mIntList.clear();
+            delegate.getVisibleVirtualViews(mIntList);
+            mIntList.forEach(id -> mNodes.add(new VirtualNodeInfo(delegate, id)));
+        });
+
+        if (mNodes.isEmpty()) {
+            return null;
+        }
+        int index = mNodes.indexOf(mCurrentSelection);
+        if (mCurrentSelection == null || index < 0) {
+            return null;
+        }
+        int totalNodes = mNodes.size();
+
+        final ToIntBiFunction<Rect, Rect> majorAxis;
+        final ToIntFunction<Rect> minorAxis;
+
+        switch (direction) {
+            case View.FOCUS_RIGHT:
+                majorAxis = (source, dest) -> dest.left - source.left;
+                minorAxis = Rect::centerY;
+                break;
+            case View.FOCUS_LEFT:
+                majorAxis = (source, dest) -> source.left - dest.left;
+                minorAxis = Rect::centerY;
+                break;
+            case View.FOCUS_UP:
+                majorAxis = (source, dest) -> source.top - dest.top;
+                minorAxis = Rect::centerX;
+                break;
+            case View.FOCUS_DOWN:
+                majorAxis = (source, dest) -> dest.top - source.top;
+                minorAxis = Rect::centerX;
+                break;
+            case View.FOCUS_FORWARD:
+                return mNodes.get((index + 1) % totalNodes);
+            case View.FOCUS_BACKWARD:
+                return mNodes.get((index + totalNodes - 1) % totalNodes);
+            default:
+                // Unknown direction
+                return null;
+        }
+        mCurrentSelection.populate(mTempNodeInfo).getBoundsInScreen(mTempRect);
+
+        float minWeight = Float.MAX_VALUE;
+        VirtualNodeInfo match = null;
+        for (int i = 0; i < totalNodes; i++) {
+            VirtualNodeInfo node = mNodes.get(i);
+            node.populate(mTempNodeInfo).getBoundsInScreen(mTempRect2);
+
+            int majorAxisWeight = majorAxis.applyAsInt(mTempRect, mTempRect2);
+            if (majorAxisWeight <= 0) {
+                continue;
+            }
+            int minorAxisWeight = minorAxis.applyAsInt(mTempRect2)
+                    - minorAxis.applyAsInt(mTempRect);
+
+            float weight = majorAxisWeight * majorAxisWeight
+                    + minorAxisWeight * minorAxisWeight * MINOR_AXIS_WEIGHT;
+            if (weight < minWeight) {
+                minWeight = weight;
+                match = node;
+            }
+        }
+        return match;
+    }
+
+    @Override
+    public boolean onKeyUp(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_ENTER && mCurrentSelection != null) {
+            mCurrentSelection.delegate.onPerformActionForVirtualView(
+                    mCurrentSelection.id, AccessibilityNodeInfoCompat.ACTION_CLICK, null);
+            return true;
+        }
+        return super.onKeyUp(keyCode, event);
+    }
+
+    /**
+     * Shows the keyboard drag popup for the provided view
+     */
+    public void showForIcon(View icon, ItemInfo item, DragOptions dragOptions) {
+        mIsOpen = true;
+        mLauncher.getDragLayer().addView(this);
+        mLauncher.getStateManager().addStateListener(this);
+
+        // Find current selection
+        CellLayout currentParent = (CellLayout) icon.getParent().getParent();
+        float[] iconPos = new float[] {currentParent.getCellWidth() / 2,
+                currentParent.getCellHeight() / 2};
+        Utilities.getDescendantCoordRelativeToAncestor(icon, currentParent, iconPos, false);
+
+        ItemLongClickListener.beginDrag(icon, mLauncher, item, dragOptions);
+
+        DragAndDropAccessibilityDelegate dndDelegate =
+                currentParent.getDragAndDropAccessibilityDelegate();
+        setCurrentSelection(new VirtualNodeInfo(
+                dndDelegate, dndDelegate.getVirtualViewAt(iconPos[0], iconPos[1])));
+
+        mLauncher.setDefaultKeyMode(Activity.DEFAULT_KEYS_DISABLE);
+        requestFocus();
+    }
+
+    private static class VirtualNodeInfo {
+        public final DragAndDropAccessibilityDelegate delegate;
+        public final int id;
+
+        VirtualNodeInfo(DragAndDropAccessibilityDelegate delegate, int id) {
+            this.id = id;
+            this.delegate = delegate;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (!(o instanceof VirtualNodeInfo)) {
+                return false;
+            }
+            VirtualNodeInfo that = (VirtualNodeInfo) o;
+            return id == that.id && delegate.equals(that.delegate);
+        }
+
+        public AccessibilityNodeInfoCompat populate(AccessibilityNodeInfoCompat nodeInfo) {
+            delegate.onPopulateNodeForVirtualView(id, nodeInfo);
+            return nodeInfo;
+        }
+
+        public void getBounds(AccessibilityNodeInfoCompat nodeInfo, Rect out) {
+            delegate.onPopulateNodeForVirtualView(id, nodeInfo);
+            nodeInfo.getBoundsInScreen(out);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id, delegate);
+        }
+    }
+
+    private static class RectFocusIndicator extends ItemFocusIndicatorHelper<Rect> {
+
+        RectFocusIndicator(View container) {
+            super(container, Themes.getColorAccent(container.getContext()));
+            mPaint.setStrokeWidth(container.getResources()
+                    .getDimension(R.dimen.keyboard_drag_stroke_width));
+            mPaint.setStyle(Style.STROKE);
+        }
+
+        @Override
+        public void viewToRect(Rect item, Rect outRect) {
+            outRect.set(item);
+        }
+    }
+}
diff --git a/src/com/android/launcher3/views/BaseDragLayer.java b/src/com/android/launcher3/views/BaseDragLayer.java
index 5464dd8ec9..15f7730fd7 100644
--- a/src/com/android/launcher3/views/BaseDragLayer.java
+++ b/src/com/android/launcher3/views/BaseDragLayer.java
@@ -454,12 +454,6 @@ public abstract class BaseDragLayer<T extends Context & ActivityContext>
         r.set(left, top, left + v.getMeasuredWidth(), top + v.getMeasuredHeight());
     }
 
-    @Override
-    public boolean dispatchUnhandledMove(View focused, int direction) {
-        // Consume the unhandled move if a container is open, to avoid switching pages underneath.
-        return AbstractFloatingView.getTopOpenView(mActivity) != null;
-    }
-
     @Override
     protected boolean onRequestFocusInDescendants(int direction, Rect previouslyFocusedRect) {
         View topView = AbstractFloatingView.getTopOpenView(mActivity);
-- 
GitLab


From 6c7e594d06bda791fda266c9dadd17b327ac03c4 Mon Sep 17 00:00:00 2001
From: Sreyas <sreyasr@google.com>
Date: Thu, 4 Feb 2021 17:05:40 -0800
Subject: [PATCH 0480/1664] Updating Chips UI

Old Screenshot: https://drive.google.com/file/d/1_ptMdXCQGTz_vafOMbB-BZVZ_EP1LsaN/view?usp=sharing
New Screenshot: https://drive.google.com/file/d/1bM6Ur5H5OJdG22XU0MdRfVlNBAf_8aUy/view?usp=sharing
Test: Manual
Bug: 179490983

Change-Id: I14715b07a412239535b4916ba9cb355a0f0cf09e
---
 .../res/drawable/chip_scrim_gradient.xml      |  8 -------
 quickstep/res/layout/task.xml                 |  1 +
 .../com/android/quickstep/views/TaskView.java | 24 +------------------
 3 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 quickstep/res/drawable/chip_scrim_gradient.xml

diff --git a/quickstep/res/drawable/chip_scrim_gradient.xml b/quickstep/res/drawable/chip_scrim_gradient.xml
deleted file mode 100644
index 5a2dfb7b4a..0000000000
--- a/quickstep/res/drawable/chip_scrim_gradient.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient
-        android:angle="90"
-        android:endColor="@android:color/transparent"
-        android:startColor="@color/chip_scrim_start_color"
-        android:type="linear" />
-</shape>
\ No newline at end of file
diff --git a/quickstep/res/layout/task.xml b/quickstep/res/layout/task.xml
index f9bb2f2b14..c90706b703 100644
--- a/quickstep/res/layout/task.xml
+++ b/quickstep/res/layout/task.xml
@@ -17,6 +17,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:clipChildren="false"
     android:defaultFocusHighlightEnabled="false"
     android:elevation="4dp"
     android:focusable="true">
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 59cf3b2b8b..c7924fdd5f 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -50,8 +50,6 @@ import android.graphics.Outline;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
-import android.graphics.drawable.GradientDrawable;
-import android.graphics.drawable.InsetDrawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.AttributeSet;
@@ -401,9 +399,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
             mContextualChip.setScaleX(comp(modalness));
             mContextualChip.setScaleY(comp(modalness));
         }
-        if (mContextualChipWrapper != null) {
-            mContextualChipWrapper.setAlpha(comp(modalness));
-        }
         mDigitalWellBeingToast.updateBannerOffset(modalness);
     }
 
@@ -736,30 +731,16 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
             layoutParams.gravity = BOTTOM | CENTER_HORIZONTAL;
             int expectedChipHeight = getExpectedViewHeight(view);
             float chipOffset = getResources().getDimension(R.dimen.chip_hint_vertical_offset);
-            layoutParams.bottomMargin = (int)
-                    (((MarginLayoutParams) mSnapshotView.getLayoutParams()).bottomMargin
-                            - expectedChipHeight + chipOffset);
+            layoutParams.bottomMargin = -expectedChipHeight - (int) chipOffset;
             mContextualChip = ((FrameLayout) mContextualChipWrapper).getChildAt(0);
             mContextualChip.setScaleX(0f);
             mContextualChip.setScaleY(0f);
-            GradientDrawable scrimDrawable = (GradientDrawable) getResources().getDrawable(
-                    R.drawable.chip_scrim_gradient, mActivity.getTheme());
-            float cornerRadius = getTaskCornerRadius();
-            scrimDrawable.setCornerRadii(
-                    new float[]{0, 0, 0, 0, cornerRadius, cornerRadius, cornerRadius,
-                            cornerRadius});
-            InsetDrawable scrimDrawableInset = new InsetDrawable(scrimDrawable, 0, 0, 0,
-                    (int) (expectedChipHeight - chipOffset));
-            mContextualChipWrapper.setBackground(scrimDrawableInset);
-            mContextualChipWrapper.setPadding(0, 0, 0, 0);
-            mContextualChipWrapper.setAlpha(0f);
             addView(view, getChildCount(), layoutParams);
             if (mContextualChip != null) {
                 mContextualChip.animate().scaleX(1f).scaleY(1f).setDuration(50);
             }
             if (mContextualChipWrapper != null) {
                 mChipTouchDelegate = new TransformingTouchDelegate(mContextualChipWrapper);
-                mContextualChipWrapper.animate().alpha(1f).setDuration(50);
             }
         }
     }
@@ -982,10 +963,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     public void setFullscreenProgress(float progress) {
         progress = Utilities.boundToRange(progress, 0, 1);
         mFullscreenProgress = progress;
-        boolean isFullscreen = mFullscreenProgress > 0;
         mIconView.setVisibility(progress < 1 ? VISIBLE : INVISIBLE);
-        setClipChildren(!isFullscreen);
-        setClipToPadding(!isFullscreen);
 
         TaskThumbnailView thumbnail = getThumbnail();
         updateCurrentFullscreenParams(thumbnail.getPreviewPositionHelper());
-- 
GitLab


From 43b1d40918b4451d1c62a584cf6daa26afdafcbe Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Thu, 4 Feb 2021 16:17:41 -0800
Subject: [PATCH 0481/1664] [AA+] Add QueryLength to
 DeviceSearchResultContainer.

Bug: 178562918
Change-Id: I4891433bcd8848edd92f103448f5c00c5f9619e4
---
 .../launcher_atom_extension.proto                 |  1 +
 .../launcher3/search/SearchResultIcon.java        | 15 +++++++++------
 .../launcher3/search/SearchSessionTracker.java    |  9 +++++++--
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/quickstep/protos_overrides/launcher_atom_extension.proto b/quickstep/protos_overrides/launcher_atom_extension.proto
index 2766acf539..6253b41aac 100644
--- a/quickstep/protos_overrides/launcher_atom_extension.proto
+++ b/quickstep/protos_overrides/launcher_atom_extension.proto
@@ -31,4 +31,5 @@ message ExtendedContainers {
 
 // Represents on-device search result container.
 message DeviceSearchResultContainer{
+  optional int32 query_length = 1;
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
index f7d5f45bfa..3dd414695d 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
@@ -81,7 +81,7 @@ public class SearchResultIcon extends BubbleTextView implements
     private static final int BITMAP_CROP_MASK_COLOR = 0xff424242;
 
     private final Launcher mLauncher;
-
+    private final SearchSessionTracker mSearchSessionTracker;
     private String mTargetId;
     private Consumer<ItemInfoWithIcon> mOnItemInfoChanged;
 
@@ -97,6 +97,7 @@ public class SearchResultIcon extends BubbleTextView implements
     public SearchResultIcon(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
         mLauncher = Launcher.getLauncher(getContext());
+        mSearchSessionTracker = SearchSessionTracker.getInstance(getContext());
     }
 
     private boolean mLongPressSupported;
@@ -113,8 +114,8 @@ public class SearchResultIcon extends BubbleTextView implements
     }
 
     /**
-     * Applies {@link SearchTarget} to view. registers a consumer after a corresponding
-     * {@link ItemInfoWithIcon} is created
+     * Applies {@link SearchTarget} to view. registers a consumer after a corresponding {@link
+     * ItemInfoWithIcon} is created
      */
     public void apply(SearchTarget searchTarget, List<SearchTarget> inlineItems,
             Consumer<ItemInfoWithIcon> cb) {
@@ -317,13 +318,15 @@ public class SearchResultIcon extends BubbleTextView implements
         }
     }
 
-    private static ContainerInfo buildDeviceSearchResultContainer() {
+    private ContainerInfo buildDeviceSearchResultContainer() {
         return ContainerInfo.newBuilder().setExtendedContainers(
                 ExtendedContainers
                         .newBuilder()
                         .setDeviceSearchResultContainer(
-                                DeviceSearchResultContainer
-                                        .newBuilder()))
+                                mSearchSessionTracker.getQueryLength()
+                                        .map(queryLength -> DeviceSearchResultContainer.newBuilder()
+                                                .setQueryLength(queryLength))
+                                        .orElse(DeviceSearchResultContainer.newBuilder())))
                 .build();
     }
 }
diff --git a/quickstep/src/com/android/launcher3/search/SearchSessionTracker.java b/quickstep/src/com/android/launcher3/search/SearchSessionTracker.java
index 3079965cb9..97a72bbd9f 100644
--- a/quickstep/src/com/android/launcher3/search/SearchSessionTracker.java
+++ b/quickstep/src/com/android/launcher3/search/SearchSessionTracker.java
@@ -15,9 +15,10 @@
  */
 package com.android.launcher3.search;
 
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+
 import android.app.search.Query;
 import android.app.search.SearchSession;
-import android.app.search.SearchTarget;
 import android.app.search.SearchTargetEvent;
 import android.content.Context;
 import android.util.Log;
@@ -27,7 +28,7 @@ import androidx.annotation.WorkerThread;
 
 import com.android.launcher3.util.MainThreadInitializedObject;
 
-import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+import java.util.Optional;
 
 /**
  * A singleton class to track and report search events back to SearchSession
@@ -63,6 +64,10 @@ public class SearchSessionTracker {
         mQuery = query;
     }
 
+    public Optional<Integer> getQueryLength() {
+        return Optional.ofNullable(mQuery).map(Query::getInput).map(String::length);
+    }
+
     /**
      * Send the user event handling back to the {@link SearchSession} object.
      */
-- 
GitLab


From 73821a9c6d7c211a3c4956091f8b7ac5523f6145 Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Fri, 5 Feb 2021 17:50:37 -0800
Subject: [PATCH 0482/1664] [AA+] Fixes wrong container for
 LAUNCHER_ITEM_DROP_COMPLETED log event.

Bug: 179529616

Change-Id: Id35c952c94d8a10743f147b194d3c27e22bc5062
---
 .../launcher3/search/SearchResultIcon.java    | 41 ++++++++-----------
 .../android/launcher3/LauncherSettings.java   |  3 ++
 .../launcher3/model/data/ItemInfo.java        | 15 ++++++-
 .../model/data/SearchActionItemInfo.java      |  4 ++
 4 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
index 3dd414695d..4c44479330 100644
--- a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
+++ b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
@@ -15,6 +15,7 @@
  */
 package com.android.launcher3.search;
 
+import static com.android.launcher3.LauncherSettings.Favorites.EXTENDED_CONTAINERS;
 import static com.android.launcher3.model.data.SearchActionItemInfo.FLAG_BADGE_WITH_PACKAGE;
 import static com.android.launcher3.model.data.SearchActionItemInfo.FLAG_PRIMARY_ICON_FROM_TITLE;
 import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE;
@@ -49,7 +50,6 @@ import com.android.launcher3.allapps.AllAppsStore;
 import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.icons.LauncherIcons;
-import com.android.launcher3.logger.LauncherAtom.ContainerInfo;
 import com.android.launcher3.logger.LauncherAtomExtensions.DeviceSearchResultContainer;
 import com.android.launcher3.logger.LauncherAtomExtensions.ExtendedContainers;
 import com.android.launcher3.model.data.AppInfo;
@@ -147,11 +147,10 @@ public class SearchResultIcon extends BubbleTextView implements
         SearchActionItemInfo itemInfo = new SearchActionItemInfo(searchAction.getIcon(),
                 searchTarget.getPackageName(), searchTarget.getUserHandle(),
                 searchAction.getTitle()) {
-            // Workaround to log ItemInfo with DeviceSearchResultContainer without
-            // updating ItemInfo.container field.
             @Override
-            public ContainerInfo getContainerInfo() {
-                return buildDeviceSearchResultContainer();
+            protected ExtendedContainers getExtendedContainer() {
+                return ExtendedContainers.newBuilder()
+                        .setDeviceSearchResultContainer(buildDeviceSearchResultContainer()).build();
             }
         };
         itemInfo.setIntent(searchAction.getIntent());
@@ -255,14 +254,13 @@ public class SearchResultIcon extends BubbleTextView implements
         AllAppsStore appsStore = mLauncher.getAppsView().getAppsStore();
         AppInfo appInfo = new AppInfo(
                 appsStore.getApp(new ComponentKey(componentName, userHandle))) {
-            // Workaround to log ItemInfo with DeviceSearchResultContainer without
-            // updating ItemInfo.container field.
             @Override
-            public ContainerInfo getContainerInfo() {
-                return buildDeviceSearchResultContainer();
+            protected ExtendedContainers getExtendedContainer() {
+                return ExtendedContainers.newBuilder()
+                        .setDeviceSearchResultContainer(buildDeviceSearchResultContainer()).build();
             }
         };
-
+        appInfo.container = EXTENDED_CONTAINERS;
         if (appInfo == null) {
             setVisibility(GONE);
             return;
@@ -273,13 +271,13 @@ public class SearchResultIcon extends BubbleTextView implements
 
     private void prepareUsingShortcutInfo(ShortcutInfo shortcutInfo) {
         WorkspaceItemInfo workspaceItemInfo = new WorkspaceItemInfo(shortcutInfo, getContext()) {
-            // Workaround to log ItemInfo with DeviceSearchResultContainer without
-            // updating ItemInfo.container field.
             @Override
-            public ContainerInfo getContainerInfo() {
-                return buildDeviceSearchResultContainer();
+            protected ExtendedContainers getExtendedContainer() {
+                return ExtendedContainers.newBuilder()
+                        .setDeviceSearchResultContainer(buildDeviceSearchResultContainer()).build();
             }
         };
+        workspaceItemInfo.container = EXTENDED_CONTAINERS;
         notifyItemInfoChanged(workspaceItemInfo);
         LauncherAppState launcherAppState = LauncherAppState.getInstance(getContext());
         MODEL_EXECUTOR.execute(() -> {
@@ -318,15 +316,10 @@ public class SearchResultIcon extends BubbleTextView implements
         }
     }
 
-    private ContainerInfo buildDeviceSearchResultContainer() {
-        return ContainerInfo.newBuilder().setExtendedContainers(
-                ExtendedContainers
-                        .newBuilder()
-                        .setDeviceSearchResultContainer(
-                                mSearchSessionTracker.getQueryLength()
-                                        .map(queryLength -> DeviceSearchResultContainer.newBuilder()
-                                                .setQueryLength(queryLength))
-                                        .orElse(DeviceSearchResultContainer.newBuilder())))
-                .build();
+    private DeviceSearchResultContainer buildDeviceSearchResultContainer() {
+        return mSearchSessionTracker.getQueryLength()
+                .map(queryLength -> DeviceSearchResultContainer.newBuilder()
+                        .setQueryLength(queryLength))
+                .orElse(DeviceSearchResultContainer.newBuilder()).build();
     }
 }
diff --git a/src/com/android/launcher3/LauncherSettings.java b/src/com/android/launcher3/LauncherSettings.java
index fe423ed1be..be270397d6 100644
--- a/src/com/android/launcher3/LauncherSettings.java
+++ b/src/com/android/launcher3/LauncherSettings.java
@@ -171,6 +171,9 @@ public class LauncherSettings {
         public static final int CONTAINER_SETTINGS = -108;
         public static final int CONTAINER_TASKSWITCHER = -109;
 
+        // Represents any of the extended containers implemented in non-AOSP variants.
+        public static final int EXTENDED_CONTAINERS = -200;
+
         public static final String containerToString(int container) {
             switch (container) {
                 case CONTAINER_DESKTOP: return "desktop";
diff --git a/src/com/android/launcher3/model/data/ItemInfo.java b/src/com/android/launcher3/model/data/ItemInfo.java
index 3851ab044d..00ac12fc46 100644
--- a/src/com/android/launcher3/model/data/ItemInfo.java
+++ b/src/com/android/launcher3/model/data/ItemInfo.java
@@ -26,6 +26,7 @@ import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_SETTING
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_SHORTCUTS;
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_TASKSWITCHER;
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_TRAY;
+import static com.android.launcher3.LauncherSettings.Favorites.EXTENDED_CONTAINERS;
 import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
 import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET;
 import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT;
@@ -54,6 +55,7 @@ import com.android.launcher3.logger.LauncherAtom.SettingsContainer;
 import com.android.launcher3.logger.LauncherAtom.Shortcut;
 import com.android.launcher3.logger.LauncherAtom.ShortcutsContainer;
 import com.android.launcher3.logger.LauncherAtom.TaskSwitcherContainer;
+import com.android.launcher3.logger.LauncherAtomExtensions.ExtendedContainers;
 import com.android.launcher3.model.ModelWriter;
 import com.android.launcher3.util.ContentWriter;
 
@@ -403,11 +405,22 @@ public class ItemInfo {
                 return ContainerInfo.newBuilder()
                         .setTaskSwitcherContainer(TaskSwitcherContainer.getDefaultInstance())
                         .build();
-
+            case EXTENDED_CONTAINERS:
+                return ContainerInfo.newBuilder()
+                        .setExtendedContainers(getExtendedContainer())
+                        .build();
         }
         return ContainerInfo.getDefaultInstance();
     }
 
+    /**
+     * Returns non-AOSP container wrapped by {@link ExtendedContainers} object. Should be overridden
+     * by build variants.
+     */
+    protected ExtendedContainers getExtendedContainer() {
+        return ExtendedContainers.getDefaultInstance();
+    }
+
     /**
      * Returns shallow copy of the object.
      */
diff --git a/src/com/android/launcher3/model/data/SearchActionItemInfo.java b/src/com/android/launcher3/model/data/SearchActionItemInfo.java
index 8469569c25..25355c9579 100644
--- a/src/com/android/launcher3/model/data/SearchActionItemInfo.java
+++ b/src/com/android/launcher3/model/data/SearchActionItemInfo.java
@@ -15,6 +15,8 @@
  */
 package com.android.launcher3.model.data;
 
+import static com.android.launcher3.LauncherSettings.Favorites.EXTENDED_CONTAINERS;
+
 import android.app.PendingIntent;
 import android.content.Intent;
 import android.graphics.drawable.Icon;
@@ -45,6 +47,7 @@ public class SearchActionItemInfo extends ItemInfoWithIcon {
             CharSequence title) {
         this.user = user == null ? Process.myUserHandle() : user;
         this.title = title;
+        this.container = EXTENDED_CONTAINERS;
         mFallbackPackageName = packageName;
         mIcon = icon;
     }
@@ -55,6 +58,7 @@ public class SearchActionItemInfo extends ItemInfoWithIcon {
         mFallbackPackageName = info.mFallbackPackageName;
         mFlags = info.mFlags;
         title = info.title;
+        this.container = EXTENDED_CONTAINERS;
     }
 
     /**
-- 
GitLab


From df256ae86be7ab2034c3152ac9730a7ad66c5cd7 Mon Sep 17 00:00:00 2001
From: Himanshu Jaju <himanshujaju@google.com>
Date: Fri, 8 Jan 2021 17:10:47 +0000
Subject: [PATCH 0483/1664] Add screen size to touch regions cache.

The general design for foldable devices contains a smaller screen and a
larger screen. Hence we need to move from caching based on rotation to
caching based on {display size, rotation} tuple.

Test: Manual on fold2
Bug: 172240450
Change-Id: I445a7545e684134d7d880f957bb97ff847b726b7
---
 .../OrientationTouchTransformerTest.java      | 98 ++++++++++++++-----
 .../OrientationTouchTransformer.java          | 77 +++++++++++----
 2 files changed, 128 insertions(+), 47 deletions(-)

diff --git a/quickstep/robolectric_tests/src/com/android/quickstep/OrientationTouchTransformerTest.java b/quickstep/robolectric_tests/src/com/android/quickstep/OrientationTouchTransformerTest.java
index 5cb55ec2d0..eca27b5566 100644
--- a/quickstep/robolectric_tests/src/com/android/quickstep/OrientationTouchTransformerTest.java
+++ b/quickstep/robolectric_tests/src/com/android/quickstep/OrientationTouchTransformerTest.java
@@ -43,8 +43,18 @@ import org.robolectric.RobolectricTestRunner;
 
 @RunWith(RobolectricTestRunner.class)
 public class OrientationTouchTransformerTest {
-    private static final int SIZE_WIDTH = 1080;
-    private static final int SIZE_HEIGHT = 2280;
+    static class ScreenSize {
+        int mHeight;
+        int mWidth;
+
+        ScreenSize(int height, int width) {
+            mHeight = height;
+            mWidth = width;
+        }
+    }
+
+    private static final ScreenSize NORMAL_SCREEN_SIZE = new ScreenSize(2280, 1080);
+    private static final ScreenSize LARGE_SCREEN_SIZE = new ScreenSize(3280, 1080);
     private static final float DENSITY_DISPLAY_METRICS = 3.0f;
 
     private OrientationTouchTransformer mTouchTransformer;
@@ -63,14 +73,16 @@ public class OrientationTouchTransformerTest {
         DisplayMetrics mockDisplayMetrics = new DisplayMetrics();
         mockDisplayMetrics.density = DENSITY_DISPLAY_METRICS;
         when(mResources.getDisplayMetrics()).thenReturn(mockDisplayMetrics);
-        mInfo = createDisplayInfo(Surface.ROTATION_0);
+        mInfo = createDisplayInfo(NORMAL_SCREEN_SIZE, Surface.ROTATION_0);
         mTouchTransformer = new OrientationTouchTransformer(mResources, NO_BUTTON, () -> 0);
     }
 
     @Test
     public void disabledMultipleRegions_shouldOverrideFirstRegion() {
-        float portraitRegionY = generateTouchRegionHeight(Surface.ROTATION_0) + 1;
-        float landscapeRegionY = generateTouchRegionHeight(Surface.ROTATION_90) + 1;
+        float portraitRegionY =
+                generateTouchRegionHeight(NORMAL_SCREEN_SIZE, Surface.ROTATION_0) + 1;
+        float landscapeRegionY =
+                generateTouchRegionHeight(NORMAL_SCREEN_SIZE, Surface.ROTATION_90) + 1;
 
         mTouchTransformer.createOrAddTouchRegion(mInfo);
         tapAndAssertTrue(100, portraitRegionY,
@@ -83,7 +95,8 @@ public class OrientationTouchTransformerTest {
                 event -> mTouchTransformer.touchInAssistantRegion(event));
 
         // Override region
-        mTouchTransformer.createOrAddTouchRegion(createDisplayInfo(Surface.ROTATION_90));
+        mTouchTransformer
+            .createOrAddTouchRegion(createDisplayInfo(NORMAL_SCREEN_SIZE, Surface.ROTATION_90));
         tapAndAssertFalse(100, portraitRegionY,
                 event -> mTouchTransformer.touchInValidSwipeRegions(event.getX(), event.getY()));
         tapAndAssertTrue(100, landscapeRegionY,
@@ -107,10 +120,13 @@ public class OrientationTouchTransformerTest {
 
     @Test
     public void enableMultipleRegions_shouldOverrideFirstRegion() {
-        float portraitRegionY = generateTouchRegionHeight(Surface.ROTATION_0) + 1;
-        float landscapeRegionY = generateTouchRegionHeight(Surface.ROTATION_90) + 1;
+        float portraitRegionY =
+                generateTouchRegionHeight(NORMAL_SCREEN_SIZE, Surface.ROTATION_0) + 1;
+        float landscapeRegionY =
+                generateTouchRegionHeight(NORMAL_SCREEN_SIZE, Surface.ROTATION_90) + 1;
 
-        mTouchTransformer.createOrAddTouchRegion(createDisplayInfo(Surface.ROTATION_90));
+        mTouchTransformer
+            .createOrAddTouchRegion(createDisplayInfo(NORMAL_SCREEN_SIZE, Surface.ROTATION_90));
         tapAndAssertFalse(100, portraitRegionY,
                 event -> mTouchTransformer.touchInValidSwipeRegions(event.getX(), event.getY()));
         tapAndAssertTrue(100, landscapeRegionY,
@@ -136,11 +152,14 @@ public class OrientationTouchTransformerTest {
 
     @Test
     public void enableMultipleRegions_assistantTriggersInMostRecent() {
-        float portraitRegionY = generateTouchRegionHeight(Surface.ROTATION_0) + 1;
-        float landscapeRegionY = generateTouchRegionHeight(Surface.ROTATION_90) + 1;
+        float portraitRegionY =
+                generateTouchRegionHeight(NORMAL_SCREEN_SIZE, Surface.ROTATION_0) + 1;
+        float landscapeRegionY =
+                generateTouchRegionHeight(NORMAL_SCREEN_SIZE, Surface.ROTATION_90) + 1;
 
         mTouchTransformer.enableMultipleRegions(true, mInfo);
-        mTouchTransformer.createOrAddTouchRegion(createDisplayInfo(Surface.ROTATION_90));
+        mTouchTransformer
+            .createOrAddTouchRegion(createDisplayInfo(NORMAL_SCREEN_SIZE, Surface.ROTATION_90));
         mTouchTransformer.createOrAddTouchRegion(mInfo);
         tapAndAssertTrue(0, portraitRegionY,
                 event -> mTouchTransformer.touchInAssistantRegion(event));
@@ -150,12 +169,15 @@ public class OrientationTouchTransformerTest {
 
     @Test
     public void enableMultipleRegions_assistantTriggersInCurrentOrientationAfterDisable() {
-        float portraitRegionY = generateTouchRegionHeight(Surface.ROTATION_0) + 1;
-        float landscapeRegionY = generateTouchRegionHeight(Surface.ROTATION_90) + 1;
+        float portraitRegionY =
+                generateTouchRegionHeight(NORMAL_SCREEN_SIZE, Surface.ROTATION_0) + 1;
+        float landscapeRegionY =
+                generateTouchRegionHeight(NORMAL_SCREEN_SIZE, Surface.ROTATION_90) + 1;
 
         mTouchTransformer.enableMultipleRegions(true, mInfo);
         mTouchTransformer.createOrAddTouchRegion(mInfo);
-        mTouchTransformer.createOrAddTouchRegion(createDisplayInfo(Surface.ROTATION_90));
+        mTouchTransformer
+            .createOrAddTouchRegion(createDisplayInfo(NORMAL_SCREEN_SIZE, Surface.ROTATION_90));
         mTouchTransformer.enableMultipleRegions(false, mInfo);
         tapAndAssertTrue(0, portraitRegionY,
                 event -> mTouchTransformer.touchInAssistantRegion(event));
@@ -163,6 +185,26 @@ public class OrientationTouchTransformerTest {
                 event -> mTouchTransformer.touchInAssistantRegion(event));
     }
 
+    @Test
+    public void assistantTriggersInCurrentScreenAfterScreenSizeChange() {
+        float smallerScreenPortraitRegionY =
+                generateTouchRegionHeight(NORMAL_SCREEN_SIZE, Surface.ROTATION_0) + 1;
+        float largerScreenPortraitRegionY =
+                generateTouchRegionHeight(LARGE_SCREEN_SIZE, Surface.ROTATION_0) + 1;
+
+        mTouchTransformer.enableMultipleRegions(false,
+                createDisplayInfo(NORMAL_SCREEN_SIZE, Surface.ROTATION_0));
+        tapAndAssertTrue(0, smallerScreenPortraitRegionY,
+                event -> mTouchTransformer.touchInAssistantRegion(event));
+
+        mTouchTransformer
+            .enableMultipleRegions(false, createDisplayInfo(LARGE_SCREEN_SIZE, Surface.ROTATION_0));
+        tapAndAssertTrue(0, largerScreenPortraitRegionY,
+                event -> mTouchTransformer.touchInAssistantRegion(event));
+        tapAndAssertFalse(0, smallerScreenPortraitRegionY,
+                event -> mTouchTransformer.touchInAssistantRegion(event));
+    }
+
     @Test
     public void applyTransform_taskNotFrozen_notInRegion() {
         mTouchTransformer.createOrAddTouchRegion(mInfo);
@@ -182,7 +224,7 @@ public class OrientationTouchTransformerTest {
     public void applyTransform_taskFrozen_noRotate_inRegion() {
         mTouchTransformer.createOrAddTouchRegion(mInfo);
         mTouchTransformer.enableMultipleRegions(true, mInfo);
-        float y = generateTouchRegionHeight(Surface.ROTATION_0) + 1;
+        float y = generateTouchRegionHeight(NORMAL_SCREEN_SIZE, Surface.ROTATION_0) + 1;
         tapAndAssertTrue(100, y,
                 event -> mTouchTransformer.touchInValidSwipeRegions(event.getX(), event.getY()));
     }
@@ -190,15 +232,16 @@ public class OrientationTouchTransformerTest {
     @Test
     public void applyTransform_taskNotFrozen_noRotate_inDefaultRegion() {
         mTouchTransformer.createOrAddTouchRegion(mInfo);
-        float y = generateTouchRegionHeight(Surface.ROTATION_0) + 1;
+        float y = generateTouchRegionHeight(NORMAL_SCREEN_SIZE, Surface.ROTATION_0) + 1;
         tapAndAssertTrue(100, y,
                 event -> mTouchTransformer.touchInValidSwipeRegions(event.getX(), event.getY()));
     }
 
     @Test
     public void applyTransform_taskNotFrozen_90Rotate_inRegion() {
-        mTouchTransformer.createOrAddTouchRegion(createDisplayInfo(Surface.ROTATION_90));
-        float y = generateTouchRegionHeight(Surface.ROTATION_90) + 1;
+        mTouchTransformer
+            .createOrAddTouchRegion(createDisplayInfo(NORMAL_SCREEN_SIZE, Surface.ROTATION_90));
+        float y = generateTouchRegionHeight(NORMAL_SCREEN_SIZE, Surface.ROTATION_90) + 1;
         tapAndAssertTrue(100, y,
                 event -> mTouchTransformer.touchInValidSwipeRegions(event.getX(), event.getY()));
     }
@@ -210,9 +253,10 @@ public class OrientationTouchTransformerTest {
     public void applyTransform_taskNotFrozen_90Rotate_inTwoRegions() {
         mTouchTransformer.createOrAddTouchRegion(mInfo);
         mTouchTransformer.enableMultipleRegions(true, mInfo);
-        mTouchTransformer.createOrAddTouchRegion(createDisplayInfo(Surface.ROTATION_90));
+        mTouchTransformer
+            .createOrAddTouchRegion(createDisplayInfo(NORMAL_SCREEN_SIZE, Surface.ROTATION_90));
         // Landscape point
-        float y1 = generateTouchRegionHeight(Surface.ROTATION_90) + 1;
+        float y1 = generateTouchRegionHeight(NORMAL_SCREEN_SIZE, Surface.ROTATION_90) + 1;
         MotionEvent inRegion1_down = generateMotionEvent(MotionEvent.ACTION_DOWN, 10, y1);
         MotionEvent inRegion1_up = generateMotionEvent(MotionEvent.ACTION_UP, 10, y1);
         // Portrait point in landscape orientation axis
@@ -231,18 +275,18 @@ public class OrientationTouchTransformerTest {
         assertTrue(mTouchTransformer.touchInValidSwipeRegions(inRegion2.getX(), inRegion2.getY()));
     }
 
-    private DisplayController.Info createDisplayInfo(int rotation) {
-        Point p = new Point(SIZE_WIDTH, SIZE_HEIGHT);
+    private DisplayController.Info createDisplayInfo(ScreenSize screenSize, int rotation) {
+        Point p = new Point(screenSize.mWidth, screenSize.mHeight);
         if (rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270) {
-            p = new Point(SIZE_HEIGHT, SIZE_WIDTH);
+            p = new Point(screenSize.mHeight, screenSize.mWidth);
         }
         return new DisplayController.Info(0, rotation, 0, p, p, p, null);
     }
 
-    private float generateTouchRegionHeight(int rotation) {
-        float height = SIZE_HEIGHT;
+    private float generateTouchRegionHeight(ScreenSize screenSize, int rotation) {
+        float height = screenSize.mHeight;
         if (rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270) {
-            height = SIZE_WIDTH;
+            height = screenSize.mWidth;
         }
         return height - ResourceUtils.DEFAULT_NAVBAR_VALUE * DENSITY_DISPLAY_METRICS;
     }
diff --git a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
index b258a10c85..6a32dc4f8e 100644
--- a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
+++ b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
@@ -30,7 +30,6 @@ import android.graphics.Matrix;
 import android.graphics.Point;
 import android.graphics.RectF;
 import android.util.Log;
-import android.util.SparseArray;
 import android.view.MotionEvent;
 import android.view.Surface;
 
@@ -40,6 +39,9 @@ import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.DisplayController.Info;
 
 import java.io.PrintWriter;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * Maintains state for supporting nav bars and tracking their gestures in multiple orientations.
@@ -51,6 +53,37 @@ import java.io.PrintWriter;
  */
 class OrientationTouchTransformer {
 
+    class CurrentDisplay {
+        public Point size;
+        public int rotation;
+
+        CurrentDisplay() {
+            this.size = new Point(0, 0);
+            this.rotation = 0;
+        }
+
+        CurrentDisplay(Point size, int rotation) {
+            this.size = size;
+            this.rotation = rotation;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+
+            CurrentDisplay display = (CurrentDisplay) o;
+            if (rotation != display.rotation) return false;
+
+            return Objects.equals(size, display.size);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(size, rotation);
+        }
+    };
+
     private static final String TAG = "OrientationTouchTransformer";
     private static final boolean DEBUG = false;
     private static final int MAX_ORIENTATIONS = 4;
@@ -60,11 +93,12 @@ class OrientationTouchTransformer {
     private final Matrix mTmpMatrix = new Matrix();
     private final float[] mTmpPoint = new float[2];
 
-    private SparseArray<OrientationRectF> mSwipeTouchRegions = new SparseArray<>(MAX_ORIENTATIONS);
+    private Map<CurrentDisplay, OrientationRectF> mSwipeTouchRegions =
+            new HashMap<CurrentDisplay, OrientationRectF>();
     private final RectF mAssistantLeftRegion = new RectF();
     private final RectF mAssistantRightRegion = new RectF();
     private final RectF mOneHandedModeRegion = new RectF();
-    private int mCurrentDisplayRotation;
+    private CurrentDisplay mCurrentDisplay = new CurrentDisplay();
     private int mNavBarGesturalHeight;
     private int mNavBarLargerGesturalHeight;
     private boolean mEnableMultipleRegions;
@@ -147,21 +181,22 @@ class OrientationTouchTransformer {
      * @see #enableMultipleRegions(boolean, Info)
      */
     void createOrAddTouchRegion(Info info) {
-        mCurrentDisplayRotation = info.rotation;
+        mCurrentDisplay = new CurrentDisplay(info.realSize, info.rotation);
+
         if (mQuickStepStartingRotation > QUICKSTEP_ROTATION_UNINITIALIZED
-                && mCurrentDisplayRotation == mQuickStepStartingRotation) {
+                && mCurrentDisplay.rotation == mQuickStepStartingRotation) {
             // User already was swiping and the current screen is same rotation as the starting one
             // Remove active nav bars in other rotations except for the one we started out in
             resetSwipeRegions(info);
             return;
         }
-        OrientationRectF region = mSwipeTouchRegions.get(mCurrentDisplayRotation);
+        OrientationRectF region = mSwipeTouchRegions.get(mCurrentDisplay);
         if (region != null) {
             return;
         }
 
         if (mEnableMultipleRegions) {
-            mSwipeTouchRegions.put(mCurrentDisplayRotation, createRegionForDisplay(info));
+            mSwipeTouchRegions.put(mCurrentDisplay, createRegionForDisplay(info));
         } else {
             resetSwipeRegions(info);
         }
@@ -208,31 +243,31 @@ class OrientationTouchTransformer {
      */
     private void resetSwipeRegions(Info region) {
         if (DEBUG) {
-            Log.d(TAG, "clearing all regions except rotation: " + mCurrentDisplayRotation);
+            Log.d(TAG, "clearing all regions except rotation: " + mCurrentDisplay.rotation);
         }
 
-        mCurrentDisplayRotation = region.rotation;
-        OrientationRectF regionToKeep = mSwipeTouchRegions.get(mCurrentDisplayRotation);
+        mCurrentDisplay = new CurrentDisplay(region.realSize, region.rotation);
+        OrientationRectF regionToKeep = mSwipeTouchRegions.get(mCurrentDisplay);
         if (regionToKeep == null) {
             regionToKeep = createRegionForDisplay(region);
         }
         mSwipeTouchRegions.clear();
-        mSwipeTouchRegions.put(mCurrentDisplayRotation, regionToKeep);
+        mSwipeTouchRegions.put(mCurrentDisplay, regionToKeep);
         updateAssistantRegions(regionToKeep);
     }
 
     private void resetSwipeRegions() {
-        OrientationRectF regionToKeep = mSwipeTouchRegions.get(mCurrentDisplayRotation);
+        OrientationRectF regionToKeep = mSwipeTouchRegions.get(mCurrentDisplay);
         mSwipeTouchRegions.clear();
         if (regionToKeep != null) {
-            mSwipeTouchRegions.put(mCurrentDisplayRotation, regionToKeep);
+            mSwipeTouchRegions.put(mCurrentDisplay, regionToKeep);
             updateAssistantRegions(regionToKeep);
         }
     }
 
     private OrientationRectF createRegionForDisplay(Info display) {
         if (DEBUG) {
-            Log.d(TAG, "creating rotation region for: " + mCurrentDisplayRotation);
+            Log.d(TAG, "creating rotation region for: " + mCurrentDisplay.rotation);
         }
 
         Point size = display.realSize;
@@ -341,7 +376,9 @@ class OrientationTouchTransformer {
                 }
 
                 for (int i = 0; i < MAX_ORIENTATIONS; i++) {
-                    OrientationRectF rect = mSwipeTouchRegions.get(i);
+                    CurrentDisplay display = new CurrentDisplay(mCurrentDisplay.size, i);
+                    OrientationRectF rect = mSwipeTouchRegions.get(display);
+
                     if (TestProtocol.sDebugTracing) {
                         Log.d(TestProtocol.NO_SWIPE_TO_HOME, "transform:DOWN, rect=" + rect);
                     }
@@ -355,7 +392,7 @@ class OrientationTouchTransformer {
                         mLastRectTouched = rect;
                         mActiveTouchRotation = rect.mRotation;
                         if (mEnableMultipleRegions
-                                && mCurrentDisplayRotation == mActiveTouchRotation) {
+                                && mCurrentDisplay.rotation == mActiveTouchRotation) {
                             // TODO(b/154580671) might make this block unnecessary
                             // Start a touch session for the default nav region for the display
                             mQuickStepStartingRotation = mLastRectTouched.mRotation;
@@ -378,8 +415,8 @@ class OrientationTouchTransformer {
         pw.println("  lastTouchedRegion=" + mLastRectTouched);
         pw.println("  multipleRegionsEnabled=" + mEnableMultipleRegions);
         StringBuilder regions = new StringBuilder("  currentTouchableRotations=");
-        for(int i = 0; i < mSwipeTouchRegions.size(); i++) {
-            OrientationRectF rectF = mSwipeTouchRegions.get(mSwipeTouchRegions.keyAt(i));
+        for (CurrentDisplay key: mSwipeTouchRegions.keySet()) {
+            OrientationRectF rectF = mSwipeTouchRegions.get(key);
             regions.append(rectF).append(" ");
         }
         pw.println(regions.toString());
@@ -417,12 +454,12 @@ class OrientationTouchTransformer {
 
         boolean applyTransform(MotionEvent event, boolean forceTransform) {
             mTmpMatrix.reset();
-            postDisplayRotation(deltaRotation(mCurrentDisplayRotation, mRotation),
+            postDisplayRotation(deltaRotation(mCurrentDisplay.rotation, mRotation),
                     mHeight, mWidth, mTmpMatrix);
             if (forceTransform) {
                 if (DEBUG) {
                     Log.d(TAG, "Transforming rotation due to forceTransform, "
-                            + "mCurrentRotation: " + mCurrentDisplayRotation
+                            + "mCurrentRotation: " + mCurrentDisplay.rotation
                             + "mRotation: " + mRotation);
                 }
                 event.transform(mTmpMatrix);
-- 
GitLab


From 5ed0907cd34faab89b9ba2c55961c072e4f6e2ec Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 8 Feb 2021 19:01:51 +0000
Subject: [PATCH 0484/1664] Update Robolectric SDK to 30

Test: Run robolectric tests, such as WidgetsListAdapterTest, from
      Android Studio. (Need manually update JDK to v9.0)

Bug: 179690223
Change-Id: I7c0c696971bd950e83705f5006c70cb260d5b121
---
 robolectric_tests/config/robolectric.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/robolectric_tests/config/robolectric.properties b/robolectric_tests/config/robolectric.properties
index 4e811f36ff..0ac997f0b3 100644
--- a/robolectric_tests/config/robolectric.properties
+++ b/robolectric_tests/config/robolectric.properties
@@ -1,4 +1,4 @@
-sdk=29
+sdk=30
 shadows= \
     com.android.launcher3.shadows.LShadowAppPredictionManager \
     com.android.launcher3.shadows.LShadowAppWidgetManager \
-- 
GitLab


From 7944ee5c79136be7f28eb52260d6be779510e749 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Fri, 8 Jan 2021 19:07:25 +0000
Subject: [PATCH 0485/1664] Enable variable size thumbnail for large screen

- Introduced a feature flag
- Refresh TaskView size when thumbnail is refreshed or Recents resizes
- Disable edge scale down in large screens
- Added temp method to get task width/height ratio
- In fullscreen, scale down TaskThumbnailView and disable TaskView elevation
- Task boxing mechanism: http://screen/3NkePthAVUVH2Rv.png

Bug: 174464656
Test: Manually test overview and quickswitch for folded and unfolded, including with RTL.
Change-Id: I2ce24d588a246cc6a2408039a37d884021aa0800
---
 .../TaskViewTouchController.java              |   7 +-
 .../com/android/quickstep/TaskViewUtils.java  |   9 +-
 .../quickstep/util/TaskViewSimulator.java     |   5 +-
 .../android/quickstep/views/RecentsView.java  |  83 +++++-
 .../quickstep/views/TaskThumbnailView.java    |  35 ++-
 .../com/android/quickstep/views/TaskView.java | 267 +++++++++++++++---
 src/com/android/launcher3/PagedView.java      |   8 +-
 .../launcher3/config/FeatureFlags.java        |   4 +
 8 files changed, 361 insertions(+), 57 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
index 7675a7968a..c2e5cdabf2 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
@@ -32,6 +32,7 @@ import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.anim.PendingAnimation;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.touch.BaseSwipeDetector;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
@@ -150,9 +151,11 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
                         mTaskBeingDragged = view;
                         int upDirection = mRecentsView.getPagedOrientationHandler()
                                 .getUpDirection(mIsRtl);
-                        if (!SysUINavigationMode.getMode(mActivity).hasGestures) {
+                        if (!SysUINavigationMode.getMode(mActivity).hasGestures || (
+                                mActivity.getDeviceProfile().isTablet
+                                        && FeatureFlags.ENABLE_OVERVIEW_GRID.get())) {
                             // Don't allow swipe down to open if we don't support swipe up
-                            // to enter overview.
+                            // to enter overview, or when grid layout is enabled.
                             directionsToDetectScroll = upDirection;
                             mAllowGoingUp = true;
                             mAllowGoingDown = false;
diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java
index 9da306eec0..25c0928e8d 100644
--- a/quickstep/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java
@@ -49,6 +49,7 @@ import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.anim.PendingAnimation;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.StateManager;
@@ -174,11 +175,13 @@ public final class TaskViewUtils {
 
         final RecentsView recentsView = v.getRecentsView();
         int taskIndex = recentsView.indexOfChild(v);
-        boolean parallaxCenterAndAdjacentTask = taskIndex != recentsView.getCurrentPage();
-        int startScroll = recentsView.getScrollOffset(taskIndex);
-
         Context context = v.getContext();
         DeviceProfile dp = BaseActivity.fromContext(context).getDeviceProfile();
+        boolean parallaxCenterAndAdjacentTask =
+                taskIndex != recentsView.getCurrentPage() && !(dp.isTablet
+                        && FeatureFlags.ENABLE_OVERVIEW_GRID.get());
+        int startScroll = recentsView.getScrollOffset(taskIndex);
+
         TaskViewSimulator topMostSimulator = null;
 
         if (tsv == null && targets.apps.length > 0) {
diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index 65bcf26305..6f16781c64 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -276,8 +276,9 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
             int start = mOrientationState.getOrientationHandler()
                     .getPrimaryValue(mTaskRect.left, mTaskRect.top);
             mScrollState.screenCenter = start + mScrollState.scroll + mScrollState.halfPageSize;
-            mScrollState.updateInterpolation(start);
-            mCurveScale = TaskView.getCurveScaleForInterpolation(mScrollState.linearInterpolation);
+            mScrollState.updateInterpolation(mDp, start);
+            mCurveScale = TaskView.getCurveScaleForInterpolation(mDp,
+                    mScrollState.linearInterpolation);
         }
 
         float progress = Utilities.boundToRange(fullScreenProgress.value, 0, 1);
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index d9d0a936b2..38d488c470 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -898,9 +898,14 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     public void setFullscreenProgress(float fullscreenProgress) {
         mFullscreenProgress = fullscreenProgress;
         int taskCount = getTaskViewCount();
+        float accumulatedTranslationX = 0;
         for (int i = 0; i < taskCount; i++) {
-            getTaskViewAt(i).setFullscreenProgress(mFullscreenProgress);
+            TaskView taskView = getTaskViewAt(i);
+            taskView.setFullscreenProgress(mFullscreenProgress);
+            taskView.setAccumulatedTranslationX(accumulatedTranslationX);
+            accumulatedTranslationX += taskView.getFullscreenTranslationX();
         }
+
         // Fade out the actions view quickly (0.1 range)
         mActionsView.getFullscreenAlpha().setValue(
                 mapToRange(fullscreenProgress, 0, 0.1f, 1f, 0f, LINEAR));
@@ -934,6 +939,11 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         setPadding(mTempRect.left - mInsets.left, mTempRect.top - mInsets.top,
                 dp.widthPx - mInsets.right - mTempRect.right,
                 dp.heightPx - mInsets.bottom - mTempRect.bottom);
+        // Force TaskView to update size from thumbnail
+        final int taskCount = getTaskViewCount();
+        for (int i = 0; i < taskCount; i++) {
+            getTaskViewAt(i).updateTaskSize();
+        }
     }
 
     public void getTaskSize(Rect outRect) {
@@ -942,6 +952,11 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mLastComputedTaskSize.set(outRect);
     }
 
+    /** Gets the last computed task size */
+    public Rect getLastComputedTaskSize() {
+        return mLastComputedTaskSize;
+    }
+
     /** Gets the task size for modal state. */
     public void getModalTaskSize(Rect outRect) {
         mSizeStrategy.calculateModalTaskSize(mActivity, mActivity.getDeviceProfile(), outRect);
@@ -987,7 +1002,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         final int pageCount = getPageCount();
         for (int i = 0; i < pageCount; i++) {
             View page = getPageAt(i);
-            mScrollState.updateInterpolation(
+            mScrollState.updateInterpolation(mActivity.getDeviceProfile(),
                     mOrientationHandler.getChildStartWithTranslation(page));
             ((PageCallbacks) page).onPageScroll(mScrollState);
         }
@@ -1422,13 +1437,13 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         /**
          * Updates linearInterpolation for the provided child position
          */
-        public void updateInterpolation(float childStart) {
+        public void updateInterpolation(DeviceProfile deviceProfile, float childStart) {
             float pageCenter = childStart + halfPageSize;
             float distanceFromScreenCenter = screenCenter - pageCenter;
             // How far the page has to move from the center to be offscreen, taking into account
             // the EDGE_SCALE_DOWN_FACTOR that will be applied at that position.
             float distanceToReachEdge = halfScreenSize
-                    + halfPageSize * (1 - TaskView.EDGE_SCALE_DOWN_FACTOR);
+                    + halfPageSize * (1 - TaskView.getEdgeScaleDownFactor(deviceProfile));
             linearInterpolation = Math.min(1,
                     Math.abs(distanceFromScreenCenter) / distanceToReachEdge);
         }
@@ -1444,12 +1459,13 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         }
     }
 
-    private void addDismissedTaskAnimations(View taskView, long duration, PendingAnimation anim) {
+    private void addDismissedTaskAnimations(TaskView taskView, long duration,
+            PendingAnimation anim) {
         // Use setFloat instead of setViewAlpha as we want to keep the view visible even when it's
         // alpha is set to 0 so that it can be recycled in the view pool properly
         anim.setFloat(taskView, VIEW_ALPHA, 0, ACCEL_2);
-        FloatProperty<View> secondaryViewTranslate =
-            mOrientationHandler.getSecondaryViewTranslate();
+        FloatProperty<TaskView> secondaryViewTranslate =
+                taskView.getDismissTaskTranslationProperty();
         int secondaryTaskDimension = mOrientationHandler.getSecondaryDimension(taskView);
         int verticalFactor = mOrientationHandler.getSecondaryTranslationDirectionFactor();
 
@@ -1515,7 +1531,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                 int scrollDiff = newScroll[i] - oldScroll[i] + offset;
                 if (scrollDiff != 0) {
                     FloatProperty translationProperty = child instanceof TaskView
-                            ? ((TaskView) child).getPrimaryFillDismissGapTranslationProperty()
+                            ? ((TaskView) child).getFillDismissGapTranslationProperty()
                             : mOrientationHandler.getPrimaryViewTranslate();
 
                     ResourceProvider rp = DynamicResource.provider(mActivity);
@@ -1971,7 +1987,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         // Find the task's scale based on its offscreen progress, then see how far it still needs to
         // move to be completely offscreen.
         Utilities.scaleRectFAboutCenter(taskPosition,
-                TaskView.getCurveScaleForInterpolation(centerToOffscreenProgress));
+                TaskView.getCurveScaleForInterpolation(mActivity.getDeviceProfile(),
+                        centerToOffscreenProgress));
         distanceToOffscreen = desiredLeft - taskPosition.left;
         // Finally, we need to account for RecentsView scale, because it moves tasks based on its
         // pivot. To do this, we move the task position to where it would be offscreen at scale = 1
@@ -1990,7 +2007,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mTaskViewsSecondaryTranslation = translation;
         for (int i = 0; i < getTaskViewCount(); i++) {
             TaskView task = getTaskViewAt(i);
-            mOrientationHandler.getSecondaryViewTranslate().set(task, translation / getScaleY());
+            task.getTaskResistanceTranslationProperty().set(task, translation / getScaleY());
         }
         mLiveTileTaskViewSimulator.recentsViewSecondaryTranslation.value = translation;
     }
@@ -2358,6 +2375,52 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         return super.computeMinScroll();
     }
 
+    @Override
+    protected boolean getPageScrolls(int[] outPageScrolls, boolean layoutChildren,
+            ComputePageScrollsLogic scrollLogic) {
+        boolean pageScrollChanged = super.getPageScrolls(outPageScrolls, layoutChildren,
+                scrollLogic);
+
+        final int taskCount = getTaskViewCount();
+        final int childCount = getChildCount();
+        for (int i = 0; i < childCount; i++) {
+            if (childCount < mTaskViewStartIndex) {
+                continue;
+            }
+
+            final TaskView taskView = getTaskViewAt(
+                    Utilities.boundToRange(i, mTaskViewStartIndex, taskCount - 1));
+            float scrollDiff =
+                    taskView.getFullscreenTranslationX() + taskView.getAccumulatedTranslationX();
+            if (scrollDiff != 0) {
+                outPageScrolls[i] += scrollDiff;
+                pageScrollChanged = true;
+            }
+        }
+        return pageScrollChanged;
+    }
+
+    @Override
+    protected int getChildOffset(int index) {
+        if (index < mTaskViewStartIndex) {
+            return super.getChildOffset(index);
+        }
+
+        final TaskView taskView = getTaskViewAt(
+                Utilities.boundToRange(index, mTaskViewStartIndex, getTaskViewCount() - 1));
+        return super.getChildOffset(index) + (int) taskView.getFullscreenTranslationX()
+                + (int) taskView.getAccumulatedTranslationX();
+    }
+
+    @Override
+    protected int getChildVisibleSize(int index) {
+        final TaskView taskView = getTaskViewAtByAbsoluteIndex(index);
+        if (taskView == null) {
+            return super.getChildVisibleSize(index);
+        }
+        return super.getChildVisibleSize(index) - (int) taskView.getFullscreenTranslationX();
+    }
+
     @Override
     protected int computeMaxScroll() {
         if (getTaskViewCount() > 0) {
diff --git a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
index 445e49085b..3bd883ddc4 100644
--- a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
@@ -51,6 +51,7 @@ import com.android.launcher3.BaseActivity;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.launcher3.util.SystemUiController;
@@ -110,6 +111,9 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
     private boolean mOverlayEnabled;
     private OverviewScreenshotActions mOverviewScreenshotActionsPlugin;
 
+    // TODO(b/179466077): Remove when proper API is ready.
+    private Float mThumbnailRatio = null;
+
     public TaskThumbnailView(Context context) {
         this(context, null);
     }
@@ -450,6 +454,31 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
         return mThumbnailData.isRealSnapshot;
     }
 
+    // TODO(b/179466077): Remove when proper API is ready.
+    public float getThumbnailRatio() {
+        // API is ready.
+        if (mThumbnailRatio != null) {
+            return mThumbnailRatio;
+        }
+
+        if (mThumbnailData == null || mThumbnailData.thumbnail == null) {
+            final float[] thumbnailRatios =
+                    new float[]{0.8882452f, 1.2834098f, 0.5558415f, 2.15625f};
+            // Use key's hash code to return a deterministic thumbnail ratio.
+            mThumbnailRatio = thumbnailRatios[mTask.key.hashCode() % thumbnailRatios.length];
+            return mThumbnailRatio;
+        }
+
+        float surfaceWidth = mThumbnailData.thumbnail.getWidth() / mThumbnailData.scale;
+        float surfaceHeight = mThumbnailData.thumbnail.getHeight() / mThumbnailData.scale;
+        float availableWidth = surfaceWidth
+                - (mThumbnailData.insets.left + mThumbnailData.insets.right);
+        float availableHeight = surfaceHeight
+                - (mThumbnailData.insets.top + mThumbnailData.insets.bottom);
+        mThumbnailRatio = availableWidth / availableHeight;
+        return mThumbnailRatio;
+    }
+
     /**
      * Utility class to position the thumbnail in the TaskView
      */
@@ -480,9 +509,11 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
             float scale = thumbnailData.scale;
             final float thumbnailScale;
 
-            // Landscape vs portrait change
+            // Landscape vs portrait change.
+            // Note: Disable rotation in grid layout.
             boolean windowingModeSupportsRotation = !dp.isMultiWindowMode
-                    && thumbnailData.windowingMode == WINDOWING_MODE_FULLSCREEN;
+                    && thumbnailData.windowingMode == WINDOWING_MODE_FULLSCREEN
+                    && !(dp.isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get());
             isOrientationDifferent = isOrientationChange(deltaRotate)
                     && windowingModeSupportsRotation;
             if (canvasWidth == 0 || canvasHeight == 0 || scale == 0) {
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 59cf3b2b8b..6709c2e43f 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -30,6 +30,8 @@ import static android.widget.Toast.LENGTH_SHORT;
 import static com.android.launcher3.QuickstepAppTransitionManagerImpl.RECENTS_LAUNCH_DURATION;
 import static com.android.launcher3.Utilities.comp;
 import static com.android.launcher3.Utilities.getDescendantCoordRelativeToAncestor;
+import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
+import static com.android.launcher3.anim.Interpolators.EXAGGERATED_EASE;
 import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.Interpolators.TOUCH_RESPONSE_INTERPOLATOR;
@@ -61,6 +63,7 @@ import android.view.MotionEvent;
 import android.view.Surface;
 import android.view.TouchDelegate;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.FrameLayout;
@@ -72,6 +75,7 @@ import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.Interpolators;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.popup.SystemShortcut;
 import com.android.launcher3.statemanager.StatefulActivity;
@@ -120,10 +124,8 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
      */
     public static final float MAX_PAGE_SCRIM_ALPHA = 0.4f;
 
-    /**
-     * How much to scale down pages near the edge of the screen.
-     */
-    public static final float EDGE_SCALE_DOWN_FACTOR = 0.03f;
+    private static final float EDGE_SCALE_DOWN_FACTOR_CAROUSEL = 0.03f;
+    private static final float EDGE_SCALE_DOWN_FACTOR_GRID = 0.00f;
 
     public static final long SCALE_ICON_DURATION = 120;
     private static final long DIM_ANIM_DURATION = 700;
@@ -152,29 +154,29 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
                 }
             };
 
-    private static final FloatProperty<TaskView> FILL_DISMISS_GAP_TRANSLATION_X =
-            new FloatProperty<TaskView>("fillDismissGapTranslationX") {
+    private static final FloatProperty<TaskView> DISMISS_TRANSLATION_X =
+            new FloatProperty<TaskView>("dismissTranslationX") {
                 @Override
                 public void setValue(TaskView taskView, float v) {
-                    taskView.setFillDismissGapTranslationX(v);
+                    taskView.setDismissTranslationX(v);
                 }
 
                 @Override
                 public Float get(TaskView taskView) {
-                    return taskView.mFillDismissGapTranslationX;
+                    return taskView.mDismissTranslationX;
                 }
             };
 
-    private static final FloatProperty<TaskView> FILL_DISMISS_GAP_TRANSLATION_Y =
-            new FloatProperty<TaskView>("fillDismissGapTranslationY") {
+    private static final FloatProperty<TaskView> DISMISS_TRANSLATION_Y =
+            new FloatProperty<TaskView>("dismissTranslationY") {
                 @Override
                 public void setValue(TaskView taskView, float v) {
-                    taskView.setFillDismissGapTranslationY(v);
+                    taskView.setDismissTranslationY(v);
                 }
 
                 @Override
                 public Float get(TaskView taskView) {
-                    return taskView.mFillDismissGapTranslationY;
+                    return taskView.mDismissTranslationY;
                 }
             };
 
@@ -204,6 +206,32 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
                 }
             };
 
+    private static final FloatProperty<TaskView> TASK_RESISTANCE_TRANSLATION_X =
+            new FloatProperty<TaskView>("taskResistanceTranslationX") {
+                @Override
+                public void setValue(TaskView taskView, float v) {
+                    taskView.setTaskResistanceTranslationX(v);
+                }
+
+                @Override
+                public Float get(TaskView taskView) {
+                    return taskView.mTaskResistanceTranslationX;
+                }
+            };
+
+    private static final FloatProperty<TaskView> TASK_RESISTANCE_TRANSLATION_Y =
+            new FloatProperty<TaskView>("taskResistanceTranslationY") {
+                @Override
+                public void setValue(TaskView taskView, float v) {
+                    taskView.setTaskResistanceTranslationY(v);
+                }
+
+                @Override
+                public Float get(TaskView taskView) {
+                    return taskView.mTaskResistanceTranslationY;
+                }
+            };
+
     private final OnAttachStateChangeListener mTaskMenuStateListener =
             new OnAttachStateChangeListener() {
                 @Override
@@ -228,15 +256,22 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     private final DigitalWellBeingToast mDigitalWellBeingToast;
     private float mCurveScale;
     private float mFullscreenProgress;
+    private float mScaleAtFullscreen = 1;
+    private float mFullscreenScale = 1;
     private final FullscreenDrawParams mCurrentFullscreenParams;
     private final StatefulActivity mActivity;
 
     // Various causes of changing primary translation, which we aggregate to setTranslationX/Y().
-    // TODO: We should do this for secondary translation properties as well.
-    private float mFillDismissGapTranslationX;
-    private float mFillDismissGapTranslationY;
+    private float mDismissTranslationX;
+    private float mDismissTranslationY;
     private float mTaskOffsetTranslationX;
     private float mTaskOffsetTranslationY;
+    private float mTaskResistanceTranslationX;
+    private float mTaskResistanceTranslationY;
+    // The following translation variables should only be used in the same orientation as Launcher.
+    private float mFullscreenTranslationX;
+    private float mAccumulatedTranslationX;
+    private float mBoxTranslationY;
 
     private ObjectAnimator mIconAndDimAnimator;
     private float mIconScaleAnimStartProgress = 0;
@@ -425,6 +460,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         cancelPendingLoadTasks();
         mTask = task;
         mSnapshotView.bind(task);
+        updateTaskSize();
         setOrientationState(orientedState);
     }
 
@@ -668,10 +704,12 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
 
     protected void resetViewTransforms() {
         setCurveScale(1);
-        mFillDismissGapTranslationX = mTaskOffsetTranslationX = 0f;
-        mFillDismissGapTranslationY = mTaskOffsetTranslationY = 0f;
-        setTranslationX(0f);
-        setTranslationY(0f);
+        // fullscreenTranslation and accumulatedTranslation should not be reset, as
+        // resetViewTransforms is called during Quickswitch scrolling.
+        mDismissTranslationX = mTaskOffsetTranslationX = mTaskResistanceTranslationX = 0f;
+        mDismissTranslationY = mTaskOffsetTranslationY = mTaskResistanceTranslationY = 0f;
+        applyTranslationX();
+        applyTranslationY();
         setTranslationZ(0);
         setAlpha(mStableAlpha);
         setIconScaleAndDim(1);
@@ -684,6 +722,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
 
     @Override
     public void onRecycle() {
+        mFullscreenTranslationX = mAccumulatedTranslationX = mBoxTranslationY = 0f;
         resetViewTransforms();
         // Clear any references to the thumbnail (it will be re-read either from the cache or the
         // system on next bind)
@@ -702,7 +741,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         float curveInterpolation =
                 CURVE_INTERPOLATOR.getInterpolation(scrollState.linearInterpolation);
         float curveScaleForCurveInterpolation = getCurveScaleForCurveInterpolation(
-                curveInterpolation);
+                mActivity.getDeviceProfile(), curveInterpolation);
         mSnapshotView.setDimAlpha(curveInterpolation * MAX_PAGE_SCRIM_ALPHA);
         setCurveScale(curveScaleForCurveInterpolation);
 
@@ -787,40 +826,70 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
         super.onLayout(changed, left, top, right, bottom);
-        setPivotX((right - left) * 0.5f);
-        setPivotY(mSnapshotView.getTop() + mSnapshotView.getHeight() * 0.5f);
+        if (mActivity.getDeviceProfile().isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get()) {
+            setPivotX(getLayoutDirection() == LAYOUT_DIRECTION_RTL ? (right - left) : 0);
+            setPivotY(0);
+        } else {
+            setPivotX((right - left) * 0.5f);
+            setPivotY(mSnapshotView.getTop() + mSnapshotView.getHeight() * 0.5f);
+        }
         if (Utilities.ATLEAST_Q) {
             SYSTEM_GESTURE_EXCLUSION_RECT.get(0).set(0, 0, getWidth(), getHeight());
             setSystemGestureExclusionRects(SYSTEM_GESTURE_EXCLUSION_RECT);
         }
     }
 
-    public static float getCurveScaleForInterpolation(float linearInterpolation) {
+    /**
+     * How much to scale down pages near the edge of the screen according to linearInterpolation.
+     */
+    public static float getCurveScaleForInterpolation(DeviceProfile deviceProfile,
+            float linearInterpolation) {
         float curveInterpolation = CURVE_INTERPOLATOR.getInterpolation(linearInterpolation);
-        return getCurveScaleForCurveInterpolation(curveInterpolation);
+        return getCurveScaleForCurveInterpolation(deviceProfile, curveInterpolation);
     }
 
-    private static float getCurveScaleForCurveInterpolation(float curveInterpolation) {
-        return 1 - curveInterpolation * EDGE_SCALE_DOWN_FACTOR;
+    private static float getCurveScaleForCurveInterpolation(DeviceProfile deviceProfile,
+            float curveInterpolation) {
+        return 1 - curveInterpolation * getEdgeScaleDownFactor(deviceProfile);
+    }
+
+    /**
+     * How much to scale down pages near the edge of the screen.
+     */
+    public static float getEdgeScaleDownFactor(DeviceProfile deviceProfile) {
+        if (deviceProfile.isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get()) {
+            return EDGE_SCALE_DOWN_FACTOR_GRID;
+        } else {
+            return EDGE_SCALE_DOWN_FACTOR_CAROUSEL;
+        }
     }
 
     private void setCurveScale(float curveScale) {
         mCurveScale = curveScale;
-        setScaleX(mCurveScale);
-        setScaleY(mCurveScale);
+        applyScale();
+    }
+
+    private void setFullscreenScale(float fullscreenScale) {
+        mFullscreenScale = fullscreenScale;
+        applyScale();
+    }
+
+    private void applyScale() {
+        setScaleX(mCurveScale * mFullscreenScale);
+        setScaleY(mCurveScale * mFullscreenScale);
     }
 
     public float getCurveScale() {
         return mCurveScale;
     }
 
-    private void setFillDismissGapTranslationX(float x) {
-        mFillDismissGapTranslationX = x;
+    private void setDismissTranslationX(float x) {
+        mDismissTranslationX = x;
         applyTranslationX();
     }
 
-    private void setFillDismissGapTranslationY(float y) {
-        mFillDismissGapTranslationY = y;
+    private void setDismissTranslationY(float y) {
+        mDismissTranslationY = y;
         applyTranslationY();
     }
 
@@ -834,17 +903,59 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         applyTranslationY();
     }
 
+    private void setTaskResistanceTranslationX(float x) {
+        mTaskResistanceTranslationX = x;
+        applyTranslationX();
+    }
+
+    private void setTaskResistanceTranslationY(float y) {
+        mTaskResistanceTranslationY = y;
+        applyTranslationY();
+    }
+
+    private void setFullscreenTranslationX(float fullscreenTranslationX) {
+        mFullscreenTranslationX = fullscreenTranslationX;
+        applyTranslationX();
+    }
+
+    public float getFullscreenTranslationX() {
+        return mFullscreenTranslationX;
+    }
+
+    public void setAccumulatedTranslationX(float accumulatedTranslationX) {
+        mAccumulatedTranslationX = accumulatedTranslationX;
+        applyTranslationX();
+    }
+
+    public float getAccumulatedTranslationX() {
+        return mAccumulatedTranslationX;
+    }
+
+    private void setBoxTranslationY(float boxTranslationY) {
+        mBoxTranslationY = boxTranslationY;
+        applyTranslationY();
+    }
+
     private void applyTranslationX() {
-        setTranslationX(mFillDismissGapTranslationX + mTaskOffsetTranslationX);
+        setTranslationX(
+                mDismissTranslationX + mTaskOffsetTranslationX + mTaskResistanceTranslationX
+                        + mFullscreenTranslationX + mAccumulatedTranslationX);
     }
 
     private void applyTranslationY() {
-        setTranslationY(mFillDismissGapTranslationY + mTaskOffsetTranslationY);
+        setTranslationY(
+                mDismissTranslationY + mTaskOffsetTranslationY + mTaskResistanceTranslationY
+                        + mBoxTranslationY);
     }
 
-    public FloatProperty<TaskView> getPrimaryFillDismissGapTranslationProperty() {
+    public FloatProperty<TaskView> getFillDismissGapTranslationProperty() {
         return getPagedOrientationHandler().getPrimaryValue(
-                FILL_DISMISS_GAP_TRANSLATION_X, FILL_DISMISS_GAP_TRANSLATION_Y);
+                DISMISS_TRANSLATION_X, DISMISS_TRANSLATION_Y);
+    }
+
+    public FloatProperty<TaskView> getDismissTaskTranslationProperty() {
+        return getPagedOrientationHandler().getSecondaryValue(
+                DISMISS_TRANSLATION_X, DISMISS_TRANSLATION_Y);
     }
 
     public FloatProperty<TaskView> getPrimaryTaskOffsetTranslationProperty() {
@@ -852,6 +963,11 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
                 TASK_OFFSET_TRANSLATION_X, TASK_OFFSET_TRANSLATION_Y);
     }
 
+    public FloatProperty<TaskView> getTaskResistanceTranslationProperty() {
+        return getPagedOrientationHandler().getSecondaryValue(
+                TASK_RESISTANCE_TRANSLATION_X, TASK_RESISTANCE_TRANSLATION_Y);
+    }
+
     @Override
     public boolean hasOverlappingRendering() {
         // TODO: Clip-out the icon region from the thumbnail, since they are overlapping.
@@ -987,6 +1103,8 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         setClipChildren(!isFullscreen);
         setClipToPadding(!isFullscreen);
 
+        updateTaskScaling();
+
         TaskThumbnailView thumbnail = getThumbnail();
         updateCurrentFullscreenParams(thumbnail.getPreviewPositionHelper());
 
@@ -1012,6 +1130,83 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
                 previewPositionHelper);
     }
 
+    void updateTaskSize() {
+        ViewGroup.LayoutParams params = getLayoutParams();
+        if (mActivity.getDeviceProfile().isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get()) {
+            final int thumbnailPadding = (int) getResources().getDimension(
+                    R.dimen.task_thumbnail_top_margin);
+
+            Rect lastComputedTaskSize = getRecentsView().getLastComputedTaskSize();
+            int taskWidth = lastComputedTaskSize.width();
+            int taskHeight = lastComputedTaskSize.height();
+            int boxLength = Math.max(taskWidth, taskHeight);
+            float thumbnailRatio = mSnapshotView.getThumbnailRatio();
+
+            int expectedWidth;
+            int expectedHeight;
+            if (thumbnailRatio > 1) {
+                expectedWidth = boxLength;
+                expectedHeight = (int) (boxLength / thumbnailRatio) + thumbnailPadding;
+            } else {
+                expectedWidth = (int) (boxLength * thumbnailRatio);
+                expectedHeight = boxLength + thumbnailPadding;
+            }
+
+            float heightDiff = (expectedHeight - thumbnailPadding - taskHeight) / 2.0f;
+            setBoxTranslationY(heightDiff);
+
+            if (expectedWidth > taskWidth) {
+                // In full screen, expectedWidth should not be larger than taskWidth.
+                mScaleAtFullscreen = taskWidth / (float) expectedWidth;
+            } else if (expectedHeight - thumbnailPadding > taskHeight) {
+                // In full screen, expectedHeight should not be larger than taskHeight.
+                mScaleAtFullscreen = taskHeight / (float) (expectedHeight - thumbnailPadding);
+            } else {
+                mScaleAtFullscreen = 1f;
+            }
+
+            if (params.width != expectedWidth || params.height != expectedHeight) {
+                params.width = expectedWidth;
+                params.height = expectedHeight;
+                setLayoutParams(params);
+            }
+        } else {
+            setBoxTranslationY(0);
+            if (params.width != ViewGroup.LayoutParams.MATCH_PARENT) {
+                params.width = ViewGroup.LayoutParams.MATCH_PARENT;
+                params.height = ViewGroup.LayoutParams.MATCH_PARENT;
+                setLayoutParams(params);
+            }
+        }
+        updateTaskScaling();
+    }
+
+    private void updateTaskScaling() {
+        if (mActivity.getDeviceProfile().isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get()) {
+            ViewGroup.LayoutParams params = getLayoutParams();
+            if (params.width == ViewGroup.LayoutParams.MATCH_PARENT
+                    || params.height == ViewGroup.LayoutParams.MATCH_PARENT) {
+                // Snapshot is not loaded yet, skip.
+                return;
+            }
+
+            float progress = EXAGGERATED_EASE.getInterpolation(mFullscreenProgress);
+            setFullscreenScale(Utilities.mapRange(progress, 1f, mScaleAtFullscreen));
+
+            float widthDiff = params.width * (1 - mFullscreenScale);
+            setFullscreenTranslationX(getFullscreenTrans(
+                    getLayoutDirection() == LAYOUT_DIRECTION_RTL ? -widthDiff : widthDiff));
+        } else {
+            setFullscreenScale(1);
+            setFullscreenTranslationX(0);
+        }
+    }
+
+    private float getFullscreenTrans(float endTranslation) {
+        float progress = ACCEL_DEACCEL.getInterpolation(mFullscreenProgress);
+        return Utilities.mapRange(progress, 0, endTranslation);
+    }
+
     public boolean isRunningTask() {
         if (getRecentsView() == null) {
             return false;
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 4303dee769..ada297f340 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -745,6 +745,11 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         return mOrientationHandler.getChildStart(pageAtIndex);
     }
 
+    protected int getChildVisibleSize(int index) {
+        View layout = getPageAt(index);
+        return mOrientationHandler.getMeasuredSize(layout);
+    }
+
     @Override
     public boolean requestChildRectangleOnScreen(View child, Rect rectangle, boolean immediate) {
         int page = indexToPage(indexOfChild(child));
@@ -1457,8 +1462,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
     }
 
     private int getDisplacementFromScreenCenter(int childIndex, int screenCenter) {
-        View layout = getPageAt(childIndex);
-        int childSize = mOrientationHandler.getMeasuredSize(layout);
+        int childSize = getChildVisibleSize(childIndex);
         int halfChildSize = (childSize / 2);
         int childCenter = getChildOffset(childIndex) + halfChildSize;
         return childCenter - screenCenter;
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index ac0083c1ee..2b373a84f8 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -214,6 +214,10 @@ public final class FeatureFlags {
     public static final BooleanFlag ENABLE_TASKBAR = new DeviceFlag(
             "ENABLE_TASKBAR", false, "Allows a system Taskbar to be shown on larger devices.");
 
+    public static final BooleanFlag ENABLE_OVERVIEW_GRID = new DeviceFlag(
+            "ENABLE_OVERVIEW_GRID", false, "Uses grid overview layout. "
+            + "Only applicable on large screen devices.");
+
     public static void initialize(Context context) {
         synchronized (sDebugFlags) {
             for (DebugFlag flag : sDebugFlags) {
-- 
GitLab


From afd0d81a70ad148ba5c4c3ebe2a9ac6406557834 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 8 Feb 2021 11:52:57 -0800
Subject: [PATCH 0486/1664] Fix some issues with taskbar

- Update Hotseat items in init() to ensure they are reloaded
- Don't update Recent items if we get the new tasks after cleanup()

Test: Fold and unfold, ensure Taskbar disappears/reappears without
crashing

Bug: 171917176
Change-Id: I1c2ae1022ae56cddece655b22db187684f691bf8
---
 .../launcher3/taskbar/TaskbarHotseatController.java       | 1 +
 .../launcher3/taskbar/TaskbarRecentsController.java       | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java
index 4dc051aaa9..082343ea0b 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java
@@ -57,6 +57,7 @@ public class TaskbarHotseatController {
 
     protected void init() {
         mLauncher.getDragController().addDragListener(mDragListener);
+        onHotseatUpdated();
     }
 
     protected void cleanup() {
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarRecentsController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarRecentsController.java
index 9d4e000da0..4256d2bd88 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarRecentsController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarRecentsController.java
@@ -50,6 +50,8 @@ public class TaskbarRecentsController {
     // The current background requests to load the task icons
     private CancellableTask[] mIconLoadRequests = new CancellableTask[mNumRecentIcons];
 
+    private boolean mIsAlive;
+
     public TaskbarRecentsController(BaseQuickstepLauncher launcher,
             TaskbarController.TaskbarRecentsControllerCallbacks taskbarCallbacks) {
         mLauncher = launcher;
@@ -58,11 +60,13 @@ public class TaskbarRecentsController {
     }
 
     protected void init() {
+        mIsAlive = true;
         TaskStackChangeListeners.getInstance().registerTaskStackListener(mTaskStackChangeListener);
         reloadRecentTasksIfNeeded();
     }
 
     protected void cleanup() {
+        mIsAlive = false;
         TaskStackChangeListeners.getInstance().unregisterTaskStackListener(
                 mTaskStackChangeListener);
         cancelAllPendingIconLoadTasks();
@@ -84,7 +88,9 @@ public class TaskbarRecentsController {
     }
 
     private void onRecentTasksChanged(ArrayList<Task> tasks) {
-        mTaskbarCallbacks.updateRecentItems(tasks);
+        if (mIsAlive) {
+            mTaskbarCallbacks.updateRecentItems(tasks);
+        }
     }
 
     /**
-- 
GitLab


From 52b5a4d8bc6908df88f22684d61aec84c20f77ed Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 4 Feb 2021 15:27:50 -0800
Subject: [PATCH 0487/1664] Registering input monitor in Launcher process

This prevents SystemUI from getting ANR when it's Launcher's fault

Bug: 177556238
Test: Verified apk on device
Change-Id: I101a7e90e43f88f58f715620d71047d5b6a3486c
---
 quickstep/AndroidManifest.xml                                | 1 +
 .../src/com/android/quickstep/TouchInteractionService.java   | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml
index 7431551710..97f4a21a01 100644
--- a/quickstep/AndroidManifest.xml
+++ b/quickstep/AndroidManifest.xml
@@ -39,6 +39,7 @@
     <uses-permission android:name="android.permission.SET_ORIENTATION"/>
     <uses-permission android:name="android.permission.READ_FRAME_BUFFER"/>
     <uses-permission android:name="android.permission.MANAGE_ACCESSIBILITY"/>
+    <uses-permission android:name="android.permission.MONITOR_INPUT"/>
 
     <uses-permission android:name="${packageName}.permission.HOTSEAT_EDU" />
     <uses-permission android:name="android.permission.SYSTEM_APPLICATION_OVERLAY" />
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 8ebea33e72..e2437156fa 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -24,7 +24,6 @@ import static com.android.launcher3.config.FeatureFlags.ASSISTANT_GIVES_LAUNCHER
 import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.quickstep.GestureState.DEFAULT_STATE;
-import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_INPUT_MONITOR;
 import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SYSUI_PROXY;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_TRACING_ENABLED;
 
@@ -283,9 +282,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
             return;
         }
 
-        Bundle bundle = SystemUiProxy.INSTANCE.get(this).monitorGestureInput("swipe-up",
-                mDeviceState.getDisplayId());
-        mInputMonitorCompat = InputMonitorCompat.fromBundle(bundle, KEY_EXTRA_INPUT_MONITOR);
+        mInputMonitorCompat = new InputMonitorCompat("swipe-up", mDeviceState.getDisplayId());
         mInputEventReceiver = mInputMonitorCompat.getInputReceiver(Looper.getMainLooper(),
                 mMainChoreographer, this::onInputEvent);
 
-- 
GitLab


From 4d69fab5c83cf030a1c4d3aceb03890126d9ce58 Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Mon, 8 Feb 2021 16:40:01 -0800
Subject: [PATCH 0488/1664] Support autoEnterPip without source rect hint

When no source rect hint is specified, autoEnterPip simply scale the
window down to the PiP.

Video: http://rcll/aaaaaabFQoRHlzixHdtY/cdY8k6V9uhJEXyMAKAUA34
Video: http://rcll/aaaaaabFQoRHlzixHdtY/bvodLNGyrIXH8DSvGHehrp
Bug: 179286893
Test: manual in ApiDemos app, see video
Change-Id: Ife4f1a56ddfd61c13383da9a1066e3d8b4a2181c
---
 .../android/quickstep/AbsSwipeUpHandler.java  |  8 +-
 .../util/SwipePipToHomeAnimator.java          | 95 ++++++++++++++-----
 2 files changed, 75 insertions(+), 28 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 36b51cdf1c..feeee502de 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1071,9 +1071,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                     && runningTaskTarget != null
                     && runningTaskTarget.pictureInPictureParams != null
                     && TaskInfoCompat.isAutoEnterPipEnabled(
-                            runningTaskTarget.pictureInPictureParams)
-                    && TaskInfoCompat.getPipSourceRectHint(
-                            runningTaskTarget.pictureInPictureParams) != null;
+                            runningTaskTarget.pictureInPictureParams);
             if (mIsSwipingPipToHome) {
                 mSwipePipToHomeAnimator = getSwipePipToHomeAnimator(
                         homeAnimFactory, runningTaskTarget, start);
@@ -1176,8 +1174,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
             swipePipToHomeAnimator.setFromRotation(mTaskViewSimulator, windowRotation);
         }
         swipePipToHomeAnimator.addListener(new AnimatorListenerAdapter() {
+            private boolean mHasAnimationEnded;
             @Override
             public void onAnimationStart(Animator animation) {
+                if (mHasAnimationEnded) return;
                 // Ensure Launcher ends in NORMAL state, we intentionally skip other callbacks
                 // since they are not relevant in this swipe-pip-to-home case.
                 homeAnimFactory.createActivityAnimationToHome().dispatchOnStart();
@@ -1185,6 +1185,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
 
             @Override
             public void onAnimationEnd(Animator animation) {
+                if (mHasAnimationEnded) return;
+                mHasAnimationEnded = true;
                 if (mRecentsAnimationController == null) {
                     // If the recents animation is interrupted, we still end the running
                     // animation (not canceled) so this is still called. In that case, we can
diff --git a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
index 378f25b7dc..0ce50729ed 100644
--- a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
+++ b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
@@ -31,6 +31,7 @@ import android.view.SurfaceControl;
 import android.view.View;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.systemui.shared.pip.PipSurfaceTransactionHelper;
@@ -60,7 +61,7 @@ public class SwipePipToHomeAnimator extends ValueAnimator implements
     /** for calculating the transform in {@link #onAnimationUpdate(ValueAnimator)} */
     private final RectEvaluator mRectEvaluator = new RectEvaluator(new Rect());
     private final RectEvaluator mInsetsEvaluator = new RectEvaluator(new Rect());
-    private final Rect mSourceHintRectInsets = new Rect();
+    private final Rect mSourceHintRectInsets;
     private final Rect mSourceInsets = new Rect();
 
     /** for rotation via {@link #setFromRotation(TaskViewSimulator, int)} */
@@ -89,7 +90,7 @@ public class SwipePipToHomeAnimator extends ValueAnimator implements
     public SwipePipToHomeAnimator(int taskId,
             @NonNull ComponentName componentName,
             @NonNull SurfaceControl leash,
-            @NonNull Rect sourceRectHint,
+            @Nullable Rect sourceRectHint,
             @NonNull Rect appBounds,
             @NonNull Rect startBounds,
             @NonNull Rect destinationBounds,
@@ -104,10 +105,14 @@ public class SwipePipToHomeAnimator extends ValueAnimator implements
         mDestinationBoundsAnimation.set(mDestinationBounds);
         mSurfaceTransactionHelper = new PipSurfaceTransactionHelper();
 
-        mSourceHintRectInsets.set(sourceRectHint.left - appBounds.left,
-                sourceRectHint.top - appBounds.top,
-                appBounds.right - sourceRectHint.right,
-                appBounds.bottom - sourceRectHint.bottom);
+        if (sourceRectHint == null) {
+            mSourceHintRectInsets = null;
+        } else {
+            mSourceHintRectInsets = new Rect(sourceRectHint.left - appBounds.left,
+                    sourceRectHint.top - appBounds.top,
+                    appBounds.right - sourceRectHint.right,
+                    appBounds.bottom - sourceRectHint.bottom);
+        }
 
         addListener(new AnimationSuccessListener() {
             @Override
@@ -168,32 +173,42 @@ public class SwipePipToHomeAnimator extends ValueAnimator implements
         final float fraction = animator.getAnimatedFraction();
         final Rect bounds = mRectEvaluator.evaluate(fraction, mStartBounds,
                 mDestinationBoundsAnimation);
-        final Rect insets = mInsetsEvaluator.evaluate(fraction, mSourceInsets,
-                mSourceHintRectInsets);
         final SurfaceControl.Transaction tx =
                 PipSurfaceTransactionHelper.newSurfaceControlTransaction();
+        if (mSourceHintRectInsets == null) {
+            // no source rect hint been set, directly scale the window down
+            onAnimationScale(fraction, tx, bounds);
+        } else {
+            // scale and crop according to the source rect hint
+            onAnimationScaleAndCrop(fraction, tx, bounds);
+        }
+        mSurfaceTransactionHelper.resetCornerRadius(tx, mLeash);
+        tx.apply();
+    }
+
+    /** scale the window directly with no source rect hint being set */
+    private void onAnimationScale(float fraction, SurfaceControl.Transaction tx, Rect bounds) {
         if (mFromRotation == Surface.ROTATION_90 || mFromRotation == Surface.ROTATION_270) {
-            final float degree, positionX, positionY;
-            if (mFromRotation == Surface.ROTATION_90) {
-                degree = -90 * fraction;
-                positionX = fraction * (mDestinationBoundsTransformed.left - mAppBounds.left)
-                        + mAppBounds.left;
-                positionY = fraction * (mDestinationBoundsTransformed.bottom - mAppBounds.top)
-                        + mAppBounds.top;
-            } else {
-                degree = 90 * fraction;
-                positionX = fraction * (mDestinationBoundsTransformed.right - mAppBounds.left)
-                        + mAppBounds.left;
-                positionY = fraction * (mDestinationBoundsTransformed.top - mAppBounds.top)
-                        + mAppBounds.top;
-            }
+            final RotatedPosition rotatedPosition = getRotatedPosition(fraction);
+            mSurfaceTransactionHelper.scale(tx, mLeash, mAppBounds, bounds,
+                    rotatedPosition.degree, rotatedPosition.positionX, rotatedPosition.positionY);
+        } else {
+            mSurfaceTransactionHelper.scale(tx, mLeash, mAppBounds, bounds);
+        }
+    }
+
+    /** scale and crop the window with source rect hint */
+    private void onAnimationScaleAndCrop(float fraction, SurfaceControl.Transaction tx,
+            Rect bounds) {
+        final Rect insets = mInsetsEvaluator.evaluate(fraction, mSourceInsets,
+                mSourceHintRectInsets);
+        if (mFromRotation == Surface.ROTATION_90 || mFromRotation == Surface.ROTATION_270) {
+            final RotatedPosition rotatedPosition = getRotatedPosition(fraction);
             mSurfaceTransactionHelper.scaleAndRotate(tx, mLeash, mAppBounds, bounds, insets,
-                    degree, positionX, positionY);
+                    rotatedPosition.degree, rotatedPosition.positionX, rotatedPosition.positionY);
         } else {
             mSurfaceTransactionHelper.scaleAndCrop(tx, mLeash, mAppBounds, bounds, insets);
         }
-        mSurfaceTransactionHelper.resetCornerRadius(tx, mLeash);
-        tx.apply();
     }
 
     public int getTaskId() {
@@ -217,4 +232,34 @@ public class SwipePipToHomeAnimator extends ValueAnimator implements
         tx.apply();
         mHasAnimationEnded = true;
     }
+
+    private RotatedPosition getRotatedPosition(float fraction) {
+        final float degree, positionX, positionY;
+        if (mFromRotation == Surface.ROTATION_90) {
+            degree = -90 * fraction;
+            positionX = fraction * (mDestinationBoundsTransformed.left - mAppBounds.left)
+                    + mAppBounds.left;
+            positionY = fraction * (mDestinationBoundsTransformed.bottom - mAppBounds.top)
+                    + mAppBounds.top;
+        } else {
+            degree = 90 * fraction;
+            positionX = fraction * (mDestinationBoundsTransformed.right - mAppBounds.left)
+                    + mAppBounds.left;
+            positionY = fraction * (mDestinationBoundsTransformed.top - mAppBounds.top)
+                    + mAppBounds.top;
+        }
+        return new RotatedPosition(degree, positionX, positionY);
+    }
+
+    private static class RotatedPosition {
+        private final float degree;
+        private final float positionX;
+        private final float positionY;
+
+        private RotatedPosition(float degree, float positionX, float positionY) {
+            this.degree = degree;
+            this.positionX = positionX;
+            this.positionY = positionY;
+        }
+    }
 }
-- 
GitLab


From fb674c7d81d31a5eaf208b51a82b77a25f2873f7 Mon Sep 17 00:00:00 2001
From: Wale Ogunwale <ogunwale@google.com>
Date: Mon, 8 Feb 2021 16:24:42 -0800
Subject: [PATCH 0489/1664] Added API to specify if split-screen should exit on
 hide

Bug: 179176511
Test: presubmits
Change-Id: I6eaecec2ac3fd1bbfbf548078eef525376ddbe72
---
 .../src/com/android/quickstep/SystemUiProxy.java      | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index 85b21e09aa..64d05e1401 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -480,6 +480,17 @@ public class SystemUiProxy implements ISystemUiProxy {
         }
     }
 
+    @Override
+    public void exitSplitScreenOnHide(boolean exitSplitScreenOnHide) {
+        if (mSystemUiProxy != null) {
+            try {
+                mSystemUiProxy.exitSplitScreenOnHide(exitSplitScreenOnHide);
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call exitSplitScreen");
+            }
+        }
+    }
+
     @Override
     public void startTask(int taskId, int stage, int position, Bundle options) {
         if (mSystemUiProxy != null) {
-- 
GitLab


From 61620e75375b45fb88c72336624a9bf3d355fbe3 Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Tue, 9 Feb 2021 09:53:37 -0800
Subject: [PATCH 0490/1664] Fixes NPE with LAUNCHER_ALLAPPS_EXIT log event.

Bug: 179720471
Test: rnlt -until-error -t com.android.launcher3.ui.TaplTestsLauncher3
Change-Id: Ic8f91092aa060a2225c059a89a33b6877cf35f36
---
 .../android/launcher3/allapps/search/LiveSearchManager.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/allapps/search/LiveSearchManager.java b/src/com/android/launcher3/allapps/search/LiveSearchManager.java
index e52c79049f..608affeb2b 100644
--- a/src/com/android/launcher3/allapps/search/LiveSearchManager.java
+++ b/src/com/android/launcher3/allapps/search/LiveSearchManager.java
@@ -157,7 +157,10 @@ public class LiveSearchManager implements StateListener<LauncherState> {
         if (finalState.equals(ALL_APPS)) {
             mLogInstanceId = new InstanceIdSequence().newInstanceId();
             logger.withInstanceId(mLogInstanceId).log(LAUNCHER_ALLAPPS_ENTRY);
-        } else if (mPrevLauncherState.equals(ALL_APPS)) {
+        } else if (mPrevLauncherState.equals(ALL_APPS)
+                // Check if mLogInstanceId is not null; to avoid NPE when LAUNCHER_ALLAPPS_EXIT is
+                // triggered multiple times
+                && mLogInstanceId != null) {
             logger.withInstanceId(mLogInstanceId).log(LAUNCHER_ALLAPPS_EXIT);
             mLogInstanceId = null;
         }
-- 
GitLab


From c402fdaf7b644ecf5ea3b1668fb8cc310483f18a Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 5 Feb 2021 12:59:36 -0800
Subject: [PATCH 0491/1664] Deduping multiple prediction UI update calls

Bug: 179445858
Test: Manual
Change-Id: I6ad86af247a6d94dcaf45206b3d7fb8c44c602d6
---
 .../HotseatPredictionController.java          | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
index 5e81fbaf08..0156e8f513 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
@@ -74,11 +74,13 @@ public class HotseatPredictionController implements DragController.DragListener,
     private static final int FLAG_UPDATE_PAUSED = 1 << 0;
     private static final int FLAG_DRAG_IN_PROGRESS = 1 << 1;
     private static final int FLAG_FILL_IN_PROGRESS = 1 << 2;
+    private static final int FLAG_REMOVING_PREDICTED_ICON = 1 << 3;
 
     private int mHotSeatItemsCount;
 
     private QuickstepLauncher mLauncher;
     private final Hotseat mHotseat;
+    private final Runnable mUpdateFillIfNotLoading = this::updateFillIfNotLoading;
 
     private List<ItemInfo> mPredictedItems = Collections.emptyList();
 
@@ -132,7 +134,8 @@ public class HotseatPredictionController implements DragController.DragListener,
     private void onHotseatHierarchyChanged() {
         if (mPauseFlags == 0 && !mLauncher.isWorkspaceLoading()) {
             // Post update after a single frame to avoid layout within layout
-            MAIN_EXECUTOR.getHandler().post(this::updateFillIfNotLoading);
+            MAIN_EXECUTOR.getHandler().removeCallbacks(mUpdateFillIfNotLoading);
+            MAIN_EXECUTOR.getHandler().post(mUpdateFillIfNotLoading);
         }
     }
 
@@ -374,7 +377,7 @@ public class HotseatPredictionController implements DragController.DragListener,
                 continue;
             }
             if (dragObject.dragSource == this && icon.equals(dragObject.originalView)) {
-                mHotseat.removeView(icon);
+                removeIconWithoutNotify(icon);
                 continue;
             }
             int rank = ((WorkspaceItemInfo) icon.getTag()).rank;
@@ -386,7 +389,7 @@ public class HotseatPredictionController implements DragController.DragListener,
                 @Override
                 public void onAnimationSuccess(Animator animator) {
                     if (icon.getParent() != null) {
-                        mHotseat.removeView(icon);
+                        removeIconWithoutNotify(icon);
                     }
                 }
             });
@@ -395,6 +398,17 @@ public class HotseatPredictionController implements DragController.DragListener,
         mIconRemoveAnimators.start();
     }
 
+    /**
+     * Removes icon while suppressing any extra tasks performed on view-hierarchy changes.
+     * This avoids recursive/redundant updates as the control updates the UI anyway after
+     * it's animation.
+     */
+    private void removeIconWithoutNotify(PredictedAppIcon icon) {
+        mPauseFlags |= FLAG_REMOVING_PREDICTED_ICON;
+        mHotseat.removeView(icon);
+        mPauseFlags &= ~FLAG_REMOVING_PREDICTED_ICON;
+    }
+
     @Override
     public void onDragStart(DropTarget.DragObject dragObject, DragOptions options) {
         removePredictedApps(mOutlineDrawings, dragObject);
-- 
GitLab


From a3a30a9224f5841e702244cafaed9891629143ff Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Mon, 8 Feb 2021 13:25:41 -0800
Subject: [PATCH 0492/1664] Migrate AA+ Search related files

Bug: 179495850
Test: Manual

Change-Id: I32180f14a11eaf72d5d4981e76c2f2ea74472494
---
 .../res/layout/fallback_search_input.xml      |  35 --
 quickstep/res/layout/search_edu_view.xml      |  73 ----
 quickstep/res/layout/search_result_icon.xml   |  20 --
 .../res/layout/search_result_icon_row.xml     |  90 -----
 quickstep/res/layout/search_result_slice.xml  |  40 ---
 .../layout/search_result_small_icon_row.xml   |  73 ----
 .../res/layout/search_result_thumbnail.xml    |  19 -
 .../res/layout/search_result_widget_live.xml  |  43 ---
 .../layout/search_result_widget_preview.xml   |   8 -
 quickstep/res/layout/search_section_title.xml |  25 --
 .../search/DeviceSearchAdapterProvider.java   | 152 --------
 .../launcher3/search/DeviceSearchEdu.java     | 220 ------------
 .../search/FallbackSearchInputView.java       | 140 --------
 .../launcher3/search/SearchAdapterItem.java   |  66 ----
 .../launcher3/search/SearchResultIcon.java    | 325 ------------------
 .../launcher3/search/SearchResultIconRow.java | 158 ---------
 .../search/SearchResultIconSlice.java         | 122 -------
 .../search/SearchResultSmallIconRow.java      | 142 --------
 .../search/SearchResultThumbnailView.java     | 102 ------
 .../launcher3/search/SearchResultWidget.java  | 228 ------------
 .../search/SearchResultWidgetPreview.java     | 130 -------
 .../search/SearchSectionHeaderView.java       |  50 ---
 .../search/SearchServicePipeline.java         | 153 ---------
 .../search/SearchSessionTracker.java          |  81 -----
 .../launcher3/search/SearchTargetHandler.java |  46 ---
 .../launcher3/search/SearchTargetUtil.java    | 198 -----------
 .../uioverrides/QuickstepLauncher.java        |   8 -
 .../util/QuickstepOnboardingPrefs.java        |  20 --
 28 files changed, 2767 deletions(-)
 delete mode 100644 quickstep/res/layout/fallback_search_input.xml
 delete mode 100644 quickstep/res/layout/search_edu_view.xml
 delete mode 100644 quickstep/res/layout/search_result_icon.xml
 delete mode 100644 quickstep/res/layout/search_result_icon_row.xml
 delete mode 100644 quickstep/res/layout/search_result_slice.xml
 delete mode 100644 quickstep/res/layout/search_result_small_icon_row.xml
 delete mode 100644 quickstep/res/layout/search_result_thumbnail.xml
 delete mode 100644 quickstep/res/layout/search_result_widget_live.xml
 delete mode 100644 quickstep/res/layout/search_result_widget_preview.xml
 delete mode 100644 quickstep/res/layout/search_section_title.xml
 delete mode 100644 quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
 delete mode 100644 quickstep/src/com/android/launcher3/search/DeviceSearchEdu.java
 delete mode 100644 quickstep/src/com/android/launcher3/search/FallbackSearchInputView.java
 delete mode 100644 quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
 delete mode 100644 quickstep/src/com/android/launcher3/search/SearchResultIcon.java
 delete mode 100644 quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
 delete mode 100644 quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java
 delete mode 100644 quickstep/src/com/android/launcher3/search/SearchResultSmallIconRow.java
 delete mode 100644 quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java
 delete mode 100644 quickstep/src/com/android/launcher3/search/SearchResultWidget.java
 delete mode 100644 quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java
 delete mode 100644 quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java
 delete mode 100644 quickstep/src/com/android/launcher3/search/SearchServicePipeline.java
 delete mode 100644 quickstep/src/com/android/launcher3/search/SearchSessionTracker.java
 delete mode 100644 quickstep/src/com/android/launcher3/search/SearchTargetHandler.java
 delete mode 100644 quickstep/src/com/android/launcher3/search/SearchTargetUtil.java

diff --git a/quickstep/res/layout/fallback_search_input.xml b/quickstep/res/layout/fallback_search_input.xml
deleted file mode 100644
index 0fb2924d96..0000000000
--- a/quickstep/res/layout/fallback_search_input.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2020 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.launcher3.search.FallbackSearchInputView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_gravity="center_vertical"
-    android:layout_marginLeft="48dp"
-    android:layout_marginRight="48dp"
-    android:background="@android:color/transparent"
-    android:focusableInTouchMode="true"
-    android:gravity="start|center_vertical"
-    android:inputType="textNoSuggestions"
-    android:imeOptions="actionSearch|flagNoExtractUi"
-    android:maxLines="1"
-    android:privateImeOptions="bc_search"
-    android:scrollHorizontally="true"
-    android:singleLine="true"
-    android:textColor="?android:attr/textColorSecondary"
-    android:textColorHint="?android:attr/textColorTertiary"
-    android:textSize="16sp" />
\ No newline at end of file
diff --git a/quickstep/res/layout/search_edu_view.xml b/quickstep/res/layout/search_edu_view.xml
deleted file mode 100644
index d89f5c7fb9..0000000000
--- a/quickstep/res/layout/search_edu_view.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.launcher3.search.DeviceSearchEdu
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_gravity="center_horizontal"
-    android:orientation="vertical">
-
-
-    <FrameLayout
-        android:layout_height="wrap_content"
-        android:id="@+id/search_box_wrapper"
-        android:layout_width="match_parent">
-
-        <include
-            layout="@layout/fallback_search_input"
-            android:id="@+id/mock_search_box" />
-    </FrameLayout>
-
-    <LinearLayout
-        android:layout_height="wrap_content"
-        android:id="@+id/edu_wrapper"
-        android:padding="24dp"
-        android:layout_marginTop="40dp"
-        android:orientation="vertical"
-        android:layout_width="match_parent">
-
-        <TextView
-            style="@style/TextHeadline"
-            android:layout_width="match_parent"
-            android:gravity="center"
-            android:textSize="24sp"
-            android:textColor="?android:attr/textColorPrimary"
-            android:layout_height="wrap_content"
-            android:text="@string/search_edu_primary" />
-
-        <TextView
-            style="@style/TextHeadline"
-            android:layout_width="match_parent"
-            android:gravity="center"
-            android:textSize="18sp"
-            android:layout_marginTop="30dp"
-            android:textColor="?android:attr/textColorPrimary"
-            android:layout_height="wrap_content"
-            android:text="@string/search_edu_secondary" />
-
-        <Button
-            android:id="@+id/dismiss_edu"
-            android:layout_width="wrap_content"
-            android:layout_marginTop="@dimen/dynamic_grid_edge_margin"
-            android:background="?android:attr/selectableItemBackground"
-            android:layout_height="wrap_content"
-            android:textColor="?android:attr/textColorPrimary"
-            android:gravity="center"
-            android:layout_gravity="center"
-            android:text="@string/search_edu_dismiss" />
-
-    </LinearLayout>
-
-</com.android.launcher3.search.DeviceSearchEdu>
\ No newline at end of file
diff --git a/quickstep/res/layout/search_result_icon.xml b/quickstep/res/layout/search_result_icon.xml
deleted file mode 100644
index e1b6dfd371..0000000000
--- a/quickstep/res/layout/search_result_icon.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<com.android.launcher3.search.SearchResultIcon xmlns:launcher="http://schemas.android.com/apk/res-auto"
-    style="@style/BaseIcon.AllApps"
-    launcher:iconDisplay="all_apps"
-    launcher:centerVertically="true" />
-
diff --git a/quickstep/res/layout/search_result_icon_row.xml b/quickstep/res/layout/search_result_icon_row.xml
deleted file mode 100644
index 084920a8e6..0000000000
--- a/quickstep/res/layout/search_result_icon_row.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.launcher3.search.SearchResultIconRow xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res-auto"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="@dimen/dynamic_grid_edge_margin">
-
-    <com.android.launcher3.search.SearchResultIcon
-        android:id="@+id/icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        launcher:iconDisplay="hero_app" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_weight="1"
-        android:layout_height="wrap_content"
-        android:padding="@dimen/dynamic_grid_edge_margin"
-        android:orientation="vertical"
-        android:layout_gravity="center_vertical">
-
-        <TextView
-            android:id="@id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="start|center_vertical"
-            android:maxLines="1"
-            android:textAlignment="viewStart"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textSize="@dimen/search_hero_title_size" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:id="@+id/subtitle"
-            android:maxLines="1"
-            android:textColor="?android:attr/textColorTertiary"
-            android:textSize="@dimen/search_hero_subtitle_size"
-            android:layout_height="wrap_content" />
-    </LinearLayout>
-
-    <com.android.launcher3.search.SearchResultIcon
-        android:id="@+id/shortcut_0"
-        style="@style/BaseIcon"
-        android:layout_width="@dimen/deep_shortcut_icon_size"
-        android:layout_height="match_parent"
-        android:layout_marginStart="4dp"
-        android:gravity="center"
-        launcher:iconDisplay="shortcut_popup"
-        android:textSize="@dimen/search_hero_inline_button_size"
-        launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size"
-        launcher:layoutHorizontal="false" />
-
-    <com.android.launcher3.search.SearchResultIcon
-        android:id="@+id/shortcut_1"
-        style="@style/BaseIcon"
-        android:layout_width="@dimen/deep_shortcut_icon_size"
-        android:layout_height="match_parent"
-        android:layout_marginStart="4dp"
-        android:gravity="center"
-        launcher:iconDisplay="shortcut_popup"
-        android:textSize="@dimen/search_hero_inline_button_size"
-        launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size"
-        launcher:layoutHorizontal="false" />
-
-    <com.android.launcher3.search.SearchResultIcon
-        android:id="@+id/shortcut_2"
-        style="@style/BaseIcon"
-        android:layout_width="@dimen/deep_shortcut_icon_size"
-        android:layout_height="match_parent"
-        android:layout_marginStart="4dp"
-        android:gravity="center"
-        launcher:iconDisplay="shortcut_popup"
-        android:textSize="@dimen/search_hero_inline_button_size"
-        launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size"
-        launcher:layoutHorizontal="false" />
-</com.android.launcher3.search.SearchResultIconRow>
\ No newline at end of file
diff --git a/quickstep/res/layout/search_result_slice.xml b/quickstep/res/layout/search_result_slice.xml
deleted file mode 100644
index 4f884ff30c..0000000000
--- a/quickstep/res/layout/search_result_slice.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.launcher3.search.SearchResultIconSlice xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res-auto"
-    android:padding="@dimen/dynamic_grid_edge_margin"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <FrameLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <com.android.launcher3.search.SearchResultIcon
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/icon"
-            launcher:iconDisplay="hero_app" />
-    </FrameLayout>
-
-    <androidx.slice.widget.SliceView
-        android:id="@+id/slice"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:layout_marginStart="@dimen/dynamic_grid_cell_padding_x"
-        android:layout_width="0dp" />
-
-</com.android.launcher3.search.SearchResultIconSlice>
-
diff --git a/quickstep/res/layout/search_result_small_icon_row.xml b/quickstep/res/layout/search_result_small_icon_row.xml
deleted file mode 100644
index 41856feeb5..0000000000
--- a/quickstep/res/layout/search_result_small_icon_row.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.launcher3.search.SearchResultSmallIconRow
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res-auto"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="@dimen/dynamic_grid_edge_margin">
-
-    <com.android.launcher3.search.SearchResultIcon
-        android:id="@+id/icon"
-        style="@style/BaseIcon"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:drawablePadding="@dimen/dynamic_grid_icon_drawable_padding"
-        android:drawableTint="?android:attr/textColorPrimary"
-        android:padding="@dimen/dynamic_grid_edge_margin"
-        launcher:iconDisplay="hero_app"
-        launcher:iconSizeOverride="48dp"
-        launcher:matchTextInsetWithQuery="true"
-        launcher:layoutHorizontal="true" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_weight="1"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:orientation="horizontal"
-        android:padding="@dimen/dynamic_grid_edge_margin" >
-
-        <TextView
-            android:id="@id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="start|center_vertical"
-            android:maxLines="1"
-            android:paddingEnd="4dp"
-            android:textAlignment="viewStart"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textSize="@dimen/search_hero_title_size" />
-        <TextView
-            android:id="@+id/delimeter"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="start|center_vertical"
-            android:maxLines="1"
-            android:text="\u2022"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textSize="@dimen/search_hero_subtitle_size" />
-        <TextView
-            android:id="@+id/subtitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxLines="1"
-            android:paddingStart="4dp"
-            android:textColor="?android:attr/textColorTertiary"
-            android:textSize="@dimen/search_hero_subtitle_size" />
-    </LinearLayout>
-</com.android.launcher3.search.SearchResultSmallIconRow>
\ No newline at end of file
diff --git a/quickstep/res/layout/search_result_thumbnail.xml b/quickstep/res/layout/search_result_thumbnail.xml
deleted file mode 100644
index 5062b76164..0000000000
--- a/quickstep/res/layout/search_result_thumbnail.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.launcher3.search.SearchResultThumbnailView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="125dp"
-    android:layout_height="125dp"/>
\ No newline at end of file
diff --git a/quickstep/res/layout/search_result_widget_live.xml b/quickstep/res/layout/search_result_widget_live.xml
deleted file mode 100644
index f2ac6cde9b..0000000000
--- a/quickstep/res/layout/search_result_widget_live.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.android.launcher3.search.SearchResultWidget
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingVertical="@dimen/widget_section_vertical_padding"
-    android:layout_marginBottom="@dimen/widget_section_vertical_padding"
-    android:gravity="center"
-    >
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:orientation="horizontal"
-        android:layout_height="wrap_content">
-
-        <com.android.launcher3.BubbleTextView
-            android:id="@+id/widget_provider"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/widget_section_height"
-            android:drawablePadding="@dimen/widget_section_horizontal_padding"
-            android:focusable="true"
-            android:gravity="start|center_vertical"
-            android:paddingHorizontal="@dimen/widget_section_horizontal_padding"
-            android:paddingVertical="@dimen/widget_section_horizontal_padding"
-            android:singleLine="true"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textSize="16sp"
-            android:textAlignment="viewStart"
-            launcher:iconDisplay="widget_section"
-            launcher:layoutHorizontal="true"
-            launcher:iconSizeOverride="@dimen/widget_section_icon_size" />
-
-        <TextView
-            android:id="@+id/widget_label"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/widget_section_height"
-            android:textSize="16sp" />
-
-    </LinearLayout>
-
-</com.android.launcher3.search.SearchResultWidget>
\ No newline at end of file
diff --git a/quickstep/res/layout/search_result_widget_preview.xml b/quickstep/res/layout/search_result_widget_preview.xml
deleted file mode 100644
index 7af24a136d..0000000000
--- a/quickstep/res/layout/search_result_widget_preview.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.android.launcher3.search.SearchResultWidgetPreview xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:padding="@dimen/dynamic_grid_cell_padding_x"
-    android:layout_height="wrap_content">
-    <include layout="@layout/widget_cell" android:id="@+id/widget_cell"/>
-<!--    <include layout="@layout/widget_cell_content" />-->
-</com.android.launcher3.search.SearchResultWidgetPreview>
\ No newline at end of file
diff --git a/quickstep/res/layout/search_section_title.xml b/quickstep/res/layout/search_section_title.xml
deleted file mode 100644
index 5842e574fc..0000000000
--- a/quickstep/res/layout/search_section_title.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.launcher3.search.SearchSectionHeaderView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/section_title"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    style="@style/TextHeadline"
-    android:paddingStart="4dp"
-    android:paddingBottom="2dp"
-    android:paddingTop="12dp"
-    android:textColor="?android:attr/textColorPrimary"
-    android:textSize="18sp" />
\ No newline at end of file
diff --git a/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java b/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
deleted file mode 100644
index d415c36ff7..0000000000
--- a/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.search;
-
-import static com.android.launcher3.allapps.AllAppsGridAdapter.VIEW_TYPE_ALL_APPS_DIVIDER;
-import static com.android.launcher3.allapps.AllAppsGridAdapter.VIEW_TYPE_ICON;
-
-import android.app.search.SearchTarget;
-import android.util.Log;
-import android.util.SparseIntArray;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.android.app.search.LayoutType;
-import com.android.launcher3.Launcher;
-import com.android.launcher3.R;
-import com.android.launcher3.allapps.AllAppsContainerView;
-import com.android.launcher3.allapps.AllAppsGridAdapter;
-import com.android.launcher3.allapps.search.SearchAdapterProvider;
-import com.android.launcher3.config.FeatureFlags;
-
-/**
- * Provides views for on-device search results
- */
-public class DeviceSearchAdapterProvider extends SearchAdapterProvider {
-
-    public static final int VIEW_TYPE_SEARCH_CORPUS_TITLE = 1 << 5;
-    public static final int VIEW_TYPE_SEARCH_SLICE = 1 << 7;
-    public static final int VIEW_TYPE_SEARCH_ICON = (1 << 8) | VIEW_TYPE_ICON;
-    public static final int VIEW_TYPE_SEARCH_ICON_ROW = (1 << 9);
-    public static final int VIEW_TYPE_SEARCH_SMALL_ICON_ROW = (1 << 10);
-    public static final int VIEW_TYPE_SEARCH_THUMBNAIL = 1 << 12;
-    public static final int VIEW_TYPE_SEARCH_WIDGET_LIVE = 1 << 15;
-    public static final int VIEW_TYPE_SEARCH_WIDGET_PREVIEW = 1 << 16;
-
-    private static final String TAG = "SearchServiceAdapter";
-
-    private final AllAppsContainerView mAppsView;
-    private final SparseIntArray mViewTypeToLayoutMap = new SparseIntArray();
-
-    public DeviceSearchAdapterProvider(Launcher launcher, AllAppsContainerView appsView) {
-        super(launcher);
-        mAppsView = appsView;
-
-        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_CORPUS_TITLE, R.layout.search_section_title);
-        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_ICON, R.layout.search_result_icon);
-        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_ICON_ROW, R.layout.search_result_icon_row);
-        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_SMALL_ICON_ROW, R.layout.search_result_small_icon_row);
-        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_SLICE, R.layout.search_result_slice);
-        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_THUMBNAIL, R.layout.search_result_thumbnail);
-        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_WIDGET_LIVE, R.layout.search_result_widget_live);
-        mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_WIDGET_PREVIEW,
-                R.layout.search_result_widget_preview);
-        mViewTypeToLayoutMap.put(VIEW_TYPE_ALL_APPS_DIVIDER, R.layout.all_apps_divider);
-    }
-
-    @Override
-    public void onBindView(AllAppsGridAdapter.ViewHolder holder, int position) {
-        SearchAdapterItem item = (SearchAdapterItem) mAppsView.getApps().getAdapterItems().get(
-                position);
-        SearchTargetHandler
-                payloadResultView =
-                (SearchTargetHandler) holder.itemView;
-        payloadResultView.apply(item.getSearchTarget(), item.getInlineItems());
-    }
-
-    @Override
-    public boolean isSearchView(int viewType) {
-        return mViewTypeToLayoutMap.get(viewType, -1) != -1;
-    }
-
-    @Override
-    public AllAppsGridAdapter.ViewHolder onCreateViewHolder(LayoutInflater inflater,
-            ViewGroup parent, int viewType) {
-        return new AllAppsGridAdapter.ViewHolder(inflater.inflate(
-                mViewTypeToLayoutMap.get(viewType), parent, false));
-    }
-
-    @Override
-    public int getGridSpanSize(int viewType, int appsPerRow) {
-        if (viewType == VIEW_TYPE_SEARCH_THUMBNAIL
-                || viewType == VIEW_TYPE_SEARCH_WIDGET_PREVIEW) {
-            return appsPerRow;
-        }
-        return super.getGridSpanSize(viewType, appsPerRow);
-    }
-
-
-    @Override
-    public boolean onAdapterItemSelected(AllAppsGridAdapter.AdapterItem adapterItem, View view) {
-        if (view instanceof SearchTargetHandler) {
-            return ((SearchTargetHandler) view).quickSelect();
-        }
-        return false;
-    }
-
-    /**
-     * Determines what view type should be used to present search target.
-     * Returns -1 if viewType is not found or if required field is not present
-     * to render the viewType.
-     */
-    public int getViewTypeForSearchTarget(SearchTarget t) {
-        switch (t.getLayoutType()) {
-            case LayoutType.TEXT_HEADER:
-                return VIEW_TYPE_SEARCH_CORPUS_TITLE;
-            case LayoutType.ICON_SINGLE_VERTICAL_TEXT:
-                return VIEW_TYPE_SEARCH_ICON;
-            case LayoutType.ICON_SLICE:
-                if (t.getSliceUri() != null) {
-                    return VIEW_TYPE_SEARCH_SLICE;
-                }
-                Log.w(TAG, "LayoutType.ICON_SLICE target doesn't contain sliceUri.");
-                break;
-            case LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT:
-            case LayoutType.ICON_SINGLE_HORIZONTAL_TEXT:
-            case LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT_BUTTON:
-            case LayoutType.ICON_HORIZONTAL_TEXT:
-                return VIEW_TYPE_SEARCH_ICON_ROW;
-            case LayoutType.SMALL_ICON_HORIZONTAL_TEXT:
-                return VIEW_TYPE_SEARCH_SMALL_ICON_ROW;
-            case LayoutType.THUMBNAIL:
-                if (t.getSearchAction() != null) {
-                    return VIEW_TYPE_SEARCH_THUMBNAIL;
-                }
-                Log.w(TAG, "LayoutType.THUMBNAIL target doesn't contain searchAction.");
-                break;
-            case LayoutType.WIDGET_PREVIEW:
-                return VIEW_TYPE_SEARCH_WIDGET_PREVIEW;
-            case LayoutType.WIDGET_LIVE:
-                return VIEW_TYPE_SEARCH_WIDGET_LIVE;
-            case LayoutType.DIVIDER:
-                return VIEW_TYPE_ALL_APPS_DIVIDER;
-        }
-
-        return -1;
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/search/DeviceSearchEdu.java b/quickstep/src/com/android/launcher3/search/DeviceSearchEdu.java
deleted file mode 100644
index 016ec1b106..0000000000
--- a/quickstep/src/com/android/launcher3/search/DeviceSearchEdu.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.search;
-
-import static com.android.launcher3.util.OnboardingPrefs.SEARCH_EDU_SEEN;
-
-import android.animation.PropertyValuesHolder;
-import android.content.Context;
-import android.graphics.Rect;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.util.AttributeSet;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.EditText;
-import android.widget.TextView;
-
-import androidx.core.graphics.ColorUtils;
-
-import com.android.launcher3.AbstractFloatingView;
-import com.android.launcher3.Insettable;
-import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherState;
-import com.android.launcher3.R;
-import com.android.launcher3.anim.Interpolators;
-import com.android.launcher3.statemanager.StateManager;
-import com.android.launcher3.util.Themes;
-import com.android.launcher3.views.AbstractSlideInView;
-
-/**
- * Feature education for on-device Search. Shown the first time user opens AllApps Search
- */
-public class DeviceSearchEdu extends AbstractSlideInView implements
-        StateManager.StateListener<LauncherState>, TextWatcher, Insettable,
-        TextView.OnEditorActionListener {
-
-    private static final long ANIMATION_DURATION = 350;
-    private static final int ANIMATION_CONTENT_TRANSLATION = 200;
-
-    private EditText mEduInput;
-
-    private View mInputWrapper;
-    private EditText mSearchInput;
-
-    private boolean mSwitchFocusOnDismiss;
-
-
-    public DeviceSearchEdu(Context context) {
-        this(context, null, 0);
-    }
-
-    public DeviceSearchEdu(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public DeviceSearchEdu(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-
-    private void dismiss() {
-        handleClose(true);
-        mLauncher.getOnboardingPrefs().markChecked(SEARCH_EDU_SEEN);
-    }
-
-    @Override
-    protected void handleClose(boolean animate) {
-        handleClose(animate, ANIMATION_DURATION);
-        mLauncher.getAllAppsController().getInsetController().show();
-        mLauncher.getStateManager().removeStateListener(this);
-    }
-
-    @Override
-    protected boolean isOfType(int type) {
-        return false;
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        mSearchInput = mLauncher.getAppsView().getSearchUiManager().getEditText();
-        mInputWrapper = findViewById(R.id.search_box_wrapper);
-        mContent = findViewById(R.id.edu_wrapper);
-
-        mEduInput = findViewById(R.id.mock_search_box);
-        mEduInput.setHint(R.string.all_apps_on_device_search_bar_hint);
-        mEduInput.addTextChangedListener(this);
-        if (mSearchInput != null) {
-            mEduInput.getLayoutParams().height = mSearchInput.getHeight();
-            mEduInput.setOnEditorActionListener(this);
-        } else {
-            mEduInput.setVisibility(INVISIBLE);
-        }
-
-        findViewById(R.id.dismiss_edu).setOnClickListener((view) -> {
-            mSwitchFocusOnDismiss = true;
-            dismiss();
-        });
-    }
-
-    private void showInternal() {
-        mLauncher.getStateManager().addStateListener(this);
-        AbstractFloatingView.closeAllOpenViews(mLauncher);
-        attachToContainer();
-        if (mSearchInput != null) {
-            Rect r = mLauncher.getViewBounds(mSearchInput);
-            mEduInput.requestFocus();
-            InputMethodManager imm = mLauncher.getSystemService(InputMethodManager.class);
-            imm.showSoftInput(mEduInput, InputMethodManager.SHOW_IMPLICIT);
-            ((LayoutParams) mInputWrapper.getLayoutParams()).setMargins(0, r.top, 0, 0);
-        }
-        animateOpen();
-    }
-
-    @Override
-    protected int getScrimColor(Context context) {
-        return ColorUtils.setAlphaComponent(Themes.getAttrColor(context, R.attr.allAppsScrimColor),
-                230);
-    }
-
-    protected void setTranslationShift(float translationShift) {
-        mTranslationShift = translationShift;
-        mContent.setAlpha(getBoxedProgress(1 - mTranslationShift, .25f, 1));
-        mContent.setTranslationY(ANIMATION_CONTENT_TRANSLATION * translationShift);
-        if (mColorScrim != null) {
-            mColorScrim.setAlpha(getBoxedProgress(1 - mTranslationShift, 0, .75f));
-        }
-    }
-
-    /**
-     * Given input [0-1], returns progress within bounds [min,max] allowing for staged animations
-     */
-    private float getBoxedProgress(float input, float min, float max) {
-        if (input < min) return 0;
-        if (input > max) return 1;
-        return (input - min) / (max - min);
-    }
-
-    private void animateOpen() {
-        if (mIsOpen || mOpenCloseAnimator.isRunning()) {
-            return;
-        }
-        mIsOpen = true;
-        mOpenCloseAnimator.setValues(
-                PropertyValuesHolder.ofFloat(TRANSLATION_SHIFT, TRANSLATION_SHIFT_OPENED));
-        mOpenCloseAnimator.setInterpolator(Interpolators.FAST_OUT_SLOW_IN);
-        mOpenCloseAnimator.setDuration(ANIMATION_DURATION);
-        mOpenCloseAnimator.start();
-    }
-
-    /**
-     * Show On-device search education view.
-     */
-    public static void show(Launcher launcher) {
-        LayoutInflater layoutInflater = LayoutInflater.from(launcher);
-        ((DeviceSearchEdu) layoutInflater.inflate(
-                R.layout.search_edu_view, launcher.getDragLayer(),
-                false)).showInternal();
-    }
-
-    @Override
-    public void onStateTransitionStart(LauncherState toState) {
-        dismiss();
-    }
-
-    @Override
-    protected void onCloseComplete() {
-        super.onCloseComplete();
-        if (mSearchInput != null && mSwitchFocusOnDismiss) {
-            mSearchInput.requestFocus();
-            mSearchInput.setSelection(mSearchInput.getText().length());
-        }
-    }
-
-    @Override
-    public void afterTextChanged(Editable editable) {
-        //Does nothing
-    }
-
-    @Override
-    public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-        //Does nothing
-    }
-
-    @Override
-    public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-        if (mSearchInput != null) {
-            mSearchInput.setText(charSequence.toString());
-            mSwitchFocusOnDismiss = true;
-            dismiss();
-        }
-    }
-
-    @Override
-    public void setInsets(Rect insets) {
-
-    }
-
-    @Override
-    public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) {
-        mSearchInput.onEditorAction(i);
-        dismiss();
-        return true;
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/search/FallbackSearchInputView.java b/quickstep/src/com/android/launcher3/search/FallbackSearchInputView.java
deleted file mode 100644
index 7b106228a8..0000000000
--- a/quickstep/src/com/android/launcher3/search/FallbackSearchInputView.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.search;
-
-import static com.android.launcher3.LauncherState.ALL_APPS;
-
-import android.content.Context;
-import android.graphics.Rect;
-import android.util.AttributeSet;
-
-import com.android.launcher3.ExtendedEditText;
-import com.android.launcher3.Launcher;
-import com.android.launcher3.allapps.AllAppsContainerView;
-import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItem;
-import com.android.launcher3.allapps.AllAppsStore;
-import com.android.launcher3.allapps.AlphabeticalAppsList;
-import com.android.launcher3.allapps.FloatingHeaderView;
-import com.android.launcher3.allapps.search.AllAppsSearchBarController;
-import com.android.launcher3.allapps.search.SearchAlgorithm;
-
-import java.util.ArrayList;
-
-/**
- * A search view shown in all apps for on device search
- */
-public class FallbackSearchInputView extends ExtendedEditText
-        implements AllAppsSearchBarController.Callbacks, AllAppsStore.OnUpdateListener {
-
-    private final AllAppsSearchBarController mSearchBarController;
-
-    private AlphabeticalAppsList mApps;
-    private Runnable mOnResultsChanged;
-    private AllAppsContainerView mAppsView;
-
-    public FallbackSearchInputView(Context context) {
-        this(context, null);
-    }
-
-    public FallbackSearchInputView(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public FallbackSearchInputView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        mSearchBarController = new AllAppsSearchBarController();
-    }
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        Launcher.getLauncher(getContext()).getAppsView().getAppsStore().addUpdateListener(this);
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        Launcher.getLauncher(getContext()).getAppsView().getAppsStore().removeUpdateListener(this);
-    }
-
-    /**
-     * Initializes SearchInput
-     */
-    public void initialize(AllAppsContainerView appsView, SearchAlgorithm algo, Runnable changed) {
-        mOnResultsChanged = changed;
-        mApps = appsView.getApps();
-        mAppsView = appsView;
-        mSearchBarController.initialize(algo, this, Launcher.getLauncher(getContext()), this);
-    }
-
-    @Override
-    public void onSearchResult(String query, ArrayList<AdapterItem> items) {
-        if (mApps != null && getParent() != null) {
-            mApps.setSearchResults(items);
-            notifyResultChanged();
-            collapseAppsViewHeader(true);
-            mAppsView.setLastSearchQuery(query);
-        }
-    }
-
-    @Override
-    public void onAppendSearchResult(String query, ArrayList<AdapterItem> items) {
-        if (mApps != null && getParent() != null) {
-            mApps.appendSearchResults(items);
-            notifyResultChanged();
-        }
-    }
-
-    @Override
-    public void clearSearchResult() {
-        if (getParent() != null && mApps != null) {
-            mApps.setSearchResults(null);
-            notifyResultChanged();
-            collapseAppsViewHeader(false);
-            mAppsView.onClearSearchResult();
-        }
-    }
-
-    @Override
-    public void onAppsUpdated() {
-        mSearchBarController.refreshSearchResult();
-    }
-
-    private void collapseAppsViewHeader(boolean collapse) {
-        FloatingHeaderView header = mAppsView.getFloatingHeaderView();
-        if (header != null) {
-            header.setCollapsed(collapse);
-        }
-    }
-
-    private void notifyResultChanged() {
-        if (mOnResultsChanged != null) {
-            mOnResultsChanged.run();
-        }
-        mAppsView.onSearchResultsChanged();
-    }
-
-    @Override
-    protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
-        // TODO: Consider animating the state transition here
-        if (focused) {
-            // Getting focus will open the keyboard. Go to the all-apps state, so that the input
-            // box is at the top and there is enough space below to show search results.
-            Launcher.getLauncher(getContext()).getStateManager().goToState(ALL_APPS, false);
-        }
-        super.onFocusChanged(focused, direction, previouslyFocusedRect);
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java b/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
deleted file mode 100644
index 8983c4f3b8..0000000000
--- a/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.search;
-
-import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_ICON;
-import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_ICON_ROW;
-import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_SMALL_ICON_ROW;
-import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_SLICE;
-import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_THUMBNAIL;
-import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_WIDGET_LIVE;
-import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_WIDGET_PREVIEW;
-
-import android.app.search.SearchTarget;
-
-import com.android.launcher3.allapps.AllAppsGridAdapter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Extension of AdapterItem that contains an extra payload specific to item
- */
-public class SearchAdapterItem extends AllAppsGridAdapter.AdapterItem {
-    private SearchTarget mSearchTarget;
-    private List<SearchTarget> mInlineItems = new ArrayList<>();
-
-
-    private static final int AVAILABLE_FOR_ACCESSIBILITY = VIEW_TYPE_SEARCH_SLICE
-            | VIEW_TYPE_SEARCH_THUMBNAIL
-            | VIEW_TYPE_SEARCH_ICON_ROW
-            | VIEW_TYPE_SEARCH_ICON
-            | VIEW_TYPE_SEARCH_SMALL_ICON_ROW
-            | VIEW_TYPE_SEARCH_WIDGET_PREVIEW
-            | VIEW_TYPE_SEARCH_WIDGET_LIVE;
-
-    public SearchAdapterItem(SearchTarget searchTarget, int type) {
-        mSearchTarget = searchTarget;
-        viewType = type;
-    }
-
-    public SearchTarget getSearchTarget() {
-        return mSearchTarget;
-    }
-
-    public List<SearchTarget> getInlineItems() {
-        return mInlineItems;
-    }
-    @Override
-    protected boolean isCountedForAccessibility() {
-        return (AVAILABLE_FOR_ACCESSIBILITY & viewType) == viewType;
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
deleted file mode 100644
index 4c44479330..0000000000
--- a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.search;
-
-import static com.android.launcher3.LauncherSettings.Favorites.EXTENDED_CONTAINERS;
-import static com.android.launcher3.model.data.SearchActionItemInfo.FLAG_BADGE_WITH_PACKAGE;
-import static com.android.launcher3.model.data.SearchActionItemInfo.FLAG_PRIMARY_ICON_FROM_TITLE;
-import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE;
-import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
-
-import android.app.search.SearchAction;
-import android.app.search.SearchTarget;
-import android.app.search.SearchTargetEvent;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.pm.ShortcutInfo;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.graphics.drawable.Icon;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.android.app.search.ResultType;
-import com.android.launcher3.BubbleTextView;
-import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.allapps.AllAppsStore;
-import com.android.launcher3.icons.BitmapInfo;
-import com.android.launcher3.icons.BitmapRenderer;
-import com.android.launcher3.icons.LauncherIcons;
-import com.android.launcher3.logger.LauncherAtomExtensions.DeviceSearchResultContainer;
-import com.android.launcher3.logger.LauncherAtomExtensions.ExtendedContainers;
-import com.android.launcher3.model.data.AppInfo;
-import com.android.launcher3.model.data.ItemInfoWithIcon;
-import com.android.launcher3.model.data.PackageItemInfo;
-import com.android.launcher3.model.data.SearchActionItemInfo;
-import com.android.launcher3.model.data.WorkspaceItemInfo;
-import com.android.launcher3.touch.ItemClickHandler;
-import com.android.launcher3.touch.ItemLongClickListener;
-import com.android.launcher3.util.ComponentKey;
-import com.android.launcher3.util.Themes;
-
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.List;
-import java.util.function.Consumer;
-
-/**
- * A {@link BubbleTextView} representing a single cell result in AllApps
- */
-public class SearchResultIcon extends BubbleTextView implements
-        SearchTargetHandler, View.OnClickListener,
-        View.OnLongClickListener {
-
-    //Play store thumbnail process workaround
-    private final Rect mTempRect = new Rect();
-    private final Paint mIconPaint = new Paint();
-    private static final int BITMAP_CROP_MASK_COLOR = 0xff424242;
-
-    private final Launcher mLauncher;
-    private final SearchSessionTracker mSearchSessionTracker;
-    private String mTargetId;
-    private Consumer<ItemInfoWithIcon> mOnItemInfoChanged;
-
-
-    public SearchResultIcon(Context context) {
-        this(context, null, 0);
-    }
-
-    public SearchResultIcon(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public SearchResultIcon(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        mLauncher = Launcher.getLauncher(getContext());
-        mSearchSessionTracker = SearchSessionTracker.getInstance(getContext());
-    }
-
-    private boolean mLongPressSupported;
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        setLongPressTimeoutFactor(1f);
-        setOnFocusChangeListener(mLauncher.getFocusHandler());
-        setOnClickListener(this);
-        setOnLongClickListener(this);
-        setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                mLauncher.getDeviceProfile().allAppsCellHeightPx));
-    }
-
-    /**
-     * Applies {@link SearchTarget} to view. registers a consumer after a corresponding {@link
-     * ItemInfoWithIcon} is created
-     */
-    public void apply(SearchTarget searchTarget, List<SearchTarget> inlineItems,
-            Consumer<ItemInfoWithIcon> cb) {
-        mOnItemInfoChanged = cb;
-        apply(searchTarget, inlineItems);
-    }
-
-    @Override
-    public void apply(SearchTarget parentTarget, List<SearchTarget> children) {
-        mTargetId = parentTarget.getId();
-        if (parentTarget.getShortcutInfo() != null) {
-            prepareUsingShortcutInfo(parentTarget.getShortcutInfo());
-            mLongPressSupported = true;
-        } else if (parentTarget.getSearchAction() != null) {
-            prepareUsingSearchAction(parentTarget);
-            mLongPressSupported = false;
-        } else {
-            String className = parentTarget.getExtras().getString(SearchTargetUtil.EXTRA_CLASS);
-            prepareUsingApp(new ComponentName(parentTarget.getPackageName(), className),
-                    parentTarget.getUserHandle());
-            mLongPressSupported = true;
-        }
-    }
-
-    private void prepareUsingSearchAction(SearchTarget searchTarget) {
-        SearchAction searchAction = searchTarget.getSearchAction();
-        Bundle extras = searchAction.getExtras();
-
-        SearchActionItemInfo itemInfo = new SearchActionItemInfo(searchAction.getIcon(),
-                searchTarget.getPackageName(), searchTarget.getUserHandle(),
-                searchAction.getTitle()) {
-            @Override
-            protected ExtendedContainers getExtendedContainer() {
-                return ExtendedContainers.newBuilder()
-                        .setDeviceSearchResultContainer(buildDeviceSearchResultContainer()).build();
-            }
-        };
-        itemInfo.setIntent(searchAction.getIntent());
-        itemInfo.setPendingIntent(searchAction.getPendingIntent());
-
-        //TODO: remove this after flags are introduced in SearchAction. Settings results require
-        // startActivityForResult
-        boolean isSettingsResult = searchTarget.getResultType() == ResultType.SETTING;
-        if ((extras != null && extras.getBoolean(
-                SearchTargetUtil.BUNDLE_EXTRA_SHOULD_START_FOR_RESULT))
-                || isSettingsResult) {
-            itemInfo.setFlags(SearchActionItemInfo.FLAG_SHOULD_START_FOR_RESULT);
-        } else if (extras != null && extras.getBoolean(
-                SearchTargetUtil.BUNDLE_EXTRA_SHOULD_START)) {
-            itemInfo.setFlags(SearchActionItemInfo.FLAG_SHOULD_START);
-        }
-        if (extras != null && extras.getBoolean(
-                SearchTargetUtil.BUNDLE_EXTRA_BADGE_WITH_PACKAGE)) {
-            itemInfo.setFlags(FLAG_BADGE_WITH_PACKAGE);
-        }
-        if (extras != null && extras.getBoolean(BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE)) {
-            itemInfo.setFlags(FLAG_PRIMARY_ICON_FROM_TITLE);
-        }
-
-        notifyItemInfoChanged(itemInfo);
-        LauncherAppState appState = LauncherAppState.getInstance(mLauncher);
-        MODEL_EXECUTOR.post(() -> {
-            try (LauncherIcons li = LauncherIcons.obtain(getContext())) {
-                Icon icon = searchTarget.getSearchAction().getIcon();
-                BitmapInfo pkgBitmap = getPackageBitmap(appState, searchTarget);
-                if (itemInfo.hasFlags(FLAG_PRIMARY_ICON_FROM_TITLE)) {
-                    // create a bitmap with first char if FLAG_PRIMARY_ICON_FROM_TITLE is set
-                    itemInfo.bitmap = li.createIconBitmap(String.valueOf(itemInfo.title.charAt(0)),
-                            pkgBitmap.color);
-                } else if (icon == null) {
-                    // Use default icon from package name
-                    itemInfo.bitmap = pkgBitmap;
-                } else {
-                    boolean isPlayResult = searchTarget.getResultType() == ResultType.PLAY;
-                    if (isPlayResult) {
-                        Bitmap b = getPlayResultBitmap(searchAction.getIcon());
-                        itemInfo.bitmap = b == null
-                                ? BitmapInfo.LOW_RES_INFO : BitmapInfo.fromBitmap(b);
-                    } else {
-                        itemInfo.bitmap = li.createBadgedIconBitmap(icon.loadDrawable(getContext()),
-                                itemInfo.user, false);
-                    }
-                }
-
-                // badge with package name
-                if (itemInfo.hasFlags(FLAG_BADGE_WITH_PACKAGE) && itemInfo.bitmap != pkgBitmap) {
-                    itemInfo.bitmap = li.badgeBitmap(itemInfo.bitmap.icon, pkgBitmap);
-                }
-            }
-            MAIN_EXECUTOR.post(() -> applyFromSearchActionItemInfo(itemInfo));
-        });
-    }
-
-    private static BitmapInfo getPackageBitmap(LauncherAppState appState, SearchTarget target) {
-        PackageItemInfo pkgInfo = new PackageItemInfo(target.getPackageName());
-        pkgInfo.user = target.getUserHandle();
-        appState.getIconCache().getTitleAndIconForApp(pkgInfo, false);
-        return pkgInfo.bitmap;
-    }
-
-    private Bitmap getPlayResultBitmap(Icon icon) {
-        try {
-            int iconSize = getIconSize();
-            URL url = new URL(icon.getUri().toString());
-            URLConnection con = url.openConnection();
-            con.addRequestProperty("Cache-Control", "max-age: 0");
-            con.setUseCaches(true);
-            Bitmap bitmap = BitmapFactory.decodeStream(con.getInputStream());
-            return getRoundedBitmap(Bitmap.createScaledBitmap(bitmap, iconSize, iconSize, false));
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    private Bitmap getRoundedBitmap(Bitmap bitmap) {
-        final int iconSize = bitmap.getWidth();
-        final float radius = Themes.getDialogCornerRadius(getContext());
-
-        return BitmapRenderer.createHardwareBitmap(iconSize, iconSize, (canvas) -> {
-            mTempRect.set(0, 0, iconSize, iconSize);
-            final RectF rectF = new RectF(mTempRect);
-
-            mIconPaint.setAntiAlias(true);
-            mIconPaint.reset();
-            canvas.drawARGB(0, 0, 0, 0);
-            mIconPaint.setColor(BITMAP_CROP_MASK_COLOR);
-            canvas.drawRoundRect(rectF, radius, radius, mIconPaint);
-
-            mIconPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
-            canvas.drawBitmap(bitmap, mTempRect, mTempRect, mIconPaint);
-        });
-    }
-
-    private void prepareUsingApp(ComponentName componentName, UserHandle userHandle) {
-        AllAppsStore appsStore = mLauncher.getAppsView().getAppsStore();
-        AppInfo appInfo = new AppInfo(
-                appsStore.getApp(new ComponentKey(componentName, userHandle))) {
-            @Override
-            protected ExtendedContainers getExtendedContainer() {
-                return ExtendedContainers.newBuilder()
-                        .setDeviceSearchResultContainer(buildDeviceSearchResultContainer()).build();
-            }
-        };
-        appInfo.container = EXTENDED_CONTAINERS;
-        if (appInfo == null) {
-            setVisibility(GONE);
-            return;
-        }
-        applyFromApplicationInfo(appInfo);
-        notifyItemInfoChanged(appInfo);
-    }
-
-    private void prepareUsingShortcutInfo(ShortcutInfo shortcutInfo) {
-        WorkspaceItemInfo workspaceItemInfo = new WorkspaceItemInfo(shortcutInfo, getContext()) {
-            @Override
-            protected ExtendedContainers getExtendedContainer() {
-                return ExtendedContainers.newBuilder()
-                        .setDeviceSearchResultContainer(buildDeviceSearchResultContainer()).build();
-            }
-        };
-        workspaceItemInfo.container = EXTENDED_CONTAINERS;
-        notifyItemInfoChanged(workspaceItemInfo);
-        LauncherAppState launcherAppState = LauncherAppState.getInstance(getContext());
-        MODEL_EXECUTOR.execute(() -> {
-            launcherAppState.getIconCache().getShortcutIcon(workspaceItemInfo, shortcutInfo);
-            MAIN_EXECUTOR.post(() -> applyFromWorkspaceItem(workspaceItemInfo));
-        });
-    }
-
-    @Override
-    public boolean quickSelect() {
-        this.performClick();
-        notifyEvent(mLauncher, mTargetId, SearchTargetEvent.ACTION_LAUNCH_KEYBOARD_FOCUS);
-        return true;
-    }
-
-    @Override
-    public void onClick(View view) {
-        ItemClickHandler.INSTANCE.onClick(view);
-        notifyEvent(mLauncher, mTargetId, SearchTargetEvent.ACTION_LAUNCH_TOUCH);
-    }
-
-    @Override
-    public boolean onLongClick(View view) {
-        if (!mLongPressSupported) {
-            return false;
-        }
-        notifyEvent(mLauncher, mTargetId, SearchTargetEvent.ACTION_LONGPRESS);
-        return ItemLongClickListener.INSTANCE_ALL_APPS.onLongClick(this);
-    }
-
-
-    private void notifyItemInfoChanged(ItemInfoWithIcon itemInfoWithIcon) {
-        if (mOnItemInfoChanged != null) {
-            mOnItemInfoChanged.accept(itemInfoWithIcon);
-            mOnItemInfoChanged = null;
-        }
-    }
-
-    private DeviceSearchResultContainer buildDeviceSearchResultContainer() {
-        return mSearchSessionTracker.getQueryLength()
-                .map(queryLength -> DeviceSearchResultContainer.newBuilder()
-                        .setQueryLength(queryLength))
-                .orElse(DeviceSearchResultContainer.newBuilder()).build();
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java b/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
deleted file mode 100644
index 12a1a1cd34..0000000000
--- a/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.search;
-
-import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
-
-import android.app.search.SearchTarget;
-import android.content.Context;
-import android.content.pm.ShortcutInfo;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.R;
-import com.android.launcher3.model.data.ItemInfoWithIcon;
-import com.android.launcher3.model.data.PackageItemInfo;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A full width representation of {@link SearchResultIcon} with a secondary label and inline
- * SearchTargets
- */
-public class SearchResultIconRow extends LinearLayout implements SearchTargetHandler {
-
-    public static final int MAX_INLINE_ITEMS = 3;
-
-    protected final Launcher mLauncher;
-    protected final SearchResultIcon[] mInlineIcons = new SearchResultIcon[MAX_INLINE_ITEMS];
-    private SearchResultIcon mResultIcon;
-
-    private final LauncherAppState mLauncherAppState;
-    private TextView mTitleView;
-    private TextView mSubTitleView;
-
-    private PackageItemInfo mProviderInfo;
-
-    public SearchResultIconRow(Context context) {
-        this(context, null, 0);
-    }
-
-    public SearchResultIconRow(Context context,
-            @Nullable AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public SearchResultIconRow(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        mLauncher = Launcher.getLauncher(getContext());
-        mLauncherAppState = LauncherAppState.getInstance(getContext());
-    }
-
-    protected int getIconSize() {
-        return mLauncher.getDeviceProfile().allAppsIconSizePx;
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        int iconSize = getIconSize();
-
-        mResultIcon = findViewById(R.id.icon);
-
-        mTitleView = findViewById(R.id.title);
-        mSubTitleView = findViewById(R.id.subtitle);
-        mSubTitleView.setVisibility(GONE);
-
-        mResultIcon.getLayoutParams().height = iconSize;
-        mResultIcon.getLayoutParams().width = iconSize;
-        mResultIcon.setTextVisibility(false);
-
-        mInlineIcons[0] = findViewById(R.id.shortcut_0);
-        mInlineIcons[1] = findViewById(R.id.shortcut_1);
-        mInlineIcons[2] = findViewById(R.id.shortcut_2);
-        for (SearchResultIcon inlineIcon : mInlineIcons) {
-            inlineIcon.getLayoutParams().width = getIconSize();
-        }
-        setOnClickListener(mResultIcon);
-        setOnLongClickListener(mResultIcon);
-    }
-
-    @Override
-    public void apply(SearchTarget parentTarget, List<SearchTarget> children) {
-        mResultIcon.apply(parentTarget, children, this::onItemInfoCreated);
-
-        showSubtitleIfNeeded(null);
-
-        if (parentTarget.getShortcutInfo() != null) {
-            updateWithShortcutInfo(parentTarget.getShortcutInfo());
-        } else if (parentTarget.getSearchAction() != null) {
-            showSubtitleIfNeeded(parentTarget.getSearchAction().getSubtitle());
-        }
-        showInlineItems(children);
-    }
-
-    @Override
-    public boolean quickSelect() {
-        this.performClick();
-        return true;
-    }
-
-    private void updateWithShortcutInfo(ShortcutInfo shortcutInfo) {
-        PackageItemInfo packageItemInfo = new PackageItemInfo(shortcutInfo.getPackage());
-        if (packageItemInfo.equals(mProviderInfo)) return;
-        MODEL_EXECUTOR.post(() -> {
-            mLauncherAppState.getIconCache().getTitleAndIconForApp(packageItemInfo, true);
-            MAIN_EXECUTOR.post(() -> {
-                showSubtitleIfNeeded(packageItemInfo.title);
-                mProviderInfo = packageItemInfo;
-            });
-        });
-    }
-
-    protected void showSubtitleIfNeeded(CharSequence subTitle) {
-        if (!TextUtils.isEmpty(subTitle)) {
-            mSubTitleView.setText(subTitle);
-            mSubTitleView.setVisibility(VISIBLE);
-        } else {
-            mSubTitleView.setVisibility(GONE);
-        }
-    }
-
-    protected void showInlineItems(List<SearchTarget> children) {
-        for (int i = 0; i < MAX_INLINE_ITEMS; i++) {
-            if (i < children.size()) {
-                mInlineIcons[i].apply(children.get(i), new ArrayList<>());
-                mInlineIcons[i].setVisibility(VISIBLE);
-            } else {
-                mInlineIcons[i].setVisibility(GONE);
-            }
-        }
-    }
-
-    protected void onItemInfoCreated(ItemInfoWithIcon info) {
-        setTag(info);
-        mTitleView.setText(info.title);
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java b/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java
deleted file mode 100644
index 4bf34324a7..0000000000
--- a/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.search;
-
-import android.app.search.SearchTarget;
-import android.app.search.SearchTargetEvent;
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.LinearLayout;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.slice.SliceItem;
-import androidx.slice.widget.EventInfo;
-import androidx.slice.widget.SliceView;
-
-import com.android.launcher3.Launcher;
-import com.android.launcher3.R;
-import com.android.launcher3.model.data.PackageItemInfo;
-import com.android.launcher3.util.SafeCloseable;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A slice view wrapper with settings app icon at start
- */
-public class SearchResultIconSlice extends LinearLayout implements SearchTargetHandler,
-        SliceView.OnSliceActionListener {
-
-    private final Launcher mLauncher;
-
-    private SliceView mSliceView;
-    private SearchResultIcon mIcon;
-    private SafeCloseable mSliceSession;
-    private String mTargetId;
-
-    public SearchResultIconSlice(Context context) {
-        this(context, null, 0);
-    }
-
-    public SearchResultIconSlice(Context context,
-            @Nullable AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public SearchResultIconSlice(Context context, @Nullable AttributeSet attrs,
-            int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        mLauncher = Launcher.getLauncher(getContext());
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        mSliceView = findViewById(R.id.slice);
-        mIcon = findViewById(R.id.icon);
-        mIcon.setTextVisibility(false);
-        int iconSize = mLauncher.getDeviceProfile().iconSizePx;
-        mIcon.getLayoutParams().height = iconSize;
-        mIcon.getLayoutParams().width = iconSize;
-    }
-
-    @Override
-    public void apply(SearchTarget parentTarget, List<SearchTarget> children) {
-        mTargetId = parentTarget.getId();
-        reset();
-        updateIcon(parentTarget, children);
-        mSliceSession = mLauncher.getLiveSearchManager()
-                .addObserver(parentTarget.getSliceUri(), mSliceView);
-    }
-
-    private void updateIcon(SearchTarget parentTarget, List<SearchTarget> children) {
-        if (children.size() == 1) {
-            mIcon.apply(children.get(0), new ArrayList<>());
-        } else {
-            PackageItemInfo pkgItem = new PackageItemInfo(parentTarget.getPackageName());
-            pkgItem.user = parentTarget.getUserHandle();
-            if (!pkgItem.equals(mIcon.getTag())) {
-                // The icon will load and apply high res icon automatically
-                mIcon.applyFromItemInfoWithIcon(pkgItem);
-            }
-        }
-    }
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        mSliceView.setOnSliceActionListener(this);
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        reset();
-    }
-
-    private void reset() {
-        mSliceView.setOnSliceActionListener(null);
-        if (mSliceSession != null) {
-            mSliceSession.close();
-        }
-    }
-
-    @Override
-    public void onSliceAction(@NonNull EventInfo eventInfo, @NonNull SliceItem sliceItem) {
-        notifyEvent(mLauncher, mTargetId, SearchTargetEvent.ACTION_TAP);
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultSmallIconRow.java b/quickstep/src/com/android/launcher3/search/SearchResultSmallIconRow.java
deleted file mode 100644
index ca8aa81ecb..0000000000
--- a/quickstep/src/com/android/launcher3/search/SearchResultSmallIconRow.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.search;
-
-import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
-
-import android.app.search.SearchTarget;
-import android.content.Context;
-import android.content.pm.ShortcutInfo;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.R;
-import com.android.launcher3.model.data.ItemInfoWithIcon;
-import com.android.launcher3.model.data.PackageItemInfo;
-
-import java.util.List;
-
-/**
- * A full width representation of {@link SearchResultIcon} with a secondary label and inline
- * SearchTargets
- */
-public class SearchResultSmallIconRow extends LinearLayout implements SearchTargetHandler {
-
-    protected final Launcher mLauncher;
-    private final LauncherAppState mLauncherAppState;
-    protected SearchResultIcon mResultIcon;
-
-    private TextView mTitleView;
-    private TextView mDelimeterView;
-    private TextView mSubTitleView;
-
-    private PackageItemInfo mProviderInfo;
-
-    public SearchResultSmallIconRow(Context context) {
-        this(context, null, 0);
-    }
-
-    public SearchResultSmallIconRow(Context context,
-            @Nullable AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public SearchResultSmallIconRow(Context context,
-            @Nullable AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        mLauncher = Launcher.getLauncher(getContext());
-        mLauncherAppState = LauncherAppState.getInstance(getContext());
-    }
-
-    protected int getIconSize() {
-        return mLauncher.getDeviceProfile().allAppsIconSizePx;
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        int iconSize = getIconSize();
-
-        mResultIcon = findViewById(R.id.icon);
-
-        mTitleView = findViewById(R.id.title);
-        mDelimeterView = findViewById(R.id.delimeter);
-        mDelimeterView.setVisibility(GONE);
-        mSubTitleView = findViewById(R.id.subtitle);
-        mSubTitleView.setVisibility(GONE);
-
-        mResultIcon.getLayoutParams().height = iconSize;
-        mResultIcon.getLayoutParams().width = iconSize;
-        mResultIcon.setTextVisibility(false);
-
-        setOnClickListener(mResultIcon);
-        setOnLongClickListener(mResultIcon);
-    }
-
-    @Override
-    public void apply(SearchTarget parentTarget, List<SearchTarget> children) {
-        mResultIcon.apply(parentTarget, children, this::onItemInfoCreated);
-
-        showSubtitleIfNeeded(null);
-
-        if (parentTarget.getShortcutInfo() != null) {
-            updateWithShortcutInfo(parentTarget.getShortcutInfo());
-        } else if (parentTarget.getSearchAction() != null) {
-            showSubtitleIfNeeded(parentTarget.getSearchAction().getSubtitle());
-        }
-    }
-
-    @Override
-    public boolean quickSelect() {
-        this.performClick();
-        return true;
-    }
-
-    private void updateWithShortcutInfo(ShortcutInfo shortcutInfo) {
-        PackageItemInfo packageItemInfo = new PackageItemInfo(shortcutInfo.getPackage());
-        if (packageItemInfo.equals(mProviderInfo)) return;
-        MODEL_EXECUTOR.post(() -> {
-            mLauncherAppState.getIconCache().getTitleAndIconForApp(packageItemInfo, true);
-            MAIN_EXECUTOR.post(() -> {
-                showSubtitleIfNeeded(packageItemInfo.title);
-                mProviderInfo = packageItemInfo;
-            });
-        });
-    }
-
-    protected void showSubtitleIfNeeded(CharSequence subTitle) {
-        if (!TextUtils.isEmpty(subTitle)) {
-            mSubTitleView.setText(subTitle);
-            mSubTitleView.setVisibility(VISIBLE);
-            mDelimeterView.setVisibility(VISIBLE);
-
-        } else {
-            mSubTitleView.setVisibility(GONE);
-        }
-    }
-
-    protected void onItemInfoCreated(ItemInfoWithIcon info) {
-        setTag(info);
-        mTitleView.setText(info.title);
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java b/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java
deleted file mode 100644
index 8803c9841a..0000000000
--- a/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.search;
-
-
-import android.app.search.SearchTarget;
-import android.app.search.SearchTargetEvent;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
-import android.util.AttributeSet;
-import android.view.View;
-
-import androidx.core.graphics.drawable.RoundedBitmapDrawable;
-import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
-
-import com.android.launcher3.Launcher;
-import com.android.launcher3.model.data.SearchActionItemInfo;
-import com.android.launcher3.touch.ItemClickHandler;
-import com.android.launcher3.util.Themes;
-
-import java.util.List;
-
-/**
- * A view representing a high confidence app search result that includes shortcuts
- */
-public class SearchResultThumbnailView extends androidx.appcompat.widget.AppCompatImageView
-        implements SearchTargetHandler, View.OnClickListener {
-
-    private SearchTarget mSearchTarget;
-
-    public SearchResultThumbnailView(Context context) {
-        super(context);
-    }
-
-    public SearchResultThumbnailView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public SearchResultThumbnailView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        setOnFocusChangeListener(Launcher.getLauncher(getContext()).getFocusHandler());
-        setOnClickListener(this);
-    }
-
-    @Override
-    public void apply(SearchTarget parentTarget, List<SearchTarget> children) {
-        mSearchTarget = parentTarget;
-        Bitmap bitmap;
-
-        SearchActionItemInfo itemInfo = new SearchActionItemInfo(
-                parentTarget.getSearchAction().getIcon(),
-                parentTarget.getPackageName(),
-                parentTarget.getUserHandle(),
-                parentTarget.getSearchAction().getTitle());
-        itemInfo.setIntent(parentTarget.getSearchAction().getIntent());
-        itemInfo.setPendingIntent(parentTarget.getSearchAction().getPendingIntent());
-
-        bitmap = ((BitmapDrawable) itemInfo.getIcon()
-                .loadDrawable(getContext())).getBitmap();
-        // crop
-        if (bitmap.getWidth() < bitmap.getHeight()) {
-            bitmap = Bitmap.createBitmap(bitmap, 0,
-                    bitmap.getHeight() / 2 - bitmap.getWidth() / 2,
-                    bitmap.getWidth(), bitmap.getWidth());
-        } else {
-            bitmap = Bitmap.createBitmap(bitmap, bitmap.getWidth() / 2 - bitmap.getHeight() / 2,
-                    0,
-                    bitmap.getHeight(), bitmap.getHeight());
-        }
-        setTag(itemInfo);
-
-        RoundedBitmapDrawable drawable = RoundedBitmapDrawableFactory.create(null, bitmap);
-        drawable.setCornerRadius(Themes.getDialogCornerRadius(getContext()));
-        setImageDrawable(drawable);
-    }
-
-    @Override
-    public void onClick(View view) {
-        ItemClickHandler.onClickSearchAction(Launcher.getLauncher(getContext()),
-                (SearchActionItemInfo) view.getTag());
-        notifyEvent(getContext(), mSearchTarget.getId(), SearchTargetEvent.ACTION_LAUNCH_TOUCH);
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultWidget.java b/quickstep/src/com/android/launcher3/search/SearchResultWidget.java
deleted file mode 100644
index e22f6ab992..0000000000
--- a/quickstep/src/com/android/launcher3/search/SearchResultWidget.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.search;
-
-import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
-
-import android.app.search.SearchTarget;
-import android.app.search.SearchTargetEvent;
-import android.appwidget.AppWidgetHostView;
-import android.appwidget.AppWidgetProviderInfo;
-import android.content.Context;
-import android.graphics.Rect;
-import android.util.AttributeSet;
-import android.view.GestureDetector;
-import android.view.MotionEvent;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.AppWidgetResizeFrame;
-import com.android.launcher3.BubbleTextView;
-import com.android.launcher3.CheckLongPressHelper;
-import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
-import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
-import com.android.launcher3.allapps.search.SearchWidgetInfoContainer;
-import com.android.launcher3.dragndrop.DraggableView;
-import com.android.launcher3.icons.cache.HandlerRunnable;
-import com.android.launcher3.model.data.PackageItemInfo;
-import com.android.launcher3.touch.ItemLongClickListener;
-import com.android.launcher3.widget.PendingAddWidgetInfo;
-
-import java.util.List;
-
-/**
- * displays live version of a widget upon receiving {@link AppWidgetProviderInfo} from Search
- * provider
- */
-public class SearchResultWidget extends LinearLayout implements SearchTargetHandler, DraggableView,
-        View.OnLongClickListener {
-
-
-    private final Rect mWidgetOffset = new Rect();
-
-    private final Launcher mLauncher;
-    private final CheckLongPressHelper mLongPressHelper;
-    private final GestureDetector mClickDetector;
-    private final AppWidgetHostView mHostView;
-    private final float mScaleToFit;
-
-    private SearchWidgetInfoContainer mInfoContainer;
-    private HandlerRunnable mLabelRequest;
-    private BubbleTextView mWidgetProvider;
-    private TextView mWidgetLabel;
-
-    public SearchResultWidget(@NonNull Context context) {
-        this(context, null, 0);
-    }
-
-    public SearchResultWidget(@NonNull Context context,
-            @Nullable AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public SearchResultWidget(@NonNull Context context, @Nullable AttributeSet attrs,
-            int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        mLauncher = Launcher.getLauncher(context);
-        mHostView = new AppWidgetHostView(context);
-        DeviceProfile grid = mLauncher.getDeviceProfile();
-        mScaleToFit = Math.min(grid.appWidgetScale.x, grid.appWidgetScale.y);
-
-        // detect tap event on widget container for search target event reporting
-        mClickDetector = new GestureDetector(context,
-                new ClickListener(
-                        () -> reportEvent(SearchTargetEvent.ACTION_LAUNCH_TOUCH)));
-        mLongPressHelper = new CheckLongPressHelper(this);
-        mLongPressHelper.setLongPressTimeoutFactor(1);
-        setOnLongClickListener(this);
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        mWidgetProvider = findViewById(R.id.widget_provider);
-        mWidgetLabel = findViewById(R.id.widget_label);
-        addView(mHostView);
-    }
-
-    @Override
-    public void apply(SearchTarget parentTarget, List<SearchTarget> children) {
-        AppWidgetProviderInfo providerInfo = parentTarget.getAppWidgetProviderInfo();
-        removeListener();
-
-        showWidgetInfo(providerInfo);
-        mInfoContainer = mLauncher.getLiveSearchManager().getPlaceHolderWidget(providerInfo);
-        if (mInfoContainer == null) {
-            setVisibility(GONE);
-            return;
-        }
-        setVisibility(VISIBLE);
-        mInfoContainer.attachWidget(mHostView);
-        PendingAddWidgetInfo info = (PendingAddWidgetInfo) mHostView.getTag();
-        int[] size = mLauncher.getWorkspace().estimateItemSize(info);
-        mHostView.getLayoutParams().width = size[0];
-        mHostView.getLayoutParams().height = size[1];
-        AppWidgetResizeFrame.updateWidgetSizeRanges(mHostView, mLauncher, info.spanX,
-                info.spanY);
-        mHostView.requestLayout();
-        setTag(info);
-    }
-
-    private void showWidgetInfo(AppWidgetProviderInfo providerInfo) {
-        PackageItemInfo pinfo = new PackageItemInfo(providerInfo.provider.getPackageName());
-        pinfo.user = providerInfo.getProfile();
-        mWidgetProvider.applyFromItemInfoWithIcon(pinfo);
-
-        mLabelRequest = new HandlerRunnable<>(
-                MODEL_EXECUTOR.getHandler(),
-                () -> LauncherAppState.getInstance(mLauncher).getIconCache()
-                        .getTitleNoCache(LauncherAppWidgetProviderInfo
-                                .fromProviderInfo(mLauncher, providerInfo)),
-                MAIN_EXECUTOR,
-                mWidgetLabel::setText);
-        Utilities.postAsyncCallback(MODEL_EXECUTOR.getHandler(), mLabelRequest);
-    }
-
-    /**
-     * Stops hostView from getting updates on a widget provider
-     */
-    public void removeListener() {
-        if (mInfoContainer != null) {
-            mInfoContainer.detachWidget(mHostView);
-            mInfoContainer = null;
-        }
-        if (mLabelRequest != null) {
-            mLabelRequest.cancel();
-            mLabelRequest = null;
-        }
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        removeListener();
-    }
-
-    private void reportEvent(int eventType) {
-        SearchSessionTracker.INSTANCE.get(getContext()).notifyEvent(
-                new SearchTargetEvent.Builder("search target id", eventType).build());
-    }
-
-    @Override
-    public boolean onInterceptTouchEvent(MotionEvent ev) {
-        mLongPressHelper.onTouchEvent(ev);
-        mClickDetector.onTouchEvent(ev);
-        return mLongPressHelper.hasPerformedLongPress();
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent ev) {
-        mLongPressHelper.onTouchEvent(ev);
-        return true;
-    }
-
-    @Override
-    public void cancelLongPress() {
-        super.cancelLongPress();
-        mLongPressHelper.cancelLongPress();
-    }
-
-    @Override
-    public int getViewType() {
-        return DraggableView.DRAGGABLE_WIDGET;
-    }
-
-    @Override
-    public void getSourceVisualDragBounds(Rect bounds) {
-        mHostView.getHitRect(mWidgetOffset);
-        int width = (int) (mHostView.getMeasuredWidth() * mScaleToFit);
-        int height = (int) (mHostView.getMeasuredHeight() * mScaleToFit);
-        bounds.set(mWidgetOffset.left,
-                mWidgetOffset.top,
-                width + mWidgetOffset.left,
-                height + mWidgetOffset.top);
-    }
-
-    @Override
-    public boolean onLongClick(View view) {
-        ItemLongClickListener.INSTANCE_ALL_APPS.onLongClick(view);
-        return false;
-    }
-
-
-    static class ClickListener extends GestureDetector.SimpleOnGestureListener {
-        private final Runnable mCb;
-
-        ClickListener(Runnable cb) {
-            mCb = cb;
-        }
-
-        @Override
-        public boolean onSingleTapConfirmed(MotionEvent e) {
-            mCb.run();
-            return super.onSingleTapConfirmed(e);
-        }
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java b/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java
deleted file mode 100644
index 5bf19087d8..0000000000
--- a/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.search;
-
-import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
-
-import android.app.search.SearchTarget;
-import android.app.search.SearchTargetEvent;
-import android.appwidget.AppWidgetProviderInfo;
-import android.content.Context;
-import android.graphics.Point;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.Toast;
-
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
-import com.android.launcher3.R;
-import com.android.launcher3.dragndrop.DragOptions;
-import com.android.launcher3.model.WidgetItem;
-import com.android.launcher3.touch.ItemLongClickListener;
-import com.android.launcher3.widget.BaseWidgetSheet;
-import com.android.launcher3.widget.PendingItemDragHelper;
-import com.android.launcher3.widget.WidgetCell;
-import com.android.launcher3.widget.WidgetImageView;
-
-import java.util.List;
-
-/**
- * displays preview of a widget upon receiving {@link AppWidgetProviderInfo} from Search provider
- */
-public class SearchResultWidgetPreview extends LinearLayout implements SearchTargetHandler,
-        View.OnClickListener, View.OnLongClickListener {
-
-    private final Launcher mLauncher;
-    private final LauncherAppState mAppState;
-    private WidgetCell mWidgetCell;
-    private Toast mWidgetToast;
-
-    private String mTargetId;
-    public SearchResultWidgetPreview(Context context) {
-        this(context, null, 0);
-    }
-
-    public SearchResultWidgetPreview(Context context,
-            @Nullable AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public SearchResultWidgetPreview(Context context, @Nullable AttributeSet attrs,
-            int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        mLauncher = Launcher.getLauncher(context);
-        mAppState = LauncherAppState.getInstance(context);
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        mWidgetCell = findViewById(R.id.widget_cell);
-        mWidgetCell.setOnLongClickListener(this);
-        mWidgetCell.setOnClickListener(this);
-    }
-
-    @Override
-    public void apply(SearchTarget parentTarget, List<SearchTarget> children) {
-        mTargetId = parentTarget.getId();
-        AppWidgetProviderInfo providerInfo = parentTarget.getAppWidgetProviderInfo();
-        LauncherAppWidgetProviderInfo pInfo = LauncherAppWidgetProviderInfo.fromProviderInfo(
-                getContext(), providerInfo);
-        MODEL_EXECUTOR.post(() -> {
-            WidgetItem widgetItem = new WidgetItem(pInfo, mLauncher.getDeviceProfile().inv,
-                    mAppState.getIconCache());
-            MAIN_EXECUTOR.post(() -> {
-                mWidgetCell.applyFromCellItem(widgetItem, mAppState.getWidgetCache());
-                mWidgetCell.ensurePreview();
-            });
-        });
-    }
-
-    @Override
-    public boolean onLongClick(View view) {
-        view.cancelLongPress();
-        if (!ItemLongClickListener.canStartDrag(mLauncher)) return false;
-        if (mWidgetCell.getTag() == null) return false;
-
-        WidgetImageView imageView = mWidgetCell.getWidgetView();
-        if (imageView.getBitmap() == null) {
-            return false;
-        }
-
-        int[] loc = new int[2];
-        mLauncher.getDragLayer().getLocationInDragLayer(imageView, loc);
-
-        new PendingItemDragHelper(mWidgetCell).startDrag(
-                imageView.getBitmapBounds(), imageView.getBitmap().getWidth(), imageView.getWidth(),
-                new Point(loc[0], loc[1]), mLauncher.getAppsView(), new DragOptions());
-        reportEvent(SearchTargetEvent.ACTION_LONGPRESS);
-        return true;
-    }
-
-    @Override
-    public void onClick(View view) {
-        mWidgetToast = BaseWidgetSheet.showWidgetToast(getContext(), mWidgetToast);
-        reportEvent(SearchTargetEvent.ACTION_LAUNCH_TOUCH);
-    }
-
-    private void reportEvent(int eventType) {
-        SearchSessionTracker.INSTANCE.get(getContext()).notifyEvent(
-                new SearchTargetEvent.Builder(mTargetId, eventType).build());
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java b/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java
deleted file mode 100644
index 9276841734..0000000000
--- a/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.search;
-
-import android.app.search.SearchTarget;
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.TextView;
-
-import androidx.annotation.Nullable;
-
-import java.util.List;
-
-/**
- * Header text view that shows a title for a given section in All apps search
- */
-public class SearchSectionHeaderView extends TextView implements SearchTargetHandler {
-
-    public SearchSectionHeaderView(Context context) {
-        super(context);
-    }
-
-    public SearchSectionHeaderView(Context context,
-            @Nullable AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public SearchSectionHeaderView(Context context, @Nullable AttributeSet attrs, int styleAttr) {
-        super(context, attrs, styleAttr);
-    }
-
-    @Override
-    public void apply(SearchTarget parentTarget, List<SearchTarget> children) {
-        setText(parentTarget.getSearchAction().getTitle());
-        setVisibility(VISIBLE);
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java b/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java
deleted file mode 100644
index fac6ba7474..0000000000
--- a/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.search;
-
-import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
-
-import android.app.search.Query;
-import android.app.search.SearchContext;
-import android.app.search.SearchSession;
-import android.app.search.SearchTarget;
-import android.app.search.SearchUiManager;
-import android.content.Context;
-import android.os.CancellationSignal;
-import android.text.TextUtils;
-import android.util.Log;
-
-import androidx.annotation.WorkerThread;
-
-import com.android.app.search.ResultType;
-import com.android.launcher3.allapps.AllAppsGridAdapter;
-import com.android.launcher3.allapps.AllAppsSectionDecorator;
-import com.android.launcher3.allapps.search.SearchPipeline;
-import com.android.launcher3.allapps.search.SearchSectionInfo;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.function.Consumer;
-
-/**
- * Search pipeline utilizing {@link android.app.search.SearchUiManager}
- */
-public class SearchServicePipeline implements SearchPipeline {
-    private static final int SUPPORTED_RESULT_TYPES =
-            ResultType.APPLICATION | ResultType.SHORTCUT | ResultType.PLAY | ResultType.PEOPLE
-                    | ResultType.SETTING;
-
-    private static final boolean DEBUG = true;
-    private static final int REQUEST_TIMEOUT = 200;
-    private static final String TAG = "SearchServicePipeline";
-
-    private final Context mContext;
-    private final SearchSession mSession;
-    private final DeviceSearchAdapterProvider mAdapterProvider;
-
-    private boolean mCanceled = false;
-
-
-    public SearchServicePipeline(Context context, DeviceSearchAdapterProvider adapterProvider) {
-        mContext = context;
-        mAdapterProvider = adapterProvider;
-        SearchUiManager manager = context.getSystemService(SearchUiManager.class);
-        mSession = manager.createSearchSession(
-                new SearchContext(SUPPORTED_RESULT_TYPES, REQUEST_TIMEOUT, null));
-        SearchSessionTracker.getInstance(context).setSearchSession(mSession);
-    }
-
-    @WorkerThread
-    @Override
-    public void query(String input, Consumer<ArrayList<AllAppsGridAdapter.AdapterItem>> callback,
-            CancellationSignal cancellationSignal) {
-        mCanceled = false;
-        Query query = new Query(input, System.currentTimeMillis(), null);
-        mSession.query(query, UI_HELPER_EXECUTOR, targets -> {
-            if (!mCanceled) {
-                if (DEBUG) {
-                    printSearchTargets(input, targets);
-                }
-                SearchSessionTracker.getInstance(mContext).setQuery(query);
-                callback.accept(this.onResult(targets));
-            }
-            Log.w(TAG, "Ignoring results due to cancel signal");
-        });
-    }
-
-    /**
-     * Given A list of search Targets, pairs a group of search targets to a AdapterItem that can
-     * be inflated in AllAppsRecyclerView
-     */
-    private ArrayList<AllAppsGridAdapter.AdapterItem> onResult(List<SearchTarget> searchTargets) {
-        HashMap<String, SearchAdapterItem> adapterMap = new LinkedHashMap<>();
-        List<SearchTarget> unmappedChildren = new ArrayList<>();
-        SearchSectionInfo section = new SearchSectionInfo();
-        section.setDecorationHandler(
-                new AllAppsSectionDecorator.SectionDecorationHandler(mContext, true));
-        for (SearchTarget target : searchTargets) {
-            if (!TextUtils.isEmpty(target.getParentId())) {
-                if (!addChildToParent(target, adapterMap)) {
-                    unmappedChildren.add(target);
-                }
-                continue;
-            }
-            int viewType = mAdapterProvider.getViewTypeForSearchTarget(target);
-            if (viewType != -1) {
-                SearchAdapterItem adapterItem = new SearchAdapterItem(target, viewType);
-                adapterItem.searchSectionInfo = section;
-                adapterMap.put(target.getId(), adapterItem);
-            }
-        }
-        for (SearchTarget s : unmappedChildren) {
-            if (!addChildToParent(s, adapterMap)) {
-                Log.w(TAG,
-                        "Unable to pair child " + s.getId() + " to parent " + s.getParentId());
-            }
-        }
-        return new ArrayList<>(adapterMap.values());
-    }
-
-    private void printSearchTargets(String query, List<SearchTarget> results) {
-        Log.d(TAG, " query=" + query + " size=" + results.size());
-        for (SearchTarget s : results) {
-            Log.d(TAG, "layoutType=" + s.getLayoutType() + " resultType=" + s.getResultType());
-        }
-    }
-
-    /**
-     * Adds a child SearchTarget to a collection of searchTarget children with a shared parentId.
-     * Returns false if no parent searchTarget with id=$parentId does not exists.
-     */
-    private boolean addChildToParent(SearchTarget target, HashMap<String, SearchAdapterItem> map) {
-        if (!map.containsKey(target.getParentId())) return false;
-        map.get(target.getParentId()).getInlineItems().add(target);
-        return true;
-    }
-
-    /**
-     * Unregister callbacks and destroy search session
-     */
-    public void destroy() {
-        mSession.destroy();
-    }
-
-    /**
-     * Cancels current ongoing search request.
-     */
-    public void cancel() {
-        mCanceled = true;
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/search/SearchSessionTracker.java b/quickstep/src/com/android/launcher3/search/SearchSessionTracker.java
deleted file mode 100644
index 97a72bbd9f..0000000000
--- a/quickstep/src/com/android/launcher3/search/SearchSessionTracker.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.search;
-
-import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
-
-import android.app.search.Query;
-import android.app.search.SearchSession;
-import android.app.search.SearchTargetEvent;
-import android.content.Context;
-import android.util.Log;
-
-import androidx.annotation.Nullable;
-import androidx.annotation.WorkerThread;
-
-import com.android.launcher3.util.MainThreadInitializedObject;
-
-import java.util.Optional;
-
-/**
- * A singleton class to track and report search events back to SearchSession
- */
-public class SearchSessionTracker {
-
-    private static final String TAG = "SearchSessionTracker";
-
-    @Nullable
-    private SearchSession mSession;
-    private Query mQuery;
-
-    public static final MainThreadInitializedObject<SearchSessionTracker> INSTANCE =
-            new MainThreadInitializedObject<>(SearchSessionTracker::new);
-
-    private SearchSessionTracker(Context context) {
-    }
-
-    /**
-     * Returns instance of SearchSessionTracker
-     */
-    public static SearchSessionTracker getInstance(Context context) {
-        return SearchSessionTracker.INSTANCE.get(context);
-    }
-
-    @WorkerThread
-    public void setSearchSession(SearchSession session) {
-        mSession = session;
-    }
-
-    @WorkerThread
-    public void setQuery(Query query) {
-        mQuery = query;
-    }
-
-    public Optional<Integer> getQueryLength() {
-        return Optional.ofNullable(mQuery).map(Query::getInput).map(String::length);
-    }
-
-    /**
-     * Send the user event handling back to the {@link SearchSession} object.
-     */
-    public void notifyEvent(SearchTargetEvent event) {
-        if (mSession == null) {
-            Log.d(TAG, "Dropping event " + event.getTargetId());
-        }
-        Log.d(TAG, "notifyEvent:" + mQuery.getInput() + ":" + event.getTargetId());
-        UI_HELPER_EXECUTOR.post(() -> mSession.notifyEvent(mQuery, event));
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java b/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java
deleted file mode 100644
index acf6f8a02a..0000000000
--- a/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.search;
-
-import android.app.search.SearchTarget;
-import android.app.search.SearchTargetEvent;
-import android.content.Context;
-
-import java.util.List;
-
-/**
- * An interface for supporting dynamic search results
- */
-public interface SearchTargetHandler {
-
-    /**
-     * Update view using values from {@link SearchTarget}
-     */
-    default void apply(SearchTarget parentTarget, List<SearchTarget> children) { }
-
-    /**
-     * Handle IME quick select event. returns whether event was handled.
-     */
-    default boolean quickSelect() {
-        return false;
-    }
-
-    default void notifyEvent(Context context, String id, int eventType) {
-        SearchTargetEvent.Builder builder = new SearchTargetEvent.Builder(id, eventType);
-        SearchSessionTracker.getInstance(context).notifyEvent(builder.build());
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java b/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java
deleted file mode 100644
index ede3b9d143..0000000000
--- a/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.search;
-
-import static com.android.app.search.LayoutType.DIVIDER;
-import static com.android.app.search.LayoutType.ICON_HORIZONTAL_TEXT;
-import static com.android.app.search.LayoutType.SMALL_ICON_HORIZONTAL_TEXT;
-import static com.android.app.search.LayoutType.THUMBNAIL;
-import static com.android.app.search.ResultType.ACTION;
-import static com.android.app.search.ResultType.SCREENSHOT;
-import static com.android.app.search.ResultType.SUGGEST;
-
-import android.app.PendingIntent;
-import android.app.search.SearchAction;
-import android.app.search.SearchTarget;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ShortcutInfo;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.drawable.Icon;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Process;
-import android.os.UserHandle;
-
-import com.android.app.search.ResultType;
-
-public class SearchTargetUtil {
-
-    public static final String BUNDLE_EXTRA_SHOULD_START = "should_start";
-    public static final String BUNDLE_EXTRA_SHOULD_START_FOR_RESULT = "should_start_for_result";
-    public static final String BUNDLE_EXTRA_BADGE_WITH_PACKAGE = "badge_with_package";
-    public static final String BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE = "primary_icon_from_title";
-
-    public static final String EXTRA_CLASS = "class";
-
-    private static final String TITLE = " title: weather ";
-    private static final String SUBTITLE = " subtitle: 68 degrees ";
-    private static final String PACKAGE2 = "com.google.android.gm";
-    private static final UserHandle USERHANDLE = Process.myUserHandle();
-
-
-    /**
-     * Generate SearchTargetUtil for ICON_HORIZONTAL_TEXT layout type.
-     *
-     * targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction(
-     * mContext, "red", Color.RED));
-     * targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction(
-     * mContext, "yellow", Color.YELLOW));
-     */
-    public static SearchTarget generateIcoHorizontalText_usingSearchAction(
-            Context context, String id, int color) {
-        SearchTarget.Builder builder =
-                new SearchTarget.Builder(ACTION, ICON_HORIZONTAL_TEXT, id)
-                        .setPackageName(PACKAGE2) /* required */
-                        .setUserHandle(USERHANDLE); /* required */
-
-        Intent intent = new Intent("com.google.android.googlequicksearchbox.GENERIC_QUERY");
-        intent.putExtra("query", "weather");
-        intent.putExtra("full_screen", false);
-        PendingIntent pendingIntent =
-                PendingIntent.getActivity(
-                        context, 1, intent,
-                        PendingIntent.FLAG_UPDATE_CURRENT);
-
-        Bitmap bitmap = Bitmap.createBitmap(200, 200, Bitmap.Config.ARGB_8888);
-        Canvas canvas = new Canvas(bitmap);
-        canvas.drawColor(color);
-        Icon icon = Icon.createWithAdaptiveBitmap(bitmap);
-
-        Bundle b = new Bundle();
-        b.putBoolean(BUNDLE_EXTRA_SHOULD_START_FOR_RESULT, true);
-        b.putBoolean(BUNDLE_EXTRA_BADGE_WITH_PACKAGE, true);
-        b.putBoolean(BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE, true);
-
-        builder.setSearchAction(new SearchAction.Builder(id, id + TITLE)
-                .setSubtitle(id + SUBTITLE)
-                .setPendingIntent(pendingIntent)
-                .setIcon(icon)
-                .setExtras(b)
-                .build());
-        return builder.build();
-    }
-
-    /**
-     * Inside SearchServicePipeline, add following samples to test the search target.
-     *
-     * targets.add(SearchTargetUtil.generateThumbnail_SearchAction("blue", Color.BLUE));
-     * targets.add(SearchTargetUtil.generateThumbnail_SearchAction("red", Color.RED));
-     * targets.add(SearchTargetUtil.generateThumbnail_SearchAction("green", Color.GREEN));
-     */
-    public static SearchTarget generateThumbnail_usingSearchAction(String id, int color) {
-        SearchTarget.Builder builder =
-                new SearchTarget.Builder(SCREENSHOT, THUMBNAIL, id)
-                        .setPackageName(PACKAGE2) /* required */
-                        .setUserHandle(USERHANDLE); /* required */
-
-
-        Intent intent = new Intent(Intent.ACTION_VIEW)
-                .setData(Uri.parse("uri blah blah"))
-                .setType("image/*")
-                .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
-        Bitmap bitmap = Bitmap.createBitmap(1000, 500, Bitmap.Config.ARGB_8888);
-        Canvas canvas = new Canvas(bitmap);
-        canvas.drawColor(color);
-        Icon icon = Icon.createWithBitmap(bitmap);
-
-        builder.setSearchAction(new SearchAction.Builder(id, TITLE)
-                .setSubtitle(SUBTITLE)
-                .setIcon(icon)
-                .setIntent(intent)
-                .build());
-        return builder.build();
-
-    }
-
-    /**
-     * Generate SearchTargetUtil for SMALL_ICON_HORIZONTAL_TEXT layout type.
-     *
-     * targets.add(SearchTargetUtil.generateIconHorizontalText_SearchAction(
-     * mContext, "red", Color.RED));
-     * targets.add(SearchTargetUtil.generateIconHorizontalText_SearchAction(
-     * mContext, "yellow", Color.YELLOW));
-     */
-    public static SearchTarget generateSmallIconHorizontalText_usingSearchAction(
-            Context context, String id, int color) {
-        String title = "Ask the assistant";
-        String fallbackQuery = "sourdough bread";
-        SearchTarget.Builder builder =
-                new SearchTarget.Builder(SUGGEST, SMALL_ICON_HORIZONTAL_TEXT, id)
-                        .setPackageName(PACKAGE2) /* required */
-                        .setUserHandle(USERHANDLE); /* required */
-
-        Intent intent3 = new Intent("com.google.android.googlequicksearchbox.GENERIC_QUERY");
-        intent3.putExtra("query", fallbackQuery);
-        intent3.putExtra("full_screen", false);
-        PendingIntent pendingIntent3 =
-                PendingIntent.getActivity(
-                        context, 1, intent3,
-                        PendingIntent.FLAG_UPDATE_CURRENT);
-
-        Bitmap bitmap = Bitmap.createBitmap(200, 200, Bitmap.Config.ARGB_8888);
-        Canvas canvas = new Canvas(bitmap);
-        canvas.drawColor(color);
-        Icon icon = Icon.createWithAdaptiveBitmap(bitmap);
-
-        Bundle extra = new Bundle();
-        extra.putBoolean(BUNDLE_EXTRA_SHOULD_START_FOR_RESULT, true);
-
-        SearchAction searchAction = new SearchAction.Builder(id, title)
-                .setSubtitle(fallbackQuery)
-                .setPendingIntent(pendingIntent3)
-                .setIcon(icon)
-                .setExtras(extra)
-                .build();
-        return builder.setSearchAction(searchAction).build();
-    }
-
-    public static SearchTarget generateDivider() {
-        SearchTarget.Builder builder =
-                new SearchTarget.Builder(SUGGEST, DIVIDER, "divider")
-                        .setPackageName("") /* required but not used*/
-                        .setUserHandle(USERHANDLE); /* required */
-        return builder.build();
-    }
-
-
-    /**
-     * Generate SearchTargetUtil for ICON_DOUBLE_HORIZONTAL_TEXT layout type.
-     */
-    public static SearchTarget generateIconDoubleHorizontalText_ShortcutInfo(Context context) {
-        String id = "23456";
-        SearchTarget.Builder builder =
-                new SearchTarget.Builder(ResultType.SHORTCUT, SMALL_ICON_HORIZONTAL_TEXT, id)
-                        .setPackageName("com.google.android.gm") /* required */
-                        .setUserHandle(UserHandle.CURRENT); /* required */
-
-        builder.setShortcutInfo(new ShortcutInfo.Builder(context, id).build());
-        return builder.build();
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 9a1e707baa..7c9a6e7957 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -45,8 +45,6 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.Workspace;
-import com.android.launcher3.allapps.AllAppsContainerView;
-import com.android.launcher3.allapps.search.SearchAdapterProvider;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.appprediction.PredictionRowView;
 import com.android.launcher3.config.FeatureFlags;
@@ -57,7 +55,6 @@ import com.android.launcher3.model.BgDataModel.FixedContainerItems;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.popup.SystemShortcut;
-import com.android.launcher3.search.DeviceSearchAdapterProvider;
 import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory;
 import com.android.launcher3.uioverrides.states.QuickstepAtomicAnimationFactory;
 import com.android.launcher3.uioverrides.touchcontrollers.NavBarToHomeTouchController;
@@ -292,11 +289,6 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
         }
     }
 
-    @Override
-    public SearchAdapterProvider createSearchAdapterProvider(AllAppsContainerView appsView) {
-        return new DeviceSearchAdapterProvider(this, appsView);
-    }
-
     @Override
     public TouchController[] createTouchControllers() {
         Mode mode = SysUINavigationMode.getMode(this);
diff --git a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
index cb81d36b4e..a85f0d2c49 100644
--- a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
+++ b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
@@ -27,10 +27,8 @@ import android.content.SharedPreferences;
 
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.Workspace;
-import com.android.launcher3.allapps.AllAppsInsetTransitionController;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.hybridhotseat.HotseatPredictionController;
-import com.android.launcher3.search.DeviceSearchEdu;
 import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.statemanager.StateManager.StateListener;
 import com.android.launcher3.uioverrides.QuickstepLauncher;
@@ -43,7 +41,6 @@ import com.android.quickstep.views.AllAppsEduView;
  */
 public class QuickstepOnboardingPrefs extends OnboardingPrefs<QuickstepLauncher> {
 
-
     public QuickstepOnboardingPrefs(QuickstepLauncher launcher, SharedPreferences sharedPrefs) {
         super(launcher, sharedPrefs);
 
@@ -134,22 +131,5 @@ public class QuickstepOnboardingPrefs extends OnboardingPrefs<QuickstepLauncher>
                 }
             });
         }
-
-        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && !getBoolean(SEARCH_EDU_SEEN)) {
-            stateManager.addStateListener(new StateListener<LauncherState>() {
-                @Override
-                public void onStateTransitionStart(LauncherState toState) {
-                    if (toState == ALL_APPS) {
-                        AllAppsInsetTransitionController insetTransitionController =
-                                mLauncher.getAllAppsController().getInsetController();
-                        insetTransitionController.setSearchEduRunnable(() -> {
-                            DeviceSearchEdu.show(launcher);
-                            insetTransitionController.setSearchEduRunnable(null);
-                        });
-                        stateManager.removeStateListener(this);
-                    }
-                }
-            });
-        }
     }
 }
-- 
GitLab


From 3a1cfc908209cf1f5fbd40beb8e0580dbc55729f Mon Sep 17 00:00:00 2001
From: Jon Spivack <spivack@google.com>
Date: Mon, 11 Jan 2021 17:20:00 -0800
Subject: [PATCH 0493/1664] Add NIU Actions buttons to the Go Overview

The buttons send Intents to the designated app (specified by
niu_actions_package) to do the following:
Listen - Read the contents of the screen aloud
Translate - Translate the contents of the screen
Search - Perform a visual search on the contents of the screen

The Intents also include (via URI) the screenshot of current app used as
a thumbnail by Recents.

The feature is controlled by the enable_niu_actions flag, set to false
here. Both this flag and the niu_actions_package String must be set for
a given Launcher to use these buttons.

Bug: 177955244
Bug: 177955748
Test: Manual (enabled on LauncherGoGoogle and sent Intents to demo Lens
app)

Change-Id: I3d1f870bb176ed0cbae637a45c072bd8acac1d4b
---
 Android.mk                                    |  11 +-
 .../res/layout/overview_actions_container.xml |  98 ++++++++++++
 .../res/values/config.xml                     |  22 +++
 go/quickstep/res/drawable/ic_listen.xml       |  32 ++++
 go/quickstep/res/drawable/ic_search.xml       |  32 ++++
 go/quickstep/res/drawable/ic_translate.xml    |  32 ++++
 go/quickstep/res/values/config.xml            |   6 +
 go/quickstep/res/values/strings.xml           |   8 +
 .../quickstep/TaskOverlayFactoryGo.java       | 147 ++++++++++++++++++
 .../views/GoOverviewActionsView.java          |  75 +++++++++
 .../res/layout/overview_actions_container.xml |   0
 .../res/values/config.xml                     |  18 +++
 quickstep/res/values/config.xml               |   2 -
 .../android/quickstep/ImageActionsApi.java    |  24 ++-
 .../android/quickstep/TaskOverlayFactory.java |  52 ++++---
 15 files changed, 527 insertions(+), 32 deletions(-)
 create mode 100644 go/quickstep/overview_ui_overrides/res/layout/overview_actions_container.xml
 create mode 100644 go/quickstep/overview_ui_overrides/res/values/config.xml
 create mode 100644 go/quickstep/res/drawable/ic_listen.xml
 create mode 100644 go/quickstep/res/drawable/ic_search.xml
 create mode 100644 go/quickstep/res/drawable/ic_translate.xml
 create mode 100644 go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
 create mode 100644 go/quickstep/src/com/android/quickstep/views/GoOverviewActionsView.java
 rename quickstep/{ => overview_ui_overrides}/res/layout/overview_actions_container.xml (100%)
 create mode 100644 quickstep/overview_ui_overrides/res/values/config.xml

diff --git a/Android.mk b/Android.mk
index 19ad328187..127df79f3b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -145,7 +145,9 @@ LOCAL_SRC_FILES := \
     $(call all-java-files-under, quickstep/src) \
     $(call all-java-files-under, src_shortcuts_overrides)
 
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/quickstep/res
+LOCAL_RESOURCE_DIR := \
+    $(LOCAL_PATH)/quickstep/res \
+    $(LOCAL_PATH)/quickstep/overview_ui_overrides/res
 LOCAL_PROGUARD_ENABLED := disabled
 
 
@@ -174,7 +176,9 @@ LOCAL_SYSTEM_EXT_MODULE := true
 LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3
 LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
 
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/quickstep/res
+LOCAL_RESOURCE_DIR := \
+    $(LOCAL_PATH)/quickstep/res \
+    $(LOCAL_PATH)/quickstep/overview_ui_overrides/res
 
 LOCAL_FULL_LIBS_MANIFEST_FILES := \
     $(LOCAL_PATH)/quickstep/AndroidManifest-launcher.xml \
@@ -213,7 +217,8 @@ LOCAL_SRC_FILES := \
 LOCAL_RESOURCE_DIR := \
     $(LOCAL_PATH)/quickstep/res \
     $(LOCAL_PATH)/go/res \
-    $(LOCAL_PATH)/go/quickstep/res
+    $(LOCAL_PATH)/go/quickstep/res \
+    $(LOCAL_PATH)/go/quickstep/overview_ui_overrides/res
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 LOCAL_PROGUARD_ENABLED := full
diff --git a/go/quickstep/overview_ui_overrides/res/layout/overview_actions_container.xml b/go/quickstep/overview_ui_overrides/res/layout/overview_actions_container.xml
new file mode 100644
index 0000000000..b438da32eb
--- /dev/null
+++ b/go/quickstep/overview_ui_overrides/res/layout/overview_actions_container.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.quickstep.views.GoOverviewActionsView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/overview_actions_height"
+    android:layout_gravity="center_horizontal|bottom">
+
+    <LinearLayout
+        android:id="@+id/action_buttons"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:orientation="horizontal">
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
+
+        <Button
+            android:id="@+id/action_listen"
+            style="@style/OverviewActionButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableTop="@drawable/ic_listen"
+            android:drawablePadding="1dp"
+            android:text="@string/action_listen"
+            android:theme="@style/ThemeControlHighlightWorkspaceColor" />
+
+        <Button
+            android:id="@+id/action_translate"
+            style="@style/OverviewActionButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableTop="@drawable/ic_translate"
+            android:drawablePadding="1dp"
+            android:text="@string/action_translate"
+            android:theme="@style/ThemeControlHighlightWorkspaceColor" />
+
+        <Button
+            android:id="@+id/action_search"
+            style="@style/OverviewActionButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableTop="@drawable/ic_search"
+            android:drawablePadding="1dp"
+            android:text="@string/action_search"
+            android:theme="@style/ThemeControlHighlightWorkspaceColor" />
+
+        <Button
+            android:id="@+id/action_screenshot"
+            style="@style/OverviewActionButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableTop="@drawable/ic_screenshot"
+            android:drawablePadding="1dp"
+            android:text="@string/action_screenshot"
+            android:theme="@style/ThemeControlHighlightWorkspaceColor" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
+
+        <Button
+            android:id="@+id/action_share"
+            style="@style/OverviewActionButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableStart="@drawable/ic_share"
+            android:text="@string/action_share"
+            android:theme="@style/ThemeControlHighlightWorkspaceColor"
+            android:visibility="gone" />
+
+        <Space
+            android:id="@+id/oav_three_button_space"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1"
+            android:visibility="gone" />
+    </LinearLayout>
+
+</com.android.quickstep.views.GoOverviewActionsView>
\ No newline at end of file
diff --git a/go/quickstep/overview_ui_overrides/res/values/config.xml b/go/quickstep/overview_ui_overrides/res/values/config.xml
new file mode 100644
index 0000000000..ec21a01572
--- /dev/null
+++ b/go/quickstep/overview_ui_overrides/res/values/config.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright (C) 2021 The Android Open Source Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+-->
+<resources>
+    <string name="task_overlay_factory_class" translatable="false">
+        com.android.quickstep.TaskOverlayFactoryGo</string>
+</resources>
\ No newline at end of file
diff --git a/go/quickstep/res/drawable/ic_listen.xml b/go/quickstep/res/drawable/ic_listen.xml
new file mode 100644
index 0000000000..a8e6c9382a
--- /dev/null
+++ b/go/quickstep/res/drawable/ic_listen.xml
@@ -0,0 +1,32 @@
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="28"
+    android:viewportHeight="28">
+  <path
+      android:pathData="M10.5,15.17c2.58,0 4.67,-2.09 4.67,-4.67s-2.09,-4.67 -4.67,-4.67c-2.58,0 -4.67,2.09 -4.67,4.67S7.92,15.17 10.5,15.17zM10.5,8.17c1.28,0 2.33,1.05 2.33,2.33s-1.05,2.33 -2.33,2.33c-1.28,0 -2.33,-1.05 -2.33,-2.33S9.22,8.17 10.5,8.17z"
+      android:fillColor="#4285F4"/>
+  <path
+      android:pathData="M10.5,17.5c-3.11,0 -9.33,1.56 -9.33,4.67v2.33h18.67v-2.33C19.83,19.06 13.62,17.5 10.5,17.5zM3.5,22.17c0.26,-0.84 3.86,-2.33 7,-2.33c3.15,0 6.77,1.5 7,2.33H3.5z"
+      android:fillColor="#4285F4"/>
+  <path
+      android:pathData="M25.67,10.5c0,0.36 -0.02,0.71 -0.05,1.05c-0.01,0.15 -0.03,0.29 -0.05,0.43c-0.02,0.18 -0.05,0.36 -0.08,0.54c-0.04,0.2 -0.07,0.39 -0.12,0.58c-0.01,0.06 -0.03,0.11 -0.04,0.17c-0.59,2.34 -1.81,4.01 -2.52,4.82c-0.09,0.1 -0.18,0.2 -0.28,0.3c-0.17,0.18 -0.27,0.27 -0.27,0.27l-1.65,-1.63c1.34,-1.33 2.27,-3.07 2.6,-5.01c0.01,-0.08 0.02,-0.16 0.04,-0.24c0.06,-0.42 0.1,-0.85 0.1,-1.29c0,-0.44 -0.04,-0.88 -0.1,-1.3c-0.01,-0.06 -0.02,-0.13 -0.03,-0.19c-0.32,-1.95 -1.25,-3.7 -2.6,-5.04l1.65,-1.63c0,0 0.11,0.1 0.27,0.27c0.09,0.1 0.19,0.2 0.28,0.3c0.71,0.82 1.93,2.48 2.52,4.82c0.01,0.06 0.03,0.11 0.04,0.17c0.04,0.19 0.08,0.38 0.12,0.58c0.03,0.18 0.06,0.36 0.08,0.54c0.02,0.14 0.04,0.28 0.05,0.43C25.65,9.79 25.67,10.14 25.67,10.5z"
+      android:fillColor="#EA4335"/>
+  <path
+      android:pathData="M20.61,8.4C20.85,9.06 21,9.76 21,10.5s-0.15,1.44 -0.39,2.1c-0.28,0.77 -0.71,1.46 -1.25,2.05l-1.66,-1.64c0.56,-0.63 0.91,-1.44 0.95,-2.34c0,-0.06 0.02,-0.11 0.02,-0.17s-0.01,-0.11 -0.02,-0.17c-0.04,-0.9 -0.39,-1.71 -0.95,-2.34l1.66,-1.64C19.9,6.94 20.32,7.63 20.61,8.4z"
+      android:fillColor="#FBBC04"/>
+</vector>
diff --git a/go/quickstep/res/drawable/ic_search.xml b/go/quickstep/res/drawable/ic_search.xml
new file mode 100644
index 0000000000..4307330414
--- /dev/null
+++ b/go/quickstep/res/drawable/ic_search.xml
@@ -0,0 +1,32 @@
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="28"
+    android:viewportHeight="28">
+  <path
+      android:pathData="M24.5,22.75l-6.84,-6.84c1,-1.35 1.59,-3.02 1.59,-4.83h-2.33c0,3.22 -2.62,5.83 -5.83,5.83v2.33c1.81,0 3.47,-0.6 4.83,-1.59l6.84,6.84L24.5,22.75z"
+      android:fillColor="#4285F4"/>
+  <path
+      android:pathData="M11.08,2.92v2.33c3.22,0 5.83,2.62 5.83,5.83h2.33C19.25,6.57 15.59,2.92 11.08,2.92z"
+      android:fillColor="#34A853"/>
+  <path
+      android:pathData="M5.25,11.08H2.92c0,4.51 3.66,8.17 8.17,8.17v-2.33C7.87,16.92 5.25,14.3 5.25,11.08z"
+      android:fillColor="#EA4335"/>
+  <path
+      android:pathData="M2.92,11.08h2.33c0,-3.22 2.62,-5.83 5.83,-5.83V2.92C6.57,2.92 2.92,6.57 2.92,11.08z"
+      android:fillColor="#FBBC04"/>
+</vector>
diff --git a/go/quickstep/res/drawable/ic_translate.xml b/go/quickstep/res/drawable/ic_translate.xml
new file mode 100644
index 0000000000..1247807fcd
--- /dev/null
+++ b/go/quickstep/res/drawable/ic_translate.xml
@@ -0,0 +1,32 @@
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="28"
+    android:viewportHeight="28">
+  <path
+      android:pathData="M12.28,15.19l-0.07,-0.05c-0.61,-0.49 -1.15,-1.05 -1.65,-1.63c-1.05,-1.22 -1.88,-2.63 -2.39,-4.17H5.83c0.54,2.17 1.58,4.16 3.01,5.85l-5.93,5.23l1.75,1.75l5.91,-5.26c0.05,0.04 0.1,0.09 0.15,0.13l3.42,2.79l1.02,-2.33L12.28,15.19z"
+      android:fillColor="#FBBC04"/>
+  <path
+      android:pathData="M21.58,11.67h-2.33l-5.25,14h2.33l1.31,-3.5h5.54l1.32,3.5h2.33L21.58,11.67zM18.53,19.83l1.89,-5.05l1.89,5.05H18.53z"
+      android:fillColor="#4285F4"/>
+  <path
+      android:pathData="M11.67,2.33l-2.34,0l0,2.34l-8.16,0l0,2.33l10.5,0l0,-2.33z"
+      android:fillColor="#EA4335"/>
+  <path
+      android:pathData="M11.67,4.67V7H14c-0.61,2.42 -1.79,4.65 -3.44,6.5c0.5,0.59 1.04,1.15 1.65,1.63l0.07,0.05c2.03,-2.32 3.44,-5.14 4.05,-8.19h3.5V4.67H11.67z"
+      android:fillColor="#34A853"/>
+</vector>
diff --git a/go/quickstep/res/values/config.xml b/go/quickstep/res/values/config.xml
index f3767748a5..9dca137562 100644
--- a/go/quickstep/res/values/config.xml
+++ b/go/quickstep/res/values/config.xml
@@ -14,5 +14,11 @@
      limitations under the License.
 -->
 <resources>
+    <!-- The component to receive app sharing Intents -->
     <string name="app_sharing_component" translatable="false"/>
+    <!-- The package to receive Listen, Translate, and Search Intents -->
+    <string name="niu_actions_package" translatable="false"/>
+
+    <!-- Feature Flags -->
+    <bool name="enable_niu_actions">false</bool>
 </resources>
\ No newline at end of file
diff --git a/go/quickstep/res/values/strings.xml b/go/quickstep/res/values/strings.xml
index fdd8397f36..71e2f3a5c5 100644
--- a/go/quickstep/res/values/strings.xml
+++ b/go/quickstep/res/values/strings.xml
@@ -3,4 +3,12 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- Label for app share drop target. [CHAR_LIMIT=20] -->
     <string name="app_share_drop_target_label">Share App</string>
+
+    <!-- ******* Overview ******* -->
+    <!-- Label for a button that lets the user listen to the content of the current app. [CHAR_LIMIT=40] -->
+    <string name="action_listen">Listen</string>
+    <!-- Label for a button that translates a screenshot of the current app. [CHAR_LIMIT=40] -->
+    <string name="action_translate">Translate</string>
+    <!-- Label for a button that triggers Search on a screenshot of the current app. [CHAR_LIMIT=40] -->
+    <string name="action_search">Search</string>
 </resources>
diff --git a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
new file mode 100644
index 0000000000..b102a394f6
--- /dev/null
+++ b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.quickstep;
+
+import static com.android.quickstep.views.OverviewActionsView.DISABLED_NO_THUMBNAIL;
+import static com.android.quickstep.views.OverviewActionsView.DISABLED_ROTATED;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Matrix;
+import android.os.SystemClock;
+import android.text.TextUtils;
+
+import com.android.launcher3.R;
+import com.android.quickstep.views.OverviewActionsView;
+import com.android.quickstep.views.TaskThumbnailView;
+import com.android.systemui.shared.recents.model.Task;
+import com.android.systemui.shared.recents.model.ThumbnailData;
+
+/**
+ * Go-specific extension of the factory class that adds an overlay to TaskView
+ */
+public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
+    public static final String ACTION_LISTEN = "com.android.quickstep.ACTION_LISTEN";
+    public static final String ACTION_TRANSLATE = "com.android.quickstep.ACTION_TRANSLATE";
+    public static final String ACTION_SEARCH = "com.android.quickstep.ACTION_SEARCH";
+    public static final String ELAPSED_NANOS = "niu_actions_elapsed_realtime_nanos";
+
+    // Empty constructor required for ResourceBasedOverride
+    public TaskOverlayFactoryGo(Context context) {}
+
+    /**
+     * Create a new overlay instance for the given View
+     */
+    public TaskOverlayGo createOverlay(TaskThumbnailView thumbnailView) {
+        return new TaskOverlayGo(thumbnailView);
+    }
+
+    /**
+     * Overlay on each task handling Overview Action Buttons.
+     * @param <T> The type of View in which the overlay will be placed
+     */
+    public static final class TaskOverlayGo<T extends OverviewActionsView> extends TaskOverlay {
+
+        private String mPackageName;
+
+        private TaskOverlayGo(TaskThumbnailView taskThumbnailView) {
+            super(taskThumbnailView);
+        }
+
+        /**
+         * Called when the current task is interactive for the user
+         */
+        @Override
+        public void initOverlay(Task task, ThumbnailData thumbnail, Matrix matrix,
+                boolean rotated) {
+            getActionsView().updateDisabledFlags(DISABLED_NO_THUMBNAIL, thumbnail == null);
+            mPackageName =
+                    mApplicationContext.getResources().getString(R.string.niu_actions_package);
+
+            if (thumbnail == null || TextUtils.isEmpty(mPackageName)) {
+                return;
+            }
+
+            getActionsView().updateDisabledFlags(DISABLED_ROTATED, rotated);
+            boolean isAllowedByPolicy = thumbnail.isRealSnapshot;
+            getActionsView().setCallbacks(new OverlayUICallbacksGoImpl(isAllowedByPolicy, task));
+        }
+
+        private void sendNIUIntent(String actionType) {
+            Intent intent = createNIUIntent(actionType);
+            mImageApi.shareAsDataWithExplicitIntent(/* crop */ null, intent);
+        }
+
+        private Intent createNIUIntent(String actionType) {
+            return new Intent(actionType)
+                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
+                    .addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
+                    .setPackage(mPackageName)
+                    .putExtra(ELAPSED_NANOS, SystemClock.elapsedRealtimeNanos());
+        }
+
+        protected class OverlayUICallbacksGoImpl extends OverlayUICallbacksImpl
+                implements OverlayUICallbacksGo {
+            public OverlayUICallbacksGoImpl(boolean isAllowedByPolicy, Task task) {
+                super(isAllowedByPolicy, task);
+            }
+
+            @SuppressLint("NewApi")
+            public void onListen() {
+                if (mIsAllowedByPolicy) {
+                    sendNIUIntent(ACTION_LISTEN);
+                } else {
+                    showBlockedByPolicyMessage();
+                }
+            }
+
+            @SuppressLint("NewApi")
+            public void onTranslate() {
+                if (mIsAllowedByPolicy) {
+                    sendNIUIntent(ACTION_TRANSLATE);
+                } else {
+                    showBlockedByPolicyMessage();
+                }
+            }
+
+            @SuppressLint("NewApi")
+            public void onSearch() {
+                if (mIsAllowedByPolicy) {
+                    sendNIUIntent(ACTION_SEARCH);
+                } else {
+                    showBlockedByPolicyMessage();
+                }
+            }
+        }
+    }
+
+    /**
+     * Callbacks the Ui can generate. This is the only way for a Ui to call methods on the
+     * controller.
+     */
+    public interface OverlayUICallbacksGo extends OverlayUICallbacks {
+        /** User has requested to listen to the current content read aloud */
+        void onListen();
+
+        /** User has requested a translation of the current content */
+        void onTranslate();
+
+        /** User has requested a visual search of the current content */
+        void onSearch();
+    }
+}
diff --git a/go/quickstep/src/com/android/quickstep/views/GoOverviewActionsView.java b/go/quickstep/src/com/android/quickstep/views/GoOverviewActionsView.java
new file mode 100644
index 0000000000..9997d16e2d
--- /dev/null
+++ b/go/quickstep/src/com/android/quickstep/views/GoOverviewActionsView.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.quickstep.views;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.R;
+import com.android.quickstep.TaskOverlayFactoryGo.OverlayUICallbacksGo;
+
+/**
+ * View for showing Go-specific action buttons in Overview
+ */
+public final class GoOverviewActionsView extends OverviewActionsView<OverlayUICallbacksGo> {
+    public GoOverviewActionsView(Context context) {
+        this(context, null);
+    }
+
+    public GoOverviewActionsView(Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public GoOverviewActionsView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+
+        if (getResources().getBoolean(R.bool.enable_niu_actions)) {
+            findViewById(R.id.action_listen).setOnClickListener(this);
+            findViewById(R.id.action_translate).setOnClickListener(this);
+            findViewById(R.id.action_search).setOnClickListener(this);
+        } else {
+            findViewById(R.id.action_listen).setVisibility(View.GONE);
+            findViewById(R.id.action_translate).setVisibility(View.GONE);
+            findViewById(R.id.action_search).setVisibility(View.GONE);
+        }
+    }
+
+    @Override
+    public void onClick(View view) {
+        super.onClick(view);
+
+        if (mCallbacks == null) {
+            return;
+        }
+        int id = view.getId();
+        if (id == R.id.action_listen) {
+            mCallbacks.onListen();
+        } else if (id == R.id.action_translate) {
+            mCallbacks.onTranslate();
+        } else if (id == R.id.action_search) {
+            mCallbacks.onSearch();
+        }
+    }
+}
diff --git a/quickstep/res/layout/overview_actions_container.xml b/quickstep/overview_ui_overrides/res/layout/overview_actions_container.xml
similarity index 100%
rename from quickstep/res/layout/overview_actions_container.xml
rename to quickstep/overview_ui_overrides/res/layout/overview_actions_container.xml
diff --git a/quickstep/overview_ui_overrides/res/values/config.xml b/quickstep/overview_ui_overrides/res/values/config.xml
new file mode 100644
index 0000000000..0f09439cf5
--- /dev/null
+++ b/quickstep/overview_ui_overrides/res/values/config.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <string name="task_overlay_factory_class" translatable="false"/>
+</resources>
\ No newline at end of file
diff --git a/quickstep/res/values/config.xml b/quickstep/res/values/config.xml
index 9ec303a48c..be661049a1 100644
--- a/quickstep/res/values/config.xml
+++ b/quickstep/res/values/config.xml
@@ -14,8 +14,6 @@
      limitations under the License.
 -->
 <resources>
-    <string name="task_overlay_factory_class" translatable="false"/>
-
     <string name="overscroll_plugin_factory_class" translatable="false" />
 
     <!-- Activities which block home gesture -->
diff --git a/quickstep/src/com/android/quickstep/ImageActionsApi.java b/quickstep/src/com/android/quickstep/ImageActionsApi.java
index cb4d53a82b..8cb64c24b8 100644
--- a/quickstep/src/com/android/quickstep/ImageActionsApi.java
+++ b/quickstep/src/com/android/quickstep/ImageActionsApi.java
@@ -64,6 +64,20 @@ public class ImageActionsApi {
      */
     @UiThread
     public void shareWithExplicitIntent(@Nullable Rect crop, Intent intent) {
+        addImageAndSendIntent(crop, intent, false);
+    }
+
+    /**
+     * Share the image this api was constructed with using the provided intent. The implementation
+     * should set the intent's data field to the URI pointing to the image.
+     */
+    @UiThread
+    public void shareAsDataWithExplicitIntent(@Nullable Rect crop, Intent intent) {
+        addImageAndSendIntent(crop, intent, true);
+    }
+
+    @UiThread
+    private void addImageAndSendIntent(@Nullable Rect crop, Intent intent, boolean setData) {
         if (mBitmapSupplier.get() == null) {
             Log.e(TAG, "No snapshot available, not starting share.");
             return;
@@ -71,12 +85,14 @@ public class ImageActionsApi {
 
         UI_HELPER_EXECUTOR.execute(() -> persistBitmapAndStartActivity(mContext,
                 mBitmapSupplier.get(), crop, intent, (uri, intentForUri) -> {
-                    intentForUri
-                            .addFlags(FLAG_GRANT_READ_URI_PERMISSION)
-                            .putExtra(EXTRA_STREAM, uri);
+                    intentForUri.addFlags(FLAG_GRANT_READ_URI_PERMISSION);
+                    if (setData) {
+                        intentForUri.setData(uri);
+                    } else {
+                        intentForUri.putExtra(EXTRA_STREAM, uri);
+                    }
                     return new Intent[]{intentForUri};
                 }, TAG));
-
     }
 
     /**
diff --git a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
index 93ebd5aa26..3befb9ce1c 100644
--- a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
@@ -122,12 +122,11 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
      */
     public static class TaskOverlay<T extends OverviewActionsView> {
 
-        private final Context mApplicationContext;
+        protected final Context mApplicationContext;
         protected final TaskThumbnailView mThumbnailView;
 
         private T mActionsView;
-        private ImageActionsApi mImageApi;
-        private boolean mIsAllowedByPolicy;
+        protected ImageActionsApi mImageApi;
 
         protected TaskOverlay(TaskThumbnailView taskThumbnailView) {
             mApplicationContext = taskThumbnailView.getContext().getApplicationContext();
@@ -153,24 +152,8 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
 
             if (thumbnail != null) {
                 getActionsView().updateDisabledFlags(DISABLED_ROTATED, rotated);
-                final boolean isAllowedByPolicy = thumbnail.isRealSnapshot;
-
-                getActionsView().setCallbacks(new OverlayUICallbacks() {
-                    @Override
-                    public void onShare() {
-                        if (isAllowedByPolicy) {
-                            endLiveTileMode(() -> mImageApi.startShareActivity(null));
-                        } else {
-                            showBlockedByPolicyMessage();
-                        }
-                    }
-
-                    @SuppressLint("NewApi")
-                    @Override
-                    public void onScreenshot() {
-                        endLiveTileMode(() -> saveScreenshot(task));
-                    }
-                });
+                boolean isAllowedByPolicy = thumbnail.isRealSnapshot;
+                getActionsView().setCallbacks(new OverlayUICallbacksImpl(isAllowedByPolicy, task));
             }
         }
 
@@ -193,7 +176,7 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
          * Called to save screenshot of the task thumbnail.
          */
         @SuppressLint("NewApi")
-        private void saveScreenshot(Task task) {
+        protected void saveScreenshot(Task task) {
             if (mThumbnailView.isRealSnapshot()) {
                 mImageApi.saveScreenshot(mThumbnailView.getThumbnail(),
                         getTaskSnapshotBounds(), getTaskSnapshotInsets(), task.key);
@@ -251,7 +234,7 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
             return mThumbnailView.getScaledInsets();
         }
 
-        private void showBlockedByPolicyMessage() {
+        protected void showBlockedByPolicyMessage() {
             Toast.makeText(
                     mThumbnailView.getContext(),
                     R.string.blocked_by_policy,
@@ -273,6 +256,29 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
                 dismissTaskMenuView(mActivity);
             }
         }
+
+        protected class OverlayUICallbacksImpl implements OverlayUICallbacks {
+            protected final boolean mIsAllowedByPolicy;
+            protected final Task mTask;
+
+            public OverlayUICallbacksImpl(boolean isAllowedByPolicy, Task task) {
+                mIsAllowedByPolicy = isAllowedByPolicy;
+                mTask = task;
+            }
+
+            public void onShare() {
+                if (mIsAllowedByPolicy) {
+                    endLiveTileMode(() -> mImageApi.startShareActivity(null));
+                } else {
+                    showBlockedByPolicyMessage();
+                }
+            }
+
+            @SuppressLint("NewApi")
+            public void onScreenshot() {
+                endLiveTileMode(() -> saveScreenshot(mTask));
+            }
+        }
     }
 
     /**
-- 
GitLab


From aafa8a44a3c8f014219c115049a229a39dc98de1 Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Thu, 4 Feb 2021 14:28:14 -0800
Subject: [PATCH 0494/1664] [AA+] Add LAUNCHER_ALLAPPS_KEYBOARD_CLOSED event.

Also adds Launcher.allAppsLogger method to simplify AllApps specific user events logging.

Bug: 178562918
Change-Id: I57520fe1504079091f0ff2c4c74268f727ffe14f
---
 .../launcher3/allapps/AllAppsContainerView.java |  6 +++++-
 .../allapps/LauncherAllAppsContainerView.java   |  8 ++++++++
 .../allapps/search/LiveSearchManager.java       | 17 ++++++++++++++---
 .../launcher3/logging/StatsLogManager.java      |  3 +++
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 20f7c231fb..505e6d82e9 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -213,10 +213,14 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         if (insets == null) return;
 
         if (insets.isVisible(WindowInsets.Type.ime())) {
-            getWindowInsetsController().hide(WindowInsets.Type.ime());
+            hideIme();
         }
     }
 
+    protected void hideIme() {
+        getWindowInsetsController().hide(WindowInsets.Type.ime());
+    }
+
     /**
      * Returns whether the view itself will handle the touch event or not.
      */
diff --git a/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java b/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
index a6bc6cf59f..03ce594731 100644
--- a/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
@@ -15,6 +15,8 @@
  */
 package com.android.launcher3.allapps;
 
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_KEYBOARD_CLOSED;
+
 import android.content.Context;
 import android.graphics.Rect;
 import android.util.AttributeSet;
@@ -93,4 +95,10 @@ public class LauncherAllAppsContainerView extends AllAppsContainerView {
             }
         }
     }
+
+    @Override
+    protected void hideIme() {
+        super.hideIme();
+        mLauncher.getLiveSearchManager().allAppsLogger().log(LAUNCHER_ALLAPPS_KEYBOARD_CLOSED);
+    }
 }
diff --git a/src/com/android/launcher3/allapps/search/LiveSearchManager.java b/src/com/android/launcher3/allapps/search/LiveSearchManager.java
index 608affeb2b..d51c78653c 100644
--- a/src/com/android/launcher3/allapps/search/LiveSearchManager.java
+++ b/src/com/android/launcher3/allapps/search/LiveSearchManager.java
@@ -153,15 +153,15 @@ public class LiveSearchManager implements StateListener<LauncherState> {
             clearWidgetHost();
         }
 
-        StatsLogger logger = mLauncher.getStatsLogManager().logger();
         if (finalState.equals(ALL_APPS)) {
+            // creates new instance ID since new all apps session is started.
             mLogInstanceId = new InstanceIdSequence().newInstanceId();
-            logger.withInstanceId(mLogInstanceId).log(LAUNCHER_ALLAPPS_ENTRY);
+            allAppsLogger().log(LAUNCHER_ALLAPPS_ENTRY);
         } else if (mPrevLauncherState.equals(ALL_APPS)
                 // Check if mLogInstanceId is not null; to avoid NPE when LAUNCHER_ALLAPPS_EXIT is
                 // triggered multiple times
                 && mLogInstanceId != null) {
-            logger.withInstanceId(mLogInstanceId).log(LAUNCHER_ALLAPPS_EXIT);
+            allAppsLogger().log(LAUNCHER_ALLAPPS_EXIT);
             mLogInstanceId = null;
         }
     }
@@ -316,4 +316,15 @@ public class LiveSearchManager implements StateListener<LauncherState> {
         @Override
         public void onActivitySaveInstanceState(Activity activity, Bundle bundle) { }
     }
+
+    /**
+     * Returns new instance of {@link StatsLogger} pre-populated with details required to log
+     * AllApps specific user events.
+     */
+    public StatsLogger allAppsLogger() {
+        return getLogInstanceId()
+                .map(instanceId -> mLauncher.getStatsLogManager().logger()
+                        .withInstanceId(instanceId))
+                .orElse(mLauncher.getStatsLogManager().logger());
+    }
 }
diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index 0292d20ef5..0d07e0d171 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -350,6 +350,9 @@ public class StatsLogManager implements ResourceBasedOverride {
 
         @UiEvent(doc = "Launcher exited from AllApps state.")
         LAUNCHER_ALLAPPS_EXIT(693),
+
+        @UiEvent(doc = "User closed the AllApps keyboard.")
+        LAUNCHER_ALLAPPS_KEYBOARD_CLOSED(694),
         ;
 
         // ADD MORE
-- 
GitLab


From 5c3d37b37d2faf961c2ea3697d7bf5682f4f8550 Mon Sep 17 00:00:00 2001
From: "[1;3C" <erosky@google.com>
Date: Fri, 29 Jan 2021 18:20:52 -0800
Subject: [PATCH 0495/1664] Update input-monitors to accept unrotated
 coordinates

Inputflinger now internally always works in the orientation
the display grew-up in so the coordinates of gesture-monitors
no-longer rotate to match the display.

For now, this adds some shims to achieve previous expected
coordinates in launcher

This is behind a flag:
   adb shell setprop persist.debug.per_window_input_rotation 1

Bug: 179274888
Test: use touch interactions on rotated display
Change-Id: Iecd9d233f60b86e24070d7d9055af6b8f44f0b54
---
 .../quickstep/TouchInteractionService.java    | 21 +++++++++++++++++++
 .../OtherActivityInputConsumer.java           | 19 +++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 8ebea33e72..c6c942ab28 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -38,18 +38,23 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
+import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.Region;
 import android.graphics.drawable.Icon;
+import android.hardware.display.DisplayManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.Looper;
 import android.os.SystemClock;
+import android.os.SystemProperties;
 import android.util.Log;
 import android.view.Choreographer;
+import android.view.Display;
 import android.view.InputEvent;
 import android.view.MotionEvent;
+import android.view.Surface;
 import android.view.accessibility.AccessibilityManager;
 
 import androidx.annotation.BinderThread;
@@ -92,6 +97,7 @@ import com.android.systemui.plugins.PluginListener;
 import com.android.systemui.shared.recents.IOverviewProxy;
 import com.android.systemui.shared.recents.ISystemUiProxy;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
+import com.android.systemui.shared.system.InputChannelCompat;
 import com.android.systemui.shared.system.InputChannelCompat.InputEventReceiver;
 import com.android.systemui.shared.system.InputConsumerController;
 import com.android.systemui.shared.system.InputMonitorCompat;
@@ -122,6 +128,9 @@ public class TouchInteractionService extends Service implements PluginListener<O
      */
     private static final int SYSTEM_ACTION_ID_ALL_APPS = 14;
 
+    public static final boolean ENABLE_PER_WINDOW_INPUT_ROTATION =
+            SystemProperties.getBoolean("persist.debug.per_window_input_rotation", false);
+
     private int mBackGestureNotificationCounter = -1;
     @Nullable
     private OverscrollPlugin mOverscrollPlugin;
@@ -249,6 +258,8 @@ public class TouchInteractionService extends Service implements PluginListener<O
     private InputMonitorCompat mInputMonitorCompat;
     private InputEventReceiver mInputEventReceiver;
 
+    private DisplayManager mDisplayManager;
+
     @Override
     public void onCreate() {
         super.onCreate();
@@ -262,6 +273,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
         mDeviceState.addOneHandedModeChangedCallback(this::onOneHandedModeOverlayChanged);
         mDeviceState.runOnUserUnlocked(this::onUserUnlocked);
         ProtoTracer.INSTANCE.get(this).add(this);
+        mDisplayManager = getSystemService(DisplayManager.class);
 
         sConnected = true;
     }
@@ -429,6 +441,15 @@ public class TouchInteractionService extends Service implements PluginListener<O
             return;
         }
         MotionEvent event = (MotionEvent) ev;
+        if (ENABLE_PER_WINDOW_INPUT_ROTATION) {
+            final Display display = mDisplayManager.getDisplay(mDeviceState.getDisplayId());
+            int rotation = display.getRotation();
+            Point sz = new Point();
+            display.getRealSize(sz);
+            if (rotation != Surface.ROTATION_0) {
+                event.transform(InputChannelCompat.createRotationMatrix(rotation, sz.x, sz.y));
+            }
+        }
 
         TestLogging.recordMotionEvent(
                 TestProtocol.SEQUENCE_TIS, "TouchInteractionService.onInputEvent", event);
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
index f2f9fb7af6..5baf5184b5 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
@@ -38,10 +38,12 @@ import android.content.Context;
 import android.content.ContextWrapper;
 import android.content.Intent;
 import android.graphics.PointF;
+import android.hardware.display.DisplayManager;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
+import android.view.Display;
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
 import android.view.ViewConfiguration;
@@ -64,6 +66,7 @@ import com.android.quickstep.RecentsAnimationDeviceState;
 import com.android.quickstep.RotationTouchHelper;
 import com.android.quickstep.TaskAnimationManager;
 import com.android.quickstep.TaskUtils;
+import com.android.quickstep.TouchInteractionService;
 import com.android.quickstep.util.ActiveGestureLog;
 import com.android.quickstep.util.CachedEventDispatcher;
 import com.android.quickstep.util.MotionPauseDetector;
@@ -113,6 +116,8 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
     private final PointF mLastPos = new PointF();
     private int mActivePointerId = INVALID_POINTER_ID;
 
+    private int mLastRotation = -1;
+
     // Distance after which we start dragging the window.
     private final float mTouchSlop;
 
@@ -130,6 +135,8 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
     // Might be displacement in X or Y, depending on the direction we are swiping from the nav bar.
     private float mStartDisplacement;
 
+    private final DisplayManager mDisplayManager;
+
     private Handler mMainThreadHandler;
     private Runnable mCancelRecentsAnimationRunnable = () -> {
         ActivityManagerWrapper.getInstance().cancelRecentsAnimation(
@@ -172,6 +179,7 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
         mPassedPilferInputSlop = mPassedWindowMoveSlop = continuingPreviousGesture;
         mDisableHorizontalSwipe = !mPassedPilferInputSlop && disableHorizontalSwipe;
         mRotationTouchHelper = mDeviceState.getRotationTouchHelper();
+        mDisplayManager = getSystemService(DisplayManager.class);
     }
 
     @Override
@@ -197,6 +205,17 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
             return;
         }
 
+        if (TouchInteractionService.ENABLE_PER_WINDOW_INPUT_ROTATION) {
+            final Display display = mDisplayManager.getDisplay(mDeviceState.getDisplayId());
+            final int rotation = display.getRotation();
+            if (rotation != mLastRotation) {
+                // If rotation changes, reset tracking to avoid degenerate velocities.
+                mLastPos.set(ev.getX(), ev.getY());
+                mVelocityTracker.clear();
+                mLastRotation = rotation;
+            }
+        }
+
         // Proxy events to recents view
         if (mPassedWindowMoveSlop && mInteractionHandler != null
                 && !mRecentsViewDispatcher.hasConsumer()) {
-- 
GitLab


From 4defb4009da960ba62d8875da6d6e914a1cb51f2 Mon Sep 17 00:00:00 2001
From: Sreyas <sreyasr@google.com>
Date: Tue, 9 Feb 2021 18:56:19 -0800
Subject: [PATCH 0496/1664] Update TaskIcon UI.

Moved TaskView Icon up and removed TaskMenuView Icon.
Screenshot: https://drive.google.com/file/d/1dVJOr_n4hfj7HvqHs3GQY-ZsPFkv3aFP/view?usp=sharing
Bug: 179490926
Test: Manual

Change-Id: I41844901a3e47ec6d6a8bdb6ed1fb7f4524500c4
---
 quickstep/res/layout/task_menu.xml            |  9 ----
 quickstep/res/values/dimens.xml               |  1 +
 .../android/quickstep/views/TaskMenuView.java | 52 -------------------
 .../com/android/quickstep/views/TaskView.java |  9 +++-
 4 files changed, 8 insertions(+), 63 deletions(-)

diff --git a/quickstep/res/layout/task_menu.xml b/quickstep/res/layout/task_menu.xml
index 098b34fcbf..744a30587b 100644
--- a/quickstep/res/layout/task_menu.xml
+++ b/quickstep/res/layout/task_menu.xml
@@ -24,15 +24,6 @@
     android:orientation="vertical"
     android:visibility="invisible">
 
-    <com.android.quickstep.views.IconView
-      android:id="@+id/task_icon"
-      android:layout_width="@dimen/task_thumbnail_icon_size"
-      android:layout_height="@dimen/task_thumbnail_icon_size"
-      android:layout_gravity="top|center_horizontal"
-      android:layout_marginBottom="@dimen/deep_shortcut_drawable_padding"
-      android:focusable="false"
-      android:importantForAccessibility="no" />
-
     <TextView
         android:id="@+id/task_name"
         android:layout_width="match_parent"
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 0f40775995..749b4b29da 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -19,6 +19,7 @@
     <dimen name="task_thumbnail_top_margin">24dp</dimen>
     <dimen name="task_thumbnail_half_top_margin">12dp</dimen>
     <dimen name="task_thumbnail_icon_size">48dp</dimen>
+    <dimen name="task_icon_top_margin">-16dp</dimen>
     <!-- For screens without rounded corners -->
     <dimen name="task_corner_radius_small">2dp</dimen>
 
diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
index 4aff7e3211..7e558bb19d 100644
--- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
@@ -35,7 +35,6 @@ import android.widget.TextView;
 
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.BaseDraggingActivity;
-import com.android.launcher3.FastBitmapDrawable;
 import com.android.launcher3.R;
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.Interpolators;
@@ -46,7 +45,6 @@ import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.BaseDragLayer;
 import com.android.quickstep.TaskOverlayFactory;
 import com.android.quickstep.TaskUtils;
-import com.android.quickstep.views.IconView.OnScaleUpdateListener;
 
 /**
  * Contains options for a recent task when long-pressing its icon.
@@ -55,42 +53,15 @@ public class TaskMenuView extends AbstractFloatingView {
 
     private static final Rect sTempRect = new Rect();
 
-    private final OnScaleUpdateListener mTaskViewIconScaleListener = new OnScaleUpdateListener() {
-        @Override
-        public void onScaleUpdate(float scale) {
-            final Drawable drawable = mTaskIcon.getDrawable();
-            if (drawable instanceof FastBitmapDrawable) {
-                if (scale != ((FastBitmapDrawable) drawable).getScale()) {
-                    mMenuIconDrawable.setScale(scale);
-                }
-            }
-        }
-    };
-
-    private final OnScaleUpdateListener mMenuIconScaleListener = new OnScaleUpdateListener() {
-        @Override
-        public void onScaleUpdate(float scale) {
-            final Drawable taskViewDrawable = mTaskView.getIconView().getDrawable();
-            if (taskViewDrawable instanceof FastBitmapDrawable) {
-                final float currentScale = ((FastBitmapDrawable) taskViewDrawable).getScale();
-                if (currentScale != scale) {
-                    ((FastBitmapDrawable) taskViewDrawable).setScale(scale);
-                }
-            }
-        }
-    };
-
     private static final int REVEAL_OPEN_DURATION = 150;
     private static final int REVEAL_CLOSE_DURATION = 100;
 
     private final float mThumbnailTopMargin;
     private BaseDraggingActivity mActivity;
     private TextView mTaskName;
-    private IconView mTaskIcon;
     private AnimatorSet mOpenCloseAnimator;
     private TaskView mTaskView;
     private LinearLayout mOptionLayout;
-    private FastBitmapDrawable mMenuIconDrawable;
 
     public TaskMenuView(Context context, AttributeSet attrs) {
         this(context, attrs, 0);
@@ -107,7 +78,6 @@ public class TaskMenuView extends AbstractFloatingView {
     protected void onFinishInflate() {
         super.onFinishInflate();
         mTaskName = findViewById(R.id.task_name);
-        mTaskIcon = findViewById(R.id.task_icon);
         mOptionLayout = findViewById(R.id.menu_option_layout);
     }
 
@@ -133,15 +103,6 @@ public class TaskMenuView extends AbstractFloatingView {
         }
     }
 
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-
-        // Remove all scale listeners when menu is removed
-        mTaskView.getIconView().removeUpdateScaleListener(mTaskViewIconScaleListener);
-        mTaskIcon.removeUpdateScaleListener(mMenuIconScaleListener);
-    }
-
     @Override
     protected boolean isOfType(int type) {
         return (type & TYPE_TASK_MENU) != 0;
@@ -204,22 +165,9 @@ public class TaskMenuView extends AbstractFloatingView {
 
     private void addMenuOptions(TaskView taskView) {
         Drawable icon = taskView.getTask().icon.getConstantState().newDrawable();
-        mTaskIcon.setDrawable(icon);
-        mTaskIcon.setOnClickListener(v -> close(true));
         mTaskName.setText(TaskUtils.getTitle(getContext(), taskView.getTask()));
         mTaskName.setOnClickListener(v -> close(true));
 
-        // Set the icons to match scale by listening to each other's changes
-        mMenuIconDrawable = icon instanceof FastBitmapDrawable ? (FastBitmapDrawable) icon : null;
-        taskView.getIconView().addUpdateScaleListener(mTaskViewIconScaleListener);
-        mTaskIcon.addUpdateScaleListener(mMenuIconScaleListener);
-
-        // Move the icon and text up half an icon size to lay over the TaskView
-        LinearLayout.LayoutParams params =
-                (LinearLayout.LayoutParams) mTaskIcon.getLayoutParams();
-        params.topMargin = (int) -mThumbnailTopMargin;
-        mTaskIcon.setLayoutParams(params);
-
         TaskOverlayFactory.getEnabledShortcuts(taskView).forEach(this::addMenuOption);
     }
 
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 0654ab1e5d..20d9fa47e6 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -612,6 +612,9 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         boolean isRtl = getLayoutDirection() == LAYOUT_DIRECTION_RTL;
         LayoutParams snapshotParams = (LayoutParams) mSnapshotView.getLayoutParams();
         int thumbnailPadding = (int) getResources().getDimension(R.dimen.task_thumbnail_top_margin);
+        int taskIconMargin = (int) getResources().getDimension(R.dimen.task_icon_top_margin);
+        int taskIconHeight = (int) getResources().getDimension(R.dimen.task_thumbnail_icon_size);
+        int iconTopMargin = taskIconMargin - taskIconHeight + thumbnailPadding;
         LayoutParams iconParams = (LayoutParams) mIconView.getLayoutParams();
         switch (orientationHandler.getRotation()) {
             case ROTATION_90:
@@ -623,7 +626,8 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
             case ROTATION_180:
                 iconParams.gravity = BOTTOM | CENTER_HORIZONTAL;
                 iconParams.bottomMargin = -thumbnailPadding;
-                iconParams.leftMargin = iconParams.topMargin = iconParams.rightMargin = 0;
+                iconParams.leftMargin = iconParams.rightMargin = 0;
+                iconParams.topMargin = iconTopMargin;
                 break;
             case ROTATION_270:
                 iconParams.gravity = (isRtl ? END : START) | CENTER_VERTICAL;
@@ -634,7 +638,8 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
             case Surface.ROTATION_0:
             default:
                 iconParams.gravity = TOP | CENTER_HORIZONTAL;
-                iconParams.leftMargin = iconParams.topMargin = iconParams.rightMargin = 0;
+                iconParams.leftMargin = iconParams.rightMargin = 0;
+                iconParams.topMargin = iconTopMargin;
                 break;
         }
         mIconView.setLayoutParams(iconParams);
-- 
GitLab


From dffbdf861c8d382e2a46417f4c0f04960bafc96d Mon Sep 17 00:00:00 2001
From: Becky Qiu <xuqiu@google.com>
Date: Tue, 9 Feb 2021 12:27:37 -0800
Subject: [PATCH 0497/1664] [Overview Sharing] Pass the full screen progress to
 task overlay.

This is to change the alpha value of the suggest view when user swipe down.

Bug: 179514465
Test: local

Change-Id: Idfa66ff6d9bb43f35f859df828a19e3b47abcd65
---
 quickstep/src/com/android/quickstep/TaskOverlayFactory.java | 6 ++++++
 quickstep/src/com/android/quickstep/views/TaskView.java     | 1 +
 2 files changed, 7 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
index 93ebd5aa26..844d6f5b55 100644
--- a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
@@ -221,6 +221,12 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
             return null;
         }
 
+        /**
+         * Sets full screen progress to the task overlay.
+         */
+        public void setFullscreenProgress(float progress) {
+        }
+
         /**
          * Gets the system shortcut for the screenshot that will be added to the task menu.
          */
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 0654ab1e5d..f420de6a27 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -1080,6 +1080,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         progress = Utilities.boundToRange(progress, 0, 1);
         mFullscreenProgress = progress;
         mIconView.setVisibility(progress < 1 ? VISIBLE : INVISIBLE);
+        getThumbnail().getTaskOverlay().setFullscreenProgress(progress);
 
         updateTaskScaling();
 
-- 
GitLab


From 9aac07e87dc5acb86f05d973381096e5c0e1634f Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Fri, 5 Feb 2021 12:53:55 -0800
Subject: [PATCH 0498/1664] [AA+] Add LAUNCHER_ALLAPPS_SWITCHED_TO_WORK_TAB &
 LAUNCHER_ALLAPPS_SWITCHED_TO_MAIN_TAB events.

Bug: 178562918
Change-Id: I6ae1e034dc8fbbca6fa046104ab69c1ec9f4e6da
---
 .../allapps/LauncherAllAppsContainerView.java          | 10 ++++++++++
 src/com/android/launcher3/logging/StatsLogManager.java |  6 ++++++
 2 files changed, 16 insertions(+)

diff --git a/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java b/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
index 03ce594731..bb1a4c07cf 100644
--- a/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
@@ -16,6 +16,8 @@
 package com.android.launcher3.allapps;
 
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_KEYBOARD_CLOSED;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_SWITCHED_TO_MAIN_TAB;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_SWITCHED_TO_WORK_TAB;
 
 import android.content.Context;
 import android.graphics.Rect;
@@ -88,6 +90,14 @@ public class LauncherAllAppsContainerView extends AllAppsContainerView {
     public void onTabChanged(int pos) {
         super.onTabChanged(pos);
         if (mUsingTabs) {
+
+            // Log tab switches only when the launcher is in AllApps state
+            if (mLauncher.getStateManager().getCurrentStableState() == LauncherState.ALL_APPS) {
+                mLauncher.getLiveSearchManager().allAppsLogger()
+                        .log(pos == AdapterHolder.WORK ? LAUNCHER_ALLAPPS_SWITCHED_TO_WORK_TAB
+                                : LAUNCHER_ALLAPPS_SWITCHED_TO_MAIN_TAB);
+            }
+
             if (pos == AdapterHolder.WORK) {
                 WorkEduView.showWorkEduIfNeeded(mLauncher);
             } else {
diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index 0d07e0d171..071b2634a1 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -353,6 +353,12 @@ public class StatsLogManager implements ResourceBasedOverride {
 
         @UiEvent(doc = "User closed the AllApps keyboard.")
         LAUNCHER_ALLAPPS_KEYBOARD_CLOSED(694),
+
+        @UiEvent(doc = "User switched to Main tab in AllApps screen.")
+        LAUNCHER_ALLAPPS_SWITCHED_TO_MAIN_TAB(695),
+
+        @UiEvent(doc = "User switched to Work tab in AllApps screen.")
+        LAUNCHER_ALLAPPS_SWITCHED_TO_WORK_TAB(696),
         ;
 
         // ADD MORE
-- 
GitLab


From ea826f87d1b50a1f9f84cf8368ae66d6ad00c97e Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Mon, 8 Feb 2021 13:54:07 -0800
Subject: [PATCH 0499/1664] [AA+] Log DeviceSearchResultContainer.QueryLength
 as cardinality field of statsd

Bug: 178562918
Change-Id: Iae8ca85d46f127e94fe57f42c5c3397d27393f6c
---
 .../quickstep/logging/StatsLogCompatManager.java      | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
index d22496d56f..aafb1af88f 100644
--- a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
+++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
@@ -19,6 +19,7 @@ package com.android.quickstep.logging;
 import static com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.EXTENDED_CONTAINERS;
 import static com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.FOLDER;
 import static com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.SEARCH_RESULT_CONTAINER;
+import static com.android.launcher3.logger.LauncherAtomExtensions.ExtendedContainers.ContainerCase.DEVICE_SEARCH_RESULT_CONTAINER;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WORKSPACE_SNAPSHOT;
 import static com.android.systemui.shared.system.SysUiStatsLog.LAUNCHER_UICHANGED__DST_STATE__ALLAPPS;
 import static com.android.systemui.shared.system.SysUiStatsLog.LAUNCHER_UICHANGED__DST_STATE__BACKGROUND;
@@ -38,6 +39,8 @@ import com.android.launcher3.logger.LauncherAtom.FolderContainer.ParentContainer
 import com.android.launcher3.logger.LauncherAtom.FolderIcon;
 import com.android.launcher3.logger.LauncherAtom.FromState;
 import com.android.launcher3.logger.LauncherAtom.ToState;
+import com.android.launcher3.logger.LauncherAtomExtensions.DeviceSearchResultContainer;
+import com.android.launcher3.logger.LauncherAtomExtensions.ExtendedContainers;
 import com.android.launcher3.logging.InstanceId;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.model.AllAppsList;
@@ -301,6 +304,14 @@ public class StatsLogCompatManager extends StatsLogManager {
                 return info.getContainerInfo().getPredictedHotseatContainer().getCardinality();
             case SEARCH_RESULT_CONTAINER:
                 return info.getContainerInfo().getSearchResultContainer().getQueryLength();
+            case EXTENDED_CONTAINERS:
+                ExtendedContainers extendedCont = info.getContainerInfo().getExtendedContainers();
+                if (extendedCont.getContainerCase() == DEVICE_SEARCH_RESULT_CONTAINER) {
+                    DeviceSearchResultContainer deviceSearchResultCont = extendedCont
+                            .getDeviceSearchResultContainer();
+                    return deviceSearchResultCont.hasQueryLength() ? deviceSearchResultCont
+                            .getQueryLength() : -1;
+                }
             default:
                 return info.getFolderIcon().getCardinality();
         }
-- 
GitLab


From 7823402ec9cbf09966548f40e22425f1d5963ae4 Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Fri, 5 Feb 2021 18:39:17 -0800
Subject: [PATCH 0500/1664] Fixes wrong container for
 LAUNCHER_ITEM_DROP_COMPLETED log event.

Bug: 179532038
Change-Id: Idfa1b82c35338a7472ff80d94fb20c69e498a028
---
 src/com/android/launcher3/Workspace.java               | 5 ++---
 src/com/android/launcher3/logging/StatsLogManager.java | 6 +++++-
 src/com/android/launcher3/model/data/FolderInfo.java   | 8 +++++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 8a45c81d97..4b95372035 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1706,10 +1706,9 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         if (dropOverView instanceof FolderIcon) {
             FolderIcon fi = (FolderIcon) dropOverView;
             if (fi.acceptDrop(d.dragInfo)) {
-                mStatsLogManager.logger().withItemInfo(d.dragInfo).withInstanceId(d.logInstanceId)
-                        .log(LauncherEvent.LAUNCHER_ITEM_DROP_COMPLETED);
+                mStatsLogManager.logger().withItemInfo(fi.mInfo).withInstanceId(d.logInstanceId)
+                        .log(LauncherEvent.LAUNCHER_ITEM_DROP_COMPLETED_ON_FOLDER_ICON);
                 fi.onDrop(d, false /* itemReturnedOnFailedDrop */);
-
                 // if the drag started here, we need to remove it from the workspace
                 if (!external) {
                     getParentCellLayoutForView(mDragInfo.cell).removeView(mDragInfo.cell);
diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index 071b2634a1..cc80a88f94 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -95,9 +95,13 @@ public class StatsLogManager implements ResourceBasedOverride {
         @UiEvent(doc = "User dragged a launcher item")
         LAUNCHER_ITEM_DRAG_STARTED(383),
 
-        @UiEvent(doc = "A dragged launcher item is successfully dropped")
+        @UiEvent(doc = "A dragged launcher item is successfully dropped onto workspace, hotseat "
+                + "open folder etc")
         LAUNCHER_ITEM_DROP_COMPLETED(385),
 
+        @UiEvent(doc = "A dragged launcher item is successfully dropped onto a folder icon.")
+        LAUNCHER_ITEM_DROP_COMPLETED_ON_FOLDER_ICON(697),
+
         @UiEvent(doc = "A dragged launcher item is successfully dropped on another item "
                 + "resulting in a new folder creation")
         LAUNCHER_ITEM_DROP_FOLDER_CREATED(386),
diff --git a/src/com/android/launcher3/model/data/FolderInfo.java b/src/com/android/launcher3/model/data/FolderInfo.java
index cc783f7a5e..cd2ef35a66 100644
--- a/src/com/android/launcher3/model/data/FolderInfo.java
+++ b/src/com/android/launcher3/model/data/FolderInfo.java
@@ -34,6 +34,7 @@ import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.folder.FolderNameInfos;
 import com.android.launcher3.logger.LauncherAtom;
 import com.android.launcher3.logger.LauncherAtom.Attribute;
+import com.android.launcher3.logger.LauncherAtom.FolderIcon;
 import com.android.launcher3.logger.LauncherAtom.FromState;
 import com.android.launcher3.logger.LauncherAtom.ToState;
 import com.android.launcher3.model.ModelWriter;
@@ -208,8 +209,13 @@ public class FolderInfo extends ItemInfo {
 
     @Override
     public LauncherAtom.ItemInfo buildProto(FolderInfo fInfo) {
+        FolderIcon.Builder folderIcon = FolderIcon.newBuilder()
+                .setCardinality(contents.size());
+        if (LabelState.SUGGESTED.equals(getLabelState())) {
+            folderIcon.setLabelInfo(title.toString());
+        }
         return getDefaultItemInfoBuilder()
-                .setFolderIcon(LauncherAtom.FolderIcon.newBuilder().setCardinality(contents.size()))
+                .setFolderIcon(folderIcon)
                 .setRank(rank)
                 .setAttribute(getLabelState().mLogAttribute)
                 .setContainerInfo(getContainerInfo())
-- 
GitLab


From 03f8dcb8a4c38d11065bd323ce759c7122c11b42 Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Fri, 5 Feb 2021 19:25:28 -0800
Subject: [PATCH 0501/1664] Add instanceId to LAUNCHER_FOLDER_CONVERTED_TO_ICON
 log event.

Bug: 179534152
Change-Id: I0e4cedbfc2310258ec83f5dd756f8eb71189206b
---
 src/com/android/launcher3/dragndrop/DragController.java | 7 +++++++
 src/com/android/launcher3/folder/Folder.java            | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/dragndrop/DragController.java b/src/com/android/launcher3/dragndrop/DragController.java
index 1cfe6acf05..93df599a81 100644
--- a/src/com/android/launcher3/dragndrop/DragController.java
+++ b/src/com/android/launcher3/dragndrop/DragController.java
@@ -40,12 +40,14 @@ import com.android.launcher3.DropTarget;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.accessibility.DragViewStateAnnouncer;
+import com.android.launcher3.logging.InstanceId;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.util.ItemInfoMatcher;
 import com.android.launcher3.util.TouchController;
 
 import java.util.ArrayList;
+import java.util.Optional;
 
 /**
  * Class for initiating a drag within a view or across multiple views.
@@ -230,6 +232,11 @@ public class DragController implements DragDriver.EventListener, TouchController
         }
     }
 
+    public Optional<InstanceId> getLogInstanceId() {
+        return Optional.ofNullable(mDragObject)
+                .map(dragObject -> dragObject.logInstanceId);
+    }
+
     /**
      * Call this from a drag source view like this:
      *
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index 61938d1719..74d8dca98d 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -1208,7 +1208,9 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
                         newIcon.requestFocus();
                     }
                     if (finalItem != null) {
-                        mStatsLogManager.logger().withItemInfo(finalItem)
+                        StatsLogger logger = mStatsLogManager.logger().withItemInfo(finalItem);
+                        mDragController.getLogInstanceId().map(logger::withInstanceId)
+                                .orElse(logger)
                                 .log(LAUNCHER_FOLDER_CONVERTED_TO_ICON);
                     }
                 }
-- 
GitLab


From 501e139c6efd35d6db730f9440810d1f311397d1 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Tue, 2 Feb 2021 16:45:07 -0800
Subject: [PATCH 0502/1664] Draw the workspace scrim in the LauncherRootView
 instead of DragLayer

=> The entire DragLayer is translated during the -1 transition which creates a janky looking edge at the top of the screen

=> By bumping the scrim up a level, we avoid this

=> Separated WorkspaceAndHotseatScrim into two separate scrims, since only part of the scrim needed to be bumped up to a level. Further, it was an overloaded class.

=> We had previously been implicitly relying on the fact that the scrim was rendered in the Workspace parent; we need to make sure to propagate workspace inavlidations to the container of the scrim. While things would still work without this change, it's more correct to leave it, as we no longer assume a hierarchy for functinoality.

Bug: 178215332

Test: manual verification. See video in bug.

Change-Id: I0a76ddf35ceea8c9635367f69380ef24f42e9479
---
 .../util/StaggeredWorkspaceAnim.java          |  2 +-
 .../android/launcher3/LauncherRootView.java   | 18 ++++-
 src/com/android/launcher3/Workspace.java      | 19 ++++-
 .../WorkspaceStateTransitionAnimation.java    | 15 ++--
 .../launcher3/dragndrop/DragLayer.java        | 35 ++++++---
 ...ceAndHotseatScrim.java => SysUiScrim.java} | 57 +++++---------
 .../graphics/WorkspaceDragScrim.java          | 74 +++++++++++++++++++
 .../AbstractStateChangeTouchController.java   |  3 +-
 8 files changed, 165 insertions(+), 58 deletions(-)
 rename src/com/android/launcher3/graphics/{WorkspaceAndHotseatScrim.java => SysUiScrim.java} (83%)
 create mode 100644 src/com/android/launcher3/graphics/WorkspaceDragScrim.java

diff --git a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
index 5bae3c77c1..932ff27719 100644
--- a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
+++ b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
@@ -139,7 +139,7 @@ public class StaggeredWorkspaceAnim {
 
         addDepthAnimationForState(launcher, NORMAL, ALPHA_DURATION_MS);
 
-        mAnimators.play(launcher.getDragLayer().getScrim().createSysuiMultiplierAnim(0f, 1f)
+        mAnimators.play(launcher.getDragLayer().getSysUiScrim().createSysuiMultiplierAnim(0f, 1f)
                 .setDuration(ALPHA_DURATION_MS));
         mAnimators.addListener(new AnimatorListenerAdapter() {
             @Override
diff --git a/src/com/android/launcher3/LauncherRootView.java b/src/com/android/launcher3/LauncherRootView.java
index 51504ce6a4..76c4518169 100644
--- a/src/com/android/launcher3/LauncherRootView.java
+++ b/src/com/android/launcher3/LauncherRootView.java
@@ -4,12 +4,14 @@ import static com.android.launcher3.config.FeatureFlags.SEPARATE_RECENTS_ACTIVIT
 
 import android.annotation.TargetApi;
 import android.content.Context;
+import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.os.Build;
 import android.util.AttributeSet;
 import android.view.ViewDebug;
 import android.view.WindowInsets;
 
+import com.android.launcher3.graphics.SysUiScrim;
 import com.android.launcher3.statemanager.StatefulActivity;
 
 import java.util.Collections;
@@ -31,6 +33,8 @@ public class LauncherRootView extends InsettableFrameLayout {
     @ViewDebug.ExportedProperty(category = "launcher")
     private boolean mForceHideBackArrow;
 
+    private SysUiScrim mSysUiScrim;
+
     public LauncherRootView(Context context, AttributeSet attrs) {
         super(context, attrs);
         mActivity = StatefulActivity.fromContext(context);
@@ -89,6 +93,18 @@ public class LauncherRootView extends InsettableFrameLayout {
         }
     }
 
+    public void setSysUiScrim(SysUiScrim scrim) {
+        mSysUiScrim = scrim;
+    }
+
+    @Override
+    protected void dispatchDraw(Canvas canvas) {
+        if (mSysUiScrim != null) {
+            mSysUiScrim.draw(canvas);
+        }
+        super.dispatchDraw(canvas);
+    }
+
     @Override
     protected void onLayout(boolean changed, int l, int t, int r, int b) {
         super.onLayout(changed, l, t, r, b);
@@ -119,4 +135,4 @@ public class LauncherRootView extends InsettableFrameLayout {
 
         void onWindowVisibilityChanged(int visibility);
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 8a45c81d97..d7dec12882 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -81,6 +81,7 @@ import com.android.launcher3.folder.FolderIcon;
 import com.android.launcher3.folder.PreviewBackground;
 import com.android.launcher3.graphics.DragPreviewProvider;
 import com.android.launcher3.graphics.PreloadIconDrawable;
+import com.android.launcher3.graphics.WorkspaceDragScrim;
 import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.logger.LauncherAtom;
 import com.android.launcher3.logging.StatsLogManager;
@@ -199,6 +200,9 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
     private boolean mStripScreensOnPageStopMoving = false;
 
     private DragPreviewProvider mOutlineProvider = null;
+
+    private WorkspaceDragScrim mWorkspaceDragScrim;
+
     private boolean mWorkspaceFadeInAdjacentScreens;
 
     final WallpaperOffsetInterpolator mWallpaperOffset;
@@ -1161,6 +1165,19 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         }
     }
 
+    public void setWorkspaceDragScrim(WorkspaceDragScrim workspaceDragScrim) {
+        mWorkspaceDragScrim = workspaceDragScrim;
+    }
+
+    @Override
+    public void invalidate() {
+        // The workspace scrim may need to be re-rendered based on the workspace scroll
+        if (mWorkspaceDragScrim != null) {
+            mWorkspaceDragScrim.invalidate();
+        }
+        super.invalidate();
+    }
+
     @Override
     public void computeScroll() {
         super.computeScroll();
@@ -2028,7 +2045,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         }
         // Invalidating the scrim will also force this CellLayout
         // to be invalidated so that it is highlighted if necessary.
-        mLauncher.getDragLayer().getScrim().invalidate();
+        mLauncher.getDragLayer().getWorkspaceDragScrim().invalidate();
     }
 
     public CellLayout getCurrentDragOverlappingLayout() {
diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
index cd938e1201..0e0ddfb834 100644
--- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
+++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
@@ -32,7 +32,7 @@ import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.Interpolators.ZOOM_OUT;
 import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
 import static com.android.launcher3.graphics.Scrim.SCRIM_PROGRESS;
-import static com.android.launcher3.graphics.WorkspaceAndHotseatScrim.SYSUI_PROGRESS;
+import static com.android.launcher3.graphics.SysUiScrim.SYSUI_PROGRESS;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_TRANSLATE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_FADE;
@@ -49,7 +49,8 @@ import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.anim.PropertySetter;
 import com.android.launcher3.anim.SpringAnimationBuilder;
-import com.android.launcher3.graphics.WorkspaceAndHotseatScrim;
+import com.android.launcher3.graphics.SysUiScrim;
+import com.android.launcher3.graphics.WorkspaceDragScrim;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.util.DynamicResource;
 import com.android.systemui.plugins.ResourceProvider;
@@ -183,10 +184,12 @@ public class WorkspaceStateTransitionAnimation {
     }
 
     public void setScrim(PropertySetter propertySetter, LauncherState state) {
-        WorkspaceAndHotseatScrim scrim = mLauncher.getDragLayer().getScrim();
-        propertySetter.setFloat(scrim, SCRIM_PROGRESS, state.getWorkspaceScrimAlpha(mLauncher),
-                LINEAR);
-        propertySetter.setFloat(scrim, SYSUI_PROGRESS,
+        WorkspaceDragScrim workspaceDragScrim = mLauncher.getDragLayer().getWorkspaceDragScrim();
+        propertySetter.setFloat(workspaceDragScrim, SCRIM_PROGRESS,
+                state.getWorkspaceScrimAlpha(mLauncher), LINEAR);
+
+        SysUiScrim sysUiScrim = mLauncher.getDragLayer().getSysUiScrim();
+        propertySetter.setFloat(sysUiScrim, SYSUI_PROGRESS,
                 state.hasFlag(FLAG_HAS_SYS_UI_SCRIM) ? 1 : 0, LINEAR);
     }
 
diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java
index e71c12d433..7a6b4f9aae 100644
--- a/src/com/android/launcher3/dragndrop/DragLayer.java
+++ b/src/com/android/launcher3/dragndrop/DragLayer.java
@@ -41,12 +41,14 @@ import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.CellLayout;
 import com.android.launcher3.DropTargetBar;
 import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherRootView;
 import com.android.launcher3.R;
 import com.android.launcher3.ShortcutAndWidgetContainer;
 import com.android.launcher3.Workspace;
 import com.android.launcher3.folder.Folder;
 import com.android.launcher3.graphics.OverviewScrim;
-import com.android.launcher3.graphics.WorkspaceAndHotseatScrim;
+import com.android.launcher3.graphics.SysUiScrim;
+import com.android.launcher3.graphics.WorkspaceDragScrim;
 import com.android.launcher3.keyboard.ViewGroupFocusHelper;
 import com.android.launcher3.util.Thunk;
 import com.android.launcher3.views.BaseDragLayer;
@@ -82,8 +84,10 @@ public class DragLayer extends BaseDragLayer<Launcher> {
 
     // Related to adjacent page hints
     private final ViewGroupFocusHelper mFocusIndicatorHelper;
-    private final WorkspaceAndHotseatScrim mWorkspaceScrim;
     private final OverviewScrim mOverviewScrim;
+    private WorkspaceDragScrim mWorkspaceDragScrim;
+    private SysUiScrim mSysUiScrim;
+    private LauncherRootView mRootView;
 
     /**
      * Used to create a new DragLayer from XML.
@@ -99,14 +103,23 @@ public class DragLayer extends BaseDragLayer<Launcher> {
         setChildrenDrawingOrderEnabled(true);
 
         mFocusIndicatorHelper = new ViewGroupFocusHelper(this);
-        mWorkspaceScrim = new WorkspaceAndHotseatScrim(this);
         mOverviewScrim = new OverviewScrim(this);
     }
 
     public void setup(DragController dragController, Workspace workspace) {
         mDragController = dragController;
-        mWorkspaceScrim.setWorkspace(workspace);
         recreateControllers();
+
+        mWorkspaceDragScrim = new WorkspaceDragScrim((this));
+        mWorkspaceDragScrim.setWorkspace(workspace);
+
+        // We delegate drawing of the workspace scrim to LauncherRootView (one level up), so as
+        // to avoid artifacts when translating the entire drag layer in the -1 transition.
+        mRootView = (LauncherRootView) getParent();
+        mSysUiScrim = new SysUiScrim(mRootView);
+        mRootView.setSysUiScrim(mSysUiScrim);
+
+
     }
 
     @Override
@@ -515,7 +528,7 @@ public class DragLayer extends BaseDragLayer<Launcher> {
     @Override
     protected void dispatchDraw(Canvas canvas) {
         // Draw the background below children.
-        mWorkspaceScrim.draw(canvas);
+        mWorkspaceDragScrim.draw(canvas);
         mOverviewScrim.updateCurrentScrimmedView(this);
         mFocusIndicatorHelper.draw(canvas);
         super.dispatchDraw(canvas);
@@ -535,18 +548,22 @@ public class DragLayer extends BaseDragLayer<Launcher> {
     @Override
     protected void onSizeChanged(int w, int h, int oldw, int oldh) {
         super.onSizeChanged(w, h, oldw, oldh);
-        mWorkspaceScrim.setSize(w, h);
+        mSysUiScrim.setSize(w, h);
     }
 
     @Override
     public void setInsets(Rect insets) {
         super.setInsets(insets);
-        mWorkspaceScrim.onInsetsChanged(insets, mAllowSysuiScrims);
+        mSysUiScrim.onInsetsChanged(insets, mAllowSysuiScrims);
         mOverviewScrim.onInsetsChanged(insets);
     }
 
-    public WorkspaceAndHotseatScrim getScrim() {
-        return mWorkspaceScrim;
+    public WorkspaceDragScrim getWorkspaceDragScrim() {
+        return mWorkspaceDragScrim;
+    }
+
+    public SysUiScrim getSysUiScrim() {
+        return mSysUiScrim;
     }
 
     public OverviewScrim getOverviewScrim() {
diff --git a/src/com/android/launcher3/graphics/WorkspaceAndHotseatScrim.java b/src/com/android/launcher3/graphics/SysUiScrim.java
similarity index 83%
rename from src/com/android/launcher3/graphics/WorkspaceAndHotseatScrim.java
rename to src/com/android/launcher3/graphics/SysUiScrim.java
index 7b7ab5e18b..d9c648b37e 100644
--- a/src/com/android/launcher3/graphics/WorkspaceAndHotseatScrim.java
+++ b/src/com/android/launcher3/graphics/SysUiScrim.java
@@ -34,7 +34,6 @@ import android.graphics.LinearGradient;
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.RectF;
-import android.graphics.Region;
 import android.graphics.Shader;
 import android.graphics.drawable.Drawable;
 import android.util.DisplayMetrics;
@@ -44,41 +43,39 @@ import android.view.WindowInsets;
 
 import androidx.core.graphics.ColorUtils;
 
-import com.android.launcher3.CellLayout;
 import com.android.launcher3.R;
 import com.android.launcher3.ResourceUtils;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.Workspace;
 import com.android.launcher3.uioverrides.WallpaperColorInfo;
 import com.android.launcher3.util.Themes;
 
 /**
  * View scrim which draws behind hotseat and workspace
  */
-public class WorkspaceAndHotseatScrim extends Scrim {
+public class SysUiScrim extends Scrim {
 
-    public static final FloatProperty<WorkspaceAndHotseatScrim> SYSUI_PROGRESS =
-            new FloatProperty<WorkspaceAndHotseatScrim>("sysUiProgress") {
+    public static final FloatProperty<SysUiScrim> SYSUI_PROGRESS =
+            new FloatProperty<SysUiScrim>("sysUiProgress") {
                 @Override
-                public Float get(WorkspaceAndHotseatScrim scrim) {
+                public Float get(SysUiScrim scrim) {
                     return scrim.mSysUiProgress;
                 }
 
                 @Override
-                public void setValue(WorkspaceAndHotseatScrim scrim, float value) {
+                public void setValue(SysUiScrim scrim, float value) {
                     scrim.setSysUiProgress(value);
                 }
             };
 
-    private static final FloatProperty<WorkspaceAndHotseatScrim> SYSUI_ANIM_MULTIPLIER =
-            new FloatProperty<WorkspaceAndHotseatScrim>("sysUiAnimMultiplier") {
+    private static final FloatProperty<SysUiScrim> SYSUI_ANIM_MULTIPLIER =
+            new FloatProperty<SysUiScrim>("sysUiAnimMultiplier") {
                 @Override
-                public Float get(WorkspaceAndHotseatScrim scrim) {
+                public Float get(SysUiScrim scrim) {
                     return scrim.mSysUiAnimMultiplier;
                 }
 
                 @Override
-                public void setValue(WorkspaceAndHotseatScrim scrim, float value) {
+                public void setValue(SysUiScrim scrim, float value) {
                     scrim.mSysUiAnimMultiplier = value;
                     scrim.reapplySysUiAlpha();
                 }
@@ -108,10 +105,6 @@ public class WorkspaceAndHotseatScrim extends Scrim {
     private static final int ALPHA_MASK_BITMAP_DP = 200;
     private static final int ALPHA_MASK_WIDTH_DP = 2;
 
-    private final Rect mHighlightRect = new Rect();
-
-    private Workspace mWorkspace;
-
     private boolean mDrawTopScrim, mDrawBottomScrim;
 
     private final RectF mFinalMaskRect = new RectF();
@@ -127,9 +120,8 @@ public class WorkspaceAndHotseatScrim extends Scrim {
     private boolean mAnimateScrimOnNextDraw = false;
     private float mSysUiAnimMultiplier = 1;
 
-    public WorkspaceAndHotseatScrim(View view) {
+    public SysUiScrim(View view) {
         super(view);
-
         mMaskHeight = ResourceUtils.pxFromDp(ALPHA_MASK_BITMAP_DP,
                 view.getResources().getDisplayMetrics());
         mTopScrim = Themes.getAttrDrawable(view.getContext(), R.attr.workspaceStatusBarScrim);
@@ -139,28 +131,10 @@ public class WorkspaceAndHotseatScrim extends Scrim {
         onExtractedColorsChanged(mWallpaperColorInfo);
     }
 
-    public void setWorkspace(Workspace workspace)  {
-        mWorkspace = workspace;
-    }
-
+    /**
+     * Draw the top and bottom scrims
+     */
     public void draw(Canvas canvas) {
-        // Draw the background below children.
-        if (mScrimAlpha > 0) {
-            // Update the scroll position first to ensure scrim cutout is in the right place.
-            mWorkspace.computeScrollWithoutInvalidation();
-            CellLayout currCellLayout = mWorkspace.getCurrentDragOverlappingLayout();
-            canvas.save();
-            if (currCellLayout != null && currCellLayout != mLauncher.getHotseat()) {
-                // Cut a hole in the darkening scrim on the page that should be highlighted, if any.
-                mLauncher.getDragLayer()
-                        .getDescendantRectRelativeToSelf(currCellLayout, mHighlightRect);
-                canvas.clipRect(mHighlightRect, Region.Op.DIFFERENCE);
-            }
-
-            super.draw(canvas);
-            canvas.restore();
-        }
-
         if (!mHideSysUiScrim) {
             if (mSysUiProgress <= 0) {
                 mAnimateScrimOnNextDraw = false;
@@ -247,6 +221,11 @@ public class WorkspaceAndHotseatScrim extends Scrim {
         super.onExtractedColorsChanged(wallpaperColorInfo);
     }
 
+    /**
+     * Set the width and height of the view being scrimmed
+     * @param w
+     * @param h
+     */
     public void setSize(int w, int h) {
         if (mTopScrim != null) {
             mTopScrim.setBounds(0, 0, w, h);
diff --git a/src/com/android/launcher3/graphics/WorkspaceDragScrim.java b/src/com/android/launcher3/graphics/WorkspaceDragScrim.java
new file mode 100644
index 0000000000..d8dc563ce8
--- /dev/null
+++ b/src/com/android/launcher3/graphics/WorkspaceDragScrim.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.graphics;
+
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.graphics.Region;
+import android.view.View;
+
+import com.android.launcher3.CellLayout;
+import com.android.launcher3.Workspace;
+
+/**
+ * Scrim drawn during SpringLoaded State (ie. Drag and Drop). Darkens the workspace except for
+ * the focused CellLayout.
+ */
+public class WorkspaceDragScrim extends Scrim {
+
+    private final Rect mHighlightRect = new Rect();
+
+    private Workspace mWorkspace;
+
+    public WorkspaceDragScrim(View view) {
+        super(view);
+        onExtractedColorsChanged(mWallpaperColorInfo);
+    }
+
+    /**
+     * Set the workspace that this scrim is acting on
+     * @param workspace
+     */
+    public void setWorkspace(Workspace workspace)  {
+        mWorkspace = workspace;
+        mWorkspace.setWorkspaceDragScrim(this);
+    }
+
+    /**
+     * Cut out the focused paged of the Workspace and then draw the scrim
+     * @param canvas
+     */
+    public void draw(Canvas canvas) {
+        // Draw the background below children.
+        if (mScrimAlpha > 0) {
+            // Update the scroll position first to ensure scrim cutout is in the right place.
+            mWorkspace.computeScrollWithoutInvalidation();
+            CellLayout currCellLayout = mWorkspace.getCurrentDragOverlappingLayout();
+            canvas.save();
+            if (currCellLayout != null && currCellLayout != mLauncher.getHotseat()) {
+                // Cut a hole in the darkening scrim on the page that should be highlighted, if any.
+                mLauncher.getDragLayer()
+                        .getDescendantRectRelativeToSelf(currCellLayout, mHighlightRect);
+                canvas.clipRect(mHighlightRect, Region.Op.DIFFERENCE);
+            }
+
+            super.draw(canvas);
+            canvas.restore();
+        }
+    }
+
+}
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index 10cd04cfcf..25ecea5f9f 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -543,7 +543,8 @@ public abstract class AbstractStateChangeTouchController
             // case the user started interacting with it before the animation finished.
             mLauncher.getStateManager().goToState(targetState, false /* animated */);
         }
-        mLauncher.getDragLayer().getScrim().createSysuiMultiplierAnim(1f).setDuration(0).start();
+        mLauncher.getDragLayer().getSysUiScrim().createSysuiMultiplierAnim(
+                1f).setDuration(0).start();
     }
 
     private void logReachedState(LauncherState targetState) {
-- 
GitLab


From 2f5648a9117c8e19a5785ffb2eff26373fb3c24c Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 8 Feb 2021 17:18:25 +0000
Subject: [PATCH 0503/1664] Refactoring before adding a new view type in the
 WidgetsListAdapter

Changes made:
1. Model: added an abstract class for storing common information for
   entries shown in the full page widgets picker.
2. Introduced a ViewHolderBinder interface to split the logic of binding
   data to ViewHolder into separate classes.
3. Move the view holder binding of WidgetsListRow from WidgetListAdapter
   to its new class.
4. Move some widgets picker classes into a new picker package.

Test: Auto: Run WidgetsListAdapterTest, WidgetsListRowEntryTest and
      WidgetsListRowViewHolderBinderTest.
      Manual: open the all apps widgets tray and navigate the list.

Bug: 179797520
Change-Id: Iab29557842bb79156cad84d00a4c5d0db0c5aa06
---
 .../android/launcher3/model/WidgetsModel.java |  16 +-
 res/layout/widgets_full_sheet.xml             |   6 +-
 .../launcher3/testing/TestActivity.java       |  41 ++++
 .../launcher3/ui/LauncherUIScrollTest.java    |   2 +-
 .../widget/WidgetsListAdapterTest.java        | 151 ------------
 .../widget/picker/WidgetsListAdapterTest.java | 215 ++++++++++++++++++
 .../WidgetsListRowViewHolderBinderTest.java   | 190 ++++++++++++++++
 .../model/WidgetsListContentEntryTest.java    | 177 ++++++++++++++
 src/com/android/launcher3/Launcher.java       |   6 +-
 .../launcher3/model/BaseModelUpdateTask.java  |   4 +-
 .../android/launcher3/model/BgDataModel.java  |   4 +-
 .../launcher3/popup/PopupDataProvider.java    |  15 +-
 .../recyclerview/ViewHolderBinder.java        |  44 ++++
 .../SecondaryDisplayLauncher.java             |   4 +-
 .../testing/TestInformationHandler.java       |   2 +-
 .../launcher3/views/OptionsPopupView.java     |   2 +-
 .../WidgetsListBaseEntry.java}                |  32 +--
 .../widget/model/WidgetsListContentEntry.java |  44 ++++
 .../{ => picker}/WidgetsDiffReporter.java     |  63 +++--
 .../widget/{ => picker}/WidgetsFullSheet.java |   9 +-
 .../widget/picker/WidgetsListAdapter.java     | 169 ++++++++++++++
 .../WidgetsListRowViewHolderBinder.java}      | 157 ++++---------
 .../{ => picker}/WidgetsRecyclerView.java     |  12 +-
 .../{ => picker}/WidgetsRowViewHolder.java    |   9 +-
 .../launcher3/model/LoaderResults.java        |   6 +-
 .../android/launcher3/model/WidgetsModel.java |  31 ++-
 .../launcher3/ui/TaplTestsLauncher3.java      |   4 +-
 27 files changed, 1043 insertions(+), 372 deletions(-)
 create mode 100644 robolectric_tests/src/com/android/launcher3/testing/TestActivity.java
 delete mode 100644 robolectric_tests/src/com/android/launcher3/widget/WidgetsListAdapterTest.java
 create mode 100644 robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java
 create mode 100644 robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListRowViewHolderBinderTest.java
 create mode 100644 robolectric_tests/src/com/android/launcher3/widget/picker/model/WidgetsListContentEntryTest.java
 create mode 100644 src/com/android/launcher3/recyclerview/ViewHolderBinder.java
 rename src/com/android/launcher3/widget/{WidgetListRowEntry.java => model/WidgetsListBaseEntry.java} (55%)
 create mode 100644 src/com/android/launcher3/widget/model/WidgetsListContentEntry.java
 rename src/com/android/launcher3/widget/{ => picker}/WidgetsDiffReporter.java (65%)
 rename src/com/android/launcher3/widget/{ => picker}/WidgetsFullSheet.java (96%)
 create mode 100644 src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
 rename src/com/android/launcher3/widget/{WidgetsListAdapter.java => picker/WidgetsListRowViewHolderBinder.java} (50%)
 rename src/com/android/launcher3/widget/{ => picker}/WidgetsRecyclerView.java (97%)
 rename src/com/android/launcher3/widget/{ => picker}/WidgetsRowViewHolder.java (86%)

diff --git a/go/src/com/android/launcher3/model/WidgetsModel.java b/go/src/com/android/launcher3/model/WidgetsModel.java
index 89b3831564..a202095c47 100644
--- a/go/src/com/android/launcher3/model/WidgetsModel.java
+++ b/go/src/com/android/launcher3/model/WidgetsModel.java
@@ -25,7 +25,7 @@ import androidx.annotation.Nullable;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.icons.ComponentWithLabelAndIcon;
 import com.android.launcher3.util.PackageUserKey;
-import com.android.launcher3.widget.WidgetListRowEntry;
+import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -43,17 +43,17 @@ public class WidgetsModel {
     public static final boolean GO_DISABLE_WIDGETS = true;
     public static final boolean GO_DISABLE_NOTIFICATION_DOTS = true;
 
-    private static final ArrayList<WidgetListRowEntry> EMPTY_WIDGET_LIST = new ArrayList<>();
+    private static final ArrayList<WidgetsListBaseEntry> EMPTY_WIDGET_LIST = new ArrayList<>();
 
     /**
-     * Returns a list of {@link WidgetListRowEntry}. All {@link WidgetItem} in a single row
-     * are sorted (based on label and user), but the overall list of {@link WidgetListRowEntry}s
-     * is not sorted. This list is sorted at the UI when using
-     * {@link com.android.launcher3.widget.WidgetsDiffReporter}
+     * Returns a list of {@link WidgetsListBaseEntry}. All {@link WidgetItem} in a single row are
+     * sorted (based on label and user), but the overall list of {@link WidgetsListBaseEntry}s is
+     * not sorted. This list is sorted at the UI when using
+     * {@link com.android.launcher3.widget.picker.WidgetsDiffReporter}
      *
-     * @see com.android.launcher3.widget.WidgetsListAdapter#setWidgets(ArrayList)
+     * @see com.android.launcher3.widget.picker.WidgetsListAdapter#setWidgets(List)
      */
-    public synchronized ArrayList<WidgetListRowEntry> getWidgetsList(Context context) {
+    public synchronized ArrayList<WidgetsListBaseEntry> getWidgetsList(Context context) {
         return EMPTY_WIDGET_LIST;
     }
 
diff --git a/res/layout/widgets_full_sheet.xml b/res/layout/widgets_full_sheet.xml
index f507a88f1a..6e7cf0fee9 100644
--- a/res/layout/widgets_full_sheet.xml
+++ b/res/layout/widgets_full_sheet.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher3.widget.WidgetsFullSheet
+<com.android.launcher3.widget.picker.WidgetsFullSheet
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -27,7 +27,7 @@
         android:background="?android:attr/colorPrimary"
         android:elevation="4dp">
 
-        <com.android.launcher3.widget.WidgetsRecyclerView
+        <com.android.launcher3.widget.picker.WidgetsRecyclerView
             android:id="@+id/widgets_list_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -49,4 +49,4 @@
             android:layout_alignParentTop="true"
             android:layout_marginEnd="@dimen/fastscroll_end_margin" />
     </com.android.launcher3.views.TopRoundedCornerView>
-</com.android.launcher3.widget.WidgetsFullSheet>
\ No newline at end of file
+</com.android.launcher3.widget.picker.WidgetsFullSheet>
\ No newline at end of file
diff --git a/robolectric_tests/src/com/android/launcher3/testing/TestActivity.java b/robolectric_tests/src/com/android/launcher3/testing/TestActivity.java
new file mode 100644
index 0000000000..dbf4b3e6c0
--- /dev/null
+++ b/robolectric_tests/src/com/android/launcher3/testing/TestActivity.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.testing;
+
+import com.android.launcher3.BaseActivity;
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.views.ActivityContext;
+import com.android.launcher3.views.BaseDragLayer;
+
+/** An empty activity for {@link android.app.Fragment}s, {@link android.view.View}s testing. */
+public class TestActivity extends BaseActivity implements ActivityContext {
+
+    private DeviceProfile mDeviceProfile;
+
+    @Override
+    public BaseDragLayer getDragLayer() {
+        return null;
+    }
+
+    @Override
+    public DeviceProfile getDeviceProfile() {
+        return mDeviceProfile;
+    }
+
+    public void setDeviceProfile(DeviceProfile deviceProfile) {
+        mDeviceProfile = deviceProfile;
+    }
+}
diff --git a/robolectric_tests/src/com/android/launcher3/ui/LauncherUIScrollTest.java b/robolectric_tests/src/com/android/launcher3/ui/LauncherUIScrollTest.java
index 957ae77eee..34cb2ad763 100644
--- a/robolectric_tests/src/com/android/launcher3/ui/LauncherUIScrollTest.java
+++ b/robolectric_tests/src/com/android/launcher3/ui/LauncherUIScrollTest.java
@@ -38,7 +38,7 @@ import com.android.launcher3.folder.FolderPagedView;
 import com.android.launcher3.util.LauncherLayoutBuilder;
 import com.android.launcher3.util.LauncherLayoutBuilder.FolderBuilder;
 import com.android.launcher3.util.LauncherModelHelper;
-import com.android.launcher3.widget.WidgetsFullSheet;
+import com.android.launcher3.widget.picker.WidgetsFullSheet;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/robolectric_tests/src/com/android/launcher3/widget/WidgetsListAdapterTest.java b/robolectric_tests/src/com/android/launcher3/widget/WidgetsListAdapterTest.java
deleted file mode 100644
index 5ab3106bd9..0000000000
--- a/robolectric_tests/src/com/android/launcher3/widget/WidgetsListAdapterTest.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.widget;
-
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.robolectric.Shadows.shadowOf;
-
-import android.appwidget.AppWidgetProviderInfo;
-import android.content.ComponentName;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.view.LayoutInflater;
-
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.android.launcher3.InvariantDeviceProfile;
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
-import com.android.launcher3.WidgetPreviewLoader;
-import com.android.launcher3.icons.BitmapInfo;
-import com.android.launcher3.icons.IconCache;
-import com.android.launcher3.model.WidgetItem;
-import com.android.launcher3.model.data.PackageItemInfo;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.shadows.ShadowPackageManager;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-import java.util.Collections;
-
-@RunWith(RobolectricTestRunner.class)
-public class WidgetsListAdapterTest {
-
-    @Mock private LayoutInflater mMockLayoutInflater;
-    @Mock private WidgetPreviewLoader mMockWidgetCache;
-    @Mock private RecyclerView.AdapterDataObserver mListener;
-    @Mock private IconCache mIconCache;
-
-    private WidgetsListAdapter mAdapter;
-    private InvariantDeviceProfile mTestProfile;
-    private Context mContext;
-
-    @Before
-    public void setup() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mTestProfile = new InvariantDeviceProfile();
-        mTestProfile.numRows = 5;
-        mTestProfile.numColumns = 5;
-        mAdapter = new WidgetsListAdapter(mContext, mMockLayoutInflater, mMockWidgetCache,
-                mIconCache, null, null);
-        mAdapter.registerAdapterDataObserver(mListener);
-    }
-
-    @Test
-    public void test_notifyDataSetChanged() throws Exception {
-        mAdapter.setWidgets(generateSampleMap(1));
-        verify(mListener, times(1)).onChanged();
-    }
-
-    @Test
-    public void test_notifyItemInserted() throws Exception {
-        mAdapter.setWidgets(generateSampleMap(1));
-        mAdapter.setWidgets(generateSampleMap(2));
-        verify(mListener, times(1)).onChanged();
-        verify(mListener, times(1)).onItemRangeInserted(eq(1), eq(1));
-    }
-
-    @Test
-    public void test_notifyItemRemoved() throws Exception {
-        mAdapter.setWidgets(generateSampleMap(2));
-        mAdapter.setWidgets(generateSampleMap(1));
-        verify(mListener, times(1)).onChanged();
-        verify(mListener, times(1)).onItemRangeRemoved(eq(1), eq(1));
-    }
-
-    @Test
-    public void testNotifyItemChanged_PackageIconDiff() throws Exception {
-        mAdapter.setWidgets(generateSampleMap(1));
-        mAdapter.setWidgets(generateSampleMap(1));
-        verify(mListener, times(1)).onChanged();
-        verify(mListener, times(1)).onItemRangeChanged(eq(0), eq(1), isNull());
-    }
-
-    @Test
-    public void testNotifyItemChanged_widgetItemInfoDiff() throws Exception {
-        // TODO: same package name but item number changed
-    }
-
-    @Test
-    public void testNotifyItemInsertedRemoved_hodgepodge() throws Exception {
-        // TODO: insert and remove combined.          curMap
-        // newMap [A, C, D]                           [A, B, E]
-        // B - C < 0, removed B from index 1          [A, E]
-        // E - C > 0, C inserted to index 1           [A, C, E]
-        // E - D > 0, D inserted to index 2           [A, C, D, E]
-        // E - null = -1, E deleted from index 3      [A, C, D]
-    }
-
-    /**
-     * Helper method to generate the sample widget model map that can be used for the tests
-     * @param num the number of WidgetItem the map should contain
-     */
-    private ArrayList<WidgetListRowEntry> generateSampleMap(int num) {
-        ArrayList<WidgetListRowEntry> result = new ArrayList<>();
-        if (num <= 0) return result;
-        ShadowPackageManager spm = shadowOf(mContext.getPackageManager());
-
-        for (int i = 0; i < num; i++) {
-            ComponentName cn = new ComponentName("com.placeholder.apk" + i, "PlaceholderWidet");
-
-            AppWidgetProviderInfo widgetInfo = new AppWidgetProviderInfo();
-            widgetInfo.provider = cn;
-            ReflectionHelpers.setField(widgetInfo, "providerInfo", spm.addReceiverIfNotPresent(cn));
-
-            WidgetItem wi = new WidgetItem(LauncherAppWidgetProviderInfo
-                    .fromProviderInfo(mContext, widgetInfo), mTestProfile, mIconCache);
-
-            PackageItemInfo pInfo = new PackageItemInfo(wi.componentName.getPackageName());
-            pInfo.title = pInfo.packageName;
-            pInfo.user = wi.user;
-            pInfo.bitmap = BitmapInfo.of(Bitmap.createBitmap(10, 10, Bitmap.Config.ALPHA_8), 0);
-
-            result.add(new WidgetListRowEntry(pInfo, new ArrayList<>(Collections.singleton(wi))));
-        }
-
-        return result;
-    }
-}
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java
new file mode 100644
index 0000000000..9bea2fb406
--- /dev/null
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java
@@ -0,0 +1,215 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget.picker;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isNull;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.verify;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.appwidget.AppWidgetProviderInfo;
+import android.content.ComponentName;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.view.LayoutInflater;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.launcher3.InvariantDeviceProfile;
+import com.android.launcher3.LauncherAppWidgetProviderInfo;
+import com.android.launcher3.WidgetPreviewLoader;
+import com.android.launcher3.icons.BitmapInfo;
+import com.android.launcher3.icons.ComponentWithLabel;
+import com.android.launcher3.icons.IconCache;
+import com.android.launcher3.model.WidgetItem;
+import com.android.launcher3.model.data.PackageItemInfo;
+import com.android.launcher3.widget.model.WidgetsListBaseEntry;
+import com.android.launcher3.widget.model.WidgetsListContentEntry;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadows.ShadowPackageManager;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+public final class WidgetsListAdapterTest {
+
+    private static final String TEST_PACKAGE_1 = "com.google.test.1";
+    private static final String TEST_PACKAGE_2 = "com.google.test.2";
+
+    @Mock private LayoutInflater mMockLayoutInflater;
+    @Mock private WidgetPreviewLoader mMockWidgetCache;
+    @Mock private RecyclerView.AdapterDataObserver mListener;
+    @Mock private IconCache mIconCache;
+
+    private WidgetsListAdapter mAdapter;
+    private InvariantDeviceProfile mTestProfile;
+    private Context mContext;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mTestProfile = new InvariantDeviceProfile();
+        mTestProfile.numRows = 5;
+        mTestProfile.numColumns = 5;
+        mAdapter = new WidgetsListAdapter(mContext, mMockLayoutInflater, mMockWidgetCache,
+                mIconCache, null, null);
+        mAdapter.registerAdapterDataObserver(mListener);
+
+        doAnswer(invocation -> ((ComponentWithLabel) invocation.getArgument(0))
+                        .getComponent().getPackageName())
+                .when(mIconCache).getTitleNoCache(any());
+    }
+
+    @Test
+    public void setWidgets_shouldNotifyDataSetChanged() {
+        mAdapter.setWidgets(generateSampleMap(1));
+
+        verify(mListener).onChanged();
+    }
+
+    @Test
+    public void setWidgets_withItemInserted_shouldNotifyItemInserted() {
+        mAdapter.setWidgets(generateSampleMap(1));
+        mAdapter.setWidgets(generateSampleMap(2));
+
+        verify(mListener).onItemRangeInserted(eq(1), eq(1));
+    }
+
+    @Test
+    public void setWidgets_withItemRemoved_shouldNotifyItemRemoved() {
+        mAdapter.setWidgets(generateSampleMap(2));
+        mAdapter.setWidgets(generateSampleMap(1));
+
+        verify(mListener).onItemRangeRemoved(eq(1), eq(1));
+    }
+
+    @Test
+    public void setWidgets_appIconChanged_shouldNotifyItemChanged() {
+        mAdapter.setWidgets(generateSampleMap(1));
+        mAdapter.setWidgets(generateSampleMap(1));
+
+        verify(mListener).onItemRangeChanged(eq(0), eq(1), isNull());
+    }
+
+    @Test
+    public void setWidgets_sameApp_moreWidgets_shouldNotifyItemChangedWithWidgetItemInfoDiff() {
+        // GIVEN the adapter was first populated with test package 1 & test package 2.
+        WidgetsListBaseEntry testPackage1With2WidgetsListEntry =
+                generateSampleAppWithWidgets(TEST_PACKAGE_1, /* numOfWidgets= */ 2);
+        WidgetsListBaseEntry testPackage2With2WidgetsListEntry =
+                generateSampleAppWithWidgets(TEST_PACKAGE_2, /* numOfWidgets= */ 2);
+        mAdapter.setWidgets(
+                List.of(testPackage1With2WidgetsListEntry, testPackage2With2WidgetsListEntry));
+
+        // WHEN the adapter is updated with the same list of apps but test package 2 has 3 widgets
+        // now.
+        WidgetsListBaseEntry testPackage1With3WidgetsListEntry =
+                generateSampleAppWithWidgets(TEST_PACKAGE_2, /* numOfWidgets= */ 2);
+        mAdapter.setWidgets(
+                List.of(testPackage1With2WidgetsListEntry, testPackage1With3WidgetsListEntry));
+
+        // THEN the onItemRangeChanged is invoked.
+        verify(mListener).onItemRangeChanged(eq(1), eq(1), isNull());
+    }
+
+    @Test
+    public void setWidgets_hodgepodge_shouldInvokeExpectedDataObserverCallbacks() {
+        List<WidgetsListBaseEntry> allAppsWithWidgets = generateSampleMap(5);
+        // GIVEN the current widgets list consist of [A, B, E].
+        List<WidgetsListBaseEntry> currentList = List.of(
+                allAppsWithWidgets.get(0), allAppsWithWidgets.get(1), allAppsWithWidgets.get(4));
+        mAdapter.setWidgets(currentList);
+
+        // WHEN the widgets list is updated to [A, C, D].
+        List<WidgetsListBaseEntry> newList = List.of(
+                allAppsWithWidgets.get(0), allAppsWithWidgets.get(2), allAppsWithWidgets.get(3));
+        mAdapter.setWidgets(newList);
+
+        // Computation logic                           | [Intermediate list during computation]
+        // THEN B <> C < 0, removed B from index 1     | [A, E]
+        verify(mListener).onItemRangeRemoved(/* positionStart= */ 1, /* itemCount= */ 1);
+        // THEN E <> C > 0, C inserted to index 1      | [A, C, E]
+        verify(mListener).onItemRangeInserted(/* positionStart= */ 1, /* itemCount= */ 1);
+        // THEN E <> D > 0, D inserted to index 2      | [A, C, D, E]
+        verify(mListener).onItemRangeInserted(/* positionStart= */ 2, /* itemCount= */ 1);
+        // THEN E <> null = -1, E deleted from index 3 | [A, C, D]
+        verify(mListener).onItemRangeRemoved(/* positionStart= */ 3, /* itemCount= */ 1);
+    }
+
+    /**
+     * Helper method to generate the sample widget model map that can be used for the tests
+     * @param num the number of WidgetItem the map should contain
+     */
+    private ArrayList<WidgetsListBaseEntry> generateSampleMap(int num) {
+        ArrayList<WidgetsListBaseEntry> result = new ArrayList<>();
+        if (num <= 0) return result;
+
+        for (int i = 0; i < num; i++) {
+            String packageName = "com.placeholder.apk" + i;
+
+            List<WidgetItem> widgetItems = generateWidgetItems(packageName, /* numOfWidgets= */ 1);
+
+            PackageItemInfo pInfo = new PackageItemInfo(packageName);
+            pInfo.title = pInfo.packageName;
+            pInfo.user = widgetItems.get(0).user;
+            pInfo.bitmap = BitmapInfo.of(Bitmap.createBitmap(10, 10, Bitmap.Config.ALPHA_8), 0);
+
+            result.add(new WidgetsListContentEntry(pInfo, /* titleSectionName= */ "", widgetItems));
+        }
+
+        return result;
+    }
+
+    private WidgetsListBaseEntry generateSampleAppWithWidgets(String packageName,
+            int numOfWidgets) {
+        PackageItemInfo appInfo = new PackageItemInfo(packageName);
+        appInfo.title = appInfo.packageName;
+        appInfo.bitmap = BitmapInfo.of(Bitmap.createBitmap(10, 10, Bitmap.Config.ALPHA_8), 0);
+
+        return new WidgetsListContentEntry(appInfo,
+                /* titleSectionName= */ "",
+                generateWidgetItems(packageName, numOfWidgets));
+    }
+
+    private List<WidgetItem> generateWidgetItems(String packageName, int numOfWidgets) {
+        ShadowPackageManager packageManager = shadowOf(mContext.getPackageManager());
+        ArrayList<WidgetItem> widgetItems = new ArrayList<>();
+        for (int i = 0; i < numOfWidgets; i++) {
+            ComponentName cn = ComponentName.createRelative(packageName, ".SampleWidget" + i);
+            AppWidgetProviderInfo widgetInfo = new AppWidgetProviderInfo();
+            widgetInfo.provider = cn;
+            ReflectionHelpers.setField(widgetInfo, "providerInfo",
+                    packageManager.addReceiverIfNotPresent(cn));
+
+            widgetItems.add(new WidgetItem(
+                    LauncherAppWidgetProviderInfo.fromProviderInfo(mContext, widgetInfo),
+                    mTestProfile, mIconCache));
+        }
+        return widgetItems;
+    }
+}
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListRowViewHolderBinderTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListRowViewHolderBinderTest.java
new file mode 100644
index 0000000000..4e9e227a52
--- /dev/null
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListRowViewHolderBinderTest.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget.picker;
+
+import static android.os.Looper.getMainLooper;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.appwidget.AppWidgetProviderInfo;
+import android.content.ComponentName;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.View.OnLongClickListener;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.InvariantDeviceProfile;
+import com.android.launcher3.LauncherAppWidgetProviderInfo;
+import com.android.launcher3.R;
+import com.android.launcher3.WidgetPreviewLoader;
+import com.android.launcher3.icons.BitmapInfo;
+import com.android.launcher3.icons.ComponentWithLabel;
+import com.android.launcher3.icons.IconCache;
+import com.android.launcher3.model.WidgetItem;
+import com.android.launcher3.model.data.PackageItemInfo;
+import com.android.launcher3.testing.TestActivity;
+import com.android.launcher3.widget.WidgetCell;
+import com.android.launcher3.widget.model.WidgetsListContentEntry;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.android.controller.ActivityController;
+import org.robolectric.shadows.ShadowPackageManager;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+public final class WidgetsListRowViewHolderBinderTest {
+    private static final String TEST_PACKAGE = "com.google.test";
+    private static final String APP_NAME = "Test app";
+
+    private Context mContext;
+    private WidgetsListRowViewHolderBinder mViewHolderBinder;
+    private InvariantDeviceProfile mTestProfile;
+    // Replace ActivityController with ActivityScenario, which is the recommended way for activity
+    // testing.
+    private ActivityController<TestActivity> mActivityController;
+    private TestActivity mTestActivity;
+
+    @Mock
+    private OnLongClickListener mOnLongClickListener;
+    @Mock
+    private OnClickListener mOnIconClickListener;
+    @Mock
+    private IconCache mIconCache;
+    @Mock
+    private WidgetPreviewLoader mWidgetPreviewLoader;
+    @Mock
+    private DeviceProfile mDeviceProfile;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mTestProfile = new InvariantDeviceProfile();
+        mTestProfile.numRows = 5;
+        mTestProfile.numColumns = 5;
+
+        mActivityController = Robolectric.buildActivity(TestActivity.class);
+        mTestActivity = mActivityController.setup().get();
+        mTestActivity.setDeviceProfile(mDeviceProfile);
+
+        doAnswer(invocation -> {
+            ComponentWithLabel componentWithLabel = (ComponentWithLabel) invocation.getArgument(0);
+            return componentWithLabel.getComponent().getShortClassName();
+        }).when(mIconCache).getTitleNoCache(any());
+
+        mViewHolderBinder = new WidgetsListRowViewHolderBinder(
+                mContext,
+                LayoutInflater.from(mTestActivity),
+                mOnIconClickListener,
+                mOnLongClickListener,
+                mWidgetPreviewLoader);
+    }
+
+    @After
+    public void tearDown() {
+        mActivityController.destroy();
+    }
+
+    @Test
+    public void bindViewHolder_appWith3Widgets_shouldMatchAppTitle() {
+        WidgetsRowViewHolder viewHolder = mViewHolderBinder.newViewHolder(
+                new FrameLayout(mTestActivity));
+        WidgetsListContentEntry entry = generateSampleAppWithWidgets(
+                APP_NAME,
+                TEST_PACKAGE,
+                /* numOfWidgets= */ 3);
+        mViewHolderBinder.bindViewHolder(viewHolder, entry);
+
+        assertThat(viewHolder.title.getText()).isEqualTo(APP_NAME);
+    }
+
+    @Test
+    public void bindViewHolder_appWith3Widgets_shouldHave3Widgets() {
+        WidgetsRowViewHolder viewHolder = mViewHolderBinder.newViewHolder(
+                new FrameLayout(mTestActivity));
+        WidgetsListContentEntry entry = generateSampleAppWithWidgets(
+                APP_NAME,
+                TEST_PACKAGE,
+                /* numOfWidgets= */ 3);
+        mViewHolderBinder.bindViewHolder(viewHolder, entry);
+        shadowOf(getMainLooper()).idle();
+
+        // THEN the cell container has 5 children: 3 widgets + 2 separators
+        // Index:        0       1        2       3        4
+        // View:  .SampleWidget0 | .SampleWidget1 | .SampleWidget2
+        assertThat(viewHolder.cellContainer.getChildCount()).isEqualTo(5);
+        // Widget 0 label is .SampleWidget0.
+        assertWidgetCellWithLabel(viewHolder.cellContainer.getChildAt(0), ".SampleWidget0");
+        // Widget 1 label is .SampleWidget1.
+        assertWidgetCellWithLabel(viewHolder.cellContainer.getChildAt(2), ".SampleWidget1");
+        // Widget 2 label is .SampleWidget2.
+        assertWidgetCellWithLabel(viewHolder.cellContainer.getChildAt(4), ".SampleWidget2");
+    }
+
+    private WidgetsListContentEntry generateSampleAppWithWidgets(String appName, String packageName,
+            int numOfWidgets) {
+        PackageItemInfo appInfo = new PackageItemInfo(packageName);
+        appInfo.title = appName;
+        appInfo.bitmap = BitmapInfo.of(Bitmap.createBitmap(10, 10, Bitmap.Config.ALPHA_8), 0);
+
+        return new WidgetsListContentEntry(appInfo,
+                /* titleSectionName= */ "",
+                generateWidgetItems(packageName, numOfWidgets));
+    }
+
+    private List<WidgetItem> generateWidgetItems(String packageName, int numOfWidgets) {
+        ShadowPackageManager packageManager = shadowOf(mContext.getPackageManager());
+        ArrayList<WidgetItem> widgetItems = new ArrayList<>();
+        for (int i = 0; i < numOfWidgets; i++) {
+            ComponentName cn = ComponentName.createRelative(packageName, ".SampleWidget" + i);
+            AppWidgetProviderInfo widgetInfo = new AppWidgetProviderInfo();
+            widgetInfo.provider = cn;
+            ReflectionHelpers.setField(widgetInfo, "providerInfo",
+                    packageManager.addReceiverIfNotPresent(cn));
+
+            widgetItems.add(new WidgetItem(
+                    LauncherAppWidgetProviderInfo.fromProviderInfo(mContext, widgetInfo),
+                    mTestProfile, mIconCache));
+        }
+        return widgetItems;
+    }
+
+    private void assertWidgetCellWithLabel(View view, String label) {
+        assertThat(view).isInstanceOf(WidgetCell.class);
+        TextView widgetLabel = (TextView) view.findViewById(R.id.widget_name);
+        assertThat(widgetLabel.getText()).isEqualTo(label);
+    }
+}
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/model/WidgetsListContentEntryTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/model/WidgetsListContentEntryTest.java
new file mode 100644
index 0000000000..a11d0c9505
--- /dev/null
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/model/WidgetsListContentEntryTest.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget.picker.model;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.appwidget.AppWidgetProviderInfo;
+import android.content.ComponentName;
+import android.content.Context;
+
+import com.android.launcher3.InvariantDeviceProfile;
+import com.android.launcher3.LauncherAppWidgetProviderInfo;
+import com.android.launcher3.icons.ComponentWithLabel;
+import com.android.launcher3.icons.IconCache;
+import com.android.launcher3.model.WidgetItem;
+import com.android.launcher3.model.data.PackageItemInfo;
+import com.android.launcher3.widget.model.WidgetsListContentEntry;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadows.ShadowPackageManager;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RunWith(RobolectricTestRunner.class)
+public final class WidgetsListContentEntryTest {
+    private static final String PACKAGE_NAME = "com.google.test";
+    private static final PackageItemInfo PACKAGE_ITEM_INFO = new PackageItemInfo(PACKAGE_NAME);
+    private static final ComponentName WIDGET_1 = ComponentName.createRelative(PACKAGE_NAME,
+            ".widget1");
+    private static final ComponentName WIDGET_2 = ComponentName.createRelative(PACKAGE_NAME,
+            ".widget2");
+    private static final ComponentName WIDGET_3 = ComponentName.createRelative(PACKAGE_NAME,
+            ".widget3");
+    private static final Map<ComponentName, String> WIDGETS_TO_LABELS = new HashMap();
+
+    static {
+        WIDGETS_TO_LABELS.put(WIDGET_1, "Cat");
+        WIDGETS_TO_LABELS.put(WIDGET_2, "Dog");
+        WIDGETS_TO_LABELS.put(WIDGET_3, "Bird");
+    }
+
+    @Mock private IconCache mIconCache;
+
+    private Context mContext;
+    private InvariantDeviceProfile mTestProfile;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mTestProfile = new InvariantDeviceProfile();
+        mTestProfile.numRows = 5;
+        mTestProfile.numColumns = 5;
+
+        doAnswer(invocation -> {
+            ComponentWithLabel componentWithLabel = (ComponentWithLabel) invocation.getArgument(0);
+            return WIDGETS_TO_LABELS.get(componentWithLabel.getComponent());
+        }).when(mIconCache).getTitleNoCache(any());
+    }
+
+    @Test
+    public void unsortedWidgets_diffLabels_shouldSortWidgetItems() {
+        // GIVEN a list of widgets in unsorted order.
+        // Cat 2x3
+        WidgetItem widgetItem1 = createWidgetItem(WIDGET_1, /* spanX= */ 2, /* spanY= */ 3);
+        // Dog 2x3
+        WidgetItem widgetItem2 = createWidgetItem(WIDGET_2, /* spanX= */ 2, /* spanY= */ 3);
+        // Bird 2x3
+        WidgetItem widgetItem3 = createWidgetItem(WIDGET_3, /* spanX= */ 2, /* spanY= */ 3);
+
+        // WHEN creates a WidgetsListRowEntry with the unsorted widgets.
+        WidgetsListContentEntry widgetsListRowEntry = new WidgetsListContentEntry(PACKAGE_ITEM_INFO,
+                /* titleSectionName= */ "T",
+                List.of(widgetItem1, widgetItem2, widgetItem3));
+
+        // THEN the widgets list is sorted by their labels alphabetically: [Bird, Cat, Dog].
+        assertThat(widgetsListRowEntry.mWidgets)
+                .containsExactly(widgetItem3, widgetItem1, widgetItem2)
+                .inOrder();
+        assertThat(widgetsListRowEntry.mTitleSectionName).isEqualTo("T");
+        assertThat(widgetsListRowEntry.mPkgItem).isEqualTo(PACKAGE_ITEM_INFO);
+    }
+
+    @Test
+    public void unsortedWidgets_sameLabels_differentSize_shouldSortWidgetItems() {
+        // GIVEN a list of widgets in unsorted order.
+        // Cat 3x3
+        WidgetItem widgetItem1 = createWidgetItem(WIDGET_1, /* spanX= */ 3, /* spanY= */ 3);
+        // Cat 1x2
+        WidgetItem widgetItem2 = createWidgetItem(WIDGET_1, /* spanX= */ 1, /* spanY= */ 2);
+        // Cat 2x2
+        WidgetItem widgetItem3 = createWidgetItem(WIDGET_1, /* spanX= */ 2, /* spanY= */ 2);
+
+        // WHEN creates a WidgetsListRowEntry with the unsorted widgets.
+        WidgetsListContentEntry widgetsListRowEntry = new WidgetsListContentEntry(PACKAGE_ITEM_INFO,
+                /* titleSectionName= */ "T",
+                List.of(widgetItem1, widgetItem2, widgetItem3));
+
+        // THEN the widgets list is sorted by their gird sizes in an ascending order:
+        // [1x2, 2x2, 3x3].
+        assertThat(widgetsListRowEntry.mWidgets)
+                .containsExactly(widgetItem2, widgetItem3, widgetItem1)
+                .inOrder();
+        assertThat(widgetsListRowEntry.mTitleSectionName).isEqualTo("T");
+        assertThat(widgetsListRowEntry.mPkgItem).isEqualTo(PACKAGE_ITEM_INFO);
+    }
+
+    @Test
+    public void unsortedWidgets_hodgepodge_shouldSortWidgetItems() {
+        // GIVEN a list of widgets in unsorted order.
+        // Cat 3x3
+        WidgetItem widgetItem1 = createWidgetItem(WIDGET_1, /* spanX= */ 3, /* spanY= */ 3);
+        // Cat 1x2
+        WidgetItem widgetItem2 = createWidgetItem(WIDGET_1, /* spanX= */ 1, /* spanY= */ 2);
+        // Dog 2x2
+        WidgetItem widgetItem3 = createWidgetItem(WIDGET_2, /* spanX= */ 2, /* spanY= */ 2);
+        // Bird 2x2
+        WidgetItem widgetItem4 = createWidgetItem(WIDGET_3, /* spanX= */ 2, /* spanY= */ 2);
+
+        // WHEN creates a WidgetsListRowEntry with the unsorted widgets.
+        WidgetsListContentEntry widgetsListRowEntry = new WidgetsListContentEntry(PACKAGE_ITEM_INFO,
+                /* titleSectionName= */ "T",
+                List.of(widgetItem1, widgetItem2, widgetItem3, widgetItem4));
+
+        // THEN the widgets list is first sorted by labels alphabetically. Then, for widgets with
+        // same labels, they are sorted by their gird sizes in an ascending order:
+        // [Bird 2x2, Cat 1x2, Cat 3x3, Dog 2x2]
+        assertThat(widgetsListRowEntry.mWidgets)
+                .containsExactly(widgetItem4, widgetItem2, widgetItem1, widgetItem3)
+                .inOrder();
+        assertThat(widgetsListRowEntry.mTitleSectionName).isEqualTo("T");
+        assertThat(widgetsListRowEntry.mPkgItem).isEqualTo(PACKAGE_ITEM_INFO);
+    }
+
+    private WidgetItem createWidgetItem(ComponentName componentName, int spanX, int spanY) {
+        String label = WIDGETS_TO_LABELS.get(componentName);
+        ShadowPackageManager packageManager = shadowOf(mContext.getPackageManager());
+        AppWidgetProviderInfo widgetInfo = new AppWidgetProviderInfo();
+        widgetInfo.provider = componentName;
+        ReflectionHelpers.setField(widgetInfo, "providerInfo",
+                packageManager.addReceiverIfNotPresent(componentName));
+
+        LauncherAppWidgetProviderInfo launcherAppWidgetProviderInfo =
+                LauncherAppWidgetProviderInfo.fromProviderInfo(mContext, widgetInfo);
+        launcherAppWidgetProviderInfo.spanX = spanX;
+        launcherAppWidgetProviderInfo.spanY = spanY;
+        launcherAppWidgetProviderInfo.label = label;
+
+        return new WidgetItem(launcherAppWidgetProviderInfo, mTestProfile, mIconCache);
+    }
+}
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 344ae0a699..2df9cbed54 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -181,10 +181,10 @@ import com.android.launcher3.widget.PendingAddWidgetInfo;
 import com.android.launcher3.widget.PendingAppWidgetHostView;
 import com.android.launcher3.widget.WidgetAddFlowHandler;
 import com.android.launcher3.widget.WidgetHostViewLoader;
-import com.android.launcher3.widget.WidgetListRowEntry;
 import com.android.launcher3.widget.WidgetManagerHelper;
-import com.android.launcher3.widget.WidgetsFullSheet;
 import com.android.launcher3.widget.custom.CustomWidgetManager;
+import com.android.launcher3.widget.model.WidgetsListBaseEntry;
+import com.android.launcher3.widget.picker.WidgetsFullSheet;
 import com.android.systemui.plugins.OverlayPlugin;
 import com.android.systemui.plugins.PluginListener;
 import com.android.systemui.plugins.shared.LauncherExterns;
@@ -2552,7 +2552,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     }
 
     @Override
-    public void bindAllWidgets(final ArrayList<WidgetListRowEntry> allWidgets) {
+    public void bindAllWidgets(final List<WidgetsListBaseEntry> allWidgets) {
         mPopupDataProvider.setAllWidgets(allWidgets);
     }
 
diff --git a/src/com/android/launcher3/model/BaseModelUpdateTask.java b/src/com/android/launcher3/model/BaseModelUpdateTask.java
index d1e501788e..543ee2adf7 100644
--- a/src/com/android/launcher3/model/BaseModelUpdateTask.java
+++ b/src/com/android/launcher3/model/BaseModelUpdateTask.java
@@ -28,7 +28,7 @@ import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.ItemInfoMatcher;
-import com.android.launcher3.widget.WidgetListRowEntry;
+import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -123,7 +123,7 @@ public abstract class BaseModelUpdateTask implements ModelUpdateTask {
     }
 
     public void bindUpdatedWidgets(BgDataModel dataModel) {
-        final ArrayList<WidgetListRowEntry> widgets =
+        final ArrayList<WidgetsListBaseEntry> widgets =
                 dataModel.widgetsModel.getWidgetsList(mApp.getContext());
         scheduleCallbackTask(c -> c.bindAllWidgets(widgets));
     }
diff --git a/src/com/android/launcher3/model/BgDataModel.java b/src/com/android/launcher3/model/BgDataModel.java
index 2d860a41d3..1d7d1a2ba7 100644
--- a/src/com/android/launcher3/model/BgDataModel.java
+++ b/src/com/android/launcher3/model/BgDataModel.java
@@ -50,7 +50,7 @@ import com.android.launcher3.util.IntSet;
 import com.android.launcher3.util.IntSparseArrayMap;
 import com.android.launcher3.util.ItemInfoMatcher;
 import com.android.launcher3.util.ViewOnDrawExecutor;
-import com.android.launcher3.widget.WidgetListRowEntry;
+import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
@@ -467,7 +467,7 @@ public class BgDataModel {
         void bindWidgetsRestored(ArrayList<LauncherAppWidgetInfo> widgets);
         void bindRestoreItemsChange(HashSet<ItemInfo> updates);
         void bindWorkspaceComponentsRemoved(ItemInfoMatcher matcher);
-        void bindAllWidgets(ArrayList<WidgetListRowEntry> widgets);
+        void bindAllWidgets(List<WidgetsListBaseEntry> widgets);
         void onPageBoundSynchronously(int page);
         void executeOnNextDraw(ViewOnDrawExecutor executor);
         void bindDeepShortcutMap(HashMap<ComponentKey, Integer> deepShortcutMap);
diff --git a/src/com/android/launcher3/popup/PopupDataProvider.java b/src/com/android/launcher3/popup/PopupDataProvider.java
index 76048ba610..18536325eb 100644
--- a/src/com/android/launcher3/popup/PopupDataProvider.java
+++ b/src/com/android/launcher3/popup/PopupDataProvider.java
@@ -31,10 +31,10 @@ import com.android.launcher3.notification.NotificationListener;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.PackageUserKey;
 import com.android.launcher3.util.ShortcutUtil;
-import com.android.launcher3.widget.WidgetListRowEntry;
+import com.android.launcher3.widget.model.WidgetsListBaseEntry;
+import com.android.launcher3.widget.model.WidgetsListContentEntry;
 
 import java.io.PrintWriter;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -59,7 +59,7 @@ public class PopupDataProvider implements NotificationListener.NotificationsChan
     /** Maps packages to their DotInfo's . */
     private Map<PackageUserKey, DotInfo> mPackageUserToDotInfos = new HashMap<>();
     /** Maps packages to their Widgets */
-    private ArrayList<WidgetListRowEntry> mAllWidgets = new ArrayList<>();
+    private List<WidgetsListBaseEntry> mAllWidgets = List.of();
 
     private PopupDataChangeListener mChangeListener = PopupDataChangeListener.INSTANCE;
 
@@ -187,7 +187,7 @@ public class PopupDataProvider implements NotificationListener.NotificationsChan
         notificationListener.cancelNotificationFromLauncher(notificationKey);
     }
 
-    public void setAllWidgets(ArrayList<WidgetListRowEntry> allWidgets) {
+    public void setAllWidgets(List<WidgetsListBaseEntry> allWidgets) {
         mAllWidgets = allWidgets;
         mChangeListener.onWidgetsBound();
     }
@@ -196,14 +196,15 @@ public class PopupDataProvider implements NotificationListener.NotificationsChan
         mChangeListener = listener == null ? PopupDataChangeListener.INSTANCE : listener;
     }
 
-    public ArrayList<WidgetListRowEntry> getAllWidgets() {
+    public List<WidgetsListBaseEntry> getAllWidgets() {
         return mAllWidgets;
     }
 
     public List<WidgetItem> getWidgetsForPackageUser(PackageUserKey packageUserKey) {
         return mAllWidgets.stream()
-                .filter(row -> row.pkgItem.packageName.equals(packageUserKey.mPackageName))
-                .flatMap(row -> row.widgets.stream())
+                .filter(row -> row instanceof WidgetsListContentEntry
+                        && row.mPkgItem.packageName.equals(packageUserKey.mPackageName))
+                .flatMap(row -> ((WidgetsListContentEntry) row).mWidgets.stream())
                 .filter(widget -> packageUserKey.mUser.equals(widget.user))
                 .collect(Collectors.toList());
     }
diff --git a/src/com/android/launcher3/recyclerview/ViewHolderBinder.java b/src/com/android/launcher3/recyclerview/ViewHolderBinder.java
new file mode 100644
index 0000000000..4653774b39
--- /dev/null
+++ b/src/com/android/launcher3/recyclerview/ViewHolderBinder.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.recyclerview;
+
+import android.view.ViewGroup;
+
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
+
+/**
+ * Creates and populates views with data
+ *
+ * @param <T> A data model which is used to populate the {@link ViewHolder}.
+ * @param <V> A subclass of {@link ViewHolder} which holds references to views.
+ */
+public interface ViewHolderBinder<T, V extends ViewHolder> {
+    /**
+     * Creates a new view, and attach it to the parent {@link ViewGroup}. Then, populates UI
+     * references in a {@link ViewHolder}.
+     */
+    V newViewHolder(ViewGroup parent);
+
+    /** Populate UI references in {@link ViewHolder} with data. */
+    void bindViewHolder(V viewHolder, T data);
+
+    /**
+     * Called when the view is recycled. Views are recycled in batches once they are sufficiently
+     * far off screen that it is unlikely the user will scroll back to them soon. Optionally
+     * override this to free expensive resources.
+     */
+    default void unbindViewHolder(V viewHolder) {}
+}
diff --git a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
index 026634529f..0e8d4aea87 100644
--- a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
+++ b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
@@ -46,7 +46,7 @@ import com.android.launcher3.util.ItemInfoMatcher;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.util.ViewOnDrawExecutor;
 import com.android.launcher3.views.BaseDragLayer;
-import com.android.launcher3.widget.WidgetListRowEntry;
+import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -232,7 +232,7 @@ public class SecondaryDisplayLauncher extends BaseDraggingActivity
     public void bindWorkspaceComponentsRemoved(ItemInfoMatcher matcher) { }
 
     @Override
-    public void bindAllWidgets(ArrayList<WidgetListRowEntry> widgets) { }
+    public void bindAllWidgets(List<WidgetsListBaseEntry> widgets) { }
 
     @Override
     public void onPageBoundSynchronously(int page) { }
diff --git a/src/com/android/launcher3/testing/TestInformationHandler.java b/src/com/android/launcher3/testing/TestInformationHandler.java
index d4a132e5ba..4261d080d9 100644
--- a/src/com/android/launcher3/testing/TestInformationHandler.java
+++ b/src/com/android/launcher3/testing/TestInformationHandler.java
@@ -33,7 +33,7 @@ import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.util.ResourceBasedOverride;
-import com.android.launcher3.widget.WidgetsFullSheet;
+import com.android.launcher3.widget.picker.WidgetsFullSheet;
 
 import java.util.concurrent.ExecutionException;
 import java.util.function.Function;
diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java
index 80f0981af5..addaf9cb82 100644
--- a/src/com/android/launcher3/views/OptionsPopupView.java
+++ b/src/com/android/launcher3/views/OptionsPopupView.java
@@ -49,7 +49,7 @@ import com.android.launcher3.popup.ArrowPopup;
 import com.android.launcher3.shortcuts.DeepShortcutView;
 import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.TestProtocol;
-import com.android.launcher3.widget.WidgetsFullSheet;
+import com.android.launcher3.widget.picker.WidgetsFullSheet;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/launcher3/widget/WidgetListRowEntry.java b/src/com/android/launcher3/widget/model/WidgetsListBaseEntry.java
similarity index 55%
rename from src/com/android/launcher3/widget/WidgetListRowEntry.java
rename to src/com/android/launcher3/widget/model/WidgetsListBaseEntry.java
index 17e4673c44..10ea7dbc5d 100644
--- a/src/com/android/launcher3/widget/WidgetListRowEntry.java
+++ b/src/com/android/launcher3/widget/model/WidgetsListBaseEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2021 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,36 +13,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.launcher3.widget;
 
-import com.android.launcher3.model.WidgetItem;
+package com.android.launcher3.widget.model;
+
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.PackageItemInfo;
 
-import java.util.ArrayList;
-
-/**
- * Holder class to store all the information related to a single row in the widget list
- */
-public class WidgetListRowEntry {
-
-    public final PackageItemInfo pkgItem;
-
-    public final ArrayList<WidgetItem> widgets;
+/** Holder class to store the package information of an entry shown in the widgets list. */
+public abstract class WidgetsListBaseEntry {
+    public final PackageItemInfo mPkgItem;
 
     /**
      * Character that is used as a section name for the {@link ItemInfo#title}.
      * (e.g., "G" will be stored if title is "Google")
      */
-    public String titleSectionName;
-
-    public WidgetListRowEntry(PackageItemInfo pkgItem, ArrayList<WidgetItem> items) {
-        this.pkgItem = pkgItem;
-        this.widgets = items;
-    }
+    public final String mTitleSectionName;
 
-    @Override
-    public String toString() {
-        return pkgItem.packageName + ":" + widgets.size();
+    public WidgetsListBaseEntry(PackageItemInfo pkgItem, String titleSectionName) {
+        mPkgItem = pkgItem;
+        mTitleSectionName = titleSectionName;
     }
 }
diff --git a/src/com/android/launcher3/widget/model/WidgetsListContentEntry.java b/src/com/android/launcher3/widget/model/WidgetsListContentEntry.java
new file mode 100644
index 0000000000..407f194cc3
--- /dev/null
+++ b/src/com/android/launcher3/widget/model/WidgetsListContentEntry.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget.model;
+
+import com.android.launcher3.model.WidgetItem;
+import com.android.launcher3.model.data.PackageItemInfo;
+import com.android.launcher3.widget.WidgetItemComparator;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Holder class to store all the information related to a list of widgets from the same app which is
+ * shown in the {@link com.android.launcher3.widget.picker.WidgetsFullSheet}.
+ */
+public final class WidgetsListContentEntry extends WidgetsListBaseEntry {
+
+    public final List<WidgetItem> mWidgets;
+
+    public WidgetsListContentEntry(PackageItemInfo pkgItem, String titleSectionName,
+            List<WidgetItem> items) {
+        super(pkgItem, titleSectionName);
+        this.mWidgets =
+                items.stream().sorted(new WidgetItemComparator()).collect(Collectors.toList());
+    }
+
+    @Override
+    public String toString() {
+        return mPkgItem.packageName + ":" + mWidgets.size();
+    }
+}
diff --git a/src/com/android/launcher3/widget/WidgetsDiffReporter.java b/src/com/android/launcher3/widget/picker/WidgetsDiffReporter.java
similarity index 65%
rename from src/com/android/launcher3/widget/WidgetsDiffReporter.java
rename to src/com/android/launcher3/widget/picker/WidgetsDiffReporter.java
index df6e2c3023..398d9ba448 100644
--- a/src/com/android/launcher3/widget/WidgetsDiffReporter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsDiffReporter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher3.widget;
+package com.android.launcher3.widget.picker;
 
 import android.util.Log;
 
@@ -22,7 +22,9 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.model.data.PackageItemInfo;
-import com.android.launcher3.widget.WidgetsListAdapter.WidgetListRowEntryComparator;
+import com.android.launcher3.widget.model.WidgetsListBaseEntry;
+import com.android.launcher3.widget.model.WidgetsListContentEntry;
+import com.android.launcher3.widget.picker.WidgetsListAdapter.WidgetListBaseRowEntryComparator;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -43,8 +45,13 @@ public class WidgetsDiffReporter {
         mListener = listener;
     }
 
-    public void process(ArrayList<WidgetListRowEntry> currentEntries,
-            ArrayList<WidgetListRowEntry> newEntries, WidgetListRowEntryComparator comparator) {
+    /**
+     * Notifies the difference between {@code currentEntries} & {@code newEntries} by calling the
+     * relevant {@link androidx.recyclerview.widget.RecyclerView.RecyclerViewDataObserver} methods.
+     */
+    public void process(ArrayList<WidgetsListBaseEntry> currentEntries,
+            ArrayList<WidgetsListBaseEntry> newEntries,
+            WidgetListBaseRowEntryComparator comparator) {
         if (DEBUG) {
             Log.d(TAG, "process oldEntries#=" + currentEntries.size()
                     + " newEntries#=" + newEntries.size());
@@ -62,20 +69,20 @@ public class WidgetsDiffReporter {
             }
             return;
         }
-        ArrayList<WidgetListRowEntry> orgEntries =
-                (ArrayList<WidgetListRowEntry>) currentEntries.clone();
-        Iterator<WidgetListRowEntry> orgIter = orgEntries.iterator();
-        Iterator<WidgetListRowEntry> newIter = newEntries.iterator();
+        ArrayList<WidgetsListBaseEntry> orgEntries =
+                (ArrayList<WidgetsListBaseEntry>) currentEntries.clone();
+        Iterator<WidgetsListBaseEntry> orgIter = orgEntries.iterator();
+        Iterator<WidgetsListBaseEntry> newIter = newEntries.iterator();
 
-        WidgetListRowEntry orgRowEntry = orgIter.next();
-        WidgetListRowEntry newRowEntry = newIter.next();
+        WidgetsListBaseEntry orgRowEntry = orgIter.next();
+        WidgetsListBaseEntry newRowEntry = newIter.next();
 
         do {
             int diff = comparePackageName(orgRowEntry, newRowEntry, comparator);
             if (DEBUG) {
                 Log.d(TAG, String.format("diff=%d orgRowEntry (%s) newRowEntry (%s)",
-                        diff, orgRowEntry != null? orgRowEntry.toString() : null,
-                        newRowEntry != null? newRowEntry.toString() : null));
+                        diff, orgRowEntry != null ? orgRowEntry.toString() : null,
+                        newRowEntry != null ? newRowEntry.toString() : null));
             }
             int index = -1;
             if (diff < 0) {
@@ -83,17 +90,17 @@ public class WidgetsDiffReporter {
                 mListener.notifyItemRemoved(index);
                 if (DEBUG) {
                     Log.d(TAG, String.format("notifyItemRemoved called (%d)%s", index,
-                            orgRowEntry.titleSectionName));
+                            orgRowEntry.mTitleSectionName));
                 }
                 currentEntries.remove(index);
                 orgRowEntry = orgIter.hasNext() ? orgIter.next() : null;
             } else if (diff > 0) {
-                index = orgRowEntry != null? currentEntries.indexOf(orgRowEntry):
-                        currentEntries.size();
+                index = orgRowEntry != null ? currentEntries.indexOf(orgRowEntry)
+                        : currentEntries.size();
                 currentEntries.add(index, newRowEntry);
                 if (DEBUG) {
                     Log.d(TAG, String.format("notifyItemInserted called (%d)%s", index,
-                            newRowEntry.titleSectionName));
+                            newRowEntry.mTitleSectionName));
                 }
                 newRowEntry = newIter.hasNext() ? newIter.next() : null;
                 mListener.notifyItemInserted(index);
@@ -102,14 +109,14 @@ public class WidgetsDiffReporter {
                 // same package name but,
                 // did the icon, title, etc, change?
                 // or did the widget size and desc, span, etc change?
-                if (!isSamePackageItemInfo(orgRowEntry.pkgItem, newRowEntry.pkgItem) ||
-                        !orgRowEntry.widgets.equals(newRowEntry.widgets)) {
+                if (!isSamePackageItemInfo(orgRowEntry.mPkgItem, newRowEntry.mPkgItem)
+                        || !areWidgetsEqual(orgRowEntry, newRowEntry)) {
                     index = currentEntries.indexOf(orgRowEntry);
                     currentEntries.set(index, newRowEntry);
                     mListener.notifyItemChanged(index);
                     if (DEBUG) {
                         Log.d(TAG, String.format("notifyItemChanged called (%d)%s", index,
-                                newRowEntry.titleSectionName));
+                                newRowEntry.mTitleSectionName));
                     }
                 }
                 orgRowEntry = orgIter.hasNext() ? orgIter.next() : null;
@@ -122,10 +129,11 @@ public class WidgetsDiffReporter {
      * Compare package name using the same comparator as in {@link WidgetsListAdapter}.
      * Also handle null row pointers.
      */
-    private int comparePackageName(WidgetListRowEntry curRow, WidgetListRowEntry newRow,
-            WidgetListRowEntryComparator comparator) {
+    private int comparePackageName(WidgetsListBaseEntry curRow, WidgetsListBaseEntry newRow,
+            WidgetListBaseRowEntryComparator comparator) {
         if (curRow == null && newRow == null) {
-            throw new IllegalStateException("Cannot compare PackageItemInfo if both rows are null.");
+            throw new IllegalStateException(
+                    "Cannot compare PackageItemInfo if both rows are null.");
         }
 
         if (curRow == null && newRow != null) {
@@ -136,6 +144,17 @@ public class WidgetsDiffReporter {
         return comparator.compare(curRow, newRow);
     }
 
+    private boolean areWidgetsEqual(WidgetsListBaseEntry curRow,
+            WidgetsListBaseEntry newRow) {
+        if (!(curRow instanceof WidgetsListContentEntry)
+                || !(newRow instanceof WidgetsListContentEntry)) {
+            return false;
+        }
+        WidgetsListContentEntry orgRowEntry = (WidgetsListContentEntry) curRow;
+        WidgetsListContentEntry newRowEntry = (WidgetsListContentEntry) newRow;
+        return orgRowEntry.mWidgets.equals(newRowEntry.mWidgets);
+    }
+
     private boolean isSamePackageItemInfo(PackageItemInfo curInfo, PackageItemInfo newInfo) {
         return curInfo.bitmap.icon.equals(newInfo.bitmap.icon)
                 && !mIconCache.isDefaultIcon(curInfo.bitmap, curInfo.user);
diff --git a/src/com/android/launcher3/widget/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
similarity index 96%
rename from src/com/android/launcher3/widget/WidgetsFullSheet.java
rename to src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 4c8c339998..03623d5183 100644
--- a/src/com/android/launcher3/widget/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.launcher3.widget;
+package com.android.launcher3.widget.picker;
 
 import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y;
 import static com.android.launcher3.testing.TestProtocol.NORMAL_STATE_ORDINAL;
@@ -42,6 +42,7 @@ import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.compat.AccessibilityManagerCompat;
 import com.android.launcher3.views.RecyclerViewFastScroller;
 import com.android.launcher3.views.TopRoundedCornerView;
+import com.android.launcher3.widget.BaseWidgetSheet;
 
 /**
  * Popup for showing the full list of available widgets
@@ -218,8 +219,8 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         if (ev.getAction() == MotionEvent.ACTION_DOWN) {
             mNoIntercept = false;
             RecyclerViewFastScroller scroller = mRecyclerView.getScrollbar();
-            if (scroller.getThumbOffsetY() >= 0 &&
-                    getPopupContainer().isEventOverView(scroller, ev)) {
+            if (scroller.getThumbOffsetY() >= 0
+                    && getPopupContainer().isEventOverView(scroller, ev)) {
                 mNoIntercept = true;
             } else if (getPopupContainer().isEventOverView(mContent, ev)) {
                 mNoIntercept = !mRecyclerView.shouldContainerScroll(ev, getPopupContainer());
@@ -228,6 +229,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         return super.onControllerInterceptTouchEvent(ev);
     }
 
+    /** Shows the {@link WidgetsFullSheet} on the launcher. */
     public static WidgetsFullSheet show(Launcher launcher, boolean animate) {
         WidgetsFullSheet sheet = (WidgetsFullSheet) launcher.getLayoutInflater()
                 .inflate(R.layout.widgets_full_sheet, launcher.getDragLayer(), false);
@@ -237,6 +239,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         return sheet;
     }
 
+    /** Gets the {@link WidgetsRecyclerView} which shows all widgets in {@link WidgetsFullSheet}. */
     @VisibleForTesting
     public static WidgetsRecyclerView getWidgetsView(Launcher launcher) {
         return launcher.findViewById(R.id.widgets_list_view);
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
new file mode 100644
index 0000000000..9d308423e6
--- /dev/null
+++ b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget.picker;
+
+import android.content.Context;
+import android.util.Log;
+import android.util.SparseArray;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.View.OnLongClickListener;
+import android.view.ViewGroup;
+
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.Adapter;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
+
+import com.android.launcher3.R;
+import com.android.launcher3.WidgetPreviewLoader;
+import com.android.launcher3.icons.IconCache;
+import com.android.launcher3.recyclerview.ViewHolderBinder;
+import com.android.launcher3.util.LabelComparator;
+import com.android.launcher3.widget.WidgetCell;
+import com.android.launcher3.widget.model.WidgetsListBaseEntry;
+import com.android.launcher3.widget.model.WidgetsListContentEntry;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * List view adapter for the widget tray.
+ *
+ * <p>Memory vs. Performance:
+ * The less number of types of views are inserted into a {@link RecyclerView}, the more recycling
+ * happens and less memory is consumed.
+ */
+public class WidgetsListAdapter extends Adapter<ViewHolder> {
+
+    private static final String TAG = "WidgetsListAdapter";
+    private static final boolean DEBUG = false;
+
+    /** Uniquely identifies widgets list view type within the app. */
+    private static final int VIEW_TYPE_WIDGETS_LIST = R.layout.widgets_list_row_view;
+
+    private final WidgetsDiffReporter mDiffReporter;
+    private final SparseArray<ViewHolderBinder> mViewHolderBinders = new SparseArray<>();
+    private final WidgetsListRowViewHolderBinder mWidgetsListRowViewHolderBinder;
+
+    private ArrayList<WidgetsListBaseEntry> mEntries = new ArrayList<>();
+
+    public WidgetsListAdapter(Context context, LayoutInflater layoutInflater,
+            WidgetPreviewLoader widgetPreviewLoader, IconCache iconCache,
+            OnClickListener iconClickListener, OnLongClickListener iconLongClickListener) {
+        mDiffReporter = new WidgetsDiffReporter(iconCache, this);
+        mWidgetsListRowViewHolderBinder = new WidgetsListRowViewHolderBinder(context,
+                layoutInflater, iconClickListener, iconLongClickListener, widgetPreviewLoader);
+        mViewHolderBinders.put(VIEW_TYPE_WIDGETS_LIST, mWidgetsListRowViewHolderBinder);
+    }
+
+    /**
+     * Defers applying bitmap on all the {@link WidgetCell} in the {@param rv}.
+     *
+     * @see WidgetCell#setApplyBitmapDeferred(boolean)
+     */
+    public void setApplyBitmapDeferred(boolean isDeferred, RecyclerView rv) {
+        mWidgetsListRowViewHolderBinder.setApplyBitmapDeferred(isDeferred);
+
+        for (int i = rv.getChildCount() - 1; i >= 0; i--) {
+            ViewHolder viewHolder = rv.getChildViewHolder(rv.getChildAt(i));
+            if (viewHolder.getItemViewType() == VIEW_TYPE_WIDGETS_LIST) {
+                WidgetsRowViewHolder holder = (WidgetsRowViewHolder) viewHolder;
+                for (int j = holder.cellContainer.getChildCount() - 1; j >= 0; j--) {
+                    View v = holder.cellContainer.getChildAt(j);
+                    if (v instanceof WidgetCell) {
+                        ((WidgetCell) v).setApplyBitmapDeferred(isDeferred);
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return mEntries.size();
+    }
+
+    /** Gets the section name for {@link com.android.launcher3.views.RecyclerViewFastScroller}. */
+    public String getSectionName(int pos) {
+        return mEntries.get(pos).mTitleSectionName;
+    }
+
+    /** Updates the widget list. */
+    public void setWidgets(List<WidgetsListBaseEntry> tempEntries) {
+        ArrayList<WidgetsListBaseEntry> newEntries = new ArrayList<>(tempEntries);
+        WidgetListBaseRowEntryComparator rowComparator = new WidgetListBaseRowEntryComparator();
+        Collections.sort(newEntries, rowComparator);
+        mDiffReporter.process(mEntries, newEntries, rowComparator);
+    }
+
+    @Override
+    public void onBindViewHolder(ViewHolder holder, int pos) {
+        ViewHolderBinder viewHolderBinder = mViewHolderBinders.get(getItemViewType(pos));
+        viewHolderBinder.bindViewHolder(holder, mEntries.get(pos));
+    }
+
+    @Override
+    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        if (DEBUG) {
+            Log.v(TAG, "\nonCreateViewHolder");
+        }
+
+        return mViewHolderBinders.get(viewType).newViewHolder(parent);
+    }
+
+    @Override
+    public void onViewRecycled(ViewHolder holder) {
+        mViewHolderBinders.get(holder.getItemViewType()).unbindViewHolder(holder);
+    }
+
+    @Override
+    public boolean onFailedToRecycleView(ViewHolder holder) {
+        // If child views are animating, then the RecyclerView may choose not to recycle the view,
+        // causing extraneous onCreateViewHolder() calls.  It is safe in this case to continue
+        // recycling this view, and take care in onViewRecycled() to cancel any existing
+        // animations.
+        return true;
+    }
+
+    @Override
+    public long getItemId(int pos) {
+        return pos;
+    }
+
+    @Override
+    public int getItemViewType(int pos) {
+        WidgetsListBaseEntry entry = mEntries.get(pos);
+        if (entry instanceof WidgetsListContentEntry) {
+            return VIEW_TYPE_WIDGETS_LIST;
+        }
+        throw new UnsupportedOperationException("ViewHolderBinder not found for " + entry);
+    }
+
+    /** Comparator for sorting WidgetListRowEntry based on package title. */
+    public static class WidgetListBaseRowEntryComparator implements
+            Comparator<WidgetsListBaseEntry> {
+
+        private final LabelComparator mComparator = new LabelComparator();
+
+        @Override
+        public int compare(WidgetsListBaseEntry a, WidgetsListBaseEntry b) {
+            return mComparator.compare(a.mPkgItem.title.toString(), b.mPkgItem.title.toString());
+        }
+    }
+}
diff --git a/src/com/android/launcher3/widget/WidgetsListAdapter.java b/src/com/android/launcher3/widget/picker/WidgetsListRowViewHolderBinder.java
similarity index 50%
rename from src/com/android/launcher3/widget/WidgetsListAdapter.java
rename to src/com/android/launcher3/widget/picker/WidgetsListRowViewHolderBinder.java
index 5bf96906be..22a8d0071c 100644
--- a/src/com/android/launcher3/widget/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListRowViewHolderBinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2021 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.launcher3.widget;
+package com.android.launcher3.widget.picker;
 
 import android.content.Context;
 import android.util.Log;
@@ -23,103 +23,76 @@ import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
 import android.view.ViewGroup;
 
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.RecyclerView.Adapter;
-
 import com.android.launcher3.R;
 import com.android.launcher3.WidgetPreviewLoader;
-import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.model.WidgetItem;
-import com.android.launcher3.util.LabelComparator;
+import com.android.launcher3.recyclerview.ViewHolderBinder;
+import com.android.launcher3.widget.WidgetCell;
+import com.android.launcher3.widget.model.WidgetsListContentEntry;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 
 /**
- * List view adapter for the widget tray.
- *
- * <p>Memory vs. Performance:
- * The less number of types of views are inserted into a {@link RecyclerView}, the more recycling
- * happens and less memory is consumed. {@link #getItemViewType} was not overridden as there is
- * only a single type of view.
+ * Binds data from {@link WidgetsListContentEntry} to UI elements in {@link WidgetsRowViewHolder}.
  */
-public class WidgetsListAdapter extends Adapter<WidgetsRowViewHolder> {
-
-    private static final String TAG = "WidgetsListAdapter";
+public class WidgetsListRowViewHolderBinder
+        implements ViewHolderBinder<WidgetsListContentEntry, WidgetsRowViewHolder> {
     private static final boolean DEBUG = false;
+    private static final String TAG = "WidgetsListRowViewHolderBinder";
 
-    private final WidgetPreviewLoader mWidgetPreviewLoader;
     private final LayoutInflater mLayoutInflater;
-
+    private final int mIndent;
     private final OnClickListener mIconClickListener;
     private final OnLongClickListener mIconLongClickListener;
-    private final int mIndent;
-    private ArrayList<WidgetListRowEntry> mEntries = new ArrayList<>();
-    private final WidgetsDiffReporter mDiffReporter;
-
-    private boolean mApplyBitmapDeferred;
-
-    public WidgetsListAdapter(Context context, LayoutInflater layoutInflater,
-            WidgetPreviewLoader widgetPreviewLoader, IconCache iconCache,
-            OnClickListener iconClickListener, OnLongClickListener iconLongClickListener) {
+    private final WidgetPreviewLoader mWidgetPreviewLoader;
+    private boolean mApplyBitmapDeferred = false;
+
+    public WidgetsListRowViewHolderBinder(
+            Context context,
+            LayoutInflater layoutInflater,
+            OnClickListener iconClickListener,
+            OnLongClickListener iconLongClickListener,
+            WidgetPreviewLoader widgetPreviewLoader) {
         mLayoutInflater = layoutInflater;
-        mWidgetPreviewLoader = widgetPreviewLoader;
+        mIndent = context.getResources().getDimensionPixelSize(R.dimen.widget_section_indent);
         mIconClickListener = iconClickListener;
         mIconLongClickListener = iconLongClickListener;
-        mIndent = context.getResources().getDimensionPixelSize(R.dimen.widget_section_indent);
-        mDiffReporter = new WidgetsDiffReporter(iconCache, this);
-    }
-
-    /**
-     * Defers applying bitmap on all the {@link WidgetCell} in the {@param rv}
-     *
-     * @see WidgetCell#setApplyBitmapDeferred(boolean)
-     */
-    public void setApplyBitmapDeferred(boolean isDeferred, RecyclerView rv) {
-        mApplyBitmapDeferred = isDeferred;
-
-        for (int i = rv.getChildCount() - 1; i >= 0; i--) {
-            WidgetsRowViewHolder holder = (WidgetsRowViewHolder)
-                    rv.getChildViewHolder(rv.getChildAt(i));
-            for (int j = holder.cellContainer.getChildCount() - 1; j >= 0; j--) {
-                View v = holder.cellContainer.getChildAt(j);
-                if (v instanceof WidgetCell) {
-                    ((WidgetCell) v).setApplyBitmapDeferred(mApplyBitmapDeferred);
-                }
-            }
-        }
+        mWidgetPreviewLoader = widgetPreviewLoader;
     }
 
     /**
-     * Update the widget list.
+     * Defers applying bitmap on all the {@link WidgetCell} at
+     * {@link #bindViewHolder(WidgetsRowViewHolder, WidgetsListContentEntry)} if
+     * {@code applyBitmapDeferred} is {@code true}.
      */
-    public void setWidgets(ArrayList<WidgetListRowEntry> tempEntries) {
-        WidgetListRowEntryComparator rowComparator = new WidgetListRowEntryComparator();
-        Collections.sort(tempEntries, rowComparator);
-        mDiffReporter.process(mEntries, tempEntries, rowComparator);
+    public void setApplyBitmapDeferred(boolean applyBitmapDeferred) {
+        mApplyBitmapDeferred = applyBitmapDeferred;
     }
 
     @Override
-    public int getItemCount() {
-        return mEntries.size();
-    }
+    public WidgetsRowViewHolder newViewHolder(ViewGroup parent) {
+        if (DEBUG) {
+            Log.v(TAG, "\nonCreateViewHolder");
+        }
+
+        ViewGroup container = (ViewGroup) mLayoutInflater.inflate(
+                R.layout.widgets_list_row_view, parent, false);
+
+        // if the end padding is 0, then container view (horizontal scroll view) doesn't respect
+        // the end of the linear layout width + the start padding and doesn't allow scrolling.
+        container.findViewById(R.id.widgets_cell_list).setPaddingRelative(mIndent, 0, 1, 0);
 
-    public String getSectionName(int pos) {
-        return mEntries.get(pos).titleSectionName;
+        return new WidgetsRowViewHolder(container);
     }
 
     @Override
-    public void onBindViewHolder(WidgetsRowViewHolder holder, int pos) {
-        WidgetListRowEntry entry = mEntries.get(pos);
-        List<WidgetItem> infoList = entry.widgets;
+    public void bindViewHolder(WidgetsRowViewHolder holder, WidgetsListContentEntry entry) {
+        List<WidgetItem> infoList = entry.mWidgets;
 
         ViewGroup row = holder.cellContainer;
         if (DEBUG) {
-            Log.d(TAG, String.format(
-                    "onBindViewHolder [pos=%d, widget#=%d, row.getChildCount=%d]",
-                    pos, infoList.size(), row.getChildCount()));
+            Log.d(TAG, String.format("onBindViewHolder [widget#=%d, row.getChildCount=%d]",
+                    infoList.size(), row.getChildCount()));
         }
 
         // Add more views.
@@ -150,7 +123,7 @@ public class WidgetsListAdapter extends Adapter<WidgetsRowViewHolder> {
         }
 
         // Bind the views in the application info section.
-        holder.title.applyFromItemInfoWithIcon(entry.pkgItem);
+        holder.title.applyFromItemInfoWithIcon(entry.mPkgItem);
 
         // Bind the view in the widget horizontal tray region.
         for (int i = 0; i < infoList.size(); i++) {
@@ -167,53 +140,11 @@ public class WidgetsListAdapter extends Adapter<WidgetsRowViewHolder> {
     }
 
     @Override
-    public WidgetsRowViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        if (DEBUG) {
-            Log.v(TAG, "\nonCreateViewHolder");
-        }
-
-        ViewGroup container = (ViewGroup) mLayoutInflater.inflate(
-                R.layout.widgets_list_row_view, parent, false);
-
-        // if the end padding is 0, then container view (horizontal scroll view) doesn't respect
-        // the end of the linear layout width + the start padding and doesn't allow scrolling.
-        container.findViewById(R.id.widgets_cell_list).setPaddingRelative(mIndent, 0, 1, 0);
-
-        return new WidgetsRowViewHolder(container);
-    }
-
-    @Override
-    public void onViewRecycled(WidgetsRowViewHolder holder) {
+    public void unbindViewHolder(WidgetsRowViewHolder holder) {
         int total = holder.cellContainer.getChildCount();
         for (int i = 0; i < total; i += 2) {
             WidgetCell widget = (WidgetCell) holder.cellContainer.getChildAt(i);
             widget.clear();
         }
     }
-
-    public boolean onFailedToRecycleView(WidgetsRowViewHolder holder) {
-        // If child views are animating, then the RecyclerView may choose not to recycle the view,
-        // causing extraneous onCreateViewHolder() calls.  It is safe in this case to continue
-        // recycling this view, and take care in onViewRecycled() to cancel any existing
-        // animations.
-        return true;
-    }
-
-    @Override
-    public long getItemId(int pos) {
-        return pos;
-    }
-
-    /**
-     * Comparator for sorting WidgetListRowEntry based on package title
-     */
-    public static class WidgetListRowEntryComparator implements Comparator<WidgetListRowEntry> {
-
-        private final LabelComparator mComparator = new LabelComparator();
-
-        @Override
-        public int compare(WidgetListRowEntry a, WidgetListRowEntry b) {
-            return mComparator.compare(a.pkgItem.title.toString(), b.pkgItem.title.toString());
-        }
-    }
 }
diff --git a/src/com/android/launcher3/widget/WidgetsRecyclerView.java b/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
similarity index 97%
rename from src/com/android/launcher3/widget/WidgetsRecyclerView.java
rename to src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
index 69de12b9d5..52e94969c6 100644
--- a/src/com/android/launcher3/widget/WidgetsRecyclerView.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher3.widget;
+package com.android.launcher3.widget.picker;
 
 import android.content.Context;
 import android.graphics.Point;
@@ -22,13 +22,13 @@ import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 
-import com.android.launcher3.BaseRecyclerView;
-import com.android.launcher3.R;
-
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.OnItemTouchListener;
 
+import com.android.launcher3.BaseRecyclerView;
+import com.android.launcher3.R;
+
 /**
  * The widgets recycler view.
  */
@@ -89,7 +89,7 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
         LinearLayoutManager layoutManager = ((LinearLayoutManager) getLayoutManager());
         layoutManager.scrollToPositionWithOffset(0, (int) -(availableScrollHeight * touchFraction));
 
-        int posInt = (int) ((touchFraction == 1)? pos -1 : pos);
+        int posInt = (int) ((touchFraction == 1) ? pos - 1 : pos);
         return mAdapter.getSectionName(posInt);
     }
 
@@ -171,4 +171,4 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
     @Override
     public void onRequestDisallowInterceptTouchEvent(boolean disallowIntercept) {
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/launcher3/widget/WidgetsRowViewHolder.java b/src/com/android/launcher3/widget/picker/WidgetsRowViewHolder.java
similarity index 86%
rename from src/com/android/launcher3/widget/WidgetsRowViewHolder.java
rename to src/com/android/launcher3/widget/picker/WidgetsRowViewHolder.java
index d26edb6134..9be079e826 100644
--- a/src/com/android/launcher3/widget/WidgetsRowViewHolder.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRowViewHolder.java
@@ -13,16 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.launcher3.widget;
+package com.android.launcher3.widget.picker;
 
 import android.view.ViewGroup;
 
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
+
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.R;
 
-import androidx.recyclerview.widget.RecyclerView.ViewHolder;
-
-public class WidgetsRowViewHolder extends ViewHolder {
+/** A {@link ViewHolder} for a row in the full widget picker. */
+public final class WidgetsRowViewHolder extends ViewHolder {
 
     public final ViewGroup cellContainer;
     public final BubbleTextView title;
diff --git a/src_shortcuts_overrides/com/android/launcher3/model/LoaderResults.java b/src_shortcuts_overrides/com/android/launcher3/model/LoaderResults.java
index 269af7bcc5..73b1601c34 100644
--- a/src_shortcuts_overrides/com/android/launcher3/model/LoaderResults.java
+++ b/src_shortcuts_overrides/com/android/launcher3/model/LoaderResults.java
@@ -21,10 +21,10 @@ import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.model.BgDataModel.Callbacks;
 import com.android.launcher3.util.ComponentKey;
-import com.android.launcher3.widget.WidgetListRowEntry;
+import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 
-import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 
 /**
  * Helper class to handle results of {@link com.android.launcher3.model.LoaderTask}.
@@ -47,7 +47,7 @@ public class LoaderResults extends BaseLoaderResults {
 
     @Override
     public void bindWidgets() {
-        final ArrayList<WidgetListRowEntry> widgets =
+        final List<WidgetsListBaseEntry> widgets =
                 mBgDataModel.widgetsModel.getWidgetsList(mApp.getContext());
         executeCallbacksTask(c -> c.bindAllWidgets(widgets), mUiExecutor);
     }
diff --git a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
index b4e45f835a..f27922b757 100644
--- a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
+++ b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
@@ -28,12 +28,12 @@ import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.pm.ShortcutConfigActivityInfo;
 import com.android.launcher3.util.PackageUserKey;
 import com.android.launcher3.util.Preconditions;
-import com.android.launcher3.widget.WidgetItemComparator;
-import com.android.launcher3.widget.WidgetListRowEntry;
 import com.android.launcher3.widget.WidgetManagerHelper;
+import com.android.launcher3.widget.model.WidgetsListBaseEntry;
+import com.android.launcher3.widget.model.WidgetsListContentEntry;
+import com.android.launcher3.widget.picker.WidgetsDiffReporter;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -60,24 +60,23 @@ public class WidgetsModel {
     private final Map<PackageItemInfo, List<WidgetItem>> mWidgetsList = new HashMap<>();
 
     /**
-     * Returns a list of {@link WidgetListRowEntry}. All {@link WidgetItem} in a single row
-     * are sorted (based on label and user), but the overall list of {@link WidgetListRowEntry}s
-     * is not sorted. This list is sorted at the UI when using
-     * {@link com.android.launcher3.widget.WidgetsDiffReporter}
+     * Returns a list of {@link WidgetsListBaseEntry}. All {@link WidgetItem} in a single row
+     * are sorted (based on label and user), but the overall list of
+     * {@link WidgetsListBaseEntry}s is not sorted. This list is sorted at the UI when using
+     * {@link WidgetsDiffReporter}
      *
-     * @see com.android.launcher3.widget.WidgetsListAdapter#setWidgets(ArrayList)
+     * @see com.android.launcher3.widget.picker.WidgetsListAdapter#setWidgets(List)
      */
-    public synchronized ArrayList<WidgetListRowEntry> getWidgetsList(Context context) {
-        ArrayList<WidgetListRowEntry> result = new ArrayList<>();
+    public synchronized ArrayList<WidgetsListBaseEntry> getWidgetsList(Context context) {
+        ArrayList<WidgetsListBaseEntry> result = new ArrayList<>();
         AlphabeticIndexCompat indexer = new AlphabeticIndexCompat(context);
 
-        WidgetItemComparator widgetComparator = new WidgetItemComparator();
         for (Map.Entry<PackageItemInfo, List<WidgetItem>> entry : mWidgetsList.entrySet()) {
-            WidgetListRowEntry row = new WidgetListRowEntry(
-                    entry.getKey(), new ArrayList<>(entry.getValue()));
-            row.titleSectionName = (row.pkgItem.title == null) ? "" :
-                    indexer.computeSectionName(row.pkgItem.title);
-            Collections.sort(row.widgets, widgetComparator);
+            PackageItemInfo pkgItem = entry.getKey();
+            String sectionName = (pkgItem.title == null) ? "" :
+                    indexer.computeSectionName(pkgItem.title);
+            WidgetsListContentEntry row =
+                    new WidgetsListContentEntry(pkgItem, sectionName, entry.getValue());
             result.add(row);
         }
         return result;
diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
index 1648bddcd8..4c9a8e7c3d 100644
--- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
+++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
@@ -37,8 +37,8 @@ import com.android.launcher3.tapl.AppIconMenuItem;
 import com.android.launcher3.tapl.Widgets;
 import com.android.launcher3.tapl.Workspace;
 import com.android.launcher3.views.OptionsPopupView;
-import com.android.launcher3.widget.WidgetsFullSheet;
-import com.android.launcher3.widget.WidgetsRecyclerView;
+import com.android.launcher3.widget.picker.WidgetsFullSheet;
+import com.android.launcher3.widget.picker.WidgetsRecyclerView;
 
 import org.junit.Before;
 import org.junit.Ignore;
-- 
GitLab


From 228877d37ccfc49b8e0e46d20055f288f7f416ca Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Tue, 9 Feb 2021 11:05:00 -0500
Subject: [PATCH 0504/1664] Add border spacing and fixed cell height to grid.

- Border spacing is the spacing between the cells.
- Workspace cell height is now fixed, and we allocate
  all the "extra" space to three different variable height
  areas.

* Built behind ENABLE_FOUR_COLUMNS flag because it hinders the
default grid.

Bug: 175329686
Test: - set border spacing to 0 and confirm matches prior layout
      - test drag and drop still worked
      - test reordering
      - test widgets
      - test folders
      - test multiwindow

Change-Id: Ic6f3dff577d28ff214bda4b0a787ec7fd08c108b
---
 res/values/attrs.xml                          |  10 +
 res/values/dimens.xml                         |   4 +-
 res/xml/size_limits.xml                       |  75 +++++++
 .../launcher3/AppWidgetResizeFrame.java       |  23 +-
 src/com/android/launcher3/BubbleTextView.java |  11 +-
 src/com/android/launcher3/CellLayout.java     | 116 +++++-----
 src/com/android/launcher3/DevicePaddings.java | 202 ++++++++++++++++++
 src/com/android/launcher3/DeviceProfile.java  |  94 +++++---
 .../launcher3/InvariantDeviceProfile.java     |   6 +
 .../launcher3/ShortcutAndWidgetContainer.java |  27 ++-
 .../search/AppsSearchContainerLayout.java     |   3 +-
 .../android/launcher3/folder/FolderIcon.java  |  14 +-
 .../launcher3/folder/FolderPagedView.java     |   4 +-
 .../launcher3/folder/PreviewBackground.java   |   3 +-
 14 files changed, 481 insertions(+), 111 deletions(-)
 create mode 100644 res/xml/size_limits.xml
 create mode 100644 src/com/android/launcher3/DevicePaddings.java

diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index e593fb497d..0adde81be0 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -135,6 +135,16 @@
         <attr name="demoModeLayoutId" format="reference" />
     </declare-styleable>
 
+    <declare-styleable name="DevicePadding">
+        <attr name="maxEmptySpace" format="dimension" />
+    </declare-styleable>
+
+    <declare-styleable name="DevicePaddingFormula">
+        <attr name="a" format="float|dimension" />
+        <attr name="b" format="float|dimension" />
+        <attr name="c" format="float|dimension" />
+    </declare-styleable>
+
     <declare-styleable name="ProfileDisplayOption">
         <attr name="name" />
         <attr name="minWidthDps" format="float" />
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index eaf7a5ff8c..1ce7840ae5 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -20,12 +20,14 @@
 
     <!-- Dynamic Grid -->
     <dimen name="dynamic_grid_edge_margin">8dp</dimen>
-    <dimen name="dynamic_grid_icon_drawable_padding">8dp</dimen>
+    <dimen name="dynamic_grid_icon_drawable_padding">7dp</dimen>
     <!-- Minimum space between workspace and hotseat in spring loaded mode -->
     <dimen name="dynamic_grid_min_spring_loaded_space">8dp</dimen>
 
+    <dimen name="dynamic_grid_cell_border_spacing">16dp</dimen>
     <dimen name="dynamic_grid_cell_layout_padding">5.5dp</dimen>
     <dimen name="dynamic_grid_cell_padding_x">8dp</dimen>
+    <dimen name="dynamic_grid_cell_padding_y">7dp</dimen>
 
     <!-- Hotseat -->
     <dimen name="dynamic_grid_hotseat_top_padding">8dp</dimen>
diff --git a/res/xml/size_limits.xml b/res/xml/size_limits.xml
new file mode 100644
index 0000000000..ba570146de
--- /dev/null
+++ b/res/xml/size_limits.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<device-paddings xmlns:launcher="http://schemas.android.com/apk/res-auto" >
+
+    <device-padding
+        launcher:maxEmptySpace="88dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="0"/>
+        <workspaceBottomPadding
+            launcher:a="0.52"
+            launcher:b="0"/>
+        <hotseatBottomPadding
+            launcher:a="0.48"
+            launcher:b="0"/>
+    </device-padding>
+
+    <device-padding
+        launcher:maxEmptySpace="97dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="16dp"/>
+        <workspaceBottomPadding
+            launcher:a="0.50"
+            launcher:b="0"
+            launcher:c="-16dp"/>
+        <hotseatBottomPadding
+            launcher:a="0.50"
+            launcher:b="0"
+            launcher:c="16dp"/>
+    </device-padding>
+
+    <device-padding
+        launcher:maxEmptySpace="107dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="16dp"/>
+        <workspaceBottomPadding
+            launcher:a="0"
+            launcher:b="36dp"/>
+        <hotseatBottomPadding
+            launcher:a="1"
+            launcher:b="0"
+            launcher:c="52dp"/>
+    </device-padding>
+
+    <device-padding
+        launcher:maxEmptySpace="9999dp">
+        <workspaceTopPadding
+            launcher:a="0.38"
+            launcher:c="36dp"/>
+        <workspaceBottomPadding
+            launcher:a="0.62"
+            launcher:c="36dp"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="36dp"/>
+    </device-padding>
+
+</device-paddings>
\ No newline at end of file
diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java
index bc3e341806..1330ed4edd 100644
--- a/src/com/android/launcher3/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher3/AppWidgetResizeFrame.java
@@ -279,8 +279,9 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
      *  Based on the current deltas, we determine if and how to resize the widget.
      */
     private void resizeWidgetIfNeeded(boolean onDismiss) {
-        float xThreshold = mCellLayout.getCellWidth();
-        float yThreshold = mCellLayout.getCellHeight();
+        DeviceProfile dp = mLauncher.getDeviceProfile();
+        float xThreshold = mCellLayout.getCellWidth() + dp.cellLayoutBorderSpacingPx;
+        float yThreshold = mCellLayout.getCellHeight() + dp.cellLayoutBorderSpacingPx;
 
         int hSpanInc = getSpanIncrement((mDeltaX + mDeltaXAddOn) / xThreshold - mRunningHInc);
         int vSpanInc = getSpanIncrement((mDeltaY + mDeltaYAddOn) / yThreshold - mRunningVInc);
@@ -364,13 +365,18 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
         final float density = context.getResources().getDisplayMetrics().density;
         final Point[] cellSize = CELL_SIZE.get(context);
 
+        final int borderSpacing = context.getResources()
+                .getDimensionPixelSize(R.dimen.dynamic_grid_cell_border_spacing);
+        final float hBorderSpacing = (spanX - 1) * borderSpacing;
+        final float vBorderSpacing = (spanY - 1) * borderSpacing;
+
         // Compute landscape size
-        int landWidth = (int) ((spanX * cellSize[0].x) / density);
-        int landHeight = (int) ((spanY * cellSize[0].y) / density);
+        int landWidth = (int) (((spanX * cellSize[0].x) + hBorderSpacing) / density);
+        int landHeight = (int) (((spanY * cellSize[0].y) + vBorderSpacing) / density);
 
         // Compute portrait size
-        int portWidth = (int) ((spanX * cellSize[1].x) / density);
-        int portHeight = (int) ((spanY * cellSize[1].y) / density);
+        int portWidth = (int) (((spanX * cellSize[1].x) + hBorderSpacing) / density);
+        int portHeight = (int) (((spanY * cellSize[1].y) + vBorderSpacing) / density);
         rect.set(portWidth, landHeight, landWidth, portHeight);
         return rect;
     }
@@ -384,8 +390,9 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
     }
 
     private void onTouchUp() {
-        int xThreshold = mCellLayout.getCellWidth();
-        int yThreshold = mCellLayout.getCellHeight();
+        DeviceProfile dp = mLauncher.getDeviceProfile();
+        int xThreshold = mCellLayout.getCellWidth() + dp.cellLayoutBorderSpacingPx;
+        int yThreshold = mCellLayout.getCellHeight() + dp.cellLayoutBorderSpacingPx;
 
         mDeltaXAddOn = mRunningHInc * xThreshold;
         mDeltaYAddOn = mRunningVInc * yThreshold;
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 21297c9f05..b05a13a5b0 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -17,6 +17,7 @@
 package com.android.launcher3;
 
 import static com.android.launcher3.FastBitmapDrawable.newIcon;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_FOUR_COLUMNS;
 import static com.android.launcher3.graphics.IconShape.getShape;
 import static com.android.launcher3.graphics.PreloadIconDrawable.newPendingIcon;
 import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
@@ -198,6 +199,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
             setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.iconTextSizePx);
             setCompoundDrawablePadding(grid.iconDrawablePaddingPx);
             defaultIconSize = grid.iconSizePx;
+            setCenterVertically(ENABLE_FOUR_COLUMNS.get());
         } else if (mDisplay == DISPLAY_ALL_APPS) {
             setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.allAppsIconTextSizePx);
             setCompoundDrawablePadding(grid.allAppsIconDrawablePaddingPx);
@@ -232,7 +234,6 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         int shadowSize = context.getResources().getDimensionPixelSize(
                 R.dimen.blur_size_click_shadow);
         mHighlightShadowFilter = new BlurMaskFilter(shadowSize, BlurMaskFilter.Blur.INNER);
-
     }
 
     @Override
@@ -554,6 +555,14 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         outBounds.set(left, top, right, bottom);
     }
 
+
+    /**
+     * Sets whether to vertically center the content.
+     */
+    public void setCenterVertically(boolean centerVertically) {
+        mCenterVertically = centerVertically;
+    }
+
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         if (mCenterVertically) {
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 452207db3b..29812fda9f 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -88,6 +88,8 @@ public class CellLayout extends ViewGroup {
     @Thunk int mCellHeight;
     private int mFixedCellWidth;
     private int mFixedCellHeight;
+    @ViewDebug.ExportedProperty(category = "launcher")
+    private final int mBorderSpacing;
 
     @ViewDebug.ExportedProperty(category = "launcher")
     private int mCountX;
@@ -208,6 +210,7 @@ public class CellLayout extends ViewGroup {
 
         DeviceProfile grid = mActivity.getDeviceProfile();
 
+        mBorderSpacing = grid.cellLayoutBorderSpacingPx;
         mCellWidth = mCellHeight = -1;
         mFixedCellWidth = mFixedCellHeight = -1;
 
@@ -288,7 +291,8 @@ public class CellLayout extends ViewGroup {
         }
 
         mShortcutsAndWidgets = new ShortcutAndWidgetContainer(context, mContainerType);
-        mShortcutsAndWidgets.setCellDimensions(mCellWidth, mCellHeight, mCountX, mCountY);
+        mShortcutsAndWidgets.setCellDimensions(mCellWidth, mCellHeight, mCountX, mCountY,
+                mBorderSpacing);
         addView(mShortcutsAndWidgets);
     }
 
@@ -345,7 +349,8 @@ public class CellLayout extends ViewGroup {
     public void setCellDimensions(int width, int height) {
         mFixedCellWidth = mCellWidth = width;
         mFixedCellHeight = mCellHeight = height;
-        mShortcutsAndWidgets.setCellDimensions(mCellWidth, mCellHeight, mCountX, mCountY);
+        mShortcutsAndWidgets.setCellDimensions(mCellWidth, mCellHeight, mCountX, mCountY,
+                mBorderSpacing);
     }
 
     public void setGridSize(int x, int y) {
@@ -354,7 +359,8 @@ public class CellLayout extends ViewGroup {
         mOccupied = new GridOccupancy(mCountX, mCountY);
         mTmpOccupied = new GridOccupancy(mCountX, mCountY);
         mTempRectStack.clear();
-        mShortcutsAndWidgets.setCellDimensions(mCellWidth, mCellHeight, mCountX, mCountY);
+        mShortcutsAndWidgets.setCellDimensions(mCellWidth, mCellHeight, mCountX, mCountY,
+                mBorderSpacing);
         requestLayout();
     }
 
@@ -475,8 +481,8 @@ public class CellLayout extends ViewGroup {
             for (int j = 0; j < mCountY; j++) {
                 canvas.save();
 
-                int transX = i * mCellWidth;
-                int transY = j * mCellHeight;
+                int transX = i * mCellWidth + (i * mBorderSpacing);
+                int transY = j * mCellHeight + (j * mBorderSpacing);
 
                 canvas.translate(getPaddingLeft() + transX, getPaddingTop() + transY);
 
@@ -591,6 +597,7 @@ public class CellLayout extends ViewGroup {
         if (child instanceof BubbleTextView) {
             BubbleTextView bubbleChild = (BubbleTextView) child;
             bubbleChild.setTextVisibility(mContainerType != HOTSEAT);
+            bubbleChild.setCenterVertically(mContainerType != HOTSEAT);
         }
 
         child.setScaleX(mChildScale);
@@ -706,11 +713,9 @@ public class CellLayout extends ViewGroup {
      * @param result Array of 2 ints to hold the x and y coordinate of the point
      */
     void cellToPoint(int cellX, int cellY, int[] result) {
-        final int hStartPadding = getPaddingLeft();
-        final int vStartPadding = getPaddingTop();
-
-        result[0] = hStartPadding + cellX * mCellWidth;
-        result[1] = vStartPadding + cellY * mCellHeight;
+        cellToRect(cellX, cellY, 1, 1, mTempRect);
+        result[0] = mTempRect.left;
+        result[1] = mTempRect.top;
     }
 
     /**
@@ -734,25 +739,9 @@ public class CellLayout extends ViewGroup {
      * @param result Array of 2 ints to hold the x and y coordinate of the point
      */
     void regionToCenterPoint(int cellX, int cellY, int spanX, int spanY, int[] result) {
-        final int hStartPadding = getPaddingLeft();
-        final int vStartPadding = getPaddingTop();
-        result[0] = hStartPadding + cellX * mCellWidth + (spanX * mCellWidth) / 2;
-        result[1] = vStartPadding + cellY * mCellHeight + (spanY * mCellHeight) / 2;
-    }
-
-     /**
-     * Given a cell coordinate and span fills out a corresponding pixel rect
-     *
-     * @param cellX X coordinate of the cell
-     * @param cellY Y coordinate of the cell
-     * @param result Rect in which to write the result
-     */
-     void regionToRect(int cellX, int cellY, int spanX, int spanY, Rect result) {
-        final int hStartPadding = getPaddingLeft();
-        final int vStartPadding = getPaddingTop();
-        final int left = hStartPadding + cellX * mCellWidth;
-        final int top = vStartPadding + cellY * mCellHeight;
-        result.set(left, top, left + (spanX * mCellWidth), top + (spanY * mCellHeight));
+        cellToRect(cellX, cellY, spanX, spanY, mTempRect);
+        result[0] = mTempRect.centerX();
+        result[1] = mTempRect.centerY();
     }
 
     public float getDistanceFromCell(float x, float y, int[] cell) {
@@ -783,12 +772,15 @@ public class CellLayout extends ViewGroup {
         int childHeightSize = heightSize - (getPaddingTop() + getPaddingBottom());
 
         if (mFixedCellWidth < 0 || mFixedCellHeight < 0) {
-            int cw = DeviceProfile.calculateCellWidth(childWidthSize, mCountX);
-            int ch = DeviceProfile.calculateCellHeight(childHeightSize, mCountY);
+            int cw = DeviceProfile.calculateCellWidth(childWidthSize, mBorderSpacing,
+                    mCountX);
+            int ch = DeviceProfile.calculateCellHeight(childHeightSize, mBorderSpacing,
+                    mCountY);
             if (cw != mCellWidth || ch != mCellHeight) {
                 mCellWidth = cw;
                 mCellHeight = ch;
-                mShortcutsAndWidgets.setCellDimensions(mCellWidth, mCellHeight, mCountX, mCountY);
+                mShortcutsAndWidgets.setCellDimensions(mCellWidth, mCellHeight, mCountX, mCountY,
+                        mBorderSpacing);
             }
         }
 
@@ -838,10 +830,11 @@ public class CellLayout extends ViewGroup {
     /**
      * Returns the amount of space left over after subtracting padding and cells. This space will be
      * very small, a few pixels at most, and is a result of rounding down when calculating the cell
-     * width in {@link DeviceProfile#calculateCellWidth(int, int)}.
+     * width in {@link DeviceProfile#calculateCellWidth(int, int, int)}.
      */
     public int getUnusedHorizontalSpace() {
-        return getMeasuredWidth() - getPaddingLeft() - getPaddingRight() - (mCountX * mCellWidth);
+        return getMeasuredWidth() - getPaddingLeft() - getPaddingRight() - (mCountX * mCellWidth)
+                - ((mCountX - 1) * mBorderSpacing);
     }
 
     public Drawable getScrimBackground() {
@@ -857,8 +850,8 @@ public class CellLayout extends ViewGroup {
         return mShortcutsAndWidgets;
     }
 
-    public View getChildAt(int x, int y) {
-        return mShortcutsAndWidgets.getChildAt(x, y);
+    public View getChildAt(int cellX, int cellY) {
+        return mShortcutsAndWidgets.getChildAt(cellX, cellY);
     }
 
     public boolean animateChildToPosition(final View child, int cellX, int cellY, int duration,
@@ -989,11 +982,11 @@ public class CellLayout extends ViewGroup {
             }
 
             // Center horizontaly
-            left += ((mCellWidth * spanX) - dragOutline.getWidth()) / 2;
+            left += (r.width() - dragOutline.getWidth()) / 2;
 
             if (v != null && v.getViewType() == DraggableView.DRAGGABLE_WIDGET) {
                 // Center vertically
-                top += ((mCellHeight * spanY) - dragOutline.getHeight()) / 2;
+                top += (r.height() - dragOutline.getHeight()) / 2;
             } else if (v != null && v.getViewType() == DraggableView.DRAGGABLE_ICON) {
                 int cHeight = getShortcutsAndWidgets().getCellContentHeight();
                 int cellPaddingY = (int) Math.max(0, ((mCellHeight - cHeight) / 2f));
@@ -2153,7 +2146,7 @@ public class CellLayout extends ViewGroup {
 
         findNearestArea(dragViewCenterX, dragViewCenterY, spanX, spanY, targetDestination);
         Rect dragRect = new Rect();
-        regionToRect(targetDestination[0], targetDestination[1], spanX, spanY, dragRect);
+        cellToRect(targetDestination[0], targetDestination[1], spanX, spanY, dragRect);
         dragRect.offset(dragViewCenterX - dragRect.centerX(), dragViewCenterY - dragRect.centerY());
 
         Rect dropRegionRect = new Rect();
@@ -2163,7 +2156,7 @@ public class CellLayout extends ViewGroup {
         int dropRegionSpanX = dropRegionRect.width();
         int dropRegionSpanY = dropRegionRect.height();
 
-        regionToRect(dropRegionRect.left, dropRegionRect.top, dropRegionRect.width(),
+        cellToRect(dropRegionRect.left, dropRegionRect.top, dropRegionRect.width(),
                 dropRegionRect.height(), dropRegionRect);
 
         int deltaX = (dropRegionRect.centerX() - dragViewCenterX) / spanX;
@@ -2521,10 +2514,11 @@ public class CellLayout extends ViewGroup {
         final int hStartPadding = getPaddingLeft();
         final int vStartPadding = getPaddingTop();
 
-        int width = cellHSpan * cellWidth;
-        int height = cellVSpan * cellHeight;
-        int x = hStartPadding + cellX * cellWidth;
-        int y = vStartPadding + cellY * cellHeight;
+        int x = hStartPadding + (cellX * mBorderSpacing) + (cellX * cellWidth);
+        int y = vStartPadding + (cellY * mBorderSpacing) + (cellY * cellHeight);
+
+        int width = cellHSpan * cellWidth + ((cellHSpan - 1) * mBorderSpacing);
+        int height = cellVSpan * cellHeight + ((cellVSpan - 1) * mBorderSpacing);
 
         resultRect.set(x, y, x + width, y + height);
     }
@@ -2542,11 +2536,13 @@ public class CellLayout extends ViewGroup {
     }
 
     public int getDesiredWidth() {
-        return getPaddingLeft() + getPaddingRight() + (mCountX * mCellWidth);
+        return getPaddingLeft() + getPaddingRight() + (mCountX * mCellWidth)
+                + ((mCountX - 1) * mBorderSpacing);
     }
 
     public int getDesiredHeight()  {
-        return getPaddingTop() + getPaddingBottom() + (mCountY * mCellHeight);
+        return getPaddingTop() + getPaddingBottom() + (mCountY * mCellHeight)
+                + ((mCountY - 1) * mBorderSpacing);
     }
 
     public boolean isOccupied(int x, int y) {
@@ -2661,19 +2657,21 @@ public class CellLayout extends ViewGroup {
             this.cellVSpan = cellVSpan;
         }
 
-        public void setup(int cellWidth, int cellHeight, boolean invertHorizontally, int colCount) {
-            setup(cellWidth, cellHeight, invertHorizontally, colCount, 1.0f, 1.0f);
+        public void setup(int cellWidth, int cellHeight, boolean invertHorizontally, int colCount,
+                int rowCount, int borderSpacing) {
+            setup(cellWidth, cellHeight, invertHorizontally, colCount, rowCount, 1.0f, 1.0f,
+                    borderSpacing);
         }
 
         /**
-         * Use this method, as opposed to {@link #setup(int, int, boolean, int)}, if the view needs
-         * to be scaled.
+         * Use this method, as opposed to {@link #setup(int, int, boolean, int, int, int)},
+         * if the view needs to be scaled.
          *
          * ie. In multi-window mode, we setup widgets so that they are measured and laid out
          * using their full/invariant device profile sizes.
          */
         public void setup(int cellWidth, int cellHeight, boolean invertHorizontally, int colCount,
-                float cellScaleX, float cellScaleY) {
+                int rowCount, float cellScaleX, float cellScaleY, int borderSpacing) {
             if (isLockedToGrid) {
                 final int myCellHSpan = cellHSpan;
                 final int myCellVSpan = cellVSpan;
@@ -2684,17 +2682,23 @@ public class CellLayout extends ViewGroup {
                     myCellX = colCount - myCellX - cellHSpan;
                 }
 
-                width = (int) (myCellHSpan * cellWidth / cellScaleX - leftMargin - rightMargin);
-                height = (int) (myCellVSpan * cellHeight / cellScaleY - topMargin - bottomMargin);
-                x = (myCellX * cellWidth + leftMargin);
-                y = (myCellY * cellHeight + topMargin);
+                int hBorderSpacing = (myCellHSpan - 1) * borderSpacing;
+                int vBorderSpacing = (myCellVSpan - 1) * borderSpacing;
+
+                float myCellWidth = ((myCellHSpan * cellWidth) + hBorderSpacing) / cellScaleX;
+                float myCellHeight = ((myCellVSpan * cellHeight) + vBorderSpacing) / cellScaleY;
+
+                width = Math.round(myCellWidth) - leftMargin - rightMargin;
+                height = Math.round(myCellHeight) - topMargin - bottomMargin;
+                x = leftMargin + (myCellX * cellWidth) + (myCellX * borderSpacing);
+                y = topMargin + (myCellY * cellHeight) + (myCellY * borderSpacing);
             }
         }
 
         /**
          * Sets the position to the provided point
          */
-        public void setXY(Point point) {
+        public void setCellXY(Point point) {
             cellX = point.x;
             cellY = point.y;
         }
diff --git a/src/com/android/launcher3/DevicePaddings.java b/src/com/android/launcher3/DevicePaddings.java
new file mode 100644
index 0000000000..4827f362c8
--- /dev/null
+++ b/src/com/android/launcher3/DevicePaddings.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.content.res.XmlResourceParser;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.util.TypedValue;
+import android.util.Xml;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+/**
+ * Workspace items have a fixed height, so we need a way to distribute any unused workspace height.
+ *
+ * The unused or "extra" height is allocated to three different variable heights:
+ * - The space above the workspace
+ * - The space between the workspace and hotseat
+ * - The espace below the hotseat
+ */
+public class DevicePaddings {
+
+    private static final String DEVICE_PADDING = "device-paddings";
+    private static final String DEVICE_PADDINGS = "device-padding";
+
+    private static final String WORKSPACE_TOP_PADDING = "workspaceTopPadding";
+    private static final String WORKSPACE_BOTTOM_PADDING = "workspaceBottomPadding";
+    private static final String HOTSEAT_BOTTOM_PADDING = "hotseatBottomPadding";
+
+    private static final String TAG = DevicePaddings.class.getSimpleName();
+    private static final boolean DEBUG = false;
+
+    ArrayList<DevicePadding> mDevicePaddings = new ArrayList<>();
+
+    public DevicePaddings(Context context) {
+        try (XmlResourceParser parser = context.getResources().getXml(R.xml.size_limits)) {
+            final int depth = parser.getDepth();
+            int type;
+            while (((type = parser.next()) != XmlPullParser.END_TAG ||
+                    parser.getDepth() > depth) && type != XmlPullParser.END_DOCUMENT) {
+                if ((type == XmlPullParser.START_TAG) && DEVICE_PADDING.equals(parser.getName())) {
+                    final int displayDepth = parser.getDepth();
+                    while (((type = parser.next()) != XmlPullParser.END_TAG ||
+                            parser.getDepth() > displayDepth)
+                            && type != XmlPullParser.END_DOCUMENT) {
+                        if ((type == XmlPullParser.START_TAG)
+                                && DEVICE_PADDINGS.equals(parser.getName())) {
+                            TypedArray a = context.obtainStyledAttributes(
+                                    Xml.asAttributeSet(parser), R.styleable.DevicePadding);
+                            int maxWidthPx = a.getDimensionPixelSize(
+                                    R.styleable.DevicePadding_maxEmptySpace, 0);
+                            a.recycle();
+
+                            PaddingFormula workspaceTopPadding = null;
+                            PaddingFormula workspaceBottomPadding = null;
+                            PaddingFormula hotseatBottomPadding = null;
+
+                            final int limitDepth = parser.getDepth();
+                            while (((type = parser.next()) != XmlPullParser.END_TAG ||
+                                    parser.getDepth() > limitDepth)
+                                    && type != XmlPullParser.END_DOCUMENT) {
+                                AttributeSet attr = Xml.asAttributeSet(parser);
+                                if ((type == XmlPullParser.START_TAG)) {
+                                    if (WORKSPACE_TOP_PADDING.equals(parser.getName())) {
+                                        workspaceTopPadding = new PaddingFormula(context, attr);
+                                    } else if (WORKSPACE_BOTTOM_PADDING.equals(parser.getName())) {
+                                        workspaceBottomPadding = new PaddingFormula(context, attr);
+                                    } else if (HOTSEAT_BOTTOM_PADDING.equals(parser.getName())) {
+                                        hotseatBottomPadding = new PaddingFormula(context, attr);
+                                    }
+                                }
+                            }
+
+                            if (workspaceTopPadding == null
+                                    || workspaceBottomPadding == null
+                                    || hotseatBottomPadding == null) {
+                                throw new RuntimeException("DevicePadding missing padding.");
+                            }
+
+                            mDevicePaddings.add(new DevicePadding(maxWidthPx, workspaceTopPadding,
+                                    workspaceBottomPadding, hotseatBottomPadding));
+                        }
+                    }
+                }
+            }
+        } catch (IOException | XmlPullParserException e) {
+            throw new RuntimeException(e);
+        }
+
+        // Sort ascending by maxEmptySpacePx
+        mDevicePaddings.sort((sl1, sl2) -> Integer.compare(sl1.maxEmptySpacePx,
+                sl2.maxEmptySpacePx));
+    }
+
+    public DevicePadding getDevicePadding(int extraSpacePx) {
+        for (DevicePadding limit : mDevicePaddings) {
+            if (extraSpacePx <= limit.maxEmptySpacePx) {
+                return limit;
+            }
+        }
+
+        return mDevicePaddings.get(mDevicePaddings.size() - 1);
+    }
+
+    /**
+     * Holds all the formulas to calculate the padding for a particular device based on the
+     * amount of extra space.
+     */
+    public static final class DevicePadding {
+
+        private final int maxEmptySpacePx;
+        private final PaddingFormula workspaceTopPadding;
+        private final PaddingFormula workspaceBottomPadding;
+        private final PaddingFormula hotseatBottomPadding;
+
+        public DevicePadding(int maxEmptySpacePx,
+                PaddingFormula workspaceTopPadding,
+                PaddingFormula workspaceBottomPadding,
+                PaddingFormula hotseatBottomPadding) {
+            this.maxEmptySpacePx = maxEmptySpacePx;
+            this.workspaceTopPadding = workspaceTopPadding;
+            this.workspaceBottomPadding = workspaceBottomPadding;
+            this.hotseatBottomPadding = hotseatBottomPadding;
+        }
+
+        public int getWorkspaceTopPadding(int extraSpacePx) {
+            return workspaceTopPadding.calculate(extraSpacePx);
+        }
+
+        public int getWorkspaceBottomPadding(int extraSpacePx) {
+            return workspaceBottomPadding.calculate(extraSpacePx);
+        }
+
+        public int getHotseatBottomPadding(int extraSpacePx) {
+            return hotseatBottomPadding.calculate(extraSpacePx);
+        }
+    }
+
+    /**
+     * Used to calculate a padding based on three variables: a, b, and c.
+     *
+     * Calculation: a * (extraSpace - c) + b
+     */
+    private static final class PaddingFormula {
+
+        private final float a;
+        private final float b;
+        private final float c;
+
+        public PaddingFormula(Context context, AttributeSet attrs) {
+            TypedArray t = context.obtainStyledAttributes(attrs,
+                    R.styleable.DevicePaddingFormula);
+
+            a = getValue(t, R.styleable.DevicePaddingFormula_a);
+            b = getValue(t, R.styleable.DevicePaddingFormula_b);
+            c = getValue(t, R.styleable.DevicePaddingFormula_c);
+
+            t.recycle();
+        }
+
+        public int calculate(int extraSpacePx) {
+            if (DEBUG) {
+                Log.d(TAG, "a=" + a + " * (" + extraSpacePx + " - " + c + ") + b=" + b);
+            }
+            return Math.round(a * (extraSpacePx - c) + b);
+        }
+
+        private static float getValue(TypedArray a, int index) {
+            if (a.getType(index) == TypedValue.TYPE_DIMENSION) {
+                return a.getDimensionPixelSize(index, 0);
+            } else if (a.getType(index) == TypedValue.TYPE_FLOAT) {
+                return a.getFloat(index, 0);
+            }
+            return 0;
+        }
+
+        @Override
+        public String toString() {
+            return "a=" + a + ", b=" + b + ", c=" + c;
+        }
+    }
+}
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 4d5bd5d95f..19915b7026 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -16,6 +16,8 @@
 
 package com.android.launcher3;
 
+import static com.android.launcher3.config.FeatureFlags.ENABLE_FOUR_COLUMNS;
+
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.Resources;
@@ -25,6 +27,7 @@ import android.graphics.Rect;
 import android.view.Surface;
 
 import com.android.launcher3.CellLayout.ContainerType;
+import com.android.launcher3.DevicePaddings.DevicePadding;
 import com.android.launcher3.graphics.IconShape;
 import com.android.launcher3.icons.DotRenderer;
 import com.android.launcher3.icons.IconNormalizer;
@@ -74,12 +77,16 @@ public class DeviceProfile {
 
     // Workspace
     public final int desiredWorkspaceLeftRightMarginPx;
+    public final int cellLayoutBorderSpacingPx;
     public final int cellLayoutPaddingLeftRightPx;
     public final int cellLayoutBottomPaddingPx;
     public final int edgeMarginPx;
     public float workspaceSpringLoadShrinkFactor;
     public final int workspaceSpringLoadedBottomSpace;
 
+    public int workspaceTopPadding;
+    public int workspaceBottomPadding;
+
     // Workspace page indicator
     public final int workspacePageIndicatorHeight;
     private final int mWorkspacePageIndicatorOverlapWorkspace;
@@ -92,6 +99,7 @@ public class DeviceProfile {
 
     public int cellWidthPx;
     public int cellHeightPx;
+    public int cellYPaddingPx;
     public int workspaceCellPaddingXPx;
 
     // Folder
@@ -187,6 +195,11 @@ public class DeviceProfile {
         edgeMarginPx = res.getDimensionPixelSize(R.dimen.dynamic_grid_edge_margin);
         desiredWorkspaceLeftRightMarginPx = isVerticalBarLayout() ? 0 : edgeMarginPx;
 
+        cellYPaddingPx = res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_padding_y);
+        cellLayoutBorderSpacingPx = isVerticalBarLayout()
+                || isMultiWindowMode
+                || !ENABLE_FOUR_COLUMNS.get()
+                ? 0 : res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_border_spacing);
         int cellLayoutPaddingLeftRightMultiplier = !isVerticalBarLayout() && isTablet
                 ? PORTRAIT_TABLET_LEFT_RIGHT_PADDING_MULTIPLIER : 1;
         int cellLayoutPadding = res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_layout_padding);
@@ -220,22 +233,31 @@ public class DeviceProfile {
                 res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_side_padding);
         // Add a bit of space between nav bar and hotseat in vertical bar layout.
         hotseatBarSidePaddingStartPx = isVerticalBarLayout() ? workspacePageIndicatorHeight : 0;
+        int hotseatExtraVerticalSize =
+                res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_extra_vertical_size);
         hotseatBarSizePx = ResourceUtils.pxFromDp(inv.iconSize, mInfo.metrics)
                 + (isVerticalBarLayout()
                 ? (hotseatBarSidePaddingStartPx + hotseatBarSidePaddingEndPx)
-                : (res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_extra_vertical_size)
-                        + hotseatBarTopPaddingPx + hotseatBarBottomPaddingPx));
+                : (hotseatBarTopPaddingPx + hotseatBarBottomPaddingPx
+                        + (ENABLE_FOUR_COLUMNS.get() ? 0 : hotseatExtraVerticalSize)));
 
         // Calculate all of the remaining variables.
-        updateAvailableDimensions(res);
-
+        int extraSpace = updateAvailableDimensions(res);
         // Now that we have all of the variables calculated, we can tune certain sizes.
-        if (!isVerticalBarLayout() && isPhone && isTallDevice) {
+        if (ENABLE_FOUR_COLUMNS.get()) {
+            DevicePadding padding = inv.devicePaddings.getDevicePadding(extraSpace);
+            workspaceTopPadding = padding.getWorkspaceTopPadding(extraSpace);
+            workspaceBottomPadding = padding.getWorkspaceBottomPadding(extraSpace);
+
+            float hotseatBarBottomPadding = padding.getHotseatBottomPadding(extraSpace);
+            hotseatBarSizePx += hotseatBarBottomPadding;
+            hotseatBarBottomPaddingPx += hotseatBarBottomPadding;
+        } else if (!isVerticalBarLayout() && isPhone && isTallDevice) {
             // We increase the hotseat size when there is extra space.
             // ie. For a display with a large aspect ratio, we can keep the icons on the workspace
             // in portrait mode closer together by adding more height to the hotseat.
             // Note: This calculation was created after noticing a pattern in the design spec.
-            int extraSpace = getCellSize().y - iconSizePx - iconDrawablePaddingPx * 2
+            extraSpace = getCellSize().y - iconSizePx - iconDrawablePaddingPx * 2
                     - workspacePageIndicatorHeight;
             hotseatBarSizePx += extraSpace;
             hotseatBarBottomPaddingPx += extraSpace;
@@ -328,17 +350,24 @@ public class DeviceProfile {
                 + topBottomPadding * 2;
     }
 
-    private void updateAvailableDimensions(Resources res) {
+    /**
+     * Returns the amount of extra (or unused) vertical space.
+     */
+    private int updateAvailableDimensions(Resources res) {
         updateIconSize(1f, res);
 
         // Check to see if the icons fit within the available height.  If not, then scale down.
-        float usedHeight = (cellHeightPx * inv.numRows);
+        float usedHeight = (cellHeightPx * inv.numRows)
+                + (cellLayoutBorderSpacingPx * (inv.numRows - 1));
         int maxHeight = (availableHeightPx - getTotalWorkspacePadding().y);
+        float extraHeight = Math.max(0, maxHeight - usedHeight);
         if (usedHeight > maxHeight) {
             float scale = maxHeight / usedHeight;
             updateIconSize(scale, res);
+            extraHeight = 0;
         }
         updateAvailableFolderCellDimensions(res);
+        return Math.round(extraHeight);
     }
 
     /**
@@ -355,16 +384,23 @@ public class DeviceProfile {
         iconTextSizePx = (int) (Utilities.pxFromSp(inv.iconTextSize, mInfo.metrics) * scale);
         iconDrawablePaddingPx = (int) (iconDrawablePaddingOriginalPx * scale);
 
-        cellHeightPx = iconSizePx + iconDrawablePaddingPx
-                + Utilities.calculateTextHeight(iconTextSizePx);
-        int cellYPadding = (getCellSize().y - cellHeightPx) / 2;
-        if (iconDrawablePaddingPx > cellYPadding && !isVerticalLayout
-                && !isMultiWindowMode) {
-            // Ensures that the label is closer to its corresponding icon. This is not an issue
-            // with vertical bar layout or multi-window mode since the issue is handled separately
-            // with their calls to {@link #adjustToHideWorkspaceLabels}.
-            cellHeightPx -= (iconDrawablePaddingPx - cellYPadding);
-            iconDrawablePaddingPx = cellYPadding;
+        if (ENABLE_FOUR_COLUMNS.get()) {
+            cellHeightPx = iconSizePx + iconDrawablePaddingPx
+                    + Utilities.calculateTextHeight(iconTextSizePx)
+                    + (cellYPaddingPx * 2);
+        } else {
+            cellYPaddingPx = 0;
+            cellHeightPx = iconSizePx + iconDrawablePaddingPx
+                    + Utilities.calculateTextHeight(iconTextSizePx);
+            int cellPaddingY = (getCellSize().y - cellHeightPx) / 2;
+            if (iconDrawablePaddingPx > cellPaddingY && !isVerticalLayout
+                    && !isMultiWindowMode) {
+                // Ensures that the label is closer to its corresponding icon. This is not an issue
+                // with vertical bar layout or multi-window mode since the issue is handled
+                // separately with their calls to {@link #adjustToHideWorkspaceLabels}.
+                cellHeightPx -= (iconDrawablePaddingPx - cellPaddingY);
+                iconDrawablePaddingPx = cellPaddingY;
+            }
         }
         cellWidthPx = iconSizePx + iconDrawablePaddingPx;
 
@@ -425,13 +461,15 @@ public class DeviceProfile {
         Point totalWorkspacePadding = getTotalWorkspacePadding();
 
         // Check if the icons fit within the available height.
-        float contentUsedHeight = folderCellHeightPx * inv.numFolderRows;
+        float contentUsedHeight = folderCellHeightPx * inv.numFolderRows
+                + ((inv.numFolderRows - 1) * cellLayoutBorderSpacingPx);
         int contentMaxHeight = availableHeightPx - totalWorkspacePadding.y - folderBottomPanelSize
                 - folderMargin;
         float scaleY = contentMaxHeight / contentUsedHeight;
 
         // Check if the icons fit within the available width.
-        float contentUsedWidth = folderCellWidthPx * inv.numFolderColumns;
+        float contentUsedWidth = folderCellWidthPx * inv.numFolderColumns
+                + ((inv.numFolderColumns - 1) * cellLayoutBorderSpacingPx);
         int contentMaxWidth = availableWidthPx - totalWorkspacePadding.x - folderMargin;
         float scaleX = contentMaxWidth / contentUsedWidth;
 
@@ -479,9 +517,9 @@ public class DeviceProfile {
         // not matter.
         Point padding = getTotalWorkspacePadding();
         result.x = calculateCellWidth(availableWidthPx - padding.x
-                - cellLayoutPaddingLeftRightPx * 2, numColumns);
+                - cellLayoutPaddingLeftRightPx * 2, cellLayoutBorderSpacingPx, numColumns);
         result.y = calculateCellHeight(availableHeightPx - padding.y
-                - cellLayoutBottomPaddingPx, numRows);
+                - cellLayoutBottomPaddingPx, cellLayoutBorderSpacingPx, numRows);
         return result;
     }
 
@@ -509,7 +547,7 @@ public class DeviceProfile {
             }
         } else {
             int paddingBottom = hotseatBarSizePx + workspacePageIndicatorHeight
-                    - mWorkspacePageIndicatorOverlapWorkspace;
+                    + workspaceBottomPadding - mWorkspacePageIndicatorOverlapWorkspace;
             if (isTablet) {
                 // Pad the left and right of the workspace to ensure consistent spacing
                 // between all icons
@@ -526,7 +564,7 @@ public class DeviceProfile {
             } else {
                 // Pad the top and bottom of the workspace with search/hotseat bar sizes
                 padding.set(desiredWorkspaceLeftRightMarginPx,
-                        edgeMarginPx,
+                        workspaceTopPadding + edgeMarginPx,
                         desiredWorkspaceLeftRightMarginPx,
                         paddingBottom);
             }
@@ -581,11 +619,11 @@ public class DeviceProfile {
         }
     }
 
-    public static int calculateCellWidth(int width, int countX) {
-        return width / countX;
+    public static int calculateCellWidth(int width, int borderSpacing, int countX) {
+        return (width - ((countX - 1) * borderSpacing)) / countX;
     }
-    public static int calculateCellHeight(int height, int countY) {
-        return height / countY;
+    public static int calculateCellHeight(int height, int borderSpacing, int countY) {
+        return (height - ((countY - 1) * borderSpacing)) / countY;
     }
 
     /**
diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index aa3ef9b139..2a08c50008 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -130,6 +130,8 @@ public class InvariantDeviceProfile {
     public DeviceProfile landscapeProfile;
     public DeviceProfile portraitProfile;
 
+    public DevicePaddings devicePaddings;
+
     public Point defaultWallpaperSize;
     public Rect defaultWidgetPadding;
 
@@ -159,6 +161,7 @@ public class InvariantDeviceProfile {
         demoModeLayoutId = p.demoModeLayoutId;
         mExtraAttrs = p.mExtraAttrs;
         mOverlayMonitor = p.mOverlayMonitor;
+        devicePaddings = p.devicePaddings;
     }
 
     @TargetApi(23)
@@ -210,6 +213,8 @@ public class InvariantDeviceProfile {
         result.landscapeIconSize = defaultDisplayOption.landscapeIconSize;
         result.allAppsIconSize = Math.min(
                 defaultDisplayOption.allAppsIconSize, myDisplayOption.allAppsIconSize);
+
+        devicePaddings = new DevicePaddings(context);
         initGrid(context, myInfo, result);
     }
 
@@ -237,6 +242,7 @@ public class InvariantDeviceProfile {
         ArrayList<DisplayOption> allOptions = getPredefinedDeviceProfiles(context, gridName);
 
         DisplayOption displayOption = invDistWeightedInterpolate(displayInfo, allOptions);
+        devicePaddings = new DevicePaddings(context);
         initGrid(context, displayInfo, displayOption);
         return displayOption.grid.name;
     }
diff --git a/src/com/android/launcher3/ShortcutAndWidgetContainer.java b/src/com/android/launcher3/ShortcutAndWidgetContainer.java
index ee0c7bb2f9..1c5081cfca 100644
--- a/src/com/android/launcher3/ShortcutAndWidgetContainer.java
+++ b/src/com/android/launcher3/ShortcutAndWidgetContainer.java
@@ -42,8 +42,10 @@ public class ShortcutAndWidgetContainer extends ViewGroup {
 
     private int mCellWidth;
     private int mCellHeight;
+    private int mBorderSpacing;
 
     private int mCountX;
+    private int mCountY;
 
     private final ActivityContext mActivity;
     private boolean mInvertIfRtl = false;
@@ -55,20 +57,23 @@ public class ShortcutAndWidgetContainer extends ViewGroup {
         mContainerType = containerType;
     }
 
-    public void setCellDimensions(int cellWidth, int cellHeight, int countX, int countY) {
+    public void setCellDimensions(int cellWidth, int cellHeight, int countX, int countY,
+            int borderSpacing) {
         mCellWidth = cellWidth;
         mCellHeight = cellHeight;
         mCountX = countX;
+        mCountY = countY;
+        mBorderSpacing = borderSpacing;
     }
 
-    public View getChildAt(int x, int y) {
+    public View getChildAt(int cellX, int cellY) {
         final int count = getChildCount();
         for (int i = 0; i < count; i++) {
             View child = getChildAt(i);
             CellLayout.LayoutParams lp = (CellLayout.LayoutParams) child.getLayoutParams();
 
-            if ((lp.cellX <= x) && (x < lp.cellX + lp.cellHSpan) &&
-                    (lp.cellY <= y) && (y < lp.cellY + lp.cellVSpan)) {
+            if ((lp.cellX <= cellX) && (cellX < lp.cellX + lp.cellHSpan)
+                    && (lp.cellY <= cellY) && (cellY < lp.cellY + lp.cellVSpan)) {
                 return child;
             }
         }
@@ -95,10 +100,11 @@ public class ShortcutAndWidgetContainer extends ViewGroup {
         CellLayout.LayoutParams lp = (CellLayout.LayoutParams) child.getLayoutParams();
         if (child instanceof LauncherAppWidgetHostView) {
             DeviceProfile profile = mActivity.getDeviceProfile();
-            lp.setup(mCellWidth, mCellHeight, invertLayoutHorizontally(), mCountX,
-                    profile.appWidgetScale.x, profile.appWidgetScale.y);
+            lp.setup(mCellWidth, mCellHeight, invertLayoutHorizontally(), mCountX, mCountY,
+                    profile.appWidgetScale.x, profile.appWidgetScale.y, mBorderSpacing);
         } else {
-            lp.setup(mCellWidth, mCellHeight, invertLayoutHorizontally(), mCountX);
+            lp.setup(mCellWidth, mCellHeight, invertLayoutHorizontally(), mCountX, mCountY,
+                    mBorderSpacing);
         }
     }
 
@@ -117,11 +123,12 @@ public class ShortcutAndWidgetContainer extends ViewGroup {
         final DeviceProfile profile = mActivity.getDeviceProfile();
 
         if (child instanceof LauncherAppWidgetHostView) {
-            lp.setup(mCellWidth, mCellHeight, invertLayoutHorizontally(), mCountX,
-                    profile.appWidgetScale.x, profile.appWidgetScale.y);
+            lp.setup(mCellWidth, mCellHeight, invertLayoutHorizontally(), mCountX, mCountY,
+                    profile.appWidgetScale.x, profile.appWidgetScale.y, mBorderSpacing);
             // Widgets have their own padding
         } else {
-            lp.setup(mCellWidth, mCellHeight, invertLayoutHorizontally(), mCountX);
+            lp.setup(mCellWidth, mCellHeight, invertLayoutHorizontally(), mCountX, mCountY,
+                    mBorderSpacing);
             // Center the icon/folder
             int cHeight = getCellContentHeight();
             int cellPaddingY = (int) Math.max(0, ((lp.height - cHeight) / 2f));
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
index 4f79fb8b6b..aef32d7a28 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
@@ -109,7 +109,8 @@ public class AppsSearchContainerLayout extends ExtendedEditText
         int rowWidth = myRequestedWidth - mAppsView.getActiveRecyclerView().getPaddingLeft()
                 - mAppsView.getActiveRecyclerView().getPaddingRight();
 
-        int cellWidth = DeviceProfile.calculateCellWidth(rowWidth, dp.inv.numHotseatIcons);
+        int cellWidth = DeviceProfile.calculateCellWidth(rowWidth, dp.cellLayoutBorderSpacingPx,
+                dp.inv.numHotseatIcons);
         int iconVisibleSize = Math.round(ICON_VISIBLE_AREA_FACTOR * dp.iconSizePx);
         int iconPadding = cellWidth - iconVisibleSize;
 
diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java
index fe310f626c..6477de3757 100644
--- a/src/com/android/launcher3/folder/FolderIcon.java
+++ b/src/com/android/launcher3/folder/FolderIcon.java
@@ -177,6 +177,8 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
         icon.setFolder(folder);
 
         icon.setOnFocusChangeListener(launcher.getFocusHandler());
+        icon.mBackground.paddingY = icon.isInHotseat()
+                ? 0 : launcher.getDeviceProfile().cellYPaddingPx;
         return icon;
     }
 
@@ -199,7 +201,7 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
         icon.mFolderName.setText(folderInfo.title);
         icon.mFolderName.setCompoundDrawablePadding(0);
         FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) icon.mFolderName.getLayoutParams();
-        lp.topMargin = grid.iconSizePx + grid.iconDrawablePaddingPx;
+        lp.topMargin = grid.cellYPaddingPx + grid.iconSizePx + grid.iconDrawablePaddingPx;
 
         icon.setTag(folderInfo);
         icon.setOnClickListener(ItemClickHandler.INSTANCE);
@@ -218,6 +220,7 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
 
         icon.setAccessibilityDelegate(activity.getAccessibilityDelegate());
 
+        icon.mBackground.paddingY = icon.isInHotseat() ? 0 : grid.cellYPaddingPx;
         icon.mPreviewVerifier = new FolderGridOrganizer(activity.getDeviceProfile().inv);
         icon.mPreviewVerifier.setFolderInfo(folderInfo);
         icon.updatePreviewItems(false);
@@ -579,6 +582,7 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
     public void setFolderBackground(PreviewBackground bg) {
         mBackground = bg;
         mBackground.setInvalidateDelegate(this);
+        mBackground.paddingY = isInHotseat() ? 0 : mActivity.getDeviceProfile().cellYPaddingPx;
     }
 
     @Override
@@ -745,9 +749,13 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
         mInfo.removeListener(mFolder);
     }
 
+    private boolean isInHotseat() {
+        return mInfo.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT;
+    }
+
     public void clearLeaveBehindIfExists() {
         ((CellLayout.LayoutParams) getLayoutParams()).canReorder = true;
-        if (mInfo.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) {
+        if (isInHotseat()) {
             CellLayout cl = (CellLayout) getParent().getParent();
             cl.clearFolderLeaveBehind();
         }
@@ -757,7 +765,7 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
         CellLayout.LayoutParams lp = (CellLayout.LayoutParams) getLayoutParams();
         // While the folder is open, the position of the icon cannot change.
         lp.canReorder = false;
-        if (mInfo.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) {
+        if (isInHotseat()) {
             CellLayout cl = (CellLayout) getParent().getParent();
             cl.setFolderLeaveBehindCell(lp.cellX, lp.cellY);
         }
diff --git a/src/com/android/launcher3/folder/FolderPagedView.java b/src/com/android/launcher3/folder/FolderPagedView.java
index a08dd3064a..df3e92cf1e 100644
--- a/src/com/android/launcher3/folder/FolderPagedView.java
+++ b/src/com/android/launcher3/folder/FolderPagedView.java
@@ -193,7 +193,7 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> {
         int pageNo = rank / mOrganizer.getMaxItemsPerPage();
 
         CellLayout.LayoutParams lp = (CellLayout.LayoutParams) view.getLayoutParams();
-        lp.setXY(mOrganizer.getPosForRank(rank));
+        lp.setCellXY(mOrganizer.getPosForRank(rank));
         getPageAt(pageNo).addViewToCellLayout(view, -1, item.getViewId(), lp, true);
     }
 
@@ -306,7 +306,7 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> {
             if (v != null) {
                 CellLayout.LayoutParams lp = (CellLayout.LayoutParams) v.getLayoutParams();
                 ItemInfo info = (ItemInfo) v.getTag();
-                lp.setXY(mOrganizer.getPosForRank(rank));
+                lp.setCellXY(mOrganizer.getPosForRank(rank));
                 currentPage.addViewToCellLayout(v, -1, info.getViewId(), lp, true);
 
                 if (mOrganizer.isItemInPreview(rank) && v instanceof BubbleTextView) {
diff --git a/src/com/android/launcher3/folder/PreviewBackground.java b/src/com/android/launcher3/folder/PreviewBackground.java
index 27b906bcbb..767fffe35b 100644
--- a/src/com/android/launcher3/folder/PreviewBackground.java
+++ b/src/com/android/launcher3/folder/PreviewBackground.java
@@ -74,6 +74,7 @@ public class PreviewBackground extends CellLayout.DelegatedCellDrawing {
     int previewSize;
     int basePreviewOffsetX;
     int basePreviewOffsetY;
+    int paddingY;
 
     private CellLayout mDrawingDelegate;
 
@@ -157,7 +158,7 @@ public class PreviewBackground extends CellLayout.DelegatedCellDrawing {
         previewSize = grid.folderIconSizePx;
 
         basePreviewOffsetX = (availableSpaceX - previewSize) / 2;
-        basePreviewOffsetY = topPadding + grid.folderIconOffsetYPx;
+        basePreviewOffsetY = paddingY + topPadding + grid.folderIconOffsetYPx;
 
         // Stroke width is 1dp
         mStrokeWidth = context.getResources().getDisplayMetrics().density;
-- 
GitLab


From 2b6d18230bdc5d75148740c7c0faac13dfba30d4 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Tue, 9 Feb 2021 17:59:48 -0800
Subject: [PATCH 0505/1664] Instrumenting swiping up to all apps for jank

Bug: 178656784
Test: manual
Change-Id: I2332f0f358dc7312dc7ad0b88bc51db5bfa8be6c
---
 .../PortraitStatesTouchController.java        | 41 +++++++++++++++++++
 .../AbstractStateChangeTouchController.java   | 11 ++++-
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
index 73f4ff2ba4..c60e257105 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
@@ -49,6 +49,7 @@ import com.android.launcher3.uioverrides.states.OverviewState;
 import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.util.LayoutUtils;
 import com.android.quickstep.views.RecentsView;
+import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
 
 /**
  * Touch controller for handling various state transitions in portrait UI.
@@ -319,4 +320,44 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
             return baseInterpolator.getInterpolation(v);
         }
     }
+
+    @Override
+    public boolean onControllerInterceptTouchEvent(MotionEvent ev) {
+        switch (ev.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                InteractionJankMonitorWrapper.begin(
+                        mLauncher.getRootView(), InteractionJankMonitorWrapper.CUJ_OPEN_ALL_APPS);
+                break;
+
+            case MotionEvent.ACTION_CANCEL:
+            case MotionEvent.ACTION_UP:
+                InteractionJankMonitorWrapper.cancel(
+                        InteractionJankMonitorWrapper.CUJ_OPEN_ALL_APPS);
+                break;
+        }
+        return super.onControllerInterceptTouchEvent(ev);
+
+    }
+
+    @Override
+    protected void onReinitToState(LauncherState newToState) {
+        super.onReinitToState(newToState);
+        if (newToState != ALL_APPS) {
+            InteractionJankMonitorWrapper.cancel(InteractionJankMonitorWrapper.CUJ_OPEN_ALL_APPS);
+        }
+    }
+
+    @Override
+    protected void onReachedFinalState(LauncherState toState) {
+        super.onReinitToState(toState);
+        if (toState == ALL_APPS) {
+            InteractionJankMonitorWrapper.end(InteractionJankMonitorWrapper.CUJ_OPEN_ALL_APPS);
+        }
+    }
+
+    @Override
+    protected void clearState() {
+        super.clearState();
+        InteractionJankMonitorWrapper.cancel(InteractionJankMonitorWrapper.CUJ_OPEN_ALL_APPS);
+    }
 }
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index 10cd04cfcf..e0a82e761f 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -124,7 +124,7 @@ public abstract class AbstractStateChangeTouchController
     protected abstract boolean canInterceptTouch(MotionEvent ev);
 
     @Override
-    public final boolean onControllerInterceptTouchEvent(MotionEvent ev) {
+    public boolean onControllerInterceptTouchEvent(MotionEvent ev) {
         if (ev.getAction() == MotionEvent.ACTION_DOWN) {
             mNoIntercept = !canInterceptTouch(ev);
             if (mNoIntercept) {
@@ -193,6 +193,8 @@ public abstract class AbstractStateChangeTouchController
                 : reachedToState ? mToState : mFromState;
         LauncherState newToState = getTargetState(newFromState, isDragTowardPositive);
 
+        onReinitToState(newToState);
+
         if (newFromState == mFromState && newToState == mToState || (newFromState == newToState)) {
             return false;
         }
@@ -231,6 +233,12 @@ public abstract class AbstractStateChangeTouchController
         return true;
     }
 
+    protected void onReinitToState(LauncherState newToState) {
+    }
+
+    protected void onReachedFinalState(LauncherState newToState) {
+    }
+
     protected boolean goingBetweenNormalAndOverview(LauncherState fromState,
             LauncherState toState) {
         return (fromState == NORMAL || fromState == OVERVIEW)
@@ -527,6 +535,7 @@ public abstract class AbstractStateChangeTouchController
             mAtomicComponentsController.getAnimationPlayer().end();
             mAtomicComponentsController = null;
         }
+        onReachedFinalState(mToState);
         clearState();
         boolean shouldGoToTargetState = mGoingBetweenStates || (mToState != targetState);
         if (shouldGoToTargetState) {
-- 
GitLab


From 91d4f9f00781046f6f8808a9d774949d7a9b48ba Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Wed, 10 Feb 2021 12:23:11 -0800
Subject: [PATCH 0506/1664] Fix to avoid NPE with LiveSearchManager.

Bug: 179911188
Test: manual
Change-Id: Ic7f8ae7f7e2795eb18569670e166310102b7ea02
---
 .../android/launcher3/allapps/search/LiveSearchManager.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/allapps/search/LiveSearchManager.java b/src/com/android/launcher3/allapps/search/LiveSearchManager.java
index d51c78653c..748ba502e3 100644
--- a/src/com/android/launcher3/allapps/search/LiveSearchManager.java
+++ b/src/com/android/launcher3/allapps/search/LiveSearchManager.java
@@ -153,11 +153,11 @@ public class LiveSearchManager implements StateListener<LauncherState> {
             clearWidgetHost();
         }
 
-        if (finalState.equals(ALL_APPS)) {
+        if (ALL_APPS.equals(finalState)) {
             // creates new instance ID since new all apps session is started.
             mLogInstanceId = new InstanceIdSequence().newInstanceId();
             allAppsLogger().log(LAUNCHER_ALLAPPS_ENTRY);
-        } else if (mPrevLauncherState.equals(ALL_APPS)
+        } else if (ALL_APPS.equals(mPrevLauncherState)
                 // Check if mLogInstanceId is not null; to avoid NPE when LAUNCHER_ALLAPPS_EXIT is
                 // triggered multiple times
                 && mLogInstanceId != null) {
-- 
GitLab


From 03c5a4623536184984724eca07305c69ee791dbe Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <rtmitchell@google.com>
Date: Thu, 11 Feb 2021 10:11:32 -0800
Subject: [PATCH 0507/1664] Ignore broken launcher tests

Fabricated overlay changes seem to have made these tests flaky. Ignore
them for now while we figure out why the tests are flaky.

Bug: 180016597
Test: atest NexusLauncherOutOfProcTests
Change-Id: I639dabb2d6d57243882e0bc7100cc4947b32e37f
---
 .../tests/src/com/android/quickstep/TaplTestsQuickstep.java    | 2 ++
 tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java     | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
index 0fe5432ceb..785d413ceb 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
@@ -42,6 +42,7 @@ import com.android.quickstep.views.RecentsView;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -215,6 +216,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
         return background;
     }
 
+    @Ignore
     @Test
     @PortraitLandscape
     public void testAllAppsFromHome() throws Exception {
diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
index 1648bddcd8..38fb0a7f91 100644
--- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
+++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
@@ -110,6 +110,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
                 .launch(mDevice.getLauncherPackageName());
     }
 
+    @Ignore
     @Test
     public void testPressHomeOnAllAppsContextMenu() throws Exception {
         final AllApps allApps = mLauncher.getWorkspace().switchToAllApps();
@@ -234,6 +235,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
         }
     }
 
+    @Ignore
     @Test
     @PortraitLandscape
     public void testAppIconLaunchFromAllAppsFromHome() throws Exception {
@@ -244,6 +246,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
         runIconLaunchFromAllAppsTest(this, allApps);
     }
 
+    @Ignore
     @Test
     @PortraitLandscape
     public void testWidgets() throws Exception {
-- 
GitLab


From b3d739dfa9401dba7bad5d6a1d8bc1143c23c814 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Thu, 11 Feb 2021 10:52:06 -0800
Subject: [PATCH 0508/1664] Apply Silk/ colorBackground(Floating) to AllApps

Bug: 180020638
Test: adb shell setprop persist.sysui.monet 1 && adb shell am crash com.android.systemui
Change-Id: Ied508f3452a3e640495fff4d1567c3b094f54432
---
 .../android/launcher3/allapps/AllAppsSectionDecorator.java   | 5 ++---
 src/com/android/launcher3/util/Themes.java                   | 5 +++++
 src/com/android/launcher3/views/ScrimView.java               | 3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
index 1d31975114..6c95992397 100644
--- a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
+++ b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
@@ -110,7 +110,6 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
      */
     public static class SectionDecorationHandler {
         private static final int FILL_ALPHA = 0;
-        private static final int FOCUS_ALPHA = (int) (.9f * 255);
 
         protected RectF mBounds = new RectF();
         private final boolean mIsFullWidth;
@@ -123,9 +122,9 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
 
         public SectionDecorationHandler(Context context, boolean isFullWidth) {
             mIsFullWidth = isFullWidth;
-            int endScrim = Themes.getAttrColor(context, R.attr.allAppsScrimColor);
+            int endScrim = Themes.getColorBackground(context);
             mFillcolor = ColorUtils.setAlphaComponent(endScrim, FILL_ALPHA);
-            mFocusColor = ColorUtils.setAlphaComponent(endScrim, FOCUS_ALPHA);
+            mFocusColor = endScrim;
             mRadius = Themes.getDialogCornerRadius(context);
         }
 
diff --git a/src/com/android/launcher3/util/Themes.java b/src/com/android/launcher3/util/Themes.java
index 55d17fc9c0..512a286288 100644
--- a/src/com/android/launcher3/util/Themes.java
+++ b/src/com/android/launcher3/util/Themes.java
@@ -81,6 +81,11 @@ public class Themes {
         return getAttrColor(context, android.R.attr.colorAccent);
     }
 
+    /** Returns the floating background color attribute. */
+    public static int getColorBackground(Context context) {
+        return getAttrColor(context, android.R.attr.colorBackground);
+    }
+
     /** Returns the floating background color attribute. */
     public static int getColorBackgroundFloating(Context context) {
         return getAttrColor(context, android.R.attr.colorBackgroundFloating);
diff --git a/src/com/android/launcher3/views/ScrimView.java b/src/com/android/launcher3/views/ScrimView.java
index 77cec80fd7..c9bd2840d8 100644
--- a/src/com/android/launcher3/views/ScrimView.java
+++ b/src/com/android/launcher3/views/ScrimView.java
@@ -42,7 +42,7 @@ import com.android.launcher3.util.Themes;
  */
 public class ScrimView<T extends Launcher> extends View implements Insettable, OnChangeListener {
 
-    private static final float SCRIM_ALPHA = .75f;
+    private static final float SCRIM_ALPHA = .95f;
     protected final T mLauncher;
     private final WallpaperColorInfo mWallpaperColorInfo;
     protected final int mEndScrim;
@@ -63,6 +63,7 @@ public class ScrimView<T extends Launcher> extends View implements Insettable, O
         mWallpaperColorInfo = WallpaperColorInfo.INSTANCE.get(context);
         int endScrim = Themes.getAttrColor(context, R.attr.allAppsScrimColor);
         if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
+            endScrim = Themes.getColorBackgroundFloating(context);
             endScrim = ColorUtils.setAlphaComponent(endScrim, (int) (255  * SCRIM_ALPHA));
         }
         mEndScrim = endScrim;
-- 
GitLab


From 34f4b7ebb8b5961b223afbf13312941efabbc7d4 Mon Sep 17 00:00:00 2001
From: Zak Cohen <zakcohen@google.com>
Date: Wed, 10 Feb 2021 11:49:29 -0800
Subject: [PATCH 0509/1664] Remove elevation from Task in Overview.

New designs don't have elevation for task views.


Bug: 179922117
Test: Local run
Change-Id: I0b3cb698574b49a279c7265e7f523819d20e2827
---
 quickstep/res/layout/task.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/quickstep/res/layout/task.xml b/quickstep/res/layout/task.xml
index c90706b703..0f9a6aad6f 100644
--- a/quickstep/res/layout/task.xml
+++ b/quickstep/res/layout/task.xml
@@ -19,7 +19,6 @@
     android:layout_height="match_parent"
     android:clipChildren="false"
     android:defaultFocusHighlightEnabled="false"
-    android:elevation="4dp"
     android:focusable="true">
 
     <com.android.quickstep.views.TaskThumbnailView
-- 
GitLab


From b56611d9620012b49e1b85e8d3ea3773ff3d36b7 Mon Sep 17 00:00:00 2001
From: Zak Cohen <zakcohen@google.com>
Date: Wed, 10 Feb 2021 14:05:29 -0800
Subject: [PATCH 0510/1664] Adjust task padding overview to match new specs.

New mocks have increased padding between the tasks.
I think we might need to fold some of these size calculations together
eventually, but this should be ok for the moment.


Bug: 179922117
Test: Local build and run
Change-Id: I4b5186d36012e80d55fae791e0c151c3112eecd1
---
 quickstep/res/values/dimens.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 749b4b29da..68c3851bf9 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -29,7 +29,7 @@
     <dimen name="overview_actions_bottom_margin_three_button">8dp</dimen>
     <dimen name="overview_actions_horizontal_margin">16dp</dimen>
 
-    <dimen name="recents_page_spacing">10dp</dimen>
+    <dimen name="recents_page_spacing">16dp</dimen>
     <dimen name="recents_clear_all_deadzone_vertical_margin">70dp</dimen>
 
     <!-- The speed in dp/s at which the user needs to be scrolling in recents such that we start
@@ -58,7 +58,7 @@
     <dimen name="task_card_menu_option_vertical_padding">8dp</dimen>
     <dimen name="task_card_menu_shadow_height">3dp</dimen>
     <dimen name="task_card_menu_horizontal_padding">0dp</dimen>
-    <dimen name="portrait_task_card_horz_space_big_overview">96dp</dimen>
+    <dimen name="portrait_task_card_horz_space_big_overview">132dp</dimen>
     <dimen name="portrait_modal_task_card_horz_space">60dp</dimen>
     <dimen name="landscape_task_card_horz_space">200dp</dimen>
     <dimen name="multi_window_task_card_horz_space">100dp</dimen>
-- 
GitLab


From b849aaf63d3d4bc90126d87f69772eb0f22ec2a9 Mon Sep 17 00:00:00 2001
From: Zak Cohen <zakcohen@google.com>
Date: Wed, 10 Feb 2021 11:52:19 -0800
Subject: [PATCH 0511/1664] Remove scaling and dimming for adjacent tasks in
 Overview.

New designs flatten out the overview list and don't have scaled and dimmed
tasks adjacent to the main one.

Bug: 179922117
Test: Local run
Change-Id: I2dde04ed60b9d8459810a10d0c27dd6e131855a6
---
 .../quickstep/util/TaskViewSimulator.java     |  7 +--
 .../android/quickstep/views/RecentsView.java  |  7 +--
 .../com/android/quickstep/views/TaskView.java | 43 ++-----------------
 3 files changed, 5 insertions(+), 52 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index 6f16781c64..edce1946eb 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -41,7 +41,6 @@ import com.android.quickstep.AnimatedFloat;
 import com.android.quickstep.BaseActivityInterface;
 import com.android.quickstep.views.RecentsView.ScrollState;
 import com.android.quickstep.views.TaskThumbnailView.PreviewPositionHelper;
-import com.android.quickstep.views.TaskView;
 import com.android.quickstep.views.TaskView.FullscreenDrawParams;
 import com.android.systemui.shared.recents.model.ThumbnailData;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
@@ -92,7 +91,6 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
 
     // TaskView properties
     private final FullscreenDrawParams mCurrentFullscreenParams;
-    private float mCurveScale = 1;
     public final AnimatedFloat taskPrimaryTranslation = new AnimatedFloat();
     public final AnimatedFloat taskSecondaryTranslation = new AnimatedFloat();
 
@@ -277,8 +275,6 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
                     .getPrimaryValue(mTaskRect.left, mTaskRect.top);
             mScrollState.screenCenter = start + mScrollState.scroll + mScrollState.halfPageSize;
             mScrollState.updateInterpolation(mDp, start);
-            mCurveScale = TaskView.getCurveScaleForInterpolation(mDp,
-                    mScrollState.linearInterpolation);
         }
 
         float progress = Utilities.boundToRange(fullScreenProgress.value, 0, 1);
@@ -295,8 +291,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
         mMatrix.postTranslate(insets.left, insets.top);
         mMatrix.postScale(scale, scale);
 
-        // Apply TaskView matrix: scale, translate, scroll
-        mMatrix.postScale(mCurveScale, mCurveScale, taskWidth / 2, taskHeight / 2);
+        // Apply TaskView matrix: translate, scroll
         mMatrix.postTranslate(mTaskRect.left, mTaskRect.top);
         mOrientationState.getOrientationHandler().set(mMatrix, MATRIX_POST_TRANSLATE,
                 taskPrimaryTranslation.value);
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 38d488c470..5d492acf84 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1984,11 +1984,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             centerToOffscreenProgress = Utilities.mapRange(centerToOffscreenProgress,
                     distanceFromMidpoint / distanceToOffscreen, 1);
         }
-        // Find the task's scale based on its offscreen progress, then see how far it still needs to
-        // move to be completely offscreen.
-        Utilities.scaleRectFAboutCenter(taskPosition,
-                TaskView.getCurveScaleForInterpolation(mActivity.getDeviceProfile(),
-                        centerToOffscreenProgress));
         distanceToOffscreen = desiredLeft - taskPosition.left;
         // Finally, we need to account for RecentsView scale, because it moves tasks based on its
         // pivot. To do this, we move the task position to where it would be offscreen at scale = 1
@@ -2114,7 +2109,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             anim.play(ObjectAnimator.ofFloat(recentsView, FULLSCREEN_PROGRESS, 1));
         } else {
             // We are launching an adjacent task, so parallax the center and other adjacent task.
-            float displacementX = tv.getWidth() * (toScale - tv.getCurveScale());
+            float displacementX = tv.getWidth() * (toScale - 1f);
             float primaryTranslation = mIsRtl ? -displacementX : displacementX;
             anim.play(ObjectAnimator.ofFloat(getPageAt(centerTaskIndex),
                     mOrientationHandler.getPrimaryViewTranslate(), primaryTranslation));
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 8a8b02176d..a1b553387b 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -44,7 +44,6 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
-import android.animation.TimeInterpolator;
 import android.app.ActivityOptions;
 import android.content.Context;
 import android.content.Intent;
@@ -112,10 +111,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
 
     private static final String TAG = TaskView.class.getSimpleName();
 
-    /** A curve of x from 0 to 1, where 0 is the center of the screen and 1 is the edge. */
-    private static final TimeInterpolator CURVE_INTERPOLATOR
-            = x -> (float) -Math.cos(x * Math.PI) / 2f + .5f;
-
     /**
      * The alpha of a black scrim on a page in the carousel as it leaves the screen.
      * In the resting position of the carousel, the adjacent pages have about half this scrim.
@@ -252,7 +247,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     private TaskMenuView mMenuView;
     private IconView mIconView;
     private final DigitalWellBeingToast mDigitalWellBeingToast;
-    private float mCurveScale;
     private float mFullscreenProgress;
     private float mScaleAtFullscreen = 1;
     private float mFullscreenScale = 1;
@@ -655,7 +649,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
             progress = 1 - progress;
         }
         mFocusTransitionProgress = progress;
-        mSnapshotView.setDimAlphaMultipler(progress);
+        mSnapshotView.setDimAlphaMultipler(0);
         float iconScalePercentage = (float) SCALE_ICON_DURATION / DIM_ANIM_DURATION;
         float lowerClamp = invert ? 1f - iconScalePercentage : 0;
         float upperClamp = invert ? 1 : iconScalePercentage;
@@ -703,7 +697,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     }
 
     protected void resetViewTransforms() {
-        setCurveScale(1);
         // fullscreenTranslation and accumulatedTranslation should not be reset, as
         // resetViewTransforms is called during Quickswitch scrolling.
         mDismissTranslationX = mTaskOffsetTranslationX = mTaskResistanceTranslationX = 0f;
@@ -738,13 +731,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
             return;
         }
 
-        float curveInterpolation =
-                CURVE_INTERPOLATOR.getInterpolation(scrollState.linearInterpolation);
-        float curveScaleForCurveInterpolation = getCurveScaleForCurveInterpolation(
-                mActivity.getDeviceProfile(), curveInterpolation);
-        mSnapshotView.setDimAlpha(curveInterpolation * MAX_PAGE_SCRIM_ALPHA);
-        setCurveScale(curveScaleForCurveInterpolation);
-
         float dwbBannerAlpha = Utilities.boundToRange(1.0f - 2 * scrollState.linearInterpolation,
                 0f, 1f);
         mDigitalWellBeingToast.updateBannerAlpha(dwbBannerAlpha);
@@ -825,20 +811,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         }
     }
 
-    /**
-     * How much to scale down pages near the edge of the screen according to linearInterpolation.
-     */
-    public static float getCurveScaleForInterpolation(DeviceProfile deviceProfile,
-            float linearInterpolation) {
-        float curveInterpolation = CURVE_INTERPOLATOR.getInterpolation(linearInterpolation);
-        return getCurveScaleForCurveInterpolation(deviceProfile, curveInterpolation);
-    }
-
-    private static float getCurveScaleForCurveInterpolation(DeviceProfile deviceProfile,
-            float curveInterpolation) {
-        return 1 - curveInterpolation * getEdgeScaleDownFactor(deviceProfile);
-    }
-
     /**
      * How much to scale down pages near the edge of the screen.
      */
@@ -850,23 +822,14 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         }
     }
 
-    private void setCurveScale(float curveScale) {
-        mCurveScale = curveScale;
-        applyScale();
-    }
-
     private void setFullscreenScale(float fullscreenScale) {
         mFullscreenScale = fullscreenScale;
         applyScale();
     }
 
     private void applyScale() {
-        setScaleX(mCurveScale * mFullscreenScale);
-        setScaleY(mCurveScale * mFullscreenScale);
-    }
-
-    public float getCurveScale() {
-        return mCurveScale;
+        setScaleX(mFullscreenScale);
+        setScaleY(mFullscreenScale);
     }
 
     private void setDismissTranslationX(float x) {
-- 
GitLab


From e87b4c49799be3a3e8a7d5b4b057b5087781e355 Mon Sep 17 00:00:00 2001
From: Sreyas <sreyasr@google.com>
Date: Thu, 11 Feb 2021 15:35:59 -0800
Subject: [PATCH 0512/1664] Updated TaskMenuView.

Added padding on top of task name and removed unused code.
Bug: 179490926
Test: Manual

Change-Id: Id28547f30872f449f4f51238854155358b2dbcbe
---
 quickstep/res/layout/task_menu.xml                          | 1 +
 quickstep/src/com/android/quickstep/views/TaskMenuView.java | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/quickstep/res/layout/task_menu.xml b/quickstep/res/layout/task_menu.xml
index 744a30587b..3916ff9a1a 100644
--- a/quickstep/res/layout/task_menu.xml
+++ b/quickstep/res/layout/task_menu.xml
@@ -29,6 +29,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
+        android:layout_marginTop="16dp"
         android:layout_marginBottom="16dp"
         android:textSize="12sp"/>
 
diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
index 7e558bb19d..e21bf7629e 100644
--- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
@@ -24,7 +24,6 @@ import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.content.Context;
 import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.MotionEvent;
@@ -164,7 +163,6 @@ public class TaskMenuView extends AbstractFloatingView {
     }
 
     private void addMenuOptions(TaskView taskView) {
-        Drawable icon = taskView.getTask().icon.getConstantState().newDrawable();
         mTaskName.setText(TaskUtils.getTitle(getContext(), taskView.getTask()));
         mTaskName.setOnClickListener(v -> close(true));
 
-- 
GitLab


From db3f34f9568b812a0d3861cc9af5c0b6a2671678 Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Fri, 12 Feb 2021 02:57:58 +0000
Subject: [PATCH 0513/1664] Revert "Ignore broken launcher tests"

This reverts commit 03c5a4623536184984724eca07305c69ee791dbe.

Reason for revert: Fixed tests
Bug: 180016597

Change-Id: I45390f157c6c3a379d686e8802648aa948071b72
---
 .../tests/src/com/android/quickstep/TaplTestsQuickstep.java    | 2 --
 tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java     | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
index 785d413ceb..0fe5432ceb 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
@@ -42,7 +42,6 @@ import com.android.quickstep.views.RecentsView;
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -216,7 +215,6 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
         return background;
     }
 
-    @Ignore
     @Test
     @PortraitLandscape
     public void testAllAppsFromHome() throws Exception {
diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
index 38fb0a7f91..1648bddcd8 100644
--- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
+++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
@@ -110,7 +110,6 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
                 .launch(mDevice.getLauncherPackageName());
     }
 
-    @Ignore
     @Test
     public void testPressHomeOnAllAppsContextMenu() throws Exception {
         final AllApps allApps = mLauncher.getWorkspace().switchToAllApps();
@@ -235,7 +234,6 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
         }
     }
 
-    @Ignore
     @Test
     @PortraitLandscape
     public void testAppIconLaunchFromAllAppsFromHome() throws Exception {
@@ -246,7 +244,6 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
         runIconLaunchFromAllAppsTest(this, allApps);
     }
 
-    @Ignore
     @Test
     @PortraitLandscape
     public void testWidgets() throws Exception {
-- 
GitLab


From 19ab177d1b383748ee477278cd553f5a82a24c34 Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Wed, 10 Feb 2021 21:36:51 -0800
Subject: [PATCH 0514/1664] Adds CONTAINER_QSB to be used for QSB data.

Also updates some related generics definitions for
better/simpler compile-time checks.

Bug: 178536734
Test: Manual
Change-Id: If439b64ad968f62674f856fd3ff465bf21cc9204
---
 .../model/QuickstepModelDelegate.java         | 11 ++--
 .../android/launcher3/LauncherSettings.java   | 60 +++++++++++--------
 .../plugins/BcSmartspaceDataPlugin.java       |  2 +-
 3 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
index c3f5c00d75..225823e550 100644
--- a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
+++ b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
@@ -84,7 +84,7 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
     private final InvariantDeviceProfile mIDP;
     private final AppEventProducer mAppEventProducer;
 
-    private boolean mActive = false;
+    protected boolean mActive = false;
 
     public QuickstepModelDelegate(Context context) {
         mAppEventProducer = new AppEventProducer(context, this::onAppTargetEvent);
@@ -200,7 +200,6 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
                         .setPredictedTargetCount(mIDP.numHotseatIcons)
                         .setExtras(convertDataModelToAppTargetBundle(context, mDataModel))
                         .build()));
-
     }
 
     private void registerPredictor(PredictorState state, AppPredictor predictor) {
@@ -236,14 +235,14 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
     static class PredictorState {
 
         public final FixedContainerItems items;
-        public final PersistedItemArray storage;
+        public final PersistedItemArray<ItemInfo> storage;
         public AppPredictor predictor;
 
         private List<AppTarget> mLastTargets;
 
         PredictorState(int container, String storageName) {
             items = new FixedContainerItems(container);
-            storage = new PersistedItemArray(storageName);
+            storage = new PersistedItemArray<>(storageName);
             mLastTargets = Collections.emptyList();
         }
 
@@ -255,7 +254,7 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
         }
 
         /**
-         * Sets the new targets and returns true if it was different than before.
+         * Sets the new targets and returns true if it was the same as before.
          */
         boolean setTargets(List<AppTarget> newTargets) {
             List<AppTarget> oldTargets = mLastTargets;
@@ -289,7 +288,7 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
         return true;
     }
 
-    private static class WorkspaceItemFactory implements PersistedItemArray.ItemFactory {
+    private static class WorkspaceItemFactory implements PersistedItemArray.ItemFactory<ItemInfo> {
 
         private final LauncherAppState mAppState;
         private final UserManagerState mUMS;
diff --git a/src/com/android/launcher3/LauncherSettings.java b/src/com/android/launcher3/LauncherSettings.java
index be270397d6..dfdc53c1c9 100644
--- a/src/com/android/launcher3/LauncherSettings.java
+++ b/src/com/android/launcher3/LauncherSettings.java
@@ -74,6 +74,37 @@ public class LauncherSettings {
          */
         public static final int ITEM_TYPE_SHORTCUT = 1;
 
+        /**
+         * The favorite is a user created folder
+         */
+        public static final int ITEM_TYPE_FOLDER = 2;
+
+        /**
+         * The favorite is a widget
+         */
+        public static final int ITEM_TYPE_APPWIDGET = 4;
+
+        /**
+         * The favorite is a custom widget provided by the launcher
+         */
+        public static final int ITEM_TYPE_CUSTOM_APPWIDGET = 5;
+
+        /**
+         * The gesture is an application created deep shortcut
+         */
+        public static final int ITEM_TYPE_DEEP_SHORTCUT = 6;
+
+        /**
+         * Type of the item is recents task.
+         * TODO(hyunyoungs): move constants not related to Favorites DB to a better location.
+         */
+        public static final int ITEM_TYPE_TASK = 7;
+
+        /**
+         * The item is QSB
+         */
+        public static final int ITEM_TYPE_QSB = 8;
+
         /**
          * The icon package name in Intent.ShortcutIconResource
          * <P>Type: TEXT</P>
@@ -170,6 +201,7 @@ public class LauncherSettings {
         public static final int CONTAINER_SHORTCUTS = -107;
         public static final int CONTAINER_SETTINGS = -108;
         public static final int CONTAINER_TASKSWITCHER = -109;
+        public static final int CONTAINER_QSB = -110;
 
         // Represents any of the extended containers implemented in non-AOSP variants.
         public static final int EXTENDED_CONTAINERS = -200;
@@ -195,6 +227,8 @@ public class LauncherSettings {
                 case ITEM_TYPE_APPWIDGET: return "WIDGET";
                 case ITEM_TYPE_CUSTOM_APPWIDGET: return "CUSTOMWIDGET";
                 case ITEM_TYPE_DEEP_SHORTCUT: return "DEEPSHORTCUT";
+                case ITEM_TYPE_TASK: return "TASK";
+                case ITEM_TYPE_QSB: return "QSB";
                 default: return String.valueOf(type);
             }
         }
@@ -239,32 +273,6 @@ public class LauncherSettings {
          */
         public static final String PROFILE_ID = "profileId";
 
-        /**
-         * The favorite is a user created folder
-         */
-        public static final int ITEM_TYPE_FOLDER = 2;
-
-        /**
-         * The favorite is a widget
-         */
-        public static final int ITEM_TYPE_APPWIDGET = 4;
-
-        /**
-         * The favorite is a custom widget provided by the launcher
-         */
-        public static final int ITEM_TYPE_CUSTOM_APPWIDGET = 5;
-
-        /**
-         * The gesture is an application created deep shortcut
-         */
-        public static final int ITEM_TYPE_DEEP_SHORTCUT = 6;
-
-        /**
-         * Type of the item is recents task.
-         * TODO(hyunyoungs): move constants not related to Favorites DB to a better location.
-         */
-        public static final int ITEM_TYPE_TASK = 7;
-
         /**
          * The appWidgetId of the widget
          *
diff --git a/src_plugins/com/android/systemui/plugins/BcSmartspaceDataPlugin.java b/src_plugins/com/android/systemui/plugins/BcSmartspaceDataPlugin.java
index b90e43bc64..f8a9a04596 100644
--- a/src_plugins/com/android/systemui/plugins/BcSmartspaceDataPlugin.java
+++ b/src_plugins/com/android/systemui/plugins/BcSmartspaceDataPlugin.java
@@ -39,6 +39,6 @@ public interface BcSmartspaceDataPlugin extends Plugin {
     /** Provides Smartspace data to registered listeners. */
     interface SmartspaceTargetListener {
         /** Each Parcelable is a SmartspaceTarget that represents a card. */
-        void onSmartspaceTargetsUpdated(List<Parcelable> targets);
+        void onSmartspaceTargetsUpdated(List<? extends Parcelable> targets);
     }
 }
-- 
GitLab


From 4c23ca768fa74ae4a4e4c6c6216a0c6fb7877c5e Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 11 Feb 2021 16:47:26 -0800
Subject: [PATCH 0515/1664] Fixing shortcut intent getting cleared during
 backup/restore

Bug: 174570283
Bug: 156871815
Test: Verified on device
Change-Id: Ie286ee783bfe96c5b2be28f0db5298caf3801e6d
---
 src/com/android/launcher3/Utilities.java       |  1 -
 .../android/launcher3/model/AllAppsList.java   |  6 ++----
 .../PackageIncrementalDownloadUpdatedTask.java |  6 +++---
 .../model/PackageInstallStateChangedTask.java  |  8 ++++----
 .../launcher3/model/PackageUpdatedTask.java    | 18 +++++++++++++-----
 .../launcher3/model/ShortcutsChangedTask.java  |  9 +++++++++
 .../launcher3/pm/InstallSessionHelper.java     |  4 ++--
 .../launcher3/util/PackageManagerHelper.java   | 10 +++++++++-
 8 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 51d8e665d0..c440303c2e 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -605,7 +605,6 @@ public final class Utilities {
                 outObj[0] = activityInfo;
                 return activityInfo.getFullResIcon(appState.getIconCache());
             }
-            if (info.getIntent() == null || info.getIntent().getPackage() == null) return null;
             List<ShortcutInfo> si = ShortcutKey.fromItemInfo(info)
                     .buildRequest(launcher)
                     .query(ShortcutRequest.ALL);
diff --git a/src/com/android/launcher3/model/AllAppsList.java b/src/com/android/launcher3/model/AllAppsList.java
index e3e4b6911f..a519f9275c 100644
--- a/src/com/android/launcher3/model/AllAppsList.java
+++ b/src/com/android/launcher3/model/AllAppsList.java
@@ -22,7 +22,6 @@ import static com.android.launcher3.model.data.AppInfo.EMPTY_ARRAY;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.ApplicationInfo;
 import android.content.pm.LauncherActivityInfo;
 import android.content.pm.LauncherApps;
 import android.os.LocaleList;
@@ -145,10 +144,9 @@ public class AllAppsList {
     }
 
     public void addPromiseApp(Context context, PackageInstallInfo installInfo) {
-        ApplicationInfo applicationInfo = new PackageManagerHelper(context)
-                .getApplicationInfo(installInfo.packageName, installInfo.user, 0);
         // only if not yet installed
-        if (applicationInfo == null) {
+        if (!new PackageManagerHelper(context)
+                .isAppInstalled(installInfo.packageName, installInfo.user)) {
             AppInfo info = new AppInfo(installInfo);
             mIconCache.getTitleAndIcon(info, info.usingLowResIcon());
             info.sectionName = mIndex.computeSectionName(info.title);
diff --git a/src/com/android/launcher3/model/PackageIncrementalDownloadUpdatedTask.java b/src/com/android/launcher3/model/PackageIncrementalDownloadUpdatedTask.java
index e3e87693b1..434776cf74 100644
--- a/src/com/android/launcher3/model/PackageIncrementalDownloadUpdatedTask.java
+++ b/src/com/android/launcher3/model/PackageIncrementalDownloadUpdatedTask.java
@@ -15,7 +15,7 @@
  */
 package com.android.launcher3.model;
 
-import android.content.ComponentName;
+import android.content.Intent;
 import android.os.UserHandle;
 
 import com.android.launcher3.LauncherAppState;
@@ -66,8 +66,8 @@ public class PackageIncrementalDownloadUpdatedTask extends BaseModelUpdateTask {
         final ArrayList<WorkspaceItemInfo> updatedWorkspaceItems = new ArrayList<>();
         synchronized (dataModel) {
             dataModel.forAllWorkspaceItemInfos(mUser, si -> {
-                ComponentName cn = si.getTargetComponent();
-                if ((cn != null) && cn.getPackageName().equals(mPackageName)) {
+                Intent intent = si.getIntent();
+                if ((intent != null) && mPackageName.equals(intent.getPackage())) {
                     si.runtimeStatusFlags &= ~ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE;
                     si.setProgressLevel(downloadInfo);
                     updatedWorkspaceItems.add(si);
diff --git a/src/com/android/launcher3/model/PackageInstallStateChangedTask.java b/src/com/android/launcher3/model/PackageInstallStateChangedTask.java
index 8215edd90b..1380e9e0c4 100644
--- a/src/com/android/launcher3/model/PackageInstallStateChangedTask.java
+++ b/src/com/android/launcher3/model/PackageInstallStateChangedTask.java
@@ -15,7 +15,7 @@
  */
 package com.android.launcher3.model;
 
-import android.content.ComponentName;
+import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 
@@ -72,9 +72,9 @@ public class PackageInstallStateChangedTask extends BaseModelUpdateTask {
         synchronized (dataModel) {
             final HashSet<ItemInfo> updates = new HashSet<>();
             dataModel.forAllWorkspaceItemInfos(mInstallInfo.user, si -> {
-                ComponentName cn = si.getTargetComponent();
-                if (si.hasPromiseIconUi() && (cn != null)
-                        && cn.getPackageName().equals(mInstallInfo.packageName)) {
+                Intent intent = si.getIntent();
+                if (si.hasPromiseIconUi() && (intent != null)
+                        && mInstallInfo.packageName.equals(intent.getPackage())) {
                     int installProgress = mInstallInfo.progress;
 
                     si.setProgressLevel(installProgress, PackageInstallInfo.STATUS_INSTALLING);
diff --git a/src/com/android/launcher3/model/PackageUpdatedTask.java b/src/com/android/launcher3/model/PackageUpdatedTask.java
index f13a109926..7bfa3ef481 100644
--- a/src/com/android/launcher3/model/PackageUpdatedTask.java
+++ b/src/com/android/launcher3/model/PackageUpdatedTask.java
@@ -30,6 +30,7 @@ import android.os.UserManager;
 import android.util.Log;
 
 import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.icons.BitmapInfo;
@@ -228,7 +229,8 @@ public class PackageUpdatedTask extends BaseModelUpdateTask {
                                 isTargetValid = context.getSystemService(LauncherApps.class)
                                         .isActivityEnabled(cn, mUser);
                             }
-                            if (si.hasStatusFlag(FLAG_RESTORED_ICON | FLAG_AUTOINSTALL_ICON)) {
+                            if (!isTargetValid && si.hasStatusFlag(
+                                    FLAG_RESTORED_ICON | FLAG_AUTOINSTALL_ICON)) {
                                 if (updateWorkspaceItemIntent(context, si, packageName)) {
                                     infoUpdated = true;
                                 } else if (si.hasPromiseIconUi()) {
@@ -250,8 +252,7 @@ public class PackageUpdatedTask extends BaseModelUpdateTask {
                             }
                         }
 
-                        if (isNewApkAvailable
-                                && si.itemType == Favorites.ITEM_TYPE_APPLICATION) {
+                        if (isNewApkAvailable) {
                             List<LauncherActivityInfo> activities = activitiesLists.get(
                                     packageName);
                             si.setProgressLevel(
@@ -260,8 +261,10 @@ public class PackageUpdatedTask extends BaseModelUpdateTask {
                                             : PackageManagerHelper.getLoadingProgress(
                                                     activities.get(0)),
                                     PackageInstallInfo.STATUS_INSTALLED_DOWNLOADING);
-                            iconCache.getTitleAndIcon(si, si.usingLowResIcon());
-                            infoUpdated = true;
+                            if (si.itemType == Favorites.ITEM_TYPE_APPLICATION) {
+                                iconCache.getTitleAndIcon(si, si.usingLowResIcon());
+                                infoUpdated = true;
+                            }
                         }
 
                         int oldRuntimeFlags = si.runtimeStatusFlags;
@@ -353,6 +356,11 @@ public class PackageUpdatedTask extends BaseModelUpdateTask {
      */
     private boolean updateWorkspaceItemIntent(Context context,
             WorkspaceItemInfo si, String packageName) {
+        if (si.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT) {
+            // Do not update intent for deep shortcuts as they contain additional information
+            // about the shortcut.
+            return false;
+        }
         // Try to find the best match activity.
         Intent intent = new PackageManagerHelper(context).getAppLaunchIntent(packageName, mUser);
         if (intent != null) {
diff --git a/src/com/android/launcher3/model/ShortcutsChangedTask.java b/src/com/android/launcher3/model/ShortcutsChangedTask.java
index 6fedad1c9d..4296d32f24 100644
--- a/src/com/android/launcher3/model/ShortcutsChangedTask.java
+++ b/src/com/android/launcher3/model/ShortcutsChangedTask.java
@@ -25,6 +25,7 @@ import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.shortcuts.ShortcutKey;
 import com.android.launcher3.shortcuts.ShortcutRequest;
 import com.android.launcher3.util.ItemInfoMatcher;
+import com.android.launcher3.util.PackageManagerHelper;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -66,6 +67,14 @@ public class ShortcutsChangedTask extends BaseModelUpdateTask {
         }
 
         if (!matchingWorkspaceItems.isEmpty()) {
+            if (mShortcuts.isEmpty()) {
+                // Verify that the app is indeed installed.
+                if (!new PackageManagerHelper(app.getContext())
+                        .isAppInstalled(mPackageName, mUser)) {
+                    // App is not installed, ignoring package events
+                    return;
+                }
+            }
             // Update the workspace to reflect the changes to updated shortcuts residing on it.
             List<String> allLauncherKnownIds = matchingWorkspaceItems.stream()
                     .map(WorkspaceItemInfo::getDeepShortcutId)
diff --git a/src/com/android/launcher3/pm/InstallSessionHelper.java b/src/com/android/launcher3/pm/InstallSessionHelper.java
index fa25114d49..0091af10f6 100644
--- a/src/com/android/launcher3/pm/InstallSessionHelper.java
+++ b/src/com/android/launcher3/pm/InstallSessionHelper.java
@@ -217,8 +217,8 @@ public class InstallSessionHelper {
                 && sessionInfo.getAppIcon() != null
                 && !TextUtils.isEmpty(sessionInfo.getAppLabel())
                 && !promiseIconAddedForId(sessionInfo.getSessionId())
-                && new PackageManagerHelper(mAppContext).getApplicationInfo(
-                        sessionInfo.getAppPackageName(), getUserHandle(sessionInfo), 0) == null) {
+                && !new PackageManagerHelper(mAppContext).isAppInstalled(
+                        sessionInfo.getAppPackageName(), getUserHandle(sessionInfo))) {
             ItemInstallQueue.INSTANCE.get(mAppContext)
                     .queueItem(sessionInfo.getAppPackageName(), getUserHandle(sessionInfo));
 
diff --git a/src/com/android/launcher3/util/PackageManagerHelper.java b/src/com/android/launcher3/util/PackageManagerHelper.java
index 7b264275d4..08ec5912a4 100644
--- a/src/com/android/launcher3/util/PackageManagerHelper.java
+++ b/src/com/android/launcher3/util/PackageManagerHelper.java
@@ -91,6 +91,14 @@ public class PackageManagerHelper {
         return info != null && isAppSuspended(info);
     }
 
+    /**
+     * Returns whether the target app is installed for a given user
+     */
+    public boolean isAppInstalled(String packageName, UserHandle user) {
+        ApplicationInfo info = getApplicationInfo(packageName, user, 0);
+        return info != null;
+    }
+
     /**
      * Returns the application info for the provided package or null
      */
@@ -105,7 +113,7 @@ public class PackageManagerHelper {
     }
 
     public boolean isSafeMode() {
-        return mContext.getPackageManager().isSafeMode();
+        return mPm.isSafeMode();
     }
 
     public Intent getAppLaunchIntent(String pkg, UserHandle user) {
-- 
GitLab


From 6600860f0f9ce177f1a3448481ea772eb25b2c01 Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Thu, 11 Feb 2021 15:23:32 -0800
Subject: [PATCH 0516/1664] [AA+] Log app launches with AllApps session
 InstanceId when current state is ALL_APPS.

Bug: 178562918
Test: Manual
Change-Id: I65b264cc37079280b59179d5b2f29b67e7a12cc5
---
 .../launcher3/uioverrides/QuickstepLauncher.java     | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 2e018f357f..8b4f4f87af 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -21,12 +21,11 @@ import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT
 import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
 import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT;
 import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT;
+import static com.android.launcher3.LauncherState.ALL_APPS;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.OVERVIEW_MODAL_TASK;
 import static com.android.launcher3.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent;
-import static com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.EXTENDED_CONTAINERS;
-import static com.android.launcher3.logger.LauncherAtomExtensions.ExtendedContainers.ContainerCase.DEVICE_SEARCH_RESULT_CONTAINER;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_APP_LAUNCH_TAP;
 import static com.android.launcher3.testing.TestProtocol.HINT_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.OVERVIEW_STATE_ORDINAL;
@@ -105,12 +104,11 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
 
     @Override
     protected void logAppLaunch(ItemInfo info, InstanceId instanceId) {
-        // If the app launch is from DeviceSearchResultContainer then add the InstanceId from
-        // LiveSearchManager to recreate the AllApps search session on the server side.
+        // If the app launch is from any of the surfaces in AllApps then add the InstanceId from
+        // LiveSearchManager to recreate the AllApps session on the server side.
         Optional<InstanceId> logInstanceId = this.getLiveSearchManager().getLogInstanceId();
-        if (info.getContainerInfo().getContainerCase() == EXTENDED_CONTAINERS
-                && info.getContainerInfo().getExtendedContainers().getContainerCase()
-                == DEVICE_SEARCH_RESULT_CONTAINER && logInstanceId.isPresent()) {
+        if (logInstanceId.isPresent() && ALL_APPS.equals(
+                getStateManager().getCurrentStableState())) {
             instanceId = logInstanceId.get();
         }
 
-- 
GitLab


From 9cc6ecfa11152641d24d3485991d32cb554c9b2c Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 12 Feb 2021 13:07:10 -0800
Subject: [PATCH 0517/1664] Fixing dragView not getting removed on returning
 home

Bug: 179330150
Test: Verified on device
Change-Id: Id0baadac36b700bd1c57382b0024c248063f9127
---
 src/com/android/launcher3/statemanager/StatefulActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/statemanager/StatefulActivity.java b/src/com/android/launcher3/statemanager/StatefulActivity.java
index 601e117f1c..7abb6532f4 100644
--- a/src/com/android/launcher3/statemanager/StatefulActivity.java
+++ b/src/com/android/launcher3/statemanager/StatefulActivity.java
@@ -150,8 +150,8 @@ public abstract class StatefulActivity<STATE_TYPE extends BaseState<STATE_TYPE>>
 
     private void handleDeferredResume() {
         if (hasBeenResumed() && !getStateManager().getState().hasFlag(FLAG_NON_INTERACTIVE)) {
-            onDeferredResumed();
             addActivityFlags(ACTIVITY_STATE_DEFERRED_RESUMED);
+            onDeferredResumed();
 
             mDeferredResumePending = false;
         } else {
-- 
GitLab


From 5fb8aae8054151746e0b1507b4a5d4cc20ec7aa4 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Sat, 13 Feb 2021 07:34:54 +0000
Subject: [PATCH 0518/1664] Revert "Update Robolectric SDK to 30"

This reverts commit 5ed0907cd34faab89b9ba2c55961c072e4f6e2ec.

Reason for revert: b/180139562

Change-Id: I9520993ee925935ab621239686377a39e2e25590
---
 robolectric_tests/config/robolectric.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/robolectric_tests/config/robolectric.properties b/robolectric_tests/config/robolectric.properties
index 0ac997f0b3..4e811f36ff 100644
--- a/robolectric_tests/config/robolectric.properties
+++ b/robolectric_tests/config/robolectric.properties
@@ -1,4 +1,4 @@
-sdk=30
+sdk=29
 shadows= \
     com.android.launcher3.shadows.LShadowAppPredictionManager \
     com.android.launcher3.shadows.LShadowAppWidgetManager \
-- 
GitLab


From 53d3427b4e1150cb789c5b3dd85540462cfce4e7 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Sat, 13 Feb 2021 20:41:45 +0000
Subject: [PATCH 0519/1664] Fix WidgetsListContentEntryTest static
 initialization error

Test: m RunLauncherRoboTests

Bug: 180158637
Change-Id: I26316dddd41b1519e8deb0e049355cdce71aac4f
---
 .../model/WidgetsListContentEntryTest.java    | 60 +++++++++----------
 1 file changed, 28 insertions(+), 32 deletions(-)

diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/model/WidgetsListContentEntryTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/model/WidgetsListContentEntryTest.java
index a11d0c9505..86df3f8ab2 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/model/WidgetsListContentEntryTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/model/WidgetsListContentEntryTest.java
@@ -50,20 +50,11 @@ import java.util.Map;
 @RunWith(RobolectricTestRunner.class)
 public final class WidgetsListContentEntryTest {
     private static final String PACKAGE_NAME = "com.google.test";
-    private static final PackageItemInfo PACKAGE_ITEM_INFO = new PackageItemInfo(PACKAGE_NAME);
-    private static final ComponentName WIDGET_1 = ComponentName.createRelative(PACKAGE_NAME,
-            ".widget1");
-    private static final ComponentName WIDGET_2 = ComponentName.createRelative(PACKAGE_NAME,
-            ".widget2");
-    private static final ComponentName WIDGET_3 = ComponentName.createRelative(PACKAGE_NAME,
-            ".widget3");
-    private static final Map<ComponentName, String> WIDGETS_TO_LABELS = new HashMap();
-
-    static {
-        WIDGETS_TO_LABELS.put(WIDGET_1, "Cat");
-        WIDGETS_TO_LABELS.put(WIDGET_2, "Dog");
-        WIDGETS_TO_LABELS.put(WIDGET_3, "Bird");
-    }
+    private final PackageItemInfo mPackageItemInfo = new PackageItemInfo(PACKAGE_NAME);
+    private final ComponentName mWidget1 = ComponentName.createRelative(PACKAGE_NAME, ".mWidget1");
+    private final ComponentName mWidget2 = ComponentName.createRelative(PACKAGE_NAME, ".mWidget2");
+    private final ComponentName mWidget3 = ComponentName.createRelative(PACKAGE_NAME, ".mWidget3");
+    private final Map<ComponentName, String> mWidgetsToLabels = new HashMap();
 
     @Mock private IconCache mIconCache;
 
@@ -73,6 +64,11 @@ public final class WidgetsListContentEntryTest {
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+
+        mWidgetsToLabels.put(mWidget1, "Cat");
+        mWidgetsToLabels.put(mWidget2, "Dog");
+        mWidgetsToLabels.put(mWidget3, "Bird");
+
         mContext = RuntimeEnvironment.application;
         mTestProfile = new InvariantDeviceProfile();
         mTestProfile.numRows = 5;
@@ -80,7 +76,7 @@ public final class WidgetsListContentEntryTest {
 
         doAnswer(invocation -> {
             ComponentWithLabel componentWithLabel = (ComponentWithLabel) invocation.getArgument(0);
-            return WIDGETS_TO_LABELS.get(componentWithLabel.getComponent());
+            return mWidgetsToLabels.get(componentWithLabel.getComponent());
         }).when(mIconCache).getTitleNoCache(any());
     }
 
@@ -88,14 +84,14 @@ public final class WidgetsListContentEntryTest {
     public void unsortedWidgets_diffLabels_shouldSortWidgetItems() {
         // GIVEN a list of widgets in unsorted order.
         // Cat 2x3
-        WidgetItem widgetItem1 = createWidgetItem(WIDGET_1, /* spanX= */ 2, /* spanY= */ 3);
+        WidgetItem widgetItem1 = createWidgetItem(mWidget1, /* spanX= */ 2, /* spanY= */ 3);
         // Dog 2x3
-        WidgetItem widgetItem2 = createWidgetItem(WIDGET_2, /* spanX= */ 2, /* spanY= */ 3);
+        WidgetItem widgetItem2 = createWidgetItem(mWidget2, /* spanX= */ 2, /* spanY= */ 3);
         // Bird 2x3
-        WidgetItem widgetItem3 = createWidgetItem(WIDGET_3, /* spanX= */ 2, /* spanY= */ 3);
+        WidgetItem widgetItem3 = createWidgetItem(mWidget3, /* spanX= */ 2, /* spanY= */ 3);
 
         // WHEN creates a WidgetsListRowEntry with the unsorted widgets.
-        WidgetsListContentEntry widgetsListRowEntry = new WidgetsListContentEntry(PACKAGE_ITEM_INFO,
+        WidgetsListContentEntry widgetsListRowEntry = new WidgetsListContentEntry(mPackageItemInfo,
                 /* titleSectionName= */ "T",
                 List.of(widgetItem1, widgetItem2, widgetItem3));
 
@@ -104,21 +100,21 @@ public final class WidgetsListContentEntryTest {
                 .containsExactly(widgetItem3, widgetItem1, widgetItem2)
                 .inOrder();
         assertThat(widgetsListRowEntry.mTitleSectionName).isEqualTo("T");
-        assertThat(widgetsListRowEntry.mPkgItem).isEqualTo(PACKAGE_ITEM_INFO);
+        assertThat(widgetsListRowEntry.mPkgItem).isEqualTo(mPackageItemInfo);
     }
 
     @Test
     public void unsortedWidgets_sameLabels_differentSize_shouldSortWidgetItems() {
         // GIVEN a list of widgets in unsorted order.
         // Cat 3x3
-        WidgetItem widgetItem1 = createWidgetItem(WIDGET_1, /* spanX= */ 3, /* spanY= */ 3);
+        WidgetItem widgetItem1 = createWidgetItem(mWidget1, /* spanX= */ 3, /* spanY= */ 3);
         // Cat 1x2
-        WidgetItem widgetItem2 = createWidgetItem(WIDGET_1, /* spanX= */ 1, /* spanY= */ 2);
+        WidgetItem widgetItem2 = createWidgetItem(mWidget1, /* spanX= */ 1, /* spanY= */ 2);
         // Cat 2x2
-        WidgetItem widgetItem3 = createWidgetItem(WIDGET_1, /* spanX= */ 2, /* spanY= */ 2);
+        WidgetItem widgetItem3 = createWidgetItem(mWidget1, /* spanX= */ 2, /* spanY= */ 2);
 
         // WHEN creates a WidgetsListRowEntry with the unsorted widgets.
-        WidgetsListContentEntry widgetsListRowEntry = new WidgetsListContentEntry(PACKAGE_ITEM_INFO,
+        WidgetsListContentEntry widgetsListRowEntry = new WidgetsListContentEntry(mPackageItemInfo,
                 /* titleSectionName= */ "T",
                 List.of(widgetItem1, widgetItem2, widgetItem3));
 
@@ -128,23 +124,23 @@ public final class WidgetsListContentEntryTest {
                 .containsExactly(widgetItem2, widgetItem3, widgetItem1)
                 .inOrder();
         assertThat(widgetsListRowEntry.mTitleSectionName).isEqualTo("T");
-        assertThat(widgetsListRowEntry.mPkgItem).isEqualTo(PACKAGE_ITEM_INFO);
+        assertThat(widgetsListRowEntry.mPkgItem).isEqualTo(mPackageItemInfo);
     }
 
     @Test
     public void unsortedWidgets_hodgepodge_shouldSortWidgetItems() {
         // GIVEN a list of widgets in unsorted order.
         // Cat 3x3
-        WidgetItem widgetItem1 = createWidgetItem(WIDGET_1, /* spanX= */ 3, /* spanY= */ 3);
+        WidgetItem widgetItem1 = createWidgetItem(mWidget1, /* spanX= */ 3, /* spanY= */ 3);
         // Cat 1x2
-        WidgetItem widgetItem2 = createWidgetItem(WIDGET_1, /* spanX= */ 1, /* spanY= */ 2);
+        WidgetItem widgetItem2 = createWidgetItem(mWidget1, /* spanX= */ 1, /* spanY= */ 2);
         // Dog 2x2
-        WidgetItem widgetItem3 = createWidgetItem(WIDGET_2, /* spanX= */ 2, /* spanY= */ 2);
+        WidgetItem widgetItem3 = createWidgetItem(mWidget2, /* spanX= */ 2, /* spanY= */ 2);
         // Bird 2x2
-        WidgetItem widgetItem4 = createWidgetItem(WIDGET_3, /* spanX= */ 2, /* spanY= */ 2);
+        WidgetItem widgetItem4 = createWidgetItem(mWidget3, /* spanX= */ 2, /* spanY= */ 2);
 
         // WHEN creates a WidgetsListRowEntry with the unsorted widgets.
-        WidgetsListContentEntry widgetsListRowEntry = new WidgetsListContentEntry(PACKAGE_ITEM_INFO,
+        WidgetsListContentEntry widgetsListRowEntry = new WidgetsListContentEntry(mPackageItemInfo,
                 /* titleSectionName= */ "T",
                 List.of(widgetItem1, widgetItem2, widgetItem3, widgetItem4));
 
@@ -155,11 +151,11 @@ public final class WidgetsListContentEntryTest {
                 .containsExactly(widgetItem4, widgetItem2, widgetItem1, widgetItem3)
                 .inOrder();
         assertThat(widgetsListRowEntry.mTitleSectionName).isEqualTo("T");
-        assertThat(widgetsListRowEntry.mPkgItem).isEqualTo(PACKAGE_ITEM_INFO);
+        assertThat(widgetsListRowEntry.mPkgItem).isEqualTo(mPackageItemInfo);
     }
 
     private WidgetItem createWidgetItem(ComponentName componentName, int spanX, int spanY) {
-        String label = WIDGETS_TO_LABELS.get(componentName);
+        String label = mWidgetsToLabels.get(componentName);
         ShadowPackageManager packageManager = shadowOf(mContext.getPackageManager());
         AppWidgetProviderInfo widgetInfo = new AppWidgetProviderInfo();
         widgetInfo.provider = componentName;
-- 
GitLab


From e92bc55d12f173273f5aee725cd5f978f2fc9066 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 10 Feb 2021 17:10:15 +0000
Subject: [PATCH 0520/1664] Make all widgets collapsed in the full widget
 picker by default

Changes:
1. Add a WidgetListHeader view for showing icon, app name and a subtitle.
2. Only WidgetListHeaders are always visible to users in the full widget
   picker.
3. Only one widgets list from an app is visible in the full widget picker
   at any one time.

Test: Auto: run add robolectric tests under widget/picker
      Manual: Open full widgets picker. Then, expand and collapse apps.
      Video: https://drive.google.com/file/d/1gzfeEm5IOAu0qHsO77OTS2eMfU7CHJiL/view?usp=sharing

Bug: 179797520
Change-Id: Idac58be23dfeafcb79b3c61b4972d3addb462de1
---
 res/drawable/ic_expand_less.xml               |  25 ++
 res/drawable/ic_expand_more.xml               |  25 ++
 res/drawable/widgets_tray_expand_button.xml   |  21 ++
 res/layout/widgets_list_row_header.xml        |  71 +++++
 res/values/attrs.xml                          |   4 +
 res/values/strings.xml                        |   5 +
 .../picker/WidgetsDiffReporterTest.java       | 269 ++++++++++++++++++
 .../widget/picker/WidgetsListAdapterTest.java | 113 +++++---
 ...WidgetsListHeaderViewHolderBinderTest.java | 173 +++++++++++
 .../WidgetsListRowViewHolderBinderTest.java   |  13 -
 src/com/android/launcher3/BubbleTextView.java |  28 +-
 .../graphics/PlaceHolderIconDrawable.java     |  32 +++
 .../widget/model/WidgetsListBaseEntry.java    |  24 ++
 .../widget/model/WidgetsListContentEntry.java |   6 +
 .../widget/model/WidgetsListHeaderEntry.java  |  64 +++++
 .../widget/picker/WidgetsDiffReporter.java    |  47 ++-
 .../widget/picker/WidgetsListAdapter.java     |  69 ++++-
 .../widget/picker/WidgetsListHeader.java      | 205 +++++++++++++
 .../picker/WidgetsListHeaderHolder.java       |  32 +++
 .../WidgetsListHeaderViewHolderBinder.java    |  61 ++++
 .../WidgetsListRowViewHolderBinder.java       |   5 +-
 .../widget/picker/WidgetsRowViewHolder.java   |   6 +-
 .../android/launcher3/model/WidgetsModel.java |   7 +-
 .../ui/widget/AddConfigWidgetTest.java        |   5 +-
 .../com/android/launcher3/tapl/Widgets.java   |  72 ++++-
 25 files changed, 1256 insertions(+), 126 deletions(-)
 create mode 100644 res/drawable/ic_expand_less.xml
 create mode 100644 res/drawable/ic_expand_more.xml
 create mode 100644 res/drawable/widgets_tray_expand_button.xml
 create mode 100644 res/layout/widgets_list_row_header.xml
 create mode 100644 robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsDiffReporterTest.java
 create mode 100644 robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java
 create mode 100644 src/com/android/launcher3/widget/model/WidgetsListHeaderEntry.java
 create mode 100644 src/com/android/launcher3/widget/picker/WidgetsListHeader.java
 create mode 100644 src/com/android/launcher3/widget/picker/WidgetsListHeaderHolder.java
 create mode 100644 src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinder.java

diff --git a/res/drawable/ic_expand_less.xml b/res/drawable/ic_expand_less.xml
new file mode 100644
index 0000000000..8360cee487
--- /dev/null
+++ b/res/drawable/ic_expand_less.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/textColorHint">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M18.59,16.41L20,15l-8,-8 -8,8 1.41,1.41L12,9.83"/>
+</vector>
diff --git a/res/drawable/ic_expand_more.xml b/res/drawable/ic_expand_more.xml
new file mode 100644
index 0000000000..49e24f6ba7
--- /dev/null
+++ b/res/drawable/ic_expand_more.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/textColorHint">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M5.41,7.59L4,9l8,8 8,-8 -1.41,-1.41L12,14.17"/>
+</vector>
diff --git a/res/drawable/widgets_tray_expand_button.xml b/res/drawable/widgets_tray_expand_button.xml
new file mode 100644
index 0000000000..8316e0fbe3
--- /dev/null
+++ b/res/drawable/widgets_tray_expand_button.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true"
+        android:drawable="@drawable/ic_expand_less" />
+    <item android:state_checked="false"
+        android:drawable="@drawable/ic_expand_more" />
+</selector>
diff --git a/res/layout/widgets_list_row_header.xml b/res/layout/widgets_list_row_header.xml
new file mode 100644
index 0000000000..faff10c156
--- /dev/null
+++ b/res/layout/widgets_list_row_header.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.launcher3.widget.picker.WidgetsListHeader xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/widgets_list_header"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:paddingVertical="20dp"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/app_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:importantForAccessibility="no"
+        tools:src="@drawable/ic_corp"/>
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:focusable="true"
+        android:descendantFocusability="afterDescendants">
+
+        <TextView
+            android:id="@+id/app_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="16sp"
+            tools:text="App name" />
+
+        <TextView
+            android:id="@+id/app_subtitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="n widgets" />
+
+    </LinearLayout>
+
+    <!-- This checkbox is not clickable. The outermost LinearLayout is responsible to handle all
+         click event and update the checkbox state. -->
+    <CheckBox
+        android:id="@+id/toggle"
+        android:layout_marginHorizontal="16dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_alignParentEnd="true"
+        android:clickable="false"
+        android:button="@drawable/widgets_tray_expand_button"/>
+
+</com.android.launcher3.widget.picker.WidgetsListHeader>
\ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index e593fb497d..b19ea22858 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -185,4 +185,8 @@
         <attr name="android:name" />
         <attr name="android:id" />
     </declare-styleable>
+
+    <declare-styleable name="WidgetsListRowHeader">
+        <attr name="appIconSize" format="dimension" />
+    </declare-styleable>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 447c9ac568..c30019b930 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -54,6 +54,11 @@
     <string name="add_item_request_drag_hint">Touch &amp; hold to place manually</string>
     <!-- Button label to automatically add icon on home screen [CHAR_LIMIT=50] -->
     <string name="place_automatically">Add automatically</string>
+    <!-- Label for showing the number of widgets an app has in the full widgets picker. [CHAR_LIMIT=25] -->
+    <plurals name="widgets_tray_subtitle">
+        <item quantity="one"><xliff:g id="widget_count" example="1">%1$d</xliff:g> widget</item>
+        <item quantity="other"><xliff:g id="widget_count" example="2">%1$d</xliff:g> widgets</item>
+    </plurals>
 
     <!-- All Apps -->
     <!-- Search bar text in the apps view. [CHAR_LIMIT=50] -->
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsDiffReporterTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsDiffReporterTest.java
new file mode 100644
index 0000000000..04797a62fb
--- /dev/null
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsDiffReporterTest.java
@@ -0,0 +1,269 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget.picker;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.appwidget.AppWidgetProviderInfo;
+import android.content.ComponentName;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.os.UserHandle;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.launcher3.InvariantDeviceProfile;
+import com.android.launcher3.LauncherAppWidgetProviderInfo;
+import com.android.launcher3.icons.BitmapInfo;
+import com.android.launcher3.icons.ComponentWithLabel;
+import com.android.launcher3.icons.IconCache;
+import com.android.launcher3.model.WidgetItem;
+import com.android.launcher3.model.data.PackageItemInfo;
+import com.android.launcher3.widget.model.WidgetsListBaseEntry;
+import com.android.launcher3.widget.model.WidgetsListContentEntry;
+import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
+import com.android.launcher3.widget.picker.WidgetsListAdapter.WidgetListBaseRowEntryComparator;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadows.ShadowPackageManager;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+public final class WidgetsDiffReporterTest {
+    private static final String TEST_PACKAGE_PREFIX = "com.google.test";
+    private static final WidgetListBaseRowEntryComparator COMPARATOR =
+            new WidgetListBaseRowEntryComparator();
+
+    @Mock private IconCache mIconCache;
+    @Mock private RecyclerView.Adapter mAdapter;
+
+    private InvariantDeviceProfile mTestProfile;
+    private WidgetsDiffReporter mWidgetsDiffReporter;
+    private Context mContext;
+    private WidgetsListHeaderEntry mHeaderA;
+    private WidgetsListHeaderEntry mHeaderB;
+    private WidgetsListHeaderEntry mHeaderC;
+    private WidgetsListHeaderEntry mHeaderD;
+    private WidgetsListHeaderEntry mHeaderE;
+    private WidgetsListContentEntry mContentC;
+    private WidgetsListContentEntry mContentE;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mTestProfile = new InvariantDeviceProfile();
+        mTestProfile.numRows = 5;
+        mTestProfile.numColumns = 5;
+
+        doAnswer(invocation -> ((ComponentWithLabel) invocation.getArgument(0))
+                .getComponent().getPackageName())
+                .when(mIconCache).getTitleNoCache(any());
+
+        mContext = RuntimeEnvironment.application;
+        mWidgetsDiffReporter = new WidgetsDiffReporter(mIconCache, mAdapter);
+        mHeaderA = createWidgetsHeaderEntry(TEST_PACKAGE_PREFIX + "A",
+                /* appName= */ "A", /* numOfWidgets= */ 3);
+        mHeaderB = createWidgetsHeaderEntry(TEST_PACKAGE_PREFIX + "B",
+                /* appName= */ "B", /* numOfWidgets= */ 3);
+        mHeaderC = createWidgetsHeaderEntry(TEST_PACKAGE_PREFIX + "C",
+                /* appName= */ "C", /* numOfWidgets= */ 3);
+        mContentC = createWidgetsContentEntry(TEST_PACKAGE_PREFIX + "C",
+                /* appName= */ "C", /* numOfWidgets= */ 3);
+        mHeaderD = createWidgetsHeaderEntry(TEST_PACKAGE_PREFIX + "D",
+                /* appName= */ "D", /* numOfWidgets= */ 3);
+        mHeaderE = createWidgetsHeaderEntry(TEST_PACKAGE_PREFIX + "E",
+                /* appName= */ "E", /* numOfWidgets= */ 3);
+        mContentE = createWidgetsContentEntry(TEST_PACKAGE_PREFIX + "E",
+                /* appName= */ "E", /* numOfWidgets= */ 3);
+    }
+
+    @Test
+    public void listNotChanged_shouldNotInvokeAnyCallbacks() {
+        // GIVEN the current list has app headers [A, B, C].
+        ArrayList<WidgetsListBaseEntry> currentList = new ArrayList<>(
+                List.of(mHeaderA, mHeaderB, mHeaderC));
+
+        // WHEN computing the list difference.
+        mWidgetsDiffReporter.process(currentList, currentList, COMPARATOR);
+
+        // THEN there is no adaptor callback.
+        verifyZeroInteractions(mAdapter);
+        // THEN the current list contains the same entries.
+        assertThat(currentList).containsExactly(mHeaderA, mHeaderB, mHeaderC);
+    }
+
+    @Test
+    public void headersOnly_emptyListToNonEmpty_shouldInvokeNotifyDataSetChanged() {
+        // GIVEN the current list has app headers [A, B, C].
+        ArrayList<WidgetsListBaseEntry> currentList = new ArrayList<>();
+
+        List<WidgetsListBaseEntry> newList = List.of(
+                createWidgetsHeaderEntry(TEST_PACKAGE_PREFIX + "A", "A", 3),
+                createWidgetsHeaderEntry(TEST_PACKAGE_PREFIX + "B", "B", 3),
+                createWidgetsHeaderEntry(TEST_PACKAGE_PREFIX + "C", "C", 3));
+
+        // WHEN computing the list difference.
+        mWidgetsDiffReporter.process(currentList, newList, COMPARATOR);
+
+        // THEN notifyDataSetChanged is called
+        verify(mAdapter).notifyDataSetChanged();
+        // THEN the current list contains all elements from the new list.
+        assertThat(currentList).containsExactlyElementsIn(newList);
+    }
+
+    @Test
+    public void headersOnly_nonEmptyToEmptyList_shouldInvokeNotifyDataSetChanged() {
+        // GIVEN the current list has app headers [A, B, C].
+        ArrayList<WidgetsListBaseEntry> currentList = new ArrayList<>(
+                List.of(mHeaderA, mHeaderB, mHeaderC));
+        // GIVEN the new list is empty.
+        List<WidgetsListBaseEntry> newList = List.of();
+
+        // WHEN computing the list difference.
+        mWidgetsDiffReporter.process(currentList, newList, COMPARATOR);
+
+        // THEN notifyDataSetChanged is called.
+        verify(mAdapter).notifyDataSetChanged();
+        // THEN the current list isEmpty.
+        assertThat(currentList).isEmpty();
+    }
+
+    @Test
+    public void headersOnly_itemAddedAndRemovedInTheNewList_shouldInvokeCorrectCallbacks() {
+        // GIVEN the current list has app headers [A, B, D].
+        ArrayList<WidgetsListBaseEntry> currentList = new ArrayList<>(
+                List.of(mHeaderA, mHeaderB, mHeaderD));
+        // GIVEN the new list has app headers [A, C, E].
+        List<WidgetsListBaseEntry> newList = List.of(mHeaderA, mHeaderC, mHeaderE);
+
+        // WHEN computing the list difference.
+        mWidgetsDiffReporter.process(currentList, newList, COMPARATOR);
+
+        // THEN "B" is removed from position 1.
+        verify(mAdapter).notifyItemRemoved(/* position= */ 1);
+        // THEN "D" is removed from position 2.
+        verify(mAdapter).notifyItemRemoved(/* position= */ 2);
+        // THEN "C" is inserted at position 1.
+        verify(mAdapter).notifyItemInserted(/* position= */ 1);
+        // THEN "E" is inserted at position 2.
+        verify(mAdapter).notifyItemInserted(/* position= */ 2);
+        // THEN the current list contains all elements from the new list.
+        assertThat(currentList).containsExactlyElementsIn(newList);
+    }
+
+    @Test
+    public void headersContentsMix_itemAddedAndRemovedInTheNewList_shouldInvokeCorrectCallbacks() {
+        // GIVEN the current list has app headers [A, B, E content].
+        ArrayList<WidgetsListBaseEntry> currentList = new ArrayList<>(
+                List.of(mHeaderA, mHeaderB, mContentE));
+        // GIVEN the new list has app headers [A, C content, D].
+        List<WidgetsListBaseEntry> newList = List.of(mHeaderA, mContentC, mHeaderD);
+
+        // WHEN computing the list difference.
+        mWidgetsDiffReporter.process(currentList, newList, COMPARATOR);
+
+        // THEN "B" is removed from position 1.
+        verify(mAdapter).notifyItemRemoved(/* position= */ 1);
+        // THEN "C content" is inserted at position 1.
+        verify(mAdapter).notifyItemInserted(/* position= */ 1);
+        // THEN "D" is inserted at position 2.
+        verify(mAdapter).notifyItemInserted(/* position= */ 2);
+        // THEN "E content" is removed from position 3.
+        verify(mAdapter).notifyItemRemoved(/* position= */ 3);
+        // THEN the current list contains all elements from the new list.
+        assertThat(currentList).containsExactlyElementsIn(newList);
+    }
+
+    @Test
+    public void headersContentsMix_userInteractWithHeader_shouldInvokeCorrectCallbacks() {
+        // GIVEN the current list has app headers [A, B, E content].
+        ArrayList<WidgetsListBaseEntry> currentList = new ArrayList<>(
+                List.of(mHeaderA, mHeaderB, mContentE));
+        // GIVEN the new list has app headers [A, B, E content].
+        List<WidgetsListBaseEntry> newList = List.of(mHeaderA, mHeaderB, mContentE);
+        // GIVEN the user has interacted with B.
+        mHeaderB.setIsWidgetListShown(true);
+
+        // WHEN computing the list difference.
+        mWidgetsDiffReporter.process(currentList, newList, COMPARATOR);
+
+        // THEN notify "B" has been changed.
+        verify(mAdapter).notifyItemChanged(/* position= */ 1);
+        // THEN the current list contains all elements from the new list.
+        assertThat(currentList).containsExactlyElementsIn(newList);
+    }
+
+
+    private WidgetsListHeaderEntry createWidgetsHeaderEntry(String packageName, String appName,
+            int numOfWidgets) {
+        List<WidgetItem> widgetItems = generateWidgetItems(packageName, numOfWidgets);
+        PackageItemInfo pInfo = createPackageItemInfo(packageName, appName,
+                widgetItems.get(0).user);
+
+        return new WidgetsListHeaderEntry(pInfo, /* titleSectionName= */ "", widgetItems);
+    }
+
+    private WidgetsListContentEntry createWidgetsContentEntry(String packageName, String appName,
+            int numOfWidgets) {
+        List<WidgetItem> widgetItems = generateWidgetItems(packageName, numOfWidgets);
+        PackageItemInfo pInfo = createPackageItemInfo(packageName, appName,
+                widgetItems.get(0).user);
+
+        return new WidgetsListContentEntry(pInfo, /* titleSectionName= */ "", widgetItems);
+    }
+
+    private PackageItemInfo createPackageItemInfo(String packageName, String appName,
+            UserHandle userHandle) {
+        PackageItemInfo pInfo = new PackageItemInfo(packageName);
+        pInfo.title = appName;
+        pInfo.user = userHandle;
+        pInfo.bitmap = BitmapInfo.of(Bitmap.createBitmap(10, 10, Bitmap.Config.ALPHA_8), 0);
+        return pInfo;
+    }
+
+    private List<WidgetItem> generateWidgetItems(String packageName, int numOfWidgets) {
+        ShadowPackageManager packageManager = shadowOf(mContext.getPackageManager());
+        ArrayList<WidgetItem> widgetItems = new ArrayList<>();
+        for (int i = 0; i < numOfWidgets; i++) {
+            ComponentName cn = ComponentName.createRelative(packageName, ".SampleWidget" + i);
+            AppWidgetProviderInfo widgetInfo = new AppWidgetProviderInfo();
+            widgetInfo.provider = cn;
+            ReflectionHelpers.setField(widgetInfo, "providerInfo",
+                    packageManager.addReceiverIfNotPresent(cn));
+
+            WidgetItem widgetItem = new WidgetItem(
+                    LauncherAppWidgetProviderInfo.fromProviderInfo(mContext, widgetInfo),
+                    mTestProfile, mIconCache);
+            widgetItems.add(widgetItem);
+        }
+        return widgetItems;
+    }
+}
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java
index 9bea2fb406..e94b2532b9 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java
@@ -40,11 +40,13 @@ import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 import com.android.launcher3.widget.model.WidgetsListContentEntry;
+import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
@@ -56,9 +58,7 @@ import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
 public final class WidgetsListAdapterTest {
-
-    private static final String TEST_PACKAGE_1 = "com.google.test.1";
-    private static final String TEST_PACKAGE_2 = "com.google.test.2";
+    private static final String TEST_PACKAGE_PLACEHOLDER = "com.google.test";
 
     @Mock private LayoutInflater mMockLayoutInflater;
     @Mock private WidgetPreviewLoader mMockWidgetCache;
@@ -117,37 +117,76 @@ public final class WidgetsListAdapterTest {
     }
 
     @Test
-    public void setWidgets_sameApp_moreWidgets_shouldNotifyItemChangedWithWidgetItemInfoDiff() {
-        // GIVEN the adapter was first populated with test package 1 & test package 2.
-        WidgetsListBaseEntry testPackage1With2WidgetsListEntry =
-                generateSampleAppWithWidgets(TEST_PACKAGE_1, /* numOfWidgets= */ 2);
-        WidgetsListBaseEntry testPackage2With2WidgetsListEntry =
-                generateSampleAppWithWidgets(TEST_PACKAGE_2, /* numOfWidgets= */ 2);
-        mAdapter.setWidgets(
-                List.of(testPackage1With2WidgetsListEntry, testPackage2With2WidgetsListEntry));
-
-        // WHEN the adapter is updated with the same list of apps but test package 2 has 3 widgets
-        // now.
-        WidgetsListBaseEntry testPackage1With3WidgetsListEntry =
-                generateSampleAppWithWidgets(TEST_PACKAGE_2, /* numOfWidgets= */ 2);
-        mAdapter.setWidgets(
-                List.of(testPackage1With2WidgetsListEntry, testPackage1With3WidgetsListEntry));
+    public void headerClick_expanded_shouldNotifyItemChange() {
+        // GIVEN a list of widgets entries:
+        // [com.google.test0, com.google.test0 content,
+        //  com.google.test1, com.google.test1 content,
+        //  com.google.test2, com.google.test2 content]
+        // The visible widgets entries: [com.google.test0, com.google.test1, com.google.test2].
+        mAdapter.setWidgets(generateSampleMap(3));
+
+        // WHEN com.google.test.1 header is expanded.
+        mAdapter.onHeaderClicked(/* isExpanded= */ true, TEST_PACKAGE_PLACEHOLDER + 1);
+
+        // THEN the visible entries list becomes:
+        // [com.google.test0, com.google.test1, com.google.test1 content, com.google.test2]
+        // com.google.test.1 content is inserted into position 2.
+        verify(mListener).onItemRangeInserted(eq(2), eq(1));
+    }
 
-        // THEN the onItemRangeChanged is invoked.
-        verify(mListener).onItemRangeChanged(eq(1), eq(1), isNull());
+    @Test
+    public void setWidgets_expandedApp_moreWidgets_shouldNotifyItemChangedWithWidgetItemInfoDiff() {
+        // GIVEN the adapter was first populated with com.google.test0 & com.google.test1. Each app
+        // has one widget.
+        ArrayList<WidgetsListBaseEntry> allEntries = generateSampleMap(2);
+        mAdapter.setWidgets(allEntries);
+        // GIVEN test com.google.test1 is expanded.
+        // Visible entries in the adapter are:
+        // [com.google.test0, com.google.test1, com.google.test1 content]
+        mAdapter.onHeaderClicked(/* isExpanded= */ true, TEST_PACKAGE_PLACEHOLDER + 1);
+        Mockito.reset(mListener);
+
+        // WHEN the adapter is updated with the same list of apps but com.google.test1 has 2 widgets
+        // now.
+        WidgetsListContentEntry testPackage1ContentEntry =
+                (WidgetsListContentEntry) allEntries.get(3);
+        WidgetItem widgetItem = testPackage1ContentEntry.mWidgets.get(0);
+        WidgetsListContentEntry newTestPackage1ContentEntry = new WidgetsListContentEntry(
+                testPackage1ContentEntry.mPkgItem,
+                testPackage1ContentEntry.mTitleSectionName, List.of(widgetItem, widgetItem));
+        allEntries.set(3, newTestPackage1ContentEntry);
+        mAdapter.setWidgets(allEntries);
+
+        // THEN the onItemRangeChanged is invoked for "com.google.test1 content" at index 2.
+        verify(mListener).onItemRangeChanged(eq(2), eq(1), isNull());
     }
 
     @Test
     public void setWidgets_hodgepodge_shouldInvokeExpectedDataObserverCallbacks() {
+        // GIVEN a widgets entry list:
+        // Index:  0|   1      | 2|      3   | 4|     5    | 6|     7    | 8|     9    |
+        //        [A, A content, B, B content, C, C content, D, D content, E, E content]
         List<WidgetsListBaseEntry> allAppsWithWidgets = generateSampleMap(5);
-        // GIVEN the current widgets list consist of [A, B, E].
+        // GIVEN the current widgets list consist of [A, A content, B, B content, E, E content].
+        // GIVEN the visible widgets list consist of [A, B, E]
         List<WidgetsListBaseEntry> currentList = List.of(
-                allAppsWithWidgets.get(0), allAppsWithWidgets.get(1), allAppsWithWidgets.get(4));
+                // A & A content
+                allAppsWithWidgets.get(0), allAppsWithWidgets.get(1),
+                // B & B content
+                allAppsWithWidgets.get(2), allAppsWithWidgets.get(3),
+                // E & E content
+                allAppsWithWidgets.get(8), allAppsWithWidgets.get(9));
         mAdapter.setWidgets(currentList);
 
-        // WHEN the widgets list is updated to [A, C, D].
+        // WHEN the widgets list is updated to [A, A content, C, C content, D, D content].
+        // WHEN the visible widgets list is updated to [A, C, D].
         List<WidgetsListBaseEntry> newList = List.of(
-                allAppsWithWidgets.get(0), allAppsWithWidgets.get(2), allAppsWithWidgets.get(3));
+                // A & A content
+                allAppsWithWidgets.get(0), allAppsWithWidgets.get(1),
+                // C & C content
+                allAppsWithWidgets.get(4), allAppsWithWidgets.get(5),
+                // D & D content
+                allAppsWithWidgets.get(6), allAppsWithWidgets.get(7));
         mAdapter.setWidgets(newList);
 
         // Computation logic                           | [Intermediate list during computation]
@@ -162,15 +201,23 @@ public final class WidgetsListAdapterTest {
     }
 
     /**
-     * Helper method to generate the sample widget model map that can be used for the tests
-     * @param num the number of WidgetItem the map should contain
+     * Generates a list of sample widget entries.
+     *
+     * <p>Each sample app has 1 widget only. An app is represented by 2 entries,
+     * {@link WidgetsListHeaderEntry} & {@link WidgetsListContentEntry}. Only
+     * {@link WidgetsListHeaderEntry} is always visible in the {@link WidgetsListAdapter}.
+     * {@link WidgetsListContentEntry} is only shown upon clicking the corresponding app's
+     * {@link WidgetsListHeaderEntry}. Only at most one {@link WidgetsListContentEntry} is shown at
+     * a time.
+     *
+     * @param num the number of apps that have widgets.
      */
     private ArrayList<WidgetsListBaseEntry> generateSampleMap(int num) {
         ArrayList<WidgetsListBaseEntry> result = new ArrayList<>();
         if (num <= 0) return result;
 
         for (int i = 0; i < num; i++) {
-            String packageName = "com.placeholder.apk" + i;
+            String packageName = TEST_PACKAGE_PLACEHOLDER + i;
 
             List<WidgetItem> widgetItems = generateWidgetItems(packageName, /* numOfWidgets= */ 1);
 
@@ -179,23 +226,13 @@ public final class WidgetsListAdapterTest {
             pInfo.user = widgetItems.get(0).user;
             pInfo.bitmap = BitmapInfo.of(Bitmap.createBitmap(10, 10, Bitmap.Config.ALPHA_8), 0);
 
+            result.add(new WidgetsListHeaderEntry(pInfo, /* titleSectionName= */ "", widgetItems));
             result.add(new WidgetsListContentEntry(pInfo, /* titleSectionName= */ "", widgetItems));
         }
 
         return result;
     }
 
-    private WidgetsListBaseEntry generateSampleAppWithWidgets(String packageName,
-            int numOfWidgets) {
-        PackageItemInfo appInfo = new PackageItemInfo(packageName);
-        appInfo.title = appInfo.packageName;
-        appInfo.bitmap = BitmapInfo.of(Bitmap.createBitmap(10, 10, Bitmap.Config.ALPHA_8), 0);
-
-        return new WidgetsListContentEntry(appInfo,
-                /* titleSectionName= */ "",
-                generateWidgetItems(packageName, numOfWidgets));
-    }
-
     private List<WidgetItem> generateWidgetItems(String packageName, int numOfWidgets) {
         ShadowPackageManager packageManager = shadowOf(mContext.getPackageManager());
         ArrayList<WidgetItem> widgetItems = new ArrayList<>();
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java
new file mode 100644
index 0000000000..ae5b9a50b7
--- /dev/null
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget.picker;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.appwidget.AppWidgetProviderInfo;
+import android.content.ComponentName;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.InvariantDeviceProfile;
+import com.android.launcher3.LauncherAppWidgetProviderInfo;
+import com.android.launcher3.R;
+import com.android.launcher3.icons.BitmapInfo;
+import com.android.launcher3.icons.ComponentWithLabel;
+import com.android.launcher3.icons.IconCache;
+import com.android.launcher3.model.WidgetItem;
+import com.android.launcher3.model.data.PackageItemInfo;
+import com.android.launcher3.testing.TestActivity;
+import com.android.launcher3.widget.WidgetCell;
+import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
+import com.android.launcher3.widget.picker.WidgetsListHeaderViewHolderBinder.OnHeaderClickListener;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.android.controller.ActivityController;
+import org.robolectric.shadows.ShadowPackageManager;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+public final class WidgetsListHeaderViewHolderBinderTest {
+    private static final String TEST_PACKAGE = "com.google.test";
+    private static final String APP_NAME = "Test app";
+
+    private Context mContext;
+    private WidgetsListHeaderViewHolderBinder mViewHolderBinder;
+    private InvariantDeviceProfile mTestProfile;
+    // Replace ActivityController with ActivityScenario, which is the recommended way for activity
+    // testing.
+    private ActivityController<TestActivity> mActivityController;
+    private TestActivity mTestActivity;
+    private FakeOnHeaderClickListener mFakeOnHeaderClickListener = new FakeOnHeaderClickListener();
+
+    @Mock
+    private IconCache mIconCache;
+    @Mock
+    private DeviceProfile mDeviceProfile;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mTestProfile = new InvariantDeviceProfile();
+        mTestProfile.numRows = 5;
+        mTestProfile.numColumns = 5;
+
+        mActivityController = Robolectric.buildActivity(TestActivity.class);
+        mTestActivity = mActivityController.setup().get();
+        mTestActivity.setDeviceProfile(mDeviceProfile);
+
+        doAnswer(invocation -> {
+            ComponentWithLabel componentWithLabel = (ComponentWithLabel) invocation.getArgument(0);
+            return componentWithLabel.getComponent().getShortClassName();
+        }).when(mIconCache).getTitleNoCache(any());
+
+        mViewHolderBinder = new WidgetsListHeaderViewHolderBinder(
+                LayoutInflater.from(mTestActivity),
+                mFakeOnHeaderClickListener);
+    }
+
+    @After
+    public void tearDown() {
+        mActivityController.destroy();
+    }
+
+    @Test
+    public void bindViewHolder_appWith3Widgets_shouldShowTheCorrectAppNameAndSubtitle() {
+        WidgetsListHeaderHolder viewHolder = mViewHolderBinder.newViewHolder(
+                new FrameLayout(mTestActivity));
+        WidgetsListHeader widgetsListHeader = viewHolder.mWidgetsListHeader;
+        WidgetsListHeaderEntry entry = generateSampleAppHeader(
+                APP_NAME,
+                TEST_PACKAGE,
+                /* numOfWidgets= */ 3);
+        mViewHolderBinder.bindViewHolder(viewHolder, entry);
+
+        TextView appTitle = widgetsListHeader.findViewById(R.id.app_title);
+        TextView appSubtitle = widgetsListHeader.findViewById(R.id.app_subtitle);
+        assertThat(appTitle.getText()).isEqualTo(APP_NAME);
+        assertThat(appSubtitle.getText()).isEqualTo("3 widgets");
+    }
+
+    private WidgetsListHeaderEntry generateSampleAppHeader(String appName, String packageName,
+            int numOfWidgets) {
+        PackageItemInfo appInfo = new PackageItemInfo(packageName);
+        appInfo.title = appName;
+        appInfo.bitmap = BitmapInfo.of(Bitmap.createBitmap(10, 10, Bitmap.Config.ALPHA_8), 0);
+
+        return new WidgetsListHeaderEntry(appInfo,
+                /* titleSectionName= */ "",
+                generateWidgetItems(packageName, numOfWidgets));
+    }
+
+    private List<WidgetItem> generateWidgetItems(String packageName, int numOfWidgets) {
+        ShadowPackageManager packageManager = shadowOf(mContext.getPackageManager());
+        ArrayList<WidgetItem> widgetItems = new ArrayList<>();
+        for (int i = 0; i < numOfWidgets; i++) {
+            ComponentName cn = ComponentName.createRelative(packageName, ".SampleWidget" + i);
+            AppWidgetProviderInfo widgetInfo = new AppWidgetProviderInfo();
+            widgetInfo.provider = cn;
+            ReflectionHelpers.setField(widgetInfo, "providerInfo",
+                    packageManager.addReceiverIfNotPresent(cn));
+
+            widgetItems.add(new WidgetItem(
+                    LauncherAppWidgetProviderInfo.fromProviderInfo(mContext, widgetInfo),
+                    mTestProfile, mIconCache));
+        }
+        return widgetItems;
+    }
+
+    private void assertWidgetCellWithLabel(View view, String label) {
+        assertThat(view).isInstanceOf(WidgetCell.class);
+        TextView widgetLabel = (TextView) view.findViewById(R.id.widget_name);
+        assertThat(widgetLabel.getText()).isEqualTo(label);
+    }
+
+    private final class FakeOnHeaderClickListener implements OnHeaderClickListener {
+
+        boolean mShowWidgets = false;
+        @Nullable  String mHeaderClickedPackage = null;
+
+        @Override
+        public void onHeaderClicked(boolean showWidgets, String packageName) {
+            mShowWidgets = showWidgets;
+            mHeaderClickedPackage = packageName;
+        }
+    }
+}
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListRowViewHolderBinderTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListRowViewHolderBinderTest.java
index 4e9e227a52..ec9fde321c 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListRowViewHolderBinderTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListRowViewHolderBinderTest.java
@@ -118,19 +118,6 @@ public final class WidgetsListRowViewHolderBinderTest {
         mActivityController.destroy();
     }
 
-    @Test
-    public void bindViewHolder_appWith3Widgets_shouldMatchAppTitle() {
-        WidgetsRowViewHolder viewHolder = mViewHolderBinder.newViewHolder(
-                new FrameLayout(mTestActivity));
-        WidgetsListContentEntry entry = generateSampleAppWithWidgets(
-                APP_NAME,
-                TEST_PACKAGE,
-                /* numOfWidgets= */ 3);
-        mViewHolderBinder.bindViewHolder(viewHolder, entry);
-
-        assertThat(viewHolder.title.getText()).isEqualTo(APP_NAME);
-    }
-
     @Test
     public void bindViewHolder_appWith3Widgets_shouldHave3Widgets() {
         WidgetsRowViewHolder viewHolder = mViewHolderBinder.newViewHolder(
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 21297c9f05..cea8cd61b0 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -24,7 +24,6 @@ import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
-import android.animation.ValueAnimator;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
@@ -34,8 +33,6 @@ import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.PointF;
-import android.graphics.PorterDuff.Mode;
-import android.graphics.PorterDuffColorFilter;
 import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
@@ -52,7 +49,6 @@ import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
-import androidx.core.graphics.ColorUtils;
 
 import com.android.launcher3.Launcher.OnResumeCallback;
 import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
@@ -798,7 +794,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         if (mIcon != null
                 && mIcon instanceof PlaceHolderIconDrawable
                 && iconUpdateAnimationEnabled()) {
-            animateIconUpdate((PlaceHolderIconDrawable) mIcon, icon);
+            ((PlaceHolderIconDrawable) mIcon).animateIconUpdate(icon);
         }
 
         mDisableRelayout = false;
@@ -950,28 +946,6 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         }
     }
 
-    private static void animateIconUpdate(PlaceHolderIconDrawable oldIcon, Drawable newIcon) {
-        int placeholderColor = oldIcon.mPaint.getColor();
-        int originalAlpha = Color.alpha(placeholderColor);
-
-        ValueAnimator iconUpdateAnimation = ValueAnimator.ofInt(originalAlpha, 0);
-        iconUpdateAnimation.setDuration(ICON_UPDATE_ANIMATION_DURATION);
-        iconUpdateAnimation.addUpdateListener(valueAnimator -> {
-            int newAlpha = (int) valueAnimator.getAnimatedValue();
-            int newColor = ColorUtils.setAlphaComponent(placeholderColor, newAlpha);
-
-            newIcon.setColorFilter(new PorterDuffColorFilter(newColor, Mode.SRC_ATOP));
-        });
-        iconUpdateAnimation.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                newIcon.setColorFilter(null);
-            }
-        });
-        iconUpdateAnimation.start();
-    }
-
-
     @Override
     public void decorate(int color) {
         mHighlightColor = color;
diff --git a/src/com/android/launcher3/graphics/PlaceHolderIconDrawable.java b/src/com/android/launcher3/graphics/PlaceHolderIconDrawable.java
index d347e8fdeb..b6d25c4de3 100644
--- a/src/com/android/launcher3/graphics/PlaceHolderIconDrawable.java
+++ b/src/com/android/launcher3/graphics/PlaceHolderIconDrawable.java
@@ -19,10 +19,19 @@ import static androidx.core.graphics.ColorUtils.compositeColors;
 
 import static com.android.launcher3.graphics.IconShape.getShapePath;
 
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.ValueAnimator;
 import android.content.Context;
 import android.graphics.Canvas;
+import android.graphics.Color;
 import android.graphics.Path;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
 import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+
+import androidx.core.graphics.ColorUtils;
 
 import com.android.launcher3.FastBitmapDrawable;
 import com.android.launcher3.R;
@@ -53,4 +62,27 @@ public class PlaceHolderIconDrawable extends FastBitmapDrawable {
         canvas.drawPath(mProgressPath, mPaint);
         canvas.restoreToCount(saveCount);
     }
+
+    /** Updates this placeholder to {@code newIcon} with animation. */
+    public void animateIconUpdate(Drawable newIcon) {
+        int placeholderColor = mPaint.getColor();
+        int originalAlpha = Color.alpha(placeholderColor);
+
+        ValueAnimator iconUpdateAnimation = ValueAnimator.ofInt(originalAlpha, 0);
+        iconUpdateAnimation.setDuration(375);
+        iconUpdateAnimation.addUpdateListener(valueAnimator -> {
+            int newAlpha = (int) valueAnimator.getAnimatedValue();
+            int newColor = ColorUtils.setAlphaComponent(placeholderColor, newAlpha);
+
+            newIcon.setColorFilter(new PorterDuffColorFilter(newColor, PorterDuff.Mode.SRC_ATOP));
+        });
+        iconUpdateAnimation.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                newIcon.setColorFilter(null);
+            }
+        });
+        iconUpdateAnimation.start();
+    }
+
 }
diff --git a/src/com/android/launcher3/widget/model/WidgetsListBaseEntry.java b/src/com/android/launcher3/widget/model/WidgetsListBaseEntry.java
index 10ea7dbc5d..09517e1cfb 100644
--- a/src/com/android/launcher3/widget/model/WidgetsListBaseEntry.java
+++ b/src/com/android/launcher3/widget/model/WidgetsListBaseEntry.java
@@ -16,9 +16,15 @@
 
 package com.android.launcher3.widget.model;
 
+import static java.lang.annotation.RetentionPolicy.SOURCE;
+
+import androidx.annotation.IntDef;
+
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.PackageItemInfo;
 
+import java.lang.annotation.Retention;
+
 /** Holder class to store the package information of an entry shown in the widgets list. */
 public abstract class WidgetsListBaseEntry {
     public final PackageItemInfo mPkgItem;
@@ -33,4 +39,22 @@ public abstract class WidgetsListBaseEntry {
         mPkgItem = pkgItem;
         mTitleSectionName = titleSectionName;
     }
+
+    /**
+     * Returns the ranking of this entry in the
+     * {@link com.android.launcher3.widget.picker.WidgetsListAdapter}.
+     *
+     * <p>Entries with smaller value should be shown first. See
+     * {@link com.android.launcher3.widget.picker.WidgetsDiffReporter} for more details.
+     */
+    @Rank
+    public abstract int getRank();
+
+    @Retention(SOURCE)
+    @IntDef({RANK_WIDGETS_LIST_HEADER, RANK_WIDGETS_LIST_CONTENT})
+    public @interface Rank {
+    }
+
+    public static final int RANK_WIDGETS_LIST_HEADER = 1;
+    public static final int RANK_WIDGETS_LIST_CONTENT = 2;
 }
diff --git a/src/com/android/launcher3/widget/model/WidgetsListContentEntry.java b/src/com/android/launcher3/widget/model/WidgetsListContentEntry.java
index 407f194cc3..b0cb8c7455 100644
--- a/src/com/android/launcher3/widget/model/WidgetsListContentEntry.java
+++ b/src/com/android/launcher3/widget/model/WidgetsListContentEntry.java
@@ -41,4 +41,10 @@ public final class WidgetsListContentEntry extends WidgetsListBaseEntry {
     public String toString() {
         return mPkgItem.packageName + ":" + mWidgets.size();
     }
+
+    @Override
+    @Rank
+    public int getRank() {
+        return RANK_WIDGETS_LIST_CONTENT;
+    }
 }
diff --git a/src/com/android/launcher3/widget/model/WidgetsListHeaderEntry.java b/src/com/android/launcher3/widget/model/WidgetsListHeaderEntry.java
new file mode 100644
index 0000000000..6899647764
--- /dev/null
+++ b/src/com/android/launcher3/widget/model/WidgetsListHeaderEntry.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget.model;
+
+import com.android.launcher3.model.WidgetItem;
+import com.android.launcher3.model.data.PackageItemInfo;
+
+import java.util.Collection;
+
+/** An information holder for an app which has widgets or/and shortcuts. */
+public final class WidgetsListHeaderEntry extends WidgetsListBaseEntry {
+
+    public final int widgetsCount;
+    public final int shortcutsCount;
+
+    private boolean mIsWidgetListShown = false;
+    private boolean mHasEntryUpdated = false;
+
+    public WidgetsListHeaderEntry(PackageItemInfo pkgItem, String titleSectionName,
+            Collection<WidgetItem> items) {
+        super(pkgItem, titleSectionName);
+        widgetsCount = (int) items.stream().filter(item -> item.widgetInfo != null).count();
+        shortcutsCount = Math.max(0, items.size() - widgetsCount);
+    }
+
+    /** Sets if the widgets list associated with this header is shown. */
+    public void setIsWidgetListShown(boolean isWidgetListShown) {
+        if (mIsWidgetListShown != isWidgetListShown) {
+            this.mIsWidgetListShown = isWidgetListShown;
+            mHasEntryUpdated = true;
+        } else {
+            mHasEntryUpdated = false;
+        }
+    }
+
+    /** Returns {@code true} if the widgets list associated with this header is shown. */
+    public boolean isWidgetListShown() {
+        return mIsWidgetListShown;
+    }
+
+    /** Returns {@code true} if this entry has been updated due to user interactions. */
+    public boolean hasEntryUpdated() {
+        return mHasEntryUpdated;
+    }
+
+    @Override
+    @Rank
+    public int getRank() {
+        return RANK_WIDGETS_LIST_HEADER;
+    }
+}
diff --git a/src/com/android/launcher3/widget/picker/WidgetsDiffReporter.java b/src/com/android/launcher3/widget/picker/WidgetsDiffReporter.java
index 398d9ba448..dbd1bdf523 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsDiffReporter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsDiffReporter.java
@@ -24,10 +24,12 @@ import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 import com.android.launcher3.widget.model.WidgetsListContentEntry;
+import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
 import com.android.launcher3.widget.picker.WidgetsListAdapter.WidgetListBaseRowEntryComparator;
 
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.List;
 
 /**
  * Do diff on widget's tray list items and call the {@link RecyclerView.Adapter}
@@ -50,7 +52,7 @@ public class WidgetsDiffReporter {
      * relevant {@link androidx.recyclerview.widget.RecyclerView.RecyclerViewDataObserver} methods.
      */
     public void process(ArrayList<WidgetsListBaseEntry> currentEntries,
-            ArrayList<WidgetsListBaseEntry> newEntries,
+            List<WidgetsListBaseEntry> newEntries,
             WidgetListBaseRowEntryComparator comparator) {
         if (DEBUG) {
             Log.d(TAG, "process oldEntries#=" + currentEntries.size()
@@ -78,7 +80,7 @@ public class WidgetsDiffReporter {
         WidgetsListBaseEntry newRowEntry = newIter.next();
 
         do {
-            int diff = comparePackageName(orgRowEntry, newRowEntry, comparator);
+            int diff = compareAppNameAndType(orgRowEntry, newRowEntry, comparator);
             if (DEBUG) {
                 Log.d(TAG, String.format("diff=%d orgRowEntry (%s) newRowEntry (%s)",
                         diff, orgRowEntry != null ? orgRowEntry.toString() : null,
@@ -106,11 +108,13 @@ public class WidgetsDiffReporter {
                 mListener.notifyItemInserted(index);
 
             } else {
-                // same package name but,
+                // same app name & type but,
                 // did the icon, title, etc, change?
+                // or did the header view changed due to user interactions?
                 // or did the widget size and desc, span, etc change?
                 if (!isSamePackageItemInfo(orgRowEntry.mPkgItem, newRowEntry.mPkgItem)
-                        || !areWidgetsEqual(orgRowEntry, newRowEntry)) {
+                        || hasHeaderUpdated(newRowEntry)
+                        || hasWidgetsListChanged(orgRowEntry, newRowEntry)) {
                     index = currentEntries.indexOf(orgRowEntry);
                     currentEntries.set(index, newRowEntry);
                     mListener.notifyItemChanged(index);
@@ -126,10 +130,13 @@ public class WidgetsDiffReporter {
     }
 
     /**
-     * Compare package name using the same comparator as in {@link WidgetsListAdapter}.
-     * Also handle null row pointers.
+     * Compares the app name and then entry type for the given {@link WidgetsListBaseEntry}s.
+     *
+     * @Return 0 if both entries' order is the same. Negative integer if {@code newRowEntry} should
+     *         order before {@code orgRowEntry}. Positive integer if {@code orgRowEntry} should
+     *         order before {@code newRowEntry}.
      */
-    private int comparePackageName(WidgetsListBaseEntry curRow, WidgetsListBaseEntry newRow,
+    private int compareAppNameAndType(WidgetsListBaseEntry curRow, WidgetsListBaseEntry newRow,
             WidgetListBaseRowEntryComparator comparator) {
         if (curRow == null && newRow == null) {
             throw new IllegalStateException(
@@ -141,10 +148,18 @@ public class WidgetsDiffReporter {
         } else if (curRow != null && newRow == null) {
             return -1; // old row needs to be deleted
         }
-        return comparator.compare(curRow, newRow);
+        int diff = comparator.compare(curRow, newRow);
+        if (diff == 0) {
+            return newRow.getRank() - curRow.getRank();
+        }
+        return diff;
     }
 
-    private boolean areWidgetsEqual(WidgetsListBaseEntry curRow,
+    /**
+     * Returns {@code true} if both {@code curRow} & {@code newRow} are
+     * {@link WidgetsListContentEntry}s with a different list of widgets.
+     */
+    private boolean hasWidgetsListChanged(WidgetsListBaseEntry curRow,
             WidgetsListBaseEntry newRow) {
         if (!(curRow instanceof WidgetsListContentEntry)
                 || !(newRow instanceof WidgetsListContentEntry)) {
@@ -152,7 +167,19 @@ public class WidgetsDiffReporter {
         }
         WidgetsListContentEntry orgRowEntry = (WidgetsListContentEntry) curRow;
         WidgetsListContentEntry newRowEntry = (WidgetsListContentEntry) newRow;
-        return orgRowEntry.mWidgets.equals(newRowEntry.mWidgets);
+        return !orgRowEntry.mWidgets.equals(newRowEntry.mWidgets);
+    }
+
+    /**
+     * Returns {@code true} if {@code newRow} is {@link WidgetsListHeaderEntry} and its content has
+     * been changed due to user interactions.
+     */
+    private boolean hasHeaderUpdated(WidgetsListBaseEntry newRow) {
+        if (!(newRow instanceof WidgetsListHeaderEntry)) {
+            return false;
+        }
+        WidgetsListHeaderEntry newRowEntry = (WidgetsListHeaderEntry) newRow;
+        return newRowEntry.hasEntryUpdated();
     }
 
     private boolean isSamePackageItemInfo(PackageItemInfo curInfo, PackageItemInfo newInfo) {
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
index 9d308423e6..5ec7f3b063 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
@@ -24,6 +24,7 @@ import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
 import android.view.ViewGroup;
 
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.Adapter;
 import androidx.recyclerview.widget.RecyclerView.ViewHolder;
@@ -36,32 +37,42 @@ import com.android.launcher3.util.LabelComparator;
 import com.android.launcher3.widget.WidgetCell;
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 import com.android.launcher3.widget.model.WidgetsListContentEntry;
+import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
+import com.android.launcher3.widget.picker.WidgetsListHeaderViewHolderBinder.OnHeaderClickListener;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
- * List view adapter for the widget tray.
+ * Recycler view adapter for the widget tray.
  *
- * <p>Memory vs. Performance:
- * The less number of types of views are inserted into a {@link RecyclerView}, the more recycling
- * happens and less memory is consumed.
+ * <p>This adapter supports view binding of subclasses of {@link WidgetsListBaseEntry}. There are 2
+ * subclasses: {@link WidgetsListHeader} & {@link WidgetsListContentEntry}.
+ * {@link WidgetsListHeader} entries are always visible in the recycler view. At most one
+ * {@link WidgetsListContentEntry} is shown in the recycler view at any time. Clicking a
+ * {@link WidgetsListHeader} will result in expanding / collapsing a corresponding
+ * {@link WidgetsListContentEntry} of the same app.
  */
-public class WidgetsListAdapter extends Adapter<ViewHolder> {
+public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderClickListener {
 
     private static final String TAG = "WidgetsListAdapter";
     private static final boolean DEBUG = false;
 
     /** Uniquely identifies widgets list view type within the app. */
     private static final int VIEW_TYPE_WIDGETS_LIST = R.layout.widgets_list_row_view;
+    private static final int VIEW_TYPE_WIDGETS_HEADER = R.layout.widgets_list_row_header;
 
     private final WidgetsDiffReporter mDiffReporter;
     private final SparseArray<ViewHolderBinder> mViewHolderBinders = new SparseArray<>();
     private final WidgetsListRowViewHolderBinder mWidgetsListRowViewHolderBinder;
+    private final WidgetListBaseRowEntryComparator mRowComparator =
+            new WidgetListBaseRowEntryComparator();
 
-    private ArrayList<WidgetsListBaseEntry> mEntries = new ArrayList<>();
+    private List<WidgetsListBaseEntry> mAllEntries = new ArrayList<>();
+    private ArrayList<WidgetsListBaseEntry> mVisibleEntries = new ArrayList<>();
+    @Nullable private String mWidgetsContentVisiblePackage = null;
 
     public WidgetsListAdapter(Context context, LayoutInflater layoutInflater,
             WidgetPreviewLoader widgetPreviewLoader, IconCache iconCache,
@@ -70,6 +81,8 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> {
         mWidgetsListRowViewHolderBinder = new WidgetsListRowViewHolderBinder(context,
                 layoutInflater, iconClickListener, iconLongClickListener, widgetPreviewLoader);
         mViewHolderBinders.put(VIEW_TYPE_WIDGETS_LIST, mWidgetsListRowViewHolderBinder);
+        mViewHolderBinders.put(VIEW_TYPE_WIDGETS_HEADER,
+                new WidgetsListHeaderViewHolderBinder(layoutInflater, this::onHeaderClicked));
     }
 
     /**
@@ -96,26 +109,39 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> {
 
     @Override
     public int getItemCount() {
-        return mEntries.size();
+        return mVisibleEntries.size();
     }
 
     /** Gets the section name for {@link com.android.launcher3.views.RecyclerViewFastScroller}. */
     public String getSectionName(int pos) {
-        return mEntries.get(pos).mTitleSectionName;
+        return mVisibleEntries.get(pos).mTitleSectionName;
     }
 
     /** Updates the widget list. */
     public void setWidgets(List<WidgetsListBaseEntry> tempEntries) {
-        ArrayList<WidgetsListBaseEntry> newEntries = new ArrayList<>(tempEntries);
-        WidgetListBaseRowEntryComparator rowComparator = new WidgetListBaseRowEntryComparator();
-        Collections.sort(newEntries, rowComparator);
-        mDiffReporter.process(mEntries, newEntries, rowComparator);
+        mAllEntries = tempEntries.stream().sorted(mRowComparator)
+                .collect(Collectors.toList());
+        updateVisibleEntries();
+    }
+
+    private void updateVisibleEntries() {
+        mAllEntries.forEach(entry -> {
+            if (entry instanceof WidgetsListHeaderEntry) {
+                ((WidgetsListHeaderEntry) entry).setIsWidgetListShown(
+                        entry.mPkgItem.packageName.equals(mWidgetsContentVisiblePackage));
+            }
+        });
+        List<WidgetsListBaseEntry> newVisibleEntries = mAllEntries.stream()
+                .filter(entry -> entry instanceof WidgetsListHeaderEntry
+                        || entry.mPkgItem.packageName.equals(mWidgetsContentVisiblePackage))
+                .collect(Collectors.toList());
+        mDiffReporter.process(mVisibleEntries, newVisibleEntries, mRowComparator);
     }
 
     @Override
     public void onBindViewHolder(ViewHolder holder, int pos) {
         ViewHolderBinder viewHolderBinder = mViewHolderBinders.get(getItemViewType(pos));
-        viewHolderBinder.bindViewHolder(holder, mEntries.get(pos));
+        viewHolderBinder.bindViewHolder(holder, mVisibleEntries.get(pos));
     }
 
     @Override
@@ -148,13 +174,26 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> {
 
     @Override
     public int getItemViewType(int pos) {
-        WidgetsListBaseEntry entry = mEntries.get(pos);
+        WidgetsListBaseEntry entry = mVisibleEntries.get(pos);
         if (entry instanceof WidgetsListContentEntry) {
             return VIEW_TYPE_WIDGETS_LIST;
+        } else if (entry instanceof WidgetsListHeaderEntry) {
+            return VIEW_TYPE_WIDGETS_HEADER;
         }
         throw new UnsupportedOperationException("ViewHolderBinder not found for " + entry);
     }
 
+    @Override
+    public void onHeaderClicked(boolean showWidgets, String expandedPackage) {
+        if (showWidgets) {
+            mWidgetsContentVisiblePackage = expandedPackage;
+            updateVisibleEntries();
+        } else if (expandedPackage.equals(mWidgetsContentVisiblePackage)) {
+            mWidgetsContentVisiblePackage = null;
+            updateVisibleEntries();
+        }
+    }
+
     /** Comparator for sorting WidgetListRowEntry based on package title. */
     public static class WidgetListBaseRowEntryComparator implements
             Comparator<WidgetsListBaseEntry> {
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListHeader.java b/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
new file mode 100644
index 0000000000..823fb7bcd2
--- /dev/null
+++ b/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
@@ -0,0 +1,205 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget.picker;
+
+import static com.android.launcher3.FastBitmapDrawable.newIcon;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
+
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.FastBitmapDrawable;
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.R;
+import com.android.launcher3.graphics.PlaceHolderIconDrawable;
+import com.android.launcher3.icons.IconCache.ItemInfoUpdateReceiver;
+import com.android.launcher3.icons.cache.HandlerRunnable;
+import com.android.launcher3.model.data.ItemInfoWithIcon;
+import com.android.launcher3.model.data.PackageItemInfo;
+import com.android.launcher3.views.ActivityContext;
+import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
+
+/**
+ * A UI represents a header of an app shown in the full widgets tray.
+ *
+ * It is a {@link LinearLayout} which contains an app icon, an app name, a subtitle and a checkbox
+ * which indicates if the widgets content view underneath this header should be shown.
+ */
+public final class WidgetsListHeader extends LinearLayout implements ItemInfoUpdateReceiver {
+
+    private boolean mEnableIconUpdateAnimation = false;
+
+    @Nullable private HandlerRunnable mIconLoadRequest;
+    @Nullable private Drawable mIconDrawable;
+    private final int mIconSize;
+
+    private ImageView mAppIcon;
+    private TextView mTitle;
+    private TextView mSubtitle;
+
+    private CheckBox mExpandToggle;
+    private boolean mIsExpanded = false;
+
+    public WidgetsListHeader(Context context) {
+        this(context, /* attrs= */ null);
+    }
+
+    public WidgetsListHeader(Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, /* defStyle= */ 0);
+    }
+
+    public WidgetsListHeader(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+
+        ActivityContext activity = ActivityContext.lookupContext(context);
+        DeviceProfile grid = activity.getDeviceProfile();
+        TypedArray a = context.obtainStyledAttributes(attrs,
+                R.styleable.WidgetsListRowHeader, defStyleAttr, /* defStyleRes= */ 0);
+        mIconSize = a.getDimensionPixelSize(R.styleable.WidgetsListRowHeader_appIconSize,
+                grid.iconSizePx);
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mAppIcon = findViewById(R.id.app_icon);
+        mTitle = findViewById(R.id.app_title);
+        mSubtitle = findViewById(R.id.app_subtitle);
+        mExpandToggle = findViewById(R.id.toggle);
+    }
+
+    /**
+     * Sets a {@link OnExpansionChangeListener} to get a callback when this app widgets section
+     * expands / collapses.
+     */
+    @UiThread
+    public void setOnExpandChangeListener(
+            @Nullable OnExpansionChangeListener onExpandChangeListener) {
+        // Use the entire touch area of this view to expand / collapse an app widgets section.
+        setOnClickListener(view -> {
+            setExpanded(!mIsExpanded);
+            onExpandChangeListener.onExpansionChange(mIsExpanded);
+        });
+    }
+
+    /** Sets the expand toggle to expand / collapse. */
+    @UiThread
+    public void setExpanded(boolean isExpanded) {
+        this.mIsExpanded = isExpanded;
+        mExpandToggle.setChecked(isExpanded);
+    }
+
+    /** Apply app icon, labels and tag using a generic {@link WidgetsListHeaderEntry}. */
+    @UiThread
+    public void applyFromItemInfoWithIcon(WidgetsListHeaderEntry entry) {
+        applyIconAndLabel(entry);
+    }
+
+    @UiThread
+    private void applyIconAndLabel(WidgetsListHeaderEntry entry) {
+        PackageItemInfo info = entry.mPkgItem;
+        setIcon(info);
+        setTitles(entry);
+        setExpanded(entry.isWidgetListShown());
+
+        super.setTag(info);
+
+        verifyHighRes();
+    }
+
+    private void setIcon(PackageItemInfo info) {
+        FastBitmapDrawable icon = newIcon(getContext(), info);
+        applyDrawables(icon);
+        mIconDrawable = icon;
+        if (mIconDrawable != null) {
+            mIconDrawable.setVisible(
+                    /* visible= */ getWindowVisibility() == VISIBLE && isShown(),
+                    /* restart= */ false);
+        }
+    }
+
+    private void applyDrawables(Drawable icon) {
+        icon.setBounds(0, 0, mIconSize, mIconSize);
+
+        mAppIcon.setImageDrawable(icon);
+
+        // If the current icon is a placeholder color, animate its update.
+        if (mIconDrawable != null
+                && mIconDrawable instanceof PlaceHolderIconDrawable
+                && mEnableIconUpdateAnimation) {
+            ((PlaceHolderIconDrawable) mIconDrawable).animateIconUpdate(icon);
+        }
+    }
+
+    private void setTitles(WidgetsListHeaderEntry entry) {
+        mTitle.setText(entry.mPkgItem.title);
+
+        if (entry.widgetsCount > 0) {
+            Resources resources = getContext().getResources();
+            mSubtitle.setText(resources.getQuantityString(R.plurals.widgets_tray_subtitle,
+                    entry.widgetsCount, entry.widgetsCount));
+            mSubtitle.setVisibility(VISIBLE);
+        } else {
+            mSubtitle.setVisibility(GONE);
+        }
+    }
+
+    @Override
+    public void reapplyItemInfo(ItemInfoWithIcon info) {
+        if (getTag() == info) {
+            mIconLoadRequest = null;
+            mEnableIconUpdateAnimation = true;
+
+            // Optimization: Starting in N, pre-uploads the bitmap to RenderThread.
+            info.bitmap.icon.prepareToDraw();
+
+            setIcon((PackageItemInfo) info);
+
+            mEnableIconUpdateAnimation = false;
+        }
+    }
+
+    /** Verifies that the current icon is high-res otherwise posts a request to load the icon. */
+    public void verifyHighRes() {
+        if (mIconLoadRequest != null) {
+            mIconLoadRequest.cancel();
+            mIconLoadRequest = null;
+        }
+        if (getTag() instanceof ItemInfoWithIcon) {
+            ItemInfoWithIcon info = (ItemInfoWithIcon) getTag();
+            if (info.usingLowResIcon()) {
+                mIconLoadRequest = LauncherAppState.getInstance(getContext()).getIconCache()
+                        .updateIconInBackground(this, info);
+            }
+        }
+    }
+
+    /** A listener for the widget section expansion / collapse events. */
+    public interface OnExpansionChangeListener {
+        /** Notifies that the widget section is expanded or collapsed. */
+        void onExpansionChange(boolean isExpanded);
+    }
+}
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListHeaderHolder.java b/src/com/android/launcher3/widget/picker/WidgetsListHeaderHolder.java
new file mode 100644
index 0000000000..d4e1b1c4a5
--- /dev/null
+++ b/src/com/android/launcher3/widget/picker/WidgetsListHeaderHolder.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget.picker;
+
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
+
+/**
+ * A {@link ViewHolder} for {@link WidgetsListHeader} of an app, which renders the app icon, the app
+ * name, label and a button for showing / hiding widgets.
+ */
+public final class WidgetsListHeaderHolder extends ViewHolder {
+    final WidgetsListHeader mWidgetsListHeader;
+
+    public WidgetsListHeaderHolder(WidgetsListHeader view) {
+        super(view);
+
+        mWidgetsListHeader = view;
+    }
+}
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinder.java b/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinder.java
new file mode 100644
index 0000000000..ed53e6fbc9
--- /dev/null
+++ b/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinder.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget.picker;
+
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import com.android.launcher3.R;
+import com.android.launcher3.recyclerview.ViewHolderBinder;
+import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
+
+/**
+ * Binds data from {@link WidgetsListHeaderEntry} to UI elements in {@link WidgetsListHeaderHolder}.
+ */
+public final class WidgetsListHeaderViewHolderBinder implements
+        ViewHolderBinder<WidgetsListHeaderEntry, WidgetsListHeaderHolder> {
+    private final LayoutInflater mLayoutInflater;
+    private final OnHeaderClickListener mOnHeaderClickListener;
+
+    public WidgetsListHeaderViewHolderBinder(LayoutInflater layoutInflater,
+            OnHeaderClickListener onHeaderClickListener) {
+        mLayoutInflater = layoutInflater;
+        mOnHeaderClickListener = onHeaderClickListener;
+    }
+
+    @Override
+    public WidgetsListHeaderHolder newViewHolder(ViewGroup parent) {
+        WidgetsListHeader header = (WidgetsListHeader) mLayoutInflater.inflate(
+                R.layout.widgets_list_row_header, parent, false);
+
+        return new WidgetsListHeaderHolder(header);
+    }
+
+    @Override
+    public void bindViewHolder(WidgetsListHeaderHolder viewHolder, WidgetsListHeaderEntry data) {
+        WidgetsListHeader widgetsListHeader = viewHolder.mWidgetsListHeader;
+        widgetsListHeader.applyFromItemInfoWithIcon(data);
+        widgetsListHeader.setExpanded(data.isWidgetListShown());
+        widgetsListHeader.setOnExpandChangeListener(isExpanded ->
+                mOnHeaderClickListener.onHeaderClicked(isExpanded, data.mPkgItem.packageName));
+    }
+
+    /** A listener to be invoked when {@link WidgetsListHeader} is clicked. */
+    public interface OnHeaderClickListener {
+        /** Calls when {@link WidgetsListHeader} is clicked to show / hide widgets for a package. */
+        void onHeaderClicked(boolean showWidgets, String packageName);
+    }
+}
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListRowViewHolderBinder.java b/src/com/android/launcher3/widget/picker/WidgetsListRowViewHolderBinder.java
index 22a8d0071c..cec6b807ec 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListRowViewHolderBinder.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListRowViewHolderBinder.java
@@ -76,7 +76,7 @@ public class WidgetsListRowViewHolderBinder
         }
 
         ViewGroup container = (ViewGroup) mLayoutInflater.inflate(
-                R.layout.widgets_list_row_view, parent, false);
+                R.layout.widgets_scroll_container, parent, false);
 
         // if the end padding is 0, then container view (horizontal scroll view) doesn't respect
         // the end of the linear layout width + the start padding and doesn't allow scrolling.
@@ -122,9 +122,6 @@ public class WidgetsListRowViewHolderBinder
             }
         }
 
-        // Bind the views in the application info section.
-        holder.title.applyFromItemInfoWithIcon(entry.mPkgItem);
-
         // Bind the view in the widget horizontal tray region.
         for (int i = 0; i < infoList.size(); i++) {
             WidgetCell widget = (WidgetCell) row.getChildAt(2 * i);
diff --git a/src/com/android/launcher3/widget/picker/WidgetsRowViewHolder.java b/src/com/android/launcher3/widget/picker/WidgetsRowViewHolder.java
index 9be079e826..ae945846e1 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsRowViewHolder.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRowViewHolder.java
@@ -19,20 +19,16 @@ import android.view.ViewGroup;
 
 import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 
-import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.R;
 
-/** A {@link ViewHolder} for a row in the full widget picker. */
+/** A {@link ViewHolder} for showing widgets of an app in the full widget picker. */
 public final class WidgetsRowViewHolder extends ViewHolder {
 
     public final ViewGroup cellContainer;
-    public final BubbleTextView title;
 
     public WidgetsRowViewHolder(ViewGroup v) {
         super(v);
 
         cellContainer = v.findViewById(R.id.widgets_cell_list);
-        title = v.findViewById(R.id.section);
-        title.setAccessibilityDelegate(null);
     }
 }
diff --git a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
index f27922b757..30c9b5ffd8 100644
--- a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
+++ b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
@@ -31,6 +31,7 @@ import com.android.launcher3.util.Preconditions;
 import com.android.launcher3.widget.WidgetManagerHelper;
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 import com.android.launcher3.widget.model.WidgetsListContentEntry;
+import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
 import com.android.launcher3.widget.picker.WidgetsDiffReporter;
 
 import java.util.ArrayList;
@@ -73,11 +74,11 @@ public class WidgetsModel {
 
         for (Map.Entry<PackageItemInfo, List<WidgetItem>> entry : mWidgetsList.entrySet()) {
             PackageItemInfo pkgItem = entry.getKey();
+            List<WidgetItem> widgetItems = entry.getValue();
             String sectionName = (pkgItem.title == null) ? "" :
                     indexer.computeSectionName(pkgItem.title);
-            WidgetsListContentEntry row =
-                    new WidgetsListContentEntry(pkgItem, sectionName, entry.getValue());
-            result.add(row);
+            result.add(new WidgetsListHeaderEntry(pkgItem, sectionName, widgetItems));
+            result.add(new WidgetsListContentEntry(pkgItem, sectionName, widgetItems));
         }
         return result;
     }
diff --git a/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java
index 9d4ccff974..737f891d78 100644
--- a/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java
+++ b/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java
@@ -92,9 +92,8 @@ public class AddConfigWidgetTest extends AbstractLauncherUiTest {
 
         // Drag widget to homescreen
         WidgetConfigStartupMonitor monitor = new WidgetConfigStartupMonitor();
-        widgets.
-                getWidget(mWidgetInfo.getLabel(mTargetContext.getPackageManager())).
-                dragToWorkspace(true, false);
+        widgets.getWidget(mWidgetInfo.getLabel(mTargetContext.getPackageManager()))
+                .dragToWorkspace(true, false);
         // Widget id for which the config activity was opened
         mWidgetId = monitor.getWidgetId();
 
diff --git a/tests/tapl/com/android/launcher3/tapl/Widgets.java b/tests/tapl/com/android/launcher3/tapl/Widgets.java
index 49af616b85..f95abdb4b2 100644
--- a/tests/tapl/com/android/launcher3/tapl/Widgets.java
+++ b/tests/tapl/com/android/launcher3/tapl/Widgets.java
@@ -31,6 +31,7 @@ import com.android.launcher3.tapl.LauncherInstrumentation.GestureScope;
 import com.android.launcher3.testing.TestProtocol;
 
 import java.util.Collection;
+import java.util.List;
 
 /**
  * All widgets container.
@@ -101,22 +102,28 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
         try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck();
              LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
                      "getting widget " + labelText + " in widgets list")) {
-            final UiObject2 widgetsContainer = verifyActiveContainer();
+            final UiObject2 fullWidgetsPicker = verifyActiveContainer();
             mLauncher.assertTrue("Widgets container didn't become scrollable",
-                    widgetsContainer.wait(Until.scrollable(true), WAIT_TIME_MS));
+                    fullWidgetsPicker.wait(Until.scrollable(true), WAIT_TIME_MS));
             final Point displaySize = mLauncher.getRealDisplaySize();
-            final BySelector labelSelector = By.clazz("android.widget.TextView").text(labelText);
 
+            final UiObject2 widgetsContainer = findTestAppWidgetsScrollContainer();
+            mLauncher.assertTrue("Can't locate widgets list for the test app: "
+                                    + mLauncher.getLauncherPackageName(),
+                    widgetsContainer != null);
+            final BySelector labelSelector = By.clazz("android.widget.TextView").text(labelText);
             int i = 0;
             for (; ; ) {
-                final Collection<UiObject2> cells = mLauncher.getObjectsInContainer(
-                        widgetsContainer, "widgets_scroll_container");
-                mLauncher.assertTrue("Widgets doesn't have 2 rows", cells.size() >= 2);
+                final Collection<UiObject2> cells = widgetsContainer.getChildren();
+                mLauncher.assertTrue("Widgets doesn't have 2 rows: ", cells.size() >= 2);
                 for (UiObject2 cell : cells) {
                     final UiObject2 label = cell.findObject(labelSelector);
+                    // The logic below doesn't handle the case which a widget cell of the given
+                    // label is not yet visible on the horizontal scrolling container. This won't be
+                    // an issue once we get rid of the horizontal scrolling container.
                     if (label == null) continue;
 
-                    final UiObject2 widget = label.getParent().getParent();
+                    final UiObject2 widget = cell;
                     mLauncher.assertEquals(
                             "View is not WidgetCell",
                             "com.android.launcher3.widget.WidgetCell",
@@ -131,7 +138,7 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
                             <= displaySize.y - mLauncher.getBottomGestureSize()) {
                         int visibleDelta = maxWidth - mLauncher.getVisibleBounds(widget).width();
                         if (visibleDelta > 0) {
-                            Rect parentBounds = mLauncher.getVisibleBounds(cell);
+                            Rect parentBounds = mLauncher.getVisibleBounds(cell.getParent());
                             mLauncher.linearGesture(parentBounds.centerX() + visibleDelta
                                             + mLauncher.getTouchSlop(),
                                     parentBounds.centerY(), parentBounds.centerX(),
@@ -153,4 +160,53 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
             }
         }
     }
+
+    /** Finds the widgets list of this test app from the collapsed full widgets picker. */
+    private UiObject2 findTestAppWidgetsScrollContainer() {
+        final BySelector headerSelector = By.res(mLauncher.getLauncherPackageName(),
+                "widgets_list_header");
+        final BySelector targetAppSelector = By.clazz("android.widget.TextView").text(
+                mLauncher.getContext().getPackageName());
+        final BySelector widgetsContainerSelector = By.res(mLauncher.getLauncherPackageName(),
+                "widgets_cell_list");
+
+        boolean hasHeaderExpanded = false;
+        for (int i = 0; i < 40; i++) {
+            UiObject2 fullWidgetsPicker = verifyActiveContainer();
+
+            UiObject2 header = fullWidgetsPicker.findObject(headerSelector);
+            mLauncher.assertTrue("Can't find a widget header", header != null);
+
+            // Look for a header that has the test app name.
+            UiObject2 headerTitle = fullWidgetsPicker.findObject(targetAppSelector);
+            if (headerTitle != null) {
+                // If we find the header and it has not been expanded, let's click it to see the
+                // widgets list.
+                if (!hasHeaderExpanded) {
+                    hasHeaderExpanded = true;
+                    mLauncher.clickLauncherObject(headerTitle);
+                    // After clicking the header, the recyclerview has been updated. Let's refresh
+                    // the container UIObject2.
+                    fullWidgetsPicker = verifyActiveContainer();
+                    // Refresh headerTitle because the first instance is stale after
+                    // verifyActiveContainer call.
+                    headerTitle = fullWidgetsPicker.findObject(targetAppSelector);
+                }
+
+                // Look for a widgets list.
+                UiObject2 widgetsContainer = fullWidgetsPicker.findObject(widgetsContainerSelector);
+                if (widgetsContainer != null) {
+                    // Make sure the widgets list is fully visible on the screen.
+                    mLauncher.scrollToLastVisibleRow(fullWidgetsPicker,
+                            widgetsContainer.getChildren(), 0);
+                    return widgetsContainer;
+                }
+                mLauncher.scrollToLastVisibleRow(fullWidgetsPicker, List.of(headerTitle), 0);
+            } else {
+                mLauncher.scrollToLastVisibleRow(fullWidgetsPicker, header.getChildren(), 0);
+            }
+        }
+
+        return null;
+    }
 }
-- 
GitLab


From c96873caaddc0fd6f6f865a77e6eee76dd066f29 Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Thu, 11 Feb 2021 15:13:47 -0800
Subject: [PATCH 0521/1664] [AA+] Log LAUNCHER_ONSTOP & LAUNCHER_ONRESUME
 events with AllApps session InstanceId.

* Transitions between AllApps and App screen logs LAUNCHER_ONSTOP & LAUNCHER_ONRESUME events. This change add InstanceId specific to the current AllApps session to these logs; this will help to regenerate AllApps session from logs on the server side. This should only affect logs from AllApps screen, but not others.

* Removes LiveSearchManager.allAppsLogger method as it may create confusion with 2 methods for logging into Statsd

* Moved AllApps entry and exit logs to Launcher.

Bug: 178562918
Test: Manual
Change-Id: I5fab941777a3dfd2e9b19c0efd5b06d3884222ef
---
 .../uioverrides/QuickstepLauncher.java        |  6 +--
 .../logging/StatsLogCompatManager.java        |  2 +-
 src/com/android/launcher3/BaseActivity.java   |  5 ++-
 src/com/android/launcher3/Launcher.java       | 28 ++++++++++++
 .../allapps/LauncherAllAppsContainerView.java |  5 +--
 .../allapps/search/LiveSearchManager.java     | 44 -------------------
 .../launcher3/logging/StatsLogManager.java    | 23 +++++++++-
 7 files changed, 58 insertions(+), 55 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 8b4f4f87af..d98e7928c7 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -81,7 +81,6 @@ import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.stream.Stream;
 
 public class QuickstepLauncher extends BaseQuickstepLauncher {
@@ -106,10 +105,9 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
     protected void logAppLaunch(ItemInfo info, InstanceId instanceId) {
         // If the app launch is from any of the surfaces in AllApps then add the InstanceId from
         // LiveSearchManager to recreate the AllApps session on the server side.
-        Optional<InstanceId> logInstanceId = this.getLiveSearchManager().getLogInstanceId();
-        if (logInstanceId.isPresent() && ALL_APPS.equals(
+        if (mAllAppsSessionLogId != null && ALL_APPS.equals(
                 getStateManager().getCurrentStableState())) {
-            instanceId = logInstanceId.get();
+            instanceId = mAllAppsSessionLogId;
         }
 
         StatsLogger logger = getStatsLogManager()
diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
index aafb1af88f..f9283a4ece 100644
--- a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
+++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
@@ -88,7 +88,7 @@ public class StatsLogCompatManager extends StatsLogManager {
     }
 
     @Override
-    public StatsLogger logger() {
+    protected StatsLogger createLogger() {
         return new StatsCompatLogger();
     }
 
diff --git a/src/com/android/launcher3/BaseActivity.java b/src/com/android/launcher3/BaseActivity.java
index 5e50e278f0..8a03facbf2 100644
--- a/src/com/android/launcher3/BaseActivity.java
+++ b/src/com/android/launcher3/BaseActivity.java
@@ -141,7 +141,10 @@ public abstract class BaseActivity extends Activity implements ActivityContext {
         return mDeviceProfile;
     }
 
-    public final StatsLogManager getStatsLogManager() {
+    /**
+     * Returns {@link StatsLogManager} for user event logging.
+     */
+    public StatsLogManager getStatsLogManager() {
         if (mStatsLogManager == null) {
             mStatsLogManager = StatsLogManager.newInstance(this);
         }
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 2df9cbed54..51e7c7d175 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -40,6 +40,8 @@ import static com.android.launcher3.Utilities.postAsyncCallback;
 import static com.android.launcher3.dragndrop.DragLayer.ALPHA_INDEX_LAUNCHER_LOAD;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_ENTRY;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_EXIT;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ONRESUME;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ONSTOP;
 import static com.android.launcher3.model.ItemInstallQueue.FLAG_ACTIVITY_PAUSED;
@@ -124,6 +126,8 @@ import com.android.launcher3.keyboard.CustomActionsPopup;
 import com.android.launcher3.keyboard.ViewGroupFocusHelper;
 import com.android.launcher3.logger.LauncherAtom;
 import com.android.launcher3.logging.FileLog;
+import com.android.launcher3.logging.InstanceId;
+import com.android.launcher3.logging.InstanceIdSequence;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.model.BgDataModel.Callbacks;
 import com.android.launcher3.model.ItemInstallQueue;
@@ -352,6 +356,13 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
     private SafeCloseable mUserChangedCallbackCloseable;
 
+    // New InstanceId is assigned to mAllAppsSessionLogId for each AllApps sessions.
+    // When Launcher is not in AllApps state mAllAppsSessionLogId will be null.
+    // User actions within AllApps state are logged with this InstanceId, to recreate AllApps
+    // session on the server side.
+    protected InstanceId mAllAppsSessionLogId;
+    private LauncherState mPrevLauncherState;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         Object traceToken = TraceHelper.INSTANCE.beginSection(ON_CREATE_EVT,
@@ -1027,6 +1038,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         }
         // When multiple pages are visible, show persistent page indicator
         mWorkspace.getPageIndicator().setShouldAutoHide(!state.hasFlag(FLAG_MULTI_PAGE));
+        mPrevLauncherState = mStateManager.getCurrentStableState();
     }
 
     @Override
@@ -1050,6 +1062,17 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
             // Clear any rotation locks when going to normal state
             getRotationHelper().setCurrentStateRequest(REQUEST_NONE);
         }
+
+        if (ALL_APPS.equals(state)) {
+            // creates new instance ID since new all apps session is started.
+            mAllAppsSessionLogId = new InstanceIdSequence().newInstanceId();
+            getStatsLogManager().logger().log(LAUNCHER_ALLAPPS_ENTRY);
+        } else if (ALL_APPS.equals(mPrevLauncherState)
+                // Check if mLogInstanceId is not null to make sure exit event is logged only once.
+                && mAllAppsSessionLogId != null) {
+            getStatsLogManager().logger().log(LAUNCHER_ALLAPPS_EXIT);
+            mAllAppsSessionLogId = null;
+        }
     }
 
     @Override
@@ -2818,4 +2841,9 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         public Configuration config;
         public Bitmap snapshot;
     }
+
+    @Override
+    public StatsLogManager getStatsLogManager() {
+        return super.getStatsLogManager().withDefaultInstanceId(mAllAppsSessionLogId);
+    }
 }
diff --git a/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java b/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
index bb1a4c07cf..4876298761 100644
--- a/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
@@ -90,10 +90,9 @@ public class LauncherAllAppsContainerView extends AllAppsContainerView {
     public void onTabChanged(int pos) {
         super.onTabChanged(pos);
         if (mUsingTabs) {
-
             // Log tab switches only when the launcher is in AllApps state
             if (mLauncher.getStateManager().getCurrentStableState() == LauncherState.ALL_APPS) {
-                mLauncher.getLiveSearchManager().allAppsLogger()
+                mLauncher.getStatsLogManager().logger()
                         .log(pos == AdapterHolder.WORK ? LAUNCHER_ALLAPPS_SWITCHED_TO_WORK_TAB
                                 : LAUNCHER_ALLAPPS_SWITCHED_TO_MAIN_TAB);
             }
@@ -109,6 +108,6 @@ public class LauncherAllAppsContainerView extends AllAppsContainerView {
     @Override
     protected void hideIme() {
         super.hideIme();
-        mLauncher.getLiveSearchManager().allAppsLogger().log(LAUNCHER_ALLAPPS_KEYBOARD_CLOSED);
+        mLauncher.getStatsLogManager().logger().log(LAUNCHER_ALLAPPS_KEYBOARD_CLOSED);
     }
 }
diff --git a/src/com/android/launcher3/allapps/search/LiveSearchManager.java b/src/com/android/launcher3/allapps/search/LiveSearchManager.java
index 748ba502e3..4ef154e6b3 100644
--- a/src/com/android/launcher3/allapps/search/LiveSearchManager.java
+++ b/src/com/android/launcher3/allapps/search/LiveSearchManager.java
@@ -16,8 +16,6 @@
 package com.android.launcher3.allapps.search;
 
 import static com.android.launcher3.LauncherState.ALL_APPS;
-import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_ENTRY;
-import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_EXIT;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.THREAD_POOL_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
@@ -47,9 +45,6 @@ import androidx.slice.SliceViewManager.SliceCallback;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.LauncherState;
-import com.android.launcher3.logging.InstanceId;
-import com.android.launcher3.logging.InstanceIdSequence;
-import com.android.launcher3.logging.StatsLogManager.StatsLogger;
 import com.android.launcher3.statemanager.StateManager.StateListener;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.SafeCloseable;
@@ -57,7 +52,6 @@ import com.android.launcher3.widget.PendingAddWidgetInfo;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Optional;
 
 /**
  * Manages Lifecycle for Live search results
@@ -74,8 +68,6 @@ public class LiveSearchManager implements StateListener<LauncherState> {
     private final HashMap<ComponentKey, SearchWidgetInfoContainer> mWidgetPlaceholders =
             new HashMap<>();
     private SearchWidgetHost mSearchWidgetHost;
-    private InstanceId mLogInstanceId;
-    private LauncherState mPrevLauncherState;
 
     public LiveSearchManager(Launcher launcher) {
         mLauncher = launcher;
@@ -138,11 +130,6 @@ public class LiveSearchManager implements StateListener<LauncherState> {
         }
     }
 
-    @Override
-    public void onStateTransitionStart(LauncherState toState) {
-        mPrevLauncherState = mLauncher.getStateManager().getCurrentStableState();
-    }
-
     @Override
     public void onStateTransitionComplete(LauncherState finalState) {
         if (finalState != ALL_APPS) {
@@ -152,18 +139,6 @@ public class LiveSearchManager implements StateListener<LauncherState> {
 
             clearWidgetHost();
         }
-
-        if (ALL_APPS.equals(finalState)) {
-            // creates new instance ID since new all apps session is started.
-            mLogInstanceId = new InstanceIdSequence().newInstanceId();
-            allAppsLogger().log(LAUNCHER_ALLAPPS_ENTRY);
-        } else if (ALL_APPS.equals(mPrevLauncherState)
-                // Check if mLogInstanceId is not null; to avoid NPE when LAUNCHER_ALLAPPS_EXIT is
-                // triggered multiple times
-                && mLogInstanceId != null) {
-            allAppsLogger().log(LAUNCHER_ALLAPPS_EXIT);
-            mLogInstanceId = null;
-        }
     }
 
     /**
@@ -181,14 +156,6 @@ public class LiveSearchManager implements StateListener<LauncherState> {
         return () -> sliceLifeCycle.removeListener(listener);
     }
 
-    /**
-     * Returns {@link InstanceId} that should be used for logging events within search session, if
-     * available.
-     */
-    public Optional<InstanceId> getLogInstanceId() {
-        return Optional.ofNullable(mLogInstanceId);
-    }
-
     static class SearchWidgetHost extends AppWidgetHost {
         SearchWidgetHost(Context context) {
             super(context, SEARCH_APPWIDGET_HOST_ID);
@@ -316,15 +283,4 @@ public class LiveSearchManager implements StateListener<LauncherState> {
         @Override
         public void onActivitySaveInstanceState(Activity activity, Bundle bundle) { }
     }
-
-    /**
-     * Returns new instance of {@link StatsLogger} pre-populated with details required to log
-     * AllApps specific user events.
-     */
-    public StatsLogger allAppsLogger() {
-        return getLogInstanceId()
-                .map(instanceId -> mLauncher.getStatsLogManager().logger()
-                        .withInstanceId(instanceId))
-                .orElse(mLauncher.getStatsLogManager().logger());
-    }
 }
diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index cc80a88f94..1266bb48aa 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -22,6 +22,8 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH
 
 import android.content.Context;
 
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.R;
 import com.android.launcher3.logger.LauncherAtom.ContainerInfo;
 import com.android.launcher3.logger.LauncherAtom.FromState;
@@ -29,6 +31,8 @@ import com.android.launcher3.logger.LauncherAtom.ToState;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.util.ResourceBasedOverride;
 
+import java.util.Optional;
+
 /**
  * Handles the user event logging in R+.
  *
@@ -47,6 +51,7 @@ public class StatsLogManager implements ResourceBasedOverride {
     public static final int LAUNCHER_STATE_ALLAPPS = 4;
     public static final int LAUNCHER_STATE_UNCHANGED = 5;
 
+    private InstanceId mInstanceId;
     /**
      * Returns event enum based on the two state transition information when swipe
      * gesture happens(to be removed during UserEventDispatcher cleanup).
@@ -480,16 +485,30 @@ public class StatsLogManager implements ResourceBasedOverride {
      * Returns new logger object.
      */
     public StatsLogger logger() {
+        StatsLogger logger = createLogger();
+        Optional.ofNullable(mInstanceId).ifPresent(logger::withInstanceId);
+        return logger;
+    }
+
+    protected StatsLogger createLogger() {
         return new StatsLogger() {
         };
     }
 
+    /**
+     * Sets InstanceId to every new {@link StatsLogger} object returned by {@link #logger()} when
+     * not-null.
+     */
+    public StatsLogManager withDefaultInstanceId(@Nullable InstanceId instanceId) {
+        this.mInstanceId = instanceId;
+        return this;
+    }
+
     /**
      * Creates a new instance of {@link StatsLogManager} based on provided context.
      */
     public static StatsLogManager newInstance(Context context) {
-        StatsLogManager mgr = Overrides.getObject(StatsLogManager.class,
+        return Overrides.getObject(StatsLogManager.class,
                 context.getApplicationContext(), R.string.stats_log_manager_class);
-        return mgr;
     }
 }
-- 
GitLab


From 384b578ab2ba408d4cc20ca5b0c04f76ec905858 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 9 Feb 2021 22:50:02 -0800
Subject: [PATCH 0522/1664] Removing menu and dialog for custom actions
 hanlding. These do not work well with gesture-nav and can potentially block
 the Launcher UI.

Instead exposing on custom actions with keyboard accelerator and
using thee internal arrowPopup for resize options
Fixing SecondoryDropTarget not sending appropriate stats log

Bug: 179854703
Test: Verified on device
Change-Id: I268690f8a937896e4350496128a38959003f8939
---
 .../QuickstepAccessibilityDelegate.java       |  57 +++++
 .../uioverrides/PredictedAppIcon.java         |  34 +--
 .../uioverrides/QuickstepLauncher.java        |   7 +
 res/drawable/ic_widget_height_decrease.xml    |  25 ++
 res/drawable/ic_widget_height_increase.xml    |  25 ++
 res/drawable/ic_widget_width_decrease.xml     |  22 ++
 res/drawable/ic_widget_width_increase.xml     |  22 ++
 res/values/strings.xml                        |   2 -
 .../launcher3/AbstractFloatingView.java       |   2 +-
 src/com/android/launcher3/CellLayout.java     |   2 +
 src/com/android/launcher3/Launcher.java       |  47 ++--
 .../launcher3/SecondaryDropTarget.java        |  13 +-
 .../LauncherAccessibilityDelegate.java        | 232 +++++++++---------
 .../ShortcutMenuAccessibilityDelegate.java    |  22 +-
 .../keyboard/CustomActionsPopup.java          |  94 -------
 .../android/launcher3/popup/ArrowPopup.java   |  12 +
 .../popup/PopupContainerWithArrow.java        |   1 +
 .../launcher3/views/OptionsPopupView.java     |   4 +-
 18 files changed, 338 insertions(+), 285 deletions(-)
 create mode 100644 quickstep/src/com/android/launcher3/QuickstepAccessibilityDelegate.java
 create mode 100644 res/drawable/ic_widget_height_decrease.xml
 create mode 100644 res/drawable/ic_widget_height_increase.xml
 create mode 100644 res/drawable/ic_widget_width_decrease.xml
 create mode 100644 res/drawable/ic_widget_width_increase.xml
 delete mode 100644 src/com/android/launcher3/keyboard/CustomActionsPopup.java

diff --git a/quickstep/src/com/android/launcher3/QuickstepAccessibilityDelegate.java b/quickstep/src/com/android/launcher3/QuickstepAccessibilityDelegate.java
new file mode 100644
index 0000000000..96559cbb8a
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/QuickstepAccessibilityDelegate.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3;
+
+import android.view.KeyEvent;
+import android.view.View;
+
+import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
+import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.uioverrides.PredictedAppIcon;
+import com.android.launcher3.uioverrides.QuickstepLauncher;
+
+import java.util.List;
+
+public class QuickstepAccessibilityDelegate extends LauncherAccessibilityDelegate {
+
+    public QuickstepAccessibilityDelegate(QuickstepLauncher launcher) {
+        super(launcher);
+        mActions.put(PIN_PREDICTION, new LauncherAction(
+                PIN_PREDICTION, R.string.pin_prediction, KeyEvent.KEYCODE_P));
+    }
+
+    @Override
+    protected void getSupportedActions(View host, ItemInfo item, List<LauncherAction> out) {
+        if (host instanceof PredictedAppIcon && !((PredictedAppIcon) host).isPinned()) {
+            out.add(new LauncherAction(PIN_PREDICTION, R.string.pin_prediction,
+                    KeyEvent.KEYCODE_P));
+        }
+        super.getSupportedActions(host, item, out);
+    }
+
+    @Override
+    protected boolean performAction(View host, ItemInfo item, int action, boolean fromKeyboard) {
+        QuickstepLauncher launcher = (QuickstepLauncher) mLauncher;
+        if (action == PIN_PREDICTION) {
+            if (launcher.getHotseatPredictionController() == null) {
+                return false;
+            }
+            launcher.getHotseatPredictionController().pinPrediction(item);
+            return true;
+        }
+        return super.performAction(host, item, action, fromKeyboard);
+    }
+}
diff --git a/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
index 2d501257c3..98551fb17a 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
@@ -15,7 +15,6 @@
  */
 package com.android.launcher3.uioverrides;
 
-import static com.android.launcher3.accessibility.LauncherAccessibilityDelegate.PIN_PREDICTION;
 import static com.android.launcher3.graphics.IconShape.getShape;
 
 import android.content.Context;
@@ -29,7 +28,6 @@ import android.os.Process;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
-import android.view.accessibility.AccessibilityNodeInfo;
 
 import androidx.core.graphics.ColorUtils;
 
@@ -37,9 +35,7 @@ import com.android.launcher3.CellLayout;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
-import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
 import com.android.launcher3.graphics.IconPalette;
-import com.android.launcher3.hybridhotseat.HotseatPredictionController;
 import com.android.launcher3.icons.IconNormalizer;
 import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.model.data.ItemInfo;
@@ -53,8 +49,7 @@ import com.android.launcher3.views.DoubleShadowBubbleTextView;
 /**
  * A BubbleTextView with a ring around it's drawable
  */
-public class PredictedAppIcon extends DoubleShadowBubbleTextView implements
-        LauncherAccessibilityDelegate.AccessibilityActionHandler {
+public class PredictedAppIcon extends DoubleShadowBubbleTextView {
 
     private static final int RING_SHADOW_COLOR = 0x99000000;
     private static final float RING_EFFECT_RATIO = 0.095f;
@@ -147,29 +142,6 @@ public class PredictedAppIcon extends DoubleShadowBubbleTextView implements
         verifyHighRes();
     }
 
-    @Override
-    public void addSupportedAccessibilityActions(AccessibilityNodeInfo accessibilityNodeInfo) {
-        if (!mIsPinned) {
-            accessibilityNodeInfo.addAction(
-                    new AccessibilityNodeInfo.AccessibilityAction(PIN_PREDICTION,
-                            getContext().getText(R.string.pin_prediction)));
-        }
-    }
-
-    @Override
-    public boolean performAccessibilityAction(int action, ItemInfo info) {
-        QuickstepLauncher launcher = Launcher.cast(Launcher.getLauncher(getContext()));
-        if (action == PIN_PREDICTION) {
-            if (launcher == null) {
-                return false;
-            }
-            HotseatPredictionController controller = launcher.getHotseatPredictionController();
-            controller.pinPrediction(info);
-            return true;
-        }
-        return false;
-    }
-
     @Override
     public void getIconBounds(Rect outBounds) {
         super.getIconBounds(outBounds);
@@ -179,6 +151,10 @@ public class PredictedAppIcon extends DoubleShadowBubbleTextView implements
         }
     }
 
+    public boolean isPinned() {
+        return mIsPinned;
+    }
+
     private int getOutlineOffsetX() {
         return (getMeasuredWidth() / 2) - mNormalizedIconRadius;
     }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 2e018f357f..0461e96871 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -44,7 +44,9 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.LauncherState;
+import com.android.launcher3.QuickstepAccessibilityDelegate;
 import com.android.launcher3.Workspace;
+import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.appprediction.PredictionRowView;
 import com.android.launcher3.hybridhotseat.HotseatPredictionController;
@@ -138,6 +140,11 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
         mHotseatPredictionController.logLaunchedAppRankingInfo(info, instanceId);
     }
 
+    @Override
+    protected LauncherAccessibilityDelegate createAccessibilityDelegate() {
+        return new QuickstepAccessibilityDelegate(this);
+    }
+
     /**
      * Returns Prediction controller for hybrid hotseat
      */
diff --git a/res/drawable/ic_widget_height_decrease.xml b/res/drawable/ic_widget_height_decrease.xml
new file mode 100644
index 0000000000..df704bacbe
--- /dev/null
+++ b/res/drawable/ic_widget_height_decrease.xml
@@ -0,0 +1,25 @@
+<!--
+Copyright (C) 2021 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/textColorPrimary">
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M8,19h3v3h2v-3h3l-4,-4 -4,4zM16,4h-3L13,1h-2v3L8,4l4,4 4,-4zM4,9v2h16L20,9L4,9zM4,12h16v2H4z"/>
+</vector>
diff --git a/res/drawable/ic_widget_height_increase.xml b/res/drawable/ic_widget_height_increase.xml
new file mode 100644
index 0000000000..c263a4b43c
--- /dev/null
+++ b/res/drawable/ic_widget_height_increase.xml
@@ -0,0 +1,25 @@
+<!--
+Copyright (C) 2021 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/textColorPrimary">
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M4,20h16v2L4,22zM4,2h16v2L4,4zM13,9h3l-4,-4 -4,4h3v6L8,15l4,4 4,-4h-3z"/>
+</vector>
diff --git a/res/drawable/ic_widget_width_decrease.xml b/res/drawable/ic_widget_width_decrease.xml
new file mode 100644
index 0000000000..2a2fad777c
--- /dev/null
+++ b/res/drawable/ic_widget_width_decrease.xml
@@ -0,0 +1,22 @@
+<!--
+Copyright (C) 2021 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<rotate
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:drawable="@drawable/ic_widget_height_decrease"
+  android:pivotX="50%"
+  android:pivotY="50%"
+  android:fromDegrees="90"
+  android:toDegrees="90" />
diff --git a/res/drawable/ic_widget_width_increase.xml b/res/drawable/ic_widget_width_increase.xml
new file mode 100644
index 0000000000..89b9f40673
--- /dev/null
+++ b/res/drawable/ic_widget_width_increase.xml
@@ -0,0 +1,22 @@
+<!--
+Copyright (C) 2021 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<rotate
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@drawable/ic_widget_height_increase"
+    android:pivotX="50%"
+    android:pivotY="50%"
+    android:fromDegrees="90"
+    android:toDegrees="90" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 447c9ac568..dd1cc7cbf9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -37,8 +37,6 @@
     <string name="shortcut_not_available">Shortcut isn\'t available</string>
     <!-- User visible name for the launcher/home screen. [CHAR_LIMIT=30] -->
     <string name="home_screen">Home</string>
-    <!-- Label for showing custom action list of a shortcut or widget. [CHAR_LIMIT=30] -->
-    <string name="custom_actions">Custom actions</string>
 
     <!-- Widgets -->
     <!-- Message to tell the user to press and hold on a widget to add it [CHAR_LIMIT=50] -->
diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java
index 6037c96f82..95cdbdd147 100644
--- a/src/com/android/launcher3/AbstractFloatingView.java
+++ b/src/com/android/launcher3/AbstractFloatingView.java
@@ -59,7 +59,7 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
             TYPE_SNACKBAR,
             TYPE_LISTENER,
             TYPE_ALL_APPS_EDU,
-
+            TYPE_DRAG_DROP_POPUP,
             TYPE_TASK_MENU,
             TYPE_OPTIONS_POPUP,
             TYPE_ICON_SURFACE
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 452207db3b..d750c6ccc1 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -305,6 +305,8 @@ public class CellLayout extends ViewGroup {
         setImportantForAccessibility(accessibilityFlag);
         getShortcutsAndWidgets().setImportantForAccessibility(accessibilityFlag);
 
+        // ExploreByTouchHelper sets focusability. Clear it when the delegate is cleared.
+        setFocusable(delegate != null);
         // Invalidate the accessibility hierarchy
         if (getParent() != null) {
             getParent().notifySubtreeAccessibilityStateChanged(
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 2df9cbed54..30dac64fc9 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -37,6 +37,7 @@ import static com.android.launcher3.LauncherState.NO_SCALE;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.SPRING_LOADED;
 import static com.android.launcher3.Utilities.postAsyncCallback;
+import static com.android.launcher3.accessibility.LauncherAccessibilityDelegate.getSupportedActions;
 import static com.android.launcher3.dragndrop.DragLayer.ALPHA_INDEX_LAUNCHER_LOAD;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
@@ -104,6 +105,7 @@ import androidx.annotation.VisibleForTesting;
 
 import com.android.launcher3.DropTarget.DragObject;
 import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
+import com.android.launcher3.accessibility.LauncherAccessibilityDelegate.LauncherAction;
 import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.allapps.AllAppsStore;
 import com.android.launcher3.allapps.AllAppsTransitionController;
@@ -120,7 +122,6 @@ import com.android.launcher3.folder.FolderGridOrganizer;
 import com.android.launcher3.folder.FolderIcon;
 import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.icons.IconCache;
-import com.android.launcher3.keyboard.CustomActionsPopup;
 import com.android.launcher3.keyboard.ViewGroupFocusHelper;
 import com.android.launcher3.logger.LauncherAtom;
 import com.android.launcher3.logging.FileLog;
@@ -163,7 +164,6 @@ import com.android.launcher3.util.PackageManagerHelper;
 import com.android.launcher3.util.PackageUserKey;
 import com.android.launcher3.util.PendingRequestArgs;
 import com.android.launcher3.util.SafeCloseable;
-import com.android.launcher3.util.ShortcutUtil;
 import com.android.launcher3.util.SystemUiController;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.util.Thunk;
@@ -383,7 +383,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         idp.addOnChangeListener(this);
         mSharedPrefs = Utilities.getPrefs(this);
         mIconCache = app.getIconCache();
-        mAccessibilityDelegate = new LauncherAccessibilityDelegate(this);
+        mAccessibilityDelegate = createAccessibilityDelegate();
 
         mDragController = new DragController(this);
         mAllAppsController = new AllAppsTransitionController(this);
@@ -2633,19 +2633,9 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
             shortcutInfos.add(new KeyboardShortcutInfo(getString(R.string.widget_button_text),
                     KeyEvent.KEYCODE_W, KeyEvent.META_CTRL_ON));
         }
-        final View currentFocus = getCurrentFocus();
-        if (currentFocus != null) {
-            if (new CustomActionsPopup(this, currentFocus).canShow()) {
-                shortcutInfos.add(new KeyboardShortcutInfo(getString(R.string.custom_actions),
-                        KeyEvent.KEYCODE_O, KeyEvent.META_CTRL_ON));
-            }
-            if (currentFocus.getTag() instanceof ItemInfo
-                    && ShortcutUtil.supportsShortcuts((ItemInfo) currentFocus.getTag())) {
+        getSupportedActions(this,  getCurrentFocus()).forEach(la ->
                 shortcutInfos.add(new KeyboardShortcutInfo(
-                        getString(R.string.shortcuts_menu_with_notifications_description),
-                        KeyEvent.KEYCODE_S, KeyEvent.META_CTRL_ON));
-            }
-        }
+                        la.accessibilityAction.getLabel(), la.keyCode, KeyEvent.META_CTRL_ON)));
         if (!shortcutInfos.isEmpty()) {
             data.add(new KeyboardShortcutGroup(getString(R.string.home_screen), shortcutInfos));
         }
@@ -2663,30 +2653,18 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
                         return true;
                     }
                     break;
-                case KeyEvent.KEYCODE_S: {
-                    View focusedView = getCurrentFocus();
-                    if (focusedView instanceof BubbleTextView
-                            && focusedView.getTag() instanceof ItemInfo
-                            && mAccessibilityDelegate.performAction(focusedView,
-                            (ItemInfo) focusedView.getTag(),
-                            LauncherAccessibilityDelegate.DEEP_SHORTCUTS,
-                            true)) {
-                        PopupContainerWithArrow.getOpen(this).requestFocus();
-                        return true;
-                    }
-                    break;
-                }
-                case KeyEvent.KEYCODE_O:
-                    if (new CustomActionsPopup(this, getCurrentFocus()).show()) {
-                        return true;
-                    }
-                    break;
                 case KeyEvent.KEYCODE_W:
                     if (isInState(NORMAL)) {
                         OptionsPopupView.openWidgets(this);
                         return true;
                     }
                     break;
+                default:
+                    for (LauncherAction la : getSupportedActions(this, getCurrentFocus())) {
+                        if (la.keyCode == keyCode) {
+                            return la.invokeFromKeyboard(getCurrentFocus());
+                        }
+                    }
             }
         }
         return super.onKeyShortcut(keyCode, event);
@@ -2744,6 +2722,9 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         return Stream.of(APP_INFO, WIDGETS, INSTALL);
     }
 
+    protected LauncherAccessibilityDelegate createAccessibilityDelegate() {
+        return new LauncherAccessibilityDelegate(this);
+    }
 
     /**
      * @see LauncherState#getOverviewScaleAndOffset(Launcher)
diff --git a/src/com/android/launcher3/SecondaryDropTarget.java b/src/com/android/launcher3/SecondaryDropTarget.java
index 92b88e6186..7276887f76 100644
--- a/src/com/android/launcher3/SecondaryDropTarget.java
+++ b/src/com/android/launcher3/SecondaryDropTarget.java
@@ -37,6 +37,8 @@ import com.android.launcher3.Launcher.OnResumeCallback;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.logging.FileLog;
+import com.android.launcher3.logging.InstanceId;
+import com.android.launcher3.logging.InstanceIdSequence;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.logging.StatsLogManager.StatsLogger;
 import com.android.launcher3.model.data.ItemInfo;
@@ -203,9 +205,13 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList
         d.dragSource = new DeferredOnComplete(d.dragSource, getContext());
 
         super.onDrop(d, options);
-        StatsLogger logger = mStatsLogManager.logger().withInstanceId(d.logInstanceId);
-        if (d.originalDragInfo != null) {
-            logger.withItemInfo(d.originalDragInfo);
+        doLog(d.logInstanceId, d.originalDragInfo);
+    }
+
+    private void doLog(InstanceId logInstanceId, ItemInfo itemInfo) {
+        StatsLogger logger = mStatsLogManager.logger().withInstanceId(logInstanceId);
+        if (itemInfo != null) {
+            logger.withItemInfo(itemInfo);
         }
         if (mCurrentAccessibilityAction == UNINSTALL) {
             logger.log(LAUNCHER_ITEM_DROPPED_ON_UNINSTALL);
@@ -296,6 +302,7 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList
 
     @Override
     public void onAccessibilityDrop(View view, ItemInfo item) {
+        doLog(new InstanceIdSequence().newInstanceId(), item);
         performDropAction(view, item);
     }
 
diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
index 6fac79aa7e..cd4616a967 100644
--- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
+++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
@@ -3,17 +3,18 @@ package com.android.launcher3.accessibility;
 import static android.view.accessibility.AccessibilityNodeInfo.ACTION_LONG_CLICK;
 
 import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.IGNORE;
 
-import android.app.AlertDialog;
 import android.appwidget.AppWidgetProviderInfo;
-import android.content.DialogInterface;
 import android.graphics.Point;
 import android.graphics.Rect;
+import android.graphics.RectF;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseArray;
+import android.view.KeyEvent;
 import android.view.View;
 import android.view.View.AccessibilityDelegate;
 import android.view.accessibility.AccessibilityNodeInfo;
@@ -25,7 +26,6 @@ import com.android.launcher3.ButtonDropTarget;
 import com.android.launcher3.CellLayout;
 import com.android.launcher3.DropTarget.DragObject;
 import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.PendingAddItemInfo;
 import com.android.launcher3.R;
@@ -33,7 +33,6 @@ import com.android.launcher3.Workspace;
 import com.android.launcher3.dragndrop.DragController.DragListener;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.folder.Folder;
-import com.android.launcher3.keyboard.CustomActionsPopup;
 import com.android.launcher3.keyboard.KeyboardDragAndDropView;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.FolderInfo;
@@ -41,14 +40,19 @@ import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.notification.NotificationListener;
+import com.android.launcher3.popup.ArrowPopup;
 import com.android.launcher3.popup.PopupContainerWithArrow;
 import com.android.launcher3.touch.ItemLongClickListener;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.ShortcutUtil;
 import com.android.launcher3.util.Thunk;
+import com.android.launcher3.views.OptionsPopupView;
+import com.android.launcher3.views.OptionsPopupView.OptionItem;
 import com.android.launcher3.widget.LauncherAppWidgetHostView;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 public class LauncherAccessibilityDelegate extends AccessibilityDelegate implements DragListener {
 
@@ -78,89 +82,105 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
         public View item;
     }
 
-    protected final SparseArray<AccessibilityAction> mActions = new SparseArray<>();
-    @Thunk final Launcher mLauncher;
+    protected final SparseArray<LauncherAction> mActions = new SparseArray<>();
+    protected final Launcher mLauncher;
 
     private DragInfo mDragInfo = null;
 
     public LauncherAccessibilityDelegate(Launcher launcher) {
         mLauncher = launcher;
 
-        mActions.put(REMOVE, new AccessibilityAction(REMOVE,
-                launcher.getText(R.string.remove_drop_target_label)));
-        mActions.put(UNINSTALL, new AccessibilityAction(UNINSTALL,
-                launcher.getText(R.string.uninstall_drop_target_label)));
-        mActions.put(DISMISS_PREDICTION, new AccessibilityAction(DISMISS_PREDICTION,
-                launcher.getText(R.string.dismiss_prediction_label)));
-        mActions.put(RECONFIGURE, new AccessibilityAction(RECONFIGURE,
-                launcher.getText(R.string.gadget_setup_text)));
-        mActions.put(ADD_TO_WORKSPACE, new AccessibilityAction(ADD_TO_WORKSPACE,
-                launcher.getText(R.string.action_add_to_workspace)));
-        mActions.put(MOVE, new AccessibilityAction(MOVE,
-                launcher.getText(R.string.action_move)));
-        mActions.put(MOVE_TO_WORKSPACE, new AccessibilityAction(MOVE_TO_WORKSPACE,
-                launcher.getText(R.string.action_move_to_workspace)));
-        mActions.put(RESIZE, new AccessibilityAction(RESIZE,
-                        launcher.getText(R.string.action_resize)));
-        mActions.put(DEEP_SHORTCUTS, new AccessibilityAction(DEEP_SHORTCUTS,
-                launcher.getText(R.string.action_deep_shortcut)));
-        mActions.put(SHORTCUTS_AND_NOTIFICATIONS, new AccessibilityAction(DEEP_SHORTCUTS,
-                launcher.getText(R.string.shortcuts_menu_with_notifications_description)));
+        mActions.put(REMOVE, new LauncherAction(
+                REMOVE, R.string.remove_drop_target_label, KeyEvent.KEYCODE_X));
+        mActions.put(UNINSTALL, new LauncherAction(
+                UNINSTALL, R.string.uninstall_drop_target_label, KeyEvent.KEYCODE_U));
+        mActions.put(DISMISS_PREDICTION, new LauncherAction(DISMISS_PREDICTION,
+                R.string.dismiss_prediction_label, KeyEvent.KEYCODE_X));
+        mActions.put(RECONFIGURE, new LauncherAction(
+                RECONFIGURE, R.string.gadget_setup_text, KeyEvent.KEYCODE_E));
+        mActions.put(ADD_TO_WORKSPACE, new LauncherAction(
+                ADD_TO_WORKSPACE, R.string.action_add_to_workspace, KeyEvent.KEYCODE_P));
+        mActions.put(MOVE, new LauncherAction(
+                MOVE, R.string.action_move, KeyEvent.KEYCODE_M));
+        mActions.put(MOVE_TO_WORKSPACE, new LauncherAction(MOVE_TO_WORKSPACE,
+                R.string.action_move_to_workspace, KeyEvent.KEYCODE_P));
+        mActions.put(RESIZE, new LauncherAction(
+                RESIZE, R.string.action_resize, KeyEvent.KEYCODE_R));
+        mActions.put(DEEP_SHORTCUTS, new LauncherAction(DEEP_SHORTCUTS,
+                R.string.action_deep_shortcut, KeyEvent.KEYCODE_S));
+        mActions.put(SHORTCUTS_AND_NOTIFICATIONS, new LauncherAction(DEEP_SHORTCUTS,
+                R.string.shortcuts_menu_with_notifications_description, KeyEvent.KEYCODE_S));
     }
 
     @Override
     public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) {
         super.onInitializeAccessibilityNodeInfo(host, info);
-        addSupportedActions(host, info, false);
-    }
+        if (host.getTag() instanceof ItemInfo) {
+            ItemInfo item = (ItemInfo) host.getTag();
 
-    public void addSupportedActions(View host, AccessibilityNodeInfo info, boolean fromKeyboard) {
-        if (!(host.getTag() instanceof ItemInfo)) return;
-        ItemInfo item = (ItemInfo) host.getTag();
+            List<LauncherAction> actions = new ArrayList<>();
+            getSupportedActions(host, item, actions);
+            actions.forEach(la -> info.addAction(la.accessibilityAction));
 
-        if (host instanceof AccessibilityActionHandler) {
-            ((AccessibilityActionHandler) host).addSupportedAccessibilityActions(info);
+            if (!itemSupportsLongClick(host, item)) {
+                info.setLongClickable(false);
+                info.removeAction(AccessibilityAction.ACTION_LONG_CLICK);
+            }
         }
+    }
 
+    /**
+     * Adds all the accessibility actions that can be handled.
+     */
+    protected void getSupportedActions(View host, ItemInfo item, List<LauncherAction> out) {
         // If the request came from keyboard, do not add custom shortcuts as that is already
         // exposed as a direct shortcut
-        if (!fromKeyboard && ShortcutUtil.supportsShortcuts(item)) {
-            info.addAction(mActions.get(NotificationListener.getInstanceIfConnected() != null
+        if (ShortcutUtil.supportsShortcuts(item)) {
+            out.add(mActions.get(NotificationListener.getInstanceIfConnected() != null
                     ? SHORTCUTS_AND_NOTIFICATIONS : DEEP_SHORTCUTS));
         }
 
         for (ButtonDropTarget target : mLauncher.getDropTargetBar().getDropTargets()) {
             if (target.supportsAccessibilityDrop(item, host)) {
-                info.addAction(mActions.get(target.getAccessibilityAction()));
+                out.add(mActions.get(target.getAccessibilityAction()));
             }
         }
 
         // Do not add move actions for keyboard request as this uses virtual nodes.
         if (itemSupportsAccessibleDrag(item)) {
-            info.addAction(mActions.get(MOVE));
+            out.add(mActions.get(MOVE));
 
             if (item.container >= 0) {
-                info.addAction(mActions.get(MOVE_TO_WORKSPACE));
+                out.add(mActions.get(MOVE_TO_WORKSPACE));
             } else if (item instanceof LauncherAppWidgetInfo) {
                 if (!getSupportedResizeActions(host, (LauncherAppWidgetInfo) item).isEmpty()) {
-                    info.addAction(mActions.get(RESIZE));
+                    out.add(mActions.get(RESIZE));
                 }
             }
         }
 
-        if (!fromKeyboard && !itemSupportsLongClick(host, item)) {
-            info.setLongClickable(false);
-            info.removeAction(AccessibilityAction.ACTION_LONG_CLICK);
+        if ((item instanceof AppInfo) || (item instanceof PendingAddItemInfo)) {
+            out.add(mActions.get(ADD_TO_WORKSPACE));
         }
+    }
 
-        if ((item instanceof AppInfo) || (item instanceof PendingAddItemInfo)) {
-            info.addAction(mActions.get(ADD_TO_WORKSPACE));
+    /**
+     * Returns all the accessibility actions that can be handled by the host.
+     */
+    public static List<LauncherAction> getSupportedActions(Launcher launcher, View host) {
+        if (host == null || !(host.getTag() instanceof  ItemInfo)) {
+            return Collections.emptyList();
         }
+        PopupContainerWithArrow container = PopupContainerWithArrow.getOpen(launcher);
+        LauncherAccessibilityDelegate delegate = container != null
+                ? container.getAccessibilityDelegate() : launcher.getAccessibilityDelegate();
+        List<LauncherAction> result = new ArrayList<>();
+        delegate.getSupportedActions(host, (ItemInfo) host.getTag(), result);
+        return result;
     }
 
     private boolean itemSupportsLongClick(View host, ItemInfo info) {
-        return PopupContainerWithArrow.canShow(host, info)
-                || new CustomActionsPopup(mLauncher, host).canShow();
+        return PopupContainerWithArrow.canShow(host, info);
     }
 
     private boolean itemSupportsAccessibleDrag(ItemInfo item) {
@@ -184,7 +204,7 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
     /**
      * Performs the provided action on the host
      */
-    public boolean performAction(final View host, final ItemInfo item, int action,
+    protected boolean performAction(final View host, final ItemInfo item, int action,
             boolean fromKeyboard) {
         if (action == ACTION_LONG_CLICK) {
             if (PopupContainerWithArrow.canShow(host, item)) {
@@ -193,19 +213,8 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
                 // standard long press path does.
                 PopupContainerWithArrow.showForIcon((BubbleTextView) host);
                 return true;
-            } else {
-                CustomActionsPopup popup = new CustomActionsPopup(mLauncher, host);
-                if (popup.canShow()) {
-                    popup.show();
-                    return true;
-                }
             }
-        }
-        if (host instanceof AccessibilityActionHandler
-                && ((AccessibilityActionHandler) host).performAccessibilityAction(action, item)) {
-            return true;
-        }
-        if (action == MOVE) {
+        } else if (action == MOVE) {
             return beginAccessibleDrag(host, item, fromKeyboard);
         } else if (action == ADD_TO_WORKSPACE) {
             final int[] coordinates = new int[2];
@@ -220,9 +229,7 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
                                 Favorites.CONTAINER_DESKTOP,
                                 screenId, coordinates[0], coordinates[1]);
 
-                        ArrayList<ItemInfo> itemList = new ArrayList<>();
-                        itemList.add(info);
-                        mLauncher.bindItems(itemList, true);
+                        mLauncher.bindItems(Collections.singletonList(info), true);
                         announceConfirmation(R.string.item_added_to_workspace);
                     } else if (item instanceof PendingAddItemInfo) {
                         PendingAddItemInfo info = (PendingAddItemInfo) item;
@@ -243,47 +250,31 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
             final int[] coordinates = new int[2];
             final int screenId = findSpaceOnWorkspace(item, coordinates);
             mLauncher.getModelWriter().moveItemInDatabase(info,
-                    LauncherSettings.Favorites.CONTAINER_DESKTOP,
+                    Favorites.CONTAINER_DESKTOP,
                     screenId, coordinates[0], coordinates[1]);
 
             // Bind the item in next frame so that if a new workspace page was created,
             // it will get laid out.
-            new Handler().post(new Runnable() {
-
-                @Override
-                public void run() {
-                    ArrayList<ItemInfo> itemList = new ArrayList<>();
-                    itemList.add(item);
-                    mLauncher.bindItems(itemList, true);
-                    announceConfirmation(R.string.item_moved);
-                }
+            new Handler().post(() -> {
+                mLauncher.bindItems(Collections.singletonList(item), true);
+                announceConfirmation(R.string.item_moved);
             });
+            return true;
         } else if (action == RESIZE) {
             final LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) item;
-            final IntArray actions = getSupportedResizeActions(host, info);
-            CharSequence[] labels = new CharSequence[actions.size()];
-            for (int i = 0; i < actions.size(); i++) {
-                labels[i] = mLauncher.getText(actions.get(i));
-            }
-
-            new AlertDialog.Builder(mLauncher)
-                .setTitle(R.string.action_resize)
-                .setItems(labels, new DialogInterface.OnClickListener() {
-
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        performResizeAction(actions.get(which), host, info);
-                        dialog.dismiss();
-                    }
-                })
-                .show();
+            List<OptionItem> actions = getSupportedResizeActions(host, info);
+            Rect pos = new Rect();
+            mLauncher.getDragLayer().getDescendantRectRelativeToSelf(host, pos);
+            ArrowPopup popup = OptionsPopupView.show(mLauncher, new RectF(pos), actions);
+            popup.requestFocus();
+            popup.setOnCloseCallback(host::requestFocus);
             return true;
-        } else if (action == DEEP_SHORTCUTS) {
+        } else if (action == DEEP_SHORTCUTS || action == SHORTCUTS_AND_NOTIFICATIONS) {
             return PopupContainerWithArrow.showForIcon((BubbleTextView) host) != null;
         } else {
             for (ButtonDropTarget dropTarget : mLauncher.getDropTargetBar().getDropTargets()) {
-                if (dropTarget.supportsAccessibilityDrop(item, host) &&
-                        action == dropTarget.getAccessibilityAction()) {
+                if (dropTarget.supportsAccessibilityDrop(item, host)
+                        && action == dropTarget.getAccessibilityAction()) {
                     dropTarget.onAccessibilityDrop(host, item);
                     return true;
                 }
@@ -292,9 +283,8 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
         return false;
     }
 
-    private IntArray getSupportedResizeActions(View host, LauncherAppWidgetInfo info) {
-        IntArray actions = new IntArray();
-
+    private List<OptionItem> getSupportedResizeActions(View host, LauncherAppWidgetInfo info) {
+        List<OptionItem> actions = new ArrayList<>();
         AppWidgetProviderInfo providerInfo = ((LauncherAppWidgetHostView) host).getAppWidgetInfo();
         if (providerInfo == null) {
             return actions;
@@ -304,28 +294,40 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
         if ((providerInfo.resizeMode & AppWidgetProviderInfo.RESIZE_HORIZONTAL) != 0) {
             if (layout.isRegionVacant(info.cellX + info.spanX, info.cellY, 1, info.spanY) ||
                     layout.isRegionVacant(info.cellX - 1, info.cellY, 1, info.spanY)) {
-                actions.add(R.string.action_increase_width);
+                actions.add(new OptionItem(
+                        R.string.action_increase_width, R.drawable.ic_widget_width_increase,
+                        IGNORE,
+                        v -> performResizeAction(R.string.action_increase_width, host, info)));
             }
 
             if (info.spanX > info.minSpanX && info.spanX > 1) {
-                actions.add(R.string.action_decrease_width);
+                actions.add(new OptionItem(
+                        R.string.action_decrease_width, R.drawable.ic_widget_width_decrease,
+                        IGNORE,
+                        v -> performResizeAction(R.string.action_decrease_width, host, info)));
             }
         }
 
         if ((providerInfo.resizeMode & AppWidgetProviderInfo.RESIZE_VERTICAL) != 0) {
             if (layout.isRegionVacant(info.cellX, info.cellY + info.spanY, info.spanX, 1) ||
                     layout.isRegionVacant(info.cellX, info.cellY - 1, info.spanX, 1)) {
-                actions.add(R.string.action_increase_height);
+                actions.add(new OptionItem(
+                        R.string.action_increase_height, R.drawable.ic_widget_height_increase,
+                        IGNORE,
+                        v -> performResizeAction(R.string.action_increase_height, host, info)));
             }
 
             if (info.spanY > info.minSpanY && info.spanY > 1) {
-                actions.add(R.string.action_decrease_height);
+                actions.add(new OptionItem(
+                        R.string.action_decrease_height, R.drawable.ic_widget_height_decrease,
+                        IGNORE,
+                        v -> performResizeAction(R.string.action_decrease_height, host, info)));
             }
         }
         return actions;
     }
 
-    @Thunk void performResizeAction(int action, View host, LauncherAppWidgetInfo info) {
+    private boolean performResizeAction(int action, View host, LauncherAppWidgetInfo info) {
         CellLayout.LayoutParams lp = (CellLayout.LayoutParams) host.getLayoutParams();
         CellLayout layout = (CellLayout) host.getParent().getParent();
         layout.markCellsAsUnoccupiedForView(host);
@@ -362,6 +364,7 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
         host.requestLayout();
         mLauncher.getModelWriter().updateItemInDatabase(info);
         announceConfirmation(mLauncher.getString(R.string.widget_resized, info.spanX, info.spanY));
+        return true;
     }
 
     @Thunk void announceConfirmation(int resId) {
@@ -489,19 +492,28 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
         return screenId;
     }
 
-    /**
-     * An interface allowing views to handle their own action.
-     */
-    public interface AccessibilityActionHandler {
+    public class LauncherAction {
+        public final int keyCode;
+        public final AccessibilityAction accessibilityAction;
 
-        /**
-         * performs accessibility action and returns true on success
-         */
-        boolean performAccessibilityAction(int action, ItemInfo itemInfo);
+        private final LauncherAccessibilityDelegate mDelegate;
+
+        public LauncherAction(int id, int labelRes, int keyCode) {
+            this.keyCode = keyCode;
+            accessibilityAction = new AccessibilityAction(id, mLauncher.getString(labelRes));
+            mDelegate = LauncherAccessibilityDelegate.this;
+        }
 
         /**
-         * adds all the accessibility actions that can be handled.
+         * Invokes the action for the provided host
          */
-        void addSupportedAccessibilityActions(AccessibilityNodeInfo accessibilityNodeInfo);
+        public boolean invokeFromKeyboard(View host) {
+            if (host != null && host.getTag() instanceof ItemInfo) {
+                return mDelegate.performAction(
+                        host, (ItemInfo) host.getTag(), accessibilityAction.getId(), true);
+            } else {
+                return false;
+            }
+        }
     }
 }
diff --git a/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java
index aaaff98e18..1733e5dd41 100644
--- a/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java
+++ b/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java
@@ -18,9 +18,8 @@ package com.android.launcher3.accessibility;
 
 import static com.android.launcher3.LauncherState.NORMAL;
 
+import android.view.KeyEvent;
 import android.view.View;
-import android.view.accessibility.AccessibilityNodeInfo;
-import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
 
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.Launcher;
@@ -31,7 +30,8 @@ import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.notification.NotificationMainView;
 import com.android.launcher3.shortcuts.DeepShortcutView;
 
-import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * Extension of {@link LauncherAccessibilityDelegate} with actions specific to shortcuts in
@@ -43,23 +43,23 @@ public class ShortcutMenuAccessibilityDelegate extends LauncherAccessibilityDele
 
     public ShortcutMenuAccessibilityDelegate(Launcher launcher) {
         super(launcher);
-        mActions.put(DISMISS_NOTIFICATION, new AccessibilityAction(DISMISS_NOTIFICATION,
-                launcher.getText(R.string.action_dismiss_notification)));
+        mActions.put(DISMISS_NOTIFICATION, new LauncherAction(DISMISS_NOTIFICATION,
+                R.string.action_dismiss_notification, KeyEvent.KEYCODE_X));
     }
 
     @Override
-    public void addSupportedActions(View host, AccessibilityNodeInfo info, boolean fromKeyboard) {
+    protected void getSupportedActions(View host, ItemInfo item, List<LauncherAction> out) {
         if ((host.getParent() instanceof DeepShortcutView)) {
-            info.addAction(mActions.get(ADD_TO_WORKSPACE));
+            out.add(mActions.get(ADD_TO_WORKSPACE));
         } else if (host instanceof NotificationMainView) {
             if (((NotificationMainView) host).canChildBeDismissed()) {
-                info.addAction(mActions.get(DISMISS_NOTIFICATION));
+                out.add(mActions.get(DISMISS_NOTIFICATION));
             }
         }
     }
 
     @Override
-    public boolean performAction(View host, ItemInfo item, int action, boolean fromKeyboard) {
+    protected boolean performAction(View host, ItemInfo item, int action, boolean fromKeyboard) {
         if (action == ADD_TO_WORKSPACE) {
             if (!(host.getParent() instanceof DeepShortcutView)) {
                 return false;
@@ -73,9 +73,7 @@ public class ShortcutMenuAccessibilityDelegate extends LauncherAccessibilityDele
                     mLauncher.getModelWriter().addItemToDatabase(info,
                             LauncherSettings.Favorites.CONTAINER_DESKTOP,
                             screenId, coordinates[0], coordinates[1]);
-                    ArrayList<ItemInfo> itemList = new ArrayList<>();
-                    itemList.add(info);
-                    mLauncher.bindItems(itemList, true);
+                    mLauncher.bindItems(Collections.singletonList(info), true);
                     AbstractFloatingView.closeAllOpenViews(mLauncher);
                     announceConfirmation(R.string.item_added_to_workspace);
                 }
diff --git a/src/com/android/launcher3/keyboard/CustomActionsPopup.java b/src/com/android/launcher3/keyboard/CustomActionsPopup.java
deleted file mode 100644
index 77ce4a8c88..0000000000
--- a/src/com/android/launcher3/keyboard/CustomActionsPopup.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.keyboard;
-
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.accessibility.AccessibilityNodeInfo;
-import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
-import android.widget.PopupMenu;
-import android.widget.PopupMenu.OnMenuItemClickListener;
-
-import com.android.launcher3.Launcher;
-import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
-import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.popup.PopupContainerWithArrow;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Handles showing a popup menu with available custom actions for a launcher icon.
- * This allows exposing various custom actions using keyboard shortcuts.
- */
-public class CustomActionsPopup implements OnMenuItemClickListener {
-
-    private final Launcher mLauncher;
-    private final LauncherAccessibilityDelegate mDelegate;
-    private final View mIcon;
-
-    public CustomActionsPopup(Launcher launcher, View icon) {
-        mLauncher = launcher;
-        mIcon = icon;
-        PopupContainerWithArrow container = PopupContainerWithArrow.getOpen(launcher);
-        if (container != null) {
-            mDelegate = container.getAccessibilityDelegate();
-        } else {
-            mDelegate = launcher.getAccessibilityDelegate();
-        }
-    }
-
-    private List<AccessibilityAction> getActionList() {
-        if (mIcon == null || !(mIcon.getTag() instanceof ItemInfo)) {
-            return Collections.EMPTY_LIST;
-        }
-
-        AccessibilityNodeInfo info = AccessibilityNodeInfo.obtain();
-        mDelegate.addSupportedActions(mIcon, info, true);
-        List<AccessibilityAction> result = new ArrayList<>(info.getActionList());
-        info.recycle();
-        return result;
-    }
-
-    public boolean canShow() {
-        return !getActionList().isEmpty();
-    }
-
-    public boolean show() {
-        List<AccessibilityAction> actions = getActionList();
-        if (actions.isEmpty()) {
-            return false;
-        }
-
-        PopupMenu popup = new PopupMenu(mLauncher, mIcon);
-        popup.setOnMenuItemClickListener(this);
-        Menu menu = popup.getMenu();
-        for (AccessibilityAction action : actions) {
-            menu.add(Menu.NONE, action.getId(), Menu.NONE, action.getLabel());
-        }
-        popup.show();
-        return true;
-    }
-
-    @Override
-    public boolean onMenuItemClick(MenuItem menuItem) {
-        return mDelegate.performAction(mIcon, (ItemInfo) mIcon.getTag(), menuItem.getItemId(),
-                true);
-    }
-}
diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java
index 90285c470b..56438d0815 100644
--- a/src/com/android/launcher3/popup/ArrowPopup.java
+++ b/src/com/android/launcher3/popup/ArrowPopup.java
@@ -40,6 +40,8 @@ import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
 import android.widget.FrameLayout;
 
+import androidx.annotation.NonNull;
+
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.InsettableFrameLayout;
@@ -82,6 +84,8 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
     private final Rect mStartRect = new Rect();
     private final Rect mEndRect = new Rect();
 
+    private Runnable mOnCloseCallback = () -> { };
+
     public ArrowPopup(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         mInflater = LayoutInflater.from(context);
@@ -555,6 +559,14 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
         mDeferContainerRemoval = false;
         getPopupContainer().removeView(this);
         getPopupContainer().removeView(mArrow);
+        mOnCloseCallback.run();
+    }
+
+    /**
+     * Callback to be called when the popup is closed
+     */
+    public void setOnCloseCallback(@NonNull Runnable callback) {
+        mOnCloseCallback = callback;
     }
 
     protected BaseDragLayer getPopupContainer() {
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index 59930ff850..a1ba74703c 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -206,6 +206,7 @@ public class PopupContainerWithArrow<T extends BaseDraggingActivity> extends Arr
                         .filter(Objects::nonNull)
                         .collect(Collectors.toList()));
         launcher.refreshAndBindWidgetsForPackageUser(PackageUserKey.fromItemInfo(item));
+        container.requestFocus();
         return container;
     }
 
diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java
index addaf9cb82..0cb8c1ec77 100644
--- a/src/com/android/launcher3/views/OptionsPopupView.java
+++ b/src/com/android/launcher3/views/OptionsPopupView.java
@@ -118,7 +118,8 @@ public class OptionsPopupView extends ArrowPopup
         mTargetRect.roundOut(outPos);
     }
 
-    public static void show(Launcher launcher, RectF targetRect, List<OptionItem> items) {
+    public static OptionsPopupView show(
+            Launcher launcher, RectF targetRect, List<OptionItem> items) {
         OptionsPopupView popup = (OptionsPopupView) launcher.getLayoutInflater()
                 .inflate(R.layout.longpress_options_menu, launcher.getDragLayer(), false);
         popup.mTargetRect = targetRect;
@@ -134,6 +135,7 @@ public class OptionsPopupView extends ArrowPopup
             popup.mItemMap.put(view, item);
         }
         popup.show();
+        return popup;
     }
 
     @VisibleForTesting
-- 
GitLab


From 0be3a615d91ee773d5f4bd474473d703881850e8 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Thu, 11 Feb 2021 18:57:35 +0000
Subject: [PATCH 0523/1664] Render preview layout in full widgets sheet and
 bottom widgets sheet

Video: https://drive.google.com/file/d/1gRE0axaq6tm3R_gjSon0RR5lC8HCmwee/view?usp=sharing

Test: Install a sample app which provides a preview layout.
      Go to full widgets sheet to observe widget previews are correctly
      displayed for bitmap previews, layout previews and placeholder
      previews. Repeat the same for bottom widgets picker.
      Pin a widget from a sample app which provide a custom RemoteViews
      preview, observe the custom RemoteViews is correctly rendered.

Bug: 179797520
Change-Id: I2ccd1f77b54a2430d842ee25349fa6e54b9159dc
---
 res/layout/live_preview_widget_cell.xml       | 28 +++++++++++++++++++
 .../dragndrop/LivePreviewWidgetCell.java      | 23 +++++++++++++++
 .../launcher3/widget/BaseWidgetSheet.java     | 11 ++++++--
 .../widget/PendingItemDragHelper.java         |  6 ++--
 .../launcher3/widget/WidgetsBottomSheet.java  |  5 ++--
 .../WidgetsListRowViewHolderBinder.java       |  8 ++++--
 6 files changed, 71 insertions(+), 10 deletions(-)
 create mode 100644 res/layout/live_preview_widget_cell.xml

diff --git a/res/layout/live_preview_widget_cell.xml b/res/layout/live_preview_widget_cell.xml
new file mode 100644
index 0000000000..7a42d195f0
--- /dev/null
+++ b/res/layout/live_preview_widget_cell.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.launcher3.dragndrop.LivePreviewWidgetCell
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_weight="1"
+    android:orientation="vertical"
+    android:focusable="true"
+    android:background="?android:attr/colorPrimaryDark"
+    android:gravity="center_horizontal">
+
+    <include layout="@layout/widget_cell_content"  />
+
+</com.android.launcher3.dragndrop.LivePreviewWidgetCell>
\ No newline at end of file
diff --git a/src/com/android/launcher3/dragndrop/LivePreviewWidgetCell.java b/src/com/android/launcher3/dragndrop/LivePreviewWidgetCell.java
index a9389bc8b3..71e10a82b0 100644
--- a/src/com/android/launcher3/dragndrop/LivePreviewWidgetCell.java
+++ b/src/com/android/launcher3/dragndrop/LivePreviewWidgetCell.java
@@ -10,7 +10,9 @@ import android.widget.RemoteViews;
 import com.android.launcher3.BaseActivity;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.LauncherAppWidgetProviderInfo;
+import com.android.launcher3.WidgetPreviewLoader;
 import com.android.launcher3.icons.BitmapRenderer;
+import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.widget.WidgetCell;
 
 /**
@@ -36,6 +38,15 @@ public class LivePreviewWidgetCell extends WidgetCell {
         mPreview = view;
     }
 
+    public RemoteViews getPreview() {
+        return mPreview;
+    }
+
+    /** Resets any resource. This should be called before recycling this view. */
+    public void reset() {
+        mPreview = null;
+    }
+
     @Override
     public void ensurePreview() {
         if (mPreview != null && mActiveRequest == null) {
@@ -49,6 +60,18 @@ public class LivePreviewWidgetCell extends WidgetCell {
         super.ensurePreview();
     }
 
+    @Override
+    public void applyFromCellItem(WidgetItem item, WidgetPreviewLoader loader) {
+        if (mPreview == null
+                && item.widgetInfo != null
+                && item.widgetInfo.previewLayout != View.NO_ID) {
+            mPreview = new RemoteViews(item.widgetInfo.provider.getPackageName(),
+                    item.widgetInfo.previewLayout);
+        }
+
+        super.applyFromCellItem(item, loader);
+    }
+
     /**
      * Generates a bitmap by inflating {@param views}.
      * @see com.android.launcher3.WidgetPreviewLoader#generateWidgetPreview
diff --git a/src/com/android/launcher3/widget/BaseWidgetSheet.java b/src/com/android/launcher3/widget/BaseWidgetSheet.java
index a38e90dfd8..15566a4e8e 100644
--- a/src/com/android/launcher3/widget/BaseWidgetSheet.java
+++ b/src/com/android/launcher3/widget/BaseWidgetSheet.java
@@ -30,6 +30,7 @@ import com.android.launcher3.DropTarget.DragObject;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.dragndrop.DragOptions;
+import com.android.launcher3.dragndrop.LivePreviewWidgetCell;
 import com.android.launcher3.popup.PopupDataProvider;
 import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.TestProtocol;
@@ -99,12 +100,16 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView
             return false;
         }
 
+        PendingItemDragHelper dragHelper = new PendingItemDragHelper(v);
+        if (v instanceof LivePreviewWidgetCell) {
+            dragHelper.setPreview(((LivePreviewWidgetCell) v).getPreview());
+        }
+
         int[] loc = new int[2];
         getPopupContainer().getLocationInDragLayer(image, loc);
 
-        new PendingItemDragHelper(v).startDrag(
-                image.getBitmapBounds(), image.getBitmap().getWidth(), image.getWidth(),
-                new Point(loc[0], loc[1]), this, new DragOptions());
+        dragHelper.startDrag(image.getBitmapBounds(), image.getBitmap().getWidth(),
+                image.getWidth(), new Point(loc[0], loc[1]), this, new DragOptions());
         close(true);
         return true;
     }
diff --git a/src/com/android/launcher3/widget/PendingItemDragHelper.java b/src/com/android/launcher3/widget/PendingItemDragHelper.java
index 3c112740cf..8fe42f4861 100644
--- a/src/com/android/launcher3/widget/PendingItemDragHelper.java
+++ b/src/com/android/launcher3/widget/PendingItemDragHelper.java
@@ -25,6 +25,8 @@ import android.graphics.drawable.Drawable;
 import android.view.View;
 import android.widget.RemoteViews;
 
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.DragSource;
 import com.android.launcher3.Launcher;
@@ -48,14 +50,14 @@ public class PendingItemDragHelper extends DragPreviewProvider {
     private final PendingAddItemInfo mAddInfo;
     private int[] mEstimatedCellSize;
 
-    private RemoteViews mPreview;
+    @Nullable private RemoteViews mPreview;
 
     public PendingItemDragHelper(View view) {
         super(view);
         mAddInfo = (PendingAddItemInfo) view.getTag();
     }
 
-    public void setPreview(RemoteViews preview) {
+    public void setPreview(@Nullable RemoteViews preview) {
         mPreview = preview;
     }
 
diff --git a/src/com/android/launcher3/widget/WidgetsBottomSheet.java b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
index 3585a1814b..223cda272a 100644
--- a/src/com/android/launcher3/widget/WidgetsBottomSheet.java
+++ b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
@@ -36,6 +36,7 @@ import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.ResourceUtils;
 import com.android.launcher3.anim.PendingAnimation;
+import com.android.launcher3.dragndrop.LivePreviewWidgetCell;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.util.PackageUserKey;
@@ -136,8 +137,8 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
     }
 
     protected WidgetCell addItemCell(ViewGroup parent) {
-        WidgetCell widget = (WidgetCell) LayoutInflater.from(getContext()).inflate(
-                R.layout.widget_cell, parent, false);
+        LivePreviewWidgetCell widget = (LivePreviewWidgetCell) LayoutInflater.from(
+                getContext()).inflate(R.layout.live_preview_widget_cell, parent, false);
 
         widget.setOnClickListener(this);
         widget.setOnLongClickListener(this);
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListRowViewHolderBinder.java b/src/com/android/launcher3/widget/picker/WidgetsListRowViewHolderBinder.java
index cec6b807ec..bd787775d9 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListRowViewHolderBinder.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListRowViewHolderBinder.java
@@ -25,6 +25,7 @@ import android.view.ViewGroup;
 
 import com.android.launcher3.R;
 import com.android.launcher3.WidgetPreviewLoader;
+import com.android.launcher3.dragndrop.LivePreviewWidgetCell;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.recyclerview.ViewHolderBinder;
 import com.android.launcher3.widget.WidgetCell;
@@ -107,8 +108,8 @@ public class WidgetsListRowViewHolderBinder
                     mLayoutInflater.inflate(R.layout.widget_list_divider, row);
                 } else {
                     // Add cell for even index
-                    WidgetCell widget = (WidgetCell) mLayoutInflater.inflate(
-                            R.layout.widget_cell, row, false);
+                    LivePreviewWidgetCell widget = (LivePreviewWidgetCell) mLayoutInflater.inflate(
+                            R.layout.live_preview_widget_cell, row, false);
 
                     // set up touch.
                     widget.setOnClickListener(mIconClickListener);
@@ -124,7 +125,8 @@ public class WidgetsListRowViewHolderBinder
 
         // Bind the view in the widget horizontal tray region.
         for (int i = 0; i < infoList.size(); i++) {
-            WidgetCell widget = (WidgetCell) row.getChildAt(2 * i);
+            LivePreviewWidgetCell widget = (LivePreviewWidgetCell) row.getChildAt(2 * i);
+            widget.reset();
             widget.applyFromCellItem(infoList.get(i), mWidgetPreviewLoader);
             widget.setApplyBitmapDeferred(mApplyBitmapDeferred);
             widget.ensurePreview();
-- 
GitLab


From 960ddb07fcfa8ae99db241e3b3a50d3629347d16 Mon Sep 17 00:00:00 2001
From: Sreyas <sreyasr@google.com>
Date: Thu, 11 Feb 2021 15:25:54 -0800
Subject: [PATCH 0524/1664] ShareTargets animations and styling.

Test: Manual
Bug: 169772466
Change-Id: I5a5118e23f90c4c585ad78f054e2c3e6b5d32001
---
 .../android/quickstep/views/OverviewActionsView.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
index 8fb7e03da8..1241982040 100644
--- a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
+++ b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
@@ -189,6 +189,14 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
 
     /** Updates vertical margins for different navigation mode or configuration changes. */
     public void updateVerticalMargin(Mode mode) {
+        LayoutParams actionParams = (LayoutParams) findViewById(
+                R.id.action_buttons).getLayoutParams();
+        actionParams.setMargins(
+                actionParams.leftMargin, actionParams.topMargin, actionParams.rightMargin,
+                getBottomVerticalMargin(mode));
+    }
+
+    protected int getBottomVerticalMargin(Mode mode) {
         int bottomMargin;
         int orientation = getResources().getConfiguration().orientation;
         if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
@@ -201,8 +209,6 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
                     .getDimensionPixelSize(R.dimen.overview_actions_bottom_margin_gesture);
         }
         bottomMargin += mInsets.bottom;
-        LayoutParams params = (LayoutParams) getLayoutParams();
-        params.setMargins(
-                params.leftMargin, params.topMargin, params.rightMargin, bottomMargin);
+        return bottomMargin;
     }
 }
-- 
GitLab


From 1906cc33f9c6a8b58f3f260d184cfb5ac1b225fc Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Thu, 11 Feb 2021 11:55:24 -0800
Subject: [PATCH 0525/1664] Refactor Folder to use ActivityContext and
 BaseDragLayer

These are the more generic versions of Launcher and DragLayer, so
that Folders can be used in other surfaces.

Test: Open and close Folders on home screen, ensure works properly
Bug: 171917176
Change-Id: I39b9aedbd8319ca61ea0e776bc95eab585e023d5
---
 src/com/android/launcher3/BaseActivity.java   |  3 +-
 src/com/android/launcher3/Launcher.java       | 38 ++++++++
 src/com/android/launcher3/folder/Folder.java  | 89 ++++++++-----------
 .../folder/FolderAnimationManager.java        | 12 ++-
 .../android/launcher3/folder/FolderIcon.java  | 14 +--
 .../launcher3/folder/FolderPagedView.java     |  5 +-
 .../launcher3/views/ActivityContext.java      | 25 +++++-
 7 files changed, 109 insertions(+), 77 deletions(-)

diff --git a/src/com/android/launcher3/BaseActivity.java b/src/com/android/launcher3/BaseActivity.java
index 8a03facbf2..062ab7112f 100644
--- a/src/com/android/launcher3/BaseActivity.java
+++ b/src/com/android/launcher3/BaseActivity.java
@@ -31,7 +31,6 @@ import android.graphics.Rect;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.util.Log;
-import android.view.ContextThemeWrapper;
 
 import androidx.annotation.IntDef;
 
@@ -333,7 +332,7 @@ public abstract class BaseActivity extends Activity implements ActivityContext {
     public static <T extends BaseActivity> T fromContext(Context context) {
         if (context instanceof BaseActivity) {
             return (T) context;
-        } else if (context instanceof ContextThemeWrapper) {
+        } else if (context instanceof ContextWrapper) {
             return fromContext(((ContextWrapper) context).getBaseContext());
         } else {
             throw new IllegalArgumentException("Cannot find BaseActivity in parent tree");
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 51e7c7d175..1d6301ba25 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -74,6 +74,7 @@ import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
+import android.graphics.Rect;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.CancellationSignal;
@@ -1797,6 +1798,43 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         return newFolder;
     }
 
+    @Override
+    public Rect getFolderBoundingBox() {
+        // We need to bound the folder to the currently visible workspace area
+        Rect folderBoundingBox = new Rect();
+        getWorkspace().getPageAreaRelativeToDragLayer(folderBoundingBox);
+        return folderBoundingBox;
+    }
+
+    @Override
+    public void updateOpenFolderPosition(int[] inOutPosition, Rect bounds, int width, int height) {
+        int left = inOutPosition[0];
+        int top = inOutPosition[1];
+        DeviceProfile grid = getDeviceProfile();
+        int distFromEdgeOfScreen = getWorkspace().getPaddingLeft();
+        if (grid.isPhone && (grid.availableWidthPx - width) < 4 * distFromEdgeOfScreen) {
+            // Center the folder if it is very close to being centered anyway, by virtue of
+            // filling the majority of the viewport. ie. remove it from the uncanny valley
+            // of centeredness.
+            left = (grid.availableWidthPx - width) / 2;
+        } else if (width >= bounds.width()) {
+            // If the folder doesn't fit within the bounds, center it about the desired bounds
+            left = bounds.left + (bounds.width() - width) / 2;
+        }
+        if (height >= bounds.height()) {
+            // Folder height is greater than page height, center on page
+            top = bounds.top + (bounds.height() - height) / 2;
+        } else {
+            // Folder height is less than page height, so bound it to the absolute open folder
+            // bounds if necessary
+            Rect folderBounds = grid.getAbsoluteOpenFolderBounds();
+            left = Math.max(folderBounds.left, Math.min(left, folderBounds.right - width));
+            top = Math.max(folderBounds.top, Math.min(top, folderBounds.bottom - height));
+        }
+        inOutPosition[0] = left;
+        inOutPosition[1] = top;
+    }
+
     /**
      * Unbinds the view for the specified item, and removes the item and all its children.
      *
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index 74d8dca98d..9efbc7dcab 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -46,6 +46,7 @@ import android.util.Log;
 import android.util.Pair;
 import android.view.FocusFinder;
 import android.view.KeyEvent;
+import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewDebug;
@@ -82,7 +83,6 @@ import com.android.launcher3.accessibility.FolderAccessibilityHelper;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.dragndrop.DragController;
 import com.android.launcher3.dragndrop.DragController.DragListener;
-import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.logger.LauncherAtom.FromState;
 import com.android.launcher3.logger.LauncherAtom.ToState;
@@ -96,6 +96,8 @@ import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pageindicators.PageIndicatorDots;
 import com.android.launcher3.util.Executors;
 import com.android.launcher3.util.Thunk;
+import com.android.launcher3.views.ActivityContext;
+import com.android.launcher3.views.BaseDragLayer;
 import com.android.launcher3.views.ClipPathView;
 import com.android.launcher3.widget.PendingAddShortcutInfo;
 
@@ -165,7 +167,11 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
     private AnimatorSet mCurrentAnimator;
     private boolean mIsAnimatingClosed = false;
 
+    // Folder can be displayed in Launcher's activity or a separate window (e.g. Taskbar).
+    // Anything specific to Launcher should use mLauncher, otherwise should use mActivityContext.
     protected final Launcher mLauncher;
+    protected final ActivityContext mActivityContext;
+
     protected DragController mDragController;
     public FolderInfo mInfo;
     private CharSequence mFromTitle;
@@ -228,6 +234,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         setAlwaysDrawnWithCacheEnabled(false);
 
         mLauncher = Launcher.getLauncher(context);
+        mActivityContext = ActivityContext.lookupContext(context);
         mStatsLogManager = StatsLogManager.newInstance(context);
         // We need this view to be focusable in touch mode so that when text editing of the folder
         // name is complete, we have something to focus on, thus hiding the cursor and giving
@@ -457,9 +464,9 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         Collections.sort(children, ITEM_POS_COMPARATOR);
         updateItemLocationsInDatabaseBatch(true);
 
-        DragLayer.LayoutParams lp = (DragLayer.LayoutParams) getLayoutParams();
+        BaseDragLayer.LayoutParams lp = (BaseDragLayer.LayoutParams) getLayoutParams();
         if (lp == null) {
-            lp = new DragLayer.LayoutParams(0, 0);
+            lp = new BaseDragLayer.LayoutParams(0, 0);
             lp.customPosition = true;
             setLayoutParams(lp);
         }
@@ -513,13 +520,14 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
     /**
      * Creates a new UserFolder, inflated from R.layout.user_folder.
      *
-     * @param launcher The main activity.
+     * @param activityContext The main ActivityContext in which to inflate this Folder. It must also
+     *                        be an instance or ContextWrapper around the Launcher activity context.
      *
      * @return A new UserFolder.
      */
     @SuppressLint("InflateParams")
-    static Folder fromXml(Launcher launcher) {
-        return (Folder) launcher.getLayoutInflater()
+    static <T extends Context & ActivityContext> Folder fromXml(T activityContext) {
+        return (Folder) LayoutInflater.from(activityContext).cloneInContext(activityContext)
                 .inflate(R.layout.user_folder_icon_normalized, null);
     }
 
@@ -597,7 +605,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
      * is played.
      */
     private void animateOpen(List<WorkspaceItemInfo> items, int pageNo) {
-        Folder openFolder = getOpen(mLauncher);
+        Folder openFolder = getOpen(mActivityContext);
         if (openFolder != null && openFolder != this) {
             // Close any open folder before opening a folder.
             openFolder.close(true);
@@ -610,7 +618,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
 
         mIsOpen = true;
 
-        DragLayer dragLayer = mLauncher.getDragLayer();
+        BaseDragLayer dragLayer = mActivityContext.getDragLayer();
         // Just verify that the folder hasn't already been added to the DragLayer.
         // There was a one-off crash where the folder had a parent already.
         if (getParent() == null) {
@@ -724,7 +732,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
 
         // Notify the accessibility manager that this folder "window" has disappeared and no
         // longer occludes the workspace items
-        mLauncher.getDragLayer().sendAccessibilityEvent(
+        mActivityContext.getDragLayer().sendAccessibilityEvent(
                 AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
     }
 
@@ -772,7 +780,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
 
     private void closeComplete(boolean wasAnimated) {
         // TODO: Clear all active animations.
-        DragLayer parent = (DragLayer) getParent();
+        BaseDragLayer parent = (BaseDragLayer) getParent();
         if (parent != null) {
             parent.removeView(this);
         }
@@ -1011,7 +1019,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
 
     private void updateItemLocationsInDatabaseBatch(boolean isBind) {
         FolderGridOrganizer verifier = new FolderGridOrganizer(
-                mLauncher.getDeviceProfile().inv).setFolderInfo(mInfo);
+                mActivityContext.getDeviceProfile().inv).setFolderInfo(mInfo);
 
         ArrayList<ItemInfo> items = new ArrayList<>();
         int total = mInfo.contents.size();
@@ -1048,10 +1056,8 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
     }
 
     private void centerAboutIcon() {
-        DeviceProfile grid = mLauncher.getDeviceProfile();
-
-        DragLayer.LayoutParams lp = (DragLayer.LayoutParams) getLayoutParams();
-        DragLayer parent = mLauncher.getDragLayer();
+        BaseDragLayer.LayoutParams lp = (BaseDragLayer.LayoutParams) getLayoutParams();
+        BaseDragLayer parent = mActivityContext.getDragLayer();
         int width = getFolderWidth();
         int height = getFolderHeight();
 
@@ -1061,38 +1067,13 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         int centeredLeft = centerX - width / 2;
         int centeredTop = centerY - height / 2;
 
-        // We need to bound the folder to the currently visible workspace area
-        if (mLauncher.getStateManager().getState().overviewUi) {
-            parent.getDescendantRectRelativeToSelf(mLauncher.getOverviewPanel(), sTempRect);
-        } else {
-            mLauncher.getWorkspace().getPageAreaRelativeToDragLayer(sTempRect);
-        }
-        int left = Math.min(Math.max(sTempRect.left, centeredLeft),
-                sTempRect.right- width);
-        int top = Math.min(Math.max(sTempRect.top, centeredTop),
-                sTempRect.bottom - height);
-
-        int distFromEdgeOfScreen = mLauncher.getWorkspace().getPaddingLeft() + getPaddingLeft();
-
-        if (grid.isPhone && (grid.availableWidthPx - width) < 4 * distFromEdgeOfScreen) {
-            // Center the folder if it is very close to being centered anyway, by virtue of
-            // filling the majority of the viewport. ie. remove it from the uncanny valley
-            // of centeredness.
-            left = (grid.availableWidthPx - width) / 2;
-        } else if (width >= sTempRect.width()) {
-            // If the folder doesn't fit within the bounds, center it about the desired bounds
-            left = sTempRect.left + (sTempRect.width() - width) / 2;
-        }
-        if (height >= sTempRect.height()) {
-            // Folder height is greater than page height, center on page
-            top = sTempRect.top + (sTempRect.height() - height) / 2;
-        } else {
-            // Folder height is less than page height, so bound it to the absolute open folder
-            // bounds if necessary
-            Rect folderBounds = grid.getAbsoluteOpenFolderBounds();
-            left = Math.max(folderBounds.left, Math.min(left, folderBounds.right - width));
-            top = Math.max(folderBounds.top, Math.min(top, folderBounds.bottom - height));
-        }
+        sTempRect.set(mActivityContext.getFolderBoundingBox());
+        int left = Utilities.boundToRange(centeredLeft, sTempRect.left, sTempRect.right - width);
+        int top = Utilities.boundToRange(centeredTop, sTempRect.top, sTempRect.bottom - height);
+        int[] inOutPosition = new int[] {left, top};
+        mActivityContext.updateOpenFolderPosition(inOutPosition, sTempRect, width, height);
+        left = inOutPosition[0];
+        top = inOutPosition[1];
 
         int folderPivotX = width / 2 + (centeredLeft - left);
         int folderPivotY = height / 2 + (centeredTop - top);
@@ -1106,7 +1087,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
     }
 
     protected int getContentAreaHeight() {
-        DeviceProfile grid = mLauncher.getDeviceProfile();
+        DeviceProfile grid = mActivityContext.getDeviceProfile();
         int maxContentAreaHeight = grid.availableHeightPx - grid.getTotalWorkspacePadding().y
                 - mFooterHeight;
         int height = Math.min(maxContentAreaHeight,
@@ -1384,7 +1365,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
     @Override
     public void onAdd(WorkspaceItemInfo item, int rank) {
         FolderGridOrganizer verifier = new FolderGridOrganizer(
-                mLauncher.getDeviceProfile().inv).setFolderInfo(mInfo);
+                mActivityContext.getDeviceProfile().inv).setFolderInfo(mInfo);
         verifier.updateRankAndPos(item, rank);
         mLauncher.getModelWriter().addOrMoveItemInDatabase(item, mInfo.id, 0, item.cellX,
                 item.cellY);
@@ -1591,8 +1572,8 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
     /**
      * Returns a folder which is already open or null
      */
-    public static Folder getOpen(Launcher launcher) {
-        return getOpenView(launcher, TYPE_FOLDER);
+    public static Folder getOpen(ActivityContext activityContext) {
+        return getOpenView(activityContext, TYPE_FOLDER);
     }
 
     /**
@@ -1611,7 +1592,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
     @Override
     public boolean onControllerInterceptTouchEvent(MotionEvent ev) {
         if (ev.getAction() == MotionEvent.ACTION_DOWN) {
-            DragLayer dl = mLauncher.getDragLayer();
+            BaseDragLayer dl = (BaseDragLayer) getParent();
 
             if (isEditingName()) {
                 if (!dl.isEventOverView(mFolderName, ev)) {
@@ -1663,9 +1644,9 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
 
     /** Returns the height of the current folder's bottom edge from the bottom of the screen. */
     private int getHeightFromBottom() {
-        DragLayer.LayoutParams layoutParams = (DragLayer.LayoutParams) getLayoutParams();
+        BaseDragLayer.LayoutParams layoutParams = (BaseDragLayer.LayoutParams) getLayoutParams();
         int folderBottomPx = layoutParams.y + layoutParams.height;
-        int windowBottomPx = mLauncher.getDeviceProfile().heightPx;
+        int windowBottomPx = mActivityContext.getDeviceProfile().heightPx;
 
         return windowBottomPx - folderBottomPx;
     }
diff --git a/src/com/android/launcher3/folder/FolderAnimationManager.java b/src/com/android/launcher3/folder/FolderAnimationManager.java
index 3d72b49b44..1cac31eb18 100644
--- a/src/com/android/launcher3/folder/FolderAnimationManager.java
+++ b/src/com/android/launcher3/folder/FolderAnimationManager.java
@@ -39,14 +39,13 @@ import androidx.core.graphics.ColorUtils;
 
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.CellLayout;
-import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.ResourceUtils;
 import com.android.launcher3.ShortcutAndWidgetContainer;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.PropertyResetListener;
-import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.util.Themes;
+import com.android.launcher3.views.BaseDragLayer;
 
 import java.util.List;
 
@@ -69,7 +68,6 @@ public class FolderAnimationManager {
     private PreviewBackground mPreviewBackground;
 
     private Context mContext;
-    private Launcher mLauncher;
 
     private final boolean mIsOpening;
 
@@ -92,8 +90,7 @@ public class FolderAnimationManager {
         mPreviewBackground = mFolderIcon.mBackground;
 
         mContext = folder.getContext();
-        mLauncher = folder.mLauncher;
-        mPreviewVerifier = new FolderGridOrganizer(mLauncher.getDeviceProfile().inv);
+        mPreviewVerifier = new FolderGridOrganizer(folder.mActivityContext.getDeviceProfile().inv);
 
         mIsOpening = isOpening;
 
@@ -114,14 +111,15 @@ public class FolderAnimationManager {
      * Prepares the Folder for animating between open / closed states.
      */
     public AnimatorSet getAnimator() {
-        final DragLayer.LayoutParams lp = (DragLayer.LayoutParams) mFolder.getLayoutParams();
+        final BaseDragLayer.LayoutParams lp =
+                (BaseDragLayer.LayoutParams) mFolder.getLayoutParams();
         mFolderIcon.getPreviewItemManager().recomputePreviewDrawingParams();
         ClippedFolderIconLayoutRule rule = mFolderIcon.getLayoutRule();
         final List<BubbleTextView> itemsInPreview = getPreviewIconsOnPage(0);
 
         // Match position of the FolderIcon
         final Rect folderIconPos = new Rect();
-        float scaleRelativeToDragLayer = mLauncher.getDragLayer()
+        float scaleRelativeToDragLayer = mFolder.mActivityContext.getDragLayer()
                 .getDescendantRectRelativeToSelf(mFolderIcon, folderIconPos);
         int scaledRadius = mPreviewBackground.getScaledRadius();
         float initialSize = (scaledRadius * 2) * scaleRelativeToDragLayer;
diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java
index 6477de3757..65a4fba63c 100644
--- a/src/com/android/launcher3/folder/FolderIcon.java
+++ b/src/com/android/launcher3/folder/FolderIcon.java
@@ -166,19 +166,19 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
         mDotParams = new DotRenderer.DrawParams();
     }
 
-    public static FolderIcon inflateFolderAndIcon(int resId, Launcher launcher, ViewGroup group,
-            FolderInfo folderInfo) {
-        Folder folder = Folder.fromXml(launcher);
-        folder.setDragController(launcher.getDragController());
+    public static <T extends Context & ActivityContext> FolderIcon inflateFolderAndIcon(int resId,
+            T activityContext, ViewGroup group, FolderInfo folderInfo) {
+        Folder folder = Folder.fromXml(activityContext);
+        folder.setDragController(folder.mLauncher.getDragController());
 
-        FolderIcon icon = inflateIcon(resId, launcher, group, folderInfo);
+        FolderIcon icon = inflateIcon(resId, activityContext, group, folderInfo);
         folder.setFolderIcon(icon);
         folder.bind(folderInfo);
         icon.setFolder(folder);
 
-        icon.setOnFocusChangeListener(launcher.getFocusHandler());
+        icon.setOnFocusChangeListener(folder.mLauncher.getFocusHandler());
         icon.mBackground.paddingY = icon.isInHotseat()
-                ? 0 : launcher.getDeviceProfile().cellYPaddingPx;
+                ? 0 : activityContext.getDeviceProfile().cellYPaddingPx;
         return icon;
     }
 
diff --git a/src/com/android/launcher3/folder/FolderPagedView.java b/src/com/android/launcher3/folder/FolderPagedView.java
index df3e92cf1e..0235dfac2f 100644
--- a/src/com/android/launcher3/folder/FolderPagedView.java
+++ b/src/com/android/launcher3/folder/FolderPagedView.java
@@ -36,7 +36,6 @@ import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.CellLayout;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile;
-import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.PagedView;
 import com.android.launcher3.R;
@@ -230,7 +229,7 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> {
     }
 
     private CellLayout createAndAddNewPage() {
-        DeviceProfile grid = Launcher.getLauncher(getContext()).getDeviceProfile();
+        DeviceProfile grid = mFolder.mActivityContext.getDeviceProfile();
         CellLayout page = mViewCache.getView(R.layout.folder_page, getContext(), this);
         page.setCellDimensions(grid.folderCellWidthPx, grid.folderCellHeightPx);
         page.getShortcutsAndWidgets().setMotionEventSplittingEnabled(false);
@@ -624,7 +623,7 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> {
 
     @Override
     protected boolean canScroll(float absVScroll, float absHScroll) {
-        return AbstractFloatingView.getTopOpenViewWithType(mFolder.mLauncher,
+        return AbstractFloatingView.getTopOpenViewWithType(mFolder.mActivityContext,
                 TYPE_ALL & ~TYPE_FOLDER) == null;
     }
 
diff --git a/src/com/android/launcher3/views/ActivityContext.java b/src/com/android/launcher3/views/ActivityContext.java
index ae459e1847..505c6cea42 100644
--- a/src/com/android/launcher3/views/ActivityContext.java
+++ b/src/com/android/launcher3/views/ActivityContext.java
@@ -17,7 +17,7 @@ package com.android.launcher3.views;
 
 import android.content.Context;
 import android.content.ContextWrapper;
-import android.view.ContextThemeWrapper;
+import android.graphics.Rect;
 import android.view.View.AccessibilityDelegate;
 
 import com.android.launcher3.DeviceProfile;
@@ -49,6 +49,23 @@ public interface ActivityContext {
         return null;
     }
 
+    default Rect getFolderBoundingBox() {
+        return getDeviceProfile().getAbsoluteOpenFolderBounds();
+    }
+
+    /**
+     * After calling {@link #getFolderBoundingBox()}, we calculate a (left, top) position for a
+     * Folder of size width x height to be within those bounds. However, the chosen position may
+     * not be visually ideal (e.g. uncanny valley of centeredness), so here's a chance to update it.
+     * @param inOutPosition A 2-size array where the first element is the left position of the open
+     *     folder and the second element is the top position. Should be updated in place if desired.
+     * @param bounds The bounds that the open folder should fit inside.
+     * @param width The width of the open folder.
+     * @param height The height of the open folder.
+     */
+    default void updateOpenFolderPosition(int[] inOutPosition, Rect bounds, int width, int height) {
+    }
+
     /**
      * The root view to support drag-and-drop and popup support.
      */
@@ -56,10 +73,10 @@ public interface ActivityContext {
 
     DeviceProfile getDeviceProfile();
 
-    static ActivityContext lookupContext(Context context) {
+    static <T extends ActivityContext> T lookupContext(Context context) {
         if (context instanceof ActivityContext) {
-            return (ActivityContext) context;
-        } else if (context instanceof ContextThemeWrapper) {
+            return (T) context;
+        } else if (context instanceof ContextWrapper) {
             return lookupContext(((ContextWrapper) context).getBaseContext());
         } else {
             throw new IllegalArgumentException("Cannot find ActivityContext in parent tree");
-- 
GitLab


From 7ba547cd2dfa8b05905fde8b77ec491cd0bc8dd1 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 2 Feb 2021 17:12:08 -0800
Subject: [PATCH 0526/1664] Folder support in Taskbar

- Add TaskbarActivityContext which allows shared Launcher elements to
  "just work" using existing generic ActivityContext.
- TaskbarContainerView extends BaseDragLayer<TaskbarActivityContext>.
- Inflate FolderIcon and Folder using TaskbarActivityContext to be
  shown in TaskbarContainerView.
- Use TaskbarActivityContext's DeviceProfile to determine icon size
  instead of overriding in styles. This also ensures that normal
  BubbleTextView icons have the same size as FolderIcons.

Test: Place a folder in home screen hotseat, ensure it shows up in
taskbar and can be opened, and that apps inside it can be launched
or dragged.
Bug: 171917176

Change-Id: Ic25d2f84bcd7e3399c88989305ea565497c030d9
---
 quickstep/res/values/dimens.xml               |  1 +
 quickstep/res/values/styles.xml               |  1 -
 .../launcher3/BaseQuickstepLauncher.java      | 10 +--
 .../taskbar/TaskbarActivityContext.java       | 78 +++++++++++++++++++
 .../taskbar/TaskbarContainerView.java         | 64 ++++++++++++++-
 .../launcher3/taskbar/TaskbarController.java  | 60 +++++++++++++-
 .../launcher3/taskbar/TaskbarView.java        | 49 +++++++++---
 src/com/android/launcher3/BubbleTextView.java |  2 +-
 src/com/android/launcher3/DeviceProfile.java  |  2 +-
 src/com/android/launcher3/folder/Folder.java  |  5 ++
 .../android/launcher3/folder/FolderIcon.java  |  6 ++
 .../launcher3/views/BaseDragLayer.java        | 12 ++-
 12 files changed, 265 insertions(+), 25 deletions(-)
 create mode 100644 quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 68c3851bf9..a0e87cfcbc 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -130,4 +130,5 @@
     <dimen name="taskbar_icon_spacing">14dp</dimen>
     <dimen name="taskbar_divider_thickness">1dp</dimen>
     <dimen name="taskbar_divider_height">24dp</dimen>
+    <dimen name="taskbar_folder_margin">16dp</dimen>
 </resources>
diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml
index 5a353f0a59..df089f6738 100644
--- a/quickstep/res/values/styles.xml
+++ b/quickstep/res/values/styles.xml
@@ -89,6 +89,5 @@
     <!-- Icon displayed on the taskbar -->
     <style name="BaseIcon.Workspace.Taskbar" >
         <item name="iconDisplay">taskbar</item>
-        <item name="iconSizeOverride">@dimen/taskbar_icon_size</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index edcd0a203a..d1fa2fd3ef 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -30,7 +30,6 @@ import android.content.Intent;
 import android.content.IntentSender;
 import android.os.Bundle;
 import android.os.CancellationSignal;
-import android.view.LayoutInflater;
 import android.view.View;
 
 import androidx.annotation.Nullable;
@@ -43,7 +42,7 @@ import com.android.launcher3.proxy.StartActivityParams;
 import com.android.launcher3.statehandlers.BackButtonAlphaHandler;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
-import com.android.launcher3.taskbar.TaskbarContainerView;
+import com.android.launcher3.taskbar.TaskbarActivityContext;
 import com.android.launcher3.taskbar.TaskbarController;
 import com.android.launcher3.taskbar.TaskbarStateHandler;
 import com.android.launcher3.uioverrides.RecentsViewStateController;
@@ -207,6 +206,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
         mActionsView.updateVerticalMargin(SysUINavigationMode.getMode(this));
 
         addTaskbarIfNecessary();
+        addOnDeviceProfileChangeListener(newDp -> addTaskbarIfNecessary());
     }
 
     @Override
@@ -223,9 +223,9 @@ public abstract class BaseQuickstepLauncher extends Launcher
             mTaskbarController = null;
         }
         if (FeatureFlags.ENABLE_TASKBAR.get() && mDeviceProfile.isTablet) {
-            TaskbarContainerView taskbarContainer = (TaskbarContainerView) LayoutInflater.from(this)
-                    .inflate(R.layout.taskbar, null, false);
-            mTaskbarController = new TaskbarController(this, taskbarContainer);
+            TaskbarActivityContext taskbarActivityContext = new TaskbarActivityContext(this);
+            mTaskbarController = new TaskbarController(this,
+                    taskbarActivityContext.getTaskbarContainerView());
             mTaskbarController.init();
         }
     }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
new file mode 100644
index 0000000000..06372fe22f
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.taskbar;
+
+import android.content.ContextWrapper;
+import android.graphics.Rect;
+import android.view.LayoutInflater;
+
+import com.android.launcher3.BaseQuickstepLauncher;
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.R;
+import com.android.launcher3.views.ActivityContext;
+import com.android.launcher3.views.BaseDragLayer;
+
+/**
+ * The {@link ActivityContext} with which we inflate Taskbar-related Views. This allows UI elements
+ * that are used by both Launcher and Taskbar (such as Folder) to reference a generic
+ * ActivityContext and BaseDragLayer instead of the Launcher activity and its DragLayer.
+ */
+public class TaskbarActivityContext extends ContextWrapper implements ActivityContext {
+
+    private final DeviceProfile mDeviceProfile;
+    private final LayoutInflater mLayoutInflater;
+    private final TaskbarContainerView mTaskbarContainerView;
+
+    public TaskbarActivityContext(BaseQuickstepLauncher launcher) {
+        super(launcher);
+        mDeviceProfile = launcher.getDeviceProfile().copy(this);
+        float taskbarIconSize = getResources().getDimension(R.dimen.taskbar_icon_size);
+        float iconScale = taskbarIconSize / mDeviceProfile.iconSizePx;
+        mDeviceProfile.updateIconSize(iconScale, getResources());
+
+        mLayoutInflater = LayoutInflater.from(this).cloneInContext(this);
+
+        mTaskbarContainerView = (TaskbarContainerView) mLayoutInflater
+                .inflate(R.layout.taskbar, null, false);
+    }
+
+    public TaskbarContainerView getTaskbarContainerView() {
+        return mTaskbarContainerView;
+    }
+
+    /**
+     * @return A LayoutInflater to use in this Context. Views inflated with this LayoutInflater will
+     * be able to access this TaskbarActivityContext via ActivityContext.lookupContext().
+     */
+    public LayoutInflater getLayoutInflater() {
+        return mLayoutInflater;
+    }
+
+    @Override
+    public BaseDragLayer<TaskbarActivityContext> getDragLayer() {
+        return mTaskbarContainerView;
+    }
+
+    @Override
+    public DeviceProfile getDeviceProfile() {
+        return mDeviceProfile;
+    }
+
+    @Override
+    public Rect getFolderBoundingBox() {
+        return mTaskbarContainerView.getFolderBoundingBox();
+    }
+}
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
index 3b361c4a38..ddd0d15442 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
@@ -19,19 +19,29 @@ import static com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsI
 import static com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo.TOUCHABLE_INSETS_REGION;
 
 import android.content.Context;
+import android.graphics.Rect;
 import android.util.AttributeSet;
-import android.widget.FrameLayout;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.android.launcher3.R;
 import com.android.launcher3.anim.AlphaUpdateListener;
+import com.android.launcher3.util.TouchController;
+import com.android.launcher3.views.BaseDragLayer;
 import com.android.systemui.shared.system.ViewTreeObserverWrapper;
 
 /**
  * Top-level ViewGroup that hosts the TaskbarView as well as Views created by it such as Folder.
  */
-public class TaskbarContainerView extends FrameLayout {
+public class TaskbarContainerView extends BaseDragLayer<TaskbarActivityContext> {
+
+    private final int[] mTempLoc = new int[2];
+    private final int mFolderMargin;
+
+    // Initialized in TaskbarController constructor.
+    private TaskbarController.TaskbarContainerViewCallbacks mControllerCallbacks;
 
     // Initialized in init.
     private TaskbarView mTaskbarView;
@@ -52,12 +62,23 @@ public class TaskbarContainerView extends FrameLayout {
 
     public TaskbarContainerView(@NonNull Context context, @Nullable AttributeSet attrs,
             int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
+        super(context, attrs, 1 /* alphaChannelCount */);
+        mFolderMargin = getResources().getDimensionPixelSize(R.dimen.taskbar_folder_margin);
+    }
+
+    protected void construct(TaskbarController.TaskbarContainerViewCallbacks callbacks) {
+        mControllerCallbacks = callbacks;
     }
 
     protected void init(TaskbarView taskbarView) {
         mTaskbarView = taskbarView;
         mTaskbarInsetsComputer = createTaskbarInsetsComputer();
+        recreateControllers();
+    }
+
+    @Override
+    public void recreateControllers() {
+        mControllers = new TouchController[0];
     }
 
     private ViewTreeObserverWrapper.OnComputeInsetsListener createTaskbarInsetsComputer() {
@@ -70,6 +91,17 @@ public class TaskbarContainerView extends FrameLayout {
                  // We're visible again, accept touches anywhere in our bounds.
                 insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_FRAME);
             }
+
+            // TaskbarContainerView provides insets to other apps based on contentInsets. These
+            // insets should stay consistent even if we expand TaskbarContainerView's bounds, e.g.
+            // to show a floating view like Folder. Thus, we set the contentInsets to be where
+            // mTaskbarView is, since its position never changes and insets rather than overlays.
+            int[] loc = mTempLoc;
+            mTaskbarView.getLocationInWindow(loc);
+            insetsInfo.contentInsets.left = loc[0];
+            insetsInfo.contentInsets.top = loc[1];
+            insetsInfo.contentInsets.right = getWidth() - (loc[0] + mTaskbarView.getWidth());
+            insetsInfo.contentInsets.bottom = getHeight() - (loc[1] + mTaskbarView.getHeight());
         };
     }
 
@@ -91,4 +123,30 @@ public class TaskbarContainerView extends FrameLayout {
 
         cleanup();
     }
+
+    @Override
+    protected boolean canFindActiveController() {
+        // Unlike super class, we want to be able to find controllers when touches occur in the
+        // gesture area. For example, this allows Folder to close itself when touching the Taskbar.
+        return true;
+    }
+
+    @Override
+    public void onViewRemoved(View child) {
+        super.onViewRemoved(child);
+        mControllerCallbacks.onViewRemoved();
+    }
+
+    /**
+     * @return Bounds (in our coordinates) where an opened Folder can display.
+     */
+    protected Rect getFolderBoundingBox() {
+        Rect boundingBox = new Rect(0, 0, getWidth(), getHeight() - mTaskbarView.getHeight());
+        boundingBox.inset(mFolderMargin, mFolderMargin);
+        return boundingBox;
+    }
+
+    protected TaskbarActivityContext getTaskbarActivityContext() {
+        return mActivity;
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index 260428dbc2..ab05fbf036 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -34,11 +34,15 @@ import android.view.WindowManager;
 
 import androidx.annotation.Nullable;
 
+import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.QuickstepAppTransitionManagerImpl;
 import com.android.launcher3.R;
 import com.android.launcher3.anim.PendingAnimation;
+import com.android.launcher3.folder.Folder;
+import com.android.launcher3.folder.FolderIcon;
+import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.touch.ItemClickHandler;
@@ -81,8 +85,9 @@ public class TaskbarController {
             TaskbarContainerView taskbarContainerView) {
         mLauncher = launcher;
         mTaskbarContainerView = taskbarContainerView;
+        mTaskbarContainerView.construct(createTaskbarContainerViewCallbacks());
         mTaskbarView = mTaskbarContainerView.findViewById(R.id.taskbar_view);
-        mTaskbarView.setCallbacks(createTaskbarViewCallbacks());
+        mTaskbarView.construct(createTaskbarViewCallbacks());
         mWindowManager = mLauncher.getWindowManager();
         mTaskbarSize = new Point(MATCH_PARENT,
                 mLauncher.getResources().getDimensionPixelSize(R.dimen.taskbar_size));
@@ -110,6 +115,18 @@ public class TaskbarController {
         };
     }
 
+    private TaskbarContainerViewCallbacks createTaskbarContainerViewCallbacks() {
+        return new TaskbarContainerViewCallbacks() {
+            @Override
+            public void onViewRemoved() {
+                if (mTaskbarContainerView.getChildCount() == 1) {
+                    // Only TaskbarView remains.
+                    setTaskbarWindowFullscreen(false);
+                }
+            }
+        };
+    }
+
     private TaskbarViewCallbacks createTaskbarViewCallbacks() {
         return new TaskbarViewCallbacks() {
             @Override
@@ -120,9 +137,29 @@ public class TaskbarController {
                         Task task = (Task) tag;
                         ActivityManagerWrapper.getInstance().startActivityFromRecents(task.key,
                                 ActivityOptions.makeBasic());
+                    } else if (tag instanceof FolderInfo) {
+                        FolderIcon folderIcon = (FolderIcon) view;
+                        Folder folder = folderIcon.getFolder();
+
+                        setTaskbarWindowFullscreen(true);
+
+                        mTaskbarContainerView.post(() -> {
+                            folder.animateOpen();
+
+                            folder.iterateOverItems((itemInfo, itemView) -> {
+                                itemView.setOnClickListener(getItemOnClickListener());
+                                itemView.setOnLongClickListener(getItemOnLongClickListener());
+                                // To play haptic when dragging, like other Taskbar items do.
+                                itemView.setHapticFeedbackEnabled(true);
+                                return false;
+                            });
+                        });
                     } else {
                         ItemClickHandler.INSTANCE.onClick(view);
                     }
+
+                    AbstractFloatingView.closeAllOpenViews(
+                            mTaskbarContainerView.getTaskbarActivityContext());
                 };
             }
 
@@ -344,6 +381,20 @@ public class TaskbarController {
         return mTaskbarContainerView.getWindowId().equals(v.getWindowId());
     }
 
+    /**
+     * Updates the TaskbarContainer to MATCH_PARENT vs original Taskbar size.
+     */
+    private void setTaskbarWindowFullscreen(boolean fullscreen) {
+        if (fullscreen) {
+            mWindowLayoutParams.width = MATCH_PARENT;
+            mWindowLayoutParams.height = MATCH_PARENT;
+        } else {
+            mWindowLayoutParams.width = mTaskbarSize.x;
+            mWindowLayoutParams.height = mTaskbarSize.y;
+        }
+        mWindowManager.updateViewLayout(mTaskbarContainerView, mWindowLayoutParams);
+    }
+
     /**
      * Contains methods that TaskbarStateHandler can call to interface with TaskbarController.
      */
@@ -360,6 +411,13 @@ public class TaskbarController {
         void updateTaskbarVisibilityAlpha(float alpha);
     }
 
+    /**
+     * Contains methods that TaskbarContainerView can call to interface with TaskbarController.
+     */
+    protected interface TaskbarContainerViewCallbacks {
+        void onViewRemoved();
+    }
+
     /**
      * Contains methods that TaskbarView can call to interface with TaskbarController.
      */
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
index d8f3bb595e..df77f8778e 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
@@ -22,7 +22,6 @@ import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.DragEvent;
-import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
@@ -32,10 +31,14 @@ import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.R;
+import com.android.launcher3.folder.FolderIcon;
+import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.launcher3.views.ActivityContext;
 import com.android.systemui.shared.recents.model.Task;
 
 /**
@@ -51,6 +54,9 @@ public class TaskbarView extends LinearLayout {
     private final RectF mDelegateSlopBounds = new RectF();
     private final int[] mTempOutLocation = new int[2];
 
+    // Initialized in TaskbarController constructor.
+    private TaskbarController.TaskbarViewCallbacks mControllerCallbacks;
+
     // Initialized in init().
     private int mHotseatStartIndex;
     private int mHotseatEndIndex;
@@ -58,8 +64,6 @@ public class TaskbarView extends LinearLayout {
     private int mRecentsStartIndex;
     private int mRecentsEndIndex;
 
-    private TaskbarController.TaskbarViewCallbacks mControllerCallbacks;
-
     // Delegate touches to the closest view if within mIconTouchSize.
     private boolean mDelegateTargeted;
     private View mDelegateView;
@@ -90,7 +94,7 @@ public class TaskbarView extends LinearLayout {
         mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
     }
 
-    protected void setCallbacks(TaskbarController.TaskbarViewCallbacks taskbarViewCallbacks) {
+    protected void construct(TaskbarController.TaskbarViewCallbacks taskbarViewCallbacks) {
         mControllerCallbacks = taskbarViewCallbacks;
     }
 
@@ -130,17 +134,37 @@ public class TaskbarView extends LinearLayout {
 
             // Replace any Hotseat views with the appropriate type if it's not already that type.
             final int expectedLayoutResId;
+            boolean isFolder = false;
+            boolean needsReinflate = false;
             if (hotseatItemInfo != null && hotseatItemInfo.isPredictedItem()) {
                 expectedLayoutResId = R.layout.taskbar_predicted_app_icon;
+            } else if (hotseatItemInfo instanceof FolderInfo) {
+                expectedLayoutResId = R.layout.folder_icon;
+                isFolder = true;
+                // Unlike for BubbleTextView, we can't reapply a new FolderInfo after inflation, so
+                // if the info changes we need to reinflate. This should only happen if a new folder
+                // is dragged to the position that another folder previously existed.
+                needsReinflate = hotseatView != null && hotseatView.getTag() != hotseatItemInfo;
             } else {
                 expectedLayoutResId = R.layout.taskbar_app_icon;
             }
-            if (hotseatView == null || hotseatView.getSourceLayoutResId() != expectedLayoutResId) {
+            if (hotseatView == null || hotseatView.getSourceLayoutResId() != expectedLayoutResId
+                    || needsReinflate) {
                 removeView(hotseatView);
-                BubbleTextView btv = (BubbleTextView) inflate(expectedLayoutResId);
-                LayoutParams lp = new LayoutParams(btv.getIconSize(), btv.getIconSize());
+                TaskbarActivityContext activityContext =
+                        ActivityContext.lookupContext(getContext());
+                if (isFolder) {
+                    FolderInfo folderInfo = (FolderInfo) hotseatItemInfo;
+                    FolderIcon folderIcon = FolderIcon.inflateFolderAndIcon(expectedLayoutResId,
+                            activityContext, this, folderInfo);
+                    folderIcon.setTextVisible(false);
+                    hotseatView = folderIcon;
+                } else {
+                    hotseatView = inflate(expectedLayoutResId);
+                }
+                int iconSize = activityContext.getDeviceProfile().iconSizePx;
+                LayoutParams lp = new LayoutParams(iconSize, iconSize);
                 lp.setMargins(mItemMarginLeftRight, 0, mItemMarginLeftRight, 0);
-                hotseatView = btv;
                 addView(hotseatView, hotseatIndex, lp);
             }
 
@@ -153,6 +177,11 @@ public class TaskbarView extends LinearLayout {
                 hotseatView.setOnClickListener(mControllerCallbacks.getItemOnClickListener());
                 hotseatView.setOnLongClickListener(
                         mControllerCallbacks.getItemOnLongClickListener());
+            } else if (isFolder) {
+                hotseatView.setVisibility(VISIBLE);
+                hotseatView.setOnClickListener(mControllerCallbacks.getItemOnClickListener());
+                hotseatView.setOnLongClickListener(
+                        mControllerCallbacks.getItemOnLongClickListener());
             } else {
                 hotseatView.setVisibility(GONE);
                 hotseatView.setOnClickListener(null);
@@ -345,6 +374,7 @@ public class TaskbarView extends LinearLayout {
         switch (event.getAction()) {
             case DragEvent.ACTION_DRAG_STARTED:
                 mIsDraggingItem = true;
+                AbstractFloatingView.closeAllOpenViews(ActivityContext.lookupContext(getContext()));
                 return true;
             case DragEvent.ACTION_DRAG_ENDED:
                 mIsDraggingItem = false;
@@ -358,6 +388,7 @@ public class TaskbarView extends LinearLayout {
     }
 
     private View inflate(@LayoutRes int layoutResId) {
-        return LayoutInflater.from(getContext()).inflate(layoutResId, this, false);
+        TaskbarActivityContext taskbarActivityContext = ActivityContext.lookupContext(getContext());
+        return taskbarActivityContext.getLayoutInflater().inflate(layoutResId, this, false);
     }
 }
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index edc7e9bb8a..e5a4335dcd 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -505,7 +505,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
      * @param canvas The canvas to draw to.
      */
     protected void drawDotIfNecessary(Canvas canvas) {
-        if (mDisplay == DISPLAY_TASKBAR) {
+        if (mActivity instanceof Launcher && ((Launcher) mActivity).isViewInTaskbar(this)) {
             // TODO: support notification dots in Taskbar
             return;
         }
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 19915b7026..83a7d77601 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -375,7 +375,7 @@ public class DeviceProfile {
      * iconTextSizePx, iconDrawablePaddingPx, cellWidth/Height, allApps* variants,
      * hotseat sizes, workspaceSpringLoadedShrinkFactor, folderIconSizePx, and folderIconOffsetYPx.
      */
-    private void updateIconSize(float scale, Resources res) {
+    public void updateIconSize(float scale, Resources res) {
         // Workspace
         final boolean isVerticalLayout = isVerticalBarLayout();
         float invIconSizeDp = isVerticalLayout ? inv.landscapeIconSize : inv.iconSize;
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index 9efbc7dcab..504b29e75a 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -1616,6 +1616,11 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         return false;
     }
 
+    @Override
+    public boolean canInterceptEventsInSystemGestureRegion() {
+        return true;
+    }
+
     /**
      * Alternative to using {@link #getClipToOutline()} as it only works with derivatives of
      * rounded rect.
diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java
index 65a4fba63c..75d8f2296c 100644
--- a/src/com/android/launcher3/folder/FolderIcon.java
+++ b/src/com/android/launcher3/folder/FolderIcon.java
@@ -754,6 +754,9 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
     }
 
     public void clearLeaveBehindIfExists() {
+        if (!(getLayoutParams() instanceof CellLayout.LayoutParams)) {
+            return;
+        }
         ((CellLayout.LayoutParams) getLayoutParams()).canReorder = true;
         if (isInHotseat()) {
             CellLayout cl = (CellLayout) getParent().getParent();
@@ -762,6 +765,9 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
     }
 
     public void drawLeaveBehindIfExists() {
+        if (!(getLayoutParams() instanceof CellLayout.LayoutParams)) {
+            return;
+        }
         CellLayout.LayoutParams lp = (CellLayout.LayoutParams) getLayoutParams();
         // While the folder is open, the position of the icon cannot change.
         lp.canReorder = false;
diff --git a/src/com/android/launcher3/views/BaseDragLayer.java b/src/com/android/launcher3/views/BaseDragLayer.java
index 15f7730fd7..1939d15776 100644
--- a/src/com/android/launcher3/views/BaseDragLayer.java
+++ b/src/com/android/launcher3/views/BaseDragLayer.java
@@ -206,15 +206,19 @@ public abstract class BaseDragLayer<T extends Context & ActivityContext>
 
     protected boolean findActiveController(MotionEvent ev) {
         mActiveController = null;
-        if ((mTouchDispatchState & (TOUCH_DISPATCHING_FROM_VIEW_GESTURE_REGION
-                | TOUCH_DISPATCHING_FROM_PROXY)) == 0) {
-            // Only look for controllers if we are not dispatching from gesture area and proxy is
-            // not active
+        if (canFindActiveController()) {
             mActiveController = findControllerToHandleTouch(ev);
         }
         return mActiveController != null;
     }
 
+    protected boolean canFindActiveController() {
+        // Only look for controllers if we are not dispatching from gesture area and proxy is
+        // not active
+        return (mTouchDispatchState & (TOUCH_DISPATCHING_FROM_VIEW_GESTURE_REGION
+                | TOUCH_DISPATCHING_FROM_PROXY)) == 0;
+    }
+
     @Override
     public boolean onRequestSendAccessibilityEvent(View child, AccessibilityEvent event) {
         // Shortcuts can appear above folder
-- 
GitLab


From bb4de85c253baf31ff120e006941fc1cfe410047 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 10 Feb 2021 12:35:28 -0800
Subject: [PATCH 0527/1664] Draw folder leave-behind when opening folder in
 taskbar

Previously there was only support for CellLayout to draw the
leave-behind. Added FolderIconParent interface so any parent can
draw the leave-behind, and implement that by TaskbarView.

Test: Open folder in Taskber, ensure leave-behind draws

Bug: 171917176
Change-Id: I08d1d939a34f971f893994fe05cac972d165ef53
---
 .../launcher3/taskbar/TaskbarView.java        | 32 ++++++++++++++++-
 .../launcher3/ShortcutAndWidgetContainer.java | 23 +++++++++++-
 .../android/launcher3/folder/FolderIcon.java  | 35 ++++++++++---------
 3 files changed, 72 insertions(+), 18 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
index df77f8778e..7a13b89d25 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
@@ -17,6 +17,7 @@ package com.android.launcher3.taskbar;
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.graphics.Canvas;
 import android.graphics.RectF;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
@@ -44,7 +45,7 @@ import com.android.systemui.shared.recents.model.Task;
 /**
  * Hosts the Taskbar content such as Hotseat and Recent Apps. Drawn on top of other apps.
  */
-public class TaskbarView extends LinearLayout {
+public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconParent {
 
     private final ColorDrawable mBackgroundDrawable;
     private final int mItemMarginLeftRight;
@@ -69,6 +70,8 @@ public class TaskbarView extends LinearLayout {
     private View mDelegateView;
 
     private boolean mIsDraggingItem;
+    // Only non-null when the corresponding Folder is open.
+    private @Nullable FolderIcon mLeaveBehindFolderIcon;
 
     public TaskbarView(@NonNull Context context) {
         this(context, null);
@@ -387,6 +390,33 @@ public class TaskbarView extends LinearLayout {
         return mIsDraggingItem;
     }
 
+    // FolderIconParent implemented methods.
+
+    @Override
+    public void drawFolderLeaveBehindForIcon(FolderIcon child) {
+        mLeaveBehindFolderIcon = child;
+        invalidate();
+    }
+
+    @Override
+    public void clearFolderLeaveBehind(FolderIcon child) {
+        mLeaveBehindFolderIcon = null;
+        invalidate();
+    }
+
+    // End FolderIconParent implemented methods.
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        if (mLeaveBehindFolderIcon != null) {
+            canvas.save();
+            canvas.translate(mLeaveBehindFolderIcon.getLeft(), mLeaveBehindFolderIcon.getTop());
+            mLeaveBehindFolderIcon.getFolderBackground().drawLeaveBehind(canvas);
+            canvas.restore();
+        }
+    }
+
     private View inflate(@LayoutRes int layoutResId) {
         TaskbarActivityContext taskbarActivityContext = ActivityContext.lookupContext(getContext());
         return taskbarActivityContext.getLayoutInflater().inflate(layoutResId, this, false);
diff --git a/src/com/android/launcher3/ShortcutAndWidgetContainer.java b/src/com/android/launcher3/ShortcutAndWidgetContainer.java
index 1c5081cfca..eab8272431 100644
--- a/src/com/android/launcher3/ShortcutAndWidgetContainer.java
+++ b/src/com/android/launcher3/ShortcutAndWidgetContainer.java
@@ -26,10 +26,11 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.android.launcher3.CellLayout.ContainerType;
+import com.android.launcher3.folder.FolderIcon;
 import com.android.launcher3.views.ActivityContext;
 import com.android.launcher3.widget.LauncherAppWidgetHostView;
 
-public class ShortcutAndWidgetContainer extends ViewGroup {
+public class ShortcutAndWidgetContainer extends ViewGroup implements FolderIcon.FolderIconParent {
     static final String TAG = "ShortcutAndWidgetContainer";
 
     // These are temporary variables to prevent having to allocate a new object just to
@@ -228,4 +229,24 @@ public class ShortcutAndWidgetContainer extends ViewGroup {
             child.cancelLongPress();
         }
     }
+
+    @Override
+    public void drawFolderLeaveBehindForIcon(FolderIcon child) {
+        CellLayout.LayoutParams lp = (CellLayout.LayoutParams) child.getLayoutParams();
+        // While the folder is open, the position of the icon cannot change.
+        lp.canReorder = false;
+        if (mContainerType == CellLayout.HOTSEAT) {
+            CellLayout cl = (CellLayout) getParent();
+            cl.setFolderLeaveBehindCell(lp.cellX, lp.cellY);
+        }
+    }
+
+    @Override
+    public void clearFolderLeaveBehind(FolderIcon child) {
+        ((CellLayout.LayoutParams) child.getLayoutParams()).canReorder = true;
+        if (mContainerType == CellLayout.HOTSEAT) {
+            CellLayout cl = (CellLayout) getParent();
+            cl.clearFolderLeaveBehind();
+        }
+    }
 }
diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java
index 75d8f2296c..6b02021ed3 100644
--- a/src/com/android/launcher3/folder/FolderIcon.java
+++ b/src/com/android/launcher3/folder/FolderIcon.java
@@ -754,26 +754,14 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
     }
 
     public void clearLeaveBehindIfExists() {
-        if (!(getLayoutParams() instanceof CellLayout.LayoutParams)) {
-            return;
-        }
-        ((CellLayout.LayoutParams) getLayoutParams()).canReorder = true;
-        if (isInHotseat()) {
-            CellLayout cl = (CellLayout) getParent().getParent();
-            cl.clearFolderLeaveBehind();
+        if (getParent() instanceof FolderIconParent) {
+            ((FolderIconParent) getParent()).clearFolderLeaveBehind(this);
         }
     }
 
     public void drawLeaveBehindIfExists() {
-        if (!(getLayoutParams() instanceof CellLayout.LayoutParams)) {
-            return;
-        }
-        CellLayout.LayoutParams lp = (CellLayout.LayoutParams) getLayoutParams();
-        // While the folder is open, the position of the icon cannot change.
-        lp.canReorder = false;
-        if (isInHotseat()) {
-            CellLayout cl = (CellLayout) getParent().getParent();
-            cl.setFolderLeaveBehindCell(lp.cellX, lp.cellY);
+        if (getParent() instanceof FolderIconParent) {
+            ((FolderIconParent) getParent()).drawFolderLeaveBehindForIcon(this);
         }
     }
 
@@ -842,4 +830,19 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
                     MAX_NUM_ITEMS_IN_PREVIEW);
         }
     }
+
+    /**
+     * Interface that provides callbacks to a parent ViewGroup that hosts this FolderIcon.
+     */
+    public interface FolderIconParent {
+        /**
+         * Tells the FolderIconParent to draw a "leave-behind" when the Folder is open and leaving a
+         * gap where the FolderIcon would be when the Folder is closed.
+         */
+        void drawFolderLeaveBehindForIcon(FolderIcon child);
+        /**
+         * Tells the FolderIconParent to stop drawing the "leave-behind" as the Folder is closed.
+         */
+        void clearFolderLeaveBehind(FolderIcon child);
+    }
 }
-- 
GitLab


From a9740ecc8f190af6829446d3c76f43f4188087f1 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Fri, 12 Feb 2021 10:08:25 -0800
Subject: [PATCH 0528/1664] Switching overlays more correctly

Test: presubmit
Bug: 180114721
Change-Id: I0d8d0c70ef34ec941e28704d06f9df5f17782155
---
 .../src/com/android/quickstep/NavigationModeSwitchRule.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
index 0f6671d18c..35383d2831 100644
--- a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
+++ b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
@@ -168,7 +168,7 @@ public class NavigationModeSwitchRule implements TestRule {
 
         Log.d(TAG, "setActiveOverlay: " + overlayPackage + "...");
         UiDevice.getInstance(getInstrumentation()).executeShellCommand(
-                "cmd overlay enable-exclusive " + overlayPackage);
+                "cmd overlay enable-exclusive --category " + overlayPackage);
 
         if (currentSysUiNavigationMode() != expectedMode) {
             final CountDownLatch latch = new CountDownLatch(1);
-- 
GitLab


From 2cdc6bae3942aedee975981009b11f5d9e95c049 Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Tue, 16 Feb 2021 17:47:33 -0800
Subject: [PATCH 0529/1664] Conform to new naming

Resources were renamed from main/accent to primary/secondary.

Test: make
Bug: 171916625
Change-Id: Ic71cf716eba9f57d27869dffa501219c41c999ec
---
 res/values-v31/colors.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/res/values-v31/colors.xml b/res/values-v31/colors.xml
index b8600a60ed..6baf39e034 100644
--- a/res/values-v31/colors.xml
+++ b/res/values-v31/colors.xml
@@ -17,17 +17,17 @@
 */
 -->
 <resources>
-    <color name="popup_color_primary_light">@android:color/system_main_50</color>
-    <color name="popup_color_secondary_light">@android:color/system_main_100</color>
-    <color name="popup_color_tertiary_light">@android:color/system_main_300</color>
-    <color name="popup_color_primary_dark">@android:color/system_main_800</color>
-    <color name="popup_color_secondary_dark">@android:color/system_main_900</color>
-    <color name="popup_color_tertiary_dark">@android:color/system_main_700</color>
+    <color name="popup_color_primary_light">@android:color/system_primary_50</color>
+    <color name="popup_color_secondary_light">@android:color/system_primary_100</color>
+    <color name="popup_color_tertiary_light">@android:color/system_primary_300</color>
+    <color name="popup_color_primary_dark">@android:color/system_primary_800</color>
+    <color name="popup_color_secondary_dark">@android:color/system_primary_900</color>
+    <color name="popup_color_tertiary_dark">@android:color/system_primary_700</color>
 
-    <color name="workspace_text_color_light">@android:color/system_main_50</color>
-    <color name="workspace_text_color_dark">@android:color/system_main_900</color>
+    <color name="workspace_text_color_light">@android:color/system_primary_50</color>
+    <color name="workspace_text_color_dark">@android:color/system_primary_900</color>
 
-    <color name="text_color_primary_dark">@android:color/system_main_50</color>
-    <color name="text_color_secondary_dark">@android:color/system_main_200</color>
-    <color name="text_color_tertiary_dark">@android:color/system_main_400</color>
+    <color name="text_color_primary_dark">@android:color/system_primary_50</color>
+    <color name="text_color_secondary_dark">@android:color/system_primary_200</color>
+    <color name="text_color_tertiary_dark">@android:color/system_primary_400</color>
 </resources>
\ No newline at end of file
-- 
GitLab


From e1a8440d78ad2437c5b69eb4df02f0a91cc4ff02 Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Fri, 12 Feb 2021 16:02:39 -0800
Subject: [PATCH 0530/1664] Add @Nullable annotation to AllAppsStore.getApp.

Test: Manual
Bug: 180120291
Change-Id: I3f29d478e39b46e307f33f2f354720bc2915b550
---
 src/com/android/launcher3/allapps/AllAppsStore.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/com/android/launcher3/allapps/AllAppsStore.java b/src/com/android/launcher3/allapps/AllAppsStore.java
index 769cb5e31b..355ccadeba 100644
--- a/src/com/android/launcher3/allapps/AllAppsStore.java
+++ b/src/com/android/launcher3/allapps/AllAppsStore.java
@@ -21,6 +21,8 @@ import static com.android.launcher3.model.data.AppInfo.EMPTY_ARRAY;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
@@ -78,6 +80,11 @@ public class AllAppsStore {
         return (mModelFlags & mask) != 0;
     }
 
+    /**
+     * Returns {@link AppInfo} if any apps matches with provided {@link ComponentKey}, otherwise
+     * null.
+     */
+    @Nullable
     public AppInfo getApp(ComponentKey key) {
         mTempInfo.componentName = key.componentName;
         mTempInfo.user = key.user;
-- 
GitLab


From a34af18b0efd6bfc6b1aa0f0c3b63d6751b282fc Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Thu, 11 Feb 2021 15:48:54 -0800
Subject: [PATCH 0531/1664] Update System settings content observer to cache
 values.

Existing ContentObserver will cache values and overwrite
them when the value itself is modified or caller force
updates.

Bug: 149571513
Test: Wrote unit tests, mostly for caching logic.
Not meant to test ContentObserver contract for registering an
observer.

Change-Id: I12835f6c2be27ce17f65a55c51c4ef85c63b4487
---
 Android.bp                                    |   1 -
 .../RecentsAnimationDeviceState.java          |  49 ++---
 .../logging/SettingsChangeLogger.java         |  13 +-
 .../quickstep/util/RecentsOrientedState.java  |  26 +--
 .../launcher3/util/SettingsCacheTest.java     | 115 +++++++++++
 .../android/launcher3/LauncherAppState.java   |  21 +-
 .../notification/NotificationListener.java    |  19 +-
 .../settings/NotificationDotsPreference.java  |   4 +-
 .../launcher3/settings/SettingsActivity.java  |  35 ++--
 .../util/SecureSettingsObserver.java          | 104 ----------
 .../android/launcher3/util/SettingsCache.java | 179 ++++++++++++++++++
 tests/Android.mk                              |   1 -
 12 files changed, 380 insertions(+), 187 deletions(-)
 create mode 100644 robolectric_tests/src/com/android/launcher3/util/SettingsCacheTest.java
 delete mode 100644 src/com/android/launcher3/util/SecureSettingsObserver.java
 create mode 100644 src/com/android/launcher3/util/SettingsCache.java

diff --git a/Android.bp b/Android.bp
index a720658f9f..9d675a4b3e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -24,7 +24,6 @@ android_library {
     ],
     srcs: [
         "tests/tapl/**/*.java",
-        "src/com/android/launcher3/util/SecureSettingsObserver.java",
         "src/com/android/launcher3/ResourceUtils.java",
         "src/com/android/launcher3/testing/TestProtocol.java",
     ],
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index 4301377808..f99b7e6af4 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -17,14 +17,16 @@ package com.android.quickstep;
 
 import static android.content.Intent.ACTION_USER_UNLOCKED;
 
+import static com.android.launcher3.util.SettingsCache.ONE_HANDED_ENABLED;
+import static com.android.launcher3.util.SettingsCache.ONE_HANDED_SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED;
 import static com.android.launcher3.util.DisplayController.DisplayHolder.CHANGE_ALL;
 import static com.android.launcher3.util.DisplayController.DisplayHolder.CHANGE_FRAME_DELAY;
 import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
 import static com.android.quickstep.SysUINavigationMode.Mode.THREE_BUTTONS;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_CLICKABLE;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE;
-import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_ASSIST_GESTURE_CONSTRAINED;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_ASSIST_GESTURE_CONSTRAINED;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BUBBLES_EXPANDED;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_GLOBAL_ACTIONS_SHOWING;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_HOME_DISABLED;
@@ -44,6 +46,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Resources;
 import android.graphics.Region;
+import android.net.Uri;
 import android.os.Process;
 import android.os.SystemProperties;
 import android.os.UserManager;
@@ -57,11 +60,11 @@ import androidx.annotation.BinderThread;
 
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.util.SettingsCache;
 import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.DisplayController.DisplayHolder;
 import com.android.launcher3.util.DisplayController.DisplayInfoChangeListener;
 import com.android.launcher3.util.DisplayController.Info;
-import com.android.launcher3.util.SecureSettingsObserver;
 import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;
 import com.android.quickstep.SysUINavigationMode.OneHandedModeChangeListener;
 import com.android.quickstep.util.NavBarPosition;
@@ -177,33 +180,33 @@ public class RecentsAnimationDeviceState implements
             }
         }
 
+        SettingsCache settingsCache = SettingsCache.INSTANCE.get(mContext);
         if (mIsOneHandedModeSupported) {
-            SecureSettingsObserver oneHandedEnabledObserver =
-                    SecureSettingsObserver.newOneHandedSettingsObserver(
-                            mContext, enabled -> mIsOneHandedModeEnabled = enabled);
-            oneHandedEnabledObserver.register();
-            oneHandedEnabledObserver.dispatchOnChange();
-            runOnDestroy(oneHandedEnabledObserver::unregister);
+            Uri oneHandedUri = Settings.Secure.getUriFor(ONE_HANDED_ENABLED);
+            SettingsCache.OnChangeListener onChangeListener =
+                    enabled -> mIsOneHandedModeEnabled = enabled;
+            settingsCache.register(oneHandedUri, onChangeListener);
+            settingsCache.dispatchOnChange(oneHandedUri);
+            runOnDestroy(() -> settingsCache.unregister(oneHandedUri, onChangeListener));
         } else {
             mIsOneHandedModeEnabled = false;
         }
 
-        SecureSettingsObserver swipeBottomEnabledObserver =
-                SecureSettingsObserver.newSwipeToNotificationSettingsObserver(
-                        mContext, enabled -> mIsSwipeToNotificationEnabled = enabled);
-        swipeBottomEnabledObserver.register();
-        swipeBottomEnabledObserver.dispatchOnChange();
-        runOnDestroy(swipeBottomEnabledObserver::unregister);
-
-        SecureSettingsObserver userSetupObserver = new SecureSettingsObserver(
-                context.getContentResolver(),
-                e -> mIsUserSetupComplete = e,
-                Settings.Secure.USER_SETUP_COMPLETE,
-                0);
-        mIsUserSetupComplete = userSetupObserver.getValue();
+
+        Uri swipeBottomNotificationUri =
+                Settings.Secure.getUriFor(ONE_HANDED_SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED);
+        SettingsCache.OnChangeListener onChangeListener =
+                enabled -> mIsSwipeToNotificationEnabled = enabled;
+        settingsCache.register(swipeBottomNotificationUri, onChangeListener);
+        settingsCache.dispatchOnChange(swipeBottomNotificationUri);
+        runOnDestroy(() -> settingsCache.unregister(swipeBottomNotificationUri, onChangeListener));
+
+        Uri setupCompleteUri = Settings.Secure.getUriFor(Settings.Secure.USER_SETUP_COMPLETE);
+        mIsUserSetupComplete = settingsCache.getValue(setupCompleteUri, 0);
         if (!mIsUserSetupComplete) {
-            userSetupObserver.register();
-            runOnDestroy(userSetupObserver::unregister);
+            SettingsCache.OnChangeListener userSetupChangeListener = e -> mIsUserSetupComplete = e;
+            settingsCache.register(setupCompleteUri, userSetupChangeListener);
+            runOnDestroy(() -> settingsCache.unregister(setupCompleteUri, userSetupChangeListener));
         }
     }
 
diff --git a/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java b/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java
index 3157865f78..f336bf5260 100644
--- a/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java
+++ b/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java
@@ -28,7 +28,7 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_NOTIFICATION_DOT_DISABLED;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_NOTIFICATION_DOT_ENABLED;
 import static com.android.launcher3.model.QuickstepModelDelegate.LAST_PREDICTION_ENABLED_STATE;
-import static com.android.launcher3.util.SecureSettingsObserver.newNotificationSettingsObserver;
+import static com.android.launcher3.util.SettingsCache.NOTIFICATION_BADGING_URI;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -43,7 +43,7 @@ import com.android.launcher3.R;
 import com.android.launcher3.logging.InstanceIdSequence;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.logging.StatsLogManager.StatsLogger;
-import com.android.launcher3.util.SecureSettingsObserver;
+import com.android.launcher3.util.SettingsCache;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;
@@ -77,11 +77,10 @@ public class SettingsChangeLogger implements
         getPrefs(context).registerOnSharedPreferenceChangeListener(this);
         getDevicePrefs(context).registerOnSharedPreferenceChangeListener(this);
 
-        SecureSettingsObserver dotsObserver =
-                newNotificationSettingsObserver(context, this::onNotificationDotsChanged);
-        mNotificationDotsEnabled = dotsObserver.getValue();
-        dispatchUserEvent();
-
+        SettingsCache mSettingsCache = SettingsCache.INSTANCE.get(context);
+        mSettingsCache.register(NOTIFICATION_BADGING_URI,
+                this::onNotificationDotsChanged);
+        mSettingsCache.dispatchOnChange(NOTIFICATION_BADGING_URI);
     }
 
     private static ArrayMap<String, LoggablePref> loadPrefKeys(Context context) {
diff --git a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
index a3ee9122a7..215f05ae4c 100644
--- a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
+++ b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
@@ -23,22 +23,18 @@ import static android.view.Surface.ROTATION_180;
 import static android.view.Surface.ROTATION_270;
 import static android.view.Surface.ROTATION_90;
 
-import static com.android.launcher3.Utilities.newContentObserver;
+import static com.android.launcher3.util.SettingsCache.ROTATION_SETTING_URI;
 import static com.android.launcher3.states.RotationHelper.ALLOW_ROTATION_PREFERENCE_KEY;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
 import static java.lang.annotation.RetentionPolicy.SOURCE;
 
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
-import android.database.ContentObserver;
 import android.graphics.Matrix;
 import android.graphics.PointF;
 import android.graphics.Rect;
-import android.os.Handler;
-import android.provider.Settings;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.OrientationEventListener;
@@ -51,6 +47,7 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.util.SettingsCache;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.util.WindowBounds;
@@ -72,9 +69,6 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
     private static final String TAG = "RecentsOrientedState";
     private static final boolean DEBUG = false;
 
-    private ContentObserver mSystemAutoRotateObserver =
-            newContentObserver(new Handler(), t -> updateAutoRotateSetting());
-
     @Retention(SOURCE)
     @IntDef({ROTATION_0, ROTATION_90, ROTATION_180, ROTATION_270})
     public @interface SurfaceRotation {}
@@ -118,9 +112,11 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
                     | FLAG_SWIPE_UP_NOT_RUNNING;
 
     private final Context mContext;
-    private final ContentResolver mContentResolver;
     private final SharedPreferences mSharedPrefs;
     private final OrientationEventListener mOrientationListener;
+    private final SettingsCache mSettingsCache;
+    private final SettingsCache.OnChangeListener mRotationChangeListener =
+            isEnabled -> updateAutoRotateSetting();
 
     private final Matrix mTmpMatrix = new Matrix();
 
@@ -138,7 +134,6 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
     public RecentsOrientedState(Context context, BaseActivityInterface sizeStrategy,
             IntConsumer rotationChangeListener) {
         mContext = context;
-        mContentResolver = context.getContentResolver();
         mSharedPrefs = Utilities.getPrefs(context);
         mOrientationListener = new OrientationEventListener(context) {
             @Override
@@ -162,6 +157,7 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
             mFlags |= FLAG_MULTIPLE_ORIENTATION_SUPPORTED_BY_DENSITY;
         }
         mFlags |= FLAG_SWIPE_UP_NOT_RUNNING;
+        mSettingsCache = SettingsCache.INSTANCE.get(mContext);
         initFlags();
     }
 
@@ -271,8 +267,8 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
     }
 
     private void updateAutoRotateSetting() {
-        setFlag(FLAG_SYSTEM_ROTATION_ALLOWED, Settings.System.getInt(mContentResolver,
-                Settings.System.ACCELEROMETER_ROTATION, 1) == 1);
+        setFlag(FLAG_SYSTEM_ROTATION_ALLOWED,
+                mSettingsCache.getValue(ROTATION_SETTING_URI, 1));
     }
 
     private void updateHomeRotationSetting() {
@@ -295,9 +291,7 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
     public void initListeners() {
         if (isMultipleOrientationSupportedByDevice()) {
             mSharedPrefs.registerOnSharedPreferenceChangeListener(this);
-            mContentResolver.registerContentObserver(
-                    Settings.System.getUriFor(Settings.System.ACCELEROMETER_ROTATION),
-                    false, mSystemAutoRotateObserver);
+            mSettingsCache.register(ROTATION_SETTING_URI, mRotationChangeListener);
         }
         initFlags();
     }
@@ -308,7 +302,7 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
     public void destroyListeners() {
         if (isMultipleOrientationSupportedByDevice()) {
             mSharedPrefs.unregisterOnSharedPreferenceChangeListener(this);
-            mContentResolver.unregisterContentObserver(mSystemAutoRotateObserver);
+            mSettingsCache.unregister(ROTATION_SETTING_URI, mRotationChangeListener);
         }
         setRotationWatcherEnabled(false);
     }
diff --git a/robolectric_tests/src/com/android/launcher3/util/SettingsCacheTest.java b/robolectric_tests/src/com/android/launcher3/util/SettingsCacheTest.java
new file mode 100644
index 0000000000..fbf4c63e65
--- /dev/null
+++ b/robolectric_tests/src/com/android/launcher3/util/SettingsCacheTest.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.util;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.net.Uri;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.Collections;
+
+@RunWith(RobolectricTestRunner.class)
+public class SettingsCacheTest {
+
+    public static final Uri KEY_SYSTEM_URI_TEST1 = Uri.parse("content://settings/system/test1");
+    public static final Uri KEY_SYSTEM_URI_TEST2 = Uri.parse("content://settings/system/test2");;
+
+    private SettingsCache.OnChangeListener mChangeListener;
+    private SettingsCache mSettingsCache;
+
+    @Before
+    public void setup() {
+        mChangeListener = mock(SettingsCache.OnChangeListener.class);
+        Context targetContext = RuntimeEnvironment.application;
+        mSettingsCache = SettingsCache.INSTANCE.get(targetContext);
+        mSettingsCache.register(KEY_SYSTEM_URI_TEST1, mChangeListener);
+    }
+
+    @Test
+    public void listenerCalledOnChange() {
+        mSettingsCache.onChange(true, KEY_SYSTEM_URI_TEST1);
+        verify(mChangeListener, times(1)).onSettingsChanged(true);
+    }
+
+    @Test
+    public void getValueRespectsDefaultValue() {
+        // Case of key not found
+        boolean val = mSettingsCache.getValue(KEY_SYSTEM_URI_TEST1, 0);
+        assertFalse(val);
+    }
+
+    @Test
+    public void getValueHitsCache() {
+        mSettingsCache.setKeyCache(Collections.singletonMap(KEY_SYSTEM_URI_TEST1, true));
+        boolean val = mSettingsCache.getValue(KEY_SYSTEM_URI_TEST1, 0);
+        assertTrue(val);
+    }
+
+    @Test
+    public void getValueUpdatedCache() {
+        // First ensure there's nothing in cache
+        boolean val = mSettingsCache.getValue(KEY_SYSTEM_URI_TEST1, 0);
+        assertFalse(val);
+
+        mSettingsCache.setKeyCache(Collections.singletonMap(KEY_SYSTEM_URI_TEST1, true));
+        val = mSettingsCache.getValue(KEY_SYSTEM_URI_TEST1, 0);
+        assertTrue(val);
+    }
+
+    @Test
+    public void multipleListenersSingleKey() {
+        SettingsCache.OnChangeListener secondListener = mock(SettingsCache.OnChangeListener.class);
+        mSettingsCache.register(KEY_SYSTEM_URI_TEST1, secondListener);
+
+        mSettingsCache.onChange(true, KEY_SYSTEM_URI_TEST1);
+        verify(mChangeListener, times(1)).onSettingsChanged(true);
+        verify(secondListener, times(1)).onSettingsChanged(true);
+    }
+
+    @Test
+    public void singleListenerMultipleKeys() {
+        SettingsCache.OnChangeListener secondListener = mock(SettingsCache.OnChangeListener.class);
+        mSettingsCache.register(KEY_SYSTEM_URI_TEST2, secondListener);
+
+        mSettingsCache.onChange(true, KEY_SYSTEM_URI_TEST1);
+        mSettingsCache.onChange(true, KEY_SYSTEM_URI_TEST2);
+        verify(mChangeListener, times(1)).onSettingsChanged(true);
+        verify(secondListener, times(1)).onSettingsChanged(true);
+    }
+
+    @Test
+    public void sameListenerMultipleKeys() {
+        SettingsCache.OnChangeListener secondListener = mock(SettingsCache.OnChangeListener.class);
+        mSettingsCache.register(KEY_SYSTEM_URI_TEST2, mChangeListener);
+
+        mSettingsCache.onChange(true, KEY_SYSTEM_URI_TEST1);
+        mSettingsCache.onChange(true, KEY_SYSTEM_URI_TEST2);
+        verify(mChangeListener, times(2)).onSettingsChanged(true);
+        verify(secondListener, times(0)).onSettingsChanged(true);
+    }
+}
diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index a4181c53c9..57d76005a6 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -17,8 +17,8 @@
 package com.android.launcher3;
 
 import static com.android.launcher3.InvariantDeviceProfile.CHANGE_FLAG_ICON_PARAMS;
+import static com.android.launcher3.util.SettingsCache.NOTIFICATION_BADGING_URI;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
-import static com.android.launcher3.util.SecureSettingsObserver.newNotificationSettingsObserver;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -37,10 +37,10 @@ import com.android.launcher3.notification.NotificationListener;
 import com.android.launcher3.pm.InstallSessionHelper;
 import com.android.launcher3.pm.InstallSessionTracker;
 import com.android.launcher3.pm.UserCache;
+import com.android.launcher3.util.SettingsCache;
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.launcher3.util.Preconditions;
 import com.android.launcher3.util.SafeCloseable;
-import com.android.launcher3.util.SecureSettingsObserver;
 import com.android.launcher3.util.SimpleBroadcastReceiver;
 import com.android.launcher3.widget.custom.CustomWidgetManager;
 
@@ -57,8 +57,9 @@ public class LauncherAppState {
     private final IconCache mIconCache;
     private final WidgetPreviewLoader mWidgetCache;
     private final InvariantDeviceProfile mInvariantDeviceProfile;
+    private SettingsCache.OnChangeListener mNotificationSettingsChangedListener;
 
-    private SecureSettingsObserver mNotificationDotsObserver;
+    private SettingsCache mSettingsCache;
     private InstallSessionTracker mInstallSessionTracker;
     private SimpleBroadcastReceiver mModelChangeReceiver;
     private SafeCloseable mCalendarChangeTracker;
@@ -108,10 +109,11 @@ public class LauncherAppState {
                 .registerInstallTracker(mModel);
 
         // Register an observer to rebind the notification listener when dots are re-enabled.
-        mNotificationDotsObserver =
-                newNotificationSettingsObserver(mContext, this::onNotificationSettingsChanged);
-        mNotificationDotsObserver.register();
-        mNotificationDotsObserver.dispatchOnChange();
+        mSettingsCache = SettingsCache.INSTANCE.get(mContext);
+        mNotificationSettingsChangedListener = this::onNotificationSettingsChanged;
+        mSettingsCache.register(NOTIFICATION_BADGING_URI,
+                mNotificationSettingsChangedListener);
+        mSettingsCache.dispatchOnChange(NOTIFICATION_BADGING_URI);
     }
 
     public LauncherAppState(Context context, @Nullable String iconCacheFileName) {
@@ -166,8 +168,9 @@ public class LauncherAppState {
         }
         CustomWidgetManager.INSTANCE.get(mContext).setWidgetRefreshCallback(null);
 
-        if (mNotificationDotsObserver != null) {
-            mNotificationDotsObserver.unregister();
+        if (mSettingsCache != null) {
+            mSettingsCache.unregister(NOTIFICATION_BADGING_URI,
+                    mNotificationSettingsChangedListener);
         }
     }
 
diff --git a/src/com/android/launcher3/notification/NotificationListener.java b/src/com/android/launcher3/notification/NotificationListener.java
index 059ad18971..2905dc322a 100644
--- a/src/com/android/launcher3/notification/NotificationListener.java
+++ b/src/com/android/launcher3/notification/NotificationListener.java
@@ -16,9 +16,9 @@
 
 package com.android.launcher3.notification;
 
+import static com.android.launcher3.util.SettingsCache.NOTIFICATION_BADGING_URI;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
-import static com.android.launcher3.util.SecureSettingsObserver.newNotificationSettingsObserver;
 
 import android.annotation.TargetApi;
 import android.app.Notification;
@@ -37,8 +37,8 @@ import androidx.annotation.AnyThread;
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
 
+import com.android.launcher3.util.SettingsCache;
 import com.android.launcher3.util.PackageUserKey;
-import com.android.launcher3.util.SecureSettingsObserver;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -81,7 +81,8 @@ public class NotificationListener extends NotificationListenerService {
     /** The last notification key that was dismissed from launcher UI */
     private String mLastKeyDismissedByLauncher;
 
-    private SecureSettingsObserver mNotificationDotsObserver;
+    private SettingsCache mSettingsCache;
+    private SettingsCache.OnChangeListener mNotificationSettingsChangedListener;
 
     public NotificationListener() {
         mWorkerHandler = new Handler(MODEL_EXECUTOR.getLooper(), this::handleWorkerMessage);
@@ -207,10 +208,12 @@ public class NotificationListener extends NotificationListenerService {
         super.onListenerConnected();
         sIsConnected = true;
 
-        mNotificationDotsObserver =
-                newNotificationSettingsObserver(this, this::onNotificationSettingsChanged);
-        mNotificationDotsObserver.register();
-        mNotificationDotsObserver.dispatchOnChange();
+        // Register an observer to rebind the notification listener when dots are re-enabled.
+        mSettingsCache = SettingsCache.INSTANCE.get(this);
+        mNotificationSettingsChangedListener = this::onNotificationSettingsChanged;
+        mSettingsCache.register(NOTIFICATION_BADGING_URI,
+                mNotificationSettingsChangedListener);
+        mSettingsCache.dispatchOnChange(NOTIFICATION_BADGING_URI);
 
         onNotificationFullRefresh();
     }
@@ -229,7 +232,7 @@ public class NotificationListener extends NotificationListenerService {
     public void onListenerDisconnected() {
         super.onListenerDisconnected();
         sIsConnected = false;
-        mNotificationDotsObserver.unregister();
+        mSettingsCache.unregister(NOTIFICATION_BADGING_URI, mNotificationSettingsChangedListener);
         onNotificationFullRefresh();
     }
 
diff --git a/src/com/android/launcher3/settings/NotificationDotsPreference.java b/src/com/android/launcher3/settings/NotificationDotsPreference.java
index a91303a529..a35416915f 100644
--- a/src/com/android/launcher3/settings/NotificationDotsPreference.java
+++ b/src/com/android/launcher3/settings/NotificationDotsPreference.java
@@ -35,14 +35,14 @@ import androidx.preference.PreferenceViewHolder;
 
 import com.android.launcher3.R;
 import com.android.launcher3.notification.NotificationListener;
-import com.android.launcher3.util.SecureSettingsObserver;
+import com.android.launcher3.util.SettingsCache;
 
 /**
  * A {@link Preference} for indicating notification dots status.
  * Also has utility methods for updating UI based on dots status changes.
  */
 public class NotificationDotsPreference extends Preference
-        implements SecureSettingsObserver.OnChangeListener {
+        implements SettingsCache.OnChangeListener {
 
     private boolean mWidgetFrameVisible = false;
 
diff --git a/src/com/android/launcher3/settings/SettingsActivity.java b/src/com/android/launcher3/settings/SettingsActivity.java
index 922425fca1..ac8dac5f7e 100644
--- a/src/com/android/launcher3/settings/SettingsActivity.java
+++ b/src/com/android/launcher3/settings/SettingsActivity.java
@@ -18,13 +18,13 @@ package com.android.launcher3.settings;
 
 import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ACCESSIBILITY_FOCUS;
 
+import static com.android.launcher3.util.SettingsCache.NOTIFICATION_BADGING_URI;
+import static com.android.launcher3.util.SettingsCache.NOTIFICATION_ENABLED_LISTENERS;
 import static com.android.launcher3.states.RotationHelper.ALLOW_ROTATION_PREFERENCE_KEY;
 import static com.android.launcher3.states.RotationHelper.getAllowRotationDefaultValue;
-import static com.android.launcher3.util.SecureSettingsObserver.newNotificationSettingsObserver;
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.provider.Settings;
 import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
@@ -45,8 +45,8 @@ import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.WidgetsModel;
+import com.android.launcher3.util.SettingsCache;
 import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
-import com.android.launcher3.util.SecureSettingsObserver;
 
 /**
  * Settings activity for Launcher. Currently implements the following setting: Allow rotation
@@ -59,8 +59,6 @@ public class SettingsActivity extends FragmentActivity
     private static final String FLAGS_PREFERENCE_KEY = "flag_toggler";
 
     private static final String NOTIFICATION_DOTS_PREFERENCE_KEY = "pref_icon_badging";
-    /** Hidden field Settings.Secure.ENABLED_NOTIFICATION_LISTENERS */
-    private static final String NOTIFICATION_ENABLED_LISTENERS = "enabled_notification_listeners";
 
     public static final String EXTRA_FRAGMENT_ARG_KEY = ":settings:fragment_args_key";
     public static final String EXTRA_SHOW_FRAGMENT_ARGS = ":settings:show_fragment_args";
@@ -126,10 +124,11 @@ public class SettingsActivity extends FragmentActivity
      */
     public static class LauncherSettingsFragment extends PreferenceFragmentCompat {
 
-        private SecureSettingsObserver mNotificationDotsObserver;
+        private SettingsCache mSettingsCache;
 
         private String mHighLightKey;
         private boolean mPreferenceHighlighted = false;
+        private NotificationDotsPreference mNotificationSettingsChangedListener;
 
         @Override
         public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
@@ -177,14 +176,16 @@ public class SettingsActivity extends FragmentActivity
                     }
 
                     // Listen to system notification dot settings while this UI is active.
-                    mNotificationDotsObserver = newNotificationSettingsObserver(
-                            getActivity(), (NotificationDotsPreference) preference);
-                    mNotificationDotsObserver.register();
+                    mSettingsCache = SettingsCache.INSTANCE.get(getActivity());
+                    mNotificationSettingsChangedListener =
+                            ((NotificationDotsPreference) preference);
+                    mSettingsCache.register(NOTIFICATION_BADGING_URI,
+                            (NotificationDotsPreference) mNotificationSettingsChangedListener);
                     // Also listen if notification permission changes
-                    mNotificationDotsObserver.getResolver().registerContentObserver(
-                            Settings.Secure.getUriFor(NOTIFICATION_ENABLED_LISTENERS), false,
-                            mNotificationDotsObserver);
-                    mNotificationDotsObserver.dispatchOnChange();
+                    mSettingsCache.register(NOTIFICATION_ENABLED_LISTENERS,
+                            mNotificationSettingsChangedListener);
+                    mSettingsCache.dispatchOnChange(NOTIFICATION_BADGING_URI);
+                    mSettingsCache.dispatchOnChange(NOTIFICATION_ENABLED_LISTENERS);
                     return true;
 
                 case ALLOW_ROTATION_PREFERENCE_KEY:
@@ -251,9 +252,11 @@ public class SettingsActivity extends FragmentActivity
 
         @Override
         public void onDestroy() {
-            if (mNotificationDotsObserver != null) {
-                mNotificationDotsObserver.unregister();
-                mNotificationDotsObserver = null;
+            if (mSettingsCache != null) {
+                mSettingsCache.unregister(NOTIFICATION_BADGING_URI,
+                        mNotificationSettingsChangedListener);
+                mSettingsCache.unregister(NOTIFICATION_ENABLED_LISTENERS,
+                        mNotificationSettingsChangedListener);
             }
             super.onDestroy();
         }
diff --git a/src/com/android/launcher3/util/SecureSettingsObserver.java b/src/com/android/launcher3/util/SecureSettingsObserver.java
deleted file mode 100644
index 9fe72ad80a..0000000000
--- a/src/com/android/launcher3/util/SecureSettingsObserver.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.util;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.database.ContentObserver;
-import android.os.Handler;
-import android.provider.Settings;
-
-/**
- * Utility class to listen for secure settings changes
- */
-public class SecureSettingsObserver extends ContentObserver {
-
-    /** Hidden field Settings.Secure.NOTIFICATION_BADGING */
-    public static final String NOTIFICATION_BADGING = "notification_badging";
-    /** Hidden field Settings.Secure.ONE_HANDED_MODE_ENABLED */
-    public static final String ONE_HANDED_ENABLED = "one_handed_mode_enabled";
-    /** Hidden field Settings.Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED */
-    public static final String ONE_HANDED_SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED =
-            "swipe_bottom_to_notification_enabled";
-
-    private final ContentResolver mResolver;
-    private final String mKeySetting;
-    private final int mDefaultValue;
-    private final OnChangeListener mOnChangeListener;
-
-    public SecureSettingsObserver(ContentResolver resolver, OnChangeListener listener,
-            String keySetting, int defaultValue) {
-        super(new Handler());
-
-        mResolver = resolver;
-        mOnChangeListener = listener;
-        mKeySetting = keySetting;
-        mDefaultValue = defaultValue;
-    }
-
-    @Override
-    public void onChange(boolean selfChange) {
-        mOnChangeListener.onSettingsChanged(getValue());
-    }
-
-    public boolean getValue() {
-        return Settings.Secure.getInt(mResolver, mKeySetting, mDefaultValue) == 1;
-    }
-
-    public void register() {
-        mResolver.registerContentObserver(Settings.Secure.getUriFor(mKeySetting), false, this);
-    }
-
-    public ContentResolver getResolver() {
-        return mResolver;
-    }
-
-    public void dispatchOnChange() {
-        onChange(true);
-    }
-
-    public void unregister() {
-        mResolver.unregisterContentObserver(this);
-    }
-
-    public interface OnChangeListener {
-        void onSettingsChanged(boolean isEnabled);
-    }
-
-    public static SecureSettingsObserver newNotificationSettingsObserver(Context context,
-            OnChangeListener listener) {
-        return new SecureSettingsObserver(
-                context.getContentResolver(), listener, NOTIFICATION_BADGING, 1);
-    }
-
-    public static SecureSettingsObserver newOneHandedSettingsObserver(Context context,
-            OnChangeListener listener) {
-        return new SecureSettingsObserver(
-                context.getContentResolver(), listener, ONE_HANDED_ENABLED, 0);
-    }
-
-    /**
-     * Constructs settings observer for {@link #ONE_HANDED_SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED}
-     * preference.
-     */
-    public static SecureSettingsObserver newSwipeToNotificationSettingsObserver(Context context,
-            OnChangeListener listener) {
-        return new SecureSettingsObserver(
-                context.getContentResolver(), listener,
-                ONE_HANDED_SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, 1);
-    }
-}
diff --git a/src/com/android/launcher3/util/SettingsCache.java b/src/com/android/launcher3/util/SettingsCache.java
new file mode 100644
index 0000000000..22b4d38891
--- /dev/null
+++ b/src/com/android/launcher3/util/SettingsCache.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.util;
+
+import static android.provider.Settings.System.ACCELEROMETER_ROTATION;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.provider.Settings;
+
+import androidx.annotation.VisibleForTesting;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+/**
+ * ContentObserver over Settings keys that also has a caching layer.
+ * Consumers can register for callbacks via {@link #register(Uri, OnChangeListener)} and
+ * {@link #unregister(Uri, OnChangeListener)} methods.
+ *
+ * This can be used as a normal cache without any listeners as well via the
+ * {@link #getValue(Uri, int)} and {@link #dispatchOnChange(Uri)} to update (and subsequently call
+ * get)
+ *
+ * The cache will be invalidated/updated through the normal
+ * {@link ContentObserver#onChange(boolean)} calls
+ * or can be force updated by calling {@link #dispatchOnChange(Uri)}.
+ *
+ * Cache will also be updated if a key queried is missing (even if it has no listeners registered).
+ */
+public class SettingsCache extends ContentObserver {
+
+    /** Hidden field Settings.Secure.NOTIFICATION_BADGING */
+    public static final Uri NOTIFICATION_BADGING_URI =
+            Settings.Secure.getUriFor("notification_badging");
+    /** Hidden field Settings.Secure.ONE_HANDED_MODE_ENABLED */
+    public static final String ONE_HANDED_ENABLED = "one_handed_mode_enabled";
+    /** Hidden field Settings.Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED */
+    public static final String ONE_HANDED_SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED =
+            "swipe_bottom_to_notification_enabled";
+    /** Hidden field Settings.Secure.ENABLED_NOTIFICATION_LISTENERS */
+    public static final Uri NOTIFICATION_ENABLED_LISTENERS =
+            Settings.Secure.getUriFor("enabled_notification_listeners");
+    public static final Uri ROTATION_SETTING_URI =
+            Settings.System.getUriFor(ACCELEROMETER_ROTATION);
+
+    private static final String SYSTEM_URI_PREFIX = Settings.System.CONTENT_URI.toString();
+
+    /**
+     * Caches the last seen value for registered keys.
+     */
+    private Map<Uri, Boolean> mKeyCache = new ConcurrentHashMap<>();
+    private final Map<Uri, CopyOnWriteArrayList<OnChangeListener>> mListenerMap = new HashMap<>();
+    protected final ContentResolver mResolver;
+
+
+    /**
+     * Singleton instance
+     */
+    public static MainThreadInitializedObject<SettingsCache> INSTANCE =
+            new MainThreadInitializedObject<>(SettingsCache::new);
+
+    private SettingsCache(Context context) {
+        super(new Handler());
+        mResolver = context.getContentResolver();
+    }
+
+    @Override
+    public void onChange(boolean selfChange, Uri uri) {
+        // We use default of 1, but if we're getting an onChange call, can assume a non-default
+        // value will exist
+        boolean newVal = updateValue(uri, 1 /* Effectively Unused */);
+        if (!mListenerMap.containsKey(uri)) {
+            return;
+        }
+
+        for (OnChangeListener listener : mListenerMap.get(uri)) {
+            listener.onSettingsChanged(newVal);
+        }
+    }
+
+    /**
+     * Returns the value for this classes key from the cache. If not in cache, will call
+     * {@link #updateValue(Uri, int)} to fetch.
+     */
+    public boolean getValue(Uri keySetting, int defaultValue) {
+        if (mKeyCache.containsKey(keySetting)) {
+            return mKeyCache.get(keySetting);
+        } else {
+            return updateValue(keySetting, defaultValue);
+        }
+    }
+
+    /**
+     * Does not de-dupe if you add same listeners for the same key multiple times.
+     * Unregister once complete using {@link #unregister(Uri, OnChangeListener)}
+     */
+    public void register(Uri uri, OnChangeListener changeListener) {
+        if (mListenerMap.containsKey(uri)) {
+            mListenerMap.get(uri).add(changeListener);
+        } else {
+            CopyOnWriteArrayList<OnChangeListener> l = new CopyOnWriteArrayList<>();
+            l.add(changeListener);
+            mListenerMap.put(uri, l);
+            mResolver.registerContentObserver(uri, false, this);
+        }
+    }
+
+    private boolean updateValue(Uri keyUri, int defaultValue) {
+        String key = keyUri.getLastPathSegment();
+        boolean newVal;
+        if (keyUri.toString().startsWith(SYSTEM_URI_PREFIX)) {
+            newVal = Settings.System.getInt(mResolver, key, defaultValue) == 1;
+        } else { // SETTING_SECURE
+            newVal = Settings.Secure.getInt(mResolver, key, defaultValue) == 1;
+        }
+
+        mKeyCache.put(keyUri, newVal);
+        return newVal;
+    }
+
+    /**
+     * Force update a change for a given URI and have all listeners for that URI receive callbacks
+     * even if the value is unchanged.
+     */
+    public void dispatchOnChange(Uri uri) {
+        onChange(true, uri);
+    }
+
+    /**
+     * Call to stop receiving updates on the given {@param listener}.
+     * This Uri/Listener pair must correspond to the same pair called with for
+     * {@link #register(Uri, OnChangeListener)}
+     */
+    public void unregister(Uri uri, OnChangeListener listener) {
+        List<OnChangeListener> listenersToRemoveFrom = mListenerMap.get(uri);
+        if (!listenersToRemoveFrom.contains(listener)) {
+            return;
+        }
+
+        listenersToRemoveFrom.remove(listener);
+        if (listenersToRemoveFrom.isEmpty()) {
+            mListenerMap.remove(uri);
+        }
+    }
+
+    /**
+     * Don't use this. Ever.
+     * @param keyCache Cache to replace {@link #mKeyCache}
+     */
+    @VisibleForTesting
+    void setKeyCache(Map<Uri, Boolean> keyCache) {
+        mKeyCache = keyCache;
+    }
+
+    public interface OnChangeListener {
+        void onSettingsChanged(boolean isEnabled);
+    }
+}
diff --git a/tests/Android.mk b/tests/Android.mk
index 3d9077d4bd..43d51fca01 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -32,7 +32,6 @@ else
 
     LOCAL_SRC_FILES := $(call all-java-files-under, tapl) \
         ../src/com/android/launcher3/ResourceUtils.java \
-        ../src/com/android/launcher3/util/SecureSettingsObserver.java \
         ../src/com/android/launcher3/testing/TestProtocol.java
 endif
 
-- 
GitLab


From 3a06568d8bcfb8a28eb0c5f631bf1b9c79084956 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Thu, 11 Feb 2021 13:54:27 +0000
Subject: [PATCH 0532/1664] Use PersistedTaskSnapshotData to calculate TaskView
 size

- Disabled variable width for running task, as PersistedTaskSnapshotData is not always up to date for current task after rotating the device

Bug: 174464656
Test: Test tablet overview with different comination of portrait/landscape wide/narrow thumbnails in portrait/landscape
Change-Id: Ifa01e72020ccaf422e3975b092462de85fa19efd
---
 .../android/quickstep/RecentTasksList.java    |  5 ++--
 .../android/quickstep/views/RecentsView.java  | 11 +++++---
 .../quickstep/views/TaskThumbnailView.java    | 28 -------------------
 .../com/android/quickstep/views/TaskView.java | 13 ++++++---
 4 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/RecentTasksList.java b/quickstep/src/com/android/quickstep/RecentTasksList.java
index 70b4f20c2b..1c5dc4c829 100644
--- a/quickstep/src/com/android/quickstep/RecentTasksList.java
+++ b/quickstep/src/com/android/quickstep/RecentTasksList.java
@@ -191,6 +191,7 @@ public class RecentTasksList extends TaskStackChangeListener {
             } else {
                 task = new Task(taskKey);
             }
+            task.setLastSnapshotData(rawTask);
             allTasks.add(task);
         }
 
@@ -200,9 +201,7 @@ public class RecentTasksList extends TaskStackChangeListener {
     private ArrayList<Task> copyOf(ArrayList<Task> tasks) {
         ArrayList<Task> newTasks = new ArrayList<>();
         for (int i = 0; i < tasks.size(); i++) {
-            Task t = tasks.get(i);
-            newTasks.add(new Task(t.key, t.colorPrimary, t.colorBackground, t.isDockable,
-                    t.isLocked, t.taskDescription, t.topActivity));
+            newTasks.add(new Task(tasks.get(i)));
         }
         return newTasks;
     }
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 5d492acf84..deb1388e96 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -646,9 +646,9 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
 
     public TaskView getTaskView(int taskId) {
         for (int i = 0; i < getTaskViewCount(); i++) {
-            TaskView tv = getTaskViewAt(i);
-            if (tv.getTask() != null && tv.getTask().key != null && tv.getTask().key.id == taskId) {
-                return tv;
+            TaskView taskView = getTaskViewAt(i);
+            if (taskView.hasTaskId(taskId)) {
+                return taskView;
             }
         }
         return null;
@@ -808,6 +808,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             final Task task = tasks.get(i);
             final TaskView taskView = (TaskView) getChildAt(pageIndex);
             taskView.bind(task, mOrientationState);
+            taskView.updateTaskSize(!taskView.hasTaskId(mRunningTaskId));
         }
 
         if (mNextPage == INVALID_PAGE) {
@@ -942,7 +943,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         // Force TaskView to update size from thumbnail
         final int taskCount = getTaskViewCount();
         for (int i = 0; i < taskCount; i++) {
-            getTaskViewAt(i).updateTaskSize();
+            TaskView taskView = getTaskViewAt(i);
+            taskView.updateTaskSize(!taskView.hasTaskId(mRunningTaskId));
         }
     }
 
@@ -1252,6 +1254,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             // gesture and the task list is loaded and applied
             mTmpRunningTask = Task.from(new TaskKey(runningTaskInfo), runningTaskInfo, false);
             taskView.bind(mTmpRunningTask, mOrientationState);
+            taskView.updateTaskSize(false);
 
             // Measure and layout immediately so that the scroll values is updated instantly
             // as the user might be quick-switching
diff --git a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
index 3bd883ddc4..f2f4bc1238 100644
--- a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
@@ -111,9 +111,6 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
     private boolean mOverlayEnabled;
     private OverviewScreenshotActions mOverviewScreenshotActionsPlugin;
 
-    // TODO(b/179466077): Remove when proper API is ready.
-    private Float mThumbnailRatio = null;
-
     public TaskThumbnailView(Context context) {
         this(context, null);
     }
@@ -454,31 +451,6 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
         return mThumbnailData.isRealSnapshot;
     }
 
-    // TODO(b/179466077): Remove when proper API is ready.
-    public float getThumbnailRatio() {
-        // API is ready.
-        if (mThumbnailRatio != null) {
-            return mThumbnailRatio;
-        }
-
-        if (mThumbnailData == null || mThumbnailData.thumbnail == null) {
-            final float[] thumbnailRatios =
-                    new float[]{0.8882452f, 1.2834098f, 0.5558415f, 2.15625f};
-            // Use key's hash code to return a deterministic thumbnail ratio.
-            mThumbnailRatio = thumbnailRatios[mTask.key.hashCode() % thumbnailRatios.length];
-            return mThumbnailRatio;
-        }
-
-        float surfaceWidth = mThumbnailData.thumbnail.getWidth() / mThumbnailData.scale;
-        float surfaceHeight = mThumbnailData.thumbnail.getHeight() / mThumbnailData.scale;
-        float availableWidth = surfaceWidth
-                - (mThumbnailData.insets.left + mThumbnailData.insets.right);
-        float availableHeight = surfaceHeight
-                - (mThumbnailData.insets.top + mThumbnailData.insets.bottom);
-        mThumbnailRatio = availableWidth / availableHeight;
-        return mThumbnailRatio;
-    }
-
     /**
      * Utility class to position the thumbnail in the TaskView
      */
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index a1b553387b..e891c95a85 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -48,6 +48,7 @@ import android.app.ActivityOptions;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Outline;
+import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
@@ -449,7 +450,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         cancelPendingLoadTasks();
         mTask = task;
         mSnapshotView.bind(task);
-        updateTaskSize();
         setOrientationState(orientedState);
     }
 
@@ -457,6 +457,10 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         return mTask;
     }
 
+    public boolean hasTaskId(int taskId) {
+        return mTask != null && mTask.key != null && mTask.key.id == taskId;
+    }
+
     public TaskThumbnailView getThumbnail() {
         return mSnapshotView;
     }
@@ -1077,9 +1081,11 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
                 previewPositionHelper);
     }
 
-    void updateTaskSize() {
+    void updateTaskSize(boolean variableWidth) {
         ViewGroup.LayoutParams params = getLayoutParams();
-        if (mActivity.getDeviceProfile().isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get()) {
+        float thumbnailRatio = mTask != null ? mTask.getVisibleThumbnailRatio() : 0f;
+        if (variableWidth && mActivity.getDeviceProfile().isTablet
+                && FeatureFlags.ENABLE_OVERVIEW_GRID.get() && thumbnailRatio != 0f) {
             final int thumbnailPadding = (int) getResources().getDimension(
                     R.dimen.task_thumbnail_top_margin);
 
@@ -1087,7 +1093,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
             int taskWidth = lastComputedTaskSize.width();
             int taskHeight = lastComputedTaskSize.height();
             int boxLength = Math.max(taskWidth, taskHeight);
-            float thumbnailRatio = mSnapshotView.getThumbnailRatio();
 
             int expectedWidth;
             int expectedHeight;
-- 
GitLab


From b686972b7db170c4bd7b6c8b107c3dbdddb8755f Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 17 Feb 2021 11:40:07 +0000
Subject: [PATCH 0533/1664] Extract common codes for personal / work profile
 tabs

These codes can be reused in the FullWidgetsSheet which we will be
adding tabs for personal / work profile.

Test: Set up work profile and then switch person / work profile tabs
      in the AllAppsContainerView.

Bug: 179797520

Change-Id: Ib7eb1190e1384a664cbe3e34411c9362f1f6db03
---
 res/layout/all_apps.xml                       | 30 +-----
 res/layout/personal_work_tabs.xml             | 47 ++++++++++
 res/layout/secondary_launcher.xml             |  4 +-
 .../allapps/AllAppsContainerView.java         | 18 ++--
 .../launcher3/allapps/AllAppsPagedView.java   | 60 ++----------
 .../allapps/LauncherAllAppsContainerView.java |  9 +-
 .../workprofile/PersonalWorkPagedView.java    | 92 +++++++++++++++++++
 .../PersonalWorkSlidingTabStrip.java          | 25 +++--
 8 files changed, 178 insertions(+), 107 deletions(-)
 create mode 100644 res/layout/personal_work_tabs.xml
 create mode 100644 src/com/android/launcher3/workprofile/PersonalWorkPagedView.java
 rename src/com/android/launcher3/{allapps => workprofile}/PersonalWorkSlidingTabStrip.java (85%)

diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml
index 0041c9a7c8..8ed16c7493 100644
--- a/res/layout/all_apps.xml
+++ b/res/layout/all_apps.xml
@@ -40,35 +40,7 @@
 
         <include layout="@layout/floating_header_content" />
 
-        <com.android.launcher3.allapps.PersonalWorkSlidingTabStrip
-            android:id="@+id/tabs"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/all_apps_header_tab_height"
-            android:layout_marginLeft="@dimen/all_apps_tabs_side_padding"
-            android:layout_marginRight="@dimen/all_apps_tabs_side_padding"
-            android:orientation="horizontal"
-            style="@style/TextHeadline">
-
-            <Button
-                android:id="@+id/tab_personal"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="?android:attr/selectableItemBackground"
-                android:text="@string/all_apps_personal_tab"
-                android:textColor="@color/all_apps_tab_text"
-                android:textSize="14sp" />
-
-            <Button
-                android:id="@+id/tab_work"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="?android:attr/selectableItemBackground"
-                android:text="@string/all_apps_work_tab"
-                android:textColor="@color/all_apps_tab_text"
-                android:textSize="14sp" />
-        </com.android.launcher3.allapps.PersonalWorkSlidingTabStrip>
+        <include layout="@layout/personal_work_tabs" />
     </com.android.launcher3.allapps.FloatingHeaderView>
 
     <include
diff --git a/res/layout/personal_work_tabs.xml b/res/layout/personal_work_tabs.xml
new file mode 100644
index 0000000000..8f29997802
--- /dev/null
+++ b/res/layout/personal_work_tabs.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+-->
+
+<com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/tabs"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/all_apps_header_tab_height"
+    android:layout_marginLeft="@dimen/all_apps_tabs_side_padding"
+    android:layout_marginRight="@dimen/all_apps_tabs_side_padding"
+    android:orientation="horizontal"
+    style="@style/TextHeadline">
+
+    <Button
+        android:id="@+id/tab_personal"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:background="?android:attr/selectableItemBackground"
+        android:text="@string/all_apps_personal_tab"
+        android:textColor="@color/all_apps_tab_text"
+        android:textSize="14sp" />
+
+    <Button
+        android:id="@+id/tab_work"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:background="?android:attr/selectableItemBackground"
+        android:text="@string/all_apps_work_tab"
+        android:textColor="@color/all_apps_tab_text"
+        android:textSize="14sp" />
+</com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip>
\ No newline at end of file
diff --git a/res/layout/secondary_launcher.xml b/res/layout/secondary_launcher.xml
index fdf4446c96..e3c60ecb5f 100644
--- a/res/layout/secondary_launcher.xml
+++ b/res/layout/secondary_launcher.xml
@@ -67,7 +67,7 @@
             android:paddingTop="@dimen/all_apps_header_top_padding"
             android:orientation="vertical" >
 
-            <com.android.launcher3.allapps.PersonalWorkSlidingTabStrip
+            <com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip
                 android:id="@+id/tabs"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/all_apps_header_tab_height"
@@ -97,7 +97,7 @@
                     android:textAllCaps="true"
                     android:textColor="@color/all_apps_tab_text"
                     android:textSize="14sp" />
-            </com.android.launcher3.allapps.PersonalWorkSlidingTabStrip>
+            </com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip>
         </com.android.launcher3.allapps.FloatingHeaderView>
 
         <com.android.launcher3.allapps.search.AppsSearchContainerLayout
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 505e6d82e9..746bfba756 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -67,12 +67,13 @@ import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.RecyclerViewFastScroller;
 import com.android.launcher3.views.SpringRelativeLayout;
+import com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip.OnActivePageChangedListener;
 
 /**
  * The all apps view container.
  */
 public class AllAppsContainerView extends SpringRelativeLayout implements DragSource,
-        Insettable, OnDeviceProfileChangeListener {
+        Insettable, OnDeviceProfileChangeListener, OnActivePageChangedListener {
 
     private static final float FLING_VELOCITY_MULTIPLIER = 135f;
     // Starts the springs after at least 55% of the animation has passed.
@@ -434,7 +435,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
                     .setOnClickListener((View view) -> mViewPager.snapToPage(AdapterHolder.MAIN));
             findViewById(R.id.tab_work)
                     .setOnClickListener((View view) -> mViewPager.snapToPage(AdapterHolder.WORK));
-            onTabChanged(mViewPager.getNextPage());
+            onActivePageChanged(mViewPager.getNextPage());
         } else {
             mAH[AdapterHolder.MAIN].setup(findViewById(R.id.apps_list_view), null);
             mAH[AdapterHolder.WORK].recyclerView = null;
@@ -483,7 +484,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         if (showTabs) {
             mViewPager = (AllAppsPagedView) newView;
             mViewPager.initParentViews(this);
-            mViewPager.getPageIndicator().setContainerView(this);
+            mViewPager.getPageIndicator().setOnActivePageChangedListener(this);
         } else {
             mViewPager = null;
         }
@@ -493,14 +494,15 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         return mViewPager != null ? mViewPager : findViewById(R.id.apps_list_view);
     }
 
-    public void onTabChanged(int pos) {
-        mHeader.setMainActive(pos == 0);
-        if (mAH[pos].recyclerView != null) {
-            mAH[pos].recyclerView.bindFastScrollbar();
+    @Override
+    public void onActivePageChanged(int currentActivePage) {
+        mHeader.setMainActive(currentActivePage == 0);
+        if (mAH[currentActivePage].recyclerView != null) {
+            mAH[currentActivePage].recyclerView.bindFastScrollbar();
         }
         reset(true /* animate */);
         if (mWorkModeSwitch != null) {
-            mWorkModeSwitch.setWorkTabVisible(pos == AdapterHolder.WORK
+            mWorkModeSwitch.setWorkTabVisible(currentActivePage == AdapterHolder.WORK
                     && mAllAppsStore.hasModelFlag(
                     FLAG_HAS_SHORTCUT_PERMISSION | FLAG_QUIET_MODE_CHANGE_PERMISSION));
         }
diff --git a/src/com/android/launcher3/allapps/AllAppsPagedView.java b/src/com/android/launcher3/allapps/AllAppsPagedView.java
index e2550f597a..647402b9e1 100644
--- a/src/com/android/launcher3/allapps/AllAppsPagedView.java
+++ b/src/com/android/launcher3/allapps/AllAppsPagedView.java
@@ -17,17 +17,17 @@ package com.android.launcher3.allapps;
 
 import android.content.Context;
 import android.util.AttributeSet;
-import android.view.MotionEvent;
 
 import com.android.launcher3.PagedView;
 import com.android.launcher3.R;
 import com.android.launcher3.config.FeatureFlags;
+import com.android.launcher3.workprofile.PersonalWorkPagedView;
 
-public class AllAppsPagedView extends PagedView<PersonalWorkSlidingTabStrip> {
-
-    static final float START_DAMPING_TOUCH_SLOP_ANGLE = (float) Math.PI / 6;
-    static final float MAX_SWIPE_ANGLE = (float) Math.PI / 3;
-    static final float TOUCH_SLOP_DAMPING_FACTOR = 4;
+/**
+ *  A {@link PagedView} for showing different views for the personal and work profile respectively
+ *  in the {@link AllAppsContainerView}.
+ */
+public class AllAppsPagedView extends PersonalWorkPagedView {
 
     public AllAppsPagedView(Context context) {
         this(context, null);
@@ -44,52 +44,4 @@ public class AllAppsPagedView extends PagedView<PersonalWorkSlidingTabStrip> {
                         R.dimen.all_apps_header_top_padding);
         setPadding(0, topPadding, 0, 0);
     }
-
-    @Override
-    protected String getCurrentPageDescription() {
-        // Not necessary, tab-bar already has two tabs with their own descriptions.
-        return "";
-    }
-
-    @Override
-    protected void onScrollChanged(int l, int t, int oldl, int oldt) {
-        super.onScrollChanged(l, t, oldl, oldt);
-        mPageIndicator.setScroll(l, mMaxScroll);
-    }
-
-    @Override
-    protected void determineScrollingStart(MotionEvent ev) {
-        float absDeltaX = Math.abs(ev.getX() - getDownMotionX());
-        float absDeltaY = Math.abs(ev.getY() - getDownMotionY());
-
-        if (Float.compare(absDeltaX, 0f) == 0) return;
-
-        float slope = absDeltaY / absDeltaX;
-        float theta = (float) Math.atan(slope);
-
-        if (absDeltaX > mTouchSlop || absDeltaY > mTouchSlop) {
-            cancelCurrentPageLongPress();
-        }
-
-        if (theta > MAX_SWIPE_ANGLE) {
-            return;
-        } else if (theta > START_DAMPING_TOUCH_SLOP_ANGLE) {
-            theta -= START_DAMPING_TOUCH_SLOP_ANGLE;
-            float extraRatio = (float)
-                    Math.sqrt((theta / (MAX_SWIPE_ANGLE - START_DAMPING_TOUCH_SLOP_ANGLE)));
-            super.determineScrollingStart(ev, 1 + TOUCH_SLOP_DAMPING_FACTOR * extraRatio);
-        } else {
-            super.determineScrollingStart(ev);
-        }
-    }
-
-    @Override
-    public boolean hasOverlappingRendering() {
-        return false;
-    }
-
-    @Override
-    protected boolean canScroll(float absVScroll, float absHScroll) {
-        return (absHScroll > absVScroll) && super.canScroll(absVScroll, absHScroll);
-    }
 }
diff --git a/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java b/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
index 4876298761..bc2e66c36b 100644
--- a/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
@@ -87,17 +87,18 @@ public class LauncherAllAppsContainerView extends AllAppsContainerView {
     }
 
     @Override
-    public void onTabChanged(int pos) {
-        super.onTabChanged(pos);
+    public void onActivePageChanged(int currentActivePage) {
+        super.onActivePageChanged(currentActivePage);
         if (mUsingTabs) {
             // Log tab switches only when the launcher is in AllApps state
             if (mLauncher.getStateManager().getCurrentStableState() == LauncherState.ALL_APPS) {
                 mLauncher.getStatsLogManager().logger()
-                        .log(pos == AdapterHolder.WORK ? LAUNCHER_ALLAPPS_SWITCHED_TO_WORK_TAB
+                        .log(currentActivePage == AdapterHolder.WORK
+                                ? LAUNCHER_ALLAPPS_SWITCHED_TO_WORK_TAB
                                 : LAUNCHER_ALLAPPS_SWITCHED_TO_MAIN_TAB);
             }
 
-            if (pos == AdapterHolder.WORK) {
+            if (currentActivePage == AdapterHolder.WORK) {
                 WorkEduView.showWorkEduIfNeeded(mLauncher);
             } else {
                 mWorkTabListener = WorkEduView.showEduFlowIfNeeded(mLauncher, mWorkTabListener);
diff --git a/src/com/android/launcher3/workprofile/PersonalWorkPagedView.java b/src/com/android/launcher3/workprofile/PersonalWorkPagedView.java
new file mode 100644
index 0000000000..8b05a0d55a
--- /dev/null
+++ b/src/com/android/launcher3/workprofile/PersonalWorkPagedView.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.workprofile;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+
+import com.android.launcher3.PagedView;
+
+/**
+ *  A {@link PagedView} for showing different views for the personal and work profile respectively.
+ */
+public class PersonalWorkPagedView extends PagedView<PersonalWorkSlidingTabStrip> {
+
+    static final float START_DAMPING_TOUCH_SLOP_ANGLE = (float) Math.PI / 6;
+    static final float MAX_SWIPE_ANGLE = (float) Math.PI / 3;
+    static final float TOUCH_SLOP_DAMPING_FACTOR = 4;
+
+    public PersonalWorkPagedView(Context context) {
+        this(context, null);
+    }
+
+    public PersonalWorkPagedView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public PersonalWorkPagedView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    protected String getCurrentPageDescription() {
+        // Not necessary, tab-bar already has two tabs with their own descriptions.
+        return "";
+    }
+
+    @Override
+    protected void onScrollChanged(int l, int t, int oldl, int oldt) {
+        super.onScrollChanged(l, t, oldl, oldt);
+        mPageIndicator.setScroll(l, mMaxScroll);
+    }
+
+    @Override
+    protected void determineScrollingStart(MotionEvent ev) {
+        float absDeltaX = Math.abs(ev.getX() - getDownMotionX());
+        float absDeltaY = Math.abs(ev.getY() - getDownMotionY());
+
+        if (Float.compare(absDeltaX, 0f) == 0) return;
+
+        float slope = absDeltaY / absDeltaX;
+        float theta = (float) Math.atan(slope);
+
+        if (absDeltaX > mTouchSlop || absDeltaY > mTouchSlop) {
+            cancelCurrentPageLongPress();
+        }
+
+        if (theta > MAX_SWIPE_ANGLE) {
+            return;
+        } else if (theta > START_DAMPING_TOUCH_SLOP_ANGLE) {
+            theta -= START_DAMPING_TOUCH_SLOP_ANGLE;
+            float extraRatio = (float)
+                    Math.sqrt((theta / (MAX_SWIPE_ANGLE - START_DAMPING_TOUCH_SLOP_ANGLE)));
+            super.determineScrollingStart(ev, 1 + TOUCH_SLOP_DAMPING_FACTOR * extraRatio);
+        } else {
+            super.determineScrollingStart(ev);
+        }
+    }
+
+    @Override
+    public boolean hasOverlappingRendering() {
+        return false;
+    }
+
+    @Override
+    protected boolean canScroll(float absVScroll, float absHScroll) {
+        return (absHScroll > absVScroll) && super.canScroll(absVScroll, absHScroll);
+    }
+}
diff --git a/src/com/android/launcher3/allapps/PersonalWorkSlidingTabStrip.java b/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
similarity index 85%
rename from src/com/android/launcher3/allapps/PersonalWorkSlidingTabStrip.java
rename to src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
index 2de425ea4b..3a3028f8d9 100644
--- a/src/com/android/launcher3/allapps/PersonalWorkSlidingTabStrip.java
+++ b/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.launcher3.allapps;
+package com.android.launcher3.workprofile;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -35,9 +35,6 @@ import com.android.launcher3.util.Themes;
  * Supports two indicator colors, dedicated for personal and work tabs.
  */
 public class PersonalWorkSlidingTabStrip extends LinearLayout implements PageIndicator {
-    private static final int POSITION_PERSONAL = 0;
-    private static final int POSITION_WORK = 1;
-
     private final Paint mSelectedIndicatorPaint;
     private final Paint mDividerPaint;
 
@@ -47,7 +44,7 @@ public class PersonalWorkSlidingTabStrip extends LinearLayout implements PageInd
     private float mScrollOffset;
     private int mSelectedPosition = 0;
 
-    private AllAppsContainerView mContainerView;
+    private OnActivePageChangedListener mOnActivePageChangedListener;
     private int mLastActivePage = 0;
     private boolean mIsRtl;
 
@@ -123,7 +120,7 @@ public class PersonalWorkSlidingTabStrip extends LinearLayout implements PageInd
         float y = getHeight() - mDividerPaint.getStrokeWidth();
         canvas.drawLine(getPaddingLeft(), y, getWidth() - getPaddingRight(), y, mDividerPaint);
         canvas.drawRect(mIndicatorLeft, getHeight() - mSelectedIndicatorHeight,
-            mIndicatorRight, getHeight(), mSelectedIndicatorPaint);
+                mIndicatorRight, getHeight(), mSelectedIndicatorPaint);
     }
 
     @Override
@@ -135,15 +132,15 @@ public class PersonalWorkSlidingTabStrip extends LinearLayout implements PageInd
     @Override
     public void setActiveMarker(int activePage) {
         updateTabTextColor(activePage);
-        if (mContainerView != null && mLastActivePage != activePage) {
+        if (mOnActivePageChangedListener != null && mLastActivePage != activePage) {
             updateIndicatorPosition(activePage);
-            mContainerView.onTabChanged(activePage);
+            mOnActivePageChangedListener.onActivePageChanged(activePage);
         }
         mLastActivePage = activePage;
     }
 
-    public void setContainerView(AllAppsContainerView containerView) {
-        mContainerView = containerView;
+    public void setOnActivePageChangedListener(OnActivePageChangedListener listener) {
+        mOnActivePageChangedListener = listener;
     }
 
     @Override
@@ -153,4 +150,12 @@ public class PersonalWorkSlidingTabStrip extends LinearLayout implements PageInd
     public boolean hasOverlappingRendering() {
         return false;
     }
+
+    /**
+     * Interface definition for a callback to be invoked when an active page has been changed.
+     */
+    public interface OnActivePageChangedListener {
+        /** Called when the active page has been changed. */
+        void onActivePageChanged(int currentActivePage);
+    }
 }
-- 
GitLab


From d25e87a6a304c19bf8ffe06c4ebee19420875518 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Fri, 12 Feb 2021 12:12:56 +0000
Subject: [PATCH 0534/1664] Refresh DisplayContext to prevent getting stale
 DisplayMetrics

Bug: 176656141
Test: Change font size or display size, it should reflect on home screen icon/text sizes.
Change-Id: I39bb9d11d246c7ccea1ea4d5af37fba3ce0001be
---
 src/com/android/launcher3/DeviceProfile.java  |  9 ++++++--
 .../launcher3/util/DisplayController.java     | 23 ++++++++++++-------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 83a7d77601..9992fdeb90 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -648,8 +648,13 @@ public class DeviceProfile {
     public boolean updateIsSeascape(Context context) {
         if (isVerticalBarLayout()) {
             // Check an up-to-date info.
-            boolean isSeascape = DisplayController.getDefaultDisplay(context)
-                    .createInfoForContext(context).rotation == Surface.ROTATION_270;
+            DisplayController.Info displayInfo = DisplayController.getDefaultDisplay(context)
+                    .createInfoForContext(context);
+            if (displayInfo == null) {
+                return false;
+            }
+
+            boolean isSeascape = displayInfo.rotation == Surface.ROTATION_270;
             if (mIsSeascape != isSeascape) {
                 mIsSeascape = isSeascape;
                 return true;
diff --git a/src/com/android/launcher3/util/DisplayController.java b/src/com/android/launcher3/util/DisplayController.java
index 3b7bcc285a..a8a7e944cf 100644
--- a/src/com/android/launcher3/util/DisplayController.java
+++ b/src/com/android/launcher3/util/DisplayController.java
@@ -29,6 +29,7 @@ import android.util.Log;
 import android.util.SparseArray;
 import android.view.Display;
 
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.launcher3.Utilities;
@@ -182,20 +183,26 @@ public class DisplayController implements DisplayListener {
         }
 
         /** Creates and up-to-date DisplayController.Info for the given context. */
+        @Nullable
         public Info createInfoForContext(Context context) {
-            Display display = Utilities.ATLEAST_R
-                    ? context.getDisplay()
-                    : context
-                        .getSystemService(DisplayManager.class)
-                        .getDisplay(mId);
-            return display == null
-                    ? new Info(context)
-                    : new Info(context, display);
+            Display display = Utilities.ATLEAST_R ? context.getDisplay() : null;
+            if (display == null) {
+                display = context.getSystemService(DisplayManager.class).getDisplay(mId);
+            }
+            if (display == null) {
+                return null;
+            }
+            // Refresh the Context the prevent stale DisplayMetrics.
+            Context displayContext = context.getApplicationContext().createDisplayContext(display);
+            return new Info(displayContext, display);
         }
 
         protected void handleOnChange() {
             Info oldInfo = mInfo;
             Info newInfo = createInfoForContext(mDisplayContext);
+            if (newInfo == null) {
+                return;
+            }
 
             int change = 0;
             if (newInfo.hasDifferentSize(oldInfo)) {
-- 
GitLab


From 22679f8804e1f7080f86d9ccdcae587932a28bac Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Wed, 17 Feb 2021 17:44:03 -0500
Subject: [PATCH 0535/1664] Update folder to new specs.

- Fix folder animation not lining up perfectly with foldericon.

Bug: 175329686
Test: manual check that the animation works as expected
Change-Id: I5c35525102e2ab7ca542bc08568706531e531890
---
 res/layout/user_folder_icon_normalized.xml | 4 ++--
 res/values/dimens.xml                      | 4 ++--
 src/com/android/launcher3/CellLayout.java  | 5 ++++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/res/layout/user_folder_icon_normalized.xml b/res/layout/user_folder_icon_normalized.xml
index 923352e707..c230dadd8f 100644
--- a/res/layout/user_folder_icon_normalized.xml
+++ b/res/layout/user_folder_icon_normalized.xml
@@ -27,8 +27,8 @@
         android:clipToPadding="false"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
         android:paddingTop="16dp"
         launcher:pageIndicator="@+id/folder_page_indicator" />
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 1ce7840ae5..84dfca57f5 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -149,9 +149,9 @@
     <dimen name="folder_cell_x_padding">9dp</dimen>
     <dimen name="folder_cell_y_padding">6dp</dimen>
     <dimen name="folder_child_text_size">13sp</dimen>
-    <dimen name="folder_label_padding_top">4dp</dimen>
+    <dimen name="folder_label_padding_top">12dp</dimen>
     <dimen name="folder_label_padding_bottom">12dp</dimen>
-    <dimen name="folder_label_text_size">14sp</dimen>
+    <dimen name="folder_label_text_size">16sp</dimen>
 
 <!-- Sizes for managed profile badges -->
     <dimen name="profile_badge_size">24dp</dimen>
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 29812fda9f..0334551da3 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -19,6 +19,7 @@ package com.android.launcher3;
 import static android.animation.ValueAnimator.areAnimatorsEnabled;
 
 import static com.android.launcher3.anim.Interpolators.DEACCEL_1_5;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_FOUR_COLUMNS;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -597,7 +598,9 @@ public class CellLayout extends ViewGroup {
         if (child instanceof BubbleTextView) {
             BubbleTextView bubbleChild = (BubbleTextView) child;
             bubbleChild.setTextVisibility(mContainerType != HOTSEAT);
-            bubbleChild.setCenterVertically(mContainerType != HOTSEAT);
+            if (ENABLE_FOUR_COLUMNS.get()) {
+                bubbleChild.setCenterVertically(mContainerType != HOTSEAT);
+            }
         }
 
         child.setScaleX(mChildScale);
-- 
GitLab


From db9a53d9aa0aa56f339b227762b354381878ad65 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Wed, 17 Feb 2021 00:35:10 -0800
Subject: [PATCH 0536/1664] Add group highlighting to AA+ result

Bug: 180071886
Test: manual
Change-Id: Id1cc3d7400e1a7fe41af272d689aa9315030b420
---
 .../appprediction/PredictionRowView.java      |   4 +-
 res/values/dimens.xml                         |   4 +-
 src/com/android/launcher3/BubbleTextView.java |  15 +-
 .../launcher3/allapps/AllAppsGridAdapter.java |  13 +-
 .../allapps/AllAppsSectionDecorator.java      | 133 ++++++++++--------
 .../allapps/AlphabeticalAppsList.java         |  22 +--
 .../allapps/search/AppsSearchPipeline.java    |   8 +-
 ...onInfo.java => SectionDecorationInfo.java} |  32 ++---
 8 files changed, 102 insertions(+), 129 deletions(-)
 rename src/com/android/launcher3/allapps/search/{SearchSectionInfo.java => SectionDecorationInfo.java} (73%)

diff --git a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
index f53a5efe95..7d494c28bf 100644
--- a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
+++ b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
@@ -130,7 +130,7 @@ public class PredictionRowView extends LinearLayout implements
 
         if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
             mDecorationHandler = new AllAppsSectionDecorator.SectionDecorationHandler(getContext(),
-                    false);
+                    false, 0, true, true);
         }
 
         updateVisibility();
@@ -164,7 +164,7 @@ public class PredictionRowView extends LinearLayout implements
             for (int i = 0; i < childrenCount; i++) {
                 mDecorationHandler.extendBounds(getChildAt(i));
             }
-            mDecorationHandler.onDraw(canvas);
+            mDecorationHandler.onGroupDraw(canvas);
             mDecorationHandler.onFocusDraw(canvas, getFocusedChild());
             mLauncher.getAppsView().getActiveRecyclerView().invalidateItemDecorations();
         }
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 1ce7840ae5..a93c615303 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -253,10 +253,12 @@
 
     <!-- Search related -->
     <dimen name="search_hero_title_size">16sp</dimen>
-    <dimen name="search_hero_subtitle_size">15sp</dimen>
+    <dimen name="search_hero_subtitle_size">14sp</dimen>
     <dimen name="search_hero_inline_button_size">12sp</dimen>
     <dimen name="search_settings_icon_size">36dp</dimen>
     <dimen name="search_settings_icon_vertical_offset">16dp</dimen>
     <dimen name="search_line_spacing">4dp</dimen>
+    <dimen name="search_decoration_corner_radius">28dp</dimen>
+    <dimen name="search_decoration_padding">1dp</dimen>
 
 </resources>
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index e5a4335dcd..ee4d7ecb55 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -53,7 +53,6 @@ import androidx.annotation.UiThread;
 
 import com.android.launcher3.Launcher.OnResumeCallback;
 import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
-import com.android.launcher3.allapps.AllAppsSectionDecorator;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.dot.DotInfo;
 import com.android.launcher3.dragndrop.DraggableView;
@@ -84,7 +83,7 @@ import java.text.NumberFormat;
  * too aggressive.
  */
 public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, OnResumeCallback,
-        IconLabelDotView, DraggableView, Reorderable, AllAppsSectionDecorator.SelfDecoratingView {
+        IconLabelDotView, DraggableView, Reorderable {
 
     private static final int DISPLAY_WORKSPACE = 0;
     private static final int DISPLAY_ALL_APPS = 1;
@@ -954,16 +953,4 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
             setCompoundDrawables(null, newIcon, null, null);
         }
     }
-
-    @Override
-    public void decorate(int color) {
-        mHighlightColor = color;
-        invalidate();
-    }
-
-    @Override
-    public void removeDecoration() {
-        mHighlightColor = Color.TRANSPARENT;
-        invalidate();
-    }
 }
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index 715c142ac9..5030c5e1a3 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -42,8 +42,7 @@ import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.search.SearchAdapterProvider;
-import com.android.launcher3.allapps.search.SearchSectionInfo;
-import com.android.launcher3.config.FeatureFlags;
+import com.android.launcher3.allapps.search.SectionDecorationInfo;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.util.PackageManagerHelper;
 
@@ -109,7 +108,7 @@ public class AllAppsGridAdapter extends
         // The index of this app not including sections
         public int appIndex = -1;
         // Search section associated to result
-        public SearchSectionInfo searchSectionInfo = null;
+        public SectionDecorationInfo sectionDecorationInfo = null;
 
         /**
          * Factory method for AppIcon AdapterItem
@@ -372,10 +371,6 @@ public class AllAppsGridAdapter extends
 
     @Override
     public void onBindViewHolder(ViewHolder holder, int position) {
-        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()
-                && holder.itemView instanceof AllAppsSectionDecorator.SelfDecoratingView) {
-            ((AllAppsSectionDecorator.SelfDecoratingView) holder.itemView).removeDecoration();
-        }
         switch (holder.getItemViewType()) {
             case VIEW_TYPE_ICON:
                 AdapterItem adapterItem = mApps.getAdapterItems().get(position);
@@ -409,10 +404,6 @@ public class AllAppsGridAdapter extends
     @Override
     public void onViewRecycled(@NonNull ViewHolder holder) {
         super.onViewRecycled(holder);
-        if (!FeatureFlags.ENABLE_DEVICE_SEARCH.get()) return;
-        if (holder.itemView instanceof AllAppsSectionDecorator.SelfDecoratingView) {
-            ((AllAppsSectionDecorator.SelfDecoratingView) holder.itemView).removeDecoration();
-        }
     }
 
     @Override
diff --git a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
index 6c95992397..176dce6c84 100644
--- a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
+++ b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
@@ -18,16 +18,18 @@ package com.android.launcher3.allapps;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Paint;
+import android.graphics.Path;
 import android.graphics.RectF;
 import android.view.View;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.graphics.ColorUtils;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsGridAdapter.AppsGridLayoutManager;
-import com.android.launcher3.allapps.search.SearchSectionInfo;
+import com.android.launcher3.allapps.search.SectionDecorationInfo;
 import com.android.launcher3.util.Themes;
 
 import java.util.List;
@@ -45,52 +47,51 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
 
     @Override
     public void onDraw(Canvas c, RecyclerView parent, RecyclerView.State state) {
-        // Iterate through views in recylerview and draw bounds around views in the same section.
-        // Since views in the same section will follow each other, we can skip to a last view in
-        // a section to get the bounds of the section without having to iterate on every item.
-        int itemCount = parent.getChildCount();
         List<AllAppsGridAdapter.AdapterItem> adapterItems = mAppsView.getApps().getAdapterItems();
-        SectionDecorationHandler lastDecorationHandler = null;
-        int i = 0;
-        while (i < itemCount) {
+        boolean drawFallbackFocusedView = true;
+        for (int i = 0; i < parent.getChildCount(); i++) {
             View view = parent.getChildAt(i);
-            if (view instanceof SelfDecoratingView) {
-                ((SelfDecoratingView) view).removeDecoration();
-            }
             int position = parent.getChildAdapterPosition(view);
             AllAppsGridAdapter.AdapterItem adapterItem = adapterItems.get(position);
-            if (adapterItem.searchSectionInfo != null) {
-                SearchSectionInfo sectionInfo = adapterItem.searchSectionInfo;
-                int endIndex = Math.min(i + sectionInfo.getPosEnd() - position, itemCount - 1);
+            if (adapterItem.sectionDecorationInfo != null) {
+                SectionDecorationInfo sectionInfo = adapterItem.sectionDecorationInfo;
                 SectionDecorationHandler decorationHandler = sectionInfo.getDecorationHandler();
-                if (decorationHandler != lastDecorationHandler && lastDecorationHandler != null) {
-                    drawDecoration(c, lastDecorationHandler, parent);
-                }
-                lastDecorationHandler = decorationHandler;
                 if (decorationHandler != null) {
                     decorationHandler.extendBounds(view);
-                }
-
-                if (endIndex > i) {
-                    i = endIndex;
-                    continue;
+                    if (sectionInfo.isFocusedView()) {
+                        decorationHandler.onFocusDraw(c, view);
+                        drawFallbackFocusedView = false;
+                    } else {
+                        decorationHandler.onGroupDraw(c);
+                    }
                 }
             }
-            i++;
         }
-        if (lastDecorationHandler != null) {
-            drawDecoration(c, lastDecorationHandler, parent);
+        // fallback logic in case none of the SearchTarget is labeled as focused item
+        if (drawFallbackFocusedView) {
+            for (int i = 0; i < parent.getChildCount(); i++) {
+                View view = parent.getChildAt(i);
+                int position = parent.getChildAdapterPosition(view);
+                AllAppsGridAdapter.AdapterItem adapterItem = adapterItems.get(position);
+                if (adapterItem.sectionDecorationInfo != null) {
+                    SectionDecorationInfo sectionInfo = adapterItem.sectionDecorationInfo;
+                    SectionDecorationHandler decorationHandler = sectionInfo.getDecorationHandler();
+                    if (decorationHandler != null) {
+                        drawDecoration(c, decorationHandler, parent);
+                    }
+                }
+            }
         }
     }
 
-    private void drawDecoration(Canvas c, SectionDecorationHandler decorationHandler,
-            RecyclerView parent) {
-        if (decorationHandler == null) return;
+    // Fallback logic in case non of the SearchTarget is labeled as focused item.
+    private void drawDecoration(@NonNull Canvas c,
+            @NonNull SectionDecorationHandler decorationHandler,
+            @NonNull RecyclerView parent) {
         if (decorationHandler.mIsFullWidth) {
             decorationHandler.mBounds.left = parent.getPaddingLeft();
             decorationHandler.mBounds.right = parent.getWidth() - parent.getPaddingRight();
         }
-        decorationHandler.onDraw(c);
         if (mAppsView.getFloatingHeaderView().getFocusedChild() == null
                 && mAppsView.getApps().getFocusedChild() != null) {
             int index = mAppsView.getApps().getFocusedChildIndex();
@@ -109,23 +110,41 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
      * Handles grouping and drawing of items in the same all apps sections.
      */
     public static class SectionDecorationHandler {
-        private static final int FILL_ALPHA = 0;
-
         protected RectF mBounds = new RectF();
         private final boolean mIsFullWidth;
         private final float mRadius;
 
-        protected int mFocusColor;
-        protected int mFillcolor;
+        protected final int mFocusColor; // main focused item color
+        protected final int mFillcolor; // grouping color
+
         private final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        private final boolean mIsTopRound;
+        private final boolean mIsBottomRound;
+        private float [] mCorners;
+        private float mFillSpacing;
 
+        public SectionDecorationHandler(Context context, boolean isFullWidth, int fillAlpha,
+                boolean isTopRound, boolean isBottomRound) {
 
-        public SectionDecorationHandler(Context context, boolean isFullWidth) {
             mIsFullWidth = isFullWidth;
             int endScrim = Themes.getColorBackground(context);
-            mFillcolor = ColorUtils.setAlphaComponent(endScrim, FILL_ALPHA);
-            mFocusColor = endScrim;
-            mRadius = Themes.getDialogCornerRadius(context);
+            mFillcolor = ColorUtils.setAlphaComponent(endScrim, fillAlpha);
+            mFocusColor = ColorUtils.setAlphaComponent(endScrim, fillAlpha);
+
+            mIsTopRound = isTopRound;
+            mIsBottomRound = isBottomRound;
+
+            mRadius = context.getResources().getDimensionPixelSize(
+                    R.dimen.search_decoration_corner_radius);
+            mFillSpacing = context.getResources().getDimensionPixelSize(
+                    R.dimen.search_decoration_padding);
+            mCorners = new float[]{
+                    mIsTopRound ? mRadius : 0, mIsTopRound ? mRadius : 0, // Top left radius in px
+                    mIsTopRound ? mRadius : 0, mIsTopRound ? mRadius : 0, // Top right radius in px
+                    mIsBottomRound ? mRadius : 0, mIsBottomRound ? mRadius : 0, // Bottom right
+                    mIsBottomRound ? mRadius : 0, mIsBottomRound ? mRadius : 0  // Bottom left
+            };
+
         }
 
         /**
@@ -147,9 +166,9 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
         /**
          * Draw bounds onto canvas.
          */
-        public void onDraw(Canvas canvas) {
+        public void onGroupDraw(Canvas canvas) {
             mPaint.setColor(mFillcolor);
-            canvas.drawRoundRect(mBounds, mRadius, mRadius, mPaint);
+            onDraw(canvas);
         }
 
         /**
@@ -159,13 +178,20 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
             if (view == null) {
                 return;
             }
-            if (view instanceof SelfDecoratingView) {
-                ((SelfDecoratingView) view).decorate(mFocusColor);
-                return;
-            }
             mPaint.setColor(mFocusColor);
-            canvas.drawRoundRect(view.getLeft(), view.getTop(),
-                    view.getRight(), view.getBottom(), mRadius, mRadius, mPaint);
+            mBounds.set(view.getLeft(), view.getTop(), view.getRight(), view.getBottom());
+            onDraw(canvas);
+        }
+
+
+        private void onDraw(Canvas canvas) {
+            final Path path = new Path();
+            RectF finalBounds = new RectF(mBounds.left + mFillSpacing,
+                    mBounds.top + mFillSpacing,
+                    mBounds.right - mFillSpacing,
+                    mBounds.bottom - mFillSpacing);
+            path.addRoundRect(finalBounds, mCorners, Path.Direction.CW);
+            canvas.drawPath(path, mPaint);
         }
 
         /**
@@ -175,19 +201,4 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
             mBounds.setEmpty();
         }
     }
-
-    /**
-     * An interface for a view to draw highlight indicator
-     */
-    public interface SelfDecoratingView {
-        /**
-         * Removes decorations drawing if focus is acquired by another view
-         */
-        void removeDecoration();
-
-        /**
-         * Draws highlight indicator on view.
-         */
-        void decorate(int focusColor);
-    }
 }
diff --git a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
index 1dc10fea1f..123ace7938 100644
--- a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
+++ b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
@@ -20,7 +20,7 @@ import android.content.Context;
 
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItem;
-import com.android.launcher3.allapps.search.SearchSectionInfo;
+import com.android.launcher3.allapps.search.SectionDecorationInfo;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.util.ItemInfoMatcher;
@@ -201,20 +201,11 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
     }
 
     void updateSearchAdapterItems(ArrayList<AdapterItem> list, int offset) {
-        SearchSectionInfo lastSection = null;
         for (int i = 0; i < list.size(); i++) {
             AdapterItem adapterItem = list.get(i);
             adapterItem.position = offset + i;
             mAdapterItems.add(adapterItem);
-            if (adapterItem.searchSectionInfo != lastSection) {
-                if (adapterItem.searchSectionInfo != null) {
-                    adapterItem.searchSectionInfo.setPosStart(adapterItem.position);
-                }
-                if (lastSection != null) {
-                    lastSection.setPosEnd(adapterItem.position - 1);
-                }
-                lastSection = adapterItem.searchSectionInfo;
-            }
+
             if (adapterItem.isCountedForAccessibility()) {
                 mAccessibilityResultsCount++;
             }
@@ -295,16 +286,16 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
         mFastScrollerSections.clear();
         mAdapterItems.clear();
 
-        SearchSectionInfo appSection = new SearchSectionInfo();
+        SectionDecorationInfo appSection = new SectionDecorationInfo();
         appSection.setDecorationHandler(
-                new AllAppsSectionDecorator.SectionDecorationHandler(mLauncher, true));
+                new AllAppsSectionDecorator.SectionDecorationHandler(mLauncher, true,
+                        0, false, false));
 
         // Recreate the filtered and sectioned apps (for convenience for the grid layout) from the
         // ordered set of sections
 
         if (!hasFilter()) {
             mAccessibilityResultsCount = mApps.size();
-            appSection.setPosStart(position);
             for (AppInfo info : mApps) {
                 String sectionName = info.sectionName;
 
@@ -321,11 +312,10 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
                     lastFastScrollerSectionInfo.fastScrollToItem = appItem;
                 }
                 if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
-                    appItem.searchSectionInfo = appSection;
+                    appItem.sectionDecorationInfo = appSection;
                 }
                 mAdapterItems.add(appItem);
             }
-            appSection.setPosEnd(mApps.isEmpty() ? appSection.getPosStart() : position - 1);
         } else {
             updateSearchAdapterItems(mSearchResults, 0);
             if (!FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java b/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
index 84688e1737..f9fb22ece7 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
@@ -37,14 +37,14 @@ public class AppsSearchPipeline implements SearchPipeline {
 
     private static final int MAX_RESULTS_COUNT = 5;
 
-    private final SearchSectionInfo mSearchSectionInfo;
+    private final SectionDecorationInfo mSearchSectionInfo;
     private final LauncherAppState mLauncherAppState;
 
     public AppsSearchPipeline(Context context, LauncherAppState launcherAppState) {
         mLauncherAppState = launcherAppState;
-        mSearchSectionInfo = new SearchSectionInfo();
+        mSearchSectionInfo = new SectionDecorationInfo();
         mSearchSectionInfo.setDecorationHandler(
-                new SectionDecorationHandler(context, true));
+                new SectionDecorationHandler(context, true, 0, true, true));
     }
 
     @Override
@@ -81,7 +81,7 @@ public class AppsSearchPipeline implements SearchPipeline {
         ArrayList<AdapterItem> items = new ArrayList<>();
         for (int i = 0; i < matchingApps.size() && i < MAX_RESULTS_COUNT; i++) {
             AdapterItem appItem = AdapterItem.asApp(i, "", matchingApps.get(i), i);
-            appItem.searchSectionInfo = mSearchSectionInfo;
+            appItem.sectionDecorationInfo = mSearchSectionInfo;
             items.add(appItem);
         }
 
diff --git a/src/com/android/launcher3/allapps/search/SearchSectionInfo.java b/src/com/android/launcher3/allapps/search/SectionDecorationInfo.java
similarity index 73%
rename from src/com/android/launcher3/allapps/search/SearchSectionInfo.java
rename to src/com/android/launcher3/allapps/search/SectionDecorationInfo.java
index 464df68c96..0b64fcaece 100644
--- a/src/com/android/launcher3/allapps/search/SearchSectionInfo.java
+++ b/src/com/android/launcher3/allapps/search/SectionDecorationInfo.java
@@ -18,37 +18,30 @@ package com.android.launcher3.allapps.search;
 import com.android.launcher3.allapps.AllAppsSectionDecorator.SectionDecorationHandler;
 
 /**
- * Info class for a search section
+ * Info class for a search section that is primarily used for decoration.
  */
-public class SearchSectionInfo {
+public class SectionDecorationInfo {
+
+    public static final int QUICK_LAUNCH = 1 << 0;
+    public static final int GROUPING = 1 << 1;
 
     private String mSectionId;
+    private boolean mFocused;
     private SectionDecorationHandler mDecorationHandler;
 
-    public int getPosStart() {
-        return mPosStart;
-    }
-
-    public void setPosStart(int posStart) {
-        mPosStart = posStart;
+    public boolean isFocusedView() {
+        return mFocused;
     }
 
-    public int getPosEnd() {
-        return mPosEnd;
+    public void setFocusedView(boolean focused) {
+        mFocused = focused;
     }
 
-    public void setPosEnd(int posEnd) {
-        mPosEnd = posEnd;
-    }
-
-    private int mPosStart;
-    private int mPosEnd;
-
-    public SearchSectionInfo() {
+    public SectionDecorationInfo() {
         this(null);
     }
 
-    public SearchSectionInfo(String sectionId) {
+    public SectionDecorationInfo(String sectionId) {
         mSectionId = sectionId;
     }
 
@@ -56,7 +49,6 @@ public class SearchSectionInfo {
         mDecorationHandler = sectionDecorationHandler;
     }
 
-
     public SectionDecorationHandler getDecorationHandler() {
         return mDecorationHandler;
     }
-- 
GitLab


From 13f656e15e470f7b5e0a1710ead41c7c8487e905 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 18 Feb 2021 09:36:02 -0800
Subject: [PATCH 0537/1664] Always loading high-res icon for apps.

Low res support will be completely removed in a followup cl

Bug: 179962824
Test: Verified on device
Change-Id: Ibb19d1892bfcdf5d26178e807f54f40462704e33
---
 src/com/android/launcher3/model/AllAppsList.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/model/AllAppsList.java b/src/com/android/launcher3/model/AllAppsList.java
index a519f9275c..92b5885e9e 100644
--- a/src/com/android/launcher3/model/AllAppsList.java
+++ b/src/com/android/launcher3/model/AllAppsList.java
@@ -136,7 +136,7 @@ public class AllAppsList {
         if (findAppInfo(info.componentName, info.user) != null) {
             return;
         }
-        mIconCache.getTitleAndIcon(info, activityInfo, true /* useLowResIcon */);
+        mIconCache.getTitleAndIcon(info, activityInfo, false /* useLowResIcon */);
         info.sectionName = mIndex.computeSectionName(info.title);
 
         data.add(info);
@@ -280,7 +280,7 @@ public class AllAppsList {
                 } else {
                     Intent launchIntent = AppInfo.makeLaunchIntent(info);
 
-                    mIconCache.getTitleAndIcon(applicationInfo, info, true /* useLowResIcon */);
+                    mIconCache.getTitleAndIcon(applicationInfo, info, false /* useLowResIcon */);
                     applicationInfo.sectionName = mIndex.computeSectionName(applicationInfo.title);
                     applicationInfo.setProgressLevel(
                             PackageManagerHelper.getLoadingProgress(info),
-- 
GitLab


From cabc13a376121606f2a8d3c9aab281df60f7db2b Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Thu, 18 Feb 2021 14:10:48 -0500
Subject: [PATCH 0538/1664] Update popup container to match spec.

Bug: 175329686
Bug: 178935485
Test: manual
Change-Id: Ia7507bd4dd6c6db0cdd6a29a0c1d0695aae7d488
---
 res/values/dimens.xml                           |  5 +++--
 .../launcher3/views/OptionsPopupView.java       | 17 ++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 1ce7840ae5..ef7d0a00a1 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -170,7 +170,8 @@
 
 <!-- Deep shortcuts -->
     <dimen name="deep_shortcuts_elevation">9dp</dimen>
-    <dimen name="bg_popup_item_width">260dp</dimen>
+    <!-- also update deep_shortcuts_divider_width -->
+    <dimen name="bg_popup_item_width">234dp</dimen>
     <dimen name="bg_popup_item_height">56dp</dimen>
     <dimen name="bg_popup_item_condensed_height">48dp</dimen>
     <dimen name="pre_drag_view_scale">6dp</dimen>
@@ -193,7 +194,7 @@
     <!-- popup_padding_start + icon_size + 10dp -->
     <dimen name="deep_shortcuts_text_padding_start">56dp</dimen>
     <!-- popup_item_width - deep_shortcuts_text_padding_start -->
-    <dimen name="deep_shortcuts_divider_width">164dp</dimen>
+    <dimen name="deep_shortcuts_divider_width">178dp</dimen>
     <dimen name="system_shortcut_icon_size">24dp</dimen>
     <!-- popup_arrow_center_start - system_shortcut_icon_size / 2 -->
     <dimen name="system_shortcut_margin_start">16dp</dimen>
diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java
index addaf9cb82..14fc189ce7 100644
--- a/src/com/android/launcher3/views/OptionsPopupView.java
+++ b/src/com/android/launcher3/views/OptionsPopupView.java
@@ -156,6 +156,14 @@ public class OptionsPopupView extends ArrowPopup
      */
     public static ArrayList<OptionItem> getOptions(Launcher launcher) {
         ArrayList<OptionItem> options = new ArrayList<>();
+        options.add(new OptionItem(R.string.settings_button_text, R.drawable.ic_setting,
+                LAUNCHER_SETTINGS_BUTTON_TAP_OR_LONGPRESS,
+                OptionsPopupView::startSettings));
+        if (!WidgetsModel.GO_DISABLE_WIDGETS) {
+            options.add(new OptionItem(R.string.widget_button_text, R.drawable.ic_widget,
+                    LAUNCHER_WIDGETSTRAY_BUTTON_TAP_OR_LONGPRESS,
+                    OptionsPopupView::onWidgetsClicked));
+        }
         int resString = Utilities.existsStyleWallpapers(launcher) ?
                 R.string.styles_wallpaper_button_text : R.string.wallpaper_button_text;
         int resDrawable = Utilities.existsStyleWallpapers(launcher) ?
@@ -163,15 +171,6 @@ public class OptionsPopupView extends ArrowPopup
         options.add(new OptionItem(resString, resDrawable,
                 IGNORE,
                 OptionsPopupView::startWallpaperPicker));
-        if (!WidgetsModel.GO_DISABLE_WIDGETS) {
-            options.add(new OptionItem(R.string.widget_button_text, R.drawable.ic_widget,
-                    LAUNCHER_WIDGETSTRAY_BUTTON_TAP_OR_LONGPRESS,
-                    OptionsPopupView::onWidgetsClicked));
-        }
-        options.add(new OptionItem(R.string.settings_button_text, R.drawable.ic_setting,
-                LAUNCHER_SETTINGS_BUTTON_TAP_OR_LONGPRESS,
-                OptionsPopupView::startSettings));
-
         return options;
     }
 
-- 
GitLab


From 15883891ea145784d8ba02e7d3c367f34969b43d Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 12 Feb 2021 11:24:40 -0800
Subject: [PATCH 0539/1664] Subtract taskbar size from
 DeviceProfile#availableHeight

Normally availableHeight excludes system insets, but taskbar is added
after availableHeight is calculated. This discrepency causes some bad
calculations such as TaskView size.

Test: touch nav bar when in an app with taskbar present, ensure the
task doesn't jump due to incorrect calculation

Fixes: 179478728
Bug: 171917176
Change-Id: I16d39d3e1d9708e2a64c81b1ac24466f9567d1b9
---
 .../launcher3/BaseQuickstepLauncher.java      |  2 +-
 .../launcher3/taskbar/TaskbarController.java  |  3 +-
 res/values/dimens.xml                         |  3 ++
 src/com/android/launcher3/DeviceProfile.java  | 28 +++++++++++++++++--
 .../launcher3/util/DisplayController.java     |  4 +++
 5 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index d1fa2fd3ef..5b301433c3 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -222,7 +222,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
             mTaskbarController.cleanup();
             mTaskbarController = null;
         }
-        if (FeatureFlags.ENABLE_TASKBAR.get() && mDeviceProfile.isTablet) {
+        if (mDeviceProfile.isTaskbarPresent) {
             TaskbarActivityContext taskbarActivityContext = new TaskbarActivityContext(this);
             mTaskbarController = new TaskbarController(this,
                     taskbarActivityContext.getTaskbarContainerView());
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index ab05fbf036..d01de657d8 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -89,8 +89,7 @@ public class TaskbarController {
         mTaskbarView = mTaskbarContainerView.findViewById(R.id.taskbar_view);
         mTaskbarView.construct(createTaskbarViewCallbacks());
         mWindowManager = mLauncher.getWindowManager();
-        mTaskbarSize = new Point(MATCH_PARENT,
-                mLauncher.getResources().getDimensionPixelSize(R.dimen.taskbar_size));
+        mTaskbarSize = new Point(MATCH_PARENT, mLauncher.getDeviceProfile().taskbarSize);
         mTaskbarStateHandler = mLauncher.getTaskbarStateHandler();
         mTaskbarVisibilityController = new TaskbarVisibilityController(mLauncher,
                 createTaskbarVisibilityControllerCallbacks());
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 1ce7840ae5..beb4b7c7b0 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -259,4 +259,7 @@
     <dimen name="search_settings_icon_vertical_offset">16dp</dimen>
     <dimen name="search_line_spacing">4dp</dimen>
 
+<!-- Taskbar related (placeholders to compile in Launcher3 without Quickstep) -->
+    <dimen name="taskbar_size">0dp</dimen>
+
 </resources>
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 83a7d77601..f2b4638018 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -25,9 +25,12 @@ import android.graphics.Point;
 import android.graphics.PointF;
 import android.graphics.Rect;
 import android.view.Surface;
+import android.view.WindowInsets;
+import android.view.WindowManager;
 
 import com.android.launcher3.CellLayout.ContainerType;
 import com.android.launcher3.DevicePaddings.DevicePadding;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.graphics.IconShape;
 import com.android.launcher3.icons.DotRenderer;
 import com.android.launcher3.icons.IconNormalizer;
@@ -149,6 +152,10 @@ public class DeviceProfile {
     public DotRenderer mDotRendererWorkSpace;
     public DotRenderer mDotRendererAllApps;
 
+     // Taskbar
+    public boolean isTaskbarPresent;
+    public int taskbarSize;
+
     DeviceProfile(Context context, InvariantDeviceProfile inv, Info info,
             Point minSize, Point maxSize, int width, int height, boolean isLandscape,
             boolean isMultiWindowMode, boolean transposeLayoutWithOrientation,
@@ -163,12 +170,13 @@ public class DeviceProfile {
         // Determine sizes.
         widthPx = width;
         heightPx = height;
+        int nonFinalAvailableHeightPx;
         if (isLandscape) {
             availableWidthPx = maxSize.x;
-            availableHeightPx = minSize.y;
+            nonFinalAvailableHeightPx = minSize.y;
         } else {
             availableWidthPx = minSize.x;
-            availableHeightPx = maxSize.y;
+            nonFinalAvailableHeightPx = maxSize.y;
         }
 
         mInfo = info;
@@ -192,6 +200,22 @@ public class DeviceProfile {
                 : Configuration.ORIENTATION_PORTRAIT);
         final Resources res = context.getResources();
 
+        isTaskbarPresent = isTablet && FeatureFlags.ENABLE_TASKBAR.get();
+        if (isTaskbarPresent) {
+            // Taskbar will be added later, but provides bottom insets that we should subtract
+            // from availableHeightPx.
+            taskbarSize = res.getDimensionPixelSize(R.dimen.taskbar_size);
+            WindowInsets windowInsets = DisplayController.INSTANCE.get(context).getHolder(mInfo.id)
+                    .getDisplayContext().getSystemService(WindowManager.class)
+                    .getCurrentWindowMetrics().getWindowInsets();
+            int nonOverlappingTaskbarInset =
+                    taskbarSize - windowInsets.getSystemWindowInsetBottom();
+            if (nonOverlappingTaskbarInset > 0) {
+                nonFinalAvailableHeightPx -= nonOverlappingTaskbarInset;
+            }
+        }
+        availableHeightPx = nonFinalAvailableHeightPx;
+
         edgeMarginPx = res.getDimensionPixelSize(R.dimen.dynamic_grid_edge_margin);
         desiredWorkspaceLeftRightMarginPx = isVerticalBarLayout() ? 0 : edgeMarginPx;
 
diff --git a/src/com/android/launcher3/util/DisplayController.java b/src/com/android/launcher3/util/DisplayController.java
index 3b7bcc285a..e787342346 100644
--- a/src/com/android/launcher3/util/DisplayController.java
+++ b/src/com/android/launcher3/util/DisplayController.java
@@ -193,6 +193,10 @@ public class DisplayController implements DisplayListener {
                     : new Info(context, display);
         }
 
+        public Context getDisplayContext() {
+            return mDisplayContext;
+        }
+
         protected void handleOnChange() {
             Info oldInfo = mInfo;
             Info newInfo = createInfoForContext(mDisplayContext);
-- 
GitLab


From 4c45d5f1eb7afe1be6d1529fc6f45ee37839f887 Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Thu, 18 Feb 2021 11:21:21 -0800
Subject: [PATCH 0540/1664] Replace Optional.ifPresent with simple if clause.

Bug: 178562918
Test: Manual
Change-Id: Icb8f07f276555aaf43ee29bf33f995c3bb446f69
---
 src/com/android/launcher3/logging/StatsLogManager.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index 1266bb48aa..0802f8a574 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -31,8 +31,6 @@ import com.android.launcher3.logger.LauncherAtom.ToState;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.util.ResourceBasedOverride;
 
-import java.util.Optional;
-
 /**
  * Handles the user event logging in R+.
  *
@@ -486,7 +484,9 @@ public class StatsLogManager implements ResourceBasedOverride {
      */
     public StatsLogger logger() {
         StatsLogger logger = createLogger();
-        Optional.ofNullable(mInstanceId).ifPresent(logger::withInstanceId);
+        if (mInstanceId != null) {
+            return logger.withInstanceId(mInstanceId);
+        }
         return logger;
     }
 
-- 
GitLab


From 786dd93f2ba9b50a2b6b88670f96a7491983fb2a Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 17 Feb 2021 15:20:31 -0800
Subject: [PATCH 0541/1664] Fix a couple of crashes when taskbar isn't yet
 attached

- Handle back to back addTaskbarIfNecessary(). Specifically, handle
  cleanup() before the previous add was attached. This is already
  handled on WM side, just had to remove isAttachedToWindow() check.
- Add isAttachedToWindow() check to isViewInTaskbar()

Test: call addTaskbarIfNecessary() three times back to back, ensure no crash.

Fixes: 180509238
Bug: 171917176
Change-Id: Id68b6c376029eb5c651f47afa56666391c516aef
---
 .../com/android/launcher3/taskbar/TaskbarController.java | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index d01de657d8..5dddaf3ed0 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -232,14 +232,10 @@ public class TaskbarController {
     }
 
     private void removeFromWindowManager() {
-        if (mTaskbarContainerView.isAttachedToWindow()) {
-            mWindowManager.removeViewImmediate(mTaskbarContainerView);
-        }
+        mWindowManager.removeViewImmediate(mTaskbarContainerView);
     }
 
     private void addToWindowManager() {
-        removeFromWindowManager();
-
         final int gravity = Gravity.BOTTOM;
 
         mWindowLayoutParams = new WindowManager.LayoutParams(
@@ -377,7 +373,8 @@ public class TaskbarController {
      * @return Whether the given View is in the same window as Taskbar.
      */
     public boolean isViewInTaskbar(View v) {
-        return mTaskbarContainerView.getWindowId().equals(v.getWindowId());
+        return mTaskbarContainerView.isAttachedToWindow()
+                && mTaskbarContainerView.getWindowId().equals(v.getWindowId());
     }
 
     /**
-- 
GitLab


From 1739c5c68e7c821037e4a5aa2a68be7fe6c222bc Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Mon, 22 Feb 2021 00:22:07 -0800
Subject: [PATCH 0542/1664] When in search mode, do not refresh rescycler view,
 on package update

Bug: 180570580
Test: manual

TL;DR;; when new app install happens in search mode, no reset
when new app install happens in a-z mode, recycler view refreshes

Change-Id: I8a6bf327ecd3dbef4837eca560f10016731b78e0
---
 .../launcher3/allapps/AllAppsSectionDecorator.java        | 2 +-
 .../android/launcher3/allapps/AlphabeticalAppsList.java   | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
index 176dce6c84..9328a3d6e9 100644
--- a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
+++ b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
@@ -129,7 +129,7 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
             mIsFullWidth = isFullWidth;
             int endScrim = Themes.getColorBackground(context);
             mFillcolor = ColorUtils.setAlphaComponent(endScrim, fillAlpha);
-            mFocusColor = ColorUtils.setAlphaComponent(endScrim, fillAlpha);
+            mFocusColor = endScrim;
 
             mIsTopRound = isTopRound;
             mIsBottomRound = isBottomRound;
diff --git a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
index 123ace7938..fefd97ad3f 100644
--- a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
+++ b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
@@ -185,7 +185,7 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
         if (results == null || mSearchResults != results) {
             boolean same = mSearchResults != null && mSearchResults.equals(results);
             mSearchResults = results;
-            onAppsUpdated();
+            updateAdapterItems();
             return !same;
         }
         return false;
@@ -257,11 +257,13 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
         }
 
         // Recompose the set of adapter items from the current set of apps
-        updateAdapterItems();
+        if (mSearchResults == null) {
+            updateAdapterItems();
+        }
     }
 
     /**
-     * Updates the set of filtered apps with the current filter.  At this point, we expect
+     * Updates the set of filtered apps with the current filter. At this point, we expect
      * mCachedSectionNames to have been calculated for the set of all apps in mApps.
      */
     private void updateAdapterItems() {
-- 
GitLab


From 9ffaee3110a324a18af21ff1bb6f5f10e3231288 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Mon, 22 Feb 2021 09:09:17 -0600
Subject: [PATCH 0543/1664] Break up nasa search results

+ replace IME feature flag launcher setting

Test: Manual
Bug: 178638266
Change-Id: Id013cd247cfa2b33cdf62ee3239ad1bacc35b5da
---
 .../allapps/AllAppsTransitionController.java  | 26 +++++++++++++------
 .../launcher3/config/FeatureFlags.java        |  3 ---
 .../AbstractStateChangeTouchController.java   |  1 -
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index a4e1f271fb..dc58c99c99 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -33,6 +33,7 @@ import static com.android.launcher3.util.SystemUiController.UI_STATE_ALLAPPS;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
+import android.content.SharedPreferences;
 import android.util.FloatProperty;
 import android.view.View;
 import android.view.animation.Interpolator;
@@ -63,7 +64,7 @@ import com.android.launcher3.views.ScrimView;
  * closer to top or closer to the page indicator.
  */
 public class AllAppsTransitionController implements StateHandler<LauncherState>,
-        OnDeviceProfileChangeListener {
+        OnDeviceProfileChangeListener, SharedPreferences.OnSharedPreferenceChangeListener {
 
     public static final FloatProperty<AllAppsTransitionController> ALL_APPS_PROGRESS =
             new FloatProperty<AllAppsTransitionController>("allAppsProgress") {
@@ -80,6 +81,7 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
             };
 
     private static final int APPS_VIEW_ALPHA_CHANNEL_INDEX = 0;
+    private static final String PREF_KEY_SHOW_SEARCH_IME = "pref_search_show_ime";
 
     private AllAppsContainerView mAppsView;
     private ScrimView mScrimView;
@@ -98,6 +100,7 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
 
     private float mScrollRangeDelta = 0;
     private AllAppsInsetTransitionController mInsetController;
+    private boolean mSearchImeEnabled;
 
     public AllAppsTransitionController(Launcher l) {
         mLauncher = l;
@@ -106,6 +109,9 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
 
         mIsVerticalLayout = mLauncher.getDeviceProfile().isVerticalBarLayout();
         mLauncher.addOnDeviceProfileChangeListener(this);
+
+        onSharedPreferenceChanged(mLauncher.getSharedPrefs(), PREF_KEY_SHOW_SEARCH_IME);
+        mLauncher.getSharedPrefs().registerOnSharedPreferenceChangeListener(this);
     }
 
     public float getShiftRange() {
@@ -142,8 +148,7 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
         float shiftCurrent = progress * mShiftRange;
 
         mAppsView.setTranslationY(shiftCurrent);
-        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()
-                && !FeatureFlags.DISABLE_INITIAL_IME_IN_ALLAPPS.get()) {
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && mSearchImeEnabled) {
             mInsetController.setProgress(progress);
         }
     }
@@ -234,9 +239,7 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
     public void setupViews(AllAppsContainerView appsView, ScrimView scrimView) {
         mAppsView = appsView;
         mScrimView = scrimView;
-        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()
-                && !FeatureFlags.DISABLE_INITIAL_IME_IN_ALLAPPS.get()
-                && BuildCompat.isAtLeastR()) {
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && BuildCompat.isAtLeastR()) {
             mInsetController = new AllAppsInsetTransitionController(mShiftRange, mAppsView);
             mLauncher.getSystemUiController().updateUiState(UI_STATE_ALLAPPS,
                     View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
@@ -264,8 +267,8 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
         if (Float.compare(mProgress, 1f) == 0) {
             mAppsView.reset(false /* animate */);
         }
-        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()
-                && !FeatureFlags.DISABLE_INITIAL_IME_IN_ALLAPPS.get() && BuildCompat.isAtLeastR()) {
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && mSearchImeEnabled
+                && BuildCompat.isAtLeastR()) {
             mInsetController.onAnimationEnd(mProgress);
             if (Float.compare(mProgress, 0f) == 0) {
                 EditText editText = mAppsView.getSearchUiManager().getEditText();
@@ -276,4 +279,11 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
             // TODO: should make the controller hide synchronously
         }
     }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String s) {
+        if (s.equals(PREF_KEY_SHOW_SEARCH_IME)) {
+            mSearchImeEnabled = sharedPreferences.getBoolean(s, true);
+        }
+    }
 }
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 556aff61c3..ef7bdf41ca 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -95,9 +95,6 @@ public final class FeatureFlags {
     public static final BooleanFlag ENABLE_DEVICE_SEARCH = new DeviceFlag(
             "ENABLE_DEVICE_SEARCH", false, "Allows on device search in all apps");
 
-    public static final BooleanFlag DISABLE_INITIAL_IME_IN_ALLAPPS = getDebugFlag(
-            "DISABLE_INITIAL_IME_IN_ALLAPPS", false, "Disable default IME state in all apps");
-
     public static final BooleanFlag FOLDER_NAME_SUGGEST = new DeviceFlag(
             "FOLDER_NAME_SUGGEST", true,
             "Suggests folder names instead of blank text.");
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index 25ecea5f9f..64a3b5e239 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -262,7 +262,6 @@ public abstract class AbstractStateChangeTouchController
         mFlingBlockCheck.unblockFling();
         // Must be called after all the animation controllers have been paused
         if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()
-                && !FeatureFlags.DISABLE_INITIAL_IME_IN_ALLAPPS.get()
                 && BuildCompat.isAtLeastR()
                 && (mToState == ALL_APPS || mToState == NORMAL)) {
             mLauncher.getAllAppsController().getInsetController().onDragStart(
-- 
GitLab


From 391404fcb71a7a23003f68117f8e4450d506cbb4 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 17 Feb 2021 15:58:23 +0000
Subject: [PATCH 0544/1664] Add personal / work tabs for work profile widgets

Video: https://drive.google.com/file/d/1TORRNcvVM7fIvNd_WZaajLbI7D9z4VFA/view?usp=sharing


Test: Main profile only: run AddConfigWidgetTest.
      With work profile: manually launch the full widgets sheet.
      Go to the personal tab: only personal widgets are shown.
      Go to the work tab: only work widgets are shown
      Successfully add personal / work widgets from the full widgets
      sheet.

Bug: 179797520

Change-Id: Iad8b90c2af35e0580319d7a05510ec88e4f8b86c
---
 res/layout/widgets_full_sheet.xml             |   6 -
 res/layout/widgets_full_sheet_paged_view.xml  |  44 +++++
 .../widgets_full_sheet_recyclerview.xml       |  21 +++
 src/com/android/launcher3/PagedView.java      |  12 ++
 .../launcher3/model/data/PackageItemInfo.java |   2 +-
 .../widget/picker/WidgetsFullSheet.java       | 151 ++++++++++++++----
 .../widget/picker/WidgetsListAdapter.java     |  14 +-
 .../android/launcher3/model/WidgetsModel.java |  43 ++---
 .../tapl/LauncherInstrumentation.java         |   2 +-
 9 files changed, 221 insertions(+), 74 deletions(-)
 create mode 100644 res/layout/widgets_full_sheet_paged_view.xml
 create mode 100644 res/layout/widgets_full_sheet_recyclerview.xml

diff --git a/res/layout/widgets_full_sheet.xml b/res/layout/widgets_full_sheet.xml
index 6e7cf0fee9..28a8c6fefc 100644
--- a/res/layout/widgets_full_sheet.xml
+++ b/res/layout/widgets_full_sheet.xml
@@ -27,12 +27,6 @@
         android:background="?android:attr/colorPrimary"
         android:elevation="4dp">
 
-        <com.android.launcher3.widget.picker.WidgetsRecyclerView
-            android:id="@+id/widgets_list_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:clipToPadding="false" />
-
         <!-- Fast scroller popup -->
         <TextView
             android:id="@+id/fast_scroller_popup"
diff --git a/res/layout/widgets_full_sheet_paged_view.xml b/res/layout/widgets_full_sheet_paged_view.xml
new file mode 100644
index 0000000000..cfbb6dd026
--- /dev/null
+++ b/res/layout/widgets_full_sheet_paged_view.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto">
+
+    <include layout="@layout/personal_work_tabs" />
+
+    <com.android.launcher3.workprofile.PersonalWorkPagedView
+        android:id="@+id/widgets_view_pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@+id/tabs"
+        android:clipToPadding="false"
+        android:descendantFocusability="afterDescendants"
+        launcher:pageIndicator="@+id/tabs">
+
+        <com.android.launcher3.widget.picker.WidgetsRecyclerView
+            android:id="@+id/primary_widgets_list_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:clipToPadding="false" />
+
+        <com.android.launcher3.widget.picker.WidgetsRecyclerView
+            android:id="@+id/work_widgets_list_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:clipToPadding="false" />
+
+    </com.android.launcher3.workprofile.PersonalWorkPagedView>
+
+</merge>
\ No newline at end of file
diff --git a/res/layout/widgets_full_sheet_recyclerview.xml b/res/layout/widgets_full_sheet_recyclerview.xml
new file mode 100644
index 0000000000..fbe559c663
--- /dev/null
+++ b/res/layout/widgets_full_sheet_recyclerview.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.launcher3.widget.picker.WidgetsRecyclerView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/primary_widgets_list_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clipToPadding="false" />
\ No newline at end of file
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index ada297f340..af2d94a278 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -96,6 +96,8 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
     private static final int MIN_FLING_VELOCITY = 250;
 
     private boolean mFreeScroll = false;
+    /** If {@code false}, disable swipe gesture to switch between pages. */
+    private boolean mSwipeGestureEnabled = true;
 
     protected final int mFlingThresholdVelocity;
     protected final int mEasyFlingThresholdVelocity;
@@ -857,6 +859,14 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         }
     }
 
+    /**
+     * If {@code enableSwipeGesture} is {@code true}, enables swipe gesture to navigate between
+     * pages. Otherwise, disables the navigation gesture.
+     */
+    public void setSwipeGestureEnabled(boolean swipeGestureEnabled) {
+        mSwipeGestureEnabled = swipeGestureEnabled;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -879,6 +889,8 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
          * scrolling there.
          */
 
+        if (!mSwipeGestureEnabled) return false;
+
         // Skip touch handling if there are no pages to swipe
         if (getChildCount() <= 0) return false;
 
diff --git a/src/com/android/launcher3/model/data/PackageItemInfo.java b/src/com/android/launcher3/model/data/PackageItemInfo.java
index b70d0d4fe6..7617d7efd9 100644
--- a/src/com/android/launcher3/model/data/PackageItemInfo.java
+++ b/src/com/android/launcher3/model/data/PackageItemInfo.java
@@ -60,6 +60,6 @@ public class PackageItemInfo extends ItemInfoWithIcon {
 
     @Override
     public int hashCode() {
-        return Objects.hash(packageName);
+        return Objects.hash(packageName, user);
     }
 }
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 03623d5183..81cd73aa08 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -22,16 +22,22 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.PropertyValuesHolder;
 import android.content.Context;
+import android.content.pm.LauncherApps;
 import android.graphics.Rect;
+import android.os.Process;
+import android.os.UserHandle;
 import android.util.AttributeSet;
 import android.util.Pair;
+import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
 
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.launcher3.Insettable;
 import com.android.launcher3.Launcher;
@@ -43,30 +49,39 @@ import com.android.launcher3.compat.AccessibilityManagerCompat;
 import com.android.launcher3.views.RecyclerViewFastScroller;
 import com.android.launcher3.views.TopRoundedCornerView;
 import com.android.launcher3.widget.BaseWidgetSheet;
+import com.android.launcher3.widget.model.WidgetsListBaseEntry;
+import com.android.launcher3.workprofile.PersonalWorkPagedView;
+import com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip.OnActivePageChangedListener;
+
+import java.util.List;
+import java.util.function.Predicate;
 
 /**
  * Popup for showing the full list of available widgets
  */
 public class WidgetsFullSheet extends BaseWidgetSheet
-        implements Insettable, ProviderChangedListener {
+        implements Insettable, ProviderChangedListener, OnActivePageChangedListener {
 
     private static final long DEFAULT_OPEN_DURATION = 267;
     private static final long FADE_IN_DURATION = 150;
     private static final float VERTICAL_START_POSITION = 0.3f;
 
     private final Rect mInsets = new Rect();
+    private final boolean mHasWorkProfile;
+    private final SparseArray<AdapterHolder> mAdapters = new SparseArray();
+    private final UserHandle mCurrentUser = Process.myUserHandle();
+    private final Predicate<WidgetsListBaseEntry> mPrimaryWidgetsFilter = entry ->
+            mCurrentUser.equals(entry.mPkgItem.user);
+    private final Predicate<WidgetsListBaseEntry> mWorkWidgetsFilter =
+            mPrimaryWidgetsFilter.negate();
 
-    private final WidgetsListAdapter mAdapter;
-
-    private WidgetsRecyclerView mRecyclerView;
+    @Nullable private PersonalWorkPagedView mViewPager;
 
     public WidgetsFullSheet(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        LauncherAppState apps = LauncherAppState.getInstance(context);
-        mAdapter = new WidgetsListAdapter(context,
-                LayoutInflater.from(context), apps.getWidgetCache(), apps.getIconCache(),
-                this, this);
-
+        mHasWorkProfile = context.getSystemService(LauncherApps.class).getProfiles().size() > 1;
+        mAdapters.put(AdapterHolder.PRIMARY, new AdapterHolder(AdapterHolder.PRIMARY));
+        mAdapters.put(AdapterHolder.WORK, new AdapterHolder(AdapterHolder.WORK));
     }
 
     public WidgetsFullSheet(Context context, AttributeSet attrs) {
@@ -77,25 +92,51 @@ public class WidgetsFullSheet extends BaseWidgetSheet
     protected void onFinishInflate() {
         super.onFinishInflate();
         mContent = findViewById(R.id.container);
+        TopRoundedCornerView springLayout = (TopRoundedCornerView) mContent;
 
-        mRecyclerView = findViewById(R.id.widgets_list_view);
-        mRecyclerView.setAdapter(mAdapter);
-        mAdapter.setApplyBitmapDeferred(true, mRecyclerView);
+        LayoutInflater layoutInflater = LayoutInflater.from(getContext());
+        int contentLayoutRes = mHasWorkProfile ? R.layout.widgets_full_sheet_paged_view
+                : R.layout.widgets_full_sheet_recyclerview;
+        layoutInflater.inflate(contentLayoutRes,  springLayout, true);
+
+        if (mHasWorkProfile) {
+            mViewPager = findViewById(R.id.widgets_view_pager);
+            // Temporarily disable swipe gesture until widgets list horizontal scrollviews per
+            // app are replaced by gird views.
+            mViewPager.setSwipeGestureEnabled(false);
+            mViewPager.initParentViews(this);
+            mViewPager.getPageIndicator().setOnActivePageChangedListener(this);
+            mViewPager.getPageIndicator().setActiveMarker(AdapterHolder.PRIMARY);
+            findViewById(R.id.tab_personal)
+                    .setOnClickListener((View view) -> mViewPager.snapToPage(0));
+            findViewById(R.id.tab_work)
+                    .setOnClickListener((View view) -> mViewPager.snapToPage(1));
+            springLayout.addSpringView(R.id.primary_widgets_list_view);
+            springLayout.addSpringView(R.id.work_widgets_list_view);
+        } else {
+            mViewPager = null;
+            springLayout.addSpringView(R.id.primary_widgets_list_view);
+        }
 
-        TopRoundedCornerView springLayout = (TopRoundedCornerView) mContent;
-        springLayout.addSpringView(R.id.widgets_list_view);
-        mRecyclerView.setEdgeEffectFactory(springLayout.createEdgeEffectFactory());
         onWidgetsBound();
     }
 
+    @Override
+    public void onActivePageChanged(int currentActivePage) {
+        mAdapters.get(currentActivePage).mWidgetsRecyclerView.bindFastScrollbar();
+    }
+
     @VisibleForTesting
     public WidgetsRecyclerView getRecyclerView() {
-        return mRecyclerView;
+        if (!mHasWorkProfile || mViewPager.getCurrentPage() == AdapterHolder.PRIMARY) {
+            return mAdapters.get(AdapterHolder.PRIMARY).mWidgetsRecyclerView;
+        }
+        return mAdapters.get(AdapterHolder.WORK).mWidgetsRecyclerView;
     }
 
     @Override
     protected Pair<View, String> getAccessibilityTarget() {
-        return Pair.create(mRecyclerView, getContext().getString(
+        return Pair.create(getRecyclerView(), getContext().getString(
                 mIsOpen ? R.string.widgets_list : R.string.widgets_list_closed));
     }
 
@@ -116,9 +157,10 @@ public class WidgetsFullSheet extends BaseWidgetSheet
     public void setInsets(Rect insets) {
         mInsets.set(insets);
 
-        mRecyclerView.setPadding(
-                mRecyclerView.getPaddingLeft(), mRecyclerView.getPaddingTop(),
-                mRecyclerView.getPaddingRight(), insets.bottom);
+        setBottomPadding(mAdapters.get(AdapterHolder.PRIMARY).mWidgetsRecyclerView, insets.bottom);
+        if (mHasWorkProfile) {
+            setBottomPadding(mAdapters.get(AdapterHolder.WORK).mWidgetsRecyclerView, insets.bottom);
+        }
         if (insets.bottom > 0) {
             setupNavBarColor();
         } else {
@@ -129,6 +171,14 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         requestLayout();
     }
 
+    private void setBottomPadding(RecyclerView recyclerView, int bottomPadding) {
+        recyclerView.setPadding(
+                recyclerView.getPaddingLeft(),
+                recyclerView.getPaddingTop(),
+                recyclerView.getPaddingRight(),
+                bottomPadding);
+    }
+
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         int widthUsed;
@@ -168,7 +218,17 @@ public class WidgetsFullSheet extends BaseWidgetSheet
 
     @Override
     public void onWidgetsBound() {
-        mAdapter.setWidgets(mLauncher.getPopupDataProvider().getAllWidgets());
+        List<WidgetsListBaseEntry> allWidgets = mLauncher.getPopupDataProvider().getAllWidgets();
+
+        AdapterHolder primaryUserAdapterHolder = mAdapters.get(AdapterHolder.PRIMARY);
+        primaryUserAdapterHolder.setup(findViewById(R.id.primary_widgets_list_view));
+        primaryUserAdapterHolder.mWidgetsListAdapter.setWidgets(allWidgets);
+        if (mHasWorkProfile) {
+            AdapterHolder workUserAdapterHolder = mAdapters.get(AdapterHolder.WORK);
+            workUserAdapterHolder.setup(findViewById(R.id.work_widgets_list_view));
+            workUserAdapterHolder.mWidgetsListAdapter.setWidgets(allWidgets);
+            onActivePageChanged(mViewPager.getCurrentPage());
+        }
     }
 
     private void open(boolean animate) {
@@ -183,12 +243,9 @@ public class WidgetsFullSheet extends BaseWidgetSheet
                     .setDuration(DEFAULT_OPEN_DURATION)
                     .setInterpolator(AnimationUtils.loadInterpolator(
                             getContext(), android.R.interpolator.linear_out_slow_in));
-            mRecyclerView.setLayoutFrozen(true);
             mOpenCloseAnimator.addListener(new AnimatorListenerAdapter() {
                 @Override
                 public void onAnimationEnd(Animator animation) {
-                    mRecyclerView.setLayoutFrozen(false);
-                    mAdapter.setApplyBitmapDeferred(false, mRecyclerView);
                     mOpenCloseAnimator.removeListener(this);
                 }
             });
@@ -198,7 +255,6 @@ public class WidgetsFullSheet extends BaseWidgetSheet
             });
         } else {
             setTranslationShift(TRANSLATION_SHIFT_OPENED);
-            mAdapter.setApplyBitmapDeferred(false, mRecyclerView);
             post(this::announceAccessibilityChanges);
         }
     }
@@ -218,12 +274,12 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         // Disable swipe down when recycler view is scrolling
         if (ev.getAction() == MotionEvent.ACTION_DOWN) {
             mNoIntercept = false;
-            RecyclerViewFastScroller scroller = mRecyclerView.getScrollbar();
+            RecyclerViewFastScroller scroller = getRecyclerView().getScrollbar();
             if (scroller.getThumbOffsetY() >= 0
                     && getPopupContainer().isEventOverView(scroller, ev)) {
                 mNoIntercept = true;
             } else if (getPopupContainer().isEventOverView(mContent, ev)) {
-                mNoIntercept = !mRecyclerView.shouldContainerScroll(ev, getPopupContainer());
+                mNoIntercept = !getRecyclerView().shouldContainerScroll(ev, getPopupContainer());
             }
         }
         return super.onControllerInterceptTouchEvent(ev);
@@ -242,14 +298,14 @@ public class WidgetsFullSheet extends BaseWidgetSheet
     /** Gets the {@link WidgetsRecyclerView} which shows all widgets in {@link WidgetsFullSheet}. */
     @VisibleForTesting
     public static WidgetsRecyclerView getWidgetsView(Launcher launcher) {
-        return launcher.findViewById(R.id.widgets_list_view);
+        return launcher.findViewById(R.id.primary_widgets_list_view);
     }
 
     @Override
     public void addHintCloseAnim(
             float distanceToMove, Interpolator interpolator, PendingAnimation target) {
-        target.setFloat(mRecyclerView, VIEW_TRANSLATE_Y, -distanceToMove, interpolator);
-        target.setViewAlpha(mRecyclerView, 0.5f, interpolator);
+        target.setFloat(getRecyclerView(), VIEW_TRANSLATE_Y, -distanceToMove, interpolator);
+        target.setViewAlpha(getRecyclerView(), 0.5f, interpolator);
     }
 
     @Override
@@ -257,4 +313,39 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         super.onCloseComplete();
         AccessibilityManagerCompat.sendStateEventToTest(getContext(), NORMAL_STATE_ORDINAL);
     }
+
+    /** A holder class for holding adapters & their corresponding recycler view. */
+    private final class AdapterHolder {
+        static final int PRIMARY = 0;
+        static final int WORK = 1;
+
+        private final int mAdapterType;
+        private final WidgetsListAdapter mWidgetsListAdapter;
+
+        private WidgetsRecyclerView mWidgetsRecyclerView;
+
+        AdapterHolder(int adapterType) {
+            mAdapterType = adapterType;
+
+            Context context = getContext();
+            LauncherAppState apps = LauncherAppState.getInstance(context);
+            mWidgetsListAdapter = new WidgetsListAdapter(
+                    context,
+                    LayoutInflater.from(context),
+                    apps.getWidgetCache(),
+                    apps.getIconCache(),
+                    /* iconClickListener= */ WidgetsFullSheet.this,
+                    /* iconLongClickListener= */ WidgetsFullSheet.this);
+            mWidgetsListAdapter.setFilter(
+                    mAdapterType == PRIMARY ? mPrimaryWidgetsFilter : mWorkWidgetsFilter);
+        }
+
+        void setup(WidgetsRecyclerView recyclerView) {
+            mWidgetsRecyclerView = recyclerView;
+            mWidgetsRecyclerView.setAdapter(mWidgetsListAdapter);
+            mWidgetsRecyclerView.setEdgeEffectFactory(
+                    ((TopRoundedCornerView) mContent).createEdgeEffectFactory());
+            mWidgetsListAdapter.setApplyBitmapDeferred(false, mWidgetsRecyclerView);
+        }
+    }
 }
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
index 5ec7f3b063..72b4a02634 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
@@ -43,6 +43,7 @@ import com.android.launcher3.widget.picker.WidgetsListHeaderViewHolderBinder.OnH
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 /**
@@ -74,6 +75,11 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
     private ArrayList<WidgetsListBaseEntry> mVisibleEntries = new ArrayList<>();
     @Nullable private String mWidgetsContentVisiblePackage = null;
 
+    private Predicate<WidgetsListBaseEntry> mHeaderAndSelectedContentFilter = entry ->
+            entry instanceof WidgetsListHeaderEntry
+                    || entry.mPkgItem.packageName.equals(mWidgetsContentVisiblePackage);
+    @Nullable private Predicate<WidgetsListBaseEntry> mFilter = null;
+
     public WidgetsListAdapter(Context context, LayoutInflater layoutInflater,
             WidgetPreviewLoader widgetPreviewLoader, IconCache iconCache,
             OnClickListener iconClickListener, OnLongClickListener iconLongClickListener) {
@@ -85,6 +91,10 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
                 new WidgetsListHeaderViewHolderBinder(layoutInflater, this::onHeaderClicked));
     }
 
+    public void setFilter(Predicate<WidgetsListBaseEntry> filter) {
+        mFilter = filter;
+    }
+
     /**
      * Defers applying bitmap on all the {@link WidgetCell} in the {@param rv}.
      *
@@ -132,8 +142,8 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
             }
         });
         List<WidgetsListBaseEntry> newVisibleEntries = mAllEntries.stream()
-                .filter(entry -> entry instanceof WidgetsListHeaderEntry
-                        || entry.mPkgItem.packageName.equals(mWidgetsContentVisiblePackage))
+                .filter(entry -> (mFilter == null || mFilter.test(entry))
+                        && mHeaderAndSelectedContentFilter.test(entry))
                 .collect(Collectors.toList());
         mDiffReporter.process(mVisibleEntries, newVisibleEntries, mRowComparator);
     }
diff --git a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
index 30c9b5ffd8..a7e3472c85 100644
--- a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
+++ b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
@@ -9,7 +9,6 @@ import android.appwidget.AppWidgetProviderInfo;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.os.Process;
 import android.os.UserHandle;
 import android.util.Log;
 
@@ -115,7 +114,7 @@ public class WidgetsModel {
                 widgetsAndShortcuts.add(new WidgetItem(info, app.getIconCache(), pm));
                 updatedItems.add(info);
             }
-            setWidgetsAndShortcuts(widgetsAndShortcuts, app, packageUser);
+            setWidgetsAndShortcuts(widgetsAndShortcuts, app);
         } catch (Exception e) {
             if (!FeatureFlags.IS_STUDIO_BUILD && Utilities.isBinderSizeError(e)) {
                 // the returned value may be incomplete and will not be refreshed until the next
@@ -132,52 +131,28 @@ public class WidgetsModel {
     }
 
     private synchronized void setWidgetsAndShortcuts(ArrayList<WidgetItem> rawWidgetsShortcuts,
-            LauncherAppState app, @Nullable PackageUserKey packageUser) {
+            LauncherAppState app) {
         if (DEBUG) {
             Log.d(TAG, "addWidgetsAndShortcuts, widgetsShortcuts#=" + rawWidgetsShortcuts.size());
         }
 
         // Temporary list for {@link PackageItemInfos} to avoid having to go through
         // {@link mPackageItemInfos} to locate the key to be used for {@link #mWidgetsList}
-        HashMap<String, PackageItemInfo> tmpPackageItemInfos = new HashMap<>();
+        HashMap<PackageUserKey, PackageItemInfo> tmpPackageItemInfos = new HashMap<>();
 
         // clear the lists.
-        if (packageUser == null) {
-            mWidgetsList.clear();
-        } else {
-            PackageItemInfo packageItem = mWidgetsList.keySet()
-                    .stream()
-                    .filter(item -> item.packageName.equals(packageUser.mPackageName))
-                    .findFirst()
-                    .orElse(null);
-            if (packageItem != null) {
-                // We want to preserve the user that was on the packageItem previously,
-                // so add it to tmpPackageItemInfos here to avoid creating a new entry.
-                tmpPackageItemInfos.put(packageItem.packageName, packageItem);
-
-                // Add the widgets for other users in the rawList as it only contains widgets for
-                // packageUser
-                List<WidgetItem> otherUserItems = mWidgetsList.remove(packageItem);
-                otherUserItems.removeIf(w -> w.user.equals(packageUser.mUser));
-                rawWidgetsShortcuts.addAll(otherUserItems);
-            }
-        }
-
-        UserHandle myUser = Process.myUserHandle();
-
+        mWidgetsList.clear();
         // add and update.
         mWidgetsList.putAll(rawWidgetsShortcuts.stream()
                 .filter(new WidgetValidityCheck(app))
                 .collect(Collectors.groupingBy(item -> {
-                    String packageName = item.componentName.getPackageName();
-                    PackageItemInfo pInfo = tmpPackageItemInfos.get(packageName);
+                    PackageUserKey packageUserKey = new PackageUserKey(
+                            item.componentName.getPackageName(), item.user);
+                    PackageItemInfo pInfo = tmpPackageItemInfos.get(packageUserKey);
                     if (pInfo == null) {
-                        pInfo = new PackageItemInfo(packageName);
-                        pInfo.user = item.user;
-                        tmpPackageItemInfos.put(packageName,  pInfo);
-                    } else if (!myUser.equals(pInfo.user)) {
-                        // Keep updating the user, until we get the primary user.
+                        pInfo = new PackageItemInfo(packageUserKey.mPackageName);
                         pInfo.user = item.user;
+                        tmpPackageItemInfos.put(packageUserKey,  pInfo);
                     }
                     return pInfo;
                 })));
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 0c8f610928..6afadfa5f8 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -153,7 +153,7 @@ public final class LauncherInstrumentation {
     private static final String WORKSPACE_RES_ID = "workspace";
     private static final String APPS_RES_ID = "apps_view";
     private static final String OVERVIEW_RES_ID = "overview_panel";
-    private static final String WIDGETS_RES_ID = "widgets_list_view";
+    private static final String WIDGETS_RES_ID = "primary_widgets_list_view";
     private static final String CONTEXT_MENU_RES_ID = "deep_shortcuts_container";
     public static final int WAIT_TIME_MS = 10000;
     public static final int LONG_WAIT_TIME_MS = 60000;
-- 
GitLab


From 40fbc96a0acec1b851f7d9f36077f9639e2ffd62 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 22 Feb 2021 11:54:15 -0800
Subject: [PATCH 0545/1664] Increase taskbar size to match latest specs

Test: Ran it locally, verified it looked as expected
Bug: 171917176
Change-Id: I8a467db57b579f1ad29d2108927eef3bd10b273a
---
 quickstep/res/values/dimens.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index a0e87cfcbc..e46eb9e12b 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -122,13 +122,13 @@
     <dimen name="accessibility_gesture_min_swipe_distance">80dp</dimen>
 
     <!-- Taskbar -->
-    <dimen name="taskbar_size">48dp</dimen>
-    <dimen name="taskbar_icon_size">32dp</dimen>
+    <dimen name="taskbar_size">60dp</dimen>
+    <dimen name="taskbar_icon_size">44dp</dimen>
     <dimen name="taskbar_icon_touch_size">48dp</dimen>
     <dimen name="taskbar_icon_drag_icon_size">54dp</dimen>
     <!-- Note that this applies to both sides of all icons, so visible space is double this. -->
-    <dimen name="taskbar_icon_spacing">14dp</dimen>
+    <dimen name="taskbar_icon_spacing">8dp</dimen>
     <dimen name="taskbar_divider_thickness">1dp</dimen>
-    <dimen name="taskbar_divider_height">24dp</dimen>
+    <dimen name="taskbar_divider_height">32dp</dimen>
     <dimen name="taskbar_folder_margin">16dp</dimen>
 </resources>
-- 
GitLab


From f8f2a6ed0a96fbbdb6667d6694ca843aa4afce06 Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Fri, 19 Feb 2021 10:09:56 -0800
Subject: [PATCH 0546/1664] [AA+] Log tap on SearchActionItem.

Bug: 178562918
Test: Presubmit
Change-Id: I42a44de4f3cc02ca331c4f99c107891c4658995d
---
 protos/launcher_atom.proto                         |  7 +++++++
 .../quickstep/logging/StatsLogCompatManager.java   |  4 ++++
 .../launcher3/model/data/SearchActionItemInfo.java | 14 ++++++++++++++
 .../android/launcher3/touch/ItemClickHandler.java  |  2 ++
 4 files changed, 27 insertions(+)

diff --git a/protos/launcher_atom.proto b/protos/launcher_atom.proto
index b4c6138671..dc9f8dd3fa 100644
--- a/protos/launcher_atom.proto
+++ b/protos/launcher_atom.proto
@@ -29,6 +29,7 @@ message ItemInfo {
     Shortcut shortcut = 3;
     Widget widget = 4;
     FolderIcon folder_icon = 9;
+    SearchActionItem search_action_item = 11;
   }
   // When used for launch event, stores the global predictive rank
   optional int32 rank = 5;
@@ -169,6 +170,12 @@ message FolderIcon {
   optional string label_info = 4;
 }
 
+// Represents SearchAction with in launcher
+message SearchActionItem{
+  optional string package_name = 1;
+  optional string title = 2;
+}
+
 //////////////////////////////////////////////
 // Containers
 
diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
index f9283a4ece..4f211d7f2f 100644
--- a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
+++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
@@ -327,6 +327,8 @@ public class StatsLogCompatManager extends StatsLogManager {
                 return info.getWidget().getPackageName();
             case TASK:
                 return info.getTask().getPackageName();
+            case SEARCH_ACTION_ITEM:
+                return info.getSearchActionItem().getPackageName();
             default:
                 return null;
         }
@@ -342,6 +344,8 @@ public class StatsLogCompatManager extends StatsLogManager {
                 return info.getWidget().getComponentName();
             case TASK:
                 return info.getTask().getComponentName();
+            case SEARCH_ACTION_ITEM:
+                return info.getSearchActionItem().getTitle();
             default:
                 return null;
         }
diff --git a/src/com/android/launcher3/model/data/SearchActionItemInfo.java b/src/com/android/launcher3/model/data/SearchActionItemInfo.java
index 25355c9579..6a8ec84c63 100644
--- a/src/com/android/launcher3/model/data/SearchActionItemInfo.java
+++ b/src/com/android/launcher3/model/data/SearchActionItemInfo.java
@@ -25,6 +25,9 @@ import android.os.UserHandle;
 
 import androidx.annotation.Nullable;
 
+import com.android.launcher3.logger.LauncherAtom.ItemInfo;
+import com.android.launcher3.logger.LauncherAtom.SearchActionItem;
+
 /**
  * Represents a SearchAction with in launcher
  */
@@ -112,4 +115,15 @@ public class SearchActionItemInfo extends ItemInfoWithIcon {
     public ItemInfoWithIcon clone() {
         return new SearchActionItemInfo(this);
     }
+
+    @Override
+    public ItemInfo buildProto(FolderInfo fInfo) {
+        return getDefaultItemInfoBuilder()
+                .setSearchActionItem(
+                        SearchActionItem.newBuilder()
+                                .setTitle(title.toString())
+                                .setPackageName(mFallbackPackageName))
+                .setContainerInfo(getContainerInfo())
+                .build();
+    }
 }
diff --git a/src/com/android/launcher3/touch/ItemClickHandler.java b/src/com/android/launcher3/touch/ItemClickHandler.java
index 2647d6fec4..098d90d8db 100644
--- a/src/com/android/launcher3/touch/ItemClickHandler.java
+++ b/src/com/android/launcher3/touch/ItemClickHandler.java
@@ -17,6 +17,7 @@ package com.android.launcher3.touch;
 
 import static com.android.launcher3.Launcher.REQUEST_BIND_PENDING_APPWIDGET;
 import static com.android.launcher3.Launcher.REQUEST_RECONFIGURE_APPWIDGET;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_APP_LAUNCH_TAP;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_FOLDER_OPEN;
 import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_DISABLED_BY_PUBLISHER;
 import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_DISABLED_LOCKED_USER;
@@ -272,6 +273,7 @@ public class ItemClickHandler {
                         Toast.LENGTH_SHORT).show();
             }
         }
+        launcher.getStatsLogManager().logger().withItemInfo(itemInfo).log(LAUNCHER_APP_LAUNCH_TAP);
     }
 
     private static void startAppShortcutOrInfoActivity(View v, ItemInfo item, Launcher launcher) {
-- 
GitLab


From 3cdc6f86af1092c1ba5aed38fbb6153d377c4677 Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Mon, 22 Feb 2021 16:23:32 -0800
Subject: [PATCH 0547/1664] Overlay property instead of style

Overlaying the whole style with sw720dp will override dark theme styles.
Let's instead define the attribute that needs to be different and put it
in a config xml.

Test: set smallest width to 720, flip to dark theme
Fixes: 180003967
Change-Id: I423f3401b612e7e87a63f3f14f972b9d863d8a17
---
 res/values-sw720dp/styles.xml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml
index f322e9f31b..c1e6ecace7 100644
--- a/res/values-sw720dp/styles.xml
+++ b/res/values-sw720dp/styles.xml
@@ -18,16 +18,6 @@
 -->
 
 <resources>
-
-    <style name="BaseLauncherTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:windowShowWallpaper">true</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowActionModeOverlay">true</item>
-        <item name="android:colorEdgeEffect">?android:attr/textColorSecondary</item>
-    </style>
-
     <!-- Workspace -->
     <style name="DropTargetButton" parent="DropTargetButtonBase">
         <item name="android:paddingLeft">60dp</item>
@@ -36,5 +26,4 @@
         <item name="android:shadowDy">0.0</item>
         <item name="android:shadowRadius">2.0</item>
     </style>
-
 </resources>
\ No newline at end of file
-- 
GitLab


From b8bb677616799be971d211e57796969bf590d727 Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Mon, 22 Feb 2021 16:36:13 -0800
Subject: [PATCH 0548/1664] [AA+] Skip title logging when search result type is
 PEOPLE.

Bug: 178562918
Test: Manual
Change-Id: Ia2fb8018efcdfb6ad947c590d559094cb460ce83
---
 .../model/data/SearchActionItemInfo.java        | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/com/android/launcher3/model/data/SearchActionItemInfo.java b/src/com/android/launcher3/model/data/SearchActionItemInfo.java
index 6a8ec84c63..e3b3b09ce0 100644
--- a/src/com/android/launcher3/model/data/SearchActionItemInfo.java
+++ b/src/com/android/launcher3/model/data/SearchActionItemInfo.java
@@ -42,12 +42,15 @@ public class SearchActionItemInfo extends ItemInfoWithIcon {
     private int mFlags = 0;
     private final Icon mIcon;
 
+    // If true title does not contain any personal info and eligible for logging.
+    private final boolean mIsPersonalTitle;
     private Intent mIntent;
 
     private PendingIntent mPendingIntent;
 
     public SearchActionItemInfo(Icon icon, String packageName, UserHandle user,
-            CharSequence title) {
+            CharSequence title, boolean isPersonalTitle) {
+        mIsPersonalTitle = isPersonalTitle;
         this.user = user == null ? Process.myUserHandle() : user;
         this.title = title;
         this.container = EXTENDED_CONTAINERS;
@@ -62,6 +65,7 @@ public class SearchActionItemInfo extends ItemInfoWithIcon {
         mFlags = info.mFlags;
         title = info.title;
         this.container = EXTENDED_CONTAINERS;
+        this.mIsPersonalTitle = info.mIsPersonalTitle;
     }
 
     /**
@@ -118,11 +122,14 @@ public class SearchActionItemInfo extends ItemInfoWithIcon {
 
     @Override
     public ItemInfo buildProto(FolderInfo fInfo) {
+        SearchActionItem.Builder itemBuilder = SearchActionItem.newBuilder()
+                .setPackageName(mFallbackPackageName);
+
+        if (!mIsPersonalTitle) {
+            itemBuilder.setTitle(title.toString());
+        }
         return getDefaultItemInfoBuilder()
-                .setSearchActionItem(
-                        SearchActionItem.newBuilder()
-                                .setTitle(title.toString())
-                                .setPackageName(mFallbackPackageName))
+                .setSearchActionItem(itemBuilder)
                 .setContainerInfo(getContainerInfo())
                 .build();
     }
-- 
GitLab


From 97710ffbb29daa8e901845821c4f06d7faf50d25 Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Sun, 21 Feb 2021 19:00:41 -0800
Subject: [PATCH 0549/1664] [AA+] Log additional UI events with Launcher
 snapshot logging.

Bug: 180418845
Test: Manual
Change-Id: I74ab1faafe6c21a8fbf6992a8aebe918cc31d85e
---
 .../com/android/launcher3/model/QuickstepModelDelegate.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
index 225823e550..2ea8bd20f6 100644
--- a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
+++ b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
@@ -148,10 +148,13 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
                         ? (FolderInfo) itemsIdMap.get(info.container) : null;
                 StatsLogCompatManager.writeSnapshot(info.buildProto(parent), instanceId);
             }
+            additionalSnapshotEvents(instanceId);
             prefs.edit().putLong(LAST_SNAPSHOT_TIME_MILLIS, now).apply();
         }
     }
 
+    protected void additionalSnapshotEvents(InstanceId snapshotInstanceId){}
+
     @Override
     public void validateData() {
         super.validateData();
-- 
GitLab


From d0ab1a0eeda4e33bb9d82ea2c4c2d8d2061f2f23 Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Wed, 17 Feb 2021 19:37:25 -0800
Subject: [PATCH 0550/1664] [AA+] Add WW logging for Slice actions.

Bug: 178562918
Test: Manual
Change-Id: I515ee3c0990dea2c30e68d5919568dc1773912ee
---
 protos/launcher_atom.proto                    |  6 ++++
 .../logging/StatsLogCompatManager.java        | 34 +++++++++++++++++--
 .../launcher3/logging/StatsLogManager.java    | 33 ++++++++++++++++++
 3 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/protos/launcher_atom.proto b/protos/launcher_atom.proto
index dc9f8dd3fa..fe81b4cbeb 100644
--- a/protos/launcher_atom.proto
+++ b/protos/launcher_atom.proto
@@ -29,6 +29,7 @@ message ItemInfo {
     Shortcut shortcut = 3;
     Widget widget = 4;
     FolderIcon folder_icon = 9;
+    Slice slice = 10;
     SearchActionItem search_action_item = 11;
   }
   // When used for launch event, stores the global predictive rank
@@ -170,6 +171,11 @@ message FolderIcon {
   optional string label_info = 4;
 }
 
+// Contains Slice details for logging.
+message Slice{
+  optional string uri = 1;
+}
+
 // Represents SearchAction with in launcher
 message SearchActionItem{
   optional string package_name = 1;
diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
index 4f211d7f2f..a762cb7d92 100644
--- a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
+++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
@@ -16,6 +16,9 @@
 
 package com.android.quickstep.logging;
 
+import static androidx.core.util.Preconditions.checkNotNull;
+import static androidx.core.util.Preconditions.checkState;
+
 import static com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.EXTENDED_CONTAINERS;
 import static com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.FOLDER;
 import static com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.SEARCH_RESULT_CONTAINER;
@@ -29,7 +32,9 @@ import static com.android.systemui.shared.system.SysUiStatsLog.LAUNCHER_UICHANGE
 import android.content.Context;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.WorkerThread;
+import androidx.slice.SliceItem;
 
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.Utilities;
@@ -140,6 +145,7 @@ public class StatsLogCompatManager extends StatsLogManager {
         private Optional<FromState> mFromState = Optional.empty();
         private Optional<ToState> mToState = Optional.empty();
         private Optional<String> mEditText = Optional.empty();
+        private SliceItem mSliceItem;
 
         @Override
         public StatsLogger withItemInfo(ItemInfo itemInfo) {
@@ -177,10 +183,8 @@ public class StatsLogCompatManager extends StatsLogManager {
 
         @Override
         public StatsLogger withContainerInfo(ContainerInfo containerInfo) {
-            if (mItemInfo != DEFAULT_ITEM_INFO) {
-                throw new IllegalArgumentException(
+            checkState(mItemInfo == DEFAULT_ITEM_INFO,
                         "ItemInfo and ContainerInfo are mutual exclusive; cannot log both.");
-            }
             this.mContainerInfo = Optional.of(containerInfo);
             return this;
         }
@@ -203,6 +207,14 @@ public class StatsLogCompatManager extends StatsLogManager {
             return this;
         }
 
+        @Override
+        public StatsLogger withSliceItem(@NonNull SliceItem sliceItem) {
+            this.mSliceItem = checkNotNull(sliceItem, "expected valid sliceItem but received null");
+            checkState(mItemInfo == DEFAULT_ITEM_INFO,
+                    "ItemInfo and SliceItem are mutual exclusive; cannot log both.");
+            return this;
+        }
+
         @Override
         public void log(EventEnum event) {
             if (!Utilities.ATLEAST_R) {
@@ -210,6 +222,20 @@ public class StatsLogCompatManager extends StatsLogManager {
             }
 
             LauncherAppState appState = LauncherAppState.getInstanceNoCreate();
+
+            if (mSliceItem != null) {
+                Executors.MODEL_EXECUTOR.execute(
+                        () -> {
+                            LauncherAtom.ItemInfo.Builder itemInfoBuilder =
+                                    LauncherAtom.ItemInfo.newBuilder().setSlice(
+                                            LauncherAtom.Slice.newBuilder().setUri(
+                                                    mSliceItem.getSlice().getUri().toString()));
+                            mContainerInfo.ifPresent(itemInfoBuilder::setContainerInfo);
+                            write(event, applyOverwrites(itemInfoBuilder.build()));
+                        });
+                return;
+            }
+
             if (mItemInfo.container < 0 || appState == null) {
                 // Write log on the model thread so that logs do not go out of order
                 // (for eg: drop comes after drag)
@@ -346,6 +372,8 @@ public class StatsLogCompatManager extends StatsLogManager {
                 return info.getTask().getComponentName();
             case SEARCH_ACTION_ITEM:
                 return info.getSearchActionItem().getTitle();
+            case SLICE:
+                return info.getSlice().getUri();
             default:
                 return null;
         }
diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index 0802f8a574..bf420d9766 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -23,6 +23,7 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH
 import android.content.Context;
 
 import androidx.annotation.Nullable;
+import androidx.slice.SliceItem;
 
 import com.android.launcher3.R;
 import com.android.launcher3.logger.LauncherAtom.ContainerInfo;
@@ -366,6 +367,31 @@ public class StatsLogManager implements ResourceBasedOverride {
 
         @UiEvent(doc = "User switched to Work tab in AllApps screen.")
         LAUNCHER_ALLAPPS_SWITCHED_TO_WORK_TAB(696),
+
+        @UiEvent(doc = "Default event when dedicated UI event is not available for the user action"
+                + " on slice .")
+        LAUNCHER_SLICE_DEFAULT_ACTION(700),
+
+        @UiEvent(doc = "User toggled-on a Slice item.")
+        LAUNCHER_SLICE_TOGGLE_ON(701),
+
+        @UiEvent(doc = "User toggled-off a Slice item.")
+        LAUNCHER_SLICE_TOGGLE_OFF(702),
+
+        @UiEvent(doc = "User acted on a Slice item with a button.")
+        LAUNCHER_SLICE_BUTTON_ACTION(703),
+
+        @UiEvent(doc = "User acted on a Slice item with a slider.")
+        LAUNCHER_SLICE_SLIDER_ACTION(704),
+
+        @UiEvent(doc = "User tapped on the entire row of a Slice.")
+        LAUNCHER_SLICE_CONTENT_ACTION(705),
+
+        @UiEvent(doc = "User tapped on the see more button of a Slice.")
+        LAUNCHER_SLICE_SEE_MORE_ACTION(706),
+
+        @UiEvent(doc = "User selected from a selection row of Slice.")
+        LAUNCHER_SLICE_SELECTION_ACTION(707),
         ;
 
         // ADD MORE
@@ -472,6 +498,13 @@ public class StatsLogManager implements ResourceBasedOverride {
             return this;
         }
 
+        /**
+         * Sets logging fields from provided {@link SliceItem}.
+         */
+        default StatsLogger withSliceItem(SliceItem sliceItem) {
+            return this;
+        }
+
         /**
          * Builds the final message and logs it as {@link EventEnum}.
          */
-- 
GitLab


From 85dfc2e03234a823a38ad52fe54e6b75275be65a Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Mon, 22 Feb 2021 09:47:08 -0600
Subject: [PATCH 0551/1664] Allow badging with ComponentNames

Bug: 180909579
Test: Manual
Change-Id: I2ee6dc2edb97ef0eb2470e7b7e8f849d451a77dd
---
 src/com/android/launcher3/model/data/SearchActionItemInfo.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/launcher3/model/data/SearchActionItemInfo.java b/src/com/android/launcher3/model/data/SearchActionItemInfo.java
index 25355c9579..d990b031a0 100644
--- a/src/com/android/launcher3/model/data/SearchActionItemInfo.java
+++ b/src/com/android/launcher3/model/data/SearchActionItemInfo.java
@@ -34,6 +34,7 @@ public class SearchActionItemInfo extends ItemInfoWithIcon {
     public static final int FLAG_SHOULD_START_FOR_RESULT = FLAG_SHOULD_START | 1 << 2;
     public static final int FLAG_BADGE_WITH_PACKAGE = 1 << 3;
     public static final int FLAG_PRIMARY_ICON_FROM_TITLE = 1 << 4;
+    public static final int FLAG_BADGE_WITH_COMPONENT_NAME = 1 << 5;
 
     private final String mFallbackPackageName;
     private int mFlags = 0;
-- 
GitLab


From 29016e8e460c7559dcb8226d51c090d0cde383d0 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 23 Feb 2021 16:51:37 -0800
Subject: [PATCH 0552/1664] Make RecentsView INVISIBLE instead of GONE

This ensures it gets laid out to compute things like page scrolls.

Test: Repro steps to both bugs below
- Force stop launcher, swipe up slightly, hold, and let go to return
  to the current task; ensure no jumps or jank
- Force stop launcher, swipe up and hold to go to Overview, ensure
  no jump on motion pause

Fixes: 180736503
Fixes: 175064755
Change-Id: I44581f87600b02a3c9ddefcb8c94bb3845cd9152
---
 quickstep/src/com/android/quickstep/views/RecentsView.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index deb1388e96..248fa46d79 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -537,7 +537,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     @Override
     protected void onWindowVisibilityChanged(int visibility) {
         super.onWindowVisibilityChanged(visibility);
-        if (visibility == GONE && ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+        if (visibility != VISIBLE && ENABLE_QUICKSTEP_LIVE_TILE.get()) {
             finishRecentsAnimation(true /* toRecents */, null);
         }
         updateTaskStackListenerState();
@@ -1748,7 +1748,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         if (alpha > 0) {
             setVisibility(VISIBLE);
         } else if (!mFreezeViewVisibility) {
-            setVisibility(GONE);
+            setVisibility(INVISIBLE);
         }
     }
 
@@ -1760,7 +1760,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         if (mFreezeViewVisibility != freezeViewVisibility) {
             mFreezeViewVisibility = freezeViewVisibility;
             if (!mFreezeViewVisibility) {
-                setVisibility(mContentAlpha > 0 ? VISIBLE : GONE);
+                setVisibility(mContentAlpha > 0 ? VISIBLE : INVISIBLE);
             }
         }
     }
-- 
GitLab


From 752ebfcef20d9b7994bb036e12816dfc77d08406 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 22 Feb 2021 16:35:13 -0800
Subject: [PATCH 0553/1664] Ensure taskbar visibility callbacks are called in
 init()

We're initializing the correct values, but the callback only runs if
the value is different than the default value of 0. Thus we weren't
updating the visibility according to the value 0 in init().

Test: Initialize taskbar while launcher is resumed
Fixes: 180103543
Change-Id: I3f754cac59e2bd5ad542de050e8b4c3146d5eebf
---
 .../android/launcher3/taskbar/TaskbarVisibilityController.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarVisibilityController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarVisibilityController.java
index 4cf55d8771..6d20d9718f 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarVisibilityController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarVisibilityController.java
@@ -59,6 +59,9 @@ public class TaskbarVisibilityController {
         boolean isImeVisible = (SystemUiProxy.INSTANCE.get(mLauncher).getLastSystemUiStateFlags()
                 & QuickStepContract.SYSUI_STATE_IME_SHOWING) != 0;
         mTaskbarVisibilityAlphaForIme.updateValue(isImeVisible ? 0f : 1f);
+
+        onTaskbarBackgroundAlphaChanged();
+        updateVisibilityAlpha();
     }
 
     protected void cleanup() {
-- 
GitLab


From 25992f12e520c8a74af79b3c557f5cceac2c12fa Mon Sep 17 00:00:00 2001
From: Sreyas <sreyasr@google.com>
Date: Mon, 22 Feb 2021 21:40:49 -0800
Subject: [PATCH 0554/1664] Fix DWB cutting off above inset when translating
 down.

Bug: 180979788
Test: Manual
Change-Id: I08577db4149b339fa217cab6401250a3fca10e65
---
 .../android/quickstep/views/DigitalWellBeingToast.java   | 8 +++++---
 quickstep/src/com/android/quickstep/views/TaskView.java  | 9 ++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
index 6630aede3d..25ae055f71 100644
--- a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
+++ b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
@@ -71,6 +71,7 @@ public final class DigitalWellBeingToast {
     private ViewOutlineProvider mOldBannerOutlineProvider;
     private float mBannerOffsetPercentage;
     private float mBannerAlpha = 1f;
+    private float mVerticalOffset = 0f;
 
     public DigitalWellBeingToast(BaseDraggingActivity activity, TaskView taskView) {
         mActivity = activity;
@@ -275,16 +276,17 @@ public final class DigitalWellBeingToast {
             @Override
             public void getOutline(View view, Outline outline) {
                 mOldBannerOutlineProvider.getOutline(view, outline);
-                outline.offset(0, -Math.round(view.getTranslationY()));
+                outline.offset(0, Math.round(-view.getTranslationY() + mVerticalOffset));
             }
         });
         mBanner.setClipToOutline(true);
     }
 
-    void updateBannerOffset(float offsetPercentage) {
+    void updateBannerOffset(float offsetPercentage, float verticalOffset) {
         if (mBanner != null && mBannerOffsetPercentage != offsetPercentage) {
+            mVerticalOffset = verticalOffset;
             mBannerOffsetPercentage = offsetPercentage;
-            mBanner.setTranslationY(offsetPercentage * mBanner.getHeight());
+            mBanner.setTranslationY(offsetPercentage * mBanner.getHeight() + mVerticalOffset);
             mBanner.invalidateOutline();
         }
     }
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index e891c95a85..dfbe6cea59 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -48,7 +48,6 @@ import android.app.ActivityOptions;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Outline;
-import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
@@ -429,7 +428,9 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
             mContextualChip.setScaleX(comp(modalness));
             mContextualChip.setScaleY(comp(modalness));
         }
-        mDigitalWellBeingToast.updateBannerOffset(modalness);
+        mDigitalWellBeingToast.updateBannerOffset(modalness,
+                mCurrentFullscreenParams.mCurrentDrawnInsets.top
+                        + mCurrentFullscreenParams.mCurrentDrawnInsets.bottom);
     }
 
     public TaskMenuView getMenuView() {
@@ -666,7 +667,9 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
             mContextualChip.setScaleX(scale);
             mContextualChip.setScaleY(scale);
         }
-        mDigitalWellBeingToast.updateBannerOffset(1f - scale);
+        mDigitalWellBeingToast.updateBannerOffset(1f - scale,
+                mCurrentFullscreenParams.mCurrentDrawnInsets.top
+                        + mCurrentFullscreenParams.mCurrentDrawnInsets.bottom);
     }
 
     public void setIconScaleAnimStartProgress(float startProgress) {
-- 
GitLab


From f480a87423e495f126c9c98b2e5884e82806ef44 Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Tue, 23 Feb 2021 18:32:58 -0800
Subject: [PATCH 0555/1664] Changes ENABLE_SMARTSPACE_ENHANCED to be a
 DeviceFlag.

This lets us toggle it server-side.

Bug: 181077020
Test: Manually toggled using
adb shell device_config put launcher ENABLE_SMARTSPACE_ENHANCED true

Change-Id: I5172bf6f977729f4c1c813b1eaba3b8b34bfc44e
---
 src/com/android/launcher3/config/FeatureFlags.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 556aff61c3..3d5920abc5 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -161,7 +161,7 @@ public final class FeatureFlags {
             "ENABLE_SMARTSPACE_UNIVERSAL", false,
             "Replace Smartspace with a version rendered by System UI.");
 
-    public static final BooleanFlag ENABLE_SMARTSPACE_ENHANCED = getDebugFlag(
+    public static final BooleanFlag ENABLE_SMARTSPACE_ENHANCED = new DeviceFlag(
             "ENABLE_SMARTSPACE_ENHANCED", false,
             "Replace Smartspace with the enhanced version. "
               + "Ignored if ENABLE_SMARTSPACE_UNIVERSAL is enabled.");
-- 
GitLab


From b984cf7fa68dfb48d321196aa0320a20ce934dca Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Wed, 24 Feb 2021 10:05:01 -0600
Subject: [PATCH 0556/1664] Restore divider between app predictions and apps

Screenshot: https://screenshot.googleplex.com/89jJLU3JXV8tRXM
Bug: 180017741
Test: Manual
Change-Id: Iab1764fe94340f120770054cf5a59bd3ed9e45a4
---
 .../launcher3/appprediction/AppsDividerView.java       |  6 ------
 .../launcher3/appprediction/PredictionRowView.java     | 10 ++++++++--
 .../launcher3/allapps/AllAppsContainerView.java        |  1 +
 .../android/launcher3/allapps/FloatingHeaderRow.java   |  7 +++++++
 .../android/launcher3/allapps/FloatingHeaderView.java  |  2 +-
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java b/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java
index b891120378..66b1a861bb 100644
--- a/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java
+++ b/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java
@@ -42,7 +42,6 @@ import com.android.launcher3.R;
 import com.android.launcher3.allapps.FloatingHeaderRow;
 import com.android.launcher3.allapps.FloatingHeaderView;
 import com.android.launcher3.anim.PropertySetter;
-import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.statemanager.StateManager.StateListener;
 import com.android.launcher3.util.Themes;
 
@@ -183,11 +182,6 @@ public class AppsDividerView extends View implements StateListener<LauncherState
     }
 
     private void updateViewVisibility() {
-        // hide divider since we have item decoration for prediction row
-        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
-            setVisibility(GONE);
-            return;
-        }
         setVisibility(mDividerType == DividerType.NONE
                 ? GONE
                 : (mIsScrolledOut ? INVISIBLE : VISIBLE));
diff --git a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
index 7d494c28bf..b570d55f69 100644
--- a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
+++ b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
@@ -108,7 +108,8 @@ public class PredictionRowView extends LinearLayout implements
 
     AllAppsSectionDecorator.SectionDecorationHandler mDecorationHandler;
 
-    @Nullable private List<ItemInfo> mPendingPredictedItems;
+    @Nullable
+    private List<ItemInfo> mPendingPredictedItems;
 
     public PredictionRowView(@NonNull Context context) {
         this(context, null);
@@ -181,7 +182,7 @@ public class PredictionRowView extends LinearLayout implements
 
     @Override
     public boolean shouldDraw() {
-        return getVisibility() == VISIBLE;
+        return getVisibility() != GONE;
     }
 
     @Override
@@ -189,6 +190,11 @@ public class PredictionRowView extends LinearLayout implements
         return mPredictionsEnabled;
     }
 
+    @Override
+    public boolean isVisible() {
+        return getVisibility() == VISIBLE;
+    }
+
     /**
      * Returns the predicted apps.
      */
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 746bfba756..ec2a6d5b85 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -757,6 +757,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
                 int bottomOffset = mWorkModeSwitch != null && mIsWork ? switchH : 0;
                 recyclerView.setPadding(padding.left, padding.top, padding.right,
                         padding.bottom + bottomOffset);
+                recyclerView.scrollToTop();
             }
         }
 
diff --git a/src/com/android/launcher3/allapps/FloatingHeaderRow.java b/src/com/android/launcher3/allapps/FloatingHeaderRow.java
index e357f61dac..31c6cc729a 100644
--- a/src/com/android/launcher3/allapps/FloatingHeaderRow.java
+++ b/src/com/android/launcher3/allapps/FloatingHeaderRow.java
@@ -61,4 +61,11 @@ public interface FloatingHeaderRow {
      * Returns a child that has focus to be launched by the IME.
      */
     View getFocusedChild();
+
+    /**
+     * Returns true if view is currently visible
+     */
+    default boolean isVisible() {
+        return shouldDraw();
+    }
 }
diff --git a/src/com/android/launcher3/allapps/FloatingHeaderView.java b/src/com/android/launcher3/allapps/FloatingHeaderView.java
index 813db7d0a0..9056e8aada 100644
--- a/src/com/android/launcher3/allapps/FloatingHeaderView.java
+++ b/src/com/android/launcher3/allapps/FloatingHeaderView.java
@@ -200,7 +200,7 @@ public class FloatingHeaderView extends LinearLayout implements
     public View getFocusedChild() {
         if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
             for (FloatingHeaderRow row : mAllRows) {
-                if (row.hasVisibleContent() && row.shouldDraw()) {
+                if (row.hasVisibleContent() && row.isVisible()) {
                     return row.getFocusedChild();
                 }
             }
-- 
GitLab


From 9f53d613345d1728037fd531f0ac64589d589dc8 Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Wed, 24 Feb 2021 10:54:01 -0800
Subject: [PATCH 0557/1664] [AA+] Use different launcher event to log all apps
 entry with device search.

Bug: 178562918
Test: Manual
Change-Id: I56357e871dd57257ccd56a073cccc7e38529c6c6
---
 src/com/android/launcher3/Launcher.java                | 7 ++++++-
 src/com/android/launcher3/logging/StatsLogManager.java | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 49adf1f1b7..f7ff262dcd 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -42,6 +42,7 @@ import static com.android.launcher3.dragndrop.DragLayer.ALPHA_INDEX_LAUNCHER_LOA
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_ENTRY;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_ENTRY_WITH_DEVICE_SEARCH;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_EXIT;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ONRESUME;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ONSTOP;
@@ -1067,7 +1068,11 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         if (ALL_APPS.equals(state)) {
             // creates new instance ID since new all apps session is started.
             mAllAppsSessionLogId = new InstanceIdSequence().newInstanceId();
-            getStatsLogManager().logger().log(LAUNCHER_ALLAPPS_ENTRY);
+            getStatsLogManager()
+                    .logger()
+                    .log(FeatureFlags.ENABLE_DEVICE_SEARCH.get()
+                            ? LAUNCHER_ALLAPPS_ENTRY_WITH_DEVICE_SEARCH
+                            : LAUNCHER_ALLAPPS_ENTRY);
         } else if (ALL_APPS.equals(mPrevLauncherState)
                 // Check if mLogInstanceId is not null to make sure exit event is logged only once.
                 && mAllAppsSessionLogId != null) {
diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index bf420d9766..7745e90d8a 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -392,6 +392,9 @@ public class StatsLogManager implements ResourceBasedOverride {
 
         @UiEvent(doc = "User selected from a selection row of Slice.")
         LAUNCHER_SLICE_SELECTION_ACTION(707),
+
+        @UiEvent(doc = "Launcher entered into AllApps state with device search enabled.")
+        LAUNCHER_ALLAPPS_ENTRY_WITH_DEVICE_SEARCH(720),
         ;
 
         // ADD MORE
-- 
GitLab


From e8d92342fa6bae795addf1a16bee540242cc4147 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Fri, 19 Feb 2021 21:29:18 +0000
Subject: [PATCH 0558/1664] Replace horizontal ScrollViews with tables in the
 full widgets picker

Test: Run gnl test, AddWidgetTest
      Run Robolectric tests for widgets
      Manual test video: https://drive.google.com/file/d/1uwCtVNIlC9150kv5eEfILfP5r5M7ARYm/view?usp=sharing

Bug: 179797520
Change-Id: I2f4cdf84338a91b63967879d0c9268c312ace19b
---
 res/layout/widgets_list_row_view.xml          |   2 +-
 res/layout/widgets_table_container.xml        |  21 ++
 ...WidgetsListTableViewHolderBinderTest.java} |  20 +-
 .../picker/util/WidgetsTableUtilsTest.java    | 201 ++++++++++++++++++
 .../android/launcher3/model/WidgetItem.java   |  16 ++
 .../widget/picker/WidgetsFullSheet.java       |  15 +-
 .../widget/picker/WidgetsListAdapter.java     |  35 ++-
 ... => WidgetsListTableViewHolderBinder.java} | 121 +++++++----
 .../widget/picker/WidgetsRowViewHolder.java   |   5 +-
 .../widget/util/WidgetsTableUtils.java        |  92 ++++++++
 .../com/android/launcher3/tapl/Widgets.java   |  57 ++---
 11 files changed, 476 insertions(+), 109 deletions(-)
 create mode 100644 res/layout/widgets_table_container.xml
 rename robolectric_tests/src/com/android/launcher3/widget/picker/{WidgetsListRowViewHolderBinderTest.java => WidgetsListTableViewHolderBinderTest.java} (90%)
 create mode 100644 robolectric_tests/src/com/android/launcher3/widget/picker/util/WidgetsTableUtilsTest.java
 rename src/com/android/launcher3/widget/picker/{WidgetsListRowViewHolderBinder.java => WidgetsListTableViewHolderBinder.java} (51%)
 create mode 100644 src/com/android/launcher3/widget/util/WidgetsTableUtils.java

diff --git a/res/layout/widgets_list_row_view.xml b/res/layout/widgets_list_row_view.xml
index eec57a5df3..5942ba65d1 100644
--- a/res/layout/widgets_list_row_view.xml
+++ b/res/layout/widgets_list_row_view.xml
@@ -45,5 +45,5 @@
         launcher:iconSizeOverride="@dimen/widget_section_icon_size"
         launcher:layoutHorizontal="true" />
 
-    <include layout="@layout/widgets_scroll_container" />
+    <include layout="@layout/widgets_table_container" />
 </LinearLayout>
diff --git a/res/layout/widgets_table_container.xml b/res/layout/widgets_table_container.xml
new file mode 100644
index 0000000000..ffa239a699
--- /dev/null
+++ b/res/layout/widgets_table_container.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<TableLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/widgets_table"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/colorPrimaryDark" />
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListRowViewHolderBinderTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java
similarity index 90%
rename from robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListRowViewHolderBinderTest.java
rename to robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java
index ec9fde321c..358e6e02dd 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListRowViewHolderBinderTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java
@@ -32,6 +32,7 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
 import android.widget.FrameLayout;
+import android.widget.TableRow;
 import android.widget.TextView;
 
 import com.android.launcher3.DeviceProfile;
@@ -65,12 +66,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
-public final class WidgetsListRowViewHolderBinderTest {
+public final class WidgetsListTableViewHolderBinderTest {
     private static final String TEST_PACKAGE = "com.google.test";
     private static final String APP_NAME = "Test app";
 
     private Context mContext;
-    private WidgetsListRowViewHolderBinder mViewHolderBinder;
+    private WidgetsListTableViewHolderBinder mViewHolderBinder;
     private InvariantDeviceProfile mTestProfile;
     // Replace ActivityController with ActivityScenario, which is the recommended way for activity
     // testing.
@@ -105,7 +106,7 @@ public final class WidgetsListRowViewHolderBinderTest {
             return componentWithLabel.getComponent().getShortClassName();
         }).when(mIconCache).getTitleNoCache(any());
 
-        mViewHolderBinder = new WidgetsListRowViewHolderBinder(
+        mViewHolderBinder = new WidgetsListTableViewHolderBinder(
                 mContext,
                 LayoutInflater.from(mTestActivity),
                 mOnIconClickListener,
@@ -129,16 +130,17 @@ public final class WidgetsListRowViewHolderBinderTest {
         mViewHolderBinder.bindViewHolder(viewHolder, entry);
         shadowOf(getMainLooper()).idle();
 
-        // THEN the cell container has 5 children: 3 widgets + 2 separators
-        // Index:        0       1        2       3        4
+        // THEN the table container has one row, which contains 3 widgets.
         // View:  .SampleWidget0 | .SampleWidget1 | .SampleWidget2
-        assertThat(viewHolder.cellContainer.getChildCount()).isEqualTo(5);
+        assertThat(viewHolder.mTableContainer.getChildCount()).isEqualTo(1);
+        TableRow row = (TableRow) viewHolder.mTableContainer.getChildAt(0);
+        assertThat(row.getChildCount()).isEqualTo(3);
         // Widget 0 label is .SampleWidget0.
-        assertWidgetCellWithLabel(viewHolder.cellContainer.getChildAt(0), ".SampleWidget0");
+        assertWidgetCellWithLabel(row.getChildAt(0), ".SampleWidget0");
         // Widget 1 label is .SampleWidget1.
-        assertWidgetCellWithLabel(viewHolder.cellContainer.getChildAt(2), ".SampleWidget1");
+        assertWidgetCellWithLabel(row.getChildAt(1), ".SampleWidget1");
         // Widget 2 label is .SampleWidget2.
-        assertWidgetCellWithLabel(viewHolder.cellContainer.getChildAt(4), ".SampleWidget2");
+        assertWidgetCellWithLabel(row.getChildAt(2), ".SampleWidget2");
     }
 
     private WidgetsListContentEntry generateSampleAppWithWidgets(String appName, String packageName,
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/util/WidgetsTableUtilsTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/util/WidgetsTableUtilsTest.java
new file mode 100644
index 0000000000..5922223f63
--- /dev/null
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/util/WidgetsTableUtilsTest.java
@@ -0,0 +1,201 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget.picker.util;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.appwidget.AppWidgetProviderInfo;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.graphics.Point;
+import android.graphics.drawable.Drawable;
+import android.os.UserHandle;
+
+import com.android.launcher3.InvariantDeviceProfile;
+import com.android.launcher3.LauncherAppWidgetProviderInfo;
+import com.android.launcher3.icons.ComponentWithLabel;
+import com.android.launcher3.icons.IconCache;
+import com.android.launcher3.model.WidgetItem;
+import com.android.launcher3.pm.ShortcutConfigActivityInfo;
+import com.android.launcher3.widget.util.WidgetsTableUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadows.ShadowPackageManager;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+public final class WidgetsTableUtilsTest {
+    private static final String TEST_PACKAGE = "com.google.test";
+
+    @Mock
+    private IconCache mIconCache;
+
+    private Context mContext;
+    private InvariantDeviceProfile mTestProfile;
+    private WidgetItem mWidget1x1;
+    private WidgetItem mWidget2x2;
+    private WidgetItem mWidget2x3;
+    private WidgetItem mWidget2x4;
+    private WidgetItem mWidget4x4;
+
+    private WidgetItem mShortcut1;
+    private WidgetItem mShortcut2;
+    private WidgetItem mShortcut3;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+
+        mTestProfile = new InvariantDeviceProfile();
+        mTestProfile.numRows = 5;
+        mTestProfile.numColumns = 5;
+
+        initTestWidgets();
+        initTestShortcuts();
+
+        doAnswer(invocation -> ((ComponentWithLabel) invocation.getArgument(0))
+                .getComponent().getPackageName())
+                .when(mIconCache).getTitleNoCache(any());
+    }
+
+
+    @Test
+    public void groupWidgetItemsIntoTable_widgetsOnly_maxSpansPerRow5_shouldGroupWidgetsInTable() {
+        List<WidgetItem> widgetItems = List.of(mWidget4x4, mWidget2x3, mWidget1x1, mWidget2x4,
+                mWidget2x2);
+
+        List<ArrayList<WidgetItem>> widgetItemInTable = WidgetsTableUtils.groupWidgetItemsIntoTable(
+                widgetItems, /* maxSpansPerRow= */ 5);
+
+        // Row 0: 1x1, 2x2, 2x3
+        // Row 1: 2x4
+        // Row 2: 4x4
+        assertThat(widgetItemInTable).hasSize(3);
+        assertThat(widgetItemInTable.get(0)).containsExactly(mWidget1x1, mWidget2x2, mWidget2x3);
+        assertThat(widgetItemInTable.get(1)).containsExactly(mWidget2x4);
+        assertThat(widgetItemInTable.get(2)).containsExactly(mWidget4x4);
+    }
+
+    @Test
+    public void groupWidgetItemsIntoTable_widgetsOnly_maxSpansPerRow4_shouldGroupWidgetsInTable() {
+        List<WidgetItem> widgetItems = List.of(mWidget4x4, mWidget2x3, mWidget1x1, mWidget2x4,
+                mWidget2x2);
+
+        List<ArrayList<WidgetItem>> widgetItemInTable = WidgetsTableUtils.groupWidgetItemsIntoTable(
+                widgetItems, /* maxSpansPerRow= */ 4);
+
+        // Row 0: 1x1, 2x2
+        // Row 1: 2x3, 2x4
+        // Row 2: 4x4
+        assertThat(widgetItemInTable).hasSize(3);
+        assertThat(widgetItemInTable.get(0)).containsExactly(mWidget1x1, mWidget2x2);
+        assertThat(widgetItemInTable.get(1)).containsExactly(mWidget2x3, mWidget2x4);
+        assertThat(widgetItemInTable.get(2)).containsExactly(mWidget4x4);
+    }
+
+    @Test
+    public void groupWidgetItemsIntoTable_mixItems_maxSpansPerRow4_shouldGroupWidgetsInTable() {
+        List<WidgetItem> widgetItems = List.of(mWidget4x4, mShortcut3, mWidget2x3, mShortcut1,
+                mWidget1x1, mShortcut2, mWidget2x4, mWidget2x2);
+
+        List<ArrayList<WidgetItem>> widgetItemInTable = WidgetsTableUtils.groupWidgetItemsIntoTable(
+                widgetItems, /* maxSpansPerRow= */ 4);
+
+        // Row 0: 1x1, 2x2
+        // Row 1: 2x3, 2x4
+        // Row 2: 4x4
+        // Row 3: shortcut3, shortcut1, shortcut2
+        assertThat(widgetItemInTable).hasSize(4);
+        assertThat(widgetItemInTable.get(0)).containsExactly(mWidget1x1, mWidget2x2);
+        assertThat(widgetItemInTable.get(1)).containsExactly(mWidget2x3, mWidget2x4);
+        assertThat(widgetItemInTable.get(2)).containsExactly(mWidget4x4);
+        assertThat(widgetItemInTable.get(3)).containsExactly(mShortcut3, mShortcut2, mShortcut1);
+    }
+
+    private void initTestWidgets() {
+        List<Point> widgetSizes = List.of(new Point(1, 1), new Point(2, 2), new Point(2, 3),
+                new Point(2, 4), new Point(4, 4));
+
+        ArrayList<WidgetItem> widgetItems = new ArrayList<>();
+        widgetSizes.stream().forEach(
+                widgetSize -> {
+                    ShadowPackageManager packageManager = shadowOf(mContext.getPackageManager());
+                    AppWidgetProviderInfo info = new AppWidgetProviderInfo();
+                    info.provider = ComponentName.createRelative(TEST_PACKAGE,
+                            ".WidgetProvider_" + widgetSize.x + "x" + widgetSize.y);
+                    LauncherAppWidgetProviderInfo widgetInfo =
+                            LauncherAppWidgetProviderInfo.fromProviderInfo(mContext, info);
+                    widgetInfo.spanX = widgetSize.x;
+                    widgetInfo.spanY = widgetSize.y;
+                    ReflectionHelpers.setField(widgetInfo, "providerInfo",
+                            packageManager.addReceiverIfNotPresent(widgetInfo.provider));
+                    widgetItems.add(new WidgetItem(widgetInfo, mTestProfile, mIconCache));
+                }
+        );
+        mWidget1x1 = widgetItems.get(0);
+        mWidget2x2 = widgetItems.get(1);
+        mWidget2x3 = widgetItems.get(2);
+        mWidget2x4 = widgetItems.get(3);
+        mWidget4x4 = widgetItems.get(4);
+    }
+
+    private void initTestShortcuts() {
+        PackageManager packageManager = mContext.getPackageManager();
+        mShortcut1 = new WidgetItem(new TestShortcutConfigActivityInfo(
+                ComponentName.createRelative(TEST_PACKAGE, ".shortcut1"), UserHandle.CURRENT),
+                mIconCache, packageManager);
+        mShortcut2 = new WidgetItem(new TestShortcutConfigActivityInfo(
+                ComponentName.createRelative(TEST_PACKAGE, ".shortcut2"), UserHandle.CURRENT),
+                mIconCache, packageManager);
+        mShortcut3 = new WidgetItem(new TestShortcutConfigActivityInfo(
+                ComponentName.createRelative(TEST_PACKAGE, ".shortcut3"), UserHandle.CURRENT),
+                mIconCache, packageManager);
+
+    }
+
+    private final class TestShortcutConfigActivityInfo extends ShortcutConfigActivityInfo {
+
+        TestShortcutConfigActivityInfo(ComponentName componentName, UserHandle user) {
+            super(componentName, user);
+        }
+
+        @Override
+        public Drawable getFullResIcon(IconCache cache) {
+            return null;
+        }
+
+        @Override
+        public CharSequence getLabel(PackageManager pm) {
+            return null;
+        }
+    }
+}
diff --git a/src/com/android/launcher3/model/WidgetItem.java b/src/com/android/launcher3/model/WidgetItem.java
index 37c089e5a0..de2481a98a 100644
--- a/src/com/android/launcher3/model/WidgetItem.java
+++ b/src/com/android/launcher3/model/WidgetItem.java
@@ -43,4 +43,20 @@ public class WidgetItem extends ComponentKey {
         activityInfo = info;
         spanX = spanY = 1;
     }
+
+    /**
+     * Returns {@code true} if this {@link WidgetItem} has the same type as the given
+     * {@code otherItem}.
+     *
+     * For example, both items are widgets or both items are shortcuts.
+     */
+    public boolean hasSameType(WidgetItem otherItem) {
+        if (widgetInfo != null && otherItem.widgetInfo != null) {
+            return true;
+        }
+        if (activityInfo != null && otherItem.activityInfo != null) {
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 81cd73aa08..39953b17e2 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -39,6 +39,7 @@ import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Insettable;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
@@ -181,20 +182,30 @@ public class WidgetsFullSheet extends BaseWidgetSheet
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        DeviceProfile deviceProfile = mLauncher.getDeviceProfile();
         int widthUsed;
         if (mInsets.bottom > 0) {
             widthUsed = mInsets.left + mInsets.right;
         } else {
-            Rect padding = mLauncher.getDeviceProfile().workspacePadding;
+            Rect padding = deviceProfile.workspacePadding;
             widthUsed = Math.max(padding.left + padding.right,
                     2 * (mInsets.left + mInsets.right));
         }
 
-        int heightUsed = mInsets.top + mLauncher.getDeviceProfile().edgeMarginPx;
+        int heightUsed = mInsets.top + deviceProfile.edgeMarginPx;
         measureChildWithMargins(mContent, widthMeasureSpec,
                 widthUsed, heightMeasureSpec, heightUsed);
         setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec),
                 MeasureSpec.getSize(heightMeasureSpec));
+
+        int maxSpansPerRow = getMeasuredWidth() / (deviceProfile.cellWidthPx
+                + deviceProfile.workspaceCellPaddingXPx);
+        mAdapters.get(AdapterHolder.PRIMARY).mWidgetsListAdapter.setMaxHorizontalSpansPerRow(
+                maxSpansPerRow);
+        if (mHasWorkProfile) {
+            mAdapters.get(AdapterHolder.WORK).mWidgetsListAdapter.setMaxHorizontalSpansPerRow(
+                    maxSpansPerRow);
+        }
     }
 
     @Override
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
index 72b4a02634..8b49d1ef15 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
@@ -19,10 +19,10 @@ import android.content.Context;
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
-import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
 import android.view.ViewGroup;
+import android.widget.TableRow;
 
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
@@ -67,7 +67,7 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
 
     private final WidgetsDiffReporter mDiffReporter;
     private final SparseArray<ViewHolderBinder> mViewHolderBinders = new SparseArray<>();
-    private final WidgetsListRowViewHolderBinder mWidgetsListRowViewHolderBinder;
+    private final WidgetsListTableViewHolderBinder mWidgetsListTableViewHolderBinder;
     private final WidgetListBaseRowEntryComparator mRowComparator =
             new WidgetListBaseRowEntryComparator();
 
@@ -84,9 +84,9 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
             WidgetPreviewLoader widgetPreviewLoader, IconCache iconCache,
             OnClickListener iconClickListener, OnLongClickListener iconLongClickListener) {
         mDiffReporter = new WidgetsDiffReporter(iconCache, this);
-        mWidgetsListRowViewHolderBinder = new WidgetsListRowViewHolderBinder(context,
+        mWidgetsListTableViewHolderBinder = new WidgetsListTableViewHolderBinder(context,
                 layoutInflater, iconClickListener, iconLongClickListener, widgetPreviewLoader);
-        mViewHolderBinders.put(VIEW_TYPE_WIDGETS_LIST, mWidgetsListRowViewHolderBinder);
+        mViewHolderBinders.put(VIEW_TYPE_WIDGETS_LIST, mWidgetsListTableViewHolderBinder);
         mViewHolderBinders.put(VIEW_TYPE_WIDGETS_HEADER,
                 new WidgetsListHeaderViewHolderBinder(layoutInflater, this::onHeaderClicked));
     }
@@ -101,16 +101,16 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
      * @see WidgetCell#setApplyBitmapDeferred(boolean)
      */
     public void setApplyBitmapDeferred(boolean isDeferred, RecyclerView rv) {
-        mWidgetsListRowViewHolderBinder.setApplyBitmapDeferred(isDeferred);
+        mWidgetsListTableViewHolderBinder.setApplyBitmapDeferred(isDeferred);
 
         for (int i = rv.getChildCount() - 1; i >= 0; i--) {
             ViewHolder viewHolder = rv.getChildViewHolder(rv.getChildAt(i));
             if (viewHolder.getItemViewType() == VIEW_TYPE_WIDGETS_LIST) {
                 WidgetsRowViewHolder holder = (WidgetsRowViewHolder) viewHolder;
-                for (int j = holder.cellContainer.getChildCount() - 1; j >= 0; j--) {
-                    View v = holder.cellContainer.getChildAt(j);
-                    if (v instanceof WidgetCell) {
-                        ((WidgetCell) v).setApplyBitmapDeferred(isDeferred);
+                for (int j = holder.mTableContainer.getChildCount() - 1; j >= 0; j--) {
+                    TableRow row =  (TableRow) holder.mTableContainer.getChildAt(j);
+                    for (int k = row.getChildCount() - 1; k >= 0; k--) {
+                        ((WidgetCell) row.getChildAt(k)).setApplyBitmapDeferred(isDeferred);
                     }
                 }
             }
@@ -204,6 +204,23 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
         }
     }
 
+    /**
+     * Sets the max horizontal spans that are allowed for grouping more than one widgets in a table
+     * row.
+     *
+     * <p>If there is only one widget in a row, that widget horizontal span is allowed to exceed
+     * {@code maxHorizontalSpans}.
+     * <p>Let's say the max horizontal spans is set to 5. Widgets can be grouped in the same row if
+     * their total horizontal spans added don't exceed 5.
+     * Example 1: Row 1: 2x2, 2x3, 1x1. Total horizontal spans is 5. This is okay.
+     * Example 2: Row 1: 2x2, 4x3, 1x1. the total horizontal spans is 7. This is wrong.
+     *            4x3 and 1x1 should be moved to a new row.
+     * Example 3: Row 1: 6x4. This is okay because this is the only item in the row.
+     */
+    public void setMaxHorizontalSpansPerRow(int maxHorizontalSpans) {
+        mWidgetsListTableViewHolderBinder.setMaxSpansPerRow(maxHorizontalSpans);
+    }
+
     /** Comparator for sorting WidgetListRowEntry based on package title. */
     public static class WidgetListBaseRowEntryComparator implements
             Comparator<WidgetsListBaseEntry> {
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListRowViewHolderBinder.java b/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
similarity index 51%
rename from src/com/android/launcher3/widget/picker/WidgetsListRowViewHolderBinder.java
rename to src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
index bd787775d9..2355700e72 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListRowViewHolderBinder.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
@@ -22,25 +22,29 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
 import android.view.ViewGroup;
+import android.widget.TableLayout;
+import android.widget.TableRow;
 
 import com.android.launcher3.R;
 import com.android.launcher3.WidgetPreviewLoader;
-import com.android.launcher3.dragndrop.LivePreviewWidgetCell;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.recyclerview.ViewHolderBinder;
 import com.android.launcher3.widget.WidgetCell;
 import com.android.launcher3.widget.model.WidgetsListContentEntry;
+import com.android.launcher3.widget.util.WidgetsTableUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
  * Binds data from {@link WidgetsListContentEntry} to UI elements in {@link WidgetsRowViewHolder}.
  */
-public class WidgetsListRowViewHolderBinder
+public final class WidgetsListTableViewHolderBinder
         implements ViewHolderBinder<WidgetsListContentEntry, WidgetsRowViewHolder> {
     private static final boolean DEBUG = false;
     private static final String TAG = "WidgetsListRowViewHolderBinder";
 
+    private int mMaxSpansPerRow = 4;
     private final LayoutInflater mLayoutInflater;
     private final int mIndent;
     private final OnClickListener mIconClickListener;
@@ -48,7 +52,7 @@ public class WidgetsListRowViewHolderBinder
     private final WidgetPreviewLoader mWidgetPreviewLoader;
     private boolean mApplyBitmapDeferred = false;
 
-    public WidgetsListRowViewHolderBinder(
+    public WidgetsListTableViewHolderBinder(
             Context context,
             LayoutInflater layoutInflater,
             OnClickListener iconClickListener,
@@ -70,6 +74,10 @@ public class WidgetsListRowViewHolderBinder
         mApplyBitmapDeferred = applyBitmapDeferred;
     }
 
+    public void setMaxSpansPerRow(int maxSpansPerRow) {
+        mMaxSpansPerRow = maxSpansPerRow;
+    }
+
     @Override
     public WidgetsRowViewHolder newViewHolder(ViewGroup parent) {
         if (DEBUG) {
@@ -77,73 +85,92 @@ public class WidgetsListRowViewHolderBinder
         }
 
         ViewGroup container = (ViewGroup) mLayoutInflater.inflate(
-                R.layout.widgets_scroll_container, parent, false);
+                R.layout.widgets_table_container, parent, false);
 
         // if the end padding is 0, then container view (horizontal scroll view) doesn't respect
         // the end of the linear layout width + the start padding and doesn't allow scrolling.
-        container.findViewById(R.id.widgets_cell_list).setPaddingRelative(mIndent, 0, 1, 0);
+        container.findViewById(R.id.widgets_table).setPaddingRelative(mIndent, 0, 1, 0);
 
         return new WidgetsRowViewHolder(container);
     }
 
     @Override
     public void bindViewHolder(WidgetsRowViewHolder holder, WidgetsListContentEntry entry) {
-        List<WidgetItem> infoList = entry.mWidgets;
-
-        ViewGroup row = holder.cellContainer;
+        TableLayout table = holder.mTableContainer;
         if (DEBUG) {
-            Log.d(TAG, String.format("onBindViewHolder [widget#=%d, row.getChildCount=%d]",
-                    infoList.size(), row.getChildCount()));
+            Log.d(TAG, String.format("onBindViewHolder [widget#=%d, table.getChildCount=%d]",
+                    entry.mWidgets.size(), table.getChildCount()));
         }
 
-        // Add more views.
-        // if there are too many, hide them.
-        int expectedChildCount = infoList.size() + Math.max(0, infoList.size() - 1);
-        int childCount = row.getChildCount();
-
-        if (expectedChildCount > childCount) {
-            for (int i = childCount; i < expectedChildCount; i++) {
-                if ((i & 1) == 1) {
-                    // Add a divider for odd index
-                    mLayoutInflater.inflate(R.layout.widget_list_divider, row);
-                } else {
-                    // Add cell for even index
-                    LivePreviewWidgetCell widget = (LivePreviewWidgetCell) mLayoutInflater.inflate(
-                            R.layout.live_preview_widget_cell, row, false);
+        List<ArrayList<WidgetItem>> widgetItemsTable =
+                WidgetsTableUtils.groupWidgetItemsIntoTable(entry.mWidgets, mMaxSpansPerRow);
+        recycleTableBeforeBinding(table, widgetItemsTable);
+        // Bind the widget items.
+        for (int i = 0; i < widgetItemsTable.size(); i++) {
+            List<WidgetItem> widgetItemsPerRow = widgetItemsTable.get(i);
+            for (int j = 0; j < widgetItemsPerRow.size(); j++) {
+                TableRow row = (TableRow) table.getChildAt(i);
+                row.setVisibility(View.VISIBLE);
+                WidgetCell widget = (WidgetCell) row.getChildAt(j);
+                WidgetItem widgetItem = widgetItemsPerRow.get(j);
+                widget.applyFromCellItem(widgetItem, mWidgetPreviewLoader);
+                widget.setApplyBitmapDeferred(mApplyBitmapDeferred);
+                widget.ensurePreview();
+                widget.setVisibility(View.VISIBLE);
+            }
+        }
+    }
 
+    /**
+     * Adds and hides table rows and columns from {@code table} to ensure there is sufficient room
+     * to display {@code widgetItemsTable}.
+     *
+     * <p>Instead of recreating all UI elements in {@code table}, this function recycles all
+     * existing UI elements. Instead of deleting excessive elements, it hides them.
+     */
+    private void recycleTableBeforeBinding(TableLayout table,
+            List<ArrayList<WidgetItem>> widgetItemsTable) {
+        // Hide extra table rows.
+        for (int i = widgetItemsTable.size(); i < table.getChildCount(); i++) {
+            table.getChildAt(i).setVisibility(View.GONE);
+        }
+
+        for (int i = 0; i < widgetItemsTable.size(); i++) {
+            List<WidgetItem> widgetItems = widgetItemsTable.get(i);
+            TableRow tableRow;
+            if (i < table.getChildCount()) {
+                tableRow = (TableRow) table.getChildAt(i);
+            } else {
+                tableRow = new TableRow(table.getContext());
+                table.addView(tableRow);
+            }
+            if (tableRow.getChildCount() > widgetItems.size()) {
+                for (int j = widgetItems.size(); j < tableRow.getChildCount(); j++) {
+                    tableRow.getChildAt(j).setVisibility(View.GONE);
+                }
+            } else {
+                for (int j = tableRow.getChildCount(); j < widgetItems.size(); j++) {
+                    WidgetCell widget = (WidgetCell) mLayoutInflater.inflate(
+                            R.layout.widget_cell, tableRow, false);
                     // set up touch.
                     widget.setOnClickListener(mIconClickListener);
                     widget.setOnLongClickListener(mIconLongClickListener);
-                    row.addView(widget);
+                    tableRow.addView(widget);
                 }
             }
-        } else if (expectedChildCount < childCount) {
-            for (int i = expectedChildCount; i < childCount; i++) {
-                row.getChildAt(i).setVisibility(View.GONE);
-            }
-        }
-
-        // Bind the view in the widget horizontal tray region.
-        for (int i = 0; i < infoList.size(); i++) {
-            LivePreviewWidgetCell widget = (LivePreviewWidgetCell) row.getChildAt(2 * i);
-            widget.reset();
-            widget.applyFromCellItem(infoList.get(i), mWidgetPreviewLoader);
-            widget.setApplyBitmapDeferred(mApplyBitmapDeferred);
-            widget.ensurePreview();
-            widget.setVisibility(View.VISIBLE);
-
-            if (i > 0) {
-                row.getChildAt(2 * i - 1).setVisibility(View.VISIBLE);
-            }
         }
     }
 
     @Override
     public void unbindViewHolder(WidgetsRowViewHolder holder) {
-        int total = holder.cellContainer.getChildCount();
-        for (int i = 0; i < total; i += 2) {
-            WidgetCell widget = (WidgetCell) holder.cellContainer.getChildAt(i);
-            widget.clear();
+        int numOfRows = holder.mTableContainer.getChildCount();
+        for (int i = 0; i < numOfRows; i++) {
+            TableRow tableRow = (TableRow) holder.mTableContainer.getChildAt(i);
+            int numOfCols = tableRow.getChildCount();
+            for (int j = 0; j < numOfCols; j++) {
+                WidgetCell widget = (WidgetCell) tableRow.getChildAt(j);
+                widget.clear();
+            }
         }
     }
 }
diff --git a/src/com/android/launcher3/widget/picker/WidgetsRowViewHolder.java b/src/com/android/launcher3/widget/picker/WidgetsRowViewHolder.java
index ae945846e1..aef1103c2c 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsRowViewHolder.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRowViewHolder.java
@@ -16,6 +16,7 @@
 package com.android.launcher3.widget.picker;
 
 import android.view.ViewGroup;
+import android.widget.TableLayout;
 
 import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 
@@ -24,11 +25,11 @@ import com.android.launcher3.R;
 /** A {@link ViewHolder} for showing widgets of an app in the full widget picker. */
 public final class WidgetsRowViewHolder extends ViewHolder {
 
-    public final ViewGroup cellContainer;
+    public final TableLayout mTableContainer;
 
     public WidgetsRowViewHolder(ViewGroup v) {
         super(v);
 
-        cellContainer = v.findViewById(R.id.widgets_cell_list);
+        mTableContainer = v.findViewById(R.id.widgets_table);
     }
 }
diff --git a/src/com/android/launcher3/widget/util/WidgetsTableUtils.java b/src/com/android/launcher3/widget/util/WidgetsTableUtils.java
new file mode 100644
index 0000000000..e73d661684
--- /dev/null
+++ b/src/com/android/launcher3/widget/util/WidgetsTableUtils.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget.util;
+
+import com.android.launcher3.model.WidgetItem;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/** An utility class which groups {@link WidgetItem}s into a table. */
+public final class WidgetsTableUtils {
+
+    /**
+     * Groups widgets in the following order:
+     * 1. Widgets always go before shortcuts.
+     * 2. Widgets with smaller horizontal spans will be shown first.
+     * 3. If widgets have the same horizontal spans, then widgets with a smaller vertical spans will
+     *    go first.
+     * 4. If both widgets have the same horizontal and vertical spans, they will use the same order
+     *    from the given {@code widgetItems}.
+     */
+    private static final Comparator<WidgetItem> WIDGET_SHORTCUT_COMPARATOR = (item, otherItem) -> {
+        if (item.widgetInfo != null && otherItem.widgetInfo == null) return -1;
+
+        if (item.widgetInfo == null && otherItem.widgetInfo != null) return 1;
+        if (item.spanX == otherItem.spanX) {
+            if (item.spanY == otherItem.spanY) return 0;
+            return item.spanY > otherItem.spanY ? 1 : -1;
+        }
+        return item.spanX > otherItem.spanX ? 1 : -1;
+    };
+
+
+    /**
+     * Groups widgets items into a 2D array which matches their appearance in a UI table.
+     *
+     * <p>Grouping:
+     * 1. Widgets and shortcuts never group together in the same row.
+     * 2. The ordered widgets are grouped together in the same row until their total horizontal
+     *    spans exceed the {@code maxSpansPerRow}.
+     * 3. The order shortcuts are grouped together in the same row until their total horizontal
+     *    spans exceed the {@code maxSpansPerRow}.
+     */
+    public static List<ArrayList<WidgetItem>> groupWidgetItemsIntoTable(
+            List<WidgetItem> widgetItems, final int maxSpansPerRow) {
+        List<WidgetItem> sortedWidgetItems = widgetItems.stream().sorted(WIDGET_SHORTCUT_COMPARATOR)
+                .collect(Collectors.toList());
+        List<ArrayList<WidgetItem>> widgetItemsTable = new ArrayList<>();
+        ArrayList<WidgetItem> widgetItemsAtRow = null;
+        for (WidgetItem widgetItem : sortedWidgetItems) {
+            if (widgetItemsAtRow == null) {
+                widgetItemsAtRow = new ArrayList<>();
+                widgetItemsTable.add(widgetItemsAtRow);
+            }
+            int numOfWidgetItems = widgetItemsAtRow.size();
+            int totalHorizontalSpan = widgetItemsAtRow.stream().map(item -> item.spanX)
+                    .reduce(/* default= */ 0, Integer::sum);
+            if (numOfWidgetItems == 0) {
+                widgetItemsAtRow.add(widgetItem);
+            } else if (widgetItem.spanX + totalHorizontalSpan <= maxSpansPerRow
+                    && widgetItem.hasSameType(widgetItemsAtRow.get(numOfWidgetItems - 1))) {
+                // Group items in the same row if
+                // 1. they are with the same type, i.e. a row can only have widgets or shortcuts but
+                //    never a mix of both.
+                // 2. the total number of horizontal spans are smaller than or equal to
+                //    MAX_SPAN_PER_ROW. If an item has a horizontal span > MAX_SPAN_PER_ROW, we just
+                //    place it in its own row regardless of the horizontal span limit.
+                widgetItemsAtRow.add(widgetItem);
+            } else {
+                widgetItemsAtRow = new ArrayList<>();
+                widgetItemsTable.add(widgetItemsAtRow);
+                widgetItemsAtRow.add(widgetItem);
+            }
+        }
+        return widgetItemsTable;
+    }
+}
diff --git a/tests/tapl/com/android/launcher3/tapl/Widgets.java b/tests/tapl/com/android/launcher3/tapl/Widgets.java
index f95abdb4b2..22f4d31bd5 100644
--- a/tests/tapl/com/android/launcher3/tapl/Widgets.java
+++ b/tests/tapl/com/android/launcher3/tapl/Widgets.java
@@ -27,7 +27,6 @@ import androidx.test.uiautomator.Direction;
 import androidx.test.uiautomator.UiObject2;
 import androidx.test.uiautomator.Until;
 
-import com.android.launcher3.tapl.LauncherInstrumentation.GestureScope;
 import com.android.launcher3.testing.TestProtocol;
 
 import java.util.Collection;
@@ -107,43 +106,25 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
                     fullWidgetsPicker.wait(Until.scrollable(true), WAIT_TIME_MS));
             final Point displaySize = mLauncher.getRealDisplaySize();
 
-            final UiObject2 widgetsContainer = findTestAppWidgetsScrollContainer();
+            final UiObject2 widgetsContainer = findTestAppWidgetsTableContainer();
             mLauncher.assertTrue("Can't locate widgets list for the test app: "
-                                    + mLauncher.getLauncherPackageName(),
+                            + mLauncher.getLauncherPackageName(),
                     widgetsContainer != null);
             final BySelector labelSelector = By.clazz("android.widget.TextView").text(labelText);
             int i = 0;
             for (; ; ) {
-                final Collection<UiObject2> cells = widgetsContainer.getChildren();
-                mLauncher.assertTrue("Widgets doesn't have 2 rows: ", cells.size() >= 2);
-                for (UiObject2 cell : cells) {
-                    final UiObject2 label = cell.findObject(labelSelector);
-                    // The logic below doesn't handle the case which a widget cell of the given
-                    // label is not yet visible on the horizontal scrolling container. This won't be
-                    // an issue once we get rid of the horizontal scrolling container.
-                    if (label == null) continue;
-
-                    final UiObject2 widget = cell;
-                    mLauncher.assertEquals(
-                            "View is not WidgetCell",
-                            "com.android.launcher3.widget.WidgetCell",
-                            widget.getClassName());
-
-                    int maxWidth = 0;
-                    for (UiObject2 sibling : widget.getParent().getChildren()) {
-                        maxWidth = Math.max(mLauncher.getVisibleBounds(sibling).width(), maxWidth);
-                    }
-
-                    if (mLauncher.getVisibleBounds(widget).bottom
-                            <= displaySize.y - mLauncher.getBottomGestureSize()) {
-                        int visibleDelta = maxWidth - mLauncher.getVisibleBounds(widget).width();
-                        if (visibleDelta > 0) {
-                            Rect parentBounds = mLauncher.getVisibleBounds(cell.getParent());
-                            mLauncher.linearGesture(parentBounds.centerX() + visibleDelta
-                                            + mLauncher.getTouchSlop(),
-                                    parentBounds.centerY(), parentBounds.centerX(),
-                                    parentBounds.centerY(), 10, true, GestureScope.INSIDE);
+                final Collection<UiObject2> tableRows = widgetsContainer.getChildren();
+                for (UiObject2 row : tableRows) {
+                    final Collection<UiObject2> widgetCells = row.getChildren();
+                    for (UiObject2 widget : widgetCells) {
+                        final UiObject2 label = widget.findObject(labelSelector);
+                        if (label == null) {
+                            continue;
                         }
+                        mLauncher.assertEquals(
+                                "View is not WidgetCell",
+                                "com.android.launcher3.widget.WidgetCell",
+                                widget.getClassName());
 
                         return new Widget(mLauncher, widget);
                     }
@@ -151,7 +132,7 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
 
                 mLauncher.assertTrue("Too many attempts", ++i <= 40);
                 final int scroll = getWidgetsScroll();
-                mLauncher.scrollToLastVisibleRow(widgetsContainer, cells, 0);
+                mLauncher.scrollToLastVisibleRow(fullWidgetsPicker, tableRows, 0);
                 final int newScroll = getWidgetsScroll();
                 mLauncher.assertTrue(
                         "Scrolled in a wrong direction in Widgets: from " + scroll + " to "
@@ -162,13 +143,13 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
     }
 
     /** Finds the widgets list of this test app from the collapsed full widgets picker. */
-    private UiObject2 findTestAppWidgetsScrollContainer() {
+    private UiObject2 findTestAppWidgetsTableContainer() {
         final BySelector headerSelector = By.res(mLauncher.getLauncherPackageName(),
                 "widgets_list_header");
         final BySelector targetAppSelector = By.clazz("android.widget.TextView").text(
                 mLauncher.getContext().getPackageName());
         final BySelector widgetsContainerSelector = By.res(mLauncher.getLauncherPackageName(),
-                "widgets_cell_list");
+                "widgets_table");
 
         boolean hasHeaderExpanded = false;
         for (int i = 0; i < 40; i++) {
@@ -196,14 +177,12 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
                 // Look for a widgets list.
                 UiObject2 widgetsContainer = fullWidgetsPicker.findObject(widgetsContainerSelector);
                 if (widgetsContainer != null) {
-                    // Make sure the widgets list is fully visible on the screen.
-                    mLauncher.scrollToLastVisibleRow(fullWidgetsPicker,
-                            widgetsContainer.getChildren(), 0);
                     return widgetsContainer;
                 }
                 mLauncher.scrollToLastVisibleRow(fullWidgetsPicker, List.of(headerTitle), 0);
             } else {
-                mLauncher.scrollToLastVisibleRow(fullWidgetsPicker, header.getChildren(), 0);
+                mLauncher.scrollToLastVisibleRow(fullWidgetsPicker, fullWidgetsPicker.getChildren(),
+                        0);
             }
         }
 
-- 
GitLab


From b2526feb244e7eac583795439705c35da864c3c8 Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pbdr@google.com>
Date: Wed, 3 Feb 2021 22:02:43 +0000
Subject: [PATCH 0559/1664] Launcher changes for go/widget-size-specification

Makes sure the launcher:

1 - Send the list of actual sizes the widget in all situations.
2 - Gives the current size to the framework on inflation.

Also needed to guard the new border changes introduced in
http://ag/13532637 with the corresponding flag.

Change-Id: I2a33e9501b921f2fc393684e8ce91ee077626bf7
Test: By hand using a local widget.
Bug: 179025145
---
 .../launcher3/AppWidgetResizeFrame.java       | 113 ++++++++++++++----
 .../LauncherAccessibilityDelegate.java        |   6 +-
 .../launcher3/qsb/QsbContainerView.java       |  13 +-
 .../widget/LauncherAppWidgetHostView.java     |  15 ++-
 .../widget/PendingAppWidgetHostView.java      |   8 ++
 .../widget/WidgetHostViewLoader.java          |  33 +++--
 6 files changed, 147 insertions(+), 41 deletions(-)

diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java
index 1330ed4edd..be92c5d133 100644
--- a/src/com/android/launcher3/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher3/AppWidgetResizeFrame.java
@@ -2,6 +2,8 @@ package com.android.launcher3;
 
 import static com.android.launcher3.LauncherAnimUtils.LAYOUT_HEIGHT;
 import static com.android.launcher3.LauncherAnimUtils.LAYOUT_WIDTH;
+import static com.android.launcher3.Utilities.ATLEAST_S;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_FOUR_COLUMNS;
 import static com.android.launcher3.views.BaseDragLayer.LAYOUT_X;
 import static com.android.launcher3.views.BaseDragLayer.LAYOUT_Y;
 
@@ -11,14 +13,19 @@ import android.animation.PropertyValuesHolder;
 import android.appwidget.AppWidgetHostView;
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
+import android.content.res.Configuration;
 import android.graphics.Point;
+import android.graphics.PointF;
 import android.graphics.Rect;
+import android.os.Bundle;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.accessibility.DragViewStateAnnouncer;
 import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.util.FocusLogic;
@@ -352,33 +359,99 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
     }
 
     public static void updateWidgetSizeRanges(AppWidgetHostView widgetView, Launcher launcher,
-            int spanX, int spanY) {
-        getWidgetSizeRanges(launcher, spanX, spanY, sTmpRect);
-        widgetView.updateAppWidgetSize(null, sTmpRect.left, sTmpRect.top,
-                sTmpRect.right, sTmpRect.bottom);
+                                              int spanX, int spanY) {
+        List<PointF> sizes = getWidgetSizes(launcher, spanX, spanY);
+        if (ATLEAST_S) {
+            widgetView.updateAppWidgetSize(new Bundle(), sizes);
+        } else {
+            Rect bounds = getMinMaxSizes(sizes, null /* outRect */);
+            widgetView.updateAppWidgetSize(new Bundle(), bounds.left, bounds.top, bounds.right,
+                    bounds.bottom);
+        }
     }
 
-    public static Rect getWidgetSizeRanges(Context context, int spanX, int spanY, Rect rect) {
-        if (rect == null) {
-            rect = new Rect();
-        }
+    private static PointF getWidgetSize(Context context, Point cellSize, int spanX, int spanY) {
         final float density = context.getResources().getDisplayMetrics().density;
+        float hBorderSpacing = 0;
+        float vBorderSpacing = 0;
+        if (ENABLE_FOUR_COLUMNS.get()) {
+            final int borderSpacing = context.getResources()
+                    .getDimensionPixelSize(R.dimen.dynamic_grid_cell_border_spacing);
+            hBorderSpacing = (spanX - 1) * borderSpacing;
+            vBorderSpacing = (spanY - 1) * borderSpacing;
+        }
+        PointF widgetSize = new PointF();
+        widgetSize.x = ((spanX * cellSize.x) + hBorderSpacing) / density;
+        widgetSize.y = ((spanY * cellSize.y) + vBorderSpacing) / density;
+        return widgetSize;
+    }
+
+    /** Returns the actual widget size given its span. */
+    public static PointF getWidgetSize(Context context, int spanX, int spanY) {
+        final Point[] cellSize = CELL_SIZE.get(context);
+        if (isLandscape(context)) {
+            return getWidgetSize(context, cellSize[0], spanX, spanY);
+        }
+        return getWidgetSize(context, cellSize[1], spanX, spanY);
+    }
+
+    /** Returns true if the screen is in landscape mode. */
+    private static boolean isLandscape(Context context) {
+        return context.getResources().getConfiguration().orientation
+                == Configuration.ORIENTATION_LANDSCAPE;
+    }
+
+    /** Returns the list of sizes for a widget of given span, in dp. */
+    public static ArrayList<PointF> getWidgetSizes(Context context, int spanX, int spanY) {
         final Point[] cellSize = CELL_SIZE.get(context);
 
-        final int borderSpacing = context.getResources()
-                .getDimensionPixelSize(R.dimen.dynamic_grid_cell_border_spacing);
-        final float hBorderSpacing = (spanX - 1) * borderSpacing;
-        final float vBorderSpacing = (spanY - 1) * borderSpacing;
+        PointF landSize = getWidgetSize(context, cellSize[0], spanX, spanY);
+        PointF portSize = getWidgetSize(context, cellSize[1], spanX, spanY);
+
+        ArrayList<PointF> sizes = new ArrayList<>(2);
+        sizes.add(landSize);
+        sizes.add(portSize);
+        return sizes;
+    }
 
-        // Compute landscape size
-        int landWidth = (int) (((spanX * cellSize[0].x) + hBorderSpacing) / density);
-        int landHeight = (int) (((spanY * cellSize[0].y) + vBorderSpacing) / density);
+    /**
+     * Returns the min and max widths and heights given a list of sizes, in dp.
+     *
+     * @param sizes List of sizes to get the min/max from.
+     * @param outRect Rectangle in which the result can be stored, to avoid extra allocations. If
+     *               null, a new rectangle will be allocated.
+     * @return A rectangle with the left (resp. top) is used for the min width (resp. height) and
+     * the right (resp. bottom) for the max. The returned rectangle is set with 0s if the list is
+     * empty.
+     */
+    public static Rect getMinMaxSizes(List<PointF> sizes, @Nullable Rect outRect) {
+        if (outRect == null) {
+            outRect = new Rect();
+        }
+        if (sizes.isEmpty()) {
+            outRect.set(0, 0, 0, 0);
+        } else {
+            PointF first = sizes.get(0);
+            outRect.set((int) first.x, (int) first.y, (int) first.x, (int) first.y);
+            for (int i = 1; i < sizes.size(); i++) {
+                outRect.union((int) sizes.get(i).x, (int) sizes.get(i).y);
+            }
+        }
+        return outRect;
+    }
 
-        // Compute portrait size
-        int portWidth = (int) (((spanX * cellSize[1].x) + hBorderSpacing) / density);
-        int portHeight = (int) (((spanY * cellSize[1].y) + vBorderSpacing) / density);
-        rect.set(portWidth, landHeight, landWidth, portHeight);
-        return rect;
+    /**
+     * Returns the range of sizes a widget may be displayed, given its span.
+     *
+     * @param context Context in which the View is rendered.
+     * @param spanX Width of the widget, in cells.
+     * @param spanY Height of the widget, in cells.
+     * @param outRect Rectangle in which the result can be stored, to avoid extra allocations. If
+     *               null, a new rectangle will be allocated.
+     */
+    public static Rect getWidgetSizeRanges(Context context, int spanX, int spanY,
+            @Nullable Rect outRect) {
+        return getMinMaxSizes(getWidgetSizes(context, spanX, spanY), outRect);
     }
 
     @Override
diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
index cd4616a967..db7fd3feca 100644
--- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
+++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
@@ -357,10 +357,8 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
         }
 
         layout.markCellsAsOccupiedForView(host);
-        Rect sizeRange = new Rect();
-        AppWidgetResizeFrame.getWidgetSizeRanges(mLauncher, info.spanX, info.spanY, sizeRange);
-        ((LauncherAppWidgetHostView) host).updateAppWidgetSize(null,
-                sizeRange.left, sizeRange.top, sizeRange.right, sizeRange.bottom);
+        AppWidgetResizeFrame.updateWidgetSizeRanges(((LauncherAppWidgetHostView) host), mLauncher,
+                info.spanX, info.spanY);
         host.requestLayout();
         mLauncher.getModelWriter().updateItemInDatabase(info);
         announceConfirmation(mLauncher.getString(R.string.widget_resized, info.spanX, info.spanY));
diff --git a/src/com/android/launcher3/qsb/QsbContainerView.java b/src/com/android/launcher3/qsb/QsbContainerView.java
index 289e0d84c0..459aefe2c0 100644
--- a/src/com/android/launcher3/qsb/QsbContainerView.java
+++ b/src/com/android/launcher3/qsb/QsbContainerView.java
@@ -20,6 +20,8 @@ import static android.appwidget.AppWidgetManager.ACTION_APPWIDGET_BIND;
 import static android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID;
 import static android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_PROVIDER;
 
+import static com.android.launcher3.Utilities.ATLEAST_S;
+
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.SearchManager;
@@ -30,6 +32,7 @@ import android.appwidget.AppWidgetProviderInfo;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.PointF;
 import android.graphics.Rect;
 import android.os.Bundle;
 import android.provider.Settings;
@@ -50,6 +53,8 @@ import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.graphics.FragmentWithPreview;
 
+import java.util.ArrayList;
+
 /**
  * A frame layout which contains a QSB. This internally uses fragment to bind the view, which
  * allows it to contain the logic for {@link Fragment#startActivityForResult(Intent, int)}.
@@ -294,12 +299,16 @@ public class QsbContainerView extends FrameLayout {
             InvariantDeviceProfile idp = LauncherAppState.getIDP(getContext());
 
             Bundle opts = new Bundle();
-            Rect size = AppWidgetResizeFrame.getWidgetSizeRanges(getContext(),
-                    idp.numColumns, 1, null);
+            ArrayList<PointF> sizes = AppWidgetResizeFrame
+                    .getWidgetSizes(getContext(), idp.numColumns, 1);
+            Rect size = AppWidgetResizeFrame.getMinMaxSizes(sizes, null /* outRect */);
             opts.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH, size.left);
             opts.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT, size.top);
             opts.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH, size.right);
             opts.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT, size.bottom);
+            if (ATLEAST_S) {
+                opts.putParcelableArrayList(AppWidgetManager.OPTION_APPWIDGET_SIZES, sizes);
+            }
             return opts;
         }
 
diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
index 780a1a18bd..41098f9f1c 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
@@ -16,9 +16,12 @@
 
 package com.android.launcher3.widget;
 
+import static com.android.launcher3.Utilities.ATLEAST_S;
+
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
 import android.content.res.Configuration;
+import android.graphics.PointF;
 import android.os.Handler;
 import android.os.SystemClock;
 import android.util.SparseBooleanArray;
@@ -70,8 +73,6 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
     private boolean mIsAutoAdvanceRegistered;
     private Runnable mAutoAdvanceRunnable;
 
-
-
     public LauncherAppWidgetHostView(Context context) {
         super(context);
         mLauncher = Launcher.getLauncher(context);
@@ -218,6 +219,16 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         mIsScrollable = checkScrollableRecursively(this);
     }
 
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        super.onSizeChanged(w, h, oldw, oldh);
+
+        if (ATLEAST_S) {
+            float density = getContext().getResources().getDisplayMetrics().density;
+            setCurrentSize(new PointF(w / density, h / density));
+        }
+    }
+
     @Override
     public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
         super.onInitializeAccessibilityNodeInfo(info);
diff --git a/src/com/android/launcher3/widget/PendingAppWidgetHostView.java b/src/com/android/launcher3/widget/PendingAppWidgetHostView.java
index ca47728020..8c3206dea8 100644
--- a/src/com/android/launcher3/widget/PendingAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/PendingAppWidgetHostView.java
@@ -22,6 +22,7 @@ import static com.android.launcher3.graphics.PreloadIconDrawable.newPendingIcon;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.PointF;
 import android.graphics.PorterDuff;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
@@ -46,6 +47,8 @@ import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.touch.ItemClickHandler;
 import com.android.launcher3.util.Themes;
 
+import java.util.List;
+
 public class PendingAppWidgetHostView extends LauncherAppWidgetHostView
         implements OnClickListener, ItemInfoUpdateReceiver {
     private static final float SETUP_ICON_SIZE_FACTOR = 2f / 5;
@@ -108,6 +111,11 @@ public class PendingAppWidgetHostView extends LauncherAppWidgetHostView
         // No-op
     }
 
+    @Override
+    public void updateAppWidgetSize(Bundle newOptions, List<PointF> sizes) {
+        // No-op
+    }
+
     @Override
     protected View getDefaultView() {
         View defaultView = mInflater.inflate(R.layout.appwidget_not_ready, this, false);
diff --git a/src/com/android/launcher3/widget/WidgetHostViewLoader.java b/src/com/android/launcher3/widget/WidgetHostViewLoader.java
index c022374614..2438bdf5ab 100644
--- a/src/com/android/launcher3/widget/WidgetHostViewLoader.java
+++ b/src/com/android/launcher3/widget/WidgetHostViewLoader.java
@@ -3,6 +3,7 @@ package com.android.launcher3.widget;
 import android.appwidget.AppWidgetHostView;
 import android.appwidget.AppWidgetManager;
 import android.content.Context;
+import android.graphics.PointF;
 import android.graphics.Rect;
 import android.os.Bundle;
 import android.os.Handler;
@@ -18,6 +19,8 @@ import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.util.Thunk;
 
+import java.util.ArrayList;
+
 public class WidgetHostViewLoader implements DragController.DragListener {
     private static final String TAG = "WidgetHostViewLoader";
     private static final boolean LOGD = false;
@@ -152,24 +155,28 @@ public class WidgetHostViewLoader implements DragController.DragListener {
     }
 
     public static Bundle getDefaultOptionsForWidget(Context context, PendingAddWidgetInfo info) {
-        Rect rect = new Rect();
-        AppWidgetResizeFrame.getWidgetSizeRanges(context, info.spanX, info.spanY, rect);
+        ArrayList<PointF> sizes = AppWidgetResizeFrame
+                .getWidgetSizes(context, info.spanX, info.spanY);
+
         Rect padding = AppWidgetHostView.getDefaultPaddingForWidget(context,
                 info.componentName, null);
-
         float density = context.getResources().getDisplayMetrics().density;
-        int xPaddingDips = (int) ((padding.left + padding.right) / density);
-        int yPaddingDips = (int) ((padding.top + padding.bottom) / density);
+        float xPaddingDips = (padding.left + padding.right) / density;
+        float yPaddingDips = (padding.top + padding.bottom) / density;
+
+        for (PointF size : sizes) {
+            size.x = Math.max(0.f, size.x - xPaddingDips);
+            size.y = Math.max(0.f, size.y - yPaddingDips);
+        }
+
+        Rect rect = AppWidgetResizeFrame.getMinMaxSizes(sizes, null /* outRect */);
 
         Bundle options = new Bundle();
-        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH,
-                rect.left - xPaddingDips);
-        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT,
-                rect.top - yPaddingDips);
-        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH,
-                rect.right - xPaddingDips);
-        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT,
-                rect.bottom - yPaddingDips);
+        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH, rect.left);
+        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT, rect.top);
+        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH, rect.right);
+        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT, rect.bottom);
+        options.putParcelableArrayList(AppWidgetManager.OPTION_APPWIDGET_SIZES, sizes);
         return options;
     }
 }
-- 
GitLab


From fdeee141d926f578b2878861dd0635ef073316bd Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 24 Feb 2021 10:16:54 +0000
Subject: [PATCH 0560/1664] Replace the no preview layout check with
 Resources.ID_NULL(0)

TODO: open up the RemoteViews(ApplicationInfo) API so that Launcher
      can inflate a layout from a work profile app.

Test: Before this CL, install tasks app in work profile. Observed
      crash when tapping Tasks header in the widgets picker.
      After this CL, no crash observed when tapping Tasks header in
      the widgets picker.

Bug: 181061277
Change-Id: I16c2b9aec5f4cabf15da35fea09f68c10797f5fa
---
 .../launcher3/dragndrop/LivePreviewWidgetCell.java        | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/dragndrop/LivePreviewWidgetCell.java b/src/com/android/launcher3/dragndrop/LivePreviewWidgetCell.java
index 71e10a82b0..be6a07f004 100644
--- a/src/com/android/launcher3/dragndrop/LivePreviewWidgetCell.java
+++ b/src/com/android/launcher3/dragndrop/LivePreviewWidgetCell.java
@@ -1,6 +1,9 @@
 package com.android.launcher3.dragndrop;
 
+import static com.android.launcher3.Utilities.ATLEAST_S;
+
 import android.content.Context;
+import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.util.AttributeSet;
 import android.view.View;
@@ -62,9 +65,10 @@ public class LivePreviewWidgetCell extends WidgetCell {
 
     @Override
     public void applyFromCellItem(WidgetItem item, WidgetPreviewLoader loader) {
-        if (mPreview == null
+        if (ATLEAST_S
+                && mPreview == null
                 && item.widgetInfo != null
-                && item.widgetInfo.previewLayout != View.NO_ID) {
+                && item.widgetInfo.previewLayout != Resources.ID_NULL) {
             mPreview = new RemoteViews(item.widgetInfo.provider.getPackageName(),
                     item.widgetInfo.previewLayout);
         }
-- 
GitLab


From 8e16391b49794da98c8e9a215de4778d44a959db Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Tue, 23 Feb 2021 19:12:05 -0800
Subject: [PATCH 0561/1664] [AA+] Log
 LAUNCHER_ALLAPPS_FOCUSED_ITEM_SELECTED_WITH_IME event.

Bug: 178562918
Test: Manual
Change-Id: Id40f80aae652dcc6c16ad35a003c91fd97750608
---
 .../launcher3/allapps/search/AllAppsSearchBarController.java  | 4 ++++
 src/com/android/launcher3/logging/StatsLogManager.java        | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
index 198c4b2bfb..cf2e2595c4 100644
--- a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
+++ b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
@@ -15,6 +15,8 @@
  */
 package com.android.launcher3.allapps.search;
 
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_FOCUSED_ITEM_SELECTED_WITH_IME;
+
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -105,6 +107,8 @@ public class AllAppsSearchBarController
     public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
         if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
             if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_GO) {
+                mLauncher.getStatsLogManager().logger()
+                        .log(LAUNCHER_ALLAPPS_FOCUSED_ITEM_SELECTED_WITH_IME);
                 // selectFocusedView should return SearchTargetEvent that is passed onto onClick
                 if (Launcher.getLauncher(mLauncher).getAppsView().selectFocusedView(v)) {
                     return true;
diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index 7745e90d8a..431d5342d3 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -393,6 +393,9 @@ public class StatsLogManager implements ResourceBasedOverride {
         @UiEvent(doc = "User selected from a selection row of Slice.")
         LAUNCHER_SLICE_SELECTION_ACTION(707),
 
+        @UiEvent(doc = "IME is used for selecting the focused item on the AllApps screen.")
+        LAUNCHER_ALLAPPS_FOCUSED_ITEM_SELECTED_WITH_IME(718),
+
         @UiEvent(doc = "Launcher entered into AllApps state with device search enabled.")
         LAUNCHER_ALLAPPS_ENTRY_WITH_DEVICE_SEARCH(720),
         ;
-- 
GitLab


From 331140f665e5bfc63ef8db6122b25eac899fd185 Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Tue, 16 Feb 2021 13:43:36 +0000
Subject: [PATCH 0562/1664] Refactor SearchAlgorithm and SearchCallback
 interface to work on generic search result type.

Test: Manually tested that 'All apps' search works fine
Bug: b/157286785
Change-Id: Id4b7fb133149e9211f871b46b47d5853ec0e0050
---
 .../search/AllAppsSearchBarController.java    | 49 +++++--------------
 .../search/AppsSearchContainerLayout.java     |  3 +-
 .../search/DefaultAppSearchAlgorithm.java     |  7 ++-
 .../{allapps => }/search/SearchAlgorithm.java | 10 ++--
 .../launcher3/search/SearchCallback.java      | 46 +++++++++++++++++
 5 files changed, 70 insertions(+), 45 deletions(-)
 rename src/com/android/launcher3/{allapps => }/search/SearchAlgorithm.java (76%)
 create mode 100644 src/com/android/launcher3/search/SearchCallback.java

diff --git a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
index 198c4b2bfb..dfa8fa49bb 100644
--- a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
+++ b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
@@ -31,10 +31,10 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItem;
 import com.android.launcher3.config.FeatureFlags;
+import com.android.launcher3.search.SearchAlgorithm;
+import com.android.launcher3.search.SearchCallback;
 import com.android.launcher3.util.PackageManagerHelper;
 
-import java.util.ArrayList;
-
 /**
  * An interface to a search box that AllApps can command.
  */
@@ -43,11 +43,11 @@ public class AllAppsSearchBarController
         OnFocusChangeListener {
 
     protected BaseDraggingActivity mLauncher;
-    protected Callbacks mCb;
+    protected SearchCallback<AdapterItem> mCallback;
     protected ExtendedEditText mInput;
     protected String mQuery;
 
-    protected SearchAlgorithm mSearchAlgorithm;
+    protected SearchAlgorithm<AdapterItem> mSearchAlgorithm;
 
     public void setVisibility(int visibility) {
         mInput.setVisibility(visibility);
@@ -57,9 +57,9 @@ public class AllAppsSearchBarController
      * Sets the references to the apps model and the search result callback.
      */
     public final void initialize(
-            SearchAlgorithm searchAlgorithm, ExtendedEditText input,
-            BaseDraggingActivity launcher, Callbacks cb) {
-        mCb = cb;
+            SearchAlgorithm<AdapterItem> searchAlgorithm, ExtendedEditText input,
+            BaseDraggingActivity launcher, SearchCallback<AdapterItem> callback) {
+        mCallback = callback;
         mLauncher = launcher;
 
         mInput = input;
@@ -85,10 +85,10 @@ public class AllAppsSearchBarController
         mQuery = s.toString();
         if (mQuery.isEmpty()) {
             mSearchAlgorithm.cancel(true);
-            mCb.clearSearchResult();
+            mCallback.clearSearchResult();
         } else {
             mSearchAlgorithm.cancel(false);
-            mSearchAlgorithm.doSearch(mQuery, mCb);
+            mSearchAlgorithm.doSearch(mQuery, mCallback);
         }
     }
 
@@ -98,7 +98,7 @@ public class AllAppsSearchBarController
         }
         // If play store continues auto updating an app, we want to show partial result.
         mSearchAlgorithm.cancel(false);
-        mSearchAlgorithm.doSearch(mQuery, mCb);
+        mSearchAlgorithm.doSearch(mQuery, mCallback);
     }
 
     @Override
@@ -149,7 +149,7 @@ public class AllAppsSearchBarController
      * Resets the search bar state.
      */
     public void reset() {
-        mCb.clearSearchResult();
+        mCallback.clearSearchResult();
         mInput.reset();
         mQuery = null;
     }
@@ -167,31 +167,4 @@ public class AllAppsSearchBarController
     public boolean isSearchFieldFocused() {
         return mInput.isFocused();
     }
-
-    /**
-     * Callback for getting search results.
-     */
-    public interface Callbacks {
-
-        /**
-         * Called when the search from primary source is complete.
-         *
-         * @param items sorted list of search result adapter items
-         */
-        void onSearchResult(String query, ArrayList<AdapterItem> items);
-
-        /**
-         * Called when the search from secondary source is complete.
-         *
-         * @param items sorted list of search result adapter items
-         */
-        void onAppendSearchResult(String query, ArrayList<AdapterItem> items);
-
-        /**
-         * Called when the search results should be cleared.
-         */
-        void clearSearchResult();
-    }
-
-
 }
\ No newline at end of file
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
index aef32d7a28..426fd0cd83 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
@@ -47,6 +47,7 @@ import com.android.launcher3.allapps.AlphabeticalAppsList;
 import com.android.launcher3.allapps.SearchUiManager;
 import com.android.launcher3.anim.PropertySetter;
 import com.android.launcher3.config.FeatureFlags;
+import com.android.launcher3.search.SearchCallback;
 
 import java.util.ArrayList;
 
@@ -54,7 +55,7 @@ import java.util.ArrayList;
  * Layout to contain the All-apps search UI.
  */
 public class AppsSearchContainerLayout extends ExtendedEditText
-        implements SearchUiManager, AllAppsSearchBarController.Callbacks,
+        implements SearchUiManager, SearchCallback<AdapterItem>,
         AllAppsStore.OnUpdateListener, Insettable {
 
     private final BaseDraggingActivity mLauncher;
diff --git a/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java b/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java
index 66bbd2e75d..4e213b0a1b 100644
--- a/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java
+++ b/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java
@@ -19,14 +19,17 @@ import android.content.Context;
 import android.os.Handler;
 
 import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItem;
 import com.android.launcher3.model.data.AppInfo;
+import com.android.launcher3.search.SearchAlgorithm;
+import com.android.launcher3.search.SearchCallback;
 
 import java.text.Collator;
 
 /**
  * The default search implementation.
  */
-public class DefaultAppSearchAlgorithm implements SearchAlgorithm {
+public class DefaultAppSearchAlgorithm implements SearchAlgorithm<AdapterItem> {
 
     protected final Handler mResultHandler;
     private final AppsSearchPipeline mAppsSearchPipeline;
@@ -45,7 +48,7 @@ public class DefaultAppSearchAlgorithm implements SearchAlgorithm {
 
     @Override
     public void doSearch(final String query,
-            final AllAppsSearchBarController.Callbacks callback) {
+            final SearchCallback<AdapterItem> callback) {
         mAppsSearchPipeline.query(query,
                 results -> mResultHandler.post(
                         () -> callback.onSearchResult(query, results)),
diff --git a/src/com/android/launcher3/allapps/search/SearchAlgorithm.java b/src/com/android/launcher3/search/SearchAlgorithm.java
similarity index 76%
rename from src/com/android/launcher3/allapps/search/SearchAlgorithm.java
rename to src/com/android/launcher3/search/SearchAlgorithm.java
index c409b1ce85..1665354af2 100644
--- a/src/com/android/launcher3/allapps/search/SearchAlgorithm.java
+++ b/src/com/android/launcher3/search/SearchAlgorithm.java
@@ -13,17 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.launcher3.allapps.search;
+package com.android.launcher3.search;
 
 /**
  * An interface for handling search.
+ *
+ * @param <T> Search Result type
  */
-public interface SearchAlgorithm {
+public interface SearchAlgorithm<T> {
 
     /**
-     * Performs search and sends the result to the callback.
+     * Performs search and sends the result to {@link SearchCallback}.
      */
-    void doSearch(String query, AllAppsSearchBarController.Callbacks callback);
+    void doSearch(String query, SearchCallback<T> callback);
 
     /**
      * Cancels any active request.
diff --git a/src/com/android/launcher3/search/SearchCallback.java b/src/com/android/launcher3/search/SearchCallback.java
new file mode 100644
index 0000000000..5796116963
--- /dev/null
+++ b/src/com/android/launcher3/search/SearchCallback.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.search;
+
+import java.util.ArrayList;
+
+/**
+ * An interface for receiving search results.
+ *
+ * @param <T> Search Result type
+ */
+public interface SearchCallback<T> {
+
+    /**
+     * Called when the search from primary source is complete.
+     *
+     * @param items list of search results
+     */
+    void onSearchResult(String query, ArrayList<T> items);
+
+    /**
+     * Called when the search from secondary source is complete.
+     *
+     * @param items list of search results
+     */
+    void onAppendSearchResult(String query, ArrayList<T> items);
+
+    /**
+     * Called when the search results should be cleared.
+     */
+    void clearSearchResult();
+}
+
-- 
GitLab


From 0779f740498aec5a49359d1af61f13ede6450e7b Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Thu, 25 Feb 2021 20:06:08 +0000
Subject: [PATCH 0563/1664] Revert "Changes ENABLE_SMARTSPACE_ENHANCED to be a
 DeviceFlag."

This reverts commit f480a87423e495f126c9c98b2e5884e82806ef44.

Reason for revert: Broke tests

Change-Id: I508e1db58b7973a60e350aa679b9b6f5fe4ecbd1
---
 src/com/android/launcher3/config/FeatureFlags.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 3d5920abc5..556aff61c3 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -161,7 +161,7 @@ public final class FeatureFlags {
             "ENABLE_SMARTSPACE_UNIVERSAL", false,
             "Replace Smartspace with a version rendered by System UI.");
 
-    public static final BooleanFlag ENABLE_SMARTSPACE_ENHANCED = new DeviceFlag(
+    public static final BooleanFlag ENABLE_SMARTSPACE_ENHANCED = getDebugFlag(
             "ENABLE_SMARTSPACE_ENHANCED", false,
             "Replace Smartspace with the enhanced version. "
               + "Ignored if ENABLE_SMARTSPACE_UNIVERSAL is enabled.");
-- 
GitLab


From e126d72fa8602e31fbb87d4b6e5d5ccac34a32d0 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Thu, 25 Feb 2021 10:45:20 -0500
Subject: [PATCH 0564/1664] More grid changes, closer to final specs.

* Added isScalable, minCellWidth, minCellHeight, and borderSpacing attrs

When isScalable is true, we use set workspace cell values to
minCellWidth/minCellHeight and then scale the cell values to
fit the available space. This allows us to have consistent
aspect ratios when two devices match the display/grid options.

This is different from the dynamic grid, which calculates
cell values based on iconSize/textSize/etc and then allows
the cell width to be as wide as space allows.

I adjusted some variables so that they will auto adjust
based on another value, indepenent from whether the
grid isScalable or not. An example of this is the folder
label text, where it's always set to be 1.14x of whatever
the workspace icon text size is. This is so we don't need
to add a bunch of more variables to DisplayOption/GridOption.

Bug: 175329686
Test: - switching between device profiles,
      - testing folder open/close
      - testing in multiwindow
      - testing in landscape
Change-Id: Ia469ae0d65b518469ef264b726db46f4a3210056
---
 res/layout/folder_application.xml             |   3 +-
 res/layout/user_folder_icon_normalized.xml    |  10 +-
 res/values/attrs.xml                          |   8 +
 res/values/config.xml                         |   2 +-
 res/values/dimens.xml                         |  16 +-
 .../launcher3/AppWidgetResizeFrame.java       |  33 ++--
 src/com/android/launcher3/BubbleTextView.java |   3 +-
 src/com/android/launcher3/DeviceProfile.java  | 144 ++++++++++++------
 .../launcher3/InvariantDeviceProfile.java     |  43 ++++++
 src/com/android/launcher3/ResourceUtils.java  |   8 +-
 src/com/android/launcher3/folder/Folder.java  |  13 +-
 .../folder/FolderAnimationManager.java        |   4 +-
 12 files changed, 203 insertions(+), 84 deletions(-)

diff --git a/res/layout/folder_application.xml b/res/layout/folder_application.xml
index 32a5419b8e..1cdee08c25 100644
--- a/res/layout/folder_application.xml
+++ b/res/layout/folder_application.xml
@@ -21,4 +21,5 @@
     android:textColor="?attr/folderTextColor"
     android:includeFontPadding="false"
     android:hapticFeedbackEnabled="false"
-    launcher:iconDisplay="folder" />
+    launcher:iconDisplay="folder"
+    launcher:centerVertically="true" />
diff --git a/res/layout/user_folder_icon_normalized.xml b/res/layout/user_folder_icon_normalized.xml
index c230dadd8f..d38a77a623 100644
--- a/res/layout/user_folder_icon_normalized.xml
+++ b/res/layout/user_folder_icon_normalized.xml
@@ -27,15 +27,12 @@
         android:clipToPadding="false"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:paddingTop="16dp"
         launcher:pageIndicator="@+id/folder_page_indicator" />
 
     <LinearLayout
         android:id="@+id/folder_footer"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="48dp"
         android:clipChildren="false"
         android:orientation="horizontal"
         android:paddingLeft="12dp"
@@ -53,13 +50,10 @@
             android:gravity="center_horizontal"
             android:hint="@string/folder_hint_text"
             android:imeOptions="flagNoExtractUi"
-            android:paddingBottom="@dimen/folder_label_padding_bottom"
-            android:paddingTop="@dimen/folder_label_padding_top"
             android:singleLine="true"
             android:textColor="?attr/folderTextColor"
             android:textColorHighlight="?android:attr/colorControlHighlight"
-            android:textColorHint="?attr/folderHintColor"
-            android:textSize="@dimen/folder_label_text_size" />
+            android:textColorHint="?attr/folderHintColor"/>
 
         <com.android.launcher3.pageindicators.PageIndicatorDots
             android:id="@+id/folder_page_indicator"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 587df6d438..4078ef4092 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -133,6 +133,8 @@
         <attr name="numAllAppsColumns" format="integer" />
         <attr name="defaultLayoutId" format="reference" />
         <attr name="demoModeLayoutId" format="reference" />
+        <attr name="isScalable" format="boolean" />
+
     </declare-styleable>
 
     <declare-styleable name="DevicePadding">
@@ -150,6 +152,12 @@
         <attr name="minWidthDps" format="float" />
         <attr name="minHeightDps" format="float" />
 
+        <!-- These min cell values are only used if GridDisplayOption#isScalable is true-->
+        <attr name="minCellHeightDps" format="float" />
+        <attr name="minCellWidthDps" format="float" />
+
+        <attr name="borderSpacingDps" format="float" />
+
         <attr name="iconImageSize" format="float" />
         <!-- landscapeIconSize defaults to iconSize, if not specified -->
         <attr name="landscapeIconSize" format="float" />
diff --git a/res/values/config.xml b/res/values/config.xml
index 41d1a12059..89415b89a3 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -24,7 +24,7 @@
 
     <!-- AllApps & Launcher transitions -->
     <!-- Out of 100, the percent to shrink the workspace during spring loaded mode. -->
-    <integer name="config_workspaceSpringLoadShrinkPercentage">90</integer>
+    <integer name="config_workspaceSpringLoadShrinkPercentage">85</integer>
 
     <!-- The duration of the animation from search hint to text entry -->
     <integer name="config_searchHintAnimationDuration">50</integer>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index acc6466caa..e532305599 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -20,6 +20,7 @@
 
     <!-- Dynamic Grid -->
     <dimen name="dynamic_grid_edge_margin">8dp</dimen>
+    <dimen name="dynamic_grid_left_right_margin">8dp</dimen>
     <dimen name="dynamic_grid_icon_drawable_padding">7dp</dimen>
     <!-- Minimum space between workspace and hotseat in spring loaded mode -->
     <dimen name="dynamic_grid_min_spring_loaded_space">8dp</dimen>
@@ -27,7 +28,6 @@
     <dimen name="dynamic_grid_cell_border_spacing">16dp</dimen>
     <dimen name="dynamic_grid_cell_layout_padding">5.5dp</dimen>
     <dimen name="dynamic_grid_cell_padding_x">8dp</dimen>
-    <dimen name="dynamic_grid_cell_padding_y">7dp</dimen>
 
     <!-- Hotseat -->
     <dimen name="dynamic_grid_hotseat_top_padding">8dp</dimen>
@@ -37,6 +37,9 @@
     <dimen name="dynamic_grid_hotseat_extra_vertical_size">34dp</dimen>
     <dimen name="dynamic_grid_hotseat_side_padding">0dp</dimen>
 
+    <!-- Scalable Grid -->
+    <dimen name="scalable_grid_left_right_margin">22dp</dimen>
+
     <!-- Workspace page indicator -->
     <dimen name="workspace_page_indicator_height">24dp</dimen>
     <dimen name="workspace_page_indicator_line_height">1dp</dimen>
@@ -90,7 +93,6 @@
     <!-- The size of corner radius of the arrow in the arrow toast. -->
     <dimen name="arrow_toast_corner_radius">2dp</dimen>
 
-
 <!-- Search bar in All Apps -->
     <dimen name="all_apps_header_max_elevation">3dp</dimen>
     <dimen name="all_apps_header_scroll_to_elevation">16dp</dimen>
@@ -148,10 +150,12 @@
 
     <dimen name="folder_cell_x_padding">9dp</dimen>
     <dimen name="folder_cell_y_padding">6dp</dimen>
-    <dimen name="folder_child_text_size">13sp</dimen>
-    <dimen name="folder_label_padding_top">12dp</dimen>
-    <dimen name="folder_label_padding_bottom">12dp</dimen>
-    <dimen name="folder_label_text_size">16sp</dimen>
+    <!-- label text size = workspace text size multiplied by this scale -->
+    <dimen name="folder_label_text_scale">1.14</dimen>
+    <dimen name="folder_label_height">48dp</dimen>
+
+    <dimen name="folder_content_padding_left_right">8dp</dimen>
+    <dimen name="folder_content_padding_top">16dp</dimen>
 
 <!-- Sizes for managed profile badges -->
     <dimen name="profile_badge_size">24dp</dimen>
diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java
index be92c5d133..4f008e26da 100644
--- a/src/com/android/launcher3/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher3/AppWidgetResizeFrame.java
@@ -3,7 +3,6 @@ package com.android.launcher3;
 import static com.android.launcher3.LauncherAnimUtils.LAYOUT_HEIGHT;
 import static com.android.launcher3.LauncherAnimUtils.LAYOUT_WIDTH;
 import static com.android.launcher3.Utilities.ATLEAST_S;
-import static com.android.launcher3.config.FeatureFlags.ENABLE_FOUR_COLUMNS;
 import static com.android.launcher3.views.BaseDragLayer.LAYOUT_X;
 import static com.android.launcher3.views.BaseDragLayer.LAYOUT_Y;
 
@@ -50,6 +49,14 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
                         inv.portraitProfile.getCellSize()};
             });
 
+    // Represents the border spacing size on the grid in the two orientations.
+    public static final MainThreadInitializedObject<int[]> BORDER_SPACING_SIZE =
+            new MainThreadInitializedObject<>(c -> {
+                InvariantDeviceProfile inv = LauncherAppState.getIDP(c);
+                return new int[] {inv.landscapeProfile.cellLayoutBorderSpacingPx,
+                        inv.portraitProfile.cellLayoutBorderSpacingPx};
+            });
+
     private static final int HANDLE_COUNT = 4;
     private static final int INDEX_LEFT = 0;
     private static final int INDEX_TOP = 1;
@@ -370,16 +377,12 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
         }
     }
 
-    private static PointF getWidgetSize(Context context, Point cellSize, int spanX, int spanY) {
+    private static PointF getWidgetSize(Context context, Point cellSize, int spanX, int spanY,
+            int borderSpacing) {
         final float density = context.getResources().getDisplayMetrics().density;
-        float hBorderSpacing = 0;
-        float vBorderSpacing = 0;
-        if (ENABLE_FOUR_COLUMNS.get()) {
-            final int borderSpacing = context.getResources()
-                    .getDimensionPixelSize(R.dimen.dynamic_grid_cell_border_spacing);
-            hBorderSpacing = (spanX - 1) * borderSpacing;
-            vBorderSpacing = (spanY - 1) * borderSpacing;
-        }
+        final float hBorderSpacing = (spanX - 1) * borderSpacing;
+        final float vBorderSpacing = (spanY - 1) * borderSpacing;
+
         PointF widgetSize = new PointF();
         widgetSize.x = ((spanX * cellSize.x) + hBorderSpacing) / density;
         widgetSize.y = ((spanY * cellSize.y) + vBorderSpacing) / density;
@@ -389,10 +392,11 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
     /** Returns the actual widget size given its span. */
     public static PointF getWidgetSize(Context context, int spanX, int spanY) {
         final Point[] cellSize = CELL_SIZE.get(context);
+        final int[] borderSpacing = BORDER_SPACING_SIZE.get(context);
         if (isLandscape(context)) {
-            return getWidgetSize(context, cellSize[0], spanX, spanY);
+            return getWidgetSize(context, cellSize[0], spanX, spanY, borderSpacing[0]);
         }
-        return getWidgetSize(context, cellSize[1], spanX, spanY);
+        return getWidgetSize(context, cellSize[1], spanX, spanY, borderSpacing[1]);
     }
 
     /** Returns true if the screen is in landscape mode. */
@@ -404,9 +408,10 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
     /** Returns the list of sizes for a widget of given span, in dp. */
     public static ArrayList<PointF> getWidgetSizes(Context context, int spanX, int spanY) {
         final Point[] cellSize = CELL_SIZE.get(context);
+        final int[] borderSpacing = BORDER_SPACING_SIZE.get(context);
 
-        PointF landSize = getWidgetSize(context, cellSize[0], spanX, spanY);
-        PointF portSize = getWidgetSize(context, cellSize[1], spanX, spanY);
+        PointF landSize = getWidgetSize(context, cellSize[0], spanX, spanY, borderSpacing[0]);
+        PointF portSize = getWidgetSize(context, cellSize[1], spanX, spanY,  borderSpacing[1]);
 
         ArrayList<PointF> sizes = new ArrayList<>(2);
         sizes.add(landSize);
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index ee4d7ecb55..e0be6de793 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -17,7 +17,6 @@
 package com.android.launcher3;
 
 import static com.android.launcher3.FastBitmapDrawable.newIcon;
-import static com.android.launcher3.config.FeatureFlags.ENABLE_FOUR_COLUMNS;
 import static com.android.launcher3.graphics.IconShape.getShape;
 import static com.android.launcher3.graphics.PreloadIconDrawable.newPendingIcon;
 import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
@@ -194,7 +193,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
             setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.iconTextSizePx);
             setCompoundDrawablePadding(grid.iconDrawablePaddingPx);
             defaultIconSize = grid.iconSizePx;
-            setCenterVertically(ENABLE_FOUR_COLUMNS.get());
+            setCenterVertically(grid.isScalableGrid);
         } else if (mDisplay == DISPLAY_ALL_APPS) {
             setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.allAppsIconTextSizePx);
             setCompoundDrawablePadding(grid.allAppsIconDrawablePaddingPx);
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 634093c141..7a9f852960 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -16,7 +16,7 @@
 
 package com.android.launcher3;
 
-import static com.android.launcher3.config.FeatureFlags.ENABLE_FOUR_COLUMNS;
+import static com.android.launcher3.ResourceUtils.pxFromDp;
 
 import android.content.Context;
 import android.content.res.Configuration;
@@ -66,6 +66,8 @@ public class DeviceProfile {
 
     public final float aspectRatio;
 
+    public final boolean isScalableGrid;
+
     /**
      * The maximum amount of left/right workspace padding as a percentage of the screen width.
      * To be clear, this means that up to 7% of the screen width can be used as left padding, and
@@ -79,8 +81,10 @@ public class DeviceProfile {
     private static final int PORTRAIT_TABLET_LEFT_RIGHT_PADDING_MULTIPLIER = 4;
 
     // Workspace
-    public final int desiredWorkspaceLeftRightMarginPx;
-    public final int cellLayoutBorderSpacingPx;
+    public final int desiredWorkspaceLeftRightOriginalPx;
+    public int desiredWorkspaceLeftRightMarginPx;
+    public final int cellLayoutBorderSpacingOriginalPx;
+    public int cellLayoutBorderSpacingPx;
     public final int cellLayoutPaddingLeftRightPx;
     public final int cellLayoutBottomPaddingPx;
     public final int edgeMarginPx;
@@ -102,13 +106,21 @@ public class DeviceProfile {
 
     public int cellWidthPx;
     public int cellHeightPx;
-    public int cellYPaddingPx;
     public int workspaceCellPaddingXPx;
 
+    public int cellYPaddingPx;
+    public int cellYPaddingOriginalPx;
+
     // Folder
+    public float folderLabelTextScale;
+    public int folderLabelTextSizePx;
     public int folderIconSizePx;
     public int folderIconOffsetYPx;
 
+    // Folder content
+    public int folderContentPaddingLeftRight;
+    public int folderContentPaddingTop;
+
     // Folder cell
     public int folderCellWidthPx;
     public int folderCellHeightPx;
@@ -164,9 +176,12 @@ public class DeviceProfile {
         this.inv = inv;
         this.isLandscape = isLandscape;
         this.isMultiWindowMode = isMultiWindowMode;
+        this.transposeLayoutWithOrientation = transposeLayoutWithOrientation;
         windowX = windowPosition.x;
         windowY = windowPosition.y;
 
+        isScalableGrid = inv.isScalable && !isVerticalBarLayout() && !isMultiWindowMode;
+
         // Determine sizes.
         widthPx = width;
         heightPx = height;
@@ -193,8 +208,6 @@ public class DeviceProfile {
         boolean isTallDevice = Float.compare(aspectRatio, TALL_DEVICE_ASPECT_RATIO_THRESHOLD) >= 0;
 
         // Some more constants
-        this.transposeLayoutWithOrientation = transposeLayoutWithOrientation;
-
         context = getContext(context, info, isVerticalBarLayout()
                 ? Configuration.ORIENTATION_LANDSCAPE
                 : Configuration.ORIENTATION_PORTRAIT);
@@ -217,16 +230,25 @@ public class DeviceProfile {
         availableHeightPx = nonFinalAvailableHeightPx;
 
         edgeMarginPx = res.getDimensionPixelSize(R.dimen.dynamic_grid_edge_margin);
-        desiredWorkspaceLeftRightMarginPx = isVerticalBarLayout() ? 0 : edgeMarginPx;
 
-        cellYPaddingPx = res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_padding_y);
-        cellLayoutBorderSpacingPx = isVerticalBarLayout()
-                || isMultiWindowMode
-                || !ENABLE_FOUR_COLUMNS.get()
-                ? 0 : res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_border_spacing);
+        desiredWorkspaceLeftRightMarginPx = isVerticalBarLayout() ? 0 : isScalableGrid
+                ? res.getDimensionPixelSize(R.dimen.scalable_grid_left_right_margin)
+                : res.getDimensionPixelSize(R.dimen.dynamic_grid_left_right_margin);
+        desiredWorkspaceLeftRightOriginalPx = desiredWorkspaceLeftRightMarginPx;
+
+        folderLabelTextScale = res.getFloat(R.dimen.folder_label_text_scale);
+        folderContentPaddingLeftRight =
+                res.getDimensionPixelSize(R.dimen.folder_content_padding_left_right);
+        folderContentPaddingTop = res.getDimensionPixelSize(R.dimen.folder_content_padding_top);
+
+        setCellLayoutBorderSpacing(pxFromDp(inv.borderSpacing, mInfo.metrics, 1f));
+        cellLayoutBorderSpacingOriginalPx = cellLayoutBorderSpacingPx;
+
         int cellLayoutPaddingLeftRightMultiplier = !isVerticalBarLayout() && isTablet
                 ? PORTRAIT_TABLET_LEFT_RIGHT_PADDING_MULTIPLIER : 1;
-        int cellLayoutPadding = res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_layout_padding);
+        int cellLayoutPadding = isScalableGrid
+                ? 0
+                : res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_layout_padding);
         if (isLandscape) {
             cellLayoutPaddingLeftRightPx = 0;
             cellLayoutBottomPaddingPx = cellLayoutPadding;
@@ -259,16 +281,16 @@ public class DeviceProfile {
         hotseatBarSidePaddingStartPx = isVerticalBarLayout() ? workspacePageIndicatorHeight : 0;
         int hotseatExtraVerticalSize =
                 res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_extra_vertical_size);
-        hotseatBarSizePx = ResourceUtils.pxFromDp(inv.iconSize, mInfo.metrics)
+        hotseatBarSizePx = pxFromDp(inv.iconSize, mInfo.metrics, 1f)
                 + (isVerticalBarLayout()
                 ? (hotseatBarSidePaddingStartPx + hotseatBarSidePaddingEndPx)
                 : (hotseatBarTopPaddingPx + hotseatBarBottomPaddingPx
-                        + (ENABLE_FOUR_COLUMNS.get() ? 0 : hotseatExtraVerticalSize)));
+                        + (isScalableGrid ? 0 : hotseatExtraVerticalSize)));
 
         // Calculate all of the remaining variables.
         int extraSpace = updateAvailableDimensions(res);
         // Now that we have all of the variables calculated, we can tune certain sizes.
-        if (ENABLE_FOUR_COLUMNS.get()) {
+        if (isScalableGrid) {
             DevicePadding padding = inv.devicePaddings.getDevicePadding(extraSpace);
             workspaceTopPadding = padding.getWorkspaceTopPadding(extraSpace);
             workspaceBottomPadding = padding.getWorkspaceBottomPadding(extraSpace);
@@ -299,6 +321,17 @@ public class DeviceProfile {
                         IconShape.DEFAULT_PATH_SIZE);
     }
 
+    private void setCellLayoutBorderSpacing(int borderSpacing) {
+        if (isScalableGrid) {
+            cellLayoutBorderSpacingPx = borderSpacing;
+            folderContentPaddingLeftRight = borderSpacing;
+            folderContentPaddingTop = borderSpacing;
+        } else {
+            cellLayoutBorderSpacingPx = 0;
+        }
+    }
+
+
     public Builder toBuilder(Context context) {
         Point size = new Point(availableWidthPx, availableHeightPx);
         return new Builder(context, inv, mInfo)
@@ -380,20 +413,42 @@ public class DeviceProfile {
     private int updateAvailableDimensions(Resources res) {
         updateIconSize(1f, res);
 
-        // Check to see if the icons fit within the available height.  If not, then scale down.
-        float usedHeight = (cellHeightPx * inv.numRows)
-                + (cellLayoutBorderSpacingPx * (inv.numRows - 1));
-        int maxHeight = (availableHeightPx - getTotalWorkspacePadding().y);
+        Point workspacePadding = getTotalWorkspacePadding();
+
+        // Check to see if the icons fit within the available height.
+        float usedHeight = getCellLayoutHeight();
+        final int maxHeight = availableHeightPx - workspacePadding.y;
         float extraHeight = Math.max(0, maxHeight - usedHeight);
-        if (usedHeight > maxHeight) {
-            float scale = maxHeight / usedHeight;
+        float scaleY = maxHeight / usedHeight;
+        boolean shouldScale = scaleY < 1f;
+
+        float scaleX = 1f;
+        if (isScalableGrid) {
+            // We scale to fit the cellWidth and cellHeight in the available space.
+            // The benefit of scalable grids is that we can get consistent aspect ratios between
+            // devices.
+            float usedWidth = (cellWidthPx * inv.numColumns)
+                    + (cellLayoutBorderSpacingPx * (inv.numColumns - 1))
+                    + (desiredWorkspaceLeftRightMarginPx * 2);
+            // We do not subtract padding here, as we also scale the workspace padding if needed.
+            scaleX = availableWidthPx / usedWidth;
+            shouldScale = true;
+        }
+
+        if (shouldScale) {
+            float scale = Math.min(scaleX, scaleY);
             updateIconSize(scale, res);
-            extraHeight = 0;
+            extraHeight = Math.max(0, maxHeight - getCellLayoutHeight());
         }
+
         updateAvailableFolderCellDimensions(res);
         return Math.round(extraHeight);
     }
 
+    private int getCellLayoutHeight() {
+        return (cellHeightPx * inv.numRows) + (cellLayoutBorderSpacingPx * (inv.numRows - 1));
+    }
+
     /**
      * Updating the iconSize affects many aspects of the launcher layout, such as: iconSizePx,
      * iconTextSizePx, iconDrawablePaddingPx, cellWidth/Height, allApps* variants,
@@ -403,17 +458,21 @@ public class DeviceProfile {
         // Workspace
         final boolean isVerticalLayout = isVerticalBarLayout();
         float invIconSizeDp = isVerticalLayout ? inv.landscapeIconSize : inv.iconSize;
-        iconSizePx = Math.max(1, (int) (ResourceUtils.pxFromDp(invIconSizeDp, mInfo.metrics)
-                * scale));
-        iconTextSizePx = (int) (Utilities.pxFromSp(inv.iconTextSize, mInfo.metrics) * scale);
+        iconSizePx = Math.max(1, pxFromDp(invIconSizeDp, mInfo.metrics, scale));
+        iconTextSizePx = pxFromDp(inv.iconTextSize, mInfo.metrics, scale);
         iconDrawablePaddingPx = (int) (iconDrawablePaddingOriginalPx * scale);
 
-        if (ENABLE_FOUR_COLUMNS.get()) {
-            cellHeightPx = iconSizePx + iconDrawablePaddingPx
-                    + Utilities.calculateTextHeight(iconTextSizePx)
-                    + (cellYPaddingPx * 2);
+        setCellLayoutBorderSpacing((int) (cellLayoutBorderSpacingOriginalPx * scale));
+
+        if (isScalableGrid) {
+            cellWidthPx = pxFromDp(inv.minCellWidth, mInfo.metrics, scale);
+            cellHeightPx = pxFromDp(inv.minCellHeight, mInfo.metrics, scale);
+            int cellContentHeight = iconSizePx + iconDrawablePaddingPx
+                    + Utilities.calculateTextHeight(iconTextSizePx);
+            cellYPaddingPx = Math.max(0, cellHeightPx - cellContentHeight) / 2;
+            desiredWorkspaceLeftRightMarginPx = (int) (desiredWorkspaceLeftRightOriginalPx * scale);
         } else {
-            cellYPaddingPx = 0;
+            cellWidthPx = iconSizePx + iconDrawablePaddingPx;
             cellHeightPx = iconSizePx + iconDrawablePaddingPx
                     + Utilities.calculateTextHeight(iconTextSizePx);
             int cellPaddingY = (getCellSize().y - cellHeightPx) / 2;
@@ -426,11 +485,10 @@ public class DeviceProfile {
                 iconDrawablePaddingPx = cellPaddingY;
             }
         }
-        cellWidthPx = iconSizePx + iconDrawablePaddingPx;
 
         // All apps
         if (allAppsHasDifferentNumColumns()) {
-            allAppsIconSizePx = ResourceUtils.pxFromDp(inv.allAppsIconSize, mInfo.metrics);
+            allAppsIconSizePx = pxFromDp(inv.allAppsIconSize, mInfo.metrics);
             allAppsIconTextSizePx = Utilities.pxFromSp(inv.allAppsIconTextSize, mInfo.metrics);
             allAppsIconDrawablePaddingPx = iconDrawablePaddingOriginalPx;
             // We use 4 below to ensure labels are closer to their corresponding icon.
@@ -474,12 +532,10 @@ public class DeviceProfile {
     }
 
     private void updateAvailableFolderCellDimensions(Resources res) {
-        int folderBottomPanelSize = res.getDimensionPixelSize(R.dimen.folder_label_padding_top)
-                + res.getDimensionPixelSize(R.dimen.folder_label_padding_bottom)
-                + Utilities.calculateTextHeight(res.getDimension(R.dimen.folder_label_text_size));
-
         updateFolderCellSize(1f, res);
 
+        final int folderBottomPanelSize = res.getDimensionPixelSize(R.dimen.folder_label_height);
+
         // Don't let the folder get too close to the edges of the screen.
         int folderMargin = edgeMarginPx * 2;
         Point totalWorkspacePadding = getTotalWorkspacePadding();
@@ -488,13 +544,14 @@ public class DeviceProfile {
         float contentUsedHeight = folderCellHeightPx * inv.numFolderRows
                 + ((inv.numFolderRows - 1) * cellLayoutBorderSpacingPx);
         int contentMaxHeight = availableHeightPx - totalWorkspacePadding.y - folderBottomPanelSize
-                - folderMargin;
+                - folderMargin - folderContentPaddingTop;
         float scaleY = contentMaxHeight / contentUsedHeight;
 
         // Check if the icons fit within the available width.
         float contentUsedWidth = folderCellWidthPx * inv.numFolderColumns
                 + ((inv.numFolderColumns - 1) * cellLayoutBorderSpacingPx);
-        int contentMaxWidth = availableWidthPx - totalWorkspacePadding.x - folderMargin;
+        int contentMaxWidth = availableWidthPx - totalWorkspacePadding.x - folderMargin
+                - folderContentPaddingLeftRight * 2;
         float scaleX = contentMaxWidth / contentUsedWidth;
 
         float scale = Math.min(scaleX, scaleY);
@@ -504,9 +561,10 @@ public class DeviceProfile {
     }
 
     private void updateFolderCellSize(float scale, Resources res) {
-        folderChildIconSizePx = (int) (ResourceUtils.pxFromDp(inv.iconSize, mInfo.metrics) * scale);
-        folderChildTextSizePx =
-                (int) (res.getDimensionPixelSize(R.dimen.folder_child_text_size) * scale);
+        float invIconSizeDp = isVerticalBarLayout() ? inv.landscapeIconSize : inv.iconSize;
+        folderChildIconSizePx = Math.max(1, pxFromDp(invIconSizeDp, mInfo.metrics, scale));
+        folderChildTextSizePx = pxFromDp(inv.iconTextSize, mInfo.metrics, scale);
+        folderLabelTextSizePx = (int) (folderChildTextSizePx * folderLabelTextScale);
 
         int textHeight = Utilities.calculateTextHeight(folderChildTextSizePx);
         int cellPaddingX = (int) (res.getDimensionPixelSize(R.dimen.folder_cell_x_padding) * scale);
@@ -588,7 +646,7 @@ public class DeviceProfile {
             } else {
                 // Pad the top and bottom of the workspace with search/hotseat bar sizes
                 padding.set(desiredWorkspaceLeftRightMarginPx,
-                        workspaceTopPadding + edgeMarginPx,
+                        workspaceTopPadding + (isScalableGrid ? 0 : edgeMarginPx),
                         desiredWorkspaceLeftRightMarginPx,
                         paddingBottom);
             }
diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index 2a08c50008..bb60557122 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -111,6 +111,10 @@ public class InvariantDeviceProfile {
     public float allAppsIconSize;
     public float allAppsIconTextSize;
 
+    public float minCellHeight;
+    public float minCellWidth;
+    public float borderSpacing;
+
     private SparseArray<TypedValue> mExtraAttrs;
 
     /**
@@ -123,6 +127,11 @@ public class InvariantDeviceProfile {
      */
     public int numAllAppsColumns;
 
+    /**
+     * Do not query directly. see {@link DeviceProfile#isScalableGrid}.
+     */
+    protected boolean isScalable;
+
     public String dbFile;
     public int defaultLayoutId;
     int demoModeLayoutId;
@@ -154,6 +163,10 @@ public class InvariantDeviceProfile {
         iconTextSize = p.iconTextSize;
         numHotseatIcons = p.numHotseatIcons;
         numAllAppsColumns = p.numAllAppsColumns;
+        isScalable = p.isScalable;
+        minCellHeight = p.minCellHeight;
+        minCellWidth = p.minCellWidth;
+        borderSpacing = p.borderSpacing;
         dbFile = p.dbFile;
         allAppsIconSize = p.allAppsIconSize;
         allAppsIconTextSize = p.allAppsIconTextSize;
@@ -213,6 +226,9 @@ public class InvariantDeviceProfile {
         result.landscapeIconSize = defaultDisplayOption.landscapeIconSize;
         result.allAppsIconSize = Math.min(
                 defaultDisplayOption.allAppsIconSize, myDisplayOption.allAppsIconSize);
+        result.minCellHeight = defaultDisplayOption.minCellHeight;
+        result.minCellWidth = defaultDisplayOption.minCellWidth;
+        result.borderSpacing = defaultDisplayOption.borderSpacing;
 
         devicePaddings = new DevicePaddings(context);
         initGrid(context, myInfo, result);
@@ -259,6 +275,7 @@ public class InvariantDeviceProfile {
         numFolderRows = closestProfile.numFolderRows;
         numFolderColumns = closestProfile.numFolderColumns;
         numAllAppsColumns = closestProfile.numAllAppsColumns;
+        isScalable = closestProfile.isScalable;
 
         mExtraAttrs = closestProfile.extraAttrs;
 
@@ -269,6 +286,10 @@ public class InvariantDeviceProfile {
         iconTextSize = displayOption.iconTextSize;
         fillResIconDpi = getLauncherIconDensity(iconBitmapSize);
 
+        minCellHeight = displayOption.minCellHeight;
+        minCellWidth = displayOption.minCellWidth;
+        borderSpacing = displayOption.borderSpacing;
+
         if (Utilities.isGridOptionsEnabled(context)) {
             allAppsIconSize = displayOption.allAppsIconSize;
             allAppsIconTextSize = displayOption.allAppsIconTextSize;
@@ -589,6 +610,8 @@ public class InvariantDeviceProfile {
         private final int defaultLayoutId;
         private final int demoModeLayoutId;
 
+        private final boolean isScalable;
+
         private final SparseArray<TypedValue> extraAttrs;
 
         public GridOption(Context context, AttributeSet attrs) {
@@ -612,6 +635,9 @@ public class InvariantDeviceProfile {
             numAllAppsColumns = a.getInt(
                     R.styleable.GridDisplayOption_numAllAppsColumns, numColumns);
 
+            isScalable = a.getBoolean(
+                    R.styleable.GridDisplayOption_isScalable, false);
+
             a.recycle();
 
             extraAttrs = Themes.createValueMap(context, attrs,
@@ -626,6 +652,10 @@ public class InvariantDeviceProfile {
         private final float minHeightDps;
         private final boolean canBeDefault;
 
+        private float minCellHeight;
+        private float minCellWidth;
+        private float borderSpacing;
+
         private float iconSize;
         private float iconTextSize;
         private float landscapeIconSize;
@@ -643,6 +673,10 @@ public class InvariantDeviceProfile {
             canBeDefault = a.getBoolean(
                     R.styleable.ProfileDisplayOption_canBeDefault, false);
 
+            minCellHeight = a.getFloat(R.styleable.ProfileDisplayOption_minCellHeightDps, 0);
+            minCellWidth = a.getFloat(R.styleable.ProfileDisplayOption_minCellWidthDps, 0);
+            borderSpacing = a.getFloat(R.styleable.ProfileDisplayOption_borderSpacingDps, 0);
+
             iconSize = a.getFloat(R.styleable.ProfileDisplayOption_iconImageSize, 0);
             landscapeIconSize = a.getFloat(R.styleable.ProfileDisplayOption_landscapeIconSize,
                     iconSize);
@@ -664,6 +698,9 @@ public class InvariantDeviceProfile {
             minWidthDps = 0;
             minHeightDps = 0;
             canBeDefault = false;
+            minCellHeight = 0;
+            minCellWidth = 0;
+            borderSpacing = 0;
         }
 
         private DisplayOption multiply(float w) {
@@ -672,6 +709,9 @@ public class InvariantDeviceProfile {
             allAppsIconSize *= w;
             iconTextSize *= w;
             allAppsIconTextSize *= w;
+            minCellHeight *= w;
+            minCellWidth *= w;
+            borderSpacing *= w;
             return this;
         }
 
@@ -681,6 +721,9 @@ public class InvariantDeviceProfile {
             allAppsIconSize += p.allAppsIconSize;
             iconTextSize += p.iconTextSize;
             allAppsIconTextSize += p.allAppsIconTextSize;
+            minCellHeight += p.minCellHeight;
+            minCellWidth += p.minCellWidth;
+            borderSpacing += p.borderSpacing;
             return this;
         }
     }
diff --git a/src/com/android/launcher3/ResourceUtils.java b/src/com/android/launcher3/ResourceUtils.java
index f60e1f8137..ece123dc62 100644
--- a/src/com/android/launcher3/ResourceUtils.java
+++ b/src/com/android/launcher3/ResourceUtils.java
@@ -60,7 +60,11 @@ public class ResourceUtils {
     }
 
     public static int pxFromDp(float size, DisplayMetrics metrics) {
-        return size < 0 ? INVALID_RESOURCE_HANDLE : Math.round(
-                TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, size, metrics));
+        return pxFromDp(size, metrics, 1f);
+    }
+
+    public static int pxFromDp(float size, DisplayMetrics metrics, float scale) {
+        return size < 0 ? INVALID_RESOURCE_HANDLE : Math.round(scale
+                * TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, size, metrics));
     }
 }
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index 504b29e75a..bcb3a54ef3 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -44,6 +44,7 @@ import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.Pair;
+import android.util.TypedValue;
 import android.view.FocusFinder;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -246,11 +247,16 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
+        final DeviceProfile dp = mLauncher.getDeviceProfile();
+        final int paddingLeftRight = dp.folderContentPaddingLeftRight;
+
         mContent = findViewById(R.id.folder_content);
+        mContent.setPadding(paddingLeftRight, dp.folderContentPaddingTop, paddingLeftRight, 0);
         mContent.setFolder(this);
 
         mPageIndicator = findViewById(R.id.folder_page_indicator);
         mFolderName = findViewById(R.id.folder_name);
+        mFolderName.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp.folderLabelTextSizePx);
         mFolderName.setOnBackKeyListener(this);
         mFolderName.setOnFocusChangeListener(this);
         mFolderName.setOnEditorActionListener(this);
@@ -262,12 +268,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         mFolderName.forceDisableSuggestions(true);
 
         mFooter = findViewById(R.id.folder_footer);
-
-        // We find out how tall footer wants to be (it is set to wrap_content), so that
-        // we can allocate the appropriate amount of space for it.
-        int measureSpec = MeasureSpec.UNSPECIFIED;
-        mFooter.measure(measureSpec, measureSpec);
-        mFooterHeight = mFooter.getMeasuredHeight();
+        mFooterHeight = getResources().getDimensionPixelSize(R.dimen.folder_label_height);
 
         if (Utilities.ATLEAST_R) {
             mFolderWindowInsetsAnimationCallback =
diff --git a/src/com/android/launcher3/folder/FolderAnimationManager.java b/src/com/android/launcher3/folder/FolderAnimationManager.java
index 1cac31eb18..feb528c96f 100644
--- a/src/com/android/launcher3/folder/FolderAnimationManager.java
+++ b/src/com/android/launcher3/folder/FolderAnimationManager.java
@@ -324,7 +324,9 @@ public class FolderAnimationManager {
 
             final int previewPosX =
                     (int) ((mTmpParams.transX - iconOffsetX + previewItemOffsetX) / folderScale);
-            final int previewPosY = (int) ((mTmpParams.transY + previewItemOffsetY) / folderScale);
+            final float paddingTop = btv.getPaddingTop() * iconScale;
+            final int previewPosY = (int) ((mTmpParams.transY + previewItemOffsetY - paddingTop)
+                    / folderScale);
 
             final float xDistance = previewPosX - btvLp.x;
             final float yDistance = previewPosY - btvLp.y;
-- 
GitLab


From 452005a14e34fa030a008d58c96e0da5ad77c8a7 Mon Sep 17 00:00:00 2001
From: Zak Cohen <zakcohen@google.com>
Date: Wed, 24 Feb 2021 16:34:46 -0800
Subject: [PATCH 0565/1664] Update ArrowPopup to accommodate more rounded
 dialogs.

Adjusts layouts to accommodate more rounded dialogs, includes adding a
new rounded triangle drawable that can be clipped by a rounded rect.



Bug: 179922117
Test: checked all instances and RTL
Change-Id: I4c2f0ead0fd56eba14ffd9b82f0c100f7d92ef5b
---
 res/values/dimens.xml                         |  10 +-
 .../android/launcher3/popup/ArrowPopup.java   | 113 +++++-------
 .../launcher3/popup/RoundedArrowDrawable.java | 161 ++++++++++++++++++
 3 files changed, 205 insertions(+), 79 deletions(-)
 create mode 100644 src/com/android/launcher3/popup/RoundedArrowDrawable.java

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index acc6466caa..17afc2aeb8 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -183,13 +183,11 @@
     <dimen name="popup_padding_start">10dp</dimen>
     <dimen name="popup_padding_end">16dp</dimen>
     <dimen name="popup_vertical_padding">4dp</dimen>
-    <dimen name="popup_arrow_width">10dp</dimen>
-    <dimen name="popup_arrow_height">8dp</dimen>
-    <dimen name="popup_arrow_vertical_offset">-2dp</dimen>
+    <dimen name="popup_arrow_width">12dp</dimen>
+    <dimen name="popup_arrow_height">10dp</dimen>
+    <dimen name="popup_arrow_vertical_offset">-1dp</dimen>
     <!-- popup_padding_start + deep_shortcut_icon_size / 2 -->
-    <dimen name="popup_arrow_horizontal_center_start">28dp</dimen>
-    <!-- popup_padding_end + deep_shortcut_drag_handle_size / 2 -->
-    <dimen name="popup_arrow_horizontal_center_end">24dp</dimen>
+    <dimen name="popup_arrow_horizontal_center_offset">28dp</dimen>
     <dimen name="popup_arrow_corner_radius">2dp</dimen>
     <!-- popup_padding_start + icon_size + 10dp -->
     <dimen name="deep_shortcuts_text_padding_start">56dp</dimen>
diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java
index 56438d0815..5a34d2a74f 100644
--- a/src/com/android/launcher3/popup/ArrowPopup.java
+++ b/src/com/android/launcher3/popup/ArrowPopup.java
@@ -26,11 +26,8 @@ import android.animation.TimeInterpolator;
 import android.animation.ValueAnimator;
 import android.content.Context;
 import android.content.res.Resources;
-import android.graphics.CornerPathEffect;
 import android.graphics.Outline;
-import android.graphics.Paint;
 import android.graphics.Rect;
-import android.graphics.drawable.ShapeDrawable;
 import android.util.AttributeSet;
 import android.util.Pair;
 import android.view.Gravity;
@@ -51,7 +48,6 @@ import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.RevealOutlineAnimation;
 import com.android.launcher3.anim.RoundedRectRevealOutlineProvider;
 import com.android.launcher3.dragndrop.DragLayer;
-import com.android.launcher3.graphics.TriangleShape;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.BaseDragLayer;
 
@@ -72,7 +68,11 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
     protected final T mLauncher;
     protected final boolean mIsRtl;
 
-    private final int mArrowOffset;
+    private final int mArrowOffsetVertical;
+    private final int mArrowOffsetHorizontal;
+    private final int mArrowWidth;
+    private final int mArrowHeight;
+    private final int mArrowPointRadius;
     private final View mArrow;
 
     protected boolean mIsLeftAligned;
@@ -103,11 +103,14 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
 
         // Initialize arrow view
         final Resources resources = getResources();
-        final int arrowWidth = resources.getDimensionPixelSize(R.dimen.popup_arrow_width);
-        final int arrowHeight = resources.getDimensionPixelSize(R.dimen.popup_arrow_height);
+        mArrowWidth = resources.getDimensionPixelSize(R.dimen.popup_arrow_width);
+        mArrowHeight = resources.getDimensionPixelSize(R.dimen.popup_arrow_height);
         mArrow = new View(context);
-        mArrow.setLayoutParams(new DragLayer.LayoutParams(arrowWidth, arrowHeight));
-        mArrowOffset = resources.getDimensionPixelSize(R.dimen.popup_arrow_vertical_offset);
+        mArrow.setLayoutParams(new DragLayer.LayoutParams(mArrowWidth, mArrowHeight));
+        mArrowOffsetVertical = resources.getDimensionPixelSize(R.dimen.popup_arrow_vertical_offset);
+        mArrowOffsetHorizontal = resources.getDimensionPixelSize(
+                R.dimen.popup_arrow_horizontal_center_offset) - (mArrowWidth / 2);
+        mArrowPointRadius = resources.getDimensionPixelSize(R.dimen.popup_arrow_corner_radius);
     }
 
     public ArrowPopup(Context context, AttributeSet attrs) {
@@ -200,48 +203,33 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
         orientAboutObject();
     }
 
-    private void addArrow() {
-        final Resources res = getResources();
-        final int arrowCenterOffset = res.getDimensionPixelSize(isAlignedWithStart()
-                ? R.dimen.popup_arrow_horizontal_center_start
-                : R.dimen.popup_arrow_horizontal_center_end);
-        final int halfArrowWidth = res.getDimensionPixelSize(R.dimen.popup_arrow_width) / 2;
-        getPopupContainer().addView(mArrow);
-        DragLayer.LayoutParams arrowLp = (DragLayer.LayoutParams) mArrow.getLayoutParams();
+    private int getArrowLeft() {
         if (mIsLeftAligned) {
-            mArrow.setX(getX() + arrowCenterOffset - halfArrowWidth);
-        } else {
-            mArrow.setX(getX() + getMeasuredWidth() - arrowCenterOffset - halfArrowWidth);
+            return mArrowOffsetHorizontal;
         }
+        return getMeasuredWidth() - mArrowOffsetHorizontal - mArrowWidth;
+    }
+
+    private void addArrow() {
+        getPopupContainer().addView(mArrow);
+        mArrow.setX(getX() + getArrowLeft());
 
         if (Gravity.isVertical(mGravity)) {
             // This is only true if there wasn't room for the container next to the icon,
             // so we centered it instead. In that case we don't want to showDefaultOptions the arrow.
             mArrow.setVisibility(INVISIBLE);
         } else {
-            ShapeDrawable arrowDrawable = new ShapeDrawable(TriangleShape.create(
-                    arrowLp.width, arrowLp.height, !mIsAboveIcon));
-            Paint arrowPaint = arrowDrawable.getPaint();
-            arrowPaint.setColor(Themes.getAttrColor(getContext(), R.attr.popupColorPrimary));
-            // The corner path effect won't be reflected in the shadow, but shouldn't be noticeable.
-            int radius = getResources().getDimensionPixelSize(R.dimen.popup_arrow_corner_radius);
-            arrowPaint.setPathEffect(new CornerPathEffect(radius));
-            mArrow.setBackground(arrowDrawable);
-            // Clip off the part of the arrow that is underneath the popup.
-            if (mIsAboveIcon) {
-                mArrow.setClipBounds(new Rect(0, -mArrowOffset, arrowLp.width, arrowLp.height));
-            } else {
-                mArrow.setClipBounds(new Rect(0, 0, arrowLp.width, arrowLp.height + mArrowOffset));
-            }
+            mArrow.setBackground(new RoundedArrowDrawable(
+                    mArrowWidth, mArrowHeight, mArrowPointRadius,
+                    mOutlineRadius, getMeasuredWidth(), getMeasuredHeight(),
+                    mArrowOffsetHorizontal, -mArrowOffsetVertical,
+                    !mIsAboveIcon, mIsLeftAligned,
+                    Themes.getAttrColor(getContext(), R.attr.popupColorPrimary)));
             mArrow.setElevation(getElevation());
         }
 
-        mArrow.setPivotX(arrowLp.width / 2);
-        mArrow.setPivotY(mIsAboveIcon ? arrowLp.height : 0);
-    }
-
-    protected boolean isAlignedWithStart() {
-        return mIsLeftAligned && !mIsRtl || !mIsLeftAligned && mIsRtl;
+        mArrow.setPivotX(mArrowWidth / 2.0f);
+        mArrow.setPivotY(mIsAboveIcon ? mArrowHeight : 0);
     }
 
     /**
@@ -274,8 +262,9 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
      */
     private void orientAboutObject(boolean allowAlignLeft, boolean allowAlignRight) {
         measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
+
         int width = getMeasuredWidth();
-        int extraVerticalSpace = mArrow.getLayoutParams().height + mArrowOffset
+        int extraVerticalSpace = mArrowHeight + mArrowOffsetVertical
                 + getResources().getDimensionPixelSize(R.dimen.popup_vertical_padding);
         int height = getMeasuredHeight() + extraVerticalSpace;
 
@@ -291,22 +280,7 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
 
         // Offset x so that the arrow and shortcut icons are center-aligned with the original icon.
         int iconWidth = mTempRect.width();
-        Resources resources = getResources();
-        int xOffset;
-        if (isAlignedWithStart()) {
-            // Aligning with the shortcut icon.
-            int shortcutIconWidth = resources.getDimensionPixelSize(R.dimen.deep_shortcut_icon_size);
-            int shortcutPaddingStart = resources.getDimensionPixelSize(
-                    R.dimen.popup_padding_start);
-            xOffset = iconWidth / 2 - shortcutIconWidth / 2 - shortcutPaddingStart;
-        } else {
-            // Aligning with the drag handle.
-            int shortcutDragHandleWidth = resources.getDimensionPixelSize(
-                    R.dimen.deep_shortcut_drag_handle_size);
-            int shortcutPaddingEnd = resources.getDimensionPixelSize(
-                    R.dimen.popup_padding_end);
-            xOffset = iconWidth / 2 - shortcutDragHandleWidth / 2 - shortcutPaddingEnd;
-        }
+        int xOffset = iconWidth / 2 - mArrowOffsetHorizontal - mArrowWidth / 2;
         x += mIsLeftAligned ? xOffset : -xOffset;
 
         // Check whether we can still align as we originally wanted, now that we've calculated x.
@@ -375,12 +349,14 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
         FrameLayout.LayoutParams arrowLp = (FrameLayout.LayoutParams) mArrow.getLayoutParams();
         if (mIsAboveIcon) {
             arrowLp.gravity = lp.gravity = Gravity.BOTTOM;
-            lp.bottomMargin = getPopupContainer().getHeight() - y - getMeasuredHeight() - insets.top;
-            arrowLp.bottomMargin = lp.bottomMargin - arrowLp.height - mArrowOffset - insets.bottom;
+            lp.bottomMargin =
+                    getPopupContainer().getHeight() - y - getMeasuredHeight() - insets.top;
+            arrowLp.bottomMargin =
+                    lp.bottomMargin - arrowLp.height - mArrowOffsetVertical - insets.bottom;
         } else {
             arrowLp.gravity = lp.gravity = Gravity.TOP;
             lp.topMargin = y + insets.top;
-            arrowLp.topMargin = lp.topMargin - insets.top - arrowLp.height - mArrowOffset;
+            arrowLp.topMargin = lp.topMargin - insets.top - arrowLp.height - mArrowOffsetVertical;
         }
     }
 
@@ -529,22 +505,13 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
     protected void onCreateCloseAnimation(AnimatorSet anim) { }
 
     private RoundedRectRevealOutlineProvider createOpenCloseOutlineProvider() {
-        Resources res = getResources();
-        int arrowCenterX = res.getDimensionPixelSize(mIsLeftAligned ^ mIsRtl ?
-                R.dimen.popup_arrow_horizontal_center_start:
-                R.dimen.popup_arrow_horizontal_center_end);
-        int halfArrowWidth = res.getDimensionPixelSize(R.dimen.popup_arrow_width) / 2;
-        float arrowCornerRadius = res.getDimension(R.dimen.popup_arrow_corner_radius);
-        if (!mIsLeftAligned) {
-            arrowCenterX = getMeasuredWidth() - arrowCenterX;
-        }
+        int arrowLeft = getArrowLeft();
         int arrowCenterY = mIsAboveIcon ? getMeasuredHeight() : 0;
 
-        mStartRect.set(arrowCenterX - halfArrowWidth, arrowCenterY, arrowCenterX + halfArrowWidth,
-                arrowCenterY);
+        mStartRect.set(arrowLeft, arrowCenterY, arrowLeft + mArrowWidth, arrowCenterY);
 
-        return new RoundedRectRevealOutlineProvider
-                (arrowCornerRadius, mOutlineRadius, mStartRect, mEndRect);
+        return new RoundedRectRevealOutlineProvider(
+                mArrowPointRadius, mOutlineRadius, mStartRect, mEndRect);
     }
 
     /**
diff --git a/src/com/android/launcher3/popup/RoundedArrowDrawable.java b/src/com/android/launcher3/popup/RoundedArrowDrawable.java
new file mode 100644
index 0000000000..e662d5c039
--- /dev/null
+++ b/src/com/android/launcher3/popup/RoundedArrowDrawable.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.popup;
+
+import static java.lang.Math.atan;
+import static java.lang.Math.cos;
+import static java.lang.Math.sin;
+import static java.lang.Math.toDegrees;
+
+import android.graphics.Canvas;
+import android.graphics.ColorFilter;
+import android.graphics.Matrix;
+import android.graphics.Outline;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.PixelFormat;
+import android.graphics.drawable.Drawable;
+
+/**
+ * A drawable for a very specific purpose. Used for the caret arrow on a rounded rectangle popup
+ * bubble.
+ * Draws a triangle with one rounded tip, the opposite edge is clipped by the body of the popup
+ * so there is no overlap when drawing them together.
+ */
+public class RoundedArrowDrawable extends Drawable {
+
+    private final Path mPath;
+    private final Paint mPaint;
+
+    /**
+     * Default constructor.
+     *
+     * @param width of the arrow.
+     * @param height of the arrow.
+     * @param radius of the tip of the arrow.
+     * @param popupRadius of the rect to clip this by.
+     * @param popupWidth of the rect to clip this by.
+     * @param popupHeight of the rect to clip this by.
+     * @param arrowOffsetX from the edge of the popup to the arrow.
+     * @param arrowOffsetY how much the arrow will overlap the popup.
+     * @param isPointingUp or not.
+     * @param leftAligned or false for right aligned.
+     * @param color to draw the triangle.
+     */
+    public RoundedArrowDrawable(float width, float height, float radius, float popupRadius,
+            float popupWidth, float popupHeight,
+            float arrowOffsetX, float arrowOffsetY, boolean isPointingUp, boolean leftAligned,
+            int color) {
+        mPath = new Path();
+        mPaint = new Paint();
+        mPaint.setColor(color);
+        mPaint.setStyle(Paint.Style.FILL);
+        mPaint.setAntiAlias(true);
+
+        // Make the drawable with the triangle pointing down and positioned on the left..
+        addDownPointingRoundedTriangleToPath(width, height, radius, mPath);
+        clipPopupBodyFromPath(popupRadius, popupWidth, popupHeight, arrowOffsetX, arrowOffsetY,
+                mPath);
+
+        // ... then flip it horizontal or vertical based on where it will be used.
+        Matrix pathTransform = new Matrix();
+        pathTransform.setScale(
+                leftAligned ? 1 : -1, isPointingUp ? -1 : 1, width * 0.5f, height * 0.5f);
+        mPath.transform(pathTransform);
+    }
+
+    @Override
+    public void draw(Canvas canvas) {
+        canvas.drawPath(mPath, mPaint);
+    }
+
+    @Override
+    public void getOutline(Outline outline) {
+        outline.setPath(mPath);
+    }
+
+    @Override
+    public int getOpacity() {
+        return PixelFormat.TRANSLUCENT;
+    }
+
+    @Override
+    public void setAlpha(int i) {
+        mPaint.setAlpha(i);
+    }
+
+    @Override
+    public void setColorFilter(ColorFilter colorFilter) {
+        mPaint.setColorFilter(colorFilter);
+    }
+
+    private static void addDownPointingRoundedTriangleToPath(float width, float height,
+            float radius, Path path) {
+        // Calculated for the arrow pointing down, will be flipped later if needed.
+
+        // Theta is half of the angle inside the triangle tip
+        float tanTheta = width / (2.0f * height);
+        float theta = (float) atan(tanTheta);
+
+        // Some trigonometry to find the center of the circle for the rounded tip
+        float roundedPointCenterY = (float) (height - (radius / sin(theta)));
+
+        // p is the distance along the triangle side to the intersection with the point circle
+        float p = radius / tanTheta;
+        float lineRoundPointIntersectFromCenter = (float) (p * sin(theta));
+        float lineRoundPointIntersectFromTop = (float) (height - (p * cos(theta)));
+
+        float centerX = width / 2.0f;
+        float thetaDeg = (float) toDegrees(theta);
+
+        path.reset();
+        path.moveTo(0, 0);
+        // Draw the top
+        path.lineTo(width, 0);
+        // Draw the right side up to the circle intersection
+        path.lineTo(
+                centerX + lineRoundPointIntersectFromCenter,
+                lineRoundPointIntersectFromTop);
+        // Draw the rounded point
+        path.arcTo(
+                centerX - radius,
+                roundedPointCenterY - radius,
+                centerX + radius,
+                roundedPointCenterY + radius,
+                thetaDeg,
+                180 - (2 * thetaDeg),
+                false);
+        // Draw the left edge to close
+        path.lineTo(0, 0);
+        path.close();
+    }
+
+    private static void clipPopupBodyFromPath(float popupRadius, float popupWidth,
+            float popupHeight, float arrowOffsetX, float arrowOffsetY, Path path) {
+        // Make a path that is used to clip the triangle, this represents the body of the popup
+        Path clipPiece = new Path();
+        clipPiece.addRoundRect(
+                0, 0, popupWidth, popupHeight,
+                popupRadius, popupRadius, Path.Direction.CW);
+        // clipping is performed as if the arrow is pointing down and positioned on the left, the
+        // resulting path will be flipped as needed later.
+        // The extra 0.5 in the vertical offset is to close the gap between this anti-aliased object
+        // and the anti-aliased body of the popup.
+        clipPiece.offset(-arrowOffsetX, -popupHeight + arrowOffsetY - 0.5f);
+        path.op(clipPiece, Path.Op.DIFFERENCE);
+    }
+}
-- 
GitLab


From 5f21f104f03f388d9dd219df734e45d0a508712d Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Thu, 25 Feb 2021 13:13:13 -0800
Subject: [PATCH 0566/1664] Waiting for the state of views to settle after
 orientation change

Presumably, we currently have flakes when immediately
after orientation change, we check for the presence of certain
views, and they are still not present.

Test: presubmit
Bug: 181057446
Change-Id: I6dbcb757a47c19728d4096283da6710f6dd5aa02
---
 .../quickstep/NavigationModeSwitchRule.java   |  4 +-
 .../tapl/LauncherInstrumentation.java         | 37 +++++++++++++------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
index 0f6671d18c..ea3c9bb042 100644
--- a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
+++ b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
@@ -200,8 +200,8 @@ public class NavigationModeSwitchRule implements TestRule {
                 () -> launcher.getNavigationModel() == expectedMode, WAIT_TIME_MS, launcher);
 
         Wait.atMost(() -> "Switching nav mode: "
-                        + launcher.getNavigationModeMismatchError(),
-                () -> launcher.getNavigationModeMismatchError() == null,
+                        + launcher.getNavigationModeMismatchError(false),
+                () -> launcher.getNavigationModeMismatchError(false) == null,
                 WAIT_TIME_MS, launcher);
         AbstractLauncherUiTest.checkDetectedLeaks(launcher);
         return true;
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 0c8f610928..5e20f7c110 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -365,9 +365,11 @@ public final class LauncherInstrumentation {
 
             if (hasSystemUiObject("keyguard_status_view")) return "Phone is locked";
 
-            if (!mDevice.hasObject(By.textStartsWith(""))) return "Screen is empty";
+            if (!mDevice.wait(Until.hasObject(By.textStartsWith("")), WAIT_TIME_MS)) {
+                return "Screen is empty";
+            }
 
-            final String navigationModeError = getNavigationModeMismatchError();
+            final String navigationModeError = getNavigationModeMismatchError(true);
             if (navigationModeError != null) return navigationModeError;
         } catch (Throwable e) {
             Log.w(TAG, "getSystemAnomalyMessage failed", e);
@@ -535,17 +537,28 @@ public final class LauncherInstrumentation {
         mExpectedRotation = expectedRotation;
     }
 
-    public String getNavigationModeMismatchError() {
+    public String getNavigationModeMismatchError(boolean waitForCorrectState) {
+        final int waitTime = waitForCorrectState ? WAIT_TIME_MS : 0;
         final NavigationModel navigationModel = getNavigationModel();
-        final boolean hasRecentsButton = hasSystemUiObject("recent_apps");
-        final boolean hasHomeButton = hasSystemUiObject("home");
-        if ((navigationModel == NavigationModel.THREE_BUTTON) != hasRecentsButton) {
-            return "Presence of recents button doesn't match the interaction mode, mode="
-                    + navigationModel.name() + ", hasRecents=" + hasRecentsButton;
+
+        if (navigationModel == NavigationModel.THREE_BUTTON) {
+            if (!mDevice.wait(Until.hasObject(By.res(SYSTEMUI_PACKAGE, "recent_apps")), waitTime)) {
+                return "Recents button not present in 3-button mode";
+            }
+        } else {
+            if (!mDevice.wait(Until.gone(By.res(SYSTEMUI_PACKAGE, "recent_apps")), waitTime)) {
+                return "Recents button is present in non-3-button mode";
+            }
         }
-        if ((navigationModel != NavigationModel.ZERO_BUTTON) != hasHomeButton) {
-            return "Presence of home button doesn't match the interaction mode, mode="
-                    + navigationModel.name() + ", hasHome=" + hasHomeButton;
+
+        if (navigationModel == NavigationModel.ZERO_BUTTON) {
+            if (!mDevice.wait(Until.gone(By.res(SYSTEMUI_PACKAGE, "home")), waitTime)) {
+                return "Home button is present in gestural mode";
+            }
+        } else {
+            if (!mDevice.wait(Until.hasObject(By.res(SYSTEMUI_PACKAGE, "home")), waitTime)) {
+                return "Home button not present in non-gestural mode";
+            }
         }
         return null;
     }
@@ -556,7 +569,7 @@ public final class LauncherInstrumentation {
         assertEquals("Unexpected display rotation",
                 mExpectedRotation, mDevice.getDisplayRotation());
 
-        final String error = getNavigationModeMismatchError();
+        final String error = getNavigationModeMismatchError(true);
         assertTrue(error, error == null);
 
         log("verifyContainerType: " + containerType);
-- 
GitLab


From 6e2a8e86df3c8e87909413204ad972ce053b5b84 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Thu, 25 Feb 2021 19:29:09 -0800
Subject: [PATCH 0567/1664] Diagnosing expected selector in app-start

Test: manual
Bug: 179392551
Change-Id: I4c7173e784caaa6435927f94eef6b269884d0ce9
---
 tests/tapl/com/android/launcher3/tapl/Launchable.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/Launchable.java b/tests/tapl/com/android/launcher3/tapl/Launchable.java
index 3fc83ff926..c4a566b2c0 100644
--- a/tests/tapl/com/android/launcher3/tapl/Launchable.java
+++ b/tests/tapl/com/android/launcher3/tapl/Launchable.java
@@ -67,7 +67,7 @@ abstract class Launchable {
                 () -> "Launching an app didn't open a new window: " + label);
 
         mLauncher.assertTrue(
-                "App didn't start: " + label,
+                "App didn't start: " + label + " (" + selector + ")",
                 TestHelpers.wait(Until.hasObject(selector), LauncherInstrumentation.WAIT_TIME_MS));
         return new Background(mLauncher);
     }
-- 
GitLab


From 75845ed9a8f38468d70f7f9b0764dc8007c0a70d Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Fri, 26 Feb 2021 00:19:34 +0000
Subject: [PATCH 0568/1664] Adds a removeChangeListener to
 FeatureFlags$BooleanFlag.

This will help us avoid leaks, etc.

Also changes ENABLE_SMARTSPACE_ENHANCED back to a DeviceFlag

Bug: 181194850
Bug: 181077020
Test: atest NexusLauncherOutOfProcTests:com.android.launcher3.memory.MemoryTests -- --abi armeabi-v7a
Change-Id: I6f54af3e6b6302a073b8b7d448ff72b05a803d8f
---
 .../src/com/android/launcher3/uioverrides/DeviceFlag.java | 8 ++++++++
 src/com/android/launcher3/config/FeatureFlags.java        | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/DeviceFlag.java b/quickstep/src/com/android/launcher3/uioverrides/DeviceFlag.java
index 010694b0c5..bb1f6fcc00 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/DeviceFlag.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/DeviceFlag.java
@@ -60,6 +60,14 @@ public class DeviceFlag extends DebugFlag {
         mListeners.add(r);
     }
 
+    @Override
+    public void removeChangeListener(Runnable r) {
+        if (mListeners == null) {
+            return;
+        }
+        mListeners.remove(r);
+    }
+
     private void registerDeviceConfigChangedListener(Context context) {
         DeviceConfig.addOnPropertiesChangedListener(
                 NAMESPACE_LAUNCHER,
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index ef7bdf41ca..e406e9b8d6 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -158,7 +158,7 @@ public final class FeatureFlags {
             "ENABLE_SMARTSPACE_UNIVERSAL", false,
             "Replace Smartspace with a version rendered by System UI.");
 
-    public static final BooleanFlag ENABLE_SMARTSPACE_ENHANCED = getDebugFlag(
+    public static final BooleanFlag ENABLE_SMARTSPACE_ENHANCED = new DeviceFlag(
             "ENABLE_SMARTSPACE_ENHANCED", false,
             "Replace Smartspace with the enhanced version. "
               + "Ignored if ENABLE_SMARTSPACE_UNIVERSAL is enabled.");
@@ -263,6 +263,8 @@ public final class FeatureFlags {
         }
 
         public void addChangeListener(Context context, Runnable r) { }
+
+        public void removeChangeListener(Runnable r) {}
     }
 
     public static class DebugFlag extends BooleanFlag {
-- 
GitLab


From 167f81b931589054474dbdfd51ae9411a3e032ed Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Tue, 23 Feb 2021 10:48:46 +0000
Subject: [PATCH 0569/1664] Add a header container view to the widgets full
 sheet

A header container view will contain
1. A horizontal bar: for indicating the popup view can be dragged
   to dismiss:
2. A title view: a title of the widgets full sheet popup view.
3. A search bar: for widgets / shortcut search. Since we will be
   making the fallback search algorithm available in AOSP, the
   search bar will now live in the Launcher3 codebase.
4. Recommended widgets (coming soon...)

This CL also added a scroll effect which gradually collapses the
title view when the user scrolls down the recycler view. The title
view will gradually restore its height when the user scroll to the
top of the recycler view.

Test: Manually test widgets pickers in work profile and non work
      profile setup. Verified the fast scroll bar works well in
      both setup.
      With searchbar: https://drive.google.com/file/d/19grUHL_LspLhMD_5p6-i0CiMW1FpflmD/view?usp=sharing
      Without searchbar: https://drive.google.com/file/d/1KRPgEAESHUhJDo1UJsQN80JO1c9Y8Nhl/view?usp=sharing

Bug: 179797520

Change-Id: If0016e3b3c693414897140e7912531ed9bd5deef
---
 res/drawable/bg_widgets_searchbox.xml         |  19 ++
 res/layout/personal_work_tabs.xml             |   1 +
 res/layout/widgets_full_sheet_paged_view.xml  |   6 +-
 ..._full_sheet_search_and_recommendations.xml |  49 ++++++
 res/values/strings.xml                        |   8 +-
 .../android/launcher3/BaseRecyclerView.java   |  18 ++
 .../allapps/AllAppsRecyclerView.java          |  18 --
 .../views/RecyclerViewFastScroller.java       |  29 +++-
 ...rchAndRecommendationsScrollController.java | 162 ++++++++++++++++++
 .../widget/picker/WidgetsFullSheet.java       |  67 +++++++-
 .../widget/picker/WidgetsRecyclerView.java    |  26 ++-
 11 files changed, 375 insertions(+), 28 deletions(-)
 create mode 100644 res/drawable/bg_widgets_searchbox.xml
 create mode 100644 res/layout/widgets_full_sheet_search_and_recommendations.xml
 create mode 100644 src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java

diff --git a/res/drawable/bg_widgets_searchbox.xml b/res/drawable/bg_widgets_searchbox.xml
new file mode 100644
index 0000000000..81dd2aa0c6
--- /dev/null
+++ b/res/drawable/bg_widgets_searchbox.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="#FFFFF7" />
+    <corners android:radius="24dp" />
+</shape>
\ No newline at end of file
diff --git a/res/layout/personal_work_tabs.xml b/res/layout/personal_work_tabs.xml
index 8f29997802..5fb5bcbea0 100644
--- a/res/layout/personal_work_tabs.xml
+++ b/res/layout/personal_work_tabs.xml
@@ -23,6 +23,7 @@
     android:layout_marginLeft="@dimen/all_apps_tabs_side_padding"
     android:layout_marginRight="@dimen/all_apps_tabs_side_padding"
     android:orientation="horizontal"
+    android:elevation="2dp"
     style="@style/TextHeadline">
 
     <Button
diff --git a/res/layout/widgets_full_sheet_paged_view.xml b/res/layout/widgets_full_sheet_paged_view.xml
index cfbb6dd026..8125db8333 100644
--- a/res/layout/widgets_full_sheet_paged_view.xml
+++ b/res/layout/widgets_full_sheet_paged_view.xml
@@ -16,13 +16,15 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto">
 
-    <include layout="@layout/personal_work_tabs" />
+    <include layout="@layout/personal_work_tabs"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp" />
 
     <com.android.launcher3.workprofile.PersonalWorkPagedView
         android:id="@+id/widgets_view_pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@+id/tabs"
         android:clipToPadding="false"
         android:descendantFocusability="afterDescendants"
         launcher:pageIndicator="@+id/tabs">
diff --git a/res/layout/widgets_full_sheet_search_and_recommendations.xml b/res/layout/widgets_full_sheet_search_and_recommendations.xml
new file mode 100644
index 0000000000..9a6f922d7d
--- /dev/null
+++ b/res/layout/widgets_full_sheet_search_and_recommendations.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/search_and_recommendations_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="16dp"
+    android:orientation="vertical">
+    <View
+        android:id="@+id/collapse_handle"
+        android:layout_width="48dp"
+        android:layout_height="2dp"
+        android:layout_gravity="center_horizontal"
+        android:background="@color/popup_color_primary_dark"/>
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:textSize="24sp"
+        android:layout_marginTop="16dp"
+        android:text="@string/widget_button_text"/>
+    <!-- Disable the search bar because it has not been implemented. -->
+    <EditText
+        android:id="@+id/widgets_search_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:layout_marginTop="16dp"
+        android:background="@drawable/bg_widgets_searchbox"
+        android:drawablePadding="8dp"
+        android:drawableStart="@drawable/ic_allapps_search"
+        android:hint="@string/widgets_full_sheet_search_bar_hint"
+        android:padding="12dp" />
+</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5a9def796a..73f9e533ca 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -57,6 +57,12 @@
         <item quantity="one"><xliff:g id="widget_count" example="1">%1$d</xliff:g> widget</item>
         <item quantity="other"><xliff:g id="widget_count" example="2">%1$d</xliff:g> widgets</item>
     </plurals>
+    <!-- Text for both the tile of a popup view, which shows all available widgets installed on
+         the device, and the text of a button, which opens this popup view. [CHAR LIMIT=30]-->
+    <string name="widget_button_text">Widgets</string>
+    <!-- Search bar text shown in the popup view showing all available widgets installed on the
+         device. [CHAR_LIMIT=50] -->
+    <string name="widgets_full_sheet_search_bar_hint">Search</string>
 
     <!-- All Apps -->
     <!-- Search bar text in the apps view. [CHAR_LIMIT=50] -->
@@ -185,8 +191,6 @@
     <string name="folder_name_format_overflow">Folder: <xliff:g id="name" example="Games">%1$s</xliff:g>, <xliff:g id="size" example="2">%2$d</xliff:g> or more items</string>
 
     <!-- Strings for the customization mode -->
-    <!-- Text for widget add button [CHAR LIMIT=30]-->
-    <string name="widget_button_text">Widgets</string>
     <!-- Text for wallpaper change button [CHAR LIMIT=30]-->
     <string name="wallpaper_button_text">Wallpapers</string>
     <!-- Text for wallpaper change button [CHAR LIMIT=30]-->
diff --git a/src/com/android/launcher3/BaseRecyclerView.java b/src/com/android/launcher3/BaseRecyclerView.java
index c55b46b33a..9369bdc2fd 100644
--- a/src/com/android/launcher3/BaseRecyclerView.java
+++ b/src/com/android/launcher3/BaseRecyclerView.java
@@ -23,6 +23,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityNodeInfo;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.launcher3.compat.AccessibilityManagerCompat;
@@ -188,4 +189,21 @@ public abstract class BaseRecyclerView extends RecyclerView  {
         super.onInitializeAccessibilityNodeInfo(info);
         if (isLayoutSuppressed()) info.setScrollable(false);
     }
+
+    /**
+     * Scrolls this recycler view to the top.
+     */
+    public void scrollToTop() {
+        if (mScrollbar != null) {
+            mScrollbar.reattachThumbToScroll();
+        }
+        if (getLayoutManager() instanceof LinearLayoutManager) {
+            LinearLayoutManager layoutManager = (LinearLayoutManager) getLayoutManager();
+            if (layoutManager.findFirstCompletelyVisibleItemPosition() == 0) {
+                // We are at the top, so don't scrollToPosition (would cause unnecessary relayout).
+                return;
+            }
+        }
+        scrollToPosition(0);
+    }
 }
\ No newline at end of file
diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
index e61b95d070..ace99383e3 100644
--- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
@@ -36,7 +36,6 @@ import com.android.launcher3.BaseRecyclerView;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
-import com.android.launcher3.allapps.AllAppsGridAdapter.AppsGridLayoutManager;
 import com.android.launcher3.views.RecyclerViewFastScroller;
 
 import java.util.ArrayList;
@@ -109,23 +108,6 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
         mViewHeights.put(AllAppsGridAdapter.VIEW_TYPE_ICON, grid.allAppsCellHeightPx);
     }
 
-    /**
-     * Scrolls this recycler view to the top.
-     */
-    public void scrollToTop() {
-        // Ensure we reattach the scrollbar if it was previously detached while fast-scrolling
-        if (mScrollbar != null) {
-            mScrollbar.reattachThumbToScroll();
-        }
-        if (getLayoutManager() instanceof AppsGridLayoutManager) {
-            AppsGridLayoutManager layoutManager = (AppsGridLayoutManager) getLayoutManager();
-            if (layoutManager.findFirstCompletelyVisibleItemPosition() == 0) {
-                // We are at the top, so don't scrollToPosition (would cause unnecessary relayout).
-                return;
-            }
-        }
-        scrollToPosition(0);
-    }
 
     @Override
     public void onDraw(Canvas c) {
diff --git a/src/com/android/launcher3/views/RecyclerViewFastScroller.java b/src/com/android/launcher3/views/RecyclerViewFastScroller.java
index 804fb3e68e..ae34257214 100644
--- a/src/com/android/launcher3/views/RecyclerViewFastScroller.java
+++ b/src/com/android/launcher3/views/RecyclerViewFastScroller.java
@@ -34,6 +34,7 @@ import android.view.View;
 import android.view.ViewConfiguration;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.launcher3.BaseRecyclerView;
@@ -99,6 +100,7 @@ public class RecyclerViewFastScroller extends View {
     private boolean mIsThumbDetached;
     private final boolean mCanThumbDetach;
     private boolean mIgnoreDragGesture;
+    private boolean mIsRecyclerViewFirstChildInParent = true;
 
     // This is the offset from the top of the scrollbar when the user first starts touching.  To
     // prevent jumping, this offset is applied as the user scrolls.
@@ -112,6 +114,7 @@ public class RecyclerViewFastScroller extends View {
 
     protected BaseRecyclerView mRv;
     private RecyclerView.OnScrollListener mOnScrollListener;
+    @Nullable private OnFastScrollChangeListener mOnFastScrollChangeListener;
 
     private int mDownX;
     private int mDownY;
@@ -188,6 +191,9 @@ public class RecyclerViewFastScroller extends View {
         updatePopupY(y);
         mThumbOffsetY = y;
         invalidate();
+        if (mOnFastScrollChangeListener != null) {
+            mOnFastScrollChangeListener.onThumbOffsetYChanged(mThumbOffsetY);
+        }
     }
 
     public int getThumbOffsetY() {
@@ -391,7 +397,9 @@ public class RecyclerViewFastScroller extends View {
             return false;
         }
         getHitRect(sTempRect);
-        sTempRect.top += mRv.getScrollBarTop();
+        if (mIsRecyclerViewFirstChildInParent) {
+            sTempRect.top += mRv.getScrollBarTop();
+        }
         if (outOffset != null) {
             outOffset.set(sTempRect.left, sTempRect.top);
         }
@@ -404,4 +412,23 @@ public class RecyclerViewFastScroller extends View {
         // alpha is so low, it does not matter.
         return false;
     }
+
+    public void setIsRecyclerViewFirstChildInParent(boolean isRecyclerViewFirstChildInParent) {
+        mIsRecyclerViewFirstChildInParent = isRecyclerViewFirstChildInParent;
+    }
+
+    public void setOnFastScrollChangeListener(
+            @Nullable OnFastScrollChangeListener onFastScrollChangeListener) {
+        mOnFastScrollChangeListener = onFastScrollChangeListener;
+    }
+
+    /**
+     * A callback that is invoked when there is a scroll change in {@link RecyclerViewFastScroller}.
+     */
+    public interface OnFastScrollChangeListener {
+        /**
+         * Called when the thumb offset vertical position, in pixels, has changed to {@code y}.
+         */
+        void onThumbOffsetYChanged(int y);
+    }
 }
diff --git a/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java b/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java
new file mode 100644
index 0000000000..a5ed20a22e
--- /dev/null
+++ b/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget.picker;
+
+import android.view.View;
+import android.widget.RelativeLayout;
+
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.launcher3.views.RecyclerViewFastScroller;
+import com.android.launcher3.widget.picker.WidgetsFullSheet.SearchAndRecommendationViewHolder;
+import com.android.launcher3.workprofile.PersonalWorkPagedView;
+
+/**
+ * A controller which measures & updates {@link WidgetsFullSheet}'s views padding, margin and
+ * vertical displacement upon scrolling.
+ */
+final class SearchAndRecommendationsScrollController implements
+        RecyclerViewFastScroller.OnFastScrollChangeListener {
+    private final boolean mHasWorkProfile;
+    private final SearchAndRecommendationViewHolder mViewHolder;
+    private final RecyclerView mPrimaryRecyclerView;
+
+    // The following are only non null if mHasWorkProfile is true.
+    @Nullable private final RecyclerView mWorkRecyclerView;
+    @Nullable private final View mPrimaryWorkTabsView;
+    @Nullable private final PersonalWorkPagedView mPrimaryWorkViewPager;
+
+    private int mMaxCollapsibleHeight = 0;
+
+    SearchAndRecommendationsScrollController(
+            boolean hasWorkProfile,
+            SearchAndRecommendationViewHolder viewHolder,
+            RecyclerView primaryRecyclerView,
+            @Nullable RecyclerView workRecyclerView,
+            @Nullable View personalWorkTabsView,
+            @Nullable PersonalWorkPagedView primaryWorkViewPager) {
+        mHasWorkProfile = hasWorkProfile;
+        mViewHolder = viewHolder;
+        mPrimaryRecyclerView = primaryRecyclerView;
+        mWorkRecyclerView = workRecyclerView;
+        mPrimaryWorkTabsView = personalWorkTabsView;
+        mPrimaryWorkViewPager = primaryWorkViewPager;
+    }
+
+    /**
+     * Updates the margin and padding of {@link WidgetsFullSheet} to accumulate collapsible views.
+     */
+    public void updateMarginAndPadding() {
+        // The maximum vertical distance, in pixels, until the last collapsible element is not
+        // visible from the screen when the user scrolls down the recycler view.
+        mMaxCollapsibleHeight = mViewHolder.mContainer.getPaddingTop()
+                + mViewHolder.mCollapseHandle.getMeasuredHeight()
+                + mViewHolder.mHeaderTitle.getMeasuredHeight();
+
+        int topContainerHeight = mViewHolder.mContainer.getMeasuredHeight();
+        if (mHasWorkProfile) {
+            // In a work profile setup, the full widget sheet contains the following views:
+            //           -------               -|
+            //           Widgets               -|---> LinearLayout for search & recommendations
+            //          Search bar             -|
+            //      Personal | Work
+            //           View Pager
+            //
+            // Views after the search & recommendations are not bound by RelativelyLayout param.
+            // To position them on the expected location, padding & margin are added to these views
+
+            // Tabs should have a padding of the height of the search & recommendations container.
+            mPrimaryWorkTabsView.setPadding(
+                    mPrimaryWorkTabsView.getPaddingLeft(),
+                    topContainerHeight,
+                    mPrimaryWorkTabsView.getPaddingRight(),
+                    mPrimaryWorkTabsView.getPaddingBottom());
+
+            // Instead of setting the top offset directly, we split the top offset into two values:
+            // 1. topOffsetAfterAllViewsCollapsed: this is the top offset after all collapsible
+            //    views are no longer visible on the screen.
+            //    This value is set as the margin for the view pager.
+            // 2. mMaxCollapsibleDistance
+            //    This value is set as the padding for the recycler views in order to work with
+            //    clipToPadding="false", which is an attribute for not showing top / bottom padding
+            //    when a recycler view has not reached the top or bottom of the list.
+            //    e.g. a list of 10 entries, only 3 entries are visible at a time.
+            //         case 1: recycler view is scrolled to the top. Top padding is visible/
+            //         (top padding)
+            //         item 1
+            //         item 2
+            //         item 3
+            //
+            //         case 2: recycler view is scrolled to the middle. No padding is visible.
+            //         item 4
+            //         item 5
+            //         item 6
+            //
+            //         case 3: recycler view is scrolled to the end. bottom padding is visible.
+            //         item 8
+            //         item 9
+            //         item 10
+            //         (bottom padding): not set in this case.
+            //
+            // When the views are first inflated, the sum of topOffsetAfterAllViewsCollapsed and
+            // mMaxCollapsibleDistance should equal to the top container height.
+            int tabsViewActualHeight =
+                    mPrimaryWorkTabsView.getMeasuredHeight() - mPrimaryWorkTabsView.getPaddingTop();
+            int topOffsetAfterAllViewsCollapsed =
+                    topContainerHeight + tabsViewActualHeight - mMaxCollapsibleHeight;
+
+            RelativeLayout.LayoutParams layoutParams =
+                    (RelativeLayout.LayoutParams) mPrimaryWorkViewPager.getLayoutParams();
+            layoutParams.setMargins(0, topOffsetAfterAllViewsCollapsed, 0, 0);
+            mPrimaryWorkViewPager.setLayoutParams(layoutParams);
+            mPrimaryWorkViewPager.requestLayout();
+
+            mPrimaryRecyclerView.setPadding(
+                    mPrimaryRecyclerView.getPaddingLeft(),
+                    mMaxCollapsibleHeight,
+                    mPrimaryRecyclerView.getPaddingRight(),
+                    mPrimaryRecyclerView.getPaddingBottom());
+            mWorkRecyclerView.setPadding(
+                    mWorkRecyclerView.getPaddingLeft(),
+                    mMaxCollapsibleHeight,
+                    mWorkRecyclerView.getPaddingRight(),
+                    mWorkRecyclerView.getPaddingBottom());
+        } else {
+            mPrimaryRecyclerView.setPadding(
+                    mPrimaryRecyclerView.getPaddingLeft(),
+                    topContainerHeight,
+                    mPrimaryRecyclerView.getPaddingRight(),
+                    mPrimaryRecyclerView.getPaddingBottom());
+        }
+    }
+
+    /**
+     * Changes the displacement of collapsible views (e.g. title & widget recommendations) and fixed
+     * views (e.g. recycler views, tabs) upon scrolling.
+     */
+    @Override
+    public void onThumbOffsetYChanged(int y) {
+        if (mMaxCollapsibleHeight > 0) {
+            int yDisplacement = Math.max(-y, -mMaxCollapsibleHeight);
+            mViewHolder.mHeaderTitle.setTranslationY(yDisplacement);
+            mViewHolder.mSearchBar.setTranslationY(yDisplacement);
+            if (mHasWorkProfile) {
+                mPrimaryWorkTabsView.setTranslationY(yDisplacement);
+            }
+        }
+    }
+}
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 39953b17e2..5a5c2ef878 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -34,6 +34,8 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
+import android.widget.EditText;
+import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
@@ -61,7 +63,8 @@ import java.util.function.Predicate;
  * Popup for showing the full list of available widgets
  */
 public class WidgetsFullSheet extends BaseWidgetSheet
-        implements Insettable, ProviderChangedListener, OnActivePageChangedListener {
+        implements Insettable, ProviderChangedListener, OnActivePageChangedListener,
+        WidgetsRecyclerView.HeaderViewDimensionsProvider {
 
     private static final long DEFAULT_OPEN_DURATION = 267;
     private static final long FADE_IN_DURATION = 150;
@@ -77,6 +80,10 @@ public class WidgetsFullSheet extends BaseWidgetSheet
             mPrimaryWidgetsFilter.negate();
 
     @Nullable private PersonalWorkPagedView mViewPager;
+    private int mInitialTabsHeight = 0;
+    private View mTabsView;
+    private SearchAndRecommendationViewHolder mSearchAndRecommendationViewHolder;
+    private SearchAndRecommendationsScrollController mSearchAndRecommendationsScrollController;
 
     public WidgetsFullSheet(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
@@ -98,8 +105,9 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         LayoutInflater layoutInflater = LayoutInflater.from(getContext());
         int contentLayoutRes = mHasWorkProfile ? R.layout.widgets_full_sheet_paged_view
                 : R.layout.widgets_full_sheet_recyclerview;
-        layoutInflater.inflate(contentLayoutRes,  springLayout, true);
+        layoutInflater.inflate(contentLayoutRes, springLayout, true);
 
+        RecyclerViewFastScroller fastScroller = findViewById(R.id.fast_scroller);
         if (mHasWorkProfile) {
             mViewPager = findViewById(R.id.widgets_view_pager);
             // Temporarily disable swipe gesture until widgets list horizontal scrollviews per
@@ -108,10 +116,12 @@ public class WidgetsFullSheet extends BaseWidgetSheet
             mViewPager.initParentViews(this);
             mViewPager.getPageIndicator().setOnActivePageChangedListener(this);
             mViewPager.getPageIndicator().setActiveMarker(AdapterHolder.PRIMARY);
+            mTabsView = findViewById(R.id.tabs);
             findViewById(R.id.tab_personal)
                     .setOnClickListener((View view) -> mViewPager.snapToPage(0));
             findViewById(R.id.tab_work)
                     .setOnClickListener((View view) -> mViewPager.snapToPage(1));
+            fastScroller.setIsRecyclerViewFirstChildInParent(false);
             springLayout.addSpringView(R.id.primary_widgets_list_view);
             springLayout.addSpringView(R.id.work_widgets_list_view);
         } else {
@@ -119,12 +129,36 @@ public class WidgetsFullSheet extends BaseWidgetSheet
             springLayout.addSpringView(R.id.primary_widgets_list_view);
         }
 
+        layoutInflater.inflate(R.layout.widgets_full_sheet_search_and_recommendations, springLayout,
+                true);
+        springLayout.addSpringView(R.id.search_and_recommendations_container);
+
+        mSearchAndRecommendationViewHolder = new SearchAndRecommendationViewHolder(
+                findViewById(R.id.search_and_recommendations_container));
+        mSearchAndRecommendationsScrollController = new SearchAndRecommendationsScrollController(
+                mHasWorkProfile,
+                mSearchAndRecommendationViewHolder,
+                findViewById(R.id.primary_widgets_list_view),
+                mHasWorkProfile ? findViewById(R.id.work_widgets_list_view) : null,
+                mTabsView,
+                mViewPager);
+        fastScroller.setOnFastScrollChangeListener(mSearchAndRecommendationsScrollController);
+
         onWidgetsBound();
     }
 
     @Override
     public void onActivePageChanged(int currentActivePage) {
         mAdapters.get(currentActivePage).mWidgetsRecyclerView.bindFastScrollbar();
+
+        reset();
+    }
+
+    private void reset() {
+        mAdapters.get(AdapterHolder.PRIMARY).mWidgetsRecyclerView.scrollToTop();
+        if (mHasWorkProfile) {
+            mAdapters.get(AdapterHolder.WORK).mWidgetsRecyclerView.scrollToTop();
+        }
     }
 
     @VisibleForTesting
@@ -220,6 +254,12 @@ public class WidgetsFullSheet extends BaseWidgetSheet
                 contentLeft + contentWidth, height);
 
         setTranslationShift(mTranslationShift);
+
+        if (mInitialTabsHeight == 0 && mTabsView != null) {
+            mInitialTabsHeight = mTabsView.getMeasuredHeight();
+        }
+
+        mSearchAndRecommendationsScrollController.updateMarginAndPadding();
     }
 
     @Override
@@ -325,6 +365,14 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         AccessibilityManagerCompat.sendStateEventToTest(getContext(), NORMAL_STATE_ORDINAL);
     }
 
+    @Override
+    public int getHeaderViewHeight() {
+        // No need to check work profile here because mInitialTabHeight is always 0 if there is no
+        // work profile.
+        return mInitialTabsHeight
+                + mSearchAndRecommendationViewHolder.mContainer.getMeasuredHeight();
+    }
+
     /** A holder class for holding adapters & their corresponding recycler view. */
     private final class AdapterHolder {
         static final int PRIMARY = 0;
@@ -354,9 +402,24 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         void setup(WidgetsRecyclerView recyclerView) {
             mWidgetsRecyclerView = recyclerView;
             mWidgetsRecyclerView.setAdapter(mWidgetsListAdapter);
+            mWidgetsRecyclerView.setHeaderViewDimensionsProvider(WidgetsFullSheet.this);
             mWidgetsRecyclerView.setEdgeEffectFactory(
                     ((TopRoundedCornerView) mContent).createEdgeEffectFactory());
             mWidgetsListAdapter.setApplyBitmapDeferred(false, mWidgetsRecyclerView);
         }
     }
+
+    final class SearchAndRecommendationViewHolder {
+        final View mContainer;
+        final View mCollapseHandle;
+        final EditText mSearchBar;
+        final TextView mHeaderTitle;
+
+        SearchAndRecommendationViewHolder(View searchAndRecommendationContainer) {
+            mContainer = searchAndRecommendationContainer;
+            mCollapseHandle = mContainer.findViewById(R.id.collapse_handle);
+            mSearchBar = mContainer.findViewById(R.id.widgets_search_bar);
+            mHeaderTitle = mContainer.findViewById(R.id.title);
+        }
+    }
 }
diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java b/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
index 52e94969c6..d65a8098f9 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
@@ -40,6 +40,7 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
 
     private final Point mFastScrollerOffset = new Point();
     private boolean mTouchDownOnScroller;
+    private HeaderViewDimensionsProvider mHeaderViewDimensionsProvider;
 
     public WidgetsRecyclerView(Context context) {
         this(context, null);
@@ -135,8 +136,8 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
     @Override
     protected int getAvailableScrollHeight() {
         View child = getChildAt(0);
-        return child.getMeasuredHeight() * mAdapter.getItemCount() - getScrollbarTrackHeight()
-                - mScrollbarTop;
+        return child.getMeasuredHeight() * mAdapter.getItemCount() + getScrollBarTop()
+                + getPaddingBottom() - mScrollbar.getHeight();
     }
 
     private boolean isModelNotReady() {
@@ -145,7 +146,9 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
 
     @Override
     public int getScrollBarTop() {
-        return mScrollbarTop;
+        return mHeaderViewDimensionsProvider == null
+                ? mScrollbarTop
+                : mHeaderViewDimensionsProvider.getHeaderViewHeight() + mScrollbarTop;
     }
 
     @Override
@@ -171,4 +174,21 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
     @Override
     public void onRequestDisallowInterceptTouchEvent(boolean disallowIntercept) {
     }
+
+    public void setHeaderViewDimensionsProvider(
+            HeaderViewDimensionsProvider headerViewDimensionsProvider) {
+        mHeaderViewDimensionsProvider = headerViewDimensionsProvider;
+    }
+
+    /**
+     * Provides dimensions of the header view that is shown at the top of a
+     * {@link WidgetsRecyclerView}.
+     */
+    public interface HeaderViewDimensionsProvider {
+        /**
+         * Returns the height, in pixels, of the header view that is shown at the top of a
+         * {@link WidgetsRecyclerView}.
+         */
+        int getHeaderViewHeight();
+    }
 }
-- 
GitLab


From 45cb6a8739dff2ae65aa93e8fdb928bfc75d1d90 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Fri, 26 Feb 2021 11:15:56 -0500
Subject: [PATCH 0570/1664] Check for developer option on resuming settings
 activity.

Test: Turn system dev option off, check pref is gone in home settings
      Turn system dev option on, check pref is visible in home settings

Change-Id: I71d90aa5840571e908228552e498ab3a82a3352d
---
 .../launcher3/settings/SettingsActivity.java  | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/settings/SettingsActivity.java b/src/com/android/launcher3/settings/SettingsActivity.java
index ac8dac5f7e..f03065c7f8 100644
--- a/src/com/android/launcher3/settings/SettingsActivity.java
+++ b/src/com/android/launcher3/settings/SettingsActivity.java
@@ -129,6 +129,7 @@ public class SettingsActivity extends FragmentActivity
         private String mHighLightKey;
         private boolean mPreferenceHighlighted = false;
         private NotificationDotsPreference mNotificationSettingsChangedListener;
+        private Preference mDeveloperOptionPref;
 
         @Override
         public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
@@ -202,18 +203,37 @@ public class SettingsActivity extends FragmentActivity
                     return FeatureFlags.showFlagTogglerUi(getContext());
 
                 case DEVELOPER_OPTIONS_KEY:
-                    // Show if plugins are enabled or flag UI is enabled.
-                    return FeatureFlags.showFlagTogglerUi(getContext()) ||
-                            PluginManagerWrapper.hasPlugins(getContext());
+                    mDeveloperOptionPref = preference;
+                    return updateDeveloperOption();
             }
 
             return true;
         }
 
+        /**
+         * Show if plugins are enabled or flag UI is enabled.
+         * @return True if we should show the preference option.
+         */
+        private boolean updateDeveloperOption() {
+            boolean showPreference = FeatureFlags.showFlagTogglerUi(getContext())
+                    || PluginManagerWrapper.hasPlugins(getContext());
+            if (mDeveloperOptionPref != null) {
+                mDeveloperOptionPref.setEnabled(showPreference);
+                if (showPreference) {
+                    getPreferenceScreen().addPreference(mDeveloperOptionPref);
+                } else {
+                    getPreferenceScreen().removePreference(mDeveloperOptionPref);
+                }
+            }
+            return showPreference;
+        }
+
         @Override
         public void onResume() {
             super.onResume();
 
+            updateDeveloperOption();
+
             if (isAdded() && !mPreferenceHighlighted) {
                 PreferenceHighlighter highlighter = createHighlighter();
                 if (highlighter != null) {
-- 
GitLab


From 11773f47d2d0ce7a082d4ea69087c36898a10ad5 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Thu, 25 Feb 2021 22:54:37 +0000
Subject: [PATCH 0571/1664] Show widget previews in their expected cell sizes

1. Show widget previews in their expected cell sizes.
2. Update the bottom picker to use a table layout rather than
a horizontal scrollbar.
3. Move the title and cell size description to the bottom of
the preview.

Test: Run AddConfigWidgetTest
      Manually open full and bottom widgets picker and observe
      widget previews.
      Video: https://drive.google.com/file/d/1K8A8hK5B4FgPTsX3cb-Yt4a_VjI0pk-w/view?usp=sharing
Bug: 179797520
Change-Id: I938612cb2e2477ce4a3a2d6c8891a0a36fc0978c
---
 res/layout/live_preview_widget_cell.xml       |  6 +-
 res/layout/widget_cell.xml                    |  4 +-
 res/layout/widget_cell_content.xml            | 66 ++++++--------
 res/layout/widgets_bottom_sheet.xml           | 17 ++--
 res/layout/widgets_table_container.xml        |  1 +
 res/values/dimens.xml                         |  4 +-
 .../android/launcher3/widget/WidgetCell.java  | 28 ++++--
 .../launcher3/widget/WidgetsBottomSheet.java  | 86 +++++++++++--------
 .../widget/picker/WidgetsFullSheet.java       |  5 +-
 .../WidgetsListTableViewHolderBinder.java     |  2 +
 10 files changed, 124 insertions(+), 95 deletions(-)

diff --git a/res/layout/live_preview_widget_cell.xml b/res/layout/live_preview_widget_cell.xml
index 7a42d195f0..1e1ce6e42e 100644
--- a/res/layout/live_preview_widget_cell.xml
+++ b/res/layout/live_preview_widget_cell.xml
@@ -15,14 +15,16 @@
 -->
 <com.android.launcher3.dragndrop.LivePreviewWidgetCell
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+    android:layout_width="0dp"
     android:layout_height="wrap_content"
+    android:paddingHorizontal="@dimen/widget_cell_horizontal_padding"
+    android:paddingVertical="@dimen/widget_cell_vertical_padding"
     android:layout_weight="1"
     android:orientation="vertical"
     android:focusable="true"
     android:background="?android:attr/colorPrimaryDark"
     android:gravity="center_horizontal">
 
-    <include layout="@layout/widget_cell_content"  />
+    <include layout="@layout/widget_cell_content" />
 
 </com.android.launcher3.dragndrop.LivePreviewWidgetCell>
\ No newline at end of file
diff --git a/res/layout/widget_cell.xml b/res/layout/widget_cell.xml
index 148a99b1ef..73a573754a 100644
--- a/res/layout/widget_cell.xml
+++ b/res/layout/widget_cell.xml
@@ -15,8 +15,10 @@
 -->
 <com.android.launcher3.widget.WidgetCell
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+    android:layout_width="0dp"
     android:layout_height="wrap_content"
+    android:paddingHorizontal="@dimen/widget_cell_horizontal_padding"
+    android:paddingVertical="@dimen/widget_cell_vertical_padding"
     android:layout_weight="1"
     android:orientation="vertical"
     android:focusable="true"
diff --git a/res/layout/widget_cell_content.xml b/res/layout/widget_cell_content.xml
index 64f2362ed3..c3e37e9176 100644
--- a/res/layout/widget_cell_content.xml
+++ b/res/layout/widget_cell_content.xml
@@ -17,47 +17,37 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="@dimen/widget_preview_label_vertical_padding"
-        android:paddingBottom="@dimen/widget_preview_label_vertical_padding"
-        android:paddingLeft="@dimen/widget_preview_label_horizontal_padding"
-        android:paddingRight="@dimen/widget_preview_label_horizontal_padding"
-        android:orientation="horizontal">
-
-        <!-- The name of the widget. -->
-        <TextView
-            android:id="@+id/widget_name"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ellipsize="end"
-            android:fadingEdge="horizontal"
-            android:gravity="start"
-            android:singleLine="true"
-            android:maxLines="1"
-            android:textColor="?android:attr/textColorSecondary"
-            android:textSize="14sp" />
-
-        <!-- The original dimensions of the widget (can't be the same text as above due to different
-             style. -->
-        <TextView
-            android:id="@+id/widget_dims"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="5dp"
-            android:layout_marginLeft="5dp"
-            android:textColor="?android:attr/textColorSecondary"
-            android:textSize="14sp"
-            android:alpha="0.8" />
-    </LinearLayout>
-
     <!-- The image of the widget. This view does not support padding. Any placement adjustment
          should be done using margins. -->
     <com.android.launcher3.widget.WidgetImageView
         android:id="@+id/widget_preview"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="0dp"
-        android:layout_weight="1" />
+        android:layout_weight="1"
+        android:layout_marginVertical="8dp" />
+
+    <!-- The name of the widget. -->
+    <TextView
+        android:id="@+id/widget_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:fadingEdge="horizontal"
+        android:gravity="center_horizontal"
+        android:singleLine="true"
+        android:maxLines="1"
+        android:textColor="?android:attr/textColorSecondary"
+        android:textSize="14sp" />
+
+    <!-- The original dimensions of the widget (can't be the same text as above due to different
+         style. -->
+    <TextView
+        android:id="@+id/widget_dims"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:textColor="?android:attr/textColorSecondary"
+        android:textSize="14sp"
+        android:alpha="0.8" />
+
 </merge>
\ No newline at end of file
diff --git a/res/layout/widgets_bottom_sheet.xml b/res/layout/widgets_bottom_sheet.xml
index 3fdfc96667..c1b2cbff12 100644
--- a/res/layout/widgets_bottom_sheet.xml
+++ b/res/layout/widgets_bottom_sheet.xml
@@ -44,11 +44,16 @@
         android:textSize="14sp"
         android:text="@string/long_press_widget_to_add"/>
 
-    <include layout="@layout/widgets_scroll_container"
-         android:id="@+id/widgets"
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content"
-         android:layout_marginTop="45dp"
-         android:layout_marginBottom="40dp"/>
+    <ScrollView
+        android:id="@+id/widgets_table_scroll_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="45dp"
+        android:layout_marginBottom="40dp">
+        <include layout="@layout/widgets_table_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal" />
+    </ScrollView>
 
 </com.android.launcher3.widget.WidgetsBottomSheet>
\ No newline at end of file
diff --git a/res/layout/widgets_table_container.xml b/res/layout/widgets_table_container.xml
index ffa239a699..c4dfe7e7c3 100644
--- a/res/layout/widgets_table_container.xml
+++ b/res/layout/widgets_table_container.xml
@@ -18,4 +18,5 @@
     android:id="@+id/widgets_table"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginHorizontal="8dp"
     android:background="?android:attr/colorPrimaryDark" />
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index acc6466caa..ee917996e5 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -102,8 +102,8 @@
     <dimen name="work_profile_footer_text_size">16sp</dimen>
 
 <!-- Widget tray -->
-    <dimen name="widget_preview_label_vertical_padding">8dp</dimen>
-    <dimen name="widget_preview_label_horizontal_padding">16dp</dimen>
+    <dimen name="widget_cell_vertical_padding">8dp</dimen>
+    <dimen name="widget_cell_horizontal_padding">16dp</dimen>
 
     <dimen name="widget_preview_shadow_blur">0.5dp</dimen>
     <dimen name="widget_preview_key_shadow_distance">1dp</dimen>
diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index bef91d2af4..c6593f869e 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -24,7 +24,6 @@ import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnLayoutChangeListener;
-import android.view.ViewGroup;
 import android.view.ViewPropertyAnimator;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.LinearLayout;
@@ -60,6 +59,8 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     /** Widget preview width is calculated by multiplying this factor to the widget cell width. */
     private static final float PREVIEW_SCALE = 0.8f;
 
+    private int mPreviewWidth;
+    private int mPreviewHeight;
     protected int mPresetPreviewSize;
     private int mCellSize;
 
@@ -106,6 +107,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     private void setContainerWidth() {
         mCellSize = (int) (mDeviceProfile.allAppsIconSizePx * WIDTH_SCALE);
         mPresetPreviewSize = (int) (mCellSize * PREVIEW_SCALE);
+        mPreviewWidth = mPreviewHeight = mPresetPreviewSize;
     }
 
     @Override
@@ -128,6 +130,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
         mWidgetImage.setBitmap(null, null);
         mWidgetName.setText(null);
         mWidgetDims.setText(null);
+        mPreviewWidth = mPreviewHeight = mPresetPreviewSize;
 
         if (mActiveRequest != null) {
             mActiveRequest.cancel();
@@ -181,6 +184,11 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
             return;
         }
         if (bitmap != null) {
+            LayoutParams layoutParams = (LayoutParams) mWidgetImage.getLayoutParams();
+            layoutParams.width = bitmap.getWidth();
+            layoutParams.height = bitmap.getHeight();
+            mWidgetImage.setLayoutParams(layoutParams);
+
             mWidgetImage.setBitmap(bitmap, mWidgetPreviewLoader.getBadgeForUser(mItem.user,
                     BaseIconFactory.getBadgeSizeForIconSize(mDeviceProfile.allAppsIconSizePx)));
             if (mAnimatePreview) {
@@ -197,8 +205,16 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
         if (mActiveRequest != null) {
             return;
         }
-        mActiveRequest = mWidgetPreviewLoader.getPreview(
-                mItem, mPresetPreviewSize, mPresetPreviewSize, this);
+        mActiveRequest = mWidgetPreviewLoader.getPreview(mItem, mPreviewWidth, mPreviewHeight,
+                this);
+    }
+
+    /** Sets the widget preview image size in number of cells. */
+    public void setPreviewSize(int spanX, int spanY) {
+        int padding = 2 * getResources()
+                .getDimensionPixelSize(R.dimen.widget_preview_shortcut_padding);
+        mPreviewWidth = mDeviceProfile.cellWidthPx * spanX + padding;
+        mPreviewHeight = mDeviceProfile.cellHeightPx * spanY + padding;
     }
 
     @Override
@@ -232,12 +248,6 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
         return "";
     }
 
-    @Override
-    public void setLayoutParams(ViewGroup.LayoutParams params) {
-        params.width = params.height = mCellSize;
-        super.setLayoutParams(params);
-    }
-
     @Override
     public CharSequence getAccessibilityClassName() {
         return WidgetCell.class.getName();
diff --git a/src/com/android/launcher3/widget/WidgetsBottomSheet.java b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
index 223cda272a..6abbf21019 100644
--- a/src/com/android/launcher3/widget/WidgetsBottomSheet.java
+++ b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
@@ -24,22 +24,25 @@ import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.util.IntProperty;
 import android.util.Pair;
-import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.Interpolator;
+import android.widget.ScrollView;
+import android.widget.TableLayout;
+import android.widget.TableRow;
 import android.widget.TextView;
 
+import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Insettable;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
-import com.android.launcher3.ResourceUtils;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.dragndrop.LivePreviewWidgetCell;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.util.PackageUserKey;
+import com.android.launcher3.widget.util.WidgetsTableUtils;
 
 import java.util.List;
 
@@ -65,6 +68,8 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
     private static final int DEFAULT_CLOSE_DURATION = 200;
     private ItemInfo mOriginalItemInfo;
     private Rect mInsets;
+    private final int mMaxTableHeight;
+    private int mMaxHorizontalSpan = 4;
 
     public WidgetsBottomSheet(Context context, AttributeSet attrs) {
         this(context, attrs, 0);
@@ -75,12 +80,41 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
         setWillNotDraw(false);
         mInsets = new Rect();
         mContent = this;
+        DeviceProfile deviceProfile = mLauncher.getDeviceProfile();
+        // Set the max table height to 2 / 3 of the grid height so that the bottom picker won't
+        // take over the entire view vertically.
+        mMaxTableHeight = deviceProfile.inv.numRows * 2 / 3  * deviceProfile.cellHeightPx;
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+        int paddingPx = 2 * getResources().getDimensionPixelOffset(
+                R.dimen.widget_cell_horizontal_padding);
+        int maxHorizontalSpan = findViewById(R.id.widgets_table).getMeasuredWidth()
+                / (mLauncher.getDeviceProfile().cellWidthPx + paddingPx);
+
+        if (mMaxHorizontalSpan != maxHorizontalSpan) {
+            // Ensure the table layout is showing widgets in the right column after measure.
+            mMaxHorizontalSpan = maxHorizontalSpan;
+            onWidgetsBound();
+        }
     }
 
     @Override
     protected void onLayout(boolean changed, int l, int t, int r, int b) {
         super.onLayout(changed, l, t, r, b);
         setTranslationShift(mTranslationShift);
+
+        // Ensure the scroll view height is not larger than mMaxTableHeight, which is a value
+        // smaller than the entire screen height.
+        ScrollView widgetsTableScrollView = findViewById(R.id.widgets_table_scroll_view);
+        if (widgetsTableScrollView.getMeasuredHeight() > mMaxTableHeight) {
+            ViewGroup.LayoutParams layoutParams = widgetsTableScrollView.getLayoutParams();
+            layoutParams.height = mMaxTableHeight;
+            widgetsTableScrollView.setLayoutParams(layoutParams);
+        }
     }
 
     public void populateAndShow(ItemInfo itemInfo) {
@@ -101,39 +135,21 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
                         mOriginalItemInfo.getTargetComponent().getPackageName(),
                         mOriginalItemInfo.user));
 
-        ViewGroup widgetRow = findViewById(R.id.widgets);
-        ViewGroup widgetCells = widgetRow.findViewById(R.id.widgets_cell_list);
-
-        widgetCells.removeAllViews();
-
-        for (int i = 0; i < widgets.size(); i++) {
-            WidgetCell widget = addItemCell(widgetCells);
-            widget.applyFromCellItem(widgets.get(i), LauncherAppState.getInstance(mLauncher)
-                    .getWidgetCache());
-            widget.ensurePreview();
-            widget.setVisibility(View.VISIBLE);
-            if (i < widgets.size() - 1) {
-                addDivider(widgetCells);
-            }
-        }
-
-        if (widgets.size() == 1) {
-            // If there is only one widget, we want to center it instead of left-align.
-            WidgetsBottomSheet.LayoutParams params = (WidgetsBottomSheet.LayoutParams)
-                    widgetRow.getLayoutParams();
-            params.gravity = Gravity.CENTER_HORIZONTAL;
-        } else {
-            // Otherwise, add an empty view to the start as padding (but still scroll edge to edge).
-            View leftPaddingView = LayoutInflater.from(getContext()).inflate(
-                    R.layout.widget_list_divider, widgetRow, false);
-            leftPaddingView.getLayoutParams().width = ResourceUtils.pxFromDp(
-                    16, getResources().getDisplayMetrics());
-            widgetCells.addView(leftPaddingView, 0);
-        }
-    }
-
-    private void addDivider(ViewGroup parent) {
-        LayoutInflater.from(getContext()).inflate(R.layout.widget_list_divider, parent, true);
+        TableLayout widgetsTable = findViewById(R.id.widgets_table);
+        widgetsTable.removeAllViews();
+
+        WidgetsTableUtils.groupWidgetItemsIntoTable(widgets, mMaxHorizontalSpan).forEach(row -> {
+            TableRow tableRow = new TableRow(getContext());
+            row.forEach(widgetItem -> {
+                WidgetCell widget = addItemCell(tableRow);
+                widget.setPreviewSize(widgetItem.spanX, widgetItem.spanY);
+                widget.applyFromCellItem(widgetItem, LauncherAppState.getInstance(mLauncher)
+                        .getWidgetCache());
+                widget.ensurePreview();
+                widget.setVisibility(View.VISIBLE);
+            });
+            widgetsTable.addView(tableRow);
+        });
     }
 
     protected WidgetCell addItemCell(ViewGroup parent) {
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 39953b17e2..fddb93112c 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -198,8 +198,9 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec),
                 MeasureSpec.getSize(heightMeasureSpec));
 
-        int maxSpansPerRow = getMeasuredWidth() / (deviceProfile.cellWidthPx
-                + deviceProfile.workspaceCellPaddingXPx);
+        int paddingPx = 2 * getResources().getDimensionPixelOffset(
+                R.dimen.widget_cell_horizontal_padding);
+        int maxSpansPerRow = getMeasuredWidth() / (deviceProfile.cellWidthPx + paddingPx);
         mAdapters.get(AdapterHolder.PRIMARY).mWidgetsListAdapter.setMaxHorizontalSpansPerRow(
                 maxSpansPerRow);
         if (mHasWorkProfile) {
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java b/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
index 2355700e72..9c8684a0bc 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
@@ -112,7 +112,9 @@ public final class WidgetsListTableViewHolderBinder
                 TableRow row = (TableRow) table.getChildAt(i);
                 row.setVisibility(View.VISIBLE);
                 WidgetCell widget = (WidgetCell) row.getChildAt(j);
+                widget.clear();
                 WidgetItem widgetItem = widgetItemsPerRow.get(j);
+                widget.setPreviewSize(widgetItem.spanX, widgetItem.spanY);
                 widget.applyFromCellItem(widgetItem, mWidgetPreviewLoader);
                 widget.setApplyBitmapDeferred(mApplyBitmapDeferred);
                 widget.ensurePreview();
-- 
GitLab


From 81bf29c9983b8005888c8044abc9ed0f38c8bce8 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Thu, 25 Feb 2021 12:51:56 -0600
Subject: [PATCH 0572/1664] Show typeahead hint for app results

Preview: https://drive.google.com/file/d/1_qB-HDVfqqzPOhnuq5Hj9grhh69av7xf/view

Bug: 180545101
Test: Manual
Change-Id: I0649fa0e19f850fdc4de3776f6ac9f450bb0501b
---
 src/com/android/launcher3/allapps/SearchUiManager.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/allapps/SearchUiManager.java b/src/com/android/launcher3/allapps/SearchUiManager.java
index f9260868f5..39410a7b3f 100644
--- a/src/com/android/launcher3/allapps/SearchUiManager.java
+++ b/src/com/android/launcher3/allapps/SearchUiManager.java
@@ -61,7 +61,8 @@ public interface SearchUiManager {
     /**
      * Called when activity is destroyed. Used to close search system services
      */
-    default void destroy(){}
+    default void destroy() {
+    }
 
     /**
      * Returns true if the QSB should be visible for the given set of visible elements
@@ -75,4 +76,9 @@ public interface SearchUiManager {
      */
     @Nullable
     EditText getEditText();
+
+    /**
+     * sets highlight result's title
+     */
+    default void setFocusedResultTitle(@Nullable  CharSequence title) { }
 }
-- 
GitLab


From 1bfd24e13f1446244ecde2f3ff19248c76630f26 Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Fri, 12 Feb 2021 20:09:12 -0800
Subject: [PATCH 0573/1664] [AA+] Fixes duplicate
 LAUNCHER_ALLAPPS_SWITCHED_TO_MAIN_TAB logs.

LAUNCHER_ALLAPPS_SWITCHED_TO_MAIN_TAB is logged when transistioning from AllApps search results view to all apps view.

Bug: 178562918
Test: Manual
Change-Id: Ie02e23ae9eaabad719ad2a1fc8f08a9e4c36936f
---
 .../launcher3/allapps/AllAppsContainerView.java  | 16 ++++++++++++++--
 .../launcher3/allapps/AllAppsPagedView.java      | 16 ++++++++++++++++
 .../allapps/LauncherAllAppsContainerView.java    | 10 ----------
 .../launcher3/logging/StatsLogManager.java       | 14 ++++++++++----
 4 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index ec2a6d5b85..4fd25770e0 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -16,6 +16,8 @@
 package com.android.launcher3.allapps;
 
 import static com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItem;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_TAP_ON_PERSONAL_TAB;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_TAP_ON_WORK_TAB;
 import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_HAS_SHORTCUT_PERMISSION;
 import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_QUIET_MODE_CHANGE_PERMISSION;
 import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_QUIET_MODE_ENABLED;
@@ -432,9 +434,19 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
             mAH[AdapterHolder.WORK].setup(mViewPager.getChildAt(1), mWorkMatcher);
             mViewPager.getPageIndicator().setActiveMarker(AdapterHolder.MAIN);
             findViewById(R.id.tab_personal)
-                    .setOnClickListener((View view) -> mViewPager.snapToPage(AdapterHolder.MAIN));
+                    .setOnClickListener((View view) -> {
+                        if (mViewPager.snapToPage(AdapterHolder.MAIN)) {
+                            mLauncher.getStatsLogManager().logger()
+                                    .log(LAUNCHER_ALLAPPS_TAP_ON_PERSONAL_TAB);
+                        }
+                    });
             findViewById(R.id.tab_work)
-                    .setOnClickListener((View view) -> mViewPager.snapToPage(AdapterHolder.WORK));
+                    .setOnClickListener((View view) -> {
+                        if (mViewPager.snapToPage(AdapterHolder.WORK)) {
+                            mLauncher.getStatsLogManager().logger()
+                                    .log(LAUNCHER_ALLAPPS_TAP_ON_WORK_TAB);
+                        }
+                    });
             onActivePageChanged(mViewPager.getNextPage());
         } else {
             mAH[AdapterHolder.MAIN].setup(findViewById(R.id.apps_list_view), null);
diff --git a/src/com/android/launcher3/allapps/AllAppsPagedView.java b/src/com/android/launcher3/allapps/AllAppsPagedView.java
index 647402b9e1..14e3b5140f 100644
--- a/src/com/android/launcher3/allapps/AllAppsPagedView.java
+++ b/src/com/android/launcher3/allapps/AllAppsPagedView.java
@@ -15,9 +15,13 @@
  */
 package com.android.launcher3.allapps;
 
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_SWIPE_TO_PERSONAL_TAB;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_SWIPE_TO_WORK_TAB;
+
 import android.content.Context;
 import android.util.AttributeSet;
 
+import com.android.launcher3.Launcher;
 import com.android.launcher3.PagedView;
 import com.android.launcher3.R;
 import com.android.launcher3.config.FeatureFlags;
@@ -44,4 +48,16 @@ public class AllAppsPagedView extends PersonalWorkPagedView {
                         R.dimen.all_apps_header_top_padding);
         setPadding(0, topPadding, 0, 0);
     }
+
+    @Override
+    protected boolean snapToPageWithVelocity(int whichPage, int velocity) {
+        boolean resp = super.snapToPageWithVelocity(whichPage, velocity);
+        if (resp && whichPage != mCurrentPage) {
+            Launcher.getLauncher(getContext()).getStatsLogManager().logger()
+                    .log(mCurrentPage < whichPage
+                            ? LAUNCHER_ALLAPPS_SWIPE_TO_WORK_TAB
+                            : LAUNCHER_ALLAPPS_SWIPE_TO_PERSONAL_TAB);
+        }
+        return resp;
+    }
 }
diff --git a/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java b/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
index bc2e66c36b..13ddc1244f 100644
--- a/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
@@ -16,8 +16,6 @@
 package com.android.launcher3.allapps;
 
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_KEYBOARD_CLOSED;
-import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_SWITCHED_TO_MAIN_TAB;
-import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_SWITCHED_TO_WORK_TAB;
 
 import android.content.Context;
 import android.graphics.Rect;
@@ -90,14 +88,6 @@ public class LauncherAllAppsContainerView extends AllAppsContainerView {
     public void onActivePageChanged(int currentActivePage) {
         super.onActivePageChanged(currentActivePage);
         if (mUsingTabs) {
-            // Log tab switches only when the launcher is in AllApps state
-            if (mLauncher.getStateManager().getCurrentStableState() == LauncherState.ALL_APPS) {
-                mLauncher.getStatsLogManager().logger()
-                        .log(currentActivePage == AdapterHolder.WORK
-                                ? LAUNCHER_ALLAPPS_SWITCHED_TO_WORK_TAB
-                                : LAUNCHER_ALLAPPS_SWITCHED_TO_MAIN_TAB);
-            }
-
             if (currentActivePage == AdapterHolder.WORK) {
                 WorkEduView.showWorkEduIfNeeded(mLauncher);
             } else {
diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index 431d5342d3..876ed35959 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -362,11 +362,11 @@ public class StatsLogManager implements ResourceBasedOverride {
         @UiEvent(doc = "User closed the AllApps keyboard.")
         LAUNCHER_ALLAPPS_KEYBOARD_CLOSED(694),
 
-        @UiEvent(doc = "User switched to Main tab in AllApps screen.")
-        LAUNCHER_ALLAPPS_SWITCHED_TO_MAIN_TAB(695),
+        @UiEvent(doc = "User switched to AllApps Main/Personal tab by swiping left.")
+        LAUNCHER_ALLAPPS_SWIPE_TO_PERSONAL_TAB(695),
 
-        @UiEvent(doc = "User switched to Work tab in AllApps screen.")
-        LAUNCHER_ALLAPPS_SWITCHED_TO_WORK_TAB(696),
+        @UiEvent(doc = "User switched to AllApps Work tab by swiping right.")
+        LAUNCHER_ALLAPPS_SWIPE_TO_WORK_TAB(696),
 
         @UiEvent(doc = "Default event when dedicated UI event is not available for the user action"
                 + " on slice .")
@@ -398,6 +398,12 @@ public class StatsLogManager implements ResourceBasedOverride {
 
         @UiEvent(doc = "Launcher entered into AllApps state with device search enabled.")
         LAUNCHER_ALLAPPS_ENTRY_WITH_DEVICE_SEARCH(720),
+
+        @UiEvent(doc = "User switched to AllApps Main/Personal tab by tapping on it.")
+        LAUNCHER_ALLAPPS_TAP_ON_PERSONAL_TAB(721),
+
+        @UiEvent(doc = "User switched to AllApps Work tab by tapping on it.")
+        LAUNCHER_ALLAPPS_TAP_ON_WORK_TAB(722),
         ;
 
         // ADD MORE
-- 
GitLab


From e9fe7f278940d857c8b4b907a8f9f8c0d182f3df Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Wed, 24 Feb 2021 09:16:07 -0800
Subject: [PATCH 0574/1664] [AA+] Logs LAUNCHER_ALLAPPS_ITEM_LONG_PRESSED
 event.

Bug: 178562918
Test: Manual
Change-Id: I6f195b7bdfa222332a250379bb7667501cbee762
---
 src/com/android/launcher3/logging/StatsLogManager.java    | 3 +++
 .../android/launcher3/touch/ItemLongClickListener.java    | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index 876ed35959..d554bb91c7 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -396,6 +396,9 @@ public class StatsLogManager implements ResourceBasedOverride {
         @UiEvent(doc = "IME is used for selecting the focused item on the AllApps screen.")
         LAUNCHER_ALLAPPS_FOCUSED_ITEM_SELECTED_WITH_IME(718),
 
+        @UiEvent(doc = "User long-pressed on an AllApps item.")
+        LAUNCHER_ALLAPPS_ITEM_LONG_PRESSED(719),
+
         @UiEvent(doc = "Launcher entered into AllApps state with device search enabled.")
         LAUNCHER_ALLAPPS_ENTRY_WITH_DEVICE_SEARCH(720),
 
diff --git a/src/com/android/launcher3/touch/ItemLongClickListener.java b/src/com/android/launcher3/touch/ItemLongClickListener.java
index 7baeab806b..919673f525 100644
--- a/src/com/android/launcher3/touch/ItemLongClickListener.java
+++ b/src/com/android/launcher3/touch/ItemLongClickListener.java
@@ -21,6 +21,7 @@ import static android.view.View.VISIBLE;
 import static com.android.launcher3.LauncherState.ALL_APPS;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_ITEM_LONG_PRESSED;
 
 import android.view.View;
 import android.view.View.OnLongClickListener;
@@ -32,6 +33,7 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.dragndrop.DragController;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.folder.Folder;
+import com.android.launcher3.logging.StatsLogManager.StatsLogger;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.TestProtocol;
@@ -86,6 +88,12 @@ public class ItemLongClickListener {
         if (!launcher.isInState(ALL_APPS) && !launcher.isInState(OVERVIEW)) return false;
         if (launcher.getWorkspace().isSwitchingState()) return false;
 
+        StatsLogger logger = launcher.getStatsLogManager().logger();
+        if (v.getTag() instanceof ItemInfo) {
+            logger.withItemInfo((ItemInfo) v.getTag());
+        }
+        logger.log(LAUNCHER_ALLAPPS_ITEM_LONG_PRESSED);
+
         // Start the drag
         final DragController dragController = launcher.getDragController();
         dragController.addDragListener(new DragController.DragListener() {
-- 
GitLab


From bb993c484ae647b3fdd625badddf2f7183eba616 Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Fri, 26 Feb 2021 12:56:25 -0800
Subject: [PATCH 0575/1664] Adds dump method to ModelDelegate.

This allows delegates to include additional data in log dumps.

Bug: 181351828
Test: Checked that data was found in a bug report and
adb shell dumpsys activity com.google.android.apps.nexuslauncher

Change-Id: I7a63430202ff899ac885a544c558e1248d2ce829
---
 src/com/android/launcher3/LauncherModel.java       | 2 ++
 src/com/android/launcher3/model/ModelDelegate.java | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index e89b9b060a..699495c7f2 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -615,7 +615,9 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi
                         + "\" bitmapIcon=" + info.bitmap.icon
                         + " componentName=" + info.componentName.getPackageName());
             }
+            writer.println();
         }
+        mModelDelegate.dump(prefix, fd, writer, args);
         mBgDataModel.dump(prefix, fd, writer, args);
     }
 
diff --git a/src/com/android/launcher3/model/ModelDelegate.java b/src/com/android/launcher3/model/ModelDelegate.java
index 92bea5b14c..13ec1ecefb 100644
--- a/src/com/android/launcher3/model/ModelDelegate.java
+++ b/src/com/android/launcher3/model/ModelDelegate.java
@@ -27,6 +27,8 @@ import com.android.launcher3.R;
 import com.android.launcher3.shortcuts.ShortcutKey;
 import com.android.launcher3.util.ResourceBasedOverride;
 
+import java.io.FileDescriptor;
+import java.io.PrintWriter;
 import java.util.Map;
 
 /**
@@ -89,4 +91,11 @@ public class ModelDelegate implements ResourceBasedOverride {
     @WorkerThread
     public void destroy() { }
 
+    /**
+     * Add data to a dumpsys request for Launcher (e.g. for bug reports).
+     *
+     * @see com.android.launcher3.Launcher#dump(java.lang.String, java.io.FileDescriptor,
+     *                                          java.io.PrintWriter, java.lang.String[])
+     **/
+    public void dump(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) { }
 }
-- 
GitLab


From 9140af12d2dc2335cd76b9313cd1a41e7852376f Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Fri, 26 Feb 2021 14:11:45 -0800
Subject: [PATCH 0576/1664] Skip window transform if SwipePipToHomeAnimator's
 running

Launcher tries to set the window transform on the recents animation
leash when it's settled on end target, which might conflict with
SwipePipToHomeAnimator and causes flash/flick at the end of the
transition. Simply skip the window transform since
SwipePipToHomeAnimator is the one solely responsible for updating the
leash in this case.

Bug: 179720719
Test: repeatedly enter PiP from ApiDemos with autoEnterPip enabled
Change-Id: Ia98675c21e3bd898cd11cf6ed97f6eaadcb11a42
---
 quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index feeee502de..7a259d4838 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1746,7 +1746,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         if (mWindowTransitionController != null) {
             mWindowTransitionController.setProgress(mCurrentShift.value, mDragLengthFactor);
         }
-        if (mRecentsAnimationTargets != null) {
+        // No need to apply any transform if there is ongoing swipe-pip-to-home animator since
+        // that animator handles the leash solely.
+        if (mRecentsAnimationTargets != null && !mIsSwipingPipToHome) {
             if (mRecentsViewScrollLinked) {
                 mTaskViewSimulator.setScroll(mRecentsView.getScrollOffset());
             }
-- 
GitLab


From a18abf55b4aa96d8dc131cf104213f293bd7ff43 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Fri, 26 Feb 2021 15:58:45 -0600
Subject: [PATCH 0577/1664] Add tracing to track every allApps rebind

Bug: 159671700
Test: presubmit
Change-Id: I1c7507ac2175d6e2f4514e4ad51c356aa75dd6e9
---
 .../android/launcher3/allapps/AllAppsContainerView.java  | 6 ++++++
 src/com/android/launcher3/views/WorkEduView.java         | 4 ++--
 tests/src/com/android/launcher3/ui/WorkTabTest.java      | 9 ++++++---
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index ec2a6d5b85..0c46e451b9 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -32,6 +32,7 @@ import android.os.Process;
 import android.text.Selection;
 import android.text.SpannableStringBuilder;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -61,6 +62,7 @@ import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.keyboard.FocusedItemDecorator;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.ItemInfoMatcher;
 import com.android.launcher3.util.MultiValueAlpha;
 import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;
@@ -481,6 +483,10 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         int layout = showTabs ? R.layout.all_apps_tabs : R.layout.all_apps_rv_layout;
         View newView = getLayoutInflater().inflate(layout, this, false);
         addView(newView, index);
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.WORK_PROFILE_REMOVED, "should show tabs:" + showTabs,
+                    new Exception());
+        }
         if (showTabs) {
             mViewPager = (AllAppsPagedView) newView;
             mViewPager.initParentViews(this);
diff --git a/src/com/android/launcher3/views/WorkEduView.java b/src/com/android/launcher3/views/WorkEduView.java
index 03d3026069..c8cf627a7f 100644
--- a/src/com/android/launcher3/views/WorkEduView.java
+++ b/src/com/android/launcher3/views/WorkEduView.java
@@ -168,8 +168,8 @@ public class WorkEduView extends AbstractSlideInView
     }
 
     private AllAppsPagedView getAllAppsPagedView() {
-        View v =  mLauncher.getAppsView().getContentView();
-        return  (v instanceof AllAppsPagedView)  ? (AllAppsPagedView) v : null;
+        View v = mLauncher.getAppsView().getContentView();
+        return (v instanceof AllAppsPagedView) ? (AllAppsPagedView) v : null;
     }
 
     /**
diff --git a/tests/src/com/android/launcher3/ui/WorkTabTest.java b/tests/src/com/android/launcher3/ui/WorkTabTest.java
index aef26ae3d0..5e41d43d95 100644
--- a/tests/src/com/android/launcher3/ui/WorkTabTest.java
+++ b/tests/src/com/android/launcher3/ui/WorkTabTest.java
@@ -154,9 +154,12 @@ public class WorkTabTest extends AbstractLauncherUiTest {
                 Log.d(TestProtocol.WORK_PROFILE_REMOVED, "Work tab not setup. Skipping test");
                 return false;
             }
-            return ((AllAppsPagedView) l.getAppsView().getContentView()).getCurrentPage()
-                    == WORK_PAGE && ((TextView) workEduView.findViewById(
-                    R.id.content_text)).getText().equals(
+            if (((AllAppsPagedView) l.getAppsView().getContentView()).getCurrentPage()
+                    != WORK_PAGE) {
+                Log.d(TestProtocol.WORK_PROFILE_REMOVED, "Work page not highlighted");
+                return false;
+            }
+            return ((TextView) workEduView.findViewById(R.id.content_text)).getText().equals(
                     l.getResources().getString(R.string.work_profile_edu_work_apps));
         }, 60000);
     }
-- 
GitLab


From ab469ac515f16002e0a56d9a84a554a9684fd4f3 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Fri, 26 Feb 2021 14:33:44 -0800
Subject: [PATCH 0578/1664] Better diagnosing leaked activities.

Test: manual
Bug: 181356264
Change-Id: I9bf843a1d26bc4cf255c1b8d2cce0febeaa4c4fe
---
 .../launcher3/ui/AbstractLauncherUiTest.java  | 37 +++++++++++--------
 .../launcher3/ui/ActivityLeakTracker.java     |  6 +++
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index b3c1240764..0edfbeda2b 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -151,23 +151,30 @@ public abstract class AbstractLauncherUiTest {
     }
 
     public static String dumpHprofData() {
-        if (sDumpWasGenerated) return "dump has already been generated by another test";
-        try {
-            final String fileName = getInstrumentation().getTargetContext().getFilesDir().getPath()
-                    + "/ActivityLeakHeapDump.hprof";
-            if (TestHelpers.isInLauncherProcess()) {
-                Debug.dumpHprofData(fileName);
-            } else {
-                final UiDevice device = UiDevice.getInstance(getInstrumentation());
-                device.executeShellCommand(
-                        "am dumpheap " + device.getLauncherPackageName() + " " + fileName);
+        String result;
+        if (sDumpWasGenerated) {
+            result = "dump has already been generated by another test";
+        } else {
+            try {
+                final String fileName =
+                        getInstrumentation().getTargetContext().getFilesDir().getPath()
+                                + "/ActivityLeakHeapDump.hprof";
+                if (TestHelpers.isInLauncherProcess()) {
+                    Debug.dumpHprofData(fileName);
+                } else {
+                    final UiDevice device = UiDevice.getInstance(getInstrumentation());
+                    device.executeShellCommand(
+                            "am dumpheap " + device.getLauncherPackageName() + " " + fileName);
+                }
+                sDumpWasGenerated = true;
+                result = "memory dump filename: " + fileName;
+            } catch (Throwable e) {
+                Log.e(TAG, "dumpHprofData failed", e);
+                result = "failed to save memory dump";
             }
-            sDumpWasGenerated = true;
-            return "memory dump filename: " + fileName;
-        } catch (Throwable e) {
-            Log.e(TAG, "dumpHprofData failed", e);
-            return "failed to save memory dump";
         }
+        return result
+                + ". Full list of activities: " + ACTIVITY_LEAK_TRACKER.getActivitiesList();
     }
 
     protected AbstractLauncherUiTest() {
diff --git a/tests/src/com/android/launcher3/ui/ActivityLeakTracker.java b/tests/src/com/android/launcher3/ui/ActivityLeakTracker.java
index dd216c7816..2db7472912 100644
--- a/tests/src/com/android/launcher3/ui/ActivityLeakTracker.java
+++ b/tests/src/com/android/launcher3/ui/ActivityLeakTracker.java
@@ -25,6 +25,7 @@ import androidx.test.InstrumentationRegistry;
 import com.android.launcher3.tapl.TestHelpers;
 
 import java.util.WeakHashMap;
+import java.util.stream.Collectors;
 
 public class ActivityLeakTracker implements Application.ActivityLifecycleCallbacks {
     private final WeakHashMap<Activity, Boolean> mActivities = new WeakHashMap<>();
@@ -81,4 +82,9 @@ public class ActivityLeakTracker implements Application.ActivityLifecycleCallbac
 
         return mActivities.size() <= 2;
     }
+
+    public String getActivitiesList() {
+        return mActivities.keySet().stream().map(a -> a.getClass().getSimpleName())
+                .collect(Collectors.joining(","));
+    }
 }
-- 
GitLab


From 4faa87c478fe2cd00fc01e233cc38d78058c0ced Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 26 Feb 2021 16:24:17 -0800
Subject: [PATCH 0579/1664] Log a bit more data in switchToAllApps()

Test: TaplTestsQuickstep.testWorkspaceSwitchToAllApps
Bug: 181122114
Change-Id: Ice5515f5b3ac87c42af42d946036505879deb235
---
 tests/tapl/com/android/launcher3/tapl/Workspace.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/Workspace.java b/tests/tapl/com/android/launcher3/tapl/Workspace.java
index f0e686f77f..d43e2352a2 100644
--- a/tests/tapl/com/android/launcher3/tapl/Workspace.java
+++ b/tests/tapl/com/android/launcher3/tapl/Workspace.java
@@ -110,7 +110,8 @@ public final class Workspace extends Home {
                     TestProtocol.REQUEST_HOME_TO_ALL_APPS_SWIPE_HEIGHT).
                     getInt(TestProtocol.TEST_INFO_RESPONSE_FIELD);
             LauncherInstrumentation.log(
-                    "switchToAllApps: swipeHeight = " + swipeHeight + ", slop = "
+                    "switchToAllApps: deviceHeight = " + deviceHeight + ", startY = " + startY
+                            + ", swipeHeight = " + swipeHeight + ", slop = "
                             + mLauncher.getTouchSlop());
 
             mLauncher.swipeToState(
-- 
GitLab


From fd1d75234763030ff9da32ac75502c9a82525642 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Fri, 26 Feb 2021 17:48:42 -0800
Subject: [PATCH 0580/1664] Check if the recents animation is still running and
 whether the app being restarted is the live tile app in
 mLiveTileRestartListener

mLiveTileRestartListener is originally used to render the animation to launch the app that's the live tile app (for example, settings is the live tile app and we can launch settings from notification shade).

However, we don't want this callback to be triggered when the recents animation is finished / live tile is ended because the default animation in that case won't be skipped.

The other scenario that we don't want the animation to be rendered here is when the restarted app is not the live tile app. This can be repro'ed in this scenario - launch any app and go to live tile; launch settings; swipe up from settings; launch the previous live tile app. In this case, we rely on the mLaunchOtherTaskHandler take care of the rendering of this animation.

Fixes: 181372992
Test: manual
Change-Id: I41b63ce5163f1ac136bf8b5909907a3f84d937d8
---
 quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 4 +++-
 quickstep/src/com/android/quickstep/views/RecentsView.java | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index feeee502de..808f26e269 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1494,7 +1494,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         @Override
         public void onActivityRestartAttempt(ActivityManager.RunningTaskInfo task,
                 boolean homeTaskVisible, boolean clearedTask, boolean wasVisible) {
-            if (mRecentsAnimationTargets.hasTask(task.taskId)) {
+            if (mRecentsView.getRunningTaskIndex() != -1
+                    && mRecentsView.getRunningTaskId() == task.taskId
+                    && mRecentsAnimationTargets.hasTask(task.taskId)) {
                 launchOtherTaskInLiveTileMode(task.taskId, mRecentsAnimationTargets.apps);
             }
             ActivityManagerWrapper.getInstance().unregisterTaskStackListener(
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index deb1388e96..361c545667 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1106,6 +1106,10 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         }
     }
 
+    public int getRunningTaskId() {
+        return mRunningTaskId;
+    }
+
     public @Nullable TaskView getRunningTaskView() {
         return getTaskView(mRunningTaskId);
     }
-- 
GitLab


From 8c575c378e1a6e3cccbc149575e835a20fe7e93b Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Mon, 1 Mar 2021 12:20:26 +0000
Subject: [PATCH 0581/1664] Remove smallestScreenSize from configChanges

- Remove smallestScreenSize so Launcher activity restarts when screen size changes to pick up new smallestSize dependent values e.g. R.bool.allow_rotation

Bug: 180803696
Test: Ensure rotation preference is respected when switching between large and small screen

Change-Id: I58f856a97effa8e35236d013300181c5d332b25a
---
 AndroidManifest.xml                    | 2 +-
 go/AndroidManifest-launcher.xml        | 2 +-
 quickstep/AndroidManifest-launcher.xml | 2 +-
 quickstep/AndroidManifest.xml          | 2 +-
 tests/AndroidManifest-common.xml       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 56a25954ee..1fad72db77 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -49,7 +49,7 @@
             android:stateNotNeeded="true"
             android:windowSoftInputMode="adjustPan"
             android:screenOrientation="unspecified"
-            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize"
+            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout"
             android:resizeableActivity="true"
             android:resumeWhilePausing="true"
             android:taskAffinity=""
diff --git a/go/AndroidManifest-launcher.xml b/go/AndroidManifest-launcher.xml
index 2223036a7a..d2575b6c68 100644
--- a/go/AndroidManifest-launcher.xml
+++ b/go/AndroidManifest-launcher.xml
@@ -49,7 +49,7 @@
             android:stateNotNeeded="true"
             android:windowSoftInputMode="adjustPan"
             android:screenOrientation="unspecified"
-            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|uiMode"
             android:resizeableActivity="true"
             android:resumeWhilePausing="true"
             android:taskAffinity=""
diff --git a/quickstep/AndroidManifest-launcher.xml b/quickstep/AndroidManifest-launcher.xml
index 53910e344b..7fe9b08f28 100644
--- a/quickstep/AndroidManifest-launcher.xml
+++ b/quickstep/AndroidManifest-launcher.xml
@@ -49,7 +49,7 @@
             android:stateNotNeeded="true"
             android:windowSoftInputMode="adjustPan"
             android:screenOrientation="unspecified"
-            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize"
+            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout"
             android:resizeableActivity="true"
             android:resumeWhilePausing="true"
             android:taskAffinity=""
diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml
index 97f4a21a01..5e5cf73148 100644
--- a/quickstep/AndroidManifest.xml
+++ b/quickstep/AndroidManifest.xml
@@ -71,7 +71,7 @@
              android:stateNotNeeded="true"
              android:theme="@style/LauncherTheme"
              android:screenOrientation="unspecified"
-             android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize"
+             android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout"
              android:resizeableActivity="true"
              android:resumeWhilePausing="true"
              android:taskAffinity=""/>
diff --git a/tests/AndroidManifest-common.xml b/tests/AndroidManifest-common.xml
index f243f279eb..744dee0607 100644
--- a/tests/AndroidManifest-common.xml
+++ b/tests/AndroidManifest-common.xml
@@ -98,7 +98,7 @@
         <activity
             android:name="com.android.launcher3.testcomponent.TestLauncherActivity"
             android:clearTaskOnLaunch="true"
-            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize"
+            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout"
             android:enabled="false"
             android:label="Test launcher"
             android:launchMode="singleTask"
-- 
GitLab


From 741fae9ea210354de740120a27b812baf187e7b9 Mon Sep 17 00:00:00 2001
From: Yogisha Dixit <ydixit@google.com>
Date: Mon, 22 Feb 2021 14:03:44 +0000
Subject: [PATCH 0582/1664] Move widget files into widget folder + add tests.

I will use the newly created LauncherAppWidgetProviderInfoTest in a follow-up CL to add tests for the newly added widget sizing APIs.

Test: Automatic: Ran all robolectric tests in launcher3,
      Manual: Added a widget, edited the widget, removed the widget
Bug: 179807199
Change-Id: I540b2dbe284c6eb5aa2466a1d13a9581ee59425b
---
 .../quickstep/ViewInflationDuringSwipeUp.java |   2 +-
 .../config/robolectric.properties             |   2 +-
 .../LauncherAppWidgetProviderInfoTest.java    | 119 ++++++++++++++++++
 .../picker/WidgetsDiffReporterTest.java       |   2 +-
 .../widget/picker/WidgetsListAdapterTest.java |   2 +-
 ...WidgetsListHeaderViewHolderBinderTest.java |   2 +-
 .../WidgetsListTableViewHolderBinderTest.java |   2 +-
 .../model/WidgetsListContentEntryTest.java    |   2 +-
 .../picker/util/WidgetsTableUtilsTest.java    |   2 +-
 .../launcher3/AppWidgetResizeFrame.java       |   1 +
 .../launcher3/AppWidgetsRestoredReceiver.java |   1 +
 src/com/android/launcher3/Launcher.java       |   2 +
 .../android/launcher3/LauncherProvider.java   |   1 +
 .../launcher3/SecondaryDropTarget.java        |   1 +
 .../launcher3/WidgetPreviewLoader.java        |   1 +
 src/com/android/launcher3/Workspace.java      |   3 +-
 .../allapps/search/LiveSearchManager.java     |   2 +-
 .../launcher3/dragndrop/AddItemActivity.java  |   4 +-
 .../dragndrop/LivePreviewWidgetCell.java      |   2 +-
 .../dragndrop/PinItemDragListener.java        |   2 +-
 .../graphics/LauncherPreviewRenderer.java     |   2 +-
 .../model/GridSizeMigrationTask.java          |   2 +-
 .../model/GridSizeMigrationTaskV2.java        |   2 +-
 .../launcher3/model/ItemInstallQueue.java     |   2 +-
 .../android/launcher3/model/LoaderTask.java   |   2 +-
 .../android/launcher3/model/ModelWriter.java  |   2 +-
 .../android/launcher3/model/WidgetItem.java   |   2 +-
 .../launcher3/touch/ItemClickHandler.java     |   2 +-
 .../{ => widget}/LauncherAppWidgetHost.java   |  13 +-
 .../widget/LauncherAppWidgetHostView.java     |   1 -
 .../LauncherAppWidgetProviderInfo.java        |  11 +-
 .../widget/PendingAddWidgetInfo.java          |   1 -
 .../widget/WidgetAddFlowHandler.java          |   1 -
 .../widget/WidgetHostViewLoader.java          |   1 -
 .../launcher3/widget/WidgetManagerHelper.java |   1 -
 .../custom/CustomAppWidgetProviderInfo.java   |   5 +-
 .../widget/custom/CustomWidgetManager.java    |   4 +-
 .../widget/picker/WidgetsFullSheet.java       |   2 +-
 .../android/launcher3/model/WidgetsModel.java |   2 +-
 .../android/launcher3/ui/TestViewHelpers.java |   2 +-
 .../ui/widget/AddConfigWidgetTest.java        |   2 +-
 .../launcher3/ui/widget/AddWidgetTest.java    |   2 +-
 .../launcher3/ui/widget/BindWidgetTest.java   |   2 +-
 .../android/launcher3/common/WidgetUtils.java |   4 +-
 44 files changed, 175 insertions(+), 50 deletions(-)
 create mode 100644 robolectric_tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java
 rename src/com/android/launcher3/{ => widget}/LauncherAppWidgetHost.java (96%)
 rename src/com/android/launcher3/{ => widget}/LauncherAppWidgetProviderInfo.java (93%)

diff --git a/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java b/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java
index 72116eb570..4ca1f593c9 100644
--- a/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java
+++ b/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java
@@ -49,7 +49,6 @@ import androidx.test.uiautomator.By;
 import androidx.test.uiautomator.UiDevice;
 import androidx.test.uiautomator.Until;
 
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.tapl.Background;
@@ -58,6 +57,7 @@ import com.android.launcher3.testcomponent.ListViewService.SimpleViewsFactory;
 import com.android.launcher3.testcomponent.TestCommandReceiver;
 import com.android.launcher3.ui.TaplTestsLauncher3;
 import com.android.launcher3.ui.TestViewHelpers;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch;
 
 import org.junit.Before;
diff --git a/robolectric_tests/config/robolectric.properties b/robolectric_tests/config/robolectric.properties
index 4e811f36ff..936ce1240b 100644
--- a/robolectric_tests/config/robolectric.properties
+++ b/robolectric_tests/config/robolectric.properties
@@ -11,4 +11,4 @@ shadows= \
     com.android.launcher3.shadows.ShadowOverrides \
     com.android.launcher3.shadows.ShadowSurfaceTransactionApplier \
 
-application=com.android.launcher3.util.LauncherTestApplication
\ No newline at end of file
+application=com.android.launcher3.util.LauncherTestApplication
diff --git a/robolectric_tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java b/robolectric_tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java
new file mode 100644
index 0000000000..92f77f2bbd
--- /dev/null
+++ b/robolectric_tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.graphics.Point;
+
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.InvariantDeviceProfile;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public final class LauncherAppWidgetProviderInfoTest {
+
+    private static final int CELL_SIZE = 50;
+
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+    }
+
+    @Test
+    public void initSpans_minWidthSmallerThanCellWidth_shouldInitializeSpansToOne() {
+        LauncherAppWidgetProviderInfo info = new LauncherAppWidgetProviderInfo();
+        info.minWidth = 20;
+        info.minHeight = 20;
+        InvariantDeviceProfile idp = createIDP();
+
+        info.initSpans(mContext, idp);
+
+        assertThat(info.spanX).isEqualTo(1);
+        assertThat(info.spanY).isEqualTo(1);
+    }
+
+    @Test
+    public void initSpans_minWidthLargerThanCellWidth_shouldInitializeSpans() {
+        LauncherAppWidgetProviderInfo info = new LauncherAppWidgetProviderInfo();
+        info.minWidth = 80;
+        info.minHeight = 80;
+        InvariantDeviceProfile idp = createIDP();
+
+        info.initSpans(mContext, idp);
+
+        assertThat(info.spanX).isEqualTo(2);
+        assertThat(info.spanY).isEqualTo(2);
+    }
+
+    @Test
+    public void initSpans_minResizeWidthUnspecified_shouldInitializeMinSpansToOne() {
+        LauncherAppWidgetProviderInfo info = new LauncherAppWidgetProviderInfo();
+        InvariantDeviceProfile idp = createIDP();
+
+        info.initSpans(mContext, idp);
+
+        assertThat(info.minSpanX).isEqualTo(1);
+        assertThat(info.minSpanY).isEqualTo(1);
+    }
+
+    @Test
+    public void initSpans_minResizeWidthSmallerThanCellWidth_shouldInitializeMinSpansToOne() {
+        LauncherAppWidgetProviderInfo info = new LauncherAppWidgetProviderInfo();
+        info.minResizeWidth = 20;
+        info.minResizeHeight = 20;
+        InvariantDeviceProfile idp = createIDP();
+
+        info.initSpans(mContext, idp);
+
+        assertThat(info.minSpanX).isEqualTo(1);
+        assertThat(info.minSpanY).isEqualTo(1);
+    }
+
+    @Test
+    public void initSpans_minResizeWidthLargerThanCellWidth_shouldInitializeMinSpans() {
+        LauncherAppWidgetProviderInfo info = new LauncherAppWidgetProviderInfo();
+        info.minResizeWidth = 80;
+        info.minResizeHeight = 80;
+        InvariantDeviceProfile idp = createIDP();
+
+        info.initSpans(mContext, idp);
+
+        assertThat(info.minSpanX).isEqualTo(2);
+        assertThat(info.minSpanY).isEqualTo(2);
+    }
+
+    private InvariantDeviceProfile createIDP() {
+        DeviceProfile profile = Mockito.mock(DeviceProfile.class);
+        Mockito.when(profile.getCellSize()).thenReturn(new Point(CELL_SIZE, CELL_SIZE));
+
+        InvariantDeviceProfile idp = new InvariantDeviceProfile();
+        idp.landscapeProfile = idp.portraitProfile = profile;
+        return idp;
+    }
+
+}
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsDiffReporterTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsDiffReporterTest.java
index 04797a62fb..b972c6ff0e 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsDiffReporterTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsDiffReporterTest.java
@@ -32,12 +32,12 @@ import android.os.UserHandle;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.launcher3.InvariantDeviceProfile;
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.ComponentWithLabel;
 import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.model.data.PackageItemInfo;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 import com.android.launcher3.widget.model.WidgetsListContentEntry;
 import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java
index e94b2532b9..a7c8d92f79 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java
@@ -31,13 +31,13 @@ import android.view.LayoutInflater;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.launcher3.InvariantDeviceProfile;
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.WidgetPreviewLoader;
 import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.ComponentWithLabel;
 import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.model.data.PackageItemInfo;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 import com.android.launcher3.widget.model.WidgetsListContentEntry;
 import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java
index ae5b9a50b7..848630ef5a 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java
@@ -34,7 +34,6 @@ import androidx.annotation.Nullable;
 
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile;
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.R;
 import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.ComponentWithLabel;
@@ -42,6 +41,7 @@ import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.testing.TestActivity;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.WidgetCell;
 import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
 import com.android.launcher3.widget.picker.WidgetsListHeaderViewHolderBinder.OnHeaderClickListener;
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java
index 358e6e02dd..8a0cf349c0 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java
@@ -37,7 +37,6 @@ import android.widget.TextView;
 
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile;
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.R;
 import com.android.launcher3.WidgetPreviewLoader;
 import com.android.launcher3.icons.BitmapInfo;
@@ -46,6 +45,7 @@ import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.testing.TestActivity;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.WidgetCell;
 import com.android.launcher3.widget.model.WidgetsListContentEntry;
 
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/model/WidgetsListContentEntryTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/model/WidgetsListContentEntryTest.java
index 86df3f8ab2..2d22c45e2c 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/model/WidgetsListContentEntryTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/model/WidgetsListContentEntryTest.java
@@ -26,11 +26,11 @@ import android.content.ComponentName;
 import android.content.Context;
 
 import com.android.launcher3.InvariantDeviceProfile;
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.icons.ComponentWithLabel;
 import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.model.data.PackageItemInfo;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.model.WidgetsListContentEntry;
 
 import org.junit.Before;
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/util/WidgetsTableUtilsTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/util/WidgetsTableUtilsTest.java
index 5922223f63..e68edd3f3a 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/util/WidgetsTableUtilsTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/util/WidgetsTableUtilsTest.java
@@ -30,11 +30,11 @@ import android.graphics.drawable.Drawable;
 import android.os.UserHandle;
 
 import com.android.launcher3.InvariantDeviceProfile;
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.icons.ComponentWithLabel;
 import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.pm.ShortcutConfigActivityInfo;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.util.WidgetsTableUtils;
 
 import org.junit.Before;
diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java
index be92c5d133..20c9ad366c 100644
--- a/src/com/android/launcher3/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher3/AppWidgetResizeFrame.java
@@ -31,6 +31,7 @@ import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.util.FocusLogic;
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.launcher3.widget.LauncherAppWidgetHostView;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/launcher3/AppWidgetsRestoredReceiver.java b/src/com/android/launcher3/AppWidgetsRestoredReceiver.java
index b85c648408..75e89b2944 100644
--- a/src/com/android/launcher3/AppWidgetsRestoredReceiver.java
+++ b/src/com/android/launcher3/AppWidgetsRestoredReceiver.java
@@ -21,6 +21,7 @@ import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.pm.UserCache;
 import com.android.launcher3.provider.RestoreDbTask;
 import com.android.launcher3.util.ContentWriter;
+import com.android.launcher3.widget.LauncherAppWidgetHost;
 
 public class AppWidgetsRestoredReceiver extends BroadcastReceiver {
 
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index f7ff262dcd..253a7c7086 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -181,7 +181,9 @@ import com.android.launcher3.views.ActivityContext;
 import com.android.launcher3.views.FloatingSurfaceView;
 import com.android.launcher3.views.OptionsPopupView;
 import com.android.launcher3.views.ScrimView;
+import com.android.launcher3.widget.LauncherAppWidgetHost;
 import com.android.launcher3.widget.LauncherAppWidgetHostView;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.PendingAddShortcutInfo;
 import com.android.launcher3.widget.PendingAddWidgetInfo;
 import com.android.launcher3.widget.PendingAppWidgetHostView;
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index e151777a1e..2ec5e90280 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -71,6 +71,7 @@ import com.android.launcher3.util.IntSet;
 import com.android.launcher3.util.NoLocaleSQLiteHelper;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.launcher3.util.Thunk;
+import com.android.launcher3.widget.LauncherAppWidgetHost;
 
 import org.xmlpull.v1.XmlPullParser;
 
diff --git a/src/com/android/launcher3/SecondaryDropTarget.java b/src/com/android/launcher3/SecondaryDropTarget.java
index 7276887f76..4fd87cbffd 100644
--- a/src/com/android/launcher3/SecondaryDropTarget.java
+++ b/src/com/android/launcher3/SecondaryDropTarget.java
@@ -46,6 +46,7 @@ import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.launcher3.util.Themes;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 
 import java.net.URISyntaxException;
 
diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java
index 2c45c776a1..446c873a1d 100644
--- a/src/com/android/launcher3/WidgetPreviewLoader.java
+++ b/src/com/android/launcher3/WidgetPreviewLoader.java
@@ -50,6 +50,7 @@ import com.android.launcher3.util.PackageUserKey;
 import com.android.launcher3.util.Preconditions;
 import com.android.launcher3.util.SQLiteCacheHelper;
 import com.android.launcher3.util.Thunk;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.WidgetCell;
 import com.android.launcher3.widget.WidgetManagerHelper;
 
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 2528c0305f..aca3d3c3c4 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -63,7 +63,6 @@ import android.view.ViewTreeObserver;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.Toast;
 
-import com.android.launcher3.LauncherAppWidgetHost.ProviderChangedListener;
 import com.android.launcher3.accessibility.AccessibleDragListenerAdapter;
 import com.android.launcher3.accessibility.WorkspaceAccessibilityHelper;
 import com.android.launcher3.anim.Interpolators;
@@ -104,6 +103,8 @@ import com.android.launcher3.util.ItemInfoMatcher;
 import com.android.launcher3.util.PackageUserKey;
 import com.android.launcher3.util.Thunk;
 import com.android.launcher3.util.WallpaperOffsetInterpolator;
+import com.android.launcher3.widget.LauncherAppWidgetHost;
+import com.android.launcher3.widget.LauncherAppWidgetHost.ProviderChangedListener;
 import com.android.launcher3.widget.LauncherAppWidgetHostView;
 import com.android.launcher3.widget.PendingAddShortcutInfo;
 import com.android.launcher3.widget.PendingAddWidgetInfo;
diff --git a/src/com/android/launcher3/allapps/search/LiveSearchManager.java b/src/com/android/launcher3/allapps/search/LiveSearchManager.java
index 4ef154e6b3..76099a6478 100644
--- a/src/com/android/launcher3/allapps/search/LiveSearchManager.java
+++ b/src/com/android/launcher3/allapps/search/LiveSearchManager.java
@@ -43,11 +43,11 @@ import androidx.slice.SliceViewManager;
 import androidx.slice.SliceViewManager.SliceCallback;
 
 import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.statemanager.StateManager.StateListener;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.SafeCloseable;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.PendingAddWidgetInfo;
 
 import java.util.ArrayList;
diff --git a/src/com/android/launcher3/dragndrop/AddItemActivity.java b/src/com/android/launcher3/dragndrop/AddItemActivity.java
index 77d2b85ef9..5dc94ff597 100644
--- a/src/com/android/launcher3/dragndrop/AddItemActivity.java
+++ b/src/com/android/launcher3/dragndrop/AddItemActivity.java
@@ -47,8 +47,6 @@ import com.android.launcher3.BaseActivity;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.LauncherAppWidgetHost;
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.R;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.model.ItemInstallQueue;
@@ -56,6 +54,8 @@ import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.pm.PinRequestHelper;
 import com.android.launcher3.views.BaseDragLayer;
+import com.android.launcher3.widget.LauncherAppWidgetHost;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.PendingAddShortcutInfo;
 import com.android.launcher3.widget.PendingAddWidgetInfo;
 import com.android.launcher3.widget.WidgetHostViewLoader;
diff --git a/src/com/android/launcher3/dragndrop/LivePreviewWidgetCell.java b/src/com/android/launcher3/dragndrop/LivePreviewWidgetCell.java
index be6a07f004..fa062f572e 100644
--- a/src/com/android/launcher3/dragndrop/LivePreviewWidgetCell.java
+++ b/src/com/android/launcher3/dragndrop/LivePreviewWidgetCell.java
@@ -12,10 +12,10 @@ import android.widget.RemoteViews;
 
 import com.android.launcher3.BaseActivity;
 import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.WidgetPreviewLoader;
 import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.model.WidgetItem;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.WidgetCell;
 
 /**
diff --git a/src/com/android/launcher3/dragndrop/PinItemDragListener.java b/src/com/android/launcher3/dragndrop/PinItemDragListener.java
index 6104d80676..2290473a81 100644
--- a/src/com/android/launcher3/dragndrop/PinItemDragListener.java
+++ b/src/com/android/launcher3/dragndrop/PinItemDragListener.java
@@ -30,8 +30,8 @@ import android.widget.RemoteViews;
 
 import com.android.launcher3.DragSource;
 import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.PendingAddItemInfo;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.PendingAddShortcutInfo;
 import com.android.launcher3.widget.PendingAddWidgetInfo;
 import com.android.launcher3.widget.PendingItemDragHelper;
diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index 3a9986ee42..5e9b179d6a 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -58,7 +58,6 @@ import com.android.launcher3.Hotseat;
 import com.android.launcher3.InsettableFrameLayout;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.LauncherModel;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.LauncherSettings.Favorites;
@@ -91,6 +90,7 @@ import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.launcher3.views.ActivityContext;
 import com.android.launcher3.views.BaseDragLayer;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.custom.CustomWidgetManager;
 
 import java.util.ArrayList;
diff --git a/src/com/android/launcher3/model/GridSizeMigrationTask.java b/src/com/android/launcher3/model/GridSizeMigrationTask.java
index e8a52bdd54..804e72ee29 100644
--- a/src/com/android/launcher3/model/GridSizeMigrationTask.java
+++ b/src/com/android/launcher3/model/GridSizeMigrationTask.java
@@ -25,7 +25,6 @@ import androidx.annotation.VisibleForTesting;
 
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.LauncherSettings.Settings;
@@ -40,6 +39,7 @@ import com.android.launcher3.provider.LauncherDbUtils.SQLiteTransaction;
 import com.android.launcher3.util.GridOccupancy;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.IntSparseArrayMap;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.WidgetManagerHelper;
 
 import java.util.ArrayList;
diff --git a/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java b/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java
index 79467d36f6..c6c0791a17 100644
--- a/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java
+++ b/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java
@@ -39,7 +39,6 @@ import androidx.annotation.VisibleForTesting;
 
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.graphics.LauncherPreviewRenderer;
@@ -48,6 +47,7 @@ import com.android.launcher3.pm.InstallSessionHelper;
 import com.android.launcher3.provider.LauncherDbUtils.SQLiteTransaction;
 import com.android.launcher3.util.GridOccupancy;
 import com.android.launcher3.util.IntArray;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.WidgetManagerHelper;
 
 import java.util.ArrayList;
diff --git a/src/com/android/launcher3/model/ItemInstallQueue.java b/src/com/android/launcher3/model/ItemInstallQueue.java
index d09bf81e17..df8367f256 100644
--- a/src/com/android/launcher3/model/ItemInstallQueue.java
+++ b/src/com/android/launcher3/model/ItemInstallQueue.java
@@ -42,7 +42,6 @@ import androidx.annotation.WorkerThread;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
@@ -52,6 +51,7 @@ import com.android.launcher3.shortcuts.ShortcutRequest;
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.launcher3.util.PersistedItemArray;
 import com.android.launcher3.util.Preconditions;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 
 import java.util.HashSet;
 import java.util.List;
diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index 8438622dca..e6e8f270a7 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -50,7 +50,6 @@ import android.util.LongSparseArray;
 import android.util.TimingLogger;
 
 import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.LauncherModel;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.Utilities;
@@ -87,6 +86,7 @@ import com.android.launcher3.util.LooperIdleLock;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.launcher3.util.PackageUserKey;
 import com.android.launcher3.util.TraceHelper;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.WidgetManagerHelper;
 
 import java.util.ArrayList;
diff --git a/src/com/android/launcher3/model/ModelWriter.java b/src/com/android/launcher3/model/ModelWriter.java
index f7b43d6bec..312435d175 100644
--- a/src/com/android/launcher3/model/ModelWriter.java
+++ b/src/com/android/launcher3/model/ModelWriter.java
@@ -28,7 +28,6 @@ import android.os.Looper;
 import android.util.Log;
 
 import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.LauncherAppWidgetHost;
 import com.android.launcher3.LauncherModel;
 import com.android.launcher3.LauncherProvider;
 import com.android.launcher3.LauncherSettings;
@@ -43,6 +42,7 @@ import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.util.ContentWriter;
 import com.android.launcher3.util.ItemInfoMatcher;
+import com.android.launcher3.widget.LauncherAppWidgetHost;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/com/android/launcher3/model/WidgetItem.java b/src/com/android/launcher3/model/WidgetItem.java
index de2481a98a..97071bbaad 100644
--- a/src/com/android/launcher3/model/WidgetItem.java
+++ b/src/com/android/launcher3/model/WidgetItem.java
@@ -4,11 +4,11 @@ import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 
 import com.android.launcher3.InvariantDeviceProfile;
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.pm.ShortcutConfigActivityInfo;
 import com.android.launcher3.util.ComponentKey;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 
 /**
  * An wrapper over various items displayed in a widget picker,
diff --git a/src/com/android/launcher3/touch/ItemClickHandler.java b/src/com/android/launcher3/touch/ItemClickHandler.java
index 098d90d8db..61bd30a6fd 100644
--- a/src/com/android/launcher3/touch/ItemClickHandler.java
+++ b/src/com/android/launcher3/touch/ItemClickHandler.java
@@ -41,7 +41,6 @@ import android.widget.Toast;
 
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.folder.Folder;
@@ -59,6 +58,7 @@ import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.launcher3.views.FloatingIconView;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.PendingAppWidgetHostView;
 import com.android.launcher3.widget.WidgetAddFlowHandler;
 import com.android.launcher3.widget.WidgetManagerHelper;
diff --git a/src/com/android/launcher3/LauncherAppWidgetHost.java b/src/com/android/launcher3/widget/LauncherAppWidgetHost.java
similarity index 96%
rename from src/com/android/launcher3/LauncherAppWidgetHost.java
rename to src/com/android/launcher3/widget/LauncherAppWidgetHost.java
index fea26df7da..d745754497 100644
--- a/src/com/android/launcher3/LauncherAppWidgetHost.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHost.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher3;
+package com.android.launcher3.widget;
 
 import static android.app.Activity.RESULT_CANCELED;
 
@@ -29,12 +29,13 @@ import android.os.Handler;
 import android.util.SparseArray;
 import android.widget.Toast;
 
+import com.android.launcher3.BaseActivity;
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.model.WidgetsModel;
 import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.TestProtocol;
-import com.android.launcher3.widget.DeferredAppWidgetHostView;
-import com.android.launcher3.widget.LauncherAppWidgetHostView;
-import com.android.launcher3.widget.PendingAppWidgetHostView;
 import com.android.launcher3.widget.custom.CustomWidgetManager;
 
 import java.util.ArrayList;
@@ -199,7 +200,7 @@ public class LauncherAppWidgetHost extends AppWidgetHost {
         }
     }
 
-    void addPendingView(int appWidgetId, PendingAppWidgetHostView view) {
+    public void addPendingView(int appWidgetId, PendingAppWidgetHostView view) {
         mPendingViews.put(appWidgetId, view);
     }
 
@@ -247,7 +248,7 @@ public class LauncherAppWidgetHost extends AppWidgetHost {
         super.onProviderChanged(appWidgetId, info);
         // The super method updates the dimensions of the providerInfo. Update the
         // launcher spans accordingly.
-        info.initSpans(mContext);
+        info.initSpans(mContext, LauncherAppState.getIDP(mContext));
     }
 
     /**
diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
index 41098f9f1c..54e51b2079 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
@@ -37,7 +37,6 @@ import android.widget.RemoteViews;
 
 import com.android.launcher3.CheckLongPressHelper;
 import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.dragndrop.DragLayer;
diff --git a/src/com/android/launcher3/LauncherAppWidgetProviderInfo.java b/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
similarity index 93%
rename from src/com/android/launcher3/LauncherAppWidgetProviderInfo.java
rename to src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
index 618b5de79e..b0c85f19eb 100644
--- a/src/com/android/launcher3/LauncherAppWidgetProviderInfo.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
@@ -1,4 +1,4 @@
-package com.android.launcher3;
+package com.android.launcher3.widget;
 
 import android.appwidget.AppWidgetHostView;
 import android.appwidget.AppWidgetProviderInfo;
@@ -11,6 +11,9 @@ import android.graphics.drawable.Drawable;
 import android.os.Parcel;
 import android.os.UserHandle;
 
+import com.android.launcher3.InvariantDeviceProfile;
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.icons.ComponentWithLabelAndIcon;
 import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
@@ -48,7 +51,7 @@ public class LauncherAppWidgetProviderInfo extends AppWidgetProviderInfo
             launcherInfo = new LauncherAppWidgetProviderInfo(p);
             p.recycle();
         }
-        launcherInfo.initSpans(context);
+        launcherInfo.initSpans(context, LauncherAppState.getIDP(context));
         return launcherInfo;
     }
 
@@ -58,9 +61,7 @@ public class LauncherAppWidgetProviderInfo extends AppWidgetProviderInfo
         super(in);
     }
 
-    public void initSpans(Context context) {
-        InvariantDeviceProfile idp = LauncherAppState.getIDP(context);
-
+    public void initSpans(Context context, InvariantDeviceProfile idp) {
         Point landCellSize = idp.landscapeProfile.getCellSize();
         Point portCellSize = idp.portraitProfile.getCellSize();
 
diff --git a/src/com/android/launcher3/widget/PendingAddWidgetInfo.java b/src/com/android/launcher3/widget/PendingAddWidgetInfo.java
index bef9a08f14..ee0b84e815 100644
--- a/src/com/android/launcher3/widget/PendingAddWidgetInfo.java
+++ b/src/com/android/launcher3/widget/PendingAddWidgetInfo.java
@@ -20,7 +20,6 @@ import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS
 import android.appwidget.AppWidgetHostView;
 import android.os.Bundle;
 
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.PendingAddItemInfo;
 
diff --git a/src/com/android/launcher3/widget/WidgetAddFlowHandler.java b/src/com/android/launcher3/widget/WidgetAddFlowHandler.java
index ebc2a25753..1ac5a3328c 100644
--- a/src/com/android/launcher3/widget/WidgetAddFlowHandler.java
+++ b/src/com/android/launcher3/widget/WidgetAddFlowHandler.java
@@ -21,7 +21,6 @@ import android.os.Parcel;
 import android.os.Parcelable;
 
 import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.util.PendingRequestArgs;
diff --git a/src/com/android/launcher3/widget/WidgetHostViewLoader.java b/src/com/android/launcher3/widget/WidgetHostViewLoader.java
index 2438bdf5ab..31cbff6982 100644
--- a/src/com/android/launcher3/widget/WidgetHostViewLoader.java
+++ b/src/com/android/launcher3/widget/WidgetHostViewLoader.java
@@ -13,7 +13,6 @@ import android.view.View;
 import com.android.launcher3.AppWidgetResizeFrame;
 import com.android.launcher3.DropTarget;
 import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.dragndrop.DragController;
 import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.dragndrop.DragOptions;
diff --git a/src/com/android/launcher3/widget/WidgetManagerHelper.java b/src/com/android/launcher3/widget/WidgetManagerHelper.java
index c0c5c48077..680460ffae 100644
--- a/src/com/android/launcher3/widget/WidgetManagerHelper.java
+++ b/src/com/android/launcher3/widget/WidgetManagerHelper.java
@@ -27,7 +27,6 @@ import android.os.UserHandle;
 
 import androidx.annotation.Nullable;
 
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.model.WidgetsModel;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.pm.UserCache;
diff --git a/src/com/android/launcher3/widget/custom/CustomAppWidgetProviderInfo.java b/src/com/android/launcher3/widget/custom/CustomAppWidgetProviderInfo.java
index 1086987f83..8b3bbce1c5 100644
--- a/src/com/android/launcher3/widget/custom/CustomAppWidgetProviderInfo.java
+++ b/src/com/android/launcher3/widget/custom/CustomAppWidgetProviderInfo.java
@@ -22,8 +22,9 @@ import android.content.pm.PackageManager;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
+import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 
 /**
  * Custom app widget provider info that can be used as a widget, but provide extra functionality
@@ -57,7 +58,7 @@ public class CustomAppWidgetProviderInfo extends LauncherAppWidgetProviderInfo
     }
 
     @Override
-    public void initSpans(Context context) { }
+    public void initSpans(Context context, InvariantDeviceProfile idp) { }
 
     @Override
     public String getLabel(PackageManager packageManager) {
diff --git a/src/com/android/launcher3/widget/custom/CustomWidgetManager.java b/src/com/android/launcher3/widget/custom/CustomWidgetManager.java
index 0b66ec01b6..329a44452b 100644
--- a/src/com/android/launcher3/widget/custom/CustomWidgetManager.java
+++ b/src/com/android/launcher3/widget/custom/CustomWidgetManager.java
@@ -16,7 +16,7 @@
 
 package com.android.launcher3.widget.custom;
 
-import static com.android.launcher3.LauncherAppWidgetProviderInfo.CLS_CUSTOM_WIDGET_PREFIX;
+import static com.android.launcher3.widget.LauncherAppWidgetProviderInfo.CLS_CUSTOM_WIDGET_PREFIX;
 
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProviderInfo;
@@ -29,12 +29,12 @@ import android.util.SparseArray;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.launcher3.util.PackageUserKey;
 import com.android.launcher3.widget.LauncherAppWidgetHostView;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.systemui.plugins.CustomWidgetPlugin;
 import com.android.systemui.plugins.PluginListener;
 
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 3a186c5741..91b79f99c3 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -45,13 +45,13 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Insettable;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.LauncherAppWidgetHost.ProviderChangedListener;
 import com.android.launcher3.R;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.compat.AccessibilityManagerCompat;
 import com.android.launcher3.views.RecyclerViewFastScroller;
 import com.android.launcher3.views.TopRoundedCornerView;
 import com.android.launcher3.widget.BaseWidgetSheet;
+import com.android.launcher3.widget.LauncherAppWidgetHost.ProviderChangedListener;
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 import com.android.launcher3.workprofile.PersonalWorkPagedView;
 import com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip.OnActivePageChangedListener;
diff --git a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
index a7e3472c85..a8c7c4825b 100644
--- a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
+++ b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
@@ -17,7 +17,6 @@ import androidx.annotation.Nullable;
 import com.android.launcher3.AppFilter;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.compat.AlphabeticIndexCompat;
 import com.android.launcher3.config.FeatureFlags;
@@ -27,6 +26,7 @@ import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.pm.ShortcutConfigActivityInfo;
 import com.android.launcher3.util.PackageUserKey;
 import com.android.launcher3.util.Preconditions;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.WidgetManagerHelper;
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 import com.android.launcher3.widget.model.WidgetsListContentEntry;
diff --git a/tests/src/com/android/launcher3/ui/TestViewHelpers.java b/tests/src/com/android/launcher3/ui/TestViewHelpers.java
index eceff346cd..083f58015c 100644
--- a/tests/src/com/android/launcher3/ui/TestViewHelpers.java
+++ b/tests/src/com/android/launcher3/ui/TestViewHelpers.java
@@ -24,9 +24,9 @@ import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.testcomponent.AppWidgetNoConfig;
 import com.android.launcher3.testcomponent.AppWidgetWithConfig;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.WidgetManagerHelper;
 
 import java.util.concurrent.Callable;
diff --git a/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java
index 737f891d78..b421b0e876 100644
--- a/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java
+++ b/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java
@@ -28,7 +28,6 @@ import android.view.View;
 import androidx.test.filters.LargeTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.Workspace;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
@@ -39,6 +38,7 @@ import com.android.launcher3.ui.TestViewHelpers;
 import com.android.launcher3.util.Wait;
 import com.android.launcher3.util.Wait.Condition;
 import com.android.launcher3.util.rule.ShellCommandRule;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 
 import org.junit.Before;
 import org.junit.Rule;
diff --git a/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java
index f146db5947..714b11b18e 100644
--- a/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java
+++ b/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java
@@ -23,12 +23,12 @@ import static org.junit.Assert.assertTrue;
 import androidx.test.filters.LargeTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.tapl.Widget;
 import com.android.launcher3.ui.AbstractLauncherUiTest;
 import com.android.launcher3.ui.TestViewHelpers;
 import com.android.launcher3.util.rule.ShellCommandRule;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java
index fa495f5a95..9c6c3173ac 100644
--- a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java
+++ b/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java
@@ -37,7 +37,6 @@ import android.widget.RemoteViews;
 import androidx.test.filters.LargeTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.R;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
@@ -47,6 +46,7 @@ import com.android.launcher3.tapl.Workspace;
 import com.android.launcher3.ui.AbstractLauncherUiTest;
 import com.android.launcher3.ui.TestViewHelpers;
 import com.android.launcher3.util.rule.ShellCommandRule;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.WidgetManagerHelper;
 
 import org.junit.After;
diff --git a/tests/src_common/com/android/launcher3/common/WidgetUtils.java b/tests/src_common/com/android/launcher3/common/WidgetUtils.java
index c0913bf96f..ffad93fffc 100644
--- a/tests/src_common/com/android/launcher3/common/WidgetUtils.java
+++ b/tests/src_common/com/android/launcher3/common/WidgetUtils.java
@@ -23,12 +23,12 @@ import android.content.ContentResolver;
 import android.content.Context;
 import android.os.Bundle;
 
-import com.android.launcher3.LauncherAppWidgetHost;
-import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.util.ContentWriter;
+import com.android.launcher3.widget.LauncherAppWidgetHost;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.PendingAddWidgetInfo;
 import com.android.launcher3.widget.WidgetManagerHelper;
 
-- 
GitLab


From c7537713ca553728316286e048af304af7cf4989 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 1 Mar 2021 21:46:25 +0000
Subject: [PATCH 0583/1664] Add widget description to WidgetCell

Full picker: https://screenshot.googleplex.com/8Dij79K8Pq2KWdm.png
Bottom picker: https://screenshot.googleplex.com/5f9TLra49dYJjLB.png

Test: Manually launch full and bottom widget pickers and observe
      description is only shown for widgets but not shortcut.

Bug: 179797520
Change-Id: I5bfde056906a4a0f4fff9bc9a488f808365173b3
---
 res/layout/widget_cell_content.xml            | 10 ++++++++
 .../android/launcher3/widget/WidgetCell.java  | 23 +++++++++++++++----
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/res/layout/widget_cell_content.xml b/res/layout/widget_cell_content.xml
index c3e37e9176..65a49ab627 100644
--- a/res/layout/widget_cell_content.xml
+++ b/res/layout/widget_cell_content.xml
@@ -50,4 +50,14 @@
         android:textSize="14sp"
         android:alpha="0.8" />
 
+    <TextView
+        android:id="@+id/widget_description"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:textSize="12sp"
+        android:maxLines="2"
+        android:ellipsize="end"
+        android:fadingEdge="horizontal" />
+
 </merge>
\ No newline at end of file
diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index c6593f869e..8c315fd604 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -16,6 +16,8 @@
 
 package com.android.launcher3.widget;
 
+import static com.android.launcher3.Utilities.ATLEAST_S;
+
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.os.CancellationSignal;
@@ -67,6 +69,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     private WidgetImageView mWidgetImage;
     private TextView mWidgetName;
     private TextView mWidgetDims;
+    private TextView mWidgetDescription;
 
     protected WidgetItem mItem;
 
@@ -114,9 +117,10 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     protected void onFinishInflate() {
         super.onFinishInflate();
 
-        mWidgetImage = (WidgetImageView) findViewById(R.id.widget_preview);
-        mWidgetName = ((TextView) findViewById(R.id.widget_name));
-        mWidgetDims = ((TextView) findViewById(R.id.widget_dims));
+        mWidgetImage = findViewById(R.id.widget_preview);
+        mWidgetName = findViewById(R.id.widget_name);
+        mWidgetDims = findViewById(R.id.widget_dims);
+        mWidgetDescription = findViewById(R.id.widget_description);
     }
 
     /**
@@ -130,6 +134,8 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
         mWidgetImage.setBitmap(null, null);
         mWidgetName.setText(null);
         mWidgetDims.setText(null);
+        mWidgetDescription.setText(null);
+        mWidgetDescription.setVisibility(GONE);
         mPreviewWidth = mPreviewHeight = mPresetPreviewSize;
 
         if (mActiveRequest != null) {
@@ -145,8 +151,17 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
                 mItem.spanX, mItem.spanY));
         mWidgetDims.setContentDescription(getContext().getString(
                 R.string.widget_accessible_dims_format, mItem.spanX, mItem.spanY));
-        mWidgetPreviewLoader = loader;
+        if (ATLEAST_S && mItem.widgetInfo != null) {
+            CharSequence description = mItem.widgetInfo.loadDescription(getContext());
+            if (description != null && description.length() > 0) {
+                mWidgetDescription.setText(description);
+                mWidgetDescription.setVisibility(VISIBLE);
+            } else {
+                mWidgetDescription.setVisibility(GONE);
+            }
+        }
 
+        mWidgetPreviewLoader = loader;
         if (item.activityInfo != null) {
             setTag(new PendingAddShortcutInfo(item.activityInfo));
         } else {
-- 
GitLab


From 0d0f4f96f91957749a0bcbcdcbbff80fb4aa7c31 Mon Sep 17 00:00:00 2001
From: Jeff Pierce <jspierce@google.com>
Date: Mon, 1 Mar 2021 14:44:54 -0800
Subject: [PATCH 0584/1664] SystemUI proxy updates for managing split screen

Allow the launcher to provide a fill-in intent when starting a
PendingIntent splitscreen, and add a new method to allow the launcher
to request removing a task from the side stage.

Bug: 179176511
Test: Manually tested with the foldable launcher prototype
Change-Id: I23173b432ffe9c988744641170412aa9111cf55d
---
 .../com/android/quickstep/SystemUiProxy.java   | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index 64d05e1401..357aef16f7 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -21,11 +21,11 @@ import android.app.PendingIntent;
 import android.app.PictureInPictureParams;
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.graphics.Bitmap;
 import android.graphics.Insets;
 import android.graphics.Rect;
-import android.os.Binder;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.IBinder.DeathRecipient;
@@ -516,14 +516,26 @@ public class SystemUiProxy implements ISystemUiProxy {
     }
 
     @Override
-    public void startIntent(PendingIntent intent, int stage, int position, Bundle options) {
+    public void startIntent(PendingIntent intent, Intent fillInIntent, int stage,
+            int position, Bundle options) {
         if (mSystemUiProxy != null) {
             try {
-                mSystemUiProxy.startIntent(intent, stage, position, options);
+                mSystemUiProxy.startIntent(intent, fillInIntent, stage, position,
+                        options);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call startIntent");
             }
         }
     }
 
+    @Override
+    public void removeFromSideStage(int taskId) {
+        if (mSystemUiProxy != null) {
+            try {
+                mSystemUiProxy.removeFromSideStage(taskId);
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call removeFromSideStage");
+            }
+        }
+    }
 }
-- 
GitLab


From ed8f264fcb1b6c069e1479ddb0a3789d1174b861 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 26 Feb 2021 17:13:24 -0800
Subject: [PATCH 0585/1664] Add debug log for initInputMonitor()

Sometimes tests aren't getting input events, and this could help
verify that the input monitor is being initialized.

Also remove obsolete check that could mean we don't initialize
when we should.

Bug: 180915942
Change-Id: I811cb432b456bc67d9e7ded945db36eb227f5071
---
 .../com/android/quickstep/TouchInteractionService.java    | 8 +++++++-
 src/com/android/launcher3/testing/TestProtocol.java       | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index e4c8b6f88b..27c7ade603 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -290,7 +290,13 @@ public class TouchInteractionService extends Service implements PluginListener<O
 
     private void initInputMonitor() {
         disposeEventHandlers();
-        if (mDeviceState.isButtonNavMode() || !SystemUiProxy.INSTANCE.get(this).isActive()) {
+
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.TIS_NO_EVENTS, "initInputMonitor: isButtonMode? "
+                    + mDeviceState.isButtonNavMode());
+        }
+
+        if (mDeviceState.isButtonNavMode()) {
             return;
         }
 
diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java
index 218172b6b2..72bbc43dbe 100644
--- a/src/com/android/launcher3/testing/TestProtocol.java
+++ b/src/com/android/launcher3/testing/TestProtocol.java
@@ -106,4 +106,5 @@ public final class TestProtocol {
     public static final String OVERIEW_NOT_ALLAPPS = "b/156095088";
     public static final String NO_SWIPE_TO_HOME = "b/158017601";
     public static final String WORK_PROFILE_REMOVED = "b/159671700";
+    public static final String TIS_NO_EVENTS = "b/180915942";
 }
-- 
GitLab


From ca6a539faa8faa672be54f3287be8cb97809cf53 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 24 Feb 2021 14:25:45 -0800
Subject: [PATCH 0586/1664] Only fetching relevant widget info during first
 pass

This avoids loading resources for allwidget providers when they
are not added to homescreen.

Test: Verified on device
Bug: 180867488
Change-Id: If9adde8eb035ecac75dc4e3e37cd3f0f526865e5
---
 src/com/android/launcher3/model/LoaderTask.java   | 15 ++++++++-------
 .../launcher3/widget/WidgetManagerHelper.java     | 12 ------------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index 8438622dca..2cc1439664 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -45,6 +45,7 @@ import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.text.TextUtils;
+import android.util.ArrayMap;
 import android.util.Log;
 import android.util.LongSparseArray;
 import android.util.TimingLogger;
@@ -126,7 +127,7 @@ public class LoaderTask implements Runnable {
 
     private final UserManagerState mUserManagerState = new UserManagerState();
 
-    protected Map<ComponentKey, AppWidgetProviderInfo> mWidgetProvidersMap;
+    protected final Map<ComponentKey, AppWidgetProviderInfo> mWidgetProvidersMap = new ArrayMap<>();
 
     private boolean mStopped;
 
@@ -664,12 +665,13 @@ public class LoaderTask implements Runnable {
                             final boolean wasProviderReady = !c.hasRestoreFlag(
                                     LauncherAppWidgetInfo.FLAG_PROVIDER_NOT_READY);
 
-                            if (mWidgetProvidersMap == null) {
-                                mWidgetProvidersMap = WidgetManagerHelper.getAllProvidersMap(
-                                        context);
+                            ComponentKey providerKey = new ComponentKey(component, c.user);
+                            if (!mWidgetProvidersMap.containsKey(providerKey)) {
+                                mWidgetProvidersMap.put(providerKey,
+                                        widgetHelper.findProvider(component, c.user));
                             }
-                            final AppWidgetProviderInfo provider = mWidgetProvidersMap.get(
-                                    new ComponentKey(component, c.user));
+                            final AppWidgetProviderInfo provider =
+                                    mWidgetProvidersMap.get(providerKey);
 
                             final boolean isProviderReady = isValidProvider(provider);
                             if (!isSafeMode && !customWidget &&
@@ -873,7 +875,6 @@ public class LoaderTask implements Runnable {
                     mBgDataModel.itemsIdMap.remove(folderId);
                 }
             }
-
             // Remove any ghost widgets
             LauncherSettings.Settings.call(contentResolver,
                     LauncherSettings.Settings.METHOD_REMOVE_GHOST_WIDGETS);
diff --git a/src/com/android/launcher3/widget/WidgetManagerHelper.java b/src/com/android/launcher3/widget/WidgetManagerHelper.java
index c0c5c48077..7248971bce 100644
--- a/src/com/android/launcher3/widget/WidgetManagerHelper.java
+++ b/src/com/android/launcher3/widget/WidgetManagerHelper.java
@@ -31,14 +31,11 @@ import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.model.WidgetsModel;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.pm.UserCache;
-import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.PackageUserKey;
 import com.android.launcher3.widget.custom.CustomWidgetManager;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -122,15 +119,6 @@ public class WidgetManagerHelper {
                 appWidgetId).getBoolean(WIDGET_OPTION_RESTORE_COMPLETED);
     }
 
-    public static Map<ComponentKey, AppWidgetProviderInfo> getAllProvidersMap(Context context) {
-        if (WidgetsModel.GO_DISABLE_WIDGETS) {
-            return Collections.emptyMap();
-        }
-        return allWidgetsSteam(context).collect(
-                        Collectors.toMap(info -> new ComponentKey(info.provider, info.getProfile()),
-                        Function.identity()));
-    }
-
     private static Stream<AppWidgetProviderInfo> allWidgetsSteam(Context context) {
         AppWidgetManager awm = context.getSystemService(AppWidgetManager.class);
         return Stream.concat(
-- 
GitLab


From 2839c20c1ae976a1a90a6dcc2f46a0eba53fde5f Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Tue, 2 Mar 2021 12:01:03 -0500
Subject: [PATCH 0587/1664] Fix NPE in FlingToDeleteHelper

Bug: 171543835
Test: not able to repo bug, but this prevents the NPE
Change-Id: I153dd0665705b2f5fd7f46786e815ba57dec4720
---
 src/com/android/launcher3/dragndrop/FlingToDeleteHelper.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/android/launcher3/dragndrop/FlingToDeleteHelper.java b/src/com/android/launcher3/dragndrop/FlingToDeleteHelper.java
index 7788f9366e..0a1aba12b5 100644
--- a/src/com/android/launcher3/dragndrop/FlingToDeleteHelper.java
+++ b/src/com/android/launcher3/dragndrop/FlingToDeleteHelper.java
@@ -65,6 +65,9 @@ public class FlingToDeleteHelper {
     }
 
     public Runnable getFlingAnimation(DropTarget.DragObject dragObject, DragOptions options) {
+        if (options == null) {
+            return null;
+        }
         PointF vel = isFlingingToDelete();
         options.isFlingToDelete = vel != null;
         if (!options.isFlingToDelete) {
-- 
GitLab


From b794ea64c72678ae1a94c2b3de130f4f5ce77a35 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Wed, 3 Feb 2021 18:00:30 +0000
Subject: [PATCH 0588/1664] Show TaskView as grid in large screens

- Introduced gridProgress to RecentsView/TaskView ofr animating into grid
- Introduced gridProgress dependant translation and scale properties in TaskView
- Animate running task into grid with TaskViewSimulator
- Remove overview actions (for now) but keep clear all button in large screens
- Adjust ClearAllButton translation to acoomodate for grid
- Use screen width +-50% to calculate task visibility
- Use the position where TaskView is on screenEnd as pageScroll
- TODO: Handle separate recents activity

Doc: go/foldables-launcher-overview
Video: http://dr/file/d/107Aydii1LoFCwP63nWG3Twr2PBDE5ZgD/view?resourcekey=0-aUjdnx8ezimS9tmAgao9ag
Test: Test Launchering overview and launching overview from apps with folloiwng combination:
- large / small screen sizes
- portrait / landscape
- thumbnails from different screen sizes / orientations
Bug: 174464863
Fixes: 181509346

Change-Id: I4b691cde774f2e37532b68ba83c6eed399f2332e
---
 quickstep/res/values/dimens.xml               |   1 +
 .../BaseRecentsViewStateController.java       |   5 +
 .../RecentsViewStateController.java           |  12 +-
 .../states/BackgroundAppState.java            |   8 +-
 .../states/OverviewModalTaskState.java        |   2 +-
 .../uioverrides/states/OverviewState.java     |   9 +-
 .../NoButtonQuickSwitchTouchController.java   |   4 +-
 .../PortraitOverviewStateTouchHelper.java     |   2 +-
 .../android/quickstep/AbsSwipeUpHandler.java  |  25 +-
 .../com/android/quickstep/TaskViewUtils.java  |   7 +-
 .../quickstep/util/TaskViewSimulator.java     |  33 +-
 .../quickstep/views/ClearAllButton.java       |  63 +++-
 .../quickstep/views/LauncherRecentsView.java  |   4 +-
 .../android/quickstep/views/RecentsView.java  | 344 ++++++++++++++++--
 .../android/quickstep/views/TaskMenuView.java |   8 +-
 .../com/android/quickstep/views/TaskView.java | 176 ++++++---
 src/com/android/launcher3/LauncherState.java  |  10 +-
 src/com/android/launcher3/PagedView.java      |  23 +-
 src/com/android/launcher3/Workspace.java      |   2 +-
 .../touch/LandscapePagedViewHandler.java      |   7 -
 .../touch/PagedOrientationHandler.java        |   2 -
 .../touch/PortraitPagedViewHandler.java       |   7 -
 22 files changed, 614 insertions(+), 140 deletions(-)

diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index e46eb9e12b..9773366247 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -29,6 +29,7 @@
     <dimen name="overview_actions_bottom_margin_three_button">8dp</dimen>
     <dimen name="overview_actions_horizontal_margin">16dp</dimen>
 
+    <dimen name="recents_row_spacing">48dp</dimen>
     <dimen name="recents_page_spacing">16dp</dimen>
     <dimen name="recents_clear_all_deadzone_vertical_margin">70dp</dimen>
 
diff --git a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
index aad7e17df0..0f13ef9c20 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
@@ -30,6 +30,7 @@ import static com.android.launcher3.states.StateAnimationConfig.PLAY_ATOMIC_OVER
 import static com.android.launcher3.states.StateAnimationConfig.PLAY_ATOMIC_OVERVIEW_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
 import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET;
+import static com.android.quickstep.views.RecentsView.RECENTS_GRID_PROGRESS;
 import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
 import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION;
 
@@ -73,6 +74,8 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView>
         SCRIM_PROGRESS.set(scrim, state.getOverviewScrimAlpha(mLauncher));
         SCRIM_MULTIPLIER.set(scrim, 1f);
         getTaskModalnessProperty().set(mRecentsView, state.getOverviewModalness());
+        RECENTS_GRID_PROGRESS.set(mRecentsView, state.displayOverviewTasksAsGrid(mLauncher)
+                ? 1f : 0f);
     }
 
     @Override
@@ -117,6 +120,8 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView>
                 mRecentsView, getTaskModalnessProperty(),
                 toState.getOverviewModalness(),
                 config.getInterpolator(ANIM_OVERVIEW_MODAL, LINEAR));
+        setter.setFloat(mRecentsView, RECENTS_GRID_PROGRESS,
+                toState.displayOverviewTasksAsGrid(mLauncher) ? 1f : 0f, LINEAR);
     }
 
     abstract FloatProperty getTaskModalnessProperty();
diff --git a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
index 5ccc1e8681..c9de662784 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
@@ -15,7 +15,8 @@
  */
 package com.android.launcher3.uioverrides;
 
-import static com.android.launcher3.LauncherState.OVERVIEW_BUTTONS;
+import static com.android.launcher3.LauncherState.CLEAR_ALL_BUTTON;
+import static com.android.launcher3.LauncherState.OVERVIEW_ACTIONS;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_ACTIONS_FADE;
 import static com.android.quickstep.views.RecentsView.CONTENT_ALPHA;
@@ -83,11 +84,14 @@ public final class RecentsViewStateController extends
 
     private void setAlphas(PropertySetter propertySetter, StateAnimationConfig config,
             LauncherState state) {
-        float buttonAlpha = (state.getVisibleElements(mLauncher) & OVERVIEW_BUTTONS) != 0 ? 1 : 0;
+        float clearAllButtonAlpha = (state.getVisibleElements(mLauncher) & CLEAR_ALL_BUTTON) != 0
+                ? 1 : 0;
         propertySetter.setFloat(mRecentsView.getClearAllButton(), ClearAllButton.VISIBILITY_ALPHA,
-                buttonAlpha, LINEAR);
+                clearAllButtonAlpha, LINEAR);
+        float overviewButtonAlpha = (state.getVisibleElements(mLauncher) & OVERVIEW_ACTIONS) != 0
+                ? 1 : 0;
         propertySetter.setFloat(mLauncher.getActionsView().getVisibilityAlpha(),
-                MultiValueAlpha.VALUE, buttonAlpha, config.getInterpolator(
+                MultiValueAlpha.VALUE, overviewButtonAlpha, config.getInterpolator(
                         ANIM_OVERVIEW_ACTIONS_FADE, LINEAR));
     }
 
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
index 2cf65af3ed..2ad718b63f 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
@@ -69,11 +69,17 @@ public class BackgroundAppState extends OverviewState {
     @Override
     public int getVisibleElements(Launcher launcher) {
         return super.getVisibleElements(launcher)
-                & ~OVERVIEW_BUTTONS
+                & ~OVERVIEW_ACTIONS
+                & ~CLEAR_ALL_BUTTON
                 & ~VERTICAL_SWIPE_INDICATOR
                 | TASKBAR;
     }
 
+    @Override
+    public boolean displayOverviewTasksAsGrid(Launcher launcher) {
+        return false;
+    }
+
     @Override
     public ScaleAndTranslation getHotseatScaleAndTranslation(Launcher launcher) {
         if ((getVisibleElements(launcher) & HOTSEAT_ICONS) != 0) {
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java
index 41c689d16d..bdba482c71 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java
@@ -45,7 +45,7 @@ public class OverviewModalTaskState extends OverviewState {
 
     @Override
     public int getVisibleElements(Launcher launcher) {
-        return OVERVIEW_BUTTONS;
+        return OVERVIEW_ACTIONS | CLEAR_ALL_BUTTON;
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
index b295e79d04..d480b6d472 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -28,6 +28,7 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.Workspace;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.util.LayoutUtils;
 import com.android.quickstep.views.RecentsView;
@@ -122,7 +123,8 @@ public class OverviewState extends LauncherState {
 
     @Override
     public int getVisibleElements(Launcher launcher) {
-        return OVERVIEW_BUTTONS;
+        return displayOverviewTasksAsGrid(launcher) ? CLEAR_ALL_BUTTON
+                : CLEAR_ALL_BUTTON | OVERVIEW_ACTIONS;
     }
 
     @Override
@@ -130,6 +132,11 @@ public class OverviewState extends LauncherState {
         return 0.5f;
     }
 
+    @Override
+    public boolean displayOverviewTasksAsGrid(Launcher launcher) {
+        return launcher.getDeviceProfile().isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get();
+    }
+
     @Override
     public String getDescription(Launcher launcher) {
         return launcher.getString(R.string.accessibility_recent_apps);
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
index df433f8cc0..4766870984 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
@@ -18,7 +18,7 @@ package com.android.launcher3.uioverrides.touchcontrollers;
 import static com.android.launcher3.LauncherAnimUtils.newCancelListener;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
-import static com.android.launcher3.LauncherState.OVERVIEW_BUTTONS;
+import static com.android.launcher3.LauncherState.OVERVIEW_ACTIONS;
 import static com.android.launcher3.LauncherState.QUICK_SWITCH;
 import static com.android.launcher3.anim.AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD;
 import static com.android.launcher3.anim.Interpolators.ACCEL_0_75;
@@ -222,7 +222,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
         mRecentsView.setContentAlpha(1);
         mRecentsView.setFullscreenProgress(fromState.getOverviewFullscreenProgress());
         mLauncher.getActionsView().getVisibilityAlpha().setValue(
-                (fromState.getVisibleElements(mLauncher) & OVERVIEW_BUTTONS) != 0 ? 1f : 0f);
+                (fromState.getVisibleElements(mLauncher) & OVERVIEW_ACTIONS) != 0 ? 1f : 0f);
 
         float[] scaleAndOffset = toState.getOverviewScaleAndOffset(mLauncher);
         // As we drag right, animate the following properties:
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java
index 845699a761..4df0f63116 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java
@@ -76,7 +76,7 @@ public final class PortraitOverviewStateTouchHelper {
      * @return the animation
      */
     PendingAnimation createSwipeDownToTaskAppAnimation(long duration, Interpolator interpolator) {
-        mRecentsView.setCurrentPage(mRecentsView.getPageNearestToCenterOfScreen());
+        mRecentsView.setCurrentPage(mRecentsView.getDestinationPage());
         TaskView taskView = mRecentsView.getCurrentPageTaskView();
         if (taskView == null) {
             throw new IllegalStateException("There is no task view to animate to.");
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 5f8fc6d768..1bd7fe6593 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -25,7 +25,6 @@ import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAG
 import static com.android.launcher3.QuickstepAppTransitionManagerImpl.RECENTS_LAUNCH_DURATION;
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.anim.Interpolators.DEACCEL;
-import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.IGNORE;
@@ -46,12 +45,14 @@ import static com.android.quickstep.GestureState.STATE_END_TARGET_ANIMATION_FINI
 import static com.android.quickstep.GestureState.STATE_END_TARGET_SET;
 import static com.android.quickstep.GestureState.STATE_RECENTS_SCROLLING_FINISHED;
 import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;
+import static com.android.quickstep.views.RecentsView.RECENTS_GRID_PROGRESS;
 import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD;
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.annotation.TargetApi;
 import android.app.ActivityManager;
@@ -79,6 +80,7 @@ import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.Interpolators;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.logging.StatsLogManager.StatsLogger;
 import com.android.launcher3.statemanager.StatefulActivity;
@@ -922,7 +924,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                     * MAX_SWIPE_DURATION * SWIPE_DURATION_MULTIPLIER));
             duration = Math.min(MAX_SWIPE_DURATION, expectedDuration);
             startShift = currentShift;
-            interpolator = endTarget == RECENTS ? OVERSHOOT_1_2 : DEACCEL;
+            interpolator = endTarget == RECENTS ? ACCEL_DEACCEL : DEACCEL;
         } else {
             startShift = Utilities.boundToRange(currentShift - velocity.y
                     * getSingleFrameMs(mContext) / mTransitionDragLength, 0, mDragLengthFactor);
@@ -945,7 +947,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                     duration = Math.min(MAX_SWIPE_DURATION, 2 * baseDuration);
 
                     if (endTarget == RECENTS) {
-                        interpolator = OVERSHOOT_1_2;
+                        interpolator = ACCEL_DEACCEL;
                     }
                 }
             }
@@ -958,7 +960,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
             duration = Math.max(MIN_OVERSHOOT_DURATION, duration);
         } else if (endTarget == RECENTS) {
             if (mRecentsView != null) {
-                int nearestPage = mRecentsView.getPageNearestToCenterOfScreen();
+                int nearestPage = mRecentsView.getDestinationPage();
                 if (mRecentsView.getNextPage() != nearestPage) {
                     // We shouldn't really scroll to the next page when swiping up to recents.
                     // Only allow settling on the next page if it's nearest to the center.
@@ -1102,8 +1104,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
             homeAnimFactory.playAtomicAnimation(velocityPxPerMs.y);
             mLauncherTransitionController = null;
         } else {
+            AnimatorSet animatorSet = new AnimatorSet();
             ValueAnimator windowAnim = mCurrentShift.animateToValue(start, end);
-            windowAnim.setDuration(duration).setInterpolator(interpolator);
             windowAnim.addUpdateListener(valueAnimator -> {
                 computeRecentsScrollIfInvisible();
             });
@@ -1138,8 +1140,15 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                     mGestureState.setState(STATE_END_TARGET_ANIMATION_FINISHED);
                 }
             });
-            windowAnim.start();
-            mRunningWindowAnim = RunningWindowAnim.wrap(windowAnim);
+            animatorSet.play(windowAnim);
+            if (mRecentsView != null && mDp.isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get()
+                    && mGestureState.getEndTarget() == RECENTS) {
+                animatorSet.play(ObjectAnimator.ofFloat(mRecentsView, RECENTS_GRID_PROGRESS, 1));
+                animatorSet.play(mTaskViewSimulator.gridProgress.animateToValue(0, 1));
+            }
+            animatorSet.setDuration(duration).setInterpolator(interpolator);
+            animatorSet.start();
+            mRunningWindowAnim = RunningWindowAnim.wrap(animatorSet);
         }
     }
 
@@ -1761,7 +1770,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                     mTaskViewSimulator.getCurrentRect(),
                     mTaskViewSimulator.getCurrentCornerRadius());
             LiveTileOverlay.INSTANCE.setRotation(
-                    mRecentsView.getPagedViewOrientedState().getDisplayRotation());
+                    mTaskViewSimulator.getOrientationState().getDisplayRotation());
         }
         ProtoTracer.INSTANCE.get(mContext).scheduleFrameUpdate();
     }
diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java
index 25c0928e8d..cd4f52f576 100644
--- a/quickstep/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java
@@ -31,6 +31,7 @@ import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MOD
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
 import android.annotation.TargetApi;
 import android.content.ComponentName;
 import android.content.Context;
@@ -307,7 +308,11 @@ public final class TaskViewUtils {
         Animator launcherAnim;
         final AnimatorListenerAdapter windowAnimEndListener;
         if (launcherClosing) {
-            launcherAnim = recentsView.createAdjacentPageAnimForTaskLaunch(taskView);
+            Context context = v.getContext();
+            DeviceProfile dp = BaseActivity.fromContext(context).getDeviceProfile();
+            launcherAnim = dp.isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get()
+                    ? ObjectAnimator.ofFloat(recentsView, RecentsView.CONTENT_ALPHA, 0)
+                    : recentsView.createAdjacentPageAnimForTaskLaunch(taskView);
             launcherAnim.setInterpolator(Interpolators.TOUCH_RESPONSE_INTERPOLATOR);
             launcherAnim.setDuration(RECENTS_LAUNCH_DURATION);
 
diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index edce1946eb..8c98480963 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -15,6 +15,7 @@
  */
 package com.android.quickstep.util;
 
+import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.states.RotationHelper.deltaRotation;
 import static com.android.launcher3.touch.PagedOrientationHandler.MATRIX_POST_TRANSLATE;
@@ -24,6 +25,7 @@ import static com.android.systemui.shared.system.WindowManagerWrapper.WINDOWING_
 
 import android.animation.TimeInterpolator;
 import android.content.Context;
+import android.content.res.Resources;
 import android.graphics.Matrix;
 import android.graphics.Point;
 import android.graphics.PointF;
@@ -34,6 +36,7 @@ import android.util.IntProperty;
 import androidx.annotation.NonNull;
 
 import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.touch.PagedOrientationHandler;
@@ -73,6 +76,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
 
     @NonNull
     private RecentsOrientedState mOrientationState;
+    private final boolean mIsRecentsRtl;
 
     private final Rect mTaskRect = new Rect();
     private boolean mDrawsBelowRecents;
@@ -98,12 +102,15 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
     public final AnimatedFloat recentsViewScale = new AnimatedFloat();
     public final AnimatedFloat fullScreenProgress = new AnimatedFloat();
     public final AnimatedFloat recentsViewSecondaryTranslation = new AnimatedFloat();
+    public final AnimatedFloat gridProgress = new AnimatedFloat();
     private final ScrollState mScrollState = new ScrollState();
 
     // Cached calculations
     private boolean mLayoutValid = false;
     private boolean mScrollValid = false;
     private int mOrientationStateId;
+    private final int mTaskThumbnailPadding;
+    private final int mRowSpacing;
 
     public TaskViewSimulator(Context context, BaseActivityInterface sizeStrategy) {
         mContext = context;
@@ -113,6 +120,10 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
         mOrientationState.setGestureActive(true);
         mCurrentFullscreenParams = new FullscreenDrawParams(context);
         mOrientationStateId = mOrientationState.getStateId();
+        Resources resources = context.getResources();
+        mIsRecentsRtl = mOrientationState.getOrientationHandler().getRecentsRtlSetting(resources);
+        mTaskThumbnailPadding = (int) resources.getDimension(R.dimen.task_thumbnail_top_margin);
+        mRowSpacing = (int) resources.getDimension(R.dimen.recents_row_spacing);
     }
 
     /**
@@ -277,9 +288,10 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
             mScrollState.updateInterpolation(mDp, start);
         }
 
-        float progress = Utilities.boundToRange(fullScreenProgress.value, 0, 1);
+        float fullScreenProgress = Utilities.boundToRange(this.fullScreenProgress.value, 0, 1);
         mCurrentFullscreenParams.setProgress(
-                progress, recentsViewScale.value, mTaskRect.width(), mDp, mPositionHelper);
+                fullScreenProgress, recentsViewScale.value, mTaskRect.width(), mDp,
+                mPositionHelper);
 
         // Apply thumbnail matrix
         RectF insets = mCurrentFullscreenParams.mCurrentDrawnInsets;
@@ -291,6 +303,23 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
         mMatrix.postTranslate(insets.left, insets.top);
         mMatrix.postScale(scale, scale);
 
+        float interpolatedGridProgress = ACCEL_DEACCEL.getInterpolation(gridProgress.value);
+
+        // Apply TaskView matrix: gridProgress
+        final int boxLength = (int) Math.max(taskWidth, taskHeight);
+        float availableHeight =
+                mTaskThumbnailPadding + taskHeight + mSizeStrategy.getOverviewActionsHeight(
+                        mContext);
+        float rowHeight = (availableHeight - mRowSpacing) / 2;
+        float gridScale = rowHeight / (boxLength + mTaskThumbnailPadding);
+        scale = Utilities.mapRange(interpolatedGridProgress, 1f, gridScale);
+        mMatrix.postScale(scale, scale, mIsRecentsRtl ? 0 : taskWidth, 0);
+        float taskWidthDiff = taskWidth * (1 - gridScale);
+        float taskWidthOffset = mIsRecentsRtl ? taskWidthDiff : -taskWidthDiff;
+        float translationPrimary = Utilities.mapRange(interpolatedGridProgress, 0, taskWidthOffset);
+        mOrientationState.getOrientationHandler().set(mMatrix, MATRIX_POST_TRANSLATE,
+                translationPrimary);
+
         // Apply TaskView matrix: translate, scroll
         mMatrix.postTranslate(mTaskRect.left, mTaskRect.top);
         mOrientationState.getOrientationHandler().set(mMatrix, MATRIX_POST_TRANSLATE,
diff --git a/quickstep/src/com/android/quickstep/views/ClearAllButton.java b/quickstep/src/com/android/quickstep/views/ClearAllButton.java
index 0837300a22..9af4d3054c 100644
--- a/quickstep/src/com/android/quickstep/views/ClearAllButton.java
+++ b/quickstep/src/com/android/quickstep/views/ClearAllButton.java
@@ -43,9 +43,12 @@ public class ClearAllButton extends Button implements PageCallbacks {
     private float mScrollAlpha = 1;
     private float mContentAlpha = 1;
     private float mVisibilityAlpha = 1;
+    private float mGridProgress = 1;
 
     private boolean mIsRtl;
     private final float mOriginalTranslationX, mOriginalTranslationY;
+    private float mNormalTranslationPrimary;
+    private float mGridTranslationPrimary;
 
     private int mScrollOffset;
 
@@ -100,10 +103,18 @@ public class ClearAllButton extends Button implements PageCallbacks {
             return;
         }
 
-        float shift = Math.min(scrollState.scrollFromEdge, orientationSize);
-        float translation = mIsRtl ? (mScrollOffset - shift) : (mScrollOffset + shift);
-        orientationHandler.setPrimaryAndResetSecondaryTranslate(
-                this, translation, mOriginalTranslationX, mOriginalTranslationY);
+        float shift;
+        if (mIsRtl) {
+            shift = Math.min(scrollState.scrollFromEdge, orientationSize);
+        } else {
+            shift = Math.min(scrollState.scrollFromEdge,
+                    orientationSize + getGridTrans(mGridTranslationPrimary))
+                    - getGridTrans(mGridTranslationPrimary);
+        }
+        mNormalTranslationPrimary = mIsRtl ? (mScrollOffset - shift) : (mScrollOffset + shift);
+        applyPrimaryTranslation();
+        orientationHandler.getSecondaryViewTranslate().set(this,
+                orientationHandler.getSecondaryValue(mOriginalTranslationX, mOriginalTranslationY));
         mScrollAlpha = 1 - shift / orientationSize;
         updateAlpha();
     }
@@ -111,6 +122,48 @@ public class ClearAllButton extends Button implements PageCallbacks {
     private void updateAlpha() {
         final float alpha = mScrollAlpha * mContentAlpha * mVisibilityAlpha;
         setAlpha(alpha);
-        setClickable(alpha == 1);
+        setClickable(Math.min(alpha, 1) == 1);
+    }
+
+    public void setGridTranslationPrimary(float gridTranslationPrimary) {
+        mGridTranslationPrimary = gridTranslationPrimary;
+        applyPrimaryTranslation();
+    }
+
+    public float getScrollAdjustment() {
+        float scrollAdjustment = 0;
+        if (mGridProgress > 0) {
+            scrollAdjustment += mGridTranslationPrimary;
+        }
+        return scrollAdjustment;
+    }
+
+    public float getOffsetAdjustment() {
+        return getScrollAdjustment();
+    }
+
+    /**
+     * Moves ClearAllButton between carousel and 2 row grid.
+     *
+     * @param gridProgress 0 = carousel; 1 = 2 row grid.
+     */
+    public void setGridProgress(float gridProgress) {
+        mGridProgress = gridProgress;
+        applyPrimaryTranslation();
+    }
+
+    private void applyPrimaryTranslation() {
+        RecentsView recentsView = getRecentsView();
+        if (recentsView == null) {
+            return;
+        }
+
+        PagedOrientationHandler orientationHandler = recentsView.getPagedOrientationHandler();
+        orientationHandler.getPrimaryViewTranslate().set(this,
+                mNormalTranslationPrimary + getGridTrans(mGridTranslationPrimary));
+    }
+
+    private float getGridTrans(float endTranslation) {
+        return mGridProgress > 0 ? endTranslation : 0;
     }
 }
diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
index 52a7466429..84218fd454 100644
--- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
@@ -16,9 +16,9 @@
 package com.android.quickstep.views;
 
 import static com.android.launcher3.LauncherState.ALL_APPS_HEADER_EXTRA;
+import static com.android.launcher3.LauncherState.CLEAR_ALL_BUTTON;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
-import static com.android.launcher3.LauncherState.OVERVIEW_BUTTONS;
 import static com.android.launcher3.LauncherState.OVERVIEW_MODAL_TASK;
 import static com.android.launcher3.LauncherState.SPRING_LOADED;
 import static com.android.launcher3.QuickstepAppTransitionManagerImpl.ALL_APPS_PROGRESS_OFF_SCREEN;
@@ -169,7 +169,7 @@ public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher>
         if (enabled) {
             LauncherState state = mActivity.getStateManager().getState();
             boolean hasClearAllButton = (state.getVisibleElements(mActivity)
-                    & OVERVIEW_BUTTONS) != 0;
+                    & CLEAR_ALL_BUTTON) != 0;
             setDisallowScrollToClearAll(!hasClearAllButton);
         }
     }
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index b72e05c80d..e20540c8fc 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -107,6 +107,7 @@ import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.touch.PagedOrientationHandler.CurveProperties;
 import com.android.launcher3.util.DynamicResource;
+import com.android.launcher3.util.IntSet;
 import com.android.launcher3.util.MultiValueAlpha;
 import com.android.launcher3.util.OverScroller;
 import com.android.launcher3.util.ResourceBasedOverride.Overrides;
@@ -239,6 +240,19 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                 }
             };
 
+    public static final FloatProperty<RecentsView> RECENTS_GRID_PROGRESS =
+            new FloatProperty<RecentsView>("recentsGrid") {
+                @Override
+                public void setValue(RecentsView view, float gridProgress) {
+                    view.setGridProgress(gridProgress);
+                }
+
+                @Override
+                public Float get(RecentsView view) {
+                    return view.mGridProgress;
+                }
+            };
+
     protected final RecentsOrientedState mOrientationState;
     protected final BaseActivityInterface mSizeStrategy;
     protected RecentsAnimationController mRecentsAnimationController;
@@ -264,6 +278,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     private final float mFastFlingVelocity;
     private final RecentsModel mModel;
     private final int mTaskTopMargin;
+    private final int mRowSpacing;
     private final ClearAllButton mClearAllButton;
     private final Rect mClearAllButtonDeadZoneRect = new Rect();
     private final Rect mTaskViewDeadZoneRect = new Rect();
@@ -285,6 +300,9 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
 
     private float mAdjacentPageOffset = 0;
     private float mTaskViewsSecondaryTranslation = 0;
+    // Progress from 0 to 1 where 0 is a carousel and 1 is a 2 row grid.
+    private float mGridProgress = 0;
+    private boolean mShowAsGrid;
 
     /**
      * TODO: Call reloadIdNeeded in onTaskStackChanged.
@@ -450,6 +468,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         setLayoutDirection(mIsRtl ? View.LAYOUT_DIRECTION_RTL : View.LAYOUT_DIRECTION_LTR);
         mTaskTopMargin = getResources()
                 .getDimensionPixelSize(R.dimen.task_thumbnail_top_margin);
+        mRowSpacing = (int) getResources().getDimension(R.dimen.recents_row_spacing);
         mSquaredTouchSlop = squaredTouchSlop(context);
 
         mEmptyIcon = context.getDrawable(R.drawable.ic_empty_recents);
@@ -479,6 +498,11 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mLiveTileTaskViewSimulator.recentsViewScale.value = 1;
         mLiveTileTaskViewSimulator.setOrientationState(mOrientationState);
         mLiveTileTaskViewSimulator.setDrawsBelowRecents(true);
+
+        mShowAsGrid =
+                mActivity.getDeviceProfile().isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get();
+        mActivity.addOnDeviceProfileChangeListener(newDp ->
+                mShowAsGrid = newDp.isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get());
     }
 
     public OverScroller getScroller() {
@@ -640,8 +664,22 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     }
 
     public boolean isTaskViewVisible(TaskView tv) {
-        // For now, just check if it's the active task or an adjacent task
-        return Math.abs(indexOfChild(tv) - getNextPage()) <= 1;
+        if (mShowAsGrid) {
+            int screenStart = mOrientationHandler.getPrimaryScroll(this);
+            int screenEnd = screenStart + mOrientationHandler.getMeasuredSize(this);
+            return isTaskViewWithinBounds(tv, screenStart, screenEnd);
+        } else {
+            // For now, just check if it's the active task or an adjacent task
+            return Math.abs(indexOfChild(tv) - getNextPage()) <= 1;
+        }
+    }
+
+    private boolean isTaskViewWithinBounds(TaskView tv, int start, int end) {
+        int taskStart = mOrientationHandler.getChildStart(tv) + (int) tv.getOffsetAdjustment();
+        int taskSize = (int) (mOrientationHandler.getMeasuredSize(tv) * tv.getSizeAdjustment());
+        int taskEnd = taskStart + taskSize;
+        return (taskStart >= start && taskStart <= end) || (taskEnd >= start
+                && taskEnd <= end);
     }
 
     public TaskView getTaskView(int taskId) {
@@ -703,10 +741,21 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     public boolean onTouchEvent(MotionEvent ev) {
         super.onTouchEvent(ev);
 
-        TaskView taskView = getCurrentPageTaskView();
-        if (taskView != null && taskView.offerTouchToChildren(ev)) {
-            // Keep consuming events to pass to delegate
-            return true;
+        if (mShowAsGrid) {
+            int taskCount = getTaskViewCount();
+            for (int i = 0; i < taskCount; i++) {
+                TaskView taskView = getTaskViewAt(i);
+                if (isTaskViewVisible(taskView) && taskView.offerTouchToChildren(ev)) {
+                    // Keep consuming events to pass to delegate
+                    return true;
+                }
+            }
+        } else {
+            TaskView taskView = getCurrentPageTaskView();
+            if (taskView != null && taskView.offerTouchToChildren(ev)) {
+                // Keep consuming events to pass to delegate
+                return true;
+            }
         }
 
         final int x = (int) ev.getX();
@@ -757,6 +806,11 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         return isHandlingTouch() || shouldStealTouchFromSiblingsBelow(ev);
     }
 
+    @Override
+    protected boolean snapToPageInFreeScroll() {
+        return !mShowAsGrid;
+    }
+
     @Override
     protected void determineScrollingStart(MotionEvent ev, float touchSlopScale) {
         // Enables swiping to the left or right only if the task overlay is not modal.
@@ -808,8 +862,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             final Task task = tasks.get(i);
             final TaskView taskView = (TaskView) getChildAt(pageIndex);
             taskView.bind(task, mOrientationState);
-            taskView.updateTaskSize(!taskView.hasTaskId(mRunningTaskId));
         }
+        updateTaskSize();
 
         if (mNextPage == INVALID_PAGE) {
             // Set the current page to the running task, but not if settling on new task.
@@ -872,8 +926,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             // Since we reuse the same mLiveTileTaskViewSimulator in the RecentsView, we need
             // to reset the params after it settles in Overview from swipe up so that we don't
             // render with obsolete param values.
-            mLiveTileTaskViewSimulator.taskPrimaryTranslation.value = 0;
-            mLiveTileTaskViewSimulator.taskSecondaryTranslation.value = 0;
             mLiveTileTaskViewSimulator.fullScreenProgress.value = 0;
             mLiveTileTaskViewSimulator.recentsViewScale.value = 1;
 
@@ -899,12 +951,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     public void setFullscreenProgress(float fullscreenProgress) {
         mFullscreenProgress = fullscreenProgress;
         int taskCount = getTaskViewCount();
-        float accumulatedTranslationX = 0;
         for (int i = 0; i < taskCount; i++) {
-            TaskView taskView = getTaskViewAt(i);
-            taskView.setFullscreenProgress(mFullscreenProgress);
-            taskView.setAccumulatedTranslationX(accumulatedTranslationX);
-            accumulatedTranslationX += taskView.getFullscreenTranslationX();
+            getTaskViewAt(i).setFullscreenProgress(mFullscreenProgress);
         }
 
         // Fade out the actions view quickly (0.1 range)
@@ -941,11 +989,22 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                 dp.widthPx - mInsets.right - mTempRect.right,
                 dp.heightPx - mInsets.bottom - mTempRect.bottom);
         // Force TaskView to update size from thumbnail
+        updateTaskSize();
+    }
+
+    /**
+     * Updates TaskView scaling and translation required to support variable width.
+     */
+    private void updateTaskSize() {
+        float accumulatedTranslationX = 0;
         final int taskCount = getTaskViewCount();
         for (int i = 0; i < taskCount; i++) {
             TaskView taskView = getTaskViewAt(i);
-            taskView.updateTaskSize(!taskView.hasTaskId(mRunningTaskId));
+            taskView.updateTaskSize();
+            taskView.setAccumulatedFullscreenTranslationX(accumulatedTranslationX);
+            accumulatedTranslationX += taskView.getFullscreenTranslationX();
         }
+        updateGridProperties();
     }
 
     public void getTaskSize(Rect outRect) {
@@ -1010,6 +1069,31 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         }
     }
 
+    @Override
+    protected int getDestinationPage(int scaledScroll) {
+        if (mGridProgress == 0) {
+            return super.getDestinationPage(scaledScroll);
+        }
+
+        final int childCount = getChildCount();
+        if (mPageScrolls == null || childCount != mPageScrolls.length) {
+            return -1;
+        }
+
+        // When in grid, return the page which scroll is closest to screenStart instead of page
+        // nearest to center of screen.
+        int minDistanceFromScreenStart = Integer.MAX_VALUE;
+        int minDistanceFromScreenStartIndex = -1;
+        for (int i = 0; i < childCount; ++i) {
+            int distanceFromScreenStart = Math.abs(mPageScrolls[i] - scaledScroll);
+            if (distanceFromScreenStart < minDistanceFromScreenStart) {
+                minDistanceFromScreenStart = distanceFromScreenStart;
+                minDistanceFromScreenStartIndex = i;
+            }
+        }
+        return minDistanceFromScreenStartIndex;
+    }
+
     /**
      * Iterates through all the tasks, and loads the associated task data for newly visible tasks,
      * and unloads the associated task data for tasks that are no longer visible.
@@ -1021,17 +1105,35 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             return;
         }
 
-        int centerPageIndex = getPageNearestToCenterOfScreen();
-        int numChildren = getChildCount();
-        int lower = Math.max(0, centerPageIndex - 2);
-        int upper = Math.min(centerPageIndex + 2, numChildren - 1);
+        int lower = 0;
+        int upper = 0;
+        int visibleStart = 0;
+        int visibleEnd = 0;
+        if (mShowAsGrid) {
+            int screenStart = mOrientationHandler.getPrimaryScroll(this);
+            int pageOrientedSize = mOrientationHandler.getMeasuredSize(this);
+            int halfScreenSize = pageOrientedSize / 2;
+            // Use +/- 50% screen width as visible area.
+            visibleStart = screenStart - halfScreenSize;
+            visibleEnd = screenStart + pageOrientedSize + halfScreenSize;
+        } else {
+            int centerPageIndex = getPageNearestToCenterOfScreen();
+            int numChildren = getChildCount();
+            lower = Math.max(0, centerPageIndex - 2);
+            upper = Math.min(centerPageIndex + 2, numChildren - 1);
+        }
 
         // Update the task data for the in/visible children
         for (int i = 0; i < getTaskViewCount(); i++) {
             TaskView taskView = getTaskViewAt(i);
             Task task = taskView.getTask();
             int index = indexOfChild(taskView);
-            boolean visible = lower <= index && index <= upper;
+            boolean visible;
+            if (mShowAsGrid) {
+                visible = isTaskViewWithinBounds(taskView, visibleStart, visibleEnd);
+            } else {
+                visible = lower <= index && index <= upper;
+            }
             if (visible) {
                 if (task == mTmpRunningTask) {
                     // Skip loading if this is the task that we are animating into
@@ -1229,7 +1331,11 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         }
         setRunningTaskHidden(false);
         animateUpRunningTaskIconScale();
-        animateActionsViewIn();
+
+        // TODO: This should be tied to whether there is a focus app on overview.
+        if (!mShowAsGrid) {
+            animateActionsViewIn();
+        }
     }
 
     /**
@@ -1258,7 +1364,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             // gesture and the task list is loaded and applied
             mTmpRunningTask = Task.from(new TaskKey(runningTaskInfo), runningTaskInfo, false);
             taskView.bind(mTmpRunningTask, mOrientationState);
-            taskView.updateTaskSize(false);
 
             // Measure and layout immediately so that the scroll values is updated instantly
             // as the user might be quick-switching
@@ -1272,6 +1377,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         setCurrentPage(getRunningTaskIndex());
         setRunningTaskViewShowScreenshot(false);
         setRunningTaskHidden(runningTaskTileHidden);
+        // Update task size after setting current task.
+        updateTaskSize();
 
         // Reload the task list
         mTaskListChangeId = mModel.getTasks(this::applyLoadPlan);
@@ -1380,6 +1487,166 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         }
     }
 
+    /**
+     * Updates TaskView and ClearAllButton scaling and translation required to turn into grid
+     * layout.
+     * This method only calculates the potential position and depends on {@link #setGridProgress} to
+     * apply the actual scaling and translation.
+     */
+    private void updateGridProperties() {
+        int taskCount = getTaskViewCount();
+        if (taskCount == 0) {
+            return;
+        }
+
+        final int boxLength = Math.max(mTaskWidth, mTaskHeight);
+
+        float availableHeight =
+                mTaskTopMargin + mTaskHeight + mSizeStrategy.getOverviewActionsHeight(mContext);
+        float rowHeight = (availableHeight - mRowSpacing) / 2;
+        float gridScale = rowHeight / (boxLength + mTaskTopMargin);
+
+        TaskView firstTask = getTaskViewAt(0);
+        float firstTaskWidthOffset;
+        if (mIsRtl) {
+            // Move the first task to the right edge.
+            firstTaskWidthOffset = mTaskWidth - firstTask.getLayoutParams().width * gridScale;
+        } else {
+            // Move the first task to the left edge.
+            firstTaskWidthOffset = -firstTask.getLayoutParams().width * (1 - gridScale);
+        }
+
+        int topRowWidth = 0;
+        int bottomRowWidth = 0;
+        float topAccumulatedTranslationX = 0;
+        float bottomAccumulatedTranslationX = 0;
+        IntSet topSet = new IntSet();
+        float[] gridTranslations = new float[taskCount];
+        for (int i = 0; i < taskCount; i++) {
+            TaskView taskView = getTaskViewAt(i);
+            taskView.setGridScale(gridScale);
+
+            float taskWidthDiff = mTaskWidth - taskView.getLayoutParams().width * gridScale;
+            float taskWidthOffset = mIsRtl ? taskWidthDiff : -taskWidthDiff;
+            // Visually we want to move all task by firstTaskWidthOffset, but calculate page scroll
+            // according to right edge (or left in nonRtl) of TaskView.
+            gridTranslations[i] = firstTaskWidthOffset - taskWidthOffset;
+            taskView.setGridOffsetTranslationX(taskWidthOffset);
+
+            // Off-set gap due to task scaling.
+            float widthDiff = taskView.getLayoutParams().width * (1 - gridScale);
+            float gridScaleTranslationX = mIsRtl ? widthDiff : -widthDiff;
+            gridTranslations[i] += gridScaleTranslationX;
+
+            // Visible offset caused by having scaling pivot on top-right.
+            taskView.setNonRtlVisibleOffset(mIsRtl ? 0 : widthDiff);
+
+            if (topRowWidth <= bottomRowWidth) {
+                gridTranslations[i] += topAccumulatedTranslationX;
+                topRowWidth += taskView.getLayoutParams().width * gridScale + mPageSpacing;
+                topSet.add(i);
+
+                taskView.setGridTranslationY(0);
+
+                // Move horizontally into empty space.
+                float widthOffset = 0;
+                for (int j = i - 1; !topSet.contains(j) && j >= 0; j--) {
+                    widthOffset += getTaskViewAt(j).getLayoutParams().width * gridScale
+                            + mPageSpacing;
+                }
+
+                float gridTranslationX = mIsRtl ? widthOffset : -widthOffset;
+                gridTranslations[i] += gridTranslationX;
+                topAccumulatedTranslationX += gridTranslationX + gridScaleTranslationX;
+                bottomAccumulatedTranslationX += gridScaleTranslationX;
+            } else {
+                gridTranslations[i] += bottomAccumulatedTranslationX;
+                bottomRowWidth += taskView.getLayoutParams().width * gridScale + mPageSpacing;
+
+                // Move into bottom row.
+                float heightOffset = (boxLength + mTaskTopMargin) * gridScale + mRowSpacing;
+                taskView.setGridTranslationY(heightOffset);
+
+                // Move horizontally into empty space.
+                float widthOffset = 0;
+                for (int j = i - 1; topSet.contains(j); j--) {
+                    widthOffset += getTaskViewAt(j).getLayoutParams().width * gridScale
+                            + mPageSpacing;
+                }
+
+                float gridTranslationX = mIsRtl ? widthOffset : -widthOffset;
+                gridTranslations[i] += gridTranslationX;
+                topAccumulatedTranslationX += gridScaleTranslationX;
+                bottomAccumulatedTranslationX += gridTranslationX + gridScaleTranslationX;
+            }
+        }
+
+        // Use the accumulated translation of the longer row.
+        float clearAllAccumulatedTranslation = mIsRtl ? Math.max(topAccumulatedTranslationX,
+                bottomAccumulatedTranslationX) : Math.min(topAccumulatedTranslationX,
+                bottomAccumulatedTranslationX);
+
+        // If the last task is on the shorter row, ClearAllButton will embed into the shorter row
+        // which is not what we want. Compensate the width difference of the 2 rows in that case.
+        float shorterRowCompensation = 0;
+        if (topRowWidth <= bottomRowWidth) {
+            if (topSet.contains(taskCount - 1)) {
+                shorterRowCompensation = bottomRowWidth - topRowWidth;
+            }
+        } else {
+            if (!topSet.contains(taskCount - 1)) {
+                shorterRowCompensation = topRowWidth - bottomRowWidth;
+            }
+        }
+        float clearAllShorterRowCompensation =
+                mIsRtl ? -shorterRowCompensation : shorterRowCompensation;
+
+        // If the total width is shorter than one task's width, move ClearAllButton further away
+        // accordingly.
+        float clearAllShortTotalCompensation = 0;
+        float longRowWidth = Math.max(topRowWidth, bottomRowWidth);
+        if (longRowWidth < mTaskWidth) {
+            float shortTotalCompensation = mTaskWidth - longRowWidth;
+            clearAllShortTotalCompensation =
+                    mIsRtl ? -shortTotalCompensation : shortTotalCompensation;
+        }
+
+        float clearAllTotalTranslationX = firstTaskWidthOffset + clearAllAccumulatedTranslation
+                + clearAllShorterRowCompensation + clearAllShortTotalCompensation;
+
+        // We need to maintain first task's grid translation at 0, now shift translation of all
+        // the TaskViews to achieve that.
+        for (int i = 0; i < taskCount; i++) {
+            getTaskViewAt(i).setGridTranslationX(gridTranslations[i] - gridTranslations[0]);
+        }
+        mClearAllButton.setGridTranslationPrimary(clearAllTotalTranslationX - gridTranslations[0]);
+
+        setGridProgress(mGridProgress);
+    }
+
+    /**
+     * Moves TaskView and ClearAllButton between carousel and 2 row grid.
+     *
+     * @param gridProgress 0 = carousel; 1 = 2 row grid.
+     */
+    public void setGridProgress(float gridProgress) {
+        int taskCount = getTaskViewCount();
+        if (taskCount == 0) {
+            return;
+        }
+
+        if (!mShowAsGrid) {
+            gridProgress = 0;
+        }
+
+        mGridProgress = gridProgress;
+
+        for (int i = 0; i < taskCount; i++) {
+            getTaskViewAt(i).setGridProgress(gridProgress);
+        }
+        mClearAllButton.setGridProgress(gridProgress);
+    }
+
     private void enableLayoutTransitions() {
         if (mLayoutTransition == null) {
             mLayoutTransition = new LayoutTransition();
@@ -1515,7 +1782,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                 if (animateTaskView) {
                     addDismissedTaskAnimations(taskView, duration, anim);
                 }
-            } else {
+            } else if (!mShowAsGrid) {  // Don't animate other tasks when dismissing in grid for now
                 // If we just take newScroll - oldScroll, everything to the right of dragged task
                 // translates to the left. We need to offset this in some cases:
                 // - In RTL, add page offset to all pages, since we want pages to move to the right
@@ -1608,6 +1875,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                         startHome();
                     } else {
                         snapToPageImmediately(pageToSnapTo);
+                        // Grid got messed up, reapply.
+                        updateGridProperties();
                     }
                     // Update the layout synchronously so that the position of next view is
                     // immediately available.
@@ -2383,17 +2652,16 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         boolean pageScrollChanged = super.getPageScrolls(outPageScrolls, layoutChildren,
                 scrollLogic);
 
-        final int taskCount = getTaskViewCount();
         final int childCount = getChildCount();
         for (int i = 0; i < childCount; i++) {
-            if (childCount < mTaskViewStartIndex) {
-                continue;
+            View child = getChildAt(i);
+            float scrollDiff = 0;
+            if (child instanceof TaskView) {
+                scrollDiff = ((TaskView) child).getScrollAdjustment();
+            } else if (child instanceof ClearAllButton) {
+                scrollDiff = ((ClearAllButton) child).getScrollAdjustment();
             }
 
-            final TaskView taskView = getTaskViewAt(
-                    Utilities.boundToRange(i, mTaskViewStartIndex, taskCount - 1));
-            float scrollDiff =
-                    taskView.getFullscreenTranslationX() + taskView.getAccumulatedTranslationX();
             if (scrollDiff != 0) {
                 outPageScrolls[i] += scrollDiff;
                 pageScrollChanged = true;
@@ -2404,14 +2672,14 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
 
     @Override
     protected int getChildOffset(int index) {
-        if (index < mTaskViewStartIndex) {
-            return super.getChildOffset(index);
+        int childOffset = super.getChildOffset(index);
+        View child = getChildAt(index);
+        if (child instanceof TaskView) {
+            childOffset += ((TaskView) child).getOffsetAdjustment();
+        } else if (child instanceof ClearAllButton) {
+            childOffset += ((ClearAllButton) child).getOffsetAdjustment();
         }
-
-        final TaskView taskView = getTaskViewAt(
-                Utilities.boundToRange(index, mTaskViewStartIndex, getTaskViewCount() - 1));
-        return super.getChildOffset(index) + (int) taskView.getFullscreenTranslationX()
-                + (int) taskView.getAccumulatedTranslationX();
+        return childOffset;
     }
 
     @Override
@@ -2420,7 +2688,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         if (taskView == null) {
             return super.getChildVisibleSize(index);
         }
-        return super.getChildVisibleSize(index) - (int) taskView.getFullscreenTranslationX();
+        return (int) (super.getChildVisibleSize(index) * taskView.getSizeAdjustment());
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
index e21bf7629e..f477ca7ea9 100644
--- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
@@ -38,6 +38,7 @@ import com.android.launcher3.R;
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.anim.RoundedRectRevealOutlineProvider;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.popup.SystemShortcut;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.util.Themes;
@@ -113,7 +114,12 @@ public class TaskMenuView extends AbstractFloatingView {
         // NOTE: Changing the pivots means the rotated view gets rotated about the new pivots set,
         // which would render the X and Y position set here incorrect
         setPivotX(0);
-        setPivotY(0);
+        if (mActivity.getDeviceProfile().isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get()) {
+            // In tablet, set pivotY to original position without mThumbnailTopMargin adjustment.
+            setPivotY(-mThumbnailTopMargin);
+        } else {
+            setPivotY(0);
+        }
         setRotation(pagedOrientationHandler.getDegreesRotated());
         setX(pagedOrientationHandler.getTaskMenuX(x, mTaskView.getThumbnail()));
         setY(pagedOrientationHandler.getTaskMenuY(adjustedY, mTaskView.getThumbnail()));
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index dfbe6cea59..20a8444073 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -248,8 +248,9 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     private IconView mIconView;
     private final DigitalWellBeingToast mDigitalWellBeingToast;
     private float mFullscreenProgress;
-    private float mScaleAtFullscreen = 1;
+    private float mGridProgress;
     private float mFullscreenScale = 1;
+    private float mGridScale = 1;
     private final FullscreenDrawParams mCurrentFullscreenParams;
     private final StatefulActivity mActivity;
 
@@ -262,8 +263,14 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     private float mTaskResistanceTranslationY;
     // The following translation variables should only be used in the same orientation as Launcher.
     private float mFullscreenTranslationX;
-    private float mAccumulatedTranslationX;
+    private float mAccumulatedFullscreenTranslationX;
     private float mBoxTranslationY;
+    // The following grid translations scales with mGridProgress.
+    private float mGridTranslationX;
+    private float mGridTranslationY;
+    // Offset translation does not affect scroll calculation.
+    private float mGridOffsetTranslationX;
+    private float mNonRtlVisibleOffset;
 
     private ObjectAnimator mIconAndDimAnimator;
     private float mIconScaleAnimStartProgress = 0;
@@ -722,7 +729,9 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
 
     @Override
     public void onRecycle() {
-        mFullscreenTranslationX = mAccumulatedTranslationX = mBoxTranslationY = 0f;
+        mFullscreenTranslationX = mAccumulatedFullscreenTranslationX = mGridTranslationX =
+                mGridTranslationY =
+                        mGridOffsetTranslationX = mBoxTranslationY = mNonRtlVisibleOffset = 0f;
         resetViewTransforms();
         // Clear any references to the thumbnail (it will be re-read either from the cache or the
         // system on next bind)
@@ -807,7 +816,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         super.onLayout(changed, left, top, right, bottom);
         if (mActivity.getDeviceProfile().isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get()) {
             setPivotX(getLayoutDirection() == LAYOUT_DIRECTION_RTL ? (right - left) : 0);
-            setPivotY(0);
+            setPivotY(mSnapshotView.getTop());
         } else {
             setPivotX((right - left) * 0.5f);
             setPivotY(mSnapshotView.getTop() + mSnapshotView.getHeight() * 0.5f);
@@ -834,9 +843,31 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         applyScale();
     }
 
+    public void setGridScale(float gridScale) {
+        mGridScale = gridScale;
+        applyScale();
+    }
+
+    /**
+     * Moves TaskView between carousel and 2 row grid.
+     *
+     * @param gridProgress 0 = carousel; 1 = 2 row grid.
+     */
+    public void setGridProgress(float gridProgress) {
+        mGridProgress = gridProgress;
+        applyTranslationX();
+        applyTranslationY();
+        applyScale();
+    }
+
     private void applyScale() {
-        setScaleX(mFullscreenScale);
-        setScaleY(mFullscreenScale);
+        float scale = 1;
+        float fullScreenProgress = EXAGGERATED_EASE.getInterpolation(mFullscreenProgress);
+        scale *= Utilities.mapRange(fullScreenProgress, 1f, mFullscreenScale);
+        float gridProgress = ACCEL_DEACCEL.getInterpolation(mGridProgress);
+        scale *= Utilities.mapRange(gridProgress, 1f, mGridScale);
+        setScaleX(scale);
+        setScaleY(scale);
     }
 
     private void setDismissTranslationX(float x) {
@@ -878,13 +909,58 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         return mFullscreenTranslationX;
     }
 
-    public void setAccumulatedTranslationX(float accumulatedTranslationX) {
-        mAccumulatedTranslationX = accumulatedTranslationX;
+    public void setAccumulatedFullscreenTranslationX(float accumulatedFullscreenTranslationX) {
+        mAccumulatedFullscreenTranslationX = accumulatedFullscreenTranslationX;
         applyTranslationX();
     }
 
-    public float getAccumulatedTranslationX() {
-        return mAccumulatedTranslationX;
+    public void setGridTranslationX(float gridTranslationX) {
+        mGridTranslationX = gridTranslationX;
+        applyTranslationX();
+    }
+
+    public void setGridTranslationY(float gridTranslationY) {
+        mGridTranslationY = gridTranslationY;
+        applyTranslationY();
+    }
+
+    public void setGridOffsetTranslationX(float gridOffsetTranslationX) {
+        mGridOffsetTranslationX = gridOffsetTranslationX;
+        applyTranslationX();
+    }
+
+    public void setNonRtlVisibleOffset(float nonRtlVisibleOffset) {
+        mNonRtlVisibleOffset = nonRtlVisibleOffset;
+    }
+
+    public float getScrollAdjustment() {
+        float scrollAdjustment = 0;
+        if (mFullscreenProgress > 0) {
+            scrollAdjustment += mFullscreenTranslationX + mAccumulatedFullscreenTranslationX;
+        }
+        if (mGridProgress > 0) {
+            scrollAdjustment += mGridTranslationX;
+        }
+        return scrollAdjustment;
+    }
+
+    public float getOffsetAdjustment() {
+        float offsetAdjustment = getScrollAdjustment();
+        if (mGridProgress > 0) {
+            offsetAdjustment += mGridOffsetTranslationX + mNonRtlVisibleOffset;
+        }
+        return offsetAdjustment;
+    }
+
+    public float getSizeAdjustment() {
+        float sizeAdjustment = 1;
+        if (mFullscreenProgress > 0) {
+            sizeAdjustment *= mFullscreenScale;
+        }
+        if (mGridProgress > 0) {
+            sizeAdjustment *= mGridScale;
+        }
+        return sizeAdjustment;
     }
 
     private void setBoxTranslationY(float boxTranslationY) {
@@ -893,15 +969,20 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     }
 
     private void applyTranslationX() {
-        setTranslationX(
-                mDismissTranslationX + mTaskOffsetTranslationX + mTaskResistanceTranslationX
-                        + mFullscreenTranslationX + mAccumulatedTranslationX);
+        setTranslationX(mDismissTranslationX + mTaskOffsetTranslationX + mTaskResistanceTranslationX
+                + getFullscreenTrans(mFullscreenTranslationX + mAccumulatedFullscreenTranslationX)
+                + getGridTrans(mGridTranslationX + mGridOffsetTranslationX));
     }
 
     private void applyTranslationY() {
         setTranslationY(
                 mDismissTranslationY + mTaskOffsetTranslationY + mTaskResistanceTranslationY
-                        + mBoxTranslationY);
+                        + getGridTrans(mGridTranslationY) + mBoxTranslationY);
+    }
+
+    private float getGridTrans(float endTranslation) {
+        float progress = ACCEL_DEACCEL.getInterpolation(mGridProgress);
+        return Utilities.mapRange(progress, 0, endTranslation);
     }
 
     public FloatProperty<TaskView> getFillDismissGapTranslationProperty() {
@@ -1057,7 +1138,9 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         mIconView.setVisibility(progress < 1 ? VISIBLE : INVISIBLE);
         getThumbnail().getTaskOverlay().setFullscreenProgress(progress);
 
-        updateTaskScaling();
+        applyTranslationX();
+        applyTranslationY();
+        applyScale();
 
         TaskThumbnailView thumbnail = getThumbnail();
         updateCurrentFullscreenParams(thumbnail.getPreviewPositionHelper());
@@ -1084,41 +1167,53 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
                 previewPositionHelper);
     }
 
-    void updateTaskSize(boolean variableWidth) {
+    /**
+     * Updates TaskView scaling and translation required to support variable width if enabled, while
+     * ensuring TaskView fits into screen in fullscreen.
+     */
+    void updateTaskSize() {
         ViewGroup.LayoutParams params = getLayoutParams();
-        float thumbnailRatio = mTask != null ? mTask.getVisibleThumbnailRatio() : 0f;
-        if (variableWidth && mActivity.getDeviceProfile().isTablet
-                && FeatureFlags.ENABLE_OVERVIEW_GRID.get() && thumbnailRatio != 0f) {
+        if (mActivity.getDeviceProfile().isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get()) {
             final int thumbnailPadding = (int) getResources().getDimension(
                     R.dimen.task_thumbnail_top_margin);
 
             Rect lastComputedTaskSize = getRecentsView().getLastComputedTaskSize();
             int taskWidth = lastComputedTaskSize.width();
             int taskHeight = lastComputedTaskSize.height();
-            int boxLength = Math.max(taskWidth, taskHeight);
 
             int expectedWidth;
             int expectedHeight;
-            if (thumbnailRatio > 1) {
-                expectedWidth = boxLength;
-                expectedHeight = (int) (boxLength / thumbnailRatio) + thumbnailPadding;
+            float thumbnailRatio = mTask != null ? mTask.getVisibleThumbnailRatio() : 0f;
+            if (isRunningTask() || thumbnailRatio == 0f) {
+                expectedWidth = taskWidth;
+                expectedHeight = taskHeight + thumbnailPadding;
             } else {
-                expectedWidth = (int) (boxLength * thumbnailRatio);
-                expectedHeight = boxLength + thumbnailPadding;
+                int boxLength = Math.max(taskWidth, taskHeight);
+                if (thumbnailRatio > 1) {
+                    expectedWidth = boxLength;
+                    expectedHeight = (int) (boxLength / thumbnailRatio) + thumbnailPadding;
+                } else {
+                    expectedWidth = (int) (boxLength * thumbnailRatio);
+                    expectedHeight = boxLength + thumbnailPadding;
+                }
             }
 
             float heightDiff = (expectedHeight - thumbnailPadding - taskHeight) / 2.0f;
             setBoxTranslationY(heightDiff);
 
+            float fullscreenScale = 1f;
             if (expectedWidth > taskWidth) {
                 // In full screen, expectedWidth should not be larger than taskWidth.
-                mScaleAtFullscreen = taskWidth / (float) expectedWidth;
+                fullscreenScale = taskWidth / (float) expectedWidth;
             } else if (expectedHeight - thumbnailPadding > taskHeight) {
                 // In full screen, expectedHeight should not be larger than taskHeight.
-                mScaleAtFullscreen = taskHeight / (float) (expectedHeight - thumbnailPadding);
-            } else {
-                mScaleAtFullscreen = 1f;
+                fullscreenScale = taskHeight / (float) (expectedHeight - thumbnailPadding);
             }
+            setFullscreenScale(fullscreenScale);
+
+            float widthDiff = params.width * (1 - mFullscreenScale);
+            setFullscreenTranslationX(
+                    getLayoutDirection() == LAYOUT_DIRECTION_RTL ? -widthDiff : widthDiff);
 
             if (params.width != expectedWidth || params.height != expectedHeight) {
                 params.width = expectedWidth;
@@ -1127,35 +1222,16 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
             }
         } else {
             setBoxTranslationY(0);
+            setFullscreenTranslationX(0);
+            setFullscreenScale(1);
             if (params.width != ViewGroup.LayoutParams.MATCH_PARENT) {
                 params.width = ViewGroup.LayoutParams.MATCH_PARENT;
                 params.height = ViewGroup.LayoutParams.MATCH_PARENT;
                 setLayoutParams(params);
             }
         }
-        updateTaskScaling();
     }
 
-    private void updateTaskScaling() {
-        if (mActivity.getDeviceProfile().isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get()) {
-            ViewGroup.LayoutParams params = getLayoutParams();
-            if (params.width == ViewGroup.LayoutParams.MATCH_PARENT
-                    || params.height == ViewGroup.LayoutParams.MATCH_PARENT) {
-                // Snapshot is not loaded yet, skip.
-                return;
-            }
-
-            float progress = EXAGGERATED_EASE.getInterpolation(mFullscreenProgress);
-            setFullscreenScale(Utilities.mapRange(progress, 1f, mScaleAtFullscreen));
-
-            float widthDiff = params.width * (1 - mFullscreenScale);
-            setFullscreenTranslationX(getFullscreenTrans(
-                    getLayoutDirection() == LAYOUT_DIRECTION_RTL ? -widthDiff : widthDiff));
-        } else {
-            setFullscreenScale(1);
-            setFullscreenTranslationX(0);
-        }
-    }
 
     private float getFullscreenTrans(float endTranslation) {
         float progress = ACCEL_DEACCEL.getInterpolation(mFullscreenProgress);
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java
index f9a1ded355..781f171698 100644
--- a/src/com/android/launcher3/LauncherState.java
+++ b/src/com/android/launcher3/LauncherState.java
@@ -56,8 +56,9 @@ public abstract class LauncherState implements BaseState<LauncherState> {
     public static final int ALL_APPS_HEADER_EXTRA = 1 << 3; // e.g. app predictions
     public static final int ALL_APPS_CONTENT = 1 << 4;
     public static final int VERTICAL_SWIPE_INDICATOR = 1 << 5;
-    public static final int OVERVIEW_BUTTONS = 1 << 6;
+    public static final int OVERVIEW_ACTIONS = 1 << 6;
     public static final int TASKBAR = 1 << 7;
+    public static final int CLEAR_ALL_BUTTON = 1 << 8;
 
     /** Mask of all the items that are contained in the apps view. */
     public static final int APPS_VIEW_ITEM_MASK =
@@ -220,6 +221,13 @@ public abstract class LauncherState implements BaseState<LauncherState> {
         return 0;
     }
 
+    /**
+     * For this state, whether tasks should layout as a grid rather than a list.
+     */
+    public boolean displayOverviewTasksAsGrid(Launcher launcher) {
+        return false;
+    }
+
     /**
      * The amount of blur and wallpaper zoom to apply to the background of either the app
      * or Launcher surface in this state. Should be a number between 0 and 1, inclusive.
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index af2d94a278..c6766a470c 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -219,7 +219,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
     /**
      * Returns the index of the currently displayed page. When in free scroll mode, this is the page
      * that the user was on before entering free scroll mode (e.g. the home screen page they
-     * long-pressed on to enter the overview). Try using {@link #getPageNearestToCenterOfScreen()}
+     * long-pressed on to enter the overview). Try using {@link #getDestinationPage()}
      * to get the page the user is currently scrolling over.
      */
     public int getCurrentPage() {
@@ -1289,7 +1289,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
                     if (((initialScroll >= maxScroll) && (isVelocityLeft || !isFling)) ||
                         ((initialScroll <= minScroll) && (!isVelocityLeft || !isFling))) {
                         mScroller.springBack(initialScroll, minScroll, maxScroll);
-                        mNextPage = getPageNearestToCenterOfScreen();
+                        mNextPage = getDestinationPage();
                     } else {
                         mScroller.setInterpolator(mDefaultInterpolator);
                         mScroller.fling(initialScroll, -velocity,
@@ -1297,11 +1297,12 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
                             Math.round(getWidth() * 0.5f * OVERSCROLL_DAMP_FACTOR));
 
                         int finalPos = mScroller.getFinalPos();
-                        mNextPage = getPageNearestToCenterOfScreen(finalPos);
+                        mNextPage = getDestinationPage(finalPos);
 
                         int firstPageScroll = getScrollForPage(!mIsRtl ? 0 : getPageCount() - 1);
                         int lastPageScroll = getScrollForPage(!mIsRtl ? getPageCount() - 1 : 0);
-                        if (finalPos > minScroll && finalPos < maxScroll) {
+                        if (snapToPageInFreeScroll() && finalPos > minScroll
+                                && finalPos < maxScroll) {
                             // If scrolling ends in the half of the added space that is closer to
                             // the end, settle to the end. Otherwise snap to the nearest page.
                             // If flinging past one of the ends, don't change the velocity as it
@@ -1347,6 +1348,10 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         return true;
     }
 
+    protected boolean snapToPageInFreeScroll() {
+        return true;
+    }
+
     protected boolean shouldFlingForVelocity(int velocity) {
         float threshold = mAllowEasyFling ? mEasyFlingThresholdVelocity : mFlingThresholdVelocity;
         return Math.abs(velocity) > threshold;
@@ -1452,6 +1457,14 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         }
     }
 
+    public int getDestinationPage() {
+        return getDestinationPage(mOrientationHandler.getPrimaryScroll(this));
+    }
+
+    protected int getDestinationPage(int scaledScroll) {
+        return getPageNearestToCenterOfScreen(scaledScroll);
+    }
+
     public int getPageNearestToCenterOfScreen() {
         return getPageNearestToCenterOfScreen(mOrientationHandler.getPrimaryScroll(this));
     }
@@ -1487,7 +1500,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
     }
 
     protected void snapToDestination() {
-        snapToPage(getPageNearestToCenterOfScreen(), getPageSnapDuration());
+        snapToPage(getDestinationPage(), getPageSnapDuration());
     }
 
     protected boolean isInOverScroll() {
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index aca3d3c3c4..981ead97a8 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -417,7 +417,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
                 // widgets as they cannot be placed inside a folder.
                 // Start at the current page and search right (on LTR) until finding a page with
                 // enough space. Since an empty screen is the furthest right, a page must be found.
-                int currentPage = getPageNearestToCenterOfScreen();
+                int currentPage = getDestinationPage();
                 for (int pageIndex = currentPage; pageIndex < getPageCount(); pageIndex++) {
                     CellLayout page = (CellLayout) getPageAt(pageIndex);
                     if (page.hasReorderSolution(dragObject.dragInfo)) {
diff --git a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
index f05f15e01d..8a64f3d7b5 100644
--- a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
+++ b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
@@ -146,13 +146,6 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
         return VIEW_TRANSLATE_X;
     }
 
-    @Override
-    public void setPrimaryAndResetSecondaryTranslate(
-            View view, float translation, float defaultTranslationX, float defaultTranslationY) {
-        view.setTranslationX(defaultTranslationX);
-        view.setTranslationY(translation);
-    }
-
     @Override
     public int getPrimaryScroll(View view) {
         return view.getScrollY();
diff --git a/src/com/android/launcher3/touch/PagedOrientationHandler.java b/src/com/android/launcher3/touch/PagedOrientationHandler.java
index b9acfa3ca8..e1cec87df7 100644
--- a/src/com/android/launcher3/touch/PagedOrientationHandler.java
+++ b/src/com/android/launcher3/touch/PagedOrientationHandler.java
@@ -66,8 +66,6 @@ public interface PagedOrientationHandler {
     int getSecondaryDimension(View view);
     FloatProperty<View> getPrimaryViewTranslate();
     FloatProperty<View> getSecondaryViewTranslate();
-    void setPrimaryAndResetSecondaryTranslate(
-            View view, float translation, float defaultTranslationX, float defaultTranslationY);
     int getPrimaryScroll(View view);
     float getPrimaryScale(View view);
     int getChildStart(View view);
diff --git a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
index 3663b5fcd3..bcaf5f444d 100644
--- a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
+++ b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
@@ -142,13 +142,6 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
         return VIEW_TRANSLATE_Y;
     }
 
-    @Override
-    public void setPrimaryAndResetSecondaryTranslate(
-            View view, float translation, float defaultTranslationX, float defaultTranslationY) {
-        view.setTranslationX(translation);
-        view.setTranslationY(defaultTranslationY);
-    }
-
     @Override
     public int getPrimaryScroll(View view) {
         return view.getScrollX();
-- 
GitLab


From b96cf5cdf22b22cebfd68efa4a05bfd065cde5a1 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 26 Jan 2021 15:50:23 -0800
Subject: [PATCH 0589/1664] Fix some issues with TwoButtonNavbarTouchController

- Use same swipe height as the tests use to get to Overview
- Use mStartState instead of fromState when determining
  target state, to disallow swiping through states, i.e.
  from NORMAL to OVERVIEW back to NORMAL in one long swipe
  up gesture. Instead, now swipe up from NORMAL goes to
  OVERVIEW and swipe up from OVERVIEW goes to NORMAL.

Fixes: 177316094
Change-Id: Ic8e9c8650d4cf11eec344802e3569413bfd5d7bc
(cherry picked from commit a24b9ff69d20cdceadca2ad4f206db43f1e2899e)
---
 .../TwoButtonNavbarTouchController.java               | 11 +++++++----
 .../touch/AbstractStateChangeTouchController.java     |  7 +++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java
index 6271a44b53..faf5054007 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java
@@ -31,6 +31,7 @@ import com.android.launcher3.states.StateAnimationConfig.AnimationFlags;
 import com.android.launcher3.touch.AbstractStateChangeTouchController;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
 import com.android.quickstep.SystemUiProxy;
+import com.android.quickstep.util.LayoutUtils;
 import com.android.quickstep.views.AllAppsEduView;
 
 /**
@@ -92,7 +93,8 @@ public class TwoButtonNavbarTouchController extends AbstractStateChangeTouchCont
                     mLauncher.getDeviceProfile().isSeascape() == isDragTowardPositive;
             return draggingFromNav ? OVERVIEW : NORMAL;
         } else {
-            return isDragTowardPositive ^ (fromState == OVERVIEW) ? OVERVIEW : NORMAL;
+            LauncherState startState = mStartState != null ? mStartState : fromState;
+            return isDragTowardPositive ^ (startState == OVERVIEW) ? OVERVIEW : NORMAL;
         }
     }
 
@@ -106,8 +108,8 @@ public class TwoButtonNavbarTouchController extends AbstractStateChangeTouchCont
 
     @Override
     protected float getShiftRange() {
-        return mLauncher.getDeviceProfile().isVerticalBarLayout()
-                ? mLauncher.getDragLayer().getWidth() : super.getShiftRange();
+        // Should be in sync with TestProtocol.REQUEST_HOME_TO_OVERVIEW_SWIPE_HEIGHT
+        return LayoutUtils.getDefaultSwipeHeight(mLauncher, mLauncher.getDeviceProfile());
     }
 
     @Override
@@ -116,7 +118,7 @@ public class TwoButtonNavbarTouchController extends AbstractStateChangeTouchCont
         long maxAccuracy = (long) (2 * range);
         mCurrentAnimation = mLauncher.getStateManager().createAnimationToNewWorkspace(mToState,
                 maxAccuracy, animComponent);
-        return (mLauncher.getDeviceProfile().isSeascape() ? 2 : -2) / range;
+        return (mLauncher.getDeviceProfile().isSeascape() ? 1 : -1) / range;
     }
 
     @Override
@@ -134,5 +136,6 @@ public class TwoButtonNavbarTouchController extends AbstractStateChangeTouchCont
                 AllAppsEduView.show(mLauncher);
             }
         }
+        mStartState = null;
     }
 }
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index 65df6144e5..b28d6f7b8f 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -67,8 +67,9 @@ public abstract class AbstractStateChangeTouchController
 
     /**
      * Play an atomic recents animation when the progress from NORMAL to OVERVIEW reaches this.
+     * TODO: Remove the atomic animation altogether and just go to OVERVIEW directly (b/175137718).
      */
-    public static final float ATOMIC_OVERVIEW_ANIM_THRESHOLD = 0.5f;
+    public static final float ATOMIC_OVERVIEW_ANIM_THRESHOLD = 1f;
     protected final long ATOMIC_DURATION = getAtomicDuration();
 
     protected final Launcher mLauncher;
@@ -342,9 +343,7 @@ public abstract class AbstractStateChangeTouchController
         if (!goingBetweenNormalAndOverview(fromState, toState)) {
             return;
         }
-        float threshold = toState == OVERVIEW ? ATOMIC_OVERVIEW_ANIM_THRESHOLD
-                : 1f - ATOMIC_OVERVIEW_ANIM_THRESHOLD;
-        boolean passedThreshold = progress >= threshold;
+        boolean passedThreshold = progress >= ATOMIC_OVERVIEW_ANIM_THRESHOLD;
         if (passedThreshold != mPassedOverviewAtomicThreshold) {
             LauncherState atomicFromState = passedThreshold ? fromState: toState;
             LauncherState atomicToState = passedThreshold ? toState : fromState;
-- 
GitLab


From d197ebcfd563a55e40d6b05ce350edf357b1f76c Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 2 Mar 2021 10:54:53 -0800
Subject: [PATCH 0590/1664] Moving data sanitization before bind

Data sanitization changes the launcher model data, which makes it
out of sync with what Launcher is displaying.
This would lead to widgetsIds getting deleted when they are created
by Launcher on UI thread, but have not yet been updated in the model
Also clearing all ghost widgets on every load. This would remove
the flaky behavior where widget update depends on folder and
other icons getting removed

Test: Presubmit
Bug: 181680555
Change-Id: I3cce69383d9d92a283c5197c3f99fbb539d93dbb
---
 .../android/launcher3/model/LoaderTask.java   | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index 209c5be598..f6c7c0604a 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -192,6 +192,16 @@ public class LoaderTask implements Runnable {
             loadWorkspace(allShortcuts);
             logger.addSplit("loadWorkspace");
 
+            // Sanitize data re-syncs widgets/shortcuts based on the workspace loaded from db.
+            // sanitizeData should not be invoked if the workspace is loaded from a db different
+            // from the main db as defined in the invariant device profile.
+            // (e.g. both grid preview and minimal device mode uses a different db)
+            if (mApp.getInvariantDeviceProfile().dbFile.equals(mDbName)) {
+                verifyNotStopped();
+                sanitizeData();
+                logger.addSplit("sanitizeData");
+            }
+
             verifyNotStopped();
             mResults.bindWorkspace();
             logger.addSplit("bindWorkspace");
@@ -274,14 +284,6 @@ public class LoaderTask implements Runnable {
                 loadFolderNames();
             }
 
-            // Sanitize data re-syncs widgets/shortcuts based on the workspace loaded from db.
-            // sanitizeData should not be invoked if the workspace is loaded from a db different
-            // from the main db as defined in the invariant device profile.
-            // (e.g. both grid preview and minimal device mode uses a different db)
-            if (mApp.getInvariantDeviceProfile().dbFile.equals(mDbName)) {
-                sanitizeData();
-            }
-
             verifyNotStopped();
             updateHandler.finish();
             logger.addSplit("finish icon update");
@@ -875,10 +877,11 @@ public class LoaderTask implements Runnable {
                     mBgDataModel.itemsIdMap.remove(folderId);
                 }
             }
-            // Remove any ghost widgets
-            LauncherSettings.Settings.call(contentResolver,
-                    LauncherSettings.Settings.METHOD_REMOVE_GHOST_WIDGETS);
+
         }
+        // Remove any ghost widgets
+        LauncherSettings.Settings.call(contentResolver,
+                LauncherSettings.Settings.METHOD_REMOVE_GHOST_WIDGETS);
 
         // Update pinned state of model shortcuts
         mBgDataModel.updateShortcutPinnedState(context);
-- 
GitLab


From 611dba4c9455ec34fa22201e70b6b7f4c9baad3a Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Tue, 2 Mar 2021 14:12:13 -0500
Subject: [PATCH 0591/1664] Use grid border spacing as widget padding if
 possible.

Widget padding is added by the system to create reliable consistency
between widgets.

Now that we have added border spacing between cells on the launcher
grid, we have significantly decreased the available space for widgets
on home screens: widget padding is 8dp on all sides, border spacing is
currently spec'd to be 16dp.

We can inset the widget padding added by the system, and instead rely
on the border spacing between cells to create reliable consistency
between widgets.

Bug: 175329686
Test: manual
      turn CellLayout#VISUALIZE_GRID debug flag on
      test drag and drop, resizing using drag handles
      view measurements in go/web-hv
Change-Id: Iabb9f45e82e4ae039f55d7fd27fbd0d23be60191
---
 src/com/android/launcher3/CellLayout.java     | 17 ++++++++---
 src/com/android/launcher3/DeviceProfile.java  | 13 ++++++++
 .../launcher3/ShortcutAndWidgetContainer.java | 13 ++++----
 .../widget/LauncherAppWidgetProviderInfo.java |  8 +++--
 .../widget/NavigableAppWidgetHostView.java    | 30 ++++++++++++++++++-
 5 files changed, 69 insertions(+), 12 deletions(-)

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 947388bc7b..b8833cf1a9 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -53,6 +53,7 @@ import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityEvent;
 
 import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import androidx.core.view.ViewCompat;
 
 import com.android.launcher3.LauncherSettings.Favorites;
@@ -2663,20 +2664,21 @@ public class CellLayout extends ViewGroup {
         }
 
         public void setup(int cellWidth, int cellHeight, boolean invertHorizontally, int colCount,
-                int rowCount, int borderSpacing) {
+                int rowCount, int borderSpacing, @Nullable Rect inset) {
             setup(cellWidth, cellHeight, invertHorizontally, colCount, rowCount, 1.0f, 1.0f,
-                    borderSpacing);
+                    borderSpacing, inset);
         }
 
         /**
-         * Use this method, as opposed to {@link #setup(int, int, boolean, int, int, int)},
+         * Use this method, as opposed to {@link #setup(int, int, boolean, int, int, int, Rect)},
          * if the view needs to be scaled.
          *
          * ie. In multi-window mode, we setup widgets so that they are measured and laid out
          * using their full/invariant device profile sizes.
          */
         public void setup(int cellWidth, int cellHeight, boolean invertHorizontally, int colCount,
-                int rowCount, float cellScaleX, float cellScaleY, int borderSpacing) {
+                int rowCount, float cellScaleX, float cellScaleY, int borderSpacing,
+                @Nullable Rect inset) {
             if (isLockedToGrid) {
                 final int myCellHSpan = cellHSpan;
                 final int myCellVSpan = cellVSpan;
@@ -2697,6 +2699,13 @@ public class CellLayout extends ViewGroup {
                 height = Math.round(myCellHeight) - topMargin - bottomMargin;
                 x = leftMargin + (myCellX * cellWidth) + (myCellX * borderSpacing);
                 y = topMargin + (myCellY * cellHeight) + (myCellY * borderSpacing);
+
+                if (inset != null) {
+                    x -= inset.left;
+                    y -= inset.top;
+                    width += inset.left + inset.right;
+                    height += inset.top + inset.bottom;
+                }
             }
         }
 
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 7a9f852960..7beea74c0c 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -331,6 +331,19 @@ public class DeviceProfile {
         }
     }
 
+    /**
+     * We inset the widget padding added by the system and instead rely on the border spacing
+     * between cells to create reliable consistency between widgets
+     */
+    public boolean shouldInsetWidgets() {
+        Rect widgetPadding = inv.defaultWidgetPadding;
+
+        // Check all sides to ensure that the widget won't overlap into another cell.
+        return cellLayoutBorderSpacingPx > widgetPadding.left
+                && cellLayoutBorderSpacingPx > widgetPadding.top
+                && cellLayoutBorderSpacingPx > widgetPadding.right
+                && cellLayoutBorderSpacingPx > widgetPadding.bottom;
+    }
 
     public Builder toBuilder(Context context) {
         Point size = new Point(availableWidthPx, availableHeightPx);
diff --git a/src/com/android/launcher3/ShortcutAndWidgetContainer.java b/src/com/android/launcher3/ShortcutAndWidgetContainer.java
index eab8272431..2c24c3a52e 100644
--- a/src/com/android/launcher3/ShortcutAndWidgetContainer.java
+++ b/src/com/android/launcher3/ShortcutAndWidgetContainer.java
@@ -37,6 +37,8 @@ public class ShortcutAndWidgetContainer extends ViewGroup implements FolderIcon.
     // return an (x, y) value from helper functions. Do NOT use them to maintain other state.
     private final int[] mTmpCellXY = new int[2];
 
+    private final Rect mTempRect = new Rect();
+
     @ContainerType
     private final int mContainerType;
     private final WallpaperManager mWallpaperManager;
@@ -101,11 +103,12 @@ public class ShortcutAndWidgetContainer extends ViewGroup implements FolderIcon.
         CellLayout.LayoutParams lp = (CellLayout.LayoutParams) child.getLayoutParams();
         if (child instanceof LauncherAppWidgetHostView) {
             DeviceProfile profile = mActivity.getDeviceProfile();
+            ((LauncherAppWidgetHostView) child).getWidgetInset(profile, mTempRect);
             lp.setup(mCellWidth, mCellHeight, invertLayoutHorizontally(), mCountX, mCountY,
-                    profile.appWidgetScale.x, profile.appWidgetScale.y, mBorderSpacing);
+                    profile.appWidgetScale.x, profile.appWidgetScale.y, mBorderSpacing, mTempRect);
         } else {
             lp.setup(mCellWidth, mCellHeight, invertLayoutHorizontally(), mCountX, mCountY,
-                    mBorderSpacing);
+                    mBorderSpacing, null);
         }
     }
 
@@ -124,12 +127,12 @@ public class ShortcutAndWidgetContainer extends ViewGroup implements FolderIcon.
         final DeviceProfile profile = mActivity.getDeviceProfile();
 
         if (child instanceof LauncherAppWidgetHostView) {
+            ((LauncherAppWidgetHostView) child).getWidgetInset(profile, mTempRect);
             lp.setup(mCellWidth, mCellHeight, invertLayoutHorizontally(), mCountX, mCountY,
-                    profile.appWidgetScale.x, profile.appWidgetScale.y, mBorderSpacing);
-            // Widgets have their own padding
+                    profile.appWidgetScale.x, profile.appWidgetScale.y, mBorderSpacing, mTempRect);
         } else {
             lp.setup(mCellWidth, mCellHeight, invertLayoutHorizontally(), mCountX, mCountY,
-                    mBorderSpacing);
+                    mBorderSpacing, null);
             // Center the icon/folder
             int cHeight = getCellContentHeight();
             int cellPaddingY = (int) Math.max(0, ((lp.height - cHeight) / 2f));
diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java b/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
index b0c85f19eb..ce97d2e294 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
@@ -72,8 +72,12 @@ public class LauncherAppWidgetProviderInfo extends AppWidgetProviderInfo
 
         // We want to account for the extra amount of padding that we are adding to the widget
         // to ensure that it gets the full amount of space that it has requested.
-        Rect widgetPadding = AppWidgetHostView.getDefaultPaddingForWidget(
-                context, provider, null);
+        // If grids supports insetting widgets, we do not account for widget padding.
+        Rect widgetPadding = new Rect();
+        if (!idp.landscapeProfile.shouldInsetWidgets()
+                || !idp.portraitProfile.shouldInsetWidgets()) {
+            AppWidgetHostView.getDefaultPaddingForWidget(context, provider, widgetPadding);
+        }
         spanX = Math.max(1, (int) Math.ceil(
                         (minWidth + widgetPadding.left + widgetPadding.right) / smallestCellWidth));
         spanY = Math.max(1, (int) Math.ceil(
diff --git a/src/com/android/launcher3/widget/NavigableAppWidgetHostView.java b/src/com/android/launcher3/widget/NavigableAppWidgetHostView.java
index ed42bc42a0..6163b5199c 100644
--- a/src/com/android/launcher3/widget/NavigableAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/NavigableAppWidgetHostView.java
@@ -17,6 +17,7 @@
 package com.android.launcher3.widget;
 
 import android.appwidget.AppWidgetHostView;
+import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
 import android.graphics.PointF;
 import android.graphics.Rect;
@@ -25,8 +26,11 @@ import android.view.View;
 import android.view.ViewDebug;
 import android.view.ViewGroup;
 
+import com.android.launcher3.BaseActivity;
+import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Reorderable;
 import com.android.launcher3.dragndrop.DraggableView;
+import com.android.launcher3.views.ActivityContext;
 
 import java.util.ArrayList;
 
@@ -50,11 +54,16 @@ public abstract class NavigableAppWidgetHostView extends AppWidgetHostView
     private final PointF mTranslationForReorderPreview = new PointF(0, 0);
     private float mScaleForReorderBounce = 1f;
 
+    private final Rect mTempRect = new Rect();
+
     @ViewDebug.ExportedProperty(category = "launcher")
     private boolean mChildrenFocused;
 
+    protected final BaseActivity mActivity;
+
     public NavigableAppWidgetHostView(Context context) {
         super(context);
+        mActivity = ActivityContext.lookupContext(context);
     }
 
     @Override
@@ -222,6 +231,25 @@ public abstract class NavigableAppWidgetHostView extends AppWidgetHostView
         int width = (int) (getMeasuredWidth() * mScaleToFit);
         int height = (int) (getMeasuredHeight() * mScaleToFit);
 
-        bounds.set(0, 0 , width, height);
+        getWidgetInset(mActivity.getDeviceProfile(), mTempRect);
+        bounds.set(mTempRect.left, mTempRect.top, width - mTempRect.right,
+                height - mTempRect.bottom);
+    }
+
+    /**
+     * Widgets have padding added by the system. We may choose to inset this padding if the grid
+     * supports it.
+     */
+    public void getWidgetInset(DeviceProfile grid, Rect out) {
+        if (!grid.shouldInsetWidgets()) {
+            out.setEmpty();
+            return;
+        }
+        AppWidgetProviderInfo info = getAppWidgetInfo();
+        if (info == null) {
+            out.set(grid.inv.defaultWidgetPadding);
+        } else {
+            AppWidgetHostView.getDefaultPaddingForWidget(getContext(), info.provider, out);
+        }
     }
 }
-- 
GitLab


From b8ad633b7e830ba647657568c926047786bde841 Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Thu, 25 Feb 2021 12:41:04 +0000
Subject: [PATCH 0592/1664] Interface for WidgetPickerSearchPipeline.

Test: not required
Bug: b/157286785
Change-Id: Ib0a4d2915bd678304e7971cdfd7296811ea8587b
---
 .../search/WidgetsPickerSearchPipeline.java   | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 src/com/android/launcher3/widget/picker/search/WidgetsPickerSearchPipeline.java

diff --git a/src/com/android/launcher3/widget/picker/search/WidgetsPickerSearchPipeline.java b/src/com/android/launcher3/widget/picker/search/WidgetsPickerSearchPipeline.java
new file mode 100644
index 0000000000..d12782c971
--- /dev/null
+++ b/src/com/android/launcher3/widget/picker/search/WidgetsPickerSearchPipeline.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.widget.picker.search;
+
+import com.android.launcher3.widget.model.WidgetsListBaseEntry;
+
+import java.util.List;
+import java.util.function.Consumer;
+
+/**
+ * An interface for a pipeline to handle widgets search.
+ */
+public interface WidgetsPickerSearchPipeline {
+
+    /**
+     * Performs a search query asynchronically. Invokes {@code callback} when the search is
+     * complete.
+     */
+    void query(String input, Consumer<List<WidgetsListBaseEntry>> callback);
+
+    /**
+     * Cancels any ongoing search request.
+     */
+    default void cancel() {};
+
+    /**
+     * Cleans up after search is no longer needed.
+     */
+    default void destroy() {};
+}
-- 
GitLab


From 97c2e513b3e4212a6a416c6765047b2ec12c8ac4 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 2 Mar 2021 12:59:50 -0800
Subject: [PATCH 0593/1664] Fixing empty page not removed when drag ends

Bug: 179550470
Test: Verified on device
Change-Id: Ie9b20dfde1a64b385041f6e4d32fe47e3c6e5a7d
---
 src/com/android/launcher3/Workspace.java | 26 ++++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index aca3d3c3c4..786a9c5b38 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -446,6 +446,19 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         }
 
         updateChildrenLayersEnabled();
+        StateManager<LauncherState> stateManager = mLauncher.getStateManager();
+        stateManager.addStateListener(new StateManager.StateListener<LauncherState>() {
+            @Override
+            public void onStateTransitionComplete(LauncherState finalState) {
+                if (finalState == NORMAL) {
+                    if (!mDeferRemoveExtraEmptyScreen) {
+                        removeExtraEmptyScreen(true /* stripEmptyScreens */);
+                    }
+                    stateManager.removeStateListener(this);
+                }
+            }
+        });
+
         mDragInfo = null;
         mOutlineProvider = null;
         mDragSourceInternal = null;
@@ -1877,19 +1890,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
                             };
                         }
                     }
-                    StateManager<LauncherState> stateManager = mLauncher.getStateManager();
-                    stateManager.addStateListener(new StateManager.StateListener<LauncherState>() {
-                        @Override
-                        public void onStateTransitionComplete(LauncherState finalState) {
-                            if (finalState == NORMAL) {
-                                if (!mDeferRemoveExtraEmptyScreen) {
-                                    removeExtraEmptyScreen(true /* stripEmptyScreens */);
-                                }
-                                stateManager.removeStateListener(this);
-                            }
-                        }
-                    });
-
                     mLauncher.getModelWriter().modifyItemInDatabase(info, container, screenId,
                             lp.cellX, lp.cellY, item.spanX, item.spanY);
                 } else {
-- 
GitLab


From ab522e85b2ce7c1085fd78ed7435dd8c40a06984 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 3 Mar 2021 13:54:02 +0000
Subject: [PATCH 0594/1664] Remove unused widgets_scroll_container layout

Test: Compile NexusLauncher successfully

Bug: 181701011
Change-Id: I35d1c9324990e86496c45ca6db5f32f9588c7279
---
 res/layout/widgets_scroll_container.xml | 33 -------------------------
 1 file changed, 33 deletions(-)
 delete mode 100644 res/layout/widgets_scroll_container.xml

diff --git a/res/layout/widgets_scroll_container.xml b/res/layout/widgets_scroll_container.xml
deleted file mode 100644
index fc509d1161..0000000000
--- a/res/layout/widgets_scroll_container.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<HorizontalScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/widgets_scroll_container"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?android:attr/colorPrimaryDark"
-    android:scrollbars="none">
-    <LinearLayout
-        android:id="@+id/widgets_cell_list"
-        style="@style/TextTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingStart="0dp"
-        android:paddingEnd="0dp"
-        android:orientation="horizontal"
-        android:showDividers="none"/>
-</HorizontalScrollView>
\ No newline at end of file
-- 
GitLab


From b4c268ee2819b0782607cae85a0dcab1dd971fa4 Mon Sep 17 00:00:00 2001
From: Yogisha Dixit <ydixit@google.com>
Date: Wed, 3 Mar 2021 18:05:44 +0000
Subject: [PATCH 0595/1664] Update app widget resize frame UI.

Mock: https://docs.google.com/presentation/d/1UxdDh8EFhPbdRWRwzjbpgL-j02ew4Ew3eG3XBCeoYdo/edit#slide=id.8YyBaHq
Implementation: https://screenshot.googleplex.com/BEFwWBmXXx8xXdS

I will update the drag handles in a follow-up CL since their specs
aren't ready yet.

Test: manual
Bug: 181774580
Change-Id: I19a99e6dbe106754da0fac56a5c2e7eb9eb90cef
---
 res/drawable-hdpi/widget_resize_frame.9.png   | Bin 187 -> 0 bytes
 res/drawable-hdpi/widget_resize_shadow.9.png  | Bin 256 -> 0 bytes
 res/drawable-mdpi/widget_resize_frame.9.png   | Bin 156 -> 0 bytes
 res/drawable-mdpi/widget_resize_shadow.9.png  | Bin 206 -> 0 bytes
 res/drawable-xhdpi/widget_resize_frame.9.png  | Bin 209 -> 0 bytes
 res/drawable-xhdpi/widget_resize_shadow.9.png | Bin 369 -> 0 bytes
 res/drawable-xxhdpi/widget_resize_frame.9.png | Bin 179 -> 0 bytes
 .../widget_resize_shadow.9.png                | Bin 605 -> 0 bytes
 .../widget_resize_frame.9.png                 | Bin 194 -> 0 bytes
 .../widget_resize_shadow.9.png                | Bin 826 -> 0 bytes
 res/drawable/widget_resize_frame.xml          |  22 ++++++++++++++++++
 res/layout/app_widget_resize_frame.xml        |  19 +++++++++------
 res/values/dimens.xml                         |   1 +
 13 files changed, 35 insertions(+), 7 deletions(-)
 delete mode 100644 res/drawable-hdpi/widget_resize_frame.9.png
 delete mode 100644 res/drawable-hdpi/widget_resize_shadow.9.png
 delete mode 100644 res/drawable-mdpi/widget_resize_frame.9.png
 delete mode 100644 res/drawable-mdpi/widget_resize_shadow.9.png
 delete mode 100644 res/drawable-xhdpi/widget_resize_frame.9.png
 delete mode 100644 res/drawable-xhdpi/widget_resize_shadow.9.png
 delete mode 100644 res/drawable-xxhdpi/widget_resize_frame.9.png
 delete mode 100644 res/drawable-xxhdpi/widget_resize_shadow.9.png
 delete mode 100644 res/drawable-xxxhdpi/widget_resize_frame.9.png
 delete mode 100644 res/drawable-xxxhdpi/widget_resize_shadow.9.png
 create mode 100644 res/drawable/widget_resize_frame.xml

diff --git a/res/drawable-hdpi/widget_resize_frame.9.png b/res/drawable-hdpi/widget_resize_frame.9.png
deleted file mode 100644
index a71093269690f6fa5039393a6878dbb4353109bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 187
zcmeAS@N?(olHy`uVBq!ia0vp^p&-n`0wgE>Nw^54nmk<`Ln;{GUUz3?GGt&m@Zun&
z(;{|zL80i=lliV^ZvMU7d#3-oDMu%7{+HR*^{YAr16+9%9AENX^UAbv%PE?Ux&H6Z
zEnl?gnexgND^|#bt+4&-_&a)~9n;?p3l?Dk&$OfZru}(qk{)_h1LztCPgg&ebxsLQ
E0MMjPPyhe`

diff --git a/res/drawable-hdpi/widget_resize_shadow.9.png b/res/drawable-hdpi/widget_resize_shadow.9.png
deleted file mode 100644
index 7cb521405e3ecf126b97114d06e68cb1ba968bd5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 256
zcmeAS@N?(olHy`uVBq!ia0vp^p&-n`0wgE>Nw^54j(fT|hEy=Vy>6Oxz<}XsK&#|3
zqdWhnyo^XQdhwbmzwph6$JTOFUh=IBTIw}bD|FSB4eFt*LZG}Xi^)*|L4o@NT^$9P
zwk}(oUbA>!->d&CS(#<u=Pu!Hw7UHHURs;M3g!(3r=N1)-NfMSaiy{KSF2dthZXwC
zZ8|I4fhK)k^eZ+tBQArp|JFvMeHXmM`AUC%oIdq^=!%<`k3aSLMXqpK;N<z&&$X$3
k4b%}Z`=Ji0auF<Vi`gx(_<hcKpqCgtUHx3vIVCg!0Ol@l4FCWD

diff --git a/res/drawable-mdpi/widget_resize_frame.9.png b/res/drawable-mdpi/widget_resize_frame.9.png
deleted file mode 100644
index 252482f02108992cefeb7c6ac21a115a4892bd35..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 156
zcmeAS@N?(olHy`uVBq!ia0vp^Rv^s50wldRH7y2G$(}BbAr*{oueviHQ4nEuP*GGo
zx1U92>HP<j_T4;F&D7?1Yi8Zs>`TrI+nHOP76xc+IbVA{W1m>>zNtH;bg$Z+{+hx1
z<)hG+_J6Xo?lssI`A2uoudlAn4bTwb0;<38@7XfOl0vZ`=dFwn0Ig&2boFyt=akR{
E00Y-N2mk;8

diff --git a/res/drawable-mdpi/widget_resize_shadow.9.png b/res/drawable-mdpi/widget_resize_shadow.9.png
deleted file mode 100644
index a2010e2a86d7cc4db10639862be6fa68d6870df6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 206
zcmeAS@N?(olHy`uVBq!ia0vp^Rv^s50wldRH7y2GQ$1ZALn;{GUUg+UtRTVq@ZhVw
z@AjE{eeZH_{C=K`qvrI7r)&78riD4Ra*1k%tO!^r>U{QZ(xPc>Z>>!?e7wN+@Lk;k
zLH^uJ3r;rOjO;#~m$IeVdi7)`TXw$c`HQs|PIdk%k(+ofYpDZs?XC2$oP`(Jdfk72
z3^?APxq0<6o`R178-7?v{yhRS-O0OqozQV9p%XRy^QY)t1Uitx)78&qol`;+00%Ks
Avj6}9

diff --git a/res/drawable-xhdpi/widget_resize_frame.9.png b/res/drawable-xhdpi/widget_resize_frame.9.png
deleted file mode 100644
index 563c75d15c1412433d85f974de0ca89d68c08834..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 209
zcmeAS@N?(olHy`uVBq!ia0vp^g&@qr3?u~t0v`h@p#Yx{S0Mc#2>`ivZ@M*r6iZ2v
zUob<x{r>lMXRiVIS)MMAAr*0NuWsaRFyLVgY@TA*!5X1xZO|}#|9>qL4?O`_r74H*
zgl5ira;$G}xXRAj`RWrqRD?QRlqQ}i?e5dtIVW(g+HKp{_jI%O)altyb&2A#+;{UL
n%g;TtIP2IU3O!OTMwBtWxgLC&^ZQvhpsfs^u6{1-oD!M<$EHs^

diff --git a/res/drawable-xhdpi/widget_resize_shadow.9.png b/res/drawable-xhdpi/widget_resize_shadow.9.png
deleted file mode 100644
index 2b1ac05f0c804e9a0437912f7dbc456b6b5c260b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 369
zcmeAS@N?(olHy`uVBq!ia0vp^g&@qq0wg`kTcQ~l7%e<q978G?-`;G^d+fl#_As(M
z+PHbc`~TBiAI6>!wYYitk22ql`3Lw44)6Uxb@zpPs$Nqx0vEY-3gKbo+kvEcQrN|U
zRM?dCMW(Qad~i}(;@0!z3A^y;^GQ)hKJ;3r#b1~pWVra>n;BQ<r)CODM=@xnEsLME
zk|85ANY!u8rj75md^|P9YGbm(^UCFO8udyay;~{&&!$sIe>Kzvd%t@B(V6sCB=fR*
z*_n_j)}d!gRtgtOor=#o5v+R6L}qiFm2T1kt6$q^cTEryEV8O{TgEK)^5qFd-ABTv
z!rZSJb$zbbEOl$?Iq|vC)#(4Wi3B|c^mD~y&nZ9t#UE$?aqi#Ur;B^P0)vvl)78&q
Iol`;+011(p{Qv*}

diff --git a/res/drawable-xxhdpi/widget_resize_frame.9.png b/res/drawable-xxhdpi/widget_resize_frame.9.png
deleted file mode 100644
index ea527f46afe7abf55b22bfc42511c78b6a426e80..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 179
zcmeAS@N?(olHy`uVBq!ia0vp^D?ylv8A$5x{<;T9aR&H=xB}__|NjHY;$zK)K#H*>
z$S;_|;n|HeASc4p#WAEJ?(LO@f(;Hlt_Kr7nmCGzF#e6vd=b*gP^o0RU`MT5+FSpU
zS;prp!jmJXrABU(IKAmjiA}EkmfyA0{dI1$ZCDfA^FjUhMxE1PU<GAovkDpG4lJ3z
S;6fnC6%3xPelF{r5}E*+Qb8sF

diff --git a/res/drawable-xxhdpi/widget_resize_shadow.9.png b/res/drawable-xxhdpi/widget_resize_shadow.9.png
deleted file mode 100644
index 54121682fba4e3d4fa24f28559e4993881684f92..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 605
zcmeAS@N?(olHy`uVBq!ia0vp^D?ylp1xWt7b9D&=1CxrUi(^Oy<J;S*VP6~=STA;|
zr!3lG{ieQoN44Jz|CLqs7f*9A%l><%XFucb3Oz$l)u~rhriKJf4hiz~4f0eqg$a1R
zWuNS&wbD~-<r1}(OD4@)GRZ4z5>x<{2a`ro>~_7|bKlMxFUls}D_-_wyLOt+{@AMX
zT$An<h3RBuyi8lOG|{p2w3N5h#DEP7F5Fx}N}j>fUT_AU7qXl*>EZ^jj<8IP4#!LL
zc%8O5`gbmQ@+C)bk#5zh>q{ohD?TR3{>J|Xqx+n~f0iqk9DlRn&<TS?W$iZwe}LTI
zYc2)^`bD@Nmij$^ve&Mo1;5wG`bPL1Ja8?1$)s;jTsGei2YPerm-7?ifW86x3Wc!$
za9#~4^pa0mRr6%a(kVS}Jbqce)LVV!ddSh1saMu)(ta7fWOh%9u=ys<m-$w?k7lm$
zb=vZ?K+WsYv{I)ne%(u4mYA#&Tx2T6r8Hqn+Drl6;K|-xhOE4+-)uPk@66kc#q|m1
zjGoGuvb$#W{i{0M^Y!}c6`FhgJX|=VrRUS^(|bIgrv^6MRm(h}@|PVsPO!ufNE#7e
n$cn)+iW;3T>8W2XvC4!yCH5(36irYBCL0D%S3j3^P6<r_m+=kZ

diff --git a/res/drawable-xxxhdpi/widget_resize_frame.9.png b/res/drawable-xxxhdpi/widget_resize_frame.9.png
deleted file mode 100644
index 4644e9ae3c7e93ca5e7c86646f1d7ce8c8ba0cda..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 194
zcmeAS@N?(olHy`uVBq!ia0vp^4?viS8Azr(Hx&UX&H$efS0MfW|9>D^e5|<;NHLZK
z`2{mLJiCzw<fMDLIEGZjy}iDWx50s@?P8m3L{nv7twei?SHN?FC*l+K_+PcTz3gku
z{m?zCyp94aNGRs}%?`(cGn(9vA3B@`SpILbI`Bu6y_Ru)qXI`00`2&^`W$!Hipt%(
T3eRo=tz__Y^>bP0l+XkKHVQzw

diff --git a/res/drawable-xxxhdpi/widget_resize_shadow.9.png b/res/drawable-xxxhdpi/widget_resize_shadow.9.png
deleted file mode 100644
index 63cea847c6560010765eaa0e9ae3bfa990d47a77..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 826
zcmeAS@N?(olHy`uVBq!ia0vp^4?viM8A$4Wo^=^W)dl#3xB}?`1WntT-vF)GED7=p
zW?*KN65!<EW)~JzWnyCy;$ju!7w47Xli(4RRFhUwmQ~QulvkG%QDkSS_{+e+<mBn%
z7*Y}U_V&q1vkfF%6HjL_L<t$2RlF+v@Oytk)lsETl@(f3Pu;gnKiky5bjPi~Yv0*#
z{jGe_{Qm?7MkW>x0R@K!>M#z}1{F1QpR3+#`Cfc6&jWG)qiQV^@-<p6xO{b;!t!Mm
z=d~+&!CN;j42%;AFulgRYfTq#=u){kxl<G#+&f-#OV#x0#rLd?&TB6>?Bbi$pf%s_
zQiFW(Iu}O%TB!~8CzzsYeVFC8in5wmc{8WoI>EBfX8&CIFzfxc`#IR>t@nSd8vWA9
zF82JP#_bz*R~0Q?m2rG_!GrAEmdW8p>$2lpnf0e~2d))qUahyO@pSikdvz(W*T4T4
zLJNX=S%-#H*}rwF@~?xe3jW+Z`AtLShlPC4+3-!z4D7ww<yI#aY5O{tPT{LL|7&MN
z?z_$3>xE9}=dAY6JTQ6NriR#8rxppb`P@I*!St&p<8s5>38!zZ+Ns1Fu|t7z2gl-<
zw?2L@tG#jI>o?17b2~SETXgW{PW#l^R$n)lId(GrnsMEEdFf8YwYwLdTRfdP#_Vi#
ywAfju2Je-ttM%F#STwAt6j_i+ulRrMZ5_kezeN+T2+p?!<p57tKbLh*2~7YF!tzo8

diff --git a/res/drawable/widget_resize_frame.xml b/res/drawable/widget_resize_frame.xml
new file mode 100644
index 0000000000..d157f5da40
--- /dev/null
+++ b/res/drawable/widget_resize_frame.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@android:color/transparent" />
+    <corners android:radius="@android:dimen/system_app_widget_background_radius" />
+    <stroke android:width="2dp" android:color="?android:attr/colorAccent" />
+</shape>
\ No newline at end of file
diff --git a/res/layout/app_widget_resize_frame.xml b/res/layout/app_widget_resize_frame.xml
index 12561b634d..dfce94669c 100644
--- a/res/layout/app_widget_resize_frame.xml
+++ b/res/layout/app_widget_resize_frame.xml
@@ -18,15 +18,20 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/widget_resize_shadow"
-    android:foreground="@drawable/widget_resize_frame"
-    android:foregroundTint="?attr/workspaceTextColor"
     android:padding="0dp">
 
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
 
+        <!-- Frame -->
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:layout_margin="@dimen/resize_frame_margin"
+            android:src="@drawable/widget_resize_frame" />
+
         <!-- Left -->
         <ImageView
             android:layout_width="wrap_content"
@@ -34,7 +39,7 @@
             android:layout_gravity="left|center_vertical"
             android:layout_marginLeft="@dimen/widget_handle_margin"
             android:src="@drawable/ic_widget_resize_handle"
-            android:tint="?attr/workspaceTextColor" />
+            android:tint="?android:attr/colorAccent" />
 
         <!-- Top -->
         <ImageView
@@ -43,7 +48,7 @@
             android:layout_gravity="top|center_horizontal"
             android:layout_marginTop="@dimen/widget_handle_margin"
             android:src="@drawable/ic_widget_resize_handle"
-            android:tint="?attr/workspaceTextColor" />
+            android:tint="?android:attr/colorAccent" />
 
         <!-- Right -->
         <ImageView
@@ -52,7 +57,7 @@
             android:layout_gravity="right|center_vertical"
             android:layout_marginRight="@dimen/widget_handle_margin"
             android:src="@drawable/ic_widget_resize_handle"
-            android:tint="?attr/workspaceTextColor" />
+            android:tint="?android:attr/colorAccent" />
 
         <!-- Bottom -->
         <ImageView
@@ -61,7 +66,7 @@
             android:layout_gravity="bottom|center_horizontal"
             android:layout_marginBottom="@dimen/widget_handle_margin"
             android:src="@drawable/ic_widget_resize_handle"
-            android:tint="?attr/workspaceTextColor" />
+            android:tint="?android:attr/colorAccent" />
 
     </FrameLayout>
 </com.android.launcher3.AppWidgetResizeFrame>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 3b171c6918..da43758bcf 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -52,6 +52,7 @@
 <!-- App Widget resize frame -->
     <dimen name="widget_handle_margin">13dp</dimen>
     <dimen name="resize_frame_background_padding">24dp</dimen>
+    <dimen name="resize_frame_margin">22dp</dimen>
 
 <!-- Fast scroll -->
     <dimen name="fastscroll_track_min_width">6dp</dimen>
-- 
GitLab


From 162ed05ac99a50bdbaa28ef654068bf593eebace Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Fri, 26 Feb 2021 23:51:30 -0800
Subject: [PATCH 0596/1664] Add NavigationModeFeatureFlag

3 Button mode doesn't use recents animation so live tile would not work on 3 button mode before migration to recents animation happens.

Bug: 169694902
Test: manual
Change-Id: I9574c624f3d220834fa18e910637cd64460adb0c
---
 .../NavBarToHomeTouchController.java          |  6 +-
 .../android/quickstep/AbsSwipeUpHandler.java  | 16 ++---
 .../QuickstepProcessInitializer.java          |  4 ++
 .../android/quickstep/TaskOverlayFactory.java |  4 +-
 .../com/android/quickstep/TaskViewUtils.java  |  9 ++-
 .../quickstep/TouchInteractionService.java    |  8 +--
 .../inputconsumers/OverviewInputConsumer.java |  4 +-
 .../util/NavigationModeFeatureFlag.java       | 58 +++++++++++++++++++
 .../quickstep/util/TaskViewSimulator.java     |  3 +-
 .../quickstep/views/LauncherRecentsView.java  |  4 +-
 .../android/quickstep/views/RecentsView.java  | 24 ++++----
 .../android/quickstep/views/TaskMenuView.java |  4 +-
 .../quickstep/views/TaskThumbnailView.java    |  4 +-
 .../com/android/quickstep/views/TaskView.java |  6 +-
 14 files changed, 107 insertions(+), 47 deletions(-)
 create mode 100644 quickstep/src/com/android/quickstep/util/NavigationModeFeatureFlag.java

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
index 6b9c34028a..a990f3ed93 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
@@ -24,8 +24,8 @@ import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_ALL_APPS_EDU;
-import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE;
+import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
 
 import android.animation.ValueAnimator;
@@ -145,7 +145,7 @@ public class NavBarToHomeTouchController implements TouchController,
                     OverviewScrim.SCRIM_MULTIPLIER, OVERVIEW_TO_HOME_SCRIM_MULTIPLIER,
                     PULLBACK_INTERPOLATOR);
 
-            if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+            if (LIVE_TILE.get()) {
                 builder.addOnFrameCallback(recentsView::redrawLiveTile);
             }
 
@@ -194,7 +194,7 @@ public class NavBarToHomeTouchController implements TouchController,
         boolean success = interpolatedProgress >= SUCCESS_TRANSITION_PROGRESS
                 || (velocity < 0 && fling);
         if (success) {
-            if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+            if (LIVE_TILE.get()) {
                 RecentsView recentsView = mLauncher.getOverviewPanel();
                 recentsView.switchToScreenshot(null,
                         () -> recentsView.finishRecentsAnimation(true /* toRecents */, null));
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 1bd7fe6593..615d0fe2bc 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -25,7 +25,6 @@ import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAG
 import static com.android.launcher3.QuickstepAppTransitionManagerImpl.RECENTS_LAUNCH_DURATION;
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.anim.Interpolators.DEACCEL;
-import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.IGNORE;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE;
@@ -45,6 +44,7 @@ import static com.android.quickstep.GestureState.STATE_END_TARGET_ANIMATION_FINI
 import static com.android.quickstep.GestureState.STATE_END_TARGET_SET;
 import static com.android.quickstep.GestureState.STATE_RECENTS_SCROLLING_FINISHED;
 import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;
+import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 import static com.android.quickstep.views.RecentsView.RECENTS_GRID_PROGRESS;
 import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD;
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME;
@@ -318,7 +318,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         mStateCallback.runOnceAtState(STATE_HANDLER_INVALIDATED | STATE_FINISH_WITH_NO_END,
                 this::notifyTransitionCancelled);
 
-        if (!ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+        if (!LIVE_TILE.get()) {
             mStateCallback.addChangeListener(STATE_APP_CONTROLLER_RECEIVED | STATE_LAUNCHER_PRESENT
                             | STATE_SCREENSHOT_VIEW_SHOWN | STATE_CAPTURE_SCREENSHOT,
                     (b) -> mRecentsView.setRunningTaskHidden(!b));
@@ -459,7 +459,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
     }
 
     private void onDeferredActivityLaunch() {
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+        if (LIVE_TILE.get()) {
             mActivityInterface.switchRunningTaskViewToScreenshot(
                     null, () -> {
                         mTaskAnimationManager.finishRunningRecentsAnimation(true /* toHome */);
@@ -1366,7 +1366,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
 
     private void resetLauncherListenersAndOverlays() {
         // Reset the callback for deferred activity launches
-        if (!ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+        if (!LIVE_TILE.get()) {
             mActivityInterface.setOnDeferredActivityLaunchCallback(null);
         }
         mActivity.getRootView().setOnApplyWindowInsetsListener(null);
@@ -1387,7 +1387,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
 
     protected void switchToScreenshot() {
         final int runningTaskId = mGestureState.getRunningTaskId();
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+        if (LIVE_TILE.get()) {
             if (mRecentsAnimationController != null) {
                 mRecentsAnimationController.getController().setWillFinishToHome(true);
                 // Update the screenshot of the task
@@ -1456,7 +1456,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
     }
 
     private void finishCurrentTransitionToRecents() {
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+        if (LIVE_TILE.get()) {
             mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);
         } else if (!hasTargets() || mRecentsAnimationController == null) {
             // If there are no targets or the animation not started, then there is nothing to finish
@@ -1517,7 +1517,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         endLauncherTransitionController();
         mActivityInterface.onSwipeUpToRecentsComplete();
         mRecentsView.onSwipeUpAnimationSuccess();
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+        if (LIVE_TILE.get()) {
             mTaskAnimationManager.setLaunchOtherTaskInLiveTileModeHandler(
                     appearedTaskTarget -> {
                         RemoteAnimationTargetCompat[] apps = Arrays.copyOf(
@@ -1765,7 +1765,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
             }
             mTaskViewSimulator.apply(mTransformParams);
         }
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && mRecentsAnimationTargets != null) {
+        if (LIVE_TILE.get() && mRecentsAnimationTargets != null) {
             LiveTileOverlay.INSTANCE.update(
                     mTaskViewSimulator.getCurrentRect(),
                     mTaskViewSimulator.getCurrentCornerRadius());
diff --git a/quickstep/src/com/android/quickstep/QuickstepProcessInitializer.java b/quickstep/src/com/android/quickstep/QuickstepProcessInitializer.java
index 65847f11bb..192738f76a 100644
--- a/quickstep/src/com/android/quickstep/QuickstepProcessInitializer.java
+++ b/quickstep/src/com/android/quickstep/QuickstepProcessInitializer.java
@@ -15,6 +15,8 @@
  */
 package com.android.quickstep;
 
+import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
+
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -59,6 +61,8 @@ public class QuickstepProcessInitializer extends MainProcessInitializer {
 
         super.init(context);
 
+        LIVE_TILE.initialize(context);
+
         // Elevate GPU priority for Quickstep and Remote animations.
         ThreadedRendererCompat.setContextPriority(
                 ThreadedRendererCompat.EGL_CONTEXT_PRIORITY_HIGH_IMG);
diff --git a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
index 0d2c42e3b0..8636130fd1 100644
--- a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
@@ -18,7 +18,7 @@ package com.android.quickstep;
 
 import static android.view.Surface.ROTATION_0;
 
-import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
+import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 import static com.android.quickstep.views.OverviewActionsView.DISABLED_NO_THUMBNAIL;
 import static com.android.quickstep.views.OverviewActionsView.DISABLED_ROTATED;
 
@@ -163,7 +163,7 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
          * @param callback callback to run, after switching to screenshot
          */
         public void endLiveTileMode(@NonNull Runnable callback) {
-            if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+            if (LIVE_TILE.get()) {
                 RecentsView recentsView = mThumbnailView.getTaskView().getRecentsView();
                 recentsView.switchToScreenshot(
                         () -> recentsView.finishRecentsAnimation(true /* toRecents */, callback));
diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java
index cd4f52f576..39751c0d71 100644
--- a/quickstep/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java
@@ -23,8 +23,8 @@ import static com.android.launcher3.Utilities.getDescendantCoordRelativeToAncest
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.Interpolators.TOUCH_RESPONSE_INTERPOLATOR;
 import static com.android.launcher3.anim.Interpolators.clampToProgress;
-import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.statehandlers.DepthController.DEPTH;
+import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_CLOSING;
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_OPENING;
 
@@ -139,7 +139,7 @@ public final class TaskViewUtils {
         boolean isRunningTask = v.isRunningTask();
         TransformParams params = null;
         TaskViewSimulator tsv = null;
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && isRunningTask) {
+        if (LIVE_TILE.get() && isRunningTask) {
             params = v.getRecentsView().getLiveTileParams();
             tsv = v.getRecentsView().getLiveTileTaskViewSimulator();
         }
@@ -159,8 +159,7 @@ public final class TaskViewUtils {
         boolean isQuickSwitch = v.isEndQuickswitchCuj();
         v.setEndQuickswitchCuj(false);
 
-        boolean inLiveTileMode =
-                ENABLE_QUICKSTEP_LIVE_TILE.get() && v.getRecentsView().getRunningTaskIndex() != -1;
+        boolean inLiveTileMode = LIVE_TILE.get() && v.getRecentsView().getRunningTaskIndex() != -1;
         final RemoteAnimationTargets targets =
                 new RemoteAnimationTargets(appTargets, wallpaperTargets,
                         inLiveTileMode ? MODE_CLOSING : MODE_OPENING);
@@ -341,7 +340,7 @@ public final class TaskViewUtils {
             };
         }
         pa.add(launcherAnim);
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && recentsView.getRunningTaskIndex() != -1) {
+        if (LIVE_TILE.get() && recentsView.getRunningTaskIndex() != -1) {
             pa.addOnFrameCallback(recentsView::redrawLiveTile);
         }
         anim.play(pa.buildAnim());
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 27c7ade603..fc805d0794 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -21,9 +21,9 @@ import static android.view.MotionEvent.ACTION_DOWN;
 import static android.view.MotionEvent.ACTION_UP;
 
 import static com.android.launcher3.config.FeatureFlags.ASSISTANT_GIVES_LAUNCHER_FOCUS;
-import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.quickstep.GestureState.DEFAULT_STATE;
+import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SYSUI_PROXY;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_TRACING_ENABLED;
 
@@ -687,8 +687,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
                     runningComponent != null && runningComponent.equals(homeComponent);
         }
 
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get()
-                && gestureState.getActivityInterface().isInLiveTileMode()) {
+        if (LIVE_TILE.get() && gestureState.getActivityInterface().isInLiveTileMode()) {
             return createOverviewInputConsumer(
                     previousGestureState, gestureState, event, forceOverviewInputConsumer);
         } else if (gestureState.getRunningTask() == null) {
@@ -744,8 +743,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
                 || previousGestureState.isRunningAnimationToLauncher()
                 || (ASSISTANT_GIVES_LAUNCHER_FOCUS.get()
                     && forceOverviewInputConsumer)
-                || (ENABLE_QUICKSTEP_LIVE_TILE.get())
-                    && gestureState.getActivityInterface().isInLiveTileMode()) {
+                || (LIVE_TILE.get()) && gestureState.getActivityInterface().isInLiveTileMode()) {
             return new OverviewInputConsumer(gestureState, activity, mInputMonitorCompat,
                     false /* startingInActivityBounds */);
         } else {
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
index aad70c4218..cee33639b3 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
@@ -15,7 +15,7 @@
  */
 package com.android.quickstep.inputconsumers;
 
-import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
+import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
 
 import android.view.KeyEvent;
@@ -99,7 +99,7 @@ public class OverviewInputConsumer<T extends StatefulActivity<?>>
 
     @Override
     public void onKeyEvent(KeyEvent ev) {
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+        if (LIVE_TILE.get()) {
             mActivity.dispatchKeyEvent(ev);
         }
     }
diff --git a/quickstep/src/com/android/quickstep/util/NavigationModeFeatureFlag.java b/quickstep/src/com/android/quickstep/util/NavigationModeFeatureFlag.java
new file mode 100644
index 0000000000..60c7add38f
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/util/NavigationModeFeatureFlag.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.quickstep.util;
+
+import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
+
+import android.content.Context;
+
+import com.android.quickstep.SysUINavigationMode;
+
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+/** A feature flag that listens to navigation mode changes. */
+public class NavigationModeFeatureFlag implements
+        SysUINavigationMode.NavigationModeChangeListener {
+
+    public static final NavigationModeFeatureFlag LIVE_TILE = new NavigationModeFeatureFlag(
+            ENABLE_QUICKSTEP_LIVE_TILE::get, mode -> mode.hasGestures);
+
+    private final Supplier<Boolean> mBasePredicate;
+    private final Predicate<SysUINavigationMode.Mode> mModePredicate;
+    private boolean mSupported;
+
+    private NavigationModeFeatureFlag(Supplier<Boolean> basePredicate,
+            Predicate<SysUINavigationMode.Mode> modePredicate) {
+        mBasePredicate = basePredicate;
+        mModePredicate = modePredicate;
+    }
+
+    public boolean get() {
+        return mBasePredicate.get() && mSupported;
+    }
+
+    public void initialize(Context context) {
+        onNavigationModeChanged(SysUINavigationMode.INSTANCE.get(context).getMode());
+        SysUINavigationMode.INSTANCE.get(context).addModeChangeListener(this);
+    }
+
+    @Override
+    public void onNavigationModeChanged(SysUINavigationMode.Mode newMode) {
+        mSupported = mModePredicate.test(newMode);
+    }
+}
diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index 8c98480963..584a284381 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -19,6 +19,7 @@ import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.states.RotationHelper.deltaRotation;
 import static com.android.launcher3.touch.PagedOrientationHandler.MATRIX_POST_TRANSLATE;
+import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 import static com.android.quickstep.util.RecentsOrientedState.postDisplayRotation;
 import static com.android.quickstep.util.RecentsOrientedState.preDisplayRotation;
 import static com.android.systemui.shared.system.WindowManagerWrapper.WINDOWING_MODE_FULLSCREEN;
@@ -352,7 +353,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
                 .withCornerRadius(getCurrentCornerRadius())
                 .withShadowRadius(app.isTranslucent ? 0 : params.getShadowRadius());
 
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && params.getRecentsSurface() != null) {
+        if (LIVE_TILE.get() && params.getRecentsSurface() != null) {
             // When relativeLayer = 0, it reverts the surfaces back to the original order.
             builder.withRelativeLayerTo(params.getRecentsSurface(),
                     mDrawsBelowRecents ? Integer.MIN_VALUE : 0);
diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
index 84218fd454..d99f707a68 100644
--- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
@@ -23,7 +23,7 @@ import static com.android.launcher3.LauncherState.OVERVIEW_MODAL_TASK;
 import static com.android.launcher3.LauncherState.SPRING_LOADED;
 import static com.android.launcher3.QuickstepAppTransitionManagerImpl.ALL_APPS_PROGRESS_OFF_SCREEN;
 import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS;
-import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
+import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
@@ -95,7 +95,7 @@ public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher>
     public void startHome() {
         Runnable onReachedHome = () -> mActivity.getStateManager().goToState(NORMAL, false);
         OverviewToHomeAnim overviewToHomeAnim = new OverviewToHomeAnim(mActivity, onReachedHome);
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+        if (LIVE_TILE.get()) {
             switchToScreenshot(null,
                     () -> finishRecentsAnimation(true /* toRecents */,
                             () -> overviewToHomeAnim.animateWithVelocity(0)));
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index e20540c8fc..78910ceddd 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -35,7 +35,6 @@ import static com.android.launcher3.anim.Interpolators.ACCEL_0_75;
 import static com.android.launcher3.anim.Interpolators.ACCEL_2;
 import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
-import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_CLEAR_ALL;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_DISMISS_SWIPE_UP;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_SWIPE_DOWN;
@@ -43,6 +42,7 @@ import static com.android.launcher3.statehandlers.DepthController.DEPTH;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW;
 import static com.android.quickstep.TaskUtils.checkCurrentOrManagedUserId;
+import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NON_ZERO_ROTATION;
 import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NO_RECENTS;
 import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NO_TASKS;
@@ -561,7 +561,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     @Override
     protected void onWindowVisibilityChanged(int visibility) {
         super.onWindowVisibilityChanged(visibility);
-        if (visibility != VISIBLE && ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+        if (visibility != VISIBLE && LIVE_TILE.get()) {
             finishRecentsAnimation(true /* toRecents */, null);
         }
         updateTaskStackListenerState();
@@ -922,7 +922,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                 taskView.setModalness(mTaskModalness);
             }
         }
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+        if (LIVE_TILE.get()) {
             // Since we reuse the same mLiveTileTaskViewSimulator in the RecentsView, we need
             // to reset the params after it settles in Overview from swipe up so that we don't
             // render with obsolete param values.
@@ -1042,7 +1042,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mModel.getThumbnailCache().getHighResLoadingState().setFlingingFast(isFlingingFast);
 
         mLiveTileTaskViewSimulator.setScroll(getScrollOffset());
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && mEnableDrawingLiveTile
+        if (LIVE_TILE.get() && mEnableDrawingLiveTile
                 && mLiveTileParams.getTargetSet() != null) {
             redrawLiveTile();
         }
@@ -1264,7 +1264,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
      */
     public void onSwipeUpAnimationSuccess() {
         if (getRunningTaskView() != null) {
-            float startProgress = ENABLE_QUICKSTEP_LIVE_TILE.get() && mLiveTileOverlayAttached
+            float startProgress = LIVE_TILE.get() && mLiveTileOverlayAttached
                     ? LiveTileOverlay.INSTANCE.cancelIconAnimation()
                     : 0f;
             animateUpRunningTaskIconScale(startProgress);
@@ -1326,7 +1326,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         setOnScrollChangeListener(null);
         setEnableFreeScroll(true);
         setEnableDrawingLiveTile(true);
-        if (!ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+        if (!LIVE_TILE.get()) {
             setRunningTaskViewShowScreenshot(true);
         }
         setRunningTaskHidden(false);
@@ -1418,7 +1418,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     }
 
     private void setRunningTaskViewShowScreenshot(boolean showScreenshot) {
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+        if (LIVE_TILE.get()) {
             TaskView runningTaskView = getRunningTaskView();
             if (runningTaskView != null) {
                 runningTaskView.setShowScreenshot(showScreenshot);
@@ -1824,7 +1824,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             anim.addOnFrameCallback(this::updateCurveProperties);
         }
 
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && getRunningTaskView() == taskView) {
+        if (LIVE_TILE.get() && getRunningTaskView() == taskView) {
             anim.addOnFrameCallback(() -> {
                 mLiveTileTaskViewSimulator.taskSecondaryTranslation.value =
                         mOrientationHandler.getSecondaryValue(
@@ -1843,7 +1843,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mPendingAnimation.addEndListener(new Consumer<Boolean>() {
             @Override
             public void accept(Boolean success) {
-                if (ENABLE_QUICKSTEP_LIVE_TILE.get() && taskView.isRunningTask() && success) {
+                if (LIVE_TILE.get() && taskView.isRunningTask() && success) {
                     finishRecentsAnimation(true /* toHome */, () -> onEnd(success));
                 } else {
                     onEnd(success);
@@ -2390,7 +2390,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             anim.play(ObjectAnimator.ofFloat(getPageAt(centerTaskIndex),
                     mOrientationHandler.getPrimaryViewTranslate(), primaryTranslation));
             int runningTaskIndex = recentsView.getRunningTaskIndex();
-            if (ENABLE_QUICKSTEP_LIVE_TILE.get() && runningTaskIndex != -1
+            if (LIVE_TILE.get() && runningTaskIndex != -1
                     && runningTaskIndex != taskIndex) {
                 anim.play(ObjectAnimator.ofFloat(
                         recentsView.getLiveTileTaskViewSimulator().taskPrimaryTranslation,
@@ -2467,7 +2467,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
 
         mPendingAnimation = new PendingAnimation(duration);
         mPendingAnimation.add(anim);
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+        if (LIVE_TILE.get()) {
             mLiveTileTaskViewSimulator.addOverviewToAppAnim(mPendingAnimation, interpolator);
             mPendingAnimation.addOnFrameCallback(this::redrawLiveTile);
         }
@@ -2479,7 +2479,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                         tv.notifyTaskLaunchFailed(TAG);
                     }
                 };
-                if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+                if (LIVE_TILE.get()) {
                     finishRecentsAnimation(false /* toRecents */, null);
                     onLaunchResult.accept(true /* success */);
                 } else {
diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
index f477ca7ea9..2315147bdb 100644
--- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
@@ -16,7 +16,7 @@
 
 package com.android.quickstep.views;
 
-import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
+import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 import static com.android.quickstep.views.TaskThumbnailView.DIM_ALPHA;
 
 import android.animation.Animator;
@@ -183,7 +183,7 @@ public class TaskMenuView extends AbstractFloatingView {
         LayoutParams lp = (LayoutParams) menuOptionView.getLayoutParams();
         mTaskView.getPagedOrientationHandler().setLayoutParamsForTaskMenuOptionItem(lp);
         menuOptionView.setOnClickListener(view -> {
-            if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+            if (LIVE_TILE.get()) {
                 RecentsView recentsView = mTaskView.getRecentsView();
                 recentsView.switchToScreenshot(null,
                         () -> recentsView.finishRecentsAnimation(true /* toRecents */,
diff --git a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
index f2f4bc1238..4c21745de8 100644
--- a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
@@ -19,7 +19,7 @@ package com.android.quickstep.views;
 import static android.view.WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS;
 import static android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS;
 
-import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
+import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 import static com.android.systemui.shared.system.WindowManagerWrapper.WINDOWING_MODE_FULLSCREEN;
 
 import android.content.Context;
@@ -319,7 +319,7 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
 
     public void drawOnCanvas(Canvas canvas, float x, float y, float width, float height,
             float cornerRadius) {
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+        if (LIVE_TILE.get()) {
             if (mTask != null && getTaskView().isRunningTask() && !getTaskView().showScreenshot()) {
                 canvas.drawRoundRect(x, y, width, height, cornerRadius, cornerRadius, mClearPaint);
                 canvas.drawRoundRect(x, y, width, height, cornerRadius, cornerRadius,
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 20a8444073..3fb5998300 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -35,10 +35,10 @@ import static com.android.launcher3.anim.Interpolators.EXAGGERATED_EASE;
 import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.Interpolators.TOUCH_RESPONSE_INTERPOLATOR;
-import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_ICON_TAP_OR_LONGPRESS;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_TAP;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -308,7 +308,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
             if (getTask() == null) {
                 return;
             }
-            if (ENABLE_QUICKSTEP_LIVE_TILE.get() && isRunningTask()) {
+            if (LIVE_TILE.get() && isRunningTask()) {
                 if (!mIsClickableAsLiveTile) {
                     return;
                 }
@@ -559,7 +559,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
             mIconLoadRequest = iconCache.updateIconInBackground(mTask,
                     (task) -> {
                         setIcon(task.icon);
-                        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && isRunningTask()) {
+                        if (LIVE_TILE.get() && isRunningTask()) {
                             getRecentsView().updateLiveTileIcon(task.icon);
                         }
                         mDigitalWellBeingToast.initialize(mTask);
-- 
GitLab


From eedab487e322b91d4602fd913d333ee5e9233f34 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Fri, 26 Feb 2021 11:53:25 -0800
Subject: [PATCH 0597/1664] Fix incremental download progress of
 workspaceiteminfos.

WorkspaceItemInfo intent package names could be null, while the item info itself had a non-null package name. Added a helper method checking component package names first, then intent package names as a fallback for deep shortcuts.

Demo: https://drive.google.com/file/d/1No44OD7SAD9qdmu-O6g3WaGdFjFLu2in/view?usp=sharing

Fixes: 181261930
Test: Manually on device
Change-Id: Ie2e10a79865b4898038fbdd4bbd9a7e9e1d42366
---
 .../PackageIncrementalDownloadUpdatedTask.java |  4 +---
 .../model/PackageInstallStateChangedTask.java  |  6 ++----
 .../android/launcher3/model/data/ItemInfo.java | 18 ++++++++++++++++++
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/com/android/launcher3/model/PackageIncrementalDownloadUpdatedTask.java b/src/com/android/launcher3/model/PackageIncrementalDownloadUpdatedTask.java
index 434776cf74..c0dc34abb5 100644
--- a/src/com/android/launcher3/model/PackageIncrementalDownloadUpdatedTask.java
+++ b/src/com/android/launcher3/model/PackageIncrementalDownloadUpdatedTask.java
@@ -15,7 +15,6 @@
  */
 package com.android.launcher3.model;
 
-import android.content.Intent;
 import android.os.UserHandle;
 
 import com.android.launcher3.LauncherAppState;
@@ -66,8 +65,7 @@ public class PackageIncrementalDownloadUpdatedTask extends BaseModelUpdateTask {
         final ArrayList<WorkspaceItemInfo> updatedWorkspaceItems = new ArrayList<>();
         synchronized (dataModel) {
             dataModel.forAllWorkspaceItemInfos(mUser, si -> {
-                Intent intent = si.getIntent();
-                if ((intent != null) && mPackageName.equals(intent.getPackage())) {
+                if (mPackageName.equals(si.getTargetPackage())) {
                     si.runtimeStatusFlags &= ~ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE;
                     si.setProgressLevel(downloadInfo);
                     updatedWorkspaceItems.add(si);
diff --git a/src/com/android/launcher3/model/PackageInstallStateChangedTask.java b/src/com/android/launcher3/model/PackageInstallStateChangedTask.java
index 1380e9e0c4..9889a8065d 100644
--- a/src/com/android/launcher3/model/PackageInstallStateChangedTask.java
+++ b/src/com/android/launcher3/model/PackageInstallStateChangedTask.java
@@ -15,7 +15,6 @@
  */
 package com.android.launcher3.model;
 
-import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 
@@ -72,9 +71,8 @@ public class PackageInstallStateChangedTask extends BaseModelUpdateTask {
         synchronized (dataModel) {
             final HashSet<ItemInfo> updates = new HashSet<>();
             dataModel.forAllWorkspaceItemInfos(mInstallInfo.user, si -> {
-                Intent intent = si.getIntent();
-                if (si.hasPromiseIconUi() && (intent != null)
-                        && mInstallInfo.packageName.equals(intent.getPackage())) {
+                if (si.hasPromiseIconUi()
+                        && mInstallInfo.packageName.equals(si.getTargetPackage())) {
                     int installProgress = mInstallInfo.progress;
 
                     si.setProgressLevel(installProgress, PackageInstallInfo.STATUS_INSTALLING);
diff --git a/src/com/android/launcher3/model/data/ItemInfo.java b/src/com/android/launcher3/model/data/ItemInfo.java
index 00ac12fc46..e54f1e7705 100644
--- a/src/com/android/launcher3/model/data/ItemInfo.java
+++ b/src/com/android/launcher3/model/data/ItemInfo.java
@@ -184,6 +184,24 @@ public class ItemInfo {
         return Optional.ofNullable(getIntent()).map(Intent::getComponent).orElse(mComponentName);
     }
 
+    /**
+     * Returns this item's package name.
+     *
+     * Prioritizes the component package name, then uses the intent package name as a fallback.
+     * This ensures deep shortcuts are supported.
+     */
+    @Nullable
+    public String getTargetPackage() {
+        ComponentName component = getTargetComponent();
+        Intent intent = getIntent();
+
+        return component != null
+                ? component.getPackageName()
+                : intent != null
+                        ? intent.getPackage()
+                        : null;
+    }
+
     public void writeToValues(ContentWriter writer) {
         writer.put(LauncherSettings.Favorites.ITEM_TYPE, itemType)
                 .put(LauncherSettings.Favorites.CONTAINER, container)
-- 
GitLab


From a29a046d836a4b8a86ddf5589445b06506f7a8e6 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 2 Mar 2021 12:28:25 -0800
Subject: [PATCH 0598/1664] Align real hotseat with taskbar hotseat during drag
 and drop

Remove hotseat space from workspace in DeviceProfile if
taskbar is present, and instantly swap between taskbar and
hotseat when entering SpringLoadedMode. To allow for an exact
handoff, we also scale up the TaskbarView such that its icons
match the hotseat icon size when on the home screen.

Note that this CL only supports dragging to the taskbar, not
out of it (which still triggers system drag and drop instead).

Test: In RTL and LTR, drag a workspace item and ensure hotseat
seamlessly swaps with the taskbar hotseat and allows drops.

Bug: 179886115
Bug: 171917176

Change-Id: Id6462075b9b0b66b06d51a78c9c0b3e11e83e84d
---
 .../taskbar/TaskbarActivityContext.java       | 12 +++++-
 .../taskbar/TaskbarContainerView.java         |  5 +++
 .../launcher3/taskbar/TaskbarController.java  | 29 ++++++++++++++-
 .../launcher3/taskbar/TaskbarView.java        | 37 ++++++++++++++++++-
 .../uioverrides/PredictedAppIcon.java         | 13 +++----
 .../QuickstepAtomicAnimationFactory.java      | 16 +++++++-
 src/com/android/launcher3/DeviceProfile.java  |  8 ++--
 src/com/android/launcher3/Hotseat.java        | 18 ++++++---
 src/com/android/launcher3/LauncherState.java  | 18 +++++++--
 .../WorkspaceStateTransitionAnimation.java    |  8 +++-
 .../WorkspacePageIndicator.java               |  4 +-
 .../launcher3/states/SpringLoadedState.java   |  2 +-
 .../states/StateAnimationConfig.java          |  4 +-
 13 files changed, 143 insertions(+), 31 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
index 06372fe22f..8312b82062 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
@@ -35,13 +35,14 @@ public class TaskbarActivityContext extends ContextWrapper implements ActivityCo
     private final DeviceProfile mDeviceProfile;
     private final LayoutInflater mLayoutInflater;
     private final TaskbarContainerView mTaskbarContainerView;
+    private final float mIconScale;
 
     public TaskbarActivityContext(BaseQuickstepLauncher launcher) {
         super(launcher);
         mDeviceProfile = launcher.getDeviceProfile().copy(this);
         float taskbarIconSize = getResources().getDimension(R.dimen.taskbar_icon_size);
-        float iconScale = taskbarIconSize / mDeviceProfile.iconSizePx;
-        mDeviceProfile.updateIconSize(iconScale, getResources());
+        mIconScale = taskbarIconSize / mDeviceProfile.iconSizePx;
+        mDeviceProfile.updateIconSize(mIconScale, getResources());
 
         mLayoutInflater = LayoutInflater.from(this).cloneInContext(this);
 
@@ -75,4 +76,11 @@ public class TaskbarActivityContext extends ContextWrapper implements ActivityCo
     public Rect getFolderBoundingBox() {
         return mTaskbarContainerView.getFolderBoundingBox();
     }
+
+    /**
+     * @return The ratio of taskbar icon size vs normal workspace/hotseat icon size.
+     */
+    public float getTaskbarIconScale() {
+        return mIconScale;
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
index ddd0d15442..1e5e3e74a1 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
@@ -97,7 +97,12 @@ public class TaskbarContainerView extends BaseDragLayer<TaskbarActivityContext>
             // to show a floating view like Folder. Thus, we set the contentInsets to be where
             // mTaskbarView is, since its position never changes and insets rather than overlays.
             int[] loc = mTempLoc;
+            float scale = mTaskbarView.getScaleX();
+            mTaskbarView.setScaleX(1);
+            mTaskbarView.setScaleY(1);
             mTaskbarView.getLocationInWindow(loc);
+            mTaskbarView.setScaleX(scale);
+            mTaskbarView.setScaleY(scale);
             insetsInfo.contentInsets.left = loc[0];
             insetsInfo.contentInsets.top = loc[1];
             insetsInfo.contentInsets.right = getWidth() - (loc[0] + mTaskbarView.getWidth());
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index 5dddaf3ed0..69ca9835cf 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -19,6 +19,8 @@ import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
 import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
 
+import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
+import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_BOTTOM_TAPPABLE_ELEMENT;
 import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_EXTRA_NAVIGATION_BAR;
 
@@ -27,6 +29,7 @@ import android.app.ActivityOptions;
 import android.content.ComponentName;
 import android.graphics.PixelFormat;
 import android.graphics.Point;
+import android.graphics.Rect;
 import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
@@ -207,6 +210,8 @@ public class TaskbarController {
         mTaskbarVisibilityController.init();
         mHotseatController.init();
         mRecentsController.init();
+
+        SCALE_PROPERTY.set(mTaskbarView, mLauncher.hasBeenResumed() ? getTaskbarScaleOnHome() : 1f);
     }
 
     private TaskbarStateHandlerCallbacks createTaskbarStateHandlerCallbacks() {
@@ -285,16 +290,23 @@ public class TaskbarController {
      * @param toState If known, the state we will end up in when reaching Launcher.
      */
     public Animator createAnimToLauncher(@Nullable LauncherState toState, long duration) {
+        alignRealHotseatWithTaskbar();
+
         PendingAnimation anim = new PendingAnimation(duration);
         anim.add(mTaskbarVisibilityController.createAnimToBackgroundAlpha(0, duration));
         if (toState != null) {
             mTaskbarStateHandler.setStateWithAnimation(toState, new StateAnimationConfig(), anim);
         }
+        anim.addFloat(mTaskbarView, SCALE_PROPERTY, mTaskbarView.getScaleX(),
+                getTaskbarScaleOnHome(), LINEAR);
         return anim.buildAnim();
     }
 
     private Animator createAnimToApp(long duration) {
-        return mTaskbarVisibilityController.createAnimToBackgroundAlpha(1, duration);
+        PendingAnimation anim = new PendingAnimation(duration);
+        anim.add(mTaskbarVisibilityController.createAnimToBackgroundAlpha(1, duration));
+        anim.addFloat(mTaskbarView, SCALE_PROPERTY, mTaskbarView.getScaleX(), 1f, LINEAR);
+        return anim.buildAnim();
     }
 
     /**
@@ -377,6 +389,21 @@ public class TaskbarController {
                 && mTaskbarContainerView.getWindowId().equals(v.getWindowId());
     }
 
+    /**
+     * Pads the Hotseat to line up exactly with Taskbar's copy of the Hotseat.
+     */
+    public void alignRealHotseatWithTaskbar() {
+        Rect hotseatBounds = new Rect();
+        mTaskbarView.getHotseatBoundsAtScale(getTaskbarScaleOnHome()).roundOut(hotseatBounds);
+        mLauncher.getHotseat().setPadding(hotseatBounds.left, hotseatBounds.top,
+                mTaskbarView.getWidth() - hotseatBounds.right,
+                mTaskbarView.getHeight() - hotseatBounds.bottom);
+    }
+
+    private float getTaskbarScaleOnHome() {
+        return 1f / mTaskbarContainerView.getTaskbarActivityContext().getTaskbarIconScale();
+    }
+
     /**
      * Updates the TaskbarContainer to MATCH_PARENT vs original Taskbar size.
      */
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
index 7a13b89d25..72c792f308 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
@@ -18,6 +18,7 @@ package com.android.launcher3.taskbar;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Canvas;
+import android.graphics.Matrix;
 import android.graphics.RectF;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
@@ -35,6 +36,7 @@ import androidx.annotation.Nullable;
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.folder.FolderIcon;
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
@@ -50,10 +52,12 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
     private final ColorDrawable mBackgroundDrawable;
     private final int mItemMarginLeftRight;
     private final int mIconTouchSize;
+    private final boolean mIsRtl;
     private final int mTouchSlop;
     private final RectF mTempDelegateBounds = new RectF();
     private final RectF mDelegateSlopBounds = new RectF();
     private final int[] mTempOutLocation = new int[2];
+    private final Matrix mTempMatrix = new Matrix();
 
     // Initialized in TaskbarController constructor.
     private TaskbarController.TaskbarViewCallbacks mControllerCallbacks;
@@ -94,6 +98,7 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
         mBackgroundDrawable = (ColorDrawable) getBackground();
         mItemMarginLeftRight = resources.getDimensionPixelSize(R.dimen.taskbar_icon_spacing);
         mIconTouchSize = resources.getDimensionPixelSize(R.dimen.taskbar_icon_touch_size);
+        mIsRtl = Utilities.isRtl(resources);
         mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
     }
 
@@ -131,7 +136,8 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
      */
     protected void updateHotseatItems(ItemInfo[] hotseatItemInfos) {
         for (int i = 0; i < hotseatItemInfos.length; i++) {
-            ItemInfo hotseatItemInfo = hotseatItemInfos[i];
+            ItemInfo hotseatItemInfo = hotseatItemInfos[!mIsRtl ? i
+                    : hotseatItemInfos.length - i - 1];
             int hotseatIndex = mHotseatStartIndex + i;
             View hotseatView = getChildAt(hotseatIndex);
 
@@ -390,6 +396,35 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
         return mIsDraggingItem;
     }
 
+    /**
+     * @return The bounding box of where the hotseat elements will be when we reach the given scale.
+     */
+    protected RectF getHotseatBoundsAtScale(float taskbarViewScale) {
+        View firstHotseatView = null, lastHotseatView = null;
+        for (int i = mHotseatStartIndex; i <= mHotseatEndIndex; i++) {
+            View child = getChildAt(i);
+            if (child.getVisibility() != GONE) {
+                if (firstHotseatView == null) {
+                    firstHotseatView = child;
+                }
+                lastHotseatView = child;
+            }
+        }
+        if (firstHotseatView == null || lastHotseatView == null) {
+            return new RectF();
+        }
+        View leftmostHotseatView = !mIsRtl ? firstHotseatView : lastHotseatView;
+        View rightmostHotseatView = !mIsRtl ? lastHotseatView : firstHotseatView;
+        RectF hotseatBounds = new RectF(
+                leftmostHotseatView.getLeft() - mItemMarginLeftRight,
+                leftmostHotseatView.getTop(),
+                rightmostHotseatView.getRight() + mItemMarginLeftRight,
+                rightmostHotseatView.getBottom());
+        mTempMatrix.setScale(taskbarViewScale, taskbarViewScale, getPivotX(), getPivotY());
+        mTempMatrix.mapRect(hotseatBounds);
+        return hotseatBounds;
+    }
+
     // FolderIconParent implemented methods.
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
index 98551fb17a..d330a68adb 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
@@ -228,17 +228,13 @@ public class PredictedAppIcon extends DoubleShadowBubbleTextView {
      */
     public static class PredictedIconOutlineDrawing extends CellLayout.DelegatedCellDrawing {
 
-        private int mOffsetX;
-        private int mOffsetY;
-        private int mIconRadius;
-        private Paint mOutlinePaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        private final PredictedAppIcon mIcon;
+        private final Paint mOutlinePaint = new Paint(Paint.ANTI_ALIAS_FLAG);
 
         public PredictedIconOutlineDrawing(int cellX, int cellY, PredictedAppIcon icon) {
             mDelegateCellX = cellX;
             mDelegateCellY = cellY;
-            mOffsetX = icon.getOutlineOffsetX();
-            mOffsetY = icon.getOutlineOffsetY();
-            mIconRadius = icon.mNormalizedIconRadius;
+            mIcon = icon;
             mOutlinePaint.setStyle(Paint.Style.FILL);
             mOutlinePaint.setColor(Color.argb(24, 245, 245, 245));
         }
@@ -248,7 +244,8 @@ public class PredictedAppIcon extends DoubleShadowBubbleTextView {
          */
         @Override
         public void drawUnderItem(Canvas canvas) {
-            getShape().drawShape(canvas, mOffsetX, mOffsetY, mIconRadius, mOutlinePaint);
+            getShape().drawShape(canvas, mIcon.getOutlineOffsetX(), mIcon.getOutlineOffsetY(),
+                    mIcon.mNormalizedIconRadius, mOutlinePaint);
         }
 
         /**
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
index 69b8aca3ef..473fe2d989 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
@@ -18,6 +18,7 @@ package com.android.launcher3.uioverrides.states;
 import static android.view.View.VISIBLE;
 
 import static com.android.launcher3.LauncherState.HINT_STATE;
+import static com.android.launcher3.LauncherState.HOTSEAT_ICONS;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.WorkspaceStateTransitionAnimation.getSpringScaleAnimator;
@@ -32,6 +33,7 @@ import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
 import static com.android.launcher3.anim.Interpolators.clampToProgress;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_DEPTH;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X;
@@ -48,7 +50,6 @@ import android.view.View;
 
 import com.android.launcher3.CellLayout;
 import com.android.launcher3.Hotseat;
-import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.Workspace;
 import com.android.launcher3.allapps.AllAppsContainerView;
@@ -62,7 +63,7 @@ import com.android.quickstep.views.RecentsView;
  * Animation factory for quickstep specific transitions
  */
 public class QuickstepAtomicAnimationFactory extends
-        RecentsAtomicAnimationFactory<Launcher, LauncherState> {
+        RecentsAtomicAnimationFactory<QuickstepLauncher, LauncherState> {
 
     // Scale recents takes before animating in
     private static final float RECENTS_PREPARE_SCALE = 1.33f;
@@ -149,6 +150,17 @@ public class QuickstepAtomicAnimationFactory extends
                 mHintToNormalDuration = (int) va.getDuration();
             }
             config.duration = Math.max(config.duration, mHintToNormalDuration);
+        } else if (mActivity.getTaskbarController() != null)  {
+            boolean wasHotseatVisible = fromState.areElementsVisible(mActivity, HOTSEAT_ICONS);
+            boolean isHotseatVisible = toState.areElementsVisible(mActivity, HOTSEAT_ICONS);
+            if (wasHotseatVisible || isHotseatVisible) {
+                config.setInterpolator(ANIM_TASKBAR_FADE, INSTANT);
+                config.setInterpolator(ANIM_HOTSEAT_FADE, INSTANT);
+
+                if (isHotseatVisible) {
+                    mActivity.getTaskbarController().alignRealHotseatWithTaskbar();
+                }
+            }
         }
     }
 }
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 7beea74c0c..f2dd60e5fc 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -641,7 +641,8 @@ public class DeviceProfile {
                 padding.right = hotseatBarSizePx;
             }
         } else {
-            int paddingBottom = hotseatBarSizePx + workspacePageIndicatorHeight
+            int hotseatTop = isTaskbarPresent ? taskbarSize : hotseatBarSizePx;
+            int paddingBottom = hotseatTop + workspacePageIndicatorHeight
                     + workspaceBottomPadding - mWorkspacePageIndicatorOverlapWorkspace;
             if (isTablet) {
                 // Pad the left and right of the workspace to ensure consistent spacing
@@ -651,9 +652,10 @@ public class DeviceProfile {
                         ((inv.numColumns - 1) * cellWidthPx)));
                 availablePaddingX = (int) Math.min(availablePaddingX,
                         widthPx * MAX_HORIZONTAL_PADDING_PERCENT);
+                int hotseatVerticalPadding = isTaskbarPresent ? 0
+                        : hotseatBarTopPaddingPx + hotseatBarBottomPaddingPx;
                 int availablePaddingY = Math.max(0, heightPx - edgeMarginPx - paddingBottom
-                        - (2 * inv.numRows * cellHeightPx) - hotseatBarTopPaddingPx
-                        - hotseatBarBottomPaddingPx);
+                        - (2 * inv.numRows * cellHeightPx) - hotseatVerticalPadding);
                 padding.set(availablePaddingX / 2, edgeMarginPx + availablePaddingY / 2,
                         availablePaddingX / 2, paddingBottom + availablePaddingY / 2);
             } else {
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index 4f4f2a75dd..ebaacb67d0 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -98,14 +98,20 @@ public class Hotseat extends CellLayout implements Insettable {
         } else {
             lp.gravity = Gravity.BOTTOM;
             lp.width = ViewGroup.LayoutParams.MATCH_PARENT;
-            lp.height = grid.hotseatBarSizePx + insets.bottom;
+            lp.height = grid.isTaskbarPresent
+                    ? grid.taskbarSize
+                    : grid.hotseatBarSizePx + insets.bottom;
         }
-        Rect padding = grid.getHotseatLayoutPadding();
-        int paddingBottom = padding.bottom;
-        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && !grid.isVerticalBarLayout()) {
-            paddingBottom -= grid.hotseatBarBottomPaddingPx;
+        if (!grid.isTaskbarPresent) {
+            // When taskbar is present, we set the padding separately to ensure a seamless visual
+            // handoff between taskbar and hotseat during drag and drop.
+            Rect padding = grid.getHotseatLayoutPadding();
+            int paddingBottom = padding.bottom;
+            if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && !grid.isVerticalBarLayout()) {
+                paddingBottom -= grid.hotseatBarBottomPaddingPx;
+            }
+            setPadding(padding.left, padding.top, padding.right, paddingBottom);
         }
-        setPadding(padding.left, padding.top, padding.right, paddingBottom);
 
         setLayoutParams(lp);
         InsettableFrameLayout.dispatchInsets(this, insets);
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java
index 781f171698..21c40efe30 100644
--- a/src/com/android/launcher3/LauncherState.java
+++ b/src/com/android/launcher3/LauncherState.java
@@ -59,6 +59,7 @@ public abstract class LauncherState implements BaseState<LauncherState> {
     public static final int OVERVIEW_ACTIONS = 1 << 6;
     public static final int TASKBAR = 1 << 7;
     public static final int CLEAR_ALL_BUTTON = 1 << 8;
+    public static final int WORKSPACE_PAGE_INDICATOR = 1 << 9;
 
     /** Mask of all the items that are contained in the apps view. */
     public static final int APPS_VIEW_ITEM_MASK =
@@ -188,14 +189,25 @@ public abstract class LauncherState implements BaseState<LauncherState> {
     }
 
     public int getVisibleElements(Launcher launcher) {
-        int flags = HOTSEAT_ICONS | VERTICAL_SWIPE_INDICATOR | TASKBAR;
-        if (!FeatureFlags.ENABLE_DEVICE_SEARCH.get()
-                && !launcher.getDeviceProfile().isVerticalBarLayout()) {
+        DeviceProfile deviceProfile = launcher.getDeviceProfile();
+        int flags = WORKSPACE_PAGE_INDICATOR | VERTICAL_SWIPE_INDICATOR | TASKBAR;
+        if (!FeatureFlags.ENABLE_DEVICE_SEARCH.get() && !deviceProfile.isVerticalBarLayout()) {
             flags |= HOTSEAT_SEARCH_BOX;
         }
+        if (!deviceProfile.isTaskbarPresent) {
+            flags |= HOTSEAT_ICONS;
+        }
         return flags;
     }
 
+    /**
+     * A shorthand for checking getVisibleElements() & elements == elements.
+     * @return Whether all of the given elements are visible.
+     */
+    public boolean areElementsVisible(Launcher launcher, int elements) {
+        return (getVisibleElements(launcher) & elements) == elements;
+    }
+
     /**
      * Fraction shift in the vertical translation UI and related properties
      *
diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
index 0e0ddfb834..660eeabbdc 100644
--- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
+++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
@@ -28,11 +28,13 @@ import static com.android.launcher3.LauncherState.FLAG_WORKSPACE_HAS_BACKGROUNDS
 import static com.android.launcher3.LauncherState.HINT_STATE;
 import static com.android.launcher3.LauncherState.HOTSEAT_ICONS;
 import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.LauncherState.WORKSPACE_PAGE_INDICATOR;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.Interpolators.ZOOM_OUT;
 import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
 import static com.android.launcher3.graphics.Scrim.SCRIM_PROGRESS;
 import static com.android.launcher3.graphics.SysUiScrim.SYSUI_PROGRESS;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_TRANSLATE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_FADE;
@@ -141,9 +143,11 @@ public class WorkspaceStateTransitionAnimation {
             }
 
             float hotseatIconsAlpha = (elements & HOTSEAT_ICONS) != 0 ? 1 : 0;
-            propertySetter.setViewAlpha(hotseat, hotseatIconsAlpha, fadeInterpolator);
+            propertySetter.setViewAlpha(hotseat, hotseatIconsAlpha,
+                    config.getInterpolator(ANIM_HOTSEAT_FADE, fadeInterpolator));
+            float workspacePageIndicatorAlpha = (elements & WORKSPACE_PAGE_INDICATOR) != 0 ? 1 : 0;
             propertySetter.setViewAlpha(mLauncher.getWorkspace().getPageIndicator(),
-                    hotseatIconsAlpha, fadeInterpolator);
+                    workspacePageIndicatorAlpha, fadeInterpolator);
         }
 
         if (config.onlyPlayAtomicComponent()) {
diff --git a/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java b/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java
index 408796f8c7..6189dc9557 100644
--- a/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java
+++ b/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java
@@ -268,7 +268,9 @@ public class WorkspacePageIndicator extends View implements Insettable, PageIndi
         } else {
             lp.leftMargin = lp.rightMargin = 0;
             lp.gravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM;
-            lp.bottomMargin = grid.hotseatBarSizePx + insets.bottom;
+            lp.bottomMargin = grid.isTaskbarPresent
+                    ? grid.workspacePadding.bottom + insets.bottom
+                    : grid.hotseatBarSizePx + insets.bottom;
         }
         setLayoutParams(lp);
     }
diff --git a/src/com/android/launcher3/states/SpringLoadedState.java b/src/com/android/launcher3/states/SpringLoadedState.java
index 44bcc34588..fce8fffdc7 100644
--- a/src/com/android/launcher3/states/SpringLoadedState.java
+++ b/src/com/android/launcher3/states/SpringLoadedState.java
@@ -93,6 +93,6 @@ public class SpringLoadedState extends LauncherState {
 
     @Override
     public int getVisibleElements(Launcher launcher) {
-        return super.getVisibleElements(launcher) & ~TASKBAR;
+        return (super.getVisibleElements(launcher) | HOTSEAT_ICONS) & ~TASKBAR;
     }
 }
diff --git a/src/com/android/launcher3/states/StateAnimationConfig.java b/src/com/android/launcher3/states/StateAnimationConfig.java
index ec949ebffd..e4c67eee7c 100644
--- a/src/com/android/launcher3/states/StateAnimationConfig.java
+++ b/src/com/android/launcher3/states/StateAnimationConfig.java
@@ -75,6 +75,7 @@ public class StateAnimationConfig {
             ANIM_DEPTH,
             ANIM_OVERVIEW_ACTIONS_FADE,
             ANIM_TASKBAR_FADE,
+            ANIM_HOTSEAT_FADE,
     })
     @Retention(RetentionPolicy.SOURCE)
     public @interface AnimType {}
@@ -95,8 +96,9 @@ public class StateAnimationConfig {
     public static final int ANIM_DEPTH = 14;
     public static final int ANIM_OVERVIEW_ACTIONS_FADE = 15;
     public static final int ANIM_TASKBAR_FADE = 16;
+    public static final int ANIM_HOTSEAT_FADE = 17; // if not set, falls back to ANIM_WORKSPACE_FADE
 
-    private static final int ANIM_TYPES_COUNT = 17;
+    private static final int ANIM_TYPES_COUNT = 18;
 
     protected final Interpolator[] mInterpolators = new Interpolator[ANIM_TYPES_COUNT];
 
-- 
GitLab


From 13c20193eb3bf5b82970cbad6831db84a22aa9d9 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 24 Feb 2021 11:21:35 -0800
Subject: [PATCH 0599/1664] Removing old logs

Bug: 156095088
Test: Presubmit
Change-Id: I61b44fd4ee96de405482f9cf9b6a06d87a295898
---
 .../PortraitStatesTouchController.java            | 15 ---------------
 .../quickstep/LauncherActivityInterface.java      |  3 ---
 .../launcher3/statemanager/StateManager.java      |  7 -------
 .../android/launcher3/testing/TestProtocol.java   |  1 -
 .../touch/AbstractStateChangeTouchController.java |  4 ----
 5 files changed, 30 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
index c60e257105..facfb9ddd8 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
@@ -126,26 +126,11 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
 
     @Override
     protected LauncherState getTargetState(LauncherState fromState, boolean isDragTowardPositive) {
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.OVERIEW_NOT_ALLAPPS, "PortraitStatesTouchController.getTargetState");
-        }
         if (fromState == ALL_APPS && !isDragTowardPositive) {
-            if (TestProtocol.sDebugTracing) {
-                Log.d(TestProtocol.OVERIEW_NOT_ALLAPPS,
-                        "PortraitStatesTouchController.getTargetState 1");
-            }
             return NORMAL;
         } else if (fromState == OVERVIEW) {
-            if (TestProtocol.sDebugTracing) {
-                Log.d(TestProtocol.OVERIEW_NOT_ALLAPPS,
-                        "PortraitStatesTouchController.getTargetState 2");
-            }
             return isDragTowardPositive ? OVERVIEW : NORMAL;
         } else if (fromState == NORMAL && isDragTowardPositive) {
-            if (TestProtocol.sDebugTracing) {
-                Log.d(TestProtocol.OVERIEW_NOT_ALLAPPS,
-                        "PortraitStatesTouchController.getTargetState 3");
-            }
             return ALL_APPS;
         }
         return fromState;
diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
index 8b0d782913..3f3e5ada68 100644
--- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
@@ -187,9 +187,6 @@ public final class LauncherActivityInterface extends
 
     @Override
     public boolean switchToRecentsIfVisible(Runnable onCompleteCallback) {
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.OVERIEW_NOT_ALLAPPS, "switchToRecentsIfVisible");
-        }
         Launcher launcher = getVisibleLauncher();
         if (launcher == null) {
             return false;
diff --git a/src/com/android/launcher3/statemanager/StateManager.java b/src/com/android/launcher3/statemanager/StateManager.java
index beb5b684f9..a18f34062a 100644
--- a/src/com/android/launcher3/statemanager/StateManager.java
+++ b/src/com/android/launcher3/statemanager/StateManager.java
@@ -302,10 +302,6 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
     }
 
     private PendingAnimation createAnimationToNewWorkspaceInternal(final STATE_TYPE state) {
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.OVERIEW_NOT_ALLAPPS, "createAnimationToNewWorkspaceInternal: "
-                    + state);
-        }
         PendingAnimation builder = new PendingAnimation(mConfig.duration);
         if (mConfig.getAnimComponents() != 0) {
             for (StateHandler handler : getStateHandlers()) {
@@ -328,9 +324,6 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
 
             @Override
             public void onAnimationSuccess(Animator animator) {
-                if (TestProtocol.sDebugTracing) {
-                    Log.d(TestProtocol.OVERIEW_NOT_ALLAPPS, "onAnimationSuccess: " + state);
-                }
                 onStateTransitionEnd(state);
             }
         };
diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java
index 72bbc43dbe..0117311261 100644
--- a/src/com/android/launcher3/testing/TestProtocol.java
+++ b/src/com/android/launcher3/testing/TestProtocol.java
@@ -103,7 +103,6 @@ public final class TestProtocol {
     public static final String REQUEST_MOCK_SENSOR_ROTATION = "mock-sensor-rotation";
 
     public static final String PERMANENT_DIAG_TAG = "TaplTarget";
-    public static final String OVERIEW_NOT_ALLAPPS = "b/156095088";
     public static final String NO_SWIPE_TO_HOME = "b/158017601";
     public static final String WORK_PROFILE_REMOVED = "b/159671700";
     public static final String TIS_NO_EVENTS = "b/180915942";
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index b28d6f7b8f..6f1b2f967f 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -202,10 +202,6 @@ public abstract class AbstractStateChangeTouchController
 
         mFromState = newFromState;
         mToState = newToState;
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.OVERIEW_NOT_ALLAPPS, "reinitCurrentAnimation: "
-                    + newToState.ordinal + " " + getClass().getSimpleName());
-        }
 
         mStartProgress = 0;
         mPassedOverviewAtomicThreshold = false;
-- 
GitLab


From 3531778a0898bdc50d806a463783650764bf46ba Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Thu, 4 Mar 2021 13:27:44 -0600
Subject: [PATCH 0600/1664] Defer AllAppsUpdate while edu test is running

Bug: 159671700
Test: Presubmit
Change-Id: I6f1421117286225d80a1538e45fbf2592229b586
---
 .../com/android/launcher3/ui/WorkTabTest.java | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/tests/src/com/android/launcher3/ui/WorkTabTest.java b/tests/src/com/android/launcher3/ui/WorkTabTest.java
index 5e41d43d95..63220adad0 100644
--- a/tests/src/com/android/launcher3/ui/WorkTabTest.java
+++ b/tests/src/com/android/launcher3/ui/WorkTabTest.java
@@ -17,6 +17,7 @@ package com.android.launcher3.ui;
 
 import static com.android.launcher3.LauncherState.ALL_APPS;
 import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.allapps.AllAppsStore.DEFER_UPDATES_TEST;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -77,6 +78,17 @@ public class WorkTabTest extends AbstractLauncherUiTest {
         mDevice.executeShellCommand("pm remove-user " + mProfileUserId);
     }
 
+    @After
+    public void resumeAppStoreUpdate() {
+        executeOnLauncher(launcher -> {
+            if (launcher == null || launcher.getAppsView() == null) {
+                return;
+            }
+            launcher.getAppsView().getAppsStore().disableDeferUpdates(DEFER_UPDATES_TEST);
+            Log.d(TestProtocol.WORK_PROFILE_REMOVED, "resuming AppStore updates");
+        });
+    }
+
     @Test
     public void workTabExists() {
         mDevice.pressHome();
@@ -145,6 +157,12 @@ public class WorkTabTest extends AbstractLauncherUiTest {
                 "work profile status (" + mProfileUserId + ") :"
                         + launcher.getAppsView().isWorkTabVisible()));
 
+
+        executeOnLauncher(launcher -> {
+            launcher.getAppsView().getAppsStore().enableDeferUpdates(DEFER_UPDATES_TEST);
+            Log.d(TestProtocol.WORK_PROFILE_REMOVED, "Defer all apps update");
+        });
+
         AtomicInteger attempt = new AtomicInteger(0);
         // verify work edu is seen next
         waitForLauncherCondition("Launcher did not show the next edu screen", l -> {
@@ -157,7 +175,6 @@ public class WorkTabTest extends AbstractLauncherUiTest {
             if (((AllAppsPagedView) l.getAppsView().getContentView()).getCurrentPage()
                     != WORK_PAGE) {
                 Log.d(TestProtocol.WORK_PROFILE_REMOVED, "Work page not highlighted");
-                return false;
             }
             return ((TextView) workEduView.findViewById(R.id.content_text)).getText().equals(
                     l.getResources().getString(R.string.work_profile_edu_work_apps));
-- 
GitLab


From 0613af358741484d4a06724cf18ea0df1a273dbb Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 4 Mar 2021 14:18:41 -0800
Subject: [PATCH 0601/1664] Add some logging for failure to get recents

Bug: 177472267
Test: Presubmit
Change-Id: I64a01ef076a58bc3118840ff3171177f61edc3f5
---
 .../android/quickstep/RecentTasksList.java    | 32 ++++++++++++++++++-
 .../com/android/quickstep/RecentsModel.java   | 10 ++++++
 .../fallback/FallbackRecentsView.java         |  6 ++++
 .../android/quickstep/views/RecentsView.java  | 23 +++++++++++++
 .../quickstep/FallbackRecentsTest.java        | 17 ++++++++--
 .../launcher3/testing/TestProtocol.java       |  1 +
 6 files changed, 86 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/RecentTasksList.java b/quickstep/src/com/android/quickstep/RecentTasksList.java
index 1c5dc4c829..2f1538bf5a 100644
--- a/quickstep/src/com/android/quickstep/RecentTasksList.java
+++ b/quickstep/src/com/android/quickstep/RecentTasksList.java
@@ -22,10 +22,12 @@ import android.annotation.TargetApi;
 import android.app.ActivityManager;
 import android.os.Build;
 import android.os.Process;
+import android.util.Log;
 import android.util.SparseBooleanArray;
 
 import androidx.annotation.VisibleForTesting;
 
+import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.LooperExecutor;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
@@ -51,6 +53,9 @@ public class RecentTasksList extends TaskStackChangeListener {
 
     // The list change id, increments as the task list changes in the system
     private int mChangeId;
+    // Whether we are currently updating the tasks in the background (up to when the result is
+    // posted back on the main thread)
+    private boolean mLoadingTasksInBackground;
 
     private TaskLoadResult mResultsBg = INVALID_RESULT;
     private TaskLoadResult mResultsUi = INVALID_RESULT;
@@ -64,6 +69,11 @@ public class RecentTasksList extends TaskStackChangeListener {
         mActivityManagerWrapper.registerTaskStackListener(this);
     }
 
+    @VisibleForTesting
+    public boolean isLoadingTasksInBackground() {
+        return mLoadingTasksInBackground;
+    }
+
     /**
      * Fetches the task keys skipping any local cache.
      */
@@ -83,6 +93,10 @@ public class RecentTasksList extends TaskStackChangeListener {
      * @return The change id of the current task list
      */
     public synchronized int getTasks(boolean loadKeysOnly, Consumer<ArrayList<Task>> callback) {
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.GET_RECENTS_FAILED, "getTasks: keysOnly=" + loadKeysOnly
+                    + " callback=" + callback);
+        }
         final int requestLoadId = mChangeId;
         if (mResultsUi.isValidForRequest(requestLoadId, loadKeysOnly)) {
             // The list is up to date, send the callback on the next frame,
@@ -90,22 +104,38 @@ public class RecentTasksList extends TaskStackChangeListener {
             if (callback != null) {
                 // Copy synchronously as the changeId might change by next frame
                 ArrayList<Task> result = copyOf(mResultsUi);
-                mMainThreadExecutor.post(() -> callback.accept(result));
+                mMainThreadExecutor.post(() -> {
+                    if (TestProtocol.sDebugTracing) {
+                        Log.d(TestProtocol.GET_RECENTS_FAILED, "getTasks: no new tasks");
+                    }
+                    callback.accept(result);
+                });
             }
 
             return requestLoadId;
         }
 
         // Kick off task loading in the background
+        mLoadingTasksInBackground = true;
         UI_HELPER_EXECUTOR.execute(() -> {
+            if (TestProtocol.sDebugTracing) {
+                Log.d(TestProtocol.GET_RECENTS_FAILED, "getTasks: loading in bg start");
+            }
             if (!mResultsBg.isValidForRequest(requestLoadId, loadKeysOnly)) {
                 mResultsBg = loadTasksInBackground(Integer.MAX_VALUE, requestLoadId, loadKeysOnly);
             }
+            if (TestProtocol.sDebugTracing) {
+                Log.d(TestProtocol.GET_RECENTS_FAILED, "getTasks: loading in bg end");
+            }
             TaskLoadResult loadResult = mResultsBg;
             mMainThreadExecutor.execute(() -> {
+                mLoadingTasksInBackground = false;
                 mResultsUi = loadResult;
                 if (callback != null) {
                     ArrayList<Task> result = copyOf(mResultsUi);
+                    if (TestProtocol.sDebugTracing) {
+                        Log.d(TestProtocol.GET_RECENTS_FAILED, "getTasks: callback w/ bg results");
+                    }
                     callback.accept(result);
                 }
             });
diff --git a/quickstep/src/com/android/quickstep/RecentsModel.java b/quickstep/src/com/android/quickstep/RecentsModel.java
index d47217b770..ba24e6a6c7 100644
--- a/quickstep/src/com/android/quickstep/RecentsModel.java
+++ b/quickstep/src/com/android/quickstep/RecentsModel.java
@@ -28,6 +28,8 @@ import android.os.Build;
 import android.os.Process;
 import android.os.UserHandle;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.launcher3.icons.IconProvider;
 import com.android.launcher3.util.Executors.SimpleThreadFactory;
 import com.android.launcher3.util.MainThreadInitializedObject;
@@ -101,6 +103,14 @@ public class RecentsModel extends TaskStackChangeListener {
         return mTaskList.isTaskListValid(changeId);
     }
 
+    /**
+     * @return Whether the task list is currently updating in the background
+     */
+    @VisibleForTesting
+    public boolean isLoadingTasksInBackground() {
+        return mTaskList.isLoadingTasksInBackground();
+    }
+
     /**
      * Finds and returns the task key associated with the given task id.
      *
diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
index 8f2356c696..13f6137fb1 100644
--- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
+++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
@@ -24,9 +24,11 @@ import android.app.ActivityManager.RunningTaskInfo;
 import android.content.Context;
 import android.os.Build;
 import android.util.AttributeSet;
+import android.util.Log;
 
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.statemanager.StateManager.StateListener;
+import com.android.launcher3.testing.TestProtocol;
 import com.android.quickstep.FallbackActivityInterface;
 import com.android.quickstep.GestureState;
 import com.android.quickstep.RecentsActivity;
@@ -120,6 +122,10 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity>
         // as well. This tile is never shown as we have setCurrentTaskHidden, but allows use to
         // track the index of the next task appropriately, as if we are switching on any other app.
         if (mHomeTaskInfo != null && mHomeTaskInfo.taskId == mRunningTaskId && !tasks.isEmpty()) {
+            if (TestProtocol.sDebugTracing) {
+                Log.d(TestProtocol.GET_RECENTS_FAILED,
+                        "FallbackRecentsView.applyLoadPlan: running task is home");
+            }
             // Check if the task list has running task
             boolean found = false;
             for (Task t : tasks) {
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 78910ceddd..f5c1b87264 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -72,6 +72,7 @@ import android.text.StaticLayout;
 import android.text.TextPaint;
 import android.util.AttributeSet;
 import android.util.FloatProperty;
+import android.util.Log;
 import android.util.SparseBooleanArray;
 import android.view.HapticFeedbackConstants;
 import android.view.KeyEvent;
@@ -104,6 +105,7 @@ import com.android.launcher3.compat.AccessibilityManagerCompat;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.StatefulActivity;
+import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.touch.PagedOrientationHandler.CurveProperties;
 import com.android.launcher3.util.DynamicResource;
@@ -823,6 +825,12 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     }
 
     protected void applyLoadPlan(ArrayList<Task> tasks) {
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.GET_RECENTS_FAILED, "applyLoadPlan: taskCount=" + tasks.size());
+            for (Task t : tasks) {
+                Log.d(TestProtocol.GET_RECENTS_FAILED, "\t" + t);
+            }
+        }
         if (mPendingAnimation != null) {
             mPendingAnimation.addEndListener(success -> applyLoadPlan(tasks));
             return;
@@ -884,12 +892,21 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         resetTaskVisuals();
         onTaskStackUpdated();
         updateEnabledOverlays();
+
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.GET_RECENTS_FAILED, "applyLoadPlan: taskViewCount="
+                    + getTaskViewCount());
+        }
     }
 
     private boolean isModal() {
         return mTaskModalness > 0;
     }
 
+    public boolean isLoadingTasks() {
+        return mModel.isLoadingTasksInBackground();
+    }
+
     private void removeTasksViewsAndClearAllButton() {
         for (int i = getTaskViewCount() - 1; i >= 0; i--) {
             removeView(getTaskViewAt(i));
@@ -900,6 +917,12 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     }
 
     public int getTaskViewCount() {
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.GET_RECENTS_FAILED, "getTaskViewCount:"
+                    + " numChildren=" + getChildCount()
+                    + " start=" + mTaskViewStartIndex
+                    + " clearAll=" + indexOfChild(mClearAllButton));
+        }
         int taskViewCount = getChildCount() - mTaskViewStartIndex;
         if (indexOfChild(mClearAllButton) != -1) {
             taskViewCount--;
diff --git a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
index 2e7e6e05ed..713fd074be 100644
--- a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
+++ b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
@@ -42,6 +42,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.os.RemoteException;
+import android.util.Log;
 
 import androidx.test.filters.LargeTest;
 import androidx.test.runner.AndroidJUnit4;
@@ -55,6 +56,7 @@ import com.android.launcher3.tapl.LauncherInstrumentation;
 import com.android.launcher3.tapl.OverviewTask;
 import com.android.launcher3.tapl.TestHelpers;
 import com.android.launcher3.testcomponent.TestCommandReceiver;
+import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.Wait;
 import com.android.launcher3.util.rule.FailureWatcher;
 import com.android.quickstep.views.RecentsView;
@@ -172,9 +174,15 @@ public class FallbackRecentsTest {
 
     protected <T> T getFromRecents(Function<RecentsActivity, T> f) {
         if (!TestHelpers.isInLauncherProcess()) return null;
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.GET_RECENTS_FAILED, "getFromRecents");
+        }
         Object[] result = new Object[1];
         Wait.atMost("Failed to get from recents", () -> MAIN_EXECUTOR.submit(() -> {
             RecentsActivity activity = RecentsActivity.ACTIVITY_TRACKER.getCreatedActivity();
+            if (TestProtocol.sDebugTracing) {
+                Log.d(TestProtocol.GET_RECENTS_FAILED, "activity=" + activity);
+            }
             if (activity == null) {
                 return false;
             }
@@ -200,8 +208,13 @@ public class FallbackRecentsTest {
                 () -> mLauncher.getRecentTasks().size() >= 3, DEFAULT_ACTIVITY_TIMEOUT, mLauncher);
 
         BaseOverview overview = mLauncher.getBackground().switchToOverview();
-        executeOnRecents(recents ->
-                assertTrue("Don't have at least 3 tasks", getTaskCount(recents) >= 3));
+        executeOnRecents(recents -> {
+            if (TestProtocol.sDebugTracing) {
+                Log.d(TestProtocol.GET_RECENTS_FAILED, "isLoading=" +
+                        recents.<RecentsView>getOverviewPanel().isLoadingTasks());
+            }
+            assertTrue("Don't have at least 3 tasks", getTaskCount(recents) >= 3);
+        });
 
         // Test flinging forward and backward.
         overview.flingForward();
diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java
index 72bbc43dbe..914772dfac 100644
--- a/src/com/android/launcher3/testing/TestProtocol.java
+++ b/src/com/android/launcher3/testing/TestProtocol.java
@@ -107,4 +107,5 @@ public final class TestProtocol {
     public static final String NO_SWIPE_TO_HOME = "b/158017601";
     public static final String WORK_PROFILE_REMOVED = "b/159671700";
     public static final String TIS_NO_EVENTS = "b/180915942";
+    public static final String GET_RECENTS_FAILED = "b/177472267";
 }
-- 
GitLab


From 64edc22c8b2f4a41adb807950b7610309ef64b93 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 3 Mar 2021 17:33:28 -0800
Subject: [PATCH 0602/1664] Space out empty taskbar hotseat views when on home
 screen

This ensures the taskbar hotseat aligns with the home screen
hotseat, as the latter supports empty cells. When in apps,
the taskbar still collapses the empty cells.

Test: Turn off hotseat predictions, remove some hotseat items,
and ensure the taskbar hotseat spreads out when on home.

Bug: 179886115
Bug: 171917176
Change-Id: I6047c3c5691685edcd8b3519e0305812b1295550
---
 .../launcher3/taskbar/TaskbarController.java  | 36 +++++++++++++++++--
 .../launcher3/taskbar/TaskbarView.java        | 25 +++++++++++--
 2 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index 69ca9835cf..544bc99869 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -25,6 +25,7 @@ import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_BOTT
 import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_EXTRA_NAVIGATION_BAR;
 
 import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
 import android.app.ActivityOptions;
 import android.content.ComponentName;
 import android.graphics.PixelFormat;
@@ -84,6 +85,8 @@ public class TaskbarController {
     // Contains all loaded Hotseat items.
     private ItemInfo[] mLatestLoadedHotseatItems;
 
+    private boolean mIsAnimatingToLauncher;
+
     public TaskbarController(BaseQuickstepLauncher launcher,
             TaskbarContainerView taskbarContainerView) {
         mLauncher = launcher;
@@ -169,6 +172,14 @@ public class TaskbarController {
             public View.OnLongClickListener getItemOnLongClickListener() {
                 return mDragController::startDragOnLongClick;
             }
+
+            @Override
+            public int getEmptyHotseatViewVisibility() {
+                // When on the home screen, we want the empty hotseat views to take up their full
+                // space so that the others line up with the home screen hotseat.
+                return mLauncher.hasBeenResumed() || mIsAnimatingToLauncher
+                        ? View.INVISIBLE : View.GONE;
+            }
         };
     }
 
@@ -290,8 +301,6 @@ public class TaskbarController {
      * @param toState If known, the state we will end up in when reaching Launcher.
      */
     public Animator createAnimToLauncher(@Nullable LauncherState toState, long duration) {
-        alignRealHotseatWithTaskbar();
-
         PendingAnimation anim = new PendingAnimation(duration);
         anim.add(mTaskbarVisibilityController.createAnimToBackgroundAlpha(0, duration));
         if (toState != null) {
@@ -299,6 +308,22 @@ public class TaskbarController {
         }
         anim.addFloat(mTaskbarView, SCALE_PROPERTY, mTaskbarView.getScaleX(),
                 getTaskbarScaleOnHome(), LINEAR);
+
+        anim.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+                mIsAnimatingToLauncher = true;
+                mTaskbarView.updateHotseatItemsVisibility();
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                mIsAnimatingToLauncher = false;
+            }
+        });
+
+        anim.addOnFrameCallback(this::alignRealHotseatWithTaskbar);
+
         return anim.buildAnim();
     }
 
@@ -306,6 +331,12 @@ public class TaskbarController {
         PendingAnimation anim = new PendingAnimation(duration);
         anim.add(mTaskbarVisibilityController.createAnimToBackgroundAlpha(1, duration));
         anim.addFloat(mTaskbarView, SCALE_PROPERTY, mTaskbarView.getScaleX(), 1f, LINEAR);
+        anim.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+                mTaskbarView.updateHotseatItemsVisibility();
+            }
+        });
         return anim.buildAnim();
     }
 
@@ -447,6 +478,7 @@ public class TaskbarController {
     protected interface TaskbarViewCallbacks {
         View.OnClickListener getItemOnClickListener();
         View.OnLongClickListener getItemOnLongClickListener();
+        int getEmptyHotseatViewVisibility();
     }
 
     /**
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
index 72c792f308..ed27f2ffc6 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
@@ -182,25 +182,44 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
                     && hotseatItemInfo instanceof WorkspaceItemInfo) {
                 ((BubbleTextView) hotseatView).applyFromWorkspaceItem(
                         (WorkspaceItemInfo) hotseatItemInfo);
-                hotseatView.setVisibility(VISIBLE);
                 hotseatView.setOnClickListener(mControllerCallbacks.getItemOnClickListener());
                 hotseatView.setOnLongClickListener(
                         mControllerCallbacks.getItemOnLongClickListener());
             } else if (isFolder) {
-                hotseatView.setVisibility(VISIBLE);
                 hotseatView.setOnClickListener(mControllerCallbacks.getItemOnClickListener());
                 hotseatView.setOnLongClickListener(
                         mControllerCallbacks.getItemOnLongClickListener());
             } else {
-                hotseatView.setVisibility(GONE);
                 hotseatView.setOnClickListener(null);
                 hotseatView.setOnLongClickListener(null);
             }
+            updateHotseatItemVisibility(hotseatView);
         }
 
         updateHotseatRecentsDividerVisibility();
     }
 
+    protected void updateHotseatItemsVisibility() {
+        for (int i = mHotseatStartIndex; i <= mHotseatEndIndex; i++) {
+            updateHotseatItemVisibility(getChildAt(i));
+        }
+    }
+
+    private void updateHotseatItemVisibility(View hotseatView) {
+        if (hotseatView.getTag() != null) {
+            hotseatView.setVisibility(VISIBLE);
+        } else {
+            int oldVisibility = hotseatView.getVisibility();
+            int newVisibility = mControllerCallbacks.getEmptyHotseatViewVisibility();
+            hotseatView.setVisibility(newVisibility);
+            if (oldVisibility == GONE && newVisibility != GONE) {
+                // By default, the layout transition only runs when going to VISIBLE,
+                // but we want it to run when going to GONE to INVISIBLE as well.
+                getLayoutTransition().showChild(this, hotseatView, oldVisibility);
+            }
+        }
+    }
+
     private View addDivider(int dividerIndex) {
         View divider = inflate(R.layout.taskbar_divider);
         addView(divider, dividerIndex);
-- 
GitLab


From a0bc6d964e35a9414377e582d1702395f3f69806 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 4 Mar 2021 15:10:44 -0800
Subject: [PATCH 0603/1664] Removing some animation special casing for 2-button
 mode

This would simplify reusing the same code for 3-button mode

Test: Verified on device
Bug: 175137718
Change-Id: Ia757eec069efc251475baa6af38c690431325f66
---
 .../android/quickstep/AbsSwipeUpHandler.java  | 19 +----
 .../quickstep/SwipeUpAnimationLogic.java      |  8 +-
 .../AnimatorControllerWithResistance.java     | 74 +++++++-----------
 .../android/launcher3/anim/Interpolators.java | 78 -------------------
 4 files changed, 29 insertions(+), 150 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 615d0fe2bc..0e2f6c8bd2 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -25,6 +25,7 @@ import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAG
 import static com.android.launcher3.QuickstepAppTransitionManagerImpl.RECENTS_LAUNCH_DURATION;
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.anim.Interpolators.DEACCEL;
+import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.IGNORE;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE;
@@ -79,7 +80,6 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimationSuccessListener;
-import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.logging.StatsLogManager.StatsLogger;
@@ -918,26 +918,15 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                 isFling, isCancel);
         float endShift = endTarget.isLauncher ? 1 : 0;
         final float startShift;
-        Interpolator interpolator = DEACCEL;
         if (!isFling) {
             long expectedDuration = Math.abs(Math.round((endShift - currentShift)
                     * MAX_SWIPE_DURATION * SWIPE_DURATION_MULTIPLIER));
             duration = Math.min(MAX_SWIPE_DURATION, expectedDuration);
             startShift = currentShift;
-            interpolator = endTarget == RECENTS ? ACCEL_DEACCEL : DEACCEL;
         } else {
             startShift = Utilities.boundToRange(currentShift - velocity.y
                     * getSingleFrameMs(mContext) / mTransitionDragLength, 0, mDragLengthFactor);
             if (mTransitionDragLength > 0) {
-                if (endTarget == RECENTS && !mDeviceState.isFullyGesturalNavMode()) {
-                    Interpolators.OvershootParams overshoot = new Interpolators.OvershootParams(
-                            startShift, endShift, endShift, endVelocity,
-                            mTransitionDragLength, mContext);
-                    endShift = overshoot.end;
-                    interpolator = overshoot.interpolator;
-                    duration = Utilities.boundToRange(overshoot.duration, MIN_OVERSHOOT_DURATION,
-                            MAX_SWIPE_DURATION);
-                } else {
                     float distanceToTravel = (endShift - currentShift) * mTransitionDragLength;
 
                     // we want the page's snap velocity to approximately match the velocity at
@@ -945,13 +934,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                     // derivative of the scroll interpolator at zero, ie. 2.
                     long baseDuration = Math.round(Math.abs(distanceToTravel / velocity.y));
                     duration = Math.min(MAX_SWIPE_DURATION, 2 * baseDuration);
-
-                    if (endTarget == RECENTS) {
-                        interpolator = ACCEL_DEACCEL;
-                    }
-                }
             }
         }
+        Interpolator interpolator = endTarget == RECENTS ? OVERSHOOT_1_2 : DEACCEL;
 
         if (endTarget.isLauncher) {
             mInputConsumerProxy.enable();
diff --git a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
index ca73041ca6..f4b8b62c6d 100644
--- a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
+++ b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
@@ -94,13 +94,7 @@ public abstract class SwipeUpAnimationLogic {
         mTransitionDragLength = mGestureState.getActivityInterface().getSwipeUpDestinationAndLength(
                 dp, mContext, TEMP_RECT,
                 mTaskViewSimulator.getOrientationState().getOrientationHandler());
-
-        if (mDeviceState.isFullyGesturalNavMode()) {
-            // We can drag all the way to the top of the screen.
-            mDragLengthFactor = (float) dp.heightPx / mTransitionDragLength;
-        } else {
-            mDragLengthFactor = 1 + AnimatorControllerWithResistance.TWO_BUTTON_EXTRA_DRAG_FACTOR;
-        }
+        mDragLengthFactor = (float) dp.heightPx / mTransitionDragLength;
 
         PendingAnimation pa = new PendingAnimation(mTransitionDragLength * 2);
         mTaskViewSimulator.addAppToOverviewAnim(pa, LINEAR);
diff --git a/quickstep/src/com/android/quickstep/util/AnimatorControllerWithResistance.java b/quickstep/src/com/android/quickstep/util/AnimatorControllerWithResistance.java
index deb70e0f8b..7f94839971 100644
--- a/quickstep/src/com/android/quickstep/util/AnimatorControllerWithResistance.java
+++ b/quickstep/src/com/android/quickstep/util/AnimatorControllerWithResistance.java
@@ -17,7 +17,6 @@ package com.android.quickstep.util;
 
 import static com.android.launcher3.anim.Interpolators.DEACCEL;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
-import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
 import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
 import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION;
 
@@ -38,7 +37,6 @@ import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.quickstep.LauncherActivityInterface;
-import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.views.RecentsView;
 
 /**
@@ -49,12 +47,6 @@ import com.android.quickstep.views.RecentsView;
  */
 public class AnimatorControllerWithResistance {
 
-    /**
-     * How much farther we can drag past overview in 2-button mode, as a factor of the distance
-     * it takes to drag from an app to overview.
-     */
-    public static final float TWO_BUTTON_EXTRA_DRAG_FACTOR = 0.25f;
-
     private enum RecentsResistanceParams {
         FROM_APP(0.75f, 0.5f, 1f),
         FROM_OVERVIEW(1f, 0.75f, 0.5f);
@@ -161,12 +153,6 @@ public class AnimatorControllerWithResistance {
         LauncherActivityInterface.INSTANCE.calculateTaskSize(params.context, params.dp, startRect,
                 orientationHandler);
         long distanceToCover = startRect.bottom;
-        boolean isTwoButtonMode = SysUINavigationMode.getMode(params.context) == TWO_BUTTONS;
-        if (isTwoButtonMode) {
-            // We can only drag a small distance past overview, not to the top of the screen.
-            distanceToCover = (long)
-                    ((params.dp.heightPx - startRect.bottom) * TWO_BUTTON_EXTRA_DRAG_FACTOR);
-        }
         PendingAnimation resistAnim = params.resistAnim != null
                 ? params.resistAnim
                 : new PendingAnimation(distanceToCover * 2);
@@ -178,43 +164,35 @@ public class AnimatorControllerWithResistance {
                 / (params.dp.heightPx - startRect.bottom);
         // This is what the scale would be at the end of the drag if we didn't apply resistance.
         float endScale = params.startScale - prevScaleRate * distanceToCover;
-        final TimeInterpolator scaleInterpolator;
-        if (isTwoButtonMode) {
-            // We are bounded by the distance of the drag, so we don't need to apply resistance.
-            scaleInterpolator = LINEAR;
-        } else {
-            // Create an interpolator that resists the scale so the scale doesn't get smaller than
-            // RECENTS_SCALE_MAX_RESIST.
-            float startResist = Utilities.getProgress(params.resistanceParams.scaleStartResist,
-                    params.startScale, endScale);
-            float maxResist = Utilities.getProgress(params.resistanceParams.scaleMaxResist,
-                    params.startScale, endScale);
-            scaleInterpolator = t -> {
-                if (t < startResist) {
-                    return t;
-                }
-                float resistProgress = Utilities.getProgress(t, startResist, 1);
-                resistProgress = RECENTS_SCALE_RESIST_INTERPOLATOR.getInterpolation(resistProgress);
-                return startResist + resistProgress * (maxResist - startResist);
-            };
-        }
+        // Create an interpolator that resists the scale so the scale doesn't get smaller than
+        // RECENTS_SCALE_MAX_RESIST.
+        float startResist = Utilities.getProgress(params.resistanceParams.scaleStartResist,
+                params.startScale, endScale);
+        float maxResist = Utilities.getProgress(params.resistanceParams.scaleMaxResist,
+                params.startScale, endScale);
+        final TimeInterpolator scaleInterpolator = t -> {
+            if (t < startResist) {
+                return t;
+            }
+            float resistProgress = Utilities.getProgress(t, startResist, 1);
+            resistProgress = RECENTS_SCALE_RESIST_INTERPOLATOR.getInterpolation(resistProgress);
+            return startResist + resistProgress * (maxResist - startResist);
+        };
         resistAnim.addFloat(params.scaleTarget, params.scaleProperty, params.startScale, endScale,
                 scaleInterpolator);
 
-        if (!isTwoButtonMode) {
-            // Compute where the task view would be based on the end scale, if we didn't translate.
-            RectF endRectF = new RectF(startRect);
-            Matrix temp = new Matrix();
-            temp.setScale(params.resistanceParams.scaleMaxResist,
-                    params.resistanceParams.scaleMaxResist, pivot.x, pivot.y);
-            temp.mapRect(endRectF);
-            // Translate such that the task view touches the top of the screen when drag does.
-            float endTranslation = endRectF.top
-                    * orientationHandler.getSecondaryTranslationDirectionFactor()
-                    * params.resistanceParams.translationFactor;
-            resistAnim.addFloat(params.translationTarget, params.translationProperty,
-                    params.startTranslation, endTranslation, RECENTS_TRANSLATE_RESIST_INTERPOLATOR);
-        }
+        // Compute where the task view would be based on the end scale.
+        RectF endRectF = new RectF(startRect);
+        Matrix temp = new Matrix();
+        temp.setScale(params.resistanceParams.scaleMaxResist,
+                params.resistanceParams.scaleMaxResist, pivot.x, pivot.y);
+        temp.mapRect(endRectF);
+        // Translate such that the task view touches the top of the screen when drag does.
+        float endTranslation = endRectF.top
+                * orientationHandler.getSecondaryTranslationDirectionFactor()
+                * params.resistanceParams.translationFactor;
+        resistAnim.addFloat(params.translationTarget, params.translationProperty,
+                params.startTranslation, endTranslation, RECENTS_TRANSLATE_RESIST_INTERPOLATOR);
 
         return resistAnim;
     }
diff --git a/src/com/android/launcher3/anim/Interpolators.java b/src/com/android/launcher3/anim/Interpolators.java
index 8016b2d5b8..6b9ed09c77 100644
--- a/src/com/android/launcher3/anim/Interpolators.java
+++ b/src/com/android/launcher3/anim/Interpolators.java
@@ -16,9 +16,6 @@
 
 package com.android.launcher3.anim;
 
-import static com.android.launcher3.util.DisplayController.getSingleFrameMs;
-
-import android.content.Context;
 import android.graphics.Path;
 import android.view.animation.AccelerateDecelerateInterpolator;
 import android.view.animation.AccelerateInterpolator;
@@ -67,9 +64,6 @@ public class Interpolators {
      */
     public static final Interpolator FINAL_FRAME = t -> t < 1 ? 0 : 1;
 
-    private static final int MIN_SETTLE_DURATION = 200;
-    private static final float OVERSHOOT_FACTOR = 0.9f;
-
     static {
         Path exaggeratedEase = new Path();
         exaggeratedEase.moveTo(0, 0);
@@ -175,76 +169,4 @@ public class Interpolators {
             float upperBound) {
         return t -> Utilities.mapRange(interpolator.getInterpolation(t), lowerBound, upperBound);
     }
-
-    /**
-     * Computes parameters necessary for an overshoot effect.
-     */
-    public static class OvershootParams {
-        public Interpolator interpolator;
-        public float start;
-        public float end;
-        public long duration;
-
-        /**
-         * Given the input params, sets OvershootParams variables to be used by the caller.
-         * @param startProgress The progress from 0 to 1 that the overshoot starts from.
-         * @param overshootPastProgress The progress from 0 to 1 where we overshoot past (should
-         *        either be equal to startProgress or endProgress, depending on if we want to
-         *        overshoot immediately or only once we reach the end).
-         * @param endProgress The final progress from 0 to 1 that we will settle to.
-         * @param velocityPxPerMs The initial velocity that causes this overshoot.
-         * @param totalDistancePx The distance against which progress is calculated.
-         */
-        public OvershootParams(float startProgress, float overshootPastProgress,
-                float endProgress, float velocityPxPerMs, int totalDistancePx, Context context) {
-            velocityPxPerMs = Math.abs(velocityPxPerMs);
-            overshootPastProgress = Math.max(overshootPastProgress, startProgress);
-            start = startProgress;
-            int startPx = (int) (start * totalDistancePx);
-            // Overshoot by about half a frame.
-            float overshootBy = OVERSHOOT_FACTOR * velocityPxPerMs *
-                    getSingleFrameMs(context) / totalDistancePx / 2;
-            overshootBy = Utilities.boundToRange(overshootBy, 0.02f, 0.15f);
-            end = overshootPastProgress + overshootBy;
-            int endPx = (int) (end  * totalDistancePx);
-            int overshootDistance = endPx - startPx;
-            // Calculate deceleration necessary to reach overshoot distance.
-            // Formula: velocityFinal^2 = velocityInitial^2 + 2 * acceleration * distance
-            //          0 = v^2 + 2ad (velocityFinal == 0)
-            //          a = v^2 / -2d
-            float decelerationPxPerMs = velocityPxPerMs * velocityPxPerMs / (2 * overshootDistance);
-            // Calculate time necessary to reach peak of overshoot.
-            // Formula: acceleration = velocity / time
-            //          time = velocity / acceleration
-            duration = (long) (velocityPxPerMs / decelerationPxPerMs);
-
-            // Now that we're at the top of the overshoot, need to settle back to endProgress.
-            float settleDistance = end - endProgress;
-            int settleDistancePx = (int) (settleDistance * totalDistancePx);
-            // Calculate time necessary for the settle.
-            // Formula: distance = velocityInitial * time + 1/2 * acceleration * time^2
-            //          d = 1/2at^2 (velocityInitial = 0, since we just stopped at the top)
-            //          t = sqrt(2d/a)
-            // Above formula assumes constant acceleration. Since we use ACCEL_DEACCEL, we actually
-            // have acceleration to halfway then deceleration the rest. So the formula becomes:
-            //          t = sqrt(d/a) * 2 (half the distance for accel, half for deaccel)
-            long settleDuration = (long) Math.sqrt(settleDistancePx / decelerationPxPerMs) * 4;
-
-            settleDuration = Math.max(MIN_SETTLE_DURATION, settleDuration);
-            // How much of the animation to devote to playing the overshoot (the rest is for settle).
-            float overshootFraction = (float) duration / (duration + settleDuration);
-            duration += settleDuration;
-            // Finally, create the interpolator, composed of two interpolators: an overshoot, which
-            // reaches end > 1, and then a settle to endProgress.
-            Interpolator overshoot = Interpolators.clampToProgress(DEACCEL, 0, overshootFraction);
-            // The settle starts at 1, where 1 is the top of the overshoot, and maps to a fraction
-            // such that final progress is endProgress. For example, if we overshot to 1.1 but want
-            // to end at 1, we need to map to 1/1.1.
-            Interpolator settle = Interpolators.clampToProgress(Interpolators.mapToProgress(
-                    ACCEL_DEACCEL, 1, (endProgress - start) / (end - start)), overshootFraction, 1);
-            interpolator = t -> t <= overshootFraction
-                    ? overshoot.getInterpolation(t)
-                    : settle.getInterpolation(t);
-        }
-    }
 }
-- 
GitLab


From e2dc985f59dfcd07cf192287f2742c810aceb241 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Thu, 4 Mar 2021 22:43:50 -0800
Subject: [PATCH 0604/1664] Reset primary and secondary translation of
 mLiveTileSimulator after settling into Overview

Fixes: 181929353
Test: manual
Change-Id: I1ca36f77f0efc32803f5128eedd21b89e2b1d2b5
---
 quickstep/src/com/android/quickstep/views/RecentsView.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 78910ceddd..3e0beddffb 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -926,6 +926,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             // Since we reuse the same mLiveTileTaskViewSimulator in the RecentsView, we need
             // to reset the params after it settles in Overview from swipe up so that we don't
             // render with obsolete param values.
+            mLiveTileTaskViewSimulator.taskPrimaryTranslation.value = 0;
+            mLiveTileTaskViewSimulator.taskSecondaryTranslation.value = 0;
             mLiveTileTaskViewSimulator.fullScreenProgress.value = 0;
             mLiveTileTaskViewSimulator.recentsViewScale.value = 1;
 
-- 
GitLab


From 6f257759785ea7ec572c1100e60263d780c4a796 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Fri, 5 Mar 2021 01:05:47 -0800
Subject: [PATCH 0605/1664] Remove LiveTileOverlay

Since we place app on top during the initial swipe up, LiveTileOverlay is no longer necessary. LiveTileOverlay was used to hole punch during the initial swipe when we place app under. After the initial swipe up settles in overview, hole punching job is given to the TaskView.

Fixes: 181937887
Test: manual
Change-Id: If5293dc0143af8be9db9d2745f567c4c680010a0
---
 .../android/quickstep/AbsSwipeUpHandler.java  |  34 +---
 .../quickstep/views/LiveTileOverlay.java      | 190 ------------------
 .../android/quickstep/views/RecentsView.java  |  20 +-
 .../com/android/quickstep/views/TaskView.java |   3 -
 4 files changed, 4 insertions(+), 243 deletions(-)
 delete mode 100644 quickstep/src/com/android/quickstep/views/LiveTileOverlay.java

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 615d0fe2bc..98b940783a 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -104,7 +104,6 @@ import com.android.quickstep.util.RectFSpringAnim;
 import com.android.quickstep.util.SurfaceTransactionApplier;
 import com.android.quickstep.util.SwipePipToHomeAnimator;
 import com.android.quickstep.util.TransformParams;
-import com.android.quickstep.views.LiveTileOverlay;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
 import com.android.systemui.shared.recents.model.ThumbnailData;
@@ -353,7 +352,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
 
         mRecentsView = activity.getOverviewPanel();
         mRecentsView.setOnPageTransitionEndCallback(null);
-        addLiveTileOverlay();
 
         mStateCallback.setState(STATE_LAUNCHER_PRESENT);
         if (alreadyOnHome) {
@@ -1240,13 +1238,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
             updateSysUiFlags(Math.max(p, mCurrentShift.value));
         });
         anim.addAnimatorListener(new AnimationSuccessListener() {
-            @Override
-            public void onAnimationStart(Animator animation) {
-                if (mActivity != null) {
-                    removeLiveTileOverlay();
-                }
-            }
-
             @Override
             public void onAnimationSuccess(Animator animator) {
                 if (mRecentsView != null) {
@@ -1268,7 +1259,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
             // In the off chance that the gesture ends before Launcher is started, we should clear
             // the callback here so that it doesn't update with the wrong state
             mActivity.clearRunOnceOnStartCallback();
-            resetLauncherListenersAndOverlays();
+            resetLauncherListeners();
         }
         if (mGestureState.getEndTarget() != null && !mGestureState.isRunningAnimationToLauncher()) {
             cancelCurrentAnimation();
@@ -1351,7 +1342,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         endLauncherTransitionController();
 
         mRecentsView.onGestureAnimationEnd();
-        resetLauncherListenersAndOverlays();
+        resetLauncherListeners();
     }
 
     private void endLauncherTransitionController() {
@@ -1364,13 +1355,12 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         }
     }
 
-    private void resetLauncherListenersAndOverlays() {
+    private void resetLauncherListeners() {
         // Reset the callback for deferred activity launches
         if (!LIVE_TILE.get()) {
             mActivityInterface.setOnDeferredActivityLaunchCallback(null);
         }
         mActivity.getRootView().setOnApplyWindowInsetsListener(null);
-        removeLiveTileOverlay();
     }
 
     private void notifyTransitionCancelled() {
@@ -1594,17 +1584,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
         anim.start();
     }
 
-    private void addLiveTileOverlay() {
-        if (LiveTileOverlay.INSTANCE.attach(mActivity.getRootView().getOverlay())) {
-            mRecentsView.setLiveTileOverlayAttached(true);
-        }
-    }
-
-    private void removeLiveTileOverlay() {
-        LiveTileOverlay.INSTANCE.detach(mActivity.getRootView().getOverlay());
-        mRecentsView.setLiveTileOverlayAttached(false);
-    }
-
     private static boolean isNotInRecents(RemoteAnimationTargetCompat app) {
         return app.isNotInRecents
                 || app.activityType == ACTIVITY_TYPE_HOME;
@@ -1765,13 +1744,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
             }
             mTaskViewSimulator.apply(mTransformParams);
         }
-        if (LIVE_TILE.get() && mRecentsAnimationTargets != null) {
-            LiveTileOverlay.INSTANCE.update(
-                    mTaskViewSimulator.getCurrentRect(),
-                    mTaskViewSimulator.getCurrentCornerRadius());
-            LiveTileOverlay.INSTANCE.setRotation(
-                    mTaskViewSimulator.getOrientationState().getDisplayRotation());
-        }
         ProtoTracer.INSTANCE.get(mContext).scheduleFrameUpdate();
     }
 
diff --git a/quickstep/src/com/android/quickstep/views/LiveTileOverlay.java b/quickstep/src/com/android/quickstep/views/LiveTileOverlay.java
deleted file mode 100644
index 8210ab0ca8..0000000000
--- a/quickstep/src/com/android/quickstep/views/LiveTileOverlay.java
+++ /dev/null
@@ -1,190 +0,0 @@
-package com.android.quickstep.views;
-
-import static android.view.Surface.ROTATION_0;
-import static android.view.Surface.ROTATION_180;
-import static android.view.Surface.ROTATION_270;
-import static android.view.Surface.ROTATION_90;
-
-import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
-import static com.android.launcher3.anim.Interpolators.LINEAR;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.ObjectAnimator;
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.Paint;
-import android.graphics.PixelFormat;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.graphics.drawable.Drawable;
-import android.util.FloatProperty;
-import android.view.ViewOverlay;
-
-import com.android.launcher3.anim.Interpolators;
-import com.android.quickstep.util.RecentsOrientedState.SurfaceRotation;
-
-public class LiveTileOverlay extends Drawable {
-
-    private static final long ICON_ANIM_DURATION = 120;
-
-    private static final FloatProperty<LiveTileOverlay> PROGRESS =
-            new FloatProperty<LiveTileOverlay>("progress") {
-                @Override
-                public void setValue(LiveTileOverlay liveTileOverlay, float progress) {
-                    liveTileOverlay.setIconAnimationProgress(progress);
-                }
-
-                @Override
-                public Float get(LiveTileOverlay liveTileOverlay) {
-                    return liveTileOverlay.mIconAnimationProgress;
-                }
-            };
-
-    public static final LiveTileOverlay INSTANCE = new LiveTileOverlay();
-
-    private final Paint mPaint = new Paint();
-    private final RectF mCurrentRect = new RectF();
-    private final Rect mBoundsRect = new Rect();
-
-    private @SurfaceRotation int mRotation = ROTATION_0;
-
-    private float mCornerRadius;
-    private Drawable mIcon;
-    private Animator mIconAnimator;
-
-    private float mIconAnimationProgress = 0f;
-    private boolean mIsAttached;
-
-    private LiveTileOverlay() {
-        mPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR));
-    }
-
-    public void update(RectF currentRect, float cornerRadius) {
-        invalidateSelf();
-
-        mCurrentRect.set(currentRect);
-        mCornerRadius = cornerRadius;
-
-        mCurrentRect.roundOut(mBoundsRect);
-        setBounds(mBoundsRect);
-        invalidateSelf();
-    }
-
-    public void update(float left, float top, float right, float bottom) {
-        mCurrentRect.set(left, top, right, bottom);
-    }
-
-    public void setRotation(@SurfaceRotation int rotation) {
-        mRotation = rotation;
-    }
-
-    public void setIcon(Drawable icon) {
-        mIcon = icon;
-    }
-
-    // TODO: consider cleaning this up and drawing icon in another way. Previously we place app
-    // below launcher during the initial swipe up and render the icon in this live tile overlay.
-    // However, this resulted in a bunch of touch input issues caused by Launcher getting the input
-    // events during transition (to overview / to another app (quick switch). So now our new
-    // solution places app on top in live tile until it fully settles in Overview.
-    public void startIconAnimation() {
-        if (mIconAnimator != null) {
-            mIconAnimator.cancel();
-        }
-        // This animator must match the icon part of {@link TaskView#FOCUS_TRANSITION} animation.
-        mIconAnimator = ObjectAnimator.ofFloat(this, PROGRESS, 1);
-        mIconAnimator.setDuration(ICON_ANIM_DURATION).setInterpolator(LINEAR);
-        mIconAnimator.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                mIconAnimator = null;
-            }
-        });
-        mIconAnimator.start();
-    }
-
-    public float cancelIconAnimation() {
-        if (mIconAnimator != null) {
-            mIconAnimator.cancel();
-        }
-        return mIconAnimationProgress;
-    }
-
-    @Override
-    public void draw(Canvas canvas) {
-        canvas.drawRoundRect(mCurrentRect, mCornerRadius, mCornerRadius, mPaint);
-        if (mIcon != null && mIconAnimationProgress > 0f) {
-            canvas.save();
-            float scale = Interpolators.clampToProgress(FAST_OUT_SLOW_IN, 0f,
-                    1f).getInterpolation(mIconAnimationProgress);
-
-            int iconRadius = mIcon.getBounds().width() / 2;
-            float dx = 0;
-            float dy = 0;
-
-            switch (mRotation) {
-                case ROTATION_0:
-                    dx = mCurrentRect.centerX() - iconRadius * scale;
-                    dy = mCurrentRect.top - iconRadius * scale;
-                    break;
-                case ROTATION_90:
-                    dx = mCurrentRect.right - iconRadius * scale;
-                    dy = mCurrentRect.centerY() - iconRadius * scale;
-                    break;
-                case ROTATION_270:
-                    dx = mCurrentRect.left - iconRadius * scale;
-                    dy = mCurrentRect.centerY() - iconRadius * scale;
-                    break;
-                case ROTATION_180:
-                    dx = mCurrentRect.centerX() - iconRadius * scale;
-                    dy = mCurrentRect.bottom - iconRadius * scale;
-                    break;
-            }
-
-            int rotationDegrees = mRotation * 90;
-            if (mRotation == ROTATION_90 || mRotation == ROTATION_270) {
-                canvas.rotate(rotationDegrees, dx + iconRadius, dy + iconRadius);
-            }
-            canvas.translate(dx, dy);
-            canvas.scale(scale, scale);
-            mIcon.draw(canvas);
-            canvas.restore();
-        }
-    }
-
-    @Override
-    public void setAlpha(int i) { }
-
-    @Override
-    public void setColorFilter(ColorFilter colorFilter) { }
-
-    @Override
-    public int getOpacity() {
-        return PixelFormat.TRANSLUCENT;
-    }
-
-    public boolean attach(ViewOverlay overlay) {
-        if (overlay != null && !mIsAttached) {
-            overlay.add(this);
-            mIsAttached = true;
-            return true;
-        }
-
-        return false;
-    }
-
-    public void detach(ViewOverlay overlay) {
-        if (overlay != null) {
-            overlay.remove(this);
-            mIsAttached = false;
-        }
-    }
-
-    private void setIconAnimationProgress(float progress) {
-        mIconAnimationProgress = progress;
-        invalidateSelf();
-    }
-}
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 78910ceddd..156ac471b2 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -420,7 +420,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     private boolean mShowEmptyMessage;
     private OnEmptyMessageUpdatedListener mOnEmptyMessageUpdatedListener;
     private Layout mEmptyTextLayout;
-    private boolean mLiveTileOverlayAttached;
 
     // Keeps track of the index where the first TaskView should be
     private int mTaskViewStartIndex = 0;
@@ -928,10 +927,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             // render with obsolete param values.
             mLiveTileTaskViewSimulator.fullScreenProgress.value = 0;
             mLiveTileTaskViewSimulator.recentsViewScale.value = 1;
-
-            // Reset the live tile rect
-            DeviceProfile deviceProfile = mActivity.getDeviceProfile();
-            LiveTileOverlay.INSTANCE.update(0, 0, deviceProfile.widthPx, deviceProfile.heightPx);
         }
         if (mRunningTaskTileHidden) {
             setRunningTaskHidden(mRunningTaskTileHidden);
@@ -1264,10 +1259,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
      */
     public void onSwipeUpAnimationSuccess() {
         if (getRunningTaskView() != null) {
-            float startProgress = LIVE_TILE.get() && mLiveTileOverlayAttached
-                    ? LiveTileOverlay.INSTANCE.cancelIconAnimation()
-                    : 0f;
-            animateUpRunningTaskIconScale(startProgress);
+            animateUpRunningTaskIconScale(0f);
         }
         setSwipeDownShouldLaunchApp(true);
     }
@@ -2589,16 +2581,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         }
     }
 
-    public void setLiveTileOverlayAttached(boolean liveTileOverlayAttached) {
-        mLiveTileOverlayAttached = liveTileOverlayAttached;
-    }
-
-    public void updateLiveTileIcon(Drawable icon) {
-        if (mLiveTileOverlayAttached) {
-            LiveTileOverlay.INSTANCE.setIcon(icon);
-        }
-    }
-
     public void finishRecentsAnimation(boolean toRecents, Runnable onFinishComplete) {
         if (mRecentsAnimationController == null) {
             if (onFinishComplete != null) {
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 3fb5998300..fdcb8dc4ab 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -559,9 +559,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
             mIconLoadRequest = iconCache.updateIconInBackground(mTask,
                     (task) -> {
                         setIcon(task.icon);
-                        if (LIVE_TILE.get() && isRunningTask()) {
-                            getRecentsView().updateLiveTileIcon(task.icon);
-                        }
                         mDigitalWellBeingToast.initialize(mTask);
                     });
         } else {
-- 
GitLab


From bcab2a808a4c517bc356dc284f6e18eaf8c28c72 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Fri, 26 Feb 2021 18:36:35 +0000
Subject: [PATCH 0606/1664] Add shortcuts count as a subtitle in the full
 widgets sheet

Screenshot: https://screenshot.googleplex.com/9Ds55rsFSNajLWN.png

Test: Open full widgets sheet and observe widgets and shortcuts
      counts are correctly displayed.

Bug: 180725078
Change-Id: Ibf43c14cc06c0e9bf245c53f190095d0eaeace12
---
 res/layout/widgets_list_row_header.xml        |  2 +-
 res/values/strings.xml                        | 19 ++++++++++---
 .../widget/picker/WidgetsListHeader.java      | 27 ++++++++++++++-----
 3 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/res/layout/widgets_list_row_header.xml b/res/layout/widgets_list_row_header.xml
index faff10c156..041e0073fd 100644
--- a/res/layout/widgets_list_row_header.xml
+++ b/res/layout/widgets_list_row_header.xml
@@ -52,7 +52,7 @@
             android:id="@+id/app_subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            tools:text="n widgets" />
+            tools:text="m widgets, n shortcuts" />
 
     </LinearLayout>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 73f9e533ca..44b5ee7739 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -52,11 +52,22 @@
     <string name="add_item_request_drag_hint">Touch &amp; hold to place manually</string>
     <!-- Button label to automatically add icon on home screen [CHAR_LIMIT=50] -->
     <string name="place_automatically">Add automatically</string>
-    <!-- Label for showing the number of widgets an app has in the full widgets picker. [CHAR_LIMIT=25] -->
-    <plurals name="widgets_tray_subtitle">
-        <item quantity="one"><xliff:g id="widget_count" example="1">%1$d</xliff:g> widget</item>
-        <item quantity="other"><xliff:g id="widget_count" example="2">%1$d</xliff:g> widgets</item>
+    <!-- Label for showing the number of widgets an app has in the full widgets picker.
+         [CHAR_LIMIT=25] -->
+    <plurals name="widgets_count">
+        <item quantity="one"><xliff:g id="widgets_count" example="1">%1$d</xliff:g> widget</item>
+        <item quantity="other"><xliff:g id="widgets_count" example="2">%1$d</xliff:g> widgets</item>
     </plurals>
+    <!-- Label for showing the number of shortcut an app has in the full widgets picker.
+         [CHAR_LIMIT=25] -->
+    <plurals name="shortcuts_count">
+        <item quantity="one"><xliff:g id="shortcuts_count" example="1">%1$d</xliff:g> shortcut</item>
+        <item quantity="other"><xliff:g id="shortcuts_count" example="2">%1$d</xliff:g> shortcuts</item>
+    </plurals>
+    <!-- Label for showing both the number of widgets and shortcuts an app has in the full widgets
+         picker. [CHAR_LIMIT=50] -->
+    <string name="widgets_and_shortcuts_count"><xliff:g id="widgets_count" example="5 widgets">%1$s</xliff:g>, <xliff:g id="shortcuts_count" example="1 shortcut">%2$s</xliff:g></string>
+
     <!-- Text for both the tile of a popup view, which shows all available widgets installed on
          the device, and the text of a button, which opens this popup view. [CHAR LIMIT=30]-->
     <string name="widget_button_text">Widgets</string>
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListHeader.java b/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
index 823fb7bcd2..070a9aa2c7 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
@@ -157,14 +157,29 @@ public final class WidgetsListHeader extends LinearLayout implements ItemInfoUpd
     private void setTitles(WidgetsListHeaderEntry entry) {
         mTitle.setText(entry.mPkgItem.title);
 
-        if (entry.widgetsCount > 0) {
-            Resources resources = getContext().getResources();
-            mSubtitle.setText(resources.getQuantityString(R.plurals.widgets_tray_subtitle,
-                    entry.widgetsCount, entry.widgetsCount));
-            mSubtitle.setVisibility(VISIBLE);
-        } else {
+        Resources resources = getContext().getResources();
+        if (entry.widgetsCount == 0 && entry.shortcutsCount == 0) {
             mSubtitle.setVisibility(GONE);
+            return;
+        }
+
+        String subtitle;
+        if (entry.widgetsCount > 0 && entry.shortcutsCount > 0) {
+            String widgetsCount = resources.getQuantityString(R.plurals.widgets_count,
+                    entry.widgetsCount, entry.widgetsCount);
+            String shortcutsCount = resources.getQuantityString(R.plurals.shortcuts_count,
+                    entry.shortcutsCount, entry.shortcutsCount);
+            subtitle = resources.getString(R.string.widgets_and_shortcuts_count, widgetsCount,
+                    shortcutsCount);
+        } else if (entry.widgetsCount > 0) {
+            subtitle = resources.getQuantityString(R.plurals.widgets_count,
+                     entry.widgetsCount, entry.widgetsCount);
+        } else {
+            subtitle = resources.getQuantityString(R.plurals.shortcuts_count,
+                    entry.shortcutsCount, entry.shortcutsCount);
         }
+        mSubtitle.setText(subtitle);
+        mSubtitle.setVisibility(VISIBLE);
     }
 
     @Override
-- 
GitLab


From 18d159a250f97ad31597b30b75ad86b9fb2348a0 Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pbdr@google.com>
Date: Tue, 2 Mar 2021 13:35:36 +0000
Subject: [PATCH 0607/1664] Correct Launcher3 for new sizes in App Widgets.

This follow recommendations from the API council review.

Also removes two public functions introduced recently by
http://ag/13473552 and are not needed anymore.

Bug: 181611658
Test: Manual testing with local widget.
Change-Id: I8d0c90a80a0d45981bd5d16e69cd86639d5ec7d8
---
 .../launcher3/AppWidgetResizeFrame.java       | 46 ++++++-------------
 .../launcher3/qsb/QsbContainerView.java       |  4 +-
 .../widget/LauncherAppWidgetHostView.java     | 13 ------
 .../widget/PendingAppWidgetHostView.java      |  4 +-
 .../widget/WidgetHostViewLoader.java          | 17 +++----
 5 files changed, 27 insertions(+), 57 deletions(-)

diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java
index a8132755b2..3b28d4dd26 100644
--- a/src/com/android/launcher3/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher3/AppWidgetResizeFrame.java
@@ -12,12 +12,11 @@ import android.animation.PropertyValuesHolder;
 import android.appwidget.AppWidgetHostView;
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
-import android.content.res.Configuration;
 import android.graphics.Point;
-import android.graphics.PointF;
 import android.graphics.Rect;
 import android.os.Bundle;
 import android.util.AttributeSet;
+import android.util.SizeF;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
@@ -368,7 +367,7 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
 
     public static void updateWidgetSizeRanges(AppWidgetHostView widgetView, Launcher launcher,
                                               int spanX, int spanY) {
-        List<PointF> sizes = getWidgetSizes(launcher, spanX, spanY);
+        List<SizeF> sizes = getWidgetSizes(launcher, spanX, spanY);
         if (ATLEAST_S) {
             widgetView.updateAppWidgetSize(new Bundle(), sizes);
         } else {
@@ -378,43 +377,25 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
         }
     }
 
-    private static PointF getWidgetSize(Context context, Point cellSize, int spanX, int spanY,
+    private static SizeF getWidgetSize(Context context, Point cellSize, int spanX, int spanY,
             int borderSpacing) {
         final float density = context.getResources().getDisplayMetrics().density;
         final float hBorderSpacing = (spanX - 1) * borderSpacing;
         final float vBorderSpacing = (spanY - 1) * borderSpacing;
 
-        PointF widgetSize = new PointF();
-        widgetSize.x = ((spanX * cellSize.x) + hBorderSpacing) / density;
-        widgetSize.y = ((spanY * cellSize.y) + vBorderSpacing) / density;
-        return widgetSize;
-    }
-
-    /** Returns the actual widget size given its span. */
-    public static PointF getWidgetSize(Context context, int spanX, int spanY) {
-        final Point[] cellSize = CELL_SIZE.get(context);
-        final int[] borderSpacing = BORDER_SPACING_SIZE.get(context);
-        if (isLandscape(context)) {
-            return getWidgetSize(context, cellSize[0], spanX, spanY, borderSpacing[0]);
-        }
-        return getWidgetSize(context, cellSize[1], spanX, spanY, borderSpacing[1]);
-    }
-
-    /** Returns true if the screen is in landscape mode. */
-    private static boolean isLandscape(Context context) {
-        return context.getResources().getConfiguration().orientation
-                == Configuration.ORIENTATION_LANDSCAPE;
+        return new SizeF(((spanX * cellSize.x) + hBorderSpacing) / density,
+                ((spanY * cellSize.y) + vBorderSpacing) / density);
     }
 
     /** Returns the list of sizes for a widget of given span, in dp. */
-    public static ArrayList<PointF> getWidgetSizes(Context context, int spanX, int spanY) {
+    public static ArrayList<SizeF> getWidgetSizes(Context context, int spanX, int spanY) {
         final Point[] cellSize = CELL_SIZE.get(context);
         final int[] borderSpacing = BORDER_SPACING_SIZE.get(context);
 
-        PointF landSize = getWidgetSize(context, cellSize[0], spanX, spanY, borderSpacing[0]);
-        PointF portSize = getWidgetSize(context, cellSize[1], spanX, spanY,  borderSpacing[1]);
+        SizeF landSize = getWidgetSize(context, cellSize[0], spanX, spanY, borderSpacing[0]);
+        SizeF portSize = getWidgetSize(context, cellSize[1], spanX, spanY, borderSpacing[1]);
 
-        ArrayList<PointF> sizes = new ArrayList<>(2);
+        ArrayList<SizeF> sizes = new ArrayList<>(2);
         sizes.add(landSize);
         sizes.add(portSize);
         return sizes;
@@ -430,17 +411,18 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
      * the right (resp. bottom) for the max. The returned rectangle is set with 0s if the list is
      * empty.
      */
-    public static Rect getMinMaxSizes(List<PointF> sizes, @Nullable Rect outRect) {
+    public static Rect getMinMaxSizes(List<SizeF> sizes, @Nullable Rect outRect) {
         if (outRect == null) {
             outRect = new Rect();
         }
         if (sizes.isEmpty()) {
             outRect.set(0, 0, 0, 0);
         } else {
-            PointF first = sizes.get(0);
-            outRect.set((int) first.x, (int) first.y, (int) first.x, (int) first.y);
+            SizeF first = sizes.get(0);
+            outRect.set((int) first.getWidth(), (int) first.getHeight(), (int) first.getWidth(),
+                    (int) first.getHeight());
             for (int i = 1; i < sizes.size(); i++) {
-                outRect.union((int) sizes.get(i).x, (int) sizes.get(i).y);
+                outRect.union((int) sizes.get(i).getWidth(), (int) sizes.get(i).getHeight());
             }
         }
         return outRect;
diff --git a/src/com/android/launcher3/qsb/QsbContainerView.java b/src/com/android/launcher3/qsb/QsbContainerView.java
index 459aefe2c0..a191df4b38 100644
--- a/src/com/android/launcher3/qsb/QsbContainerView.java
+++ b/src/com/android/launcher3/qsb/QsbContainerView.java
@@ -32,11 +32,11 @@ import android.appwidget.AppWidgetProviderInfo;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.PointF;
 import android.graphics.Rect;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.util.AttributeSet;
+import android.util.SizeF;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -299,7 +299,7 @@ public class QsbContainerView extends FrameLayout {
             InvariantDeviceProfile idp = LauncherAppState.getIDP(getContext());
 
             Bundle opts = new Bundle();
-            ArrayList<PointF> sizes = AppWidgetResizeFrame
+            ArrayList<SizeF> sizes = AppWidgetResizeFrame
                     .getWidgetSizes(getContext(), idp.numColumns, 1);
             Rect size = AppWidgetResizeFrame.getMinMaxSizes(sizes, null /* outRect */);
             opts.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH, size.left);
diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
index 54e51b2079..3285c187c0 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
@@ -16,12 +16,9 @@
 
 package com.android.launcher3.widget;
 
-import static com.android.launcher3.Utilities.ATLEAST_S;
-
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
 import android.content.res.Configuration;
-import android.graphics.PointF;
 import android.os.Handler;
 import android.os.SystemClock;
 import android.util.SparseBooleanArray;
@@ -218,16 +215,6 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         mIsScrollable = checkScrollableRecursively(this);
     }
 
-    @Override
-    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-        super.onSizeChanged(w, h, oldw, oldh);
-
-        if (ATLEAST_S) {
-            float density = getContext().getResources().getDisplayMetrics().density;
-            setCurrentSize(new PointF(w / density, h / density));
-        }
-    }
-
     @Override
     public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
         super.onInitializeAccessibilityNodeInfo(info);
diff --git a/src/com/android/launcher3/widget/PendingAppWidgetHostView.java b/src/com/android/launcher3/widget/PendingAppWidgetHostView.java
index 8c3206dea8..4b113d8070 100644
--- a/src/com/android/launcher3/widget/PendingAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/PendingAppWidgetHostView.java
@@ -22,7 +22,6 @@ import static com.android.launcher3.graphics.PreloadIconDrawable.newPendingIcon;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
-import android.graphics.PointF;
 import android.graphics.PorterDuff;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
@@ -30,6 +29,7 @@ import android.os.Bundle;
 import android.text.Layout;
 import android.text.StaticLayout;
 import android.text.TextPaint;
+import android.util.SizeF;
 import android.util.TypedValue;
 import android.view.ContextThemeWrapper;
 import android.view.View;
@@ -112,7 +112,7 @@ public class PendingAppWidgetHostView extends LauncherAppWidgetHostView
     }
 
     @Override
-    public void updateAppWidgetSize(Bundle newOptions, List<PointF> sizes) {
+    public void updateAppWidgetSize(Bundle newOptions, List<SizeF> sizes) {
         // No-op
     }
 
diff --git a/src/com/android/launcher3/widget/WidgetHostViewLoader.java b/src/com/android/launcher3/widget/WidgetHostViewLoader.java
index 31cbff6982..12e0d43bd1 100644
--- a/src/com/android/launcher3/widget/WidgetHostViewLoader.java
+++ b/src/com/android/launcher3/widget/WidgetHostViewLoader.java
@@ -3,11 +3,11 @@ package com.android.launcher3.widget;
 import android.appwidget.AppWidgetHostView;
 import android.appwidget.AppWidgetManager;
 import android.content.Context;
-import android.graphics.PointF;
 import android.graphics.Rect;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
+import android.util.SizeF;
 import android.view.View;
 
 import com.android.launcher3.AppWidgetResizeFrame;
@@ -19,6 +19,7 @@ import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.util.Thunk;
 
 import java.util.ArrayList;
+import java.util.stream.Collectors;
 
 public class WidgetHostViewLoader implements DragController.DragListener {
     private static final String TAG = "WidgetHostViewLoader";
@@ -154,7 +155,7 @@ public class WidgetHostViewLoader implements DragController.DragListener {
     }
 
     public static Bundle getDefaultOptionsForWidget(Context context, PendingAddWidgetInfo info) {
-        ArrayList<PointF> sizes = AppWidgetResizeFrame
+        ArrayList<SizeF> sizes = AppWidgetResizeFrame
                 .getWidgetSizes(context, info.spanX, info.spanY);
 
         Rect padding = AppWidgetHostView.getDefaultPaddingForWidget(context,
@@ -163,19 +164,19 @@ public class WidgetHostViewLoader implements DragController.DragListener {
         float xPaddingDips = (padding.left + padding.right) / density;
         float yPaddingDips = (padding.top + padding.bottom) / density;
 
-        for (PointF size : sizes) {
-            size.x = Math.max(0.f, size.x - xPaddingDips);
-            size.y = Math.max(0.f, size.y - yPaddingDips);
-        }
+        ArrayList<SizeF> paddedSizes = sizes.stream().map(
+                size -> new SizeF(Math.max(0.f, size.getWidth() - xPaddingDips),
+                        Math.max(0.f, size.getHeight() - yPaddingDips))).collect(
+                Collectors.toCollection(ArrayList::new));
 
-        Rect rect = AppWidgetResizeFrame.getMinMaxSizes(sizes, null /* outRect */);
+        Rect rect = AppWidgetResizeFrame.getMinMaxSizes(paddedSizes, null /* outRect */);
 
         Bundle options = new Bundle();
         options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH, rect.left);
         options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT, rect.top);
         options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH, rect.right);
         options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT, rect.bottom);
-        options.putParcelableArrayList(AppWidgetManager.OPTION_APPWIDGET_SIZES, sizes);
+        options.putParcelableArrayList(AppWidgetManager.OPTION_APPWIDGET_SIZES, paddedSizes);
         return options;
     }
 }
-- 
GitLab


From 7f7b2f7ee9172a2fb9af77c4ea02a6a00e47e8f9 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 3 Mar 2021 14:51:36 +0000
Subject: [PATCH 0608/1664] Fix scrolling bugs in full widgets sheet

Bugs:
1. Layout margins were not taken into account
2. Fast scroller offset has a different scale to the recycler view
3. Update padding & margin in onMeasure rather than in onLayout

TODO: fast scroller measurement doesn't take into account of
      expanded item. It naively use the same height for all items
      from the recycler view adapter.

Test: Open full widgets sheet for both work profile and non-work
      profile setup. Scrollbar initial position is correct. Scroll
      up and down to confirm views vertical translation is correct.

Video: https://drive.google.com/file/d/1kp3iSm23RVk_otBNeYalEPPkWjjWMOY0/view?usp=sharing

Bug: 181629430
Change-Id: I398a94510751782e78aa8f426f37b03ecca8ec99
---
 ...rchAndRecommendationsScrollController.java | 50 ++++++++++++++-----
 .../widget/picker/WidgetsFullSheet.java       | 27 +++++++---
 2 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java b/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java
index a5ed20a22e..95fa05f19e 100644
--- a/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java
+++ b/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java
@@ -16,10 +16,10 @@
 package com.android.launcher3.widget.picker;
 
 import android.view.View;
+import android.view.ViewGroup.MarginLayoutParams;
 import android.widget.RelativeLayout;
 
 import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.launcher3.views.RecyclerViewFastScroller;
 import com.android.launcher3.widget.picker.WidgetsFullSheet.SearchAndRecommendationViewHolder;
@@ -33,20 +33,21 @@ final class SearchAndRecommendationsScrollController implements
         RecyclerViewFastScroller.OnFastScrollChangeListener {
     private final boolean mHasWorkProfile;
     private final SearchAndRecommendationViewHolder mViewHolder;
-    private final RecyclerView mPrimaryRecyclerView;
+    private final WidgetsRecyclerView mPrimaryRecyclerView;
 
     // The following are only non null if mHasWorkProfile is true.
-    @Nullable private final RecyclerView mWorkRecyclerView;
+    @Nullable private final WidgetsRecyclerView mWorkRecyclerView;
     @Nullable private final View mPrimaryWorkTabsView;
     @Nullable private final PersonalWorkPagedView mPrimaryWorkViewPager;
 
+    private WidgetsRecyclerView mCurrentRecyclerView;
     private int mMaxCollapsibleHeight = 0;
 
     SearchAndRecommendationsScrollController(
             boolean hasWorkProfile,
             SearchAndRecommendationViewHolder viewHolder,
-            RecyclerView primaryRecyclerView,
-            @Nullable RecyclerView workRecyclerView,
+            WidgetsRecyclerView primaryRecyclerView,
+            @Nullable WidgetsRecyclerView workRecyclerView,
             @Nullable View personalWorkTabsView,
             @Nullable PersonalWorkPagedView primaryWorkViewPager) {
         mHasWorkProfile = hasWorkProfile;
@@ -55,6 +56,12 @@ final class SearchAndRecommendationsScrollController implements
         mWorkRecyclerView = workRecyclerView;
         mPrimaryWorkTabsView = personalWorkTabsView;
         mPrimaryWorkViewPager = primaryWorkViewPager;
+        mCurrentRecyclerView = mPrimaryRecyclerView;
+    }
+
+    /** Sets the current active {@link WidgetsRecyclerView}. */
+    public void setCurrentRecyclerView(WidgetsRecyclerView currentRecyclerView) {
+        mCurrentRecyclerView = currentRecyclerView;
     }
 
     /**
@@ -64,10 +71,10 @@ final class SearchAndRecommendationsScrollController implements
         // The maximum vertical distance, in pixels, until the last collapsible element is not
         // visible from the screen when the user scrolls down the recycler view.
         mMaxCollapsibleHeight = mViewHolder.mContainer.getPaddingTop()
-                + mViewHolder.mCollapseHandle.getMeasuredHeight()
-                + mViewHolder.mHeaderTitle.getMeasuredHeight();
+                + measureHeightWithVerticalMargins(mViewHolder.mCollapseHandle)
+                + measureHeightWithVerticalMargins(mViewHolder.mHeaderTitle);
 
-        int topContainerHeight = mViewHolder.mContainer.getMeasuredHeight();
+        int topContainerHeight = measureHeightWithVerticalMargins(mViewHolder.mContainer);
         if (mHasWorkProfile) {
             // In a work profile setup, the full widget sheet contains the following views:
             //           -------               -|
@@ -114,8 +121,8 @@ final class SearchAndRecommendationsScrollController implements
             //
             // When the views are first inflated, the sum of topOffsetAfterAllViewsCollapsed and
             // mMaxCollapsibleDistance should equal to the top container height.
-            int tabsViewActualHeight =
-                    mPrimaryWorkTabsView.getMeasuredHeight() - mPrimaryWorkTabsView.getPaddingTop();
+            int tabsViewActualHeight = measureHeightWithVerticalMargins(mPrimaryWorkTabsView)
+                    - mPrimaryWorkTabsView.getPaddingTop();
             int topOffsetAfterAllViewsCollapsed =
                     topContainerHeight + tabsViewActualHeight - mMaxCollapsibleHeight;
 
@@ -149,9 +156,12 @@ final class SearchAndRecommendationsScrollController implements
      * views (e.g. recycler views, tabs) upon scrolling.
      */
     @Override
-    public void onThumbOffsetYChanged(int y) {
+    public void onThumbOffsetYChanged(int unused) {
+        // Always use the recycler view offset because fast scroller offset has a different scale.
+        int recyclerViewYOffset = mCurrentRecyclerView.getCurrentScrollY();
+        if (recyclerViewYOffset < 0) return;
         if (mMaxCollapsibleHeight > 0) {
-            int yDisplacement = Math.max(-y, -mMaxCollapsibleHeight);
+            int yDisplacement = Math.max(-recyclerViewYOffset, -mMaxCollapsibleHeight);
             mViewHolder.mHeaderTitle.setTranslationY(yDisplacement);
             mViewHolder.mSearchBar.setTranslationY(yDisplacement);
             if (mHasWorkProfile) {
@@ -159,4 +169,20 @@ final class SearchAndRecommendationsScrollController implements
             }
         }
     }
+
+    /** Resets any previous view translation. */
+    public void reset() {
+        mViewHolder.mHeaderTitle.setTranslationY(0);
+        mViewHolder.mSearchBar.setTranslationY(0);
+        if (mHasWorkProfile) {
+            mPrimaryWorkTabsView.setTranslationY(0);
+        }
+    }
+
+    /** private the height, in pixel, + the vertical margins of a given view. */
+    private static int measureHeightWithVerticalMargins(View view) {
+        MarginLayoutParams marginLayoutParams = (MarginLayoutParams) view.getLayoutParams();
+        return view.getMeasuredHeight() + marginLayoutParams.bottomMargin
+                + marginLayoutParams.topMargin;
+    }
 }
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 91b79f99c3..52a2fc5ac0 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -149,7 +149,10 @@ public class WidgetsFullSheet extends BaseWidgetSheet
 
     @Override
     public void onActivePageChanged(int currentActivePage) {
-        mAdapters.get(currentActivePage).mWidgetsRecyclerView.bindFastScrollbar();
+        WidgetsRecyclerView currentRecyclerView =
+                mAdapters.get(currentActivePage).mWidgetsRecyclerView;
+        currentRecyclerView.bindFastScrollbar();
+        mSearchAndRecommendationsScrollController.setCurrentRecyclerView(currentRecyclerView);
 
         reset();
     }
@@ -159,6 +162,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         if (mHasWorkProfile) {
             mAdapters.get(AdapterHolder.WORK).mWidgetsRecyclerView.scrollToTop();
         }
+        mSearchAndRecommendationsScrollController.reset();
     }
 
     @VisibleForTesting
@@ -241,6 +245,12 @@ public class WidgetsFullSheet extends BaseWidgetSheet
             mAdapters.get(AdapterHolder.WORK).mWidgetsListAdapter.setMaxHorizontalSpansPerRow(
                     maxSpansPerRow);
         }
+
+        if (mInitialTabsHeight == 0 && mTabsView != null) {
+            mInitialTabsHeight = measureHeightWithVerticalMargins(mTabsView);
+        }
+
+        mSearchAndRecommendationsScrollController.updateMarginAndPadding();
     }
 
     @Override
@@ -255,12 +265,6 @@ public class WidgetsFullSheet extends BaseWidgetSheet
                 contentLeft + contentWidth, height);
 
         setTranslationShift(mTranslationShift);
-
-        if (mInitialTabsHeight == 0 && mTabsView != null) {
-            mInitialTabsHeight = mTabsView.getMeasuredHeight();
-        }
-
-        mSearchAndRecommendationsScrollController.updateMarginAndPadding();
     }
 
     @Override
@@ -371,7 +375,14 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         // No need to check work profile here because mInitialTabHeight is always 0 if there is no
         // work profile.
         return mInitialTabsHeight
-                + mSearchAndRecommendationViewHolder.mContainer.getMeasuredHeight();
+                + measureHeightWithVerticalMargins(mSearchAndRecommendationViewHolder.mContainer);
+    }
+
+    /** private the height, in pixel, + the vertical margins of a given view. */
+    private static int measureHeightWithVerticalMargins(View view) {
+        MarginLayoutParams marginLayoutParams = (MarginLayoutParams) view.getLayoutParams();
+        return view.getMeasuredHeight() + marginLayoutParams.bottomMargin
+                + marginLayoutParams.topMargin;
     }
 
     /** A holder class for holding adapters & their corresponding recycler view. */
-- 
GitLab


From 77c1673e64e68d7efad0b87efa3655d7c7b173a9 Mon Sep 17 00:00:00 2001
From: wilsonshih <wilsonshih@google.com>
Date: Thu, 17 Dec 2020 18:18:02 +0800
Subject: [PATCH 0609/1664] Let Launcher able to receive task launching
 callback(4/N)

Ref doc: go/starting_window_android_s
Test: build/flash
Bug: 131311659
Bug: 131727939
Bug: 152480470

Change-Id: I4354ef33fe60c6026ab7f5e47fa024011e637359
---
 .../src/com/android/quickstep/SystemUiProxy.java  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index 357aef16f7..5668817da8 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -37,6 +37,7 @@ import android.view.MotionEvent;
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.systemui.shared.recents.IPinnedStackAnimationListener;
 import com.android.systemui.shared.recents.ISplitScreenListener;
+import com.android.systemui.shared.recents.IStartingWindowListener;
 import com.android.systemui.shared.recents.ISystemUiProxy;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.system.RemoteTransitionCompat;
@@ -538,4 +539,18 @@ public class SystemUiProxy implements ISystemUiProxy {
             }
         }
     }
+
+    /**
+     * Sets listener to get callbacks when launching a task.
+     */
+    @Override
+    public void setStartingWindowListener(IStartingWindowListener listener) {
+        if (mSystemUiProxy != null) {
+            try {
+                mSystemUiProxy.setStartingWindowListener(listener);
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call setStartingWindowListener", e);
+            }
+        }
+    }
 }
-- 
GitLab


From 718d0c3e2fc3823786e80820be49a643d7ec9df0 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Fri, 5 Mar 2021 16:54:35 +0000
Subject: [PATCH 0610/1664] Animate task from overview grid when launching

Bug: 174464863
Test: Manually launching from different grid positions
Change-Id: Iafb03b86c6b85fb0ebabc0f2ba98acf89d7ea971
---
 .../src/com/android/quickstep/TaskViewUtils.java |  4 ++++
 .../quickstep/util/TaskViewSimulator.java        |  7 ++++---
 .../com/android/quickstep/views/RecentsView.java | 16 +++++++++++++++-
 .../com/android/quickstep/views/TaskView.java    |  8 ++++++++
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java
index 39751c0d71..17822e6f0c 100644
--- a/quickstep/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java
@@ -180,6 +180,7 @@ public final class TaskViewUtils {
         boolean parallaxCenterAndAdjacentTask =
                 taskIndex != recentsView.getCurrentPage() && !(dp.isTablet
                         && FeatureFlags.ENABLE_OVERVIEW_GRID.get());
+        float gridTranslationSecondary = recentsView.getGridTranslationSecondary(taskIndex);
         int startScroll = recentsView.getScrollOffset(taskIndex);
 
         TaskViewSimulator topMostSimulator = null;
@@ -196,6 +197,8 @@ public final class TaskViewUtils {
             tsv.setPreview(targets.apps[targets.apps.length - 1]);
             tsv.fullScreenProgress.value = 0;
             tsv.recentsViewScale.value = 1;
+            tsv.gridProgress.value = 1;
+            tsv.gridTranslationSecondary.value = gridTranslationSecondary;
             tsv.setScroll(startScroll);
 
             // Fade in the task during the initial 20% of the animation
@@ -208,6 +211,7 @@ public final class TaskViewUtils {
                     AnimatedFloat.VALUE, 1, TOUCH_RESPONSE_INTERPOLATOR);
             out.setFloat(tsv.recentsViewScale,
                     AnimatedFloat.VALUE, tsv.getFullScreenScale(), TOUCH_RESPONSE_INTERPOLATOR);
+            out.setFloat(tsv.gridProgress, AnimatedFloat.VALUE, 0, TOUCH_RESPONSE_INTERPOLATOR);
             out.setInt(tsv, TaskViewSimulator.SCROLL, 0, TOUCH_RESPONSE_INTERPOLATOR);
 
             TaskViewSimulator finalTsv = tsv;
diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index 584a284381..9537247295 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -16,7 +16,6 @@
 package com.android.quickstep.util;
 
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
-import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.states.RotationHelper.deltaRotation;
 import static com.android.launcher3.touch.PagedOrientationHandler.MATRIX_POST_TRANSLATE;
 import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
@@ -98,6 +97,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
     private final FullscreenDrawParams mCurrentFullscreenParams;
     public final AnimatedFloat taskPrimaryTranslation = new AnimatedFloat();
     public final AnimatedFloat taskSecondaryTranslation = new AnimatedFloat();
+    public final AnimatedFloat gridTranslationSecondary = new AnimatedFloat();
 
     // RecentsView properties
     public final AnimatedFloat recentsViewScale = new AnimatedFloat();
@@ -317,9 +317,10 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
         mMatrix.postScale(scale, scale, mIsRecentsRtl ? 0 : taskWidth, 0);
         float taskWidthDiff = taskWidth * (1 - gridScale);
         float taskWidthOffset = mIsRecentsRtl ? taskWidthDiff : -taskWidthDiff;
-        float translationPrimary = Utilities.mapRange(interpolatedGridProgress, 0, taskWidthOffset);
         mOrientationState.getOrientationHandler().set(mMatrix, MATRIX_POST_TRANSLATE,
-                translationPrimary);
+                Utilities.mapRange(interpolatedGridProgress, 0, taskWidthOffset));
+        mOrientationState.getOrientationHandler().setSecondary(mMatrix, MATRIX_POST_TRANSLATE,
+                Utilities.mapRange(interpolatedGridProgress, 0, gridTranslationSecondary.value));
 
         // Apply TaskView matrix: translate, scroll
         mMatrix.postTranslate(mTaskRect.left, mTaskRect.top);
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 78910ceddd..db482acebb 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2729,7 +2729,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     }
 
     /**
-     * @return How many pixels the page is offset on the currently laid out dominant axis.
+     * Returns how many pixels the page is offset on the currently laid out dominant axis.
      */
     public int getScrollOffset(int pageIndex) {
         if (pageIndex == -1) {
@@ -2745,6 +2745,20 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         return getScrollForPage(pageIndex) - scroll;
     }
 
+    /**
+     * Returns how many pixels the task is offset on the currently laid out secondary axis
+     * according to {@link #mGridProgress}.
+     */
+    public float getGridTranslationSecondary(int pageIndex) {
+        TaskView taskView = getTaskViewAtByAbsoluteIndex(pageIndex);
+        if (taskView == null) {
+            return 0;
+        }
+
+        return mOrientationHandler.getSecondaryValue(taskView.getGridTranslationX(),
+                taskView.getGridTranslationY());
+    }
+
     public Consumer<MotionEvent> getEventDispatcher(float navbarRotation) {
         float degreesRotated;
         if (navbarRotation == 0) {
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 3fb5998300..49f5a7a810 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -919,11 +919,19 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         applyTranslationX();
     }
 
+    public float getGridTranslationX() {
+        return mGridTranslationX;
+    }
+
     public void setGridTranslationY(float gridTranslationY) {
         mGridTranslationY = gridTranslationY;
         applyTranslationY();
     }
 
+    public float getGridTranslationY() {
+        return mGridTranslationY;
+    }
+
     public void setGridOffsetTranslationX(float gridOffsetTranslationX) {
         mGridOffsetTranslationX = gridOffsetTranslationX;
         applyTranslationX();
-- 
GitLab


From 6643088959a547feca4d343a3268effae68386d5 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 5 Mar 2021 09:58:44 -0800
Subject: [PATCH 0611/1664] Nullify taskbar hotseatView tag when the cell is
 empty

This ensures that a removed view becomes invisible.

Test: turn off hotseat suggestions, drag an item out
and verify it's removed from taskbar as well
Bug: 179886115
Bug: 171917176

Change-Id: Iec509c2f0c420cee6f86feb293419bb2249a8dc4
---
 quickstep/src/com/android/launcher3/taskbar/TaskbarView.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
index ed27f2ffc6..a729e7799f 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
@@ -192,6 +192,7 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
             } else {
                 hotseatView.setOnClickListener(null);
                 hotseatView.setOnLongClickListener(null);
+                hotseatView.setTag(null);
             }
             updateHotseatItemVisibility(hotseatView);
         }
-- 
GitLab


From 46b0d8e29193206ca24a0589d01932294ee8478a Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 3 Mar 2021 18:23:01 +0000
Subject: [PATCH 0612/1664] Inflate layout preview for work profile

Also fix a bug which LivePreviewCells are not used in full widgets
sheet.

Test: Temporarily replace the previewLayout with initialLayout
      from the code. Then, open both the full and bottom widgets
      sheet. Observe initial layout is rendered correctly for both
      personal and work profile.

Screenshot: https://screenshot.googleplex.com/BgJycVjzeoU3PNf.png

Bug: 181061277
Change-Id: Id635ee778008b6f94009f50bf4373d3b0f545417
---
 .../dragndrop/LivePreviewWidgetCell.java      | 58 ++++++++++++++-----
 .../android/launcher3/widget/WidgetCell.java  |  4 +-
 .../WidgetsListTableViewHolderBinder.java     |  2 +-
 3 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/src/com/android/launcher3/dragndrop/LivePreviewWidgetCell.java b/src/com/android/launcher3/dragndrop/LivePreviewWidgetCell.java
index fa062f572e..826ddb0b4e 100644
--- a/src/com/android/launcher3/dragndrop/LivePreviewWidgetCell.java
+++ b/src/com/android/launcher3/dragndrop/LivePreviewWidgetCell.java
@@ -2,6 +2,7 @@ package com.android.launcher3.dragndrop;
 
 import static com.android.launcher3.Utilities.ATLEAST_S;
 
+import android.appwidget.AppWidgetHostView;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
@@ -25,6 +26,8 @@ public class LivePreviewWidgetCell extends WidgetCell {
 
     private RemoteViews mPreview;
 
+    private AppWidgetHostView mPreviewAppWidgetHostView;
+
     public LivePreviewWidgetCell(Context context) {
         this(context, null);
     }
@@ -46,8 +49,11 @@ public class LivePreviewWidgetCell extends WidgetCell {
     }
 
     /** Resets any resource. This should be called before recycling this view. */
-    public void reset() {
+    @Override
+    public void clear() {
+        super.clear();
         mPreview = null;
+        mPreviewAppWidgetHostView = null;
     }
 
     @Override
@@ -60,6 +66,15 @@ public class LivePreviewWidgetCell extends WidgetCell {
                 return;
             }
         }
+
+        if (mPreviewAppWidgetHostView != null) {
+            Bitmap preview = generateFromView(mActivity, mPreviewAppWidgetHostView,
+                    mItem.widgetInfo, mPreviewWidth, new int[1]);
+            if (preview != null) {
+                applyPreview(preview);
+                return;
+            }
+        }
         super.ensurePreview();
     }
 
@@ -69,8 +84,19 @@ public class LivePreviewWidgetCell extends WidgetCell {
                 && mPreview == null
                 && item.widgetInfo != null
                 && item.widgetInfo.previewLayout != Resources.ID_NULL) {
-            mPreview = new RemoteViews(item.widgetInfo.provider.getPackageName(),
-                    item.widgetInfo.previewLayout);
+            mPreviewAppWidgetHostView = new AppWidgetHostView(getContext());
+            LauncherAppWidgetProviderInfo launcherAppWidgetProviderInfo =
+                    LauncherAppWidgetProviderInfo.fromProviderInfo(getContext(),
+                            item.widgetInfo.clone());
+            // A hack to force the initial layout to be the preview layout since there is no API for
+            // rendering a preview layout for work profile apps yet. For non-work profile layout, a
+            // proper solution is to use RemoteViews(PackageName, LayoutId).
+            launcherAppWidgetProviderInfo.initialLayout = item.widgetInfo.previewLayout;
+            mPreviewAppWidgetHostView.setAppWidget(/* appWidgetId= */ -1,
+                    launcherAppWidgetProviderInfo);
+            mPreviewAppWidgetHostView.setPadding(/* left= */ 0, /* top= */0, /* right= */
+                    0, /* bottom= */ 0);
+            mPreviewAppWidgetHostView.updateAppWidget(/* remoteViews= */ null);
         }
 
         super.applyFromCellItem(item, loader);
@@ -84,23 +110,27 @@ public class LivePreviewWidgetCell extends WidgetCell {
      */
     public static Bitmap generateFromRemoteViews(BaseActivity activity, RemoteViews views,
             LauncherAppWidgetProviderInfo info, int previewSize, int[] preScaledWidthOut) {
+        try {
+            return generateFromView(activity, views.apply(activity, new FrameLayout(activity)),
+                    info, previewSize, preScaledWidthOut);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    private static Bitmap generateFromView(BaseActivity activity, View v,
+            LauncherAppWidgetProviderInfo info, int previewSize, int[] preScaledWidthOut) {
 
         DeviceProfile dp = activity.getDeviceProfile();
         int viewWidth = dp.cellWidthPx * info.spanX;
         int viewHeight = dp.cellHeightPx * info.spanY;
 
-        final View v;
-        try {
-            v = views.apply(activity, new FrameLayout(activity));
-            v.measure(MeasureSpec.makeMeasureSpec(viewWidth, MeasureSpec.EXACTLY),
-                    MeasureSpec.makeMeasureSpec(viewHeight, MeasureSpec.EXACTLY));
+        v.measure(MeasureSpec.makeMeasureSpec(viewWidth, MeasureSpec.EXACTLY),
+                MeasureSpec.makeMeasureSpec(viewHeight, MeasureSpec.EXACTLY));
 
-            viewWidth = v.getMeasuredWidth();
-            viewHeight = v.getMeasuredHeight();
-            v.layout(0, 0, viewWidth, viewHeight);
-        } catch (Exception e) {
-            return null;
-        }
+        viewWidth = v.getMeasuredWidth();
+        viewHeight = v.getMeasuredHeight();
+        v.layout(0, 0, viewWidth, viewHeight);
 
         preScaledWidthOut[0] = viewWidth;
         final int bitmapWidth, bitmapHeight;
diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index 8c315fd604..ea6f0c35c1 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -61,8 +61,8 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     /** Widget preview width is calculated by multiplying this factor to the widget cell width. */
     private static final float PREVIEW_SCALE = 0.8f;
 
-    private int mPreviewWidth;
-    private int mPreviewHeight;
+    protected int mPreviewWidth;
+    protected int mPreviewHeight;
     protected int mPresetPreviewSize;
     private int mCellSize;
 
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java b/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
index 9c8684a0bc..28ffd5473a 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
@@ -153,7 +153,7 @@ public final class WidgetsListTableViewHolderBinder
             } else {
                 for (int j = tableRow.getChildCount(); j < widgetItems.size(); j++) {
                     WidgetCell widget = (WidgetCell) mLayoutInflater.inflate(
-                            R.layout.widget_cell, tableRow, false);
+                            R.layout.live_preview_widget_cell, tableRow, false);
                     // set up touch.
                     widget.setOnClickListener(mIconClickListener);
                     widget.setOnLongClickListener(mIconLongClickListener);
-- 
GitLab


From e2358949d47c606b61965d0e1fe46031fd38dbad Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Fri, 5 Mar 2021 14:59:13 -0600
Subject: [PATCH 0613/1664] [Search] Support flexible results-per-row in
 AllApps

Bug: 181987314
Test: Manual
Change-Id: Idc3d24dafc42944a7cc925e0991118c86a89b318
---
 .../launcher3/allapps/AllAppsGridAdapter.java | 19 ++++++++++---------
 .../allapps/search/SearchAdapterProvider.java | 11 +++++++++--
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index 5030c5e1a3..a05e036701 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -240,20 +240,18 @@ public class AllAppsGridAdapter extends
         @Override
         public int getSpanSize(int position) {
             int viewType = mApps.getAdapterItems().get(position).viewType;
+            int totalSpans = mGridLayoutMgr.getSpanCount();
             if (isIconViewType(viewType)) {
-                return 1 * SPAN_MULTIPLIER;
+                return totalSpans / mAppsPerRow;
             } else if (mSearchAdapterProvider.isSearchView(viewType)) {
-                return mSearchAdapterProvider.getGridSpanSize(viewType, mAppsPerRow);
+                return totalSpans / mSearchAdapterProvider.getItemsPerRow(viewType, mAppsPerRow);
             } else {
                 // Section breaks span the full width
-                return mAppsPerRow * SPAN_MULTIPLIER;
+                return totalSpans;
             }
         }
     }
 
-    // multiplier to support adapter item column count that is not mAppsPerRow.
-    public static final int SPAN_MULTIPLIER = 3;
-
     private final BaseDraggingActivity mLauncher;
     private final LayoutInflater mLayoutInflater;
     private final AlphabeticalAppsList mApps;
@@ -285,14 +283,17 @@ public class AllAppsGridAdapter extends
 
         mOnIconClickListener = launcher.getItemOnClickListener();
 
-        setAppsPerRow(mLauncher.getDeviceProfile().inv.numAllAppsColumns);
-
         mSearchAdapterProvider = searchAdapterProvider;
+        setAppsPerRow(mLauncher.getDeviceProfile().inv.numAllAppsColumns);
     }
 
     public void setAppsPerRow(int appsPerRow) {
         mAppsPerRow = appsPerRow;
-        mGridLayoutMgr.setSpanCount(mAppsPerRow * SPAN_MULTIPLIER);
+        int totalSpans = mAppsPerRow;
+        for (int itemPerRow : mSearchAdapterProvider.getSupportedItemsPerRow()) {
+            totalSpans *= itemPerRow;
+        }
+        mGridLayoutMgr.setSpanCount(totalSpans);
     }
 
     /**
diff --git a/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java b/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
index a79ec437fb..6d491fdd2e 100644
--- a/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
+++ b/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
@@ -50,11 +50,18 @@ public abstract class SearchAdapterProvider {
     public abstract AllAppsGridAdapter.ViewHolder onCreateViewHolder(LayoutInflater layoutInflater,
             ViewGroup parent, int viewType);
 
+    /**
+     * Returns supported item per row combinations supported
+     */
+    public int[] getSupportedItemsPerRow() {
+        return new int[]{};
+    }
+
     /**
      * Returns how many cells a view should span
      */
-    public int getGridSpanSize(int viewType, int appsPerRow) {
-        return appsPerRow * AllAppsGridAdapter.SPAN_MULTIPLIER;
+    public int getItemsPerRow(int viewType, int appsPerRow) {
+        return appsPerRow;
     }
 
     /**
-- 
GitLab


From 39938cbc9443b622df422d4a4772dd161e996774 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 26 Feb 2021 09:15:31 -0800
Subject: [PATCH 0614/1664] Initiate Hotseat drag from long pressing
 corresponding Taskbar item

When you long press on the taskbar hotseat item, the following happens:
- We start a system drag and drop with an invisible drag shadow
- We create a new DragOptions with the simulatedDndStartPoint set to the
  drag down position, and tell Launcher to use that for the next drag
- We perform a long click on the equivalent Hotseat item in Launcher
- We pass the drag events of that operation to Launcher's DragController

This allows Launcher to handle the entire drag operation, including the
pre-drag (with popup), and taskbar already hides when the drag starts.

Test: Long press items in taskbar hotseat, able to drag them to workspace

Bug: 179886115
Bug: 171917176
Change-Id: I576b80cb1bd0225cdc91cf7689fdee0481265109
---
 .../launcher3/BaseQuickstepLauncher.java      | 12 +++
 .../HotseatPredictionController.java          |  3 +-
 .../launcher3/taskbar/TaskbarController.java  |  9 +-
 .../taskbar/TaskbarDragController.java        | 35 ++++++-
 .../taskbar/TaskbarDragListener.java          | 99 +++++++++++++++++++
 src/com/android/launcher3/Hotseat.java        |  8 ++
 src/com/android/launcher3/Launcher.java       |  5 +
 src/com/android/launcher3/Workspace.java      |  2 +-
 .../touch/ItemLongClickListener.java          |  2 +-
 9 files changed, 170 insertions(+), 5 deletions(-)
 create mode 100644 quickstep/src/com/android/launcher3/taskbar/TaskbarDragListener.java

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 5b301433c3..161c98ec5f 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -35,6 +35,7 @@ import android.view.View;
 import androidx.annotation.Nullable;
 
 import com.android.launcher3.config.FeatureFlags;
+import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.model.WellbeingModel;
 import com.android.launcher3.popup.SystemShortcut;
 import com.android.launcher3.proxy.ProxyActivityStarter;
@@ -83,6 +84,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
 
     private @Nullable TaskbarController mTaskbarController;
     private final TaskbarStateHandler mTaskbarStateHandler = new TaskbarStateHandler(this);
+    // Will be updated when dragging from taskbar.
+    private DragOptions mWorkspaceDragOptions = new DragOptions();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -269,6 +272,15 @@ public abstract class BaseQuickstepLauncher extends Launcher
         return mTaskbarController != null && mTaskbarController.isViewInTaskbar(v);
     }
 
+    @Override
+    public DragOptions getDefaultWorkspaceDragOptions() {
+        return mWorkspaceDragOptions;
+    }
+
+    public void setWorkspaceDragOptions(DragOptions dragOptions) {
+        mWorkspaceDragOptions = dragOptions;
+    }
+
     @Override
     public void useFadeOutAnimationForLauncherStart(CancellationSignal signal) {
         QuickstepAppTransitionManagerImpl appTransitionManager =
diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
index 0156e8f513..f297343552 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
@@ -107,7 +107,8 @@ public class HotseatPredictionController implements DragController.DragListener,
         WorkspaceItemInfo dragItem = new WorkspaceItemInfo((WorkspaceItemInfo) v.getTag());
         v.setVisibility(View.INVISIBLE);
         mLauncher.getWorkspace().beginDragShared(
-                v, null, this, dragItem, new DragPreviewProvider(v), new DragOptions());
+                v, null, this, dragItem, new DragPreviewProvider(v),
+                mLauncher.getDefaultWorkspaceDragOptions());
         return true;
     };
 
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index 544bc99869..74a82ab4e2 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -170,7 +170,14 @@ public class TaskbarController {
 
             @Override
             public View.OnLongClickListener getItemOnLongClickListener() {
-                return mDragController::startDragOnLongClick;
+                return view -> {
+                    if (mLauncher.hasBeenResumed() && view.getTag() instanceof ItemInfo) {
+                        alignRealHotseatWithTaskbar();
+                        return mDragController.startWorkspaceDragOnLongClick(view);
+                    } else {
+                        return mDragController.startSystemDragOnLongClick(view);
+                    }
+                };
             }
 
             @Override
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
index baec8998f3..f51e49837d 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
@@ -33,6 +33,7 @@ import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.R;
+import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.system.ClipDescriptionCompat;
@@ -57,7 +58,7 @@ public class TaskbarDragController {
      * generate the ClipDescription and Intent.
      * @return Whether {@link View#startDragAndDrop} started successfully.
      */
-    protected boolean startDragOnLongClick(View view) {
+    protected boolean startSystemDragOnLongClick(View view) {
         if (!(view instanceof BubbleTextView)) {
             return false;
         }
@@ -124,6 +125,38 @@ public class TaskbarDragController {
         return false;
     }
 
+    /**
+     * Starts a drag and drop operation that controls a real Workspace (Hotseat) view.
+     * @param view The Taskbar item that was long clicked.
+     * @return Whether {@link View#startDragAndDrop} started successfully.
+     */
+    protected boolean startWorkspaceDragOnLongClick(View view) {
+        View.DragShadowBuilder transparentShadowBuilder = new View.DragShadowBuilder(view) {
+            private static final int ARBITRARY_SHADOW_SIZE = 10;
+
+            @Override
+            public void onDrawShadow(Canvas canvas) {
+            }
+
+            @Override
+            public void onProvideShadowMetrics(Point outShadowSize, Point outShadowTouchPoint) {
+                outShadowSize.set(ARBITRARY_SHADOW_SIZE, ARBITRARY_SHADOW_SIZE);
+                outShadowTouchPoint.set(ARBITRARY_SHADOW_SIZE / 2, ARBITRARY_SHADOW_SIZE / 2);
+            }
+        };
+
+        TaskbarDragListener taskbarDragListener = new TaskbarDragListener(mLauncher,
+                (ItemInfo) view.getTag());
+        if (view.startDragAndDrop(new ClipData("", new String[] {taskbarDragListener.getMimeType()},
+                        new ClipData.Item("")),
+                transparentShadowBuilder, null /* localState */, View.DRAG_FLAG_GLOBAL)) {
+            view.setOnDragListener(getDraggedViewDragListener());
+            taskbarDragListener.init(mLauncher.getDragLayer());
+            return true;
+        }
+        return false;
+    }
+
     /**
      * Hide the original Taskbar item while it is being dragged.
      */
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragListener.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragListener.java
new file mode 100644
index 0000000000..2bd58617f0
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragListener.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.taskbar;
+
+import android.content.ClipDescription;
+import android.graphics.Point;
+import android.view.DragEvent;
+import android.view.View;
+
+import com.android.launcher3.BaseQuickstepLauncher;
+import com.android.launcher3.dragndrop.DragLayer;
+import com.android.launcher3.dragndrop.DragOptions;
+import com.android.launcher3.model.data.ItemInfo;
+
+import java.util.UUID;
+
+/**
+ * Listens to system drag and drop events initated by the Taskbar, and forwards them to Launcher's
+ * internal DragController to move Hotseat items.
+ */
+public class TaskbarDragListener implements View.OnDragListener {
+
+    private static final String MIME_TYPE_PREFIX = "com.android.launcher3.taskbar.drag_and_drop/";
+
+    private final BaseQuickstepLauncher mLauncher;
+    private final ItemInfo mDraggedItem;
+    private final DragOptions mDragOptions;
+    // Randomly generated id used to verify the drag event.
+    private final String mId;
+
+    // Initialized in init().
+    DragLayer mDragLayer;
+
+    /**
+     * @param draggedItem The info of the item that was long clicked, which we will use to find
+     *                    the equivalent match on Hotseat to drag internally.
+     */
+    public TaskbarDragListener(BaseQuickstepLauncher launcher, ItemInfo draggedItem) {
+        mLauncher = launcher;
+        mDraggedItem = draggedItem;
+        mDragOptions = new DragOptions();
+        mDragOptions.simulatedDndStartPoint = new Point();
+        mId = UUID.randomUUID().toString();
+    }
+
+    protected void init(DragLayer dragLayer) {
+        mDragLayer = dragLayer;
+        mDragLayer.setOnDragListener(this);
+    }
+
+    private void cleanup() {
+        mDragLayer.setOnDragListener(null);
+        mLauncher.setWorkspaceDragOptions(new DragOptions());
+    }
+
+    /**
+     * Returns a randomly generated id used to verify the drag event.
+     */
+    protected String getMimeType() {
+        return MIME_TYPE_PREFIX + mId;
+    }
+
+    @Override
+    public boolean onDrag(View dragLayer, DragEvent dragEvent) {
+        ClipDescription clipDescription = dragEvent.getClipDescription();
+        if (dragEvent.getAction() == DragEvent.ACTION_DRAG_STARTED) {
+            if (clipDescription == null || !clipDescription.hasMimeType(getMimeType())) {
+                // We didn't initiate this drag, ignore.
+                cleanup();
+                return false;
+            }
+            View hotseatView = mLauncher.getHotseat().getFirstItemMatch(
+                    (info, view) -> info == mDraggedItem);
+            if (hotseatView == null) {
+                cleanup();
+                return false;
+            }
+            mDragOptions.simulatedDndStartPoint.set((int) dragEvent.getX(), (int) dragEvent.getY());
+            mLauncher.setWorkspaceDragOptions(mDragOptions);
+            hotseatView.performLongClick();
+        } else if (dragEvent.getAction() == DragEvent.ACTION_DRAG_ENDED) {
+            cleanup();
+        }
+        return mLauncher.getDragController().onDragEvent(dragEvent);
+    }
+}
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index ebaacb67d0..b2112ad83a 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -21,6 +21,7 @@ import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.MotionEvent;
+import android.view.View;
 import android.view.ViewDebug;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
@@ -166,4 +167,11 @@ public class Hotseat extends CellLayout implements Insettable {
     protected void showInlineQsb() {
         //Does nothing
     }
+
+    /**
+     * Returns the first View for which the given itemOperator returns true, or null.
+     */
+    public View getFirstItemMatch(Workspace.ItemOperator itemOperator) {
+        return mWorkspace.getFirstMatch(new CellLayout[] { this }, itemOperator);
+    }
 }
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 253a7c7086..fa63885c67 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -121,6 +121,7 @@ import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.dot.DotInfo;
 import com.android.launcher3.dragndrop.DragController;
 import com.android.launcher3.dragndrop.DragLayer;
+import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.dragndrop.DragView;
 import com.android.launcher3.folder.FolderGridOrganizer;
 import com.android.launcher3.folder.FolderIcon;
@@ -2863,6 +2864,10 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         return false;
     }
 
+    public DragOptions getDefaultWorkspaceDragOptions() {
+        return new DragOptions();
+    }
+
     private static class NonConfigInstance {
         public Configuration config;
         public Bitmap snapshot;
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 77fee08de2..87fb6fb7a1 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2973,7 +2973,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
      * @param operators List of operators, in order starting from best matching operator.
      * @return
      */
-    private View getFirstMatch(CellLayout[] cellLayouts, final ItemOperator... operators) {
+    View getFirstMatch(CellLayout[] cellLayouts, final ItemOperator... operators) {
         // This array is filled with the first match for each operator.
         final View[] matches = new View[operators.length];
         // For efficiency, the outer loop should be CellLayout.
diff --git a/src/com/android/launcher3/touch/ItemLongClickListener.java b/src/com/android/launcher3/touch/ItemLongClickListener.java
index 919673f525..f876dd9230 100644
--- a/src/com/android/launcher3/touch/ItemLongClickListener.java
+++ b/src/com/android/launcher3/touch/ItemLongClickListener.java
@@ -57,7 +57,7 @@ public class ItemLongClickListener {
         if (!(v.getTag() instanceof ItemInfo)) return false;
 
         launcher.setWaitingForResult(null);
-        beginDrag(v, launcher, (ItemInfo) v.getTag(), new DragOptions());
+        beginDrag(v, launcher, (ItemInfo) v.getTag(), launcher.getDefaultWorkspaceDragOptions());
         return true;
     }
 
-- 
GitLab


From c6fe0dd4fa5d5113e96fffbdf27293cfbd302468 Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Wed, 3 Mar 2021 18:40:01 +0000
Subject: [PATCH 0615/1664] Implement pipeline for a simple search based on
 query string matching on app names in WidgetsListBaseEntries.

This will be the default search for AOSP widget picker and a fallback search for Pixel widget picker.

Test: Tested prototype locally. Also added robolectric test.
Bug: b/157286785
Change-Id: Iad3bf2f46b2a89383a52c756fd1b9f65ecbeb40b
---
 .../SimpleWidgetsSearchAlgorithmTest.java     |  81 ++++++++
 .../SimpleWidgetsSearchPipelineTest.java      | 182 ++++++++++++++++++
 .../search/SimpleWidgetsSearchAlgorithm.java  |  63 ++++++
 .../search/SimpleWidgetsSearchPipeline.java   |  88 +++++++++
 4 files changed, 414 insertions(+)
 create mode 100644 robolectric_tests/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchAlgorithmTest.java
 create mode 100644 robolectric_tests/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchPipelineTest.java
 create mode 100644 src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchAlgorithm.java
 create mode 100644 src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchPipeline.java

diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchAlgorithmTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchAlgorithmTest.java
new file mode 100644
index 0000000000..c2bf1ae2dc
--- /dev/null
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchAlgorithmTest.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.widget.picker.search;
+
+import static android.os.Looper.getMainLooper;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.matches;
+import static org.mockito.Mockito.verify;
+import static org.robolectric.Shadows.shadowOf;
+
+import com.android.launcher3.search.SearchCallback;
+import com.android.launcher3.widget.model.WidgetsListBaseEntry;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+
+@RunWith(RobolectricTestRunner.class)
+public class SimpleWidgetsSearchAlgorithmTest {
+
+    private SimpleWidgetsSearchAlgorithm mSimpleWidgetsSearchAlgorithm;
+    @Mock
+    private WidgetsPickerSearchPipeline mSearchPipeline;
+    @Mock
+    private SearchCallback<WidgetsListBaseEntry> mSearchCallback;
+    @Captor
+    private ArgumentCaptor<Consumer<List<WidgetsListBaseEntry>>> mConsumerCaptor;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mSimpleWidgetsSearchAlgorithm = new SimpleWidgetsSearchAlgorithm(mSearchPipeline);
+    }
+
+    @Test
+    public void doSearch_shouldQueryPipeline() {
+        mSimpleWidgetsSearchAlgorithm.doSearch("abc", mSearchCallback);
+
+        verify(mSearchPipeline).query(eq("abc"), any());
+    }
+
+    @Test
+    public void doSearch_shouldInformSearchCallbackOnQueryResult() {
+        ArrayList<WidgetsListBaseEntry> baseEntries = new ArrayList<>();
+
+        mSimpleWidgetsSearchAlgorithm.doSearch("abc", mSearchCallback);
+
+        verify(mSearchPipeline).query(eq("abc"), mConsumerCaptor.capture());
+        mConsumerCaptor.getValue().accept(baseEntries);
+        shadowOf(getMainLooper()).idle();
+        // Verify SearchCallback#onSearchResult receives a query token along with the search
+        // results. The query token is the original query string concatenated with the query
+        // timestamp.
+        verify(mSearchCallback).onSearchResult(matches("abc\t\\d*"), eq(baseEntries));
+    }
+}
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchPipelineTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchPipelineTest.java
new file mode 100644
index 0000000000..8aebf12b89
--- /dev/null
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchPipelineTest.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.widget.picker.search;
+
+import static android.os.Looper.getMainLooper;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.appwidget.AppWidgetProviderInfo;
+import android.content.ComponentName;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.os.UserHandle;
+
+import com.android.launcher3.InvariantDeviceProfile;
+import com.android.launcher3.icons.BitmapInfo;
+import com.android.launcher3.icons.ComponentWithLabel;
+import com.android.launcher3.icons.IconCache;
+import com.android.launcher3.model.WidgetItem;
+import com.android.launcher3.model.data.PackageItemInfo;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
+import com.android.launcher3.widget.model.WidgetsListContentEntry;
+import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadows.ShadowPackageManager;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+public class SimpleWidgetsSearchPipelineTest {
+    private static final SimpleWidgetsSearchPipeline.StringMatcher MATCHER =
+            SimpleWidgetsSearchPipeline.StringMatcher.getInstance();
+
+    @Mock private IconCache mIconCache;
+
+    private InvariantDeviceProfile mTestProfile;
+    private WidgetsListHeaderEntry mCalendarHeaderEntry;
+    private WidgetsListContentEntry mCalendarContentEntry;
+    private WidgetsListHeaderEntry mCameraHeaderEntry;
+    private WidgetsListContentEntry mCameraContentEntry;
+    private WidgetsListHeaderEntry mClockHeaderEntry;
+    private WidgetsListContentEntry mClockContentEntry;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        doAnswer(invocation -> ((ComponentWithLabel) invocation.getArgument(0))
+                .getComponent().getPackageName())
+                .when(mIconCache).getTitleNoCache(any());
+        mTestProfile = new InvariantDeviceProfile();
+        mTestProfile.numRows = 5;
+        mTestProfile.numColumns = 5;
+        mContext = RuntimeEnvironment.application;
+
+        mCalendarHeaderEntry =
+                createWidgetsHeaderEntry("com.example.android.Calendar", "Calendar", 2);
+        mCalendarContentEntry =
+                createWidgetsContentEntry("com.example.android.Calendar", "Calendar", 2);
+        mCameraHeaderEntry = createWidgetsHeaderEntry("com.example.android.Camera", "Camera", 5);
+        mCameraContentEntry = createWidgetsContentEntry("com.example.android.Camera", "Camera", 5);
+        mClockHeaderEntry = createWidgetsHeaderEntry("com.example.android.Clock", "Clock", 3);
+        mClockContentEntry = createWidgetsContentEntry("com.example.android.Clock", "Clock", 3);
+    }
+
+    @Test
+    public void query_shouldInformCallbackWithResultsMatchedOnAppName() {
+        SimpleWidgetsSearchPipeline pipeline = new SimpleWidgetsSearchPipeline(
+                List.of(mCalendarHeaderEntry, mCalendarContentEntry, mCameraHeaderEntry,
+                        mCameraContentEntry, mClockHeaderEntry, mClockContentEntry));
+
+        pipeline.query("Ca", results ->
+                assertEquals(results, List.of(mCalendarHeaderEntry, mCalendarContentEntry,
+                        mCameraHeaderEntry, mCameraContentEntry)));
+        shadowOf(getMainLooper()).idle();
+    }
+
+    @Test
+    public void testMatches() {
+        assertTrue(MATCHER.matches("q", "Q"));
+        assertTrue(MATCHER.matches("q", "  Q"));
+        assertTrue(MATCHER.matches("e", "elephant"));
+        assertTrue(MATCHER.matches("eL", "Elephant"));
+        assertTrue(MATCHER.matches("elephant ", "elephant"));
+        assertTrue(MATCHER.matches("whitec", "white cow"));
+        assertTrue(MATCHER.matches("white  c", "white cow"));
+        assertTrue(MATCHER.matches("white ", "white cow"));
+        assertTrue(MATCHER.matches("white c", "white cow"));
+        assertTrue(MATCHER.matches("电", "电子邮件"));
+        assertTrue(MATCHER.matches("电子", "电子邮件"));
+        assertTrue(MATCHER.matches("다", "다운로드"));
+        assertTrue(MATCHER.matches("드", "드라이브"));
+        assertTrue(MATCHER.matches("åbç", "abc"));
+        assertTrue(MATCHER.matches("ål", "Alpha"));
+
+        assertFalse(MATCHER.matches("phant", "elephant"));
+        assertFalse(MATCHER.matches("elephants", "elephant"));
+        assertFalse(MATCHER.matches("cow", "white cow"));
+        assertFalse(MATCHER.matches("cow", "whiteCow"));
+        assertFalse(MATCHER.matches("dog", "cats&Dogs"));
+        assertFalse(MATCHER.matches("ba", "Bot"));
+        assertFalse(MATCHER.matches("ba", "bot"));
+        assertFalse(MATCHER.matches("子", "电子邮件"));
+        assertFalse(MATCHER.matches("邮件", "电子邮件"));
+        assertFalse(MATCHER.matches("ㄷ", "다운로드 드라이브"));
+        assertFalse(MATCHER.matches("ㄷㄷ", "다운로드 드라이브"));
+        assertFalse(MATCHER.matches("åç", "abc"));
+    }
+
+    private WidgetsListHeaderEntry createWidgetsHeaderEntry(String packageName, String appName,
+            int numOfWidgets) {
+        List<WidgetItem> widgetItems = generateWidgetItems(packageName, numOfWidgets);
+        PackageItemInfo pInfo = createPackageItemInfo(packageName, appName,
+                widgetItems.get(0).user);
+
+        return new WidgetsListHeaderEntry(pInfo, /* titleSectionName= */ "", widgetItems);
+    }
+
+    private WidgetsListContentEntry createWidgetsContentEntry(String packageName, String appName,
+            int numOfWidgets) {
+        List<WidgetItem> widgetItems = generateWidgetItems(packageName, numOfWidgets);
+        PackageItemInfo pInfo = createPackageItemInfo(packageName, appName,
+                widgetItems.get(0).user);
+
+        return new WidgetsListContentEntry(pInfo, /* titleSectionName= */ "", widgetItems);
+    }
+
+    private PackageItemInfo createPackageItemInfo(String packageName, String appName,
+            UserHandle userHandle) {
+        PackageItemInfo pInfo = new PackageItemInfo(packageName);
+        pInfo.title = appName;
+        pInfo.user = userHandle;
+        pInfo.bitmap = BitmapInfo.of(Bitmap.createBitmap(10, 10, Bitmap.Config.ALPHA_8), 0);
+        return pInfo;
+    }
+
+    private List<WidgetItem> generateWidgetItems(String packageName, int numOfWidgets) {
+        ShadowPackageManager packageManager = shadowOf(mContext.getPackageManager());
+        ArrayList<WidgetItem> widgetItems = new ArrayList<>();
+        for (int i = 0; i < numOfWidgets; i++) {
+            ComponentName cn = ComponentName.createRelative(packageName, ".SampleWidget" + i);
+            AppWidgetProviderInfo widgetInfo = new AppWidgetProviderInfo();
+            widgetInfo.provider = cn;
+            ReflectionHelpers.setField(widgetInfo, "providerInfo",
+                    packageManager.addReceiverIfNotPresent(cn));
+
+            WidgetItem widgetItem = new WidgetItem(
+                    LauncherAppWidgetProviderInfo.fromProviderInfo(mContext, widgetInfo),
+                    mTestProfile, mIconCache);
+            widgetItems.add(widgetItem);
+        }
+        return widgetItems;
+    }
+}
diff --git a/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchAlgorithm.java b/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchAlgorithm.java
new file mode 100644
index 0000000000..15d245486b
--- /dev/null
+++ b/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchAlgorithm.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.widget.picker.search;
+
+import android.os.Handler;
+import android.util.Log;
+
+import com.android.launcher3.search.SearchAlgorithm;
+import com.android.launcher3.search.SearchCallback;
+import com.android.launcher3.widget.model.WidgetsListBaseEntry;
+
+import java.util.ArrayList;
+
+/**
+ * Implementation of {@link SearchAlgorithm} that posts a task to query on the main thread.
+ */
+public final class SimpleWidgetsSearchAlgorithm implements SearchAlgorithm<WidgetsListBaseEntry> {
+
+    private static final boolean DEBUG = false;
+    private static final String TAG = "SimpleWidgetsSearchAlgo";
+    private static final String DELIM = "\t";
+
+    private final Handler mResultHandler;
+    private final WidgetsPickerSearchPipeline mSearchPipeline;
+
+    public SimpleWidgetsSearchAlgorithm(WidgetsPickerSearchPipeline searchPipeline) {
+        mResultHandler = new Handler();
+        mSearchPipeline = searchPipeline;
+    }
+
+    @Override
+    public void doSearch(String query, SearchCallback<WidgetsListBaseEntry> callback) {
+        long startTime = System.currentTimeMillis();
+        String queryToken = query + DELIM + startTime;
+        if (DEBUG) {
+            Log.d(TAG, "doSearch queryToken:" + queryToken);
+        }
+        mSearchPipeline.query(query,
+                results -> mResultHandler.post(
+                        () -> callback.onSearchResult(queryToken, new ArrayList(results))));
+    }
+
+    @Override
+    public void cancel(boolean interruptActiveRequests) {
+        if (interruptActiveRequests) {
+            mResultHandler.removeCallbacksAndMessages(/*token= */null);
+        }
+    }
+}
diff --git a/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchPipeline.java b/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchPipeline.java
new file mode 100644
index 0000000000..99114955aa
--- /dev/null
+++ b/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchPipeline.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.widget.picker.search;
+
+import com.android.launcher3.widget.model.WidgetsListBaseEntry;
+
+import java.text.Collator;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+
+/**
+ * Implementation of {@link WidgetsPickerSearchPipeline} that performs search by prefix matching on
+ * app names and widget labels.
+ */
+public final class SimpleWidgetsSearchPipeline implements WidgetsPickerSearchPipeline {
+
+    private final List<WidgetsListBaseEntry> mAllEntries;
+
+    public SimpleWidgetsSearchPipeline(List<WidgetsListBaseEntry> allEntries) {
+        mAllEntries = allEntries;
+    }
+
+    @Override
+    public void query(String input, Consumer<List<WidgetsListBaseEntry>> callback) {
+        StringMatcher matcher =  StringMatcher.getInstance();
+        ArrayList<WidgetsListBaseEntry> results = new ArrayList<>();
+        // TODO(b/157286785): Filter entries based on query prefix matching on widget labels also.
+        for (WidgetsListBaseEntry e : mAllEntries) {
+            if (matcher.matches(input, e.mPkgItem.title.toString())) {
+                results.add(e);
+            }
+        }
+        callback.accept(results);
+    }
+
+    /**
+     * Performs locale sensitive string comparison using {@link Collator}.
+     */
+    public static class StringMatcher {
+
+        private static final char MAX_UNICODE = '\uFFFF';
+
+        private final Collator mCollator;
+
+        StringMatcher() {
+            mCollator = Collator.getInstance();
+            mCollator.setStrength(Collator.PRIMARY);
+            mCollator.setDecomposition(Collator.CANONICAL_DECOMPOSITION);
+        }
+
+        /**
+         * Returns true if {@param query} is a prefix of {@param target}.
+         */
+        public boolean matches(String query, String target) {
+            switch (mCollator.compare(query, target)) {
+                case 0:
+                    return true;
+                case -1:
+                    // The target string can contain a modifier which would make it larger than
+                    // the query string (even though the length is same). If the query becomes
+                    // larger after appending a unicode character, it was originally a prefix of
+                    // the target string and hence should match.
+                    return mCollator.compare(query + MAX_UNICODE, target) > -1;
+                default:
+                    return false;
+            }
+        }
+
+        public static StringMatcher getInstance() {
+            return new StringMatcher();
+        }
+    }
+}
-- 
GitLab


From 0f7715639710ebacf28e34b160c3b40189c83b02 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Wed, 3 Mar 2021 08:45:24 -0800
Subject: [PATCH 0616/1664] No focus highlight in prediction row

Bug: 181337130
Test: manual

Change-Id: Ic6598a02c575037208c8808e1f9e102b7b7be5e9
---
 .../appprediction/PredictionRowView.java       | 18 ------------------
 .../allapps/AllAppsSectionDecorator.java       | 17 -----------------
 2 files changed, 35 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
index b570d55f69..83234e36e9 100644
--- a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
+++ b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
@@ -41,7 +41,6 @@ import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
-import com.android.launcher3.allapps.AllAppsSectionDecorator;
 import com.android.launcher3.allapps.FloatingHeaderRow;
 import com.android.launcher3.allapps.FloatingHeaderView;
 import com.android.launcher3.anim.AlphaUpdateListener;
@@ -106,8 +105,6 @@ public class PredictionRowView extends LinearLayout implements
 
     private boolean mPredictionsEnabled = false;
 
-    AllAppsSectionDecorator.SectionDecorationHandler mDecorationHandler;
-
     @Nullable
     private List<ItemInfo> mPendingPredictedItems;
 
@@ -129,11 +126,6 @@ public class PredictionRowView extends LinearLayout implements
         mIconFullTextAlpha = Color.alpha(mIconTextColor);
         mIconCurrentTextAlpha = mIconFullTextAlpha;
 
-        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
-            mDecorationHandler = new AllAppsSectionDecorator.SectionDecorationHandler(getContext(),
-                    false, 0, true, true);
-        }
-
         updateVisibility();
     }
 
@@ -159,16 +151,6 @@ public class PredictionRowView extends LinearLayout implements
 
     @Override
     protected void dispatchDraw(Canvas canvas) {
-        if (mDecorationHandler != null) {
-            mDecorationHandler.reset();
-            int childrenCount = getChildCount();
-            for (int i = 0; i < childrenCount; i++) {
-                mDecorationHandler.extendBounds(getChildAt(i));
-            }
-            mDecorationHandler.onGroupDraw(canvas);
-            mDecorationHandler.onFocusDraw(canvas, getFocusedChild());
-            mLauncher.getAppsView().getActiveRecyclerView().invalidateItemDecorations();
-        }
         mFocusHelper.draw(canvas);
         super.dispatchDraw(canvas);
     }
diff --git a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
index 9328a3d6e9..f4d735e1da 100644
--- a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
+++ b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
@@ -48,7 +48,6 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
     @Override
     public void onDraw(Canvas c, RecyclerView parent, RecyclerView.State state) {
         List<AllAppsGridAdapter.AdapterItem> adapterItems = mAppsView.getApps().getAdapterItems();
-        boolean drawFallbackFocusedView = true;
         for (int i = 0; i < parent.getChildCount(); i++) {
             View view = parent.getChildAt(i);
             int position = parent.getChildAdapterPosition(view);
@@ -60,28 +59,12 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
                     decorationHandler.extendBounds(view);
                     if (sectionInfo.isFocusedView()) {
                         decorationHandler.onFocusDraw(c, view);
-                        drawFallbackFocusedView = false;
                     } else {
                         decorationHandler.onGroupDraw(c);
                     }
                 }
             }
         }
-        // fallback logic in case none of the SearchTarget is labeled as focused item
-        if (drawFallbackFocusedView) {
-            for (int i = 0; i < parent.getChildCount(); i++) {
-                View view = parent.getChildAt(i);
-                int position = parent.getChildAdapterPosition(view);
-                AllAppsGridAdapter.AdapterItem adapterItem = adapterItems.get(position);
-                if (adapterItem.sectionDecorationInfo != null) {
-                    SectionDecorationInfo sectionInfo = adapterItem.sectionDecorationInfo;
-                    SectionDecorationHandler decorationHandler = sectionInfo.getDecorationHandler();
-                    if (decorationHandler != null) {
-                        drawDecoration(c, decorationHandler, parent);
-                    }
-                }
-            }
-        }
     }
 
     // Fallback logic in case non of the SearchTarget is labeled as focused item.
-- 
GitLab


From d3df0e4103371bba70b159c6286ebd4acb8abdcf Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Wed, 3 Mar 2021 09:24:55 -0800
Subject: [PATCH 0617/1664] Do not rebind AA+ adapters when there's search
 result

Bug: 181352111
Test: manual
Change-Id: Ieab75f3805f5d06a6bd8f60014abca103d7004b4
---
 src/com/android/launcher3/allapps/AllAppsContainerView.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index a92e1aa612..edd9a9f7ef 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -199,7 +199,9 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
                 break;
             }
         }
-        rebindAdapters(hasWorkApps);
+        if (!mAH[AdapterHolder.MAIN].appsList.hasFilter()) {
+            rebindAdapters(hasWorkApps);
+        }
         if (hasWorkApps) {
             resetWorkProfile();
         }
-- 
GitLab


From 5a007fe0f6b0c8e370ee7a93687cd004cb61811c Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Thu, 25 Feb 2021 00:58:05 -0800
Subject: [PATCH 0618/1664] Convert Launcher Android.mk to Android.bp to setup
 RoboTests

Bug: 181083996
Test: m Launcher3 && install Launcher3 and test basic things
Test: m RunLauncherRoboTests (90 tests run and 3 fails)

Change-Id: Icdc839d06413409cbd52d10a5ef9fe27b0a57baa
---
 Android.bp                                    | 90 +++++++++++++++++++
 Android.mk                                    | 73 ---------------
 res/values-sw720dp/config.xml                 |  1 -
 robolectric_tests/Android.bp                  | 46 ++++++++++
 robolectric_tests/Android.mk                  | 68 --------------
 .../config/robolectric.properties             |  3 +-
 .../util => unstaged}/SettingsCacheTest.java  |  0
 .../android/launcher3}/BuildConfig.java       |  0
 8 files changed, 138 insertions(+), 143 deletions(-)
 create mode 100644 robolectric_tests/Android.bp
 delete mode 100644 robolectric_tests/Android.mk
 rename robolectric_tests/{src/com/android/launcher3/util => unstaged}/SettingsCacheTest.java (100%)
 rename src_build_config/{ => com/android/launcher3}/BuildConfig.java (100%)

diff --git a/Android.bp b/Android.bp
index cca48ce329..002f6fe602 100644
--- a/Android.bp
+++ b/Android.bp
@@ -93,3 +93,93 @@ java_library {
     sdk_version: "current",
     min_sdk_version: "28",
 }
+
+//
+// Build rule for Launcher3 dependencies lib.
+//
+android_library {
+    name: "Launcher3CommonDepsLib",
+    static_libs: [
+        "androidx.recyclerview_recyclerview",
+        "androidx.dynamicanimation_dynamicanimation",
+        "androidx.preference_preference",
+        "androidx.slice_slice-view",
+        "iconloader_base",
+        "LauncherPluginLib",
+        "launcher_quickstep_log_protos_lite"
+    ],
+    srcs: [
+        "src_build_config/**/*.java",
+    ],
+    resource_dirs: ["res"],
+    optimize: {
+        enabled: false,
+    },
+    sdk_version: "current",
+    min_sdk_version: "26",
+    manifest: "AndroidManifest-common.xml",
+}
+
+//
+// Build rule for Launcher3 app.
+//
+android_app {
+    name: "Launcher3",
+
+    static_libs: [
+        "Launcher3CommonDepsLib",
+    ],
+    srcs: [
+        "src/**/*.java",
+        "src_shortcuts_overrides/**/*.java",
+        "src_ui_overrides/**/*.java",
+        "ext_tests/src/**/*.java",
+    ],
+    resource_dirs: [
+        "ext_tests/res",
+    ],
+    optimize: {
+        proguard_flags_files: ["proguard.flags"],
+        // Proguard is disable for testing. Derivarive prjects to keep proguard enabled
+        enabled: false,
+    },
+
+    sdk_version: "current",
+    min_sdk_version: "26",
+    target_sdk_version: "29",
+    privileged: true,
+    system_ext_specific: true,
+
+    overrides: [
+        "Home",
+        "Launcher2",
+    ],
+    required: ["privapp_whitelist_com.android.launcher3"],
+
+    jacoco: {
+        include_filter: ["com.android.launcher3.**"],
+    },
+    additional_manifests: [
+        "AndroidManifest-common.xml",
+    ],
+}
+
+//
+// Launcher Robolectric test target.
+//
+java_library {
+    name: "Launcher3TestCommon",
+    libs: [
+        "Launcher3CommonDepsLib",
+    ],
+    srcs: [
+        "src/**/*.java",
+        "src_shortcuts_overrides/**/*.java",
+        "src_ui_overrides/**/*.java",
+        "ext_tests/src/**/*.java",
+        "tests/src_common/**/*.java",
+    ],
+    target_sdk_version: "29",
+    sdk_version: "current",
+    min_sdk_version: "26",
+}
diff --git a/Android.mk b/Android.mk
index 304935bdaa..89870a690e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,79 +16,6 @@
 
 LOCAL_PATH := $(call my-dir)
 
-#
-# Build rule for Launcher3 dependencies lib.
-#
-include $(CLEAR_VARS)
-LOCAL_USE_AAPT2 := true
-LOCAL_AAPT2_ONLY := true
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_STATIC_ANDROID_LIBRARIES := \
-    androidx.recyclerview_recyclerview \
-    androidx.dynamicanimation_dynamicanimation \
-    androidx.preference_preference \
-    androidx.slice_slice-view \
-    iconloader_base
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    LauncherPluginLib \
-    launcher_quickstep_log_protos_lite \
-    search_ui
-
-LOCAL_SRC_FILES := \
-    $(call all-java-files-under, src_build_config) \
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PROGUARD_ENABLED := disabled
-
-LOCAL_SDK_VERSION := current
-LOCAL_MIN_SDK_VERSION := 26
-LOCAL_MODULE := Launcher3CommonDepsLib
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_MANIFEST_FILE := AndroidManifest-common.xml
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-#
-# Build rule for Launcher3 app.
-#
-include $(CLEAR_VARS)
-LOCAL_USE_AAPT2 := true
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib
-
-LOCAL_SRC_FILES := \
-    $(call all-java-files-under, src) \
-    $(call all-java-files-under, src_shortcuts_overrides) \
-    $(call all-java-files-under, src_ui_overrides) \
-    $(call all-java-files-under, ext_tests/src)
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/ext_tests/res
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-# Proguard is disable for testing. Derivarive prjects to keep proguard enabled
-LOCAL_PROGUARD_ENABLED := disabled
-
-LOCAL_SDK_VERSION := current
-LOCAL_MIN_SDK_VERSION := 26
-LOCAL_PACKAGE_NAME := Launcher3
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_SYSTEM_EXT_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
-
-LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.*
-
-include $(BUILD_PACKAGE)
-
 #
 # Build rule for Launcher3 Go app for Android Go devices.
 #
diff --git a/res/values-sw720dp/config.xml b/res/values-sw720dp/config.xml
index 1f401c49e7..ec07591ff9 100644
--- a/res/values-sw720dp/config.xml
+++ b/res/values-sw720dp/config.xml
@@ -1,5 +1,4 @@
 <resources>
-    <bool name="config_largeHeap">true</bool>
 
 <!-- All Apps & Widgets -->
     <!-- Out of 100, the percent to shrink the workspace during spring loaded mode. -->
diff --git a/robolectric_tests/Android.bp b/robolectric_tests/Android.bp
new file mode 100644
index 0000000000..c738df9aa7
--- /dev/null
+++ b/robolectric_tests/Android.bp
@@ -0,0 +1,46 @@
+// Copyright (C) 2021 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//
+// Launcher Robolectric test target.
+//
+//        "robolectric_android-all-stub", not needed, we write our own stubs
+android_robolectric_test {
+    name: "LauncherRoboTests",
+    srcs: [
+        "src/**/*.java",
+    ],
+    java_resource_dirs: [
+        "resources",
+        "res",
+        "config",
+    ],
+    static_libs: [
+        "truth-prebuilt",
+        "Launcher3TestCommon",
+        "androidx.test.runner",
+        "androidx.test.rules",
+        "mockito-robolectric-prebuilt",
+    ],
+    //robolectric_prebuilt_version: "4.4",
+    libs: [
+        "platform-robolectric-4.4-prebuilt",
+    ],
+    instrumentation_for: "Launcher3",
+
+    test_options: {
+        timeout: 36000,
+    },
+}
+
diff --git a/robolectric_tests/Android.mk b/robolectric_tests/Android.mk
deleted file mode 100644
index 405a45808d..0000000000
--- a/robolectric_tests/Android.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#############################################
-# Launcher Robolectric test target.         #
-#############################################
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := LauncherRoboTests
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-
-LOCAL_SDK_VERSION := system_current
-LOCAL_SRC_FILES := \
-	$(call all-java-files-under, src) \
-	$(call all-java-files-under, ../tests/src_common)
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    androidx.test.runner \
-    androidx.test.rules \
-    mockito-robolectric-prebuilt \
-    truth-prebuilt
-LOCAL_JAVA_LIBRARIES := \
-    platform-robolectric-4.3.1-prebuilt
-
-LOCAL_JAVA_RESOURCE_DIRS := resources config
-
-LOCAL_INSTRUMENTATION_FOR := Launcher3
-LOCAL_MODULE_TAGS := optional
-
-# Generate test_config.properties
-include external/robolectric-shadows/gen_test_config.mk
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-############################################
-# Target to run the previous target.       #
-############################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := RunLauncherRoboTests
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE
-LOCAL_SDK_VERSION := system_current
-LOCAL_JAVA_LIBRARIES := LauncherRoboTests
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-LOCAL_TEST_PACKAGE := Launcher3
-LOCAL_INSTRUMENT_SOURCE_DIRS := packages/apps/Launcher3/src
-
-LOCAL_ROBOTEST_TIMEOUT := 36000
-
-include prebuilts/misc/common/robolectric/4.4/run_robotests.mk
diff --git a/robolectric_tests/config/robolectric.properties b/robolectric_tests/config/robolectric.properties
index 4e811f36ff..1b170e1eb4 100644
--- a/robolectric_tests/config/robolectric.properties
+++ b/robolectric_tests/config/robolectric.properties
@@ -1,4 +1,5 @@
 sdk=29
+
 shadows= \
     com.android.launcher3.shadows.LShadowAppPredictionManager \
     com.android.launcher3.shadows.LShadowAppWidgetManager \
@@ -11,4 +12,4 @@ shadows= \
     com.android.launcher3.shadows.ShadowOverrides \
     com.android.launcher3.shadows.ShadowSurfaceTransactionApplier \
 
-application=com.android.launcher3.util.LauncherTestApplication
\ No newline at end of file
+application=com.android.launcher3.util.LauncherTestApplication
diff --git a/robolectric_tests/src/com/android/launcher3/util/SettingsCacheTest.java b/robolectric_tests/unstaged/SettingsCacheTest.java
similarity index 100%
rename from robolectric_tests/src/com/android/launcher3/util/SettingsCacheTest.java
rename to robolectric_tests/unstaged/SettingsCacheTest.java
diff --git a/src_build_config/BuildConfig.java b/src_build_config/com/android/launcher3/BuildConfig.java
similarity index 100%
rename from src_build_config/BuildConfig.java
rename to src_build_config/com/android/launcher3/BuildConfig.java
-- 
GitLab


From f0988f1fb1d89af048dd98adfe1b1c1162899cfb Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Wed, 3 Mar 2021 08:39:34 -0800
Subject: [PATCH 0619/1664] Prevent NPE inside AllAppsTransitionController

Bug: 181911438
Test: manual

Change-Id: Ia2cfe43512c0336232fc6787eb955d476280e3b8
---
 .../allapps/AllAppsTransitionController.java    | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index dc58c99c99..a48e4232cf 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -144,11 +144,14 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
      */
     public void setProgress(float progress) {
         mProgress = progress;
+
         mScrimView.setProgress(progress);
         float shiftCurrent = progress * mShiftRange;
-
         mAppsView.setTranslationY(shiftCurrent);
         if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && mSearchImeEnabled) {
+            if (mInsetController == null) {
+                setupInsetTransitionController();
+            }
             mInsetController.setProgress(progress);
         }
     }
@@ -240,13 +243,17 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
         mAppsView = appsView;
         mScrimView = scrimView;
         if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && BuildCompat.isAtLeastR()) {
-            mInsetController = new AllAppsInsetTransitionController(mShiftRange, mAppsView);
-            mLauncher.getSystemUiController().updateUiState(UI_STATE_ALLAPPS,
-                    View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                            | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+            setupInsetTransitionController();
         }
     }
 
+    private void setupInsetTransitionController() {
+        mInsetController = new AllAppsInsetTransitionController(mShiftRange, mAppsView);
+        mLauncher.getSystemUiController().updateUiState(UI_STATE_ALLAPPS,
+                View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                        | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+    }
+
     /**
      * Updates the total scroll range but does not update the UI.
      */
-- 
GitLab


From 2ae5f2026919ce8877b1cc80e3bb9e4eedefd523 Mon Sep 17 00:00:00 2001
From: Bill Lin <lbill@google.com>
Date: Fri, 5 Mar 2021 13:28:55 +0800
Subject: [PATCH 0620/1664] Avoid mis-trigger when motion do not endup within
 system gesture region

Previously, mOneHandedModeRegion reference larger gesture hieght
"navigation_bar_gesture_larger_height" for the detect region which
will easily introduce mis-trigger above NavBar panel region

Now we add 1 more condition to ensure user end up the motion in NavBar
region for both OHM & Swipe Notification gesture

Test: atest WMShellUnitTests
Test: NexusLauncher:connectedGoogleWithQuickstepDebugAndroidTest
Bug: 179957109
Change-Id: Ibceab87cd17fd8988f39c6c1746829d73623e4f1
---
 .../OrientationTouchTransformer.java          |  1 -
 .../OneHandedModeInputConsumer.java           | 20 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
index 6a32dc4f8e..a749f9a868 100644
--- a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
+++ b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
@@ -273,7 +273,6 @@ class OrientationTouchTransformer {
         Point size = display.realSize;
         int rotation = display.rotation;
         int touchHeight = mNavBarGesturalHeight;
-        int largerGesturalHeight = mNavBarLargerGesturalHeight;
         OrientationRectF orientationRectF =
                 new OrientationRectF(0, 0, size.x, size.y, rotation);
         if (mMode == SysUINavigationMode.Mode.NO_BUTTON) {
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
index b10bdde91f..cd69cf1366 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
@@ -21,14 +21,18 @@ import static android.view.MotionEvent.ACTION_DOWN;
 import static android.view.MotionEvent.ACTION_MOVE;
 import static android.view.MotionEvent.ACTION_UP;
 
+import static com.android.launcher3.ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE;
 import static com.android.launcher3.Utilities.squaredHypot;
 
 import android.content.Context;
+import android.graphics.Point;
 import android.graphics.PointF;
 import android.view.MotionEvent;
 
 import com.android.launcher3.R;
+import com.android.launcher3.ResourceUtils;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.util.DisplayController;
 import com.android.quickstep.InputConsumer;
 import com.android.quickstep.RecentsAnimationDeviceState;
 import com.android.quickstep.SystemUiProxy;
@@ -45,11 +49,15 @@ public class OneHandedModeInputConsumer extends DelegateInputConsumer {
     private static final int ANGLE_MIN = 30;
 
     private final Context mContext;
+    private final DisplayController.DisplayHolder mDisplayHolder;
+    private final Point mDisplaySize;
     private final RecentsAnimationDeviceState mDeviceState;
 
     private final float mDragDistThreshold;
     private final float mSquaredSlop;
 
+    private final int mNavBarSize;
+
     private final PointF mDownPos = new PointF();
     private final PointF mLastPos = new PointF();
 
@@ -60,10 +68,14 @@ public class OneHandedModeInputConsumer extends DelegateInputConsumer {
             InputConsumer delegate, InputMonitorCompat inputMonitor) {
         super(delegate, inputMonitor);
         mContext = context;
+        mDisplayHolder = DisplayController.getDefaultDisplay(mContext);
         mDeviceState = deviceState;
         mDragDistThreshold = context.getResources().getDimensionPixelSize(
                 R.dimen.gestures_onehanded_drag_threshold);
         mSquaredSlop = Utilities.squaredTouchSlop(context);
+        mDisplaySize = mDisplayHolder.getInfo().realSize;
+        mNavBarSize = ResourceUtils.getNavbarSize(NAVBAR_BOTTOM_GESTURE_SIZE,
+                mContext.getResources());
     }
 
     @Override
@@ -96,7 +108,8 @@ public class OneHandedModeInputConsumer extends DelegateInputConsumer {
                                 mDownPos.x - mLastPos.x, mDownPos.y - mLastPos.y))
                                 || (mDeviceState.isOneHandedModeActive() && isValidExitAngle(
                                 mDownPos.x - mLastPos.x, mDownPos.y - mLastPos.y))) {
-                            mPassedSlop = true;
+                            // To avoid mis-trigger when motion not touch system gesture region.
+                            mPassedSlop = isInSystemGestureRegion(mLastPos);
                             setActive(ev);
                         } else {
                             mState = STATE_DELEGATE_ACTIVE;
@@ -154,6 +167,11 @@ public class OneHandedModeInputConsumer extends DelegateInputConsumer {
         SystemUiProxy.INSTANCE.get(mContext).stopOneHandedMode();
     }
 
+    private boolean isInSystemGestureRegion(PointF lastPos) {
+        final int navBarUpperBound = mDisplaySize.y - mNavBarSize;
+        return mDeviceState.isGesturalNavMode() && lastPos.y > navBarUpperBound;
+    }
+
     private boolean isValidStartAngle(float deltaX, float deltaY) {
         final float angle = (float) Math.toDegrees(Math.atan2(deltaY, deltaX));
         return angle > -(ANGLE_MAX) && angle < -(ANGLE_MIN);
-- 
GitLab


From ae53cb246f9dc369e800a99733a7be007ceed99f Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Fri, 5 Mar 2021 19:00:37 +0000
Subject: [PATCH 0621/1664] Fix overview grid scroll problem

- This can be reproduced ocassionally without any obvious pattern, when this happen the page scroll and min/max scroll is messed up
- When this happen, onLayout happens before the first setGridProgress call from animations
- The fix is to request a relayout at the end of state transition

Bug: 174464863
Test: manual
Change-Id: I12683c49d7ed72349a4b9cb3b4d3871741e3e22e
---
 .../quickstep/views/ClearAllButton.java       |  8 ++--
 .../quickstep/views/LauncherRecentsView.java  |  2 +
 .../android/quickstep/views/RecentsView.java  | 38 +++++++++++++++----
 .../com/android/quickstep/views/TaskView.java | 18 ++++-----
 4 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/ClearAllButton.java b/quickstep/src/com/android/quickstep/views/ClearAllButton.java
index 9af4d3054c..e7101ccfe9 100644
--- a/quickstep/src/com/android/quickstep/views/ClearAllButton.java
+++ b/quickstep/src/com/android/quickstep/views/ClearAllButton.java
@@ -130,16 +130,16 @@ public class ClearAllButton extends Button implements PageCallbacks {
         applyPrimaryTranslation();
     }
 
-    public float getScrollAdjustment() {
+    public float getScrollAdjustment(boolean gridEnabled) {
         float scrollAdjustment = 0;
-        if (mGridProgress > 0) {
+        if (gridEnabled) {
             scrollAdjustment += mGridTranslationPrimary;
         }
         return scrollAdjustment;
     }
 
-    public float getOffsetAdjustment() {
-        return getScrollAdjustment();
+    public float getOffsetAdjustment(boolean gridEnabled) {
+        return getScrollAdjustment(gridEnabled);
     }
 
     /**
diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
index d99f707a68..c62f3e28ab 100644
--- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
@@ -160,6 +160,8 @@ public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher>
             reset();
         }
         setOverlayEnabled(finalState == OVERVIEW || finalState == OVERVIEW_MODAL_TASK);
+        setOverviewGridEnabled(finalState.displayOverviewTasksAsGrid(mActivity));
+        setOverviewFullscreenEnabled(finalState.getOverviewFullscreenProgress() == 1);
         setFreezeViewVisibility(false);
     }
 
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index f20ca82217..bdd0a3678e 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -299,6 +299,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     protected boolean mDisallowScrollToClearAll;
     private boolean mOverlayEnabled;
     protected boolean mFreezeViewVisibility;
+    private boolean mOverviewGridEnabled;
+    private boolean mOverviewFullscreenEnabled;
 
     private float mAdjacentPageOffset = 0;
     private float mTaskViewsSecondaryTranslation = 0;
@@ -676,8 +678,10 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     }
 
     private boolean isTaskViewWithinBounds(TaskView tv, int start, int end) {
-        int taskStart = mOrientationHandler.getChildStart(tv) + (int) tv.getOffsetAdjustment();
-        int taskSize = (int) (mOrientationHandler.getMeasuredSize(tv) * tv.getSizeAdjustment());
+        int taskStart = mOrientationHandler.getChildStart(tv) + (int) tv.getOffsetAdjustment(
+                mOverviewFullscreenEnabled, mOverviewGridEnabled);
+        int taskSize = (int) (mOrientationHandler.getMeasuredSize(tv) * tv.getSizeAdjustment(
+                mOverviewFullscreenEnabled, mOverviewGridEnabled));
         int taskEnd = taskStart + taskSize;
         return (taskStart >= start && taskStart <= end) || (taskEnd >= start
                 && taskEnd <= end);
@@ -2664,9 +2668,10 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             View child = getChildAt(i);
             float scrollDiff = 0;
             if (child instanceof TaskView) {
-                scrollDiff = ((TaskView) child).getScrollAdjustment();
+                scrollDiff = ((TaskView) child).getScrollAdjustment(mOverviewFullscreenEnabled,
+                        mOverviewGridEnabled);
             } else if (child instanceof ClearAllButton) {
-                scrollDiff = ((ClearAllButton) child).getScrollAdjustment();
+                scrollDiff = ((ClearAllButton) child).getScrollAdjustment(mOverviewGridEnabled);
             }
 
             if (scrollDiff != 0) {
@@ -2682,9 +2687,10 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         int childOffset = super.getChildOffset(index);
         View child = getChildAt(index);
         if (child instanceof TaskView) {
-            childOffset += ((TaskView) child).getOffsetAdjustment();
+            childOffset += ((TaskView) child).getOffsetAdjustment(mOverviewFullscreenEnabled,
+                    mOverviewGridEnabled);
         } else if (child instanceof ClearAllButton) {
-            childOffset += ((ClearAllButton) child).getOffsetAdjustment();
+            childOffset += ((ClearAllButton) child).getOffsetAdjustment(mOverviewGridEnabled);
         }
         return childOffset;
     }
@@ -2695,7 +2701,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         if (taskView == null) {
             return super.getChildVisibleSize(index);
         }
-        return (int) (super.getChildVisibleSize(index) * taskView.getSizeAdjustment());
+        return (int) (super.getChildVisibleSize(index) * taskView.getSizeAdjustment(
+                mOverviewFullscreenEnabled, mOverviewGridEnabled));
     }
 
     @Override
@@ -2810,6 +2817,23 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         }
     }
 
+    public void setOverviewGridEnabled(boolean overviewGridEnabled) {
+        if (mOverviewGridEnabled != overviewGridEnabled) {
+            mOverviewGridEnabled = overviewGridEnabled;
+            // Request layout to ensure scroll position is recalculated with updated mGridProgress.
+            requestLayout();
+        }
+    }
+
+    public void setOverviewFullscreenEnabled(boolean overviewFullscreenEnabled) {
+        if (mOverviewFullscreenEnabled != overviewFullscreenEnabled) {
+            mOverviewFullscreenEnabled = overviewFullscreenEnabled;
+            // Request layout to ensure scroll position is recalculated with updated
+            // mFullscreenProgress.
+            requestLayout();
+        }
+    }
+
     /**
      * Switch the current running task view to static snapshot mode,
      * capturing the snapshot at the same time.
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 0cf7261fa8..88545c6436 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -938,31 +938,31 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         mNonRtlVisibleOffset = nonRtlVisibleOffset;
     }
 
-    public float getScrollAdjustment() {
+    public float getScrollAdjustment(boolean fullscreenEnabled, boolean gridEnabled) {
         float scrollAdjustment = 0;
-        if (mFullscreenProgress > 0) {
+        if (fullscreenEnabled) {
             scrollAdjustment += mFullscreenTranslationX + mAccumulatedFullscreenTranslationX;
         }
-        if (mGridProgress > 0) {
+        if (gridEnabled) {
             scrollAdjustment += mGridTranslationX;
         }
         return scrollAdjustment;
     }
 
-    public float getOffsetAdjustment() {
-        float offsetAdjustment = getScrollAdjustment();
-        if (mGridProgress > 0) {
+    public float getOffsetAdjustment(boolean fullscreenEnabled, boolean gridEnabled) {
+        float offsetAdjustment = getScrollAdjustment(fullscreenEnabled, gridEnabled);
+        if (gridEnabled) {
             offsetAdjustment += mGridOffsetTranslationX + mNonRtlVisibleOffset;
         }
         return offsetAdjustment;
     }
 
-    public float getSizeAdjustment() {
+    public float getSizeAdjustment(boolean fullscreenEnabled, boolean gridEnabled) {
         float sizeAdjustment = 1;
-        if (mFullscreenProgress > 0) {
+        if (fullscreenEnabled) {
             sizeAdjustment *= mFullscreenScale;
         }
-        if (mGridProgress > 0) {
+        if (gridEnabled) {
             sizeAdjustment *= mGridScale;
         }
         return sizeAdjustment;
-- 
GitLab


From 45fc68118045243c292a1fd3af6744165223fde1 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Mon, 8 Mar 2021 18:10:22 +0000
Subject: [PATCH 0622/1664] Use ACCEL_DEACCEL when swiping up to enter grid

Bug: 174464863
Test: Test entering grid when swipe up on small and large screens
Change-Id: I0799ef341b8344406de371501dc34a12ac8cbc6e
---
 quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 7f2af6b01c..e0c041eb9d 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -934,7 +934,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                     duration = Math.min(MAX_SWIPE_DURATION, 2 * baseDuration);
             }
         }
-        Interpolator interpolator = endTarget == RECENTS ? OVERSHOOT_1_2 : DEACCEL;
+        Interpolator interpolator =
+                endTarget == RECENTS ? (mDp.isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get()
+                        ? ACCEL_DEACCEL : OVERSHOOT_1_2) : DEACCEL;
 
         if (endTarget.isLauncher) {
             mInputConsumerProxy.enable();
-- 
GitLab


From 51b2453e30ff14a469c47aefe747b88270e08d4d Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 8 Mar 2021 10:14:10 -0800
Subject: [PATCH 0623/1664] End any running taskbar animation in cleanup()

Test: Open an app, swipe to home and remove taskbar during animation,
ensure no crash
Fixes: 182163822

Change-Id: Ie92b4fdf03a23c8a205d1d7327a304cf1d996383
---
 .../launcher3/taskbar/TaskbarController.java  | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index 544bc99869..9c3f27a593 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -85,6 +85,7 @@ public class TaskbarController {
     // Contains all loaded Hotseat items.
     private ItemInfo[] mLatestLoadedHotseatItems;
 
+    private @Nullable Animator mAnimator;
     private boolean mIsAnimatingToLauncher;
 
     public TaskbarController(BaseQuickstepLauncher launcher,
@@ -245,6 +246,10 @@ public class TaskbarController {
         mTaskbarVisibilityController.cleanup();
         mHotseatController.cleanup();
         mRecentsController.cleanup();
+
+        if (mAnimator != null) {
+            mAnimator.end();
+        }
     }
 
     private void removeFromWindowManager() {
@@ -287,13 +292,21 @@ public class TaskbarController {
      */
     public void onLauncherResumedOrPaused(boolean isResumed) {
         long duration = QuickstepAppTransitionManagerImpl.CONTENT_ALPHA_DURATION;
-        final Animator anim;
+        if (mAnimator != null) {
+            mAnimator.cancel();
+        }
         if (isResumed) {
-            anim = createAnimToLauncher(null, duration);
+            mAnimator = createAnimToLauncher(null, duration);
         } else {
-            anim = createAnimToApp(duration);
+            mAnimator = createAnimToApp(duration);
         }
-        anim.start();
+        mAnimator.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                mAnimator = null;
+            }
+        });
+        mAnimator.start();
     }
 
     /**
-- 
GitLab


From ae6b34811b3f66bb1c7a621a3651b3ae0d0b9c3d Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Fri, 5 Mar 2021 20:20:24 +0000
Subject: [PATCH 0624/1664] WidgetCell & LiveWidgetPreview cleanup

The fixes are:
1. For widgets shown in TableRow, aligns them center vertically.
   This is useful when widgets of different height are shown in
   the same row.
2. Remove background color from WidgetCell
3. Re-enable swipe in FullWidgetsSheet
4. Use the WidgetCell image as the single & long press area because
   1. Previews are now scaled to their default size. The touch area
      should already be larger for widgets that are bigger than 2.4
      cells
   2. WidgetCells also render description. If the user long press the
      description area, the drag view will not align in the middle of
      the user touch / drag area.

Test: Drag-n-drop widgets from FullWidgetsSheet, BottomWidgetsSheet
      and pin widget flow.
      In FullWidgetsSheet, swipe left and right to switch work /
      personal tab.

Video: https://drive.google.com/file/d/1Ur7PwF1a7iwGGRTZczfc0BSVu-Ta6-Vm/view?usp=sharing

Bug: 179797520
Change-Id: I6fe4bc88d1e1b35b1819d8d7f046105f5ed27043
---
 res/layout/add_item_confirmation_activity.xml |   4 +-
 res/layout/live_preview_widget_cell.xml       |  30 ----
 res/layout/widget_cell.xml                    |   1 -
 src/com/android/launcher3/PagedView.java      |  12 --
 .../launcher3/dragndrop/AddItemActivity.java  |   8 +-
 .../dragndrop/LivePreviewWidgetCell.java      | 153 ------------------
 .../launcher3/widget/BaseWidgetSheet.java     |   7 +-
 .../widget/PendingItemDragHelper.java         |   3 +-
 .../android/launcher3/widget/WidgetCell.java  | 107 ++++++++++++
 .../launcher3/widget/WidgetsBottomSheet.java  |  12 +-
 .../widget/picker/WidgetsFullSheet.java       |   3 -
 .../WidgetsListTableViewHolderBinder.java     |  10 +-
 12 files changed, 132 insertions(+), 218 deletions(-)
 delete mode 100644 res/layout/live_preview_widget_cell.xml
 delete mode 100644 src/com/android/launcher3/dragndrop/LivePreviewWidgetCell.java

diff --git a/res/layout/add_item_confirmation_activity.xml b/res/layout/add_item_confirmation_activity.xml
index 830255b6aa..b1a1efe0ac 100644
--- a/res/layout/add_item_confirmation_activity.xml
+++ b/res/layout/add_item_confirmation_activity.xml
@@ -46,7 +46,7 @@
                 android:background="?android:attr/colorPrimaryDark"
                 android:theme="?attr/widgetsTheme">
 
-                <com.android.launcher3.dragndrop.LivePreviewWidgetCell
+                <com.android.launcher3.widget.WidgetCell
                     android:id="@+id/widget_cell"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -59,7 +59,7 @@
 
                     <include layout="@layout/widget_cell_content"  />
 
-                </com.android.launcher3.dragndrop.LivePreviewWidgetCell>
+                </com.android.launcher3.widget.WidgetCell>
             </FrameLayout>
         </LinearLayout>
     </ScrollView>
diff --git a/res/layout/live_preview_widget_cell.xml b/res/layout/live_preview_widget_cell.xml
deleted file mode 100644
index 1e1ce6e42e..0000000000
--- a/res/layout/live_preview_widget_cell.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.launcher3.dragndrop.LivePreviewWidgetCell
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="0dp"
-    android:layout_height="wrap_content"
-    android:paddingHorizontal="@dimen/widget_cell_horizontal_padding"
-    android:paddingVertical="@dimen/widget_cell_vertical_padding"
-    android:layout_weight="1"
-    android:orientation="vertical"
-    android:focusable="true"
-    android:background="?android:attr/colorPrimaryDark"
-    android:gravity="center_horizontal">
-
-    <include layout="@layout/widget_cell_content" />
-
-</com.android.launcher3.dragndrop.LivePreviewWidgetCell>
\ No newline at end of file
diff --git a/res/layout/widget_cell.xml b/res/layout/widget_cell.xml
index 73a573754a..55dd1de034 100644
--- a/res/layout/widget_cell.xml
+++ b/res/layout/widget_cell.xml
@@ -22,7 +22,6 @@
     android:layout_weight="1"
     android:orientation="vertical"
     android:focusable="true"
-    android:background="?android:attr/colorPrimaryDark"
     android:gravity="center_horizontal">
 
     <include layout="@layout/widget_cell_content"  />
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index c6766a470c..50f1e445ed 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -96,8 +96,6 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
     private static final int MIN_FLING_VELOCITY = 250;
 
     private boolean mFreeScroll = false;
-    /** If {@code false}, disable swipe gesture to switch between pages. */
-    private boolean mSwipeGestureEnabled = true;
 
     protected final int mFlingThresholdVelocity;
     protected final int mEasyFlingThresholdVelocity;
@@ -859,14 +857,6 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         }
     }
 
-    /**
-     * If {@code enableSwipeGesture} is {@code true}, enables swipe gesture to navigate between
-     * pages. Otherwise, disables the navigation gesture.
-     */
-    public void setSwipeGestureEnabled(boolean swipeGestureEnabled) {
-        mSwipeGestureEnabled = swipeGestureEnabled;
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -889,8 +879,6 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
          * scrolling there.
          */
 
-        if (!mSwipeGestureEnabled) return false;
-
         // Skip touch handling if there are no pages to swipe
         if (getChildCount() <= 0) return false;
 
diff --git a/src/com/android/launcher3/dragndrop/AddItemActivity.java b/src/com/android/launcher3/dragndrop/AddItemActivity.java
index 5dc94ff597..c972cbbd7e 100644
--- a/src/com/android/launcher3/dragndrop/AddItemActivity.java
+++ b/src/com/android/launcher3/dragndrop/AddItemActivity.java
@@ -58,6 +58,7 @@ import com.android.launcher3.widget.LauncherAppWidgetHost;
 import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.PendingAddShortcutInfo;
 import com.android.launcher3.widget.PendingAddWidgetInfo;
+import com.android.launcher3.widget.WidgetCell;
 import com.android.launcher3.widget.WidgetHostViewLoader;
 import com.android.launcher3.widget.WidgetImageView;
 import com.android.launcher3.widget.WidgetManagerHelper;
@@ -78,7 +79,7 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
     private LauncherAppState mApp;
     private InvariantDeviceProfile mIdp;
 
-    private LivePreviewWidgetCell mWidgetCell;
+    private WidgetCell mWidgetCell;
 
     // Widget request specific options.
     private LauncherAppWidgetHost mAppWidgetHost;
@@ -117,8 +118,9 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
             }
         }
 
-        mWidgetCell.setOnTouchListener(this);
-        mWidgetCell.setOnLongClickListener(this);
+        WidgetImageView preview = mWidgetCell.findViewById(R.id.widget_preview);
+        preview.setOnTouchListener(this);
+        preview.setOnLongClickListener(this);
 
         // savedInstanceState is null when the activity is created the first time (i.e., avoids
         // duplicate logging during rotation)
diff --git a/src/com/android/launcher3/dragndrop/LivePreviewWidgetCell.java b/src/com/android/launcher3/dragndrop/LivePreviewWidgetCell.java
deleted file mode 100644
index 826ddb0b4e..0000000000
--- a/src/com/android/launcher3/dragndrop/LivePreviewWidgetCell.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package com.android.launcher3.dragndrop;
-
-import static com.android.launcher3.Utilities.ATLEAST_S;
-
-import android.appwidget.AppWidgetHostView;
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.RemoteViews;
-
-import com.android.launcher3.BaseActivity;
-import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.WidgetPreviewLoader;
-import com.android.launcher3.icons.BitmapRenderer;
-import com.android.launcher3.model.WidgetItem;
-import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
-import com.android.launcher3.widget.WidgetCell;
-
-/**
- * Extension of {@link WidgetCell} which supports generating previews from {@link RemoteViews}
- */
-public class LivePreviewWidgetCell extends WidgetCell {
-
-    private RemoteViews mPreview;
-
-    private AppWidgetHostView mPreviewAppWidgetHostView;
-
-    public LivePreviewWidgetCell(Context context) {
-        this(context, null);
-    }
-
-    public LivePreviewWidgetCell(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public LivePreviewWidgetCell(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    public void setPreview(RemoteViews view) {
-        mPreview = view;
-    }
-
-    public RemoteViews getPreview() {
-        return mPreview;
-    }
-
-    /** Resets any resource. This should be called before recycling this view. */
-    @Override
-    public void clear() {
-        super.clear();
-        mPreview = null;
-        mPreviewAppWidgetHostView = null;
-    }
-
-    @Override
-    public void ensurePreview() {
-        if (mPreview != null && mActiveRequest == null) {
-            Bitmap preview = generateFromRemoteViews(
-                    mActivity, mPreview, mItem.widgetInfo, mPresetPreviewSize, new int[1]);
-            if (preview != null) {
-                applyPreview(preview);
-                return;
-            }
-        }
-
-        if (mPreviewAppWidgetHostView != null) {
-            Bitmap preview = generateFromView(mActivity, mPreviewAppWidgetHostView,
-                    mItem.widgetInfo, mPreviewWidth, new int[1]);
-            if (preview != null) {
-                applyPreview(preview);
-                return;
-            }
-        }
-        super.ensurePreview();
-    }
-
-    @Override
-    public void applyFromCellItem(WidgetItem item, WidgetPreviewLoader loader) {
-        if (ATLEAST_S
-                && mPreview == null
-                && item.widgetInfo != null
-                && item.widgetInfo.previewLayout != Resources.ID_NULL) {
-            mPreviewAppWidgetHostView = new AppWidgetHostView(getContext());
-            LauncherAppWidgetProviderInfo launcherAppWidgetProviderInfo =
-                    LauncherAppWidgetProviderInfo.fromProviderInfo(getContext(),
-                            item.widgetInfo.clone());
-            // A hack to force the initial layout to be the preview layout since there is no API for
-            // rendering a preview layout for work profile apps yet. For non-work profile layout, a
-            // proper solution is to use RemoteViews(PackageName, LayoutId).
-            launcherAppWidgetProviderInfo.initialLayout = item.widgetInfo.previewLayout;
-            mPreviewAppWidgetHostView.setAppWidget(/* appWidgetId= */ -1,
-                    launcherAppWidgetProviderInfo);
-            mPreviewAppWidgetHostView.setPadding(/* left= */ 0, /* top= */0, /* right= */
-                    0, /* bottom= */ 0);
-            mPreviewAppWidgetHostView.updateAppWidget(/* remoteViews= */ null);
-        }
-
-        super.applyFromCellItem(item, loader);
-    }
-
-    /**
-     * Generates a bitmap by inflating {@param views}.
-     * @see com.android.launcher3.WidgetPreviewLoader#generateWidgetPreview
-     *
-     * TODO: Consider moving this to the background thread.
-     */
-    public static Bitmap generateFromRemoteViews(BaseActivity activity, RemoteViews views,
-            LauncherAppWidgetProviderInfo info, int previewSize, int[] preScaledWidthOut) {
-        try {
-            return generateFromView(activity, views.apply(activity, new FrameLayout(activity)),
-                    info, previewSize, preScaledWidthOut);
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    private static Bitmap generateFromView(BaseActivity activity, View v,
-            LauncherAppWidgetProviderInfo info, int previewSize, int[] preScaledWidthOut) {
-
-        DeviceProfile dp = activity.getDeviceProfile();
-        int viewWidth = dp.cellWidthPx * info.spanX;
-        int viewHeight = dp.cellHeightPx * info.spanY;
-
-        v.measure(MeasureSpec.makeMeasureSpec(viewWidth, MeasureSpec.EXACTLY),
-                MeasureSpec.makeMeasureSpec(viewHeight, MeasureSpec.EXACTLY));
-
-        viewWidth = v.getMeasuredWidth();
-        viewHeight = v.getMeasuredHeight();
-        v.layout(0, 0, viewWidth, viewHeight);
-
-        preScaledWidthOut[0] = viewWidth;
-        final int bitmapWidth, bitmapHeight;
-        final float scale;
-        if (viewWidth > previewSize) {
-            scale = ((float) previewSize) / viewWidth;
-            bitmapWidth = previewSize;
-            bitmapHeight = (int) (viewHeight * scale);
-        } else {
-            scale = 1;
-            bitmapWidth = viewWidth;
-            bitmapHeight = viewHeight;
-        }
-
-        return BitmapRenderer.createSoftwareBitmap(bitmapWidth, bitmapHeight, c -> {
-            c.scale(scale, scale);
-            v.draw(c);
-        });
-    }
-}
diff --git a/src/com/android/launcher3/widget/BaseWidgetSheet.java b/src/com/android/launcher3/widget/BaseWidgetSheet.java
index 15566a4e8e..03c58bb387 100644
--- a/src/com/android/launcher3/widget/BaseWidgetSheet.java
+++ b/src/com/android/launcher3/widget/BaseWidgetSheet.java
@@ -30,7 +30,6 @@ import com.android.launcher3.DropTarget.DragObject;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.dragndrop.DragOptions;
-import com.android.launcher3.dragndrop.LivePreviewWidgetCell;
 import com.android.launcher3.popup.PopupDataProvider;
 import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.TestProtocol;
@@ -86,6 +85,8 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView
 
         if (v instanceof WidgetCell) {
             return beginDraggingWidget((WidgetCell) v);
+        } else if (v.getParent() instanceof WidgetCell) {
+            return beginDraggingWidget((WidgetCell) v.getParent());
         }
         return true;
     }
@@ -101,9 +102,7 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView
         }
 
         PendingItemDragHelper dragHelper = new PendingItemDragHelper(v);
-        if (v instanceof LivePreviewWidgetCell) {
-            dragHelper.setPreview(((LivePreviewWidgetCell) v).getPreview());
-        }
+        dragHelper.setPreview(v.getPreview());
 
         int[] loc = new int[2];
         getPopupContainer().getLocationInDragLayer(image, loc);
diff --git a/src/com/android/launcher3/widget/PendingItemDragHelper.java b/src/com/android/launcher3/widget/PendingItemDragHelper.java
index 8fe42f4861..6e8383698d 100644
--- a/src/com/android/launcher3/widget/PendingItemDragHelper.java
+++ b/src/com/android/launcher3/widget/PendingItemDragHelper.java
@@ -35,7 +35,6 @@ import com.android.launcher3.PendingAddItemInfo;
 import com.android.launcher3.R;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.dragndrop.DraggableView;
-import com.android.launcher3.dragndrop.LivePreviewWidgetCell;
 import com.android.launcher3.graphics.DragPreviewProvider;
 import com.android.launcher3.icons.LauncherIcons;
 
@@ -92,7 +91,7 @@ public class PendingItemDragHelper extends DragPreviewProvider {
             int[] previewSizeBeforeScale = new int[1];
 
             if (mPreview != null) {
-                preview = LivePreviewWidgetCell.generateFromRemoteViews(launcher, mPreview,
+                preview = WidgetCell.generateFromRemoteViews(launcher, mPreview,
                         createWidgetInfo.info, maxWidth, previewSizeBeforeScale);
             }
             if (preview == null) {
diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index ea6f0c35c1..229df50288 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -18,7 +18,9 @@ package com.android.launcher3.widget;
 
 import static com.android.launcher3.Utilities.ATLEAST_S;
 
+import android.appwidget.AppWidgetHostView;
 import android.content.Context;
+import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.os.CancellationSignal;
 import android.util.AttributeSet;
@@ -28,7 +30,9 @@ import android.view.View;
 import android.view.View.OnLayoutChangeListener;
 import android.view.ViewPropertyAnimator;
 import android.view.accessibility.AccessibilityNodeInfo;
+import android.widget.FrameLayout;
 import android.widget.LinearLayout;
+import android.widget.RemoteViews;
 import android.widget.TextView;
 
 import com.android.launcher3.BaseActivity;
@@ -37,6 +41,7 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.R;
 import com.android.launcher3.WidgetPreviewLoader;
 import com.android.launcher3.icons.BaseIconFactory;
+import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.model.WidgetItem;
 
 /**
@@ -85,6 +90,9 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     protected final DeviceProfile mDeviceProfile;
     private final CheckLongPressHelper mLongPressHelper;
 
+    private RemoteViews mPreview;
+    private AppWidgetHostView mPreviewAppWidgetHostView;
+
     public WidgetCell(Context context) {
         this(context, null);
     }
@@ -123,6 +131,14 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
         mWidgetDescription = findViewById(R.id.widget_description);
     }
 
+    public void setPreview(RemoteViews view) {
+        mPreview = view;
+    }
+
+    public RemoteViews getPreview() {
+        return mPreview;
+    }
+
     /**
      * Called to clear the view and free attached resources. (e.g., {@link Bitmap}
      */
@@ -142,9 +158,13 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
             mActiveRequest.cancel();
             mActiveRequest = null;
         }
+        mPreview = null;
+        mPreviewAppWidgetHostView = null;
     }
 
     public void applyFromCellItem(WidgetItem item, WidgetPreviewLoader loader) {
+        applyPreviewLayout(item);
+
         mItem = item;
         mWidgetName.setText(mItem.label);
         mWidgetDims.setText(getContext().getString(R.string.widget_dims_format,
@@ -169,6 +189,27 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
         }
     }
 
+    private void applyPreviewLayout(WidgetItem item) {
+        if (ATLEAST_S
+                && mPreview == null
+                && item.widgetInfo != null
+                && item.widgetInfo.previewLayout != Resources.ID_NULL) {
+            mPreviewAppWidgetHostView = new AppWidgetHostView(getContext());
+            LauncherAppWidgetProviderInfo launcherAppWidgetProviderInfo =
+                    LauncherAppWidgetProviderInfo.fromProviderInfo(getContext(),
+                            item.widgetInfo.clone());
+            // A hack to force the initial layout to be the preview layout since there is no API for
+            // rendering a preview layout for work profile apps yet. For non-work profile layout, a
+            // proper solution is to use RemoteViews(PackageName, LayoutId).
+            launcherAppWidgetProviderInfo.initialLayout = item.widgetInfo.previewLayout;
+            mPreviewAppWidgetHostView.setAppWidget(/* appWidgetId= */ -1,
+                    launcherAppWidgetProviderInfo);
+            mPreviewAppWidgetHostView.setPadding(/* left= */ 0, /* top= */0, /* right= */
+                    0, /* bottom= */ 0);
+            mPreviewAppWidgetHostView.updateAppWidget(/* remoteViews= */ null);
+        }
+    }
+
     public WidgetImageView getWidgetView() {
         return mWidgetImage;
     }
@@ -217,6 +258,23 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     }
 
     public void ensurePreview() {
+        if (mPreview != null && mActiveRequest == null) {
+            Bitmap preview = generateFromRemoteViews(
+                    mActivity, mPreview, mItem.widgetInfo, mPresetPreviewSize, new int[1]);
+            if (preview != null) {
+                applyPreview(preview);
+                return;
+            }
+        }
+
+        if (mPreviewAppWidgetHostView != null) {
+            Bitmap preview = generateFromView(mActivity, mPreviewAppWidgetHostView,
+                    mItem.widgetInfo, mPreviewWidth, new int[1]);
+            if (preview != null) {
+                applyPreview(preview);
+                return;
+            }
+        }
         if (mActiveRequest != null) {
             return;
         }
@@ -273,4 +331,53 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
         super.onInitializeAccessibilityNodeInfo(info);
         info.removeAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_CLICK);
     }
+
+    /**
+     * Generates a bitmap by inflating {@param views}.
+     * @see com.android.launcher3.WidgetPreviewLoader#generateWidgetPreview
+     *
+     * TODO: Consider moving this to the background thread.
+     */
+    public static Bitmap generateFromRemoteViews(BaseActivity activity, RemoteViews views,
+            LauncherAppWidgetProviderInfo info, int previewSize, int[] preScaledWidthOut) {
+        try {
+            return generateFromView(activity, views.apply(activity, new FrameLayout(activity)),
+                    info, previewSize, preScaledWidthOut);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    private static Bitmap generateFromView(BaseActivity activity, View v,
+            LauncherAppWidgetProviderInfo info, int previewSize, int[] preScaledWidthOut) {
+
+        DeviceProfile dp = activity.getDeviceProfile();
+        int viewWidth = dp.cellWidthPx * info.spanX;
+        int viewHeight = dp.cellHeightPx * info.spanY;
+
+        v.measure(MeasureSpec.makeMeasureSpec(viewWidth, MeasureSpec.EXACTLY),
+                MeasureSpec.makeMeasureSpec(viewHeight, MeasureSpec.EXACTLY));
+
+        viewWidth = v.getMeasuredWidth();
+        viewHeight = v.getMeasuredHeight();
+        v.layout(0, 0, viewWidth, viewHeight);
+
+        preScaledWidthOut[0] = viewWidth;
+        final int bitmapWidth, bitmapHeight;
+        final float scale;
+        if (viewWidth > previewSize) {
+            scale = ((float) previewSize) / viewWidth;
+            bitmapWidth = previewSize;
+            bitmapHeight = (int) (viewHeight * scale);
+        } else {
+            scale = 1;
+            bitmapWidth = viewWidth;
+            bitmapHeight = viewHeight;
+        }
+
+        return BitmapRenderer.createSoftwareBitmap(bitmapWidth, bitmapHeight, c -> {
+            c.scale(scale, scale);
+            v.draw(c);
+        });
+    }
 }
diff --git a/src/com/android/launcher3/widget/WidgetsBottomSheet.java b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
index 6abbf21019..e6d54a9435 100644
--- a/src/com/android/launcher3/widget/WidgetsBottomSheet.java
+++ b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
@@ -24,6 +24,7 @@ import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.util.IntProperty;
 import android.util.Pair;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -38,7 +39,6 @@ import com.android.launcher3.Insettable;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.anim.PendingAnimation;
-import com.android.launcher3.dragndrop.LivePreviewWidgetCell;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.util.PackageUserKey;
@@ -140,6 +140,7 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
 
         WidgetsTableUtils.groupWidgetItemsIntoTable(widgets, mMaxHorizontalSpan).forEach(row -> {
             TableRow tableRow = new TableRow(getContext());
+            tableRow.setGravity(Gravity.CENTER_VERTICAL);
             row.forEach(widgetItem -> {
                 WidgetCell widget = addItemCell(tableRow);
                 widget.setPreviewSize(widgetItem.spanX, widgetItem.spanY);
@@ -153,11 +154,12 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
     }
 
     protected WidgetCell addItemCell(ViewGroup parent) {
-        LivePreviewWidgetCell widget = (LivePreviewWidgetCell) LayoutInflater.from(
-                getContext()).inflate(R.layout.live_preview_widget_cell, parent, false);
+        WidgetCell widget = (WidgetCell) LayoutInflater.from(getContext())
+                .inflate(R.layout.widget_cell, parent, false);
 
-        widget.setOnClickListener(this);
-        widget.setOnLongClickListener(this);
+        WidgetImageView preview = widget.findViewById(R.id.widget_preview);
+        preview.setOnClickListener(this);
+        preview.setOnLongClickListener(this);
         widget.setAnimatePreview(false);
 
         parent.addView(widget);
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 52a2fc5ac0..bf9b849f84 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -110,9 +110,6 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         RecyclerViewFastScroller fastScroller = findViewById(R.id.fast_scroller);
         if (mHasWorkProfile) {
             mViewPager = findViewById(R.id.widgets_view_pager);
-            // Temporarily disable swipe gesture until widgets list horizontal scrollviews per
-            // app are replaced by gird views.
-            mViewPager.setSwipeGestureEnabled(false);
             mViewPager.initParentViews(this);
             mViewPager.getPageIndicator().setOnActivePageChangedListener(this);
             mViewPager.getPageIndicator().setActiveMarker(AdapterHolder.PRIMARY);
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java b/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
index 28ffd5473a..47fa71ac83 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
@@ -17,6 +17,7 @@ package com.android.launcher3.widget.picker;
 
 import android.content.Context;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -30,6 +31,7 @@ import com.android.launcher3.WidgetPreviewLoader;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.recyclerview.ViewHolderBinder;
 import com.android.launcher3.widget.WidgetCell;
+import com.android.launcher3.widget.WidgetImageView;
 import com.android.launcher3.widget.model.WidgetsListContentEntry;
 import com.android.launcher3.widget.util.WidgetsTableUtils;
 
@@ -144,6 +146,7 @@ public final class WidgetsListTableViewHolderBinder
                 tableRow = (TableRow) table.getChildAt(i);
             } else {
                 tableRow = new TableRow(table.getContext());
+                tableRow.setGravity(Gravity.CENTER_VERTICAL);
                 table.addView(tableRow);
             }
             if (tableRow.getChildCount() > widgetItems.size()) {
@@ -153,10 +156,11 @@ public final class WidgetsListTableViewHolderBinder
             } else {
                 for (int j = tableRow.getChildCount(); j < widgetItems.size(); j++) {
                     WidgetCell widget = (WidgetCell) mLayoutInflater.inflate(
-                            R.layout.live_preview_widget_cell, tableRow, false);
+                            R.layout.widget_cell, tableRow, false);
                     // set up touch.
-                    widget.setOnClickListener(mIconClickListener);
-                    widget.setOnLongClickListener(mIconLongClickListener);
+                    WidgetImageView preview = widget.findViewById(R.id.widget_preview);
+                    preview.setOnClickListener(mIconClickListener);
+                    preview.setOnLongClickListener(mIconLongClickListener);
                     tableRow.addView(widget);
                 }
             }
-- 
GitLab


From 3a8353256a9cc2880a578ddf5a53bf7c34b5f63a Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Tue, 2 Mar 2021 21:26:00 +0000
Subject: [PATCH 0625/1664] Widgets recommendation backend

Add a widgets recommendation mechanism based on AiAI app predication
ranking with the following changes:

1. Only one widget is picked from one app.
2. Widgets that are already added to the workspace are excluded from
   the recommendation.

Test: run PredicationUpdateTaskTest

Bug: 179797520
Change-Id: Ia697bc6df0bae75969e68b7b3de32d57901f7461
---
 .../android/launcher3/model/WidgetsModel.java |   8 +-
 .../WidgetsPredicationUpdateTaskTest.java     | 263 ++++++++++++++++++
 .../model/QuickstepModelDelegate.java         |  30 ++
 .../model/WidgetsPredictionUpdateTask.java    |  82 ++++++
 .../uioverrides/QuickstepLauncher.java        |   2 +
 .../widgets_predication_update_task_data.txt  |  24 ++
 .../android/launcher3/LauncherSettings.java   |   1 +
 .../launcher3/model/BaseModelUpdateTask.java  |   2 +-
 .../launcher3/popup/PopupDataProvider.java    |  32 ++-
 .../launcher3/model/LoaderResults.java        |   2 +-
 .../android/launcher3/model/WidgetsModel.java |  20 +-
 11 files changed, 461 insertions(+), 5 deletions(-)
 create mode 100644 quickstep/robolectric_tests/src/com/android/launcher3/model/WidgetsPredicationUpdateTaskTest.java
 create mode 100644 quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java
 create mode 100644 robolectric_tests/resources/widgets_predication_update_task_data.txt

diff --git a/go/src/com/android/launcher3/model/WidgetsModel.java b/go/src/com/android/launcher3/model/WidgetsModel.java
index a202095c47..cc5e1cbb46 100644
--- a/go/src/com/android/launcher3/model/WidgetsModel.java
+++ b/go/src/com/android/launcher3/model/WidgetsModel.java
@@ -30,6 +30,7 @@ import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -53,10 +54,15 @@ public class WidgetsModel {
      *
      * @see com.android.launcher3.widget.picker.WidgetsListAdapter#setWidgets(List)
      */
-    public synchronized ArrayList<WidgetsListBaseEntry> getWidgetsList(Context context) {
+    public synchronized ArrayList<WidgetsListBaseEntry> getWidgetsListForPicker(Context context) {
         return EMPTY_WIDGET_LIST;
     }
 
+    /** Returns a mapping of packages to their widgets without static shortcuts. */
+    public synchronized Map<PackageUserKey, List<WidgetItem>> getAllWidgetsWithoutShortcuts() {
+        return Map.of();
+    }
+
     /**
      * @param packageUser If null, all widgets and shortcuts are updated and returned, otherwise
      *                    only widgets and shortcuts associated with the package/user are.
diff --git a/quickstep/robolectric_tests/src/com/android/launcher3/model/WidgetsPredicationUpdateTaskTest.java b/quickstep/robolectric_tests/src/com/android/launcher3/model/WidgetsPredicationUpdateTaskTest.java
new file mode 100644
index 0000000000..70a143ee6f
--- /dev/null
+++ b/quickstep/robolectric_tests/src/com/android/launcher3/model/WidgetsPredicationUpdateTaskTest.java
@@ -0,0 +1,263 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.model;
+
+import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_PREDICTION;
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.app.prediction.AppTarget;
+import android.app.prediction.AppTargetId;
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProviderInfo;
+import android.content.ComponentName;
+import android.content.Context;
+import android.os.Process;
+import android.os.UserHandle;
+
+import com.android.launcher3.InvariantDeviceProfile;
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.icons.ComponentWithLabel;
+import com.android.launcher3.icons.IconCache;
+import com.android.launcher3.model.BgDataModel.FixedContainerItems;
+import com.android.launcher3.model.QuickstepModelDelegate.PredictorState;
+import com.android.launcher3.model.data.AppInfo;
+import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.LauncherAppWidgetInfo;
+import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.launcher3.util.ComponentKey;
+import com.android.launcher3.util.IntArray;
+import com.android.launcher3.util.ItemInfoMatcher;
+import com.android.launcher3.util.LauncherModelHelper;
+import com.android.launcher3.util.ViewOnDrawExecutor;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
+import com.android.launcher3.widget.PendingAddWidgetInfo;
+import com.android.launcher3.widget.model.WidgetsListBaseEntry;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadows.ShadowAppWidgetManager;
+import org.robolectric.shadows.ShadowPackageManager;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@RunWith(RobolectricTestRunner.class)
+public final class WidgetsPredicationUpdateTaskTest {
+
+    private AppWidgetProviderInfo mApp1Provider1 = new AppWidgetProviderInfo();
+    private AppWidgetProviderInfo mApp1Provider2 = new AppWidgetProviderInfo();
+    private AppWidgetProviderInfo mApp2Provider1 = new AppWidgetProviderInfo();
+    private AppWidgetProviderInfo mApp4Provider1 = new AppWidgetProviderInfo();
+    private AppWidgetProviderInfo mApp4Provider2 = new AppWidgetProviderInfo();
+    private AppWidgetProviderInfo mApp5Provider1 = new AppWidgetProviderInfo();
+
+    private FakeBgDataModelCallback mCallback = new FakeBgDataModelCallback();
+    private Context mContext;
+    private LauncherModelHelper mModelHelper;
+    private UserHandle mUserHandle;
+    private InvariantDeviceProfile mTestProfile;
+
+    @Mock
+    private IconCache mIconCache;
+
+    @Before
+    public void setup() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        doAnswer(invocation -> {
+            ComponentWithLabel componentWithLabel = invocation.getArgument(0);
+            return componentWithLabel.getComponent().getShortClassName();
+        }).when(mIconCache).getTitleNoCache(any());
+
+        mContext = RuntimeEnvironment.application;
+        mModelHelper = new LauncherModelHelper();
+        mUserHandle = Process.myUserHandle();
+        mTestProfile = new InvariantDeviceProfile();
+        // 2 widgets, app4/provider1 & app5/provider1, have already been added to the workspace.
+        mModelHelper.initializeData("/widgets_predication_update_task_data.txt");
+
+        ShadowPackageManager packageManager = shadowOf(mContext.getPackageManager());
+        mApp1Provider1.provider = ComponentName.createRelative("app1", "provider1");
+        ReflectionHelpers.setField(mApp1Provider1, "providerInfo",
+                packageManager.addReceiverIfNotPresent(mApp1Provider1.provider));
+        mApp1Provider2.provider = ComponentName.createRelative("app1", "provider2");
+        ReflectionHelpers.setField(mApp1Provider2, "providerInfo",
+                packageManager.addReceiverIfNotPresent(mApp1Provider2.provider));
+        mApp2Provider1.provider = ComponentName.createRelative("app2", "provider1");
+        ReflectionHelpers.setField(mApp2Provider1, "providerInfo",
+                packageManager.addReceiverIfNotPresent(mApp2Provider1.provider));
+        mApp4Provider1.provider = ComponentName.createRelative("app4", "provider1");
+        ReflectionHelpers.setField(mApp4Provider1, "providerInfo",
+                packageManager.addReceiverIfNotPresent(mApp4Provider1.provider));
+        mApp4Provider2.provider = ComponentName.createRelative("app4", ".provider2");
+        ReflectionHelpers.setField(mApp4Provider2, "providerInfo",
+                packageManager.addReceiverIfNotPresent(mApp4Provider2.provider));
+        mApp5Provider1.provider = ComponentName.createRelative("app5", "provider1");
+        ReflectionHelpers.setField(mApp5Provider1, "providerInfo",
+                packageManager.addReceiverIfNotPresent(mApp5Provider1.provider));
+
+        ShadowAppWidgetManager shadowAppWidgetManager =
+                shadowOf(mContext.getSystemService(AppWidgetManager.class));
+        shadowAppWidgetManager.addInstalledProvider(mApp1Provider1);
+        shadowAppWidgetManager.addInstalledProvider(mApp1Provider2);
+        shadowAppWidgetManager.addInstalledProvider(mApp2Provider1);
+        shadowAppWidgetManager.addInstalledProvider(mApp4Provider1);
+        shadowAppWidgetManager.addInstalledProvider(mApp4Provider2);
+        shadowAppWidgetManager.addInstalledProvider(mApp5Provider1);
+
+        mModelHelper.getModel().addCallbacks(mCallback);
+
+        MODEL_EXECUTOR.post(() -> mModelHelper.getBgDataModel().widgetsModel.update(
+                LauncherAppState.getInstance(mContext), /* packageUser= */ null));
+        waitUntilIdle();
+    }
+
+
+    @Test
+    public void widgetsRecommendationRan_shouldOnlyReturnNotAddedWidgetsInAppPredictionOrder()
+            throws Exception {
+        // WHEN newPredicationTask is executed with app predication of 5 apps.
+        AppTarget app1 = new AppTarget(new AppTargetId("app1"), "app1", "className",
+                mUserHandle);
+        AppTarget app2 = new AppTarget(new AppTargetId("app2"), "app2", "className",
+                mUserHandle);
+        AppTarget app3 = new AppTarget(new AppTargetId("app3"), "app3", "className",
+                mUserHandle);
+        AppTarget app4 = new AppTarget(new AppTargetId("app4"), "app4", "className",
+                mUserHandle);
+        AppTarget app5 = new AppTarget(new AppTargetId("app5"), "app5", "className",
+                mUserHandle);
+        mModelHelper.executeTaskForTest(
+                newWidgetsPredicationTask(List.of(app5, app3, app2, app4, app1)))
+                .forEach(Runnable::run);
+
+        // THEN only 3 widgets are returned because
+        // 1. app5/provider1 & app4/provider1 have already been added to workspace. They are
+        //    excluded from the result.
+        // 2. app3 doesn't have a widget.
+        // 3. only 1 widget is picked from app1 because we only want to promote one widget per app.
+        List<PendingAddWidgetInfo> recommendedWidgets = mCallback.mRecommendedWidgets.items
+                .stream()
+                .map(itemInfo -> (PendingAddWidgetInfo) itemInfo)
+                .collect(Collectors.toList());
+        assertThat(recommendedWidgets).hasSize(3);
+        assertWidgetInfo(recommendedWidgets.get(0).info, mApp2Provider1);
+        assertWidgetInfo(recommendedWidgets.get(1).info, mApp4Provider2);
+        assertWidgetInfo(recommendedWidgets.get(2).info, mApp1Provider1);
+    }
+
+    private void assertWidgetInfo(
+            LauncherAppWidgetProviderInfo actual, AppWidgetProviderInfo expected) {
+        assertThat(actual.provider).isEqualTo(expected.provider);
+        assertThat(actual.getUser()).isEqualTo(expected.getProfile());
+    }
+
+    private void waitUntilIdle() {
+        shadowOf(MODEL_EXECUTOR.getLooper()).idle();
+        shadowOf(MAIN_EXECUTOR.getLooper()).idle();
+    }
+
+    private WidgetsPredictionUpdateTask newWidgetsPredicationTask(List<AppTarget> appTargets) {
+        return new WidgetsPredictionUpdateTask(
+                new PredictorState(CONTAINER_WIDGETS_PREDICTION, "test_widgets_prediction"),
+                appTargets);
+    }
+
+    private final class FakeBgDataModelCallback implements BgDataModel.Callbacks {
+
+        private FixedContainerItems mRecommendedWidgets = null;
+
+        @Override
+        public void bindExtraContainerItems(FixedContainerItems item) {
+            mRecommendedWidgets = item;
+        }
+
+        @Override
+        public int getPageToBindSynchronously() {
+            return 0;
+        }
+
+        @Override
+        public void clearPendingBinds() { }
+
+        @Override
+        public void startBinding() { }
+
+        @Override
+        public void bindItems(List<ItemInfo> shortcuts, boolean forceAnimateIcons) { }
+
+        @Override
+        public void bindScreens(IntArray orderedScreenIds) { }
+
+        @Override
+        public void finishFirstPageBind(ViewOnDrawExecutor executor) { }
+
+        @Override
+        public void finishBindingItems(int pageBoundFirst) { }
+
+        @Override
+        public void preAddApps() { }
+
+        @Override
+        public void bindAppsAdded(IntArray newScreens, ArrayList<ItemInfo> addNotAnimated,
+                ArrayList<ItemInfo> addAnimated) { }
+
+        @Override
+        public void bindIncrementalDownloadProgressUpdated(AppInfo app) { }
+
+        @Override
+        public void bindWorkspaceItemsChanged(List<WorkspaceItemInfo> updated) { }
+
+        @Override
+        public void bindWidgetsRestored(ArrayList<LauncherAppWidgetInfo> widgets) { }
+
+        @Override
+        public void bindRestoreItemsChange(HashSet<ItemInfo> updates) { }
+
+        @Override
+        public void bindWorkspaceComponentsRemoved(ItemInfoMatcher matcher) { }
+
+        @Override
+        public void bindAllWidgets(List<WidgetsListBaseEntry> widgets) { }
+
+        @Override
+        public void onPageBoundSynchronously(int page) { }
+
+        @Override
+        public void executeOnNextDraw(ViewOnDrawExecutor executor) { }
+
+        @Override
+        public void bindDeepShortcutMap(HashMap<ComponentKey, Integer> deepShortcutMap) { }
+
+        @Override
+        public void bindAllApplications(AppInfo[] apps, int flags) { }
+    }
+}
diff --git a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
index 2ea8bd20f6..b1b4d70152 100644
--- a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
+++ b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
@@ -21,6 +21,7 @@ import static android.text.format.DateUtils.formatElapsedTime;
 import static com.android.launcher3.InvariantDeviceProfile.CHANGE_FLAG_GRID;
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION;
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_PREDICTION;
+import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_PREDICTION;
 import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
 import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT;
 import static com.android.launcher3.Utilities.getDevicePrefs;
@@ -80,6 +81,8 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
             new PredictorState(CONTAINER_PREDICTION, "all_apps_predictions");
     private final PredictorState mHotseatState =
             new PredictorState(CONTAINER_HOTSEAT_PREDICTION, "hotseat_predictions");
+    private final PredictorState mWidgetsRecommendationState =
+            new PredictorState(CONTAINER_WIDGETS_PREDICTION, "widgets_prediction");
 
     private final InvariantDeviceProfile mIDP;
     private final AppEventProducer mAppEventProducer;
@@ -111,6 +114,9 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
         mHotseatState.items.setItems(
                 mHotseatState.storage.read(mApp.getContext(), hotseatFactory, ums.allUsers::get));
         mDataModel.extraItems.put(CONTAINER_HOTSEAT_PREDICTION, mHotseatState.items);
+
+        // Widgets prediction isn't used frequently. And thus, it is not persisted on disk.
+        mDataModel.extraItems.put(CONTAINER_WIDGETS_PREDICTION, mWidgetsRecommendationState.items);
         mActive = true;
     }
 
@@ -161,6 +167,9 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
         if (mAllAppsState.predictor != null) {
             mAllAppsState.predictor.requestPredictionUpdate();
         }
+        if (mWidgetsRecommendationState.predictor != null) {
+            mWidgetsRecommendationState.predictor.requestPredictionUpdate();
+        }
     }
 
     @Override
@@ -176,6 +185,7 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
     private void destroyPredictors() {
         mAllAppsState.destroyPredictor();
         mHotseatState.destroyPredictor();
+        mWidgetsRecommendationState.destroyPredictor();
     }
 
     @WorkerThread
@@ -203,6 +213,12 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
                         .setPredictedTargetCount(mIDP.numHotseatIcons)
                         .setExtras(convertDataModelToAppTargetBundle(context, mDataModel))
                         .build()));
+
+        registerWidgetsPredictor(apm.createAppPredictionSession(
+                new AppPredictionContext.Builder(context)
+                        .setUiSurface("widgets")
+                        .setPredictedTargetCount(mIDP.numColumns)
+                        .build()));
     }
 
     private void registerPredictor(PredictorState state, AppPredictor predictor) {
@@ -220,6 +236,20 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
         mApp.getModel().enqueueModelUpdateTask(new PredictionUpdateTask(state, targets));
     }
 
+    private void registerWidgetsPredictor(AppPredictor predictor) {
+        mWidgetsRecommendationState.predictor = predictor;
+        mWidgetsRecommendationState.predictor.registerPredictionUpdates(
+                Executors.MODEL_EXECUTOR, targets -> {
+                    if (mWidgetsRecommendationState.setTargets(targets)) {
+                        // No diff, skip
+                        return;
+                    }
+                    mApp.getModel().enqueueModelUpdateTask(
+                            new WidgetsPredictionUpdateTask(mWidgetsRecommendationState, targets));
+                });
+        mWidgetsRecommendationState.predictor.requestPredictionUpdate();
+    }
+
     @Override
     public void onIdpChanged(int changeFlags, InvariantDeviceProfile profile) {
         if ((changeFlags & CHANGE_FLAG_GRID) != 0) {
diff --git a/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java b/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java
new file mode 100644
index 0000000000..a29ac1a7de
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.model;
+
+import android.app.prediction.AppTarget;
+
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.model.BgDataModel.FixedContainerItems;
+import com.android.launcher3.model.QuickstepModelDelegate.PredictorState;
+import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.util.ComponentKey;
+import com.android.launcher3.util.PackageUserKey;
+import com.android.launcher3.widget.PendingAddWidgetInfo;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/** Task to update model as a result of predicted widgets update */
+public final class WidgetsPredictionUpdateTask extends BaseModelUpdateTask {
+    private final PredictorState mPredictorState;
+    private final List<AppTarget> mTargets;
+
+    WidgetsPredictionUpdateTask(PredictorState predictorState, List<AppTarget> targets) {
+        mPredictorState = predictorState;
+        mTargets = targets;
+    }
+
+    /**
+     * Uses the app predication result to infer widgets that the user may want to use.
+     *
+     * <p>The algorithm uses the app prediction ranking to create a widgets ranking which only
+     * includes one widget per app and excludes widgets that have already been added to the
+     * workspace.
+     */
+    @Override
+    public void execute(LauncherAppState appState, BgDataModel dataModel, AllAppsList apps) {
+        Set<ComponentKey> widgetsInWorkspace = dataModel.appWidgets.stream().map(
+                widget -> new ComponentKey(widget.providerName, widget.user)).collect(
+                Collectors.toSet());
+        Map<PackageUserKey, List<WidgetItem>> allWidgets =
+                dataModel.widgetsModel.getAllWidgetsWithoutShortcuts();
+
+        ArrayList<ItemInfo> recommendedWidgetsInDescendingOrder = new ArrayList<>();
+        for (AppTarget app : mTargets) {
+            PackageUserKey packageUserKey = new PackageUserKey(app.getPackageName(), app.getUser());
+            if (allWidgets.containsKey(packageUserKey)) {
+                List<WidgetItem> notAddedWidgets = allWidgets.get(packageUserKey).stream()
+                        .filter(item ->
+                                !widgetsInWorkspace.contains(
+                                        new ComponentKey(item.componentName, item.user)))
+                        .collect(Collectors.toList());
+                if (notAddedWidgets.size() > 0) {
+                    // Even an apps have more than one widgets, we only include one widget.
+                    recommendedWidgetsInDescendingOrder.add(
+                            new PendingAddWidgetInfo(notAddedWidgets.get(0).widgetInfo));
+                }
+            }
+        }
+        FixedContainerItems fixedContainerItems = mPredictorState.items;
+        fixedContainerItems.items.clear();
+        fixedContainerItems.items.addAll(recommendedWidgetsInDescendingOrder);
+        bindExtraContainerItems(fixedContainerItems);
+
+        // Don't store widgets prediction to disk because it is not used frequently.
+    }
+}
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 55dde4569d..b009629c80 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -218,6 +218,8 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
                     .setPredictedApps(item.items);
         } else if (item.containerId == Favorites.CONTAINER_HOTSEAT_PREDICTION) {
             mHotseatPredictionController.setPredictedItems(item);
+        } else if (item.containerId == Favorites.CONTAINER_WIDGETS_PREDICTION) {
+            getPopupDataProvider().setRecommendedWidgets(item.items);
         }
     }
 
diff --git a/robolectric_tests/resources/widgets_predication_update_task_data.txt b/robolectric_tests/resources/widgets_predication_update_task_data.txt
new file mode 100644
index 0000000000..941d1954e2
--- /dev/null
+++ b/robolectric_tests/resources/widgets_predication_update_task_data.txt
@@ -0,0 +1,24 @@
+# Model data used by WidgetsPredictionUpdateTasksTest
+
+classMap s com.android.launcher3.model.data.WorkspaceItemInfo
+classMap w com.android.launcher3.model.data.LauncherAppWidgetInfo
+
+# Items for the BgDataModel
+
+# App shortcuts
+bgItem s itemType=0 title=app1-class1 intent=component=app1/class1 id=1
+bgItem s itemType=0 title=app1-class2 intent=component=app1/class2 id=2
+bgItem s itemType=0 title=app2-class1 intent=component=app2/class1 id=3
+bgItem s itemType=0 title=app2-class2 intent=component=app2/class2 id=4
+
+# Promise icons for app3
+bgItem s itemType=0 status=2 title=app3-class1 intent=component=app3/class1 id=5
+bgItem s itemType=0 status=2 title=app3-class2 intent=component=app3/class2 id=6
+bgItem s itemType=1 status=1 title=app3-shrt intent=component=app3/class3 id=7
+
+# Promise icon for app4
+bgItem s itemType=1 status=1 title=app4-shrt intent=component=app4/class1 id=8
+
+# Widget
+bgItem w providerName=app4/provider1 id=9
+bgItem w providerName=app5/provider1 id=10
\ No newline at end of file
diff --git a/src/com/android/launcher3/LauncherSettings.java b/src/com/android/launcher3/LauncherSettings.java
index dfdc53c1c9..22c257a8cb 100644
--- a/src/com/android/launcher3/LauncherSettings.java
+++ b/src/com/android/launcher3/LauncherSettings.java
@@ -193,6 +193,7 @@ public class LauncherSettings {
         public static final int CONTAINER_DESKTOP = -100;
         public static final int CONTAINER_HOTSEAT = -101;
         public static final int CONTAINER_PREDICTION = -102;
+        public static final int CONTAINER_WIDGETS_PREDICTION = -111;
         public static final int CONTAINER_HOTSEAT_PREDICTION = -103;
         public static final int CONTAINER_ALL_APPS = -104;
         public static final int CONTAINER_WIDGETS_TRAY = -105;
diff --git a/src/com/android/launcher3/model/BaseModelUpdateTask.java b/src/com/android/launcher3/model/BaseModelUpdateTask.java
index 543ee2adf7..ad553d5e46 100644
--- a/src/com/android/launcher3/model/BaseModelUpdateTask.java
+++ b/src/com/android/launcher3/model/BaseModelUpdateTask.java
@@ -124,7 +124,7 @@ public abstract class BaseModelUpdateTask implements ModelUpdateTask {
 
     public void bindUpdatedWidgets(BgDataModel dataModel) {
         final ArrayList<WidgetsListBaseEntry> widgets =
-                dataModel.widgetsModel.getWidgetsList(mApp.getContext());
+                dataModel.widgetsModel.getWidgetsListForPicker(mApp.getContext());
         scheduleCallbackTask(c -> c.bindAllWidgets(widgets));
     }
 
diff --git a/src/com/android/launcher3/popup/PopupDataProvider.java b/src/com/android/launcher3/popup/PopupDataProvider.java
index 18536325eb..778089485a 100644
--- a/src/com/android/launcher3/popup/PopupDataProvider.java
+++ b/src/com/android/launcher3/popup/PopupDataProvider.java
@@ -58,8 +58,11 @@ public class PopupDataProvider implements NotificationListener.NotificationsChan
     private HashMap<ComponentKey, Integer> mDeepShortcutMap = new HashMap<>();
     /** Maps packages to their DotInfo's . */
     private Map<PackageUserKey, DotInfo> mPackageUserToDotInfos = new HashMap<>();
-    /** Maps packages to their Widgets */
+
+    /** All installed widgets. */
     private List<WidgetsListBaseEntry> mAllWidgets = List.of();
+    /** Widgets that can be recommended to the users. */
+    private List<ItemInfo> mRecommendedWidgets = List.of();
 
     private PopupDataChangeListener mChangeListener = PopupDataChangeListener.INSTANCE;
 
@@ -187,6 +190,15 @@ public class PopupDataProvider implements NotificationListener.NotificationsChan
         notificationListener.cancelNotificationFromLauncher(notificationKey);
     }
 
+    /**
+     * Sets a list of recommended widgets ordered by their order of appearance in the widgets
+     * recommendation UI.
+     */
+    public void setRecommendedWidgets(List<ItemInfo> recommendedWidgets) {
+        mRecommendedWidgets = recommendedWidgets;
+        mChangeListener.onRecommendedWidgetsBound();
+    }
+
     public void setAllWidgets(List<WidgetsListBaseEntry> allWidgets) {
         mAllWidgets = allWidgets;
         mChangeListener.onWidgetsBound();
@@ -200,6 +212,21 @@ public class PopupDataProvider implements NotificationListener.NotificationsChan
         return mAllWidgets;
     }
 
+    /** Returns a list of recommended widgets. */
+    public List<WidgetItem> getRecommendedWidgets() {
+        HashMap<ComponentKey, WidgetItem> allWidgetItems = new HashMap<>();
+        mAllWidgets.stream()
+                .filter(entry -> entry instanceof WidgetsListContentEntry)
+                .forEach(entry -> ((WidgetsListContentEntry) entry).mWidgets
+                        .forEach(widget -> allWidgetItems.put(
+                                new ComponentKey(widget.componentName, widget.user), widget)));
+        return mRecommendedWidgets.stream()
+                .map(recommendedWidget -> allWidgetItems.get(
+                        new ComponentKey(recommendedWidget.getTargetComponent(),
+                                recommendedWidget.user)))
+                .collect(Collectors.toList());
+    }
+
     public List<WidgetItem> getWidgetsForPackageUser(PackageUserKey packageUserKey) {
         return mAllWidgets.stream()
                 .filter(row -> row instanceof WidgetsListContentEntry
@@ -244,5 +271,8 @@ public class PopupDataProvider implements NotificationListener.NotificationsChan
         default void trimNotifications(Map<PackageUserKey, DotInfo> updatedDots) { }
 
         default void onWidgetsBound() { }
+
+        /** A callback to get notified when recommended widgets are bound. */
+        default void onRecommendedWidgetsBound() { }
     }
 }
diff --git a/src_shortcuts_overrides/com/android/launcher3/model/LoaderResults.java b/src_shortcuts_overrides/com/android/launcher3/model/LoaderResults.java
index 73b1601c34..abce2a24f4 100644
--- a/src_shortcuts_overrides/com/android/launcher3/model/LoaderResults.java
+++ b/src_shortcuts_overrides/com/android/launcher3/model/LoaderResults.java
@@ -48,7 +48,7 @@ public class LoaderResults extends BaseLoaderResults {
     @Override
     public void bindWidgets() {
         final List<WidgetsListBaseEntry> widgets =
-                mBgDataModel.widgetsModel.getWidgetsList(mApp.getContext());
+                mBgDataModel.widgetsModel.getWidgetsListForPicker(mApp.getContext());
         executeCallbacksTask(c -> c.bindAllWidgets(widgets), mUiExecutor);
     }
 }
diff --git a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
index a8c7c4825b..3ea47660b0 100644
--- a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
+++ b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
@@ -5,6 +5,8 @@ import static android.appwidget.AppWidgetProviderInfo.WIDGET_FEATURE_HIDE_FROM_P
 
 import static com.android.launcher3.pm.ShortcutConfigActivityInfo.queryList;
 
+import static java.util.stream.Collectors.toList;
+
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.ComponentName;
 import android.content.Context;
@@ -67,7 +69,7 @@ public class WidgetsModel {
      *
      * @see com.android.launcher3.widget.picker.WidgetsListAdapter#setWidgets(List)
      */
-    public synchronized ArrayList<WidgetsListBaseEntry> getWidgetsList(Context context) {
+    public synchronized ArrayList<WidgetsListBaseEntry> getWidgetsListForPicker(Context context) {
         ArrayList<WidgetsListBaseEntry> result = new ArrayList<>();
         AlphabeticIndexCompat indexer = new AlphabeticIndexCompat(context);
 
@@ -82,6 +84,22 @@ public class WidgetsModel {
         return result;
     }
 
+    /** Returns a mapping of packages to their widgets without static shortcuts. */
+    public synchronized Map<PackageUserKey, List<WidgetItem>> getAllWidgetsWithoutShortcuts() {
+        Map<PackageUserKey, List<WidgetItem>> packagesToWidgets = new HashMap<>();
+        mWidgetsList.forEach((packageItemInfo, widgetsAndShortcuts) -> {
+            List<WidgetItem> widgets = widgetsAndShortcuts.stream()
+                        .filter(item -> item.widgetInfo != null)
+                        .collect(toList());
+            if (widgets.size() > 0) {
+                packagesToWidgets.put(
+                        new PackageUserKey(packageItemInfo.packageName, packageItemInfo.user),
+                        widgets);
+            }
+        });
+        return packagesToWidgets;
+    }
+
     /**
      * @param packageUser If null, all widgets and shortcuts are updated and returned, otherwise
      *                    only widgets and shortcuts associated with the package/user are.
-- 
GitLab


From 0724113b3df06ae6260a25578d2de013410973a5 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Mon, 8 Mar 2021 15:53:13 -0800
Subject: [PATCH 0626/1664] Removing insets controller animation as part of
 all-apps opening

Adding support for easier extension of StateHandlers

Bug: 180143210
Test: Verified on device
Change-Id: If6a088d1482c9b268b21786c4694f6e0927be0c3
---
 .../launcher3/BaseQuickstepLauncher.java      |  16 +-
 .../android/quickstep/RecentsActivity.java    |   5 +-
 src/com/android/launcher3/Launcher.java       |   6 +-
 .../AllAppsInsetTransitionController.java     | 315 ------------------
 .../allapps/AllAppsTransitionController.java  |  59 +---
 .../launcher3/allapps/SearchUiManager.java    |   4 +-
 .../search/AppsSearchContainerLayout.java     |   3 +-
 .../launcher3/statemanager/StateManager.java  |   6 +-
 .../statemanager/StatefulActivity.java        |   4 +-
 .../AbstractStateChangeTouchController.java   |  12 -
 10 files changed, 31 insertions(+), 399 deletions(-)
 delete mode 100644 src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 161c98ec5f..56d25f2818 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -63,6 +63,7 @@ import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
+import java.util.List;
 import java.util.stream.Stream;
 
 /**
@@ -244,15 +245,12 @@ public abstract class BaseQuickstepLauncher extends Launcher
     }
 
     @Override
-    protected StateHandler<LauncherState>[] createStateHandlers() {
-        return new StateHandler[] {
-                getAllAppsController(),
-                getWorkspace(),
-                getDepthController(),
-                new RecentsViewStateController(this),
-                new BackButtonAlphaHandler(this),
-                getTaskbarStateHandler(),
-        };
+    protected void collectStateHandlers(List<StateHandler> out) {
+        super.collectStateHandlers(out);
+        out.add(getDepthController());
+        out.add(new RecentsViewStateController(this));
+        out.add(new BackButtonAlphaHandler(this));
+        out.add(getTaskbarStateHandler());
     }
 
     public DepthController getDepthController() {
diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index 8aa0842f0e..1b2fd41617 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -71,6 +71,7 @@ import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
+import java.util.List;
 
 /**
  * A recents activity that shows the recently launched tasks as swipable task cards.
@@ -317,8 +318,8 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
     }
 
     @Override
-    protected StateHandler<RecentsState>[] createStateHandlers() {
-        return new StateHandler[] { new FallbackRecentsStateController(this) };
+    protected void collectStateHandlers(List<StateHandler> out) {
+        out.add(new FallbackRecentsStateController(this));
     }
 
     @Override
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index fa63885c67..80c80d7716 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2761,8 +2761,10 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         return super.onKeyUp(keyCode, event);
     }
 
-    protected StateHandler<LauncherState>[] createStateHandlers() {
-        return new StateHandler[] { getAllAppsController(), getWorkspace() };
+    @Override
+    protected void collectStateHandlers(List<StateHandler> out) {
+        out.add(getAllAppsController());
+        out.add(getWorkspace());
     }
 
     public TouchController[] createTouchControllers() {
diff --git a/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java b/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
deleted file mode 100644
index b34c8b8150..0000000000
--- a/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.allapps;
-
-import android.annotation.TargetApi;
-import android.graphics.Insets;
-import android.os.Build;
-import android.util.Log;
-import android.view.View;
-import android.view.WindowInsets;
-import android.view.WindowInsetsAnimationControlListener;
-import android.view.WindowInsetsAnimationController;
-import android.view.animation.Interpolator;
-import android.view.animation.LinearInterpolator;
-
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.Utilities;
-import com.android.launcher3.util.UiThreadHelper;
-
-/**
- * Handles IME over all apps to be synchronously transitioning along with the passed in
- * root inset.
- */
-public class AllAppsInsetTransitionController {
-
-    private static final boolean DEBUG = true;
-    private static final String TAG = "AllAppsInsetTransitionController";
-    private static final Interpolator LINEAR = new LinearInterpolator();
-
-    private WindowInsetsAnimationController mAnimationController;
-    private WindowInsetsAnimationControlListener mCurrentRequest;
-
-    private Runnable mSearchEduRunnable;
-
-    private float mAllAppsHeight;
-
-    private int mDownInsetBottom;
-    private boolean mShownAtDown;
-
-    private int mHiddenInsetBottom;
-    private int mShownInsetBottom;
-
-    private float mDown, mCurrent;
-    private View mApps;
-
-    /**
-     *
-     */
-    public boolean showSearchEduIfNecessary() {
-        if (mSearchEduRunnable == null) {
-            return false;
-        }
-        mSearchEduRunnable.run();
-        return true;
-    }
-
-    public void setSearchEduRunnable(Runnable eduRunnable) {
-        mSearchEduRunnable = eduRunnable;
-    }
-
-    // Only purpose of these states is to keep track of fast fling transition
-    enum State {
-        RESET, DRAG_START_BOTTOM, DRAG_START_BOTTOM_IME_CANCELLED,
-        FLING_END_TOP, FLING_END_TOP_IME_CANCELLED,
-        DRAG_START_TOP, FLING_END_BOTTOM
-    }
-
-    private State mState;
-
-    public AllAppsInsetTransitionController(float allAppsHeight, View appsView) {
-        mAllAppsHeight = allAppsHeight;
-        mApps = appsView;
-    }
-
-    public void show() {
-        mApps.getWindowInsetsController().show(WindowInsets.Type.ime());
-    }
-
-    public void hide() {
-        if (!Utilities.ATLEAST_R) return;
-
-        WindowInsets insets = mApps.getRootWindowInsets();
-        if (insets == null) return;
-
-        boolean imeVisible = insets.isVisible(WindowInsets.Type.ime());
-
-        if (DEBUG) {
-            Log.d(TAG, "\nhide imeVisible=" + imeVisible);
-        }
-        if (insets.isVisible(WindowInsets.Type.ime())) {
-            mApps.getWindowInsetsController().hide(WindowInsets.Type.ime());
-        }
-    }
-
-    /**
-     * Initializes member variables and requests for the {@link WindowInsetsAnimationController}
-     * object.
-     *
-     * @param progress value between 0..1
-     */
-    @TargetApi(Build.VERSION_CODES.R)
-    public void onDragStart(float progress) {
-        if (!Utilities.ATLEAST_R) return;
-
-        // Until getRootWindowInsets().isVisible(...) method returns correct value,
-        // only support InsetController based IME transition during swipe up and
-        // NOT swipe down
-        if (Float.compare(progress, 0f) == 0) return;
-
-        setState(true, false, progress);
-        mDown = progress * mAllAppsHeight;
-
-        // Below two values are sometimes incorrect. Possibly a platform bug
-        // mDownInsetBottom = mApps.getRootWindowInsets().getInsets(WindowInsets.Type.ime()).bottom;
-        // mShownAtDown = mApps.getRootWindowInsets().isVisible(WindowInsets.Type.ime());
-
-        if (DEBUG) {
-            Log.d(TAG, "\nonDragStart progress=" + progress
-                    + " mDownInsets=" + mDownInsetBottom
-                    + " mShownAtDown=" + mShownAtDown);
-        }
-
-        mApps.getWindowInsetsController().controlWindowInsetsAnimation(
-                WindowInsets.Type.ime(), -1 /* no predetermined duration */, LINEAR, null,
-                mCurrentRequest = new WindowInsetsAnimationControlListener() {
-
-                    @Override
-                    public void onReady(WindowInsetsAnimationController controller, int types) {
-                        if (DEBUG) {
-                            Log.d(TAG, "Listener.onReady " + (mCurrentRequest == this));
-                        }
-                        if (controller != null) {
-                            if (mCurrentRequest == this && !handleFinishOnFling(controller)) {
-                                mAnimationController = controller;
-                            } else {
-                                controller.finish(false /* just don't show */);
-                            }
-                        }
-                    }
-
-                    @Override
-                    public void onFinished(WindowInsetsAnimationController controller) {
-                        // when screen lock happens, then this method get called
-                        if (DEBUG) {
-                            Log.d(TAG, "Listener.onFinished ctrl=" + controller
-                                    + " mAnimationController=" + mAnimationController);
-                        }
-                        if (mAnimationController != null) {
-                            mAnimationController.finish(true);
-                            mAnimationController = null;
-                        }
-                    }
-
-                    @Override
-                    public void onCancelled(@Nullable WindowInsetsAnimationController controller) {
-                        if (DEBUG) {
-                            // Keep the verbose logging to chase down IME not showing up issue.
-                            // b/178904132
-                            Log.e(TAG, "Listener.onCancelled ctrl=" + controller
-                                    + " mAnimationController=" + mAnimationController,
-                                    new Exception());
-                        }
-                        if (mState == State.DRAG_START_BOTTOM) {
-                            mState = State.DRAG_START_BOTTOM_IME_CANCELLED;
-                        }
-                        mAnimationController = null;
-                        if (controller != null) {
-                            controller.finish(true);
-                        }
-                    }
-                });
-    }
-
-    /**
-     * If IME bounds after touch sequence finishes, call finish.
-     */
-    private boolean handleFinishOnFling(WindowInsetsAnimationController controller) {
-        if (!Utilities.ATLEAST_R) return false;
-
-        if (mState == State.FLING_END_TOP) {
-            controller.finish(true);
-            return true;
-        } else if (mState == State.FLING_END_BOTTOM) {
-            controller.finish(false);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Handles the translation using the progress.
-     *
-     * @param progress value between 0..1
-     */
-    @TargetApi(Build.VERSION_CODES.R)
-    public void setProgress(float progress) {
-        if (!Utilities.ATLEAST_R) return;
-        // progress that equals to 0 or 1 is error prone. Do not use them.
-        // Instead use onDragStart and onAnimationEnd
-        if (mAnimationController == null || progress <= 0f || progress >= 1f) return;
-
-        mCurrent = progress * mAllAppsHeight;
-        mHiddenInsetBottom = mAnimationController.getHiddenStateInsets().bottom; // 0
-        mShownInsetBottom = mAnimationController.getShownStateInsets().bottom; // 1155
-
-        int shift = mShownAtDown ? 0 : (int) (mAllAppsHeight - mShownInsetBottom);
-
-        int inset = (int) (mDownInsetBottom + (mDown - mCurrent) - shift);
-
-        final int start = mShownAtDown ? mShownInsetBottom : mHiddenInsetBottom;
-        final int end = mShownAtDown ? mHiddenInsetBottom : mShownInsetBottom;
-        inset = Math.max(inset, mHiddenInsetBottom);
-        inset = Math.min(inset, mShownInsetBottom);
-        if (DEBUG && false) {
-            Log.d(TAG, "updateInset mCurrent=" + mCurrent + " mDown="
-                    + mDown + " hidden=" + mHiddenInsetBottom
-                    + " shown=" + mShownInsetBottom
-                    + " mDownInsets.bottom=" + mDownInsetBottom + " inset=" + inset
-                    + " shift= " + shift);
-        }
-
-        mAnimationController.setInsetsAndAlpha(
-                Insets.of(0, 0, 0, inset),
-                1f, (inset - start) / (float) (end - start));
-    }
-
-    /**
-     * Report to the animation controller that we no longer plan to translate anymore.
-     *
-     * @param progress value between 0..1
-     */
-    @TargetApi(Build.VERSION_CODES.R)
-    public void onAnimationEnd(float progress) {
-        if (DEBUG) {
-            Log.d(TAG, "onAnimationEnd progress=" + progress
-                    + " mAnimationController=" + mAnimationController);
-        }
-        if (mState == null) {
-            // only called when launcher restarting.
-            UiThreadHelper.hideKeyboardAsync(mApps.getContext(), mApps.getWindowToken());
-        }
-
-        setState(false, true, progress);
-
-
-        if (mAnimationController == null) {
-            if (mState == State.FLING_END_TOP_IME_CANCELLED) {
-                mApps.getWindowInsetsController().show(WindowInsets.Type.ime());
-            }
-            return;
-        }
-
-        /* handle finish */
-        if (mState == State.FLING_END_TOP) {
-            mAnimationController.finish(true /* show */);
-        } else {
-            if (Float.compare(progress, 1f) == 0 /* bottom */) {
-                mAnimationController.finish(false /* gone */);
-            } else {
-                mAnimationController.finish(mShownAtDown);
-            }
-        }
-        /* handle finish */
-
-        if (DEBUG) {
-            Log.d(TAG, "endTranslation progress=" + progress
-                    + " mAnimationController=" + mAnimationController);
-        }
-        mAnimationController = null;
-        mCurrentRequest = null;
-        setState(false, false, progress);
-    }
-
-    private void setState(boolean start, boolean end, float progress) {
-        State state = State.RESET;
-        if (start && end) {
-            throw new IllegalStateException("drag start and end cannot happen in same call");
-        }
-        if (start) {
-            if (Float.compare(progress, 1f) == 0) {
-                state = State.DRAG_START_BOTTOM;
-            } else if (Float.compare(progress, 0f) == 0) {
-                state = State.DRAG_START_TOP;
-            }
-        } else if (end) {
-            if (Float.compare(progress, 1f) == 0 && mState == State.DRAG_START_TOP) {
-                state = State.FLING_END_BOTTOM;
-            } else if (Float.compare(progress, 0f) == 0) {
-                if (mState == State.DRAG_START_BOTTOM) {
-                    state = State.FLING_END_TOP;
-                } else if (mState == State.DRAG_START_BOTTOM_IME_CANCELLED) {
-                    state = State.FLING_END_TOP_IME_CANCELLED;
-                }
-            }
-        }
-        if (DEBUG) {
-            Log.d(TAG, "setState " + mState + " -> " + state);
-        }
-        mState = state;
-    }
-}
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index a48e4232cf..abf63dc0a1 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -33,18 +33,15 @@ import static com.android.launcher3.util.SystemUiController.UI_STATE_ALLAPPS;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
-import android.content.SharedPreferences;
 import android.util.FloatProperty;
 import android.view.View;
 import android.view.animation.Interpolator;
-import android.widget.EditText;
-
-import androidx.core.os.BuildCompat;
 
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.anim.PropertySetter;
@@ -63,8 +60,8 @@ import com.android.launcher3.views.ScrimView;
  * If release velocity < THRES1, snap according to either top or bottom depending on whether it's
  * closer to top or closer to the page indicator.
  */
-public class AllAppsTransitionController implements StateHandler<LauncherState>,
-        OnDeviceProfileChangeListener, SharedPreferences.OnSharedPreferenceChangeListener {
+public class AllAppsTransitionController
+        implements StateHandler<LauncherState>, OnDeviceProfileChangeListener {
 
     public static final FloatProperty<AllAppsTransitionController> ALL_APPS_PROGRESS =
             new FloatProperty<AllAppsTransitionController>("allAppsProgress") {
@@ -81,7 +78,6 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
             };
 
     private static final int APPS_VIEW_ALPHA_CHANNEL_INDEX = 0;
-    private static final String PREF_KEY_SHOW_SEARCH_IME = "pref_search_show_ime";
 
     private AllAppsContainerView mAppsView;
     private ScrimView mScrimView;
@@ -99,8 +95,6 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
     private float mProgress;        // [0, 1], mShiftRange * mProgress = shiftCurrent
 
     private float mScrollRangeDelta = 0;
-    private AllAppsInsetTransitionController mInsetController;
-    private boolean mSearchImeEnabled;
 
     public AllAppsTransitionController(Launcher l) {
         mLauncher = l;
@@ -109,19 +103,12 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
 
         mIsVerticalLayout = mLauncher.getDeviceProfile().isVerticalBarLayout();
         mLauncher.addOnDeviceProfileChangeListener(this);
-
-        onSharedPreferenceChanged(mLauncher.getSharedPrefs(), PREF_KEY_SHOW_SEARCH_IME);
-        mLauncher.getSharedPrefs().registerOnSharedPreferenceChangeListener(this);
     }
 
     public float getShiftRange() {
         return mShiftRange;
     }
 
-    public AllAppsInsetTransitionController getInsetController() {
-        return mInsetController;
-    }
-
     @Override
     public void onDeviceProfileChanged(DeviceProfile dp) {
         mIsVerticalLayout = dp.isVerticalBarLayout();
@@ -146,14 +133,7 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
         mProgress = progress;
 
         mScrimView.setProgress(progress);
-        float shiftCurrent = progress * mShiftRange;
-        mAppsView.setTranslationY(shiftCurrent);
-        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && mSearchImeEnabled) {
-            if (mInsetController == null) {
-                setupInsetTransitionController();
-            }
-            mInsetController.setProgress(progress);
-        }
+        mAppsView.setTranslationY(progress * mShiftRange);
     }
 
     public float getProgress() {
@@ -242,18 +222,13 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
     public void setupViews(AllAppsContainerView appsView, ScrimView scrimView) {
         mAppsView = appsView;
         mScrimView = scrimView;
-        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && BuildCompat.isAtLeastR()) {
-            setupInsetTransitionController();
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && Utilities.ATLEAST_R) {
+            mLauncher.getSystemUiController().updateUiState(UI_STATE_ALLAPPS,
+                    View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                            | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
         }
     }
 
-    private void setupInsetTransitionController() {
-        mInsetController = new AllAppsInsetTransitionController(mShiftRange, mAppsView);
-        mLauncher.getSystemUiController().updateUiState(UI_STATE_ALLAPPS,
-                View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                        | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
-    }
-
     /**
      * Updates the total scroll range but does not update the UI.
      */
@@ -274,23 +249,5 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
         if (Float.compare(mProgress, 1f) == 0) {
             mAppsView.reset(false /* animate */);
         }
-        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && mSearchImeEnabled
-                && BuildCompat.isAtLeastR()) {
-            mInsetController.onAnimationEnd(mProgress);
-            if (Float.compare(mProgress, 0f) == 0) {
-                EditText editText = mAppsView.getSearchUiManager().getEditText();
-                if (editText != null && !mInsetController.showSearchEduIfNecessary()) {
-                    editText.requestFocus();
-                }
-            }
-            // TODO: should make the controller hide synchronously
-        }
-    }
-
-    @Override
-    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String s) {
-        if (s.equals(PREF_KEY_SHOW_SEARCH_IME)) {
-            mSearchImeEnabled = sharedPreferences.getBoolean(s, true);
-        }
     }
 }
diff --git a/src/com/android/launcher3/allapps/SearchUiManager.java b/src/com/android/launcher3/allapps/SearchUiManager.java
index 39410a7b3f..0d42950cbb 100644
--- a/src/com/android/launcher3/allapps/SearchUiManager.java
+++ b/src/com/android/launcher3/allapps/SearchUiManager.java
@@ -20,10 +20,10 @@ import static com.android.launcher3.LauncherState.ALL_APPS_HEADER;
 import android.graphics.Rect;
 import android.view.KeyEvent;
 import android.view.animation.Interpolator;
-import android.widget.EditText;
 
 import androidx.annotation.Nullable;
 
+import com.android.launcher3.ExtendedEditText;
 import com.android.launcher3.anim.PropertySetter;
 
 /**
@@ -75,7 +75,7 @@ public interface SearchUiManager {
      * @return the edit text object
      */
     @Nullable
-    EditText getEditText();
+    ExtendedEditText getEditText();
 
     /**
      * sets highlight result's title
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
index 426fd0cd83..2261d5147b 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
@@ -32,7 +32,6 @@ import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup.MarginLayoutParams;
 import android.view.animation.Interpolator;
-import android.widget.EditText;
 
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.DeviceProfile;
@@ -230,7 +229,7 @@ public class AppsSearchContainerLayout extends ExtendedEditText
     }
 
     @Override
-    public EditText getEditText() {
+    public ExtendedEditText getEditText() {
         return this;
     }
 }
diff --git a/src/com/android/launcher3/statemanager/StateManager.java b/src/com/android/launcher3/statemanager/StateManager.java
index a18f34062a..2b51e97f3f 100644
--- a/src/com/android/launcher3/statemanager/StateManager.java
+++ b/src/com/android/launcher3/statemanager/StateManager.java
@@ -26,14 +26,12 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.os.Handler;
 import android.os.Looper;
-import android.util.Log;
 
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.states.StateAnimationConfig.AnimationFlags;
-import com.android.launcher3.testing.TestProtocol;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -90,7 +88,9 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
 
     public StateHandler[] getStateHandlers() {
         if (mStateHandlers == null) {
-            mStateHandlers = mActivity.createStateHandlers();
+            ArrayList<StateHandler> handlers = new ArrayList<>();
+            mActivity.collectStateHandlers(handlers);
+            mStateHandlers = handlers.toArray(new StateHandler[handlers.size()]);
         }
         return mStateHandlers;
     }
diff --git a/src/com/android/launcher3/statemanager/StatefulActivity.java b/src/com/android/launcher3/statemanager/StatefulActivity.java
index 7abb6532f4..8a35cb33c0 100644
--- a/src/com/android/launcher3/statemanager/StatefulActivity.java
+++ b/src/com/android/launcher3/statemanager/StatefulActivity.java
@@ -30,6 +30,8 @@ import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
 import com.android.launcher3.views.BaseDragLayer;
 
+import java.util.List;
+
 /**
  * Abstract activity with state management
  * @param <STATE_TYPE> Type of state object
@@ -46,7 +48,7 @@ public abstract class StatefulActivity<STATE_TYPE extends BaseState<STATE_TYPE>>
     /**
      * Create handlers to control the property changes for this activity
      */
-    protected abstract StateHandler<STATE_TYPE>[] createStateHandlers();
+    protected abstract void collectStateHandlers(List<StateHandler> out);
 
     /**
      * Returns true if the activity is in the provided state
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index 6f1b2f967f..516fc74ba6 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -38,24 +38,19 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ValueAnimator;
 import android.os.SystemClock;
-import android.util.Log;
 import android.view.HapticFeedbackConstants;
 import android.view.MotionEvent;
 
-import androidx.core.os.BuildCompat;
-
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAnimUtils;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.AnimatorPlaybackController;
-import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.logger.LauncherAtom;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.states.StateAnimationConfig.AnimationFlags;
-import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.FlingBlockCheck;
 import com.android.launcher3.util.TouchController;
 
@@ -265,13 +260,6 @@ public abstract class AbstractStateChangeTouchController
         }
         mCanBlockFling = mFromState == NORMAL;
         mFlingBlockCheck.unblockFling();
-        // Must be called after all the animation controllers have been paused
-        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()
-                && BuildCompat.isAtLeastR()
-                && (mToState == ALL_APPS || mToState == NORMAL)) {
-            mLauncher.getAllAppsController().getInsetController().onDragStart(
-                    mFromState == NORMAL ? 1f : 0f);
-        }
     }
 
     @Override
-- 
GitLab


From d0bb42bf2e75fd49d235160ea9331d46a40c1aa6 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Mon, 8 Mar 2021 17:10:23 -0600
Subject: [PATCH 0627/1664] Pause onAppsUpdate when AllApps is converted to
 tabs.

To avoid onAppsUpdated conflicting with WorkTabEdu, this change pauses callback updates when AllApps is first converted to tabs. This should  avoid the need for additional  extended timeouts.

Bug: 159671700
Test: Presubmit
Change-Id: I0959629f47ae6d824e5886b2cf917635f5bfdf0e
---
 .../com/android/launcher3/ui/WorkTabTest.java | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/tests/src/com/android/launcher3/ui/WorkTabTest.java b/tests/src/com/android/launcher3/ui/WorkTabTest.java
index 63220adad0..a6c7c03da4 100644
--- a/tests/src/com/android/launcher3/ui/WorkTabTest.java
+++ b/tests/src/com/android/launcher3/ui/WorkTabTest.java
@@ -18,6 +18,7 @@ package com.android.launcher3.ui;
 import static com.android.launcher3.LauncherState.ALL_APPS;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.allapps.AllAppsStore.DEFER_UPDATES_TEST;
+import static com.android.launcher3.tapl.LauncherInstrumentation.LONG_WAIT_TIME_MS;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -140,9 +141,13 @@ public class WorkTabTest extends AbstractLauncherUiTest {
                 WorkEduView.KEY_WORK_EDU_STEP).remove(
                 WorkEduView.KEY_LEGACY_WORK_EDU_SEEN).commit());
 
-        waitForLauncherCondition("Work tab not setup",
-                launcher -> launcher.getAppsView().getContentView() instanceof AllAppsPagedView,
-                60000);
+        waitForLauncherCondition("Work tab not setup", launcher -> {
+            if (launcher.getAppsView().getContentView() instanceof AllAppsPagedView) {
+                launcher.getAppsView().getAppsStore().enableDeferUpdates(DEFER_UPDATES_TEST);
+                return true;
+            }
+            return false;
+        }, LONG_WAIT_TIME_MS);
 
         executeOnLauncher(launcher -> launcher.getStateManager().goToState(ALL_APPS));
         WorkEduView workEduView = getEduView();
@@ -153,16 +158,6 @@ public class WorkTabTest extends AbstractLauncherUiTest {
             workEduView.findViewById(R.id.proceed).callOnClick();
         });
 
-        executeOnLauncher(launcher -> Log.d(TestProtocol.WORK_PROFILE_REMOVED,
-                "work profile status (" + mProfileUserId + ") :"
-                        + launcher.getAppsView().isWorkTabVisible()));
-
-
-        executeOnLauncher(launcher -> {
-            launcher.getAppsView().getAppsStore().enableDeferUpdates(DEFER_UPDATES_TEST);
-            Log.d(TestProtocol.WORK_PROFILE_REMOVED, "Defer all apps update");
-        });
-
         AtomicInteger attempt = new AtomicInteger(0);
         // verify work edu is seen next
         waitForLauncherCondition("Launcher did not show the next edu screen", l -> {
@@ -178,7 +173,7 @@ public class WorkTabTest extends AbstractLauncherUiTest {
             }
             return ((TextView) workEduView.findViewById(R.id.content_text)).getText().equals(
                     l.getResources().getString(R.string.work_profile_edu_work_apps));
-        }, 60000);
+        });
     }
 
     @Test
-- 
GitLab


From 34c0262778f4d7a4ba75ab8d0754ec1743d8c1f1 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Sat, 13 Feb 2021 00:27:06 -0800
Subject: [PATCH 0628/1664] Instrumenting flinging all apps for jank

Bug: 178656812
Test: manual

Change-Id: I56bf19709784ac081a4f7068dedb8814eb6f3d0b
---
 .../logging/StatsLogCompatManager.java        | 30 +++++++++++++++++--
 .../allapps/AllAppsRecyclerView.java          | 21 +++++++++++++
 .../launcher3/logging/StatsLogManager.java    | 14 +++++++++
 3 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
index a762cb7d92..66c24c8bae 100644
--- a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
+++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
@@ -31,6 +31,7 @@ import static com.android.systemui.shared.system.SysUiStatsLog.LAUNCHER_UICHANGE
 
 import android.content.Context;
 import android.util.Log;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.WorkerThread;
@@ -55,6 +56,7 @@ import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.util.Executors;
 import com.android.launcher3.util.LogConfig;
+import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
 import com.android.systemui.shared.system.SysUiStatsLog;
 
 import java.util.Optional;
@@ -94,7 +96,7 @@ public class StatsLogCompatManager extends StatsLogManager {
 
     @Override
     protected StatsLogger createLogger() {
-        return new StatsCompatLogger();
+        return new StatsCompatLogger(mContext);
     }
 
     /**
@@ -136,6 +138,7 @@ public class StatsLogCompatManager extends StatsLogManager {
 
         private static final ItemInfo DEFAULT_ITEM_INFO = new ItemInfo();
 
+        private Context mContext;
         private ItemInfo mItemInfo = DEFAULT_ITEM_INFO;
         private InstanceId mInstanceId = DEFAULT_INSTANCE_ID;
         private OptionalInt mRank = OptionalInt.empty();
@@ -147,6 +150,10 @@ public class StatsLogCompatManager extends StatsLogManager {
         private Optional<String> mEditText = Optional.empty();
         private SliceItem mSliceItem;
 
+        StatsCompatLogger(Context context) {
+            mContext = context;
+        }
+
         @Override
         public StatsLogger withItemInfo(ItemInfo itemInfo) {
             if (mContainerInfo.isPresent()) {
@@ -220,7 +227,6 @@ public class StatsLogCompatManager extends StatsLogManager {
             if (!Utilities.ATLEAST_R) {
                 return;
             }
-
             LauncherAppState appState = LauncherAppState.getInstanceNoCreate();
 
             if (mSliceItem != null) {
@@ -256,6 +262,26 @@ public class StatsLogCompatManager extends StatsLogManager {
             }
         }
 
+        @Override
+        public void sendToInteractionJankMonitor(EventEnum event, View view) {
+            if (!(event instanceof LauncherEvent)) {
+                return;
+            }
+            switch ((LauncherEvent) event) {
+                case LAUNCHER_ALLAPPS_VERTICAL_SWIPE_BEGIN:
+                    InteractionJankMonitorWrapper.begin(
+                            view,
+                            InteractionJankMonitorWrapper.CUJ_ALL_APPS_SCROLL);
+                    break;
+                case LAUNCHER_ALLAPPS_VERTICAL_SWIPE_END:
+                    InteractionJankMonitorWrapper.end(
+                            InteractionJankMonitorWrapper.CUJ_ALL_APPS_SCROLL);
+                    break;
+                default:
+                    break;
+            }
+        }
+
         private LauncherAtom.ItemInfo applyOverwrites(LauncherAtom.ItemInfo atomInfo) {
             LauncherAtom.ItemInfo.Builder itemInfoBuilder = atomInfo.toBuilder();
 
diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
index ace99383e3..179cb778fd 100644
--- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
@@ -19,6 +19,9 @@ import static android.view.View.MeasureSpec.EXACTLY;
 import static android.view.View.MeasureSpec.UNSPECIFIED;
 import static android.view.View.MeasureSpec.makeMeasureSpec;
 
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_VERTICAL_SWIPE_BEGIN;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_VERTICAL_SWIPE_END;
+
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Canvas;
@@ -36,6 +39,7 @@ import com.android.launcher3.BaseRecyclerView;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
+import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.views.RecyclerViewFastScroller;
 
 import java.util.ArrayList;
@@ -175,6 +179,23 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
         }
     }
 
+    @Override
+    public void onScrollStateChanged(int state) {
+        super.onScrollStateChanged(state);
+
+        StatsLogManager mgr = BaseDraggingActivity.fromContext(getContext()).getStatsLogManager();
+        switch (state) {
+            case SCROLL_STATE_DRAGGING:
+                mgr.logger().sendToInteractionJankMonitor(
+                        LAUNCHER_ALLAPPS_VERTICAL_SWIPE_BEGIN, this);
+                break;
+            case SCROLL_STATE_IDLE:
+                mgr.logger().sendToInteractionJankMonitor(
+                        LAUNCHER_ALLAPPS_VERTICAL_SWIPE_END, this);
+                break;
+        }
+    }
+
     @Override
     public boolean onInterceptTouchEvent(MotionEvent e) {
         boolean result = super.onInterceptTouchEvent(e);
diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index d554bb91c7..c5ffff99fb 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -21,6 +21,7 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_OVERVIEW_GESTURE;
 
 import android.content.Context;
+import android.view.View;
 
 import androidx.annotation.Nullable;
 import androidx.slice.SliceItem;
@@ -407,6 +408,12 @@ public class StatsLogManager implements ResourceBasedOverride {
 
         @UiEvent(doc = "User switched to AllApps Work tab by tapping on it.")
         LAUNCHER_ALLAPPS_TAP_ON_WORK_TAB(722),
+
+        @UiEvent(doc = "All apps vertical fling started.")
+        LAUNCHER_ALLAPPS_VERTICAL_SWIPE_BEGIN(724),
+
+        @UiEvent(doc = "All apps vertical fling ended.")
+        LAUNCHER_ALLAPPS_VERTICAL_SWIPE_END(725)
         ;
 
         // ADD MORE
@@ -525,6 +532,13 @@ public class StatsLogManager implements ResourceBasedOverride {
          */
         default void log(EventEnum event) {
         }
+
+        /**
+         * Builds the final message and logs it to two different atoms, one for
+         * event tracking and the other for jank tracking.
+         */
+        default void sendToInteractionJankMonitor(EventEnum event, View v) {
+        }
     }
 
     /**
-- 
GitLab


From dc016f37a29b42fe3b825acde0529a2e39471a18 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Tue, 9 Mar 2021 09:57:40 -0600
Subject: [PATCH 0629/1664] Fix QSB tap crash

Launcher should use LCM of supported getSupportedItemsPerRowArray instead of product.

Bug: 182236647
Test: Manual
Change-Id: Ia0ad1158a841068c29ed09bf7f598f14c410092f
---
 src/com/android/launcher3/allapps/AllAppsGridAdapter.java   | 6 ++++--
 .../launcher3/allapps/search/SearchAdapterProvider.java     | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index a05e036701..bb175eac28 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -290,8 +290,10 @@ public class AllAppsGridAdapter extends
     public void setAppsPerRow(int appsPerRow) {
         mAppsPerRow = appsPerRow;
         int totalSpans = mAppsPerRow;
-        for (int itemPerRow : mSearchAdapterProvider.getSupportedItemsPerRow()) {
-            totalSpans *= itemPerRow;
+        for (int itemPerRow : mSearchAdapterProvider.getSupportedItemsPerRowArray()) {
+            if (totalSpans % itemPerRow != 0) {
+                totalSpans *= itemPerRow;
+            }
         }
         mGridLayoutMgr.setSpanCount(totalSpans);
     }
diff --git a/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java b/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
index 6d491fdd2e..fdacd3d2d9 100644
--- a/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
+++ b/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
@@ -53,7 +53,7 @@ public abstract class SearchAdapterProvider {
     /**
      * Returns supported item per row combinations supported
      */
-    public int[] getSupportedItemsPerRow() {
+    public int[] getSupportedItemsPerRowArray() {
         return new int[]{};
     }
 
-- 
GitLab


From 90351c208e1cf2d358c7b5d94978eff4258b72e1 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 9 Mar 2021 10:36:38 -0800
Subject: [PATCH 0630/1664] Create a new DragOptions for every drag operation

Previously we were reusing the same DragOptions which led to some
bad states.

Test: Drag items around, ensure nothing disappears from Workspace
Bug: 182079330
Change-Id: I8d6027bc984db8c770841bb560735604689ad0ff
---
 .../android/launcher3/BaseQuickstepLauncher.java    | 13 +++++++++----
 .../launcher3/taskbar/TaskbarDragListener.java      | 11 +++++------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 161c98ec5f..6f36d4521e 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -85,7 +85,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
     private @Nullable TaskbarController mTaskbarController;
     private final TaskbarStateHandler mTaskbarStateHandler = new TaskbarStateHandler(this);
     // Will be updated when dragging from taskbar.
-    private DragOptions mWorkspaceDragOptions = new DragOptions();
+    private @Nullable DragOptions mNextWorkspaceDragOptions = null;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -274,11 +274,16 @@ public abstract class BaseQuickstepLauncher extends Launcher
 
     @Override
     public DragOptions getDefaultWorkspaceDragOptions() {
-        return mWorkspaceDragOptions;
+        if (mNextWorkspaceDragOptions != null) {
+            DragOptions options = mNextWorkspaceDragOptions;
+            mNextWorkspaceDragOptions = null;
+            return options;
+        }
+        return super.getDefaultWorkspaceDragOptions();
     }
 
-    public void setWorkspaceDragOptions(DragOptions dragOptions) {
-        mWorkspaceDragOptions = dragOptions;
+    public void setNextWorkspaceDragOptions(DragOptions dragOptions) {
+        mNextWorkspaceDragOptions = dragOptions;
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragListener.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragListener.java
index 2bd58617f0..9d203fbe76 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragListener.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragListener.java
@@ -37,7 +37,6 @@ public class TaskbarDragListener implements View.OnDragListener {
 
     private final BaseQuickstepLauncher mLauncher;
     private final ItemInfo mDraggedItem;
-    private final DragOptions mDragOptions;
     // Randomly generated id used to verify the drag event.
     private final String mId;
 
@@ -51,8 +50,6 @@ public class TaskbarDragListener implements View.OnDragListener {
     public TaskbarDragListener(BaseQuickstepLauncher launcher, ItemInfo draggedItem) {
         mLauncher = launcher;
         mDraggedItem = draggedItem;
-        mDragOptions = new DragOptions();
-        mDragOptions.simulatedDndStartPoint = new Point();
         mId = UUID.randomUUID().toString();
     }
 
@@ -63,7 +60,7 @@ public class TaskbarDragListener implements View.OnDragListener {
 
     private void cleanup() {
         mDragLayer.setOnDragListener(null);
-        mLauncher.setWorkspaceDragOptions(new DragOptions());
+        mLauncher.setNextWorkspaceDragOptions(null);
     }
 
     /**
@@ -88,8 +85,10 @@ public class TaskbarDragListener implements View.OnDragListener {
                 cleanup();
                 return false;
             }
-            mDragOptions.simulatedDndStartPoint.set((int) dragEvent.getX(), (int) dragEvent.getY());
-            mLauncher.setWorkspaceDragOptions(mDragOptions);
+            DragOptions dragOptions = new DragOptions();
+            dragOptions.simulatedDndStartPoint = new Point((int) dragEvent.getX(),
+                    (int) dragEvent.getY());
+            mLauncher.setNextWorkspaceDragOptions(dragOptions);
             hotseatView.performLongClick();
         } else if (dragEvent.getAction() == DragEvent.ACTION_DRAG_ENDED) {
             cleanup();
-- 
GitLab


From bc08503e0bd393f661bae68d6ea47b24b4902ebb Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 9 Mar 2021 11:01:02 -0800
Subject: [PATCH 0631/1664] Ensure taskbar hotseat array index is in bounds

Test: switch from 5x5 grid to 4x4 grid, ensure no crash
Fixes: 181981906
Change-Id: Ic23e3d5f1debcfd2307e48c6aaac38d143fd95c3
---
 .../android/launcher3/taskbar/TaskbarHotseatController.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java
index 082343ea0b..b1bafdb879 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java
@@ -78,7 +78,10 @@ public class TaskbarHotseatController {
                 CellLayout.LayoutParams lp = (CellLayout.LayoutParams) child.getLayoutParams();
                 // Since the hotseat might be laid out vertically or horizontally, use whichever
                 // index is higher.
-                hotseatItemInfos[Math.max(lp.cellX, lp.cellY)] = itemInfo;
+                int index = Math.max(lp.cellX, lp.cellY);
+                if (0 <= index && index < hotseatItemInfos.length) {
+                    hotseatItemInfos[index] = itemInfo;
+                }
             }
         }
 
-- 
GitLab


From 30d6971812e6b7147affd0b0a3f807af2843c6e9 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 9 Mar 2021 12:32:01 -0800
Subject: [PATCH 0632/1664] Allow touches through Taskbar when dragging to home
 screen

Setting visibleInsets to (almost) empty ensures the drag
events get sent to launcher.

Test: Drag a taskbar item on home, ensure it moves when
events are within the taskbar insets

Bug: 182079330
Bug: 171917176
Change-Id: Ida6a4a94a3fd2927d18245f45ed3e8d1701b9833
---
 .../android/launcher3/taskbar/TaskbarContainerView.java  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
index 1e5e3e74a1..528f43e699 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
@@ -83,10 +83,15 @@ public class TaskbarContainerView extends BaseDragLayer<TaskbarActivityContext>
 
     private ViewTreeObserverWrapper.OnComputeInsetsListener createTaskbarInsetsComputer() {
         return insetsInfo -> {
-            if (getAlpha() < AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD) {
-                // We're invisible, let touches pass through us.
+            if (getAlpha() < AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD
+                    || mTaskbarView.isDraggingItem()) {
+                // We're invisible or dragging out of taskbar, let touches pass through us.
                 insetsInfo.touchableRegion.setEmpty();
                 insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION);
+                // TODO(b/182234653): Shouldn't need to do this, but for the meantime, reporting
+                // that visibleInsets is empty allows DragEvents through. Setting them as completely
+                // empty reverts to default behavior, so set 1 px instead.
+                insetsInfo.visibleInsets.set(0, 0, 0, 1);
             } else {
                  // We're visible again, accept touches anywhere in our bounds.
                 insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_FRAME);
-- 
GitLab


From 13358f65ab7cfee02c5ead2cd7d5305e563887dc Mon Sep 17 00:00:00 2001
From: Pasty Chang <pastychang@google.com>
Date: Wed, 10 Mar 2021 06:58:51 +0000
Subject: [PATCH 0633/1664] Revert "Removing insets controller animation as
 part of all-apps..."

Revert "Moving insets animation to StateHandler so that it can b..."

Revert submission 13810332-insetcontroller

Reason for revert: QsbLayout#getEditText() return object is changed, but extended class HotseatQsbWidget wasn't updated.

https://android-build.googleplex.com/builds/submitted/7197042/aosp_crosshatch-userdebug/latest/view/logs/build_error.log

Reverted Changes:
If6a088d14:Removing insets controller animation as part of al...
I296415604:Moving insets animation to StateHandler so that it...

Change-Id: I4eb33772acd887d6e1d92a9ecde41cf1e0687896
---
 .../launcher3/BaseQuickstepLauncher.java      |  16 +-
 .../android/quickstep/RecentsActivity.java    |   5 +-
 src/com/android/launcher3/Launcher.java       |   6 +-
 .../AllAppsInsetTransitionController.java     | 315 ++++++++++++++++++
 .../allapps/AllAppsTransitionController.java  |  59 +++-
 .../launcher3/allapps/SearchUiManager.java    |   4 +-
 .../search/AppsSearchContainerLayout.java     |   3 +-
 .../launcher3/statemanager/StateManager.java  |   6 +-
 .../statemanager/StatefulActivity.java        |   4 +-
 .../AbstractStateChangeTouchController.java   |  12 +
 10 files changed, 399 insertions(+), 31 deletions(-)
 create mode 100644 src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 56d25f2818..161c98ec5f 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -63,7 +63,6 @@ import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
-import java.util.List;
 import java.util.stream.Stream;
 
 /**
@@ -245,12 +244,15 @@ public abstract class BaseQuickstepLauncher extends Launcher
     }
 
     @Override
-    protected void collectStateHandlers(List<StateHandler> out) {
-        super.collectStateHandlers(out);
-        out.add(getDepthController());
-        out.add(new RecentsViewStateController(this));
-        out.add(new BackButtonAlphaHandler(this));
-        out.add(getTaskbarStateHandler());
+    protected StateHandler<LauncherState>[] createStateHandlers() {
+        return new StateHandler[] {
+                getAllAppsController(),
+                getWorkspace(),
+                getDepthController(),
+                new RecentsViewStateController(this),
+                new BackButtonAlphaHandler(this),
+                getTaskbarStateHandler(),
+        };
     }
 
     public DepthController getDepthController() {
diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index 1b2fd41617..8aa0842f0e 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -71,7 +71,6 @@ import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
-import java.util.List;
 
 /**
  * A recents activity that shows the recently launched tasks as swipable task cards.
@@ -318,8 +317,8 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
     }
 
     @Override
-    protected void collectStateHandlers(List<StateHandler> out) {
-        out.add(new FallbackRecentsStateController(this));
+    protected StateHandler<RecentsState>[] createStateHandlers() {
+        return new StateHandler[] { new FallbackRecentsStateController(this) };
     }
 
     @Override
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 80c80d7716..fa63885c67 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2761,10 +2761,8 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         return super.onKeyUp(keyCode, event);
     }
 
-    @Override
-    protected void collectStateHandlers(List<StateHandler> out) {
-        out.add(getAllAppsController());
-        out.add(getWorkspace());
+    protected StateHandler<LauncherState>[] createStateHandlers() {
+        return new StateHandler[] { getAllAppsController(), getWorkspace() };
     }
 
     public TouchController[] createTouchControllers() {
diff --git a/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java b/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
new file mode 100644
index 0000000000..b34c8b8150
--- /dev/null
+++ b/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
@@ -0,0 +1,315 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.allapps;
+
+import android.annotation.TargetApi;
+import android.graphics.Insets;
+import android.os.Build;
+import android.util.Log;
+import android.view.View;
+import android.view.WindowInsets;
+import android.view.WindowInsetsAnimationControlListener;
+import android.view.WindowInsetsAnimationController;
+import android.view.animation.Interpolator;
+import android.view.animation.LinearInterpolator;
+
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.Utilities;
+import com.android.launcher3.util.UiThreadHelper;
+
+/**
+ * Handles IME over all apps to be synchronously transitioning along with the passed in
+ * root inset.
+ */
+public class AllAppsInsetTransitionController {
+
+    private static final boolean DEBUG = true;
+    private static final String TAG = "AllAppsInsetTransitionController";
+    private static final Interpolator LINEAR = new LinearInterpolator();
+
+    private WindowInsetsAnimationController mAnimationController;
+    private WindowInsetsAnimationControlListener mCurrentRequest;
+
+    private Runnable mSearchEduRunnable;
+
+    private float mAllAppsHeight;
+
+    private int mDownInsetBottom;
+    private boolean mShownAtDown;
+
+    private int mHiddenInsetBottom;
+    private int mShownInsetBottom;
+
+    private float mDown, mCurrent;
+    private View mApps;
+
+    /**
+     *
+     */
+    public boolean showSearchEduIfNecessary() {
+        if (mSearchEduRunnable == null) {
+            return false;
+        }
+        mSearchEduRunnable.run();
+        return true;
+    }
+
+    public void setSearchEduRunnable(Runnable eduRunnable) {
+        mSearchEduRunnable = eduRunnable;
+    }
+
+    // Only purpose of these states is to keep track of fast fling transition
+    enum State {
+        RESET, DRAG_START_BOTTOM, DRAG_START_BOTTOM_IME_CANCELLED,
+        FLING_END_TOP, FLING_END_TOP_IME_CANCELLED,
+        DRAG_START_TOP, FLING_END_BOTTOM
+    }
+
+    private State mState;
+
+    public AllAppsInsetTransitionController(float allAppsHeight, View appsView) {
+        mAllAppsHeight = allAppsHeight;
+        mApps = appsView;
+    }
+
+    public void show() {
+        mApps.getWindowInsetsController().show(WindowInsets.Type.ime());
+    }
+
+    public void hide() {
+        if (!Utilities.ATLEAST_R) return;
+
+        WindowInsets insets = mApps.getRootWindowInsets();
+        if (insets == null) return;
+
+        boolean imeVisible = insets.isVisible(WindowInsets.Type.ime());
+
+        if (DEBUG) {
+            Log.d(TAG, "\nhide imeVisible=" + imeVisible);
+        }
+        if (insets.isVisible(WindowInsets.Type.ime())) {
+            mApps.getWindowInsetsController().hide(WindowInsets.Type.ime());
+        }
+    }
+
+    /**
+     * Initializes member variables and requests for the {@link WindowInsetsAnimationController}
+     * object.
+     *
+     * @param progress value between 0..1
+     */
+    @TargetApi(Build.VERSION_CODES.R)
+    public void onDragStart(float progress) {
+        if (!Utilities.ATLEAST_R) return;
+
+        // Until getRootWindowInsets().isVisible(...) method returns correct value,
+        // only support InsetController based IME transition during swipe up and
+        // NOT swipe down
+        if (Float.compare(progress, 0f) == 0) return;
+
+        setState(true, false, progress);
+        mDown = progress * mAllAppsHeight;
+
+        // Below two values are sometimes incorrect. Possibly a platform bug
+        // mDownInsetBottom = mApps.getRootWindowInsets().getInsets(WindowInsets.Type.ime()).bottom;
+        // mShownAtDown = mApps.getRootWindowInsets().isVisible(WindowInsets.Type.ime());
+
+        if (DEBUG) {
+            Log.d(TAG, "\nonDragStart progress=" + progress
+                    + " mDownInsets=" + mDownInsetBottom
+                    + " mShownAtDown=" + mShownAtDown);
+        }
+
+        mApps.getWindowInsetsController().controlWindowInsetsAnimation(
+                WindowInsets.Type.ime(), -1 /* no predetermined duration */, LINEAR, null,
+                mCurrentRequest = new WindowInsetsAnimationControlListener() {
+
+                    @Override
+                    public void onReady(WindowInsetsAnimationController controller, int types) {
+                        if (DEBUG) {
+                            Log.d(TAG, "Listener.onReady " + (mCurrentRequest == this));
+                        }
+                        if (controller != null) {
+                            if (mCurrentRequest == this && !handleFinishOnFling(controller)) {
+                                mAnimationController = controller;
+                            } else {
+                                controller.finish(false /* just don't show */);
+                            }
+                        }
+                    }
+
+                    @Override
+                    public void onFinished(WindowInsetsAnimationController controller) {
+                        // when screen lock happens, then this method get called
+                        if (DEBUG) {
+                            Log.d(TAG, "Listener.onFinished ctrl=" + controller
+                                    + " mAnimationController=" + mAnimationController);
+                        }
+                        if (mAnimationController != null) {
+                            mAnimationController.finish(true);
+                            mAnimationController = null;
+                        }
+                    }
+
+                    @Override
+                    public void onCancelled(@Nullable WindowInsetsAnimationController controller) {
+                        if (DEBUG) {
+                            // Keep the verbose logging to chase down IME not showing up issue.
+                            // b/178904132
+                            Log.e(TAG, "Listener.onCancelled ctrl=" + controller
+                                    + " mAnimationController=" + mAnimationController,
+                                    new Exception());
+                        }
+                        if (mState == State.DRAG_START_BOTTOM) {
+                            mState = State.DRAG_START_BOTTOM_IME_CANCELLED;
+                        }
+                        mAnimationController = null;
+                        if (controller != null) {
+                            controller.finish(true);
+                        }
+                    }
+                });
+    }
+
+    /**
+     * If IME bounds after touch sequence finishes, call finish.
+     */
+    private boolean handleFinishOnFling(WindowInsetsAnimationController controller) {
+        if (!Utilities.ATLEAST_R) return false;
+
+        if (mState == State.FLING_END_TOP) {
+            controller.finish(true);
+            return true;
+        } else if (mState == State.FLING_END_BOTTOM) {
+            controller.finish(false);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Handles the translation using the progress.
+     *
+     * @param progress value between 0..1
+     */
+    @TargetApi(Build.VERSION_CODES.R)
+    public void setProgress(float progress) {
+        if (!Utilities.ATLEAST_R) return;
+        // progress that equals to 0 or 1 is error prone. Do not use them.
+        // Instead use onDragStart and onAnimationEnd
+        if (mAnimationController == null || progress <= 0f || progress >= 1f) return;
+
+        mCurrent = progress * mAllAppsHeight;
+        mHiddenInsetBottom = mAnimationController.getHiddenStateInsets().bottom; // 0
+        mShownInsetBottom = mAnimationController.getShownStateInsets().bottom; // 1155
+
+        int shift = mShownAtDown ? 0 : (int) (mAllAppsHeight - mShownInsetBottom);
+
+        int inset = (int) (mDownInsetBottom + (mDown - mCurrent) - shift);
+
+        final int start = mShownAtDown ? mShownInsetBottom : mHiddenInsetBottom;
+        final int end = mShownAtDown ? mHiddenInsetBottom : mShownInsetBottom;
+        inset = Math.max(inset, mHiddenInsetBottom);
+        inset = Math.min(inset, mShownInsetBottom);
+        if (DEBUG && false) {
+            Log.d(TAG, "updateInset mCurrent=" + mCurrent + " mDown="
+                    + mDown + " hidden=" + mHiddenInsetBottom
+                    + " shown=" + mShownInsetBottom
+                    + " mDownInsets.bottom=" + mDownInsetBottom + " inset=" + inset
+                    + " shift= " + shift);
+        }
+
+        mAnimationController.setInsetsAndAlpha(
+                Insets.of(0, 0, 0, inset),
+                1f, (inset - start) / (float) (end - start));
+    }
+
+    /**
+     * Report to the animation controller that we no longer plan to translate anymore.
+     *
+     * @param progress value between 0..1
+     */
+    @TargetApi(Build.VERSION_CODES.R)
+    public void onAnimationEnd(float progress) {
+        if (DEBUG) {
+            Log.d(TAG, "onAnimationEnd progress=" + progress
+                    + " mAnimationController=" + mAnimationController);
+        }
+        if (mState == null) {
+            // only called when launcher restarting.
+            UiThreadHelper.hideKeyboardAsync(mApps.getContext(), mApps.getWindowToken());
+        }
+
+        setState(false, true, progress);
+
+
+        if (mAnimationController == null) {
+            if (mState == State.FLING_END_TOP_IME_CANCELLED) {
+                mApps.getWindowInsetsController().show(WindowInsets.Type.ime());
+            }
+            return;
+        }
+
+        /* handle finish */
+        if (mState == State.FLING_END_TOP) {
+            mAnimationController.finish(true /* show */);
+        } else {
+            if (Float.compare(progress, 1f) == 0 /* bottom */) {
+                mAnimationController.finish(false /* gone */);
+            } else {
+                mAnimationController.finish(mShownAtDown);
+            }
+        }
+        /* handle finish */
+
+        if (DEBUG) {
+            Log.d(TAG, "endTranslation progress=" + progress
+                    + " mAnimationController=" + mAnimationController);
+        }
+        mAnimationController = null;
+        mCurrentRequest = null;
+        setState(false, false, progress);
+    }
+
+    private void setState(boolean start, boolean end, float progress) {
+        State state = State.RESET;
+        if (start && end) {
+            throw new IllegalStateException("drag start and end cannot happen in same call");
+        }
+        if (start) {
+            if (Float.compare(progress, 1f) == 0) {
+                state = State.DRAG_START_BOTTOM;
+            } else if (Float.compare(progress, 0f) == 0) {
+                state = State.DRAG_START_TOP;
+            }
+        } else if (end) {
+            if (Float.compare(progress, 1f) == 0 && mState == State.DRAG_START_TOP) {
+                state = State.FLING_END_BOTTOM;
+            } else if (Float.compare(progress, 0f) == 0) {
+                if (mState == State.DRAG_START_BOTTOM) {
+                    state = State.FLING_END_TOP;
+                } else if (mState == State.DRAG_START_BOTTOM_IME_CANCELLED) {
+                    state = State.FLING_END_TOP_IME_CANCELLED;
+                }
+            }
+        }
+        if (DEBUG) {
+            Log.d(TAG, "setState " + mState + " -> " + state);
+        }
+        mState = state;
+    }
+}
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index abf63dc0a1..a48e4232cf 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -33,15 +33,18 @@ import static com.android.launcher3.util.SystemUiController.UI_STATE_ALLAPPS;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
+import android.content.SharedPreferences;
 import android.util.FloatProperty;
 import android.view.View;
 import android.view.animation.Interpolator;
+import android.widget.EditText;
+
+import androidx.core.os.BuildCompat;
 
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
-import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.anim.PropertySetter;
@@ -60,8 +63,8 @@ import com.android.launcher3.views.ScrimView;
  * If release velocity < THRES1, snap according to either top or bottom depending on whether it's
  * closer to top or closer to the page indicator.
  */
-public class AllAppsTransitionController
-        implements StateHandler<LauncherState>, OnDeviceProfileChangeListener {
+public class AllAppsTransitionController implements StateHandler<LauncherState>,
+        OnDeviceProfileChangeListener, SharedPreferences.OnSharedPreferenceChangeListener {
 
     public static final FloatProperty<AllAppsTransitionController> ALL_APPS_PROGRESS =
             new FloatProperty<AllAppsTransitionController>("allAppsProgress") {
@@ -78,6 +81,7 @@ public class AllAppsTransitionController
             };
 
     private static final int APPS_VIEW_ALPHA_CHANNEL_INDEX = 0;
+    private static final String PREF_KEY_SHOW_SEARCH_IME = "pref_search_show_ime";
 
     private AllAppsContainerView mAppsView;
     private ScrimView mScrimView;
@@ -95,6 +99,8 @@ public class AllAppsTransitionController
     private float mProgress;        // [0, 1], mShiftRange * mProgress = shiftCurrent
 
     private float mScrollRangeDelta = 0;
+    private AllAppsInsetTransitionController mInsetController;
+    private boolean mSearchImeEnabled;
 
     public AllAppsTransitionController(Launcher l) {
         mLauncher = l;
@@ -103,12 +109,19 @@ public class AllAppsTransitionController
 
         mIsVerticalLayout = mLauncher.getDeviceProfile().isVerticalBarLayout();
         mLauncher.addOnDeviceProfileChangeListener(this);
+
+        onSharedPreferenceChanged(mLauncher.getSharedPrefs(), PREF_KEY_SHOW_SEARCH_IME);
+        mLauncher.getSharedPrefs().registerOnSharedPreferenceChangeListener(this);
     }
 
     public float getShiftRange() {
         return mShiftRange;
     }
 
+    public AllAppsInsetTransitionController getInsetController() {
+        return mInsetController;
+    }
+
     @Override
     public void onDeviceProfileChanged(DeviceProfile dp) {
         mIsVerticalLayout = dp.isVerticalBarLayout();
@@ -133,7 +146,14 @@ public class AllAppsTransitionController
         mProgress = progress;
 
         mScrimView.setProgress(progress);
-        mAppsView.setTranslationY(progress * mShiftRange);
+        float shiftCurrent = progress * mShiftRange;
+        mAppsView.setTranslationY(shiftCurrent);
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && mSearchImeEnabled) {
+            if (mInsetController == null) {
+                setupInsetTransitionController();
+            }
+            mInsetController.setProgress(progress);
+        }
     }
 
     public float getProgress() {
@@ -222,13 +242,18 @@ public class AllAppsTransitionController
     public void setupViews(AllAppsContainerView appsView, ScrimView scrimView) {
         mAppsView = appsView;
         mScrimView = scrimView;
-        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && Utilities.ATLEAST_R) {
-            mLauncher.getSystemUiController().updateUiState(UI_STATE_ALLAPPS,
-                    View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                            | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && BuildCompat.isAtLeastR()) {
+            setupInsetTransitionController();
         }
     }
 
+    private void setupInsetTransitionController() {
+        mInsetController = new AllAppsInsetTransitionController(mShiftRange, mAppsView);
+        mLauncher.getSystemUiController().updateUiState(UI_STATE_ALLAPPS,
+                View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                        | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+    }
+
     /**
      * Updates the total scroll range but does not update the UI.
      */
@@ -249,5 +274,23 @@ public class AllAppsTransitionController
         if (Float.compare(mProgress, 1f) == 0) {
             mAppsView.reset(false /* animate */);
         }
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && mSearchImeEnabled
+                && BuildCompat.isAtLeastR()) {
+            mInsetController.onAnimationEnd(mProgress);
+            if (Float.compare(mProgress, 0f) == 0) {
+                EditText editText = mAppsView.getSearchUiManager().getEditText();
+                if (editText != null && !mInsetController.showSearchEduIfNecessary()) {
+                    editText.requestFocus();
+                }
+            }
+            // TODO: should make the controller hide synchronously
+        }
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String s) {
+        if (s.equals(PREF_KEY_SHOW_SEARCH_IME)) {
+            mSearchImeEnabled = sharedPreferences.getBoolean(s, true);
+        }
     }
 }
diff --git a/src/com/android/launcher3/allapps/SearchUiManager.java b/src/com/android/launcher3/allapps/SearchUiManager.java
index 0d42950cbb..39410a7b3f 100644
--- a/src/com/android/launcher3/allapps/SearchUiManager.java
+++ b/src/com/android/launcher3/allapps/SearchUiManager.java
@@ -20,10 +20,10 @@ import static com.android.launcher3.LauncherState.ALL_APPS_HEADER;
 import android.graphics.Rect;
 import android.view.KeyEvent;
 import android.view.animation.Interpolator;
+import android.widget.EditText;
 
 import androidx.annotation.Nullable;
 
-import com.android.launcher3.ExtendedEditText;
 import com.android.launcher3.anim.PropertySetter;
 
 /**
@@ -75,7 +75,7 @@ public interface SearchUiManager {
      * @return the edit text object
      */
     @Nullable
-    ExtendedEditText getEditText();
+    EditText getEditText();
 
     /**
      * sets highlight result's title
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
index 2261d5147b..426fd0cd83 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
@@ -32,6 +32,7 @@ import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup.MarginLayoutParams;
 import android.view.animation.Interpolator;
+import android.widget.EditText;
 
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.DeviceProfile;
@@ -229,7 +230,7 @@ public class AppsSearchContainerLayout extends ExtendedEditText
     }
 
     @Override
-    public ExtendedEditText getEditText() {
+    public EditText getEditText() {
         return this;
     }
 }
diff --git a/src/com/android/launcher3/statemanager/StateManager.java b/src/com/android/launcher3/statemanager/StateManager.java
index 2b51e97f3f..a18f34062a 100644
--- a/src/com/android/launcher3/statemanager/StateManager.java
+++ b/src/com/android/launcher3/statemanager/StateManager.java
@@ -26,12 +26,14 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.os.Handler;
 import android.os.Looper;
+import android.util.Log;
 
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.states.StateAnimationConfig.AnimationFlags;
+import com.android.launcher3.testing.TestProtocol;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -88,9 +90,7 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
 
     public StateHandler[] getStateHandlers() {
         if (mStateHandlers == null) {
-            ArrayList<StateHandler> handlers = new ArrayList<>();
-            mActivity.collectStateHandlers(handlers);
-            mStateHandlers = handlers.toArray(new StateHandler[handlers.size()]);
+            mStateHandlers = mActivity.createStateHandlers();
         }
         return mStateHandlers;
     }
diff --git a/src/com/android/launcher3/statemanager/StatefulActivity.java b/src/com/android/launcher3/statemanager/StatefulActivity.java
index 8a35cb33c0..7abb6532f4 100644
--- a/src/com/android/launcher3/statemanager/StatefulActivity.java
+++ b/src/com/android/launcher3/statemanager/StatefulActivity.java
@@ -30,8 +30,6 @@ import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
 import com.android.launcher3.views.BaseDragLayer;
 
-import java.util.List;
-
 /**
  * Abstract activity with state management
  * @param <STATE_TYPE> Type of state object
@@ -48,7 +46,7 @@ public abstract class StatefulActivity<STATE_TYPE extends BaseState<STATE_TYPE>>
     /**
      * Create handlers to control the property changes for this activity
      */
-    protected abstract void collectStateHandlers(List<StateHandler> out);
+    protected abstract StateHandler<STATE_TYPE>[] createStateHandlers();
 
     /**
      * Returns true if the activity is in the provided state
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index 516fc74ba6..6f1b2f967f 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -38,19 +38,24 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ValueAnimator;
 import android.os.SystemClock;
+import android.util.Log;
 import android.view.HapticFeedbackConstants;
 import android.view.MotionEvent;
 
+import androidx.core.os.BuildCompat;
+
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAnimUtils;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.AnimatorPlaybackController;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.logger.LauncherAtom;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.states.StateAnimationConfig.AnimationFlags;
+import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.FlingBlockCheck;
 import com.android.launcher3.util.TouchController;
 
@@ -260,6 +265,13 @@ public abstract class AbstractStateChangeTouchController
         }
         mCanBlockFling = mFromState == NORMAL;
         mFlingBlockCheck.unblockFling();
+        // Must be called after all the animation controllers have been paused
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()
+                && BuildCompat.isAtLeastR()
+                && (mToState == ALL_APPS || mToState == NORMAL)) {
+            mLauncher.getAllAppsController().getInsetController().onDragStart(
+                    mFromState == NORMAL ? 1f : 0f);
+        }
     }
 
     @Override
-- 
GitLab


From b5181c8c3947cb5062c602b3390cff3b1cb812ee Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 10 Mar 2021 07:39:12 +0000
Subject: [PATCH 0634/1664] Revert "Revert "Removing insets controller
 animation as part of ..."

Revert "Revert "Moving insets animation to StateHandler so that ..."

Revert submission 13823490-revert-13810332-insetcontroller-CLXXLCZAUM

Reason for revert: Fixed original error in ag/13823726
Reverted Changes:
Ie19a3fd90:Revert "Moving insets animation to StateHandler so...
I4eb33772a:Revert "Removing insets controller animation as pa...

Change-Id: I7fb395c51ea99081913bc99515257e98c0a32754
---
 .../launcher3/BaseQuickstepLauncher.java      |  16 +-
 .../android/quickstep/RecentsActivity.java    |   5 +-
 src/com/android/launcher3/Launcher.java       |   6 +-
 .../AllAppsInsetTransitionController.java     | 315 ------------------
 .../allapps/AllAppsTransitionController.java  |  59 +---
 .../launcher3/allapps/SearchUiManager.java    |   4 +-
 .../search/AppsSearchContainerLayout.java     |   3 +-
 .../launcher3/statemanager/StateManager.java  |   6 +-
 .../statemanager/StatefulActivity.java        |   4 +-
 .../AbstractStateChangeTouchController.java   |  12 -
 10 files changed, 31 insertions(+), 399 deletions(-)
 delete mode 100644 src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 161c98ec5f..56d25f2818 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -63,6 +63,7 @@ import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
+import java.util.List;
 import java.util.stream.Stream;
 
 /**
@@ -244,15 +245,12 @@ public abstract class BaseQuickstepLauncher extends Launcher
     }
 
     @Override
-    protected StateHandler<LauncherState>[] createStateHandlers() {
-        return new StateHandler[] {
-                getAllAppsController(),
-                getWorkspace(),
-                getDepthController(),
-                new RecentsViewStateController(this),
-                new BackButtonAlphaHandler(this),
-                getTaskbarStateHandler(),
-        };
+    protected void collectStateHandlers(List<StateHandler> out) {
+        super.collectStateHandlers(out);
+        out.add(getDepthController());
+        out.add(new RecentsViewStateController(this));
+        out.add(new BackButtonAlphaHandler(this));
+        out.add(getTaskbarStateHandler());
     }
 
     public DepthController getDepthController() {
diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index 8aa0842f0e..1b2fd41617 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -71,6 +71,7 @@ import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
+import java.util.List;
 
 /**
  * A recents activity that shows the recently launched tasks as swipable task cards.
@@ -317,8 +318,8 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
     }
 
     @Override
-    protected StateHandler<RecentsState>[] createStateHandlers() {
-        return new StateHandler[] { new FallbackRecentsStateController(this) };
+    protected void collectStateHandlers(List<StateHandler> out) {
+        out.add(new FallbackRecentsStateController(this));
     }
 
     @Override
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index fa63885c67..80c80d7716 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2761,8 +2761,10 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         return super.onKeyUp(keyCode, event);
     }
 
-    protected StateHandler<LauncherState>[] createStateHandlers() {
-        return new StateHandler[] { getAllAppsController(), getWorkspace() };
+    @Override
+    protected void collectStateHandlers(List<StateHandler> out) {
+        out.add(getAllAppsController());
+        out.add(getWorkspace());
     }
 
     public TouchController[] createTouchControllers() {
diff --git a/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java b/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
deleted file mode 100644
index b34c8b8150..0000000000
--- a/src/com/android/launcher3/allapps/AllAppsInsetTransitionController.java
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.allapps;
-
-import android.annotation.TargetApi;
-import android.graphics.Insets;
-import android.os.Build;
-import android.util.Log;
-import android.view.View;
-import android.view.WindowInsets;
-import android.view.WindowInsetsAnimationControlListener;
-import android.view.WindowInsetsAnimationController;
-import android.view.animation.Interpolator;
-import android.view.animation.LinearInterpolator;
-
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.Utilities;
-import com.android.launcher3.util.UiThreadHelper;
-
-/**
- * Handles IME over all apps to be synchronously transitioning along with the passed in
- * root inset.
- */
-public class AllAppsInsetTransitionController {
-
-    private static final boolean DEBUG = true;
-    private static final String TAG = "AllAppsInsetTransitionController";
-    private static final Interpolator LINEAR = new LinearInterpolator();
-
-    private WindowInsetsAnimationController mAnimationController;
-    private WindowInsetsAnimationControlListener mCurrentRequest;
-
-    private Runnable mSearchEduRunnable;
-
-    private float mAllAppsHeight;
-
-    private int mDownInsetBottom;
-    private boolean mShownAtDown;
-
-    private int mHiddenInsetBottom;
-    private int mShownInsetBottom;
-
-    private float mDown, mCurrent;
-    private View mApps;
-
-    /**
-     *
-     */
-    public boolean showSearchEduIfNecessary() {
-        if (mSearchEduRunnable == null) {
-            return false;
-        }
-        mSearchEduRunnable.run();
-        return true;
-    }
-
-    public void setSearchEduRunnable(Runnable eduRunnable) {
-        mSearchEduRunnable = eduRunnable;
-    }
-
-    // Only purpose of these states is to keep track of fast fling transition
-    enum State {
-        RESET, DRAG_START_BOTTOM, DRAG_START_BOTTOM_IME_CANCELLED,
-        FLING_END_TOP, FLING_END_TOP_IME_CANCELLED,
-        DRAG_START_TOP, FLING_END_BOTTOM
-    }
-
-    private State mState;
-
-    public AllAppsInsetTransitionController(float allAppsHeight, View appsView) {
-        mAllAppsHeight = allAppsHeight;
-        mApps = appsView;
-    }
-
-    public void show() {
-        mApps.getWindowInsetsController().show(WindowInsets.Type.ime());
-    }
-
-    public void hide() {
-        if (!Utilities.ATLEAST_R) return;
-
-        WindowInsets insets = mApps.getRootWindowInsets();
-        if (insets == null) return;
-
-        boolean imeVisible = insets.isVisible(WindowInsets.Type.ime());
-
-        if (DEBUG) {
-            Log.d(TAG, "\nhide imeVisible=" + imeVisible);
-        }
-        if (insets.isVisible(WindowInsets.Type.ime())) {
-            mApps.getWindowInsetsController().hide(WindowInsets.Type.ime());
-        }
-    }
-
-    /**
-     * Initializes member variables and requests for the {@link WindowInsetsAnimationController}
-     * object.
-     *
-     * @param progress value between 0..1
-     */
-    @TargetApi(Build.VERSION_CODES.R)
-    public void onDragStart(float progress) {
-        if (!Utilities.ATLEAST_R) return;
-
-        // Until getRootWindowInsets().isVisible(...) method returns correct value,
-        // only support InsetController based IME transition during swipe up and
-        // NOT swipe down
-        if (Float.compare(progress, 0f) == 0) return;
-
-        setState(true, false, progress);
-        mDown = progress * mAllAppsHeight;
-
-        // Below two values are sometimes incorrect. Possibly a platform bug
-        // mDownInsetBottom = mApps.getRootWindowInsets().getInsets(WindowInsets.Type.ime()).bottom;
-        // mShownAtDown = mApps.getRootWindowInsets().isVisible(WindowInsets.Type.ime());
-
-        if (DEBUG) {
-            Log.d(TAG, "\nonDragStart progress=" + progress
-                    + " mDownInsets=" + mDownInsetBottom
-                    + " mShownAtDown=" + mShownAtDown);
-        }
-
-        mApps.getWindowInsetsController().controlWindowInsetsAnimation(
-                WindowInsets.Type.ime(), -1 /* no predetermined duration */, LINEAR, null,
-                mCurrentRequest = new WindowInsetsAnimationControlListener() {
-
-                    @Override
-                    public void onReady(WindowInsetsAnimationController controller, int types) {
-                        if (DEBUG) {
-                            Log.d(TAG, "Listener.onReady " + (mCurrentRequest == this));
-                        }
-                        if (controller != null) {
-                            if (mCurrentRequest == this && !handleFinishOnFling(controller)) {
-                                mAnimationController = controller;
-                            } else {
-                                controller.finish(false /* just don't show */);
-                            }
-                        }
-                    }
-
-                    @Override
-                    public void onFinished(WindowInsetsAnimationController controller) {
-                        // when screen lock happens, then this method get called
-                        if (DEBUG) {
-                            Log.d(TAG, "Listener.onFinished ctrl=" + controller
-                                    + " mAnimationController=" + mAnimationController);
-                        }
-                        if (mAnimationController != null) {
-                            mAnimationController.finish(true);
-                            mAnimationController = null;
-                        }
-                    }
-
-                    @Override
-                    public void onCancelled(@Nullable WindowInsetsAnimationController controller) {
-                        if (DEBUG) {
-                            // Keep the verbose logging to chase down IME not showing up issue.
-                            // b/178904132
-                            Log.e(TAG, "Listener.onCancelled ctrl=" + controller
-                                    + " mAnimationController=" + mAnimationController,
-                                    new Exception());
-                        }
-                        if (mState == State.DRAG_START_BOTTOM) {
-                            mState = State.DRAG_START_BOTTOM_IME_CANCELLED;
-                        }
-                        mAnimationController = null;
-                        if (controller != null) {
-                            controller.finish(true);
-                        }
-                    }
-                });
-    }
-
-    /**
-     * If IME bounds after touch sequence finishes, call finish.
-     */
-    private boolean handleFinishOnFling(WindowInsetsAnimationController controller) {
-        if (!Utilities.ATLEAST_R) return false;
-
-        if (mState == State.FLING_END_TOP) {
-            controller.finish(true);
-            return true;
-        } else if (mState == State.FLING_END_BOTTOM) {
-            controller.finish(false);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Handles the translation using the progress.
-     *
-     * @param progress value between 0..1
-     */
-    @TargetApi(Build.VERSION_CODES.R)
-    public void setProgress(float progress) {
-        if (!Utilities.ATLEAST_R) return;
-        // progress that equals to 0 or 1 is error prone. Do not use them.
-        // Instead use onDragStart and onAnimationEnd
-        if (mAnimationController == null || progress <= 0f || progress >= 1f) return;
-
-        mCurrent = progress * mAllAppsHeight;
-        mHiddenInsetBottom = mAnimationController.getHiddenStateInsets().bottom; // 0
-        mShownInsetBottom = mAnimationController.getShownStateInsets().bottom; // 1155
-
-        int shift = mShownAtDown ? 0 : (int) (mAllAppsHeight - mShownInsetBottom);
-
-        int inset = (int) (mDownInsetBottom + (mDown - mCurrent) - shift);
-
-        final int start = mShownAtDown ? mShownInsetBottom : mHiddenInsetBottom;
-        final int end = mShownAtDown ? mHiddenInsetBottom : mShownInsetBottom;
-        inset = Math.max(inset, mHiddenInsetBottom);
-        inset = Math.min(inset, mShownInsetBottom);
-        if (DEBUG && false) {
-            Log.d(TAG, "updateInset mCurrent=" + mCurrent + " mDown="
-                    + mDown + " hidden=" + mHiddenInsetBottom
-                    + " shown=" + mShownInsetBottom
-                    + " mDownInsets.bottom=" + mDownInsetBottom + " inset=" + inset
-                    + " shift= " + shift);
-        }
-
-        mAnimationController.setInsetsAndAlpha(
-                Insets.of(0, 0, 0, inset),
-                1f, (inset - start) / (float) (end - start));
-    }
-
-    /**
-     * Report to the animation controller that we no longer plan to translate anymore.
-     *
-     * @param progress value between 0..1
-     */
-    @TargetApi(Build.VERSION_CODES.R)
-    public void onAnimationEnd(float progress) {
-        if (DEBUG) {
-            Log.d(TAG, "onAnimationEnd progress=" + progress
-                    + " mAnimationController=" + mAnimationController);
-        }
-        if (mState == null) {
-            // only called when launcher restarting.
-            UiThreadHelper.hideKeyboardAsync(mApps.getContext(), mApps.getWindowToken());
-        }
-
-        setState(false, true, progress);
-
-
-        if (mAnimationController == null) {
-            if (mState == State.FLING_END_TOP_IME_CANCELLED) {
-                mApps.getWindowInsetsController().show(WindowInsets.Type.ime());
-            }
-            return;
-        }
-
-        /* handle finish */
-        if (mState == State.FLING_END_TOP) {
-            mAnimationController.finish(true /* show */);
-        } else {
-            if (Float.compare(progress, 1f) == 0 /* bottom */) {
-                mAnimationController.finish(false /* gone */);
-            } else {
-                mAnimationController.finish(mShownAtDown);
-            }
-        }
-        /* handle finish */
-
-        if (DEBUG) {
-            Log.d(TAG, "endTranslation progress=" + progress
-                    + " mAnimationController=" + mAnimationController);
-        }
-        mAnimationController = null;
-        mCurrentRequest = null;
-        setState(false, false, progress);
-    }
-
-    private void setState(boolean start, boolean end, float progress) {
-        State state = State.RESET;
-        if (start && end) {
-            throw new IllegalStateException("drag start and end cannot happen in same call");
-        }
-        if (start) {
-            if (Float.compare(progress, 1f) == 0) {
-                state = State.DRAG_START_BOTTOM;
-            } else if (Float.compare(progress, 0f) == 0) {
-                state = State.DRAG_START_TOP;
-            }
-        } else if (end) {
-            if (Float.compare(progress, 1f) == 0 && mState == State.DRAG_START_TOP) {
-                state = State.FLING_END_BOTTOM;
-            } else if (Float.compare(progress, 0f) == 0) {
-                if (mState == State.DRAG_START_BOTTOM) {
-                    state = State.FLING_END_TOP;
-                } else if (mState == State.DRAG_START_BOTTOM_IME_CANCELLED) {
-                    state = State.FLING_END_TOP_IME_CANCELLED;
-                }
-            }
-        }
-        if (DEBUG) {
-            Log.d(TAG, "setState " + mState + " -> " + state);
-        }
-        mState = state;
-    }
-}
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index a48e4232cf..abf63dc0a1 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -33,18 +33,15 @@ import static com.android.launcher3.util.SystemUiController.UI_STATE_ALLAPPS;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
-import android.content.SharedPreferences;
 import android.util.FloatProperty;
 import android.view.View;
 import android.view.animation.Interpolator;
-import android.widget.EditText;
-
-import androidx.core.os.BuildCompat;
 
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.anim.PropertySetter;
@@ -63,8 +60,8 @@ import com.android.launcher3.views.ScrimView;
  * If release velocity < THRES1, snap according to either top or bottom depending on whether it's
  * closer to top or closer to the page indicator.
  */
-public class AllAppsTransitionController implements StateHandler<LauncherState>,
-        OnDeviceProfileChangeListener, SharedPreferences.OnSharedPreferenceChangeListener {
+public class AllAppsTransitionController
+        implements StateHandler<LauncherState>, OnDeviceProfileChangeListener {
 
     public static final FloatProperty<AllAppsTransitionController> ALL_APPS_PROGRESS =
             new FloatProperty<AllAppsTransitionController>("allAppsProgress") {
@@ -81,7 +78,6 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
             };
 
     private static final int APPS_VIEW_ALPHA_CHANNEL_INDEX = 0;
-    private static final String PREF_KEY_SHOW_SEARCH_IME = "pref_search_show_ime";
 
     private AllAppsContainerView mAppsView;
     private ScrimView mScrimView;
@@ -99,8 +95,6 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
     private float mProgress;        // [0, 1], mShiftRange * mProgress = shiftCurrent
 
     private float mScrollRangeDelta = 0;
-    private AllAppsInsetTransitionController mInsetController;
-    private boolean mSearchImeEnabled;
 
     public AllAppsTransitionController(Launcher l) {
         mLauncher = l;
@@ -109,19 +103,12 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
 
         mIsVerticalLayout = mLauncher.getDeviceProfile().isVerticalBarLayout();
         mLauncher.addOnDeviceProfileChangeListener(this);
-
-        onSharedPreferenceChanged(mLauncher.getSharedPrefs(), PREF_KEY_SHOW_SEARCH_IME);
-        mLauncher.getSharedPrefs().registerOnSharedPreferenceChangeListener(this);
     }
 
     public float getShiftRange() {
         return mShiftRange;
     }
 
-    public AllAppsInsetTransitionController getInsetController() {
-        return mInsetController;
-    }
-
     @Override
     public void onDeviceProfileChanged(DeviceProfile dp) {
         mIsVerticalLayout = dp.isVerticalBarLayout();
@@ -146,14 +133,7 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
         mProgress = progress;
 
         mScrimView.setProgress(progress);
-        float shiftCurrent = progress * mShiftRange;
-        mAppsView.setTranslationY(shiftCurrent);
-        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && mSearchImeEnabled) {
-            if (mInsetController == null) {
-                setupInsetTransitionController();
-            }
-            mInsetController.setProgress(progress);
-        }
+        mAppsView.setTranslationY(progress * mShiftRange);
     }
 
     public float getProgress() {
@@ -242,18 +222,13 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
     public void setupViews(AllAppsContainerView appsView, ScrimView scrimView) {
         mAppsView = appsView;
         mScrimView = scrimView;
-        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && BuildCompat.isAtLeastR()) {
-            setupInsetTransitionController();
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && Utilities.ATLEAST_R) {
+            mLauncher.getSystemUiController().updateUiState(UI_STATE_ALLAPPS,
+                    View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                            | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
         }
     }
 
-    private void setupInsetTransitionController() {
-        mInsetController = new AllAppsInsetTransitionController(mShiftRange, mAppsView);
-        mLauncher.getSystemUiController().updateUiState(UI_STATE_ALLAPPS,
-                View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                        | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
-    }
-
     /**
      * Updates the total scroll range but does not update the UI.
      */
@@ -274,23 +249,5 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>,
         if (Float.compare(mProgress, 1f) == 0) {
             mAppsView.reset(false /* animate */);
         }
-        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && mSearchImeEnabled
-                && BuildCompat.isAtLeastR()) {
-            mInsetController.onAnimationEnd(mProgress);
-            if (Float.compare(mProgress, 0f) == 0) {
-                EditText editText = mAppsView.getSearchUiManager().getEditText();
-                if (editText != null && !mInsetController.showSearchEduIfNecessary()) {
-                    editText.requestFocus();
-                }
-            }
-            // TODO: should make the controller hide synchronously
-        }
-    }
-
-    @Override
-    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String s) {
-        if (s.equals(PREF_KEY_SHOW_SEARCH_IME)) {
-            mSearchImeEnabled = sharedPreferences.getBoolean(s, true);
-        }
     }
 }
diff --git a/src/com/android/launcher3/allapps/SearchUiManager.java b/src/com/android/launcher3/allapps/SearchUiManager.java
index 39410a7b3f..0d42950cbb 100644
--- a/src/com/android/launcher3/allapps/SearchUiManager.java
+++ b/src/com/android/launcher3/allapps/SearchUiManager.java
@@ -20,10 +20,10 @@ import static com.android.launcher3.LauncherState.ALL_APPS_HEADER;
 import android.graphics.Rect;
 import android.view.KeyEvent;
 import android.view.animation.Interpolator;
-import android.widget.EditText;
 
 import androidx.annotation.Nullable;
 
+import com.android.launcher3.ExtendedEditText;
 import com.android.launcher3.anim.PropertySetter;
 
 /**
@@ -75,7 +75,7 @@ public interface SearchUiManager {
      * @return the edit text object
      */
     @Nullable
-    EditText getEditText();
+    ExtendedEditText getEditText();
 
     /**
      * sets highlight result's title
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
index 426fd0cd83..2261d5147b 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
@@ -32,7 +32,6 @@ import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup.MarginLayoutParams;
 import android.view.animation.Interpolator;
-import android.widget.EditText;
 
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.DeviceProfile;
@@ -230,7 +229,7 @@ public class AppsSearchContainerLayout extends ExtendedEditText
     }
 
     @Override
-    public EditText getEditText() {
+    public ExtendedEditText getEditText() {
         return this;
     }
 }
diff --git a/src/com/android/launcher3/statemanager/StateManager.java b/src/com/android/launcher3/statemanager/StateManager.java
index a18f34062a..2b51e97f3f 100644
--- a/src/com/android/launcher3/statemanager/StateManager.java
+++ b/src/com/android/launcher3/statemanager/StateManager.java
@@ -26,14 +26,12 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.os.Handler;
 import android.os.Looper;
-import android.util.Log;
 
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.states.StateAnimationConfig.AnimationFlags;
-import com.android.launcher3.testing.TestProtocol;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -90,7 +88,9 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
 
     public StateHandler[] getStateHandlers() {
         if (mStateHandlers == null) {
-            mStateHandlers = mActivity.createStateHandlers();
+            ArrayList<StateHandler> handlers = new ArrayList<>();
+            mActivity.collectStateHandlers(handlers);
+            mStateHandlers = handlers.toArray(new StateHandler[handlers.size()]);
         }
         return mStateHandlers;
     }
diff --git a/src/com/android/launcher3/statemanager/StatefulActivity.java b/src/com/android/launcher3/statemanager/StatefulActivity.java
index 7abb6532f4..8a35cb33c0 100644
--- a/src/com/android/launcher3/statemanager/StatefulActivity.java
+++ b/src/com/android/launcher3/statemanager/StatefulActivity.java
@@ -30,6 +30,8 @@ import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
 import com.android.launcher3.views.BaseDragLayer;
 
+import java.util.List;
+
 /**
  * Abstract activity with state management
  * @param <STATE_TYPE> Type of state object
@@ -46,7 +48,7 @@ public abstract class StatefulActivity<STATE_TYPE extends BaseState<STATE_TYPE>>
     /**
      * Create handlers to control the property changes for this activity
      */
-    protected abstract StateHandler<STATE_TYPE>[] createStateHandlers();
+    protected abstract void collectStateHandlers(List<StateHandler> out);
 
     /**
      * Returns true if the activity is in the provided state
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index 6f1b2f967f..516fc74ba6 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -38,24 +38,19 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ValueAnimator;
 import android.os.SystemClock;
-import android.util.Log;
 import android.view.HapticFeedbackConstants;
 import android.view.MotionEvent;
 
-import androidx.core.os.BuildCompat;
-
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAnimUtils;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.AnimatorPlaybackController;
-import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.logger.LauncherAtom;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.states.StateAnimationConfig.AnimationFlags;
-import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.FlingBlockCheck;
 import com.android.launcher3.util.TouchController;
 
@@ -265,13 +260,6 @@ public abstract class AbstractStateChangeTouchController
         }
         mCanBlockFling = mFromState == NORMAL;
         mFlingBlockCheck.unblockFling();
-        // Must be called after all the animation controllers have been paused
-        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()
-                && BuildCompat.isAtLeastR()
-                && (mToState == ALL_APPS || mToState == NORMAL)) {
-            mLauncher.getAllAppsController().getInsetController().onDragStart(
-                    mFromState == NORMAL ? 1f : 0f);
-        }
     }
 
     @Override
-- 
GitLab


From 378c11f041dd17069106e213dc5accf0e113eff8 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Wed, 10 Mar 2021 10:28:50 -0500
Subject: [PATCH 0635/1664] Fix icon text size being calculated in DP instead
 of SP.

Bug: 175329686
Test: manual, change font/display size
Change-Id: Ic8c6260444d18df64ccee4c2bcfbc2332a327da9
---
 src/com/android/launcher3/DeviceProfile.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 7beea74c0c..adafea2f4c 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -472,7 +472,7 @@ public class DeviceProfile {
         final boolean isVerticalLayout = isVerticalBarLayout();
         float invIconSizeDp = isVerticalLayout ? inv.landscapeIconSize : inv.iconSize;
         iconSizePx = Math.max(1, pxFromDp(invIconSizeDp, mInfo.metrics, scale));
-        iconTextSizePx = pxFromDp(inv.iconTextSize, mInfo.metrics, scale);
+        iconTextSizePx = (int) (Utilities.pxFromSp(inv.iconTextSize, mInfo.metrics) * scale);
         iconDrawablePaddingPx = (int) (iconDrawablePaddingOriginalPx * scale);
 
         setCellLayoutBorderSpacing((int) (cellLayoutBorderSpacingOriginalPx * scale));
-- 
GitLab


From 956b5f70122d9dcbd09175d6e6b0ecbc3e8527b5 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Tue, 9 Mar 2021 11:07:39 +0000
Subject: [PATCH 0636/1664] Use gridProgress from RecentsView when launching
 apps from overview

Test: Launch from overview into app, animation should be smooth
Bug: 174464863
Fixes: 182168668
Change-Id: I274ec55aaef1c30c973b8c37de3c6ddae43ff90f
---
 quickstep/src/com/android/quickstep/TaskViewUtils.java   | 3 ++-
 .../src/com/android/quickstep/views/RecentsView.java     | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java
index 17822e6f0c..aa1b8e19bb 100644
--- a/quickstep/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java
@@ -180,6 +180,7 @@ public final class TaskViewUtils {
         boolean parallaxCenterAndAdjacentTask =
                 taskIndex != recentsView.getCurrentPage() && !(dp.isTablet
                         && FeatureFlags.ENABLE_OVERVIEW_GRID.get());
+        float gridProgress = recentsView.getGridProgress();
         float gridTranslationSecondary = recentsView.getGridTranslationSecondary(taskIndex);
         int startScroll = recentsView.getScrollOffset(taskIndex);
 
@@ -197,7 +198,7 @@ public final class TaskViewUtils {
             tsv.setPreview(targets.apps[targets.apps.length - 1]);
             tsv.fullScreenProgress.value = 0;
             tsv.recentsViewScale.value = 1;
-            tsv.gridProgress.value = 1;
+            tsv.gridProgress.value = gridProgress;
             tsv.gridTranslationSecondary.value = gridTranslationSecondary;
             tsv.setScroll(startScroll);
 
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index bdd0a3678e..efe1f753e0 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2773,6 +2773,15 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                 taskView.getGridTranslationY());
     }
 
+    /**
+     * Returns the progress of forming a grid from carousel.
+     *
+     * @return A float from 0 to 1 where 0 is a carousel and 1 is a 2 row grid.
+     */
+    public float getGridProgress() {
+        return mGridProgress;
+    }
+
     public Consumer<MotionEvent> getEventDispatcher(float navbarRotation) {
         float degreesRotated;
         if (navbarRotation == 0) {
-- 
GitLab


From 2e9de09383d1a7727fd6f89652a66991e4da5b26 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 10 Mar 2021 09:33:11 -0800
Subject: [PATCH 0637/1664] End Taskbar animator before other cleanup

This ensures it doesn't try to set properties that have already
been cleaned up.

Test: Swipe home from an app, remove taskbar during transition
Fixes: 182163822
Change-Id: Ia8779f044beeabd99e087288c3ae7f4f72c72d39
---
 .../com/android/launcher3/taskbar/TaskbarController.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index 544835c317..fb7d85fd85 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -246,6 +246,11 @@ public class TaskbarController {
      * Removes the Taskbar from the screen, and removes any obsolete listeners etc.
      */
     public void cleanup() {
+        if (mAnimator != null) {
+            // End this first, in case it relies on properties that are about to be cleaned up.
+            mAnimator.end();
+        }
+
         mTaskbarView.cleanup();
         mTaskbarContainerView.cleanup();
         removeFromWindowManager();
@@ -253,10 +258,6 @@ public class TaskbarController {
         mTaskbarVisibilityController.cleanup();
         mHotseatController.cleanup();
         mRecentsController.cleanup();
-
-        if (mAnimator != null) {
-            mAnimator.end();
-        }
     }
 
     private void removeFromWindowManager() {
-- 
GitLab


From 7ec893fb8e0704fb72b5868004de4b5f7097e40f Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 10 Mar 2021 17:00:25 +0000
Subject: [PATCH 0638/1664] Update widget toast strings

Test: Tap on widgets and shortcuts in all widget tray and observe
      correct string is shown.

Bug: 179797520
Change-Id: I0e274017d4af1de506afbb819ab91f6575d7bb8e
---
 res/values/strings.xml                        |  8 ++---
 .../launcher3/widget/BaseWidgetSheet.java     | 30 ++++++++++++++++++-
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 44b5ee7739..fd33a20513 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -40,9 +40,9 @@
 
     <!-- Widgets -->
     <!-- Message to tell the user to press and hold on a widget to add it [CHAR_LIMIT=50] -->
-    <string name="long_press_widget_to_add">Touch &amp; hold to pick up a widget.</string>
+    <string name="long_press_widget_to_add">Touch &amp; hold to move a widget.</string>
     <!-- Accessibility spoken hint message in widget picker, which allows user to add a widget. Custom action is the label for additional accessibility actions available in this mode [CHAR_LIMIT=100] -->
-    <string name="long_accessible_way_to_add">Double-tap &amp; hold to pick up a widget or use custom actions.</string>
+    <string name="long_accessible_way_to_add">Double-tap &amp; hold to move a widget or use custom actions.</string>
     <!-- The format string for the dimensions of a widget in the drawer -->
     <!-- There is a special version of this format string for Farsi -->
     <string name="widget_dims_format">%1$d \u00d7 %2$d</string>
@@ -101,9 +101,9 @@
 
     <!-- Drag and drop -->
     <!-- Message to tell the user to press and hold on a shortcut to add it [CHAR_LIMIT=50] -->
-    <string name="long_press_shortcut_to_add">Touch &amp; hold to pick up a shortcut.</string>
+    <string name="long_press_shortcut_to_add">Touch &amp; hold to move a shortcut.</string>
     <!-- Accessibility spoken hint message in deep shortcut menu, which allows user to add a shortcut. Custom action is the label for additional accessibility actions available in this mode [CHAR_LIMIT=200] -->
-    <string name="long_accessible_way_to_add_shortcut">Double-tap &amp; hold to pick up a shortcut or use custom actions.</string>
+    <string name="long_accessible_way_to_add_shortcut">Double-tap &amp; hold to move a shortcut or use custom actions.</string>
 
     <skip />
     <!-- Error message when user has filled a home screen -->
diff --git a/src/com/android/launcher3/widget/BaseWidgetSheet.java b/src/com/android/launcher3/widget/BaseWidgetSheet.java
index 03c58bb387..4fe631aa61 100644
--- a/src/com/android/launcher3/widget/BaseWidgetSheet.java
+++ b/src/com/android/launcher3/widget/BaseWidgetSheet.java
@@ -74,7 +74,18 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView
 
     @Override
     public final void onClick(View v) {
-        mWidgetInstructionToast = showWidgetToast(getContext(), mWidgetInstructionToast);
+        Object tag = null;
+        if (v instanceof WidgetCell) {
+            tag = v.getTag();
+        } else if (v.getParent() instanceof WidgetCell) {
+            tag = ((WidgetCell) v.getParent()).getTag();
+        }
+        if (tag instanceof PendingAddShortcutInfo) {
+            mWidgetInstructionToast = showShortcutToast(getContext(), mWidgetInstructionToast);
+        } else {
+            mWidgetInstructionToast = showWidgetToast(getContext(), mWidgetInstructionToast);
+        }
+
     }
 
     @Override
@@ -158,4 +169,21 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView
         toast.show();
         return toast;
     }
+
+    /**
+     * Show shortcut tap toast prompting user to drag instead.
+     */
+    private static Toast showShortcutToast(Context context, Toast toast) {
+        // Let the user know that they have to long press to add a widget
+        if (toast != null) {
+            toast.cancel();
+        }
+
+        CharSequence msg = Utilities.wrapForTts(
+                context.getText(R.string.long_press_shortcut_to_add),
+                context.getString(R.string.long_accessible_way_to_add_shortcut));
+        toast = Toast.makeText(context, msg, Toast.LENGTH_SHORT);
+        toast.show();
+        return toast;
+    }
 }
-- 
GitLab


From d73d6e56a9981128a6109891807423ead32b992e Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Tue, 9 Mar 2021 22:44:04 +0000
Subject: [PATCH 0639/1664] Show an empty view when there is no widget
 available

Test: Remove all widgets from work profile using TestDpc. Observe
      empty view is shown in the full widget tray. Add back some
      widgets to work profile and observe widgets showing up in the
      full widgets tray

Bug: 179797520
Change-Id: I2e1fcb5a0014568a4674e2bcc0a3ed3c6ec5a44a
---
 res/layout/widgets_full_sheet.xml             |  9 +++++++++
 res/values/strings.xml                        |  3 +++
 .../widget/picker/WidgetsFullSheet.java       | 20 +++++++++++++++++--
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/res/layout/widgets_full_sheet.xml b/res/layout/widgets_full_sheet.xml
index 28a8c6fefc..6c18d7ac75 100644
--- a/res/layout/widgets_full_sheet.xml
+++ b/res/layout/widgets_full_sheet.xml
@@ -15,6 +15,7 @@
 -->
 <com.android.launcher3.widget.picker.WidgetsFullSheet
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
@@ -27,6 +28,14 @@
         android:background="?android:attr/colorPrimary"
         android:elevation="4dp">
 
+        <TextView
+            android:id="@+id/no_widgets_text"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:visibility="gone"
+            tools:text="No widgets available" />
+
         <!-- Fast scroller popup -->
         <TextView
             android:id="@+id/fast_scroller_popup"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 44b5ee7739..6fb72b140b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -74,6 +74,9 @@
     <!-- Search bar text shown in the popup view showing all available widgets installed on the
          device. [CHAR_LIMIT=50] -->
     <string name="widgets_full_sheet_search_bar_hint">Search</string>
+    <!-- Text shown when there is no widgets shown in the popup view showing all available widgets
+         installed on the device. [CHAR_LIMIT=none] -->
+    <string name="no_widgets_available">No widgets available</string>
 
     <!-- All Apps -->
     <!-- Search bar text in the apps view. [CHAR_LIMIT=50] -->
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index bf9b849f84..330175f653 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -82,6 +82,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
     @Nullable private PersonalWorkPagedView mViewPager;
     private int mInitialTabsHeight = 0;
     private View mTabsView;
+    private TextView mNoWidgetsView;
     private SearchAndRecommendationViewHolder mSearchAndRecommendationViewHolder;
     private SearchAndRecommendationsScrollController mSearchAndRecommendationsScrollController;
 
@@ -141,19 +142,32 @@ public class WidgetsFullSheet extends BaseWidgetSheet
                 mViewPager);
         fastScroller.setOnFastScrollChangeListener(mSearchAndRecommendationsScrollController);
 
+        mNoWidgetsView = findViewById(R.id.no_widgets_text);
+
         onWidgetsBound();
     }
 
     @Override
     public void onActivePageChanged(int currentActivePage) {
-        WidgetsRecyclerView currentRecyclerView =
-                mAdapters.get(currentActivePage).mWidgetsRecyclerView;
+        AdapterHolder currentAdapterHolder = mAdapters.get(currentActivePage);
+        WidgetsRecyclerView currentRecyclerView = currentAdapterHolder.mWidgetsRecyclerView;
         currentRecyclerView.bindFastScrollbar();
         mSearchAndRecommendationsScrollController.setCurrentRecyclerView(currentRecyclerView);
 
+        updateNoWidgetsView(currentAdapterHolder);
+
         reset();
     }
 
+    private void updateNoWidgetsView(AdapterHolder adapterHolder) {
+        boolean isWidgetAvailable = adapterHolder.mWidgetsListAdapter.getItemCount() > 0;
+        adapterHolder.mWidgetsRecyclerView.setVisibility(isWidgetAvailable ? VISIBLE : GONE);
+
+        // Always resets the text in case this is updated by search.
+        mNoWidgetsView.setText(R.string.no_widgets_available);
+        mNoWidgetsView.setVisibility(isWidgetAvailable ? GONE : VISIBLE);
+    }
+
     private void reset() {
         mAdapters.get(AdapterHolder.PRIMARY).mWidgetsRecyclerView.scrollToTop();
         if (mHasWorkProfile) {
@@ -276,6 +290,8 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         AdapterHolder primaryUserAdapterHolder = mAdapters.get(AdapterHolder.PRIMARY);
         primaryUserAdapterHolder.setup(findViewById(R.id.primary_widgets_list_view));
         primaryUserAdapterHolder.mWidgetsListAdapter.setWidgets(allWidgets);
+        updateNoWidgetsView(primaryUserAdapterHolder);
+
         if (mHasWorkProfile) {
             AdapterHolder workUserAdapterHolder = mAdapters.get(AdapterHolder.WORK);
             workUserAdapterHolder.setup(findViewById(R.id.work_widgets_list_view));
-- 
GitLab


From cd9f8719bc3146f311574fbbd063434a33d91403 Mon Sep 17 00:00:00 2001
From: Sreyas <sreyasr@google.com>
Date: Mon, 8 Mar 2021 19:48:17 -0800
Subject: [PATCH 0640/1664] Let chips take full screen width.

Bug: 180917948
Test: Manual
Change-Id: I1b8602a567c4906fb52fa686092d0bf16b1f64d9
---
 quickstep/src/com/android/quickstep/views/TaskView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 88545c6436..6516ee5409 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -769,7 +769,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         }
         if (view != null) {
             mContextualChipWrapper = view;
-            LayoutParams layoutParams = new LayoutParams(LayoutParams.MATCH_PARENT,
+            LayoutParams layoutParams = new LayoutParams(((View) getParent()).getMeasuredWidth(),
                     LayoutParams.WRAP_CONTENT);
             layoutParams.gravity = BOTTOM | CENTER_HORIZONTAL;
             int expectedChipHeight = getExpectedViewHeight(view);
-- 
GitLab


From fb05759bab16a21ddd24b314e0fd78c49506c0c7 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Wed, 10 Mar 2021 13:07:26 -0500
Subject: [PATCH 0641/1664] Register setStartingWindowListener so launcher can
 defer icon drawing/crop correctly.

Bug: 177264697
Test: manual
      close all tasks
      launch app, note that shell is drawing icon & launcher correctly crops
      return home
      launch same app, note that launcher draws the icon

Change-Id: Id320eb9e3e03f861cc8e4adec739b8faf29adda0
---
 .../QuickstepAppTransitionManagerImpl.java    | 71 +++++++++++++++++--
 src/com/android/launcher3/Launcher.java       |  3 +-
 .../LauncherAppTransitionManager.java         |  7 ++
 3 files changed, 75 insertions(+), 6 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
index c4b696157c..f14c5bf775 100644
--- a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
@@ -16,6 +16,9 @@
 
 package com.android.launcher3;
 
+import static android.window.StartingWindowInfo.STARTING_WINDOW_TYPE_NONE;
+import static android.window.StartingWindowInfo.STARTING_WINDOW_TYPE_SPLASH_SCREEN;
+
 import static com.android.launcher3.BaseActivity.INVISIBLE_ALL;
 import static com.android.launcher3.BaseActivity.INVISIBLE_BY_APP_TRANSITIONS;
 import static com.android.launcher3.BaseActivity.INVISIBLE_BY_PENDING_FLAGS;
@@ -80,6 +83,7 @@ import com.android.quickstep.util.MultiValueUpdateListener;
 import com.android.quickstep.util.RemoteAnimationProvider;
 import com.android.quickstep.util.StaggeredWorkspaceAnim;
 import com.android.quickstep.util.SurfaceTransactionApplier;
+import com.android.systemui.shared.recents.IStartingWindowListener;
 import com.android.systemui.shared.system.ActivityCompat;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
 import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
@@ -92,6 +96,8 @@ import com.android.systemui.shared.system.RemoteTransitionCompat;
 import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
 import com.android.systemui.shared.system.WindowManagerWrapper;
 
+import java.util.LinkedHashMap;
+
 /**
  * {@link LauncherAppTransitionManager} with Quickstep-specific app transitions for launching from
  * home and/or all-apps.  Not used for 3p launchers.
@@ -145,6 +151,8 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
     // Progress = 0: All apps is fully pulled up, Progress = 1: All apps is fully pulled down.
     public static final float ALL_APPS_PROGRESS_OFF_SCREEN = 1.3059858f;
 
+    private static final int MAX_NUM_TASKS = 5;
+
     protected final BaseQuickstepLauncher mLauncher;
 
     private final DragLayer mDragLayer;
@@ -180,6 +188,9 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
         }
     };
 
+    // Will never be larger than MAX_NUM_TASKS
+    private LinkedHashMap<Integer, Integer> mTypeForTaskId;
+
     public QuickstepAppTransitionManagerImpl(Context context) {
         mLauncher = Launcher.cast(Launcher.getLauncher(context));
         mDragLayer = mLauncher.getDragLayer();
@@ -194,6 +205,23 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
         mMaxShadowRadius = res.getDimensionPixelSize(R.dimen.max_shadow_radius);
 
         mLauncher.addOnDeviceProfileChangeListener(this);
+
+        if (supportsSSplashScreen()) {
+            mTypeForTaskId = new LinkedHashMap<Integer, Integer>(MAX_NUM_TASKS) {
+                @Override
+                protected boolean removeEldestEntry(Entry<Integer, Integer> entry) {
+                    return size() > MAX_NUM_TASKS;
+                }
+            };
+
+            SystemUiProxy.INSTANCE.get(mLauncher).setStartingWindowListener(
+                    new IStartingWindowListener.Stub() {
+                        @Override
+                        public void onTaskLaunching(int taskId, int supportedType) {
+                            mTypeForTaskId.put(taskId, supportedType);
+                        }
+                    });
+        }
     }
 
     @Override
@@ -336,6 +364,15 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
         return bounds;
     }
 
+    private int getOpeningTaskId(RemoteAnimationTargetCompat[] appTargets) {
+        for (RemoteAnimationTargetCompat target : appTargets) {
+            if (target.mode == MODE_OPENING) {
+                return target.taskId;
+            }
+        }
+        return -1;
+    }
+
     public void setRemoteAnimationProvider(final RemoteAnimationProvider animationProvider,
             CancellationSignal cancellationSignal) {
         mRemoteAnimationProvider = animationProvider;
@@ -471,8 +508,19 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
         int[] dragLayerBounds = new int[2];
         mDragLayer.getLocationOnScreen(dragLayerBounds);
 
+        final boolean hasSplashScreen;
+        if (supportsSSplashScreen()) {
+            int taskId = getOpeningTaskId(appTargets);
+            int type = mTypeForTaskId.getOrDefault(taskId, STARTING_WINDOW_TYPE_NONE);
+            mTypeForTaskId.remove(taskId);
+            hasSplashScreen = type == STARTING_WINDOW_TYPE_SPLASH_SCREEN;
+        } else {
+            hasSplashScreen = false;
+        }
+
         AnimOpenProperties prop = new AnimOpenProperties(mLauncher.getResources(), mDeviceProfile,
-                windowTargetBounds, launcherIconBounds, v, dragLayerBounds[0], dragLayerBounds[1]);
+                windowTargetBounds, launcherIconBounds, v, dragLayerBounds[0], dragLayerBounds[1],
+                hasSplashScreen);
         int left = (int) (prop.cropCenterXStart - prop.cropWidthStart / 2);
         int top = (int) (prop.cropCenterYStart - prop.cropHeightStart / 2);
         int right = (int) (left + prop.cropWidthStart);
@@ -562,7 +610,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                 Utilities.scaleRectFAboutCenter(tmpRectF, mIconScaleToFitScreen.value);
                 float windowTransX0 = tmpRectF.left - offsetX;
                 float windowTransY0 = tmpRectF.top - offsetY;
-                if (ENABLE_SHELL_STARTING_SURFACE) {
+                if (hasSplashScreen) {
                     windowTransX0 -= crop.left * scale;
                     windowTransY0 -= crop.top * scale;
                 }
@@ -686,6 +734,14 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
         }
     }
 
+    @Override
+    public void onActivityDestroyed() {
+        super.onActivityDestroyed();
+        unregisterRemoteAnimations();
+        unregisterRemoteTransitions();
+        SystemUiProxy.INSTANCE.getNoCreate().setStartingWindowListener(null);
+    }
+
     /**
      * Unregisters all remote animations.
      */
@@ -821,6 +877,12 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
         return closingAnimator;
     }
 
+    private boolean supportsSSplashScreen() {
+        return hasControlRemoteAppTransitionPermission()
+                && Utilities.ATLEAST_S
+                && ENABLE_SHELL_STARTING_SURFACE;
+    }
+
     private boolean hasControlRemoteAppTransitionPermission() {
         return mLauncher.checkSelfPermission(CONTROL_REMOTE_APP_TRANSITION_PERMISSION)
                 == PackageManager.PERMISSION_GRANTED;
@@ -1030,7 +1092,8 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
         public final float iconAlphaStart;
 
         AnimOpenProperties(Resources r, DeviceProfile dp, Rect windowTargetBounds,
-                RectF launcherIconBounds, View view, int dragLayerLeft, int dragLayerTop) {
+                RectF launcherIconBounds, View view, int dragLayerLeft, int dragLayerTop,
+                boolean hasSplashScreen) {
             // Scale the app icon to take up the entire screen. This simplifies the math when
             // animating the app window position / scale.
             float smallestSize = Math.min(windowTargetBounds.height(), windowTargetBounds.width());
@@ -1063,7 +1126,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
             alphaDuration = useUpwardAnimation ? APP_LAUNCH_ALPHA_DURATION
                     : APP_LAUNCH_ALPHA_DOWN_DURATION;
 
-            if (ENABLE_SHELL_STARTING_SURFACE) {
+            if (hasSplashScreen) {
                 iconAlphaStart = 0;
 
                 // TOOD: Share value from shell when available.
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index fa63885c67..8d500ed9e5 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1609,8 +1609,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         LauncherAppState.getIDP(this).removeOnChangeListener(this);
 
         mOverlayManager.onActivityDestroyed(this);
-        mAppTransitionManager.unregisterRemoteAnimations();
-        mAppTransitionManager.unregisterRemoteTransitions();
+        mAppTransitionManager.onActivityDestroyed();
         mUserChangedCallbackCloseable.close();
         mLiveSearchManager.stop();
     }
diff --git a/src/com/android/launcher3/LauncherAppTransitionManager.java b/src/com/android/launcher3/LauncherAppTransitionManager.java
index 0fa441a279..d0bf577da2 100644
--- a/src/com/android/launcher3/LauncherAppTransitionManager.java
+++ b/src/com/android/launcher3/LauncherAppTransitionManager.java
@@ -61,6 +61,13 @@ public class LauncherAppTransitionManager implements ResourceBasedOverride {
         // Do nothing
     }
 
+    /**
+     * Handles clean up when activity is destroyed.
+     */
+    public void onActivityDestroyed() {
+        // Do nothing
+    }
+
     /**
      * Unregisters all remote animations.
      */
-- 
GitLab


From 368dc79f55153229b4d7defcc36e90c8f5ffe65a Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Wed, 10 Mar 2021 12:19:12 -0800
Subject: [PATCH 0642/1664] Increase wait times in TAPL

This helps to avoid misleading errors when
the system has performance problems.

Test: presubmit
Bug: 179392551
Change-Id: I4de3c543f32f41af64bd6107885df82b03973d35
---
 tests/src/com/android/launcher3/ui/WorkTabTest.java          | 4 ++--
 .../com/android/launcher3/tapl/LauncherInstrumentation.java  | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/src/com/android/launcher3/ui/WorkTabTest.java b/tests/src/com/android/launcher3/ui/WorkTabTest.java
index a6c7c03da4..8f4381b0fe 100644
--- a/tests/src/com/android/launcher3/ui/WorkTabTest.java
+++ b/tests/src/com/android/launcher3/ui/WorkTabTest.java
@@ -18,7 +18,6 @@ package com.android.launcher3.ui;
 import static com.android.launcher3.LauncherState.ALL_APPS;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.allapps.AllAppsStore.DEFER_UPDATES_TEST;
-import static com.android.launcher3.tapl.LauncherInstrumentation.LONG_WAIT_TIME_MS;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -37,6 +36,7 @@ import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.allapps.AllAppsPagedView;
 import com.android.launcher3.allapps.WorkModeSwitch;
 import com.android.launcher3.dragndrop.DragLayer;
+import com.android.launcher3.tapl.LauncherInstrumentation;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.views.WorkEduView;
 
@@ -147,7 +147,7 @@ public class WorkTabTest extends AbstractLauncherUiTest {
                 return true;
             }
             return false;
-        }, LONG_WAIT_TIME_MS);
+        }, LauncherInstrumentation.WAIT_TIME_MS);
 
         executeOnLauncher(launcher -> launcher.getStateManager().goToState(ALL_APPS));
         WorkEduView workEduView = getEduView();
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index f279a82475..a3f37d2fe6 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -155,8 +155,7 @@ public final class LauncherInstrumentation {
     private static final String OVERVIEW_RES_ID = "overview_panel";
     private static final String WIDGETS_RES_ID = "primary_widgets_list_view";
     private static final String CONTEXT_MENU_RES_ID = "deep_shortcuts_container";
-    public static final int WAIT_TIME_MS = 10000;
-    public static final int LONG_WAIT_TIME_MS = 60000;
+    public static final int WAIT_TIME_MS = 60000;
     private static final String SYSTEMUI_PACKAGE = "com.android.systemui";
     private static final String ANDROID_PACKAGE = "android";
 
@@ -656,7 +655,7 @@ public final class LauncherInstrumentation {
         try {
             final AccessibilityEvent event =
                     mInstrumentation.getUiAutomation().executeAndWaitForEvent(
-                            command, eventFilter, LONG_WAIT_TIME_MS);
+                            command, eventFilter, WAIT_TIME_MS);
             assertNotNull("executeAndWaitForEvent returned null (this can't happen)", event);
             final Parcelable parcelableData = event.getParcelableData();
             event.recycle();
-- 
GitLab


From ab33b76dce2e1e474924076bae99528575007516 Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pbdr@google.com>
Date: Tue, 16 Feb 2021 20:58:35 +0000
Subject: [PATCH 0643/1664] Launcher changes to support dynamic coloring on
 static widgets.

Bug: 179783721
Test: By hand using the AppWidgetDynamicColors widget
Change-Id: I27863cac31f2f6c29f5a717ff8d4492325f936fb
---
 res/values/config.xml                         |   5 +
 src/com/android/launcher3/Workspace.java      |  12 +-
 .../settings/DeveloperOptionsFragment.java    |   1 -
 .../util/WallpaperOffsetInterpolator.java     |  13 +-
 .../widget/LauncherAppWidgetHostView.java     | 120 +++++++++++++++++-
 .../launcher3/widget/LocalColorExtractor.java |  65 ++++++++++
 tests/AndroidManifest-common.xml              |  11 ++
 .../test_layout_appwidget_dynamic_colors.xml  |  52 ++++++++
 tests/res/xml/appwidget_dynamic_colors.xml    |  10 ++
 .../testcomponent/AppWidgetDynamicColors.java |  25 ++++
 10 files changed, 305 insertions(+), 9 deletions(-)
 create mode 100644 src/com/android/launcher3/widget/LocalColorExtractor.java
 create mode 100644 tests/res/layout/test_layout_appwidget_dynamic_colors.xml
 create mode 100644 tests/res/xml/appwidget_dynamic_colors.xml
 create mode 100644 tests/src/com/android/launcher3/testcomponent/AppWidgetDynamicColors.java

diff --git a/res/values/config.xml b/res/values/config.xml
index 89415b89a3..8184c98d3d 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -90,6 +90,7 @@
     <string name="wallpaper_picker_package" translatable="false"></string>
     <string name="calendar_component_name" translatable="false"></string>
     <string name="clock_component_name" translatable="false"></string>
+    <string name="local_colors_extraction_class" translatable="false"></string>
 
     <!-- Accessibility actions -->
     <item type="id" name="action_remove" />
@@ -188,4 +189,8 @@
     </string-array>
 
     <string-array name="filtered_components" ></string-array>
+
+    <!-- Name of the class used to generate colors from the wallpaper colors. Must be implementing the LauncherAppWidgetHostView.ColorGenerator interface. -->
+    <string name="color_generator_class" translatable="false"/>
+
 </resources>
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 87fb6fb7a1..0cc965c6c6 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -186,7 +186,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
     @Thunk final Launcher mLauncher;
     @Thunk DragController mDragController;
 
-    private final Rect mTempRect = new Rect();
     private final int[] mTempXY = new int[2];
     private final float[] mTempFXY = new float[2];
     @Thunk float[] mDragViewVisualCenter = new float[2];
@@ -367,10 +366,19 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
     }
 
     public float getWallpaperOffsetForCenterPage() {
-        int pageScroll = getScrollForPage(getPageNearestToCenterOfScreen());
+        return getWallpaperOffsetForPage(getPageNearestToCenterOfScreen());
+    }
+
+    private float getWallpaperOffsetForPage(int page) {
+        int pageScroll = getScrollForPage(page);
         return mWallpaperOffset.wallpaperOffsetForScroll(pageScroll);
     }
 
+    /** Returns the number of pages used for the wallpaper parallax. */
+    public int getNumPagesForWallpaperParallax() {
+        return mWallpaperOffset.getNumPagesForWallpaperParallax();
+    }
+
     public Rect estimateItemPosition(CellLayout cl, int hCell, int vCell, int hSpan, int vSpan) {
         Rect r = new Rect();
         cl.cellToRect(hCell, vCell, hSpan, vSpan, r);
diff --git a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
index c9fb956617..8d676c9fa3 100644
--- a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
+++ b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
@@ -88,7 +88,6 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
     private PreferenceCategory mPluginsCategory;
     private FlagTogglerPrefUi mFlagTogglerPrefUi;
 
-
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_ADDED);
diff --git a/src/com/android/launcher3/util/WallpaperOffsetInterpolator.java b/src/com/android/launcher3/util/WallpaperOffsetInterpolator.java
index 2ad80cf665..b8554e418c 100644
--- a/src/com/android/launcher3/util/WallpaperOffsetInterpolator.java
+++ b/src/com/android/launcher3/util/WallpaperOffsetInterpolator.java
@@ -145,14 +145,17 @@ public class WallpaperOffsetInterpolator extends BroadcastReceiver {
         msg.sendToTarget();
     }
 
-    private void updateOffset() {
-        int numPagesForWallpaperParallax;
+    /** Returns the number of pages used for the wallpaper parallax. */
+    public int getNumPagesForWallpaperParallax() {
         if (mWallpaperIsLiveWallpaper) {
-            numPagesForWallpaperParallax = mNumScreens;
+            return mNumScreens;
         } else {
-            numPagesForWallpaperParallax = Math.max(MIN_PARALLAX_PAGE_SPAN, mNumScreens);
+            return Math.max(MIN_PARALLAX_PAGE_SPAN, mNumScreens);
         }
-        Message.obtain(mHandler, MSG_SET_NUM_PARALLAX, numPagesForWallpaperParallax, 0,
+    }
+
+    private void updateOffset() {
+        Message.obtain(mHandler, MSG_SET_NUM_PARALLAX, getNumPagesForWallpaperParallax(), 0,
                 mWindowToken).sendToTarget();
     }
 
diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
index 3285c187c0..df012959fa 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
@@ -16,12 +16,17 @@
 
 package com.android.launcher3.widget;
 
+import android.app.WallpaperManager;
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
 import android.content.res.Configuration;
+import android.graphics.Rect;
+import android.graphics.RectF;
 import android.os.Handler;
 import android.os.SystemClock;
+import android.util.Log;
 import android.util.SparseBooleanArray;
+import android.util.SparseIntArray;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -32,10 +37,13 @@ import android.widget.AdapterView;
 import android.widget.Advanceable;
 import android.widget.RemoteViews;
 
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.CheckLongPressHelper;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.Workspace;
 import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
@@ -43,11 +51,16 @@ import com.android.launcher3.util.Executors;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.BaseDragLayer.TouchCompleteListener;
 
+import java.util.List;
+
 /**
  * {@inheritDoc}
  */
 public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
-        implements TouchCompleteListener, View.OnLongClickListener {
+        implements TouchCompleteListener, View.OnLongClickListener,
+        LocalColorExtractor.Listener {
+
+    private static final String LOG_TAG = "LauncherAppWidgetHostView";
 
     // Related to the auto-advancing of widgets
     private static final long ADVANCE_INTERVAL = 20000;
@@ -60,18 +73,29 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
 
     private final CheckLongPressHelper mLongPressHelper;
     protected final Launcher mLauncher;
+    private final Workspace mWorkspace;
+    private final WallpaperManager mWallpaperManager;
 
     @ViewDebug.ExportedProperty(category = "launcher")
     private boolean mReinflateOnConfigChange;
 
+    // Maintain the color manager.
+    private final LocalColorExtractor mColorExtractor;
+
     private boolean mIsScrollable;
     private boolean mIsAttachedToWindow;
     private boolean mIsAutoAdvanceRegistered;
     private Runnable mAutoAdvanceRunnable;
+    private RectF mLastLocationRegistered = null;
+    // Used to store the widget size during onLayout.
+    private final Rect mCurrentWidgetSize = new Rect();
+    private final RectF mTempRectF = new RectF();
+    private final boolean mIsRtl;
 
     public LauncherAppWidgetHostView(Context context) {
         super(context);
         mLauncher = Launcher.getLauncher(context);
+        mWorkspace = mLauncher.getWorkspace();
         mLongPressHelper = new CheckLongPressHelper(this, this);
         mInflater = LayoutInflater.from(context);
         setAccessibilityDelegate(mLauncher.getAccessibilityDelegate());
@@ -81,6 +105,19 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         if (Utilities.ATLEAST_Q && Themes.getAttrBoolean(mLauncher, R.attr.isWorkspaceDarkText)) {
             setOnLightBackground(true);
         }
+        mIsRtl = Utilities.isRtl(context.getResources());
+        mWallpaperManager = WallpaperManager.getInstance(getContext());
+        mColorExtractor = LocalColorExtractor.newInstance(getContext());
+        mColorExtractor.setListener(this);
+    }
+
+    @Override
+    public void setColorResources(@Nullable SparseIntArray colors) {
+        if (colors == null) {
+            resetColorResources();
+        } else {
+            super.setColorResources(colors);
+        }
     }
 
     @Override
@@ -167,6 +204,7 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         // state is updated. So isAttachedToWindow() will return true until next frame.
         mIsAttachedToWindow = false;
         checkIfAutoAdvance();
+        mColorExtractor.removeLocations();
     }
 
     @Override
@@ -213,6 +251,78 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         }
 
         mIsScrollable = checkScrollableRecursively(this);
+
+        mCurrentWidgetSize.left = left;
+        mCurrentWidgetSize.top = top;
+        mCurrentWidgetSize.right = right;
+        mCurrentWidgetSize.bottom = bottom;
+        updateColorExtraction(mCurrentWidgetSize);
+    }
+
+    private void updateColorExtraction(Rect widgetLocation) {
+        // If the widget hasn't been measured and laid out, we cannot do this.
+        if (widgetLocation.isEmpty()) {
+            return;
+        }
+        LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) getTag();
+        if (info != null) {
+            int screenWidth = mLauncher.getDeviceProfile().widthPx;
+            int screenHeight = mLauncher.getDeviceProfile().heightPx;
+            int numScreens = mWorkspace.getNumPagesForWallpaperParallax();
+            int screenId = mIsRtl ? numScreens - info.screenId : info.screenId;
+            float relativeScreenWidth = 1f / numScreens;
+            float absoluteTop = widgetLocation.top;
+            float absoluteBottom = widgetLocation.bottom;
+            for (View v = (View) getParent();
+                    v != null && v.getId() != R.id.launcher;
+                    v = (View) v.getParent()) {
+                absoluteBottom += v.getTop();
+                absoluteTop += v.getTop();
+            }
+            float xOffset = 0;
+            View parentView = (View) getParent();
+            // The layout depends on the orientation.
+            if (getResources().getConfiguration().orientation
+                    == Configuration.ORIENTATION_LANDSCAPE) {
+                xOffset = screenHeight - mWorkspace.getPaddingRight()
+                        - parentView.getWidth();
+            } else {
+                xOffset = mWorkspace.getPaddingLeft() + parentView.getPaddingLeft();
+            }
+            // This is the position of the widget relative to the wallpaper, as expected by the
+            // local color extraction of the WallpaperManager.
+            // The coordinate system is such that, on the horizontal axis, each screen has a
+            // distinct range on the [0,1] segment. So if there are 3 screens, they will have the
+            // ranges [0, 1/3], [1/3, 2/3] and [2/3, 1]. The position on the subrange should be
+            // the position of the widget relative to the screen. For the vertical axis, this is
+            // simply the location of the widget relative to the screen.
+            mTempRectF.left = ((widgetLocation.left + xOffset) / screenWidth + screenId)
+                    * relativeScreenWidth;
+            mTempRectF.right = ((widgetLocation.right + xOffset) / screenWidth + screenId)
+                    * relativeScreenWidth;
+            mTempRectF.top = absoluteTop / screenHeight;
+            mTempRectF.bottom = absoluteBottom / screenHeight;
+            if (mTempRectF.left < 0 || mTempRectF.right > 1 || mTempRectF.top < 0
+                    || mTempRectF.bottom > 1) {
+                Log.e(LOG_TAG, "   Error, invalid relative position");
+                return;
+            }
+            if (!mTempRectF.equals(mLastLocationRegistered)) {
+                if (mLastLocationRegistered != null) {
+                    mColorExtractor.removeLocations();
+                }
+                mLastLocationRegistered = new RectF(mTempRectF);
+                mColorExtractor.addLocation(List.of(mLastLocationRegistered));
+            }
+        } else {
+            mColorExtractor.removeLocations();
+        }
+    }
+
+    @Override
+    public void onColorsChanged(RectF rectF, SparseIntArray colors) {
+        // setColorResources will reapply the view, which must happen in the UI thread.
+        post(() -> setColorResources(colors));
     }
 
     @Override
@@ -225,6 +335,14 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
     protected void onWindowVisibilityChanged(int visibility) {
         super.onWindowVisibilityChanged(visibility);
         maybeRegisterAutoAdvance();
+
+        if (visibility == View.VISIBLE) {
+            if (mLastLocationRegistered != null) {
+                mColorExtractor.addLocation(List.of(mLastLocationRegistered));
+            }
+        } else {
+            mColorExtractor.removeLocations();
+        }
     }
 
     private void checkIfAutoAdvance() {
diff --git a/src/com/android/launcher3/widget/LocalColorExtractor.java b/src/com/android/launcher3/widget/LocalColorExtractor.java
new file mode 100644
index 0000000000..097158b072
--- /dev/null
+++ b/src/com/android/launcher3/widget/LocalColorExtractor.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.widget;
+
+import android.appwidget.AppWidgetHostView;
+import android.content.Context;
+import android.graphics.RectF;
+import android.util.SparseIntArray;
+
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.R;
+import com.android.launcher3.util.ResourceBasedOverride;
+
+import java.util.List;
+
+/** Extracts the colors we need from the wallpaper at given locations. */
+public class LocalColorExtractor implements ResourceBasedOverride {
+
+    /** Listener for color changes on a screen location. */
+    public interface Listener {
+        /**
+         * Method called when the colors on a registered location has changed.
+         *
+         * {@code extractedColors} maps the color resources {@code android.R.colors.system_*} to
+         * their value, in a format that can be passed directly to
+         * {@link AppWidgetHostView#setColorResources(SparseIntArray)}.
+         */
+        void onColorsChanged(RectF rect, SparseIntArray extractedColors);
+    }
+
+    static LocalColorExtractor newInstance(Context context) {
+        return Overrides.getObject(LocalColorExtractor.class, context.getApplicationContext(),
+                R.string.local_colors_extraction_class);
+    }
+
+    /** Sets the object that will receive the color changes. */
+    public void setListener(@Nullable Listener listener) {
+        // no-op
+    }
+
+    /** Adds a list of locations to track with this listener. */
+    public void addLocation(List<RectF> locations) {
+        // no-op
+    }
+
+    /** Stops tracking any locations. */
+    public void removeLocations() {
+        // no-op
+    }
+}
diff --git a/tests/AndroidManifest-common.xml b/tests/AndroidManifest-common.xml
index 744dee0607..7f6c8f8a87 100644
--- a/tests/AndroidManifest-common.xml
+++ b/tests/AndroidManifest-common.xml
@@ -60,6 +60,17 @@
                        android:resource="@xml/appwidget_with_config"/>
         </receiver>
 
+        <receiver
+            android:name="com.android.launcher3.testcomponent.AppWidgetDynamicColors"
+            android:exported="true"
+            android:label="Dynamic Colors">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
+            </intent-filter>
+            <meta-data android:name="android.appwidget.provider"
+                android:resource="@xml/appwidget_dynamic_colors"/>
+        </receiver>
+
         <activity
             android:name="com.android.launcher3.testcomponent.WidgetConfigActivity"
             android:exported="true">
diff --git a/tests/res/layout/test_layout_appwidget_dynamic_colors.xml b/tests/res/layout/test_layout_appwidget_dynamic_colors.xml
new file mode 100644
index 0000000000..c5ab030d11
--- /dev/null
+++ b/tests/res/layout/test_layout_appwidget_dynamic_colors.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:background="?android:attr/colorBackground"
+    android:padding="8dp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <LinearLayout
+        android:orientation = "horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="prim"/>
+        <ImageView
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:background="@android:color/system_primary_500"/>
+    </LinearLayout>
+    <LinearLayout
+        android:orientation = "horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="second"/>
+        <ImageView
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:background="@android:color/system_secondary_500"/>
+    </LinearLayout>
+    <LinearLayout
+        android:orientation = "horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="neutral"/>
+        <ImageView
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:background="@android:color/system_neutral_500"/>
+    </LinearLayout>
+
+    </LinearLayout>
\ No newline at end of file
diff --git a/tests/res/xml/appwidget_dynamic_colors.xml b/tests/res/xml/appwidget_dynamic_colors.xml
new file mode 100644
index 0000000000..f6b9a04343
--- /dev/null
+++ b/tests/res/xml/appwidget_dynamic_colors.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appwidget-provider
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:minWidth="1dp"
+    android:minHeight="1dp"
+    android:updatePeriodMillis="0"
+    android:initialLayout="@layout/test_layout_appwidget_dynamic_colors"
+    android:resizeMode="horizontal|vertical"
+    android:widgetCategory="home_screen">
+</appwidget-provider>
\ No newline at end of file
diff --git a/tests/src/com/android/launcher3/testcomponent/AppWidgetDynamicColors.java b/tests/src/com/android/launcher3/testcomponent/AppWidgetDynamicColors.java
new file mode 100644
index 0000000000..5fb34540ed
--- /dev/null
+++ b/tests/src/com/android/launcher3/testcomponent/AppWidgetDynamicColors.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.testcomponent;
+
+import android.appwidget.AppWidgetProvider;
+
+/**
+ * A simple app widget showing a primary, secondary and neutral color.
+ */
+public class AppWidgetDynamicColors extends AppWidgetProvider {
+}
-- 
GitLab


From 9f921098d3f6352f131c89e1c218b1c8a8bf72c7 Mon Sep 17 00:00:00 2001
From: Zak Cohen <zakcohen@google.com>
Date: Wed, 10 Mar 2021 14:31:02 -0800
Subject: [PATCH 0644/1664] Make TaskMenuView corner radius follow TaskView.

Also removes fake shadow from TaskMenuView as not required in new style.

Bug: 182276195
Test: Run on 3a and 4
Change-Id: Iadf89e30e56d8d7419b1e6c9550bb1b2bf3d5c49
---
 quickstep/res/drawable/task_menu_bg.xml       | 26 +++----------------
 .../android/quickstep/views/TaskMenuView.java | 18 +++++++++++--
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/quickstep/res/drawable/task_menu_bg.xml b/quickstep/res/drawable/task_menu_bg.xml
index 7334d984f1..a60defc3bd 100644
--- a/quickstep/res/drawable/task_menu_bg.xml
+++ b/quickstep/res/drawable/task_menu_bg.xml
@@ -14,25 +14,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:gravity="bottom">
-        <!-- Shadow -->
-        <shape>
-            <gradient android:angle="270"
-                android:endColor="@android:color/transparent"
-                android:startColor="#26000000" />
-            <size android:height="@dimen/task_card_menu_shadow_height" />
-        </shape>
-    </item>
-    <item android:bottom="@dimen/task_card_menu_shadow_height">
-        <!-- Background -->
-        <shape>
-            <corners
-                android:topLeftRadius="?android:attr/dialogCornerRadius"
-                android:topRightRadius="?android:attr/dialogCornerRadius"
-                android:bottomLeftRadius="0dp"
-                android:bottomRightRadius="0dp" />
-            <solid android:color="?attr/popupColorPrimary" />
-        </shape>
-    </item>
-</layer-list>
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?attr/popupColorPrimary" />
+</shape>
diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
index 2315147bdb..fe7ece216a 100644
--- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
@@ -23,12 +23,14 @@ import android.animation.Animator;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.content.Context;
+import android.graphics.Outline;
 import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewOutlineProvider;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -41,10 +43,10 @@ import com.android.launcher3.anim.RoundedRectRevealOutlineProvider;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.popup.SystemShortcut;
 import com.android.launcher3.touch.PagedOrientationHandler;
-import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.BaseDragLayer;
 import com.android.quickstep.TaskOverlayFactory;
 import com.android.quickstep.TaskUtils;
+import com.android.quickstep.util.TaskCornerRadius;
 
 /**
  * Contains options for a recent task when long-pressing its icon.
@@ -72,6 +74,7 @@ public class TaskMenuView extends AbstractFloatingView {
 
         mActivity = BaseDraggingActivity.fromContext(context);
         mThumbnailTopMargin = getResources().getDimension(R.dimen.task_thumbnail_top_margin);
+        setClipToOutline(true);
     }
 
     @Override
@@ -108,6 +111,17 @@ public class TaskMenuView extends AbstractFloatingView {
         return (type & TYPE_TASK_MENU) != 0;
     }
 
+    @Override
+    public ViewOutlineProvider getOutlineProvider() {
+        return new ViewOutlineProvider() {
+            @Override
+            public void getOutline(View view, Outline outline) {
+                outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(),
+                        TaskCornerRadius.get(view.getContext()));
+            }
+        };
+    }
+
     public void setPosition(float x, float y, PagedOrientationHandler pagedOrientationHandler) {
         float adjustedY = y + mThumbnailTopMargin;
         // Changing pivot to make computations easier
@@ -260,7 +274,7 @@ public class TaskMenuView extends AbstractFloatingView {
     }
 
     private RoundedRectRevealOutlineProvider createOpenCloseOutlineProvider() {
-        float radius = Themes.getDialogCornerRadius(getContext());
+        float radius = TaskCornerRadius.get(mContext);
         Rect fromRect = new Rect(0, 0, getWidth(), 0);
         Rect toRect = new Rect(0, 0, getWidth(), getHeight());
         return new RoundedRectRevealOutlineProvider(radius, radius, fromRect, toRect);
-- 
GitLab


From b65d766d8825dbc564acd43e5e654d2c98f54a0d Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Sun, 7 Mar 2021 15:09:11 -0800
Subject: [PATCH 0645/1664] Adding support for listening for app launch
 animation completion

Bug: 181165935
Bug: 179065491
Test: Verified on device
Change-Id: Ifa6a91560cb31b4dfb72a0f582607e873d8a002d
---
 quickstep/res/values/override.xml             |   2 -
 .../launcher3/BaseQuickstepLauncher.java      |  33 +++-
 .../launcher3/LauncherAnimationRunner.java    |  40 +++--
 .../LauncherAppTransitionManagerImpl.java     |  83 ----------
 .../launcher3/LauncherInitListener.java       |   4 +-
 ...l.java => QuickstepTransitionManager.java} | 145 +++++++++---------
 .../launcher3/WrappedAnimationRunnerImpl.java |   4 +-
 .../WrappedLauncherAnimationRunner.java       |   7 +-
 .../launcher3/taskbar/TaskbarController.java  |   4 +-
 .../uioverrides/QuickstepLauncher.java        |   6 +-
 .../uioverrides/states/OverviewState.java     |   2 +-
 .../android/quickstep/AbsSwipeUpHandler.java  |  26 ++--
 .../quickstep/OverviewCommandHelper.java      |   2 +-
 .../android/quickstep/RecentsActivity.java    |  47 +++---
 .../quickstep/TaskShortcutFactory.java        |  14 +-
 .../com/android/quickstep/TaskViewUtils.java  |   2 +-
 .../util/RemoteAnimationProvider.java         |  18 +--
 .../quickstep/views/LauncherRecentsView.java  |   2 +-
 .../android/quickstep/views/RecentsView.java  |  12 +-
 .../com/android/quickstep/views/TaskView.java | 105 +++++++------
 res/values/config.xml                         |   1 -
 src/com/android/launcher3/BaseActivity.java   |   2 +-
 .../launcher3/BaseDraggingActivity.java       |  42 ++++-
 src/com/android/launcher3/BubbleTextView.java |  10 +-
 src/com/android/launcher3/Launcher.java       |  46 +-----
 .../LauncherAppTransitionManager.java         |  91 -----------
 .../launcher3/SecondaryDropTarget.java        |   6 +-
 .../SecondaryDisplayLauncher.java             |   6 -
 .../launcher3/touch/ItemClickHandler.java     |   4 +-
 .../util/ActivityOptionsWrapper.java          |  41 +++++
 .../android/launcher3/util/RunnableList.java  |  64 ++++++++
 31 files changed, 394 insertions(+), 477 deletions(-)
 delete mode 100644 quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
 rename quickstep/src/com/android/launcher3/{QuickstepAppTransitionManagerImpl.java => QuickstepTransitionManager.java} (92%)
 delete mode 100644 src/com/android/launcher3/LauncherAppTransitionManager.java
 create mode 100644 src/com/android/launcher3/util/ActivityOptionsWrapper.java
 create mode 100644 src/com/android/launcher3/util/RunnableList.java

diff --git a/quickstep/res/values/override.xml b/quickstep/res/values/override.xml
index 605774dd9c..705ec9d48c 100644
--- a/quickstep/res/values/override.xml
+++ b/quickstep/res/values/override.xml
@@ -17,8 +17,6 @@
 <!-- Class overrides for launcher with quickstep. -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_transition_manager_class" translatable="false">com.android.launcher3.LauncherAppTransitionManagerImpl</string>
-
   <string name="instant_app_resolver_class" translatable="false">com.android.quickstep.InstantAppResolverImpl</string>
 
   <string name="app_launch_tracker_class" translatable="false">com.android.launcher3.appprediction.PredictionAppTracker</string>
diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 641e108be5..6eb1498c09 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -25,7 +25,6 @@ import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SY
 
 import android.animation.AnimatorSet;
 import android.animation.ValueAnimator;
-import android.app.ActivityOptions;
 import android.content.Intent;
 import android.content.IntentSender;
 import android.os.Bundle;
@@ -47,6 +46,7 @@ import com.android.launcher3.taskbar.TaskbarActivityContext;
 import com.android.launcher3.taskbar.TaskbarController;
 import com.android.launcher3.taskbar.TaskbarStateHandler;
 import com.android.launcher3.uioverrides.RecentsViewStateController;
+import com.android.launcher3.util.ActivityOptionsWrapper;
 import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.UiThreadHelper;
 import com.android.quickstep.RecentsModel;
@@ -73,6 +73,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
         implements NavigationModeChangeListener {
 
     private DepthController mDepthController = new DepthController(this);
+    private QuickstepTransitionManager mAppTransitionManager;
 
     /**
      * Reusable command for applying the back button alpha on the background thread.
@@ -91,6 +92,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        mAppTransitionManager = new QuickstepTransitionManager(this);
+        mAppTransitionManager.registerRemoteAnimations();
 
         SysUINavigationMode.INSTANCE.get(this).addModeChangeListener(this);
         addMultiWindowModeChangedListener(mDepthController);
@@ -98,8 +101,9 @@ public abstract class BaseQuickstepLauncher extends Launcher
 
     @Override
     public void onDestroy() {
-        SysUINavigationMode.INSTANCE.get(this).removeModeChangeListener(this);
+        mAppTransitionManager.onActivityDestroyed();
 
+        SysUINavigationMode.INSTANCE.get(this).removeModeChangeListener(this);
         if (mTaskbarController != null) {
             mTaskbarController.cleanup();
         }
@@ -107,6 +111,10 @@ public abstract class BaseQuickstepLauncher extends Launcher
         super.onDestroy();
     }
 
+    public QuickstepTransitionManager getAppTransitionManager() {
+        return mAppTransitionManager;
+    }
+
     @Override
     public void onNavigationModeChanged(Mode newMode) {
         getDragLayer().recreateControllers();
@@ -270,6 +278,12 @@ public abstract class BaseQuickstepLauncher extends Launcher
         return mTaskbarController != null && mTaskbarController.isViewInTaskbar(v);
     }
 
+    public boolean supportsAdaptiveIconAnimation(View clickedView) {
+        return mAppTransitionManager.hasControlRemoteAppTransitionPermission()
+                && FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM.get()
+                && !isViewInTaskbar(clickedView);
+    }
+
     @Override
     public DragOptions getDefaultWorkspaceDragOptions() {
         if (mNextWorkspaceDragOptions != null) {
@@ -286,8 +300,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
 
     @Override
     public void useFadeOutAnimationForLauncherStart(CancellationSignal signal) {
-        QuickstepAppTransitionManagerImpl appTransitionManager =
-                (QuickstepAppTransitionManagerImpl) getAppTransitionManager();
+        QuickstepTransitionManager appTransitionManager = getAppTransitionManager();
         appTransitionManager.setRemoteAnimationProvider(new RemoteAnimationProvider() {
             @Override
             public AnimatorSet createWindowAnimation(RemoteAnimationTargetCompat[] appTargets,
@@ -379,10 +392,14 @@ public abstract class BaseQuickstepLauncher extends Launcher
     }
 
     @Override
-    public ActivityOptions getActivityLaunchOptions(View v) {
-        ActivityOptions activityOptions = super.getActivityLaunchOptions(v);
-        if (activityOptions != null && mLastTouchUpTime > 0) {
-            ActivityOptionsCompat.setLauncherSourceInfo(activityOptions, mLastTouchUpTime);
+    public ActivityOptionsWrapper getActivityLaunchOptions(View v) {
+        ActivityOptionsWrapper activityOptions =
+                mAppTransitionManager.hasControlRemoteAppTransitionPermission()
+                        ? mAppTransitionManager.getActivityLaunchOptions(this, v)
+                        : super.getActivityLaunchOptions(v);
+        if (mLastTouchUpTime > 0) {
+            ActivityOptionsCompat.setLauncherSourceInfo(
+                    activityOptions.options, mLastTouchUpTime);
         }
         return activityOptions;
     }
diff --git a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
index 588d676ac7..be98157b1b 100644
--- a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
+++ b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
@@ -17,6 +17,7 @@ package com.android.launcher3;
 
 import static com.android.launcher3.Utilities.postAsyncCallback;
 import static com.android.launcher3.util.DisplayController.getSingleFrameMs;
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.systemui.shared.recents.utilities.Utilities.postAtFrontOfQueueAsynchronously;
 
@@ -29,6 +30,7 @@ import android.os.Build;
 import android.os.Handler;
 
 import androidx.annotation.BinderThread;
+import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 
 import com.android.systemui.shared.system.RemoteAnimationRunnerCompat;
@@ -37,8 +39,6 @@ import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 @TargetApi(Build.VERSION_CODES.P)
 public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCompat {
 
-    private static final String TAG = "LauncherAnimationRunner";
-
     private final Handler mHandler;
     private final boolean mStartAtFrontOfQueue;
     private AnimationResult mAnimationResult;
@@ -66,10 +66,7 @@ public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCo
             Runnable runnable) {
         Runnable r = () -> {
             finishExistingAnimation();
-            mAnimationResult = new AnimationResult(() -> {
-                UI_HELPER_EXECUTOR.execute(runnable);
-                mAnimationResult = null;
-            });
+            mAnimationResult = new AnimationResult(() -> mAnimationResult = null, runnable);
             onCreateAnimation(transit, appTargets, wallpaperTargets, nonAppTargets,
                     mAnimationResult);
         };
@@ -126,37 +123,60 @@ public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCo
 
     public static final class AnimationResult {
 
-        private final Runnable mFinishRunnable;
+        private final Runnable mSyncFinishRunnable;
+        private final Runnable mASyncFinishRunnable;
 
         private AnimatorSet mAnimator;
+        private Runnable mOnCompleteCallback;
         private boolean mFinished = false;
         private boolean mInitialized = false;
 
-        private AnimationResult(Runnable finishRunnable) {
-            mFinishRunnable = finishRunnable;
+        private AnimationResult(Runnable syncFinishRunnable, Runnable asyncFinishRunnable) {
+            mSyncFinishRunnable = syncFinishRunnable;
+            mASyncFinishRunnable = asyncFinishRunnable;
         }
 
         @UiThread
         private void finish() {
             if (!mFinished) {
-                mFinishRunnable.run();
+                mSyncFinishRunnable.run();
+                UI_HELPER_EXECUTOR.execute(() -> {
+                    mASyncFinishRunnable.run();
+                    if (mOnCompleteCallback != null) {
+                        MAIN_EXECUTOR.execute(mOnCompleteCallback);
+                    }
+                });
                 mFinished = true;
             }
         }
 
         @UiThread
         public void setAnimation(AnimatorSet animation, Context context) {
+            setAnimation(animation, context, null);
+
+        }
+
+        /**
+         * Sets the animation to play for this app launch
+         */
+        @UiThread
+        public void setAnimation(AnimatorSet animation, Context context,
+                @Nullable Runnable onCompleteCallback) {
             if (mInitialized) {
                 throw new IllegalStateException("Animation already initialized");
             }
             mInitialized = true;
             mAnimator = animation;
+            mOnCompleteCallback = onCompleteCallback;
             if (mAnimator == null) {
                 finish();
             } else if (mFinished) {
                 // Animation callback was already finished, skip the animation.
                 mAnimator.start();
                 mAnimator.end();
+                if (mOnCompleteCallback != null) {
+                    mOnCompleteCallback.run();
+                }
             } else {
                 // Start the animation
                 mAnimator.addListener(new AnimatorListenerAdapter() {
diff --git a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
deleted file mode 100644
index ae4bd96997..0000000000
--- a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3;
-
-import static com.android.launcher3.anim.Interpolators.AGGRESSIVE_EASE;
-import static com.android.launcher3.anim.Interpolators.LINEAR;
-import static com.android.quickstep.TaskViewUtils.findTaskViewToLaunch;
-
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
-import android.content.Context;
-import android.view.View;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.android.quickstep.TaskViewUtils;
-import com.android.quickstep.views.RecentsView;
-import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
-
-/**
- * A {@link QuickstepAppTransitionManagerImpl} that also implements recents transitions from
- * {@link RecentsView}.
- */
-public final class LauncherAppTransitionManagerImpl extends QuickstepAppTransitionManagerImpl {
-
-    public LauncherAppTransitionManagerImpl(Context context) {
-        super(context);
-    }
-
-    @Override
-    protected boolean isLaunchingFromRecents(@NonNull View v,
-            @Nullable RemoteAnimationTargetCompat[] targets) {
-        return mLauncher.getStateManager().getState().overviewUi
-                && findTaskViewToLaunch(mLauncher.getOverviewPanel(), v, targets) != null;
-    }
-
-    @Override
-    protected void composeRecentsLaunchAnimator(@NonNull AnimatorSet anim, @NonNull View v,
-            @NonNull RemoteAnimationTargetCompat[] appTargets,
-            @NonNull RemoteAnimationTargetCompat[] wallpaperTargets, boolean launcherClosing) {
-        TaskViewUtils.composeRecentsLaunchAnimator(anim, v, appTargets, wallpaperTargets,
-                launcherClosing, mLauncher.getStateManager(), mLauncher.getOverviewPanel(),
-                mLauncher.getDepthController());
-    }
-
-    @Override
-    protected Runnable composeViewContentAnimator(@NonNull AnimatorSet anim, float[] alphas,
-            float[] trans) {
-        RecentsView overview = mLauncher.getOverviewPanel();
-        ObjectAnimator alpha = ObjectAnimator.ofFloat(overview,
-                RecentsView.CONTENT_ALPHA, alphas);
-        alpha.setDuration(CONTENT_ALPHA_DURATION);
-        alpha.setInterpolator(LINEAR);
-        anim.play(alpha);
-        overview.setFreezeViewVisibility(true);
-
-        ObjectAnimator transY = ObjectAnimator.ofFloat(overview, View.TRANSLATION_Y, trans);
-        transY.setInterpolator(AGGRESSIVE_EASE);
-        transY.setDuration(CONTENT_TRANSLATION_DURATION);
-        anim.play(transY);
-
-        return () -> {
-            overview.setFreezeViewVisibility(false);
-            overview.setTranslationY(0);
-            mLauncher.getStateManager().reapplyState();
-        };
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/LauncherInitListener.java b/quickstep/src/com/android/launcher3/LauncherInitListener.java
index 7fb0d43600..5fc79f078f 100644
--- a/quickstep/src/com/android/launcher3/LauncherInitListener.java
+++ b/quickstep/src/com/android/launcher3/LauncherInitListener.java
@@ -46,8 +46,8 @@ public class LauncherInitListener extends ActivityInitListener<Launcher> {
     @Override
     public boolean handleInit(Launcher launcher, boolean alreadyOnHome) {
         if (mRemoteAnimationProvider != null) {
-            QuickstepAppTransitionManagerImpl appTransitionManager =
-                    (QuickstepAppTransitionManagerImpl) launcher.getAppTransitionManager();
+            QuickstepTransitionManager appTransitionManager =
+                    ((BaseQuickstepLauncher) launcher).getAppTransitionManager();
 
             // Set a one-time animation provider. After the first call, this will get cleared.
             // TODO: Probably also check the intended target id.
diff --git a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
similarity index 92%
rename from quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
rename to quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index f14c5bf775..343b87e735 100644
--- a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -37,6 +37,7 @@ import static com.android.launcher3.config.FeatureFlags.SEPARATE_RECENTS_ACTIVIT
 import static com.android.launcher3.dragndrop.DragLayer.ALPHA_INDEX_TRANSITIONS;
 import static com.android.launcher3.statehandlers.DepthController.DEPTH;
 import static com.android.quickstep.TaskUtils.taskIsATargetWithMode;
+import static com.android.quickstep.TaskViewUtils.findTaskViewToLaunch;
 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;
@@ -47,7 +48,6 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
-import android.app.ActivityOptions;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
@@ -69,20 +69,23 @@ import androidx.annotation.Nullable;
 import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
 import com.android.launcher3.allapps.AllAppsTransitionController;
 import com.android.launcher3.anim.AnimationSuccessListener;
-import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.shortcuts.DeepShortcutView;
 import com.android.launcher3.statehandlers.DepthController;
+import com.android.launcher3.util.ActivityOptionsWrapper;
 import com.android.launcher3.util.DynamicResource;
 import com.android.launcher3.util.MultiValueAlpha;
 import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;
+import com.android.launcher3.util.RunnableList;
 import com.android.launcher3.views.FloatingIconView;
 import com.android.quickstep.RemoteAnimationTargets;
 import com.android.quickstep.SystemUiProxy;
+import com.android.quickstep.TaskViewUtils;
 import com.android.quickstep.util.MultiValueUpdateListener;
 import com.android.quickstep.util.RemoteAnimationProvider;
 import com.android.quickstep.util.StaggeredWorkspaceAnim;
 import com.android.quickstep.util.SurfaceTransactionApplier;
+import com.android.quickstep.views.RecentsView;
 import com.android.systemui.shared.recents.IStartingWindowListener;
 import com.android.systemui.shared.system.ActivityCompat;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
@@ -99,12 +102,9 @@ import com.android.systemui.shared.system.WindowManagerWrapper;
 import java.util.LinkedHashMap;
 
 /**
- * {@link LauncherAppTransitionManager} with Quickstep-specific app transitions for launching from
- * home and/or all-apps.  Not used for 3p launchers.
+ * Manages the opening and closing app transitions from Launcher
  */
-@SuppressWarnings("unused")
-public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTransitionManager
-        implements OnDeviceProfileChangeListener {
+public class QuickstepTransitionManager implements OnDeviceProfileChangeListener {
 
     private static final String TAG = "QuickstepTransition";
 
@@ -115,8 +115,8 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
     public static final int STATUS_BAR_TRANSITION_DURATION = 120;
 
     /**
-     * Since our animations decelerate heavily when finishing, we want to start status bar animations
-     * x ms before the ending.
+     * Since our animations decelerate heavily when finishing, we want to start status bar
+     * animations x ms before the ending.
      */
     public static final int STATUS_BAR_TRANSITION_PRE_DELAY = 96;
 
@@ -191,7 +191,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
     // Will never be larger than MAX_NUM_TASKS
     private LinkedHashMap<Integer, Integer> mTypeForTaskId;
 
-    public QuickstepAppTransitionManagerImpl(Context context) {
+    public QuickstepTransitionManager(Context context) {
         mLauncher = Launcher.cast(Launcher.getLauncher(context));
         mDragLayer = mLauncher.getDragLayer();
         mDragLayerAlpha = mDragLayer.getAlphaProperty(ALPHA_INDEX_TRANSITIONS);
@@ -229,37 +229,29 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
         mDeviceProfile = dp;
     }
 
-    @Override
-    public boolean supportsAdaptiveIconAnimation(View clickedView) {
-        return hasControlRemoteAppTransitionPermission()
-                && FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM.get()
-                && !mLauncher.isViewInTaskbar(clickedView);
-    }
-
     /**
      * @return ActivityOptions with remote animations that controls how the window of the opening
      *         targets are displayed.
      */
-    @Override
-    public ActivityOptions getActivityLaunchOptions(Launcher launcher, View v) {
-        if (hasControlRemoteAppTransitionPermission()) {
-            boolean fromRecents = isLaunchingFromRecents(v, null /* targets */);
-            mAppLaunchRunner = new AppLaunchAnimationRunner(mHandler, v);
-            RemoteAnimationRunnerCompat runner = new WrappedLauncherAnimationRunner<>(
-                    mAppLaunchRunner, true /* startAtFrontOfQueue */);
-
-            // Note that this duration is a guess as we do not know if the animation will be a
-            // recents launch or not for sure until we know the opening app targets.
-            long duration = fromRecents
-                    ? RECENTS_LAUNCH_DURATION
-                    : APP_LAUNCH_DURATION;
-
-            long statusBarTransitionDelay = duration - STATUS_BAR_TRANSITION_DURATION
-                    - STATUS_BAR_TRANSITION_PRE_DELAY;
-            return ActivityOptionsCompat.makeRemoteAnimation(new RemoteAnimationAdapterCompat(
-                    runner, duration, statusBarTransitionDelay));
-        }
-        return super.getActivityLaunchOptions(launcher, v);
+    public ActivityOptionsWrapper getActivityLaunchOptions(Launcher launcher, View v) {
+        boolean fromRecents = isLaunchingFromRecents(v, null /* targets */);
+        RunnableList onEndCallback = new RunnableList();
+        mAppLaunchRunner = new AppLaunchAnimationRunner(mHandler, v, onEndCallback);
+        RemoteAnimationRunnerCompat runner = new WrappedLauncherAnimationRunner<>(
+                mHandler, mAppLaunchRunner, true /* startAtFrontOfQueue */);
+
+        // Note that this duration is a guess as we do not know if the animation will be a
+        // recents launch or not for sure until we know the opening app targets.
+        long duration = fromRecents
+                ? RECENTS_LAUNCH_DURATION
+                : APP_LAUNCH_DURATION;
+
+        long statusBarTransitionDelay = duration - STATUS_BAR_TRANSITION_DURATION
+                - STATUS_BAR_TRANSITION_PRE_DELAY;
+        RemoteAnimationAdapterCompat adapterCompat =
+                new RemoteAnimationAdapterCompat(runner, duration, statusBarTransitionDelay);
+        return new ActivityOptionsWrapper(
+                ActivityOptionsCompat.makeRemoteAnimation(adapterCompat), onEndCallback);
     }
 
     /**
@@ -272,8 +264,11 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
      * @param targets apps that are opening/closing
      * @return true if the app is launching from recents, false if it most likely is not
      */
-    protected abstract boolean isLaunchingFromRecents(@NonNull View v,
-            @Nullable RemoteAnimationTargetCompat[] targets);
+    protected boolean isLaunchingFromRecents(@NonNull View v,
+            @Nullable RemoteAnimationTargetCompat[] targets) {
+        return mLauncher.getStateManager().getState().overviewUi
+                && findTaskViewToLaunch(mLauncher.getOverviewPanel(), v, targets) != null;
+    }
 
     /**
      * Composes the animations for a launch from the recents list.
@@ -283,9 +278,13 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
      * @param appTargets the apps that are opening/closing
      * @param launcherClosing true if the launcher app is closing
      */
-    protected abstract void composeRecentsLaunchAnimator(@NonNull AnimatorSet anim, @NonNull View v,
+    protected void composeRecentsLaunchAnimator(@NonNull AnimatorSet anim, @NonNull View v,
             @NonNull RemoteAnimationTargetCompat[] appTargets,
-            @NonNull RemoteAnimationTargetCompat[] wallpaperTargets, boolean launcherClosing);
+            @NonNull RemoteAnimationTargetCompat[] wallpaperTargets, boolean launcherClosing) {
+        TaskViewUtils.composeRecentsLaunchAnimator(anim, v, appTargets, wallpaperTargets,
+                launcherClosing, mLauncher.getStateManager(), mLauncher.getOverviewPanel(),
+                mLauncher.getDepthController());
+    }
 
     private boolean areAllTargetsTranslucent(@NonNull RemoteAnimationTargetCompat[] targets) {
         boolean isAllOpeningTargetTrs = true;
@@ -483,8 +482,27 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
      * @param trans the translation Y values to animator to over time
      * @return listener to run when the animation ends
      */
-    protected abstract Runnable composeViewContentAnimator(@NonNull AnimatorSet anim,
-            float[] alphas, float[] trans);
+    protected Runnable composeViewContentAnimator(@NonNull AnimatorSet anim,
+            float[] alphas, float[] trans) {
+        RecentsView overview = mLauncher.getOverviewPanel();
+        ObjectAnimator alpha = ObjectAnimator.ofFloat(overview,
+                RecentsView.CONTENT_ALPHA, alphas);
+        alpha.setDuration(CONTENT_ALPHA_DURATION);
+        alpha.setInterpolator(LINEAR);
+        anim.play(alpha);
+        overview.setFreezeViewVisibility(true);
+
+        ObjectAnimator transY = ObjectAnimator.ofFloat(overview, View.TRANSLATION_Y, trans);
+        transY.setInterpolator(AGGRESSIVE_EASE);
+        transY.setDuration(CONTENT_TRANSLATION_DURATION);
+        anim.play(transY);
+
+        return () -> {
+            overview.setFreezeViewVisibility(false);
+            overview.setTranslationY(0);
+            mLauncher.getStateManager().reapplyState();
+        };
+    }
 
     /**
      * @return Animator that controls the window of the opening targets from app icons.
@@ -686,7 +704,6 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
     /**
      * Registers remote animations used when closing apps to home screen.
      */
-    @Override
     public void registerRemoteAnimations() {
         if (SEPARATE_RECENTS_ACTIVITY.get()) {
             return;
@@ -698,7 +715,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
             definition.addRemoteAnimation(WindowManagerWrapper.TRANSIT_WALLPAPER_OPEN,
                     WindowManagerWrapper.ACTIVITY_TYPE_STANDARD,
                     new RemoteAnimationAdapterCompat(
-                            new WrappedLauncherAnimationRunner<>(mWallpaperOpenRunner,
+                            new WrappedLauncherAnimationRunner<>(mHandler, mWallpaperOpenRunner,
                                     false /* startAtFrontOfQueue */),
                             CLOSING_TRANSITION_DURATION_MS, 0 /* statusBarTransitionDelay */));
 
@@ -707,7 +724,8 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                 definition.addRemoteAnimation(
                         WindowManagerWrapper.TRANSIT_KEYGUARD_GOING_AWAY_ON_WALLPAPER,
                         new RemoteAnimationAdapterCompat(
-                                new WrappedLauncherAnimationRunner<>(mKeyguardGoingAwayRunner,
+                                new WrappedLauncherAnimationRunner<>(
+                                        mHandler, mKeyguardGoingAwayRunner,
                                         true /* startAtFrontOfQueue */),
                                 CLOSING_TRANSITION_DURATION_MS, 0 /* statusBarTransitionDelay */));
             }
@@ -719,7 +737,6 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
     /**
      * Registers remote animations used when closing apps to home screen.
      */
-    @Override
     public void registerRemoteTransitions() {
         if (SEPARATE_RECENTS_ACTIVITY.get()) {
             return;
@@ -727,26 +744,20 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
         if (hasControlRemoteAppTransitionPermission()) {
             mWallpaperOpenTransitionRunner = createWallpaperOpenRunner(false /* fromUnlock */);
             mLauncherOpenTransition = RemoteAnimationAdapterCompat.buildRemoteTransition(
-                    new WrappedLauncherAnimationRunner<>(mWallpaperOpenTransitionRunner,
+                    new WrappedLauncherAnimationRunner<>(mHandler, mWallpaperOpenTransitionRunner,
                             false /* startAtFrontOfQueue */));
             mLauncherOpenTransition.addHomeOpenCheck();
             SystemUiProxy.INSTANCE.getNoCreate().registerRemoteTransition(mLauncherOpenTransition);
         }
     }
 
-    @Override
     public void onActivityDestroyed() {
-        super.onActivityDestroyed();
         unregisterRemoteAnimations();
         unregisterRemoteTransitions();
         SystemUiProxy.INSTANCE.getNoCreate().setStartingWindowListener(null);
     }
 
-    /**
-     * Unregisters all remote animations.
-     */
-    @Override
-    public void unregisterRemoteAnimations() {
+    private void unregisterRemoteAnimations() {
         if (SEPARATE_RECENTS_ACTIVITY.get()) {
             return;
         }
@@ -761,8 +772,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
         }
     }
 
-    @Override
-    public void unregisterRemoteTransitions() {
+    private void unregisterRemoteTransitions() {
         if (SEPARATE_RECENTS_ACTIVITY.get()) {
             return;
         }
@@ -883,7 +893,10 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                 && ENABLE_SHELL_STARTING_SURFACE;
     }
 
-    private boolean hasControlRemoteAppTransitionPermission() {
+    /**
+     * Returns true if we have permission to control remote app transisions
+     */
+    public boolean hasControlRemoteAppTransitionPermission() {
         return mLauncher.checkSelfPermission(CONTROL_REMOTE_APP_TRANSITION_PERMISSION)
                 == PackageManager.PERMISSION_GRANTED;
     }
@@ -922,11 +935,6 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
             mFromUnlock = fromUnlock;
         }
 
-        @Override
-        public Handler getHandler() {
-            return mHandler;
-        }
-
         @Override
         public void onCreateAnimation(int transit,
                 RemoteAnimationTargetCompat[] appTargets,
@@ -1017,15 +1025,12 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
 
         private final Handler mHandler;
         private final View mV;
+        private final RunnableList mOnEndCallback;
 
-        AppLaunchAnimationRunner(Handler handler, View v) {
+        AppLaunchAnimationRunner(Handler handler, View v, RunnableList onEndCallback) {
             mHandler = handler;
             mV = v;
-        }
-
-        @Override
-        public Handler getHandler() {
-            return mHandler;
+            mOnEndCallback = onEndCallback;
         }
 
         @Override
@@ -1060,7 +1065,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                 anim.addListener(mForceInvisibleListener);
             }
 
-            result.setAnimation(anim, mLauncher);
+            result.setAnimation(anim, mLauncher, mOnEndCallback::executeAllAndDestroy);
         }
     }
 
diff --git a/quickstep/src/com/android/launcher3/WrappedAnimationRunnerImpl.java b/quickstep/src/com/android/launcher3/WrappedAnimationRunnerImpl.java
index 03cc28e49b..16727ecfda 100644
--- a/quickstep/src/com/android/launcher3/WrappedAnimationRunnerImpl.java
+++ b/quickstep/src/com/android/launcher3/WrappedAnimationRunnerImpl.java
@@ -16,8 +16,6 @@
 
 package com.android.launcher3;
 
-import android.os.Handler;
-
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
 /**
@@ -25,7 +23,7 @@ import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
  * implementation.
  */
 public interface WrappedAnimationRunnerImpl {
-    Handler getHandler();
+
     void onCreateAnimation(int transit,
             RemoteAnimationTargetCompat[] appTargets,
             RemoteAnimationTargetCompat[] wallpaperTargets,
diff --git a/quickstep/src/com/android/launcher3/WrappedLauncherAnimationRunner.java b/quickstep/src/com/android/launcher3/WrappedLauncherAnimationRunner.java
index 1e1631bed9..e31927550c 100644
--- a/quickstep/src/com/android/launcher3/WrappedLauncherAnimationRunner.java
+++ b/quickstep/src/com/android/launcher3/WrappedLauncherAnimationRunner.java
@@ -16,6 +16,8 @@
 
 package com.android.launcher3;
 
+import android.os.Handler;
+
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
 import java.lang.ref.WeakReference;
@@ -40,8 +42,9 @@ public class WrappedLauncherAnimationRunner<R extends WrappedAnimationRunnerImpl
         extends LauncherAnimationRunner {
     private WeakReference<R> mImpl;
 
-    public WrappedLauncherAnimationRunner(R animationRunnerImpl, boolean startAtFrontOfQueue) {
-        super(animationRunnerImpl.getHandler(), startAtFrontOfQueue);
+    public WrappedLauncherAnimationRunner(
+            Handler handler, R animationRunnerImpl, boolean startAtFrontOfQueue) {
+        super(handler, startAtFrontOfQueue);
         mImpl = new WeakReference<>(animationRunnerImpl);
     }
 
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index 544835c317..ca5d3c3e6c 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -41,7 +41,7 @@ import androidx.annotation.Nullable;
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.LauncherState;
-import com.android.launcher3.QuickstepAppTransitionManagerImpl;
+import com.android.launcher3.QuickstepTransitionManager;
 import com.android.launcher3.R;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.folder.Folder;
@@ -298,7 +298,7 @@ public class TaskbarController {
      * Should be called from onResume() and onPause(), and animates the Taskbar accordingly.
      */
     public void onLauncherResumedOrPaused(boolean isResumed) {
-        long duration = QuickstepAppTransitionManagerImpl.CONTENT_ALPHA_DURATION;
+        long duration = QuickstepTransitionManager.CONTENT_ALPHA_DURATION;
         if (mAnimator != null) {
             mAnimator.cancel();
         }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index b009629c80..e02f2c2445 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -30,7 +30,6 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH
 import static com.android.launcher3.testing.TestProtocol.HINT_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.OVERVIEW_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.QUICK_SWITCH_STATE_ORDINAL;
-import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY;
 
 import android.content.Intent;
@@ -262,14 +261,13 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
                 RecentsView rv = getOverviewPanel();
                 TaskView tasktolaunch = rv.getTaskViewAt(0);
                 if (tasktolaunch != null) {
-                    tasktolaunch.launchTask(false, success -> {
+                    tasktolaunch.launchTask(success -> {
                         if (!success) {
                             getStateManager().goToState(OVERVIEW);
-                            tasktolaunch.notifyTaskLaunchFailed(TAG);
                         } else {
                             getStateManager().moveToRestState();
                         }
-                    }, MAIN_EXECUTOR.getHandler());
+                    });
                 } else {
                     getStateManager().goToState(NORMAL);
                 }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
index d480b6d472..1f68a0403b 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -155,7 +155,7 @@ public class OverviewState extends LauncherState {
     public void onBackPressed(Launcher launcher) {
         TaskView taskView = launcher.<RecentsView>getOverviewPanel().getRunningTaskView();
         if (taskView != null) {
-            taskView.launchTask(true);
+            taskView.launchTaskAnimated();
         } else {
             super.onBackPressed(launcher);
         }
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index e0c041eb9d..cf345e6083 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -22,7 +22,7 @@ import static android.widget.Toast.LENGTH_SHORT;
 
 import static com.android.launcher3.BaseActivity.INVISIBLE_BY_STATE_HANDLER;
 import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS;
-import static com.android.launcher3.QuickstepAppTransitionManagerImpl.RECENTS_LAUNCH_DURATION;
+import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DURATION;
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.anim.Interpolators.DEACCEL;
 import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
@@ -1624,19 +1624,17 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                 mGestureState.updateLastStartedTaskId(taskId);
                 boolean hasTaskPreviouslyAppeared = mGestureState.getPreviouslyAppearedTaskIds()
                         .contains(taskId);
-                nextTask.launchTask(false /* animate */, true /* freezeTaskList */,
-                        success -> {
-                            resultCallback.accept(success);
-                            if (success) {
-                                if (hasTaskPreviouslyAppeared) {
-                                    onRestartPreviouslyAppearedTask();
-                                }
-                            } else {
-                                mActivityInterface.onLaunchTaskFailed();
-                                nextTask.notifyTaskLaunchFailed(TAG);
-                                mRecentsAnimationController.finish(true /* toRecents */, null);
-                            }
-                        }, MAIN_EXECUTOR.getHandler());
+                nextTask.launchTask(success -> {
+                    resultCallback.accept(success);
+                    if (success) {
+                        if (hasTaskPreviouslyAppeared) {
+                            onRestartPreviouslyAppearedTask();
+                        }
+                    } else {
+                        mActivityInterface.onLaunchTaskFailed();
+                        mRecentsAnimationController.finish(true /* toRecents */, null);
+                    }
+                }, true /* freezeTaskList */);
             } else {
                 mActivityInterface.onLaunchTaskFailed();
                 Toast.makeText(mContext, R.string.activity_not_available, LENGTH_SHORT).show();
diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
index 985389ea7d..63fdd0b554 100644
--- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
@@ -132,7 +132,7 @@ public class OverviewCommandHelper {
             }
             int currentPage = recents.getNextPage();
             if (currentPage >= 0 && currentPage < recents.getTaskViewCount()) {
-                ((TaskView) recents.getPageAt(currentPage)).launchTask(true);
+                ((TaskView) recents.getPageAt(currentPage)).launchTaskAnimated();
             } else {
                 recents.startHome();
             }
diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index 1b2fd41617..3d68d64e53 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -18,9 +18,9 @@ package com.android.quickstep;
 import static android.content.pm.ActivityInfo.CONFIG_ORIENTATION;
 import static android.content.pm.ActivityInfo.CONFIG_SCREEN_SIZE;
 
-import static com.android.launcher3.QuickstepAppTransitionManagerImpl.RECENTS_LAUNCH_DURATION;
-import static com.android.launcher3.QuickstepAppTransitionManagerImpl.STATUS_BAR_TRANSITION_DURATION;
-import static com.android.launcher3.QuickstepAppTransitionManagerImpl.STATUS_BAR_TRANSITION_PRE_DELAY;
+import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DURATION;
+import static com.android.launcher3.QuickstepTransitionManager.STATUS_BAR_TRANSITION_DURATION;
+import static com.android.launcher3.QuickstepTransitionManager.STATUS_BAR_TRANSITION_PRE_DELAY;
 import static com.android.launcher3.Utilities.createHomeIntent;
 import static com.android.launcher3.testing.TestProtocol.OVERVIEW_STATE_ORDINAL;
 import static com.android.quickstep.TaskUtils.taskIsATargetWithMode;
@@ -30,7 +30,6 @@ import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MOD
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
-import android.app.ActivityOptions;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
@@ -46,7 +45,6 @@ import com.android.launcher3.LauncherAnimationRunner.AnimationResult;
 import com.android.launcher3.R;
 import com.android.launcher3.WrappedAnimationRunnerImpl;
 import com.android.launcher3.WrappedLauncherAnimationRunner;
-import com.android.launcher3.allapps.search.SearchAdapterProvider;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.compat.AccessibilityManagerCompat;
@@ -54,7 +52,9 @@ import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
 import com.android.launcher3.statemanager.StatefulActivity;
+import com.android.launcher3.util.ActivityOptionsWrapper;
 import com.android.launcher3.util.ActivityTracker;
+import com.android.launcher3.util.RunnableList;
 import com.android.launcher3.util.SystemUiController;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.BaseDragLayer;
@@ -94,7 +94,6 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
 
     // Strong refs to runners which are cleared when the activity is destroyed
     private WrappedAnimationRunnerImpl mActivityLaunchAnimationRunner;
-    private SearchAdapterProvider mSearchAdapterProvider;
 
     /**
      * Init drag layer and overview panel views.
@@ -172,42 +171,40 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
     }
 
     @Override
-    public ActivityOptions getActivityLaunchOptions(final View v) {
+    public ActivityOptionsWrapper getActivityLaunchOptions(final View v) {
         if (!(v instanceof TaskView)) {
-            return null;
+            return super.getActivityLaunchOptions(v);
         }
 
         final TaskView taskView = (TaskView) v;
-        mActivityLaunchAnimationRunner = new WrappedAnimationRunnerImpl() {
-            @Override
-            public Handler getHandler() {
-                return mUiHandler;
-            }
+        RunnableList onEndCallback = new RunnableList();
 
-            @Override
-            public void onCreateAnimation(int transit,
+        mActivityLaunchAnimationRunner = (int transit,
                     RemoteAnimationTargetCompat[] appTargets,
                     RemoteAnimationTargetCompat[] wallpaperTargets,
                     RemoteAnimationTargetCompat[] nonAppTargets,
-                    AnimationResult result) {
-                AnimatorSet anim = composeRecentsLaunchAnimator(taskView, appTargets,
-                        wallpaperTargets);
-                anim.addListener(resetStateListener());
-                result.setAnimation(anim, RecentsActivity.this);
-            }
+                    AnimationResult result) -> {
+            AnimatorSet anim = composeRecentsLaunchAnimator(taskView, appTargets,
+                    wallpaperTargets);
+            anim.addListener(resetStateListener());
+            result.setAnimation(anim, RecentsActivity.this, onEndCallback::executeAllAndDestroy);
         };
+
         final LauncherAnimationRunner wrapper = new WrappedLauncherAnimationRunner<>(
-                mActivityLaunchAnimationRunner, true /* startAtFrontOfQueue */);
-        return ActivityOptionsCompat.makeRemoteAnimation(new RemoteAnimationAdapterCompat(
+                mUiHandler, mActivityLaunchAnimationRunner, true /* startAtFrontOfQueue */);
+        RemoteAnimationAdapterCompat adapterCompat = new RemoteAnimationAdapterCompat(
                 wrapper, RECENTS_LAUNCH_DURATION,
                 RECENTS_LAUNCH_DURATION - STATUS_BAR_TRANSITION_DURATION
-                        - STATUS_BAR_TRANSITION_PRE_DELAY));
+                        - STATUS_BAR_TRANSITION_PRE_DELAY);
+        return new ActivityOptionsWrapper(
+                ActivityOptionsCompat.makeRemoteAnimation(adapterCompat),
+                onEndCallback);
     }
 
     /**
      * Composes the animations for a launch from the recents list if possible.
      */
-    private AnimatorSet composeRecentsLaunchAnimator(TaskView taskView,
+    private AnimatorSet  composeRecentsLaunchAnimator(TaskView taskView,
             RemoteAnimationTargetCompat[] appTargets,
             RemoteAnimationTargetCompat[] wallpaperTargets) {
         AnimatorSet target = new AnimatorSet();
diff --git a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
index 65bb0f35d1..d81f07f4c3 100644
--- a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
@@ -38,7 +38,6 @@ import com.android.launcher3.logging.StatsLogManager.LauncherEvent;
 import com.android.launcher3.model.WellbeingModel;
 import com.android.launcher3.popup.SystemShortcut;
 import com.android.launcher3.popup.SystemShortcut.AppInfo;
-import com.android.launcher3.util.Executors;
 import com.android.launcher3.util.InstantAppResolver;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskThumbnailView;
@@ -54,7 +53,6 @@ import com.android.systemui.shared.system.WindowManagerWrapper;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.function.Consumer;
 
 /**
  * Represents a system shortcut that can be shown for a recent task.
@@ -281,15 +279,9 @@ public interface TaskShortcutFactory {
 
         @Override
         public void onClick(View view) {
-            Consumer<Boolean> resultCallback = success -> {
-                if (success) {
-                    SystemUiProxy.INSTANCE.get(mTarget).startScreenPinning(
-                            mTaskView.getTask().key.id);
-                } else {
-                    mTaskView.notifyTaskLaunchFailed(TAG);
-                }
-            };
-            mTaskView.launchTask(true, resultCallback, Executors.MAIN_EXECUTOR.getHandler());
+            if (mTaskView.launchTaskAnimated() != null) {
+                SystemUiProxy.INSTANCE.get(mTarget).startScreenPinning(mTaskView.getTask().key.id);
+            }
             dismissTaskMenuView(mTarget);
             mTarget.getStatsLogManager().logger().withItemInfo(mTaskView.getItemInfo())
                     .log(LauncherEvent.LAUNCHER_SYSTEM_SHORTCUT_PIN_TAP);
diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java
index aa1b8e19bb..2feeffa202 100644
--- a/quickstep/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java
@@ -18,7 +18,7 @@ package com.android.quickstep;
 import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA;
 import static com.android.launcher3.LauncherState.BACKGROUND_APP;
 import static com.android.launcher3.LauncherState.NORMAL;
-import static com.android.launcher3.QuickstepAppTransitionManagerImpl.RECENTS_LAUNCH_DURATION;
+import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DURATION;
 import static com.android.launcher3.Utilities.getDescendantCoordRelativeToAncestor;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.Interpolators.TOUCH_RESPONSE_INTERPOLATOR;
diff --git a/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java b/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java
index 3adb459aeb..5c6da1611f 100644
--- a/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java
+++ b/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java
@@ -21,7 +21,6 @@ import android.content.Context;
 import android.os.Handler;
 
 import com.android.launcher3.LauncherAnimationRunner;
-import com.android.launcher3.LauncherAnimationRunner.AnimationResult;
 import com.android.launcher3.WrappedAnimationRunnerImpl;
 import com.android.launcher3.WrappedLauncherAnimationRunner;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
@@ -36,23 +35,10 @@ public abstract class RemoteAnimationProvider {
             RemoteAnimationTargetCompat[] wallpaperTargets);
 
     ActivityOptions toActivityOptions(Handler handler, long duration, Context context) {
-        mAnimationRunner = new WrappedAnimationRunnerImpl() {
-            @Override
-            public Handler getHandler() {
-                return handler;
-            }
-
-            @Override
-            public void onCreateAnimation(int transit,
-                    RemoteAnimationTargetCompat[] appTargets,
-                    RemoteAnimationTargetCompat[] wallpaperTargets,
-                    RemoteAnimationTargetCompat[] nonApps,
-                    AnimationResult result) {
+        mAnimationRunner = (transit, appTargets, wallpaperTargets, nonApps, result) ->
                 result.setAnimation(createWindowAnimation(appTargets, wallpaperTargets), context);
-            }
-        };
         final LauncherAnimationRunner wrapper = new WrappedLauncherAnimationRunner(
-                mAnimationRunner, false /* startAtFrontOfQueue */);
+                handler, mAnimationRunner, false /* startAtFrontOfQueue */);
         return ActivityOptionsCompat.makeRemoteAnimation(
                 new RemoteAnimationAdapterCompat(wrapper, duration, 0));
     }
diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
index c62f3e28ab..ceb343d89f 100644
--- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
@@ -21,7 +21,7 @@ import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.OVERVIEW_MODAL_TASK;
 import static com.android.launcher3.LauncherState.SPRING_LOADED;
-import static com.android.launcher3.QuickstepAppTransitionManagerImpl.ALL_APPS_PROGRESS_OFF_SCREEN;
+import static com.android.launcher3.QuickstepTransitionManager.ALL_APPS_PROGRESS_OFF_SCREEN;
 import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS;
 import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index efe1f753e0..d4548dfc62 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1467,7 +1467,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             }
         }
         targetTask.setEndQuickswitchCuj(true);
-        targetTask.launchTask(true);
+        targetTask.launchTaskAnimated();
     }
 
     public void setRunningTaskIconScaledDown(boolean isScaledDown) {
@@ -2494,17 +2494,11 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         }
         mPendingAnimation.addEndListener(isSuccess -> {
             if (isSuccess) {
-                Consumer<Boolean> onLaunchResult = (result) -> {
-                    onTaskLaunchAnimationEnd(result);
-                    if (!result) {
-                        tv.notifyTaskLaunchFailed(TAG);
-                    }
-                };
                 if (LIVE_TILE.get()) {
                     finishRecentsAnimation(false /* toRecents */, null);
-                    onLaunchResult.accept(true /* success */);
+                    onTaskLaunchAnimationEnd(true /* success */);
                 } else {
-                    tv.launchTask(false, onLaunchResult, getHandler());
+                    tv.launchTask(this::onTaskLaunchAnimationEnd);
                 }
                 Task task = tv.getTask();
                 if (task != null) {
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 88545c6436..e8cf29a11a 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -27,7 +27,7 @@ import static android.view.Surface.ROTATION_270;
 import static android.view.Surface.ROTATION_90;
 import static android.widget.Toast.LENGTH_SHORT;
 
-import static com.android.launcher3.QuickstepAppTransitionManagerImpl.RECENTS_LAUNCH_DURATION;
+import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DURATION;
 import static com.android.launcher3.Utilities.comp;
 import static com.android.launcher3.Utilities.getDescendantCoordRelativeToAncestor;
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
@@ -37,6 +37,7 @@ import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.Interpolators.TOUCH_RESPONSE_INTERPOLATOR;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_ICON_TAP_OR_LONGPRESS;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_TAP;
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 
@@ -52,7 +53,6 @@ import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.os.Handler;
 import android.util.AttributeSet;
 import android.util.FloatProperty;
 import android.util.Log;
@@ -66,6 +66,8 @@ import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.FrameLayout;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.R;
@@ -79,7 +81,9 @@ import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.PagedOrientationHandler;
+import com.android.launcher3.util.ActivityOptionsWrapper;
 import com.android.launcher3.util.ComponentKey;
+import com.android.launcher3.util.RunnableList;
 import com.android.launcher3.util.TransformingTouchDelegate;
 import com.android.launcher3.util.ViewPool.Reusable;
 import com.android.quickstep.RecentsModel;
@@ -335,7 +339,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
                 });
                 anim.start();
             } else {
-                launchTask(true /* animate */);
+                launchTaskAnimated();
             }
             mActivity.getStatsLogManager().logger().withItemInfo(getItemInfo())
                     .log(LAUNCHER_TASK_LAUNCH_TAP);
@@ -483,63 +487,62 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
                 .createPlaybackController();
     }
 
-    public void launchTask(boolean animate) {
-        launchTask(animate, false /* freezeTaskList */);
-    }
-
-    public void launchTask(boolean animate, boolean freezeTaskList) {
-        launchTask(animate, freezeTaskList, (result) -> {
-            if (!result) {
+    /**
+     * Starts the task associated with this view and animates the startup.
+     * @return CompletionStage to indicate the animation completion or null if the launch failed.
+     */
+    public RunnableList launchTaskAnimated() {
+        if (mTask != null) {
+            TestLogging.recordEvent(
+                    TestProtocol.SEQUENCE_MAIN, "startActivityFromRecentsAsync", mTask);
+            ActivityOptionsWrapper opts =  mActivity.getActivityLaunchOptions(this);
+            if (ActivityManagerWrapper.getInstance()
+                    .startActivityFromRecents(mTask.key, opts.options)) {
+                return opts.onEndCallback;
+            } else {
                 notifyTaskLaunchFailed(TAG);
+                return null;
             }
-        }, getHandler());
+        } else {
+            return null;
+        }
     }
 
-    public void launchTask(boolean animate, Consumer<Boolean> resultCallback,
-            Handler resultCallbackHandler) {
-        launchTask(animate, false /* freezeTaskList */, resultCallback, resultCallbackHandler);
+    /**
+     * Starts the task associated with this view without any animation
+     */
+    public void launchTask(@NonNull Consumer<Boolean> callback) {
+        launchTask(callback, false /* freezeTaskList */);
     }
 
-    public void launchTask(boolean animate, boolean freezeTaskList, Consumer<Boolean> resultCallback,
-            Handler resultCallbackHandler) {
+    /**
+     * Starts the task associated with this view without any animation
+     */
+    public void launchTask(@NonNull Consumer<Boolean> callback, boolean freezeTaskList) {
         if (mTask != null) {
-            final ActivityOptions opts;
             TestLogging.recordEvent(
                     TestProtocol.SEQUENCE_MAIN, "startActivityFromRecentsAsync", mTask);
-            if (animate) {
-                opts = mActivity.getActivityLaunchOptions(this);
-                if (freezeTaskList) {
-                    ActivityOptionsCompat.setFreezeRecentTasksList(opts);
-                }
-                ActivityManagerWrapper.getInstance().startActivityFromRecentsAsync(mTask.key,
-                        opts, resultCallback, resultCallbackHandler);
-            } else {
-                opts = ActivityOptionsCompat.makeCustomAnimation(getContext(), 0, 0, () -> {
-                    if (resultCallback != null) {
-                        // Only post the animation start after the system has indicated that the
-                        // transition has started
-                        resultCallbackHandler.post(() -> resultCallback.accept(true));
-                    }
-                }, resultCallbackHandler);
-                if (freezeTaskList) {
-                    ActivityOptionsCompat.setFreezeRecentTasksList(opts);
-                }
-                UI_HELPER_EXECUTOR.execute(
-                        () -> ActivityManagerWrapper.getInstance().startActivityFromRecentsAsync(
-                                mTask.key,
-                                opts,
-                                (success) -> {
-                                    if (resultCallback != null && !success) {
-                                        // If the call to start activity failed, then post the
-                                        // result
-                                        // immediately, otherwise, wait for the animation start
-                                        // callback
-                                        // from the activity options above
-                                        resultCallbackHandler.post(
-                                                () -> resultCallback.accept(false));
-                                    }
-                                }, resultCallbackHandler));
+
+            // Indicate success once the system has indicated that the transition has started
+            ActivityOptions opts = ActivityOptionsCompat.makeCustomAnimation(
+                    getContext(), 0, 0, () -> callback.accept(true), MAIN_EXECUTOR.getHandler());
+            if (freezeTaskList) {
+                ActivityOptionsCompat.setFreezeRecentTasksList(opts);
             }
+            Task.TaskKey key = mTask.key;
+            UI_HELPER_EXECUTOR.execute(() -> {
+                if (!ActivityManagerWrapper.getInstance().startActivityFromRecents(key, opts)) {
+                    // If the call to start activity failed, then post the result immediately,
+                    // otherwise, wait for the animation start callback from the activity options
+                    // above
+                    MAIN_EXECUTOR.post(() -> {
+                        notifyTaskLaunchFailed(TAG);
+                        callback.accept(false);
+                    });
+                }
+            });
+        } else {
+            callback.accept(false);
         }
     }
 
@@ -1123,7 +1126,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         return getRecentsView().mOrientationState.getOrientationHandler();
     }
 
-    public void notifyTaskLaunchFailed(String tag) {
+    private void notifyTaskLaunchFailed(String tag) {
         String msg = "Failed to launch task";
         if (mTask != null) {
             msg += " (task=" + mTask.key.baseIntent + " userId=" + mTask.key.userId + ")";
diff --git a/res/values/config.xml b/res/values/config.xml
index 89415b89a3..23294c8164 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -61,7 +61,6 @@
     <!-- Various classes overriden by projects/build flavors. -->
     <string name="folder_name_provider_class" translatable="false"></string>
     <string name="stats_log_manager_class" translatable="false"></string>
-    <string name="app_transition_manager_class" translatable="false"></string>
     <string name="instant_app_resolver_class" translatable="false"></string>
     <string name="main_process_initializer_class" translatable="false"></string>
     <string name="app_launch_tracker_class" translatable="false"></string>
diff --git a/src/com/android/launcher3/BaseActivity.java b/src/com/android/launcher3/BaseActivity.java
index 062ab7112f..f77f7e8454 100644
--- a/src/com/android/launcher3/BaseActivity.java
+++ b/src/com/android/launcher3/BaseActivity.java
@@ -279,7 +279,7 @@ public abstract class BaseActivity extends Activity implements ActivityContext {
     /**
      * Used to set the override visibility state, used only to handle the transition home with the
      * recents animation.
-     * @see QuickstepAppTransitionManagerImpl#createWallpaperOpenRunner
+     * @see QuickstepTransitionManager#createWallpaperOpenRunner
      */
     public void addForceInvisibleFlag(@InvisibilityFlags int flag) {
         mForceInvisible |= flag;
diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java
index 5bfde15a04..e38ab74ee7 100644
--- a/src/com/android/launcher3/BaseDraggingActivity.java
+++ b/src/com/android/launcher3/BaseDraggingActivity.java
@@ -27,6 +27,7 @@ import android.content.res.Configuration;
 import android.graphics.Insets;
 import android.graphics.Point;
 import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Process;
 import android.os.StrictMode;
@@ -40,6 +41,7 @@ import android.view.WindowInsets.Type;
 import android.view.WindowMetrics;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.android.launcher3.LauncherSettings.Favorites;
@@ -52,10 +54,12 @@ import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.touch.ItemClickHandler;
 import com.android.launcher3.uioverrides.WallpaperColorInfo;
+import com.android.launcher3.util.ActivityOptionsWrapper;
 import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.DisplayController.DisplayInfoChangeListener;
 import com.android.launcher3.util.DisplayController.Info;
 import com.android.launcher3.util.PackageManagerHelper;
+import com.android.launcher3.util.RunnableList;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.util.TraceHelper;
 import com.android.launcher3.util.WindowBounds;
@@ -76,6 +80,7 @@ public abstract class BaseDraggingActivity extends BaseActivity
     protected boolean mIsSafeModeEnabled;
 
     private Runnable mOnStartCallback;
+    private RunnableList mOnResumeCallbacks = new RunnableList();
 
     private int mThemeRes = R.style.AppTheme;
 
@@ -97,6 +102,16 @@ public abstract class BaseDraggingActivity extends BaseActivity
         }
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mOnResumeCallbacks.executeAllAndClear();
+    }
+
+    public void addOnResumeCallback(Runnable callback) {
+        mOnResumeCallbacks.add(callback);
+    }
+
     @Override
     public void onExtractedColorsChanged(WallpaperColorInfo wallpaperColorInfo) {
         updateTheme();
@@ -149,20 +164,35 @@ public abstract class BaseDraggingActivity extends BaseActivity
         return new Rect(pos[0], pos[1], pos[0] + v.getWidth(), pos[1] + v.getHeight());
     }
 
-    public final Bundle getActivityLaunchOptionsAsBundle(View v) {
-        ActivityOptions activityOptions = getActivityLaunchOptions(v);
-        return activityOptions == null ? null : activityOptions.toBundle();
+    @NonNull
+    public ActivityOptionsWrapper getActivityLaunchOptions(View v) {
+        int left = 0, top = 0;
+        int width = v.getMeasuredWidth(), height = v.getMeasuredHeight();
+        if (v instanceof BubbleTextView) {
+            // Launch from center of icon, not entire view
+            Drawable icon = ((BubbleTextView) v).getIcon();
+            if (icon != null) {
+                Rect bounds = icon.getBounds();
+                left = (width - bounds.width()) / 2;
+                top = v.getPaddingTop();
+                width = bounds.width();
+                height = bounds.height();
+            }
+        }
+        ActivityOptions options =
+                ActivityOptions.makeClipRevealAnimation(v, left, top, width, height);
+        RunnableList callback = new RunnableList();
+        addOnResumeCallback(callback::executeAllAndDestroy);
+        return new ActivityOptionsWrapper(options, callback);
     }
 
-    public abstract ActivityOptions getActivityLaunchOptions(View v);
-
     public boolean startActivitySafely(View v, Intent intent, @Nullable ItemInfo item) {
         if (mIsSafeModeEnabled && !PackageManagerHelper.isSystemApp(this, intent)) {
             Toast.makeText(this, R.string.safemode_shortcut_error, Toast.LENGTH_SHORT).show();
             return false;
         }
 
-        Bundle optsBundle = (v != null) ? getActivityLaunchOptionsAsBundle(v) : null;
+        Bundle optsBundle = (v != null) ? getActivityLaunchOptions(v).toBundle() : null;
         UserHandle user = item == null ? null : item.user;
 
         // Prepare intent
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index e0be6de793..2b58fb6adf 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -50,7 +50,6 @@ import android.widget.TextView;
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 
-import com.android.launcher3.Launcher.OnResumeCallback;
 import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.dot.DotInfo;
@@ -81,7 +80,7 @@ import java.text.NumberFormat;
  * because we want to make the bubble taller than the text and TextView's clip is
  * too aggressive.
  */
-public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, OnResumeCallback,
+public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         IconLabelDotView, DraggableView, Reorderable {
 
     private static final int DISPLAY_WORKSPACE = 0;
@@ -431,13 +430,6 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         }
     }
 
-    @Override
-    public void onLauncherResume() {
-        // Reset the pressed state of icon that was locked in the press state while activity
-        // was launching
-        setStayPressed(false);
-    }
-
     void clearPressedBackground() {
         setPressed(false);
         setStayPressed(false);
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 78e6f68b2f..1546ee3572 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -61,7 +61,6 @@ import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.annotation.TargetApi;
-import android.app.ActivityOptions;
 import android.appwidget.AppWidgetHostView;
 import android.appwidget.AppWidgetManager;
 import android.content.ActivityNotFoundException;
@@ -276,7 +275,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
     private static final int THEME_CROSS_FADE_ANIMATION_DURATION = 375;
 
-    private LauncherAppTransitionManager mAppTransitionManager;
     private Configuration mOldConfig;
 
     private LiveSearchManager mLiveSearchManager;
@@ -312,8 +310,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     @Thunk
     boolean mWorkspaceLoading = true;
 
-    private ArrayList<OnResumeCallback> mOnResumeCallbacks = new ArrayList<>();
-
     // Used to notify when an activity launch has been deferred because launcher is not yet resumed
     // TODO: See if we can remove this later
     private Runnable mOnDeferredActivityLaunchCallback;
@@ -419,9 +415,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         crossFadeWithPreviousAppearance();
         mPopupDataProvider = new PopupDataProvider(this::updateNotificationDots);
 
-        mAppTransitionManager = LauncherAppTransitionManager.newInstance(this);
-        mAppTransitionManager.registerRemoteAnimations();
-
         boolean internalStateHandled = ACTIVITY_TRACKER.handleCreate(this);
         if (internalStateHandled) {
             if (savedInstanceState != null) {
@@ -1090,15 +1083,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
                 TraceHelper.FLAG_UI_EVENT);
         super.onResume();
 
-        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();
-        }
-
         if (mDeferOverlayCallbacks) {
             scheduleDeferredCheck();
         } else {
@@ -1609,7 +1593,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         LauncherAppState.getIDP(this).removeOnChangeListener(this);
 
         mOverlayManager.onActivityDestroyed(this);
-        mAppTransitionManager.onActivityDestroyed();
         mUserChangedCallbackCloseable.close();
         mLiveSearchManager.stop();
     }
@@ -1933,16 +1916,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         }
     }
 
-    @TargetApi(Build.VERSION_CODES.M)
-    @Override
-    public ActivityOptions getActivityLaunchOptions(View v) {
-        return mAppTransitionManager.getActivityLaunchOptions(this, v);
-    }
-
-    public LauncherAppTransitionManager getAppTransitionManager() {
-        return mAppTransitionManager;
-    }
-
     @TargetApi(Build.VERSION_CODES.M)
     @Override
     protected boolean onErrorStartingShortcut(Intent intent, ItemInfo info) {
@@ -1993,7 +1966,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
             // state when we return to launcher.
             BubbleTextView btv = (BubbleTextView) v;
             btv.setStayPressed(true);
-            addOnResumeCallback(btv);
+            addOnResumeCallback(() -> btv.setStayPressed(false));
         }
         return success;
     }
@@ -2037,10 +2010,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         return result;
     }
 
-    public void addOnResumeCallback(OnResumeCallback callback) {
-        mOnResumeCallbacks.add(callback);
-    }
-
     /**
      * Persistant callback which notifies when an activity launch is deferred because the activity
      * was not yet resumed.
@@ -2814,15 +2783,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         return (T) activityContext;
     }
 
-
-    /**
-     * Callback for listening for onResume
-     */
-    public interface OnResumeCallback {
-
-        void onLauncherResume();
-    }
-
     /**
      * Cross-fades the launcher's updated appearance with its previous appearance.
      *
@@ -2865,6 +2825,10 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         return false;
     }
 
+    public boolean supportsAdaptiveIconAnimation(View clickedView) {
+        return false;
+    }
+
     public DragOptions getDefaultWorkspaceDragOptions() {
         return new DragOptions();
     }
diff --git a/src/com/android/launcher3/LauncherAppTransitionManager.java b/src/com/android/launcher3/LauncherAppTransitionManager.java
deleted file mode 100644
index d0bf577da2..0000000000
--- a/src/com/android/launcher3/LauncherAppTransitionManager.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3;
-
-import android.app.ActivityOptions;
-import android.content.Context;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.view.View;
-
-import com.android.launcher3.util.ResourceBasedOverride;
-
-/**
- * Manages the opening and closing app transitions from Launcher.
- */
-public class LauncherAppTransitionManager implements ResourceBasedOverride {
-
-    public static LauncherAppTransitionManager newInstance(Context context) {
-        return Overrides.getObject(LauncherAppTransitionManager.class,
-                context, R.string.app_transition_manager_class);
-    }
-
-    public ActivityOptions getActivityLaunchOptions(Launcher launcher, View v) {
-        int left = 0, top = 0;
-        int width = v.getMeasuredWidth(), height = v.getMeasuredHeight();
-        if (v instanceof BubbleTextView) {
-            // Launch from center of icon, not entire view
-            Drawable icon = ((BubbleTextView) v).getIcon();
-            if (icon != null) {
-                Rect bounds = icon.getBounds();
-                left = (width - bounds.width()) / 2;
-                top = v.getPaddingTop();
-                width = bounds.width();
-                height = bounds.height();
-            }
-        }
-        return ActivityOptions.makeClipRevealAnimation(v, left, top, width, height);
-    }
-
-    public boolean supportsAdaptiveIconAnimation(View clickedView) {
-        return false;
-    }
-
-    /**
-     * Registers remote animations for certain system transitions.
-     */
-    public void registerRemoteAnimations() {
-        // Do nothing
-    }
-
-    /**
-     * Handles clean up when activity is destroyed.
-     */
-    public void onActivityDestroyed() {
-        // Do nothing
-    }
-
-    /**
-     * Unregisters all remote animations.
-     */
-    public void unregisterRemoteAnimations() {
-        // Do nothing
-    }
-
-    /**
-     * Registers remote transitions for certain system transitions.
-     */
-    public void registerRemoteTransitions() {
-        // Do nothing
-    }
-
-    /**
-     * Unregisters all remote transitions.
-     */
-    public void unregisterRemoteTransitions() {
-        // Do nothing
-    }
-}
diff --git a/src/com/android/launcher3/SecondaryDropTarget.java b/src/com/android/launcher3/SecondaryDropTarget.java
index 4fd87cbffd..8bc5ad0eb1 100644
--- a/src/com/android/launcher3/SecondaryDropTarget.java
+++ b/src/com/android/launcher3/SecondaryDropTarget.java
@@ -33,7 +33,6 @@ import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
 
-import com.android.launcher3.Launcher.OnResumeCallback;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.logging.FileLog;
@@ -228,7 +227,7 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList
             DeferredOnComplete deferred = (DeferredOnComplete) d.dragSource;
             if (target != null) {
                 deferred.mPackageName = target.getPackageName();
-                mLauncher.addOnResumeCallback(deferred);
+                mLauncher.addOnResumeCallback(deferred::onLauncherResume);
             } else {
                 deferred.sendFailure();
             }
@@ -311,7 +310,7 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList
      * A wrapper around {@link DragSource} which delays the {@link #onDropCompleted} action until
      * {@link #onLauncherResume}
      */
-    private class DeferredOnComplete implements DragSource, OnResumeCallback {
+    private class DeferredOnComplete implements DragSource {
 
         private final DragSource mOriginal;
         private final Context mContext;
@@ -330,7 +329,6 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList
             mDragObject = d;
         }
 
-        @Override
         public void onLauncherResume() {
             // We use MATCH_UNINSTALLED_PACKAGES as the app can be on SD card as well.
             if (new PackageManagerHelper(mContext).getApplicationInfo(mPackageName,
diff --git a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
index 0e8d4aea87..f5e74b7168 100644
--- a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
+++ b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
@@ -17,7 +17,6 @@ package com.android.launcher3.secondarydisplay;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
-import android.app.ActivityOptions;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
@@ -167,11 +166,6 @@ public class SecondaryDisplayLauncher extends BaseDraggingActivity
         return mDragLayer;
     }
 
-    @Override
-    public ActivityOptions getActivityLaunchOptions(View v) {
-        return null;
-    }
-
     @Override
     protected void reapplyUi() { }
 
diff --git a/src/com/android/launcher3/touch/ItemClickHandler.java b/src/com/android/launcher3/touch/ItemClickHandler.java
index 61bd30a6fd..2e54904267 100644
--- a/src/com/android/launcher3/touch/ItemClickHandler.java
+++ b/src/com/android/launcher3/touch/ItemClickHandler.java
@@ -180,7 +180,7 @@ public class ItemClickHandler {
                 LauncherApps launcherApps = launcher.getSystemService(LauncherApps.class);
                 try {
                     launcherApps.startPackageInstallerSessionDetailsActivity(sessionInfo, null,
-                            launcher.getActivityLaunchOptionsAsBundle(v));
+                            launcher.getActivityLaunchOptions(v).toBundle());
                     return;
                 } catch (Exception e) {
                     Log.e(TAG, "Unable to launch market intent for package=" + packageName, e);
@@ -304,7 +304,7 @@ public class ItemClickHandler {
                 intent.setPackage(null);
             }
         }
-        if (v != null && launcher.getAppTransitionManager().supportsAdaptiveIconAnimation(v)) {
+        if (v != null && launcher.supportsAdaptiveIconAnimation(v)) {
             // Preload the icon to reduce latency b/w swapping the floating view with the original.
             FloatingIconView.fetchIcon(launcher, v, item, true /* isOpening */);
         }
diff --git a/src/com/android/launcher3/util/ActivityOptionsWrapper.java b/src/com/android/launcher3/util/ActivityOptionsWrapper.java
new file mode 100644
index 0000000000..99cc1f7b6c
--- /dev/null
+++ b/src/com/android/launcher3/util/ActivityOptionsWrapper.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.util;
+
+
+import android.app.ActivityOptions;
+import android.os.Bundle;
+
+/**
+ * A wrapper around {@link ActivityOptions} to allow custom functionality in launcher
+ */
+public class ActivityOptionsWrapper {
+
+    public final ActivityOptions options;
+    public final RunnableList onEndCallback;
+
+    public ActivityOptionsWrapper(ActivityOptions options, RunnableList onEndCallback) {
+        this.options = options;
+        this.onEndCallback = onEndCallback;
+    }
+
+    /**
+     * @see {@link ActivityOptions#toBundle()}
+     */
+    public Bundle toBundle() {
+        return options.toBundle();
+    }
+}
diff --git a/src/com/android/launcher3/util/RunnableList.java b/src/com/android/launcher3/util/RunnableList.java
new file mode 100644
index 0000000000..55add14479
--- /dev/null
+++ b/src/com/android/launcher3/util/RunnableList.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.util;
+
+import java.util.ArrayList;
+
+/**
+ * Utility class to hold a list of runnable
+ */
+public class RunnableList {
+
+    private ArrayList<Runnable> mList = null;
+    private boolean mDestroyed = false;
+
+    /**
+     * Ads a runnable to this list
+     */
+    public void add(Runnable runnable) {
+        if (mDestroyed) {
+            runnable.run();
+            return;
+        }
+        if (mList == null) {
+            mList = new ArrayList<>();
+        }
+        mList.add(runnable);
+    }
+
+    /**
+     * Destroys the list, executing any pending callbacks. All new callbacks are
+     * immediately executed
+     */
+    public void executeAllAndDestroy() {
+        mDestroyed = true;
+        executeAllAndClear();
+    }
+
+    /**
+     * Executes all previously added runnable and clears the list
+     */
+    public void executeAllAndClear() {
+        if (mList != null) {
+            ArrayList<Runnable> list = mList;
+            mList = null;
+            int count = list.size();
+            for (int i = 0; i < count; i++) {
+                list.get(i).run();
+            }
+        }
+    }
+}
-- 
GitLab


From 7468ff8bcc948a0a0c0b2de6fa1201cbdc420dcb Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pbdr@google.com>
Date: Wed, 10 Mar 2021 20:57:01 +0000
Subject: [PATCH 0646/1664] Adding new team members working on the launcher

Merged-In: I21dcf7fa78522826ae78db9cf8bdd72f8c8a6eca
Test: N/A
Bug: 182399964
Change-Id: I2f737cba83bde213b8712f3e288ea3f5ead4f001
---
 OWNERS | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/OWNERS b/OWNERS
index 1d6ad8cf8d..a9dae6f480 100644
--- a/OWNERS
+++ b/OWNERS
@@ -4,6 +4,12 @@
 # People who can approve changes for submission
 #
 
+petrcermak@google.com
+pbdr@google.com
+kideckel@google.com
+stevenckng@google.com
+ydixit@google.com
+boadway@google.com
 adamcohen@google.com
 hyunyoungs@google.com
 mrcasey@google.com
-- 
GitLab


From acc6336fcdc5cb4bd94ee70bcff02abd22ebf779 Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pbdr@google.com>
Date: Thu, 11 Mar 2021 11:05:50 +0000
Subject: [PATCH 0647/1664] Adding alinazaidi@ in Launcher3's OWNERS

For some reason, I was unable to do it with others in the CL.

Note: This is a merge from AOSP.

Test: N/A
Merged-In: I02596028dd15e1fdbe255b954bd39f4c3bb005e2
Change-Id: I70172726b6aae7c7b210e4b3210d34dc1c503c06
Bug: 182399964
---
 OWNERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OWNERS b/OWNERS
index a9dae6f480..daad057841 100644
--- a/OWNERS
+++ b/OWNERS
@@ -10,6 +10,7 @@ kideckel@google.com
 stevenckng@google.com
 ydixit@google.com
 boadway@google.com
+alinazaidi@google.com
 adamcohen@google.com
 hyunyoungs@google.com
 mrcasey@google.com
-- 
GitLab


From 84140bec6d30071fa6ae0ebf01268ec507695915 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Thu, 11 Mar 2021 08:48:27 -0800
Subject: [PATCH 0648/1664] Disable double haptic when dragging from taskbar
 hotseat on home

Both DragLayer and the dragged view were playing a haptic; disable
DragLayer's haptic feedback for this drag interaction.

Test: Drag from hotseat on home, ensure only one haptic is played
Bug: 182079330
Bug: 171917176
Change-Id: I185533999e905ea79a80aaa2145fc39049e8d45e
---
 .../src/com/android/launcher3/taskbar/TaskbarDragListener.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragListener.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragListener.java
index 9d203fbe76..dc27df1909 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragListener.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragListener.java
@@ -56,11 +56,14 @@ public class TaskbarDragListener implements View.OnDragListener {
     protected void init(DragLayer dragLayer) {
         mDragLayer = dragLayer;
         mDragLayer.setOnDragListener(this);
+        // Temporarily disable haptics, as system will already play one when drag and drop starts.
+        mDragLayer.setHapticFeedbackEnabled(false);
     }
 
     private void cleanup() {
         mDragLayer.setOnDragListener(null);
         mLauncher.setNextWorkspaceDragOptions(null);
+        mDragLayer.setHapticFeedbackEnabled(true);
     }
 
     /**
-- 
GitLab


From 20a7cfbd3c96c328ba0346d7ab7aa0256c3a6bf6 Mon Sep 17 00:00:00 2001
From: Hilary Huo <hhuo@google.com>
Date: Tue, 9 Mar 2021 16:11:28 -0800
Subject: [PATCH 0649/1664] [settings-pixel-search] Add slice timeout to avoid
 showing empty slice view

Bug: 181810946

Test: m
Change-Id: Icd83bbf428bf7d87e3957a6f6d888142c6008da3
---
 .../search/DefaultSearchAdapterProvider.java  |  6 +++
 .../allapps/search/LiveSearchManager.java     | 45 +++++++++++++++++--
 .../allapps/search/SearchAdapterProvider.java |  6 +++
 3 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/allapps/search/DefaultSearchAdapterProvider.java b/src/com/android/launcher3/allapps/search/DefaultSearchAdapterProvider.java
index 330ec6806b..e268f567ae 100644
--- a/src/com/android/launcher3/allapps/search/DefaultSearchAdapterProvider.java
+++ b/src/com/android/launcher3/allapps/search/DefaultSearchAdapterProvider.java
@@ -15,6 +15,7 @@
  */
 package com.android.launcher3.allapps.search;
 
+import android.net.Uri;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -36,6 +37,11 @@ public class DefaultSearchAdapterProvider extends SearchAdapterProvider {
 
     }
 
+    @Override
+    public void onSliceStatusUpdate(Uri sliceUri) {
+
+    }
+
     @Override
     public boolean isSearchView(int viewType) {
         return false;
diff --git a/src/com/android/launcher3/allapps/search/LiveSearchManager.java b/src/com/android/launcher3/allapps/search/LiveSearchManager.java
index 76099a6478..adb882a90a 100644
--- a/src/com/android/launcher3/allapps/search/LiveSearchManager.java
+++ b/src/com/android/launcher3/allapps/search/LiveSearchManager.java
@@ -42,6 +42,7 @@ import androidx.slice.Slice;
 import androidx.slice.SliceViewManager;
 import androidx.slice.SliceViewManager.SliceCallback;
 
+import com.android.launcher3.Alarm;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.statemanager.StateManager.StateListener;
@@ -52,6 +53,7 @@ import com.android.launcher3.widget.PendingAddWidgetInfo;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.function.Consumer;
 
 /**
  * Manages Lifecycle for Live search results
@@ -60,6 +62,7 @@ public class LiveSearchManager implements StateListener<LauncherState> {
 
     private static final String TAG = "LiveSearchManager";
 
+    private static final long SLICE_TIMEOUT_MS = 50;
     public static final int SEARCH_APPWIDGET_HOST_ID = 2048;
 
     private final Launcher mLauncher;
@@ -144,16 +147,50 @@ public class LiveSearchManager implements StateListener<LauncherState> {
     /**
      * Adds a new observer for the provided uri and returns a callback to cancel this observer
      */
-    public SafeCloseable addObserver(Uri uri, Observer<Slice> listener) {
+    public SafeCloseable addObserver(Uri uri, Observer<Slice> listener,
+            Consumer<Uri> timeoutConsumer) {
         SliceLifeCycle slc = mUriSliceMap.get(uri);
         if (slc == null) {
             slc = new SliceLifeCycle(uri, mLauncher);
             mUriSliceMap.put(uri, slc);
         }
-        slc.addListener(listener);
+        if (slc.mLastValue != null) {
+            listener.onChanged(slc.mLastValue);
+        }
+
+        // Use a listener wrapper to handle error timeout.
+        Observer<Slice> listenerWrapper = new Observer<Slice>() {
+            final Alarm mErrorTimeout = new Alarm();
+            {
+                mErrorTimeout.setOnAlarmListener(alarm -> {
+                    alarm.cancelAlarm();
+                    timeoutConsumer.accept(uri);
+                });
+                mErrorTimeout.setAlarm(SLICE_TIMEOUT_MS);
+            }
+
+            @Override
+            public void onChanged(Slice slice) {
+                if (slice == null) {
+                    return;
+                }
+
+                if (mErrorTimeout.alarmPending()) {
+                    mErrorTimeout.cancelAlarm();
+                }
+
+                if (mUriSliceMap.get(uri) != null) {
+                    mUriSliceMap.get(uri).mLastValue = slice;
+                }
+
+                listener.onChanged(slice);
+            }
+        };
+
+        slc.addListener(listenerWrapper);
 
         final SliceLifeCycle sliceLifeCycle = slc;
-        return () -> sliceLifeCycle.removeListener(listener);
+        return () -> sliceLifeCycle.removeListener(listenerWrapper);
     }
 
     static class SearchWidgetHost extends AppWidgetHost {
@@ -184,6 +221,8 @@ public class LiveSearchManager implements StateListener<LauncherState> {
         private boolean mDestroyed = false;
         private boolean mWasListening = false;
 
+        Slice mLastValue;
+
         SliceLifeCycle(Uri uri, Launcher launcher) {
             mUri = uri;
             mLauncher = launcher;
diff --git a/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java b/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
index fdacd3d2d9..0864090ade 100644
--- a/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
+++ b/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
@@ -16,6 +16,7 @@
 
 package com.android.launcher3.allapps.search;
 
+import android.net.Uri;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -39,6 +40,11 @@ public abstract class SearchAdapterProvider {
      */
     public abstract void onBindView(AllAppsGridAdapter.ViewHolder holder, int position);
 
+    /**
+     * Called from LiveSearchManager to notify slice status updates.
+     */
+    public abstract void onSliceStatusUpdate(Uri sliceUri);
+
     /**
      * Returns whether or not viewType can be handled by searchProvider
      */
-- 
GitLab


From 26c1f3b13904f603dcf60d37cc5c88c04e5fb6e5 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Wed, 10 Mar 2021 11:55:33 +0000
Subject: [PATCH 0650/1664] Calculate grid layout size separately from task
 size

- Add translation to align task into top right/left corner of grid rect
- Also updated grid padding according to mocks

Bug: 174464863
Test: Launch overview, launch overview from app, launch into app
Change-Id: Ie856f9c43ebf35f5e58b5d125ff1754ad7bc0160
---
 quickstep/res/values/dimens.xml               |  6 +-
 .../quickstep/BaseActivityInterface.java      | 15 +++++
 .../quickstep/util/TaskViewSimulator.java     | 32 ++++++----
 .../android/quickstep/views/RecentsView.java  | 59 ++++++++++---------
 4 files changed, 73 insertions(+), 39 deletions(-)

diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 9773366247..43ea42ab34 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -29,7 +29,11 @@
     <dimen name="overview_actions_bottom_margin_three_button">8dp</dimen>
     <dimen name="overview_actions_horizontal_margin">16dp</dimen>
 
-    <dimen name="recents_row_spacing">48dp</dimen>
+    <dimen name="overview_grid_top_margin">77dp</dimen>
+    <dimen name="overview_grid_bottom_margin">90dp</dimen>
+    <dimen name="overview_grid_side_margin">54dp</dimen>
+    <dimen name="overview_grid_row_spacing">42dp</dimen>
+
     <dimen name="recents_page_spacing">16dp</dimen>
     <dimen name="recents_clear_all_deadzone_vertical_margin">70dp</dimen>
 
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index ce14197c2e..7a144ba4ba 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -257,6 +257,21 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
                 Math.round(x) + Math.round(outWidth), Math.round(y) + Math.round(outHeight));
     }
 
+    /**
+     * Calculates the overview grid size for the provided device configuration.
+     */
+    public final void calculateGridSize(Context context, DeviceProfile dp, Rect outRect) {
+        Resources res = context.getResources();
+        int topMargin = res.getDimensionPixelSize(R.dimen.overview_grid_top_margin);
+        int bottomMargin = res.getDimensionPixelSize(R.dimen.overview_grid_bottom_margin);
+        int sideMargin = res.getDimensionPixelSize(R.dimen.overview_grid_side_margin);
+
+        Rect insets = dp.getInsets();
+        outRect.set(0, 0, dp.widthPx, dp.heightPx);
+        outRect.inset(Math.max(insets.left, sideMargin), Math.max(insets.top, topMargin),
+                Math.max(insets.right, sideMargin), Math.max(insets.bottom, bottomMargin));
+    }
+
     /**
      * Calculates the modal taskView size for the provided device configuration
      */
diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index 9537247295..df1229ba05 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -79,6 +79,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
     private final boolean mIsRecentsRtl;
 
     private final Rect mTaskRect = new Rect();
+    private final Rect mGridRect = new Rect();
     private boolean mDrawsBelowRecents;
     private final PointF mPivot = new PointF();
     private DeviceProfile mDp;
@@ -124,7 +125,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
         Resources resources = context.getResources();
         mIsRecentsRtl = mOrientationState.getOrientationHandler().getRecentsRtlSetting(resources);
         mTaskThumbnailPadding = (int) resources.getDimension(R.dimen.task_thumbnail_top_margin);
-        mRowSpacing = (int) resources.getDimension(R.dimen.recents_row_spacing);
+        mRowSpacing = (int) resources.getDimension(R.dimen.overview_grid_row_spacing);
     }
 
     /**
@@ -266,6 +267,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
             mOrientationStateId = mOrientationState.getStateId();
 
             getFullScreenScale();
+            mSizeStrategy.calculateGridSize(mContext, mDp, mGridRect);
             mThumbnailData.rotation = mOrientationState.getDisplayRotation();
 
             mPositionHelper.updateThumbnailMatrix(
@@ -304,24 +306,34 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
         mMatrix.postTranslate(insets.left, insets.top);
         mMatrix.postScale(scale, scale);
 
+        // Apply TaskView matrix: gridProgress related properties
         float interpolatedGridProgress = ACCEL_DEACCEL.getInterpolation(gridProgress.value);
-
-        // Apply TaskView matrix: gridProgress
         final int boxLength = (int) Math.max(taskWidth, taskHeight);
-        float availableHeight =
-                mTaskThumbnailPadding + taskHeight + mSizeStrategy.getOverviewActionsHeight(
-                        mContext);
+        float availableHeight = mGridRect.height();
         float rowHeight = (availableHeight - mRowSpacing) / 2;
         float gridScale = rowHeight / (boxLength + mTaskThumbnailPadding);
         scale = Utilities.mapRange(interpolatedGridProgress, 1f, gridScale);
         mMatrix.postScale(scale, scale, mIsRecentsRtl ? 0 : taskWidth, 0);
-        float taskWidthDiff = taskWidth * (1 - gridScale);
-        float taskWidthOffset = mIsRecentsRtl ? taskWidthDiff : -taskWidthDiff;
-        mOrientationState.getOrientationHandler().set(mMatrix, MATRIX_POST_TRANSLATE,
-                Utilities.mapRange(interpolatedGridProgress, 0, taskWidthOffset));
         mOrientationState.getOrientationHandler().setSecondary(mMatrix, MATRIX_POST_TRANSLATE,
                 Utilities.mapRange(interpolatedGridProgress, 0, gridTranslationSecondary.value));
 
+        // Apply TaskView matrix: task rect and grid rect difference
+        float scaledWidth = taskWidth * gridScale;
+        float taskGridHorizontalDiff;
+        if (mIsRecentsRtl) {
+            float taskRight = mTaskRect.left + scaledWidth;
+            taskGridHorizontalDiff = mGridRect.right - taskRight;
+        } else {
+            float taskLeft = mTaskRect.right - scaledWidth;
+            taskGridHorizontalDiff = mGridRect.left - taskLeft;
+        }
+        float taskGridVerticalDiff =
+                mGridRect.top + mTaskThumbnailPadding * gridScale - mTaskRect.top;
+        mOrientationState.getOrientationHandler().set(mMatrix, MATRIX_POST_TRANSLATE,
+                Utilities.mapRange(interpolatedGridProgress, 0, taskGridHorizontalDiff));
+        mOrientationState.getOrientationHandler().setSecondary(mMatrix, MATRIX_POST_TRANSLATE,
+                Utilities.mapRange(interpolatedGridProgress, 0, taskGridVerticalDiff));
+
         // Apply TaskView matrix: translate, scroll
         mMatrix.postTranslate(mTaskRect.left, mTaskRect.top);
         mOrientationState.getOrientationHandler().set(mMatrix, MATRIX_POST_TRANSLATE,
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index efe1f753e0..117c88e76f 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -264,6 +264,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     protected final TransformParams mLiveTileParams = new TransformParams();
     protected final TaskViewSimulator mLiveTileTaskViewSimulator;
     protected final Rect mLastComputedTaskSize = new Rect();
+    protected final Rect mLastComputedGridSize = new Rect();
     // How much a task that is directly offscreen will be pushed out due to RecentsView scale/pivot.
     protected Float mLastComputedTaskPushOutDistance = null;
     protected boolean mEnableDrawingLiveTile = false;
@@ -471,7 +472,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         setLayoutDirection(mIsRtl ? View.LAYOUT_DIRECTION_RTL : View.LAYOUT_DIRECTION_LTR);
         mTaskTopMargin = getResources()
                 .getDimensionPixelSize(R.dimen.task_thumbnail_top_margin);
-        mRowSpacing = (int) getResources().getDimension(R.dimen.recents_row_spacing);
+        mRowSpacing = getResources().getDimensionPixelSize(R.dimen.overview_grid_row_spacing);
         mSquaredTouchSlop = squaredTouchSlop(context);
 
         mEmptyIcon = context.getDrawable(R.drawable.ic_empty_recents);
@@ -1012,6 +1013,10 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         setPadding(mTempRect.left - mInsets.left, mTempRect.top - mInsets.top,
                 dp.widthPx - mInsets.right - mTempRect.right,
                 dp.heightPx - mInsets.bottom - mTempRect.bottom);
+
+        mSizeStrategy.calculateGridSize(mActivity, mActivity.getDeviceProfile(),
+                mLastComputedGridSize);
+
         // Force TaskView to update size from thumbnail
         updateTaskSize();
     }
@@ -1521,22 +1526,10 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         }
 
         final int boxLength = Math.max(mTaskWidth, mTaskHeight);
-
-        float availableHeight =
-                mTaskTopMargin + mTaskHeight + mSizeStrategy.getOverviewActionsHeight(mContext);
+        float availableHeight = mLastComputedGridSize.height();
         float rowHeight = (availableHeight - mRowSpacing) / 2;
         float gridScale = rowHeight / (boxLength + mTaskTopMargin);
 
-        TaskView firstTask = getTaskViewAt(0);
-        float firstTaskWidthOffset;
-        if (mIsRtl) {
-            // Move the first task to the right edge.
-            firstTaskWidthOffset = mTaskWidth - firstTask.getLayoutParams().width * gridScale;
-        } else {
-            // Move the first task to the left edge.
-            firstTaskWidthOffset = -firstTask.getLayoutParams().width * (1 - gridScale);
-        }
-
         int topRowWidth = 0;
         int bottomRowWidth = 0;
         float topAccumulatedTranslationX = 0;
@@ -1546,13 +1539,22 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         for (int i = 0; i < taskCount; i++) {
             TaskView taskView = getTaskViewAt(i);
             taskView.setGridScale(gridScale);
+            gridTranslations[i] = 0;
+
+            float scaledWidth = taskView.getLayoutParams().width * gridScale;
+            float taskGridHorizontalDiff;
+            if (mIsRtl) {
+                float taskRight = mLastComputedTaskSize.left + scaledWidth;
+                taskGridHorizontalDiff = mLastComputedGridSize.right - taskRight;
+            } else {
+                float taskLeft = mLastComputedTaskSize.right - scaledWidth;
+                taskGridHorizontalDiff = mLastComputedGridSize.left - taskLeft;
+            }
+            gridTranslations[i] -= taskGridHorizontalDiff;
+            taskView.setGridOffsetTranslationX(taskGridHorizontalDiff);
 
-            float taskWidthDiff = mTaskWidth - taskView.getLayoutParams().width * gridScale;
-            float taskWidthOffset = mIsRtl ? taskWidthDiff : -taskWidthDiff;
-            // Visually we want to move all task by firstTaskWidthOffset, but calculate page scroll
-            // according to right edge (or left in nonRtl) of TaskView.
-            gridTranslations[i] = firstTaskWidthOffset - taskWidthOffset;
-            taskView.setGridOffsetTranslationX(taskWidthOffset);
+            float taskGridVerticalDiff = mLastComputedGridSize.top + mTaskTopMargin * gridScale
+                    - mLastComputedTaskSize.top;
 
             // Off-set gap due to task scaling.
             float widthDiff = taskView.getLayoutParams().width * (1 - gridScale);
@@ -1567,7 +1569,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                 topRowWidth += taskView.getLayoutParams().width * gridScale + mPageSpacing;
                 topSet.add(i);
 
-                taskView.setGridTranslationY(0);
+                taskView.setGridTranslationY(taskGridVerticalDiff);
 
                 // Move horizontally into empty space.
                 float widthOffset = 0;
@@ -1578,15 +1580,14 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
 
                 float gridTranslationX = mIsRtl ? widthOffset : -widthOffset;
                 gridTranslations[i] += gridTranslationX;
-                topAccumulatedTranslationX += gridTranslationX + gridScaleTranslationX;
-                bottomAccumulatedTranslationX += gridScaleTranslationX;
+                topAccumulatedTranslationX += gridTranslationX;
             } else {
                 gridTranslations[i] += bottomAccumulatedTranslationX;
                 bottomRowWidth += taskView.getLayoutParams().width * gridScale + mPageSpacing;
 
                 // Move into bottom row.
                 float heightOffset = (boxLength + mTaskTopMargin) * gridScale + mRowSpacing;
-                taskView.setGridTranslationY(heightOffset);
+                taskView.setGridTranslationY(heightOffset + taskGridVerticalDiff);
 
                 // Move horizontally into empty space.
                 float widthOffset = 0;
@@ -1597,9 +1598,10 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
 
                 float gridTranslationX = mIsRtl ? widthOffset : -widthOffset;
                 gridTranslations[i] += gridTranslationX;
-                topAccumulatedTranslationX += gridScaleTranslationX;
-                bottomAccumulatedTranslationX += gridTranslationX + gridScaleTranslationX;
+                bottomAccumulatedTranslationX += gridTranslationX;
             }
+            topAccumulatedTranslationX += gridScaleTranslationX;
+            bottomAccumulatedTranslationX += gridScaleTranslationX;
         }
 
         // Use the accumulated translation of the longer row.
@@ -1632,8 +1634,9 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                     mIsRtl ? -shortTotalCompensation : shortTotalCompensation;
         }
 
-        float clearAllTotalTranslationX = firstTaskWidthOffset + clearAllAccumulatedTranslation
-                + clearAllShorterRowCompensation + clearAllShortTotalCompensation;
+        float clearAllTotalTranslationX =
+                clearAllAccumulatedTranslation + clearAllShorterRowCompensation
+                        + clearAllShortTotalCompensation;
 
         // We need to maintain first task's grid translation at 0, now shift translation of all
         // the TaskViews to achieve that.
-- 
GitLab


From 334e65935b6a16c366c8b9a003598fbd37519040 Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Thu, 11 Mar 2021 16:10:27 +0000
Subject: [PATCH 0651/1664] Have a recycler view to show search results.

-Have a recycler view layout for search widgets list.
-Make WidgetsFullSheet implement interface- SearchModeListener to get notified when user is using search and also when search results are ready.
-Have a WidgetsListSearchHeaderViewHolderBinder for search result headers which shows subtext in header as concatenated string of widget/shortcut labels.
-Modify WidgetsListAdapter and WidgetsDiffReporter to work well with search recycler view.

Test: Tested prototype locally. Also added robolectric test.
Bug: b/157286785
Change-Id: Ie29d9f295fddb6d727b5fc26a360f514f2f4a763
---
 res/layout/widgets_full_sheet.xml             |   8 +
 res/layout/widgets_list_row_header.xml        |   2 +
 res/values/id.xml                             |  21 +++
 .../picker/WidgetsDiffReporterTest.java       |  21 +++
 .../widget/picker/WidgetsListAdapterTest.java |  35 +++-
 ...WidgetsListHeaderViewHolderBinderTest.java |  49 +++--
 ...sListSearchHeaderViewHolderBinderTest.java | 171 ++++++++++++++++++
 .../widget/model/WidgetsListBaseEntry.java    |   5 +-
 .../widget/model/WidgetsListContentEntry.java |   2 +-
 .../widget/model/WidgetsListHeaderEntry.java  |  21 ++-
 .../model/WidgetsListSearchHeaderEntry.java   |  77 ++++++++
 .../widget/picker/OnHeaderClickListener.java  |  28 +++
 ...rchAndRecommendationsScrollController.java |   8 +
 .../widget/picker/WidgetsDiffReporter.java    |  17 +-
 .../widget/picker/WidgetsFullSheet.java       |  77 +++++++-
 .../widget/picker/WidgetsListAdapter.java     |  50 +++--
 .../widget/picker/WidgetsListHeader.java      |  31 +++-
 .../WidgetsListHeaderViewHolderBinder.java    |  12 +-
 .../picker/WidgetsListSearchHeaderHolder.java |  32 ++++
 ...dgetsListSearchHeaderViewHolderBinder.java |  59 ++++++
 .../picker/search/SearchModeListener.java     |  40 ++++
 21 files changed, 698 insertions(+), 68 deletions(-)
 create mode 100644 res/values/id.xml
 create mode 100644 robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinderTest.java
 create mode 100644 src/com/android/launcher3/widget/model/WidgetsListSearchHeaderEntry.java
 create mode 100644 src/com/android/launcher3/widget/picker/OnHeaderClickListener.java
 create mode 100644 src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderHolder.java
 create mode 100644 src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinder.java
 create mode 100644 src/com/android/launcher3/widget/picker/search/SearchModeListener.java

diff --git a/res/layout/widgets_full_sheet.xml b/res/layout/widgets_full_sheet.xml
index 6c18d7ac75..226c4f713a 100644
--- a/res/layout/widgets_full_sheet.xml
+++ b/res/layout/widgets_full_sheet.xml
@@ -51,5 +51,13 @@
             android:layout_alignParentEnd="true"
             android:layout_alignParentTop="true"
             android:layout_marginEnd="@dimen/fastscroll_end_margin" />
+
+        <com.android.launcher3.widget.picker.WidgetsRecyclerView
+            android:id="@+id/search_widgets_list_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            android:clipToPadding="false" />
+
     </com.android.launcher3.views.TopRoundedCornerView>
 </com.android.launcher3.widget.picker.WidgetsFullSheet>
\ No newline at end of file
diff --git a/res/layout/widgets_list_row_header.xml b/res/layout/widgets_list_row_header.xml
index 041e0073fd..21920a29f3 100644
--- a/res/layout/widgets_list_row_header.xml
+++ b/res/layout/widgets_list_row_header.xml
@@ -52,6 +52,8 @@
             android:id="@+id/app_subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
             tools:text="m widgets, n shortcuts" />
 
     </LinearLayout>
diff --git a/res/values/id.xml b/res/values/id.xml
new file mode 100644
index 0000000000..39c49bd5e1
--- /dev/null
+++ b/res/values/id.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2020 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<resources>
+    <item type="id" name="view_type_widgets_list" />
+    <item type="id" name="view_type_widgets_header" />
+    <item type="id" name="view_type_widgets_search_header" />
+</resources>
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsDiffReporterTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsDiffReporterTest.java
index b972c6ff0e..cc36f630c9 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsDiffReporterTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsDiffReporterTest.java
@@ -221,6 +221,27 @@ public final class WidgetsDiffReporterTest {
         assertThat(currentList).containsExactlyElementsIn(newList);
     }
 
+    @Test
+    public void headersContentsMix_headerWidgetsModified_shouldInvokeCorrectCallbacks() {
+        // GIVEN the current list has app headers [A, B, E content].
+        ArrayList<WidgetsListBaseEntry> currentList = new ArrayList<>(
+                List.of(mHeaderA, mHeaderB, mContentE));
+        // GIVEN the new list has one of the headers widgets list modified.
+        List<WidgetsListBaseEntry> newList = List.of(
+                new WidgetsListHeaderEntry(
+                        mHeaderA.mPkgItem, mHeaderA.mTitleSectionName,
+                        mHeaderA.mWidgets.subList(0, 1)),
+                mHeaderB, mContentE);
+
+        // WHEN computing the list difference.
+        mWidgetsDiffReporter.process(currentList, newList, COMPARATOR);
+
+        // THEN notify "A" has been changed.
+        verify(mAdapter).notifyItemChanged(/* position= */ 0);
+        // THEN the current list contains all elements from the new list.
+        assertThat(currentList).containsExactlyElementsIn(newList);
+    }
+
 
     private WidgetsListHeaderEntry createWidgetsHeaderEntry(String packageName, String appName,
             int numOfWidgets) {
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java
index a7c8d92f79..e1214ff39f 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java
@@ -26,6 +26,8 @@ import android.appwidget.AppWidgetProviderInfo;
 import android.content.ComponentName;
 import android.content.Context;
 import android.graphics.Bitmap;
+import android.os.Process;
+import android.os.UserHandle;
 import android.view.LayoutInflater;
 
 import androidx.recyclerview.widget.RecyclerView;
@@ -37,6 +39,7 @@ import com.android.launcher3.icons.ComponentWithLabel;
 import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.model.data.PackageItemInfo;
+import com.android.launcher3.util.PackageUserKey;
 import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 import com.android.launcher3.widget.model.WidgetsListContentEntry;
@@ -67,6 +70,7 @@ public final class WidgetsListAdapterTest {
 
     private WidgetsListAdapter mAdapter;
     private InvariantDeviceProfile mTestProfile;
+    private UserHandle mUserHandle;
     private Context mContext;
 
     @Before
@@ -76,6 +80,7 @@ public final class WidgetsListAdapterTest {
         mTestProfile = new InvariantDeviceProfile();
         mTestProfile.numRows = 5;
         mTestProfile.numColumns = 5;
+        mUserHandle = Process.myUserHandle();
         mAdapter = new WidgetsListAdapter(mContext, mMockLayoutInflater, mMockWidgetCache,
                 mIconCache, null, null);
         mAdapter.registerAdapterDataObserver(mListener);
@@ -126,7 +131,8 @@ public final class WidgetsListAdapterTest {
         mAdapter.setWidgets(generateSampleMap(3));
 
         // WHEN com.google.test.1 header is expanded.
-        mAdapter.onHeaderClicked(/* isExpanded= */ true, TEST_PACKAGE_PLACEHOLDER + 1);
+        mAdapter.onHeaderClicked(/* showWidgets= */ true,
+                new PackageUserKey(TEST_PACKAGE_PLACEHOLDER + 1, mUserHandle));
 
         // THEN the visible entries list becomes:
         // [com.google.test0, com.google.test1, com.google.test1 content, com.google.test2]
@@ -143,7 +149,8 @@ public final class WidgetsListAdapterTest {
         // GIVEN test com.google.test1 is expanded.
         // Visible entries in the adapter are:
         // [com.google.test0, com.google.test1, com.google.test1 content]
-        mAdapter.onHeaderClicked(/* isExpanded= */ true, TEST_PACKAGE_PLACEHOLDER + 1);
+        mAdapter.onHeaderClicked(/* showWidgets= */ true,
+                new PackageUserKey(TEST_PACKAGE_PLACEHOLDER + 1, mUserHandle));
         Mockito.reset(mListener);
 
         // WHEN the adapter is updated with the same list of apps but com.google.test1 has 2 widgets
@@ -200,6 +207,30 @@ public final class WidgetsListAdapterTest {
         verify(mListener).onItemRangeRemoved(/* positionStart= */ 3, /* itemCount= */ 1);
     }
 
+    @Test
+    public void setWidgetsOnSearch_expandedApp_shouldResetExpandedApp() {
+        // GIVEN a list of widgets entries:
+        // [com.google.test0, com.google.test0 content,
+        //  com.google.test1, com.google.test1 content,
+        //  com.google.test2, com.google.test2 content]
+        // The visible widgets entries: [com.google.test0, com.google.test1, com.google.test2].
+        ArrayList<WidgetsListBaseEntry> allEntries = generateSampleMap(2);
+        mAdapter.setWidgetsOnSearch(allEntries);
+        // GIVEN com.google.test.1 header is expanded. The visible entries list becomes:
+        // [com.google.test0, com.google.test1, com.google.test1 content, com.google.test2]
+        mAdapter.onHeaderClicked(/* showWidgets= */ true,
+                new PackageUserKey(TEST_PACKAGE_PLACEHOLDER + 1, mUserHandle));
+        Mockito.reset(mListener);
+
+        // WHEN same widget entries are set again.
+        mAdapter.setWidgetsOnSearch(allEntries);
+
+        // THEN expanded app is reset and the visible entries list becomes:
+        // [com.google.test0, com.google.test1, com.google.test2]
+        verify(mListener).onItemRangeChanged(eq(1), eq(1), isNull());
+        verify(mListener).onItemRangeRemoved(/* positionStart= */ 2, /* itemCount= */ 1);
+    }
+
     /**
      * Generates a list of sample widget entries.
      *
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java
index 848630ef5a..e8c11da2e7 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java
@@ -18,7 +18,9 @@ package com.android.launcher3.widget.picker;
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.verify;
 import static org.robolectric.Shadows.shadowOf;
 
 import android.appwidget.AppWidgetProviderInfo;
@@ -26,12 +28,9 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.view.LayoutInflater;
-import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
-import androidx.annotation.Nullable;
-
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.R;
@@ -41,10 +40,9 @@ import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.testing.TestActivity;
+import com.android.launcher3.util.PackageUserKey;
 import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
-import com.android.launcher3.widget.WidgetCell;
 import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
-import com.android.launcher3.widget.picker.WidgetsListHeaderViewHolderBinder.OnHeaderClickListener;
 
 import org.junit.After;
 import org.junit.Before;
@@ -74,12 +72,13 @@ public final class WidgetsListHeaderViewHolderBinderTest {
     // testing.
     private ActivityController<TestActivity> mActivityController;
     private TestActivity mTestActivity;
-    private FakeOnHeaderClickListener mFakeOnHeaderClickListener = new FakeOnHeaderClickListener();
 
     @Mock
     private IconCache mIconCache;
     @Mock
     private DeviceProfile mDeviceProfile;
+    @Mock
+    private OnHeaderClickListener mOnHeaderClickListener;
 
     @Before
     public void setUp() {
@@ -99,8 +98,7 @@ public final class WidgetsListHeaderViewHolderBinderTest {
         }).when(mIconCache).getTitleNoCache(any());
 
         mViewHolderBinder = new WidgetsListHeaderViewHolderBinder(
-                LayoutInflater.from(mTestActivity),
-                mFakeOnHeaderClickListener);
+                LayoutInflater.from(mTestActivity), mOnHeaderClickListener);
     }
 
     @After
@@ -125,6 +123,23 @@ public final class WidgetsListHeaderViewHolderBinderTest {
         assertThat(appSubtitle.getText()).isEqualTo("3 widgets");
     }
 
+    @Test
+    public void bindViewHolder_shouldAttachOnHeaderClickListener() {
+        WidgetsListHeaderHolder viewHolder = mViewHolderBinder.newViewHolder(
+                new FrameLayout(mTestActivity));
+        WidgetsListHeader widgetsListHeader = viewHolder.mWidgetsListHeader;
+        WidgetsListHeaderEntry entry = generateSampleAppHeader(
+                APP_NAME,
+                TEST_PACKAGE,
+                /* numOfWidgets= */ 3);
+
+        mViewHolderBinder.bindViewHolder(viewHolder, entry);
+        widgetsListHeader.callOnClick();
+
+        verify(mOnHeaderClickListener).onHeaderClicked(eq(true),
+                eq(new PackageUserKey(entry.mPkgItem.packageName, entry.mPkgItem.user)));
+    }
+
     private WidgetsListHeaderEntry generateSampleAppHeader(String appName, String packageName,
             int numOfWidgets) {
         PackageItemInfo appInfo = new PackageItemInfo(packageName);
@@ -152,22 +167,4 @@ public final class WidgetsListHeaderViewHolderBinderTest {
         }
         return widgetItems;
     }
-
-    private void assertWidgetCellWithLabel(View view, String label) {
-        assertThat(view).isInstanceOf(WidgetCell.class);
-        TextView widgetLabel = (TextView) view.findViewById(R.id.widget_name);
-        assertThat(widgetLabel.getText()).isEqualTo(label);
-    }
-
-    private final class FakeOnHeaderClickListener implements OnHeaderClickListener {
-
-        boolean mShowWidgets = false;
-        @Nullable  String mHeaderClickedPackage = null;
-
-        @Override
-        public void onHeaderClicked(boolean showWidgets, String packageName) {
-            mShowWidgets = showWidgets;
-            mHeaderClickedPackage = packageName;
-        }
-    }
 }
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinderTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinderTest.java
new file mode 100644
index 0000000000..07fbfd2a3c
--- /dev/null
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinderTest.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget.picker;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.verify;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.appwidget.AppWidgetProviderInfo;
+import android.content.ComponentName;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.view.LayoutInflater;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.InvariantDeviceProfile;
+import com.android.launcher3.R;
+import com.android.launcher3.icons.BitmapInfo;
+import com.android.launcher3.icons.ComponentWithLabel;
+import com.android.launcher3.icons.IconCache;
+import com.android.launcher3.model.WidgetItem;
+import com.android.launcher3.model.data.PackageItemInfo;
+import com.android.launcher3.testing.TestActivity;
+import com.android.launcher3.util.PackageUserKey;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
+import com.android.launcher3.widget.model.WidgetsListSearchHeaderEntry;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.android.controller.ActivityController;
+import org.robolectric.shadows.ShadowPackageManager;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+public final class WidgetsListSearchHeaderViewHolderBinderTest {
+    private static final String TEST_PACKAGE = "com.google.test";
+    private static final String APP_NAME = "Test app";
+
+    private Context mContext;
+    private WidgetsListSearchHeaderViewHolderBinder mViewHolderBinder;
+    private InvariantDeviceProfile mTestProfile;
+    // Replace ActivityController with ActivityScenario, which is the recommended way for activity
+    // testing.
+    private ActivityController<TestActivity> mActivityController;
+    private TestActivity mTestActivity;
+
+    @Mock
+    private IconCache mIconCache;
+    @Mock
+    private DeviceProfile mDeviceProfile;
+    @Mock
+    private OnHeaderClickListener mOnHeaderClickListener;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mTestProfile = new InvariantDeviceProfile();
+        mTestProfile.numRows = 5;
+        mTestProfile.numColumns = 5;
+
+        mActivityController = Robolectric.buildActivity(TestActivity.class);
+        mTestActivity = mActivityController.setup().get();
+        mTestActivity.setDeviceProfile(mDeviceProfile);
+
+        doAnswer(invocation -> {
+            ComponentWithLabel componentWithLabel = (ComponentWithLabel) invocation.getArgument(0);
+            return componentWithLabel.getComponent().getShortClassName();
+        }).when(mIconCache).getTitleNoCache(any());
+
+        mViewHolderBinder = new WidgetsListSearchHeaderViewHolderBinder(
+                LayoutInflater.from(mTestActivity), mOnHeaderClickListener);
+    }
+
+    @After
+    public void tearDown() {
+        mActivityController.destroy();
+    }
+
+    @Test
+    public void bindViewHolder_appWith3Widgets_shouldShowTheCorrectAppNameAndSubtitle() {
+        WidgetsListSearchHeaderHolder viewHolder = mViewHolderBinder.newViewHolder(
+                new FrameLayout(mTestActivity));
+        WidgetsListHeader widgetsListHeader = viewHolder.mWidgetsListHeader;
+        WidgetsListSearchHeaderEntry entry = generateSampleSearchHeader(
+                APP_NAME,
+                TEST_PACKAGE,
+                /* numOfWidgets= */ 3);
+        mViewHolderBinder.bindViewHolder(viewHolder, entry);
+
+        TextView appTitle = widgetsListHeader.findViewById(R.id.app_title);
+        TextView appSubtitle = widgetsListHeader.findViewById(R.id.app_subtitle);
+        assertThat(appTitle.getText()).isEqualTo(APP_NAME);
+        assertThat(appSubtitle.getText())
+                .isEqualTo(".SampleWidget0, .SampleWidget1, .SampleWidget2");
+    }
+
+    @Test
+    public void bindViewHolder_shouldAttachOnHeaderClickListener() {
+        WidgetsListSearchHeaderHolder viewHolder = mViewHolderBinder.newViewHolder(
+                new FrameLayout(mTestActivity));
+        WidgetsListHeader widgetsListHeader = viewHolder.mWidgetsListHeader;
+        WidgetsListSearchHeaderEntry entry = generateSampleSearchHeader(
+                APP_NAME,
+                TEST_PACKAGE,
+                /* numOfWidgets= */ 3);
+
+        mViewHolderBinder.bindViewHolder(viewHolder, entry);
+        widgetsListHeader.callOnClick();
+
+        verify(mOnHeaderClickListener).onHeaderClicked(eq(true),
+                eq(new PackageUserKey(entry.mPkgItem.packageName, entry.mPkgItem.user)));
+    }
+
+    private WidgetsListSearchHeaderEntry generateSampleSearchHeader(String appName,
+            String packageName, int numOfWidgets) {
+        PackageItemInfo appInfo = new PackageItemInfo(packageName);
+        appInfo.title = appName;
+        appInfo.bitmap = BitmapInfo.of(Bitmap.createBitmap(10, 10, Bitmap.Config.ALPHA_8), 0);
+
+        return new WidgetsListSearchHeaderEntry(appInfo,
+                /* titleSectionName= */ "",
+                generateWidgetItems(packageName, numOfWidgets));
+    }
+
+    private List<WidgetItem> generateWidgetItems(String packageName, int numOfWidgets) {
+        ShadowPackageManager packageManager = shadowOf(mContext.getPackageManager());
+        ArrayList<WidgetItem> widgetItems = new ArrayList<>();
+        for (int i = 0; i < numOfWidgets; i++) {
+            ComponentName cn = ComponentName.createRelative(packageName, ".SampleWidget" + i);
+            AppWidgetProviderInfo widgetInfo = new AppWidgetProviderInfo();
+            widgetInfo.provider = cn;
+            ReflectionHelpers.setField(widgetInfo, "providerInfo",
+                    packageManager.addReceiverIfNotPresent(cn));
+
+            widgetItems.add(new WidgetItem(
+                    LauncherAppWidgetProviderInfo.fromProviderInfo(mContext, widgetInfo),
+                    mTestProfile, mIconCache));
+        }
+        return widgetItems;
+    }
+}
diff --git a/src/com/android/launcher3/widget/model/WidgetsListBaseEntry.java b/src/com/android/launcher3/widget/model/WidgetsListBaseEntry.java
index 09517e1cfb..d09fd49e6e 100644
--- a/src/com/android/launcher3/widget/model/WidgetsListBaseEntry.java
+++ b/src/com/android/launcher3/widget/model/WidgetsListBaseEntry.java
@@ -51,10 +51,11 @@ public abstract class WidgetsListBaseEntry {
     public abstract int getRank();
 
     @Retention(SOURCE)
-    @IntDef({RANK_WIDGETS_LIST_HEADER, RANK_WIDGETS_LIST_CONTENT})
+    @IntDef({RANK_WIDGETS_LIST_HEADER, RANK_WIDGETS_LIST_SEARCH_HEADER, RANK_WIDGETS_LIST_CONTENT})
     public @interface Rank {
     }
 
     public static final int RANK_WIDGETS_LIST_HEADER = 1;
-    public static final int RANK_WIDGETS_LIST_CONTENT = 2;
+    public static final int RANK_WIDGETS_LIST_SEARCH_HEADER = 2;
+    public static final int RANK_WIDGETS_LIST_CONTENT = 3;
 }
diff --git a/src/com/android/launcher3/widget/model/WidgetsListContentEntry.java b/src/com/android/launcher3/widget/model/WidgetsListContentEntry.java
index b0cb8c7455..afc0f443bd 100644
--- a/src/com/android/launcher3/widget/model/WidgetsListContentEntry.java
+++ b/src/com/android/launcher3/widget/model/WidgetsListContentEntry.java
@@ -39,7 +39,7 @@ public final class WidgetsListContentEntry extends WidgetsListBaseEntry {
 
     @Override
     public String toString() {
-        return mPkgItem.packageName + ":" + mWidgets.size();
+        return "Content:" + mPkgItem.packageName + ":" + mWidgets.size();
     }
 
     @Override
diff --git a/src/com/android/launcher3/widget/model/WidgetsListHeaderEntry.java b/src/com/android/launcher3/widget/model/WidgetsListHeaderEntry.java
index 6899647764..309b678409 100644
--- a/src/com/android/launcher3/widget/model/WidgetsListHeaderEntry.java
+++ b/src/com/android/launcher3/widget/model/WidgetsListHeaderEntry.java
@@ -17,21 +17,25 @@ package com.android.launcher3.widget.model;
 
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.model.data.PackageItemInfo;
+import com.android.launcher3.widget.WidgetItemComparator;
 
-import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /** An information holder for an app which has widgets or/and shortcuts. */
 public final class WidgetsListHeaderEntry extends WidgetsListBaseEntry {
 
     public final int widgetsCount;
     public final int shortcutsCount;
+    public final List<WidgetItem> mWidgets;
 
     private boolean mIsWidgetListShown = false;
     private boolean mHasEntryUpdated = false;
 
     public WidgetsListHeaderEntry(PackageItemInfo pkgItem, String titleSectionName,
-            Collection<WidgetItem> items) {
+            List<WidgetItem> items) {
         super(pkgItem, titleSectionName);
+        mWidgets = items.stream().sorted(new WidgetItemComparator()).collect(Collectors.toList());
         widgetsCount = (int) items.stream().filter(item -> item.widgetInfo != null).count();
         shortcutsCount = Math.max(0, items.size() - widgetsCount);
     }
@@ -56,9 +60,22 @@ public final class WidgetsListHeaderEntry extends WidgetsListBaseEntry {
         return mHasEntryUpdated;
     }
 
+    @Override
+    public String toString() {
+        return "Header:" + mPkgItem.packageName + ":" + mWidgets.size();
+    }
+
     @Override
     @Rank
     public int getRank() {
         return RANK_WIDGETS_LIST_HEADER;
     }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof WidgetsListHeaderEntry)) return false;
+        WidgetsListHeaderEntry otherEntry = (WidgetsListHeaderEntry) obj;
+        return mWidgets.equals(otherEntry.mWidgets) && mPkgItem.equals(otherEntry.mPkgItem)
+                && mTitleSectionName.equals(otherEntry.mTitleSectionName);
+    }
 }
diff --git a/src/com/android/launcher3/widget/model/WidgetsListSearchHeaderEntry.java b/src/com/android/launcher3/widget/model/WidgetsListSearchHeaderEntry.java
new file mode 100644
index 0000000000..a8b887bb9e
--- /dev/null
+++ b/src/com/android/launcher3/widget/model/WidgetsListSearchHeaderEntry.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget.model;
+
+import com.android.launcher3.model.WidgetItem;
+import com.android.launcher3.model.data.PackageItemInfo;
+import com.android.launcher3.widget.WidgetItemComparator;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/** An information holder for an app which has widgets or/and shortcuts, to be shown in search. */
+public final class WidgetsListSearchHeaderEntry extends WidgetsListBaseEntry {
+
+    public final List<WidgetItem> mWidgets;
+
+    private boolean mIsWidgetListShown = false;
+    private boolean mHasEntryUpdated = false;
+
+    public WidgetsListSearchHeaderEntry(PackageItemInfo pkgItem, String titleSectionName,
+            List<WidgetItem> items) {
+        super(pkgItem, titleSectionName);
+        mWidgets = items.stream().sorted(new WidgetItemComparator()).collect(Collectors.toList());
+    }
+
+    /** Sets if the widgets list associated with this header is shown. */
+    public void setIsWidgetListShown(boolean isWidgetListShown) {
+        if (mIsWidgetListShown != isWidgetListShown) {
+            this.mIsWidgetListShown = isWidgetListShown;
+            mHasEntryUpdated = true;
+        } else {
+            mHasEntryUpdated = false;
+        }
+    }
+
+    /** Returns {@code true} if the widgets list associated with this header is shown. */
+    public boolean isWidgetListShown() {
+        return mIsWidgetListShown;
+    }
+
+    /** Returns {@code true} if this entry has been updated due to user interactions. */
+    public boolean hasEntryUpdated() {
+        return mHasEntryUpdated;
+    }
+
+    @Override
+    public String toString() {
+        return "SearchHeader:" + mPkgItem.packageName + ":" + mWidgets.size();
+    }
+
+    @Override
+    @Rank
+    public int getRank() {
+        return RANK_WIDGETS_LIST_SEARCH_HEADER;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof WidgetsListSearchHeaderEntry)) return false;
+        WidgetsListSearchHeaderEntry otherEntry = (WidgetsListSearchHeaderEntry) obj;
+        return mWidgets.equals(otherEntry.mWidgets) && mPkgItem.equals(otherEntry.mPkgItem)
+                && mTitleSectionName.equals(otherEntry.mTitleSectionName);
+    }
+}
diff --git a/src/com/android/launcher3/widget/picker/OnHeaderClickListener.java b/src/com/android/launcher3/widget/picker/OnHeaderClickListener.java
new file mode 100644
index 0000000000..73727515c2
--- /dev/null
+++ b/src/com/android/launcher3/widget/picker/OnHeaderClickListener.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget.picker;
+
+import com.android.launcher3.util.PackageUserKey;
+
+/**
+ * A listener to be invoked when a header is clicked.
+ */
+public interface OnHeaderClickListener {
+    /**
+     * Calls when a header is clicked to show / hide widgets for a package.
+     */
+    void onHeaderClicked(boolean showWidgets, PackageUserKey packageUserKey);
+}
diff --git a/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java b/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java
index 95fa05f19e..7eb5b834fd 100644
--- a/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java
+++ b/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java
@@ -34,6 +34,7 @@ final class SearchAndRecommendationsScrollController implements
     private final boolean mHasWorkProfile;
     private final SearchAndRecommendationViewHolder mViewHolder;
     private final WidgetsRecyclerView mPrimaryRecyclerView;
+    private final WidgetsRecyclerView mSearchRecyclerView;
 
     // The following are only non null if mHasWorkProfile is true.
     @Nullable private final WidgetsRecyclerView mWorkRecyclerView;
@@ -48,12 +49,14 @@ final class SearchAndRecommendationsScrollController implements
             SearchAndRecommendationViewHolder viewHolder,
             WidgetsRecyclerView primaryRecyclerView,
             @Nullable WidgetsRecyclerView workRecyclerView,
+            WidgetsRecyclerView searchRecyclerView,
             @Nullable View personalWorkTabsView,
             @Nullable PersonalWorkPagedView primaryWorkViewPager) {
         mHasWorkProfile = hasWorkProfile;
         mViewHolder = viewHolder;
         mPrimaryRecyclerView = primaryRecyclerView;
         mWorkRecyclerView = workRecyclerView;
+        mSearchRecyclerView = searchRecyclerView;
         mPrimaryWorkTabsView = personalWorkTabsView;
         mPrimaryWorkViewPager = primaryWorkViewPager;
         mCurrentRecyclerView = mPrimaryRecyclerView;
@@ -149,6 +152,11 @@ final class SearchAndRecommendationsScrollController implements
                     mPrimaryRecyclerView.getPaddingRight(),
                     mPrimaryRecyclerView.getPaddingBottom());
         }
+        mSearchRecyclerView.setPadding(
+                mSearchRecyclerView.getPaddingLeft(),
+                topContainerHeight,
+                mSearchRecyclerView.getPaddingRight(),
+                mSearchRecyclerView.getPaddingBottom());
     }
 
     /**
diff --git a/src/com/android/launcher3/widget/picker/WidgetsDiffReporter.java b/src/com/android/launcher3/widget/picker/WidgetsDiffReporter.java
index dbd1bdf523..2366609b3f 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsDiffReporter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsDiffReporter.java
@@ -25,6 +25,7 @@ import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 import com.android.launcher3.widget.model.WidgetsListContentEntry;
 import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
+import com.android.launcher3.widget.model.WidgetsListSearchHeaderEntry;
 import com.android.launcher3.widget.picker.WidgetsListAdapter.WidgetListBaseRowEntryComparator;
 
 import java.util.ArrayList;
@@ -113,7 +114,7 @@ public class WidgetsDiffReporter {
                 // or did the header view changed due to user interactions?
                 // or did the widget size and desc, span, etc change?
                 if (!isSamePackageItemInfo(orgRowEntry.mPkgItem, newRowEntry.mPkgItem)
-                        || hasHeaderUpdated(newRowEntry)
+                        || hasHeaderUpdated(orgRowEntry, newRowEntry)
                         || hasWidgetsListChanged(orgRowEntry, newRowEntry)) {
                     index = currentEntries.indexOf(orgRowEntry);
                     currentEntries.set(index, newRowEntry);
@@ -174,12 +175,16 @@ public class WidgetsDiffReporter {
      * Returns {@code true} if {@code newRow} is {@link WidgetsListHeaderEntry} and its content has
      * been changed due to user interactions.
      */
-    private boolean hasHeaderUpdated(WidgetsListBaseEntry newRow) {
-        if (!(newRow instanceof WidgetsListHeaderEntry)) {
-            return false;
+    private boolean hasHeaderUpdated(WidgetsListBaseEntry curRow, WidgetsListBaseEntry newRow) {
+        if (newRow instanceof WidgetsListHeaderEntry && curRow instanceof WidgetsListHeaderEntry) {
+            return ((WidgetsListHeaderEntry) newRow).hasEntryUpdated() || !curRow.equals(newRow);
+        }
+        if (newRow instanceof WidgetsListSearchHeaderEntry
+                && curRow instanceof WidgetsListSearchHeaderEntry) {
+            return ((WidgetsListSearchHeaderEntry) newRow).hasEntryUpdated()
+                    || !curRow.equals(newRow);
         }
-        WidgetsListHeaderEntry newRowEntry = (WidgetsListHeaderEntry) newRow;
-        return newRowEntry.hasEntryUpdated();
+        return false;
     }
 
     private boolean isSamePackageItemInfo(PackageItemInfo curInfo, PackageItemInfo newInfo) {
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 330175f653..946a456e29 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -34,7 +34,6 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
-import android.widget.EditText;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
@@ -53,6 +52,8 @@ import com.android.launcher3.views.TopRoundedCornerView;
 import com.android.launcher3.widget.BaseWidgetSheet;
 import com.android.launcher3.widget.LauncherAppWidgetHost.ProviderChangedListener;
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
+import com.android.launcher3.widget.picker.search.SearchModeListener;
+import com.android.launcher3.widget.picker.search.WidgetsSearchBar;
 import com.android.launcher3.workprofile.PersonalWorkPagedView;
 import com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip.OnActivePageChangedListener;
 
@@ -64,7 +65,7 @@ import java.util.function.Predicate;
  */
 public class WidgetsFullSheet extends BaseWidgetSheet
         implements Insettable, ProviderChangedListener, OnActivePageChangedListener,
-        WidgetsRecyclerView.HeaderViewDimensionsProvider {
+        WidgetsRecyclerView.HeaderViewDimensionsProvider, SearchModeListener {
 
     private static final long DEFAULT_OPEN_DURATION = 267;
     private static final long FADE_IN_DURATION = 150;
@@ -81,6 +82,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
 
     @Nullable private PersonalWorkPagedView mViewPager;
     private int mInitialTabsHeight = 0;
+    private boolean mIsInSearchMode;
     private View mTabsView;
     private TextView mNoWidgetsView;
     private SearchAndRecommendationViewHolder mSearchAndRecommendationViewHolder;
@@ -91,6 +93,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         mHasWorkProfile = context.getSystemService(LauncherApps.class).getProfiles().size() > 1;
         mAdapters.put(AdapterHolder.PRIMARY, new AdapterHolder(AdapterHolder.PRIMARY));
         mAdapters.put(AdapterHolder.WORK, new AdapterHolder(AdapterHolder.WORK));
+        mAdapters.put(AdapterHolder.SEARCH, new AdapterHolder(AdapterHolder.SEARCH));
     }
 
     public WidgetsFullSheet(Context context, AttributeSet attrs) {
@@ -138,6 +141,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
                 mSearchAndRecommendationViewHolder,
                 findViewById(R.id.primary_widgets_list_view),
                 mHasWorkProfile ? findViewById(R.id.work_widgets_list_view) : null,
+                findViewById(R.id.search_widgets_list_view),
                 mTabsView,
                 mViewPager);
         fastScroller.setOnFastScrollChangeListener(mSearchAndRecommendationsScrollController);
@@ -145,17 +149,25 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         mNoWidgetsView = findViewById(R.id.no_widgets_text);
 
         onWidgetsBound();
+
+        mSearchAndRecommendationViewHolder.mSearchBar.initialize(
+                mLauncher.getPopupDataProvider().getAllWidgets(), /* searchModeListener= */ this);
     }
 
     @Override
     public void onActivePageChanged(int currentActivePage) {
         AdapterHolder currentAdapterHolder = mAdapters.get(currentActivePage);
-        WidgetsRecyclerView currentRecyclerView = currentAdapterHolder.mWidgetsRecyclerView;
-        currentRecyclerView.bindFastScrollbar();
-        mSearchAndRecommendationsScrollController.setCurrentRecyclerView(currentRecyclerView);
+        WidgetsRecyclerView currentRecyclerView =
+                mAdapters.get(currentActivePage).mWidgetsRecyclerView;
 
         updateNoWidgetsView(currentAdapterHolder);
 
+        attachScrollbarToRecyclerView(currentRecyclerView);
+    }
+
+    private void attachScrollbarToRecyclerView(WidgetsRecyclerView recyclerView) {
+        recyclerView.bindFastScrollbar();
+        mSearchAndRecommendationsScrollController.setCurrentRecyclerView(recyclerView);
         reset();
     }
 
@@ -173,11 +185,15 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         if (mHasWorkProfile) {
             mAdapters.get(AdapterHolder.WORK).mWidgetsRecyclerView.scrollToTop();
         }
+        mAdapters.get(AdapterHolder.SEARCH).mWidgetsRecyclerView.scrollToTop();
         mSearchAndRecommendationsScrollController.reset();
     }
 
     @VisibleForTesting
     public WidgetsRecyclerView getRecyclerView() {
+        if (mIsInSearchMode) {
+            return mAdapters.get(AdapterHolder.SEARCH).mWidgetsRecyclerView;
+        }
         if (!mHasWorkProfile || mViewPager.getCurrentPage() == AdapterHolder.PRIMARY) {
             return mAdapters.get(AdapterHolder.PRIMARY).mWidgetsRecyclerView;
         }
@@ -289,6 +305,8 @@ public class WidgetsFullSheet extends BaseWidgetSheet
 
         AdapterHolder primaryUserAdapterHolder = mAdapters.get(AdapterHolder.PRIMARY);
         primaryUserAdapterHolder.setup(findViewById(R.id.primary_widgets_list_view));
+        AdapterHolder searchAdapterHolder = mAdapters.get(AdapterHolder.SEARCH);
+        searchAdapterHolder.setup(findViewById(R.id.search_widgets_list_view));
         primaryUserAdapterHolder.mWidgetsListAdapter.setWidgets(allWidgets);
         updateNoWidgetsView(primaryUserAdapterHolder);
 
@@ -300,6 +318,40 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         }
     }
 
+    @Override
+    public void enterSearchMode() {
+        if (mIsInSearchMode) return;
+        setViewVisibilityBasedOnSearch(/*isInSearchMode= */ true);
+        attachScrollbarToRecyclerView(mAdapters.get(AdapterHolder.SEARCH).mWidgetsRecyclerView);
+    }
+
+    @Override
+    public void exitSearchMode() {
+        setViewVisibilityBasedOnSearch(/*isInSearchMode=*/ false);
+        if (mHasWorkProfile) {
+            mViewPager.snapToPage(AdapterHolder.PRIMARY);
+        }
+        attachScrollbarToRecyclerView(mAdapters.get(AdapterHolder.PRIMARY).mWidgetsRecyclerView);
+    }
+
+    @Override
+    public void onSearchResults(List<WidgetsListBaseEntry> entries) {
+        mAdapters.get(AdapterHolder.SEARCH).mWidgetsListAdapter.setWidgetsOnSearch(entries);
+    }
+
+    private void setViewVisibilityBasedOnSearch(boolean isInSearchMode) {
+        mIsInSearchMode = isInSearchMode;
+        if (mHasWorkProfile) {
+            mViewPager.setVisibility(isInSearchMode ? GONE : VISIBLE);
+            mTabsView.setVisibility(isInSearchMode ? GONE : VISIBLE);
+        } else {
+            mAdapters.get(AdapterHolder.PRIMARY).mWidgetsRecyclerView
+                    .setVisibility(isInSearchMode ? GONE : VISIBLE);
+        }
+        mAdapters.get(AdapterHolder.SEARCH).mWidgetsRecyclerView
+                .setVisibility(mIsInSearchMode ? VISIBLE : GONE);
+    }
+
     private void open(boolean animate) {
         if (animate) {
             if (getPopupContainer().getInsets().bottom > 0) {
@@ -402,6 +454,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
     private final class AdapterHolder {
         static final int PRIMARY = 0;
         static final int WORK = 1;
+        static final int SEARCH = 2;
 
         private final int mAdapterType;
         private final WidgetsListAdapter mWidgetsListAdapter;
@@ -420,8 +473,16 @@ public class WidgetsFullSheet extends BaseWidgetSheet
                     apps.getIconCache(),
                     /* iconClickListener= */ WidgetsFullSheet.this,
                     /* iconLongClickListener= */ WidgetsFullSheet.this);
-            mWidgetsListAdapter.setFilter(
-                    mAdapterType == PRIMARY ? mPrimaryWidgetsFilter : mWorkWidgetsFilter);
+            switch (mAdapterType) {
+                case PRIMARY:
+                    mWidgetsListAdapter.setFilter(mPrimaryWidgetsFilter);
+                    break;
+                case WORK:
+                    mWidgetsListAdapter.setFilter(mWorkWidgetsFilter);
+                    break;
+                default:
+                    break;
+            }
         }
 
         void setup(WidgetsRecyclerView recyclerView) {
@@ -437,7 +498,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
     final class SearchAndRecommendationViewHolder {
         final View mContainer;
         final View mCollapseHandle;
-        final EditText mSearchBar;
+        final WidgetsSearchBar mSearchBar;
         final TextView mHeaderTitle;
 
         SearchAndRecommendationViewHolder(View searchAndRecommendationContainer) {
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
index 8b49d1ef15..f6ed1eafb1 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
@@ -34,11 +34,12 @@ import com.android.launcher3.WidgetPreviewLoader;
 import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.recyclerview.ViewHolderBinder;
 import com.android.launcher3.util.LabelComparator;
+import com.android.launcher3.util.PackageUserKey;
 import com.android.launcher3.widget.WidgetCell;
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 import com.android.launcher3.widget.model.WidgetsListContentEntry;
 import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
-import com.android.launcher3.widget.picker.WidgetsListHeaderViewHolderBinder.OnHeaderClickListener;
+import com.android.launcher3.widget.model.WidgetsListSearchHeaderEntry;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -62,8 +63,9 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
     private static final boolean DEBUG = false;
 
     /** Uniquely identifies widgets list view type within the app. */
-    private static final int VIEW_TYPE_WIDGETS_LIST = R.layout.widgets_list_row_view;
-    private static final int VIEW_TYPE_WIDGETS_HEADER = R.layout.widgets_list_row_header;
+    private static final int VIEW_TYPE_WIDGETS_LIST = R.id.view_type_widgets_list;
+    private static final int VIEW_TYPE_WIDGETS_HEADER = R.id.view_type_widgets_header;
+    private static final int VIEW_TYPE_WIDGETS_SEARCH_HEADER = R.id.view_type_widgets_search_header;
 
     private final WidgetsDiffReporter mDiffReporter;
     private final SparseArray<ViewHolderBinder> mViewHolderBinders = new SparseArray<>();
@@ -73,11 +75,13 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
 
     private List<WidgetsListBaseEntry> mAllEntries = new ArrayList<>();
     private ArrayList<WidgetsListBaseEntry> mVisibleEntries = new ArrayList<>();
-    @Nullable private String mWidgetsContentVisiblePackage = null;
+    @Nullable private PackageUserKey mWidgetsContentVisiblePackageUserKey = null;
 
     private Predicate<WidgetsListBaseEntry> mHeaderAndSelectedContentFilter = entry ->
             entry instanceof WidgetsListHeaderEntry
-                    || entry.mPkgItem.packageName.equals(mWidgetsContentVisiblePackage);
+                    || entry instanceof WidgetsListSearchHeaderEntry
+                    || new PackageUserKey(entry.mPkgItem.packageName, entry.mPkgItem.user)
+                    .equals(mWidgetsContentVisiblePackageUserKey);
     @Nullable private Predicate<WidgetsListBaseEntry> mFilter = null;
 
     public WidgetsListAdapter(Context context, LayoutInflater layoutInflater,
@@ -87,8 +91,14 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
         mWidgetsListTableViewHolderBinder = new WidgetsListTableViewHolderBinder(context,
                 layoutInflater, iconClickListener, iconLongClickListener, widgetPreviewLoader);
         mViewHolderBinders.put(VIEW_TYPE_WIDGETS_LIST, mWidgetsListTableViewHolderBinder);
-        mViewHolderBinders.put(VIEW_TYPE_WIDGETS_HEADER,
-                new WidgetsListHeaderViewHolderBinder(layoutInflater, this::onHeaderClicked));
+        mViewHolderBinders.put(
+                VIEW_TYPE_WIDGETS_HEADER,
+                new WidgetsListHeaderViewHolderBinder(
+                        layoutInflater, /*onHeaderClickListener=*/this));
+        mViewHolderBinders.put(
+                VIEW_TYPE_WIDGETS_SEARCH_HEADER,
+                new WidgetsListSearchHeaderViewHolderBinder(
+                        layoutInflater, /*onHeaderClickListener=*/ this));
     }
 
     public void setFilter(Predicate<WidgetsListBaseEntry> filter) {
@@ -127,18 +137,30 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
         return mVisibleEntries.get(pos).mTitleSectionName;
     }
 
-    /** Updates the widget list. */
+    /** Updates the widget list based on {@code tempEntries}. */
     public void setWidgets(List<WidgetsListBaseEntry> tempEntries) {
         mAllEntries = tempEntries.stream().sorted(mRowComparator)
                 .collect(Collectors.toList());
         updateVisibleEntries();
     }
 
+    /** Updates the widget list based on {@code searchResults}. */
+    public void setWidgetsOnSearch(List<WidgetsListBaseEntry> searchResults) {
+        // Forget the expanded package every time widget list is refreshed in search mode.
+        mWidgetsContentVisiblePackageUserKey = null;
+        setWidgets(searchResults);
+    }
+
     private void updateVisibleEntries() {
         mAllEntries.forEach(entry -> {
             if (entry instanceof WidgetsListHeaderEntry) {
                 ((WidgetsListHeaderEntry) entry).setIsWidgetListShown(
-                        entry.mPkgItem.packageName.equals(mWidgetsContentVisiblePackage));
+                        new PackageUserKey(entry.mPkgItem.packageName, entry.mPkgItem.user)
+                                .equals(mWidgetsContentVisiblePackageUserKey));
+            } else if (entry instanceof WidgetsListSearchHeaderEntry) {
+                ((WidgetsListSearchHeaderEntry) entry).setIsWidgetListShown(
+                        new PackageUserKey(entry.mPkgItem.packageName, entry.mPkgItem.user)
+                                .equals(mWidgetsContentVisiblePackageUserKey));
             }
         });
         List<WidgetsListBaseEntry> newVisibleEntries = mAllEntries.stream()
@@ -189,17 +211,19 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
             return VIEW_TYPE_WIDGETS_LIST;
         } else if (entry instanceof WidgetsListHeaderEntry) {
             return VIEW_TYPE_WIDGETS_HEADER;
+        } else if (entry instanceof WidgetsListSearchHeaderEntry) {
+            return VIEW_TYPE_WIDGETS_SEARCH_HEADER;
         }
         throw new UnsupportedOperationException("ViewHolderBinder not found for " + entry);
     }
 
     @Override
-    public void onHeaderClicked(boolean showWidgets, String expandedPackage) {
+    public void onHeaderClicked(boolean showWidgets, PackageUserKey packageUserKey) {
         if (showWidgets) {
-            mWidgetsContentVisiblePackage = expandedPackage;
+            mWidgetsContentVisiblePackageUserKey = packageUserKey;
             updateVisibleEntries();
-        } else if (expandedPackage.equals(mWidgetsContentVisiblePackage)) {
-            mWidgetsContentVisiblePackage = null;
+        } else if (packageUserKey.equals(mWidgetsContentVisiblePackageUserKey)) {
+            mWidgetsContentVisiblePackageUserKey = null;
             updateVisibleEntries();
         }
     }
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListHeader.java b/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
index 070a9aa2c7..119d094be5 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
@@ -41,6 +41,9 @@ import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.views.ActivityContext;
 import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
+import com.android.launcher3.widget.model.WidgetsListSearchHeaderEntry;
+
+import java.util.stream.Collectors;
 
 /**
  * A UI represents a header of an app shown in the full widgets tray.
@@ -173,7 +176,7 @@ public final class WidgetsListHeader extends LinearLayout implements ItemInfoUpd
                     shortcutsCount);
         } else if (entry.widgetsCount > 0) {
             subtitle = resources.getQuantityString(R.plurals.widgets_count,
-                     entry.widgetsCount, entry.widgetsCount);
+                    entry.widgetsCount, entry.widgetsCount);
         } else {
             subtitle = resources.getQuantityString(R.plurals.shortcuts_count,
                     entry.shortcutsCount, entry.shortcutsCount);
@@ -182,6 +185,32 @@ public final class WidgetsListHeader extends LinearLayout implements ItemInfoUpd
         mSubtitle.setVisibility(VISIBLE);
     }
 
+    /** Apply app icon, labels and tag using a generic {@link WidgetsListSearchHeaderEntry}. */
+    @UiThread
+    public void applyFromItemInfoWithIcon(WidgetsListSearchHeaderEntry entry) {
+        applyIconAndLabel(entry);
+    }
+
+    @UiThread
+    private void applyIconAndLabel(WidgetsListSearchHeaderEntry entry) {
+        PackageItemInfo info = entry.mPkgItem;
+        setIcon(info);
+        setTitles(entry);
+        setExpanded(entry.isWidgetListShown());
+
+        super.setTag(info);
+
+        verifyHighRes();
+    }
+
+    private void setTitles(WidgetsListSearchHeaderEntry entry) {
+        mTitle.setText(entry.mPkgItem.title);
+
+        mSubtitle.setText(entry.mWidgets.stream()
+                .map(item -> item.label).sorted().collect(Collectors.joining(", ")));
+        mSubtitle.setVisibility(VISIBLE);
+    }
+
     @Override
     public void reapplyItemInfo(ItemInfoWithIcon info) {
         if (getTag() == info) {
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinder.java b/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinder.java
index ed53e6fbc9..fcefe3a5ed 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinder.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinder.java
@@ -20,6 +20,7 @@ import android.view.ViewGroup;
 
 import com.android.launcher3.R;
 import com.android.launcher3.recyclerview.ViewHolderBinder;
+import com.android.launcher3.util.PackageUserKey;
 import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
 
 /**
@@ -50,12 +51,9 @@ public final class WidgetsListHeaderViewHolderBinder implements
         widgetsListHeader.applyFromItemInfoWithIcon(data);
         widgetsListHeader.setExpanded(data.isWidgetListShown());
         widgetsListHeader.setOnExpandChangeListener(isExpanded ->
-                mOnHeaderClickListener.onHeaderClicked(isExpanded, data.mPkgItem.packageName));
-    }
-
-    /** A listener to be invoked when {@link WidgetsListHeader} is clicked. */
-    public interface OnHeaderClickListener {
-        /** Calls when {@link WidgetsListHeader} is clicked to show / hide widgets for a package. */
-        void onHeaderClicked(boolean showWidgets, String packageName);
+                mOnHeaderClickListener.onHeaderClicked(
+                        isExpanded,
+                        new PackageUserKey(data.mPkgItem.packageName, data.mPkgItem.user)
+                ));
     }
 }
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderHolder.java b/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderHolder.java
new file mode 100644
index 0000000000..9562af3d50
--- /dev/null
+++ b/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderHolder.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget.picker;
+
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
+
+/**
+ * A {@link ViewHolder} for {@link WidgetsListHeader} of an app, which renders the app icon, the app
+ * name, label and a button for showing / hiding widgets.
+ */
+public final class WidgetsListSearchHeaderHolder extends ViewHolder {
+    final WidgetsListHeader mWidgetsListHeader;
+
+    public WidgetsListSearchHeaderHolder(WidgetsListHeader view) {
+        super(view);
+
+        mWidgetsListHeader = view;
+    }
+}
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinder.java b/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinder.java
new file mode 100644
index 0000000000..83c7948f95
--- /dev/null
+++ b/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinder.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget.picker;
+
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import com.android.launcher3.R;
+import com.android.launcher3.recyclerview.ViewHolderBinder;
+import com.android.launcher3.util.PackageUserKey;
+import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
+import com.android.launcher3.widget.model.WidgetsListSearchHeaderEntry;
+
+/**
+ * Binds data from {@link WidgetsListHeaderEntry} to UI elements in {@link WidgetsListHeaderHolder}.
+ */
+public final class WidgetsListSearchHeaderViewHolderBinder implements
+        ViewHolderBinder<WidgetsListSearchHeaderEntry, WidgetsListSearchHeaderHolder> {
+    private final LayoutInflater mLayoutInflater;
+    private final OnHeaderClickListener mOnHeaderClickListener;
+
+    public WidgetsListSearchHeaderViewHolderBinder(LayoutInflater layoutInflater,
+            OnHeaderClickListener onHeaderClickListener) {
+        mLayoutInflater = layoutInflater;
+        mOnHeaderClickListener = onHeaderClickListener;
+    }
+
+    @Override
+    public WidgetsListSearchHeaderHolder newViewHolder(ViewGroup parent) {
+        WidgetsListHeader header = (WidgetsListHeader) mLayoutInflater.inflate(
+                R.layout.widgets_list_row_header, parent, false);
+
+        return new WidgetsListSearchHeaderHolder(header);
+    }
+
+    @Override
+    public void bindViewHolder(WidgetsListSearchHeaderHolder viewHolder,
+            WidgetsListSearchHeaderEntry data) {
+        WidgetsListHeader widgetsListHeader = viewHolder.mWidgetsListHeader;
+        widgetsListHeader.applyFromItemInfoWithIcon(data);
+        widgetsListHeader.setExpanded(data.isWidgetListShown());
+        widgetsListHeader.setOnExpandChangeListener(isExpanded ->
+                mOnHeaderClickListener.onHeaderClicked(isExpanded,
+                        new PackageUserKey(data.mPkgItem.packageName, data.mPkgItem.user)));
+    }
+}
diff --git a/src/com/android/launcher3/widget/picker/search/SearchModeListener.java b/src/com/android/launcher3/widget/picker/search/SearchModeListener.java
new file mode 100644
index 0000000000..cee7d6735a
--- /dev/null
+++ b/src/com/android/launcher3/widget/picker/search/SearchModeListener.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget.picker.search;
+
+import com.android.launcher3.widget.model.WidgetsListBaseEntry;
+
+import java.util.List;
+
+/**
+ * A listener to help with widgets picker search.
+ */
+public interface SearchModeListener {
+    /**
+     * Notifies the subscriber when user enters widget picker search mode.
+     */
+    void enterSearchMode();
+
+    /**
+     * Notifies the subscriber when user exits widget picker search mode.
+     */
+    void exitSearchMode();
+
+    /**
+     * Notifies the subscriber with search results.
+     */
+    void onSearchResults(List<WidgetsListBaseEntry> entries);
+}
-- 
GitLab


From 6066f3dde47277359b3a65de9e511b64cadfb343 Mon Sep 17 00:00:00 2001
From: Zak Cohen <zakcohen@google.com>
Date: Fri, 26 Feb 2021 16:56:35 -0800
Subject: [PATCH 0652/1664] Update Overview UI to new layout.

This change spaces out app icon and proactive row as well as removing
the clipping from task snapshots.

Bug: 179922117
Test: Local on two devices

Change-Id: I5075b6dd7895cb40cdd59495fd27e4153c9cc2ea
---
 quickstep/res/values/dimens.xml               |  20 ++--
 .../quickstep/BaseActivityInterface.java      | 102 ++++++++----------
 .../quickstep/FallbackActivityInterface.java  |   7 --
 .../quickstep/LauncherActivityInterface.java  |  26 -----
 .../quickstep/util/RecentsOrientedState.java  |  13 ++-
 .../quickstep/views/TaskThumbnailView.java    |  15 ++-
 .../com/android/quickstep/views/TaskView.java |  18 ++--
 7 files changed, 83 insertions(+), 118 deletions(-)

diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 43ea42ab34..2a246247c8 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -16,16 +16,22 @@
 
 <resources>
 
-    <dimen name="task_thumbnail_top_margin">24dp</dimen>
-    <dimen name="task_thumbnail_half_top_margin">12dp</dimen>
+    <dimen name="task_thumbnail_top_margin">80dp</dimen>
+    <dimen name="task_thumbnail_half_top_margin">40dp</dimen>
     <dimen name="task_thumbnail_icon_size">48dp</dimen>
-    <dimen name="task_icon_top_margin">-16dp</dimen>
+    <dimen name="task_icon_top_margin">16dp</dimen>
     <!-- For screens without rounded corners -->
     <dimen name="task_corner_radius_small">2dp</dimen>
 
+    <dimen name="overview_proactive_row_height">48dp</dimen>
+    <dimen name="overview_proactive_row_bottom_margin">16dp</dimen>
+
+    <dimen name="overview_minimum_next_prev_size">48dp</dimen>
+    <dimen name="overview_task_margin">16dp</dimen>
+
     <!-- Overrideable in overlay that provides the Overview Actions. -->
-    <dimen name="overview_actions_height">66dp</dimen>
-    <dimen name="overview_actions_bottom_margin_gesture">16dp</dimen>
+    <dimen name="overview_actions_height">48dp</dimen>
+    <dimen name="overview_actions_bottom_margin_gesture">12dp</dimen>
     <dimen name="overview_actions_bottom_margin_three_button">8dp</dimen>
     <dimen name="overview_actions_horizontal_margin">16dp</dimen>
 
@@ -63,10 +69,6 @@
     <dimen name="task_card_menu_option_vertical_padding">8dp</dimen>
     <dimen name="task_card_menu_shadow_height">3dp</dimen>
     <dimen name="task_card_menu_horizontal_padding">0dp</dimen>
-    <dimen name="portrait_task_card_horz_space_big_overview">132dp</dimen>
-    <dimen name="portrait_modal_task_card_horz_space">60dp</dimen>
-    <dimen name="landscape_task_card_horz_space">200dp</dimen>
-    <dimen name="multi_window_task_card_horz_space">100dp</dimen>
     <!-- Copied from framework resource:
        docked_stack_divider_thickness - 2 * docked_stack_divider_insets -->
     <dimen name="multi_window_task_divider_size">10dp</dimen>
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index 7a144ba4ba..7c1d9fadbb 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -33,6 +33,7 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Rect;
 import android.os.Build;
+import android.view.Gravity;
 import android.view.MotionEvent;
 
 import androidx.annotation.Nullable;
@@ -53,6 +54,7 @@ import com.android.quickstep.util.ActivityInitListener;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
 import com.android.quickstep.util.SplitScreenBounds;
 import com.android.quickstep.views.RecentsView;
+import com.android.quickstep.views.TaskView;
 import com.android.systemui.shared.recents.model.ThumbnailData;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
@@ -197,33 +199,23 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
      */
     public final void calculateTaskSize(Context context, DeviceProfile dp, Rect outRect,
             PagedOrientationHandler orientedState) {
-        calculateTaskSize(context, dp, getExtraSpace(context, dp, orientedState), outRect);
-    }
-
-    protected abstract float getExtraSpace(Context context, DeviceProfile dp,
-            PagedOrientationHandler orientedState);
-
-    private void calculateTaskSize(Context context, DeviceProfile dp, float extraVerticalSpace,
-            Rect outRect) {
         Resources res = context.getResources();
 
-        final int paddingResId;
-        if (dp.isMultiWindowMode) {
-            paddingResId = R.dimen.multi_window_task_card_horz_space;
-        } else if (dp.isVerticalBarLayout()) {
-            paddingResId = R.dimen.landscape_task_card_horz_space;
-        } else {
-            paddingResId = R.dimen.portrait_task_card_horz_space_big_overview;
-        }
-        float paddingHorz = res.getDimension(paddingResId);
-        float paddingVert = 0;
-
-        calculateTaskSizeInternal(context, dp, extraVerticalSpace, paddingHorz, paddingVert,
-                res.getDimension(R.dimen.task_thumbnail_top_margin), outRect);
+        int taskMargin = res.getDimensionPixelSize(R.dimen.overview_task_margin);
+        int taskIconAndMargin = res.getDimensionPixelSize(R.dimen.task_thumbnail_icon_size)
+                + res.getDimensionPixelSize(R.dimen.task_icon_top_margin);
+        int proactiveRowAndMargin = res.getDimensionPixelSize(R.dimen.overview_proactive_row_height)
+                + res.getDimensionPixelSize(R.dimen.overview_proactive_row_bottom_margin);
+
+        calculateTaskSizeInternal(context, dp,
+                taskIconAndMargin + taskMargin,
+                proactiveRowAndMargin + getOverviewActionsHeight(context) + taskMargin,
+                res.getDimensionPixelSize(R.dimen.overview_minimum_next_prev_size) + taskMargin,
+                outRect);
     }
 
     private void calculateTaskSizeInternal(Context context, DeviceProfile dp,
-            float extraVerticalSpace, float paddingHorz, float paddingVert, float topIconMargin,
+            int claimedSpaceAbove, int claimedSpaceBelow, int minimumHorizontalPadding,
             Rect outRect) {
         float taskWidth, taskHeight;
         Rect insets = dp.getInsets();
@@ -231,30 +223,29 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
             WindowBounds bounds = SplitScreenBounds.INSTANCE.getSecondaryWindowBounds(context);
             taskWidth = bounds.availableSize.x;
             taskHeight = bounds.availableSize.y;
-        } else {
+        } else if (TaskView.CLIP_STATUS_AND_NAV_BARS) {
             taskWidth = dp.availableWidthPx;
             taskHeight = dp.availableHeightPx;
+        } else {
+            taskWidth = dp.widthPx;
+            taskHeight = dp.heightPx;
         }
 
-        // Note this should be same as dp.availableWidthPx and dp.availableHeightPx unless
-        // we override the insets ourselves.
-        int launcherVisibleWidth = dp.widthPx - insets.left - insets.right;
-        int launcherVisibleHeight = dp.heightPx - insets.top - insets.bottom;
-
-        float availableHeight = launcherVisibleHeight
-                - topIconMargin - extraVerticalSpace - paddingVert;
-        float availableWidth = launcherVisibleWidth - paddingHorz;
-
-        float scale = Math.min(availableWidth / taskWidth, availableHeight / taskHeight);
-        float outWidth = scale * taskWidth;
-        float outHeight = scale * taskHeight;
-
-        // Center in the visible space
-        float x = insets.left + (launcherVisibleWidth - outWidth) / 2;
-        float y = insets.top + Math.max(topIconMargin,
-                (launcherVisibleHeight - extraVerticalSpace - outHeight) / 2);
-        outRect.set(Math.round(x), Math.round(y),
-                Math.round(x) + Math.round(outWidth), Math.round(y) + Math.round(outHeight));
+        Rect potentialTaskRect = new Rect(0, 0, dp.widthPx, dp.heightPx);
+        potentialTaskRect.inset(insets.left, insets.top, insets.right, insets.bottom);
+        potentialTaskRect.inset(
+                minimumHorizontalPadding,
+                claimedSpaceAbove,
+                minimumHorizontalPadding,
+                claimedSpaceBelow);
+
+        float scale = Math.min(
+                potentialTaskRect.width() / taskWidth,
+                potentialTaskRect.height() / taskHeight);
+        int outWidth = Math.round(scale * taskWidth);
+        int outHeight = Math.round(scale * taskHeight);
+
+        Gravity.apply(Gravity.CENTER, outWidth, outHeight, potentialTaskRect, outRect);
     }
 
     /**
@@ -276,22 +267,20 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
      * Calculates the modal taskView size for the provided device configuration
      */
     public final void calculateModalTaskSize(Context context, DeviceProfile dp, Rect outRect) {
-        float paddingHorz = context.getResources().getDimension(dp.isMultiWindowMode
-                ? R.dimen.multi_window_task_card_horz_space
-                : dp.isVerticalBarLayout()
-                        ? R.dimen.landscape_task_card_horz_space
-                        : R.dimen.portrait_modal_task_card_horz_space);
-        float extraVerticalSpace = getOverviewActionsHeight(context);
-        float paddingVert = 0;
-        float topIconMargin = 0;
-        calculateTaskSizeInternal(context, dp, extraVerticalSpace, paddingHorz, paddingVert,
-                topIconMargin, outRect);
+        Resources res = context.getResources();
+        calculateTaskSizeInternal(
+                context, dp,
+                res.getDimensionPixelSize(R.dimen.overview_task_margin),
+                getOverviewActionsHeight(context)
+                        + res.getDimensionPixelSize(R.dimen.overview_task_margin),
+                res.getDimensionPixelSize(R.dimen.overview_task_margin),
+                outRect);
     }
 
-    /** Gets the space that the overview actions will take, including margins. */
-    public final float getOverviewActionsHeight(Context context) {
+    /** Gets the space that the overview actions will take, including bottom margin. */
+    public final int getOverviewActionsHeight(Context context) {
         Resources res = context.getResources();
-        float actionsBottomMargin = 0;
+        int actionsBottomMargin = 0;
         if (getMode(context) == Mode.THREE_BUTTONS) {
             actionsBottomMargin = res.getDimensionPixelSize(
                     R.dimen.overview_actions_bottom_margin_three_button);
@@ -299,9 +288,8 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
             actionsBottomMargin = res.getDimensionPixelSize(
                     R.dimen.overview_actions_bottom_margin_gesture);
         }
-        float overviewActionsHeight = actionsBottomMargin
+        return actionsBottomMargin
                 + res.getDimensionPixelSize(R.dimen.overview_actions_height);
-        return overviewActionsHeight;
     }
 
     /**
diff --git a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
index 96e4f38b43..db290d648f 100644
--- a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
@@ -26,7 +26,6 @@ import android.view.MotionEvent;
 import androidx.annotation.Nullable;
 
 import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.R;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.quickstep.fallback.RecentsState;
 import com.android.quickstep.util.ActivityInitListener;
@@ -155,10 +154,4 @@ public final class FallbackActivityInterface extends
         }
         activity.<RecentsView>getOverviewPanel().startHome();
     }
-
-    @Override
-    protected float getExtraSpace(Context context, DeviceProfile dp,
-            PagedOrientationHandler orientationHandler) {
-        return context.getResources().getDimensionPixelSize(R.dimen.overview_actions_height);
-    }
 }
diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
index 3f3e5ada68..7efbfb8503 100644
--- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
@@ -19,13 +19,10 @@ import static com.android.launcher3.LauncherState.BACKGROUND_APP;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
-import static com.android.quickstep.SysUINavigationMode.getMode;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.graphics.Rect;
-import android.util.Log;
 import android.view.MotionEvent;
 
 import androidx.annotation.Nullable;
@@ -36,13 +33,11 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherInitListener;
 import com.android.launcher3.LauncherState;
-import com.android.launcher3.R;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statehandlers.DepthController.ClampedDepthProperty;
 import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.taskbar.TaskbarController;
-import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.quickstep.GestureState.GestureEndTarget;
 import com.android.quickstep.SysUINavigationMode.Mode;
@@ -262,27 +257,6 @@ public final class LauncherActivityInterface extends
         }
     }
 
-    @Override
-    protected float getExtraSpace(Context context, DeviceProfile dp,
-            PagedOrientationHandler orientationHandler) {
-        Resources res = context.getResources();
-        //TODO: this needs to account for the swipe gesture height and accessibility
-        // UI when shown.
-        float actionsBottomMargin = 0;
-        if (!dp.isVerticalBarLayout()) {
-            if (getMode(context) == Mode.THREE_BUTTONS) {
-                actionsBottomMargin = res.getDimensionPixelSize(
-                    R.dimen.overview_actions_bottom_margin_three_button);
-            } else {
-                actionsBottomMargin = res.getDimensionPixelSize(
-                    R.dimen.overview_actions_bottom_margin_gesture);
-            }
-        }
-        float actionsHeight = actionsBottomMargin
-                + res.getDimensionPixelSize(R.dimen.overview_actions_height);
-        return actionsHeight;
-    }
-
     @Override
     void onOverviewServiceBound() {
         final BaseQuickstepLauncher activity = getCreatedActivity();
diff --git a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
index 215f05ae4c..188efadd45 100644
--- a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
+++ b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
@@ -23,9 +23,9 @@ import static android.view.Surface.ROTATION_180;
 import static android.view.Surface.ROTATION_270;
 import static android.view.Surface.ROTATION_90;
 
-import static com.android.launcher3.util.SettingsCache.ROTATION_SETTING_URI;
 import static com.android.launcher3.states.RotationHelper.ALLOW_ROTATION_PREFERENCE_KEY;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+import static com.android.launcher3.util.SettingsCache.ROTATION_SETTING_URI;
 
 import static java.lang.annotation.RetentionPolicy.SOURCE;
 
@@ -47,11 +47,12 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.util.SettingsCache;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.PagedOrientationHandler;
+import com.android.launcher3.util.SettingsCache;
 import com.android.launcher3.util.WindowBounds;
 import com.android.quickstep.BaseActivityInterface;
+import com.android.quickstep.views.TaskView;
 
 import java.lang.annotation.Retention;
 import java.util.function.IntConsumer;
@@ -367,8 +368,12 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
      */
     public float getFullScreenScaleAndPivot(Rect taskView, DeviceProfile dp, PointF outPivot) {
         Rect insets = dp.getInsets();
-        float fullWidth = dp.widthPx - insets.left - insets.right;
-        float fullHeight = dp.heightPx - insets.top - insets.bottom;
+        float fullWidth = dp.widthPx;
+        float fullHeight = dp.heightPx;
+        if (TaskView.CLIP_STATUS_AND_NAV_BARS) {
+            fullWidth -= insets.left + insets.right;
+            fullHeight -= insets.top + insets.bottom;
+        }
 
         if (dp.isMultiWindowMode) {
             WindowBounds bounds = SplitScreenBounds.INSTANCE.getSecondaryWindowBounds(mContext);
diff --git a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
index 4c21745de8..36a5f036a9 100644
--- a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
@@ -212,13 +212,6 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
         return mDimAlpha;
     }
 
-    public Rect getInsets(Rect fallback) {
-        if (mThumbnailData != null) {
-            return mThumbnailData.insets;
-        }
-        return fallback;
-    }
-
     /**
      * Get the scaled insets that are being used to draw the task view. This is a subsection of
      * the full snapshot.
@@ -230,6 +223,10 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
             return Insets.NONE;
         }
 
+        if (!TaskView.CLIP_STATUS_AND_NAV_BARS) {
+            return Insets.NONE;
+        }
+
         RectF bitmapRect = new RectF(
                 0, 0,
                 mThumbnailData.thumbnail.getWidth(), mThumbnailData.thumbnail.getHeight());
@@ -459,7 +456,6 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
         // Contains the portion of the thumbnail that is clipped when fullscreen progress = 0.
         private final RectF mClippedInsets = new RectF();
         private final Matrix mMatrix = new Matrix();
-        private float mClipBottom = -1;
         private boolean mIsOrientationChanged;
 
         public Matrix getMatrix() {
@@ -476,7 +472,8 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
 
             int thumbnailRotation = thumbnailData.rotation;
             int deltaRotate = getRotationDelta(currentRotation, thumbnailRotation);
-            RectF thumbnailClipHint = new RectF(thumbnailData.insets);
+            RectF thumbnailClipHint = TaskView.CLIP_STATUS_AND_NAV_BARS
+                    ? new RectF(thumbnailData.insets) : new RectF();
 
             float scale = thumbnailData.scale;
             final float thumbnailScale;
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 605eb3fec9..eace0f8015 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -121,6 +121,12 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
      */
     public static final float MAX_PAGE_SCRIM_ALPHA = 0.4f;
 
+    /**
+     * Should the TaskView display clip off the status and navigation bars in recents. When this
+     * is false the overview shows the whole screen scaled down instead.
+     */
+    public static final boolean CLIP_STATUS_AND_NAV_BARS = false;
+
     private static final float EDGE_SCALE_DOWN_FACTOR_CAROUSEL = 0.03f;
     private static final float EDGE_SCALE_DOWN_FACTOR_GRID = 0.00f;
 
@@ -620,12 +626,11 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         int thumbnailPadding = (int) getResources().getDimension(R.dimen.task_thumbnail_top_margin);
         int taskIconMargin = (int) getResources().getDimension(R.dimen.task_icon_top_margin);
         int taskIconHeight = (int) getResources().getDimension(R.dimen.task_thumbnail_icon_size);
-        int iconTopMargin = taskIconMargin - taskIconHeight + thumbnailPadding;
         LayoutParams iconParams = (LayoutParams) mIconView.getLayoutParams();
         switch (orientationHandler.getRotation()) {
             case ROTATION_90:
                 iconParams.gravity = (isRtl ? START : END) | CENTER_VERTICAL;
-                iconParams.rightMargin = -thumbnailPadding;
+                iconParams.rightMargin = -taskIconHeight - taskIconMargin / 2;
                 iconParams.leftMargin = 0;
                 iconParams.topMargin = snapshotParams.topMargin / 2;
                 break;
@@ -633,11 +638,11 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
                 iconParams.gravity = BOTTOM | CENTER_HORIZONTAL;
                 iconParams.bottomMargin = -thumbnailPadding;
                 iconParams.leftMargin = iconParams.rightMargin = 0;
-                iconParams.topMargin = iconTopMargin;
+                iconParams.topMargin = taskIconMargin;
                 break;
             case ROTATION_270:
                 iconParams.gravity = (isRtl ? END : START) | CENTER_VERTICAL;
-                iconParams.leftMargin = -thumbnailPadding;
+                iconParams.leftMargin = -taskIconHeight - taskIconMargin / 2;
                 iconParams.rightMargin = 0;
                 iconParams.topMargin = snapshotParams.topMargin / 2;
                 break;
@@ -645,7 +650,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
             default:
                 iconParams.gravity = TOP | CENTER_HORIZONTAL;
                 iconParams.leftMargin = iconParams.rightMargin = 0;
-                iconParams.topMargin = iconTopMargin;
+                iconParams.topMargin = taskIconMargin;
                 break;
         }
         mIconView.setLayoutParams(iconParams);
@@ -1191,7 +1196,8 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
 
             int expectedWidth;
             int expectedHeight;
-            float thumbnailRatio = mTask != null ? mTask.getVisibleThumbnailRatio() : 0f;
+            float thumbnailRatio = mTask != null ? mTask.getVisibleThumbnailRatio(
+                    TaskView.CLIP_STATUS_AND_NAV_BARS) : 0f;
             if (isRunningTask() || thumbnailRatio == 0f) {
                 expectedWidth = taskWidth;
                 expectedHeight = taskHeight + thumbnailPadding;
-- 
GitLab


From c1e66b523ee9b6a622e93eca423d2e280e9c07a9 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Thu, 11 Mar 2021 19:05:45 -0500
Subject: [PATCH 0653/1664] Fix folder outline not matching the v28 radius.

Bug: 175329686
Test: manual, open folder and verify no visual artifacts
Change-Id: If7cfaf6f95e43ad6f2636b136bc98961554ebf36
---
 src/com/android/launcher3/folder/FolderAnimationManager.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/folder/FolderAnimationManager.java b/src/com/android/launcher3/folder/FolderAnimationManager.java
index feb528c96f..ee6ea99e77 100644
--- a/src/com/android/launcher3/folder/FolderAnimationManager.java
+++ b/src/com/android/launcher3/folder/FolderAnimationManager.java
@@ -40,7 +40,6 @@ import androidx.core.graphics.ColorUtils;
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.CellLayout;
 import com.android.launcher3.R;
-import com.android.launcher3.ResourceUtils;
 import com.android.launcher3.ShortcutAndWidgetContainer;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.PropertyResetListener;
@@ -177,7 +176,7 @@ public class FolderAnimationManager {
                 Math.round((totalOffsetX + initialSize)),
                 Math.round((paddingOffsetY + initialSize)));
         Rect endRect = new Rect(0, 0, lp.width, lp.height);
-        float finalRadius = ResourceUtils.pxFromDp(2, mContext.getResources().getDisplayMetrics());
+        float finalRadius = mFolderBackground.getCornerRadius();
 
         // Create the animators.
         AnimatorSet a = new AnimatorSet();
-- 
GitLab


From 7575baadb48bce1529d3c924962c61234608fd8e Mon Sep 17 00:00:00 2001
From: Zak Cohen <zakcohen@google.com>
Date: Fri, 5 Feb 2021 17:04:27 -0800
Subject: [PATCH 0654/1664] Overview - make drag share targets work with Work
 Profile

Start the destination as the correct user, and fix the uris as
its leaving.

Bug: 179162353
Test: flash with WP and regular, test both targets
Change-Id: I49c980c5d08843ad221a9b92816351a22ea58990
---
 .../src/com/android/quickstep/util/ImageActionUtils.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/util/ImageActionUtils.java b/quickstep/src/com/android/quickstep/util/ImageActionUtils.java
index d022085877..0f2d778623 100644
--- a/quickstep/src/com/android/quickstep/util/ImageActionUtils.java
+++ b/quickstep/src/com/android/quickstep/util/ImageActionUtils.java
@@ -99,7 +99,14 @@ public class ImageActionUtils {
             .putExtra(Intent.EXTRA_STREAM, uri)
             .putExtra(Intent.EXTRA_SHORTCUT_ID, shortcutInfo.getId())
             .setClipData(clipdata);
-        context.startActivity(intent);
+
+        if (context.getUserId() != appTarget.getUser().getIdentifier()) {
+            intent.prepareToLeaveUser(context.getUserId());
+            intent.fixUris(context.getUserId());
+            context.startActivityAsUser(intent, appTarget.getUser());
+        } else {
+            context.startActivity(intent);
+        }
     }
 
     /**
-- 
GitLab


From 3ac2aab373afa8c972c1f71d79f14af2189c486e Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Sun, 7 Mar 2021 16:02:56 -0800
Subject: [PATCH 0655/1664] Moves BcSmartspaceDataPlugin to SystemUI.

Its new home is:
frameworks/base/packages/SystemUI/plugin/bcsmartspace/src/com/android/systemui/plugins.

Test: mp droid, mp sysuig, gradle build for Launcher
Bug: 182344603

Change-Id: I840e0da0d2bd32d94d72fbb4a10c70d21c823326
---
 .../plugins/BcSmartspaceDataPlugin.java       | 44 -------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 src_plugins/com/android/systemui/plugins/BcSmartspaceDataPlugin.java

diff --git a/src_plugins/com/android/systemui/plugins/BcSmartspaceDataPlugin.java b/src_plugins/com/android/systemui/plugins/BcSmartspaceDataPlugin.java
deleted file mode 100644
index f8a9a04596..0000000000
--- a/src_plugins/com/android/systemui/plugins/BcSmartspaceDataPlugin.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.systemui.plugins;
-
-import android.os.Parcelable;
-
-import com.android.systemui.plugins.annotations.ProvidesInterface;
-
-import java.util.List;
-
-/**
- * Interface to provide SmartspaceTargets to BcSmartspace.
- */
-@ProvidesInterface(action = BcSmartspaceDataPlugin.ACTION, version = BcSmartspaceDataPlugin.VERSION)
-public interface BcSmartspaceDataPlugin extends Plugin {
-    String ACTION = "com.android.systemui.action.PLUGIN_BC_SMARTSPACE_DATA";
-    int VERSION = 1;
-
-    /** Register a listener to get Smartspace data. */
-    void registerListener(SmartspaceTargetListener listener);
-
-    /** Unregister a listener. */
-    void unregisterListener(SmartspaceTargetListener listener);
-
-    /** Provides Smartspace data to registered listeners. */
-    interface SmartspaceTargetListener {
-        /** Each Parcelable is a SmartspaceTarget that represents a card. */
-        void onSmartspaceTargetsUpdated(List<? extends Parcelable> targets);
-    }
-}
-- 
GitLab


From 288960b5ba3923af3cd1ece5ae92e452ecc3d0e4 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Thu, 11 Mar 2021 19:11:19 -0800
Subject: [PATCH 0656/1664] Disable waiting for animation from event injection

This will avoid taking locks from it,
and stop TAPL from introducing jank under lock contention.

Bug: 173469230
Test: presubmit
Change-Id: Ifeba2dc7528b573ffaba2aa94dfdae6b8a14a7b3
---
 .../com/android/launcher3/tapl/LauncherInstrumentation.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index f279a82475..6bf676fb5d 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -1215,7 +1215,7 @@ public final class LauncherInstrumentation {
 
         final MotionEvent event = getMotionEvent(downTime, currentTime, action, point.x, point.y);
         assertTrue("injectInputEvent failed",
-                mInstrumentation.getUiAutomation().injectInputEvent(event, true));
+                mInstrumentation.getUiAutomation().injectInputEvent(event, true, false));
         event.recycle();
     }
 
-- 
GitLab


From 0acb2807df31ed7ad03ca71afc22b3119ecb8a6a Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 11 Mar 2021 15:11:58 -0800
Subject: [PATCH 0657/1664] Limit existing usages of nav bar button alpha to
 two button mode

Bug: 181206743
Test: Manual
Change-Id: Id63131e9aae36bb143d6a4807ef37f96dfa05be9
---
 .../launcher3/BaseQuickstepLauncher.java      |  9 +++--
 .../statehandlers/BackButtonAlphaHandler.java | 10 ++---
 .../com/android/quickstep/SystemUiProxy.java  | 40 +++++++++----------
 3 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 6eb1498c09..d1f670d15c 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -21,6 +21,7 @@ import static com.android.launcher3.LauncherState.FLAG_HIDE_BACK_BUTTON;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.util.DisplayController.DisplayHolder.CHANGE_SIZE;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY;
 
 import android.animation.AnimatorSet;
@@ -79,7 +80,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
      * Reusable command for applying the back button alpha on the background thread.
      */
     public static final UiThreadHelper.AsyncCommand SET_BACK_BUTTON_ALPHA =
-            (context, arg1, arg2) -> SystemUiProxy.INSTANCE.get(context).setBackButtonAlpha(
+            (context, arg1, arg2) -> SystemUiProxy.INSTANCE.get(context).setNavBarButtonAlpha(
                     Float.intBitsToFloat(arg1), arg2 != 0);
 
     private OverviewActionsView mActionsView;
@@ -369,8 +370,10 @@ public abstract class BaseQuickstepLauncher extends Launcher
      */
     private void onLauncherStateOrFocusChanged() {
         boolean shouldBackButtonBeHidden = shouldBackButtonBeHidden(getStateManager().getState());
-        UiThreadHelper.setBackButtonAlphaAsync(this, SET_BACK_BUTTON_ALPHA,
-                shouldBackButtonBeHidden ? 0f : 1f, true /* animate */);
+        if (SysUINavigationMode.getMode(this) == TWO_BUTTONS) {
+            UiThreadHelper.setBackButtonAlphaAsync(this, SET_BACK_BUTTON_ALPHA,
+                    shouldBackButtonBeHidden ? 0f : 1f, true /* animate */);
+        }
         if (getDragLayer() != null) {
             getRootView().setDisallowBackGesture(shouldBackButtonBeHidden);
         }
diff --git a/quickstep/src/com/android/launcher3/statehandlers/BackButtonAlphaHandler.java b/quickstep/src/com/android/launcher3/statehandlers/BackButtonAlphaHandler.java
index 13501a452b..ce9430515c 100644
--- a/quickstep/src/com/android/launcher3/statehandlers/BackButtonAlphaHandler.java
+++ b/quickstep/src/com/android/launcher3/statehandlers/BackButtonAlphaHandler.java
@@ -18,6 +18,7 @@ package com.android.launcher3.statehandlers;
 
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.quickstep.AnimatedFloat.VALUE;
+import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
 
 import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.LauncherState;
@@ -30,7 +31,7 @@ import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.SystemUiProxy;
 
 /**
- * State handler for animating back button alpha
+ * State handler for animating back button alpha in two-button nav mode.
  */
 public class BackButtonAlphaHandler implements StateHandler<LauncherState> {
 
@@ -51,14 +52,11 @@ public class BackButtonAlphaHandler implements StateHandler<LauncherState> {
             return;
         }
 
-        if (!SysUINavigationMode.getMode(mLauncher).hasGestures) {
-            // If the nav mode is not gestural, then force back button alpha to be 1
-            UiThreadHelper.setBackButtonAlphaAsync(mLauncher,
-                    BaseQuickstepLauncher.SET_BACK_BUTTON_ALPHA, 1f, true /* animate */);
+        if (SysUINavigationMode.getMode(mLauncher) != TWO_BUTTONS) {
             return;
         }
 
-        mBackAlpha.value = SystemUiProxy.INSTANCE.get(mLauncher).getLastBackButtonAlpha();
+        mBackAlpha.value = SystemUiProxy.INSTANCE.get(mLauncher).getLastNavButtonAlpha();
         animation.setFloat(mBackAlpha, VALUE,
                 mLauncher.shouldBackButtonBeHidden(toState) ? 0 : 1, LINEAR);
     }
diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index 5668817da8..619103c2ef 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -45,7 +45,8 @@ import com.android.systemui.shared.system.RemoteTransitionCompat;
 /**
  * Holds the reference to SystemUI.
  */
-public class SystemUiProxy implements ISystemUiProxy {
+public class SystemUiProxy implements ISystemUiProxy,
+        SysUINavigationMode.NavigationModeChangeListener {
     private static final String TAG = SystemUiProxy.class.getSimpleName();
 
     public static final MainThreadInitializedObject<SystemUiProxy> INSTANCE =
@@ -59,14 +60,20 @@ public class SystemUiProxy implements ISystemUiProxy {
     // Used to dedupe calls to SystemUI
     private int mLastShelfHeight;
     private boolean mLastShelfVisible;
-    private float mLastBackButtonAlpha;
-    private boolean mLastBackButtonAnimate;
+    private float mLastNavButtonAlpha;
+    private boolean mLastNavButtonAnimate;
 
     // TODO(141886704): Find a way to remove this
     private int mLastSystemUiStateFlags;
 
     public SystemUiProxy(Context context) {
-        // Do nothing
+        SysUINavigationMode.INSTANCE.get(context).addModeChangeListener(this);
+    }
+
+    @Override
+    public void onNavigationModeChanged(SysUINavigationMode.Mode newMode) {
+        // Whenever the nav mode changes, force reset the nav button alpha
+        setNavBarButtonAlpha(1f, false);
     }
 
     @Override
@@ -149,28 +156,17 @@ public class SystemUiProxy implements ISystemUiProxy {
         return null;
     }
 
-    @Override
-    public void setBackButtonAlpha(float alpha, boolean animate) {
-        boolean changed = Float.compare(alpha, mLastBackButtonAlpha) != 0
-                || animate != mLastBackButtonAnimate;
-        if (mSystemUiProxy != null && changed) {
-            mLastBackButtonAlpha = alpha;
-            mLastBackButtonAnimate = animate;
-            try {
-                mSystemUiProxy.setBackButtonAlpha(alpha, animate);
-            } catch (RemoteException e) {
-                Log.w(TAG, "Failed call setBackButtonAlpha", e);
-            }
-        }
-    }
-
-    public float getLastBackButtonAlpha() {
-        return mLastBackButtonAlpha;
+    public float getLastNavButtonAlpha() {
+        return mLastNavButtonAlpha;
     }
 
     @Override
     public void setNavBarButtonAlpha(float alpha, boolean animate) {
-        if (mSystemUiProxy != null) {
+        boolean changed = Float.compare(alpha, mLastNavButtonAlpha) != 0
+                || animate != mLastNavButtonAnimate;
+        if (mSystemUiProxy != null && changed) {
+            mLastNavButtonAlpha = alpha;
+            mLastNavButtonAnimate = animate;
             try {
                 mSystemUiProxy.setNavBarButtonAlpha(alpha, animate);
             } catch (RemoteException e) {
-- 
GitLab


From 5a4d91e54d304a4004cac86119811f493be04873 Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Tue, 9 Mar 2021 15:17:09 -0800
Subject: [PATCH 0658/1664] Pass the transform from Launcher to SysUI

Video: http://rcll/aaaaaabFQoRHlzixHdtY/hT5SXvaCy28P4UtfuoKiDw
Bug: 181342797
Test: see video
Change-Id: Id70d89b6dc82c7b9a33bd998b9ebdeb31703c37d
---
 .../android/quickstep/AbsSwipeUpHandler.java  |  4 +-
 .../quickstep/RecentsAnimationController.java |  8 +++-
 .../util/SwipePipToHomeAnimator.java          | 39 ++++++++++++++-----
 3 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index cf345e6083..7df86b99c7 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1469,7 +1469,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                     mSwipePipToHomeAnimator.getDestinationBounds());
             mRecentsAnimationController.setFinishTaskBounds(
                     mSwipePipToHomeAnimator.getTaskId(),
-                    mSwipePipToHomeAnimator.getDestinationBounds());
+                    mSwipePipToHomeAnimator.getDestinationBounds(),
+                    mSwipePipToHomeAnimator.getFinishWindowCrop(),
+                    mSwipePipToHomeAnimator.getFinishTransform());
             mIsSwipingPipToHome = false;
         }
     }
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationController.java b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
index 646c5a0592..ec585cc667 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationController.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
@@ -149,10 +149,14 @@ public class RecentsAnimationController {
      * accordingly. This should be called before `finish`
      * @param taskId for which the leash should be updated
      * @param destinationBounds bounds of the final PiP window
+     * @param windowCrop bounds to crop as part of final transform.
+     * @param float9 An array of 9 floats to be used as matrix transform.
      */
-    public void setFinishTaskBounds(int taskId, Rect destinationBounds) {
+    public void setFinishTaskBounds(int taskId, Rect destinationBounds, Rect windowCrop,
+            float[] float9) {
         UI_HELPER_EXECUTOR.execute(
-                () -> mController.setFinishTaskBounds(taskId, destinationBounds));
+                () -> mController.setFinishTaskBounds(taskId, destinationBounds, windowCrop,
+                        float9));
     }
 
     /**
diff --git a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
index 0ce50729ed..0a1a6e8ea0 100644
--- a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
+++ b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
@@ -134,8 +134,9 @@ public class SwipePipToHomeAnimator extends ValueAnimator implements
 
             @Override
             public void onAnimationEnd(Animator animation) {
-                if (!mHasAnimationEnded) super.onAnimationEnd(animation);
-                SwipePipToHomeAnimator.this.onAnimationEnd();
+                if (mHasAnimationEnded) return;
+                super.onAnimationEnd(animation);
+                mHasAnimationEnded = true;
             }
         });
         addUpdateListener(this);
@@ -223,14 +224,34 @@ public class SwipePipToHomeAnimator extends ValueAnimator implements
         return mDestinationBounds;
     }
 
-    private void onAnimationEnd() {
-        if (mHasAnimationEnded) return;
+    /**
+     * @return {@link Rect} of the final window crop in destination orientation.
+     */
+    public Rect getFinishWindowCrop() {
+        final Rect windowCrop = new Rect(mAppBounds);
+        if (mSourceHintRectInsets != null) {
+            windowCrop.inset(mSourceHintRectInsets);
+        }
+        return windowCrop;
+    }
 
-        final SurfaceControl.Transaction tx =
-                PipSurfaceTransactionHelper.newSurfaceControlTransaction();
-        mSurfaceTransactionHelper.reset(tx, mLeash, mDestinationBoundsTransformed, mFromRotation);
-        tx.apply();
-        mHasAnimationEnded = true;
+    /**
+     * @return Array of 9 floats represents the final transform in destination orientation.
+     */
+    public float[] getFinishTransform() {
+        final Matrix transform = new Matrix();
+        final float[] float9 = new float[9];
+        if (mSourceHintRectInsets == null) {
+            transform.setRectToRect(new RectF(mAppBounds), new RectF(mDestinationBounds),
+                    Matrix.ScaleToFit.FILL);
+        } else {
+            final float scale = mAppBounds.width() <= mAppBounds.height()
+                    ? (float) mDestinationBounds.width() / mAppBounds.width()
+                    : (float) mDestinationBounds.height() / mAppBounds.height();
+            transform.setScale(scale, scale);
+        }
+        transform.getValues(float9);
+        return float9;
     }
 
     private RotatedPosition getRotatedPosition(float fraction) {
-- 
GitLab


From ae72b46b2cc4b92fd341698b0e695d903379b7e3 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 10 Mar 2021 16:18:40 -0800
Subject: [PATCH 0659/1664] Replace taskbar hotseat with real hotseat when
 folder is open

- Seamlessly show real hotseat and hide taskbar hotseat, while
  keeping rest of taskbar visible
- Update MultiValueAlpha to allow for taking max alpha instead
  of blending, and use that for Hotseat
- Fix folder open bounds on home screen when taskbar is present

Test: Open folder from taskbar on home, can drag out items
Bug: 182079330
Bug: 171917176
Change-Id: I7c1983e3219b1341cf233260f0ccac9051c4dc14
---
 quickstep/res/layout/taskbar.xml              |  3 +-
 .../launcher3/BaseQuickstepLauncher.java      |  4 +
 .../launcher3/taskbar/TaskbarController.java  | 85 +++++++++++++++----
 .../launcher3/taskbar/TaskbarView.java        | 22 ++++-
 .../launcher3/AbstractFloatingView.java       |  3 +
 src/com/android/launcher3/DeviceProfile.java  |  3 +-
 src/com/android/launcher3/Hotseat.java        | 17 ++++
 .../WorkspaceStateTransitionAnimation.java    |  5 +-
 .../launcher3/util/MultiValueAlpha.java       | 43 ++++++++--
 9 files changed, 158 insertions(+), 27 deletions(-)

diff --git a/quickstep/res/layout/taskbar.xml b/quickstep/res/layout/taskbar.xml
index b124b33290..84e23043b0 100644
--- a/quickstep/res/layout/taskbar.xml
+++ b/quickstep/res/layout/taskbar.xml
@@ -25,7 +25,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@color/taskbar_background"
-        android:gravity="center"
-        android:animateLayoutChanges="true"/>
+        android:gravity="center"/>
 
 </com.android.launcher3.taskbar.TaskbarContainerView>
\ No newline at end of file
diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 641e108be5..ff47eae20c 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -315,6 +315,10 @@ public abstract class BaseQuickstepLauncher extends Launcher
     @Override
     public void onDragLayerHierarchyChanged() {
         onLauncherStateOrFocusChanged();
+
+        if (mTaskbarController != null) {
+            mTaskbarController.onLauncherDragLayerHierarchyChanged();
+        }
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index 544835c317..d96cf7c854 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -19,6 +19,8 @@ import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
 import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
 
+import static com.android.launcher3.AbstractFloatingView.TYPE_ALL;
+import static com.android.launcher3.AbstractFloatingView.TYPE_REPLACE_TASKBAR_WITH_HOTSEAT;
 import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_BOTTOM_TAPPABLE_ELEMENT;
@@ -40,6 +42,7 @@ import androidx.annotation.Nullable;
 
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.BaseQuickstepLauncher;
+import com.android.launcher3.Hotseat;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.QuickstepAppTransitionManagerImpl;
 import com.android.launcher3.R;
@@ -144,22 +147,13 @@ public class TaskbarController {
                         ActivityManagerWrapper.getInstance().startActivityFromRecents(task.key,
                                 ActivityOptions.makeBasic());
                     } else if (tag instanceof FolderInfo) {
-                        FolderIcon folderIcon = (FolderIcon) view;
-                        Folder folder = folderIcon.getFolder();
-
-                        setTaskbarWindowFullscreen(true);
-
-                        mTaskbarContainerView.post(() -> {
-                            folder.animateOpen();
-
-                            folder.iterateOverItems((itemInfo, itemView) -> {
-                                itemView.setOnClickListener(getItemOnClickListener());
-                                itemView.setOnLongClickListener(getItemOnLongClickListener());
-                                // To play haptic when dragging, like other Taskbar items do.
-                                itemView.setHapticFeedbackEnabled(true);
-                                return false;
-                            });
-                        });
+                        if (mLauncher.hasBeenResumed()) {
+                            FolderInfo folderInfo = (FolderInfo) tag;
+                            onClickedOnFolderFromHome(folderInfo);
+                        } else {
+                            FolderIcon folderIcon = (FolderIcon) view;
+                            onClickedOnFolderInApp(folderIcon);
+                        }
                     } else {
                         ItemClickHandler.INSTANCE.onClick(view);
                     }
@@ -169,6 +163,34 @@ public class TaskbarController {
                 };
             }
 
+            // Open the real folder in Launcher.
+            private void onClickedOnFolderFromHome(FolderInfo folderInfo) {
+                alignRealHotseatWithTaskbar();
+
+                FolderIcon folderIcon = (FolderIcon) mLauncher.getHotseat()
+                        .getFirstItemMatch((info, v) -> info == folderInfo);
+                folderIcon.post(folderIcon::performClick);
+            }
+
+            // Open the Taskbar folder, and handle clicks on folder items.
+            private void onClickedOnFolderInApp(FolderIcon folderIcon) {
+                Folder folder = folderIcon.getFolder();
+
+                setTaskbarWindowFullscreen(true);
+
+                mTaskbarContainerView.post(() -> {
+                    folder.animateOpen();
+
+                    folder.iterateOverItems((itemInfo, itemView) -> {
+                        itemView.setOnClickListener(getItemOnClickListener());
+                        itemView.setOnLongClickListener(getItemOnLongClickListener());
+                        // To play haptic when dragging, like other Taskbar items do.
+                        itemView.setHapticFeedbackEnabled(true);
+                        return false;
+                    });
+                });
+            }
+
             @Override
             public View.OnLongClickListener getItemOnLongClickListener() {
                 return view -> {
@@ -306,6 +328,7 @@ public class TaskbarController {
             mAnimator = createAnimToLauncher(null, duration);
         } else {
             mAnimator = createAnimToApp(duration);
+            replaceTaskbarWithHotseatOrViceVersa();
         }
         mAnimator.addListener(new AnimatorListenerAdapter() {
             @Override
@@ -355,6 +378,7 @@ public class TaskbarController {
             @Override
             public void onAnimationStart(Animator animation) {
                 mTaskbarView.updateHotseatItemsVisibility();
+                setReplaceTaskbarWithHotseat(false);
             }
         });
         return anim.buildAnim();
@@ -451,6 +475,35 @@ public class TaskbarController {
                 mTaskbarView.getHeight() - hotseatBounds.bottom);
     }
 
+    /**
+     * A view was added or removed from DragLayer, check if we need to hide our hotseat copy and
+     * show the real one instead.
+     */
+    public void onLauncherDragLayerHierarchyChanged() {
+        replaceTaskbarWithHotseatOrViceVersa();
+    }
+
+    private void replaceTaskbarWithHotseatOrViceVersa() {
+        boolean replaceTaskbarWithHotseat = AbstractFloatingView.getTopOpenViewWithType(mLauncher,
+                TYPE_ALL & TYPE_REPLACE_TASKBAR_WITH_HOTSEAT) != null;
+        if (!mLauncher.hasBeenResumed()) {
+            replaceTaskbarWithHotseat = false;
+        }
+        setReplaceTaskbarWithHotseat(replaceTaskbarWithHotseat);
+    }
+
+    private void setReplaceTaskbarWithHotseat(boolean replaceTaskbarWithHotseat) {
+        Hotseat hotseat = mLauncher.getHotseat();
+        if (replaceTaskbarWithHotseat) {
+            alignRealHotseatWithTaskbar();
+            hotseat.getReplaceTaskbarAlpha().setValue(1f);
+            mTaskbarView.setHotseatViewsHidden(true);
+        } else {
+            hotseat.getReplaceTaskbarAlpha().setValue(0f);
+            mTaskbarView.setHotseatViewsHidden(false);
+        }
+    }
+
     private float getTaskbarScaleOnHome() {
         return 1f / mTaskbarContainerView.getTaskbarActivityContext().getTaskbarIconScale();
     }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
index a729e7799f..1d762e9696 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
@@ -15,6 +15,7 @@
  */
 package com.android.launcher3.taskbar;
 
+import android.animation.LayoutTransition;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Canvas;
@@ -63,6 +64,7 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
     private TaskbarController.TaskbarViewCallbacks mControllerCallbacks;
 
     // Initialized in init().
+    private LayoutTransition mLayoutTransition;
     private int mHotseatStartIndex;
     private int mHotseatEndIndex;
     private View mHotseatRecentsDivider;
@@ -76,6 +78,7 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
     private boolean mIsDraggingItem;
     // Only non-null when the corresponding Folder is open.
     private @Nullable FolderIcon mLeaveBehindFolderIcon;
+    private boolean mIsHotseatHidden;
 
     public TaskbarView(@NonNull Context context) {
         this(context, null);
@@ -107,6 +110,9 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
     }
 
     protected void init(int numHotseatIcons, int numRecentIcons) {
+        mLayoutTransition = new LayoutTransition();
+        setLayoutTransitionsEnabled(true);
+
         mHotseatStartIndex = 0;
         mHotseatEndIndex = mHotseatStartIndex + numHotseatIcons - 1;
         updateHotseatItems(new ItemInfo[numHotseatIcons]);
@@ -119,6 +125,10 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
         updateRecentTasks(new Task[numRecentIcons]);
     }
 
+    private void setLayoutTransitionsEnabled(boolean enabled) {
+        setLayoutTransition(enabled ? mLayoutTransition : null);
+    }
+
     protected void cleanup() {
         removeAllViews();
     }
@@ -206,9 +216,19 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
         }
     }
 
+    /**
+     * Hides or shows the hotseat items immediately (without layout transitions).
+     */
+    protected void setHotseatViewsHidden(boolean hidden) {
+        mIsHotseatHidden = hidden;
+        setLayoutTransitionsEnabled(false);
+        updateHotseatItemsVisibility();
+        setLayoutTransitionsEnabled(true);
+    }
+
     private void updateHotseatItemVisibility(View hotseatView) {
         if (hotseatView.getTag() != null) {
-            hotseatView.setVisibility(VISIBLE);
+            hotseatView.setVisibility(mIsHotseatHidden ? INVISIBLE : VISIBLE);
         } else {
             int oldVisibility = hotseatView.getVisibility();
             int newVisibility = mControllerCallbacks.getEmptyHotseatViewVisibility();
diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java
index 95cdbdd147..e263c7af55 100644
--- a/src/com/android/launcher3/AbstractFloatingView.java
+++ b/src/com/android/launcher3/AbstractFloatingView.java
@@ -98,6 +98,9 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
     public static final int TYPE_HIDE_BACK_BUTTON = TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE
             | TYPE_SNACKBAR | TYPE_WIDGET_RESIZE_FRAME | TYPE_LISTENER;
 
+    // When these types of floating views are open, hide the taskbar hotseat and show the real one.
+    public static final int TYPE_REPLACE_TASKBAR_WITH_HOTSEAT = TYPE_FOLDER | TYPE_ACTION_POPUP;
+
     public static final int TYPE_ACCESSIBLE = TYPE_ALL & ~TYPE_DISCOVERY_BOUNCE & ~TYPE_LISTENER
             & ~TYPE_ALL_APPS_EDU;
 
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 2440854028..fb7a99f433 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -708,10 +708,11 @@ public class DeviceProfile {
                     mInsets.top + availableHeightPx);
         } else {
             // Folders should only appear below the drop target bar and above the hotseat
+            int hotseatTop = isTaskbarPresent ? taskbarSize : hotseatBarSizePx;
             return new Rect(mInsets.left + edgeMarginPx,
                     mInsets.top + dropTargetBarSizePx + edgeMarginPx,
                     mInsets.left + availableWidthPx - edgeMarginPx,
-                    mInsets.top + availableHeightPx - hotseatBarSizePx
+                    mInsets.top + availableHeightPx - hotseatTop
                             - workspacePageIndicatorHeight - edgeMarginPx);
         }
     }
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index b2112ad83a..e5b75c1382 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -29,6 +29,7 @@ import android.widget.FrameLayout;
 import androidx.annotation.Nullable;
 
 import com.android.launcher3.config.FeatureFlags;
+import com.android.launcher3.util.MultiValueAlpha;
 
 import java.util.function.Consumer;
 
@@ -37,6 +38,10 @@ import java.util.function.Consumer;
  */
 public class Hotseat extends CellLayout implements Insettable {
 
+    private static final int ALPHA_INDEX_STATE = 0;
+    private static final int ALPHA_INDEX_REPLACE_TASKBAR = 1;
+    private static final int NUM_ALPHA_CHANNELS = 2;
+
     @ViewDebug.ExportedProperty(category = "launcher")
     private boolean mHasVerticalHotseat;
     private Workspace mWorkspace;
@@ -44,6 +49,8 @@ public class Hotseat extends CellLayout implements Insettable {
     @Nullable
     private Consumer<Boolean> mOnVisibilityAggregatedCallback;
 
+    private final MultiValueAlpha mMultiValueAlpha;
+
     public Hotseat(Context context) {
         this(context, null);
     }
@@ -54,6 +61,8 @@ public class Hotseat extends CellLayout implements Insettable {
 
     public Hotseat(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
+        mMultiValueAlpha = new MultiValueAlpha(this, NUM_ALPHA_CHANNELS, MultiValueAlpha.Mode.MAX);
+        mMultiValueAlpha.setUpdateVisibility(true);
     }
 
     /**
@@ -174,4 +183,12 @@ public class Hotseat extends CellLayout implements Insettable {
     public View getFirstItemMatch(Workspace.ItemOperator itemOperator) {
         return mWorkspace.getFirstMatch(new CellLayout[] { this }, itemOperator);
     }
+
+    public MultiValueAlpha.AlphaProperty getStateAlpha() {
+        return mMultiValueAlpha.getProperty(ALPHA_INDEX_STATE);
+    }
+
+    public MultiValueAlpha.AlphaProperty getReplaceTaskbarAlpha() {
+        return mMultiValueAlpha.getProperty(ALPHA_INDEX_REPLACE_TASKBAR);
+    }
 }
diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
index 660eeabbdc..d6d2f733c3 100644
--- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
+++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
@@ -55,6 +55,7 @@ import com.android.launcher3.graphics.SysUiScrim;
 import com.android.launcher3.graphics.WorkspaceDragScrim;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.util.DynamicResource;
+import com.android.launcher3.util.MultiValueAlpha;
 import com.android.systemui.plugins.ResourceProvider;
 
 /**
@@ -143,8 +144,8 @@ public class WorkspaceStateTransitionAnimation {
             }
 
             float hotseatIconsAlpha = (elements & HOTSEAT_ICONS) != 0 ? 1 : 0;
-            propertySetter.setViewAlpha(hotseat, hotseatIconsAlpha,
-                    config.getInterpolator(ANIM_HOTSEAT_FADE, fadeInterpolator));
+            propertySetter.setFloat(hotseat.getStateAlpha(), MultiValueAlpha.VALUE,
+                    hotseatIconsAlpha, config.getInterpolator(ANIM_HOTSEAT_FADE, fadeInterpolator));
             float workspacePageIndicatorAlpha = (elements & WORKSPACE_PAGE_INDICATOR) != 0 ? 1 : 0;
             propertySetter.setViewAlpha(mLauncher.getWorkspace().getPageIndicator(),
                     workspacePageIndicatorAlpha, fadeInterpolator);
diff --git a/src/com/android/launcher3/util/MultiValueAlpha.java b/src/com/android/launcher3/util/MultiValueAlpha.java
index 5be95292b4..c79b1f6c99 100644
--- a/src/com/android/launcher3/util/MultiValueAlpha.java
+++ b/src/com/android/launcher3/util/MultiValueAlpha.java
@@ -42,16 +42,49 @@ public class MultiValueAlpha {
                 }
             };
 
+    /**
+     * Determines how each alpha should factor into the final alpha.
+     */
+    public enum Mode {
+        BLEND(1f) {
+            @Override
+            public float calculateNewAlpha(float currentAlpha, float otherAlpha) {
+                return currentAlpha * otherAlpha;
+            }
+        },
+
+        MAX(0f) {
+            @Override
+            public float calculateNewAlpha(float currentAlpha, float otherAlpha) {
+                return Math.max(currentAlpha, otherAlpha);
+            }
+        };
+
+        Mode(float startAlpha) {
+            mStartAlpha = startAlpha;
+        }
+
+        protected final float mStartAlpha;
+        protected abstract float calculateNewAlpha(float currentAlpha, float otherAlpha);
+    }
+
     private final View mView;
     private final AlphaProperty[] mMyProperties;
+    private final Mode mMode;
 
     private int mValidMask;
     // Whether we should change from INVISIBLE to VISIBLE and vice versa at low alpha values.
     private boolean mUpdateVisibility;
 
     public MultiValueAlpha(View view, int size) {
+        this(view, size, Mode.BLEND);
+    }
+
+    public MultiValueAlpha(View view, int size, Mode mode) {
         mView = view;
         mMyProperties = new AlphaProperty[size];
+        mMode = mode;
+        mView.setAlpha(mMode.mStartAlpha);
 
         mValidMask = 0;
         for (int i = 0; i < size; i++) {
@@ -79,9 +112,9 @@ public class MultiValueAlpha {
 
         private final int mMyMask;
 
-        private float mValue = 1;
+        private float mValue = mMode.mStartAlpha;
         // Factor of all other alpha channels, only valid if mMyMask is present in mValidMask.
-        private float mOthers = 1;
+        private float mOthers = mMode.mStartAlpha;
 
         AlphaProperty(int myMask) {
             mMyMask = myMask;
@@ -94,10 +127,10 @@ public class MultiValueAlpha {
 
             if ((mValidMask & mMyMask) == 0) {
                 // Our cache value is not correct, recompute it.
-                mOthers = 1;
+                mOthers = mMode.mStartAlpha;
                 for (AlphaProperty prop : mMyProperties) {
                     if (prop != this) {
-                        mOthers *= prop.mValue;
+                        mOthers = mMode.calculateNewAlpha(mOthers, prop.mValue);
                     }
                 }
             }
@@ -107,7 +140,7 @@ public class MultiValueAlpha {
             mValidMask = mMyMask;
             mValue = value;
 
-            mView.setAlpha(mOthers * mValue);
+            mView.setAlpha(mMode.calculateNewAlpha(mOthers, mValue));
             if (mUpdateVisibility) {
                 AlphaUpdateListener.updateVisibility(mView);
             }
-- 
GitLab


From cf2e907f56d9531adff2d9ffc057706b158c86b2 Mon Sep 17 00:00:00 2001
From: Robert Carr <racarr@google.com>
Date: Thu, 11 Mar 2021 22:03:41 -0800
Subject: [PATCH 0660/1664] Launcher3: Port SurfaceTransactionApplier to BLAST

Internal copy already works this way.

Bug: 168505645
Change-Id: I31a3fadb01b9fb65c15616522e612f718bc92ba3
---
 .../android/quickstep/util/SurfaceTransactionApplier.java  | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/util/SurfaceTransactionApplier.java b/quickstep/src/com/android/quickstep/util/SurfaceTransactionApplier.java
index 0436a1c53a..3b4fd31fa5 100644
--- a/quickstep/src/com/android/quickstep/util/SurfaceTransactionApplier.java
+++ b/quickstep/src/com/android/quickstep/util/SurfaceTransactionApplier.java
@@ -15,8 +15,6 @@
  */
 package com.android.quickstep.util;
 
-import static com.android.systemui.shared.system.TransactionCompat.deferTransactionUntil;
-
 import android.annotation.TargetApi;
 import android.os.Build;
 import android.os.Handler;
@@ -90,11 +88,10 @@ public class SurfaceTransactionApplier extends ReleaseCheck {
             for (int i = params.length - 1; i >= 0; i--) {
                 SurfaceParams surfaceParams = params[i];
                 if (surfaceParams.surface.isValid()) {
-                    deferTransactionUntil(t, surfaceParams.surface, mBarrierSurfaceControl, frame);
-                    surfaceParams.applyTo(t);
+                      surfaceParams.applyTo(t);
                 }
             }
-            t.apply();
+            mTargetViewRootImpl.mergeWithNextTransaction(t, frame);
             Message.obtain(mApplyHandler, MSG_UPDATE_SEQUENCE_NUMBER, toApplySeqNo, 0)
                     .sendToTarget();
         });
-- 
GitLab


From 647baded97ea0835b53d5fc247126c5f69b85adb Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 12 Mar 2021 12:50:29 -0800
Subject: [PATCH 0661/1664] Make ENABLE_TASKBAR and ENABLE_OVERVIEW_GRID
 DebugFlags instead of DeviceFlags

Test: reinstalled and flag values stayed the same and work
Change-Id: Icd3d6a5333de29d0e054a7a2eed512bfbfa9d4e3
---
 src/com/android/launcher3/config/FeatureFlags.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index e406e9b8d6..3657e892ad 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -198,10 +198,10 @@ public final class FeatureFlags {
             "ENABLE_APP_PREDICTIONS_WHILE_VISIBLE", true, "Allows app "
             + "predictions to be updated while they are visible to the user.");
 
-    public static final BooleanFlag ENABLE_TASKBAR = new DeviceFlag(
+    public static final BooleanFlag ENABLE_TASKBAR = getDebugFlag(
             "ENABLE_TASKBAR", false, "Allows a system Taskbar to be shown on larger devices.");
 
-    public static final BooleanFlag ENABLE_OVERVIEW_GRID = new DeviceFlag(
+    public static final BooleanFlag ENABLE_OVERVIEW_GRID = getDebugFlag(
             "ENABLE_OVERVIEW_GRID", false, "Uses grid overview layout. "
             + "Only applicable on large screen devices.");
 
-- 
GitLab


From e92a4add9938091ce3e193a56478fc7c872e6f3c Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Fri, 12 Mar 2021 15:30:41 -0500
Subject: [PATCH 0662/1664] Do not add arrow to OptionsPopupView.

Bug: 175329686
Test: open home menu, notice no arrow
      open long press menu, notice arrow still visible
Change-Id: I3f480d570b5134376324d4b8051da639ee8d8b27
---
 .../android/launcher3/popup/ArrowPopup.java   | 24 +++++++++++++++----
 .../launcher3/views/OptionsPopupView.java     |  5 ++++
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java
index 5a34d2a74f..15915e5380 100644
--- a/src/com/android/launcher3/popup/ArrowPopup.java
+++ b/src/com/android/launcher3/popup/ArrowPopup.java
@@ -164,7 +164,9 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
             reverseOrder(viewsToFlip);
         }
         onInflationComplete(reverseOrder);
-        addArrow();
+        if (shouldAddArrow()) {
+            addArrow();
+        }
         animateOpen();
     }
 
@@ -174,7 +176,9 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
     protected void show() {
         setupForDisplay();
         onInflationComplete(false);
-        addArrow();
+        if (shouldAddArrow()) {
+            addArrow();
+        }
         animateOpen();
     }
 
@@ -232,6 +236,13 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
         mArrow.setPivotY(mIsAboveIcon ? mArrowHeight : 0);
     }
 
+    /**
+     * Returns whether or not we should add the arrow.
+     */
+    protected boolean shouldAddArrow() {
+        return true;
+    }
+
     /**
      * Provide the location of the target object relative to the dragLayer.
      */
@@ -392,13 +403,18 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
         return getChildCount() > 0 ? getChildAt(0) : this;
     }
 
+    private int getArrowDuration() {
+        return shouldAddArrow()
+                ? getResources().getInteger(R.integer.config_popupArrowOpenCloseDuration)
+                : 0;
+    }
     private void animateOpen() {
         setVisibility(View.VISIBLE);
 
         final AnimatorSet openAnim = new AnimatorSet();
         final Resources res = getResources();
         final long revealDuration = (long) res.getInteger(R.integer.config_popupOpenCloseDuration);
-        final long arrowDuration = res.getInteger(R.integer.config_popupArrowOpenCloseDuration);
+        final long arrowDuration = getArrowDuration();
         final TimeInterpolator revealInterpolator = ACCEL_DEACCEL;
 
         // Rectangular reveal.
@@ -460,7 +476,7 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
         final Resources res = getResources();
         final TimeInterpolator revealInterpolator = ACCEL_DEACCEL;
         final long revealDuration = res.getInteger(R.integer.config_popupOpenCloseDuration);
-        final long arrowDuration = res.getInteger(R.integer.config_popupArrowOpenCloseDuration);
+        final long arrowDuration = getArrowDuration();
 
         // Hide the arrow
         Animator scaleArrow = ObjectAnimator.ofFloat(mArrow, LauncherAnimUtils.SCALE_PROPERTY, 0)
diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java
index 899dcf702b..1a114f3ce7 100644
--- a/src/com/android/launcher3/views/OptionsPopupView.java
+++ b/src/com/android/launcher3/views/OptionsPopupView.java
@@ -113,6 +113,11 @@ public class OptionsPopupView extends ArrowPopup
         return (type & TYPE_OPTIONS_POPUP) != 0;
     }
 
+    @Override
+    protected boolean shouldAddArrow() {
+        return false;
+    }
+
     @Override
     protected void getTargetObjectLocation(Rect outPos) {
         mTargetRect.roundOut(outPos);
-- 
GitLab


From 53d1364e8bbd3cac5bbc7578d07c6ae6293957e9 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 10 Mar 2021 22:40:55 +0000
Subject: [PATCH 0663/1664] Better estimate the height of widget recycler view

Test: Expand and collapse apps in the widgets picker. Then, observe
      the height of the fast scroller is correctly displayed.

Bug: 181629430
Change-Id: I9efcf902f8548fc5c8a398609758d43123228e5e
---
 res/layout/widgets_list_row_header.xml        |  2 +-
 res/values/dimens.xml                         |  2 +
 .../widget/picker/WidgetsFullSheet.java       | 10 +--
 .../widget/picker/WidgetsListAdapter.java     |  5 ++
 .../widget/picker/WidgetsRecyclerView.java    | 64 +++++++++++++++++--
 5 files changed, 71 insertions(+), 12 deletions(-)

diff --git a/res/layout/widgets_list_row_header.xml b/res/layout/widgets_list_row_header.xml
index 041e0073fd..77b5a9a9b1 100644
--- a/res/layout/widgets_list_row_header.xml
+++ b/res/layout/widgets_list_row_header.xml
@@ -19,7 +19,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:attr/selectableItemBackground"
-    android:paddingVertical="20dp"
+    android:paddingVertical="@dimen/widget_list_header_view_vertical_padding"
     android:orientation="horizontal">
 
     <ImageView
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index da43758bcf..d135b43df9 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -108,6 +108,8 @@
     <dimen name="widget_cell_vertical_padding">8dp</dimen>
     <dimen name="widget_cell_horizontal_padding">16dp</dimen>
 
+    <dimen name="widget_list_header_view_vertical_padding">20dp</dimen>
+
     <dimen name="widget_preview_shadow_blur">0.5dp</dimen>
     <dimen name="widget_preview_key_shadow_distance">1dp</dimen>
     <dimen name="widget_preview_corner_radius">2dp</dimen>
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 330175f653..978c6d82ce 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -385,14 +385,16 @@ public class WidgetsFullSheet extends BaseWidgetSheet
 
     @Override
     public int getHeaderViewHeight() {
-        // No need to check work profile here because mInitialTabHeight is always 0 if there is no
-        // work profile.
-        return mInitialTabsHeight
-                + measureHeightWithVerticalMargins(mSearchAndRecommendationViewHolder.mContainer);
+        return measureHeightWithVerticalMargins(mSearchAndRecommendationViewHolder.mCollapseHandle)
+                + measureHeightWithVerticalMargins(mSearchAndRecommendationViewHolder.mHeaderTitle)
+                + measureHeightWithVerticalMargins(mSearchAndRecommendationViewHolder.mSearchBar);
     }
 
     /** private the height, in pixel, + the vertical margins of a given view. */
     private static int measureHeightWithVerticalMargins(View view) {
+        if (view.getVisibility() != VISIBLE) {
+            return 0;
+        }
         MarginLayoutParams marginLayoutParams = (MarginLayoutParams) view.getLayoutParams();
         return view.getMeasuredHeight() + marginLayoutParams.bottomMargin
                 + marginLayoutParams.topMargin;
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
index 8b49d1ef15..00c1f8bd7a 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
@@ -122,6 +122,11 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
         return mVisibleEntries.size();
     }
 
+    /** Returns all items that will be drawn in a recycler view. */
+    public List<WidgetsListBaseEntry> getItems() {
+        return mVisibleEntries;
+    }
+
     /** Gets the section name for {@link com.android.launcher3.views.RecyclerViewFastScroller}. */
     public String getSectionName(int pos) {
         return mVisibleEntries.get(pos).mTitleSectionName;
diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java b/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
index d65a8098f9..9ab64247a7 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
@@ -21,13 +21,19 @@ import android.graphics.Point;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
+import android.widget.TableLayout;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.OnItemTouchListener;
 
 import com.android.launcher3.BaseRecyclerView;
+import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.R;
+import com.android.launcher3.views.ActivityContext;
+import com.android.launcher3.widget.model.WidgetsListBaseEntry;
+import com.android.launcher3.widget.model.WidgetsListContentEntry;
+import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
 
 /**
  * The widgets recycler view.
@@ -39,8 +45,10 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
     private final int mScrollbarTop;
 
     private final Point mFastScrollerOffset = new Point();
+    private final int mEstimatedWidgetListHeaderHeight;
     private boolean mTouchDownOnScroller;
     private HeaderViewDimensionsProvider mHeaderViewDimensionsProvider;
+    private int mLastVisibleWidgetContentTableHeight = 0;
 
     public WidgetsRecyclerView(Context context) {
         this(context, null);
@@ -55,6 +63,12 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
         super(context, attrs, defStyleAttr);
         mScrollbarTop = getResources().getDimensionPixelSize(R.dimen.dynamic_grid_edge_margin);
         addOnItemTouchListener(this);
+
+        ActivityContext activity = ActivityContext.lookupContext(getContext());
+        DeviceProfile grid = activity.getDeviceProfile();
+        mEstimatedWidgetListHeaderHeight = grid.iconSizePx
+                + 2 * context.getResources().getDimensionPixelSize(
+                        R.dimen.widget_list_header_view_vertical_padding);
     }
 
     @Override
@@ -123,21 +137,32 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
 
         View child = getChildAt(0);
         int rowIndex = getChildPosition(child);
-        int y = (child.getMeasuredHeight() * rowIndex);
+        for (int i = 0; i < getChildCount(); i++) {
+            View view = getChildAt(i);
+            if (view instanceof TableLayout) {
+                // This assumes there is ever only one content shown in this recycler view.
+                mLastVisibleWidgetContentTableHeight = view.getMeasuredHeight();
+            }
+        }
+
+        int scrollPosition = getItemsHeight(rowIndex);
         int offset = getLayoutManager().getDecoratedTop(child);
 
-        return getPaddingTop() + y - offset;
+        return getPaddingTop() + scrollPosition - offset;
     }
 
     /**
-     * Returns the available scroll height:
-     *   AvailableScrollHeight = Total height of the all items - last page height
+     * Returns the available scroll height, in pixel.
+     *
+     * <p>If the recycler view can't be scrolled, returns 0.
      */
     @Override
     protected int getAvailableScrollHeight() {
-        View child = getChildAt(0);
-        return child.getMeasuredHeight() * mAdapter.getItemCount() + getScrollBarTop()
-                + getPaddingBottom() - mScrollbar.getHeight();
+        // AvailableScrollHeight = Total height of the all items - first page height
+        int firstPageHeight = getMeasuredHeight() - getPaddingTop() - getPaddingBottom();
+        int totalHeightOfAllItems = getItemsHeight(/* untilIndex= */ mAdapter.getItemCount());
+        int availableScrollHeight = totalHeightOfAllItems - firstPageHeight;
+        return Math.max(0, availableScrollHeight);
     }
 
     private boolean isModelNotReady() {
@@ -180,6 +205,31 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
         mHeaderViewDimensionsProvider = headerViewDimensionsProvider;
     }
 
+    /**
+     * Returns the sum of the height, in pixels, of this list adapter's items from index 0 until
+     * {@code untilIndex}.
+     *
+     * <p>If the untilIndex is larger than the total number of items in this adapter, returns the
+     * sum of all items' height.
+     */
+    private int getItemsHeight(int untilIndex) {
+        if (untilIndex > mAdapter.getItems().size()) {
+            untilIndex = mAdapter.getItems().size();
+        }
+        int totalItemsHeight = 0;
+        for (int i = 0; i < untilIndex; i++) {
+            WidgetsListBaseEntry entry = mAdapter.getItems().get(i);
+            if (entry instanceof WidgetsListHeaderEntry) {
+                totalItemsHeight += mEstimatedWidgetListHeaderHeight;
+            } else if (entry instanceof WidgetsListContentEntry) {
+                totalItemsHeight += mLastVisibleWidgetContentTableHeight;
+            } else {
+                throw new UnsupportedOperationException("Can't estimate height for " + entry);
+            }
+        }
+        return totalItemsHeight;
+    }
+
     /**
      * Provides dimensions of the header view that is shown at the top of a
      * {@link WidgetsRecyclerView}.
-- 
GitLab


From 730b9d60a492a9b5550907afb116032e120343b0 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Fri, 12 Mar 2021 14:46:35 -0800
Subject: [PATCH 0664/1664] Fixing Launcher3 tests

Adding an atest config.
Correctly calculating display height.
Allowing scrolling from a partially visible bottom row in AllApps

Test: presubmit
Bug: 182006150
Change-Id: I5f3b976ac05ed1c2e1ffbb67cc6db0c0ee13ae6c
---
 tests/Launcher3Tests.xml                      | 50 +++++++++++++++++++
 .../com/android/launcher3/tapl/AllApps.java   | 15 +++---
 .../tapl/LauncherInstrumentation.java         |  8 ++-
 3 files changed, 62 insertions(+), 11 deletions(-)
 create mode 100644 tests/Launcher3Tests.xml

diff --git a/tests/Launcher3Tests.xml b/tests/Launcher3Tests.xml
new file mode 100644
index 0000000000..3fff622857
--- /dev/null
+++ b/tests/Launcher3Tests.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<!-- This test config file is auto-generated. -->
+<configuration description="Runs Launcher3 tests.">
+    <option name="test-suite-tag" value="apct" />
+    <option name="test-suite-tag" value="apct-instrumentation" />
+
+    <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+        <option name="set-test-harness" value="true" />
+        <option name="run-command" value="am force-stop com.android.launcher3" />
+        <option name="run-command" value="pm uninstall com.google.android.apps.nexuslauncher" />
+        <option name="run-command" value="pm uninstall com.google.android.apps.nexuslauncher.out_of_proc_tests" />
+        <option name="run-command" value="pm uninstall com.google.android.apps.nexuslauncher.tests" />
+        <option name="run-command" value="pm disable com.google.android.googlequicksearchbox" />
+
+        <option name="run-command" value="input keyevent 82" />
+        <option name="run-command" value="settings delete secure assistant" />
+        <option name="run-command" value="settings put global airplane_mode_on 1" />
+        <option name="run-command" value="am broadcast -a android.intent.action.AIRPLANE_MODE" />
+    </target_preparer>
+
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="Launcher3Tests.apk" />
+        <option name="test-file-name" value="Launcher3.apk" />
+    </target_preparer>
+
+    <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">
+        <option name="directory-keys" value="/data/user/0/com.android.launcher3/files" />
+        <option name="collect-on-run-ended-only" value="true" />
+    </metrics_collector>
+
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="com.android.launcher3.tests" />
+        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
+    </test>
+</configuration>
diff --git a/tests/tapl/com/android/launcher3/tapl/AllApps.java b/tests/tapl/com/android/launcher3/tapl/AllApps.java
index b6c17df730..e32250eaa5 100644
--- a/tests/tapl/com/android/launcher3/tapl/AllApps.java
+++ b/tests/tapl/com/android/launcher3/tapl/AllApps.java
@@ -27,7 +27,6 @@ import androidx.test.uiautomator.BySelector;
 import androidx.test.uiautomator.Direction;
 import androidx.test.uiautomator.UiObject2;
 
-import com.android.launcher3.ResourceUtils;
 import com.android.launcher3.testing.TestProtocol;
 
 import java.util.stream.Collectors;
@@ -108,26 +107,24 @@ public class AllApps extends LauncherInstrumentation.VisibleContainer {
                     "apps_list_view");
             final UiObject2 searchBox = getSearchBox(allAppsContainer);
 
-            int bottomGestureMargin = ResourceUtils.getNavbarSize(
-                    ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE, mLauncher.getResources()) + 1;
-            int deviceHeight = mLauncher.getDevice().getDisplayHeight();
-            int displayBottom = deviceHeight - bottomGestureMargin;
+            int deviceHeight = mLauncher.getRealDisplaySize().y;
+            int bottomGestureStartOnScreen = mLauncher.getBottomGestureStartOnScreen();
             final BySelector appIconSelector = AppIcon.getAppIconSelector(appName, mLauncher);
             if (!hasClickableIcon(allAppsContainer, appListRecycler, appIconSelector,
-                    displayBottom)) {
+                    bottomGestureStartOnScreen)) {
                 scrollBackToBeginning();
                 int attempts = 0;
                 int scroll = getAllAppsScroll();
                 try (LauncherInstrumentation.Closable c1 = mLauncher.addContextLayer("scrolled")) {
                     while (!hasClickableIcon(allAppsContainer, appListRecycler, appIconSelector,
-                            displayBottom)) {
+                            bottomGestureStartOnScreen)) {
                         mLauncher.scrollToLastVisibleRow(
                                 allAppsContainer,
                                 mLauncher.getObjectsInContainer(allAppsContainer, "icon")
                                         .stream()
                                         .filter(icon ->
-                                                        mLauncher.getVisibleBounds(icon).bottom
-                                                        <= displayBottom)
+                                                mLauncher.getVisibleBounds(icon).top
+                                                        < bottomGestureStartOnScreen)
                                         .collect(Collectors.toList()),
                                 mLauncher.getVisibleBounds(searchBox).bottom
                                         - mLauncher.getVisibleBounds(allAppsContainer).top);
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index f279a82475..64fc3609ae 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -1028,16 +1028,20 @@ public final class LauncherInstrumentation {
                 expectedState);
     }
 
-    int getBottomGestureSize() {
+    private int getBottomGestureSize() {
         return ResourceUtils.getNavbarSize(
                 ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE, getResources()) + 1;
     }
 
     int getBottomGestureMarginInContainer(UiObject2 container) {
-        final int bottomGestureStartOnScreen = getRealDisplaySize().y - getBottomGestureSize();
+        final int bottomGestureStartOnScreen = getBottomGestureStartOnScreen();
         return getVisibleBounds(container).bottom - bottomGestureStartOnScreen;
     }
 
+    int getBottomGestureStartOnScreen() {
+        return getRealDisplaySize().y - getBottomGestureSize();
+    }
+
     void clickLauncherObject(UiObject2 object) {
         expectEvent(TestProtocol.SEQUENCE_MAIN, LauncherInstrumentation.EVENT_TOUCH_DOWN);
         expectEvent(TestProtocol.SEQUENCE_MAIN, LauncherInstrumentation.EVENT_TOUCH_UP);
-- 
GitLab


From 145b7fd68c30720cc6e4bf967063363347ceb3c3 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Thu, 11 Mar 2021 10:03:12 -0800
Subject: [PATCH 0665/1664] Remove insets due to Taskbar, except on workspace
 elements

Test: go to all apps, ensure no bottom insets/limited nav bar
protection; go to overview, ensure no extra bottom padding

Bug: 171917176
Change-Id: I09dc589e1cb8d3b673bf2b38e42284557413e011
---
 src/com/android/launcher3/DeviceProfile.java          |  4 +++-
 src/com/android/launcher3/LauncherRootView.java       | 11 +++++++++--
 src/com/android/launcher3/Workspace.java              |  2 ++
 .../launcher3/allapps/AllAppsContainerView.java       |  3 ++-
 .../pageindicators/WorkspacePageIndicator.java        |  2 +-
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 2440854028..387f5164da 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -167,6 +167,8 @@ public class DeviceProfile {
      // Taskbar
     public boolean isTaskbarPresent;
     public int taskbarSize;
+    // How much of the bottom inset is due to Taskbar rather than other system elements.
+    public int nonOverlappingTaskbarInset;
 
     DeviceProfile(Context context, InvariantDeviceProfile inv, Info info,
             Point minSize, Point maxSize, int width, int height, boolean isLandscape,
@@ -221,7 +223,7 @@ public class DeviceProfile {
             WindowInsets windowInsets = DisplayController.INSTANCE.get(context).getHolder(mInfo.id)
                     .getDisplayContext().getSystemService(WindowManager.class)
                     .getCurrentWindowMetrics().getWindowInsets();
-            int nonOverlappingTaskbarInset =
+            nonOverlappingTaskbarInset =
                     taskbarSize - windowInsets.getSystemWindowInsetBottom();
             if (nonOverlappingTaskbarInset > 0) {
                 nonFinalAvailableHeightPx -= nonOverlappingTaskbarInset;
diff --git a/src/com/android/launcher3/LauncherRootView.java b/src/com/android/launcher3/LauncherRootView.java
index 76c4518169..83ddf641b7 100644
--- a/src/com/android/launcher3/LauncherRootView.java
+++ b/src/com/android/launcher3/LauncherRootView.java
@@ -41,8 +41,15 @@ public class LauncherRootView extends InsettableFrameLayout {
     }
 
     private void handleSystemWindowInsets(Rect insets) {
-        // Update device profile before notifying th children.
-        mActivity.getDeviceProfile().updateInsets(insets);
+        DeviceProfile dp = mActivity.getDeviceProfile();
+
+        // Taskbar provides insets, but we don't want that for most Launcher elements so remove it.
+        mTempRect.set(insets);
+        insets = mTempRect;
+        insets.bottom = Math.max(0, insets.bottom - dp.nonOverlappingTaskbarInset);
+
+        // Update device profile before notifying the children.
+        dp.updateInsets(insets);
         boolean resetState = !insets.equals(mInsets);
         setInsets(insets);
 
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 87fb6fb7a1..80d9bfc84b 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -310,6 +310,8 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         Rect padding = grid.workspacePadding;
         setPadding(padding.left, padding.top, padding.right, padding.bottom);
         mInsets.set(insets);
+        // Increase our bottom insets so we don't overlap with the taskbar.
+        mInsets.bottom += grid.nonOverlappingTaskbarInset;
 
         if (mWorkspaceFadeInAdjacentScreens) {
             // In landscape mode the page spacing is set to the default.
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index edd9a9f7ef..b7b1229080 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -395,7 +395,8 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
     @Override
     public WindowInsets dispatchApplyWindowInsets(WindowInsets insets) {
         if (Utilities.ATLEAST_Q) {
-            mNavBarScrimHeight = insets.getTappableElementInsets().bottom;
+            mNavBarScrimHeight = insets.getTappableElementInsets().bottom
+                    - mLauncher.getDeviceProfile().nonOverlappingTaskbarInset;
         } else {
             mNavBarScrimHeight = insets.getStableInsetBottom();
         }
diff --git a/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java b/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java
index 6189dc9557..a7cd10d628 100644
--- a/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java
+++ b/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java
@@ -269,7 +269,7 @@ public class WorkspacePageIndicator extends View implements Insettable, PageIndi
             lp.leftMargin = lp.rightMargin = 0;
             lp.gravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM;
             lp.bottomMargin = grid.isTaskbarPresent
-                    ? grid.workspacePadding.bottom + insets.bottom
+                    ? grid.workspacePadding.bottom + grid.taskbarSize
                     : grid.hotseatBarSizePx + insets.bottom;
         }
         setLayoutParams(lp);
-- 
GitLab


From 68f7fbfb8286d954045f1fc561051838f3bef7cd Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 2 Feb 2021 23:29:09 -0800
Subject: [PATCH 0666/1664] Update calls to go through the feature interface
 instead of sysui proxy

Bug: 180074017
Test: atest PinnedStackTests
Test: Verify Pip works w/ launcher (shelf offsets, autoenter, etc)

Change-Id: Ie41b0b77a7d5a79288af91f862e2a2cdda85fb66
---
 .../launcher3/QuickstepTransitionManager.java |   2 +-
 .../com/android/quickstep/SystemUiProxy.java  | 240 ++++++++++--------
 .../quickstep/TouchInteractionService.java    |  24 +-
 .../android/quickstep/views/RecentsView.java  |  23 +-
 4 files changed, 169 insertions(+), 120 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 343b87e735..f04c58d586 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -86,7 +86,6 @@ import com.android.quickstep.util.RemoteAnimationProvider;
 import com.android.quickstep.util.StaggeredWorkspaceAnim;
 import com.android.quickstep.util.SurfaceTransactionApplier;
 import com.android.quickstep.views.RecentsView;
-import com.android.systemui.shared.recents.IStartingWindowListener;
 import com.android.systemui.shared.system.ActivityCompat;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
 import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
@@ -98,6 +97,7 @@ import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 import com.android.systemui.shared.system.RemoteTransitionCompat;
 import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
 import com.android.systemui.shared.system.WindowManagerWrapper;
+import com.android.wm.shell.startingsurface.IStartingWindowListener;
 
 import java.util.LinkedHashMap;
 
diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index 5668817da8..f25c358fea 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -35,12 +35,17 @@ import android.util.Log;
 import android.view.MotionEvent;
 
 import com.android.launcher3.util.MainThreadInitializedObject;
-import com.android.systemui.shared.recents.IPinnedStackAnimationListener;
-import com.android.systemui.shared.recents.ISplitScreenListener;
-import com.android.systemui.shared.recents.IStartingWindowListener;
 import com.android.systemui.shared.recents.ISystemUiProxy;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.system.RemoteTransitionCompat;
+import com.android.wm.shell.onehanded.IOneHanded;
+import com.android.wm.shell.pip.IPip;
+import com.android.wm.shell.pip.IPipAnimationListener;
+import com.android.wm.shell.splitscreen.ISplitScreen;
+import com.android.wm.shell.splitscreen.ISplitScreenListener;
+import com.android.wm.shell.startingsurface.IStartingWindow;
+import com.android.wm.shell.startingsurface.IStartingWindowListener;
+import com.android.wm.shell.transition.IShellTransitions;
 
 /**
  * Holds the reference to SystemUI.
@@ -52,8 +57,13 @@ public class SystemUiProxy implements ISystemUiProxy {
             new MainThreadInitializedObject<>(SystemUiProxy::new);
 
     private ISystemUiProxy mSystemUiProxy;
+    private IPip mPip;
+    private ISplitScreen mSplitScreen;
+    private IOneHanded mOneHanded;
+    private IShellTransitions mShellTransitions;
+    private IStartingWindow mStartingWindow;
     private final DeathRecipient mSystemUiProxyDeathRecipient = () -> {
-        MAIN_EXECUTOR.execute(() -> setProxy(null));
+        MAIN_EXECUTOR.execute(() -> clearProxy());
     };
 
     // Used to dedupe calls to SystemUI
@@ -75,12 +85,23 @@ public class SystemUiProxy implements ISystemUiProxy {
         return null;
     }
 
-    public void setProxy(ISystemUiProxy proxy) {
+    public void setProxy(ISystemUiProxy proxy, IPip pip, ISplitScreen splitScreen,
+            IOneHanded oneHanded, IShellTransitions shellTransitions,
+            IStartingWindow startingWindow) {
         unlinkToDeath();
         mSystemUiProxy = proxy;
+        mPip = pip;
+        mSplitScreen = splitScreen;
+        mOneHanded = oneHanded;
+        mShellTransitions = shellTransitions;
+        mStartingWindow = startingWindow;
         linkToDeath();
     }
 
+    public void clearProxy() {
+        setProxy(null, null, null, null, null, null);
+    }
+
     // TODO(141886704): Find a way to remove this
     public void setLastSystemUiStateFlags(int stateFlags) {
         mLastSystemUiStateFlags = stateFlags;
@@ -268,21 +289,6 @@ public class SystemUiProxy implements ISystemUiProxy {
         }
     }
 
-    @Override
-    public void setShelfHeight(boolean visible, int shelfHeight) {
-        boolean changed = visible != mLastShelfVisible || shelfHeight != mLastShelfHeight;
-        if (mSystemUiProxy != null && changed) {
-            mLastShelfVisible = visible;
-            mLastShelfHeight = shelfHeight;
-            try {
-                mSystemUiProxy.setShelfHeight(visible, shelfHeight);
-            } catch (RemoteException e) {
-                Log.w(TAG, "Failed call setShelfHeight visible: " + visible
-                        + " height: " + shelfHeight, e);
-            }
-        }
-    }
-
     @Override
     public void handleImageAsScreenshot(Bitmap bitmap, Rect rect, Insets insets, int i) {
         if (mSystemUiProxy != null) {
@@ -319,20 +325,6 @@ public class SystemUiProxy implements ISystemUiProxy {
         }
     }
 
-    /**
-     * Sets listener to get pinned stack animation callbacks.
-     */
-    @Override
-    public void setPinnedStackAnimationListener(IPinnedStackAnimationListener listener) {
-        if (mSystemUiProxy != null) {
-            try {
-                mSystemUiProxy.setPinnedStackAnimationListener(listener);
-            } catch (RemoteException e) {
-                Log.w(TAG, "Failed call setPinnedStackAnimationListener", e);
-            }
-        }
-    }
-
     @Override
     public void onQuickSwitchToNewTask(int rotation) {
         if (mSystemUiProxy != null) {
@@ -358,44 +350,55 @@ public class SystemUiProxy implements ISystemUiProxy {
     }
 
     @Override
-    public void startOneHandedMode() {
+    public void expandNotificationPanel() {
         if (mSystemUiProxy != null) {
             try {
-                mSystemUiProxy.startOneHandedMode();
+                mSystemUiProxy.expandNotificationPanel();
             } catch (RemoteException e) {
-                Log.w(TAG, "Failed call startOneHandedMode", e);
+                Log.w(TAG, "Failed call expandNotificationPanel", e);
             }
         }
     }
 
-    @Override
-    public void stopOneHandedMode() {
-        if (mSystemUiProxy != null) {
+    //
+    // Pip
+    //
+
+    /**
+     * Sets the shelf height.
+     */
+    public void setShelfHeight(boolean visible, int shelfHeight) {
+        boolean changed = visible != mLastShelfVisible || shelfHeight != mLastShelfHeight;
+        if (mPip != null && changed) {
+            mLastShelfVisible = visible;
+            mLastShelfHeight = shelfHeight;
             try {
-                mSystemUiProxy.stopOneHandedMode();
+                mPip.setShelfHeight(visible, shelfHeight);
             } catch (RemoteException e) {
-                Log.w(TAG, "Failed call stopOneHandedMode", e);
+                Log.w(TAG, "Failed call setShelfHeight visible: " + visible
+                        + " height: " + shelfHeight, e);
             }
         }
     }
 
-    @Override
-    public void expandNotificationPanel() {
-        if (mSystemUiProxy != null) {
+    /**
+     * Sets listener to get pinned stack animation callbacks.
+     */
+    public void setPinnedStackAnimationListener(IPipAnimationListener listener) {
+        if (mPip != null) {
             try {
-                mSystemUiProxy.expandNotificationPanel();
+                mPip.setPinnedStackAnimationListener(listener);
             } catch (RemoteException e) {
-                Log.w(TAG, "Failed call expandNotificationPanel", e);
+                Log.w(TAG, "Failed call setPinnedStackAnimationListener", e);
             }
         }
     }
 
-    @Override
     public Rect startSwipePipToHome(ComponentName componentName, ActivityInfo activityInfo,
             PictureInPictureParams pictureInPictureParams, int launcherRotation, int shelfHeight) {
-        if (mSystemUiProxy != null) {
+        if (mPip != null) {
             try {
-                return mSystemUiProxy.startSwipePipToHome(componentName, activityInfo,
+                return mPip.startSwipePipToHome(componentName, activityInfo,
                         pictureInPictureParams, launcherRotation, shelfHeight);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call startSwipePipToHome", e);
@@ -404,111 +407,85 @@ public class SystemUiProxy implements ISystemUiProxy {
         return null;
     }
 
-    @Override
     public void stopSwipePipToHome(ComponentName componentName, Rect destinationBounds) {
-        if (mSystemUiProxy != null) {
+        if (mPip != null) {
             try {
-                mSystemUiProxy.stopSwipePipToHome(componentName, destinationBounds);
+                mPip.stopSwipePipToHome(componentName, destinationBounds);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call stopSwipePipToHome");
             }
         }
     }
 
-    @Override
-    public void registerRemoteTransition(RemoteTransitionCompat remoteTransition) {
-        if (mSystemUiProxy != null) {
-            try {
-                mSystemUiProxy.registerRemoteTransition(remoteTransition);
-            } catch (RemoteException e) {
-                Log.w(TAG, "Failed call registerRemoteTransition");
-            }
-        }
-    }
+    //
+    // Splitscreen
+    //
 
-    @Override
-    public void unregisterRemoteTransition(RemoteTransitionCompat remoteTransition) {
-        if (mSystemUiProxy != null) {
-            try {
-                mSystemUiProxy.unregisterRemoteTransition(remoteTransition);
-            } catch (RemoteException e) {
-                Log.w(TAG, "Failed call registerRemoteTransition");
-            }
-        }
-    }
-
-    @Override
     public void registerSplitScreenListener(ISplitScreenListener listener) {
-        if (mSystemUiProxy != null) {
+        if (mSplitScreen != null) {
             try {
-                mSystemUiProxy.registerSplitScreenListener(listener);
+                mSplitScreen.registerSplitScreenListener(listener);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call registerSplitScreenListener");
             }
         }
     }
 
-    @Override
     public void unregisterSplitScreenListener(ISplitScreenListener listener) {
-        if (mSystemUiProxy != null) {
+        if (mSplitScreen != null) {
             try {
-                mSystemUiProxy.unregisterSplitScreenListener(listener);
+                mSplitScreen.unregisterSplitScreenListener(listener);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call unregisterSplitScreenListener");
             }
         }
     }
 
-    @Override
     public void setSideStageVisibility(boolean visible) {
-        if (mSystemUiProxy != null) {
+        if (mSplitScreen != null) {
             try {
-                mSystemUiProxy.setSideStageVisibility(visible);
+                mSplitScreen.setSideStageVisibility(visible);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call setSideStageVisibility");
             }
         }
     }
 
-    @Override
     public void exitSplitScreen() {
-        if (mSystemUiProxy != null) {
+        if (mSplitScreen != null) {
             try {
-                mSystemUiProxy.exitSplitScreen();
+                mSplitScreen.exitSplitScreen();
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call exitSplitScreen");
             }
         }
     }
 
-    @Override
     public void exitSplitScreenOnHide(boolean exitSplitScreenOnHide) {
-        if (mSystemUiProxy != null) {
+        if (mSplitScreen != null) {
             try {
-                mSystemUiProxy.exitSplitScreenOnHide(exitSplitScreenOnHide);
+                mSplitScreen.exitSplitScreenOnHide(exitSplitScreenOnHide);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call exitSplitScreen");
             }
         }
     }
 
-    @Override
     public void startTask(int taskId, int stage, int position, Bundle options) {
-        if (mSystemUiProxy != null) {
+        if (mSplitScreen != null) {
             try {
-                mSystemUiProxy.startTask(taskId, stage, position, options);
+                mSplitScreen.startTask(taskId, stage, position, options);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call startTask");
             }
         }
     }
 
-    @Override
     public void startShortcut(String packageName, String shortcutId, int stage, int position,
             Bundle options, UserHandle user) {
-        if (mSystemUiProxy != null) {
+        if (mSplitScreen != null) {
             try {
-                mSystemUiProxy.startShortcut(packageName, shortcutId, stage, position, options,
+                mSplitScreen.startShortcut(packageName, shortcutId, stage, position, options,
                         user);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call startShortcut");
@@ -516,38 +493,87 @@ public class SystemUiProxy implements ISystemUiProxy {
         }
     }
 
-    @Override
-    public void startIntent(PendingIntent intent, Intent fillInIntent, int stage,
-            int position, Bundle options) {
-        if (mSystemUiProxy != null) {
+    public void startIntent(PendingIntent intent, Intent fillInIntent, int stage, int position,
+            Bundle options) {
+        if (mSplitScreen != null) {
             try {
-                mSystemUiProxy.startIntent(intent, fillInIntent, stage, position,
-                        options);
+                mSplitScreen.startIntent(intent, fillInIntent, stage, position, options);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call startIntent");
             }
         }
     }
 
-    @Override
     public void removeFromSideStage(int taskId) {
-        if (mSystemUiProxy != null) {
+        if (mSplitScreen != null) {
             try {
-                mSystemUiProxy.removeFromSideStage(taskId);
+                mSplitScreen.removeFromSideStage(taskId);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call removeFromSideStage");
             }
         }
     }
 
+    //
+    // One handed
+    //
+
+    public void startOneHandedMode() {
+        if (mOneHanded != null) {
+            try {
+                mOneHanded.startOneHanded();
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call startOneHandedMode", e);
+            }
+        }
+    }
+
+    public void stopOneHandedMode() {
+        if (mOneHanded != null) {
+            try {
+                mOneHanded.stopOneHanded();
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call stopOneHandedMode", e);
+            }
+        }
+    }
+
+    //
+    // Remote transitions
+    //
+
+    public void registerRemoteTransition(RemoteTransitionCompat remoteTransition) {
+        if (mShellTransitions != null) {
+            try {
+                mShellTransitions.registerRemote(remoteTransition.getFilter(),
+                        remoteTransition.getTransition());
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call registerRemoteTransition");
+            }
+        }
+    }
+
+    public void unregisterRemoteTransition(RemoteTransitionCompat remoteTransition) {
+        if (mShellTransitions != null) {
+            try {
+                mShellTransitions.unregisterRemote(remoteTransition.getTransition());
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call registerRemoteTransition");
+            }
+        }
+    }
+
+    //
+    // Starting window
+    //
+
     /**
      * Sets listener to get callbacks when launching a task.
      */
-    @Override
     public void setStartingWindowListener(IStartingWindowListener listener) {
-        if (mSystemUiProxy != null) {
+        if (mStartingWindow != null) {
             try {
-                mSystemUiProxy.setStartingWindowListener(listener);
+                mStartingWindow.setStartingWindowListener(listener);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call setStartingWindowListener", e);
             }
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index fc805d0794..1cb5f5d04e 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -24,6 +24,11 @@ import static com.android.launcher3.config.FeatureFlags.ASSISTANT_GIVES_LAUNCHER
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.quickstep.GestureState.DEFAULT_STATE;
 import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
+import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_ONE_HANDED;
+import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_PIP;
+import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_SHELL_TRANSITIONS;
+import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_SPLIT_SCREEN;
+import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_STARTING_WINDOW;
 import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SYSUI_PROXY;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_TRACING_ENABLED;
 
@@ -101,6 +106,11 @@ import com.android.systemui.shared.system.InputChannelCompat.InputEventReceiver;
 import com.android.systemui.shared.system.InputConsumerController;
 import com.android.systemui.shared.system.InputMonitorCompat;
 import com.android.systemui.shared.tracing.ProtoTraceable;
+import com.android.wm.shell.onehanded.IOneHanded;
+import com.android.wm.shell.pip.IPip;
+import com.android.wm.shell.splitscreen.ISplitScreen;
+import com.android.wm.shell.startingsurface.IStartingWindow;
+import com.android.wm.shell.transition.IShellTransitions;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
@@ -140,8 +150,18 @@ public class TouchInteractionService extends Service implements PluginListener<O
         public void onInitialize(Bundle bundle) {
             ISystemUiProxy proxy = ISystemUiProxy.Stub.asInterface(
                     bundle.getBinder(KEY_EXTRA_SYSUI_PROXY));
+            IPip pip = IPip.Stub.asInterface(bundle.getBinder(KEY_EXTRA_SHELL_PIP));
+            ISplitScreen splitscreen = ISplitScreen.Stub.asInterface(bundle.getBinder(
+                    KEY_EXTRA_SHELL_SPLIT_SCREEN));
+            IOneHanded onehanded = IOneHanded.Stub.asInterface(
+                    bundle.getBinder(KEY_EXTRA_SHELL_ONE_HANDED));
+            IShellTransitions shellTransitions = IShellTransitions.Stub.asInterface(
+                    bundle.getBinder(KEY_EXTRA_SHELL_SHELL_TRANSITIONS));
+            IStartingWindow startingWindow = IStartingWindow.Stub.asInterface(
+                    bundle.getBinder(KEY_EXTRA_SHELL_STARTING_WINDOW));
             MAIN_EXECUTOR.execute(() -> {
-                SystemUiProxy.INSTANCE.get(TouchInteractionService.this).setProxy(proxy);
+                SystemUiProxy.INSTANCE.get(TouchInteractionService.this).setProxy(proxy, pip,
+                        splitscreen, onehanded, shellTransitions, startingWindow);
                 TouchInteractionService.this.initInputMonitor();
                 preloadOverview(true /* fromInit */);
                 mDeviceState.runOnUserUnlocked(() -> {
@@ -421,7 +441,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
         }
         disposeEventHandlers();
         mDeviceState.destroy();
-        SystemUiProxy.INSTANCE.get(this).setProxy(null);
+        SystemUiProxy.INSTANCE.get(this).clearProxy();
         ProtoTracer.INSTANCE.get(this).stop();
         ProtoTracer.INSTANCE.get(this).remove(this);
 
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 9a903dc124..261c43f0e4 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -39,6 +39,7 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_DISMISS_SWIPE_UP;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_SWIPE_DOWN;
 import static com.android.launcher3.statehandlers.DepthController.DEPTH;
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW;
 import static com.android.quickstep.TaskUtils.checkCurrentOrManagedUserId;
@@ -133,13 +134,13 @@ import com.android.quickstep.util.SurfaceTransactionApplier;
 import com.android.quickstep.util.TaskViewSimulator;
 import com.android.quickstep.util.TransformParams;
 import com.android.systemui.plugins.ResourceProvider;
-import com.android.systemui.shared.recents.IPinnedStackAnimationListener;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.recents.model.Task.TaskKey;
 import com.android.systemui.shared.recents.model.ThumbnailData;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.PackageManagerWrapper;
 import com.android.systemui.shared.system.TaskStackChangeListener;
+import com.android.wm.shell.pip.IPipAnimationListener;
 
 import java.util.ArrayList;
 import java.util.function.Consumer;
@@ -377,7 +378,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         }
     };
 
-    private final PinnedStackAnimationListener mIPinnedStackAnimationListener =
+    private final PinnedStackAnimationListener mIPipAnimationListener =
             new PinnedStackAnimationListener();
 
     // Used to keep track of the last requested task list id, so that we do not request to load the
@@ -597,9 +598,9 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mLiveTileParams.setSyncTransactionApplier(mSyncTransactionApplier);
         RecentsModel.INSTANCE.get(getContext()).addThumbnailChangeListener(this);
         mIdp.addOnChangeListener(this);
-        mIPinnedStackAnimationListener.setActivity(mActivity);
+        mIPipAnimationListener.setActivity(mActivity);
         SystemUiProxy.INSTANCE.get(getContext()).setPinnedStackAnimationListener(
-                mIPinnedStackAnimationListener);
+                mIPipAnimationListener);
         mOrientationState.initListeners();
         SplitScreenBounds.INSTANCE.addOnChangeListener(this);
         mTaskOverlayFactory.initListeners();
@@ -618,7 +619,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mIdp.removeOnChangeListener(this);
         SystemUiProxy.INSTANCE.get(getContext()).setPinnedStackAnimationListener(null);
         SplitScreenBounds.INSTANCE.removeOnChangeListener(this);
-        mIPinnedStackAnimationListener.setActivity(null);
+        mIPipAnimationListener.setActivity(null);
         mOrientationState.destroyListeners();
         mTaskOverlayFactory.removeListeners();
     }
@@ -2922,7 +2923,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     }
 
     private static class PinnedStackAnimationListener<T extends BaseActivity> extends
-            IPinnedStackAnimationListener.Stub {
+            IPipAnimationListener.Stub {
         private T mActivity;
 
         public void setActivity(T activity) {
@@ -2930,10 +2931,12 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         }
 
         @Override
-        public void onPinnedStackAnimationStarted() {
-            // Needed for activities that auto-enter PiP, which will not trigger a remote
-            // animation to be created
-            mActivity.clearForceInvisibleFlag(STATE_HANDLER_INVISIBILITY_FLAGS);
+        public void onPipAnimationStarted() {
+            MAIN_EXECUTOR.execute(() -> {
+                // Needed for activities that auto-enter PiP, which will not trigger a remote
+                // animation to be created
+                mActivity.clearForceInvisibleFlag(STATE_HANDLER_INVISIBILITY_FLAGS);
+            });
         }
     }
 }
-- 
GitLab


From f72f513e6c049f4b40f7a6bb30ae0e3d8a0567a0 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Thu, 11 Mar 2021 20:48:25 -0800
Subject: [PATCH 0667/1664] Fix AA+ decorator drawing out of bounds issue /
 Make AA+ opaque

Bug: 182425322
Bug: 182305279

Test: manual

Change-Id: Ib9fbd09613e8e1c50a9d75fb2ab9546d2f5230b7
---
 .../allapps/AllAppsSectionDecorator.java      | 24 ++++---------------
 .../android/launcher3/views/ScrimView.java    |  9 +------
 2 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
index f4d735e1da..269e3905c8 100644
--- a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
+++ b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
@@ -56,11 +56,10 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
                 SectionDecorationInfo sectionInfo = adapterItem.sectionDecorationInfo;
                 SectionDecorationHandler decorationHandler = sectionInfo.getDecorationHandler();
                 if (decorationHandler != null) {
-                    decorationHandler.extendBounds(view);
                     if (sectionInfo.isFocusedView()) {
                         decorationHandler.onFocusDraw(c, view);
                     } else {
-                        decorationHandler.onGroupDraw(c);
+                        decorationHandler.onGroupDraw(c, view);
                     }
                 }
             }
@@ -130,27 +129,14 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
 
         }
 
-        /**
-         * Extends current bounds to include the view.
-         */
-        public void extendBounds(View view) {
-            if (mBounds.isEmpty()) {
-                mBounds.set(view.getLeft(), view.getTop(), view.getRight(), view.getBottom());
-            } else {
-                mBounds.set(
-                        Math.min(mBounds.left, view.getLeft()),
-                        Math.min(mBounds.top, view.getTop()),
-                        Math.max(mBounds.right, view.getRight()),
-                        Math.max(mBounds.bottom, view.getBottom())
-                );
-            }
-        }
-
         /**
          * Draw bounds onto canvas.
          */
-        public void onGroupDraw(Canvas canvas) {
+        public void onGroupDraw(Canvas canvas, View view) {
+            if (view == null) return;
+
             mPaint.setColor(mFillcolor);
+            mBounds.set(view.getLeft(), view.getTop(), view.getRight(), view.getBottom());
             onDraw(canvas);
         }
 
diff --git a/src/com/android/launcher3/views/ScrimView.java b/src/com/android/launcher3/views/ScrimView.java
index c9bd2840d8..7f0765becd 100644
--- a/src/com/android/launcher3/views/ScrimView.java
+++ b/src/com/android/launcher3/views/ScrimView.java
@@ -32,7 +32,6 @@ import androidx.core.graphics.ColorUtils;
 import com.android.launcher3.Insettable;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
-import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.uioverrides.WallpaperColorInfo;
 import com.android.launcher3.uioverrides.WallpaperColorInfo.OnChangeListener;
 import com.android.launcher3.util.Themes;
@@ -42,7 +41,6 @@ import com.android.launcher3.util.Themes;
  */
 public class ScrimView<T extends Launcher> extends View implements Insettable, OnChangeListener {
 
-    private static final float SCRIM_ALPHA = .95f;
     protected final T mLauncher;
     private final WallpaperColorInfo mWallpaperColorInfo;
     protected final int mEndScrim;
@@ -61,12 +59,7 @@ public class ScrimView<T extends Launcher> extends View implements Insettable, O
         super(context, attrs);
         mLauncher = Launcher.cast(Launcher.getLauncher(context));
         mWallpaperColorInfo = WallpaperColorInfo.INSTANCE.get(context);
-        int endScrim = Themes.getAttrColor(context, R.attr.allAppsScrimColor);
-        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
-            endScrim = Themes.getColorBackgroundFloating(context);
-            endScrim = ColorUtils.setAlphaComponent(endScrim, (int) (255  * SCRIM_ALPHA));
-        }
-        mEndScrim = endScrim;
+        mEndScrim = Themes.getAttrColor(context, R.attr.allAppsScrimColor);
         mIsScrimDark = ColorUtils.calculateLuminance(mEndScrim) < 0.5f;
 
         mMaxScrimAlpha = 0.7f;
-- 
GitLab


From f5767cf92851e50fcd12ebb22f9d165239222b2f Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Thu, 11 Mar 2021 00:26:42 -0800
Subject: [PATCH 0668/1664] Do not reset workprofile when on search result page

Bug: 182443195
Test: Manual
Change-Id: I2cb1d11949233273881dc9d387e68c9878d49096
---
 src/com/android/launcher3/allapps/AllAppsContainerView.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index edd9a9f7ef..9ede94c43f 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -201,9 +201,9 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         }
         if (!mAH[AdapterHolder.MAIN].appsList.hasFilter()) {
             rebindAdapters(hasWorkApps);
-        }
-        if (hasWorkApps) {
-            resetWorkProfile();
+            if (hasWorkApps) {
+                resetWorkProfile();
+            }
         }
     }
 
-- 
GitLab


From d07acba0489f82c830e6b63534f65ccb8e093e83 Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Tue, 9 Mar 2021 21:23:35 +0000
Subject: [PATCH 0669/1664] Add a WidgetsSearchBar(Launcher3) and a
 WidgetsSearchController.

- Make WidgetsSearchBar in Launcher3 initialize WidgetsSearchController with SimpleWidgetsSearchPipeline
- Modify SimpleWidgetsSearchPipeline to filter widgets entries on widgets/shortcut labels also.

Test: Tested prototype locally. Also added robolectric test.
Bug: b/157286785
Change-Id: I65f5fa0240ffb6d22023167e4e86d94d83bbd9f7
---
 res/drawable/ic_gm_close_24.xml               |   9 +
 ..._full_sheet_search_and_recommendations.xml |  13 +-
 res/layout/widgets_search_bar.xml             |  33 ++++
 .../SimpleWidgetsSearchPipelineTest.java      |  87 +++++-----
 .../WidgetsSearchBarControllerTest.java       | 140 +++++++++++++++
 .../allapps/search/AppsSearchPipeline.java    |   7 +-
 .../search/DefaultAppSearchAlgorithm.java     | 131 --------------
 .../launcher3/search/SearchAlgorithm.java     |   5 +
 .../search/StringMatcherUtility.java          | 162 ++++++++++++++++++
 .../widget/model/WidgetsListBaseEntry.java    |  11 +-
 .../widget/model/WidgetsListContentEntry.java |  16 +-
 .../widget/model/WidgetsListHeaderEntry.java  |   6 +-
 .../model/WidgetsListSearchHeaderEntry.java   |   7 +-
 .../search/SimpleWidgetsSearchPipeline.java   |  70 +++-----
 .../picker/search/WidgetsSearchBar.java       |  79 +++++++++
 .../search/WidgetsSearchBarController.java    | 111 ++++++++++++
 .../search/DefaultAppSearchAlgorithmTest.java |  98 -----------
 .../search/StringMatcherUtilityTest.java      |  96 +++++++++++
 18 files changed, 733 insertions(+), 348 deletions(-)
 create mode 100644 res/drawable/ic_gm_close_24.xml
 create mode 100644 res/layout/widgets_search_bar.xml
 create mode 100644 robolectric_tests/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarControllerTest.java
 create mode 100644 src/com/android/launcher3/search/StringMatcherUtility.java
 create mode 100644 src/com/android/launcher3/widget/picker/search/WidgetsSearchBar.java
 create mode 100644 src/com/android/launcher3/widget/picker/search/WidgetsSearchBarController.java
 delete mode 100644 tests/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithmTest.java
 create mode 100644 tests/src/com/android/launcher3/search/StringMatcherUtilityTest.java

diff --git a/res/drawable/ic_gm_close_24.xml b/res/drawable/ic_gm_close_24.xml
new file mode 100644
index 0000000000..2c9c932fa3
--- /dev/null
+++ b/res/drawable/ic_gm_close_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?android:attr/textColorTertiary"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12 19,6.41z"/>
+</vector>
diff --git a/res/layout/widgets_full_sheet_search_and_recommendations.xml b/res/layout/widgets_full_sheet_search_and_recommendations.xml
index 9a6f922d7d..6182255dc6 100644
--- a/res/layout/widgets_full_sheet_search_and_recommendations.xml
+++ b/res/layout/widgets_full_sheet_search_and_recommendations.xml
@@ -34,16 +34,5 @@
         android:textSize="24sp"
         android:layout_marginTop="16dp"
         android:text="@string/widget_button_text"/>
-    <!-- Disable the search bar because it has not been implemented. -->
-    <EditText
-        android:id="@+id/widgets_search_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        android:layout_marginTop="16dp"
-        android:background="@drawable/bg_widgets_searchbox"
-        android:drawablePadding="8dp"
-        android:drawableStart="@drawable/ic_allapps_search"
-        android:hint="@string/widgets_full_sheet_search_bar_hint"
-        android:padding="12dp" />
+    <include layout="@layout/widgets_search_bar"/>
 </LinearLayout>
diff --git a/res/layout/widgets_search_bar.xml b/res/layout/widgets_search_bar.xml
new file mode 100644
index 0000000000..252637d9cf
--- /dev/null
+++ b/res/layout/widgets_search_bar.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.android.launcher3.widget.picker.search.WidgetsSearchBar
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/widgets_search_bar"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:layout_marginTop="16dp"
+    android:background="@drawable/bg_widgets_searchbox"
+    android:padding="12dp"
+    android:visibility="gone">
+
+    <EditText
+        android:id="@+id/widgets_search_bar_edit_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:drawablePadding="8dp"
+        android:drawableStart="@drawable/ic_allapps_search"
+        android:background="@null"
+        android:hint="@string/widgets_full_sheet_search_bar_hint"
+        android:maxLines="1"
+        android:layout_weight="1"
+        android:inputType="text"/>
+
+    <ImageButton
+        android:id="@+id/widgets_search_cancel_button"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:src="@drawable/ic_gm_close_24"
+        android:background="?android:selectableItemBackground"
+        android:layout_gravity="center"
+        android:visibility="gone"/>
+</com.android.launcher3.widget.picker.search.WidgetsSearchBar>
\ No newline at end of file
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchPipelineTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchPipelineTest.java
index 8aebf12b89..17ededdb37 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchPipelineTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchPipelineTest.java
@@ -19,8 +19,6 @@ package com.android.launcher3.widget.picker.search;
 import static android.os.Looper.getMainLooper;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doAnswer;
 import static org.robolectric.Shadows.shadowOf;
@@ -40,6 +38,7 @@ import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.model.WidgetsListContentEntry;
 import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
+import com.android.launcher3.widget.model.WidgetsListSearchHeaderEntry;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -56,9 +55,6 @@ import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
 public class SimpleWidgetsSearchPipelineTest {
-    private static final SimpleWidgetsSearchPipeline.StringMatcher MATCHER =
-            SimpleWidgetsSearchPipeline.StringMatcher.getInstance();
-
     @Mock private IconCache mIconCache;
 
     private InvariantDeviceProfile mTestProfile;
@@ -73,9 +69,10 @@ public class SimpleWidgetsSearchPipelineTest {
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        doAnswer(invocation -> ((ComponentWithLabel) invocation.getArgument(0))
-                .getComponent().getPackageName())
-                .when(mIconCache).getTitleNoCache(any());
+        doAnswer(invocation -> {
+            ComponentWithLabel componentWithLabel = (ComponentWithLabel) invocation.getArgument(0);
+            return componentWithLabel.getComponent().getShortClassName();
+        }).when(mIconCache).getTitleNoCache(any());
         mTestProfile = new InvariantDeviceProfile();
         mTestProfile.numRows = 5;
         mTestProfile.numColumns = 5;
@@ -85,54 +82,60 @@ public class SimpleWidgetsSearchPipelineTest {
                 createWidgetsHeaderEntry("com.example.android.Calendar", "Calendar", 2);
         mCalendarContentEntry =
                 createWidgetsContentEntry("com.example.android.Calendar", "Calendar", 2);
-        mCameraHeaderEntry = createWidgetsHeaderEntry("com.example.android.Camera", "Camera", 5);
-        mCameraContentEntry = createWidgetsContentEntry("com.example.android.Camera", "Camera", 5);
+        mCameraHeaderEntry = createWidgetsHeaderEntry("com.example.android.Camera", "Camera", 11);
+        mCameraContentEntry = createWidgetsContentEntry("com.example.android.Camera", "Camera", 11);
         mClockHeaderEntry = createWidgetsHeaderEntry("com.example.android.Clock", "Clock", 3);
         mClockContentEntry = createWidgetsContentEntry("com.example.android.Clock", "Clock", 3);
     }
 
     @Test
-    public void query_shouldInformCallbackWithResultsMatchedOnAppName() {
+    public void query_shouldMatchOnAppName() {
         SimpleWidgetsSearchPipeline pipeline = new SimpleWidgetsSearchPipeline(
                 List.of(mCalendarHeaderEntry, mCalendarContentEntry, mCameraHeaderEntry,
                         mCameraContentEntry, mClockHeaderEntry, mClockContentEntry));
 
         pipeline.query("Ca", results ->
-                assertEquals(results, List.of(mCalendarHeaderEntry, mCalendarContentEntry,
-                        mCameraHeaderEntry, mCameraContentEntry)));
+                assertEquals(results,
+                        List.of(
+                                new WidgetsListSearchHeaderEntry(
+                                        mCalendarHeaderEntry.mPkgItem,
+                                        mCalendarHeaderEntry.mTitleSectionName,
+                                        mCalendarHeaderEntry.mWidgets),
+                                mCalendarContentEntry,
+                                new WidgetsListSearchHeaderEntry(
+                                        mCameraHeaderEntry.mPkgItem,
+                                        mCameraHeaderEntry.mTitleSectionName,
+                                        mCameraHeaderEntry.mWidgets),
+                                mCameraContentEntry)));
         shadowOf(getMainLooper()).idle();
     }
 
     @Test
-    public void testMatches() {
-        assertTrue(MATCHER.matches("q", "Q"));
-        assertTrue(MATCHER.matches("q", "  Q"));
-        assertTrue(MATCHER.matches("e", "elephant"));
-        assertTrue(MATCHER.matches("eL", "Elephant"));
-        assertTrue(MATCHER.matches("elephant ", "elephant"));
-        assertTrue(MATCHER.matches("whitec", "white cow"));
-        assertTrue(MATCHER.matches("white  c", "white cow"));
-        assertTrue(MATCHER.matches("white ", "white cow"));
-        assertTrue(MATCHER.matches("white c", "white cow"));
-        assertTrue(MATCHER.matches("电", "电子邮件"));
-        assertTrue(MATCHER.matches("电子", "电子邮件"));
-        assertTrue(MATCHER.matches("다", "다운로드"));
-        assertTrue(MATCHER.matches("드", "드라이브"));
-        assertTrue(MATCHER.matches("åbç", "abc"));
-        assertTrue(MATCHER.matches("ål", "Alpha"));
-
-        assertFalse(MATCHER.matches("phant", "elephant"));
-        assertFalse(MATCHER.matches("elephants", "elephant"));
-        assertFalse(MATCHER.matches("cow", "white cow"));
-        assertFalse(MATCHER.matches("cow", "whiteCow"));
-        assertFalse(MATCHER.matches("dog", "cats&Dogs"));
-        assertFalse(MATCHER.matches("ba", "Bot"));
-        assertFalse(MATCHER.matches("ba", "bot"));
-        assertFalse(MATCHER.matches("子", "电子邮件"));
-        assertFalse(MATCHER.matches("邮件", "电子邮件"));
-        assertFalse(MATCHER.matches("ㄷ", "다운로드 드라이브"));
-        assertFalse(MATCHER.matches("ㄷㄷ", "다운로드 드라이브"));
-        assertFalse(MATCHER.matches("åç", "abc"));
+    public void query_shouldMatchOnWidgetLabel() {
+        SimpleWidgetsSearchPipeline pipeline = new SimpleWidgetsSearchPipeline(
+                List.of(mCalendarHeaderEntry, mCalendarContentEntry, mCameraHeaderEntry,
+                        mCameraContentEntry));
+
+        pipeline.query("Widget1", results ->
+                assertEquals(results,
+                        List.of(
+                                new WidgetsListSearchHeaderEntry(
+                                        mCalendarHeaderEntry.mPkgItem,
+                                        mCalendarHeaderEntry.mTitleSectionName,
+                                        mCalendarHeaderEntry.mWidgets.subList(1, 2)),
+                                new WidgetsListContentEntry(
+                                        mCalendarHeaderEntry.mPkgItem,
+                                        mCalendarHeaderEntry.mTitleSectionName,
+                                        mCalendarHeaderEntry.mWidgets.subList(1, 2)),
+                                new WidgetsListSearchHeaderEntry(
+                                        mCameraHeaderEntry.mPkgItem,
+                                        mCameraHeaderEntry.mTitleSectionName,
+                                        mCameraHeaderEntry.mWidgets.subList(1, 3)),
+                                new WidgetsListContentEntry(
+                                        mCameraHeaderEntry.mPkgItem,
+                                        mCameraHeaderEntry.mTitleSectionName,
+                                        mCameraHeaderEntry.mWidgets.subList(1, 3)))));
+        shadowOf(getMainLooper()).idle();
     }
 
     private WidgetsListHeaderEntry createWidgetsHeaderEntry(String packageName, String appName,
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarControllerTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarControllerTest.java
new file mode 100644
index 0000000000..7fc965051d
--- /dev/null
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarControllerTest.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.widget.picker.search;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.ImageButton;
+
+import com.android.launcher3.search.SearchAlgorithm;
+import com.android.launcher3.widget.model.WidgetsListBaseEntry;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.ArrayList;
+
+@RunWith(RobolectricTestRunner.class)
+public class WidgetsSearchBarControllerTest {
+
+    private WidgetsSearchBarController mController;
+    private Context mContext;
+    private EditText mEditText;
+    private ImageButton mCancelButton;
+    @Mock
+    private SearchModeListener mSearchModeListener;
+    @Mock
+    private SearchAlgorithm<WidgetsListBaseEntry> mSearchAlgorithm;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mEditText = new EditText(mContext);
+        mCancelButton = new ImageButton(mContext);
+        mController = new WidgetsSearchBarController(
+                mSearchAlgorithm, mEditText, mCancelButton, mSearchModeListener);
+    }
+
+    @Test
+    public void onSearchResult_shouldInformSearchModeListener() {
+        ArrayList<WidgetsListBaseEntry> entries = new ArrayList<>();
+        mController.onSearchResult("abc", entries);
+
+        verify(mSearchModeListener).onSearchResults(entries);
+    }
+
+    @Test
+    public void afterTextChanged_shouldInformSearchModeListenerToEnterSearch() {
+        mEditText.setText("abc");
+
+        verify(mSearchModeListener).enterSearchMode();
+        verifyNoMoreInteractions(mSearchModeListener);
+    }
+
+    @Test
+    public void afterTextChanged_shouldDoSearch() {
+        mEditText.setText("abc");
+
+        verify(mSearchAlgorithm).doSearch(eq("abc"), any());
+    }
+
+    @Test
+    public void afterTextChanged_shouldShowCancelButton() {
+        mEditText.setText("abc");
+
+        assertEquals(mCancelButton.getVisibility(), View.VISIBLE);
+    }
+
+    @Test
+    public void afterTextChanged_empty_shouldInformSearchModeListenerToExitSearch() {
+        mEditText.setText("");
+
+        verify(mSearchModeListener).exitSearchMode();
+        verifyNoMoreInteractions(mSearchModeListener);
+    }
+
+    @Test
+    public void afterTextChanged_empty_shouldCancelSearch() {
+        mEditText.setText("");
+
+        verify(mSearchAlgorithm).cancel(true);
+        verifyNoMoreInteractions(mSearchAlgorithm);
+    }
+
+    @Test
+    public void afterTextChanged_empty_shouldHideCancelButton() {
+        mEditText.setText("");
+
+        assertEquals(mCancelButton.getVisibility(), View.GONE);
+    }
+
+    @Test
+    public void cancelSearch_shouldInformSearchModeListenerToExitSearch() {
+        mCancelButton.performClick();
+
+        verify(mSearchModeListener).exitSearchMode();
+        verifyNoMoreInteractions(mSearchModeListener);
+    }
+
+    @Test
+    public void cancelSearch_shouldCancelSearch() {
+        mCancelButton.performClick();
+
+        verify(mSearchAlgorithm).cancel(true);
+        verifyNoMoreInteractions(mSearchAlgorithm);
+    }
+
+    @Test
+    public void cancelSearch_shouldClearSearchBar() {
+        mCancelButton.performClick();
+
+        assertEquals(mEditText.getText().toString(), "");
+    }
+}
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java b/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
index f9fb22ece7..34895ed5f5 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
@@ -25,6 +25,7 @@ import com.android.launcher3.model.AllAppsList;
 import com.android.launcher3.model.BaseModelUpdateTask;
 import com.android.launcher3.model.BgDataModel;
 import com.android.launcher3.model.data.AppInfo;
+import com.android.launcher3.search.StringMatcherUtility;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -67,10 +68,10 @@ public class AppsSearchPipeline implements SearchPipeline {
         // apps that don't match all of the words in the query.
         final String queryTextLower = query.toLowerCase();
         final ArrayList<AppInfo> result = new ArrayList<>();
-        DefaultAppSearchAlgorithm.StringMatcher matcher =
-                DefaultAppSearchAlgorithm.StringMatcher.getInstance();
+        StringMatcherUtility.StringMatcher matcher =
+                StringMatcherUtility.StringMatcher.getInstance();
         for (AppInfo info : apps) {
-            if (DefaultAppSearchAlgorithm.matches(info, queryTextLower, matcher)) {
+            if (StringMatcherUtility.matches(queryTextLower, info.title.toString(), matcher)) {
                 result.add(info);
             }
         }
diff --git a/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java b/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java
index 4e213b0a1b..a386ef8ee2 100644
--- a/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java
+++ b/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java
@@ -20,12 +20,9 @@ import android.os.Handler;
 
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItem;
-import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.search.SearchAlgorithm;
 import com.android.launcher3.search.SearchCallback;
 
-import java.text.Collator;
-
 /**
  * The default search implementation.
  */
@@ -54,132 +51,4 @@ public class DefaultAppSearchAlgorithm implements SearchAlgorithm<AdapterItem> {
                         () -> callback.onSearchResult(query, results)),
                 null);
     }
-
-    public static boolean matches(AppInfo info, String query, StringMatcher matcher) {
-        int queryLength = query.length();
-
-        String title = info.title.toString();
-        int titleLength = title.length();
-
-        if (titleLength < queryLength || queryLength <= 0) {
-            return false;
-        }
-
-        if (requestSimpleFuzzySearch(query)) {
-            return title.toLowerCase().contains(query);
-        }
-
-        int lastType;
-        int thisType = Character.UNASSIGNED;
-        int nextType = Character.getType(title.codePointAt(0));
-
-        int end = titleLength - queryLength;
-        for (int i = 0; i <= end; i++) {
-            lastType = thisType;
-            thisType = nextType;
-            nextType = i < (titleLength - 1) ?
-                    Character.getType(title.codePointAt(i + 1)) : Character.UNASSIGNED;
-            if (isBreak(thisType, lastType, nextType) &&
-                    matcher.matches(query, title.substring(i, i + queryLength))) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Returns true if the current point should be a break point. Following cases
-     * are considered as break points:
-     *      1) Any non space character after a space character
-     *      2) Any digit after a non-digit character
-     *      3) Any capital character after a digit or small character
-     *      4) Any capital character before a small character
-     */
-    private static boolean isBreak(int thisType, int prevType, int nextType) {
-        switch (prevType) {
-            case Character.UNASSIGNED:
-            case Character.SPACE_SEPARATOR:
-            case Character.LINE_SEPARATOR:
-            case Character.PARAGRAPH_SEPARATOR:
-                return true;
-        }
-        switch (thisType) {
-            case Character.UPPERCASE_LETTER:
-                if (nextType == Character.UPPERCASE_LETTER) {
-                    return true;
-                }
-                // Follow through
-            case Character.TITLECASE_LETTER:
-                // Break point if previous was not a upper case
-                return prevType != Character.UPPERCASE_LETTER;
-            case Character.LOWERCASE_LETTER:
-                // Break point if previous was not a letter.
-                return prevType > Character.OTHER_LETTER || prevType <= Character.UNASSIGNED;
-            case Character.DECIMAL_DIGIT_NUMBER:
-            case Character.LETTER_NUMBER:
-            case Character.OTHER_NUMBER:
-                // Break point if previous was not a number
-                return !(prevType == Character.DECIMAL_DIGIT_NUMBER
-                        || prevType == Character.LETTER_NUMBER
-                        || prevType == Character.OTHER_NUMBER);
-            case Character.MATH_SYMBOL:
-            case Character.CURRENCY_SYMBOL:
-            case Character.OTHER_PUNCTUATION:
-            case Character.DASH_PUNCTUATION:
-                // Always a break point for a symbol
-                return true;
-            default:
-                return  false;
-        }
-    }
-
-    public static class StringMatcher {
-
-        private static final char MAX_UNICODE = '\uFFFF';
-
-        private final Collator mCollator;
-
-        StringMatcher() {
-            // On android N and above, Collator uses ICU implementation which has a much better
-            // support for non-latin locales.
-            mCollator = Collator.getInstance();
-            mCollator.setStrength(Collator.PRIMARY);
-            mCollator.setDecomposition(Collator.CANONICAL_DECOMPOSITION);
-        }
-
-        /**
-         * Returns true if {@param query} is a prefix of {@param target}
-         */
-        public boolean matches(String query, String target) {
-            switch (mCollator.compare(query, target)) {
-                case 0:
-                    return true;
-                case -1:
-                    // The target string can contain a modifier which would make it larger than
-                    // the query string (even though the length is same). If the query becomes
-                    // larger after appending a unicode character, it was originally a prefix of
-                    // the target string and hence should match.
-                    return mCollator.compare(query + MAX_UNICODE, target) > -1;
-                default:
-                    return false;
-            }
-        }
-
-        public static StringMatcher getInstance() {
-            return new StringMatcher();
-        }
-    }
-
-    private static boolean requestSimpleFuzzySearch(String s) {
-        for (int i = 0; i < s.length(); ) {
-            int codepoint = s.codePointAt(i);
-            i += Character.charCount(codepoint);
-            switch (Character.UnicodeScript.of(codepoint)) {
-                case HAN:
-                    //Character.UnicodeScript.HAN: use String.contains to match
-                    return true;
-            }
-        }
-        return false;
-    }
 }
diff --git a/src/com/android/launcher3/search/SearchAlgorithm.java b/src/com/android/launcher3/search/SearchAlgorithm.java
index 1665354af2..a1720c733b 100644
--- a/src/com/android/launcher3/search/SearchAlgorithm.java
+++ b/src/com/android/launcher3/search/SearchAlgorithm.java
@@ -31,4 +31,9 @@ public interface SearchAlgorithm<T> {
      * Cancels any active request.
      */
     void cancel(boolean interruptActiveRequests);
+
+    /**
+     * Cleans up after search is no longer needed.
+     */
+    default void destroy() {};
 }
diff --git a/src/com/android/launcher3/search/StringMatcherUtility.java b/src/com/android/launcher3/search/StringMatcherUtility.java
new file mode 100644
index 0000000000..acab52bbe8
--- /dev/null
+++ b/src/com/android/launcher3/search/StringMatcherUtility.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.search;
+
+import java.text.Collator;
+
+/**
+ * Utilities for matching query string to target string.
+ */
+public class StringMatcherUtility {
+
+    /**
+     * Returns {@code true} is {@code query} is a prefix substring of a complete word/phrase in
+     * {@code target}.
+     */
+    public static boolean matches(String query, String target, StringMatcher matcher) {
+        int queryLength = query.length();
+
+        int targetLength = target.length();
+
+        if (targetLength < queryLength || queryLength <= 0) {
+            return false;
+        }
+
+        if (requestSimpleFuzzySearch(query)) {
+            return target.toLowerCase().contains(query);
+        }
+
+        int lastType;
+        int thisType = Character.UNASSIGNED;
+        int nextType = Character.getType(target.codePointAt(0));
+
+        int end = targetLength - queryLength;
+        for (int i = 0; i <= end; i++) {
+            lastType = thisType;
+            thisType = nextType;
+            nextType = i < (targetLength - 1)
+                    ? Character.getType(target.codePointAt(i + 1)) : Character.UNASSIGNED;
+            if (isBreak(thisType, lastType, nextType)
+                    && matcher.matches(query, target.substring(i, i + queryLength))) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Returns true if the current point should be a break point. Following cases
+     * are considered as break points:
+     *      1) Any non space character after a space character
+     *      2) Any digit after a non-digit character
+     *      3) Any capital character after a digit or small character
+     *      4) Any capital character before a small character
+     */
+    private static boolean isBreak(int thisType, int prevType, int nextType) {
+        switch (prevType) {
+            case Character.UNASSIGNED:
+            case Character.SPACE_SEPARATOR:
+            case Character.LINE_SEPARATOR:
+            case Character.PARAGRAPH_SEPARATOR:
+                return true;
+        }
+        switch (thisType) {
+            case Character.UPPERCASE_LETTER:
+                if (nextType == Character.UPPERCASE_LETTER) {
+                    return true;
+                }
+                // Follow through
+            case Character.TITLECASE_LETTER:
+                // Break point if previous was not a upper case
+                return prevType != Character.UPPERCASE_LETTER;
+            case Character.LOWERCASE_LETTER:
+                // Break point if previous was not a letter.
+                return prevType > Character.OTHER_LETTER || prevType <= Character.UNASSIGNED;
+            case Character.DECIMAL_DIGIT_NUMBER:
+            case Character.LETTER_NUMBER:
+            case Character.OTHER_NUMBER:
+                // Break point if previous was not a number
+                return !(prevType == Character.DECIMAL_DIGIT_NUMBER
+                        || prevType == Character.LETTER_NUMBER
+                        || prevType == Character.OTHER_NUMBER);
+            case Character.MATH_SYMBOL:
+            case Character.CURRENCY_SYMBOL:
+            case Character.OTHER_PUNCTUATION:
+            case Character.DASH_PUNCTUATION:
+                // Always a break point for a symbol
+                return true;
+            default:
+                return  false;
+        }
+    }
+
+    /**
+     * Performs locale sensitive string comparison using {@link Collator}.
+     */
+    public static class StringMatcher {
+
+        private static final char MAX_UNICODE = '\uFFFF';
+
+        private final Collator mCollator;
+
+        StringMatcher() {
+            // On android N and above, Collator uses ICU implementation which has a much better
+            // support for non-latin locales.
+            mCollator = Collator.getInstance();
+            mCollator.setStrength(Collator.PRIMARY);
+            mCollator.setDecomposition(Collator.CANONICAL_DECOMPOSITION);
+        }
+
+        /**
+         * Returns true if {@param query} is a prefix of {@param target}
+         */
+        public boolean matches(String query, String target) {
+            switch (mCollator.compare(query, target)) {
+                case 0:
+                    return true;
+                case -1:
+                    // The target string can contain a modifier which would make it larger than
+                    // the query string (even though the length is same). If the query becomes
+                    // larger after appending a unicode character, it was originally a prefix of
+                    // the target string and hence should match.
+                    return mCollator.compare(query + MAX_UNICODE, target) > -1;
+                default:
+                    return false;
+            }
+        }
+
+        public static StringMatcher getInstance() {
+            return new StringMatcher();
+        }
+    }
+
+    /**
+     * Matching optimization to search in Chinese.
+     */
+    private static boolean requestSimpleFuzzySearch(String s) {
+        for (int i = 0; i < s.length(); ) {
+            int codepoint = s.codePointAt(i);
+            i += Character.charCount(codepoint);
+            switch (Character.UnicodeScript.of(codepoint)) {
+                case HAN:
+                    //Character.UnicodeScript.HAN: use String.contains to match
+                    return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/src/com/android/launcher3/widget/model/WidgetsListBaseEntry.java b/src/com/android/launcher3/widget/model/WidgetsListBaseEntry.java
index d09fd49e6e..73bae6f484 100644
--- a/src/com/android/launcher3/widget/model/WidgetsListBaseEntry.java
+++ b/src/com/android/launcher3/widget/model/WidgetsListBaseEntry.java
@@ -20,10 +20,14 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
 
 import androidx.annotation.IntDef;
 
+import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.PackageItemInfo;
+import com.android.launcher3.widget.WidgetItemComparator;
 
 import java.lang.annotation.Retention;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /** Holder class to store the package information of an entry shown in the widgets list. */
 public abstract class WidgetsListBaseEntry {
@@ -35,9 +39,14 @@ public abstract class WidgetsListBaseEntry {
      */
     public final String mTitleSectionName;
 
-    public WidgetsListBaseEntry(PackageItemInfo pkgItem, String titleSectionName) {
+    public final List<WidgetItem> mWidgets;
+
+    public WidgetsListBaseEntry(PackageItemInfo pkgItem, String titleSectionName,
+            List<WidgetItem> items) {
         mPkgItem = pkgItem;
         mTitleSectionName = titleSectionName;
+        this.mWidgets =
+                items.stream().sorted(new WidgetItemComparator()).collect(Collectors.toList());
     }
 
     /**
diff --git a/src/com/android/launcher3/widget/model/WidgetsListContentEntry.java b/src/com/android/launcher3/widget/model/WidgetsListContentEntry.java
index afc0f443bd..0328cf68ba 100644
--- a/src/com/android/launcher3/widget/model/WidgetsListContentEntry.java
+++ b/src/com/android/launcher3/widget/model/WidgetsListContentEntry.java
@@ -17,10 +17,8 @@ package com.android.launcher3.widget.model;
 
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.model.data.PackageItemInfo;
-import com.android.launcher3.widget.WidgetItemComparator;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * Holder class to store all the information related to a list of widgets from the same app which is
@@ -28,13 +26,9 @@ import java.util.stream.Collectors;
  */
 public final class WidgetsListContentEntry extends WidgetsListBaseEntry {
 
-    public final List<WidgetItem> mWidgets;
-
     public WidgetsListContentEntry(PackageItemInfo pkgItem, String titleSectionName,
             List<WidgetItem> items) {
-        super(pkgItem, titleSectionName);
-        this.mWidgets =
-                items.stream().sorted(new WidgetItemComparator()).collect(Collectors.toList());
+        super(pkgItem, titleSectionName, items);
     }
 
     @Override
@@ -47,4 +41,12 @@ public final class WidgetsListContentEntry extends WidgetsListBaseEntry {
     public int getRank() {
         return RANK_WIDGETS_LIST_CONTENT;
     }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof WidgetsListContentEntry)) return false;
+        WidgetsListContentEntry otherEntry = (WidgetsListContentEntry) obj;
+        return mWidgets.equals(otherEntry.mWidgets) && mPkgItem.equals(otherEntry.mPkgItem)
+                && mTitleSectionName.equals(otherEntry.mTitleSectionName);
+    }
 }
diff --git a/src/com/android/launcher3/widget/model/WidgetsListHeaderEntry.java b/src/com/android/launcher3/widget/model/WidgetsListHeaderEntry.java
index 309b678409..1fdc39959a 100644
--- a/src/com/android/launcher3/widget/model/WidgetsListHeaderEntry.java
+++ b/src/com/android/launcher3/widget/model/WidgetsListHeaderEntry.java
@@ -17,25 +17,21 @@ package com.android.launcher3.widget.model;
 
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.model.data.PackageItemInfo;
-import com.android.launcher3.widget.WidgetItemComparator;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 /** An information holder for an app which has widgets or/and shortcuts. */
 public final class WidgetsListHeaderEntry extends WidgetsListBaseEntry {
 
     public final int widgetsCount;
     public final int shortcutsCount;
-    public final List<WidgetItem> mWidgets;
 
     private boolean mIsWidgetListShown = false;
     private boolean mHasEntryUpdated = false;
 
     public WidgetsListHeaderEntry(PackageItemInfo pkgItem, String titleSectionName,
             List<WidgetItem> items) {
-        super(pkgItem, titleSectionName);
-        mWidgets = items.stream().sorted(new WidgetItemComparator()).collect(Collectors.toList());
+        super(pkgItem, titleSectionName, items);
         widgetsCount = (int) items.stream().filter(item -> item.widgetInfo != null).count();
         shortcutsCount = Math.max(0, items.size() - widgetsCount);
     }
diff --git a/src/com/android/launcher3/widget/model/WidgetsListSearchHeaderEntry.java b/src/com/android/launcher3/widget/model/WidgetsListSearchHeaderEntry.java
index a8b887bb9e..2aec3f8fd9 100644
--- a/src/com/android/launcher3/widget/model/WidgetsListSearchHeaderEntry.java
+++ b/src/com/android/launcher3/widget/model/WidgetsListSearchHeaderEntry.java
@@ -17,23 +17,18 @@ package com.android.launcher3.widget.model;
 
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.model.data.PackageItemInfo;
-import com.android.launcher3.widget.WidgetItemComparator;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 /** An information holder for an app which has widgets or/and shortcuts, to be shown in search. */
 public final class WidgetsListSearchHeaderEntry extends WidgetsListBaseEntry {
 
-    public final List<WidgetItem> mWidgets;
-
     private boolean mIsWidgetListShown = false;
     private boolean mHasEntryUpdated = false;
 
     public WidgetsListSearchHeaderEntry(PackageItemInfo pkgItem, String titleSectionName,
             List<WidgetItem> items) {
-        super(pkgItem, titleSectionName);
-        mWidgets = items.stream().sorted(new WidgetItemComparator()).collect(Collectors.toList());
+        super(pkgItem, titleSectionName, items);
     }
 
     /** Sets if the widgets list associated with this header is shown. */
diff --git a/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchPipeline.java b/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchPipeline.java
index 99114955aa..5222e8ec59 100644
--- a/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchPipeline.java
+++ b/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchPipeline.java
@@ -16,12 +16,19 @@
 
 package com.android.launcher3.widget.picker.search;
 
+import static com.android.launcher3.search.StringMatcherUtility.matches;
+
+import com.android.launcher3.model.WidgetItem;
+import com.android.launcher3.search.StringMatcherUtility.StringMatcher;
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
+import com.android.launcher3.widget.model.WidgetsListContentEntry;
+import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
+import com.android.launcher3.widget.model.WidgetsListSearchHeaderEntry;
 
-import java.text.Collator;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 /**
  * Implementation of {@link WidgetsPickerSearchPipeline} that performs search by prefix matching on
@@ -37,52 +44,29 @@ public final class SimpleWidgetsSearchPipeline implements WidgetsPickerSearchPip
 
     @Override
     public void query(String input, Consumer<List<WidgetsListBaseEntry>> callback) {
-        StringMatcher matcher =  StringMatcher.getInstance();
         ArrayList<WidgetsListBaseEntry> results = new ArrayList<>();
-        // TODO(b/157286785): Filter entries based on query prefix matching on widget labels also.
-        for (WidgetsListBaseEntry e : mAllEntries) {
-            if (matcher.matches(input, e.mPkgItem.title.toString())) {
-                results.add(e);
-            }
-        }
+        mAllEntries.stream().filter(entry -> entry instanceof WidgetsListHeaderEntry)
+                .forEach(headerEntry -> {
+                    List<WidgetItem> matchedWidgetItems = filterWidgetItems(
+                            input, headerEntry.mPkgItem.title.toString(), headerEntry.mWidgets);
+                    if (matchedWidgetItems.size() > 0) {
+                        results.add(new WidgetsListSearchHeaderEntry(headerEntry.mPkgItem,
+                                headerEntry.mTitleSectionName, matchedWidgetItems));
+                        results.add(new WidgetsListContentEntry(headerEntry.mPkgItem,
+                                headerEntry.mTitleSectionName, matchedWidgetItems));
+                    }
+                });
         callback.accept(results);
     }
 
-    /**
-     * Performs locale sensitive string comparison using {@link Collator}.
-     */
-    public static class StringMatcher {
-
-        private static final char MAX_UNICODE = '\uFFFF';
-
-        private final Collator mCollator;
-
-        StringMatcher() {
-            mCollator = Collator.getInstance();
-            mCollator.setStrength(Collator.PRIMARY);
-            mCollator.setDecomposition(Collator.CANONICAL_DECOMPOSITION);
-        }
-
-        /**
-         * Returns true if {@param query} is a prefix of {@param target}.
-         */
-        public boolean matches(String query, String target) {
-            switch (mCollator.compare(query, target)) {
-                case 0:
-                    return true;
-                case -1:
-                    // The target string can contain a modifier which would make it larger than
-                    // the query string (even though the length is same). If the query becomes
-                    // larger after appending a unicode character, it was originally a prefix of
-                    // the target string and hence should match.
-                    return mCollator.compare(query + MAX_UNICODE, target) > -1;
-                default:
-                    return false;
-            }
-        }
-
-        public static StringMatcher getInstance() {
-            return new StringMatcher();
+    private List<WidgetItem> filterWidgetItems(String query, String packageTitle,
+            List<WidgetItem> items) {
+        StringMatcher matcher = StringMatcher.getInstance();
+        if (matches(query, packageTitle, matcher)) {
+            return items;
         }
+        return items.stream()
+                .filter(item -> matches(query, item.label, matcher))
+                .collect(Collectors.toList());
     }
 }
diff --git a/src/com/android/launcher3/widget/picker/search/WidgetsSearchBar.java b/src/com/android/launcher3/widget/picker/search/WidgetsSearchBar.java
new file mode 100644
index 0000000000..d8e9733ce5
--- /dev/null
+++ b/src/com/android/launcher3/widget/picker/search/WidgetsSearchBar.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.widget.picker.search;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.R;
+import com.android.launcher3.search.SearchAlgorithm;
+import com.android.launcher3.widget.model.WidgetsListBaseEntry;
+
+import java.util.List;
+
+/**
+ * View for a search bar with an edit text with a cancel button.
+ */
+public class WidgetsSearchBar extends LinearLayout {
+    private WidgetsSearchBarController mController;
+    private EditText mEditText;
+    private ImageButton mCancelButton;
+
+    public WidgetsSearchBar(Context context) {
+        this(context, null, 0);
+    }
+
+    public WidgetsSearchBar(@NonNull Context context,
+            @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public WidgetsSearchBar(@NonNull Context context, @Nullable AttributeSet attrs,
+            int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    /**
+     * Attaches a controller to the search bar which interacts with {@code searchModeListener}.
+     */
+    public void initialize(List<WidgetsListBaseEntry> allWidgets,
+            SearchModeListener searchModeListener) {
+        SearchAlgorithm<WidgetsListBaseEntry> algo =
+                new SimpleWidgetsSearchAlgorithm(new SimpleWidgetsSearchPipeline(allWidgets));
+        mController = new WidgetsSearchBarController(
+                algo, mEditText, mCancelButton, searchModeListener);
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mEditText = findViewById(R.id.widgets_search_bar_edit_text);
+        mCancelButton = findViewById(R.id.widgets_search_cancel_button);
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        mController.onDestroy();
+    }
+}
diff --git a/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarController.java b/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarController.java
new file mode 100644
index 0000000000..6c374842fd
--- /dev/null
+++ b/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarController.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.widget.picker.search;
+
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
+
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.util.Log;
+import android.widget.EditText;
+import android.widget.ImageButton;
+
+import com.android.launcher3.search.SearchAlgorithm;
+import com.android.launcher3.search.SearchCallback;
+import com.android.launcher3.widget.model.WidgetsListBaseEntry;
+
+import java.util.ArrayList;
+
+/**
+ * Controller for a search bar with an edit text and a cancel button.
+ */
+public class WidgetsSearchBarController implements TextWatcher,
+        SearchCallback<WidgetsListBaseEntry> {
+    private static final String TAG = "WidgetsSearchBarController";
+    private static final boolean DEBUG = false;
+
+    protected SearchAlgorithm<WidgetsListBaseEntry> mSearchAlgorithm;
+    protected EditText mInput;
+    protected ImageButton mCancelButton;
+    protected SearchModeListener mSearchModeListener;
+    protected String mQuery;
+
+    public WidgetsSearchBarController(
+            SearchAlgorithm<WidgetsListBaseEntry> algo, EditText editText, ImageButton cancelButton,
+            SearchModeListener searchModeListener) {
+        mSearchAlgorithm = algo;
+        mInput = editText;
+        mInput.addTextChangedListener(this);
+        mCancelButton = cancelButton;
+        mCancelButton.setOnClickListener(v -> clearSearchResult());
+        mSearchModeListener = searchModeListener;
+    }
+
+    @Override
+    public void afterTextChanged(final Editable s) {
+        mQuery = s.toString();
+        if (mQuery.isEmpty()) {
+            mSearchAlgorithm.cancel(/* interruptActiveRequests= */ true);
+            mSearchModeListener.exitSearchMode();
+            mCancelButton.setVisibility(GONE);
+        } else {
+            mSearchAlgorithm.cancel(/* interruptActiveRequests= */ false);
+            mSearchModeListener.enterSearchMode();
+            mSearchAlgorithm.doSearch(mQuery, this);
+            mCancelButton.setVisibility(VISIBLE);
+        }
+    }
+
+    @Override
+    public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+        // Do nothing.
+    }
+
+    @Override
+    public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+        // Do nothing.
+    }
+
+    @Override
+    public void onSearchResult(String query, ArrayList<WidgetsListBaseEntry> items) {
+        if (DEBUG) {
+            Log.d(TAG, "onSearchResult query: " + query + " items: " + items);
+        }
+        mSearchModeListener.onSearchResults(items);
+    }
+
+    @Override
+    public void onAppendSearchResult(String query, ArrayList<WidgetsListBaseEntry> items) {
+        // Not needed.
+    }
+
+    @Override
+    public void clearSearchResult() {
+        mSearchAlgorithm.cancel(/* interruptActiveRequests= */ true);
+        mInput.getText().clear();
+        mInput.clearFocus();
+        mSearchModeListener.exitSearchMode();
+    }
+
+    /**
+     * Cleans up after search is no longer needed.
+     */
+    public void onDestroy() {
+        mSearchAlgorithm.destroy();
+    }
+}
diff --git a/tests/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithmTest.java b/tests/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithmTest.java
deleted file mode 100644
index 39709a9539..0000000000
--- a/tests/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithmTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.allapps.search;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import android.content.ComponentName;
-
-import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.launcher3.model.data.AppInfo;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * Unit tests for {@link DefaultAppSearchAlgorithm}
- */
-@SmallTest
-@RunWith(AndroidJUnit4.class)
-public class DefaultAppSearchAlgorithmTest {
-    private static final DefaultAppSearchAlgorithm.StringMatcher MATCHER =
-            DefaultAppSearchAlgorithm.StringMatcher.getInstance();
-
-    @Test
-    public void testMatches() {
-        assertTrue(DefaultAppSearchAlgorithm.matches(getInfo("white cow"), "cow", MATCHER));
-        assertTrue(DefaultAppSearchAlgorithm.matches(getInfo("whiteCow"), "cow", MATCHER));
-        assertTrue(DefaultAppSearchAlgorithm.matches(getInfo("whiteCOW"), "cow", MATCHER));
-        assertTrue(DefaultAppSearchAlgorithm.matches(getInfo("whitecowCOW"), "cow", MATCHER));
-        assertTrue(DefaultAppSearchAlgorithm.matches(getInfo("white2cow"), "cow", MATCHER));
-
-        assertFalse(DefaultAppSearchAlgorithm.matches(getInfo("whitecow"), "cow", MATCHER));
-        assertFalse(DefaultAppSearchAlgorithm.matches(getInfo("whitEcow"), "cow", MATCHER));
-
-        assertTrue(DefaultAppSearchAlgorithm.matches(getInfo("whitecowCow"), "cow", MATCHER));
-        assertTrue(DefaultAppSearchAlgorithm.matches(getInfo("whitecow cow"), "cow", MATCHER));
-        assertFalse(DefaultAppSearchAlgorithm.matches(getInfo("whitecowcow"), "cow", MATCHER));
-        assertFalse(DefaultAppSearchAlgorithm.matches(getInfo("whit ecowcow"), "cow", MATCHER));
-
-        assertTrue(DefaultAppSearchAlgorithm.matches(getInfo("cats&dogs"), "dog", MATCHER));
-        assertTrue(DefaultAppSearchAlgorithm.matches(getInfo("cats&Dogs"), "dog", MATCHER));
-        assertTrue(DefaultAppSearchAlgorithm.matches(getInfo("cats&Dogs"), "&", MATCHER));
-
-        assertTrue(DefaultAppSearchAlgorithm.matches(getInfo("2+43"), "43", MATCHER));
-        assertFalse(DefaultAppSearchAlgorithm.matches(getInfo("2+43"), "3", MATCHER));
-
-        assertTrue(DefaultAppSearchAlgorithm.matches(getInfo("Q"), "q", MATCHER));
-        assertTrue(DefaultAppSearchAlgorithm.matches(getInfo("  Q"), "q", MATCHER));
-
-        // match lower case words
-        assertTrue(DefaultAppSearchAlgorithm.matches(getInfo("elephant"), "e", MATCHER));
-
-        assertTrue(DefaultAppSearchAlgorithm.matches(getInfo("电子邮件"), "电", MATCHER));
-        assertTrue(DefaultAppSearchAlgorithm.matches(getInfo("电子邮件"), "电子", MATCHER));
-        assertTrue(DefaultAppSearchAlgorithm.matches(getInfo("电子邮件"), "子", MATCHER));
-        assertTrue(DefaultAppSearchAlgorithm.matches(getInfo("电子邮件"), "邮件", MATCHER));
-
-        assertFalse(DefaultAppSearchAlgorithm.matches(getInfo("Bot"), "ba", MATCHER));
-        assertFalse(DefaultAppSearchAlgorithm.matches(getInfo("bot"), "ba", MATCHER));
-    }
-
-    @Test
-    public void testMatchesVN() {
-        assertTrue(DefaultAppSearchAlgorithm.matches(getInfo("다운로드"), "다", MATCHER));
-        assertTrue(DefaultAppSearchAlgorithm.matches(getInfo("드라이브"), "드", MATCHER));
-        assertTrue(DefaultAppSearchAlgorithm.matches(getInfo("다운로드 드라이브"), "ㄷ", MATCHER));
-        assertTrue(DefaultAppSearchAlgorithm.matches(getInfo("운로 드라이브"), "ㄷ", MATCHER));
-        assertTrue(DefaultAppSearchAlgorithm.matches(getInfo("abc"), "åbç", MATCHER));
-        assertTrue(DefaultAppSearchAlgorithm.matches(getInfo("Alpha"), "ål", MATCHER));
-
-        assertFalse(DefaultAppSearchAlgorithm.matches(getInfo("다운로드 드라이브"), "ㄷㄷ", MATCHER));
-        assertFalse(DefaultAppSearchAlgorithm.matches(getInfo("로드라이브"), "ㄷ", MATCHER));
-        assertFalse(DefaultAppSearchAlgorithm.matches(getInfo("abc"), "åç", MATCHER));
-    }
-
-    private AppInfo getInfo(String title) {
-        AppInfo info = new AppInfo();
-        info.title = title;
-        info.componentName = new ComponentName("Test", title);
-        return info;
-    }
-}
diff --git a/tests/src/com/android/launcher3/search/StringMatcherUtilityTest.java b/tests/src/com/android/launcher3/search/StringMatcherUtilityTest.java
new file mode 100644
index 0000000000..413f404406
--- /dev/null
+++ b/tests/src/com/android/launcher3/search/StringMatcherUtilityTest.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.search;
+
+import static com.android.launcher3.search.StringMatcherUtility.matches;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.launcher3.search.StringMatcherUtility.StringMatcher;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Unit tests for {@link StringMatcherUtility}
+ */
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class StringMatcherUtilityTest {
+    private static final StringMatcher MATCHER =
+            StringMatcher.getInstance();
+
+    @Test
+    public void testMatches() {
+        assertTrue(matches("white ", "white cow", MATCHER));
+        assertTrue(matches("white c", "white cow", MATCHER));
+        assertTrue(matches("cow", "white cow", MATCHER));
+        assertTrue(matches("cow", "whiteCow", MATCHER));
+        assertTrue(matches("cow", "whiteCOW", MATCHER));
+        assertTrue(matches("cow", "whitecowCOW", MATCHER));
+        assertTrue(matches("cow", "white2cow", MATCHER));
+
+        assertFalse(matches("cow", "whitecow", MATCHER));
+        assertFalse(matches("cow", "whitEcow", MATCHER));
+
+        assertTrue(matches("cow", "whitecowCow", MATCHER));
+        assertTrue(matches("cow", "whitecow cow", MATCHER));
+        assertFalse(matches("cow", "whitecowcow", MATCHER));
+        assertFalse(matches("cow", "whit ecowcow", MATCHER));
+
+        assertTrue(matches("dog", "cats&dogs", MATCHER));
+        assertTrue(matches("dog", "cats&Dogs", MATCHER));
+        assertTrue(matches("&", "cats&Dogs", MATCHER));
+
+        assertTrue(matches("43", "2+43", MATCHER));
+        assertFalse(matches("3", "2+43", MATCHER));
+
+        assertTrue(matches("q", "Q", MATCHER));
+        assertTrue(matches("q", "  Q", MATCHER));
+
+        // match lower case words
+        assertTrue(matches("e", "elephant", MATCHER));
+        assertTrue(matches("eL", "Elephant", MATCHER));
+
+        assertTrue(matches("电", "电子邮件", MATCHER));
+        assertTrue(matches("电子", "电子邮件", MATCHER));
+        assertTrue(matches("子", "电子邮件", MATCHER));
+        assertTrue(matches("邮件", "电子邮件", MATCHER));
+
+        assertFalse(matches("ba", "Bot", MATCHER));
+        assertFalse(matches("ba", "bot", MATCHER));
+        assertFalse(matches("phant", "elephant", MATCHER));
+        assertFalse(matches("elephants", "elephant", MATCHER));
+    }
+
+    @Test
+    public void testMatchesVN() {
+        assertTrue(matches("다", "다운로드", MATCHER));
+        assertTrue(matches("드", "드라이브", MATCHER));
+        assertTrue(matches("ㄷ", "다운로드 드라이브", MATCHER));
+        assertTrue(matches("ㄷ", "운로 드라이브", MATCHER));
+        assertTrue(matches("åbç", "abc", MATCHER));
+        assertTrue(matches("ål", "Alpha", MATCHER));
+
+        assertFalse(matches("ㄷㄷ", "다운로드 드라이브", MATCHER));
+        assertFalse(matches("ㄷ", "로드라이브", MATCHER));
+        assertFalse(matches("åç", "abc", MATCHER));
+    }
+}
-- 
GitLab


From 354902f725e6946dda0e4539ceb30dd342e01a64 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Mon, 15 Mar 2021 12:03:15 +0000
Subject: [PATCH 0670/1664] Use grid Rect when calculating clear all position

- This is a follow-up of http://ag/13827968 that uses separate grid Rect to calculate grid layout position
- This fixes the case when there are not enough tasks to fill the screen

Bug: 174464863
Test: Launch overview grid with only one task, clear all should not be shown until scrolled
Change-Id: I4c4f720bc83e6f1feca83285adbe567deea2d063
---
 quickstep/src/com/android/quickstep/views/RecentsView.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 9a903dc124..ad98071346 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1624,12 +1624,12 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         float clearAllShorterRowCompensation =
                 mIsRtl ? -shorterRowCompensation : shorterRowCompensation;
 
-        // If the total width is shorter than one task's width, move ClearAllButton further away
+        // If the total width is shorter than one grid's width, move ClearAllButton further away
         // accordingly.
         float clearAllShortTotalCompensation = 0;
         float longRowWidth = Math.max(topRowWidth, bottomRowWidth);
-        if (longRowWidth < mTaskWidth) {
-            float shortTotalCompensation = mTaskWidth - longRowWidth;
+        if (longRowWidth < mLastComputedGridSize.width()) {
+            float shortTotalCompensation = mLastComputedGridSize.width() - longRowWidth;
             clearAllShortTotalCompensation =
                     mIsRtl ? -shortTotalCompensation : shortTotalCompensation;
         }
-- 
GitLab


From 256007747818f1dd55ea735c92fd594473bda22b Mon Sep 17 00:00:00 2001
From: Yogisha Dixit <ydixit@google.com>
Date: Wed, 3 Mar 2021 18:50:00 +0000
Subject: [PATCH 0671/1664] Do not launch configuration activity if
 CONFIGURATION_OPTIONAL.

Test: Created a placeholder widget with CONFIGURATION_OPTIONAL and checked
that configuration activity was not launched.
Bug: 177977976

Change-Id: I854c9b3fb6007fd98009182f68fbf36d4571a81f
---
 .../widget/WidgetAddFlowHandler.java          | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/widget/WidgetAddFlowHandler.java b/src/com/android/launcher3/widget/WidgetAddFlowHandler.java
index 1ac5a3328c..93132664ef 100644
--- a/src/com/android/launcher3/widget/WidgetAddFlowHandler.java
+++ b/src/com/android/launcher3/widget/WidgetAddFlowHandler.java
@@ -15,6 +15,9 @@
  */
 package com.android.launcher3.widget;
 
+import static android.appwidget.AppWidgetProviderInfo.WIDGET_FEATURE_CONFIGURATION_OPTIONAL;
+import static android.appwidget.AppWidgetProviderInfo.WIDGET_FEATURE_RECONFIGURABLE;
+
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
 import android.os.Parcel;
@@ -78,8 +81,22 @@ public class WidgetAddFlowHandler implements Parcelable {
         return true;
     }
 
+    /**
+     * Checks whether the widget needs configuration.
+     *
+     * A widget needs configuration if (1) it has a configuration activity and (2)
+     * it's configuration is not optional.
+     *
+     * @return true if the widget needs configuration, false otherwise.
+     */
     public boolean needsConfigure() {
-        return mProviderInfo.configure != null;
+        int featureFlags = mProviderInfo.widgetFeatures;
+        // A widget's configuration is optional only if it's configuration is marked as optional AND
+        // it can be reconfigured later.
+        boolean configurationOptional = (featureFlags & WIDGET_FEATURE_CONFIGURATION_OPTIONAL) != 0
+                && (featureFlags & WIDGET_FEATURE_RECONFIGURABLE) != 0;
+
+        return mProviderInfo.configure != null && !configurationOptional;
     }
 
     public LauncherAppWidgetProviderInfo getProviderInfo(Context context) {
-- 
GitLab


From 342e9df03c4c154a00fc14dd774caa66f4376add Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Wed, 10 Mar 2021 11:02:19 -0600
Subject: [PATCH 0672/1664] [Search]Implement search session cache in AllApps

- Skips SearchTarget reapplication if the id has not changed
- Resolves Incessant  subtitle on short row

Bug: 181510793
Test: Manual
Change-Id: Ic10ef9682fd3700616b7b1b7a60e82b5f2250fd3
---
 src/com/android/launcher3/Launcher.java       |  10 -
 .../allapps/search/LiveSearchManager.java     | 325 ------------------
 .../android/launcher3/icons/IconCache.java    |  11 +-
 3 files changed, 7 insertions(+), 339 deletions(-)
 delete mode 100644 src/com/android/launcher3/allapps/search/LiveSearchManager.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 1546ee3572..c57f62171e 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -113,7 +113,6 @@ import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.allapps.AllAppsStore;
 import com.android.launcher3.allapps.AllAppsTransitionController;
 import com.android.launcher3.allapps.DiscoveryBounce;
-import com.android.launcher3.allapps.search.LiveSearchManager;
 import com.android.launcher3.anim.PropertyListBuilder;
 import com.android.launcher3.compat.AccessibilityManagerCompat;
 import com.android.launcher3.config.FeatureFlags;
@@ -277,8 +276,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
     private Configuration mOldConfig;
 
-    private LiveSearchManager mLiveSearchManager;
-
     @Thunk
     Workspace mWorkspace;
     @Thunk
@@ -401,8 +398,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         mAllAppsController = new AllAppsTransitionController(this);
         mStateManager = new StateManager<>(this, NORMAL);
 
-        mLiveSearchManager = new LiveSearchManager(this);
-
         mOnboardingPrefs = createOnboardingPrefs(mSharedPrefs);
 
         mAppWidgetManager = new WidgetManagerHelper(this);
@@ -490,10 +485,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         }
     }
 
-    public LiveSearchManager getLiveSearchManager() {
-        return mLiveSearchManager;
-    }
-
     protected LauncherOverlayManager getDefaultOverlay() {
         return new LauncherOverlayManager() { };
     }
@@ -1594,7 +1585,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
         mOverlayManager.onActivityDestroyed(this);
         mUserChangedCallbackCloseable.close();
-        mLiveSearchManager.stop();
     }
 
     public LauncherAccessibilityDelegate getAccessibilityDelegate() {
diff --git a/src/com/android/launcher3/allapps/search/LiveSearchManager.java b/src/com/android/launcher3/allapps/search/LiveSearchManager.java
deleted file mode 100644
index adb882a90a..0000000000
--- a/src/com/android/launcher3/allapps/search/LiveSearchManager.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.allapps.search;
-
-import static com.android.launcher3.LauncherState.ALL_APPS;
-import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-import static com.android.launcher3.util.Executors.THREAD_POOL_EXECUTOR;
-import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
-import static com.android.launcher3.widget.WidgetHostViewLoader.getDefaultOptionsForWidget;
-
-import android.app.Activity;
-import android.app.Application.ActivityLifecycleCallbacks;
-import android.appwidget.AppWidgetHost;
-import android.appwidget.AppWidgetHostView;
-import android.appwidget.AppWidgetManager;
-import android.appwidget.AppWidgetProviderInfo;
-import android.content.ComponentName;
-import android.content.Context;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.util.Log;
-
-import androidx.annotation.Nullable;
-import androidx.annotation.UiThread;
-import androidx.annotation.WorkerThread;
-import androidx.lifecycle.Observer;
-import androidx.slice.Slice;
-import androidx.slice.SliceViewManager;
-import androidx.slice.SliceViewManager.SliceCallback;
-
-import com.android.launcher3.Alarm;
-import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherState;
-import com.android.launcher3.statemanager.StateManager.StateListener;
-import com.android.launcher3.util.ComponentKey;
-import com.android.launcher3.util.SafeCloseable;
-import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
-import com.android.launcher3.widget.PendingAddWidgetInfo;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.function.Consumer;
-
-/**
- * Manages Lifecycle for Live search results
- */
-public class LiveSearchManager implements StateListener<LauncherState> {
-
-    private static final String TAG = "LiveSearchManager";
-
-    private static final long SLICE_TIMEOUT_MS = 50;
-    public static final int SEARCH_APPWIDGET_HOST_ID = 2048;
-
-    private final Launcher mLauncher;
-    private final HashMap<Uri, SliceLifeCycle> mUriSliceMap = new HashMap<>();
-
-    private final HashMap<ComponentKey, SearchWidgetInfoContainer> mWidgetPlaceholders =
-            new HashMap<>();
-    private SearchWidgetHost mSearchWidgetHost;
-
-    public LiveSearchManager(Launcher launcher) {
-        mLauncher = launcher;
-        mLauncher.getStateManager().addStateListener(this);
-    }
-
-    /**
-     * Creates new {@link AppWidgetHostView} from {@link AppWidgetProviderInfo}. Caches views for
-     * quicker result within the same search session
-     */
-    public SearchWidgetInfoContainer getPlaceHolderWidget(AppWidgetProviderInfo providerInfo) {
-        if (mSearchWidgetHost == null) {
-            mSearchWidgetHost = new SearchWidgetHost(mLauncher);
-            mSearchWidgetHost.startListening();
-        }
-
-        ComponentName provider = providerInfo.provider;
-        UserHandle userHandle = providerInfo.getProfile();
-
-        ComponentKey key = new ComponentKey(provider, userHandle);
-        if (mWidgetPlaceholders.containsKey(key)) {
-            return mWidgetPlaceholders.get(key);
-        }
-
-        LauncherAppWidgetProviderInfo pinfo = LauncherAppWidgetProviderInfo.fromProviderInfo(
-                mLauncher, providerInfo);
-        PendingAddWidgetInfo pendingAddWidgetInfo = new PendingAddWidgetInfo(pinfo);
-
-        Bundle options = getDefaultOptionsForWidget(mLauncher, pendingAddWidgetInfo);
-        int appWidgetId = mSearchWidgetHost.allocateAppWidgetId();
-        boolean success = AppWidgetManager.getInstance(mLauncher)
-                .bindAppWidgetIdIfAllowed(appWidgetId, userHandle, provider, options);
-        if (!success) {
-            mSearchWidgetHost.deleteAppWidgetId(appWidgetId);
-            mWidgetPlaceholders.put(key, null);
-            return null;
-        }
-
-        SearchWidgetInfoContainer view = (SearchWidgetInfoContainer) mSearchWidgetHost.createView(
-                mLauncher, appWidgetId, providerInfo);
-        view.setTag(pendingAddWidgetInfo);
-        mWidgetPlaceholders.put(key, view);
-        return view;
-    }
-
-    /**
-     * Stop search session
-     */
-    public void stop() {
-        clearWidgetHost();
-    }
-
-    private void clearWidgetHost() {
-        if (mSearchWidgetHost != null) {
-            mSearchWidgetHost.stopListening();
-            mSearchWidgetHost.clearViews();
-            mSearchWidgetHost.deleteHost();
-            mWidgetPlaceholders.clear();
-            mSearchWidgetHost = null;
-        }
-    }
-
-    @Override
-    public void onStateTransitionComplete(LauncherState finalState) {
-        if (finalState != ALL_APPS) {
-            // Clear all search session related objects
-            mUriSliceMap.values().forEach(SliceLifeCycle::destroy);
-            mUriSliceMap.clear();
-
-            clearWidgetHost();
-        }
-    }
-
-    /**
-     * Adds a new observer for the provided uri and returns a callback to cancel this observer
-     */
-    public SafeCloseable addObserver(Uri uri, Observer<Slice> listener,
-            Consumer<Uri> timeoutConsumer) {
-        SliceLifeCycle slc = mUriSliceMap.get(uri);
-        if (slc == null) {
-            slc = new SliceLifeCycle(uri, mLauncher);
-            mUriSliceMap.put(uri, slc);
-        }
-        if (slc.mLastValue != null) {
-            listener.onChanged(slc.mLastValue);
-        }
-
-        // Use a listener wrapper to handle error timeout.
-        Observer<Slice> listenerWrapper = new Observer<Slice>() {
-            final Alarm mErrorTimeout = new Alarm();
-            {
-                mErrorTimeout.setOnAlarmListener(alarm -> {
-                    alarm.cancelAlarm();
-                    timeoutConsumer.accept(uri);
-                });
-                mErrorTimeout.setAlarm(SLICE_TIMEOUT_MS);
-            }
-
-            @Override
-            public void onChanged(Slice slice) {
-                if (slice == null) {
-                    return;
-                }
-
-                if (mErrorTimeout.alarmPending()) {
-                    mErrorTimeout.cancelAlarm();
-                }
-
-                if (mUriSliceMap.get(uri) != null) {
-                    mUriSliceMap.get(uri).mLastValue = slice;
-                }
-
-                listener.onChanged(slice);
-            }
-        };
-
-        slc.addListener(listenerWrapper);
-
-        final SliceLifeCycle sliceLifeCycle = slc;
-        return () -> sliceLifeCycle.removeListener(listenerWrapper);
-    }
-
-    static class SearchWidgetHost extends AppWidgetHost {
-        SearchWidgetHost(Context context) {
-            super(context, SEARCH_APPWIDGET_HOST_ID);
-        }
-
-        @Override
-        protected AppWidgetHostView onCreateView(Context context, int appWidgetId,
-                AppWidgetProviderInfo appWidget) {
-            return new SearchWidgetInfoContainer(context);
-        }
-
-        @Override
-        public void clearViews() {
-            super.clearViews();
-        }
-    }
-
-    private static class SliceLifeCycle
-            implements ActivityLifecycleCallbacks, SliceCallback {
-
-        private final Uri mUri;
-        private final Launcher mLauncher;
-        private final SliceViewManager mSliceViewManager;
-        private final ArrayList<Observer<Slice>> mListeners = new ArrayList<>();
-
-        private boolean mDestroyed = false;
-        private boolean mWasListening = false;
-
-        Slice mLastValue;
-
-        SliceLifeCycle(Uri uri, Launcher launcher) {
-            mUri = uri;
-            mLauncher = launcher;
-            mSliceViewManager = SliceViewManager.getInstance(launcher);
-            launcher.registerActivityLifecycleCallbacks(this);
-
-            if (launcher.isDestroyed()) {
-                onActivityDestroyed(launcher);
-            } else if (launcher.isStarted()) {
-                onActivityStarted(launcher);
-            }
-        }
-
-        @Override
-        public void onActivityDestroyed(Activity activity) {
-            destroy();
-        }
-
-        @Override
-        public void onActivityStarted(Activity activity) {
-            updateListening();
-        }
-
-        @Override
-        public void onActivityStopped(Activity activity) {
-            updateListening();
-        }
-
-        private void updateListening() {
-            boolean isListening = mDestroyed
-                    ? false
-                    : (mLauncher.isStarted() && !mListeners.isEmpty());
-            UI_HELPER_EXECUTOR.execute(() -> uploadListeningBg(isListening));
-        }
-
-        @WorkerThread
-        private void uploadListeningBg(boolean isListening) {
-            if (mWasListening != isListening) {
-                mWasListening = isListening;
-                if (isListening) {
-                    mSliceViewManager.registerSliceCallback(mUri, MAIN_EXECUTOR, this);
-                    // Update slice one-time on the different thread so that we can display
-                    // multiple slices in parallel
-                    THREAD_POOL_EXECUTOR.execute(this::updateSlice);
-                } else {
-                    mSliceViewManager.unregisterSliceCallback(mUri, this);
-                }
-            }
-        }
-
-        @UiThread
-        private void addListener(Observer<Slice> listener) {
-            mListeners.add(listener);
-            updateListening();
-        }
-
-        @UiThread
-        private void removeListener(Observer<Slice> listener) {
-            mListeners.remove(listener);
-            updateListening();
-        }
-
-        @WorkerThread
-        private void updateSlice() {
-            try {
-                Slice s = mSliceViewManager.bindSlice(mUri);
-                MAIN_EXECUTOR.execute(() -> onSliceUpdated(s));
-            } catch (Exception e) {
-                Log.d(TAG, "Error fetching slice", e);
-            }
-        }
-
-        @UiThread
-        @Override
-        public void onSliceUpdated(@Nullable Slice s) {
-            mListeners.forEach(l -> l.onChanged(s));
-        }
-
-        private void destroy() {
-            if (mDestroyed) {
-                return;
-            }
-            mDestroyed = true;
-            mLauncher.unregisterActivityLifecycleCallbacks(this);
-            mListeners.clear();
-        }
-
-        @Override
-        public void onActivityCreated(Activity activity, Bundle bundle) { }
-
-        @Override
-        public void onActivityPaused(Activity activity) { }
-
-        @Override
-        public void onActivityResumed(Activity activity) { }
-
-        @Override
-        public void onActivitySaveInstanceState(Activity activity, Bundle bundle) { }
-    }
-}
diff --git a/src/com/android/launcher3/icons/IconCache.java b/src/com/android/launcher3/icons/IconCache.java
index 61f2c2adae..988794ccb6 100644
--- a/src/com/android/launcher3/icons/IconCache.java
+++ b/src/com/android/launcher3/icons/IconCache.java
@@ -131,6 +131,7 @@ public class IconCache extends BaseIconCache {
 
     /**
      * Fetches high-res icon for the provided ItemInfo and updates the caller when done.
+     *
      * @return a request ID that can be used to cancel the request.
      */
     public HandlerRunnable updateIconInBackground(final ItemInfoUpdateReceiver caller,
@@ -139,7 +140,7 @@ public class IconCache extends BaseIconCache {
         if (mPendingIconRequestCount <= 0) {
             MODEL_EXECUTOR.setThreadPriority(Process.THREAD_PRIORITY_FOREGROUND);
         }
-        mPendingIconRequestCount ++;
+        mPendingIconRequestCount++;
 
         HandlerRunnable<ItemInfoWithIcon> request = new HandlerRunnable<>(mWorkerHandler,
                 () -> {
@@ -158,7 +159,7 @@ public class IconCache extends BaseIconCache {
     }
 
     private void onIconRequestEnd() {
-        mPendingIconRequestCount --;
+        mPendingIconRequestCount--;
         if (mPendingIconRequestCount <= 0) {
             MODEL_EXECUTOR.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
         }
@@ -289,7 +290,8 @@ public class IconCache extends BaseIconCache {
             @NonNull Supplier<LauncherActivityInfo> activityInfoProvider,
             boolean usePkgIcon, boolean useLowResIcon) {
         CacheEntry entry = cacheLocked(infoInOut.getTargetComponent(), infoInOut.user,
-                activityInfoProvider, mLauncherActivityInfoCachingLogic, usePkgIcon, useLowResIcon);
+                activityInfoProvider, mLauncherActivityInfoCachingLogic, usePkgIcon,
+                useLowResIcon);
         applyCacheEntry(entry, infoInOut);
     }
 
@@ -315,7 +317,8 @@ public class IconCache extends BaseIconCache {
     }
 
     public void updateSessionCache(PackageUserKey key, PackageInstaller.SessionInfo info) {
-        cachePackageInstallInfo(key.mPackageName, key.mUser, info.getAppIcon(), info.getAppLabel());
+        cachePackageInstallInfo(key.mPackageName, key.mUser, info.getAppIcon(),
+                info.getAppLabel());
     }
 
     @Override
-- 
GitLab


From ee904f65c141497326cef9b769e27425e36cf81d Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 15 Mar 2021 17:52:25 +0000
Subject: [PATCH 0673/1664] Revert "Update calls to go through the feature
 interface instead..."

Revert "1/ Add mechanism to expose shell feature directly (for Pip)"

Revert "Add shell aidl files"

Revert "Update starting window init call for CarLauncher"

Revert submission 13608835-shell_feature_interfaces

Reason for revert: SysUI Studio aidl import issue
Reverted Changes:
I49a5a0419:2/ Add mechanism to expose other features directly...
I19425896d:Update starting window init call for CarLauncher
If048d2cd9:1/ Add mechanism to expose shell feature directly ...
Ibb8365d3c:Add shell aidl files
Ie41b0b77a:Update calls to go through the feature interface i...

Change-Id: I99c039c88d1d5f9b249f74a361f5f30ee34addd2
---
 .../launcher3/QuickstepTransitionManager.java |   2 +-
 .../com/android/quickstep/SystemUiProxy.java  | 240 ++++++++----------
 .../quickstep/TouchInteractionService.java    |  24 +-
 .../android/quickstep/views/RecentsView.java  |  23 +-
 4 files changed, 120 insertions(+), 169 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index f04c58d586..343b87e735 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -86,6 +86,7 @@ import com.android.quickstep.util.RemoteAnimationProvider;
 import com.android.quickstep.util.StaggeredWorkspaceAnim;
 import com.android.quickstep.util.SurfaceTransactionApplier;
 import com.android.quickstep.views.RecentsView;
+import com.android.systemui.shared.recents.IStartingWindowListener;
 import com.android.systemui.shared.system.ActivityCompat;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
 import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
@@ -97,7 +98,6 @@ import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 import com.android.systemui.shared.system.RemoteTransitionCompat;
 import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
 import com.android.systemui.shared.system.WindowManagerWrapper;
-import com.android.wm.shell.startingsurface.IStartingWindowListener;
 
 import java.util.LinkedHashMap;
 
diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index f25c358fea..5668817da8 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -35,17 +35,12 @@ import android.util.Log;
 import android.view.MotionEvent;
 
 import com.android.launcher3.util.MainThreadInitializedObject;
+import com.android.systemui.shared.recents.IPinnedStackAnimationListener;
+import com.android.systemui.shared.recents.ISplitScreenListener;
+import com.android.systemui.shared.recents.IStartingWindowListener;
 import com.android.systemui.shared.recents.ISystemUiProxy;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.system.RemoteTransitionCompat;
-import com.android.wm.shell.onehanded.IOneHanded;
-import com.android.wm.shell.pip.IPip;
-import com.android.wm.shell.pip.IPipAnimationListener;
-import com.android.wm.shell.splitscreen.ISplitScreen;
-import com.android.wm.shell.splitscreen.ISplitScreenListener;
-import com.android.wm.shell.startingsurface.IStartingWindow;
-import com.android.wm.shell.startingsurface.IStartingWindowListener;
-import com.android.wm.shell.transition.IShellTransitions;
 
 /**
  * Holds the reference to SystemUI.
@@ -57,13 +52,8 @@ public class SystemUiProxy implements ISystemUiProxy {
             new MainThreadInitializedObject<>(SystemUiProxy::new);
 
     private ISystemUiProxy mSystemUiProxy;
-    private IPip mPip;
-    private ISplitScreen mSplitScreen;
-    private IOneHanded mOneHanded;
-    private IShellTransitions mShellTransitions;
-    private IStartingWindow mStartingWindow;
     private final DeathRecipient mSystemUiProxyDeathRecipient = () -> {
-        MAIN_EXECUTOR.execute(() -> clearProxy());
+        MAIN_EXECUTOR.execute(() -> setProxy(null));
     };
 
     // Used to dedupe calls to SystemUI
@@ -85,23 +75,12 @@ public class SystemUiProxy implements ISystemUiProxy {
         return null;
     }
 
-    public void setProxy(ISystemUiProxy proxy, IPip pip, ISplitScreen splitScreen,
-            IOneHanded oneHanded, IShellTransitions shellTransitions,
-            IStartingWindow startingWindow) {
+    public void setProxy(ISystemUiProxy proxy) {
         unlinkToDeath();
         mSystemUiProxy = proxy;
-        mPip = pip;
-        mSplitScreen = splitScreen;
-        mOneHanded = oneHanded;
-        mShellTransitions = shellTransitions;
-        mStartingWindow = startingWindow;
         linkToDeath();
     }
 
-    public void clearProxy() {
-        setProxy(null, null, null, null, null, null);
-    }
-
     // TODO(141886704): Find a way to remove this
     public void setLastSystemUiStateFlags(int stateFlags) {
         mLastSystemUiStateFlags = stateFlags;
@@ -289,6 +268,21 @@ public class SystemUiProxy implements ISystemUiProxy {
         }
     }
 
+    @Override
+    public void setShelfHeight(boolean visible, int shelfHeight) {
+        boolean changed = visible != mLastShelfVisible || shelfHeight != mLastShelfHeight;
+        if (mSystemUiProxy != null && changed) {
+            mLastShelfVisible = visible;
+            mLastShelfHeight = shelfHeight;
+            try {
+                mSystemUiProxy.setShelfHeight(visible, shelfHeight);
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call setShelfHeight visible: " + visible
+                        + " height: " + shelfHeight, e);
+            }
+        }
+    }
+
     @Override
     public void handleImageAsScreenshot(Bitmap bitmap, Rect rect, Insets insets, int i) {
         if (mSystemUiProxy != null) {
@@ -325,6 +319,20 @@ public class SystemUiProxy implements ISystemUiProxy {
         }
     }
 
+    /**
+     * Sets listener to get pinned stack animation callbacks.
+     */
+    @Override
+    public void setPinnedStackAnimationListener(IPinnedStackAnimationListener listener) {
+        if (mSystemUiProxy != null) {
+            try {
+                mSystemUiProxy.setPinnedStackAnimationListener(listener);
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call setPinnedStackAnimationListener", e);
+            }
+        }
+    }
+
     @Override
     public void onQuickSwitchToNewTask(int rotation) {
         if (mSystemUiProxy != null) {
@@ -350,55 +358,44 @@ public class SystemUiProxy implements ISystemUiProxy {
     }
 
     @Override
-    public void expandNotificationPanel() {
+    public void startOneHandedMode() {
         if (mSystemUiProxy != null) {
             try {
-                mSystemUiProxy.expandNotificationPanel();
+                mSystemUiProxy.startOneHandedMode();
             } catch (RemoteException e) {
-                Log.w(TAG, "Failed call expandNotificationPanel", e);
+                Log.w(TAG, "Failed call startOneHandedMode", e);
             }
         }
     }
 
-    //
-    // Pip
-    //
-
-    /**
-     * Sets the shelf height.
-     */
-    public void setShelfHeight(boolean visible, int shelfHeight) {
-        boolean changed = visible != mLastShelfVisible || shelfHeight != mLastShelfHeight;
-        if (mPip != null && changed) {
-            mLastShelfVisible = visible;
-            mLastShelfHeight = shelfHeight;
+    @Override
+    public void stopOneHandedMode() {
+        if (mSystemUiProxy != null) {
             try {
-                mPip.setShelfHeight(visible, shelfHeight);
+                mSystemUiProxy.stopOneHandedMode();
             } catch (RemoteException e) {
-                Log.w(TAG, "Failed call setShelfHeight visible: " + visible
-                        + " height: " + shelfHeight, e);
+                Log.w(TAG, "Failed call stopOneHandedMode", e);
             }
         }
     }
 
-    /**
-     * Sets listener to get pinned stack animation callbacks.
-     */
-    public void setPinnedStackAnimationListener(IPipAnimationListener listener) {
-        if (mPip != null) {
+    @Override
+    public void expandNotificationPanel() {
+        if (mSystemUiProxy != null) {
             try {
-                mPip.setPinnedStackAnimationListener(listener);
+                mSystemUiProxy.expandNotificationPanel();
             } catch (RemoteException e) {
-                Log.w(TAG, "Failed call setPinnedStackAnimationListener", e);
+                Log.w(TAG, "Failed call expandNotificationPanel", e);
             }
         }
     }
 
+    @Override
     public Rect startSwipePipToHome(ComponentName componentName, ActivityInfo activityInfo,
             PictureInPictureParams pictureInPictureParams, int launcherRotation, int shelfHeight) {
-        if (mPip != null) {
+        if (mSystemUiProxy != null) {
             try {
-                return mPip.startSwipePipToHome(componentName, activityInfo,
+                return mSystemUiProxy.startSwipePipToHome(componentName, activityInfo,
                         pictureInPictureParams, launcherRotation, shelfHeight);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call startSwipePipToHome", e);
@@ -407,85 +404,111 @@ public class SystemUiProxy implements ISystemUiProxy {
         return null;
     }
 
+    @Override
     public void stopSwipePipToHome(ComponentName componentName, Rect destinationBounds) {
-        if (mPip != null) {
+        if (mSystemUiProxy != null) {
             try {
-                mPip.stopSwipePipToHome(componentName, destinationBounds);
+                mSystemUiProxy.stopSwipePipToHome(componentName, destinationBounds);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call stopSwipePipToHome");
             }
         }
     }
 
-    //
-    // Splitscreen
-    //
+    @Override
+    public void registerRemoteTransition(RemoteTransitionCompat remoteTransition) {
+        if (mSystemUiProxy != null) {
+            try {
+                mSystemUiProxy.registerRemoteTransition(remoteTransition);
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call registerRemoteTransition");
+            }
+        }
+    }
 
+    @Override
+    public void unregisterRemoteTransition(RemoteTransitionCompat remoteTransition) {
+        if (mSystemUiProxy != null) {
+            try {
+                mSystemUiProxy.unregisterRemoteTransition(remoteTransition);
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call registerRemoteTransition");
+            }
+        }
+    }
+
+    @Override
     public void registerSplitScreenListener(ISplitScreenListener listener) {
-        if (mSplitScreen != null) {
+        if (mSystemUiProxy != null) {
             try {
-                mSplitScreen.registerSplitScreenListener(listener);
+                mSystemUiProxy.registerSplitScreenListener(listener);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call registerSplitScreenListener");
             }
         }
     }
 
+    @Override
     public void unregisterSplitScreenListener(ISplitScreenListener listener) {
-        if (mSplitScreen != null) {
+        if (mSystemUiProxy != null) {
             try {
-                mSplitScreen.unregisterSplitScreenListener(listener);
+                mSystemUiProxy.unregisterSplitScreenListener(listener);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call unregisterSplitScreenListener");
             }
         }
     }
 
+    @Override
     public void setSideStageVisibility(boolean visible) {
-        if (mSplitScreen != null) {
+        if (mSystemUiProxy != null) {
             try {
-                mSplitScreen.setSideStageVisibility(visible);
+                mSystemUiProxy.setSideStageVisibility(visible);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call setSideStageVisibility");
             }
         }
     }
 
+    @Override
     public void exitSplitScreen() {
-        if (mSplitScreen != null) {
+        if (mSystemUiProxy != null) {
             try {
-                mSplitScreen.exitSplitScreen();
+                mSystemUiProxy.exitSplitScreen();
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call exitSplitScreen");
             }
         }
     }
 
+    @Override
     public void exitSplitScreenOnHide(boolean exitSplitScreenOnHide) {
-        if (mSplitScreen != null) {
+        if (mSystemUiProxy != null) {
             try {
-                mSplitScreen.exitSplitScreenOnHide(exitSplitScreenOnHide);
+                mSystemUiProxy.exitSplitScreenOnHide(exitSplitScreenOnHide);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call exitSplitScreen");
             }
         }
     }
 
+    @Override
     public void startTask(int taskId, int stage, int position, Bundle options) {
-        if (mSplitScreen != null) {
+        if (mSystemUiProxy != null) {
             try {
-                mSplitScreen.startTask(taskId, stage, position, options);
+                mSystemUiProxy.startTask(taskId, stage, position, options);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call startTask");
             }
         }
     }
 
+    @Override
     public void startShortcut(String packageName, String shortcutId, int stage, int position,
             Bundle options, UserHandle user) {
-        if (mSplitScreen != null) {
+        if (mSystemUiProxy != null) {
             try {
-                mSplitScreen.startShortcut(packageName, shortcutId, stage, position, options,
+                mSystemUiProxy.startShortcut(packageName, shortcutId, stage, position, options,
                         user);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call startShortcut");
@@ -493,87 +516,38 @@ public class SystemUiProxy implements ISystemUiProxy {
         }
     }
 
-    public void startIntent(PendingIntent intent, Intent fillInIntent, int stage, int position,
-            Bundle options) {
-        if (mSplitScreen != null) {
+    @Override
+    public void startIntent(PendingIntent intent, Intent fillInIntent, int stage,
+            int position, Bundle options) {
+        if (mSystemUiProxy != null) {
             try {
-                mSplitScreen.startIntent(intent, fillInIntent, stage, position, options);
+                mSystemUiProxy.startIntent(intent, fillInIntent, stage, position,
+                        options);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call startIntent");
             }
         }
     }
 
+    @Override
     public void removeFromSideStage(int taskId) {
-        if (mSplitScreen != null) {
+        if (mSystemUiProxy != null) {
             try {
-                mSplitScreen.removeFromSideStage(taskId);
+                mSystemUiProxy.removeFromSideStage(taskId);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call removeFromSideStage");
             }
         }
     }
 
-    //
-    // One handed
-    //
-
-    public void startOneHandedMode() {
-        if (mOneHanded != null) {
-            try {
-                mOneHanded.startOneHanded();
-            } catch (RemoteException e) {
-                Log.w(TAG, "Failed call startOneHandedMode", e);
-            }
-        }
-    }
-
-    public void stopOneHandedMode() {
-        if (mOneHanded != null) {
-            try {
-                mOneHanded.stopOneHanded();
-            } catch (RemoteException e) {
-                Log.w(TAG, "Failed call stopOneHandedMode", e);
-            }
-        }
-    }
-
-    //
-    // Remote transitions
-    //
-
-    public void registerRemoteTransition(RemoteTransitionCompat remoteTransition) {
-        if (mShellTransitions != null) {
-            try {
-                mShellTransitions.registerRemote(remoteTransition.getFilter(),
-                        remoteTransition.getTransition());
-            } catch (RemoteException e) {
-                Log.w(TAG, "Failed call registerRemoteTransition");
-            }
-        }
-    }
-
-    public void unregisterRemoteTransition(RemoteTransitionCompat remoteTransition) {
-        if (mShellTransitions != null) {
-            try {
-                mShellTransitions.unregisterRemote(remoteTransition.getTransition());
-            } catch (RemoteException e) {
-                Log.w(TAG, "Failed call registerRemoteTransition");
-            }
-        }
-    }
-
-    //
-    // Starting window
-    //
-
     /**
      * Sets listener to get callbacks when launching a task.
      */
+    @Override
     public void setStartingWindowListener(IStartingWindowListener listener) {
-        if (mStartingWindow != null) {
+        if (mSystemUiProxy != null) {
             try {
-                mStartingWindow.setStartingWindowListener(listener);
+                mSystemUiProxy.setStartingWindowListener(listener);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call setStartingWindowListener", e);
             }
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 1cb5f5d04e..fc805d0794 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -24,11 +24,6 @@ import static com.android.launcher3.config.FeatureFlags.ASSISTANT_GIVES_LAUNCHER
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.quickstep.GestureState.DEFAULT_STATE;
 import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
-import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_ONE_HANDED;
-import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_PIP;
-import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_SHELL_TRANSITIONS;
-import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_SPLIT_SCREEN;
-import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_STARTING_WINDOW;
 import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SYSUI_PROXY;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_TRACING_ENABLED;
 
@@ -106,11 +101,6 @@ import com.android.systemui.shared.system.InputChannelCompat.InputEventReceiver;
 import com.android.systemui.shared.system.InputConsumerController;
 import com.android.systemui.shared.system.InputMonitorCompat;
 import com.android.systemui.shared.tracing.ProtoTraceable;
-import com.android.wm.shell.onehanded.IOneHanded;
-import com.android.wm.shell.pip.IPip;
-import com.android.wm.shell.splitscreen.ISplitScreen;
-import com.android.wm.shell.startingsurface.IStartingWindow;
-import com.android.wm.shell.transition.IShellTransitions;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
@@ -150,18 +140,8 @@ public class TouchInteractionService extends Service implements PluginListener<O
         public void onInitialize(Bundle bundle) {
             ISystemUiProxy proxy = ISystemUiProxy.Stub.asInterface(
                     bundle.getBinder(KEY_EXTRA_SYSUI_PROXY));
-            IPip pip = IPip.Stub.asInterface(bundle.getBinder(KEY_EXTRA_SHELL_PIP));
-            ISplitScreen splitscreen = ISplitScreen.Stub.asInterface(bundle.getBinder(
-                    KEY_EXTRA_SHELL_SPLIT_SCREEN));
-            IOneHanded onehanded = IOneHanded.Stub.asInterface(
-                    bundle.getBinder(KEY_EXTRA_SHELL_ONE_HANDED));
-            IShellTransitions shellTransitions = IShellTransitions.Stub.asInterface(
-                    bundle.getBinder(KEY_EXTRA_SHELL_SHELL_TRANSITIONS));
-            IStartingWindow startingWindow = IStartingWindow.Stub.asInterface(
-                    bundle.getBinder(KEY_EXTRA_SHELL_STARTING_WINDOW));
             MAIN_EXECUTOR.execute(() -> {
-                SystemUiProxy.INSTANCE.get(TouchInteractionService.this).setProxy(proxy, pip,
-                        splitscreen, onehanded, shellTransitions, startingWindow);
+                SystemUiProxy.INSTANCE.get(TouchInteractionService.this).setProxy(proxy);
                 TouchInteractionService.this.initInputMonitor();
                 preloadOverview(true /* fromInit */);
                 mDeviceState.runOnUserUnlocked(() -> {
@@ -441,7 +421,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
         }
         disposeEventHandlers();
         mDeviceState.destroy();
-        SystemUiProxy.INSTANCE.get(this).clearProxy();
+        SystemUiProxy.INSTANCE.get(this).setProxy(null);
         ProtoTracer.INSTANCE.get(this).stop();
         ProtoTracer.INSTANCE.get(this).remove(this);
 
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 261c43f0e4..9a903dc124 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -39,7 +39,6 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_DISMISS_SWIPE_UP;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_SWIPE_DOWN;
 import static com.android.launcher3.statehandlers.DepthController.DEPTH;
-import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW;
 import static com.android.quickstep.TaskUtils.checkCurrentOrManagedUserId;
@@ -134,13 +133,13 @@ import com.android.quickstep.util.SurfaceTransactionApplier;
 import com.android.quickstep.util.TaskViewSimulator;
 import com.android.quickstep.util.TransformParams;
 import com.android.systemui.plugins.ResourceProvider;
+import com.android.systemui.shared.recents.IPinnedStackAnimationListener;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.recents.model.Task.TaskKey;
 import com.android.systemui.shared.recents.model.ThumbnailData;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.PackageManagerWrapper;
 import com.android.systemui.shared.system.TaskStackChangeListener;
-import com.android.wm.shell.pip.IPipAnimationListener;
 
 import java.util.ArrayList;
 import java.util.function.Consumer;
@@ -378,7 +377,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         }
     };
 
-    private final PinnedStackAnimationListener mIPipAnimationListener =
+    private final PinnedStackAnimationListener mIPinnedStackAnimationListener =
             new PinnedStackAnimationListener();
 
     // Used to keep track of the last requested task list id, so that we do not request to load the
@@ -598,9 +597,9 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mLiveTileParams.setSyncTransactionApplier(mSyncTransactionApplier);
         RecentsModel.INSTANCE.get(getContext()).addThumbnailChangeListener(this);
         mIdp.addOnChangeListener(this);
-        mIPipAnimationListener.setActivity(mActivity);
+        mIPinnedStackAnimationListener.setActivity(mActivity);
         SystemUiProxy.INSTANCE.get(getContext()).setPinnedStackAnimationListener(
-                mIPipAnimationListener);
+                mIPinnedStackAnimationListener);
         mOrientationState.initListeners();
         SplitScreenBounds.INSTANCE.addOnChangeListener(this);
         mTaskOverlayFactory.initListeners();
@@ -619,7 +618,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mIdp.removeOnChangeListener(this);
         SystemUiProxy.INSTANCE.get(getContext()).setPinnedStackAnimationListener(null);
         SplitScreenBounds.INSTANCE.removeOnChangeListener(this);
-        mIPipAnimationListener.setActivity(null);
+        mIPinnedStackAnimationListener.setActivity(null);
         mOrientationState.destroyListeners();
         mTaskOverlayFactory.removeListeners();
     }
@@ -2923,7 +2922,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     }
 
     private static class PinnedStackAnimationListener<T extends BaseActivity> extends
-            IPipAnimationListener.Stub {
+            IPinnedStackAnimationListener.Stub {
         private T mActivity;
 
         public void setActivity(T activity) {
@@ -2931,12 +2930,10 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         }
 
         @Override
-        public void onPipAnimationStarted() {
-            MAIN_EXECUTOR.execute(() -> {
-                // Needed for activities that auto-enter PiP, which will not trigger a remote
-                // animation to be created
-                mActivity.clearForceInvisibleFlag(STATE_HANDLER_INVISIBILITY_FLAGS);
-            });
+        public void onPinnedStackAnimationStarted() {
+            // Needed for activities that auto-enter PiP, which will not trigger a remote
+            // animation to be created
+            mActivity.clearForceInvisibleFlag(STATE_HANDLER_INVISIBILITY_FLAGS);
         }
     }
 }
-- 
GitLab


From 2debd80f1f3144d2f8b6152ef39f1cb9f139165a Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 12 Mar 2021 16:06:52 -0800
Subject: [PATCH 0674/1664] Hide nav handle/background when taskbar is showing

Test: nav handle isn't showing unless taskbar is hidden or removed
Fixes: 181206743
Bug: 171917176
Change-Id: I84b7d0bba1a5d208b1f8b1b467faf79f04078348
---
 .../taskbar/TaskbarVisibilityController.java          | 11 ++++++++++-
 .../src/com/android/quickstep/SystemUiProxy.java      |  5 ++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarVisibilityController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarVisibilityController.java
index 6d20d9718f..715e4ca4c6 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarVisibilityController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarVisibilityController.java
@@ -65,6 +65,7 @@ public class TaskbarVisibilityController {
     }
 
     protected void cleanup() {
+        setNavBarButtonAlpha(1f);
     }
 
     protected AnimatedFloat getTaskbarVisibilityForLauncherState() {
@@ -93,6 +94,14 @@ public class TaskbarVisibilityController {
         float alphaDueToLauncher = Math.max(mTaskbarBackgroundAlpha.value,
                 mTaskbarVisibilityAlphaForLauncherState.value);
         float alphaDueToOther = mTaskbarVisibilityAlphaForIme.value;
-        mTaskbarCallbacks.updateTaskbarVisibilityAlpha(alphaDueToLauncher * alphaDueToOther);
+        float taskbarAlpha = alphaDueToLauncher * alphaDueToOther;
+        mTaskbarCallbacks.updateTaskbarVisibilityAlpha(taskbarAlpha);
+
+        // Make the nav bar invisible if taskbar is visible.
+        setNavBarButtonAlpha(1f - taskbarAlpha);
+    }
+
+    private void setNavBarButtonAlpha(float navBarAlpha) {
+        SystemUiProxy.INSTANCE.get(mLauncher).setNavBarButtonAlpha(navBarAlpha, false);
     }
 }
diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index 619103c2ef..a70cc4ccd2 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -62,6 +62,7 @@ public class SystemUiProxy implements ISystemUiProxy,
     private boolean mLastShelfVisible;
     private float mLastNavButtonAlpha;
     private boolean mLastNavButtonAnimate;
+    private boolean mHasNavButtonAlphaBeenSet = false;
 
     // TODO(141886704): Find a way to remove this
     private int mLastSystemUiStateFlags;
@@ -163,10 +164,12 @@ public class SystemUiProxy implements ISystemUiProxy,
     @Override
     public void setNavBarButtonAlpha(float alpha, boolean animate) {
         boolean changed = Float.compare(alpha, mLastNavButtonAlpha) != 0
-                || animate != mLastNavButtonAnimate;
+                || animate != mLastNavButtonAnimate
+                || !mHasNavButtonAlphaBeenSet;
         if (mSystemUiProxy != null && changed) {
             mLastNavButtonAlpha = alpha;
             mLastNavButtonAnimate = animate;
+            mHasNavButtonAlphaBeenSet = true;
             try {
                 mSystemUiProxy.setNavBarButtonAlpha(alpha, animate);
             } catch (RemoteException e) {
-- 
GitLab


From d987a828e8fb328a7da976e9e86a259e65eb1f20 Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Mon, 22 Feb 2021 14:49:27 -0800
Subject: [PATCH 0675/1664] Initial commit of new split screen work.

TODO:
* Extract out common elements in TaskShortcutFactory.MultiWindowFactory
for commonalities between new and old way of
invoking split screen
* Integrate with WM APIs (b/182002789)
* Write tests for SplitSelectStateController

Bug: 181704764

Change-Id: Ice35adb4ea82897f5e2433dc9b93a549f3d511b5
---
 .../res/layout/fallback_recents_activity.xml  |   8 +
 quickstep/res/layout/overview_panel.xml       |   8 +
 quickstep/res/values/dimens.xml               |   1 +
 quickstep/res/values/strings.xml              |   2 -
 .../launcher3/BaseQuickstepLauncher.java      |   9 +-
 .../BaseRecentsViewStateController.java       |   9 +-
 .../RecentsViewStateController.java           |  23 ++
 .../uioverrides/states/OverviewState.java     |   8 +
 .../states/SplitScreenSelectState.java        |  52 +++++
 .../android/quickstep/RecentsActivity.java    |  10 +-
 .../android/quickstep/TaskOverlayFactory.java |  26 ++-
 .../quickstep/TaskShortcutFactory.java        |  30 ++-
 .../com/android/quickstep/TaskViewUtils.java  |  89 ++++++++
 .../fallback/FallbackRecentsView.java         |   5 +-
 .../util/SplitSelectStateController.java      | 151 ++++++++++++
 .../quickstep/util/TaskViewSimulator.java     |   3 +
 .../quickstep/views/LauncherRecentsView.java  |   4 +-
 .../android/quickstep/views/RecentsView.java  | 215 +++++++++++++++++-
 .../quickstep/views/SplitPlaceholderView.java |  55 +++++
 .../android/quickstep/views/TaskMenuView.java |   5 +-
 .../com/android/quickstep/views/TaskView.java |  34 ++-
 .../res => res}/drawable/ic_split_screen.xml  |   0
 res/values/strings.xml                        |   7 +
 src/com/android/launcher3/LauncherState.java  |  12 +
 .../launcher3/config/FeatureFlags.java        |   3 +
 .../launcher3/popup/SystemShortcut.java       |  13 ++
 .../launcher3/testing/TestProtocol.java       |   3 +
 .../touch/LandscapePagedViewHandler.java      |  42 ++++
 .../touch/PagedOrientationHandler.java        |   9 +
 .../touch/PortraitPagedViewHandler.java       |  57 +++++
 .../touch/SeascapePagedViewHandler.java       |  36 +++
 .../util/SplitConfigurationOptions.java       |  85 +++++++
 src/com/android/launcher3/util/ViewPool.java  |   2 +-
 .../uioverrides/states/OverviewState.java     |   7 +
 34 files changed, 997 insertions(+), 26 deletions(-)
 create mode 100644 quickstep/src/com/android/launcher3/uioverrides/states/SplitScreenSelectState.java
 create mode 100644 quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
 create mode 100644 quickstep/src/com/android/quickstep/views/SplitPlaceholderView.java
 rename {quickstep/res => res}/drawable/ic_split_screen.xml (100%)
 create mode 100644 src/com/android/launcher3/util/SplitConfigurationOptions.java

diff --git a/quickstep/res/layout/fallback_recents_activity.xml b/quickstep/res/layout/fallback_recents_activity.xml
index cd64a94bab..55400a7b24 100644
--- a/quickstep/res/layout/fallback_recents_activity.xml
+++ b/quickstep/res/layout/fallback_recents_activity.xml
@@ -19,6 +19,14 @@
     android:layout_height="match_parent"
     android:fitsSystemWindows="true">
 
+    <com.android.quickstep.views.SplitPlaceholderView
+        android:id="@+id/split_placeholder"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/split_placeholder_size"
+        android:background="@android:color/white"
+        android:alpha=".8"
+        android:visibility="gone" />
+
     <com.android.quickstep.fallback.RecentsDragLayer
         android:id="@+id/drag_layer"
         android:layout_width="match_parent"
diff --git a/quickstep/res/layout/overview_panel.xml b/quickstep/res/layout/overview_panel.xml
index fe57e9b3d5..394e8808c8 100644
--- a/quickstep/res/layout/overview_panel.xml
+++ b/quickstep/res/layout/overview_panel.xml
@@ -15,6 +15,14 @@
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <com.android.quickstep.views.SplitPlaceholderView
+        android:id="@+id/split_placeholder"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/split_placeholder_size"
+        android:background="@android:color/white"
+        android:alpha=".8"
+        android:visibility="gone" />
+
     <com.android.quickstep.views.LauncherRecentsView
         android:id="@+id/overview_panel"
         android:layout_width="match_parent"
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 2a246247c8..755bce8612 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -39,6 +39,7 @@
     <dimen name="overview_grid_bottom_margin">90dp</dimen>
     <dimen name="overview_grid_side_margin">54dp</dimen>
     <dimen name="overview_grid_row_spacing">42dp</dimen>
+    <dimen name="split_placeholder_size">110dp</dimen>
 
     <dimen name="recents_page_spacing">16dp</dimen>
     <dimen name="recents_clear_all_deadzone_vertical_margin">70dp</dimen>
diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml
index 9a4487c70d..0764bb3ca3 100644
--- a/quickstep/res/values/strings.xml
+++ b/quickstep/res/values/strings.xml
@@ -22,8 +22,6 @@
     <string name="derived_app_name" translatable="false">Quickstep</string>
 
     <!-- Options for recent tasks -->
-    <!-- Title for an option to enter split screen mode for a given app -->
-    <string name="recent_task_option_split_screen">Split screen</string>
     <!-- Title for an option to keep an app pinned to the screen until it is unpinned -->
     <string name="recent_task_option_pin">Pin</string>
     <!-- Title for an option to enter freeform mode for a given app -->
diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index cdfd1a275c..20a645e996 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -58,8 +58,10 @@ import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.TaskUtils;
 import com.android.quickstep.util.RemoteAnimationProvider;
 import com.android.quickstep.util.RemoteFadeOutAnimationListener;
+import com.android.quickstep.util.SplitSelectStateController;
 import com.android.quickstep.views.OverviewActionsView;
 import com.android.quickstep.views.RecentsView;
+import com.android.quickstep.views.SplitPlaceholderView;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
@@ -215,7 +217,12 @@ public abstract class BaseQuickstepLauncher extends Launcher
 
         SysUINavigationMode.INSTANCE.get(this).updateMode();
         mActionsView = findViewById(R.id.overview_actions_view);
-        ((RecentsView) getOverviewPanel()).init(mActionsView);
+        SplitPlaceholderView splitPlaceholderView = findViewById(R.id.split_placeholder);
+        RecentsView overviewPanel = (RecentsView) getOverviewPanel();
+        splitPlaceholderView.init(
+                new SplitSelectStateController(SystemUiProxy.INSTANCE.get(this))
+        );
+        overviewPanel.init(mActionsView, splitPlaceholderView);
         mActionsView.updateVerticalMargin(SysUINavigationMode.getMode(this));
 
         addTaskbarIfNecessary();
diff --git a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
index 0f13ef9c20..bedaefa5d6 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
@@ -32,6 +32,7 @@ import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
 import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET;
 import static com.android.quickstep.views.RecentsView.RECENTS_GRID_PROGRESS;
 import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
+import static com.android.quickstep.views.RecentsView.TASK_PRIMARY_TRANSLATION;
 import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION;
 
 import android.util.FloatProperty;
@@ -44,6 +45,7 @@ import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.graphics.OverviewScrim;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
 import com.android.launcher3.states.StateAnimationConfig;
+import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.quickstep.views.RecentsView;
 
 /**
@@ -105,7 +107,12 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView>
                 config.getInterpolator(ANIM_OVERVIEW_SCALE, LINEAR));
         setter.setFloat(mRecentsView, ADJACENT_PAGE_OFFSET, scaleAndOffset[1],
                 config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_X, LINEAR));
-        setter.setFloat(mRecentsView, TASK_SECONDARY_TRANSLATION, 0f,
+        PagedOrientationHandler orientationHandler =
+                ((RecentsView) mLauncher.getOverviewPanel()).getPagedOrientationHandler();
+        FloatProperty taskViewsFloat = orientationHandler.getSplitSelectTaskOffset(
+                TASK_PRIMARY_TRANSLATION, TASK_SECONDARY_TRANSLATION, mLauncher.getDeviceProfile());
+        setter.setFloat(mRecentsView, taskViewsFloat,
+                toState.getOverviewSecondaryTranslation(mLauncher),
                 config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, LINEAR));
 
         setter.setFloat(mRecentsView, getContentAlphaProperty(), toState.overviewUi ? 1 : 0,
diff --git a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
index c9de662784..750f673625 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
@@ -17,11 +17,14 @@ package com.android.launcher3.uioverrides;
 
 import static com.android.launcher3.LauncherState.CLEAR_ALL_BUTTON;
 import static com.android.launcher3.LauncherState.OVERVIEW_ACTIONS;
+import static com.android.launcher3.LauncherState.OVERVIEW_SPLIT_SELECT;
+import static com.android.launcher3.LauncherState.SPLIT_PLACHOLDER_VIEW;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_ACTIONS_FADE;
 import static com.android.quickstep.views.RecentsView.CONTENT_ALPHA;
 import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS;
 import static com.android.quickstep.views.RecentsView.TASK_MODALNESS;
+import static com.android.quickstep.views.SplitPlaceholderView.ALPHA_FLOAT;
 
 import android.annotation.TargetApi;
 import android.os.Build;
@@ -77,11 +80,26 @@ public final class RecentsViewStateController extends
                     AnimationSuccessListener.forRunnable(mRecentsView::resetTaskVisuals));
         }
 
+        // Create or dismiss split screen select animations
+        LauncherState currentState = mLauncher.getStateManager().getState();
+        if (isSplitSelectionState(toState) && !isSplitSelectionState(currentState)) {
+            builder.add(mRecentsView.createSplitSelectInitAnimation().buildAnim());
+        } else if (!isSplitSelectionState(toState) && isSplitSelectionState(currentState)) {
+            builder.add(mRecentsView.cancelSplitSelect(true).buildAnim());
+        }
+
         setAlphas(builder, config, toState);
         builder.setFloat(mRecentsView, FULLSCREEN_PROGRESS,
                 toState.getOverviewFullscreenProgress(), LINEAR);
     }
 
+    /**
+     * @return true if {@param toState} is {@link LauncherState#OVERVIEW_SPLIT_SELECT}
+     */
+    private boolean isSplitSelectionState(@NonNull LauncherState toState) {
+        return toState == OVERVIEW_SPLIT_SELECT;
+    }
+
     private void setAlphas(PropertySetter propertySetter, StateAnimationConfig config,
             LauncherState state) {
         float clearAllButtonAlpha = (state.getVisibleElements(mLauncher) & CLEAR_ALL_BUTTON) != 0
@@ -93,6 +111,11 @@ public final class RecentsViewStateController extends
         propertySetter.setFloat(mLauncher.getActionsView().getVisibilityAlpha(),
                 MultiValueAlpha.VALUE, overviewButtonAlpha, config.getInterpolator(
                         ANIM_OVERVIEW_ACTIONS_FADE, LINEAR));
+
+        float splitPlaceholderAlpha = state.areElementsVisible(mLauncher, SPLIT_PLACHOLDER_VIEW) ?
+                1 : 0;
+        propertySetter.setFloat(mRecentsView.getSplitPlaceholder(), ALPHA_FLOAT,
+                splitPlaceholderAlpha, LINEAR);
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
index 1f68a0403b..372784a2c0 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -175,4 +175,12 @@ public class OverviewState extends LauncherState {
     public static OverviewState newModalTaskState(int id) {
         return new OverviewModalTaskState(id);
     }
+
+    /**
+     * New Overview substate representing state where 1 app for split screen has been selected and
+     * pinned and user is selecting the second one
+     */
+    public static OverviewState newSplitSelectState(int id) {
+        return new SplitScreenSelectState(id);
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/SplitScreenSelectState.java b/quickstep/src/com/android/launcher3/uioverrides/states/SplitScreenSelectState.java
new file mode 100644
index 0000000000..722d74a55a
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/SplitScreenSelectState.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.uioverrides.states;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+import com.android.launcher3.touch.PagedOrientationHandler;
+import com.android.quickstep.views.RecentsView;
+
+/**
+ * New Overview substate representing state where 1 app for split screen has been selected and
+ * pinned and user is selecting the second one
+ */
+public class SplitScreenSelectState extends OverviewState {
+    public SplitScreenSelectState(int id) {
+        super(id);
+    }
+
+    @Override
+    public void onBackPressed(Launcher launcher) {
+        launcher.getStateManager().goToState(OVERVIEW);
+    }
+
+    @Override
+    public int getVisibleElements(Launcher launcher) {
+        return SPLIT_PLACHOLDER_VIEW;
+    }
+
+    @Override
+    public float getOverviewSecondaryTranslation(Launcher launcher) {
+        RecentsView recentsView = launcher.getOverviewPanel();
+        PagedOrientationHandler orientationHandler = recentsView.getPagedOrientationHandler();
+        int splitPosition = recentsView.getSplitPlaceholder().getSplitController()
+                .getActiveSplitPositionOption().mStagePosition;
+        int direction = orientationHandler.getSplitTranslationDirectionFactor(splitPosition);
+        return launcher.getResources().getDimension(R.dimen.split_placeholder_size) * direction;
+    }
+}
diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index 3d68d64e53..d3ed791b40 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -63,7 +63,9 @@ import com.android.quickstep.fallback.FallbackRecentsView;
 import com.android.quickstep.fallback.RecentsDragLayer;
 import com.android.quickstep.fallback.RecentsState;
 import com.android.quickstep.util.RecentsAtomicAnimationFactory;
+import com.android.quickstep.util.SplitSelectStateController;
 import com.android.quickstep.views.OverviewActionsView;
+import com.android.quickstep.views.SplitPlaceholderView;
 import com.android.quickstep.views.TaskView;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
 import com.android.systemui.shared.system.RemoteAnimationAdapterCompat;
@@ -105,8 +107,14 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
         mFallbackRecentsView = findViewById(R.id.overview_panel);
         mActionsView = findViewById(R.id.overview_actions_view);
 
+        SplitPlaceholderView splitPlaceholderView = findViewById(R.id.split_placeholder);
+        splitPlaceholderView.init(
+                new SplitSelectStateController(
+                        SystemUiProxy.INSTANCE.get(this))
+        );
+
         mDragLayer.recreateControllers();
-        mFallbackRecentsView.init(mActionsView);
+        mFallbackRecentsView.init(mActionsView, splitPlaceholderView);
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
index 8636130fd1..cd13200352 100644
--- a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
@@ -36,11 +36,16 @@ import androidx.annotation.RequiresApi;
 
 import com.android.launcher3.BaseActivity;
 import com.android.launcher3.BaseDraggingActivity;
+import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.R;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.popup.SystemShortcut;
+import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.util.ResourceBasedOverride;
+import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
+import com.android.quickstep.TaskShortcutFactory.SplitSelectSystemShortcut;
 import com.android.quickstep.util.RecentsOrientedState;
 import com.android.quickstep.views.OverviewActionsView;
 import com.android.quickstep.views.RecentsView;
@@ -57,11 +62,18 @@ import java.util.List;
  */
 public class TaskOverlayFactory implements ResourceBasedOverride {
 
-    public static List<SystemShortcut> getEnabledShortcuts(TaskView taskView) {
+    public static List<SystemShortcut> getEnabledShortcuts(TaskView taskView,
+            DeviceProfile deviceProfile) {
         final ArrayList<SystemShortcut> shortcuts = new ArrayList<>();
         final BaseDraggingActivity activity = BaseActivity.fromContext(taskView.getContext());
         for (TaskShortcutFactory menuOption : MENU_OPTIONS) {
             SystemShortcut shortcut = menuOption.getShortcut(activity, taskView);
+            if (menuOption == TaskShortcutFactory.SPLIT_SCREEN &&
+                    FeatureFlags.ENABLE_SPLIT_SELECT.get()) {
+                addSplitOptions(shortcuts, activity, taskView, deviceProfile);
+                continue;
+            }
+
             if (shortcut != null) {
                 shortcuts.add(shortcut);
             }
@@ -91,6 +103,18 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
         return shortcuts;
     }
 
+
+    public static void addSplitOptions(List<SystemShortcut> outShortcuts,
+            BaseDraggingActivity activity, TaskView taskView, DeviceProfile deviceProfile) {
+        PagedOrientationHandler orientationHandler =
+                taskView.getRecentsView().getPagedOrientationHandler();
+        List<SplitPositionOption> positions =
+                orientationHandler.getSplitPositionOptions(deviceProfile);
+        for (SplitPositionOption option : positions) {
+            outShortcuts.add(new SplitSelectSystemShortcut(activity, taskView, option));
+        }
+    }
+
     public TaskOverlay createOverlay(TaskThumbnailView thumbnailView) {
         return new TaskOverlay(thumbnailView);
     }
diff --git a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
index d81f07f4c3..c06e9a90fa 100644
--- a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
@@ -34,11 +34,13 @@ import android.view.View;
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.R;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.logging.StatsLogManager.LauncherEvent;
 import com.android.launcher3.model.WellbeingModel;
 import com.android.launcher3.popup.SystemShortcut;
 import com.android.launcher3.popup.SystemShortcut.AppInfo;
 import com.android.launcher3.util.InstantAppResolver;
+import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskThumbnailView;
 import com.android.quickstep.views.TaskView;
@@ -58,7 +60,6 @@ import java.util.List;
  * Represents a system shortcut that can be shown for a recent task.
  */
 public interface TaskShortcutFactory {
-
     SystemShortcut getShortcut(BaseDraggingActivity activity, TaskView view);
 
     TaskShortcutFactory APP_INFO = (activity, view) -> new AppInfo(activity, view.getItemInfo());
@@ -93,6 +94,23 @@ public interface TaskShortcutFactory {
         }
     }
 
+    class SplitSelectSystemShortcut extends SystemShortcut {
+        private final TaskView mTaskView;
+        private SplitPositionOption mSplitPositionOption;
+        public SplitSelectSystemShortcut(BaseDraggingActivity target, TaskView taskView,
+                SplitPositionOption option) {
+            super(option.mIconResId, option.mTextResId, target, taskView.getItemInfo());
+            mTaskView = taskView;
+            mSplitPositionOption = option;
+            setEnabled(taskView.getRecentsView().getTaskViewCount() > 1);
+        }
+
+        @Override
+        public void onClick(View view) {
+            mTaskView.initiateSplitSelect(mSplitPositionOption);
+        }
+    }
+
     class MultiWindowSystemShortcut extends SystemShortcut {
 
         private Handler mHandler;
@@ -210,6 +228,16 @@ public interface TaskShortcutFactory {
                     && (displayId == -1 || displayId == DEFAULT_DISPLAY);
         }
 
+        @Override
+        public SystemShortcut getShortcut(BaseDraggingActivity activity, TaskView taskView) {
+            SystemShortcut shortcut = super.getShortcut(activity, taskView);
+            if (FeatureFlags.ENABLE_SPLIT_SELECT.get()) {
+                // Disable if there's only one recent app for split screen
+                shortcut.setEnabled(taskView.getRecentsView().getTaskViewCount() > 1);
+            }
+            return shortcut;
+        }
+
         @Override
         protected ActivityOptions makeLaunchOptions(Activity activity) {
             final ActivityCompat act = new ActivityCompat(activity);
diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java
index 2feeffa202..7a428ce637 100644
--- a/quickstep/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java
@@ -23,6 +23,7 @@ import static com.android.launcher3.Utilities.getDescendantCoordRelativeToAncest
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.Interpolators.TOUCH_RESPONSE_INTERPOLATOR;
 import static com.android.launcher3.anim.Interpolators.clampToProgress;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.statehandlers.DepthController.DEPTH;
 import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_CLOSING;
@@ -37,6 +38,7 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.graphics.Matrix;
 import android.graphics.Matrix.ScaleToFit;
+import android.graphics.Rect;
 import android.graphics.RectF;
 import android.os.Build;
 import android.view.View;
@@ -295,6 +297,93 @@ public final class TaskViewUtils {
         }
     }
 
+    /**
+     * TODO: This doesn't animate at present. Feel free to blow out everyhing in this method
+     * if needed
+     *
+     * We could manually try to animate the just the bounds for the leashes we get back, but we try
+     * to do it through TaskViewSimulator(TVS) since that handles a lot of the recents UI stuff for
+     * us.
+     *
+     * First you have to call TVS#setPreview() to indicate which leash it will operate one
+     * Then operations happen in TVS#apply() on each frame callback.
+     *
+     * TVS uses DeviceProfile to try to figure out things like task height and such based on if the
+     * device is in multiWindowMode or not. It's unclear given the two calls to startTask() when the
+     * device is considered in multiWindowMode and things like insets and stuff change
+     * and calculations have to be adjusted in the animations for that
+     */
+    public static void composeRecentsSplitLaunchAnimator(@NonNull AnimatorSet anim,
+            @NonNull TaskView v, @NonNull RemoteAnimationTargetCompat[] appTargets,
+            @NonNull RemoteAnimationTargetCompat[] wallpaperTargets, boolean launcherClosing,
+            @NonNull StateManager stateManager, @NonNull DepthController depthController,
+            int targetStage) {
+        PendingAnimation out = new PendingAnimation(RECENTS_LAUNCH_DURATION);
+        boolean isRunningTask = v.isRunningTask();
+        TransformParams params = null;
+        TaskViewSimulator tvs = null;
+        RecentsView recentsView = v.getRecentsView();
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && isRunningTask) {
+            params = recentsView.getLiveTileParams();
+            tvs = recentsView.getLiveTileTaskViewSimulator();
+        }
+
+        boolean inLiveTileMode =
+                ENABLE_QUICKSTEP_LIVE_TILE.get() && recentsView.getRunningTaskIndex() != -1;
+        final RemoteAnimationTargets targets =
+                new RemoteAnimationTargets(appTargets, wallpaperTargets,
+                        inLiveTileMode ? MODE_CLOSING : MODE_OPENING);
+
+        if (params == null) {
+            SurfaceTransactionApplier applier = new SurfaceTransactionApplier(v);
+            targets.addReleaseCheck(applier);
+
+            params = new TransformParams()
+                    .setSyncTransactionApplier(applier)
+                    .setTargetSet(targets);
+        }
+
+        Rect crop = new Rect();
+        Context context = v.getContext();
+        DeviceProfile dp = BaseActivity.fromContext(context).getDeviceProfile();
+        if (tvs == null && targets.apps.length > 0) {
+            tvs = new TaskViewSimulator(recentsView.getContext(), recentsView.getSizeStrategy());
+            tvs.setDp(dp);
+
+            // RecentsView never updates the display rotation until swipe-up so the value may
+            // be stale. Use the display value instead.
+            int displayRotation = DisplayController.getDefaultDisplay(recentsView.getContext())
+                    .getInfo().rotation;
+            tvs.getOrientationState().update(displayRotation, displayRotation);
+
+            tvs.setPreview(targets.apps[targets.apps.length - 1]);
+            tvs.fullScreenProgress.value = 0;
+            tvs.recentsViewScale.value = 1;
+//            tvs.setScroll(startScroll);
+
+            // Fade in the task during the initial 20% of the animation
+            out.addFloat(params, TransformParams.TARGET_ALPHA, 0, 1,
+                    clampToProgress(LINEAR, 0, 0.2f));
+        }
+
+        TaskViewSimulator topMostSimulator = null;
+
+        if (tvs != null) {
+            out.setFloat(tvs.fullScreenProgress,
+                    AnimatedFloat.VALUE, 1, TOUCH_RESPONSE_INTERPOLATOR);
+            out.setFloat(tvs.recentsViewScale,
+                    AnimatedFloat.VALUE, tvs.getFullScreenScale(), TOUCH_RESPONSE_INTERPOLATOR);
+            out.setInt(tvs, TaskViewSimulator.SCROLL, 0, TOUCH_RESPONSE_INTERPOLATOR);
+
+            TaskViewSimulator finalTsv = tvs;
+            TransformParams finalParams = params;
+            out.addOnFrameCallback(() -> finalTsv.apply(finalParams));
+            topMostSimulator = tvs;
+        }
+
+        anim.play(out.buildAnim());
+    }
+
     public static void composeRecentsLaunchAnimator(@NonNull AnimatorSet anim, @NonNull View v,
             @NonNull RemoteAnimationTargetCompat[] appTargets,
             @NonNull RemoteAnimationTargetCompat[] wallpaperTargets, boolean launcherClosing,
diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
index 13f6137fb1..02fd5bb3f7 100644
--- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
+++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
@@ -34,6 +34,7 @@ import com.android.quickstep.GestureState;
 import com.android.quickstep.RecentsActivity;
 import com.android.quickstep.views.OverviewActionsView;
 import com.android.quickstep.views.RecentsView;
+import com.android.quickstep.views.SplitPlaceholderView;
 import com.android.quickstep.views.TaskView;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.recents.model.Task.TaskKey;
@@ -56,8 +57,8 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity>
     }
 
     @Override
-    public void init(OverviewActionsView actionsView) {
-        super.init(actionsView);
+    public void init(OverviewActionsView actionsView, SplitPlaceholderView splitPlaceholderView) {
+        super.init(actionsView, splitPlaceholderView);
         setOverviewStateEnabled(true);
         setOverlayEnabled(true);
     }
diff --git a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
new file mode 100644
index 0000000000..d9154edc8d
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.quickstep.util;
+
+import android.animation.AnimatorSet;
+import android.app.ActivityOptions;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Pair;
+
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.BaseActivity;
+import com.android.launcher3.BaseQuickstepLauncher;
+import com.android.launcher3.LauncherAnimationRunner;
+import com.android.launcher3.WrappedAnimationRunnerImpl;
+import com.android.launcher3.WrappedLauncherAnimationRunner;
+import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
+import com.android.quickstep.SystemUiProxy;
+import com.android.quickstep.TaskViewUtils;
+import com.android.quickstep.views.TaskView;
+import com.android.systemui.shared.system.ActivityOptionsCompat;
+import com.android.systemui.shared.system.RemoteAnimationAdapterCompat;
+import com.android.systemui.shared.system.RemoteAnimationRunnerCompat;
+import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
+
+/**
+ * Represent data needed for the transient state when user has selected one app for split screen
+ * and is in the process of either a) selecting a second app or b) exiting intention to invoke split
+ */
+public class SplitSelectStateController {
+
+    private final SystemUiProxy mSystemUiProxy;
+    private TaskView mInitialTaskView;
+    private SplitPositionOption mInitialPosition;
+
+    public SplitSelectStateController(SystemUiProxy systemUiProxy) {
+        mSystemUiProxy = systemUiProxy;
+    }
+
+    /**
+     * To be called after first task selected
+     */
+    public void setInitialTaskSelect(TaskView taskView, SplitPositionOption positionOption) {
+        mInitialTaskView = taskView;
+        mInitialPosition = positionOption;
+    }
+
+    /**
+     * To be called after second task selected
+     */
+    public void setSecondTaskId(TaskView taskView) {
+        // Assume initial mInitialTaskId is for top/left part of screen
+        WrappedAnimationRunnerImpl initialSplitRunnerWrapped =  new SplitLaunchAnimationRunner(
+                mInitialTaskView, 0);
+        WrappedAnimationRunnerImpl secondarySplitRunnerWrapped =  new SplitLaunchAnimationRunner(
+                taskView, 1);
+        RemoteAnimationRunnerCompat initialSplitRunner = new WrappedLauncherAnimationRunner(
+                new Handler(Looper.getMainLooper()), initialSplitRunnerWrapped,
+                true /* startAtFrontOfQueue */);
+        RemoteAnimationRunnerCompat secondarySplitRunner = new WrappedLauncherAnimationRunner(
+                new Handler(Looper.getMainLooper()), secondarySplitRunnerWrapped,
+                true /* startAtFrontOfQueue */);
+        ActivityOptions initialOptions = ActivityOptionsCompat.makeRemoteAnimation(
+                new RemoteAnimationAdapterCompat(initialSplitRunner, 300, 150));
+        ActivityOptions secondaryOptions = ActivityOptionsCompat.makeRemoteAnimation(
+                new RemoteAnimationAdapterCompat(secondarySplitRunner, 300, 150));
+        mSystemUiProxy.startTask(mInitialTaskView.getTask().key.id, mInitialPosition.mStageType,
+                mInitialPosition.mStagePosition,
+                /*null*/ initialOptions.toBundle());
+        Pair<Integer, Integer> compliment = getComplimentaryStageAndPosition(mInitialPosition);
+        mSystemUiProxy.startTask(taskView.getTask().key.id, compliment.first,
+                compliment.second,
+                /*null*/ secondaryOptions.toBundle());
+        // After successful launch, call resetState
+        resetState();
+    }
+
+    @Nullable
+    public SplitPositionOption getActiveSplitPositionOption() {
+        return mInitialPosition;
+    }
+
+    /**
+     * @return the opposite stage and position from the {@param position} provided as first and
+     *         second object, respectively
+     * Ex. If position is has stage = Main and position = Top/Left, this will return
+     * Pair(stage=Side, position=Bottom/Left)
+     */
+    private Pair<Integer, Integer> getComplimentaryStageAndPosition(SplitPositionOption position) {
+        // Right now this is as simple as flipping between 0 and 1
+        int complimentStageType = position.mStageType ^ 1;
+        int complimentStagePosition = position.mStagePosition ^ 1;
+        return new Pair<>(complimentStageType, complimentStagePosition);
+    }
+
+    /**
+     * Remote animation runner for animation to launch an app.
+     */
+    private class SplitLaunchAnimationRunner implements WrappedAnimationRunnerImpl {
+
+        private final TaskView mV;
+        private final int mTargetState;
+
+        SplitLaunchAnimationRunner(TaskView v, int targetState) {
+            mV = v;
+            mTargetState = targetState;
+        }
+
+        @Override
+        public void onCreateAnimation(int transit,
+                RemoteAnimationTargetCompat[] appTargets,
+                RemoteAnimationTargetCompat[] wallpaperTargets,
+                RemoteAnimationTargetCompat[] nonAppTargets,
+                LauncherAnimationRunner.AnimationResult result) {
+            AnimatorSet anim = new AnimatorSet();
+            BaseQuickstepLauncher activity = BaseActivity.fromContext(mV.getContext());
+            TaskViewUtils.composeRecentsSplitLaunchAnimator(anim, mV,
+                    appTargets, wallpaperTargets, true, activity.getStateManager(),
+                    activity.getDepthController(), mTargetState);
+            result.setAnimation(anim, activity);
+        }
+    }
+
+
+    /**
+     * To be called if split select was cancelled
+     */
+    public void resetState() {
+        mInitialTaskView = null;
+        mInitialPosition = null;
+    }
+
+    public boolean isSplitSelectActive() {
+        return mInitialTaskView != null;
+    }
+}
diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index df1229ba05..6e8a5f13d3 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -104,6 +104,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
     public final AnimatedFloat recentsViewScale = new AnimatedFloat();
     public final AnimatedFloat fullScreenProgress = new AnimatedFloat();
     public final AnimatedFloat recentsViewSecondaryTranslation = new AnimatedFloat();
+    public final AnimatedFloat recentsViewPrimaryTranslation = new AnimatedFloat();
     public final AnimatedFloat gridProgress = new AnimatedFloat();
     private final ScrollState mScrollState = new ScrollState();
 
@@ -347,6 +348,8 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
         mMatrix.postScale(recentsViewScale.value, recentsViewScale.value, mPivot.x, mPivot.y);
         mOrientationState.getOrientationHandler().setSecondary(mMatrix, MATRIX_POST_TRANSLATE,
                 recentsViewSecondaryTranslation.value);
+        mOrientationState.getOrientationHandler().set(mMatrix, MATRIX_POST_TRANSLATE,
+                recentsViewPrimaryTranslation.value);
         applyWindowToHomeRotation(mMatrix);
 
         // Crop rect is the inverse of thumbnail matrix
diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
index ceb343d89f..9d31190eb6 100644
--- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
@@ -86,8 +86,8 @@ public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher>
     }
 
     @Override
-    public void init(OverviewActionsView actionsView) {
-        super.init(actionsView);
+    public void init(OverviewActionsView actionsView, SplitPlaceholderView splitPlaceholderView) {
+        super.init(actionsView, splitPlaceholderView);
         setContentAlpha(0);
     }
 
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index b9630259ef..3c5e403ada 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -26,6 +26,7 @@ import static com.android.launcher3.LauncherAnimUtils.SUCCESS_TRANSITION_PROGRES
 import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA;
 import static com.android.launcher3.LauncherState.BACKGROUND_APP;
 import static com.android.launcher3.LauncherState.OVERVIEW_MODAL_TASK;
+import static com.android.launcher3.LauncherState.OVERVIEW_SPLIT_SELECT;
 import static com.android.launcher3.Utilities.EDGE_NAV_BAR;
 import static com.android.launcher3.Utilities.mapToRange;
 import static com.android.launcher3.Utilities.squaredHypot;
@@ -48,6 +49,7 @@ import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NON_ZERO_RO
 import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NO_RECENTS;
 import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NO_TASKS;
 
+import android.animation.Animator;
 import android.animation.AnimatorSet;
 import android.animation.LayoutTransition;
 import android.animation.LayoutTransition.TransitionListener;
@@ -114,6 +116,7 @@ import com.android.launcher3.util.IntSet;
 import com.android.launcher3.util.MultiValueAlpha;
 import com.android.launcher3.util.OverScroller;
 import com.android.launcher3.util.ResourceBasedOverride.Overrides;
+import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.util.ViewPool;
 import com.android.quickstep.AnimatedFloat;
@@ -211,11 +214,17 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                 }
             };
 
+    /**
+     * Even though {@link TaskView} has distinct offsetTranslationX/Y and resistance property, they
+     * are currently both used to apply secondary translation. Should their use cases change to be
+     * more specific, we'd want to create a similar FloatProperty just for a TaskView's
+     * offsetX/Y property
+     */
     public static final FloatProperty<RecentsView> TASK_SECONDARY_TRANSLATION =
             new FloatProperty<RecentsView>("taskSecondaryTranslation") {
                 @Override
                 public void setValue(RecentsView recentsView, float v) {
-                    recentsView.setTaskViewsSecondaryTranslation(v);
+                    recentsView.setTaskViewsResistanceTranslation(v);
                 }
 
                 @Override
@@ -224,6 +233,25 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                 }
             };
 
+    /**
+     * Even though {@link TaskView} has distinct offsetTranslationX/Y and resistance property, they
+     * are currently both used to apply secondary translation. Should their use cases change to be
+     * more specific, we'd want to create a similar FloatProperty just for a TaskView's
+     * offsetX/Y property
+     */
+    public static final FloatProperty<RecentsView> TASK_PRIMARY_TRANSLATION =
+            new FloatProperty<RecentsView>("taskPrimaryTranslation") {
+                @Override
+                public void setValue(RecentsView recentsView, float v) {
+                    recentsView.setTaskViewsPrimaryTranslation(v);
+                }
+
+                @Override
+                public Float get(RecentsView recentsView) {
+                    return recentsView.mTaskViewsPrimaryTranslation;
+                }
+            };
+
     /** Same as normal SCALE_PROPERTY, but also updates page offsets that depend on this scale. */
     public static final FloatProperty<RecentsView> RECENTS_SCALE_PROPERTY =
             new FloatProperty<RecentsView>("recentsScale") {
@@ -234,7 +262,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                     view.mLastComputedTaskPushOutDistance = null;
                     view.mLiveTileTaskViewSimulator.recentsViewScale.value = scale;
                     view.updatePageOffsets();
-                    view.setTaskViewsSecondaryTranslation(view.mTaskViewsSecondaryTranslation);
+                    view.setTaskViewsResistanceTranslation(view.mTaskViewsSecondaryTranslation);
+                    view.setTaskViewsPrimaryTranslation(view.mTaskViewsPrimaryTranslation);
                 }
 
                 @Override
@@ -306,6 +335,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
 
     private float mAdjacentPageOffset = 0;
     private float mTaskViewsSecondaryTranslation = 0;
+    private float mTaskViewsPrimaryTranslation = 0;
     // Progress from 0 to 1 where 0 is a carousel and 1 is a 2 row grid.
     private float mGridProgress = 0;
     private boolean mShowAsGrid;
@@ -427,6 +457,28 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     private OnEmptyMessageUpdatedListener mOnEmptyMessageUpdatedListener;
     private Layout mEmptyTextLayout;
 
+    /**
+     * Placeholder view indicating where the first split screen selected app will be placed
+     */
+    private SplitPlaceholderView mSplitPlaceholderView;
+    /**
+     * The first task that split screen selection was initiated with. When split select state is
+     * initialized, we create a
+     * {@link #createTaskDismissAnimation(TaskView, boolean, boolean, long)} for this TaskView but
+     * don't actually remove the task since the user might back out. As such, we also ensure this
+     * View doesn't go back into the {@link #mTaskViewPool}, see {@link #onViewRemoved(View)}
+     */
+    private TaskView mSplitHiddenTaskView;
+    /**
+     * Keeps track of the index of the TaskView that split screen was initialized with so we know
+     * where to insert it back into list of taskViews in case user backs out of entering split
+     * screen.
+     * NOTE: This index is the index while {@link #mSplitHiddenTaskView} was a child of recentsView,
+     * this doesn't get adjusted to reflect the new child count after the taskView is dismissed/
+     * removed from recentsView
+     */
+    private int mSplitHiddenTaskViewIndex;
+
     // Keeps track of the index where the first TaskView should be
     private int mTaskViewStartIndex = 0;
     private OverviewActionsView mActionsView;
@@ -582,9 +634,19 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         loadVisibleTaskData();
     }
 
-    public void init(OverviewActionsView actionsView) {
+    public void init(OverviewActionsView actionsView, SplitPlaceholderView splitPlaceholderView) {
         mActionsView = actionsView;
         mActionsView.updateHiddenFlags(HIDDEN_NO_TASKS, getTaskViewCount() == 0);
+        mSplitPlaceholderView = splitPlaceholderView;
+
+    }
+
+    public SplitPlaceholderView getSplitPlaceholder() {
+        return mSplitPlaceholderView;
+    }
+
+    public boolean isSplitSelectionActive() {
+        return mSplitPlaceholderView.getSplitController().isSplitSelectActive();
     }
 
     @Override
@@ -628,8 +690,9 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     public void onViewRemoved(View child) {
         super.onViewRemoved(child);
 
-        // Clear the task data for the removed child if it was visible
-        if (child instanceof TaskView) {
+        // Clear the task data for the removed child if it was visible unless it's the initial
+        // taskview for entering split screen, we only pretend to dismiss the task
+        if (child instanceof TaskView && child != mSplitHiddenTaskView) {
             TaskView taskView = (TaskView) child;
             mHasVisibleTaskData.delete(taskView.getTask().key.id);
             mTaskViewPool.recycle(taskView);
@@ -707,6 +770,9 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             // Reset the running task when leaving overview since it can still have a reference to
             // its thumbnail
             mTmpRunningTask = null;
+            if (mSplitPlaceholderView.getSplitController().isSplitSelectActive()) {
+                cancelSplitSelect(false);
+            }
         }
     }
 
@@ -1764,7 +1830,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         // alpha is set to 0 so that it can be recycled in the view pool properly
         anim.setFloat(taskView, VIEW_ALPHA, 0, ACCEL_2);
         FloatProperty<TaskView> secondaryViewTranslate =
-                taskView.getDismissTaskTranslationProperty();
+                taskView.getSecondaryDissmissTranslationProperty();
         int secondaryTaskDimension = mOrientationHandler.getSecondaryDimension(taskView);
         int verticalFactor = mOrientationHandler.getSecondaryTranslationDirectionFactor();
 
@@ -1827,10 +1893,23 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                         offset += mIsRtl ? -scrollDiffPerPage : scrollDiffPerPage;
                     }
                 }
+
+                // Additional offset for fake landscape, if the pinning happens to the right or
+                // left, we need to scroll all the tasks away from the direction of the splaceholder
+                // view
+                if (isSplitSelectionActive()) {
+                    int splitPosition = getSplitPlaceholder().getSplitController()
+                            .getActiveSplitPositionOption().mStagePosition;
+                    int direction = mOrientationHandler
+                            .getSplitTranslationDirectionFactor(splitPosition);
+                    int splitOffset = mOrientationHandler.getSplitAnimationTranslation(
+                            mSplitPlaceholderView.getHeight(), mActivity.getDeviceProfile());
+                    offset += direction * splitOffset;
+                }
                 int scrollDiff = newScroll[i] - oldScroll[i] + offset;
                 if (scrollDiff != 0) {
                     FloatProperty translationProperty = child instanceof TaskView
-                            ? ((TaskView) child).getFillDismissGapTranslationProperty()
+                            ? ((TaskView) child).getPrimaryDismissTranslationProperty()
                             : mOrientationHandler.getPrimaryViewTranslate();
 
                     ResourceProvider rp = DynamicResource.provider(mActivity);
@@ -1908,6 +1987,12 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                     onLayout(false /*  changed */, getLeft(), getTop(), getRight(), getBottom());
                 }
                 resetTaskVisuals();
+                if (mActivity.isInState(OVERVIEW_SPLIT_SELECT)) {
+                    // We want to keep the tasks translations in this temporary state
+                    // after resetting the rest above
+                    setTaskViewsResistanceTranslation(mTaskViewsSecondaryTranslation);
+                    setTaskViewsPrimaryTranslation(mTaskViewsPrimaryTranslation);
+                }
                 mPendingAnimation = null;
             }
         });
@@ -2299,7 +2384,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         return distanceToOffscreen * offsetProgress;
     }
 
-    private void setTaskViewsSecondaryTranslation(float translation) {
+    private void setTaskViewsResistanceTranslation(float translation) {
         mTaskViewsSecondaryTranslation = translation;
         for (int i = 0; i < getTaskViewCount(); i++) {
             TaskView task = getTaskViewAt(i);
@@ -2308,6 +2393,15 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mLiveTileTaskViewSimulator.recentsViewSecondaryTranslation.value = translation;
     }
 
+    private void setTaskViewsPrimaryTranslation(float translation) {
+        mTaskViewsPrimaryTranslation = translation;
+        for (int i = 0; i < getTaskViewCount(); i++) {
+            TaskView task = getTaskViewAt(i);
+            task.getPrimaryDismissTranslationProperty().set(task, translation / getScaleY());
+        }
+        mLiveTileTaskViewSimulator.recentsViewPrimaryTranslation.value = translation;
+    }
+
     /**
      * TODO: Do not assume motion across X axis for adjacent page
      */
@@ -2325,6 +2419,111 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         }
     }
 
+    public void initiateSplitSelect(TaskView taskView, SplitPositionOption splitPositionOption) {
+        mSplitHiddenTaskView = taskView;
+        mSplitPlaceholderView.getSplitController().setInitialTaskSelect(taskView,
+                splitPositionOption);
+        mSplitHiddenTaskViewIndex = indexOfChild(taskView);
+        mActivity.getStateManager().goToState(LauncherState.OVERVIEW_SPLIT_SELECT);
+    }
+
+    public PendingAnimation createSplitSelectInitAnimation() {
+        int duration = mActivity.getStateManager().getState().getTransitionDuration(getContext());
+        return createTaskDismissAnimation(mSplitHiddenTaskView, true, false, duration);
+    }
+
+    public void confirmSplitSelect(TaskView taskView) {
+        mSplitPlaceholderView.getSplitController().setSecondTaskId(taskView);
+        resetTaskVisuals();
+        setTranslationY(0);
+    }
+
+    public PendingAnimation cancelSplitSelect(boolean animate) {
+        mSplitPlaceholderView.getSplitController().resetState();
+        int duration = mActivity.getStateManager().getState().getTransitionDuration(getContext());
+        PendingAnimation pendingAnim = new PendingAnimation(duration);
+        if (!animate) {
+            resetFromSplitSelectionState();
+            return pendingAnim;
+        }
+
+        addViewInLayout(mSplitHiddenTaskView, mSplitHiddenTaskViewIndex,
+                mSplitHiddenTaskView.getLayoutParams());
+        mSplitHiddenTaskView.setAlpha(0);
+        int[] oldScroll = new int[getChildCount()];
+        getPageScrolls(oldScroll, false,
+                view -> view.getVisibility() != GONE && view != mSplitHiddenTaskView);
+
+        // x is correct, y is before tasks move up
+        int[] locationOnScreen = mSplitHiddenTaskView.getLocationOnScreen();
+        int[] newScroll = new int[getChildCount()];
+        getPageScrolls(newScroll, false, SIMPLE_SCROLL_LOGIC);
+
+        boolean needsCurveUpdates = false;
+        for (int i = mSplitHiddenTaskViewIndex; i >= 0; i--) {
+            View child = getChildAt(i);
+            if (child == mSplitHiddenTaskView) {
+
+                int left = newScroll[i] + getPaddingStart();
+                int topMargin = mSplitHiddenTaskView.getThumbnailTopMargin();
+                int top = -mSplitHiddenTaskView.getHeight() - locationOnScreen[1];
+                mSplitHiddenTaskView.layout(left, top,
+                        left + mSplitHiddenTaskView.getWidth(),
+                        top + mSplitHiddenTaskView.getHeight());
+                pendingAnim.add(ObjectAnimator.ofFloat(mSplitHiddenTaskView, TRANSLATION_Y,
+                        -top + mSplitPlaceholderView.getHeight() - topMargin));
+                pendingAnim.add(ObjectAnimator.ofFloat(mSplitHiddenTaskView, ALPHA, 1));
+            } else {
+                // If insertion is on last index (furthest from clear all), we directly add the view
+                // else we translate all views to the right of insertion index further right,
+                // ignore views to left
+                int scrollDiff = newScroll[i] - oldScroll[i];
+                if (scrollDiff != 0) {
+                    FloatProperty translationProperty = child instanceof TaskView
+                            ? ((TaskView) child).getPrimaryDismissTranslationProperty()
+                            : mOrientationHandler.getPrimaryViewTranslate();
+
+                    ResourceProvider rp = DynamicResource.provider(mActivity);
+                    SpringProperty sp = new SpringProperty(SpringProperty.FLAG_CAN_SPRING_ON_END)
+                            .setDampingRatio(
+                                    rp.getFloat(R.dimen.dismiss_task_trans_x_damping_ratio))
+                            .setStiffness(rp.getFloat(R.dimen.dismiss_task_trans_x_stiffness));
+                    pendingAnim.add(ObjectAnimator.ofFloat(child, translationProperty, scrollDiff)
+                            .setDuration(duration), ACCEL, sp);
+                    needsCurveUpdates = true;
+                }
+            }
+        }
+
+        if (needsCurveUpdates) {
+            pendingAnim.addOnFrameCallback(this::updateCurveProperties);
+        }
+
+        pendingAnim.addListener(new AnimationSuccessListener() {
+            @Override
+            public void onAnimationSuccess(Animator animator) {
+                resetFromSplitSelectionState();
+            }
+        });
+
+        return pendingAnim;
+    }
+
+    private void resetFromSplitSelectionState() {
+        mSplitHiddenTaskView.setTranslationY(0);
+        int pageToSnapTo = mCurrentPage;
+        if (mSplitHiddenTaskViewIndex <= pageToSnapTo) {
+            pageToSnapTo += 1;
+        } else {
+            pageToSnapTo = mSplitHiddenTaskViewIndex;
+        }
+        snapToPageImmediately(pageToSnapTo);
+        onLayout(false /*  changed */, getLeft(), getTop(), getRight(), getBottom());
+        resetTaskVisuals();
+        mSplitHiddenTaskView = null;
+        mSplitHiddenTaskViewIndex = -1;
+    }
+
     private void updateDeadZoneRects() {
         // Get the deadzone rect surrounding the clear all button to not dismiss overview to home
         mClearAllButtonDeadZoneRect.setEmpty();
diff --git a/quickstep/src/com/android/quickstep/views/SplitPlaceholderView.java b/quickstep/src/com/android/quickstep/views/SplitPlaceholderView.java
new file mode 100644
index 0000000000..fb9be814f1
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/views/SplitPlaceholderView.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.quickstep.views;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.util.FloatProperty;
+import android.view.View;
+
+import com.android.quickstep.util.SplitSelectStateController;
+
+public class SplitPlaceholderView extends View {
+
+    public static final FloatProperty<SplitPlaceholderView> ALPHA_FLOAT =
+            new FloatProperty<SplitPlaceholderView>("SplitViewAlpha") {
+                @Override
+                public void setValue(SplitPlaceholderView splitPlaceholderView, float v) {
+                    splitPlaceholderView.setVisibility(v != 0 ? VISIBLE : GONE);
+                    splitPlaceholderView.setAlpha(v);
+                }
+
+                @Override
+                public Float get(SplitPlaceholderView splitPlaceholderView) {
+                    return splitPlaceholderView.getAlpha();
+                }
+            };
+
+    private SplitSelectStateController mSplitController;
+
+    public SplitPlaceholderView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public void init(SplitSelectStateController controller) {
+        this.mSplitController = controller;
+    }
+
+    public SplitSelectStateController getSplitController() {
+        return mSplitController;
+    }
+}
diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
index fe7ece216a..a5b7a5b575 100644
--- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
@@ -186,7 +186,8 @@ public class TaskMenuView extends AbstractFloatingView {
         mTaskName.setText(TaskUtils.getTitle(getContext(), taskView.getTask()));
         mTaskName.setOnClickListener(v -> close(true));
 
-        TaskOverlayFactory.getEnabledShortcuts(taskView).forEach(this::addMenuOption);
+        TaskOverlayFactory.getEnabledShortcuts(taskView, mActivity.getDeviceProfile())
+                .forEach(this::addMenuOption);
     }
 
     private void addMenuOption(SystemShortcut menuOption) {
@@ -196,6 +197,8 @@ public class TaskMenuView extends AbstractFloatingView {
                 menuOptionView.findViewById(R.id.icon), menuOptionView.findViewById(R.id.text));
         LayoutParams lp = (LayoutParams) menuOptionView.getLayoutParams();
         mTaskView.getPagedOrientationHandler().setLayoutParamsForTaskMenuOptionItem(lp);
+        menuOptionView.setEnabled(menuOption.isEnabled());
+        menuOptionView.setAlpha(menuOption.isEnabled() ? 1 : 0.5f);
         menuOptionView.setOnClickListener(view -> {
             if (LIVE_TILE.get()) {
                 RecentsView recentsView = mTaskView.getRecentsView();
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index eace0f8015..cd8ea7675f 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -28,6 +28,7 @@ import static android.view.Surface.ROTATION_90;
 import static android.widget.Toast.LENGTH_SHORT;
 
 import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DURATION;
+import static com.android.launcher3.LauncherState.OVERVIEW_SPLIT_SELECT;
 import static com.android.launcher3.Utilities.comp;
 import static com.android.launcher3.Utilities.getDescendantCoordRelativeToAncestor;
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
@@ -84,6 +85,7 @@ import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.util.ActivityOptionsWrapper;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.RunnableList;
+import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
 import com.android.launcher3.util.TransformingTouchDelegate;
 import com.android.launcher3.util.ViewPool.Reusable;
 import com.android.quickstep.RecentsModel;
@@ -345,7 +347,12 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
                 });
                 anim.start();
             } else {
-                launchTaskAnimated();
+                if (mActivity.isInState(OVERVIEW_SPLIT_SELECT)) {
+                    // User tapped to select second split screen app
+                    getRecentsView().confirmSplitSelect(this);
+                } else {
+                    launchTaskAnimated();
+                }
             }
             mActivity.getStatsLogManager().logger().withItemInfo(getItemInfo())
                     .log(LAUNCHER_TASK_LAUNCH_TAP);
@@ -591,6 +598,11 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     }
 
     private boolean showTaskMenu() {
+        if (getRecentsView().mActivity.isInState(OVERVIEW_SPLIT_SELECT)) {
+            // Don't show menu when selecting second split screen app
+            return true;
+        }
+
         if (!getRecentsView().isClearAllHidden()) {
             getRecentsView().snapToPage(getRecentsView().indexOfChild(this));
         } else {
@@ -619,6 +631,10 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         }
     }
 
+    public int getThumbnailTopMargin() {
+        return (int) getResources().getDimension(R.dimen.task_thumbnail_top_margin);
+    }
+
     public void setOrientationState(RecentsOrientedState orientationState) {
         PagedOrientationHandler orientationHandler = orientationState.getOrientationHandler();
         boolean isRtl = getLayoutDirection() == LAYOUT_DIRECTION_RTL;
@@ -998,12 +1014,12 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         return Utilities.mapRange(progress, 0, endTranslation);
     }
 
-    public FloatProperty<TaskView> getFillDismissGapTranslationProperty() {
+    public FloatProperty<TaskView> getPrimaryDismissTranslationProperty() {
         return getPagedOrientationHandler().getPrimaryValue(
                 DISMISS_TRANSLATION_X, DISMISS_TRANSLATION_Y);
     }
 
-    public FloatProperty<TaskView> getDismissTaskTranslationProperty() {
+    public FloatProperty<TaskView> getSecondaryDissmissTranslationProperty() {
         return getPagedOrientationHandler().getSecondaryValue(
                 DISMISS_TRANSLATION_X, DISMISS_TRANSLATION_Y);
     }
@@ -1081,7 +1097,8 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
                         getContext().getText(R.string.accessibility_close)));
 
         final Context context = getContext();
-        for (SystemShortcut s : TaskOverlayFactory.getEnabledShortcuts(this)) {
+        for (SystemShortcut s : TaskOverlayFactory.getEnabledShortcuts(this,
+                mActivity.getDeviceProfile())) {
             info.addAction(s.createAccessibilityAction(context));
         }
 
@@ -1113,7 +1130,8 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
             return true;
         }
 
-        for (SystemShortcut s : TaskOverlayFactory.getEnabledShortcuts(this)) {
+        for (SystemShortcut s : TaskOverlayFactory.getEnabledShortcuts(this,
+                mActivity.getDeviceProfile())) {
             if (s.hasHandlerForAction(action)) {
                 s.onClick(this);
                 return true;
@@ -1274,6 +1292,12 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         mSnapshotView.setOverlayEnabled(overlayEnabled);
     }
 
+    public void initiateSplitSelect(SplitPositionOption splitPositionOption) {
+        RecentsView rv = getRecentsView();
+        getMenuView().close(false);
+        rv.initiateSplitSelect(this, splitPositionOption);
+    }
+
     /**
      * We update and subsequently draw these in {@link #setFullscreenProgress(float)}.
      */
diff --git a/quickstep/res/drawable/ic_split_screen.xml b/res/drawable/ic_split_screen.xml
similarity index 100%
rename from quickstep/res/drawable/ic_split_screen.xml
rename to res/drawable/ic_split_screen.xml
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 351182d8a6..0600cae271 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -38,6 +38,13 @@
     <!-- User visible name for the launcher/home screen. [CHAR_LIMIT=30] -->
     <string name="home_screen">Home</string>
 
+    <!-- Options for recent tasks -->
+    <!-- Title for an option to enter split screen mode for a given app -->
+    <string name="recent_task_option_split_screen">Split screen</string>
+    <string translatable="false" name="split_screen_position_top">Pin to top</string>
+    <string translatable="false" name="split_screen_position_left">Pin to left</string>
+    <string translatable="false" name="split_screen_position_right">Pin to right</string>
+
     <!-- Widgets -->
     <!-- Message to tell the user to press and hold on a widget to add it [CHAR_LIMIT=50] -->
     <string name="long_press_widget_to_add">Touch &amp; hold to move a widget.</string>
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java
index 21c40efe30..aa97450a2b 100644
--- a/src/com/android/launcher3/LauncherState.java
+++ b/src/com/android/launcher3/LauncherState.java
@@ -22,6 +22,7 @@ import static com.android.launcher3.testing.TestProtocol.BACKGROUND_APP_STATE_OR
 import static com.android.launcher3.testing.TestProtocol.HINT_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.NORMAL_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.OVERVIEW_MODAL_TASK_STATE_ORDINAL;
+import static com.android.launcher3.testing.TestProtocol.OVERVIEW_SPLIT_SELECT_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.OVERVIEW_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.QUICK_SWITCH_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.SPRING_LOADED_STATE_ORDINAL;
@@ -60,6 +61,7 @@ public abstract class LauncherState implements BaseState<LauncherState> {
     public static final int TASKBAR = 1 << 7;
     public static final int CLEAR_ALL_BUTTON = 1 << 8;
     public static final int WORKSPACE_PAGE_INDICATOR = 1 << 9;
+    public static final int SPLIT_PLACHOLDER_VIEW = 1 << 10;
 
     /** Mask of all the items that are contained in the apps view. */
     public static final int APPS_VIEW_ITEM_MASK =
@@ -126,6 +128,8 @@ public abstract class LauncherState implements BaseState<LauncherState> {
             OverviewState.newSwitchState(QUICK_SWITCH_STATE_ORDINAL);
     public static final LauncherState BACKGROUND_APP =
             OverviewState.newBackgroundState(BACKGROUND_APP_STATE_ORDINAL);
+    public static final LauncherState OVERVIEW_SPLIT_SELECT =
+            OverviewState.newSplitSelectState(OVERVIEW_SPLIT_SELECT_ORDINAL);
 
     public final int ordinal;
 
@@ -240,6 +244,14 @@ public abstract class LauncherState implements BaseState<LauncherState> {
         return false;
     }
 
+    /**
+     * For this state, how much additional vertical translation there should be for each of the
+     * child TaskViews.
+     */
+    public float getOverviewSecondaryTranslation(Launcher launcher) {
+        return 0;
+    }
+
     /**
      * The amount of blur and wallpaper zoom to apply to the background of either the app
      * or Launcher surface in this state. Should be a number between 0 and 1, inclusive.
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 3657e892ad..48e41d5fda 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -205,6 +205,9 @@ public final class FeatureFlags {
             "ENABLE_OVERVIEW_GRID", false, "Uses grid overview layout. "
             + "Only applicable on large screen devices.");
 
+    public static final BooleanFlag ENABLE_SPLIT_SELECT = getDebugFlag(
+            "ENABLE_SPLIT_SELECT", false, "Uses new split screen selection overview UI");
+
     public static void initialize(Context context) {
         synchronized (sDebugFlags) {
             for (DebugFlag flag : sDebugFlags) {
diff --git a/src/com/android/launcher3/popup/SystemShortcut.java b/src/com/android/launcher3/popup/SystemShortcut.java
index 577fe4afaa..e5424cfe0a 100644
--- a/src/com/android/launcher3/popup/SystemShortcut.java
+++ b/src/com/android/launcher3/popup/SystemShortcut.java
@@ -45,6 +45,11 @@ public abstract class SystemShortcut<T extends BaseDraggingActivity> extends Ite
     protected final T mTarget;
     protected final ItemInfo mItemInfo;
 
+    /**
+     * Indicates if it's invokable or not through some disabled UI
+     */
+    private boolean isEnabled = true;
+
     public SystemShortcut(int iconResId, int labelResId, T target, ItemInfo itemInfo) {
         mIconResId = iconResId;
         mLabelResId = labelResId;
@@ -83,6 +88,14 @@ public abstract class SystemShortcut<T extends BaseDraggingActivity> extends Ite
                 mAccessibilityActionId, context.getText(mLabelResId));
     }
 
+    public void setEnabled(boolean enabled) {
+        isEnabled = enabled;
+    }
+
+    public boolean isEnabled() {
+        return isEnabled;
+    }
+
     public boolean hasHandlerForAction(int action) {
         return mAccessibilityActionId == action;
     }
diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java
index 7cb6e34a41..f34bff6994 100644
--- a/src/com/android/launcher3/testing/TestProtocol.java
+++ b/src/com/android/launcher3/testing/TestProtocol.java
@@ -32,6 +32,7 @@ public final class TestProtocol {
     public static final int ALL_APPS_STATE_ORDINAL = 5;
     public static final int BACKGROUND_APP_STATE_ORDINAL = 6;
     public static final int HINT_STATE_ORDINAL = 7;
+    public static final int OVERVIEW_SPLIT_SELECT_ORDINAL = 8;
     public static final String TAPL_EVENTS_TAG = "TaplEvents";
     public static final String SEQUENCE_MAIN = "Main";
     public static final String SEQUENCE_TIS = "TIS";
@@ -55,6 +56,8 @@ public final class TestProtocol {
                 return "Background";
             case HINT_STATE_ORDINAL:
                 return "Hint";
+            case OVERVIEW_SPLIT_SELECT_ORDINAL:
+                return "OverviewSplitSelect";
             default:
                 return "Unknown";
         }
diff --git a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
index 8a64f3d7b5..c1cf0c8ec2 100644
--- a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
+++ b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
@@ -21,6 +21,10 @@ import static android.widget.ListPopupWindow.WRAP_CONTENT;
 import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_X;
 import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y;
 import static com.android.launcher3.touch.SingleAxisSwipeDetector.HORIZONTAL;
+import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT;
+import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT;
+import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_TYPE_MAIN;
+import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_TYPE_SIDE;
 
 import android.content.res.Resources;
 import android.graphics.PointF;
@@ -36,8 +40,13 @@ import android.widget.LinearLayout;
 
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.PagedView;
+import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.util.OverScroller;
+import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public class LandscapePagedViewHandler implements PagedOrientationHandler {
 
@@ -211,6 +220,20 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
         return 1;
     }
 
+    @Override
+    public int getSplitTranslationDirectionFactor(int stagePosition) {
+        if (stagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT) {
+            return -1;
+        } else {
+            return 1;
+        }
+    }
+
+    @Override
+    public int getSplitAnimationTranslation(int translationOffset, DeviceProfile dp) {
+        return translationOffset;
+    }
+
     @Override
     public float getTaskMenuX(float x, View thumbnailView) {
         return thumbnailView.getMeasuredWidth() + x;
@@ -282,4 +305,23 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
     public int getDistanceToBottomOfRect(DeviceProfile dp, Rect rect) {
         return rect.left;
     }
+
+    @Override
+    public List<SplitPositionOption> getSplitPositionOptions(DeviceProfile dp) {
+        List<SplitPositionOption> options = new ArrayList<>(2);
+        // Add left/right options where left => position top, right => position bottom
+        options.add(new SplitPositionOption(
+                R.drawable.ic_split_screen, R.string.split_screen_position_left,
+                STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN));
+        options.add(new SplitPositionOption(
+                R.drawable.ic_split_screen, R.string.split_screen_position_right,
+                STAGE_POSITION_BOTTOM_OR_RIGHT, STAGE_TYPE_SIDE));
+        return options;
+    }
+
+    @Override
+    public FloatProperty getSplitSelectTaskOffset(FloatProperty primary, FloatProperty secondary,
+            DeviceProfile deviceProfile) {
+        return primary;
+    }
 }
diff --git a/src/com/android/launcher3/touch/PagedOrientationHandler.java b/src/com/android/launcher3/touch/PagedOrientationHandler.java
index e1cec87df7..fcfa205ed2 100644
--- a/src/com/android/launcher3/touch/PagedOrientationHandler.java
+++ b/src/com/android/launcher3/touch/PagedOrientationHandler.java
@@ -32,6 +32,10 @@ import android.widget.LinearLayout;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.PagedView;
 import com.android.launcher3.util.OverScroller;
+import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
+import com.android.launcher3.util.SplitConfigurationOptions.StagePosition;
+
+import java.util.List;
 
 /**
  * Abstraction layer to separate horizontal and vertical specific implementations
@@ -75,6 +79,8 @@ public interface PagedOrientationHandler {
     int getScrollOffsetEnd(View view, Rect insets);
     int getPrimaryTranslationDirectionFactor();
     int getSecondaryTranslationDirectionFactor();
+    int getSplitTranslationDirectionFactor(@StagePosition int stagePosition);
+    int getSplitAnimationTranslation(int translationOffset, DeviceProfile dp);
     ChildBounds getChildBounds(View child, int childStart, int pageCenter, boolean layoutChild);
     void setMaxScroll(AccessibilityEvent event, int maxScroll);
     boolean getRecentsRtlSetting(Resources resources);
@@ -95,6 +101,9 @@ public interface PagedOrientationHandler {
     int getTaskMenuLayoutOrientation(boolean canRecentsActivityRotate, LinearLayout taskMenuLayout);
     void setLayoutParamsForTaskMenuOptionItem(LinearLayout.LayoutParams lp);
     int getDistanceToBottomOfRect(DeviceProfile dp, Rect rect);
+    List<SplitPositionOption> getSplitPositionOptions(DeviceProfile dp);
+    FloatProperty getSplitSelectTaskOffset(FloatProperty primary, FloatProperty secondary,
+            DeviceProfile deviceProfile);
 
     // The following are only used by TaskViewTouchHandler.
     /** @return Either VERTICAL or HORIZONTAL. */
diff --git a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
index bcaf5f444d..2bc2dc7d93 100644
--- a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
+++ b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
@@ -19,6 +19,10 @@ package com.android.launcher3.touch;
 import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_X;
 import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y;
 import static com.android.launcher3.touch.SingleAxisSwipeDetector.VERTICAL;
+import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT;
+import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT;
+import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_TYPE_MAIN;
+import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_TYPE_SIDE;
 
 import android.content.res.Resources;
 import android.graphics.PointF;
@@ -34,8 +38,13 @@ import android.widget.LinearLayout;
 
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.PagedView;
+import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.util.OverScroller;
+import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public class PortraitPagedViewHandler implements PagedOrientationHandler {
 
@@ -207,6 +216,23 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
         return -1;
     }
 
+    @Override
+    public int getSplitTranslationDirectionFactor(int stagePosition) {
+        if (stagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT) {
+            return -1;
+        } else {
+            return 1;
+        }
+    }
+
+    @Override
+    public int getSplitAnimationTranslation(int translationOffset, DeviceProfile dp) {
+        if (dp.isLandscape) {
+            return translationOffset;
+        }
+        return 0;
+    }
+
     @Override
     public float getTaskMenuX(float x, View thumbnailView) {
         return x;
@@ -277,4 +303,35 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
     public int getDistanceToBottomOfRect(DeviceProfile dp, Rect rect) {
         return dp.heightPx - rect.bottom;
     }
+
+    @Override
+    public List<SplitPositionOption> getSplitPositionOptions(DeviceProfile dp) {
+        List<SplitPositionOption> options = new ArrayList<>(2);
+        // TODO: Add in correct icons
+        if (dp.isLandscape) { // or seascape
+            // Add left/right options
+            options.add(new SplitPositionOption(
+                    R.drawable.ic_split_screen, R.string.split_screen_position_left,
+                    STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN));
+            options.add(new SplitPositionOption(
+                    R.drawable.ic_split_screen, R.string.split_screen_position_right,
+                    STAGE_POSITION_BOTTOM_OR_RIGHT, STAGE_TYPE_SIDE));
+        } else {
+            // Only add top option
+            options.add(new SplitPositionOption(
+                    R.drawable.ic_split_screen, R.string.split_screen_position_top,
+                    STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN));
+        }
+        return options;
+    }
+
+    @Override
+    public FloatProperty getSplitSelectTaskOffset(FloatProperty primary, FloatProperty secondary,
+            DeviceProfile dp) {
+        if (dp.isLandscape) { // or seascape
+            return primary;
+        } else {
+            return secondary;
+        }
+    }
 }
diff --git a/src/com/android/launcher3/touch/SeascapePagedViewHandler.java b/src/com/android/launcher3/touch/SeascapePagedViewHandler.java
index 54af029266..b5252f73ea 100644
--- a/src/com/android/launcher3/touch/SeascapePagedViewHandler.java
+++ b/src/com/android/launcher3/touch/SeascapePagedViewHandler.java
@@ -17,6 +17,10 @@
 package com.android.launcher3.touch;
 
 import static com.android.launcher3.touch.SingleAxisSwipeDetector.HORIZONTAL;
+import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT;
+import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT;
+import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_TYPE_MAIN;
+import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_TYPE_SIDE;
 
 import android.content.res.Resources;
 import android.graphics.PointF;
@@ -25,7 +29,12 @@ import android.view.Surface;
 import android.view.View;
 
 import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public class SeascapePagedViewHandler extends LandscapePagedViewHandler {
 
@@ -34,6 +43,20 @@ public class SeascapePagedViewHandler extends LandscapePagedViewHandler {
         return -1;
     }
 
+    @Override
+    public int getSplitTranslationDirectionFactor(int stagePosition) {
+        if (stagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT) {
+            return -1;
+        } else {
+            return 1;
+        }
+    }
+
+    @Override
+    public int getSplitAnimationTranslation(int translationOffset, DeviceProfile dp) {
+        return translationOffset;
+    }
+
     @Override
     public boolean getRecentsRtlSetting(Resources resources) {
         return Utilities.isRtl(resources);
@@ -71,6 +94,19 @@ public class SeascapePagedViewHandler extends LandscapePagedViewHandler {
         return dp.widthPx - rect.right;
     }
 
+    @Override
+    public List<SplitPositionOption> getSplitPositionOptions(DeviceProfile dp) {
+        List<SplitPositionOption> options = new ArrayList<>(2);
+        // Add left/right options where left => position bottom, right => position top
+        options.add(new SplitPositionOption(
+                R.drawable.ic_split_screen, R.string.split_screen_position_left,
+                STAGE_POSITION_BOTTOM_OR_RIGHT, STAGE_TYPE_SIDE));
+        options.add(new SplitPositionOption(
+                R.drawable.ic_split_screen, R.string.split_screen_position_right,
+                STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN));
+        return options;
+    }
+
     /* ---------- The following are only used by TaskViewTouchHandler. ---------- */
 
     @Override
diff --git a/src/com/android/launcher3/util/SplitConfigurationOptions.java b/src/com/android/launcher3/util/SplitConfigurationOptions.java
new file mode 100644
index 0000000000..573c8bd367
--- /dev/null
+++ b/src/com/android/launcher3/util/SplitConfigurationOptions.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.util;
+
+import static java.lang.annotation.RetentionPolicy.SOURCE;
+
+import androidx.annotation.IntDef;
+
+import java.lang.annotation.Retention;
+
+public final class SplitConfigurationOptions {
+
+    ///////////////////////////////////
+    // Taken from
+    // frameworks/base/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreen.java
+    /**
+     * Stage position isn't specified normally meaning to use what ever it is currently set to.
+     */
+    public static final int STAGE_POSITION_UNDEFINED = -1;
+    /**
+     * Specifies that a stage is positioned at the top half of the screen if
+     * in portrait mode or at the left half of the screen if in landscape mode.
+     */
+    public static final int STAGE_POSITION_TOP_OR_LEFT = 0;
+
+    /**
+     * Specifies that a stage is positioned at the bottom half of the screen if
+     * in portrait mode or at the right half of the screen if in landscape mode.
+     */
+    public static final int STAGE_POSITION_BOTTOM_OR_RIGHT = 1;
+
+    @Retention(SOURCE)
+    @IntDef({STAGE_POSITION_UNDEFINED, STAGE_POSITION_TOP_OR_LEFT, STAGE_POSITION_BOTTOM_OR_RIGHT})
+    public @interface StagePosition {}
+
+    /**
+     * Stage type isn't specified normally meaning to use what ever the default is.
+     * E.g. exit split-screen and launch the app in fullscreen.
+     */
+    public static final int STAGE_TYPE_UNDEFINED = -1;
+    /**
+     * The main stage type.
+     */
+    public static final int STAGE_TYPE_MAIN = 0;
+
+    /**
+     * The side stage type.
+     */
+    public static final int STAGE_TYPE_SIDE = 1;
+
+    @IntDef({STAGE_TYPE_UNDEFINED, STAGE_TYPE_MAIN, STAGE_TYPE_SIDE})
+    public @interface StageType {}
+    ///////////////////////////////////
+
+    public static class SplitPositionOption {
+        public final int mIconResId;
+        public final int mTextResId;
+        @StagePosition
+        public final int mStagePosition;
+
+        @StageType
+        public final int mStageType;
+
+        public SplitPositionOption(int iconResId, int textResId, int stagePosition, int stageType) {
+            mIconResId = iconResId;
+            mTextResId = textResId;
+            mStagePosition = stagePosition;
+            mStageType = stageType;
+        }
+    }
+}
diff --git a/src/com/android/launcher3/util/ViewPool.java b/src/com/android/launcher3/util/ViewPool.java
index 5b33f1849e..e413d7ff9c 100644
--- a/src/com/android/launcher3/util/ViewPool.java
+++ b/src/com/android/launcher3/util/ViewPool.java
@@ -58,7 +58,7 @@ public class ViewPool<T extends View & Reusable> {
         Preconditions.assertUIThread();
         Handler handler = new Handler();
 
-        // LayoutInflater is not thread save as it maintains a global variable 'mConstructorArgs'.
+        // LayoutInflater is not thread safe as it maintains a global variable 'mConstructorArgs'.
         // Create a different copy to use on the background thread.
         LayoutInflater inflater = mInflater.cloneInContext(mInflater.getContext());
 
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java b/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java
index da5a94f6fd..e85e505f35 100644
--- a/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -49,4 +49,11 @@ public class OverviewState extends LauncherState {
     public static OverviewState newModalTaskState(int id) {
         return new OverviewState(id);
     }
+
+    /**
+     *  New Overview substate that represents the overview in modal mode (one task shown on its own)
+     */
+    public static OverviewState newSplitSelectState(int id) {
+        return new OverviewState(id);
+    }
 }
-- 
GitLab


From 0226d1ad79d1f2af4a8a47dc1aa705913cde0c66 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 8 Mar 2021 23:34:44 +0000
Subject: [PATCH 0676/1664] Replace DragView bitmap with drawable

This is a preliminary work for local color extraction. In order to
apply local colors extracted from wallpaper to AppWidgetHostView
during drag, we need to hold a reference of the dragging
AppWidgetHostView.

In this CL, the following changes are made:
1. Instead of using bitmap image directly for icons, folders, shortcuts,
   legacy widget drawable preview, a BitmapDrawable wrapper is
    introduced.
2. Introduce a WidgetHostViewDraggableDrawable which draws
   LauncherAppWidgetHostView directly to canvas. No more bitmap
   generation overhead.
3. Remove drag outline from the drag logic because this will be replaced
   by a new grid color hint UI: https://screenshot.googleplex.com/7jBEVeuxFecFKKT.png

Test: Add: add widgets, shortcuts from widgets tray.
           add icons from all apps.
           create folder.
      Drag: drag existing widgets, shortcuts, folders and icons around

Bug: 182282587
Change-Id: Ia45ff756ea5bb80cf0761f0727a9453d50c204c0
---
 src/com/android/launcher3/Workspace.java      | 43 +++++-----
 .../launcher3/dragndrop/AddItemActivity.java  |  4 +-
 .../dragndrop/AppWidgetHostViewDrawable.java  | 79 +++++++++++++++++++
 .../launcher3/dragndrop/DragController.java   | 29 +++++--
 .../android/launcher3/dragndrop/DragView.java | 67 +++++++++-------
 .../dragndrop/PinItemDragListener.java        |  2 +-
 .../graphics/DragPreviewProvider.java         | 23 ++++--
 .../ShortcutDragPreviewProvider.java          | 23 +++---
 .../launcher3/widget/BaseWidgetSheet.java     |  7 +-
 .../widget/PendingItemDragHelper.java         | 48 +++++++----
 .../android/launcher3/widget/WidgetCell.java  | 71 +++++++++++------
 .../launcher3/widget/WidgetImageView.java     | 22 +++---
 12 files changed, 289 insertions(+), 129 deletions(-)
 create mode 100644 src/com/android/launcher3/dragndrop/AppWidgetHostViewDrawable.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 0cc965c6c6..6da090cd17 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -69,6 +69,7 @@ import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.dot.FolderDotInfo;
+import com.android.launcher3.dragndrop.AppWidgetHostViewDrawable;
 import com.android.launcher3.dragndrop.DragController;
 import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.dragndrop.DragOptions;
@@ -396,15 +397,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
             layout.markCellsAsUnoccupiedForView(mDragInfo.cell);
         }
 
-        if (mOutlineProvider != null) {
-            if (dragObject.dragView != null) {
-                Bitmap preview = dragObject.dragView.getPreviewBitmap();
-
-                // The outline is used to visualize where the item will land if dropped
-                mOutlineProvider.generateDragOutline(preview);
-            }
-        }
-
         updateChildrenLayersEnabled();
 
         // Do not add a new page if it is a accessible drag which was not started by the workspace.
@@ -1504,10 +1496,10 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
             draggableView = (DraggableView) child;
         }
 
-        // The drag bitmap follows the touch point around on the screen
-        final Bitmap b = previewProvider.createDragBitmap();
+        // The draggable drawable follows the touch point around on the screen
+        final Drawable drawable = previewProvider.createDrawable();
         int halfPadding = previewProvider.previewPadding / 2;
-        float scale = previewProvider.getScaleAndPosition(b, mTempXY);
+        float scale = previewProvider.getScaleAndPosition(drawable, mTempXY);
         int dragLayerX = mTempXY[0];
         int dragLayerY = mTempXY[1];
 
@@ -1533,9 +1525,18 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
             }
         }
 
-        DragView dv = mDragController.startDrag(b, draggableView, dragLayerX, dragLayerY, source,
-                dragObject, dragVisualizeOffset, dragRect, scale * iconScale,
-                scale, dragOptions);
+        DragView dv = mDragController.startDrag(
+                drawable,
+                draggableView,
+                dragLayerX,
+                dragLayerY,
+                source,
+                dragObject,
+                dragVisualizeOffset,
+                dragRect,
+                scale * iconScale,
+                scale,
+                dragOptions);
         dv.setIntrinsicIconScaleFactor(dragOptions.intrinsicIconScaleFactor);
         return dv;
     }
@@ -2583,7 +2584,11 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
 
     }
 
-    public Bitmap createWidgetBitmap(ItemInfo widgetInfo, View layout) {
+    private Drawable createWidgetDrawable(ItemInfo widgetInfo, View layout) {
+        if (layout instanceof LauncherAppWidgetHostView) {
+            return new AppWidgetHostViewDrawable((LauncherAppWidgetHostView) layout);
+        }
+
         int[] unScaledSize = estimateItemSize(widgetInfo);
         int visibility = layout.getVisibility();
         layout.setVisibility(VISIBLE);
@@ -2595,7 +2600,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         Bitmap b = BitmapRenderer.createHardwareBitmap(
                 unScaledSize[0], unScaledSize[1], layout::draw);
         layout.setVisibility(visibility);
-        return b;
+        return new FastBitmapDrawable(b);
     }
 
     private void getFinalPositionForDropAnimation(int[] loc, float[] scaleXY,
@@ -2665,8 +2670,8 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         boolean isWidget = info.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET ||
                 info.itemType == LauncherSettings.Favorites.ITEM_TYPE_CUSTOM_APPWIDGET;
         if ((animationType == ANIMATE_INTO_POSITION_AND_RESIZE || external) && finalView != null) {
-            Bitmap crossFadeBitmap = createWidgetBitmap(info, finalView);
-            dragView.setCrossFadeBitmap(crossFadeBitmap);
+            Drawable crossFadeDrawable = createWidgetDrawable(info, finalView);
+            dragView.setCrossFadeDrawable(crossFadeDrawable);
             dragView.crossFade((int) (duration * 0.8f));
         } else if (isWidget && external) {
             scaleXY[0] = scaleXY[1] = Math.min(scaleXY[0],  scaleXY[1]);
diff --git a/src/com/android/launcher3/dragndrop/AddItemActivity.java b/src/com/android/launcher3/dragndrop/AddItemActivity.java
index c972cbbd7e..7bc9865162 100644
--- a/src/com/android/launcher3/dragndrop/AddItemActivity.java
+++ b/src/com/android/launcher3/dragndrop/AddItemActivity.java
@@ -142,7 +142,7 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
 
         // If the ImageView doesn't have a drawable yet, the widget preview hasn't been loaded and
         // we abort the drag.
-        if (img.getBitmap() == null) {
+        if (img.getDrawable() == null) {
             return false;
         }
 
@@ -151,7 +151,7 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
 
         // Start home and pass the draw request params
         PinItemDragListener listener = new PinItemDragListener(mRequest, bounds,
-                img.getBitmap().getWidth(), img.getWidth());
+                img.getDrawable().getIntrinsicWidth(), img.getWidth());
 
 
         // Start a system drag and drop. We use a transparent bitmap as preview for system drag
diff --git a/src/com/android/launcher3/dragndrop/AppWidgetHostViewDrawable.java b/src/com/android/launcher3/dragndrop/AppWidgetHostViewDrawable.java
new file mode 100644
index 0000000000..477bc6e316
--- /dev/null
+++ b/src/com/android/launcher3/dragndrop/AppWidgetHostViewDrawable.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.dragndrop;
+
+import android.graphics.Canvas;
+import android.graphics.ColorFilter;
+import android.graphics.Paint;
+import android.graphics.PixelFormat;
+import android.graphics.drawable.Drawable;
+
+import com.android.launcher3.widget.LauncherAppWidgetHostView;
+
+/** A drawable which renders {@link LauncherAppWidgetHostView} to a canvas. */
+public final class AppWidgetHostViewDrawable extends Drawable {
+
+    private final LauncherAppWidgetHostView mAppWidgetHostView;
+    private Paint mPaint = new Paint();
+
+    public AppWidgetHostViewDrawable(LauncherAppWidgetHostView appWidgetHostView) {
+        mAppWidgetHostView = appWidgetHostView;
+    }
+
+    @Override
+    public void draw(Canvas canvas) {
+        int saveCount = canvas.saveLayer(0, 0, getIntrinsicWidth(), getIntrinsicHeight(), mPaint);
+        mAppWidgetHostView.draw(canvas);
+        canvas.restoreToCount(saveCount);
+    }
+
+    @Override
+    public int getIntrinsicWidth() {
+        return mAppWidgetHostView.getMeasuredWidth();
+    }
+
+    @Override
+    public int getIntrinsicHeight() {
+        return mAppWidgetHostView.getMeasuredHeight();
+    }
+
+    @Override
+    public int getOpacity() {
+        // This is up to app widget provider. We don't know if the host view will cover anything
+        // behind the drawable.
+        return PixelFormat.UNKNOWN;
+    }
+
+    @Override
+    public void setAlpha(int alpha) {
+        mPaint.setAlpha(alpha);
+    }
+
+    @Override
+    public int getAlpha() {
+        return mPaint.getAlpha();
+    }
+
+    @Override
+    public void setColorFilter(ColorFilter colorFilter) {
+        mPaint.setColorFilter(colorFilter);
+    }
+
+    @Override
+    public ColorFilter getColorFilter() {
+        return mPaint.getColorFilter();
+    }
+}
diff --git a/src/com/android/launcher3/dragndrop/DragController.java b/src/com/android/launcher3/dragndrop/DragController.java
index 93df599a81..b7a70cb654 100644
--- a/src/com/android/launcher3/dragndrop/DragController.java
+++ b/src/com/android/launcher3/dragndrop/DragController.java
@@ -25,9 +25,9 @@ import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import android.animation.ValueAnimator;
 import android.content.ComponentName;
 import android.content.res.Resources;
-import android.graphics.Bitmap;
 import android.graphics.Point;
 import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
 import android.view.DragEvent;
 import android.view.HapticFeedbackConstants;
 import android.view.KeyEvent;
@@ -129,7 +129,7 @@ public class DragController implements DragDriver.EventListener, TouchController
      * drop, it is the responsibility of the {@link DropTarget} to exit out of the spring loaded
      * mode. If the drop was cancelled for some reason, the UI will automatically exit out of this mode.
      *
-     * @param b The bitmap to display as the drag image.  It will be re-scaled to the
+     * @param drawable The drawable to be displayed in the drag view.  It will be re-scaled to the
      *          enlarged size.
      * @param originalView The source view (ie. icon, widget etc.) that is being dragged
      *          and which the DragView represents
@@ -140,9 +140,18 @@ public class DragController implements DragDriver.EventListener, TouchController
      * @param dragRegion Coordinates within the bitmap b for the position of item being dragged.
      *          Makes dragging feel more precise, e.g. you can clip out a transparent border
      */
-    public DragView startDrag(Bitmap b, DraggableView originalView, int dragLayerX, int dragLayerY,
-            DragSource source, ItemInfo dragInfo, Point dragOffset, Rect dragRegion,
-            float initialDragViewScale, float dragViewScaleOnDrop, DragOptions options) {
+    public DragView startDrag(
+            Drawable drawable,
+            DraggableView originalView,
+            int dragLayerX,
+            int dragLayerY,
+            DragSource source,
+            ItemInfo dragInfo,
+            Point dragOffset,
+            Rect dragRegion,
+            float initialDragViewScale,
+            float dragViewScaleOnDrop,
+            DragOptions options) {
         if (PROFILE_DRAWING_DURING_DRAG) {
             android.os.Debug.startMethodTracing("Launcher");
         }
@@ -173,8 +182,14 @@ public class DragController implements DragDriver.EventListener, TouchController
         final Resources res = mLauncher.getResources();
         final float scaleDps = mIsInPreDrag
                 ? res.getDimensionPixelSize(R.dimen.pre_drag_view_scale) : 0f;
-        final DragView dragView = mDragObject.dragView = new DragView(mLauncher, b, registrationX,
-                registrationY, initialDragViewScale, dragViewScaleOnDrop, scaleDps);
+        final DragView dragView = mDragObject.dragView = new DragView(
+                mLauncher,
+                drawable,
+                registrationX,
+                registrationY,
+                initialDragViewScale,
+                dragViewScaleOnDrop,
+                scaleDps);
         dragView.setItemInfo(dragInfo);
         mDragObject.dragComplete = false;
 
diff --git a/src/com/android/launcher3/dragndrop/DragView.java b/src/com/android/launcher3/dragndrop/DragView.java
index 86b93d0aa3..df4d81197a 100644
--- a/src/com/android/launcher3/dragndrop/DragView.java
+++ b/src/com/android/launcher3/dragndrop/DragView.java
@@ -67,9 +67,9 @@ public class DragView extends View implements StateListener<LauncherState> {
     public static final int COLOR_CHANGE_DURATION = 120;
     public static final int VIEW_ZOOM_DURATION = 150;
 
-    private boolean mDrawBitmap = true;
-    private Bitmap mBitmap;
-    private Bitmap mCrossFadeBitmap;
+    private boolean mShouldDraw = true;
+    private Drawable mDrawable;
+    private Drawable mCrossFadeDrawable;
     @Thunk Paint mPaint;
     private final int mBlurSizeOutline;
     private final int mRegistrationX;
@@ -114,19 +114,21 @@ public class DragView extends View implements StateListener<LauncherState> {
      * The registration point is the point inside our view that the touch events should
      * be centered upon.
      * @param launcher The Launcher instance
-     * @param bitmap The view that we're dragging around.  We scale it up when we draw it.
+     * @param drawable The view that we're dragging around.  We scale it up when we draw it.
      * @param registrationX The x coordinate of the registration point.
      * @param registrationY The y coordinate of the registration point.
      */
-    public DragView(Launcher launcher, Bitmap bitmap, int registrationX, int registrationY,
-                    final float initialScale, final float scaleOnDrop, final float finalScaleDps) {
+    public DragView(Launcher launcher, Drawable drawable, int registrationX,
+            int registrationY, final float initialScale, final float scaleOnDrop,
+            final float finalScaleDps) {
         super(launcher);
         mLauncher = launcher;
         mDragLayer = launcher.getDragLayer();
         mDragController = launcher.getDragController();
         mFirstFrameAnimatorHelper = new FirstFrameAnimatorHelper(this);
 
-        final float scale = (bitmap.getWidth() + finalScaleDps) / bitmap.getWidth();
+        final float scale = (drawable.getIntrinsicWidth() + finalScaleDps)
+                / drawable.getIntrinsicWidth();
 
         // Set the initial scale to avoid any jumps
         setScaleX(initialScale);
@@ -144,8 +146,9 @@ public class DragView extends View implements StateListener<LauncherState> {
             }
         });
 
-        mBitmap = bitmap;
-        setDragRegion(new Rect(0, 0, bitmap.getWidth(), bitmap.getHeight()));
+        mDrawable = drawable;
+        setDragRegion(new Rect(0, 0, drawable.getIntrinsicWidth(),
+                drawable.getIntrinsicHeight()));
 
         // The point in our scaled bitmap that the touch events are located
         mRegistrationX = registrationX;
@@ -197,8 +200,8 @@ public class DragView extends View implements StateListener<LauncherState> {
             @Override
             public void run() {
                 Object[] outObj = new Object[1];
-                int w = mBitmap.getWidth();
-                int h = mBitmap.getHeight();
+                int w = mDrawable.getIntrinsicWidth();
+                int h = mDrawable.getIntrinsicHeight();
                 Drawable dr = Utilities.getFullDrawable(mLauncher, info, w, h, outObj);
 
                 if (dr instanceof AdaptiveIconDrawable) {
@@ -214,11 +217,11 @@ public class DragView extends View implements StateListener<LauncherState> {
                     mBadge.setBounds(badgeBounds);
 
                     // Do not draw the background in case of folder as its translucent
-                    mDrawBitmap = !(dr instanceof FolderAdaptiveIcon);
+                    mShouldDraw = !(dr instanceof FolderAdaptiveIcon);
 
                     try (LauncherIcons li = LauncherIcons.obtain(mLauncher)) {
                         Drawable nDr; // drawable to be normalized
-                        if (mDrawBitmap) {
+                        if (mShouldDraw) {
                             nDr = dr;
                         } else {
                             // Since we just want the scale, avoid heavy drawing operations
@@ -308,7 +311,7 @@ public class DragView extends View implements StateListener<LauncherState> {
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        setMeasuredDimension(mBitmap.getWidth(), mBitmap.getHeight());
+        setMeasuredDimension(mDrawable.getIntrinsicWidth(), mDrawable.getIntrinsicHeight());
     }
 
     /** Sets the scale of the view over the normal workspace icon size. */
@@ -352,29 +355,37 @@ public class DragView extends View implements StateListener<LauncherState> {
         return mDragRegion;
     }
 
-    public Bitmap getPreviewBitmap() {
-        return mBitmap;
-    }
-
     @Override
     protected void onDraw(Canvas canvas) {
         mHasDrawn = true;
 
-        if (mDrawBitmap) {
+        if (mShouldDraw) {
             // Always draw the bitmap to mask anti aliasing due to clipPath
-            boolean crossFade = mCrossFadeProgress > 0 && mCrossFadeBitmap != null;
+            boolean crossFade = mCrossFadeProgress > 0 && mCrossFadeDrawable != null;
             if (crossFade) {
                 int alpha = crossFade ? (int) (255 * (1 - mCrossFadeProgress)) : 255;
                 mPaint.setAlpha(alpha);
             }
-            canvas.drawBitmap(mBitmap, 0.0f, 0.0f, mPaint);
+            mDrawable.setColorFilter(mPaint.getColorFilter());
+            mDrawable.setAlpha(mPaint.getAlpha());
+            mDrawable.setBounds(
+                    new Rect(0, 0, mDrawable.getIntrinsicWidth(),
+                            mDrawable.getIntrinsicHeight()));
+            mDrawable.draw(canvas);
             if (crossFade) {
                 mPaint.setAlpha((int) (255 * mCrossFadeProgress));
                 final int saveCount = canvas.save();
-                float sX = (mBitmap.getWidth() * 1.0f) / mCrossFadeBitmap.getWidth();
-                float sY = (mBitmap.getHeight() * 1.0f) / mCrossFadeBitmap.getHeight();
+                float sX = ((float) mDrawable.getIntrinsicWidth())
+                        / mCrossFadeDrawable.getIntrinsicWidth();
+                float sY = ((float) mDrawable.getIntrinsicHeight())
+                        / mCrossFadeDrawable.getIntrinsicHeight();
                 canvas.scale(sX, sY);
-                canvas.drawBitmap(mCrossFadeBitmap, 0.0f, 0.0f, mPaint);
+                mCrossFadeDrawable.setColorFilter(mPaint.getColorFilter());
+                mCrossFadeDrawable.setAlpha(mPaint.getAlpha());
+                mDrawable.setBounds(
+                        new Rect(0, 0, mDrawable.getIntrinsicWidth(),
+                                mDrawable.getIntrinsicHeight()));
+                mCrossFadeDrawable.draw(canvas);
                 canvas.restoreToCount(saveCount);
             }
         }
@@ -390,8 +401,8 @@ public class DragView extends View implements StateListener<LauncherState> {
         }
     }
 
-    public void setCrossFadeBitmap(Bitmap crossFadeBitmap) {
-        mCrossFadeBitmap = crossFadeBitmap;
+    public void setCrossFadeDrawable(Drawable crossFadeDrawable) {
+        mCrossFadeDrawable = crossFadeDrawable;
     }
 
     public void crossFade(int duration) {
@@ -469,8 +480,8 @@ public class DragView extends View implements StateListener<LauncherState> {
 
         // Start the pick-up animation
         DragLayer.LayoutParams lp = new DragLayer.LayoutParams(0, 0);
-        lp.width = mBitmap.getWidth();
-        lp.height = mBitmap.getHeight();
+        lp.width = mDrawable.getIntrinsicWidth();
+        lp.height = mDrawable.getIntrinsicHeight();
         lp.customPosition = true;
         setLayoutParams(lp);
         move(touchX, touchY);
diff --git a/src/com/android/launcher3/dragndrop/PinItemDragListener.java b/src/com/android/launcher3/dragndrop/PinItemDragListener.java
index 2290473a81..9f12e6ec45 100644
--- a/src/com/android/launcher3/dragndrop/PinItemDragListener.java
+++ b/src/com/android/launcher3/dragndrop/PinItemDragListener.java
@@ -96,7 +96,7 @@ public class PinItemDragListener extends BaseItemDragListener {
 
         PendingItemDragHelper dragHelper = new PendingItemDragHelper(view);
         if (mRequest.getRequestType() == PinItemRequest.REQUEST_TYPE_APPWIDGET) {
-            dragHelper.setPreview(getPreview(mRequest));
+            dragHelper.setRemoteViewsPreview(getPreview(mRequest));
         }
         return dragHelper;
     }
diff --git a/src/com/android/launcher3/graphics/DragPreviewProvider.java b/src/com/android/launcher3/graphics/DragPreviewProvider.java
index 21822a3542..9bc54442a7 100644
--- a/src/com/android/launcher3/graphics/DragPreviewProvider.java
+++ b/src/com/android/launcher3/graphics/DragPreviewProvider.java
@@ -30,9 +30,11 @@ import android.graphics.drawable.Drawable;
 import android.view.View;
 
 import com.android.launcher3.BubbleTextView;
+import com.android.launcher3.FastBitmapDrawable;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.config.FeatureFlags;
+import com.android.launcher3.dragndrop.AppWidgetHostViewDrawable;
 import com.android.launcher3.dragndrop.DraggableView;
 import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.util.SafeCloseable;
@@ -88,10 +90,14 @@ public class DragPreviewProvider {
     }
 
     /**
-     * Returns a new bitmap to show when the {@link #mView} is being dragged around.
-     * Responsibility for the bitmap is transferred to the caller.
+     * Returns a new drawable to show when the {@link #mView} is being dragged around.
+     * Responsibility for the drawable is transferred to the caller.
      */
-    public Bitmap createDragBitmap() {
+    public Drawable createDrawable() {
+        if (mView instanceof LauncherAppWidgetHostView) {
+            return new AppWidgetHostViewDrawable((LauncherAppWidgetHostView) mView);
+        }
+
         int width = 0;
         int height = 0;
         // Assume scaleX == scaleY, which is always the case for workspace items.
@@ -105,8 +111,9 @@ public class DragPreviewProvider {
             height = mView.getHeight();
         }
 
-        return BitmapRenderer.createHardwareBitmap(width + blurSizeOutline,
-                height + blurSizeOutline, (c) -> drawDragView(c, scale));
+        return new FastBitmapDrawable(
+                BitmapRenderer.createHardwareBitmap(width + blurSizeOutline,
+                        height + blurSizeOutline, (c) -> drawDragView(c, scale)));
     }
 
     public final void generateDragOutline(Bitmap preview) {
@@ -129,7 +136,7 @@ public class DragPreviewProvider {
         return bounds;
     }
 
-    public float getScaleAndPosition(Bitmap preview, int[] outPos) {
+    public float getScaleAndPosition(Drawable preview, int[] outPos) {
         float scale = Launcher.getLauncher(mView.getContext())
                 .getDragLayer().getLocationInDragLayer(mView, outPos);
         if (mView instanceof LauncherAppWidgetHostView) {
@@ -139,8 +146,8 @@ public class DragPreviewProvider {
         }
 
         outPos[0] = Math.round(outPos[0] -
-                (preview.getWidth() - scale * mView.getWidth() * mView.getScaleX()) / 2);
-        outPos[1] = Math.round(outPos[1] - (1 - scale) * preview.getHeight() / 2
+                (preview.getIntrinsicWidth() - scale * mView.getWidth() * mView.getScaleX()) / 2);
+        outPos[1] = Math.round(outPos[1] - (1 - scale) * preview.getIntrinsicHeight() / 2
                 - previewPadding / 2);
         return scale;
     }
diff --git a/src/com/android/launcher3/shortcuts/ShortcutDragPreviewProvider.java b/src/com/android/launcher3/shortcuts/ShortcutDragPreviewProvider.java
index 3e59b612cf..530aaedefc 100644
--- a/src/com/android/launcher3/shortcuts/ShortcutDragPreviewProvider.java
+++ b/src/com/android/launcher3/shortcuts/ShortcutDragPreviewProvider.java
@@ -23,6 +23,7 @@ import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.view.View;
 
+import com.android.launcher3.FastBitmapDrawable;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
@@ -42,15 +43,16 @@ public class ShortcutDragPreviewProvider extends DragPreviewProvider {
     }
 
     @Override
-    public Bitmap createDragBitmap() {
+    public Drawable createDrawable() {
         if (FeatureFlags.ENABLE_DEEP_SHORTCUT_ICON_CACHE.get()) {
             int size = Launcher.getLauncher(mView.getContext()).getDeviceProfile().iconSizePx;
-            return BitmapRenderer.createHardwareBitmap(
-                    size + blurSizeOutline,
-                    size + blurSizeOutline,
-                    (c) -> drawDragViewOnBackground(c, size));
+            return new FastBitmapDrawable(
+                    BitmapRenderer.createHardwareBitmap(
+                            size + blurSizeOutline,
+                            size + blurSizeOutline,
+                            (c) -> drawDragViewOnBackground(c, size)));
         } else {
-            return createDragBitmapLegacy();
+            return new FastBitmapDrawable(createDragBitmapLegacy());
         }
     }
 
@@ -81,7 +83,7 @@ public class ShortcutDragPreviewProvider extends DragPreviewProvider {
     }
 
     @Override
-    public float getScaleAndPosition(Bitmap preview, int[] outPos) {
+    public float getScaleAndPosition(Drawable preview, int[] outPos) {
         Launcher launcher = Launcher.getLauncher(mView.getContext());
         int iconSize = getDrawableBounds(mView.getBackground()).width();
         float scale = launcher.getDragLayer().getLocationInDragLayer(mView, outPos);
@@ -91,9 +93,10 @@ public class ShortcutDragPreviewProvider extends DragPreviewProvider {
             iconLeft = mView.getWidth() - iconSize - iconLeft;
         }
 
-        outPos[0] += Math.round(scale * iconLeft + (scale * iconSize - preview.getWidth()) / 2 +
-                mPositionShift.x);
-        outPos[1] += Math.round((scale * mView.getHeight() - preview.getHeight()) / 2
+        outPos[0] += Math.round(
+                scale * iconLeft + (scale * iconSize - preview.getIntrinsicWidth()) / 2
+                        + mPositionShift.x);
+        outPos[1] += Math.round((scale * mView.getHeight() - preview.getIntrinsicHeight()) / 2
                 + mPositionShift.y);
         float size = launcher.getDeviceProfile().iconSizePx;
         return scale * iconSize / size;
diff --git a/src/com/android/launcher3/widget/BaseWidgetSheet.java b/src/com/android/launcher3/widget/BaseWidgetSheet.java
index 4fe631aa61..fc63af0c45 100644
--- a/src/com/android/launcher3/widget/BaseWidgetSheet.java
+++ b/src/com/android/launcher3/widget/BaseWidgetSheet.java
@@ -108,17 +108,18 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView
 
         // If the ImageView doesn't have a drawable yet, the widget preview hasn't been loaded and
         // we abort the drag.
-        if (image.getBitmap() == null) {
+        if (image.getDrawable() == null) {
             return false;
         }
 
         PendingItemDragHelper dragHelper = new PendingItemDragHelper(v);
-        dragHelper.setPreview(v.getPreview());
+        dragHelper.setRemoteViewsPreview(v.getPreview());
+        dragHelper.setAppWidgetHostViewPreview(v.getAppWidgetHostViewPreview());
 
         int[] loc = new int[2];
         getPopupContainer().getLocationInDragLayer(image, loc);
 
-        dragHelper.startDrag(image.getBitmapBounds(), image.getBitmap().getWidth(),
+        dragHelper.startDrag(image.getBitmapBounds(), image.getDrawable().getIntrinsicWidth(),
                 image.getWidth(), new Point(loc[0], loc[1]), this, new DragOptions());
         close(true);
         return true;
diff --git a/src/com/android/launcher3/widget/PendingItemDragHelper.java b/src/com/android/launcher3/widget/PendingItemDragHelper.java
index 6e8383698d..8961f3642a 100644
--- a/src/com/android/launcher3/widget/PendingItemDragHelper.java
+++ b/src/com/android/launcher3/widget/PendingItemDragHelper.java
@@ -29,10 +29,12 @@ import androidx.annotation.Nullable;
 
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.DragSource;
+import com.android.launcher3.FastBitmapDrawable;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.PendingAddItemInfo;
 import com.android.launcher3.R;
+import com.android.launcher3.dragndrop.AppWidgetHostViewDrawable;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.dragndrop.DraggableView;
 import com.android.launcher3.graphics.DragPreviewProvider;
@@ -49,15 +51,26 @@ public class PendingItemDragHelper extends DragPreviewProvider {
     private final PendingAddItemInfo mAddInfo;
     private int[] mEstimatedCellSize;
 
-    @Nullable private RemoteViews mPreview;
+    @Nullable private RemoteViews mRemoteViewsPreview;
+    @Nullable private LauncherAppWidgetHostView mAppWidgetHostViewPreview;
 
     public PendingItemDragHelper(View view) {
         super(view);
         mAddInfo = (PendingAddItemInfo) view.getTag();
     }
 
-    public void setPreview(@Nullable RemoteViews preview) {
-        mPreview = preview;
+    /**
+     * Sets a {@link RemoteViews} which shows an app widget preview provided by app developers in
+     * the pin widget flow.
+     */
+    public void setRemoteViewsPreview(@Nullable RemoteViews remoteViewsPreview) {
+        mRemoteViewsPreview = remoteViewsPreview;
+    }
+
+    /** Sets a {@link LauncherAppWidgetHostView} which shows a preview layout of an app widget. */
+    public void setAppWidgetHostViewPreview(
+            @Nullable LauncherAppWidgetHostView appWidgetHostViewPreview) {
+        mAppWidgetHostViewPreview = appWidgetHostViewPreview;
     }
 
     /**
@@ -74,7 +87,7 @@ public class PendingItemDragHelper extends DragPreviewProvider {
         final Launcher launcher = Launcher.getLauncher(mView.getContext());
         LauncherAppState app = LauncherAppState.getInstance(launcher);
 
-        Bitmap preview = null;
+        Drawable preview = null;
         final float scale;
         final Point dragOffset;
         final Rect dragRegion;
@@ -90,13 +103,19 @@ public class PendingItemDragHelper extends DragPreviewProvider {
 
             int[] previewSizeBeforeScale = new int[1];
 
-            if (mPreview != null) {
-                preview = WidgetCell.generateFromRemoteViews(launcher, mPreview,
-                        createWidgetInfo.info, maxWidth, previewSizeBeforeScale);
+            if (mRemoteViewsPreview != null) {
+                preview = new FastBitmapDrawable(
+                        WidgetCell.generateFromRemoteViews(launcher, mRemoteViewsPreview,
+                                createWidgetInfo.info, maxWidth, previewSizeBeforeScale));
+            }
+            if (mAppWidgetHostViewPreview != null) {
+                preview = new AppWidgetHostViewDrawable(mAppWidgetHostViewPreview);
             }
             if (preview == null) {
-                preview = app.getWidgetCache().generateWidgetPreview(launcher,
-                        createWidgetInfo.info, maxWidth, null, previewSizeBeforeScale).first;
+                preview = new FastBitmapDrawable(
+                        app.getWidgetCache().generateWidgetPreview(launcher,
+                                createWidgetInfo.info, maxWidth, null,
+                                previewSizeBeforeScale).first);
             }
 
             if (previewSizeBeforeScale[0] < previewBitmapWidth) {
@@ -109,7 +128,7 @@ public class PendingItemDragHelper extends DragPreviewProvider {
                 previewBounds.left += padding;
                 previewBounds.right -= padding;
             }
-            scale = previewBounds.width() / (float) preview.getWidth();
+            scale = previewBounds.width() / (float) preview.getIntrinsicWidth();
             launcher.getDragController().addDragListener(new WidgetHostViewLoader(launcher, mView));
 
             dragOffset = null;
@@ -119,9 +138,10 @@ public class PendingItemDragHelper extends DragPreviewProvider {
             PendingAddShortcutInfo createShortcutInfo = (PendingAddShortcutInfo) mAddInfo;
             Drawable icon = createShortcutInfo.activityInfo.getFullResIcon(app.getIconCache());
             LauncherIcons li = LauncherIcons.obtain(launcher);
-            preview = li.createScaledBitmapWithoutShadow(icon, 0);
+            preview = new FastBitmapDrawable(
+                    li.createScaledBitmapWithoutShadow(icon, 0));
             li.recycle();
-            scale = ((float) launcher.getDeviceProfile().iconSizePx) / preview.getWidth();
+            scale = ((float) launcher.getDeviceProfile().iconSizePx) / preview.getIntrinsicWidth();
 
             dragOffset = new Point(previewPadding / 2, previewPadding / 2);
 
@@ -149,9 +169,9 @@ public class PendingItemDragHelper extends DragPreviewProvider {
         launcher.getWorkspace().prepareDragWithProvider(this);
 
         int dragLayerX = screenPos.x + previewBounds.left
-                + (int) ((scale * preview.getWidth() - preview.getWidth()) / 2);
+                + (int) ((scale * preview.getIntrinsicWidth() - preview.getIntrinsicWidth()) / 2);
         int dragLayerY = screenPos.y + previewBounds.top
-                + (int) ((scale * preview.getHeight() - preview.getHeight()) / 2);
+                + (int) ((scale * preview.getIntrinsicHeight() - preview.getIntrinsicHeight()) / 2);
 
         // Start the drag
         launcher.getDragController().startDrag(preview, draggableView, dragLayerX, dragLayerY,
diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index 229df50288..5328041d16 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -18,10 +18,10 @@ package com.android.launcher3.widget;
 
 import static com.android.launcher3.Utilities.ATLEAST_S;
 
-import android.appwidget.AppWidgetHostView;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
 import android.os.CancellationSignal;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -35,11 +35,15 @@ import android.widget.LinearLayout;
 import android.widget.RemoteViews;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.BaseActivity;
 import com.android.launcher3.CheckLongPressHelper;
 import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.FastBitmapDrawable;
 import com.android.launcher3.R;
 import com.android.launcher3.WidgetPreviewLoader;
+import com.android.launcher3.dragndrop.AppWidgetHostViewDrawable;
 import com.android.launcher3.icons.BaseIconFactory;
 import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.model.WidgetItem;
@@ -84,14 +88,14 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     private boolean mAnimatePreview = true;
 
     private boolean mApplyBitmapDeferred = false;
-    private Bitmap mDeferredBitmap;
+    private Drawable mDeferredDrawable;
 
     protected final BaseActivity mActivity;
     protected final DeviceProfile mDeviceProfile;
     private final CheckLongPressHelper mLongPressHelper;
 
     private RemoteViews mPreview;
-    private AppWidgetHostView mPreviewAppWidgetHostView;
+    private LauncherAppWidgetHostView mAppWidgetHostViewPreview;
 
     public WidgetCell(Context context) {
         this(context, null);
@@ -147,7 +151,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
             Log.d(TAG, "reset called on:" + mWidgetName.getText());
         }
         mWidgetImage.animate().cancel();
-        mWidgetImage.setBitmap(null, null);
+        mWidgetImage.setDrawable(null, null);
         mWidgetName.setText(null);
         mWidgetDims.setText(null);
         mWidgetDescription.setText(null);
@@ -159,7 +163,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
             mActiveRequest = null;
         }
         mPreview = null;
-        mPreviewAppWidgetHostView = null;
+        mAppWidgetHostViewPreview = null;
     }
 
     public void applyFromCellItem(WidgetItem item, WidgetPreviewLoader loader) {
@@ -194,7 +198,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
                 && mPreview == null
                 && item.widgetInfo != null
                 && item.widgetInfo.previewLayout != Resources.ID_NULL) {
-            mPreviewAppWidgetHostView = new AppWidgetHostView(getContext());
+            mAppWidgetHostViewPreview = new LauncherAppWidgetHostView(getContext());
             LauncherAppWidgetProviderInfo launcherAppWidgetProviderInfo =
                     LauncherAppWidgetProviderInfo.fromProviderInfo(getContext(),
                             item.widgetInfo.clone());
@@ -202,11 +206,11 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
             // rendering a preview layout for work profile apps yet. For non-work profile layout, a
             // proper solution is to use RemoteViews(PackageName, LayoutId).
             launcherAppWidgetProviderInfo.initialLayout = item.widgetInfo.previewLayout;
-            mPreviewAppWidgetHostView.setAppWidget(/* appWidgetId= */ -1,
+            mAppWidgetHostViewPreview.setAppWidget(/* appWidgetId= */ -1,
                     launcherAppWidgetProviderInfo);
-            mPreviewAppWidgetHostView.setPadding(/* left= */ 0, /* top= */0, /* right= */
+            mAppWidgetHostViewPreview.setPadding(/* left= */ 0, /* top= */0, /* right= */
                     0, /* bottom= */ 0);
-            mPreviewAppWidgetHostView.updateAppWidget(/* remoteViews= */ null);
+            mAppWidgetHostViewPreview.updateAppWidget(/* remoteViews= */ null);
         }
     }
 
@@ -214,6 +218,11 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
         return mWidgetImage;
     }
 
+    @Nullable
+    public LauncherAppWidgetHostView getAppWidgetHostViewPreview() {
+        return mAppWidgetHostViewPreview;
+    }
+
     /**
      * Sets if applying bitmap preview should be deferred. The UI will still load the bitmap, but
      * will not cause invalidate, so that when deferring is disabled later, all the bitmaps are
@@ -223,9 +232,9 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     public void setApplyBitmapDeferred(boolean isDeferred) {
         if (mApplyBitmapDeferred != isDeferred) {
             mApplyBitmapDeferred = isDeferred;
-            if (!mApplyBitmapDeferred && mDeferredBitmap != null) {
-                applyPreview(mDeferredBitmap);
-                mDeferredBitmap = null;
+            if (!mApplyBitmapDeferred && mDeferredDrawable != null) {
+                applyPreview(mDeferredDrawable);
+                mDeferredDrawable = null;
             }
         }
     }
@@ -235,17 +244,21 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     }
 
     public void applyPreview(Bitmap bitmap) {
+        applyPreview(new FastBitmapDrawable(bitmap));
+    }
+
+    private void applyPreview(Drawable drawable) {
         if (mApplyBitmapDeferred) {
-            mDeferredBitmap = bitmap;
+            mDeferredDrawable = drawable;
             return;
         }
-        if (bitmap != null) {
+        if (drawable != null) {
             LayoutParams layoutParams = (LayoutParams) mWidgetImage.getLayoutParams();
-            layoutParams.width = bitmap.getWidth();
-            layoutParams.height = bitmap.getHeight();
+            layoutParams.width = drawable.getIntrinsicWidth();
+            layoutParams.height = drawable.getIntrinsicHeight();
             mWidgetImage.setLayoutParams(layoutParams);
 
-            mWidgetImage.setBitmap(bitmap, mWidgetPreviewLoader.getBadgeForUser(mItem.user,
+            mWidgetImage.setDrawable(drawable, mWidgetPreviewLoader.getBadgeForUser(mItem.user,
                     BaseIconFactory.getBadgeSizeForIconSize(mDeviceProfile.allAppsIconSizePx)));
             if (mAnimatePreview) {
                 mWidgetImage.setAlpha(0f);
@@ -262,18 +275,26 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
             Bitmap preview = generateFromRemoteViews(
                     mActivity, mPreview, mItem.widgetInfo, mPresetPreviewSize, new int[1]);
             if (preview != null) {
-                applyPreview(preview);
+                applyPreview(new FastBitmapDrawable(preview));
                 return;
             }
         }
 
-        if (mPreviewAppWidgetHostView != null) {
-            Bitmap preview = generateFromView(mActivity, mPreviewAppWidgetHostView,
-                    mItem.widgetInfo, mPreviewWidth, new int[1]);
-            if (preview != null) {
-                applyPreview(preview);
-                return;
-            }
+        if (mAppWidgetHostViewPreview != null) {
+            DeviceProfile dp = mActivity.getDeviceProfile();
+            int viewWidth = dp.cellWidthPx * mItem.spanX;
+            int viewHeight = dp.cellHeightPx * mItem.spanY;
+
+            mAppWidgetHostViewPreview.measure(
+                    MeasureSpec.makeMeasureSpec(viewWidth, MeasureSpec.EXACTLY),
+                    MeasureSpec.makeMeasureSpec(viewHeight, MeasureSpec.EXACTLY));
+
+            viewWidth = mAppWidgetHostViewPreview.getMeasuredWidth();
+            viewHeight = mAppWidgetHostViewPreview.getMeasuredHeight();
+            mAppWidgetHostViewPreview.layout(0, 0, viewWidth, viewHeight);
+            Drawable drawable = new AppWidgetHostViewDrawable(mAppWidgetHostViewPreview);
+            applyPreview(drawable);
+            return;
         }
         if (mActiveRequest != null) {
             return;
diff --git a/src/com/android/launcher3/widget/WidgetImageView.java b/src/com/android/launcher3/widget/WidgetImageView.java
index df2bcffc16..39d701ce5b 100644
--- a/src/com/android/launcher3/widget/WidgetImageView.java
+++ b/src/com/android/launcher3/widget/WidgetImageView.java
@@ -17,9 +17,7 @@
 package com.android.launcher3.widget;
 
 import android.content.Context;
-import android.graphics.Bitmap;
 import android.graphics.Canvas;
-import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
@@ -35,11 +33,10 @@ import com.android.launcher3.Utilities;
  */
 public class WidgetImageView extends View {
 
-    private final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG);
     private final RectF mDstRectF = new RectF();
     private final int mBadgeMargin;
 
-    private Bitmap mBitmap;
+    private Drawable mDrawable;
     private Drawable mBadge;
 
     public WidgetImageView(Context context) {
@@ -57,21 +54,22 @@ public class WidgetImageView extends View {
                 .getDimensionPixelSize(R.dimen.profile_badge_margin);
     }
 
-    public void setBitmap(Bitmap bitmap, Drawable badge) {
-        mBitmap = bitmap;
+    public void setDrawable(Drawable drawable, Drawable badge) {
+        mDrawable = drawable;
         mBadge = badge;
         invalidate();
     }
 
-    public Bitmap getBitmap() {
-        return mBitmap;
+    public Drawable getDrawable() {
+        return mDrawable;
     }
 
     @Override
     protected void onDraw(Canvas canvas) {
-        if (mBitmap != null) {
+        if (mDrawable != null) {
             updateDstRectF();
-            canvas.drawBitmap(mBitmap, null, mDstRectF, mPaint);
+            mDrawable.setBounds(getBitmapBounds());
+            mDrawable.draw(canvas);
 
             // Only draw the badge if a preview was drawn.
             if (mBadge != null) {
@@ -91,11 +89,11 @@ public class WidgetImageView extends View {
     private void updateDstRectF() {
         float myWidth = getWidth();
         float myHeight = getHeight();
-        float bitmapWidth = mBitmap.getWidth();
+        float bitmapWidth = mDrawable.getIntrinsicWidth();
 
         final float scale = bitmapWidth > myWidth ? myWidth / bitmapWidth : 1;
         float scaledWidth = bitmapWidth * scale;
-        float scaledHeight = mBitmap.getHeight() * scale;
+        float scaledHeight = mDrawable.getIntrinsicHeight() * scale;
 
         mDstRectF.left = (myWidth - scaledWidth) / 2;
         mDstRectF.right = (myWidth + scaledWidth) / 2;
-- 
GitLab


From a907a995c9b2e687e44ea8f3777482c33dac8914 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Wed, 10 Mar 2021 10:18:03 -0800
Subject: [PATCH 0677/1664] Hide keyboard only when scrolling happens

Bug: 179307221
Test: see attached video

Change-Id: I9b13c8f62122a6d7bf56a28c830be9a9dbfee52a
---
 src/com/android/launcher3/ExtendedEditText.java          | 7 +++----
 .../android/launcher3/allapps/AllAppsContainerView.java  | 6 +-----
 .../android/launcher3/allapps/AllAppsRecyclerView.java   | 2 ++
 .../launcher3/allapps/AllAppsTransitionController.java   | 1 +
 .../allapps/search/AllAppsSearchBarController.java       | 2 +-
 src/com/android/launcher3/statemanager/StateManager.java | 9 +++++++++
 6 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/com/android/launcher3/ExtendedEditText.java b/src/com/android/launcher3/ExtendedEditText.java
index 02c61620fe..c79dabe8cf 100644
--- a/src/com/android/launcher3/ExtendedEditText.java
+++ b/src/com/android/launcher3/ExtendedEditText.java
@@ -131,10 +131,9 @@ public class ExtendedEditText extends EditText {
     public void reset() {
         if (!TextUtils.isEmpty(getText())) {
             setText("");
-        } else {
-            if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
-                return;
-            }
+        }
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
+            return;
         }
         if (isFocused()) {
             View nextFocus = focusSearch(View.FOCUS_DOWN);
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 9ede94c43f..67ed99d94c 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -246,11 +246,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
             hideInput();
             return false;
         }
-        boolean shouldScroll = rv.shouldContainerScroll(ev, mLauncher.getDragLayer());
-        if (shouldScroll) {
-            hideInput();
-        }
-        return shouldScroll;
+        return rv.shouldContainerScroll(ev, mLauncher.getDragLayer());
     }
 
     @Override
diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
index 179cb778fd..f307a53bc0 100644
--- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
@@ -31,6 +31,7 @@ import android.util.Log;
 import android.util.SparseIntArray;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.WindowInsets;
 
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -188,6 +189,7 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
             case SCROLL_STATE_DRAGGING:
                 mgr.logger().sendToInteractionJankMonitor(
                         LAUNCHER_ALLAPPS_VERTICAL_SWIPE_BEGIN, this);
+                getWindowInsetsController().hide(WindowInsets.Type.ime());
                 break;
             case SCROLL_STATE_IDLE:
                 mgr.logger().sendToInteractionJankMonitor(
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index abf63dc0a1..1e6f829886 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -246,6 +246,7 @@ public class AllAppsTransitionController
      * TODO: This logic should go in {@link LauncherState}
      */
     private void onProgressAnimationEnd() {
+        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) return;
         if (Float.compare(mProgress, 1f) == 0) {
             mAppsView.reset(false /* animate */);
         }
diff --git a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
index 3319018218..d3c9993579 100644
--- a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
+++ b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
@@ -144,7 +144,7 @@ public class AllAppsSearchBarController
 
     @Override
     public void onFocusChange(View view, boolean hasFocus) {
-        if (!hasFocus) {
+        if (!hasFocus && !FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
             mInput.hideKeyboard();
         }
     }
diff --git a/src/com/android/launcher3/statemanager/StateManager.java b/src/com/android/launcher3/statemanager/StateManager.java
index 2b51e97f3f..51767e77e7 100644
--- a/src/com/android/launcher3/statemanager/StateManager.java
+++ b/src/com/android/launcher3/statemanager/StateManager.java
@@ -77,6 +77,15 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
         return mCurrentStableState;
     }
 
+    @Override
+    public String toString() {
+        return " StateManager(mLastStableState:" + mLastStableState
+                + ", mCurrentStableState:" + mCurrentStableState
+                + ", mState:" + mState
+                + ", mRestState:" + mRestState
+                + ", isInTransition:" + (mConfig.currentAnimation != null) + ")";
+    }
+
     public void dump(String prefix, PrintWriter writer) {
         writer.println(prefix + "StateManager:");
         writer.println(prefix + "\tmLastStableState:" + mLastStableState);
-- 
GitLab


From 1632752a72e7e61ca219b6a97c5f142c07828e33 Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Mon, 15 Mar 2021 07:00:49 +0000
Subject: [PATCH 0678/1664] Have an interface for WidgetsSearchBar so Nexus
 Launcher can override the search bar.

Test: Tested prototype locally.
Bug: b/157286785
Change-Id: I263063a451862755efe3d6e4a5a2eb69f2ea29b8
---
 res/layout/widgets_search_bar.xml             |  7 +-
 .../launcher3/config/FeatureFlags.java        |  3 +
 .../widget/picker/WidgetsFullSheet.java       |  3 +-
 .../widget/picker/WidgetsRecyclerView.java    |  4 +-
 .../search/LauncherWidgetsSearchBar.java      | 77 +++++++++++++++++++
 .../picker/search/WidgetsSearchBar.java       | 57 ++------------
 6 files changed, 95 insertions(+), 56 deletions(-)
 create mode 100644 src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java

diff --git a/res/layout/widgets_search_bar.xml b/res/layout/widgets_search_bar.xml
index 252637d9cf..450e5f1ece 100644
--- a/res/layout/widgets_search_bar.xml
+++ b/res/layout/widgets_search_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.android.launcher3.widget.picker.search.WidgetsSearchBar
+<com.android.launcher3.widget.picker.search.LauncherWidgetsSearchBar
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/widgets_search_bar"
     android:layout_width="match_parent"
@@ -7,8 +7,7 @@
     android:orientation="horizontal"
     android:layout_marginTop="16dp"
     android:background="@drawable/bg_widgets_searchbox"
-    android:padding="12dp"
-    android:visibility="gone">
+    android:padding="12dp">
 
     <EditText
         android:id="@+id/widgets_search_bar_edit_text"
@@ -30,4 +29,4 @@
         android:background="?android:selectableItemBackground"
         android:layout_gravity="center"
         android:visibility="gone"/>
-</com.android.launcher3.widget.picker.search.WidgetsSearchBar>
\ No newline at end of file
+</com.android.launcher3.widget.picker.search.LauncherWidgetsSearchBar>
\ No newline at end of file
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 48e41d5fda..c1dd809855 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -140,6 +140,9 @@ public final class FeatureFlags {
     public static final BooleanFlag ENABLE_OVERVIEW_SELECTIONS = new DeviceFlag(
             "ENABLE_OVERVIEW_SELECTIONS", true, "Show Select Mode button in Overview Actions");
 
+    public static final BooleanFlag ENABLE_WIDGETS_PICKER_AIAI_SEARCH = new DeviceFlag(
+            "ENABLE_WIDGETS_PICKER_AIAI_SEARCH", false, "Enable AiAi search in the widgets picker");
+
     public static final BooleanFlag ENABLE_OVERVIEW_SHARE = getDebugFlag(
             "ENABLE_OVERVIEW_SHARE", false, "Show Share button in Overview Actions");
 
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 6b3c71ab36..92994be568 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -439,7 +439,8 @@ public class WidgetsFullSheet extends BaseWidgetSheet
     public int getHeaderViewHeight() {
         return measureHeightWithVerticalMargins(mSearchAndRecommendationViewHolder.mCollapseHandle)
                 + measureHeightWithVerticalMargins(mSearchAndRecommendationViewHolder.mHeaderTitle)
-                + measureHeightWithVerticalMargins(mSearchAndRecommendationViewHolder.mSearchBar);
+                + measureHeightWithVerticalMargins(
+                (View) mSearchAndRecommendationViewHolder.mSearchBar);
     }
 
     /** private the height, in pixel, + the vertical margins of a given view. */
diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java b/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
index 9ab64247a7..12d3f11919 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
@@ -34,6 +34,7 @@ import com.android.launcher3.views.ActivityContext;
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 import com.android.launcher3.widget.model.WidgetsListContentEntry;
 import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
+import com.android.launcher3.widget.model.WidgetsListSearchHeaderEntry;
 
 /**
  * The widgets recycler view.
@@ -219,7 +220,8 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
         int totalItemsHeight = 0;
         for (int i = 0; i < untilIndex; i++) {
             WidgetsListBaseEntry entry = mAdapter.getItems().get(i);
-            if (entry instanceof WidgetsListHeaderEntry) {
+            if (entry instanceof WidgetsListHeaderEntry ||
+                    entry instanceof WidgetsListSearchHeaderEntry) {
                 totalItemsHeight += mEstimatedWidgetListHeaderHeight;
             } else if (entry instanceof WidgetsListContentEntry) {
                 totalItemsHeight += mLastVisibleWidgetContentTableHeight;
diff --git a/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java b/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java
new file mode 100644
index 0000000000..d68e87e3d6
--- /dev/null
+++ b/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.widget.picker.search;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.R;
+import com.android.launcher3.search.SearchAlgorithm;
+import com.android.launcher3.widget.model.WidgetsListBaseEntry;
+
+import java.util.List;
+
+/**
+ * View for a search bar with an edit text with a cancel button.
+ */
+public class LauncherWidgetsSearchBar extends LinearLayout implements WidgetsSearchBar {
+    private WidgetsSearchBarController mController;
+    private EditText mEditText;
+    private ImageButton mCancelButton;
+
+    public LauncherWidgetsSearchBar(Context context) {
+        this(context, null, 0);
+    }
+
+    public LauncherWidgetsSearchBar(@NonNull Context context,
+            @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public LauncherWidgetsSearchBar(@NonNull Context context, @Nullable AttributeSet attrs,
+            int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    public void initialize(List<WidgetsListBaseEntry> allWidgets,
+            SearchModeListener searchModeListener) {
+        SearchAlgorithm<WidgetsListBaseEntry> algo =
+                new SimpleWidgetsSearchAlgorithm(new SimpleWidgetsSearchPipeline(allWidgets));
+        mController = new WidgetsSearchBarController(
+                algo, mEditText, mCancelButton, searchModeListener);
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mEditText = findViewById(R.id.widgets_search_bar_edit_text);
+        mCancelButton = findViewById(R.id.widgets_search_cancel_button);
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        mController.onDestroy();
+    }
+}
diff --git a/src/com/android/launcher3/widget/picker/search/WidgetsSearchBar.java b/src/com/android/launcher3/widget/picker/search/WidgetsSearchBar.java
index d8e9733ce5..af6dc48aae 100644
--- a/src/com/android/launcher3/widget/picker/search/WidgetsSearchBar.java
+++ b/src/com/android/launcher3/widget/picker/search/WidgetsSearchBar.java
@@ -16,64 +16,21 @@
 
 package com.android.launcher3.widget.picker.search;
 
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.EditText;
-import android.widget.ImageButton;
-import android.widget.LinearLayout;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.R;
-import com.android.launcher3.search.SearchAlgorithm;
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 
 import java.util.List;
 
 /**
- * View for a search bar with an edit text with a cancel button.
+ * Interface for a widgets picker search bar.
  */
-public class WidgetsSearchBar extends LinearLayout {
-    private WidgetsSearchBarController mController;
-    private EditText mEditText;
-    private ImageButton mCancelButton;
-
-    public WidgetsSearchBar(Context context) {
-        this(context, null, 0);
-    }
-
-    public WidgetsSearchBar(@NonNull Context context,
-            @Nullable AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public WidgetsSearchBar(@NonNull Context context, @Nullable AttributeSet attrs,
-            int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
+public interface WidgetsSearchBar {
     /**
      * Attaches a controller to the search bar which interacts with {@code searchModeListener}.
      */
-    public void initialize(List<WidgetsListBaseEntry> allWidgets,
-            SearchModeListener searchModeListener) {
-        SearchAlgorithm<WidgetsListBaseEntry> algo =
-                new SimpleWidgetsSearchAlgorithm(new SimpleWidgetsSearchPipeline(allWidgets));
-        mController = new WidgetsSearchBarController(
-                algo, mEditText, mCancelButton, searchModeListener);
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        mEditText = findViewById(R.id.widgets_search_bar_edit_text);
-        mCancelButton = findViewById(R.id.widgets_search_cancel_button);
-    }
+    void initialize(List<WidgetsListBaseEntry> allWidgets, SearchModeListener searchModeListener);
 
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        mController.onDestroy();
-    }
+    /**
+     * Sets the vertical location, in pixels, of this search bar relative to its top position.
+     */
+    void setTranslationY(float translationY);
 }
-- 
GitLab


From c42e49f535177304aa1a5306a4fc7870660de5b2 Mon Sep 17 00:00:00 2001
From: Yogisha Dixit <ydixit@google.com>
Date: Mon, 1 Mar 2021 14:07:54 +0000
Subject: [PATCH 0679/1664] Use targetCell[Width|Height] as default widget
 size.

Test: Created a widget and manually tested the following scenarios
  - targetCell[Width|Height] not specified
  - targetCell[Width|Height] larger than maxResize[Width|Height]
  - targetCell[Width|Height] smaller than minResize[Width|Height]
  - targetCell[Width|Height] within max/min bounds
Bug: 179807199
Change-Id: I55a9dd2f94aa450ba6362301f7ac5ba4ee42f44d
---
 .../widget/LauncherAppWidgetProviderInfo.java | 49 +++++++++++++++----
 1 file changed, 39 insertions(+), 10 deletions(-)

diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java b/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
index ce97d2e294..8689fbfd3c 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
@@ -1,5 +1,7 @@
 package com.android.launcher3.widget;
 
+import static com.android.launcher3.Utilities.ATLEAST_S;
+
 import android.appwidget.AppWidgetHostView;
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.ComponentName;
@@ -33,6 +35,8 @@ public class LauncherAppWidgetProviderInfo extends AppWidgetProviderInfo
     public int spanY;
     public int minSpanX;
     public int minSpanY;
+    public int maxSpanX;
+    public int maxSpanY;
 
     public static LauncherAppWidgetProviderInfo fromProviderInfo(Context context,
             AppWidgetProviderInfo info) {
@@ -78,15 +82,40 @@ public class LauncherAppWidgetProviderInfo extends AppWidgetProviderInfo
                 || !idp.portraitProfile.shouldInsetWidgets()) {
             AppWidgetHostView.getDefaultPaddingForWidget(context, provider, widgetPadding);
         }
-        spanX = Math.max(1, (int) Math.ceil(
-                        (minWidth + widgetPadding.left + widgetPadding.right) / smallestCellWidth));
-        spanY = Math.max(1, (int) Math.ceil(
-                (minHeight + widgetPadding.top + widgetPadding.bottom) / smallestCellHeight));
-
-        minSpanX = Math.max(1, (int) Math.ceil(
-                (minResizeWidth + widgetPadding.left + widgetPadding.right) / smallestCellWidth));
-        minSpanY = Math.max(1, (int) Math.ceil(
-                (minResizeHeight + widgetPadding.top + widgetPadding.bottom) / smallestCellHeight));
+
+        minSpanX = getSpanX(widgetPadding, minResizeWidth, smallestCellWidth);
+        minSpanY = getSpanY(widgetPadding, minResizeHeight, smallestCellHeight);
+
+        // Use maxResizeWidth/Height if they are defined and we're on S or above.
+        maxSpanX =
+                (ATLEAST_S && maxResizeWidth > 0)
+                        ? getSpanX(widgetPadding, maxResizeWidth, smallestCellWidth)
+                        : idp.numColumns;
+        maxSpanY =
+                (ATLEAST_S && maxResizeHeight > 0)
+                        ? getSpanY(widgetPadding, maxResizeHeight, smallestCellHeight)
+                        : idp.numRows;
+
+        // Use targetCellWidth/Height if it is within the min/max ranges and we're on S or above.
+        // Otherwise, fall back to minWidth/Height.
+        if (ATLEAST_S && targetCellWidth >= minSpanX && targetCellWidth <= maxSpanX
+                && targetCellHeight >= minSpanY && targetCellHeight <= maxSpanY) {
+            spanX = targetCellWidth;
+            spanY = targetCellHeight;
+        } else {
+            spanX = getSpanX(widgetPadding, minWidth, smallestCellWidth);
+            spanY = getSpanY(widgetPadding, minHeight, smallestCellHeight);
+        }
+    }
+
+    private int getSpanX(Rect widgetPadding, int widgetWidth, float cellWidth) {
+        return Math.max(1, (int) Math.ceil(
+                (widgetWidth + widgetPadding.left + widgetPadding.right) / cellWidth));
+    }
+
+    private int getSpanY(Rect widgetPadding, int widgetHeight, float cellHeight) {
+        return Math.max(1, (int) Math.ceil(
+                (widgetHeight + widgetPadding.top + widgetPadding.bottom) / cellHeight));
     }
 
     public String getLabel(PackageManager packageManager) {
@@ -124,4 +153,4 @@ public class LauncherAppWidgetProviderInfo extends AppWidgetProviderInfo
     public Drawable getFullResIcon(IconCache cache) {
         return cache.getFullResIcon(provider.getPackageName(), icon);
     }
-}
+}
\ No newline at end of file
-- 
GitLab


From ecd12b32c9752662657ce4cab232f6e72782c4aa Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Thu, 11 Mar 2021 20:16:54 +0000
Subject: [PATCH 0680/1664] Show overview as grid in fallback recents

- Replace mShowAsGrid with state specific mOverviewGridEnabled and mCurrentGestureEndTarget
- Avoid showing invisible home task in grid
- Fix quick switch out of orientation in fallback recents
- Add a HOME state to switch to when starting home, to avoid showing grid overview briefly in quick switch
- Separate clear all button and overview actions handling
- Always maintain first task's fullscreen translation at 0 to avoid jumping when mOverviewFullscreenEnabled changes
- Moved fullscreenTranslation calculation to RecentsView
- Added GestureEndTarget -> BaseState translation to allow querying displayOverviewAsGrid for a displayOverviewTasksAsGrid

Bug: 174464863
Test: Launch overveiw from home, launch overveiw from app, launch into app, test for both small and large screens
Change-Id: Iee06d94d3067ea45cadd2051717223ddc0e6e70c
---
 .../BaseRecentsViewStateController.java       |   6 +-
 .../states/BackgroundAppState.java            |   3 +-
 .../uioverrides/states/OverviewState.java     |   6 +-
 .../android/quickstep/AbsSwipeUpHandler.java  |  26 +++--
 .../quickstep/BaseActivityInterface.java      |   5 +
 .../quickstep/FallbackActivityInterface.java  |  23 ++++
 .../quickstep/FallbackSwipeHandler.java       |   3 +-
 .../com/android/quickstep/GestureState.java   |   4 +-
 .../quickstep/LauncherActivityInterface.java  |  17 ++-
 .../quickstep/LauncherSwipeHandlerV2.java     |   3 +-
 .../FallbackRecentsStateController.java       |  10 +-
 .../fallback/FallbackRecentsView.java         |  10 +-
 .../quickstep/fallback/RecentsState.java      |  38 +++++-
 .../inputconsumers/OverviewInputConsumer.java |   3 +-
 .../quickstep/views/LauncherRecentsView.java  |   4 +-
 .../android/quickstep/views/RecentsView.java  | 110 ++++++++++++------
 .../com/android/quickstep/views/TaskView.java |  32 ++---
 src/com/android/launcher3/LauncherState.java  |   7 --
 .../launcher3/statemanager/BaseState.java     |   9 ++
 19 files changed, 222 insertions(+), 97 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
index bedaefa5d6..d65c59e067 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
@@ -76,8 +76,8 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView>
         SCRIM_PROGRESS.set(scrim, state.getOverviewScrimAlpha(mLauncher));
         SCRIM_MULTIPLIER.set(scrim, 1f);
         getTaskModalnessProperty().set(mRecentsView, state.getOverviewModalness());
-        RECENTS_GRID_PROGRESS.set(mRecentsView, state.displayOverviewTasksAsGrid(mLauncher)
-                ? 1f : 0f);
+        RECENTS_GRID_PROGRESS.set(mRecentsView,
+                state.displayOverviewTasksAsGrid(mLauncher.getDeviceProfile()) ? 1f : 0f);
     }
 
     @Override
@@ -128,7 +128,7 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView>
                 toState.getOverviewModalness(),
                 config.getInterpolator(ANIM_OVERVIEW_MODAL, LINEAR));
         setter.setFloat(mRecentsView, RECENTS_GRID_PROGRESS,
-                toState.displayOverviewTasksAsGrid(mLauncher) ? 1f : 0f, LINEAR);
+                toState.displayOverviewTasksAsGrid(mLauncher.getDeviceProfile()) ? 1f : 0f, LINEAR);
     }
 
     abstract FloatProperty getTaskModalnessProperty();
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
index 2ad718b63f..fb58bf6422 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
@@ -20,6 +20,7 @@ import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKG
 import android.content.Context;
 
 import com.android.launcher3.BaseDraggingActivity;
+import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.allapps.AllAppsTransitionController;
 import com.android.quickstep.util.LayoutUtils;
@@ -76,7 +77,7 @@ public class BackgroundAppState extends OverviewState {
     }
 
     @Override
-    public boolean displayOverviewTasksAsGrid(Launcher launcher) {
+    public boolean displayOverviewTasksAsGrid(DeviceProfile deviceProfile) {
         return false;
     }
 
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
index 372784a2c0..5a28cfdc0e 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -123,7 +123,7 @@ public class OverviewState extends LauncherState {
 
     @Override
     public int getVisibleElements(Launcher launcher) {
-        return displayOverviewTasksAsGrid(launcher) ? CLEAR_ALL_BUTTON
+        return displayOverviewTasksAsGrid(launcher.getDeviceProfile()) ? CLEAR_ALL_BUTTON
                 : CLEAR_ALL_BUTTON | OVERVIEW_ACTIONS;
     }
 
@@ -133,8 +133,8 @@ public class OverviewState extends LauncherState {
     }
 
     @Override
-    public boolean displayOverviewTasksAsGrid(Launcher launcher) {
-        return launcher.getDeviceProfile().isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get();
+    public boolean displayOverviewTasksAsGrid(DeviceProfile deviceProfile) {
+        return deviceProfile.isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get();
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 7df86b99c7..a2f15f5ff3 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -80,9 +80,9 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimationSuccessListener;
-import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.logging.StatsLogManager.StatsLogger;
+import com.android.launcher3.statemanager.BaseState;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.tracing.InputConsumerProto;
 import com.android.launcher3.tracing.SwipeHandlerProto;
@@ -124,14 +124,15 @@ import java.util.function.Consumer;
  * Handles the navigation gestures when Launcher is the default home activity.
  */
 @TargetApi(Build.VERSION_CODES.R)
-public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends RecentsView>
+public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
+        Q extends RecentsView, S extends BaseState<S>>
         extends SwipeUpAnimationLogic implements OnApplyWindowInsetsListener,
         RecentsAnimationCallbacks.RecentsAnimationListener {
     private static final String TAG = "AbsSwipeUpHandler";
 
     private static final String[] STATE_NAMES = DEBUG_STATES ? new String[17] : null;
 
-    protected final BaseActivityInterface<?, T> mActivityInterface;
+    protected final BaseActivityInterface<S, T> mActivityInterface;
     protected final InputConsumerProxy mInputConsumerProxy;
     protected final ActivityInitListener mActivityInitListener;
     // Callbacks to be made once the recents animation starts
@@ -934,9 +935,15 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                     duration = Math.min(MAX_SWIPE_DURATION, 2 * baseDuration);
             }
         }
-        Interpolator interpolator =
-                endTarget == RECENTS ? (mDp.isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get()
-                        ? ACCEL_DEACCEL : OVERSHOOT_1_2) : DEACCEL;
+        Interpolator interpolator;
+        S state = mActivityInterface.stateFromGestureEndTarget(endTarget);
+        if (state.displayOverviewTasksAsGrid(mActivity.getDeviceProfile())) {
+            interpolator = ACCEL_DEACCEL;
+        } else if (endTarget == RECENTS) {
+            interpolator = OVERSHOOT_1_2;
+        } else {
+            interpolator = DEACCEL;
+        }
 
         if (endTarget.isLauncher) {
             mInputConsumerProxy.enable();
@@ -1126,8 +1133,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
                 }
             });
             animatorSet.play(windowAnim);
-            if (mRecentsView != null && mDp.isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get()
-                    && mGestureState.getEndTarget() == RECENTS) {
+            S state = mActivityInterface.stateFromGestureEndTarget(mGestureState.getEndTarget());
+            if (mRecentsView != null && state.displayOverviewTasksAsGrid(
+                    mActivity.getDeviceProfile())) {
                 animatorSet.play(ObjectAnimator.ofFloat(mRecentsView, RECENTS_GRID_PROGRESS, 1));
                 animatorSet.play(mTaskViewSimulator.gridProgress.animateToValue(0, 1));
             }
@@ -1756,7 +1764,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
 
     public interface Factory {
 
-        AbsSwipeUpHandler<StatefulActivity<?>, RecentsView> newHandler(
+        AbsSwipeUpHandler newHandler(
                 GestureState gestureState, long touchTimeMs, boolean continuingLastGesture);
     }
 }
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index 7c1d9fadbb..5942b3aaf4 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -306,6 +306,11 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
     public void onSystemUiFlagsChanged(int systemUiStateFlags) {
     }
 
+    /**
+     * Returns the expected STATE_TYPE from the provided GestureEndTarget.
+     */
+    public abstract STATE_TYPE stateFromGestureEndTarget(GestureState.GestureEndTarget endTarget);
+
     public interface AnimationFactory {
 
         void createActivityInterface(long transitionLength);
diff --git a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
index db290d648f..bffe3a1498 100644
--- a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
@@ -18,6 +18,7 @@ package com.android.quickstep;
 import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
 import static com.android.quickstep.fallback.RecentsState.BACKGROUND_APP;
 import static com.android.quickstep.fallback.RecentsState.DEFAULT;
+import static com.android.quickstep.fallback.RecentsState.HOME;
 
 import android.content.Context;
 import android.graphics.Rect;
@@ -81,6 +82,7 @@ public final class FallbackActivityInterface extends
     @Override
     public AnimationFactory prepareRecentsUI(RecentsAnimationDeviceState deviceState,
             boolean activityVisible, Consumer<AnimatorControllerWithResistance> callback) {
+        notifyRecentsOfOrientation(deviceState.getRotationTouchHelper());
         DefaultAnimationFactory factory = new DefaultAnimationFactory(callback);
         factory.initUI();
         return factory;
@@ -154,4 +156,25 @@ public final class FallbackActivityInterface extends
         }
         activity.<RecentsView>getOverviewPanel().startHome();
     }
+
+    @Override
+    public RecentsState stateFromGestureEndTarget(GestureState.GestureEndTarget endTarget) {
+        switch (endTarget) {
+            case RECENTS:
+                return DEFAULT;
+            case NEW_TASK:
+            case LAST_TASK:
+                return BACKGROUND_APP;
+            case HOME:
+            default:
+                return HOME;
+        }
+    }
+
+    private void notifyRecentsOfOrientation(RotationTouchHelper rotationTouchHelper) {
+        // reset layout on swipe to home
+        RecentsView recentsView = getCreatedActivity().getOverviewPanel();
+        recentsView.setLayoutRotation(rotationTouchHelper.getCurrentActiveRotation(),
+                rotationTouchHelper.getDisplayRotation());
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
index a80c111d69..7e4a352d93 100644
--- a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
+++ b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
@@ -55,6 +55,7 @@ import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.anim.SpringAnimationBuilder;
 import com.android.quickstep.fallback.FallbackRecentsView;
+import com.android.quickstep.fallback.RecentsState;
 import com.android.quickstep.util.RectFSpringAnim;
 import com.android.quickstep.util.TransformParams;
 import com.android.quickstep.util.TransformParams.BuilderProxy;
@@ -73,7 +74,7 @@ import java.util.function.Consumer;
  */
 @TargetApi(Build.VERSION_CODES.R)
 public class FallbackSwipeHandler extends
-        AbsSwipeUpHandler<RecentsActivity, FallbackRecentsView> {
+        AbsSwipeUpHandler<RecentsActivity, FallbackRecentsView, RecentsState> {
 
     /**
      * Message used for receiving gesture nav contract information. We use a static messenger to
diff --git a/quickstep/src/com/android/quickstep/GestureState.java b/quickstep/src/com/android/quickstep/GestureState.java
index 8d67ee697a..ebdc1e6454 100644
--- a/quickstep/src/com/android/quickstep/GestureState.java
+++ b/quickstep/src/com/android/quickstep/GestureState.java
@@ -25,6 +25,7 @@ import android.app.ActivityManager;
 import android.content.Intent;
 import android.os.Build;
 
+import com.android.launcher3.statemanager.BaseState;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.tracing.GestureStateProto;
 import com.android.launcher3.tracing.SwipeHandlerProto;
@@ -213,7 +214,8 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL
     /**
      * @return the interface to the activity handing the UI updates for this gesture.
      */
-    public <T extends StatefulActivity<?>> BaseActivityInterface<?, T> getActivityInterface() {
+    public <S extends BaseState<S>,
+            T extends StatefulActivity<S>> BaseActivityInterface<S, T> getActivityInterface() {
         return mActivityInterface;
     }
 
diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
index 7efbfb8503..ca5765e469 100644
--- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
@@ -18,6 +18,7 @@ package com.android.quickstep;
 import static com.android.launcher3.LauncherState.BACKGROUND_APP;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
+import static com.android.launcher3.LauncherState.QUICK_SWITCH;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING;
 
@@ -270,7 +271,7 @@ public final class LauncherActivityInterface extends
         if (taskbarController == null) {
             return;
         }
-        LauncherState toState = endTarget == GestureEndTarget.RECENTS ? OVERVIEW : NORMAL;
+        LauncherState toState = stateFromGestureEndTarget(endTarget);
         taskbarController.createAnimToLauncher(toState, duration).start();
     }
 
@@ -301,4 +302,18 @@ public final class LauncherActivityInterface extends
         }
         return taskbarController.isDraggingItem();
     }
+
+    @Override
+    public LauncherState stateFromGestureEndTarget(GestureEndTarget endTarget) {
+        switch (endTarget) {
+            case RECENTS:
+                return OVERVIEW;
+            case NEW_TASK:
+            case LAST_TASK:
+                return QUICK_SWITCH;
+            case HOME:
+            default:
+                return NORMAL;
+        }
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
index 842fb84ff9..1ce420178f 100644
--- a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
+++ b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
@@ -27,6 +27,7 @@ import android.view.View;
 import androidx.annotation.NonNull;
 
 import com.android.launcher3.BaseQuickstepLauncher;
+import com.android.launcher3.LauncherState;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.views.FloatingIconView;
 import com.android.quickstep.util.RectFSpringAnim;
@@ -39,7 +40,7 @@ import com.android.systemui.shared.system.InputConsumerController;
  * Temporary class to allow easier refactoring
  */
 public class LauncherSwipeHandlerV2 extends
-        AbsSwipeUpHandler<BaseQuickstepLauncher, RecentsView> {
+        AbsSwipeUpHandler<BaseQuickstepLauncher, RecentsView, LauncherState> {
 
     public LauncherSwipeHandlerV2(Context context, RecentsAnimationDeviceState deviceState,
             TaskAnimationManager taskAnimationManager, GestureState gestureState, long touchTimeMs,
diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
index 24a761066a..54f6ce6dc6 100644
--- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
+++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
@@ -25,6 +25,7 @@ import static com.android.launcher3.states.StateAnimationConfig.PLAY_ATOMIC_OVER
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
 import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET;
 import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS;
+import static com.android.quickstep.views.RecentsView.RECENTS_GRID_PROGRESS;
 import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
 import static com.android.quickstep.views.RecentsView.TASK_MODALNESS;
 import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION;
@@ -77,11 +78,12 @@ public class FallbackRecentsStateController implements StateHandler<RecentsState
 
     private void setProperties(RecentsState state, StateAnimationConfig config,
             PropertySetter setter) {
-        float buttonAlpha = state.hasButtons() ? 1 : 0;
+        float clearAllButtonAlpha = state.hasClearAllButton() ? 1 : 0;
         setter.setFloat(mRecentsView.getClearAllButton(), ClearAllButton.VISIBILITY_ALPHA,
-                buttonAlpha, LINEAR);
+                clearAllButtonAlpha, LINEAR);
+        float overviewButtonAlpha =  state.hasOverviewActions(mActivity) ? 1 : 0;
         setter.setFloat(mActivity.getActionsView().getVisibilityAlpha(),
-                MultiValueAlpha.VALUE, buttonAlpha, LINEAR);
+                MultiValueAlpha.VALUE, overviewButtonAlpha, LINEAR);
 
         float[] scaleAndOffset = state.getOverviewScaleAndOffset(mActivity);
         setter.setFloat(mRecentsView, RECENTS_SCALE_PROPERTY, scaleAndOffset[0],
@@ -94,5 +96,7 @@ public class FallbackRecentsStateController implements StateHandler<RecentsState
         setter.setFloat(mRecentsView, TASK_MODALNESS, state.getOverviewModalness(),
                 config.getInterpolator(ANIM_OVERVIEW_MODAL, LINEAR));
         setter.setFloat(mRecentsView, FULLSCREEN_PROGRESS, state.isFullScreen() ? 1 : 0, LINEAR);
+        setter.setFloat(mRecentsView, RECENTS_GRID_PROGRESS,
+                state.displayOverviewTasksAsGrid(mActivity.getDeviceProfile()) ? 1f : 0f, LINEAR);
     }
 }
diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
index 02fd5bb3f7..e0750450fd 100644
--- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
+++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
@@ -66,6 +66,7 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity>
     @Override
     public void startHome() {
         mActivity.startHome();
+        mActivity.getStateManager().goToState(RecentsState.HOME);
     }
 
     /**
@@ -154,6 +155,11 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity>
         super.setRunningTaskHidden(isHidden);
     }
 
+    @Override
+    protected boolean isHomeTask(TaskView taskView) {
+        return mHomeTaskInfo != null && taskView.hasTaskId(mHomeTaskInfo.taskId);
+    }
+
     @Override
     public void setModalStateEnabled(boolean isModalState) {
         super.setModalStateEnabled(isModalState);
@@ -169,6 +175,8 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity>
     @Override
     public void onStateTransitionStart(RecentsState toState) {
         setOverviewStateEnabled(true);
+        setOverviewGridEnabled(toState.displayOverviewTasksAsGrid(mActivity.getDeviceProfile()));
+        setOverviewFullscreenEnabled(toState.isFullScreen());
         setFreezeViewVisibility(true);
     }
 
@@ -183,7 +191,7 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity>
         super.setOverviewStateEnabled(enabled);
         if (enabled) {
             RecentsState state = mActivity.getStateManager().getState();
-            setDisallowScrollToClearAll(!state.hasButtons());
+            setDisallowScrollToClearAll(!state.hasClearAllButton());
         }
     }
 }
diff --git a/quickstep/src/com/android/quickstep/fallback/RecentsState.java b/quickstep/src/com/android/quickstep/fallback/RecentsState.java
index f15a9de6f8..a9856d2dd8 100644
--- a/quickstep/src/com/android/quickstep/fallback/RecentsState.java
+++ b/quickstep/src/com/android/quickstep/fallback/RecentsState.java
@@ -20,6 +20,8 @@ import static com.android.launcher3.uioverrides.states.OverviewModalTaskState.ge
 
 import android.content.Context;
 
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.statemanager.BaseState;
 import com.android.quickstep.RecentsActivity;
 
@@ -29,14 +31,19 @@ import com.android.quickstep.RecentsActivity;
 public class RecentsState implements BaseState<RecentsState> {
 
     private static final int FLAG_MODAL = BaseState.getFlag(0);
-    private static final int FLAG_HAS_BUTTONS = BaseState.getFlag(1);
+    private static final int FLAG_CLEAR_ALL_BUTTON = BaseState.getFlag(1);
     private static final int FLAG_FULL_SCREEN = BaseState.getFlag(2);
+    private static final int FLAG_OVERVIEW_ACTIONS = BaseState.getFlag(3);
+    private static final int FLAG_SHOW_AS_GRID = BaseState.getFlag(4);
 
-    public static final RecentsState DEFAULT = new RecentsState(0, FLAG_HAS_BUTTONS);
+    public static final RecentsState DEFAULT = new RecentsState(0,
+            FLAG_CLEAR_ALL_BUTTON | FLAG_OVERVIEW_ACTIONS | FLAG_SHOW_AS_GRID);
     public static final RecentsState MODAL_TASK = new ModalState(1,
-            FLAG_DISABLE_RESTORE | FLAG_HAS_BUTTONS | FLAG_MODAL);
+            FLAG_DISABLE_RESTORE | FLAG_CLEAR_ALL_BUTTON | FLAG_OVERVIEW_ACTIONS | FLAG_MODAL
+                    | FLAG_SHOW_AS_GRID);
     public static final RecentsState BACKGROUND_APP = new BackgroundAppState(2,
             FLAG_DISABLE_RESTORE | FLAG_NON_INTERACTIVE | FLAG_FULL_SCREEN);
+    public static final RecentsState HOME = new RecentsState(3, 0);
 
     public final int ordinal;
     private final int mFlags;
@@ -82,14 +89,35 @@ public class RecentsState implements BaseState<RecentsState> {
         return hasFlag(FLAG_FULL_SCREEN);
     }
 
-    public boolean hasButtons() {
-        return hasFlag(FLAG_HAS_BUTTONS);
+    /**
+     * For this state, whether clear all button should be shown.
+     */
+    public boolean hasClearAllButton() {
+        return hasFlag(FLAG_CLEAR_ALL_BUTTON);
+    }
+
+    /**
+     * For this state, whether overview actions should be shown.
+     */
+    public boolean hasOverviewActions(RecentsActivity activity) {
+        return hasFlag(FLAG_OVERVIEW_ACTIONS) && !showAsGrid(activity.getDeviceProfile());
     }
 
     public float[] getOverviewScaleAndOffset(RecentsActivity activity) {
         return new float[] { NO_SCALE, NO_OFFSET };
     }
 
+    /**
+     * For this state, whether tasks should layout as a grid rather than a list.
+     */
+    public boolean displayOverviewTasksAsGrid(DeviceProfile deviceProfile) {
+        return hasFlag(FLAG_SHOW_AS_GRID) && showAsGrid(deviceProfile);
+    }
+
+    private boolean showAsGrid(DeviceProfile deviceProfile) {
+        return deviceProfile.isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get();
+    }
+
     private static class ModalState extends RecentsState {
 
         public ModalState(int id, int flags) {
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
index cee33639b3..fa9e0ec1ab 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
@@ -24,6 +24,7 @@ import android.view.MotionEvent;
 import androidx.annotation.Nullable;
 
 import com.android.launcher3.Utilities;
+import com.android.launcher3.statemanager.BaseState;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.TestProtocol;
@@ -38,7 +39,7 @@ import com.android.systemui.shared.system.InputMonitorCompat;
 /**
  * Input consumer for handling touch on the recents/Launcher activity.
  */
-public class OverviewInputConsumer<T extends StatefulActivity<?>>
+public class OverviewInputConsumer<S extends BaseState<S>, T extends StatefulActivity<S>>
         implements InputConsumer {
 
     private final T mActivity;
diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
index 9d31190eb6..da24b594b4 100644
--- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
@@ -150,6 +150,8 @@ public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher>
     @Override
     public void onStateTransitionStart(LauncherState toState) {
         setOverviewStateEnabled(toState.overviewUi);
+        setOverviewGridEnabled(toState.displayOverviewTasksAsGrid(mActivity.getDeviceProfile()));
+        setOverviewFullscreenEnabled(toState.getOverviewFullscreenProgress() == 1);
         setFreezeViewVisibility(true);
     }
 
@@ -160,8 +162,6 @@ public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher>
             reset();
         }
         setOverlayEnabled(finalState == OVERVIEW || finalState == OVERVIEW_MODAL_TASK);
-        setOverviewGridEnabled(finalState.displayOverviewTasksAsGrid(mActivity));
-        setOverviewFullscreenEnabled(finalState.getOverviewFullscreenProgress() == 1);
         setFreezeViewVisibility(false);
     }
 
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index f5b62d5828..8f35ea6e65 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -337,7 +337,9 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     private float mTaskViewsPrimaryTranslation = 0;
     // Progress from 0 to 1 where 0 is a carousel and 1 is a 2 row grid.
     private float mGridProgress = 0;
-    private boolean mShowAsGrid;
+
+    // The GestureEndTarget that is still in progress.
+    private GestureState.GestureEndTarget mCurrentGestureEndTarget;
 
     /**
      * TODO: Call reloadIdNeeded in onTaskStackChanged.
@@ -554,11 +556,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mLiveTileTaskViewSimulator.recentsViewScale.value = 1;
         mLiveTileTaskViewSimulator.setOrientationState(mOrientationState);
         mLiveTileTaskViewSimulator.setDrawsBelowRecents(true);
-
-        mShowAsGrid =
-                mActivity.getDeviceProfile().isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get();
-        mActivity.addOnDeviceProfileChangeListener(newDp ->
-                mShowAsGrid = newDp.isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get());
     }
 
     public OverScroller getScroller() {
@@ -731,7 +728,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     }
 
     public boolean isTaskViewVisible(TaskView tv) {
-        if (mShowAsGrid) {
+        if (showAsGrid()) {
             int screenStart = mOrientationHandler.getPrimaryScroll(this);
             int screenEnd = screenStart + mOrientationHandler.getMeasuredSize(this);
             return isTaskViewWithinBounds(tv, screenStart, screenEnd);
@@ -743,9 +740,9 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
 
     private boolean isTaskViewWithinBounds(TaskView tv, int start, int end) {
         int taskStart = mOrientationHandler.getChildStart(tv) + (int) tv.getOffsetAdjustment(
-                mOverviewFullscreenEnabled, mOverviewGridEnabled);
+                mOverviewFullscreenEnabled, showAsGrid());
         int taskSize = (int) (mOrientationHandler.getMeasuredSize(tv) * tv.getSizeAdjustment(
-                mOverviewFullscreenEnabled, mOverviewGridEnabled));
+                mOverviewFullscreenEnabled, showAsGrid()));
         int taskEnd = taskStart + taskSize;
         return (taskStart >= start && taskStart <= end) || (taskEnd >= start
                 && taskEnd <= end);
@@ -813,7 +810,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     public boolean onTouchEvent(MotionEvent ev) {
         super.onTouchEvent(ev);
 
-        if (mShowAsGrid) {
+        if (showAsGrid()) {
             int taskCount = getTaskViewCount();
             for (int i = 0; i < taskCount; i++) {
                 TaskView taskView = getTaskViewAt(i);
@@ -880,7 +877,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
 
     @Override
     protected boolean snapToPageInFreeScroll() {
-        return !mShowAsGrid;
+        return !showAsGrid();
     }
 
     @Override
@@ -1091,14 +1088,35 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
      * Updates TaskView scaling and translation required to support variable width.
      */
     private void updateTaskSize() {
-        float accumulatedTranslationX = 0;
         final int taskCount = getTaskViewCount();
+        float accumulatedTranslationX = 0;
+        float[] fullscreenTranslations = new float[taskCount];
+        int firstNonHomeTaskIndex = 0;
         for (int i = 0; i < taskCount; i++) {
             TaskView taskView = getTaskViewAt(i);
+            if (isHomeTask(taskView)) {
+                if (firstNonHomeTaskIndex == i) {
+                    firstNonHomeTaskIndex++;
+                }
+                continue;
+            }
+
             taskView.updateTaskSize();
-            taskView.setAccumulatedFullscreenTranslationX(accumulatedTranslationX);
-            accumulatedTranslationX += taskView.getFullscreenTranslationX();
+            fullscreenTranslations[i] += accumulatedTranslationX;
+            float widthDiff =
+                    taskView.getLayoutParams().width * (1 - taskView.getFullscreenScale());
+            float fullscreenTranslationX = mIsRtl ? widthDiff : -widthDiff;
+            fullscreenTranslations[i] += fullscreenTranslationX;
+            accumulatedTranslationX += fullscreenTranslationX;
+        }
+
+        // We need to maintain first non-home task's full screen translation at 0, now shift
+        // translation of all the TaskViews to achieve that.
+        for (int i = firstNonHomeTaskIndex; i < taskCount; i++) {
+            getTaskViewAt(i).setFullscreenTranslationX(
+                    fullscreenTranslations[i] - fullscreenTranslations[firstNonHomeTaskIndex]);
         }
+
         updateGridProperties();
     }
 
@@ -1204,7 +1222,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         int upper = 0;
         int visibleStart = 0;
         int visibleEnd = 0;
-        if (mShowAsGrid) {
+        if (showAsGrid()) {
             int screenStart = mOrientationHandler.getPrimaryScroll(this);
             int pageOrientedSize = mOrientationHandler.getMeasuredSize(this);
             int halfScreenSize = pageOrientedSize / 2;
@@ -1224,7 +1242,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             Task task = taskView.getTask();
             int index = indexOfChild(taskView);
             boolean visible;
-            if (mShowAsGrid) {
+            if (showAsGrid()) {
                 visible = isTaskViewWithinBounds(taskView, visibleStart, visibleEnd);
             } else {
                 visible = lower <= index && index <= upper;
@@ -1404,7 +1422,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
      * Called when a gesture from an app has finished, and an end target has been determined.
      */
     public void onGestureEndTargetCalculated(GestureState.GestureEndTarget endTarget) {
-
+        mCurrentGestureEndTarget = endTarget;
     }
 
     /**
@@ -1425,9 +1443,11 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         animateUpRunningTaskIconScale();
 
         // TODO: This should be tied to whether there is a focus app on overview.
-        if (!mShowAsGrid) {
+        if (!showAsGrid()) {
             animateActionsViewIn();
         }
+
+        mCurrentGestureEndTarget = null;
     }
 
     /**
@@ -1601,11 +1621,19 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         float topAccumulatedTranslationX = 0;
         float bottomAccumulatedTranslationX = 0;
         IntSet topSet = new IntSet();
+        IntSet bottomSet = new IntSet();
         float[] gridTranslations = new float[taskCount];
+        int firstNonHomeTaskIndex = 0;
         for (int i = 0; i < taskCount; i++) {
             TaskView taskView = getTaskViewAt(i);
+            if (isHomeTask(taskView)) {
+                if (firstNonHomeTaskIndex == i) {
+                    firstNonHomeTaskIndex++;
+                }
+                continue;
+            }
+
             taskView.setGridScale(gridScale);
-            gridTranslations[i] = 0;
 
             float scaledWidth = taskView.getLayoutParams().width * gridScale;
             float taskGridHorizontalDiff;
@@ -1639,7 +1667,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
 
                 // Move horizontally into empty space.
                 float widthOffset = 0;
-                for (int j = i - 1; !topSet.contains(j) && j >= 0; j--) {
+                for (int j = i - 1; bottomSet.contains(j); j--) {
                     widthOffset += getTaskViewAt(j).getLayoutParams().width * gridScale
                             + mPageSpacing;
                 }
@@ -1650,6 +1678,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             } else {
                 gridTranslations[i] += bottomAccumulatedTranslationX;
                 bottomRowWidth += taskView.getLayoutParams().width * gridScale + mPageSpacing;
+                bottomSet.add(i);
 
                 // Move into bottom row.
                 float heightOffset = (boxLength + mTaskTopMargin) * gridScale + mRowSpacing;
@@ -1704,31 +1733,33 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                 clearAllAccumulatedTranslation + clearAllShorterRowCompensation
                         + clearAllShortTotalCompensation;
 
-        // We need to maintain first task's grid translation at 0, now shift translation of all
-        // the TaskViews to achieve that.
-        for (int i = 0; i < taskCount; i++) {
-            getTaskViewAt(i).setGridTranslationX(gridTranslations[i] - gridTranslations[0]);
+        // We need to maintain first non-home task's grid translation at 0, now shift translation
+        // of all the TaskViews to achieve that.
+        for (int i = firstNonHomeTaskIndex; i < taskCount; i++) {
+            getTaskViewAt(i).setGridTranslationX(
+                    gridTranslations[i] - gridTranslations[firstNonHomeTaskIndex]);
         }
-        mClearAllButton.setGridTranslationPrimary(clearAllTotalTranslationX - gridTranslations[0]);
+        mClearAllButton.setGridTranslationPrimary(
+                clearAllTotalTranslationX - gridTranslations[firstNonHomeTaskIndex]);
 
         setGridProgress(mGridProgress);
     }
 
+    protected boolean isHomeTask(TaskView taskView) {
+        return false;
+    }
+
     /**
      * Moves TaskView and ClearAllButton between carousel and 2 row grid.
      *
      * @param gridProgress 0 = carousel; 1 = 2 row grid.
      */
-    public void setGridProgress(float gridProgress) {
+    private void setGridProgress(float gridProgress) {
         int taskCount = getTaskViewCount();
         if (taskCount == 0) {
             return;
         }
 
-        if (!mShowAsGrid) {
-            gridProgress = 0;
-        }
-
         mGridProgress = gridProgress;
 
         for (int i = 0; i < taskCount; i++) {
@@ -1872,7 +1903,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                 if (animateTaskView) {
                     addDismissedTaskAnimations(taskView, duration, anim);
                 }
-            } else if (!mShowAsGrid) {  // Don't animate other tasks when dismissing in grid for now
+            } else if (!showAsGrid()) {
+                // For grid layout, don't animate other tasks when dismissing in grid for now.
                 // If we just take newScroll - oldScroll, everything to the right of dragged task
                 // translates to the left. We need to offset this in some cases:
                 // - In RTL, add page offset to all pages, since we want pages to move to the right
@@ -2865,9 +2897,9 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             float scrollDiff = 0;
             if (child instanceof TaskView) {
                 scrollDiff = ((TaskView) child).getScrollAdjustment(mOverviewFullscreenEnabled,
-                        mOverviewGridEnabled);
+                        showAsGrid());
             } else if (child instanceof ClearAllButton) {
-                scrollDiff = ((ClearAllButton) child).getScrollAdjustment(mOverviewGridEnabled);
+                scrollDiff = ((ClearAllButton) child).getScrollAdjustment(showAsGrid());
             }
 
             if (scrollDiff != 0) {
@@ -2884,9 +2916,9 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         View child = getChildAt(index);
         if (child instanceof TaskView) {
             childOffset += ((TaskView) child).getOffsetAdjustment(mOverviewFullscreenEnabled,
-                    mOverviewGridEnabled);
+                    showAsGrid());
         } else if (child instanceof ClearAllButton) {
-            childOffset += ((ClearAllButton) child).getOffsetAdjustment(mOverviewGridEnabled);
+            childOffset += ((ClearAllButton) child).getOffsetAdjustment(showAsGrid());
         }
         return childOffset;
     }
@@ -2898,7 +2930,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             return super.getChildVisibleSize(index);
         }
         return (int) (super.getChildVisibleSize(index) * taskView.getSizeAdjustment(
-                mOverviewFullscreenEnabled, mOverviewGridEnabled));
+                mOverviewFullscreenEnabled, showAsGrid()));
     }
 
     @Override
@@ -3109,6 +3141,12 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         return mSizeStrategy;
     }
 
+    private boolean showAsGrid() {
+        return mOverviewGridEnabled || (mCurrentGestureEndTarget != null
+                && mSizeStrategy.stateFromGestureEndTarget(
+                mCurrentGestureEndTarget).displayOverviewTasksAsGrid(mActivity.getDeviceProfile()));
+    }
+
     /**
      * Used to register callbacks for when our empty message state changes.
      *
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index cd8ea7675f..809adcbe21 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -27,8 +27,8 @@ import static android.view.Surface.ROTATION_270;
 import static android.view.Surface.ROTATION_90;
 import static android.widget.Toast.LENGTH_SHORT;
 
-import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DURATION;
 import static com.android.launcher3.LauncherState.OVERVIEW_SPLIT_SELECT;
+import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DURATION;
 import static com.android.launcher3.Utilities.comp;
 import static com.android.launcher3.Utilities.getDescendantCoordRelativeToAncestor;
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
@@ -275,7 +275,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     private float mTaskResistanceTranslationY;
     // The following translation variables should only be used in the same orientation as Launcher.
     private float mFullscreenTranslationX;
-    private float mAccumulatedFullscreenTranslationX;
     private float mBoxTranslationY;
     // The following grid translations scales with mGridProgress.
     private float mGridTranslationX;
@@ -750,9 +749,8 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
 
     @Override
     public void onRecycle() {
-        mFullscreenTranslationX = mAccumulatedFullscreenTranslationX = mGridTranslationX =
-                mGridTranslationY =
-                        mGridOffsetTranslationX = mBoxTranslationY = mNonRtlVisibleOffset = 0f;
+        mFullscreenTranslationX = mGridTranslationX = mGridTranslationY =
+                mGridOffsetTranslationX = mBoxTranslationY = mNonRtlVisibleOffset = 0f;
         resetViewTransforms();
         // Clear any references to the thumbnail (it will be re-read either from the cache or the
         // system on next bind)
@@ -864,6 +862,10 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         applyScale();
     }
 
+    public float getFullscreenScale() {
+        return mFullscreenScale;
+    }
+
     public void setGridScale(float gridScale) {
         mGridScale = gridScale;
         applyScale();
@@ -921,20 +923,11 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         applyTranslationY();
     }
 
-    private void setFullscreenTranslationX(float fullscreenTranslationX) {
+    public void setFullscreenTranslationX(float fullscreenTranslationX) {
         mFullscreenTranslationX = fullscreenTranslationX;
         applyTranslationX();
     }
 
-    public float getFullscreenTranslationX() {
-        return mFullscreenTranslationX;
-    }
-
-    public void setAccumulatedFullscreenTranslationX(float accumulatedFullscreenTranslationX) {
-        mAccumulatedFullscreenTranslationX = accumulatedFullscreenTranslationX;
-        applyTranslationX();
-    }
-
     public void setGridTranslationX(float gridTranslationX) {
         mGridTranslationX = gridTranslationX;
         applyTranslationX();
@@ -965,7 +958,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     public float getScrollAdjustment(boolean fullscreenEnabled, boolean gridEnabled) {
         float scrollAdjustment = 0;
         if (fullscreenEnabled) {
-            scrollAdjustment += mFullscreenTranslationX + mAccumulatedFullscreenTranslationX;
+            scrollAdjustment += mFullscreenTranslationX;
         }
         if (gridEnabled) {
             scrollAdjustment += mGridTranslationX;
@@ -999,7 +992,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
 
     private void applyTranslationX() {
         setTranslationX(mDismissTranslationX + mTaskOffsetTranslationX + mTaskResistanceTranslationX
-                + getFullscreenTrans(mFullscreenTranslationX + mAccumulatedFullscreenTranslationX)
+                + getFullscreenTrans(mFullscreenTranslationX)
                 + getGridTrans(mGridTranslationX + mGridOffsetTranslationX));
     }
 
@@ -1243,10 +1236,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
             }
             setFullscreenScale(fullscreenScale);
 
-            float widthDiff = params.width * (1 - mFullscreenScale);
-            setFullscreenTranslationX(
-                    getLayoutDirection() == LAYOUT_DIRECTION_RTL ? -widthDiff : widthDiff);
-
             if (params.width != expectedWidth || params.height != expectedHeight) {
                 params.width = expectedWidth;
                 params.height = expectedHeight;
@@ -1254,7 +1243,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
             }
         } else {
             setBoxTranslationY(0);
-            setFullscreenTranslationX(0);
             setFullscreenScale(1);
             if (params.width != ViewGroup.LayoutParams.MATCH_PARENT) {
                 params.width = ViewGroup.LayoutParams.MATCH_PARENT;
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java
index aa97450a2b..ae75b51799 100644
--- a/src/com/android/launcher3/LauncherState.java
+++ b/src/com/android/launcher3/LauncherState.java
@@ -237,13 +237,6 @@ public abstract class LauncherState implements BaseState<LauncherState> {
         return 0;
     }
 
-    /**
-     * For this state, whether tasks should layout as a grid rather than a list.
-     */
-    public boolean displayOverviewTasksAsGrid(Launcher launcher) {
-        return false;
-    }
-
     /**
      * For this state, how much additional vertical translation there should be for each of the
      * child TaskViews.
diff --git a/src/com/android/launcher3/statemanager/BaseState.java b/src/com/android/launcher3/statemanager/BaseState.java
index daec1d8508..122573cfa1 100644
--- a/src/com/android/launcher3/statemanager/BaseState.java
+++ b/src/com/android/launcher3/statemanager/BaseState.java
@@ -17,6 +17,8 @@ package com.android.launcher3.statemanager;
 
 import android.content.Context;
 
+import com.android.launcher3.DeviceProfile;
+
 /**
  * Interface representing a state of a StatefulActivity
  */
@@ -52,4 +54,11 @@ public interface BaseState<T extends BaseState> {
      * Returns if the state has the provided flag
      */
     boolean hasFlag(int flagMask);
+
+    /**
+     * For this state, whether tasks should layout as a grid rather than a list.
+     */
+    default boolean displayOverviewTasksAsGrid(DeviceProfile deviceProfile) {
+        return false;
+    }
 }
-- 
GitLab


From e5695f919656598f55b4d8817b92e1b559554559 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 16 Mar 2021 11:11:46 -0700
Subject: [PATCH 0681/1664] Hide taskbar when certain floating views are open

Test: Open widgets, ensure taskbar hides
Bug: 171917176
Change-Id: Ib78182fe0ca1ea5ffbd28ab42f49ab8f0e535a18
---
 .../android/launcher3/taskbar/TaskbarController.java |  8 ++++++--
 .../taskbar/TaskbarVisibilityController.java         | 12 +++++++++++-
 src/com/android/launcher3/AbstractFloatingView.java  |  4 ++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index 744339b5c4..3ae85819f1 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -19,7 +19,7 @@ import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
 import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
 
-import static com.android.launcher3.AbstractFloatingView.TYPE_ALL;
+import static com.android.launcher3.AbstractFloatingView.TYPE_HIDE_TASKBAR;
 import static com.android.launcher3.AbstractFloatingView.TYPE_REPLACE_TASKBAR_WITH_HOTSEAT;
 import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
@@ -486,11 +486,15 @@ public class TaskbarController {
 
     private void replaceTaskbarWithHotseatOrViceVersa() {
         boolean replaceTaskbarWithHotseat = AbstractFloatingView.getTopOpenViewWithType(mLauncher,
-                TYPE_ALL & TYPE_REPLACE_TASKBAR_WITH_HOTSEAT) != null;
+                TYPE_REPLACE_TASKBAR_WITH_HOTSEAT) != null;
         if (!mLauncher.hasBeenResumed()) {
             replaceTaskbarWithHotseat = false;
         }
         setReplaceTaskbarWithHotseat(replaceTaskbarWithHotseat);
+
+        boolean hideTaskbar = AbstractFloatingView.getTopOpenViewWithType(mLauncher,
+                TYPE_HIDE_TASKBAR) != null;
+        mTaskbarVisibilityController.animateToVisibilityForFloatingView(hideTaskbar ? 0f : 1f);
     }
 
     private void setReplaceTaskbarWithHotseat(boolean replaceTaskbarWithHotseat) {
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarVisibilityController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarVisibilityController.java
index 715e4ca4c6..2228ebae8f 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarVisibilityController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarVisibilityController.java
@@ -31,6 +31,7 @@ import com.android.systemui.shared.system.QuickStepContract;
 public class TaskbarVisibilityController {
 
     private static final long IME_VISIBILITY_ALPHA_DURATION = 120;
+    private static final long FLOATING_VIEW_VISIBILITY_ALPHA_DURATION = 120;
 
     private final BaseQuickstepLauncher mLauncher;
     private final TaskbarController.TaskbarVisibilityControllerCallbacks mTaskbarCallbacks;
@@ -44,6 +45,8 @@ public class TaskbarVisibilityController {
             this::updateVisibilityAlpha);
     private AnimatedFloat mTaskbarVisibilityAlphaForIme = new AnimatedFloat(
             this::updateVisibilityAlpha);
+    private AnimatedFloat mTaskbarVisibilityAlphaForFloatingView = new AnimatedFloat(
+            this::updateVisibilityAlpha);
 
     public TaskbarVisibilityController(BaseQuickstepLauncher launcher,
             TaskbarController.TaskbarVisibilityControllerCallbacks taskbarCallbacks) {
@@ -59,6 +62,7 @@ public class TaskbarVisibilityController {
         boolean isImeVisible = (SystemUiProxy.INSTANCE.get(mLauncher).getLastSystemUiStateFlags()
                 & QuickStepContract.SYSUI_STATE_IME_SHOWING) != 0;
         mTaskbarVisibilityAlphaForIme.updateValue(isImeVisible ? 0f : 1f);
+        mTaskbarVisibilityAlphaForFloatingView.updateValue(1f);
 
         onTaskbarBackgroundAlphaChanged();
         updateVisibilityAlpha();
@@ -82,6 +86,11 @@ public class TaskbarVisibilityController {
                 .setDuration(IME_VISIBILITY_ALPHA_DURATION).start();
     }
 
+    protected void animateToVisibilityForFloatingView(float toAlpha) {
+        mTaskbarVisibilityAlphaForIme.animateToValue(mTaskbarVisibilityAlphaForFloatingView.value,
+                toAlpha).setDuration(FLOATING_VIEW_VISIBILITY_ALPHA_DURATION).start();
+    }
+
     private void onTaskbarBackgroundAlphaChanged() {
         mTaskbarCallbacks.updateTaskbarBackgroundAlpha(mTaskbarBackgroundAlpha.value);
         updateVisibilityAlpha();
@@ -93,7 +102,8 @@ public class TaskbarVisibilityController {
         // LauncherState if Launcher is paused.
         float alphaDueToLauncher = Math.max(mTaskbarBackgroundAlpha.value,
                 mTaskbarVisibilityAlphaForLauncherState.value);
-        float alphaDueToOther = mTaskbarVisibilityAlphaForIme.value;
+        float alphaDueToOther = mTaskbarVisibilityAlphaForIme.value
+                * mTaskbarVisibilityAlphaForFloatingView.value;
         float taskbarAlpha = alphaDueToLauncher * alphaDueToOther;
         mTaskbarCallbacks.updateTaskbarVisibilityAlpha(taskbarAlpha);
 
diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java
index e263c7af55..d894bb4b82 100644
--- a/src/com/android/launcher3/AbstractFloatingView.java
+++ b/src/com/android/launcher3/AbstractFloatingView.java
@@ -101,6 +101,10 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
     // When these types of floating views are open, hide the taskbar hotseat and show the real one.
     public static final int TYPE_REPLACE_TASKBAR_WITH_HOTSEAT = TYPE_FOLDER | TYPE_ACTION_POPUP;
 
+    // Hide the taskbar when these types of floating views are open.
+    public static final int TYPE_HIDE_TASKBAR = TYPE_WIDGETS_BOTTOM_SHEET | TYPE_WIDGETS_FULL_SHEET
+            | TYPE_ON_BOARD_POPUP;
+
     public static final int TYPE_ACCESSIBLE = TYPE_ALL & ~TYPE_DISCOVERY_BOUNCE & ~TYPE_LISTENER
             & ~TYPE_ALL_APPS_EDU;
 
-- 
GitLab


From 1a4670eeffc165c823a7bbc0a772b086a111888d Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Tue, 16 Mar 2021 19:30:04 +0000
Subject: [PATCH 0682/1664] Only clear widgets list upon all widgets &
 shortcuts update

Test: Install BBC News. Then, quickly go to all widgets tray.
      BBC News widgets is added to the all widgets tray without
      removing other widgets.

Bug: 182897740
Change-Id: I17b50f5128e24c346354b8fb7817a318a94efb62
---
 .../com/android/launcher3/model/WidgetsModel.java    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
index 3ea47660b0..f82f2cc47a 100644
--- a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
+++ b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
@@ -132,7 +132,7 @@ public class WidgetsModel {
                 widgetsAndShortcuts.add(new WidgetItem(info, app.getIconCache(), pm));
                 updatedItems.add(info);
             }
-            setWidgetsAndShortcuts(widgetsAndShortcuts, app);
+            setWidgetsAndShortcuts(widgetsAndShortcuts, app, packageUser);
         } catch (Exception e) {
             if (!FeatureFlags.IS_STUDIO_BUILD && Utilities.isBinderSizeError(e)) {
                 // the returned value may be incomplete and will not be refreshed until the next
@@ -149,7 +149,7 @@ public class WidgetsModel {
     }
 
     private synchronized void setWidgetsAndShortcuts(ArrayList<WidgetItem> rawWidgetsShortcuts,
-            LauncherAppState app) {
+            LauncherAppState app, @Nullable PackageUserKey packageUser) {
         if (DEBUG) {
             Log.d(TAG, "addWidgetsAndShortcuts, widgetsShortcuts#=" + rawWidgetsShortcuts.size());
         }
@@ -158,8 +158,12 @@ public class WidgetsModel {
         // {@link mPackageItemInfos} to locate the key to be used for {@link #mWidgetsList}
         HashMap<PackageUserKey, PackageItemInfo> tmpPackageItemInfos = new HashMap<>();
 
-        // clear the lists.
-        mWidgetsList.clear();
+        // Clear the lists only if this is an update on all widgets and shortcuts. If packageUser
+        // isn't null, only updates the shortcuts and widgets for the app represented in
+        // packageUser.
+        if (packageUser == null) {
+            mWidgetsList.clear();
+        }
         // add and update.
         mWidgetsList.putAll(rawWidgetsShortcuts.stream()
                 .filter(new WidgetValidityCheck(app))
-- 
GitLab


From 45c16f7392054c90e97e830dd72ce5dc2275f8cf Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Tue, 16 Mar 2021 12:26:30 -0500
Subject: [PATCH 0683/1664] [Hotseat] Fix badging for shortcut predictions in
 hotseat

This change also sends shortcutInfo corresponding to AppTargetEvent

Screenshot: https://screenshot.googleplex.com/7nN7mNEuMCLkKbY
Bug: 159500320
Test: Manual
Change-Id: I9c31d7208510c5362039868ae41d098c9eb1e2dd
---
 .../launcher3/model/AppEventProducer.java        | 16 ++++++++++++++++
 .../launcher3/uioverrides/PredictedAppIcon.java  | 11 ++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/model/AppEventProducer.java b/quickstep/src/com/android/launcher3/model/AppEventProducer.java
index 9944270c95..eed493d4cf 100644
--- a/quickstep/src/com/android/launcher3/model/AppEventProducer.java
+++ b/quickstep/src/com/android/launcher3/model/AppEventProducer.java
@@ -42,6 +42,7 @@ import android.app.prediction.AppTargetEvent;
 import android.app.prediction.AppTargetId;
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.pm.ShortcutInfo;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Message;
@@ -62,9 +63,11 @@ import com.android.launcher3.logger.LauncherAtom.WorkspaceContainer;
 import com.android.launcher3.logging.StatsLogManager.EventEnum;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.pm.UserCache;
+import com.android.launcher3.shortcuts.ShortcutRequest;
 import com.android.quickstep.logging.StatsLogCompatManager.StatsLogConsumer;
 
 import java.util.Locale;
+import java.util.Optional;
 import java.util.function.ObjIntConsumer;
 import java.util.function.Predicate;
 
@@ -174,6 +177,7 @@ public class AppEventProducer implements StatsLogConsumer {
             return null;
         }
         ComponentName cn = null;
+        ShortcutInfo shortcutInfo = null;
         String id = null;
 
         switch (info.getItemCase()) {
@@ -188,6 +192,14 @@ public class AppEventProducer implements StatsLogConsumer {
                 LauncherAtom.Shortcut si = info.getShortcut();
                 if (!TextUtils.isEmpty(si.getShortcutId())
                         && (cn = parseNullable(si.getShortcutName())) != null) {
+                    Optional<ShortcutInfo> opt = new ShortcutRequest(mContext,
+                            userHandle).forPackage(cn.getPackageName(), si.getShortcutId()).query(
+                            ShortcutRequest.ALL).stream().findFirst();
+                    if (opt.isPresent()) {
+                        shortcutInfo = opt.get();
+                    } else {
+                        return null;
+                    }
                     id = "shortcut:" + si.getShortcutId();
                 }
                 break;
@@ -210,6 +222,9 @@ public class AppEventProducer implements StatsLogConsumer {
                 return createTempFolderTarget();
         }
         if (id != null && cn != null) {
+            if (shortcutInfo != null) {
+                return new AppTarget.Builder(new AppTargetId(id), shortcutInfo).build();
+            }
             return new AppTarget.Builder(new AppTargetId(id), cn.getPackageName(), userHandle)
                     .setClassName(cn.getClassName())
                     .build();
@@ -217,6 +232,7 @@ public class AppEventProducer implements StatsLogConsumer {
         return null;
     }
 
+
     private AppTarget createTempFolderTarget() {
         return new AppTarget.Builder(new AppTargetId("folder:" + SystemClock.uptimeMillis()),
                 mContext.getPackageName(), Process.myUserHandle())
diff --git a/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
index d330a68adb..b4aa596760 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
@@ -34,11 +34,11 @@ import androidx.core.graphics.ColorUtils;
 import com.android.launcher3.CellLayout;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.R;
 import com.android.launcher3.graphics.IconPalette;
 import com.android.launcher3.icons.IconNormalizer;
 import com.android.launcher3.icons.LauncherIcons;
-import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.touch.ItemClickHandler;
 import com.android.launcher3.touch.ItemLongClickListener;
@@ -85,8 +85,13 @@ public class PredictedAppIcon extends DoubleShadowBubbleTextView {
     public void onDraw(Canvas canvas) {
         int count = canvas.save();
         if (!mIsPinned) {
-            boolean isBadged = getTag() instanceof WorkspaceItemInfo
-                    && !Process.myUserHandle().equals(((ItemInfo) getTag()).user);
+            boolean isBadged = false;
+            if (getTag() instanceof WorkspaceItemInfo) {
+                WorkspaceItemInfo info = (WorkspaceItemInfo) getTag();
+                isBadged = !Process.myUserHandle().equals(info.user)
+                        || info.itemType == LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT
+                        || info.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT;
+            }
             drawEffect(canvas, isBadged);
             canvas.translate(getWidth() * RING_EFFECT_RATIO, getHeight() * RING_EFFECT_RATIO);
             canvas.scale(1 - 2 * RING_EFFECT_RATIO, 1 - 2 * RING_EFFECT_RATIO);
-- 
GitLab


From f9954cc4cc115db16302208cf23e5dda4d329cac Mon Sep 17 00:00:00 2001
From: Yogisha Dixit <ydixit@google.com>
Date: Tue, 16 Mar 2021 14:56:42 +0000
Subject: [PATCH 0684/1664] Fix bug with resize frame disappearing.

Currently, if you resize the widget to the top, bottom or right, the
resize frame disappears. This is because the AppWidgetResizeFrame code
relies on the indices of the child elements to find the drag handles.

I updated the code to instead use IDs since that is more robust.

Test: manual
Bug: 182305670
Change-Id: Iaa9d32c9190fb579101914f03d57bb48dcecb88d
---
 res/layout/app_widget_resize_frame.xml              | 4 ++++
 src/com/android/launcher3/AppWidgetResizeFrame.java | 9 ++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/res/layout/app_widget_resize_frame.xml b/res/layout/app_widget_resize_frame.xml
index dfce94669c..2e476df6c9 100644
--- a/res/layout/app_widget_resize_frame.xml
+++ b/res/layout/app_widget_resize_frame.xml
@@ -34,6 +34,7 @@
 
         <!-- Left -->
         <ImageView
+            android:id="@+id/widget_resize_left_handle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="left|center_vertical"
@@ -43,6 +44,7 @@
 
         <!-- Top -->
         <ImageView
+            android:id="@+id/widget_resize_top_handle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="top|center_horizontal"
@@ -52,6 +54,7 @@
 
         <!-- Right -->
         <ImageView
+            android:id="@+id/widget_resize_right_handle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="right|center_vertical"
@@ -61,6 +64,7 @@
 
         <!-- Bottom -->
         <ImageView
+            android:id="@+id/widget_resize_bottom_handle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|center_horizontal"
diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java
index 9d6af9f253..8071782617 100644
--- a/src/com/android/launcher3/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher3/AppWidgetResizeFrame.java
@@ -20,7 +20,6 @@ import android.util.SizeF;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.ViewGroup;
 
 import androidx.annotation.Nullable;
 
@@ -139,10 +138,10 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
     protected void onFinishInflate() {
         super.onFinishInflate();
 
-        ViewGroup content = (ViewGroup) getChildAt(0);
-        for (int i = 0; i < HANDLE_COUNT; i ++) {
-            mDragHandles[i] = content.getChildAt(i);
-        }
+        mDragHandles[INDEX_LEFT] = findViewById(R.id.widget_resize_left_handle);
+        mDragHandles[INDEX_TOP] = findViewById(R.id.widget_resize_top_handle);
+        mDragHandles[INDEX_RIGHT] = findViewById(R.id.widget_resize_right_handle);
+        mDragHandles[INDEX_BOTTOM] = findViewById(R.id.widget_resize_bottom_handle);
     }
 
     @Override
-- 
GitLab


From 333a110840be0c6a1aacca107b703ce3e4496e02 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Tue, 16 Mar 2021 18:43:03 -0500
Subject: [PATCH 0685/1664] Move SearchWidgetInfoContainer to NexusLauncher

Bug: 182361605
Test: Manual
Change-Id: I082c0ecdebca4b8c41d5d6283aacff555fa7ae63
---
 .../search/SearchWidgetInfoContainer.java     | 73 -------------------
 1 file changed, 73 deletions(-)
 delete mode 100644 src/com/android/launcher3/allapps/search/SearchWidgetInfoContainer.java

diff --git a/src/com/android/launcher3/allapps/search/SearchWidgetInfoContainer.java b/src/com/android/launcher3/allapps/search/SearchWidgetInfoContainer.java
deleted file mode 100644
index 8e5f8cb9c0..0000000000
--- a/src/com/android/launcher3/allapps/search/SearchWidgetInfoContainer.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.allapps.search;
-
-import android.appwidget.AppWidgetHostView;
-import android.appwidget.AppWidgetProviderInfo;
-import android.content.Context;
-import android.widget.RemoteViews;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A placeholder {@link AppWidgetHostView} used for managing widget search results
- */
-public class SearchWidgetInfoContainer extends AppWidgetHostView {
-    private int mAppWidgetId;
-    private AppWidgetProviderInfo mProviderInfo;
-    private RemoteViews mViews;
-    private List<AppWidgetHostView> mListeners = new ArrayList<>();
-
-    public SearchWidgetInfoContainer(Context context) {
-        super(context);
-    }
-
-    @Override
-    public void setAppWidget(int appWidgetId, AppWidgetProviderInfo info) {
-        mAppWidgetId = appWidgetId;
-        mProviderInfo = info;
-        for (AppWidgetHostView listener : mListeners) {
-            listener.setAppWidget(mAppWidgetId, mProviderInfo);
-        }
-    }
-
-    @Override
-    public void updateAppWidget(RemoteViews remoteViews) {
-        mViews = remoteViews;
-        for (AppWidgetHostView listener : mListeners) {
-            listener.updateAppWidget(remoteViews);
-        }
-    }
-
-    /**
-     * Create a live {@link AppWidgetHostView} from placeholder
-     */
-    public void attachWidget(AppWidgetHostView hv) {
-        hv.setTag(getTag());
-        hv.setAppWidget(mAppWidgetId, mProviderInfo);
-        hv.updateAppWidget(mViews);
-        mListeners.add(hv);
-    }
-
-    /**
-     * stops AppWidgetHostView from getting updates
-     */
-    public void detachWidget(AppWidgetHostView hostView) {
-        mListeners.remove(hostView);
-    }
-
-}
-- 
GitLab


From fa3316e8db309336e1a3adc1773114b511e95635 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Tue, 16 Mar 2021 18:53:20 -0500
Subject: [PATCH 0686/1664] [Search] Update search input hint

Bug: 182927397
Test: Manual
Change-Id: I6ea7e70d0ddf3672187bd1936bc46c841a2618fb
---
 res/values/strings.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0600cae271..8d1cba4772 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -88,8 +88,6 @@
     <!-- All Apps -->
     <!-- Search bar text in the apps view. [CHAR_LIMIT=50] -->
     <string name="all_apps_search_bar_hint">Search apps</string>
-    <!-- Search bar text in the apps view. [CHAR_LIMIT=50] -->
-    <string name="all_apps_on_device_search_bar_hint">Search this phone and more…</string>
     <!-- Loading apps text. [CHAR_LIMIT=50] -->
     <string name="all_apps_loading_message">Loading apps&#8230;</string>
     <!-- No-search-results text. [CHAR_LIMIT=50] -->
-- 
GitLab


From 0fe7326cf0814db80022447f97bca025dfa9f081 Mon Sep 17 00:00:00 2001
From: Pat Manning <patmanning@google.com>
Date: Tue, 9 Mar 2021 13:08:06 +0000
Subject: [PATCH 0687/1664] Align task thumbnails to edge when cropped.

Align to left edge unless RTL enabled. Do not rotate thumbnails if they
would not fit nicely once rotated.

Test: manual - Ensure task thumbnails align with left edge if cropped.
Bug: 177402412
Change-Id: I6e03715061120deb5a8fde005d676170eed0f819
---
 .../quickstep/util/TaskViewSimulator.java     |  4 +-
 .../quickstep/views/TaskThumbnailView.java    | 48 +++++++++++--------
 src/com/android/launcher3/Utilities.java      | 10 ++++
 3 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index df1229ba05..867b97221b 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -270,10 +270,12 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
             mSizeStrategy.calculateGridSize(mContext, mDp, mGridRect);
             mThumbnailData.rotation = mOrientationState.getDisplayRotation();
 
+            // mIsRecentsRtl is the inverse of TaskView RTL.
+            boolean isRtlEnabled = !mIsRecentsRtl;
             mPositionHelper.updateThumbnailMatrix(
                     mThumbnailPosition, mThumbnailData,
                     mTaskRect.width(), mTaskRect.height(),
-                    mDp, mOrientationState.getRecentsActivityRotation());
+                    mDp, mOrientationState.getRecentsActivityRotation(), isRtlEnabled);
             mPositionHelper.getMatrix().invert(mInversePositionMatrix);
 
             PagedOrientationHandler poh = mOrientationState.getOrientationHandler();
diff --git a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
index 36a5f036a9..17d075f6c8 100644
--- a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
@@ -379,9 +379,10 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
                     mThumbnailData.thumbnail.getHeight());
             int currentRotation = getTaskView().getRecentsView().getPagedViewOrientedState()
                     .getRecentsActivityRotation();
+            boolean isRtl = getLayoutDirection() == LAYOUT_DIRECTION_RTL;
             mPreviewPositionHelper.updateThumbnailMatrix(mPreviewRect, mThumbnailData,
                     getMeasuredWidth(), getMeasuredHeight(), mActivity.getDeviceProfile(),
-                    currentRotation);
+                    currentRotation, isRtl);
 
             mBitmapShader.setLocalMatrix(mPreviewPositionHelper.mMatrix);
             mPaint.setShader(mBitmapShader);
@@ -466,7 +467,8 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
          * Updates the matrix based on the provided parameters
          */
         public void updateThumbnailMatrix(Rect thumbnailBounds, ThumbnailData thumbnailData,
-                int canvasWidth, int canvasHeight, DeviceProfile dp, int currentRotation) {
+                int canvasWidth, int canvasHeight, DeviceProfile dp, int currentRotation,
+                boolean isRtl) {
             boolean isRotated = false;
             boolean isOrientationDifferent;
 
@@ -500,6 +502,17 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
                 float availableHeight = surfaceHeight
                         - (thumbnailClipHint.top + thumbnailClipHint.bottom);
 
+                if (isRotated) {
+                    float canvasAspect = canvasWidth / (float) canvasHeight;
+                    float availableAspect = availableHeight / availableWidth;
+                    // Do not rotate thumbnail if it would not improve fit
+                    if (Utilities.isRelativePercentDifferenceGreaterThan(canvasAspect,
+                            availableAspect, 0.1f)) {
+                        isRotated = false;
+                        isOrientationDifferent = false;
+                    }
+                }
+
                 final float targetW, targetH;
                 if (isOrientationDifferent) {
                     targetW = canvasHeight;
@@ -535,28 +548,25 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
                     }
                 }
 
-                // Update the clip hints
-                float halfExtraW = (availableWidth - croppedWidth) / 2;
-                thumbnailClipHint.left += halfExtraW;
-                thumbnailClipHint.right += halfExtraW;
-                if (thumbnailClipHint.left < 0) {
-                    thumbnailClipHint.right += thumbnailClipHint.left;
-                    thumbnailClipHint.left = 0;
-                } else if (thumbnailClipHint.right < 0) {
-                    thumbnailClipHint.left += thumbnailClipHint.right;
+                // Update the clip hints. Align to 0,0, crop the remaining.
+                if (isRtl) {
+                    if (thumbnailClipHint.right < 0) {
+                        thumbnailClipHint.left += thumbnailClipHint.right;
+                    }
                     thumbnailClipHint.right = 0;
+                    thumbnailClipHint.left += availableWidth - croppedWidth;
+                } else {
+                    if (thumbnailClipHint.left < 0) {
+                        thumbnailClipHint.right += thumbnailClipHint.left;
+                    }
+                    thumbnailClipHint.left = 0;
+                    thumbnailClipHint.right += availableWidth - croppedWidth;
                 }
-
-                float halfExtraH = (availableHeight - croppedHeight) / 2;
-                thumbnailClipHint.top += halfExtraH;
-                thumbnailClipHint.bottom += halfExtraH;
                 if (thumbnailClipHint.top < 0) {
                     thumbnailClipHint.bottom += thumbnailClipHint.top;
-                    thumbnailClipHint.top = 0;
-                } else if (thumbnailClipHint.bottom < 0) {
-                    thumbnailClipHint.top += thumbnailClipHint.bottom;
-                    thumbnailClipHint.bottom = 0;
                 }
+                thumbnailClipHint.top = 0;
+                thumbnailClipHint.bottom += availableHeight - croppedHeight;
 
                 thumbnailScale = targetW / (croppedWidth * scale);
             }
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index c440303c2e..94c6574c60 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -690,6 +690,16 @@ public final class Utilities {
         };
     }
 
+    /**
+     * Compares the ratio of two quantities and returns whether that ratio is greater than the
+     * provided bound. Order of quantities does not matter. Bound should be a decimal representation
+     * of a percentage.
+     */
+    public static boolean isRelativePercentDifferenceGreaterThan(float first, float second,
+            float bound) {
+        return (Math.abs(first - second) / Math.abs((first + second) / 2.0f)) > bound;
+    }
+
     private static class FixedSizeEmptyDrawable extends ColorDrawable {
 
         private final int mSize;
-- 
GitLab


From 8e57cce4ee818dfceaf0f59e492e9b4e9f814d05 Mon Sep 17 00:00:00 2001
From: Andras Kloczl <andraskloczl@google.com>
Date: Thu, 11 Feb 2021 23:51:19 +0100
Subject: [PATCH 0688/1664] Two panel & two page swipe & currentPage fixes

- Pagespacing set to 0 to have similar design to figma
- Added padding to left side of left panel and right side of right panel to match figma
- getPageScrolls changed to support two page scrolling
- validateNewPage changed so that only even indexed pages can be switched to
- getPageWidthSize added for measurements, it returns half screen width when two panel is active
- onMeasure changed to use getPageWidthSize
- panelCount has been increased from 1 to 2 when two panel is active
- add feature flag for two panel home
- shouldConsumeTouch changed so not only currentpage is checked but currentpage+1 screen as well
- add one more extra check for setDropLayoutForDragObject for currentpage + 2, next to right panel
- using new grid option for two panel home screen

Test: manual
Bug: 174464115
Change-Id: I1bad7eecc67f65fb833608744a5aa5aca65373b4
---
 res/values/dimens.xml                         |  2 +
 src/com/android/launcher3/DeviceProfile.java  | 11 ++-
 .../launcher3/InvariantDeviceProfile.java     |  4 +
 src/com/android/launcher3/PagedView.java      | 76 +++++++++++++++----
 src/com/android/launcher3/Workspace.java      | 51 +++++++++++--
 .../launcher3/config/FeatureFlags.java        |  4 +
 .../dragndrop/SpringLoadedDragController.java |  5 +-
 7 files changed, 129 insertions(+), 24 deletions(-)

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d135b43df9..d25cdb644f 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -29,6 +29,8 @@
     <dimen name="dynamic_grid_cell_layout_padding">5.5dp</dimen>
     <dimen name="dynamic_grid_cell_padding_x">8dp</dimen>
 
+    <dimen name="two_panel_home_side_padding">18dp</dimen>
+
     <!-- Hotseat -->
     <dimen name="dynamic_grid_hotseat_top_padding">8dp</dimen>
     <dimen name="dynamic_grid_hotseat_bottom_padding">2dp</dimen>
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 90cc384e86..02571a059e 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -251,7 +251,12 @@ public class DeviceProfile {
         int cellLayoutPadding = isScalableGrid
                 ? 0
                 : res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_layout_padding);
-        if (isLandscape) {
+
+        if (FeatureFlags.ENABLE_TWO_PANEL_HOME.get() && isTablet) {
+            cellLayoutPaddingLeftRightPx =
+                    res.getDimensionPixelSize(R.dimen.two_panel_home_side_padding);
+            cellLayoutBottomPaddingPx = 0;
+        } else if (isLandscape) {
             cellLayoutPaddingLeftRightPx = 0;
             cellLayoutBottomPaddingPx = cellLayoutPadding;
         } else {
@@ -660,6 +665,10 @@ public class DeviceProfile {
                         - (2 * inv.numRows * cellHeightPx) - hotseatVerticalPadding);
                 padding.set(availablePaddingX / 2, edgeMarginPx + availablePaddingY / 2,
                         availablePaddingX / 2, paddingBottom + availablePaddingY / 2);
+
+                if (FeatureFlags.ENABLE_TWO_PANEL_HOME.get()) {
+                    padding.set(0, padding.top, 0, padding.bottom);
+                }
             } else {
                 // Pad the top and bottom of the workspace with search/hotseat bar sizes
                 padding.set(desiredWorkspaceLeftRightMarginPx,
diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index bb60557122..348d9eef2c 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -19,6 +19,7 @@ package com.android.launcher3;
 import static com.android.launcher3.Utilities.getDevicePrefs;
 import static com.android.launcher3.Utilities.getPointString;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_FOUR_COLUMNS;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_TWO_PANEL_HOME;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.PackageManagerHelper.getPackageFilter;
 
@@ -235,6 +236,9 @@ public class InvariantDeviceProfile {
     }
 
     public static String getCurrentGridName(Context context) {
+        if (ENABLE_TWO_PANEL_HOME.get()) {
+            return ENABLE_TWO_PANEL_HOME.key;
+        }
         if (ENABLE_FOUR_COLUMNS.get()) {
             return ENABLE_FOUR_COLUMNS.key;
         }
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 50f1e445ed..b084eb1b9b 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -282,7 +282,32 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
     private int validateNewPage(int newPage) {
         newPage = ensureWithinScrollBounds(newPage);
         // Ensure that it is clamped by the actual set of children in all cases
-        return Utilities.boundToRange(newPage, 0, getPageCount() - 1);
+        newPage = Utilities.boundToRange(newPage, 0, getPageCount() - 1);
+
+        if (getPanelCount() > 1) {
+            // Always return left panel as new page
+            newPage = getLeftmostVisiblePageForIndex(newPage);
+        }
+        return newPage;
+    }
+
+    private int getLeftmostVisiblePageForIndex(int pageIndex) {
+        int panelCount = getPanelCount();
+        return (pageIndex / panelCount) * panelCount;
+    }
+
+    /**
+     * Returns the number of pages that are shown at the same time.
+     */
+    protected int getPanelCount() {
+        return 1;
+    }
+
+    /**
+     * Returns true if the view is on one of the current pages, false otherwise.
+     */
+    public boolean isVisible(View child) {
+        return getLeftmostVisiblePageForIndex(indexOfChild(child)) == mCurrentPage;
     }
 
     /**
@@ -548,6 +573,10 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         super.forceLayout();
     }
 
+    private int getPageWidthSize(int widthSize) {
+        return (widthSize - mInsets.left - mInsets.right) / getPanelCount();
+    }
+
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         if (getChildCount() == 0) {
@@ -578,7 +607,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         if (DEBUG) Log.d(TAG, "PagedView.onMeasure(): " + widthSize + ", " + heightSize);
 
         int myWidthSpec = MeasureSpec.makeMeasureSpec(
-                widthSize - mInsets.left - mInsets.right, MeasureSpec.EXACTLY);
+                getPageWidthSize(widthSize), MeasureSpec.EXACTLY);
         int myHeightSpec = MeasureSpec.makeMeasureSpec(
                 heightSize - mInsets.top - mInsets.bottom, MeasureSpec.EXACTLY);
 
@@ -672,9 +701,11 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
 
                 // In case the pages are of different width, align the page to left or right edge
                 // based on the orientation.
+                // In case we have multiple panels on the screen, scrollOffsetEnd is the scroll
+                // needed for the whole visible area, so we have to divide it by panelCount.
                 final int pageScroll = mIsRtl
-                    ? (childStart - scrollOffsetStart)
-                    : Math.max(0, childPrimaryEnd  - scrollOffsetEnd);
+                        ? (childStart - scrollOffsetStart)
+                        : Math.max(0, childPrimaryEnd - scrollOffsetEnd / getPanelCount());
                 if (outPageScrolls[i] != pageScroll) {
                     pageScrollChanged = true;
                     outPageScrolls[i] = pageScroll;
@@ -682,6 +713,19 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
                 childStart += primaryDimension + mPageSpacing + getChildGap();
             }
         }
+
+        int panelCount = getPanelCount();
+        if (panelCount > 1) {
+            for (int i = 0; i < childCount; i++) {
+                // In case we have multiple panels, always use left panel's page scroll for all
+                // panels on the screen.
+                int adjustedScroll = outPageScrolls[getLeftmostVisiblePageForIndex(i)];
+                if (outPageScrolls[i] != adjustedScroll) {
+                    outPageScrolls[i] = adjustedScroll;
+                    pageScrollChanged = true;
+                }
+            }
+        }
         return pageScrollChanged;
     }
 
@@ -794,14 +838,16 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         }
         if (direction == View.FOCUS_LEFT) {
             if (getCurrentPage() > 0) {
-                snapToPage(getCurrentPage() - 1);
-                getChildAt(getCurrentPage() - 1).requestFocus(direction);
+                int nextPage = validateNewPage(getCurrentPage() - 1);
+                snapToPage(nextPage);
+                getChildAt(nextPage).requestFocus(direction);
                 return true;
             }
         } else if (direction == View.FOCUS_RIGHT) {
             if (getCurrentPage() < getPageCount() - 1) {
-                snapToPage(getCurrentPage() + 1);
-                getChildAt(getCurrentPage() + 1).requestFocus(direction);
+                int nextPage = validateNewPage(getCurrentPage() + 1);
+                snapToPage(nextPage);
+                getChildAt(nextPage).requestFocus(direction);
                 return true;
             }
         }
@@ -820,11 +866,13 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         }
         if (direction == View.FOCUS_LEFT) {
             if (mCurrentPage > 0) {
-                getPageAt(mCurrentPage - 1).addFocusables(views, direction, focusableMode);
+                int nextPage = validateNewPage(mCurrentPage - 1);
+                getPageAt(nextPage).addFocusables(views, direction, focusableMode);
             }
-        } else if (direction == View.FOCUS_RIGHT){
+        } else if (direction == View.FOCUS_RIGHT) {
             if (mCurrentPage < getPageCount() - 1) {
-                getPageAt(mCurrentPage + 1).addFocusables(views, direction, focusableMode);
+                int nextPage = validateNewPage(mCurrentPage + 1);
+                getPageAt(nextPage).addFocusables(views, direction, focusableMode);
             }
         }
     }
@@ -1255,12 +1303,14 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
 
                     if (((isSignificantMove && !isDeltaLeft && !isFling) ||
                             (isFling && !isVelocityLeft)) && mCurrentPage > 0) {
-                        finalPage = returnToOriginalPage ? mCurrentPage : mCurrentPage - 1;
+                        finalPage = returnToOriginalPage
+                                ? mCurrentPage : mCurrentPage - getPanelCount();
                         snapToPageWithVelocity(finalPage, velocity);
                     } else if (((isSignificantMove && isDeltaLeft && !isFling) ||
                             (isFling && isVelocityLeft)) &&
                             mCurrentPage < getChildCount() - 1) {
-                        finalPage = returnToOriginalPage ? mCurrentPage : mCurrentPage + 1;
+                        finalPage = returnToOriginalPage
+                                ? mCurrentPage : mCurrentPage + getPanelCount();
                         snapToPageWithVelocity(finalPage, velocity);
                     } else {
                         snapToDestination();
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index a089517b65..5aea45a806 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -312,7 +312,9 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         // Increase our bottom insets so we don't overlap with the taskbar.
         mInsets.bottom += grid.nonOverlappingTaskbarInset;
 
-        if (mWorkspaceFadeInAdjacentScreens) {
+        if (isTwoPanelEnabled()) {
+            setPageSpacing(0); // we have two pages and we don't want any spacing
+        } else if (mWorkspaceFadeInAdjacentScreens) {
             // In landscape mode the page spacing is set to the default.
             setPageSpacing(grid.edgeMarginPx);
         } else {
@@ -324,12 +326,30 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
             setPageSpacing(Math.max(maxInsets, maxPadding));
         }
 
-
         int paddingLeftRight = grid.cellLayoutPaddingLeftRightPx;
         int paddingBottom = grid.cellLayoutBottomPaddingPx;
+        int twoPanelLandscapeSidePadding = paddingLeftRight * 2;
+        int twoPanelPortraitSidePadding = paddingLeftRight / 2;
+
+        int panelCount = getPanelCount();
         for (int i = mWorkspaceScreens.size() - 1; i >= 0; i--) {
-            mWorkspaceScreens.valueAt(i)
-                    .setPadding(paddingLeftRight, 0, paddingLeftRight, paddingBottom);
+            int paddingLeft = paddingLeftRight;
+            int paddingRight = paddingLeftRight;
+            if (panelCount > 1) {
+                if (i % panelCount == 0) { // left side panel
+                    paddingLeft = grid.isLandscape ? twoPanelLandscapeSidePadding
+                            : twoPanelPortraitSidePadding;
+                    paddingRight = 0;
+                } else if (i % panelCount == panelCount - 1) { // right side panel
+                    paddingLeft = 0;
+                    paddingRight = grid.isLandscape ? twoPanelLandscapeSidePadding
+                            : twoPanelPortraitSidePadding;
+                } else { // middle panel
+                    paddingLeft = 0;
+                    paddingRight = 0;
+                }
+            }
+            mWorkspaceScreens.valueAt(i).setPadding(paddingLeft, 0, paddingRight, paddingBottom);
         }
     }
 
@@ -445,6 +465,15 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
                 .log(LauncherEvent.LAUNCHER_ITEM_DRAG_STARTED);
     }
 
+    private boolean isTwoPanelEnabled() {
+        return mLauncher.mDeviceProfile.isTablet && FeatureFlags.ENABLE_TWO_PANEL_HOME.get();
+    }
+
+    @Override
+    protected int getPanelCount() {
+        return isTwoPanelEnabled() ? 2 : super.getPanelCount();
+    }
+
     public void deferRemoveExtraEmptyScreen() {
         mDeferRemoveExtraEmptyScreen = true;
     }
@@ -832,7 +861,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
 
     private boolean shouldConsumeTouch(View v) {
         return !workspaceIconsCanBeDragged()
-                || (!workspaceInModalState() && indexOfChild(v) != mCurrentPage);
+                || (!workspaceInModalState() && !isVisible(v));
     }
 
     public boolean isSwitchingState() {
@@ -2259,19 +2288,27 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
 
         int nextPage = getNextPage();
         if (layout == null && !isPageInTransition()) {
-            // Check if the item is dragged over left page
+            // Check if the item is dragged over currentPage - 1 page
             mTempTouchCoordinates[0] = Math.min(centerX, d.x);
             mTempTouchCoordinates[1] = d.y;
             layout = verifyInsidePage(nextPage + (mIsRtl ? 1 : -1), mTempTouchCoordinates);
         }
 
         if (layout == null && !isPageInTransition()) {
-            // Check if the item is dragged over right page
+            // Check if the item is dragged over currentPage + 1 page
             mTempTouchCoordinates[0] = Math.max(centerX, d.x);
             mTempTouchCoordinates[1] = d.y;
             layout = verifyInsidePage(nextPage + (mIsRtl ? -1 : 1), mTempTouchCoordinates);
         }
 
+        // If two panel is enabled, users can also drag items to currentPage + 2
+        if (isTwoPanelEnabled() && layout == null && !isPageInTransition()) {
+            // Check if the item is dragged over currentPage + 2 page
+            mTempTouchCoordinates[0] = Math.max(centerX, d.x);
+            mTempTouchCoordinates[1] = d.y;
+            layout = verifyInsidePage(nextPage + (mIsRtl ? -2 : 2), mTempTouchCoordinates);
+        }
+
         // Always pick the current page.
         if (layout == null && nextPage >= 0 && nextPage < getPageCount()) {
             layout = (CellLayout) getChildAt(nextPage);
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 48e41d5fda..43123c141d 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -205,6 +205,10 @@ public final class FeatureFlags {
             "ENABLE_OVERVIEW_GRID", false, "Uses grid overview layout. "
             + "Only applicable on large screen devices.");
 
+    public static final BooleanFlag ENABLE_TWO_PANEL_HOME = getDebugFlag(
+            "ENABLE_TWO_PANEL_HOME", false,
+            "Uses two panel on home screen. Only applicable on large screen devices.");
+
     public static final BooleanFlag ENABLE_SPLIT_SELECT = getDebugFlag(
             "ENABLE_SPLIT_SELECT", false, "Uses new split screen selection overview UI");
 
diff --git a/src/com/android/launcher3/dragndrop/SpringLoadedDragController.java b/src/com/android/launcher3/dragndrop/SpringLoadedDragController.java
index 37200a6a8b..6325877936 100644
--- a/src/com/android/launcher3/dragndrop/SpringLoadedDragController.java
+++ b/src/com/android/launcher3/dragndrop/SpringLoadedDragController.java
@@ -56,9 +56,8 @@ public class SpringLoadedDragController implements OnAlarmListener {
         if (mScreen != null) {
             // Snap to the screen that we are hovering over now
             Workspace w = mLauncher.getWorkspace();
-            int page = w.indexOfChild(mScreen);
-            if (page != w.getCurrentPage()) {
-                w.snapToPage(page);
+            if (!w.isVisible(mScreen)) {
+                w.snapToPage(w.indexOfChild(mScreen));
             }
         } else {
             mLauncher.getDragController().cancelDrag();
-- 
GitLab


From 2e732e95d95200c33e40c8a09daf60e9d7c3054e Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Fri, 12 Mar 2021 17:39:38 +0000
Subject: [PATCH 0689/1664] Bug fixes for widget picker search.

SearchBarController
- Use Extended Edit Text to handle close keyboard action well.
- On press enter while search remove focus from bar and hide keyboard.
- On cancel button press hide keyboard and also reset search targets to empty so that on next search session the previous results dont flash (show for a short time before reflecting users query).

WidgetsFullSheet
- Make sure expanded header are reset when user leaves personal/work recycler views. Search recycler view resets its expanded header on every search already.
- Show 'no search results' view if no search result present.
- Update WidgetListBaseRowEntryComparator to show personal profile widgets first.

Test: Tested prototype locally.
Bug: b/157286785
Change-Id: Ibaa208c4091783e14ac0887caf559e867185df5a
---
 res/layout/widgets_search_bar.xml             |  2 +-
 res/values/strings.xml                        |  3 ++
 .../WidgetsSearchBarControllerTest.java       |  9 +++--
 .../widget/picker/WidgetsFullSheet.java       | 20 ++++++++++-
 .../widget/picker/WidgetsListAdapter.java     | 20 +++++++++--
 .../widget/picker/WidgetsRecyclerView.java    |  4 +--
 .../search/LauncherWidgetsSearchBar.java      |  4 +--
 .../search/WidgetsSearchBarController.java    | 33 ++++++++++++++++---
 8 files changed, 77 insertions(+), 18 deletions(-)

diff --git a/res/layout/widgets_search_bar.xml b/res/layout/widgets_search_bar.xml
index 450e5f1ece..6f65e2bce6 100644
--- a/res/layout/widgets_search_bar.xml
+++ b/res/layout/widgets_search_bar.xml
@@ -9,7 +9,7 @@
     android:background="@drawable/bg_widgets_searchbox"
     android:padding="12dp">
 
-    <EditText
+    <com.android.launcher3.ExtendedEditText
         android:id="@+id/widgets_search_bar_edit_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0600cae271..292dfbe5a4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -84,6 +84,9 @@
     <!-- Text shown when there is no widgets shown in the popup view showing all available widgets
          installed on the device. [CHAR_LIMIT=none] -->
     <string name="no_widgets_available">No widgets available</string>
+    <!-- Text shown when there are no matching widget search results for user's search query.
+         [CHAR_LIMIT=none] -->
+    <string name="no_search_results">No search results</string>
 
     <!-- All Apps -->
     <!-- Search bar text in the apps view. [CHAR_LIMIT=50] -->
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarControllerTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarControllerTest.java
index 7fc965051d..4e6f17c384 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarControllerTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarControllerTest.java
@@ -24,9 +24,9 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 import android.content.Context;
 import android.view.View;
-import android.widget.EditText;
 import android.widget.ImageButton;
 
+import com.android.launcher3.ExtendedEditText;
 import com.android.launcher3.search.SearchAlgorithm;
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 
@@ -45,7 +45,7 @@ public class WidgetsSearchBarControllerTest {
 
     private WidgetsSearchBarController mController;
     private Context mContext;
-    private EditText mEditText;
+    private ExtendedEditText mEditText;
     private ImageButton mCancelButton;
     @Mock
     private SearchModeListener mSearchModeListener;
@@ -56,7 +56,7 @@ public class WidgetsSearchBarControllerTest {
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
-        mEditText = new EditText(mContext);
+        mEditText = new ExtendedEditText(mContext);
         mCancelButton = new ImageButton(mContext);
         mController = new WidgetsSearchBarController(
                 mSearchAlgorithm, mEditText, mCancelButton, mSearchModeListener);
@@ -116,11 +116,10 @@ public class WidgetsSearchBarControllerTest {
     }
 
     @Test
-    public void cancelSearch_shouldInformSearchModeListenerToExitSearch() {
+    public void cancelSearch_shouldInformSearchModeListenerToClearResultsAndExitSearch() {
         mCancelButton.performClick();
 
         verify(mSearchModeListener).exitSearchMode();
-        verifyNoMoreInteractions(mSearchModeListener);
     }
 
     @Test
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 92994be568..5747690ba6 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -57,6 +57,7 @@ import com.android.launcher3.widget.picker.search.WidgetsSearchBar;
 import com.android.launcher3.workprofile.PersonalWorkPagedView;
 import com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip.OnActivePageChangedListener;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Predicate;
 
@@ -161,8 +162,8 @@ public class WidgetsFullSheet extends BaseWidgetSheet
                 mAdapters.get(currentActivePage).mWidgetsRecyclerView;
 
         updateNoWidgetsView(currentAdapterHolder);
-
         attachScrollbarToRecyclerView(currentRecyclerView);
+        resetExpandedHeaders();
     }
 
     private void attachScrollbarToRecyclerView(WidgetsRecyclerView recyclerView) {
@@ -180,6 +181,13 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         mNoWidgetsView.setVisibility(isWidgetAvailable ? GONE : VISIBLE);
     }
 
+    private void updateNoSearchResultsView(boolean isVisible) {
+        mNoWidgetsView.setVisibility(isVisible ? VISIBLE : GONE);
+        if (isVisible) {
+            mNoWidgetsView.setText(R.string.no_search_results);
+        }
+    }
+
     private void reset() {
         mAdapters.get(AdapterHolder.PRIMARY).mWidgetsRecyclerView.scrollToTop();
         if (mHasWorkProfile) {
@@ -323,10 +331,12 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         if (mIsInSearchMode) return;
         setViewVisibilityBasedOnSearch(/*isInSearchMode= */ true);
         attachScrollbarToRecyclerView(mAdapters.get(AdapterHolder.SEARCH).mWidgetsRecyclerView);
+        resetExpandedHeaders();
     }
 
     @Override
     public void exitSearchMode() {
+        onSearchResults(new ArrayList<>());
         setViewVisibilityBasedOnSearch(/*isInSearchMode=*/ false);
         if (mHasWorkProfile) {
             mViewPager.snapToPage(AdapterHolder.PRIMARY);
@@ -337,6 +347,8 @@ public class WidgetsFullSheet extends BaseWidgetSheet
     @Override
     public void onSearchResults(List<WidgetsListBaseEntry> entries) {
         mAdapters.get(AdapterHolder.SEARCH).mWidgetsListAdapter.setWidgetsOnSearch(entries);
+        updateNoSearchResultsView(
+                mAdapters.get(AdapterHolder.SEARCH).mWidgetsListAdapter.getItemCount() == 0);
     }
 
     private void setViewVisibilityBasedOnSearch(boolean isInSearchMode) {
@@ -350,6 +362,12 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         }
         mAdapters.get(AdapterHolder.SEARCH).mWidgetsRecyclerView
                 .setVisibility(mIsInSearchMode ? VISIBLE : GONE);
+        mNoWidgetsView.setVisibility(GONE);
+    }
+
+    private void resetExpandedHeaders() {
+        mAdapters.get(AdapterHolder.PRIMARY).mWidgetsListAdapter.resetExpandedHeader();
+        mAdapters.get(AdapterHolder.WORK).mWidgetsListAdapter.resetExpandedHeader();
     }
 
     private void open(boolean animate) {
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
index 9009eb15c8..5346c1c18f 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
@@ -16,6 +16,7 @@
 package com.android.launcher3.widget.picker;
 
 import android.content.Context;
+import android.os.Process;
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
@@ -81,7 +82,7 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
             entry instanceof WidgetsListHeaderEntry
                     || entry instanceof WidgetsListSearchHeaderEntry
                     || new PackageUserKey(entry.mPkgItem.packageName, entry.mPkgItem.user)
-                    .equals(mWidgetsContentVisiblePackageUserKey);
+                            .equals(mWidgetsContentVisiblePackageUserKey);
     @Nullable private Predicate<WidgetsListBaseEntry> mFilter = null;
 
     public WidgetsListAdapter(Context context, LayoutInflater layoutInflater,
@@ -175,6 +176,14 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
         mDiffReporter.process(mVisibleEntries, newVisibleEntries, mRowComparator);
     }
 
+    /**
+     * Resets any expanded widget header.
+     */
+    public void resetExpandedHeader() {
+        mWidgetsContentVisiblePackageUserKey = null;
+        updateVisibleEntries();
+    }
+
     @Override
     public void onBindViewHolder(ViewHolder holder, int pos) {
         ViewHolderBinder viewHolderBinder = mViewHolderBinders.get(getItemViewType(pos));
@@ -258,7 +267,14 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
 
         @Override
         public int compare(WidgetsListBaseEntry a, WidgetsListBaseEntry b) {
-            return mComparator.compare(a.mPkgItem.title.toString(), b.mPkgItem.title.toString());
+            int i = mComparator.compare(a.mPkgItem.title.toString(), b.mPkgItem.title.toString());
+            if (i != 0) {
+                return i;
+            }
+            // Prioritize entries from current user over other users if the entries are same.
+            if (a.mPkgItem.user.equals(b.mPkgItem.user)) return 0;
+            if (a.mPkgItem.user.equals(Process.myUserHandle())) return -1;
+            return 1;
         }
     }
 }
diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java b/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
index 12d3f11919..b016b4f32c 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
@@ -220,8 +220,8 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
         int totalItemsHeight = 0;
         for (int i = 0; i < untilIndex; i++) {
             WidgetsListBaseEntry entry = mAdapter.getItems().get(i);
-            if (entry instanceof WidgetsListHeaderEntry ||
-                    entry instanceof WidgetsListSearchHeaderEntry) {
+            if (entry instanceof WidgetsListHeaderEntry
+                    || entry instanceof WidgetsListSearchHeaderEntry) {
                 totalItemsHeight += mEstimatedWidgetListHeaderHeight;
             } else if (entry instanceof WidgetsListContentEntry) {
                 totalItemsHeight += mLastVisibleWidgetContentTableHeight;
diff --git a/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java b/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java
index d68e87e3d6..5520826ab9 100644
--- a/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java
+++ b/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java
@@ -18,13 +18,13 @@ package com.android.launcher3.widget.picker.search;
 
 import android.content.Context;
 import android.util.AttributeSet;
-import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.android.launcher3.ExtendedEditText;
 import com.android.launcher3.R;
 import com.android.launcher3.search.SearchAlgorithm;
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
@@ -36,7 +36,7 @@ import java.util.List;
  */
 public class LauncherWidgetsSearchBar extends LinearLayout implements WidgetsSearchBar {
     private WidgetsSearchBarController mController;
-    private EditText mEditText;
+    private ExtendedEditText mEditText;
     private ImageButton mCancelButton;
 
     public LauncherWidgetsSearchBar(Context context) {
diff --git a/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarController.java b/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarController.java
index 6c374842fd..60110977ed 100644
--- a/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarController.java
+++ b/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarController.java
@@ -22,9 +22,11 @@ import static android.view.View.VISIBLE;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
-import android.widget.EditText;
+import android.view.KeyEvent;
+import android.view.View;
 import android.widget.ImageButton;
 
+import com.android.launcher3.ExtendedEditText;
 import com.android.launcher3.search.SearchAlgorithm;
 import com.android.launcher3.search.SearchCallback;
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
@@ -35,22 +37,25 @@ import java.util.ArrayList;
  * Controller for a search bar with an edit text and a cancel button.
  */
 public class WidgetsSearchBarController implements TextWatcher,
-        SearchCallback<WidgetsListBaseEntry> {
+        SearchCallback<WidgetsListBaseEntry>,  ExtendedEditText.OnBackKeyListener,
+        View.OnKeyListener {
     private static final String TAG = "WidgetsSearchBarController";
     private static final boolean DEBUG = false;
 
     protected SearchAlgorithm<WidgetsListBaseEntry> mSearchAlgorithm;
-    protected EditText mInput;
+    protected ExtendedEditText mInput;
     protected ImageButton mCancelButton;
     protected SearchModeListener mSearchModeListener;
     protected String mQuery;
 
     public WidgetsSearchBarController(
-            SearchAlgorithm<WidgetsListBaseEntry> algo, EditText editText, ImageButton cancelButton,
-            SearchModeListener searchModeListener) {
+            SearchAlgorithm<WidgetsListBaseEntry> algo, ExtendedEditText editText,
+            ImageButton cancelButton, SearchModeListener searchModeListener) {
         mSearchAlgorithm = algo;
         mInput = editText;
         mInput.addTextChangedListener(this);
+        mInput.setOnBackKeyListener(this);
+        mInput.setOnKeyListener(this);
         mCancelButton = cancelButton;
         mCancelButton.setOnClickListener(v -> clearSearchResult());
         mSearchModeListener = searchModeListener;
@@ -99,6 +104,7 @@ public class WidgetsSearchBarController implements TextWatcher,
         mSearchAlgorithm.cancel(/* interruptActiveRequests= */ true);
         mInput.getText().clear();
         mInput.clearFocus();
+        mInput.hideKeyboard();
         mSearchModeListener.exitSearchMode();
     }
 
@@ -108,4 +114,21 @@ public class WidgetsSearchBarController implements TextWatcher,
     public void onDestroy() {
         mSearchAlgorithm.destroy();
     }
+
+    @Override
+    public boolean onBackKey() {
+        mInput.clearFocus();
+        mInput.hideKeyboard();
+        return true;
+    }
+
+    @Override
+    public boolean onKey(View view, int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_UP) {
+            mInput.clearFocus();
+            mInput.hideKeyboard();
+            return true;
+        }
+        return false;
+    }
 }
-- 
GitLab


From 58561d4fd7c6d2b8d8fa9445a11d032a92bb8034 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Wed, 17 Mar 2021 10:51:54 -0400
Subject: [PATCH 0690/1664] Dump DeviceProfile to help with debugging grid
 changes Some of these internal values are not exposed in hierarchy viewer

Bug: 175329686
Test: Take bug report and verify output
Change-Id: Ic39be510682fe5aeb03b7436858f6442895c796f
---
 src/com/android/launcher3/DeviceProfile.java | 106 +++++++++++++++++--
 src/com/android/launcher3/Launcher.java      |   1 +
 2 files changed, 99 insertions(+), 8 deletions(-)

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 90cc384e86..27fae4f5ac 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -17,6 +17,7 @@
 package com.android.launcher3;
 
 import static com.android.launcher3.ResourceUtils.pxFromDp;
+import static com.android.launcher3.Utilities.dpiFromPx;
 
 import android.content.Context;
 import android.content.res.Configuration;
@@ -38,6 +39,8 @@ import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.DisplayController.Info;
 import com.android.launcher3.util.WindowBounds;
 
+import java.io.PrintWriter;
+
 public class DeviceProfile {
 
     private static final float TABLET_MIN_DPS = 600;
@@ -91,8 +94,10 @@ public class DeviceProfile {
     public float workspaceSpringLoadShrinkFactor;
     public final int workspaceSpringLoadedBottomSpace;
 
+    private final int extraSpace;
     public int workspaceTopPadding;
     public int workspaceBottomPadding;
+    public int extraHotseatBottomPadding;
 
     // Workspace page indicator
     public final int workspacePageIndicatorHeight;
@@ -109,7 +114,6 @@ public class DeviceProfile {
     public int workspaceCellPaddingXPx;
 
     public int cellYPaddingPx;
-    public int cellYPaddingOriginalPx;
 
     // Folder
     public float folderLabelTextScale;
@@ -199,8 +203,7 @@ public class DeviceProfile {
         mInfo = info;
 
         // Constants from resources
-        float swDPs = Utilities.dpiFromPx(
-                Math.min(info.smallestSize.x, info.smallestSize.y), info.metrics);
+        float swDPs = dpiFromPx(Math.min(info.smallestSize.x, info.smallestSize.y), info.metrics);
         boolean allowRotation = context.getResources().getBoolean(R.bool.allow_rotation);
         // Tablet UI is built with assumption that simulated landscape is disabled.
         isTablet = allowRotation && swDPs >= TABLET_MIN_DPS;
@@ -290,22 +293,22 @@ public class DeviceProfile {
                         + (isScalableGrid ? 0 : hotseatExtraVerticalSize)));
 
         // Calculate all of the remaining variables.
-        int extraSpace = updateAvailableDimensions(res);
+        extraSpace = updateAvailableDimensions(res);
         // Now that we have all of the variables calculated, we can tune certain sizes.
         if (isScalableGrid) {
             DevicePadding padding = inv.devicePaddings.getDevicePadding(extraSpace);
             workspaceTopPadding = padding.getWorkspaceTopPadding(extraSpace);
             workspaceBottomPadding = padding.getWorkspaceBottomPadding(extraSpace);
 
-            float hotseatBarBottomPadding = padding.getHotseatBottomPadding(extraSpace);
-            hotseatBarSizePx += hotseatBarBottomPadding;
-            hotseatBarBottomPaddingPx += hotseatBarBottomPadding;
+            extraHotseatBottomPadding = padding.getHotseatBottomPadding(extraSpace);
+            hotseatBarSizePx += extraHotseatBottomPadding;
+            hotseatBarBottomPaddingPx += extraHotseatBottomPadding;
         } else if (!isVerticalBarLayout() && isPhone && isTallDevice) {
             // We increase the hotseat size when there is extra space.
             // ie. For a display with a large aspect ratio, we can keep the icons on the workspace
             // in portrait mode closer together by adding more height to the hotseat.
             // Note: This calculation was created after noticing a pattern in the design spec.
-            extraSpace = getCellSize().y - iconSizePx - iconDrawablePaddingPx * 2
+            int extraSpace = getCellSize().y - iconSizePx - iconDrawablePaddingPx * 2
                     - workspacePageIndicatorHeight;
             hotseatBarSizePx += extraSpace;
             hotseatBarBottomPaddingPx += extraSpace;
@@ -785,6 +788,93 @@ public class DeviceProfile {
         }
     }
 
+    private String pxToDpStr(String name, float value) {
+        return "\t" + name + ": " + value + "px (" + dpiFromPx(value, mInfo.metrics) + "dp)";
+    }
+
+    public void dump(String prefix, PrintWriter writer) {
+        writer.println(prefix + "DeviceProfile:");
+        writer.println(prefix + "\t1 dp = " + mInfo.metrics.density + " px");
+
+        writer.println(prefix + "\tisTablet:" + isTablet);
+        writer.println(prefix + "\tisLargeTablet:" + isLargeTablet);
+        writer.println(prefix + "\tisPhone:" + isPhone);
+        writer.println(prefix + "\ttransposeLayoutWithOrientation:"
+                + transposeLayoutWithOrientation);
+
+        writer.println(prefix + "\tisLandscape:" + isLandscape);
+        writer.println(prefix + "\tisMultiWindowMode:" + isMultiWindowMode);
+
+        writer.println(prefix + pxToDpStr("windowX", windowX));
+        writer.println(prefix + pxToDpStr("windowY", windowY));
+        writer.println(prefix + pxToDpStr("widthPx", widthPx));
+        writer.println(prefix + pxToDpStr("heightPx", heightPx));
+
+        writer.println(prefix + pxToDpStr("availableWidthPx", availableWidthPx));
+        writer.println(prefix + pxToDpStr("availableHeightPx", availableHeightPx));
+
+        writer.println(prefix + "\taspectRatio:" + aspectRatio);
+
+        writer.println(prefix + "\tisScalableGrid:" + isScalableGrid);
+
+        writer.println(prefix + "\tinv.minCellWidth:" + inv.minCellWidth + "dp");
+        writer.println(prefix + "\tinv.minCellHeight:" + inv.minCellHeight + "dp");
+
+        writer.println(prefix + pxToDpStr("cellWidthPx", cellWidthPx));
+        writer.println(prefix + pxToDpStr("cellHeightPx", cellHeightPx));
+
+        writer.println(prefix + pxToDpStr("getCellSize().x", getCellSize().x));
+        writer.println(prefix + pxToDpStr("getCellSize().y", getCellSize().y));
+
+        writer.println(prefix + "\tinv.iconSize:" + inv.iconSize + "dp");
+        writer.println(prefix + pxToDpStr("iconSizePx", iconSizePx));
+        writer.println(prefix + pxToDpStr("iconTextSizePx", iconTextSizePx));
+        writer.println(prefix + pxToDpStr("iconDrawablePaddingPx", iconDrawablePaddingPx));
+
+        writer.println(prefix + pxToDpStr("folderCellWidthPx", folderCellWidthPx));
+        writer.println(prefix + pxToDpStr("folderCellHeightPx", folderCellHeightPx));
+        writer.println(prefix + pxToDpStr("folderChildIconSizePx", folderChildIconSizePx));
+        writer.println(prefix + pxToDpStr("folderChildTextSizePx", folderChildTextSizePx));
+        writer.println(prefix + pxToDpStr("folderChildDrawablePaddingPx",
+                folderChildDrawablePaddingPx));
+
+        writer.println(prefix + pxToDpStr("cellLayoutBorderSpacingPx",
+                cellLayoutBorderSpacingPx));
+        writer.println(prefix + pxToDpStr("desiredWorkspaceLeftRightMarginPx",
+                desiredWorkspaceLeftRightMarginPx));
+
+        writer.println(prefix + pxToDpStr("allAppsIconSizePx", allAppsIconSizePx));
+        writer.println(prefix + pxToDpStr("allAppsIconTextSizePx", allAppsIconTextSizePx));
+        writer.println(prefix + pxToDpStr("allAppsIconDrawablePaddingPx",
+                allAppsIconDrawablePaddingPx));
+        writer.println(prefix + pxToDpStr("allAppsCellHeightPx", allAppsCellHeightPx));
+
+        writer.println(prefix + pxToDpStr("hotseatBarSizePx", hotseatBarSizePx));
+        writer.println(prefix + pxToDpStr("hotseatCellHeightPx", hotseatCellHeightPx));
+        writer.println(prefix + pxToDpStr("hotseatBarTopPaddingPx", hotseatBarTopPaddingPx));
+        writer.println(prefix + pxToDpStr("hotseatBarBottomPaddingPx", hotseatBarBottomPaddingPx));
+        writer.println(prefix + pxToDpStr("hotseatBarSidePaddingStartPx",
+                hotseatBarSidePaddingStartPx));
+        writer.println(prefix + pxToDpStr("hotseatBarSidePaddingEndPx",
+                hotseatBarSidePaddingEndPx));
+
+        writer.println(prefix + "\tisTaskbarPresent:" + isTaskbarPresent);
+
+        writer.println(prefix + pxToDpStr("taskbarSize", taskbarSize));
+        writer.println(prefix + pxToDpStr("nonOverlappingTaskbarInset",
+                nonOverlappingTaskbarInset));
+
+        writer.println(prefix + pxToDpStr("workspacePadding.left", workspacePadding.left));
+        writer.println(prefix + pxToDpStr("workspacePadding.top", workspacePadding.top));
+        writer.println(prefix + pxToDpStr("workspacePadding.right", workspacePadding.right));
+        writer.println(prefix + pxToDpStr("workspacePadding.bottom", workspacePadding.bottom));
+
+        writer.println(prefix + pxToDpStr("extraSpace", extraSpace));
+        writer.println(prefix + pxToDpStr("workspaceTopPadding", workspaceTopPadding));
+        writer.println(prefix + pxToDpStr("workspaceBottomPadding", workspaceBottomPadding));
+        writer.println(prefix + pxToDpStr("extraHotseatBottomPadding", extraHotseatBottomPadding));
+    }
+
     private static Context getContext(Context c, Info info, int orientation) {
         Configuration config = new Configuration(c.getResources().getConfiguration());
         config.orientation = orientation;
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index c57f62171e..89c0f6697e 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2634,6 +2634,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         mDragLayer.dump(prefix, writer);
         mStateManager.dump(prefix, writer);
         mPopupDataProvider.dump(prefix, writer);
+        mDeviceProfile.dump(prefix, writer);
 
         try {
             FileLog.flushAll(writer);
-- 
GitLab


From 01554536a952d66bafedc6c5909423e07eda99c1 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Wed, 17 Mar 2021 12:11:24 -0400
Subject: [PATCH 0691/1664] Snap to destination page before animating folder
 close.

This ensures the X page animation runs in the preview.

Bug: 175329686
Test: Scroll to 2nd page, and close folder before scroll finishes
Change-Id: Id4820a212dcc945b0134b79f3d42c68954b17275
---
 src/com/android/launcher3/folder/Folder.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index bcb3a54ef3..471f6715c6 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -741,6 +741,10 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         if (mIsAnimatingClosed) {
             return;
         }
+
+        mContent.completePendingPageChanges();
+        mContent.snapToPageImmediately(mContent.getDestinationPage());
+
         if (mCurrentAnimator != null && mCurrentAnimator.isRunning()) {
             mCurrentAnimator.cancel();
         }
-- 
GitLab


From d5347045d00feb7717e3d33f2e9ef9134bae46c8 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 2 Mar 2021 14:49:42 -0800
Subject: [PATCH 0692/1664] Using recents animation and swipe handler for
 3-button mode

Bug: 181165935
Test: Manual

Change-Id: I7fe586319e4dde1a1b398a0c75896c4dfdb75862
---
 .../android/quickstep/AbsSwipeUpHandler.java  |  20 +-
 .../AppToOverviewAnimationProvider.java       | 180 ---------
 .../quickstep/FallbackActivityInterface.java  |   2 +-
 .../quickstep/LauncherActivityInterface.java  |   3 +-
 .../quickstep/OverviewCommandHelper.java      | 348 +++++++++---------
 .../RecentsAnimationDeviceState.java          |  14 +-
 .../quickstep/TouchInteractionService.java    |  46 ++-
 .../OtherActivityInputConsumer.java           |   8 +-
 .../android/quickstep/views/RecentsView.java  |  23 --
 9 files changed, 242 insertions(+), 402 deletions(-)
 delete mode 100644 quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index a2f15f5ff3..6da2201dc9 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -48,6 +48,7 @@ import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;
 import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 import static com.android.quickstep.views.RecentsView.RECENTS_GRID_PROGRESS;
 import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD;
+import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME;
 
 import android.animation.Animator;
@@ -616,7 +617,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         final boolean passed = mCurrentShift.value >= MIN_PROGRESS_FOR_OVERVIEW;
         if (passed != mPassedOverviewThreshold) {
             mPassedOverviewThreshold = passed;
-            if (!mDeviceState.isFullyGesturalNavMode()) {
+            if (!mDeviceState.isTwoButtonNavMode()) {
                 performHapticFeedback();
             }
         }
@@ -722,6 +723,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
 
     @UiThread
     public void onGestureStarted(boolean isLikelyToStartNewTask) {
+        mActivityInterface.closeOverlay();
+        TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
+
         if (mRecentsView != null) {
             InteractionJankMonitorWrapper.begin(mRecentsView,
                     InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH, 2000 /* ms timeout */);
@@ -849,6 +853,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
 
     private GestureEndTarget calculateEndTarget(PointF velocity, float endVelocity, boolean isFling,
             boolean isCancel) {
+        if (mDeviceState.isButtonNavMode()) {
+            // Button mode, this is only used to go to recents
+            return RECENTS;
+        }
         final GestureEndTarget endTarget;
         final boolean goingToNewTask;
         if (mRecentsView != null) {
@@ -953,15 +961,20 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         } else if (endTarget == RECENTS) {
             if (mRecentsView != null) {
                 int nearestPage = mRecentsView.getDestinationPage();
+                boolean isScrolling = false;
                 if (mRecentsView.getNextPage() != nearestPage) {
                     // We shouldn't really scroll to the next page when swiping up to recents.
                     // Only allow settling on the next page if it's nearest to the center.
                     mRecentsView.snapToPage(nearestPage, Math.toIntExact(duration));
+                    isScrolling = true;
                 }
                 if (mRecentsView.getScroller().getDuration() > MAX_SWIPE_DURATION) {
                     mRecentsView.snapToPage(mRecentsView.getNextPage(), (int) MAX_SWIPE_DURATION);
+                    isScrolling = true;
+                }
+                if (!mDeviceState.isButtonNavMode() || isScrolling) {
+                    duration = Math.max(duration, mRecentsView.getScroller().getDuration());
                 }
-                duration = Math.max(duration, mRecentsView.getScroller().getDuration());
             }
         }
 
@@ -1764,7 +1777,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
 
     public interface Factory {
 
-        AbsSwipeUpHandler newHandler(
-                GestureState gestureState, long touchTimeMs, boolean continuingLastGesture);
+        AbsSwipeUpHandler newHandler(GestureState gestureState, long touchTimeMs);
     }
 }
diff --git a/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java b/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java
deleted file mode 100644
index d159fa0904..0000000000
--- a/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.quickstep;
-
-import static com.android.launcher3.LauncherState.BACKGROUND_APP;
-import static com.android.launcher3.LauncherState.OVERVIEW;
-import static com.android.launcher3.anim.Interpolators.TOUCH_RESPONSE_INTERPOLATOR;
-import static com.android.launcher3.anim.Interpolators.clampToProgress;
-import static com.android.launcher3.statehandlers.DepthController.DEPTH;
-import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_CLOSING;
-
-import android.animation.Animator;
-import android.animation.AnimatorSet;
-import android.app.ActivityManager.RunningTaskInfo;
-import android.util.Log;
-import android.view.animation.Interpolator;
-
-import com.android.launcher3.AbstractFloatingView;
-import com.android.launcher3.anim.AnimationSuccessListener;
-import com.android.launcher3.anim.PendingAnimation;
-import com.android.launcher3.statehandlers.DepthController;
-import com.android.launcher3.statemanager.StatefulActivity;
-import com.android.launcher3.taskbar.TaskbarController;
-import com.android.quickstep.util.RemoteAnimationProvider;
-import com.android.quickstep.util.SurfaceTransactionApplier;
-import com.android.quickstep.util.TaskViewSimulator;
-import com.android.quickstep.util.TransformParams;
-import com.android.quickstep.views.RecentsView;
-import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
-
-/**
- * Provider for the atomic (for 3-button mode) remote window animation from the app to the overview.
- *
- * @param <T> activity that contains the overview
- */
-final class AppToOverviewAnimationProvider<T extends StatefulActivity<?>> extends
-        RemoteAnimationProvider {
-
-    private static final long RECENTS_LAUNCH_DURATION = 250;
-    private static final String TAG = "AppToOverviewAnimationProvider";
-
-    private final BaseActivityInterface<?, T> mActivityInterface;
-    // The id of the currently running task that is transitioning to overview.
-    private final RunningTaskInfo mTargetTask;
-    private final RecentsAnimationDeviceState mDeviceState;
-
-    private T mActivity;
-    private RecentsView mRecentsView;
-
-    AppToOverviewAnimationProvider(
-            BaseActivityInterface<?, T> activityInterface, RunningTaskInfo targetTask,
-            RecentsAnimationDeviceState deviceState) {
-        mActivityInterface = activityInterface;
-        mTargetTask = targetTask;
-        mDeviceState = deviceState;
-    }
-
-    /**
-     * Callback for when the activity is ready/initialized.
-     *
-     * @param activity the activity that is ready
-     * @param wasVisible true if it was visible before
-     */
-    boolean onActivityReady(T activity, Boolean wasVisible) {
-        activity.<RecentsView>getOverviewPanel().showCurrentTask(mTargetTask);
-        AbstractFloatingView.closeAllOpenViews(activity, wasVisible);
-        BaseActivityInterface.AnimationFactory factory = mActivityInterface.prepareRecentsUI(
-                mDeviceState,
-                wasVisible, (controller) -> {
-                    controller.getNormalController().dispatchOnStart();
-                    controller.getNormalController().getAnimationPlayer().end();
-                });
-        factory.createActivityInterface(RECENTS_LAUNCH_DURATION);
-        factory.setRecentsAttachedToAppWindow(true, false);
-        mActivity = activity;
-        mRecentsView = mActivity.getOverviewPanel();
-        return false;
-    }
-
-    /**
-     * Create remote window animation from the currently running app to the overview panel.
-     *
-     * @param appTargets the target apps
-     * @return animation from app to overview
-     */
-    @Override
-    public AnimatorSet createWindowAnimation(RemoteAnimationTargetCompat[] appTargets,
-            RemoteAnimationTargetCompat[] wallpaperTargets) {
-        PendingAnimation pa = new PendingAnimation(RECENTS_LAUNCH_DURATION);
-        if (mActivity == null) {
-            Log.e(TAG, "Animation created, before activity");
-            return pa.buildAnim();
-        }
-
-        mRecentsView.setRunningTaskIconScaledDown(true);
-        pa.addListener(new AnimationSuccessListener() {
-            @Override
-            public void onAnimationSuccess(Animator animator) {
-                mActivityInterface.onSwipeUpToRecentsComplete();
-                mRecentsView.animateUpRunningTaskIconScale();
-            }
-        });
-
-        DepthController depthController = mActivityInterface.getDepthController();
-        if (depthController != null) {
-            pa.addFloat(depthController, DEPTH, BACKGROUND_APP.getDepth(mActivity),
-                    OVERVIEW.getDepth(mActivity), TOUCH_RESPONSE_INTERPOLATOR);
-        }
-
-        TaskbarController taskbarController = mActivityInterface.getTaskbarController();
-        if (taskbarController != null) {
-            pa.add(taskbarController.createAnimToLauncher(OVERVIEW, getRecentsLaunchDuration()));
-        }
-
-        RemoteAnimationTargets targets = new RemoteAnimationTargets(appTargets,
-                wallpaperTargets, MODE_CLOSING);
-
-        // Use the top closing app to determine the insets for the animation
-        RemoteAnimationTargetCompat runningTaskTarget = mTargetTask == null ? null
-                : targets.findTask(mTargetTask.taskId);
-        if (runningTaskTarget == null) {
-            Log.e(TAG, "No closing app");
-            return pa.buildAnim();
-        }
-
-        TaskViewSimulator tsv = new TaskViewSimulator(mActivity, mRecentsView.getSizeStrategy());
-        tsv.setDp(mActivity.getDeviceProfile());
-        tsv.setOrientationState(mRecentsView.getPagedViewOrientedState());
-        tsv.setPreview(runningTaskTarget);
-
-        TransformParams params = new TransformParams()
-                .setTargetSet(targets)
-                .setSyncTransactionApplier(new SurfaceTransactionApplier(mActivity.getRootView()));
-
-        AnimatedFloat recentsAlpha = new AnimatedFloat(() -> { });
-        params.setBaseBuilderProxy((builder, app, p)
-                -> builder.withAlpha(recentsAlpha.value));
-
-        Interpolator taskInterpolator;
-        if (targets.isAnimatingHome()) {
-            params.setHomeBuilderProxy((builder, app, p) -> builder.withAlpha(1 - p.getProgress()));
-
-            taskInterpolator = TOUCH_RESPONSE_INTERPOLATOR;
-            pa.addFloat(recentsAlpha, AnimatedFloat.VALUE, 0, 1, TOUCH_RESPONSE_INTERPOLATOR);
-        } else {
-            // When animation from app to recents, the recents layer is drawn on top of the app. To
-            // prevent the overlap, we animate the task first and then quickly fade in the recents.
-            taskInterpolator = clampToProgress(TOUCH_RESPONSE_INTERPOLATOR, 0, 0.8f);
-            pa.addFloat(recentsAlpha, AnimatedFloat.VALUE, 0, 1,
-                    clampToProgress(TOUCH_RESPONSE_INTERPOLATOR, 0.8f, 1));
-        }
-
-        pa.addFloat(params, TransformParams.PROGRESS, 0, 1, taskInterpolator);
-        tsv.addAppToOverviewAnim(pa, taskInterpolator);
-        pa.addOnFrameCallback(() -> tsv.apply(params));
-        return pa.buildAnim();
-    }
-
-    /**
-     * Get duration of animation from app to overview.
-     *
-     * @return duration of animation
-     */
-    long getRecentsLaunchDuration() {
-        return RECENTS_LAUNCH_DURATION;
-    }
-}
diff --git a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
index bffe3a1498..e13d1a4511 100644
--- a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
@@ -105,7 +105,7 @@ public final class FallbackActivityInterface extends
     @Override
     public RecentsView getVisibleRecentsView() {
         RecentsActivity activity = getCreatedActivity();
-        if (activity != null && activity.hasWindowFocus()) {
+        if (activity != null && activity.hasBeenResumed()) {
             return activity.getOverviewPanel();
         }
         return null;
diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
index ca5765e469..98b96b2c6c 100644
--- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
@@ -177,7 +177,7 @@ public final class LauncherActivityInterface extends
     @UiThread
     private Launcher getVisibleLauncher() {
         Launcher launcher = getCreatedActivity();
-        return (launcher != null) && launcher.isStarted() && launcher.hasWindowFocus()
+        return (launcher != null) && launcher.isStarted() && launcher.hasBeenResumed()
                 ? launcher : null;
     }
 
@@ -188,6 +188,7 @@ public final class LauncherActivityInterface extends
             return false;
         }
 
+        closeOverlay();
         launcher.getStateManager().goToState(OVERVIEW,
                 launcher.getStateManager().shouldAnimateStateChange(), onCompleteCallback);
         return true;
diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
index 63fdd0b554..923d4f1e40 100644
--- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
@@ -16,29 +16,28 @@
 package com.android.quickstep;
 
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
+import static com.android.quickstep.util.ActiveGestureLog.INTENT_EXTRA_LOG_TRACE_ID;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
 import android.annotation.TargetApi;
-import android.content.Context;
+import android.content.Intent;
+import android.graphics.PointF;
 import android.os.Build;
 import android.os.SystemClock;
 import android.os.Trace;
-import android.view.ViewConfiguration;
 
 import androidx.annotation.BinderThread;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
 
 import com.android.launcher3.statemanager.StatefulActivity;
-import com.android.quickstep.util.ActivityInitListener;
-import com.android.quickstep.util.RemoteAnimationProvider;
+import com.android.launcher3.util.RunnableList;
+import com.android.quickstep.RecentsAnimationCallbacks.RecentsAnimationListener;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
-import com.android.systemui.shared.system.ActivityManagerWrapper;
+import com.android.systemui.shared.recents.model.ThumbnailData;
 import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
-import com.android.systemui.shared.system.LatencyTrackerCompat;
-import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
+
+import java.util.ArrayList;
 
 /**
  * Helper class to handle various atomic commands for switching between Overview.
@@ -46,66 +45,191 @@ import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 @TargetApi(Build.VERSION_CODES.P)
 public class OverviewCommandHelper {
 
-    private final Context mContext;
-    private final RecentsAnimationDeviceState mDeviceState;
-    private final OverviewComponentObserver mOverviewComponentObserver;
+    public static final int TYPE_SHOW = 1;
+    public static final int TYPE_SHOW_NEXT_FOCUS = 2;
+    public static final int TYPE_HIDE = 3;
+    public static final int TYPE_TOGGLE = 4;
 
-    private long mLastToggleTime;
+    private static final String TRANSITION_NAME = "Transition:toOverview";
 
-    public OverviewCommandHelper(Context context, RecentsAnimationDeviceState deviceState,
-            OverviewComponentObserver observer) {
-        mContext = context;
-        mDeviceState = deviceState;
+    private final TouchInteractionService mService;
+    private final OverviewComponentObserver mOverviewComponentObserver;
+    private final TaskAnimationManager mTaskAnimationManager;
+    private final ArrayList<CommandInfo> mPendingCommands = new ArrayList<>();
+
+    public OverviewCommandHelper(TouchInteractionService service,
+            OverviewComponentObserver observer,
+            TaskAnimationManager taskAnimationManager) {
+        mService = service;
         mOverviewComponentObserver = observer;
+        mTaskAnimationManager = taskAnimationManager;
     }
 
-    @BinderThread
-    public void onOverviewToggle() {
-        // If currently screen pinning, do not enter overview
-        if (mDeviceState.isScreenPinningActive()) {
-            return;
+    /**
+     * Called when the command finishes execution.
+     */
+    private void scheduleNextTask(CommandInfo command) {
+        if (!mPendingCommands.isEmpty() && mPendingCommands.get(0) == command) {
+            mPendingCommands.remove(0);
+            executeNext();
         }
+    }
 
-        TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
-        MAIN_EXECUTOR.execute(new RecentsActivityCommand<>());
+    /**
+     * Executes the next command from the queue. If the command finishes immediately (returns true),
+     * it continues to execute the next command, until the queue is empty of a command defer's its
+     * completion (returns false).
+     */
+    @UiThread
+    private void executeNext() {
+        if (mPendingCommands.isEmpty()) {
+            return;
+        }
+        CommandInfo cmd = mPendingCommands.get(0);
+        if (executeCommand(cmd)) {
+            scheduleNextTask(cmd);
+        }
     }
 
-    @BinderThread
-    public void onOverviewShown(boolean triggeredFromAltTab) {
-        if (triggeredFromAltTab) {
-            TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
+    @UiThread
+    private void addCommand(CommandInfo cmd) {
+        boolean wasEmpty = mPendingCommands.isEmpty();
+        mPendingCommands.add(cmd);
+        if (wasEmpty) {
+            executeNext();
         }
-        MAIN_EXECUTOR.execute(new ShowRecentsCommand(triggeredFromAltTab));
     }
 
+    /**
+     * Adds a command to be executed next, after all pending tasks are completed
+     */
     @BinderThread
-    public void onOverviewHidden() {
-        MAIN_EXECUTOR.execute(new HideRecentsCommand());
+    public void addCommand(int type) {
+        CommandInfo cmd = new CommandInfo(type);
+        MAIN_EXECUTOR.execute(() -> addCommand(cmd));
     }
 
-    private class ShowRecentsCommand extends RecentsActivityCommand {
+    private TaskView getNextTask(RecentsView view) {
+        final TaskView runningTaskView = view.getRunningTaskView();
 
-        private final boolean mTriggeredFromAltTab;
+        if (runningTaskView == null) {
+            return view.getTaskViewCount() > 0 ? view.getTaskViewAt(0) : null;
+        } else {
+            final TaskView nextTask = view.getNextTaskView();
+            return nextTask != null ? nextTask : runningTaskView;
+        }
+    }
 
-        ShowRecentsCommand(boolean triggeredFromAltTab) {
-            mTriggeredFromAltTab = triggeredFromAltTab;
+    private boolean launchTask(RecentsView recents, @Nullable TaskView taskView, CommandInfo cmd) {
+        RunnableList callbackList = null;
+        if (taskView != null) {
+            taskView.setEndQuickswitchCuj(true);
+            callbackList = taskView.launchTaskAnimated();
         }
 
-        @Override
-        protected boolean handleCommand(long elapsedTime) {
-            // TODO: Go to the next page if started from alt-tab.
-            return mActivityInterface.getVisibleRecentsView() != null;
+        if (callbackList != null) {
+            callbackList.add(() -> scheduleNextTask(cmd));
+            return false;
+        } else {
+            recents.startHome();
+            return true;
         }
+    }
 
-        @Override
-        protected void onTransitionComplete() {
-            // TODO(b/138729100) This doesn't execute first time launcher is run
-            if (mTriggeredFromAltTab) {
-                RecentsView rv =  mActivityInterface.getVisibleRecentsView();
-                if (rv == null) {
-                    return;
+    /**
+     * Executes the task and returns true if next task can be executed. If false, then the next
+     * task is deferred until {@link #scheduleNextTask} is called
+     */
+    private <T extends StatefulActivity<?>> boolean executeCommand(CommandInfo cmd) {
+        BaseActivityInterface<?, T> activityInterface =
+                mOverviewComponentObserver.getActivityInterface();
+        RecentsView recents = activityInterface.getVisibleRecentsView();
+        if (recents == null) {
+            if (cmd.type == TYPE_HIDE) {
+                // already hidden
+                return true;
+            }
+        } else {
+            switch (cmd.type) {
+                case TYPE_SHOW:
+                    // already visible
+                    return true;
+                case TYPE_HIDE: {
+                    int currentPage = recents.getNextPage();
+                    TaskView tv = (currentPage >= 0 && currentPage < recents.getTaskViewCount())
+                            ? (TaskView) recents.getPageAt(currentPage)
+                            : null;
+                    return launchTask(recents, tv, cmd);
                 }
+                case TYPE_TOGGLE:
+                    return launchTask(recents, getNextTask(recents), cmd);
+            }
+        }
+
+        if (activityInterface.switchToRecentsIfVisible(() -> scheduleNextTask(cmd))) {
+            // If successfully switched, wait until animation finishes
+            return false;
+        }
+
+        final T activity = activityInterface.getCreatedActivity();
+        if (activity != null) {
+            InteractionJankMonitorWrapper.begin(
+                    activity.getRootView(),
+                    InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH);
+        }
+
+        GestureState gestureState = mService.createGestureState(GestureState.DEFAULT_STATE);
+        AbsSwipeUpHandler interactionHandler = mService.getSwipeUpHandlerFactory()
+                .newHandler(gestureState, cmd.createTime);
+        interactionHandler.setGestureEndCallback(
+                () -> onTransitionComplete(cmd, interactionHandler));
+
+        Intent intent = new Intent(interactionHandler.getLaunchIntent());
+        interactionHandler.initWhenReady(intent);
+
+        RecentsAnimationListener recentAnimListener = new RecentsAnimationListener() {
+            @Override
+            public void onRecentsAnimationStart(RecentsAnimationController controller,
+                    RecentsAnimationTargets targets) {
+                interactionHandler.onGestureEnded(0, new PointF(), new PointF());
+                cmd.removeListener(this);
+            }
+
+            @Override
+            public void onRecentsAnimationCanceled(ThumbnailData thumbnailData) {
+                interactionHandler.onGestureCancelled();
+                cmd.removeListener(this);
+            }
+        };
+
+        if (mTaskAnimationManager.isRecentsAnimationRunning()) {
+            cmd.mActiveCallbacks = mTaskAnimationManager.continueRecentsAnimation(gestureState);
+            cmd.mActiveCallbacks.addListener(interactionHandler);
+            mTaskAnimationManager.notifyRecentsAnimationState(interactionHandler);
+            interactionHandler.onGestureStarted(true /*isLikelyToStartNewTask*/);
+
+            cmd.mActiveCallbacks.addListener(recentAnimListener);
+            mTaskAnimationManager.notifyRecentsAnimationState(recentAnimListener);
+        } else {
+            intent.putExtra(INTENT_EXTRA_LOG_TRACE_ID, gestureState.getGestureId());
+            cmd.mActiveCallbacks = mTaskAnimationManager.startRecentsAnimation(
+                    gestureState, intent, interactionHandler);
+            interactionHandler.onGestureStarted(false /*isLikelyToStartNewTask*/);
+            cmd.mActiveCallbacks.addListener(recentAnimListener);
+        }
+
+        Trace.beginAsyncSection(TRANSITION_NAME, 0);
+        return false;
+    }
+
+    private void onTransitionComplete(CommandInfo cmd, AbsSwipeUpHandler handler) {
+        cmd.removeListener(handler);
+        Trace.endAsyncSection(TRANSITION_NAME, 0);
 
+        if (cmd.type == TYPE_SHOW_NEXT_FOCUS) {
+            RecentsView rv =
+                    mOverviewComponentObserver.getActivityInterface().getVisibleRecentsView();
+            if (rv != null) {
                 // Ensure that recents view has focus so that it receives the followup key inputs
                 TaskView taskView = rv.getNextTaskView();
                 if (taskView == null) {
@@ -120,130 +244,22 @@ public class OverviewCommandHelper {
                 }
             }
         }
+        scheduleNextTask(cmd);
     }
 
-    private class HideRecentsCommand extends RecentsActivityCommand {
+    private static class CommandInfo {
+        public final long createTime = SystemClock.elapsedRealtime();
+        public final int type;
+        RecentsAnimationCallbacks mActiveCallbacks;
 
-        @Override
-        protected boolean handleCommand(long elapsedTime) {
-            RecentsView recents = mActivityInterface.getVisibleRecentsView();
-            if (recents == null) {
-                return false;
-            }
-            int currentPage = recents.getNextPage();
-            if (currentPage >= 0 && currentPage < recents.getTaskViewCount()) {
-                ((TaskView) recents.getPageAt(currentPage)).launchTaskAnimated();
-            } else {
-                recents.startHome();
-            }
-            return true;
-        }
-    }
-
-    private class RecentsActivityCommand<T extends StatefulActivity<?>> implements Runnable {
-
-        private static final String TRANSITION_NAME = "Transition:toOverview";
-        protected final BaseActivityInterface<?, T> mActivityInterface;
-        private final long mCreateTime;
-        private final AppToOverviewAnimationProvider<T> mAnimationProvider;
-
-        private final long mToggleClickedTime = SystemClock.uptimeMillis();
-        private ActivityInitListener mListener;
-
-        public RecentsActivityCommand() {
-            mActivityInterface = mOverviewComponentObserver.getActivityInterface();
-            mCreateTime = SystemClock.elapsedRealtime();
-            mAnimationProvider = new AppToOverviewAnimationProvider<>(mActivityInterface,
-                    ActivityManagerWrapper.getInstance().getRunningTask(), mDeviceState);
-
-            // Preload the plan
-            RecentsModel.INSTANCE.get(mContext).getTasks(null);
-        }
-
-        @Override
-        public void run() {
-            long elapsedTime = mCreateTime - mLastToggleTime;
-            mLastToggleTime = mCreateTime;
-
-            if (handleCommand(elapsedTime)) {
-                // Command already handled.
-                return;
-            }
-
-            if (mActivityInterface.switchToRecentsIfVisible(this::onTransitionComplete)) {
-                // If successfully switched, then return
-                return;
-            }
-
-            final T activity = mActivityInterface.getCreatedActivity();
-            if (activity != null) {
-                InteractionJankMonitorWrapper.begin(
-                        activity.getRootView(),
-                        InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH);
-            }
-
-            // Otherwise, start overview.
-            mListener = mActivityInterface.createActivityInitListener(this::onActivityReady);
-            mListener.registerAndStartActivity(mOverviewComponentObserver.getOverviewIntent(),
-                    new RemoteAnimationProvider() {
-                        @Override
-                        public AnimatorSet createWindowAnimation(
-                                RemoteAnimationTargetCompat[] appTargets,
-                                RemoteAnimationTargetCompat[] wallpaperTargets) {
-                            return RecentsActivityCommand.this.createWindowAnimation(appTargets,
-                                    wallpaperTargets);
-                        }
-                    }, mContext, MAIN_EXECUTOR.getHandler(),
-                    mAnimationProvider.getRecentsLaunchDuration());
+        CommandInfo(int type) {
+            this.type = type;
         }
 
-        protected boolean handleCommand(long elapsedTime) {
-            // TODO: We need to fix this case with PIP, when an activity first enters PIP, it shows
-            //       the menu activity which takes window focus, preventing the right condition from
-            //       being run below
-            RecentsView recents = mActivityInterface.getVisibleRecentsView();
-            if (recents != null) {
-                // Launch the next task
-                recents.showNextTask();
-                return true;
-            } else if (elapsedTime < ViewConfiguration.getDoubleTapTimeout()) {
-                // The user tried to launch back into overview too quickly, either after
-                // launching an app, or before overview has actually shown, just ignore for now
-                return true;
+        void removeListener(RecentsAnimationListener listener) {
+            if (mActiveCallbacks != null) {
+                mActiveCallbacks.removeListener(listener);
             }
-            return false;
-        }
-
-        private boolean onActivityReady(Boolean wasVisible) {
-            final T activity = mActivityInterface.getCreatedActivity();
-            return mAnimationProvider.onActivityReady(activity, wasVisible);
         }
-
-        private AnimatorSet createWindowAnimation(RemoteAnimationTargetCompat[] appTargets,
-                RemoteAnimationTargetCompat[] wallpaperTargets) {
-            LatencyTrackerCompat.logToggleRecents(
-                    mContext, (int) (SystemClock.uptimeMillis() - mToggleClickedTime));
-
-            mListener.unregister();
-
-            AnimatorSet animatorSet = mAnimationProvider.createWindowAnimation(appTargets,
-                    wallpaperTargets);
-            animatorSet.addListener(new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationStart(Animator animation) {
-                    Trace.beginAsyncSection(TRANSITION_NAME, 0);
-                    super.onAnimationStart(animation);
-                }
-
-                @Override
-                public void onAnimationEnd(Animator animation) {
-                    onTransitionComplete();
-                    Trace.endAsyncSection(TRANSITION_NAME, 0);
-                }
-            });
-            return animatorSet;
-        }
-
-        protected void onTransitionComplete() { }
     }
 }
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index f99b7e6af4..458f45a75d 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -17,12 +17,13 @@ package com.android.quickstep;
 
 import static android.content.Intent.ACTION_USER_UNLOCKED;
 
-import static com.android.launcher3.util.SettingsCache.ONE_HANDED_ENABLED;
-import static com.android.launcher3.util.SettingsCache.ONE_HANDED_SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED;
 import static com.android.launcher3.util.DisplayController.DisplayHolder.CHANGE_ALL;
 import static com.android.launcher3.util.DisplayController.DisplayHolder.CHANGE_FRAME_DELAY;
+import static com.android.launcher3.util.SettingsCache.ONE_HANDED_ENABLED;
+import static com.android.launcher3.util.SettingsCache.ONE_HANDED_SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED;
 import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
 import static com.android.quickstep.SysUINavigationMode.Mode.THREE_BUTTONS;
+import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_CLICKABLE;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY;
@@ -60,11 +61,11 @@ import androidx.annotation.BinderThread;
 
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.util.SettingsCache;
 import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.DisplayController.DisplayHolder;
 import com.android.launcher3.util.DisplayController.DisplayInfoChangeListener;
 import com.android.launcher3.util.DisplayController.Info;
+import com.android.launcher3.util.SettingsCache;
 import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;
 import com.android.quickstep.SysUINavigationMode.OneHandedModeChangeListener;
 import com.android.quickstep.util.NavBarPosition;
@@ -303,6 +304,13 @@ public class RecentsAnimationDeviceState implements
         return mMode.hasGestures;
     }
 
+    /**
+     * @return whether the current nav mode is 2-button-based.
+     */
+    public boolean isTwoButtonNavMode() {
+        return mMode == TWO_BUTTONS;
+    }
+
     /**
      * @return whether the current nav mode is button-based.
      */
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index fc805d0794..8e6f663bed 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -24,6 +24,7 @@ import static com.android.launcher3.config.FeatureFlags.ASSISTANT_GIVES_LAUNCHER
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.quickstep.GestureState.DEFAULT_STATE;
 import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
+import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
 import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SYSUI_PROXY;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_TRACING_ENABLED;
 
@@ -157,13 +158,23 @@ public class TouchInteractionService extends Service implements PluginListener<O
         @BinderThread
         public void onOverviewToggle() {
             TestLogging.recordEvent(TestProtocol.SEQUENCE_MAIN, "onOverviewToggle");
-            mOverviewCommandHelper.onOverviewToggle();
+            // If currently screen pinning, do not enter overview
+            if (mDeviceState.isScreenPinningActive()) {
+                return;
+            }
+            TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
+            mOverviewCommandHelper.addCommand(OverviewCommandHelper.TYPE_TOGGLE);
         }
 
         @BinderThread
         @Override
         public void onOverviewShown(boolean triggeredFromAltTab) {
-            mOverviewCommandHelper.onOverviewShown(triggeredFromAltTab);
+            if (triggeredFromAltTab) {
+                TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
+                mOverviewCommandHelper.addCommand(OverviewCommandHelper.TYPE_SHOW_NEXT_FOCUS);
+            } else {
+                mOverviewCommandHelper.addCommand(OverviewCommandHelper.TYPE_SHOW);
+            }
         }
 
         @BinderThread
@@ -171,7 +182,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
         public void onOverviewHidden(boolean triggeredFromAltTab, boolean triggeredFromHomeKey) {
             if (triggeredFromAltTab && !triggeredFromHomeKey) {
                 // onOverviewShownFromAltTab hides the overview and ends at the target app
-                mOverviewCommandHelper.onOverviewHidden();
+                mOverviewCommandHelper.addCommand(OverviewCommandHelper.TYPE_HIDE);
             }
         }
 
@@ -326,8 +337,8 @@ public class TouchInteractionService extends Service implements PluginListener<O
     public void onUserUnlocked() {
         mTaskAnimationManager = new TaskAnimationManager(this);
         mOverviewComponentObserver = new OverviewComponentObserver(this, mDeviceState);
-        mOverviewCommandHelper = new OverviewCommandHelper(this, mDeviceState,
-                mOverviewComponentObserver);
+        mOverviewCommandHelper = new OverviewCommandHelper(this,
+                mOverviewComponentObserver, mTaskAnimationManager);
         mResetGestureInputConsumer = new ResetGestureInputConsumer(mTaskAnimationManager);
         mInputConsumer = InputConsumerController.getRecentsAnimationInputConsumer();
         mInputConsumer.registerInputConsumer();
@@ -555,7 +566,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
         ProtoTracer.INSTANCE.get(this).scheduleFrameUpdate();
     }
 
-    private GestureState createGestureState(GestureState previousGestureState) {
+    public GestureState createGestureState(GestureState previousGestureState) {
         GestureState gestureState = new GestureState(mOverviewComponentObserver,
                 ActiveGestureLog.INSTANCE.generateAndSetLogId());
         if (mTaskAnimationManager.isRecentsAnimationRunning()) {
@@ -704,16 +715,15 @@ public class TouchInteractionService extends Service implements PluginListener<O
         }
     }
 
+    public AbsSwipeUpHandler.Factory getSwipeUpHandlerFactory() {
+        return !mOverviewComponentObserver.isHomeAndOverviewSame()
+                ? mFallbackSwipeHandlerFactory : mLauncherSwipeHandlerFactory;
+    }
+
     private InputConsumer createOtherActivityInputConsumer(GestureState gestureState,
             MotionEvent event) {
 
-        final AbsSwipeUpHandler.Factory factory;
-        if (!mOverviewComponentObserver.isHomeAndOverviewSame()) {
-            factory = mFallbackSwipeHandlerFactory;
-        } else {
-            factory = mLauncherSwipeHandlerFactory;
-        }
-
+        final AbsSwipeUpHandler.Factory factory = getSwipeUpHandlerFactory();
         final boolean shouldDefer = !mOverviewComponentObserver.isHomeAndOverviewSame()
                 || gestureState.getActivityInterface().deferStartingActivity(mDeviceState, event);
         final boolean disableHorizontalSwipe = mDeviceState.isInExclusionRegion(event);
@@ -886,15 +896,17 @@ public class TouchInteractionService extends Service implements PluginListener<O
     }
 
     private AbsSwipeUpHandler createLauncherSwipeHandler(
-            GestureState gestureState, long touchTimeMs, boolean continuingLastGesture) {
+            GestureState gestureState, long touchTimeMs) {
         return new LauncherSwipeHandlerV2(this, mDeviceState, mTaskAnimationManager,
-                gestureState, touchTimeMs, continuingLastGesture, mInputConsumer);
+                gestureState, touchTimeMs, mTaskAnimationManager.isRecentsAnimationRunning(),
+                mInputConsumer);
     }
 
     private AbsSwipeUpHandler createFallbackSwipeHandler(
-            GestureState gestureState, long touchTimeMs, boolean continuingLastGesture) {
+            GestureState gestureState, long touchTimeMs) {
         return new FallbackSwipeHandler(this, mDeviceState, mTaskAnimationManager,
-                gestureState, touchTimeMs, continuingLastGesture, mInputConsumer);
+                gestureState, touchTimeMs, mTaskAnimationManager.isRecentsAnimationRunning(),
+                mInputConsumer);
     }
 
     protected boolean shouldNotifyBackGesture() {
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
index 5baf5184b5..9878d4527a 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
@@ -31,7 +31,6 @@ import static com.android.launcher3.util.TraceHelper.FLAG_CHECK_FOR_RACE_CONDITI
 import static com.android.launcher3.util.VelocityUtils.PX_PER_MS;
 import static com.android.quickstep.GestureState.STATE_OVERSCROLL_WINDOW_CREATED;
 import static com.android.quickstep.util.ActiveGestureLog.INTENT_EXTRA_LOG_TRACE_ID;
-import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -65,7 +64,6 @@ import com.android.quickstep.RecentsAnimationCallbacks;
 import com.android.quickstep.RecentsAnimationDeviceState;
 import com.android.quickstep.RotationTouchHelper;
 import com.android.quickstep.TaskAnimationManager;
-import com.android.quickstep.TaskUtils;
 import com.android.quickstep.TouchInteractionService;
 import com.android.quickstep.util.ActiveGestureLog;
 import com.android.quickstep.util.CachedEventDispatcher;
@@ -381,9 +379,6 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
         // Once we detect the gesture, we can enable batching to reduce further updates
         mInputEventReceiver.setBatchingEnabled(true);
 
-        mActivityInterface.closeOverlay();
-        TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
-
         // Notify the handler that the gesture has actually started
         mInteractionHandler.onGestureStarted(isLikelyToStartNewTask);
     }
@@ -391,8 +386,7 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
     private void startTouchTrackingForWindowAnimation(long touchTimeMs) {
         ActiveGestureLog.INSTANCE.addLog("startRecentsAnimation");
 
-        mInteractionHandler = mHandlerFactory.newHandler(mGestureState, touchTimeMs,
-                mTaskAnimationManager.isRecentsAnimationRunning());
+        mInteractionHandler = mHandlerFactory.newHandler(mGestureState, touchTimeMs);
         mInteractionHandler.setGestureEndCallback(this::onInteractionGestureFinished);
         mMotionPauseDetector.setOnMotionPauseListener(mInteractionHandler.getMotionPauseListener());
         Intent intent = new Intent(mInteractionHandler.getLaunchIntent());
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 8f35ea6e65..ce97fdcba5 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1538,29 +1538,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         }
     }
 
-    public void showNextTask() {
-        final TaskView runningTaskView = getRunningTaskView();
-        final TaskView targetTask;
-
-        if (runningTaskView == null) {
-            // Launch the first task
-            if (getTaskViewCount() > 0) {
-                targetTask = getTaskViewAt(0);
-            } else {
-                return;
-            }
-        } else {
-            final TaskView nextTask = getNextTaskView();
-            if (nextTask != null) {
-                targetTask = nextTask;
-            } else {
-                targetTask = runningTaskView;
-            }
-        }
-        targetTask.setEndQuickswitchCuj(true);
-        targetTask.launchTaskAnimated();
-    }
-
     public void setRunningTaskIconScaledDown(boolean isScaledDown) {
         if (mRunningTaskIconScaledDown != isScaledDown) {
             mRunningTaskIconScaledDown = isScaledDown;
-- 
GitLab


From 30dd1d65f61b14892d8b664d809e8a5c5e69d2ae Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 15 Mar 2021 21:45:49 +0000
Subject: [PATCH 0693/1664] Apply local color extraction during drag-n-drop

Test: Drag a test widget around and observe local extract color
      is applied.

Bug: b/182282587, b/182816217
Change-Id: If63a9d91ceb2102d5d913bca85997b8be07b1adf
---
 src/com/android/launcher3/CellLayout.java     |  45 ++++--
 src/com/android/launcher3/Workspace.java      |   4 +
 .../dragndrop/AppWidgetHostViewDrawable.java  |   5 +
 .../android/launcher3/dragndrop/DragView.java |   5 +
 .../widget/LauncherAppWidgetHostView.java     | 149 ++++++++++--------
 .../widget/PendingItemDragHelper.java         |   3 +
 .../AppWidgetHostViewDragListener.java        |  59 +++++++
 7 files changed, 196 insertions(+), 74 deletions(-)
 create mode 100644 src/com/android/launcher3/widget/dragndrop/AppWidgetHostViewDragListener.java

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index b8833cf1a9..cc4bfe8c74 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -60,6 +60,7 @@ import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.accessibility.DragAndDropAccessibilityDelegate;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.config.FeatureFlags;
+import com.android.launcher3.dragndrop.AppWidgetHostViewDrawable;
 import com.android.launcher3.dragndrop.DraggableView;
 import com.android.launcher3.folder.PreviewBackground;
 import com.android.launcher3.graphics.DragPreviewProvider;
@@ -180,6 +181,9 @@ public class CellLayout extends ViewGroup {
     private final ArrayList<View> mIntersectingViews = new ArrayList<>();
     private final Rect mOccupiedRect = new Rect();
     private final int[] mDirectionVector = new int[2];
+    private final Workspace mWorkspace;
+    private final DeviceProfile mDeviceProfile;
+
     final int[] mPreviousReorderDirection = new int[2];
     private static final int INVALID_DIRECTION = -100;
 
@@ -209,15 +213,15 @@ public class CellLayout extends ViewGroup {
         setWillNotDraw(false);
         setClipToPadding(false);
         mActivity = ActivityContext.lookupContext(context);
+        mWorkspace = Launcher.cast(mActivity).getWorkspace();
+        mDeviceProfile = mActivity.getDeviceProfile();
 
-        DeviceProfile grid = mActivity.getDeviceProfile();
-
-        mBorderSpacing = grid.cellLayoutBorderSpacingPx;
+        mBorderSpacing = mDeviceProfile.cellLayoutBorderSpacingPx;
         mCellWidth = mCellHeight = -1;
         mFixedCellWidth = mFixedCellHeight = -1;
 
-        mCountX = grid.inv.numColumns;
-        mCountY = grid.inv.numRows;
+        mCountX = mDeviceProfile.inv.numColumns;
+        mCountY = mDeviceProfile.inv.numRows;
         mOccupied =  new GridOccupancy(mCountX, mCountY);
         mTmpOccupied = new GridOccupancy(mCountX, mCountY);
 
@@ -234,7 +238,7 @@ public class CellLayout extends ViewGroup {
         mBackground.setCallback(this);
         mBackground.setAlpha(0);
 
-        mReorderPreviewAnimationMagnitude = (REORDER_PREVIEW_MAGNITUDE * grid.iconSizePx);
+        mReorderPreviewAnimationMagnitude = (REORDER_PREVIEW_MAGNITUDE * mDeviceProfile.iconSizePx);
 
         // Initialize the data structures used for the drag visualization.
         mEaseOutInterpolator = Interpolators.DEACCEL_2_5; // Quint ease out
@@ -961,15 +965,18 @@ public class CellLayout extends ViewGroup {
         final int oldDragCellX = mDragCell[0];
         final int oldDragCellY = mDragCell[1];
 
-        if (outlineProvider == null || outlineProvider.generatedDragOutline == null) {
-            return;
-        }
-
-        Bitmap dragOutline = outlineProvider.generatedDragOutline;
         if (cellX != oldDragCellX || cellY != oldDragCellY) {
             mDragCell[0] = cellX;
             mDragCell[1] = cellY;
 
+            applyColorExtraction(dragObject, mDragCell, spanX, spanY);
+
+            if (outlineProvider == null || outlineProvider.generatedDragOutline == null) {
+                return;
+            }
+
+            Bitmap dragOutline = outlineProvider.generatedDragOutline;
+
             final int oldIndex = mDragOutlineCurrent;
             mDragOutlineAnims[oldIndex].animateOut();
             mDragOutlineCurrent = (oldIndex + 1) % mDragOutlines.length;
@@ -1011,6 +1018,20 @@ public class CellLayout extends ViewGroup {
         }
     }
 
+    /** Applies the local color extraction to a dragging widget object. */
+    private void applyColorExtraction(DropTarget.DragObject dragObject, int[] targetCell, int spanX,
+            int spanY) {
+        // Apply local extracted color if the DragView is an AppWidgetHostViewDrawable.
+        Drawable drawable = dragObject.dragView.getDrawable();
+        if (drawable instanceof AppWidgetHostViewDrawable) {
+            int screenId = mWorkspace.getIdForScreen(this);
+            int pageId = mWorkspace.getPageIndexForScreenId(screenId);
+            AppWidgetHostViewDrawable hostViewDrawable = ((AppWidgetHostViewDrawable) drawable);
+            cellToRect(targetCell[0], targetCell[1], spanX, spanY, mTempRect);
+            hostViewDrawable.getAppWidgetHostView().handleDrag(mTempRect, pageId);
+        }
+    }
+
     @SuppressLint("StringFormatMatches")
     public String getItemMoveDescription(int cellX, int cellY) {
         if (mContainerType == HOTSEAT) {
@@ -2076,7 +2097,7 @@ public class CellLayout extends ViewGroup {
     private void commitTempPlacement() {
         mTmpOccupied.copyTo(mOccupied);
 
-        int screenId = Launcher.cast(mActivity).getWorkspace().getIdForScreen(this);
+        int screenId = mWorkspace.getIdForScreen(this);
         int container = Favorites.CONTAINER_DESKTOP;
 
         if (mContainerType == HOTSEAT) {
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index d1daac88de..478effe72d 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -111,6 +111,7 @@ import com.android.launcher3.widget.PendingAddShortcutInfo;
 import com.android.launcher3.widget.PendingAddWidgetInfo;
 import com.android.launcher3.widget.PendingAppWidgetHostView;
 import com.android.launcher3.widget.WidgetManagerHelper;
+import com.android.launcher3.widget.dragndrop.AppWidgetHostViewDragListener;
 import com.android.systemui.plugins.shared.LauncherOverlayManager.LauncherOverlay;
 
 import java.util.ArrayList;
@@ -1527,6 +1528,9 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
             }
         }
 
+        if (drawable instanceof AppWidgetHostViewDrawable) {
+            mDragController.addDragListener(new AppWidgetHostViewDragListener(mLauncher));
+        }
         DragView dv = mDragController.startDrag(
                 drawable,
                 draggableView,
diff --git a/src/com/android/launcher3/dragndrop/AppWidgetHostViewDrawable.java b/src/com/android/launcher3/dragndrop/AppWidgetHostViewDrawable.java
index 477bc6e316..92ae670e52 100644
--- a/src/com/android/launcher3/dragndrop/AppWidgetHostViewDrawable.java
+++ b/src/com/android/launcher3/dragndrop/AppWidgetHostViewDrawable.java
@@ -76,4 +76,9 @@ public final class AppWidgetHostViewDrawable extends Drawable {
     public ColorFilter getColorFilter() {
         return mPaint.getColorFilter();
     }
+
+    /** Returns the {@link LauncherAppWidgetHostView}. */
+    public LauncherAppWidgetHostView getAppWidgetHostView() {
+        return mAppWidgetHostView;
+    }
 }
diff --git a/src/com/android/launcher3/dragndrop/DragView.java b/src/com/android/launcher3/dragndrop/DragView.java
index df4d81197a..e2816f4d8c 100644
--- a/src/com/android/launcher3/dragndrop/DragView.java
+++ b/src/com/android/launcher3/dragndrop/DragView.java
@@ -561,6 +561,11 @@ public class DragView extends View implements StateListener<LauncherState> {
         return mInitialScale;
     }
 
+    /** Returns the current {@link Drawable} that is rendered in this view. */
+    public Drawable getDrawable() {
+        return mDrawable;
+    }
+
     private static class SpringFloatValue {
 
         private static final FloatPropertyCompat<SpringFloatValue> VALUE =
diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
index df012959fa..8df70fbf3a 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
@@ -16,7 +16,6 @@
 
 package com.android.launcher3.widget;
 
-import android.app.WallpaperManager;
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
 import android.content.res.Configuration;
@@ -50,6 +49,7 @@ import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.util.Executors;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.BaseDragLayer.TouchCompleteListener;
+import com.android.launcher3.widget.dragndrop.AppWidgetHostViewDragListener;
 
 import java.util.List;
 
@@ -74,7 +74,6 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
     private final CheckLongPressHelper mLongPressHelper;
     protected final Launcher mLauncher;
     private final Workspace mWorkspace;
-    private final WallpaperManager mWallpaperManager;
 
     @ViewDebug.ExportedProperty(category = "launcher")
     private boolean mReinflateOnConfigChange;
@@ -85,10 +84,14 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
     private boolean mIsScrollable;
     private boolean mIsAttachedToWindow;
     private boolean mIsAutoAdvanceRegistered;
+    private boolean mIsInDragMode = false;
     private Runnable mAutoAdvanceRunnable;
     private RectF mLastLocationRegistered = null;
+    @Nullable private AppWidgetHostViewDragListener mDragListener;
+
     // Used to store the widget size during onLayout.
     private final Rect mCurrentWidgetSize = new Rect();
+    private final Rect mWidgetSizeAtDrag = new Rect();
     private final RectF mTempRectF = new RectF();
     private final boolean mIsRtl;
 
@@ -106,7 +109,6 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
             setOnLightBackground(true);
         }
         mIsRtl = Utilities.isRtl(context.getResources());
-        mWallpaperManager = WallpaperManager.getInstance(getContext());
         mColorExtractor = LocalColorExtractor.newInstance(getContext());
         mColorExtractor.setListener(this);
     }
@@ -118,12 +120,16 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         } else {
             super.setColorResources(colors);
         }
+
+        if (mDragListener != null) {
+            mDragListener.onDragContentChanged();
+        }
     }
 
     @Override
     public boolean onLongClick(View view) {
         if (mIsScrollable) {
-            DragLayer dragLayer = Launcher.getLauncher(getContext()).getDragLayer();
+            DragLayer dragLayer = mLauncher.getDragLayer();
             dragLayer.requestDisallowInterceptTouchEvent(false);
         }
         view.performLongClick();
@@ -172,7 +178,7 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
 
     public boolean onInterceptTouchEvent(MotionEvent ev) {
         if (ev.getAction() == MotionEvent.ACTION_DOWN) {
-            DragLayer dragLayer = Launcher.getLauncher(getContext()).getDragLayer();
+            DragLayer dragLayer = mLauncher.getDragLayer();
             if (mIsScrollable) {
                 dragLayer.requestDisallowInterceptTouchEvent(true);
             }
@@ -252,70 +258,89 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
 
         mIsScrollable = checkScrollableRecursively(this);
 
-        mCurrentWidgetSize.left = left;
-        mCurrentWidgetSize.top = top;
-        mCurrentWidgetSize.right = right;
-        mCurrentWidgetSize.bottom = bottom;
-        updateColorExtraction(mCurrentWidgetSize);
+        if (!mIsInDragMode && getTag() instanceof LauncherAppWidgetInfo) {
+            mCurrentWidgetSize.left = left;
+            mCurrentWidgetSize.top = top;
+            mCurrentWidgetSize.right = right;
+            mCurrentWidgetSize.bottom = bottom;
+            LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) getTag();
+            int pageId = mWorkspace.getPageIndexForScreenId(info.screenId);
+            updateColorExtraction(mCurrentWidgetSize, pageId);
+        }
     }
 
-    private void updateColorExtraction(Rect widgetLocation) {
+    /** Starts the drag mode. */
+    public void startDrag(AppWidgetHostViewDragListener dragListener) {
+        mIsInDragMode = true;
+        mDragListener = dragListener;
+    }
+
+    /** Handles a drag event occurred on a workspace page, {@code pageId}. */
+    public void handleDrag(Rect rect, int pageId) {
+        mWidgetSizeAtDrag.set(rect);
+        updateColorExtraction(mWidgetSizeAtDrag, pageId);
+    }
+
+    /** Ends the drag mode. */
+    public void endDrag() {
+        mIsInDragMode = false;
+        mDragListener = null;
+        mWidgetSizeAtDrag.setEmpty();
+        requestLayout();
+    }
+
+    private void updateColorExtraction(Rect widgetLocation, int pageId) {
         // If the widget hasn't been measured and laid out, we cannot do this.
         if (widgetLocation.isEmpty()) {
             return;
         }
-        LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) getTag();
-        if (info != null) {
-            int screenWidth = mLauncher.getDeviceProfile().widthPx;
-            int screenHeight = mLauncher.getDeviceProfile().heightPx;
-            int numScreens = mWorkspace.getNumPagesForWallpaperParallax();
-            int screenId = mIsRtl ? numScreens - info.screenId : info.screenId;
-            float relativeScreenWidth = 1f / numScreens;
-            float absoluteTop = widgetLocation.top;
-            float absoluteBottom = widgetLocation.bottom;
-            for (View v = (View) getParent();
-                    v != null && v.getId() != R.id.launcher;
-                    v = (View) v.getParent()) {
-                absoluteBottom += v.getTop();
-                absoluteTop += v.getTop();
-            }
-            float xOffset = 0;
-            View parentView = (View) getParent();
-            // The layout depends on the orientation.
-            if (getResources().getConfiguration().orientation
-                    == Configuration.ORIENTATION_LANDSCAPE) {
-                xOffset = screenHeight - mWorkspace.getPaddingRight()
-                        - parentView.getWidth();
-            } else {
-                xOffset = mWorkspace.getPaddingLeft() + parentView.getPaddingLeft();
-            }
-            // This is the position of the widget relative to the wallpaper, as expected by the
-            // local color extraction of the WallpaperManager.
-            // The coordinate system is such that, on the horizontal axis, each screen has a
-            // distinct range on the [0,1] segment. So if there are 3 screens, they will have the
-            // ranges [0, 1/3], [1/3, 2/3] and [2/3, 1]. The position on the subrange should be
-            // the position of the widget relative to the screen. For the vertical axis, this is
-            // simply the location of the widget relative to the screen.
-            mTempRectF.left = ((widgetLocation.left + xOffset) / screenWidth + screenId)
-                    * relativeScreenWidth;
-            mTempRectF.right = ((widgetLocation.right + xOffset) / screenWidth + screenId)
-                    * relativeScreenWidth;
-            mTempRectF.top = absoluteTop / screenHeight;
-            mTempRectF.bottom = absoluteBottom / screenHeight;
-            if (mTempRectF.left < 0 || mTempRectF.right > 1 || mTempRectF.top < 0
-                    || mTempRectF.bottom > 1) {
-                Log.e(LOG_TAG, "   Error, invalid relative position");
-                return;
-            }
-            if (!mTempRectF.equals(mLastLocationRegistered)) {
-                if (mLastLocationRegistered != null) {
-                    mColorExtractor.removeLocations();
-                }
-                mLastLocationRegistered = new RectF(mTempRectF);
-                mColorExtractor.addLocation(List.of(mLastLocationRegistered));
-            }
+        int screenWidth = mLauncher.getDeviceProfile().widthPx;
+        int screenHeight = mLauncher.getDeviceProfile().heightPx;
+        int numScreens = mWorkspace.getNumPagesForWallpaperParallax();
+        pageId = mIsRtl ? numScreens - pageId - 1 : pageId;
+        float relativeScreenWidth = 1f / numScreens;
+        float absoluteTop = widgetLocation.top;
+        float absoluteBottom = widgetLocation.bottom;
+        for (View v = (View) getParent();
+                v != null && v.getId() != R.id.launcher;
+                v = (View) v.getParent()) {
+            absoluteBottom += v.getTop();
+            absoluteTop += v.getTop();
+        }
+        float xOffset = 0;
+        View parentView = (View) getParent();
+        // The layout depends on the orientation.
+        if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
+            int parentViewWidth = parentView == null ? 0 : parentView.getWidth();
+            xOffset = screenHeight - mWorkspace.getPaddingRight() - parentViewWidth;
         } else {
-            mColorExtractor.removeLocations();
+            int parentViewPaddingLeft = parentView == null ? 0 : parentView.getPaddingLeft();
+            xOffset = mWorkspace.getPaddingLeft() + parentViewPaddingLeft;
+        }
+        // This is the position of the widget relative to the wallpaper, as expected by the
+        // local color extraction of the WallpaperManager.
+        // The coordinate system is such that, on the horizontal axis, each screen has a
+        // distinct range on the [0,1] segment. So if there are 3 screens, they will have the
+        // ranges [0, 1/3], [1/3, 2/3] and [2/3, 1]. The position on the subrange should be
+        // the position of the widget relative to the screen. For the vertical axis, this is
+        // simply the location of the widget relative to the screen.
+        mTempRectF.left = ((widgetLocation.left + xOffset) / screenWidth + pageId)
+                * relativeScreenWidth;
+        mTempRectF.right = ((widgetLocation.right + xOffset) / screenWidth + pageId)
+                * relativeScreenWidth;
+        mTempRectF.top = absoluteTop / screenHeight;
+        mTempRectF.bottom = absoluteBottom / screenHeight;
+        if (mTempRectF.left < 0 || mTempRectF.right > 1 || mTempRectF.top < 0
+                || mTempRectF.bottom > 1) {
+            Log.e(LOG_TAG, "   Error, invalid relative position");
+            return;
+        }
+        if (!mTempRectF.equals(mLastLocationRegistered)) {
+            if (mLastLocationRegistered != null) {
+                mColorExtractor.removeLocations();
+            }
+            mLastLocationRegistered = new RectF(mTempRectF);
+            mColorExtractor.addLocation(List.of(mLastLocationRegistered));
         }
     }
 
diff --git a/src/com/android/launcher3/widget/PendingItemDragHelper.java b/src/com/android/launcher3/widget/PendingItemDragHelper.java
index 8961f3642a..247a748ba6 100644
--- a/src/com/android/launcher3/widget/PendingItemDragHelper.java
+++ b/src/com/android/launcher3/widget/PendingItemDragHelper.java
@@ -39,6 +39,7 @@ import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.dragndrop.DraggableView;
 import com.android.launcher3.graphics.DragPreviewProvider;
 import com.android.launcher3.icons.LauncherIcons;
+import com.android.launcher3.widget.dragndrop.AppWidgetHostViewDragListener;
 
 /**
  * Extension of {@link DragPreviewProvider} with logic specific to pending widgets/shortcuts
@@ -110,6 +111,8 @@ public class PendingItemDragHelper extends DragPreviewProvider {
             }
             if (mAppWidgetHostViewPreview != null) {
                 preview = new AppWidgetHostViewDrawable(mAppWidgetHostViewPreview);
+                launcher.getDragController()
+                        .addDragListener(new AppWidgetHostViewDragListener(launcher));
             }
             if (preview == null) {
                 preview = new FastBitmapDrawable(
diff --git a/src/com/android/launcher3/widget/dragndrop/AppWidgetHostViewDragListener.java b/src/com/android/launcher3/widget/dragndrop/AppWidgetHostViewDragListener.java
new file mode 100644
index 0000000000..c5e6fbd827
--- /dev/null
+++ b/src/com/android/launcher3/widget/dragndrop/AppWidgetHostViewDragListener.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget.dragndrop;
+
+import com.android.launcher3.DropTarget;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.dragndrop.AppWidgetHostViewDrawable;
+import com.android.launcher3.dragndrop.DragController;
+import com.android.launcher3.dragndrop.DragOptions;
+import com.android.launcher3.widget.LauncherAppWidgetHostView;
+
+/** A drag listener of {@link LauncherAppWidgetHostView}. */
+public final class AppWidgetHostViewDragListener implements DragController.DragListener {
+    private final Launcher mLauncher;
+    private DropTarget.DragObject mDragObject;
+    private AppWidgetHostViewDrawable mAppWidgetHostViewDrawable;
+    private LauncherAppWidgetHostView mAppWidgetHostView;
+
+    public AppWidgetHostViewDragListener(Launcher launcher) {
+        mLauncher = launcher;
+    }
+
+    @Override
+    public void onDragStart(DropTarget.DragObject dragObject, DragOptions unused) {
+        if (dragObject.dragView.getDrawable() instanceof AppWidgetHostViewDrawable) {
+            mDragObject = dragObject;
+            mAppWidgetHostViewDrawable =
+                    (AppWidgetHostViewDrawable) mDragObject.dragView.getDrawable();
+            mAppWidgetHostView = mAppWidgetHostViewDrawable.getAppWidgetHostView();
+            mAppWidgetHostView.startDrag(this);
+        } else {
+            mLauncher.getDragController().removeDragListener(this);
+        }
+    }
+
+    @Override
+    public void onDragEnd() {
+        mAppWidgetHostView.endDrag();
+        mLauncher.getDragController().removeDragListener(this);
+    }
+
+    /** Notifies when there is a content change in the drag view. */
+    public void onDragContentChanged() {
+        mDragObject.dragView.invalidate();
+    }
+}
-- 
GitLab


From c373e1c6425f842960353fe034dcb68a9c1a0332 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 9 Mar 2021 17:27:53 -0800
Subject: [PATCH 0694/1664] Adding an optional QSB in hotseat

Removing sections in all-apps during transition and treating
it as a single unit

Bug: 175137718
Test: Manual
Change-Id: I55a501d80b5903f1a9d92a26b3784784fd9e50fd
---
 .../launcher3/QuickstepTransitionManager.java |  8 --
 .../appprediction/AppsDividerView.java        | 10 --
 .../appprediction/PredictionRowView.java      | 95 +------------------
 .../launcher3/taskbar/TaskbarController.java  |  7 +-
 .../uioverrides/QuickstepLauncher.java        |  2 +-
 .../uioverrides/states/AllAppsState.java      |  2 +-
 ...ButtonNavbarToOverviewTouchController.java |  2 +-
 .../util/StaggeredWorkspaceAnim.java          |  9 +-
 .../quickstep/views/LauncherRecentsView.java  | 31 ------
 res/layout/all_apps.xml                       |  1 -
 res/layout/search_container_hotseat.xml       | 20 ++++
 src/com/android/launcher3/Hotseat.java        | 55 ++++++++++-
 src/com/android/launcher3/LauncherState.java  | 25 ++---
 .../WorkspaceStateTransitionAnimation.java    | 11 ---
 .../allapps/AllAppsContainerView.java         |  2 +-
 .../allapps/AllAppsTransitionController.java  | 22 +----
 .../launcher3/allapps/FloatingHeaderRow.java  |  5 -
 .../launcher3/allapps/FloatingHeaderView.java | 23 -----
 .../launcher3/allapps/PluginHeaderRow.java    | 11 ---
 .../launcher3/allapps/SearchUiManager.java    | 24 +----
 .../search/AppsSearchContainerLayout.java     | 10 +-
 .../launcher3/util/MultiValueAlpha.java       | 16 +---
 .../uioverrides/states/AllAppsState.java      |  2 +-
 .../tapl/LauncherInstrumentation.java         |  6 +-
 24 files changed, 107 insertions(+), 292 deletions(-)
 create mode 100644 res/layout/search_container_hotseat.xml

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 343b87e735..7404dee9d1 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -27,7 +27,6 @@ import static com.android.launcher3.LauncherState.ALL_APPS;
 import static com.android.launcher3.LauncherState.BACKGROUND_APP;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.Utilities.postAsyncCallback;
-import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS;
 import static com.android.launcher3.anim.Interpolators.AGGRESSIVE_EASE;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_1_7;
 import static com.android.launcher3.anim.Interpolators.EXAGGERATED_EASE;
@@ -67,7 +66,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
-import com.android.launcher3.allapps.AllAppsTransitionController;
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.shortcuts.DeepShortcutView;
@@ -148,9 +146,6 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
     public static final int CONTENT_ALPHA_DURATION = 217;
     protected static final int CONTENT_TRANSLATION_DURATION = 350;
 
-    // Progress = 0: All apps is fully pulled up, Progress = 1: All apps is fully pulled down.
-    public static final float ALL_APPS_PROGRESS_OFF_SCREEN = 1.3059858f;
-
     private static final int MAX_NUM_TASKS = 5;
 
     protected final BaseQuickstepLauncher mLauncher;
@@ -429,9 +424,6 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                 appsView.setLayerType(View.LAYER_TYPE_NONE, null);
             };
         } else if (mLauncher.isInState(OVERVIEW)) {
-            AllAppsTransitionController allAppsController = mLauncher.getAllAppsController();
-            launcherAnimator.play(ObjectAnimator.ofFloat(allAppsController, ALL_APPS_PROGRESS,
-                    allAppsController.getProgress(), ALL_APPS_PROGRESS_OFF_SCREEN));
             endListener = composeViewContentAnimator(launcherAnimator, alphas, trans);
         } else {
             mDragLayerAlpha.setValue(alphas[0]);
diff --git a/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java b/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java
index 66b1a861bb..d17a5aed9b 100644
--- a/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java
+++ b/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java
@@ -16,7 +16,6 @@
 
 package com.android.launcher3.appprediction;
 
-import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA;
 import static com.android.launcher3.LauncherState.ALL_APPS;
 
 import android.annotation.TargetApi;
@@ -30,7 +29,6 @@ import android.text.StaticLayout;
 import android.text.TextPaint;
 import android.util.AttributeSet;
 import android.view.View;
-import android.view.animation.Interpolator;
 
 import androidx.annotation.ColorInt;
 import androidx.core.content.ContextCompat;
@@ -41,7 +39,6 @@ import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.FloatingHeaderRow;
 import com.android.launcher3.allapps.FloatingHeaderView;
-import com.android.launcher3.anim.PropertySetter;
 import com.android.launcher3.statemanager.StateManager.StateListener;
 import com.android.launcher3.util.Themes;
 
@@ -286,13 +283,6 @@ public class AppsDividerView extends View implements StateListener<LauncherState
         setPadding(leftRightPadding, getPaddingTop(), leftRightPadding, getPaddingBottom());
     }
 
-    @Override
-    public void setContentVisibility(boolean hasHeaderExtra, boolean hasAllAppsContent,
-            PropertySetter setter, Interpolator headerFade, Interpolator allAppsFade) {
-        // Don't use setViewAlpha as we want to control the visibility ourselves.
-        setter.setFloat(this, VIEW_ALPHA, hasAllAppsContent ? 1 : 0, allAppsFade);
-    }
-
     @Override
     public void setVerticalScroll(int scroll, boolean isScrolledOut) {
         setTranslationY(scroll);
diff --git a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
index 83234e36e9..8e92b59ae1 100644
--- a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
+++ b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
@@ -16,20 +16,14 @@
 
 package com.android.launcher3.appprediction;
 
-import static com.android.launcher3.anim.Interpolators.LINEAR;
-import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
-
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.Canvas;
-import android.graphics.Color;
 import android.graphics.Rect;
 import android.os.Build;
 import android.util.AttributeSet;
-import android.util.IntProperty;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.animation.Interpolator;
 import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
@@ -44,7 +38,6 @@ import com.android.launcher3.R;
 import com.android.launcher3.allapps.FloatingHeaderRow;
 import com.android.launcher3.allapps.FloatingHeaderView;
 import com.android.launcher3.anim.AlphaUpdateListener;
-import com.android.launcher3.anim.PropertySetter;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.keyboard.FocusIndicatorHelper;
 import com.android.launcher3.keyboard.FocusIndicatorHelper.SimpleFocusIndicatorHelper;
@@ -53,8 +46,6 @@ import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.touch.ItemClickHandler;
 import com.android.launcher3.touch.ItemLongClickListener;
-import com.android.launcher3.util.Themes;
-import com.android.quickstep.AnimatedFloat;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -63,22 +54,6 @@ import java.util.List;
 public class PredictionRowView extends LinearLayout implements
         OnDeviceProfileChangeListener, FloatingHeaderRow {
 
-    private static final IntProperty<PredictionRowView> TEXT_ALPHA =
-            new IntProperty<PredictionRowView>("textAlpha") {
-                @Override
-                public void setValue(PredictionRowView view, int alpha) {
-                    view.setTextAlpha(alpha);
-                }
-
-                @Override
-                public Integer get(PredictionRowView view) {
-                    return view.mIconLastSetTextAlpha;
-                }
-            };
-
-    private static final Interpolator ALPHA_FACTOR_INTERPOLATOR =
-            (t) -> (t < 0.8f) ? 0 : (t - 0.8f) / 0.2f;
-
     private final Launcher mLauncher;
     private int mNumPredictedAppsPerRow;
 
@@ -88,21 +63,9 @@ public class PredictionRowView extends LinearLayout implements
     // The set of predicted apps resolved from the component names and the current set of apps
     private final List<WorkspaceItemInfo> mPredictedApps = new ArrayList<>();
 
-    private final int mIconTextColor;
-    private final int mIconFullTextAlpha;
-    private int mIconLastSetTextAlpha;
-    // Might use mIconFullTextAlpha instead of mIconLastSetTextAlpha if we are translucent.
-    private int mIconCurrentTextAlpha;
-
     private FloatingHeaderView mParent;
     private boolean mScrolledOut;
 
-    private float mScrollTranslation = 0;
-    private final AnimatedFloat mContentAlphaFactor =
-            new AnimatedFloat(this::updateTranslationAndAlpha);
-    private final AnimatedFloat mOverviewScrollFactor =
-            new AnimatedFloat(this::updateTranslationAndAlpha);
-
     private boolean mPredictionsEnabled = false;
 
     @Nullable
@@ -117,15 +80,9 @@ public class PredictionRowView extends LinearLayout implements
         setOrientation(LinearLayout.HORIZONTAL);
 
         mFocusHelper = new SimpleFocusIndicatorHelper(this);
-
         mNumPredictedAppsPerRow = LauncherAppState.getIDP(context).numAllAppsColumns;
         mLauncher = Launcher.getLauncher(context);
         mLauncher.addOnDeviceProfileChangeListener(this);
-
-        mIconTextColor = Themes.getAttrColor(context, android.R.attr.textColorSecondary);
-        mIconFullTextAlpha = Color.alpha(mIconTextColor);
-        mIconCurrentTextAlpha = mIconFullTextAlpha;
-
         updateVisibility();
     }
 
@@ -246,7 +203,6 @@ public class PredictionRowView extends LinearLayout implements
         }
 
         int predictionCount = mPredictedApps.size();
-        int iconColor = setColorAlphaBound(mIconTextColor, mIconCurrentTextAlpha);
 
         for (int i = 0; i < getChildCount(); i++) {
             BubbleTextView icon = (BubbleTextView) getChildAt(i);
@@ -254,7 +210,6 @@ public class PredictionRowView extends LinearLayout implements
             if (predictionCount > i) {
                 icon.setVisibility(View.VISIBLE);
                 icon.applyFromWorkspaceItem(mPredictedApps.get(i));
-                icon.setTextColor(iconColor);
             } else {
                 icon.setVisibility(predictionCount == 0 ? GONE : INVISIBLE);
             }
@@ -269,27 +224,6 @@ public class PredictionRowView extends LinearLayout implements
         mParent.onHeightUpdated();
     }
 
-    public void setTextAlpha(int textAlpha) {
-        mIconLastSetTextAlpha = textAlpha;
-        if (getAlpha() < 1 && textAlpha > 0) {
-            // If the entire header is translucent, make sure the text is at full opacity so it's
-            // not double-translucent. However, we support keeping the text invisible (alpha == 0).
-            textAlpha = mIconFullTextAlpha;
-        }
-        mIconCurrentTextAlpha = textAlpha;
-        int iconColor = setColorAlphaBound(mIconTextColor, mIconCurrentTextAlpha);
-        for (int i = 0; i < getChildCount(); i++) {
-            ((BubbleTextView) getChildAt(i)).setTextColor(iconColor);
-        }
-    }
-
-    @Override
-    public void setAlpha(float alpha) {
-        super.setAlpha(alpha);
-        // Reapply text alpha so that we update it to be full alpha if the row is now translucent.
-        setTextAlpha(mIconLastSetTextAlpha);
-    }
-
     @Override
     public boolean hasOverlappingRendering() {
         return false;
@@ -299,34 +233,11 @@ public class PredictionRowView extends LinearLayout implements
     @Override
     public void setVerticalScroll(int scroll, boolean isScrolledOut) {
         mScrolledOut = isScrolledOut;
-        updateTranslationAndAlpha();
         if (!isScrolledOut) {
-            mScrollTranslation = scroll;
-            updateTranslationAndAlpha();
-        }
-    }
-
-    private void updateTranslationAndAlpha() {
-        if (mPredictionsEnabled) {
-            setTranslationY((1 - mOverviewScrollFactor.value) * mScrollTranslation);
-
-            float factor = ALPHA_FACTOR_INTERPOLATOR.getInterpolation(mOverviewScrollFactor.value);
-            float endAlpha = factor + (1 - factor) * (mScrolledOut ? 0 : 1);
-            setAlpha(mContentAlphaFactor.value * endAlpha);
-            AlphaUpdateListener.updateVisibility(this);
+            setTranslationY(scroll);
         }
-    }
-
-    @Override
-    public void setContentVisibility(boolean hasHeaderExtra, boolean hasAllAppsContent,
-            PropertySetter setter, Interpolator headerFade, Interpolator allAppsFade) {
-        // Text follows all apps visibility
-        int textAlpha = hasHeaderExtra && hasAllAppsContent ? mIconFullTextAlpha : 0;
-        setter.setInt(this, TEXT_ALPHA, textAlpha, allAppsFade);
-        setter.setFloat(mOverviewScrollFactor, AnimatedFloat.VALUE,
-                (hasHeaderExtra && !hasAllAppsContent) ? 1 : 0, LINEAR);
-        setter.setFloat(mContentAlphaFactor, AnimatedFloat.VALUE, hasHeaderExtra ? 1 : 0,
-                headerFade);
+        setAlpha(mScrolledOut ? 0 : 1);
+        AlphaUpdateListener.updateVisibility(this);
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index 3ae85819f1..a2b2ddd5dd 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -42,6 +42,7 @@ import androidx.annotation.Nullable;
 
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.BaseQuickstepLauncher;
+import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Hotseat;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.QuickstepTransitionManager;
@@ -470,8 +471,12 @@ public class TaskbarController {
      */
     public void alignRealHotseatWithTaskbar() {
         Rect hotseatBounds = new Rect();
+        DeviceProfile grid = mLauncher.getDeviceProfile();
+        int hotseatHeight = grid.workspacePadding.bottom + grid.getInsets().bottom;
+        int hotseatTopDiff = hotseatHeight - grid.taskbarSize;
+
         mTaskbarView.getHotseatBoundsAtScale(getTaskbarScaleOnHome()).roundOut(hotseatBounds);
-        mLauncher.getHotseat().setPadding(hotseatBounds.left, hotseatBounds.top,
+        mLauncher.getHotseat().setPadding(hotseatBounds.left, hotseatBounds.top + hotseatTopDiff,
                 mTaskbarView.getWidth() - hotseatBounds.right,
                 mTaskbarView.getHeight() - hotseatBounds.bottom);
     }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index e02f2c2445..bae97d763a 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -234,7 +234,7 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
     @Override
     public void onDestroy() {
         super.onDestroy();
-        getAppsView().getSearchUiManager().destroy();
+        getAppsView().getSearchUiManager().destroySearch();
         mHotseatPredictionController.destroy();
     }
 
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
index 37c774b657..b2f8a404c0 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
@@ -78,7 +78,7 @@ public class AllAppsState extends LauncherState {
 
     @Override
     public int getVisibleElements(Launcher launcher) {
-        return ALL_APPS_HEADER | ALL_APPS_HEADER_EXTRA | ALL_APPS_CONTENT;
+        return ALL_APPS_CONTENT;
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
index 45cb46f96a..6c71995f9b 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -155,7 +155,7 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
             super.onDragEnd(velocity);
         }
 
-        View searchView = mLauncher.getAppsView().getSearchView();
+        View searchView = mLauncher.getHotseat().getQsb();
         if (searchView instanceof FeedbackHandler) {
             ((FeedbackHandler) searchView).resetFeedback();
         }
diff --git a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
index 932ff27719..ae644cd6fd 100644
--- a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
+++ b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
@@ -37,6 +37,7 @@ import android.view.ViewGroup;
 import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.CellLayout;
 import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.Hotseat;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
@@ -84,7 +85,7 @@ public class StaggeredWorkspaceAnim {
         Workspace workspace = launcher.getWorkspace();
         CellLayout cellLayout = (CellLayout) workspace.getChildAt(workspace.getCurrentPage());
         ShortcutAndWidgetContainer currentPage = cellLayout.getShortcutsAndWidgets();
-        ViewGroup hotseat = launcher.getHotseat();
+        Hotseat hotseat = launcher.getHotseat();
 
         boolean workspaceClipChildren = workspace.getClipChildren();
         boolean workspaceClipToPadding = workspace.getClipToPadding();
@@ -124,11 +125,7 @@ public class StaggeredWorkspaceAnim {
                 addStaggeredAnimationForView(child, grid.inv.numRows + 1, totalRows);
             }
 
-            if (launcher.getAppsView().getSearchUiManager()
-                    .isQsbVisible(NORMAL.getVisibleElements(launcher))) {
-                addStaggeredAnimationForView(launcher.getAppsView().getSearchView(),
-                        grid.inv.numRows + 2, totalRows);
-            }
+            addStaggeredAnimationForView(hotseat.getQsb(), grid.inv.numRows + 2, totalRows);
         }
 
         if (animateOverviewScrim) {
diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
index da24b594b4..e042b35653 100644
--- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
@@ -15,18 +15,13 @@
  */
 package com.android.quickstep.views;
 
-import static com.android.launcher3.LauncherState.ALL_APPS_HEADER_EXTRA;
 import static com.android.launcher3.LauncherState.CLEAR_ALL_BUTTON;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.OVERVIEW_MODAL_TASK;
 import static com.android.launcher3.LauncherState.SPRING_LOADED;
-import static com.android.launcher3.QuickstepTransitionManager.ALL_APPS_PROGRESS_OFF_SCREEN;
-import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS;
 import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build;
@@ -41,7 +36,6 @@ import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.StateManager.StateListener;
 import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
 import com.android.quickstep.LauncherActivityInterface;
-import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.util.OverviewToHomeAnim;
 import com.android.systemui.plugins.PluginListener;
 import com.android.systemui.plugins.RecentsExtraCard;
@@ -104,31 +98,6 @@ public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher>
         }
     }
 
-    /**
-     * Animates adjacent tasks and translate hotseat off screen as well.
-     */
-    @Override
-    public AnimatorSet createAdjacentPageAnimForTaskLaunch(TaskView tv) {
-        AnimatorSet anim = super.createAdjacentPageAnimForTaskLaunch(tv);
-
-        if (!SysUINavigationMode.getMode(mActivity).hasGestures) {
-            // Hotseat doesn't move when opening recents with the button,
-            // so don't animate it here either.
-            return anim;
-        }
-
-        float allAppsProgressOffscreen = ALL_APPS_PROGRESS_OFF_SCREEN;
-        LauncherState state = mActivity.getStateManager().getState();
-        if ((state.getVisibleElements(mActivity) & ALL_APPS_HEADER_EXTRA) != 0) {
-            float maxShiftRange = mActivity.getDeviceProfile().heightPx;
-            float currShiftRange = mActivity.getAllAppsController().getShiftRange();
-            allAppsProgressOffscreen = 1f + (maxShiftRange - currShiftRange) / maxShiftRange;
-        }
-        anim.play(ObjectAnimator.ofFloat(
-                mActivity.getAllAppsController(), ALL_APPS_PROGRESS, allAppsProgressOffscreen));
-        return anim;
-    }
-
     @Override
     protected void onTaskLaunchAnimationEnd(boolean success) {
         if (success) {
diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml
index 8ed16c7493..24d764ec18 100644
--- a/res/layout/all_apps.xml
+++ b/res/layout/all_apps.xml
@@ -44,7 +44,6 @@
     </com.android.launcher3.allapps.FloatingHeaderView>
 
     <include
-        android:id="@id/search_container_all_apps"
         layout="@layout/search_container_all_apps"/>
 
     <include layout="@layout/all_apps_fast_scroller" />
diff --git a/res/layout/search_container_hotseat.xml b/res/layout/search_container_hotseat.xml
new file mode 100644
index 0000000000..8f12ca07b0
--- /dev/null
+++ b/res/layout/search_container_hotseat.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<View
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="0dp" />
\ No newline at end of file
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index e5b75c1382..0e9de45e2f 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -20,6 +20,7 @@ import android.content.Context;
 import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewDebug;
@@ -42,6 +43,9 @@ public class Hotseat extends CellLayout implements Insettable {
     private static final int ALPHA_INDEX_REPLACE_TASKBAR = 1;
     private static final int NUM_ALPHA_CHANNELS = 2;
 
+    // Ratio of empty space, qsb should take up to appear visually centered.
+    public static final float QSB_CENTER_FACTOR = .325f;
+
     @ViewDebug.ExportedProperty(category = "launcher")
     private boolean mHasVerticalHotseat;
     private Workspace mWorkspace;
@@ -50,6 +54,8 @@ public class Hotseat extends CellLayout implements Insettable {
     private Consumer<Boolean> mOnVisibilityAggregatedCallback;
 
     private final MultiValueAlpha mMultiValueAlpha;
+    private final View mQsb;
+    private final int mQsbHeight;
 
     public Hotseat(Context context) {
         this(context, null);
@@ -63,6 +69,10 @@ public class Hotseat extends CellLayout implements Insettable {
         super(context, attrs, defStyle);
         mMultiValueAlpha = new MultiValueAlpha(this, NUM_ALPHA_CHANNELS, MultiValueAlpha.Mode.MAX);
         mMultiValueAlpha.setUpdateVisibility(true);
+
+        mQsb = LayoutInflater.from(context).inflate(R.layout.search_container_hotseat, this, false);
+        mQsbHeight = mQsb.getLayoutParams().height;
+        addView(mQsb);
     }
 
     /**
@@ -97,6 +107,7 @@ public class Hotseat extends CellLayout implements Insettable {
         DeviceProfile grid = mActivity.getDeviceProfile();
 
         if (grid.isVerticalBarLayout()) {
+            mQsb.setVisibility(View.GONE);
             lp.height = ViewGroup.LayoutParams.MATCH_PARENT;
             if (grid.isSeascape()) {
                 lp.gravity = Gravity.LEFT;
@@ -106,12 +117,15 @@ public class Hotseat extends CellLayout implements Insettable {
                 lp.width = grid.hotseatBarSizePx + insets.right;
             }
         } else {
+            mQsb.setVisibility(View.VISIBLE);
             lp.gravity = Gravity.BOTTOM;
             lp.width = ViewGroup.LayoutParams.MATCH_PARENT;
-            lp.height = grid.isTaskbarPresent
-                    ? grid.taskbarSize
-                    : grid.hotseatBarSizePx + insets.bottom;
+            lp.height = (grid.isTaskbarPresent
+                        ? grid.workspacePadding.bottom
+                        : grid.hotseatBarSizePx)
+                    + insets.bottom;
         }
+
         if (!grid.isTaskbarPresent) {
             // When taskbar is present, we set the padding separately to ensure a seamless visual
             // handoff between taskbar and hotseat during drag and drop.
@@ -177,6 +191,34 @@ public class Hotseat extends CellLayout implements Insettable {
         //Does nothing
     }
 
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+        int width = getShortcutsAndWidgets().getMeasuredWidth();
+        mQsb.measure(MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+                MeasureSpec.makeMeasureSpec(mQsbHeight, MeasureSpec.EXACTLY));
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        super.onLayout(changed, l, t, r, b);
+
+        int qsbWidth = mQsb.getMeasuredWidth();
+        int left = (r - l - qsbWidth) / 2;
+        int right = left + qsbWidth;
+
+        DeviceProfile dp = mActivity.getDeviceProfile();
+        int freeSpace = dp.isTaskbarPresent
+                ? dp.workspacePadding.bottom
+                : dp.hotseatBarSizePx - dp.hotseatCellHeightPx - mQsbHeight;
+        int bottom = b - t
+                - (int) (freeSpace * QSB_CENTER_FACTOR)
+                - dp.getInsets().bottom;
+        int top = bottom - mQsbHeight;
+        mQsb.layout(left, top, right, bottom);
+    }
+
     /**
      * Returns the first View for which the given itemOperator returns true, or null.
      */
@@ -191,4 +233,11 @@ public class Hotseat extends CellLayout implements Insettable {
     public MultiValueAlpha.AlphaProperty getReplaceTaskbarAlpha() {
         return mMultiValueAlpha.getProperty(ALPHA_INDEX_REPLACE_TASKBAR);
     }
+
+    /**
+     * Returns the QSB inside hotseat
+     */
+    public View getQsb() {
+        return mQsb;
+    }
 }
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java
index ae75b51799..e9a34953d5 100644
--- a/src/com/android/launcher3/LauncherState.java
+++ b/src/com/android/launcher3/LauncherState.java
@@ -30,7 +30,6 @@ import static com.android.launcher3.testing.TestProtocol.SPRING_LOADED_STATE_ORD
 import android.content.Context;
 import android.view.animation.Interpolator;
 
-import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.statemanager.BaseState;
 import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.states.HintState;
@@ -52,20 +51,13 @@ public abstract class LauncherState implements BaseState<LauncherState> {
      */
     public static final int NONE = 0;
     public static final int HOTSEAT_ICONS = 1 << 0;
-    public static final int HOTSEAT_SEARCH_BOX = 1 << 1;
-    public static final int ALL_APPS_HEADER = 1 << 2;
-    public static final int ALL_APPS_HEADER_EXTRA = 1 << 3; // e.g. app predictions
-    public static final int ALL_APPS_CONTENT = 1 << 4;
-    public static final int VERTICAL_SWIPE_INDICATOR = 1 << 5;
-    public static final int OVERVIEW_ACTIONS = 1 << 6;
-    public static final int TASKBAR = 1 << 7;
-    public static final int CLEAR_ALL_BUTTON = 1 << 8;
-    public static final int WORKSPACE_PAGE_INDICATOR = 1 << 9;
-    public static final int SPLIT_PLACHOLDER_VIEW = 1 << 10;
-
-    /** Mask of all the items that are contained in the apps view. */
-    public static final int APPS_VIEW_ITEM_MASK =
-            HOTSEAT_SEARCH_BOX | ALL_APPS_HEADER | ALL_APPS_HEADER_EXTRA | ALL_APPS_CONTENT;
+    public static final int ALL_APPS_CONTENT = 1 << 1;
+    public static final int VERTICAL_SWIPE_INDICATOR = 1 << 2;
+    public static final int OVERVIEW_ACTIONS = 1 << 3;
+    public static final int TASKBAR = 1 << 4;
+    public static final int CLEAR_ALL_BUTTON = 1 << 5;
+    public static final int WORKSPACE_PAGE_INDICATOR = 1 << 6;
+    public static final int SPLIT_PLACHOLDER_VIEW = 1 << 7;
 
     // Flag indicating workspace has multiple pages visible.
     public static final int FLAG_MULTI_PAGE = BaseState.getFlag(0);
@@ -195,9 +187,6 @@ public abstract class LauncherState implements BaseState<LauncherState> {
     public int getVisibleElements(Launcher launcher) {
         DeviceProfile deviceProfile = launcher.getDeviceProfile();
         int flags = WORKSPACE_PAGE_INDICATOR | VERTICAL_SWIPE_INDICATOR | TASKBAR;
-        if (!FeatureFlags.ENABLE_DEVICE_SEARCH.get() && !deviceProfile.isVerticalBarLayout()) {
-            flags |= HOTSEAT_SEARCH_BOX;
-        }
         if (!deviceProfile.isTaskbarPresent) {
             flags |= HOTSEAT_ICONS;
         }
diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
index d6d2f733c3..412754e211 100644
--- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
+++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
@@ -47,7 +47,6 @@ import android.view.animation.Interpolator;
 
 import com.android.launcher3.LauncherState.PageAlphaProvider;
 import com.android.launcher3.LauncherState.ScaleAndTranslation;
-import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.anim.PropertySetter;
 import com.android.launcher3.anim.SpringAnimationBuilder;
@@ -111,9 +110,6 @@ public class WorkspaceStateTransitionAnimation {
                 pageAlphaProvider.interpolator);
         boolean playAtomicComponent = config.playAtomicOverviewScaleComponent();
         Hotseat hotseat = mWorkspace.getHotseat();
-        // Since we set the pivot relative to mWorkspace, we need to scale a sibling of Workspace.
-        AllAppsContainerView qsbScaleView = mLauncher.getAppsView();
-        View qsbView = qsbScaleView.getSearchView();
         if (playAtomicComponent) {
             Interpolator scaleInterpolator = config.getInterpolator(ANIM_WORKSPACE_SCALE, ZOOM_OUT);
             LauncherState fromState = mLauncher.getStateManager().getState();
@@ -127,20 +123,15 @@ public class WorkspaceStateTransitionAnimation {
             }
 
             setPivotToScaleWithWorkspace(hotseat);
-            setPivotToScaleWithWorkspace(qsbScaleView);
             float hotseatScale = hotseatScaleAndTranslation.scale;
             if (shouldSpring) {
                 PendingAnimation pa = (PendingAnimation) propertySetter;
                 pa.add(getSpringScaleAnimator(mLauncher, hotseat, hotseatScale));
-                pa.add(getSpringScaleAnimator(mLauncher, qsbScaleView,
-                        qsbScaleAndTranslation.scale));
             } else {
                 Interpolator hotseatScaleInterpolator = config.getInterpolator(ANIM_HOTSEAT_SCALE,
                         scaleInterpolator);
                 propertySetter.setFloat(hotseat, SCALE_PROPERTY, hotseatScale,
                         hotseatScaleInterpolator);
-                propertySetter.setFloat(qsbScaleView, SCALE_PROPERTY, qsbScaleAndTranslation.scale,
-                        hotseatScaleInterpolator);
             }
 
             float hotseatIconsAlpha = (elements & HOTSEAT_ICONS) != 0 ? 1 : 0;
@@ -170,8 +161,6 @@ public class WorkspaceStateTransitionAnimation {
                 hotseatScaleAndTranslation.translationY, hotseatTranslationInterpolator);
         propertySetter.setFloat(mWorkspace.getPageIndicator(), VIEW_TRANSLATE_Y,
                 hotseatScaleAndTranslation.translationY, hotseatTranslationInterpolator);
-        propertySetter.setFloat(qsbView, VIEW_TRANSLATE_Y,
-                qsbScaleAndTranslation.translationY, hotseatTranslationInterpolator);
 
         setScrim(propertySetter, state);
     }
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index fdc69ec3e9..78c404f061 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -343,7 +343,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
 
         mSearchContainer = findViewById(R.id.search_container_all_apps);
         mSearchUiManager = (SearchUiManager) mSearchContainer;
-        mSearchUiManager.initialize(this);
+        mSearchUiManager.initializeSearch(this);
     }
 
     public SearchUiManager getSearchUiManager() {
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 1e6f829886..16ecd589e4 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -16,16 +16,11 @@
 package com.android.launcher3.allapps;
 
 import static com.android.launcher3.LauncherState.ALL_APPS_CONTENT;
-import static com.android.launcher3.LauncherState.ALL_APPS_HEADER_EXTRA;
-import static com.android.launcher3.LauncherState.APPS_VIEW_ITEM_MASK;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
-import static com.android.launcher3.anim.Interpolators.FINAL_FRAME;
-import static com.android.launcher3.anim.Interpolators.INSTANT;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_HEADER_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_VERTICAL_PROGRESS;
 import static com.android.launcher3.util.SystemUiController.UI_STATE_ALLAPPS;
@@ -194,25 +189,10 @@ public class AllAppsTransitionController
      */
     public void setAlphas(LauncherState state, StateAnimationConfig config, PropertySetter setter) {
         int visibleElements = state.getVisibleElements(mLauncher);
-        boolean hasHeaderExtra = (visibleElements & ALL_APPS_HEADER_EXTRA) != 0;
         boolean hasAllAppsContent = (visibleElements & ALL_APPS_CONTENT) != 0;
 
-        boolean hasAnyVisibleItem = (visibleElements & APPS_VIEW_ITEM_MASK) != 0;
-
         Interpolator allAppsFade = config.getInterpolator(ANIM_ALL_APPS_FADE, LINEAR);
-        Interpolator headerFade = config.getInterpolator(ANIM_ALL_APPS_HEADER_FADE, allAppsFade);
-
-
-        setter.setViewAlpha(mAppsView.getContentView(), hasAllAppsContent ? 1 : 0, allAppsFade);
-        setter.setViewAlpha(mAppsView.getScrollBar(), hasAllAppsContent ? 1 : 0, allAppsFade);
-        mAppsView.getFloatingHeaderView().setContentVisibility(hasHeaderExtra,
-                hasAllAppsContent, setter, headerFade, allAppsFade);
-
-        mAppsView.getSearchUiManager().setContentVisibility(visibleElements, setter, allAppsFade);
-
-        // Set visibility of the container at the very beginning or end of the transition.
-        setter.setViewAlpha(mAppsView, hasAnyVisibleItem ? 1 : 0,
-                hasAnyVisibleItem ? INSTANT : FINAL_FRAME);
+        setter.setViewAlpha(mAppsView, hasAllAppsContent ? 1 : 0, allAppsFade);
     }
 
     public AnimatorListenerAdapter getProgressAnimatorListener() {
diff --git a/src/com/android/launcher3/allapps/FloatingHeaderRow.java b/src/com/android/launcher3/allapps/FloatingHeaderRow.java
index 31c6cc729a..9bf60433ff 100644
--- a/src/com/android/launcher3/allapps/FloatingHeaderRow.java
+++ b/src/com/android/launcher3/allapps/FloatingHeaderRow.java
@@ -17,10 +17,8 @@ package com.android.launcher3.allapps;
 
 import android.graphics.Rect;
 import android.view.View;
-import android.view.animation.Interpolator;
 
 import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.anim.PropertySetter;
 
 /**
  * A abstract representation of a row in all-apps view
@@ -47,9 +45,6 @@ public interface FloatingHeaderRow {
      */
     boolean hasVisibleContent();
 
-    void setContentVisibility(boolean hasHeaderExtra, boolean hasAllAppsContent,
-            PropertySetter setter, Interpolator headerFade, Interpolator allAppsFade);
-
     /**
      * Scrolls the content vertically.
      */
diff --git a/src/com/android/launcher3/allapps/FloatingHeaderView.java b/src/com/android/launcher3/allapps/FloatingHeaderView.java
index 9056e8aada..86f330c88d 100644
--- a/src/com/android/launcher3/allapps/FloatingHeaderView.java
+++ b/src/com/android/launcher3/allapps/FloatingHeaderView.java
@@ -15,8 +15,6 @@
  */
 package com.android.launcher3.allapps;
 
-import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA;
-
 import android.animation.ValueAnimator;
 import android.content.Context;
 import android.graphics.Point;
@@ -26,7 +24,6 @@ import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.animation.Interpolator;
 import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
@@ -37,7 +34,6 @@ import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Insettable;
 import com.android.launcher3.R;
-import com.android.launcher3.anim.PropertySetter;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
 import com.android.systemui.plugins.AllAppsRow;
@@ -88,7 +84,6 @@ public class FloatingHeaderView extends LinearLayout implements
     private int mSnappedScrolledY;
     private int mTranslationY;
 
-    private boolean mAllowTouchForwarding;
     private boolean mForwardToRecyclerView;
 
     protected boolean mTabsHidden;
@@ -350,10 +345,6 @@ public class FloatingHeaderView extends LinearLayout implements
 
     @Override
     public boolean onInterceptTouchEvent(MotionEvent ev) {
-        if (!mAllowTouchForwarding) {
-            mForwardToRecyclerView = false;
-            return super.onInterceptTouchEvent(ev);
-        }
         calcOffset(mTempOffset);
         ev.offsetLocation(mTempOffset.x, mTempOffset.y);
         mForwardToRecyclerView = mCurrentRV.onInterceptTouchEvent(ev);
@@ -382,20 +373,6 @@ public class FloatingHeaderView extends LinearLayout implements
         p.y = getTop() - mCurrentRV.getTop() - mParent.getTop();
     }
 
-    public void setContentVisibility(boolean hasHeader, boolean hasAllAppsContent,
-            PropertySetter setter, Interpolator headerFade, Interpolator allAppsFade) {
-        for (FloatingHeaderRow row : mAllRows) {
-            row.setContentVisibility(hasHeader, hasAllAppsContent, setter, headerFade, allAppsFade);
-        }
-
-        allowTouchForwarding(hasAllAppsContent);
-        setter.setFloat(mTabLayout, VIEW_ALPHA, hasAllAppsContent ? 1 : 0, headerFade);
-    }
-
-    protected void allowTouchForwarding(boolean allow) {
-        mAllowTouchForwarding = allow;
-    }
-
     public boolean hasVisibleContent() {
         for (FloatingHeaderRow row : mAllRows) {
             if (row.hasVisibleContent()) {
diff --git a/src/com/android/launcher3/allapps/PluginHeaderRow.java b/src/com/android/launcher3/allapps/PluginHeaderRow.java
index cf7142c338..5b5fbb7ff9 100644
--- a/src/com/android/launcher3/allapps/PluginHeaderRow.java
+++ b/src/com/android/launcher3/allapps/PluginHeaderRow.java
@@ -18,14 +18,10 @@ package com.android.launcher3.allapps;
 import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
 
-import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA;
-
 import android.graphics.Rect;
 import android.view.View;
-import android.view.animation.Interpolator;
 
 import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.anim.PropertySetter;
 import com.android.systemui.plugins.AllAppsRow;
 
 /**
@@ -64,13 +60,6 @@ public class PluginHeaderRow implements FloatingHeaderRow {
         return true;
     }
 
-    @Override
-    public void setContentVisibility(boolean hasHeaderExtra, boolean hasAllAppsContent,
-            PropertySetter setter, Interpolator headerFade, Interpolator allAppsFade) {
-        // Don't use setViewAlpha as we want to control the visibility ourselves.
-        setter.setFloat(mView, VIEW_ALPHA, hasAllAppsContent ? 1 : 0, headerFade);
-    }
-
     @Override
     public void setVerticalScroll(int scroll, boolean isScrolledOut) {
         mView.setVisibility(isScrolledOut ? INVISIBLE : VISIBLE);
diff --git a/src/com/android/launcher3/allapps/SearchUiManager.java b/src/com/android/launcher3/allapps/SearchUiManager.java
index 0d42950cbb..0a2dea99b9 100644
--- a/src/com/android/launcher3/allapps/SearchUiManager.java
+++ b/src/com/android/launcher3/allapps/SearchUiManager.java
@@ -15,16 +15,12 @@
  */
 package com.android.launcher3.allapps;
 
-import static com.android.launcher3.LauncherState.ALL_APPS_HEADER;
-
 import android.graphics.Rect;
 import android.view.KeyEvent;
-import android.view.animation.Interpolator;
 
 import androidx.annotation.Nullable;
 
 import com.android.launcher3.ExtendedEditText;
-import com.android.launcher3.anim.PropertySetter;
 
 /**
  * Interface for controlling the Apps search UI.
@@ -34,7 +30,7 @@ public interface SearchUiManager {
     /**
      * Initializes the search manager.
      */
-    void initialize(AllAppsContainerView containerView);
+    void initializeSearch(AllAppsContainerView containerView);
 
     /**
      * Notifies the search manager to close any active search session.
@@ -45,31 +41,17 @@ public interface SearchUiManager {
      * Called before dispatching a key event, in case the search manager wants to initialize
      * some UI beforehand.
      */
-    void preDispatchKeyEvent(KeyEvent keyEvent);
+    default void preDispatchKeyEvent(KeyEvent keyEvent) { };
 
     /**
      * Returns the vertical shift for the all-apps view, so that it aligns with the hotseat.
      */
     float getScrollRangeDelta(Rect insets);
 
-    /**
-     * Called as part of state transition to update the content UI
-     */
-    void setContentVisibility(int visibleElements, PropertySetter setter,
-            Interpolator interpolator);
-
     /**
      * Called when activity is destroyed. Used to close search system services
      */
-    default void destroy() {
-    }
-
-    /**
-     * Returns true if the QSB should be visible for the given set of visible elements
-     */
-    default boolean isQsbVisible(int visibleElements) {
-        return (visibleElements & ALL_APPS_HEADER) != 0;
-    }
+    default void destroySearch() { }
 
     /**
      * @return the edit text object
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
index 2261d5147b..bfcc1c75ec 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
@@ -31,7 +31,6 @@ import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup.MarginLayoutParams;
-import android.view.animation.Interpolator;
 
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.DeviceProfile;
@@ -44,7 +43,6 @@ import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItem;
 import com.android.launcher3.allapps.AllAppsStore;
 import com.android.launcher3.allapps.AlphabeticalAppsList;
 import com.android.launcher3.allapps.SearchUiManager;
-import com.android.launcher3.anim.PropertySetter;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.search.SearchCallback;
 
@@ -134,7 +132,7 @@ public class AppsSearchContainerLayout extends ExtendedEditText
     }
 
     @Override
-    public void initialize(AllAppsContainerView appsView) {
+    public void initializeSearch(AllAppsContainerView appsView) {
         mApps = appsView.getApps();
         mAppsView = appsView;
         mSearchBarController.initialize(
@@ -222,12 +220,6 @@ public class AppsSearchContainerLayout extends ExtendedEditText
         }
     }
 
-    @Override
-    public void setContentVisibility(int visibleElements, PropertySetter setter,
-            Interpolator interpolator) {
-        setter.setViewAlpha(this, isQsbVisible(visibleElements) ? 1 : 0, interpolator);
-    }
-
     @Override
     public ExtendedEditText getEditText() {
         return this;
diff --git a/src/com/android/launcher3/util/MultiValueAlpha.java b/src/com/android/launcher3/util/MultiValueAlpha.java
index c79b1f6c99..0ea0290a8b 100644
--- a/src/com/android/launcher3/util/MultiValueAlpha.java
+++ b/src/com/android/launcher3/util/MultiValueAlpha.java
@@ -46,25 +46,20 @@ public class MultiValueAlpha {
      * Determines how each alpha should factor into the final alpha.
      */
     public enum Mode {
-        BLEND(1f) {
+        BLEND() {
             @Override
             public float calculateNewAlpha(float currentAlpha, float otherAlpha) {
                 return currentAlpha * otherAlpha;
             }
         },
 
-        MAX(0f) {
+        MAX() {
             @Override
             public float calculateNewAlpha(float currentAlpha, float otherAlpha) {
                 return Math.max(currentAlpha, otherAlpha);
             }
         };
 
-        Mode(float startAlpha) {
-            mStartAlpha = startAlpha;
-        }
-
-        protected final float mStartAlpha;
         protected abstract float calculateNewAlpha(float currentAlpha, float otherAlpha);
     }
 
@@ -84,7 +79,6 @@ public class MultiValueAlpha {
         mView = view;
         mMyProperties = new AlphaProperty[size];
         mMode = mode;
-        mView.setAlpha(mMode.mStartAlpha);
 
         mValidMask = 0;
         for (int i = 0; i < size; i++) {
@@ -112,9 +106,9 @@ public class MultiValueAlpha {
 
         private final int mMyMask;
 
-        private float mValue = mMode.mStartAlpha;
+        private float mValue = 1;
         // Factor of all other alpha channels, only valid if mMyMask is present in mValidMask.
-        private float mOthers = mMode.mStartAlpha;
+        private float mOthers = 1;
 
         AlphaProperty(int myMask) {
             mMyMask = myMask;
@@ -127,7 +121,7 @@ public class MultiValueAlpha {
 
             if ((mValidMask & mMyMask) == 0) {
                 // Our cache value is not correct, recompute it.
-                mOthers = mMode.mStartAlpha;
+                mOthers = 1;
                 for (AlphaProperty prop : mMyProperties) {
                     if (prop != this) {
                         mOthers = mMode.calculateNewAlpha(mOthers, prop.mValue);
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java b/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java
index a4e53a1cc0..ff281482ec 100644
--- a/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java
+++ b/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java
@@ -56,7 +56,7 @@ public class AllAppsState extends LauncherState {
 
     @Override
     public int getVisibleElements(Launcher launcher) {
-        return ALL_APPS_HEADER | ALL_APPS_CONTENT;
+        return ALL_APPS_CONTENT;
     }
 
     @Override
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 5138f02aad..a7b92b7e9c 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -585,11 +585,7 @@ public final class LauncherInstrumentation {
                 "but the current state is not " + containerType.name())) {
             switch (containerType) {
                 case WORKSPACE: {
-                    if (mDevice.isNaturalOrientation()) {
-                        waitForLauncherObject(APPS_RES_ID);
-                    } else {
-                        waitUntilLauncherObjectGone(APPS_RES_ID);
-                    }
+                    waitUntilLauncherObjectGone(APPS_RES_ID);
                     waitUntilLauncherObjectGone(OVERVIEW_RES_ID);
                     waitUntilLauncherObjectGone(WIDGETS_RES_ID);
                     return waitForLauncherObject(WORKSPACE_RES_ID);
-- 
GitLab


From 17ba630cd90e6475bcfd1bb2fbebc0d8e958b55d Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Wed, 17 Mar 2021 14:41:04 -0700
Subject: [PATCH 0695/1664] Fixing testOverview test

Apparently, we can't generally expect that flinging to and
fro will return Overview to the original task, especially
if the device performance is low.

Now starting the expected task explicitly.

Test: presubmit
Bug: 182794819
Change-Id: Ia2931f4f3005c46dd72990c247a90f9010b9b8d5
---
 .../tests/src/com/android/quickstep/TaplTestsQuickstep.java      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
index 0fe5432ceb..5ffe3156f6 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
@@ -120,6 +120,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
                 getCurrentOverviewPage(launcher) < currentTaskAfterFlingForward));
 
         // Test opening a task.
+        startTestActivity(2);
         OverviewTask task = mLauncher.pressHome().switchToOverview().getCurrentTask();
         assertNotNull("overview.getCurrentTask() returned null (1)", task);
         assertNotNull("OverviewTask.open returned null", task.open());
-- 
GitLab


From a608d81359c0c161765cc8f2b26be79a1e8c7912 Mon Sep 17 00:00:00 2001
From: "[1;3C" <erosky@google.com>
Date: Fri, 22 Jan 2021 13:34:46 -0800
Subject: [PATCH 0696/1664] Add rotation support to launch animations

This only adds support for launch animations. Recents
requires some auxiliar work.

Adds a rotation parameter to the animation targets that
only gets used by shell transitions. If this is non-zero,
launcher will transform it's coordinates relative to that
provide rotation.

Bug: 179308296
Test: Launch and exit apps with different orientation from
      default (portrait).
Change-Id: I7b52cbd37432bcd43e7155bcb07b30cc65c43186
---
 .../launcher3/QuickstepTransitionManager.java | 111 +++++++++++++-----
 src/com/android/launcher3/Utilities.java      |  31 +++++
 2 files changed, 114 insertions(+), 28 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 343b87e735..5dcec685ff 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -314,9 +314,11 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
         // before our internal listeners.
         mLauncher.getStateManager().setCurrentAnimation(anim);
 
-        Rect windowTargetBounds = getWindowTargetBounds(appTargets);
+        final int rotationChange = getRotationChange(appTargets);
+        // Note: the targetBounds are relative to the launcher
+        Rect windowTargetBounds = getWindowTargetBounds(appTargets, rotationChange);
         anim.play(getOpeningWindowAnimators(v, appTargets, wallpaperTargets, windowTargetBounds,
-                areAllTargetsTranslucent(appTargets)));
+                areAllTargetsTranslucent(appTargets), rotationChange));
         if (launcherClosing) {
             Pair<AnimatorSet, Runnable> launcherContentAnimator =
                     getLauncherContentAnimator(true /* isAppOpening */,
@@ -345,19 +347,29 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
      * In multiwindow mode, we need to get the final size of the opening app window target to help
      * figure out where the floating view should animate to.
      */
-    private Rect getWindowTargetBounds(RemoteAnimationTargetCompat[] appTargets) {
-        Rect bounds = new Rect(0, 0, mDeviceProfile.widthPx, mDeviceProfile.heightPx);
-        if (mLauncher.isInMultiWindowMode()) {
-            for (RemoteAnimationTargetCompat target : appTargets) {
-                if (target.mode == MODE_OPENING) {
-                    bounds.set(target.screenSpaceBounds);
-                    if (target.localBounds != null) {
-                        bounds.set(target.localBounds);
-                    } else {
-                        bounds.offsetTo(target.position.x, target.position.y);
-                    }
-                    return bounds;
-                }
+    private Rect getWindowTargetBounds(@NonNull RemoteAnimationTargetCompat[] appTargets,
+            int rotationChange) {
+        RemoteAnimationTargetCompat target = null;
+        for (RemoteAnimationTargetCompat t : appTargets) {
+            if (t.mode != MODE_OPENING) continue;
+            target = t;
+            break;
+        }
+        if (target == null) return new Rect(0, 0, mDeviceProfile.widthPx, mDeviceProfile.heightPx);
+        final Rect bounds = new Rect(target.screenSpaceBounds);
+        if (target.localBounds != null) {
+            bounds.set(target.localBounds);
+        } else {
+            bounds.offsetTo(target.position.x, target.position.y);
+        }
+        if (rotationChange != 0) {
+            if ((rotationChange % 2) == 1) {
+                // undoing rotation, so our "original" parent size is actually flipped
+                Utilities.rotateBounds(bounds, mDeviceProfile.heightPx, mDeviceProfile.widthPx,
+                        4 - rotationChange);
+            } else {
+                Utilities.rotateBounds(bounds, mDeviceProfile.widthPx, mDeviceProfile.heightPx,
+                        4 - rotationChange);
             }
         }
         return bounds;
@@ -510,7 +522,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
     private Animator getOpeningWindowAnimators(View v,
             RemoteAnimationTargetCompat[] appTargets,
             RemoteAnimationTargetCompat[] wallpaperTargets,
-            Rect windowTargetBounds, boolean appTargetsAreTranslucent) {
+            Rect windowTargetBounds, boolean appTargetsAreTranslucent, int rotationChange) {
         RectF launcherIconBounds = new RectF();
         FloatingIconView floatingView = FloatingIconView.getFloatingIconView(mLauncher, v,
                 !appTargetsAreTranslucent, launcherIconBounds, true /* isOpening */);
@@ -610,6 +622,10 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
 
                 final int windowCropWidth = crop.width();
                 final int windowCropHeight = crop.height();
+                if (rotationChange != 0) {
+                    Utilities.rotateBounds(crop, mDeviceProfile.widthPx,
+                            mDeviceProfile.heightPx, rotationChange);
+                }
 
                 // Scale the size of the icon to match the size of the window crop.
                 float scaleX = iconWidth / windowCropWidth;
@@ -649,7 +665,20 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
 
                     if (target.mode == MODE_OPENING) {
                         matrix.setScale(scale, scale);
-                        matrix.postTranslate(windowTransX0, windowTransY0);
+                        if (rotationChange == 1) {
+                            matrix.postTranslate(windowTransY0,
+                                    mDeviceProfile.widthPx - (windowTransX0 + scaledCropWidth));
+                        } else if (rotationChange == 2) {
+                            matrix.postTranslate(
+                                    mDeviceProfile.widthPx - (windowTransX0 + scaledCropWidth),
+                                    mDeviceProfile.heightPx - (windowTransY0 + scaledCropHeight));
+                        } else if (rotationChange == 3) {
+                            matrix.postTranslate(
+                                    mDeviceProfile.heightPx - (windowTransY0 + scaledCropHeight),
+                                    windowTransX0);
+                        } else {
+                            matrix.postTranslate(windowTransX0, windowTransY0);
+                        }
 
                         floatingView.update(floatingIconBounds, mIconAlpha.value, percent, 0f,
                                 mWindowRadius.value * scale, true /* isOpening */);
@@ -658,17 +687,25 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                                 .withAlpha(1f - mIconAlpha.value)
                                 .withCornerRadius(mWindowRadius.value)
                                 .withShadowRadius(mShadowRadius.value);
-                    } else {
+                    } else if (target.mode == MODE_CLOSING) {
                         if (target.localBounds != null) {
                             final Rect localBounds = target.localBounds;
                             tmpPos.set(target.localBounds.left, target.localBounds.top);
                         } else {
                             tmpPos.set(target.position.x, target.position.y);
                         }
-
-                        matrix.setTranslate(tmpPos.x, tmpPos.y);
                         final Rect crop = new Rect(target.screenSpaceBounds);
                         crop.offsetTo(0, 0);
+
+                        if ((rotationChange % 2) == 1) {
+                            int tmp = crop.right;
+                            crop.right = crop.bottom;
+                            crop.bottom = tmp;
+                            tmp = tmpPos.x;
+                            tmpPos.x = tmpPos.y;
+                            tmpPos.y = tmp;
+                        }
+                        matrix.setTranslate(tmpPos.x, tmpPos.y);
                         builder.withMatrix(matrix)
                                 .withWindowCrop(crop)
                                 .withAlpha(1f);
@@ -825,14 +862,26 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
         return unlockAnimator;
     }
 
+    private static int getRotationChange(RemoteAnimationTargetCompat[] appTargets) {
+        int rotationChange = 0;
+        for (RemoteAnimationTargetCompat target : appTargets) {
+            if (Math.abs(target.rotationChange) > Math.abs(rotationChange)) {
+                rotationChange = target.rotationChange;
+            }
+        }
+        return rotationChange;
+    }
+
     /**
      * Animator that controls the transformations of the windows the targets that are closing.
      */
     private Animator getClosingWindowAnimators(RemoteAnimationTargetCompat[] appTargets,
             RemoteAnimationTargetCompat[] wallpaperTargets) {
+        final int rotationChange = getRotationChange(appTargets);
         SurfaceTransactionApplier surfaceApplier = new SurfaceTransactionApplier(mDragLayer);
         Matrix matrix = new Matrix();
         Point tmpPos = new Point();
+        Rect tmpRect = new Rect();
         ValueAnimator closingAnimator = ValueAnimator.ofFloat(0, 1);
         int duration = CLOSING_TRANSITION_DURATION_MS;
         float windowCornerRadius = mDeviceProfile.isMultiWindowMode
@@ -859,26 +908,32 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                         tmpPos.set(target.position.x, target.position.y);
                     }
 
+                    final Rect crop = new Rect(target.screenSpaceBounds);
+                    crop.offsetTo(0, 0);
                     if (target.mode == MODE_CLOSING) {
+                        tmpRect.set(target.screenSpaceBounds);
+                        if ((rotationChange % 2) != 0) {
+                            final int right = crop.right;
+                            crop.right = crop.bottom;
+                            crop.bottom = right;
+                        }
                         matrix.setScale(mScale.value, mScale.value,
-                                target.screenSpaceBounds.centerX(),
-                                target.screenSpaceBounds.centerY());
+                                tmpRect.centerX(),
+                                tmpRect.centerY());
                         matrix.postTranslate(0, mDy.value);
                         matrix.postTranslate(tmpPos.x, tmpPos.y);
                         builder.withMatrix(matrix)
+                                .withWindowCrop(crop)
                                 .withAlpha(mAlpha.value)
                                 .withCornerRadius(windowCornerRadius)
                                 .withShadowRadius(mShadowRadius.value);
-                    } else {
+                    } else if (target.mode == MODE_OPENING) {
                         matrix.setTranslate(tmpPos.x, tmpPos.y);
                         builder.withMatrix(matrix)
+                                .withWindowCrop(crop)
                                 .withAlpha(1f);
                     }
-                    final Rect crop = new Rect(target.screenSpaceBounds);
-                    crop.offsetTo(0, 0);
-                    params[i] = builder
-                            .withWindowCrop(crop)
-                            .build();
+                    params[i] = builder.build();
                 }
                 surfaceApplier.scheduleApply(params);
             }
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 94c6574c60..e57844d7df 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -700,6 +700,37 @@ public final class Utilities {
         return (Math.abs(first - second) / Math.abs((first + second) / 2.0f)) > bound;
     }
 
+    /**
+     * Rotates `inOutBounds` by `delta` 90-degree increments. Rotation is visually CCW. Parent
+     * sizes represent the "space" that will rotate carrying inOutBounds along with it to determine
+     * the final bounds.
+     */
+    public static void rotateBounds(Rect inOutBounds, int parentWidth, int parentHeight,
+            int delta) {
+        int rdelta = ((delta % 4) + 4) % 4;
+        int origLeft = inOutBounds.left;
+        switch (rdelta) {
+            case 0:
+                return;
+            case 1:
+                inOutBounds.left = inOutBounds.top;
+                inOutBounds.top = parentWidth - inOutBounds.right;
+                inOutBounds.right = inOutBounds.bottom;
+                inOutBounds.bottom = parentWidth - origLeft;
+                return;
+            case 2:
+                inOutBounds.left = parentWidth - inOutBounds.right;
+                inOutBounds.right = parentWidth - origLeft;
+                return;
+            case 3:
+                inOutBounds.left = parentHeight - inOutBounds.bottom;
+                inOutBounds.bottom = inOutBounds.right;
+                inOutBounds.right = parentHeight - inOutBounds.top;
+                inOutBounds.top = origLeft;
+                return;
+        }
+    }
+
     private static class FixedSizeEmptyDrawable extends ColorDrawable {
 
         private final int mSize;
-- 
GitLab


From 08ef694509055b94dc34f1536519d73880dc544b Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 17 Mar 2021 17:19:52 +0000
Subject: [PATCH 0697/1664] Adjust font, color, margin, corners for all widgets
 tray

Test: manually
Bug: 179797520
Change-Id: Ib78aae05e021da272ef2f754c876d24a4c14bcb0
---
 res/drawable/ic_expand_less.xml               |  2 +-
 res/drawable/ic_expand_more.xml               |  2 +-
 res/drawable/widgets_list_bottom_ripple.xml   | 41 ++++++++++++++++++
 res/drawable/widgets_list_middle_ripple.xml   | 42 +++++++++++++++++++
 res/drawable/widgets_list_top_ripple.xml      | 42 +++++++++++++++++++
 res/layout/widget_cell_content.xml            |  7 ++--
 res/layout/widgets_full_sheet.xml             |  2 +-
 ..._full_sheet_search_and_recommendations.xml |  3 +-
 res/layout/widgets_list_row_header.xml        |  5 ++-
 res/layout/widgets_table_container.xml        |  3 +-
 res/values/dimens.xml                         |  5 +++
 ...WidgetsListHeaderViewHolderBinderTest.java | 15 +++++--
 ...sListSearchHeaderViewHolderBinderTest.java | 15 +++++--
 .../WidgetsListTableViewHolderBinderTest.java | 11 ++++-
 .../recyclerview/ViewHolderBinder.java        |  2 +-
 .../widget/picker/WidgetsListAdapter.java     |  9 ++--
 .../widget/picker/WidgetsListHeader.java      | 11 +++++
 .../WidgetsListHeaderViewHolderBinder.java    | 15 ++++++-
 ...dgetsListSearchHeaderViewHolderBinder.java | 14 ++++++-
 .../WidgetsListTableViewHolderBinder.java     | 16 ++++++-
 20 files changed, 234 insertions(+), 28 deletions(-)
 create mode 100644 res/drawable/widgets_list_bottom_ripple.xml
 create mode 100644 res/drawable/widgets_list_middle_ripple.xml
 create mode 100644 res/drawable/widgets_list_top_ripple.xml

diff --git a/res/drawable/ic_expand_less.xml b/res/drawable/ic_expand_less.xml
index 8360cee487..cc1608349e 100644
--- a/res/drawable/ic_expand_less.xml
+++ b/res/drawable/ic_expand_less.xml
@@ -18,7 +18,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?android:attr/textColorHint">
+    android:tint="?android:attr/textColorSecondary">
     <path
         android:fillColor="#FF000000"
         android:pathData="M18.59,16.41L20,15l-8,-8 -8,8 1.41,1.41L12,9.83"/>
diff --git a/res/drawable/ic_expand_more.xml b/res/drawable/ic_expand_more.xml
index 49e24f6ba7..ecbce7fa78 100644
--- a/res/drawable/ic_expand_more.xml
+++ b/res/drawable/ic_expand_more.xml
@@ -18,7 +18,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?android:attr/textColorHint">
+    android:tint="?android:attr/textColorSecondary">
     <path
         android:fillColor="#FF000000"
         android:pathData="M5.41,7.59L4,9l8,8 8,-8 -1.41,-1.41L12,14.17"/>
diff --git a/res/drawable/widgets_list_bottom_ripple.xml b/res/drawable/widgets_list_bottom_ripple.xml
new file mode 100644
index 0000000000..3a26091f14
--- /dev/null
+++ b/res/drawable/widgets_list_bottom_ripple.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2021, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <corners
+                android:topLeftRadius="@dimen/widget_list_content_corner_radius"
+                android:topRightRadius="@dimen/widget_list_content_corner_radius"
+                android:bottomLeftRadius="@dimen/widget_list_top_bottom_corner_radius"
+                android:bottomRightRadius="@dimen/widget_list_top_bottom_corner_radius" />
+        </shape>
+    </item>
+    <item android:id="@android:id/background">
+        <shape android:shape="rectangle">
+            <solid android:color="?android:attr/colorBackground" />
+            <corners
+                android:topLeftRadius="@dimen/widget_list_content_corner_radius"
+                android:topRightRadius="@dimen/widget_list_content_corner_radius"
+                android:bottomLeftRadius="@dimen/widget_list_top_bottom_corner_radius"
+                android:bottomRightRadius="@dimen/widget_list_top_bottom_corner_radius" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/res/drawable/widgets_list_middle_ripple.xml b/res/drawable/widgets_list_middle_ripple.xml
new file mode 100644
index 0000000000..da025d79bb
--- /dev/null
+++ b/res/drawable/widgets_list_middle_ripple.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2021, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <corners
+                android:topLeftRadius="@dimen/widget_list_content_corner_radius"
+                android:topRightRadius="@dimen/widget_list_content_corner_radius"
+                android:bottomLeftRadius="@dimen/widget_list_content_corner_radius"
+                android:bottomRightRadius="@dimen/widget_list_content_corner_radius" />
+        </shape>
+    </item>
+
+    <item android:id="@android:id/background">
+        <shape android:shape="rectangle">
+            <solid android:color="?android:attr/colorBackground" />
+            <corners
+                android:topLeftRadius="@dimen/widget_list_content_corner_radius"
+                android:topRightRadius="@dimen/widget_list_content_corner_radius"
+                android:bottomLeftRadius="@dimen/widget_list_content_corner_radius"
+                android:bottomRightRadius="@dimen/widget_list_content_corner_radius" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/res/drawable/widgets_list_top_ripple.xml b/res/drawable/widgets_list_top_ripple.xml
new file mode 100644
index 0000000000..6efc3e1789
--- /dev/null
+++ b/res/drawable/widgets_list_top_ripple.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2021, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <corners
+                android:topLeftRadius="@dimen/widget_list_top_bottom_corner_radius"
+                android:topRightRadius="@dimen/widget_list_top_bottom_corner_radius"
+                android:bottomLeftRadius="@dimen/widget_list_content_corner_radius"
+                android:bottomRightRadius="@dimen/widget_list_content_corner_radius" />
+        </shape>
+    </item>
+
+    <item android:id="@android:id/background">
+        <shape android:shape="rectangle">
+            <solid android:color="?android:attr/colorBackground" />
+            <corners
+                android:topLeftRadius="@dimen/widget_list_top_bottom_corner_radius"
+                android:topRightRadius="@dimen/widget_list_top_bottom_corner_radius"
+                android:bottomLeftRadius="@dimen/widget_list_content_corner_radius"
+                android:bottomRightRadius="@dimen/widget_list_content_corner_radius" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/res/layout/widget_cell_content.xml b/res/layout/widget_cell_content.xml
index 65a49ab627..50908a49ba 100644
--- a/res/layout/widget_cell_content.xml
+++ b/res/layout/widget_cell_content.xml
@@ -36,7 +36,7 @@
         android:gravity="center_horizontal"
         android:singleLine="true"
         android:maxLines="1"
-        android:textColor="?android:attr/textColorSecondary"
+        android:textColor="?android:attr/textColorPrimary"
         android:textSize="14sp" />
 
     <!-- The original dimensions of the widget (can't be the same text as above due to different
@@ -46,7 +46,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:textColor="?android:attr/textColorSecondary"
+        android:textColor="?android:attr/textColorTertiary"
         android:textSize="14sp"
         android:alpha="0.8" />
 
@@ -55,7 +55,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:textSize="12sp"
+        android:textSize="14sp"
+        android:textColor="?android:attr/textColorTertiary"
         android:maxLines="2"
         android:ellipsize="end"
         android:fadingEdge="horizontal" />
diff --git a/res/layout/widgets_full_sheet.xml b/res/layout/widgets_full_sheet.xml
index 226c4f713a..172284b4df 100644
--- a/res/layout/widgets_full_sheet.xml
+++ b/res/layout/widgets_full_sheet.xml
@@ -25,7 +25,7 @@
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?android:attr/colorPrimary"
+        android:background="?android:attr/colorBackgroundFloating"
         android:elevation="4dp">
 
         <TextView
diff --git a/res/layout/widgets_full_sheet_search_and_recommendations.xml b/res/layout/widgets_full_sheet_search_and_recommendations.xml
index 6182255dc6..1219f57e17 100644
--- a/res/layout/widgets_full_sheet_search_and_recommendations.xml
+++ b/res/layout/widgets_full_sheet_search_and_recommendations.xml
@@ -25,7 +25,7 @@
         android:layout_width="48dp"
         android:layout_height="2dp"
         android:layout_gravity="center_horizontal"
-        android:background="@color/popup_color_primary_dark"/>
+        android:background="?android:attr/textColorSecondary"/>
     <TextView
         android:id="@+id/title"
         android:layout_width="match_parent"
@@ -33,6 +33,7 @@
         android:gravity="center_horizontal"
         android:textSize="24sp"
         android:layout_marginTop="16dp"
+        android:textColor="?android:attr/textColorSecondary"
         android:text="@string/widget_button_text"/>
     <include layout="@layout/widgets_search_bar"/>
 </LinearLayout>
diff --git a/res/layout/widgets_list_row_header.xml b/res/layout/widgets_list_row_header.xml
index 15902867ad..62345b39a6 100644
--- a/res/layout/widgets_list_row_header.xml
+++ b/res/layout/widgets_list_row_header.xml
@@ -18,7 +18,9 @@
     android:id="@+id/widgets_list_header"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?android:attr/selectableItemBackground"
+    android:layout_marginHorizontal="8dp"
+    android:background="@drawable/widgets_list_middle_ripple"
+    android:layout_marginBottom="@dimen/widget_list_entry_bottom_margin"
     android:paddingVertical="@dimen/widget_list_header_view_vertical_padding"
     android:orientation="horizontal">
 
@@ -54,6 +56,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:maxLines="1"
+            android:textColor="?android:attr/textColorTertiary"
             tools:text="m widgets, n shortcuts" />
 
     </LinearLayout>
diff --git a/res/layout/widgets_table_container.xml b/res/layout/widgets_table_container.xml
index c4dfe7e7c3..0b5f0b9d6c 100644
--- a/res/layout/widgets_table_container.xml
+++ b/res/layout/widgets_table_container.xml
@@ -19,4 +19,5 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="8dp"
-    android:background="?android:attr/colorPrimaryDark" />
+    android:background="@drawable/widgets_list_middle_ripple"
+    android:layout_marginBottom="@dimen/widget_list_entry_bottom_margin"/>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d135b43df9..5645edc4e4 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -108,7 +108,12 @@
     <dimen name="widget_cell_vertical_padding">8dp</dimen>
     <dimen name="widget_cell_horizontal_padding">16dp</dimen>
 
+
+    <dimen name="widget_list_top_bottom_corner_radius">28dp</dimen>
+    <dimen name="widget_list_content_corner_radius">4dp</dimen>
+
     <dimen name="widget_list_header_view_vertical_padding">20dp</dimen>
+    <dimen name="widget_list_entry_bottom_margin">2dp</dimen>
 
     <dimen name="widget_preview_shadow_blur">0.5dp</dimen>
     <dimen name="widget_preview_key_shadow_distance">1dp</dimen>
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java
index e8c11da2e7..84a03d572c 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java
@@ -34,6 +34,7 @@ import android.widget.TextView;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.R;
+import com.android.launcher3.WidgetPreviewLoader;
 import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.ComponentWithLabel;
 import com.android.launcher3.icons.IconCache;
@@ -78,6 +79,8 @@ public final class WidgetsListHeaderViewHolderBinderTest {
     @Mock
     private DeviceProfile mDeviceProfile;
     @Mock
+    private WidgetPreviewLoader mWidgetPreviewLoader;
+    @Mock
     private OnHeaderClickListener mOnHeaderClickListener;
 
     @Before
@@ -97,8 +100,14 @@ public final class WidgetsListHeaderViewHolderBinderTest {
             return componentWithLabel.getComponent().getShortClassName();
         }).when(mIconCache).getTitleNoCache(any());
 
+        WidgetsListAdapter widgetsListAdapter = new WidgetsListAdapter(mContext,
+                LayoutInflater.from(mTestActivity),
+                mWidgetPreviewLoader,
+                mIconCache,
+                /* iconClickListener= */ view -> {},
+                /* iconLongClickListener= */ view -> false);
         mViewHolderBinder = new WidgetsListHeaderViewHolderBinder(
-                LayoutInflater.from(mTestActivity), mOnHeaderClickListener);
+                LayoutInflater.from(mTestActivity), mOnHeaderClickListener, widgetsListAdapter);
     }
 
     @After
@@ -115,7 +124,7 @@ public final class WidgetsListHeaderViewHolderBinderTest {
                 APP_NAME,
                 TEST_PACKAGE,
                 /* numOfWidgets= */ 3);
-        mViewHolderBinder.bindViewHolder(viewHolder, entry);
+        mViewHolderBinder.bindViewHolder(viewHolder, entry, /* position= */ 0);
 
         TextView appTitle = widgetsListHeader.findViewById(R.id.app_title);
         TextView appSubtitle = widgetsListHeader.findViewById(R.id.app_subtitle);
@@ -133,7 +142,7 @@ public final class WidgetsListHeaderViewHolderBinderTest {
                 TEST_PACKAGE,
                 /* numOfWidgets= */ 3);
 
-        mViewHolderBinder.bindViewHolder(viewHolder, entry);
+        mViewHolderBinder.bindViewHolder(viewHolder, entry, /* position= */ 0);
         widgetsListHeader.callOnClick();
 
         verify(mOnHeaderClickListener).onHeaderClicked(eq(true),
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinderTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinderTest.java
index 07fbfd2a3c..075c58db6b 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinderTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinderTest.java
@@ -34,6 +34,7 @@ import android.widget.TextView;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.R;
+import com.android.launcher3.WidgetPreviewLoader;
 import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.ComponentWithLabel;
 import com.android.launcher3.icons.IconCache;
@@ -78,6 +79,8 @@ public final class WidgetsListSearchHeaderViewHolderBinderTest {
     @Mock
     private DeviceProfile mDeviceProfile;
     @Mock
+    private WidgetPreviewLoader mWidgetPreviewLoader;
+    @Mock
     private OnHeaderClickListener mOnHeaderClickListener;
 
     @Before
@@ -97,8 +100,14 @@ public final class WidgetsListSearchHeaderViewHolderBinderTest {
             return componentWithLabel.getComponent().getShortClassName();
         }).when(mIconCache).getTitleNoCache(any());
 
+        WidgetsListAdapter widgetsListAdapter = new WidgetsListAdapter(mContext,
+                LayoutInflater.from(mTestActivity),
+                mWidgetPreviewLoader,
+                mIconCache,
+                /* iconClickListener= */ view -> {},
+                /* iconLongClickListener= */ view -> false);
         mViewHolderBinder = new WidgetsListSearchHeaderViewHolderBinder(
-                LayoutInflater.from(mTestActivity), mOnHeaderClickListener);
+                LayoutInflater.from(mTestActivity), mOnHeaderClickListener, widgetsListAdapter);
     }
 
     @After
@@ -115,7 +124,7 @@ public final class WidgetsListSearchHeaderViewHolderBinderTest {
                 APP_NAME,
                 TEST_PACKAGE,
                 /* numOfWidgets= */ 3);
-        mViewHolderBinder.bindViewHolder(viewHolder, entry);
+        mViewHolderBinder.bindViewHolder(viewHolder, entry, /* position= */ 0);
 
         TextView appTitle = widgetsListHeader.findViewById(R.id.app_title);
         TextView appSubtitle = widgetsListHeader.findViewById(R.id.app_subtitle);
@@ -134,7 +143,7 @@ public final class WidgetsListSearchHeaderViewHolderBinderTest {
                 TEST_PACKAGE,
                 /* numOfWidgets= */ 3);
 
-        mViewHolderBinder.bindViewHolder(viewHolder, entry);
+        mViewHolderBinder.bindViewHolder(viewHolder, entry, /* position= */ 0);
         widgetsListHeader.callOnClick();
 
         verify(mOnHeaderClickListener).onHeaderClicked(eq(true),
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java
index 8a0cf349c0..0c6e71711d 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java
@@ -106,12 +106,19 @@ public final class WidgetsListTableViewHolderBinderTest {
             return componentWithLabel.getComponent().getShortClassName();
         }).when(mIconCache).getTitleNoCache(any());
 
+        WidgetsListAdapter widgetsListAdapter = new WidgetsListAdapter(mContext,
+                LayoutInflater.from(mTestActivity),
+                mWidgetPreviewLoader,
+                mIconCache,
+                /* iconClickListener= */ view -> {},
+                /* iconLongClickListener= */ view -> false);
         mViewHolderBinder = new WidgetsListTableViewHolderBinder(
                 mContext,
                 LayoutInflater.from(mTestActivity),
                 mOnIconClickListener,
                 mOnLongClickListener,
-                mWidgetPreviewLoader);
+                mWidgetPreviewLoader,
+                widgetsListAdapter);
     }
 
     @After
@@ -127,7 +134,7 @@ public final class WidgetsListTableViewHolderBinderTest {
                 APP_NAME,
                 TEST_PACKAGE,
                 /* numOfWidgets= */ 3);
-        mViewHolderBinder.bindViewHolder(viewHolder, entry);
+        mViewHolderBinder.bindViewHolder(viewHolder, entry, /* position= */ 0);
         shadowOf(getMainLooper()).idle();
 
         // THEN the table container has one row, which contains 3 widgets.
diff --git a/src/com/android/launcher3/recyclerview/ViewHolderBinder.java b/src/com/android/launcher3/recyclerview/ViewHolderBinder.java
index 4653774b39..5b8d5bcafe 100644
--- a/src/com/android/launcher3/recyclerview/ViewHolderBinder.java
+++ b/src/com/android/launcher3/recyclerview/ViewHolderBinder.java
@@ -33,7 +33,7 @@ public interface ViewHolderBinder<T, V extends ViewHolder> {
     V newViewHolder(ViewGroup parent);
 
     /** Populate UI references in {@link ViewHolder} with data. */
-    void bindViewHolder(V viewHolder, T data);
+    void bindViewHolder(V viewHolder, T data, int position);
 
     /**
      * Called when the view is recycled. Views are recycled in batches once they are sufficiently
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
index 9009eb15c8..4f11d731c8 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
@@ -89,16 +89,17 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
             OnClickListener iconClickListener, OnLongClickListener iconLongClickListener) {
         mDiffReporter = new WidgetsDiffReporter(iconCache, this);
         mWidgetsListTableViewHolderBinder = new WidgetsListTableViewHolderBinder(context,
-                layoutInflater, iconClickListener, iconLongClickListener, widgetPreviewLoader);
+                layoutInflater, iconClickListener, iconLongClickListener,
+                widgetPreviewLoader, /* listAdapter= */ this);
         mViewHolderBinders.put(VIEW_TYPE_WIDGETS_LIST, mWidgetsListTableViewHolderBinder);
         mViewHolderBinders.put(
                 VIEW_TYPE_WIDGETS_HEADER,
                 new WidgetsListHeaderViewHolderBinder(
-                        layoutInflater, /*onHeaderClickListener=*/this));
+                        layoutInflater, /* onHeaderClickListener= */this, /* listAdapter= */ this));
         mViewHolderBinders.put(
                 VIEW_TYPE_WIDGETS_SEARCH_HEADER,
                 new WidgetsListSearchHeaderViewHolderBinder(
-                        layoutInflater, /*onHeaderClickListener=*/ this));
+                        layoutInflater, /*onHeaderClickListener=*/ this, /* listAdapter= */ this));
     }
 
     public void setFilter(Predicate<WidgetsListBaseEntry> filter) {
@@ -178,7 +179,7 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
     @Override
     public void onBindViewHolder(ViewHolder holder, int pos) {
         ViewHolderBinder viewHolderBinder = mViewHolderBinders.get(getItemViewType(pos));
-        viewHolderBinder.bindViewHolder(holder, mVisibleEntries.get(pos));
+        viewHolderBinder.bindViewHolder(holder, mVisibleEntries.get(pos), pos);
     }
 
     @Override
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListHeader.java b/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
index 119d094be5..75dd40901b 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
@@ -29,6 +29,7 @@ import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.FastBitmapDrawable;
@@ -58,6 +59,7 @@ public final class WidgetsListHeader extends LinearLayout implements ItemInfoUpd
     @Nullable private HandlerRunnable mIconLoadRequest;
     @Nullable private Drawable mIconDrawable;
     private final int mIconSize;
+    private final int mBottomMarginSize;
 
     private ImageView mAppIcon;
     private TextView mTitle;
@@ -83,6 +85,8 @@ public final class WidgetsListHeader extends LinearLayout implements ItemInfoUpd
                 R.styleable.WidgetsListRowHeader, defStyleAttr, /* defStyleRes= */ 0);
         mIconSize = a.getDimensionPixelSize(R.styleable.WidgetsListRowHeader_appIconSize,
                 grid.iconSizePx);
+        mBottomMarginSize =
+                getResources().getDimensionPixelSize(R.dimen.widget_list_entry_bottom_margin);
     }
 
     @Override
@@ -113,6 +117,13 @@ public final class WidgetsListHeader extends LinearLayout implements ItemInfoUpd
     public void setExpanded(boolean isExpanded) {
         this.mIsExpanded = isExpanded;
         mExpandToggle.setChecked(isExpanded);
+        if (getLayoutParams() instanceof RecyclerView.LayoutParams) {
+            int bottomMargin = isExpanded ? 0 : mBottomMarginSize;
+            RecyclerView.LayoutParams layoutParams =
+                    ((RecyclerView.LayoutParams) getLayoutParams());
+            layoutParams.bottomMargin = bottomMargin;
+            setLayoutParams(layoutParams);
+        }
     }
 
     /** Apply app icon, labels and tag using a generic {@link WidgetsListHeaderEntry}. */
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinder.java b/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinder.java
index fcefe3a5ed..f126321b73 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinder.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinder.java
@@ -30,11 +30,14 @@ public final class WidgetsListHeaderViewHolderBinder implements
         ViewHolderBinder<WidgetsListHeaderEntry, WidgetsListHeaderHolder> {
     private final LayoutInflater mLayoutInflater;
     private final OnHeaderClickListener mOnHeaderClickListener;
+    private final WidgetsListAdapter mWidgetsListAdapter;
 
     public WidgetsListHeaderViewHolderBinder(LayoutInflater layoutInflater,
-            OnHeaderClickListener onHeaderClickListener) {
+            OnHeaderClickListener onHeaderClickListener,
+            WidgetsListAdapter listAdapter) {
         mLayoutInflater = layoutInflater;
         mOnHeaderClickListener = onHeaderClickListener;
+        mWidgetsListAdapter = listAdapter;
     }
 
     @Override
@@ -46,8 +49,16 @@ public final class WidgetsListHeaderViewHolderBinder implements
     }
 
     @Override
-    public void bindViewHolder(WidgetsListHeaderHolder viewHolder, WidgetsListHeaderEntry data) {
+    public void bindViewHolder(WidgetsListHeaderHolder viewHolder, WidgetsListHeaderEntry data,
+            int position) {
         WidgetsListHeader widgetsListHeader = viewHolder.mWidgetsListHeader;
+        if (position == 0) {
+            widgetsListHeader.setBackgroundResource(R.drawable.widgets_list_top_ripple);
+        } else if (position == mWidgetsListAdapter.getItemCount() - 1) {
+            widgetsListHeader.setBackgroundResource(R.drawable.widgets_list_bottom_ripple);
+        } else {
+            widgetsListHeader.setBackgroundResource(R.drawable.widgets_list_middle_ripple);
+        }
         widgetsListHeader.applyFromItemInfoWithIcon(data);
         widgetsListHeader.setExpanded(data.isWidgetListShown());
         widgetsListHeader.setOnExpandChangeListener(isExpanded ->
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinder.java b/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinder.java
index 83c7948f95..37713e1018 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinder.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinder.java
@@ -31,11 +31,14 @@ public final class WidgetsListSearchHeaderViewHolderBinder implements
         ViewHolderBinder<WidgetsListSearchHeaderEntry, WidgetsListSearchHeaderHolder> {
     private final LayoutInflater mLayoutInflater;
     private final OnHeaderClickListener mOnHeaderClickListener;
+    private final WidgetsListAdapter mWidgetsListAdapter;
 
     public WidgetsListSearchHeaderViewHolderBinder(LayoutInflater layoutInflater,
-            OnHeaderClickListener onHeaderClickListener) {
+            OnHeaderClickListener onHeaderClickListener,
+            WidgetsListAdapter listAdapter) {
         mLayoutInflater = layoutInflater;
         mOnHeaderClickListener = onHeaderClickListener;
+        mWidgetsListAdapter = listAdapter;
     }
 
     @Override
@@ -48,8 +51,15 @@ public final class WidgetsListSearchHeaderViewHolderBinder implements
 
     @Override
     public void bindViewHolder(WidgetsListSearchHeaderHolder viewHolder,
-            WidgetsListSearchHeaderEntry data) {
+            WidgetsListSearchHeaderEntry data, int position) {
         WidgetsListHeader widgetsListHeader = viewHolder.mWidgetsListHeader;
+        if (position == 0) {
+            widgetsListHeader.setBackgroundResource(R.drawable.widgets_list_top_ripple);
+        } else if (position == mWidgetsListAdapter.getItemCount() - 1) {
+            widgetsListHeader.setBackgroundResource(R.drawable.widgets_list_bottom_ripple);
+        } else {
+            widgetsListHeader.setBackgroundResource(R.drawable.widgets_list_middle_ripple);
+        }
         widgetsListHeader.applyFromItemInfoWithIcon(data);
         widgetsListHeader.setExpanded(data.isWidgetListShown());
         widgetsListHeader.setOnExpandChangeListener(isExpanded ->
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java b/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
index 47fa71ac83..d0be35df52 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
@@ -52,6 +52,7 @@ public final class WidgetsListTableViewHolderBinder
     private final OnClickListener mIconClickListener;
     private final OnLongClickListener mIconLongClickListener;
     private final WidgetPreviewLoader mWidgetPreviewLoader;
+    private final WidgetsListAdapter mWidgetsListAdapter;
     private boolean mApplyBitmapDeferred = false;
 
     public WidgetsListTableViewHolderBinder(
@@ -59,12 +60,14 @@ public final class WidgetsListTableViewHolderBinder
             LayoutInflater layoutInflater,
             OnClickListener iconClickListener,
             OnLongClickListener iconLongClickListener,
-            WidgetPreviewLoader widgetPreviewLoader) {
+            WidgetPreviewLoader widgetPreviewLoader,
+            WidgetsListAdapter listAdapter) {
         mLayoutInflater = layoutInflater;
         mIndent = context.getResources().getDimensionPixelSize(R.dimen.widget_section_indent);
         mIconClickListener = iconClickListener;
         mIconLongClickListener = iconLongClickListener;
         mWidgetPreviewLoader = widgetPreviewLoader;
+        mWidgetsListAdapter = listAdapter;
     }
 
     /**
@@ -97,13 +100,22 @@ public final class WidgetsListTableViewHolderBinder
     }
 
     @Override
-    public void bindViewHolder(WidgetsRowViewHolder holder, WidgetsListContentEntry entry) {
+    public void bindViewHolder(WidgetsRowViewHolder holder, WidgetsListContentEntry entry,
+            int position) {
         TableLayout table = holder.mTableContainer;
         if (DEBUG) {
             Log.d(TAG, String.format("onBindViewHolder [widget#=%d, table.getChildCount=%d]",
                     entry.mWidgets.size(), table.getChildCount()));
         }
 
+        if (position == mWidgetsListAdapter.getItemCount() - 1) {
+            table.setBackgroundResource(R.drawable.widgets_list_bottom_ripple);
+        } else {
+            // WidgetsListContentEntry is never shown in position 0. There must be a header above
+            // it.
+            table.setBackgroundResource(R.drawable.widgets_list_middle_ripple);
+        }
+
         List<ArrayList<WidgetItem>> widgetItemsTable =
                 WidgetsTableUtils.groupWidgetItemsIntoTable(entry.mWidgets, mMaxSpansPerRow);
         recycleTableBeforeBinding(table, widgetItemsTable);
-- 
GitLab


From 6327dabc2ae0d383322f388880462692ed9ef058 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Wed, 17 Mar 2021 15:51:42 -0700
Subject: [PATCH 0698/1664] Not assuming reverse order of menu shortcuts

For Launcher3 tests the order can be either
Shortcut 0
Shortcut 1
Shortcut 2

or
Shortcut 2
Shortcut 1
Shortcut 0

Test: presubmit
Bug: 182006150
Change-Id: Ie014f5e5655a5b0bff05316c2a1457a5b5f703ef
---
 .../launcher3/ui/TaplTestsLauncher3.java      | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
index 4c9a8e7c3d..6f47df06a6 100644
--- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
+++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
@@ -334,20 +334,31 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
         // 1. Open all apps and wait for load complete.
         // 2. Find the app and long press it to show shortcuts.
         // 3. Press icon center until shortcuts appear
-        final AllApps allApps = mLauncher.
-                getWorkspace().
-                switchToAllApps();
+        final AllApps allApps = mLauncher
+                .getWorkspace()
+                .switchToAllApps();
         allApps.freeze();
         try {
-            final AppIconMenuItem menuItem = allApps.
-                    getAppIcon(APP_NAME).
-                    openMenu().
-                    getMenuItem(0);
-            final String shortcutName = menuItem.getText();
-            assertEquals("Wrong menu item", "Shortcut 3", shortcutName);
+            final AppIconMenu menu = allApps
+                    .getAppIcon(APP_NAME)
+                    .openMenu();
+            final AppIconMenuItem menuItem0 = menu.getMenuItem(0);
+            final AppIconMenuItem menuItem2 = menu.getMenuItem(2);
+
+            final AppIconMenuItem menuItem;
+
+            final String expectedShortcutName = "Shortcut 3";
+            if (menuItem0.getText().equals(expectedShortcutName)) {
+                menuItem = menuItem0;
+            } else {
+                final String shortcutName2 = menuItem2.getText();
+                assertEquals("Wrong menu item", expectedShortcutName, shortcutName2);
+                menuItem = menuItem2;
+            }
 
             menuItem.dragToWorkspace(false, false);
-            mLauncher.getWorkspace().getWorkspaceAppIcon(shortcutName).launch(getAppPackageName());
+            mLauncher.getWorkspace().getWorkspaceAppIcon(expectedShortcutName)
+                    .launch(getAppPackageName());
         } finally {
             allApps.unfreeze();
         }
-- 
GitLab


From 840b42f66fff8898829140ae9e189a04c6120186 Mon Sep 17 00:00:00 2001
From: Jon Spivack <spivack@google.com>
Date: Fri, 26 Feb 2021 15:24:02 -0800
Subject: [PATCH 0699/1664] Pass Assistant web URI in NIU Actions

The Task Overlay for the activity shown in Recents requests the AssistContent for that activity. If the content includes a web URI, this is added to the Intents sent by the NIU Actions buttons.

Bug: 180157890
Test: Manual (tested with Chrome as the recent activity on local device)
Test: TODO (b/179738220)
Change-Id: I33c79e75678605693e0282e4ad82dc6af28957dd
---
 go/AndroidManifest.xml                        |  2 +
 .../quickstep/TaskOverlayFactoryGo.java       | 80 +++++++++++++++++--
 2 files changed, 77 insertions(+), 5 deletions(-)

diff --git a/go/AndroidManifest.xml b/go/AndroidManifest.xml
index f36439db53..2671604f94 100644
--- a/go/AndroidManifest.xml
+++ b/go/AndroidManifest.xml
@@ -24,6 +24,8 @@
 
     <uses-sdk android:targetSdkVersion="29" android:minSdkVersion="25"/>
 
+    <uses-permission android:name="android.permission.GET_TOP_ACTIVITY_INFO" />
+
     <application
         android:backupAgent="com.android.launcher3.LauncherBackupAgent"
         android:fullBackupOnly="true"
diff --git a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
index b102a394f6..36a4e7fa35 100644
--- a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
+++ b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
@@ -20,11 +20,21 @@ import static com.android.quickstep.views.OverviewActionsView.DISABLED_NO_THUMBN
 import static com.android.quickstep.views.OverviewActionsView.DISABLED_ROTATED;
 
 import android.annotation.SuppressLint;
+import android.app.ActivityTaskManager;
+import android.app.IAssistDataReceiver;
+import android.app.assist.AssistContent;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Bitmap;
 import android.graphics.Matrix;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.RemoteException;
 import android.os.SystemClock;
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.android.launcher3.R;
 import com.android.quickstep.views.OverviewActionsView;
@@ -40,6 +50,8 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
     public static final String ACTION_TRANSLATE = "com.android.quickstep.ACTION_TRANSLATE";
     public static final String ACTION_SEARCH = "com.android.quickstep.ACTION_SEARCH";
     public static final String ELAPSED_NANOS = "niu_actions_elapsed_realtime_nanos";
+    public static final String ACTIONS_URL = "niu_actions_app_url";
+    private static final String TAG = "TaskOverlayFactoryGo";
 
     // Empty constructor required for ResourceBasedOverride
     public TaskOverlayFactoryGo(Context context) {}
@@ -56,11 +68,16 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
      * @param <T> The type of View in which the overlay will be placed
      */
     public static final class TaskOverlayGo<T extends OverviewActionsView> extends TaskOverlay {
+        private static final String ASSIST_KEY_CONTENT = "content";
 
-        private String mPackageName;
+        private String mNIUPackageName;
+        private int mTaskId;
+        private Bundle mAssistData;
+        private final Handler mMainThreadHandler;
 
         private TaskOverlayGo(TaskThumbnailView taskThumbnailView) {
             super(taskThumbnailView);
+            mMainThreadHandler = new Handler(Looper.getMainLooper());
         }
 
         /**
@@ -70,16 +87,39 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
         public void initOverlay(Task task, ThumbnailData thumbnail, Matrix matrix,
                 boolean rotated) {
             getActionsView().updateDisabledFlags(DISABLED_NO_THUMBNAIL, thumbnail == null);
-            mPackageName =
+            mNIUPackageName =
                     mApplicationContext.getResources().getString(R.string.niu_actions_package);
 
-            if (thumbnail == null || TextUtils.isEmpty(mPackageName)) {
+            if (thumbnail == null || TextUtils.isEmpty(mNIUPackageName)) {
                 return;
             }
 
             getActionsView().updateDisabledFlags(DISABLED_ROTATED, rotated);
             boolean isAllowedByPolicy = thumbnail.isRealSnapshot;
             getActionsView().setCallbacks(new OverlayUICallbacksGoImpl(isAllowedByPolicy, task));
+
+            mTaskId = task.key.id;
+            AssistDataReceiverImpl receiver = new AssistDataReceiverImpl();
+            receiver.setOverlay(this);
+
+            try {
+                ActivityTaskManager.getService().requestAssistDataForTask(receiver, mTaskId,
+                        mApplicationContext.getPackageName());
+            } catch (RemoteException e) {
+                Log.e(TAG, "Unable to request AssistData");
+            }
+        }
+
+        /**
+         * Called when AssistDataReceiverImpl receives data from ActivityTaskManagerService's
+         * AssistDataRequester
+         */
+        public void onAssistDataReceived(Bundle data) {
+            mMainThreadHandler.post(() -> {
+                if (data != null) {
+                    mAssistData = data;
+                }
+            });
         }
 
         private void sendNIUIntent(String actionType) {
@@ -88,11 +128,21 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
         }
 
         private Intent createNIUIntent(String actionType) {
-            return new Intent(actionType)
+            Intent intent = new Intent(actionType)
                     .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
                     .addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
-                    .setPackage(mPackageName)
+                    .setPackage(mNIUPackageName)
                     .putExtra(ELAPSED_NANOS, SystemClock.elapsedRealtimeNanos());
+
+            if (mAssistData != null) {
+                final AssistContent content = mAssistData.getParcelable(ASSIST_KEY_CONTENT);
+                Uri webUri = (content == null) ? null : content.getWebUri();
+                if (webUri != null) {
+                    intent.putExtra(ACTIONS_URL, webUri.toString());
+                }
+            }
+
+            return intent;
         }
 
         protected class OverlayUICallbacksGoImpl extends OverlayUICallbacksImpl
@@ -130,6 +180,26 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
         }
     }
 
+    /**
+     * Basic AssistDataReceiver. This is passed to ActivityTaskManagerService, which then requests
+     * the data.
+     */
+    private static final class AssistDataReceiverImpl extends IAssistDataReceiver.Stub {
+        private TaskOverlayGo mOverlay;
+
+        public void setOverlay(TaskOverlayGo overlay) {
+            mOverlay = overlay;
+        }
+
+        @Override
+        public void onHandleAssistData(Bundle data) {
+            mOverlay.onAssistDataReceived(data);
+        }
+
+        @Override
+        public void onHandleAssistScreenshot(Bitmap screenshot) {}
+    }
+
     /**
      * Callbacks the Ui can generate. This is the only way for a Ui to call methods on the
      * controller.
-- 
GitLab


From f5c42ea6aa25b8d1b7070418020ab86c1f311a6e Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 12 Mar 2021 16:00:40 -0800
Subject: [PATCH 0700/1664] Adding some build rules in Launcher3

Bug: 182502086
Test: Presubmit
Change-Id: Ib2c18f1e252b3382030293fd3b873e840320301a
Merged-In: Ib2c18f1e252b3382030293fd3b873e840320301a
---
 Android.bp                                    | 80 +++++++++++++------
 SharedLibWrapper/build.gradle                 | 17 ----
 quickstep/Android.bp                          | 19 +++++
 .../quickstep/RecentsActivityTest.java        |  1 +
 .../quickstep/util/TaskViewSimulatorTest.java |  5 +-
 robolectric_tests/Android.bp                  | 26 +++---
 .../robolectric.properties                    |  2 +-
 .../launcher3/ui/LauncherUIScrollTest.java    |  1 +
 tests/Android.bp                              | 17 ++++
 9 files changed, 112 insertions(+), 56 deletions(-)
 delete mode 100644 SharedLibWrapper/build.gradle
 create mode 100644 quickstep/Android.bp
 rename robolectric_tests/{config => resources}/robolectric.properties (98%)
 create mode 100644 tests/Android.bp

diff --git a/Android.bp b/Android.bp
index 002f6fe602..92cc36b5e3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -94,27 +94,35 @@ java_library {
     min_sdk_version: "28",
 }
 
-//
-// Build rule for Launcher3 dependencies lib.
-//
+// Library with all the dependencies for building Launcher3
 android_library {
-    name: "Launcher3CommonDepsLib",
+    name: "Launcher3ResLib",
+    srcs: [ ],
+    resource_dirs: ["res"],
     static_libs: [
+        "LauncherPluginLib",
+        "launcher_quickstep_log_protos_lite",
+        "androidx-constraintlayout_constraintlayout",
         "androidx.recyclerview_recyclerview",
         "androidx.dynamicanimation_dynamicanimation",
+        "androidx.fragment_fragment",
         "androidx.preference_preference",
         "androidx.slice_slice-view",
+        "androidx.cardview_cardview",
         "iconloader_base",
-        "LauncherPluginLib",
-        "launcher_quickstep_log_protos_lite"
-    ],
-    srcs: [
-        "src_build_config/**/*.java",
     ],
-    resource_dirs: ["res"],
-    optimize: {
-        enabled: false,
-    },
+    manifest: "AndroidManifest-common.xml",
+    sdk_version: "current",
+    min_sdk_version: "26",
+}
+
+//
+// Build rule for Launcher3 dependencies lib.
+//
+android_library {
+    name: "Launcher3CommonDepsLib",
+    srcs: ["src_build_config/**/*.java"],
+    static_libs: ["Launcher3ResLib"],
     sdk_version: "current",
     min_sdk_version: "26",
     manifest: "AndroidManifest-common.xml",
@@ -164,22 +172,42 @@ android_app {
     ],
 }
 
-//
-// Launcher Robolectric test target.
-//
-java_library {
-    name: "Launcher3TestCommon",
-    libs: [
-        "Launcher3CommonDepsLib",
+// Library with all the dependencies for building quickstep
+android_library {
+    name: "QuickstepResLib",
+    srcs: [ ],
+    resource_dirs: [
+        "quickstep/res",
+        "quickstep/overview_ui_overrides/res",
     ],
+    static_libs: [
+        "Launcher3ResLib",
+        "SystemUISharedLib",
+        "SystemUI-statsd",
+    ],
+    manifest: "quickstep/AndroidManifest.xml",
+    min_sdk_version: "28",
+}
+
+
+// Source code used for test helpers
+filegroup {
+    name: "launcher-src-ext-tests",
+    srcs: ["ext_tests/src/**/*.java"],
+}
+
+// Common source files used to build launcher
+filegroup {
+    name: "launcher-src-no-build-config",
     srcs: [
         "src/**/*.java",
         "src_shortcuts_overrides/**/*.java",
-        "src_ui_overrides/**/*.java",
-        "ext_tests/src/**/*.java",
-        "tests/src_common/**/*.java",
+        "quickstep/src/**/*.java",
     ],
-    target_sdk_version: "29",
-    sdk_version: "current",
-    min_sdk_version: "26",
+}
+
+// Proguard files for Launcher3
+filegroup {
+    name: "launcher-proguard-rules",
+    srcs: ["proguard.flags"],
 }
diff --git a/SharedLibWrapper/build.gradle b/SharedLibWrapper/build.gradle
deleted file mode 100644
index 674e38abd6..0000000000
--- a/SharedLibWrapper/build.gradle
+++ /dev/null
@@ -1,17 +0,0 @@
-apply plugin: 'java'
-
-final String ANDROID_TOP = "${rootDir}/../../.."
-final String FRAMEWORK_PREBUILTS_DIR = "${ANDROID_TOP}/prebuilts/framework_intermediates/"
-
-sourceSets {
-    main {
-        java.srcDirs = ["${ANDROID_TOP}/frameworks/lib/systemui/SharedLibWrapper/src"]
-    }
-}
-
-sourceCompatibility = 1.8
-
-dependencies {
-    implementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/quickstep/libs", include: 'sysui_shared.jar')
-    compileOnly fileTree(dir: "$ANDROID_TOP/prebuilts/fullsdk-${org.gradle.internal.os.OperatingSystem.current().isMacOsX() ? "darwin" : "linux"}/platforms/${COMPILE_SDK}", include: 'android.jar')
-}
diff --git a/quickstep/Android.bp b/quickstep/Android.bp
new file mode 100644
index 0000000000..585b6ada88
--- /dev/null
+++ b/quickstep/Android.bp
@@ -0,0 +1,19 @@
+// Copyright (C) 2021 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+filegroup {
+    name: "launcher3-quickstep-robolectric-src",
+    path: "robolectric_tests",
+    srcs: ["robolectric_tests/src/**/*.java"],
+}
diff --git a/quickstep/robolectric_tests/src/com/android/quickstep/RecentsActivityTest.java b/quickstep/robolectric_tests/src/com/android/quickstep/RecentsActivityTest.java
index 7049af0eb7..9df9ab1682 100644
--- a/quickstep/robolectric_tests/src/com/android/quickstep/RecentsActivityTest.java
+++ b/quickstep/robolectric_tests/src/com/android/quickstep/RecentsActivityTest.java
@@ -37,6 +37,7 @@ import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(RobolectricTestRunner.class)
 @LooperMode(Mode.PAUSED)
+@org.junit.Ignore
 public class RecentsActivityTest {
 
     @Test
diff --git a/quickstep/robolectric_tests/src/com/android/quickstep/util/TaskViewSimulatorTest.java b/quickstep/robolectric_tests/src/com/android/quickstep/util/TaskViewSimulatorTest.java
index 688f323d75..88079aee73 100644
--- a/quickstep/robolectric_tests/src/com/android/quickstep/util/TaskViewSimulatorTest.java
+++ b/quickstep/robolectric_tests/src/com/android/quickstep/util/TaskViewSimulatorTest.java
@@ -17,6 +17,8 @@ package com.android.quickstep.util;
 
 import static android.view.Display.DEFAULT_DISPLAY;
 
+import static org.mockito.Mockito.mock;
+
 import android.content.Context;
 import android.graphics.Rect;
 import android.graphics.RectF;
@@ -29,6 +31,7 @@ import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.shadows.LShadowDisplay;
 import com.android.launcher3.util.DisplayController;
 import com.android.quickstep.LauncherActivityInterface;
+import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
 
 import org.hamcrest.Description;
@@ -162,7 +165,7 @@ public class TaskViewSimulatorTest {
         @Override
         public SurfaceParams[] createSurfaceParams(BuilderProxy proxy) {
             SurfaceParams.Builder builder = new SurfaceParams.Builder((SurfaceControl) null);
-            proxy.onBuildTargetParams(builder, null, this);
+            proxy.onBuildTargetParams(builder, mock(RemoteAnimationTargetCompat.class), this);
             return new SurfaceParams[] {builder.build()};
         }
 
diff --git a/robolectric_tests/Android.bp b/robolectric_tests/Android.bp
index c738df9aa7..50309b7902 100644
--- a/robolectric_tests/Android.bp
+++ b/robolectric_tests/Android.bp
@@ -16,27 +16,31 @@
 // Launcher Robolectric test target.
 //
 //        "robolectric_android-all-stub", not needed, we write our own stubs
+filegroup {
+    name: "launcher3-robolectric-resources",
+    path: "resources",
+    srcs: ["resources/*"],
+}
+
+filegroup {
+    name: "launcher3-robolectric-src",
+    srcs: ["src/**/*.java"],
+}
+
 android_robolectric_test {
     name: "LauncherRoboTests",
     srcs: [
-        "src/**/*.java",
-    ],
-    java_resource_dirs: [
-        "resources",
-        "res",
-        "config",
+        ":launcher3-robolectric-src",
+        ":launcher3-test-src-common",
     ],
+    java_resources: [":launcher3-robolectric-resources"],
     static_libs: [
         "truth-prebuilt",
-        "Launcher3TestCommon",
         "androidx.test.runner",
         "androidx.test.rules",
         "mockito-robolectric-prebuilt",
     ],
-    //robolectric_prebuilt_version: "4.4",
-    libs: [
-        "platform-robolectric-4.4-prebuilt",
-    ],
+    robolectric_prebuilt_version: "4.5.1",
     instrumentation_for: "Launcher3",
 
     test_options: {
diff --git a/robolectric_tests/config/robolectric.properties b/robolectric_tests/resources/robolectric.properties
similarity index 98%
rename from robolectric_tests/config/robolectric.properties
rename to robolectric_tests/resources/robolectric.properties
index 1b170e1eb4..abb6968431 100644
--- a/robolectric_tests/config/robolectric.properties
+++ b/robolectric_tests/resources/robolectric.properties
@@ -1,4 +1,4 @@
-sdk=29
+sdk=30
 
 shadows= \
     com.android.launcher3.shadows.LShadowAppPredictionManager \
diff --git a/robolectric_tests/src/com/android/launcher3/ui/LauncherUIScrollTest.java b/robolectric_tests/src/com/android/launcher3/ui/LauncherUIScrollTest.java
index 34cb2ad763..4d151f1948 100644
--- a/robolectric_tests/src/com/android/launcher3/ui/LauncherUIScrollTest.java
+++ b/robolectric_tests/src/com/android/launcher3/ui/LauncherUIScrollTest.java
@@ -54,6 +54,7 @@ import org.robolectric.shadows.ShadowLooper;
  */
 @RunWith(RobolectricTestRunner.class)
 @LooperMode(Mode.PAUSED)
+@org.junit.Ignore
 public class LauncherUIScrollTest {
 
     private Context mTargetContext;
diff --git a/tests/Android.bp b/tests/Android.bp
new file mode 100644
index 0000000000..8a73483bb3
--- /dev/null
+++ b/tests/Android.bp
@@ -0,0 +1,17 @@
+// Copyright (C) 2021 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+filegroup {
+    name: "launcher3-test-src-common",
+    srcs: ["src_common/**/*.java"],
+}
-- 
GitLab


From 56c0931e99be808cc433ed8c7024d60bd2b719d1 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Wed, 3 Mar 2021 12:56:00 -0800
Subject: [PATCH 0701/1664] Enable Live Tile

Fixes: 169694902
Fixes: 174866547
Fixes: 181937887
Test: manual
Change-Id: I5f2f304d4003e72ed2fb4ea0b0c74f06d2adfe4b
---
 quickstep/src/com/android/quickstep/views/RecentsView.java | 3 ---
 src/com/android/launcher3/config/FeatureFlags.java         | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index f5b62d5828..3593dbe544 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -617,9 +617,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     @Override
     protected void onWindowVisibilityChanged(int visibility) {
         super.onWindowVisibilityChanged(visibility);
-        if (visibility != VISIBLE && LIVE_TILE.get()) {
-            finishRecentsAnimation(true /* toRecents */, null);
-        }
         updateTaskStackListenerState();
     }
 
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 48e41d5fda..0e4b0ab65e 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -85,7 +85,7 @@ public final class FeatureFlags {
             "ADAPTIVE_ICON_WINDOW_ANIM", true, "Use adaptive icons for window animations.");
 
     public static final BooleanFlag ENABLE_QUICKSTEP_LIVE_TILE = getDebugFlag(
-            "ENABLE_QUICKSTEP_LIVE_TILE", false, "Enable live tile in Quickstep overview");
+            "ENABLE_QUICKSTEP_LIVE_TILE", true, "Enable live tile in Quickstep overview");
 
     // Keep as DeviceFlag to allow remote disable in emergency.
     public static final BooleanFlag ENABLE_SUGGESTED_ACTIONS_OVERVIEW = new DeviceFlag(
-- 
GitLab


From 66ccd29a3d96fa5224a1285552144f4633b529b8 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Thu, 18 Mar 2021 12:09:12 +0000
Subject: [PATCH 0702/1664] Adjust bottom picker padding / margin & add a drag
 handle

Test: Manual
Bug: 179797520
Change-Id: I594bf2cf140a31f20d41fbb9804197724478caf9
---
 res/layout/widgets_bottom_sheet.xml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/res/layout/widgets_bottom_sheet.xml b/res/layout/widgets_bottom_sheet.xml
index c1b2cbff12..d18ba568cf 100644
--- a/res/layout/widgets_bottom_sheet.xml
+++ b/res/layout/widgets_bottom_sheet.xml
@@ -19,12 +19,17 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="28dp"
+    android:paddingTop="16dp"
     android:background="@drawable/top_round_rect_primary"
     android:elevation="@dimen/deep_shortcuts_elevation"
     android:layout_gravity="bottom"
     android:theme="?attr/widgetsTheme">
-
+    <View
+        android:layout_width="48dp"
+        android:layout_height="2dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginBottom="16dp"
+        android:background="?android:attr/textColorSecondary"/>
     <TextView
         style="@style/TextHeadline"
         android:id="@+id/title"
@@ -48,8 +53,8 @@
         android:id="@+id/widgets_table_scroll_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="45dp"
-        android:layout_marginBottom="40dp">
+        android:fadeScrollbars="false"
+        android:layout_marginVertical="16dp">
         <include layout="@layout/widgets_table_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-- 
GitLab


From cb76e7d16fc943d15b3fcf159df1a7b0f2f1068a Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Thu, 18 Mar 2021 12:13:18 +0000
Subject: [PATCH 0703/1664] Improvements to widget picker search.

-Expand clickable area on search bar.

Test: Tested prototype locally.
Bug: b/157286785
Change-Id: I70a4edb1ce207f4dae9a0909c05e0823840500dd
---
 res/layout/widgets_search_bar.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/layout/widgets_search_bar.xml b/res/layout/widgets_search_bar.xml
index 6f65e2bce6..cf693bbd1d 100644
--- a/res/layout/widgets_search_bar.xml
+++ b/res/layout/widgets_search_bar.xml
@@ -6,13 +6,13 @@
     android:layout_height="wrap_content"
     android:orientation="horizontal"
     android:layout_marginTop="16dp"
-    android:background="@drawable/bg_widgets_searchbox"
-    android:padding="12dp">
+    android:background="@drawable/bg_widgets_searchbox">
 
     <com.android.launcher3.ExtendedEditText
         android:id="@+id/widgets_search_bar_edit_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:padding="12dp"
         android:drawablePadding="8dp"
         android:drawableStart="@drawable/ic_allapps_search"
         android:background="@null"
-- 
GitLab


From c79316740b2be062efb8822f3b45b00876ba77d3 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Thu, 18 Mar 2021 11:08:49 -0400
Subject: [PATCH 0704/1664] Update deep shortcut to new ui.

- Removed divider views, using margin to separate views
- Removed elevations
- Added a ViewGroup to hold all notification views, and applied an outline

Bug: 175329686
Test: visual
Change-Id: Iad70dcfdaeba6050c2b17c07f76bb7bfb728e544
---
 res/drawable/middle_item_primary.xml          | 20 ++++++
 res/drawable/single_item_primary.xml          | 20 ++++++
 res/drawable/single_item_secondary.xml        | 20 ++++++
 res/layout/deep_shortcut.xml                  |  9 +--
 res/layout/longpress_options_menu.xml         |  1 -
 res/layout/notification_content.xml           |  8 ---
 res/layout/notification_gutter.xml            |  5 +-
 res/layout/popup_container.xml                | 11 ++-
 res/layout/system_shortcut.xml                |  9 +--
 res/layout/system_shortcut_icons.xml          |  2 +-
 res/layout/user_folder_icon_normalized.xml    |  1 -
 res/values/dimens.xml                         | 20 +++---
 .../notification/NotificationItemView.java    | 46 +++++++-----
 .../android/launcher3/popup/ArrowPopup.java   | 70 ++++++++++++++++++-
 .../popup/PopupContainerWithArrow.java        | 40 +++--------
 .../launcher3/shortcuts/DeepShortcutView.java |  6 --
 .../launcher3/views/OptionsPopupView.java     |  1 -
 17 files changed, 188 insertions(+), 101 deletions(-)
 create mode 100644 res/drawable/middle_item_primary.xml
 create mode 100644 res/drawable/single_item_primary.xml
 create mode 100644 res/drawable/single_item_secondary.xml

diff --git a/res/drawable/middle_item_primary.xml b/res/drawable/middle_item_primary.xml
new file mode 100644
index 0000000000..c9757142da
--- /dev/null
+++ b/res/drawable/middle_item_primary.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="?attr/popupColorPrimary"/>
+    <corners android:radius="@dimen/popup_middle_item_radius" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/single_item_primary.xml b/res/drawable/single_item_primary.xml
new file mode 100644
index 0000000000..1c0889bd23
--- /dev/null
+++ b/res/drawable/single_item_primary.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="?attr/popupColorPrimary"/>
+    <corners android:radius="@dimen/popup_single_item_radius" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/single_item_secondary.xml b/res/drawable/single_item_secondary.xml
new file mode 100644
index 0000000000..4edc4813aa
--- /dev/null
+++ b/res/drawable/single_item_secondary.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="?attr/popupColorSecondary"/>
+    <corners android:radius="@dimen/popup_single_item_radius" />
+</shape>
\ No newline at end of file
diff --git a/res/layout/deep_shortcut.xml b/res/layout/deep_shortcut.xml
index 840a8b776d..d6b4a37dd4 100644
--- a/res/layout/deep_shortcut.xml
+++ b/res/layout/deep_shortcut.xml
@@ -19,6 +19,7 @@
     xmlns:launcher="http://schemas.android.com/apk/res-auto"
     android:layout_width="@dimen/bg_popup_item_width"
     android:layout_height="@dimen/bg_popup_item_height"
+    android:background="@drawable/middle_item_primary"
     android:theme="@style/PopupItem" >
 
     <com.android.launcher3.shortcuts.DeepShortcutTextView
@@ -45,12 +46,4 @@
         android:layout_gravity="start|center_vertical"
         android:background="@drawable/ic_deepshortcut_placeholder"/>
 
-    <View
-        android:id="@+id/divider"
-        android:layout_width="@dimen/deep_shortcuts_divider_width"
-        android:layout_height="@dimen/popup_item_divider_height"
-        android:layout_gravity="end|bottom"
-        android:visibility="gone"
-        android:background="?attr/popupColorTertiary" />
-
 </com.android.launcher3.shortcuts.DeepShortcutView>
diff --git a/res/layout/longpress_options_menu.xml b/res/layout/longpress_options_menu.xml
index 20bb5b81be..3898365b1c 100644
--- a/res/layout/longpress_options_menu.xml
+++ b/res/layout/longpress_options_menu.xml
@@ -18,7 +18,6 @@
     android:id="@+id/deep_shortcuts_container"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="?attr/popupColorPrimary"
     android:clipToPadding="false"
     android:clipChildren="false"
     android:elevation="@dimen/deep_shortcuts_elevation"
diff --git a/res/layout/notification_content.xml b/res/layout/notification_content.xml
index d01be019eb..147aa30525 100644
--- a/res/layout/notification_content.xml
+++ b/res/layout/notification_content.xml
@@ -96,14 +96,6 @@
 
     </com.android.launcher3.notification.NotificationMainView>
 
-    <!-- Divider -->
-    <View
-        android:id="@+id/divider"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/popup_item_divider_height"
-        android:layout_below="@id/main_view"
-        android:background="?attr/popupColorTertiary" />
-
     <!-- Footer -->
     <com.android.launcher3.notification.NotificationFooterLayout
         android:id="@+id/footer"
diff --git a/res/layout/notification_gutter.xml b/res/layout/notification_gutter.xml
index 10e7f7d68a..9a3e55abef 100644
--- a/res/layout/notification_gutter.xml
+++ b/res/layout/notification_gutter.xml
@@ -16,6 +16,5 @@
 <View
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="4dp"
-    android:layout_marginTop="4dp"
-    android:background="@drawable/bg_notification_content" />
\ No newline at end of file
+    android:layout_height="0dp"
+    android:layout_marginTop="@dimen/popup_margin" />
\ No newline at end of file
diff --git a/res/layout/popup_container.xml b/res/layout/popup_container.xml
index c73740771d..04822fd7a2 100644
--- a/res/layout/popup_container.xml
+++ b/res/layout/popup_container.xml
@@ -19,8 +19,15 @@
     android:id="@+id/deep_shortcuts_container"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="?attr/popupColorPrimary"
     android:clipToPadding="false"
     android:clipChildren="false"
     android:elevation="@dimen/deep_shortcuts_elevation"
-    android:orientation="vertical" />
\ No newline at end of file
+    android:orientation="vertical">
+    <LinearLayout
+        android:id="@+id/notification_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:background="?attr/popupColorPrimary"
+        android:orientation="vertical"/>
+</com.android.launcher3.popup.PopupContainerWithArrow>
\ No newline at end of file
diff --git a/res/layout/system_shortcut.xml b/res/layout/system_shortcut.xml
index c620e2af57..68251e4d15 100644
--- a/res/layout/system_shortcut.xml
+++ b/res/layout/system_shortcut.xml
@@ -19,6 +19,7 @@
     xmlns:launcher="http://schemas.android.com/apk/res-auto"
     android:layout_width="@dimen/bg_popup_item_width"
     android:layout_height="@dimen/bg_popup_item_height"
+    android:background="@drawable/middle_item_primary"
     android:theme="@style/PopupItem" >
 
     <com.android.launcher3.BubbleTextView
@@ -44,12 +45,4 @@
         android:layout_gravity="start|center_vertical"
         android:backgroundTint="?android:attr/textColorTertiary"/>
 
-    <View
-        android:id="@+id/divider"
-        android:layout_width="@dimen/deep_shortcuts_divider_width"
-        android:layout_height="@dimen/popup_item_divider_height"
-        android:layout_gravity="end|bottom"
-        android:visibility="gone"
-        android:background="?attr/popupColorTertiary" />
-
 </com.android.launcher3.shortcuts.DeepShortcutView>
diff --git a/res/layout/system_shortcut_icons.xml b/res/layout/system_shortcut_icons.xml
index a340f4fc9d..f9922488fb 100644
--- a/res/layout/system_shortcut_icons.xml
+++ b/res/layout/system_shortcut_icons.xml
@@ -21,7 +21,7 @@
     android:layout_height="@dimen/system_shortcut_header_height"
     android:orientation="horizontal"
     android:gravity="end|center_vertical"
-    android:background="?attr/popupColorSecondary"
+    android:background="@drawable/single_item_secondary"
     android:clipToPadding="true">
 
     <Space android:layout_width="0dp"
diff --git a/res/layout/user_folder_icon_normalized.xml b/res/layout/user_folder_icon_normalized.xml
index d38a77a623..8b188577a8 100644
--- a/res/layout/user_folder_icon_normalized.xml
+++ b/res/layout/user_folder_icon_normalized.xml
@@ -19,7 +19,6 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:background="@drawable/round_rect_folder"
-    android:elevation="5dp"
     android:orientation="vertical" >
 
     <com.android.launcher3.folder.FolderPagedView
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d135b43df9..c0ea2fef76 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -176,16 +176,18 @@
     <dimen name="pending_widget_elevation">2dp</dimen>
 
 <!-- Deep shortcuts -->
-    <dimen name="deep_shortcuts_elevation">9dp</dimen>
-    <!-- also update deep_shortcuts_divider_width -->
+    <dimen name="deep_shortcuts_elevation">0dp</dimen>
     <dimen name="bg_popup_item_width">234dp</dimen>
     <dimen name="bg_popup_item_height">56dp</dimen>
     <dimen name="bg_popup_item_condensed_height">48dp</dimen>
     <dimen name="pre_drag_view_scale">6dp</dimen>
     <!-- an icon with shortcuts must be dragged this far before the container is removed. -->
     <dimen name="deep_shortcuts_start_drag_threshold">16dp</dimen>
-    <dimen name="deep_shortcut_icon_size">36dp</dimen>
-    <dimen name="deep_shortcut_drawable_padding">8dp</dimen>
+    <dimen name="deep_shortcut_icon_size">32dp</dimen>
+    <dimen name="popup_margin">2dp</dimen>
+    <dimen name="popup_single_item_radius">100dp</dimen>
+    <dimen name="popup_middle_item_radius">4dp</dimen>
+    <dimen name="deep_shortcut_drawable_padding">12dp</dimen>
     <dimen name="deep_shortcut_drag_handle_size">16dp</dimen>
     <dimen name="popup_padding_start">10dp</dimen>
     <dimen name="popup_padding_end">16dp</dimen>
@@ -194,16 +196,14 @@
     <dimen name="popup_arrow_height">10dp</dimen>
     <dimen name="popup_arrow_vertical_offset">-1dp</dimen>
     <!-- popup_padding_start + deep_shortcut_icon_size / 2 -->
-    <dimen name="popup_arrow_horizontal_center_offset">28dp</dimen>
+    <dimen name="popup_arrow_horizontal_center_offset">26dp</dimen>
     <dimen name="popup_arrow_corner_radius">2dp</dimen>
     <!-- popup_padding_start + icon_size + 10dp -->
-    <dimen name="deep_shortcuts_text_padding_start">56dp</dimen>
-    <!-- popup_item_width - deep_shortcuts_text_padding_start -->
-    <dimen name="deep_shortcuts_divider_width">178dp</dimen>
+    <dimen name="deep_shortcuts_text_padding_start">52dp</dimen>
     <dimen name="system_shortcut_icon_size">24dp</dimen>
-    <!-- popup_arrow_center_start - system_shortcut_icon_size / 2 -->
+    <!-- popup_arrow_horizontal_center_offset - system_shortcut_icon_size / 2 -->
     <dimen name="system_shortcut_margin_start">16dp</dimen>
-    <dimen name="system_shortcut_header_height">48dp</dimen>
+    <dimen name="system_shortcut_header_height">56dp</dimen>
     <dimen name="system_shortcut_header_icon_touch_size">48dp</dimen>
     <!-- (touch_size - icon_size) / 2 -->
     <dimen name="system_shortcut_header_icon_padding">12dp</dimen>
diff --git a/src/com/android/launcher3/notification/NotificationItemView.java b/src/com/android/launcher3/notification/NotificationItemView.java
index 0320aa3edd..d44d158010 100644
--- a/src/com/android/launcher3/notification/NotificationItemView.java
+++ b/src/com/android/launcher3/notification/NotificationItemView.java
@@ -21,10 +21,13 @@ import static com.android.launcher3.touch.SingleAxisSwipeDetector.HORIZONTAL;
 import android.app.Notification;
 import android.content.Context;
 import android.graphics.Color;
+import android.graphics.Outline;
 import android.graphics.Rect;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.ViewGroup.MarginLayoutParams;
+import android.view.ViewOutlineProvider;
 import android.widget.TextView;
 
 import com.android.launcher3.R;
@@ -43,7 +46,8 @@ public class NotificationItemView {
     private static final Rect sTempRect = new Rect();
 
     private final Context mContext;
-    private final PopupContainerWithArrow mContainer;
+    private final PopupContainerWithArrow mPopupContainer;
+    private final ViewGroup mRootView;
 
     private final TextView mHeaderText;
     private final TextView mHeaderCount;
@@ -53,7 +57,6 @@ public class NotificationItemView {
     private final View mIconView;
 
     private final View mHeader;
-    private final View mDivider;
 
     private View mGutter;
 
@@ -61,8 +64,9 @@ public class NotificationItemView {
     private boolean mAnimatingNextIcon;
     private int mNotificationHeaderTextColor = Notification.COLOR_DEFAULT;
 
-    public NotificationItemView(PopupContainerWithArrow container) {
-        mContainer = container;
+    public NotificationItemView(PopupContainerWithArrow container, ViewGroup rootView) {
+        mPopupContainer = container;
+        mRootView = rootView;
         mContext = container.getContext();
 
         mHeaderText = container.findViewById(R.id.notification_text);
@@ -72,17 +76,25 @@ public class NotificationItemView {
         mIconView = container.findViewById(R.id.popup_item_icon);
 
         mHeader = container.findViewById(R.id.header);
-        mDivider = container.findViewById(R.id.divider);
 
         mSwipeDetector = new SingleAxisSwipeDetector(mContext, mMainView, HORIZONTAL);
         mSwipeDetector.setDetectableScrollConditions(SingleAxisSwipeDetector.DIRECTION_BOTH, false);
         mMainView.setSwipeDetector(mSwipeDetector);
         mFooter.setContainer(this);
+
+        float radius = Themes.getDialogCornerRadius(mContext);
+        rootView.setClipToOutline(true);
+        rootView.setOutlineProvider(new ViewOutlineProvider() {
+            @Override
+            public void getOutline(View view, Outline outline) {
+                outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(), radius);
+            }
+        });
     }
 
     public void addGutter() {
         if (mGutter == null) {
-            mGutter = mContainer.inflateAndAdd(R.layout.notification_gutter, mContainer);
+            mGutter = mPopupContainer.inflateAndAdd(R.layout.notification_gutter, mRootView);
         }
     }
 
@@ -94,9 +106,8 @@ public class NotificationItemView {
     }
 
     public void removeFooter() {
-        if (mContainer.indexOfChild(mFooter) >= 0) {
-            mContainer.removeView(mFooter);
-            mContainer.removeView(mDivider);
+        if (mRootView.indexOfChild(mFooter) >= 0) {
+            mRootView.removeView(mFooter);
         }
     }
 
@@ -108,16 +119,15 @@ public class NotificationItemView {
     }
 
     public void removeAllViews() {
-        mContainer.removeView(mMainView);
-        mContainer.removeView(mHeader);
+        mRootView.removeView(mMainView);
+        mRootView.removeView(mHeader);
 
-        if (mContainer.indexOfChild(mFooter) >= 0) {
-            mContainer.removeView(mFooter);
-            mContainer.removeView(mDivider);
+        if (mRootView.indexOfChild(mFooter) >= 0) {
+            mRootView.removeView(mFooter);
         }
 
         if (mGutter != null) {
-            mContainer.removeView(mGutter);
+            mRootView.removeView(mGutter);
         }
     }
 
@@ -136,11 +146,11 @@ public class NotificationItemView {
 
     public boolean onInterceptTouchEvent(MotionEvent ev) {
         if (ev.getAction() == MotionEvent.ACTION_DOWN) {
-            sTempRect.set(mMainView.getLeft(), mMainView.getTop(),
-                    mMainView.getRight(), mMainView.getBottom());
+            sTempRect.set(mRootView.getLeft(), mRootView.getTop(),
+                    mRootView.getRight(), mRootView.getBottom());
             mIgnoreTouch = !sTempRect.contains((int) ev.getX(), (int) ev.getY());
             if (!mIgnoreTouch) {
-                mContainer.getParent().requestDisallowInterceptTouchEvent(true);
+                mPopupContainer.getParent().requestDisallowInterceptTouchEvent(true);
             }
         }
         if (mIgnoreTouch) {
diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java
index 15915e5380..6aa98122cd 100644
--- a/src/com/android/launcher3/popup/ArrowPopup.java
+++ b/src/com/android/launcher3/popup/ArrowPopup.java
@@ -28,6 +28,7 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Outline;
 import android.graphics.Rect;
+import android.graphics.drawable.GradientDrawable;
 import android.util.AttributeSet;
 import android.util.Pair;
 import android.view.Gravity;
@@ -48,6 +49,7 @@ import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.RevealOutlineAnimation;
 import com.android.launcher3.anim.RoundedRectRevealOutlineProvider;
 import com.android.launcher3.dragndrop.DragLayer;
+import com.android.launcher3.shortcuts.DeepShortcutView;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.BaseDragLayer;
 
@@ -75,6 +77,8 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
     private final int mArrowPointRadius;
     private final View mArrow;
 
+    private final int mMargin;
+
     protected boolean mIsLeftAligned;
     protected boolean mIsAboveIcon;
     private int mGravity;
@@ -84,6 +88,9 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
     private final Rect mStartRect = new Rect();
     private final Rect mEndRect = new Rect();
 
+    private final GradientDrawable mRoundedTop;
+    private final GradientDrawable mRoundedBottom;
+
     private Runnable mOnCloseCallback = () -> { };
 
     public ArrowPopup(Context context, AttributeSet attrs, int defStyleAttr) {
@@ -103,6 +110,7 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
 
         // Initialize arrow view
         final Resources resources = getResources();
+        mMargin = resources.getDimensionPixelSize(R.dimen.popup_margin);
         mArrowWidth = resources.getDimensionPixelSize(R.dimen.popup_arrow_width);
         mArrowHeight = resources.getDimensionPixelSize(R.dimen.popup_arrow_height);
         mArrow = new View(context);
@@ -111,6 +119,17 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
         mArrowOffsetHorizontal = resources.getDimensionPixelSize(
                 R.dimen.popup_arrow_horizontal_center_offset) - (mArrowWidth / 2);
         mArrowPointRadius = resources.getDimensionPixelSize(R.dimen.popup_arrow_corner_radius);
+
+        mRoundedTop = new GradientDrawable();
+        mRoundedTop.setColor(Themes.getAttrColor(context, R.attr.popupColorPrimary));
+        mRoundedTop.setCornerRadii(new float[] { mOutlineRadius, mOutlineRadius, mOutlineRadius,
+                mOutlineRadius, 0, 0, 0, 0});
+
+        mRoundedBottom = new GradientDrawable();
+        mRoundedBottom.setColor(Themes.getAttrColor(context, R.attr.popupColorPrimary));
+        mRoundedBottom.setCornerRadii(new float[] { 0, 0, 0, 0, mOutlineRadius, mOutlineRadius,
+                mOutlineRadius, mOutlineRadius});
+
     }
 
     public ArrowPopup(Context context, AttributeSet attrs) {
@@ -153,6 +172,50 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
      */
     protected void onInflationComplete(boolean isReversed) { }
 
+    /**
+     * Set the margins and radius of backgrounds after views are properly ordered.
+     */
+    protected void assignMarginsAndBackgrounds() {
+        int count = getChildCount();
+        int totalVisibleShortcuts = 0;
+        for (int i = 0; i < count; i++) {
+            View view = getChildAt(i);
+            if (view.getVisibility() == VISIBLE && view instanceof DeepShortcutView) {
+                totalVisibleShortcuts++;
+            }
+        }
+
+        int numVisibleShortcut = 0;
+        View lastView = null;
+        for (int i = 0; i < count; i++) {
+            View view = getChildAt(i);
+            boolean isShortcut = view instanceof DeepShortcutView;
+            if (view.getVisibility() == VISIBLE) {
+                if (lastView != null) {
+                    MarginLayoutParams mlp = (MarginLayoutParams) lastView.getLayoutParams();
+                    mlp.bottomMargin = mMargin;
+                }
+                lastView = view;
+                MarginLayoutParams mlp = (MarginLayoutParams) lastView.getLayoutParams();
+                mlp.bottomMargin = 0;
+
+                if (isShortcut) {
+                    if (totalVisibleShortcuts == 1) {
+                        view.setBackgroundResource(R.drawable.single_item_primary);
+                    } else if (totalVisibleShortcuts > 1) {
+                        if (numVisibleShortcut == 0) {
+                            view.setBackground(mRoundedTop);
+                        } else if (numVisibleShortcut == (totalVisibleShortcuts - 1)) {
+                            view.setBackground(mRoundedBottom);
+                        }
+                        numVisibleShortcut++;
+                    }
+                }
+            }
+        }
+        measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
+    }
+
     /**
      * Shows the popup at the desired location, optionally reversing the children.
      * @param viewsToFlip number of views from the top to to flip in case of reverse order
@@ -164,6 +227,8 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
             reverseOrder(viewsToFlip);
         }
         onInflationComplete(reverseOrder);
+        assignMarginsAndBackgrounds();
+        orientAboutObject();
         if (shouldAddArrow()) {
             addArrow();
         }
@@ -176,6 +241,8 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
     protected void show() {
         setupForDisplay();
         onInflationComplete(false);
+        assignMarginsAndBackgrounds();
+        orientAboutObject();
         if (shouldAddArrow()) {
             addArrow();
         }
@@ -203,8 +270,6 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
         for (int i = 0; i < count; i++) {
             addView(allViews.get(i));
         }
-
-        orientAboutObject();
     }
 
     private int getArrowLeft() {
@@ -408,6 +473,7 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
                 ? getResources().getInteger(R.integer.config_popupArrowOpenCloseDuration)
                 : 0;
     }
+
     private void animateOpen() {
         setVisibility(View.VISIBLE);
 
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index a1ba74703c..4087f49f8e 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -91,6 +91,7 @@ public class PopupContainerWithArrow<T extends BaseDraggingActivity> extends Arr
     private BubbleTextView mOriginalIcon;
     private NotificationItemView mNotificationItemView;
     private int mNumNotifications;
+    private ViewGroup mNotificationContainer;
 
     private ViewGroup mSystemShortcutContainer;
 
@@ -222,20 +223,6 @@ public class PopupContainerWithArrow<T extends BaseDraggingActivity> extends Arr
         if (isReversed && mNotificationItemView != null) {
             mNotificationItemView.inverseGutterMargin();
         }
-
-        // Update dividers
-        int count = getChildCount();
-        DeepShortcutView lastView = null;
-        for (int i = 0; i < count; i++) {
-            View view = getChildAt(i);
-            if (view.getVisibility() == VISIBLE && view instanceof DeepShortcutView) {
-                if (lastView != null) {
-                    lastView.setDividerVisibility(VISIBLE);
-                }
-                lastView = (DeepShortcutView) view;
-                lastView.setDividerVisibility(INVISIBLE);
-            }
-        }
     }
 
     @TargetApi(Build.VERSION_CODES.P)
@@ -257,8 +244,12 @@ public class PopupContainerWithArrow<T extends BaseDraggingActivity> extends Arr
         // Add views
         if (mNumNotifications > 0) {
             // Add notification entries
-            View.inflate(getContext(), R.layout.notification_content, this);
-            mNotificationItemView = new NotificationItemView(this);
+            if (mNotificationContainer == null) {
+                mNotificationContainer = findViewById(R.id.notification_container);
+                mNotificationContainer.setVisibility(VISIBLE);
+            }
+            View.inflate(getContext(), R.layout.notification_content, mNotificationContainer);
+            mNotificationItemView = new NotificationItemView(this, mNotificationContainer);
             if (mNumNotifications == 1) {
                 mNotificationItemView.removeFooter();
             }
@@ -358,21 +349,6 @@ public class PopupContainerWithArrow<T extends BaseDraggingActivity> extends Arr
         }
     }
 
-    private void updateDividers() {
-        int count = getChildCount();
-        DeepShortcutView lastView = null;
-        for (int i = 0; i < count; i++) {
-            View view = getChildAt(i);
-            if (view.getVisibility() == VISIBLE && view instanceof DeepShortcutView) {
-                if (lastView != null) {
-                    lastView.setDividerVisibility(VISIBLE);
-                }
-                lastView = (DeepShortcutView) view;
-                lastView.setDividerVisibility(INVISIBLE);
-            }
-        }
-    }
-
     private void initializeSystemShortcut(int resId, ViewGroup container, SystemShortcut info) {
         View view = inflateAndAdd(
                 resId, container, getInsertIndexForSystemShortcut(container, info));
@@ -592,7 +568,7 @@ public class PopupContainerWithArrow<T extends BaseDraggingActivity> extends Arr
                 mNotificationItemView.removeAllViews();
                 mNotificationItemView = null;
                 updateHiddenShortcuts();
-                updateDividers();
+                assignMarginsAndBackgrounds();
             } else {
                 mNotificationItemView.trimNotifications(
                         NotificationKeyData.extractKeysOnly(dotInfo.getNotificationKeys()));
diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutView.java b/src/com/android/launcher3/shortcuts/DeepShortcutView.java
index e9b92e2f10..1c1418c325 100644
--- a/src/com/android/launcher3/shortcuts/DeepShortcutView.java
+++ b/src/com/android/launcher3/shortcuts/DeepShortcutView.java
@@ -41,7 +41,6 @@ public class DeepShortcutView extends FrameLayout {
 
     private BubbleTextView mBubbleText;
     private View mIconView;
-    private View mDivider;
 
     private WorkspaceItemInfo mInfo;
     private ShortcutInfo mDetail;
@@ -63,11 +62,6 @@ public class DeepShortcutView extends FrameLayout {
         super.onFinishInflate();
         mBubbleText = findViewById(R.id.bubble_text);
         mIconView = findViewById(R.id.icon);
-        mDivider = findViewById(R.id.divider);
-    }
-
-    public void setDividerVisibility(int visibility) {
-        mDivider.setVisibility(visibility);
     }
 
     public BubbleTextView getBubbleText() {
diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java
index 1a114f3ce7..9a2db109ef 100644
--- a/src/com/android/launcher3/views/OptionsPopupView.java
+++ b/src/com/android/launcher3/views/OptionsPopupView.java
@@ -134,7 +134,6 @@ public class OptionsPopupView extends ArrowPopup
                     (DeepShortcutView) popup.inflateAndAdd(R.layout.system_shortcut, popup);
             view.getIconView().setBackgroundResource(item.iconRes);
             view.getBubbleText().setText(item.labelRes);
-            view.setDividerVisibility(View.INVISIBLE);
             view.setOnClickListener(popup);
             view.setOnLongClickListener(popup);
             popup.mItemMap.put(view, item);
-- 
GitLab


From ea0d30de6851fdd02ef08f9fbd42c38400e35e29 Mon Sep 17 00:00:00 2001
From: Mariia Sandrikova <mariiasand@google.com>
Date: Thu, 18 Mar 2021 12:09:47 +0000
Subject: [PATCH 0705/1664] Revert "Enable Live Tile"

This reverts commit 56c0931e99be808cc433ed8c7024d60bd2b719d1.

Reason for revert: DroidMonitor: Potential culprit for Bug 183078688 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Fix: 183078688
Fix: 183091281
Change-Id: I050b3e26d35a7a1b60b5ccc58d371a7ab8efb0dc
---
 quickstep/src/com/android/quickstep/views/RecentsView.java | 3 +++
 src/com/android/launcher3/config/FeatureFlags.java         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 3593dbe544..f5b62d5828 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -617,6 +617,9 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     @Override
     protected void onWindowVisibilityChanged(int visibility) {
         super.onWindowVisibilityChanged(visibility);
+        if (visibility != VISIBLE && LIVE_TILE.get()) {
+            finishRecentsAnimation(true /* toRecents */, null);
+        }
         updateTaskStackListenerState();
     }
 
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 0e4b0ab65e..48e41d5fda 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -85,7 +85,7 @@ public final class FeatureFlags {
             "ADAPTIVE_ICON_WINDOW_ANIM", true, "Use adaptive icons for window animations.");
 
     public static final BooleanFlag ENABLE_QUICKSTEP_LIVE_TILE = getDebugFlag(
-            "ENABLE_QUICKSTEP_LIVE_TILE", true, "Enable live tile in Quickstep overview");
+            "ENABLE_QUICKSTEP_LIVE_TILE", false, "Enable live tile in Quickstep overview");
 
     // Keep as DeviceFlag to allow remote disable in emergency.
     public static final BooleanFlag ENABLE_SUGGESTED_ACTIONS_OVERVIEW = new DeviceFlag(
-- 
GitLab


From 7c67fafe4d2c355d3b3564bf84f8e1548281706d Mon Sep 17 00:00:00 2001
From: Pat Manning <patmanning@google.com>
Date: Thu, 18 Mar 2021 17:24:25 +0000
Subject: [PATCH 0706/1664] Respect clip hint when aligning cropped thumbnails.

With clipping off, alignment will show letterbox borders. With clipping
we will respect the clip hints.

Test: manual
Bug: 177402412
Change-Id: Ie9d2c95636f23c4f64635ac6d55eb59306c30223
---
 .../quickstep/views/TaskThumbnailView.java        | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
index 17d075f6c8..2b54f95bdf 100644
--- a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
@@ -550,23 +550,26 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
 
                 // Update the clip hints. Align to 0,0, crop the remaining.
                 if (isRtl) {
+                    thumbnailClipHint.left += availableWidth - croppedWidth;
                     if (thumbnailClipHint.right < 0) {
                         thumbnailClipHint.left += thumbnailClipHint.right;
+                        thumbnailClipHint.right = 0;
                     }
-                    thumbnailClipHint.right = 0;
-                    thumbnailClipHint.left += availableWidth - croppedWidth;
                 } else {
+                    thumbnailClipHint.right += availableWidth - croppedWidth;
                     if (thumbnailClipHint.left < 0) {
                         thumbnailClipHint.right += thumbnailClipHint.left;
+                        thumbnailClipHint.left = 0;
                     }
-                    thumbnailClipHint.left = 0;
-                    thumbnailClipHint.right += availableWidth - croppedWidth;
                 }
+                thumbnailClipHint.bottom += availableHeight - croppedHeight;
                 if (thumbnailClipHint.top < 0) {
                     thumbnailClipHint.bottom += thumbnailClipHint.top;
+                    thumbnailClipHint.top = 0;
+                } else if (thumbnailClipHint.bottom < 0) {
+                    thumbnailClipHint.top += thumbnailClipHint.bottom;
+                    thumbnailClipHint.bottom = 0;
                 }
-                thumbnailClipHint.top = 0;
-                thumbnailClipHint.bottom += availableHeight - croppedHeight;
 
                 thumbnailScale = targetW / (croppedWidth * scale);
             }
-- 
GitLab


From 19946daf220d66a50c7d2ec02d14abc2980aba0b Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 2 Feb 2021 23:29:09 -0800
Subject: [PATCH 0707/1664] Update calls to go through the feature interface
 instead of sysui proxy

Bug: 180074017
Test: atest PinnedStackTests
Test: Verify Pip works w/ launcher (shelf offsets, autoenter, etc)
Change-Id: I7de733f7267123218f6550963e44f6a893ad99b2
---
 .../launcher3/QuickstepTransitionManager.java |   2 +-
 .../com/android/quickstep/SystemUiProxy.java  | 240 ++++++++++--------
 .../quickstep/TouchInteractionService.java    |  24 +-
 .../android/quickstep/views/RecentsView.java  |  23 +-
 4 files changed, 169 insertions(+), 120 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 7404dee9d1..9ac2c72045 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -84,7 +84,6 @@ import com.android.quickstep.util.RemoteAnimationProvider;
 import com.android.quickstep.util.StaggeredWorkspaceAnim;
 import com.android.quickstep.util.SurfaceTransactionApplier;
 import com.android.quickstep.views.RecentsView;
-import com.android.systemui.shared.recents.IStartingWindowListener;
 import com.android.systemui.shared.system.ActivityCompat;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
 import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
@@ -96,6 +95,7 @@ import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 import com.android.systemui.shared.system.RemoteTransitionCompat;
 import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
 import com.android.systemui.shared.system.WindowManagerWrapper;
+import com.android.wm.shell.startingsurface.IStartingWindowListener;
 
 import java.util.LinkedHashMap;
 
diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index a70cc4ccd2..cf71eaeeb8 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -35,12 +35,17 @@ import android.util.Log;
 import android.view.MotionEvent;
 
 import com.android.launcher3.util.MainThreadInitializedObject;
-import com.android.systemui.shared.recents.IPinnedStackAnimationListener;
-import com.android.systemui.shared.recents.ISplitScreenListener;
-import com.android.systemui.shared.recents.IStartingWindowListener;
 import com.android.systemui.shared.recents.ISystemUiProxy;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.system.RemoteTransitionCompat;
+import com.android.wm.shell.onehanded.IOneHanded;
+import com.android.wm.shell.pip.IPip;
+import com.android.wm.shell.pip.IPipAnimationListener;
+import com.android.wm.shell.splitscreen.ISplitScreen;
+import com.android.wm.shell.splitscreen.ISplitScreenListener;
+import com.android.wm.shell.startingsurface.IStartingWindow;
+import com.android.wm.shell.startingsurface.IStartingWindowListener;
+import com.android.wm.shell.transition.IShellTransitions;
 
 /**
  * Holds the reference to SystemUI.
@@ -53,8 +58,13 @@ public class SystemUiProxy implements ISystemUiProxy,
             new MainThreadInitializedObject<>(SystemUiProxy::new);
 
     private ISystemUiProxy mSystemUiProxy;
+    private IPip mPip;
+    private ISplitScreen mSplitScreen;
+    private IOneHanded mOneHanded;
+    private IShellTransitions mShellTransitions;
+    private IStartingWindow mStartingWindow;
     private final DeathRecipient mSystemUiProxyDeathRecipient = () -> {
-        MAIN_EXECUTOR.execute(() -> setProxy(null));
+        MAIN_EXECUTOR.execute(() -> clearProxy());
     };
 
     // Used to dedupe calls to SystemUI
@@ -83,12 +93,23 @@ public class SystemUiProxy implements ISystemUiProxy,
         return null;
     }
 
-    public void setProxy(ISystemUiProxy proxy) {
+    public void setProxy(ISystemUiProxy proxy, IPip pip, ISplitScreen splitScreen,
+            IOneHanded oneHanded, IShellTransitions shellTransitions,
+            IStartingWindow startingWindow) {
         unlinkToDeath();
         mSystemUiProxy = proxy;
+        mPip = pip;
+        mSplitScreen = splitScreen;
+        mOneHanded = oneHanded;
+        mShellTransitions = shellTransitions;
+        mStartingWindow = startingWindow;
         linkToDeath();
     }
 
+    public void clearProxy() {
+        setProxy(null, null, null, null, null, null);
+    }
+
     // TODO(141886704): Find a way to remove this
     public void setLastSystemUiStateFlags(int stateFlags) {
         mLastSystemUiStateFlags = stateFlags;
@@ -267,21 +288,6 @@ public class SystemUiProxy implements ISystemUiProxy,
         }
     }
 
-    @Override
-    public void setShelfHeight(boolean visible, int shelfHeight) {
-        boolean changed = visible != mLastShelfVisible || shelfHeight != mLastShelfHeight;
-        if (mSystemUiProxy != null && changed) {
-            mLastShelfVisible = visible;
-            mLastShelfHeight = shelfHeight;
-            try {
-                mSystemUiProxy.setShelfHeight(visible, shelfHeight);
-            } catch (RemoteException e) {
-                Log.w(TAG, "Failed call setShelfHeight visible: " + visible
-                        + " height: " + shelfHeight, e);
-            }
-        }
-    }
-
     @Override
     public void handleImageAsScreenshot(Bitmap bitmap, Rect rect, Insets insets, int i) {
         if (mSystemUiProxy != null) {
@@ -318,20 +324,6 @@ public class SystemUiProxy implements ISystemUiProxy,
         }
     }
 
-    /**
-     * Sets listener to get pinned stack animation callbacks.
-     */
-    @Override
-    public void setPinnedStackAnimationListener(IPinnedStackAnimationListener listener) {
-        if (mSystemUiProxy != null) {
-            try {
-                mSystemUiProxy.setPinnedStackAnimationListener(listener);
-            } catch (RemoteException e) {
-                Log.w(TAG, "Failed call setPinnedStackAnimationListener", e);
-            }
-        }
-    }
-
     @Override
     public void onQuickSwitchToNewTask(int rotation) {
         if (mSystemUiProxy != null) {
@@ -357,44 +349,55 @@ public class SystemUiProxy implements ISystemUiProxy,
     }
 
     @Override
-    public void startOneHandedMode() {
+    public void expandNotificationPanel() {
         if (mSystemUiProxy != null) {
             try {
-                mSystemUiProxy.startOneHandedMode();
+                mSystemUiProxy.expandNotificationPanel();
             } catch (RemoteException e) {
-                Log.w(TAG, "Failed call startOneHandedMode", e);
+                Log.w(TAG, "Failed call expandNotificationPanel", e);
             }
         }
     }
 
-    @Override
-    public void stopOneHandedMode() {
-        if (mSystemUiProxy != null) {
+    //
+    // Pip
+    //
+
+    /**
+     * Sets the shelf height.
+     */
+    public void setShelfHeight(boolean visible, int shelfHeight) {
+        boolean changed = visible != mLastShelfVisible || shelfHeight != mLastShelfHeight;
+        if (mPip != null && changed) {
+            mLastShelfVisible = visible;
+            mLastShelfHeight = shelfHeight;
             try {
-                mSystemUiProxy.stopOneHandedMode();
+                mPip.setShelfHeight(visible, shelfHeight);
             } catch (RemoteException e) {
-                Log.w(TAG, "Failed call stopOneHandedMode", e);
+                Log.w(TAG, "Failed call setShelfHeight visible: " + visible
+                        + " height: " + shelfHeight, e);
             }
         }
     }
 
-    @Override
-    public void expandNotificationPanel() {
-        if (mSystemUiProxy != null) {
+    /**
+     * Sets listener to get pinned stack animation callbacks.
+     */
+    public void setPinnedStackAnimationListener(IPipAnimationListener listener) {
+        if (mPip != null) {
             try {
-                mSystemUiProxy.expandNotificationPanel();
+                mPip.setPinnedStackAnimationListener(listener);
             } catch (RemoteException e) {
-                Log.w(TAG, "Failed call expandNotificationPanel", e);
+                Log.w(TAG, "Failed call setPinnedStackAnimationListener", e);
             }
         }
     }
 
-    @Override
     public Rect startSwipePipToHome(ComponentName componentName, ActivityInfo activityInfo,
             PictureInPictureParams pictureInPictureParams, int launcherRotation, int shelfHeight) {
-        if (mSystemUiProxy != null) {
+        if (mPip != null) {
             try {
-                return mSystemUiProxy.startSwipePipToHome(componentName, activityInfo,
+                return mPip.startSwipePipToHome(componentName, activityInfo,
                         pictureInPictureParams, launcherRotation, shelfHeight);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call startSwipePipToHome", e);
@@ -403,111 +406,85 @@ public class SystemUiProxy implements ISystemUiProxy,
         return null;
     }
 
-    @Override
     public void stopSwipePipToHome(ComponentName componentName, Rect destinationBounds) {
-        if (mSystemUiProxy != null) {
+        if (mPip != null) {
             try {
-                mSystemUiProxy.stopSwipePipToHome(componentName, destinationBounds);
+                mPip.stopSwipePipToHome(componentName, destinationBounds);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call stopSwipePipToHome");
             }
         }
     }
 
-    @Override
-    public void registerRemoteTransition(RemoteTransitionCompat remoteTransition) {
-        if (mSystemUiProxy != null) {
-            try {
-                mSystemUiProxy.registerRemoteTransition(remoteTransition);
-            } catch (RemoteException e) {
-                Log.w(TAG, "Failed call registerRemoteTransition");
-            }
-        }
-    }
+    //
+    // Splitscreen
+    //
 
-    @Override
-    public void unregisterRemoteTransition(RemoteTransitionCompat remoteTransition) {
-        if (mSystemUiProxy != null) {
-            try {
-                mSystemUiProxy.unregisterRemoteTransition(remoteTransition);
-            } catch (RemoteException e) {
-                Log.w(TAG, "Failed call registerRemoteTransition");
-            }
-        }
-    }
-
-    @Override
     public void registerSplitScreenListener(ISplitScreenListener listener) {
-        if (mSystemUiProxy != null) {
+        if (mSplitScreen != null) {
             try {
-                mSystemUiProxy.registerSplitScreenListener(listener);
+                mSplitScreen.registerSplitScreenListener(listener);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call registerSplitScreenListener");
             }
         }
     }
 
-    @Override
     public void unregisterSplitScreenListener(ISplitScreenListener listener) {
-        if (mSystemUiProxy != null) {
+        if (mSplitScreen != null) {
             try {
-                mSystemUiProxy.unregisterSplitScreenListener(listener);
+                mSplitScreen.unregisterSplitScreenListener(listener);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call unregisterSplitScreenListener");
             }
         }
     }
 
-    @Override
     public void setSideStageVisibility(boolean visible) {
-        if (mSystemUiProxy != null) {
+        if (mSplitScreen != null) {
             try {
-                mSystemUiProxy.setSideStageVisibility(visible);
+                mSplitScreen.setSideStageVisibility(visible);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call setSideStageVisibility");
             }
         }
     }
 
-    @Override
     public void exitSplitScreen() {
-        if (mSystemUiProxy != null) {
+        if (mSplitScreen != null) {
             try {
-                mSystemUiProxy.exitSplitScreen();
+                mSplitScreen.exitSplitScreen();
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call exitSplitScreen");
             }
         }
     }
 
-    @Override
     public void exitSplitScreenOnHide(boolean exitSplitScreenOnHide) {
-        if (mSystemUiProxy != null) {
+        if (mSplitScreen != null) {
             try {
-                mSystemUiProxy.exitSplitScreenOnHide(exitSplitScreenOnHide);
+                mSplitScreen.exitSplitScreenOnHide(exitSplitScreenOnHide);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call exitSplitScreen");
             }
         }
     }
 
-    @Override
     public void startTask(int taskId, int stage, int position, Bundle options) {
-        if (mSystemUiProxy != null) {
+        if (mSplitScreen != null) {
             try {
-                mSystemUiProxy.startTask(taskId, stage, position, options);
+                mSplitScreen.startTask(taskId, stage, position, options);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call startTask");
             }
         }
     }
 
-    @Override
     public void startShortcut(String packageName, String shortcutId, int stage, int position,
             Bundle options, UserHandle user) {
-        if (mSystemUiProxy != null) {
+        if (mSplitScreen != null) {
             try {
-                mSystemUiProxy.startShortcut(packageName, shortcutId, stage, position, options,
+                mSplitScreen.startShortcut(packageName, shortcutId, stage, position, options,
                         user);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call startShortcut");
@@ -515,38 +492,87 @@ public class SystemUiProxy implements ISystemUiProxy,
         }
     }
 
-    @Override
-    public void startIntent(PendingIntent intent, Intent fillInIntent, int stage,
-            int position, Bundle options) {
-        if (mSystemUiProxy != null) {
+    public void startIntent(PendingIntent intent, Intent fillInIntent, int stage, int position,
+            Bundle options) {
+        if (mSplitScreen != null) {
             try {
-                mSystemUiProxy.startIntent(intent, fillInIntent, stage, position,
-                        options);
+                mSplitScreen.startIntent(intent, fillInIntent, stage, position, options);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call startIntent");
             }
         }
     }
 
-    @Override
     public void removeFromSideStage(int taskId) {
-        if (mSystemUiProxy != null) {
+        if (mSplitScreen != null) {
             try {
-                mSystemUiProxy.removeFromSideStage(taskId);
+                mSplitScreen.removeFromSideStage(taskId);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call removeFromSideStage");
             }
         }
     }
 
+    //
+    // One handed
+    //
+
+    public void startOneHandedMode() {
+        if (mOneHanded != null) {
+            try {
+                mOneHanded.startOneHanded();
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call startOneHandedMode", e);
+            }
+        }
+    }
+
+    public void stopOneHandedMode() {
+        if (mOneHanded != null) {
+            try {
+                mOneHanded.stopOneHanded();
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call stopOneHandedMode", e);
+            }
+        }
+    }
+
+    //
+    // Remote transitions
+    //
+
+    public void registerRemoteTransition(RemoteTransitionCompat remoteTransition) {
+        if (mShellTransitions != null) {
+            try {
+                mShellTransitions.registerRemote(remoteTransition.getFilter(),
+                        remoteTransition.getTransition());
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call registerRemoteTransition");
+            }
+        }
+    }
+
+    public void unregisterRemoteTransition(RemoteTransitionCompat remoteTransition) {
+        if (mShellTransitions != null) {
+            try {
+                mShellTransitions.unregisterRemote(remoteTransition.getTransition());
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call registerRemoteTransition");
+            }
+        }
+    }
+
+    //
+    // Starting window
+    //
+
     /**
      * Sets listener to get callbacks when launching a task.
      */
-    @Override
     public void setStartingWindowListener(IStartingWindowListener listener) {
-        if (mSystemUiProxy != null) {
+        if (mStartingWindow != null) {
             try {
-                mSystemUiProxy.setStartingWindowListener(listener);
+                mStartingWindow.setStartingWindowListener(listener);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call setStartingWindowListener", e);
             }
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 8e6f663bed..4747f1898d 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -25,6 +25,11 @@ import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.quickstep.GestureState.DEFAULT_STATE;
 import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
+import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_ONE_HANDED;
+import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_PIP;
+import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_SHELL_TRANSITIONS;
+import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_SPLIT_SCREEN;
+import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_STARTING_WINDOW;
 import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SYSUI_PROXY;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_TRACING_ENABLED;
 
@@ -102,6 +107,11 @@ import com.android.systemui.shared.system.InputChannelCompat.InputEventReceiver;
 import com.android.systemui.shared.system.InputConsumerController;
 import com.android.systemui.shared.system.InputMonitorCompat;
 import com.android.systemui.shared.tracing.ProtoTraceable;
+import com.android.wm.shell.onehanded.IOneHanded;
+import com.android.wm.shell.pip.IPip;
+import com.android.wm.shell.splitscreen.ISplitScreen;
+import com.android.wm.shell.startingsurface.IStartingWindow;
+import com.android.wm.shell.transition.IShellTransitions;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
@@ -141,8 +151,18 @@ public class TouchInteractionService extends Service implements PluginListener<O
         public void onInitialize(Bundle bundle) {
             ISystemUiProxy proxy = ISystemUiProxy.Stub.asInterface(
                     bundle.getBinder(KEY_EXTRA_SYSUI_PROXY));
+            IPip pip = IPip.Stub.asInterface(bundle.getBinder(KEY_EXTRA_SHELL_PIP));
+            ISplitScreen splitscreen = ISplitScreen.Stub.asInterface(bundle.getBinder(
+                    KEY_EXTRA_SHELL_SPLIT_SCREEN));
+            IOneHanded onehanded = IOneHanded.Stub.asInterface(
+                    bundle.getBinder(KEY_EXTRA_SHELL_ONE_HANDED));
+            IShellTransitions shellTransitions = IShellTransitions.Stub.asInterface(
+                    bundle.getBinder(KEY_EXTRA_SHELL_SHELL_TRANSITIONS));
+            IStartingWindow startingWindow = IStartingWindow.Stub.asInterface(
+                    bundle.getBinder(KEY_EXTRA_SHELL_STARTING_WINDOW));
             MAIN_EXECUTOR.execute(() -> {
-                SystemUiProxy.INSTANCE.get(TouchInteractionService.this).setProxy(proxy);
+                SystemUiProxy.INSTANCE.get(TouchInteractionService.this).setProxy(proxy, pip,
+                        splitscreen, onehanded, shellTransitions, startingWindow);
                 TouchInteractionService.this.initInputMonitor();
                 preloadOverview(true /* fromInit */);
                 mDeviceState.runOnUserUnlocked(() -> {
@@ -432,7 +452,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
         }
         disposeEventHandlers();
         mDeviceState.destroy();
-        SystemUiProxy.INSTANCE.get(this).setProxy(null);
+        SystemUiProxy.INSTANCE.get(this).clearProxy();
         ProtoTracer.INSTANCE.get(this).stop();
         ProtoTracer.INSTANCE.get(this).remove(this);
 
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 882241ebbe..7adfc1c780 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -40,6 +40,7 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_DISMISS_SWIPE_UP;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_SWIPE_DOWN;
 import static com.android.launcher3.statehandlers.DepthController.DEPTH;
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW;
 import static com.android.quickstep.TaskUtils.checkCurrentOrManagedUserId;
@@ -136,13 +137,13 @@ import com.android.quickstep.util.SurfaceTransactionApplier;
 import com.android.quickstep.util.TaskViewSimulator;
 import com.android.quickstep.util.TransformParams;
 import com.android.systemui.plugins.ResourceProvider;
-import com.android.systemui.shared.recents.IPinnedStackAnimationListener;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.recents.model.Task.TaskKey;
 import com.android.systemui.shared.recents.model.ThumbnailData;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.PackageManagerWrapper;
 import com.android.systemui.shared.system.TaskStackChangeListener;
+import com.android.wm.shell.pip.IPipAnimationListener;
 
 import java.util.ArrayList;
 import java.util.function.Consumer;
@@ -409,7 +410,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         }
     };
 
-    private final PinnedStackAnimationListener mIPinnedStackAnimationListener =
+    private final PinnedStackAnimationListener mIPipAnimationListener =
             new PinnedStackAnimationListener();
 
     // Used to keep track of the last requested task list id, so that we do not request to load the
@@ -653,9 +654,9 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mLiveTileParams.setSyncTransactionApplier(mSyncTransactionApplier);
         RecentsModel.INSTANCE.get(getContext()).addThumbnailChangeListener(this);
         mIdp.addOnChangeListener(this);
-        mIPinnedStackAnimationListener.setActivity(mActivity);
+        mIPipAnimationListener.setActivity(mActivity);
         SystemUiProxy.INSTANCE.get(getContext()).setPinnedStackAnimationListener(
-                mIPinnedStackAnimationListener);
+                mIPipAnimationListener);
         mOrientationState.initListeners();
         SplitScreenBounds.INSTANCE.addOnChangeListener(this);
         mTaskOverlayFactory.initListeners();
@@ -674,7 +675,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mIdp.removeOnChangeListener(this);
         SystemUiProxy.INSTANCE.get(getContext()).setPinnedStackAnimationListener(null);
         SplitScreenBounds.INSTANCE.removeOnChangeListener(this);
-        mIPinnedStackAnimationListener.setActivity(null);
+        mIPipAnimationListener.setActivity(null);
         mOrientationState.destroyListeners();
         mTaskOverlayFactory.removeListeners();
     }
@@ -3133,7 +3134,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     }
 
     private static class PinnedStackAnimationListener<T extends BaseActivity> extends
-            IPinnedStackAnimationListener.Stub {
+            IPipAnimationListener.Stub {
         private T mActivity;
 
         public void setActivity(T activity) {
@@ -3141,10 +3142,12 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         }
 
         @Override
-        public void onPinnedStackAnimationStarted() {
-            // Needed for activities that auto-enter PiP, which will not trigger a remote
-            // animation to be created
-            mActivity.clearForceInvisibleFlag(STATE_HANDLER_INVISIBILITY_FLAGS);
+        public void onPipAnimationStarted() {
+            MAIN_EXECUTOR.execute(() -> {
+                // Needed for activities that auto-enter PiP, which will not trigger a remote
+                // animation to be created
+                mActivity.clearForceInvisibleFlag(STATE_HANDLER_INVISIBILITY_FLAGS);
+            });
         }
     }
 }
-- 
GitLab


From e6354c1ab22cec56b3344c0e52a1380883272f3b Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Thu, 18 Mar 2021 19:22:00 +0000
Subject: [PATCH 0708/1664] Revert "[Live tile] Finish recents animation when
 the phone goes to sleep in live tile mode"

This reverts commit d028937e74a9ea6d36e463de4c87ed37283bbdf6.

Reason for revert: Caused a few bugs

Change-Id: I1a3f4aa90679dec18ed27d2a5a5f0446c6d52594
Fixes: 174866547
Fixes: 181937887
Fixes: 183124957
---
 quickstep/src/com/android/quickstep/views/RecentsView.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index ce97fdcba5..882241ebbe 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -614,9 +614,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     @Override
     protected void onWindowVisibilityChanged(int visibility) {
         super.onWindowVisibilityChanged(visibility);
-        if (visibility != VISIBLE && LIVE_TILE.get()) {
-            finishRecentsAnimation(true /* toRecents */, null);
-        }
         updateTaskStackListenerState();
     }
 
-- 
GitLab


From b31d8fc379a429d082422151ed5e20b8d72c50a3 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Thu, 18 Mar 2021 13:57:20 -0700
Subject: [PATCH 0709/1664] Use taskbarSize as bottom inset when taskbar is
 present.

This was done in ag/13841736 but not included in ag/13821586

Test: QSB in correct position when taskbar present and not present
Bug: 171917176
Change-Id: I6aa220559afebe8710b5f01cdec9c2baa9f4c926
---
 .../src/com/android/launcher3/taskbar/TaskbarController.java  | 2 +-
 src/com/android/launcher3/Hotseat.java                        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index a2b2ddd5dd..f652961629 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -472,7 +472,7 @@ public class TaskbarController {
     public void alignRealHotseatWithTaskbar() {
         Rect hotseatBounds = new Rect();
         DeviceProfile grid = mLauncher.getDeviceProfile();
-        int hotseatHeight = grid.workspacePadding.bottom + grid.getInsets().bottom;
+        int hotseatHeight = grid.workspacePadding.bottom + grid.taskbarSize;
         int hotseatTopDiff = hotseatHeight - grid.taskbarSize;
 
         mTaskbarView.getHotseatBoundsAtScale(getTaskbarScaleOnHome()).roundOut(hotseatBounds);
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index 0e9de45e2f..5007d0d450 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -123,7 +123,7 @@ public class Hotseat extends CellLayout implements Insettable {
             lp.height = (grid.isTaskbarPresent
                         ? grid.workspacePadding.bottom
                         : grid.hotseatBarSizePx)
-                    + insets.bottom;
+                    + (grid.isTaskbarPresent ? grid.taskbarSize : insets.bottom);
         }
 
         if (!grid.isTaskbarPresent) {
@@ -214,7 +214,7 @@ public class Hotseat extends CellLayout implements Insettable {
                 : dp.hotseatBarSizePx - dp.hotseatCellHeightPx - mQsbHeight;
         int bottom = b - t
                 - (int) (freeSpace * QSB_CENTER_FACTOR)
-                - dp.getInsets().bottom;
+                - (dp.isTaskbarPresent ? dp.taskbarSize : dp.getInsets().bottom);
         int top = bottom - mQsbHeight;
         mQsb.layout(left, top, right, bottom);
     }
-- 
GitLab


From 6f98e1ebd0133f069cad0098126e75beb352eaa0 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Thu, 18 Mar 2021 22:00:51 +0000
Subject: [PATCH 0710/1664] Notify WidgetHostView drag content change only at
 onDraw

Reapply RemoteViews can happen asynchronously. RemoteViews may
not finish reinflation right after setColorResource. Let's call
it onDraw.

Test: Manual

Bug: 182282587

Change-Id: I3653b4c64a5897637181f61096464b75945ab5f5
---
 .../launcher3/widget/LauncherAppWidgetHostView.java        | 7 ++++++-
 .../widget/dragndrop/AppWidgetHostViewDragListener.java    | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
index 8df70fbf3a..5c18faf213 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
@@ -19,6 +19,7 @@ package com.android.launcher3.widget;
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
 import android.content.res.Configuration;
+import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.os.Handler;
@@ -120,8 +121,12 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         } else {
             super.setColorResources(colors);
         }
+    }
 
-        if (mDragListener != null) {
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        if (mIsInDragMode && mDragListener != null) {
             mDragListener.onDragContentChanged();
         }
     }
diff --git a/src/com/android/launcher3/widget/dragndrop/AppWidgetHostViewDragListener.java b/src/com/android/launcher3/widget/dragndrop/AppWidgetHostViewDragListener.java
index c5e6fbd827..66bb363dde 100644
--- a/src/com/android/launcher3/widget/dragndrop/AppWidgetHostViewDragListener.java
+++ b/src/com/android/launcher3/widget/dragndrop/AppWidgetHostViewDragListener.java
@@ -54,6 +54,8 @@ public final class AppWidgetHostViewDragListener implements DragController.DragL
 
     /** Notifies when there is a content change in the drag view. */
     public void onDragContentChanged() {
-        mDragObject.dragView.invalidate();
+        if (mDragObject.dragView != null) {
+            mDragObject.dragView.invalidate();
+        }
     }
 }
-- 
GitLab


From a8bbcb9c0401bfa1dbc5c68d8be4d5b59e82a02f Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 18 Mar 2021 15:48:04 -0700
Subject: [PATCH 0711/1664] Fixing ActivityInit getting called before the full
 launcher components are initialized

Bug: 182575999
Test: Presubmit
Change-Id: Iea6986624b70caf2d502c1b21318b57a8b2fde03
---
 .../src/com/android/launcher3/BaseQuickstepLauncher.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 20a645e996..c4becf105f 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -95,9 +95,6 @@ public abstract class BaseQuickstepLauncher extends Launcher
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mAppTransitionManager = new QuickstepTransitionManager(this);
-        mAppTransitionManager.registerRemoteAnimations();
-
         SysUINavigationMode.INSTANCE.get(this).addModeChangeListener(this);
         addMultiWindowModeChangedListener(mDepthController);
     }
@@ -225,6 +222,9 @@ public abstract class BaseQuickstepLauncher extends Launcher
         overviewPanel.init(mActionsView, splitPlaceholderView);
         mActionsView.updateVerticalMargin(SysUINavigationMode.getMode(this));
 
+        mAppTransitionManager = new QuickstepTransitionManager(this);
+        mAppTransitionManager.registerRemoteAnimations();
+
         addTaskbarIfNecessary();
         addOnDeviceProfileChangeListener(newDp -> addTaskbarIfNecessary());
     }
-- 
GitLab


From cc505b8ae4eb921ab98583997869057a6c540d2d Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Thu, 18 Mar 2021 23:04:35 +0000
Subject: [PATCH 0712/1664] Don't store Launcher as a class variable in
 CellLayout

CellLayout can be used by non launcher context, e.g. style &
wallpaper preview. To be safe, don't store Launcher as class
variable.

Test: Preview in style & wallpaper works fine
      Drag icons from hotseat.
      Drag widgets from workspace.

Bug: b/182282587
Change-Id: I9358eebce66ff1a46adbfb0602ae2bc970a921a6
---
 src/com/android/launcher3/CellLayout.java | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index cc4bfe8c74..9df8d44d58 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -181,8 +181,6 @@ public class CellLayout extends ViewGroup {
     private final ArrayList<View> mIntersectingViews = new ArrayList<>();
     private final Rect mOccupiedRect = new Rect();
     private final int[] mDirectionVector = new int[2];
-    private final Workspace mWorkspace;
-    private final DeviceProfile mDeviceProfile;
 
     final int[] mPreviousReorderDirection = new int[2];
     private static final int INVALID_DIRECTION = -100;
@@ -213,15 +211,14 @@ public class CellLayout extends ViewGroup {
         setWillNotDraw(false);
         setClipToPadding(false);
         mActivity = ActivityContext.lookupContext(context);
-        mWorkspace = Launcher.cast(mActivity).getWorkspace();
-        mDeviceProfile = mActivity.getDeviceProfile();
+        DeviceProfile deviceProfile = mActivity.getDeviceProfile();
 
-        mBorderSpacing = mDeviceProfile.cellLayoutBorderSpacingPx;
+        mBorderSpacing = deviceProfile.cellLayoutBorderSpacingPx;
         mCellWidth = mCellHeight = -1;
         mFixedCellWidth = mFixedCellHeight = -1;
 
-        mCountX = mDeviceProfile.inv.numColumns;
-        mCountY = mDeviceProfile.inv.numRows;
+        mCountX = deviceProfile.inv.numColumns;
+        mCountY = deviceProfile.inv.numRows;
         mOccupied =  new GridOccupancy(mCountX, mCountY);
         mTmpOccupied = new GridOccupancy(mCountX, mCountY);
 
@@ -238,7 +235,7 @@ public class CellLayout extends ViewGroup {
         mBackground.setCallback(this);
         mBackground.setAlpha(0);
 
-        mReorderPreviewAnimationMagnitude = (REORDER_PREVIEW_MAGNITUDE * mDeviceProfile.iconSizePx);
+        mReorderPreviewAnimationMagnitude = (REORDER_PREVIEW_MAGNITUDE * deviceProfile.iconSizePx);
 
         // Initialize the data structures used for the drag visualization.
         mEaseOutInterpolator = Interpolators.DEACCEL_2_5; // Quint ease out
@@ -1024,8 +1021,10 @@ public class CellLayout extends ViewGroup {
         // Apply local extracted color if the DragView is an AppWidgetHostViewDrawable.
         Drawable drawable = dragObject.dragView.getDrawable();
         if (drawable instanceof AppWidgetHostViewDrawable) {
-            int screenId = mWorkspace.getIdForScreen(this);
-            int pageId = mWorkspace.getPageIndexForScreenId(screenId);
+            Workspace workspace =
+                    Launcher.getLauncher(dragObject.dragView.getContext()).getWorkspace();
+            int screenId = workspace.getIdForScreen(this);
+            int pageId = workspace.getPageIndexForScreenId(screenId);
             AppWidgetHostViewDrawable hostViewDrawable = ((AppWidgetHostViewDrawable) drawable);
             cellToRect(targetCell[0], targetCell[1], spanX, spanY, mTempRect);
             hostViewDrawable.getAppWidgetHostView().handleDrag(mTempRect, pageId);
@@ -2097,7 +2096,7 @@ public class CellLayout extends ViewGroup {
     private void commitTempPlacement() {
         mTmpOccupied.copyTo(mOccupied);
 
-        int screenId = mWorkspace.getIdForScreen(this);
+        int screenId = Launcher.cast(mActivity).getWorkspace().getIdForScreen(this);
         int container = Favorites.CONTAINER_DESKTOP;
 
         if (mContainerType == HOTSEAT) {
-- 
GitLab


From 8eb1f73d58166684a141e440781fcec4dc9317da Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Thu, 18 Mar 2021 14:59:18 +0000
Subject: [PATCH 0713/1664] A11y fix for all widgets tray (Part 1 / n)

Mark some image view unimportant for accessibility.
Still need to update the content description for widget list
header to describe the expand / collapse action.

Test: Navigate all widgets tray with talkback enabled.

Bug: 183120145
Change-Id: I1801d8351ac7f22a0135a96a36de706377781b31
---
 res/layout/widget_cell_content.xml           | 1 +
 res/layout/widgets_full_sheet_paged_view.xml | 9 ++++-----
 res/layout/widgets_list_row_header.xml       | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/res/layout/widget_cell_content.xml b/res/layout/widget_cell_content.xml
index 50908a49ba..7b85d9bcd5 100644
--- a/res/layout/widget_cell_content.xml
+++ b/res/layout/widget_cell_content.xml
@@ -24,6 +24,7 @@
         android:layout_width="wrap_content"
         android:layout_height="0dp"
         android:layout_weight="1"
+        android:importantForAccessibility="no"
         android:layout_marginVertical="8dp" />
 
     <!-- The name of the widget. -->
diff --git a/res/layout/widgets_full_sheet_paged_view.xml b/res/layout/widgets_full_sheet_paged_view.xml
index 8125db8333..ae877d46bf 100644
--- a/res/layout/widgets_full_sheet_paged_view.xml
+++ b/res/layout/widgets_full_sheet_paged_view.xml
@@ -16,11 +16,6 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto">
 
-    <include layout="@layout/personal_work_tabs"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="16dp" />
-
     <com.android.launcher3.workprofile.PersonalWorkPagedView
         android:id="@+id/widgets_view_pager"
         android:layout_width="match_parent"
@@ -43,4 +38,8 @@
 
     </com.android.launcher3.workprofile.PersonalWorkPagedView>
 
+    <include layout="@layout/personal_work_tabs"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp" />
 </merge>
\ No newline at end of file
diff --git a/res/layout/widgets_list_row_header.xml b/res/layout/widgets_list_row_header.xml
index 62345b39a6..ed3a042148 100644
--- a/res/layout/widgets_list_row_header.xml
+++ b/res/layout/widgets_list_row_header.xml
@@ -71,6 +71,7 @@
         android:layout_gravity="center_vertical"
         android:layout_alignParentEnd="true"
         android:clickable="false"
+        android:importantForAccessibility="no"
         android:button="@drawable/widgets_tray_expand_button"/>
 
 </com.android.launcher3.widget.picker.WidgetsListHeader>
\ No newline at end of file
-- 
GitLab


From 72c15ef913f3b0ee11e523a9b2c523841d8e8c10 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Thu, 18 Mar 2021 18:04:02 -0700
Subject: [PATCH 0714/1664] Fix QSB and Hotseat positions when
 ENABLE_DEVICE_SEARCH is enabled

Test: visual
Change-Id: I755de7552e2bb3f927f6be59c07f910ddfbc4650
---
 src/com/android/launcher3/Hotseat.java | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index 0e9de45e2f..a3e01a98b9 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -29,7 +29,6 @@ import android.widget.FrameLayout;
 
 import androidx.annotation.Nullable;
 
-import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.util.MultiValueAlpha;
 
 import java.util.function.Consumer;
@@ -96,7 +95,7 @@ public class Hotseat extends CellLayout implements Insettable {
         if (hasVerticalHotseat) {
             setGridSize(1, idp.numHotseatIcons);
         } else {
-            setGridSize(idp.numHotseatIcons, FeatureFlags.ENABLE_DEVICE_SEARCH.get() ? 2 : 1);
+            setGridSize(idp.numHotseatIcons, 1);
         }
         showInlineQsb();
     }
@@ -130,11 +129,7 @@ public class Hotseat extends CellLayout implements Insettable {
             // When taskbar is present, we set the padding separately to ensure a seamless visual
             // handoff between taskbar and hotseat during drag and drop.
             Rect padding = grid.getHotseatLayoutPadding();
-            int paddingBottom = padding.bottom;
-            if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && !grid.isVerticalBarLayout()) {
-                paddingBottom -= grid.hotseatBarBottomPaddingPx;
-            }
-            setPadding(padding.left, padding.top, padding.right, paddingBottom);
+            setPadding(padding.left, padding.top, padding.right, padding.bottom);
         }
 
         setLayoutParams(lp);
-- 
GitLab


From 8dbf38e30f67ce913de247bd5a4e2ead801623a1 Mon Sep 17 00:00:00 2001
From: Sreyas <sreyasr@google.com>
Date: Wed, 17 Mar 2021 14:33:30 -0700
Subject: [PATCH 0715/1664] Fixes OverviewActionsView height sizing.

By fixing the action buttons container height and allowing wrap content on overviewActionsView all views have enough room to be displayed and actions button container height can be calculated.
Bug: 182854439
Test: Manual

Change-Id: I34516ba42430d8fe6774e10215dd8ac1127920c8
---
 .../res/layout/overview_actions_container.xml               | 6 +++---
 .../res/layout/overview_actions_container.xml               | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/go/quickstep/overview_ui_overrides/res/layout/overview_actions_container.xml b/go/quickstep/overview_ui_overrides/res/layout/overview_actions_container.xml
index b438da32eb..e6af84868e 100644
--- a/go/quickstep/overview_ui_overrides/res/layout/overview_actions_container.xml
+++ b/go/quickstep/overview_ui_overrides/res/layout/overview_actions_container.xml
@@ -17,14 +17,14 @@
 <com.android.quickstep.views.GoOverviewActionsView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/overview_actions_height"
+    android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal|bottom">
 
     <LinearLayout
         android:id="@+id/action_buttons"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
+        android:layout_height="@dimen/overview_actions_height"
+        android:layout_gravity="bottom|center_horizontal"
         android:orientation="horizontal">
 
         <Space
diff --git a/quickstep/overview_ui_overrides/res/layout/overview_actions_container.xml b/quickstep/overview_ui_overrides/res/layout/overview_actions_container.xml
index d15a2d2ab6..1da25e772a 100644
--- a/quickstep/overview_ui_overrides/res/layout/overview_actions_container.xml
+++ b/quickstep/overview_ui_overrides/res/layout/overview_actions_container.xml
@@ -16,14 +16,14 @@
 -->
 <com.android.quickstep.views.OverviewActionsView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/overview_actions_height"
+    android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal|bottom">
 
     <LinearLayout
         android:id="@+id/action_buttons"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
+        android:layout_height="@dimen/overview_actions_height"
+        android:layout_gravity="bottom|center_horizontal"
         android:orientation="horizontal">
 
         <Space
-- 
GitLab


From f19300e479fe80d0dc8aba4d21bccbccc44f5b64 Mon Sep 17 00:00:00 2001
From: Zak Cohen <zakcohen@google.com>
Date: Mon, 8 Feb 2021 14:32:00 -0800
Subject: [PATCH 0716/1664] Return empty, not null, a11y node in Workspace

It's not valid to return a null accessbilitynode.

Test: local
Bug: 182529089

Change-Id: I94245fb33128c68e33ce388284f64e5ac3bb23dc
---
 src/com/android/launcher3/Workspace.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index c84724ff90..6a16da9cf9 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1455,7 +1455,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
             // TAPL can work only if UIDevice is set up as setCompressedLayoutHeirarchy(false).
             // Hiding workspace from the tests when it's
             // IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS.
-            return null;
+            return AccessibilityNodeInfo.obtain();
         }
         return super.createAccessibilityNodeInfo();
     }
-- 
GitLab


From 390b27e46cc178ba67fe54f35140272ed1b37367 Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Fri, 19 Mar 2021 04:22:23 -0700
Subject: [PATCH 0717/1664] [LSC] Add LOCAL_LICENSE_KINDS to
 packages/apps/Launcher3

Added SPDX-license-identifier-Apache-2.0 to:
  quickstep/Android.bp
  robolectric_tests/Android.bp
  tests/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I699e0796410f691ae7cf4802c41987d79e4e486d
---
 quickstep/Android.bp         |  9 +++++++++
 robolectric_tests/Android.bp | 10 +++++++++-
 tests/Android.bp             |  9 +++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/quickstep/Android.bp b/quickstep/Android.bp
index 585b6ada88..38c9919b07 100644
--- a/quickstep/Android.bp
+++ b/quickstep/Android.bp
@@ -12,6 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "packages_apps_Launcher3_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["packages_apps_Launcher3_license"],
+}
+
 filegroup {
     name: "launcher3-quickstep-robolectric-src",
     path: "robolectric_tests",
diff --git a/robolectric_tests/Android.bp b/robolectric_tests/Android.bp
index 50309b7902..bf323623b2 100644
--- a/robolectric_tests/Android.bp
+++ b/robolectric_tests/Android.bp
@@ -16,6 +16,15 @@
 // Launcher Robolectric test target.
 //
 //        "robolectric_android-all-stub", not needed, we write our own stubs
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "packages_apps_Launcher3_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["packages_apps_Launcher3_license"],
+}
+
 filegroup {
     name: "launcher3-robolectric-resources",
     path: "resources",
@@ -47,4 +56,3 @@ android_robolectric_test {
         timeout: 36000,
     },
 }
-
diff --git a/tests/Android.bp b/tests/Android.bp
index 8a73483bb3..da55c28684 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -11,6 +11,15 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "packages_apps_Launcher3_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["packages_apps_Launcher3_license"],
+}
+
 filegroup {
     name: "launcher3-test-src-common",
     srcs: ["src_common/**/*.java"],
-- 
GitLab


From c4f3f49805ec03b7e115ab8e4ca4117e44fadc97 Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Fri, 19 Mar 2021 14:22:43 +0000
Subject: [PATCH 0718/1664] Fix bugs for Widgets picker Search UI.

- On orientation change, clear search bar.
- Change text and search bar color to make similar to mocks/ all apps search bar.
- Fix search recycler view visual bugs.
- If back is pressed in search mode, exit search mode instead of exiting widget picker.

Test: Manually seen widget picker on phone.
Bug: 183103133
Bug: 183103936
Bug: 183115050
Bug: 157286785
Change-Id: I056f089eada84d00133038f4a3d7b18bc51be564
---
 res/drawable/bg_widgets_searchbox.xml         |  2 +-
 res/layout/widgets_search_bar.xml             |  5 ++++-
 .../widget/picker/WidgetsFullSheet.java       | 21 +++++++++++++++++++
 .../search/LauncherWidgetsSearchBar.java      |  5 +++++
 .../picker/search/WidgetsSearchBar.java       |  5 +++++
 5 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/res/drawable/bg_widgets_searchbox.xml b/res/drawable/bg_widgets_searchbox.xml
index 81dd2aa0c6..2a50a51fae 100644
--- a/res/drawable/bg_widgets_searchbox.xml
+++ b/res/drawable/bg_widgets_searchbox.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="#FFFFF7" />
+    <solid android:color="?android:attr/textColorPrimaryInverse" />
     <corners android:radius="24dp" />
 </shape>
\ No newline at end of file
diff --git a/res/layout/widgets_search_bar.xml b/res/layout/widgets_search_bar.xml
index cf693bbd1d..021058b65d 100644
--- a/res/layout/widgets_search_bar.xml
+++ b/res/layout/widgets_search_bar.xml
@@ -19,12 +19,15 @@
         android:hint="@string/widgets_full_sheet_search_bar_hint"
         android:maxLines="1"
         android:layout_weight="1"
-        android:inputType="text"/>
+        android:inputType="text"
+        android:textColor="?android:attr/textColorSecondary"
+        android:textColorHint="?android:attr/textColorTertiary"/>
 
     <ImageButton
         android:id="@+id/widgets_search_cancel_button"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
+        android:padding="8dp"
         android:src="@drawable/ic_gm_close_24"
         android:background="?android:selectableItemBackground"
         android:layout_gravity="center"
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 5747690ba6..dc375ca414 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -23,6 +23,7 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.PropertyValuesHolder;
 import android.content.Context;
 import android.content.pm.LauncherApps;
+import android.content.res.Configuration;
 import android.graphics.Rect;
 import android.os.Process;
 import android.os.UserHandle;
@@ -232,6 +233,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         mInsets.set(insets);
 
         setBottomPadding(mAdapters.get(AdapterHolder.PRIMARY).mWidgetsRecyclerView, insets.bottom);
+        setBottomPadding(mAdapters.get(AdapterHolder.SEARCH).mWidgetsRecyclerView, insets.bottom);
         if (mHasWorkProfile) {
             setBottomPadding(mAdapters.get(AdapterHolder.WORK).mWidgetsRecyclerView, insets.bottom);
         }
@@ -276,6 +278,8 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         int maxSpansPerRow = getMeasuredWidth() / (deviceProfile.cellWidthPx + paddingPx);
         mAdapters.get(AdapterHolder.PRIMARY).mWidgetsListAdapter.setMaxHorizontalSpansPerRow(
                 maxSpansPerRow);
+        mAdapters.get(AdapterHolder.SEARCH).mWidgetsListAdapter.setMaxHorizontalSpansPerRow(
+                maxSpansPerRow);
         if (mHasWorkProfile) {
             mAdapters.get(AdapterHolder.WORK).mWidgetsListAdapter.setMaxHorizontalSpansPerRow(
                     maxSpansPerRow);
@@ -471,6 +475,23 @@ public class WidgetsFullSheet extends BaseWidgetSheet
                 + marginLayoutParams.topMargin;
     }
 
+    @Override
+    protected void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        if (mIsInSearchMode) {
+            mSearchAndRecommendationViewHolder.mSearchBar.reset();
+        }
+    }
+
+    @Override
+    public boolean onBackPressed() {
+        if (mIsInSearchMode) {
+            mSearchAndRecommendationViewHolder.mSearchBar.reset();
+            return true;
+        }
+        return super.onBackPressed();
+    }
+
     /** A holder class for holding adapters & their corresponding recycler view. */
     private final class AdapterHolder {
         static final int PRIMARY = 0;
diff --git a/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java b/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java
index 5520826ab9..cc336196ae 100644
--- a/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java
+++ b/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java
@@ -62,6 +62,11 @@ public class LauncherWidgetsSearchBar extends LinearLayout implements WidgetsSea
                 algo, mEditText, mCancelButton, searchModeListener);
     }
 
+    @Override
+    public void reset() {
+        mController.clearSearchResult();
+    }
+
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
diff --git a/src/com/android/launcher3/widget/picker/search/WidgetsSearchBar.java b/src/com/android/launcher3/widget/picker/search/WidgetsSearchBar.java
index af6dc48aae..ef7bf23226 100644
--- a/src/com/android/launcher3/widget/picker/search/WidgetsSearchBar.java
+++ b/src/com/android/launcher3/widget/picker/search/WidgetsSearchBar.java
@@ -29,6 +29,11 @@ public interface WidgetsSearchBar {
      */
     void initialize(List<WidgetsListBaseEntry> allWidgets, SearchModeListener searchModeListener);
 
+    /**
+     * Clears search bar.
+     */
+    void reset();
+
     /**
      * Sets the vertical location, in pixels, of this search bar relative to its top position.
      */
-- 
GitLab


From 0369cd54705e53b8af9afb8fd47d1732464c1313 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Fri, 19 Mar 2021 12:07:19 -0400
Subject: [PATCH 0719/1664] Folder updates.

- 3 item folder preview has the first item on top of the other 2
- Skip first frame of the folder open animation as there is no
  visual change in that first frame.

Bug: 175329686
Test: visual
Change-Id: Ida9a55ee5093c49f230cdf22d7943b2a6a7ed42d
---
 .../android/launcher3/folder/ClippedFolderIconLayoutRule.java | 2 +-
 src/com/android/launcher3/folder/Folder.java                  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java b/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java
index 5954efa95f..c67efefa5d 100644
--- a/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java
+++ b/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java
@@ -97,7 +97,7 @@ public class ClippedFolderIconLayoutRule {
 
         double thetaShift = 0;
         if (curNumItems == 3) {
-            thetaShift = Math.PI / 6;
+            thetaShift = Math.PI / 2;
         } else if (curNumItems == 4) {
             thetaShift = Math.PI / 4;
         }
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index bcb3a54ef3..ec7155c1b1 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -26,6 +26,7 @@ import static com.android.launcher3.config.FeatureFlags.ALWAYS_USE_HARDWARE_OPTI
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_FOLDER_CONVERTED_TO_ICON;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_FOLDER_LABEL_UPDATED;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ITEM_DROP_COMPLETED;
+import static com.android.launcher3.util.DisplayController.getSingleFrameMs;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -695,6 +696,9 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
 
         mPageIndicator.stopAllAnimations();
         startAnimation(anim);
+        // Because t=0 has the folder match the folder icon, we can skip the
+        // first frame and have the same movement one frame earlier.
+        anim.setCurrentPlayTime(Math.min(getSingleFrameMs(getContext()), anim.getTotalDuration()));
 
         // Make sure the folder picks up the last drag move even if the finger doesn't move.
         if (mDragController.isDragging()) {
-- 
GitLab


From b0b2a9acd0db64d6af130db6e6d41cd74c871985 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Wed, 24 Feb 2021 13:58:35 -0800
Subject: [PATCH 0720/1664] Continue receiving key events from input consumer
 after settling into Overview

This builds on ag/13732971. In live tile mode after settling into overview, recents_animation_input_consumer should have the focus, and thus we will need to extend the lifecycle of input consumers so that key events can be routed to launcher

Overall, since live tile extends the lifecycle of certain private variables of AbsSwipeHandler, I am thinking of doing a refactor by putting those things into a separate class, but it might be too big for this change.

TODO: I've verified that this change works while if we don't process motion events, it would cause b/182932863. Will investigate on that.

Fixes: 181404912
Test: Cherry pick ag/13732971; Go to overview; Swipe back; Observe the animation to go back to app
Change-Id: I5afd397be387b75f373442781dd1d00560dca99e
---
 .../src/com/android/quickstep/AbsSwipeUpHandler.java   |  7 ++++++-
 .../com/android/quickstep/TaskAnimationManager.java    | 10 ++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 6da2201dc9..30945007a9 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1334,7 +1334,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     }
 
     private void invalidateHandler() {
-        mInputConsumerProxy.destroy();
+        if (!LIVE_TILE.get() || !mActivityInterface.isInLiveTileMode()
+                || mGestureState.getEndTarget() != RECENTS) {
+            mInputConsumerProxy.destroy();
+            mTaskAnimationManager.setLiveTileCleanUpHandler(null);
+        }
         endRunningWindowAnim(false /* cancel */);
 
         if (mGestureEndCallback != null) {
@@ -1526,6 +1530,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                         apps[apps.length - 1] = appearedTaskTarget;
                         launchOtherTaskInLiveTileMode(appearedTaskTarget.taskId, apps);
                     });
+            mTaskAnimationManager.setLiveTileCleanUpHandler(mInputConsumerProxy::destroy);
             ActivityManagerWrapper.getInstance().registerTaskStackListener(
                     mLiveTileRestartListener);
         }
diff --git a/quickstep/src/com/android/quickstep/TaskAnimationManager.java b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
index 02c27636fc..9a454f2bd7 100644
--- a/quickstep/src/com/android/quickstep/TaskAnimationManager.java
+++ b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
@@ -50,6 +50,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
     private GestureState mLastGestureState;
     private RemoteAnimationTargetCompat mLastAppearedTaskTarget;
     private Consumer<RemoteAnimationTargetCompat> mLaunchOtherTaskHandler;
+    private Runnable mLiveTileCleanUpHandler;
     private Context mCtx;
 
     TaskAnimationManager(Context ctx) {
@@ -169,6 +170,10 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
         mLaunchOtherTaskHandler = handler;
     }
 
+    public void setLiveTileCleanUpHandler(Runnable runnable) {
+        mLiveTileCleanUpHandler = runnable;
+    }
+
     /**
      * Finishes the running recents animation.
      */
@@ -206,6 +211,11 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
      * Cleans up the recents animation entirely.
      */
     private void cleanUpRecentsAnimation() {
+        if (mLiveTileCleanUpHandler != null) {
+            mLiveTileCleanUpHandler.run();
+            mLiveTileCleanUpHandler = null;
+        }
+
         // Release all the target leashes
         if (mTargets != null) {
             mTargets.release();
-- 
GitLab


From 2a58d13b9b0616558bb1c1e6d80e80c84aa1aaa5 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Fri, 19 Mar 2021 11:44:04 -0400
Subject: [PATCH 0721/1664] Add separate background colors to each popup
 container child.

- Colors interpolate between the primary and secondary popup colors
- Removed condensed height and icon scale

Bug: 175329686
Test: visual, manual checking apps with different shortcut options
Change-Id: I064c329dc8ad3ae6f408056c74372cca3ce20b68
---
 res/values/dimens.xml                         |  1 -
 .../notification/NotificationItemView.java    |  4 ++
 .../notification/NotificationMainView.java    | 19 +++++--
 .../android/launcher3/popup/ArrowPopup.java   | 50 +++++++++++++++++--
 .../popup/PopupContainerWithArrow.java        | 18 ++++---
 5 files changed, 75 insertions(+), 17 deletions(-)

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c0ea2fef76..10bcb8fd59 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -179,7 +179,6 @@
     <dimen name="deep_shortcuts_elevation">0dp</dimen>
     <dimen name="bg_popup_item_width">234dp</dimen>
     <dimen name="bg_popup_item_height">56dp</dimen>
-    <dimen name="bg_popup_item_condensed_height">48dp</dimen>
     <dimen name="pre_drag_view_scale">6dp</dimen>
     <!-- an icon with shortcuts must be dragged this far before the container is removed. -->
     <dimen name="deep_shortcuts_start_drag_threshold">16dp</dimen>
diff --git a/src/com/android/launcher3/notification/NotificationItemView.java b/src/com/android/launcher3/notification/NotificationItemView.java
index d44d158010..e954480ca5 100644
--- a/src/com/android/launcher3/notification/NotificationItemView.java
+++ b/src/com/android/launcher3/notification/NotificationItemView.java
@@ -92,6 +92,10 @@ public class NotificationItemView {
         });
     }
 
+    public void updateBackgroundColor(int color) {
+        mMainView.updateBackgroundColor(color);
+    }
+
     public void addGutter() {
         if (mGutter == null) {
             mGutter = mPopupContainer.inflateAndAdd(R.layout.notification_gutter, mRootView);
diff --git a/src/com/android/launcher3/notification/NotificationMainView.java b/src/com/android/launcher3/notification/NotificationMainView.java
index 9b065233b9..c9956667db 100644
--- a/src/com/android/launcher3/notification/NotificationMainView.java
+++ b/src/com/android/launcher3/notification/NotificationMainView.java
@@ -97,15 +97,24 @@ public class NotificationMainView extends FrameLayout implements SingleAxisSwipe
         super.onFinishInflate();
 
         mTextAndBackground = findViewById(R.id.text_and_background);
+        mTitleView = mTextAndBackground.findViewById(R.id.title);
+        mTextView = mTextAndBackground.findViewById(R.id.text);
+        mIconView = findViewById(R.id.popup_item_icon);
+
         ColorDrawable colorBackground = (ColorDrawable) mTextAndBackground.getBackground();
-        mBackgroundColor = colorBackground.getColor();
+        updateBackgroundColor(colorBackground.getColor());
+    }
+
+    public void updateBackgroundColor(int color) {
+        mBackgroundColor = color;
         RippleDrawable rippleBackground = new RippleDrawable(ColorStateList.valueOf(
                 Themes.getAttrColor(getContext(), android.R.attr.colorControlHighlight)),
-                colorBackground, null);
+                new ColorDrawable(color), null);
         mTextAndBackground.setBackground(rippleBackground);
-        mTitleView = mTextAndBackground.findViewById(R.id.title);
-        mTextView = mTextAndBackground.findViewById(R.id.text);
-        mIconView = findViewById(R.id.popup_item_icon);
+        if (mNotificationInfo != null) {
+            mIconView.setBackground(mNotificationInfo.getIconForBackground(getContext(),
+                    mBackgroundColor));
+        }
     }
 
     public void setSwipeDetector(SingleAxisSwipeDetector swipeDetector) {
diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java
index 6aa98122cd..a53fe1f848 100644
--- a/src/com/android/launcher3/popup/ArrowPopup.java
+++ b/src/com/android/launcher3/popup/ArrowPopup.java
@@ -17,10 +17,12 @@
 package com.android.launcher3.popup;
 
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
+import static com.android.launcher3.popup.PopupPopulator.MAX_SHORTCUTS;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
+import android.animation.ArgbEvaluator;
 import android.animation.ObjectAnimator;
 import android.animation.TimeInterpolator;
 import android.animation.ValueAnimator;
@@ -28,6 +30,8 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Outline;
 import android.graphics.Rect;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
 import android.util.AttributeSet;
 import android.util.Pair;
@@ -63,6 +67,9 @@ import java.util.Collections;
  */
 public abstract class ArrowPopup<T extends BaseDraggingActivity> extends AbstractFloatingView {
 
+    // +1 for system shortcut view
+    private static final int MAX_NUM_CHILDREN = MAX_SHORTCUTS + 1;
+
     private final Rect mTempRect = new Rect();
 
     protected final LayoutInflater mInflater;
@@ -93,6 +100,9 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
 
     private Runnable mOnCloseCallback = () -> { };
 
+    private int mArrowColor;
+    private final int[] mColors;
+
     public ArrowPopup(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         mInflater = LayoutInflater.from(context);
@@ -121,15 +131,22 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
         mArrowPointRadius = resources.getDimensionPixelSize(R.dimen.popup_arrow_corner_radius);
 
         mRoundedTop = new GradientDrawable();
-        mRoundedTop.setColor(Themes.getAttrColor(context, R.attr.popupColorPrimary));
         mRoundedTop.setCornerRadii(new float[] { mOutlineRadius, mOutlineRadius, mOutlineRadius,
                 mOutlineRadius, 0, 0, 0, 0});
 
         mRoundedBottom = new GradientDrawable();
-        mRoundedBottom.setColor(Themes.getAttrColor(context, R.attr.popupColorPrimary));
         mRoundedBottom.setCornerRadii(new float[] { 0, 0, 0, 0, mOutlineRadius, mOutlineRadius,
                 mOutlineRadius, mOutlineRadius});
 
+        int primaryColor = Themes.getAttrColor(context, R.attr.popupColorPrimary);
+        int secondaryColor = Themes.getAttrColor(context, R.attr.popupColorSecondary);
+        ArgbEvaluator argb = new ArgbEvaluator();
+        mColors = new int[MAX_NUM_CHILDREN];
+        // Interpolate between the two colors, exclusive.
+        float step = 1f / (MAX_NUM_CHILDREN + 1);
+        for (int i = 0; i < mColors.length; ++i) {
+            mColors[i] = (int) argb.evaluate((i + 1) * step, primaryColor, secondaryColor);
+        }
     }
 
     public ArrowPopup(Context context, AttributeSet attrs) {
@@ -187,6 +204,7 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
 
         int numVisibleShortcut = 0;
         View lastView = null;
+        int numVisibleChild = 0;
         for (int i = 0; i < count; i++) {
             View view = getChildAt(i);
             boolean isShortcut = view instanceof DeepShortcutView;
@@ -207,15 +225,41 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
                             view.setBackground(mRoundedTop);
                         } else if (numVisibleShortcut == (totalVisibleShortcuts - 1)) {
                             view.setBackground(mRoundedBottom);
+                        } else {
+                            view.setBackgroundResource(R.drawable.middle_item_primary);
                         }
                         numVisibleShortcut++;
                     }
                 }
+
+                int color = mColors[numVisibleChild % mColors.length];
+                setChildColor(view, color);
+
+                // Arrow color matches the first child or the last child.
+                if (!mIsAboveIcon && numVisibleChild == 0) {
+                    mArrowColor = color;
+                } else if (mIsAboveIcon) {
+                    mArrowColor = color;
+                }
+
+                numVisibleChild++;
             }
         }
         measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
     }
 
+    /**
+     * Sets the background color of the child.
+     */
+    protected void setChildColor(View view, int color) {
+        Drawable bg = view.getBackground();
+        if (bg instanceof GradientDrawable) {
+            ((GradientDrawable) bg.mutate()).setColor(color);
+        } else if (bg instanceof ColorDrawable) {
+            ((ColorDrawable) bg.mutate()).setColor(color);
+        }
+    }
+
     /**
      * Shows the popup at the desired location, optionally reversing the children.
      * @param viewsToFlip number of views from the top to to flip in case of reverse order
@@ -293,7 +337,7 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
                     mOutlineRadius, getMeasuredWidth(), getMeasuredHeight(),
                     mArrowOffsetHorizontal, -mArrowOffsetVertical,
                     !mIsAboveIcon, mIsLeftAligned,
-                    Themes.getAttrColor(getContext(), R.attr.popupColorPrimary)));
+                    mArrowColor));
             mArrow.setElevation(getElevation());
         }
 
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index 4087f49f8e..c282ae8287 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -60,6 +60,7 @@ import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.notification.NotificationInfo;
 import com.android.launcher3.notification.NotificationItemView;
 import com.android.launcher3.notification.NotificationKeyData;
+import com.android.launcher3.notification.NotificationMainView;
 import com.android.launcher3.popup.PopupDataProvider.PopupDataChangeListener;
 import com.android.launcher3.shortcuts.DeepShortcutView;
 import com.android.launcher3.shortcuts.ShortcutDragPreviewProvider;
@@ -170,6 +171,14 @@ public class PopupContainerWithArrow<T extends BaseDraggingActivity> extends Arr
         return false;
     }
 
+    @Override
+    protected void setChildColor(View v, int color) {
+        super.setChildColor(v, color);
+        if (v.getId() == R.id.notification_container && mNotificationItemView != null) {
+            mNotificationItemView.updateBackgroundColor(color);
+        }
+    }
+
     /**
      * Returns true if we can show the container.
      */
@@ -333,19 +342,11 @@ public class PopupContainerWithArrow<T extends BaseDraggingActivity> extends Arr
     private void updateHiddenShortcuts() {
         int allowedCount = mNotificationItemView != null
                 ? MAX_SHORTCUTS_IF_NOTIFICATIONS : MAX_SHORTCUTS;
-        int originalHeight = getResources().getDimensionPixelSize(R.dimen.bg_popup_item_height);
-        int itemHeight = mNotificationItemView != null ?
-                getResources().getDimensionPixelSize(R.dimen.bg_popup_item_condensed_height)
-                : originalHeight;
-        float iconScale = ((float) itemHeight) / originalHeight;
 
         int total = mShortcuts.size();
         for (int i = 0; i < total; i++) {
             DeepShortcutView view = mShortcuts.get(i);
             view.setVisibility(i >= allowedCount ? GONE : VISIBLE);
-            view.getLayoutParams().height = itemHeight;
-            view.getIconView().setScaleX(iconScale);
-            view.getIconView().setScaleY(iconScale);
         }
     }
 
@@ -567,6 +568,7 @@ public class PopupContainerWithArrow<T extends BaseDraggingActivity> extends Arr
                 // No more notifications, remove the notification views and expand all shortcuts.
                 mNotificationItemView.removeAllViews();
                 mNotificationItemView = null;
+                mNotificationContainer.setVisibility(GONE);
                 updateHiddenShortcuts();
                 assignMarginsAndBackgrounds();
             } else {
-- 
GitLab


From e31af6264d00a996af5fa59b63ed622a6c74c6c3 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 19 Mar 2021 11:04:11 -0700
Subject: [PATCH 0722/1664] Don't go to NORMAL after task launches if animation
 in progress

Test: Swipe down on a task, swipe up immediately as it launches;
state stays as BACKGROUND_APP instead of NORMAL
Fixes: 171757635

Change-Id: Ia38774c01190bd184e229ff532ea9df2a75abcb4
---
 .../src/com/android/quickstep/views/LauncherRecentsView.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
index e042b35653..a0af68a9bf 100644
--- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
@@ -101,7 +101,7 @@ public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher>
     @Override
     protected void onTaskLaunchAnimationEnd(boolean success) {
         if (success) {
-            mActivity.getStateManager().goToState(NORMAL, false /* animate */);
+            mActivity.getStateManager().moveToRestState();
         } else {
             LauncherState state = mActivity.getStateManager().getState();
             mActivity.getAllAppsController().setState(state);
-- 
GitLab


From 147527229b0c7100f8ce2015c7855a4088417fef Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Fri, 19 Mar 2021 09:52:37 -0500
Subject: [PATCH 0723/1664] [Search] Tie quick-launch and focus highlight

Highlight and quick-launch item should be determined by Search service pipeline based on quick_launch flag on SearchTarget

Bug: 183083807
Bug: 183083682
Test: Manual
Change-Id: I0191474653deca7e1ecd01fa92c90efcdbb9a8dc
---
 .../allapps/AllAppsContainerView.java         | 36 ++-----------------
 .../allapps/AllAppsSectionDecorator.java      |  6 ++--
 .../search/AllAppsSearchBarController.java    | 29 ++++-----------
 .../search/DefaultSearchAdapterProvider.java  | 26 +++++++++-----
 .../allapps/search/SearchAdapterProvider.java | 13 +++++--
 .../allapps/search/SectionDecorationInfo.java | 11 ------
 6 files changed, 41 insertions(+), 80 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 78c404f061..591de043d2 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -15,7 +15,6 @@
  */
 package com.android.launcher3.allapps;
 
-import static com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItem;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_TAP_ON_PERSONAL_TAB;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_TAP_ON_WORK_TAB;
 import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_HAS_SHORTCUT_PERMISSION;
@@ -63,7 +62,6 @@ import com.android.launcher3.allapps.search.SearchAdapterProvider;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.keyboard.FocusedItemDecorator;
 import com.android.launcher3.model.data.AppInfo;
-import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.ItemInfoMatcher;
 import com.android.launcher3.util.MultiValueAlpha;
@@ -564,37 +562,9 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
     /**
      * Handles selection on focused view and returns success
      */
-    public boolean selectFocusedView(View v) {
-        ItemInfo headerItem = getHighlightedItemFromHeader();
-        if (headerItem != null) {
-            return mLauncher.startActivitySafely(v, headerItem.getIntent(), headerItem);
-        }
-        AdapterItem focusedItem = getActiveRecyclerView().getApps().getFocusedChild();
-        if (focusedItem != null) {
-            View focusedView = getActiveRecyclerView().getLayoutManager()
-                    .findViewByPosition(focusedItem.position);
-            if (focusedView != null && mSearchAdapterProvider.onAdapterItemSelected(focusedItem,
-                    focusedView)) {
-                return true;
-            }
-        }
-        if (focusedItem != null && focusedItem.appInfo != null) {
-            ItemInfo itemInfo = focusedItem.appInfo;
-            return mLauncher.startActivitySafely(v, itemInfo.getIntent(), itemInfo);
-        }
-        return false;
-    }
-
-    /**
-     * Returns the ItemInfo of a focused view inside {@link FloatingHeaderView}
-     */
-    public ItemInfo getHighlightedItemFromHeader() {
-        View view = getFloatingHeaderView().getFocusedChild();
-        if (view != null && view.getTag() instanceof ItemInfo) {
-            return ((ItemInfo) view.getTag());
-        }
-
-        return null;
+    public boolean launchHighlightedItem() {
+        if (mSearchAdapterProvider == null) return false;
+        return mSearchAdapterProvider.launchHighlightedItem();
     }
 
     public SearchAdapterProvider getSearchAdapterProvider() {
diff --git a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
index 269e3905c8..7fcd6ec16f 100644
--- a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
+++ b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
@@ -29,6 +29,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsGridAdapter.AppsGridLayoutManager;
+import com.android.launcher3.allapps.search.SearchAdapterProvider;
 import com.android.launcher3.allapps.search.SectionDecorationInfo;
 import com.android.launcher3.util.Themes;
 
@@ -48,6 +49,7 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
     @Override
     public void onDraw(Canvas c, RecyclerView parent, RecyclerView.State state) {
         List<AllAppsGridAdapter.AdapterItem> adapterItems = mAppsView.getApps().getAdapterItems();
+        SearchAdapterProvider adapterProvider = mAppsView.getSearchAdapterProvider();
         for (int i = 0; i < parent.getChildCount(); i++) {
             View view = parent.getChildAt(i);
             int position = parent.getChildAdapterPosition(view);
@@ -56,7 +58,7 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
                 SectionDecorationInfo sectionInfo = adapterItem.sectionDecorationInfo;
                 SectionDecorationHandler decorationHandler = sectionInfo.getDecorationHandler();
                 if (decorationHandler != null) {
-                    if (sectionInfo.isFocusedView()) {
+                    if (view.equals(adapterProvider.getHighlightedItem())) {
                         decorationHandler.onFocusDraw(c, view);
                     } else {
                         decorationHandler.onGroupDraw(c, view);
@@ -102,7 +104,7 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
         private final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
         private final boolean mIsTopRound;
         private final boolean mIsBottomRound;
-        private float [] mCorners;
+        private float[] mCorners;
         private float mFillSpacing;
 
         public SectionDecorationHandler(Context context, boolean isFullWidth, int fillAlpha,
diff --git a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
index d3c9993579..79718fb6df 100644
--- a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
+++ b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
@@ -35,7 +35,6 @@ import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItem;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.search.SearchAlgorithm;
 import com.android.launcher3.search.SearchCallback;
-import com.android.launcher3.util.PackageManagerHelper;
 
 /**
  * An interface to a search box that AllApps can command.
@@ -105,30 +104,14 @@ public class AllAppsSearchBarController
 
     @Override
     public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
-            if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_GO) {
-                mLauncher.getStatsLogManager().logger()
-                        .log(LAUNCHER_ALLAPPS_FOCUSED_ITEM_SELECTED_WITH_IME);
-                // selectFocusedView should return SearchTargetEvent that is passed onto onClick
-                if (Launcher.getLauncher(mLauncher).getAppsView().selectFocusedView(v)) {
-                    return true;
-                }
-            }
-        }
 
-        // Skip if it's not the right action
-        if (actionId != EditorInfo.IME_ACTION_SEARCH) {
-            return false;
+        if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_GO) {
+            mLauncher.getStatsLogManager().logger()
+                    .log(LAUNCHER_ALLAPPS_FOCUSED_ITEM_SELECTED_WITH_IME);
+            // selectFocusedView should return SearchTargetEvent that is passed onto onClick
+            return Launcher.getLauncher(mLauncher).getAppsView().launchHighlightedItem();
         }
-
-        // Skip if the query is empty
-        String query = v.getText().toString();
-        if (query.isEmpty()) {
-            return false;
-        }
-        return mLauncher.startActivitySafely(v,
-                PackageManagerHelper.getMarketSearchIntent(mLauncher, query), null
-        );
+        return false;
     }
 
     @Override
diff --git a/src/com/android/launcher3/allapps/search/DefaultSearchAdapterProvider.java b/src/com/android/launcher3/allapps/search/DefaultSearchAdapterProvider.java
index e268f567ae..ba895ed5d4 100644
--- a/src/com/android/launcher3/allapps/search/DefaultSearchAdapterProvider.java
+++ b/src/com/android/launcher3/allapps/search/DefaultSearchAdapterProvider.java
@@ -15,31 +15,31 @@
  */
 package com.android.launcher3.allapps.search;
 
-import android.net.Uri;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import com.android.launcher3.BaseDraggingActivity;
+import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.allapps.AllAppsGridAdapter;
+import com.android.launcher3.model.data.ItemInfo;
 
 /**
  * Provides views for local search results
  */
 public class DefaultSearchAdapterProvider extends SearchAdapterProvider {
 
+    private View mHighlightedView;
+
     public DefaultSearchAdapterProvider(BaseDraggingActivity launcher) {
         super(launcher);
     }
 
     @Override
     public void onBindView(AllAppsGridAdapter.ViewHolder holder, int position) {
-
-    }
-
-    @Override
-    public void onSliceStatusUpdate(Uri sliceUri) {
-
+        if (position == 0) {
+            mHighlightedView = holder.itemView;
+        }
     }
 
     @Override
@@ -54,7 +54,17 @@ public class DefaultSearchAdapterProvider extends SearchAdapterProvider {
     }
 
     @Override
-    public boolean onAdapterItemSelected(AllAppsGridAdapter.AdapterItem adapterItem, View view) {
+    public boolean launchHighlightedItem() {
+        if (mHighlightedView instanceof BubbleTextView
+                && mHighlightedView.getTag() instanceof ItemInfo) {
+            ItemInfo itemInfo = (ItemInfo) mHighlightedView.getTag();
+            return mLauncher.startActivitySafely(mHighlightedView, itemInfo.getIntent(), itemInfo);
+        }
         return false;
     }
+
+    @Override
+    public View getHighlightedItem() {
+        return mHighlightedView;
+    }
 }
diff --git a/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java b/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
index 0864090ade..a650a7d947 100644
--- a/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
+++ b/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
@@ -43,7 +43,8 @@ public abstract class SearchAdapterProvider {
     /**
      * Called from LiveSearchManager to notify slice status updates.
      */
-    public abstract void onSliceStatusUpdate(Uri sliceUri);
+    public void onSliceStatusUpdate(Uri sliceUri) {
+    }
 
     /**
      * Returns whether or not viewType can be handled by searchProvider
@@ -74,6 +75,12 @@ public abstract class SearchAdapterProvider {
      * handles selection event on search adapter item. Returns false if provider can not handle
      * event
      */
-    public abstract boolean onAdapterItemSelected(AllAppsGridAdapter.AdapterItem adapterItem,
-            View view);
+    public abstract boolean launchHighlightedItem();
+
+    /**
+     * Returns the current highlighted view
+     */
+    public abstract View getHighlightedItem();
+
+
 }
diff --git a/src/com/android/launcher3/allapps/search/SectionDecorationInfo.java b/src/com/android/launcher3/allapps/search/SectionDecorationInfo.java
index 0b64fcaece..56dd63ccc1 100644
--- a/src/com/android/launcher3/allapps/search/SectionDecorationInfo.java
+++ b/src/com/android/launcher3/allapps/search/SectionDecorationInfo.java
@@ -21,22 +21,11 @@ import com.android.launcher3.allapps.AllAppsSectionDecorator.SectionDecorationHa
  * Info class for a search section that is primarily used for decoration.
  */
 public class SectionDecorationInfo {
-
-    public static final int QUICK_LAUNCH = 1 << 0;
     public static final int GROUPING = 1 << 1;
 
     private String mSectionId;
-    private boolean mFocused;
     private SectionDecorationHandler mDecorationHandler;
 
-    public boolean isFocusedView() {
-        return mFocused;
-    }
-
-    public void setFocusedView(boolean focused) {
-        mFocused = focused;
-    }
-
     public SectionDecorationInfo() {
         this(null);
     }
-- 
GitLab


From 4235fc129c5bdbcfb88b57815a5bfb5971692f21 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Fri, 19 Mar 2021 20:13:16 +0000
Subject: [PATCH 0724/1664] Renders widget recommendations

Update the tapl test logic to scroll a smaller distance to avoid the
search bar blocking the target touch area.

Test: Open full widgets sheet and observe the widget recommendations
      shown at the top.
      Run AddConfigWidgetTest

Bug: 179797520

Change-Id: I6d53bbb46e2cb928ed7d015aaac604be17d33178
---
 res/layout/widget_cell_content.xml            |  11 +-
 ..._full_sheet_search_and_recommendations.xml |  12 +-
 res/layout/widgets_search_bar.xml             |   3 +-
 res/values/dimens.xml                         |   1 +
 .../android/launcher3/widget/WidgetCell.java  |  11 +-
 ...rchAndRecommendationsScrollController.java | 159 +++++++++++-----
 .../widget/picker/WidgetsFullSheet.java       | 107 +++++++++--
 .../WidgetsRecommendationTableLayout.java     | 175 ++++++++++++++++++
 .../com/android/launcher3/tapl/Widgets.java   |  25 ++-
 9 files changed, 420 insertions(+), 84 deletions(-)
 create mode 100644 src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java

diff --git a/res/layout/widget_cell_content.xml b/res/layout/widget_cell_content.xml
index 7b85d9bcd5..a3d0070697 100644
--- a/res/layout/widget_cell_content.xml
+++ b/res/layout/widget_cell_content.xml
@@ -18,10 +18,11 @@
     android:layout_height="wrap_content">
 
     <!-- The image of the widget. This view does not support padding. Any placement adjustment
-         should be done using margins. -->
+         should be done using margins.
+          width & height are set at runtime after scaling the preview image. -->
     <com.android.launcher3.widget.WidgetImageView
         android:id="@+id/widget_preview"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_weight="1"
         android:importantForAccessibility="no"
@@ -38,7 +39,7 @@
         android:singleLine="true"
         android:maxLines="1"
         android:textColor="?android:attr/textColorPrimary"
-        android:textSize="14sp" />
+        android:textSize="@dimen/widget_cell_font_size" />
 
     <!-- The original dimensions of the widget (can't be the same text as above due to different
          style. -->
@@ -48,7 +49,7 @@
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:textColor="?android:attr/textColorTertiary"
-        android:textSize="14sp"
+        android:textSize="@dimen/widget_cell_font_size"
         android:alpha="0.8" />
 
     <TextView
@@ -56,7 +57,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:textSize="14sp"
+        android:textSize="@dimen/widget_cell_font_size"
         android:textColor="?android:attr/textColorTertiary"
         android:maxLines="2"
         android:ellipsize="end"
diff --git a/res/layout/widgets_full_sheet_search_and_recommendations.xml b/res/layout/widgets_full_sheet_search_and_recommendations.xml
index 1219f57e17..e5df175d3d 100644
--- a/res/layout/widgets_full_sheet_search_and_recommendations.xml
+++ b/res/layout/widgets_full_sheet_search_and_recommendations.xml
@@ -18,12 +18,15 @@
     android:id="@+id/search_and_recommendations_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="16dp"
+    android:paddingHorizontal="16dp"
+    android:layout_marginBottom="16dp"
     android:orientation="vertical">
     <View
         android:id="@+id/collapse_handle"
         android:layout_width="48dp"
         android:layout_height="2dp"
+        android:layout_marginTop="16dp"
+        android:elevation="2dp"
         android:layout_gravity="center_horizontal"
         android:background="?android:attr/textColorSecondary"/>
     <TextView
@@ -36,4 +39,11 @@
         android:textColor="?android:attr/textColorSecondary"
         android:text="@string/widget_button_text"/>
     <include layout="@layout/widgets_search_bar"/>
+
+    <com.android.launcher3.widget.picker.WidgetsRecommendationTableLayout
+        android:id="@+id/recommended_widget_table"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:visibility="gone" />
 </LinearLayout>
diff --git a/res/layout/widgets_search_bar.xml b/res/layout/widgets_search_bar.xml
index 021058b65d..1db7462a0f 100644
--- a/res/layout/widgets_search_bar.xml
+++ b/res/layout/widgets_search_bar.xml
@@ -6,7 +6,8 @@
     android:layout_height="wrap_content"
     android:orientation="horizontal"
     android:layout_marginTop="16dp"
-    android:background="@drawable/bg_widgets_searchbox">
+    android:background="@drawable/bg_widgets_searchbox"
+    android:elevation="2dp">
 
     <com.android.launcher3.ExtendedEditText
         android:id="@+id/widgets_search_bar_edit_text"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c607c98b24..aa5a09c183 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -109,6 +109,7 @@
 <!-- Widget tray -->
     <dimen name="widget_cell_vertical_padding">8dp</dimen>
     <dimen name="widget_cell_horizontal_padding">16dp</dimen>
+    <dimen name="widget_cell_font_size">14sp</dimen>
 
 
     <dimen name="widget_list_top_bottom_corner_radius">28dp</dimen>
diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index 5328041d16..1b0e1ce0b2 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -74,6 +74,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     protected int mPreviewHeight;
     protected int mPresetPreviewSize;
     private int mCellSize;
+    private float mPreviewScale = 1f;
 
     private WidgetImageView mWidgetImage;
     private TextView mWidgetName;
@@ -254,8 +255,8 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
         }
         if (drawable != null) {
             LayoutParams layoutParams = (LayoutParams) mWidgetImage.getLayoutParams();
-            layoutParams.width = drawable.getIntrinsicWidth();
-            layoutParams.height = drawable.getIntrinsicHeight();
+            layoutParams.width = (int) (drawable.getIntrinsicWidth() * mPreviewScale);
+            layoutParams.height = (int) (drawable.getIntrinsicHeight() * mPreviewScale);
             mWidgetImage.setLayoutParams(layoutParams);
 
             mWidgetImage.setDrawable(drawable, mWidgetPreviewLoader.getBadgeForUser(mItem.user,
@@ -305,10 +306,16 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
 
     /** Sets the widget preview image size in number of cells. */
     public void setPreviewSize(int spanX, int spanY) {
+        setPreviewSize(spanX, spanY, 1f);
+    }
+
+    /** Sets the widget preview image size, in number of cells, and preview scale. */
+    public void setPreviewSize(int spanX, int spanY, float previewScale) {
         int padding = 2 * getResources()
                 .getDimensionPixelSize(R.dimen.widget_preview_shortcut_padding);
         mPreviewWidth = mDeviceProfile.cellWidthPx * spanX + padding;
         mPreviewHeight = mDeviceProfile.cellHeightPx * spanY + padding;
+        mPreviewScale = previewScale;
     }
 
     @Override
diff --git a/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java b/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java
index 7eb5b834fd..7f840776b2 100644
--- a/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java
+++ b/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java
@@ -35,6 +35,7 @@ final class SearchAndRecommendationsScrollController implements
     private final SearchAndRecommendationViewHolder mViewHolder;
     private final WidgetsRecyclerView mPrimaryRecyclerView;
     private final WidgetsRecyclerView mSearchRecyclerView;
+    private final int mTabsHeight;
 
     // The following are only non null if mHasWorkProfile is true.
     @Nullable private final WidgetsRecyclerView mWorkRecyclerView;
@@ -42,10 +43,28 @@ final class SearchAndRecommendationsScrollController implements
     @Nullable private final PersonalWorkPagedView mPrimaryWorkViewPager;
 
     private WidgetsRecyclerView mCurrentRecyclerView;
-    private int mMaxCollapsibleHeight = 0;
+
+    /**
+     * The vertical distance, in pixels, until the search is pinned at the top of the screen when
+     * the user scrolls down the recycler view.
+     */
+    private int mCollapsibleHeightForSearch = 0;
+    /**
+     * The vertical distance, in pixels, until the recommendation table disappears from the top of
+     * the screen when the user scrolls down the recycler view.
+     */
+    private int mCollapsibleHeightForRecommendation = 0;
+    /**
+     * The vertical distance, in pixels, until the tabs is pinned at the top of the screen when the
+     * user scrolls down the recycler view.
+     *
+     * <p>Always 0 if there is no work profile.
+     */
+    private int mCollapsibleHeightForTabs = 0;
 
     SearchAndRecommendationsScrollController(
             boolean hasWorkProfile,
+            int tabsHeight,
             SearchAndRecommendationViewHolder viewHolder,
             WidgetsRecyclerView primaryRecyclerView,
             @Nullable WidgetsRecyclerView workRecyclerView,
@@ -55,46 +74,63 @@ final class SearchAndRecommendationsScrollController implements
         mHasWorkProfile = hasWorkProfile;
         mViewHolder = viewHolder;
         mPrimaryRecyclerView = primaryRecyclerView;
+        mCurrentRecyclerView = mPrimaryRecyclerView;
         mWorkRecyclerView = workRecyclerView;
         mSearchRecyclerView = searchRecyclerView;
         mPrimaryWorkTabsView = personalWorkTabsView;
         mPrimaryWorkViewPager = primaryWorkViewPager;
         mCurrentRecyclerView = mPrimaryRecyclerView;
+        mTabsHeight = tabsHeight;
     }
 
     /** Sets the current active {@link WidgetsRecyclerView}. */
     public void setCurrentRecyclerView(WidgetsRecyclerView currentRecyclerView) {
         mCurrentRecyclerView = currentRecyclerView;
+        mCurrentRecyclerView = currentRecyclerView;
+        mViewHolder.mHeaderTitle.setTranslationY(0);
+        mViewHolder.mRecommendedWidgetsTable.setTranslationY(0);
+        mViewHolder.mSearchBar.setTranslationY(0);
+
+        if (mHasWorkProfile) {
+            mPrimaryWorkTabsView.setTranslationY(0);
+        }
     }
 
     /**
      * Updates the margin and padding of {@link WidgetsFullSheet} to accumulate collapsible views.
+     *
+     * @return {@code true} if margins or/and padding of views in the search and recommendations
+     * container have been updated.
      */
-    public void updateMarginAndPadding() {
-        // The maximum vertical distance, in pixels, until the last collapsible element is not
-        // visible from the screen when the user scrolls down the recycler view.
-        mMaxCollapsibleHeight = mViewHolder.mContainer.getPaddingTop()
-                + measureHeightWithVerticalMargins(mViewHolder.mCollapseHandle)
-                + measureHeightWithVerticalMargins(mViewHolder.mHeaderTitle);
+    public boolean updateMarginAndPadding() {
+        boolean hasMarginOrPaddingUpdated = false;
+        mCollapsibleHeightForSearch = measureHeightWithVerticalMargins(mViewHolder.mHeaderTitle);
+        mCollapsibleHeightForRecommendation =
+                measureHeightWithVerticalMargins(mViewHolder.mHeaderTitle)
+                        + measureHeightWithVerticalMargins(mViewHolder.mCollapseHandle)
+                        + measureHeightWithVerticalMargins((View) mViewHolder.mSearchBar)
+                        + measureHeightWithVerticalMargins(mViewHolder.mRecommendedWidgetsTable);
 
         int topContainerHeight = measureHeightWithVerticalMargins(mViewHolder.mContainer);
         if (mHasWorkProfile) {
+            mCollapsibleHeightForTabs = measureHeightWithVerticalMargins(mViewHolder.mHeaderTitle)
+                    + measureHeightWithVerticalMargins(mViewHolder.mRecommendedWidgetsTable);
             // In a work profile setup, the full widget sheet contains the following views:
-            //           -------               -|
-            //           Widgets               -|---> LinearLayout for search & recommendations
-            //          Search bar             -|
-            //      Personal | Work
+            //           ------- (pinned)           -|
+            //          Widgets (collapsible)       -|---> LinearLayout for search & recommendations
+            //          Search bar (pinned)         -|
+            //  Widgets recommendation (collapsible)-|
+            //      Personal | Work (pinned)
             //           View Pager
             //
             // Views after the search & recommendations are not bound by RelativelyLayout param.
             // To position them on the expected location, padding & margin are added to these views
 
             // Tabs should have a padding of the height of the search & recommendations container.
-            mPrimaryWorkTabsView.setPadding(
-                    mPrimaryWorkTabsView.getPaddingLeft(),
-                    topContainerHeight,
-                    mPrimaryWorkTabsView.getPaddingRight(),
-                    mPrimaryWorkTabsView.getPaddingBottom());
+            RelativeLayout.LayoutParams tabsLayoutParams =
+                    (RelativeLayout.LayoutParams) mPrimaryWorkTabsView.getLayoutParams();
+            tabsLayoutParams.topMargin = topContainerHeight;
+            mPrimaryWorkTabsView.setLayoutParams(tabsLayoutParams);
 
             // Instead of setting the top offset directly, we split the top offset into two values:
             // 1. topOffsetAfterAllViewsCollapsed: this is the top offset after all collapsible
@@ -124,39 +160,52 @@ final class SearchAndRecommendationsScrollController implements
             //
             // When the views are first inflated, the sum of topOffsetAfterAllViewsCollapsed and
             // mMaxCollapsibleDistance should equal to the top container height.
-            int tabsViewActualHeight = measureHeightWithVerticalMargins(mPrimaryWorkTabsView)
-                    - mPrimaryWorkTabsView.getPaddingTop();
             int topOffsetAfterAllViewsCollapsed =
-                    topContainerHeight + tabsViewActualHeight - mMaxCollapsibleHeight;
+                    topContainerHeight + mTabsHeight - mCollapsibleHeightForTabs;
 
-            RelativeLayout.LayoutParams layoutParams =
+            RelativeLayout.LayoutParams viewPagerLayoutParams =
                     (RelativeLayout.LayoutParams) mPrimaryWorkViewPager.getLayoutParams();
-            layoutParams.setMargins(0, topOffsetAfterAllViewsCollapsed, 0, 0);
-            mPrimaryWorkViewPager.setLayoutParams(layoutParams);
-            mPrimaryWorkViewPager.requestLayout();
-
-            mPrimaryRecyclerView.setPadding(
-                    mPrimaryRecyclerView.getPaddingLeft(),
-                    mMaxCollapsibleHeight,
-                    mPrimaryRecyclerView.getPaddingRight(),
-                    mPrimaryRecyclerView.getPaddingBottom());
-            mWorkRecyclerView.setPadding(
-                    mWorkRecyclerView.getPaddingLeft(),
-                    mMaxCollapsibleHeight,
-                    mWorkRecyclerView.getPaddingRight(),
-                    mWorkRecyclerView.getPaddingBottom());
+            if (viewPagerLayoutParams.topMargin != topOffsetAfterAllViewsCollapsed) {
+                viewPagerLayoutParams.topMargin = topOffsetAfterAllViewsCollapsed;
+                mPrimaryWorkViewPager.setLayoutParams(viewPagerLayoutParams);
+                hasMarginOrPaddingUpdated = true;
+            }
+
+            if (mPrimaryRecyclerView.getPaddingTop() != mCollapsibleHeightForTabs) {
+                mPrimaryRecyclerView.setPadding(
+                        mPrimaryRecyclerView.getPaddingLeft(),
+                        mCollapsibleHeightForTabs,
+                        mPrimaryRecyclerView.getPaddingRight(),
+                        mPrimaryRecyclerView.getPaddingBottom());
+                hasMarginOrPaddingUpdated = true;
+            }
+            if (mWorkRecyclerView.getPaddingTop() != mCollapsibleHeightForTabs) {
+                mWorkRecyclerView.setPadding(
+                        mWorkRecyclerView.getPaddingLeft(),
+                        mCollapsibleHeightForTabs,
+                        mWorkRecyclerView.getPaddingRight(),
+                        mWorkRecyclerView.getPaddingBottom());
+                hasMarginOrPaddingUpdated = true;
+            }
         } else {
-            mPrimaryRecyclerView.setPadding(
-                    mPrimaryRecyclerView.getPaddingLeft(),
+            if (mPrimaryRecyclerView.getPaddingTop() != topContainerHeight) {
+                mPrimaryRecyclerView.setPadding(
+                        mPrimaryRecyclerView.getPaddingLeft(),
+                        topContainerHeight,
+                        mPrimaryRecyclerView.getPaddingRight(),
+                        mPrimaryRecyclerView.getPaddingBottom());
+                hasMarginOrPaddingUpdated = true;
+            }
+        }
+        if (mSearchRecyclerView.getPaddingTop() != topContainerHeight) {
+            mSearchRecyclerView.setPadding(
+                    mSearchRecyclerView.getPaddingLeft(),
                     topContainerHeight,
-                    mPrimaryRecyclerView.getPaddingRight(),
-                    mPrimaryRecyclerView.getPaddingBottom());
+                    mSearchRecyclerView.getPaddingRight(),
+                    mSearchRecyclerView.getPaddingBottom());
+            hasMarginOrPaddingUpdated = true;
         }
-        mSearchRecyclerView.setPadding(
-                mSearchRecyclerView.getPaddingLeft(),
-                topContainerHeight,
-                mSearchRecyclerView.getPaddingRight(),
-                mSearchRecyclerView.getPaddingBottom());
+        return hasMarginOrPaddingUpdated;
     }
 
     /**
@@ -168,13 +217,22 @@ final class SearchAndRecommendationsScrollController implements
         // Always use the recycler view offset because fast scroller offset has a different scale.
         int recyclerViewYOffset = mCurrentRecyclerView.getCurrentScrollY();
         if (recyclerViewYOffset < 0) return;
-        if (mMaxCollapsibleHeight > 0) {
-            int yDisplacement = Math.max(-recyclerViewYOffset, -mMaxCollapsibleHeight);
+
+        if (mCollapsibleHeightForRecommendation > 0) {
+            int yDisplacement = Math.max(-recyclerViewYOffset,
+                    -mCollapsibleHeightForRecommendation);
             mViewHolder.mHeaderTitle.setTranslationY(yDisplacement);
-            mViewHolder.mSearchBar.setTranslationY(yDisplacement);
-            if (mHasWorkProfile) {
-                mPrimaryWorkTabsView.setTranslationY(yDisplacement);
-            }
+            mViewHolder.mRecommendedWidgetsTable.setTranslationY(yDisplacement);
+        }
+
+        if (mCollapsibleHeightForSearch > 0) {
+            int searchYDisplacement = Math.max(-recyclerViewYOffset, -mCollapsibleHeightForSearch);
+            mViewHolder.mSearchBar.setTranslationY(searchYDisplacement);
+        }
+
+        if (mHasWorkProfile && mCollapsibleHeightForTabs > 0) {
+            int yDisplacementForTabs = Math.max(-recyclerViewYOffset, -mCollapsibleHeightForTabs);
+            mPrimaryWorkTabsView.setTranslationY(yDisplacementForTabs);
         }
     }
 
@@ -189,6 +247,9 @@ final class SearchAndRecommendationsScrollController implements
 
     /** private the height, in pixel, + the vertical margins of a given view. */
     private static int measureHeightWithVerticalMargins(View view) {
+        if (view.getVisibility() != View.VISIBLE) {
+            return 0;
+        }
         MarginLayoutParams marginLayoutParams = (MarginLayoutParams) view.getLayoutParams();
         return view.getMeasuredHeight() + marginLayoutParams.bottomMargin
                 + marginLayoutParams.topMargin;
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index dc375ca414..1c34ece115 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -33,6 +33,7 @@ import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
 import android.widget.TextView;
@@ -48,6 +49,7 @@ import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.compat.AccessibilityManagerCompat;
+import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.views.RecyclerViewFastScroller;
 import com.android.launcher3.views.TopRoundedCornerView;
 import com.android.launcher3.widget.BaseWidgetSheet;
@@ -55,6 +57,7 @@ import com.android.launcher3.widget.LauncherAppWidgetHost.ProviderChangedListene
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 import com.android.launcher3.widget.picker.search.SearchModeListener;
 import com.android.launcher3.widget.picker.search.WidgetsSearchBar;
+import com.android.launcher3.widget.util.WidgetsTableUtils;
 import com.android.launcher3.workprofile.PersonalWorkPagedView;
 import com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip.OnActivePageChangedListener;
 
@@ -68,10 +71,15 @@ import java.util.function.Predicate;
 public class WidgetsFullSheet extends BaseWidgetSheet
         implements Insettable, ProviderChangedListener, OnActivePageChangedListener,
         WidgetsRecyclerView.HeaderViewDimensionsProvider, SearchModeListener {
+    private static final String TAG = WidgetsFullSheet.class.getSimpleName();
 
     private static final long DEFAULT_OPEN_DURATION = 267;
     private static final long FADE_IN_DURATION = 150;
     private static final float VERTICAL_START_POSITION = 0.3f;
+    // The widget recommendation table can easily take over the entire screen on devices with small
+    // resolution or landscape on phone. This ratio defines the max percentage of content area that
+    // the table can display.
+    private static final float RECOMMENDATION_TABLE_HEIGHT_RATIO = 0.75f;
 
     private final Rect mInsets = new Rect();
     private final boolean mHasWorkProfile;
@@ -81,10 +89,12 @@ public class WidgetsFullSheet extends BaseWidgetSheet
             mCurrentUser.equals(entry.mPkgItem.user);
     private final Predicate<WidgetsListBaseEntry> mWorkWidgetsFilter =
             mPrimaryWidgetsFilter.negate();
+    private final int mTabsHeight;
+    private final int mWidgetCellHorizontalPadding;
 
     @Nullable private PersonalWorkPagedView mViewPager;
-    private int mInitialTabsHeight = 0;
     private boolean mIsInSearchMode;
+    private int mMaxSpansPerRow = 4;
     private View mTabsView;
     private TextView mNoWidgetsView;
     private SearchAndRecommendationViewHolder mSearchAndRecommendationViewHolder;
@@ -96,6 +106,12 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         mAdapters.put(AdapterHolder.PRIMARY, new AdapterHolder(AdapterHolder.PRIMARY));
         mAdapters.put(AdapterHolder.WORK, new AdapterHolder(AdapterHolder.WORK));
         mAdapters.put(AdapterHolder.SEARCH, new AdapterHolder(AdapterHolder.SEARCH));
+        mTabsHeight = mHasWorkProfile
+                ? getContext().getResources()
+                        .getDimensionPixelSize(R.dimen.all_apps_header_tab_height)
+                : 0;
+        mWidgetCellHorizontalPadding = 2 * getResources().getDimensionPixelOffset(
+                R.dimen.widget_cell_horizontal_padding);
     }
 
     public WidgetsFullSheet(Context context, AttributeSet attrs) {
@@ -140,6 +156,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
                 findViewById(R.id.search_and_recommendations_container));
         mSearchAndRecommendationsScrollController = new SearchAndRecommendationsScrollController(
                 mHasWorkProfile,
+                mTabsHeight,
                 mSearchAndRecommendationViewHolder,
                 findViewById(R.id.primary_widgets_list_view),
                 mHasWorkProfile ? findViewById(R.id.work_widgets_list_view) : null,
@@ -150,6 +167,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
 
         mNoWidgetsView = findViewById(R.id.no_widgets_text);
 
+        onRecommendedWidgetsBound();
         onWidgetsBound();
 
         mSearchAndRecommendationViewHolder.mSearchBar.initialize(
@@ -257,6 +275,22 @@ public class WidgetsFullSheet extends BaseWidgetSheet
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        doMeasure(widthMeasureSpec, heightMeasureSpec);
+
+        if (mSearchAndRecommendationsScrollController.updateMarginAndPadding()) {
+            doMeasure(widthMeasureSpec, heightMeasureSpec);
+        }
+
+        if (updateMaxSpansPerRow()) {
+            doMeasure(widthMeasureSpec, heightMeasureSpec);
+
+            if (mSearchAndRecommendationsScrollController.updateMarginAndPadding()) {
+                doMeasure(widthMeasureSpec, heightMeasureSpec);
+            }
+        }
+    }
+
+    private void doMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         DeviceProfile deviceProfile = mLauncher.getDeviceProfile();
         int widthUsed;
         if (mInsets.bottom > 0) {
@@ -272,24 +306,29 @@ public class WidgetsFullSheet extends BaseWidgetSheet
                 widthUsed, heightMeasureSpec, heightUsed);
         setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec),
                 MeasureSpec.getSize(heightMeasureSpec));
+    }
 
-        int paddingPx = 2 * getResources().getDimensionPixelOffset(
-                R.dimen.widget_cell_horizontal_padding);
-        int maxSpansPerRow = getMeasuredWidth() / (deviceProfile.cellWidthPx + paddingPx);
-        mAdapters.get(AdapterHolder.PRIMARY).mWidgetsListAdapter.setMaxHorizontalSpansPerRow(
-                maxSpansPerRow);
-        mAdapters.get(AdapterHolder.SEARCH).mWidgetsListAdapter.setMaxHorizontalSpansPerRow(
-                maxSpansPerRow);
-        if (mHasWorkProfile) {
-            mAdapters.get(AdapterHolder.WORK).mWidgetsListAdapter.setMaxHorizontalSpansPerRow(
-                    maxSpansPerRow);
-        }
+    /** Returns {@code true} if the max spans have been updated. */
+    private boolean updateMaxSpansPerRow() {
+        if (getMeasuredWidth() == 0) return false;
 
-        if (mInitialTabsHeight == 0 && mTabsView != null) {
-            mInitialTabsHeight = measureHeightWithVerticalMargins(mTabsView);
-        }
+        int previousMaxSpansPerRow = mMaxSpansPerRow;
+        mMaxSpansPerRow = getMeasuredWidth()
+                / (mLauncher.getDeviceProfile().cellWidthPx + mWidgetCellHorizontalPadding);
 
-        mSearchAndRecommendationsScrollController.updateMarginAndPadding();
+        if (previousMaxSpansPerRow != mMaxSpansPerRow) {
+            mAdapters.get(AdapterHolder.PRIMARY).mWidgetsListAdapter.setMaxHorizontalSpansPerRow(
+                    mMaxSpansPerRow);
+            mAdapters.get(AdapterHolder.SEARCH).mWidgetsListAdapter.setMaxHorizontalSpansPerRow(
+                    mMaxSpansPerRow);
+            if (mHasWorkProfile) {
+                mAdapters.get(AdapterHolder.WORK).mWidgetsListAdapter.setMaxHorizontalSpansPerRow(
+                        mMaxSpansPerRow);
+            }
+            onRecommendedWidgetsBound();
+            return true;
+        }
+        return false;
     }
 
     @Override
@@ -346,6 +385,8 @@ public class WidgetsFullSheet extends BaseWidgetSheet
             mViewPager.snapToPage(AdapterHolder.PRIMARY);
         }
         attachScrollbarToRecyclerView(mAdapters.get(AdapterHolder.PRIMARY).mWidgetsRecyclerView);
+
+        mSearchAndRecommendationsScrollController.updateMarginAndPadding();
     }
 
     @Override
@@ -357,6 +398,8 @@ public class WidgetsFullSheet extends BaseWidgetSheet
 
     private void setViewVisibilityBasedOnSearch(boolean isInSearchMode) {
         mIsInSearchMode = isInSearchMode;
+        mSearchAndRecommendationViewHolder.mRecommendedWidgetsTable
+                .setVisibility(isInSearchMode ? GONE : VISIBLE);
         if (mHasWorkProfile) {
             mViewPager.setVisibility(isInSearchMode ? GONE : VISIBLE);
             mTabsView.setVisibility(isInSearchMode ? GONE : VISIBLE);
@@ -374,6 +417,25 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         mAdapters.get(AdapterHolder.WORK).mWidgetsListAdapter.resetExpandedHeader();
     }
 
+    @Override
+    public void onRecommendedWidgetsBound() {
+        List<WidgetItem> recommendedWidgets =
+                mLauncher.getPopupDataProvider().getRecommendedWidgets();
+        WidgetsRecommendationTableLayout table =
+                mSearchAndRecommendationViewHolder.mRecommendedWidgetsTable;
+        if (recommendedWidgets.size() > 0) {
+            float maxTableHeight =
+                    (mLauncher.getDeviceProfile().heightPx - mTabsHeight - getHeaderViewHeight())
+                            * RECOMMENDATION_TABLE_HEIGHT_RATIO;
+            List<ArrayList<WidgetItem>> recommendedWidgetsInTable =
+                    WidgetsTableUtils.groupWidgetItemsIntoTable(recommendedWidgets,
+                            mMaxSpansPerRow);
+            table.setRecommendedWidgets(recommendedWidgetsInTable, maxTableHeight);
+        } else {
+            table.setVisibility(GONE);
+        }
+    }
+
     private void open(boolean animate) {
         if (animate) {
             if (getPopupContainer().getInsets().bottom > 0) {
@@ -534,20 +596,29 @@ public class WidgetsFullSheet extends BaseWidgetSheet
             mWidgetsRecyclerView.setEdgeEffectFactory(
                     ((TopRoundedCornerView) mContent).createEdgeEffectFactory());
             mWidgetsListAdapter.setApplyBitmapDeferred(false, mWidgetsRecyclerView);
+            mWidgetsListAdapter.setMaxHorizontalSpansPerRow(mMaxSpansPerRow);
         }
     }
 
     final class SearchAndRecommendationViewHolder {
-        final View mContainer;
+        final ViewGroup mContainer;
         final View mCollapseHandle;
         final WidgetsSearchBar mSearchBar;
         final TextView mHeaderTitle;
+        final WidgetsRecommendationTableLayout mRecommendedWidgetsTable;
 
-        SearchAndRecommendationViewHolder(View searchAndRecommendationContainer) {
+        SearchAndRecommendationViewHolder(ViewGroup searchAndRecommendationContainer) {
             mContainer = searchAndRecommendationContainer;
             mCollapseHandle = mContainer.findViewById(R.id.collapse_handle);
             mSearchBar = mContainer.findViewById(R.id.widgets_search_bar);
             mHeaderTitle = mContainer.findViewById(R.id.title);
+            mRecommendedWidgetsTable = mContainer.findViewById(R.id.recommended_widget_table);
+            mRecommendedWidgetsTable.setWidgetCellOnTouchListener((view, event) -> {
+                getRecyclerView().onTouchEvent(event);
+                return false;
+            });
+            mRecommendedWidgetsTable.setWidgetCellLongClickListener(WidgetsFullSheet.this);
+            mRecommendedWidgetsTable.setWidgetCellOnClickListener(WidgetsFullSheet.this);
         }
     }
 }
diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
new file mode 100644
index 0000000000..6569fb0d48
--- /dev/null
+++ b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget.picker;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+import android.widget.TableLayout;
+import android.widget.TableRow;
+
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.R;
+import com.android.launcher3.model.WidgetItem;
+import com.android.launcher3.widget.WidgetCell;
+import com.android.launcher3.widget.WidgetImageView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/** A {@link TableLayout} for showing recommended widgets. */
+public final class WidgetsRecommendationTableLayout extends TableLayout {
+    private static final float SCALE_DOWN_RATIO = 0.9f;
+    private final DeviceProfile mDeviceProfile;
+    private final float mWidgetCellTextViewsHeight;
+
+    private float mRecommendationTableMaxHeight = Float.MAX_VALUE;
+    @Nullable private OnLongClickListener mWidgetCellOnLongClickListener;
+    @Nullable private OnClickListener mWidgetCellOnClickListener;
+    @Nullable private OnTouchListener mWidgetCellOnTouchListener;
+
+    public WidgetsRecommendationTableLayout(Context context) {
+        this(context, /* attrs= */ null);
+    }
+
+    public WidgetsRecommendationTableLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mDeviceProfile = Launcher.getLauncher(context).getDeviceProfile();
+        // There are 1 row for title, 1 row for dimension and 2 rows for description.
+        mWidgetCellTextViewsHeight = 4 * getResources().getDimension(R.dimen.widget_cell_font_size);
+    }
+
+    /** Sets a {@link android.view.View.OnLongClickListener} for all widget cells in this table. */
+    public void setWidgetCellLongClickListener(OnLongClickListener onLongClickListener) {
+        mWidgetCellOnLongClickListener = onLongClickListener;
+    }
+
+    /** Sets a {@link android.view.View.OnClickListener} for all widget cells in this table. */
+    public void setWidgetCellOnClickListener(OnClickListener widgetCellOnClickListener) {
+        mWidgetCellOnClickListener = widgetCellOnClickListener;
+    }
+
+    /** Sets a {@link android.view.View.OnTouchListener} for all widget cells in this table. */
+    public void setWidgetCellOnTouchListener(OnTouchListener widgetCellOnTouchListener) {
+        mWidgetCellOnTouchListener = widgetCellOnTouchListener;
+    }
+
+    /**
+     * Sets a list of recommended widgets that would like to be displayed in this table within the
+     * desired {@code recommendationTableMaxHeight}.
+     *
+     * <p>If the content can't fit {@code recommendationTableMaxHeight}, this view will remove a
+     * last row from the {@code recommendedWidgets} until it fits or only one row left. If the only
+     * row still doesn't fit, we scale down the preview image.
+     */
+    public void setRecommendedWidgets(List<ArrayList<WidgetItem>> recommendedWidgets,
+            float recommendationTableMaxHeight) {
+        mRecommendationTableMaxHeight = recommendationTableMaxHeight;
+        RecommendationTableData data = fitRecommendedWidgetsToTableSpace(/* previewScale= */ 1f,
+                recommendedWidgets);
+        bindData(data);
+    }
+
+    private void bindData(RecommendationTableData data) {
+        if (data.mRecommendationTable.size() == 0) {
+            setVisibility(GONE);
+            return;
+        }
+
+        removeAllViews();
+
+        for (int i = 0; i < data.mRecommendationTable.size(); i++) {
+            List<WidgetItem> widgetItems = data.mRecommendationTable.get(i);
+            TableRow tableRow = new TableRow(getContext());
+            tableRow.setGravity(Gravity.TOP);
+
+            for (WidgetItem widgetItem : widgetItems) {
+                WidgetCell widgetCell = addItemCell(tableRow);
+                widgetCell.setPreviewSize(widgetItem.spanX, widgetItem.spanY, data.mPreviewScale);
+                widgetCell.applyFromCellItem(widgetItem,
+                        LauncherAppState.getInstance(getContext()).getWidgetCache());
+                widgetCell.ensurePreview();
+            }
+            addView(tableRow);
+        }
+        setVisibility(VISIBLE);
+    }
+
+    private WidgetCell addItemCell(ViewGroup parent) {
+        WidgetCell widget = (WidgetCell) LayoutInflater.from(
+                getContext()).inflate(R.layout.widget_cell, parent, false);
+
+        widget.setOnTouchListener(mWidgetCellOnTouchListener);
+        WidgetImageView preview = widget.findViewById(R.id.widget_preview);
+        preview.setOnClickListener(mWidgetCellOnClickListener);
+        preview.setOnLongClickListener(mWidgetCellOnLongClickListener);
+        widget.setAnimatePreview(false);
+
+        parent.addView(widget);
+        return widget;
+    }
+
+    private RecommendationTableData fitRecommendedWidgetsToTableSpace(
+            float previewScale,
+            List<ArrayList<WidgetItem>> recommendedWidgetsInTable) {
+        // A naive estimation of the widgets recommendation table height without inflation.
+        float totalHeight = 0;
+        for (int i = 0; i < recommendedWidgetsInTable.size(); i++) {
+            List<WidgetItem> widgetItems = recommendedWidgetsInTable.get(i);
+            float rowHeight = 0;
+            for (int j = 0; j < widgetItems.size(); j++) {
+                float previewHeight = widgetItems.get(j).spanY * mDeviceProfile.allAppsCellHeightPx
+                        * previewScale;
+                rowHeight = Math.max(rowHeight, previewHeight + mWidgetCellTextViewsHeight);
+            }
+            totalHeight += rowHeight;
+        }
+
+        if (totalHeight < mRecommendationTableMaxHeight) {
+            return new RecommendationTableData(recommendedWidgetsInTable, previewScale);
+        }
+
+        if (recommendedWidgetsInTable.size() > 1) {
+            // We don't want to scale down widgets preview unless we really need to. Reduce the
+            // num of row by 1 to see if it fits.
+            return fitRecommendedWidgetsToTableSpace(
+                    previewScale,
+                    recommendedWidgetsInTable.subList(/* fromIndex= */0,
+                            /* toIndex= */recommendedWidgetsInTable.size() - 1));
+        }
+
+        float nextPreviewScale = previewScale * SCALE_DOWN_RATIO;
+        return fitRecommendedWidgetsToTableSpace(nextPreviewScale, recommendedWidgetsInTable);
+    }
+
+    /** Data class for the widgets recommendation table and widgets preview scaling. */
+    private class RecommendationTableData {
+        private final List<ArrayList<WidgetItem>> mRecommendationTable;
+        private final float mPreviewScale;
+
+        RecommendationTableData(List<ArrayList<WidgetItem>> recommendationTable,
+                float previewScale) {
+            mRecommendationTable = recommendationTable;
+            mPreviewScale = previewScale;
+        }
+    }
+}
diff --git a/tests/tapl/com/android/launcher3/tapl/Widgets.java b/tests/tapl/com/android/launcher3/tapl/Widgets.java
index 22f4d31bd5..fe4c71282f 100644
--- a/tests/tapl/com/android/launcher3/tapl/Widgets.java
+++ b/tests/tapl/com/android/launcher3/tapl/Widgets.java
@@ -30,7 +30,6 @@ import androidx.test.uiautomator.Until;
 import com.android.launcher3.testing.TestProtocol;
 
 import java.util.Collection;
-import java.util.List;
 
 /**
  * All widgets container.
@@ -106,7 +105,8 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
                     fullWidgetsPicker.wait(Until.scrollable(true), WAIT_TIME_MS));
             final Point displaySize = mLauncher.getRealDisplaySize();
 
-            final UiObject2 widgetsContainer = findTestAppWidgetsTableContainer();
+            Rect headerRect = new Rect();
+            final UiObject2 widgetsContainer = findTestAppWidgetsTableContainer(headerRect);
             mLauncher.assertTrue("Can't locate widgets list for the test app: "
                             + mLauncher.getLauncherPackageName(),
                     widgetsContainer != null);
@@ -132,7 +132,12 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
 
                 mLauncher.assertTrue("Too many attempts", ++i <= 40);
                 final int scroll = getWidgetsScroll();
-                mLauncher.scrollToLastVisibleRow(fullWidgetsPicker, tableRows, 0);
+                mLauncher.scroll(
+                        fullWidgetsPicker,
+                        Direction.DOWN,
+                        headerRect,
+                        10,
+                        true);
                 final int newScroll = getWidgetsScroll();
                 mLauncher.assertTrue(
                         "Scrolled in a wrong direction in Widgets: from " + scroll + " to "
@@ -143,7 +148,7 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
     }
 
     /** Finds the widgets list of this test app from the collapsed full widgets picker. */
-    private UiObject2 findTestAppWidgetsTableContainer() {
+    private UiObject2 findTestAppWidgetsTableContainer(Rect outHeaderRect) {
         final BySelector headerSelector = By.res(mLauncher.getLauncherPackageName(),
                 "widgets_list_header");
         final BySelector targetAppSelector = By.clazz("android.widget.TextView").text(
@@ -156,6 +161,7 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
             UiObject2 fullWidgetsPicker = verifyActiveContainer();
 
             UiObject2 header = fullWidgetsPicker.findObject(headerSelector);
+            outHeaderRect.set(0, 0, 0, header.getVisibleBounds().height());
             mLauncher.assertTrue("Can't find a widget header", header != null);
 
             // Look for a header that has the test app name.
@@ -179,11 +185,14 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
                 if (widgetsContainer != null) {
                     return widgetsContainer;
                 }
-                mLauncher.scrollToLastVisibleRow(fullWidgetsPicker, List.of(headerTitle), 0);
-            } else {
-                mLauncher.scrollToLastVisibleRow(fullWidgetsPicker, fullWidgetsPicker.getChildren(),
-                        0);
+
             }
+            mLauncher.scroll(
+                    fullWidgetsPicker,
+                    Direction.DOWN,
+                    outHeaderRect,
+                    /* steps= */ 10,
+                    /* slowDown= */ true);
         }
 
         return null;
-- 
GitLab


From f0b702f61b9782941795ca6495be6e564fbb1f53 Mon Sep 17 00:00:00 2001
From: Jon Spivack <spivack@google.com>
Date: Fri, 19 Mar 2021 14:38:22 -0700
Subject: [PATCH 0725/1664] Enable NIU Actions on Go devices

This flips the feature flag to enable the NIU Actions buttons in the Go Launcher Recents page.

Bug: 158157668
Test: Manual (on local wembley device)
Change-Id: Ifa49cbb8840556ce53a09f00e36b0f6a12eb8d60
---
 go/quickstep/res/values/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go/quickstep/res/values/config.xml b/go/quickstep/res/values/config.xml
index 9dca137562..a21381c745 100644
--- a/go/quickstep/res/values/config.xml
+++ b/go/quickstep/res/values/config.xml
@@ -20,5 +20,5 @@
     <string name="niu_actions_package" translatable="false"/>
 
     <!-- Feature Flags -->
-    <bool name="enable_niu_actions">false</bool>
+    <bool name="enable_niu_actions">true</bool>
 </resources>
\ No newline at end of file
-- 
GitLab


From 9053b9075150301c272d4950667c02877802ea2b Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 19 Mar 2021 15:13:24 -0700
Subject: [PATCH 0726/1664] Fix spring loaded scale when taskbar is present

Test: scaled workspace doesn't overlap QSB during drag and drop
Bug: 171917176
Change-Id: I56c7ee834e2c3ee2c796e88e83f75dbd24d28bd5
---
 src/com/android/launcher3/states/SpringLoadedState.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/states/SpringLoadedState.java b/src/com/android/launcher3/states/SpringLoadedState.java
index fce8fffdc7..d593013a36 100644
--- a/src/com/android/launcher3/states/SpringLoadedState.java
+++ b/src/com/android/launcher3/states/SpringLoadedState.java
@@ -59,10 +59,11 @@ public class SpringLoadedState extends LauncherState {
 
         float scale = grid.workspaceSpringLoadShrinkFactor;
         Rect insets = launcher.getDragLayer().getInsets();
+        int insetsBottom = grid.isTaskbarPresent ? grid.taskbarSize : insets.bottom;
 
         float scaledHeight = scale * ws.getNormalChildHeight();
         float shrunkTop = insets.top + grid.dropTargetBarSizePx;
-        float shrunkBottom = ws.getMeasuredHeight() - insets.bottom
+        float shrunkBottom = ws.getMeasuredHeight() - insetsBottom
                 - grid.workspacePadding.bottom
                 - grid.workspaceSpringLoadedBottomSpace;
         float totalShrunkSpace = shrunkBottom - shrunkTop;
-- 
GitLab


From 116e94e0a7017ff417470db19f2d4b547218eefc Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Fri, 19 Mar 2021 17:21:22 -0400
Subject: [PATCH 0727/1664] Account for children margins when orienting popup
 container.

Instead of recalculating the orientation after adding margins,
we account for the margins in the initial calls to orientAboutObject.

This ensures consistent mIsAboveIcon throughout calls to show the popup.

- Also updates the smaller radius to match the middle items.

Bug: 175329686
Test: long press on item where height and height without margins would
      result in differing mIsAboveIcon values
      eg. the 3rd item in a folder in the top middle of 5x5 workspace

Change-Id: I6132b544a89c7948339d17f219ad75c797233f55
---
 res/drawable/middle_item_primary.xml          |  2 +-
 res/values/dimens.xml                         |  2 +-
 .../android/launcher3/popup/ArrowPopup.java   | 21 ++++++++++++-------
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/res/drawable/middle_item_primary.xml b/res/drawable/middle_item_primary.xml
index c9757142da..0c04ea14ec 100644
--- a/res/drawable/middle_item_primary.xml
+++ b/res/drawable/middle_item_primary.xml
@@ -16,5 +16,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="?attr/popupColorPrimary"/>
-    <corners android:radius="@dimen/popup_middle_item_radius" />
+    <corners android:radius="@dimen/popup_smaller_radius" />
 </shape>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index b60b6113e4..36ee6bb38c 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -192,7 +192,7 @@
     <dimen name="deep_shortcut_icon_size">32dp</dimen>
     <dimen name="popup_margin">2dp</dimen>
     <dimen name="popup_single_item_radius">100dp</dimen>
-    <dimen name="popup_middle_item_radius">4dp</dimen>
+    <dimen name="popup_smaller_radius">4dp</dimen>
     <dimen name="deep_shortcut_drawable_padding">12dp</dimen>
     <dimen name="deep_shortcut_drag_handle_size">16dp</dimen>
     <dimen name="popup_padding_start">10dp</dimen>
diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java
index a53fe1f848..373653829b 100644
--- a/src/com/android/launcher3/popup/ArrowPopup.java
+++ b/src/com/android/launcher3/popup/ArrowPopup.java
@@ -130,13 +130,14 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
                 R.dimen.popup_arrow_horizontal_center_offset) - (mArrowWidth / 2);
         mArrowPointRadius = resources.getDimensionPixelSize(R.dimen.popup_arrow_corner_radius);
 
+        int smallerRadius = resources.getDimensionPixelSize(R.dimen.popup_smaller_radius);
         mRoundedTop = new GradientDrawable();
         mRoundedTop.setCornerRadii(new float[] { mOutlineRadius, mOutlineRadius, mOutlineRadius,
-                mOutlineRadius, 0, 0, 0, 0});
+                mOutlineRadius, smallerRadius, smallerRadius, smallerRadius, smallerRadius});
 
         mRoundedBottom = new GradientDrawable();
-        mRoundedBottom.setCornerRadii(new float[] { 0, 0, 0, 0, mOutlineRadius, mOutlineRadius,
-                mOutlineRadius, mOutlineRadius});
+        mRoundedBottom.setCornerRadii(new float[] { smallerRadius, smallerRadius, smallerRadius,
+                smallerRadius, mOutlineRadius, mOutlineRadius, mOutlineRadius, mOutlineRadius});
 
         int primaryColor = Themes.getAttrColor(context, R.attr.popupColorPrimary);
         int secondaryColor = Themes.getAttrColor(context, R.attr.popupColorSecondary);
@@ -272,7 +273,6 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
         }
         onInflationComplete(reverseOrder);
         assignMarginsAndBackgrounds();
-        orientAboutObject();
         if (shouldAddArrow()) {
             addArrow();
         }
@@ -286,7 +286,6 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
         setupForDisplay();
         onInflationComplete(false);
         assignMarginsAndBackgrounds();
-        orientAboutObject();
         if (shouldAddArrow()) {
             addArrow();
         }
@@ -383,10 +382,18 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
     private void orientAboutObject(boolean allowAlignLeft, boolean allowAlignRight) {
         measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
 
-        int width = getMeasuredWidth();
         int extraVerticalSpace = mArrowHeight + mArrowOffsetVertical
                 + getResources().getDimensionPixelSize(R.dimen.popup_vertical_padding);
-        int height = getMeasuredHeight() + extraVerticalSpace;
+        // The margins are added after we call this method, so we need to account for them here.
+        int numVisibleChildren = 0;
+        for (int i = getChildCount() - 1; i >= 0; --i) {
+            if (getChildAt(i).getVisibility() == VISIBLE) {
+                numVisibleChildren++;
+            }
+        }
+        int childMargins = (numVisibleChildren - 1) * mMargin;
+        int height = getMeasuredHeight() + extraVerticalSpace + childMargins;
+        int width = getMeasuredWidth();
 
         getTargetObjectLocation(mTempRect);
         InsettableFrameLayout dragLayer = getPopupContainer();
-- 
GitLab


From e85b5565c6d5595de945059579e7b57644588c83 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Fri, 19 Mar 2021 23:52:12 +0000
Subject: [PATCH 0728/1664] A11y fix for all widgets tray (Part 2 / n)

Fix the focus change when expanding / collapsing an app in
the all widgets tray by adding stable ids and disable item
animator.

Item animator is also disable even accessibility isn't enabled
because the default item animator also disrupts the header
padding. It also makes the expansion / collapsing of widgets table
very unpredicible.

Test: Navigate all widgets tray with talkback on.

Bug: 183120145
Change-Id: Ib1e2ea4d543757248e635a834204db688532cbfa
---
 .../android/launcher3/widget/picker/WidgetsFullSheet.java    | 3 +++
 .../android/launcher3/widget/picker/WidgetsListAdapter.java  | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index dc375ca414..c1709f64f6 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -515,6 +515,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
                     apps.getIconCache(),
                     /* iconClickListener= */ WidgetsFullSheet.this,
                     /* iconLongClickListener= */ WidgetsFullSheet.this);
+            mWidgetsListAdapter.setHasStableIds(true);
             switch (mAdapterType) {
                 case PRIMARY:
                     mWidgetsListAdapter.setFilter(mPrimaryWidgetsFilter);
@@ -530,6 +531,8 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         void setup(WidgetsRecyclerView recyclerView) {
             mWidgetsRecyclerView = recyclerView;
             mWidgetsRecyclerView.setAdapter(mWidgetsListAdapter);
+            // Disables animation because it disrupts the item focus upon adapter item change.
+            mWidgetsRecyclerView.setItemAnimator(null);
             mWidgetsRecyclerView.setHeaderViewDimensionsProvider(WidgetsFullSheet.this);
             mWidgetsRecyclerView.setEdgeEffectFactory(
                     ((TopRoundedCornerView) mContent).createEdgeEffectFactory());
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
index cab1e02d9a..d841c64a3c 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
@@ -43,6 +43,7 @@ import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
 import com.android.launcher3.widget.model.WidgetsListSearchHeaderEntry;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
 import java.util.function.Predicate;
@@ -216,7 +217,9 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
 
     @Override
     public long getItemId(int pos) {
-        return pos;
+        return Arrays.hashCode(new Object[]{
+                mVisibleEntries.get(pos).mPkgItem.hashCode(),
+                getItemViewType(pos)});
     }
 
     @Override
-- 
GitLab


From 554a1bee3994469cdf383498dbb36dced24f0d19 Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Tue, 16 Mar 2021 19:47:39 -0700
Subject: [PATCH 0729/1664] Apply new color scheme

Bug: 173553055
Test: manual
Test: atest SystemPalette
Test: atest ThemeOverlayControllerTest
Test: atest DeviceDefaultThemeTest
Change-Id: Ie06160ed322ceac2e1078c24db287dd1f26a0a65
---
 res/values-v31/colors.xml                     | 22 +++++++++----------
 .../test_layout_appwidget_dynamic_colors.xml  |  6 ++---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/res/values-v31/colors.xml b/res/values-v31/colors.xml
index 6baf39e034..24aac10a26 100644
--- a/res/values-v31/colors.xml
+++ b/res/values-v31/colors.xml
@@ -17,17 +17,17 @@
 */
 -->
 <resources>
-    <color name="popup_color_primary_light">@android:color/system_primary_50</color>
-    <color name="popup_color_secondary_light">@android:color/system_primary_100</color>
-    <color name="popup_color_tertiary_light">@android:color/system_primary_300</color>
-    <color name="popup_color_primary_dark">@android:color/system_primary_800</color>
-    <color name="popup_color_secondary_dark">@android:color/system_primary_900</color>
-    <color name="popup_color_tertiary_dark">@android:color/system_primary_700</color>
+    <color name="popup_color_primary_light">@android:color/system_neutral1_50</color>
+    <color name="popup_color_secondary_light">@android:color/system_neutral2_100</color>
+    <color name="popup_color_tertiary_light">@android:color/system_neutral2_300</color>
+    <color name="popup_color_primary_dark">@android:color/system_neutral1_800</color>
+    <color name="popup_color_secondary_dark">@android:color/system_neutral1_900</color>
+    <color name="popup_color_tertiary_dark">@android:color/system_neutral2_700</color>
 
-    <color name="workspace_text_color_light">@android:color/system_primary_50</color>
-    <color name="workspace_text_color_dark">@android:color/system_primary_900</color>
+    <color name="workspace_text_color_light">@android:color/system_neutral1_50</color>
+    <color name="workspace_text_color_dark">@android:color/system_neutral1_900</color>
 
-    <color name="text_color_primary_dark">@android:color/system_primary_50</color>
-    <color name="text_color_secondary_dark">@android:color/system_primary_200</color>
-    <color name="text_color_tertiary_dark">@android:color/system_primary_400</color>
+    <color name="text_color_primary_dark">@android:color/system_neutral1_50</color>
+    <color name="text_color_secondary_dark">@android:color/system_neutral2_200</color>
+    <color name="text_color_tertiary_dark">@android:color/system_neutral2_400</color>
 </resources>
\ No newline at end of file
diff --git a/tests/res/layout/test_layout_appwidget_dynamic_colors.xml b/tests/res/layout/test_layout_appwidget_dynamic_colors.xml
index c5ab030d11..21625c643d 100644
--- a/tests/res/layout/test_layout_appwidget_dynamic_colors.xml
+++ b/tests/res/layout/test_layout_appwidget_dynamic_colors.xml
@@ -18,7 +18,7 @@
         <ImageView
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:background="@android:color/system_primary_500"/>
+            android:background="@android:color/system_neutral1_500"/>
     </LinearLayout>
     <LinearLayout
         android:orientation = "horizontal"
@@ -32,7 +32,7 @@
         <ImageView
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:background="@android:color/system_secondary_500"/>
+            android:background="@android:color/system_accent1_500"/>
     </LinearLayout>
     <LinearLayout
         android:orientation = "horizontal"
@@ -46,7 +46,7 @@
         <ImageView
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:background="@android:color/system_neutral_500"/>
+            android:background="@android:color/system_neutral2_500"/>
     </LinearLayout>
 
     </LinearLayout>
\ No newline at end of file
-- 
GitLab


From a22574aa66ef8e122d2d332d60acfe9e0320d160 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Thu, 18 Mar 2021 22:37:33 -0700
Subject: [PATCH 0730/1664] Remove cursor when edit text no longer has focus

Bug: 180142918

Test: manual
Change-Id: I9a58ef605b145889e30cb42e99f0b98e16af1e46
Signed-off-by: Hyunyoung Song <hyunyoungs@google.com>
---
 .../allapps/AllAppsRecyclerView.java          |  1 +
 .../allapps/AllAppsSectionDecorator.java      | 25 -------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
index f307a53bc0..66575eb289 100644
--- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
@@ -189,6 +189,7 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
             case SCROLL_STATE_DRAGGING:
                 mgr.logger().sendToInteractionJankMonitor(
                         LAUNCHER_ALLAPPS_VERTICAL_SWIPE_BEGIN, this);
+                requestFocus();
                 getWindowInsetsController().hide(WindowInsets.Type.ime());
                 break;
             case SCROLL_STATE_IDLE:
diff --git a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
index 7fcd6ec16f..0bd2f44cc9 100644
--- a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
+++ b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
@@ -22,13 +22,11 @@ import android.graphics.Path;
 import android.graphics.RectF;
 import android.view.View;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.graphics.ColorUtils;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.launcher3.R;
-import com.android.launcher3.allapps.AllAppsGridAdapter.AppsGridLayoutManager;
 import com.android.launcher3.allapps.search.SearchAdapterProvider;
 import com.android.launcher3.allapps.search.SectionDecorationInfo;
 import com.android.launcher3.util.Themes;
@@ -68,28 +66,6 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
         }
     }
 
-    // Fallback logic in case non of the SearchTarget is labeled as focused item.
-    private void drawDecoration(@NonNull Canvas c,
-            @NonNull SectionDecorationHandler decorationHandler,
-            @NonNull RecyclerView parent) {
-        if (decorationHandler.mIsFullWidth) {
-            decorationHandler.mBounds.left = parent.getPaddingLeft();
-            decorationHandler.mBounds.right = parent.getWidth() - parent.getPaddingRight();
-        }
-        if (mAppsView.getFloatingHeaderView().getFocusedChild() == null
-                && mAppsView.getApps().getFocusedChild() != null) {
-            int index = mAppsView.getApps().getFocusedChildIndex();
-            AppsGridLayoutManager layoutManager = (AppsGridLayoutManager)
-                    mAppsView.getActiveRecyclerView().getLayoutManager();
-            if (layoutManager.findFirstVisibleItemPosition() <= index
-                    && index < parent.getChildCount()) {
-                RecyclerView.ViewHolder vh = parent.findViewHolderForAdapterPosition(index);
-                if (vh != null) decorationHandler.onFocusDraw(c, vh.itemView);
-            }
-        }
-        decorationHandler.reset();
-    }
-
     /**
      * Handles grouping and drawing of items in the same all apps sections.
      */
@@ -136,7 +112,6 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
          */
         public void onGroupDraw(Canvas canvas, View view) {
             if (view == null) return;
-
             mPaint.setColor(mFillcolor);
             mBounds.set(view.getLeft(), view.getTop(), view.getRight(), view.getBottom());
             onDraw(canvas);
-- 
GitLab


From 471922c5ac92741868d61b1d0de97e1ab8d3129c Mon Sep 17 00:00:00 2001
From: Yogisha Dixit <ydixit@google.com>
Date: Mon, 22 Mar 2021 11:14:48 +0000
Subject: [PATCH 0731/1664] Do not allow widget to be resized beyond max size.

Test: manual
Bug: 179807199
Change-Id: I38e108a8db2c5f06c0922972efa334e3b2864046
---
 .../launcher3/AppWidgetResizeFrame.java       | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java
index 8071782617..d02efb0100 100644
--- a/src/com/android/launcher3/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher3/AppWidgetResizeFrame.java
@@ -100,6 +100,8 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
     private int mRunningVInc;
     private int mMinHSpan;
     private int mMinVSpan;
+    private int mMaxHSpan;
+    private int mMaxVSpan;
     private int mDeltaX;
     private int mDeltaY;
     private int mDeltaXAddOn;
@@ -183,6 +185,8 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
 
         mMinHSpan = info.minSpanX;
         mMinVSpan = info.minSpanY;
+        mMaxHSpan = info.maxSpanX;
+        mMaxVSpan = info.maxSpanY;
 
         mWidgetPadding = AppWidgetHostView.getDefaultPaddingForWidget(getContext(),
                 widgetView.getAppWidgetInfo().provider, null);
@@ -314,7 +318,7 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
         // expandability.
         mTempRange1.set(cellX, spanX + cellX);
         int hSpanDelta = mTempRange1.applyDeltaAndBound(mLeftBorderActive, mRightBorderActive,
-                hSpanInc, mMinHSpan, mCellLayout.getCountX(), mTempRange2);
+                hSpanInc, mMinHSpan, mMaxHSpan, mCellLayout.getCountX(), mTempRange2);
         cellX = mTempRange2.start;
         spanX = mTempRange2.size();
         if (hSpanDelta != 0) {
@@ -323,7 +327,7 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
 
         mTempRange1.set(cellY, spanY + cellY);
         int vSpanDelta = mTempRange1.applyDeltaAndBound(mTopBorderActive, mBottomBorderActive,
-                vSpanInc, mMinVSpan, mCellLayout.getCountY(), mTempRange2);
+                vSpanInc, mMinVSpan, mMaxVSpan, mCellLayout.getCountY(), mTempRange2);
         cellY = mTempRange2.start;
         spanY = mTempRange2.size();
         if (vSpanDelta != 0) {
@@ -642,12 +646,15 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
          * @param minSize minimum size after with the moving edge should not be shifted any further.
          *                For eg, if delta = -3 when moving the endEdge brings the size to less than
          *                minSize, only delta = -2 will applied
+         * @param maxSize maximum size after with the moving edge should not be shifted any further.
+         *                For eg, if delta = -3 when moving the endEdge brings the size to greater
+         *                than maxSize, only delta = -2 will applied
          * @param maxEnd The maximum value to the end edge (start edge is always restricted to 0)
          * @return the amount of increase when endEdge was moves and the amount of decrease when
          * the start edge was moved.
          */
         public int applyDeltaAndBound(boolean moveStart, boolean moveEnd, int delta,
-                int minSize, int maxEnd, IntRange out) {
+                int minSize, int maxSize, int maxEnd, IntRange out) {
             applyDelta(moveStart, moveEnd, delta, out);
             if (out.start < 0) {
                 out.start = 0;
@@ -662,6 +669,13 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
                     out.end = out.start + minSize;
                 }
             }
+            if (out.size() > maxSize) {
+                if (moveStart) {
+                    out.start = out.end - maxSize;
+                } else if (moveEnd) {
+                    out.end = out.start + maxSize;
+                }
+            }
             return moveEnd ? out.size() - size() : size() - out.size();
         }
     }
-- 
GitLab


From 6a2acfaa59b949fa8bb9a11e22f3836a09289e2f Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Fri, 19 Mar 2021 13:23:53 +0000
Subject: [PATCH 0732/1664] Add an 65% opacity for workspace elements drag over
 button drop target

Also remove the draggable item hover top button color change.

Test: Manual
Bug: 183193201
Change-Id: Id80622b8c0152180c47c0c9ebff8aa8bc2a5c2be
---
 .../android/launcher3/ButtonDropTarget.java   | 56 ++-----------------
 .../android/launcher3/DeleteDropTarget.java   |  3 -
 .../launcher3/SecondaryDropTarget.java        |  4 --
 3 files changed, 4 insertions(+), 59 deletions(-)

diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
index 459b9a841e..4740079f9d 100644
--- a/src/com/android/launcher3/ButtonDropTarget.java
+++ b/src/com/android/launcher3/ButtonDropTarget.java
@@ -21,14 +21,9 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 import static com.android.launcher3.LauncherState.NORMAL;
 
 import android.animation.AnimatorSet;
-import android.animation.FloatArrayEvaluator;
-import android.animation.ObjectAnimator;
-import android.animation.ValueAnimator;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.content.res.Resources;
-import android.graphics.ColorMatrix;
-import android.graphics.ColorMatrixColorFilter;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
@@ -45,10 +40,7 @@ import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.dragndrop.DragController;
 import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.dragndrop.DragOptions;
-import com.android.launcher3.dragndrop.DragView;
 import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.util.Themes;
-import com.android.launcher3.util.Thunk;
 
 /**
  * Implements a DropTarget.
@@ -72,6 +64,7 @@ public abstract class ButtonDropTarget extends TextView
 
     private static final int[] sTempCords = new int[2];
     private static final int DRAG_VIEW_DROP_DURATION = 285;
+    private static final float DRAG_VIEW_HOVER_OVER_OPACITY = 0.65f;
 
     public static final int TOOLTIP_DEFAULT = 0;
     public static final int TOOLTIP_LEFT = 1;
@@ -89,9 +82,6 @@ public abstract class ButtonDropTarget extends TextView
     /** An item must be dragged at least this many pixels before this drop target is enabled. */
     private final int mDragDistanceThreshold;
 
-    /** The paint applied to the drag view on hover */
-    protected int mHoverColor = 0;
-
     protected CharSequence mText;
     protected ColorStateList mOriginalTextColor;
     protected Drawable mDrawable;
@@ -101,7 +91,6 @@ public abstract class ButtonDropTarget extends TextView
     private int mToolTipLocation;
 
     private AnimatorSet mCurrentColorAnim;
-    @Thunk ColorMatrix mSrcFilter, mDstFilter, mCurrentFilter;
 
     public ButtonDropTarget(Context context, AttributeSet attrs) {
         this(context, attrs, 0);
@@ -177,8 +166,7 @@ public abstract class ButtonDropTarget extends TextView
             mToolTip.showAsDropDown(this, x, y);
         }
 
-        d.dragView.setColor(mHoverColor);
-        animateTextColor(mHoverColor);
+        d.dragView.setAlpha(DRAG_VIEW_HOVER_OVER_OPACITY);
         if (d.stateAnnouncer != null) {
             d.stateAnnouncer.cancel();
         }
@@ -190,51 +178,15 @@ public abstract class ButtonDropTarget extends TextView
         // Do nothing
     }
 
-    protected void resetHoverColor() {
-        animateTextColor(mOriginalTextColor.getDefaultColor());
-    }
-
-    private void animateTextColor(int targetColor) {
-        if (mCurrentColorAnim != null) {
-            mCurrentColorAnim.cancel();
-        }
-
-        mCurrentColorAnim = new AnimatorSet();
-        mCurrentColorAnim.setDuration(DragView.COLOR_CHANGE_DURATION);
-
-        if (mSrcFilter == null) {
-            mSrcFilter = new ColorMatrix();
-            mDstFilter = new ColorMatrix();
-            mCurrentFilter = new ColorMatrix();
-        }
-
-        int defaultTextColor = mOriginalTextColor.getDefaultColor();
-        Themes.setColorChangeOnMatrix(defaultTextColor, getTextColor(), mSrcFilter);
-        Themes.setColorChangeOnMatrix(defaultTextColor, targetColor, mDstFilter);
-
-        ValueAnimator anim1 = ValueAnimator.ofObject(
-                new FloatArrayEvaluator(mCurrentFilter.getArray()),
-                mSrcFilter.getArray(), mDstFilter.getArray());
-        anim1.addUpdateListener((anim) -> {
-            mDrawable.setColorFilter(new ColorMatrixColorFilter(mCurrentFilter));
-            invalidate();
-        });
-
-        mCurrentColorAnim.play(anim1);
-        mCurrentColorAnim.play(ObjectAnimator.ofArgb(this, TEXT_COLOR, targetColor));
-        mCurrentColorAnim.start();
-    }
-
     @Override
     public final void onDragExit(DragObject d) {
         hideTooltip();
 
         if (!d.dragComplete) {
             d.dragView.setColor(0);
-            resetHoverColor();
+            d.dragView.setAlpha(1f);
         } else {
-            // Restore the hover color
-            d.dragView.setColor(mHoverColor);
+            d.dragView.setAlpha(DRAG_VIEW_HOVER_OVER_OPACITY);
         }
     }
 
diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java
index cc119c9361..e46aad2bcf 100644
--- a/src/com/android/launcher3/DeleteDropTarget.java
+++ b/src/com/android/launcher3/DeleteDropTarget.java
@@ -53,9 +53,6 @@ public class DeleteDropTarget extends ButtonDropTarget {
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
-        // Get the hover color
-        mHoverColor = getResources().getColor(R.color.delete_target_hover_tint);
-
         setDrawable(R.drawable.ic_remove_shadow);
     }
 
diff --git a/src/com/android/launcher3/SecondaryDropTarget.java b/src/com/android/launcher3/SecondaryDropTarget.java
index 8bc5ad0eb1..858b72eb18 100644
--- a/src/com/android/launcher3/SecondaryDropTarget.java
+++ b/src/com/android/launcher3/SecondaryDropTarget.java
@@ -44,7 +44,6 @@ import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.util.PackageManagerHelper;
-import com.android.launcher3.util.Themes;
 import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 
 import java.net.URISyntaxException;
@@ -109,15 +108,12 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList
         mCurrentAccessibilityAction = action;
 
         if (action == UNINSTALL) {
-            mHoverColor = getResources().getColor(R.color.uninstall_target_hover_tint);
             setDrawable(R.drawable.ic_uninstall_shadow);
             updateText(R.string.uninstall_drop_target_label);
         } else if (action == DISMISS_PREDICTION) {
-            mHoverColor = Themes.getColorAccent(getContext());
             setDrawable(R.drawable.ic_block_shadow);
             updateText(R.string.dismiss_prediction_label);
         } else if (action == RECONFIGURE) {
-            mHoverColor = Themes.getColorAccent(getContext());
             setDrawable(R.drawable.ic_setup_shadow);
             updateText(R.string.gadget_setup_text);
         }
-- 
GitLab


From 267270e859bef22abb598d20b174dee9289b361c Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 22 Mar 2021 15:26:13 +0000
Subject: [PATCH 0733/1664] Align widgets previews top to the table layout

Test: Manual

Bug: 179797520
Change-Id: I0716432e72327b825619bc35d55cb74d9621ee6a
---
 src/com/android/launcher3/widget/WidgetsBottomSheet.java        | 2 +-
 .../widget/picker/WidgetsListTableViewHolderBinder.java         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/widget/WidgetsBottomSheet.java b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
index e6d54a9435..267f9f72c0 100644
--- a/src/com/android/launcher3/widget/WidgetsBottomSheet.java
+++ b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
@@ -140,7 +140,7 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
 
         WidgetsTableUtils.groupWidgetItemsIntoTable(widgets, mMaxHorizontalSpan).forEach(row -> {
             TableRow tableRow = new TableRow(getContext());
-            tableRow.setGravity(Gravity.CENTER_VERTICAL);
+            tableRow.setGravity(Gravity.TOP);
             row.forEach(widgetItem -> {
                 WidgetCell widget = addItemCell(tableRow);
                 widget.setPreviewSize(widgetItem.spanX, widgetItem.spanY);
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java b/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
index d0be35df52..c1d64b1c74 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
@@ -158,7 +158,7 @@ public final class WidgetsListTableViewHolderBinder
                 tableRow = (TableRow) table.getChildAt(i);
             } else {
                 tableRow = new TableRow(table.getContext());
-                tableRow.setGravity(Gravity.CENTER_VERTICAL);
+                tableRow.setGravity(Gravity.TOP);
                 table.addView(tableRow);
             }
             if (tableRow.getChildCount() > widgetItems.size()) {
-- 
GitLab


From 85a8da02908440db00d2eb15d92688e2c11090b8 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 22 Mar 2021 09:30:18 -0700
Subject: [PATCH 0734/1664] Dump input monitor and input event receiver to bug
 reports

Test: adb shell dumpsys activity service TouchInteractionService
Bug: 180915942
Change-Id: Ic1155b323cd3f9cef164ce4d663cadc4b29a0893
---
 .../src/com/android/quickstep/TouchInteractionService.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 4747f1898d..1fb946550e 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -887,6 +887,9 @@ public class TouchInteractionService extends Service implements PluginListener<O
             if (mGestureState != null) {
                 mGestureState.dump(pw);
             }
+            pw.println("Input state:");
+            pw.println("  mInputMonitorCompat=" + mInputMonitorCompat);
+            pw.println("  mInputEventReceiver=" + mInputEventReceiver);
             SysUINavigationMode.INSTANCE.get(this).dump(pw);
             pw.println("TouchState:");
             BaseDraggingActivity createdOverviewActivity = mOverviewComponentObserver == null ? null
-- 
GitLab


From f4fb4d9429b082ebc51258df8b745a92bccc24a6 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 22 Mar 2021 16:30:24 +0000
Subject: [PATCH 0735/1664] Fix corner radius for single item in the widgets
 tray.

If there is only one item, corner radius at 4 corners should be 28dp.

Test: Corner radius of one item is correctly shown in the widgets
      picker.

Bug: 183382610
Change-Id: Ief46af8c41ce944792d08212e93f7d68c6278d05
---
 .../widgets_list_single_item_ripple.xml       | 41 +++++++++++++++++++
 .../WidgetsListHeaderViewHolderBinder.java    |  4 +-
 ...dgetsListSearchHeaderViewHolderBinder.java |  4 +-
 3 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 res/drawable/widgets_list_single_item_ripple.xml

diff --git a/res/drawable/widgets_list_single_item_ripple.xml b/res/drawable/widgets_list_single_item_ripple.xml
new file mode 100644
index 0000000000..b8b6f42523
--- /dev/null
+++ b/res/drawable/widgets_list_single_item_ripple.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2021, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <corners
+                android:topLeftRadius="@dimen/widget_list_top_bottom_corner_radius"
+                android:topRightRadius="@dimen/widget_list_top_bottom_corner_radius"
+                android:bottomLeftRadius="@dimen/widget_list_top_bottom_corner_radius"
+                android:bottomRightRadius="@dimen/widget_list_top_bottom_corner_radius" />
+        </shape>
+    </item>
+    <item android:id="@android:id/background">
+        <shape android:shape="rectangle">
+            <solid android:color="?android:attr/colorBackground" />
+            <corners
+                android:topLeftRadius="@dimen/widget_list_top_bottom_corner_radius"
+                android:topRightRadius="@dimen/widget_list_top_bottom_corner_radius"
+                android:bottomLeftRadius="@dimen/widget_list_top_bottom_corner_radius"
+                android:bottomRightRadius="@dimen/widget_list_top_bottom_corner_radius" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinder.java b/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinder.java
index f126321b73..e57f4d8811 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinder.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinder.java
@@ -52,7 +52,9 @@ public final class WidgetsListHeaderViewHolderBinder implements
     public void bindViewHolder(WidgetsListHeaderHolder viewHolder, WidgetsListHeaderEntry data,
             int position) {
         WidgetsListHeader widgetsListHeader = viewHolder.mWidgetsListHeader;
-        if (position == 0) {
+        if (mWidgetsListAdapter.getItemCount() == 1) {
+            widgetsListHeader.setBackgroundResource(R.drawable.widgets_list_single_item_ripple);
+        } else if (position == 0) {
             widgetsListHeader.setBackgroundResource(R.drawable.widgets_list_top_ripple);
         } else if (position == mWidgetsListAdapter.getItemCount() - 1) {
             widgetsListHeader.setBackgroundResource(R.drawable.widgets_list_bottom_ripple);
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinder.java b/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinder.java
index 37713e1018..b98f5e18eb 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinder.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinder.java
@@ -53,7 +53,9 @@ public final class WidgetsListSearchHeaderViewHolderBinder implements
     public void bindViewHolder(WidgetsListSearchHeaderHolder viewHolder,
             WidgetsListSearchHeaderEntry data, int position) {
         WidgetsListHeader widgetsListHeader = viewHolder.mWidgetsListHeader;
-        if (position == 0) {
+        if (mWidgetsListAdapter.getItemCount() == 1) {
+            widgetsListHeader.setBackgroundResource(R.drawable.widgets_list_single_item_ripple);
+        } else if (position == 0) {
             widgetsListHeader.setBackgroundResource(R.drawable.widgets_list_top_ripple);
         } else if (position == mWidgetsListAdapter.getItemCount() - 1) {
             widgetsListHeader.setBackgroundResource(R.drawable.widgets_list_bottom_ripple);
-- 
GitLab


From 2bb5134413309246b383b6ccedf6369650d1a47f Mon Sep 17 00:00:00 2001
From: Andras Kloczl <andraskloczl@google.com>
Date: Sat, 20 Mar 2021 01:13:45 +0100
Subject: [PATCH 0736/1664] Fix widget scrolling issue on right panel

Since we added support for multiple panels on the home screen,
we need to call cancelLongPress on all the visible pages not
just on the leftmost visible page.

Test: manual
Bug: 178582378
Change-Id: I88ded543a16b1bbf2a53a627e5725f68b42e742b
---
 src/com/android/launcher3/PagedView.java | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index b084eb1b9b..72eff620d7 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -63,6 +63,7 @@ import com.android.launcher3.util.Thunk;
 import com.android.launcher3.views.ActivityContext;
 
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * An abstraction of the original Workspace which supports browsing through a
@@ -303,6 +304,21 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         return 1;
     }
 
+    /**
+     * Returns the currently visible pages.
+     */
+    protected Iterable<View> getVisiblePages() {
+        int panelCount = getPanelCount();
+        List<View> visiblePages = new ArrayList<>(panelCount);
+        for (int i = mCurrentPage; i < mCurrentPage + panelCount; i++) {
+            View page = getPageAt(i);
+            if (page != null) {
+                visiblePages.add(page);
+            }
+        }
+        return visiblePages;
+    }
+
     /**
      * Returns true if the view is on one of the current pages, false otherwise.
      */
@@ -1052,10 +1068,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         // Try canceling the long press. It could also have been scheduled
         // by a distant descendant, so use the mAllowLongPress flag to block
         // everything
-        final View currentPage = getPageAt(mCurrentPage);
-        if (currentPage != null) {
-            currentPage.cancelLongPress();
-        }
+        getVisiblePages().forEach(View::cancelLongPress);
     }
 
     protected float getScrollProgress(int screenCenter, View v, int page) {
-- 
GitLab


From ef45cc95b5868f24e824216cc2d5d37d653d40be Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Sun, 21 Mar 2021 11:40:33 -0700
Subject: [PATCH 0737/1664] Support live tile with OVERVIEW_GRID

Test: turn on both ENABLE_QUICKSTEP_LIVE_TILE and OVERVIEW_GRID. Swipe up from app to overview
Fixes: 183231362
Change-Id: Ic918e1fad423295d532cefce13c85e622ff8116c
---
 quickstep/src/com/android/quickstep/views/RecentsView.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 7adfc1c780..f216985a94 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1018,6 +1018,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             mLiveTileTaskViewSimulator.taskSecondaryTranslation.value = 0;
             mLiveTileTaskViewSimulator.fullScreenProgress.value = 0;
             mLiveTileTaskViewSimulator.recentsViewScale.value = 1;
+            mLiveTileTaskViewSimulator.gridProgress.value = 0;
         }
         if (mRunningTaskTileHidden) {
             setRunningTaskHidden(mRunningTaskTileHidden);
@@ -1740,6 +1741,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         for (int i = 0; i < taskCount; i++) {
             getTaskViewAt(i).setGridProgress(gridProgress);
         }
+        mLiveTileTaskViewSimulator.gridProgress.value = gridProgress;
         mClearAllButton.setGridProgress(gridProgress);
     }
 
-- 
GitLab


From e4c0e954d3ed452134e1db8c5523fde55fa90765 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Fri, 19 Mar 2021 22:51:09 +0000
Subject: [PATCH 0738/1664] Exact common layout from widgets bottom sheet

Test: open widgets bottom sheet and drag and drop widgets & shortcuts.

Bug: 182305634
Change-Id: I82e3e584edf64177ffa6e677f5b3f487823d3e1b
---
 res/layout/widgets_bottom_sheet.xml         | 36 +-------------
 res/layout/widgets_bottom_sheet_content.xml | 53 +++++++++++++++++++++
 2 files changed, 54 insertions(+), 35 deletions(-)
 create mode 100644 res/layout/widgets_bottom_sheet_content.xml

diff --git a/res/layout/widgets_bottom_sheet.xml b/res/layout/widgets_bottom_sheet.xml
index d18ba568cf..8002d1ddc7 100644
--- a/res/layout/widgets_bottom_sheet.xml
+++ b/res/layout/widgets_bottom_sheet.xml
@@ -24,41 +24,7 @@
     android:elevation="@dimen/deep_shortcuts_elevation"
     android:layout_gravity="bottom"
     android:theme="?attr/widgetsTheme">
-    <View
-        android:layout_width="48dp"
-        android:layout_height="2dp"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginBottom="16dp"
-        android:background="?android:attr/textColorSecondary"/>
-    <TextView
-        style="@style/TextHeadline"
-        android:id="@+id/title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textSize="24sp"/>
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:paddingTop="4dp"
-        android:fontFamily="sans-serif"
-        android:textColor="?android:attr/textColorTertiary"
-        android:textSize="14sp"
-        android:text="@string/long_press_widget_to_add"/>
-
-    <ScrollView
-        android:id="@+id/widgets_table_scroll_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fadeScrollbars="false"
-        android:layout_marginVertical="16dp">
-        <include layout="@layout/widgets_table_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal" />
-    </ScrollView>
+    <include layout="@layout/widgets_bottom_sheet_content" />
 
 </com.android.launcher3.widget.WidgetsBottomSheet>
\ No newline at end of file
diff --git a/res/layout/widgets_bottom_sheet_content.xml b/res/layout/widgets_bottom_sheet_content.xml
new file mode 100644
index 0000000000..916ff1baf7
--- /dev/null
+++ b/res/layout/widgets_bottom_sheet_content.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+    <View
+        android:layout_width="48dp"
+        android:layout_height="2dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginBottom="16dp"
+        android:background="?android:attr/textColorSecondary"/>
+    <TextView
+        style="@style/TextHeadline"
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="24sp"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:paddingTop="4dp"
+        android:fontFamily="sans-serif"
+        android:textColor="?android:attr/textColorTertiary"
+        android:textSize="14sp"
+        android:text="@string/long_press_widget_to_add"/>
+
+    <ScrollView
+        android:id="@+id/widgets_table_scroll_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fadeScrollbars="false"
+        android:layout_marginVertical="16dp">
+        <include layout="@layout/widgets_table_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal" />
+    </ScrollView>
+</merge>
-- 
GitLab


From cbfbc7493bcd064eb087c3b20696c2e5ffefac95 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 18 Mar 2021 22:44:14 -0700
Subject: [PATCH 0739/1664] Expose the full task info with the remote animation
 target

Bug: 129067201
Test: Manual

Change-Id: Ife60b31a5798f43b55634dbb0f75dbc0c9795560
---
 .../src/com/android/quickstep/AbsSwipeUpHandler.java     | 9 +++++----
 src/com/android/launcher3/BaseDraggingActivity.java      | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 6da2201dc9..fde43f20ee 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1076,9 +1076,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
             HomeAnimationFactory homeAnimFactory = createHomeAnimationFactory(duration);
             mIsSwipingPipToHome = homeAnimFactory.supportSwipePipToHome()
                     && runningTaskTarget != null
-                    && runningTaskTarget.pictureInPictureParams != null
+                    && runningTaskTarget.taskInfo.pictureInPictureParams != null
                     && TaskInfoCompat.isAutoEnterPipEnabled(
-                            runningTaskTarget.pictureInPictureParams);
+                            runningTaskTarget.taskInfo.pictureInPictureParams);
             if (mIsSwipingPipToHome) {
                 mSwipePipToHomeAnimator = getSwipePipToHomeAnimator(
                         homeAnimFactory, runningTaskTarget, start);
@@ -1168,7 +1168,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         final Rect destinationBounds = SystemUiProxy.INSTANCE.get(mContext)
                 .startSwipePipToHome(taskInfo.topActivity,
                         TaskInfoCompat.getTopActivityInfo(taskInfo),
-                        runningTaskTarget.pictureInPictureParams,
+                        runningTaskTarget.taskInfo.pictureInPictureParams,
                         homeRotation,
                         mDp.hotseatBarSizePx);
         final Rect startBounds = new Rect();
@@ -1177,7 +1177,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                 runningTaskTarget.taskId,
                 taskInfo.topActivity,
                 runningTaskTarget.leash.getSurfaceControl(),
-                TaskInfoCompat.getPipSourceRectHint(runningTaskTarget.pictureInPictureParams),
+                TaskInfoCompat.getPipSourceRectHint(
+                        runningTaskTarget.taskInfo.pictureInPictureParams),
                 TaskInfoCompat.getWindowConfigurationBounds(taskInfo),
                 startBounds,
                 destinationBounds,
diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java
index e38ab74ee7..4ba762ac7b 100644
--- a/src/com/android/launcher3/BaseDraggingActivity.java
+++ b/src/com/android/launcher3/BaseDraggingActivity.java
@@ -28,6 +28,7 @@ import android.graphics.Insets;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
+import android.os.Binder;
 import android.os.Bundle;
 import android.os.Process;
 import android.os.StrictMode;
-- 
GitLab


From 05df2843ee8fcec539363a84b253e28b09c07e47 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 22 Mar 2021 20:22:21 +0000
Subject: [PATCH 0740/1664] Increase the number of prediction for widgets model

Test: launch all widgets tray and observes widgets predicted.

Bug: 179797520
Change-Id: Id231cde5015a2a79b7532a39343b3340c27e09c9
---
 .../com/android/launcher3/model/QuickstepModelDelegate.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
index b1b4d70152..df3657d01d 100644
--- a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
+++ b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
@@ -73,6 +73,7 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
 
     public static final String LAST_PREDICTION_ENABLED_STATE = "last_prediction_enabled_state";
     private static final String LAST_SNAPSHOT_TIME_MILLIS = "LAST_SNAPSHOT_TIME_MILLIS";
+    private static final int NUM_OF_RECOMMENDED_WIDGETS_PREDICATION = 20;
 
     private static final boolean IS_DEBUG = false;
     private static final String TAG = "QuickstepModelDelegate";
@@ -217,7 +218,7 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
         registerWidgetsPredictor(apm.createAppPredictionSession(
                 new AppPredictionContext.Builder(context)
                         .setUiSurface("widgets")
-                        .setPredictedTargetCount(mIDP.numColumns)
+                        .setPredictedTargetCount(NUM_OF_RECOMMENDED_WIDGETS_PREDICATION)
                         .build()));
     }
 
-- 
GitLab


From 62e08797f3096b0f67efbb0c380578781016cbb1 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 22 Mar 2021 15:13:21 -0700
Subject: [PATCH 0741/1664] Fix extra haptic on swipe up

Test: swipe up in 0 button mode, no haptic until pause detected

Bug: 181165935
Change-Id: I69b598cf8e1ac1038d5cfad0f43468a8d7d23e4a
---
 quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 6da2201dc9..496d5a67bb 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -617,7 +617,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         final boolean passed = mCurrentShift.value >= MIN_PROGRESS_FOR_OVERVIEW;
         if (passed != mPassedOverviewThreshold) {
             mPassedOverviewThreshold = passed;
-            if (!mDeviceState.isTwoButtonNavMode()) {
+            if (mDeviceState.isTwoButtonNavMode()) {
                 performHapticFeedback();
             }
         }
-- 
GitLab


From 867ff5f60cd2941a0b06d410da0d2665c209b6a3 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 22 Mar 2021 18:25:19 +0000
Subject: [PATCH 0742/1664] Update title of bottom widgets tray

Only use the "app name" instead of "app name widgets" as title
Remove "Touch & hold to move a widget" subtitle.

Test: manual

Bug: 179797520
Change-Id: I7a5954af73aa5b480096e93ade3520cef6c93f17
---
 res/layout/widgets_bottom_sheet_content.xml            | 10 ----------
 res/values/strings.xml                                 |  2 --
 .../android/launcher3/widget/WidgetsBottomSheet.java   |  3 +--
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/res/layout/widgets_bottom_sheet_content.xml b/res/layout/widgets_bottom_sheet_content.xml
index 916ff1baf7..a9d523ae57 100644
--- a/res/layout/widgets_bottom_sheet_content.xml
+++ b/res/layout/widgets_bottom_sheet_content.xml
@@ -29,16 +29,6 @@
         android:textColor="?android:attr/textColorPrimary"
         android:textSize="24sp"/>
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:paddingTop="4dp"
-        android:fontFamily="sans-serif"
-        android:textColor="?android:attr/textColorTertiary"
-        android:textSize="14sp"
-        android:text="@string/long_press_widget_to_add"/>
-
     <ScrollView
         android:id="@+id/widgets_table_scroll_view"
         android:layout_width="match_parent"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1eb123bb92..7c37283067 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -269,8 +269,6 @@
     <string name="app_waiting_download_title"><xliff:g id="name" example="Messenger">%1$s</xliff:g> waiting to install</string>
 
     <!-- Strings for widgets & more in the popup container/bottom sheet -->
-    <!-- Title for a bottom sheet that shows widgets for a particular app -->
-    <string name="widgets_bottom_sheet_title"><xliff:g id="name" example="Messenger">%1$s</xliff:g> widgets</string>
 
     <!-- Accessibility title for the popup containing a list of widgets. [CHAR_LIMIT=50] -->
     <string name="widgets_list">Widgets list</string>
diff --git a/src/com/android/launcher3/widget/WidgetsBottomSheet.java b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
index 267f9f72c0..2fda86c89c 100644
--- a/src/com/android/launcher3/widget/WidgetsBottomSheet.java
+++ b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
@@ -119,8 +119,7 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
 
     public void populateAndShow(ItemInfo itemInfo) {
         mOriginalItemInfo = itemInfo;
-        ((TextView) findViewById(R.id.title)).setText(getContext().getString(
-                R.string.widgets_bottom_sheet_title, mOriginalItemInfo.title));
+        ((TextView) findViewById(R.id.title)).setText(mOriginalItemInfo.title);
 
         onWidgetsBound();
         attachToContainer();
-- 
GitLab


From 9ce3b25ef6f30418558da49efead328d5353210b Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 22 Mar 2021 14:43:58 -0700
Subject: [PATCH 0743/1664] Add TaskbarView as a child of Hotseat

Instead of keeping the Taskbar window showing above the home screen,
we now integrate a copy of TaskbarView directly into Launcher's view
hierarchy. Most TaskbarController calls apply to both TaskbarViews
(mTaskbarViewInApp and mTaskbarViewOnHome), except for calls related
to Hotseat, which only apply to mTasbkarViewInApp given the real
Hotseat will be showing with mTaskbarViewOnHome.

More cleanup will follow this change.

Test: All taskbar interactions (e.g. drag and drop) continue to work
Bug: 182512211
Bug: 171917176
Change-Id: I0f0b124f652daa85f866e1df8f9e2981540331a0
---
 quickstep/res/layout/taskbar_divider.xml      |   2 -
 quickstep/res/layout/taskbar_view.xml         |  26 ++++
 .../launcher3/BaseQuickstepLauncher.java      |   4 +-
 .../taskbar/TaskbarActivityContext.java       |   5 +-
 .../taskbar/TaskbarContainerView.java         |   2 +-
 .../launcher3/taskbar/TaskbarController.java  | 145 +++++++++++-------
 .../launcher3/taskbar/TaskbarView.java        |  91 +++++++----
 .../util/StaggeredWorkspaceAnim.java          |  26 +++-
 res/layout/taskbar_view.xml                   |  21 +++
 src/com/android/launcher3/Hotseat.java        |  44 ++++--
 src/com/android/launcher3/LauncherState.java  |   7 +-
 .../WorkspaceStateTransitionAnimation.java    |   5 +-
 .../launcher3/views/ActivityContext.java      |  18 ++-
 13 files changed, 264 insertions(+), 132 deletions(-)
 create mode 100644 quickstep/res/layout/taskbar_view.xml
 create mode 100644 res/layout/taskbar_view.xml

diff --git a/quickstep/res/layout/taskbar_divider.xml b/quickstep/res/layout/taskbar_divider.xml
index 6e1aa1e3d5..87649f752e 100644
--- a/quickstep/res/layout/taskbar_divider.xml
+++ b/quickstep/res/layout/taskbar_divider.xml
@@ -18,6 +18,4 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="@dimen/taskbar_divider_thickness"
     android:layout_height="@dimen/taskbar_divider_height"
-    android:layout_marginStart="@dimen/taskbar_icon_spacing"
-    android:layout_marginEnd="@dimen/taskbar_icon_spacing"
     android:background="@color/taskbar_divider" />
\ No newline at end of file
diff --git a/quickstep/res/layout/taskbar_view.xml b/quickstep/res/layout/taskbar_view.xml
new file mode 100644
index 0000000000..34a88ea6a2
--- /dev/null
+++ b/quickstep/res/layout/taskbar_view.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.launcher3.taskbar.TaskbarView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/taskbar_view"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/taskbar_size"
+    android:background="@android:color/transparent"
+    android:layout_gravity="bottom"
+    android:gravity="center"
+    android:visibility="gone" />
+
diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index c4becf105f..9ab49cebfa 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -46,6 +46,7 @@ import com.android.launcher3.statemanager.StateManager.StateHandler;
 import com.android.launcher3.taskbar.TaskbarActivityContext;
 import com.android.launcher3.taskbar.TaskbarController;
 import com.android.launcher3.taskbar.TaskbarStateHandler;
+import com.android.launcher3.taskbar.TaskbarView;
 import com.android.launcher3.uioverrides.RecentsViewStateController;
 import com.android.launcher3.util.ActivityOptionsWrapper;
 import com.android.launcher3.util.DisplayController;
@@ -243,9 +244,10 @@ public abstract class BaseQuickstepLauncher extends Launcher
             mTaskbarController = null;
         }
         if (mDeviceProfile.isTaskbarPresent) {
+            TaskbarView taskbarViewOnHome = (TaskbarView) mHotseat.getTaskbarView();
             TaskbarActivityContext taskbarActivityContext = new TaskbarActivityContext(this);
             mTaskbarController = new TaskbarController(this,
-                    taskbarActivityContext.getTaskbarContainerView());
+                    taskbarActivityContext.getTaskbarContainerView(), taskbarViewOnHome);
             mTaskbarController.init();
         }
     }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
index 8312b82062..fc5e2c1740 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
@@ -54,10 +54,7 @@ public class TaskbarActivityContext extends ContextWrapper implements ActivityCo
         return mTaskbarContainerView;
     }
 
-    /**
-     * @return A LayoutInflater to use in this Context. Views inflated with this LayoutInflater will
-     * be able to access this TaskbarActivityContext via ActivityContext.lookupContext().
-     */
+    @Override
     public LayoutInflater getLayoutInflater() {
         return mLayoutInflater;
     }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
index 528f43e699..5202d91684 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
@@ -84,7 +84,7 @@ public class TaskbarContainerView extends BaseDragLayer<TaskbarActivityContext>
     private ViewTreeObserverWrapper.OnComputeInsetsListener createTaskbarInsetsComputer() {
         return insetsInfo -> {
             if (getAlpha() < AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD
-                    || mTaskbarView.isDraggingItem()) {
+                    || mTaskbarView.getVisibility() != VISIBLE || mTaskbarView.isDraggingItem()) {
                 // We're invisible or dragging out of taskbar, let touches pass through us.
                 insetsInfo.touchableRegion.setEmpty();
                 insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION);
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index f652961629..abf6d54146 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -19,8 +19,6 @@ import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
 import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
 
-import static com.android.launcher3.AbstractFloatingView.TYPE_HIDE_TASKBAR;
-import static com.android.launcher3.AbstractFloatingView.TYPE_REPLACE_TASKBAR_WITH_HOTSEAT;
 import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_BOTTOM_TAPPABLE_ELEMENT;
@@ -43,7 +41,6 @@ import androidx.annotation.Nullable;
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.Hotseat;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.QuickstepTransitionManager;
 import com.android.launcher3.R;
@@ -54,6 +51,7 @@ import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.touch.ItemClickHandler;
+import com.android.launcher3.views.ActivityContext;
 import com.android.quickstep.AnimatedFloat;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
@@ -70,7 +68,8 @@ public class TaskbarController {
     private static final String WINDOW_TITLE = "Taskbar";
 
     private final TaskbarContainerView mTaskbarContainerView;
-    private final TaskbarView mTaskbarView;
+    private final TaskbarView mTaskbarViewInApp;
+    private final TaskbarView mTaskbarViewOnHome;
     private final BaseQuickstepLauncher mLauncher;
     private final WindowManager mWindowManager;
     // Layout width and height of the Taskbar in the default state.
@@ -91,14 +90,17 @@ public class TaskbarController {
 
     private @Nullable Animator mAnimator;
     private boolean mIsAnimatingToLauncher;
+    private boolean mIsAnimatingToApp;
 
     public TaskbarController(BaseQuickstepLauncher launcher,
-            TaskbarContainerView taskbarContainerView) {
+            TaskbarContainerView taskbarContainerView, TaskbarView taskbarViewOnHome) {
         mLauncher = launcher;
         mTaskbarContainerView = taskbarContainerView;
         mTaskbarContainerView.construct(createTaskbarContainerViewCallbacks());
-        mTaskbarView = mTaskbarContainerView.findViewById(R.id.taskbar_view);
-        mTaskbarView.construct(createTaskbarViewCallbacks());
+        mTaskbarViewInApp = mTaskbarContainerView.findViewById(R.id.taskbar_view);
+        mTaskbarViewInApp.construct(createTaskbarViewCallbacks());
+        mTaskbarViewOnHome = taskbarViewOnHome;
+        mTaskbarViewOnHome.construct(createTaskbarViewCallbacks());
         mWindowManager = mLauncher.getWindowManager();
         mTaskbarSize = new Point(MATCH_PARENT, mLauncher.getDeviceProfile().taskbarSize);
         mTaskbarStateHandler = mLauncher.getTaskbarStateHandler();
@@ -115,12 +117,13 @@ public class TaskbarController {
         return new TaskbarVisibilityControllerCallbacks() {
             @Override
             public void updateTaskbarBackgroundAlpha(float alpha) {
-                mTaskbarView.setBackgroundAlpha(alpha);
+                mTaskbarViewInApp.setBackgroundAlpha(alpha);
             }
 
             @Override
             public void updateTaskbarVisibilityAlpha(float alpha) {
                 mTaskbarContainerView.setAlpha(alpha);
+                mTaskbarViewOnHome.setAlpha(alpha);
             }
         };
     }
@@ -196,7 +199,7 @@ public class TaskbarController {
             public View.OnLongClickListener getItemOnLongClickListener() {
                 return view -> {
                     if (mLauncher.hasBeenResumed() && view.getTag() instanceof ItemInfo) {
-                        alignRealHotseatWithTaskbar();
+                        // TODO: remove this path
                         return mDragController.startWorkspaceDragOnLongClick(view);
                     } else {
                         return mDragController.startSystemDragOnLongClick(view);
@@ -205,11 +208,24 @@ public class TaskbarController {
             }
 
             @Override
-            public int getEmptyHotseatViewVisibility() {
+            public int getEmptyHotseatViewVisibility(TaskbarView taskbarView) {
                 // When on the home screen, we want the empty hotseat views to take up their full
                 // space so that the others line up with the home screen hotseat.
-                return mLauncher.hasBeenResumed() || mIsAnimatingToLauncher
-                        ? View.INVISIBLE : View.GONE;
+                boolean isOnHomeScreen = taskbarView == mTaskbarViewOnHome
+                        || mLauncher.hasBeenResumed() || mIsAnimatingToLauncher;
+                return isOnHomeScreen ? View.INVISIBLE : View.GONE;
+            }
+
+            @Override
+            public float getNonIconScale(TaskbarView taskbarView) {
+                return taskbarView == mTaskbarViewOnHome ? getTaskbarScaleOnHome() : 1f;
+            }
+
+            @Override
+            public void onItemPositionsChanged(TaskbarView taskbarView) {
+                if (taskbarView == mTaskbarViewOnHome) {
+                    alignRealHotseatWithTaskbar();
+                }
             }
         };
     }
@@ -218,7 +234,7 @@ public class TaskbarController {
         return new TaskbarHotseatControllerCallbacks() {
             @Override
             public void updateHotseatItems(ItemInfo[] hotseatItemInfos) {
-                mTaskbarView.updateHotseatItems(hotseatItemInfos);
+                mTaskbarViewInApp.updateHotseatItems(hotseatItemInfos);
                 mLatestLoadedHotseatItems = hotseatItemInfos;
                 dedupeAndUpdateRecentItems();
             }
@@ -235,7 +251,8 @@ public class TaskbarController {
 
             @Override
             public void updateRecentTaskAtIndex(int taskIndex, Task task) {
-                mTaskbarView.updateRecentTaskAtIndex(taskIndex, task);
+                mTaskbarViewInApp.updateRecentTaskAtIndex(taskIndex, task);
+                mTaskbarViewOnHome.updateRecentTaskAtIndex(taskIndex, task);
             }
         };
     }
@@ -244,16 +261,20 @@ public class TaskbarController {
      * Initializes the Taskbar, including adding it to the screen.
      */
     public void init() {
-        mTaskbarView.init(mHotseatController.getNumHotseatIcons(),
+        mTaskbarViewInApp.init(mHotseatController.getNumHotseatIcons(),
+                mRecentsController.getNumRecentIcons());
+        mTaskbarViewOnHome.init(mHotseatController.getNumHotseatIcons(),
                 mRecentsController.getNumRecentIcons());
-        mTaskbarContainerView.init(mTaskbarView);
+        mTaskbarContainerView.init(mTaskbarViewInApp);
         addToWindowManager();
         mTaskbarStateHandler.setTaskbarCallbacks(createTaskbarStateHandlerCallbacks());
         mTaskbarVisibilityController.init();
         mHotseatController.init();
         mRecentsController.init();
 
-        SCALE_PROPERTY.set(mTaskbarView, mLauncher.hasBeenResumed() ? getTaskbarScaleOnHome() : 1f);
+        SCALE_PROPERTY.set(mTaskbarViewInApp, mLauncher.hasBeenResumed()
+                ? getTaskbarScaleOnHome() : 1f);
+        updateWhichTaskbarViewIsVisible();
     }
 
     private TaskbarStateHandlerCallbacks createTaskbarStateHandlerCallbacks() {
@@ -274,7 +295,8 @@ public class TaskbarController {
             mAnimator.end();
         }
 
-        mTaskbarView.cleanup();
+        mTaskbarViewInApp.cleanup();
+        mTaskbarViewOnHome.cleanup();
         mTaskbarContainerView.cleanup();
         removeFromWindowManager();
         mTaskbarStateHandler.setTaskbarCallbacks(null);
@@ -313,7 +335,7 @@ public class TaskbarController {
         TaskbarContainerView.LayoutParams taskbarLayoutParams =
                 new TaskbarContainerView.LayoutParams(mTaskbarSize.x, mTaskbarSize.y);
         taskbarLayoutParams.gravity = gravity;
-        mTaskbarView.setLayoutParams(taskbarLayoutParams);
+        mTaskbarViewInApp.setLayoutParams(taskbarLayoutParams);
 
         mWindowManager.addView(mTaskbarContainerView, mWindowLayoutParams);
     }
@@ -330,7 +352,6 @@ public class TaskbarController {
             mAnimator = createAnimToLauncher(null, duration);
         } else {
             mAnimator = createAnimToApp(duration);
-            replaceTaskbarWithHotseatOrViceVersa();
         }
         mAnimator.addListener(new AnimatorListenerAdapter() {
             @Override
@@ -351,36 +372,41 @@ public class TaskbarController {
         if (toState != null) {
             mTaskbarStateHandler.setStateWithAnimation(toState, new StateAnimationConfig(), anim);
         }
-        anim.addFloat(mTaskbarView, SCALE_PROPERTY, mTaskbarView.getScaleX(),
+        anim.addFloat(mTaskbarViewInApp, SCALE_PROPERTY, mTaskbarViewInApp.getScaleX(),
                 getTaskbarScaleOnHome(), LINEAR);
 
         anim.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationStart(Animator animation) {
                 mIsAnimatingToLauncher = true;
-                mTaskbarView.updateHotseatItemsVisibility();
+                mTaskbarViewInApp.updateHotseatItemsVisibility();
             }
 
             @Override
             public void onAnimationEnd(Animator animation) {
                 mIsAnimatingToLauncher = false;
+                updateWhichTaskbarViewIsVisible();
             }
         });
 
-        anim.addOnFrameCallback(this::alignRealHotseatWithTaskbar);
-
         return anim.buildAnim();
     }
 
     private Animator createAnimToApp(long duration) {
         PendingAnimation anim = new PendingAnimation(duration);
         anim.add(mTaskbarVisibilityController.createAnimToBackgroundAlpha(1, duration));
-        anim.addFloat(mTaskbarView, SCALE_PROPERTY, mTaskbarView.getScaleX(), 1f, LINEAR);
+        anim.addFloat(mTaskbarViewInApp, SCALE_PROPERTY, mTaskbarViewInApp.getScaleX(), 1f, LINEAR);
         anim.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationStart(Animator animation) {
-                mTaskbarView.updateHotseatItemsVisibility();
-                setReplaceTaskbarWithHotseat(false);
+                mIsAnimatingToApp = true;
+                mTaskbarViewInApp.updateHotseatItemsVisibility();
+                updateWhichTaskbarViewIsVisible();
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                mIsAnimatingToApp = false;
             }
         });
         return anim.buildAnim();
@@ -405,11 +431,11 @@ public class TaskbarController {
      * @return Whether any Taskbar item could handle the given MotionEvent if given the chance.
      */
     public boolean isEventOverAnyTaskbarItem(MotionEvent ev) {
-        return mTaskbarView.isEventOverAnyItem(ev);
+        return mTaskbarViewInApp.isEventOverAnyItem(ev);
     }
 
     public boolean isDraggingItem() {
-        return mTaskbarView.isDraggingItem();
+        return mTaskbarViewInApp.isDraggingItem() || mTaskbarViewOnHome.isDraggingItem();
     }
 
     private void dedupeAndUpdateRecentItems() {
@@ -454,7 +480,8 @@ public class TaskbarController {
             tasksArray[tasksArray.length - 1 - i] = task;
         }
 
-        mTaskbarView.updateRecentTasks(tasksArray);
+        mTaskbarViewInApp.updateRecentTasks(tasksArray);
+        mTaskbarViewOnHome.updateRecentTasks(tasksArray);
         mRecentsController.loadIconsForTasks(tasksArray);
     }
 
@@ -475,10 +502,11 @@ public class TaskbarController {
         int hotseatHeight = grid.workspacePadding.bottom + grid.taskbarSize;
         int hotseatTopDiff = hotseatHeight - grid.taskbarSize;
 
-        mTaskbarView.getHotseatBoundsAtScale(getTaskbarScaleOnHome()).roundOut(hotseatBounds);
-        mLauncher.getHotseat().setPadding(hotseatBounds.left, hotseatBounds.top + hotseatTopDiff,
-                mTaskbarView.getWidth() - hotseatBounds.right,
-                mTaskbarView.getHeight() - hotseatBounds.bottom);
+        mTaskbarViewOnHome.getHotseatBounds().roundOut(hotseatBounds);
+        mLauncher.getHotseat().setPadding(hotseatBounds.left,
+                hotseatBounds.top + hotseatTopDiff,
+                mTaskbarViewOnHome.getWidth() - hotseatBounds.right,
+                mTaskbarViewOnHome.getHeight() - hotseatBounds.bottom);
     }
 
     /**
@@ -486,36 +514,32 @@ public class TaskbarController {
      * show the real one instead.
      */
     public void onLauncherDragLayerHierarchyChanged() {
-        replaceTaskbarWithHotseatOrViceVersa();
+        // TODO: remove, as this is a no-op now
     }
 
-    private void replaceTaskbarWithHotseatOrViceVersa() {
-        boolean replaceTaskbarWithHotseat = AbstractFloatingView.getTopOpenViewWithType(mLauncher,
-                TYPE_REPLACE_TASKBAR_WITH_HOTSEAT) != null;
-        if (!mLauncher.hasBeenResumed()) {
-            replaceTaskbarWithHotseat = false;
-        }
-        setReplaceTaskbarWithHotseat(replaceTaskbarWithHotseat);
-
-        boolean hideTaskbar = AbstractFloatingView.getTopOpenViewWithType(mLauncher,
-                TYPE_HIDE_TASKBAR) != null;
-        mTaskbarVisibilityController.animateToVisibilityForFloatingView(hideTaskbar ? 0f : 1f);
-    }
-
-    private void setReplaceTaskbarWithHotseat(boolean replaceTaskbarWithHotseat) {
-        Hotseat hotseat = mLauncher.getHotseat();
-        if (replaceTaskbarWithHotseat) {
-            alignRealHotseatWithTaskbar();
-            hotseat.getReplaceTaskbarAlpha().setValue(1f);
-            mTaskbarView.setHotseatViewsHidden(true);
+    private void updateWhichTaskbarViewIsVisible() {
+        boolean isInApp = !mLauncher.hasBeenResumed() || mIsAnimatingToLauncher
+                || mIsAnimatingToApp;
+        if (isInApp) {
+            mTaskbarViewInApp.setVisibility(View.VISIBLE);
+            mTaskbarViewOnHome.setVisibility(View.INVISIBLE);
+            mLauncher.getHotseat().setIconsAlpha(0);
         } else {
-            hotseat.getReplaceTaskbarAlpha().setValue(0f);
-            mTaskbarView.setHotseatViewsHidden(false);
+            mTaskbarViewInApp.setVisibility(View.INVISIBLE);
+            mTaskbarViewOnHome.setVisibility(View.VISIBLE);
+            mLauncher.getHotseat().setIconsAlpha(1);
         }
     }
 
-    private float getTaskbarScaleOnHome() {
-        return 1f / mTaskbarContainerView.getTaskbarActivityContext().getTaskbarIconScale();
+    /**
+     * Returns the ratio of the taskbar icon size on home vs in an app.
+     */
+    public float getTaskbarScaleOnHome() {
+        DeviceProfile inAppDp = mTaskbarContainerView.getTaskbarActivityContext()
+                .getDeviceProfile();
+        DeviceProfile onHomeDp = ActivityContext.lookupContext(mTaskbarViewOnHome.getContext())
+                .getDeviceProfile();
+        return (float) onHomeDp.cellWidthPx / inAppDp.cellWidthPx;
     }
 
     /**
@@ -561,7 +585,10 @@ public class TaskbarController {
     protected interface TaskbarViewCallbacks {
         View.OnClickListener getItemOnClickListener();
         View.OnLongClickListener getItemOnLongClickListener();
-        int getEmptyHotseatViewVisibility();
+        int getEmptyHotseatViewVisibility(TaskbarView taskbarView);
+        /** Returns how much to scale non-icon elements such as spacing and dividers. */
+        float getNonIconScale(TaskbarView taskbarView);
+        void onItemPositionsChanged(TaskbarView taskbarView);
     }
 
     /**
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
index 1d762e9696..3567c17afa 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
@@ -15,11 +15,14 @@
  */
 package com.android.launcher3.taskbar;
 
+import android.animation.Animator;
+import android.animation.AnimatorSet;
 import android.animation.LayoutTransition;
+import android.animation.ValueAnimator;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Canvas;
-import android.graphics.Matrix;
+import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
@@ -36,6 +39,7 @@ import androidx.annotation.Nullable;
 
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.BubbleTextView;
+import com.android.launcher3.Insettable;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.folder.FolderIcon;
@@ -48,20 +52,23 @@ import com.android.systemui.shared.recents.model.Task;
 /**
  * Hosts the Taskbar content such as Hotseat and Recent Apps. Drawn on top of other apps.
  */
-public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconParent {
+public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconParent, Insettable {
 
     private final ColorDrawable mBackgroundDrawable;
-    private final int mItemMarginLeftRight;
+    private final int mDividerWidth;
+    private final int mDividerHeight;
     private final int mIconTouchSize;
     private final boolean mIsRtl;
     private final int mTouchSlop;
     private final RectF mTempDelegateBounds = new RectF();
     private final RectF mDelegateSlopBounds = new RectF();
     private final int[] mTempOutLocation = new int[2];
-    private final Matrix mTempMatrix = new Matrix();
 
     // Initialized in TaskbarController constructor.
     private TaskbarController.TaskbarViewCallbacks mControllerCallbacks;
+    // Scale on elements that aren't icons.
+    private float mNonIconScale;
+    private int mItemMarginLeftRight;
 
     // Initialized in init().
     private LayoutTransition mLayoutTransition;
@@ -78,7 +85,6 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
     private boolean mIsDraggingItem;
     // Only non-null when the corresponding Folder is open.
     private @Nullable FolderIcon mLeaveBehindFolderIcon;
-    private boolean mIsHotseatHidden;
 
     public TaskbarView(@NonNull Context context) {
         this(context, null);
@@ -99,7 +105,8 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
 
         Resources resources = getResources();
         mBackgroundDrawable = (ColorDrawable) getBackground();
-        mItemMarginLeftRight = resources.getDimensionPixelSize(R.dimen.taskbar_icon_spacing);
+        mDividerWidth = resources.getDimensionPixelSize(R.dimen.taskbar_divider_thickness);
+        mDividerHeight = resources.getDimensionPixelSize(R.dimen.taskbar_divider_height);
         mIconTouchSize = resources.getDimensionPixelSize(R.dimen.taskbar_icon_touch_size);
         mIsRtl = Utilities.isRtl(resources);
         mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
@@ -107,11 +114,16 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
 
     protected void construct(TaskbarController.TaskbarViewCallbacks taskbarViewCallbacks) {
         mControllerCallbacks = taskbarViewCallbacks;
+        mNonIconScale = mControllerCallbacks.getNonIconScale(this);
+        mItemMarginLeftRight = getResources().getDimensionPixelSize(R.dimen.taskbar_icon_spacing);
+        mItemMarginLeftRight = Math.round(mItemMarginLeftRight * mNonIconScale);
     }
 
     protected void init(int numHotseatIcons, int numRecentIcons) {
         mLayoutTransition = new LayoutTransition();
-        setLayoutTransitionsEnabled(true);
+        addUpdateListenerForAllLayoutTransitions(
+                () -> mControllerCallbacks.onItemPositionsChanged(this));
+        setLayoutTransition(mLayoutTransition);
 
         mHotseatStartIndex = 0;
         mHotseatEndIndex = mHotseatStartIndex + numHotseatIcons - 1;
@@ -125,12 +137,30 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
         updateRecentTasks(new Task[numRecentIcons]);
     }
 
-    private void setLayoutTransitionsEnabled(boolean enabled) {
-        setLayoutTransition(enabled ? mLayoutTransition : null);
+    private void addUpdateListenerForAllLayoutTransitions(Runnable onUpdate) {
+        addUpdateListenerForLayoutTransition(LayoutTransition.CHANGE_APPEARING, onUpdate);
+        addUpdateListenerForLayoutTransition(LayoutTransition.CHANGE_DISAPPEARING, onUpdate);
+        addUpdateListenerForLayoutTransition(LayoutTransition.CHANGING, onUpdate);
+        addUpdateListenerForLayoutTransition(LayoutTransition.APPEARING, onUpdate);
+        addUpdateListenerForLayoutTransition(LayoutTransition.DISAPPEARING, onUpdate);
+    }
+
+    private void addUpdateListenerForLayoutTransition(int transitionType, Runnable onUpdate) {
+        Animator anim = mLayoutTransition.getAnimator(transitionType);
+        if (anim instanceof ValueAnimator) {
+            ((ValueAnimator) anim).addUpdateListener(valueAnimator -> onUpdate.run());
+        } else {
+            AnimatorSet animSet = new AnimatorSet();
+            ValueAnimator updateAnim = ValueAnimator.ofFloat(0, 1);
+            updateAnim.addUpdateListener(valueAnimator -> onUpdate.run());
+            animSet.playTogether(anim, updateAnim);
+            mLayoutTransition.setAnimator(transitionType, animSet);
+        }
     }
 
     protected void cleanup() {
         removeAllViews();
+        mHotseatRecentsDivider = null;
     }
 
     /**
@@ -170,12 +200,11 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
             if (hotseatView == null || hotseatView.getSourceLayoutResId() != expectedLayoutResId
                     || needsReinflate) {
                 removeView(hotseatView);
-                TaskbarActivityContext activityContext =
-                        ActivityContext.lookupContext(getContext());
+                ActivityContext activityContext = ActivityContext.lookupContext(getContext());
                 if (isFolder) {
                     FolderInfo folderInfo = (FolderInfo) hotseatItemInfo;
                     FolderIcon folderIcon = FolderIcon.inflateFolderAndIcon(expectedLayoutResId,
-                            activityContext, this, folderInfo);
+                            ActivityContext.lookupContext(getContext()), this, folderInfo);
                     folderIcon.setTextVisible(false);
                     hotseatView = folderIcon;
                 } else {
@@ -216,22 +245,12 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
         }
     }
 
-    /**
-     * Hides or shows the hotseat items immediately (without layout transitions).
-     */
-    protected void setHotseatViewsHidden(boolean hidden) {
-        mIsHotseatHidden = hidden;
-        setLayoutTransitionsEnabled(false);
-        updateHotseatItemsVisibility();
-        setLayoutTransitionsEnabled(true);
-    }
-
     private void updateHotseatItemVisibility(View hotseatView) {
         if (hotseatView.getTag() != null) {
-            hotseatView.setVisibility(mIsHotseatHidden ? INVISIBLE : VISIBLE);
+            hotseatView.setVisibility(VISIBLE);
         } else {
             int oldVisibility = hotseatView.getVisibility();
-            int newVisibility = mControllerCallbacks.getEmptyHotseatViewVisibility();
+            int newVisibility = mControllerCallbacks.getEmptyHotseatViewVisibility(this);
             hotseatView.setVisibility(newVisibility);
             if (oldVisibility == GONE && newVisibility != GONE) {
                 // By default, the layout transition only runs when going to VISIBLE,
@@ -243,7 +262,11 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
 
     private View addDivider(int dividerIndex) {
         View divider = inflate(R.layout.taskbar_divider);
-        addView(divider, dividerIndex);
+        LayoutParams lp = new LayoutParams(mDividerWidth, mDividerHeight);
+        lp.setMargins(mItemMarginLeftRight, 0, mItemMarginLeftRight, 0);
+        divider.setScaleX(mNonIconScale);
+        divider.setScaleY(mNonIconScale);
+        addView(divider, dividerIndex, lp);
         return divider;
     }
 
@@ -437,9 +460,9 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
     }
 
     /**
-     * @return The bounding box of where the hotseat elements will be when we reach the given scale.
+     * @return The bounding box of where the hotseat elements are relative to this TaskbarView.
      */
-    protected RectF getHotseatBoundsAtScale(float taskbarViewScale) {
+    protected RectF getHotseatBounds() {
         View firstHotseatView = null, lastHotseatView = null;
         for (int i = mHotseatStartIndex; i <= mHotseatEndIndex; i++) {
             View child = getChildAt(i);
@@ -455,14 +478,11 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
         }
         View leftmostHotseatView = !mIsRtl ? firstHotseatView : lastHotseatView;
         View rightmostHotseatView = !mIsRtl ? lastHotseatView : firstHotseatView;
-        RectF hotseatBounds = new RectF(
+        return new RectF(
                 leftmostHotseatView.getLeft() - mItemMarginLeftRight,
                 leftmostHotseatView.getTop(),
                 rightmostHotseatView.getRight() + mItemMarginLeftRight,
                 rightmostHotseatView.getBottom());
-        mTempMatrix.setScale(taskbarViewScale, taskbarViewScale, getPivotX(), getPivotY());
-        mTempMatrix.mapRect(hotseatBounds);
-        return hotseatBounds;
     }
 
     // FolderIconParent implemented methods.
@@ -493,7 +513,12 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
     }
 
     private View inflate(@LayoutRes int layoutResId) {
-        TaskbarActivityContext taskbarActivityContext = ActivityContext.lookupContext(getContext());
-        return taskbarActivityContext.getLayoutInflater().inflate(layoutResId, this, false);
+        return ActivityContext.lookupContext(getContext()).getLayoutInflater()
+                .inflate(layoutResId, this, false);
+    }
+
+    @Override
+    public void setInsets(Rect insets) {
+        // Ignore, we just implement Insettable to draw behind system insets.
     }
 }
diff --git a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
index ae644cd6fd..3faf72a006 100644
--- a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
+++ b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
@@ -112,20 +112,32 @@ public class StaggeredWorkspaceAnim {
         }
 
         // Set up springs for the hotseat and qsb.
-        ViewGroup hotseatChild = (ViewGroup) hotseat.getChildAt(0);
+        ViewGroup hotseatIcons = hotseat.getShortcutsAndWidgets();
         if (grid.isVerticalBarLayout()) {
-            for (int i = hotseatChild.getChildCount() - 1; i >= 0; i--) {
-                View child = hotseatChild.getChildAt(i);
+            for (int i = hotseatIcons.getChildCount() - 1; i >= 0; i--) {
+                View child = hotseatIcons.getChildAt(i);
                 CellLayout.LayoutParams lp = ((CellLayout.LayoutParams) child.getLayoutParams());
                 addStaggeredAnimationForView(child, lp.cellY + 1, totalRows);
             }
         } else {
-            for (int i = hotseatChild.getChildCount() - 1; i >= 0; i--) {
-                View child = hotseatChild.getChildAt(i);
-                addStaggeredAnimationForView(child, grid.inv.numRows + 1, totalRows);
+            final int hotseatRow, qsbRow, taskbarRow;
+            if (grid.isTaskbarPresent) {
+                qsbRow = grid.inv.numRows + 1;
+                hotseatRow = grid.inv.numRows + 2;
+            } else {
+                hotseatRow = grid.inv.numRows + 1;
+                qsbRow = grid.inv.numRows + 2;
             }
+            // Taskbar and hotseat overlap.
+            taskbarRow = hotseatRow;
 
-            addStaggeredAnimationForView(hotseat.getQsb(), grid.inv.numRows + 2, totalRows);
+            for (int i = hotseatIcons.getChildCount() - 1; i >= 0; i--) {
+                View child = hotseatIcons.getChildAt(i);
+                addStaggeredAnimationForView(child, hotseatRow, totalRows);
+            }
+
+            addStaggeredAnimationForView(hotseat.getQsb(), qsbRow, totalRows);
+            addStaggeredAnimationForView(hotseat.getTaskbarView(), taskbarRow, totalRows);
         }
 
         if (animateOverviewScrim) {
diff --git a/res/layout/taskbar_view.xml b/res/layout/taskbar_view.xml
new file mode 100644
index 0000000000..96ae43db4a
--- /dev/null
+++ b/res/layout/taskbar_view.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<Space
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="0dp"
+    android:layout_height="0dp"
+    android:visibility="gone" />
\ No newline at end of file
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index af4a843b12..4049ed6882 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -29,8 +29,6 @@ import android.widget.FrameLayout;
 
 import androidx.annotation.Nullable;
 
-import com.android.launcher3.util.MultiValueAlpha;
-
 import java.util.function.Consumer;
 
 /**
@@ -38,10 +36,6 @@ import java.util.function.Consumer;
  */
 public class Hotseat extends CellLayout implements Insettable {
 
-    private static final int ALPHA_INDEX_STATE = 0;
-    private static final int ALPHA_INDEX_REPLACE_TASKBAR = 1;
-    private static final int NUM_ALPHA_CHANNELS = 2;
-
     // Ratio of empty space, qsb should take up to appear visually centered.
     public static final float QSB_CENTER_FACTOR = .325f;
 
@@ -52,10 +46,12 @@ public class Hotseat extends CellLayout implements Insettable {
     @Nullable
     private Consumer<Boolean> mOnVisibilityAggregatedCallback;
 
-    private final MultiValueAlpha mMultiValueAlpha;
     private final View mQsb;
     private final int mQsbHeight;
 
+    private final View mTaskbarView;
+    private final int mTaskbarViewHeight;
+
     public Hotseat(Context context) {
         this(context, null);
     }
@@ -66,12 +62,15 @@ public class Hotseat extends CellLayout implements Insettable {
 
     public Hotseat(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
-        mMultiValueAlpha = new MultiValueAlpha(this, NUM_ALPHA_CHANNELS, MultiValueAlpha.Mode.MAX);
-        mMultiValueAlpha.setUpdateVisibility(true);
 
         mQsb = LayoutInflater.from(context).inflate(R.layout.search_container_hotseat, this, false);
         mQsbHeight = mQsb.getLayoutParams().height;
         addView(mQsb);
+
+        mTaskbarView = LayoutInflater.from(context).inflate(R.layout.taskbar_view, this, false);
+        mTaskbarViewHeight = mTaskbarView.getLayoutParams().height;
+        // We want taskbar in the back so its background applies to Hotseat as well.
+        addView(mTaskbarView, 0);
     }
 
     /**
@@ -193,6 +192,8 @@ public class Hotseat extends CellLayout implements Insettable {
         int width = getShortcutsAndWidgets().getMeasuredWidth();
         mQsb.measure(MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
                 MeasureSpec.makeMeasureSpec(mQsbHeight, MeasureSpec.EXACTLY));
+        mTaskbarView.measure(MeasureSpec.makeMeasureSpec(getMeasuredWidth(), MeasureSpec.EXACTLY),
+                MeasureSpec.makeMeasureSpec(mTaskbarViewHeight, MeasureSpec.EXACTLY));
     }
 
     @Override
@@ -212,6 +213,13 @@ public class Hotseat extends CellLayout implements Insettable {
                 - (dp.isTaskbarPresent ? dp.taskbarSize : dp.getInsets().bottom);
         int top = bottom - mQsbHeight;
         mQsb.layout(left, top, right, bottom);
+
+        int taskbarWidth = mTaskbarView.getMeasuredWidth();
+        left = (r - l - taskbarWidth) / 2;
+        right = left + taskbarWidth;
+        bottom = b - t;
+        top = bottom - mTaskbarViewHeight;
+        mTaskbarView.layout(left, top, right, bottom);
     }
 
     /**
@@ -221,12 +229,11 @@ public class Hotseat extends CellLayout implements Insettable {
         return mWorkspace.getFirstMatch(new CellLayout[] { this }, itemOperator);
     }
 
-    public MultiValueAlpha.AlphaProperty getStateAlpha() {
-        return mMultiValueAlpha.getProperty(ALPHA_INDEX_STATE);
-    }
-
-    public MultiValueAlpha.AlphaProperty getReplaceTaskbarAlpha() {
-        return mMultiValueAlpha.getProperty(ALPHA_INDEX_REPLACE_TASKBAR);
+    /**
+     * Sets the alpha value of just our ShortcutAndWidgetContainer.
+     */
+    public void setIconsAlpha(float alpha) {
+        getShortcutsAndWidgets().setAlpha(alpha);
     }
 
     /**
@@ -235,4 +242,11 @@ public class Hotseat extends CellLayout implements Insettable {
     public View getQsb() {
         return mQsb;
     }
+
+    /**
+     * Returns the Taskbar inside hotseat
+     */
+    public View getTaskbarView() {
+        return mTaskbarView;
+    }
 }
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java
index e9a34953d5..0f8c6b9172 100644
--- a/src/com/android/launcher3/LauncherState.java
+++ b/src/com/android/launcher3/LauncherState.java
@@ -185,12 +185,7 @@ public abstract class LauncherState implements BaseState<LauncherState> {
     }
 
     public int getVisibleElements(Launcher launcher) {
-        DeviceProfile deviceProfile = launcher.getDeviceProfile();
-        int flags = WORKSPACE_PAGE_INDICATOR | VERTICAL_SWIPE_INDICATOR | TASKBAR;
-        if (!deviceProfile.isTaskbarPresent) {
-            flags |= HOTSEAT_ICONS;
-        }
-        return flags;
+        return HOTSEAT_ICONS | WORKSPACE_PAGE_INDICATOR | VERTICAL_SWIPE_INDICATOR | TASKBAR;
     }
 
     /**
diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
index 412754e211..cfcf0a0ced 100644
--- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
+++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
@@ -54,7 +54,6 @@ import com.android.launcher3.graphics.SysUiScrim;
 import com.android.launcher3.graphics.WorkspaceDragScrim;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.util.DynamicResource;
-import com.android.launcher3.util.MultiValueAlpha;
 import com.android.systemui.plugins.ResourceProvider;
 
 /**
@@ -135,8 +134,8 @@ public class WorkspaceStateTransitionAnimation {
             }
 
             float hotseatIconsAlpha = (elements & HOTSEAT_ICONS) != 0 ? 1 : 0;
-            propertySetter.setFloat(hotseat.getStateAlpha(), MultiValueAlpha.VALUE,
-                    hotseatIconsAlpha, config.getInterpolator(ANIM_HOTSEAT_FADE, fadeInterpolator));
+            propertySetter.setViewAlpha(hotseat, hotseatIconsAlpha,
+                    config.getInterpolator(ANIM_HOTSEAT_FADE, fadeInterpolator));
             float workspacePageIndicatorAlpha = (elements & WORKSPACE_PAGE_INDICATOR) != 0 ? 1 : 0;
             propertySetter.setViewAlpha(mLauncher.getWorkspace().getPageIndicator(),
                     workspacePageIndicatorAlpha, fadeInterpolator);
diff --git a/src/com/android/launcher3/views/ActivityContext.java b/src/com/android/launcher3/views/ActivityContext.java
index 505c6cea42..71aa4ac445 100644
--- a/src/com/android/launcher3/views/ActivityContext.java
+++ b/src/com/android/launcher3/views/ActivityContext.java
@@ -18,6 +18,7 @@ package com.android.launcher3.views;
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.graphics.Rect;
+import android.view.LayoutInflater;
 import android.view.View.AccessibilityDelegate;
 
 import com.android.launcher3.DeviceProfile;
@@ -66,6 +67,18 @@ public interface ActivityContext {
     default void updateOpenFolderPosition(int[] inOutPosition, Rect bounds, int width, int height) {
     }
 
+    /**
+     * Returns a LayoutInflater that is cloned in this Context, so that Views inflated by it will
+     * have the same Context. (i.e. {@link #lookupContext(Context)} will find this ActivityContext.)
+     */
+    default LayoutInflater getLayoutInflater() {
+        if (this instanceof Context) {
+            Context context = (Context) this;
+            return LayoutInflater.from(context).cloneInContext(context);
+        }
+        return null;
+    }
+
     /**
      * The root view to support drag-and-drop and popup support.
      */
@@ -73,7 +86,10 @@ public interface ActivityContext {
 
     DeviceProfile getDeviceProfile();
 
-    static <T extends ActivityContext> T lookupContext(Context context) {
+    /**
+     * Returns the ActivityContext associated with the given Context.
+     */
+    static <T extends Context & ActivityContext> T lookupContext(Context context) {
         if (context instanceof ActivityContext) {
             return (T) context;
         } else if (context instanceof ContextWrapper) {
-- 
GitLab


From 59b5e241e2b1ca7b2befe6efb601ff661ffa58dc Mon Sep 17 00:00:00 2001
From: Sreyas <sreyasr@google.com>
Date: Fri, 19 Mar 2021 14:00:14 -0700
Subject: [PATCH 0744/1664] Hide chips if loaded in select mode.

Bug: 182375263
Test: Manual

Change-Id: Id9709a2033b303c09d9ca26d2e05af6af45df564
---
 .../com/android/quickstep/views/TaskView.java | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 809adcbe21..2b7e6fd059 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -298,7 +298,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     private boolean mEndQuickswitchCuj;
 
     private View mContextualChipWrapper;
-    private View mContextualChip;
     private final float[] mIconCenterCoords = new float[2];
     private final float[] mChipCenterCoords = new float[2];
 
@@ -447,9 +446,9 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         }
         mModalness = modalness;
         mIconView.setAlpha(comp(modalness));
-        if (mContextualChip != null) {
-            mContextualChip.setScaleX(comp(modalness));
-            mContextualChip.setScaleY(comp(modalness));
+        if (mContextualChipWrapper != null) {
+            mContextualChipWrapper.setScaleX(comp(modalness));
+            mContextualChipWrapper.setScaleY(comp(modalness));
         }
         mDigitalWellBeingToast.updateBannerOffset(modalness,
                 mCurrentFullscreenParams.mCurrentDrawnInsets.top
@@ -689,10 +688,10 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
                 .getInterpolation(progress);
         mIconView.setScaleX(scale);
         mIconView.setScaleY(scale);
-        if (mContextualChip != null && mContextualChipWrapper != null) {
+        if (mContextualChipWrapper != null && mContextualChipWrapper != null) {
             mContextualChipWrapper.setAlpha(scale);
-            mContextualChip.setScaleX(scale);
-            mContextualChip.setScaleY(scale);
+            mContextualChipWrapper.setScaleX(Math.min(scale, comp(mModalness)));
+            mContextualChipWrapper.setScaleY(Math.min(scale, comp(mModalness)));
         }
         mDigitalWellBeingToast.updateBannerOffset(1f - scale,
                 mCurrentFullscreenParams.mCurrentDrawnInsets.top
@@ -797,14 +796,12 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
             int expectedChipHeight = getExpectedViewHeight(view);
             float chipOffset = getResources().getDimension(R.dimen.chip_hint_vertical_offset);
             layoutParams.bottomMargin = -expectedChipHeight - (int) chipOffset;
-            mContextualChip = ((FrameLayout) mContextualChipWrapper).getChildAt(0);
-            mContextualChip.setScaleX(0f);
-            mContextualChip.setScaleY(0f);
+            mContextualChipWrapper.setScaleX(0f);
+            mContextualChipWrapper.setScaleY(0f);
             addView(view, getChildCount(), layoutParams);
-            if (mContextualChip != null) {
-                mContextualChip.animate().scaleX(1f).scaleY(1f).setDuration(50);
-            }
             if (mContextualChipWrapper != null) {
+                float scale = comp(mModalness);
+                mContextualChipWrapper.animate().scaleX(scale).scaleY(scale).setDuration(50);
                 mChipTouchDelegate = new TransformingTouchDelegate(mContextualChipWrapper);
             }
         }
@@ -825,7 +822,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         }
         View oldContextualChipWrapper = mContextualChipWrapper;
         mContextualChipWrapper = null;
-        mContextualChip = null;
         mChipTouchDelegate = null;
         return oldContextualChipWrapper;
     }
-- 
GitLab


From 823da2283337a43f238c7665364fa0abe14e8df4 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Tue, 23 Mar 2021 08:08:45 -0400
Subject: [PATCH 0745/1664] Folder cell should match grid cell aspect ratio if
 isScalableGrid is true.

Bug: 175329686
Test: inspected with go/web-hv
Change-Id: I652c696d8ae58b7009b7310bb926b279b9477724
---
 src/com/android/launcher3/CellLayout.java    |  5 ++-
 src/com/android/launcher3/DeviceProfile.java | 38 +++++++++++++-------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 9df8d44d58..de11eae825 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -213,7 +213,10 @@ public class CellLayout extends ViewGroup {
         mActivity = ActivityContext.lookupContext(context);
         DeviceProfile deviceProfile = mActivity.getDeviceProfile();
 
-        mBorderSpacing = deviceProfile.cellLayoutBorderSpacingPx;
+        mBorderSpacing = mContainerType == FOLDER
+                ? deviceProfile.folderCellLayoutBorderSpacingPx
+                : deviceProfile.cellLayoutBorderSpacingPx;
+
         mCellWidth = mCellHeight = -1;
         mFixedCellWidth = mFixedCellHeight = -1;
 
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index fa19ee6918..4c9c53330b 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -122,6 +122,7 @@ public class DeviceProfile {
     public int folderIconOffsetYPx;
 
     // Folder content
+    public int folderCellLayoutBorderSpacingPx;
     public int folderContentPaddingLeftRight;
     public int folderContentPaddingTop;
 
@@ -248,6 +249,7 @@ public class DeviceProfile {
 
         setCellLayoutBorderSpacing(pxFromDp(inv.borderSpacing, mInfo.metrics, 1f));
         cellLayoutBorderSpacingOriginalPx = cellLayoutBorderSpacingPx;
+        folderCellLayoutBorderSpacingPx = cellLayoutBorderSpacingPx;
 
         int cellLayoutPaddingLeftRightMultiplier = !isVerticalBarLayout() && isTablet
                 ? PORTRAIT_TABLET_LEFT_RIGHT_PADDING_MULTIPLIER : 1;
@@ -332,13 +334,7 @@ public class DeviceProfile {
     }
 
     private void setCellLayoutBorderSpacing(int borderSpacing) {
-        if (isScalableGrid) {
-            cellLayoutBorderSpacingPx = borderSpacing;
-            folderContentPaddingLeftRight = borderSpacing;
-            folderContentPaddingTop = borderSpacing;
-        } else {
-            cellLayoutBorderSpacingPx = 0;
-        }
+        cellLayoutBorderSpacingPx = isScalableGrid ? borderSpacing : 0;
     }
 
     /**
@@ -565,14 +561,14 @@ public class DeviceProfile {
 
         // Check if the icons fit within the available height.
         float contentUsedHeight = folderCellHeightPx * inv.numFolderRows
-                + ((inv.numFolderRows - 1) * cellLayoutBorderSpacingPx);
+                + ((inv.numFolderRows - 1) * folderCellLayoutBorderSpacingPx);
         int contentMaxHeight = availableHeightPx - totalWorkspacePadding.y - folderBottomPanelSize
                 - folderMargin - folderContentPaddingTop;
         float scaleY = contentMaxHeight / contentUsedHeight;
 
         // Check if the icons fit within the available width.
         float contentUsedWidth = folderCellWidthPx * inv.numFolderColumns
-                + ((inv.numFolderColumns - 1) * cellLayoutBorderSpacingPx);
+                + ((inv.numFolderColumns - 1) * folderCellLayoutBorderSpacingPx);
         int contentMaxWidth = availableWidthPx - totalWorkspacePadding.x - folderMargin
                 - folderContentPaddingLeftRight * 2;
         float scaleX = contentMaxWidth / contentUsedWidth;
@@ -590,11 +586,25 @@ public class DeviceProfile {
         folderLabelTextSizePx = (int) (folderChildTextSizePx * folderLabelTextScale);
 
         int textHeight = Utilities.calculateTextHeight(folderChildTextSizePx);
-        int cellPaddingX = (int) (res.getDimensionPixelSize(R.dimen.folder_cell_x_padding) * scale);
-        int cellPaddingY = (int) (res.getDimensionPixelSize(R.dimen.folder_cell_y_padding) * scale);
 
-        folderCellWidthPx = folderChildIconSizePx + 2 * cellPaddingX;
-        folderCellHeightPx = folderChildIconSizePx + 2 * cellPaddingY + textHeight;
+        if (isScalableGrid) {
+            folderCellWidthPx = (int) (cellWidthPx * scale);
+            folderCellHeightPx = (int) (cellHeightPx * scale);
+
+            int borderSpacing = (int) (cellLayoutBorderSpacingOriginalPx * scale);
+            folderCellLayoutBorderSpacingPx = borderSpacing;
+            folderContentPaddingLeftRight = borderSpacing;
+            folderContentPaddingTop = borderSpacing;
+        } else {
+            int cellPaddingX = (int) (res.getDimensionPixelSize(R.dimen.folder_cell_x_padding)
+                    * scale);
+            int cellPaddingY = (int) (res.getDimensionPixelSize(R.dimen.folder_cell_y_padding)
+                    * scale);
+
+            folderCellWidthPx = folderChildIconSizePx + 2 * cellPaddingX;
+            folderCellHeightPx = folderChildIconSizePx + 2 * cellPaddingY + textHeight;
+        }
+
         folderChildDrawablePaddingPx = Math.max(0,
                 (folderCellHeightPx - folderChildIconSizePx - textHeight) / 3);
     }
@@ -846,6 +856,8 @@ public class DeviceProfile {
         writer.println(prefix + pxToDpStr("folderChildTextSizePx", folderChildTextSizePx));
         writer.println(prefix + pxToDpStr("folderChildDrawablePaddingPx",
                 folderChildDrawablePaddingPx));
+        writer.println(prefix + pxToDpStr("folderCellLayoutBorderSpacingPx",
+                folderCellLayoutBorderSpacingPx));
 
         writer.println(prefix + pxToDpStr("cellLayoutBorderSpacingPx",
                 cellLayoutBorderSpacingPx));
-- 
GitLab


From 76060eb11b336aa0f1ef54055d561307190b34f4 Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Mon, 22 Mar 2021 12:25:37 +0000
Subject: [PATCH 0746/1664] Bug fixes for widget picker search (2/n)

- Dismiss keyboard when user starts to drag widget picker
- Add content description for cancel button

Test: Tested manually.
Bug: 183211445
Bug: 183106676
Change-Id: Ie620c3d50a49d8380f316d48e4ee8ebced6de5eb
---
 res/layout/widgets_search_bar.xml                          | 1 +
 res/values/strings.xml                                     | 3 +++
 .../android/launcher3/widget/picker/WidgetsFullSheet.java  | 7 +++++++
 3 files changed, 11 insertions(+)

diff --git a/res/layout/widgets_search_bar.xml b/res/layout/widgets_search_bar.xml
index 1db7462a0f..e3836df108 100644
--- a/res/layout/widgets_search_bar.xml
+++ b/res/layout/widgets_search_bar.xml
@@ -32,5 +32,6 @@
         android:src="@drawable/ic_gm_close_24"
         android:background="?android:selectableItemBackground"
         android:layout_gravity="center"
+        android:contentDescription="@string/widgets_full_sheet_cancel_button_description"
         android:visibility="gone"/>
 </com.android.launcher3.widget.picker.search.LauncherWidgetsSearchBar>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1eb123bb92..6af3dae8a7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -81,6 +81,9 @@
     <!-- Search bar text shown in the popup view showing all available widgets installed on the
          device. [CHAR_LIMIT=50] -->
     <string name="widgets_full_sheet_search_bar_hint">Search</string>
+    <!-- Spoken text for screen readers. This text lets a user know that the button is used to clear
+         the text that the user entered in the search box. [CHAR_LIMIT=none] -->
+    <string name="widgets_full_sheet_cancel_button_description">Clear text from search box</string>
     <!-- Text shown when there is no widgets shown in the popup view showing all available widgets
          installed on the device. [CHAR_LIMIT=none] -->
     <string name="no_widgets_available">No widgets available</string>
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index f43f712a52..dc7d341546 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -34,6 +34,7 @@ import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowInsets;
 import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
 import android.widget.TextView;
@@ -554,6 +555,12 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         return super.onBackPressed();
     }
 
+    @Override
+    public void onDragStart(boolean start, float startDisplacement) {
+        super.onDragStart(start, startDisplacement);
+        getWindowInsetsController().hide(WindowInsets.Type.ime());
+    }
+
     /** A holder class for holding adapters & their corresponding recycler view. */
     private final class AdapterHolder {
         static final int PRIMARY = 0;
-- 
GitLab


From 6d97d893e0dcb512a717ff1b001e16243d5b6212 Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Mon, 22 Mar 2021 10:06:25 +0000
Subject: [PATCH 0747/1664] Update Pin widget dialog UI according to mocks.

Test: Tested manually and RequestPinItemTest passed
Bug: 182982143
Bug: 182994819
Bug: 182929673
Change-Id: I905ea0c1860d28ee9fbb456ddf6abd728b65bac4
---
 AndroidManifest-common.xml                    |  3 +-
 res/drawable/add_item_dialog_background.xml   |  8 ++
 .../add_item_dialog_button_background.xml     | 22 ++++++
 res/layout/add_item_confirmation_activity.xml | 75 +++++++------------
 res/layout/widget_cell_content.xml            | 16 ++--
 res/layout/widgets_list_row_header.xml        |  3 +-
 res/values-night/styles.xml                   |  2 +
 res/values/dimens.xml                         |  6 ++
 res/values/styles.xml                         |  6 ++
 .../launcher3/dragndrop/AddItemActivity.java  | 17 +++++
 10 files changed, 100 insertions(+), 58 deletions(-)
 create mode 100644 res/drawable/add_item_dialog_background.xml
 create mode 100644 res/drawable/add_item_dialog_button_background.xml

diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index 4fd2e4075c..4e72260e9c 100644
--- a/AndroidManifest-common.xml
+++ b/AndroidManifest-common.xml
@@ -116,8 +116,7 @@
             android:theme="@style/AppItemActivityTheme"
             android:excludeFromRecents="true"
             android:autoRemoveFromRecents="true"
-            android:exported="true"
-            android:label="@string/action_add_to_workspace" >
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.content.pm.action.CONFIRM_PIN_SHORTCUT" />
                 <action android:name="android.content.pm.action.CONFIRM_PIN_APPWIDGET" />
diff --git a/res/drawable/add_item_dialog_background.xml b/res/drawable/add_item_dialog_background.xml
new file mode 100644
index 0000000000..04bde8f5a7
--- /dev/null
+++ b/res/drawable/add_item_dialog_background.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+    <solid android:color="?android:attr/colorBackground" />
+    <corners
+        android:topLeftRadius="?android:attr/dialogCornerRadius"
+        android:topRightRadius="?android:attr/dialogCornerRadius" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/add_item_dialog_button_background.xml b/res/drawable/add_item_dialog_button_background.xml
new file mode 100644
index 0000000000..1b4591f8c1
--- /dev/null
+++ b/res/drawable/add_item_dialog_button_background.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset
+    android:insetLeft="@dimen/pin_widget_button_inset_horizontal"
+    android:insetRight="@dimen/pin_widget_button_inset_horizontal"
+    android:insetTop="@dimen/pin_widget_button_inset_vertical"
+    android:insetBottom="@dimen/pin_widget_button_inset_vertical"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <ripple
+        android:color="?android:attr/colorControlHighlight">
+        <item>
+            <shape android:tint="?android:attr/colorAccent" android:shape="rectangle">
+                <corners android:radius="18dp" />
+                <solid android:color="#FFFFFF"  />
+                <padding
+                    android:left="@dimen/pin_widget_button_padding_horizontal"
+                    android:top="@dimen/pin_widget_button_padding_vertical"
+                    android:right="@dimen/pin_widget_button_padding_horizontal"
+                    android:bottom="@dimen/pin_widget_button_padding_vertical" />
+            </shape>
+        </item>
+    </ripple>
+</inset>
\ No newline at end of file
diff --git a/res/layout/add_item_confirmation_activity.xml b/res/layout/add_item_confirmation_activity.xml
index b1a1efe0ac..d5e7333614 100644
--- a/res/layout/add_item_confirmation_activity.xml
+++ b/res/layout/add_item_confirmation_activity.xml
@@ -17,70 +17,51 @@
 */
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/add_item_confirmation"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:padding="24dp"
     android:orientation="vertical">
-    <ScrollView
+
+    <TextView
+        style="@style/TextHeadline"
+        android:id="@+id/widget_appName"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="24sp"
+        android:ellipsize="end"
+        android:fadingEdge="horizontal"
+        android:singleLine="true"
+        android:maxLines="1" />
+
+    <include layout="@layout/widget_cell"
+        android:id="@+id/widget_cell"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:clipToPadding="false">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingBottom="20dp"
-                android:paddingLeft="24dp"
-                android:paddingRight="24dp"
-                android:paddingTop="4dp"
-                android:text="@string/add_item_request_drag_hint" />
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?android:attr/colorPrimaryDark"
-                android:theme="?attr/widgetsTheme">
-
-                <com.android.launcher3.widget.WidgetCell
-                    android:id="@+id/widget_cell"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_weight="1"
-                    android:background="?android:attr/colorPrimaryDark"
-                    android:focusable="true"
-                    android:gravity="center_horizontal"
-                    android:orientation="vertical" >
-
-                    <include layout="@layout/widget_cell_content"  />
-
-                </com.android.launcher3.widget.WidgetCell>
-            </FrameLayout>
-        </LinearLayout>
-    </ScrollView>
+        android:layout_marginVertical="16dp" />
 
     <LinearLayout
-        style="?android:attr/buttonBarStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="end"
-        android:paddingBottom="4dp"
-        android:paddingEnd="12dp"
-        android:paddingStart="12dp"
-        android:paddingTop="4dp" >
+        android:padding="8dp"
+        android:orientation="horizontal">
         <Button
-            style="?android:attr/buttonBarButtonStyle"
+            style="@style/Widget.DeviceDefault.Button.Rounded.Colored"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:onClick="onCancelClick"
             android:text="@android:string/cancel" />
+
+        <Space
+            android:layout_width="4dp"
+            android:layout_height="wrap_content" />
+
         <Button
-            style="?android:attr/buttonBarButtonStyle"
+            style="@style/Widget.DeviceDefault.Button.Rounded.Colored"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:onClick="onPlaceAutomaticallyClick"
diff --git a/res/layout/widget_cell_content.xml b/res/layout/widget_cell_content.xml
index a3d0070697..30bd8b19d5 100644
--- a/res/layout/widget_cell_content.xml
+++ b/res/layout/widget_cell_content.xml
@@ -18,8 +18,8 @@
     android:layout_height="wrap_content">
 
     <!-- The image of the widget. This view does not support padding. Any placement adjustment
-         should be done using margins.
-          width & height are set at runtime after scaling the preview image. -->
+         should be done using margins. Width & height are set at runtime after scaling the preview
+         image. -->
     <com.android.launcher3.widget.WidgetImageView
         android:id="@+id/widget_preview"
         android:layout_width="0dp"
@@ -41,16 +41,15 @@
         android:textColor="?android:attr/textColorPrimary"
         android:textSize="@dimen/widget_cell_font_size" />
 
-    <!-- The original dimensions of the widget (can't be the same text as above due to different
-         style. -->
+    <!-- The original dimensions of the widget -->
     <TextView
         android:id="@+id/widget_dims"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:textColor="?android:attr/textColorTertiary"
+        android:textColor="?android:attr/textColorSecondary"
         android:textSize="@dimen/widget_cell_font_size"
-        android:alpha="0.8" />
+        android:alpha="0.7" />
 
     <TextView
         android:id="@+id/widget_description"
@@ -58,9 +57,10 @@
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:textSize="@dimen/widget_cell_font_size"
-        android:textColor="?android:attr/textColorTertiary"
+        android:textColor="?android:attr/textColorSecondary"
         android:maxLines="2"
         android:ellipsize="end"
-        android:fadingEdge="horizontal" />
+        android:fadingEdge="horizontal"
+        android:alpha="0.7" />
 
 </merge>
\ No newline at end of file
diff --git a/res/layout/widgets_list_row_header.xml b/res/layout/widgets_list_row_header.xml
index ed3a042148..598041cd3f 100644
--- a/res/layout/widgets_list_row_header.xml
+++ b/res/layout/widgets_list_row_header.xml
@@ -56,7 +56,8 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:maxLines="1"
-            android:textColor="?android:attr/textColorTertiary"
+            android:textColor="?android:attr/textColorSecondary"
+            android:alpha="0.7"
             tools:text="m widgets, n shortcuts" />
 
     </LinearLayout>
diff --git a/res/values-night/styles.xml b/res/values-night/styles.xml
index 510e1f4cd0..07a5096849 100644
--- a/res/values-night/styles.xml
+++ b/res/values-night/styles.xml
@@ -21,6 +21,8 @@
 
     <style name="AppItemActivityTheme" parent="@android:style/Theme.DeviceDefault.Dialog.Alert">
         <item name="widgetsTheme">@style/WidgetContainerTheme.Dark</item>
+        <item name="android:windowBackground">@drawable/add_item_dialog_background</item>
+        <item name="android:windowNoTitle">true</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 9d6c936384..af4421a341 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -138,6 +138,12 @@
     <dimen name="shortcut_preview_padding_right">0dp</dimen>
     <dimen name="shortcut_preview_padding_top">0dp</dimen>
 
+<!-- Pin widget dialog -->
+    <dimen name="pin_widget_button_padding_horizontal">8dp</dimen>
+    <dimen name="pin_widget_button_padding_vertical">4dp</dimen>
+    <dimen name="pin_widget_button_inset_horizontal">4dp</dimen>
+    <dimen name="pin_widget_button_inset_vertical">6dp</dimen>
+
 <!-- Dragging -->
     <!-- Drag padding to add to the bottom of drop targets -->
     <dimen name="drop_target_drag_padding">14dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index adc22381a8..a27cdacdc6 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -145,6 +145,8 @@
 
     <style name="AppItemActivityTheme" parent="@android:style/Theme.DeviceDefault.Light.Dialog.Alert">
         <item name="widgetsTheme">@style/WidgetContainerTheme</item>
+        <item name="android:windowBackground">@drawable/add_item_dialog_background</item>
+        <item name="android:windowNoTitle">true</item>
     </style>
 
     <style name="HomeSettingsTheme" parent="@android:style/Theme.DeviceDefault.Settings">
@@ -281,4 +283,8 @@
         <item name="android:colorControlHighlight">#DFE1E5</item>
         <item name="android:colorForeground">@color/all_apps_bg_hand_fill_dark</item>
     </style>
+
+    <style name="Widget.DeviceDefault.Button.Rounded.Colored" parent="@android:style/Widget.DeviceDefault.Button.Colored">
+        <item name="android:background">@drawable/add_item_dialog_button_background</item>
+    </style>
 </resources>
diff --git a/src/com/android/launcher3/dragndrop/AddItemActivity.java b/src/com/android/launcher3/dragndrop/AddItemActivity.java
index 7bc9865162..b7a7366108 100644
--- a/src/com/android/launcher3/dragndrop/AddItemActivity.java
+++ b/src/com/android/launcher3/dragndrop/AddItemActivity.java
@@ -37,11 +37,14 @@ import android.graphics.Rect;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
+import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.DragShadowBuilder;
 import android.view.View.OnLongClickListener;
 import android.view.View.OnTouchListener;
+import android.view.WindowManager;
+import android.widget.TextView;
 
 import com.android.launcher3.BaseActivity;
 import com.android.launcher3.InvariantDeviceProfile;
@@ -127,6 +130,9 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
         if (savedInstanceState == null) {
             logCommand(LAUNCHER_ADD_EXTERNAL_ITEM_START);
         }
+
+        TextView widgetAppName = findViewById(R.id.widget_appName);
+        widgetAppName.setText(getApplicationInfo().labelRes);
     }
 
     @Override
@@ -326,4 +332,15 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
                 .withItemInfo((ItemInfo) mWidgetCell.getWidgetView().getTag())
                 .log(command);
     }
+
+    @Override
+    public void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        View view = getWindow().getDecorView();
+        WindowManager.LayoutParams layoutParams =
+                (WindowManager.LayoutParams) view.getLayoutParams();
+        layoutParams.gravity = Gravity.BOTTOM;
+        layoutParams.width = WindowManager.LayoutParams.MATCH_PARENT;
+        getWindowManager().updateViewLayout(view, layoutParams);
+    }
 }
-- 
GitLab


From e888b08b70657f29e20c59319ec17f6c2686c968 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Tue, 23 Mar 2021 12:00:38 -0400
Subject: [PATCH 0748/1664] Updating deep shortcut container to new width.

Bug: 175329686
Test: manual, visual
Change-Id: I0487d240523ab3de4bf3e381ec359267eaa33a71
---
 res/layout/deep_shortcut.xml   | 2 ++
 res/layout/system_shortcut.xml | 3 ++-
 res/values/dimens.xml          | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/res/layout/deep_shortcut.xml b/res/layout/deep_shortcut.xml
index d6b4a37dd4..0d11b50ab3 100644
--- a/res/layout/deep_shortcut.xml
+++ b/res/layout/deep_shortcut.xml
@@ -32,6 +32,8 @@
         android:paddingEnd="@dimen/popup_padding_end"
         android:drawableEnd="@drawable/ic_drag_handle"
         android:drawablePadding="@dimen/deep_shortcut_drawable_padding"
+        android:singleLine="true"
+        android:ellipsize="end"
         android:textSize="14sp"
         android:textColor="?android:attr/textColorPrimary"
         launcher:layoutHorizontal="true"
diff --git a/res/layout/system_shortcut.xml b/res/layout/system_shortcut.xml
index 68251e4d15..9f45f30216 100644
--- a/res/layout/system_shortcut.xml
+++ b/res/layout/system_shortcut.xml
@@ -31,7 +31,8 @@
         android:paddingStart="@dimen/deep_shortcuts_text_padding_start"
         android:paddingEnd="@dimen/popup_padding_end"
         android:textSize="14sp"
-        android:maxLines="1"
+        android:singleLine="true"
+        android:ellipsize="end"
         android:textColor="?android:attr/textColorPrimary"
         launcher:iconDisplay="shortcut_popup"
         launcher:layoutHorizontal="true"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 64c07d03d5..2f46a2a51a 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -185,7 +185,7 @@
 
 <!-- Deep shortcuts -->
     <dimen name="deep_shortcuts_elevation">0dp</dimen>
-    <dimen name="bg_popup_item_width">234dp</dimen>
+    <dimen name="bg_popup_item_width">216dp</dimen>
     <dimen name="bg_popup_item_height">56dp</dimen>
     <dimen name="pre_drag_view_scale">6dp</dimen>
     <!-- an icon with shortcuts must be dragged this far before the container is removed. -->
-- 
GitLab


From c6995f3eb21ab1d1a0dd548d49c5758343a3d608 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Tue, 23 Mar 2021 11:06:09 -0500
Subject: [PATCH 0749/1664] [Search] Resolve work/personal tab overlap with A-Z
 list

This issue was caused due to launcher falling out of sync with DEVICE_SEARCH_FLAG. This change makes AllApps views agnostic of search input type when rendering layout.

Bug: 182591985
Test: local
Change-Id: Ic015b68e110eea9ab5184325f2a3633a5c7d15cc
---
 res/layout/all_apps_tabs.xml                             | 1 +
 .../android/launcher3/allapps/AllAppsContainerView.java  | 4 ----
 src/com/android/launcher3/allapps/AllAppsPagedView.java  | 6 ------
 .../android/launcher3/allapps/FloatingHeaderView.java    | 9 +++------
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/res/layout/all_apps_tabs.xml b/res/layout/all_apps_tabs.xml
index c684881195..2accd2d21f 100644
--- a/res/layout/all_apps_tabs.xml
+++ b/res/layout/all_apps_tabs.xml
@@ -26,6 +26,7 @@
     android:clipChildren="true"
     android:clipToPadding="false"
     android:descendantFocusability="afterDescendants"
+    android:paddingTop="@dimen/all_apps_header_top_padding"
     launcher:pageIndicator="@+id/tabs" >
 
     <include layout="@layout/all_apps_rv_layout" />
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 591de043d2..bf0a88f33f 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -583,10 +583,6 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         int padding = mHeader.getMaxTranslation();
         for (int i = 0; i < mAH.length; i++) {
             mAH[i].padding.top = padding;
-            if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && mUsingTabs) {
-                //add extra space between tabs and recycler view
-                mAH[i].padding.top += mLauncher.getDeviceProfile().edgeMarginPx;
-            }
             mAH[i].applyPadding();
         }
     }
diff --git a/src/com/android/launcher3/allapps/AllAppsPagedView.java b/src/com/android/launcher3/allapps/AllAppsPagedView.java
index 14e3b5140f..3cc9ce6806 100644
--- a/src/com/android/launcher3/allapps/AllAppsPagedView.java
+++ b/src/com/android/launcher3/allapps/AllAppsPagedView.java
@@ -23,8 +23,6 @@ import android.util.AttributeSet;
 
 import com.android.launcher3.Launcher;
 import com.android.launcher3.PagedView;
-import com.android.launcher3.R;
-import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.workprofile.PersonalWorkPagedView;
 
 /**
@@ -43,10 +41,6 @@ public class AllAppsPagedView extends PersonalWorkPagedView {
 
     public AllAppsPagedView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
-        int topPadding = FeatureFlags.ENABLE_DEVICE_SEARCH.get() ? 0
-                : context.getResources().getDimensionPixelOffset(
-                        R.dimen.all_apps_header_top_padding);
-        setPadding(0, topPadding, 0, 0);
     }
 
     @Override
diff --git a/src/com/android/launcher3/allapps/FloatingHeaderView.java b/src/com/android/launcher3/allapps/FloatingHeaderView.java
index 86f330c88d..733d867e4d 100644
--- a/src/com/android/launcher3/allapps/FloatingHeaderView.java
+++ b/src/com/android/launcher3/allapps/FloatingHeaderView.java
@@ -106,8 +106,8 @@ public class FloatingHeaderView extends LinearLayout implements
 
     public FloatingHeaderView(@NonNull Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
-        mHeaderTopPadding = FeatureFlags.ENABLE_DEVICE_SEARCH.get() ? 0 :
-                context.getResources().getDimensionPixelSize(R.dimen.all_apps_header_top_padding);
+        mHeaderTopPadding = context.getResources()
+                .getDimensionPixelSize(R.dimen.all_apps_header_top_padding);
     }
 
     @Override
@@ -125,7 +125,6 @@ public class FloatingHeaderView extends LinearLayout implements
             }
         }
         mFixedRows = rows.toArray(new FloatingHeaderRow[rows.size()]);
-        setPadding(0, mHeaderTopPadding, 0, 0);
         mAllRows = mFixedRows;
     }
 
@@ -243,9 +242,7 @@ public class FloatingHeaderView extends LinearLayout implements
 
     public int getMaxTranslation() {
         if (mMaxTranslation == 0 && mTabsHidden) {
-            int paddingOffset = getResources().getDimensionPixelSize(
-                    R.dimen.all_apps_search_bar_bottom_padding);
-            return FeatureFlags.ENABLE_DEVICE_SEARCH.get() ? 0 : paddingOffset;
+            return getResources().getDimensionPixelSize(R.dimen.all_apps_search_bar_bottom_padding);
         } else if (mMaxTranslation > 0 && mTabsHidden) {
             return mMaxTranslation + getPaddingTop();
         } else {
-- 
GitLab


From 284aaba153530e318130720e98afd7683a590b00 Mon Sep 17 00:00:00 2001
From: Alex Johnston <acjohnston@google.com>
Date: Tue, 23 Mar 2021 13:46:11 +0000
Subject: [PATCH 0750/1664] Block recent work profile apps content capture

Stop data exposure of work profile by blocking
content capture of recents apps when the work
profile is locked.

Manual testing steps
* Set up work profile
* Set personal and work pattern
* Open work app, enter work pattern and
  verify content capture is possible
* Lock device
* Go to Recents and select already opened
  work app. Verify content capture is not
  possible until work pattern is entered.

Bug: 168802517
Test: manual testing
Change-Id: I3e6ba1d8645335785e8e26cdc895ea9c0017a0fd
---
 .../src/com/android/quickstep/TaskOverlayFactoryGo.java      | 2 +-
 quickstep/src/com/android/quickstep/TaskOverlayFactory.java  | 2 +-
 .../src/com/android/quickstep/views/TaskThumbnailView.java   | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
index b102a394f6..ea808c66f5 100644
--- a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
+++ b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
@@ -78,7 +78,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
             }
 
             getActionsView().updateDisabledFlags(DISABLED_ROTATED, rotated);
-            boolean isAllowedByPolicy = thumbnail.isRealSnapshot;
+            boolean isAllowedByPolicy = mThumbnailView.isRealSnapshot();
             getActionsView().setCallbacks(new OverlayUICallbacksGoImpl(isAllowedByPolicy, task));
         }
 
diff --git a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
index 0d2c42e3b0..3d98b9c5bc 100644
--- a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
@@ -152,7 +152,7 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
 
             if (thumbnail != null) {
                 getActionsView().updateDisabledFlags(DISABLED_ROTATED, rotated);
-                boolean isAllowedByPolicy = thumbnail.isRealSnapshot;
+                boolean isAllowedByPolicy = mThumbnailView.isRealSnapshot();
                 getActionsView().setCallbacks(new OverlayUICallbacksImpl(isAllowedByPolicy, task));
             }
         }
diff --git a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
index 3bd883ddc4..f94acf8bb9 100644
--- a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
@@ -445,13 +445,14 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
     }
 
     /**
-     * Returns whether the snapshot is real.
+     * Returns whether the snapshot is real. If the device is locked for the user of the task,
+     * the snapshot used will be an app-theme generated snapshot instead of a real snapshot.
      */
     public boolean isRealSnapshot() {
         if (mThumbnailData == null) {
             return false;
         }
-        return mThumbnailData.isRealSnapshot;
+        return mThumbnailData.isRealSnapshot && !mTask.isLocked;
     }
 
     // TODO(b/179466077): Remove when proper API is ready.
-- 
GitLab


From d0b6bfaa6906f6f7e9bf7a0729dd919ef5d08ede Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 23 Mar 2021 09:10:18 -0700
Subject: [PATCH 0751/1664] Remove some unused hotseat/qsb scaling code

Now that QSB is always part of Hotseat, we don't need
getQsbScaleAndTranslation(), and now that HOTSEAT_ICONS are never in
Overview, we can remove the getHotseatScaleAndTranslation() override

Test: Everything works as before
Bug: 175137718
Change-Id: I902815d8e270269c1a2a9af54fa8480e5aef929d
---
 .../states/BackgroundAppState.java            | 14 ---------
 .../uioverrides/states/OverviewState.java     | 29 -------------------
 src/com/android/launcher3/LauncherState.java  |  4 ---
 .../WorkspaceStateTransitionAnimation.java    |  1 -
 .../launcher3/dragndrop/DragLayer.java        |  5 ++--
 .../launcher3/graphics/OverviewScrim.java     | 14 ++++-----
 .../android/launcher3/states/HintState.java   |  6 ----
 7 files changed, 7 insertions(+), 66 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
index fb58bf6422..aa770d289a 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
@@ -81,20 +81,6 @@ public class BackgroundAppState extends OverviewState {
         return false;
     }
 
-    @Override
-    public ScaleAndTranslation getHotseatScaleAndTranslation(Launcher launcher) {
-        if ((getVisibleElements(launcher) & HOTSEAT_ICONS) != 0) {
-            // Translate hotseat offscreen if we show it in overview.
-            RecentsView recentsView = launcher.getOverviewPanel();
-            ScaleAndTranslation scaleAndTranslation = super.getHotseatScaleAndTranslation(launcher);
-            scaleAndTranslation.translationY += LayoutUtils.getShelfTrackingDistance(launcher,
-                    launcher.getDeviceProfile(),
-                    recentsView.getPagedOrientationHandler());
-            return scaleAndTranslation;
-        }
-        return super.getHotseatScaleAndTranslation(launcher);
-    }
-
     @Override
     protected float getDepthUnchecked(Context context) {
         return 1f;
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
index 5a28cfdc0e..d8a5f9bdfe 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -77,40 +77,11 @@ public class OverviewState extends LauncherState {
         return new ScaleAndTranslation(scale, 0, -getDefaultSwipeHeight(launcher) * parallaxFactor);
     }
 
-    @Override
-    public ScaleAndTranslation getHotseatScaleAndTranslation(Launcher launcher) {
-        if ((getVisibleElements(launcher) & HOTSEAT_ICONS) != 0) {
-            DeviceProfile dp = launcher.getDeviceProfile();
-            if (dp.allAppsIconSizePx >= dp.iconSizePx) {
-                return new ScaleAndTranslation(1, 0, 0);
-            } else {
-                float scale = ((float) dp.allAppsIconSizePx) / dp.iconSizePx;
-                // Distance between the screen center (which is the pivotY for hotseat) and the
-                // bottom of the hotseat (which we want to preserve)
-                float distanceFromBottom = dp.heightPx / 2 - dp.hotseatBarBottomPaddingPx;
-                // On scaling, the bottom edge is moved closer to the pivotY. We move the
-                // hotseat back down so that the bottom edge's position is preserved.
-                float translationY = distanceFromBottom * (1 - scale);
-                return new ScaleAndTranslation(scale, 0, translationY);
-            }
-        }
-        return getWorkspaceScaleAndTranslation(launcher);
-    }
-
     @Override
     public float[] getOverviewScaleAndOffset(Launcher launcher) {
         return new float[] {NO_SCALE, NO_OFFSET};
     }
 
-    @Override
-    public ScaleAndTranslation getQsbScaleAndTranslation(Launcher launcher) {
-        if (this == OVERVIEW) {
-            // Treat the QSB as part of the hotseat so they move together.
-            return getHotseatScaleAndTranslation(launcher);
-        }
-        return super.getQsbScaleAndTranslation(launcher);
-    }
-
     @Override
     public PageAlphaProvider getWorkspacePageAlphaProvider(Launcher launcher) {
         return new PageAlphaProvider(DEACCEL_2) {
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java
index e9a34953d5..fbb3ffdb76 100644
--- a/src/com/android/launcher3/LauncherState.java
+++ b/src/com/android/launcher3/LauncherState.java
@@ -176,10 +176,6 @@ public abstract class LauncherState implements BaseState<LauncherState> {
         return launcher.getNormalOverviewScaleAndOffset();
     }
 
-    public ScaleAndTranslation getQsbScaleAndTranslation(Launcher launcher) {
-        return new ScaleAndTranslation(NO_SCALE, NO_OFFSET, NO_OFFSET);
-    }
-
     public float getOverviewFullscreenProgress() {
         return 0;
     }
diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
index 412754e211..1c9af2746d 100644
--- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
+++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
@@ -96,7 +96,6 @@ public class WorkspaceStateTransitionAnimation {
         ScaleAndTranslation scaleAndTranslation = state.getWorkspaceScaleAndTranslation(mLauncher);
         ScaleAndTranslation hotseatScaleAndTranslation = state.getHotseatScaleAndTranslation(
                 mLauncher);
-        ScaleAndTranslation qsbScaleAndTranslation = state.getQsbScaleAndTranslation(mLauncher);
         mNewScale = scaleAndTranslation.scale;
         PageAlphaProvider pageAlphaProvider = state.getWorkspacePageAlphaProvider(mLauncher);
         final int childCount = mWorkspace.getChildCount();
diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java
index 7a6b4f9aae..419c3f1a69 100644
--- a/src/com/android/launcher3/dragndrop/DragLayer.java
+++ b/src/com/android/launcher3/dragndrop/DragLayer.java
@@ -110,6 +110,8 @@ public class DragLayer extends BaseDragLayer<Launcher> {
         mDragController = dragController;
         recreateControllers();
 
+        mOverviewScrim.setup();
+
         mWorkspaceDragScrim = new WorkspaceDragScrim((this));
         mWorkspaceDragScrim.setWorkspace(workspace);
 
@@ -118,8 +120,6 @@ public class DragLayer extends BaseDragLayer<Launcher> {
         mRootView = (LauncherRootView) getParent();
         mSysUiScrim = new SysUiScrim(mRootView);
         mRootView.setSysUiScrim(mSysUiScrim);
-
-
     }
 
     @Override
@@ -555,7 +555,6 @@ public class DragLayer extends BaseDragLayer<Launcher> {
     public void setInsets(Rect insets) {
         super.setInsets(insets);
         mSysUiScrim.onInsetsChanged(insets, mAllowSysuiScrims);
-        mOverviewScrim.onInsetsChanged(insets);
     }
 
     public WorkspaceDragScrim getWorkspaceDragScrim() {
diff --git a/src/com/android/launcher3/graphics/OverviewScrim.java b/src/com/android/launcher3/graphics/OverviewScrim.java
index c0c3e5e9c2..53303dbbe5 100644
--- a/src/com/android/launcher3/graphics/OverviewScrim.java
+++ b/src/com/android/launcher3/graphics/OverviewScrim.java
@@ -18,10 +18,6 @@ package com.android.launcher3.graphics;
 
 import static android.view.View.VISIBLE;
 
-import static com.android.launcher3.LauncherState.HOTSEAT_ICONS;
-import static com.android.launcher3.LauncherState.OVERVIEW;
-
-import android.graphics.Rect;
 import android.util.FloatProperty;
 import android.view.View;
 import android.view.ViewGroup;
@@ -55,15 +51,15 @@ public class OverviewScrim extends Scrim {
 
     public OverviewScrim(View view) {
         super(view);
-        mStableScrimmedView = mCurrentScrimmedView = mLauncher.getOverviewPanel();
 
         onExtractedColorsChanged(mWallpaperColorInfo);
     }
 
-    public void onInsetsChanged(Rect insets) {
-        mStableScrimmedView = (OVERVIEW.getVisibleElements(mLauncher) & HOTSEAT_ICONS) != 0
-                ? mLauncher.getHotseat()
-                : mLauncher.getOverviewPanel();
+    /**
+     * Initializes once view hierarchy is established.
+     */
+    public void setup() {
+        mStableScrimmedView = mCurrentScrimmedView = mLauncher.getOverviewPanel();
     }
 
     public void updateCurrentScrimmedView(ViewGroup root) {
diff --git a/src/com/android/launcher3/states/HintState.java b/src/com/android/launcher3/states/HintState.java
index fd1d965982..eb2c551994 100644
--- a/src/com/android/launcher3/states/HintState.java
+++ b/src/com/android/launcher3/states/HintState.java
@@ -53,10 +53,4 @@ public class HintState extends LauncherState {
     public ScaleAndTranslation getWorkspaceScaleAndTranslation(Launcher launcher) {
         return new ScaleAndTranslation(0.92f, 0, 0);
     }
-
-    @Override
-    public ScaleAndTranslation getQsbScaleAndTranslation(Launcher launcher) {
-        // Treat the QSB as part of the hotseat so they move together.
-        return getHotseatScaleAndTranslation(launcher);
-    }
 }
-- 
GitLab


From f2c99e9d32ac6a2e5d76ebe0cd055beb25bc017f Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 22 Mar 2021 15:59:38 -0700
Subject: [PATCH 0752/1664] Remove MultiValueAlpha Mode, as all usages are
 BLEND

Test: Compiles, works as before
Bug: 182512211
Change-Id: I79ee683720cdc697d91e7587d8fab4fd2645ba0d
---
 .../launcher3/util/MultiValueAlpha.java       | 31 ++-----------------
 1 file changed, 2 insertions(+), 29 deletions(-)

diff --git a/src/com/android/launcher3/util/MultiValueAlpha.java b/src/com/android/launcher3/util/MultiValueAlpha.java
index 0ea0290a8b..5be95292b4 100644
--- a/src/com/android/launcher3/util/MultiValueAlpha.java
+++ b/src/com/android/launcher3/util/MultiValueAlpha.java
@@ -42,43 +42,16 @@ public class MultiValueAlpha {
                 }
             };
 
-    /**
-     * Determines how each alpha should factor into the final alpha.
-     */
-    public enum Mode {
-        BLEND() {
-            @Override
-            public float calculateNewAlpha(float currentAlpha, float otherAlpha) {
-                return currentAlpha * otherAlpha;
-            }
-        },
-
-        MAX() {
-            @Override
-            public float calculateNewAlpha(float currentAlpha, float otherAlpha) {
-                return Math.max(currentAlpha, otherAlpha);
-            }
-        };
-
-        protected abstract float calculateNewAlpha(float currentAlpha, float otherAlpha);
-    }
-
     private final View mView;
     private final AlphaProperty[] mMyProperties;
-    private final Mode mMode;
 
     private int mValidMask;
     // Whether we should change from INVISIBLE to VISIBLE and vice versa at low alpha values.
     private boolean mUpdateVisibility;
 
     public MultiValueAlpha(View view, int size) {
-        this(view, size, Mode.BLEND);
-    }
-
-    public MultiValueAlpha(View view, int size, Mode mode) {
         mView = view;
         mMyProperties = new AlphaProperty[size];
-        mMode = mode;
 
         mValidMask = 0;
         for (int i = 0; i < size; i++) {
@@ -124,7 +97,7 @@ public class MultiValueAlpha {
                 mOthers = 1;
                 for (AlphaProperty prop : mMyProperties) {
                     if (prop != this) {
-                        mOthers = mMode.calculateNewAlpha(mOthers, prop.mValue);
+                        mOthers *= prop.mValue;
                     }
                 }
             }
@@ -134,7 +107,7 @@ public class MultiValueAlpha {
             mValidMask = mMyMask;
             mValue = value;
 
-            mView.setAlpha(mMode.calculateNewAlpha(mOthers, mValue));
+            mView.setAlpha(mOthers * mValue);
             if (mUpdateVisibility) {
                 AlphaUpdateListener.updateVisibility(mView);
             }
-- 
GitLab


From e63bd38a55e262ea98d2bbcea45ecef0fbd3e931 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 22 Mar 2021 17:19:41 -0700
Subject: [PATCH 0753/1664] Remove dead taskbar code

Test: Works as before
Bug: 182512211
Change-Id: Id4c979f2924f9ae6881a9bed18bcc52fbd80c05b
---
 .../launcher3/BaseQuickstepLauncher.java      |   4 -
 .../taskbar/TaskbarActivityContext.java       |  12 +--
 .../launcher3/taskbar/TaskbarController.java  |  68 +++---------
 .../taskbar/TaskbarDragController.java        |  33 ------
 .../taskbar/TaskbarDragListener.java          | 101 ------------------
 .../taskbar/TaskbarStateHandler.java          |  10 +-
 .../taskbar/TaskbarVisibilityController.java  |  18 +---
 .../QuickstepAtomicAnimationFactory.java      |  16 ---
 .../util/StaggeredWorkspaceAnim.java          |   4 +-
 .../launcher3/AbstractFloatingView.java       |   7 --
 .../WorkspaceStateTransitionAnimation.java    |   4 +-
 .../states/StateAnimationConfig.java          |   8 +-
 12 files changed, 28 insertions(+), 257 deletions(-)
 delete mode 100644 quickstep/src/com/android/launcher3/taskbar/TaskbarDragListener.java

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 9ab49cebfa..6ba74145b2 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -338,10 +338,6 @@ public abstract class BaseQuickstepLauncher extends Launcher
     @Override
     public void onDragLayerHierarchyChanged() {
         onLauncherStateOrFocusChanged();
-
-        if (mTaskbarController != null) {
-            mTaskbarController.onLauncherDragLayerHierarchyChanged();
-        }
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
index fc5e2c1740..5513c1658c 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
@@ -35,14 +35,13 @@ public class TaskbarActivityContext extends ContextWrapper implements ActivityCo
     private final DeviceProfile mDeviceProfile;
     private final LayoutInflater mLayoutInflater;
     private final TaskbarContainerView mTaskbarContainerView;
-    private final float mIconScale;
 
     public TaskbarActivityContext(BaseQuickstepLauncher launcher) {
         super(launcher);
         mDeviceProfile = launcher.getDeviceProfile().copy(this);
         float taskbarIconSize = getResources().getDimension(R.dimen.taskbar_icon_size);
-        mIconScale = taskbarIconSize / mDeviceProfile.iconSizePx;
-        mDeviceProfile.updateIconSize(mIconScale, getResources());
+        float iconScale = taskbarIconSize / mDeviceProfile.iconSizePx;
+        mDeviceProfile.updateIconSize(iconScale, getResources());
 
         mLayoutInflater = LayoutInflater.from(this).cloneInContext(this);
 
@@ -73,11 +72,4 @@ public class TaskbarActivityContext extends ContextWrapper implements ActivityCo
     public Rect getFolderBoundingBox() {
         return mTaskbarContainerView.getFolderBoundingBox();
     }
-
-    /**
-     * @return The ratio of taskbar icon size vs normal workspace/hotseat icon size.
-     */
-    public float getTaskbarIconScale() {
-        return mIconScale;
-    }
 }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index abf6d54146..eccc41bfe2 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -151,13 +151,22 @@ public class TaskbarController {
                         ActivityManagerWrapper.getInstance().startActivityFromRecents(task.key,
                                 ActivityOptions.makeBasic());
                     } else if (tag instanceof FolderInfo) {
-                        if (mLauncher.hasBeenResumed()) {
-                            FolderInfo folderInfo = (FolderInfo) tag;
-                            onClickedOnFolderFromHome(folderInfo);
-                        } else {
-                            FolderIcon folderIcon = (FolderIcon) view;
-                            onClickedOnFolderInApp(folderIcon);
-                        }
+                        FolderIcon folderIcon = (FolderIcon) view;
+                        Folder folder = folderIcon.getFolder();
+
+                        setTaskbarWindowFullscreen(true);
+
+                        mTaskbarContainerView.post(() -> {
+                            folder.animateOpen();
+
+                            folder.iterateOverItems((itemInfo, itemView) -> {
+                                itemView.setOnClickListener(getItemOnClickListener());
+                                itemView.setOnLongClickListener(getItemOnLongClickListener());
+                                // To play haptic when dragging, like other Taskbar items do.
+                                itemView.setHapticFeedbackEnabled(true);
+                                return false;
+                            });
+                        });
                     } else {
                         ItemClickHandler.INSTANCE.onClick(view);
                     }
@@ -167,44 +176,9 @@ public class TaskbarController {
                 };
             }
 
-            // Open the real folder in Launcher.
-            private void onClickedOnFolderFromHome(FolderInfo folderInfo) {
-                alignRealHotseatWithTaskbar();
-
-                FolderIcon folderIcon = (FolderIcon) mLauncher.getHotseat()
-                        .getFirstItemMatch((info, v) -> info == folderInfo);
-                folderIcon.post(folderIcon::performClick);
-            }
-
-            // Open the Taskbar folder, and handle clicks on folder items.
-            private void onClickedOnFolderInApp(FolderIcon folderIcon) {
-                Folder folder = folderIcon.getFolder();
-
-                setTaskbarWindowFullscreen(true);
-
-                mTaskbarContainerView.post(() -> {
-                    folder.animateOpen();
-
-                    folder.iterateOverItems((itemInfo, itemView) -> {
-                        itemView.setOnClickListener(getItemOnClickListener());
-                        itemView.setOnLongClickListener(getItemOnLongClickListener());
-                        // To play haptic when dragging, like other Taskbar items do.
-                        itemView.setHapticFeedbackEnabled(true);
-                        return false;
-                    });
-                });
-            }
-
             @Override
             public View.OnLongClickListener getItemOnLongClickListener() {
-                return view -> {
-                    if (mLauncher.hasBeenResumed() && view.getTag() instanceof ItemInfo) {
-                        // TODO: remove this path
-                        return mDragController.startWorkspaceDragOnLongClick(view);
-                    } else {
-                        return mDragController.startSystemDragOnLongClick(view);
-                    }
-                };
+                return mDragController::startSystemDragOnLongClick;
             }
 
             @Override
@@ -509,14 +483,6 @@ public class TaskbarController {
                 mTaskbarViewOnHome.getHeight() - hotseatBounds.bottom);
     }
 
-    /**
-     * A view was added or removed from DragLayer, check if we need to hide our hotseat copy and
-     * show the real one instead.
-     */
-    public void onLauncherDragLayerHierarchyChanged() {
-        // TODO: remove, as this is a no-op now
-    }
-
     private void updateWhichTaskbarViewIsVisible() {
         boolean isInApp = !mLauncher.hasBeenResumed() || mIsAnimatingToLauncher
                 || mIsAnimatingToApp;
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
index f51e49837d..5eb34cb360 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
@@ -33,7 +33,6 @@ import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.R;
-import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.system.ClipDescriptionCompat;
@@ -125,38 +124,6 @@ public class TaskbarDragController {
         return false;
     }
 
-    /**
-     * Starts a drag and drop operation that controls a real Workspace (Hotseat) view.
-     * @param view The Taskbar item that was long clicked.
-     * @return Whether {@link View#startDragAndDrop} started successfully.
-     */
-    protected boolean startWorkspaceDragOnLongClick(View view) {
-        View.DragShadowBuilder transparentShadowBuilder = new View.DragShadowBuilder(view) {
-            private static final int ARBITRARY_SHADOW_SIZE = 10;
-
-            @Override
-            public void onDrawShadow(Canvas canvas) {
-            }
-
-            @Override
-            public void onProvideShadowMetrics(Point outShadowSize, Point outShadowTouchPoint) {
-                outShadowSize.set(ARBITRARY_SHADOW_SIZE, ARBITRARY_SHADOW_SIZE);
-                outShadowTouchPoint.set(ARBITRARY_SHADOW_SIZE / 2, ARBITRARY_SHADOW_SIZE / 2);
-            }
-        };
-
-        TaskbarDragListener taskbarDragListener = new TaskbarDragListener(mLauncher,
-                (ItemInfo) view.getTag());
-        if (view.startDragAndDrop(new ClipData("", new String[] {taskbarDragListener.getMimeType()},
-                        new ClipData.Item("")),
-                transparentShadowBuilder, null /* localState */, View.DRAG_FLAG_GLOBAL)) {
-            view.setOnDragListener(getDraggedViewDragListener());
-            taskbarDragListener.init(mLauncher.getDragLayer());
-            return true;
-        }
-        return false;
-    }
-
     /**
      * Hide the original Taskbar item while it is being dragged.
      */
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragListener.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragListener.java
deleted file mode 100644
index dc27df1909..0000000000
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragListener.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.taskbar;
-
-import android.content.ClipDescription;
-import android.graphics.Point;
-import android.view.DragEvent;
-import android.view.View;
-
-import com.android.launcher3.BaseQuickstepLauncher;
-import com.android.launcher3.dragndrop.DragLayer;
-import com.android.launcher3.dragndrop.DragOptions;
-import com.android.launcher3.model.data.ItemInfo;
-
-import java.util.UUID;
-
-/**
- * Listens to system drag and drop events initated by the Taskbar, and forwards them to Launcher's
- * internal DragController to move Hotseat items.
- */
-public class TaskbarDragListener implements View.OnDragListener {
-
-    private static final String MIME_TYPE_PREFIX = "com.android.launcher3.taskbar.drag_and_drop/";
-
-    private final BaseQuickstepLauncher mLauncher;
-    private final ItemInfo mDraggedItem;
-    // Randomly generated id used to verify the drag event.
-    private final String mId;
-
-    // Initialized in init().
-    DragLayer mDragLayer;
-
-    /**
-     * @param draggedItem The info of the item that was long clicked, which we will use to find
-     *                    the equivalent match on Hotseat to drag internally.
-     */
-    public TaskbarDragListener(BaseQuickstepLauncher launcher, ItemInfo draggedItem) {
-        mLauncher = launcher;
-        mDraggedItem = draggedItem;
-        mId = UUID.randomUUID().toString();
-    }
-
-    protected void init(DragLayer dragLayer) {
-        mDragLayer = dragLayer;
-        mDragLayer.setOnDragListener(this);
-        // Temporarily disable haptics, as system will already play one when drag and drop starts.
-        mDragLayer.setHapticFeedbackEnabled(false);
-    }
-
-    private void cleanup() {
-        mDragLayer.setOnDragListener(null);
-        mLauncher.setNextWorkspaceDragOptions(null);
-        mDragLayer.setHapticFeedbackEnabled(true);
-    }
-
-    /**
-     * Returns a randomly generated id used to verify the drag event.
-     */
-    protected String getMimeType() {
-        return MIME_TYPE_PREFIX + mId;
-    }
-
-    @Override
-    public boolean onDrag(View dragLayer, DragEvent dragEvent) {
-        ClipDescription clipDescription = dragEvent.getClipDescription();
-        if (dragEvent.getAction() == DragEvent.ACTION_DRAG_STARTED) {
-            if (clipDescription == null || !clipDescription.hasMimeType(getMimeType())) {
-                // We didn't initiate this drag, ignore.
-                cleanup();
-                return false;
-            }
-            View hotseatView = mLauncher.getHotseat().getFirstItemMatch(
-                    (info, view) -> info == mDraggedItem);
-            if (hotseatView == null) {
-                cleanup();
-                return false;
-            }
-            DragOptions dragOptions = new DragOptions();
-            dragOptions.simulatedDndStartPoint = new Point((int) dragEvent.getX(),
-                    (int) dragEvent.getY());
-            mLauncher.setNextWorkspaceDragOptions(dragOptions);
-            hotseatView.performLongClick();
-        } else if (dragEvent.getAction() == DragEvent.ACTION_DRAG_ENDED) {
-            cleanup();
-        }
-        return mLauncher.getDragController().onDragEvent(dragEvent);
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java
index b4b5d8b3fe..0a3819dad5 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java
@@ -16,14 +16,12 @@
 package com.android.launcher3.taskbar;
 
 import static com.android.launcher3.LauncherState.TASKBAR;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_TASKBAR_FADE;
-import static com.android.launcher3.states.StateAnimationConfig.SKIP_TASKBAR;
+import static com.android.launcher3.anim.Interpolators.LINEAR;
 
 import androidx.annotation.Nullable;
 
 import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.LauncherState;
-import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.states.StateAnimationConfig;
@@ -65,13 +63,9 @@ public class TaskbarStateHandler implements StateManager.StateHandler<LauncherSt
         if (mTaskbarCallbacks == null) {
             return;
         }
-        if (config.hasAnimationFlag(SKIP_TASKBAR)) {
-            return;
-        }
 
         AnimatedFloat alphaTarget = mTaskbarCallbacks.getAlphaTarget();
         boolean isTaskbarVisible = (toState.getVisibleElements(mLauncher) & TASKBAR) != 0;
-        animation.setFloat(alphaTarget, AnimatedFloat.VALUE, isTaskbarVisible ? 1f : 0f,
-                config.getInterpolator(ANIM_TASKBAR_FADE, Interpolators.LINEAR));
+        animation.setFloat(alphaTarget, AnimatedFloat.VALUE, isTaskbarVisible ? 1f : 0f, LINEAR);
     }
 }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarVisibilityController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarVisibilityController.java
index 2228ebae8f..8745a7c8d9 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarVisibilityController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarVisibilityController.java
@@ -31,21 +31,18 @@ import com.android.systemui.shared.system.QuickStepContract;
 public class TaskbarVisibilityController {
 
     private static final long IME_VISIBILITY_ALPHA_DURATION = 120;
-    private static final long FLOATING_VIEW_VISIBILITY_ALPHA_DURATION = 120;
 
     private final BaseQuickstepLauncher mLauncher;
     private final TaskbarController.TaskbarVisibilityControllerCallbacks mTaskbarCallbacks;
 
     // Background alpha.
-    private AnimatedFloat mTaskbarBackgroundAlpha = new AnimatedFloat(
+    private final AnimatedFloat mTaskbarBackgroundAlpha = new AnimatedFloat(
             this::onTaskbarBackgroundAlphaChanged);
 
     // Overall visibility.
-    private AnimatedFloat mTaskbarVisibilityAlphaForLauncherState = new AnimatedFloat(
+    private final AnimatedFloat mTaskbarVisibilityAlphaForLauncherState = new AnimatedFloat(
             this::updateVisibilityAlpha);
-    private AnimatedFloat mTaskbarVisibilityAlphaForIme = new AnimatedFloat(
-            this::updateVisibilityAlpha);
-    private AnimatedFloat mTaskbarVisibilityAlphaForFloatingView = new AnimatedFloat(
+    private final AnimatedFloat mTaskbarVisibilityAlphaForIme = new AnimatedFloat(
             this::updateVisibilityAlpha);
 
     public TaskbarVisibilityController(BaseQuickstepLauncher launcher,
@@ -62,7 +59,6 @@ public class TaskbarVisibilityController {
         boolean isImeVisible = (SystemUiProxy.INSTANCE.get(mLauncher).getLastSystemUiStateFlags()
                 & QuickStepContract.SYSUI_STATE_IME_SHOWING) != 0;
         mTaskbarVisibilityAlphaForIme.updateValue(isImeVisible ? 0f : 1f);
-        mTaskbarVisibilityAlphaForFloatingView.updateValue(1f);
 
         onTaskbarBackgroundAlphaChanged();
         updateVisibilityAlpha();
@@ -86,11 +82,6 @@ public class TaskbarVisibilityController {
                 .setDuration(IME_VISIBILITY_ALPHA_DURATION).start();
     }
 
-    protected void animateToVisibilityForFloatingView(float toAlpha) {
-        mTaskbarVisibilityAlphaForIme.animateToValue(mTaskbarVisibilityAlphaForFloatingView.value,
-                toAlpha).setDuration(FLOATING_VIEW_VISIBILITY_ALPHA_DURATION).start();
-    }
-
     private void onTaskbarBackgroundAlphaChanged() {
         mTaskbarCallbacks.updateTaskbarBackgroundAlpha(mTaskbarBackgroundAlpha.value);
         updateVisibilityAlpha();
@@ -102,8 +93,7 @@ public class TaskbarVisibilityController {
         // LauncherState if Launcher is paused.
         float alphaDueToLauncher = Math.max(mTaskbarBackgroundAlpha.value,
                 mTaskbarVisibilityAlphaForLauncherState.value);
-        float alphaDueToOther = mTaskbarVisibilityAlphaForIme.value
-                * mTaskbarVisibilityAlphaForFloatingView.value;
+        float alphaDueToOther = mTaskbarVisibilityAlphaForIme.value;
         float taskbarAlpha = alphaDueToLauncher * alphaDueToOther;
         mTaskbarCallbacks.updateTaskbarVisibilityAlpha(taskbarAlpha);
 
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
index 473fe2d989..de7be5dbb8 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
@@ -18,7 +18,6 @@ package com.android.launcher3.uioverrides.states;
 import static android.view.View.VISIBLE;
 
 import static com.android.launcher3.LauncherState.HINT_STATE;
-import static com.android.launcher3.LauncherState.HOTSEAT_ICONS;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.WorkspaceStateTransitionAnimation.getSpringScaleAnimator;
@@ -33,12 +32,10 @@ import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
 import static com.android.launcher3.anim.Interpolators.clampToProgress;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_DEPTH;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_TASKBAR_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_TRANSLATE;
@@ -82,7 +79,6 @@ public class QuickstepAtomicAnimationFactory extends
         if (toState == NORMAL && fromState == OVERVIEW) {
             config.setInterpolator(ANIM_WORKSPACE_SCALE, DEACCEL);
             config.setInterpolator(ANIM_WORKSPACE_FADE, ACCEL);
-            config.setInterpolator(ANIM_TASKBAR_FADE, ACCEL);
             config.setInterpolator(ANIM_ALL_APPS_FADE, ACCEL);
             config.setInterpolator(ANIM_OVERVIEW_SCALE, clampToProgress(ACCEL, 0, 0.9f));
             config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, ACCEL_DEACCEL);
@@ -141,7 +137,6 @@ public class QuickstepAtomicAnimationFactory extends
             config.setInterpolator(ANIM_DEPTH, OVERSHOOT_1_2);
             config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, OVERSHOOT_1_2);
             config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, OVERSHOOT_1_2);
-            config.setInterpolator(ANIM_TASKBAR_FADE, OVERSHOOT_1_2);
         } else if (fromState == HINT_STATE && toState == NORMAL) {
             config.setInterpolator(ANIM_DEPTH, DEACCEL_3);
             if (mHintToNormalDuration == -1) {
@@ -150,17 +145,6 @@ public class QuickstepAtomicAnimationFactory extends
                 mHintToNormalDuration = (int) va.getDuration();
             }
             config.duration = Math.max(config.duration, mHintToNormalDuration);
-        } else if (mActivity.getTaskbarController() != null)  {
-            boolean wasHotseatVisible = fromState.areElementsVisible(mActivity, HOTSEAT_ICONS);
-            boolean isHotseatVisible = toState.areElementsVisible(mActivity, HOTSEAT_ICONS);
-            if (wasHotseatVisible || isHotseatVisible) {
-                config.setInterpolator(ANIM_TASKBAR_FADE, INSTANT);
-                config.setInterpolator(ANIM_HOTSEAT_FADE, INSTANT);
-
-                if (isHotseatVisible) {
-                    mActivity.getTaskbarController().alignRealHotseatWithTaskbar();
-                }
-            }
         }
     }
 }
diff --git a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
index 3faf72a006..23f9c10a01 100644
--- a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
+++ b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
@@ -24,7 +24,6 @@ import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_COMPONENTS;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_DEPTH_CONTROLLER;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
-import static com.android.launcher3.states.StateAnimationConfig.SKIP_TASKBAR;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -168,8 +167,7 @@ public class StaggeredWorkspaceAnim {
      */
     private void prepareToAnimate(Launcher launcher, boolean animateOverviewScrim) {
         StateAnimationConfig config = new StateAnimationConfig();
-        config.animFlags = ANIM_ALL_COMPONENTS | SKIP_OVERVIEW | SKIP_DEPTH_CONTROLLER
-                | SKIP_TASKBAR;
+        config.animFlags = ANIM_ALL_COMPONENTS | SKIP_OVERVIEW | SKIP_DEPTH_CONTROLLER;
         config.duration = 0;
         // setRecentsAttachedToAppWindow() will animate recents out.
         launcher.getStateManager().createAtomicAnimation(BACKGROUND_APP, NORMAL, config).start();
diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java
index d894bb4b82..95cdbdd147 100644
--- a/src/com/android/launcher3/AbstractFloatingView.java
+++ b/src/com/android/launcher3/AbstractFloatingView.java
@@ -98,13 +98,6 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
     public static final int TYPE_HIDE_BACK_BUTTON = TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE
             | TYPE_SNACKBAR | TYPE_WIDGET_RESIZE_FRAME | TYPE_LISTENER;
 
-    // When these types of floating views are open, hide the taskbar hotseat and show the real one.
-    public static final int TYPE_REPLACE_TASKBAR_WITH_HOTSEAT = TYPE_FOLDER | TYPE_ACTION_POPUP;
-
-    // Hide the taskbar when these types of floating views are open.
-    public static final int TYPE_HIDE_TASKBAR = TYPE_WIDGETS_BOTTOM_SHEET | TYPE_WIDGETS_FULL_SHEET
-            | TYPE_ON_BOARD_POPUP;
-
     public static final int TYPE_ACCESSIBLE = TYPE_ALL & ~TYPE_DISCOVERY_BOUNCE & ~TYPE_LISTENER
             & ~TYPE_ALL_APPS_EDU;
 
diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
index cfcf0a0ced..29a0c75e3f 100644
--- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
+++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
@@ -34,7 +34,6 @@ import static com.android.launcher3.anim.Interpolators.ZOOM_OUT;
 import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
 import static com.android.launcher3.graphics.Scrim.SCRIM_PROGRESS;
 import static com.android.launcher3.graphics.SysUiScrim.SYSUI_PROGRESS;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_TRANSLATE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_FADE;
@@ -134,8 +133,7 @@ public class WorkspaceStateTransitionAnimation {
             }
 
             float hotseatIconsAlpha = (elements & HOTSEAT_ICONS) != 0 ? 1 : 0;
-            propertySetter.setViewAlpha(hotseat, hotseatIconsAlpha,
-                    config.getInterpolator(ANIM_HOTSEAT_FADE, fadeInterpolator));
+            propertySetter.setViewAlpha(hotseat, hotseatIconsAlpha, fadeInterpolator);
             float workspacePageIndicatorAlpha = (elements & WORKSPACE_PAGE_INDICATOR) != 0 ? 1 : 0;
             propertySetter.setViewAlpha(mLauncher.getWorkspace().getPageIndicator(),
                     workspacePageIndicatorAlpha, fadeInterpolator);
diff --git a/src/com/android/launcher3/states/StateAnimationConfig.java b/src/com/android/launcher3/states/StateAnimationConfig.java
index e4c67eee7c..cd74390418 100644
--- a/src/com/android/launcher3/states/StateAnimationConfig.java
+++ b/src/com/android/launcher3/states/StateAnimationConfig.java
@@ -38,7 +38,6 @@ public class StateAnimationConfig {
             PLAY_ATOMIC_OVERVIEW_PEEK,
             SKIP_OVERVIEW,
             SKIP_DEPTH_CONTROLLER,
-            SKIP_TASKBAR,
     })
     @Retention(RetentionPolicy.SOURCE)
     public @interface AnimationFlags {}
@@ -47,7 +46,6 @@ public class StateAnimationConfig {
     public static final int PLAY_ATOMIC_OVERVIEW_PEEK = 1 << 2;
     public static final int SKIP_OVERVIEW = 1 << 3;
     public static final int SKIP_DEPTH_CONTROLLER = 1 << 4;
-    public static final int SKIP_TASKBAR = 1 << 5;
 
     public long duration;
     public boolean userControlled;
@@ -74,8 +72,6 @@ public class StateAnimationConfig {
             ANIM_OVERVIEW_MODAL,
             ANIM_DEPTH,
             ANIM_OVERVIEW_ACTIONS_FADE,
-            ANIM_TASKBAR_FADE,
-            ANIM_HOTSEAT_FADE,
     })
     @Retention(RetentionPolicy.SOURCE)
     public @interface AnimType {}
@@ -95,10 +91,8 @@ public class StateAnimationConfig {
     public static final int ANIM_OVERVIEW_MODAL = 13;
     public static final int ANIM_DEPTH = 14;
     public static final int ANIM_OVERVIEW_ACTIONS_FADE = 15;
-    public static final int ANIM_TASKBAR_FADE = 16;
-    public static final int ANIM_HOTSEAT_FADE = 17; // if not set, falls back to ANIM_WORKSPACE_FADE
 
-    private static final int ANIM_TYPES_COUNT = 18;
+    private static final int ANIM_TYPES_COUNT = 16;
 
     protected final Interpolator[] mInterpolators = new Interpolator[ANIM_TYPES_COUNT];
 
-- 
GitLab


From 706ff85fe5ff2aff700278c428d7febb38809066 Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Tue, 16 Mar 2021 18:27:32 -0700
Subject: [PATCH 0754/1664] Prevent setting task thumbnail during swipe to
 overview

Previously we were setting the incorrect thumbnail when
swiping to overview, then taking a task screenshot right
when the animation ends and replacing the first thumbnail.
This sometimes caused a flicker of the old thumbnail, now
we avoid setting the thumbnail at all for the taskview that
is being swiped up.

Another edge case handled here is when switching nav modes
and then immediately entering overview, Recents receives an
onConfigChange for changing task icon size. That would cause
all taskviews to null out both their existing icon and
thumbnail, now only the icon gets nulled out.
Existing issue where switching to 3 button nav and then
entering overview shows blank icon, doesn't register for
receiving the updated task snapshot fast enough.

Fixes: 179307265
Test: Ask assistant for weather, swipe to overview
Ask assistant for time, swipe to overview, no flicker

Switch nav modes to gesture, swipe to overview.
There's a flicker for config change, but thumbnail is correct

Change-Id: I300b29f999f6d6876f82bc0189b44f4c10ae33fe
---
 .../RecentsViewStateController.java           |  3 +-
 .../FallbackRecentsStateController.java       |  3 +-
 .../android/quickstep/views/RecentsView.java  | 36 ++++++----
 .../com/android/quickstep/views/TaskView.java | 68 +++++++++++++++----
 4 files changed, 84 insertions(+), 26 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
index 750f673625..e1456b17ad 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
@@ -25,6 +25,7 @@ import static com.android.quickstep.views.RecentsView.CONTENT_ALPHA;
 import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS;
 import static com.android.quickstep.views.RecentsView.TASK_MODALNESS;
 import static com.android.quickstep.views.SplitPlaceholderView.ALPHA_FLOAT;
+import static com.android.quickstep.views.TaskView.FLAG_UPDATE_ALL;
 
 import android.annotation.TargetApi;
 import android.os.Build;
@@ -73,7 +74,7 @@ public final class RecentsViewStateController extends
 
         if (toState.overviewUi) {
             // While animating into recents, update the visible task data as needed
-            builder.addOnFrameCallback(mRecentsView::loadVisibleTaskData);
+            builder.addOnFrameCallback(() -> mRecentsView.loadVisibleTaskData(FLAG_UPDATE_ALL));
             mRecentsView.updateEmptyMessage();
         } else {
             builder.addListener(
diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
index 54f6ce6dc6..82bfa9b9a9 100644
--- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
+++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
@@ -29,6 +29,7 @@ import static com.android.quickstep.views.RecentsView.RECENTS_GRID_PROGRESS;
 import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
 import static com.android.quickstep.views.RecentsView.TASK_MODALNESS;
 import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION;
+import static com.android.quickstep.views.TaskView.FLAG_UPDATE_ALL;
 
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.anim.PropertySetter;
@@ -70,7 +71,7 @@ public class FallbackRecentsStateController implements StateHandler<RecentsState
             return;
         }
         // While animating into recents, update the visible task data as needed
-        setter.addOnFrameCallback(mRecentsView::loadVisibleTaskData);
+        setter.addOnFrameCallback(() -> mRecentsView.loadVisibleTaskData(FLAG_UPDATE_ALL));
         mRecentsView.updateEmptyMessage();
 
         setProperties(toState, config, setter);
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index f216985a94..4d8176c7e5 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -315,6 +315,10 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     private final ClearAllButton mClearAllButton;
     private final Rect mClearAllButtonDeadZoneRect = new Rect();
     private final Rect mTaskViewDeadZoneRect = new Rect();
+    /**
+     * Reflects if Recents is currently in the middle of a gesture
+     */
+    private boolean mGestureActive;
 
     private final ScrollState mScrollState = new ScrollState();
     // Keeps track of the previously known visible tasks for purposes of loading/unloading task data
@@ -624,8 +628,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             return;
         }
         mModel.getIconCache().clear();
-        unloadVisibleTaskData();
-        loadVisibleTaskData();
+        unloadVisibleTaskData(TaskView.FLAG_UPDATE_ICON);
+        loadVisibleTaskData(TaskView.FLAG_UPDATE_ICON);
     }
 
     public void init(OverviewActionsView actionsView, SplitPlaceholderView splitPlaceholderView) {
@@ -908,7 +912,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         }
 
         // Unload existing visible task data
-        unloadVisibleTaskData();
+        unloadVisibleTaskData(TaskView.FLAG_UPDATE_ALL);
 
         TaskView ignoreResetTaskView =
                 mIgnoreResetTaskId == -1 ? null : getTaskView(mIgnoreResetTaskId);
@@ -1031,7 +1035,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
 
         updateCurveProperties();
         // Update the set of visible task's data
-        loadVisibleTaskData();
+        loadVisibleTaskData(TaskView.FLAG_UPDATE_ALL);
         setTaskModalness(0);
     }
 
@@ -1147,7 +1151,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             }
 
             // After scrolling, update the visible task's data
-            loadVisibleTaskData();
+            loadVisibleTaskData(TaskView.FLAG_UPDATE_ALL);
         }
 
         // Update the high res thumbnail loader state
@@ -1210,7 +1214,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
      * Iterates through all the tasks, and loads the associated task data for newly visible tasks,
      * and unloads the associated task data for tasks that are no longer visible.
      */
-    public void loadVisibleTaskData() {
+    public void loadVisibleTaskData(@TaskView.TaskDataChanges int dataChanges) {
         if (!mOverviewStateEnabled || mTaskListChangeId == -1) {
             // Skip loading visible task data if we've already left the overview state, or if the
             // task list hasn't been loaded yet (the task views will not reflect the task list)
@@ -1252,12 +1256,18 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                     continue;
                 }
                 if (!mHasVisibleTaskData.get(task.key.id)) {
-                    taskView.onTaskListVisibilityChanged(true /* visible */);
+                    // Ignore thumbnail update if it's current running task during the gesture
+                    // We snapshot at end of gesture, it will update then
+                    int changes = dataChanges;
+                    if (taskView == getRunningTaskView() && mGestureActive) {
+                        changes &= ~TaskView.FLAG_UPDATE_THUMBNAIL;
+                    }
+                    taskView.onTaskListVisibilityChanged(true /* visible */, changes);
                 }
                 mHasVisibleTaskData.put(task.key.id, visible);
             } else {
                 if (mHasVisibleTaskData.get(task.key.id)) {
-                    taskView.onTaskListVisibilityChanged(false /* visible */);
+                    taskView.onTaskListVisibilityChanged(false /* visible */, dataChanges);
                 }
                 mHasVisibleTaskData.delete(task.key.id);
             }
@@ -1267,12 +1277,12 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     /**
      * Unloads any associated data from the currently visible tasks
      */
-    private void unloadVisibleTaskData() {
+    private void unloadVisibleTaskData(@TaskView.TaskDataChanges int dataChanges) {
         for (int i = 0; i < mHasVisibleTaskData.size(); i++) {
             if (mHasVisibleTaskData.valueAt(i)) {
                 TaskView taskView = getTaskView(mHasVisibleTaskData.keyAt(i));
                 if (taskView != null) {
-                    taskView.onTaskListVisibilityChanged(false /* visible */);
+                    taskView.onTaskListVisibilityChanged(false /* visible */, dataChanges);
                 }
             }
         }
@@ -1310,7 +1320,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mRecentsAnimationController = null;
         mLiveTileParams.setTargetSet(null);
 
-        unloadVisibleTaskData();
+        unloadVisibleTaskData(TaskView.FLAG_UPDATE_ALL);
         setCurrentPage(0);
         mDwbToastShown = false;
         mActivity.getSystemUiController().updateUiState(UI_STATE_OVERVIEW, 0);
@@ -1358,6 +1368,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
      * Called when a gesture from an app is starting.
      */
     public void onGestureAnimationStart(RunningTaskInfo runningTaskInfo) {
+        mGestureActive = true;
         // This needs to be called before the other states are set since it can create the task view
         if (mOrientationState.setGestureActive(true)) {
             updateOrientationHandler();
@@ -1428,6 +1439,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
      * Called when a gesture from an app has finished, and the animation to the target has ended.
      */
     public void onGestureAnimationEnd() {
+        mGestureActive = false;
         if (mOrientationState.setGestureActive(false)) {
             updateOrientationHandler();
         }
@@ -2733,7 +2745,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     @Override
     protected void notifyPageSwitchListener(int prevPage) {
         super.notifyPageSwitchListener(prevPage);
-        loadVisibleTaskData();
+        loadVisibleTaskData(TaskView.FLAG_UPDATE_ALL);
         updateEnabledOverlays();
     }
 
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 2b7e6fd059..a2acab880f 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -42,6 +42,8 @@ import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 
+import static java.lang.annotation.RetentionPolicy.SOURCE;
+
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
@@ -67,6 +69,7 @@ import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.FrameLayout;
 import android.widget.Toast;
 
+import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
 
 import com.android.launcher3.DeviceProfile;
@@ -106,6 +109,7 @@ import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
 import com.android.systemui.shared.system.QuickStepContract;
 
+import java.lang.annotation.Retention;
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Consumer;
@@ -117,6 +121,19 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
 
     private static final String TAG = TaskView.class.getSimpleName();
 
+    public static final int FLAG_UPDATE_ICON = 1;
+    public static final int FLAG_UPDATE_THUMBNAIL = FLAG_UPDATE_ICON << 1;
+
+    public static final int FLAG_UPDATE_ALL = FLAG_UPDATE_ICON | FLAG_UPDATE_THUMBNAIL;
+
+    /**
+     * Used in conjunction with {@link #onTaskListVisibilityChanged(boolean, int)}, providing more
+     * granularity on which components of this task require an update
+     */
+    @Retention(SOURCE)
+    @IntDef({FLAG_UPDATE_ALL, FLAG_UPDATE_ICON, FLAG_UPDATE_THUMBNAIL})
+    public @interface TaskDataChanges {}
+
     /**
      * The alpha of a black scrim on a page in the carousel as it leaves the screen.
      * In the resting position of the carousel, the adjacent pages have about half this scrim.
@@ -557,7 +574,19 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         }
     }
 
+    /**
+     * See {@link TaskDataChanges}
+     * @param visible If this task view will be visible to the user in overview or hidden
+     */
     public void onTaskListVisibilityChanged(boolean visible) {
+        onTaskListVisibilityChanged(visible, FLAG_UPDATE_ALL);
+    }
+
+    /**
+     * See {@link TaskDataChanges}
+     * @param visible If this task view will be visible to the user in overview or hidden
+     */
+    public void onTaskListVisibilityChanged(boolean visible, @TaskDataChanges int changes) {
         if (mTask == null) {
             return;
         }
@@ -568,22 +597,37 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
             RecentsModel model = RecentsModel.INSTANCE.get(getContext());
             TaskThumbnailCache thumbnailCache = model.getThumbnailCache();
             TaskIconCache iconCache = model.getIconCache();
-            mThumbnailLoadRequest = thumbnailCache.updateThumbnailInBackground(
-                    mTask, thumbnail -> mSnapshotView.setThumbnail(mTask, thumbnail));
-            mIconLoadRequest = iconCache.updateIconInBackground(mTask,
-                    (task) -> {
-                        setIcon(task.icon);
-                        mDigitalWellBeingToast.initialize(mTask);
-                    });
+
+            if (needsUpdate(changes, FLAG_UPDATE_THUMBNAIL)) {
+                mThumbnailLoadRequest = thumbnailCache.updateThumbnailInBackground(
+                        mTask, thumbnail -> {
+                            mSnapshotView.setThumbnail(mTask, thumbnail);
+                        });
+            }
+            if (needsUpdate(changes, FLAG_UPDATE_ICON)) {
+                mIconLoadRequest = iconCache.updateIconInBackground(mTask,
+                        (task) -> {
+                            setIcon(task.icon);
+                            mDigitalWellBeingToast.initialize(mTask);
+                        });
+            }
         } else {
-            mSnapshotView.setThumbnail(null, null);
-            setIcon(null);
-            // Reset the task thumbnail reference as well (it will be fetched from the cache or
-            // reloaded next time we need it)
-            mTask.thumbnail = null;
+            if (needsUpdate(changes, FLAG_UPDATE_THUMBNAIL)) {
+                mSnapshotView.setThumbnail(null, null);
+                // Reset the task thumbnail reference as well (it will be fetched from the cache or
+                // reloaded next time we need it)
+                mTask.thumbnail = null;
+            }
+            if (needsUpdate(changes, FLAG_UPDATE_ICON)) {
+                setIcon(null);
+            }
         }
     }
 
+    private boolean needsUpdate(@TaskDataChanges int dataChange, @TaskDataChanges int flag) {
+        return (dataChange & flag) == flag;
+    }
+
     private void cancelPendingLoadTasks() {
         if (mThumbnailLoadRequest != null) {
             mThumbnailLoadRequest.cancel();
-- 
GitLab


From 298526e812d347ca3c6a10061faa90899dabf56d Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pbdr@google.com>
Date: Thu, 18 Mar 2021 08:49:47 +0000
Subject: [PATCH 0755/1664] Enforce rounded corners on App Widgets.

The feature is controlled by the ENABLE_ENFORCED_ROUNDED_CORNERS flag
(currently set to false).

If does not yet handle P/H flags to control its behavior.

Bug: 183097166
Test: Manual tests with top 1P App Widgets (See bug for results)
Change-Id: I56fca1b717f37ad518588115409f2144a71d4b98
---
 res/values/dimens.xml                         |   3 +
 .../launcher3/config/FeatureFlags.java        |   3 +
 .../dragndrop/AppWidgetHostViewDrawable.java  |  20 +++
 .../widget/LauncherAppWidgetHostView.java     |  55 +++++-
 .../widget/RoundedCornerEnforcement.java      | 170 ++++++++++++++++++
 5 files changed, 250 insertions(+), 1 deletion(-)
 create mode 100644 src/com/android/launcher3/widget/RoundedCornerEnforcement.java

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 9d6c936384..c378a806a1 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -277,4 +277,7 @@
 <!-- Taskbar related (placeholders to compile in Launcher3 without Quickstep) -->
     <dimen name="taskbar_size">0dp</dimen>
 
+    <!-- Size of the maximum radius for the enforced rounded rectangles. -->
+    <dimen name="enforced_rounded_corner_max_radius">16dp</dimen>
+
 </resources>
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 96251f000c..7f76d27564 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -215,6 +215,9 @@ public final class FeatureFlags {
     public static final BooleanFlag ENABLE_SPLIT_SELECT = getDebugFlag(
             "ENABLE_SPLIT_SELECT", false, "Uses new split screen selection overview UI");
 
+    public static final BooleanFlag ENABLE_ENFORCED_ROUNDED_CORNERS = new DeviceFlag(
+            "ENABLE_ENFORCED_ROUNDED_CORNERS", true, "Enforce rounded corners on all App Widgets");
+
     public static void initialize(Context context) {
         synchronized (sDebugFlags) {
             for (DebugFlag flag : sDebugFlags) {
diff --git a/src/com/android/launcher3/dragndrop/AppWidgetHostViewDrawable.java b/src/com/android/launcher3/dragndrop/AppWidgetHostViewDrawable.java
index 92ae670e52..5cd95dc413 100644
--- a/src/com/android/launcher3/dragndrop/AppWidgetHostViewDrawable.java
+++ b/src/com/android/launcher3/dragndrop/AppWidgetHostViewDrawable.java
@@ -17,8 +17,12 @@ package com.android.launcher3.dragndrop;
 
 import android.graphics.Canvas;
 import android.graphics.ColorFilter;
+import android.graphics.Outline;
 import android.graphics.Paint;
+import android.graphics.Path;
 import android.graphics.PixelFormat;
+import android.graphics.Rect;
+import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
 
 import com.android.launcher3.widget.LauncherAppWidgetHostView;
@@ -28,14 +32,30 @@ public final class AppWidgetHostViewDrawable extends Drawable {
 
     private final LauncherAppWidgetHostView mAppWidgetHostView;
     private Paint mPaint = new Paint();
+    private final Path mClipPath;
 
     public AppWidgetHostViewDrawable(LauncherAppWidgetHostView appWidgetHostView) {
         mAppWidgetHostView = appWidgetHostView;
+        Path clipPath = null;
+        if (appWidgetHostView.getClipToOutline()) {
+            Outline outline = new Outline();
+            mAppWidgetHostView.getOutlineProvider().getOutline(mAppWidgetHostView, outline);
+            Rect rect = new Rect();
+            if (outline.getRect(rect)) {
+                float radius = outline.getRadius();
+                clipPath = new Path();
+                clipPath.addRoundRect(new RectF(rect), radius, radius, Path.Direction.CCW);
+            }
+        }
+        mClipPath = clipPath;
     }
 
     @Override
     public void draw(Canvas canvas) {
         int saveCount = canvas.saveLayer(0, 0, getIntrinsicWidth(), getIntrinsicHeight(), mPaint);
+        if (mClipPath != null) {
+            canvas.clipPath(mClipPath);
+        }
         mAppWidgetHostView.draw(canvas);
         canvas.restoreToCount(saveCount);
     }
diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
index 5c18faf213..9b971dbc8a 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
@@ -20,6 +20,7 @@ import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.Canvas;
+import android.graphics.Outline;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.os.Handler;
@@ -32,12 +33,14 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewDebug;
 import android.view.ViewGroup;
+import android.view.ViewOutlineProvider;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.AdapterView;
 import android.widget.Advanceable;
 import android.widget.RemoteViews;
 
 import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
 
 import com.android.launcher3.CheckLongPressHelper;
 import com.android.launcher3.Launcher;
@@ -95,6 +98,18 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
     private final Rect mWidgetSizeAtDrag = new Rect();
     private final RectF mTempRectF = new RectF();
     private final boolean mIsRtl;
+    private final Rect mEnforcedRectangle = new Rect();
+    private final float mEnforcedCornerRadius;
+    private final ViewOutlineProvider mCornerRadiusEnforcementOutline = new ViewOutlineProvider() {
+        @Override
+        public void getOutline(View view, Outline outline) {
+            if (mEnforcedRectangle.isEmpty() || mEnforcedCornerRadius <= 0) {
+                outline.setEmpty();
+            } else {
+                outline.setRoundRect(mEnforcedRectangle, mEnforcedCornerRadius);
+            }
+        }
+    };
 
     public LauncherAppWidgetHostView(Context context) {
         super(context);
@@ -112,6 +127,8 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         mIsRtl = Utilities.isRtl(context.getResources());
         mColorExtractor = LocalColorExtractor.newInstance(getContext());
         mColorExtractor.setListener(this);
+
+        mEnforcedCornerRadius = RoundedCornerEnforcement.computeEnforcedRadius(getContext());
     }
 
     @Override
@@ -169,7 +186,7 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         if (viewGroup instanceof AdapterView) {
             return true;
         } else {
-            for (int i=0; i < viewGroup.getChildCount(); i++) {
+            for (int i = 0; i < viewGroup.getChildCount(); i++) {
                 View child = viewGroup.getChildAt(i);
                 if (child instanceof ViewGroup) {
                     if (checkScrollableRecursively((ViewGroup) child)) {
@@ -272,6 +289,8 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
             int pageId = mWorkspace.getPageIndexForScreenId(info.screenId);
             updateColorExtraction(mCurrentWidgetSize, pageId);
         }
+
+        enforceRoundedCorners();
     }
 
     /** Starts the drag mode. */
@@ -469,4 +488,38 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         }
         return false;
     }
+
+    @UiThread
+    private void resetRoundedCorners() {
+        setOutlineProvider(ViewOutlineProvider.BACKGROUND);
+        setClipToOutline(false);
+    }
+
+    @UiThread
+    private void enforceRoundedCorners() {
+        if (mEnforcedCornerRadius <= 0 || !RoundedCornerEnforcement.isRoundedCornerEnabled(this)) {
+            resetRoundedCorners();
+            return;
+        }
+        View background = RoundedCornerEnforcement.findBackground(this);
+        if (RoundedCornerEnforcement.hasAppWidgetOptedOut(this, background)) {
+            resetRoundedCorners();
+            return;
+        }
+        RoundedCornerEnforcement.computeRoundedRectangle(this,
+                background,
+                mEnforcedRectangle);
+        setOutlineProvider(mCornerRadiusEnforcementOutline);
+        setClipToOutline(true);
+    }
+
+    /** Returns the corner radius currently enforced, in pixels. */
+    public float getEnforcedCornerRadius() {
+        return mEnforcedCornerRadius;
+    }
+
+    /** Returns true if the corner radius are enforced for this App Widget. */
+    public boolean hasEnforcedCornerRadius() {
+        return getClipToOutline();
+    }
 }
diff --git a/src/com/android/launcher3/widget/RoundedCornerEnforcement.java b/src/com/android/launcher3/widget/RoundedCornerEnforcement.java
new file mode 100644
index 0000000000..99eccd1303
--- /dev/null
+++ b/src/com/android/launcher3/widget/RoundedCornerEnforcement.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.widget;
+
+import android.appwidget.AppWidgetHostView;
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Rect;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.config.FeatureFlags;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Utilities to compute the enforced the use of rounded corners on App Widgets.
+ */
+public class RoundedCornerEnforcement {
+    // This class is only a namespace and not meant to be instantiated.
+    private RoundedCornerEnforcement() {
+    }
+
+    /**
+     * Find the background view for a widget.
+     *
+     * @param appWidget the view containing the App Widget (typically the instance of
+     * {@link AppWidgetHostView}).
+     */
+    @Nullable
+    public static View findBackground(@NonNull View appWidget) {
+        List<View> backgrounds = findViewsWithId(appWidget, android.R.id.background);
+        if (backgrounds.size() == 1) {
+            return backgrounds.get(0);
+        }
+        // Really, the argument should contain the widget, so it cannot be the background.
+        if (appWidget instanceof ViewGroup) {
+            ViewGroup vg = (ViewGroup) appWidget;
+            if (vg.getChildCount() > 0) {
+                return findUndefinedBackground(vg.getChildAt(0));
+            }
+        }
+        return appWidget;
+    }
+
+    /**
+     * Check whether the app widget has opted out of the enforcement.
+     */
+    public static boolean hasAppWidgetOptedOut(@NonNull View appWidget, @NonNull View background) {
+        return background.getId() == android.R.id.background && background.getClipToOutline();
+    }
+
+    /** Check if the app widget is in the deny list. */
+    public static boolean isRoundedCornerEnabled(@NonNull View view) {
+        if (!Utilities.ATLEAST_S || !FeatureFlags.ENABLE_ENFORCED_ROUNDED_CORNERS.get()) {
+            return false;
+        }
+        // Here we need to test if the view's component is in the (to be created) deny list.
+        return true;
+    }
+
+    /**
+     * Computes the rounded rectangle needed for this app widget.
+     *
+     * @param appWidget View onto which the rounded rectangle will be applied.
+     * @param background Background view. This must be either {@code appWidget} or a descendant
+     *                  of {@code appWidget}.
+     * @param outRect Rectangle set to the rounded rectangle coordinates, in the reference frame
+     *                of {@code appWidget}.
+     */
+    public static void computeRoundedRectangle(@NonNull View appWidget, @NonNull View background,
+            @NonNull Rect outRect) {
+        outRect.left = 0;
+        outRect.right = background.getWidth();
+        outRect.top = 0;
+        outRect.bottom = background.getHeight();
+        while (background != appWidget) {
+            outRect.offset(background.getLeft(), background.getTop());
+            background = (View) background.getParent();
+        }
+    }
+
+    /**
+     * Computes the radius of the rounded rectangle that should be applied to a widget expanded
+     * in the given context.
+     */
+    public static float computeEnforcedRadius(@NonNull Context context) {
+        if (!Utilities.ATLEAST_S) {
+            return 0;
+        }
+        Resources res = context.getResources();
+        float systemRadius = res.getDimension(android.R.dimen.system_app_widget_background_radius);
+        float defaultRadius = res.getDimension(R.dimen.enforced_rounded_corner_max_radius);
+        return Math.min(defaultRadius, systemRadius);
+    }
+
+    private static List<View> findViewsWithId(View view, @IdRes int viewId) {
+        List<View> output = new ArrayList<>();
+        accumulateViewsWithId(view, viewId, output);
+        return output;
+    }
+
+    // Traverse views. If the predicate returns true, continue on the children, otherwise, don't.
+    private static void accumulateViewsWithId(View view, @IdRes int viewId, List<View> output) {
+        if (view.getId() == viewId) {
+            output.add(view);
+            return;
+        }
+        if (view instanceof ViewGroup) {
+            ViewGroup vg = (ViewGroup) view;
+            for (int i = 0; i < vg.getChildCount(); i++) {
+                accumulateViewsWithId(vg.getChildAt(i), viewId, output);
+            }
+        }
+    }
+
+    private static boolean isViewVisible(View view) {
+        if (view.getVisibility() != View.VISIBLE) {
+            return false;
+        }
+        return !view.willNotDraw() || view.getForeground() != null || view.getBackground() != null;
+    }
+
+    @Nullable
+    private static View findUndefinedBackground(View current) {
+        if (current.getVisibility() != View.VISIBLE) {
+            return null;
+        }
+        if (isViewVisible(current)) {
+            return current;
+        }
+        View lastVisibleView = null;
+        // Find the first view that is either not a ViewGroup, or a ViewGroup which will draw
+        // something, or a ViewGroup that contains more than one view.
+        if (current instanceof ViewGroup) {
+            ViewGroup vg = (ViewGroup) current;
+            for (int i = 0; i < vg.getChildCount(); i++) {
+                View visibleView = findUndefinedBackground(vg.getChildAt(i));
+                if (visibleView != null) {
+                    if (lastVisibleView != null) {
+                        return current; // At least two visible children
+                    }
+                    lastVisibleView = visibleView;
+                }
+            }
+        }
+        return lastVisibleView;
+    }
+}
-- 
GitLab


From 452df2d5bb8fbc210909fff80536a223472d88c1 Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pbdr@google.com>
Date: Fri, 19 Mar 2021 23:16:54 +0000
Subject: [PATCH 0756/1664] Update the resize frame to use the forced radius.

When forcing the rounded corners, the radius may be smaller than the
default one. When this happens, we should change how the frame is drawn
to only use that reduced radius, or this looks weird.

Bug: 183097166
Test: Manual tests with top 1P App Widgets
Change-Id: I6ce232515ce14059e1168e16735719ea2370132c
---
 res/layout/app_widget_resize_frame.xml               |  1 +
 src/com/android/launcher3/AppWidgetResizeFrame.java  | 12 ++++++++++++
 .../launcher3/widget/LauncherAppWidgetHostView.java  |  1 +
 3 files changed, 14 insertions(+)

diff --git a/res/layout/app_widget_resize_frame.xml b/res/layout/app_widget_resize_frame.xml
index 2e476df6c9..671dbc63c0 100644
--- a/res/layout/app_widget_resize_frame.xml
+++ b/res/layout/app_widget_resize_frame.xml
@@ -26,6 +26,7 @@
 
         <!-- Frame -->
         <ImageView
+            android:id="@+id/widget_resize_frame"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="center"
diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java
index d02efb0100..ab9178556e 100644
--- a/src/com/android/launcher3/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher3/AppWidgetResizeFrame.java
@@ -14,12 +14,15 @@ import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
 import android.graphics.Point;
 import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import android.util.AttributeSet;
 import android.util.SizeF;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
+import android.widget.ImageView;
 
 import androidx.annotation.Nullable;
 
@@ -166,6 +169,15 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
         DragLayer dl = launcher.getDragLayer();
         AppWidgetResizeFrame frame = (AppWidgetResizeFrame) launcher.getLayoutInflater()
                 .inflate(R.layout.app_widget_resize_frame, dl, false);
+        if (widget.hasEnforcedCornerRadius()) {
+            float enforcedCornerRadius = widget.getEnforcedCornerRadius();
+            ImageView imageView = frame.findViewById(R.id.widget_resize_frame);
+            Drawable d = imageView.getDrawable();
+            if (d instanceof GradientDrawable) {
+                GradientDrawable gd = (GradientDrawable) d.mutate();
+                gd.setCornerRadius(enforcedCornerRadius);
+            }
+        }
         frame.setupForWidget(widget, cellLayout, dl);
         ((DragLayer.LayoutParams) frame.getLayoutParams()).customPosition = true;
 
diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
index 9b971dbc8a..2e542edf76 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
@@ -522,4 +522,5 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
     public boolean hasEnforcedCornerRadius() {
         return getClipToOutline();
     }
+
 }
-- 
GitLab


From 3f28e0686d55ae0f698aab16ee7970f5e7a8a78a Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Tue, 23 Mar 2021 17:29:31 -0400
Subject: [PATCH 0757/1664] Update All Apps apps per row when DeviceProfile
 changes.

This fixes the bug where # all apps columns does not change as
expected during a grid change.

Bug: 183534910
Test: manual, visual
Change-Id: Id6a6abd3c7c5e9f36be96eef92961ecfdd477ac9
---
 src/com/android/launcher3/allapps/AllAppsContainerView.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 591de043d2..9813bca8a1 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -180,6 +180,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
     @Override
     public void onDeviceProfileChanged(DeviceProfile dp) {
         for (AdapterHolder holder : mAH) {
+            holder.adapter.setAppsPerRow(dp.inv.numAllAppsColumns);
             if (holder.recyclerView != null) {
                 // Remove all views and clear the pool, while keeping the data same. After this
                 // call, all the viewHolders will be recreated.
-- 
GitLab


From aea0cbf9d360ffb4a915c0870cb969f1c77fd2c5 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 23 Mar 2021 15:35:46 -0700
Subject: [PATCH 0758/1664] Fix taskbar crash after cleanup

- Set LayoutTransition after adding initial views
- End running transitions in cleanup
- Only run update listener if LayoutTransition is active

Test: No crash after taskbar cleanup()
Bug: 182512211
Change-Id: I1049857935d09235388c1ef1fe4d89ef53b79aa5
---
 .../launcher3/taskbar/TaskbarView.java        | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
index 3567c17afa..21a2d512ab 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
@@ -120,11 +120,6 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
     }
 
     protected void init(int numHotseatIcons, int numRecentIcons) {
-        mLayoutTransition = new LayoutTransition();
-        addUpdateListenerForAllLayoutTransitions(
-                () -> mControllerCallbacks.onItemPositionsChanged(this));
-        setLayoutTransition(mLayoutTransition);
-
         mHotseatStartIndex = 0;
         mHotseatEndIndex = mHotseatStartIndex + numHotseatIcons - 1;
         updateHotseatItems(new ItemInfo[numHotseatIcons]);
@@ -135,6 +130,14 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
         mRecentsStartIndex = dividerIndex + 1;
         mRecentsEndIndex = mRecentsStartIndex + numRecentIcons - 1;
         updateRecentTasks(new Task[numRecentIcons]);
+
+        mLayoutTransition = new LayoutTransition();
+        addUpdateListenerForAllLayoutTransitions(() -> {
+            if (getLayoutTransition() == mLayoutTransition) {
+                mControllerCallbacks.onItemPositionsChanged(this);
+            }
+        });
+        setLayoutTransition(mLayoutTransition);
     }
 
     private void addUpdateListenerForAllLayoutTransitions(Runnable onUpdate) {
@@ -159,10 +162,20 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
     }
 
     protected void cleanup() {
+        endAllLayoutTransitionAnimators();
+        setLayoutTransition(null);
         removeAllViews();
         mHotseatRecentsDivider = null;
     }
 
+    private void endAllLayoutTransitionAnimators() {
+        mLayoutTransition.getAnimator(LayoutTransition.CHANGE_APPEARING).end();
+        mLayoutTransition.getAnimator(LayoutTransition.CHANGE_DISAPPEARING).end();
+        mLayoutTransition.getAnimator(LayoutTransition.CHANGING).end();
+        mLayoutTransition.getAnimator(LayoutTransition.APPEARING).end();
+        mLayoutTransition.getAnimator(LayoutTransition.DISAPPEARING).end();
+    }
+
     /**
      * Sets the alpha of the background color behind all the Taskbar contents.
      * @param alpha 0 is fully transparent, 1 is fully opaque.
-- 
GitLab


From 6c5e02ac27e190ce23153fee2d9de1af1998cd2b Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Tue, 23 Mar 2021 15:30:31 +0000
Subject: [PATCH 0759/1664] Fix scrolling in widgets picker tapl tests

If the search bar and the target widget item intersect, scroll up to
make the target widget item clickable.

Test: run AddWidgetTest, AddConfigWidgetTest

Bug: 183403949
Change-Id: I847cc34757cb02b1a12e18e511fda749873ad5da
---
 .../com/android/launcher3/tapl/Widgets.java   | 73 +++++++++++++------
 1 file changed, 52 insertions(+), 21 deletions(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/Widgets.java b/tests/tapl/com/android/launcher3/tapl/Widgets.java
index fe4c71282f..f08491342b 100644
--- a/tests/tapl/com/android/launcher3/tapl/Widgets.java
+++ b/tests/tapl/com/android/launcher3/tapl/Widgets.java
@@ -18,7 +18,6 @@ package com.android.launcher3.tapl;
 
 import static com.android.launcher3.tapl.LauncherInstrumentation.WAIT_TIME_MS;
 
-import android.graphics.Point;
 import android.graphics.Rect;
 
 import androidx.test.uiautomator.By;
@@ -30,6 +29,7 @@ import androidx.test.uiautomator.Until;
 import com.android.launcher3.testing.TestProtocol;
 
 import java.util.Collection;
+import java.util.List;
 
 /**
  * All widgets container.
@@ -100,17 +100,18 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
         try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck();
              LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
                      "getting widget " + labelText + " in widgets list")) {
+            final UiObject2 searchBar = findSearchBar();
             final UiObject2 fullWidgetsPicker = verifyActiveContainer();
             mLauncher.assertTrue("Widgets container didn't become scrollable",
                     fullWidgetsPicker.wait(Until.scrollable(true), WAIT_TIME_MS));
-            final Point displaySize = mLauncher.getRealDisplaySize();
 
-            Rect headerRect = new Rect();
-            final UiObject2 widgetsContainer = findTestAppWidgetsTableContainer(headerRect);
+            final UiObject2 widgetsContainer = findTestAppWidgetsTableContainer(searchBar);
             mLauncher.assertTrue("Can't locate widgets list for the test app: "
                             + mLauncher.getLauncherPackageName(),
                     widgetsContainer != null);
             final BySelector labelSelector = By.clazz("android.widget.TextView").text(labelText);
+            final BySelector previewSelector = By.res(mLauncher.getLauncherPackageName(),
+                    "widget_preview");
             int i = 0;
             for (; ; ) {
                 final Collection<UiObject2> tableRows = widgetsContainer.getChildren();
@@ -125,19 +126,28 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
                                 "View is not WidgetCell",
                                 "com.android.launcher3.widget.WidgetCell",
                                 widget.getClassName());
-
-                        return new Widget(mLauncher, widget);
+                        UiObject2 preview = widget.findObject(previewSelector);
+                        mLauncher.assertTrue("Can't find widget preview", preview != null);
+                        Rect previewRect = new Rect(preview.getVisibleBounds());
+                        boolean intersected = searchBar.getVisibleBounds().intersect(previewRect);
+                        if (intersected) {
+                            Rect scrollUp = new Rect(/* left= */ 0, /* top= */0, /* right*/ 0,
+                                    /* bottom= */ searchBar.getVisibleBounds().height());
+                            mLauncher.scroll(
+                                    fullWidgetsPicker,
+                                    Direction.UP,
+                                    scrollUp,
+                                    /* steps= */ 2,
+                                    /* slowDown= */ true);
+                        }
+                        preview = widget.findObject(previewSelector);
+                        return new Widget(mLauncher, preview);
                     }
                 }
 
                 mLauncher.assertTrue("Too many attempts", ++i <= 40);
                 final int scroll = getWidgetsScroll();
-                mLauncher.scroll(
-                        fullWidgetsPicker,
-                        Direction.DOWN,
-                        headerRect,
-                        10,
-                        true);
+                mLauncher.scrollToLastVisibleRow(fullWidgetsPicker, tableRows, 0);
                 final int newScroll = getWidgetsScroll();
                 mLauncher.assertTrue(
                         "Scrolled in a wrong direction in Widgets: from " + scroll + " to "
@@ -147,8 +157,21 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
         }
     }
 
+    private UiObject2 findSearchBar() {
+        final BySelector searchBarContainerSelector = By.res(mLauncher.getLauncherPackageName(),
+                "search_and_recommendations_container");
+        final BySelector searchBarSelector = By.res(mLauncher.getLauncherPackageName(),
+                "widgets_search_bar");
+        final UiObject2 searchBarContainer = mLauncher.waitForLauncherObject(
+                searchBarContainerSelector);
+        mLauncher.assertTrue("Can't find a search bar container", searchBarContainer != null);
+        UiObject2 searchBar = searchBarContainer.findObject(searchBarSelector);
+        mLauncher.assertTrue("Can't find a search bar", searchBar != null);
+        return searchBar;
+    }
+
     /** Finds the widgets list of this test app from the collapsed full widgets picker. */
-    private UiObject2 findTestAppWidgetsTableContainer(Rect outHeaderRect) {
+    private UiObject2 findTestAppWidgetsTableContainer(final UiObject2 searchBar) {
         final BySelector headerSelector = By.res(mLauncher.getLauncherPackageName(),
                 "widgets_list_header");
         final BySelector targetAppSelector = By.clazz("android.widget.TextView").text(
@@ -161,12 +184,23 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
             UiObject2 fullWidgetsPicker = verifyActiveContainer();
 
             UiObject2 header = fullWidgetsPicker.findObject(headerSelector);
-            outHeaderRect.set(0, 0, 0, header.getVisibleBounds().height());
             mLauncher.assertTrue("Can't find a widget header", header != null);
 
             // Look for a header that has the test app name.
             UiObject2 headerTitle = fullWidgetsPicker.findObject(targetAppSelector);
             if (headerTitle != null) {
+                Rect headerTitleRect = new Rect(headerTitle.getVisibleBounds());
+                boolean intersected = searchBar.getVisibleBounds().intersect(headerTitleRect);
+                if (intersected) {
+                    Rect scrollUp = new Rect(/* left= */ 0, /* top= */0, /* right*/ 0,
+                            /* bottom= */ searchBar.getVisibleBounds().height());
+                    mLauncher.scroll(
+                            fullWidgetsPicker,
+                            Direction.UP,
+                            scrollUp,
+                            /* steps= */ 2,
+                            /* slowDown= */ true);
+                }
                 // If we find the header and it has not been expanded, let's click it to see the
                 // widgets list.
                 if (!hasHeaderExpanded) {
@@ -185,14 +219,11 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
                 if (widgetsContainer != null) {
                     return widgetsContainer;
                 }
-
+                mLauncher.scrollToLastVisibleRow(fullWidgetsPicker, List.of(headerTitle), 0);
+            } else {
+                mLauncher.scrollToLastVisibleRow(fullWidgetsPicker, fullWidgetsPicker.getChildren(),
+                        0);
             }
-            mLauncher.scroll(
-                    fullWidgetsPicker,
-                    Direction.DOWN,
-                    outHeaderRect,
-                    /* steps= */ 10,
-                    /* slowDown= */ true);
         }
 
         return null;
-- 
GitLab


From 2cff164be23f13246b7ad7512b241d7e9fd26433 Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Wed, 24 Mar 2021 09:52:45 +0000
Subject: [PATCH 0760/1664] Clear focus from search bar whenever a header is
 clicked in search adapter.

Test: Manually checked
Bug: 183398749
Change-Id: Ie91312ae1e62c6427e3397d1e5f60bc812a790ee
---
 .../widget/picker/WidgetsListAdapterTest.java |  2 +-
 ...WidgetsListHeaderViewHolderBinderTest.java |  3 ++-
 ...sListSearchHeaderViewHolderBinderTest.java |  3 ++-
 .../WidgetsListTableViewHolderBinderTest.java |  3 ++-
 .../widget/picker/WidgetsFullSheet.java       | 13 +++++++--
 .../widget/picker/WidgetsListAdapter.java     |  9 ++++++-
 .../search/LauncherWidgetsSearchBar.java      |  5 ++++
 .../picker/search/WidgetsSearchBar.java       |  5 ++++
 .../search/WidgetsSearchBarController.java    | 17 +++++++-----
 .../search/WidgetsSearchBarUIHelper.java      | 27 +++++++++++++++++++
 10 files changed, 74 insertions(+), 13 deletions(-)
 create mode 100644 src/com/android/launcher3/widget/picker/search/WidgetsSearchBarUIHelper.java

diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java
index e1214ff39f..6b5678cb8a 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java
@@ -82,7 +82,7 @@ public final class WidgetsListAdapterTest {
         mTestProfile.numColumns = 5;
         mUserHandle = Process.myUserHandle();
         mAdapter = new WidgetsListAdapter(mContext, mMockLayoutInflater, mMockWidgetCache,
-                mIconCache, null, null);
+                mIconCache, null, null, null);
         mAdapter.registerAdapterDataObserver(mListener);
 
         doAnswer(invocation -> ((ComponentWithLabel) invocation.getArgument(0))
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java
index 84a03d572c..12a092dafe 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java
@@ -105,7 +105,8 @@ public final class WidgetsListHeaderViewHolderBinderTest {
                 mWidgetPreviewLoader,
                 mIconCache,
                 /* iconClickListener= */ view -> {},
-                /* iconLongClickListener= */ view -> false);
+                /* iconLongClickListener= */ view -> false,
+                /* searchBarUIHelper= */ null);
         mViewHolderBinder = new WidgetsListHeaderViewHolderBinder(
                 LayoutInflater.from(mTestActivity), mOnHeaderClickListener, widgetsListAdapter);
     }
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinderTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinderTest.java
index 075c58db6b..e09034132c 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinderTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinderTest.java
@@ -105,7 +105,8 @@ public final class WidgetsListSearchHeaderViewHolderBinderTest {
                 mWidgetPreviewLoader,
                 mIconCache,
                 /* iconClickListener= */ view -> {},
-                /* iconLongClickListener= */ view -> false);
+                /* iconLongClickListener= */ view -> false,
+                /* searchBarUIHelper= */ null);
         mViewHolderBinder = new WidgetsListSearchHeaderViewHolderBinder(
                 LayoutInflater.from(mTestActivity), mOnHeaderClickListener, widgetsListAdapter);
     }
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java
index 0c6e71711d..0935d1cfc4 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java
@@ -111,7 +111,8 @@ public final class WidgetsListTableViewHolderBinderTest {
                 mWidgetPreviewLoader,
                 mIconCache,
                 /* iconClickListener= */ view -> {},
-                /* iconLongClickListener= */ view -> false);
+                /* iconLongClickListener= */ view -> false,
+                /* searchBarUIHelper= */ null);
         mViewHolderBinder = new WidgetsListTableViewHolderBinder(
                 mContext,
                 LayoutInflater.from(mTestActivity),
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index dc7d341546..29c00b209f 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -58,6 +58,7 @@ import com.android.launcher3.widget.LauncherAppWidgetHost.ProviderChangedListene
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 import com.android.launcher3.widget.picker.search.SearchModeListener;
 import com.android.launcher3.widget.picker.search.WidgetsSearchBar;
+import com.android.launcher3.widget.picker.search.WidgetsSearchBarUIHelper;
 import com.android.launcher3.widget.util.WidgetsTableUtils;
 import com.android.launcher3.workprofile.PersonalWorkPagedView;
 import com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip.OnActivePageChangedListener;
@@ -71,7 +72,8 @@ import java.util.function.Predicate;
  */
 public class WidgetsFullSheet extends BaseWidgetSheet
         implements Insettable, ProviderChangedListener, OnActivePageChangedListener,
-        WidgetsRecyclerView.HeaderViewDimensionsProvider, SearchModeListener {
+        WidgetsRecyclerView.HeaderViewDimensionsProvider, SearchModeListener,
+        WidgetsSearchBarUIHelper {
     private static final String TAG = WidgetsFullSheet.class.getSimpleName();
 
     private static final long DEFAULT_OPEN_DURATION = 267;
@@ -561,6 +563,11 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         getWindowInsetsController().hide(WindowInsets.Type.ime());
     }
 
+    @Override
+    public void clearSearchBarFocus() {
+        mSearchAndRecommendationViewHolder.mSearchBar.clearSearchBarFocus();
+    }
+
     /** A holder class for holding adapters & their corresponding recycler view. */
     private final class AdapterHolder {
         static final int PRIMARY = 0;
@@ -583,7 +590,9 @@ public class WidgetsFullSheet extends BaseWidgetSheet
                     apps.getWidgetCache(),
                     apps.getIconCache(),
                     /* iconClickListener= */ WidgetsFullSheet.this,
-                    /* iconLongClickListener= */ WidgetsFullSheet.this);
+                    /* iconLongClickListener= */ WidgetsFullSheet.this,
+                    /* WidgetsSearchBarUIHelper= */
+                    mAdapterType == SEARCH ? WidgetsFullSheet.this : null);
             mWidgetsListAdapter.setHasStableIds(true);
             switch (mAdapterType) {
                 case PRIMARY:
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
index d841c64a3c..d9c9d4d71b 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
@@ -41,6 +41,7 @@ import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 import com.android.launcher3.widget.model.WidgetsListContentEntry;
 import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
 import com.android.launcher3.widget.model.WidgetsListSearchHeaderEntry;
+import com.android.launcher3.widget.picker.search.WidgetsSearchBarUIHelper;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -69,6 +70,7 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
     private static final int VIEW_TYPE_WIDGETS_HEADER = R.id.view_type_widgets_header;
     private static final int VIEW_TYPE_WIDGETS_SEARCH_HEADER = R.id.view_type_widgets_search_header;
 
+    @Nullable private final WidgetsSearchBarUIHelper mSearchBarUIHelper;
     private final WidgetsDiffReporter mDiffReporter;
     private final SparseArray<ViewHolderBinder> mViewHolderBinders = new SparseArray<>();
     private final WidgetsListTableViewHolderBinder mWidgetsListTableViewHolderBinder;
@@ -88,7 +90,9 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
 
     public WidgetsListAdapter(Context context, LayoutInflater layoutInflater,
             WidgetPreviewLoader widgetPreviewLoader, IconCache iconCache,
-            OnClickListener iconClickListener, OnLongClickListener iconLongClickListener) {
+            OnClickListener iconClickListener, OnLongClickListener iconLongClickListener,
+            @Nullable WidgetsSearchBarUIHelper searchBarUIHelper) {
+        mSearchBarUIHelper = searchBarUIHelper;
         mDiffReporter = new WidgetsDiffReporter(iconCache, this);
         mWidgetsListTableViewHolderBinder = new WidgetsListTableViewHolderBinder(context,
                 layoutInflater, iconClickListener, iconLongClickListener,
@@ -237,6 +241,9 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
 
     @Override
     public void onHeaderClicked(boolean showWidgets, PackageUserKey packageUserKey) {
+        if (mSearchBarUIHelper != null) {
+            mSearchBarUIHelper.clearSearchBarFocus();
+        }
         if (showWidgets) {
             mWidgetsContentVisiblePackageUserKey = packageUserKey;
             updateVisibleEntries();
diff --git a/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java b/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java
index cc336196ae..56a08b16fb 100644
--- a/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java
+++ b/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java
@@ -79,4 +79,9 @@ public class LauncherWidgetsSearchBar extends LinearLayout implements WidgetsSea
         super.onDetachedFromWindow();
         mController.onDestroy();
     }
+
+    @Override
+    public void clearSearchBarFocus() {
+        mController.clearFocus();
+    }
 }
diff --git a/src/com/android/launcher3/widget/picker/search/WidgetsSearchBar.java b/src/com/android/launcher3/widget/picker/search/WidgetsSearchBar.java
index ef7bf23226..3ac82c0ca7 100644
--- a/src/com/android/launcher3/widget/picker/search/WidgetsSearchBar.java
+++ b/src/com/android/launcher3/widget/picker/search/WidgetsSearchBar.java
@@ -34,6 +34,11 @@ public interface WidgetsSearchBar {
      */
     void reset();
 
+    /**
+     * Clears focus from search bar.
+     */
+    void clearSearchBarFocus();
+
     /**
      * Sets the vertical location, in pixels, of this search bar relative to its top position.
      */
diff --git a/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarController.java b/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarController.java
index 60110977ed..d35a75b80a 100644
--- a/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarController.java
+++ b/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarController.java
@@ -103,8 +103,7 @@ public class WidgetsSearchBarController implements TextWatcher,
     public void clearSearchResult() {
         mSearchAlgorithm.cancel(/* interruptActiveRequests= */ true);
         mInput.getText().clear();
-        mInput.clearFocus();
-        mInput.hideKeyboard();
+        clearFocus();
         mSearchModeListener.exitSearchMode();
     }
 
@@ -117,18 +116,24 @@ public class WidgetsSearchBarController implements TextWatcher,
 
     @Override
     public boolean onBackKey() {
-        mInput.clearFocus();
-        mInput.hideKeyboard();
+        clearFocus();
         return true;
     }
 
     @Override
     public boolean onKey(View view, int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_UP) {
-            mInput.clearFocus();
-            mInput.hideKeyboard();
+            clearFocus();
             return true;
         }
         return false;
     }
+
+    /**
+     * Clears focus from edit text.
+     */
+    public void clearFocus() {
+        mInput.clearFocus();
+        mInput.hideKeyboard();
+    }
 }
diff --git a/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarUIHelper.java b/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarUIHelper.java
new file mode 100644
index 0000000000..edfdc655ed
--- /dev/null
+++ b/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarUIHelper.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.widget.picker.search;
+
+/**
+ * UI helper for {@link WidgetsSearchBar}.
+ */
+public interface WidgetsSearchBarUIHelper {
+    /**
+     * Clears focus from the search bar.
+     */
+    void clearSearchBarFocus();
+}
-- 
GitLab


From 375a1bbb929ae5ce723e3466d8f0ea6d2a71f5de Mon Sep 17 00:00:00 2001
From: Jon Spivack <spivack@google.com>
Date: Wed, 24 Mar 2021 04:01:26 -0700
Subject: [PATCH 0761/1664] TaskOverlayFactoryGo: Minor updates for testability

Made a few things public and marked them as @VisibleForTesting.

Bug: 179738220
Test: atest -v LauncherGoGoogleRoboTests
Change-Id: I231316ecf9282ad4d54038e218f44f062b3fa413
---
 .../android/quickstep/TaskOverlayFactoryGo.java  | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
index 36a4e7fa35..3a473449ae 100644
--- a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
+++ b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
@@ -36,6 +36,8 @@ import android.os.SystemClock;
 import android.text.TextUtils;
 import android.util.Log;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.launcher3.R;
 import com.android.quickstep.views.OverviewActionsView;
 import com.android.quickstep.views.TaskThumbnailView;
@@ -51,6 +53,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
     public static final String ACTION_SEARCH = "com.android.quickstep.ACTION_SEARCH";
     public static final String ELAPSED_NANOS = "niu_actions_elapsed_realtime_nanos";
     public static final String ACTIONS_URL = "niu_actions_app_url";
+    private static final String ASSIST_KEY_CONTENT = "content";
     private static final String TAG = "TaskOverlayFactoryGo";
 
     // Empty constructor required for ResourceBasedOverride
@@ -68,8 +71,6 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
      * @param <T> The type of View in which the overlay will be placed
      */
     public static final class TaskOverlayGo<T extends OverviewActionsView> extends TaskOverlay {
-        private static final String ASSIST_KEY_CONTENT = "content";
-
         private String mNIUPackageName;
         private int mTaskId;
         private Bundle mAssistData;
@@ -122,7 +123,11 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
             });
         }
 
-        private void sendNIUIntent(String actionType) {
+        /**
+         * Creates and sends an Intent corresponding to the button that was clicked
+         */
+        @VisibleForTesting
+        public void sendNIUIntent(String actionType) {
             Intent intent = createNIUIntent(actionType);
             mImageApi.shareAsDataWithExplicitIntent(/* crop */ null, intent);
         }
@@ -178,6 +183,11 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
                 }
             }
         }
+
+        @VisibleForTesting
+        public void setImageActionsAPI(ImageActionsApi imageActionsApi) {
+            mImageApi = imageActionsApi;
+        }
     }
 
     /**
-- 
GitLab


From a4cb0f02de08baf3ad1b8c3f0d0f9be523ee53aa Mon Sep 17 00:00:00 2001
From: Andras Kloczl <andraskloczl@google.com>
Date: Sun, 21 Mar 2021 00:23:07 +0100
Subject: [PATCH 0762/1664] Fix staggered animation on right panel home screen

Recently we have added support for multiple panels
on the home screen but the current StaggeredWorkspaceAnim
logic only supports animation for the leftmost panel.

Test: manual
Bug: 183032642
Change-Id: I539e1c1a26292b75801eb3070e22f0fbde1ebc7e
---
 .../util/StaggeredWorkspaceAnim.java          | 50 ++++++++++++-------
 src/com/android/launcher3/PagedView.java      |  2 +-
 2 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
index 3faf72a006..ce0ad77da3 100644
--- a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
+++ b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
@@ -83,34 +83,25 @@ public class StaggeredWorkspaceAnim {
 
         DeviceProfile grid = launcher.getDeviceProfile();
         Workspace workspace = launcher.getWorkspace();
-        CellLayout cellLayout = (CellLayout) workspace.getChildAt(workspace.getCurrentPage());
-        ShortcutAndWidgetContainer currentPage = cellLayout.getShortcutsAndWidgets();
         Hotseat hotseat = launcher.getHotseat();
 
+        // Hotseat and QSB takes up two additional rows.
+        int totalRows = grid.inv.numRows + (grid.isVerticalBarLayout() ? 0 : 2);
+
+        // Add animation for all the visible workspace pages
+        workspace.getVisiblePages()
+                .forEach(page -> addAnimationForPage((CellLayout) page, totalRows));
+
         boolean workspaceClipChildren = workspace.getClipChildren();
         boolean workspaceClipToPadding = workspace.getClipToPadding();
-        boolean cellLayoutClipChildren = cellLayout.getClipChildren();
-        boolean cellLayoutClipToPadding = cellLayout.getClipToPadding();
         boolean hotseatClipChildren = hotseat.getClipChildren();
         boolean hotseatClipToPadding = hotseat.getClipToPadding();
 
         workspace.setClipChildren(false);
         workspace.setClipToPadding(false);
-        cellLayout.setClipChildren(false);
-        cellLayout.setClipToPadding(false);
         hotseat.setClipChildren(false);
         hotseat.setClipToPadding(false);
 
-        // Hotseat and QSB takes up two additional rows.
-        int totalRows = grid.inv.numRows + (grid.isVerticalBarLayout() ? 0 : 2);
-
-        // Set up springs on workspace items.
-        for (int i = currentPage.getChildCount() - 1; i >= 0; i--) {
-            View child = currentPage.getChildAt(i);
-            CellLayout.LayoutParams lp = ((CellLayout.LayoutParams) child.getLayoutParams());
-            addStaggeredAnimationForView(child, lp.cellY + lp.cellVSpan, totalRows);
-        }
-
         // Set up springs for the hotseat and qsb.
         ViewGroup hotseatIcons = hotseat.getShortcutsAndWidgets();
         if (grid.isVerticalBarLayout()) {
@@ -155,14 +146,37 @@ public class StaggeredWorkspaceAnim {
             public void onAnimationEnd(Animator animation) {
                 workspace.setClipChildren(workspaceClipChildren);
                 workspace.setClipToPadding(workspaceClipToPadding);
-                cellLayout.setClipChildren(cellLayoutClipChildren);
-                cellLayout.setClipToPadding(cellLayoutClipToPadding);
                 hotseat.setClipChildren(hotseatClipChildren);
                 hotseat.setClipToPadding(hotseatClipToPadding);
             }
         });
     }
 
+    private void addAnimationForPage(CellLayout page, int totalRows) {
+        ShortcutAndWidgetContainer itemsContainer = page.getShortcutsAndWidgets();
+
+        boolean pageClipChildren = page.getClipChildren();
+        boolean pageClipToPadding = page.getClipToPadding();
+
+        page.setClipChildren(false);
+        page.setClipToPadding(false);
+
+        // Set up springs on workspace items.
+        for (int i = itemsContainer.getChildCount() - 1; i >= 0; i--) {
+            View child = itemsContainer.getChildAt(i);
+            CellLayout.LayoutParams lp = ((CellLayout.LayoutParams) child.getLayoutParams());
+            addStaggeredAnimationForView(child, lp.cellY + lp.cellVSpan, totalRows);
+        }
+
+        mAnimators.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                page.setClipChildren(pageClipChildren);
+                page.setClipToPadding(pageClipToPadding);
+            }
+        });
+    }
+
     /**
      * Setup workspace with 0 duration to prepare for our staggered animation.
      */
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 72eff620d7..65fde8659a 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -307,7 +307,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
     /**
      * Returns the currently visible pages.
      */
-    protected Iterable<View> getVisiblePages() {
+    public Iterable<View> getVisiblePages() {
         int panelCount = getPanelCount();
         List<View> visiblePages = new ArrayList<>(panelCount);
         for (int i = mCurrentPage; i < mCurrentPage + panelCount; i++) {
-- 
GitLab


From 73c8a366a86aef554f6588eb44c68955cb23b338 Mon Sep 17 00:00:00 2001
From: Yogisha Dixit <ydixit@google.com>
Date: Sun, 21 Mar 2021 20:10:06 +0000
Subject: [PATCH 0763/1664] Add a button for reconfiguring widgets.

Test: manual
Bug: 183316993
Change-Id: I17bec121e3d07d65979c2b92c285e487a7d64d65
---
 res/drawable/gm_edit_24.xml                   | 10 ++++++
 .../widget_reconfigure_button_frame.xml       | 32 +++++++++++++++++++
 res/layout/app_widget_resize_frame.xml        | 12 +++++++
 res/values/dimens.xml                         |  6 ++++
 .../launcher3/AppWidgetResizeFrame.java       | 25 +++++++++++++++
 .../widget/LauncherAppWidgetProviderInfo.java |  4 +++
 6 files changed, 89 insertions(+)
 create mode 100644 res/drawable/gm_edit_24.xml
 create mode 100644 res/drawable/widget_reconfigure_button_frame.xml

diff --git a/res/drawable/gm_edit_24.xml b/res/drawable/gm_edit_24.xml
new file mode 100644
index 0000000000..59a0dc2faf
--- /dev/null
+++ b/res/drawable/gm_edit_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M20.41,4.94l-1.35,-1.35c-0.78,-0.78 -2.05,-0.78 -2.83,0L3,16.82L3,21h4.18L20.41,7.77c0.79,-0.78 0.79,-2.05 0,-2.83zM6.41,19.06L5,19v-1.36l9.82,-9.82 1.41,1.41 -9.82,9.83z"/>
+</vector>
diff --git a/res/drawable/widget_reconfigure_button_frame.xml b/res/drawable/widget_reconfigure_button_frame.xml
new file mode 100644
index 0000000000..37d93ade95
--- /dev/null
+++ b/res/drawable/widget_reconfigure_button_frame.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:width="@dimen/widget_reconfigure_button_size"
+        android:height="@dimen/widget_reconfigure_button_size">
+        <shape
+            android:shape="rectangle">
+            <solid android:color="?android:attr/colorAccent" />
+            <corners android:radius="@dimen/widget_reconfigure_button_corner_radius" />
+        </shape>
+    </item>
+    <item
+        android:gravity="center"
+        android:padding="@dimen/widget_reconfigure_button_padding"
+        android:drawable="@drawable/gm_edit_24"
+        android:color="?android:attr/colorPrimary" />
+</layer-list>
diff --git a/res/layout/app_widget_resize_frame.xml b/res/layout/app_widget_resize_frame.xml
index 671dbc63c0..53db5edd8a 100644
--- a/res/layout/app_widget_resize_frame.xml
+++ b/res/layout/app_widget_resize_frame.xml
@@ -73,5 +73,17 @@
             android:src="@drawable/ic_widget_resize_handle"
             android:tint="?android:attr/colorAccent" />
 
+        <ImageButton
+            android:id="@+id/widget_reconfigure_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/widget_reconfigure_button_padding"
+            android:layout_gravity="bottom|end"
+            android:layout_marginBottom="@dimen/widget_reconfigure_button_margin"
+            android:layout_marginEnd="@dimen/widget_reconfigure_button_margin"
+            android:src="@drawable/widget_reconfigure_button_frame"
+            android:background="?android:attr/selectableItemBackground"
+            android:visibility="gone" />
+
     </FrameLayout>
 </com.android.launcher3.AppWidgetResizeFrame>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index cf830c7ed4..c051d6d4e6 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -56,6 +56,12 @@
     <dimen name="resize_frame_background_padding">24dp</dimen>
     <dimen name="resize_frame_margin">22dp</dimen>
 
+    <!-- App widget reconfigure button -->
+    <dimen name="widget_reconfigure_button_corner_radius">14dp</dimen>
+    <dimen name="widget_reconfigure_button_padding">6dp</dimen>
+    <dimen name="widget_reconfigure_button_margin">32dp</dimen>
+    <dimen name="widget_reconfigure_button_size">36dp</dimen>
+
 <!-- Fast scroll -->
     <dimen name="fastscroll_track_min_width">6dp</dimen>
     <dimen name="fastscroll_track_max_width">8dp</dimen>
diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java
index ab9178556e..5d41bb5c3e 100644
--- a/src/com/android/launcher3/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher3/AppWidgetResizeFrame.java
@@ -22,6 +22,7 @@ import android.util.SizeF;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 
 import androidx.annotation.Nullable;
@@ -74,6 +75,7 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
     private LauncherAppWidgetHostView mWidgetView;
     private CellLayout mCellLayout;
     private DragLayer mDragLayer;
+    private ImageButton mReconfigureButton;
 
     private Rect mWidgetPadding;
 
@@ -211,6 +213,17 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
             mDragHandles[INDEX_RIGHT].setVisibility(GONE);
         }
 
+        mReconfigureButton = (ImageButton) findViewById(R.id.widget_reconfigure_button);
+        if (info.isReconfigurable()) {
+            mReconfigureButton.setVisibility(VISIBLE);
+            mReconfigureButton.setOnClickListener(view -> mLauncher
+                    .getAppWidgetHost()
+                    .startConfigActivity(
+                            mLauncher,
+                            mWidgetView.getAppWidgetId(),
+                            Launcher.REQUEST_RECONFIGURE_APPWIDGET));
+        }
+
         // When we create the resize frame, we first mark all cells as unoccupied. The appropriate
         // cells (same if not resized, or different) will be marked as occupied when the resize
         // frame is dismissed.
@@ -582,6 +595,13 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
         return false;
     }
 
+    private boolean isTouchOnReconfigureButton(MotionEvent ev) {
+        int xFrame = (int) ev.getX() - getLeft();
+        int yFrame = (int) ev.getY() - getTop();
+        mReconfigureButton.getHitRect(sTmpRect);
+        return sTmpRect.contains(xFrame, yFrame);
+    }
+
     @Override
     public boolean onControllerTouchEvent(MotionEvent ev) {
         int action = ev.getAction();
@@ -609,6 +629,11 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
         if (ev.getAction() == MotionEvent.ACTION_DOWN && handleTouchDown(ev)) {
             return true;
         }
+        // Keep the resize frame open but let a click on the reconfigure button fall through to the
+        // button's OnClickListener.
+        if (isTouchOnReconfigureButton(ev)) {
+            return false;
+        }
         close(false);
         return false;
     }
diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java b/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
index 8689fbfd3c..ad61495de8 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
@@ -139,6 +139,10 @@ public class LauncherAppWidgetProviderInfo extends AppWidgetProviderInfo
         }
     }
 
+    public boolean isReconfigurable() {
+        return configure != null && (getWidgetFeatures() & WIDGET_FEATURE_RECONFIGURABLE) != 0;
+    }
+
     @Override
     public final ComponentName getComponent() {
         return provider;
-- 
GitLab


From 334efebaba9f17d9fc79bfdee1a610d6d626dc7c Mon Sep 17 00:00:00 2001
From: Zak Cohen <zakcohen@google.com>
Date: Fri, 19 Mar 2021 16:42:07 -0700
Subject: [PATCH 0764/1664] Overview - Adds first pass at making landscape
 layout real.

Adds dynamic sizing to margins around task view, also creates space in the
overview actions view in landscape to make space for the proactive chips if
needed.

Bug: 182529089
Test: Local build and run on two devices
Change-Id: I447de3564a3249ede4e8e8a4d3e5d1c177f6be61
---
 .../res/layout/overview_clear_all_button.xml  |  3 +-
 quickstep/res/layout/task.xml                 |  5 +--
 quickstep/res/values-land/dimens.xml          |  2 ++
 quickstep/res/values/dimens.xml               |  4 ---
 .../quickstep/BaseActivityInterface.java      | 26 ++++++++-------
 .../quickstep/util/TaskViewSimulator.java     |  6 ++--
 .../quickstep/views/ClearAllButton.java       | 15 ++++++---
 .../quickstep/views/OverviewActionsView.java  | 13 ++++++++
 .../android/quickstep/views/RecentsView.java  | 18 +++++------
 .../android/quickstep/views/TaskMenuView.java |  7 ++--
 .../com/android/quickstep/views/TaskView.java | 32 +++++++++----------
 res/values/dimens.xml                         |  4 +++
 src/com/android/launcher3/DeviceProfile.java  |  9 ++++++
 13 files changed, 87 insertions(+), 57 deletions(-)

diff --git a/quickstep/res/layout/overview_clear_all_button.xml b/quickstep/res/layout/overview_clear_all_button.xml
index 34ff91df9a..c61610a438 100644
--- a/quickstep/res/layout/overview_clear_all_button.xml
+++ b/quickstep/res/layout/overview_clear_all_button.xml
@@ -22,5 +22,4 @@
     android:layout_height="wrap_content"
     android:text="@string/recents_clear_all"
     android:textColor="?attr/workspaceTextColor"
-    android:textSize="14sp"
-    android:translationY="@dimen/task_thumbnail_half_top_margin" />
\ No newline at end of file
+    android:textSize="14sp" />
\ No newline at end of file
diff --git a/quickstep/res/layout/task.xml b/quickstep/res/layout/task.xml
index 0f9a6aad6f..7e5b85c41d 100644
--- a/quickstep/res/layout/task.xml
+++ b/quickstep/res/layout/task.xml
@@ -13,6 +13,8 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
+<!-- NOTE! don't add dimensions for margins / paddings / sizes that change per orientation to this
+     file, they need to be loaded at runtime. -->
 <com.android.quickstep.views.TaskView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
@@ -24,8 +26,7 @@
     <com.android.quickstep.views.TaskThumbnailView
         android:id="@+id/snapshot"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="@dimen/task_thumbnail_top_margin"/>
+        android:layout_height="match_parent"/>
 
     <com.android.quickstep.views.IconView
         android:id="@+id/icon"
diff --git a/quickstep/res/values-land/dimens.xml b/quickstep/res/values-land/dimens.xml
index c03eaa2cf1..7cb01f6261 100644
--- a/quickstep/res/values-land/dimens.xml
+++ b/quickstep/res/values-land/dimens.xml
@@ -16,4 +16,6 @@
 -->
 <resources>
     <dimen name="task_card_menu_horizontal_padding">24dp</dimen>
+
+    <dimen name="overview_task_margin">8dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 755bce8612..0ff11c5f5e 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -15,11 +15,7 @@
 -->
 
 <resources>
-
-    <dimen name="task_thumbnail_top_margin">80dp</dimen>
-    <dimen name="task_thumbnail_half_top_margin">40dp</dimen>
     <dimen name="task_thumbnail_icon_size">48dp</dimen>
-    <dimen name="task_icon_top_margin">16dp</dimen>
     <!-- For screens without rounded corners -->
     <dimen name="task_corner_radius_small">2dp</dimen>
 
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index 5942b3aaf4..462630cac3 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -201,14 +201,18 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
             PagedOrientationHandler orientedState) {
         Resources res = context.getResources();
 
-        int taskMargin = res.getDimensionPixelSize(R.dimen.overview_task_margin);
-        int taskIconAndMargin = res.getDimensionPixelSize(R.dimen.task_thumbnail_icon_size)
-                + res.getDimensionPixelSize(R.dimen.task_icon_top_margin);
-        int proactiveRowAndMargin = res.getDimensionPixelSize(R.dimen.overview_proactive_row_height)
-                + res.getDimensionPixelSize(R.dimen.overview_proactive_row_bottom_margin);
-
+        int taskMargin = dp.overviewTaskMarginPx;
+        int proactiveRowAndMargin;
+        if (dp.isVerticalBarLayout()) {
+            // In Vertical Bar Layout the proactive row doesn't have its own space, it's inside
+            // the actions row.
+            proactiveRowAndMargin = 0;
+        } else {
+            proactiveRowAndMargin = res.getDimensionPixelSize(R.dimen.overview_proactive_row_height)
+                    + res.getDimensionPixelSize(R.dimen.overview_proactive_row_bottom_margin);
+        }
         calculateTaskSizeInternal(context, dp,
-                taskIconAndMargin + taskMargin,
+                dp.overviewTaskThumbnailTopMarginPx,
                 proactiveRowAndMargin + getOverviewActionsHeight(context) + taskMargin,
                 res.getDimensionPixelSize(R.dimen.overview_minimum_next_prev_size) + taskMargin,
                 outRect);
@@ -267,13 +271,11 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
      * Calculates the modal taskView size for the provided device configuration
      */
     public final void calculateModalTaskSize(Context context, DeviceProfile dp, Rect outRect) {
-        Resources res = context.getResources();
         calculateTaskSizeInternal(
                 context, dp,
-                res.getDimensionPixelSize(R.dimen.overview_task_margin),
-                getOverviewActionsHeight(context)
-                        + res.getDimensionPixelSize(R.dimen.overview_task_margin),
-                res.getDimensionPixelSize(R.dimen.overview_task_margin),
+                dp.overviewTaskMarginPx,
+                getOverviewActionsHeight(context) + dp.overviewTaskMarginPx,
+                dp.overviewTaskMarginPx,
                 outRect);
     }
 
diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index 8b5d4989a4..c60d072e94 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -112,7 +112,6 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
     private boolean mLayoutValid = false;
     private boolean mScrollValid = false;
     private int mOrientationStateId;
-    private final int mTaskThumbnailPadding;
     private final int mRowSpacing;
 
     public TaskViewSimulator(Context context, BaseActivityInterface sizeStrategy) {
@@ -125,7 +124,6 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
         mOrientationStateId = mOrientationState.getStateId();
         Resources resources = context.getResources();
         mIsRecentsRtl = mOrientationState.getOrientationHandler().getRecentsRtlSetting(resources);
-        mTaskThumbnailPadding = (int) resources.getDimension(R.dimen.task_thumbnail_top_margin);
         mRowSpacing = (int) resources.getDimension(R.dimen.overview_grid_row_spacing);
     }
 
@@ -314,7 +312,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
         final int boxLength = (int) Math.max(taskWidth, taskHeight);
         float availableHeight = mGridRect.height();
         float rowHeight = (availableHeight - mRowSpacing) / 2;
-        float gridScale = rowHeight / (boxLength + mTaskThumbnailPadding);
+        float gridScale = rowHeight / (boxLength + mDp.overviewTaskThumbnailTopMarginPx);
         scale = Utilities.mapRange(interpolatedGridProgress, 1f, gridScale);
         mMatrix.postScale(scale, scale, mIsRecentsRtl ? 0 : taskWidth, 0);
         mOrientationState.getOrientationHandler().setSecondary(mMatrix, MATRIX_POST_TRANSLATE,
@@ -331,7 +329,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
             taskGridHorizontalDiff = mGridRect.left - taskLeft;
         }
         float taskGridVerticalDiff =
-                mGridRect.top + mTaskThumbnailPadding * gridScale - mTaskRect.top;
+                mGridRect.top + mDp.overviewTaskThumbnailTopMarginPx * gridScale - mTaskRect.top;
         mOrientationState.getOrientationHandler().set(mMatrix, MATRIX_POST_TRANSLATE,
                 Utilities.mapRange(interpolatedGridProgress, 0, taskGridHorizontalDiff));
         mOrientationState.getOrientationHandler().setSecondary(mMatrix, MATRIX_POST_TRANSLATE,
diff --git a/quickstep/src/com/android/quickstep/views/ClearAllButton.java b/quickstep/src/com/android/quickstep/views/ClearAllButton.java
index e7101ccfe9..dbeff43f87 100644
--- a/quickstep/src/com/android/quickstep/views/ClearAllButton.java
+++ b/quickstep/src/com/android/quickstep/views/ClearAllButton.java
@@ -21,6 +21,7 @@ import android.util.AttributeSet;
 import android.util.FloatProperty;
 import android.widget.Button;
 
+import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.quickstep.views.RecentsView.PageCallbacks;
 import com.android.quickstep.views.RecentsView.ScrollState;
@@ -40,13 +41,13 @@ public class ClearAllButton extends Button implements PageCallbacks {
                 }
             };
 
+    private final StatefulActivity mActivity;
     private float mScrollAlpha = 1;
     private float mContentAlpha = 1;
     private float mVisibilityAlpha = 1;
     private float mGridProgress = 1;
 
     private boolean mIsRtl;
-    private final float mOriginalTranslationX, mOriginalTranslationY;
     private float mNormalTranslationPrimary;
     private float mGridTranslationPrimary;
 
@@ -55,8 +56,7 @@ public class ClearAllButton extends Button implements PageCallbacks {
     public ClearAllButton(Context context, AttributeSet attrs) {
         super(context, attrs);
         mIsRtl = getLayoutDirection() == LAYOUT_DIRECTION_RTL;
-        mOriginalTranslationX = getTranslationX();
-        mOriginalTranslationY = getTranslationY();
+        mActivity = StatefulActivity.fromContext(context);
     }
 
     @Override
@@ -114,7 +114,7 @@ public class ClearAllButton extends Button implements PageCallbacks {
         mNormalTranslationPrimary = mIsRtl ? (mScrollOffset - shift) : (mScrollOffset + shift);
         applyPrimaryTranslation();
         orientationHandler.getSecondaryViewTranslate().set(this,
-                orientationHandler.getSecondaryValue(mOriginalTranslationX, mOriginalTranslationY));
+                orientationHandler.getSecondaryValue(0f, getOriginalTranslationY()));
         mScrollAlpha = 1 - shift / orientationSize;
         updateAlpha();
     }
@@ -166,4 +166,11 @@ public class ClearAllButton extends Button implements PageCallbacks {
     private float getGridTrans(float endTranslation) {
         return mGridProgress > 0 ? endTranslation : 0;
     }
+
+    /**
+     * Get the Y translation that is set in the original layout position, before scrolling.
+     */
+    private float getOriginalTranslationY() {
+        return mActivity.getDeviceProfile().overviewTaskThumbnailTopMarginPx / 2.0f;
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
index 1241982040..6fcd54cf62 100644
--- a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
+++ b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
@@ -29,6 +29,7 @@ import android.widget.FrameLayout;
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
 
+import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Insettable;
 import com.android.launcher3.R;
 import com.android.launcher3.util.MultiValueAlpha;
@@ -144,6 +145,7 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
     public void setInsets(Rect insets) {
         mInsets.set(insets);
         updateVerticalMargin(SysUINavigationMode.getMode(getContext()));
+        updateHorizontalPadding();
     }
 
     public void updateHiddenFlags(@ActionsHiddenFlags int visibilityFlags, boolean enable) {
@@ -187,6 +189,10 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
         return mMultiValueAlpha.getProperty(INDEX_FULLSCREEN_ALPHA);
     }
 
+    private void updateHorizontalPadding() {
+        setPadding(mInsets.left, 0, mInsets.right, 0);
+    }
+
     /** Updates vertical margins for different navigation mode or configuration changes. */
     public void updateVerticalMargin(Mode mode) {
         LayoutParams actionParams = (LayoutParams) findViewById(
@@ -196,6 +202,13 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
                 getBottomVerticalMargin(mode));
     }
 
+    /**
+     * Set the device profile for this view to draw with.
+     */
+    public void setDp(DeviceProfile dp) {
+        requestLayout();
+    }
+
     protected int getBottomVerticalMargin(Mode mode) {
         int bottomMargin;
         int orientation = getResources().getConfiguration().orientation;
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 4d8176c7e5..d637bb4aca 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -310,7 +310,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     protected final T mActivity;
     private final float mFastFlingVelocity;
     private final RecentsModel mModel;
-    private final int mTaskTopMargin;
     private final int mRowSpacing;
     private final ClearAllButton mClearAllButton;
     private final Rect mClearAllButtonDeadZoneRect = new Rect();
@@ -529,8 +528,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
 
         mIsRtl = mOrientationHandler.getRecentsRtlSetting(getResources());
         setLayoutDirection(mIsRtl ? View.LAYOUT_DIRECTION_RTL : View.LAYOUT_DIRECTION_LTR);
-        mTaskTopMargin = getResources()
-                .getDimensionPixelSize(R.dimen.task_thumbnail_top_margin);
         mRowSpacing = getResources().getDimensionPixelSize(R.dimen.overview_grid_row_spacing);
         mSquaredTouchSlop = squaredTouchSlop(context);
 
@@ -1066,7 +1063,9 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     public void setInsets(Rect insets) {
         mInsets.set(insets);
         resetPaddingFromTaskSize();
-        mLiveTileTaskViewSimulator.setDp(mActivity.getDeviceProfile());
+        DeviceProfile dp = mActivity.getDeviceProfile();
+        mLiveTileTaskViewSimulator.setDp(dp);
+        mActionsView.setDp(dp);
     }
 
     private void resetPaddingFromTaskSize() {
@@ -1075,7 +1074,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mTaskWidth = mTempRect.width();
         mTaskHeight = mTempRect.height();
 
-        mTempRect.top -= mTaskTopMargin;
+        mTempRect.top -= dp.overviewTaskThumbnailTopMarginPx;
         setPadding(mTempRect.left - mInsets.left, mTempRect.top - mInsets.top,
                 dp.widthPx - mInsets.right - mTempRect.right,
                 dp.heightPx - mInsets.bottom - mTempRect.bottom);
@@ -1602,7 +1601,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         final int boxLength = Math.max(mTaskWidth, mTaskHeight);
         float availableHeight = mLastComputedGridSize.height();
         float rowHeight = (availableHeight - mRowSpacing) / 2;
-        float gridScale = rowHeight / (boxLength + mTaskTopMargin);
+        int taskTopMargin = mActivity.getDeviceProfile().overviewTaskThumbnailTopMarginPx;
+        float gridScale = rowHeight / (boxLength + taskTopMargin);
 
         int topRowWidth = 0;
         int bottomRowWidth = 0;
@@ -1635,7 +1635,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             gridTranslations[i] -= taskGridHorizontalDiff;
             taskView.setGridOffsetTranslationX(taskGridHorizontalDiff);
 
-            float taskGridVerticalDiff = mLastComputedGridSize.top + mTaskTopMargin * gridScale
+            float taskGridVerticalDiff = mLastComputedGridSize.top + taskTopMargin * gridScale
                     - mLastComputedTaskSize.top;
 
             // Off-set gap due to task scaling.
@@ -1669,7 +1669,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                 bottomSet.add(i);
 
                 // Move into bottom row.
-                float heightOffset = (boxLength + mTaskTopMargin) * gridScale + mRowSpacing;
+                float heightOffset = (boxLength + taskTopMargin) * gridScale + mRowSpacing;
                 taskView.setGridTranslationY(heightOffset + taskGridVerticalDiff);
 
                 // Move horizontally into empty space.
@@ -2485,7 +2485,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             if (child == mSplitHiddenTaskView) {
 
                 int left = newScroll[i] + getPaddingStart();
-                int topMargin = mSplitHiddenTaskView.getThumbnailTopMargin();
+                int topMargin = mActivity.getDeviceProfile().overviewTaskThumbnailTopMarginPx;
                 int top = -mSplitHiddenTaskView.getHeight() - locationOnScreen[1];
                 mSplitHiddenTaskView.layout(left, top,
                         left + mSplitHiddenTaskView.getWidth(),
diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
index a5b7a5b575..a46daf38fd 100644
--- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
@@ -58,7 +58,6 @@ public class TaskMenuView extends AbstractFloatingView {
     private static final int REVEAL_OPEN_DURATION = 150;
     private static final int REVEAL_CLOSE_DURATION = 100;
 
-    private final float mThumbnailTopMargin;
     private BaseDraggingActivity mActivity;
     private TextView mTaskName;
     private AnimatorSet mOpenCloseAnimator;
@@ -73,7 +72,6 @@ public class TaskMenuView extends AbstractFloatingView {
         super(context, attrs, defStyleAttr);
 
         mActivity = BaseDraggingActivity.fromContext(context);
-        mThumbnailTopMargin = getResources().getDimension(R.dimen.task_thumbnail_top_margin);
         setClipToOutline(true);
     }
 
@@ -123,14 +121,15 @@ public class TaskMenuView extends AbstractFloatingView {
     }
 
     public void setPosition(float x, float y, PagedOrientationHandler pagedOrientationHandler) {
-        float adjustedY = y + mThumbnailTopMargin;
+        int taskTopMargin = mActivity.getDeviceProfile().overviewTaskThumbnailTopMarginPx;
+        float adjustedY = y + taskTopMargin;
         // Changing pivot to make computations easier
         // NOTE: Changing the pivots means the rotated view gets rotated about the new pivots set,
         // which would render the X and Y position set here incorrect
         setPivotX(0);
         if (mActivity.getDeviceProfile().isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get()) {
             // In tablet, set pivotY to original position without mThumbnailTopMargin adjustment.
-            setPivotY(-mThumbnailTopMargin);
+            setPivotY(-taskTopMargin);
         } else {
             setPivotY(0);
         }
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index a2acab880f..be044e7c48 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -376,7 +376,8 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         mCurrentFullscreenParams = new FullscreenDrawParams(context);
         mDigitalWellBeingToast = new DigitalWellBeingToast(mActivity, this);
 
-        mOutlineProvider = new TaskOutlineProvider(getContext(), mCurrentFullscreenParams);
+        mOutlineProvider = new TaskOutlineProvider(getContext(), mCurrentFullscreenParams,
+                mActivity.getDeviceProfile().overviewTaskThumbnailTopMarginPx);
         setOutlineProvider(mOutlineProvider);
     }
 
@@ -673,16 +674,12 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         }
     }
 
-    public int getThumbnailTopMargin() {
-        return (int) getResources().getDimension(R.dimen.task_thumbnail_top_margin);
-    }
-
     public void setOrientationState(RecentsOrientedState orientationState) {
         PagedOrientationHandler orientationHandler = orientationState.getOrientationHandler();
         boolean isRtl = getLayoutDirection() == LAYOUT_DIRECTION_RTL;
         LayoutParams snapshotParams = (LayoutParams) mSnapshotView.getLayoutParams();
-        int thumbnailPadding = (int) getResources().getDimension(R.dimen.task_thumbnail_top_margin);
-        int taskIconMargin = (int) getResources().getDimension(R.dimen.task_icon_top_margin);
+        snapshotParams.topMargin = mActivity.getDeviceProfile().overviewTaskThumbnailTopMarginPx;
+        int taskIconMargin = mActivity.getDeviceProfile().overviewTaskMarginPx;
         int taskIconHeight = (int) getResources().getDimension(R.dimen.task_thumbnail_icon_size);
         LayoutParams iconParams = (LayoutParams) mIconView.getLayoutParams();
         switch (orientationHandler.getRotation()) {
@@ -694,7 +691,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
                 break;
             case ROTATION_180:
                 iconParams.gravity = BOTTOM | CENTER_HORIZONTAL;
-                iconParams.bottomMargin = -thumbnailPadding;
+                iconParams.bottomMargin = -snapshotParams.topMargin;
                 iconParams.leftMargin = iconParams.rightMargin = 0;
                 iconParams.topMargin = taskIconMargin;
                 break;
@@ -711,6 +708,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
                 iconParams.topMargin = taskIconMargin;
                 break;
         }
+        mSnapshotView.setLayoutParams(snapshotParams);
         mIconView.setLayoutParams(iconParams);
         mIconView.setRotation(orientationHandler.getDegreesRotated());
 
@@ -1083,17 +1081,17 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
 
     private static final class TaskOutlineProvider extends ViewOutlineProvider {
 
-        private final int mMarginTop;
+        private int mMarginTop;
         private FullscreenDrawParams mFullscreenParams;
 
-        TaskOutlineProvider(Context context, FullscreenDrawParams fullscreenParams) {
-            mMarginTop = context.getResources().getDimensionPixelSize(
-                    R.dimen.task_thumbnail_top_margin);
+        TaskOutlineProvider(Context context, FullscreenDrawParams fullscreenParams, int topMargin) {
+            mMarginTop = topMargin;
             mFullscreenParams = fullscreenParams;
         }
 
-        public void setFullscreenParams(FullscreenDrawParams params) {
+        public void updateParams(FullscreenDrawParams params, int topMargin) {
             mFullscreenParams = params;
+            mMarginTop = topMargin;
         }
 
         @Override
@@ -1216,7 +1214,9 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         }
 
         thumbnail.setFullscreenParams(mCurrentFullscreenParams);
-        mOutlineProvider.setFullscreenParams(mCurrentFullscreenParams);
+        mOutlineProvider.updateParams(
+                mCurrentFullscreenParams,
+                mActivity.getDeviceProfile().overviewTaskThumbnailTopMarginPx);
         invalidateOutline();
     }
 
@@ -1238,8 +1238,8 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     void updateTaskSize() {
         ViewGroup.LayoutParams params = getLayoutParams();
         if (mActivity.getDeviceProfile().isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get()) {
-            final int thumbnailPadding = (int) getResources().getDimension(
-                    R.dimen.task_thumbnail_top_margin);
+            final int thumbnailPadding =
+                    mActivity.getDeviceProfile().overviewTaskThumbnailTopMarginPx;
 
             Rect lastComputedTaskSize = getRecentsView().getLastComputedTaskSize();
             int taskWidth = lastComputedTaskSize.width();
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index cf830c7ed4..d54e3a142c 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -286,4 +286,8 @@
     <!-- Size of the maximum radius for the enforced rounded rectangles. -->
     <dimen name="enforced_rounded_corner_max_radius">16dp</dimen>
 
+<!-- Overview placeholder to compile in Launcer3 without Quickstep -->
+    <dimen name="task_thumbnail_icon_size">0dp</dimen>
+    <dimen name="overview_task_margin">0dp</dimen>
+
 </resources>
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index fa19ee6918..09f4cde195 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -151,6 +151,10 @@ public class DeviceProfile {
     public int allAppsIconDrawablePaddingPx;
     public float allAppsIconTextSizePx;
 
+    // Overview
+    public int overviewTaskThumbnailTopMarginPx;
+    public int overviewTaskMarginPx;
+
     // Widgets
     public final PointF appWidgetScale = new PointF(1.0f, 1.0f);
 
@@ -297,6 +301,11 @@ public class DeviceProfile {
                 : (hotseatBarTopPaddingPx + hotseatBarBottomPaddingPx
                         + (isScalableGrid ? 0 : hotseatExtraVerticalSize)));
 
+
+        overviewTaskMarginPx = res.getDimensionPixelSize(R.dimen.overview_task_margin);
+        overviewTaskThumbnailTopMarginPx = res.getDimensionPixelSize(
+                R.dimen.task_thumbnail_icon_size) + 2 * overviewTaskMarginPx;
+
         // Calculate all of the remaining variables.
         extraSpace = updateAvailableDimensions(res);
         // Now that we have all of the variables calculated, we can tune certain sizes.
-- 
GitLab


From 02c4f65e67a30d7d3baaba7f7dd4aedfe7416bed Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 24 Mar 2021 14:51:19 +0000
Subject: [PATCH 0765/1664] Fix scrolling in WidgetsBottomSheet

Popup container shouldn't intercept the scroll event if its child
scroll view isn't scrolled to the top yet.

Test: manual
Bug: 183599207
Change-Id: I434ba5e91b154e9862f22c08cd01c9d459e6707b
---
 .../launcher3/widget/WidgetsBottomSheet.java       | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/com/android/launcher3/widget/WidgetsBottomSheet.java b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
index 2fda86c89c..bbb0d92eac 100644
--- a/src/com/android/launcher3/widget/WidgetsBottomSheet.java
+++ b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
@@ -26,6 +26,7 @@ import android.util.IntProperty;
 import android.util.Pair;
 import android.view.Gravity;
 import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.Interpolator;
@@ -152,6 +153,19 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
         });
     }
 
+    @Override
+    public boolean onControllerInterceptTouchEvent(MotionEvent ev) {
+        if (ev.getAction() == MotionEvent.ACTION_DOWN) {
+            mNoIntercept = false;
+            ScrollView scrollView = findViewById(R.id.widgets_table_scroll_view);
+            if (getPopupContainer().isEventOverView(scrollView, ev)
+                    && scrollView.getScrollY() > 0) {
+                mNoIntercept = true;
+            }
+        }
+        return super.onControllerInterceptTouchEvent(ev);
+    }
+
     protected WidgetCell addItemCell(ViewGroup parent) {
         WidgetCell widget = (WidgetCell) LayoutInflater.from(getContext())
                 .inflate(R.layout.widget_cell, parent, false);
-- 
GitLab


From 6151a34543be100447f8821d23acf0632e754749 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 24 Mar 2021 10:01:44 -0700
Subject: [PATCH 0766/1664] Fix activity NPE when clearing flags

- If the activity is already destroyed then skip setting flags

Bug: 183400378
Test: Just adding a null check
Change-Id: Id2fddb5adb3b68302fb58fce340abd29237ca731
---
 quickstep/src/com/android/quickstep/views/RecentsView.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 4d8176c7e5..3cdb1dcc3e 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -3160,7 +3160,9 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             MAIN_EXECUTOR.execute(() -> {
                 // Needed for activities that auto-enter PiP, which will not trigger a remote
                 // animation to be created
-                mActivity.clearForceInvisibleFlag(STATE_HANDLER_INVISIBILITY_FLAGS);
+                if (mActivity != null) {
+                    mActivity.clearForceInvisibleFlag(STATE_HANDLER_INVISIBILITY_FLAGS);
+                }
             });
         }
     }
-- 
GitLab


From 387e65e3c4626bd9f623d22aac300b1301ef5d69 Mon Sep 17 00:00:00 2001
From: Jon Spivack <spivack@google.com>
Date: Wed, 24 Mar 2021 10:16:00 -0700
Subject: [PATCH 0767/1664] Change label for Search button in Go Overview

The visual search button on the Recents screen (on Go devices) will be renamed to Lens.

Bug: 183618164
Test: Manual
Change-Id: I86371e604bd0204510737e5088c95404129818bb
---
 go/quickstep/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go/quickstep/res/values/strings.xml b/go/quickstep/res/values/strings.xml
index 71e2f3a5c5..61c8cd9343 100644
--- a/go/quickstep/res/values/strings.xml
+++ b/go/quickstep/res/values/strings.xml
@@ -10,5 +10,5 @@
     <!-- Label for a button that translates a screenshot of the current app. [CHAR_LIMIT=40] -->
     <string name="action_translate">Translate</string>
     <!-- Label for a button that triggers Search on a screenshot of the current app. [CHAR_LIMIT=40] -->
-    <string name="action_search">Search</string>
+    <string name="action_search">Lens</string>
 </resources>
-- 
GitLab


From 02e9f1e12f16456daf234c1e82ed43e26e1ef8b1 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 22 Mar 2021 17:32:50 -0700
Subject: [PATCH 0768/1664] Slightly improve Taskbar animations to launcher

- Move Taskbar scale to LauncherState
- Rename TaskbarVisibilityController to TaskbarAnimationController and
  add mTaskbarScaleForLauncherState to TaskbarAnimationController
- Set OverviewState#getTaskbarScale() = 1f so Taskbar doesn't scale
  up when going from an app to Overview
- Increase home animation duration so Taskbar animation aligns better

Test: Taskbar scales up when going home, doesn't scale up when going
to overview
Bug: 182512211

Change-Id: I6f448e76de98d7ff337ae93234d4bb7ce6254d50
---
 .../launcher3/BaseQuickstepLauncher.java      |  8 ++++
 ...r.java => TaskbarAnimationController.java} | 31 ++++++++++---
 .../launcher3/taskbar/TaskbarController.java  | 46 +++++++++++--------
 .../taskbar/TaskbarStateHandler.java          |  5 ++
 .../uioverrides/states/OverviewState.java     |  5 ++
 .../android/quickstep/AbsSwipeUpHandler.java  |  5 +-
 .../util/StaggeredWorkspaceAnim.java          |  9 ++--
 src/com/android/launcher3/Launcher.java       |  7 +++
 src/com/android/launcher3/LauncherState.java  |  4 ++
 9 files changed, 89 insertions(+), 31 deletions(-)
 rename quickstep/src/com/android/launcher3/taskbar/{TaskbarVisibilityController.java => TaskbarAnimationController.java} (76%)

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 6ba74145b2..085db6d7b6 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -335,6 +335,14 @@ public abstract class BaseQuickstepLauncher extends Launcher
                 ? new float[] {1, 1} : new float[] {1.1f, 0};
     }
 
+    @Override
+    public float getNormalTaskbarScale() {
+        if (mTaskbarController != null) {
+            return mTaskbarController.getTaskbarScaleOnHome();
+        }
+        return super.getNormalTaskbarScale();
+    }
+
     @Override
     public void onDragLayerHierarchyChanged() {
         onLauncherStateOrFocusChanged();
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarVisibilityController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java
similarity index 76%
rename from quickstep/src/com/android/launcher3/taskbar/TaskbarVisibilityController.java
rename to quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java
index 8745a7c8d9..7c54e2d6b9 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarVisibilityController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java
@@ -20,20 +20,21 @@ import static com.android.launcher3.LauncherState.TASKBAR;
 import android.animation.Animator;
 
 import com.android.launcher3.BaseQuickstepLauncher;
+import com.android.launcher3.Utilities;
 import com.android.quickstep.AnimatedFloat;
 import com.android.quickstep.SystemUiProxy;
 import com.android.systemui.shared.system.QuickStepContract;
 
 /**
- * Works with TaskbarController to update the TaskbarView's alpha based on LauncherState, whether
- * Launcher is in the foreground, etc.
+ * Works with TaskbarController to update the TaskbarView's visual properties based on factors such
+ * as LauncherState, whether Launcher is in the foreground, etc.
  */
-public class TaskbarVisibilityController {
+public class TaskbarAnimationController {
 
     private static final long IME_VISIBILITY_ALPHA_DURATION = 120;
 
     private final BaseQuickstepLauncher mLauncher;
-    private final TaskbarController.TaskbarVisibilityControllerCallbacks mTaskbarCallbacks;
+    private final TaskbarController.TaskbarAnimationControllerCallbacks mTaskbarCallbacks;
 
     // Background alpha.
     private final AnimatedFloat mTaskbarBackgroundAlpha = new AnimatedFloat(
@@ -45,8 +46,12 @@ public class TaskbarVisibilityController {
     private final AnimatedFloat mTaskbarVisibilityAlphaForIme = new AnimatedFloat(
             this::updateVisibilityAlpha);
 
-    public TaskbarVisibilityController(BaseQuickstepLauncher launcher,
-            TaskbarController.TaskbarVisibilityControllerCallbacks taskbarCallbacks) {
+    // Scale.
+    private final AnimatedFloat mTaskbarScaleForLauncherState = new AnimatedFloat(
+            this::updateScale);
+
+    public TaskbarAnimationController(BaseQuickstepLauncher launcher,
+            TaskbarController.TaskbarAnimationControllerCallbacks taskbarCallbacks) {
         mLauncher = launcher;
         mTaskbarCallbacks = taskbarCallbacks;
     }
@@ -72,6 +77,10 @@ public class TaskbarVisibilityController {
         return mTaskbarVisibilityAlphaForLauncherState;
     }
 
+    protected AnimatedFloat getTaskbarScaleForLauncherState() {
+        return mTaskbarScaleForLauncherState;
+    }
+
     protected Animator createAnimToBackgroundAlpha(float toAlpha, long duration) {
         return mTaskbarBackgroundAlpha.animateToValue(mTaskbarBackgroundAlpha.value, toAlpha)
                 .setDuration(duration);
@@ -85,6 +94,7 @@ public class TaskbarVisibilityController {
     private void onTaskbarBackgroundAlphaChanged() {
         mTaskbarCallbacks.updateTaskbarBackgroundAlpha(mTaskbarBackgroundAlpha.value);
         updateVisibilityAlpha();
+        updateScale();
     }
 
     private void updateVisibilityAlpha() {
@@ -101,6 +111,15 @@ public class TaskbarVisibilityController {
         setNavBarButtonAlpha(1f - taskbarAlpha);
     }
 
+    private void updateScale() {
+        // We use mTaskbarBackgroundAlpha as a proxy for whether Launcher is resumed/paused, the
+        // assumption being that Taskbar should always be at scale 1f regardless of the current
+        // LauncherState if Launcher is paused.
+        float scale = mTaskbarScaleForLauncherState.value;
+        scale = Utilities.mapRange(mTaskbarBackgroundAlpha.value, scale, 1f);
+        mTaskbarCallbacks.updateTaskbarScale(scale);
+    }
+
     private void setNavBarButtonAlpha(float navBarAlpha) {
         SystemUiProxy.INSTANCE.get(mLauncher).setNavBarButtonAlpha(navBarAlpha, false);
     }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index eccc41bfe2..de23ad2efa 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -19,8 +19,6 @@ import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
 import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
 
-import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
-import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_BOTTOM_TAPPABLE_ELEMENT;
 import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_EXTRA_NAVIGATION_BAR;
 
@@ -75,7 +73,7 @@ public class TaskbarController {
     // Layout width and height of the Taskbar in the default state.
     private final Point mTaskbarSize;
     private final TaskbarStateHandler mTaskbarStateHandler;
-    private final TaskbarVisibilityController mTaskbarVisibilityController;
+    private final TaskbarAnimationController mTaskbarAnimationController;
     private final TaskbarHotseatController mHotseatController;
     private final TaskbarRecentsController mRecentsController;
     private final TaskbarDragController mDragController;
@@ -104,8 +102,8 @@ public class TaskbarController {
         mWindowManager = mLauncher.getWindowManager();
         mTaskbarSize = new Point(MATCH_PARENT, mLauncher.getDeviceProfile().taskbarSize);
         mTaskbarStateHandler = mLauncher.getTaskbarStateHandler();
-        mTaskbarVisibilityController = new TaskbarVisibilityController(mLauncher,
-                createTaskbarVisibilityControllerCallbacks());
+        mTaskbarAnimationController = new TaskbarAnimationController(mLauncher,
+                createTaskbarAnimationControllerCallbacks());
         mHotseatController = new TaskbarHotseatController(mLauncher,
                 createTaskbarHotseatControllerCallbacks());
         mRecentsController = new TaskbarRecentsController(mLauncher,
@@ -113,8 +111,8 @@ public class TaskbarController {
         mDragController = new TaskbarDragController(mLauncher);
     }
 
-    private TaskbarVisibilityControllerCallbacks createTaskbarVisibilityControllerCallbacks() {
-        return new TaskbarVisibilityControllerCallbacks() {
+    private TaskbarAnimationControllerCallbacks createTaskbarAnimationControllerCallbacks() {
+        return new TaskbarAnimationControllerCallbacks() {
             @Override
             public void updateTaskbarBackgroundAlpha(float alpha) {
                 mTaskbarViewInApp.setBackgroundAlpha(alpha);
@@ -125,6 +123,12 @@ public class TaskbarController {
                 mTaskbarContainerView.setAlpha(alpha);
                 mTaskbarViewOnHome.setAlpha(alpha);
             }
+
+            @Override
+            public void updateTaskbarScale(float scale) {
+                mTaskbarViewInApp.setScaleX(scale);
+                mTaskbarViewInApp.setScaleY(scale);
+            }
         };
     }
 
@@ -242,12 +246,10 @@ public class TaskbarController {
         mTaskbarContainerView.init(mTaskbarViewInApp);
         addToWindowManager();
         mTaskbarStateHandler.setTaskbarCallbacks(createTaskbarStateHandlerCallbacks());
-        mTaskbarVisibilityController.init();
+        mTaskbarAnimationController.init();
         mHotseatController.init();
         mRecentsController.init();
 
-        SCALE_PROPERTY.set(mTaskbarViewInApp, mLauncher.hasBeenResumed()
-                ? getTaskbarScaleOnHome() : 1f);
         updateWhichTaskbarViewIsVisible();
     }
 
@@ -255,7 +257,12 @@ public class TaskbarController {
         return new TaskbarStateHandlerCallbacks() {
             @Override
             public AnimatedFloat getAlphaTarget() {
-                return mTaskbarVisibilityController.getTaskbarVisibilityForLauncherState();
+                return mTaskbarAnimationController.getTaskbarVisibilityForLauncherState();
+            }
+
+            @Override
+            public AnimatedFloat getScaleTarget() {
+                return mTaskbarAnimationController.getTaskbarScaleForLauncherState();
             }
         };
     }
@@ -274,7 +281,7 @@ public class TaskbarController {
         mTaskbarContainerView.cleanup();
         removeFromWindowManager();
         mTaskbarStateHandler.setTaskbarCallbacks(null);
-        mTaskbarVisibilityController.cleanup();
+        mTaskbarAnimationController.cleanup();
         mHotseatController.cleanup();
         mRecentsController.cleanup();
     }
@@ -342,12 +349,10 @@ public class TaskbarController {
      */
     public Animator createAnimToLauncher(@Nullable LauncherState toState, long duration) {
         PendingAnimation anim = new PendingAnimation(duration);
-        anim.add(mTaskbarVisibilityController.createAnimToBackgroundAlpha(0, duration));
+        anim.add(mTaskbarAnimationController.createAnimToBackgroundAlpha(0, duration));
         if (toState != null) {
             mTaskbarStateHandler.setStateWithAnimation(toState, new StateAnimationConfig(), anim);
         }
-        anim.addFloat(mTaskbarViewInApp, SCALE_PROPERTY, mTaskbarViewInApp.getScaleX(),
-                getTaskbarScaleOnHome(), LINEAR);
 
         anim.addListener(new AnimatorListenerAdapter() {
             @Override
@@ -368,8 +373,7 @@ public class TaskbarController {
 
     private Animator createAnimToApp(long duration) {
         PendingAnimation anim = new PendingAnimation(duration);
-        anim.add(mTaskbarVisibilityController.createAnimToBackgroundAlpha(1, duration));
-        anim.addFloat(mTaskbarViewInApp, SCALE_PROPERTY, mTaskbarViewInApp.getScaleX(), 1f, LINEAR);
+        anim.add(mTaskbarAnimationController.createAnimToBackgroundAlpha(1, duration));
         anim.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationStart(Animator animation) {
@@ -390,7 +394,7 @@ public class TaskbarController {
      * Should be called when the IME visibility changes, so we can hide/show Taskbar accordingly.
      */
     public void setIsImeVisible(boolean isImeVisible) {
-        mTaskbarVisibilityController.animateToVisibilityForIme(isImeVisible ? 0 : 1);
+        mTaskbarAnimationController.animateToVisibilityForIme(isImeVisible ? 0 : 1);
     }
 
     /**
@@ -527,15 +531,17 @@ public class TaskbarController {
      */
     protected interface TaskbarStateHandlerCallbacks {
         AnimatedFloat getAlphaTarget();
+        AnimatedFloat getScaleTarget();
     }
 
     /**
-     * Contains methods that TaskbarVisibilityController can call to interface with
+     * Contains methods that TaskbarAnimationController can call to interface with
      * TaskbarController.
      */
-    protected interface TaskbarVisibilityControllerCallbacks {
+    protected interface TaskbarAnimationControllerCallbacks {
         void updateTaskbarBackgroundAlpha(float alpha);
         void updateTaskbarVisibilityAlpha(float alpha);
+        void updateTaskbarScale(float scale);
     }
 
     /**
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java
index 0a3819dad5..9fc7d995a7 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java
@@ -53,8 +53,10 @@ public class TaskbarStateHandler implements StateManager.StateHandler<LauncherSt
         }
 
         AnimatedFloat alphaTarget = mTaskbarCallbacks.getAlphaTarget();
+        AnimatedFloat scaleTarget = mTaskbarCallbacks.getScaleTarget();
         boolean isTaskbarVisible = (state.getVisibleElements(mLauncher) & TASKBAR) != 0;
         alphaTarget.updateValue(isTaskbarVisible ? 1f : 0f);
+        scaleTarget.updateValue(state.getTaskbarScale(mLauncher));
     }
 
     @Override
@@ -65,7 +67,10 @@ public class TaskbarStateHandler implements StateManager.StateHandler<LauncherSt
         }
 
         AnimatedFloat alphaTarget = mTaskbarCallbacks.getAlphaTarget();
+        AnimatedFloat scaleTarget = mTaskbarCallbacks.getScaleTarget();
         boolean isTaskbarVisible = (toState.getVisibleElements(mLauncher) & TASKBAR) != 0;
         animation.setFloat(alphaTarget, AnimatedFloat.VALUE, isTaskbarVisible ? 1f : 0f, LINEAR);
+        animation.setFloat(scaleTarget, AnimatedFloat.VALUE, toState.getTaskbarScale(mLauncher),
+                LINEAR);
     }
 }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
index d8a5f9bdfe..43e70a3923 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -82,6 +82,11 @@ public class OverviewState extends LauncherState {
         return new float[] {NO_SCALE, NO_OFFSET};
     }
 
+    @Override
+    public float getTaskbarScale(Launcher launcher) {
+        return 1f;
+    }
+
     @Override
     public PageAlphaProvider getWorkspacePageAlphaProvider(Launcher launcher) {
         return new PageAlphaProvider(DEACCEL_2) {
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index b49282544d..ec741ab459 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -102,6 +102,7 @@ import com.android.quickstep.util.MultiValueUpdateListener;
 import com.android.quickstep.util.ProtoTracer;
 import com.android.quickstep.util.RecentsOrientedState;
 import com.android.quickstep.util.RectFSpringAnim;
+import com.android.quickstep.util.StaggeredWorkspaceAnim;
 import com.android.quickstep.util.SurfaceTransactionApplier;
 import com.android.quickstep.util.SwipePipToHomeAnimator;
 import com.android.quickstep.util.TransformParams;
@@ -200,7 +201,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
             STATE_LAUNCHER_PRESENT | STATE_LAUNCHER_DRAWN | STATE_LAUNCHER_STARTED;
 
     public static final long MAX_SWIPE_DURATION = 350;
-    public static final long MIN_OVERSHOOT_DURATION = 120;
+    public static final long HOME_DURATION = StaggeredWorkspaceAnim.DURATION_MS;
 
     public static final float MIN_PROGRESS_FOR_OVERVIEW = 0.7f;
     private static final float SWIPE_DURATION_MULTIPLIER =
@@ -957,7 +958,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
             mInputConsumerProxy.enable();
         }
         if (endTarget == HOME) {
-            duration = Math.max(MIN_OVERSHOOT_DURATION, duration);
+            duration = HOME_DURATION;
         } else if (endTarget == RECENTS) {
             if (mRecentsView != null) {
                 int nearestPage = mRecentsView.getDestinationPage();
diff --git a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
index d4ca31fbda..f68e936f7f 100644
--- a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
+++ b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
@@ -60,7 +60,10 @@ import com.android.systemui.plugins.ResourceProvider;
 public class StaggeredWorkspaceAnim {
 
     private static final int APP_CLOSE_ROW_START_DELAY_MS = 10;
+    // How long it takes to fade in each staggered row.
     private static final int ALPHA_DURATION_MS = 250;
+    // Should be used for animations running alongside this StaggeredWorkspaceAnim.
+    public static final int DURATION_MS = 250;
 
     private static final float MAX_VELOCITY_PX_PER_S = 22f;
 
@@ -131,15 +134,15 @@ public class StaggeredWorkspaceAnim {
         }
 
         if (animateOverviewScrim) {
-            PendingAnimation pendingAnimation = new PendingAnimation(ALPHA_DURATION_MS);
+            PendingAnimation pendingAnimation = new PendingAnimation(DURATION_MS);
             addScrimAnimationForState(launcher, NORMAL, pendingAnimation);
             mAnimators.play(pendingAnimation.buildAnim());
         }
 
-        addDepthAnimationForState(launcher, NORMAL, ALPHA_DURATION_MS);
+        addDepthAnimationForState(launcher, NORMAL, DURATION_MS);
 
         mAnimators.play(launcher.getDragLayer().getSysUiScrim().createSysuiMultiplierAnim(0f, 1f)
-                .setDuration(ALPHA_DURATION_MS));
+                .setDuration(DURATION_MS));
         mAnimators.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationEnd(Animator animation) {
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 89c0f6697e..8785fbc2b9 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2763,6 +2763,13 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         return new float[] {NO_SCALE, NO_OFFSET};
     }
 
+    /**
+     * @see LauncherState#getTaskbarScale(Launcher)
+     */
+    public float getNormalTaskbarScale() {
+        return 1f;
+    }
+
     public static Launcher getLauncher(Context context) {
         return fromContext(context);
     }
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java
index 06bc4380fa..46bce937bf 100644
--- a/src/com/android/launcher3/LauncherState.java
+++ b/src/com/android/launcher3/LauncherState.java
@@ -176,6 +176,10 @@ public abstract class LauncherState implements BaseState<LauncherState> {
         return launcher.getNormalOverviewScaleAndOffset();
     }
 
+    public float getTaskbarScale(Launcher launcher) {
+        return launcher.getNormalTaskbarScale();
+    }
+
     public float getOverviewFullscreenProgress() {
         return 0;
     }
-- 
GitLab


From dedbc8ac36f674baa47694bc20a93f8ee2fe46cc Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Wed, 17 Mar 2021 16:53:26 +0000
Subject: [PATCH 0769/1664] Remove grid scaling in Overveiw

- Grid scaling has problem that scales task icon and menu, which makes it hard to control icon size and text size in the manula
- Replaced the whole concept with dedicated Task size calculation in grid layout
- Support different icon size in TaskView in grid and removed task_thumbnail_top_margin
- Removed grid progress in TaskViewSimulator as well
- Refactored how ClearAllButton scroll and translations are calcualted to align clear all properly in grid
- Make page center calculation aware of PagedView pivot and scaling

Bug: 174464863
Test: Manual on two screens
Change-Id: I47b13ef6e55c6e16c52ea04225f5bde02ed82fc2
---
 quickstep/res/values/dimens.xml               |   1 +
 .../android/quickstep/AbsSwipeUpHandler.java  |  11 +-
 .../quickstep/BaseActivityInterface.java      |  88 ++++++----
 .../com/android/quickstep/TaskViewUtils.java  |   7 +-
 .../quickstep/util/TaskViewSimulator.java     |  36 ----
 .../quickstep/views/ClearAllButton.java       |  66 ++++++--
 .../android/quickstep/views/RecentsView.java  | 156 +++++++++---------
 .../com/android/quickstep/views/TaskView.java |  38 ++---
 res/values/dimens.xml                         |   1 +
 src/com/android/launcher3/DeviceProfile.java  |  11 +-
 src/com/android/launcher3/PagedView.java      |  23 ++-
 .../android/launcher3/anim/Interpolators.java |   3 +
 .../touch/LandscapePagedViewHandler.java      |   2 +-
 .../touch/PagedOrientationHandler.java        |   2 +-
 .../touch/PortraitPagedViewHandler.java       |   2 +-
 15 files changed, 233 insertions(+), 214 deletions(-)

diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 0ff11c5f5e..3036341dae 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -16,6 +16,7 @@
 
 <resources>
     <dimen name="task_thumbnail_icon_size">48dp</dimen>
+    <dimen name="task_thumbnail_icon_size_grid">32dp</dimen>
     <!-- For screens without rounded corners -->
     <dimen name="task_corner_radius_small">2dp</dimen>
 
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index b49282544d..f4ef1f7e47 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -923,6 +923,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         float currentShift = mCurrentShift.value;
         final GestureEndTarget endTarget = calculateEndTarget(velocity, endVelocity,
                 isFling, isCancel);
+        // Set the state, but don't notify until the animation completes
+        mGestureState.setEndTarget(endTarget, false /* isAtomic */);
+
         float endShift = endTarget.isLauncher ? 1 : 0;
         final float startShift;
         if (!isFling) {
@@ -945,7 +948,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         }
         Interpolator interpolator;
         S state = mActivityInterface.stateFromGestureEndTarget(endTarget);
-        if (state.displayOverviewTasksAsGrid(mActivity.getDeviceProfile())) {
+        if (state.displayOverviewTasksAsGrid(mDp)) {
             interpolator = ACCEL_DEACCEL;
         } else if (endTarget == RECENTS) {
             interpolator = OVERSHOOT_1_2;
@@ -1055,8 +1058,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     @UiThread
     private void animateToProgressInternal(float start, float end, long duration,
             Interpolator interpolator, GestureEndTarget target, PointF velocityPxPerMs) {
-        // Set the state, but don't notify until the animation completes
-        mGestureState.setEndTarget(target, false /* isAtomic */);
         maybeUpdateRecentsAttachedState();
 
         // If we are transitioning to launcher, then listen for the activity to be restarted while
@@ -1147,10 +1148,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
             });
             animatorSet.play(windowAnim);
             S state = mActivityInterface.stateFromGestureEndTarget(mGestureState.getEndTarget());
-            if (mRecentsView != null && state.displayOverviewTasksAsGrid(
-                    mActivity.getDeviceProfile())) {
+            if (mRecentsView != null && state.displayOverviewTasksAsGrid(mDp)) {
                 animatorSet.play(ObjectAnimator.ofFloat(mRecentsView, RECENTS_GRID_PROGRESS, 1));
-                animatorSet.play(mTaskViewSimulator.gridProgress.animateToValue(0, 1));
             }
             animatorSet.setDuration(duration).setInterpolator(interpolator);
             animatorSet.start();
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index 462630cac3..0415009faf 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -31,6 +31,7 @@ import android.animation.Animator;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.Resources;
+import android.graphics.PointF;
 import android.graphics.Rect;
 import android.os.Build;
 import android.view.Gravity;
@@ -43,6 +44,7 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.R;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.BaseState;
 import com.android.launcher3.statemanager.StatefulActivity;
@@ -195,45 +197,53 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
     }
 
     /**
-     * Calculates the taskView size for the provided device configuration
+     * Calculates the taskView size for the provided device configuration.
      */
     public final void calculateTaskSize(Context context, DeviceProfile dp, Rect outRect,
             PagedOrientationHandler orientedState) {
         Resources res = context.getResources();
-
-        int taskMargin = dp.overviewTaskMarginPx;
-        int proactiveRowAndMargin;
-        if (dp.isVerticalBarLayout()) {
-            // In Vertical Bar Layout the proactive row doesn't have its own space, it's inside
-            // the actions row.
-            proactiveRowAndMargin = 0;
+        if (dp.isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get()) {
+            Rect gridRect = new Rect();
+            calculateGridSize(context, dp, gridRect);
+
+            int rowSpacing = res.getDimensionPixelSize(R.dimen.overview_grid_row_spacing);
+            float rowHeight = (gridRect.height() - rowSpacing) / 2f;
+
+            PointF taskDimension = getTaskDimension(context, dp);
+            float scale = (rowHeight - dp.overviewTaskThumbnailTopMarginPx) / Math.max(
+                    taskDimension.x, taskDimension.y);
+            int outWidth = Math.round(scale * taskDimension.x);
+            int outHeight = Math.round(scale * taskDimension.y);
+
+            int gravity = Gravity.TOP;
+            gravity |= orientedState.getRecentsRtlSetting(res) ? Gravity.RIGHT : Gravity.LEFT;
+            gridRect.inset(0, dp.overviewTaskThumbnailTopMarginPx, 0, 0);
+            Gravity.apply(gravity, outWidth, outHeight, gridRect, outRect);
         } else {
-            proactiveRowAndMargin = res.getDimensionPixelSize(R.dimen.overview_proactive_row_height)
-                    + res.getDimensionPixelSize(R.dimen.overview_proactive_row_bottom_margin);
+            int taskMargin = dp.overviewTaskMarginPx;
+            int proactiveRowAndMargin;
+            if (dp.isVerticalBarLayout()) {
+                // In Vertical Bar Layout the proactive row doesn't have its own space, it's inside
+                // the actions row.
+                proactiveRowAndMargin = 0;
+            } else {
+                proactiveRowAndMargin = res.getDimensionPixelSize(
+                        R.dimen.overview_proactive_row_height)
+                        + res.getDimensionPixelSize(R.dimen.overview_proactive_row_bottom_margin);
+            }
+            calculateTaskSizeInternal(context, dp,
+                    dp.overviewTaskThumbnailTopMarginPx,
+                    proactiveRowAndMargin + getOverviewActionsHeight(context) + taskMargin,
+                    res.getDimensionPixelSize(R.dimen.overview_minimum_next_prev_size) + taskMargin,
+                    outRect);
         }
-        calculateTaskSizeInternal(context, dp,
-                dp.overviewTaskThumbnailTopMarginPx,
-                proactiveRowAndMargin + getOverviewActionsHeight(context) + taskMargin,
-                res.getDimensionPixelSize(R.dimen.overview_minimum_next_prev_size) + taskMargin,
-                outRect);
     }
 
     private void calculateTaskSizeInternal(Context context, DeviceProfile dp,
             int claimedSpaceAbove, int claimedSpaceBelow, int minimumHorizontalPadding,
             Rect outRect) {
-        float taskWidth, taskHeight;
+        PointF taskDimension = getTaskDimension(context, dp);
         Rect insets = dp.getInsets();
-        if (dp.isMultiWindowMode) {
-            WindowBounds bounds = SplitScreenBounds.INSTANCE.getSecondaryWindowBounds(context);
-            taskWidth = bounds.availableSize.x;
-            taskHeight = bounds.availableSize.y;
-        } else if (TaskView.CLIP_STATUS_AND_NAV_BARS) {
-            taskWidth = dp.availableWidthPx;
-            taskHeight = dp.availableHeightPx;
-        } else {
-            taskWidth = dp.widthPx;
-            taskHeight = dp.heightPx;
-        }
 
         Rect potentialTaskRect = new Rect(0, 0, dp.widthPx, dp.heightPx);
         potentialTaskRect.inset(insets.left, insets.top, insets.right, insets.bottom);
@@ -244,14 +254,30 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
                 claimedSpaceBelow);
 
         float scale = Math.min(
-                potentialTaskRect.width() / taskWidth,
-                potentialTaskRect.height() / taskHeight);
-        int outWidth = Math.round(scale * taskWidth);
-        int outHeight = Math.round(scale * taskHeight);
+                potentialTaskRect.width() / taskDimension.x,
+                potentialTaskRect.height() / taskDimension.y);
+        int outWidth = Math.round(scale * taskDimension.x);
+        int outHeight = Math.round(scale * taskDimension.y);
 
         Gravity.apply(Gravity.CENTER, outWidth, outHeight, potentialTaskRect, outRect);
     }
 
+    private PointF getTaskDimension(Context context, DeviceProfile dp) {
+        PointF dimension = new PointF();
+        if (dp.isMultiWindowMode) {
+            WindowBounds bounds = SplitScreenBounds.INSTANCE.getSecondaryWindowBounds(context);
+            dimension.x = bounds.availableSize.x;
+            dimension.y = bounds.availableSize.y;
+        } else if (TaskView.CLIP_STATUS_AND_NAV_BARS) {
+            dimension.x = dp.availableWidthPx;
+            dimension.y = dp.availableHeightPx;
+        } else {
+            dimension.x = dp.widthPx;
+            dimension.y = dp.heightPx;
+        }
+        return dimension;
+    }
+
     /**
      * Calculates the overview grid size for the provided device configuration.
      */
diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java
index 7a428ce637..79db842c0d 100644
--- a/quickstep/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java
@@ -22,6 +22,7 @@ import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DU
 import static com.android.launcher3.Utilities.getDescendantCoordRelativeToAncestor;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.Interpolators.TOUCH_RESPONSE_INTERPOLATOR;
+import static com.android.launcher3.anim.Interpolators.TOUCH_RESPONSE_INTERPOLATOR_ACCEL_DEACCEL;
 import static com.android.launcher3.anim.Interpolators.clampToProgress;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.statehandlers.DepthController.DEPTH;
@@ -200,8 +201,7 @@ public final class TaskViewUtils {
             tsv.setPreview(targets.apps[targets.apps.length - 1]);
             tsv.fullScreenProgress.value = 0;
             tsv.recentsViewScale.value = 1;
-            tsv.gridProgress.value = gridProgress;
-            tsv.gridTranslationSecondary.value = gridTranslationSecondary;
+            tsv.taskSecondaryTranslation.value = gridTranslationSecondary;
             tsv.setScroll(startScroll);
 
             // Fade in the task during the initial 20% of the animation
@@ -214,7 +214,8 @@ public final class TaskViewUtils {
                     AnimatedFloat.VALUE, 1, TOUCH_RESPONSE_INTERPOLATOR);
             out.setFloat(tsv.recentsViewScale,
                     AnimatedFloat.VALUE, tsv.getFullScreenScale(), TOUCH_RESPONSE_INTERPOLATOR);
-            out.setFloat(tsv.gridProgress, AnimatedFloat.VALUE, 0, TOUCH_RESPONSE_INTERPOLATOR);
+            out.setFloat(tsv.taskSecondaryTranslation, AnimatedFloat.VALUE, 0,
+                    TOUCH_RESPONSE_INTERPOLATOR_ACCEL_DEACCEL);
             out.setInt(tsv, TaskViewSimulator.SCROLL, 0, TOUCH_RESPONSE_INTERPOLATOR);
 
             TaskViewSimulator finalTsv = tsv;
diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index c60d072e94..6cfe3029d8 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -15,7 +15,6 @@
  */
 package com.android.quickstep.util;
 
-import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.states.RotationHelper.deltaRotation;
 import static com.android.launcher3.touch.PagedOrientationHandler.MATRIX_POST_TRANSLATE;
 import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
@@ -36,7 +35,6 @@ import android.util.IntProperty;
 import androidx.annotation.NonNull;
 
 import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.touch.PagedOrientationHandler;
@@ -79,7 +77,6 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
     private final boolean mIsRecentsRtl;
 
     private final Rect mTaskRect = new Rect();
-    private final Rect mGridRect = new Rect();
     private boolean mDrawsBelowRecents;
     private final PointF mPivot = new PointF();
     private DeviceProfile mDp;
@@ -98,21 +95,18 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
     private final FullscreenDrawParams mCurrentFullscreenParams;
     public final AnimatedFloat taskPrimaryTranslation = new AnimatedFloat();
     public final AnimatedFloat taskSecondaryTranslation = new AnimatedFloat();
-    public final AnimatedFloat gridTranslationSecondary = new AnimatedFloat();
 
     // RecentsView properties
     public final AnimatedFloat recentsViewScale = new AnimatedFloat();
     public final AnimatedFloat fullScreenProgress = new AnimatedFloat();
     public final AnimatedFloat recentsViewSecondaryTranslation = new AnimatedFloat();
     public final AnimatedFloat recentsViewPrimaryTranslation = new AnimatedFloat();
-    public final AnimatedFloat gridProgress = new AnimatedFloat();
     private final ScrollState mScrollState = new ScrollState();
 
     // Cached calculations
     private boolean mLayoutValid = false;
     private boolean mScrollValid = false;
     private int mOrientationStateId;
-    private final int mRowSpacing;
 
     public TaskViewSimulator(Context context, BaseActivityInterface sizeStrategy) {
         mContext = context;
@@ -124,7 +118,6 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
         mOrientationStateId = mOrientationState.getStateId();
         Resources resources = context.getResources();
         mIsRecentsRtl = mOrientationState.getOrientationHandler().getRecentsRtlSetting(resources);
-        mRowSpacing = (int) resources.getDimension(R.dimen.overview_grid_row_spacing);
     }
 
     /**
@@ -266,7 +259,6 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
             mOrientationStateId = mOrientationState.getStateId();
 
             getFullScreenScale();
-            mSizeStrategy.calculateGridSize(mContext, mDp, mGridRect);
             mThumbnailData.rotation = mOrientationState.getDisplayRotation();
 
             // mIsRecentsRtl is the inverse of TaskView RTL.
@@ -307,34 +299,6 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
         mMatrix.postTranslate(insets.left, insets.top);
         mMatrix.postScale(scale, scale);
 
-        // Apply TaskView matrix: gridProgress related properties
-        float interpolatedGridProgress = ACCEL_DEACCEL.getInterpolation(gridProgress.value);
-        final int boxLength = (int) Math.max(taskWidth, taskHeight);
-        float availableHeight = mGridRect.height();
-        float rowHeight = (availableHeight - mRowSpacing) / 2;
-        float gridScale = rowHeight / (boxLength + mDp.overviewTaskThumbnailTopMarginPx);
-        scale = Utilities.mapRange(interpolatedGridProgress, 1f, gridScale);
-        mMatrix.postScale(scale, scale, mIsRecentsRtl ? 0 : taskWidth, 0);
-        mOrientationState.getOrientationHandler().setSecondary(mMatrix, MATRIX_POST_TRANSLATE,
-                Utilities.mapRange(interpolatedGridProgress, 0, gridTranslationSecondary.value));
-
-        // Apply TaskView matrix: task rect and grid rect difference
-        float scaledWidth = taskWidth * gridScale;
-        float taskGridHorizontalDiff;
-        if (mIsRecentsRtl) {
-            float taskRight = mTaskRect.left + scaledWidth;
-            taskGridHorizontalDiff = mGridRect.right - taskRight;
-        } else {
-            float taskLeft = mTaskRect.right - scaledWidth;
-            taskGridHorizontalDiff = mGridRect.left - taskLeft;
-        }
-        float taskGridVerticalDiff =
-                mGridRect.top + mDp.overviewTaskThumbnailTopMarginPx * gridScale - mTaskRect.top;
-        mOrientationState.getOrientationHandler().set(mMatrix, MATRIX_POST_TRANSLATE,
-                Utilities.mapRange(interpolatedGridProgress, 0, taskGridHorizontalDiff));
-        mOrientationState.getOrientationHandler().setSecondary(mMatrix, MATRIX_POST_TRANSLATE,
-                Utilities.mapRange(interpolatedGridProgress, 0, taskGridVerticalDiff));
-
         // Apply TaskView matrix: translate, scroll
         mMatrix.postTranslate(mTaskRect.left, mTaskRect.top);
         mOrientationState.getOrientationHandler().set(mMatrix, MATRIX_POST_TRANSLATE,
diff --git a/quickstep/src/com/android/quickstep/views/ClearAllButton.java b/quickstep/src/com/android/quickstep/views/ClearAllButton.java
index dbeff43f87..12b59d0817 100644
--- a/quickstep/src/com/android/quickstep/views/ClearAllButton.java
+++ b/quickstep/src/com/android/quickstep/views/ClearAllButton.java
@@ -50,8 +50,11 @@ public class ClearAllButton extends Button implements PageCallbacks {
     private boolean mIsRtl;
     private float mNormalTranslationPrimary;
     private float mGridTranslationPrimary;
+    private float mGridTranslationSecondary;
+    private float mGridScrollOffset;
+    private float mOffsetTranslationPrimary;
 
-    private int mScrollOffset;
+    private int mSidePadding;
 
     public ClearAllButton(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -63,7 +66,7 @@ public class ClearAllButton extends Button implements PageCallbacks {
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
         super.onLayout(changed, left, top, right, bottom);
         PagedOrientationHandler orientationHandler = getRecentsView().getPagedOrientationHandler();
-        mScrollOffset = orientationHandler.getClearAllScrollOffset(getRecentsView(), mIsRtl);
+        mSidePadding = orientationHandler.getClearAllSidePadding(getRecentsView(), mIsRtl);
     }
 
     private RecentsView getRecentsView() {
@@ -96,25 +99,27 @@ public class ClearAllButton extends Button implements PageCallbacks {
     }
 
     @Override
-    public void onPageScroll(ScrollState scrollState) {
-        PagedOrientationHandler orientationHandler = getRecentsView().getPagedOrientationHandler();
+    public void onPageScroll(ScrollState scrollState, boolean gridEnabled) {
+        RecentsView recentsView = getRecentsView();
+        if (recentsView == null) {
+            return;
+        }
+
+        PagedOrientationHandler orientationHandler = recentsView.getPagedOrientationHandler();
         float orientationSize = orientationHandler.getPrimaryValue(getWidth(), getHeight());
         if (orientationSize == 0) {
             return;
         }
 
-        float shift;
-        if (mIsRtl) {
-            shift = Math.min(scrollState.scrollFromEdge, orientationSize);
-        } else {
-            shift = Math.min(scrollState.scrollFromEdge,
-                    orientationSize + getGridTrans(mGridTranslationPrimary))
-                    - getGridTrans(mGridTranslationPrimary);
+        int leftEdgeScroll = recentsView.getLeftMostChildScroll();
+        float adjustedScrollFromEdge = scrollState.scrollFromEdge - leftEdgeScroll;
+        float shift = Math.min(adjustedScrollFromEdge, orientationSize);
+        mNormalTranslationPrimary = mIsRtl ? -shift : shift;
+        if (!gridEnabled) {
+            mNormalTranslationPrimary += mSidePadding;
         }
-        mNormalTranslationPrimary = mIsRtl ? (mScrollOffset - shift) : (mScrollOffset + shift);
         applyPrimaryTranslation();
-        orientationHandler.getSecondaryViewTranslate().set(this,
-                orientationHandler.getSecondaryValue(0f, getOriginalTranslationY()));
+        applySecondaryTranslation();
         mScrollAlpha = 1 - shift / orientationSize;
         updateAlpha();
     }
@@ -130,11 +135,26 @@ public class ClearAllButton extends Button implements PageCallbacks {
         applyPrimaryTranslation();
     }
 
+    public void setGridTranslationSecondary(float gridTranslationSecondary) {
+        mGridTranslationSecondary = gridTranslationSecondary;
+        applyPrimaryTranslation();
+    }
+
+    public void setGridScrollOffset(float gridScrollOffset) {
+        mGridScrollOffset = gridScrollOffset;
+    }
+
+    public void setOffsetTranslationPrimary(float offsetTranslationPrimary) {
+        mOffsetTranslationPrimary = offsetTranslationPrimary;
+        applyPrimaryTranslation();
+    }
+
     public float getScrollAdjustment(boolean gridEnabled) {
         float scrollAdjustment = 0;
         if (gridEnabled) {
-            scrollAdjustment += mGridTranslationPrimary;
+            scrollAdjustment += mGridTranslationPrimary + mGridScrollOffset;
         }
+        scrollAdjustment += mOffsetTranslationPrimary;
         return scrollAdjustment;
     }
 
@@ -160,7 +180,21 @@ public class ClearAllButton extends Button implements PageCallbacks {
 
         PagedOrientationHandler orientationHandler = recentsView.getPagedOrientationHandler();
         orientationHandler.getPrimaryViewTranslate().set(this,
-                mNormalTranslationPrimary + getGridTrans(mGridTranslationPrimary));
+                orientationHandler.getPrimaryValue(0f, getOriginalTranslationY())
+                        + mNormalTranslationPrimary + mOffsetTranslationPrimary + getGridTrans(
+                        mGridTranslationPrimary));
+    }
+
+    private void applySecondaryTranslation() {
+        RecentsView recentsView = getRecentsView();
+        if (recentsView == null) {
+            return;
+        }
+
+        PagedOrientationHandler orientationHandler = recentsView.getPagedOrientationHandler();
+        orientationHandler.getSecondaryViewTranslate().set(this,
+                orientationHandler.getSecondaryValue(0f, getOriginalTranslationY())
+                        + getGridTrans(mGridTranslationSecondary));
     }
 
     private float getGridTrans(float endTranslation) {
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index d637bb4aca..335d47093e 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -301,6 +301,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     protected final Rect mTempRect = new Rect();
     protected final RectF mTempRectF = new RectF();
     private final PointF mTempPointF = new PointF();
+    private float mFullscreenScale;
 
     private static final int DISMISS_TASK_DURATION = 300;
     private static final int ADDITION_TASK_DURATION = 200;
@@ -741,7 +742,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         int taskStart = mOrientationHandler.getChildStart(tv) + (int) tv.getOffsetAdjustment(
                 mOverviewFullscreenEnabled, showAsGrid());
         int taskSize = (int) (mOrientationHandler.getMeasuredSize(tv) * tv.getSizeAdjustment(
-                mOverviewFullscreenEnabled, showAsGrid()));
+                mOverviewFullscreenEnabled));
         int taskEnd = taskStart + taskSize;
         return (taskStart >= start && taskStart <= end) || (taskEnd >= start
                 && taskEnd <= end);
@@ -1019,7 +1020,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             mLiveTileTaskViewSimulator.taskSecondaryTranslation.value = 0;
             mLiveTileTaskViewSimulator.fullScreenProgress.value = 0;
             mLiveTileTaskViewSimulator.recentsViewScale.value = 1;
-            mLiveTileTaskViewSimulator.gridProgress.value = 0;
         }
         if (mRunningTaskTileHidden) {
             setRunningTaskHidden(mRunningTaskTileHidden);
@@ -1091,6 +1091,10 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
      */
     private void updateTaskSize() {
         final int taskCount = getTaskViewCount();
+        if (taskCount == 0) {
+            return;
+        }
+
         float accumulatedTranslationX = 0;
         float[] fullscreenTranslations = new float[taskCount];
         int firstNonHomeTaskIndex = 0;
@@ -1105,8 +1109,11 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
 
             taskView.updateTaskSize();
             fullscreenTranslations[i] += accumulatedTranslationX;
+            // Compensate space caused by TaskView scaling.
             float widthDiff =
                     taskView.getLayoutParams().width * (1 - taskView.getFullscreenScale());
+            // Compensate page spacing widening caused by RecentsView scaling.
+            widthDiff += mPageSpacing * (1 - 1 / mFullscreenScale);
             float fullscreenTranslationX = mIsRtl ? widthDiff : -widthDiff;
             fullscreenTranslations[i] += fullscreenTranslationX;
             accumulatedTranslationX += fullscreenTranslationX;
@@ -1180,13 +1187,13 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             View page = getPageAt(i);
             mScrollState.updateInterpolation(mActivity.getDeviceProfile(),
                     mOrientationHandler.getChildStartWithTranslation(page));
-            ((PageCallbacks) page).onPageScroll(mScrollState);
+            ((PageCallbacks) page).onPageScroll(mScrollState, mOverviewGridEnabled);
         }
     }
 
     @Override
     protected int getDestinationPage(int scaledScroll) {
-        if (mGridProgress == 0) {
+        if (!showAsGrid()) {
             return super.getDestinationPage(scaledScroll);
         }
 
@@ -1599,11 +1606,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         }
 
         final int boxLength = Math.max(mTaskWidth, mTaskHeight);
-        float availableHeight = mLastComputedGridSize.height();
-        float rowHeight = (availableHeight - mRowSpacing) / 2;
         int taskTopMargin = mActivity.getDeviceProfile().overviewTaskThumbnailTopMarginPx;
-        float gridScale = rowHeight / (boxLength + taskTopMargin);
-
         int topRowWidth = 0;
         int bottomRowWidth = 0;
         float topAccumulatedTranslationX = 0;
@@ -1621,43 +1624,17 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                 continue;
             }
 
-            taskView.setGridScale(gridScale);
-
-            float scaledWidth = taskView.getLayoutParams().width * gridScale;
-            float taskGridHorizontalDiff;
-            if (mIsRtl) {
-                float taskRight = mLastComputedTaskSize.left + scaledWidth;
-                taskGridHorizontalDiff = mLastComputedGridSize.right - taskRight;
-            } else {
-                float taskLeft = mLastComputedTaskSize.right - scaledWidth;
-                taskGridHorizontalDiff = mLastComputedGridSize.left - taskLeft;
-            }
-            gridTranslations[i] -= taskGridHorizontalDiff;
-            taskView.setGridOffsetTranslationX(taskGridHorizontalDiff);
-
-            float taskGridVerticalDiff = mLastComputedGridSize.top + taskTopMargin * gridScale
-                    - mLastComputedTaskSize.top;
-
-            // Off-set gap due to task scaling.
-            float widthDiff = taskView.getLayoutParams().width * (1 - gridScale);
-            float gridScaleTranslationX = mIsRtl ? widthDiff : -widthDiff;
-            gridTranslations[i] += gridScaleTranslationX;
-
-            // Visible offset caused by having scaling pivot on top-right.
-            taskView.setNonRtlVisibleOffset(mIsRtl ? 0 : widthDiff);
-
             if (topRowWidth <= bottomRowWidth) {
                 gridTranslations[i] += topAccumulatedTranslationX;
-                topRowWidth += taskView.getLayoutParams().width * gridScale + mPageSpacing;
+                topRowWidth += taskView.getLayoutParams().width + mPageSpacing;
                 topSet.add(i);
 
-                taskView.setGridTranslationY(taskGridVerticalDiff);
+                taskView.setGridTranslationY(0);
 
                 // Move horizontally into empty space.
                 float widthOffset = 0;
                 for (int j = i - 1; bottomSet.contains(j); j--) {
-                    widthOffset += getTaskViewAt(j).getLayoutParams().width * gridScale
-                            + mPageSpacing;
+                    widthOffset += getTaskViewAt(j).getLayoutParams().width + mPageSpacing;
                 }
 
                 float gridTranslationX = mIsRtl ? widthOffset : -widthOffset;
@@ -1665,26 +1642,39 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                 topAccumulatedTranslationX += gridTranslationX;
             } else {
                 gridTranslations[i] += bottomAccumulatedTranslationX;
-                bottomRowWidth += taskView.getLayoutParams().width * gridScale + mPageSpacing;
+                bottomRowWidth += taskView.getLayoutParams().width + mPageSpacing;
                 bottomSet.add(i);
 
                 // Move into bottom row.
-                float heightOffset = (boxLength + taskTopMargin) * gridScale + mRowSpacing;
-                taskView.setGridTranslationY(heightOffset + taskGridVerticalDiff);
+                float heightOffset = (boxLength + taskTopMargin) + mRowSpacing;
+                taskView.setGridTranslationY(heightOffset);
 
                 // Move horizontally into empty space.
                 float widthOffset = 0;
                 for (int j = i - 1; topSet.contains(j); j--) {
-                    widthOffset += getTaskViewAt(j).getLayoutParams().width * gridScale
-                            + mPageSpacing;
+                    widthOffset += getTaskViewAt(j).getLayoutParams().width + mPageSpacing;
                 }
 
                 float gridTranslationX = mIsRtl ? widthOffset : -widthOffset;
                 gridTranslations[i] += gridTranslationX;
                 bottomAccumulatedTranslationX += gridTranslationX;
             }
-            topAccumulatedTranslationX += gridScaleTranslationX;
-            bottomAccumulatedTranslationX += gridScaleTranslationX;
+        }
+
+        // If the first non-home task does not take full width of task Rect, shift all tasks
+        // accordingly without affecting scrolls.
+        int firstTaskWidth = getTaskViewAt(firstNonHomeTaskIndex).getLayoutParams().width;
+        float firstNonHomeTaskOffset = firstTaskWidth == ViewGroup.LayoutParams.MATCH_PARENT ? 0
+                : mTaskWidth - firstTaskWidth;
+        float offsetTranslation = mIsRtl ? firstNonHomeTaskOffset : -firstNonHomeTaskOffset;
+
+        // We need to maintain first non-home task's grid translation at 0, now shift translation
+        // of all the TaskViews to achieve that.
+        for (int i = firstNonHomeTaskIndex; i < taskCount; i++) {
+            TaskView taskView = getTaskViewAt(i);
+            taskView.setGridTranslationX(
+                    gridTranslations[i] - gridTranslations[firstNonHomeTaskIndex]);
+            taskView.setGridOffsetTranslationX(offsetTranslation);
         }
 
         // Use the accumulated translation of the longer row.
@@ -1700,7 +1690,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                 shorterRowCompensation = bottomRowWidth - topRowWidth;
             }
         } else {
-            if (!topSet.contains(taskCount - 1)) {
+            if (bottomSet.contains(taskCount - 1)) {
                 shorterRowCompensation = topRowWidth - bottomRowWidth;
             }
         }
@@ -1721,14 +1711,14 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                 clearAllAccumulatedTranslation + clearAllShorterRowCompensation
                         + clearAllShortTotalCompensation;
 
-        // We need to maintain first non-home task's grid translation at 0, now shift translation
-        // of all the TaskViews to achieve that.
-        for (int i = firstNonHomeTaskIndex; i < taskCount; i++) {
-            getTaskViewAt(i).setGridTranslationX(
-                    gridTranslations[i] - gridTranslations[firstNonHomeTaskIndex]);
-        }
         mClearAllButton.setGridTranslationPrimary(
                 clearAllTotalTranslationX - gridTranslations[firstNonHomeTaskIndex]);
+        mClearAllButton.setGridTranslationSecondary(
+                boxLength - mTaskHeight / 2f + mRowSpacing / 2f);
+        mClearAllButton.setGridScrollOffset(
+                mIsRtl ? mLastComputedTaskSize.left - mLastComputedGridSize.left
+                        : mLastComputedTaskSize.right - mLastComputedGridSize.right);
+        mClearAllButton.setOffsetTranslationPrimary(offsetTranslation);
 
         setGridProgress(mGridProgress);
     }
@@ -1753,7 +1743,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         for (int i = 0; i < taskCount; i++) {
             getTaskViewAt(i).setGridProgress(gridProgress);
         }
-        mLiveTileTaskViewSimulator.gridProgress.value = gridProgress;
         mClearAllButton.setGridProgress(gridProgress);
     }
 
@@ -1801,8 +1790,10 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
 
         /**
          * Updates the page UI based on scroll params.
+         *
+         * @param gridEnabled whether Overveiw is currently showing as 2 rows grid
          */
-        default void onPageScroll(ScrollState scrollState) {}
+        default void onPageScroll(ScrollState scrollState, boolean gridEnabled) {}
     }
 
     public static class ScrollState extends CurveProperties {
@@ -2297,7 +2288,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
 
         // Update the pivots such that when the task is scaled, it fills the full page
         getTaskSize(mTempRect);
-        getPagedViewOrientedState().getFullScreenScaleAndPivot(
+        mFullscreenScale = getPagedViewOrientedState().getFullScreenScaleAndPivot(
                 mTempRect, mActivity.getDeviceProfile(), mTempPointF);
         setPivotX(mTempPointF.x);
         setPivotY(mTempPointF.y);
@@ -2858,20 +2849,40 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     @Override
     protected int computeMinScroll() {
         if (getTaskViewCount() > 0) {
-            if (mDisallowScrollToClearAll) {
+            if (mIsRtl && mDisallowScrollToClearAll) {
                 // We aren't showing the clear all button,
                 // so use the leftmost task as the min scroll.
-                if (mIsRtl) {
-                    return getScrollForPage(indexOfChild(getTaskViewAt(getTaskViewCount() - 1)));
-                }
-                return getScrollForPage(mTaskViewStartIndex);
+                return getScrollForPage(indexOfChild(getTaskViewAt(getTaskViewCount() - 1)));
+            }
+            return getLeftMostChildScroll();
+        }
+        return super.computeMinScroll();
+    }
+
+    /**
+     * Returns page scroll of the left most child.
+     */
+    public int getLeftMostChildScroll() {
+        if (mIsRtl) {
+            return getScrollForPage(indexOfChild(getTaskViewAt(getTaskViewCount() - 1)) + 1);
+        }
+        return getScrollForPage(mTaskViewStartIndex);
+    }
+
+    @Override
+    protected int computeMaxScroll() {
+        if (getTaskViewCount() > 0) {
+            if (!mIsRtl && mDisallowScrollToClearAll) {
+                // We aren't showing the clear all button,
+                // so use the rightmost task as the min scroll.
+                return getScrollForPage(indexOfChild(getTaskViewAt(getTaskViewCount() - 1)));
             }
             if (mIsRtl) {
-                return getScrollForPage(indexOfChild(getTaskViewAt(getTaskViewCount() - 1)) + 1);
+                return getScrollForPage(mTaskViewStartIndex);
             }
-            return getScrollForPage(mTaskViewStartIndex);
+            return getScrollForPage(indexOfChild(getTaskViewAt(getTaskViewCount() - 1)) + 1);
         }
-        return super.computeMinScroll();
+        return super.computeMaxScroll();
     }
 
     @Override
@@ -2919,26 +2930,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             return super.getChildVisibleSize(index);
         }
         return (int) (super.getChildVisibleSize(index) * taskView.getSizeAdjustment(
-                mOverviewFullscreenEnabled, showAsGrid()));
-    }
-
-    @Override
-    protected int computeMaxScroll() {
-        if (getTaskViewCount() > 0) {
-            if (mDisallowScrollToClearAll) {
-                // We aren't showing the clear all button,
-                // so use the rightmost task as the min scroll.
-                if (mIsRtl) {
-                    return getScrollForPage(mTaskViewStartIndex);
-                }
-                return getScrollForPage(indexOfChild(getTaskViewAt(getTaskViewCount() - 1)));
-            }
-            if (mIsRtl) {
-                return getScrollForPage(mTaskViewStartIndex);
-            }
-            return getScrollForPage(indexOfChild(getTaskViewAt(getTaskViewCount() - 1)) + 1);
-        }
-        return super.computeMaxScroll();
+                mOverviewFullscreenEnabled));
     }
 
     public ClearAllButton getClearAllButton() {
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index be044e7c48..d497a96edb 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -279,7 +279,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     private float mFullscreenProgress;
     private float mGridProgress;
     private float mFullscreenScale = 1;
-    private float mGridScale = 1;
     private final FullscreenDrawParams mCurrentFullscreenParams;
     private final StatefulActivity mActivity;
 
@@ -298,7 +297,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     private float mGridTranslationY;
     // Offset translation does not affect scroll calculation.
     private float mGridOffsetTranslationX;
-    private float mNonRtlVisibleOffset;
 
     private ObjectAnimator mIconAndDimAnimator;
     private float mIconScaleAnimStartProgress = 0;
@@ -678,9 +676,10 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         PagedOrientationHandler orientationHandler = orientationState.getOrientationHandler();
         boolean isRtl = getLayoutDirection() == LAYOUT_DIRECTION_RTL;
         LayoutParams snapshotParams = (LayoutParams) mSnapshotView.getLayoutParams();
-        snapshotParams.topMargin = mActivity.getDeviceProfile().overviewTaskThumbnailTopMarginPx;
-        int taskIconMargin = mActivity.getDeviceProfile().overviewTaskMarginPx;
-        int taskIconHeight = (int) getResources().getDimension(R.dimen.task_thumbnail_icon_size);
+        DeviceProfile deviceProfile = mActivity.getDeviceProfile();
+        snapshotParams.topMargin = deviceProfile.overviewTaskThumbnailTopMarginPx;
+        int taskIconMargin = deviceProfile.overviewTaskMarginPx;
+        int taskIconHeight = deviceProfile.overviewTaskIconSizePx;
         LayoutParams iconParams = (LayoutParams) mIconView.getLayoutParams();
         switch (orientationHandler.getRotation()) {
             case ROTATION_90:
@@ -709,8 +708,11 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
                 break;
         }
         mSnapshotView.setLayoutParams(snapshotParams);
+        iconParams.width = iconParams.height = taskIconHeight;
         mIconView.setLayoutParams(iconParams);
         mIconView.setRotation(orientationHandler.getDegreesRotated());
+        snapshotParams.topMargin = deviceProfile.overviewTaskThumbnailTopMarginPx;
+        mSnapshotView.setLayoutParams(snapshotParams);
 
         if (mMenuView != null) {
             mMenuView.onRotationChanged();
@@ -790,8 +792,8 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
 
     @Override
     public void onRecycle() {
-        mFullscreenTranslationX = mGridTranslationX = mGridTranslationY =
-                mGridOffsetTranslationX = mBoxTranslationY = mNonRtlVisibleOffset = 0f;
+        mFullscreenTranslationX = mGridTranslationX =
+                mGridTranslationY = mGridOffsetTranslationX = mBoxTranslationY = 0f;
         resetViewTransforms();
         // Clear any references to the thumbnail (it will be re-read either from the cache or the
         // system on next bind)
@@ -801,7 +803,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     }
 
     @Override
-    public void onPageScroll(ScrollState scrollState) {
+    public void onPageScroll(ScrollState scrollState, boolean gridEnabled) {
         // Don't do anything if it's modal.
         if (mModalness > 0) {
             return;
@@ -904,11 +906,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         return mFullscreenScale;
     }
 
-    public void setGridScale(float gridScale) {
-        mGridScale = gridScale;
-        applyScale();
-    }
-
     /**
      * Moves TaskView between carousel and 2 row grid.
      *
@@ -925,8 +922,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         float scale = 1;
         float fullScreenProgress = EXAGGERATED_EASE.getInterpolation(mFullscreenProgress);
         scale *= Utilities.mapRange(fullScreenProgress, 1f, mFullscreenScale);
-        float gridProgress = ACCEL_DEACCEL.getInterpolation(mGridProgress);
-        scale *= Utilities.mapRange(gridProgress, 1f, mGridScale);
         setScaleX(scale);
         setScaleY(scale);
     }
@@ -989,10 +984,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         applyTranslationX();
     }
 
-    public void setNonRtlVisibleOffset(float nonRtlVisibleOffset) {
-        mNonRtlVisibleOffset = nonRtlVisibleOffset;
-    }
-
     public float getScrollAdjustment(boolean fullscreenEnabled, boolean gridEnabled) {
         float scrollAdjustment = 0;
         if (fullscreenEnabled) {
@@ -1004,22 +995,19 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         return scrollAdjustment;
     }
 
-    public float getOffsetAdjustment(boolean fullscreenEnabled, boolean gridEnabled) {
+    public float getOffsetAdjustment(boolean fullscreenEnabled,boolean gridEnabled) {
         float offsetAdjustment = getScrollAdjustment(fullscreenEnabled, gridEnabled);
         if (gridEnabled) {
-            offsetAdjustment += mGridOffsetTranslationX + mNonRtlVisibleOffset;
+            offsetAdjustment += mGridOffsetTranslationX;
         }
         return offsetAdjustment;
     }
 
-    public float getSizeAdjustment(boolean fullscreenEnabled, boolean gridEnabled) {
+    public float getSizeAdjustment(boolean fullscreenEnabled) {
         float sizeAdjustment = 1;
         if (fullscreenEnabled) {
             sizeAdjustment *= mFullscreenScale;
         }
-        if (gridEnabled) {
-            sizeAdjustment *= mGridScale;
-        }
         return sizeAdjustment;
     }
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 73af517e98..1fccdf34a6 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -294,6 +294,7 @@
 
 <!-- Overview placeholder to compile in Launcer3 without Quickstep -->
     <dimen name="task_thumbnail_icon_size">0dp</dimen>
+    <dimen name="task_thumbnail_icon_size_grid">0dp</dimen>
     <dimen name="overview_task_margin">0dp</dimen>
 
 </resources>
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 09f4cde195..58d612d014 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -152,8 +152,9 @@ public class DeviceProfile {
     public float allAppsIconTextSizePx;
 
     // Overview
-    public int overviewTaskThumbnailTopMarginPx;
     public int overviewTaskMarginPx;
+    public int overviewTaskIconSizePx;
+    public int overviewTaskThumbnailTopMarginPx;
 
     // Widgets
     public final PointF appWidgetScale = new PointF(1.0f, 1.0f);
@@ -301,10 +302,12 @@ public class DeviceProfile {
                 : (hotseatBarTopPaddingPx + hotseatBarBottomPaddingPx
                         + (isScalableGrid ? 0 : hotseatExtraVerticalSize)));
 
-
         overviewTaskMarginPx = res.getDimensionPixelSize(R.dimen.overview_task_margin);
-        overviewTaskThumbnailTopMarginPx = res.getDimensionPixelSize(
-                R.dimen.task_thumbnail_icon_size) + 2 * overviewTaskMarginPx;
+        overviewTaskIconSizePx =
+                isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get() ? res.getDimensionPixelSize(
+                        R.dimen.task_thumbnail_icon_size_grid) : res.getDimensionPixelSize(
+                        R.dimen.task_thumbnail_icon_size);
+        overviewTaskThumbnailTopMarginPx = overviewTaskIconSizePx + overviewTaskMarginPx * 2;
 
         // Calculate all of the remaining variables.
         extraSpace = updateAvailableDimensions(res);
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 65fde8659a..76885ccbc8 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1512,17 +1512,16 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         return getDestinationPage(mOrientationHandler.getPrimaryScroll(this));
     }
 
-    protected int getDestinationPage(int scaledScroll) {
-        return getPageNearestToCenterOfScreen(scaledScroll);
+    protected int getDestinationPage(int primaryScroll) {
+        return getPageNearestToCenterOfScreen(primaryScroll);
     }
 
     public int getPageNearestToCenterOfScreen() {
         return getPageNearestToCenterOfScreen(mOrientationHandler.getPrimaryScroll(this));
     }
 
-    private int getPageNearestToCenterOfScreen(int scaledScroll) {
-        int pageOrientationSize = mOrientationHandler.getMeasuredSize(this);
-        int screenCenter = scaledScroll + (pageOrientationSize / 2);
+    private int getPageNearestToCenterOfScreen(int primaryScroll) {
+        int screenCenter = getScreenCenter(primaryScroll);
         int minDistanceFromScreenCenter = Integer.MAX_VALUE;
         int minDistanceFromScreenCenterIndex = -1;
         final int childCount = getChildCount();
@@ -1538,18 +1537,26 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
     }
 
     private int getDisplacementFromScreenCenter(int childIndex, int screenCenter) {
-        int childSize = getChildVisibleSize(childIndex);
+        int childSize = Math.round(getChildVisibleSize(childIndex));
         int halfChildSize = (childSize / 2);
         int childCenter = getChildOffset(childIndex) + halfChildSize;
         return childCenter - screenCenter;
     }
 
     protected int getDisplacementFromScreenCenter(int childIndex) {
-        int pageOrientationSize = mOrientationHandler.getMeasuredSize(this);
-        int screenCenter = mOrientationHandler.getPrimaryScroll(this) + (pageOrientationSize / 2);
+        int primaryScroll = mOrientationHandler.getPrimaryScroll(this);
+        int screenCenter = getScreenCenter(primaryScroll);
         return getDisplacementFromScreenCenter(childIndex, screenCenter);
     }
 
+    private int getScreenCenter(int primaryScroll) {
+        float primaryScale = mOrientationHandler.getPrimaryScale(this);
+        float primaryPivot =  mOrientationHandler.getPrimaryValue(getPivotX(), getPivotY());
+        int pageOrientationSize = mOrientationHandler.getMeasuredSize(this);
+        return Math.round(primaryScroll + (pageOrientationSize / 2f - primaryPivot) / primaryScale
+                + primaryPivot);
+    }
+
     protected void snapToDestination() {
         snapToPage(getDestinationPage(), getPageSnapDuration());
     }
diff --git a/src/com/android/launcher3/anim/Interpolators.java b/src/com/android/launcher3/anim/Interpolators.java
index 6b9ed09c77..7980138370 100644
--- a/src/com/android/launcher3/anim/Interpolators.java
+++ b/src/com/android/launcher3/anim/Interpolators.java
@@ -77,6 +77,9 @@ public class Interpolators {
 
     public static final Interpolator TOUCH_RESPONSE_INTERPOLATOR =
             new PathInterpolator(0.3f, 0f, 0.1f, 1f);
+    public static final Interpolator TOUCH_RESPONSE_INTERPOLATOR_ACCEL_DEACCEL =
+            v -> ACCEL_DEACCEL.getInterpolation(TOUCH_RESPONSE_INTERPOLATOR.getInterpolation(v));
+
 
     /**
      * Inversion of ZOOM_OUT, compounded with an ease-out.
diff --git a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
index c1cf0c8ec2..19dfe15f62 100644
--- a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
+++ b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
@@ -136,7 +136,7 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
     }
 
     @Override
-    public int getClearAllScrollOffset(View view, boolean isRtl) {
+    public int getClearAllSidePadding(View view, boolean isRtl) {
         return (isRtl ? view.getPaddingBottom() : - view.getPaddingTop()) / 2;
     }
 
diff --git a/src/com/android/launcher3/touch/PagedOrientationHandler.java b/src/com/android/launcher3/touch/PagedOrientationHandler.java
index fcfa205ed2..9140a04341 100644
--- a/src/com/android/launcher3/touch/PagedOrientationHandler.java
+++ b/src/com/android/launcher3/touch/PagedOrientationHandler.java
@@ -66,7 +66,7 @@ public interface PagedOrientationHandler {
     float getPrimaryVelocity(VelocityTracker velocityTracker, int pointerId);
     int getMeasuredSize(View view);
     float getPrimarySize(RectF rect);
-    int getClearAllScrollOffset(View view, boolean isRtl);
+    int getClearAllSidePadding(View view, boolean isRtl);
     int getSecondaryDimension(View view);
     FloatProperty<View> getPrimaryViewTranslate();
     FloatProperty<View> getSecondaryViewTranslate();
diff --git a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
index 2bc2dc7d93..29be62733c 100644
--- a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
+++ b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
@@ -132,7 +132,7 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
     }
 
     @Override
-    public int getClearAllScrollOffset(View view, boolean isRtl) {
+    public int getClearAllSidePadding(View view, boolean isRtl) {
         return (isRtl ? view.getPaddingRight() : - view.getPaddingLeft()) / 2;
     }
 
-- 
GitLab


From c9e69fa98da5bb166edf0978bf45d3c1bfd952ab Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Mon, 22 Mar 2021 17:13:34 -0400
Subject: [PATCH 0770/1664] Refactor device padding to be set per grid option

- Fixes bug where devices with scaled grids were not
  getting the correct deivce padding.
- Also fix bug where device padding was invalid.
  Added validation check when processing paddings to prevent
  this from happening again.

Bug: 175329686
Test: manual, enable debug flag,
      run and verify no crash from validation check

Change-Id: I35b019c40667c08de4fad95ac4b05b2d8f8a0e74
---
 res/values/attrs.xml                          |  1 +
 ...size_limits.xml => size_limits_80x104.xml} |  2 +-
 src/com/android/launcher3/DevicePaddings.java | 44 ++++++++++++++++---
 src/com/android/launcher3/DeviceProfile.java  | 27 +++++++++---
 .../launcher3/InvariantDeviceProfile.java     | 14 ++++--
 5 files changed, 74 insertions(+), 14 deletions(-)
 rename res/xml/{size_limits.xml => size_limits_80x104.xml} (98%)

diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 4078ef4092..f4a729f734 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -134,6 +134,7 @@
         <attr name="defaultLayoutId" format="reference" />
         <attr name="demoModeLayoutId" format="reference" />
         <attr name="isScalable" format="boolean" />
+        <attr name="devicePaddingId" format="reference" />
 
     </declare-styleable>
 
diff --git a/res/xml/size_limits.xml b/res/xml/size_limits_80x104.xml
similarity index 98%
rename from res/xml/size_limits.xml
rename to res/xml/size_limits_80x104.xml
index ba570146de..e11bc5ecfa 100644
--- a/res/xml/size_limits.xml
+++ b/res/xml/size_limits_80x104.xml
@@ -38,7 +38,7 @@
         <workspaceBottomPadding
             launcher:a="0.50"
             launcher:b="0"
-            launcher:c="-16dp"/>
+            launcher:c="16dp"/>
         <hotseatBottomPadding
             launcher:a="0.50"
             launcher:b="0"
diff --git a/src/com/android/launcher3/DevicePaddings.java b/src/com/android/launcher3/DevicePaddings.java
index 4827f362c8..7c387b1efe 100644
--- a/src/com/android/launcher3/DevicePaddings.java
+++ b/src/com/android/launcher3/DevicePaddings.java
@@ -52,8 +52,8 @@ public class DevicePaddings {
 
     ArrayList<DevicePadding> mDevicePaddings = new ArrayList<>();
 
-    public DevicePaddings(Context context) {
-        try (XmlResourceParser parser = context.getResources().getXml(R.xml.size_limits)) {
+    public DevicePaddings(Context context, int devicePaddingId) {
+        try (XmlResourceParser parser = context.getResources().getXml(devicePaddingId)) {
             final int depth = parser.getDepth();
             int type;
             while (((type = parser.next()) != XmlPullParser.END_TAG ||
@@ -94,16 +94,27 @@ public class DevicePaddings {
                             if (workspaceTopPadding == null
                                     || workspaceBottomPadding == null
                                     || hotseatBottomPadding == null) {
-                                throw new RuntimeException("DevicePadding missing padding.");
+                                if (Utilities.IS_DEBUG_DEVICE) {
+                                    throw new RuntimeException("DevicePadding missing padding.");
+                                }
                             }
 
-                            mDevicePaddings.add(new DevicePadding(maxWidthPx, workspaceTopPadding,
-                                    workspaceBottomPadding, hotseatBottomPadding));
+                            DevicePadding dp = new DevicePadding(maxWidthPx, workspaceTopPadding,
+                                    workspaceBottomPadding, hotseatBottomPadding);
+                            if (dp.isValid()) {
+                                mDevicePaddings.add(dp);
+                            } else {
+                                Log.e(TAG, "Invalid device padding found.");
+                                if (Utilities.IS_DEBUG_DEVICE) {
+                                    throw new RuntimeException("DevicePadding is invalid");
+                                }
+                            }
                         }
                     }
                 }
             }
         } catch (IOException | XmlPullParserException e) {
+            Log.e(TAG, "Failure parsing device padding layout.", e);
             throw new RuntimeException(e);
         }
 
@@ -128,6 +139,9 @@ public class DevicePaddings {
      */
     public static final class DevicePadding {
 
+        // One for each padding since they can each be off by 1 due to rounding errors.
+        private static final int ROUNDING_THRESHOLD_PX = 3;
+
         private final int maxEmptySpacePx;
         private final PaddingFormula workspaceTopPadding;
         private final PaddingFormula workspaceBottomPadding;
@@ -143,6 +157,10 @@ public class DevicePaddings {
             this.hotseatBottomPadding = hotseatBottomPadding;
         }
 
+        public int getMaxEmptySpacePx() {
+            return maxEmptySpacePx;
+        }
+
         public int getWorkspaceTopPadding(int extraSpacePx) {
             return workspaceTopPadding.calculate(extraSpacePx);
         }
@@ -154,6 +172,22 @@ public class DevicePaddings {
         public int getHotseatBottomPadding(int extraSpacePx) {
             return hotseatBottomPadding.calculate(extraSpacePx);
         }
+
+        public boolean isValid() {
+            int workspaceTopPadding = getWorkspaceTopPadding(maxEmptySpacePx);
+            int workspaceBottomPadding = getWorkspaceBottomPadding(maxEmptySpacePx);
+            int hotseatBottomPadding = getHotseatBottomPadding(maxEmptySpacePx);
+            int sum = workspaceTopPadding + workspaceBottomPadding + hotseatBottomPadding;
+            int diff = Math.abs(sum - maxEmptySpacePx);
+            if (DEBUG) {
+                Log.d(TAG, "isValid: workspaceTopPadding=" + workspaceTopPadding
+                        + ", workspaceBottomPadding=" + workspaceBottomPadding
+                        + ", hotseatBottomPadding=" + hotseatBottomPadding
+                        + ", sum=" + sum
+                        + ", diff=" + diff);
+            }
+            return diff <= ROUNDING_THRESHOLD_PX;
+        }
     }
 
     /**
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 58d612d014..1ce5f4dba6 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -104,6 +104,7 @@ public class DeviceProfile {
     private final int mWorkspacePageIndicatorOverlapWorkspace;
 
     // Workspace icons
+    public float iconScale;
     public int iconSizePx;
     public int iconTextSizePx;
     public int iconDrawablePaddingPx;
@@ -312,12 +313,19 @@ public class DeviceProfile {
         // Calculate all of the remaining variables.
         extraSpace = updateAvailableDimensions(res);
         // Now that we have all of the variables calculated, we can tune certain sizes.
-        if (isScalableGrid) {
-            DevicePadding padding = inv.devicePaddings.getDevicePadding(extraSpace);
-            workspaceTopPadding = padding.getWorkspaceTopPadding(extraSpace);
-            workspaceBottomPadding = padding.getWorkspaceBottomPadding(extraSpace);
+        if (isScalableGrid && inv.devicePaddings != null) {
+            // Paddings were created assuming no scaling, so we first unscale the extra space.
+            int unscaledExtraSpace = (int) (extraSpace / iconScale);
+            DevicePadding padding = inv.devicePaddings.getDevicePadding(unscaledExtraSpace);
+
+            int paddingWorkspaceTop = padding.getWorkspaceTopPadding(unscaledExtraSpace);
+            int paddingWorkspaceBottom = padding.getWorkspaceBottomPadding(unscaledExtraSpace);
+            int paddingHotseatBottom = padding.getHotseatBottomPadding(unscaledExtraSpace);
+
+            workspaceTopPadding = Math.round(paddingWorkspaceTop * iconScale);
+            workspaceBottomPadding = Math.round(paddingWorkspaceBottom * iconScale);
+            extraHotseatBottomPadding = Math.round(paddingHotseatBottom * iconScale);
 
-            extraHotseatBottomPadding = padding.getHotseatBottomPadding(extraSpace);
             hotseatBarSizePx += extraHotseatBottomPadding;
             hotseatBarBottomPaddingPx += extraHotseatBottomPadding;
         } else if (!isVerticalBarLayout() && isPhone && isTallDevice) {
@@ -490,6 +498,8 @@ public class DeviceProfile {
      * hotseat sizes, workspaceSpringLoadedShrinkFactor, folderIconSizePx, and folderIconOffsetYPx.
      */
     public void updateIconSize(float scale, Resources res) {
+        iconScale = scale;
+
         // Workspace
         final boolean isVerticalLayout = isVerticalBarLayout();
         float invIconSizeDp = isVerticalLayout ? inv.landscapeIconSize : inv.iconSize;
@@ -890,7 +900,14 @@ public class DeviceProfile {
         writer.println(prefix + pxToDpStr("workspacePadding.right", workspacePadding.right));
         writer.println(prefix + pxToDpStr("workspacePadding.bottom", workspacePadding.bottom));
 
+        writer.println(prefix + pxToDpStr("scaleToFit", iconScale));
         writer.println(prefix + pxToDpStr("extraSpace", extraSpace));
+
+        if (inv.devicePaddings != null) {
+            int unscaledExtraSpace = (int) (extraSpace / iconScale);
+            writer.println(prefix + pxToDpStr("maxEmptySpace",
+                    inv.devicePaddings.getDevicePadding(unscaledExtraSpace).getMaxEmptySpacePx()));
+        }
         writer.println(prefix + pxToDpStr("workspaceTopPadding", workspaceTopPadding));
         writer.println(prefix + pxToDpStr("workspaceBottomPadding", workspaceBottomPadding));
         writer.println(prefix + pxToDpStr("extraHotseatBottomPadding", extraHotseatBottomPadding));
diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index 348d9eef2c..3dbd4794a2 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -132,6 +132,7 @@ public class InvariantDeviceProfile {
      * Do not query directly. see {@link DeviceProfile#isScalableGrid}.
      */
     protected boolean isScalable;
+    public int devicePaddingId;
 
     public String dbFile;
     public int defaultLayoutId;
@@ -140,7 +141,7 @@ public class InvariantDeviceProfile {
     public DeviceProfile landscapeProfile;
     public DeviceProfile portraitProfile;
 
-    public DevicePaddings devicePaddings;
+    @Nullable public DevicePaddings devicePaddings;
 
     public Point defaultWallpaperSize;
     public Rect defaultWidgetPadding;
@@ -165,6 +166,7 @@ public class InvariantDeviceProfile {
         numHotseatIcons = p.numHotseatIcons;
         numAllAppsColumns = p.numAllAppsColumns;
         isScalable = p.isScalable;
+        devicePaddingId = p.devicePaddingId;
         minCellHeight = p.minCellHeight;
         minCellWidth = p.minCellWidth;
         borderSpacing = p.borderSpacing;
@@ -231,7 +233,6 @@ public class InvariantDeviceProfile {
         result.minCellWidth = defaultDisplayOption.minCellWidth;
         result.borderSpacing = defaultDisplayOption.borderSpacing;
 
-        devicePaddings = new DevicePaddings(context);
         initGrid(context, myInfo, result);
     }
 
@@ -262,7 +263,6 @@ public class InvariantDeviceProfile {
         ArrayList<DisplayOption> allOptions = getPredefinedDeviceProfiles(context, gridName);
 
         DisplayOption displayOption = invDistWeightedInterpolate(displayInfo, allOptions);
-        devicePaddings = new DevicePaddings(context);
         initGrid(context, displayInfo, displayOption);
         return displayOption.grid.name;
     }
@@ -280,6 +280,7 @@ public class InvariantDeviceProfile {
         numFolderColumns = closestProfile.numFolderColumns;
         numAllAppsColumns = closestProfile.numAllAppsColumns;
         isScalable = closestProfile.isScalable;
+        devicePaddingId = closestProfile.devicePaddingId;
 
         mExtraAttrs = closestProfile.extraAttrs;
 
@@ -302,6 +303,10 @@ public class InvariantDeviceProfile {
             allAppsIconTextSize = iconTextSize;
         }
 
+        if (devicePaddingId != 0) {
+            devicePaddings = new DevicePaddings(context, devicePaddingId);
+        }
+
         // If the partner customization apk contains any grid overrides, apply them
         // Supported overrides: numRows, numColumns, iconSize
         applyPartnerDeviceProfileOverrides(context, displayInfo.metrics);
@@ -615,6 +620,7 @@ public class InvariantDeviceProfile {
         private final int demoModeLayoutId;
 
         private final boolean isScalable;
+        private final int devicePaddingId;
 
         private final SparseArray<TypedValue> extraAttrs;
 
@@ -641,6 +647,8 @@ public class InvariantDeviceProfile {
 
             isScalable = a.getBoolean(
                     R.styleable.GridDisplayOption_isScalable, false);
+            devicePaddingId = a.getResourceId(
+                    R.styleable.GridDisplayOption_devicePaddingId, 0);
 
             a.recycle();
 
-- 
GitLab


From 7c43972c50b47d11bc9c83e7364586b3a045dbbc Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Wed, 24 Mar 2021 11:32:44 +0000
Subject: [PATCH 0771/1664] Move numAllAppsColumns to displayOptions

- Allow different number of columns per screen size

Bug: 171915986
Test: Manual
Change-Id: I7b7d518289ea56624dc87512f639e92f10f6b586
---
 res/values/attrs.xml                          |  5 +++--
 .../launcher3/InvariantDeviceProfile.java     | 20 +++++++++++++------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 4078ef4092..1da6bc4e45 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -129,8 +129,6 @@
         <!-- numHotseatIcons defaults to numColumns, if not specified -->
         <attr name="numHotseatIcons" format="integer" />
         <attr name="dbFile" format="string" />
-        <!-- numAllAppsColumns defaults to numColumns, if not specified -->
-        <attr name="numAllAppsColumns" format="integer" />
         <attr name="defaultLayoutId" format="reference" />
         <attr name="demoModeLayoutId" format="reference" />
         <attr name="isScalable" format="boolean" />
@@ -170,6 +168,9 @@
         <attr name="allAppsIconSize" format="float" />
         <!-- allAppsIconTextSize defaults to iconTextSize, if not specified -->
         <attr name="allAppsIconTextSize" format="float" />
+
+        <!-- numAllAppsColumns defaults to GridDisplayOption.numColumns, if not specified -->
+        <attr name="numAllAppsColumns" format="integer" />
     </declare-styleable>
 
     <declare-styleable name="CellLayout">
diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index 348d9eef2c..320b97c829 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -225,8 +225,13 @@ public class InvariantDeviceProfile {
                 .add(myDisplayOption);
         result.iconSize = defaultDisplayOption.iconSize;
         result.landscapeIconSize = defaultDisplayOption.landscapeIconSize;
-        result.allAppsIconSize = Math.min(
-                defaultDisplayOption.allAppsIconSize, myDisplayOption.allAppsIconSize);
+        if (defaultDisplayOption.allAppsIconSize < myDisplayOption.allAppsIconSize) {
+            result.allAppsIconSize = defaultDisplayOption.allAppsIconSize;
+            result.numAllAppsColumns = defaultDisplayOption.numAllAppsColumns;
+        } else {
+            result.allAppsIconSize = myDisplayOption.allAppsIconSize;
+            result.numAllAppsColumns = myDisplayOption.numAllAppsColumns;
+        }
         result.minCellHeight = defaultDisplayOption.minCellHeight;
         result.minCellWidth = defaultDisplayOption.minCellWidth;
         result.borderSpacing = defaultDisplayOption.borderSpacing;
@@ -278,7 +283,6 @@ public class InvariantDeviceProfile {
         demoModeLayoutId = closestProfile.demoModeLayoutId;
         numFolderRows = closestProfile.numFolderRows;
         numFolderColumns = closestProfile.numFolderColumns;
-        numAllAppsColumns = closestProfile.numAllAppsColumns;
         isScalable = closestProfile.isScalable;
 
         mExtraAttrs = closestProfile.extraAttrs;
@@ -293,6 +297,7 @@ public class InvariantDeviceProfile {
         minCellHeight = displayOption.minCellHeight;
         minCellWidth = displayOption.minCellWidth;
         borderSpacing = displayOption.borderSpacing;
+        numAllAppsColumns = Math.round(displayOption.numAllAppsColumns);
 
         if (Utilities.isGridOptionsEnabled(context)) {
             allAppsIconSize = displayOption.allAppsIconSize;
@@ -609,7 +614,6 @@ public class InvariantDeviceProfile {
         private final int numHotseatIcons;
 
         private final String dbFile;
-        private final int numAllAppsColumns;
 
         private final int defaultLayoutId;
         private final int demoModeLayoutId;
@@ -636,8 +640,6 @@ public class InvariantDeviceProfile {
                     R.styleable.GridDisplayOption_numFolderRows, numRows);
             numFolderColumns = a.getInt(
                     R.styleable.GridDisplayOption_numFolderColumns, numColumns);
-            numAllAppsColumns = a.getInt(
-                    R.styleable.GridDisplayOption_numAllAppsColumns, numColumns);
 
             isScalable = a.getBoolean(
                     R.styleable.GridDisplayOption_isScalable, false);
@@ -656,6 +658,7 @@ public class InvariantDeviceProfile {
         private final float minHeightDps;
         private final boolean canBeDefault;
 
+        private float numAllAppsColumns;
         private float minCellHeight;
         private float minCellWidth;
         private float borderSpacing;
@@ -676,6 +679,8 @@ public class InvariantDeviceProfile {
             minHeightDps = a.getFloat(R.styleable.ProfileDisplayOption_minHeightDps, 0);
             canBeDefault = a.getBoolean(
                     R.styleable.ProfileDisplayOption_canBeDefault, false);
+            numAllAppsColumns = a.getInt(R.styleable.ProfileDisplayOption_numAllAppsColumns,
+                    grid.numColumns);
 
             minCellHeight = a.getFloat(R.styleable.ProfileDisplayOption_minCellHeightDps, 0);
             minCellWidth = a.getFloat(R.styleable.ProfileDisplayOption_minCellWidthDps, 0);
@@ -702,12 +707,14 @@ public class InvariantDeviceProfile {
             minWidthDps = 0;
             minHeightDps = 0;
             canBeDefault = false;
+            numAllAppsColumns = 0;
             minCellHeight = 0;
             minCellWidth = 0;
             borderSpacing = 0;
         }
 
         private DisplayOption multiply(float w) {
+            numAllAppsColumns *= w;
             iconSize *= w;
             landscapeIconSize *= w;
             allAppsIconSize *= w;
@@ -720,6 +727,7 @@ public class InvariantDeviceProfile {
         }
 
         private DisplayOption add(DisplayOption p) {
+            numAllAppsColumns += p.numAllAppsColumns;
             iconSize += p.iconSize;
             landscapeIconSize += p.landscapeIconSize;
             allAppsIconSize += p.allAppsIconSize;
-- 
GitLab


From e0b8c8396a1ffd1341841ea32ca9d08544aa0dbb Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Wed, 24 Mar 2021 19:34:44 -0500
Subject: [PATCH 0772/1664] [String][Work profile] Update work profile strings

Bug: 183517121
Test: Manual
Change-Id: I334854170dca6ecf321da0ec2094ab993404c229
---
 res/values/strings.xml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1eb123bb92..8faac48c8b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -379,9 +379,18 @@
     <!--- heading shown when user opens work apps tab while work apps are paused -->
     <string name="work_apps_paused_title">Work profile is paused</string>
     <!--- body shown when user opens work apps tab while work apps are paused -->
-    <string name="work_apps_paused_body">Work apps can\'t send you notifications, use your battery, or access your location</string>
+    <string name="work_apps_paused_body">Work apps can’t send you notifications, use your battery, or access your location</string>
     <!-- content description for paused work apps list -->
-    <string name="work_apps_paused_content_description">Work profile is paused. Work apps can\’t send you notifications, use your battery, or access your location</string>
+    <string name="work_apps_paused_content_description">Work profile is paused. Work apps can’t send you notifications, use your battery, or access your location</string>
+    <!-- string shown in educational banner about work profile -->
+    <string name="work_apps_paused_edu_banner">Work apps are badged and visible to your IT admin</string>
+    <!-- button string shown to dismiss work tab education -->
+    <string name="work_apps_paused_edu_accept">Got it</string>
+
+    <!-- button string shown pause work profile -->
+    <string name="work_apps_pause_btn_text">Pause work apps</string>
+    <!-- button string shown enable work profile -->
+    <string name="work_apps_enable_btn_text">Turn on</string>
 
     <!-- A hint shown in launcher settings develop options filter box -->
     <string name="developer_options_filter_hint">Filter</string>
-- 
GitLab


From 773050d228287b42e4a1beec2b89c6533e65c251 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Mon, 22 Mar 2021 19:47:46 -0700
Subject: [PATCH 0773/1664] Fix a memory leak

Currently we pass a callback from AbsSwipeUpHandler to TaskAnimationManager to render task view launch animation, exposing the launcher activity to the static TouchInteractionService, which causes the leak. To not only fix the leak, but consider a better place for this functionality semantically, RecentsView is a better home.

Fixes: 183458638
Test: Run presubmit

Change-Id: Id35d0ad22005003d2516c34515a5cb338605be0b
---
 .../android/quickstep/AbsSwipeUpHandler.java  | 108 ++----------------
 .../quickstep/RecentsAnimationTargets.java    |   9 --
 .../quickstep/TaskAnimationManager.java       |  49 +++++---
 .../quickstep/util/InputConsumerProxy.java    |  28 +++--
 .../util/InputProxyHandlerFactory.java        |  53 +++++++++
 .../android/quickstep/views/RecentsView.java  |  75 ++++++++++++
 6 files changed, 187 insertions(+), 135 deletions(-)
 create mode 100644 quickstep/src/com/android/quickstep/util/InputProxyHandlerFactory.java

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index f4ef1f7e47..c91fa9fd5c 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -22,7 +22,6 @@ import static android.widget.Toast.LENGTH_SHORT;
 
 import static com.android.launcher3.BaseActivity.INVISIBLE_BY_STATE_HANDLER;
 import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS;
-import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DURATION;
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.anim.Interpolators.DEACCEL;
 import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
@@ -97,8 +96,8 @@ import com.android.quickstep.util.ActiveGestureLog;
 import com.android.quickstep.util.ActivityInitListener;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
 import com.android.quickstep.util.InputConsumerProxy;
+import com.android.quickstep.util.InputProxyHandlerFactory;
 import com.android.quickstep.util.MotionPauseDetector;
-import com.android.quickstep.util.MultiValueUpdateListener;
 import com.android.quickstep.util.ProtoTracer;
 import com.android.quickstep.util.RecentsOrientedState;
 import com.android.quickstep.util.RectFSpringAnim;
@@ -113,12 +112,10 @@ import com.android.systemui.shared.system.InputConsumerController;
 import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
 import com.android.systemui.shared.system.LatencyTrackerCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
-import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
 import com.android.systemui.shared.system.TaskInfoCompat;
 import com.android.systemui.shared.system.TaskStackChangeListener;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.function.Consumer;
 
 /**
@@ -255,7 +252,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         mActivityInterface = gestureState.getActivityInterface();
         mActivityInitListener = mActivityInterface.createActivityInitListener(this::onActivityInit);
         mInputConsumerProxy =
-                new InputConsumerProxy(inputConsumer, this::createNewInputProxyHandler);
+                new InputConsumerProxy(inputConsumer, () -> {
+                    endRunningWindowAnim(mGestureState.getEndTarget() == HOME /* cancel */);
+                    endLauncherTransitionController();
+                }, new InputProxyHandlerFactory(mActivityInterface, mGestureState));
         mTaskAnimationManager = taskAnimationManager;
         mTouchTimeMs = touchTimeMs;
         mContinuingLastGesture = continuingLastGesture;
@@ -783,19 +783,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         handleNormalGestureEnd(endVelocity, isFling, velocity, false /* isCancel */);
     }
 
-    /**
-     * Called to create a input proxy for the running task
-     */
-    @UiThread
-    protected InputConsumer createNewInputProxyHandler() {
-        endRunningWindowAnim(mGestureState.getEndTarget() == HOME /* cancel */);
-        endLauncherTransitionController();
-
-        StatefulActivity activity = mActivityInterface.getCreatedActivity();
-        return activity == null ? InputConsumer.NO_OP
-                : new OverviewInputConsumer(mGestureState, activity, null, true);
-    }
-
     private void endRunningWindowAnim(boolean cancel) {
         if (mRunningWindowAnim != null) {
             if (cancel) {
@@ -1338,6 +1325,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
             mInputConsumerProxy.destroy();
             mTaskAnimationManager.setLiveTileCleanUpHandler(null);
         }
+        mInputConsumerProxy.unregisterCallback();
         endRunningWindowAnim(false /* cancel */);
 
         if (mGestureEndCallback != null) {
@@ -1502,36 +1490,13 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
 
     protected abstract void finishRecentsControllerToHome(Runnable callback);
 
-    private final TaskStackChangeListener mLiveTileRestartListener = new TaskStackChangeListener() {
-        @Override
-        public void onActivityRestartAttempt(ActivityManager.RunningTaskInfo task,
-                boolean homeTaskVisible, boolean clearedTask, boolean wasVisible) {
-            if (mRecentsView.getRunningTaskIndex() != -1
-                    && mRecentsView.getRunningTaskId() == task.taskId
-                    && mRecentsAnimationTargets.hasTask(task.taskId)) {
-                launchOtherTaskInLiveTileMode(task.taskId, mRecentsAnimationTargets.apps);
-            }
-            ActivityManagerWrapper.getInstance().unregisterTaskStackListener(
-                    mLiveTileRestartListener);
-        }
-    };
-
     private void setupLauncherUiAfterSwipeUpToRecentsAnimation() {
         endLauncherTransitionController();
         mActivityInterface.onSwipeUpToRecentsComplete();
         mRecentsView.onSwipeUpAnimationSuccess();
         if (LIVE_TILE.get()) {
-            mTaskAnimationManager.setLaunchOtherTaskInLiveTileModeHandler(
-                    appearedTaskTarget -> {
-                        RemoteAnimationTargetCompat[] apps = Arrays.copyOf(
-                                mRecentsAnimationTargets.apps,
-                                mRecentsAnimationTargets.apps.length + 1);
-                        apps[apps.length - 1] = appearedTaskTarget;
-                        launchOtherTaskInLiveTileMode(appearedTaskTarget.taskId, apps);
-                    });
             mTaskAnimationManager.setLiveTileCleanUpHandler(mInputConsumerProxy::destroy);
-            ActivityManagerWrapper.getInstance().registerTaskStackListener(
-                    mLiveTileRestartListener);
+            mTaskAnimationManager.enableLiveTileRestartListener();
         }
 
         SystemUiProxy.INSTANCE.get(mContext).onOverviewShown(false, TAG);
@@ -1539,65 +1504,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         reset();
     }
 
-    private void launchOtherTaskInLiveTileMode(int taskId, RemoteAnimationTargetCompat[] apps) {
-        AnimatorSet anim = new AnimatorSet();
-        TaskView taskView = mRecentsView.getTaskView(taskId);
-        if (taskView == null || !mRecentsView.isTaskViewVisible(taskView)) {
-            // TODO: Refine this animation.
-            SurfaceTransactionApplier surfaceApplier =
-                    new SurfaceTransactionApplier(mActivity.getDragLayer());
-            ValueAnimator appAnimator = ValueAnimator.ofFloat(0, 1);
-            appAnimator.setDuration(RECENTS_LAUNCH_DURATION);
-            appAnimator.setInterpolator(ACCEL_DEACCEL);
-            appAnimator.addUpdateListener(new MultiValueUpdateListener() {
-                @Override
-                public void onUpdate(float percent) {
-                    SurfaceParams.Builder builder = new SurfaceParams.Builder(
-                            apps[apps.length - 1].leash);
-                    Matrix matrix = new Matrix();
-                    matrix.postScale(percent, percent);
-                    matrix.postTranslate(mDp.widthPx * (1 - percent) / 2,
-                            mDp.heightPx * (1 - percent) / 2);
-                    builder.withAlpha(percent).withMatrix(matrix);
-                    surfaceApplier.scheduleApply(builder.build());
-                }
-            });
-            anim.play(appAnimator);
-        } else {
-            TaskViewUtils.composeRecentsLaunchAnimator(
-                    anim, taskView, apps,
-                    mRecentsAnimationTargets.wallpapers, true /* launcherClosing */,
-                    mActivity.getStateManager(), mRecentsView,
-                    mActivityInterface.getDepthController());
-        }
-        anim.addListener(new AnimatorListenerAdapter(){
-
-            @Override
-            public void onAnimationEnd(Animator animator) {
-                cleanUp(false);
-            }
-
-            @Override
-            public void onAnimationCancel(Animator animator) {
-                cleanUp(true);
-            }
-
-            private void cleanUp(boolean canceled) {
-                if (mRecentsAnimationController != null) {
-                    mRecentsAnimationController.finish(false /* toRecents */,
-                            null /* onFinishComplete */);
-                    if (canceled) {
-                        mRecentsAnimationController = null;
-                    } else {
-                        mActivityInterface.onLaunchTaskSuccess();
-                    }
-                    ActiveGestureLog.INSTANCE.addLog("finishRecentsAnimation", false);
-                }
-            }
-        });
-        anim.start();
-    }
-
     private static boolean isNotInRecents(RemoteAnimationTargetCompat app) {
         return app.isNotInRecents
                 || app.activityType == ACTIVITY_TYPE_HOME;
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationTargets.java b/quickstep/src/com/android/quickstep/RecentsAnimationTargets.java
index da0a66431e..718c5baa2c 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationTargets.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationTargets.java
@@ -41,13 +41,4 @@ public class RecentsAnimationTargets extends RemoteAnimationTargets {
     public boolean hasTargets() {
         return unfilteredApps.length != 0;
     }
-
-    public boolean hasTask(int taskId) {
-        for (RemoteAnimationTargetCompat target : unfilteredApps) {
-            if (target.taskId == taskId) {
-                return true;
-            }
-        }
-        return false;
-    }
 }
diff --git a/quickstep/src/com/android/quickstep/TaskAnimationManager.java b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
index 9a454f2bd7..b6dad2d385 100644
--- a/quickstep/src/com/android/quickstep/TaskAnimationManager.java
+++ b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
@@ -17,10 +17,11 @@ package com.android.quickstep;
 
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
-import static com.android.quickstep.GestureState.GestureEndTarget.RECENTS;
 import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_INITIALIZED;
 import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_STARTED;
+import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 
+import android.app.ActivityManager;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -31,13 +32,13 @@ import androidx.annotation.UiThread;
 
 import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
+import com.android.quickstep.views.RecentsView;
 import com.android.systemui.shared.recents.model.ThumbnailData;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 import com.android.systemui.shared.system.RemoteTransitionCompat;
-
-import java.util.function.Consumer;
+import com.android.systemui.shared.system.TaskStackChangeListener;
 
 public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAnimationListener {
     public static final boolean ENABLE_SHELL_TRANSITIONS =
@@ -49,10 +50,24 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
     // Temporary until we can hook into gesture state events
     private GestureState mLastGestureState;
     private RemoteAnimationTargetCompat mLastAppearedTaskTarget;
-    private Consumer<RemoteAnimationTargetCompat> mLaunchOtherTaskHandler;
     private Runnable mLiveTileCleanUpHandler;
     private Context mCtx;
 
+    private final TaskStackChangeListener mLiveTileRestartListener = new TaskStackChangeListener() {
+        @Override
+        public void onActivityRestartAttempt(ActivityManager.RunningTaskInfo task,
+                boolean homeTaskVisible, boolean clearedTask, boolean wasVisible) {
+            BaseActivityInterface activityInterface = mLastGestureState.getActivityInterface();
+            if (LIVE_TILE.get() && activityInterface.isInLiveTileMode()
+                    && activityInterface.getCreatedActivity() != null) {
+                RecentsView recentsView = activityInterface.getCreatedActivity().getOverviewPanel();
+                recentsView.launchSideTaskInLiveTileModeForRestartedApp(task.taskId);
+                ActivityManagerWrapper.getInstance().unregisterTaskStackListener(
+                        mLiveTileRestartListener);
+            }
+        }
+    };
+
     TaskAnimationManager(Context ctx) {
         mCtx = ctx;
     }
@@ -114,9 +129,14 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
 
             @Override
             public void onTaskAppeared(RemoteAnimationTargetCompat appearedTaskTarget) {
-                if (mLaunchOtherTaskHandler != null
-                        && mLastGestureState.getEndTarget() == RECENTS) {
-                    mLaunchOtherTaskHandler.accept(appearedTaskTarget);
+                BaseActivityInterface activityInterface = mLastGestureState.getActivityInterface();
+                if (LIVE_TILE.get() && activityInterface.isInLiveTileMode()
+                        && activityInterface.getCreatedActivity() != null) {
+                    RecentsView recentsView =
+                            activityInterface.getCreatedActivity().getOverviewPanel();
+                    RemoteAnimationTargetCompat[] apps = new RemoteAnimationTargetCompat[1];
+                    apps[0] = appearedTaskTarget;
+                    recentsView.launchSideTaskInLiveTileMode(appearedTaskTarget.taskId, apps);
                     return;
                 }
                 if (mController != null) {
@@ -161,17 +181,12 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
         return mCallbacks;
     }
 
-    /**
-     * The passed-in handler is used to render side task launch animation in recents in live tile
-     * mode.
-     */
-    public void setLaunchOtherTaskInLiveTileModeHandler(
-            Consumer<RemoteAnimationTargetCompat> handler) {
-        mLaunchOtherTaskHandler = handler;
+    public void setLiveTileCleanUpHandler(Runnable cleanUpHandler) {
+        mLiveTileCleanUpHandler = cleanUpHandler;
     }
 
-    public void setLiveTileCleanUpHandler(Runnable runnable) {
-        mLiveTileCleanUpHandler = runnable;
+    public void enableLiveTileRestartListener() {
+        ActivityManagerWrapper.getInstance().registerTaskStackListener(mLiveTileRestartListener);
     }
 
     /**
@@ -215,6 +230,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
             mLiveTileCleanUpHandler.run();
             mLiveTileCleanUpHandler = null;
         }
+        ActivityManagerWrapper.getInstance().unregisterTaskStackListener(mLiveTileRestartListener);
 
         // Release all the target leashes
         if (mTargets != null) {
@@ -231,7 +247,6 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
         mTargets = null;
         mLastGestureState = null;
         mLastAppearedTaskTarget = null;
-        mLaunchOtherTaskHandler = null;
     }
 
     public void dump() {
diff --git a/quickstep/src/com/android/quickstep/util/InputConsumerProxy.java b/quickstep/src/com/android/quickstep/util/InputConsumerProxy.java
index 3e87f48f02..2e5b33ae24 100644
--- a/quickstep/src/com/android/quickstep/util/InputConsumerProxy.java
+++ b/quickstep/src/com/android/quickstep/util/InputConsumerProxy.java
@@ -38,7 +38,8 @@ public class InputConsumerProxy {
     private static final String TAG = "InputConsumerProxy";
 
     private final InputConsumerController mInputConsumerController;
-    private final Supplier<InputConsumer> mConsumerSupplier;
+    private Runnable mCallback;
+    private Supplier<InputConsumer> mConsumerSupplier;
 
     // The consumer is created lazily on demand.
     private InputConsumer mInputConsumer;
@@ -48,8 +49,9 @@ public class InputConsumerProxy {
     private boolean mDestroyPending = false;
 
     public InputConsumerProxy(InputConsumerController inputConsumerController,
-            Supplier<InputConsumer> consumerSupplier) {
+            Runnable callback, Supplier<InputConsumer> consumerSupplier) {
         mInputConsumerController = inputConsumerController;
+        mCallback = callback;
         mConsumerSupplier = consumerSupplier;
     }
 
@@ -64,9 +66,7 @@ public class InputConsumerProxy {
         if (ev instanceof MotionEvent) {
             onInputConsumerMotionEvent((MotionEvent) ev);
         } else if (ev instanceof KeyEvent) {
-            if (mInputConsumer == null) {
-                mInputConsumer = mConsumerSupplier.get();
-            }
+            initInputConsumerIfNeeded();
             mInputConsumer.onKeyEvent((KeyEvent) ev);
             return true;
         }
@@ -89,9 +89,7 @@ public class InputConsumerProxy {
 
         if (action == ACTION_DOWN) {
             mTouchInProgress = true;
-            if (mInputConsumer == null) {
-                mInputConsumer = mConsumerSupplier.get();
-            }
+            initInputConsumerIfNeeded();
         } else if (action == ACTION_CANCEL || action == ACTION_UP) {
             // Finish any pending actions
             mTouchInProgress = false;
@@ -115,4 +113,18 @@ public class InputConsumerProxy {
         mDestroyed = true;
         mInputConsumerController.setInputListener(null);
     }
+
+    public void unregisterCallback() {
+        mCallback = null;
+    }
+
+    private void initInputConsumerIfNeeded() {
+        if (mInputConsumer == null) {
+            if (mCallback != null) {
+                mCallback.run();
+            }
+            mInputConsumer = mConsumerSupplier.get();
+            mConsumerSupplier = null;
+        }
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/util/InputProxyHandlerFactory.java b/quickstep/src/com/android/quickstep/util/InputProxyHandlerFactory.java
new file mode 100644
index 0000000000..8209c09304
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/util/InputProxyHandlerFactory.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.quickstep.util;
+
+import androidx.annotation.UiThread;
+
+import com.android.launcher3.statemanager.StatefulActivity;
+import com.android.quickstep.BaseActivityInterface;
+import com.android.quickstep.GestureState;
+import com.android.quickstep.InputConsumer;
+import com.android.quickstep.inputconsumers.OverviewInputConsumer;
+
+import java.util.function.Supplier;
+
+/**
+ * A factory that creates a input consumer for
+ *  {@link com.android.quickstep.util.InputConsumerProxy}.
+ */
+public class InputProxyHandlerFactory implements Supplier<InputConsumer> {
+
+    private final BaseActivityInterface mActivityInterface;
+    private final GestureState mGestureState;
+
+    @UiThread
+    public InputProxyHandlerFactory(BaseActivityInterface activityInterface,
+            GestureState gestureState) {
+        mActivityInterface = activityInterface;
+        mGestureState = gestureState;
+    }
+
+    /**
+     * Called to create a input proxy for the running task
+     */
+    @Override
+    public InputConsumer get() {
+        StatefulActivity activity = mActivityInterface.getCreatedActivity();
+        return activity == null ? InputConsumer.NO_OP
+                : new OverviewInputConsumer(mGestureState, activity, null, true);
+    }
+}
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index d357ebead0..769344080a 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -27,6 +27,7 @@ import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA;
 import static com.android.launcher3.LauncherState.BACKGROUND_APP;
 import static com.android.launcher3.LauncherState.OVERVIEW_MODAL_TASK;
 import static com.android.launcher3.LauncherState.OVERVIEW_SPLIT_SELECT;
+import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DURATION;
 import static com.android.launcher3.Utilities.EDGE_NAV_BAR;
 import static com.android.launcher3.Utilities.mapToRange;
 import static com.android.launcher3.Utilities.squaredHypot;
@@ -34,6 +35,7 @@ import static com.android.launcher3.Utilities.squaredTouchSlop;
 import static com.android.launcher3.anim.Interpolators.ACCEL;
 import static com.android.launcher3.anim.Interpolators.ACCEL_0_75;
 import static com.android.launcher3.anim.Interpolators.ACCEL_2;
+import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_CLEAR_ALL;
@@ -50,6 +52,7 @@ import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NO_RECENTS;
 import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NO_TASKS;
 
 import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.LayoutTransition;
 import android.animation.LayoutTransition.TransitionListener;
@@ -61,6 +64,7 @@ import android.app.ActivityManager.RunningTaskInfo;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.Canvas;
+import android.graphics.Matrix;
 import android.graphics.Point;
 import android.graphics.PointF;
 import android.graphics.Rect;
@@ -129,8 +133,11 @@ import com.android.quickstep.RecentsModel.TaskVisualsChangeListener;
 import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.TaskOverlayFactory;
 import com.android.quickstep.TaskThumbnailCache;
+import com.android.quickstep.TaskViewUtils;
 import com.android.quickstep.ViewUtils;
+import com.android.quickstep.util.ActiveGestureLog;
 import com.android.quickstep.util.LayoutUtils;
+import com.android.quickstep.util.MultiValueUpdateListener;
 import com.android.quickstep.util.RecentsOrientedState;
 import com.android.quickstep.util.SplitScreenBounds;
 import com.android.quickstep.util.SurfaceTransactionApplier;
@@ -142,6 +149,8 @@ import com.android.systemui.shared.recents.model.Task.TaskKey;
 import com.android.systemui.shared.recents.model.ThumbnailData;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.PackageManagerWrapper;
+import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
+import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
 import com.android.systemui.shared.system.TaskStackChangeListener;
 import com.android.wm.shell.pip.IPipAnimationListener;
 
@@ -715,6 +724,72 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         super.draw(canvas);
     }
 
+    public void launchSideTaskInLiveTileModeForRestartedApp(int taskId) {
+        if (mRunningTaskId != -1 && mRunningTaskId == taskId &&
+                getLiveTileParams().getTargetSet().findTask(taskId) != null) {
+            launchSideTaskInLiveTileMode(taskId, getLiveTileParams().getTargetSet().apps);
+        }
+    }
+
+    public void launchSideTaskInLiveTileMode(int taskId, RemoteAnimationTargetCompat[] apps) {
+        AnimatorSet anim = new AnimatorSet();
+        TaskView taskView = getTaskView(taskId);
+        if (taskView == null || !isTaskViewVisible(taskView)) {
+            // TODO: Refine this animation.
+            SurfaceTransactionApplier surfaceApplier =
+                    new SurfaceTransactionApplier(mActivity.getDragLayer());
+            ValueAnimator appAnimator = ValueAnimator.ofFloat(0, 1);
+            appAnimator.setDuration(RECENTS_LAUNCH_DURATION);
+            appAnimator.setInterpolator(ACCEL_DEACCEL);
+            appAnimator.addUpdateListener(new MultiValueUpdateListener() {
+                @Override
+                public void onUpdate(float percent) {
+                    SurfaceParams.Builder builder = new SurfaceParams.Builder(
+                            apps[apps.length - 1].leash);
+                    Matrix matrix = new Matrix();
+                    matrix.postScale(percent, percent);
+                    matrix.postTranslate(mActivity.getDeviceProfile().widthPx * (1 - percent) / 2,
+                            mActivity.getDeviceProfile().heightPx * (1 - percent) / 2);
+                    builder.withAlpha(percent).withMatrix(matrix);
+                    surfaceApplier.scheduleApply(builder.build());
+                }
+            });
+            anim.play(appAnimator);
+        } else {
+            TaskViewUtils.composeRecentsLaunchAnimator(
+                    anim, taskView, apps,
+                    mLiveTileParams.getTargetSet().wallpapers, true /* launcherClosing */,
+                    mActivity.getStateManager(), this,
+                    getDepthController());
+        }
+        anim.addListener(new AnimatorListenerAdapter(){
+
+            @Override
+            public void onAnimationEnd(Animator animator) {
+                cleanUp(false);
+            }
+
+            @Override
+            public void onAnimationCancel(Animator animator) {
+                cleanUp(true);
+            }
+
+            private void cleanUp(boolean canceled) {
+                if (mRecentsAnimationController != null) {
+                    mRecentsAnimationController.finish(false /* toRecents */,
+                            null /* onFinishComplete */);
+                    if (canceled) {
+                        mRecentsAnimationController = null;
+                    } else {
+                        mSizeStrategy.onLaunchTaskSuccess();
+                    }
+                    ActiveGestureLog.INSTANCE.addLog("finishRecentsAnimation", false);
+                }
+            }
+        });
+        anim.start();
+    }
+
     private void updateTaskStartIndex(View affectingView) {
         if (!(affectingView instanceof TaskView) && !(affectingView instanceof ClearAllButton)) {
             int childCount = getChildCount();
-- 
GitLab


From 6323aa270cd807651eb681120b03fbaabf058264 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Tue, 23 Mar 2021 08:56:40 -0700
Subject: [PATCH 0774/1664] Enable device search

Bug: 183683148
Test: presubmit

Change-Id: I464a8ba2bfe0af635d4d0f3a6cd10666e47976ce
---
 src/com/android/launcher3/config/FeatureFlags.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 96251f000c..6daecba1a8 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -93,7 +93,7 @@ public final class FeatureFlags {
 
 
     public static final BooleanFlag ENABLE_DEVICE_SEARCH = new DeviceFlag(
-            "ENABLE_DEVICE_SEARCH", false, "Allows on device search in all apps");
+            "ENABLE_DEVICE_SEARCH", true, "Allows on device search in all apps");
 
     public static final BooleanFlag FOLDER_NAME_SUGGEST = new DeviceFlag(
             "FOLDER_NAME_SUGGEST", true,
-- 
GitLab


From a750f8cdcab8c244e1b206f5ea004e78f8babcb4 Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pbdr@google.com>
Date: Thu, 25 Mar 2021 11:01:06 +0000
Subject: [PATCH 0775/1664] Correct RoundedCorner enforcements.

The feature status will not, in the end, depend on the widget, so
removed the argument.

Bug: 183097166
Test: Manual test

Change-Id: I977e775072cf1724f3e31b848d3ac4c862d23e00
---
 .../launcher3/widget/LauncherAppWidgetHostView.java       | 5 +++--
 .../launcher3/widget/RoundedCornerEnforcement.java        | 8 ++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
index 2e542edf76..687318f775 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
@@ -497,12 +497,13 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
 
     @UiThread
     private void enforceRoundedCorners() {
-        if (mEnforcedCornerRadius <= 0 || !RoundedCornerEnforcement.isRoundedCornerEnabled(this)) {
+        if (mEnforcedCornerRadius <= 0 || !RoundedCornerEnforcement.isRoundedCornerEnabled()) {
             resetRoundedCorners();
             return;
         }
         View background = RoundedCornerEnforcement.findBackground(this);
-        if (RoundedCornerEnforcement.hasAppWidgetOptedOut(this, background)) {
+        if (background == null
+                || RoundedCornerEnforcement.hasAppWidgetOptedOut(this, background)) {
             resetRoundedCorners();
             return;
         }
diff --git a/src/com/android/launcher3/widget/RoundedCornerEnforcement.java b/src/com/android/launcher3/widget/RoundedCornerEnforcement.java
index 99eccd1303..1e46ffd30c 100644
--- a/src/com/android/launcher3/widget/RoundedCornerEnforcement.java
+++ b/src/com/android/launcher3/widget/RoundedCornerEnforcement.java
@@ -72,12 +72,8 @@ public class RoundedCornerEnforcement {
     }
 
     /** Check if the app widget is in the deny list. */
-    public static boolean isRoundedCornerEnabled(@NonNull View view) {
-        if (!Utilities.ATLEAST_S || !FeatureFlags.ENABLE_ENFORCED_ROUNDED_CORNERS.get()) {
-            return false;
-        }
-        // Here we need to test if the view's component is in the (to be created) deny list.
-        return true;
+    public static boolean isRoundedCornerEnabled() {
+        return Utilities.ATLEAST_S && FeatureFlags.ENABLE_ENFORCED_ROUNDED_CORNERS.get();
     }
 
     /**
-- 
GitLab


From adc23265dc00c881b303aabe4d7d5609f710f029 Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pbdr@google.com>
Date: Thu, 25 Mar 2021 11:01:34 +0000
Subject: [PATCH 0776/1664] Added rounded corner to bitmap Widget Preview

This applies to the widget picker and the initial Widget drop.

Bug: 183615331
Test: Manually using top preinstalled widgets
Change-Id: Ib7ce422dc485396c2aceec6f43e83529d642ecc7
---
 .../android/launcher3/FastBitmapDrawable.java  | 18 ++++++++++++++++++
 .../widget/PendingItemDragHelper.java          |  9 ++++++++-
 .../android/launcher3/widget/WidgetCell.java   |  6 +++++-
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/FastBitmapDrawable.java b/src/com/android/launcher3/FastBitmapDrawable.java
index b1fe4a235c..0027a50d95 100644
--- a/src/com/android/launcher3/FastBitmapDrawable.java
+++ b/src/com/android/launcher3/FastBitmapDrawable.java
@@ -28,6 +28,7 @@ import android.graphics.ColorFilter;
 import android.graphics.ColorMatrix;
 import android.graphics.ColorMatrixColorFilter;
 import android.graphics.Paint;
+import android.graphics.Path;
 import android.graphics.PixelFormat;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
@@ -61,6 +62,8 @@ public class FastBitmapDrawable extends Drawable {
     private boolean mIsPressed;
     private boolean mIsDisabled;
     private float mDisabledAlpha = 1f;
+    private float mRoundedCornersRadius = 0f;
+    private final Path mClipPath = new Path();
 
     // Animator and properties for the fast bitmap drawable's scale
     private static final Property<FastBitmapDrawable, Float> SCALE
@@ -102,6 +105,13 @@ public class FastBitmapDrawable extends Drawable {
 
     @Override
     public final void draw(Canvas canvas) {
+        if (mRoundedCornersRadius > 0) {
+            float radius = mRoundedCornersRadius * mScale;
+            mClipPath.reset();
+            mClipPath.addRoundRect(0, 0, getIntrinsicWidth(), getIntrinsicHeight(),
+                    radius, radius, Path.Direction.CCW);
+            canvas.clipPath(mClipPath);
+        }
         if (mScale != 1f) {
             int count = canvas.save();
             Rect bounds = getBounds();
@@ -164,6 +174,14 @@ public class FastBitmapDrawable extends Drawable {
         return mScale;
     }
 
+    public void setRoundedCornersRadius(float radius) {
+        mRoundedCornersRadius = radius;
+    }
+
+    public float getRoundedCornersRadius() {
+        return mRoundedCornersRadius;
+    }
+
     @Override
     public int getIntrinsicWidth() {
         return mBitmap.getWidth();
diff --git a/src/com/android/launcher3/widget/PendingItemDragHelper.java b/src/com/android/launcher3/widget/PendingItemDragHelper.java
index 247a748ba6..08bb66211c 100644
--- a/src/com/android/launcher3/widget/PendingItemDragHelper.java
+++ b/src/com/android/launcher3/widget/PendingItemDragHelper.java
@@ -54,10 +54,13 @@ public class PendingItemDragHelper extends DragPreviewProvider {
 
     @Nullable private RemoteViews mRemoteViewsPreview;
     @Nullable private LauncherAppWidgetHostView mAppWidgetHostViewPreview;
+    private final float mEnforcedRoundedCornersForWidget;
 
     public PendingItemDragHelper(View view) {
         super(view);
         mAddInfo = (PendingAddItemInfo) view.getTag();
+        mEnforcedRoundedCornersForWidget = RoundedCornerEnforcement.computeEnforcedRadius(
+                view.getContext());
     }
 
     /**
@@ -115,10 +118,14 @@ public class PendingItemDragHelper extends DragPreviewProvider {
                         .addDragListener(new AppWidgetHostViewDragListener(launcher));
             }
             if (preview == null) {
-                preview = new FastBitmapDrawable(
+                FastBitmapDrawable p = new FastBitmapDrawable(
                         app.getWidgetCache().generateWidgetPreview(launcher,
                                 createWidgetInfo.info, maxWidth, null,
                                 previewSizeBeforeScale).first);
+                if (RoundedCornerEnforcement.isRoundedCornerEnabled()) {
+                    p.setRoundedCornersRadius(mEnforcedRoundedCornersForWidget);
+                }
+                preview = p;
             }
 
             if (previewSizeBeforeScale[0] < previewBitmapWidth) {
diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index 1b0e1ce0b2..2b4b9ea55e 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -94,6 +94,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     protected final BaseActivity mActivity;
     protected final DeviceProfile mDeviceProfile;
     private final CheckLongPressHelper mLongPressHelper;
+    private final float mEnforcedCornerRadius;
 
     private RemoteViews mPreview;
     private LauncherAppWidgetHostView mAppWidgetHostViewPreview;
@@ -118,6 +119,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
         setWillNotDraw(false);
         setClipToPadding(false);
         setAccessibilityDelegate(mActivity.getAccessibilityDelegate());
+        mEnforcedCornerRadius = RoundedCornerEnforcement.computeEnforcedRadius(context);
     }
 
     private void setContainerWidth() {
@@ -245,7 +247,9 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     }
 
     public void applyPreview(Bitmap bitmap) {
-        applyPreview(new FastBitmapDrawable(bitmap));
+        FastBitmapDrawable drawable = new FastBitmapDrawable(bitmap);
+        drawable.setRoundedCornersRadius(mEnforcedCornerRadius);
+        applyPreview(drawable);
     }
 
     private void applyPreview(Drawable drawable) {
-- 
GitLab


From 074f83205d6022c1f6593921575108e5c8d3de24 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Thu, 25 Mar 2021 16:51:54 +0000
Subject: [PATCH 0777/1664] Filter out potential null widget item from
 recommended widgets

There is a likely a race condition which the recommended widgets
contain widget that have not been added to mAllWidgets. Instead
of introducing a lock mechanism, let's simply filter null widgets.

Test: manual

Bug: 183619699
Change-Id: Ia82778b8ac8c42265bdf6838e059f81022a0d4ef
---
 src/com/android/launcher3/popup/PopupDataProvider.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/com/android/launcher3/popup/PopupDataProvider.java b/src/com/android/launcher3/popup/PopupDataProvider.java
index 778089485a..6f9f0d7867 100644
--- a/src/com/android/launcher3/popup/PopupDataProvider.java
+++ b/src/com/android/launcher3/popup/PopupDataProvider.java
@@ -40,6 +40,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -224,6 +225,7 @@ public class PopupDataProvider implements NotificationListener.NotificationsChan
                 .map(recommendedWidget -> allWidgetItems.get(
                         new ComponentKey(recommendedWidget.getTargetComponent(),
                                 recommendedWidget.user)))
+                .filter(Objects::nonNull)
                 .collect(Collectors.toList());
     }
 
-- 
GitLab


From 572aca4ce274b22529ba78610ee7044c6fa2f636 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 24 Mar 2021 15:21:39 -0700
Subject: [PATCH 0778/1664] Moving some common functionality to IconLoaderLib

Bug: 183641907
Test: Manual
Change-Id: Icfc7ebb140e4e1678b0715beee2e0e513e707b9e
---
 Android.bp                                    |   1 +
 .../launcher3/QuickstepTransitionManager.java |   1 +
 .../com/android/quickstep/TaskIconCache.java  |  11 +-
 .../com/android/quickstep/views/IconView.java |  38 --
 res/values/attrs.xml                          |   2 -
 res/values/config.xml                         |   2 -
 src/com/android/launcher3/BubbleTextView.java |  11 +-
 .../android/launcher3/FastBitmapDrawable.java | 357 ------------------
 src/com/android/launcher3/Utilities.java      |   1 +
 .../launcher3/WidgetPreviewLoader.java        |   1 +
 src/com/android/launcher3/Workspace.java      |   1 +
 .../android/launcher3/dragndrop/DragView.java |   2 +-
 .../PinShortcutRequestActivityInfo.java       |   3 +-
 .../launcher3/folder/FolderPagedView.java     |   2 +-
 .../launcher3/folder/PreviewItemManager.java  |   7 +-
 .../graphics/DragPreviewProvider.java         |   2 +-
 .../graphics/PlaceHolderIconDrawable.java     |  88 -----
 .../graphics/PreloadIconDrawable.java         |   2 +-
 .../launcher3/icons/ClockDrawableWrapper.java | 328 ----------------
 .../android/launcher3/icons/IconProvider.java | 251 ------------
 .../model/data/ItemInfoWithIcon.java          |  11 +
 .../ShortcutDragPreviewProvider.java          |   2 +-
 .../android/launcher3/util/SafeCloseable.java |  26 --
 src/com/android/launcher3/util/Themes.java    |  23 +-
 .../widget/PendingAppWidgetHostView.java      |   7 +-
 .../widget/PendingItemDragHelper.java         |   2 +-
 .../android/launcher3/widget/WidgetCell.java  |   2 +-
 .../widget/picker/WidgetsListHeader.java      |   8 +-
 28 files changed, 44 insertions(+), 1148 deletions(-)
 delete mode 100644 src/com/android/launcher3/FastBitmapDrawable.java
 delete mode 100644 src/com/android/launcher3/graphics/PlaceHolderIconDrawable.java
 delete mode 100644 src/com/android/launcher3/icons/ClockDrawableWrapper.java
 delete mode 100644 src/com/android/launcher3/icons/IconProvider.java
 delete mode 100644 src/com/android/launcher3/util/SafeCloseable.java

diff --git a/Android.bp b/Android.bp
index 92cc36b5e3..2c9d664ac6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -44,6 +44,7 @@ android_library {
         "src/com/android/launcher3/ResourceUtils.java",
         "src/com/android/launcher3/testing/TestProtocol.java",
     ],
+    resource_dirs: [ ],
     manifest: "tests/tapl/AndroidManifest.xml",
     platform_apis: true,
 }
diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 64b22d439c..82a83fc073 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -68,6 +68,7 @@ import androidx.annotation.Nullable;
 import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.dragndrop.DragLayer;
+import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.shortcuts.DeepShortcutView;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.util.ActivityOptionsWrapper;
diff --git a/quickstep/src/com/android/quickstep/TaskIconCache.java b/quickstep/src/com/android/quickstep/TaskIconCache.java
index dd0ed8f349..08503cfaac 100644
--- a/quickstep/src/com/android/quickstep/TaskIconCache.java
+++ b/quickstep/src/com/android/quickstep/TaskIconCache.java
@@ -15,7 +15,6 @@
  */
 package com.android.quickstep;
 
-import static com.android.launcher3.FastBitmapDrawable.newIcon;
 import static com.android.launcher3.uioverrides.QuickstepLauncher.GO_LOW_RAM_RECENTS_ENABLED;
 
 import android.app.ActivityManager.TaskDescription;
@@ -34,7 +33,6 @@ import android.view.accessibility.AccessibilityManager;
 
 import androidx.annotation.WorkerThread;
 
-import com.android.launcher3.FastBitmapDrawable;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.icons.BitmapInfo;
@@ -137,11 +135,12 @@ public class TaskIconCache {
         // TODO: Load icon resource (b/143363444)
         Bitmap icon = TaskDescriptionCompat.getIcon(desc, key.userId);
         if (icon != null) {
-            entry.icon = new FastBitmapDrawable(getBitmapInfo(
+            /* isInstantApp */
+            entry.icon = getBitmapInfo(
                     new BitmapDrawable(mContext.getResources(), icon),
                     key.userId,
                     desc.getPrimaryColor(),
-                    false /* isInstantApp */));
+                    false /* isInstantApp */).newIcon(mContext);
         } else {
             activityInfo = PackageManagerWrapper.getInstance().getActivityInfo(
                     key.getComponent(), key.userId);
@@ -151,7 +150,7 @@ public class TaskIconCache {
                         key.userId,
                         desc.getPrimaryColor(),
                         activityInfo.applicationInfo.isInstantApp());
-                entry.icon = newIcon(mContext, bitmapInfo);
+                entry.icon = bitmapInfo.newIcon(mContext);
             } else {
                 entry.icon = getDefaultIcon(key.userId);
             }
@@ -199,7 +198,7 @@ public class TaskIconCache {
                 }
                 mDefaultIcons.put(userId, info);
             }
-            return new FastBitmapDrawable(info);
+            return info.newIcon(mContext);
         }
     }
 
diff --git a/quickstep/src/com/android/quickstep/views/IconView.java b/quickstep/src/com/android/quickstep/views/IconView.java
index 7cc00b7ccd..ed642df7b4 100644
--- a/quickstep/src/com/android/quickstep/views/IconView.java
+++ b/quickstep/src/com/android/quickstep/views/IconView.java
@@ -21,26 +21,14 @@ import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.View;
 
-import androidx.annotation.NonNull;
-
-import com.android.launcher3.FastBitmapDrawable;
-
-import java.util.ArrayList;
-
 /**
  * A view which draws a drawable stretched to fit its size. Unlike ImageView, it avoids relayout
  * when the drawable changes.
  */
 public class IconView extends View {
 
-    public interface OnScaleUpdateListener {
-        public void onScaleUpdate(float scale);
-    }
-
     private Drawable mDrawable;
 
-    private ArrayList<OnScaleUpdateListener> mScaleListeners;
-
     public IconView(Context context) {
         super(context);
     }
@@ -93,16 +81,6 @@ public class IconView extends View {
         }
     }
 
-    @Override
-    public void invalidateDrawable(@NonNull Drawable drawable) {
-        super.invalidateDrawable(drawable);
-        if (drawable instanceof FastBitmapDrawable && mScaleListeners != null) {
-            for (OnScaleUpdateListener listener : mScaleListeners) {
-                listener.onScaleUpdate(((FastBitmapDrawable) drawable).getScale());
-            }
-        }
-    }
-
     @Override
     protected void onDraw(Canvas canvas) {
         if (mDrawable != null) {
@@ -115,22 +93,6 @@ public class IconView extends View {
         return false;
     }
 
-    public void addUpdateScaleListener(OnScaleUpdateListener listener) {
-        if (mScaleListeners == null) {
-            mScaleListeners = new ArrayList<>();
-        }
-        mScaleListeners.add(listener);
-        if (mDrawable instanceof FastBitmapDrawable) {
-            listener.onScaleUpdate(((FastBitmapDrawable) mDrawable).getScale());
-        }
-    }
-
-    public void removeUpdateScaleListener(OnScaleUpdateListener listener) {
-        if (mScaleListeners != null) {
-            mScaleListeners.remove(listener);
-        }
-    }
-
     @Override
     public void setAlpha(float alpha) {
         super.setAlpha(alpha);
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index c1c8f01a87..fc2b4bc5f9 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -33,7 +33,6 @@
     <attr name="workspaceKeyShadowColor" format="color" />
     <attr name="workspaceStatusBarScrim" format="reference" />
     <attr name="widgetsTheme" format="reference" />
-    <attr name="loadingIconColor" format="color" />
     <attr name="iconOnlyShortcutColor" format="color" />
     <attr name="eduHalfSheetBGColor" format="color" />
 
@@ -44,7 +43,6 @@
     <attr name="folderTextColor" format="color" />
     <attr name="folderHintColor" format="color" />
     <attr name="workProfileOverlayTextColor" format="color" />
-    <attr name="disabledIconAlpha" format="float" />
 
     <!-- BubbleTextView specific attributes. -->
     <declare-styleable name="BubbleTextView">
diff --git a/res/values/config.xml b/res/values/config.xml
index 65e2ab3a85..57f626cf54 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -87,8 +87,6 @@
 
     <!-- Default packages -->
     <string name="wallpaper_picker_package" translatable="false"></string>
-    <string name="calendar_component_name" translatable="false"></string>
-    <string name="clock_component_name" translatable="false"></string>
     <string name="local_colors_extraction_class" translatable="false"></string>
 
     <!-- Accessibility actions -->
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 2b58fb6adf..d333b49a3a 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -16,7 +16,6 @@
 
 package com.android.launcher3;
 
-import static com.android.launcher3.FastBitmapDrawable.newIcon;
 import static com.android.launcher3.graphics.IconShape.getShape;
 import static com.android.launcher3.graphics.PreloadIconDrawable.newPendingIcon;
 import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
@@ -57,11 +56,12 @@ import com.android.launcher3.dragndrop.DraggableView;
 import com.android.launcher3.folder.FolderIcon;
 import com.android.launcher3.graphics.IconPalette;
 import com.android.launcher3.graphics.IconShape;
-import com.android.launcher3.graphics.PlaceHolderIconDrawable;
 import com.android.launcher3.graphics.PreloadIconDrawable;
 import com.android.launcher3.icons.DotRenderer;
+import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.icons.IconCache.ItemInfoUpdateReceiver;
 import com.android.launcher3.icons.LauncherIcons;
+import com.android.launcher3.icons.PlaceHolderIconDrawable;
 import com.android.launcher3.icons.cache.HandlerRunnable;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
@@ -92,12 +92,9 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
     private static final int[] STATE_PRESSED = new int[]{android.R.attr.state_pressed};
     private static final float HIGHLIGHT_SCALE = 1.16f;
 
-
     private final PointF mTranslationForReorderBounce = new PointF(0, 0);
     private final PointF mTranslationForReorderPreview = new PointF(0, 0);
 
-    private static final int ICON_UPDATE_ANIMATION_DURATION = 375;
-
     private float mScaleForReorderBounce = 1f;
 
     protected final Paint mHighlightPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
@@ -335,7 +332,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
 
     @UiThread
     protected void applyIconAndLabel(ItemInfoWithIcon info) {
-        FastBitmapDrawable iconDrawable = newIcon(getContext(), info);
+        FastBitmapDrawable iconDrawable = info.newIcon(getContext());
         mDotParams.color = IconPalette.getMutedColor(info.bitmap.color, 0.54f);
 
         setIcon(iconDrawable);
@@ -933,7 +930,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
 
     private void resetIconScale() {
         if (mIcon instanceof FastBitmapDrawable) {
-            ((FastBitmapDrawable) mIcon).setScale(1f);
+            ((FastBitmapDrawable) mIcon).resetScale();
         }
     }
 
diff --git a/src/com/android/launcher3/FastBitmapDrawable.java b/src/com/android/launcher3/FastBitmapDrawable.java
deleted file mode 100644
index 0027a50d95..0000000000
--- a/src/com/android/launcher3/FastBitmapDrawable.java
+++ /dev/null
@@ -1,357 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3;
-
-import static com.android.launcher3.anim.Interpolators.ACCEL;
-import static com.android.launcher3.anim.Interpolators.DEACCEL;
-
-import android.animation.ObjectAnimator;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.ColorFilter;
-import android.graphics.ColorMatrix;
-import android.graphics.ColorMatrixColorFilter;
-import android.graphics.Paint;
-import android.graphics.Path;
-import android.graphics.PixelFormat;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.util.Property;
-
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.graphics.PlaceHolderIconDrawable;
-import com.android.launcher3.icons.BitmapInfo;
-import com.android.launcher3.model.data.ItemInfoWithIcon;
-import com.android.launcher3.util.Themes;
-
-
-public class FastBitmapDrawable extends Drawable {
-
-    private static final float PRESSED_SCALE = 1.1f;
-
-    private static final float DISABLED_DESATURATION = 1f;
-    private static final float DISABLED_BRIGHTNESS = 0.5f;
-
-    public static final int CLICK_FEEDBACK_DURATION = 200;
-
-    private static ColorFilter sDisabledFColorFilter;
-
-    protected final Paint mPaint = new Paint(Paint.FILTER_BITMAP_FLAG | Paint.ANTI_ALIAS_FLAG);
-    protected Bitmap mBitmap;
-    protected final int mIconColor;
-
-    @Nullable private ColorFilter mColorFilter;
-
-    private boolean mIsPressed;
-    private boolean mIsDisabled;
-    private float mDisabledAlpha = 1f;
-    private float mRoundedCornersRadius = 0f;
-    private final Path mClipPath = new Path();
-
-    // Animator and properties for the fast bitmap drawable's scale
-    private static final Property<FastBitmapDrawable, Float> SCALE
-            = new Property<FastBitmapDrawable, Float>(Float.TYPE, "scale") {
-        @Override
-        public Float get(FastBitmapDrawable fastBitmapDrawable) {
-            return fastBitmapDrawable.mScale;
-        }
-
-        @Override
-        public void set(FastBitmapDrawable fastBitmapDrawable, Float value) {
-            fastBitmapDrawable.mScale = value;
-            fastBitmapDrawable.invalidateSelf();
-        }
-    };
-    private ObjectAnimator mScaleAnimation;
-    private float mScale = 1;
-
-    private int mAlpha = 255;
-
-    public FastBitmapDrawable(Bitmap b) {
-        this(b, Color.TRANSPARENT);
-    }
-
-    public FastBitmapDrawable(BitmapInfo info) {
-        this(info.icon, info.color);
-    }
-
-    protected FastBitmapDrawable(Bitmap b, int iconColor) {
-        this(b, iconColor, false);
-    }
-
-    protected FastBitmapDrawable(Bitmap b, int iconColor, boolean isDisabled) {
-        mBitmap = b;
-        mIconColor = iconColor;
-        setFilterBitmap(true);
-        setIsDisabled(isDisabled);
-    }
-
-    @Override
-    public final void draw(Canvas canvas) {
-        if (mRoundedCornersRadius > 0) {
-            float radius = mRoundedCornersRadius * mScale;
-            mClipPath.reset();
-            mClipPath.addRoundRect(0, 0, getIntrinsicWidth(), getIntrinsicHeight(),
-                    radius, radius, Path.Direction.CCW);
-            canvas.clipPath(mClipPath);
-        }
-        if (mScale != 1f) {
-            int count = canvas.save();
-            Rect bounds = getBounds();
-            canvas.scale(mScale, mScale, bounds.exactCenterX(), bounds.exactCenterY());
-            drawInternal(canvas, bounds);
-            canvas.restoreToCount(count);
-        } else {
-            drawInternal(canvas, getBounds());
-        }
-    }
-
-    protected void drawInternal(Canvas canvas, Rect bounds) {
-        canvas.drawBitmap(mBitmap, null, bounds, mPaint);
-    }
-
-    @Override
-    public void setColorFilter(ColorFilter cf) {
-        mColorFilter = cf;
-        updateFilter();
-    }
-
-    @Override
-    public int getOpacity() {
-        return PixelFormat.TRANSLUCENT;
-    }
-
-    @Override
-    public void setAlpha(int alpha) {
-        if (mAlpha != alpha) {
-            mAlpha = alpha;
-            mPaint.setAlpha(alpha);
-            invalidateSelf();
-        }
-    }
-
-    @Override
-    public void setFilterBitmap(boolean filterBitmap) {
-        mPaint.setFilterBitmap(filterBitmap);
-        mPaint.setAntiAlias(filterBitmap);
-    }
-
-    public int getAlpha() {
-        return mAlpha;
-    }
-
-    public void setScale(float scale) {
-        if (mScaleAnimation != null) {
-            mScaleAnimation.cancel();
-            mScaleAnimation = null;
-        }
-        mScale = scale;
-        invalidateSelf();
-    }
-
-    public float getAnimatedScale() {
-        return mScaleAnimation == null ? 1 : mScale;
-    }
-
-    public float getScale() {
-        return mScale;
-    }
-
-    public void setRoundedCornersRadius(float radius) {
-        mRoundedCornersRadius = radius;
-    }
-
-    public float getRoundedCornersRadius() {
-        return mRoundedCornersRadius;
-    }
-
-    @Override
-    public int getIntrinsicWidth() {
-        return mBitmap.getWidth();
-    }
-
-    @Override
-    public int getIntrinsicHeight() {
-        return mBitmap.getHeight();
-    }
-
-    @Override
-    public int getMinimumWidth() {
-        return getBounds().width();
-    }
-
-    @Override
-    public int getMinimumHeight() {
-        return getBounds().height();
-    }
-
-    @Override
-    public boolean isStateful() {
-        return true;
-    }
-
-    @Override
-    public ColorFilter getColorFilter() {
-        return mPaint.getColorFilter();
-    }
-
-    @Override
-    protected boolean onStateChange(int[] state) {
-        boolean isPressed = false;
-        for (int s : state) {
-            if (s == android.R.attr.state_pressed) {
-                isPressed = true;
-                break;
-            }
-        }
-        if (mIsPressed != isPressed) {
-            mIsPressed = isPressed;
-
-            if (mScaleAnimation != null) {
-                mScaleAnimation.cancel();
-                mScaleAnimation = null;
-            }
-
-            if (mIsPressed) {
-                // Animate when going to pressed state
-                mScaleAnimation = ObjectAnimator.ofFloat(this, SCALE, PRESSED_SCALE);
-                mScaleAnimation.setDuration(CLICK_FEEDBACK_DURATION);
-                mScaleAnimation.setInterpolator(ACCEL);
-                mScaleAnimation.start();
-            } else {
-                if (isVisible()) {
-                    mScaleAnimation = ObjectAnimator.ofFloat(this, SCALE, 1f);
-                    mScaleAnimation.setDuration(CLICK_FEEDBACK_DURATION);
-                    mScaleAnimation.setInterpolator(DEACCEL);
-                    mScaleAnimation.start();
-                } else {
-                    mScale = 1f;
-                    invalidateSelf();
-                }
-            }
-            return true;
-        }
-        return false;
-    }
-
-    public void setIsDisabled(boolean isDisabled) {
-        if (mIsDisabled != isDisabled) {
-            mIsDisabled = isDisabled;
-            updateFilter();
-        }
-    }
-
-    protected boolean isDisabled() {
-        return mIsDisabled;
-    }
-
-    private ColorFilter getDisabledColorFilter() {
-        if (sDisabledFColorFilter == null) {
-            ColorMatrix tempBrightnessMatrix = new ColorMatrix();
-            ColorMatrix tempFilterMatrix = new ColorMatrix();
-
-            tempFilterMatrix.setSaturation(1f - DISABLED_DESATURATION);
-            float scale = 1 - DISABLED_BRIGHTNESS;
-            int brightnessI =   (int) (255 * DISABLED_BRIGHTNESS);
-            float[] mat = tempBrightnessMatrix.getArray();
-            mat[0] = scale;
-            mat[6] = scale;
-            mat[12] = scale;
-            mat[4] = brightnessI;
-            mat[9] = brightnessI;
-            mat[14] = brightnessI;
-            mat[18] = mDisabledAlpha;
-            tempFilterMatrix.preConcat(tempBrightnessMatrix);
-            sDisabledFColorFilter = new ColorMatrixColorFilter(tempFilterMatrix);
-        }
-        return sDisabledFColorFilter;
-    }
-
-    /**
-     * Updates the paint to reflect the current brightness and saturation.
-     */
-    protected void updateFilter() {
-        mPaint.setColorFilter(mIsDisabled ? getDisabledColorFilter() : mColorFilter);
-        invalidateSelf();
-    }
-
-    @Override
-    public ConstantState getConstantState() {
-        return new FastBitmapConstantState(mBitmap, mIconColor, mIsDisabled);
-    }
-
-    protected static class FastBitmapConstantState extends ConstantState {
-        protected final Bitmap mBitmap;
-        protected final int mIconColor;
-        protected final boolean mIsDisabled;
-
-        public FastBitmapConstantState(Bitmap bitmap, int color, boolean isDisabled) {
-            mBitmap = bitmap;
-            mIconColor = color;
-            mIsDisabled = isDisabled;
-        }
-
-        @Override
-        public FastBitmapDrawable newDrawable() {
-            return new FastBitmapDrawable(mBitmap, mIconColor, mIsDisabled);
-        }
-
-        @Override
-        public int getChangingConfigurations() {
-            return 0;
-        }
-    }
-
-    /**
-     * Interface to be implemented by custom {@link BitmapInfo} to handle drawable construction
-     */
-    public interface Factory {
-
-        /**
-         * Called to create a new drawable
-         */
-        FastBitmapDrawable newDrawable();
-    }
-
-    /**
-     * Returns a FastBitmapDrawable with the icon.
-     */
-    public static FastBitmapDrawable newIcon(Context context, ItemInfoWithIcon info) {
-        FastBitmapDrawable drawable = newIcon(context, info.bitmap);
-        drawable.setIsDisabled(info.isDisabled());
-        return drawable;
-    }
-
-    /**
-     * Creates a drawable for the provided BitmapInfo
-     */
-    public static FastBitmapDrawable newIcon(Context context, BitmapInfo info) {
-        final FastBitmapDrawable drawable;
-        if (info instanceof Factory) {
-            drawable = ((Factory) info).newDrawable();
-        } else if (info.isLowRes()) {
-            drawable = new PlaceHolderIconDrawable(info, context);
-        } else {
-            drawable = new FastBitmapDrawable(info);
-        }
-        drawable.mDisabledAlpha = Themes.getFloat(context, R.attr.disabledIconAlpha, 1f);
-        return drawable;
-    }
-}
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index e57844d7df..8825710401 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -69,6 +69,7 @@ import androidx.core.os.BuildCompat;
 import com.android.launcher3.dragndrop.FolderAdaptiveIcon;
 import com.android.launcher3.graphics.GridCustomizationsProvider;
 import com.android.launcher3.graphics.TintedDrawableSpan;
+import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.icons.IconProvider;
 import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.icons.ShortcutCachingLogic;
diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java
index 446c873a1d..2f9c96e567 100644
--- a/src/com/android/launcher3/WidgetPreviewLoader.java
+++ b/src/com/android/launcher3/WidgetPreviewLoader.java
@@ -37,6 +37,7 @@ import android.util.Pair;
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 
+import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.icons.GraphicsUtils;
 import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.icons.LauncherIcons;
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 6a16da9cf9..bd173481b7 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -83,6 +83,7 @@ import com.android.launcher3.graphics.DragPreviewProvider;
 import com.android.launcher3.graphics.PreloadIconDrawable;
 import com.android.launcher3.graphics.WorkspaceDragScrim;
 import com.android.launcher3.icons.BitmapRenderer;
+import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.logger.LauncherAtom;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.logging.StatsLogManager.LauncherEvent;
diff --git a/src/com/android/launcher3/dragndrop/DragView.java b/src/com/android/launcher3/dragndrop/DragView.java
index e2816f4d8c..0f26ff4d90 100644
--- a/src/com/android/launcher3/dragndrop/DragView.java
+++ b/src/com/android/launcher3/dragndrop/DragView.java
@@ -44,7 +44,6 @@ import androidx.dynamicanimation.animation.FloatPropertyCompat;
 import androidx.dynamicanimation.animation.SpringAnimation;
 import androidx.dynamicanimation.animation.SpringForce;
 
-import com.android.launcher3.FastBitmapDrawable;
 import com.android.launcher3.FirstFrameAnimatorHelper;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherSettings;
@@ -52,6 +51,7 @@ import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.Interpolators;
+import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.statemanager.StateManager.StateListener;
diff --git a/src/com/android/launcher3/dragndrop/PinShortcutRequestActivityInfo.java b/src/com/android/launcher3/dragndrop/PinShortcutRequestActivityInfo.java
index f543e47c0a..29e7c1854d 100644
--- a/src/com/android/launcher3/dragndrop/PinShortcutRequestActivityInfo.java
+++ b/src/com/android/launcher3/dragndrop/PinShortcutRequestActivityInfo.java
@@ -28,7 +28,6 @@ import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Process;
 
-import com.android.launcher3.FastBitmapDrawable;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAnimUtils;
 import com.android.launcher3.LauncherAppState;
@@ -78,7 +77,7 @@ class PinShortcutRequestActivityInfo extends ShortcutConfigActivityInfo {
         Drawable d = mContext.getSystemService(LauncherApps.class)
                 .getShortcutIconDrawable(mInfo, LauncherAppState.getIDP(mContext).fillResIconDpi);
         if (d == null) {
-            d = new FastBitmapDrawable(cache.getDefaultIcon(Process.myUserHandle()));
+            d = cache.getDefaultIcon(Process.myUserHandle()).newIcon(mContext);
         }
         return d;
     }
diff --git a/src/com/android/launcher3/folder/FolderPagedView.java b/src/com/android/launcher3/folder/FolderPagedView.java
index 0235dfac2f..c1f4643f63 100644
--- a/src/com/android/launcher3/folder/FolderPagedView.java
+++ b/src/com/android/launcher3/folder/FolderPagedView.java
@@ -483,7 +483,7 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> {
                 icon.verifyHighRes();
                 // Set the callback back to the actual icon, in case
                 // it was captured by the FolderIcon
-                Drawable d = icon.getCompoundDrawables()[1];
+                Drawable d = icon.getIcon();
                 if (d != null) {
                     d.setCallback(icon);
                 }
diff --git a/src/com/android/launcher3/folder/PreviewItemManager.java b/src/com/android/launcher3/folder/PreviewItemManager.java
index 9ae7faf988..8244f01e92 100644
--- a/src/com/android/launcher3/folder/PreviewItemManager.java
+++ b/src/com/android/launcher3/folder/PreviewItemManager.java
@@ -16,7 +16,6 @@
 
 package com.android.launcher3.folder;
 
-import static com.android.launcher3.FastBitmapDrawable.newIcon;
 import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.ENTER_INDEX;
 import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.EXIT_INDEX;
 import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW;
@@ -33,10 +32,10 @@ import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.util.FloatProperty;
 import android.view.View;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 
+import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.graphics.PreloadIconDrawable;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
@@ -113,7 +112,7 @@ public class PreviewItemManager {
     }
 
     Drawable prepareCreateAnimation(final View destView) {
-        Drawable animateDrawable = ((TextView) destView).getCompoundDrawables()[1];
+        Drawable animateDrawable = ((BubbleTextView) destView).getIcon();
         computePreviewDrawingParams(animateDrawable.getIntrinsicWidth(),
                 destView.getMeasuredWidth());
         mReferenceDrawable = animateDrawable;
@@ -401,7 +400,7 @@ public class PreviewItemManager {
             drawable.setLevel(item.getProgressLevel());
             p.drawable = drawable;
         } else {
-            p.drawable = newIcon(mContext, item);
+            p.drawable = item.newIcon(mContext);
         }
         p.drawable.setBounds(0, 0, mIconSize, mIconSize);
         p.item = item;
diff --git a/src/com/android/launcher3/graphics/DragPreviewProvider.java b/src/com/android/launcher3/graphics/DragPreviewProvider.java
index 9bc54442a7..0e61b98649 100644
--- a/src/com/android/launcher3/graphics/DragPreviewProvider.java
+++ b/src/com/android/launcher3/graphics/DragPreviewProvider.java
@@ -30,13 +30,13 @@ import android.graphics.drawable.Drawable;
 import android.view.View;
 
 import com.android.launcher3.BubbleTextView;
-import com.android.launcher3.FastBitmapDrawable;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.dragndrop.AppWidgetHostViewDrawable;
 import com.android.launcher3.dragndrop.DraggableView;
 import com.android.launcher3.icons.BitmapRenderer;
+import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.util.SafeCloseable;
 import com.android.launcher3.widget.LauncherAppWidgetHostView;
 
diff --git a/src/com/android/launcher3/graphics/PlaceHolderIconDrawable.java b/src/com/android/launcher3/graphics/PlaceHolderIconDrawable.java
deleted file mode 100644
index b6d25c4de3..0000000000
--- a/src/com/android/launcher3/graphics/PlaceHolderIconDrawable.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.graphics;
-
-import static androidx.core.graphics.ColorUtils.compositeColors;
-
-import static com.android.launcher3.graphics.IconShape.getShapePath;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.ValueAnimator;
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Path;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffColorFilter;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-
-import androidx.core.graphics.ColorUtils;
-
-import com.android.launcher3.FastBitmapDrawable;
-import com.android.launcher3.R;
-import com.android.launcher3.icons.BitmapInfo;
-import com.android.launcher3.util.Themes;
-
-/**
- * Subclass which draws a placeholder icon when the actual icon is not yet loaded
- */
-public class PlaceHolderIconDrawable extends FastBitmapDrawable {
-
-    // Path in [0, 100] bounds.
-    private final Path mProgressPath;
-
-    public PlaceHolderIconDrawable(BitmapInfo info, Context context) {
-        super(info);
-
-        mProgressPath = getShapePath();
-        mPaint.setColor(compositeColors(
-                Themes.getAttrColor(context, R.attr.loadingIconColor), info.color));
-    }
-
-    @Override
-    protected void drawInternal(Canvas canvas, Rect bounds) {
-        int saveCount = canvas.save();
-        canvas.translate(bounds.left, bounds.top);
-        canvas.scale(bounds.width() / 100f, bounds.height() / 100f);
-        canvas.drawPath(mProgressPath, mPaint);
-        canvas.restoreToCount(saveCount);
-    }
-
-    /** Updates this placeholder to {@code newIcon} with animation. */
-    public void animateIconUpdate(Drawable newIcon) {
-        int placeholderColor = mPaint.getColor();
-        int originalAlpha = Color.alpha(placeholderColor);
-
-        ValueAnimator iconUpdateAnimation = ValueAnimator.ofInt(originalAlpha, 0);
-        iconUpdateAnimation.setDuration(375);
-        iconUpdateAnimation.addUpdateListener(valueAnimator -> {
-            int newAlpha = (int) valueAnimator.getAnimatedValue();
-            int newColor = ColorUtils.setAlphaComponent(placeholderColor, newAlpha);
-
-            newIcon.setColorFilter(new PorterDuffColorFilter(newColor, PorterDuff.Mode.SRC_ATOP));
-        });
-        iconUpdateAnimation.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                newIcon.setColorFilter(null);
-            }
-        });
-        iconUpdateAnimation.start();
-    }
-
-}
diff --git a/src/com/android/launcher3/graphics/PreloadIconDrawable.java b/src/com/android/launcher3/graphics/PreloadIconDrawable.java
index ce824df3e6..ac0ec5f7f7 100644
--- a/src/com/android/launcher3/graphics/PreloadIconDrawable.java
+++ b/src/com/android/launcher3/graphics/PreloadIconDrawable.java
@@ -37,8 +37,8 @@ import android.util.Property;
 import android.util.SparseArray;
 import android.view.ContextThemeWrapper;
 
-import com.android.launcher3.FastBitmapDrawable;
 import com.android.launcher3.anim.Interpolators;
+import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.util.Themes;
 
diff --git a/src/com/android/launcher3/icons/ClockDrawableWrapper.java b/src/com/android/launcher3/icons/ClockDrawableWrapper.java
deleted file mode 100644
index 1bd252ba45..0000000000
--- a/src/com/android/launcher3/icons/ClockDrawableWrapper.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.icons;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Rect;
-import android.graphics.drawable.AdaptiveIconDrawable;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.LayerDrawable;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Process;
-import android.os.SystemClock;
-import android.util.Log;
-
-import com.android.launcher3.FastBitmapDrawable;
-
-import java.util.Calendar;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Wrapper over {@link AdaptiveIconDrawable} to intercept icon flattening logic for dynamic
- * clock icons
- */
-@TargetApi(Build.VERSION_CODES.O)
-public class ClockDrawableWrapper extends AdaptiveIconDrawable implements BitmapInfo.Extender {
-
-    private static final String TAG = "ClockDrawableWrapper";
-
-    private static final boolean DISABLE_SECONDS = true;
-
-    // Time after which the clock icon should check for an update. The actual invalidate
-    // will only happen in case of any change.
-    public static final long TICK_MS = DISABLE_SECONDS ? TimeUnit.MINUTES.toMillis(1) : 200L;
-
-    private static final String LAUNCHER_PACKAGE = "com.android.launcher3";
-    private static final String ROUND_ICON_METADATA_KEY = LAUNCHER_PACKAGE
-            + ".LEVEL_PER_TICK_ICON_ROUND";
-    private static final String HOUR_INDEX_METADATA_KEY = LAUNCHER_PACKAGE + ".HOUR_LAYER_INDEX";
-    private static final String MINUTE_INDEX_METADATA_KEY = LAUNCHER_PACKAGE
-            + ".MINUTE_LAYER_INDEX";
-    private static final String SECOND_INDEX_METADATA_KEY = LAUNCHER_PACKAGE
-            + ".SECOND_LAYER_INDEX";
-    private static final String DEFAULT_HOUR_METADATA_KEY = LAUNCHER_PACKAGE
-            + ".DEFAULT_HOUR";
-    private static final String DEFAULT_MINUTE_METADATA_KEY = LAUNCHER_PACKAGE
-            + ".DEFAULT_MINUTE";
-    private static final String DEFAULT_SECOND_METADATA_KEY = LAUNCHER_PACKAGE
-            + ".DEFAULT_SECOND";
-
-    /* Number of levels to jump per second for the second hand */
-    private static final int LEVELS_PER_SECOND = 10;
-
-    public static final int INVALID_VALUE = -1;
-
-    private final AnimationInfo mAnimationInfo = new AnimationInfo();
-    private int mTargetSdkVersion;
-
-    public ClockDrawableWrapper(AdaptiveIconDrawable base) {
-        super(base.getBackground(), base.getForeground());
-    }
-
-    /**
-     * Loads and returns the wrapper from the provided package, or returns null
-     * if it is unable to load.
-     */
-    public static ClockDrawableWrapper forPackage(Context context, String pkg, int iconDpi) {
-        try {
-            PackageManager pm = context.getPackageManager();
-            ApplicationInfo appInfo =  pm.getApplicationInfo(pkg,
-                    PackageManager.MATCH_UNINSTALLED_PACKAGES | PackageManager.GET_META_DATA);
-            final Bundle metadata = appInfo.metaData;
-            if (metadata == null) {
-                return null;
-            }
-            int drawableId = metadata.getInt(ROUND_ICON_METADATA_KEY, 0);
-            if (drawableId == 0) {
-                return null;
-            }
-
-            Drawable drawable = pm.getResourcesForApplication(appInfo).getDrawableForDensity(
-                    drawableId, iconDpi).mutate();
-            if (!(drawable instanceof AdaptiveIconDrawable)) {
-                return null;
-            }
-
-            ClockDrawableWrapper wrapper =
-                    new ClockDrawableWrapper((AdaptiveIconDrawable) drawable);
-            wrapper.mTargetSdkVersion = appInfo.targetSdkVersion;
-            AnimationInfo info = wrapper.mAnimationInfo;
-
-            info.baseDrawableState = drawable.getConstantState();
-
-            info.hourLayerIndex = metadata.getInt(HOUR_INDEX_METADATA_KEY, INVALID_VALUE);
-            info.minuteLayerIndex = metadata.getInt(MINUTE_INDEX_METADATA_KEY, INVALID_VALUE);
-            info.secondLayerIndex = metadata.getInt(SECOND_INDEX_METADATA_KEY, INVALID_VALUE);
-
-            info.defaultHour = metadata.getInt(DEFAULT_HOUR_METADATA_KEY, 0);
-            info.defaultMinute = metadata.getInt(DEFAULT_MINUTE_METADATA_KEY, 0);
-            info.defaultSecond = metadata.getInt(DEFAULT_SECOND_METADATA_KEY, 0);
-
-            LayerDrawable foreground = (LayerDrawable) wrapper.getForeground();
-            int layerCount = foreground.getNumberOfLayers();
-            if (info.hourLayerIndex < 0 || info.hourLayerIndex >= layerCount) {
-                info.hourLayerIndex = INVALID_VALUE;
-            }
-            if (info.minuteLayerIndex < 0 || info.minuteLayerIndex >= layerCount) {
-                info.minuteLayerIndex = INVALID_VALUE;
-            }
-            if (info.secondLayerIndex < 0 || info.secondLayerIndex >= layerCount) {
-                info.secondLayerIndex = INVALID_VALUE;
-            } else if (DISABLE_SECONDS) {
-                foreground.setDrawable(info.secondLayerIndex, null);
-                info.secondLayerIndex = INVALID_VALUE;
-            }
-            return wrapper;
-        } catch (Exception e) {
-            Log.d(TAG, "Unable to load clock drawable info", e);
-        }
-        return null;
-    }
-
-    @Override
-    public BitmapInfo getExtendedInfo(Bitmap bitmap, int color, BaseIconFactory iconFactory) {
-        iconFactory.disableColorExtraction();
-        float [] scale = new float[1];
-        AdaptiveIconDrawable background = new AdaptiveIconDrawable(
-                getBackground().getConstantState().newDrawable(), null);
-        BitmapInfo bitmapInfo = iconFactory.createBadgedIconBitmap(background,
-                Process.myUserHandle(), mTargetSdkVersion, false, scale);
-
-        return new ClockBitmapInfo(bitmap, color, scale[0], mAnimationInfo, bitmapInfo.icon);
-    }
-
-    @Override
-    public void prepareToDrawOnUi() {
-        mAnimationInfo.applyTime(Calendar.getInstance(), (LayerDrawable) getForeground());
-    }
-
-    private static class AnimationInfo {
-
-        public ConstantState baseDrawableState;
-
-        public int hourLayerIndex;
-        public int minuteLayerIndex;
-        public int secondLayerIndex;
-        public int defaultHour;
-        public int defaultMinute;
-        public int defaultSecond;
-
-        boolean applyTime(Calendar time, LayerDrawable foregroundDrawable) {
-            time.setTimeInMillis(System.currentTimeMillis());
-
-            // We need to rotate by the difference from the default time if one is specified.
-            int convertedHour = (time.get(Calendar.HOUR) + (12 - defaultHour)) % 12;
-            int convertedMinute = (time.get(Calendar.MINUTE) + (60 - defaultMinute)) % 60;
-            int convertedSecond = (time.get(Calendar.SECOND) + (60 - defaultSecond)) % 60;
-
-            boolean invalidate = false;
-            if (hourLayerIndex != INVALID_VALUE) {
-                final Drawable hour = foregroundDrawable.getDrawable(hourLayerIndex);
-                if (hour.setLevel(convertedHour * 60 + time.get(Calendar.MINUTE))) {
-                    invalidate = true;
-                }
-            }
-
-            if (minuteLayerIndex != INVALID_VALUE) {
-                final Drawable minute = foregroundDrawable.getDrawable(minuteLayerIndex);
-                if (minute.setLevel(time.get(Calendar.HOUR) * 60 + convertedMinute)) {
-                    invalidate = true;
-                }
-            }
-
-            if (secondLayerIndex != INVALID_VALUE) {
-                final Drawable second = foregroundDrawable.getDrawable(secondLayerIndex);
-                if (second.setLevel(convertedSecond * LEVELS_PER_SECOND)) {
-                    invalidate = true;
-                }
-            }
-
-            return invalidate;
-        }
-    }
-
-    private static class ClockBitmapInfo extends BitmapInfo implements FastBitmapDrawable.Factory {
-
-        public final float scale;
-        public final int offset;
-        public final AnimationInfo animInfo;
-        public final Bitmap mFlattenedBackground;
-
-        ClockBitmapInfo(Bitmap icon, int color, float scale, AnimationInfo animInfo,
-                Bitmap background) {
-            super(icon, color);
-            this.scale = scale;
-            this.animInfo = animInfo;
-            this.offset = (int) Math.ceil(ShadowGenerator.BLUR_FACTOR * icon.getWidth());
-            this.mFlattenedBackground = background;
-        }
-
-        @Override
-        public FastBitmapDrawable newDrawable() {
-            return new ClockIconDrawable(this);
-        }
-    }
-
-    private static class ClockIconDrawable extends FastBitmapDrawable implements Runnable {
-
-        private final Calendar mTime = Calendar.getInstance();
-
-        private final ClockBitmapInfo mInfo;
-
-        private final AdaptiveIconDrawable mFullDrawable;
-        private final LayerDrawable mForeground;
-
-        ClockIconDrawable(ClockBitmapInfo clockInfo) {
-            super(clockInfo);
-
-            mInfo = clockInfo;
-
-            mFullDrawable = (AdaptiveIconDrawable) mInfo.animInfo.baseDrawableState.newDrawable();
-            mForeground = (LayerDrawable) mFullDrawable.getForeground();
-        }
-
-        @Override
-        protected void onBoundsChange(Rect bounds) {
-            super.onBoundsChange(bounds);
-            mFullDrawable.setBounds(bounds);
-        }
-
-        @Override
-        public void drawInternal(Canvas canvas, Rect bounds) {
-            if (mInfo == null) {
-                super.drawInternal(canvas, bounds);
-                return;
-            }
-            // draw the background that is already flattened to a bitmap
-            canvas.drawBitmap(mInfo.mFlattenedBackground, null, bounds, mPaint);
-
-            // prepare and draw the foreground
-            mInfo.animInfo.applyTime(mTime, mForeground);
-
-            canvas.scale(mInfo.scale, mInfo.scale,
-                    bounds.exactCenterX() + mInfo.offset, bounds.exactCenterY() + mInfo.offset);
-            canvas.clipPath(mFullDrawable.getIconMask());
-            mForeground.draw(canvas);
-
-            reschedule();
-        }
-
-        @Override
-        protected void updateFilter() {
-            super.updateFilter();
-            mFullDrawable.setColorFilter(mPaint.getColorFilter());
-        }
-
-        @Override
-        public void run() {
-            if (mInfo.animInfo.applyTime(mTime, mForeground)) {
-                invalidateSelf();
-            } else {
-                reschedule();
-            }
-        }
-
-        @Override
-        public boolean setVisible(boolean visible, boolean restart) {
-            boolean result = super.setVisible(visible, restart);
-            if (visible) {
-                reschedule();
-            } else {
-                unscheduleSelf(this);
-            }
-            return result;
-        }
-
-        private void reschedule() {
-            if (!isVisible()) {
-                return;
-            }
-
-            unscheduleSelf(this);
-            final long upTime = SystemClock.uptimeMillis();
-            final long step = TICK_MS; /* tick every 200 ms */
-            scheduleSelf(this, upTime - ((upTime % step)) + step);
-        }
-
-        @Override
-        public ConstantState getConstantState() {
-            return new ClockConstantState(mInfo, isDisabled());
-        }
-
-        private static class ClockConstantState extends FastBitmapConstantState {
-
-            private final ClockBitmapInfo mInfo;
-
-            ClockConstantState(ClockBitmapInfo info, boolean isDisabled) {
-                super(info.icon, info.color, isDisabled);
-                mInfo = info;
-            }
-
-            @Override
-            public FastBitmapDrawable newDrawable() {
-                ClockIconDrawable drawable = new ClockIconDrawable(mInfo);
-                drawable.setIsDisabled(mIsDisabled);
-                return drawable;
-            }
-        }
-    }
-}
diff --git a/src/com/android/launcher3/icons/IconProvider.java b/src/com/android/launcher3/icons/IconProvider.java
deleted file mode 100644
index 1468b27822..0000000000
--- a/src/com/android/launcher3/icons/IconProvider.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.icons;
-
-import android.content.BroadcastReceiver;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.ActivityInfo;
-import android.content.pm.LauncherActivityInfo;
-import android.content.pm.PackageManager;
-import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Process;
-import android.os.UserHandle;
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.android.launcher3.R;
-import com.android.launcher3.icons.BitmapInfo.Extender;
-import com.android.launcher3.pm.UserCache;
-import com.android.launcher3.util.ComponentKey;
-import com.android.launcher3.util.SafeCloseable;
-
-import java.util.Calendar;
-import java.util.function.BiConsumer;
-import java.util.function.BiFunction;
-
-/**
- * Class to handle icon loading from different packages
- */
-public class IconProvider {
-
-    private static final String TAG = "IconProvider";
-    private static final boolean DEBUG = false;
-
-    private static final String ICON_METADATA_KEY_PREFIX = ".dynamic_icons";
-
-    private static final String SYSTEM_STATE_SEPARATOR = " ";
-
-    // Default value returned if there are problems getting resources.
-    private static final int NO_ID = 0;
-
-    private static final BiFunction<LauncherActivityInfo, Integer, Drawable> LAI_LOADER =
-            LauncherActivityInfo::getIcon;
-
-    private static final BiFunction<ActivityInfo, PackageManager, Drawable> AI_LOADER =
-            ActivityInfo::loadUnbadgedIcon;
-
-
-    private final Context mContext;
-    private final ComponentName mCalendar;
-    private final ComponentName mClock;
-
-    public IconProvider(Context context) {
-        mContext = context;
-        mCalendar = parseComponentOrNull(context, R.string.calendar_component_name);
-        mClock = parseComponentOrNull(context, R.string.clock_component_name);
-    }
-
-    /**
-     * Adds any modification to the provided systemState for dynamic icons. This system state
-     * is used by caches to check for icon invalidation.
-     */
-    public String getSystemStateForPackage(String systemState, String packageName) {
-        if (mCalendar != null && mCalendar.getPackageName().equals(packageName)) {
-            return systemState + SYSTEM_STATE_SEPARATOR + getDay();
-        } else {
-            return systemState;
-        }
-    }
-
-    /**
-     * Loads the icon for the provided LauncherActivityInfo such that it can be drawn directly
-     * on the UI
-     */
-    public Drawable getIconForUI(LauncherActivityInfo info, int iconDpi) {
-        Drawable icon = getIcon(info, iconDpi);
-        if (icon instanceof BitmapInfo.Extender) {
-            ((Extender) icon).prepareToDrawOnUi();
-        }
-        return icon;
-    }
-
-    /**
-     * Loads the icon for the provided LauncherActivityInfo
-     */
-    public Drawable getIcon(LauncherActivityInfo info, int iconDpi) {
-        return getIcon(info.getApplicationInfo().packageName, info.getUser(),
-                info, iconDpi, LAI_LOADER);
-    }
-
-    /**
-     * Loads the icon for the provided activity info
-     */
-    public Drawable getIcon(ActivityInfo info, UserHandle user) {
-        return getIcon(info.applicationInfo.packageName, user, info, mContext.getPackageManager(),
-                AI_LOADER);
-    }
-
-    private <T, P> Drawable getIcon(String packageName, UserHandle user, T obj, P param,
-            BiFunction<T, P, Drawable> loader) {
-        Drawable icon = null;
-        if (mCalendar != null && mCalendar.getPackageName().equals(packageName)) {
-            icon = loadCalendarDrawable(0);
-        } else if (mClock != null
-                && mClock.getPackageName().equals(packageName)
-                && Process.myUserHandle().equals(user)) {
-            icon = loadClockDrawable(0);
-        }
-        return icon == null ? loader.apply(obj, param) : icon;
-    }
-
-    private Drawable loadCalendarDrawable(int iconDpi) {
-        PackageManager pm = mContext.getPackageManager();
-        try {
-            final Bundle metadata = pm.getActivityInfo(
-                    mCalendar,
-                    PackageManager.GET_UNINSTALLED_PACKAGES | PackageManager.GET_META_DATA)
-                    .metaData;
-            final Resources resources = pm.getResourcesForApplication(mCalendar.getPackageName());
-            final int id = getDynamicIconId(metadata, resources);
-            if (id != NO_ID) {
-                if (DEBUG) Log.d(TAG, "Got icon #" + id);
-                return resources.getDrawableForDensity(id, iconDpi, null /* theme */);
-            }
-        } catch (PackageManager.NameNotFoundException e) {
-            if (DEBUG) {
-                Log.d(TAG, "Could not get activityinfo or resources for package: "
-                        + mCalendar.getPackageName());
-            }
-        }
-        return null;
-    }
-
-    private Drawable loadClockDrawable(int iconDpi) {
-        return ClockDrawableWrapper.forPackage(mContext, mClock.getPackageName(), iconDpi);
-    }
-
-    protected boolean isClockIcon(ComponentKey key) {
-        return mClock != null && mClock.equals(key.componentName)
-                && Process.myUserHandle().equals(key.user);
-    }
-
-    /**
-     * @param metadata metadata of the default activity of Calendar
-     * @param resources from the Calendar package
-     * @return the resource id for today's Calendar icon; 0 if resources cannot be found.
-     */
-    private int getDynamicIconId(Bundle metadata, Resources resources) {
-        if (metadata == null) {
-            return NO_ID;
-        }
-        String key = mCalendar.getPackageName() + ICON_METADATA_KEY_PREFIX;
-        final int arrayId = metadata.getInt(key, NO_ID);
-        if (arrayId == NO_ID) {
-            return NO_ID;
-        }
-        try {
-            return resources.obtainTypedArray(arrayId).getResourceId(getDay(), NO_ID);
-        } catch (Resources.NotFoundException e) {
-            if (DEBUG) {
-                Log.d(TAG, "package defines '" + key + "' but corresponding array not found");
-            }
-            return NO_ID;
-        }
-    }
-
-    /**
-     * @return Today's day of the month, zero-indexed.
-     */
-    private int getDay() {
-        return Calendar.getInstance().get(Calendar.DAY_OF_MONTH) - 1;
-    }
-
-
-    /**
-     * Registers a callback to listen for calendar icon changes.
-     * The callback receives the packageName for the calendar icon
-     */
-    public static SafeCloseable registerIconChangeListener(Context context,
-            BiConsumer<String, UserHandle> callback, Handler handler) {
-        ComponentName calendar = parseComponentOrNull(context, R.string.calendar_component_name);
-        ComponentName clock = parseComponentOrNull(context, R.string.clock_component_name);
-
-        if (calendar == null && clock == null) {
-            return () -> { };
-        }
-
-        BroadcastReceiver receiver = new DateTimeChangeReceiver(callback);
-        final IntentFilter filter = new IntentFilter(Intent.ACTION_TIMEZONE_CHANGED);
-        if (calendar != null) {
-            filter.addAction(Intent.ACTION_TIME_CHANGED);
-            filter.addAction(Intent.ACTION_DATE_CHANGED);
-        }
-        context.registerReceiver(receiver, filter, null, handler);
-
-        return () -> context.unregisterReceiver(receiver);
-    }
-
-    private static class DateTimeChangeReceiver extends BroadcastReceiver {
-
-        private final BiConsumer<String, UserHandle> mCallback;
-
-        DateTimeChangeReceiver(BiConsumer<String, UserHandle> callback) {
-            mCallback = callback;
-        }
-
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if (Intent.ACTION_TIMEZONE_CHANGED.equals(intent.getAction())) {
-                ComponentName clock = parseComponentOrNull(context, R.string.clock_component_name);
-                if (clock != null) {
-                    mCallback.accept(clock.getPackageName(), Process.myUserHandle());
-                }
-            }
-
-            ComponentName calendar =
-                    parseComponentOrNull(context, R.string.calendar_component_name);
-            if (calendar != null) {
-                for (UserHandle user : UserCache.INSTANCE.get(context).getUserProfiles()) {
-                    mCallback.accept(calendar.getPackageName(), user);
-                }
-            }
-
-        }
-    }
-
-    private static ComponentName parseComponentOrNull(Context context, int resId) {
-        String cn = context.getString(resId);
-        return TextUtils.isEmpty(cn) ? null : ComponentName.unflattenFromString(cn);
-
-    }
-}
diff --git a/src/com/android/launcher3/model/data/ItemInfoWithIcon.java b/src/com/android/launcher3/model/data/ItemInfoWithIcon.java
index d95e7080de..76b2ab0e85 100644
--- a/src/com/android/launcher3/model/data/ItemInfoWithIcon.java
+++ b/src/com/android/launcher3/model/data/ItemInfoWithIcon.java
@@ -23,6 +23,7 @@ import android.content.Intent;
 import androidx.annotation.Nullable;
 
 import com.android.launcher3.icons.BitmapInfo;
+import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.pm.PackageInstallInfo;
 import com.android.launcher3.util.PackageManagerHelper;
 
@@ -216,4 +217,14 @@ public abstract class ItemInfoWithIcon extends ItemInfo {
      * @return a copy of this
      */
     public abstract ItemInfoWithIcon clone();
+
+
+    /**
+     * Returns a FastBitmapDrawable with the icon.
+     */
+    public FastBitmapDrawable newIcon(Context context) {
+        FastBitmapDrawable drawable = bitmap.newIcon(context);
+        drawable.setIsDisabled(isDisabled());
+        return drawable;
+    }
 }
diff --git a/src/com/android/launcher3/shortcuts/ShortcutDragPreviewProvider.java b/src/com/android/launcher3/shortcuts/ShortcutDragPreviewProvider.java
index 530aaedefc..cecbb0db13 100644
--- a/src/com/android/launcher3/shortcuts/ShortcutDragPreviewProvider.java
+++ b/src/com/android/launcher3/shortcuts/ShortcutDragPreviewProvider.java
@@ -23,12 +23,12 @@ import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.view.View;
 
-import com.android.launcher3.FastBitmapDrawable;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.graphics.DragPreviewProvider;
 import com.android.launcher3.icons.BitmapRenderer;
+import com.android.launcher3.icons.FastBitmapDrawable;
 
 /**
  * Extension of {@link DragPreviewProvider} which generates bitmaps scaled to the default icon size.
diff --git a/src/com/android/launcher3/util/SafeCloseable.java b/src/com/android/launcher3/util/SafeCloseable.java
deleted file mode 100644
index ba8ee04d27..0000000000
--- a/src/com/android/launcher3/util/SafeCloseable.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.util;
-
-/**
- * Extension of closeable which does not throw an exception
- */
-public interface SafeCloseable extends AutoCloseable {
-
-    @Override
-    void close();
-}
diff --git a/src/com/android/launcher3/util/Themes.java b/src/com/android/launcher3/util/Themes.java
index 512a286288..e8a0635b2a 100644
--- a/src/com/android/launcher3/util/Themes.java
+++ b/src/com/android/launcher3/util/Themes.java
@@ -28,6 +28,7 @@ import android.util.TypedValue;
 
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.icons.GraphicsUtils;
 import com.android.launcher3.uioverrides.WallpaperColorInfo;
 
 /**
@@ -92,10 +93,7 @@ public class Themes {
     }
 
     public static int getAttrColor(Context context, int attr) {
-        TypedArray ta = context.obtainStyledAttributes(new int[]{attr});
-        int colorAccent = ta.getColor(0, 0);
-        ta.recycle();
-        return colorAccent;
+        return GraphicsUtils.getAttrColor(context, attr);
     }
 
     public static boolean getAttrBoolean(Context context, int attr) {
@@ -119,23 +117,6 @@ public class Themes {
         return value;
     }
 
-    /**
-     * Returns the alpha corresponding to the theme attribute {@param attr}, in the range [0, 255].
-     */
-    public static int getAlpha(Context context, int attr) {
-        return (int) (255 * getFloat(context, attr, 0) + 0.5f);
-    }
-
-    /**
-     * Returns the alpha corresponding to the theme attribute {@param attr}
-     */
-    public static float getFloat(Context context, int attr, float defValue) {
-        TypedArray ta = context.obtainStyledAttributes(new int[]{attr});
-        float value = ta.getFloat(0, defValue);
-        ta.recycle();
-        return value;
-    }
-
     /**
      * Scales a color matrix such that, when applied to color R G B A, it produces R' G' B' A' where
      * R' = r * R
diff --git a/src/com/android/launcher3/widget/PendingAppWidgetHostView.java b/src/com/android/launcher3/widget/PendingAppWidgetHostView.java
index 4b113d8070..3308eecf5d 100644
--- a/src/com/android/launcher3/widget/PendingAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/PendingAppWidgetHostView.java
@@ -16,7 +16,6 @@
 
 package com.android.launcher3.widget;
 
-import static com.android.launcher3.FastBitmapDrawable.newIcon;
 import static com.android.launcher3.graphics.PreloadIconDrawable.newPendingIcon;
 
 import android.content.Context;
@@ -37,8 +36,8 @@ import android.view.View.OnClickListener;
 import android.widget.RemoteViews;
 
 import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.FastBitmapDrawable;
 import com.android.launcher3.R;
+import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.icons.IconCache.ItemInfoUpdateReceiver;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
@@ -152,12 +151,12 @@ public class PendingAppWidgetHostView extends LauncherAppWidgetHostView
             //   2) Preload icon in the center
             //   3) Setup icon in the center and app icon in the top right corner.
             if (mDisabledForSafeMode) {
-                FastBitmapDrawable disabledIcon = newIcon(getContext(), info);
+                FastBitmapDrawable disabledIcon = info.newIcon(getContext());
                 disabledIcon.setIsDisabled(true);
                 mCenterDrawable = disabledIcon;
                 mSettingIconDrawable = null;
             } else if (isReadyForClickSetup()) {
-                mCenterDrawable = newIcon(getContext(), info);
+                mCenterDrawable = info.newIcon(getContext());
                 mSettingIconDrawable = getResources().getDrawable(R.drawable.ic_setting).mutate();
                 updateSettingColor(info.bitmap.color);
             } else {
diff --git a/src/com/android/launcher3/widget/PendingItemDragHelper.java b/src/com/android/launcher3/widget/PendingItemDragHelper.java
index 08bb66211c..ad0a4017c6 100644
--- a/src/com/android/launcher3/widget/PendingItemDragHelper.java
+++ b/src/com/android/launcher3/widget/PendingItemDragHelper.java
@@ -29,7 +29,6 @@ import androidx.annotation.Nullable;
 
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.DragSource;
-import com.android.launcher3.FastBitmapDrawable;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.PendingAddItemInfo;
@@ -38,6 +37,7 @@ import com.android.launcher3.dragndrop.AppWidgetHostViewDrawable;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.dragndrop.DraggableView;
 import com.android.launcher3.graphics.DragPreviewProvider;
+import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.widget.dragndrop.AppWidgetHostViewDragListener;
 
diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index 2b4b9ea55e..c11b68e5f6 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -40,12 +40,12 @@ import androidx.annotation.Nullable;
 import com.android.launcher3.BaseActivity;
 import com.android.launcher3.CheckLongPressHelper;
 import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.FastBitmapDrawable;
 import com.android.launcher3.R;
 import com.android.launcher3.WidgetPreviewLoader;
 import com.android.launcher3.dragndrop.AppWidgetHostViewDrawable;
 import com.android.launcher3.icons.BaseIconFactory;
 import com.android.launcher3.icons.BitmapRenderer;
+import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.model.WidgetItem;
 
 /**
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListHeader.java b/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
index 75dd40901b..497c72e540 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
@@ -15,8 +15,6 @@
  */
 package com.android.launcher3.widget.picker;
 
-import static com.android.launcher3.FastBitmapDrawable.newIcon;
-
 import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
@@ -32,11 +30,11 @@ import androidx.annotation.UiThread;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.FastBitmapDrawable;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
-import com.android.launcher3.graphics.PlaceHolderIconDrawable;
+import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.icons.IconCache.ItemInfoUpdateReceiver;
+import com.android.launcher3.icons.PlaceHolderIconDrawable;
 import com.android.launcher3.icons.cache.HandlerRunnable;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.PackageItemInfo;
@@ -145,7 +143,7 @@ public final class WidgetsListHeader extends LinearLayout implements ItemInfoUpd
     }
 
     private void setIcon(PackageItemInfo info) {
-        FastBitmapDrawable icon = newIcon(getContext(), info);
+        FastBitmapDrawable icon = info.newIcon(getContext());
         applyDrawables(icon);
         mIconDrawable = icon;
         if (mIconDrawable != null) {
-- 
GitLab


From 6062b851bec8152e51a2210c5e07ee4446757d78 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Wed, 24 Mar 2021 15:06:15 -0700
Subject: [PATCH 0779/1664] Add strings for gesture navigation tutorial.

Added string resources needed for the gesture navigation tutorial.

Test: none.

Bug: 169687177
Change-Id: I75b863141954f6459693dfb6f16ed0d1fff9920d
---
 quickstep/res/values/strings.xml              | 97 +++++++++++--------
 .../BackGestureTutorialController.java        |  6 +-
 .../HomeGestureTutorialController.java        |  4 +-
 .../OverviewGestureTutorialController.java    |  4 +-
 4 files changed, 63 insertions(+), 48 deletions(-)

diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml
index 0764bb3ca3..160332105b 100644
--- a/quickstep/res/values/strings.xml
+++ b/quickstep/res/values/strings.xml
@@ -99,62 +99,61 @@
 
     <!-- Dismiss button string for search education view -->
     <string name="search_edu_dismiss">Got it.</string>
-
-    <!-- Title shown during interactive part of Back gesture tutorial for right edge. [CHAR LIMIT=30] -->
-    <string name="back_gesture_tutorial_playground_title_swipe_inward_right_edge" translatable="false">Try the back gesture</string>
-    <!-- Subtitle shown during interactive parts of Back gesture tutorial for right edge. [CHAR LIMIT=60] -->
-    <string name="back_gesture_tutorial_engaged_subtitle_swipe_inward_right_edge" translatable="false">Start at the right edge and swipe toward the middle</string>
+    <!-- Feedback shown during interactive parts of Back gesture tutorial for left edge when the gesture is too far from the edge. [CHAR LIMIT=100] -->
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge">Make sure you swipe from the far-left edge.</string>
+    <!-- Feedback shown during interactive parts of Back gesture tutorial for left edge when the gesture is cancelled. [CHAR LIMIT=100] -->
+    <string name="back_gesture_feedback_cancelled_left_edge">Make sure you swipe from the left edge to the middle of the screen and let go.</string>
+    <!-- Feedback shown after completing the left back gesture before continuing on to the right edge. [CHAR LIMIT=60] -->
+    <string name="back_gesture_feedback_complete_left_edge">That\'s it! Now try swiping from the right edge.</string>
     <!-- Feedback shown during interactive parts of Back gesture tutorial for right edge when the gesture is too far from the edge. [CHAR LIMIT=100] -->
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" translatable="false">Make sure you swipe from the far right edge</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge">Make sure you swipe from the far-right edge.</string>
     <!-- Feedback shown during interactive parts of Back gesture tutorial for right edge when the gesture is cancelled. [CHAR LIMIT=100] -->
-    <string name="back_gesture_feedback_cancelled_right_edge" translatable="false">Make sure you swipe straight to the left and let go</string>
-
-    <!-- Title shown during interactive part of Back gesture tutorial for left edge. [CHAR LIMIT=30] -->
-    <string name="back_gesture_tutorial_playground_title_swipe_inward_left_edge" translatable="false">Try the other side</string>
-    <!-- Subtitle shown during interactive parts of Back gesture tutorial for left edge. [CHAR LIMIT=60] -->
-    <string name="back_gesture_tutorial_engaged_subtitle_swipe_inward_left_edge" translatable="false">That\'s it! Now try swiping from the left edge.</string>
-    <!-- Feedback shown during interactive parts of Back gesture tutorial for left edge when the gesture is too far from the edge. [CHAR LIMIT=100] -->
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" translatable="false">Make sure you swipe from the far left edge</string>
+    <string name="back_gesture_feedback_cancelled_right_edge">Make sure you swipe from the right edge to the middle of the screen and let go.</string>
     <!-- Feedback shown during interactive parts of Back gesture tutorial for left edge when the gesture is cancelled. [CHAR LIMIT=100] -->
-    <string name="back_gesture_feedback_cancelled_left_edge" translatable="false">Make sure you swipe straight to the right and let go</string>
-
+    <string name="back_gesture_feedback_complete">You completed the go back gesture. Next up, learn how to go Home.</string>
     <!-- Feedback shown during interactive parts of Back gesture tutorial when the gesture is within the nav bar region. [CHAR LIMIT=100] -->
-    <string name="back_gesture_feedback_swipe_in_nav_bar" translatable="false">Make sure you don\'t swipe too close to the bottom of the screen</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar">Make sure you don\'t swipe too close to the bottom of the screen.</string>
     <!-- Subtitle shown on the confirmation screen after successful gesture. [CHAR LIMIT=60] -->
-    <string name="back_gesture_tutorial_confirm_subtitle" translatable="false">To change the sensitivity of the back gesture, go to Settings</string>
-
-    <!-- Title shown during interactive part of Home gesture tutorial. [CHAR LIMIT=30] -->
-    <string name="home_gesture_tutorial_playground_title" translatable="false">Tutorial: Go Home</string>
-    <!-- Subtitle shown during interactive parts of Home gesture tutorial. [CHAR LIMIT=60] -->
-    <string name="home_gesture_tutorial_playground_subtitle" translatable="false">Try swiping upward from the bottom edge of the screen</string>
+    <string name="back_gesture_tutorial_confirm_subtitle">To change the sensitivity of the back gesture, go to Settings</string>
     <!-- Feedback shown during interactive parts of Home gesture tutorial when the gesture is started too far from the edge. [CHAR LIMIT=100] -->
-    <string name="home_gesture_feedback_swipe_too_far_from_edge" translatable="false">Make sure you swipe from the bottom edge of the screen</string>
+    <!-- Introduction title for the Back gesture tutorial. [CHAR LIMIT=100] -->
+    <string name="back_gesture_intro_title">Swipe to go back</string>
+    <!-- Introduction subtitle for the Back gesture tutorial. [CHAR LIMIT=100] -->
+    <string name="back_gesture_intro_subtitle">To go back to the last screen, swipe from the left or right edge to the middle of the screen.</string>
+
+    <string name="home_gesture_feedback_swipe_too_far_from_edge">Make sure you swipe up from the bottom edge of the screen.</string>
     <!-- Feedback shown during interactive parts of Home gesture tutorial when the Overview gesture is detected. [CHAR LIMIT=100] -->
-    <string name="home_gesture_feedback_overview_detected" translatable="false">Make sure you don\'t pause before letting go</string>
+    <string name="home_gesture_feedback_overview_detected">Make sure you don\'t pause before letting go.</string>
     <!-- Feedback shown during interactive parts of Home gesture tutorial when the gesture is horizontal instead of vertical. [CHAR LIMIT=100] -->
-    <string name="home_gesture_feedback_wrong_swipe_direction" translatable="false">Make sure you swipe straight up</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction">Make sure you swipe straight up.</string>
+    <string name="home_gesture_feedback_complete">You completed the go Home gesture. Next up, learn how to switch apps.</string>
+    <!-- Introduction title for the Home gesture tutorial. [CHAR LIMIT=100] -->
+    <string name="home_gesture_intro_title">Swipe to go home</string>
+    <!-- Introduction subtitle for the Home gesture tutorial. [CHAR LIMIT=100] -->
+    <string name="home_gesture_intro_subtitle">Swipe up from the bottom of your screen. This gesture always takes you to the Home screen.</string>
 
-    <!-- Title shown during interactive part of Overview gesture tutorial. [CHAR LIMIT=30] -->
-    <string name="overview_gesture_tutorial_playground_title" translatable="false">Tutorial: Switch Apps</string>
-    <!-- Subtitle shown during interactive parts of Overview gesture tutorial. [CHAR LIMIT=60] -->
-    <string name="overview_gesture_tutorial_playground_subtitle" translatable="false">Swipe up from the bottom of the screen and hold</string>
     <!-- Feedback shown during interactive parts of Overview gesture tutorial when the gesture is started too far from the edge. [CHAR LIMIT=100] -->
-    <string name="overview_gesture_feedback_swipe_too_far_from_edge" translatable="false">Make sure you swipe from the bottom edge of the screen</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge">Make sure you swipe up from the bottom edge of the screen.</string>
     <!-- Feedback shown during interactive parts of Overview gesture tutorial when the Home gesture is detected. [CHAR LIMIT=100] -->
-    <string name="overview_gesture_feedback_home_detected" translatable="false">Try holding the window for longer before releasing</string>
+    <string name="overview_gesture_feedback_home_detected">Try holding the window for longer before releasing.</string>
     <!-- Feedback shown during interactive parts of Overview gesture tutorial when the gesture is horizontal instead of vertical. [CHAR LIMIT=100] -->
-    <string name="overview_gesture_feedback_wrong_swipe_direction" translatable="false">Make sure you swipe straight up and pause</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction">Make sure you swipe straight up, then pause.</string>
+    <string name="overview_gesture_feedback_complete">You completed the switch apps gesture. You\'re ready to use your phone!</string>
+    <!-- Introduction title for the Overview gesture tutorial. [CHAR LIMIT=100] -->
+    <string name="overview_gesture_intro_title">Swipe to switch apps</string>
+    <!-- Introduction subtitle for the Overview gesture tutorial. [CHAR LIMIT=100] -->
+    <string name="overview_gesture_intro_subtitle">Swipe up from the bottom of your screen, hold, then release.</string>
 
     <!-- Title shown during interactive part of Assistant gesture tutorial. [CHAR LIMIT=30] -->
     <string name="assistant_gesture_tutorial_playground_title" translatable="false">Tutorial: Assistant</string>
     <!-- Subtitle shown during interactive parts of Assistant gesture tutorial. [CHAR LIMIT=60] -->
     <string name="assistant_gesture_tutorial_playground_subtitle" translatable="false">Try swiping diagonally from a bottom corner of the screen</string>
     <!-- Feedback shown during interactive parts of Assistant gesture tutorial when the gesture is started too far from the corner. [CHAR LIMIT=100] -->
-    <string name="assistant_gesture_feedback_swipe_too_far_from_corner" translatable="false">Make sure you swipe from a bottom corner of the screen</string>
+    <string name="assistant_gesture_feedback_swipe_too_far_from_corner" translatable="false">Make sure you swipe from a bottom corner of the screen.</string>
     <!-- Feedback shown during interactive parts of Assistant gesture tutorial when the gesture doesn't go diagonally enough. [CHAR LIMIT=100] -->
-    <string name="assistant_gesture_feedback_swipe_not_diagonal" translatable="false">Make sure you swipe diagonally</string>
+    <string name="assistant_gesture_feedback_swipe_not_diagonal" translatable="false">Make sure you swipe diagonally.</string>
     <!-- Feedback shown during interactive parts of Assistant gesture tutorial when the gesture doesn't go far enough. [CHAR LIMIT=100] -->
-    <string name="assistant_gesture_feedback_swipe_not_long_enough" translatable="false">Try swiping further</string>
+    <string name="assistant_gesture_feedback_swipe_not_long_enough" translatable="false">Try swiping further.</string>
 
     <!-- Title shown in sandbox mode part of gesture tutorial. [CHAR LIMIT=30] -->
     <string name="sandbox_mode_title" translatable="false">Sandbox Mode</string>
@@ -172,11 +171,19 @@
     <string name="sandbox_mode_back_gesture_feedback_swipe_too_far_from_edge" translatable="false">Make sure you swipe from the left/right edge of the screen</string>
 
     <!-- Title shown on the confirmation screen after successful gesture. [CHAR LIMIT=30] -->
-    <string name="gesture_tutorial_confirm_title" translatable="false">All set</string>
-    <!-- Button text shown on a button on the confirm screen to leave the tutorial. [CHAR LIMIT=14] -->
-    <string name="gesture_tutorial_action_button_label_done" translatable="false">Done</string>
+    <string name="gesture_tutorial_confirm_title">All set</string>
+    <!-- Button text shown on a button on the feedback popup to proceed to the next tutorial step. [CHAR LIMIT=14] -->
+    <string name="gesture_tutorial_action_button_label_next">Next</string>
+    <!-- Button text shown on a button on the feedback popup to complete the tutorial. [CHAR LIMIT=14] -->
+    <string name="gesture_tutorial_action_button_label_done">Done</string>
     <!-- Button text shown on a button to go to Settings. [CHAR LIMIT=14] -->
-    <string name="gesture_tutorial_action_button_label_settings" translatable="false">Settings</string>
+    <string name="gesture_tutorial_action_button_label_settings">Settings</string>
+    <!-- Feedback title to try again. [CHAR LIMIT=30] -->
+    <string name="gesture_tutorial_try_again">Try again</string>
+    <!-- Feedback title for a successful gesture. [CHAR LIMIT=30] -->
+    <string name="gesture_tutorial_nice">Nice!</string>
+    <!-- Feedback subtext displaying the current step and the total number of steps for the tutorial. [CHAR LIMIT=30] -->
+    <string name="gesture_tutorial_step">Tutorial <xliff:g id="current">%1$d</xliff:g>/<xliff:g id="total">%2$d</xliff:g></string>
 
     <!-- ******* Overview ******* -->
     <!-- Label for a button that causes the current overview app to be shared. [CHAR_LIMIT=40] -->
@@ -185,4 +192,14 @@
     <string name="action_screenshot">Screenshot</string>
     <!-- Message shown when an action is blocked by a policy enforced by the app or the organization managing the device. [CHAR_LIMIT=NONE] -->
     <string name="blocked_by_policy">This action isn\'t allowed by the app or your organization</string>
+
+    <!-- ******* Skip tutorial dialog ******* -->
+    <!-- Title for the dialog that allows the user to skip the gesture navigation tutorial. [CHAR_LIMIT=40] -->
+    <string name="skip_tutorial_dialog_title">Skip navigation tutorial?</string>
+    <!-- Subtitle for the dialog that allows the user to skip the gesture navigation tutorial. [CHAR_LIMIT=40] -->
+    <string name="skip_tutorial_dialog_subtitle">You can find this later in the Tips app</string>
+    <!-- Button text shown on a button on the tutorial skip dialog to return to the tutorial. [CHAR LIMIT=14] -->
+    <string name="gesture_tutorial_action_button_label_cancel">Cancel</string>
+    <!-- Button text shown on a button on the tutorial skip dialog to exit the tutorial. [CHAR LIMIT=14] -->
+    <string name="gesture_tutorial_action_button_label_skip">Skip</string>
 </resources>
diff --git a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
index 161e015481..a1b7e010c6 100644
--- a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
@@ -36,9 +36,8 @@ final class BackGestureTutorialController extends TutorialController {
     Integer getTitleStringId() {
         switch (mTutorialType) {
             case RIGHT_EDGE_BACK_NAVIGATION:
-                return R.string.back_gesture_tutorial_playground_title_swipe_inward_right_edge;
             case LEFT_EDGE_BACK_NAVIGATION:
-                return R.string.back_gesture_tutorial_playground_title_swipe_inward_left_edge;
+                return R.string.back_gesture_intro_title;
             case BACK_NAVIGATION_COMPLETE:
                 return R.string.gesture_tutorial_confirm_title;
         }
@@ -49,9 +48,8 @@ final class BackGestureTutorialController extends TutorialController {
     Integer getSubtitleStringId() {
         switch (mTutorialType) {
             case RIGHT_EDGE_BACK_NAVIGATION:
-                return R.string.back_gesture_tutorial_engaged_subtitle_swipe_inward_right_edge;
             case LEFT_EDGE_BACK_NAVIGATION:
-                return R.string.back_gesture_tutorial_engaged_subtitle_swipe_inward_left_edge;
+                return R.string.back_gesture_intro_subtitle;
             case BACK_NAVIGATION_COMPLETE:
                 return R.string.back_gesture_tutorial_confirm_subtitle;
         }
diff --git a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
index 95352d1a23..fbf3a0a958 100644
--- a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
@@ -38,7 +38,7 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll
     Integer getTitleStringId() {
         switch (mTutorialType) {
             case HOME_NAVIGATION:
-                return R.string.home_gesture_tutorial_playground_title;
+                return R.string.home_gesture_intro_title;
             case HOME_NAVIGATION_COMPLETE:
                 return R.string.gesture_tutorial_confirm_title;
         }
@@ -48,7 +48,7 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll
     @Override
     Integer getSubtitleStringId() {
         if (mTutorialType == TutorialType.HOME_NAVIGATION) {
-            return R.string.home_gesture_tutorial_playground_subtitle;
+            return R.string.home_gesture_intro_subtitle;
         }
         return null;
     }
diff --git a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
index 45cbd0b571..31f26d1a05 100644
--- a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
@@ -39,7 +39,7 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont
     Integer getTitleStringId() {
         switch (mTutorialType) {
             case OVERVIEW_NAVIGATION:
-                return R.string.overview_gesture_tutorial_playground_title;
+                return R.string.overview_gesture_intro_title;
             case OVERVIEW_NAVIGATION_COMPLETE:
                 return R.string.gesture_tutorial_confirm_title;
         }
@@ -49,7 +49,7 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont
     @Override
     Integer getSubtitleStringId() {
         if (mTutorialType == TutorialType.OVERVIEW_NAVIGATION) {
-            return R.string.overview_gesture_tutorial_playground_subtitle;
+            return R.string.overview_gesture_intro_subtitle;
         }
         return null;
     }
-- 
GitLab


From 5921dd65108ee386708b1e88cc1fedbbe6fb7ecd Mon Sep 17 00:00:00 2001
From: Pat Manning <patmanning@google.com>
Date: Thu, 25 Mar 2021 18:33:09 +0000
Subject: [PATCH 0780/1664] Shift only tasks within current grid row upon task
 dismissal.

Test: manual
Bug: 182579190
Change-Id: I656a743f41f5139ab5673862e27b48076cfc4313
---
 .../android/quickstep/views/RecentsView.java   | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 769344080a..a35580f2bb 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -355,6 +355,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     // The GestureEndTarget that is still in progress.
     private GestureState.GestureEndTarget mCurrentGestureEndTarget;
 
+    IntSet mTopIdSet = new IntSet();
+
     /**
      * TODO: Call reloadIdNeeded in onTaskStackChanged.
      */
@@ -1201,7 +1203,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                     fullscreenTranslations[i] - fullscreenTranslations[firstNonHomeTaskIndex]);
         }
 
-        updateGridProperties();
+        updateGridProperties(false);
     }
 
     public void getTaskSize(Rect outRect) {
@@ -1674,7 +1676,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
      * This method only calculates the potential position and depends on {@link #setGridProgress} to
      * apply the actual scaling and translation.
      */
-    private void updateGridProperties() {
+    private void updateGridProperties(boolean isTaskDismissal) {
         int taskCount = getTaskViewCount();
         if (taskCount == 0) {
             return;
@@ -1690,6 +1692,10 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         IntSet bottomSet = new IntSet();
         float[] gridTranslations = new float[taskCount];
         int firstNonHomeTaskIndex = 0;
+
+        if (!isTaskDismissal) {
+            mTopIdSet.clear();
+        }
         for (int i = 0; i < taskCount; i++) {
             TaskView taskView = getTaskViewAt(i);
             if (isHomeTask(taskView)) {
@@ -1699,10 +1705,14 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                 continue;
             }
 
-            if (topRowWidth <= bottomRowWidth) {
+            // Evenly distribute tasks between rows unless rearranging due to task dismissal, in
+            // which case keep tasks in their respective rows.
+            if ((!isTaskDismissal && topRowWidth <= bottomRowWidth) || (isTaskDismissal && mTopIdSet
+                    .contains(taskView.getTask().key.id))) {
                 gridTranslations[i] += topAccumulatedTranslationX;
                 topRowWidth += taskView.getLayoutParams().width + mPageSpacing;
                 topSet.add(i);
+                mTopIdSet.add(taskView.getTask().key.id);
 
                 taskView.setGridTranslationY(0);
 
@@ -2066,7 +2076,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                     } else {
                         snapToPageImmediately(pageToSnapTo);
                         // Grid got messed up, reapply.
-                        updateGridProperties();
+                        updateGridProperties(true);
                     }
                     // Update the layout synchronously so that the position of next view is
                     // immediately available.
-- 
GitLab


From 00c966a446e6e2b84e825df5bfbe09f8cc9295dc Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Thu, 18 Mar 2021 11:12:24 -0700
Subject: [PATCH 0781/1664] Pass the whole auto pip transaction to recents
 animation

Bug: 179720719
Test: manually using the ApiDemos app
Change-Id: I921c97c8bbba66dc5a674d1d67cff2e528e56154
---
 .../android/quickstep/AbsSwipeUpHandler.java  |  7 +-
 .../quickstep/RecentsAnimationController.java | 12 +--
 .../util/SwipePipToHomeAnimator.java          | 78 ++++++++-----------
 3 files changed, 42 insertions(+), 55 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index b49282544d..c50a5ea124 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -46,6 +46,8 @@ import static com.android.quickstep.GestureState.STATE_END_TARGET_SET;
 import static com.android.quickstep.GestureState.STATE_RECENTS_SCROLLING_FINISHED;
 import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;
 import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
+import static com.android.quickstep.util.SwipePipToHomeAnimator.FRACTION_END;
+import static com.android.quickstep.util.SwipePipToHomeAnimator.FRACTION_START;
 import static com.android.quickstep.views.RecentsView.RECENTS_GRID_PROGRESS;
 import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
@@ -1084,7 +1086,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                         homeAnimFactory, runningTaskTarget, start);
                 mSwipePipToHomeAnimator.setDuration(SWIPE_PIP_TO_HOME_DURATION);
                 mSwipePipToHomeAnimator.setInterpolator(interpolator);
-                mSwipePipToHomeAnimator.setFloatValues(0f, 1f);
+                mSwipePipToHomeAnimator.setFloatValues(FRACTION_START, FRACTION_END);
                 mSwipePipToHomeAnimator.start();
                 mRunningWindowAnim = RunningWindowAnim.wrap(mSwipePipToHomeAnimator);
             } else {
@@ -1495,8 +1497,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
             mRecentsAnimationController.setFinishTaskBounds(
                     mSwipePipToHomeAnimator.getTaskId(),
                     mSwipePipToHomeAnimator.getDestinationBounds(),
-                    mSwipePipToHomeAnimator.getFinishWindowCrop(),
-                    mSwipePipToHomeAnimator.getFinishTransform());
+                    mSwipePipToHomeAnimator.getFinishTransaction());
             mIsSwipingPipToHome = false;
         }
     }
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationController.java b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
index ec585cc667..82e8a9304c 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationController.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
@@ -20,6 +20,7 @@ import static com.android.launcher3.util.Executors.THREAD_POOL_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
 import android.graphics.Rect;
+import android.window.PictureInPictureSurfaceTransaction;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.UiThread;
@@ -149,14 +150,13 @@ public class RecentsAnimationController {
      * accordingly. This should be called before `finish`
      * @param taskId for which the leash should be updated
      * @param destinationBounds bounds of the final PiP window
-     * @param windowCrop bounds to crop as part of final transform.
-     * @param float9 An array of 9 floats to be used as matrix transform.
+     * @param finishTransaction leash operations for the final transform.
      */
-    public void setFinishTaskBounds(int taskId, Rect destinationBounds, Rect windowCrop,
-            float[] float9) {
+    public void setFinishTaskBounds(int taskId, Rect destinationBounds,
+            PictureInPictureSurfaceTransaction finishTransaction) {
         UI_HELPER_EXECUTOR.execute(
-                () -> mController.setFinishTaskBounds(taskId, destinationBounds, windowCrop,
-                        float9));
+                () -> mController.setFinishTaskBounds(taskId, destinationBounds,
+                        finishTransaction));
     }
 
     /**
diff --git a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
index 0a1a6e8ea0..a1240e0f42 100644
--- a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
+++ b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
@@ -29,6 +29,7 @@ import android.util.Log;
 import android.view.Surface;
 import android.view.SurfaceControl;
 import android.view.View;
+import android.window.PictureInPictureSurfaceTransaction;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -46,10 +47,12 @@ import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
  * Launcher and SysUI. Also, there should be one source of truth for the corner radius of the
  * PiP window, which would ideally be on SysUI side as well.
  */
-public class SwipePipToHomeAnimator extends ValueAnimator implements
-        ValueAnimator.AnimatorUpdateListener {
+public class SwipePipToHomeAnimator extends ValueAnimator {
     private static final String TAG = SwipePipToHomeAnimator.class.getSimpleName();
 
+    public static final float FRACTION_START = 0f;
+    public static final float FRACTION_END = 1f;
+
     private final int mTaskId;
     private final ComponentName mComponentName;
     private final SurfaceControl mLeash;
@@ -139,7 +142,7 @@ public class SwipePipToHomeAnimator extends ValueAnimator implements
                 mHasAnimationEnded = true;
             }
         });
-        addUpdateListener(this);
+        addUpdateListener(this::onAnimationUpdate);
     }
 
     /** sets the from rotation if it's different from the target rotation. */
@@ -167,48 +170,53 @@ public class SwipePipToHomeAnimator extends ValueAnimator implements
                 mAppBounds.top + mDestinationBounds.height());
     }
 
-    @Override
-    public void onAnimationUpdate(ValueAnimator animator) {
+    private void onAnimationUpdate(ValueAnimator animator) {
         if (mHasAnimationEnded) return;
+        final SurfaceControl.Transaction tx =
+                PipSurfaceTransactionHelper.newSurfaceControlTransaction();
+        onAnimationUpdate(tx, animator.getAnimatedFraction());
+        tx.apply();
+    }
 
-        final float fraction = animator.getAnimatedFraction();
+    private PictureInPictureSurfaceTransaction onAnimationUpdate(SurfaceControl.Transaction tx,
+            float fraction) {
         final Rect bounds = mRectEvaluator.evaluate(fraction, mStartBounds,
                 mDestinationBoundsAnimation);
-        final SurfaceControl.Transaction tx =
-                PipSurfaceTransactionHelper.newSurfaceControlTransaction();
+        final PictureInPictureSurfaceTransaction op;
         if (mSourceHintRectInsets == null) {
             // no source rect hint been set, directly scale the window down
-            onAnimationScale(fraction, tx, bounds);
+            op = onAnimationScale(fraction, tx, bounds);
         } else {
             // scale and crop according to the source rect hint
-            onAnimationScaleAndCrop(fraction, tx, bounds);
+            op = onAnimationScaleAndCrop(fraction, tx, bounds);
         }
-        mSurfaceTransactionHelper.resetCornerRadius(tx, mLeash);
-        tx.apply();
+        return op;
     }
 
     /** scale the window directly with no source rect hint being set */
-    private void onAnimationScale(float fraction, SurfaceControl.Transaction tx, Rect bounds) {
+    private PictureInPictureSurfaceTransaction onAnimationScale(
+            float fraction, SurfaceControl.Transaction tx, Rect bounds) {
         if (mFromRotation == Surface.ROTATION_90 || mFromRotation == Surface.ROTATION_270) {
             final RotatedPosition rotatedPosition = getRotatedPosition(fraction);
-            mSurfaceTransactionHelper.scale(tx, mLeash, mAppBounds, bounds,
+            return mSurfaceTransactionHelper.scale(tx, mLeash, mAppBounds, bounds,
                     rotatedPosition.degree, rotatedPosition.positionX, rotatedPosition.positionY);
         } else {
-            mSurfaceTransactionHelper.scale(tx, mLeash, mAppBounds, bounds);
+            return mSurfaceTransactionHelper.scale(tx, mLeash, mAppBounds, bounds);
         }
     }
 
     /** scale and crop the window with source rect hint */
-    private void onAnimationScaleAndCrop(float fraction, SurfaceControl.Transaction tx,
+    private PictureInPictureSurfaceTransaction onAnimationScaleAndCrop(
+            float fraction, SurfaceControl.Transaction tx,
             Rect bounds) {
         final Rect insets = mInsetsEvaluator.evaluate(fraction, mSourceInsets,
                 mSourceHintRectInsets);
         if (mFromRotation == Surface.ROTATION_90 || mFromRotation == Surface.ROTATION_270) {
             final RotatedPosition rotatedPosition = getRotatedPosition(fraction);
-            mSurfaceTransactionHelper.scaleAndRotate(tx, mLeash, mAppBounds, bounds, insets,
+            return mSurfaceTransactionHelper.scaleAndRotate(tx, mLeash, mAppBounds, bounds, insets,
                     rotatedPosition.degree, rotatedPosition.positionX, rotatedPosition.positionY);
         } else {
-            mSurfaceTransactionHelper.scaleAndCrop(tx, mLeash, mAppBounds, bounds, insets);
+            return mSurfaceTransactionHelper.scaleAndCrop(tx, mLeash, mAppBounds, bounds, insets);
         }
     }
 
@@ -224,34 +232,12 @@ public class SwipePipToHomeAnimator extends ValueAnimator implements
         return mDestinationBounds;
     }
 
-    /**
-     * @return {@link Rect} of the final window crop in destination orientation.
-     */
-    public Rect getFinishWindowCrop() {
-        final Rect windowCrop = new Rect(mAppBounds);
-        if (mSourceHintRectInsets != null) {
-            windowCrop.inset(mSourceHintRectInsets);
-        }
-        return windowCrop;
-    }
-
-    /**
-     * @return Array of 9 floats represents the final transform in destination orientation.
-     */
-    public float[] getFinishTransform() {
-        final Matrix transform = new Matrix();
-        final float[] float9 = new float[9];
-        if (mSourceHintRectInsets == null) {
-            transform.setRectToRect(new RectF(mAppBounds), new RectF(mDestinationBounds),
-                    Matrix.ScaleToFit.FILL);
-        } else {
-            final float scale = mAppBounds.width() <= mAppBounds.height()
-                    ? (float) mDestinationBounds.width() / mAppBounds.width()
-                    : (float) mDestinationBounds.height() / mAppBounds.height();
-            transform.setScale(scale, scale);
-        }
-        transform.getValues(float9);
-        return float9;
+    /** @return {@link PictureInPictureSurfaceTransaction} for the final leash transaction. */
+    public PictureInPictureSurfaceTransaction getFinishTransaction() {
+        // get the final leash operations but do not apply to the leash.
+        final SurfaceControl.Transaction tx =
+                PipSurfaceTransactionHelper.newSurfaceControlTransaction();
+        return onAnimationUpdate(tx, FRACTION_END);
     }
 
     private RotatedPosition getRotatedPosition(float fraction) {
-- 
GitLab


From 26a9df6046748d1c46b1e5bd821481306a9c376b Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Thu, 25 Mar 2021 13:19:43 +0000
Subject: [PATCH 0782/1664] Fix AddWidgetTest & AddWidgetConfigTest

Simplify the scrolling by a scroll down a smaller fixed distance. This
way we don't need to scroll back-n-forth in order to handle the
overlapping of the search bar and the targeted widget.

Test: run AddWidgetTest & AddWidgetConfigTest

Bug: 183616605
Change-Id: Icc72f4ba6c61bdb95ab5eaf22600407d59d14eba
---
 .../tapl/LauncherInstrumentation.java         | 16 ++++
 .../com/android/launcher3/tapl/Widgets.java   | 83 +++++++------------
 2 files changed, 44 insertions(+), 55 deletions(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 7bfe33c9ba..475a4ff374 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -52,6 +52,7 @@ import android.view.WindowManager;
 import android.view.accessibility.AccessibilityEvent;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.test.InstrumentationRegistry;
 import androidx.test.uiautomator.By;
 import androidx.test.uiautomator.BySelector;
@@ -867,6 +868,16 @@ public final class LauncherInstrumentation {
         return object;
     }
 
+    @Nullable
+    UiObject2 findObjectInContainer(UiObject2 container, BySelector selector) {
+        try {
+            return container.findObject(selector);
+        } catch (StaleObjectException e) {
+            fail("The container disappeared from screen");
+            return null;
+        }
+    }
+
     @NonNull
     List<UiObject2> getObjectsInContainer(UiObject2 container, String resName) {
         try {
@@ -1059,6 +1070,11 @@ public final class LauncherInstrumentation {
         final int itemRowNewTopOnScreen = containerRect.top + topPaddingInContainer;
         final int distance = itemRowCurrentTopOnScreen - itemRowNewTopOnScreen + getTouchSlop();
 
+        scrollDownByDistance(container, distance);
+    }
+
+    void scrollDownByDistance(UiObject2 container, int distance) {
+        final Rect containerRect = getVisibleBounds(container);
         final int bottomGestureMarginInContainer = getBottomGestureMarginInContainer(container);
         scroll(
                 container,
diff --git a/tests/tapl/com/android/launcher3/tapl/Widgets.java b/tests/tapl/com/android/launcher3/tapl/Widgets.java
index f08491342b..a3f9ade054 100644
--- a/tests/tapl/com/android/launcher3/tapl/Widgets.java
+++ b/tests/tapl/com/android/launcher3/tapl/Widgets.java
@@ -17,6 +17,7 @@
 package com.android.launcher3.tapl;
 
 import static com.android.launcher3.tapl.LauncherInstrumentation.WAIT_TIME_MS;
+import static com.android.launcher3.tapl.LauncherInstrumentation.log;
 
 import android.graphics.Rect;
 
@@ -29,13 +30,13 @@ import androidx.test.uiautomator.Until;
 import com.android.launcher3.testing.TestProtocol;
 
 import java.util.Collection;
-import java.util.List;
 
 /**
  * All widgets container.
  */
 public final class Widgets extends LauncherInstrumentation.VisibleContainer {
     private static final int FLING_STEPS = 10;
+    private static final int SCROLL_ATTEMPTS = 60;
 
     Widgets(LauncherInstrumentation launcher) {
         super(launcher);
@@ -49,7 +50,7 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
         try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck();
              LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
                      "want to fling forward in widgets")) {
-            LauncherInstrumentation.log("Widgets.flingForward enter");
+            log("Widgets.flingForward enter");
             final UiObject2 widgetsContainer = verifyActiveContainer();
             mLauncher.scroll(
                     widgetsContainer,
@@ -60,7 +61,7 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
             try (LauncherInstrumentation.Closable c1 = mLauncher.addContextLayer("flung forward")) {
                 verifyActiveContainer();
             }
-            LauncherInstrumentation.log("Widgets.flingForward exit");
+            log("Widgets.flingForward exit");
         }
     }
 
@@ -71,7 +72,7 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
         try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck();
              LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
                      "want to fling backwards in widgets")) {
-            LauncherInstrumentation.log("Widgets.flingBackward enter");
+            log("Widgets.flingBackward enter");
             final UiObject2 widgetsContainer = verifyActiveContainer();
             mLauncher.scroll(
                     widgetsContainer,
@@ -81,7 +82,7 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
             try (LauncherInstrumentation.Closable c1 = mLauncher.addContextLayer("flung back")) {
                 verifyActiveContainer();
             }
-            LauncherInstrumentation.log("Widgets.flingBackward exit");
+            log("Widgets.flingBackward exit");
         }
     }
 
@@ -101,11 +102,12 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
              LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
                      "getting widget " + labelText + " in widgets list")) {
             final UiObject2 searchBar = findSearchBar();
+            final int searchBarHeight = searchBar.getVisibleBounds().height();
             final UiObject2 fullWidgetsPicker = verifyActiveContainer();
             mLauncher.assertTrue("Widgets container didn't become scrollable",
                     fullWidgetsPicker.wait(Until.scrollable(true), WAIT_TIME_MS));
 
-            final UiObject2 widgetsContainer = findTestAppWidgetsTableContainer(searchBar);
+            final UiObject2 widgetsContainer = findTestAppWidgetsTableContainer();
             mLauncher.assertTrue("Can't locate widgets list for the test app: "
                             + mLauncher.getLauncherPackageName(),
                     widgetsContainer != null);
@@ -118,7 +120,8 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
                 for (UiObject2 row : tableRows) {
                     final Collection<UiObject2> widgetCells = row.getChildren();
                     for (UiObject2 widget : widgetCells) {
-                        final UiObject2 label = widget.findObject(labelSelector);
+                        final UiObject2 label = mLauncher.findObjectInContainer(widget,
+                                labelSelector);
                         if (label == null) {
                             continue;
                         }
@@ -126,28 +129,15 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
                                 "View is not WidgetCell",
                                 "com.android.launcher3.widget.WidgetCell",
                                 widget.getClassName());
-                        UiObject2 preview = widget.findObject(previewSelector);
-                        mLauncher.assertTrue("Can't find widget preview", preview != null);
-                        Rect previewRect = new Rect(preview.getVisibleBounds());
-                        boolean intersected = searchBar.getVisibleBounds().intersect(previewRect);
-                        if (intersected) {
-                            Rect scrollUp = new Rect(/* left= */ 0, /* top= */0, /* right*/ 0,
-                                    /* bottom= */ searchBar.getVisibleBounds().height());
-                            mLauncher.scroll(
-                                    fullWidgetsPicker,
-                                    Direction.UP,
-                                    scrollUp,
-                                    /* steps= */ 2,
-                                    /* slowDown= */ true);
-                        }
-                        preview = widget.findObject(previewSelector);
+                        UiObject2 preview = mLauncher.waitForObjectInContainer(widget,
+                                previewSelector);
                         return new Widget(mLauncher, preview);
                     }
                 }
 
-                mLauncher.assertTrue("Too many attempts", ++i <= 40);
+                mLauncher.assertTrue("Too many attempts", ++i <= SCROLL_ATTEMPTS);
                 final int scroll = getWidgetsScroll();
-                mLauncher.scrollToLastVisibleRow(fullWidgetsPicker, tableRows, 0);
+                mLauncher.scrollDownByDistance(fullWidgetsPicker, searchBarHeight);
                 final int newScroll = getWidgetsScroll();
                 mLauncher.assertTrue(
                         "Scrolled in a wrong direction in Widgets: from " + scroll + " to "
@@ -164,14 +154,13 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
                 "widgets_search_bar");
         final UiObject2 searchBarContainer = mLauncher.waitForLauncherObject(
                 searchBarContainerSelector);
-        mLauncher.assertTrue("Can't find a search bar container", searchBarContainer != null);
-        UiObject2 searchBar = searchBarContainer.findObject(searchBarSelector);
-        mLauncher.assertTrue("Can't find a search bar", searchBar != null);
+        UiObject2 searchBar = mLauncher.waitForObjectInContainer(searchBarContainer,
+                searchBarSelector);
         return searchBar;
     }
 
     /** Finds the widgets list of this test app from the collapsed full widgets picker. */
-    private UiObject2 findTestAppWidgetsTableContainer(final UiObject2 searchBar) {
+    private UiObject2 findTestAppWidgetsTableContainer() {
         final BySelector headerSelector = By.res(mLauncher.getLauncherPackageName(),
                 "widgets_list_header");
         final BySelector targetAppSelector = By.clazz("android.widget.TextView").text(
@@ -180,50 +169,34 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
                 "widgets_table");
 
         boolean hasHeaderExpanded = false;
-        for (int i = 0; i < 40; i++) {
+        for (int i = 0; i < SCROLL_ATTEMPTS; i++) {
             UiObject2 fullWidgetsPicker = verifyActiveContainer();
 
-            UiObject2 header = fullWidgetsPicker.findObject(headerSelector);
-            mLauncher.assertTrue("Can't find a widget header", header != null);
+            UiObject2 header = mLauncher.waitForObjectInContainer(fullWidgetsPicker,
+                    headerSelector);
+            int headerHeight = header.getVisibleBounds().height();
 
             // Look for a header that has the test app name.
-            UiObject2 headerTitle = fullWidgetsPicker.findObject(targetAppSelector);
+            UiObject2 headerTitle = mLauncher.findObjectInContainer(fullWidgetsPicker,
+                    targetAppSelector);
             if (headerTitle != null) {
-                Rect headerTitleRect = new Rect(headerTitle.getVisibleBounds());
-                boolean intersected = searchBar.getVisibleBounds().intersect(headerTitleRect);
-                if (intersected) {
-                    Rect scrollUp = new Rect(/* left= */ 0, /* top= */0, /* right*/ 0,
-                            /* bottom= */ searchBar.getVisibleBounds().height());
-                    mLauncher.scroll(
-                            fullWidgetsPicker,
-                            Direction.UP,
-                            scrollUp,
-                            /* steps= */ 2,
-                            /* slowDown= */ true);
-                }
                 // If we find the header and it has not been expanded, let's click it to see the
                 // widgets list.
                 if (!hasHeaderExpanded) {
+                    log("Header has not been expanded. Click to expand.");
                     hasHeaderExpanded = true;
                     mLauncher.clickLauncherObject(headerTitle);
-                    // After clicking the header, the recyclerview has been updated. Let's refresh
-                    // the container UIObject2.
-                    fullWidgetsPicker = verifyActiveContainer();
-                    // Refresh headerTitle because the first instance is stale after
-                    // verifyActiveContainer call.
-                    headerTitle = fullWidgetsPicker.findObject(targetAppSelector);
                 }
 
                 // Look for a widgets list.
-                UiObject2 widgetsContainer = fullWidgetsPicker.findObject(widgetsContainerSelector);
+                UiObject2 widgetsContainer = mLauncher.findObjectInContainer(fullWidgetsPicker,
+                        widgetsContainerSelector);
                 if (widgetsContainer != null) {
+                    log("Widgets container found.");
                     return widgetsContainer;
                 }
-                mLauncher.scrollToLastVisibleRow(fullWidgetsPicker, List.of(headerTitle), 0);
-            } else {
-                mLauncher.scrollToLastVisibleRow(fullWidgetsPicker, fullWidgetsPicker.getChildren(),
-                        0);
             }
+            mLauncher.scrollDownByDistance(fullWidgetsPicker, headerHeight);
         }
 
         return null;
-- 
GitLab


From b9bbe994eb1252412d5a4c31c6ea51cf88662631 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Thu, 25 Mar 2021 15:09:20 -0700
Subject: [PATCH 0783/1664] Fix Home->Overview not being logged in 0 button
 mode

At some point we made a change to clearState() from onDragEnd(),
which means the detector is in IDLE state instead of SETTLING. As
long as we aren't still in DRAGGING state, we should log.

Test: wwlogcat
Change-Id: I0f1098bd09cd1296b06f8cb3ebe400c2a25156ca
---
 .../NoButtonNavbarToOverviewTouchController.java                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
index 6c71995f9b..fc06d29ade 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -203,7 +203,7 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
     }
 
     private void maybeSwipeInteractionToOverviewComplete() {
-        if (mReachedOverview && mDetector.isSettlingState()) {
+        if (mReachedOverview && !mDetector.isDraggingState()) {
             onSwipeInteractionCompleted(OVERVIEW);
         }
     }
-- 
GitLab


From 7122bd1577f699419d3f340f4a5eb6ffc9e10c5b Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Thu, 25 Mar 2021 18:07:03 -0500
Subject: [PATCH 0784/1664] Disable work profile tests

Bug: 182844465
Test: presubmit
Change-Id: Ifc7baf9dffc6b8b453acf23dfe74f4cc9cd5ba4e
---
 tests/src/com/android/launcher3/ui/WorkTabTest.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/src/com/android/launcher3/ui/WorkTabTest.java b/tests/src/com/android/launcher3/ui/WorkTabTest.java
index 8f4381b0fe..919c89fd56 100644
--- a/tests/src/com/android/launcher3/ui/WorkTabTest.java
+++ b/tests/src/com/android/launcher3/ui/WorkTabTest.java
@@ -42,7 +42,6 @@ import com.android.launcher3.views.WorkEduView;
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.util.List;
@@ -90,7 +89,7 @@ public class WorkTabTest extends AbstractLauncherUiTest {
         });
     }
 
-    @Test
+//    @Test
     public void workTabExists() {
         mDevice.pressHome();
         waitForLauncherCondition("Launcher didn't start", Objects::nonNull);
@@ -102,7 +101,7 @@ public class WorkTabTest extends AbstractLauncherUiTest {
                 launcher -> launcher.getAppsView().isWorkTabVisible(), 60000);
     }
 
-    @Test
+//    @Test
     public void toggleWorks() {
         mDevice.pressHome();
         waitForLauncherCondition("Launcher didn't start", Objects::nonNull);
@@ -133,7 +132,7 @@ public class WorkTabTest extends AbstractLauncherUiTest {
                 l -> l.getSystemService(UserManager.class).isQuietModeEnabled(workProfile));
     }
 
-    @Test
+//    @Test
     public void testWorkEduFlow() {
         mDevice.pressHome();
         waitForLauncherCondition("Launcher didn't start", Objects::nonNull);
@@ -176,7 +175,7 @@ public class WorkTabTest extends AbstractLauncherUiTest {
         });
     }
 
-    @Test
+//    @Test
     public void testWorkEduIntermittent() {
         mDevice.pressHome();
         waitForLauncherCondition("Launcher didn't start", Objects::nonNull);
-- 
GitLab


From 9d706b1ada38867f86ca9f3c1cf00a5c1b6cdfdc Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Wed, 24 Mar 2021 14:12:29 -0700
Subject: [PATCH 0785/1664] Fix failed test in order to enable Live Tile (in
 the next change)

Live tile changes certain assumptions we have for tests, for example
- Launcher will not be in the resumed state after swiping up to Overview

Also, disable live tile for 3rd party launcher for now

Test: presubmit
Fixes: 169694902
Change-Id: Ifd466db0354f59290c4f66a0a2ad4c82f1169f29
---
 .../util/NavigationModeFeatureFlag.java       |  9 +++-
 .../quickstep/AbstractQuickStepTest.java      | 53 +++++++++++++++++++
 .../StartLauncherViaGestureTests.java         |  1 +
 .../launcher3/ui/AbstractLauncherUiTest.java  | 28 +++++++---
 4 files changed, 83 insertions(+), 8 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/util/NavigationModeFeatureFlag.java b/quickstep/src/com/android/quickstep/util/NavigationModeFeatureFlag.java
index 60c7add38f..351adf4265 100644
--- a/quickstep/src/com/android/quickstep/util/NavigationModeFeatureFlag.java
+++ b/quickstep/src/com/android/quickstep/util/NavigationModeFeatureFlag.java
@@ -20,6 +20,8 @@ import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TI
 
 import android.content.Context;
 
+import com.android.quickstep.OverviewComponentObserver;
+import com.android.quickstep.RecentsAnimationDeviceState;
 import com.android.quickstep.SysUINavigationMode;
 
 import java.util.function.Predicate;
@@ -35,6 +37,7 @@ public class NavigationModeFeatureFlag implements
     private final Supplier<Boolean> mBasePredicate;
     private final Predicate<SysUINavigationMode.Mode> mModePredicate;
     private boolean mSupported;
+    private OverviewComponentObserver mObserver;
 
     private NavigationModeFeatureFlag(Supplier<Boolean> basePredicate,
             Predicate<SysUINavigationMode.Mode> modePredicate) {
@@ -43,12 +46,16 @@ public class NavigationModeFeatureFlag implements
     }
 
     public boolean get() {
-        return mBasePredicate.get() && mSupported;
+        return mBasePredicate.get() && mSupported && mObserver.isHomeAndOverviewSame();
     }
 
     public void initialize(Context context) {
         onNavigationModeChanged(SysUINavigationMode.INSTANCE.get(context).getMode());
         SysUINavigationMode.INSTANCE.get(context).addModeChangeListener(this);
+
+        // Temporary solution to disable live tile for the fallback launcher
+        RecentsAnimationDeviceState rads = new RecentsAnimationDeviceState(context);
+        mObserver = new OverviewComponentObserver(context, rads);
     }
 
     @Override
diff --git a/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java b/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java
index a412b3970f..4f27e21ae8 100644
--- a/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java
+++ b/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java
@@ -16,7 +16,15 @@
 
 package com.android.quickstep;
 
+import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
+
+import static org.junit.Assert.assertTrue;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.tapl.LauncherInstrumentation;
+import com.android.launcher3.tapl.LauncherInstrumentation.ContainerType;
 import com.android.launcher3.ui.AbstractLauncherUiTest;
+import com.android.quickstep.views.RecentsView;
 
 import org.junit.rules.RuleChain;
 import org.junit.rules.TestRule;
@@ -31,4 +39,49 @@ public abstract class AbstractQuickStepTest extends AbstractLauncherUiTest {
                 outerRule(new NavigationModeSwitchRule(mLauncher)).
                 around(super.getRulesInsideActivityMonitor());
     }
+
+    @Override
+    protected void onLauncherActivityClose(Launcher launcher) {
+        RecentsView recentsView = launcher.getOverviewPanel();
+        if (recentsView != null) {
+            recentsView.finishRecentsAnimation(true, null);
+        }
+    }
+
+    @Override
+    protected void checkLauncherState(Launcher launcher, ContainerType expectedContainerType,
+            boolean isResumed, boolean isStarted) {
+        if (!isInLiveTileMode(launcher, expectedContainerType)) {
+            super.checkLauncherState(launcher, expectedContainerType, isResumed, isStarted);
+        } else {
+            assertTrue("[Live Tile] hasBeenResumed() == isStarted(), hasBeenResumed(): "
+                            + isResumed, isResumed != isStarted);
+        }
+    }
+
+    @Override
+    protected void checkLauncherStateInOverview(Launcher launcher,
+            ContainerType expectedContainerType, boolean isStarted, boolean isResumed) {
+        if (!isInLiveTileMode(launcher, expectedContainerType)) {
+            super.checkLauncherStateInOverview(launcher, expectedContainerType, isStarted,
+                    isResumed);
+        } else {
+            assertTrue(
+                    "[Live Tile] Launcher is not started or has been resumed in state: "
+                            + expectedContainerType,
+                    isStarted && !isResumed);
+        }
+    }
+
+    private boolean isInLiveTileMode(Launcher launcher,
+            LauncherInstrumentation.ContainerType expectedContainerType) {
+        if (!LIVE_TILE.get()
+                || expectedContainerType != LauncherInstrumentation.ContainerType.OVERVIEW) {
+            return false;
+        }
+
+        RecentsView recentsView = launcher.getOverviewPanel();
+        return recentsView.getSizeStrategy().isInLiveTileMode()
+                && recentsView.getRunningTaskId() != -1;
+    }
 }
diff --git a/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java b/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java
index 9732cdc64c..6e19436c90 100644
--- a/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java
+++ b/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java
@@ -100,6 +100,7 @@ public class StartLauncherViaGestureTests extends AbstractQuickStepTest {
             // The test action.
             mLauncher.getBackground().switchToOverview();
         }
+        closeLauncherActivity();
         mLauncher.pressHome();
     }
 }
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index 0edfbeda2b..72b1d2242e 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -503,6 +503,7 @@ public abstract class AbstractLauncherUiTest {
         // Destroy Launcher activity.
         executeOnLauncher(launcher -> {
             if (launcher != null) {
+                onLauncherActivityClose(launcher);
                 launcher.finish();
             }
         });
@@ -524,7 +525,7 @@ public abstract class AbstractLauncherUiTest {
         return launcher.getAppsView().getActiveRecyclerView().getCurrentScrollY();
     }
 
-    private static void checkLauncherIntegrity(
+    private void checkLauncherIntegrity(
             Launcher launcher, ContainerType expectedContainerType) {
         if (launcher != null) {
             final StateManager<LauncherState> stateManager = launcher.getStateManager();
@@ -535,10 +536,8 @@ public abstract class AbstractLauncherUiTest {
                     stableState == stateManager.getState());
 
             final boolean isResumed = launcher.hasBeenResumed();
-            assertTrue("hasBeenResumed() != isStarted(), hasBeenResumed(): " + isResumed,
-                    isResumed == launcher.isStarted());
-            assertTrue("hasBeenResumed() != isUserActive(), hasBeenResumed(): " + isResumed,
-                    isResumed == launcher.isUserActive());
+            final boolean isStarted = launcher.isStarted();
+            checkLauncherState(launcher, expectedContainerType, isResumed, isStarted);
 
             final int ordinal = stableState.ordinal;
 
@@ -561,8 +560,7 @@ public abstract class AbstractLauncherUiTest {
                     break;
                 }
                 case OVERVIEW: {
-                    assertTrue(
-                            "Launcher is not resumed in state: " + expectedContainerType,
+                    checkLauncherStateInOverview(launcher, expectedContainerType, isStarted,
                             isResumed);
                     assertTrue(TestProtocol.stateOrdinalToString(ordinal),
                             ordinal == TestProtocol.OVERVIEW_STATE_ORDINAL);
@@ -587,4 +585,20 @@ public abstract class AbstractLauncherUiTest {
                             expectedContainerType == ContainerType.FALLBACK_OVERVIEW);
         }
     }
+
+    protected void checkLauncherState(Launcher launcher, ContainerType expectedContainerType,
+            boolean isResumed, boolean isStarted) {
+        assertTrue("hasBeenResumed() != isStarted(), hasBeenResumed(): " + isResumed,
+                isResumed == isStarted);
+        assertTrue("hasBeenResumed() != isUserActive(), hasBeenResumed(): " + isResumed,
+                isResumed == launcher.isUserActive());
+    }
+
+    protected void checkLauncherStateInOverview(Launcher launcher,
+            ContainerType expectedContainerType, boolean isStarted, boolean isResumed) {
+        assertTrue("Launcher is not resumed in state: " + expectedContainerType,
+                isResumed);
+    }
+
+    protected void onLauncherActivityClose(Launcher launcher) { }
 }
-- 
GitLab


From 0dd46fa242812abbfbe454de2ab85c5878d1ce94 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Thu, 25 Mar 2021 19:48:03 -0700
Subject: [PATCH 0786/1664] Enable Live Tile

Test: presubmit
Fixes: 169694902
Change-Id: Id5cb0dae39a492de6ec54ef843c7492d1626e4db
---
 src/com/android/launcher3/config/FeatureFlags.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 7f76d27564..8ae2abd337 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -85,7 +85,7 @@ public final class FeatureFlags {
             "ADAPTIVE_ICON_WINDOW_ANIM", true, "Use adaptive icons for window animations.");
 
     public static final BooleanFlag ENABLE_QUICKSTEP_LIVE_TILE = getDebugFlag(
-            "ENABLE_QUICKSTEP_LIVE_TILE", false, "Enable live tile in Quickstep overview");
+            "ENABLE_QUICKSTEP_LIVE_TILE", true, "Enable live tile in Quickstep overview");
 
     // Keep as DeviceFlag to allow remote disable in emergency.
     public static final BooleanFlag ENABLE_SUGGESTED_ACTIONS_OVERVIEW = new DeviceFlag(
-- 
GitLab


From 733efa1bcdbe2442816ce410616f5a594229c303 Mon Sep 17 00:00:00 2001
From: Zak Cohen <zakcohen@google.com>
Date: Wed, 24 Mar 2021 16:44:21 -0700
Subject: [PATCH 0787/1664] Overview - extract AssistContentRequester logic for
 reuse.

Extract the logic for fetching AssistContent into a common reusable place.

Bug: 179705864
Test: Local build of main launcher
Change-Id: Ife37a393d93f899fa1ae460bdcf0cadff6468b04
---
 .../quickstep/TaskOverlayFactoryGo.java       |  77 +++----------
 .../util/AssistContentRequester.java          | 103 ++++++++++++++++++
 2 files changed, 121 insertions(+), 59 deletions(-)
 create mode 100644 quickstep/src/com/android/quickstep/util/AssistContentRequester.java

diff --git a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
index 872f168e20..350e0d1d97 100644
--- a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
+++ b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
@@ -20,25 +20,17 @@ import static com.android.quickstep.views.OverviewActionsView.DISABLED_NO_THUMBN
 import static com.android.quickstep.views.OverviewActionsView.DISABLED_ROTATED;
 
 import android.annotation.SuppressLint;
-import android.app.ActivityTaskManager;
-import android.app.IAssistDataReceiver;
 import android.app.assist.AssistContent;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Bitmap;
 import android.graphics.Matrix;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.RemoteException;
 import android.os.SystemClock;
 import android.text.TextUtils;
-import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
 
 import com.android.launcher3.R;
+import com.android.quickstep.util.AssistContentRequester;
 import com.android.quickstep.views.OverviewActionsView;
 import com.android.quickstep.views.TaskThumbnailView;
 import com.android.systemui.shared.recents.model.Task;
@@ -53,7 +45,6 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
     public static final String ACTION_SEARCH = "com.android.quickstep.ACTION_SEARCH";
     public static final String ELAPSED_NANOS = "niu_actions_elapsed_realtime_nanos";
     public static final String ACTIONS_URL = "niu_actions_app_url";
-    private static final String ASSIST_KEY_CONTENT = "content";
     private static final String TAG = "TaskOverlayFactoryGo";
 
     // Empty constructor required for ResourceBasedOverride
@@ -72,13 +63,10 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
      */
     public static final class TaskOverlayGo<T extends OverviewActionsView> extends TaskOverlay {
         private String mNIUPackageName;
-        private int mTaskId;
-        private Bundle mAssistData;
-        private final Handler mMainThreadHandler;
+        private String mWebUrl;
 
         private TaskOverlayGo(TaskThumbnailView taskThumbnailView) {
             super(taskThumbnailView);
-            mMainThreadHandler = new Handler(Looper.getMainLooper());
         }
 
         /**
@@ -99,28 +87,23 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
             boolean isAllowedByPolicy = mThumbnailView.isRealSnapshot();
             getActionsView().setCallbacks(new OverlayUICallbacksGoImpl(isAllowedByPolicy, task));
 
-            mTaskId = task.key.id;
-            AssistDataReceiverImpl receiver = new AssistDataReceiverImpl();
-            receiver.setOverlay(this);
+            int taskId = task.key.id;
+            AssistContentRequester contentRequester =
+                    new AssistContentRequester(mApplicationContext);
+            contentRequester.requestAssistContent(taskId, this::onAssistContentReceived);
+        }
 
-            try {
-                ActivityTaskManager.getService().requestAssistDataForTask(receiver, mTaskId,
-                        mApplicationContext.getPackageName());
-            } catch (RemoteException e) {
-                Log.e(TAG, "Unable to request AssistData");
-            }
+        /** Provide Assist Content to the overlay. */
+        @VisibleForTesting
+        public void onAssistContentReceived(AssistContent assistContent) {
+            mWebUrl = assistContent.getWebUri() != null
+                    ? assistContent.getWebUri().toString() : null;
         }
 
-        /**
-         * Called when AssistDataReceiverImpl receives data from ActivityTaskManagerService's
-         * AssistDataRequester
-         */
-        public void onAssistDataReceived(Bundle data) {
-            mMainThreadHandler.post(() -> {
-                if (data != null) {
-                    mAssistData = data;
-                }
-            });
+        @Override
+        public void reset() {
+            super.reset();
+            mWebUrl = null;
         }
 
         /**
@@ -139,12 +122,8 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
                     .setPackage(mNIUPackageName)
                     .putExtra(ELAPSED_NANOS, SystemClock.elapsedRealtimeNanos());
 
-            if (mAssistData != null) {
-                final AssistContent content = mAssistData.getParcelable(ASSIST_KEY_CONTENT);
-                Uri webUri = (content == null) ? null : content.getWebUri();
-                if (webUri != null) {
-                    intent.putExtra(ACTIONS_URL, webUri.toString());
-                }
+            if (mWebUrl != null) {
+                intent.putExtra(ACTIONS_URL, mWebUrl);
             }
 
             return intent;
@@ -190,26 +169,6 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
         }
     }
 
-    /**
-     * Basic AssistDataReceiver. This is passed to ActivityTaskManagerService, which then requests
-     * the data.
-     */
-    private static final class AssistDataReceiverImpl extends IAssistDataReceiver.Stub {
-        private TaskOverlayGo mOverlay;
-
-        public void setOverlay(TaskOverlayGo overlay) {
-            mOverlay = overlay;
-        }
-
-        @Override
-        public void onHandleAssistData(Bundle data) {
-            mOverlay.onAssistDataReceived(data);
-        }
-
-        @Override
-        public void onHandleAssistScreenshot(Bitmap screenshot) {}
-    }
-
     /**
      * Callbacks the Ui can generate. This is the only way for a Ui to call methods on the
      * controller.
diff --git a/quickstep/src/com/android/quickstep/util/AssistContentRequester.java b/quickstep/src/com/android/quickstep/util/AssistContentRequester.java
new file mode 100644
index 0000000000..3730284ee8
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/util/AssistContentRequester.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.quickstep.util;
+
+import android.app.ActivityTaskManager;
+import android.app.IActivityTaskManager;
+import android.app.IAssistDataReceiver;
+import android.app.assist.AssistContent;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.util.Log;
+
+import com.android.launcher3.util.Executors;
+
+import java.util.concurrent.Executor;
+
+/**
+ * Can be used to request the AssistContent from a provided task id, useful for getting the web uri
+ * if provided from the task.
+ */
+public class AssistContentRequester {
+    private static final String TAG = "AssistContentRequester";
+    private static final String ASSIST_KEY_CONTENT = "content";
+
+    /** For receiving content, called on the main thread. */
+    public interface Callback {
+        /**
+         * Called when the {@link android.app.assist.AssistContent} of the requested task is
+         * available.
+         **/
+        void onAssistContentAvailable(AssistContent assistContent);
+    }
+
+    private final IActivityTaskManager mActivityTaskManager;
+    private final String mPackageName;
+    private final Executor mCallbackExecutor;
+
+    public AssistContentRequester(Context context) {
+        mActivityTaskManager = ActivityTaskManager.getService();
+        mPackageName = context.getApplicationContext().getPackageName();
+        mCallbackExecutor = Executors.MAIN_EXECUTOR;
+    }
+
+    /**
+     * Request the {@link AssistContent} from the task with the provided id.
+     *
+     * @param taskId to query for the content.
+     * @param callback to call when the content is available, called on the main thread.
+     */
+    public void requestAssistContent(int taskId, Callback callback) {
+        try {
+            mActivityTaskManager.requestAssistDataForTask(
+                    new AssistDataReceiver(callback, mCallbackExecutor), taskId, mPackageName);
+        } catch (RemoteException e) {
+            Log.e(TAG, "Requesting assist content failed for task: " + taskId, e);
+        }
+    }
+
+    private static final class AssistDataReceiver extends IAssistDataReceiver.Stub {
+
+        private final Executor mExecutor;
+        private final Callback mCallback;
+
+        AssistDataReceiver(Callback callback, Executor callbackExecutor) {
+            mCallback = callback;
+            mExecutor = callbackExecutor;
+        }
+
+        @Override
+        public void onHandleAssistData(Bundle data) {
+            if (data == null) {
+                return;
+            }
+
+            final AssistContent content = data.getParcelable(ASSIST_KEY_CONTENT);
+            if (content == null) {
+                Log.e(TAG, "Received AssistData, but no AssistContent found");
+                return;
+            }
+
+            mExecutor.execute(() -> mCallback.onAssistContentAvailable(content));
+        }
+
+        @Override
+        public void onHandleAssistScreenshot(Bitmap screenshot) {}
+    }
+}
-- 
GitLab


From c07e3b3c2884976c3aa918e66523f7bc62e0bf50 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Sun, 28 Mar 2021 23:46:50 -0700
Subject: [PATCH 0788/1664] Remove AA+ decorator logic from aosp code

Bug: 179495850
Test: manual

Change-Id: I7e029e4970f45a0f7c410533f85335a95e4e448c
---
 .../launcher3/BaseDraggingActivity.java       |   2 +-
 .../allapps/AllAppsContainerView.java         |   3 +-
 .../launcher3/allapps/AllAppsGridAdapter.java |   3 +-
 .../allapps/AllAppsSectionDecorator.java      | 150 ------------------
 .../allapps/AlphabeticalAppsList.java         |  10 +-
 .../launcher3/allapps/DecorationInfo.java     |  19 +++
 .../allapps/search/AppsSearchPipeline.java    |   6 -
 .../search/DefaultSearchAdapterProvider.java  |  23 ++-
 .../allapps/search/SearchAdapterProvider.java |  12 +-
 .../allapps/search/SectionDecorationInfo.java |  51 ------
 10 files changed, 53 insertions(+), 226 deletions(-)
 delete mode 100644 src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
 create mode 100644 src/com/android/launcher3/allapps/DecorationInfo.java
 delete mode 100644 src/com/android/launcher3/allapps/search/SectionDecorationInfo.java

diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java
index e38ab74ee7..9b350a1dd6 100644
--- a/src/com/android/launcher3/BaseDraggingActivity.java
+++ b/src/com/android/launcher3/BaseDraggingActivity.java
@@ -329,6 +329,6 @@ public abstract class BaseDraggingActivity extends BaseActivity
      * views
      */
     public SearchAdapterProvider createSearchAdapterProvider(AllAppsContainerView allapps) {
-        return new DefaultSearchAdapterProvider(this);
+        return new DefaultSearchAdapterProvider(this, allapps);
     }
 }
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index bf0a88f33f..949cd2e500 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -699,8 +699,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
             applyPadding();
             setupOverlay();
             if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
-                recyclerView.addItemDecoration(new AllAppsSectionDecorator(
-                        AllAppsContainerView.this));
+                recyclerView.addItemDecoration(mSearchAdapterProvider.getDecorator());
             }
         }
 
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index bb175eac28..5b4c4c5c36 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -42,7 +42,6 @@ import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.search.SearchAdapterProvider;
-import com.android.launcher3.allapps.search.SectionDecorationInfo;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.util.PackageManagerHelper;
 
@@ -108,7 +107,7 @@ public class AllAppsGridAdapter extends
         // The index of this app not including sections
         public int appIndex = -1;
         // Search section associated to result
-        public SectionDecorationInfo sectionDecorationInfo = null;
+        public DecorationInfo decorationInfo = null;
 
         /**
          * Factory method for AppIcon AdapterItem
diff --git a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
deleted file mode 100644
index 0bd2f44cc9..0000000000
--- a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.allapps;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Path;
-import android.graphics.RectF;
-import android.view.View;
-
-import androidx.annotation.Nullable;
-import androidx.core.graphics.ColorUtils;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.android.launcher3.R;
-import com.android.launcher3.allapps.search.SearchAdapterProvider;
-import com.android.launcher3.allapps.search.SectionDecorationInfo;
-import com.android.launcher3.util.Themes;
-
-import java.util.List;
-
-/**
- * ItemDecoration class that groups items in {@link AllAppsRecyclerView}
- */
-public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration {
-
-    private final AllAppsContainerView mAppsView;
-
-    AllAppsSectionDecorator(AllAppsContainerView appsContainerView) {
-        mAppsView = appsContainerView;
-    }
-
-    @Override
-    public void onDraw(Canvas c, RecyclerView parent, RecyclerView.State state) {
-        List<AllAppsGridAdapter.AdapterItem> adapterItems = mAppsView.getApps().getAdapterItems();
-        SearchAdapterProvider adapterProvider = mAppsView.getSearchAdapterProvider();
-        for (int i = 0; i < parent.getChildCount(); i++) {
-            View view = parent.getChildAt(i);
-            int position = parent.getChildAdapterPosition(view);
-            AllAppsGridAdapter.AdapterItem adapterItem = adapterItems.get(position);
-            if (adapterItem.sectionDecorationInfo != null) {
-                SectionDecorationInfo sectionInfo = adapterItem.sectionDecorationInfo;
-                SectionDecorationHandler decorationHandler = sectionInfo.getDecorationHandler();
-                if (decorationHandler != null) {
-                    if (view.equals(adapterProvider.getHighlightedItem())) {
-                        decorationHandler.onFocusDraw(c, view);
-                    } else {
-                        decorationHandler.onGroupDraw(c, view);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Handles grouping and drawing of items in the same all apps sections.
-     */
-    public static class SectionDecorationHandler {
-        protected RectF mBounds = new RectF();
-        private final boolean mIsFullWidth;
-        private final float mRadius;
-
-        protected final int mFocusColor; // main focused item color
-        protected final int mFillcolor; // grouping color
-
-        private final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-        private final boolean mIsTopRound;
-        private final boolean mIsBottomRound;
-        private float[] mCorners;
-        private float mFillSpacing;
-
-        public SectionDecorationHandler(Context context, boolean isFullWidth, int fillAlpha,
-                boolean isTopRound, boolean isBottomRound) {
-
-            mIsFullWidth = isFullWidth;
-            int endScrim = Themes.getColorBackground(context);
-            mFillcolor = ColorUtils.setAlphaComponent(endScrim, fillAlpha);
-            mFocusColor = endScrim;
-
-            mIsTopRound = isTopRound;
-            mIsBottomRound = isBottomRound;
-
-            mRadius = context.getResources().getDimensionPixelSize(
-                    R.dimen.search_decoration_corner_radius);
-            mFillSpacing = context.getResources().getDimensionPixelSize(
-                    R.dimen.search_decoration_padding);
-            mCorners = new float[]{
-                    mIsTopRound ? mRadius : 0, mIsTopRound ? mRadius : 0, // Top left radius in px
-                    mIsTopRound ? mRadius : 0, mIsTopRound ? mRadius : 0, // Top right radius in px
-                    mIsBottomRound ? mRadius : 0, mIsBottomRound ? mRadius : 0, // Bottom right
-                    mIsBottomRound ? mRadius : 0, mIsBottomRound ? mRadius : 0  // Bottom left
-            };
-
-        }
-
-        /**
-         * Draw bounds onto canvas.
-         */
-        public void onGroupDraw(Canvas canvas, View view) {
-            if (view == null) return;
-            mPaint.setColor(mFillcolor);
-            mBounds.set(view.getLeft(), view.getTop(), view.getRight(), view.getBottom());
-            onDraw(canvas);
-        }
-
-        /**
-         * Draw the bound of the view to the canvas.
-         */
-        public void onFocusDraw(Canvas canvas, @Nullable View view) {
-            if (view == null) {
-                return;
-            }
-            mPaint.setColor(mFocusColor);
-            mBounds.set(view.getLeft(), view.getTop(), view.getRight(), view.getBottom());
-            onDraw(canvas);
-        }
-
-
-        private void onDraw(Canvas canvas) {
-            final Path path = new Path();
-            RectF finalBounds = new RectF(mBounds.left + mFillSpacing,
-                    mBounds.top + mFillSpacing,
-                    mBounds.right - mFillSpacing,
-                    mBounds.bottom - mFillSpacing);
-            path.addRoundRect(finalBounds, mCorners, Path.Direction.CW);
-            canvas.drawPath(path, mPaint);
-        }
-
-        /**
-         * Reset view bounds to empty.
-         */
-        public void reset() {
-            mBounds.setEmpty();
-        }
-    }
-}
diff --git a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
index fefd97ad3f..6957850730 100644
--- a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
+++ b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
@@ -20,7 +20,6 @@ import android.content.Context;
 
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItem;
-import com.android.launcher3.allapps.search.SectionDecorationInfo;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.util.ItemInfoMatcher;
@@ -288,11 +287,6 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
         mFastScrollerSections.clear();
         mAdapterItems.clear();
 
-        SectionDecorationInfo appSection = new SectionDecorationInfo();
-        appSection.setDecorationHandler(
-                new AllAppsSectionDecorator.SectionDecorationHandler(mLauncher, true,
-                        0, false, false));
-
         // Recreate the filtered and sectioned apps (for convenience for the grid layout) from the
         // ordered set of sections
 
@@ -313,9 +307,7 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
                 if (lastFastScrollerSectionInfo.fastScrollToItem == null) {
                     lastFastScrollerSectionInfo.fastScrollToItem = appItem;
                 }
-                if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
-                    appItem.sectionDecorationInfo = appSection;
-                }
+
                 mAdapterItems.add(appItem);
             }
         } else {
diff --git a/src/com/android/launcher3/allapps/DecorationInfo.java b/src/com/android/launcher3/allapps/DecorationInfo.java
new file mode 100644
index 0000000000..50b250cad1
--- /dev/null
+++ b/src/com/android/launcher3/allapps/DecorationInfo.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.allapps;
+
+public class DecorationInfo {
+}
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java b/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
index 34895ed5f5..42ee4b78be 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
@@ -20,7 +20,6 @@ import android.os.CancellationSignal;
 
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItem;
-import com.android.launcher3.allapps.AllAppsSectionDecorator.SectionDecorationHandler;
 import com.android.launcher3.model.AllAppsList;
 import com.android.launcher3.model.BaseModelUpdateTask;
 import com.android.launcher3.model.BgDataModel;
@@ -38,14 +37,10 @@ public class AppsSearchPipeline implements SearchPipeline {
 
     private static final int MAX_RESULTS_COUNT = 5;
 
-    private final SectionDecorationInfo mSearchSectionInfo;
     private final LauncherAppState mLauncherAppState;
 
     public AppsSearchPipeline(Context context, LauncherAppState launcherAppState) {
         mLauncherAppState = launcherAppState;
-        mSearchSectionInfo = new SectionDecorationInfo();
-        mSearchSectionInfo.setDecorationHandler(
-                new SectionDecorationHandler(context, true, 0, true, true));
     }
 
     @Override
@@ -82,7 +77,6 @@ public class AppsSearchPipeline implements SearchPipeline {
         ArrayList<AdapterItem> items = new ArrayList<>();
         for (int i = 0; i < matchingApps.size() && i < MAX_RESULTS_COUNT; i++) {
             AdapterItem appItem = AdapterItem.asApp(i, "", matchingApps.get(i), i);
-            appItem.sectionDecorationInfo = mSearchSectionInfo;
             items.add(appItem);
         }
 
diff --git a/src/com/android/launcher3/allapps/search/DefaultSearchAdapterProvider.java b/src/com/android/launcher3/allapps/search/DefaultSearchAdapterProvider.java
index ba895ed5d4..ef62da43af 100644
--- a/src/com/android/launcher3/allapps/search/DefaultSearchAdapterProvider.java
+++ b/src/com/android/launcher3/allapps/search/DefaultSearchAdapterProvider.java
@@ -15,12 +15,17 @@
  */
 package com.android.launcher3.allapps.search;
 
+import android.graphics.Canvas;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.BubbleTextView;
+import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.allapps.AllAppsGridAdapter;
 import com.android.launcher3.model.data.ItemInfo;
 
@@ -29,10 +34,19 @@ import com.android.launcher3.model.data.ItemInfo;
  */
 public class DefaultSearchAdapterProvider extends SearchAdapterProvider {
 
+    private final RecyclerView.ItemDecoration mDecoration;
     private View mHighlightedView;
 
-    public DefaultSearchAdapterProvider(BaseDraggingActivity launcher) {
-        super(launcher);
+    public DefaultSearchAdapterProvider(BaseDraggingActivity launcher,
+            AllAppsContainerView appsContainerView) {
+        super(launcher, appsContainerView);
+        mDecoration = new RecyclerView.ItemDecoration() {
+            @Override
+            public void onDraw(@NonNull Canvas c, @NonNull RecyclerView parent,
+                    @NonNull RecyclerView.State state) {
+                super.onDraw(c, parent, state);
+            }
+        };
     }
 
     @Override
@@ -67,4 +81,9 @@ public class DefaultSearchAdapterProvider extends SearchAdapterProvider {
     public View getHighlightedItem() {
         return mHighlightedView;
     }
+
+    @Override
+    public RecyclerView.ItemDecoration getDecorator() {
+        return mDecoration;
+    }
 }
diff --git a/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java b/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
index a650a7d947..cefb8cbdd8 100644
--- a/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
+++ b/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
@@ -21,7 +21,10 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.android.launcher3.BaseDraggingActivity;
+import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.allapps.AllAppsGridAdapter;
 
 /**
@@ -31,7 +34,7 @@ public abstract class SearchAdapterProvider {
 
     protected final BaseDraggingActivity mLauncher;
 
-    public SearchAdapterProvider(BaseDraggingActivity launcher) {
+    public SearchAdapterProvider(BaseDraggingActivity launcher, AllAppsContainerView appsView) {
         mLauncher = launcher;
     }
 
@@ -72,7 +75,7 @@ public abstract class SearchAdapterProvider {
     }
 
     /**
-     * handles selection event on search adapter item. Returns false if provider can not handle
+     * Handles selection event on search adapter item. Returns false if provider can not handle
      * event
      */
     public abstract boolean launchHighlightedItem();
@@ -82,5 +85,8 @@ public abstract class SearchAdapterProvider {
      */
     public abstract View getHighlightedItem();
 
-
+    /**
+     * Returns the item decorator.
+     */
+    public abstract RecyclerView.ItemDecoration getDecorator();
 }
diff --git a/src/com/android/launcher3/allapps/search/SectionDecorationInfo.java b/src/com/android/launcher3/allapps/search/SectionDecorationInfo.java
deleted file mode 100644
index 56dd63ccc1..0000000000
--- a/src/com/android/launcher3/allapps/search/SectionDecorationInfo.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.allapps.search;
-
-import com.android.launcher3.allapps.AllAppsSectionDecorator.SectionDecorationHandler;
-
-/**
- * Info class for a search section that is primarily used for decoration.
- */
-public class SectionDecorationInfo {
-    public static final int GROUPING = 1 << 1;
-
-    private String mSectionId;
-    private SectionDecorationHandler mDecorationHandler;
-
-    public SectionDecorationInfo() {
-        this(null);
-    }
-
-    public SectionDecorationInfo(String sectionId) {
-        mSectionId = sectionId;
-    }
-
-    public void setDecorationHandler(SectionDecorationHandler sectionDecorationHandler) {
-        mDecorationHandler = sectionDecorationHandler;
-    }
-
-    public SectionDecorationHandler getDecorationHandler() {
-        return mDecorationHandler;
-    }
-
-    /**
-     * Returns the section's ID
-     */
-    public String getSectionId() {
-        return mSectionId == null ? "" : mSectionId;
-    }
-}
-- 
GitLab


From 41a842449d0f640945538e8b0a80dcf1e7535754 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Mon, 29 Mar 2021 13:01:28 +0100
Subject: [PATCH 0789/1664] Don't transpose hotseat on sw600

Bug: 178385459
Test: Manual
Change-Id: I5805b0ccb05b97b931ab99a31c31029f7066daca
---
 res/values-sw600dp/config.xml | 3 +++
 res/values-sw720dp/config.xml | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/values-sw600dp/config.xml b/res/values-sw600dp/config.xml
index 09bdaafc1d..d50115b20d 100644
--- a/res/values-sw600dp/config.xml
+++ b/res/values-sw600dp/config.xml
@@ -1,3 +1,6 @@
 <resources>
     <bool name="allow_rotation">true</bool>
+
+    <!-- Hotseat -->
+    <bool name="hotseat_transpose_layout_with_orientation">false</bool>
 </resources>
diff --git a/res/values-sw720dp/config.xml b/res/values-sw720dp/config.xml
index ec07591ff9..33fc553a84 100644
--- a/res/values-sw720dp/config.xml
+++ b/res/values-sw720dp/config.xml
@@ -3,7 +3,4 @@
 <!-- All Apps & Widgets -->
     <!-- Out of 100, the percent to shrink the workspace during spring loaded mode. -->
     <integer name="config_workspaceSpringLoadShrinkPercentage">90</integer>
-
-<!-- Hotseat -->
-    <bool name="hotseat_transpose_layout_with_orientation">false</bool>
 </resources>
-- 
GitLab


From c5d168da829d948e3c43a1ed42529b8f2b14752e Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Thu, 25 Mar 2021 09:28:19 -0700
Subject: [PATCH 0790/1664] In 2 button mode, animate to HINT_STATE instead of
 OVERVIEW directly

When reaching HINT_STATE_TWO_BUTTON, we goToState(OVERVIEW) with a
haptic, to keep the same feeling as before.

Test: Swipe up from home on nav bar, ensure it goes to overview
Bug: 175137718
Change-Id: Ib17d4a5e9e33b8bf9b074f926faa6d0e2fb487fa
---
 .../uioverrides/QuickstepLauncher.java        |  7 +++++
 .../QuickstepAtomicAnimationFactory.java      |  4 ++-
 .../TwoButtonNavbarTouchController.java       | 28 +++++++++++++++++--
 src/com/android/launcher3/LauncherState.java  |  6 +++-
 .../android/launcher3/states/HintState.java   |  6 +++-
 .../launcher3/testing/TestProtocol.java       |  5 +++-
 6 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index bae97d763a..fc1f30a865 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -28,6 +28,7 @@ import static com.android.launcher3.LauncherState.OVERVIEW_MODAL_TASK;
 import static com.android.launcher3.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_APP_LAUNCH_TAP;
 import static com.android.launcher3.testing.TestProtocol.HINT_STATE_ORDINAL;
+import static com.android.launcher3.testing.TestProtocol.HINT_STATE_TWO_BUTTON_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.OVERVIEW_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.QUICK_SWITCH_STATE_ORDINAL;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY;
@@ -35,6 +36,7 @@ import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SY
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
+import android.view.HapticFeedbackConstants;
 import android.view.View;
 
 import com.android.launcher3.BaseQuickstepLauncher;
@@ -251,6 +253,11 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
                 }
                 break;
             }
+            case HINT_STATE_TWO_BUTTON_ORDINAL: {
+                getStateManager().goToState(OVERVIEW);
+                getDragLayer().performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY);
+                break;
+            }
             case OVERVIEW_STATE_ORDINAL: {
                 RecentsView rv = getOverviewPanel();
                 sendCustomAccessibilityEvent(
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
index de7be5dbb8..ba6192314e 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
@@ -18,6 +18,7 @@ package com.android.launcher3.uioverrides.states;
 import static android.view.View.VISIBLE;
 
 import static com.android.launcher3.LauncherState.HINT_STATE;
+import static com.android.launcher3.LauncherState.HINT_STATE_TWO_BUTTON;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.WorkspaceStateTransitionAnimation.getSpringScaleAnimator;
@@ -115,7 +116,8 @@ public class QuickstepAtomicAnimationFactory extends
                     qsbContainer.setScaleY(0.92f);
                 }
             }
-        } else if ((fromState == NORMAL || fromState == HINT_STATE) && toState == OVERVIEW) {
+        } else if ((fromState == NORMAL || fromState == HINT_STATE
+                || fromState == HINT_STATE_TWO_BUTTON) && toState == OVERVIEW) {
             if (SysUINavigationMode.getMode(mActivity) == NO_BUTTON) {
                 config.setInterpolator(ANIM_WORKSPACE_SCALE,
                         fromState == NORMAL ? ACCEL : OVERSHOOT_1_2);
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java
index faf5054007..5781469861 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java
@@ -17,11 +17,13 @@ package com.android.launcher3.uioverrides.touchcontrollers;
 
 import static com.android.launcher3.AbstractFloatingView.TYPE_ALL_APPS_EDU;
 import static com.android.launcher3.AbstractFloatingView.getOpenView;
+import static com.android.launcher3.LauncherState.HINT_STATE_TWO_BUTTON;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.Utilities.EDGE_NAV_BAR;
 
 import android.animation.ValueAnimator;
+import android.os.SystemClock;
 import android.view.MotionEvent;
 
 import com.android.launcher3.AbstractFloatingView;
@@ -91,10 +93,10 @@ public class TwoButtonNavbarTouchController extends AbstractStateChangeTouchCont
         if (mIsTransposed) {
             boolean draggingFromNav =
                     mLauncher.getDeviceProfile().isSeascape() == isDragTowardPositive;
-            return draggingFromNav ? OVERVIEW : NORMAL;
+            return draggingFromNav ? HINT_STATE_TWO_BUTTON : NORMAL;
         } else {
             LauncherState startState = mStartState != null ? mStartState : fromState;
-            return isDragTowardPositive ^ (startState == OVERVIEW) ? OVERVIEW : NORMAL;
+            return isDragTowardPositive ^ (startState == OVERVIEW) ? HINT_STATE_TWO_BUTTON : NORMAL;
         }
     }
 
@@ -104,6 +106,12 @@ public class TwoButtonNavbarTouchController extends AbstractStateChangeTouchCont
         super.updateSwipeCompleteAnimation(animator, expectedDuration, targetState,
                 velocity, isFling);
         mFinishFastOnSecondTouch = !mIsTransposed && mFromState == NORMAL;
+
+        if (targetState == HINT_STATE_TWO_BUTTON) {
+            // We were going to HINT_STATE_TWO_BUTTON, but end that animation immediately so we go
+            // to OVERVIEW instead.
+            animator.setDuration(0);
+        }
     }
 
     @Override
@@ -121,13 +129,27 @@ public class TwoButtonNavbarTouchController extends AbstractStateChangeTouchCont
         return (mLauncher.getDeviceProfile().isSeascape() ? 1 : -1) / range;
     }
 
+    @Override
+    protected void updateProgress(float fraction) {
+        super.updateProgress(fraction);
+
+        // We have reached HINT_STATE, end the gesture now to go to OVERVIEW.
+        if (fraction >= 1 && mToState == HINT_STATE_TWO_BUTTON) {
+            final long now = SystemClock.uptimeMillis();
+            MotionEvent event = MotionEvent.obtain(now, now,
+                    MotionEvent.ACTION_UP, 0.0f, 0.0f, 0);
+            mDetector.onTouchEvent(event);
+            event.recycle();
+        }
+    }
+
     @Override
     protected void onSwipeInteractionCompleted(LauncherState targetState) {
         super.onSwipeInteractionCompleted(targetState);
         if (!mIsTransposed) {
             mContinuousTouchCount++;
         }
-        if (mStartState == NORMAL && targetState == OVERVIEW) {
+        if (mStartState == NORMAL && targetState == HINT_STATE_TWO_BUTTON) {
             SystemUiProxy.INSTANCE.get(mLauncher).onOverviewShown(true, TAG);
         } else if (targetState == NORMAL
                 && mContinuousTouchCount >= MAX_NUM_SWIPES_TO_TRIGGER_EDU) {
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java
index 06bc4380fa..0df7c21854 100644
--- a/src/com/android/launcher3/LauncherState.java
+++ b/src/com/android/launcher3/LauncherState.java
@@ -17,9 +17,11 @@ package com.android.launcher3;
 
 import static com.android.launcher3.anim.Interpolators.ACCEL_2;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
+import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW;
 import static com.android.launcher3.testing.TestProtocol.ALL_APPS_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.BACKGROUND_APP_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.HINT_STATE_ORDINAL;
+import static com.android.launcher3.testing.TestProtocol.HINT_STATE_TWO_BUTTON_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.NORMAL_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.OVERVIEW_MODAL_TASK_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.OVERVIEW_SPLIT_SELECT_ORDINAL;
@@ -89,7 +91,7 @@ public abstract class LauncherState implements BaseState<LauncherState> {
                 }
             };
 
-    private static final LauncherState[] sAllStates = new LauncherState[9];
+    private static final LauncherState[] sAllStates = new LauncherState[10];
 
     /**
      * TODO: Create a separate class for NORMAL state.
@@ -112,6 +114,8 @@ public abstract class LauncherState implements BaseState<LauncherState> {
             SPRING_LOADED_STATE_ORDINAL);
     public static final LauncherState ALL_APPS = new AllAppsState(ALL_APPS_STATE_ORDINAL);
     public static final LauncherState HINT_STATE = new HintState(HINT_STATE_ORDINAL);
+    public static final LauncherState HINT_STATE_TWO_BUTTON = new HintState(
+            HINT_STATE_TWO_BUTTON_ORDINAL, LAUNCHER_STATE_OVERVIEW);
 
     public static final LauncherState OVERVIEW = new OverviewState(OVERVIEW_STATE_ORDINAL);
     public static final LauncherState OVERVIEW_MODAL_TASK = OverviewState.newModalTaskState(
diff --git a/src/com/android/launcher3/states/HintState.java b/src/com/android/launcher3/states/HintState.java
index eb2c551994..76f89bcdc9 100644
--- a/src/com/android/launcher3/states/HintState.java
+++ b/src/com/android/launcher3/states/HintState.java
@@ -31,7 +31,11 @@ public class HintState extends LauncherState {
             | FLAG_HAS_SYS_UI_SCRIM;
 
     public HintState(int id) {
-        super(id, LAUNCHER_STATE_HOME, STATE_FLAGS);
+        this(id, LAUNCHER_STATE_HOME);
+    }
+
+    public HintState(int id, int statsLogOrdinal) {
+        super(id, statsLogOrdinal, STATE_FLAGS);
     }
 
     @Override
diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java
index f34bff6994..943d129047 100644
--- a/src/com/android/launcher3/testing/TestProtocol.java
+++ b/src/com/android/launcher3/testing/TestProtocol.java
@@ -32,7 +32,8 @@ public final class TestProtocol {
     public static final int ALL_APPS_STATE_ORDINAL = 5;
     public static final int BACKGROUND_APP_STATE_ORDINAL = 6;
     public static final int HINT_STATE_ORDINAL = 7;
-    public static final int OVERVIEW_SPLIT_SELECT_ORDINAL = 8;
+    public static final int HINT_STATE_TWO_BUTTON_ORDINAL = 8;
+    public static final int OVERVIEW_SPLIT_SELECT_ORDINAL = 9;
     public static final String TAPL_EVENTS_TAG = "TaplEvents";
     public static final String SEQUENCE_MAIN = "Main";
     public static final String SEQUENCE_TIS = "TIS";
@@ -56,6 +57,8 @@ public final class TestProtocol {
                 return "Background";
             case HINT_STATE_ORDINAL:
                 return "Hint";
+            case HINT_STATE_TWO_BUTTON_ORDINAL:
+                return "Hint2Button";
             case OVERVIEW_SPLIT_SELECT_ORDINAL:
                 return "OverviewSplitSelect";
             default:
-- 
GitLab


From 6cd95cd2d823978edd98c7e605bf2d3f12c1aa37 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 23 Mar 2021 17:22:28 -0700
Subject: [PATCH 0791/1664] Remove Overview atomic animation support

- Remove PLAY_ATOMIC_OVERVIEW_SCALE and PLAY_ATOMIC_OVERVIEW_PEEK
- Remove complicated parallel atomic animation support from
  AbstractStateChangeTouchController and subclasses
- Remove some code related to going between Overview <-> AllApps

Test: Swipe between states in all 3 navigation modes
Bug: 175137718
Change-Id: Ice314d46946c3a983cdc6ccf1a67effb5da9156e
---
 .../statehandlers/BackButtonAlphaHandler.java |   4 -
 .../statehandlers/DepthController.java        |   1 -
 .../BaseRecentsViewStateController.java       |   6 -
 ...ButtonNavbarToOverviewTouchController.java |   4 +-
 .../PortraitStatesTouchController.java        | 101 +--------
 .../QuickSwitchTouchController.java           |   2 +-
 .../TransposedQuickSwitchTouchController.java |   4 +-
 .../TwoButtonNavbarTouchController.java       |   5 +-
 .../FallbackRecentsStateController.java       |   6 -
 .../quickstep/util/OverviewToHomeAnim.java    |   7 +-
 .../util/StaggeredWorkspaceAnim.java          |   4 +-
 .../WorkspaceStateTransitionAnimation.java    |  81 +++----
 .../allapps/AllAppsTransitionController.java  |   9 +-
 .../launcher3/statemanager/StateManager.java  |   6 +-
 .../states/StateAnimationConfig.java          |  50 +---
 .../AbstractStateChangeTouchController.java   | 214 +-----------------
 .../touch/AllAppsSwipeController.java         |  10 +-
 17 files changed, 63 insertions(+), 451 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/statehandlers/BackButtonAlphaHandler.java b/quickstep/src/com/android/launcher3/statehandlers/BackButtonAlphaHandler.java
index ce9430515c..1f268cc9d9 100644
--- a/quickstep/src/com/android/launcher3/statehandlers/BackButtonAlphaHandler.java
+++ b/quickstep/src/com/android/launcher3/statehandlers/BackButtonAlphaHandler.java
@@ -48,10 +48,6 @@ public class BackButtonAlphaHandler implements StateHandler<LauncherState> {
     @Override
     public void setStateWithAnimation(LauncherState toState, StateAnimationConfig config,
             PendingAnimation animation) {
-        if (config.onlyPlayAtomicComponent()) {
-            return;
-        }
-
         if (SysUINavigationMode.getMode(mLauncher) != TWO_BUTTONS) {
             return;
         }
diff --git a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
index fe8f0c653d..249ef3a3b0 100644
--- a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
+++ b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
@@ -193,7 +193,6 @@ public class DepthController implements StateHandler<LauncherState>,
     public void setStateWithAnimation(LauncherState toState, StateAnimationConfig config,
             PendingAnimation animation) {
         if (mSurface == null
-                || config.onlyPlayAtomicComponent()
                 || config.hasAnimationFlag(SKIP_DEPTH_CONTROLLER)
                 || mIgnoreStateChangesDuringMultiWindowAnimation) {
             return;
diff --git a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
index d65c59e067..d36af09d89 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
@@ -26,8 +26,6 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SC
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCRIM_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y;
-import static com.android.launcher3.states.StateAnimationConfig.PLAY_ATOMIC_OVERVIEW_PEEK;
-import static com.android.launcher3.states.StateAnimationConfig.PLAY_ATOMIC_OVERVIEW_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
 import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET;
 import static com.android.quickstep.views.RecentsView.RECENTS_GRID_PROGRESS;
@@ -83,10 +81,6 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView>
     @Override
     public void setStateWithAnimation(LauncherState toState, StateAnimationConfig config,
             PendingAnimation builder) {
-        if (!config.hasAnimationFlag(PLAY_ATOMIC_OVERVIEW_PEEK | PLAY_ATOMIC_OVERVIEW_SCALE)) {
-            // The entire recents animation is played atomically.
-            return;
-        }
         if (config.hasAnimationFlag(SKIP_OVERVIEW)) {
             return;
         }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
index 6c71995f9b..fcb211be39 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -108,8 +108,8 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
     }
 
     @Override
-    protected float initCurrentAnimation(int animComponents) {
-        float progressMultiplier = super.initCurrentAnimation(animComponents);
+    protected float initCurrentAnimation() {
+        float progressMultiplier = super.initCurrentAnimation();
         if (mToState == HINT_STATE) {
             // Track the drag across the entire height of the screen.
             progressMultiplier = -1 / getShiftRange();
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
index facfb9ddd8..1af9685f4f 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
@@ -23,17 +23,9 @@ import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.anim.Interpolators.ACCEL;
 import static com.android.launcher3.anim.Interpolators.DEACCEL;
-import static com.android.launcher3.anim.Interpolators.LINEAR;
-import static com.android.launcher3.config.FeatureFlags.UNSTABLE_SPRINGS;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_VERTICAL_PROGRESS;
 
-import android.animation.TimeInterpolator;
-import android.animation.ValueAnimator;
-import android.util.Log;
 import android.view.MotionEvent;
-import android.view.animation.Interpolator;
 
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
@@ -41,8 +33,6 @@ import com.android.launcher3.LauncherState;
 import com.android.launcher3.allapps.AllAppsTransitionController;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.states.StateAnimationConfig;
-import com.android.launcher3.states.StateAnimationConfig.AnimationFlags;
-import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.AbstractStateChangeTouchController;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
 import com.android.launcher3.uioverrides.states.OverviewState;
@@ -70,11 +60,6 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
 
     private final PortraitOverviewStateTouchHelper mOverviewPortraitStateTouchHelper;
 
-    private final InterpolatorWrapper mAllAppsInterpolatorWrapper = new InterpolatorWrapper();
-
-    // If true, we will finish the current animation instantly on second touch.
-    private boolean mFinishFastOnSecondTouch;
-
     public PortraitStatesTouchController(Launcher l) {
         super(l, SingleAxisSwipeDetector.VERTICAL);
         mOverviewPortraitStateTouchHelper = new PortraitOverviewStateTouchHelper(l);
@@ -85,10 +70,6 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
         // If we are swiping to all apps instead of overview, allow it from anywhere.
         boolean interceptAnywhere = mLauncher.isInState(NORMAL);
         if (mCurrentAnimation != null) {
-            if (mFinishFastOnSecondTouch) {
-                mCurrentAnimation.getAnimationPlayer().end();
-            }
-
             AllAppsTransitionController allAppsController = mLauncher.getAllAppsController();
             if (ev.getY() >= allAppsController.getShiftRange() * allAppsController.getProgress()
                     || interceptAnywhere) {
@@ -96,11 +77,7 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
                 // the touch is below the current all apps progress (to allow for double swipe).
                 return true;
             }
-            // Otherwise, make sure everything is settled and don't intercept so they can scroll
-            // recents, dismiss a task, etc.
-            if (mAtomicAnim != null) {
-                mAtomicAnim.end();
-            }
+            // Otherwise, don't intercept so they can scroll recents, dismiss a task, etc.
             return false;
         }
         if (mLauncher.isInState(ALL_APPS)) {
@@ -136,32 +113,6 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
         return fromState;
     }
 
-    private StateAnimationConfig getNormalToOverviewAnimation() {
-        mAllAppsInterpolatorWrapper.baseInterpolator = LINEAR;
-
-        StateAnimationConfig builder = new StateAnimationConfig();
-        builder.setInterpolator(ANIM_VERTICAL_PROGRESS, mAllAppsInterpolatorWrapper);
-        return builder;
-    }
-
-    private static StateAnimationConfig getOverviewToAllAppsAnimation() {
-        StateAnimationConfig builder = new StateAnimationConfig();
-        builder.setInterpolator(ANIM_ALL_APPS_FADE, Interpolators.clampToProgress(ACCEL,
-                0, ALL_APPS_CONTENT_FADE_THRESHOLD));
-        builder.setInterpolator(ANIM_OVERVIEW_FADE, Interpolators.clampToProgress(DEACCEL,
-                RECENTS_FADE_THRESHOLD, 1));
-        return builder;
-    }
-
-    private StateAnimationConfig getAllAppsToOverviewAnimation() {
-        StateAnimationConfig builder = new StateAnimationConfig();
-        builder.setInterpolator(ANIM_ALL_APPS_FADE, Interpolators.clampToProgress(DEACCEL,
-                1 - ALL_APPS_CONTENT_FADE_THRESHOLD, 1));
-        builder.setInterpolator(ANIM_OVERVIEW_FADE, Interpolators.clampToProgress(ACCEL,
-                0f, 1 - RECENTS_FADE_THRESHOLD));
-        return builder;
-    }
-
     private StateAnimationConfig getNormalToAllAppsAnimation() {
         StateAnimationConfig builder = new StateAnimationConfig();
         builder.setInterpolator(ANIM_ALL_APPS_FADE, Interpolators.clampToProgress(ACCEL,
@@ -180,13 +131,7 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
     protected StateAnimationConfig getConfigForStates(
             LauncherState fromState, LauncherState toState) {
         final StateAnimationConfig config;
-        if (fromState == NORMAL && toState == OVERVIEW) {
-            config = getNormalToOverviewAnimation();
-        } else if (fromState == OVERVIEW && toState == ALL_APPS) {
-            config = getOverviewToAllAppsAnimation();
-        } else if (fromState == ALL_APPS && toState == OVERVIEW) {
-            config = getAllAppsToOverviewAnimation();
-        } else if (fromState == NORMAL && toState == ALL_APPS) {
+        if (fromState == NORMAL && toState == ALL_APPS) {
             config = getNormalToAllAppsAnimation();
         } else if (fromState == ALL_APPS && toState == NORMAL) {
             config = getAllAppsToNormalAnimation();
@@ -197,7 +142,7 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
     }
 
     @Override
-    protected float initCurrentAnimation(@AnimationFlags int animFlags) {
+    protected float initCurrentAnimation() {
         float range = getShiftRange();
         long maxAccuracy = (long) (2 * range);
 
@@ -208,7 +153,6 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
 
         final StateAnimationConfig config = totalShift == 0 ? new StateAnimationConfig()
                 : getConfigForStates(mFromState, mToState);
-        config.animFlags = animFlags;
         config.duration = maxAccuracy;
 
         if (mCurrentAnimation != null) {
@@ -242,35 +186,6 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
         return 1 / totalShift;
     }
 
-    @Override
-    protected void updateSwipeCompleteAnimation(ValueAnimator animator, long expectedDuration,
-            LauncherState targetState, float velocity, boolean isFling) {
-        super.updateSwipeCompleteAnimation(animator, expectedDuration, targetState,
-                velocity, isFling);
-        handleFirstSwipeToOverview(animator, expectedDuration, targetState, velocity, isFling);
-    }
-
-    private void handleFirstSwipeToOverview(final ValueAnimator animator,
-            final long expectedDuration, final LauncherState targetState, final float velocity,
-            final boolean isFling) {
-        if (UNSTABLE_SPRINGS.get() && mFromState == OVERVIEW && mToState == ALL_APPS
-                && targetState == OVERVIEW) {
-            mFinishFastOnSecondTouch = true;
-        } else  if (mFromState == NORMAL && mToState == OVERVIEW && targetState == OVERVIEW) {
-            mFinishFastOnSecondTouch = true;
-            if (isFling && expectedDuration != 0) {
-                // Update all apps interpolator to add a bit of overshoot starting from currFraction
-                final float currFraction = mCurrentAnimation.getProgressFraction();
-                mAllAppsInterpolatorWrapper.baseInterpolator = Interpolators.clampToProgress(
-                        Interpolators.overshootInterpolatorForVelocity(velocity), currFraction, 1);
-                animator.setDuration(Math.min(expectedDuration, ATOMIC_DURATION))
-                        .setInterpolator(LINEAR);
-            }
-        } else {
-            mFinishFastOnSecondTouch = false;
-        }
-    }
-
     @Override
     protected void onSwipeInteractionCompleted(LauncherState targetState) {
         super.onSwipeInteractionCompleted(targetState);
@@ -296,16 +211,6 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
         return launcher.getDragLayer().getHeight() - hotseatHeight;
     }
 
-    private static class InterpolatorWrapper implements Interpolator {
-
-        public TimeInterpolator baseInterpolator = LINEAR;
-
-        @Override
-        public float getInterpolation(float v) {
-            return baseInterpolator.getInterpolation(v);
-        }
-    }
-
     @Override
     public boolean onControllerInterceptTouchEvent(MotionEvent ev) {
         switch (ev.getAction()) {
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
index fc9e1bbfe5..85422092f8 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
@@ -101,7 +101,7 @@ public class QuickSwitchTouchController extends AbstractStateChangeTouchControll
     }
 
     @Override
-    protected float initCurrentAnimation(int animComponents) {
+    protected float initCurrentAnimation() {
         StateAnimationConfig config = new StateAnimationConfig();
         setupInterpolators(config);
         config.duration = (long) (getShiftRange() * 2);
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TransposedQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TransposedQuickSwitchTouchController.java
index 0ed529184e..8f9c01441e 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TransposedQuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TransposedQuickSwitchTouchController.java
@@ -32,8 +32,8 @@ public class TransposedQuickSwitchTouchController extends QuickSwitchTouchContro
     }
 
     @Override
-    protected float initCurrentAnimation(int animComponents) {
-        float multiplier = super.initCurrentAnimation(animComponents);
+    protected float initCurrentAnimation() {
+        float multiplier = super.initCurrentAnimation();
         return mLauncher.getDeviceProfile().isSeascape() ? multiplier : -multiplier;
     }
 
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java
index 5781469861..3f7190f017 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java
@@ -29,7 +29,6 @@ import android.view.MotionEvent;
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
-import com.android.launcher3.states.StateAnimationConfig.AnimationFlags;
 import com.android.launcher3.touch.AbstractStateChangeTouchController;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
 import com.android.quickstep.SystemUiProxy;
@@ -121,11 +120,11 @@ public class TwoButtonNavbarTouchController extends AbstractStateChangeTouchCont
     }
 
     @Override
-    protected float initCurrentAnimation(@AnimationFlags int animComponent) {
+    protected float initCurrentAnimation() {
         float range = getShiftRange();
         long maxAccuracy = (long) (2 * range);
         mCurrentAnimation = mLauncher.getStateManager().createAnimationToNewWorkspace(mToState,
-                maxAccuracy, animComponent);
+                maxAccuracy);
         return (mLauncher.getDeviceProfile().isSeascape() ? 1 : -1) / range;
     }
 
diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
index 82bfa9b9a9..03a0b4ec6b 100644
--- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
+++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
@@ -20,8 +20,6 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_MO
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y;
-import static com.android.launcher3.states.StateAnimationConfig.PLAY_ATOMIC_OVERVIEW_PEEK;
-import static com.android.launcher3.states.StateAnimationConfig.PLAY_ATOMIC_OVERVIEW_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
 import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET;
 import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS;
@@ -63,10 +61,6 @@ public class FallbackRecentsStateController implements StateHandler<RecentsState
     @Override
     public void setStateWithAnimation(RecentsState toState, StateAnimationConfig config,
             PendingAnimation setter) {
-        if (!config.hasAnimationFlag(PLAY_ATOMIC_OVERVIEW_PEEK | PLAY_ATOMIC_OVERVIEW_SCALE)) {
-            // The entire recents animation is played atomically.
-            return;
-        }
         if (config.hasAnimationFlag(SKIP_OVERVIEW)) {
             return;
         }
diff --git a/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java b/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
index 1031c5b080..a0ee621d49 100644
--- a/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
+++ b/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
@@ -22,13 +22,11 @@ import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 import static com.android.launcher3.anim.Interpolators.FINAL_FRAME;
 import static com.android.launcher3.anim.Interpolators.INSTANT;
 import static com.android.launcher3.anim.Interpolators.clampToProgress;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_COMPONENTS;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_ACTIONS_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y;
-import static com.android.launcher3.states.StateAnimationConfig.PLAY_ATOMIC_OVERVIEW_PEEK;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
@@ -105,10 +103,7 @@ public class OverviewToHomeAnim {
 
         StateAnimationConfig config = new UseFirstInterpolatorStateAnimConfig();
         config.duration = duration;
-        config.animFlags = playStaggeredWorkspaceAnim
-                // StaggeredWorkspaceAnim doesn't animate overview, so we handle it here.
-                ? PLAY_ATOMIC_OVERVIEW_PEEK
-                : ANIM_ALL_COMPONENTS;
+        config.animFlags = StateAnimationConfig.PLAY_ANIMATION;
         boolean isLayoutNaturalToLauncher = recentsView.getPagedOrientationHandler()
                 .isLayoutNaturalToLauncher();
         config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, isLayoutNaturalToLauncher
diff --git a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
index d4ca31fbda..9ec40b8c12 100644
--- a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
+++ b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
@@ -21,7 +21,7 @@ import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_COMPONENTS;
+import static com.android.launcher3.states.StateAnimationConfig.PLAY_ANIMATION;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_DEPTH_CONTROLLER;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
 
@@ -181,7 +181,7 @@ public class StaggeredWorkspaceAnim {
      */
     private void prepareToAnimate(Launcher launcher, boolean animateOverviewScrim) {
         StateAnimationConfig config = new StateAnimationConfig();
-        config.animFlags = ANIM_ALL_COMPONENTS | SKIP_OVERVIEW | SKIP_DEPTH_CONTROLLER;
+        config.animFlags = PLAY_ANIMATION | SKIP_OVERVIEW | SKIP_DEPTH_CONTROLLER;
         config.duration = 0;
         // setRecentsAttachedToAppWindow() will animate recents out.
         launcher.getStateManager().createAtomicAnimation(BACKGROUND_APP, NORMAL, config).start();
diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
index 16e022ca85..e0a4d4a5c6 100644
--- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
+++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
@@ -105,47 +105,39 @@ public class WorkspaceStateTransitionAnimation {
         int elements = state.getVisibleElements(mLauncher);
         Interpolator fadeInterpolator = config.getInterpolator(ANIM_WORKSPACE_FADE,
                 pageAlphaProvider.interpolator);
-        boolean playAtomicComponent = config.playAtomicOverviewScaleComponent();
         Hotseat hotseat = mWorkspace.getHotseat();
-        if (playAtomicComponent) {
-            Interpolator scaleInterpolator = config.getInterpolator(ANIM_WORKSPACE_SCALE, ZOOM_OUT);
-            LauncherState fromState = mLauncher.getStateManager().getState();
-            boolean shouldSpring = propertySetter instanceof PendingAnimation
-                    && fromState == HINT_STATE && state == NORMAL;
-            if (shouldSpring) {
-                ((PendingAnimation) propertySetter).add(getSpringScaleAnimator(mLauncher,
-                        mWorkspace, mNewScale));
-            } else {
-                propertySetter.setFloat(mWorkspace, SCALE_PROPERTY, mNewScale, scaleInterpolator);
-            }
-
-            setPivotToScaleWithWorkspace(hotseat);
-            float hotseatScale = hotseatScaleAndTranslation.scale;
-            if (shouldSpring) {
-                PendingAnimation pa = (PendingAnimation) propertySetter;
-                pa.add(getSpringScaleAnimator(mLauncher, hotseat, hotseatScale));
-            } else {
-                Interpolator hotseatScaleInterpolator = config.getInterpolator(ANIM_HOTSEAT_SCALE,
-                        scaleInterpolator);
-                propertySetter.setFloat(hotseat, SCALE_PROPERTY, hotseatScale,
-                        hotseatScaleInterpolator);
-            }
-
-            float hotseatIconsAlpha = (elements & HOTSEAT_ICONS) != 0 ? 1 : 0;
-            propertySetter.setViewAlpha(hotseat, hotseatIconsAlpha, fadeInterpolator);
-            float workspacePageIndicatorAlpha = (elements & WORKSPACE_PAGE_INDICATOR) != 0 ? 1 : 0;
-            propertySetter.setViewAlpha(mLauncher.getWorkspace().getPageIndicator(),
-                    workspacePageIndicatorAlpha, fadeInterpolator);
+        Interpolator scaleInterpolator = config.getInterpolator(ANIM_WORKSPACE_SCALE, ZOOM_OUT);
+        LauncherState fromState = mLauncher.getStateManager().getState();
+
+        boolean shouldSpring = propertySetter instanceof PendingAnimation
+                && fromState == HINT_STATE && state == NORMAL;
+        if (shouldSpring) {
+            ((PendingAnimation) propertySetter).add(getSpringScaleAnimator(mLauncher,
+                    mWorkspace, mNewScale));
+        } else {
+            propertySetter.setFloat(mWorkspace, SCALE_PROPERTY, mNewScale, scaleInterpolator);
         }
 
-        if (config.onlyPlayAtomicComponent()) {
-            // Only the alpha and scale, handled above, are included in the atomic animation.
-            return;
+        setPivotToScaleWithWorkspace(hotseat);
+        float hotseatScale = hotseatScaleAndTranslation.scale;
+        if (shouldSpring) {
+            PendingAnimation pa = (PendingAnimation) propertySetter;
+            pa.add(getSpringScaleAnimator(mLauncher, hotseat, hotseatScale));
+        } else {
+            Interpolator hotseatScaleInterpolator = config.getInterpolator(ANIM_HOTSEAT_SCALE,
+                    scaleInterpolator);
+            propertySetter.setFloat(hotseat, SCALE_PROPERTY, hotseatScale,
+                    hotseatScaleInterpolator);
         }
 
-        Interpolator translationInterpolator = !playAtomicComponent
-                ? LINEAR
-                : config.getInterpolator(ANIM_WORKSPACE_TRANSLATE, ZOOM_OUT);
+        float hotseatIconsAlpha = (elements & HOTSEAT_ICONS) != 0 ? 1 : 0;
+        propertySetter.setViewAlpha(hotseat, hotseatIconsAlpha, fadeInterpolator);
+        float workspacePageIndicatorAlpha = (elements & WORKSPACE_PAGE_INDICATOR) != 0 ? 1 : 0;
+        propertySetter.setViewAlpha(mLauncher.getWorkspace().getPageIndicator(),
+                workspacePageIndicatorAlpha, fadeInterpolator);
+
+        Interpolator translationInterpolator =
+                config.getInterpolator(ANIM_WORKSPACE_TRANSLATE, ZOOM_OUT);
         propertySetter.setFloat(mWorkspace, VIEW_TRANSLATE_X,
                 scaleAndTranslation.translationX, translationInterpolator);
         propertySetter.setFloat(mWorkspace, VIEW_TRANSLATE_Y,
@@ -195,17 +187,12 @@ public class WorkspaceStateTransitionAnimation {
         int drawableAlpha = state.hasFlag(FLAG_WORKSPACE_HAS_BACKGROUNDS)
                 ? Math.round(pageAlpha * 255) : 0;
 
-        if (!config.onlyPlayAtomicComponent()) {
-            // Don't update the scrim during the atomic animation.
-            propertySetter.setInt(cl.getScrimBackground(),
-                    DRAWABLE_ALPHA, drawableAlpha, ZOOM_OUT);
-        }
-        if (config.playAtomicOverviewScaleComponent()) {
-            Interpolator fadeInterpolator = config.getInterpolator(ANIM_WORKSPACE_FADE,
-                    pageAlphaProvider.interpolator);
-            propertySetter.setFloat(cl.getShortcutsAndWidgets(), VIEW_ALPHA,
-                    pageAlpha, fadeInterpolator);
-        }
+        propertySetter.setInt(cl.getScrimBackground(),
+                DRAWABLE_ALPHA, drawableAlpha, ZOOM_OUT);
+        Interpolator fadeInterpolator = config.getInterpolator(ANIM_WORKSPACE_FADE,
+                pageAlphaProvider.interpolator);
+        propertySetter.setFloat(cl.getShortcutsAndWidgets(), VIEW_ALPHA,
+                pageAlpha, fadeInterpolator);
     }
 
     /**
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 16ecd589e4..8c5b0fe0c4 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -155,19 +155,12 @@ public class AllAppsTransitionController
             StateAnimationConfig config, PendingAnimation builder) {
         float targetProgress = toState.getVerticalProgress(mLauncher);
         if (Float.compare(mProgress, targetProgress) == 0) {
-            if (!config.onlyPlayAtomicComponent()) {
-                setAlphas(toState, config, builder);
-            }
+            setAlphas(toState, config, builder);
             // Fail fast
             onProgressAnimationEnd();
             return;
         }
 
-        if (config.onlyPlayAtomicComponent()) {
-            // There is no atomic component for the all apps transition, so just return early.
-            return;
-        }
-
         Interpolator interpolator = config.userControlled ? LINEAR : toState == OVERVIEW
                 ? config.getInterpolator(ANIM_OVERVIEW_SCALE, FAST_OUT_SLOW_IN)
                 : FAST_OUT_SLOW_IN;
diff --git a/src/com/android/launcher3/statemanager/StateManager.java b/src/com/android/launcher3/statemanager/StateManager.java
index 51767e77e7..90a6df3556 100644
--- a/src/com/android/launcher3/statemanager/StateManager.java
+++ b/src/com/android/launcher3/statemanager/StateManager.java
@@ -18,7 +18,7 @@ package com.android.launcher3.statemanager;
 
 import static android.animation.ValueAnimator.areAnimatorsEnabled;
 
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_COMPONENTS;
+import static com.android.launcher3.states.StateAnimationConfig.PLAY_ANIMATION;
 
 import android.animation.Animator;
 import android.animation.Animator.AnimatorListener;
@@ -289,7 +289,7 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
      */
     public AnimatorPlaybackController createAnimationToNewWorkspace(
             STATE_TYPE state, long duration) {
-        return createAnimationToNewWorkspace(state, duration, ANIM_ALL_COMPONENTS);
+        return createAnimationToNewWorkspace(state, duration, PLAY_ANIMATION);
     }
 
     public AnimatorPlaybackController createAnimationToNewWorkspace(
@@ -312,7 +312,7 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
 
     private PendingAnimation createAnimationToNewWorkspaceInternal(final STATE_TYPE state) {
         PendingAnimation builder = new PendingAnimation(mConfig.duration);
-        if (mConfig.getAnimComponents() != 0) {
+        if (mConfig.hasAnimationFlag(PLAY_ANIMATION)) {
             for (StateHandler handler : getStateHandlers()) {
                 handler.setStateWithAnimation(state, mConfig, builder);
             }
diff --git a/src/com/android/launcher3/states/StateAnimationConfig.java b/src/com/android/launcher3/states/StateAnimationConfig.java
index cd74390418..20457334c3 100644
--- a/src/com/android/launcher3/states/StateAnimationConfig.java
+++ b/src/com/android/launcher3/states/StateAnimationConfig.java
@@ -27,32 +27,22 @@ import java.lang.annotation.RetentionPolicy;
  */
 public class StateAnimationConfig {
 
-    // We separate the state animations into "atomic" and "non-atomic" components. The atomic
-    // components may be run atomically - that is, all at once, instead of user-controlled. However,
-    // atomic components are not restricted to this purpose; they can be user-controlled alongside
-    // non atomic components as well. Note that each gesture model has exactly one atomic component,
-    // PLAY_ATOMIC_OVERVIEW_SCALE *or* PLAY_ATOMIC_OVERVIEW_PEEK.
     @IntDef(flag = true, value = {
-            PLAY_NON_ATOMIC,
-            PLAY_ATOMIC_OVERVIEW_SCALE,
-            PLAY_ATOMIC_OVERVIEW_PEEK,
+            PLAY_ANIMATION,
             SKIP_OVERVIEW,
             SKIP_DEPTH_CONTROLLER,
     })
     @Retention(RetentionPolicy.SOURCE)
     public @interface AnimationFlags {}
-    public static final int PLAY_NON_ATOMIC = 1 << 0;
-    public static final int PLAY_ATOMIC_OVERVIEW_SCALE = 1 << 1;
-    public static final int PLAY_ATOMIC_OVERVIEW_PEEK = 1 << 2;
-    public static final int SKIP_OVERVIEW = 1 << 3;
-    public static final int SKIP_DEPTH_CONTROLLER = 1 << 4;
+    // TODO: make this the default; invert this to be SKIP_ALL_ANIMATIONS
+    public static final int PLAY_ANIMATION = 1 << 0;
+    public static final int SKIP_OVERVIEW = 1 << 1;
+    public static final int SKIP_DEPTH_CONTROLLER = 1 << 2;
 
     public long duration;
     public boolean userControlled;
-    public @AnimationFlags int animFlags = ANIM_ALL_COMPONENTS;
+    public @AnimationFlags int animFlags = PLAY_ANIMATION;
 
-    public static final int ANIM_ALL_COMPONENTS = PLAY_NON_ATOMIC | PLAY_ATOMIC_OVERVIEW_SCALE
-            | PLAY_ATOMIC_OVERVIEW_PEEK;
 
     // Various types of animation state transition
     @IntDef(value = {
@@ -126,38 +116,10 @@ public class StateAnimationConfig {
         mInterpolators[animId] = interpolator;
     }
 
-    /**
-     * @return Whether Overview is scaling as part of this animation. If this is the only
-     * component (i.e. NON_ATOMIC_COMPONENT isn't included), then this scaling is happening
-     * atomically, rather than being part of a normal state animation. StateHandlers can use
-     * this to designate part of their animation that should scale with Overview.
-     */
-    public boolean playAtomicOverviewScaleComponent() {
-        return hasAnimationFlag(StateAnimationConfig.PLAY_ATOMIC_OVERVIEW_SCALE);
-    }
-
-    /**
-     * @return Whether this animation will play atomically at the same time as a different,
-     * user-controlled state transition. StateHandlers, which contribute to both animations, can
-     * use this to avoid animating the same properties in both animations, since they'd conflict
-     * with one another.
-     */
-    public boolean onlyPlayAtomicComponent() {
-        return getAnimComponents() == StateAnimationConfig.PLAY_ATOMIC_OVERVIEW_SCALE
-                || getAnimComponents() == StateAnimationConfig.PLAY_ATOMIC_OVERVIEW_PEEK;
-    }
-
     /**
      * Returns true if the config and any of the provided component flags
      */
     public boolean hasAnimationFlag(@AnimationFlags int a) {
         return (animFlags & a) != 0;
     }
-
-    /**
-     * @return Only the flags that determine which animation components to play.
-     */
-    public @AnimationFlags int getAnimComponents() {
-        return animFlags & StateAnimationConfig.ANIM_ALL_COMPONENTS;
-    }
 }
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index 516fc74ba6..2889801a8b 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -27,30 +27,20 @@ import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_UNKNOWN_SWIPEDOWN;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_UNKNOWN_SWIPEUP;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_COMPONENTS;
-import static com.android.launcher3.states.StateAnimationConfig.PLAY_ATOMIC_OVERVIEW_SCALE;
-import static com.android.launcher3.states.StateAnimationConfig.PLAY_NON_ATOMIC;
 import static com.android.launcher3.util.DisplayController.getSingleFrameMs;
 
-import android.animation.Animator;
 import android.animation.Animator.AnimatorListener;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
 import android.animation.ValueAnimator;
-import android.os.SystemClock;
-import android.view.HapticFeedbackConstants;
 import android.view.MotionEvent;
 
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAnimUtils;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.logger.LauncherAtom;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.states.StateAnimationConfig;
-import com.android.launcher3.states.StateAnimationConfig.AnimationFlags;
 import com.android.launcher3.util.FlingBlockCheck;
 import com.android.launcher3.util.TouchController;
 
@@ -60,13 +50,6 @@ import com.android.launcher3.util.TouchController;
 public abstract class AbstractStateChangeTouchController
         implements TouchController, SingleAxisSwipeDetector.Listener {
 
-    /**
-     * Play an atomic recents animation when the progress from NORMAL to OVERVIEW reaches this.
-     * TODO: Remove the atomic animation altogether and just go to OVERVIEW directly (b/175137718).
-     */
-    public static final float ATOMIC_OVERVIEW_ANIM_THRESHOLD = 1f;
-    protected final long ATOMIC_DURATION = getAtomicDuration();
-
     protected final Launcher mLauncher;
     protected final SingleAxisSwipeDetector mDetector;
     protected final SingleAxisSwipeDetector.Direction mSwipeDirection;
@@ -89,23 +72,7 @@ public abstract class AbstractStateChangeTouchController
     private float mProgressMultiplier;
     private float mDisplacementShift;
     private boolean mCanBlockFling;
-    private FlingBlockCheck mFlingBlockCheck = new FlingBlockCheck();
-
-    protected AnimatorSet mAtomicAnim;
-    // True if we want to resume playing atomic components when mAtomicAnim completes.
-    private boolean mScheduleResumeAtomicComponent;
-    private AutoPlayAtomicAnimationInfo mAtomicAnimAutoPlayInfo;
-
-    private boolean mPassedOverviewAtomicThreshold;
-    // mAtomicAnim plays the atomic components of the state animations when we pass the threshold.
-    // However, if we reinit to transition to a new state (e.g. OVERVIEW -> ALL_APPS) before the
-    // atomic animation finishes, we only control the non-atomic components so that we don't
-    // interfere with the atomic animation. When the atomic animation ends, we start controlling
-    // the atomic components as well, using this controller.
-    private AnimatorPlaybackController mAtomicComponentsController;
-    private LauncherState mAtomicComponentsTargetState = NORMAL;
-
-    private float mAtomicComponentsStartProgress;
+    private final FlingBlockCheck mFlingBlockCheck = new FlingBlockCheck();
 
     public AbstractStateChangeTouchController(Launcher l, SingleAxisSwipeDetector.Direction dir) {
         mLauncher = l;
@@ -113,10 +80,6 @@ public abstract class AbstractStateChangeTouchController
         mSwipeDirection = dir;
     }
 
-    protected long getAtomicDuration() {
-        return 200;
-    }
-
     protected abstract boolean canInterceptTouch(MotionEvent ev);
 
     @Override
@@ -182,7 +145,7 @@ public abstract class AbstractStateChangeTouchController
     protected abstract LauncherState getTargetState(LauncherState fromState,
             boolean isDragTowardPositive);
 
-    protected abstract float initCurrentAnimation(@AnimationFlags int animComponents);
+    protected abstract float initCurrentAnimation();
 
     private boolean reinitCurrentAnimation(boolean reachedToState, boolean isDragTowardPositive) {
         LauncherState newFromState = mFromState == null ? mLauncher.getStateManager().getState()
@@ -199,28 +162,10 @@ public abstract class AbstractStateChangeTouchController
         mToState = newToState;
 
         mStartProgress = 0;
-        mPassedOverviewAtomicThreshold = false;
         if (mCurrentAnimation != null) {
             mCurrentAnimation.getTarget().removeListener(mClearStateOnCancelListener);
         }
-        int animComponents = goingBetweenNormalAndOverview(mFromState, mToState)
-                ? PLAY_NON_ATOMIC : ANIM_ALL_COMPONENTS;
-        mScheduleResumeAtomicComponent = false;
-        if (mAtomicAnim != null) {
-            animComponents = PLAY_NON_ATOMIC;
-            // Control the non-atomic components until the atomic animation finishes, then control
-            // the atomic components as well.
-            mScheduleResumeAtomicComponent = true;
-        }
-        if (goingBetweenNormalAndOverview(mFromState, mToState)
-                || mAtomicComponentsTargetState != mToState) {
-            cancelAtomicComponentsController();
-        }
-
-        if (mAtomicComponentsController != null) {
-            animComponents &= ~PLAY_ATOMIC_OVERVIEW_SCALE;
-        }
-        mProgressMultiplier = initCurrentAnimation(animComponents);
+        mProgressMultiplier = initCurrentAnimation();
         mCurrentAnimation.dispatchOnStart();
         return true;
     }
@@ -231,13 +176,6 @@ public abstract class AbstractStateChangeTouchController
     protected void onReachedFinalState(LauncherState newToState) {
     }
 
-    protected boolean goingBetweenNormalAndOverview(LauncherState fromState,
-            LauncherState toState) {
-        return (fromState == NORMAL || fromState == OVERVIEW)
-                && (toState == NORMAL || toState == OVERVIEW)
-                && mGoingBetweenStates;
-    }
-
     @Override
     public void onDragStart(boolean start, float startDisplacement) {
         mStartState = mLauncher.getStateManager().getState();
@@ -252,11 +190,6 @@ public abstract class AbstractStateChangeTouchController
         } else {
             mCurrentAnimation.pause();
             mStartProgress = mCurrentAnimation.getProgressFraction();
-
-            mAtomicAnimAutoPlayInfo = null;
-            if (mAtomicComponentsController != null) {
-                mAtomicComponentsController.pause();
-            }
         }
         mCanBlockFling = mFromState == NORMAL;
         mFlingBlockCheck.unblockFling();
@@ -310,69 +243,6 @@ public abstract class AbstractStateChangeTouchController
             return;
         }
         mCurrentAnimation.setPlayFraction(fraction);
-        if (mAtomicComponentsController != null) {
-            // Make sure we don't divide by 0, and have at least a small runway.
-            float start = Math.min(mAtomicComponentsStartProgress, 0.9f);
-            mAtomicComponentsController.setPlayFraction((fraction - start) / (1 - start));
-        }
-        maybeUpdateAtomicAnim(mFromState, mToState, fraction);
-    }
-
-    /**
-     * When going between normal and overview states, see if we passed the overview threshold and
-     * play the appropriate atomic animation if so.
-     */
-    private void maybeUpdateAtomicAnim(LauncherState fromState, LauncherState toState,
-            float progress) {
-        if (!goingBetweenNormalAndOverview(fromState, toState)) {
-            return;
-        }
-        boolean passedThreshold = progress >= ATOMIC_OVERVIEW_ANIM_THRESHOLD;
-        if (passedThreshold != mPassedOverviewAtomicThreshold) {
-            LauncherState atomicFromState = passedThreshold ? fromState: toState;
-            LauncherState atomicToState = passedThreshold ? toState : fromState;
-            mPassedOverviewAtomicThreshold = passedThreshold;
-            if (mAtomicAnim != null) {
-                mAtomicAnim.cancel();
-            }
-            mAtomicAnim = createAtomicAnimForState(atomicFromState, atomicToState, ATOMIC_DURATION);
-            mAtomicAnim.addListener(new AnimationSuccessListener() {
-                @Override
-                public void onAnimationEnd(Animator animation) {
-                    super.onAnimationEnd(animation);
-                    mAtomicAnim = null;
-                    mScheduleResumeAtomicComponent = false;
-                }
-
-                @Override
-                public void onAnimationSuccess(Animator animator) {
-                    if (!mScheduleResumeAtomicComponent) {
-                        return;
-                    }
-                    cancelAtomicComponentsController();
-
-                    if (mCurrentAnimation != null) {
-                        mAtomicComponentsStartProgress = mCurrentAnimation.getProgressFraction();
-                        long duration = (long) (getShiftRange() * 2);
-                        mAtomicComponentsController = AnimatorPlaybackController.wrap(
-                                createAtomicAnimForState(mFromState, mToState, duration), duration);
-                        mAtomicComponentsController.dispatchOnStart();
-                        mAtomicComponentsTargetState = mToState;
-                        maybeAutoPlayAtomicComponentsAnim();
-                    }
-                }
-            });
-            mAtomicAnim.start();
-            mLauncher.getDragLayer().performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY);
-        }
-    }
-
-    private AnimatorSet createAtomicAnimForState(LauncherState fromState, LauncherState targetState,
-            long duration) {
-        StateAnimationConfig config = getConfigForStates(fromState, targetState);
-        config.animFlags = PLAY_ATOMIC_OVERVIEW_SCALE;
-        config.duration = duration;
-        return mLauncher.getStateManager().createAtomicAnimation(fromState, targetState, config);
     }
 
     /**
@@ -451,59 +321,12 @@ public abstract class AbstractStateChangeTouchController
         mCurrentAnimation.setEndAction(() -> onSwipeInteractionCompleted(targetState));
         ValueAnimator anim = mCurrentAnimation.getAnimationPlayer();
         anim.setFloatValues(startProgress, endProgress);
-        maybeUpdateAtomicAnim(mFromState, targetState, targetState == mToState ? 1f : 0f);
-        updateSwipeCompleteAnimation(anim, Math.max(duration, getRemainingAtomicDuration()),
-                targetState, velocity, fling);
+        updateSwipeCompleteAnimation(anim, duration, targetState, velocity, fling);
         mCurrentAnimation.dispatchOnStart();
         if (fling && targetState == LauncherState.ALL_APPS && !UNSTABLE_SPRINGS.get()) {
             mLauncher.getAppsView().addSpringFromFlingUpdateListener(anim, velocity);
         }
         anim.start();
-        mAtomicAnimAutoPlayInfo = new AutoPlayAtomicAnimationInfo(endProgress, anim.getDuration());
-        maybeAutoPlayAtomicComponentsAnim();
-    }
-
-    /**
-     * Animates the atomic components from the current progress to the final progress.
-     *
-     * Note that this only applies when we are controlling the atomic components separately from
-     * the non-atomic components, which only happens if we reinit before the atomic animation
-     * finishes.
-     */
-    private void maybeAutoPlayAtomicComponentsAnim() {
-        if (mAtomicComponentsController == null || mAtomicAnimAutoPlayInfo == null) {
-            return;
-        }
-
-        final AnimatorPlaybackController controller = mAtomicComponentsController;
-        ValueAnimator atomicAnim = controller.getAnimationPlayer();
-        atomicAnim.setFloatValues(controller.getProgressFraction(),
-                mAtomicAnimAutoPlayInfo.toProgress);
-        long duration = mAtomicAnimAutoPlayInfo.endTime - SystemClock.elapsedRealtime();
-        mAtomicAnimAutoPlayInfo = null;
-        if (duration <= 0) {
-            atomicAnim.start();
-            atomicAnim.end();
-            mAtomicComponentsController = null;
-        } else {
-            atomicAnim.setDuration(duration);
-            atomicAnim.addListener(new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationEnd(Animator animation) {
-                    if (mAtomicComponentsController == controller) {
-                        mAtomicComponentsController = null;
-                    }
-                }
-            });
-            atomicAnim.start();
-        }
-    }
-
-    private long getRemainingAtomicDuration() {
-        if (mAtomicAnim == null) {
-            return 0;
-        }
-        return mAtomicAnim.getTotalDuration() - mAtomicAnim.getCurrentPlayTime();
     }
 
     protected void updateSwipeCompleteAnimation(ValueAnimator animator, long expectedDuration,
@@ -513,10 +336,6 @@ public abstract class AbstractStateChangeTouchController
     }
 
     protected void onSwipeInteractionCompleted(LauncherState targetState) {
-        if (mAtomicComponentsController != null) {
-            mAtomicComponentsController.getAnimationPlayer().end();
-            mAtomicComponentsController = null;
-        }
         onReachedFinalState(mToState);
         clearState();
         boolean shouldGoToTargetState = mGoingBetweenStates || (mToState != targetState);
@@ -556,37 +375,12 @@ public abstract class AbstractStateChangeTouchController
 
     protected void clearState() {
         cancelAnimationControllers();
-        if (mAtomicAnim != null) {
-            mAtomicAnim.cancel();
-            mAtomicAnim = null;
-        }
         mGoingBetweenStates = true;
-        mScheduleResumeAtomicComponent = false;
         mDetector.finishedScrolling();
         mDetector.setDetectableScrollConditions(0, false);
     }
 
     private void cancelAnimationControllers() {
         mCurrentAnimation = null;
-        cancelAtomicComponentsController();
-    }
-
-    private void cancelAtomicComponentsController() {
-        if (mAtomicComponentsController != null) {
-            mAtomicComponentsController.getAnimationPlayer().cancel();
-            mAtomicComponentsController = null;
-        }
-        mAtomicAnimAutoPlayInfo = null;
-    }
-
-    private static class AutoPlayAtomicAnimationInfo {
-
-        public final float toProgress;
-        public final long endTime;
-
-        AutoPlayAtomicAnimationInfo(float toProgress, long duration) {
-            this.toProgress = toProgress;
-            this.endTime = duration + SystemClock.elapsedRealtime();
-        }
     }
 }
diff --git a/src/com/android/launcher3/touch/AllAppsSwipeController.java b/src/com/android/launcher3/touch/AllAppsSwipeController.java
index f9dcf2d2e9..ab2652ab5e 100644
--- a/src/com/android/launcher3/touch/AllAppsSwipeController.java
+++ b/src/com/android/launcher3/touch/AllAppsSwipeController.java
@@ -23,24 +23,18 @@ import android.view.MotionEvent;
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
-import com.android.launcher3.states.StateAnimationConfig.AnimationFlags;
 
 /**
  * TouchController to switch between NORMAL and ALL_APPS state.
  */
 public class AllAppsSwipeController extends AbstractStateChangeTouchController {
 
-    private MotionEvent mTouchDownEvent;
-
     public AllAppsSwipeController(Launcher l) {
         super(l, SingleAxisSwipeDetector.VERTICAL);
     }
 
     @Override
     protected boolean canInterceptTouch(MotionEvent ev) {
-        if (ev.getAction() == MotionEvent.ACTION_DOWN) {
-            mTouchDownEvent = ev;
-        }
         if (mCurrentAnimation != null) {
             // If we are already animating from a previous state, we can intercept.
             return true;
@@ -69,11 +63,11 @@ public class AllAppsSwipeController extends AbstractStateChangeTouchController {
     }
 
     @Override
-    protected float initCurrentAnimation(@AnimationFlags int animComponents) {
+    protected float initCurrentAnimation() {
         float range = getShiftRange();
         long maxAccuracy = (long) (2 * range);
         mCurrentAnimation = mLauncher.getStateManager()
-                .createAnimationToNewWorkspace(mToState, maxAccuracy, animComponents);
+                .createAnimationToNewWorkspace(mToState, maxAccuracy);
         float startVerticalShift = mFromState.getVerticalProgress(mLauncher) * range;
         float endVerticalShift = mToState.getVerticalProgress(mLauncher) * range;
         float totalShift = endVerticalShift - startVerticalShift;
-- 
GitLab


From 52bbcc3976576127c757001485d20416c6f8b36e Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Thu, 25 Mar 2021 11:22:21 -0700
Subject: [PATCH 0792/1664] Invert StateAnimationConfig.PLAY_ANIMATION as
 SKIP_ALL_ANIMATIONS

This allows the default flag to be 0 instead of PLAY_ANIMATION, and is
aligned with the existing SKIP_OVERVIEW and SKIP_DEPTH_CONTROLLER
flags.

Test: Navigate to various states, works as before
Bug: 175137718
Change-Id: I2af1792e7fbd5bca82afb225290fd6b545368dcf
---
 .../NoButtonQuickSwitchTouchController.java            |  3 ++-
 .../com/android/quickstep/LauncherSwipeHandlerV2.java  |  3 ++-
 .../com/android/quickstep/util/OverviewToHomeAnim.java |  1 -
 .../android/quickstep/util/StaggeredWorkspaceAnim.java |  3 +--
 .../android/launcher3/statemanager/StateManager.java   | 10 +++++-----
 .../android/launcher3/states/StateAnimationConfig.java |  7 +++----
 6 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
index 4766870984..61cd13b36c 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
@@ -33,6 +33,7 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FA
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_VERTICAL_PROGRESS;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_TRANSLATE;
+import static com.android.launcher3.states.StateAnimationConfig.SKIP_ALL_ANIMATIONS;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
 import static com.android.launcher3.touch.BothAxesSwipeDetector.DIRECTION_RIGHT;
 import static com.android.launcher3.touch.BothAxesSwipeDetector.DIRECTION_UP;
@@ -372,7 +373,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
             // animation as from an app.
             StateAnimationConfig config = new StateAnimationConfig();
             // Update mNonOverviewAnim to do nothing so it doesn't interfere.
-            config.animFlags = 0;
+            config.animFlags = SKIP_ALL_ANIMATIONS;
             updateNonOverviewAnim(targetState, config);
             nonOverviewAnim = mNonOverviewAnim.getAnimationPlayer();
 
diff --git a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
index 1ce420178f..311ac83c00 100644
--- a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
+++ b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
@@ -29,6 +29,7 @@ import androidx.annotation.NonNull;
 import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.anim.AnimatorPlaybackController;
+import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.views.FloatingIconView;
 import com.android.quickstep.util.RectFSpringAnim;
 import com.android.quickstep.util.StaggeredWorkspaceAnim;
@@ -134,7 +135,7 @@ public class LauncherSwipeHandlerV2 extends
             // to home.
             long accuracy = 2 * Math.max(mDp.widthPx, mDp.heightPx);
             return mActivity.getStateManager().createAnimationToNewWorkspace(
-                    NORMAL, accuracy, 0 /* animComponents */);
+                    NORMAL, accuracy, StateAnimationConfig.SKIP_ALL_ANIMATIONS);
         }
 
         @Override
diff --git a/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java b/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
index a0ee621d49..1128dac82e 100644
--- a/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
+++ b/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
@@ -103,7 +103,6 @@ public class OverviewToHomeAnim {
 
         StateAnimationConfig config = new UseFirstInterpolatorStateAnimConfig();
         config.duration = duration;
-        config.animFlags = StateAnimationConfig.PLAY_ANIMATION;
         boolean isLayoutNaturalToLauncher = recentsView.getPagedOrientationHandler()
                 .isLayoutNaturalToLauncher();
         config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, isLayoutNaturalToLauncher
diff --git a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
index 9ec40b8c12..973759a306 100644
--- a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
+++ b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
@@ -21,7 +21,6 @@ import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
-import static com.android.launcher3.states.StateAnimationConfig.PLAY_ANIMATION;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_DEPTH_CONTROLLER;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
 
@@ -181,7 +180,7 @@ public class StaggeredWorkspaceAnim {
      */
     private void prepareToAnimate(Launcher launcher, boolean animateOverviewScrim) {
         StateAnimationConfig config = new StateAnimationConfig();
-        config.animFlags = PLAY_ANIMATION | SKIP_OVERVIEW | SKIP_DEPTH_CONTROLLER;
+        config.animFlags = SKIP_OVERVIEW | SKIP_DEPTH_CONTROLLER;
         config.duration = 0;
         // setRecentsAttachedToAppWindow() will animate recents out.
         launcher.getStateManager().createAtomicAnimation(BACKGROUND_APP, NORMAL, config).start();
diff --git a/src/com/android/launcher3/statemanager/StateManager.java b/src/com/android/launcher3/statemanager/StateManager.java
index 90a6df3556..14ef2dc652 100644
--- a/src/com/android/launcher3/statemanager/StateManager.java
+++ b/src/com/android/launcher3/statemanager/StateManager.java
@@ -18,7 +18,7 @@ package com.android.launcher3.statemanager;
 
 import static android.animation.ValueAnimator.areAnimatorsEnabled;
 
-import static com.android.launcher3.states.StateAnimationConfig.PLAY_ANIMATION;
+import static com.android.launcher3.states.StateAnimationConfig.SKIP_ALL_ANIMATIONS;
 
 import android.animation.Animator;
 import android.animation.Animator.AnimatorListener;
@@ -289,14 +289,14 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
      */
     public AnimatorPlaybackController createAnimationToNewWorkspace(
             STATE_TYPE state, long duration) {
-        return createAnimationToNewWorkspace(state, duration, PLAY_ANIMATION);
+        return createAnimationToNewWorkspace(state, duration, 0 /* animFlags */);
     }
 
     public AnimatorPlaybackController createAnimationToNewWorkspace(
-            STATE_TYPE state, long duration, @AnimationFlags int animComponents) {
+            STATE_TYPE state, long duration, @AnimationFlags int animFlags) {
         StateAnimationConfig config = new StateAnimationConfig();
         config.duration = duration;
-        config.animFlags = animComponents;
+        config.animFlags = animFlags;
         return createAnimationToNewWorkspace(state, config);
     }
 
@@ -312,7 +312,7 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
 
     private PendingAnimation createAnimationToNewWorkspaceInternal(final STATE_TYPE state) {
         PendingAnimation builder = new PendingAnimation(mConfig.duration);
-        if (mConfig.hasAnimationFlag(PLAY_ANIMATION)) {
+        if (!mConfig.hasAnimationFlag(SKIP_ALL_ANIMATIONS)) {
             for (StateHandler handler : getStateHandlers()) {
                 handler.setStateWithAnimation(state, mConfig, builder);
             }
diff --git a/src/com/android/launcher3/states/StateAnimationConfig.java b/src/com/android/launcher3/states/StateAnimationConfig.java
index 20457334c3..8e7dcc098b 100644
--- a/src/com/android/launcher3/states/StateAnimationConfig.java
+++ b/src/com/android/launcher3/states/StateAnimationConfig.java
@@ -28,20 +28,19 @@ import java.lang.annotation.RetentionPolicy;
 public class StateAnimationConfig {
 
     @IntDef(flag = true, value = {
-            PLAY_ANIMATION,
+            SKIP_ALL_ANIMATIONS,
             SKIP_OVERVIEW,
             SKIP_DEPTH_CONTROLLER,
     })
     @Retention(RetentionPolicy.SOURCE)
     public @interface AnimationFlags {}
-    // TODO: make this the default; invert this to be SKIP_ALL_ANIMATIONS
-    public static final int PLAY_ANIMATION = 1 << 0;
+    public static final int SKIP_ALL_ANIMATIONS = 1 << 0;
     public static final int SKIP_OVERVIEW = 1 << 1;
     public static final int SKIP_DEPTH_CONTROLLER = 1 << 2;
 
     public long duration;
     public boolean userControlled;
-    public @AnimationFlags int animFlags = PLAY_ANIMATION;
+    public @AnimationFlags int animFlags = 0;
 
 
     // Various types of animation state transition
-- 
GitLab


From c5797893e7327d300b6c9549ab6d93d6d7a0e387 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Mon, 29 Mar 2021 12:26:05 -0700
Subject: [PATCH 0793/1664] Using edgeEffect for overscroll in all-apps and
 widget tray

Bug: 183966408
Test: Manual
Change-Id: Iea1b67504fc59fc7ce2ec657bf8ac7e3d8bfff1c
---
 .../allapps/AllAppsContainerView.java         |  28 +--
 .../launcher3/views/SpringRelativeLayout.java | 179 ++++++++----------
 .../widget/picker/WidgetsFullSheet.java       |   5 -
 3 files changed, 78 insertions(+), 134 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index bf0a88f33f..60dd77435d 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -77,7 +77,7 @@ import com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip.OnActivePag
 public class AllAppsContainerView extends SpringRelativeLayout implements DragSource,
         Insettable, OnDeviceProfileChangeListener, OnActivePageChangedListener {
 
-    private static final float FLING_VELOCITY_MULTIPLIER = 135f;
+    private static final float FLING_VELOCITY_MULTIPLIER = 1000 * .8f;
     // Starts the springs after at least 55% of the animation has passed.
     private static final float FLING_ANIMATION_THRESHOLD = 0.55f;
     private static final int ALPHA_CHANNEL_COUNT = 2;
@@ -140,12 +140,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
 
         mAllAppsStore.addUpdateListener(this::onAppsUpdated);
 
-        addSpringView(R.id.all_apps_header);
-        addSpringView(R.id.apps_list_view);
-        addSpringView(R.id.all_apps_tabs_view_pager);
-
         mMultiValueAlpha = new MultiValueAlpha(this, ALPHA_CHANNEL_COUNT);
-
     }
 
     /**
@@ -169,14 +164,6 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         return mWorkModeSwitch;
     }
 
-
-    @Override
-    protected void setDampedScrollShift(float shift) {
-        // Bound the shift amount to avoid content from drawing on top (Y-val) of the QSB.
-        float maxShift = getSearchView().getHeight() / 2f;
-        super.setDampedScrollShift(Utilities.boundToRange(shift, -maxShift, maxShift));
-    }
-
     @Override
     public void onDeviceProfileChanged(DeviceProfile dp) {
         for (AdapterHolder holder : mAH) {
@@ -407,12 +394,6 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         }
     }
 
-    @Override
-    public int getCanvasClipTopForOverscroll() {
-        // Do not clip if the QSB is attached to the spring, otherwise the QSB will get clipped.
-        return mSpringViews.get(getSearchView().getId()) ? 0 : mHeader.getTop();
-    }
-
     private void rebindAdapters(boolean showTabs) {
         rebindAdapters(showTabs, false /* force */);
     }
@@ -639,11 +620,8 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
             public void onAnimationUpdate(ValueAnimator valueAnimator) {
                 if (shouldSpring
                         && valueAnimator.getAnimatedFraction() >= FLING_ANIMATION_THRESHOLD) {
-                    int searchViewId = getSearchView().getId();
-                    addSpringView(searchViewId);
-                    finishWithShiftAndVelocity(1, velocity * FLING_VELOCITY_MULTIPLIER,
-                            (anim, canceled, value, velocity) -> removeSpringView(searchViewId));
-
+                    absorbSwipeUpVelocity(Math.abs(
+                            Math.round(velocity * FLING_VELOCITY_MULTIPLIER)));
                     shouldSpring = false;
                 }
             }
diff --git a/src/com/android/launcher3/views/SpringRelativeLayout.java b/src/com/android/launcher3/views/SpringRelativeLayout.java
index d0ec9d7e08..9701389f91 100644
--- a/src/com/android/launcher3/views/SpringRelativeLayout.java
+++ b/src/com/android/launcher3/views/SpringRelativeLayout.java
@@ -15,51 +15,25 @@
  */
 package com.android.launcher3.views;
 
-import static androidx.dynamicanimation.animation.SpringForce.DAMPING_RATIO_MEDIUM_BOUNCY;
-import static androidx.dynamicanimation.animation.SpringForce.STIFFNESS_LOW;
-import static androidx.dynamicanimation.animation.SpringForce.STIFFNESS_MEDIUM;
-
 import android.content.Context;
 import android.graphics.Canvas;
 import android.util.AttributeSet;
-import android.util.SparseBooleanArray;
-import android.view.View;
 import android.widget.EdgeEffect;
 import android.widget.RelativeLayout;
 
 import androidx.annotation.NonNull;
-import androidx.dynamicanimation.animation.DynamicAnimation;
-import androidx.dynamicanimation.animation.FloatPropertyCompat;
-import androidx.dynamicanimation.animation.SpringAnimation;
-import androidx.dynamicanimation.animation.SpringForce;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory;
 
-public class SpringRelativeLayout extends RelativeLayout {
-
-    private static final float STIFFNESS = (STIFFNESS_MEDIUM + STIFFNESS_LOW) / 2;
-    private static final float DAMPING_RATIO = DAMPING_RATIO_MEDIUM_BOUNCY;
-    private static final float VELOCITY_MULTIPLIER = 0.3f;
-
-    private static final FloatPropertyCompat<SpringRelativeLayout> DAMPED_SCROLL =
-            new FloatPropertyCompat<SpringRelativeLayout>("value") {
-
-                @Override
-                public float getValue(SpringRelativeLayout object) {
-                    return object.mDampedScrollShift;
-                }
-
-                @Override
-                public void setValue(SpringRelativeLayout object, float value) {
-                    object.setDampedScrollShift(value);
-                }
-            };
+import com.android.launcher3.Utilities;
 
-    protected final SparseBooleanArray mSpringViews = new SparseBooleanArray();
-    private final SpringAnimation mSpring;
+/**
+ * View group to allow rendering overscroll effect in a child at the parent level
+ */
+public class SpringRelativeLayout extends RelativeLayout {
 
-    private float mDampedScrollShift = 0;
-    private SpringEdgeEffect mActiveEdge;
+    private final EdgeEffect mEdgeGlowTop;
+    private final EdgeEffect mEdgeGlowBottom;
 
     public SpringRelativeLayout(Context context) {
         this(context, null);
@@ -71,98 +45,73 @@ public class SpringRelativeLayout extends RelativeLayout {
 
     public SpringRelativeLayout(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        mSpring = new SpringAnimation(this, DAMPED_SCROLL, 0);
-        mSpring.setSpring(new SpringForce(0)
-                .setStiffness(STIFFNESS)
-                .setDampingRatio(DAMPING_RATIO));
-    }
-
-    public void addSpringView(int id) {
-        mSpringViews.put(id, true);
-    }
-
-    public void removeSpringView(int id) {
-        mSpringViews.delete(id);
-        invalidate();
-    }
-
-    /**
-     * Used to clip the canvas when drawing child views during overscroll.
-     */
-    public int getCanvasClipTopForOverscroll() {
-        return 0;
+        mEdgeGlowTop = Utilities.ATLEAST_S
+                ? new EdgeEffect(context, attrs) : new EdgeEffect(context);
+        mEdgeGlowBottom = Utilities.ATLEAST_S
+                ? new EdgeEffect(context, attrs) : new EdgeEffect(context);
+        setWillNotDraw(false);
     }
 
     @Override
-    protected boolean drawChild(Canvas canvas, View child, long drawingTime) {
-        if (mDampedScrollShift != 0 && mSpringViews.get(child.getId())) {
-            int saveCount = canvas.save();
-
-            canvas.clipRect(0, getCanvasClipTopForOverscroll(), getWidth(), getHeight());
-            canvas.translate(0, mDampedScrollShift);
-            boolean result = super.drawChild(canvas, child, drawingTime);
-
-            canvas.restoreToCount(saveCount);
-
-            return result;
-        }
-        return super.drawChild(canvas, child, drawingTime);
-    }
-
-    private void setActiveEdge(SpringEdgeEffect edge) {
-        if (mActiveEdge != edge && mActiveEdge != null) {
-            mActiveEdge.mDistance = 0;
+    public void draw(Canvas canvas) {
+        super.draw(canvas);
+        if (!mEdgeGlowTop.isFinished()) {
+            final int restoreCount = canvas.save();
+            canvas.translate(0, 0);
+            mEdgeGlowTop.setSize(getWidth(), getHeight());
+            if (mEdgeGlowTop.draw(canvas)) {
+                postInvalidateOnAnimation();
+            }
+            canvas.restoreToCount(restoreCount);
         }
-        mActiveEdge = edge;
-    }
-
-    protected void setDampedScrollShift(float shift) {
-        if (shift != mDampedScrollShift) {
-            mDampedScrollShift = shift;
-            invalidate();
+        if (!mEdgeGlowBottom.isFinished()) {
+            final int restoreCount = canvas.save();
+            final int width = getWidth();
+            final int height = getHeight();
+            canvas.translate(-width, height);
+            canvas.rotate(180, width, 0);
+            mEdgeGlowBottom.setSize(width, height);
+            if (mEdgeGlowBottom.draw(canvas)) {
+                postInvalidateOnAnimation();
+            }
+            canvas.restoreToCount(restoreCount);
         }
     }
 
-    private void finishScrollWithVelocity(float velocity) {
-        mSpring.setStartVelocity(velocity);
-        mSpring.setStartValue(mDampedScrollShift);
-        mSpring.start();
-    }
 
-    protected void finishWithShiftAndVelocity(float shift, float velocity,
-            DynamicAnimation.OnAnimationEndListener listener) {
-        setDampedScrollShift(shift);
-        mSpring.addEndListener(listener);
-        finishScrollWithVelocity(velocity);
+    /**
+     * Absorbs the velocity as a result for swipe-up fling
+     */
+    protected void absorbSwipeUpVelocity(int velocity) {
+        mEdgeGlowBottom.onAbsorb(velocity);
+        invalidate();
     }
 
     public EdgeEffectFactory createEdgeEffectFactory() {
-        return new SpringEdgeEffectFactory();
+        return new ProxyEdgeEffectFactory();
     }
 
-    private class SpringEdgeEffectFactory extends EdgeEffectFactory {
+    private class ProxyEdgeEffectFactory extends EdgeEffectFactory {
 
         @NonNull @Override
         protected EdgeEffect createEdgeEffect(RecyclerView view, int direction) {
             switch (direction) {
                 case DIRECTION_TOP:
-                    return new SpringEdgeEffect(getContext(), +VELOCITY_MULTIPLIER);
+                    return new EdgeEffectProxy(getContext(), mEdgeGlowTop);
                 case DIRECTION_BOTTOM:
-                    return new SpringEdgeEffect(getContext(), -VELOCITY_MULTIPLIER);
+                    return new EdgeEffectProxy(getContext(), mEdgeGlowBottom);
             }
             return super.createEdgeEffect(view, direction);
         }
     }
 
-    private class SpringEdgeEffect extends EdgeEffect {
+    private class EdgeEffectProxy extends EdgeEffect {
 
-        private final float mVelocityMultiplier;
+        private final EdgeEffect mParent;
 
-        private float mDistance;
-
-        public SpringEdgeEffect(Context context, float velocityMultiplier) {
+        EdgeEffectProxy(Context context, EdgeEffect parent) {
             super(context);
-            mVelocityMultiplier = velocityMultiplier;
+            mParent = parent;
         }
 
         @Override
@@ -170,22 +119,44 @@ public class SpringRelativeLayout extends RelativeLayout {
             return false;
         }
 
+        private void invalidateParentScrollEffect() {
+            if (!mParent.isFinished()) {
+                invalidate();
+            }
+        }
+
         @Override
         public void onAbsorb(int velocity) {
-            finishScrollWithVelocity(velocity * mVelocityMultiplier);
+            mParent.onAbsorb(velocity);
+            invalidateParentScrollEffect();
+        }
+
+        @Override
+        public void onPull(float deltaDistance) {
+            mParent.onPull(deltaDistance);
+            invalidateParentScrollEffect();
         }
 
         @Override
         public void onPull(float deltaDistance, float displacement) {
-            setActiveEdge(this);
-            mDistance += deltaDistance * (mVelocityMultiplier / 3f);
-            setDampedScrollShift(mDistance * getHeight());
+            mParent.onPull(deltaDistance, displacement);
+            invalidateParentScrollEffect();
         }
 
         @Override
         public void onRelease() {
-            mDistance = 0;
-            finishScrollWithVelocity(0);
+            mParent.onRelease();
+            invalidateParentScrollEffect();
+        }
+
+        @Override
+        public void finish() {
+            mParent.finish();
+        }
+
+        @Override
+        public boolean isFinished() {
+            return mParent.isFinished();
         }
     }
 }
\ No newline at end of file
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 29c00b209f..d13884ad9e 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -144,17 +144,12 @@ public class WidgetsFullSheet extends BaseWidgetSheet
             findViewById(R.id.tab_work)
                     .setOnClickListener((View view) -> mViewPager.snapToPage(1));
             fastScroller.setIsRecyclerViewFirstChildInParent(false);
-            springLayout.addSpringView(R.id.primary_widgets_list_view);
-            springLayout.addSpringView(R.id.work_widgets_list_view);
         } else {
             mViewPager = null;
-            springLayout.addSpringView(R.id.primary_widgets_list_view);
         }
 
         layoutInflater.inflate(R.layout.widgets_full_sheet_search_and_recommendations, springLayout,
                 true);
-        springLayout.addSpringView(R.id.search_and_recommendations_container);
-
         mSearchAndRecommendationViewHolder = new SearchAndRecommendationViewHolder(
                 findViewById(R.id.search_and_recommendations_container));
         mSearchAndRecommendationsScrollController = new SearchAndRecommendationsScrollController(
-- 
GitLab


From 3a4ba0bec3b2724534c8b587e2fead05cd3039bd Mon Sep 17 00:00:00 2001
From: Andras Kloczl <andraskloczl@google.com>
Date: Mon, 29 Mar 2021 18:47:14 +0200
Subject: [PATCH 0794/1664] Fix two panel home folder opening display issue

Change the rect calculation logic that is used to
display an opening folder. If multiple panels are
displayed then we calculate the union of the pages.

Test: manual
Bug: 181962118
Change-Id: I504f22890115ceebc16d60929149fe634bf820d0
---
 src/com/android/launcher3/Launcher.java  |  4 +---
 src/com/android/launcher3/Workspace.java | 24 +++++++++++++++++-------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 8785fbc2b9..5eba39927f 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1781,9 +1781,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     @Override
     public Rect getFolderBoundingBox() {
         // We need to bound the folder to the currently visible workspace area
-        Rect folderBoundingBox = new Rect();
-        getWorkspace().getPageAreaRelativeToDragLayer(folderBoundingBox);
-        return folderBoundingBox;
+        return getWorkspace().getPageAreaRelativeToDragLayer();
     }
 
     @Override
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index bd173481b7..48638f59f7 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2000,16 +2000,26 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
     }
 
     /**
-     * Computes the area relative to dragLayer which is used to display a page.
+     * Computes and returns the area relative to dragLayer which is used to display a page.
+     * In case we have multiple pages displayed at the same time, we return the union of the areas.
      */
-    public void getPageAreaRelativeToDragLayer(Rect outArea) {
-        CellLayout child = (CellLayout) getChildAt(getNextPage());
-        if (child == null) {
-            return;
+    public Rect getPageAreaRelativeToDragLayer() {
+        Rect area = new Rect();
+        int nextPage = getNextPage();
+        int panelCount = getPanelCount();
+        for (int page = nextPage; page < nextPage + panelCount; page++) {
+            CellLayout child = (CellLayout) getChildAt(page);
+            if (child == null) {
+                break;
+            }
+
+            ShortcutAndWidgetContainer boundingLayout = child.getShortcutsAndWidgets();
+            Rect tmpRect = new Rect();
+            mLauncher.getDragLayer().getDescendantRectRelativeToSelf(boundingLayout, tmpRect);
+            area.union(tmpRect);
         }
 
-        ShortcutAndWidgetContainer boundingLayout = child.getShortcutsAndWidgets();
-        mLauncher.getDragLayer().getDescendantRectRelativeToSelf(boundingLayout, outArea);
+        return area;
     }
 
     @Override
-- 
GitLab


From 1b54846254020aa92e381f7d711b38beda58f1c1 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Mon, 29 Mar 2021 14:47:06 -0700
Subject: [PATCH 0795/1664] Fixing a leak in WallpaperColorInfo

Nulling temp listeners after use

Test: presubmit
Bug: 181356264
Change-Id: I6cace47f1424e2fe59a283bb0e16de523875b6cf
---
 .../com/android/launcher3/uioverrides/WallpaperColorInfo.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/WallpaperColorInfo.java b/quickstep/src/com/android/launcher3/uioverrides/WallpaperColorInfo.java
index 36c0e342c1..1417995057 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/WallpaperColorInfo.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/WallpaperColorInfo.java
@@ -102,9 +102,11 @@ public class WallpaperColorInfo implements OnColorsChangedListener {
     private void notifyChange() {
         // Create a new array to avoid concurrent modification when the activity destroys itself.
         mTempListeners = mListeners.toArray(mTempListeners);
-        for (OnChangeListener listener : mTempListeners) {
+        for (int i = mTempListeners.length - 1; i >= 0; --i) {
+            final OnChangeListener listener = mTempListeners[i];
             if (listener != null) {
                 listener.onExtractedColorsChanged(this);
+                mTempListeners[i] = null;
             }
         }
     }
-- 
GitLab


From b5c4d1108fade5e0dd0c74a7c39e87dfd6334a29 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Mon, 29 Mar 2021 17:37:53 +0100
Subject: [PATCH 0796/1664] Changes page alignment in PagedView calcualtion

- Align pages to right (instead of left) in RTL, to make scroll calculation for grid overview easier for out of orientation tasks
- Changed TaskView pivot direction to be consistent with page alignment
- Add scroll offset for ClearAllButton to align to left in RTL
- Fixed Workspace scroll issues in RTL, and removed needs to use panelCount when calculating page scroll

Bug: 175939487
Test: Test carousel/grid overveiw, Workspace, Folder scroll view for normal/RTL
Change-Id: Ic0ba88e5d58638e1149d97a68a978d80fbf26774
---
 .../quickstep/views/ClearAllButton.java       | 12 +++++------
 .../android/quickstep/views/RecentsView.java  | 15 +++++---------
 .../com/android/quickstep/views/TaskView.java | 20 ++++---------------
 src/com/android/launcher3/PagedView.java      | 11 ++++------
 4 files changed, 18 insertions(+), 40 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/ClearAllButton.java b/quickstep/src/com/android/quickstep/views/ClearAllButton.java
index 12b59d0817..ff78995a1c 100644
--- a/quickstep/src/com/android/quickstep/views/ClearAllButton.java
+++ b/quickstep/src/com/android/quickstep/views/ClearAllButton.java
@@ -52,7 +52,7 @@ public class ClearAllButton extends Button implements PageCallbacks {
     private float mGridTranslationPrimary;
     private float mGridTranslationSecondary;
     private float mGridScrollOffset;
-    private float mOffsetTranslationPrimary;
+    private float mScrollOffsetPrimary;
 
     private int mSidePadding;
 
@@ -144,9 +144,8 @@ public class ClearAllButton extends Button implements PageCallbacks {
         mGridScrollOffset = gridScrollOffset;
     }
 
-    public void setOffsetTranslationPrimary(float offsetTranslationPrimary) {
-        mOffsetTranslationPrimary = offsetTranslationPrimary;
-        applyPrimaryTranslation();
+    public void setScrollOffsetPrimary(float scrollOffsetPrimary) {
+        mScrollOffsetPrimary = scrollOffsetPrimary;
     }
 
     public float getScrollAdjustment(boolean gridEnabled) {
@@ -154,7 +153,7 @@ public class ClearAllButton extends Button implements PageCallbacks {
         if (gridEnabled) {
             scrollAdjustment += mGridTranslationPrimary + mGridScrollOffset;
         }
-        scrollAdjustment += mOffsetTranslationPrimary;
+        scrollAdjustment += mScrollOffsetPrimary;
         return scrollAdjustment;
     }
 
@@ -181,8 +180,7 @@ public class ClearAllButton extends Button implements PageCallbacks {
         PagedOrientationHandler orientationHandler = recentsView.getPagedOrientationHandler();
         orientationHandler.getPrimaryViewTranslate().set(this,
                 orientationHandler.getPrimaryValue(0f, getOriginalTranslationY())
-                        + mNormalTranslationPrimary + mOffsetTranslationPrimary + getGridTrans(
-                        mGridTranslationPrimary));
+                        + mNormalTranslationPrimary + getGridTrans(mGridTranslationPrimary));
     }
 
     private void applySecondaryTranslation() {
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index a35580f2bb..ad266ce542 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1192,7 +1192,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             // Compensate page spacing widening caused by RecentsView scaling.
             widthDiff += mPageSpacing * (1 - 1 / mFullscreenScale);
             float fullscreenTranslationX = mIsRtl ? widthDiff : -widthDiff;
-            fullscreenTranslations[i] += fullscreenTranslationX;
             accumulatedTranslationX += fullscreenTranslationX;
         }
 
@@ -1203,6 +1202,11 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                     fullscreenTranslations[i] - fullscreenTranslations[firstNonHomeTaskIndex]);
         }
 
+        // Align ClearAllButton to the left (RTL) or right (non-RTL), which is different from other
+        // TaskViews.
+        int clearAllWidthDiff = mTaskWidth - mClearAllButton.getWidth();
+        mClearAllButton.setScrollOffsetPrimary(mIsRtl ? clearAllWidthDiff : -clearAllWidthDiff);
+
         updateGridProperties(false);
     }
 
@@ -1746,20 +1750,12 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             }
         }
 
-        // If the first non-home task does not take full width of task Rect, shift all tasks
-        // accordingly without affecting scrolls.
-        int firstTaskWidth = getTaskViewAt(firstNonHomeTaskIndex).getLayoutParams().width;
-        float firstNonHomeTaskOffset = firstTaskWidth == ViewGroup.LayoutParams.MATCH_PARENT ? 0
-                : mTaskWidth - firstTaskWidth;
-        float offsetTranslation = mIsRtl ? firstNonHomeTaskOffset : -firstNonHomeTaskOffset;
-
         // We need to maintain first non-home task's grid translation at 0, now shift translation
         // of all the TaskViews to achieve that.
         for (int i = firstNonHomeTaskIndex; i < taskCount; i++) {
             TaskView taskView = getTaskViewAt(i);
             taskView.setGridTranslationX(
                     gridTranslations[i] - gridTranslations[firstNonHomeTaskIndex]);
-            taskView.setGridOffsetTranslationX(offsetTranslation);
         }
 
         // Use the accumulated translation of the longer row.
@@ -1803,7 +1799,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mClearAllButton.setGridScrollOffset(
                 mIsRtl ? mLastComputedTaskSize.left - mLastComputedGridSize.left
                         : mLastComputedTaskSize.right - mLastComputedGridSize.right);
-        mClearAllButton.setOffsetTranslationPrimary(offsetTranslation);
 
         setGridProgress(mGridProgress);
     }
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index d497a96edb..21b11644d2 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -295,8 +295,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     // The following grid translations scales with mGridProgress.
     private float mGridTranslationX;
     private float mGridTranslationY;
-    // Offset translation does not affect scroll calculation.
-    private float mGridOffsetTranslationX;
 
     private ObjectAnimator mIconAndDimAnimator;
     private float mIconScaleAnimStartProgress = 0;
@@ -792,8 +790,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
 
     @Override
     public void onRecycle() {
-        mFullscreenTranslationX = mGridTranslationX =
-                mGridTranslationY = mGridOffsetTranslationX = mBoxTranslationY = 0f;
+        mFullscreenTranslationX = mGridTranslationX = mGridTranslationY = mBoxTranslationY = 0f;
         resetViewTransforms();
         // Clear any references to the thumbnail (it will be re-read either from the cache or the
         // system on next bind)
@@ -874,7 +871,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
         super.onLayout(changed, left, top, right, bottom);
         if (mActivity.getDeviceProfile().isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get()) {
-            setPivotX(getLayoutDirection() == LAYOUT_DIRECTION_RTL ? (right - left) : 0);
+            setPivotX(getLayoutDirection() == LAYOUT_DIRECTION_RTL ? 0 : right - left);
             setPivotY(mSnapshotView.getTop());
         } else {
             setPivotX((right - left) * 0.5f);
@@ -979,11 +976,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         return mGridTranslationY;
     }
 
-    public void setGridOffsetTranslationX(float gridOffsetTranslationX) {
-        mGridOffsetTranslationX = gridOffsetTranslationX;
-        applyTranslationX();
-    }
-
     public float getScrollAdjustment(boolean fullscreenEnabled, boolean gridEnabled) {
         float scrollAdjustment = 0;
         if (fullscreenEnabled) {
@@ -996,11 +988,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     }
 
     public float getOffsetAdjustment(boolean fullscreenEnabled,boolean gridEnabled) {
-        float offsetAdjustment = getScrollAdjustment(fullscreenEnabled, gridEnabled);
-        if (gridEnabled) {
-            offsetAdjustment += mGridOffsetTranslationX;
-        }
-        return offsetAdjustment;
+        return getScrollAdjustment(fullscreenEnabled, gridEnabled);
     }
 
     public float getSizeAdjustment(boolean fullscreenEnabled) {
@@ -1019,7 +1007,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     private void applyTranslationX() {
         setTranslationX(mDismissTranslationX + mTaskOffsetTranslationX + mTaskResistanceTranslationX
                 + getFullscreenTrans(mFullscreenTranslationX)
-                + getGridTrans(mGridTranslationX + mGridOffsetTranslationX));
+                + getGridTrans(mGridTranslationX));
     }
 
     private void applyTranslationY() {
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 76885ccbc8..01f7c71daf 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -715,13 +715,10 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
                 final int primaryDimension = bounds.primaryDimension;
                 final int childPrimaryEnd = bounds.childPrimaryEnd;
 
-                // In case the pages are of different width, align the page to left or right edge
-                // based on the orientation.
-                // In case we have multiple panels on the screen, scrollOffsetEnd is the scroll
-                // needed for the whole visible area, so we have to divide it by panelCount.
-                final int pageScroll = mIsRtl
-                        ? (childStart - scrollOffsetStart)
-                        : Math.max(0, childPrimaryEnd - scrollOffsetEnd / getPanelCount());
+                // In case the pages are of different width, align the page to left edge for non-RTL
+                // or right edge for RTL.
+                final int pageScroll =
+                        mIsRtl ? childPrimaryEnd - scrollOffsetEnd : childStart - scrollOffsetStart;
                 if (outPageScrolls[i] != pageScroll) {
                     pageScrollChanged = true;
                     outPageScrolls[i] = pageScroll;
-- 
GitLab


From ec1277eec1f0691fca1ced0eb107f1417a66a1fa Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Thu, 25 Mar 2021 10:41:54 -0400
Subject: [PATCH 0797/1664] Migrate existing 4x5 and 4x4 grid users to a new
 4x5 grid.

Due to the dogfood 4x5 grid using the wrong db, there may
be some rearranging of items.

The goal is to completely remove the old 4x4 and 4x5 grid,
but first we need to silently migrate users to the new grid.

We still  need to keep the old grids in the device profile
so we hide them from the Styles & Wallpaper app.

We also need to reset and remove the ENABLE_FOUR_COLUMN feature
flag from the UI.

- Added TODO to remove this logic in the tracking doc

Bug: 183965808
Bug: 175329686
Test: have old 4x4 or 4x5 grid set up
      install apk with these changes
      confirm that we are now using the new grid and the
      other grid options are inaccessible to the user
Change-Id: I81a91b8415effbe0bf7ba722f11ab44a4169e3df
---
 res/values/attrs.xml                          |  3 ++
 src/com/android/launcher3/CellLayout.java     |  3 +-
 .../launcher3/InvariantDeviceProfile.java     |  4 +++
 .../android/launcher3/LauncherAppState.java   | 35 +++++++++++++++++--
 src/com/android/launcher3/LauncherFiles.java  |  2 ++
 .../launcher3/config/FeatureFlags.java        | 17 ++++++++-
 .../graphics/GridCustomizationsProvider.java  |  5 ++-
 7 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index fc2b4bc5f9..99f6c7584b 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -132,6 +132,9 @@
         <attr name="isScalable" format="boolean" />
         <attr name="devicePaddingId" format="reference" />
 
+        <!-- whether the grid option is shown to the user -->
+        <attr name="visible" format="boolean" />
+
     </declare-styleable>
 
     <declare-styleable name="DevicePadding">
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 9df8d44d58..7ece72e4a3 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -19,7 +19,6 @@ package com.android.launcher3;
 import static android.animation.ValueAnimator.areAnimatorsEnabled;
 
 import static com.android.launcher3.anim.Interpolators.DEACCEL_1_5;
-import static com.android.launcher3.config.FeatureFlags.ENABLE_FOUR_COLUMNS;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -602,7 +601,7 @@ public class CellLayout extends ViewGroup {
         if (child instanceof BubbleTextView) {
             BubbleTextView bubbleChild = (BubbleTextView) child;
             bubbleChild.setTextVisibility(mContainerType != HOTSEAT);
-            if (ENABLE_FOUR_COLUMNS.get()) {
+            if (mActivity.getDeviceProfile().isScalableGrid) {
                 bubbleChild.setCenterVertically(mContainerType != HOTSEAT);
             }
         }
diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index b0c3bb4e81..754e988da6 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -626,6 +626,8 @@ public class InvariantDeviceProfile {
         private final boolean isScalable;
         private final int devicePaddingId;
 
+        public final boolean visible;
+
         private final SparseArray<TypedValue> extraAttrs;
 
         public GridOption(Context context, AttributeSet attrs) {
@@ -652,6 +654,8 @@ public class InvariantDeviceProfile {
             devicePaddingId = a.getResourceId(
                     R.styleable.GridDisplayOption_devicePaddingId, 0);
 
+            visible = a.getBoolean(R.styleable.GridDisplayOption_visible, true);
+
             a.recycle();
 
             extraAttrs = Themes.createValueMap(context, attrs,
diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index 57d76005a6..ccc023ab76 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -17,8 +17,11 @@
 package com.android.launcher3;
 
 import static com.android.launcher3.InvariantDeviceProfile.CHANGE_FLAG_ICON_PARAMS;
-import static com.android.launcher3.util.SettingsCache.NOTIFICATION_BADGING_URI;
+import static com.android.launcher3.InvariantDeviceProfile.KEY_MIGRATION_SRC_HOTSEAT_COUNT;
+import static com.android.launcher3.InvariantDeviceProfile.KEY_MIGRATION_SRC_WORKSPACE_SIZE;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_FOUR_COLUMNS;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
+import static com.android.launcher3.util.SettingsCache.NOTIFICATION_BADGING_URI;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -37,10 +40,10 @@ import com.android.launcher3.notification.NotificationListener;
 import com.android.launcher3.pm.InstallSessionHelper;
 import com.android.launcher3.pm.InstallSessionTracker;
 import com.android.launcher3.pm.UserCache;
-import com.android.launcher3.util.SettingsCache;
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.launcher3.util.Preconditions;
 import com.android.launcher3.util.SafeCloseable;
+import com.android.launcher3.util.SettingsCache;
 import com.android.launcher3.util.SimpleBroadcastReceiver;
 import com.android.launcher3.widget.custom.CustomWidgetManager;
 
@@ -122,6 +125,34 @@ public class LauncherAppState {
         mContext = context;
 
         mInvariantDeviceProfile = InvariantDeviceProfile.INSTANCE.get(context);
+
+        // b/175329686 Temporary logic to gracefully migrate group of users to the new 4x5 grid.
+        String gridName = InvariantDeviceProfile.getCurrentGridName(context);
+        if (ENABLE_FOUR_COLUMNS.get()
+                || "reasonable".equals(gridName)
+                || ENABLE_FOUR_COLUMNS.key.equals(gridName)) {
+            // Reset flag and remove it from developer options to prevent it from being enabled
+            // again.
+            ENABLE_FOUR_COLUMNS.reset(context);
+            FeatureFlags.removeFlag(ENABLE_FOUR_COLUMNS);
+
+            // Force migration code to run
+            Utilities.getPrefs(context).edit()
+                    .remove(KEY_MIGRATION_SRC_HOTSEAT_COUNT)
+                    .remove(KEY_MIGRATION_SRC_WORKSPACE_SIZE)
+                    .apply();
+
+            // We make an empty call here to ensure the database is created with the old IDP grid,
+            // so that when we set the new grid the migration can proceeds as expected.
+            LauncherSettings.Settings.call(context.getContentResolver(), "");
+
+            String newGridName = "practical";
+            Utilities.getPrefs(mContext).edit().putString("idp_grid_name", newGridName).commit();
+            mInvariantDeviceProfile.setCurrentGrid(context, "practical");
+        } else {
+            FeatureFlags.removeFlag(ENABLE_FOUR_COLUMNS);
+        }
+
         mIconCache = new IconCache(mContext, mInvariantDeviceProfile, iconCacheFileName);
         mWidgetCache = new WidgetPreviewLoader(mContext, mIconCache);
         mModel = new LauncherModel(context, this, mIconCache, new AppFilter(mContext));
diff --git a/src/com/android/launcher3/LauncherFiles.java b/src/com/android/launcher3/LauncherFiles.java
index 25afb55472..6c0daa4da9 100644
--- a/src/com/android/launcher3/LauncherFiles.java
+++ b/src/com/android/launcher3/LauncherFiles.java
@@ -15,6 +15,7 @@ public class LauncherFiles {
     private static final String XML = ".xml";
 
     public static final String LAUNCHER_DB = "launcher.db";
+    public static final String LAUNCHER_4_BY_5_DB = "launcher_4_by_5.db";
     public static final String LAUNCHER_4_BY_4_DB = "launcher_4_by_4.db";
     public static final String LAUNCHER_3_BY_3_DB = "launcher_3_by_3.db";
     public static final String LAUNCHER_2_BY_2_DB = "launcher_2_by_2.db";
@@ -30,6 +31,7 @@ public class LauncherFiles {
 
     public static final List<String> ALL_FILES = Collections.unmodifiableList(Arrays.asList(
             LAUNCHER_DB,
+            LAUNCHER_4_BY_5_DB,
             LAUNCHER_4_BY_4_DB,
             LAUNCHER_3_BY_3_DB,
             LAUNCHER_2_BY_2_DB,
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 7f76d27564..51631584a8 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -187,7 +187,7 @@ public final class FeatureFlags {
             "EXPANDED_SMARTSPACE", false, "Expands smartspace height to two rows. "
               + "Any apps occupying the first row will be removed from workspace.");
 
-    public static final BooleanFlag ENABLE_FOUR_COLUMNS = new DeviceFlag(
+    public static final DeviceFlag ENABLE_FOUR_COLUMNS = new DeviceFlag(
             "ENABLE_FOUR_COLUMNS", false, "Uses 4 columns in launcher grid."
             + "Warning: This will permanently alter your home screen items and is not reversible.");
 
@@ -227,6 +227,12 @@ public final class FeatureFlags {
         }
     }
 
+    public static void removeFlag(DebugFlag flag) {
+        synchronized (sDebugFlags) {
+            sDebugFlags.remove(flag);
+        }
+    }
+
     static List<DebugFlag> getDebugFlags() {
         synchronized (sDebugFlags) {
             return new ArrayList<>(sDebugFlags);
@@ -304,6 +310,15 @@ public final class FeatureFlags {
                     .getBoolean(key, defaultValue);
         }
 
+        /**
+         * Resets value to default value.
+         */
+        public void reset(Context context) {
+            mCurrentValue = defaultValue;
+            context.getSharedPreferences(FLAGS_PREF_NAME, Context.MODE_PRIVATE)
+                    .edit().putBoolean(key, defaultValue).apply();
+        }
+
         @Override
         protected StringBuilder appendProps(StringBuilder src) {
             return super.appendProps(src).append(", mCurrentValue=").append(mCurrentValue);
diff --git a/src/com/android/launcher3/graphics/GridCustomizationsProvider.java b/src/com/android/launcher3/graphics/GridCustomizationsProvider.java
index cb42e7aa05..911f8c3cde 100644
--- a/src/com/android/launcher3/graphics/GridCustomizationsProvider.java
+++ b/src/com/android/launcher3/graphics/GridCustomizationsProvider.java
@@ -90,7 +90,10 @@ public class GridCustomizationsProvider extends ContentProvider {
                     parser.getDepth() > depth) && type != XmlPullParser.END_DOCUMENT) {
                 if ((type == XmlPullParser.START_TAG)
                         && GridOption.TAG_NAME.equals(parser.getName())) {
-                    result.add(new GridOption(getContext(), Xml.asAttributeSet(parser)));
+                    GridOption option = new GridOption(getContext(), Xml.asAttributeSet(parser));
+                    if (option.visible) {
+                        result.add(option);
+                    }
                 }
             }
         } catch (IOException | XmlPullParserException e) {
-- 
GitLab


From 04e9f39f19d90ae978660262719f03184501b75e Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Mon, 29 Mar 2021 16:21:52 -0700
Subject: [PATCH 0798/1664] Simplifying all-apps seach pipeline

Bug: 183607616
Test: Verified on device
Change-Id: Id7ded3c244b747a577cdfcf298db6dddf19fa4eb
---
 .../uioverrides/QuickstepLauncher.java        |  1 -
 .../launcher3/allapps/SearchUiManager.java    |  5 --
 .../search/AppsSearchContainerLayout.java     |  3 +-
 .../allapps/search/AppsSearchPipeline.java    | 85 -------------------
 .../search/DefaultAppSearchAlgorithm.java     | 63 +++++++++++---
 .../allapps/search/SearchPipeline.java        | 37 --------
 6 files changed, 53 insertions(+), 141 deletions(-)
 delete mode 100644 src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
 delete mode 100644 src/com/android/launcher3/allapps/search/SearchPipeline.java

diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index bae97d763a..b1c04b1e92 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -234,7 +234,6 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
     @Override
     public void onDestroy() {
         super.onDestroy();
-        getAppsView().getSearchUiManager().destroySearch();
         mHotseatPredictionController.destroy();
     }
 
diff --git a/src/com/android/launcher3/allapps/SearchUiManager.java b/src/com/android/launcher3/allapps/SearchUiManager.java
index 0a2dea99b9..941d3af797 100644
--- a/src/com/android/launcher3/allapps/SearchUiManager.java
+++ b/src/com/android/launcher3/allapps/SearchUiManager.java
@@ -48,11 +48,6 @@ public interface SearchUiManager {
      */
     float getScrollRangeDelta(Rect insets);
 
-    /**
-     * Called when activity is destroyed. Used to close search system services
-     */
-    default void destroySearch() { }
-
     /**
      * @return the edit text object
      */
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
index bfcc1c75ec..c51bcf5bd4 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
@@ -36,7 +36,6 @@ import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.ExtendedEditText;
 import com.android.launcher3.Insettable;
-import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItem;
@@ -136,7 +135,7 @@ public class AppsSearchContainerLayout extends ExtendedEditText
         mApps = appsView.getApps();
         mAppsView = appsView;
         mSearchBarController.initialize(
-                new DefaultAppSearchAlgorithm(mLauncher, LauncherAppState.getInstance(mLauncher)),
+                new DefaultAppSearchAlgorithm(mLauncher),
                 this, mLauncher, this);
     }
 
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java b/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
deleted file mode 100644
index 42ee4b78be..0000000000
--- a/src/com/android/launcher3/allapps/search/AppsSearchPipeline.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.allapps.search;
-
-import android.content.Context;
-import android.os.CancellationSignal;
-
-import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItem;
-import com.android.launcher3.model.AllAppsList;
-import com.android.launcher3.model.BaseModelUpdateTask;
-import com.android.launcher3.model.BgDataModel;
-import com.android.launcher3.model.data.AppInfo;
-import com.android.launcher3.search.StringMatcherUtility;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Consumer;
-
-/**
- * A device search section for handling app searches
- */
-public class AppsSearchPipeline implements SearchPipeline {
-
-    private static final int MAX_RESULTS_COUNT = 5;
-
-    private final LauncherAppState mLauncherAppState;
-
-    public AppsSearchPipeline(Context context, LauncherAppState launcherAppState) {
-        mLauncherAppState = launcherAppState;
-    }
-
-    @Override
-    public void query(String input, Consumer<ArrayList<AdapterItem>> callback,
-            CancellationSignal cancellationSignal) {
-        mLauncherAppState.getModel().enqueueModelUpdateTask(new BaseModelUpdateTask() {
-            @Override
-            public void execute(LauncherAppState app, BgDataModel dataModel, AllAppsList apps) {
-                List<AppInfo> matchingResults = getTitleMatchResult(apps.data, input);
-                callback.accept(getAdapterItems(matchingResults));
-            }
-        });
-    }
-
-    /**
-     * Filters {@link AppInfo}s matching specified query
-     */
-    public static ArrayList<AppInfo> getTitleMatchResult(List<AppInfo> apps, String query) {
-        // Do an intersection of the words in the query and each title, and filter out all the
-        // apps that don't match all of the words in the query.
-        final String queryTextLower = query.toLowerCase();
-        final ArrayList<AppInfo> result = new ArrayList<>();
-        StringMatcherUtility.StringMatcher matcher =
-                StringMatcherUtility.StringMatcher.getInstance();
-        for (AppInfo info : apps) {
-            if (StringMatcherUtility.matches(queryTextLower, info.title.toString(), matcher)) {
-                result.add(info);
-            }
-        }
-        return result;
-    }
-
-    private ArrayList<AdapterItem> getAdapterItems(List<AppInfo> matchingApps) {
-        ArrayList<AdapterItem> items = new ArrayList<>();
-        for (int i = 0; i < matchingApps.size() && i < MAX_RESULTS_COUNT; i++) {
-            AdapterItem appItem = AdapterItem.asApp(i, "", matchingApps.get(i), i);
-            items.add(appItem);
-        }
-
-        return items;
-    }
-}
diff --git a/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java b/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java
index a386ef8ee2..1f854c6787 100644
--- a/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java
+++ b/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java
@@ -15,25 +15,39 @@
  */
 package com.android.launcher3.allapps.search;
 
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+
 import android.content.Context;
 import android.os.Handler;
 
+import androidx.annotation.AnyThread;
+
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItem;
+import com.android.launcher3.model.AllAppsList;
+import com.android.launcher3.model.BaseModelUpdateTask;
+import com.android.launcher3.model.BgDataModel;
+import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.search.SearchAlgorithm;
 import com.android.launcher3.search.SearchCallback;
+import com.android.launcher3.search.StringMatcherUtility;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * The default search implementation.
  */
 public class DefaultAppSearchAlgorithm implements SearchAlgorithm<AdapterItem> {
 
-    protected final Handler mResultHandler;
-    private final AppsSearchPipeline mAppsSearchPipeline;
+    private static final int MAX_RESULTS_COUNT = 5;
+
+    private final LauncherAppState mAppState;
+    private final Handler mResultHandler;
 
-    public DefaultAppSearchAlgorithm(Context context, LauncherAppState launcherAppState) {
-        mResultHandler = new Handler();
-        mAppsSearchPipeline = new AppsSearchPipeline(context, launcherAppState);
+    public DefaultAppSearchAlgorithm(Context context) {
+        mAppState = LauncherAppState.getInstance(context);
+        mResultHandler = new Handler(MAIN_EXECUTOR.getLooper());
     }
 
     @Override
@@ -44,11 +58,38 @@ public class DefaultAppSearchAlgorithm implements SearchAlgorithm<AdapterItem> {
     }
 
     @Override
-    public void doSearch(final String query,
-            final SearchCallback<AdapterItem> callback) {
-        mAppsSearchPipeline.query(query,
-                results -> mResultHandler.post(
-                        () -> callback.onSearchResult(query, results)),
-                null);
+    public void doSearch(String query, SearchCallback<AdapterItem> callback) {
+        mAppState.getModel().enqueueModelUpdateTask(new BaseModelUpdateTask() {
+            @Override
+            public void execute(LauncherAppState app, BgDataModel dataModel, AllAppsList apps) {
+                ArrayList<AdapterItem> result = getTitleMatchResult(apps.data, query);
+                mResultHandler.post(() -> callback.onSearchResult(query, result));
+            }
+        });
+    }
+
+    /**
+     * Filters {@link AppInfo}s matching specified query
+     */
+    @AnyThread
+    public static ArrayList<AdapterItem> getTitleMatchResult(List<AppInfo> apps, String query) {
+        // Do an intersection of the words in the query and each title, and filter out all the
+        // apps that don't match all of the words in the query.
+        final String queryTextLower = query.toLowerCase();
+        final ArrayList<AdapterItem> result = new ArrayList<>();
+        StringMatcherUtility.StringMatcher matcher =
+                StringMatcherUtility.StringMatcher.getInstance();
+
+        int resultCount = 0;
+        int total = apps.size();
+        for (int i = 0; i < total && resultCount < MAX_RESULTS_COUNT; i++) {
+            AppInfo info = apps.get(i);
+            if (StringMatcherUtility.matches(queryTextLower, info.title.toString(), matcher)) {
+                AdapterItem appItem = AdapterItem.asApp(resultCount, "", info, resultCount);
+                result.add(appItem);
+                resultCount++;
+            }
+        }
+        return result;
     }
 }
diff --git a/src/com/android/launcher3/allapps/search/SearchPipeline.java b/src/com/android/launcher3/allapps/search/SearchPipeline.java
deleted file mode 100644
index 3516a41724..0000000000
--- a/src/com/android/launcher3/allapps/search/SearchPipeline.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.allapps.search;
-
-import android.os.CancellationSignal;
-
-import com.android.launcher3.allapps.AllAppsGridAdapter;
-
-import java.util.ArrayList;
-import java.util.function.Consumer;
-
-/**
- * An interface for handling search within pipeline
- */
-// Remove when System Service API is added.
-public interface SearchPipeline {
-
-    /**
-     * Perform query
-     */
-    void query(String input,
-            Consumer<ArrayList<AllAppsGridAdapter.AdapterItem>> callback,
-            CancellationSignal cancellationSignal);
-}
-- 
GitLab


From 8ffdc4b6c4ae7f3fe10cd6e25a007c22fcbdeb99 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Tue, 30 Mar 2021 16:37:21 +0000
Subject: [PATCH 0799/1664] Revert "Enable device search"

This reverts commit 6323aa270cd807651eb681120b03fbaabf058264.

Reason for revert: 4 tests failing in tapl
Bug: 184030316
Bug: 184030696
Bug: 184030463
Bug: 184030324

Change-Id: Ib5daebbca9bad4eefd20ca51755f5a02a9c4f6aa
---
 src/com/android/launcher3/config/FeatureFlags.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 6daecba1a8..96251f000c 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -93,7 +93,7 @@ public final class FeatureFlags {
 
 
     public static final BooleanFlag ENABLE_DEVICE_SEARCH = new DeviceFlag(
-            "ENABLE_DEVICE_SEARCH", true, "Allows on device search in all apps");
+            "ENABLE_DEVICE_SEARCH", false, "Allows on device search in all apps");
 
     public static final BooleanFlag FOLDER_NAME_SUGGEST = new DeviceFlag(
             "FOLDER_NAME_SUGGEST", true,
-- 
GitLab


From 04d432ee419bc8dc0fcd90db315e3b9db3a8ccd0 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Tue, 30 Mar 2021 20:18:21 +0000
Subject: [PATCH 0800/1664] Revert "Revert "Enable device search""

This reverts commit 8ffdc4b6c4ae7f3fe10cd6e25a007c22fcbdeb99.

Reason for revert: b/183683148

Change-Id: I8429671f460e2ecbd187b8279aeed85009ffb334
---
 src/com/android/launcher3/config/FeatureFlags.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 96251f000c..6daecba1a8 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -93,7 +93,7 @@ public final class FeatureFlags {
 
 
     public static final BooleanFlag ENABLE_DEVICE_SEARCH = new DeviceFlag(
-            "ENABLE_DEVICE_SEARCH", false, "Allows on device search in all apps");
+            "ENABLE_DEVICE_SEARCH", true, "Allows on device search in all apps");
 
     public static final BooleanFlag FOLDER_NAME_SUGGEST = new DeviceFlag(
             "FOLDER_NAME_SUGGEST", true,
-- 
GitLab


From 940c27ef1a385319d68801f90a4b2290a70b4944 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Sun, 28 Mar 2021 10:31:43 -0700
Subject: [PATCH 0801/1664] Using an independent drawable for rounded corners

Bug: 183641907
Test: Manual
Change-Id: I3114d43d07c03884348e1c33805545f19bb8d540
---
 .../src/com/android/quickstep/TaskIconCache.java  |  2 +-
 .../android/launcher3/WidgetPreviewLoader.java    | 15 ++++++---------
 .../launcher3/notification/NotificationInfo.java  |  6 ++----
 .../launcher3/widget/PendingItemDragHelper.java   |  5 +++--
 src/com/android/launcher3/widget/WidgetCell.java  |  4 ++--
 .../launcher3/ui/AbstractLauncherUiTest.java      |  2 +-
 6 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/TaskIconCache.java b/quickstep/src/com/android/quickstep/TaskIconCache.java
index 08503cfaac..ba1c413909 100644
--- a/quickstep/src/com/android/quickstep/TaskIconCache.java
+++ b/quickstep/src/com/android/quickstep/TaskIconCache.java
@@ -146,7 +146,7 @@ public class TaskIconCache {
                     key.getComponent(), key.userId);
             if (activityInfo != null) {
                 BitmapInfo bitmapInfo = getBitmapInfo(
-                        mIconProvider.getIcon(activityInfo, UserHandle.of(key.userId)),
+                        mIconProvider.getIcon(activityInfo),
                         key.userId,
                         desc.getPrimaryColor(),
                         activityInfo.applicationInfo.isInstantApp());
diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java
index 2f9c96e567..f43452cd65 100644
--- a/src/com/android/launcher3/WidgetPreviewLoader.java
+++ b/src/com/android/launcher3/WidgetPreviewLoader.java
@@ -541,20 +541,17 @@ public class WidgetPreviewLoader {
             c.setBitmap(preview);
             c.drawColor(0, PorterDuff.Mode.CLEAR);
         }
-        RectF boxRect = drawBoxWithShadow(c, size, size);
+
+        drawBoxWithShadow(c, size, size);
 
         LauncherIcons li = LauncherIcons.obtain(mContext);
-        Bitmap icon = li.createBadgedIconBitmap(
+        Drawable icon = li.createBadgedIconBitmap(
                 mutateOnMainThread(info.getFullResIcon(mIconCache)),
-                Process.myUserHandle(), 0).icon;
+                Process.myUserHandle(), 0).newIcon(launcher);
         li.recycle();
 
-        Rect src = new Rect(0, 0, icon.getWidth(), icon.getHeight());
-
-        boxRect.set(0, 0, iconSize, iconSize);
-        boxRect.offset(padding, padding);
-        c.drawBitmap(icon, src, boxRect,
-                new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG));
+        icon.setBounds(padding, padding, padding + iconSize, padding + iconSize);
+        icon.draw(c);
         c.setBitmap(null);
         return preview;
     }
diff --git a/src/com/android/launcher3/notification/NotificationInfo.java b/src/com/android/launcher3/notification/NotificationInfo.java
index 80eeb22747..d27d8c7778 100644
--- a/src/com/android/launcher3/notification/NotificationInfo.java
+++ b/src/com/android/launcher3/notification/NotificationInfo.java
@@ -22,7 +22,6 @@ import android.app.ActivityOptions;
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.content.Context;
-import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Icon;
 import android.os.Bundle;
@@ -86,9 +85,8 @@ public class NotificationInfo implements View.OnClickListener {
             mIsIconLarge = true;
         }
         if (mIconDrawable == null) {
-            mIconDrawable = new BitmapDrawable(context.getResources(), LauncherAppState
-                    .getInstance(context).getIconCache()
-                    .getDefaultIcon(statusBarNotification.getUser()).icon);
+            mIconDrawable = LauncherAppState.getInstance(context).getIconCache()
+                    .getDefaultIcon(statusBarNotification.getUser()).newIcon(context);
         }
         intent = notification.contentIntent;
         autoCancel = (notification.flags & Notification.FLAG_AUTO_CANCEL) != 0;
diff --git a/src/com/android/launcher3/widget/PendingItemDragHelper.java b/src/com/android/launcher3/widget/PendingItemDragHelper.java
index ad0a4017c6..3e61e56ee4 100644
--- a/src/com/android/launcher3/widget/PendingItemDragHelper.java
+++ b/src/com/android/launcher3/widget/PendingItemDragHelper.java
@@ -39,6 +39,7 @@ import com.android.launcher3.dragndrop.DraggableView;
 import com.android.launcher3.graphics.DragPreviewProvider;
 import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.icons.LauncherIcons;
+import com.android.launcher3.icons.RoundDrawableWrapper;
 import com.android.launcher3.widget.dragndrop.AppWidgetHostViewDragListener;
 
 /**
@@ -118,12 +119,12 @@ public class PendingItemDragHelper extends DragPreviewProvider {
                         .addDragListener(new AppWidgetHostViewDragListener(launcher));
             }
             if (preview == null) {
-                FastBitmapDrawable p = new FastBitmapDrawable(
+                Drawable p = new FastBitmapDrawable(
                         app.getWidgetCache().generateWidgetPreview(launcher,
                                 createWidgetInfo.info, maxWidth, null,
                                 previewSizeBeforeScale).first);
                 if (RoundedCornerEnforcement.isRoundedCornerEnabled()) {
-                    p.setRoundedCornersRadius(mEnforcedRoundedCornersForWidget);
+                    p = new RoundDrawableWrapper(p, mEnforcedRoundedCornersForWidget);
                 }
                 preview = p;
             }
diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index c11b68e5f6..40b256b9cd 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -46,6 +46,7 @@ import com.android.launcher3.dragndrop.AppWidgetHostViewDrawable;
 import com.android.launcher3.icons.BaseIconFactory;
 import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.icons.FastBitmapDrawable;
+import com.android.launcher3.icons.RoundDrawableWrapper;
 import com.android.launcher3.model.WidgetItem;
 
 /**
@@ -248,8 +249,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
 
     public void applyPreview(Bitmap bitmap) {
         FastBitmapDrawable drawable = new FastBitmapDrawable(bitmap);
-        drawable.setRoundedCornersRadius(mEnforcedCornerRadius);
-        applyPreview(drawable);
+        applyPreview(new RoundDrawableWrapper(drawable, mEnforcedCornerRadius));
     }
 
     private void applyPreview(Drawable drawable) {
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index 72b1d2242e..d4e8f1f5d0 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -512,7 +512,7 @@ public abstract class AbstractLauncherUiTest {
     }
 
     protected boolean isInBackground(Launcher launcher) {
-        return !launcher.hasBeenResumed();
+        return launcher == null || !launcher.hasBeenResumed();
     }
 
     protected boolean isInState(Supplier<LauncherState> state) {
-- 
GitLab


From 35d23a62f01027f741e883ee2f227b72c281970f Mon Sep 17 00:00:00 2001
From: Andras Kloczl <andraskloczl@google.com>
Date: Tue, 30 Mar 2021 13:31:23 +0200
Subject: [PATCH 0802/1664] Fix app close animation for two panel home

Change getFirstMatchForAppClose to check all the visible
pages not just the page with the currentPage index.

Test: manual
Bug: 183606840
Change-Id: If5280797f821f7d10f82376aeef5e8eb4d352e2a
---
 src/com/android/launcher3/Hotseat.java   |  3 ++-
 src/com/android/launcher3/Workspace.java | 14 +++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index 4049ed6882..15e12d697c 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -29,6 +29,7 @@ import android.widget.FrameLayout;
 
 import androidx.annotation.Nullable;
 
+import java.util.Arrays;
 import java.util.function.Consumer;
 
 /**
@@ -226,7 +227,7 @@ public class Hotseat extends CellLayout implements Insettable {
      * Returns the first View for which the given itemOperator returns true, or null.
      */
     public View getFirstItemMatch(Workspace.ItemOperator itemOperator) {
-        return mWorkspace.getFirstMatch(new CellLayout[] { this }, itemOperator);
+        return mWorkspace.getFirstMatch(Arrays.asList(this), itemOperator);
     }
 
     /**
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index bd173481b7..f645489502 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2968,8 +2968,10 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
      * @param user The user of the app to match.
      */
     public View getFirstMatchForAppClose(String packageName, UserHandle user) {
-        final int curPage = getCurrentPage();
-        final CellLayout currentPage = (CellLayout) getPageAt(curPage);
+        List<CellLayout> cellLayouts = new ArrayList<>(getPanelCount() + 1);
+        cellLayouts.add(getHotseat());
+        getVisiblePages().forEach(page -> cellLayouts.add((CellLayout) page));
+
         final Workspace.ItemOperator packageAndUser = (ItemInfo info, View view) -> info != null
                 && info.getTargetComponent() != null
                 && TextUtils.equals(info.getTargetComponent().getPackageName(), packageName)
@@ -2990,13 +2992,11 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
 
         // Order: App icons, app in folder. Items in hotseat get returned first.
         if (ADAPTIVE_ICON_WINDOW_ANIM.get()) {
-            return getFirstMatch(new CellLayout[] { getHotseat(), currentPage },
-                    packageAndUserAndApp, packageAndUserAndAppInFolder);
+            return getFirstMatch(cellLayouts, packageAndUserAndApp, packageAndUserAndAppInFolder);
         } else {
             // Do not use Folder as a criteria, since it'll cause a crash when trying to draw
             // FolderAdaptiveIcon as the background.
-            return getFirstMatch(new CellLayout[] { getHotseat(), currentPage },
-                    packageAndUserAndApp);
+            return getFirstMatch(cellLayouts, packageAndUserAndApp);
         }
     }
 
@@ -3030,7 +3030,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
      * @param operators List of operators, in order starting from best matching operator.
      * @return
      */
-    View getFirstMatch(CellLayout[] cellLayouts, final ItemOperator... operators) {
+    View getFirstMatch(Iterable<CellLayout> cellLayouts, final ItemOperator... operators) {
         // This array is filled with the first match for each operator.
         final View[] matches = new View[operators.length];
         // For efficiency, the outer loop should be CellLayout.
-- 
GitLab


From ce6cc7e7052e08741399647691cedf3eb635d9e5 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 30 Mar 2021 16:51:08 -0700
Subject: [PATCH 0803/1664] Simplifying widget search pipeline

Bug: 183607616
Test: Verified on device
Change-Id: I3e5dd9e280f375475d1e1cf41dff6e6533175ebf
---
 .../SimpleWidgetsSearchAlgorithmTest.java     | 173 ++++++++++++++--
 .../SimpleWidgetsSearchPipelineTest.java      | 185 ------------------
 .../widget/picker/WidgetsFullSheet.java       |   2 +-
 .../search/LauncherWidgetsSearchBar.java      |  13 +-
 .../search/SimpleWidgetsSearchAlgorithm.java  |  63 ++++--
 .../search/SimpleWidgetsSearchPipeline.java   |  72 -------
 .../search/WidgetsPickerSearchPipeline.java   |  44 -----
 .../picker/search/WidgetsSearchBar.java       |   6 +-
 8 files changed, 207 insertions(+), 351 deletions(-)
 delete mode 100644 robolectric_tests/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchPipelineTest.java
 delete mode 100644 src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchPipeline.java
 delete mode 100644 src/com/android/launcher3/widget/picker/search/WidgetsPickerSearchPipeline.java

diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchAlgorithmTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchAlgorithmTest.java
index c2bf1ae2dc..36b6f01dc0 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchAlgorithmTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchAlgorithmTest.java
@@ -18,64 +18,197 @@ package com.android.launcher3.widget.picker.search;
 
 import static android.os.Looper.getMainLooper;
 
+import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.ArgumentMatchers.matches;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.verify;
 import static org.robolectric.Shadows.shadowOf;
 
+import android.appwidget.AppWidgetProviderInfo;
+import android.content.ComponentName;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.os.UserHandle;
+
+import com.android.launcher3.InvariantDeviceProfile;
+import com.android.launcher3.icons.BitmapInfo;
+import com.android.launcher3.icons.ComponentWithLabel;
+import com.android.launcher3.icons.IconCache;
+import com.android.launcher3.model.WidgetItem;
+import com.android.launcher3.model.data.PackageItemInfo;
+import com.android.launcher3.popup.PopupDataProvider;
 import com.android.launcher3.search.SearchCallback;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
+import com.android.launcher3.widget.model.WidgetsListContentEntry;
+import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
+import com.android.launcher3.widget.model.WidgetsListSearchHeaderEntry;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadows.ShadowPackageManager;
+import org.robolectric.util.ReflectionHelpers;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
-import java.util.function.Consumer;
 
 @RunWith(RobolectricTestRunner.class)
 public class SimpleWidgetsSearchAlgorithmTest {
 
+    @Mock private IconCache mIconCache;
+
+    private InvariantDeviceProfile mTestProfile;
+    private WidgetsListHeaderEntry mCalendarHeaderEntry;
+    private WidgetsListContentEntry mCalendarContentEntry;
+    private WidgetsListHeaderEntry mCameraHeaderEntry;
+    private WidgetsListContentEntry mCameraContentEntry;
+    private WidgetsListHeaderEntry mClockHeaderEntry;
+    private WidgetsListContentEntry mClockContentEntry;
+    private Context mContext;
+
     private SimpleWidgetsSearchAlgorithm mSimpleWidgetsSearchAlgorithm;
     @Mock
-    private WidgetsPickerSearchPipeline mSearchPipeline;
+    private PopupDataProvider mDataProvider;
     @Mock
     private SearchCallback<WidgetsListBaseEntry> mSearchCallback;
-    @Captor
-    private ArgumentCaptor<Consumer<List<WidgetsListBaseEntry>>> mConsumerCaptor;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mSimpleWidgetsSearchAlgorithm = new SimpleWidgetsSearchAlgorithm(mSearchPipeline);
+        doAnswer(invocation -> {
+            ComponentWithLabel componentWithLabel = (ComponentWithLabel) invocation.getArgument(0);
+            return componentWithLabel.getComponent().getShortClassName();
+        }).when(mIconCache).getTitleNoCache(any());
+        mTestProfile = new InvariantDeviceProfile();
+        mTestProfile.numRows = 5;
+        mTestProfile.numColumns = 5;
+        mContext = RuntimeEnvironment.application;
+
+        mCalendarHeaderEntry =
+                createWidgetsHeaderEntry("com.example.android.Calendar", "Calendar", 2);
+        mCalendarContentEntry =
+                createWidgetsContentEntry("com.example.android.Calendar", "Calendar", 2);
+        mCameraHeaderEntry = createWidgetsHeaderEntry("com.example.android.Camera", "Camera", 11);
+        mCameraContentEntry = createWidgetsContentEntry("com.example.android.Camera", "Camera", 11);
+        mClockHeaderEntry = createWidgetsHeaderEntry("com.example.android.Clock", "Clock", 3);
+        mClockContentEntry = createWidgetsContentEntry("com.example.android.Clock", "Clock", 3);
+
+
+        mSimpleWidgetsSearchAlgorithm = new SimpleWidgetsSearchAlgorithm(mDataProvider);
+        doReturn(Collections.EMPTY_LIST).when(mDataProvider).getAllWidgets();
     }
 
     @Test
-    public void doSearch_shouldQueryPipeline() {
-        mSimpleWidgetsSearchAlgorithm.doSearch("abc", mSearchCallback);
+    public void filter_shouldMatchOnAppName() {
+        doReturn(List.of(mCalendarHeaderEntry, mCalendarContentEntry, mCameraHeaderEntry,
+                mCameraContentEntry, mClockHeaderEntry, mClockContentEntry))
+                .when(mDataProvider)
+                .getAllWidgets();
 
-        verify(mSearchPipeline).query(eq("abc"), any());
+        assertEquals(List.of(
+                new WidgetsListSearchHeaderEntry(
+                        mCalendarHeaderEntry.mPkgItem,
+                        mCalendarHeaderEntry.mTitleSectionName,
+                        mCalendarHeaderEntry.mWidgets),
+                mCalendarContentEntry,
+                new WidgetsListSearchHeaderEntry(
+                        mCameraHeaderEntry.mPkgItem,
+                        mCameraHeaderEntry.mTitleSectionName,
+                        mCameraHeaderEntry.mWidgets),
+                mCameraContentEntry),
+                SimpleWidgetsSearchAlgorithm.getFilteredWidgets(mDataProvider, "Ca"));
     }
 
     @Test
-    public void doSearch_shouldInformSearchCallbackOnQueryResult() {
-        ArrayList<WidgetsListBaseEntry> baseEntries = new ArrayList<>();
+    public void filter_shouldMatchOnWidgetLabel() {
+        doReturn(List.of(mCalendarHeaderEntry, mCalendarContentEntry, mCameraHeaderEntry,
+                mCameraContentEntry))
+                .when(mDataProvider)
+                .getAllWidgets();
 
-        mSimpleWidgetsSearchAlgorithm.doSearch("abc", mSearchCallback);
+        assertEquals(List.of(
+                new WidgetsListSearchHeaderEntry(
+                        mCalendarHeaderEntry.mPkgItem,
+                        mCalendarHeaderEntry.mTitleSectionName,
+                        mCalendarHeaderEntry.mWidgets.subList(1, 2)),
+                new WidgetsListContentEntry(
+                        mCalendarHeaderEntry.mPkgItem,
+                        mCalendarHeaderEntry.mTitleSectionName,
+                        mCalendarHeaderEntry.mWidgets.subList(1, 2)),
+                new WidgetsListSearchHeaderEntry(
+                        mCameraHeaderEntry.mPkgItem,
+                        mCameraHeaderEntry.mTitleSectionName,
+                        mCameraHeaderEntry.mWidgets.subList(1, 3)),
+                new WidgetsListContentEntry(
+                        mCameraHeaderEntry.mPkgItem,
+                        mCameraHeaderEntry.mTitleSectionName,
+                        mCameraHeaderEntry.mWidgets.subList(1, 3))),
+                SimpleWidgetsSearchAlgorithm.getFilteredWidgets(mDataProvider, "Widget1"));
+    }
 
-        verify(mSearchPipeline).query(eq("abc"), mConsumerCaptor.capture());
-        mConsumerCaptor.getValue().accept(baseEntries);
+    @Test
+    public void doSearch_shouldInformCallback() {
+        doReturn(List.of(mCalendarHeaderEntry, mCalendarContentEntry, mCameraHeaderEntry,
+                mCameraContentEntry, mClockHeaderEntry, mClockContentEntry))
+                .when(mDataProvider)
+                .getAllWidgets();
+        mSimpleWidgetsSearchAlgorithm.doSearch("Ca", mSearchCallback);
         shadowOf(getMainLooper()).idle();
-        // Verify SearchCallback#onSearchResult receives a query token along with the search
-        // results. The query token is the original query string concatenated with the query
-        // timestamp.
-        verify(mSearchCallback).onSearchResult(matches("abc\t\\d*"), eq(baseEntries));
+        verify(mSearchCallback).onSearchResult(
+                matches("Ca"), argThat(a -> a != null && !a.isEmpty()));
+    }
+
+    private WidgetsListHeaderEntry createWidgetsHeaderEntry(String packageName, String appName,
+            int numOfWidgets) {
+        List<WidgetItem> widgetItems = generateWidgetItems(packageName, numOfWidgets);
+        PackageItemInfo pInfo = createPackageItemInfo(packageName, appName,
+                widgetItems.get(0).user);
+
+        return new WidgetsListHeaderEntry(pInfo, /* titleSectionName= */ "", widgetItems);
+    }
+
+    private WidgetsListContentEntry createWidgetsContentEntry(String packageName, String appName,
+            int numOfWidgets) {
+        List<WidgetItem> widgetItems = generateWidgetItems(packageName, numOfWidgets);
+        PackageItemInfo pInfo = createPackageItemInfo(packageName, appName,
+                widgetItems.get(0).user);
+
+        return new WidgetsListContentEntry(pInfo, /* titleSectionName= */ "", widgetItems);
+    }
+
+    private PackageItemInfo createPackageItemInfo(String packageName, String appName,
+            UserHandle userHandle) {
+        PackageItemInfo pInfo = new PackageItemInfo(packageName);
+        pInfo.title = appName;
+        pInfo.user = userHandle;
+        pInfo.bitmap = BitmapInfo.of(Bitmap.createBitmap(10, 10, Bitmap.Config.ALPHA_8), 0);
+        return pInfo;
+    }
+
+    private List<WidgetItem> generateWidgetItems(String packageName, int numOfWidgets) {
+        ShadowPackageManager packageManager = shadowOf(mContext.getPackageManager());
+        ArrayList<WidgetItem> widgetItems = new ArrayList<>();
+        for (int i = 0; i < numOfWidgets; i++) {
+            ComponentName cn = ComponentName.createRelative(packageName, ".SampleWidget" + i);
+            AppWidgetProviderInfo widgetInfo = new AppWidgetProviderInfo();
+            widgetInfo.provider = cn;
+            ReflectionHelpers.setField(widgetInfo, "providerInfo",
+                    packageManager.addReceiverIfNotPresent(cn));
+
+            WidgetItem widgetItem = new WidgetItem(
+                    LauncherAppWidgetProviderInfo.fromProviderInfo(mContext, widgetInfo),
+                    mTestProfile, mIconCache);
+            widgetItems.add(widgetItem);
+        }
+        return widgetItems;
     }
 }
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchPipelineTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchPipelineTest.java
deleted file mode 100644
index 17ededdb37..0000000000
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchPipelineTest.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.widget.picker.search;
-
-import static android.os.Looper.getMainLooper;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doAnswer;
-import static org.robolectric.Shadows.shadowOf;
-
-import android.appwidget.AppWidgetProviderInfo;
-import android.content.ComponentName;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.os.UserHandle;
-
-import com.android.launcher3.InvariantDeviceProfile;
-import com.android.launcher3.icons.BitmapInfo;
-import com.android.launcher3.icons.ComponentWithLabel;
-import com.android.launcher3.icons.IconCache;
-import com.android.launcher3.model.WidgetItem;
-import com.android.launcher3.model.data.PackageItemInfo;
-import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
-import com.android.launcher3.widget.model.WidgetsListContentEntry;
-import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
-import com.android.launcher3.widget.model.WidgetsListSearchHeaderEntry;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.shadows.ShadowPackageManager;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(RobolectricTestRunner.class)
-public class SimpleWidgetsSearchPipelineTest {
-    @Mock private IconCache mIconCache;
-
-    private InvariantDeviceProfile mTestProfile;
-    private WidgetsListHeaderEntry mCalendarHeaderEntry;
-    private WidgetsListContentEntry mCalendarContentEntry;
-    private WidgetsListHeaderEntry mCameraHeaderEntry;
-    private WidgetsListContentEntry mCameraContentEntry;
-    private WidgetsListHeaderEntry mClockHeaderEntry;
-    private WidgetsListContentEntry mClockContentEntry;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        doAnswer(invocation -> {
-            ComponentWithLabel componentWithLabel = (ComponentWithLabel) invocation.getArgument(0);
-            return componentWithLabel.getComponent().getShortClassName();
-        }).when(mIconCache).getTitleNoCache(any());
-        mTestProfile = new InvariantDeviceProfile();
-        mTestProfile.numRows = 5;
-        mTestProfile.numColumns = 5;
-        mContext = RuntimeEnvironment.application;
-
-        mCalendarHeaderEntry =
-                createWidgetsHeaderEntry("com.example.android.Calendar", "Calendar", 2);
-        mCalendarContentEntry =
-                createWidgetsContentEntry("com.example.android.Calendar", "Calendar", 2);
-        mCameraHeaderEntry = createWidgetsHeaderEntry("com.example.android.Camera", "Camera", 11);
-        mCameraContentEntry = createWidgetsContentEntry("com.example.android.Camera", "Camera", 11);
-        mClockHeaderEntry = createWidgetsHeaderEntry("com.example.android.Clock", "Clock", 3);
-        mClockContentEntry = createWidgetsContentEntry("com.example.android.Clock", "Clock", 3);
-    }
-
-    @Test
-    public void query_shouldMatchOnAppName() {
-        SimpleWidgetsSearchPipeline pipeline = new SimpleWidgetsSearchPipeline(
-                List.of(mCalendarHeaderEntry, mCalendarContentEntry, mCameraHeaderEntry,
-                        mCameraContentEntry, mClockHeaderEntry, mClockContentEntry));
-
-        pipeline.query("Ca", results ->
-                assertEquals(results,
-                        List.of(
-                                new WidgetsListSearchHeaderEntry(
-                                        mCalendarHeaderEntry.mPkgItem,
-                                        mCalendarHeaderEntry.mTitleSectionName,
-                                        mCalendarHeaderEntry.mWidgets),
-                                mCalendarContentEntry,
-                                new WidgetsListSearchHeaderEntry(
-                                        mCameraHeaderEntry.mPkgItem,
-                                        mCameraHeaderEntry.mTitleSectionName,
-                                        mCameraHeaderEntry.mWidgets),
-                                mCameraContentEntry)));
-        shadowOf(getMainLooper()).idle();
-    }
-
-    @Test
-    public void query_shouldMatchOnWidgetLabel() {
-        SimpleWidgetsSearchPipeline pipeline = new SimpleWidgetsSearchPipeline(
-                List.of(mCalendarHeaderEntry, mCalendarContentEntry, mCameraHeaderEntry,
-                        mCameraContentEntry));
-
-        pipeline.query("Widget1", results ->
-                assertEquals(results,
-                        List.of(
-                                new WidgetsListSearchHeaderEntry(
-                                        mCalendarHeaderEntry.mPkgItem,
-                                        mCalendarHeaderEntry.mTitleSectionName,
-                                        mCalendarHeaderEntry.mWidgets.subList(1, 2)),
-                                new WidgetsListContentEntry(
-                                        mCalendarHeaderEntry.mPkgItem,
-                                        mCalendarHeaderEntry.mTitleSectionName,
-                                        mCalendarHeaderEntry.mWidgets.subList(1, 2)),
-                                new WidgetsListSearchHeaderEntry(
-                                        mCameraHeaderEntry.mPkgItem,
-                                        mCameraHeaderEntry.mTitleSectionName,
-                                        mCameraHeaderEntry.mWidgets.subList(1, 3)),
-                                new WidgetsListContentEntry(
-                                        mCameraHeaderEntry.mPkgItem,
-                                        mCameraHeaderEntry.mTitleSectionName,
-                                        mCameraHeaderEntry.mWidgets.subList(1, 3)))));
-        shadowOf(getMainLooper()).idle();
-    }
-
-    private WidgetsListHeaderEntry createWidgetsHeaderEntry(String packageName, String appName,
-            int numOfWidgets) {
-        List<WidgetItem> widgetItems = generateWidgetItems(packageName, numOfWidgets);
-        PackageItemInfo pInfo = createPackageItemInfo(packageName, appName,
-                widgetItems.get(0).user);
-
-        return new WidgetsListHeaderEntry(pInfo, /* titleSectionName= */ "", widgetItems);
-    }
-
-    private WidgetsListContentEntry createWidgetsContentEntry(String packageName, String appName,
-            int numOfWidgets) {
-        List<WidgetItem> widgetItems = generateWidgetItems(packageName, numOfWidgets);
-        PackageItemInfo pInfo = createPackageItemInfo(packageName, appName,
-                widgetItems.get(0).user);
-
-        return new WidgetsListContentEntry(pInfo, /* titleSectionName= */ "", widgetItems);
-    }
-
-    private PackageItemInfo createPackageItemInfo(String packageName, String appName,
-            UserHandle userHandle) {
-        PackageItemInfo pInfo = new PackageItemInfo(packageName);
-        pInfo.title = appName;
-        pInfo.user = userHandle;
-        pInfo.bitmap = BitmapInfo.of(Bitmap.createBitmap(10, 10, Bitmap.Config.ALPHA_8), 0);
-        return pInfo;
-    }
-
-    private List<WidgetItem> generateWidgetItems(String packageName, int numOfWidgets) {
-        ShadowPackageManager packageManager = shadowOf(mContext.getPackageManager());
-        ArrayList<WidgetItem> widgetItems = new ArrayList<>();
-        for (int i = 0; i < numOfWidgets; i++) {
-            ComponentName cn = ComponentName.createRelative(packageName, ".SampleWidget" + i);
-            AppWidgetProviderInfo widgetInfo = new AppWidgetProviderInfo();
-            widgetInfo.provider = cn;
-            ReflectionHelpers.setField(widgetInfo, "providerInfo",
-                    packageManager.addReceiverIfNotPresent(cn));
-
-            WidgetItem widgetItem = new WidgetItem(
-                    LauncherAppWidgetProviderInfo.fromProviderInfo(mContext, widgetInfo),
-                    mTestProfile, mIconCache);
-            widgetItems.add(widgetItem);
-        }
-        return widgetItems;
-    }
-}
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index d13884ad9e..a4257a208e 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -169,7 +169,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         onWidgetsBound();
 
         mSearchAndRecommendationViewHolder.mSearchBar.initialize(
-                mLauncher.getPopupDataProvider().getAllWidgets(), /* searchModeListener= */ this);
+                mLauncher.getPopupDataProvider(), /* searchModeListener= */ this);
     }
 
     @Override
diff --git a/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java b/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java
index 56a08b16fb..42f1bb2d21 100644
--- a/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java
+++ b/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java
@@ -26,10 +26,7 @@ import androidx.annotation.Nullable;
 
 import com.android.launcher3.ExtendedEditText;
 import com.android.launcher3.R;
-import com.android.launcher3.search.SearchAlgorithm;
-import com.android.launcher3.widget.model.WidgetsListBaseEntry;
-
-import java.util.List;
+import com.android.launcher3.popup.PopupDataProvider;
 
 /**
  * View for a search bar with an edit text with a cancel button.
@@ -54,12 +51,10 @@ public class LauncherWidgetsSearchBar extends LinearLayout implements WidgetsSea
     }
 
     @Override
-    public void initialize(List<WidgetsListBaseEntry> allWidgets,
-            SearchModeListener searchModeListener) {
-        SearchAlgorithm<WidgetsListBaseEntry> algo =
-                new SimpleWidgetsSearchAlgorithm(new SimpleWidgetsSearchPipeline(allWidgets));
+    public void initialize(PopupDataProvider dataProvider, SearchModeListener searchModeListener) {
         mController = new WidgetsSearchBarController(
-                algo, mEditText, mCancelButton, searchModeListener);
+                new SimpleWidgetsSearchAlgorithm(dataProvider),
+                mEditText, mCancelButton, searchModeListener);
     }
 
     @Override
diff --git a/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchAlgorithm.java b/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchAlgorithm.java
index 15d245486b..9be3b5f1e4 100644
--- a/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchAlgorithm.java
+++ b/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchAlgorithm.java
@@ -16,42 +16,41 @@
 
 package com.android.launcher3.widget.picker.search;
 
+import static com.android.launcher3.search.StringMatcherUtility.matches;
+
 import android.os.Handler;
-import android.util.Log;
 
+import com.android.launcher3.model.WidgetItem;
+import com.android.launcher3.popup.PopupDataProvider;
 import com.android.launcher3.search.SearchAlgorithm;
 import com.android.launcher3.search.SearchCallback;
+import com.android.launcher3.search.StringMatcherUtility.StringMatcher;
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
+import com.android.launcher3.widget.model.WidgetsListContentEntry;
+import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
+import com.android.launcher3.widget.model.WidgetsListSearchHeaderEntry;
 
 import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Implementation of {@link SearchAlgorithm} that posts a task to query on the main thread.
  */
 public final class SimpleWidgetsSearchAlgorithm implements SearchAlgorithm<WidgetsListBaseEntry> {
 
-    private static final boolean DEBUG = false;
-    private static final String TAG = "SimpleWidgetsSearchAlgo";
-    private static final String DELIM = "\t";
-
     private final Handler mResultHandler;
-    private final WidgetsPickerSearchPipeline mSearchPipeline;
+    private final PopupDataProvider mDataProvider;
 
-    public SimpleWidgetsSearchAlgorithm(WidgetsPickerSearchPipeline searchPipeline) {
+    public SimpleWidgetsSearchAlgorithm(PopupDataProvider dataProvider) {
         mResultHandler = new Handler();
-        mSearchPipeline = searchPipeline;
+        mDataProvider = dataProvider;
     }
 
     @Override
     public void doSearch(String query, SearchCallback<WidgetsListBaseEntry> callback) {
-        long startTime = System.currentTimeMillis();
-        String queryToken = query + DELIM + startTime;
-        if (DEBUG) {
-            Log.d(TAG, "doSearch queryToken:" + queryToken);
-        }
-        mSearchPipeline.query(query,
-                results -> mResultHandler.post(
-                        () -> callback.onSearchResult(queryToken, new ArrayList(results))));
+        ArrayList<WidgetsListBaseEntry> result = getFilteredWidgets(mDataProvider, query);
+        mResultHandler.post(() -> callback.onSearchResult(query, result));
     }
 
     @Override
@@ -60,4 +59,36 @@ public final class SimpleWidgetsSearchAlgorithm implements SearchAlgorithm<Widge
             mResultHandler.removeCallbacksAndMessages(/*token= */null);
         }
     }
+
+    /**
+     * Returns entries for all matched widgets
+     */
+    public static ArrayList<WidgetsListBaseEntry> getFilteredWidgets(
+            PopupDataProvider dataProvider, String input) {
+        ArrayList<WidgetsListBaseEntry> results = new ArrayList<>();
+        dataProvider.getAllWidgets().stream()
+                .filter(entry -> entry instanceof WidgetsListHeaderEntry)
+                .forEach(headerEntry -> {
+                    List<WidgetItem> matchedWidgetItems = filterWidgetItems(
+                            input, headerEntry.mPkgItem.title.toString(), headerEntry.mWidgets);
+                    if (matchedWidgetItems.size() > 0) {
+                        results.add(new WidgetsListSearchHeaderEntry(headerEntry.mPkgItem,
+                                headerEntry.mTitleSectionName, matchedWidgetItems));
+                        results.add(new WidgetsListContentEntry(headerEntry.mPkgItem,
+                                headerEntry.mTitleSectionName, matchedWidgetItems));
+                    }
+                });
+        return results;
+    }
+
+    private static List<WidgetItem> filterWidgetItems(String query, String packageTitle,
+            List<WidgetItem> items) {
+        StringMatcher matcher = StringMatcher.getInstance();
+        if (matches(query, packageTitle, matcher)) {
+            return items;
+        }
+        return items.stream()
+                .filter(item -> matches(query, item.label, matcher))
+                .collect(Collectors.toList());
+    }
 }
diff --git a/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchPipeline.java b/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchPipeline.java
deleted file mode 100644
index 5222e8ec59..0000000000
--- a/src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchPipeline.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.widget.picker.search;
-
-import static com.android.launcher3.search.StringMatcherUtility.matches;
-
-import com.android.launcher3.model.WidgetItem;
-import com.android.launcher3.search.StringMatcherUtility.StringMatcher;
-import com.android.launcher3.widget.model.WidgetsListBaseEntry;
-import com.android.launcher3.widget.model.WidgetsListContentEntry;
-import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
-import com.android.launcher3.widget.model.WidgetsListSearchHeaderEntry;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-
-/**
- * Implementation of {@link WidgetsPickerSearchPipeline} that performs search by prefix matching on
- * app names and widget labels.
- */
-public final class SimpleWidgetsSearchPipeline implements WidgetsPickerSearchPipeline {
-
-    private final List<WidgetsListBaseEntry> mAllEntries;
-
-    public SimpleWidgetsSearchPipeline(List<WidgetsListBaseEntry> allEntries) {
-        mAllEntries = allEntries;
-    }
-
-    @Override
-    public void query(String input, Consumer<List<WidgetsListBaseEntry>> callback) {
-        ArrayList<WidgetsListBaseEntry> results = new ArrayList<>();
-        mAllEntries.stream().filter(entry -> entry instanceof WidgetsListHeaderEntry)
-                .forEach(headerEntry -> {
-                    List<WidgetItem> matchedWidgetItems = filterWidgetItems(
-                            input, headerEntry.mPkgItem.title.toString(), headerEntry.mWidgets);
-                    if (matchedWidgetItems.size() > 0) {
-                        results.add(new WidgetsListSearchHeaderEntry(headerEntry.mPkgItem,
-                                headerEntry.mTitleSectionName, matchedWidgetItems));
-                        results.add(new WidgetsListContentEntry(headerEntry.mPkgItem,
-                                headerEntry.mTitleSectionName, matchedWidgetItems));
-                    }
-                });
-        callback.accept(results);
-    }
-
-    private List<WidgetItem> filterWidgetItems(String query, String packageTitle,
-            List<WidgetItem> items) {
-        StringMatcher matcher = StringMatcher.getInstance();
-        if (matches(query, packageTitle, matcher)) {
-            return items;
-        }
-        return items.stream()
-                .filter(item -> matches(query, item.label, matcher))
-                .collect(Collectors.toList());
-    }
-}
diff --git a/src/com/android/launcher3/widget/picker/search/WidgetsPickerSearchPipeline.java b/src/com/android/launcher3/widget/picker/search/WidgetsPickerSearchPipeline.java
deleted file mode 100644
index d12782c971..0000000000
--- a/src/com/android/launcher3/widget/picker/search/WidgetsPickerSearchPipeline.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.widget.picker.search;
-
-import com.android.launcher3.widget.model.WidgetsListBaseEntry;
-
-import java.util.List;
-import java.util.function.Consumer;
-
-/**
- * An interface for a pipeline to handle widgets search.
- */
-public interface WidgetsPickerSearchPipeline {
-
-    /**
-     * Performs a search query asynchronically. Invokes {@code callback} when the search is
-     * complete.
-     */
-    void query(String input, Consumer<List<WidgetsListBaseEntry>> callback);
-
-    /**
-     * Cancels any ongoing search request.
-     */
-    default void cancel() {};
-
-    /**
-     * Cleans up after search is no longer needed.
-     */
-    default void destroy() {};
-}
diff --git a/src/com/android/launcher3/widget/picker/search/WidgetsSearchBar.java b/src/com/android/launcher3/widget/picker/search/WidgetsSearchBar.java
index 3ac82c0ca7..0ac47ce5f2 100644
--- a/src/com/android/launcher3/widget/picker/search/WidgetsSearchBar.java
+++ b/src/com/android/launcher3/widget/picker/search/WidgetsSearchBar.java
@@ -16,9 +16,7 @@
 
 package com.android.launcher3.widget.picker.search;
 
-import com.android.launcher3.widget.model.WidgetsListBaseEntry;
-
-import java.util.List;
+import com.android.launcher3.popup.PopupDataProvider;
 
 /**
  * Interface for a widgets picker search bar.
@@ -27,7 +25,7 @@ public interface WidgetsSearchBar {
     /**
      * Attaches a controller to the search bar which interacts with {@code searchModeListener}.
      */
-    void initialize(List<WidgetsListBaseEntry> allWidgets, SearchModeListener searchModeListener);
+    void initialize(PopupDataProvider dataProvider, SearchModeListener searchModeListener);
 
     /**
      * Clears search bar.
-- 
GitLab


From e0536137b9fa5cdb5e1e5abd1b2fc11869e09243 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 30 Mar 2021 17:05:42 -0700
Subject: [PATCH 0804/1664] Marking tests as ignore

- Test runner seems to have trouble with test classes without
  tests

Bug: 182844465
Test: presubmit
Change-Id: Idd38822a16024daa548a09f583951334a10660cd
---
 .../src/com/android/launcher3/ui/WorkTabTest.java  | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/tests/src/com/android/launcher3/ui/WorkTabTest.java b/tests/src/com/android/launcher3/ui/WorkTabTest.java
index 919c89fd56..bfacc74220 100644
--- a/tests/src/com/android/launcher3/ui/WorkTabTest.java
+++ b/tests/src/com/android/launcher3/ui/WorkTabTest.java
@@ -42,6 +42,8 @@ import com.android.launcher3.views.WorkEduView;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.util.List;
@@ -89,7 +91,8 @@ public class WorkTabTest extends AbstractLauncherUiTest {
         });
     }
 
-//    @Test
+    @Ignore("b/182844465")
+    @Test
     public void workTabExists() {
         mDevice.pressHome();
         waitForLauncherCondition("Launcher didn't start", Objects::nonNull);
@@ -101,7 +104,8 @@ public class WorkTabTest extends AbstractLauncherUiTest {
                 launcher -> launcher.getAppsView().isWorkTabVisible(), 60000);
     }
 
-//    @Test
+    @Ignore("b/182844465")
+    @Test
     public void toggleWorks() {
         mDevice.pressHome();
         waitForLauncherCondition("Launcher didn't start", Objects::nonNull);
@@ -132,7 +136,8 @@ public class WorkTabTest extends AbstractLauncherUiTest {
                 l -> l.getSystemService(UserManager.class).isQuietModeEnabled(workProfile));
     }
 
-//    @Test
+    @Ignore("b/182844465")
+    @Test
     public void testWorkEduFlow() {
         mDevice.pressHome();
         waitForLauncherCondition("Launcher didn't start", Objects::nonNull);
@@ -175,7 +180,8 @@ public class WorkTabTest extends AbstractLauncherUiTest {
         });
     }
 
-//    @Test
+    @Ignore("b/182844465")
+    @Test
     public void testWorkEduIntermittent() {
         mDevice.pressHome();
         waitForLauncherCondition("Launcher didn't start", Objects::nonNull);
-- 
GitLab


From 3804f91a46782092a62021d58605b2c49f8011ee Mon Sep 17 00:00:00 2001
From: Marvin Bernal <marvinbernal@google.com>
Date: Wed, 31 Mar 2021 00:39:17 +0000
Subject: [PATCH 0805/1664] Add System Back function to SystemUiProxy

Bug: 183988752
Test: mp launcher
Change-Id: Iaddd1f8a9440c80840209d653c0b3e59b8138a26
---
 .../src/com/android/quickstep/SystemUiProxy.java      | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index cf71eaeeb8..1f332c4dda 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -87,6 +87,17 @@ public class SystemUiProxy implements ISystemUiProxy,
         setNavBarButtonAlpha(1f, false);
     }
 
+    @Override
+    public void onBackPressed() {
+        if (mSystemUiProxy != null) {
+            try {
+                mSystemUiProxy.onBackPressed();
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call onBackPressed", e);
+            }
+        }
+    }
+
     @Override
     public IBinder asBinder() {
         // Do nothing
-- 
GitLab


From a547b781ee5a72fcfb8c672df342a86cf54cf800 Mon Sep 17 00:00:00 2001
From: Zak Cohen <zakcohen@google.com>
Date: Mon, 29 Mar 2021 16:52:26 -0700
Subject: [PATCH 0806/1664] Overview - update UI to use solid color scrim.

Also required updates to colors and status bar icons to match with new
color.

Bug: 179922117
Test: local build and flash on two devices

Change-Id: Ibec54107f52c01f125e6d100abe32434f2067b71
---
 quickstep/res/values/styles.xml               |  2 +-
 .../uioverrides/states/OverviewState.java     |  2 +-
 .../QuickSwitchTouchController.java           |  7 +++--
 .../android/quickstep/AbsSwipeUpHandler.java  | 10 +++++--
 .../android/quickstep/RecentsActivity.java    |  3 +-
 .../quickstep/SwipeUpAnimationLogic.java      | 13 ++-------
 .../quickstep/util/TaskViewSimulator.java     |  3 +-
 .../quickstep/util/TransformParams.java       | 14 ---------
 .../android/quickstep/views/RecentsView.java  | 29 ++++++++++++++++---
 res/color/overview_button.xml                 |  4 +--
 .../launcher3/graphics/OverviewScrim.java     | 11 ++++++-
 11 files changed, 55 insertions(+), 43 deletions(-)

diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml
index df089f6738..e56397aa94 100644
--- a/quickstep/res/values/styles.xml
+++ b/quickstep/res/values/styles.xml
@@ -81,7 +81,7 @@
         parent="@android:style/Widget.DeviceDefault.Button.Borderless">
         <item name="android:textColor">@color/overview_button</item>
         <item name="android:drawableTint">@color/overview_button</item>
-        <item name="android:tint">?attr/workspaceTextColor</item>
+        <item name="android:tint">?android:attr/textColorPrimary</item>
         <item name="android:drawablePadding">8dp</item>
         <item name="android:textAllCaps">false</item>
     </style>
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
index 43e70a3923..b269901a0b 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -105,7 +105,7 @@ public class OverviewState extends LauncherState {
 
     @Override
     public float getOverviewScrimAlpha(Launcher launcher) {
-        return 0.5f;
+        return 1f;
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
index fc9e1bbfe5..a4518bda85 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
@@ -137,14 +137,17 @@ public class QuickSwitchTouchController extends AbstractStateChangeTouchControll
 
     private void updateFullscreenProgress(float progress) {
         mOverviewPanel.setFullscreenProgress(progress);
-        int sysuiFlags = 0;
         if (progress > UPDATE_SYSUI_FLAGS_THRESHOLD) {
+            int sysuiFlags = 0;
             TaskView tv = mOverviewPanel.getTaskViewAt(0);
             if (tv != null) {
                 sysuiFlags = tv.getThumbnail().getSysUiStatusNavFlags();
             }
+            mLauncher.getSystemUiController().updateUiState(UI_STATE_OVERVIEW, sysuiFlags);
+        } else {
+            mLauncher.getSystemUiController().updateUiState(
+                    UI_STATE_OVERVIEW, mOverviewPanel.hasLightBackground());
         }
-        mLauncher.getSystemUiController().updateUiState(UI_STATE_OVERVIEW, sysuiFlags);
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 1a5f9c221e..6394131091 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -91,7 +91,6 @@ import com.android.launcher3.util.VibratorWrapper;
 import com.android.launcher3.util.WindowBounds;
 import com.android.quickstep.BaseActivityInterface.AnimationFactory;
 import com.android.quickstep.GestureState.GestureEndTarget;
-import com.android.quickstep.inputconsumers.OverviewInputConsumer;
 import com.android.quickstep.util.ActiveGestureLog;
 import com.android.quickstep.util.ActivityInitListener;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
@@ -654,8 +653,13 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                     ||  (quickswitchThresholdPassed && centermostTaskFlags != 0));
             mRecentsAnimationController.setSplitScreenMinimized(swipeUpThresholdPassed);
 
-            int sysuiFlags = swipeUpThresholdPassed ? 0 : centermostTaskFlags;
-            mActivity.getSystemUiController().updateUiState(UI_STATE_OVERVIEW, sysuiFlags);
+            if (swipeUpThresholdPassed) {
+                mActivity.getSystemUiController().updateUiState(
+                        UI_STATE_OVERVIEW, mRecentsView.hasLightBackground());
+            } else {
+                mActivity.getSystemUiController().updateUiState(
+                        UI_STATE_OVERVIEW, centermostTaskFlags);
+            }
         }
     }
 
diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index d3ed791b40..1340abb6ab 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -56,7 +56,6 @@ import com.android.launcher3.util.ActivityOptionsWrapper;
 import com.android.launcher3.util.ActivityTracker;
 import com.android.launcher3.util.RunnableList;
 import com.android.launcher3.util.SystemUiController;
-import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.BaseDragLayer;
 import com.android.quickstep.fallback.FallbackRecentsStateController;
 import com.android.quickstep.fallback.FallbackRecentsView;
@@ -267,7 +266,7 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
         setupViews();
 
         getSystemUiController().updateUiState(SystemUiController.UI_STATE_BASE_WINDOW,
-                Themes.getAttrBoolean(this, R.attr.isWorkspaceDarkText));
+                mFallbackRecentsView.hasLightBackground());
         ACTIVITY_TRACKER.handleCreate(this);
     }
 
diff --git a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
index f4b8b62c6d..a8c09dc8fa 100644
--- a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
+++ b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
@@ -29,7 +29,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.UiThread;
 
 import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.AnimatorPlaybackController;
@@ -67,8 +66,6 @@ public abstract class SwipeUpAnimationLogic {
     // How much further we can drag past recents, as a factor of mTransitionDragLength.
     protected float mDragLengthFactor = 1;
 
-    protected final float mMaxShadowRadius;
-
     protected AnimatorControllerWithResistance mWindowTransitionController;
 
     public SwipeUpAnimationLogic(Context context, RecentsAnimationDeviceState deviceState,
@@ -82,9 +79,6 @@ public abstract class SwipeUpAnimationLogic {
         mTaskViewSimulator.getOrientationState().update(
                 mDeviceState.getRotationTouchHelper().getCurrentActiveRotation(),
                 mDeviceState.getRotationTouchHelper().getDisplayRotation());
-
-        mMaxShadowRadius = context.getResources().getDimensionPixelSize(R.dimen.max_shadow_radius);
-        mTransformParams.setShadowRadius(mMaxShadowRadius);
     }
 
     protected void initTransitionEndpoints(DeviceProfile dp) {
@@ -271,11 +265,9 @@ public abstract class SwipeUpAnimationLogic {
 
             mMatrix.setRectToRect(mCropRectF, mWindowCurrentRect, ScaleToFit.FILL);
             float cornerRadius = Utilities.mapRange(progress, mStartRadius, mEndRadius);
-            float shadowRadius = Utilities.mapRange(progress, mMaxShadowRadius, 0);
             mTransformParams
                     .setTargetAlpha(getWindowAlpha(progress))
-                    .setCornerRadius(cornerRadius)
-                    .setShadowRadius(shadowRadius);
+                    .setCornerRadius(cornerRadius);
 
             mTransformParams.applySurfaceParams(mTransformParams.createSurfaceParams(this));
             mAnimationFactory.update(currentRect, progress, mMatrix.mapRadius(cornerRadius));
@@ -286,8 +278,7 @@ public abstract class SwipeUpAnimationLogic {
                 Builder builder, RemoteAnimationTargetCompat app, TransformParams params) {
             builder.withMatrix(mMatrix)
                     .withWindowCrop(mCropRect)
-                    .withCornerRadius(params.getCornerRadius())
-                    .withShadowRadius(app.isTranslucent ? 0 : params.getShadowRadius());
+                    .withCornerRadius(params.getCornerRadius());
         }
 
         @Override
diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index 6cfe3029d8..3c8a12c876 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -330,8 +330,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
             Builder builder, RemoteAnimationTargetCompat app, TransformParams params) {
         builder.withMatrix(mMatrix)
                 .withWindowCrop(mTmpCropRect)
-                .withCornerRadius(getCurrentCornerRadius())
-                .withShadowRadius(app.isTranslucent ? 0 : params.getShadowRadius());
+                .withCornerRadius(getCurrentCornerRadius());
 
         if (LIVE_TILE.get() && params.getRecentsSurface() != null) {
             // When relativeLayer = 0, it reverts the surfaces back to the original order.
diff --git a/quickstep/src/com/android/quickstep/util/TransformParams.java b/quickstep/src/com/android/quickstep/util/TransformParams.java
index cdf5163f59..756331dcdf 100644
--- a/quickstep/src/com/android/quickstep/util/TransformParams.java
+++ b/quickstep/src/com/android/quickstep/util/TransformParams.java
@@ -57,7 +57,6 @@ public class TransformParams {
     private float mProgress;
     private float mTargetAlpha;
     private float mCornerRadius;
-    private float mShadowRadius;
     private RemoteAnimationTargets mTargetSet;
     private SurfaceTransactionApplier mSyncTransactionApplier;
     private SurfaceControl mRecentsSurface;
@@ -69,7 +68,6 @@ public class TransformParams {
         mProgress = 0;
         mTargetAlpha = 1;
         mCornerRadius = -1;
-        mShadowRadius = 0;
     }
 
     /**
@@ -92,14 +90,6 @@ public class TransformParams {
         return this;
     }
 
-    /**
-     * Sets the shadow radius of the transformed window, in pixels.
-     */
-    public TransformParams setShadowRadius(float shadowRadius) {
-        mShadowRadius = shadowRadius;
-        return this;
-    }
-
     /**
      * Specifies the alpha of the transformed window. Default is 1.
      */
@@ -207,10 +197,6 @@ public class TransformParams {
         return mCornerRadius;
     }
 
-    public float getShadowRadius() {
-        return mShadowRadius;
-    }
-
     public SurfaceControl getRecentsSurface() {
         return mRecentsSurface;
     }
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index a35580f2bb..7a1076c620 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -439,6 +439,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
 
     private boolean mRunningTaskIconScaledDown = false;
 
+    private final boolean mHasLightBackground;
     private boolean mOverviewStateEnabled;
     private boolean mHandleTaskStackChanges;
     private boolean mSwipeDownShouldLaunchApp;
@@ -570,6 +571,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mLiveTileTaskViewSimulator.recentsViewScale.value = 1;
         mLiveTileTaskViewSimulator.setOrientationState(mOrientationState);
         mLiveTileTaskViewSimulator.setDrawsBelowRecents(true);
+
+        mHasLightBackground = Themes.getAttrBoolean(mActivity, android.R.attr.isLightTheme);
     }
 
     public OverScroller getScroller() {
@@ -847,6 +850,13 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                 cancelSplitSelect(false);
             }
         }
+
+        if (enabled) {
+            mActivity.getSystemUiController().updateUiState(
+                    UI_STATE_OVERVIEW, hasLightBackground());
+        } else {
+            mActivity.getSystemUiController().updateUiState(UI_STATE_OVERVIEW, 0);
+        }
     }
 
     public void onDigitalWellbeingToastShown() {
@@ -2515,6 +2525,14 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         }
     }
 
+    /**
+     * True if the background scrim of the recents view is light colored and the foreground elements
+     * should use dark colors.
+     */
+    public boolean hasLightBackground() {
+        return mHasLightBackground;
+    }
+
     public void initiateSplitSelect(TaskView taskView, SplitPositionOption splitPositionOption) {
         mSplitHiddenTaskView = taskView;
         mSplitPlaceholderView.getSplitController().setInitialTaskSelect(taskView,
@@ -2759,10 +2777,13 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         progressAnim.addUpdateListener(animator -> {
             // Once we pass a certain threshold, update the sysui flags to match the target
             // tasks' flags
-            mActivity.getSystemUiController().updateUiState(UI_STATE_OVERVIEW,
-                    animator.getAnimatedFraction() > UPDATE_SYSUI_FLAGS_THRESHOLD
-                            ? targetSysUiFlags
-                            : 0);
+            if (animator.getAnimatedFraction() > UPDATE_SYSUI_FLAGS_THRESHOLD) {
+                mActivity.getSystemUiController().updateUiState(
+                        UI_STATE_OVERVIEW, targetSysUiFlags);
+            } else {
+                mActivity.getSystemUiController().updateUiState(
+                        UI_STATE_OVERVIEW, hasLightBackground());
+            }
 
             // Passing the threshold from taskview to fullscreen app will vibrate
             final boolean passed = animator.getAnimatedFraction() >=
diff --git a/res/color/overview_button.xml b/res/color/overview_button.xml
index 6ac36bf5df..aa48b78604 100644
--- a/res/color/overview_button.xml
+++ b/res/color/overview_button.xml
@@ -2,10 +2,10 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:alpha="1"
-        android:color="?attr/workspaceTextColor"
+        android:color="?android:attr/textColorPrimary"
         android:state_enabled="true" />
     <item
         android:alpha="?android:disabledAlpha"
-        android:color="?attr/workspaceTextColor"
+        android:color="?android:attr/textColorPrimary"
         android:state_enabled="false" />
 </selector>
\ No newline at end of file
diff --git a/src/com/android/launcher3/graphics/OverviewScrim.java b/src/com/android/launcher3/graphics/OverviewScrim.java
index 53303dbbe5..7d52744b44 100644
--- a/src/com/android/launcher3/graphics/OverviewScrim.java
+++ b/src/com/android/launcher3/graphics/OverviewScrim.java
@@ -25,6 +25,10 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.android.launcher3.R;
+import com.android.launcher3.uioverrides.WallpaperColorInfo;
+import com.android.launcher3.util.Themes;
+
 /**
  * View scrim which draws behind overview (recent apps).
  */
@@ -52,7 +56,7 @@ public class OverviewScrim extends Scrim {
     public OverviewScrim(View view) {
         super(view);
 
-        onExtractedColorsChanged(mWallpaperColorInfo);
+        mScrimColor = Themes.getAttrColor(view.getContext(), R.attr.allAppsScrimColor);
     }
 
     /**
@@ -74,6 +78,11 @@ public class OverviewScrim extends Scrim {
         }
     }
 
+    @Override
+    public void onExtractedColorsChanged(WallpaperColorInfo wallpaperColorInfo) {
+        // No super, don't respond to wallpaper colors, follow device ones instead
+    }
+
     /**
      * @return The view to draw the scrim behind, or null if all visible views should be scrimmed.
      */
-- 
GitLab


From 941375eda4bb4ae06a85306b7fed24f1b4d9fd82 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Wed, 31 Mar 2021 13:10:45 -0400
Subject: [PATCH 0807/1664] Only hide workspace labels if there is not enough
 space for it in the cell.

- Also increases the spacing in all apps to reduce visual clitter.

Bug: 175329686
Test: manual, change grid to mw, smaller grid, and verify labels
Change-Id: I75c7fa9c69b8446ce0e48f4353fb225004e2a2fc
---
 src/com/android/launcher3/DeviceProfile.java | 42 ++++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 1ce5f4dba6..a207731472 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -404,12 +404,7 @@ public class DeviceProfile {
                 .setMultiWindowMode(true)
                 .build();
 
-        // If there isn't enough vertical cell padding with the labels displayed, hide the labels.
-        float workspaceCellPaddingY = profile.getCellSize().y - profile.iconSizePx
-                - iconDrawablePaddingPx - profile.iconTextSizePx;
-        if (workspaceCellPaddingY < profile.iconDrawablePaddingPx * 2) {
-            profile.adjustToHideWorkspaceLabels();
-        }
+        profile.hideWorkspaceLabelsIfNotEnoughSpace();
 
         // We use these scales to measure and layout the widgets using their full invariant profile
         // sizes and then draw them scaled and centered to fit in their multi-window mode cellspans.
@@ -430,24 +425,32 @@ public class DeviceProfile {
     }
 
     /**
-     * Adjusts the profile so that the labels on the Workspace are hidden.
+     * Checks if there is enough space for labels on the workspace.
+     * If there is not, labels on the Workspace are hidden.
      * It is important to call this method after the All Apps variables have been set.
      */
-    private void adjustToHideWorkspaceLabels() {
-        iconTextSizePx = 0;
-        iconDrawablePaddingPx = 0;
-        cellHeightPx = iconSizePx;
-        autoResizeAllAppsCells();
+    private void hideWorkspaceLabelsIfNotEnoughSpace() {
+        float iconTextHeight = Utilities.calculateTextHeight(iconTextSizePx);
+        float workspaceCellPaddingY = getCellSize().y - iconSizePx - iconDrawablePaddingPx
+                - iconTextHeight;
+
+        // We want enough space so that the text is closer to its corresponding icon.
+        if (workspaceCellPaddingY < iconTextHeight) {
+            iconTextSizePx = 0;
+            iconDrawablePaddingPx = 0;
+            cellHeightPx = iconSizePx;
+            autoResizeAllAppsCells();
+        }
     }
 
     /**
      * Re-computes the all-apps cell size to be independent of workspace
      */
     public void autoResizeAllAppsCells() {
-        int topBottomPadding = allAppsIconDrawablePaddingPx * (isVerticalBarLayout() ? 2 : 1);
+        int textHeight = Utilities.calculateTextHeight(allAppsIconTextSizePx);
+        int topBottomPadding = textHeight;
         allAppsCellHeightPx = allAppsIconSizePx + allAppsIconDrawablePaddingPx
-                + Utilities.calculateTextHeight(allAppsIconTextSizePx)
-                + topBottomPadding * 2;
+                + textHeight + (topBottomPadding * 2);
     }
 
     /**
@@ -536,9 +539,7 @@ public class DeviceProfile {
             allAppsIconSizePx = pxFromDp(inv.allAppsIconSize, mInfo.metrics);
             allAppsIconTextSizePx = Utilities.pxFromSp(inv.allAppsIconTextSize, mInfo.metrics);
             allAppsIconDrawablePaddingPx = iconDrawablePaddingOriginalPx;
-            // We use 4 below to ensure labels are closer to their corresponding icon.
-            allAppsCellHeightPx = Math.round(allAppsIconSizePx + allAppsIconTextSizePx
-                    + (4 * allAppsIconDrawablePaddingPx));
+            autoResizeAllAppsCells();
         } else {
             allAppsIconSizePx = iconSizePx;
             allAppsIconTextSizePx = iconTextSizePx;
@@ -547,9 +548,8 @@ public class DeviceProfile {
         }
         allAppsCellWidthPx = allAppsIconSizePx + allAppsIconDrawablePaddingPx;
 
-        if (isVerticalBarLayout()) {
-            // Always hide the Workspace text with vertical bar layout.
-            adjustToHideWorkspaceLabels();
+        if (isVerticalLayout) {
+            hideWorkspaceLabelsIfNotEnoughSpace();
         }
 
         // Hotseat
-- 
GitLab


From 157a9ee7dd3b9a8a2440d32614b2c37f7ec2ac85 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 31 Mar 2021 12:58:39 -0700
Subject: [PATCH 0808/1664] Removing some unused classes

Bug: 184183801
Test: Manual
Change-Id: I946b4b4d486d52e467bb3df7dcac65e534803b7d
---
 ...ButtonNavbarToOverviewTouchController.java |  17 ---
 .../graphics/NinePatchDrawHelper.java         | 100 ------------------
 2 files changed, 117 deletions(-)
 delete mode 100644 src/com/android/launcher3/graphics/NinePatchDrawHelper.java

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
index e70450d6b4..0921ad31ad 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -38,7 +38,6 @@ import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.graphics.PointF;
 import android.view.MotionEvent;
-import android.view.View;
 import android.view.ViewConfiguration;
 
 import com.android.launcher3.Launcher;
@@ -155,11 +154,6 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
             super.onDragEnd(velocity);
         }
 
-        View searchView = mLauncher.getHotseat().getQsb();
-        if (searchView instanceof FeedbackHandler) {
-            ((FeedbackHandler) searchView).resetFeedback();
-        }
-
         mMotionPauseDetector.clear();
         mNormalToHintOverviewScrimAnimator = null;
         if (mLauncher.isInState(OVERVIEW)) {
@@ -314,15 +308,4 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
         }
         return super.getConfigForStates(fromState, toState);
     }
-
-    /**
-     * Interface for views with feedback animation requiring reset
-     */
-    public interface FeedbackHandler {
-
-        /**
-         * reset searchWidget feedback
-         */
-        void resetFeedback();
-    }
 }
diff --git a/src/com/android/launcher3/graphics/NinePatchDrawHelper.java b/src/com/android/launcher3/graphics/NinePatchDrawHelper.java
deleted file mode 100644
index 587268968b..0000000000
--- a/src/com/android/launcher3/graphics/NinePatchDrawHelper.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.graphics;
-
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Rect;
-import android.graphics.RectF;
-
-/**
- * Utility class which draws a bitmap by dissecting it into 3 segments and stretching
- * the middle segment.
- */
-public class NinePatchDrawHelper {
-
-    // The extra width used for the bitmap. This portion of the bitmap is stretched to match the
-    // width of the draw region. Randomly chosen, any value > 4 will be sufficient.
-    public static final int EXTENSION_PX = 20;
-
-    private final Rect mSrc = new Rect();
-    private final RectF mDst = new RectF();
-    // Enable filtering to always get a nice edge. This avoids jagged line, when bitmap is
-    // translated by half pixel.
-    public final Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG);
-
-    /**
-     * Draws the bitmap split into three parts horizontally, with the middle part having width
-     * as {@link #EXTENSION_PX} in the center of the bitmap.
-     */
-    public void draw(Bitmap bitmap, Canvas canvas, float left, float top, float right) {
-        int height = bitmap.getHeight();
-
-        mSrc.top = 0;
-        mSrc.bottom = height;
-        mDst.top = top;
-        mDst.bottom = top + height;
-        draw3Patch(bitmap, canvas, left, right);
-    }
-
-
-    /**
-     * Draws the bitmap split horizontally into 3 parts (same as {@link #draw}) and split
-     * vertically into two parts, bottom part of size {@link #EXTENSION_PX} / 2 which is
-     * stretched vertically.
-     */
-    public void drawVerticallyStretched(Bitmap bitmap, Canvas canvas, float left, float top,
-            float right, float bottom) {
-        draw(bitmap, canvas, left, top, right);
-
-        // Draw bottom stretched region.
-        int height = bitmap.getHeight();
-        mSrc.top = height - EXTENSION_PX / 4;
-        mSrc.bottom = height;
-        mDst.top = top + height;
-        mDst.bottom = bottom;
-        draw3Patch(bitmap, canvas, left, right);
-    }
-
-
-
-    private void draw3Patch(Bitmap bitmap, Canvas canvas, float left, float right) {
-        int width = bitmap.getWidth();
-        int halfWidth = width / 2;
-
-        // Draw left edge
-        drawRegion(bitmap, canvas, 0, halfWidth, left, left + halfWidth);
-
-        // Draw right edge
-        drawRegion(bitmap, canvas, halfWidth, width, right - halfWidth, right);
-
-        // Draw middle stretched region
-        int halfExt = EXTENSION_PX / 4;
-        drawRegion(bitmap, canvas, halfWidth - halfExt, halfWidth + halfExt,
-                left + halfWidth, right - halfWidth);
-    }
-
-    private void drawRegion(Bitmap bitmap, Canvas c,
-            int srcLeft, int srcRight, float dstLeft, float dstRight) {
-        mSrc.left = srcLeft;
-        mSrc.right = srcRight;
-
-        mDst.left = dstLeft;
-        mDst.right = dstRight;
-        c.drawBitmap(bitmap, mSrc, mDst, paint);
-    }
-}
-- 
GitLab


From 0b5b8d4969d09c76d87f16d66724da2aeb9ebd4f Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 31 Mar 2021 14:56:47 -0700
Subject: [PATCH 0809/1664] Fixing all-apps appearing as blank

Since all-apps and homescreen do not share any QSB, we can
change the alpha for hotseat QSB directly

Bug: 184122599
Test: Manual
Change-Id: Ifa610fe75ad22cfe8a7d816ed2b48e2b9411c4c1
---
 src/com/android/launcher3/Hotseat.java        | 13 -------
 src/com/android/launcher3/Launcher.java       | 35 +------------------
 .../allapps/AllAppsContainerView.java         | 11 ------
 .../allapps/AllAppsTransitionController.java  |  1 -
 4 files changed, 1 insertion(+), 59 deletions(-)

diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index 15e12d697c..5429806ede 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -29,7 +29,6 @@ import android.widget.FrameLayout;
 
 import androidx.annotation.Nullable;
 
-import java.util.Arrays;
 import java.util.function.Consumer;
 
 /**
@@ -97,7 +96,6 @@ public class Hotseat extends CellLayout implements Insettable {
         } else {
             setGridSize(idp.numHotseatIcons, 1);
         }
-        showInlineQsb();
     }
 
     @Override
@@ -182,10 +180,6 @@ public class Hotseat extends CellLayout implements Insettable {
         mOnVisibilityAggregatedCallback = callback;
     }
 
-    protected void showInlineQsb() {
-        //Does nothing
-    }
-
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
@@ -223,13 +217,6 @@ public class Hotseat extends CellLayout implements Insettable {
         mTaskbarView.layout(left, top, right, bottom);
     }
 
-    /**
-     * Returns the first View for which the given itemOperator returns true, or null.
-     */
-    public View getFirstItemMatch(Workspace.ItemOperator itemOperator) {
-        return mWorkspace.getFirstMatch(Arrays.asList(this), itemOperator);
-    }
-
     /**
      * Sets the alpha value of just our ShortcutAndWidgetContainer.
      */
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 5eba39927f..f7cf66bf6a 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -34,7 +34,6 @@ import static com.android.launcher3.LauncherState.FLAG_NON_INTERACTIVE;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.NO_OFFSET;
 import static com.android.launcher3.LauncherState.NO_SCALE;
-import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.SPRING_LOADED;
 import static com.android.launcher3.Utilities.postAsyncCallback;
 import static com.android.launcher3.accessibility.LauncherAccessibilityDelegate.getSupportedActions;
@@ -149,7 +148,6 @@ import com.android.launcher3.popup.SystemShortcut;
 import com.android.launcher3.qsb.QsbContainerView;
 import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
-import com.android.launcher3.statemanager.StateManager.StateListener;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.states.RotationHelper;
 import com.android.launcher3.testing.TestLogging;
@@ -269,9 +267,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     private static final int NEW_APPS_ANIMATION_INACTIVE_TIMEOUT_SECONDS = 5;
     @Thunk @VisibleForTesting public static final int NEW_APPS_ANIMATION_DELAY = 500;
 
-    private static final int APPS_VIEW_ALPHA_CHANNEL_INDEX = 1;
-    private static final int SCRIM_VIEW_ALPHA_CHANNEL_INDEX = 0;
-
     private static final int THEME_CROSS_FADE_ANIMATION_DURATION = 375;
 
     private Configuration mOldConfig;
@@ -342,8 +337,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
     private RotationHelper mRotationHelper;
 
-    private float mCurrentAssistantVisibility = 0f;
-
     protected LauncherOverlayManager mOverlayManager;
     // If true, overlay callbacks are deferred
     private boolean mDeferOverlayCallbacks;
@@ -457,24 +450,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
                 OverlayPlugin.class, false /* allowedMultiple */);
 
         mRotationHelper.initialize();
-
-        mStateManager.addStateListener(new StateListener<LauncherState>() {
-
-            @Override
-            public void onStateTransitionComplete(LauncherState finalState) {
-                float alpha = 1f - mCurrentAssistantVisibility;
-                if (finalState == NORMAL) {
-                    mAppsView.getAlphaProperty(APPS_VIEW_ALPHA_CHANNEL_INDEX).setValue(alpha);
-                } else if (finalState == OVERVIEW) {
-                    mAppsView.getAlphaProperty(APPS_VIEW_ALPHA_CHANNEL_INDEX).setValue(alpha);
-                    mScrimView.setAlpha(alpha);
-                } else {
-                    mAppsView.getAlphaProperty(APPS_VIEW_ALPHA_CHANNEL_INDEX).setValue(1f);
-                    mScrimView.setAlpha(1f);
-                }
-            }
-        });
-
         TraceHelper.INSTANCE.endSection(traceToken);
 
         mUserChangedCallbackCloseable = UserCache.INSTANCE.get(this).addUserChangeListener(
@@ -563,15 +538,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     }
 
     public void onAssistantVisibilityChanged(float visibility) {
-        mCurrentAssistantVisibility = visibility;
-        float alpha = 1f - visibility;
-        LauncherState state = mStateManager.getState();
-        if (state == NORMAL) {
-            mAppsView.getAlphaProperty(APPS_VIEW_ALPHA_CHANNEL_INDEX).setValue(alpha);
-        } else if (state == OVERVIEW) {
-            mAppsView.getAlphaProperty(APPS_VIEW_ALPHA_CHANNEL_INDEX).setValue(alpha);
-            mScrimView.setAlpha(alpha);
-        }
+        mHotseat.getQsb().setAlpha(1f - visibility);
     }
 
     private void initDeviceProfile(InvariantDeviceProfile idp) {
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 225e1c1440..406e785ad5 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -64,8 +64,6 @@ import com.android.launcher3.keyboard.FocusedItemDecorator;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.ItemInfoMatcher;
-import com.android.launcher3.util.MultiValueAlpha;
-import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.RecyclerViewFastScroller;
 import com.android.launcher3.views.SpringRelativeLayout;
@@ -80,7 +78,6 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
     private static final float FLING_VELOCITY_MULTIPLIER = 1000 * .8f;
     // Starts the springs after at least 55% of the animation has passed.
     private static final float FLING_ANIMATION_THRESHOLD = 0.55f;
-    private static final int ALPHA_CHANNEL_COUNT = 2;
 
     protected final BaseDraggingActivity mLauncher;
     protected final AdapterHolder[] mAH;
@@ -107,8 +104,6 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
     protected RecyclerViewFastScroller mTouchHandler;
     protected final Point mFastScrollerOffset = new Point();
 
-    private final MultiValueAlpha mMultiValueAlpha;
-
     private Rect mInsets = new Rect();
 
     SearchAdapterProvider mSearchAdapterProvider;
@@ -139,8 +134,6 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         mNavBarScrimPaint.setColor(Themes.getAttrColor(context, R.attr.allAppsNavBarScrimColor));
 
         mAllAppsStore.addUpdateListener(this::onAppsUpdated);
-
-        mMultiValueAlpha = new MultiValueAlpha(this, ALPHA_CHANNEL_COUNT);
     }
 
     /**
@@ -156,10 +149,6 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         return mAllAppsStore;
     }
 
-    public AlphaProperty getAlphaProperty(int index) {
-        return mMultiValueAlpha.getProperty(index);
-    }
-
     public WorkModeSwitch getWorkModeSwitch() {
         return mWorkModeSwitch;
     }
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 8c5b0fe0c4..f031136309 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -110,7 +110,6 @@ public class AllAppsTransitionController
         setScrollRangeDelta(mScrollRangeDelta);
 
         if (mIsVerticalLayout) {
-            mAppsView.getAlphaProperty(APPS_VIEW_ALPHA_CHANNEL_INDEX).setValue(1);
             mLauncher.getHotseat().setTranslationY(0);
             mLauncher.getWorkspace().getPageIndicator().setTranslationY(0);
         }
-- 
GitLab


From b391ebf79813e0ec18d549f1d4e3fc363fddafa6 Mon Sep 17 00:00:00 2001
From: Zak Cohen <zakcohen@google.com>
Date: Wed, 31 Mar 2021 15:09:34 -0700
Subject: [PATCH 0810/1664] TAPL Increase size of Background to Overview swipe
 gesture

The instrumentation is using the swipe height, not width, for when in
landscape. Ideally this should be plumbed through but it isn't yet so fix
with a bigger gesture.

Test: TaplTestNexus#testBackground
Bug: 184059820
Change-Id: Id19f65f51468af707baea0a1b31569bb84f7fcb8
---
 tests/tapl/com/android/launcher3/tapl/Background.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/Background.java b/tests/tapl/com/android/launcher3/tapl/Background.java
index d3177837d2..4a666b17f3 100644
--- a/tests/tapl/com/android/launcher3/tapl/Background.java
+++ b/tests/tapl/com/android/launcher3/tapl/Background.java
@@ -122,7 +122,9 @@ public class Background extends LauncherInstrumentation.VisibleContainer {
                     endY = startY - swipeLength;
                 } else {
                     startX = getSwipeStartX();
-                    endX = startX - swipeLength;
+                    // TODO(b/184059820) make horizontal swipe use swipe width not height, for the
+                    // moment just double the swipe length.
+                    endX = startX - swipeLength * 2;
                     startY = endY = mLauncher.getDevice().getDisplayHeight() / 2;
                 }
 
-- 
GitLab


From 58530bd64b51419a9d6dbd9c13ec80153c4e6b95 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 31 Mar 2021 15:56:11 -0700
Subject: [PATCH 0811/1664] Fixing notification dots settings not updated
 properly

Also avoiding settings cache reset whenever someone registers
a new listener

Bug: 184200027
Test: Manual
Change-Id: I0c8b7084b6b4656102e9041b779b80a98624ddd8
---
 .../RecentsAnimationDeviceState.java          |  4 +--
 .../logging/SettingsChangeLogger.java         |  2 +-
 .../android/launcher3/LauncherAppState.java   |  2 +-
 .../notification/NotificationListener.java    |  6 ++--
 .../settings/NotificationDotsPreference.java  | 34 +++++++++++++++++++
 .../launcher3/settings/SettingsActivity.java  | 34 +------------------
 .../android/launcher3/util/SettingsCache.java | 22 +++++-------
 7 files changed, 51 insertions(+), 53 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index 458f45a75d..23e35f6307 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -187,7 +187,7 @@ public class RecentsAnimationDeviceState implements
             SettingsCache.OnChangeListener onChangeListener =
                     enabled -> mIsOneHandedModeEnabled = enabled;
             settingsCache.register(oneHandedUri, onChangeListener);
-            settingsCache.dispatchOnChange(oneHandedUri);
+            mIsOneHandedModeEnabled = settingsCache.getValue(oneHandedUri);
             runOnDestroy(() -> settingsCache.unregister(oneHandedUri, onChangeListener));
         } else {
             mIsOneHandedModeEnabled = false;
@@ -199,7 +199,7 @@ public class RecentsAnimationDeviceState implements
         SettingsCache.OnChangeListener onChangeListener =
                 enabled -> mIsSwipeToNotificationEnabled = enabled;
         settingsCache.register(swipeBottomNotificationUri, onChangeListener);
-        settingsCache.dispatchOnChange(swipeBottomNotificationUri);
+        mIsSwipeToNotificationEnabled = settingsCache.getValue(swipeBottomNotificationUri);
         runOnDestroy(() -> settingsCache.unregister(swipeBottomNotificationUri, onChangeListener));
 
         Uri setupCompleteUri = Settings.Secure.getUriFor(Settings.Secure.USER_SETUP_COMPLETE);
diff --git a/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java b/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java
index f336bf5260..b336d2fcea 100644
--- a/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java
+++ b/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java
@@ -80,7 +80,7 @@ public class SettingsChangeLogger implements
         SettingsCache mSettingsCache = SettingsCache.INSTANCE.get(context);
         mSettingsCache.register(NOTIFICATION_BADGING_URI,
                 this::onNotificationDotsChanged);
-        mSettingsCache.dispatchOnChange(NOTIFICATION_BADGING_URI);
+        onNotificationDotsChanged(mSettingsCache.getValue(NOTIFICATION_BADGING_URI));
     }
 
     private static ArrayMap<String, LoggablePref> loadPrefKeys(Context context) {
diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index ccc023ab76..4754558aa1 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -116,7 +116,7 @@ public class LauncherAppState {
         mNotificationSettingsChangedListener = this::onNotificationSettingsChanged;
         mSettingsCache.register(NOTIFICATION_BADGING_URI,
                 mNotificationSettingsChangedListener);
-        mSettingsCache.dispatchOnChange(NOTIFICATION_BADGING_URI);
+        onNotificationSettingsChanged(mSettingsCache.getValue(NOTIFICATION_BADGING_URI));
     }
 
     public LauncherAppState(Context context, @Nullable String iconCacheFileName) {
diff --git a/src/com/android/launcher3/notification/NotificationListener.java b/src/com/android/launcher3/notification/NotificationListener.java
index 2905dc322a..e58f5fa2d5 100644
--- a/src/com/android/launcher3/notification/NotificationListener.java
+++ b/src/com/android/launcher3/notification/NotificationListener.java
@@ -16,9 +16,9 @@
 
 package com.android.launcher3.notification;
 
-import static com.android.launcher3.util.SettingsCache.NOTIFICATION_BADGING_URI;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
+import static com.android.launcher3.util.SettingsCache.NOTIFICATION_BADGING_URI;
 
 import android.annotation.TargetApi;
 import android.app.Notification;
@@ -37,8 +37,8 @@ import androidx.annotation.AnyThread;
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
 
-import com.android.launcher3.util.SettingsCache;
 import com.android.launcher3.util.PackageUserKey;
+import com.android.launcher3.util.SettingsCache;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -213,7 +213,7 @@ public class NotificationListener extends NotificationListenerService {
         mNotificationSettingsChangedListener = this::onNotificationSettingsChanged;
         mSettingsCache.register(NOTIFICATION_BADGING_URI,
                 mNotificationSettingsChangedListener);
-        mSettingsCache.dispatchOnChange(NOTIFICATION_BADGING_URI);
+        onNotificationSettingsChanged(mSettingsCache.getValue(NOTIFICATION_BADGING_URI));
 
         onNotificationFullRefresh();
     }
diff --git a/src/com/android/launcher3/settings/NotificationDotsPreference.java b/src/com/android/launcher3/settings/NotificationDotsPreference.java
index a35416915f..afcf882e7d 100644
--- a/src/com/android/launcher3/settings/NotificationDotsPreference.java
+++ b/src/com/android/launcher3/settings/NotificationDotsPreference.java
@@ -17,6 +17,8 @@ package com.android.launcher3.settings;
 
 import static com.android.launcher3.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY;
 import static com.android.launcher3.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGS;
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+import static com.android.launcher3.util.SettingsCache.NOTIFICATION_BADGING_URI;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -24,6 +26,7 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.database.ContentObserver;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.util.AttributeSet;
@@ -49,6 +52,14 @@ public class NotificationDotsPreference extends Preference
     /** Hidden field Settings.Secure.ENABLED_NOTIFICATION_LISTENERS */
     private static final String NOTIFICATION_ENABLED_LISTENERS = "enabled_notification_listeners";
 
+    private final ContentObserver mListenerListObserver =
+            new ContentObserver(MAIN_EXECUTOR.getHandler()) {
+        @Override
+        public void onChange(boolean selfChange) {
+            updateUI();
+        }
+    };
+
     public NotificationDotsPreference(
             Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
@@ -66,6 +77,29 @@ public class NotificationDotsPreference extends Preference
         super(context);
     }
 
+    @Override
+    public void onAttached() {
+        super.onAttached();
+        SettingsCache.INSTANCE.get(getContext()).register(NOTIFICATION_BADGING_URI, this);
+        getContext().getContentResolver().registerContentObserver(
+                Settings.Secure.getUriFor(NOTIFICATION_ENABLED_LISTENERS),
+                false, mListenerListObserver);
+        updateUI();
+    }
+
+    private void updateUI() {
+        onSettingsChanged(SettingsCache.INSTANCE.get(getContext())
+                .getValue(NOTIFICATION_BADGING_URI));
+    }
+
+    @Override
+    public void onDetached() {
+        super.onDetached();
+        SettingsCache.INSTANCE.get(getContext()).unregister(NOTIFICATION_BADGING_URI, this);
+        getContext().getContentResolver().unregisterContentObserver(mListenerListObserver);
+
+    }
+
     private void setWidgetFrameVisible(boolean isVisible) {
         if (mWidgetFrameVisible != isVisible) {
             mWidgetFrameVisible = isVisible;
diff --git a/src/com/android/launcher3/settings/SettingsActivity.java b/src/com/android/launcher3/settings/SettingsActivity.java
index f03065c7f8..5b42ac70eb 100644
--- a/src/com/android/launcher3/settings/SettingsActivity.java
+++ b/src/com/android/launcher3/settings/SettingsActivity.java
@@ -18,8 +18,6 @@ package com.android.launcher3.settings;
 
 import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ACCESSIBILITY_FOCUS;
 
-import static com.android.launcher3.util.SettingsCache.NOTIFICATION_BADGING_URI;
-import static com.android.launcher3.util.SettingsCache.NOTIFICATION_ENABLED_LISTENERS;
 import static com.android.launcher3.states.RotationHelper.ALLOW_ROTATION_PREFERENCE_KEY;
 import static com.android.launcher3.states.RotationHelper.getAllowRotationDefaultValue;
 
@@ -45,7 +43,6 @@ import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.WidgetsModel;
-import com.android.launcher3.util.SettingsCache;
 import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
 
 /**
@@ -124,11 +121,8 @@ public class SettingsActivity extends FragmentActivity
      */
     public static class LauncherSettingsFragment extends PreferenceFragmentCompat {
 
-        private SettingsCache mSettingsCache;
-
         private String mHighLightKey;
         private boolean mPreferenceHighlighted = false;
-        private NotificationDotsPreference mNotificationSettingsChangedListener;
         private Preference mDeveloperOptionPref;
 
         @Override
@@ -172,22 +166,7 @@ public class SettingsActivity extends FragmentActivity
         protected boolean initPreference(Preference preference) {
             switch (preference.getKey()) {
                 case NOTIFICATION_DOTS_PREFERENCE_KEY:
-                    if (WidgetsModel.GO_DISABLE_NOTIFICATION_DOTS) {
-                        return false;
-                    }
-
-                    // Listen to system notification dot settings while this UI is active.
-                    mSettingsCache = SettingsCache.INSTANCE.get(getActivity());
-                    mNotificationSettingsChangedListener =
-                            ((NotificationDotsPreference) preference);
-                    mSettingsCache.register(NOTIFICATION_BADGING_URI,
-                            (NotificationDotsPreference) mNotificationSettingsChangedListener);
-                    // Also listen if notification permission changes
-                    mSettingsCache.register(NOTIFICATION_ENABLED_LISTENERS,
-                            mNotificationSettingsChangedListener);
-                    mSettingsCache.dispatchOnChange(NOTIFICATION_BADGING_URI);
-                    mSettingsCache.dispatchOnChange(NOTIFICATION_ENABLED_LISTENERS);
-                    return true;
+                    return !WidgetsModel.GO_DISABLE_NOTIFICATION_DOTS;
 
                 case ALLOW_ROTATION_PREFERENCE_KEY:
                     if (getResources().getBoolean(R.bool.allow_rotation)) {
@@ -269,16 +248,5 @@ public class SettingsActivity extends FragmentActivity
                 }
             });
         }
-
-        @Override
-        public void onDestroy() {
-            if (mSettingsCache != null) {
-                mSettingsCache.unregister(NOTIFICATION_BADGING_URI,
-                        mNotificationSettingsChangedListener);
-                mSettingsCache.unregister(NOTIFICATION_ENABLED_LISTENERS,
-                        mNotificationSettingsChangedListener);
-            }
-            super.onDestroy();
-        }
     }
 }
diff --git a/src/com/android/launcher3/util/SettingsCache.java b/src/com/android/launcher3/util/SettingsCache.java
index 22b4d38891..10611c7211 100644
--- a/src/com/android/launcher3/util/SettingsCache.java
+++ b/src/com/android/launcher3/util/SettingsCache.java
@@ -39,12 +39,11 @@ import java.util.concurrent.CopyOnWriteArrayList;
  * {@link #unregister(Uri, OnChangeListener)} methods.
  *
  * This can be used as a normal cache without any listeners as well via the
- * {@link #getValue(Uri, int)} and {@link #dispatchOnChange(Uri)} to update (and subsequently call
+ * {@link #getValue(Uri, int)} and {@link #onChange)} to update (and subsequently call
  * get)
  *
  * The cache will be invalidated/updated through the normal
  * {@link ContentObserver#onChange(boolean)} calls
- * or can be force updated by calling {@link #dispatchOnChange(Uri)}.
  *
  * Cache will also be updated if a key queried is missing (even if it has no listeners registered).
  */
@@ -58,9 +57,6 @@ public class SettingsCache extends ContentObserver {
     /** Hidden field Settings.Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED */
     public static final String ONE_HANDED_SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED =
             "swipe_bottom_to_notification_enabled";
-    /** Hidden field Settings.Secure.ENABLED_NOTIFICATION_LISTENERS */
-    public static final Uri NOTIFICATION_ENABLED_LISTENERS =
-            Settings.Secure.getUriFor("enabled_notification_listeners");
     public static final Uri ROTATION_SETTING_URI =
             Settings.System.getUriFor(ACCELEROMETER_ROTATION);
 
@@ -99,6 +95,14 @@ public class SettingsCache extends ContentObserver {
         }
     }
 
+    /**
+     * Returns the value for this classes key from the cache. If not in cache, will call
+     * {@link #updateValue(Uri, int)} to fetch.
+     */
+    public boolean getValue(Uri keySetting) {
+        return getValue(keySetting, 1);
+    }
+
     /**
      * Returns the value for this classes key from the cache. If not in cache, will call
      * {@link #updateValue(Uri, int)} to fetch.
@@ -139,14 +143,6 @@ public class SettingsCache extends ContentObserver {
         return newVal;
     }
 
-    /**
-     * Force update a change for a given URI and have all listeners for that URI receive callbacks
-     * even if the value is unchanged.
-     */
-    public void dispatchOnChange(Uri uri) {
-        onChange(true, uri);
-    }
-
     /**
      * Call to stop receiving updates on the given {@param listener}.
      * This Uri/Listener pair must correspond to the same pair called with for
-- 
GitLab


From 063e350fa319d77cf2d2787814be6c851a6695fa Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 30 Mar 2021 21:47:38 -0700
Subject: [PATCH 0812/1664] Move disabled test out

Bug: 182844465
Test: presubmit
Change-Id: I543c43db3fb27e671eea00d112bab2a4f485dbc9
---
 .../com/android/launcher3/ui => src_disabled}/WorkTabTest.java    | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename tests/{src/com/android/launcher3/ui => src_disabled}/WorkTabTest.java (100%)

diff --git a/tests/src/com/android/launcher3/ui/WorkTabTest.java b/tests/src_disabled/WorkTabTest.java
similarity index 100%
rename from tests/src/com/android/launcher3/ui/WorkTabTest.java
rename to tests/src_disabled/WorkTabTest.java
-- 
GitLab


From 712a8bf0041dde1ee1611d2c107db1ce9fb11a47 Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pbdr@google.com>
Date: Thu, 1 Apr 2021 11:19:20 +0100
Subject: [PATCH 0813/1664] Prevent launcher crash when an App Widget is
 removed.

If an App Widget with a scrollable element is removed, we may end up in
a situation where we try to draw the view directly on a canvas while the
it has already been detached from the workspace. This can crash as some
of the drawing the scroll indicators require the view to be attached.

In general, we should never draw a view by calling the draw method
directly, even more so when the view is detached: the behavior is
undefined as the method expects the canvas to be properly set up, and it
is not. A crash can therefore be expected. This patch should avoid
crashing the launcher until we stop doing that altogether.

Fix: 183386115
Test: Manally add a view with a preview layout
Test: Manually remove an app widget with a list view
Change-Id: I8e1aa581700a08d6747eab085199c2b293e0e3fb
---
 .../dragndrop/AppWidgetHostViewDrawable.java      | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/dragndrop/AppWidgetHostViewDrawable.java b/src/com/android/launcher3/dragndrop/AppWidgetHostViewDrawable.java
index 5cd95dc413..7b32bbf02e 100644
--- a/src/com/android/launcher3/dragndrop/AppWidgetHostViewDrawable.java
+++ b/src/com/android/launcher3/dragndrop/AppWidgetHostViewDrawable.java
@@ -27,15 +27,21 @@ import android.graphics.drawable.Drawable;
 
 import com.android.launcher3.widget.LauncherAppWidgetHostView;
 
-/** A drawable which renders {@link LauncherAppWidgetHostView} to a canvas. */
+/**
+ * A drawable which renders {@link LauncherAppWidgetHostView} to a canvas.
+ *
+ * TODO(b/183609936) Stop using that class and remove it.
+ */
 public final class AppWidgetHostViewDrawable extends Drawable {
 
     private final LauncherAppWidgetHostView mAppWidgetHostView;
     private Paint mPaint = new Paint();
     private final Path mClipPath;
+    private final boolean mWasAttached;
 
     public AppWidgetHostViewDrawable(LauncherAppWidgetHostView appWidgetHostView) {
         mAppWidgetHostView = appWidgetHostView;
+        mWasAttached = appWidgetHostView.isAttachedToWindow();
         Path clipPath = null;
         if (appWidgetHostView.getClipToOutline()) {
             Outline outline = new Outline();
@@ -56,7 +62,12 @@ public final class AppWidgetHostViewDrawable extends Drawable {
         if (mClipPath != null) {
             canvas.clipPath(mClipPath);
         }
-        mAppWidgetHostView.draw(canvas);
+        // If the view was never attached, or is current attached, then draw. Otherwise do not try
+        // to draw, or we might trigger bugs with items that get drawn while requiring the view to
+        // be attached.
+        if (!mWasAttached || mAppWidgetHostView.isAttachedToWindow()) {
+            mAppWidgetHostView.draw(canvas);
+        }
         canvas.restoreToCount(saveCount);
     }
 
-- 
GitLab


From dfde4d96ea740e35dfc4e1b32422b45a8c49e39e Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Fri, 19 Mar 2021 14:47:03 +0000
Subject: [PATCH 0814/1664] Focus running task in overview grid

- calculateTaskSize now returns the Rect for focused task
- Introduced calculateGridTaskSize for non-focused task, and translate non-focused tasks to fit the grid
- As Task Rect is now vertically centered, removed ClearAllButton's grid vertical translation
- When ClearAllButton is not shown (e.g. quickswitch), make sure ClearAllButton's scroll won't be used when page snapping. This happens when page scrolls are translated so they're negative.
- Added back ActionsView when task is focused below the TaskView, which become invisible as you scroll
- In Modal state, move the ActionsView down so it won't cover the TaskView

Bug: 175939487
Test: manual
Change-Id: Idfa94a51f856418adc0503cf04211dcb4b1814fe
---
 .../res/layout/overview_actions_container.xml |   5 +-
 .../res/layout/overview_actions_container.xml |   5 +-
 quickstep/res/values/dimens.xml               |   1 +
 .../RecentsViewStateController.java           |   7 +-
 .../states/OverviewModalTaskState.java        |  12 +-
 .../uioverrides/states/OverviewState.java     |   3 +-
 .../quickstep/BaseActivityInterface.java      |  35 +++-
 .../FallbackRecentsStateController.java       |   4 +-
 .../fallback/FallbackRecentsView.java         |   2 +-
 .../quickstep/fallback/RecentsState.java      |   4 +-
 .../quickstep/views/ClearAllButton.java       |  40 ++--
 .../quickstep/views/LauncherRecentsView.java  |  34 +++-
 .../quickstep/views/OverviewActionsView.java  |  35 +++-
 .../android/quickstep/views/RecentsView.java  | 185 +++++++++++++-----
 .../com/android/quickstep/views/TaskView.java | 110 ++++++-----
 res/layout/overview_actions_container.xml     |   2 +
 16 files changed, 354 insertions(+), 130 deletions(-)

diff --git a/go/quickstep/overview_ui_overrides/res/layout/overview_actions_container.xml b/go/quickstep/overview_ui_overrides/res/layout/overview_actions_container.xml
index e6af84868e..866eac6e51 100644
--- a/go/quickstep/overview_ui_overrides/res/layout/overview_actions_container.xml
+++ b/go/quickstep/overview_ui_overrides/res/layout/overview_actions_container.xml
@@ -14,11 +14,12 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
+<!-- NOTE! don't add dimensions for margins / gravity to root view in this file, they need to be
+     loaded at runtime. -->
 <com.android.quickstep.views.GoOverviewActionsView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center_horizontal|bottom">
+    android:layout_height="wrap_content">
 
     <LinearLayout
         android:id="@+id/action_buttons"
diff --git a/quickstep/overview_ui_overrides/res/layout/overview_actions_container.xml b/quickstep/overview_ui_overrides/res/layout/overview_actions_container.xml
index 1da25e772a..b652252ce1 100644
--- a/quickstep/overview_ui_overrides/res/layout/overview_actions_container.xml
+++ b/quickstep/overview_ui_overrides/res/layout/overview_actions_container.xml
@@ -14,10 +14,11 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
+<!-- NOTE! don't add dimensions for margins / gravity to root view in this file, they need to be
+     loaded at runtime. -->
 <com.android.quickstep.views.OverviewActionsView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center_horizontal|bottom">
+    android:layout_height="wrap_content">
 
     <LinearLayout
         android:id="@+id/action_buttons"
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 3036341dae..3e6c78f4de 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -36,6 +36,7 @@
     <dimen name="overview_grid_bottom_margin">90dp</dimen>
     <dimen name="overview_grid_side_margin">54dp</dimen>
     <dimen name="overview_grid_row_spacing">42dp</dimen>
+    <dimen name="overview_grid_focus_vertical_margin">130dp</dimen>
     <dimen name="split_placeholder_size">110dp</dimen>
 
     <dimen name="recents_page_spacing">16dp</dimen>
diff --git a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
index e1456b17ad..6929b5dc9c 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
@@ -103,12 +103,11 @@ public final class RecentsViewStateController extends
 
     private void setAlphas(PropertySetter propertySetter, StateAnimationConfig config,
             LauncherState state) {
-        float clearAllButtonAlpha = (state.getVisibleElements(mLauncher) & CLEAR_ALL_BUTTON) != 0
-                ? 1 : 0;
+        float clearAllButtonAlpha = state.areElementsVisible(mLauncher, CLEAR_ALL_BUTTON) ? 1 : 0;
         propertySetter.setFloat(mRecentsView.getClearAllButton(), ClearAllButton.VISIBILITY_ALPHA,
                 clearAllButtonAlpha, LINEAR);
-        float overviewButtonAlpha = (state.getVisibleElements(mLauncher) & OVERVIEW_ACTIONS) != 0
-                ? 1 : 0;
+        float overviewButtonAlpha = state.areElementsVisible(mLauncher, OVERVIEW_ACTIONS)
+                && mRecentsView.shouldShowOverviewActionsForState(state) ? 1 : 0;
         propertySetter.setFloat(mLauncher.getActionsView().getVisibilityAlpha(),
                 MultiValueAlpha.VALUE, overviewButtonAlpha, config.getInterpolator(
                         ANIM_OVERVIEW_ACTIONS_FADE, LINEAR));
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java
index bdba482c71..6f084a1f97 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java
@@ -18,6 +18,7 @@ package com.android.launcher3.uioverrides.states;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW;
 
 import android.content.Context;
+import android.graphics.Point;
 import android.graphics.Rect;
 
 import com.android.launcher3.BaseDraggingActivity;
@@ -70,13 +71,12 @@ public class OverviewModalTaskState extends OverviewState {
     }
 
     public static float[] getOverviewScaleAndOffsetForModalState(BaseDraggingActivity activity) {
-        Rect out = new Rect();
-        activity.<RecentsView>getOverviewPanel().getTaskSize(out);
-        int taskHeight = out.height();
-        activity.<RecentsView>getOverviewPanel().getModalTaskSize(out);
-        int newHeight = out.height();
+        Point taskSize = activity.<RecentsView>getOverviewPanel().getSelectedTaskSize();
+        Rect modalTaskSize = new Rect();
+        activity.<RecentsView>getOverviewPanel().getModalTaskSize(modalTaskSize);
 
-        float scale = (float) newHeight / taskHeight;
+        float scale = Math.min((float) modalTaskSize.height() / taskSize.y,
+                (float) modalTaskSize.width() / taskSize.x);
 
         return new float[] {scale, NO_OFFSET};
     }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
index 43e70a3923..32bf3155bd 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -99,8 +99,7 @@ public class OverviewState extends LauncherState {
 
     @Override
     public int getVisibleElements(Launcher launcher) {
-        return displayOverviewTasksAsGrid(launcher.getDeviceProfile()) ? CLEAR_ALL_BUTTON
-                : CLEAR_ALL_BUTTON | OVERVIEW_ACTIONS;
+        return CLEAR_ALL_BUTTON | OVERVIEW_ACTIONS;
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index 0415009faf..3afffc1dad 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -206,18 +206,17 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
             Rect gridRect = new Rect();
             calculateGridSize(context, dp, gridRect);
 
-            int rowSpacing = res.getDimensionPixelSize(R.dimen.overview_grid_row_spacing);
-            float rowHeight = (gridRect.height() - rowSpacing) / 2f;
+            int verticalMargin = res.getDimensionPixelSize(
+                    R.dimen.overview_grid_focus_vertical_margin);
+            float taskHeight = gridRect.height() - verticalMargin * 2;
 
             PointF taskDimension = getTaskDimension(context, dp);
-            float scale = (rowHeight - dp.overviewTaskThumbnailTopMarginPx) / Math.max(
-                    taskDimension.x, taskDimension.y);
+            float scale = taskHeight / Math.max(taskDimension.x, taskDimension.y);
             int outWidth = Math.round(scale * taskDimension.x);
             int outHeight = Math.round(scale * taskDimension.y);
 
-            int gravity = Gravity.TOP;
+            int gravity = Gravity.CENTER_VERTICAL;
             gravity |= orientedState.getRecentsRtlSetting(res) ? Gravity.RIGHT : Gravity.LEFT;
-            gridRect.inset(0, dp.overviewTaskThumbnailTopMarginPx, 0, 0);
             Gravity.apply(gravity, outWidth, outHeight, gridRect, outRect);
         } else {
             int taskMargin = dp.overviewTaskMarginPx;
@@ -293,6 +292,30 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
                 Math.max(insets.right, sideMargin), Math.max(insets.bottom, bottomMargin));
     }
 
+    /**
+     * Calculates the overview grid non-focused task size for the provided device configuration.
+     */
+    public final void calculateGridTaskSize(Context context, DeviceProfile dp, Rect outRect,
+            PagedOrientationHandler orientedState) {
+        Resources res = context.getResources();
+        Rect gridRect = new Rect();
+        calculateGridSize(context, dp, gridRect);
+
+        int rowSpacing = res.getDimensionPixelSize(R.dimen.overview_grid_row_spacing);
+        float rowHeight = (gridRect.height() - rowSpacing) / 2f;
+
+        PointF taskDimension = getTaskDimension(context, dp);
+        float scale = (rowHeight - dp.overviewTaskThumbnailTopMarginPx) / Math.max(
+                taskDimension.x, taskDimension.y);
+        int outWidth = Math.round(scale * taskDimension.x);
+        int outHeight = Math.round(scale * taskDimension.y);
+
+        int gravity = Gravity.TOP;
+        gravity |= orientedState.getRecentsRtlSetting(res) ? Gravity.RIGHT : Gravity.LEFT;
+        gridRect.inset(0, dp.overviewTaskThumbnailTopMarginPx, 0, 0);
+        Gravity.apply(gravity, outWidth, outHeight, gridRect, outRect);
+    }
+
     /**
      * Calculates the modal taskView size for the provided device configuration
      */
diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
index 03a0b4ec6b..8962ec93c8 100644
--- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
+++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
@@ -76,7 +76,9 @@ public class FallbackRecentsStateController implements StateHandler<RecentsState
         float clearAllButtonAlpha = state.hasClearAllButton() ? 1 : 0;
         setter.setFloat(mRecentsView.getClearAllButton(), ClearAllButton.VISIBILITY_ALPHA,
                 clearAllButtonAlpha, LINEAR);
-        float overviewButtonAlpha =  state.hasOverviewActions(mActivity) ? 1 : 0;
+        float overviewButtonAlpha =
+                state.hasOverviewActions() && mRecentsView.shouldShowOverviewActionsForState(state)
+                        ? 1 : 0;
         setter.setFloat(mActivity.getActionsView().getVisibilityAlpha(),
                 MultiValueAlpha.VALUE, overviewButtonAlpha, LINEAR);
 
diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
index e0750450fd..854a140d71 100644
--- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
+++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
@@ -42,7 +42,7 @@ import com.android.systemui.shared.recents.model.Task.TaskKey;
 import java.util.ArrayList;
 
 @TargetApi(Build.VERSION_CODES.R)
-public class FallbackRecentsView extends RecentsView<RecentsActivity>
+public class FallbackRecentsView extends RecentsView<RecentsActivity, RecentsState>
         implements StateListener<RecentsState> {
 
     private RunningTaskInfo mHomeTaskInfo;
diff --git a/quickstep/src/com/android/quickstep/fallback/RecentsState.java b/quickstep/src/com/android/quickstep/fallback/RecentsState.java
index a9856d2dd8..bbe279e2f1 100644
--- a/quickstep/src/com/android/quickstep/fallback/RecentsState.java
+++ b/quickstep/src/com/android/quickstep/fallback/RecentsState.java
@@ -99,8 +99,8 @@ public class RecentsState implements BaseState<RecentsState> {
     /**
      * For this state, whether overview actions should be shown.
      */
-    public boolean hasOverviewActions(RecentsActivity activity) {
-        return hasFlag(FLAG_OVERVIEW_ACTIONS) && !showAsGrid(activity.getDeviceProfile());
+    public boolean hasOverviewActions() {
+        return hasFlag(FLAG_OVERVIEW_ACTIONS);
     }
 
     public float[] getOverviewScaleAndOffset(RecentsActivity activity) {
diff --git a/quickstep/src/com/android/quickstep/views/ClearAllButton.java b/quickstep/src/com/android/quickstep/views/ClearAllButton.java
index ff78995a1c..d616f7c7a5 100644
--- a/quickstep/src/com/android/quickstep/views/ClearAllButton.java
+++ b/quickstep/src/com/android/quickstep/views/ClearAllButton.java
@@ -45,12 +45,13 @@ public class ClearAllButton extends Button implements PageCallbacks {
     private float mScrollAlpha = 1;
     private float mContentAlpha = 1;
     private float mVisibilityAlpha = 1;
+    private float mFullscreenProgress = 1;
     private float mGridProgress = 1;
 
     private boolean mIsRtl;
     private float mNormalTranslationPrimary;
+    private float mFullscreenTranslationPrimary;
     private float mGridTranslationPrimary;
-    private float mGridTranslationSecondary;
     private float mGridScrollOffset;
     private float mScrollOffsetPrimary;
 
@@ -130,13 +131,13 @@ public class ClearAllButton extends Button implements PageCallbacks {
         setClickable(Math.min(alpha, 1) == 1);
     }
 
-    public void setGridTranslationPrimary(float gridTranslationPrimary) {
-        mGridTranslationPrimary = gridTranslationPrimary;
+    public void setFullscreenTranslationPrimary(float fullscreenTranslationPrimary) {
+        mFullscreenTranslationPrimary = fullscreenTranslationPrimary;
         applyPrimaryTranslation();
     }
 
-    public void setGridTranslationSecondary(float gridTranslationSecondary) {
-        mGridTranslationSecondary = gridTranslationSecondary;
+    public void setGridTranslationPrimary(float gridTranslationPrimary) {
+        mGridTranslationPrimary = gridTranslationPrimary;
         applyPrimaryTranslation();
     }
 
@@ -148,8 +149,11 @@ public class ClearAllButton extends Button implements PageCallbacks {
         mScrollOffsetPrimary = scrollOffsetPrimary;
     }
 
-    public float getScrollAdjustment(boolean gridEnabled) {
+    public float getScrollAdjustment(boolean fullscreenEnabled, boolean gridEnabled) {
         float scrollAdjustment = 0;
+        if (fullscreenEnabled) {
+            scrollAdjustment += mFullscreenTranslationPrimary;
+        }
         if (gridEnabled) {
             scrollAdjustment += mGridTranslationPrimary + mGridScrollOffset;
         }
@@ -157,8 +161,18 @@ public class ClearAllButton extends Button implements PageCallbacks {
         return scrollAdjustment;
     }
 
-    public float getOffsetAdjustment(boolean gridEnabled) {
-        return getScrollAdjustment(gridEnabled);
+    public float getOffsetAdjustment(boolean fullscreenEnabled, boolean gridEnabled) {
+        return getScrollAdjustment(fullscreenEnabled, gridEnabled);
+    }
+
+    /**
+     * Adjust translation when this TaskView is about to be shown fullscreen.
+     *
+     * @param progress: 0 = no translation; 1 = translate according to TaskVIew translations.
+     */
+    public void setFullscreenProgress(float progress) {
+        mFullscreenProgress = progress;
+        applyPrimaryTranslation();
     }
 
     /**
@@ -180,7 +194,8 @@ public class ClearAllButton extends Button implements PageCallbacks {
         PagedOrientationHandler orientationHandler = recentsView.getPagedOrientationHandler();
         orientationHandler.getPrimaryViewTranslate().set(this,
                 orientationHandler.getPrimaryValue(0f, getOriginalTranslationY())
-                        + mNormalTranslationPrimary + getGridTrans(mGridTranslationPrimary));
+                        + mNormalTranslationPrimary + getFullscreenTrans(
+                        mFullscreenTranslationPrimary) + getGridTrans(mGridTranslationPrimary));
     }
 
     private void applySecondaryTranslation() {
@@ -191,8 +206,11 @@ public class ClearAllButton extends Button implements PageCallbacks {
 
         PagedOrientationHandler orientationHandler = recentsView.getPagedOrientationHandler();
         orientationHandler.getSecondaryViewTranslate().set(this,
-                orientationHandler.getSecondaryValue(0f, getOriginalTranslationY())
-                        + getGridTrans(mGridTranslationSecondary));
+                orientationHandler.getSecondaryValue(0f, getOriginalTranslationY()));
+    }
+
+    private float getFullscreenTrans(float endTranslation) {
+        return mFullscreenProgress > 0 ? endTranslation : 0;
     }
 
     private float getGridTrans(float endTranslation) {
diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
index a0af68a9bf..896d1ae58d 100644
--- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
@@ -19,11 +19,13 @@ import static com.android.launcher3.LauncherState.CLEAR_ALL_BUTTON;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.OVERVIEW_MODAL_TASK;
+import static com.android.launcher3.LauncherState.OVERVIEW_SPLIT_SELECT;
 import static com.android.launcher3.LauncherState.SPRING_LOADED;
 import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 
 import android.annotation.TargetApi;
 import android.content.Context;
+import android.content.res.Configuration;
 import android.os.Build;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
@@ -35,6 +37,7 @@ import com.android.launcher3.LauncherState;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.StateManager.StateListener;
 import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
+import com.android.launcher3.util.SplitConfigurationOptions;
 import com.android.quickstep.LauncherActivityInterface;
 import com.android.quickstep.util.OverviewToHomeAnim;
 import com.android.systemui.plugins.PluginListener;
@@ -44,7 +47,7 @@ import com.android.systemui.plugins.RecentsExtraCard;
  * {@link RecentsView} used in Launcher activity
  */
 @TargetApi(Build.VERSION_CODES.O)
-public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher>
+public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher, LauncherState>
         implements StateListener<LauncherState> {
 
     private RecentsExtraCard mRecentsExtraCardPlugin;
@@ -234,4 +237,33 @@ public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher>
             }
         }
     }
+
+    @Override
+    protected void onDismissAnimationEnds() {
+        super.onDismissAnimationEnds();
+        if (mActivity.isInState(OVERVIEW_SPLIT_SELECT)) {
+            // We want to keep the tasks translations in this temporary state
+            // after resetting the rest above
+            setTaskViewsResistanceTranslation(mTaskViewsSecondaryTranslation);
+            setTaskViewsPrimaryTranslation(mTaskViewsPrimaryTranslation);
+        }
+    }
+
+    @Override
+    public void initiateSplitSelect(TaskView taskView,
+            SplitConfigurationOptions.SplitPositionOption splitPositionOption) {
+        super.initiateSplitSelect(taskView, splitPositionOption);
+        mActivity.getStateManager().goToState(LauncherState.OVERVIEW_SPLIT_SELECT);
+    }
+
+    @Override
+    protected void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        // If overview is in modal state when rotate, reset it to overview state without running
+        // animation.
+        if (mActivity.isInState(OVERVIEW_MODAL_TASK)) {
+            mActivity.getStateManager().goToState(LauncherState.OVERVIEW, false);
+            resetModalVisuals();
+        }
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
index 6fcd54cf62..9adeea42f0 100644
--- a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
+++ b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
@@ -16,6 +16,7 @@
 
 package com.android.quickstep.views;
 
+import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_SHARE;
 
 import android.content.Context;
@@ -32,6 +33,7 @@ import androidx.annotation.Nullable;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Insettable;
 import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.util.MultiValueAlpha;
 import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;
 import com.android.quickstep.SysUINavigationMode;
@@ -76,6 +78,7 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
     private static final int INDEX_VISIBILITY_ALPHA = 1;
     private static final int INDEX_FULLSCREEN_ALPHA = 2;
     private static final int INDEX_HIDDEN_FLAGS_ALPHA = 3;
+    private static final int INDEX_SCROLL_ALPHA = 4;
 
     private final MultiValueAlpha mMultiValueAlpha;
 
@@ -87,6 +90,9 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
 
     protected T mCallbacks;
 
+    private float mModalness;
+    private float mModalTransformY;
+
     public OverviewActionsView(Context context) {
         this(context, null);
     }
@@ -97,7 +103,7 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
 
     public OverviewActionsView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr, 0);
-        mMultiValueAlpha = new MultiValueAlpha(this, 4);
+        mMultiValueAlpha = new MultiValueAlpha(this, 5);
         mMultiValueAlpha.setUpdateVisibility(true);
     }
 
@@ -189,6 +195,10 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
         return mMultiValueAlpha.getProperty(INDEX_FULLSCREEN_ALPHA);
     }
 
+    public AlphaProperty getScrollAlpha() {
+        return mMultiValueAlpha.getProperty(INDEX_SCROLL_ALPHA);
+    }
+
     private void updateHorizontalPadding() {
         setPadding(mInsets.left, 0, mInsets.right, 0);
     }
@@ -224,4 +234,27 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
         bottomMargin += mInsets.bottom;
         return bottomMargin;
     }
+
+    /**
+     * The current task is fully modal (modalness = 1) when it is shown on its own in a modal
+     * way. Modalness 0 means the task is shown in context with all the other tasks.
+     */
+    public void setTaskModalness(float modalness) {
+        mModalness = modalness;
+        applyTranslationY();
+    }
+
+    public void setModalTransformY(float modalTransformY) {
+        mModalTransformY = modalTransformY;
+        applyTranslationY();
+    }
+
+    private void applyTranslationY() {
+        setTranslationY(getModalTrans(mModalTransformY));
+    }
+
+    private float getModalTrans(float endTranslation) {
+        float progress = ACCEL_DEACCEL.getInterpolation(mModalness);
+        return Utilities.mapRange(progress, 0, endTranslation);
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index ad266ce542..b688f1ec4b 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -25,8 +25,6 @@ import static com.android.launcher3.InvariantDeviceProfile.CHANGE_FLAG_ICON_PARA
 import static com.android.launcher3.LauncherAnimUtils.SUCCESS_TRANSITION_PROGRESS;
 import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA;
 import static com.android.launcher3.LauncherState.BACKGROUND_APP;
-import static com.android.launcher3.LauncherState.OVERVIEW_MODAL_TASK;
-import static com.android.launcher3.LauncherState.OVERVIEW_SPLIT_SELECT;
 import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DURATION;
 import static com.android.launcher3.Utilities.EDGE_NAV_BAR;
 import static com.android.launcher3.Utilities.mapToRange;
@@ -81,6 +79,7 @@ import android.util.AttributeSet;
 import android.util.FloatProperty;
 import android.util.Log;
 import android.util.SparseBooleanArray;
+import android.view.Gravity;
 import android.view.HapticFeedbackConstants;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -91,6 +90,7 @@ import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.animation.Interpolator;
+import android.widget.FrameLayout;
 import android.widget.ListView;
 
 import androidx.annotation.Nullable;
@@ -100,7 +100,6 @@ import com.android.launcher3.BaseActivity.MultiWindowModeChangedListener;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Insettable;
 import com.android.launcher3.InvariantDeviceProfile;
-import com.android.launcher3.LauncherState;
 import com.android.launcher3.PagedView;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
@@ -111,6 +110,7 @@ import com.android.launcher3.anim.SpringProperty;
 import com.android.launcher3.compat.AccessibilityManagerCompat;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.statehandlers.DepthController;
+import com.android.launcher3.statemanager.BaseState;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.PagedOrientationHandler;
@@ -161,8 +161,9 @@ import java.util.function.Consumer;
  * A list of recent tasks.
  */
 @TargetApi(Build.VERSION_CODES.R)
-public abstract class RecentsView<T extends StatefulActivity> extends PagedView implements
-        Insettable, TaskThumbnailCache.HighResLoadingState.HighResLoadingStateChangedCallback,
+public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_TYPE>,
+        STATE_TYPE extends BaseState<STATE_TYPE>> extends PagedView implements Insettable,
+        TaskThumbnailCache.HighResLoadingState.HighResLoadingStateChangedCallback,
         InvariantDeviceProfile.OnIDPChangeListener, TaskVisualsChangeListener,
         SplitScreenBounds.OnChangeListener {
 
@@ -295,7 +296,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             };
 
     protected final RecentsOrientedState mOrientationState;
-    protected final BaseActivityInterface mSizeStrategy;
+    protected final BaseActivityInterface<STATE_TYPE, ACTIVITY_TYPE> mSizeStrategy;
     protected RecentsAnimationController mRecentsAnimationController;
     protected SurfaceTransactionApplier mSyncTransactionApplier;
     protected int mTaskWidth;
@@ -304,6 +305,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     protected final TaskViewSimulator mLiveTileTaskViewSimulator;
     protected final Rect mLastComputedTaskSize = new Rect();
     protected final Rect mLastComputedGridSize = new Rect();
+    protected final Rect mLastComputedGridTaskSize = new Rect();
     // How much a task that is directly offscreen will be pushed out due to RecentsView scale/pivot.
     protected Float mLastComputedTaskPushOutDistance = null;
     protected boolean mEnableDrawingLiveTile = false;
@@ -317,10 +319,11 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     // The threshold at which we update the SystemUI flags when animating from the task into the app
     public static final float UPDATE_SYSUI_FLAGS_THRESHOLD = 0.85f;
 
-    protected final T mActivity;
+    protected final ACTIVITY_TYPE mActivity;
     private final float mFastFlingVelocity;
     private final RecentsModel mModel;
     private final int mRowSpacing;
+    private final int mGridSideMargin;
     private final ClearAllButton mClearAllButton;
     private final Rect mClearAllButtonDeadZoneRect = new Rect();
     private final Rect mTaskViewDeadZoneRect = new Rect();
@@ -347,8 +350,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     private boolean mOverviewFullscreenEnabled;
 
     private float mAdjacentPageOffset = 0;
-    private float mTaskViewsSecondaryTranslation = 0;
-    private float mTaskViewsPrimaryTranslation = 0;
+    protected float mTaskViewsSecondaryTranslation = 0;
+    protected float mTaskViewsPrimaryTranslation = 0;
     // Progress from 0 to 1 where 0 is a carousel and 1 is a 2 row grid.
     private float mGridProgress = 0;
 
@@ -436,6 +439,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
     protected int mRunningTaskId = -1;
     protected boolean mRunningTaskTileHidden;
     private Task mTmpRunningTask;
+    protected int mFocusedTaskId = -1;
+    private float mFocusedTaskRatio;
 
     private boolean mRunningTaskIconScaledDown = false;
 
@@ -541,6 +546,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mIsRtl = mOrientationHandler.getRecentsRtlSetting(getResources());
         setLayoutDirection(mIsRtl ? View.LAYOUT_DIRECTION_RTL : View.LAYOUT_DIRECTION_LTR);
         mRowSpacing = getResources().getDimensionPixelSize(R.dimen.overview_grid_row_spacing);
+        mGridSideMargin = getResources().getDimensionPixelSize(R.dimen.overview_grid_side_margin);
         mSquaredTouchSlop = squaredTouchSlop(context);
 
         mEmptyIcon = context.getDrawable(R.drawable.ic_empty_recents);
@@ -645,7 +651,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mActionsView = actionsView;
         mActionsView.updateHiddenFlags(HIDDEN_NO_TASKS, getTaskViewCount() == 0);
         mSplitPlaceholderView = splitPlaceholderView;
-
     }
 
     public SplitPlaceholderView getSplitPlaceholder() {
@@ -1119,6 +1124,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         for (int i = 0; i < taskCount; i++) {
             getTaskViewAt(i).setFullscreenProgress(mFullscreenProgress);
         }
+        mClearAllButton.setFullscreenProgress(fullscreenProgress);
 
         // Fade out the actions view quickly (0.1 range)
         mActionsView.getFullscreenAlpha().setValue(
@@ -1158,9 +1164,31 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
 
         mSizeStrategy.calculateGridSize(mActivity, mActivity.getDeviceProfile(),
                 mLastComputedGridSize);
+        mSizeStrategy.calculateGridTaskSize(mActivity, mActivity.getDeviceProfile(),
+                mLastComputedGridTaskSize, mOrientationHandler);
 
         // Force TaskView to update size from thumbnail
         updateTaskSize();
+
+        // Update ActionsView position
+        FrameLayout.LayoutParams layoutParams =
+                (FrameLayout.LayoutParams) mActionsView.getLayoutParams();
+        if (dp.isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get()) {
+            layoutParams.gravity = Gravity.BOTTOM;
+            layoutParams.bottomMargin =
+                    dp.heightPx - mInsets.bottom - mLastComputedGridSize.bottom;
+            layoutParams.leftMargin = mLastComputedTaskSize.left;
+            layoutParams.rightMargin = dp.widthPx - mLastComputedTaskSize.right;
+            // When in modal state, remove bottom margin to avoid covering content.
+            mActionsView.setModalTransformY(layoutParams.bottomMargin);
+        } else {
+            layoutParams.gravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM;
+            layoutParams.bottomMargin = 0;
+            layoutParams.leftMargin = 0;
+            layoutParams.rightMargin = 0;
+            mActionsView.setModalTransformY(0);
+        }
+        mActionsView.setLayoutParams(layoutParams);
     }
 
     /**
@@ -1201,6 +1229,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             getTaskViewAt(i).setFullscreenTranslationX(
                     fullscreenTranslations[i] - fullscreenTranslations[firstNonHomeTaskIndex]);
         }
+        mClearAllButton.setFullscreenTranslationPrimary(
+                accumulatedTranslationX - fullscreenTranslations[firstNonHomeTaskIndex]);
 
         // Align ClearAllButton to the left (RTL) or right (non-RTL), which is different from other
         // TaskViews.
@@ -1216,11 +1246,36 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mLastComputedTaskSize.set(outRect);
     }
 
+    /**
+     * Returns the size of task selected to enter modal state.
+     */
+    public Point getSelectedTaskSize() {
+        mSizeStrategy.calculateTaskSize(mActivity, mActivity.getDeviceProfile(), mTempRect,
+                mOrientationHandler);
+        int taskWidth = mTempRect.width();
+        int taskHeight = mTempRect.height();
+        if (mRunningTaskId != -1) {
+            int boxLength = Math.max(taskWidth, taskHeight);
+            if (mFocusedTaskRatio > 1) {
+                taskWidth = boxLength;
+                taskHeight = (int) (boxLength / mFocusedTaskRatio);
+            } else {
+                taskWidth = (int) (boxLength * mFocusedTaskRatio);
+                taskHeight = boxLength;
+            }
+        }
+        return new Point(taskWidth, taskHeight);
+    }
+
     /** Gets the last computed task size */
     public Rect getLastComputedTaskSize() {
         return mLastComputedTaskSize;
     }
 
+    public Rect getLastComputedGridTaskSize() {
+        return mLastComputedGridTaskSize;
+    }
+
     /** Gets the task size for modal state. */
     public void getModalTaskSize(Rect outRect) {
         mSizeStrategy.calculateModalTaskSize(mActivity, mActivity.getDeviceProfile(), outRect);
@@ -1239,6 +1294,15 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
 
             // After scrolling, update the visible task's data
             loadVisibleTaskData(TaskView.FLAG_UPDATE_ALL);
+
+            // After scrolling, update ActionsView's visibility.
+            TaskView focusedTaskView = getFocusedTaskView();
+            if (focusedTaskView != null) {
+                float scrollDiff = Math.abs(getScrollForPage(indexOfChild(focusedTaskView))
+                        - mOrientationHandler.getPrimaryScroll(this));
+                float delta = (mGridSideMargin - scrollDiff) / (float) mGridSideMargin;
+                mActionsView.getScrollAlpha().setValue(Utilities.boundToRange(delta, 0, 1));
+            }
         }
 
         // Update the high res thumbnail loader state
@@ -1403,6 +1467,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         setCurrentTask(-1);
         mIgnoreResetTaskId = -1;
         mTaskListChangeId = -1;
+        mFocusedTaskId = -1;
 
         mRecentsAnimationController = null;
         mLiveTileParams.setTargetSet(null);
@@ -1429,6 +1494,17 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         return getTaskIndexForId(mRunningTaskId);
     }
 
+    public @Nullable TaskView getFocusedTaskView() {
+        return getTaskView(mFocusedTaskId);
+    }
+
+    /**
+     * Returns the width to height ratio of the focused {@link TaskView}.
+     */
+    public float getFocusedTaskRatio() {
+        return mFocusedTaskRatio;
+    }
+
     /**
      * Get the index of the task view whose id matches {@param taskId}.
      * @return -1 if there is no task view for the task id, else the index of the task view.
@@ -1520,6 +1596,11 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
      */
     public void onGestureEndTargetCalculated(GestureState.GestureEndTarget endTarget) {
         mCurrentGestureEndTarget = endTarget;
+        if (showAsGrid()) {
+            mFocusedTaskId = mRunningTaskId;
+            mFocusedTaskRatio =
+                    mLastComputedTaskSize.width() / (float) mLastComputedTaskSize.height();
+        }
     }
 
     /**
@@ -1540,8 +1621,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         setRunningTaskHidden(false);
         animateUpRunningTaskIconScale();
 
-        // TODO: This should be tied to whether there is a focus app on overview.
-        if (!showAsGrid()) {
+        if (!showAsGrid() || getFocusedTaskView() != null) {
             animateActionsViewIn();
         }
 
@@ -1661,6 +1741,13 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         anim.start();
     }
 
+    private void animateActionsViewOut() {
+        ObjectAnimator anim = ObjectAnimator.ofFloat(
+                mActionsView.getVisibilityAlpha(), MultiValueAlpha.VALUE, 1, 0);
+        anim.setDuration(TaskView.SCALE_ICON_DURATION);
+        anim.start();
+    }
+
     public void animateUpRunningTaskIconScale() {
         animateUpRunningTaskIconScale(0);
     }
@@ -1686,8 +1773,12 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             return;
         }
 
-        final int boxLength = Math.max(mTaskWidth, mTaskHeight);
+        final int boxLength = Math.max(mLastComputedGridTaskSize.width(),
+                mLastComputedGridTaskSize.height());
         int taskTopMargin = mActivity.getDeviceProfile().overviewTaskThumbnailTopMarginPx;
+        float heightOffset = (boxLength + taskTopMargin) + mRowSpacing;
+        float taskGridVerticalDiff = mLastComputedGridTaskSize.top - mLastComputedTaskSize.top;
+
         int topRowWidth = 0;
         int bottomRowWidth = 0;
         float topAccumulatedTranslationX = 0;
@@ -1710,15 +1801,23 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             }
 
             // Evenly distribute tasks between rows unless rearranging due to task dismissal, in
-            // which case keep tasks in their respective rows.
-            if ((!isTaskDismissal && topRowWidth <= bottomRowWidth) || (isTaskDismissal && mTopIdSet
-                    .contains(taskView.getTask().key.id))) {
+            // which case keep tasks in their respective rows. For the running task, don't join
+            // the grid.
+            if (taskView.isRunningTask()) {
+                topRowWidth += taskView.getLayoutParams().width + mPageSpacing;
+                bottomRowWidth += taskView.getLayoutParams().width + mPageSpacing;
+
+                // Center view vertically in case it's from different orientation.
+                taskView.setGridTranslationY((mLastComputedTaskSize.height() + taskTopMargin
+                        - taskView.getLayoutParams().height) / 2f);
+            } else if ((!isTaskDismissal && topRowWidth <= bottomRowWidth) || (isTaskDismissal
+                        && mTopIdSet.contains(taskView.getTask().key.id))) {
                 gridTranslations[i] += topAccumulatedTranslationX;
                 topRowWidth += taskView.getLayoutParams().width + mPageSpacing;
                 topSet.add(i);
                 mTopIdSet.add(taskView.getTask().key.id);
 
-                taskView.setGridTranslationY(0);
+                taskView.setGridTranslationY(taskGridVerticalDiff);
 
                 // Move horizontally into empty space.
                 float widthOffset = 0;
@@ -1735,8 +1834,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                 bottomSet.add(i);
 
                 // Move into bottom row.
-                float heightOffset = (boxLength + taskTopMargin) + mRowSpacing;
-                taskView.setGridTranslationY(heightOffset);
+                taskView.setGridTranslationY(heightOffset + taskGridVerticalDiff);
 
                 // Move horizontally into empty space.
                 float widthOffset = 0;
@@ -1794,8 +1892,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
 
         mClearAllButton.setGridTranslationPrimary(
                 clearAllTotalTranslationX - gridTranslations[firstNonHomeTaskIndex]);
-        mClearAllButton.setGridTranslationSecondary(
-                boxLength - mTaskHeight / 2f + mRowSpacing / 2f);
         mClearAllButton.setGridScrollOffset(
                 mIsRtl ? mLastComputedTaskSize.left - mLastComputedGridSize.left
                         : mLastComputedTaskSize.right - mLastComputedGridSize.right);
@@ -2072,24 +2168,25 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                         snapToPageImmediately(pageToSnapTo);
                         // Grid got messed up, reapply.
                         updateGridProperties(true);
+                        if (showAsGrid() && getFocusedTaskView() == null) {
+                            animateActionsViewOut();
+                        }
                     }
                     // Update the layout synchronously so that the position of next view is
                     // immediately available.
                     onLayout(false /*  changed */, getLeft(), getTop(), getRight(), getBottom());
                 }
                 resetTaskVisuals();
-                if (mActivity.isInState(OVERVIEW_SPLIT_SELECT)) {
-                    // We want to keep the tasks translations in this temporary state
-                    // after resetting the rest above
-                    setTaskViewsResistanceTranslation(mTaskViewsSecondaryTranslation);
-                    setTaskViewsPrimaryTranslation(mTaskViewsPrimaryTranslation);
-                }
+                onDismissAnimationEnds();
                 mPendingAnimation = null;
             }
         });
         return anim;
     }
 
+    protected void onDismissAnimationEnds() {
+    }
+
     public PendingAnimation createAllTasksDismissAnimation(long duration) {
         if (FeatureFlags.IS_STUDIO_BUILD && mPendingAnimation != null) {
             throw new IllegalStateException("Another pending animation is still running");
@@ -2257,13 +2354,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         if (mOrientationState.setRecentsRotation(rotation)) {
             updateOrientationHandler();
         }
-
-        // If overview is in modal state when rotate, reset it to overview state without running
-        // animation.
-        if (mActivity.isInState(OVERVIEW_MODAL_TASK)) {
-            mActivity.getStateManager().goToState(LauncherState.OVERVIEW, false);
-            resetModalVisuals();
-        }
     }
 
     public void setLayoutRotation(int touchRotation, int displayRotation) {
@@ -2475,7 +2565,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         return distanceToOffscreen * offsetProgress;
     }
 
-    private void setTaskViewsResistanceTranslation(float translation) {
+    protected void setTaskViewsResistanceTranslation(float translation) {
         mTaskViewsSecondaryTranslation = translation;
         for (int i = 0; i < getTaskViewCount(); i++) {
             TaskView task = getTaskViewAt(i);
@@ -2484,7 +2574,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mLiveTileTaskViewSimulator.recentsViewSecondaryTranslation.value = translation;
     }
 
-    private void setTaskViewsPrimaryTranslation(float translation) {
+    protected void setTaskViewsPrimaryTranslation(float translation) {
         mTaskViewsPrimaryTranslation = translation;
         for (int i = 0; i < getTaskViewCount(); i++) {
             TaskView task = getTaskViewAt(i);
@@ -2515,7 +2605,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         mSplitPlaceholderView.getSplitController().setInitialTaskSelect(taskView,
                 splitPositionOption);
         mSplitHiddenTaskViewIndex = indexOfChild(taskView);
-        mActivity.getStateManager().goToState(LauncherState.OVERVIEW_SPLIT_SELECT);
     }
 
     public PendingAnimation createSplitSelectInitAnimation() {
@@ -2943,10 +3032,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
      * Returns page scroll of the left most child.
      */
     public int getLeftMostChildScroll() {
-        if (mIsRtl) {
-            return getScrollForPage(indexOfChild(getTaskViewAt(getTaskViewCount() - 1)) + 1);
-        }
-        return getScrollForPage(mTaskViewStartIndex);
+        return getScrollForPage(mIsRtl ? indexOfChild(mClearAllButton) : mTaskViewStartIndex);
     }
 
     @Override
@@ -2957,10 +3043,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                 // so use the rightmost task as the min scroll.
                 return getScrollForPage(indexOfChild(getTaskViewAt(getTaskViewCount() - 1)));
             }
-            if (mIsRtl) {
-                return getScrollForPage(mTaskViewStartIndex);
-            }
-            return getScrollForPage(indexOfChild(getTaskViewAt(getTaskViewCount() - 1)) + 1);
+            return getScrollForPage(mIsRtl ? mTaskViewStartIndex : indexOfChild(mClearAllButton));
         }
         return super.computeMaxScroll();
     }
@@ -2979,7 +3062,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                 scrollDiff = ((TaskView) child).getScrollAdjustment(mOverviewFullscreenEnabled,
                         showAsGrid());
             } else if (child instanceof ClearAllButton) {
-                scrollDiff = ((ClearAllButton) child).getScrollAdjustment(showAsGrid());
+                scrollDiff = ((ClearAllButton) child).getScrollAdjustment(
+                        mOverviewFullscreenEnabled, showAsGrid());
             }
 
             if (scrollDiff != 0) {
@@ -2998,7 +3082,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
             childOffset += ((TaskView) child).getOffsetAdjustment(mOverviewFullscreenEnabled,
                     showAsGrid());
         } else if (child instanceof ClearAllButton) {
-            childOffset += ((ClearAllButton) child).getOffsetAdjustment(showAsGrid());
+            childOffset += ((ClearAllButton) child).getOffsetAdjustment(mOverviewFullscreenEnabled,
+                    showAsGrid());
         }
         return childOffset;
     }
@@ -3174,6 +3259,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         boolean inPlaceLandscape = !mOrientationState.canRecentsActivityRotate()
                 && mOrientationState.getTouchRotation() != ROTATION_0;
         mActionsView.updateHiddenFlags(HIDDEN_NON_ZERO_ROTATION, modalness < 1 && inPlaceLandscape);
+        mActionsView.setTaskModalness(modalness);
     }
 
     @Nullable
@@ -3208,6 +3294,11 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
                 mCurrentGestureEndTarget).displayOverviewTasksAsGrid(mActivity.getDeviceProfile()));
     }
 
+    public boolean shouldShowOverviewActionsForState(STATE_TYPE state) {
+        return !state.displayOverviewTasksAsGrid(mActivity.getDeviceProfile())
+                || getFocusedTaskView() != null;
+    }
+
     /**
      * Used to register callbacks for when our empty message state changes.
      *
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 21b11644d2..745e328ab3 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -987,7 +987,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         return scrollAdjustment;
     }
 
-    public float getOffsetAdjustment(boolean fullscreenEnabled,boolean gridEnabled) {
+    public float getOffsetAdjustment(boolean fullscreenEnabled, boolean gridEnabled) {
         return getScrollAdjustment(fullscreenEnabled, gridEnabled);
     }
 
@@ -1213,61 +1213,76 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
      */
     void updateTaskSize() {
         ViewGroup.LayoutParams params = getLayoutParams();
+        float fullscreenScale;
+        float boxTranslationY;
+        int expectedWidth;
+        int expectedHeight;
         if (mActivity.getDeviceProfile().isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get()) {
             final int thumbnailPadding =
                     mActivity.getDeviceProfile().overviewTaskThumbnailTopMarginPx;
-
-            Rect lastComputedTaskSize = getRecentsView().getLastComputedTaskSize();
-            int taskWidth = lastComputedTaskSize.width();
-            int taskHeight = lastComputedTaskSize.height();
-
-            int expectedWidth;
-            int expectedHeight;
-            float thumbnailRatio = mTask != null ? mTask.getVisibleThumbnailRatio(
-                    TaskView.CLIP_STATUS_AND_NAV_BARS) : 0f;
-            if (isRunningTask() || thumbnailRatio == 0f) {
-                expectedWidth = taskWidth;
-                expectedHeight = taskHeight + thumbnailPadding;
+            final Rect lastComputedTaskSize = getRecentsView().getLastComputedTaskSize();
+            final int taskWidth = lastComputedTaskSize.width();
+            final int taskHeight = lastComputedTaskSize.height();
+
+            int boxWidth;
+            int boxHeight;
+            float thumbnailRatio;
+            boolean isFocusedTask = isFocusedTask();
+            if (isFocusedTask || isRunningTask()) {
+                // Task will be focused and should use focused task size. Use runningTaskRatio
+                // that is associated with the original orientation of the focused task if possible.
+                boxWidth = taskWidth;
+                boxHeight = taskHeight;
+                thumbnailRatio = isFocusedTask ? getRecentsView().getFocusedTaskRatio() : 0;
             } else {
-                int boxLength = Math.max(taskWidth, taskHeight);
-                if (thumbnailRatio > 1) {
-                    expectedWidth = boxLength;
-                    expectedHeight = (int) (boxLength / thumbnailRatio) + thumbnailPadding;
-                } else {
-                    expectedWidth = (int) (boxLength * thumbnailRatio);
-                    expectedHeight = boxLength + thumbnailPadding;
-                }
+                // Otherwise task is in grid, and should use lastComputedGridTaskSize.
+                Rect lastComputedGridTaskSize = getRecentsView().getLastComputedGridTaskSize();
+                boxWidth = lastComputedGridTaskSize.width();
+                boxHeight = lastComputedGridTaskSize.height();
+                thumbnailRatio = mTask != null ? mTask.getVisibleThumbnailRatio(
+                        TaskView.CLIP_STATUS_AND_NAV_BARS) : 0f;
+            }
+            int boxLength = Math.max(boxWidth, boxHeight);
+
+            // Bound width/height to the box size.
+            if (thumbnailRatio == 0f) {
+                expectedWidth = boxWidth;
+                expectedHeight = boxHeight + thumbnailPadding;
+            } else if (thumbnailRatio > 1) {
+                expectedWidth = boxLength;
+                expectedHeight = (int) (boxLength / thumbnailRatio) + thumbnailPadding;
+            } else {
+                expectedWidth = (int) (boxLength * thumbnailRatio);
+                expectedHeight = boxLength + thumbnailPadding;
             }
 
-            float heightDiff = (expectedHeight - thumbnailPadding - taskHeight) / 2.0f;
-            setBoxTranslationY(heightDiff);
+            // Scale to to fit task Rect.
+            fullscreenScale = taskWidth / (float) boxWidth;
 
-            float fullscreenScale = 1f;
-            if (expectedWidth > taskWidth) {
-                // In full screen, expectedWidth should not be larger than taskWidth.
-                fullscreenScale = taskWidth / (float) expectedWidth;
-            } else if (expectedHeight - thumbnailPadding > taskHeight) {
-                // In full screen, expectedHeight should not be larger than taskHeight.
-                fullscreenScale = taskHeight / (float) (expectedHeight - thumbnailPadding);
+            // In full screen, scale back TaskView to original size.
+            if (expectedWidth > boxWidth) {
+                fullscreenScale *= boxWidth / (float) expectedWidth;
+            } else if (expectedHeight - thumbnailPadding > boxHeight) {
+                fullscreenScale *= boxHeight / (float) (expectedHeight - thumbnailPadding);
             }
-            setFullscreenScale(fullscreenScale);
 
-            if (params.width != expectedWidth || params.height != expectedHeight) {
-                params.width = expectedWidth;
-                params.height = expectedHeight;
-                setLayoutParams(params);
-            }
+            // Align to top of task Rect.
+            boxTranslationY = (expectedHeight - thumbnailPadding - taskHeight) / 2.0f;
         } else {
-            setBoxTranslationY(0);
-            setFullscreenScale(1);
-            if (params.width != ViewGroup.LayoutParams.MATCH_PARENT) {
-                params.width = ViewGroup.LayoutParams.MATCH_PARENT;
-                params.height = ViewGroup.LayoutParams.MATCH_PARENT;
-                setLayoutParams(params);
-            }
+            fullscreenScale = 1f;
+            boxTranslationY = 0f;
+            expectedWidth = ViewGroup.LayoutParams.MATCH_PARENT;
+            expectedHeight = ViewGroup.LayoutParams.MATCH_PARENT;
         }
-    }
 
+        setFullscreenScale(fullscreenScale);
+        setBoxTranslationY(boxTranslationY);
+        if (params.width != expectedWidth || params.height != expectedHeight) {
+            params.width = expectedWidth;
+            params.height = expectedHeight;
+            setLayoutParams(params);
+        }
+    }
 
     private float getFullscreenTrans(float endTranslation) {
         float progress = ACCEL_DEACCEL.getInterpolation(mFullscreenProgress);
@@ -1281,6 +1296,13 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         return this == getRecentsView().getRunningTaskView();
     }
 
+    public boolean isFocusedTask() {
+        if (getRecentsView() == null) {
+            return false;
+        }
+        return this == getRecentsView().getFocusedTaskView();
+    }
+
     public void setShowScreenshot(boolean showScreenshot) {
         mShowScreenshot = showScreenshot;
     }
diff --git a/res/layout/overview_actions_container.xml b/res/layout/overview_actions_container.xml
index 5946bf67ec..f152c7c727 100644
--- a/res/layout/overview_actions_container.xml
+++ b/res/layout/overview_actions_container.xml
@@ -14,6 +14,8 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
+<!-- NOTE! don't add dimensions for margins / gravity to root view in this file, they need to be
+     loaded at runtime. -->
 <Space
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="0dp"
-- 
GitLab


From b62fba0d0199d719ac63761846e09b4b28e1dc2c Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Thu, 1 Apr 2021 13:14:23 -0400
Subject: [PATCH 0815/1664] Set FLAG_IMMUTABLE flag on FirstScreenBroadcast
 PendingIntent.

Bug: 183927137
Test: restore phone and ensure broadcast is sent
Change-Id: I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2
---
 src/com/android/launcher3/model/FirstScreenBroadcast.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/model/FirstScreenBroadcast.java b/src/com/android/launcher3/model/FirstScreenBroadcast.java
index 70d1b481e6..e391d37938 100644
--- a/src/com/android/launcher3/model/FirstScreenBroadcast.java
+++ b/src/com/android/launcher3/model/FirstScreenBroadcast.java
@@ -15,6 +15,8 @@
  */
 package com.android.launcher3.model;
 
+import static android.app.PendingIntent.FLAG_IMMUTABLE;
+import static android.app.PendingIntent.FLAG_ONE_SHOT;
 import static android.os.Process.myUserHandle;
 
 import static com.android.launcher3.pm.InstallSessionHelper.getUserHandle;
@@ -140,7 +142,7 @@ public class FirstScreenBroadcast {
                 .putStringArrayListExtra(HOTSEAT_ITEM_EXTRA, new ArrayList<>(hotseatItems))
                 .putStringArrayListExtra(WIDGET_ITEM_EXTRA, new ArrayList<>(widgetItems))
                 .putExtra(VERIFICATION_TOKEN_EXTRA, PendingIntent.getActivity(context, 0,
-                        new Intent(), PendingIntent.FLAG_ONE_SHOT)));
+                        new Intent(), FLAG_ONE_SHOT | FLAG_IMMUTABLE)));
     }
 
     private static String getPackageName(ItemInfo info) {
-- 
GitLab


From 7d821d98f1f12d04decd75501b6f1dccd9beefd4 Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Thu, 1 Apr 2021 16:04:44 -0700
Subject: [PATCH 0816/1664] Updates OptionsPopupView to allow non-resource
 strings/icons.

This will be needed for Smartspace which gets its menu options
from AiAi.

Test: Hard-coded strings passed to Smartspace from the fake
data Launcher plugin. Also verified could access the menu
using TalkBack.
Bug: 184179894

Change-Id: I724c09db18085585c7a5224e32c0d8973acdab7c
---
 .../LauncherAccessibilityDelegate.java        | 22 ++++----
 .../views/AccessibilityActionsView.java       |  2 +-
 .../launcher3/views/OptionsPopupView.java     | 51 ++++++++++++++-----
 3 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
index db7fd3feca..a5852ba828 100644
--- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
+++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
@@ -265,7 +265,7 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
             List<OptionItem> actions = getSupportedResizeActions(host, info);
             Rect pos = new Rect();
             mLauncher.getDragLayer().getDescendantRectRelativeToSelf(host, pos);
-            ArrowPopup popup = OptionsPopupView.show(mLauncher, new RectF(pos), actions);
+            ArrowPopup popup = OptionsPopupView.show(mLauncher, new RectF(pos), actions, false);
             popup.requestFocus();
             popup.setOnCloseCallback(host::requestFocus);
             return true;
@@ -294,15 +294,17 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
         if ((providerInfo.resizeMode & AppWidgetProviderInfo.RESIZE_HORIZONTAL) != 0) {
             if (layout.isRegionVacant(info.cellX + info.spanX, info.cellY, 1, info.spanY) ||
                     layout.isRegionVacant(info.cellX - 1, info.cellY, 1, info.spanY)) {
-                actions.add(new OptionItem(
-                        R.string.action_increase_width, R.drawable.ic_widget_width_increase,
+                actions.add(new OptionItem(mLauncher,
+                        R.string.action_increase_width,
+                        R.drawable.ic_widget_width_increase,
                         IGNORE,
                         v -> performResizeAction(R.string.action_increase_width, host, info)));
             }
 
             if (info.spanX > info.minSpanX && info.spanX > 1) {
-                actions.add(new OptionItem(
-                        R.string.action_decrease_width, R.drawable.ic_widget_width_decrease,
+                actions.add(new OptionItem(mLauncher,
+                        R.string.action_decrease_width,
+                        R.drawable.ic_widget_width_decrease,
                         IGNORE,
                         v -> performResizeAction(R.string.action_decrease_width, host, info)));
             }
@@ -311,15 +313,17 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
         if ((providerInfo.resizeMode & AppWidgetProviderInfo.RESIZE_VERTICAL) != 0) {
             if (layout.isRegionVacant(info.cellX, info.cellY + info.spanY, info.spanX, 1) ||
                     layout.isRegionVacant(info.cellX, info.cellY - 1, info.spanX, 1)) {
-                actions.add(new OptionItem(
-                        R.string.action_increase_height, R.drawable.ic_widget_height_increase,
+                actions.add(new OptionItem(mLauncher,
+                        R.string.action_increase_height,
+                        R.drawable.ic_widget_height_increase,
                         IGNORE,
                         v -> performResizeAction(R.string.action_increase_height, host, info)));
             }
 
             if (info.spanY > info.minSpanY && info.spanY > 1) {
-                actions.add(new OptionItem(
-                        R.string.action_decrease_height, R.drawable.ic_widget_height_decrease,
+                actions.add(new OptionItem(mLauncher,
+                        R.string.action_decrease_height,
+                        R.drawable.ic_widget_height_decrease,
                         IGNORE,
                         v -> performResizeAction(R.string.action_decrease_height, host, info)));
             }
diff --git a/src/com/android/launcher3/views/AccessibilityActionsView.java b/src/com/android/launcher3/views/AccessibilityActionsView.java
index 0eacaa3009..1d136c3a9f 100644
--- a/src/com/android/launcher3/views/AccessibilityActionsView.java
+++ b/src/com/android/launcher3/views/AccessibilityActionsView.java
@@ -67,7 +67,7 @@ public class AccessibilityActionsView extends View implements StateListener<Laun
         info.addAction(new AccessibilityAction(
                 R.string.all_apps_button_label, l.getText(R.string.all_apps_button_label)));
         for (OptionItem item : OptionsPopupView.getOptions(l)) {
-            info.addAction(new AccessibilityAction(item.labelRes, l.getText(item.labelRes)));
+            info.addAction(new AccessibilityAction(item.labelRes, item.label));
         }
         return info;
     }
diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java
index 9a2db109ef..98cc876c93 100644
--- a/src/com/android/launcher3/views/OptionsPopupView.java
+++ b/src/com/android/launcher3/views/OptionsPopupView.java
@@ -26,6 +26,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Rect;
 import android.graphics.RectF;
+import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.AttributeSet;
@@ -37,6 +38,7 @@ import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+import androidx.core.content.ContextCompat;
 
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherSettings;
@@ -62,6 +64,7 @@ public class OptionsPopupView extends ArrowPopup
 
     private final ArrayMap<View, OptionItem> mItemMap = new ArrayMap<>();
     private RectF mTargetRect;
+    private boolean mShouldAddArrow;
 
     public OptionsPopupView(Context context, AttributeSet attrs) {
         this(context, attrs, 0);
@@ -113,9 +116,13 @@ public class OptionsPopupView extends ArrowPopup
         return (type & TYPE_OPTIONS_POPUP) != 0;
     }
 
+    public void setShouldAddArrow(boolean shouldAddArrow) {
+        mShouldAddArrow = shouldAddArrow;
+    }
+
     @Override
     protected boolean shouldAddArrow() {
-        return false;
+        return mShouldAddArrow;
     }
 
     @Override
@@ -124,16 +131,17 @@ public class OptionsPopupView extends ArrowPopup
     }
 
     public static OptionsPopupView show(
-            Launcher launcher, RectF targetRect, List<OptionItem> items) {
+            Launcher launcher, RectF targetRect, List<OptionItem> items, boolean shouldAddArrow) {
         OptionsPopupView popup = (OptionsPopupView) launcher.getLayoutInflater()
                 .inflate(R.layout.longpress_options_menu, launcher.getDragLayer(), false);
         popup.mTargetRect = targetRect;
+        popup.setShouldAddArrow(shouldAddArrow);
 
         for (OptionItem item : items) {
             DeepShortcutView view =
                     (DeepShortcutView) popup.inflateAndAdd(R.layout.system_shortcut, popup);
-            view.getIconView().setBackgroundResource(item.iconRes);
-            view.getBubbleText().setText(item.labelRes);
+            view.getIconView().setBackgroundDrawable(item.icon);
+            view.getBubbleText().setText(item.label);
             view.setOnClickListener(popup);
             view.setOnLongClickListener(popup);
             popup.mItemMap.put(view, item);
@@ -154,7 +162,7 @@ public class OptionsPopupView extends ArrowPopup
             y = launcher.getDragLayer().getHeight() / 2;
         }
         RectF target = new RectF(x - halfSize, y - halfSize, x + halfSize, y + halfSize);
-        show(launcher, target, getOptions(launcher));
+        show(launcher, target, getOptions(launcher), false);
     }
 
     /**
@@ -162,11 +170,15 @@ public class OptionsPopupView extends ArrowPopup
      */
     public static ArrayList<OptionItem> getOptions(Launcher launcher) {
         ArrayList<OptionItem> options = new ArrayList<>();
-        options.add(new OptionItem(R.string.settings_button_text, R.drawable.ic_setting,
+        options.add(new OptionItem(launcher,
+                R.string.settings_button_text,
+                R.drawable.ic_setting,
                 LAUNCHER_SETTINGS_BUTTON_TAP_OR_LONGPRESS,
                 OptionsPopupView::startSettings));
         if (!WidgetsModel.GO_DISABLE_WIDGETS) {
-            options.add(new OptionItem(R.string.widget_button_text, R.drawable.ic_widget,
+            options.add(new OptionItem(launcher,
+                    R.string.widget_button_text,
+                    R.drawable.ic_widget,
                     LAUNCHER_WIDGETSTRAY_BUTTON_TAP_OR_LONGPRESS,
                     OptionsPopupView::onWidgetsClicked));
         }
@@ -174,7 +186,9 @@ public class OptionsPopupView extends ArrowPopup
                 R.string.styles_wallpaper_button_text : R.string.wallpaper_button_text;
         int resDrawable = Utilities.existsStyleWallpapers(launcher) ?
                 R.drawable.ic_palette : R.drawable.ic_wallpaper;
-        options.add(new OptionItem(resString, resDrawable,
+        options.add(new OptionItem(launcher,
+                resString,
+                resDrawable,
                 IGNORE,
                 OptionsPopupView::startWallpaperPicker));
         return options;
@@ -241,15 +255,28 @@ public class OptionsPopupView extends ArrowPopup
 
     public static class OptionItem {
 
+        // Used to create AccessibilityNodeInfo in AccessibilityActionsView.java.
         public final int labelRes;
-        public final int iconRes;
+
+        public final CharSequence label;
+        public final Drawable icon;
         public final EventEnum eventId;
         public final OnLongClickListener clickListener;
 
-        public OptionItem(int labelRes, int iconRes, EventEnum eventId,
-                OnLongClickListener clickListener) {
+        public OptionItem(Context context, int labelRes, int iconRes, EventEnum eventId,
+                          OnLongClickListener clickListener) {
             this.labelRes = labelRes;
-            this.iconRes = iconRes;
+            this.label = context.getText(labelRes);
+            this.icon = ContextCompat.getDrawable(context, iconRes);
+            this.eventId = eventId;
+            this.clickListener = clickListener;
+        }
+
+        public OptionItem(CharSequence label, Drawable icon, EventEnum eventId,
+                          OnLongClickListener clickListener) {
+            this.labelRes = 0;
+            this.label = label;
+            this.icon = icon;
             this.eventId = eventId;
             this.clickListener = clickListener;
         }
-- 
GitLab


From 11d7d34f0df2b0ca308a2414ef09ae2f0be646b6 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 2 Apr 2021 10:58:57 -0700
Subject: [PATCH 0817/1664] Removing unnessary resource split in overview

Bug: 184169818
Test: Presubmit
Change-Id: Iff5a8510be337472f05acb5629712ec088361471
---
 Android.bp                                    |  1 -
 Android.mk                                    | 13 ++++-------
 .../res/values/config.xml                     | 22 -------------------
 .../res/layout/overview_actions_container.xml |  0
 go/quickstep/res/values/config.xml            |  2 ++
 .../res/values/config.xml                     | 18 ---------------
 .../recents_ui_overrides/src/REMOVED.txt      |  2 --
 .../res/layout/overview_actions_container.xml |  0
 quickstep/res/values/config.xml               |  1 +
 9 files changed, 7 insertions(+), 52 deletions(-)
 delete mode 100644 go/quickstep/overview_ui_overrides/res/values/config.xml
 rename go/quickstep/{overview_ui_overrides => }/res/layout/overview_actions_container.xml (100%)
 delete mode 100644 quickstep/overview_ui_overrides/res/values/config.xml
 delete mode 100644 quickstep/recents_ui_overrides/src/REMOVED.txt
 rename quickstep/{overview_ui_overrides => }/res/layout/overview_actions_container.xml (100%)

diff --git a/Android.bp b/Android.bp
index 2c9d664ac6..e30d22ff73 100644
--- a/Android.bp
+++ b/Android.bp
@@ -179,7 +179,6 @@ android_library {
     srcs: [ ],
     resource_dirs: [
         "quickstep/res",
-        "quickstep/overview_ui_overrides/res",
     ],
     static_libs: [
         "Launcher3ResLib",
diff --git a/Android.mk b/Android.mk
index 89870a690e..54a80b7454 100644
--- a/Android.mk
+++ b/Android.mk
@@ -78,9 +78,7 @@ LOCAL_SRC_FILES := \
     $(call all-java-files-under, quickstep/src) \
     $(call all-java-files-under, src_shortcuts_overrides)
 
-LOCAL_RESOURCE_DIR := \
-    $(LOCAL_PATH)/quickstep/res \
-    $(LOCAL_PATH)/quickstep/overview_ui_overrides/res
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/quickstep/res
 LOCAL_PROGUARD_ENABLED := disabled
 
 
@@ -109,9 +107,7 @@ LOCAL_SYSTEM_EXT_MODULE := true
 LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3
 LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
 
-LOCAL_RESOURCE_DIR := \
-    $(LOCAL_PATH)/quickstep/res \
-    $(LOCAL_PATH)/quickstep/overview_ui_overrides/res
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/quickstep/res
 
 LOCAL_FULL_LIBS_MANIFEST_FILES := \
     $(LOCAL_PATH)/quickstep/AndroidManifest-launcher.xml \
@@ -148,10 +144,9 @@ LOCAL_SRC_FILES := \
     $(call all-java-files-under, go/quickstep/src)
 
 LOCAL_RESOURCE_DIR := \
-    $(LOCAL_PATH)/quickstep/res \
-    $(LOCAL_PATH)/go/res \
     $(LOCAL_PATH)/go/quickstep/res \
-    $(LOCAL_PATH)/go/quickstep/overview_ui_overrides/res
+    $(LOCAL_PATH)/go/res \
+    $(LOCAL_PATH)/quickstep/res
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 LOCAL_PROGUARD_ENABLED := full
diff --git a/go/quickstep/overview_ui_overrides/res/values/config.xml b/go/quickstep/overview_ui_overrides/res/values/config.xml
deleted file mode 100644
index ec21a01572..0000000000
--- a/go/quickstep/overview_ui_overrides/res/values/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-* Copyright (C) 2021 The Android Open Source Project
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
--->
-<resources>
-    <string name="task_overlay_factory_class" translatable="false">
-        com.android.quickstep.TaskOverlayFactoryGo</string>
-</resources>
\ No newline at end of file
diff --git a/go/quickstep/overview_ui_overrides/res/layout/overview_actions_container.xml b/go/quickstep/res/layout/overview_actions_container.xml
similarity index 100%
rename from go/quickstep/overview_ui_overrides/res/layout/overview_actions_container.xml
rename to go/quickstep/res/layout/overview_actions_container.xml
diff --git a/go/quickstep/res/values/config.xml b/go/quickstep/res/values/config.xml
index a21381c745..402bf9ad13 100644
--- a/go/quickstep/res/values/config.xml
+++ b/go/quickstep/res/values/config.xml
@@ -21,4 +21,6 @@
 
     <!-- Feature Flags -->
     <bool name="enable_niu_actions">true</bool>
+
+    <string name="task_overlay_factory_class" translatable="false">com.android.quickstep.TaskOverlayFactoryGo</string>
 </resources>
\ No newline at end of file
diff --git a/quickstep/overview_ui_overrides/res/values/config.xml b/quickstep/overview_ui_overrides/res/values/config.xml
deleted file mode 100644
index 0f09439cf5..0000000000
--- a/quickstep/overview_ui_overrides/res/values/config.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <string name="task_overlay_factory_class" translatable="false"/>
-</resources>
\ No newline at end of file
diff --git a/quickstep/recents_ui_overrides/src/REMOVED.txt b/quickstep/recents_ui_overrides/src/REMOVED.txt
deleted file mode 100644
index c3a3eaf692..0000000000
--- a/quickstep/recents_ui_overrides/src/REMOVED.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Temp file to prevent build breakage.
-Will be removed in followup cl.
\ No newline at end of file
diff --git a/quickstep/overview_ui_overrides/res/layout/overview_actions_container.xml b/quickstep/res/layout/overview_actions_container.xml
similarity index 100%
rename from quickstep/overview_ui_overrides/res/layout/overview_actions_container.xml
rename to quickstep/res/layout/overview_actions_container.xml
diff --git a/quickstep/res/values/config.xml b/quickstep/res/values/config.xml
index be661049a1..b2ff7709d4 100644
--- a/quickstep/res/values/config.xml
+++ b/quickstep/res/values/config.xml
@@ -15,6 +15,7 @@
 -->
 <resources>
     <string name="overscroll_plugin_factory_class" translatable="false" />
+    <string name="task_overlay_factory_class" translatable="false"/>
 
     <!-- Activities which block home gesture -->
     <string-array name="gesture_blocking_activities" translatable="false">
-- 
GitLab


From 0eabc781b1fd7ac3b94834a22a8f0b63bfca5eb8 Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Fri, 2 Apr 2021 14:30:10 -0700
Subject: [PATCH 0818/1664] [AA+] Fix missing InstanceId for
 LAUNCHER_ALLAPPS_CLOSE_DOWN event.

Before: https://screenshot.googleplex.com/8ZYxhujUR3amgmF.png
After: https://screenshot.googleplex.com/AZ7PExbBhGW2pAC.png

Bug: 178562918
Test: Manual
Change-Id: Id0bc54049e3a13cd53aaa37d0acee27ec7433fab
---
 src/com/android/launcher3/Launcher.java       | 24 +++++++++++--------
 .../AbstractStateChangeTouchController.java   |  7 +++---
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index f7cf66bf6a..ecaff7a2ad 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -994,7 +994,19 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         }
         // When multiple pages are visible, show persistent page indicator
         mWorkspace.getPageIndicator().setShouldAutoHide(!state.hasFlag(FLAG_MULTI_PAGE));
+
         mPrevLauncherState = mStateManager.getCurrentStableState();
+        if (mPrevLauncherState != state && ALL_APPS.equals(state)
+                // Making sure mAllAppsSessionLogId is null to avoid double logging.
+                && mAllAppsSessionLogId == null) {
+            // creates new instance ID since new all apps session is started.
+            mAllAppsSessionLogId = new InstanceIdSequence().newInstanceId();
+            getStatsLogManager()
+                    .logger()
+                    .log(FeatureFlags.ENABLE_DEVICE_SEARCH.get()
+                            ? LAUNCHER_ALLAPPS_ENTRY_WITH_DEVICE_SEARCH
+                            : LAUNCHER_ALLAPPS_ENTRY);
+        }
     }
 
     @Override
@@ -1019,16 +1031,8 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
             getRotationHelper().setCurrentStateRequest(REQUEST_NONE);
         }
 
-        if (ALL_APPS.equals(state)) {
-            // creates new instance ID since new all apps session is started.
-            mAllAppsSessionLogId = new InstanceIdSequence().newInstanceId();
-            getStatsLogManager()
-                    .logger()
-                    .log(FeatureFlags.ENABLE_DEVICE_SEARCH.get()
-                            ? LAUNCHER_ALLAPPS_ENTRY_WITH_DEVICE_SEARCH
-                            : LAUNCHER_ALLAPPS_ENTRY);
-        } else if (ALL_APPS.equals(mPrevLauncherState)
-                // Check if mLogInstanceId is not null to make sure exit event is logged only once.
+        if (mPrevLauncherState != state && !ALL_APPS.equals(state)
+                // Making sure mAllAppsSessionLogId is not null to avoid double logging.
                 && mAllAppsSessionLogId != null) {
             getStatsLogManager().logger().log(LAUNCHER_ALLAPPS_EXIT);
             mAllAppsSessionLogId = null;
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index 2889801a8b..a4372930be 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -317,7 +317,9 @@ public abstract class AbstractStateChangeTouchController
                         Math.min(progress, 1) - endProgress) * durationMultiplier;
             }
         }
-
+        if (targetState != mStartState) {
+            logReachedState(targetState);
+        }
         mCurrentAnimation.setEndAction(() -> onSwipeInteractionCompleted(targetState));
         ValueAnimator anim = mCurrentAnimation.getAnimationPlayer();
         anim.setFloatValues(startProgress, endProgress);
@@ -345,9 +347,6 @@ public abstract class AbstractStateChangeTouchController
     }
 
     protected void goToTargetState(LauncherState targetState) {
-        if (targetState != mStartState) {
-            logReachedState(targetState);
-        }
         if (!mLauncher.isInState(targetState)) {
             // If we're already in the target state, don't jump to it at the end of the animation in
             // case the user started interacting with it before the animation finished.
-- 
GitLab


From ec4407b4ef47f397bec8bad9d2aec4078893d520 Mon Sep 17 00:00:00 2001
From: Zak Cohen <zakcohen@google.com>
Date: Thu, 1 Apr 2021 10:49:12 -0700
Subject: [PATCH 0819/1664] Overview - add the ability to color scrim task
 views.

Bug: 184202238
Test: local build and flash
Change-Id: If700cb6dffc3966fe860c40d98d40a5899c236e4
---
 .../views/DigitalWellBeingToast.java          | 15 ++++
 .../com/android/quickstep/views/IconView.java | 14 ++++
 .../android/quickstep/views/RecentsView.java  | 10 +++
 .../android/quickstep/views/TaskMenuView.java |  9 +--
 .../quickstep/views/TaskThumbnailView.java    | 68 +++++--------------
 .../com/android/quickstep/views/TaskView.java | 48 +++++++++++--
 src/com/android/launcher3/Utilities.java      | 20 ++++++
 7 files changed, 123 insertions(+), 61 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
index 25ae055f71..deb674c4a0 100644
--- a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
+++ b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
@@ -30,6 +30,7 @@ import android.content.Intent;
 import android.content.pm.LauncherApps;
 import android.content.pm.LauncherApps.AppUsageLimit;
 import android.graphics.Outline;
+import android.graphics.Paint;
 import android.icu.text.MeasureFormat;
 import android.icu.text.MeasureFormat.FormatWidth;
 import android.icu.util.Measure;
@@ -48,6 +49,7 @@ import androidx.annotation.StringRes;
 import com.android.launcher3.BaseActivity;
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
 import com.android.systemui.shared.recents.model.Task;
 
 import java.time.Duration;
@@ -297,4 +299,17 @@ public final class DigitalWellBeingToast {
             mBanner.setAlpha(alpha);
         }
     }
+
+    void setBannerColorTint(int color, float amount) {
+        if (mBanner == null) {
+            return;
+        }
+        if (mBannerAlpha == 0 || amount == 0) {
+            mBanner.setLayerType(View.LAYER_TYPE_NONE, null);
+        }
+        Paint layerPaint = new Paint();
+        layerPaint.setColorFilter(Utilities.makeColorTintingColorFilter(color, amount));
+        mBanner.setLayerType(View.LAYER_TYPE_HARDWARE, layerPaint);
+        mBanner.setLayerPaint(layerPaint);
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/views/IconView.java b/quickstep/src/com/android/quickstep/views/IconView.java
index ed642df7b4..5b0ade0d17 100644
--- a/quickstep/src/com/android/quickstep/views/IconView.java
+++ b/quickstep/src/com/android/quickstep/views/IconView.java
@@ -21,6 +21,8 @@ import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.View;
 
+import com.android.launcher3.Utilities;
+
 /**
  * A view which draws a drawable stretched to fit its size. Unlike ImageView, it avoids relayout
  * when the drawable changes.
@@ -102,4 +104,16 @@ public class IconView extends View {
             setVisibility(INVISIBLE);
         }
     }
+
+    /**
+     * Set the tint color of the icon, useful for scrimming or dimming.
+     *
+     * @param color to blend in.
+     * @param amount [0,1] 0 no tint, 1 full tint
+     */
+    public void setIconColorTint(int color, float amount) {
+        if (mDrawable != null) {
+            mDrawable.setColorFilter(Utilities.makeColorTintingColorFilter(color, amount));
+        }
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index bf237fd141..5ea3dea89b 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -3223,6 +3223,16 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
         return mSizeStrategy;
     }
 
+    /**
+     * Set all the task views to color tint scrim mode, dimming or tinting them all. Allows the
+     * tasks to be dimmed while other elements in the recents view are left alone.
+     */
+    public void showForegroundScrim(boolean show) {
+        for (int i = 0; i < getTaskViewCount(); i++) {
+            getTaskViewAt(i).showColorTint(show);
+        }
+    }
+
     private boolean showAsGrid() {
         return mOverviewGridEnabled || (mCurrentGestureEndTarget != null
                 && mSizeStrategy.stateFromGestureEndTarget(
diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
index a46daf38fd..0b84bc92a1 100644
--- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
@@ -249,9 +249,11 @@ public class TaskMenuView extends AbstractFloatingView {
         final Animator revealAnimator = createOpenCloseOutlineProvider()
                 .createRevealAnimator(this, closing);
         revealAnimator.setInterpolator(Interpolators.DEACCEL);
-        mOpenCloseAnimator.play(revealAnimator);
-        mOpenCloseAnimator.play(ObjectAnimator.ofFloat(mTaskView.getThumbnail(), DIM_ALPHA,
-                closing ? 0 : TaskView.MAX_PAGE_SCRIM_ALPHA));
+        mOpenCloseAnimator.playTogether(revealAnimator,
+                ObjectAnimator.ofFloat(
+                        mTaskView.getThumbnail(), DIM_ALPHA,
+                        closing ? 0 : TaskView.MAX_PAGE_SCRIM_ALPHA),
+                ObjectAnimator.ofFloat(this, ALPHA, closing ? 0 : 1));
         mOpenCloseAnimator.addListener(new AnimationSuccessListener() {
             @Override
             public void onAnimationStart(Animator animation) {
@@ -265,7 +267,6 @@ public class TaskMenuView extends AbstractFloatingView {
                 }
             }
         });
-        mOpenCloseAnimator.play(ObjectAnimator.ofFloat(this, ALPHA, closing ? 0 : 1));
         mOpenCloseAnimator.setDuration(closing ? REVEAL_CLOSE_DURATION: REVEAL_OPEN_DURATION);
         mOpenCloseAnimator.start();
     }
diff --git a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
index af62582418..685f725707 100644
--- a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
@@ -28,8 +28,6 @@ import android.graphics.BitmapShader;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.ColorFilter;
-import android.graphics.ColorMatrix;
-import android.graphics.ColorMatrixColorFilter;
 import android.graphics.Insets;
 import android.graphics.Matrix;
 import android.graphics.Paint;
@@ -46,10 +44,10 @@ import android.view.Surface;
 import android.view.View;
 
 import androidx.annotation.RequiresApi;
+import androidx.core.graphics.ColorUtils;
 
 import com.android.launcher3.BaseActivity;
 import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
@@ -67,10 +65,6 @@ import com.android.systemui.shared.recents.model.ThumbnailData;
  * A task in the Recents view.
  */
 public class TaskThumbnailView extends View implements PluginListener<OverviewScreenshotActions> {
-
-    private static final ColorMatrix COLOR_MATRIX = new ColorMatrix();
-    private static final ColorMatrix SATURATION_COLOR_MATRIX = new ColorMatrix();
-
     private static final MainThreadInitializedObject<FullscreenDrawParams> TEMP_PARAMS =
             new MainThreadInitializedObject<>(FullscreenDrawParams::new);
 
@@ -89,11 +83,11 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
 
     private final BaseActivity mActivity;
     private TaskOverlay mOverlay;
-    private final boolean mIsDarkTextTheme;
     private final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
     private final Paint mBackgroundPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
     private final Paint mClearPaint = new Paint();
     private final Paint mDimmingPaintAfterClearing = new Paint();
+    private final int mDimColor;
 
     // Contains the portion of the thumbnail that is clipped when fullscreen progress = 0.
     private final Rect mPreviewRect = new Rect();
@@ -104,9 +98,8 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
     private ThumbnailData mThumbnailData;
     protected BitmapShader mBitmapShader;
 
-    private float mDimAlpha = 1f;
-    private float mDimAlphaMultiplier = 1f;
-    private float mSaturation = 1f;
+    /** How much this thumbnail is dimmed, 0 not dimmed at all, 1 totally dimmed. */
+    private float mDimAlpha = 0f;
 
     private boolean mOverlayEnabled;
     private OverviewScreenshotActions mOverviewScreenshotActionsPlugin;
@@ -124,11 +117,12 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
         mPaint.setFilterBitmap(true);
         mBackgroundPaint.setColor(Color.WHITE);
         mClearPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR));
-        mDimmingPaintAfterClearing.setColor(Color.BLACK);
         mActivity = BaseActivity.fromContext(context);
-        mIsDarkTextTheme = Themes.getAttrBoolean(mActivity, R.attr.isWorkspaceDarkText);
         // Initialize with placeholder value. It is overridden later by TaskView
         mFullscreenParams = TEMP_PARAMS.get(context);
+
+        mDimColor = Themes.getColorBackgroundFloating(context);
+        mDimmingPaintAfterClearing.setColor(mDimColor);
     }
 
     /**
@@ -186,15 +180,12 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
         updateThumbnailPaintFilter();
     }
 
-    public void setDimAlphaMultipler(float dimAlphaMultipler) {
-        mDimAlphaMultiplier = dimAlphaMultipler;
-        setDimAlpha(mDimAlpha);
-    }
-
     /**
      * Sets the alpha of the dim layer on top of this view.
      * <p>
-     * If dimAlpha is 0, no dimming is applied; if dimAlpha is 1, the thumbnail will be black.
+     * If dimAlpha is 0, no dimming is applied; if dimAlpha is 1, the thumbnail will be the
+     * extracted background color.
+     *
      */
     public void setDimAlpha(float dimAlpha) {
         mDimAlpha = dimAlpha;
@@ -359,15 +350,15 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
     }
 
     private void updateThumbnailPaintFilter() {
-        int mul = (int) ((1 - mDimAlpha * mDimAlphaMultiplier) * 255);
-        ColorFilter filter = getColorFilter(mul, mIsDarkTextTheme, mSaturation);
+        ColorFilter filter = getColorFilter(mDimAlpha);
         mBackgroundPaint.setColorFilter(filter);
-        mDimmingPaintAfterClearing.setAlpha(255 - mul);
+        int alpha = (int) (mDimAlpha * 255);
+        mDimmingPaintAfterClearing.setAlpha(alpha);
         if (mBitmapShader != null) {
             mPaint.setColorFilter(filter);
         } else {
             mPaint.setColorFilter(null);
-            mPaint.setColor(Color.argb(255, mul, mul, mul));
+            mPaint.setColor(ColorUtils.blendARGB(Color.BLACK, mDimColor, alpha));
         }
         invalidate();
     }
@@ -401,35 +392,8 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
         updateThumbnailMatrix();
     }
 
-    /**
-     * @param intensity multiplier for color values. 0 - make black (white if shouldLighten), 255 -
-     *                  leave unchanged.
-     */
-    private static ColorFilter getColorFilter(int intensity, boolean shouldLighten,
-            float saturation) {
-        intensity = Utilities.boundToRange(intensity, 0, 255);
-
-        if (intensity == 255 && saturation == 1) {
-            return null;
-        }
-
-        final float intensityScale = intensity / 255f;
-        COLOR_MATRIX.setScale(intensityScale, intensityScale, intensityScale, 1);
-
-        if (saturation != 1) {
-            SATURATION_COLOR_MATRIX.setSaturation(saturation);
-            COLOR_MATRIX.postConcat(SATURATION_COLOR_MATRIX);
-        }
-
-        if (shouldLighten) {
-            final float[] colorArray = COLOR_MATRIX.getArray();
-            final int colorAdd = 255 - intensity;
-            colorArray[4] = colorAdd;
-            colorArray[9] = colorAdd;
-            colorArray[14] = colorAdd;
-        }
-
-        return new ColorMatrixColorFilter(COLOR_MATRIX);
+    private ColorFilter getColorFilter(float dimAmount) {
+        return Utilities.makeColorTintingColorFilter(mDimColor, dimAmount);
     }
 
     public Bitmap getThumbnail() {
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 21b11644d2..207e3b4ecf 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -89,6 +89,7 @@ import com.android.launcher3.util.ActivityOptionsWrapper;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.RunnableList;
 import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
+import com.android.launcher3.util.Themes;
 import com.android.launcher3.util.TransformingTouchDelegate;
 import com.android.launcher3.util.ViewPool.Reusable;
 import com.android.quickstep.RecentsModel;
@@ -134,10 +135,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     @IntDef({FLAG_UPDATE_ALL, FLAG_UPDATE_ICON, FLAG_UPDATE_THUMBNAIL})
     public @interface TaskDataChanges {}
 
-    /**
-     * The alpha of a black scrim on a page in the carousel as it leaves the screen.
-     * In the resting position of the carousel, the adjacent pages have about half this scrim.
-     */
+    /** The maximum amount that a task view can be scrimmed, dimmed or tinted. */
     public static final float MAX_PAGE_SCRIM_ALPHA = 0.4f;
 
     /**
@@ -254,6 +252,19 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
                 }
             };
 
+    private static final FloatProperty<TaskView> COLOR_TINT =
+            new FloatProperty<TaskView>("colorTint") {
+                @Override
+                public void setValue(TaskView taskView, float v) {
+                    taskView.setColorTint(v);
+                }
+
+                @Override
+                public Float get(TaskView taskView) {
+                    return taskView.getColorTint();
+                }
+            };
+
     private final OnAttachStateChangeListener mTaskMenuStateListener =
             new OnAttachStateChangeListener() {
                 @Override
@@ -314,6 +325,11 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     private final float[] mIconCenterCoords = new float[2];
     private final float[] mChipCenterCoords = new float[2];
 
+    // Colored tint for the task view and all its supplementary views (like the task icon and well
+    // being banner.
+    private final int mTintingColor;
+    private float mTintAmount;
+
     private boolean mIsClickableAsLiveTile = true;
 
     public TaskView(Context context) {
@@ -375,6 +391,8 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         mOutlineProvider = new TaskOutlineProvider(getContext(), mCurrentFullscreenParams,
                 mActivity.getDeviceProfile().overviewTaskThumbnailTopMarginPx);
         setOutlineProvider(mOutlineProvider);
+
+        mTintingColor = Themes.getColorBackgroundFloating(context);
     }
 
     /**
@@ -722,7 +740,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
             progress = 1 - progress;
         }
         mFocusTransitionProgress = progress;
-        mSnapshotView.setDimAlphaMultipler(0);
         float iconScalePercentage = (float) SCALE_ICON_DURATION / DIM_ANIM_DURATION;
         float lowerClamp = invert ? 1f - iconScalePercentage : 0;
         float upperClamp = invert ? 1 : iconScalePercentage;
@@ -781,6 +798,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         setTranslationZ(0);
         setAlpha(mStableAlpha);
         setIconScaleAndDim(1);
+        setColorTint(0);
     }
 
     public void setStableAlpha(float parentAlpha) {
@@ -1302,6 +1320,26 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         rv.initiateSplitSelect(this, splitPositionOption);
     }
 
+    private void setColorTint(float amount) {
+        mSnapshotView.setDimAlpha(amount);
+        mIconView.setIconColorTint(mTintingColor, amount);
+        mDigitalWellBeingToast.setBannerColorTint(mTintingColor, amount);
+    }
+
+    private float getColorTint() {
+        return mTintAmount;
+    }
+
+    /**
+     * Show the task view with a color tint (animates value).
+     */
+    public void showColorTint(boolean enable) {
+        ObjectAnimator tintAnimator = ObjectAnimator.ofFloat(
+                this, COLOR_TINT, enable ? MAX_PAGE_SCRIM_ALPHA : 0);
+        tintAnimator.setAutoCancel(true);
+        tintAnimator.start();
+    }
+
     /**
      * We update and subsequently draw these in {@link #setFullscreenProgress(float)}.
      */
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 8825710401..1776777934 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -37,6 +37,8 @@ import android.content.res.Resources;
 import android.database.ContentObserver;
 import android.graphics.Bitmap;
 import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.LightingColorFilter;
 import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.Point;
@@ -64,6 +66,7 @@ import android.view.View;
 import android.view.ViewConfiguration;
 import android.view.animation.Interpolator;
 
+import androidx.core.graphics.ColorUtils;
 import androidx.core.os.BuildCompat;
 
 import com.android.launcher3.dragndrop.FolderAdaptiveIcon;
@@ -732,6 +735,23 @@ public final class Utilities {
         }
     }
 
+    /**
+     * Make a color filter that blends a color into the destination based on a scalable amout.
+     *
+     * @param color to blend in.
+     * @param tintAmount [0-1] 0 no tinting, 1 full color.
+     * @return ColorFilter for tinting, or {@code null} if no filter is needed.
+     */
+    public static ColorFilter makeColorTintingColorFilter(int color, float tintAmount) {
+        if (tintAmount == 0f) {
+            return null;
+        }
+        return new LightingColorFilter(
+                // This isn't blending in white, its making a multiplication mask for the base color
+                ColorUtils.blendARGB(Color.WHITE, 0, tintAmount),
+                ColorUtils.blendARGB(0, color, tintAmount));
+    }
+
     private static class FixedSizeEmptyDrawable extends ColorDrawable {
 
         private final int mSize;
-- 
GitLab


From ee9aff9b5b53db9baf921812af869a117a7b33ca Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Mon, 5 Apr 2021 13:30:40 -0500
Subject: [PATCH 0820/1664] [Search][Motion] Normal<->AllApps transition revamp

Preview video attached to BR

Key changes:

- SearchUiManager#getScrollRangeDelta is removed. AllApps initial vertical offset is now controlled by deviceProfile.allAppsOpenVerticalTranslate.
- ShelfScrimView is renamed to AllAppsScrimView. Scrim no longer does vertical translate with AllApps open.  Shelf/overview related code removed.
- Scrim and AllApps content transition are animated with different interpolators. Scrim color is a blend of accentColor and allAppsScrim with proportion determined by progress*TINT_DECAY_MULTIPLIER

Bug: 183001675
Test: Manual
Change-Id: Id6bde7ee65c55c83c2973fe41f458b9364d39ecd
---
 quickstep/res/layout/scrim_view.xml           |   2 +-
 ...ButtonNavbarToOverviewTouchController.java |  34 +--
 .../PortraitStatesTouchController.java        |  18 +-
 .../quickstep/views/AllAppsScrimView.java     | 125 +++++++++
 .../quickstep/views/ShelfScrimView.java       | 256 ------------------
 res/values/dimens.xml                         |   1 +
 src/com/android/launcher3/DeviceProfile.java  |   5 +
 .../allapps/AllAppsTransitionController.java  |   2 +-
 .../allapps/LauncherAllAppsContainerView.java |   5 +-
 .../launcher3/allapps/SearchUiManager.java    |   6 -
 .../search/AppsSearchContainerLayout.java     |  11 -
 .../android/launcher3/views/ScrimView.java    |   3 +-
 12 files changed, 165 insertions(+), 303 deletions(-)
 create mode 100644 quickstep/src/com/android/quickstep/views/AllAppsScrimView.java
 delete mode 100644 quickstep/src/com/android/quickstep/views/ShelfScrimView.java

diff --git a/quickstep/res/layout/scrim_view.xml b/quickstep/res/layout/scrim_view.xml
index 2cc37f9cc4..3f2daf1d17 100644
--- a/quickstep/res/layout/scrim_view.xml
+++ b/quickstep/res/layout/scrim_view.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.quickstep.views.ShelfScrimView
+<com.android.quickstep.views.AllAppsScrimView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
index 0921ad31ad..65bbeea52e 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -182,13 +182,13 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
         }
         mNormalToHintOverviewScrimAnimator = null;
         mCurrentAnimation.getTarget().addListener(newCancelListener(() ->
-            mLauncher.getStateManager().goToState(OVERVIEW, true, () -> {
-                mOverviewResistYAnim = AnimatorControllerWithResistance
-                        .createRecentsResistanceFromOverviewAnim(mLauncher, null)
-                        .createPlaybackController();
-                mReachedOverview = true;
-                maybeSwipeInteractionToOverviewComplete();
-            })));
+                mLauncher.getStateManager().goToState(OVERVIEW, true, () -> {
+                    mOverviewResistYAnim = AnimatorControllerWithResistance
+                            .createRecentsResistanceFromOverviewAnim(mLauncher, null)
+                            .createPlaybackController();
+                    mReachedOverview = true;
+                    maybeSwipeInteractionToOverviewComplete();
+                })));
 
         mCurrentAnimation.getTarget().removeListener(mClearStateOnCancelListener);
         mCurrentAnimation.dispatchOnCancel();
@@ -239,7 +239,7 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
     private void goToOverviewOrHomeOnDragEnd(float velocity) {
         boolean goToHomeInsteadOfOverview = !mMotionPauseDetector.isPaused();
         if (goToHomeInsteadOfOverview) {
-            new OverviewToHomeAnim(mLauncher, ()-> onSwipeInteractionCompleted(NORMAL))
+            new OverviewToHomeAnim(mLauncher, () -> onSwipeInteractionCompleted(NORMAL))
                     .animateWithVelocity(velocity);
         }
         if (mReachedOverview) {
@@ -275,17 +275,14 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
             LauncherState fromState, LauncherState toState) {
         if (fromState == NORMAL && toState == ALL_APPS) {
             StateAnimationConfig builder = new StateAnimationConfig();
-            // Fade in prediction icons quickly, then rest of all apps after reaching overview.
-            float progressToReachOverview = NORMAL.getVerticalProgress(mLauncher)
-                    - OVERVIEW.getVerticalProgress(mLauncher);
             builder.setInterpolator(ANIM_ALL_APPS_HEADER_FADE, Interpolators.clampToProgress(
                     ACCEL,
                     0,
-                    ALL_APPS_CONTENT_FADE_THRESHOLD));
+                    ALL_APPS_CONTENT_FADE_MAX_CLAMPING_THRESHOLD));
             builder.setInterpolator(ANIM_ALL_APPS_FADE, Interpolators.clampToProgress(
                     ACCEL,
-                    progressToReachOverview,
-                    progressToReachOverview + ALL_APPS_CONTENT_FADE_THRESHOLD));
+                    ALL_APPS_CONTENT_FADE_MIN_CLAMPING_THRESHOLD,
+                    ALL_APPS_CONTENT_FADE_MAX_CLAMPING_THRESHOLD));
 
             // Get workspace out of the way quickly, to prepare for potential pause.
             builder.setInterpolator(ANIM_WORKSPACE_SCALE, DEACCEL_3);
@@ -294,15 +291,14 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
             return builder;
         } else if (fromState == ALL_APPS && toState == NORMAL) {
             StateAnimationConfig builder = new StateAnimationConfig();
-            // Keep all apps/predictions opaque until the very end of the transition.
-            float progressToReachOverview = OVERVIEW.getVerticalProgress(mLauncher);
+
             builder.setInterpolator(ANIM_ALL_APPS_FADE, Interpolators.clampToProgress(
                     DEACCEL,
-                    progressToReachOverview - ALL_APPS_CONTENT_FADE_THRESHOLD,
-                    progressToReachOverview));
+                    1 - ALL_APPS_CONTENT_FADE_MAX_CLAMPING_THRESHOLD,
+                    1 - ALL_APPS_CONTENT_FADE_MIN_CLAMPING_THRESHOLD));
             builder.setInterpolator(ANIM_ALL_APPS_HEADER_FADE, Interpolators.clampToProgress(
                     DEACCEL,
-                    1 - ALL_APPS_CONTENT_FADE_THRESHOLD,
+                    1 - ALL_APPS_CONTENT_FADE_MAX_CLAMPING_THRESHOLD,
                     1));
             return builder;
         }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
index 1af9685f4f..b8f9452f36 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
@@ -49,9 +49,15 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
     private static final String TAG = "PortraitStatesTouchCtrl";
 
     /**
-     * The progress at which all apps content will be fully visible when swiping up from overview.
+     * The progress at which all apps content will be fully visible.
      */
-    protected static final float ALL_APPS_CONTENT_FADE_THRESHOLD = 0.08f;
+    protected static final float ALL_APPS_CONTENT_FADE_MAX_CLAMPING_THRESHOLD = 0.8f;
+
+    /**
+     * Minimum clamping progress for fading in all apps content
+     */
+    protected static final float ALL_APPS_CONTENT_FADE_MIN_CLAMPING_THRESHOLD = 0.4f;
+
 
     /**
      * The progress at which recents will begin fading out when swiping up from overview.
@@ -116,14 +122,14 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
     private StateAnimationConfig getNormalToAllAppsAnimation() {
         StateAnimationConfig builder = new StateAnimationConfig();
         builder.setInterpolator(ANIM_ALL_APPS_FADE, Interpolators.clampToProgress(ACCEL,
-                0, ALL_APPS_CONTENT_FADE_THRESHOLD));
+                0, ALL_APPS_CONTENT_FADE_MAX_CLAMPING_THRESHOLD));
         return builder;
     }
 
     private StateAnimationConfig getAllAppsToNormalAnimation() {
         StateAnimationConfig builder = new StateAnimationConfig();
         builder.setInterpolator(ANIM_ALL_APPS_FADE, Interpolators.clampToProgress(DEACCEL,
-                1 - ALL_APPS_CONTENT_FADE_THRESHOLD, 1));
+                1 - ALL_APPS_CONTENT_FADE_MAX_CLAMPING_THRESHOLD, 1));
         return builder;
     }
 
@@ -135,7 +141,7 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
             config = getNormalToAllAppsAnimation();
         } else if (fromState == ALL_APPS && toState == NORMAL) {
             config = getAllAppsToNormalAnimation();
-        }  else {
+        } else {
             config = new StateAnimationConfig();
         }
         return config;
@@ -198,7 +204,7 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
      * Whether the motion event is over the hotseat.
      *
      * @param launcher the launcher activity
-     * @param ev the event to check
+     * @param ev       the event to check
      * @return true if the event is over the hotseat
      */
     static boolean isTouchOverHotseat(Launcher launcher, MotionEvent ev) {
diff --git a/quickstep/src/com/android/quickstep/views/AllAppsScrimView.java b/quickstep/src/com/android/quickstep/views/AllAppsScrimView.java
new file mode 100644
index 0000000000..185080e51d
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/views/AllAppsScrimView.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.quickstep.views;
+
+import static com.android.launcher3.LauncherState.OVERVIEW;
+import static com.android.launcher3.anim.Interpolators.ACCEL;
+import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.util.AttributeSet;
+import android.view.animation.Interpolator;
+
+import androidx.core.graphics.ColorUtils;
+
+import com.android.launcher3.BaseQuickstepLauncher;
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.anim.Interpolators;
+import com.android.launcher3.util.Themes;
+import com.android.launcher3.views.ScrimView;
+
+/**
+ * Scrim used for all-apps background. uses interpolator to coordinate fade in with
+ * all-apps contents
+ *
+ * Note: ranges are inverted because progress goes from 1 to 0 for NORMAL->AllAPPS
+ */
+public class AllAppsScrimView extends ScrimView<BaseQuickstepLauncher> {
+
+    private static final float TINT_DECAY_MULTIPLIER = .5f;
+
+    //min progress for scrim to become visible
+    private static final float SCRIM_VISIBLE_THRESHOLD = .9f;
+    //max progress where scrim alpha animates.
+    private static final float SCRIM_SOLID_THRESHOLD = .5f;
+    private final Interpolator mScrimInterpolator = Interpolators.clampToProgress(ACCEL,
+            SCRIM_SOLID_THRESHOLD,
+            SCRIM_VISIBLE_THRESHOLD);
+
+    // In transposed layout, we simply draw a flat color.
+    private boolean mDrawingFlatColor;
+
+    private final int mEndAlpha;
+    private final Paint mPaint;
+
+    private int mCurrentScrimColor;
+    private final int mTintColor;
+
+    public AllAppsScrimView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mMaxScrimAlpha = Math.round(OVERVIEW.getOverviewScrimAlpha(mLauncher) * 255);
+        mTintColor = Themes.getColorAccent(mContext);
+
+
+        mEndAlpha = Color.alpha(mEndScrim);
+        mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+
+        // Just assume the easiest UI for now, until we have the proper layout information.
+        mDrawingFlatColor = true;
+    }
+
+    @Override
+    public void reInitUi() {
+        DeviceProfile dp = mLauncher.getDeviceProfile();
+        mDrawingFlatColor = dp.isVerticalBarLayout();
+        updateColors();
+        updateSysUiColors();
+        invalidate();
+    }
+
+    @Override
+    public void updateColors() {
+        super.updateColors();
+        if (mDrawingFlatColor) {
+            return;
+        }
+
+        if (mProgress >= 1) {
+            mCurrentScrimColor = 0;
+        } else {
+            float interpolationProgress = mScrimInterpolator.getInterpolation(mProgress);
+            // Note that these ranges and interpolators are inverted because progress goes 1 to 0.
+            int alpha = Math.round(Utilities.mapRange(interpolationProgress, mEndAlpha, 0));
+            int color = ColorUtils.blendARGB(mEndScrim, mTintColor,
+                    mProgress * TINT_DECAY_MULTIPLIER);
+            mCurrentScrimColor = setColorAlphaBound(color, alpha);
+        }
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        if (mDrawingFlatColor) {
+            if (mCurrentFlatColor != 0) {
+                canvas.drawColor(mCurrentFlatColor);
+            }
+            return;
+        }
+
+        if (Color.alpha(mCurrentScrimColor) == 0) {
+            return;
+        } else if (mProgress <= 0) {
+            canvas.drawColor(mCurrentScrimColor);
+            return;
+        }
+
+        mPaint.setColor(mCurrentScrimColor);
+        canvas.drawRect(0, 0, getWidth(), getHeight(), mPaint);
+    }
+}
diff --git a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java b/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
deleted file mode 100644
index db04fc034c..0000000000
--- a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.quickstep.views;
-
-import static com.android.launcher3.LauncherState.OVERVIEW;
-import static com.android.launcher3.anim.Interpolators.ACCEL;
-import static com.android.launcher3.anim.Interpolators.ACCEL_2;
-import static com.android.launcher3.anim.Interpolators.LINEAR;
-import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
-import static com.android.launcher3.util.SystemUiController.UI_STATE_SCRIM_VIEW;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Path;
-import android.graphics.Path.Direction;
-import android.graphics.Path.Op;
-import android.util.AttributeSet;
-import android.view.animation.Interpolator;
-
-import com.android.launcher3.BaseQuickstepLauncher;
-import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
-import com.android.launcher3.anim.Interpolators;
-import com.android.launcher3.uioverrides.states.OverviewState;
-import com.android.launcher3.util.Themes;
-import com.android.launcher3.views.ScrimView;
-import com.android.quickstep.SysUINavigationMode;
-import com.android.quickstep.SysUINavigationMode.Mode;
-import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;
-
-/**
- * Scrim used for all-apps and shelf in Overview
- * In transposed layout, it behaves as a simple color scrim.
- * In portrait layout, it draws a rounded rect such that
- *    From normal state to overview state, the shelf just fades in and does not move
- *    From overview state to all-apps state the shelf moves up and fades in to cover the screen
- */
-public class ShelfScrimView extends ScrimView<BaseQuickstepLauncher>
-        implements NavigationModeChangeListener {
-
-    // If the progress is more than this, shelf follows the finger, otherwise it moves faster to
-    // cover the whole screen
-    private static final float SCRIM_CATCHUP_THRESHOLD = 0.2f;
-
-    // Temporarily needed until android.R.attr.bottomDialogCornerRadius becomes public
-    private static final float BOTTOM_CORNER_RADIUS_RATIO = 2f;
-
-    // In transposed layout, we simply draw a flat color.
-    private boolean mDrawingFlatColor;
-
-    // For shelf mode
-    private final int mEndAlpha;
-    private final float mRadius;
-    private final int mMaxScrimAlpha;
-    private final Paint mPaint;
-
-    // Mid point where the alpha changes
-    private int mMidAlpha;
-    private float mMidProgress;
-
-    private Interpolator mBeforeMidProgressColorInterpolator = ACCEL;
-    private Interpolator mAfterMidProgressColorInterpolator = ACCEL;
-
-    private float mShiftRange;
-
-    private float mTopOffset;
-    private float mShelfTop;
-    private float mShelfTopAtThreshold;
-
-    private int mShelfColor;
-    private int mRemainingScreenColor;
-
-    private final Path mTempPath = new Path();
-    private final Path mRemainingScreenPath = new Path();
-    private boolean mRemainingScreenPathValid = false;
-
-    private Mode mSysUINavigationMode;
-
-    public ShelfScrimView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        mMaxScrimAlpha = Math.round(OVERVIEW.getOverviewScrimAlpha(mLauncher) * 255);
-
-        mEndAlpha = Color.alpha(mEndScrim);
-        mRadius = BOTTOM_CORNER_RADIUS_RATIO * Themes.getDialogCornerRadius(context);
-        mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-
-        // Just assume the easiest UI for now, until we have the proper layout information.
-        mDrawingFlatColor = true;
-    }
-
-    @Override
-    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-        super.onSizeChanged(w, h, oldw, oldh);
-        mRemainingScreenPathValid = false;
-    }
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        onNavigationModeChanged(SysUINavigationMode.INSTANCE.get(getContext())
-                .addModeChangeListener(this));
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        SysUINavigationMode.INSTANCE.get(getContext()).removeModeChangeListener(this);
-    }
-
-    @Override
-    public void onNavigationModeChanged(Mode newMode) {
-        mSysUINavigationMode = newMode;
-        // Note that these interpolators are inverted because progress goes 1 to 0.
-        if (mSysUINavigationMode == Mode.NO_BUTTON) {
-            // Show the shelf more quickly before reaching overview progress.
-            mBeforeMidProgressColorInterpolator = ACCEL_2;
-            mAfterMidProgressColorInterpolator = ACCEL;
-        } else {
-            mBeforeMidProgressColorInterpolator = ACCEL;
-            mAfterMidProgressColorInterpolator = Interpolators.clampToProgress(ACCEL, 0.5f, 1f);
-        }
-    }
-
-    @Override
-    public void reInitUi() {
-        DeviceProfile dp = mLauncher.getDeviceProfile();
-        mDrawingFlatColor = dp.isVerticalBarLayout();
-
-        if (!mDrawingFlatColor) {
-            mRemainingScreenPathValid = false;
-            mShiftRange = mLauncher.getAllAppsController().getShiftRange();
-
-            // Fade in all apps background quickly to distinguish from swiping from nav bar.
-            mMidAlpha = Themes.getAttrInteger(getContext(), R.attr.allAppsInterimScrimAlpha);
-            mMidProgress = 1 - (OverviewState.getDefaultSwipeHeight(mLauncher)
-                    / mLauncher.getAllAppsController().getShiftRange());
-
-            mTopOffset = dp.getInsets().top;
-            mShelfTopAtThreshold = mShiftRange * SCRIM_CATCHUP_THRESHOLD + mTopOffset;
-        }
-        updateColors();
-        updateSysUiColors();
-        invalidate();
-    }
-
-    @Override
-    public void updateColors() {
-        super.updateColors();
-        if (mDrawingFlatColor) {
-            return;
-        }
-
-        if (mProgress >= SCRIM_CATCHUP_THRESHOLD) {
-            mShelfTop = mShiftRange * mProgress + mTopOffset;
-        } else {
-            mShelfTop = Utilities.mapRange(mProgress / SCRIM_CATCHUP_THRESHOLD, -mRadius,
-                    mShelfTopAtThreshold);
-        }
-
-        if (mProgress >= 1) {
-            mRemainingScreenColor = 0;
-            mShelfColor = 0;
-        } else if (mProgress >= mMidProgress) {
-            mRemainingScreenColor = 0;
-
-            int alpha = Math.round(Utilities.mapToRange(
-                    mProgress, mMidProgress, 1, mMidAlpha, 0, mBeforeMidProgressColorInterpolator));
-            mShelfColor = setColorAlphaBound(mEndScrim, alpha);
-        } else {
-            // Note that these ranges and interpolators are inverted because progress goes 1 to 0.
-            int alpha = Math.round(
-                    Utilities.mapToRange(mProgress, (float) 0, mMidProgress, (float) mEndAlpha,
-                            (float) mMidAlpha, mAfterMidProgressColorInterpolator));
-            mShelfColor = setColorAlphaBound(mEndScrim, alpha);
-
-            int remainingScrimAlpha = Math.round(
-                    Utilities.mapToRange(mProgress, (float) 0, mMidProgress, mMaxScrimAlpha,
-                            (float) 0, LINEAR));
-            mRemainingScreenColor = setColorAlphaBound(mScrimColor, remainingScrimAlpha);
-        }
-    }
-
-    @Override
-    protected void updateSysUiColors() {
-        if (mDrawingFlatColor) {
-            super.updateSysUiColors();
-        } else {
-            // Use a light system UI (dark icons) if all apps is behind at least half of the
-            // status bar.
-            boolean forceChange = mShelfTop <= mLauncher.getDeviceProfile().getInsets().top / 2f;
-            if (forceChange) {
-                mLauncher.getSystemUiController().updateUiState(UI_STATE_SCRIM_VIEW, !mIsScrimDark);
-            } else {
-                mLauncher.getSystemUiController().updateUiState(UI_STATE_SCRIM_VIEW, 0);
-            }
-        }
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        if (mDrawingFlatColor) {
-            if (mCurrentFlatColor != 0) {
-                canvas.drawColor(mCurrentFlatColor);
-            }
-            return;
-        }
-
-        if (Color.alpha(mShelfColor) == 0) {
-            return;
-        } else if (mProgress <= 0) {
-            canvas.drawColor(mShelfColor);
-            return;
-        }
-
-        int height = getHeight();
-        int width = getWidth();
-        // Draw the scrim over the remaining screen if needed.
-        if (mRemainingScreenColor != 0) {
-            if (!mRemainingScreenPathValid) {
-                mTempPath.reset();
-                // Using a arbitrary '+10' in the bottom to avoid any left-overs at the
-                // corners due to rounding issues.
-                mTempPath.addRoundRect(0, height - mRadius, width, height + mRadius + 10,
-                        mRadius, mRadius, Direction.CW);
-                mRemainingScreenPath.reset();
-                mRemainingScreenPath.addRect(0, 0, width, height, Direction.CW);
-                mRemainingScreenPath.op(mTempPath, Op.DIFFERENCE);
-            }
-
-            float offset = height - mRadius - mShelfTop;
-            canvas.translate(0, -offset);
-            mPaint.setColor(mRemainingScreenColor);
-            canvas.drawPath(mRemainingScreenPath, mPaint);
-            canvas.translate(0, offset);
-        }
-
-        mPaint.setColor(mShelfColor);
-        canvas.drawRoundRect(0, mShelfTop, width, height + mRadius, mRadius, mRadius, mPaint);
-    }
-}
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 1fccdf34a6..51dddab6f7 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -84,6 +84,7 @@
     <dimen name="fastscroll_end_margin">-26dp</dimen>
 
     <!-- All Apps -->
+    <dimen name="all_apps_open_vertical_translate">96dp</dimen>
     <dimen name="all_apps_search_bar_field_height">48dp</dimen>
     <dimen name="all_apps_search_bar_bottom_padding">30dp</dimen>
     <dimen name="all_apps_empty_search_message_top_offset">40dp</dimen>
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index a29eab70d3..aea38a054b 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -147,6 +147,7 @@ public class DeviceProfile {
     public final int hotseatBarSidePaddingEndPx;
 
     // All apps
+    public int allAppsOpenVerticalTranslate;
     public int allAppsCellHeightPx;
     public int allAppsCellWidthPx;
     public int allAppsIconSizePx;
@@ -248,6 +249,10 @@ public class DeviceProfile {
                 : res.getDimensionPixelSize(R.dimen.dynamic_grid_left_right_margin);
         desiredWorkspaceLeftRightOriginalPx = desiredWorkspaceLeftRightMarginPx;
 
+
+        allAppsOpenVerticalTranslate = res.getDimensionPixelSize(
+                R.dimen.all_apps_open_vertical_translate);
+
         folderLabelTextScale = res.getFloat(R.dimen.folder_label_text_scale);
         folderContentPaddingLeftRight =
                 res.getDimensionPixelSize(R.dimen.folder_content_padding_left_right);
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index f031136309..c21d7745ca 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -127,7 +127,7 @@ public class AllAppsTransitionController
         mProgress = progress;
 
         mScrimView.setProgress(progress);
-        mAppsView.setTranslationY(progress * mShiftRange);
+        mAppsView.setTranslationY(mProgress * mShiftRange);
     }
 
     public float getProgress() {
diff --git a/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java b/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
index 13ddc1244f..16ae2508ec 100644
--- a/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
@@ -72,8 +72,9 @@ public class LauncherAllAppsContainerView extends AllAppsContainerView {
     @Override
     public void setInsets(Rect insets) {
         super.setInsets(insets);
-        mLauncher.getAllAppsController()
-                .setScrollRangeDelta(mSearchUiManager.getScrollRangeDelta(insets));
+        int allAppsStartingPositionY = mLauncher.getDeviceProfile().availableHeightPx
+                - mLauncher.getDeviceProfile().allAppsOpenVerticalTranslate;
+        mLauncher.getAllAppsController().setScrollRangeDelta(allAppsStartingPositionY);
     }
 
     @Override
diff --git a/src/com/android/launcher3/allapps/SearchUiManager.java b/src/com/android/launcher3/allapps/SearchUiManager.java
index 941d3af797..924a392389 100644
--- a/src/com/android/launcher3/allapps/SearchUiManager.java
+++ b/src/com/android/launcher3/allapps/SearchUiManager.java
@@ -15,7 +15,6 @@
  */
 package com.android.launcher3.allapps;
 
-import android.graphics.Rect;
 import android.view.KeyEvent;
 
 import androidx.annotation.Nullable;
@@ -43,11 +42,6 @@ public interface SearchUiManager {
      */
     default void preDispatchKeyEvent(KeyEvent keyEvent) { };
 
-    /**
-     * Returns the vertical shift for the all-apps view, so that it aligns with the hotseat.
-     */
-    float getScrollRangeDelta(Rect insets);
-
     /**
      * @return the edit text object
      */
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
index c51bcf5bd4..a8185d6eba 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
@@ -42,7 +42,6 @@ import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItem;
 import com.android.launcher3.allapps.AllAppsStore;
 import com.android.launcher3.allapps.AlphabeticalAppsList;
 import com.android.launcher3.allapps.SearchUiManager;
-import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.search.SearchCallback;
 
 import java.util.ArrayList;
@@ -209,16 +208,6 @@ public class AppsSearchContainerLayout extends ExtendedEditText
         requestLayout();
     }
 
-    @Override
-    public float getScrollRangeDelta(Rect insets) {
-        if (mLauncher.getDeviceProfile().isVerticalBarLayout()
-                || FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
-            return 0;
-        } else {
-            return insets.bottom + insets.top;
-        }
-    }
-
     @Override
     public ExtendedEditText getEditText() {
         return this;
diff --git a/src/com/android/launcher3/views/ScrimView.java b/src/com/android/launcher3/views/ScrimView.java
index 7f0765becd..72926dde34 100644
--- a/src/com/android/launcher3/views/ScrimView.java
+++ b/src/com/android/launcher3/views/ScrimView.java
@@ -40,6 +40,7 @@ import com.android.launcher3.util.Themes;
  * Simple scrim which draws a flat color
  */
 public class ScrimView<T extends Launcher> extends View implements Insettable, OnChangeListener {
+    private static final float STATUS_BAR_COLOR_FORCE_UPDATE_THRESHOLD = .1f;
 
     protected final T mLauncher;
     private final WallpaperColorInfo mWallpaperColorInfo;
@@ -117,7 +118,7 @@ public class ScrimView<T extends Launcher> extends View implements Insettable, O
     protected void updateSysUiColors() {
         // Use a light system UI (dark icons) if all apps is behind at least half of the
         // status bar.
-        boolean forceChange = mProgress <= 0.1f;
+        boolean forceChange = mProgress <= STATUS_BAR_COLOR_FORCE_UPDATE_THRESHOLD;
         if (forceChange) {
             mLauncher.getSystemUiController().updateUiState(UI_STATE_SCRIM_VIEW, !mIsScrimDark);
         } else {
-- 
GitLab


From 8a9cc9689ab4478f9e4aa27d6889b355df730bf3 Mon Sep 17 00:00:00 2001
From: Sreyas <sreyasr@google.com>
Date: Thu, 18 Mar 2021 19:54:15 -0700
Subject: [PATCH 0821/1664] Shared element transition between image and
 sharesheet.

Bug: 182373655
Test: Manual
Change-Id: I6f5abffa0c4911d939ba45476fe1301d65b840cf
---
 .../quickstep/util/ImageActionUtils.java      | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/util/ImageActionUtils.java b/quickstep/src/com/android/quickstep/util/ImageActionUtils.java
index 0f2d778623..2285d74d73 100644
--- a/quickstep/src/com/android/quickstep/util/ImageActionUtils.java
+++ b/quickstep/src/com/android/quickstep/util/ImageActionUtils.java
@@ -19,9 +19,12 @@ package com.android.quickstep.util;
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION;
 
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.THREAD_POOL_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
+import android.app.Activity;
+import android.app.ActivityOptions;
 import android.app.prediction.AppTarget;
 import android.content.ClipData;
 import android.content.ClipDescription;
@@ -37,11 +40,13 @@ import android.graphics.Rect;
 import android.graphics.RectF;
 import android.net.Uri;
 import android.util.Log;
+import android.view.View;
 
 import androidx.annotation.UiThread;
 import androidx.annotation.WorkerThread;
 import androidx.core.content.FileProvider;
 
+import com.android.internal.app.ChooserActivity;
 import com.android.launcher3.BuildConfig;
 import com.android.quickstep.SystemUiProxy;
 import com.android.systemui.shared.recents.model.Task;
@@ -125,6 +130,22 @@ public class ImageActionUtils {
                 tag));
     }
 
+    /**
+     * Launch the activity to share image with shared element transition.
+     */
+    @UiThread
+    public static void startShareActivity(Context context, Supplier<Bitmap> bitmapSupplier,
+            Rect crop, Intent intent, String tag, View sharedElement) {
+        if (bitmapSupplier.get() == null) {
+            Log.e(tag, "No snapshot available, not starting share.");
+            return;
+        }
+
+        UI_HELPER_EXECUTOR.execute(() -> persistBitmapAndStartActivity(context,
+                bitmapSupplier.get(), crop, intent, ImageActionUtils::getShareIntentForImageUri,
+                tag, sharedElement));
+    }
+
     /**
      * Starts activity based on given intent created from image uri.
      */
@@ -141,6 +162,30 @@ public class ImageActionUtils {
         }
     }
 
+    /**
+     * Starts activity based on given intent created from image uri with shared element transition.
+     */
+    @WorkerThread
+    public static void persistBitmapAndStartActivity(Context context, Bitmap bitmap, Rect crop,
+            Intent intent, BiFunction<Uri, Intent, Intent[]> uriToIntentMap, String tag,
+            View scaledImage) {
+        Intent[] intents = uriToIntentMap.apply(getImageUri(bitmap, crop, context, tag), intent);
+
+        // Work around b/159412574
+        if (intents.length == 1) {
+            MAIN_EXECUTOR.execute(() -> context.startActivity(intents[0],
+                    ActivityOptions.makeSceneTransitionAnimation((Activity) context, scaledImage,
+                            ChooserActivity.FIRST_IMAGE_PREVIEW_TRANSITION_NAME).toBundle()));
+
+        } else {
+            MAIN_EXECUTOR.execute(() -> context.startActivities(intents,
+                    ActivityOptions.makeSceneTransitionAnimation((Activity) context, scaledImage,
+                            ChooserActivity.FIRST_IMAGE_PREVIEW_TRANSITION_NAME).toBundle()));
+        }
+    }
+
+
+
     /**
      * Converts image bitmap to Uri by temporarily saving bitmap to cache, and creating Uri pointing
      * to that location. Used to be able to share an image with another app.
-- 
GitLab


From e3f7d0d1b4210111126e9e8dd25386985b004733 Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Mon, 5 Apr 2021 12:41:06 -0700
Subject: [PATCH 0822/1664] Add split placeholder view above OverviewScrim

Only show single split option for landscape and
seascape overview menu options.

Bug: 181705607
Change-Id: I577fbaed41b5debd007c953851ec2056988057d9
---
 quickstep/res/layout/overview_panel.xml              |  3 +--
 .../com/android/launcher3/BaseQuickstepLauncher.java | 11 ++++++++---
 .../uioverrides/BaseRecentsViewStateController.java  |  5 +++++
 .../uioverrides/RecentsViewStateController.java      |  2 +-
 .../android/launcher3/graphics/OverviewScrim.java    |  7 +++++++
 .../launcher3/touch/LandscapePagedViewHandler.java   | 12 +++---------
 .../launcher3/touch/PortraitPagedViewHandler.java    | 11 ++++++-----
 .../launcher3/touch/SeascapePagedViewHandler.java    | 12 +++---------
 8 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/quickstep/res/layout/overview_panel.xml b/quickstep/res/layout/overview_panel.xml
index 394e8808c8..9d71000276 100644
--- a/quickstep/res/layout/overview_panel.xml
+++ b/quickstep/res/layout/overview_panel.xml
@@ -19,8 +19,7 @@
         android:id="@+id/split_placeholder"
         android:layout_width="match_parent"
         android:layout_height="@dimen/split_placeholder_size"
-        android:background="@android:color/white"
-        android:alpha=".8"
+        android:background="@android:color/darker_gray"
         android:visibility="gone" />
 
     <com.android.quickstep.views.LauncherRecentsView
diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 085db6d7b6..e9ded8a07c 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -92,6 +92,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
     private final TaskbarStateHandler mTaskbarStateHandler = new TaskbarStateHandler(this);
     // Will be updated when dragging from taskbar.
     private @Nullable DragOptions mNextWorkspaceDragOptions = null;
+    private SplitPlaceholderView mSplitPlaceholderView;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -215,12 +216,12 @@ public abstract class BaseQuickstepLauncher extends Launcher
 
         SysUINavigationMode.INSTANCE.get(this).updateMode();
         mActionsView = findViewById(R.id.overview_actions_view);
-        SplitPlaceholderView splitPlaceholderView = findViewById(R.id.split_placeholder);
+        mSplitPlaceholderView = findViewById(R.id.split_placeholder);
         RecentsView overviewPanel = (RecentsView) getOverviewPanel();
-        splitPlaceholderView.init(
+        mSplitPlaceholderView.init(
                 new SplitSelectStateController(SystemUiProxy.INSTANCE.get(this))
         );
-        overviewPanel.init(mActionsView, splitPlaceholderView);
+        overviewPanel.init(mActionsView, mSplitPlaceholderView);
         mActionsView.updateVerticalMargin(SysUINavigationMode.getMode(this));
 
         mAppTransitionManager = new QuickstepTransitionManager(this);
@@ -256,6 +257,10 @@ public abstract class BaseQuickstepLauncher extends Launcher
         return (T) mActionsView;
     }
 
+    public SplitPlaceholderView getSplitPlaceholderView() {
+        return mSplitPlaceholderView;
+    }
+
     @Override
     protected void closeOpenViews(boolean animate) {
         super.closeOpenViews(animate);
diff --git a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
index d36af09d89..a3a1fef052 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
@@ -116,6 +116,11 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView>
                 config.getInterpolator(ANIM_OVERVIEW_SCRIM_FADE, LINEAR));
         setter.setFloat(scrim, SCRIM_MULTIPLIER, 1f,
                 config.getInterpolator(ANIM_OVERVIEW_SCRIM_FADE, LINEAR));
+        if (toState.areElementsVisible(mLauncher, LauncherState.SPLIT_PLACHOLDER_VIEW)) {
+            scrim.updateStableScrimmedView(mLauncher.getSplitPlaceholderView());
+        } else {
+            scrim.updateStableScrimmedView(mLauncher.getOverviewPanel());
+        }
 
         setter.setFloat(
                 mRecentsView, getTaskModalnessProperty(),
diff --git a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
index 6929b5dc9c..9097c8b4c2 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
@@ -113,7 +113,7 @@ public final class RecentsViewStateController extends
                         ANIM_OVERVIEW_ACTIONS_FADE, LINEAR));
 
         float splitPlaceholderAlpha = state.areElementsVisible(mLauncher, SPLIT_PLACHOLDER_VIEW) ?
-                1 : 0;
+                0.7f : 0;
         propertySetter.setFloat(mRecentsView.getSplitPlaceholder(), ALPHA_FLOAT,
                 splitPlaceholderAlpha, LINEAR);
     }
diff --git a/src/com/android/launcher3/graphics/OverviewScrim.java b/src/com/android/launcher3/graphics/OverviewScrim.java
index 7d52744b44..7aadb962f7 100644
--- a/src/com/android/launcher3/graphics/OverviewScrim.java
+++ b/src/com/android/launcher3/graphics/OverviewScrim.java
@@ -66,6 +66,13 @@ public class OverviewScrim extends Scrim {
         mStableScrimmedView = mCurrentScrimmedView = mLauncher.getOverviewPanel();
     }
 
+    /**
+     * @param view The view we want the scrim to be behind
+     */
+    public void updateStableScrimmedView(View view) {
+        mStableScrimmedView = view;
+    }
+
     public void updateCurrentScrimmedView(ViewGroup root) {
         // Find the lowest view that is at or above the view we want to show the scrim behind.
         mCurrentScrimmedView = mStableScrimmedView;
diff --git a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
index 19dfe15f62..dd5611e7de 100644
--- a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
+++ b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
@@ -24,7 +24,6 @@ import static com.android.launcher3.touch.SingleAxisSwipeDetector.HORIZONTAL;
 import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT;
 import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT;
 import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_TYPE_MAIN;
-import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_TYPE_SIDE;
 
 import android.content.res.Resources;
 import android.graphics.PointF;
@@ -45,7 +44,7 @@ import com.android.launcher3.Utilities;
 import com.android.launcher3.util.OverScroller;
 import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class LandscapePagedViewHandler implements PagedOrientationHandler {
@@ -308,15 +307,10 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
 
     @Override
     public List<SplitPositionOption> getSplitPositionOptions(DeviceProfile dp) {
-        List<SplitPositionOption> options = new ArrayList<>(2);
-        // Add left/right options where left => position top, right => position bottom
-        options.add(new SplitPositionOption(
+        // Add "left" side of phone which is actually the top
+        return Collections.singletonList(new SplitPositionOption(
                 R.drawable.ic_split_screen, R.string.split_screen_position_left,
                 STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN));
-        options.add(new SplitPositionOption(
-                R.drawable.ic_split_screen, R.string.split_screen_position_right,
-                STAGE_POSITION_BOTTOM_OR_RIGHT, STAGE_TYPE_SIDE));
-        return options;
     }
 
     @Override
diff --git a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
index 29be62733c..2ca0340ee7 100644
--- a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
+++ b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
@@ -306,16 +306,17 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
 
     @Override
     public List<SplitPositionOption> getSplitPositionOptions(DeviceProfile dp) {
-        List<SplitPositionOption> options = new ArrayList<>(2);
+        List<SplitPositionOption> options = new ArrayList<>(1);
         // TODO: Add in correct icons
-        if (dp.isLandscape) { // or seascape
+        if (dp.isSeascape()) { // or seascape
             // Add left/right options
             options.add(new SplitPositionOption(
-                    R.drawable.ic_split_screen, R.string.split_screen_position_left,
+                    R.drawable.ic_split_screen, R.string.split_screen_position_right,
                     STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN));
+        } else if (dp.isLandscape) {
             options.add(new SplitPositionOption(
-                    R.drawable.ic_split_screen, R.string.split_screen_position_right,
-                    STAGE_POSITION_BOTTOM_OR_RIGHT, STAGE_TYPE_SIDE));
+                    R.drawable.ic_split_screen, R.string.split_screen_position_left,
+                    STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN));
         } else {
             // Only add top option
             options.add(new SplitPositionOption(
diff --git a/src/com/android/launcher3/touch/SeascapePagedViewHandler.java b/src/com/android/launcher3/touch/SeascapePagedViewHandler.java
index b5252f73ea..bd6e31be02 100644
--- a/src/com/android/launcher3/touch/SeascapePagedViewHandler.java
+++ b/src/com/android/launcher3/touch/SeascapePagedViewHandler.java
@@ -20,7 +20,6 @@ import static com.android.launcher3.touch.SingleAxisSwipeDetector.HORIZONTAL;
 import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT;
 import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT;
 import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_TYPE_MAIN;
-import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_TYPE_SIDE;
 
 import android.content.res.Resources;
 import android.graphics.PointF;
@@ -33,7 +32,7 @@ import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class SeascapePagedViewHandler extends LandscapePagedViewHandler {
@@ -96,15 +95,10 @@ public class SeascapePagedViewHandler extends LandscapePagedViewHandler {
 
     @Override
     public List<SplitPositionOption> getSplitPositionOptions(DeviceProfile dp) {
-        List<SplitPositionOption> options = new ArrayList<>(2);
-        // Add left/right options where left => position bottom, right => position top
-        options.add(new SplitPositionOption(
-                R.drawable.ic_split_screen, R.string.split_screen_position_left,
-                STAGE_POSITION_BOTTOM_OR_RIGHT, STAGE_TYPE_SIDE));
-        options.add(new SplitPositionOption(
+        // Add "right" option which is actually the top
+        return Collections.singletonList(new SplitPositionOption(
                 R.drawable.ic_split_screen, R.string.split_screen_position_right,
                 STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN));
-        return options;
     }
 
     /* ---------- The following are only used by TaskViewTouchHandler. ---------- */
-- 
GitLab


From 71b954a25789e4ef02a05aa8b0b65935b77073de Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Mon, 5 Apr 2021 16:59:15 -0400
Subject: [PATCH 0823/1664] Update device padding to allocate more space to
 workspaceBottomPAdding.

Bug: 175329686
Test: verify using DeviceProfile dump
Change-Id: I7054a49bf33e2c44bd1886a88dbed75c6807ab37
---
 res/xml/size_limits_80x104.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/xml/size_limits_80x104.xml b/res/xml/size_limits_80x104.xml
index e11bc5ecfa..f3755498dc 100644
--- a/res/xml/size_limits_80x104.xml
+++ b/res/xml/size_limits_80x104.xml
@@ -36,11 +36,11 @@
             launcher:a="0"
             launcher:b="16dp"/>
         <workspaceBottomPadding
-            launcher:a="0.50"
+            launcher:a="0.56"
             launcher:b="0"
             launcher:c="16dp"/>
         <hotseatBottomPadding
-            launcher:a="0.50"
+            launcher:a="0.44"
             launcher:b="0"
             launcher:c="16dp"/>
     </device-padding>
-- 
GitLab


From 2043f2009f9de2d7f59ba8ed733b95c55ac2299d Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Mon, 5 Apr 2021 16:47:01 -0500
Subject: [PATCH 0824/1664] [Hotseat] Don't show hotseat edu in tests

Bug: 180972179
Test: presubmit
Change-Id: I2e82c0c90804d0149717ebdcd83fdac9c822ce7d
---
 .../com/android/quickstep/util/QuickstepOnboardingPrefs.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
index 1544f00d49..6d6e802231 100644
--- a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
+++ b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
@@ -26,6 +26,7 @@ import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
 import android.content.SharedPreferences;
 
 import com.android.launcher3.LauncherState;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.Workspace;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.hybridhotseat.HotseatPredictionController;
@@ -63,7 +64,8 @@ public class QuickstepOnboardingPrefs extends OnboardingPrefs<QuickstepLauncher>
             });
         }
 
-        if (!hasReachedMaxCount(HOTSEAT_DISCOVERY_TIP_COUNT)) {
+        if (!Utilities.IS_RUNNING_IN_TEST_HARNESS
+                && !hasReachedMaxCount(HOTSEAT_DISCOVERY_TIP_COUNT)) {
             stateManager.addStateListener(new StateListener<LauncherState>() {
                 boolean mFromAllApps = false;
 
-- 
GitLab


From e78a70ba836c821f49b722d041a72b712bec75eb Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 29 Mar 2021 16:45:59 -0700
Subject: [PATCH 0825/1664] Send a notification when there's an uncaught
 exception

Guarded by FeatureFlag.NOTIFIY_CRASHES and IS_DEBUG_DEVICE

Test: Add a crash in the code, ensure a notification is posted
and can share the stack trace

Change-Id: I828cca3a99debf62f492960eb3cdc699cc0d7f9a
---
 src/com/android/launcher3/Launcher.java       | 42 +++++++++++++++++++
 .../launcher3/config/FeatureFlags.java        |  3 ++
 2 files changed, 45 insertions(+)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index f7cf66bf6a..f4ffa1f2a1 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -60,6 +60,10 @@ import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.annotation.TargetApi;
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
 import android.appwidget.AppWidgetHostView;
 import android.appwidget.AppWidgetManager;
 import android.content.ActivityNotFoundException;
@@ -373,6 +377,44 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
                     .build());
         }
 
+        if (Utilities.IS_DEBUG_DEVICE && FeatureFlags.NOTIFY_CRASHES.get()) {
+            final String notificationChannelId = "com.android.launcher3.Debug";
+            final String notificationChannelName = "Debug";
+            final String notificationTag = "Debug";
+            final int notificationId = 0;
+
+            NotificationManager notificationManager = getSystemService(NotificationManager.class);
+            notificationManager.createNotificationChannel(new NotificationChannel(
+                    notificationChannelId, notificationChannelName,
+                    NotificationManager.IMPORTANCE_HIGH));
+
+            Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> {
+                String stackTrace = Log.getStackTraceString(throwable);
+
+                Intent shareIntent = new Intent(Intent.ACTION_SEND);
+                shareIntent.setType("text/plain");
+                shareIntent.putExtra(Intent.EXTRA_TEXT, stackTrace);
+                shareIntent = Intent.createChooser(shareIntent, null);
+                PendingIntent sharePendingIntent = PendingIntent.getActivity(
+                        this, 0, shareIntent, PendingIntent.FLAG_UPDATE_CURRENT
+                );
+
+                Notification notification = new Notification.Builder(this, notificationChannelId)
+                        .setSmallIcon(android.R.drawable.ic_menu_close_clear_cancel)
+                        .setContentTitle("Launcher crash detected!")
+                        .setStyle(new Notification.BigTextStyle().bigText(stackTrace))
+                        .addAction(android.R.drawable.ic_menu_share, "Share", sharePendingIntent)
+                        .build();
+                notificationManager.notify(notificationTag, notificationId, notification);
+
+                Thread.UncaughtExceptionHandler defaultUncaughtExceptionHandler =
+                        Thread.getDefaultUncaughtExceptionHandler();
+                if (defaultUncaughtExceptionHandler != null) {
+                    defaultUncaughtExceptionHandler.uncaughtException(thread, throwable);
+                }
+            });
+        }
+
         super.onCreate(savedInstanceState);
 
         LauncherAppState app = LauncherAppState.getInstance(this);
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index c7f01334a6..f5fbe2b11a 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -218,6 +218,9 @@ public final class FeatureFlags {
     public static final BooleanFlag ENABLE_ENFORCED_ROUNDED_CORNERS = new DeviceFlag(
             "ENABLE_ENFORCED_ROUNDED_CORNERS", true, "Enforce rounded corners on all App Widgets");
 
+    public static final BooleanFlag NOTIFY_CRASHES = getDebugFlag("NOTIFY_CRASHES", false,
+            "Sends a notification whenever launcher encounters an uncaught exception.");
+
     public static void initialize(Context context) {
         synchronized (sDebugFlags) {
             for (DebugFlag flag : sDebugFlags) {
-- 
GitLab


From 6a74e65953adfbef2fc29951cde82e40272bf1b5 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Thu, 25 Mar 2021 17:15:18 -0700
Subject: [PATCH 0826/1664] Explicitly set which taskbar view is visible at
 each caller

This makes it more clear which taskbar view is expected for particular
code flows. Also makes it easier to set it to null in cleanup().

Test: call cleanup() while taskbarOnHome is invisible, ensure hotseat
icons go back to being visible
Bug: 182512211
Fixes: 183633496

Change-Id: I680a15582c8034a049b20e035b4d54f5ea5aee04
---
 .../launcher3/taskbar/TaskbarController.java  | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index de23ad2efa..c4cbf8b761 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -88,7 +88,6 @@ public class TaskbarController {
 
     private @Nullable Animator mAnimator;
     private boolean mIsAnimatingToLauncher;
-    private boolean mIsAnimatingToApp;
 
     public TaskbarController(BaseQuickstepLauncher launcher,
             TaskbarContainerView taskbarContainerView, TaskbarView taskbarViewOnHome) {
@@ -250,7 +249,9 @@ public class TaskbarController {
         mHotseatController.init();
         mRecentsController.init();
 
-        updateWhichTaskbarViewIsVisible();
+        setWhichTaskbarViewIsVisible(mLauncher.hasBeenResumed()
+                ? mTaskbarViewOnHome
+                : mTaskbarViewInApp);
     }
 
     private TaskbarStateHandlerCallbacks createTaskbarStateHandlerCallbacks() {
@@ -284,6 +285,8 @@ public class TaskbarController {
         mTaskbarAnimationController.cleanup();
         mHotseatController.cleanup();
         mRecentsController.cleanup();
+
+        setWhichTaskbarViewIsVisible(null);
     }
 
     private void removeFromWindowManager() {
@@ -364,7 +367,7 @@ public class TaskbarController {
             @Override
             public void onAnimationEnd(Animator animation) {
                 mIsAnimatingToLauncher = false;
-                updateWhichTaskbarViewIsVisible();
+                setWhichTaskbarViewIsVisible(mTaskbarViewOnHome);
             }
         });
 
@@ -377,14 +380,12 @@ public class TaskbarController {
         anim.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationStart(Animator animation) {
-                mIsAnimatingToApp = true;
                 mTaskbarViewInApp.updateHotseatItemsVisibility();
-                updateWhichTaskbarViewIsVisible();
+                setWhichTaskbarViewIsVisible(mTaskbarViewInApp);
             }
 
             @Override
             public void onAnimationEnd(Animator animation) {
-                mIsAnimatingToApp = false;
             }
         });
         return anim.buildAnim();
@@ -487,18 +488,12 @@ public class TaskbarController {
                 mTaskbarViewOnHome.getHeight() - hotseatBounds.bottom);
     }
 
-    private void updateWhichTaskbarViewIsVisible() {
-        boolean isInApp = !mLauncher.hasBeenResumed() || mIsAnimatingToLauncher
-                || mIsAnimatingToApp;
-        if (isInApp) {
-            mTaskbarViewInApp.setVisibility(View.VISIBLE);
-            mTaskbarViewOnHome.setVisibility(View.INVISIBLE);
-            mLauncher.getHotseat().setIconsAlpha(0);
-        } else {
-            mTaskbarViewInApp.setVisibility(View.INVISIBLE);
-            mTaskbarViewOnHome.setVisibility(View.VISIBLE);
-            mLauncher.getHotseat().setIconsAlpha(1);
-        }
+    private void setWhichTaskbarViewIsVisible(@Nullable TaskbarView visibleTaskbar) {
+        mTaskbarViewInApp.setVisibility(visibleTaskbar == mTaskbarViewInApp
+                ? View.VISIBLE : View.INVISIBLE);
+        mTaskbarViewOnHome.setVisibility(visibleTaskbar == mTaskbarViewOnHome
+                ? View.VISIBLE : View.INVISIBLE);
+        mLauncher.getHotseat().setIconsAlpha(visibleTaskbar != mTaskbarViewInApp ? 1f : 0f);
     }
 
     /**
-- 
GitLab


From 23b7fea6ebd5473a80369263bdd4549a97b3b697 Mon Sep 17 00:00:00 2001
From: Zak Cohen <zakcohen@google.com>
Date: Mon, 5 Apr 2021 15:53:51 -0700
Subject: [PATCH 0827/1664] Overview - update Clear All and Empty message
 drawing

Update Clear All and Empty message to use primary color, not workspace
color, as they are drawn on floating background now, not wallpaper.

Bug: 184260454
Fixes: 184260454
Test: local build, flash and run
Change-Id: Ie8ef4b7ace3053c2068a27b7cbedbbb039fc36d8
---
 quickstep/res/layout/overview_clear_all_button.xml         | 2 +-
 quickstep/res/layout/overview_panel.xml                    | 1 -
 quickstep/src/com/android/quickstep/views/RecentsView.java | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/quickstep/res/layout/overview_clear_all_button.xml b/quickstep/res/layout/overview_clear_all_button.xml
index c61610a438..1ee726e62e 100644
--- a/quickstep/res/layout/overview_clear_all_button.xml
+++ b/quickstep/res/layout/overview_clear_all_button.xml
@@ -21,5 +21,5 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:text="@string/recents_clear_all"
-    android:textColor="?attr/workspaceTextColor"
+    android:textColor="?android:attr/textColorPrimary"
     android:textSize="14sp" />
\ No newline at end of file
diff --git a/quickstep/res/layout/overview_panel.xml b/quickstep/res/layout/overview_panel.xml
index 394e8808c8..34b7ee3ef3 100644
--- a/quickstep/res/layout/overview_panel.xml
+++ b/quickstep/res/layout/overview_panel.xml
@@ -30,7 +30,6 @@
         android:accessibilityPaneTitle="@string/accessibility_recent_apps"
         android:clipChildren="false"
         android:clipToPadding="false"
-        android:theme="@style/HomeScreenElementTheme"
         android:visibility="invisible" />
 
     <include
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index b62a029964..3c171fed8c 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -559,6 +559,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 .getDimension(R.dimen.recents_empty_message_text_size));
         mEmptyMessagePaint.setTypeface(Typeface.create(Themes.getDefaultBodyFont(context),
                 Typeface.NORMAL));
+        mEmptyMessagePaint.setAntiAlias(true);
         mEmptyMessagePadding = getResources()
                 .getDimensionPixelSize(R.dimen.recents_empty_message_text_padding);
         setWillNotDraw(false);
-- 
GitLab


From e13a4a4475b8d16daecf87c3cc8d9c5691f815d0 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 5 Apr 2021 16:14:39 -0700
Subject: [PATCH 0828/1664] Cleanup taskbar touchableInsets

- Remove obsolete visibleInsets hack and isDraggingItem() check
- Have TaskbarController determine whether taskbar is touchable,
  rather than TaskbarContainerView.
- Disallow touches during transition to home (can potentially
  improve this later)

Test: Swupe home, tap taskbar folder during transition, ensure
don't end up in broken state with the uninteractable folder open
Bug: 182512211

Change-Id: Id625ce8b9b876a8a1b450b7d6fb771540e23bc08
---
 .../launcher3/taskbar/TaskbarContainerView.java  | 16 +++++-----------
 .../launcher3/taskbar/TaskbarController.java     |  9 +++++++++
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
index 5202d91684..ccf6b41e5d 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
@@ -27,7 +27,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.android.launcher3.R;
-import com.android.launcher3.anim.AlphaUpdateListener;
 import com.android.launcher3.util.TouchController;
 import com.android.launcher3.views.BaseDragLayer;
 import com.android.systemui.shared.system.ViewTreeObserverWrapper;
@@ -83,18 +82,13 @@ public class TaskbarContainerView extends BaseDragLayer<TaskbarActivityContext>
 
     private ViewTreeObserverWrapper.OnComputeInsetsListener createTaskbarInsetsComputer() {
         return insetsInfo -> {
-            if (getAlpha() < AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD
-                    || mTaskbarView.getVisibility() != VISIBLE || mTaskbarView.isDraggingItem()) {
-                // We're invisible or dragging out of taskbar, let touches pass through us.
+            if (mControllerCallbacks.isTaskbarTouchable()) {
+                 // Accept touches anywhere in our bounds.
+                insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_FRAME);
+            } else {
+                // Let touches pass through us.
                 insetsInfo.touchableRegion.setEmpty();
                 insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION);
-                // TODO(b/182234653): Shouldn't need to do this, but for the meantime, reporting
-                // that visibleInsets is empty allows DragEvents through. Setting them as completely
-                // empty reverts to default behavior, so set 1 px instead.
-                insetsInfo.visibleInsets.set(0, 0, 0, 1);
-            } else {
-                 // We're visible again, accept touches anywhere in our bounds.
-                insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_FRAME);
             }
 
             // TaskbarContainerView provides insets to other apps based on contentInsets. These
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index de23ad2efa..bd22bc5fa0 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -42,6 +42,7 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.QuickstepTransitionManager;
 import com.android.launcher3.R;
+import com.android.launcher3.anim.AlphaUpdateListener;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.folder.Folder;
 import com.android.launcher3.folder.FolderIcon;
@@ -141,6 +142,13 @@ public class TaskbarController {
                     setTaskbarWindowFullscreen(false);
                 }
             }
+
+            @Override
+            public boolean isTaskbarTouchable() {
+                return mTaskbarContainerView.getAlpha() > AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD
+                        && mTaskbarViewInApp.getVisibility() == View.VISIBLE
+                        && !mIsAnimatingToLauncher;
+            }
         };
     }
 
@@ -549,6 +557,7 @@ public class TaskbarController {
      */
     protected interface TaskbarContainerViewCallbacks {
         void onViewRemoved();
+        boolean isTaskbarTouchable();
     }
 
     /**
-- 
GitLab


From 9f436dfe8ebc046670ca241c3328dc02d92a08d1 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 5 Apr 2021 16:07:16 -0700
Subject: [PATCH 0829/1664] Ensure taskbar animation ends when running window
 animation does

- Store the possible parallel animation to cancel/end in
  AbsSwipeUpHandler#endRunningWindowAnim()

Test: 1. remove taskbar during transition, ensure cleaned up properly
2. open a second app during transition to home, ensure taskbar
maintains correct visibility
Bug: 182512211

Change-Id: I71a6b6ce624113d43ad5a599cb5cfec28a555310
---
 .../com/android/quickstep/AbsSwipeUpHandler.java  | 15 ++++++++++++++-
 .../android/quickstep/BaseActivityInterface.java  |  4 +++-
 .../quickstep/LauncherActivityInterface.java      |  8 +++++---
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index b7c6743780..5a3e009b8d 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -217,6 +217,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
 
     // Either RectFSpringAnim (if animating home) or ObjectAnimator (from mCurrentShift) otherwise
     private RunningWindowAnim mRunningWindowAnim;
+    // Possible second animation running at the same time as mRunningWindowAnim
+    private Animator mParallelRunningAnim;
     private boolean mIsMotionPaused;
     private boolean mHasMotionEverBeenPaused;
 
@@ -798,6 +800,13 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                 mRunningWindowAnim.end();
             }
         }
+        if (mParallelRunningAnim != null) {
+            if (cancel) {
+                mParallelRunningAnim.cancel();
+            } else {
+                mParallelRunningAnim.end();
+            }
+        }
     }
 
     private void onSettledOnEndTarget() {
@@ -1060,7 +1069,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
             ActivityManagerWrapper.getInstance().registerTaskStackListener(
                     mActivityRestartListener);
 
-            mActivityInterface.onAnimateToLauncher(mGestureState.getEndTarget(), duration);
+            mParallelRunningAnim = mActivityInterface.getParallelAnimationToLauncher(
+                    mGestureState.getEndTarget(), duration);
+            if (mParallelRunningAnim != null) {
+                mParallelRunningAnim.start();
+            }
         }
 
         if (mGestureState.getEndTarget() == HOME) {
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index 3afffc1dad..d810947ee5 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -347,7 +347,9 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
      * Called when the gesture ends and the animation starts towards the given target. No-op by
      * default, but subclasses can override to add an additional animation with the same duration.
      */
-    public void onAnimateToLauncher(GestureState.GestureEndTarget endTarget, long duration) {
+    public @Nullable Animator getParallelAnimationToLauncher(
+            GestureState.GestureEndTarget endTarget, long duration) {
+        return null;
     }
 
     /**
diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
index 98b96b2c6c..878f5c9e4c 100644
--- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
@@ -22,6 +22,7 @@ import static com.android.launcher3.LauncherState.QUICK_SWITCH;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING;
 
+import android.animation.Animator;
 import android.content.Context;
 import android.graphics.Rect;
 import android.view.MotionEvent;
@@ -267,13 +268,14 @@ public final class LauncherActivityInterface extends
     }
 
     @Override
-    public void onAnimateToLauncher(GestureEndTarget endTarget, long duration) {
+    public @Nullable Animator getParallelAnimationToLauncher(GestureEndTarget endTarget,
+            long duration) {
         TaskbarController taskbarController = getTaskbarController();
         if (taskbarController == null) {
-            return;
+            return null;
         }
         LauncherState toState = stateFromGestureEndTarget(endTarget);
-        taskbarController.createAnimToLauncher(toState, duration).start();
+        return taskbarController.createAnimToLauncher(toState, duration);
     }
 
     @Override
-- 
GitLab


From 27d9a92a4478220260bfba3ecd1a4a9b6974a24e Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 5 Apr 2021 21:19:25 -0700
Subject: [PATCH 0830/1664] Reset force-minimized split state when in live tile
 mode

Bug: 184233556
Test: Enter split, go home, launch same task by tapping or swiping
Change-Id: Ied2d56f087e5c05f5f7c4b19428f8088edf4e599
---
 .../android/quickstep/views/RecentsView.java  | 13 ++-
 .../com/android/quickstep/views/TaskView.java | 93 ++++++++++---------
 2 files changed, 59 insertions(+), 47 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 327f5e6e92..29dd0b4986 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -786,8 +786,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
 
             private void cleanUp(boolean canceled) {
                 if (mRecentsAnimationController != null) {
-                    mRecentsAnimationController.finish(false /* toRecents */,
-                            null /* onFinishComplete */);
+                    finishRecentsAnimation(false /* toRecents */, null /* onFinishComplete */);
                     if (canceled) {
                         mRecentsAnimationController = null;
                     } else {
@@ -3009,6 +3008,16 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     }
 
     public void finishRecentsAnimation(boolean toRecents, Runnable onFinishComplete) {
+        if (!toRecents && LIVE_TILE.get()) {
+            // Reset the minimized state since we force-toggled the minimized state when entering
+            // overview, but never actually finished the recents animation.  This is a catch all for
+            // cases where we haven't already reset it.
+            SystemUiProxy p = SystemUiProxy.INSTANCE.getNoCreate();
+            if (p != null) {
+                p.setSplitScreenMinimized(false);
+            }
+        }
+
         if (mRecentsAnimationController == null) {
             if (onFinishComplete != null) {
                 onFinishComplete.run();
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 745e328ab3..5fe0567b02 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -93,6 +93,7 @@ import com.android.launcher3.util.TransformingTouchDelegate;
 import com.android.launcher3.util.ViewPool.Reusable;
 import com.android.quickstep.RecentsModel;
 import com.android.quickstep.RemoteAnimationTargets;
+import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.TaskIconCache;
 import com.android.quickstep.TaskOverlayFactory;
 import com.android.quickstep.TaskThumbnailCache;
@@ -327,47 +328,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     public TaskView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         mActivity = StatefulActivity.fromContext(context);
-        setOnClickListener((view) -> {
-            if (getTask() == null) {
-                return;
-            }
-            if (LIVE_TILE.get() && isRunningTask()) {
-                if (!mIsClickableAsLiveTile) {
-                    return;
-                }
-
-                mIsClickableAsLiveTile = false;
-                RecentsView recentsView = getRecentsView();
-                RemoteAnimationTargets targets = recentsView.getLiveTileParams().getTargetSet();
-                recentsView.getLiveTileTaskViewSimulator().setDrawsBelowRecents(false);
-
-                AnimatorSet anim = new AnimatorSet();
-                TaskViewUtils.composeRecentsLaunchAnimator(
-                        anim, this, targets.apps,
-                        targets.wallpapers, true /* launcherClosing */,
-                        mActivity.getStateManager(), recentsView,
-                        recentsView.getDepthController());
-                anim.addListener(new AnimatorListenerAdapter() {
-
-                    @Override
-                    public void onAnimationEnd(Animator animator) {
-                        recentsView.getLiveTileTaskViewSimulator().setDrawsBelowRecents(true);
-                        recentsView.finishRecentsAnimation(false, null);
-                        mIsClickableAsLiveTile = true;
-                    }
-                });
-                anim.start();
-            } else {
-                if (mActivity.isInState(OVERVIEW_SPLIT_SELECT)) {
-                    // User tapped to select second split screen app
-                    getRecentsView().confirmSplitSelect(this);
-                } else {
-                    launchTaskAnimated();
-                }
-            }
-            mActivity.getStatsLogManager().logger().withItemInfo(getItemInfo())
-                    .log(LAUNCHER_TASK_LAUNCH_TAP);
-        });
+        setOnClickListener(this::onClick);
 
         mCurrentFullscreenParams = new FullscreenDrawParams(context);
         mDigitalWellBeingToast = new DigitalWellBeingToast(mActivity, this);
@@ -506,10 +467,52 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         return mIconView;
     }
 
-    public AnimatorPlaybackController createLaunchAnimationForRunningTask() {
-        return getRecentsView().createTaskLaunchAnimation(
-                this, RECENTS_LAUNCH_DURATION, TOUCH_RESPONSE_INTERPOLATOR)
-                .createPlaybackController();
+    private void onClick(View view) {
+        if (getTask() == null) {
+            return;
+        }
+        if (LIVE_TILE.get() && isRunningTask()) {
+            if (!mIsClickableAsLiveTile) {
+                return;
+            }
+
+            // Reset the minimized state since we force-toggled the minimized state when entering
+            // overview, but never actually finished the recents animation
+            SystemUiProxy p = SystemUiProxy.INSTANCE.getNoCreate();
+            if (p != null) {
+                p.setSplitScreenMinimized(false);
+            }
+
+            mIsClickableAsLiveTile = false;
+            RecentsView recentsView = getRecentsView();
+            RemoteAnimationTargets targets = recentsView.getLiveTileParams().getTargetSet();
+            recentsView.getLiveTileTaskViewSimulator().setDrawsBelowRecents(false);
+
+            AnimatorSet anim = new AnimatorSet();
+            TaskViewUtils.composeRecentsLaunchAnimator(
+                    anim, this, targets.apps,
+                    targets.wallpapers, true /* launcherClosing */,
+                    mActivity.getStateManager(), recentsView,
+                    recentsView.getDepthController());
+            anim.addListener(new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationEnd(Animator animator) {
+                    recentsView.getLiveTileTaskViewSimulator().setDrawsBelowRecents(true);
+                    recentsView.finishRecentsAnimation(false, null);
+                    mIsClickableAsLiveTile = true;
+                }
+            });
+            anim.start();
+        } else {
+            if (mActivity.isInState(OVERVIEW_SPLIT_SELECT)) {
+                // User tapped to select second split screen app
+                getRecentsView().confirmSplitSelect(this);
+            } else {
+                launchTaskAnimated();
+            }
+        }
+        mActivity.getStatsLogManager().logger().withItemInfo(getItemInfo())
+                .log(LAUNCHER_TASK_LAUNCH_TAP);
     }
 
     /**
-- 
GitLab


From 7700bffc4732358a46c8b39d93bf3a7ccb7fec91 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 5 Apr 2021 21:37:01 -0700
Subject: [PATCH 0831/1664] Fix noisy log from sysui flag changes

Bug: 144854916
Test: Logcat after sysui flag changes, ensure no tracing change logs
Change-Id: I36b6b71bae08303787508ab6eb63ca989866370c
---
 .../quickstep/TouchInteractionService.java    | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 1fb946550e..e9d2eb4632 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -239,8 +239,9 @@ public class TouchInteractionService extends Service implements PluginListener<O
         @BinderThread
         public void onSystemUiStateChanged(int stateFlags) {
             MAIN_EXECUTOR.execute(() -> {
+                int lastFlags = mDeviceState.getSystemUiStateFlags();
                 mDeviceState.setSystemUiFlags(stateFlags);
-                TouchInteractionService.this.onSystemUiFlagsChanged();
+                TouchInteractionService.this.onSystemUiFlagsChanged(lastFlags);
             });
         }
 
@@ -362,7 +363,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
         mResetGestureInputConsumer = new ResetGestureInputConsumer(mTaskAnimationManager);
         mInputConsumer = InputConsumerController.getRecentsAnimationInputConsumer();
         mInputConsumer.registerInputConsumer();
-        onSystemUiFlagsChanged();
+        onSystemUiFlagsChanged(mDeviceState.getSystemUiStateFlags());
         onAssistantVisibilityChanged();
 
         // Temporarily disable model preload
@@ -414,7 +415,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
     }
 
     @UiThread
-    private void onSystemUiFlagsChanged() {
+    private void onSystemUiFlagsChanged(int lastSysUIFlags) {
         if (mDeviceState.isUserUnlocked()) {
             int systemUiStateFlags = mDeviceState.getSystemUiStateFlags();
             SystemUiProxy.INSTANCE.get(this).setLastSystemUiStateFlags(systemUiStateFlags);
@@ -422,14 +423,17 @@ public class TouchInteractionService extends Service implements PluginListener<O
             mOverviewComponentObserver.getActivityInterface().onSystemUiFlagsChanged(
                     systemUiStateFlags);
 
-            // Update the tracing state
-            if ((systemUiStateFlags & SYSUI_STATE_TRACING_ENABLED) != 0) {
-                Log.d(TAG, "Starting tracing.");
-                ProtoTracer.INSTANCE.get(this).start();
-            } else {
-                Log.d(TAG, "Stopping tracing. Dumping to file="
-                    + ProtoTracer.INSTANCE.get(this).getTraceFile());
-                ProtoTracer.INSTANCE.get(this).stop();
+            if ((lastSysUIFlags & SYSUI_STATE_TRACING_ENABLED) !=
+                    (systemUiStateFlags & SYSUI_STATE_TRACING_ENABLED)) {
+                // Update the tracing state
+                if ((systemUiStateFlags & SYSUI_STATE_TRACING_ENABLED) != 0) {
+                    Log.d(TAG, "Starting tracing.");
+                    ProtoTracer.INSTANCE.get(this).start();
+                } else {
+                    Log.d(TAG, "Stopping tracing. Dumping to file="
+                            + ProtoTracer.INSTANCE.get(this).getTraceFile());
+                    ProtoTracer.INSTANCE.get(this).stop();
+                }
             }
         }
     }
-- 
GitLab


From ac120c9a478143477af158a848410b97ab839e23 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Tue, 6 Apr 2021 03:03:33 -0500
Subject: [PATCH 0832/1664] [Search] make AbstractSlideinView#createColorScrim
 overridable

+ Introduce feature flag for people tile results

Bug: 183972880
Bug: 184003600
Test: Manual
Change-Id: Ia8b3af4e99a66f640f6f42fc5886d9cbfb5e913c
---
 quickstep/res/values/strings.xml                       | 10 +---------
 src/com/android/launcher3/config/FeatureFlags.java     |  4 ++++
 .../android/launcher3/views/AbstractSlideInView.java   |  2 +-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml
index 160332105b..2a0683079f 100644
--- a/quickstep/res/values/strings.xml
+++ b/quickstep/res/values/strings.xml
@@ -59,7 +59,7 @@
     <string name="all_apps_prediction_tip">Your predicted apps</string>
 
     <!-- Content description for a close button. [CHAR LIMIT=NONE] -->
-    <string  name="gesture_tutorial_close_button_content_description" translatable="false">Close</string>
+    <string name="gesture_tutorial_close_button_content_description" translatable="false">Close</string>
 
     <!-- Hotseat educational strings for users who don't qualify for migration -->
     <string name="hotseat_edu_title_migrate">Get app suggestions on the bottom row of your Home screen</string>
@@ -91,14 +91,6 @@
     <!-- content description for hotseat items -->
     <string name="hotseat_prediction_content_description">Predicted app: <xliff:g id="title" example="Chrome">%1$s</xliff:g></string>
 
-    <!-- primary educational text shown for first time search users -->
-    <string name="search_edu_primary">Search your phone for apps, people, settings and more!</string>
-    <!-- secondary educational text shown for first time search users -->
-    <string name="search_edu_secondary">Tap keyboard search button to launch the first search
-        result.</string>
-
-    <!-- Dismiss button string for search education view -->
-    <string name="search_edu_dismiss">Got it.</string>
     <!-- Feedback shown during interactive parts of Back gesture tutorial for left edge when the gesture is too far from the edge. [CHAR LIMIT=100] -->
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge">Make sure you swipe from the far-left edge.</string>
     <!-- Feedback shown during interactive parts of Back gesture tutorial for left edge when the gesture is cancelled. [CHAR LIMIT=100] -->
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index c7f01334a6..7b92d112cf 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -95,6 +95,10 @@ public final class FeatureFlags {
     public static final BooleanFlag ENABLE_DEVICE_SEARCH = new DeviceFlag(
             "ENABLE_DEVICE_SEARCH", true, "Allows on device search in all apps");
 
+    public static final BooleanFlag ENABLE_PEOPLE_TILE_PREVIEW = getDebugFlag(
+            "ENABLE_PEOPLE_TILE_PREVIEW", false,
+            "Experimental: Shows conversation shortcuts on home screen as search results");
+
     public static final BooleanFlag FOLDER_NAME_SUGGEST = new DeviceFlag(
             "FOLDER_NAME_SUGGEST", true,
             "Suggests folder names instead of blank text.");
diff --git a/src/com/android/launcher3/views/AbstractSlideInView.java b/src/com/android/launcher3/views/AbstractSlideInView.java
index e08f881bab..f79313f026 100644
--- a/src/com/android/launcher3/views/AbstractSlideInView.java
+++ b/src/com/android/launcher3/views/AbstractSlideInView.java
@@ -216,7 +216,7 @@ public abstract class AbstractSlideInView extends AbstractFloatingView
         return mLauncher.getDragLayer();
     }
 
-    protected static View createColorScrim(Context context, int bgColor) {
+    protected View createColorScrim(Context context, int bgColor) {
         View view = new View(context);
         view.forceHasOverlappingRendering(false);
         view.setBackgroundColor(bgColor);
-- 
GitLab


From 5461089baa474da4b59bdb20fb5bfe882f0f68f2 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Tue, 6 Apr 2021 04:05:13 -0500
Subject: [PATCH 0833/1664] [Search][Layout] Fix blank space when predictions
 are disabled

This regression is caused due to getExpectedHeight relying on view visibility state while AlphaUpdateListener.updateVisibility was reseting the views visibility.

Bug: 184211402
Test: local
Change-Id: Ib756f5eb8f6356a18a025626008b97fd7c77fec9
---
 .../android/launcher3/appprediction/PredictionRowView.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
index 8e92b59ae1..cc3ccea4d0 100644
--- a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
+++ b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
@@ -237,7 +237,9 @@ public class PredictionRowView extends LinearLayout implements
             setTranslationY(scroll);
         }
         setAlpha(mScrolledOut ? 0 : 1);
-        AlphaUpdateListener.updateVisibility(this);
+        if (getVisibility() != GONE) {
+            AlphaUpdateListener.updateVisibility(this);
+        }
     }
 
     @Override
-- 
GitLab


From fbdb50aa489f39a1ef6736b2f2318b665c55e0e2 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 6 Apr 2021 10:07:55 -0700
Subject: [PATCH 0834/1664] Fix HINT_STATE not tracking the entire height of
 the screen

Explicitly use DeviceProfile#heightPx instead of getShiftRange(),
which might be less depending on AllAppsTransitionController

Test: swipe up from bottom on home, ensure workspace scales down
as the gesture goes all the way to the top of the screen

Change-Id: I9c2988d361c22d437c7eb9bea8ed715d06054c59
---
 .../NoButtonNavbarToOverviewTouchController.java                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
index 65bbeea52e..464b90a2cb 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -111,7 +111,7 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
         float progressMultiplier = super.initCurrentAnimation();
         if (mToState == HINT_STATE) {
             // Track the drag across the entire height of the screen.
-            progressMultiplier = -1 / getShiftRange();
+            progressMultiplier = -1f / mLauncher.getDeviceProfile().heightPx;
         }
         return progressMultiplier;
     }
-- 
GitLab


From bf694d61ee251a80ba438281b832795f0f7ec811 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Thu, 25 Mar 2021 13:51:20 -0700
Subject: [PATCH 0835/1664] Add logging for adding pending icons to the
 workspace.

Added logging to help track down b/168788486

Bug: 168788486

Test: manual
Change-Id: I96b38be7c02793f1b6649e6c0de5cdf47dca6edb
---
 .../android/launcher3/SessionCommitReceiver.java   |  8 ++++++++
 .../launcher3/model/AddWorkspaceItemsTask.java     |  5 +++++
 .../android/launcher3/model/ItemInstallQueue.java  | 14 +++++++++++++-
 .../android/launcher3/pm/InstallSessionHelper.java |  6 ++++++
 4 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/SessionCommitReceiver.java b/src/com/android/launcher3/SessionCommitReceiver.java
index 1bbbb2b59e..50361040f7 100644
--- a/src/com/android/launcher3/SessionCommitReceiver.java
+++ b/src/com/android/launcher3/SessionCommitReceiver.java
@@ -24,6 +24,7 @@ import android.content.pm.PackageInstaller.SessionInfo;
 import android.content.pm.PackageManager;
 import android.os.UserHandle;
 import android.text.TextUtils;
+import android.util.Log;
 
 import androidx.annotation.WorkerThread;
 
@@ -36,6 +37,8 @@ import com.android.launcher3.util.Executors;
  */
 public class SessionCommitReceiver extends BroadcastReceiver {
 
+    private static final String LOG = "SessionCommitReceiver";
+
     // Preference key for automatically adding icon to homescreen.
     public static final String ADD_ICON_PREFERENCE_KEY = "pref_add_icon_to_home";
 
@@ -68,6 +71,11 @@ public class SessionCommitReceiver extends BroadcastReceiver {
             return;
         }
 
+        Log.i(LOG,
+                "Adding package name to install queue. Package name: " + info.getAppPackageName()
+                        + ", has app icon: " + (info.getAppIcon() != null)
+                        + ", has app label: " + !TextUtils.isEmpty(info.getAppLabel()));
+
         ItemInstallQueue.INSTANCE.get(context)
                 .queueItem(info.getAppPackageName(), user);
     }
diff --git a/src/com/android/launcher3/model/AddWorkspaceItemsTask.java b/src/com/android/launcher3/model/AddWorkspaceItemsTask.java
index 56dbbd33da..fd51ba8d5b 100644
--- a/src/com/android/launcher3/model/AddWorkspaceItemsTask.java
+++ b/src/com/android/launcher3/model/AddWorkspaceItemsTask.java
@@ -20,6 +20,7 @@ import android.content.pm.LauncherActivityInfo;
 import android.content.pm.LauncherApps;
 import android.content.pm.PackageInstaller.SessionInfo;
 import android.os.UserHandle;
+import android.util.Log;
 import android.util.LongSparseArray;
 import android.util.Pair;
 
@@ -47,6 +48,8 @@ import java.util.List;
  */
 public class AddWorkspaceItemsTask extends BaseModelUpdateTask {
 
+    private static final String LOG = "AddWorkspaceItemsTask";
+
     private final List<Pair<ItemInfo, Object>> mItemList;
 
     /**
@@ -167,6 +170,8 @@ public class AddWorkspaceItemsTask extends BaseModelUpdateTask {
 
                 // Save the WorkspaceItemInfo for binding in the workspace
                 addedItemsFinal.add(itemInfo);
+
+                Log.i(LOG, "Adding item info to workspace: " + itemInfo);
             }
         }
 
diff --git a/src/com/android/launcher3/model/ItemInstallQueue.java b/src/com/android/launcher3/model/ItemInstallQueue.java
index df8367f256..836d804445 100644
--- a/src/com/android/launcher3/model/ItemInstallQueue.java
+++ b/src/com/android/launcher3/model/ItemInstallQueue.java
@@ -63,6 +63,8 @@ import java.util.stream.Stream;
  */
 public class ItemInstallQueue {
 
+    private static final String LOG = "ItemInstallQueue";
+
     public static final int FLAG_ACTIVITY_PAUSED = 1;
     public static final int FLAG_LOADER_RUNNING = 2;
     public static final int FLAG_DRAG_AND_DROP = 4;
@@ -183,7 +185,17 @@ public class ItemInstallQueue {
 
     private void queuePendingShortcutInfo(PendingInstallShortcutInfo info) {
         // Queue the item up for adding if launcher has not loaded properly yet
-        MODEL_EXECUTOR.post(() -> addToQueue(info));
+        MODEL_EXECUTOR.post(() -> {
+            Pair<ItemInfo, Object> itemInfo = info.getItemInfo(mContext);
+            if (itemInfo == null) {
+                Log.i(LOG, "Adding PendingInstallShortcutInfo with no attached info to queue.");
+            } else {
+                Log.i(LOG, "Adding PendingInstallShortcutInfo to queue. Attached info: "
+                        + itemInfo.first);
+            }
+
+            addToQueue(info);
+        });
         flushInstallQueue();
     }
 
diff --git a/src/com/android/launcher3/pm/InstallSessionHelper.java b/src/com/android/launcher3/pm/InstallSessionHelper.java
index 0091af10f6..72f1c58905 100644
--- a/src/com/android/launcher3/pm/InstallSessionHelper.java
+++ b/src/com/android/launcher3/pm/InstallSessionHelper.java
@@ -29,6 +29,7 @@ import android.os.Build;
 import android.os.Process;
 import android.os.UserHandle;
 import android.text.TextUtils;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
@@ -56,6 +57,8 @@ import java.util.List;
  */
 public class InstallSessionHelper {
 
+    private static final String LOG = "InstallSessionHelper";
+
     // Set<String> of session ids of promise icons that have been added to the home screen
     // as FLAG_PROMISE_NEW_INSTALLS.
     protected static final String PROMISE_ICON_IDS = "promise_icon_ids";
@@ -219,6 +222,9 @@ public class InstallSessionHelper {
                 && !promiseIconAddedForId(sessionInfo.getSessionId())
                 && !new PackageManagerHelper(mAppContext).isAppInstalled(
                         sessionInfo.getAppPackageName(), getUserHandle(sessionInfo))) {
+            Log.i(LOG, "Adding package name to install queue: "
+                    + sessionInfo.getAppPackageName());
+
             ItemInstallQueue.INSTANCE.get(mAppContext)
                     .queueItem(sessionInfo.getAppPackageName(), getUserHandle(sessionInfo));
 
-- 
GitLab


From b77fa8da529056198a6236d5c7c60cc097e04ead Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 6 Apr 2021 12:07:02 -0700
Subject: [PATCH 0836/1664] Consolidate two different onTransitionCancelled
 implementations

There was previously two different onTransitionCancelled(), one in
BaseActivityInterface and one in AnimationFactory. They are pretty
similar and the differences seem subtle and not necessary. In this
bug, the AnimationFactory version was going to mStartState instead
of StateManager#getRestState() (which is the same, unless mStartState
disables restore). Instead, always use the mActivityInterface
implemenation, which seems more robust.

Test: Open app A, open app B, quick switch from B to A, swipe home
during that transition, then touch nav region during home transtion;
ensure we don't goToState(BACKGROUND_APP) in the subsequent
onTransitionCanceled().

Fixes: 184583037

Change-Id: I315a5087b12413d88c3ccc1e3245a55a76a73e62
---
 .../src/com/android/quickstep/AbsSwipeUpHandler.java      | 8 ++------
 .../src/com/android/quickstep/BaseActivityInterface.java  | 7 -------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index b7c6743780..0a497bfc39 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -317,9 +317,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         mStateCallback.runOnceAtState(STATE_LAUNCHER_PRESENT | STATE_HANDLER_INVALIDATED,
                 this::invalidateHandlerWithLauncher);
         mStateCallback.runOnceAtState(STATE_HANDLER_INVALIDATED | STATE_RESUME_LAST_TASK,
-                this::notifyTransitionCancelled);
+                this::resetStateForAnimationCancel);
         mStateCallback.runOnceAtState(STATE_HANDLER_INVALIDATED | STATE_FINISH_WITH_NO_END,
-                this::notifyTransitionCancelled);
+                this::resetStateForAnimationCancel);
 
         if (!LIVE_TILE.get()) {
             mStateCallback.addChangeListener(STATE_APP_CONTROLLER_RECEIVED | STATE_LAUNCHER_PRESENT
@@ -1370,10 +1370,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         mActivity.getRootView().setOnApplyWindowInsetsListener(null);
     }
 
-    private void notifyTransitionCancelled() {
-        mAnimationFactory.onTransitionCancelled();
-    }
-
     private void resetStateForAnimationCancel() {
         boolean wasVisible = mWasLauncherAlreadyVisible || mGestureStarted;
         mActivityInterface.onTransitionCancelled(wasVisible);
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index 3afffc1dad..b9c2450ccc 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -366,8 +366,6 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
 
         void createActivityInterface(long transitionLength);
 
-        default void onTransitionCancelled() { }
-
         /**
          * @param attached Whether to show RecentsView alongside the app window. If false, recents
          *                 will be hidden by some property we can animate, e.g. alpha.
@@ -433,11 +431,6 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
             }
         }
 
-        @Override
-        public void onTransitionCancelled() {
-            mActivity.getStateManager().goToState(mStartState, false /* animate */);
-        }
-
         @Override
         public void setRecentsAttachedToAppWindow(boolean attached, boolean animate) {
             if (mIsAttachedToWindow == attached && animate) {
-- 
GitLab


From c82916fecb48104f22d7102e825884f4cfb64575 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 6 Apr 2021 13:03:54 -0700
Subject: [PATCH 0837/1664] Some cleanup in RecentsView

> Merging overview and all-apps scrims into a single View
> Decoupling TaskMenuView from taskView

Bug: 184676497
Test: Manual

Change-Id: I49f7249eaa2a800054385ab8e73a441d6a1b5e16
---
 quickstep/res/layout/scrim_view.xml           |  20 ---
 .../BaseRecentsViewStateController.java       |  17 ---
 .../uioverrides/states/AllAppsState.java      |   5 +
 .../uioverrides/states/OverviewState.java     |   2 +-
 .../NavBarToHomeTouchController.java          |   5 -
 ...ButtonNavbarToOverviewTouchController.java |  10 +-
 .../NoButtonQuickSwitchTouchController.java   |   6 +-
 .../com/android/quickstep/TaskViewUtils.java  |   7 +-
 .../util/StaggeredWorkspaceAnim.java          |  19 +--
 .../quickstep/util/TaskViewSimulator.java     |  42 +-----
 .../quickstep/views/AllAppsScrimView.java     | 125 ------------------
 .../quickstep/views/ClearAllButton.java       |   9 +-
 .../views/DigitalWellBeingToast.java          |  15 +--
 .../quickstep/views/LauncherRecentsView.java  |   7 +-
 .../views/RecentsExtraViewContainer.java      |   2 +-
 .../android/quickstep/views/RecentsView.java  |  98 ++------------
 .../android/quickstep/views/TaskMenuView.java |  21 ++-
 .../com/android/quickstep/views/TaskView.java |  63 +--------
 res/layout/launcher.xml                       |   7 +-
 res/layout/scrim_view.xml                     |  20 ---
 src/com/android/launcher3/Launcher.java       |   3 +-
 src/com/android/launcher3/LauncherState.java  |   4 +-
 .../WorkspaceStateTransitionAnimation.java    |  12 +-
 .../allapps/AllAppsTransitionController.java  |  13 +-
 .../launcher3/dragndrop/DragLayer.java        |  21 ---
 .../launcher3/graphics/OverviewScrim.java     | 111 ----------------
 .../android/launcher3/states/HintState.java   |   2 +-
 .../launcher3/states/SpringLoadedState.java   |   2 +-
 .../states/StateAnimationConfig.java          |   4 +-
 .../touch/LandscapePagedViewHandler.java      |   8 --
 .../touch/PagedOrientationHandler.java        |   8 --
 .../touch/PortraitPagedViewHandler.java       |   9 --
 .../android/launcher3/views/ScrimView.java    |  94 ++++---------
 .../uioverrides/states/AllAppsState.java      |   5 +
 34 files changed, 119 insertions(+), 677 deletions(-)
 delete mode 100644 quickstep/res/layout/scrim_view.xml
 delete mode 100644 quickstep/src/com/android/quickstep/views/AllAppsScrimView.java
 delete mode 100644 res/layout/scrim_view.xml
 delete mode 100644 src/com/android/launcher3/graphics/OverviewScrim.java

diff --git a/quickstep/res/layout/scrim_view.xml b/quickstep/res/layout/scrim_view.xml
deleted file mode 100644
index 3f2daf1d17..0000000000
--- a/quickstep/res/layout/scrim_view.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.quickstep.views.AllAppsScrimView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/scrim_view" />
\ No newline at end of file
diff --git a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
index a3a1fef052..01616d45ec 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
@@ -18,12 +18,9 @@ package com.android.launcher3.uioverrides;
 
 import static com.android.launcher3.anim.Interpolators.AGGRESSIVE_EASE_IN_OUT;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
-import static com.android.launcher3.graphics.OverviewScrim.SCRIM_MULTIPLIER;
-import static com.android.launcher3.graphics.Scrim.SCRIM_PROGRESS;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_MODAL;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCRIM_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
@@ -40,7 +37,6 @@ import androidx.annotation.NonNull;
 import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.anim.PendingAnimation;
-import com.android.launcher3.graphics.OverviewScrim;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.touch.PagedOrientationHandler;
@@ -70,9 +66,6 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView>
         TASK_SECONDARY_TRANSLATION.set(mRecentsView, 0f);
 
         getContentAlphaProperty().set(mRecentsView, state.overviewUi ? 1f : 0);
-        OverviewScrim scrim = mLauncher.getDragLayer().getOverviewScrim();
-        SCRIM_PROGRESS.set(scrim, state.getOverviewScrimAlpha(mLauncher));
-        SCRIM_MULTIPLIER.set(scrim, 1f);
         getTaskModalnessProperty().set(mRecentsView, state.getOverviewModalness());
         RECENTS_GRID_PROGRESS.set(mRecentsView,
                 state.displayOverviewTasksAsGrid(mLauncher.getDeviceProfile()) ? 1f : 0f);
@@ -111,16 +104,6 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView>
 
         setter.setFloat(mRecentsView, getContentAlphaProperty(), toState.overviewUi ? 1 : 0,
                 config.getInterpolator(ANIM_OVERVIEW_FADE, AGGRESSIVE_EASE_IN_OUT));
-        OverviewScrim scrim = mLauncher.getDragLayer().getOverviewScrim();
-        setter.setFloat(scrim, SCRIM_PROGRESS, toState.getOverviewScrimAlpha(mLauncher),
-                config.getInterpolator(ANIM_OVERVIEW_SCRIM_FADE, LINEAR));
-        setter.setFloat(scrim, SCRIM_MULTIPLIER, 1f,
-                config.getInterpolator(ANIM_OVERVIEW_SCRIM_FADE, LINEAR));
-        if (toState.areElementsVisible(mLauncher, LauncherState.SPLIT_PLACHOLDER_VIEW)) {
-            scrim.updateStableScrimmedView(mLauncher.getSplitPlaceholderView());
-        } else {
-            scrim.updateStableScrimmedView(mLauncher.getOverviewPanel());
-        }
 
         setter.setFloat(
                 mRecentsView, getTaskModalnessProperty(),
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
index b2f8a404c0..4e03971517 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
@@ -90,4 +90,9 @@ public class AllAppsState extends LauncherState {
     public LauncherState getHistoryForState(LauncherState previousState) {
         return previousState == OVERVIEW ? OVERVIEW : NORMAL;
     }
+
+    @Override
+    public float getWorkspaceScrimAlpha(Launcher launcher) {
+        return 1;
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
index 95a855a7c8..6cdeb0f74b 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -103,7 +103,7 @@ public class OverviewState extends LauncherState {
     }
 
     @Override
-    public float getOverviewScrimAlpha(Launcher launcher) {
+    public float getWorkspaceScrimAlpha(Launcher launcher) {
         return 1f;
     }
 
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
index a990f3ed93..b8caf81f14 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
@@ -44,7 +44,6 @@ import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.compat.AccessibilityManagerCompat;
 import com.android.launcher3.config.FeatureFlags;
-import com.android.launcher3.graphics.OverviewScrim;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
 import com.android.launcher3.util.TouchController;
@@ -141,10 +140,6 @@ public class NavBarToHomeTouchController implements TouchController,
             AnimatorControllerWithResistance.createRecentsResistanceFromOverviewAnim(mLauncher,
                     builder);
 
-            builder.setFloat(mLauncher.getDragLayer().getOverviewScrim(),
-                    OverviewScrim.SCRIM_MULTIPLIER, OVERVIEW_TO_HOME_SCRIM_MULTIPLIER,
-                    PULLBACK_INTERPOLATOR);
-
             if (LIVE_TILE.get()) {
                 builder.addOnFrameCallback(recentsView::redrawLiveTile);
             }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
index 65bbeea52e..7b31b1328a 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -16,6 +16,7 @@
 
 package com.android.launcher3.uioverrides.touchcontrollers;
 
+import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA;
 import static com.android.launcher3.LauncherAnimUtils.newCancelListener;
 import static com.android.launcher3.LauncherState.ALL_APPS;
 import static com.android.launcher3.LauncherState.HINT_STATE;
@@ -45,7 +46,6 @@ import com.android.launcher3.LauncherState;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.Interpolators;
-import com.android.launcher3.graphics.OverviewScrim;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.util.VibratorWrapper;
 import com.android.quickstep.SystemUiProxy;
@@ -128,10 +128,10 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
 
         if (mFromState == NORMAL && mToState == HINT_STATE) {
             mNormalToHintOverviewScrimAnimator = ObjectAnimator.ofFloat(
-                    mLauncher.getDragLayer().getOverviewScrim(),
-                    OverviewScrim.SCRIM_PROGRESS,
-                    mFromState.getOverviewScrimAlpha(mLauncher),
-                    mToState.getOverviewScrimAlpha(mLauncher));
+                    mLauncher.getScrimView(),
+                    VIEW_ALPHA,
+                    mFromState.getWorkspaceScrimAlpha(mLauncher),
+                    mToState.getWorkspaceScrimAlpha(mLauncher));
         }
         mStartedOverview = false;
         mReachedOverview = false;
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
index 61cd13b36c..697516d113 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
@@ -15,6 +15,7 @@
  */
 package com.android.launcher3.uioverrides.touchcontrollers;
 
+import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA;
 import static com.android.launcher3.LauncherAnimUtils.newCancelListener;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
@@ -59,7 +60,6 @@ import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
-import com.android.launcher3.graphics.OverviewScrim;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.touch.BaseSwipeDetector;
 import com.android.launcher3.touch.BothAxesSwipeDetector;
@@ -231,8 +231,8 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
         //   - OverviewScrim
         PendingAnimation xAnim = new PendingAnimation((long) (mXRange * 2));
         xAnim.setFloat(mRecentsView, ADJACENT_PAGE_OFFSET, scaleAndOffset[1], LINEAR);
-        xAnim.setFloat(mLauncher.getDragLayer().getOverviewScrim(), OverviewScrim.SCRIM_PROGRESS,
-                toState.getOverviewScrimAlpha(mLauncher), LINEAR);
+        xAnim.setFloat(mLauncher.getScrimView(), VIEW_ALPHA,
+                toState.getWorkspaceScrimAlpha(mLauncher), LINEAR);
         mXOverviewAnim = xAnim.createPlaybackController();
         mXOverviewAnim.dispatchOnStart();
 
diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java
index 79db842c0d..558230b258 100644
--- a/quickstep/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java
@@ -183,7 +183,6 @@ public final class TaskViewUtils {
         boolean parallaxCenterAndAdjacentTask =
                 taskIndex != recentsView.getCurrentPage() && !(dp.isTablet
                         && FeatureFlags.ENABLE_OVERVIEW_GRID.get());
-        float gridProgress = recentsView.getGridProgress();
         float gridTranslationSecondary = recentsView.getGridTranslationSecondary(taskIndex);
         int startScroll = recentsView.getScrollOffset(taskIndex);
 
@@ -216,7 +215,8 @@ public final class TaskViewUtils {
                     AnimatedFloat.VALUE, tsv.getFullScreenScale(), TOUCH_RESPONSE_INTERPOLATOR);
             out.setFloat(tsv.taskSecondaryTranslation, AnimatedFloat.VALUE, 0,
                     TOUCH_RESPONSE_INTERPOLATOR_ACCEL_DEACCEL);
-            out.setInt(tsv, TaskViewSimulator.SCROLL, 0, TOUCH_RESPONSE_INTERPOLATOR);
+            out.setFloat(tsv.recentsViewScroll, AnimatedFloat.VALUE, 0,
+                    TOUCH_RESPONSE_INTERPOLATOR);
 
             TaskViewSimulator finalTsv = tsv;
             TransformParams finalParams = params;
@@ -374,7 +374,8 @@ public final class TaskViewUtils {
                     AnimatedFloat.VALUE, 1, TOUCH_RESPONSE_INTERPOLATOR);
             out.setFloat(tvs.recentsViewScale,
                     AnimatedFloat.VALUE, tvs.getFullScreenScale(), TOUCH_RESPONSE_INTERPOLATOR);
-            out.setInt(tvs, TaskViewSimulator.SCROLL, 0, TOUCH_RESPONSE_INTERPOLATOR);
+            out.setFloat(tvs.recentsViewScroll,
+                    AnimatedFloat.VALUE, 0, TOUCH_RESPONSE_INTERPOLATOR);
 
             TaskViewSimulator finalTsv = tvs;
             TransformParams finalParams = params;
diff --git a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
index 6757e4c4b8..c12bd9b301 100644
--- a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
+++ b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
@@ -18,7 +18,6 @@ package com.android.quickstep.util;
 import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y;
 import static com.android.launcher3.LauncherState.BACKGROUND_APP;
 import static com.android.launcher3.LauncherState.NORMAL;
-import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_DEPTH_CONTROLLER;
@@ -42,9 +41,7 @@ import com.android.launcher3.R;
 import com.android.launcher3.ShortcutAndWidgetContainer;
 import com.android.launcher3.Workspace;
 import com.android.launcher3.anim.PendingAnimation;
-import com.android.launcher3.anim.PropertySetter;
 import com.android.launcher3.anim.SpringAnimationBuilder;
-import com.android.launcher3.graphics.OverviewScrim;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.util.DynamicResource;
@@ -134,7 +131,8 @@ public class StaggeredWorkspaceAnim {
 
         if (animateOverviewScrim) {
             PendingAnimation pendingAnimation = new PendingAnimation(DURATION_MS);
-            addScrimAnimationForState(launcher, NORMAL, pendingAnimation);
+            launcher.getWorkspace().getStateTransitionAnimation()
+                    .setScrim(pendingAnimation, NORMAL, new StateAnimationConfig());
             mAnimators.play(pendingAnimation.buildAnim());
         }
 
@@ -192,7 +190,8 @@ public class StaggeredWorkspaceAnim {
         launcher.<RecentsView>getOverviewPanel().getScroller().forceFinished(true);
 
         if (animateOverviewScrim) {
-            addScrimAnimationForState(launcher, BACKGROUND_APP, NO_ANIM_PROPERTY_SETTER);
+            launcher.getWorkspace().getStateTransitionAnimation()
+                    .setScrim(NO_ANIM_PROPERTY_SETTER, BACKGROUND_APP, config);
         }
     }
 
@@ -263,16 +262,6 @@ public class StaggeredWorkspaceAnim {
         mAnimators.play(alpha);
     }
 
-    private void addScrimAnimationForState(Launcher launcher, LauncherState state,
-            PropertySetter setter) {
-        launcher.getWorkspace().getStateTransitionAnimation().setScrim(setter, state);
-        setter.setFloat(
-                launcher.getDragLayer().getOverviewScrim(),
-                OverviewScrim.SCRIM_PROGRESS,
-                state.getOverviewScrimAlpha(launcher),
-                ACCEL_DEACCEL);
-    }
-
     private void addDepthAnimationForState(Launcher launcher, LauncherState state, long duration) {
         if (!(launcher instanceof BaseQuickstepLauncher)) {
             return;
diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index 3c8a12c876..e63f8bbea8 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -30,17 +30,14 @@ import android.graphics.Point;
 import android.graphics.PointF;
 import android.graphics.Rect;
 import android.graphics.RectF;
-import android.util.IntProperty;
 
 import androidx.annotation.NonNull;
 
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.PendingAnimation;
-import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.quickstep.AnimatedFloat;
 import com.android.quickstep.BaseActivityInterface;
-import com.android.quickstep.views.RecentsView.ScrollState;
 import com.android.quickstep.views.TaskThumbnailView.PreviewPositionHelper;
 import com.android.quickstep.views.TaskView.FullscreenDrawParams;
 import com.android.systemui.shared.recents.model.ThumbnailData;
@@ -52,19 +49,6 @@ import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.
  */
 public class TaskViewSimulator implements TransformParams.BuilderProxy {
 
-    public static final IntProperty<TaskViewSimulator> SCROLL =
-            new IntProperty<TaskViewSimulator>("scroll") {
-                @Override
-                public void setValue(TaskViewSimulator simulator, int scroll) {
-                    simulator.setScroll(scroll);
-                }
-
-                @Override
-                public Integer get(TaskViewSimulator simulator) {
-                    return simulator.mScrollState.scroll;
-                }
-            };
-
     private final Rect mTmpCropRect = new Rect();
     private final RectF mTempRectF = new RectF();
     private final float[] mTempPoint = new float[2];
@@ -101,11 +85,10 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
     public final AnimatedFloat fullScreenProgress = new AnimatedFloat();
     public final AnimatedFloat recentsViewSecondaryTranslation = new AnimatedFloat();
     public final AnimatedFloat recentsViewPrimaryTranslation = new AnimatedFloat();
-    private final ScrollState mScrollState = new ScrollState();
+    public final AnimatedFloat recentsViewScroll = new AnimatedFloat();
 
     // Cached calculations
     private boolean mLayoutValid = false;
-    private boolean mScrollValid = false;
     private int mOrientationStateId;
 
     public TaskViewSimulator(Context context, BaseActivityInterface sizeStrategy) {
@@ -172,11 +155,8 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
     /**
      * Updates the scroll for RecentsView
      */
-    public void setScroll(int scroll) {
-        if (mScrollState.scroll != scroll) {
-            mScrollState.scroll = scroll;
-            mScrollValid = false;
-        }
+    public void setScroll(float scroll) {
+        recentsViewScroll.value = scroll;
     }
 
     public void setDrawsBelowRecents(boolean drawsBelowRecents) {
@@ -268,20 +248,6 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
                     mTaskRect.width(), mTaskRect.height(),
                     mDp, mOrientationState.getRecentsActivityRotation(), isRtlEnabled);
             mPositionHelper.getMatrix().invert(mInversePositionMatrix);
-
-            PagedOrientationHandler poh = mOrientationState.getOrientationHandler();
-            mScrollState.halfPageSize =
-                    poh.getPrimaryValue(mTaskRect.width(), mTaskRect.height()) / 2;
-            mScrollState.halfScreenSize = poh.getPrimaryValue(mDp.widthPx, mDp.heightPx) / 2;
-            mScrollValid = false;
-        }
-
-        if (!mScrollValid) {
-            mScrollValid = true;
-            int start = mOrientationState.getOrientationHandler()
-                    .getPrimaryValue(mTaskRect.left, mTaskRect.top);
-            mScrollState.screenCenter = start + mScrollState.scroll + mScrollState.halfPageSize;
-            mScrollState.updateInterpolation(mDp, start);
         }
 
         float fullScreenProgress = Utilities.boundToRange(this.fullScreenProgress.value, 0, 1);
@@ -306,7 +272,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
         mOrientationState.getOrientationHandler().setSecondary(mMatrix, MATRIX_POST_TRANSLATE,
                 taskSecondaryTranslation.value);
         mOrientationState.getOrientationHandler().set(
-                mMatrix, MATRIX_POST_TRANSLATE, mScrollState.scroll);
+                mMatrix, MATRIX_POST_TRANSLATE, recentsViewScroll.value);
 
         // Apply RecentsView matrix
         mMatrix.postScale(recentsViewScale.value, recentsViewScale.value, mPivot.x, mPivot.y);
diff --git a/quickstep/src/com/android/quickstep/views/AllAppsScrimView.java b/quickstep/src/com/android/quickstep/views/AllAppsScrimView.java
deleted file mode 100644
index 185080e51d..0000000000
--- a/quickstep/src/com/android/quickstep/views/AllAppsScrimView.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.quickstep.views;
-
-import static com.android.launcher3.LauncherState.OVERVIEW;
-import static com.android.launcher3.anim.Interpolators.ACCEL;
-import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.util.AttributeSet;
-import android.view.animation.Interpolator;
-
-import androidx.core.graphics.ColorUtils;
-
-import com.android.launcher3.BaseQuickstepLauncher;
-import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.Utilities;
-import com.android.launcher3.anim.Interpolators;
-import com.android.launcher3.util.Themes;
-import com.android.launcher3.views.ScrimView;
-
-/**
- * Scrim used for all-apps background. uses interpolator to coordinate fade in with
- * all-apps contents
- *
- * Note: ranges are inverted because progress goes from 1 to 0 for NORMAL->AllAPPS
- */
-public class AllAppsScrimView extends ScrimView<BaseQuickstepLauncher> {
-
-    private static final float TINT_DECAY_MULTIPLIER = .5f;
-
-    //min progress for scrim to become visible
-    private static final float SCRIM_VISIBLE_THRESHOLD = .9f;
-    //max progress where scrim alpha animates.
-    private static final float SCRIM_SOLID_THRESHOLD = .5f;
-    private final Interpolator mScrimInterpolator = Interpolators.clampToProgress(ACCEL,
-            SCRIM_SOLID_THRESHOLD,
-            SCRIM_VISIBLE_THRESHOLD);
-
-    // In transposed layout, we simply draw a flat color.
-    private boolean mDrawingFlatColor;
-
-    private final int mEndAlpha;
-    private final Paint mPaint;
-
-    private int mCurrentScrimColor;
-    private final int mTintColor;
-
-    public AllAppsScrimView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        mMaxScrimAlpha = Math.round(OVERVIEW.getOverviewScrimAlpha(mLauncher) * 255);
-        mTintColor = Themes.getColorAccent(mContext);
-
-
-        mEndAlpha = Color.alpha(mEndScrim);
-        mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-
-        // Just assume the easiest UI for now, until we have the proper layout information.
-        mDrawingFlatColor = true;
-    }
-
-    @Override
-    public void reInitUi() {
-        DeviceProfile dp = mLauncher.getDeviceProfile();
-        mDrawingFlatColor = dp.isVerticalBarLayout();
-        updateColors();
-        updateSysUiColors();
-        invalidate();
-    }
-
-    @Override
-    public void updateColors() {
-        super.updateColors();
-        if (mDrawingFlatColor) {
-            return;
-        }
-
-        if (mProgress >= 1) {
-            mCurrentScrimColor = 0;
-        } else {
-            float interpolationProgress = mScrimInterpolator.getInterpolation(mProgress);
-            // Note that these ranges and interpolators are inverted because progress goes 1 to 0.
-            int alpha = Math.round(Utilities.mapRange(interpolationProgress, mEndAlpha, 0));
-            int color = ColorUtils.blendARGB(mEndScrim, mTintColor,
-                    mProgress * TINT_DECAY_MULTIPLIER);
-            mCurrentScrimColor = setColorAlphaBound(color, alpha);
-        }
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        if (mDrawingFlatColor) {
-            if (mCurrentFlatColor != 0) {
-                canvas.drawColor(mCurrentFlatColor);
-            }
-            return;
-        }
-
-        if (Color.alpha(mCurrentScrimColor) == 0) {
-            return;
-        } else if (mProgress <= 0) {
-            canvas.drawColor(mCurrentScrimColor);
-            return;
-        }
-
-        mPaint.setColor(mCurrentScrimColor);
-        canvas.drawRect(0, 0, getWidth(), getHeight(), mPaint);
-    }
-}
diff --git a/quickstep/src/com/android/quickstep/views/ClearAllButton.java b/quickstep/src/com/android/quickstep/views/ClearAllButton.java
index d616f7c7a5..4300329671 100644
--- a/quickstep/src/com/android/quickstep/views/ClearAllButton.java
+++ b/quickstep/src/com/android/quickstep/views/ClearAllButton.java
@@ -23,10 +23,8 @@ import android.widget.Button;
 
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.touch.PagedOrientationHandler;
-import com.android.quickstep.views.RecentsView.PageCallbacks;
-import com.android.quickstep.views.RecentsView.ScrollState;
 
-public class ClearAllButton extends Button implements PageCallbacks {
+public class ClearAllButton extends Button {
 
     public static final FloatProperty<ClearAllButton> VISIBILITY_ALPHA =
             new FloatProperty<ClearAllButton>("visibilityAlpha") {
@@ -99,8 +97,7 @@ public class ClearAllButton extends Button implements PageCallbacks {
         }
     }
 
-    @Override
-    public void onPageScroll(ScrollState scrollState, boolean gridEnabled) {
+    public void onRecentsViewScroll(int scrollFromEdge, boolean gridEnabled) {
         RecentsView recentsView = getRecentsView();
         if (recentsView == null) {
             return;
@@ -113,7 +110,7 @@ public class ClearAllButton extends Button implements PageCallbacks {
         }
 
         int leftEdgeScroll = recentsView.getLeftMostChildScroll();
-        float adjustedScrollFromEdge = scrollState.scrollFromEdge - leftEdgeScroll;
+        int adjustedScrollFromEdge = scrollFromEdge - leftEdgeScroll;
         float shift = Math.min(adjustedScrollFromEdge, orientationSize);
         mNormalTranslationPrimary = mIsRtl ? -shift : shift;
         if (!gridEnabled) {
diff --git a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
index deb674c4a0..7c8041c992 100644
--- a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
+++ b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
@@ -72,7 +72,6 @@ public final class DigitalWellBeingToast {
     private View mBanner;
     private ViewOutlineProvider mOldBannerOutlineProvider;
     private float mBannerOffsetPercentage;
-    private float mBannerAlpha = 1f;
     private float mVerticalOffset = 0f;
 
     public DigitalWellBeingToast(BaseDraggingActivity activity, TaskView taskView) {
@@ -99,10 +98,6 @@ public final class DigitalWellBeingToast {
 
         mTaskView.setContentDescription(
                 getContentDescriptionForTask(mTask, appUsageLimitTimeMs, appRemainingTimeMs));
-        RecentsView rv = mTaskView.getRecentsView();
-        if (rv != null) {
-            rv.onDigitalWellbeingToastShown();
-        }
     }
 
     public String getText() {
@@ -268,7 +263,6 @@ public final class DigitalWellBeingToast {
         layoutParams.bottomMargin = ((ViewGroup.MarginLayoutParams)
                 mTaskView.getThumbnail().getLayoutParams()).bottomMargin;
         mBanner.setTranslationY(mBannerOffsetPercentage * mBanner.getHeight());
-        mBanner.setAlpha(mBannerAlpha);
         mTaskView.addView(mBanner);
     }
 
@@ -293,18 +287,11 @@ public final class DigitalWellBeingToast {
         }
     }
 
-    void updateBannerAlpha(float alpha) {
-        if (mBanner != null && mBannerAlpha != alpha) {
-            mBannerAlpha = alpha;
-            mBanner.setAlpha(alpha);
-        }
-    }
-
     void setBannerColorTint(int color, float amount) {
         if (mBanner == null) {
             return;
         }
-        if (mBannerAlpha == 0 || amount == 0) {
+        if (amount == 0) {
             mBanner.setLayerType(View.LAYER_TYPE_NONE, null);
         }
         Paint layerPaint = new Paint();
diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
index 896d1ae58d..f5a8ff8170 100644
--- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
@@ -149,9 +149,10 @@ public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher, Laun
     }
 
     @Override
-    protected boolean shouldStealTouchFromSiblingsBelow(MotionEvent ev) {
-        return mActivity.getStateManager().getState().overviewUi
-                && super.shouldStealTouchFromSiblingsBelow(ev);
+    public boolean onTouchEvent(MotionEvent ev) {
+        boolean result = super.onTouchEvent(ev);
+        // Do not let touch escape to siblings below this view.
+        return result || mActivity.getStateManager().getState().overviewUi;
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/views/RecentsExtraViewContainer.java b/quickstep/src/com/android/quickstep/views/RecentsExtraViewContainer.java
index 1ea6d4a245..16bc3bc533 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsExtraViewContainer.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsExtraViewContainer.java
@@ -23,7 +23,7 @@ import android.widget.FrameLayout;
 /**
  * Empty view to house recents overview extra card
  */
-public class RecentsExtraViewContainer extends FrameLayout implements RecentsView.PageCallbacks {
+public class RecentsExtraViewContainer extends FrameLayout {
 
     private boolean mScrollable = false;
 
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 3c171fed8c..1a866800f7 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -20,6 +20,8 @@ import static android.view.Surface.ROTATION_0;
 import static android.view.View.MeasureSpec.EXACTLY;
 import static android.view.View.MeasureSpec.makeMeasureSpec;
 
+import static com.android.launcher3.AbstractFloatingView.TYPE_TASK_MENU;
+import static com.android.launcher3.AbstractFloatingView.getTopOpenViewWithType;
 import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS;
 import static com.android.launcher3.InvariantDeviceProfile.CHANGE_FLAG_ICON_PARAMS;
 import static com.android.launcher3.LauncherAnimUtils.SUCCESS_TRANSITION_PROGRESS;
@@ -114,7 +116,6 @@ import com.android.launcher3.statemanager.BaseState;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.PagedOrientationHandler;
-import com.android.launcher3.touch.PagedOrientationHandler.CurveProperties;
 import com.android.launcher3.util.DynamicResource;
 import com.android.launcher3.util.IntSet;
 import com.android.launcher3.util.MultiValueAlpha;
@@ -167,8 +168,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         InvariantDeviceProfile.OnIDPChangeListener, TaskVisualsChangeListener,
         SplitScreenBounds.OnChangeListener {
 
-    private static final String TAG = RecentsView.class.getSimpleName();
-
     public static final FloatProperty<RecentsView> CONTENT_ALPHA =
             new FloatProperty<RecentsView>("contentAlpha") {
                 @Override
@@ -332,7 +331,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
      */
     private boolean mGestureActive;
 
-    private final ScrollState mScrollState = new ScrollState();
     // Keeps track of the previously known visible tasks for purposes of loading/unloading task data
     private final SparseBooleanArray mHasVisibleTaskData = new SparseBooleanArray();
 
@@ -342,7 +340,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
 
     private final TaskOverlayFactory mTaskOverlayFactory;
 
-    private boolean mDwbToastShown;
     protected boolean mDisallowScrollToClearAll;
     private boolean mOverlayEnabled;
     protected boolean mFreezeViewVisibility;
@@ -865,12 +862,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         }
     }
 
-    public void onDigitalWellbeingToastShown() {
-        if (!mDwbToastShown) {
-            mDwbToastShown = true;
-        }
-    }
-
     /**
      * Whether the Clear All button is hidden or fully visible. Used to determine if center
      * displayed page is a task or the Clear All button.
@@ -963,9 +954,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 break;
         }
 
-
-        // Do not let touch escape to siblings below this view.
-        return isHandlingTouch() || shouldStealTouchFromSiblingsBelow(ev);
+        return isHandlingTouch();
     }
 
     @Override
@@ -980,9 +969,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             super.determineScrollingStart(ev, touchSlopScale);
         }
     }
-    protected boolean shouldStealTouchFromSiblingsBelow(MotionEvent ev) {
-        return true;
-    }
 
     protected void applyLoadPlan(ArrayList<Task> tasks) {
         if (TestProtocol.sDebugTracing) {
@@ -1334,17 +1320,9 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         if (getPageCount() == 0 || getPageAt(0).getMeasuredWidth() == 0) {
             return;
         }
-        mOrientationHandler.getCurveProperties(this, mInsets, mScrollState);
-        mScrollState.scrollFromEdge =
-                mIsRtl ? mScrollState.scroll : (mMaxScroll - mScrollState.scroll);
-
-        final int pageCount = getPageCount();
-        for (int i = 0; i < pageCount; i++) {
-            View page = getPageAt(i);
-            mScrollState.updateInterpolation(mActivity.getDeviceProfile(),
-                    mOrientationHandler.getChildStartWithTranslation(page));
-            ((PageCallbacks) page).onPageScroll(mScrollState, mOverviewGridEnabled);
-        }
+        int scroll = mOrientationHandler.getPrimaryScroll(this);
+        int scrollFromEdge = mIsRtl ? scroll : (mMaxScroll - scroll);
+        mClearAllButton.onRecentsViewScroll(scrollFromEdge, mOverviewGridEnabled);
     }
 
     @Override
@@ -1485,7 +1463,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
 
         unloadVisibleTaskData(TaskView.FLAG_UPDATE_ALL);
         setCurrentPage(0);
-        mDwbToastShown = false;
         mActivity.getSystemUiController().updateUiState(UI_STATE_OVERVIEW, 0);
         LayoutUtils.setViewEnabled(mActionsView, true);
         if (mOrientationState.setGestureActive(false)) {
@@ -1600,6 +1577,10 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         for (int i = 0; i < getTaskViewCount(); i++) {
             getTaskViewAt(i).setOrientationState(mOrientationState);
         }
+        TaskMenuView tv = (TaskMenuView) getTopOpenViewWithType(mActivity, TYPE_TASK_MENU);
+        if (tv != null) {
+            tv.onRotationChanged();
+        }
     }
 
     /**
@@ -1952,7 +1933,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                     // When the unpinned task is added, snap to first page and disable transitions
                     if (view instanceof TaskView) {
                         snapToPage(0);
-                        disableLayoutTransitions();
+                        setLayoutTransition(null);
                     }
 
                 }
@@ -1961,10 +1942,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         setLayoutTransition(mLayoutTransition);
     }
 
-    private void disableLayoutTransitions() {
-        setLayoutTransition(null);
-    }
-
     public void setSwipeDownShouldLaunchApp(boolean swipeDownShouldLaunchApp) {
         mSwipeDownShouldLaunchApp = swipeDownShouldLaunchApp;
     }
@@ -1973,44 +1950,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         return mSwipeDownShouldLaunchApp;
     }
 
-    public interface PageCallbacks {
-
-        /**
-         * Updates the page UI based on scroll params.
-         *
-         * @param gridEnabled whether Overveiw is currently showing as 2 rows grid
-         */
-        default void onPageScroll(ScrollState scrollState, boolean gridEnabled) {}
-    }
-
-    public static class ScrollState extends CurveProperties {
-
-        /**
-         * The progress from 0 to 1, where 0 is the center
-         * of the screen and 1 is the edge of the screen.
-         */
-        public float linearInterpolation;
-
-        /**
-         * The amount by which all the content is scrolled relative to the end of the list.
-         */
-        public float scrollFromEdge;
-
-        /**
-         * Updates linearInterpolation for the provided child position
-         */
-        public void updateInterpolation(DeviceProfile deviceProfile, float childStart) {
-            float pageCenter = childStart + halfPageSize;
-            float distanceFromScreenCenter = screenCenter - pageCenter;
-            // How far the page has to move from the center to be offscreen, taking into account
-            // the EDGE_SCALE_DOWN_FACTOR that will be applied at that position.
-            float distanceToReachEdge = halfScreenSize
-                    + halfPageSize * (1 - TaskView.getEdgeScaleDownFactor(deviceProfile));
-            linearInterpolation = Math.min(1,
-                    Math.abs(distanceFromScreenCenter) / distanceToReachEdge);
-        }
-    }
-
     public void setIgnoreResetTask(int taskId) {
         mIgnoreResetTaskId = taskId;
     }
@@ -2547,9 +2486,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         mTempRectF.set(mLastComputedTaskSize);
         RectF taskPosition = mTempRectF;
         float desiredLeft = getWidth();
-        float distanceToOffscreen = desiredLeft - taskPosition.left;
         // Used to calculate the scale of the task view based on its new offset.
-        float centerToOffscreenProgress = Math.abs(offsetProgress);
         if (midpointIndex > -1) {
             // When there is a midpoint reference task, adjacent tasks have less distance to travel
             // to reach offscreen. Offset the task position to the task's starting point.
@@ -2559,10 +2496,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                     - mOrientationHandler.getChildStart(midpointChild)
                     + getDisplacementFromScreenCenter(midpointIndex));
             taskPosition.offset(distanceFromMidpoint, 0);
-            centerToOffscreenProgress = Utilities.mapRange(centerToOffscreenProgress,
-                    distanceFromMidpoint / distanceToOffscreen, 1);
         }
-        distanceToOffscreen = desiredLeft - taskPosition.left;
+        float distanceToOffscreen = desiredLeft - taskPosition.left;
         // Finally, we need to account for RecentsView scale, because it moves tasks based on its
         // pivot. To do this, we move the task position to where it would be offscreen at scale = 1
         // (computed above), then we apply the scale via getMatrix() to determine how much that
@@ -3169,15 +3104,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 taskView.getGridTranslationY());
     }
 
-    /**
-     * Returns the progress of forming a grid from carousel.
-     *
-     * @return A float from 0 to 1 where 0 is a carousel and 1 is a 2 row grid.
-     */
-    public float getGridProgress() {
-        return mGridProgress;
-    }
-
     public Consumer<MotionEvent> getEventDispatcher(float navbarRotation) {
         float degreesRotated;
         if (navbarRotation == 0) {
diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
index 0b84bc92a1..658d71daf9 100644
--- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
@@ -31,6 +31,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
+import android.view.ViewTreeObserver.OnScrollChangedListener;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -51,7 +52,7 @@ import com.android.quickstep.util.TaskCornerRadius;
 /**
  * Contains options for a recent task when long-pressing its icon.
  */
-public class TaskMenuView extends AbstractFloatingView {
+public class TaskMenuView extends AbstractFloatingView implements OnScrollChangedListener {
 
     private static final Rect sTempRect = new Rect();
 
@@ -120,7 +121,8 @@ public class TaskMenuView extends AbstractFloatingView {
         };
     }
 
-    public void setPosition(float x, float y, PagedOrientationHandler pagedOrientationHandler) {
+    private void setPosition(float x, float y) {
+        PagedOrientationHandler pagedOrientationHandler = mTaskView.getPagedOrientationHandler();
         int taskTopMargin = mActivity.getDeviceProfile().overviewTaskThumbnailTopMarginPx;
         float adjustedY = y + taskTopMargin;
         // Changing pivot to make computations easier
@@ -150,11 +152,11 @@ public class TaskMenuView extends AbstractFloatingView {
         }
     }
 
-    public static TaskMenuView showForTask(TaskView taskView) {
+    public static boolean showForTask(TaskView taskView) {
         BaseDraggingActivity activity = BaseDraggingActivity.fromContext(taskView.getContext());
         final TaskMenuView taskMenuView = (TaskMenuView) activity.getLayoutInflater().inflate(
                         R.layout.task_menu, activity.getDragLayer(), false);
-        return taskMenuView.populateAndShowForTask(taskView) ? taskMenuView : null;
+        return taskMenuView.populateAndShowForTask(taskView);
     }
 
     private boolean populateAndShowForTask(TaskView taskView) {
@@ -167,9 +169,16 @@ public class TaskMenuView extends AbstractFloatingView {
             return false;
         }
         post(this::animateOpen);
+        mActivity.getRootView().getViewTreeObserver().addOnScrollChangedListener(this);
         return true;
     }
 
+    @Override
+    public void onScrollChanged() {
+        RecentsView rv = mTaskView.getRecentsView();
+        setPosition(mTaskView.getX() - rv.getScrollX(), mTaskView.getY() - rv.getScrollY());
+    }
+
     /** @return true if successfully able to populate task view menu, false otherwise */
     private boolean populateAndLayoutMenu() {
         if (mTaskView.getTask().icon == null) {
@@ -227,8 +236,7 @@ public class TaskMenuView extends AbstractFloatingView {
             .mOrientationState.isRecentsActivityRotationAllowed();
         mOptionLayout.setOrientation(orientationHandler
                 .getTaskMenuLayoutOrientation(canActivityRotate, mOptionLayout));
-        setPosition(sTempRect.left - insets.left, sTempRect.top - insets.top,
-            taskView.getPagedOrientationHandler());
+        setPosition(sTempRect.left - insets.left, sTempRect.top - insets.top);
     }
 
     private void animateOpen() {
@@ -274,6 +282,7 @@ public class TaskMenuView extends AbstractFloatingView {
     private void closeComplete() {
         mIsOpen = false;
         mActivity.getDragLayer().removeView(this);
+        mActivity.getRootView().getViewTreeObserver().removeOnScrollChangedListener(this);
     }
 
     private RoundedRectRevealOutlineProvider createOpenCloseOutlineProvider() {
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index e78406fa25..b87d2bfbd1 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -27,6 +27,7 @@ import static android.view.Surface.ROTATION_270;
 import static android.view.Surface.ROTATION_90;
 import static android.widget.Toast.LENGTH_SHORT;
 
+import static com.android.launcher3.AbstractFloatingView.TYPE_TASK_MENU;
 import static com.android.launcher3.LauncherState.OVERVIEW_SPLIT_SELECT;
 import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DURATION;
 import static com.android.launcher3.Utilities.comp;
@@ -72,6 +73,7 @@ import android.widget.Toast;
 import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
 
+import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.R;
@@ -102,8 +104,6 @@ import com.android.quickstep.TaskViewUtils;
 import com.android.quickstep.util.CancellableTask;
 import com.android.quickstep.util.RecentsOrientedState;
 import com.android.quickstep.util.TaskCornerRadius;
-import com.android.quickstep.views.RecentsView.PageCallbacks;
-import com.android.quickstep.views.RecentsView.ScrollState;
 import com.android.quickstep.views.TaskThumbnailView.PreviewPositionHelper;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
@@ -118,7 +118,7 @@ import java.util.function.Consumer;
 /**
  * A task in the Recents view.
  */
-public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
+public class TaskView extends FrameLayout implements Reusable {
 
     private static final String TAG = TaskView.class.getSimpleName();
 
@@ -265,26 +265,10 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
                 }
             };
 
-    private final OnAttachStateChangeListener mTaskMenuStateListener =
-            new OnAttachStateChangeListener() {
-                @Override
-                public void onViewAttachedToWindow(View view) {
-                }
-
-                @Override
-                public void onViewDetachedFromWindow(View view) {
-                    if (mMenuView != null) {
-                        mMenuView.removeOnAttachStateChangeListener(this);
-                        mMenuView = null;
-                    }
-                }
-            };
-
     private final TaskOutlineProvider mOutlineProvider;
 
     private Task mTask;
     private TaskThumbnailView mSnapshotView;
-    private TaskMenuView mMenuView;
     private IconView mIconView;
     private final DigitalWellBeingToast mDigitalWellBeingToast;
     private float mFullscreenProgress;
@@ -487,10 +471,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
                         + mCurrentFullscreenParams.mCurrentDrawnInsets.bottom);
     }
 
-    public TaskMenuView getMenuView() {
-        return mMenuView;
-    }
-
     public DigitalWellBeingToast getDigitalWellBeingToast() {
         return mDigitalWellBeingToast;
     }
@@ -662,15 +642,12 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
 
         if (!getRecentsView().isClearAllHidden()) {
             getRecentsView().snapToPage(getRecentsView().indexOfChild(this));
+            return false;
         } else {
-            mMenuView = TaskMenuView.showForTask(this);
             mActivity.getStatsLogManager().logger().withItemInfo(getItemInfo())
                     .log(LAUNCHER_TASK_ICON_TAP_OR_LONGPRESS);
-            if (mMenuView != null) {
-                mMenuView.addOnAttachStateChangeListener(mTaskMenuStateListener);
-            }
+            return TaskMenuView.showForTask(this);
         }
-        return mMenuView != null;
     }
 
     private void setIcon(Drawable icon) {
@@ -729,10 +706,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         mIconView.setRotation(orientationHandler.getDegreesRotated());
         snapshotParams.topMargin = deviceProfile.overviewTaskThumbnailTopMarginPx;
         mSnapshotView.setLayoutParams(snapshotParams);
-
-        if (mMenuView != null) {
-            mMenuView.onRotationChanged();
-        }
     }
 
     private void setIconAndDimTransitionProgress(float progress, boolean invert) {
@@ -817,27 +790,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         onTaskListVisibilityChanged(false);
     }
 
-    @Override
-    public void onPageScroll(ScrollState scrollState, boolean gridEnabled) {
-        // Don't do anything if it's modal.
-        if (mModalness > 0) {
-            return;
-        }
-
-        float dwbBannerAlpha = Utilities.boundToRange(1.0f - 2 * scrollState.linearInterpolation,
-                0f, 1f);
-        mDigitalWellBeingToast.updateBannerAlpha(dwbBannerAlpha);
-
-        if (mMenuView != null) {
-            PagedOrientationHandler pagedOrientationHandler = getPagedOrientationHandler();
-            RecentsView recentsView = getRecentsView();
-            mMenuView.setPosition(getX() - recentsView.getScrollX(),
-                    getY() - recentsView.getScrollY(), pagedOrientationHandler);
-            mMenuView.setScaleX(getScaleX());
-            mMenuView.setScaleY(getScaleY());
-        }
-    }
-
     /**
      * Sets the contextual chip.
      *
@@ -1337,9 +1289,8 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
     }
 
     public void initiateSplitSelect(SplitPositionOption splitPositionOption) {
-        RecentsView rv = getRecentsView();
-        getMenuView().close(false);
-        rv.initiateSplitSelect(this, splitPositionOption);
+        AbstractFloatingView.closeOpenViews(mActivity, false, TYPE_TASK_MENU);
+        getRecentsView().initiateSplitSelect(this, splitPositionOption);
     }
 
     private void setColorTint(float amount) {
diff --git a/res/layout/launcher.xml b/res/layout/launcher.xml
index 8451b77bc0..f34e68588b 100644
--- a/res/layout/launcher.xml
+++ b/res/layout/launcher.xml
@@ -62,9 +62,12 @@
             android:id="@+id/drop_target_bar"
             layout="@layout/drop_target_bar" />
 
-        <include
+        <com.android.launcher3.views.ScrimView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:id="@+id/scrim_view"
-            layout="@layout/scrim_view" />
+            android:background="?attr/allAppsScrimColor"
+            android:alpha="0" />
 
         <include
             android:id="@+id/apps_view"
diff --git a/res/layout/scrim_view.xml b/res/layout/scrim_view.xml
deleted file mode 100644
index a604d569de..0000000000
--- a/res/layout/scrim_view.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.launcher3.views.ScrimView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/scrim_view" />
\ No newline at end of file
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index df5f953350..50915439da 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1191,8 +1191,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
         // Setup the drag controller (drop targets have to be added in reverse order in priority)
         mDropTargetBar.setup(mDragController);
-
-        mAllAppsController.setupViews(mAppsView, mScrimView);
+        mAllAppsController.setupViews(mAppsView);
     }
 
     /**
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java
index 100395866a..0c509a112a 100644
--- a/src/com/android/launcher3/LauncherState.java
+++ b/src/com/android/launcher3/LauncherState.java
@@ -209,11 +209,11 @@ public abstract class LauncherState implements BaseState<LauncherState> {
         return 1f;
     }
 
-    public float getWorkspaceScrimAlpha(Launcher launcher) {
+    public float getWorkspaceBackgroundAlpha(Launcher launcher) {
         return 0;
     }
 
-    public float getOverviewScrimAlpha(Launcher launcher) {
+    public float getWorkspaceScrimAlpha(Launcher launcher) {
         return 0;
     }
 
diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
index e0a4d4a5c6..24de19f20e 100644
--- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
+++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
@@ -38,6 +38,7 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_SCA
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_TRANSLATE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_SCALE;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_SCRIM_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_TRANSLATE;
 
 import android.animation.ValueAnimator;
@@ -150,7 +151,7 @@ public class WorkspaceStateTransitionAnimation {
         propertySetter.setFloat(mWorkspace.getPageIndicator(), VIEW_TRANSLATE_Y,
                 hotseatScaleAndTranslation.translationY, hotseatTranslationInterpolator);
 
-        setScrim(propertySetter, state);
+        setScrim(propertySetter, state, config);
     }
 
     /**
@@ -165,14 +166,19 @@ public class WorkspaceStateTransitionAnimation {
                 - sibling.getLeft() - sibling.getTranslationX());
     }
 
-    public void setScrim(PropertySetter propertySetter, LauncherState state) {
+    public void setScrim(PropertySetter propertySetter, LauncherState state,
+            StateAnimationConfig config) {
         WorkspaceDragScrim workspaceDragScrim = mLauncher.getDragLayer().getWorkspaceDragScrim();
         propertySetter.setFloat(workspaceDragScrim, SCRIM_PROGRESS,
-                state.getWorkspaceScrimAlpha(mLauncher), LINEAR);
+                state.getWorkspaceBackgroundAlpha(mLauncher), LINEAR);
 
         SysUiScrim sysUiScrim = mLauncher.getDragLayer().getSysUiScrim();
         propertySetter.setFloat(sysUiScrim, SYSUI_PROGRESS,
                 state.hasFlag(FLAG_HAS_SYS_UI_SCRIM) ? 1 : 0, LINEAR);
+
+        propertySetter.setViewAlpha(mLauncher.getScrimView(),
+                state.getWorkspaceScrimAlpha(mLauncher),
+                config.getInterpolator(ANIM_WORKSPACE_SCRIM_FADE, LINEAR));
     }
 
     public void applyChildState(LauncherState state, CellLayout cl, int childIndex) {
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index c21d7745ca..0060b83673 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -43,7 +43,6 @@ import com.android.launcher3.anim.PropertySetter;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
 import com.android.launcher3.states.StateAnimationConfig;
-import com.android.launcher3.views.ScrimView;
 
 /**
  * Handles AllApps view transition.
@@ -72,10 +71,7 @@ public class AllAppsTransitionController
                 }
             };
 
-    private static final int APPS_VIEW_ALPHA_CHANNEL_INDEX = 0;
-
     private AllAppsContainerView mAppsView;
-    private ScrimView mScrimView;
 
     private final Launcher mLauncher;
     private boolean mIsVerticalLayout;
@@ -125,8 +121,6 @@ public class AllAppsTransitionController
      */
     public void setProgress(float progress) {
         mProgress = progress;
-
-        mScrimView.setProgress(progress);
         mAppsView.setTranslationY(mProgress * mShiftRange);
     }
 
@@ -191,9 +185,8 @@ public class AllAppsTransitionController
         return AnimationSuccessListener.forRunnable(this::onProgressAnimationEnd);
     }
 
-    public void setupViews(AllAppsContainerView appsView, ScrimView scrimView) {
+    public void setupViews(AllAppsContainerView appsView) {
         mAppsView = appsView;
-        mScrimView = scrimView;
         if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && Utilities.ATLEAST_R) {
             mLauncher.getSystemUiController().updateUiState(UI_STATE_ALLAPPS,
                     View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
@@ -207,10 +200,6 @@ public class AllAppsTransitionController
     void setScrollRangeDelta(float delta) {
         mScrollRangeDelta = delta;
         mShiftRange = mLauncher.getDeviceProfile().heightPx - mScrollRangeDelta;
-
-        if (mScrimView != null) {
-            mScrimView.reInitUi();
-        }
     }
 
     /**
diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java
index 419c3f1a69..c80fd90537 100644
--- a/src/com/android/launcher3/dragndrop/DragLayer.java
+++ b/src/com/android/launcher3/dragndrop/DragLayer.java
@@ -46,7 +46,6 @@ import com.android.launcher3.R;
 import com.android.launcher3.ShortcutAndWidgetContainer;
 import com.android.launcher3.Workspace;
 import com.android.launcher3.folder.Folder;
-import com.android.launcher3.graphics.OverviewScrim;
 import com.android.launcher3.graphics.SysUiScrim;
 import com.android.launcher3.graphics.WorkspaceDragScrim;
 import com.android.launcher3.keyboard.ViewGroupFocusHelper;
@@ -84,7 +83,6 @@ public class DragLayer extends BaseDragLayer<Launcher> {
 
     // Related to adjacent page hints
     private final ViewGroupFocusHelper mFocusIndicatorHelper;
-    private final OverviewScrim mOverviewScrim;
     private WorkspaceDragScrim mWorkspaceDragScrim;
     private SysUiScrim mSysUiScrim;
     private LauncherRootView mRootView;
@@ -103,15 +101,12 @@ public class DragLayer extends BaseDragLayer<Launcher> {
         setChildrenDrawingOrderEnabled(true);
 
         mFocusIndicatorHelper = new ViewGroupFocusHelper(this);
-        mOverviewScrim = new OverviewScrim(this);
     }
 
     public void setup(DragController dragController, Workspace workspace) {
         mDragController = dragController;
         recreateControllers();
 
-        mOverviewScrim.setup();
-
         mWorkspaceDragScrim = new WorkspaceDragScrim((this));
         mWorkspaceDragScrim.setWorkspace(workspace);
 
@@ -529,20 +524,8 @@ public class DragLayer extends BaseDragLayer<Launcher> {
     protected void dispatchDraw(Canvas canvas) {
         // Draw the background below children.
         mWorkspaceDragScrim.draw(canvas);
-        mOverviewScrim.updateCurrentScrimmedView(this);
         mFocusIndicatorHelper.draw(canvas);
         super.dispatchDraw(canvas);
-        if (mOverviewScrim.getScrimmedView() == null) {
-            mOverviewScrim.draw(canvas);
-        }
-    }
-
-    @Override
-    protected boolean drawChild(Canvas canvas, View child, long drawingTime) {
-        if (child == mOverviewScrim.getScrimmedView()) {
-            mOverviewScrim.draw(canvas);
-        }
-        return super.drawChild(canvas, child, drawingTime);
     }
 
     @Override
@@ -564,8 +547,4 @@ public class DragLayer extends BaseDragLayer<Launcher> {
     public SysUiScrim getSysUiScrim() {
         return mSysUiScrim;
     }
-
-    public OverviewScrim getOverviewScrim() {
-        return mOverviewScrim;
-    }
 }
diff --git a/src/com/android/launcher3/graphics/OverviewScrim.java b/src/com/android/launcher3/graphics/OverviewScrim.java
deleted file mode 100644
index 7aadb962f7..0000000000
--- a/src/com/android/launcher3/graphics/OverviewScrim.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.graphics;
-
-import static android.view.View.VISIBLE;
-
-import android.util.FloatProperty;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.R;
-import com.android.launcher3.uioverrides.WallpaperColorInfo;
-import com.android.launcher3.util.Themes;
-
-/**
- * View scrim which draws behind overview (recent apps).
- */
-public class OverviewScrim extends Scrim {
-
-    public static final FloatProperty<OverviewScrim> SCRIM_MULTIPLIER =
-            new FloatProperty<OverviewScrim>("scrimMultiplier") {
-                @Override
-                public Float get(OverviewScrim scrim) {
-                    return scrim.mScrimMultiplier;
-                }
-
-                @Override
-                public void setValue(OverviewScrim scrim, float v) {
-                    scrim.setScrimMultiplier(v);
-                }
-            };
-
-    private @NonNull View mStableScrimmedView;
-    // Might be higher up if mStableScrimmedView is invisible.
-    private @Nullable View mCurrentScrimmedView;
-
-    private float mScrimMultiplier = 1f;
-
-    public OverviewScrim(View view) {
-        super(view);
-
-        mScrimColor = Themes.getAttrColor(view.getContext(), R.attr.allAppsScrimColor);
-    }
-
-    /**
-     * Initializes once view hierarchy is established.
-     */
-    public void setup() {
-        mStableScrimmedView = mCurrentScrimmedView = mLauncher.getOverviewPanel();
-    }
-
-    /**
-     * @param view The view we want the scrim to be behind
-     */
-    public void updateStableScrimmedView(View view) {
-        mStableScrimmedView = view;
-    }
-
-    public void updateCurrentScrimmedView(ViewGroup root) {
-        // Find the lowest view that is at or above the view we want to show the scrim behind.
-        mCurrentScrimmedView = mStableScrimmedView;
-        int currentIndex = root.indexOfChild(mCurrentScrimmedView);
-        final int childCount = root.getChildCount();
-        while (mCurrentScrimmedView != null && mCurrentScrimmedView.getVisibility() != VISIBLE
-                && currentIndex < childCount) {
-            currentIndex++;
-            mCurrentScrimmedView = root.getChildAt(currentIndex);
-        }
-    }
-
-    @Override
-    public void onExtractedColorsChanged(WallpaperColorInfo wallpaperColorInfo) {
-        // No super, don't respond to wallpaper colors, follow device ones instead
-    }
-
-    /**
-     * @return The view to draw the scrim behind, or null if all visible views should be scrimmed.
-     */
-    public @Nullable View getScrimmedView() {
-        return mCurrentScrimmedView;
-    }
-
-    private void setScrimMultiplier(float scrimMultiplier) {
-        if (Float.compare(mScrimMultiplier, scrimMultiplier) != 0) {
-            mScrimMultiplier = scrimMultiplier;
-            invalidate();
-        }
-    }
-
-    @Override
-    protected int getScrimAlpha() {
-        return Math.round(super.getScrimAlpha() * mScrimMultiplier);
-    }
-}
diff --git a/src/com/android/launcher3/states/HintState.java b/src/com/android/launcher3/states/HintState.java
index 76f89bcdc9..22c9d5ba44 100644
--- a/src/com/android/launcher3/states/HintState.java
+++ b/src/com/android/launcher3/states/HintState.java
@@ -49,7 +49,7 @@ public class HintState extends LauncherState {
     }
 
     @Override
-    public float getOverviewScrimAlpha(Launcher launcher) {
+    public float getWorkspaceScrimAlpha(Launcher launcher) {
         return 0.4f;
     }
 
diff --git a/src/com/android/launcher3/states/SpringLoadedState.java b/src/com/android/launcher3/states/SpringLoadedState.java
index d593013a36..39bcdc5cd8 100644
--- a/src/com/android/launcher3/states/SpringLoadedState.java
+++ b/src/com/android/launcher3/states/SpringLoadedState.java
@@ -88,7 +88,7 @@ public class SpringLoadedState extends LauncherState {
     }
 
     @Override
-    public float getWorkspaceScrimAlpha(Launcher launcher) {
+    public float getWorkspaceBackgroundAlpha(Launcher launcher) {
         return 0.3f;
     }
 
diff --git a/src/com/android/launcher3/states/StateAnimationConfig.java b/src/com/android/launcher3/states/StateAnimationConfig.java
index 8e7dcc098b..0dbfb0b15f 100644
--- a/src/com/android/launcher3/states/StateAnimationConfig.java
+++ b/src/com/android/launcher3/states/StateAnimationConfig.java
@@ -56,7 +56,7 @@ public class StateAnimationConfig {
             ANIM_OVERVIEW_TRANSLATE_Y,
             ANIM_OVERVIEW_FADE,
             ANIM_ALL_APPS_FADE,
-            ANIM_OVERVIEW_SCRIM_FADE,
+            ANIM_WORKSPACE_SCRIM_FADE,
             ANIM_ALL_APPS_HEADER_FADE,
             ANIM_OVERVIEW_MODAL,
             ANIM_DEPTH,
@@ -75,7 +75,7 @@ public class StateAnimationConfig {
     public static final int ANIM_OVERVIEW_TRANSLATE_Y = 8;
     public static final int ANIM_OVERVIEW_FADE = 9;
     public static final int ANIM_ALL_APPS_FADE = 10;
-    public static final int ANIM_OVERVIEW_SCRIM_FADE = 11;
+    public static final int ANIM_WORKSPACE_SCRIM_FADE = 11;
     public static final int ANIM_ALL_APPS_HEADER_FADE = 12; // e.g. predictions
     public static final int ANIM_OVERVIEW_MODAL = 13;
     public static final int ANIM_DEPTH = 14;
diff --git a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
index dd5611e7de..a241e637be 100644
--- a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
+++ b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
@@ -74,14 +74,6 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
         scroller.startScroll(scroller.getCurrPos(), newPosition - scroller.getCurrPos());
     }
 
-    @Override
-    public void getCurveProperties(PagedView view, Rect insets, CurveProperties out) {
-        out.scroll = view.getScrollY();
-        out.halfPageSize = view.getNormalChildHeight() / 2;
-        out.halfScreenSize = view.getMeasuredHeight() / 2;
-        out.screenCenter = insets.top + view.getPaddingTop() + out.scroll + out.halfPageSize;
-    }
-
     @Override
     public boolean isLayoutNaturalToLauncher() {
         return false;
diff --git a/src/com/android/launcher3/touch/PagedOrientationHandler.java b/src/com/android/launcher3/touch/PagedOrientationHandler.java
index 9140a04341..b85d08addd 100644
--- a/src/com/android/launcher3/touch/PagedOrientationHandler.java
+++ b/src/com/android/launcher3/touch/PagedOrientationHandler.java
@@ -93,7 +93,6 @@ public interface PagedOrientationHandler {
     void delegateScrollTo(PagedView pagedView, int primaryScroll);
     void delegateScrollBy(PagedView pagedView, int unboundedScroll, int x, int y);
     void scrollerStartScroll(OverScroller scroller, int newPosition);
-    void getCurveProperties(PagedView view, Rect insets, CurveProperties out);
     boolean isLayoutNaturalToLauncher();
     float getTaskMenuX(float x, View thumbnailView);
     float getTaskMenuY(float y, View thumbnailView);
@@ -121,13 +120,6 @@ public interface PagedOrientationHandler {
      */
     void adjustFloatingIconStartVelocity(PointF velocity);
 
-    class CurveProperties {
-        public int scroll;
-        public int halfPageSize;
-        public int screenCenter;
-        public int halfScreenSize;
-    }
-
     class ChildBounds {
 
         public final int primaryDimension;
diff --git a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
index 2ca0340ee7..2fb5952372 100644
--- a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
+++ b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
@@ -22,7 +22,6 @@ import static com.android.launcher3.touch.SingleAxisSwipeDetector.VERTICAL;
 import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT;
 import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT;
 import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_TYPE_MAIN;
-import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_TYPE_SIDE;
 
 import android.content.res.Resources;
 import android.graphics.PointF;
@@ -73,14 +72,6 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
         scroller.startScroll(newPosition - scroller.getCurrPos(), scroller.getCurrPos());
     }
 
-    @Override
-    public void getCurveProperties(PagedView view, Rect insets, CurveProperties out) {
-        out.scroll = view.getScrollX();
-        out.halfPageSize = view.getNormalChildWidth() / 2;
-        out.halfScreenSize = view.getMeasuredWidth() / 2;
-        out.screenCenter = insets.left + view.getPaddingLeft() + out.scroll + out.halfPageSize;
-    }
-
     @Override
     public boolean isLayoutNaturalToLauncher() {
         return true;
diff --git a/src/com/android/launcher3/views/ScrimView.java b/src/com/android/launcher3/views/ScrimView.java
index 72926dde34..c9424de152 100644
--- a/src/com/android/launcher3/views/ScrimView.java
+++ b/src/com/android/launcher3/views/ScrimView.java
@@ -15,14 +15,9 @@
  */
 package com.android.launcher3.views;
 
-import static androidx.core.graphics.ColorUtils.compositeColors;
-
-import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
 import static com.android.launcher3.util.SystemUiController.UI_STATE_SCRIM_VIEW;
 
 import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
 import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.view.View;
@@ -32,104 +27,61 @@ import androidx.core.graphics.ColorUtils;
 import com.android.launcher3.Insettable;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
-import com.android.launcher3.uioverrides.WallpaperColorInfo;
-import com.android.launcher3.uioverrides.WallpaperColorInfo.OnChangeListener;
+import com.android.launcher3.util.SystemUiController;
 import com.android.launcher3.util.Themes;
 
 /**
  * Simple scrim which draws a flat color
  */
-public class ScrimView<T extends Launcher> extends View implements Insettable, OnChangeListener {
-    private static final float STATUS_BAR_COLOR_FORCE_UPDATE_THRESHOLD = .1f;
-
-    protected final T mLauncher;
-    private final WallpaperColorInfo mWallpaperColorInfo;
-    protected final int mEndScrim;
-    protected final boolean mIsScrimDark;
-
-    protected float mMaxScrimAlpha;
+public class ScrimView extends View implements Insettable {
+    private static final float STATUS_BAR_COLOR_FORCE_UPDATE_THRESHOLD = 0.9f;
 
-    protected float mProgress = 1;
-    protected int mScrimColor;
-
-    protected int mCurrentFlatColor;
-    protected int mEndFlatColor;
-    protected int mEndFlatColorAlpha;
+    private final boolean mIsScrimDark;
+    private SystemUiController mSystemUiController;
 
     public ScrimView(Context context, AttributeSet attrs) {
         super(context, attrs);
-        mLauncher = Launcher.cast(Launcher.getLauncher(context));
-        mWallpaperColorInfo = WallpaperColorInfo.INSTANCE.get(context);
-        mEndScrim = Themes.getAttrColor(context, R.attr.allAppsScrimColor);
-        mIsScrimDark = ColorUtils.calculateLuminance(mEndScrim) < 0.5f;
-
-        mMaxScrimAlpha = 0.7f;
+        mIsScrimDark = ColorUtils.calculateLuminance(
+                Themes.getAttrColor(context, R.attr.allAppsScrimColor)) < 0.5f;
         setFocusable(false);
     }
 
     @Override
     public void setInsets(Rect insets) { }
 
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        mWallpaperColorInfo.addOnChangeListener(this);
-        onExtractedColorsChanged(mWallpaperColorInfo);
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        mWallpaperColorInfo.removeOnChangeListener(this);
-    }
-
     @Override
     public boolean hasOverlappingRendering() {
         return false;
     }
 
     @Override
-    public void onExtractedColorsChanged(WallpaperColorInfo wallpaperColorInfo) {
-        mScrimColor = wallpaperColorInfo.getMainColor();
-        mEndFlatColor = compositeColors(mEndScrim, setColorAlphaBound(
-                mScrimColor, Math.round(mMaxScrimAlpha * 255)));
-        mEndFlatColorAlpha = Color.alpha(mEndFlatColor);
-        updateColors();
-        invalidate();
+    protected boolean onSetAlpha(int alpha) {
+        updateSysUiColors();
+        return super.onSetAlpha(alpha);
     }
 
-    public void setProgress(float progress) {
-        if (mProgress != progress) {
-            mProgress = progress;
-            updateColors();
-            updateSysUiColors();
-            invalidate();
-        }
-    }
-
-    public void reInitUi() { }
-
-    protected void updateColors() {
-        mCurrentFlatColor = mProgress >= 1 ? 0 : setColorAlphaBound(
-                mEndFlatColor, Math.round((1 - mProgress) * mEndFlatColorAlpha));
+    @Override
+    protected void onVisibilityChanged(View changedView, int visibility) {
+        super.onVisibilityChanged(changedView, visibility);
+        updateSysUiColors();
     }
 
-    protected void updateSysUiColors() {
+    private void updateSysUiColors() {
         // Use a light system UI (dark icons) if all apps is behind at least half of the
         // status bar.
-        boolean forceChange = mProgress <= STATUS_BAR_COLOR_FORCE_UPDATE_THRESHOLD;
+        boolean forceChange =
+                getVisibility() == VISIBLE && getAlpha() > STATUS_BAR_COLOR_FORCE_UPDATE_THRESHOLD;
         if (forceChange) {
-            mLauncher.getSystemUiController().updateUiState(UI_STATE_SCRIM_VIEW, !mIsScrimDark);
+            getSystemUiController().updateUiState(UI_STATE_SCRIM_VIEW, !mIsScrimDark);
         } else {
-            mLauncher.getSystemUiController().updateUiState(UI_STATE_SCRIM_VIEW, 0);
+            getSystemUiController().updateUiState(UI_STATE_SCRIM_VIEW, 0);
         }
     }
 
-    @Override
-    protected void onDraw(Canvas canvas) {
-        if (mCurrentFlatColor != 0) {
-            canvas.drawColor(mCurrentFlatColor);
+    private SystemUiController getSystemUiController() {
+        if (mSystemUiController == null) {
+            mSystemUiController = Launcher.getLauncher(getContext()).getSystemUiController();
         }
+        return mSystemUiController;
     }
 }
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java b/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java
index ff281482ec..53748b7ee9 100644
--- a/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java
+++ b/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java
@@ -74,4 +74,9 @@ public class AllAppsState extends LauncherState {
     public float getVerticalProgress(Launcher launcher) {
         return 0f;
     }
+
+    @Override
+    public float getWorkspaceScrimAlpha(Launcher launcher) {
+        return 1;
+    }
 }
-- 
GitLab


From ad41a56166333f839eb8536ce07676bb610706ab Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pbdr@google.com>
Date: Thu, 25 Mar 2021 16:44:40 +0000
Subject: [PATCH 0838/1664] Stop trying to draw a view not attached to the view
 tree

The behavior of the framework when we try to do so is undefined. In our
case, it almost work, but no clipping is applied, which is a problem for
Android S (before that, widget couldn't use clipping in the first
place).

Instead of drawing the view through a drawable, this really add the view
and adds also a badge ImageView for badges instead of drawing them
indirectly.

Note that, temporarily, we have to re-allow drawing the view after it
has been attached, but the underlying framework bug being fixed, this
should be fine (I tested it and it really seems to be).

Bug: 183609936
Test: Using hand designed app (see bug)
Change-Id: I929ef8fc81c98c49406f2d940cd5efc28319886d
---
 res/layout/widget_cell_content.xml            | 27 +++++--
 .../dragndrop/AppWidgetHostViewDrawable.java  | 29 +-------
 .../launcher3/widget/BaseWidgetSheet.java     | 21 ++++--
 .../widget/PendingItemDragHelper.java         |  1 +
 .../android/launcher3/widget/WidgetCell.java  | 73 +++++++++++++------
 .../launcher3/widget/WidgetCellPreview.java   | 46 ++++++++++++
 .../launcher3/widget/WidgetImageView.java     | 22 +-----
 .../WidgetsListTableViewHolderBinder.java     |  3 +-
 8 files changed, 137 insertions(+), 85 deletions(-)
 create mode 100644 src/com/android/launcher3/widget/WidgetCellPreview.java

diff --git a/res/layout/widget_cell_content.xml b/res/layout/widget_cell_content.xml
index 30bd8b19d5..0f6fc6cdb7 100644
--- a/res/layout/widget_cell_content.xml
+++ b/res/layout/widget_cell_content.xml
@@ -17,16 +17,31 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
-    <!-- The image of the widget. This view does not support padding. Any placement adjustment
-         should be done using margins. Width & height are set at runtime after scaling the preview
-         image. -->
-    <com.android.launcher3.widget.WidgetImageView
-        android:id="@+id/widget_preview"
+    <com.android.launcher3.widget.WidgetCellPreview
+        android:id="@+id/widget_preview_container"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_weight="1"
         android:importantForAccessibility="no"
-        android:layout_marginVertical="8dp" />
+        android:layout_marginVertical="8dp">
+        <!-- The image of the widget. This view does not support padding. Any placement adjustment
+             should be done using margins. Width & height are set at runtime after scaling the
+             preview image. -->
+        <com.android.launcher3.widget.WidgetImageView
+            android:id="@+id/widget_preview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:importantForAccessibility="no"
+            android:layout_gravity="fill"/>
+
+        <ImageView
+            android:id="@+id/widget_badge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:importantForAccessibility="no"
+            android:layout_gravity="end|bottom"
+            android:layout_margin="@dimen/profile_badge_margin"/>
+    </com.android.launcher3.widget.WidgetCellPreview>
 
     <!-- The name of the widget. -->
     <TextView
diff --git a/src/com/android/launcher3/dragndrop/AppWidgetHostViewDrawable.java b/src/com/android/launcher3/dragndrop/AppWidgetHostViewDrawable.java
index 7b32bbf02e..2135f5dff9 100644
--- a/src/com/android/launcher3/dragndrop/AppWidgetHostViewDrawable.java
+++ b/src/com/android/launcher3/dragndrop/AppWidgetHostViewDrawable.java
@@ -17,12 +17,8 @@ package com.android.launcher3.dragndrop;
 
 import android.graphics.Canvas;
 import android.graphics.ColorFilter;
-import android.graphics.Outline;
 import android.graphics.Paint;
-import android.graphics.Path;
 import android.graphics.PixelFormat;
-import android.graphics.Rect;
-import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
 
 import com.android.launcher3.widget.LauncherAppWidgetHostView;
@@ -36,38 +32,15 @@ public final class AppWidgetHostViewDrawable extends Drawable {
 
     private final LauncherAppWidgetHostView mAppWidgetHostView;
     private Paint mPaint = new Paint();
-    private final Path mClipPath;
-    private final boolean mWasAttached;
 
     public AppWidgetHostViewDrawable(LauncherAppWidgetHostView appWidgetHostView) {
         mAppWidgetHostView = appWidgetHostView;
-        mWasAttached = appWidgetHostView.isAttachedToWindow();
-        Path clipPath = null;
-        if (appWidgetHostView.getClipToOutline()) {
-            Outline outline = new Outline();
-            mAppWidgetHostView.getOutlineProvider().getOutline(mAppWidgetHostView, outline);
-            Rect rect = new Rect();
-            if (outline.getRect(rect)) {
-                float radius = outline.getRadius();
-                clipPath = new Path();
-                clipPath.addRoundRect(new RectF(rect), radius, radius, Path.Direction.CCW);
-            }
-        }
-        mClipPath = clipPath;
     }
 
     @Override
     public void draw(Canvas canvas) {
         int saveCount = canvas.saveLayer(0, 0, getIntrinsicWidth(), getIntrinsicHeight(), mPaint);
-        if (mClipPath != null) {
-            canvas.clipPath(mClipPath);
-        }
-        // If the view was never attached, or is current attached, then draw. Otherwise do not try
-        // to draw, or we might trigger bugs with items that get drawn while requiring the view to
-        // be attached.
-        if (!mWasAttached || mAppWidgetHostView.isAttachedToWindow()) {
-            mAppWidgetHostView.draw(canvas);
-        }
+        mAppWidgetHostView.draw(canvas);
         canvas.restoreToCount(saveCount);
     }
 
diff --git a/src/com/android/launcher3/widget/BaseWidgetSheet.java b/src/com/android/launcher3/widget/BaseWidgetSheet.java
index fc63af0c45..95b887c4c6 100644
--- a/src/com/android/launcher3/widget/BaseWidgetSheet.java
+++ b/src/com/android/launcher3/widget/BaseWidgetSheet.java
@@ -19,6 +19,7 @@ import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
 
 import android.content.Context;
 import android.graphics.Point;
+import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -108,7 +109,7 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView
 
         // If the ImageView doesn't have a drawable yet, the widget preview hasn't been loaded and
         // we abort the drag.
-        if (image.getDrawable() == null) {
+        if (image.getDrawable() == null && v.getAppWidgetHostViewPreview() == null) {
             return false;
         }
 
@@ -116,11 +117,21 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView
         dragHelper.setRemoteViewsPreview(v.getPreview());
         dragHelper.setAppWidgetHostViewPreview(v.getAppWidgetHostViewPreview());
 
-        int[] loc = new int[2];
-        getPopupContainer().getLocationInDragLayer(image, loc);
+        if (image.getDrawable() != null) {
+            int[] loc = new int[2];
+            getPopupContainer().getLocationInDragLayer(image, loc);
 
-        dragHelper.startDrag(image.getBitmapBounds(), image.getDrawable().getIntrinsicWidth(),
-                image.getWidth(), new Point(loc[0], loc[1]), this, new DragOptions());
+            dragHelper.startDrag(image.getBitmapBounds(), image.getDrawable().getIntrinsicWidth(),
+                    image.getWidth(), new Point(loc[0], loc[1]), this, new DragOptions());
+        } else {
+            View preview = v.getAppWidgetHostViewPreview();
+            int[] loc = new int[2];
+            getPopupContainer().getLocationInDragLayer(preview, loc);
+
+            Rect r = new Rect(0, 0, preview.getWidth(), preview.getHeight());
+            dragHelper.startDrag(r, preview.getMeasuredWidth(), preview.getMeasuredWidth(),
+                    new Point(loc[0], loc[1]), this, new DragOptions());
+        }
         close(true);
         return true;
     }
diff --git a/src/com/android/launcher3/widget/PendingItemDragHelper.java b/src/com/android/launcher3/widget/PendingItemDragHelper.java
index 3e61e56ee4..e78d517b09 100644
--- a/src/com/android/launcher3/widget/PendingItemDragHelper.java
+++ b/src/com/android/launcher3/widget/PendingItemDragHelper.java
@@ -115,6 +115,7 @@ public class PendingItemDragHelper extends DragPreviewProvider {
             }
             if (mAppWidgetHostViewPreview != null) {
                 preview = new AppWidgetHostViewDrawable(mAppWidgetHostViewPreview);
+                previewSizeBeforeScale[0] = mAppWidgetHostViewPreview.getMeasuredWidth();
                 launcher.getDragController()
                         .addDragListener(new AppWidgetHostViewDragListener(launcher));
             }
diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index 40b256b9cd..5e7c961708 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -28,9 +28,11 @@ import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnLayoutChangeListener;
+import android.view.ViewGroup;
 import android.view.ViewPropertyAnimator;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.FrameLayout;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RemoteViews;
 import android.widget.TextView;
@@ -42,7 +44,6 @@ import com.android.launcher3.CheckLongPressHelper;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.R;
 import com.android.launcher3.WidgetPreviewLoader;
-import com.android.launcher3.dragndrop.AppWidgetHostViewDrawable;
 import com.android.launcher3.icons.BaseIconFactory;
 import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.icons.FastBitmapDrawable;
@@ -77,7 +78,9 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     private int mCellSize;
     private float mPreviewScale = 1f;
 
+    private FrameLayout mWidgetImageContainer;
     private WidgetImageView mWidgetImage;
+    private ImageView mWidgetBadge;
     private TextView mWidgetName;
     private TextView mWidgetDims;
     private TextView mWidgetDescription;
@@ -133,7 +136,9 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     protected void onFinishInflate() {
         super.onFinishInflate();
 
+        mWidgetImageContainer = findViewById(R.id.widget_preview_container);
         mWidgetImage = findViewById(R.id.widget_preview);
+        mWidgetBadge = findViewById(R.id.widget_badge);
         mWidgetName = findViewById(R.id.widget_name);
         mWidgetDims = findViewById(R.id.widget_dims);
         mWidgetDescription = findViewById(R.id.widget_description);
@@ -155,7 +160,9 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
             Log.d(TAG, "reset called on:" + mWidgetName.getText());
         }
         mWidgetImage.animate().cancel();
-        mWidgetImage.setDrawable(null, null);
+        mWidgetImage.setDrawable(null);
+        mWidgetImage.setVisibility(View.VISIBLE);
+        mWidgetBadge.setImageDrawable(null);
         mWidgetName.setText(null);
         mWidgetDims.setText(null);
         mWidgetDescription.setText(null);
@@ -167,6 +174,9 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
             mActiveRequest = null;
         }
         mPreview = null;
+        if (mAppWidgetHostViewPreview != null) {
+            mWidgetImageContainer.removeView(mAppWidgetHostViewPreview);
+        }
         mAppWidgetHostViewPreview = null;
     }
 
@@ -215,6 +225,13 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
             mAppWidgetHostViewPreview.setPadding(/* left= */ 0, /* top= */0, /* right= */
                     0, /* bottom= */ 0);
             mAppWidgetHostViewPreview.updateAppWidget(/* remoteViews= */ null);
+            // Gravity 77 = "fill"
+            FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.MATCH_PARENT, /* gravity= */ 77);
+            mAppWidgetHostViewPreview.setLayoutParams(params);
+            mWidgetImageContainer.addView(mAppWidgetHostViewPreview, /* index= */ 0);
+            mWidgetImage.setVisibility(View.GONE);
         }
     }
 
@@ -258,21 +275,36 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
             return;
         }
         if (drawable != null) {
-            LayoutParams layoutParams = (LayoutParams) mWidgetImage.getLayoutParams();
-            layoutParams.width = (int) (drawable.getIntrinsicWidth() * mPreviewScale);
-            layoutParams.height = (int) (drawable.getIntrinsicHeight() * mPreviewScale);
-            mWidgetImage.setLayoutParams(layoutParams);
-
-            mWidgetImage.setDrawable(drawable, mWidgetPreviewLoader.getBadgeForUser(mItem.user,
-                    BaseIconFactory.getBadgeSizeForIconSize(mDeviceProfile.allAppsIconSizePx)));
-            if (mAnimatePreview) {
-                mWidgetImage.setAlpha(0f);
-                ViewPropertyAnimator anim = mWidgetImage.animate();
-                anim.alpha(1.0f).setDuration(FADE_IN_DURATION_MS);
-            } else {
-                mWidgetImage.setAlpha(1f);
+            setContainerSize(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
+            mWidgetImage.setDrawable(drawable);
+            mWidgetImage.setVisibility(View.VISIBLE);
+            if (mAppWidgetHostViewPreview != null) {
+                removeView(mAppWidgetHostViewPreview);
+                mAppWidgetHostViewPreview = null;
             }
         }
+        Drawable badge = mWidgetPreviewLoader.getBadgeForUser(mItem.user,
+                BaseIconFactory.getBadgeSizeForIconSize(mDeviceProfile.allAppsIconSizePx));
+        if (badge == null) {
+            mWidgetBadge.setVisibility(View.GONE);
+        } else {
+            mWidgetBadge.setVisibility(View.VISIBLE);
+            mWidgetBadge.setImageDrawable(badge);
+        }
+        if (mAnimatePreview) {
+            mWidgetImageContainer.setAlpha(0f);
+            ViewPropertyAnimator anim = mWidgetImageContainer.animate();
+            anim.alpha(1.0f).setDuration(FADE_IN_DURATION_MS);
+        } else {
+            mWidgetImageContainer.setAlpha(1f);
+        }
+    }
+
+    private void setContainerSize(int width, int height) {
+        LayoutParams layoutParams = (LayoutParams) mWidgetImageContainer.getLayoutParams();
+        layoutParams.width = (int) (width * mPreviewScale);
+        layoutParams.height = (int) (height * mPreviewScale);
+        mWidgetImageContainer.setLayoutParams(layoutParams);
     }
 
     public void ensurePreview() {
@@ -290,15 +322,8 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
             int viewWidth = dp.cellWidthPx * mItem.spanX;
             int viewHeight = dp.cellHeightPx * mItem.spanY;
 
-            mAppWidgetHostViewPreview.measure(
-                    MeasureSpec.makeMeasureSpec(viewWidth, MeasureSpec.EXACTLY),
-                    MeasureSpec.makeMeasureSpec(viewHeight, MeasureSpec.EXACTLY));
-
-            viewWidth = mAppWidgetHostViewPreview.getMeasuredWidth();
-            viewHeight = mAppWidgetHostViewPreview.getMeasuredHeight();
-            mAppWidgetHostViewPreview.layout(0, 0, viewWidth, viewHeight);
-            Drawable drawable = new AppWidgetHostViewDrawable(mAppWidgetHostViewPreview);
-            applyPreview(drawable);
+            setContainerSize(viewWidth, viewHeight);
+            applyPreview((Drawable) null);
             return;
         }
         if (mActiveRequest != null) {
diff --git a/src/com/android/launcher3/widget/WidgetCellPreview.java b/src/com/android/launcher3/widget/WidgetCellPreview.java
new file mode 100644
index 0000000000..ad3a61abb4
--- /dev/null
+++ b/src/com/android/launcher3/widget/WidgetCellPreview.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.widget.FrameLayout;
+
+/**
+ * View group managing the widget preview: either using a {@link WidgetImageView} or an actual
+ * {@link LauncherAppWidgetHostView}.
+ */
+public class WidgetCellPreview extends FrameLayout {
+    public WidgetCellPreview(Context context) {
+        this(context, null);
+    }
+
+    public WidgetCellPreview(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public WidgetCellPreview(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent ev) {
+        super.onInterceptTouchEvent(ev);
+        return true;
+    }
+
+}
diff --git a/src/com/android/launcher3/widget/WidgetImageView.java b/src/com/android/launcher3/widget/WidgetImageView.java
index 39d701ce5b..11f4485e33 100644
--- a/src/com/android/launcher3/widget/WidgetImageView.java
+++ b/src/com/android/launcher3/widget/WidgetImageView.java
@@ -25,7 +25,6 @@ import android.util.AttributeSet;
 import android.view.View;
 
 import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
 
 /**
  * View that draws a bitmap horizontally centered. If the image width is greater than the view
@@ -37,7 +36,6 @@ public class WidgetImageView extends View {
     private final int mBadgeMargin;
 
     private Drawable mDrawable;
-    private Drawable mBadge;
 
     public WidgetImageView(Context context) {
         this(context, null);
@@ -54,9 +52,9 @@ public class WidgetImageView extends View {
                 .getDimensionPixelSize(R.dimen.profile_badge_margin);
     }
 
-    public void setDrawable(Drawable drawable, Drawable badge) {
+    /** Set the drawable to use for this view. */
+    public void setDrawable(Drawable drawable) {
         mDrawable = drawable;
-        mBadge = badge;
         invalidate();
     }
 
@@ -70,11 +68,6 @@ public class WidgetImageView extends View {
             updateDstRectF();
             mDrawable.setBounds(getBitmapBounds());
             mDrawable.draw(canvas);
-
-            // Only draw the badge if a preview was drawn.
-            if (mBadge != null) {
-                mBadge.draw(canvas);
-            }
         }
     }
 
@@ -105,17 +98,6 @@ public class WidgetImageView extends View {
             mDstRectF.top = (myHeight - scaledHeight) / 2;
             mDstRectF.bottom = (myHeight + scaledHeight) / 2;
         }
-
-        if (mBadge != null) {
-            Rect bounds = mBadge.getBounds();
-            int left = Utilities.boundToRange(
-                    (int) (mDstRectF.right + mBadgeMargin - bounds.width()),
-                    mBadgeMargin, getWidth() - bounds.width());
-            int top = Utilities.boundToRange(
-                    (int) (mDstRectF.bottom + mBadgeMargin - bounds.height()),
-                    mBadgeMargin, getHeight() - bounds.height());
-            mBadge.setBounds(left, top, bounds.width() + left, bounds.height() + top);
-        }
     }
 
     /**
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java b/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
index c1d64b1c74..1524ab34e8 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
@@ -31,7 +31,6 @@ import com.android.launcher3.WidgetPreviewLoader;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.recyclerview.ViewHolderBinder;
 import com.android.launcher3.widget.WidgetCell;
-import com.android.launcher3.widget.WidgetImageView;
 import com.android.launcher3.widget.model.WidgetsListContentEntry;
 import com.android.launcher3.widget.util.WidgetsTableUtils;
 
@@ -170,7 +169,7 @@ public final class WidgetsListTableViewHolderBinder
                     WidgetCell widget = (WidgetCell) mLayoutInflater.inflate(
                             R.layout.widget_cell, tableRow, false);
                     // set up touch.
-                    WidgetImageView preview = widget.findViewById(R.id.widget_preview);
+                    View preview = widget.findViewById(R.id.widget_preview_container);
                     preview.setOnClickListener(mIconClickListener);
                     preview.setOnLongClickListener(mIconLongClickListener);
                     tableRow.addView(widget);
-- 
GitLab


From 9245773737dacf4676a1d5600beb166d3c727940 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Tue, 6 Apr 2021 13:10:06 -0500
Subject: [PATCH 0839/1664] [Search] Update specs per UX

- Moves search related resources go NexusLauncher

Test: Visual
Bug: 184369338
Change-Id: Ic466395192d1fd891aeebec93b491d453edf84aa
---
 res/values/dimens.xml  | 10 ----------
 res/values/strings.xml |  6 ------
 2 files changed, 16 deletions(-)

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 51dddab6f7..a192c276b7 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -277,16 +277,6 @@
     <!-- Onboarding bottomsheet related -->
     <dimen name="bottom_sheet_edu_padding">24dp</dimen>
 
-    <!-- Search related -->
-    <dimen name="search_hero_title_size">16sp</dimen>
-    <dimen name="search_hero_subtitle_size">14sp</dimen>
-    <dimen name="search_hero_inline_button_size">12sp</dimen>
-    <dimen name="search_settings_icon_size">36dp</dimen>
-    <dimen name="search_settings_icon_vertical_offset">16dp</dimen>
-    <dimen name="search_line_spacing">4dp</dimen>
-    <dimen name="search_decoration_corner_radius">28dp</dimen>
-    <dimen name="search_decoration_padding">1dp</dimen>
-
 <!-- Taskbar related (placeholders to compile in Launcher3 without Quickstep) -->
     <dimen name="taskbar_size">0dp</dimen>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1371e91d0f..bf3a25cbf5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -103,12 +103,6 @@
     <!-- Label for an icon representing any generic app. [CHAR_LIMIT=50] -->
     <string name="label_application">App</string>
 
-    <!--All apps Search-->
-    <!-- Section title for apps [CHAR_LIMIT=50] -->
-    <string name="search_corpus_apps">Apps</string>
-    <!-- try instant app action for play search result [CHAR_LIMIT=50 -->
-    <string name="search_action_try_now">Try Now</string>
-
     <!-- Popup items -->
     <!-- Text to display as the header above notifications. [CHAR_LIMIT=30] -->
     <string name="notifications_header">Notifications</string>
-- 
GitLab


From 7f52f4090c2e07fbfc68ed7dc2823405a59cddf5 Mon Sep 17 00:00:00 2001
From: Vadim Tryshev <vadimt@google.com>
Date: Wed, 7 Apr 2021 21:07:56 +0000
Subject: [PATCH 0840/1664] Revert "Fixing testOverview test"

This reverts commit 17ba630cd90e6475bcfd1bb2fbebc0d8e958b55d.

Reason for revert: For unknown reasons, the problem had fixed itself

Change-Id: Ifdf884a4ca0e3cd96d85da2725216fd34bfdcbe0
---
 .../tests/src/com/android/quickstep/TaplTestsQuickstep.java      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
index 5ffe3156f6..0fe5432ceb 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
@@ -120,7 +120,6 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
                 getCurrentOverviewPage(launcher) < currentTaskAfterFlingForward));
 
         // Test opening a task.
-        startTestActivity(2);
         OverviewTask task = mLauncher.pressHome().switchToOverview().getCurrentTask();
         assertNotNull("overview.getCurrentTask() returned null (1)", task);
         assertNotNull("OverviewTask.open returned null", task.open());
-- 
GitLab


From e845463a1bbc4aa8452fa3f21629be3459adf7d7 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Wed, 7 Apr 2021 14:07:28 -0700
Subject: [PATCH 0841/1664] Update Home settings nav bar color.

Updated the Hime settings nav bar color to match that of the wallpaper picker app.

Test: manual

fixes: 183396026
Change-Id: Id2302a553c5ddf645d497cb832608efecb3e70ad
---
 res/values/styles.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values/styles.xml b/res/values/styles.xml
index a27cdacdc6..fd77b80811 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -150,7 +150,7 @@
     </style>
 
     <style name="HomeSettingsTheme" parent="@android:style/Theme.DeviceDefault.Settings">
-        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">?android:colorPrimaryDark</item>
         <item name="preferenceTheme">@style/HomeSettingsPreferenceTheme</item>
     </style>
 
-- 
GitLab


From 8b9919de9fca08ed572958f54410e789c6998778 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 7 Apr 2021 14:45:17 -0700
Subject: [PATCH 0842/1664] Removing some dependency on icon shape

Bug: 183641907
Test: Manual
Change-Id: Ifd492a850bb9918ad378385abe544362e34e70b0
---
 .../uioverrides/PredictedAppIcon.java         | 79 ++++++++++++-------
 src/com/android/launcher3/BubbleTextView.java | 50 +-----------
 src/com/android/launcher3/DeviceProfile.java  | 11 +--
 .../android/launcher3/graphics/IconShape.java | 29 -------
 .../graphics/PreloadIconDrawable.java         |  7 +-
 5 files changed, 62 insertions(+), 114 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
index b4aa596760..5ba1fe17b2 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
@@ -15,12 +15,11 @@
  */
 package com.android.launcher3.uioverrides;
 
-import static com.android.launcher3.graphics.IconShape.getShape;
-
 import android.content.Context;
 import android.graphics.BlurMaskFilter;
 import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.Rect;
@@ -37,6 +36,7 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.R;
 import com.android.launcher3.graphics.IconPalette;
+import com.android.launcher3.icons.GraphicsUtils;
 import com.android.launcher3.icons.IconNormalizer;
 import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
@@ -58,9 +58,13 @@ public class PredictedAppIcon extends DoubleShadowBubbleTextView {
     private final DeviceProfile mDeviceProfile;
     private final Paint mIconRingPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
     private final Path mRingPath = new Path();
-    private boolean mIsPinned = false;
-    private final int mNormalizedIconRadius;
+    private final int mNormalizedIconSize;
+    private final Path mShapePath;
+    private final Matrix mTmpMatrix = new Matrix();
+
     private final BlurMaskFilter mShadowFilter;
+
+    private boolean mIsPinned = false;
     private int mPlateColor;
     boolean mDrawForDrag = false;
 
@@ -75,24 +79,18 @@ public class PredictedAppIcon extends DoubleShadowBubbleTextView {
     public PredictedAppIcon(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
         mDeviceProfile = ActivityContext.lookupContext(context).getDeviceProfile();
-        mNormalizedIconRadius = IconNormalizer.getNormalizedCircleSize(getIconSize()) / 2;
+        mNormalizedIconSize = IconNormalizer.getNormalizedCircleSize(getIconSize());
         int shadowSize = context.getResources().getDimensionPixelSize(
                 R.dimen.blur_size_thin_outline);
         mShadowFilter = new BlurMaskFilter(shadowSize, BlurMaskFilter.Blur.OUTER);
+        mShapePath = GraphicsUtils.getShapePath(mNormalizedIconSize);
     }
 
     @Override
     public void onDraw(Canvas canvas) {
         int count = canvas.save();
         if (!mIsPinned) {
-            boolean isBadged = false;
-            if (getTag() instanceof WorkspaceItemInfo) {
-                WorkspaceItemInfo info = (WorkspaceItemInfo) getTag();
-                isBadged = !Process.myUserHandle().equals(info.user)
-                        || info.itemType == LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT
-                        || info.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT;
-            }
-            drawEffect(canvas, isBadged);
+            drawEffect(canvas);
             canvas.translate(getWidth() * RING_EFFECT_RATIO, getHeight() * RING_EFFECT_RATIO);
             canvas.scale(1 - 2 * RING_EFFECT_RATIO, 1 - 2 * RING_EFFECT_RATIO);
         }
@@ -161,32 +159,57 @@ public class PredictedAppIcon extends DoubleShadowBubbleTextView {
     }
 
     private int getOutlineOffsetX() {
-        return (getMeasuredWidth() / 2) - mNormalizedIconRadius;
+        return (getMeasuredWidth() - mNormalizedIconSize) / 2;
     }
 
     private int getOutlineOffsetY() {
         if (mDisplay != DISPLAY_TASKBAR) {
             return getPaddingTop() + mDeviceProfile.folderIconOffsetYPx;
         }
-        return (getMeasuredHeight() / 2) - mNormalizedIconRadius;
+        return (getMeasuredHeight() - mNormalizedIconSize) / 2;
     }
 
-    private void drawEffect(Canvas canvas, boolean isBadged) {
-        // Don't draw ring effect if item is about to be dragged.
-        if (mDrawForDrag) {
-            return;
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        super.onSizeChanged(w, h, oldw, oldh);
+        updateRingPath();
+    }
+
+    @Override
+    public void setTag(Object tag) {
+        super.setTag(tag);
+        updateRingPath();
+    }
+
+    private void updateRingPath() {
+        boolean isBadged = false;
+        if (getTag() instanceof WorkspaceItemInfo) {
+            WorkspaceItemInfo info = (WorkspaceItemInfo) getTag();
+            isBadged = !Process.myUserHandle().equals(info.user)
+                    || info.itemType == LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT
+                    || info.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT;
         }
+
         mRingPath.reset();
-        getShape().addToPath(mRingPath, getOutlineOffsetX(), getOutlineOffsetY(),
-                mNormalizedIconRadius);
+        mTmpMatrix.setTranslate(getOutlineOffsetX(), getOutlineOffsetY());
+
+        mRingPath.addPath(mShapePath, mTmpMatrix);
         if (isBadged) {
-            float outlineSize = mNormalizedIconRadius * RING_EFFECT_RATIO * 2;
+            float outlineSize = mNormalizedIconSize * RING_EFFECT_RATIO;
             float iconSize = getIconSize() * (1 - 2 * RING_EFFECT_RATIO);
             float badgeSize = LauncherIcons.getBadgeSizeForIconSize((int) iconSize) + outlineSize;
-            float badgeInset = mNormalizedIconRadius * 2 - badgeSize;
-            getShape().addToPath(mRingPath, getOutlineOffsetX() + badgeInset,
-                    getOutlineOffsetY() + badgeInset, badgeSize / 2);
+            float scale = badgeSize / mNormalizedIconSize;
+            mTmpMatrix.postTranslate(mNormalizedIconSize, mNormalizedIconSize);
+            mTmpMatrix.preScale(scale, scale);
+            mTmpMatrix.preTranslate(-mNormalizedIconSize, -mNormalizedIconSize);
+            mRingPath.addPath(mShapePath, mTmpMatrix);
+        }
+    }
 
+    private void drawEffect(Canvas canvas) {
+        // Don't draw ring effect if item is about to be dragged.
+        if (mDrawForDrag) {
+            return;
         }
         mIconRingPaint.setColor(RING_SHADOW_COLOR);
         mIconRingPaint.setMaskFilter(mShadowFilter);
@@ -249,8 +272,10 @@ public class PredictedAppIcon extends DoubleShadowBubbleTextView {
          */
         @Override
         public void drawUnderItem(Canvas canvas) {
-            getShape().drawShape(canvas, mIcon.getOutlineOffsetX(), mIcon.getOutlineOffsetY(),
-                    mIcon.mNormalizedIconRadius, mOutlinePaint);
+            canvas.save();
+            canvas.translate(mIcon.getOutlineOffsetX(), mIcon.getOutlineOffsetY());
+            canvas.drawPath(mIcon.mShapePath, mOutlinePaint);
+            canvas.restore();
         }
 
         /**
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index d333b49a3a..2ace796ca0 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -16,7 +16,6 @@
 
 package com.android.launcher3;
 
-import static com.android.launcher3.graphics.IconShape.getShape;
 import static com.android.launcher3.graphics.PreloadIconDrawable.newPendingIcon;
 import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
 
@@ -26,16 +25,13 @@ import android.animation.ObjectAnimator;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
-import android.graphics.BlurMaskFilter;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
-import android.graphics.Path;
 import android.graphics.PointF;
 import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
-import android.os.Process;
 import android.text.TextUtils.TruncateAt;
 import android.util.AttributeSet;
 import android.util.Property;
@@ -50,7 +46,6 @@ import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 
 import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
-import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.dot.DotInfo;
 import com.android.launcher3.dragndrop.DraggableView;
 import com.android.launcher3.folder.FolderIcon;
@@ -60,7 +55,6 @@ import com.android.launcher3.graphics.PreloadIconDrawable;
 import com.android.launcher3.icons.DotRenderer;
 import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.icons.IconCache.ItemInfoUpdateReceiver;
-import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.icons.PlaceHolderIconDrawable;
 import com.android.launcher3.icons.cache.HandlerRunnable;
 import com.android.launcher3.model.data.AppInfo;
@@ -97,11 +91,6 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
 
     private float mScaleForReorderBounce = 1f;
 
-    protected final Paint mHighlightPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-    private final Path mHighlightPath = new Path();
-    protected int mHighlightColor = Color.TRANSPARENT;
-    private final BlurMaskFilter mHighlightShadowFilter;
-
     private static final Property<BubbleTextView, Float> DOT_SCALE_PROPERTY
             = new Property<BubbleTextView, Float>(Float.TYPE, "dotScale") {
         @Override
@@ -220,10 +209,6 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         setEllipsize(TruncateAt.END);
         setAccessibilityDelegate(mActivity.getAccessibilityDelegate());
         setTextAlpha(1f);
-
-        int shadowSize = context.getResources().getDimensionPixelSize(
-                R.dimen.blur_size_click_shadow);
-        mHighlightShadowFilter = new BlurMaskFilter(shadowSize, BlurMaskFilter.Blur.INNER);
     }
 
     @Override
@@ -451,41 +436,10 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
 
     @Override
     public void onDraw(Canvas canvas) {
-        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && mHighlightColor != Color.TRANSPARENT) {
-            int count = canvas.save();
-            drawFocusHighlight(canvas);
-            canvas.restoreToCount(count);
-        }
         super.onDraw(canvas);
         drawDotIfNecessary(canvas);
     }
 
-    protected void drawFocusHighlight(Canvas canvas) {
-        boolean isBadged = getTag() instanceof ItemInfo && !Process.myUserHandle().equals(
-                ((ItemInfo) getTag()).user);
-        float insetScale = (HIGHLIGHT_SCALE - 1) / 2;
-        canvas.translate(-getIconSize() * insetScale, -insetScale * getIconSize());
-        float outlineSize = getIconSize() * HIGHLIGHT_SCALE;
-        mHighlightPath.reset();
-        mHighlightPaint.reset();
-        getIconBounds(mDotParams.iconBounds);
-        getShape().addToPath(mHighlightPath, mDotParams.iconBounds.left, mDotParams.iconBounds.top,
-                outlineSize / 2);
-        if (isBadged) {
-            float borderSize = outlineSize - getIconSize();
-            float badgeSize = LauncherIcons.getBadgeSizeForIconSize(getIconSize()) + borderSize;
-            float badgeInset = outlineSize - badgeSize;
-            getShape().addToPath(mHighlightPath, mDotParams.iconBounds.left + badgeInset,
-                    mDotParams.iconBounds.top + badgeInset, badgeSize / 2);
-        }
-        mHighlightPaint.setMaskFilter(mHighlightShadowFilter);
-        mHighlightPaint.setColor(mDotParams.color);
-        canvas.drawPath(mHighlightPath, mHighlightPaint);
-        mHighlightPaint.setMaskFilter(null);
-        mHighlightPaint.setColor(mHighlightColor);
-        canvas.drawPath(mHighlightPath, mHighlightPaint);
-    }
-
     /**
      * Draws the notification dot in the top right corner of the icon bounds.
      *
@@ -921,11 +875,9 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
 
     @Override
     public SafeCloseable prepareDrawDragView() {
-        int highlightColor = mHighlightColor;
-        mHighlightColor = Color.TRANSPARENT;
         resetIconScale();
         setForceHideDot(true);
-        return () -> mHighlightColor = highlightColor;
+        return () -> { };
     }
 
     private void resetIconScale() {
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index aea38a054b..e17ef2910c 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -22,6 +22,7 @@ import static com.android.launcher3.Utilities.dpiFromPx;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.Resources;
+import android.graphics.Path;
 import android.graphics.Point;
 import android.graphics.PointF;
 import android.graphics.Rect;
@@ -32,8 +33,8 @@ import android.view.WindowManager;
 import com.android.launcher3.CellLayout.ContainerType;
 import com.android.launcher3.DevicePaddings.DevicePadding;
 import com.android.launcher3.config.FeatureFlags;
-import com.android.launcher3.graphics.IconShape;
 import com.android.launcher3.icons.DotRenderer;
+import com.android.launcher3.icons.GraphicsUtils;
 import com.android.launcher3.icons.IconNormalizer;
 import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.DisplayController.Info;
@@ -46,6 +47,7 @@ public class DeviceProfile {
     private static final float TABLET_MIN_DPS = 600;
     private static final float LARGE_TABLET_MIN_DPS = 720;
 
+    private static final int DEFAULT_DOT_SIZE = 100;
 
     public final InvariantDeviceProfile inv;
     private final Info mInfo;
@@ -351,11 +353,10 @@ public class DeviceProfile {
         updateWorkspacePadding();
 
         // This is done last, after iconSizePx is calculated above.
-        mDotRendererWorkSpace = new DotRenderer(iconSizePx, IconShape.getShapePath(),
-                IconShape.DEFAULT_PATH_SIZE);
+        Path dotPath = GraphicsUtils.getShapePath(DEFAULT_DOT_SIZE);
+        mDotRendererWorkSpace = new DotRenderer(iconSizePx, dotPath, DEFAULT_DOT_SIZE);
         mDotRendererAllApps = iconSizePx == allAppsIconSizePx ? mDotRendererWorkSpace :
-                new DotRenderer(allAppsIconSizePx, IconShape.getShapePath(),
-                        IconShape.DEFAULT_PATH_SIZE);
+                new DotRenderer(allAppsIconSizePx, dotPath, DEFAULT_DOT_SIZE);
     }
 
     private void setCellLayoutBorderSpacing(int borderSpacing) {
diff --git a/src/com/android/launcher3/graphics/IconShape.java b/src/com/android/launcher3/graphics/IconShape.java
index b208a40d35..2da679c422 100644
--- a/src/com/android/launcher3/graphics/IconShape.java
+++ b/src/com/android/launcher3/graphics/IconShape.java
@@ -37,20 +37,14 @@ import android.graphics.drawable.AdaptiveIconDrawable;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
 import android.util.AttributeSet;
-import android.util.SparseArray;
-import android.util.TypedValue;
 import android.util.Xml;
 import android.view.View;
 import android.view.ViewOutlineProvider;
 
-import androidx.annotation.Nullable;
-
 import com.android.launcher3.R;
 import com.android.launcher3.anim.RoundedRectRevealOutlineProvider;
 import com.android.launcher3.icons.GraphicsUtils;
 import com.android.launcher3.icons.IconNormalizer;
-import com.android.launcher3.util.IntArray;
-import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.ClipPathView;
 
 import org.xmlpull.v1.XmlPullParser;
@@ -66,30 +60,16 @@ import java.util.List;
 public abstract class IconShape {
 
     private static IconShape sInstance = new Circle();
-    private static Path sShapePath;
     private static float sNormalizationScale = ICON_VISIBLE_AREA_FACTOR;
 
-    public static final int DEFAULT_PATH_SIZE = 100;
-
     public static IconShape getShape() {
         return sInstance;
     }
 
-    public static Path getShapePath() {
-        if (sShapePath == null) {
-            Path p = new Path();
-            getShape().addToPath(p, 0, 0, DEFAULT_PATH_SIZE * 0.5f);
-            sShapePath = p;
-        }
-        return sShapePath;
-    }
-
     public static float getNormalizationScale() {
         return sNormalizationScale;
     }
 
-    private SparseArray<TypedValue> mAttrs;
-
     public boolean enableShapeDetection(){
         return false;
     };
@@ -102,11 +82,6 @@ public abstract class IconShape {
     public abstract <T extends View & ClipPathView> Animator createRevealAnimator(T target,
             Rect startRect, Rect endRect, float endRadius, boolean isReversed);
 
-    @Nullable
-    public TypedValue getAttrValue(int attr) {
-        return mAttrs == null ? null : mAttrs.get(attr);
-    }
-
     /**
      * Abstract shape where the reveal animation is a derivative of a round rect animation
      */
@@ -410,7 +385,6 @@ public abstract class IconShape {
 
             final int depth = parser.getDepth();
             int[] radiusAttr = new int[] {R.attr.folderIconRadius};
-            IntArray keysToIgnore = new IntArray(0);
 
             while (((type = parser.next()) != XmlPullParser.END_TAG ||
                     parser.getDepth() > depth) && type != XmlPullParser.END_DOCUMENT) {
@@ -421,7 +395,6 @@ public abstract class IconShape {
                     IconShape shape = getShapeDefinition(parser.getName(), a.getFloat(0, 1));
                     a.recycle();
 
-                    shape.mAttrs = Themes.createValueMap(context, attrs, keysToIgnore);
                     result.add(shape);
                 }
             }
@@ -467,8 +440,6 @@ public abstract class IconShape {
         }
 
         // Initialize shape properties
-        drawable.setBounds(0, 0, DEFAULT_PATH_SIZE, DEFAULT_PATH_SIZE);
-        sShapePath = new Path(drawable.getIconMask());
         sNormalizationScale = IconNormalizer.normalizeAdaptiveIcon(drawable, size, null);
     }
 }
diff --git a/src/com/android/launcher3/graphics/PreloadIconDrawable.java b/src/com/android/launcher3/graphics/PreloadIconDrawable.java
index ac0ec5f7f7..13ae866efb 100644
--- a/src/com/android/launcher3/graphics/PreloadIconDrawable.java
+++ b/src/com/android/launcher3/graphics/PreloadIconDrawable.java
@@ -17,9 +17,6 @@
 
 package com.android.launcher3.graphics;
 
-import static com.android.launcher3.graphics.IconShape.DEFAULT_PATH_SIZE;
-import static com.android.launcher3.graphics.IconShape.getShapePath;
-
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
@@ -39,6 +36,7 @@ import android.view.ContextThemeWrapper;
 
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.icons.FastBitmapDrawable;
+import com.android.launcher3.icons.GraphicsUtils;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.util.Themes;
 
@@ -62,6 +60,7 @@ public class PreloadIconDrawable extends FastBitmapDrawable {
                 }
             };
 
+    private static final int DEFAULT_PATH_SIZE = 100;
     private static final float PROGRESS_WIDTH = 7;
     private static final float PROGRESS_GAP = 2;
     private static final int MAX_PAINT_ALPHA = 255;
@@ -132,7 +131,7 @@ public class PreloadIconDrawable extends FastBitmapDrawable {
             boolean isDarkMode) {
         super(info.bitmap);
         mItem = info;
-        mShapePath = getShapePath();
+        mShapePath = GraphicsUtils.getShapePath(DEFAULT_PATH_SIZE);
         mScaledTrackPath = new Path();
         mScaledProgressPath = new Path();
 
-- 
GitLab


From a39f45ba283b8af05a7e8c8247822cc3b14e64f7 Mon Sep 17 00:00:00 2001
From: Pinyao Ting <pinyaoting@google.com>
Date: Wed, 7 Apr 2021 19:40:02 -0700
Subject: [PATCH 0843/1664] Fix BackupRestoreTest

Modified the test in comply with changes in Roboelectric framework.

Bug: 184793993
Test: wip
Change-Id: I31af8ea828d0070bb9161e553c5a5054e5d0b432
---
 .../launcher3/model/BackupRestoreTest.java        | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/robolectric_tests/src/com/android/launcher3/model/BackupRestoreTest.java b/robolectric_tests/src/com/android/launcher3/model/BackupRestoreTest.java
index 8baf5a3f27..adf720f2bc 100644
--- a/robolectric_tests/src/com/android/launcher3/model/BackupRestoreTest.java
+++ b/robolectric_tests/src/com/android/launcher3/model/BackupRestoreTest.java
@@ -35,6 +35,7 @@ import android.app.backup.BackupManager;
 import android.content.pm.PackageInstaller;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
+import android.os.Process;
 import android.os.UserHandle;
 import android.os.UserManager;
 
@@ -64,17 +65,11 @@ public class BackupRestoreTest {
     private static final long OLD_WORK_PROFILE_ID = 11;
     private static final int WORK_PROFILE_ID = 10;
 
-    private static final int SYSTEM_USER = 0;
-    private static final int FLAG_SYSTEM = 0x00000800;
-    private static final int FLAG_PROFILE = 0x00001000;
-
     private ShadowUserManager mUserManager;
     private BackupManager mBackupManager;
     private LauncherModelHelper mModelHelper;
     private SQLiteDatabase mDb;
     private InvariantDeviceProfile mIdp;
-    private UserHandle mMainProfileUser;
-    private UserHandle mWorkProfileUser;
 
     @Before
     public void setUp() {
@@ -90,17 +85,15 @@ public class BackupRestoreTest {
         final UserManager userManager = RuntimeEnvironment.application.getSystemService(
                 UserManager.class);
         mUserManager = Shadow.extract(userManager);
-        // sign in to primary user
-        mMainProfileUser = mUserManager.addUser(SYSTEM_USER, "me", FLAG_SYSTEM);
         // sign in to work profile
-        mWorkProfileUser = mUserManager.addUser(WORK_PROFILE_ID, "work", FLAG_PROFILE);
+        mUserManager.addUser(WORK_PROFILE_ID, "work", ShadowUserManager.FLAG_MANAGED_PROFILE);
     }
 
     private void setupBackupManager() {
         mBackupManager = new BackupManager(RuntimeEnvironment.application);
         final LShadowBackupManager bm = Shadow.extract(mBackupManager);
-        bm.addProfile(MY_OLD_PROFILE_ID, mMainProfileUser);
-        bm.addProfile(OLD_WORK_PROFILE_ID, mWorkProfileUser);
+        bm.addProfile(MY_OLD_PROFILE_ID, Process.myUserHandle());
+        bm.addProfile(OLD_WORK_PROFILE_ID, UserHandle.of(WORK_PROFILE_ID));
     }
 
     @Test
-- 
GitLab


From fd604ee7ae329b49fd01468c78a48b191e40d024 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Tue, 6 Apr 2021 19:22:21 +0100
Subject: [PATCH 0844/1664] Use a separate personal/work tabs layout for the
 widget picker

1. Apps are feminine while widgets are masculine in some languages.
   We should use a different set of strings to ensure strings are
   translated with the right context.
2. We will be using a different theme for widget tabs. Let's keep
   the layout separate.

Bug: 184613311
Test: manual
Change-Id: I88df8ca6091e4b6ddf81f34f180a6ce2cada16e3
---
 res/layout/all_apps.xml                       |  2 +-
 ...bs.xml => all_apps_personal_work_tabs.xml} |  0
 res/layout/widgets_full_sheet_paged_view.xml  |  2 +-
 res/layout/widgets_personal_work_tabs.xml     | 48 +++++++++++++++++++
 res/values/strings.xml                        |  4 ++
 5 files changed, 54 insertions(+), 2 deletions(-)
 rename res/layout/{personal_work_tabs.xml => all_apps_personal_work_tabs.xml} (100%)
 create mode 100644 res/layout/widgets_personal_work_tabs.xml

diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml
index 24d764ec18..b570464c8c 100644
--- a/res/layout/all_apps.xml
+++ b/res/layout/all_apps.xml
@@ -40,7 +40,7 @@
 
         <include layout="@layout/floating_header_content" />
 
-        <include layout="@layout/personal_work_tabs" />
+        <include layout="@layout/all_apps_personal_work_tabs" />
     </com.android.launcher3.allapps.FloatingHeaderView>
 
     <include
diff --git a/res/layout/personal_work_tabs.xml b/res/layout/all_apps_personal_work_tabs.xml
similarity index 100%
rename from res/layout/personal_work_tabs.xml
rename to res/layout/all_apps_personal_work_tabs.xml
diff --git a/res/layout/widgets_full_sheet_paged_view.xml b/res/layout/widgets_full_sheet_paged_view.xml
index ae877d46bf..e3d34f6978 100644
--- a/res/layout/widgets_full_sheet_paged_view.xml
+++ b/res/layout/widgets_full_sheet_paged_view.xml
@@ -38,7 +38,7 @@
 
     </com.android.launcher3.workprofile.PersonalWorkPagedView>
 
-    <include layout="@layout/personal_work_tabs"
+    <include layout="@layout/widgets_personal_work_tabs"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="16dp" />
diff --git a/res/layout/widgets_personal_work_tabs.xml b/res/layout/widgets_personal_work_tabs.xml
new file mode 100644
index 0000000000..3d3ae6acb5
--- /dev/null
+++ b/res/layout/widgets_personal_work_tabs.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+-->
+
+<com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/tabs"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/all_apps_header_tab_height"
+    android:layout_marginLeft="@dimen/all_apps_tabs_side_padding"
+    android:layout_marginRight="@dimen/all_apps_tabs_side_padding"
+    android:orientation="horizontal"
+    android:elevation="2dp"
+    style="@style/TextHeadline">
+
+    <Button
+        android:id="@+id/tab_personal"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:background="?android:attr/selectableItemBackground"
+        android:text="@string/widgets_full_sheet_personal_tab"
+        android:textColor="@color/all_apps_tab_text"
+        android:textSize="14sp" />
+
+    <Button
+        android:id="@+id/tab_work"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:background="?android:attr/selectableItemBackground"
+        android:text="@string/widgets_full_sheet_work_tab"
+        android:textColor="@color/all_apps_tab_text"
+        android:textSize="14sp" />
+</com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1371e91d0f..986180c9af 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -90,6 +90,10 @@
     <!-- Text shown when there are no matching widget search results for user's search query.
          [CHAR_LIMIT=none] -->
     <string name="no_search_results">No search results</string>
+    <!-- Tab label. A user can tap this tab to access their personal widgets. [CHAR_LIMIT=25] -->
+    <string name="widgets_full_sheet_personal_tab">Personal</string>
+    <!-- Tab label. A user can tap this tab to access their work widgets. [CHAR_LIMIT=25] -->
+    <string name="widgets_full_sheet_work_tab">Work</string>
 
     <!-- All Apps -->
     <!-- Search bar text in the apps view. [CHAR_LIMIT=50] -->
-- 
GitLab


From 6057cb9fe6bf3f19215d8d5cc8ae1e595ea287a2 Mon Sep 17 00:00:00 2001
From: Andras Kloczl <andraskloczl@google.com>
Date: Wed, 7 Apr 2021 13:45:17 +0200
Subject: [PATCH 0845/1664] Update icon and text size for two panel home screen

Adding new field for landscape icon text size and changing
the logic for when to use landscape sizes.

Test: manual
Bug: 182796672
Change-Id: I89833e8fd90f2606937c3b95ac10229a042213ec
---
 res/values/attrs.xml                                  | 2 ++
 src/com/android/launcher3/DeviceProfile.java          | 5 +++--
 src/com/android/launcher3/InvariantDeviceProfile.java | 8 ++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 99f6c7584b..381b0fef21 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -162,6 +162,8 @@
         <!-- landscapeIconSize defaults to iconSize, if not specified -->
         <attr name="landscapeIconSize" format="float" />
         <attr name="iconTextSize" format="float" />
+        <!-- landscapeIconTextSize defaults to iconTextSize, if not specified -->
+        <attr name="landscapeIconTextSize" format="float" />
         <!-- If true, this display option is used to determine the default grid -->
         <attr name="canBeDefault" format="boolean" />
 
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index aea38a054b..35b0f27c79 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -506,9 +506,10 @@ public class DeviceProfile {
 
         // Workspace
         final boolean isVerticalLayout = isVerticalBarLayout();
-        float invIconSizeDp = isVerticalLayout ? inv.landscapeIconSize : inv.iconSize;
+        float invIconSizeDp = isLandscape ? inv.landscapeIconSize : inv.iconSize;
         iconSizePx = Math.max(1, pxFromDp(invIconSizeDp, mInfo.metrics, scale));
-        iconTextSizePx = (int) (Utilities.pxFromSp(inv.iconTextSize, mInfo.metrics) * scale);
+        float invIconTextSizeSp = isLandscape ? inv.landscapeIconTextSize : inv.iconTextSize;
+        iconTextSizePx = (int) (Utilities.pxFromSp(invIconTextSizeSp, mInfo.metrics) * scale);
         iconDrawablePaddingPx = (int) (iconDrawablePaddingOriginalPx * scale);
 
         setCellLayoutBorderSpacing((int) (cellLayoutBorderSpacingOriginalPx * scale));
diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index 754e988da6..5612dafe23 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -106,6 +106,7 @@ public class InvariantDeviceProfile {
     public float iconSize;
     public String iconShapePath;
     public float landscapeIconSize;
+    public float landscapeIconTextSize;
     public int iconBitmapSize;
     public int fillResIconDpi;
     public float iconTextSize;
@@ -163,6 +164,7 @@ public class InvariantDeviceProfile {
         landscapeIconSize = p.landscapeIconSize;
         iconBitmapSize = p.iconBitmapSize;
         iconTextSize = p.iconTextSize;
+        landscapeIconTextSize = p.landscapeIconTextSize;
         numHotseatIcons = p.numHotseatIcons;
         numAllAppsColumns = p.numAllAppsColumns;
         isScalable = p.isScalable;
@@ -293,6 +295,7 @@ public class InvariantDeviceProfile {
         landscapeIconSize = displayOption.landscapeIconSize;
         iconBitmapSize = ResourceUtils.pxFromDp(iconSize, displayInfo.metrics);
         iconTextSize = displayOption.iconTextSize;
+        landscapeIconTextSize = displayOption.landscapeIconTextSize;
         fillResIconDpi = getLauncherIconDensity(iconBitmapSize);
 
         minCellHeight = displayOption.minCellHeight;
@@ -678,6 +681,7 @@ public class InvariantDeviceProfile {
         private float iconSize;
         private float iconTextSize;
         private float landscapeIconSize;
+        private float landscapeIconTextSize;
         private float allAppsIconSize;
         private float allAppsIconTextSize;
 
@@ -702,6 +706,8 @@ public class InvariantDeviceProfile {
             landscapeIconSize = a.getFloat(R.styleable.ProfileDisplayOption_landscapeIconSize,
                     iconSize);
             iconTextSize = a.getFloat(R.styleable.ProfileDisplayOption_iconTextSize, 0);
+            landscapeIconTextSize = a.getFloat(
+                    R.styleable.ProfileDisplayOption_landscapeIconTextSize, iconTextSize);
 
             allAppsIconSize = a.getFloat(R.styleable.ProfileDisplayOption_allAppsIconSize,
                     iconSize);
@@ -731,6 +737,7 @@ public class InvariantDeviceProfile {
             landscapeIconSize *= w;
             allAppsIconSize *= w;
             iconTextSize *= w;
+            landscapeIconTextSize *= w;
             allAppsIconTextSize *= w;
             minCellHeight *= w;
             minCellWidth *= w;
@@ -744,6 +751,7 @@ public class InvariantDeviceProfile {
             landscapeIconSize += p.landscapeIconSize;
             allAppsIconSize += p.allAppsIconSize;
             iconTextSize += p.iconTextSize;
+            landscapeIconTextSize += p.landscapeIconTextSize;
             allAppsIconTextSize += p.allAppsIconTextSize;
             minCellHeight += p.minCellHeight;
             minCellWidth += p.minCellWidth;
-- 
GitLab


From a65d68b6bf95dcb1cd7d2de5455c17f5258317c5 Mon Sep 17 00:00:00 2001
From: Jon Spivack <spivack@google.com>
Date: Wed, 7 Apr 2021 10:22:25 -0700
Subject: [PATCH 0846/1664] Support LauncherGoGoogle builds in Android.bp

LauncherGoGoogle has dependencies in Launcher3. In order to build it with Android.bp files, these must be exported as filegroups/libraries.

Bug: 184175022
Test: Manual (built/installed on local device)
Test: m -j RunLauncherGoGoogleRoboTests
Change-Id: I1748ab9ccda06dadbd05c2ffcc77b59478ce37c7
---
 Android.bp | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/Android.bp b/Android.bp
index e30d22ff73..df0a96fe4e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -211,3 +211,30 @@ filegroup {
     name: "launcher-proguard-rules",
     srcs: ["proguard.flags"],
 }
+
+
+// Library with all the dependencies for building Launcher Go
+android_library {
+    name: "LauncherGoResLib",
+    srcs: [
+        "src/**/*.java",
+        "quickstep/src/**/*.java",
+        "go/src/**/*.java",
+        "go/quickstep/src/**/*.java",
+    ],
+    resource_dirs: [
+        "go/res",
+        "go/quickstep/res",
+    ],
+    static_libs: [
+        "Launcher3CommonDepsLib",
+        "QuickstepResLib",
+    ],
+    manifest: "quickstep/AndroidManifest-launcher.xml",
+    additional_manifests: [
+        "go/AndroidManifest.xml",
+        "AndroidManifest-common.xml",
+    ],
+    min_sdk_version: "29",
+}
+
-- 
GitLab


From f7df816a8ad6ad4adc685a952a445beaa2d40098 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Wed, 7 Apr 2021 19:03:52 +0100
Subject: [PATCH 0847/1664] Check showAsGrid when applying secondary translate
 on TaskViewSimulator

Bug: 184566209
Test: manual
Change-Id: I53d78553a67c8cd056a9cafad0f163e2c6401550
---
 .../src/com/android/quickstep/TaskViewUtils.java   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java
index 558230b258..f14f60bb91 100644
--- a/quickstep/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java
@@ -180,9 +180,9 @@ public final class TaskViewUtils {
         int taskIndex = recentsView.indexOfChild(v);
         Context context = v.getContext();
         DeviceProfile dp = BaseActivity.fromContext(context).getDeviceProfile();
+        boolean showAsGrid = dp.isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get();
         boolean parallaxCenterAndAdjacentTask =
-                taskIndex != recentsView.getCurrentPage() && !(dp.isTablet
-                        && FeatureFlags.ENABLE_OVERVIEW_GRID.get());
+                taskIndex != recentsView.getCurrentPage() && !showAsGrid;
         float gridTranslationSecondary = recentsView.getGridTranslationSecondary(taskIndex);
         int startScroll = recentsView.getScrollOffset(taskIndex);
 
@@ -200,7 +200,9 @@ public final class TaskViewUtils {
             tsv.setPreview(targets.apps[targets.apps.length - 1]);
             tsv.fullScreenProgress.value = 0;
             tsv.recentsViewScale.value = 1;
-            tsv.taskSecondaryTranslation.value = gridTranslationSecondary;
+            if (showAsGrid) {
+                tsv.taskSecondaryTranslation.value = gridTranslationSecondary;
+            }
             tsv.setScroll(startScroll);
 
             // Fade in the task during the initial 20% of the animation
@@ -213,8 +215,10 @@ public final class TaskViewUtils {
                     AnimatedFloat.VALUE, 1, TOUCH_RESPONSE_INTERPOLATOR);
             out.setFloat(tsv.recentsViewScale,
                     AnimatedFloat.VALUE, tsv.getFullScreenScale(), TOUCH_RESPONSE_INTERPOLATOR);
-            out.setFloat(tsv.taskSecondaryTranslation, AnimatedFloat.VALUE, 0,
-                    TOUCH_RESPONSE_INTERPOLATOR_ACCEL_DEACCEL);
+            if (showAsGrid) {
+                out.setFloat(tsv.taskSecondaryTranslation, AnimatedFloat.VALUE, 0,
+                        TOUCH_RESPONSE_INTERPOLATOR_ACCEL_DEACCEL);
+            }
             out.setFloat(tsv.recentsViewScroll, AnimatedFloat.VALUE, 0,
                     TOUCH_RESPONSE_INTERPOLATOR);
 
-- 
GitLab


From 5fee81233b547ff3b08ddda368c28a1a24ee601f Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Wed, 7 Apr 2021 20:49:34 +0100
Subject: [PATCH 0848/1664] Calculate ClearAllButton's scroll offset after it's
 laid out

- ClearAllButton's width is 0 before it's laid out, making the calcualtion incorrect

Bug: 184570027
Test: Restart device or change screen size, ClearAllButton is in correct position
Change-Id: I2cefccbe18925cb3d9dac705b333400639b7049e
---
 .../src/com/android/quickstep/views/RecentsView.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 66d621e1f1..c39e7df8c6 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1228,11 +1228,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         mClearAllButton.setFullscreenTranslationPrimary(
                 accumulatedTranslationX - fullscreenTranslations[firstNonHomeTaskIndex]);
 
-        // Align ClearAllButton to the left (RTL) or right (non-RTL), which is different from other
-        // TaskViews.
-        int clearAllWidthDiff = mTaskWidth - mClearAllButton.getWidth();
-        mClearAllButton.setScrollOffsetPrimary(mIsRtl ? clearAllWidthDiff : -clearAllWidthDiff);
-
         updateGridProperties(false);
     }
 
@@ -3020,6 +3015,13 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         boolean pageScrollChanged = super.getPageScrolls(outPageScrolls, layoutChildren,
                 scrollLogic);
 
+        // Align ClearAllButton to the left (RTL) or right (non-RTL), which is different from other
+        // TaskViews. This must be called after laying out ClearAllButton.
+        if (layoutChildren) {
+            int clearAllWidthDiff = mTaskWidth - mClearAllButton.getWidth();
+            mClearAllButton.setScrollOffsetPrimary(mIsRtl ? clearAllWidthDiff : -clearAllWidthDiff);
+        }
+
         final int childCount = getChildCount();
         for (int i = 0; i < childCount; i++) {
             View child = getChildAt(i);
-- 
GitLab


From 833a0b9fa980001c585abc9ee46c3a8cf2d99000 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Thu, 8 Apr 2021 22:32:57 +0100
Subject: [PATCH 0849/1664] Add a widget conversations category for grouping
 widgets in the picker

Bug: 184878454
Test: Open the full widget picker and observe the conversation widget
      from SystemUi is listed under conversations.
Change-Id: I53cd74d80ce3c4ff77a92cd660ca9283416e9fd3
---
 res/values/strings.xml                        |  3 +
 .../android/launcher3/icons/IconCache.java    |  6 ++
 .../launcher3/model/data/PackageItemInfo.java | 22 +++++++-
 .../android/launcher3/model/WidgetsModel.java | 55 +++++++++++++++++--
 4 files changed, 81 insertions(+), 5 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1371e91d0f..c929fcbabe 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -91,6 +91,9 @@
          [CHAR_LIMIT=none] -->
     <string name="no_search_results">No search results</string>
 
+    <!-- A widget category label for grouping widgets related to conversations. [CHAR_LIMIT=30] -->
+    <string name="widget_category_conversations">Conversations</string>
+
     <!-- All Apps -->
     <!-- Search bar text in the apps view. [CHAR_LIMIT=50] -->
     <string name="all_apps_search_bar_hint">Search apps</string>
diff --git a/src/com/android/launcher3/icons/IconCache.java b/src/com/android/launcher3/icons/IconCache.java
index 988794ccb6..a2c0f5cdf4 100644
--- a/src/com/android/launcher3/icons/IconCache.java
+++ b/src/com/android/launcher3/icons/IconCache.java
@@ -39,6 +39,7 @@ import androidx.annotation.NonNull;
 
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherFiles;
+import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.icons.ComponentWithLabel.ComponentCachingLogic;
@@ -304,6 +305,11 @@ public class IconCache extends BaseIconCache {
         CacheEntry entry = getEntryForPackageLocked(
                 infoInOut.packageName, infoInOut.user, useLowResIcon);
         applyCacheEntry(entry, infoInOut);
+        if (infoInOut.category == PackageItemInfo.CONVERSATIONS) {
+            infoInOut.title = mContext.getString(R.string.widget_category_conversations);
+            infoInOut.contentDescription = mPackageManager.getUserBadgedLabel(
+                    infoInOut.title, infoInOut.user);
+        }
     }
 
     protected void applyCacheEntry(CacheEntry entry, ItemInfoWithIcon info) {
diff --git a/src/com/android/launcher3/model/data/PackageItemInfo.java b/src/com/android/launcher3/model/data/PackageItemInfo.java
index 7617d7efd9..a81fe6a9d1 100644
--- a/src/com/android/launcher3/model/data/PackageItemInfo.java
+++ b/src/com/android/launcher3/model/data/PackageItemInfo.java
@@ -16,27 +16,47 @@
 
 package com.android.launcher3.model.data;
 
+import androidx.annotation.IntDef;
+
 import com.android.launcher3.LauncherSettings;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.util.Objects;
 
 /**
  * Represents a {@link Package} in the widget tray section.
  */
 public class PackageItemInfo extends ItemInfoWithIcon {
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({NO_CATEGORY, CONVERSATIONS})
+    public @interface Category{}
+    /** The package is not categorized in the widget tray. */
+    public static final int NO_CATEGORY = 0;
+    /** The package is categorized to conversations widget in the widget tray. */
+    public static final int CONVERSATIONS = 1;
 
     /**
      * Package name of the {@link PackageItemInfo}.
      */
-    public String packageName;
+    public final String packageName;
+
+    /** Represents a widget category shown in the widget tray section. */
+    @Category public final int category;
 
     public PackageItemInfo(String packageName) {
+        this(packageName, NO_CATEGORY);
+    }
+
+    public PackageItemInfo(String packageName, @Category int category) {
         this.packageName = packageName;
+        this.category = category;
         this.itemType = LauncherSettings.Favorites.ITEM_TYPE_NON_ACTIONABLE;
     }
 
     public PackageItemInfo(PackageItemInfo copy) {
         this.packageName = copy.packageName;
+        this.category = copy.category;
         this.itemType = LauncherSettings.Favorites.ITEM_TYPE_NON_ACTIONABLE;
     }
 
diff --git a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
index f82f2cc47a..be18e546d2 100644
--- a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
+++ b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
@@ -36,6 +36,7 @@ import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
 import com.android.launcher3.widget.picker.WidgetsDiffReporter;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -58,6 +59,9 @@ public class WidgetsModel {
     private static final String TAG = "WidgetsModel";
     private static final boolean DEBUG = false;
 
+    private static final ComponentName CONVERSATION_WIDGET = ComponentName.createRelative(
+            "com.android.systemui", ".people.widget.PeopleSpaceWidgetProvider");
+
     /* Map of widgets and shortcuts that are tracked per package. */
     private final Map<PackageItemInfo, List<WidgetItem>> mWidgetsList = new HashMap<>();
 
@@ -156,7 +160,7 @@ public class WidgetsModel {
 
         // Temporary list for {@link PackageItemInfos} to avoid having to go through
         // {@link mPackageItemInfos} to locate the key to be used for {@link #mWidgetsList}
-        HashMap<PackageUserKey, PackageItemInfo> tmpPackageItemInfos = new HashMap<>();
+        HashMap<WidgetPackageOrCategoryKey, PackageItemInfo> tmpPackageItemInfos = new HashMap<>();
 
         // Clear the lists only if this is an update on all widgets and shortcuts. If packageUser
         // isn't null, only updates the shortcuts and widgets for the app represented in
@@ -168,11 +172,11 @@ public class WidgetsModel {
         mWidgetsList.putAll(rawWidgetsShortcuts.stream()
                 .filter(new WidgetValidityCheck(app))
                 .collect(Collectors.groupingBy(item -> {
-                    PackageUserKey packageUserKey = new PackageUserKey(
-                            item.componentName.getPackageName(), item.user);
+                    WidgetPackageOrCategoryKey packageUserKey = getWidgetPackageOrCategoryKey(item);
                     PackageItemInfo pInfo = tmpPackageItemInfos.get(packageUserKey);
                     if (pInfo == null) {
-                        pInfo = new PackageItemInfo(packageUserKey.mPackageName);
+                        pInfo = new PackageItemInfo(item.componentName.getPackageName(),
+                                packageUserKey.mCategory);
                         pInfo.user = item.user;
                         tmpPackageItemInfos.put(packageUserKey,  pInfo);
                     }
@@ -224,6 +228,13 @@ public class WidgetsModel {
         return null;
     }
 
+    private WidgetPackageOrCategoryKey getWidgetPackageOrCategoryKey(WidgetItem item) {
+        if (CONVERSATION_WIDGET.equals(item.componentName)) {
+            return new WidgetPackageOrCategoryKey(PackageItemInfo.CONVERSATIONS, item.user);
+        }
+        return new WidgetPackageOrCategoryKey(item.componentName.getPackageName(), item.user);
+    }
+
     private static class WidgetValidityCheck implements Predicate<WidgetItem> {
 
         private final InvariantDeviceProfile mIdp;
@@ -265,4 +276,40 @@ public class WidgetsModel {
             return true;
         }
     }
+
+    /** A hash key for grouping widgets by package name or category. */
+    private static class WidgetPackageOrCategoryKey {
+        /**
+         * The package name of the widget provider.
+         *
+         * <p>This shouldn't be empty if {@link #mCategory} has a value,
+         * {@link PackageItemInfo#NO_CATEGORY}.
+         */
+        public final String mPackage;
+        /** A widget category. */
+        @PackageItemInfo.Category public final int mCategory;
+        public final UserHandle mUser;
+        private final int mHashCode;
+
+        WidgetPackageOrCategoryKey(String packageName, UserHandle user) {
+            this(packageName,  PackageItemInfo.NO_CATEGORY, user);
+        }
+
+        WidgetPackageOrCategoryKey(@PackageItemInfo.Category int category, UserHandle user) {
+            this("", category, user);
+        }
+
+        private WidgetPackageOrCategoryKey(String packageName,
+                @PackageItemInfo.Category int category, UserHandle user) {
+            mPackage = packageName;
+            mCategory = category;
+            mUser = user;
+            mHashCode = Arrays.hashCode(new Object[]{mPackage, mCategory, mUser});
+        }
+
+        @Override
+        public int hashCode() {
+            return mHashCode;
+        }
+    }
 }
\ No newline at end of file
-- 
GitLab


From ffb976c4042e9c31e2bc26987a117ae12117c5c1 Mon Sep 17 00:00:00 2001
From: shawnlin <shawnlin@google.com>
Date: Fri, 19 Mar 2021 16:04:14 +0800
Subject: [PATCH 0850/1664] Attached the navigation bar to app for launching
 from Launcher

- Play the nav bar fade-out animation at the same time when the app
  launching animation starts and make the fade-in animation ends at the
  same time when app launching animation ends.
- To make the nav bar fade-in animation looks like it's attached to the
  app, apply crop rect and translation that the app targets apply to the
  nav target.

Bug: 181638132
Test: manual: click app icon on launcher to launch an activity and
observe the navigation bar animation.

Change-Id: If7e610eca5fccbb747a76c87335a600b018195a6
---
 .../launcher3/QuickstepTransitionManager.java | 52 +++++++++++++++----
 .../quickstep/FallbackSwipeHandler.java       |  3 +-
 .../android/quickstep/RecentsActivity.java    |  7 +--
 .../quickstep/RecentsAnimationTargets.java    |  2 +-
 .../quickstep/RemoteAnimationTargets.java     | 22 +++++++-
 .../com/android/quickstep/TaskViewUtils.java  | 52 ++++++++++++++++---
 .../util/MultiValueUpdateListener.java        |  7 +++
 .../util/RemoteFadeOutAnimationListener.java  |  3 +-
 .../util/SplitSelectStateController.java      |  2 +-
 .../quickstep/util/TransformParams.java       |  2 +-
 .../android/quickstep/views/RecentsView.java  |  3 +-
 .../com/android/quickstep/views/TaskView.java |  2 +-
 .../launcher3/anim/PendingAnimation.java      |  9 +++-
 13 files changed, 137 insertions(+), 29 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 82a83fc073..009ca27603 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -61,6 +61,8 @@ import android.os.Looper;
 import android.os.SystemProperties;
 import android.util.Pair;
 import android.view.View;
+import android.view.animation.Interpolator;
+import android.view.animation.PathInterpolator;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -137,6 +139,15 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
     private static final long APP_LAUNCH_ALPHA_DOWN_DURATION =
             (long) (APP_LAUNCH_ALPHA_DURATION * APP_LAUNCH_DOWN_DUR_SCALE_FACTOR);
 
+    public static final int ANIMATION_NAV_FADE_IN_DURATION = 266;
+    public static final int ANIMATION_NAV_FADE_OUT_DURATION = 133;
+    public static final long ANIMATION_DELAY_NAV_FADE_IN =
+            APP_LAUNCH_DURATION - ANIMATION_NAV_FADE_IN_DURATION;
+    public static final Interpolator NAV_FADE_IN_INTERPOLATOR =
+            new PathInterpolator(0f, 0f, 0f, 1f);
+    public static final Interpolator NAV_FADE_OUT_INTERPOLATOR =
+            new PathInterpolator(0.2f, 0f, 1f, 1f);
+
     private static final long CROP_DURATION = 375;
     private static final long RADIUS_DURATION = 375;
 
@@ -276,10 +287,11 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
      */
     protected void composeRecentsLaunchAnimator(@NonNull AnimatorSet anim, @NonNull View v,
             @NonNull RemoteAnimationTargetCompat[] appTargets,
-            @NonNull RemoteAnimationTargetCompat[] wallpaperTargets, boolean launcherClosing) {
+            @NonNull RemoteAnimationTargetCompat[] wallpaperTargets,
+            @NonNull RemoteAnimationTargetCompat[] nonAppTargets, boolean launcherClosing) {
         TaskViewUtils.composeRecentsLaunchAnimator(anim, v, appTargets, wallpaperTargets,
-                launcherClosing, mLauncher.getStateManager(), mLauncher.getOverviewPanel(),
-                mLauncher.getDepthController());
+                nonAppTargets, launcherClosing, mLauncher.getStateManager(),
+                mLauncher.getOverviewPanel(), mLauncher.getDepthController());
     }
 
     private boolean areAllTargetsTranslucent(@NonNull RemoteAnimationTargetCompat[] targets) {
@@ -305,6 +317,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
     private void composeIconLaunchAnimator(@NonNull AnimatorSet anim, @NonNull View v,
             @NonNull RemoteAnimationTargetCompat[] appTargets,
             @NonNull RemoteAnimationTargetCompat[] wallpaperTargets,
+            @NonNull RemoteAnimationTargetCompat[] nonAppTargets,
             boolean launcherClosing) {
         // Set the state animation first so that any state listeners are called
         // before our internal listeners.
@@ -313,8 +326,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
         final int rotationChange = getRotationChange(appTargets);
         // Note: the targetBounds are relative to the launcher
         Rect windowTargetBounds = getWindowTargetBounds(appTargets, rotationChange);
-        anim.play(getOpeningWindowAnimators(v, appTargets, wallpaperTargets, windowTargetBounds,
-                areAllTargetsTranslucent(appTargets), rotationChange));
+        anim.play(getOpeningWindowAnimators(v, appTargets, wallpaperTargets, nonAppTargets,
+                windowTargetBounds, areAllTargetsTranslucent(appTargets), rotationChange));
         if (launcherClosing) {
             Pair<AnimatorSet, Runnable> launcherContentAnimator =
                     getLauncherContentAnimator(true /* isAppOpening */,
@@ -515,6 +528,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
     private Animator getOpeningWindowAnimators(View v,
             RemoteAnimationTargetCompat[] appTargets,
             RemoteAnimationTargetCompat[] wallpaperTargets,
+            RemoteAnimationTargetCompat[] nonAppTargets,
             Rect windowTargetBounds, boolean appTargetsAreTranslucent, int rotationChange) {
         RectF launcherIconBounds = new RectF();
         FloatingIconView floatingView = FloatingIconView.getFloatingIconView(mLauncher, v,
@@ -523,10 +537,11 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
         Matrix matrix = new Matrix();
 
         RemoteAnimationTargets openingTargets = new RemoteAnimationTargets(appTargets,
-                wallpaperTargets, MODE_OPENING);
+                wallpaperTargets, nonAppTargets, MODE_OPENING);
         SurfaceTransactionApplier surfaceApplier =
                 new SurfaceTransactionApplier(floatingView);
         openingTargets.addReleaseCheck(surfaceApplier);
+        RemoteAnimationTargetCompat navBarTarget = openingTargets.getNavBarRemoteAnimationTarget();
 
         int[] dragLayerBounds = new int[2];
         mDragLayer.getLocationOnScreen(dragLayerBounds);
@@ -601,6 +616,11 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
             FloatProp mCropRectHeight = new FloatProp(prop.cropHeightStart, prop.cropHeightEnd, 0,
                     CROP_DURATION, EXAGGERATED_EASE);
 
+            FloatProp mNavFadeOut = new FloatProp(1f, 0f, 0, ANIMATION_NAV_FADE_OUT_DURATION,
+                    NAV_FADE_OUT_INTERPOLATOR);
+            FloatProp mNavFadeIn = new FloatProp(0f, 1f, ANIMATION_DELAY_NAV_FADE_IN,
+                    ANIMATION_NAV_FADE_IN_DURATION, NAV_FADE_IN_INTERPOLATOR);
+
             @Override
             public void onUpdate(float percent) {
                 // Calculate the size of the scaled icon.
@@ -706,6 +726,21 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                     params[i] = builder.build();
                 }
                 surfaceApplier.scheduleApply(params);
+
+                if (navBarTarget != null) {
+                    final SurfaceParams.Builder navBuilder =
+                            new SurfaceParams.Builder(navBarTarget.leash);
+                    if (mNavFadeIn.value > mNavFadeIn.getStartValue()) {
+                        matrix.setScale(scale, scale);
+                        matrix.postTranslate(windowTransX0, windowTransY0);
+                        navBuilder.withMatrix(matrix)
+                                .withWindowCrop(crop)
+                                .withAlpha(mNavFadeIn.value);
+                    } else {
+                        navBuilder.withAlpha(mNavFadeOut.value);
+                    }
+                    surfaceApplier.scheduleApply(navBuilder.build());
+                }
             }
         });
 
@@ -1088,19 +1123,18 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                 RemoteAnimationTargetCompat[] nonAppTargets,
                 LauncherAnimationRunner.AnimationResult result) {
             AnimatorSet anim = new AnimatorSet();
-
             boolean launcherClosing =
                     launcherIsATargetWithMode(appTargets, MODE_CLOSING);
 
             final boolean launchingFromRecents = isLaunchingFromRecents(mV, appTargets);
             final boolean launchingFromTaskbar = mLauncher.isViewInTaskbar(mV);
             if (launchingFromRecents) {
-                composeRecentsLaunchAnimator(anim, mV, appTargets, wallpaperTargets,
+                composeRecentsLaunchAnimator(anim, mV, appTargets, wallpaperTargets, nonAppTargets,
                         launcherClosing);
             } else if (launchingFromTaskbar) {
                 // TODO
             } else {
-                composeIconLaunchAnimator(anim, mV, appTargets, wallpaperTargets,
+                composeIconLaunchAnimator(anim, mV, appTargets, wallpaperTargets, nonAppTargets,
                         launcherClosing);
             }
 
diff --git a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
index 7e4a352d93..ec1cc4a648 100644
--- a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
+++ b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
@@ -247,7 +247,8 @@ public class FallbackSwipeHandler extends
             if (appearedTaskTarget.activityType == ACTIVITY_TYPE_HOME) {
                 RemoteAnimationTargets targets = new RemoteAnimationTargets(
                         new RemoteAnimationTargetCompat[] {appearedTaskTarget},
-                        new RemoteAnimationTargetCompat[0], appearedTaskTarget.mode);
+                        new RemoteAnimationTargetCompat[0], new RemoteAnimationTargetCompat[0],
+                        appearedTaskTarget.mode);
                 mHomeAlphaParams.setTargetSet(targets);
                 updateHomeAlpha();
                 return true;
diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index 1340abb6ab..06137f22b0 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -192,7 +192,7 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
                     RemoteAnimationTargetCompat[] nonAppTargets,
                     AnimationResult result) -> {
             AnimatorSet anim = composeRecentsLaunchAnimator(taskView, appTargets,
-                    wallpaperTargets);
+                    wallpaperTargets, nonAppTargets);
             anim.addListener(resetStateListener());
             result.setAnimation(anim, RecentsActivity.this, onEndCallback::executeAllAndDestroy);
         };
@@ -213,12 +213,13 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
      */
     private AnimatorSet  composeRecentsLaunchAnimator(TaskView taskView,
             RemoteAnimationTargetCompat[] appTargets,
-            RemoteAnimationTargetCompat[] wallpaperTargets) {
+            RemoteAnimationTargetCompat[] wallpaperTargets,
+            RemoteAnimationTargetCompat[] nonAppTargets) {
         AnimatorSet target = new AnimatorSet();
         boolean activityClosing = taskIsATargetWithMode(appTargets, getTaskId(), MODE_CLOSING);
         PendingAnimation pa = new PendingAnimation(RECENTS_LAUNCH_DURATION);
         createRecentsWindowAnimator(taskView, !activityClosing, appTargets,
-                wallpaperTargets, null /* depthController */, pa);
+                wallpaperTargets, nonAppTargets, null /* depthController */, pa);
         target.play(pa.buildAnim());
 
         // Found a visible recents task that matches the opening app, lets launch the app from there
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationTargets.java b/quickstep/src/com/android/quickstep/RecentsAnimationTargets.java
index 718c5baa2c..3861bab04b 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationTargets.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationTargets.java
@@ -33,7 +33,7 @@ public class RecentsAnimationTargets extends RemoteAnimationTargets {
     public RecentsAnimationTargets(RemoteAnimationTargetCompat[] apps,
             RemoteAnimationTargetCompat[] wallpapers, Rect homeContentInsets,
             Rect minimizedHomeBounds) {
-        super(apps, wallpapers, MODE_CLOSING);
+        super(apps, wallpapers, new RemoteAnimationTargetCompat[0], MODE_CLOSING);
         this.homeContentInsets = homeContentInsets;
         this.minimizedHomeBounds = minimizedHomeBounds;
     }
diff --git a/quickstep/src/com/android/quickstep/RemoteAnimationTargets.java b/quickstep/src/com/android/quickstep/RemoteAnimationTargets.java
index ab5e3ba0cc..a1af77d382 100644
--- a/quickstep/src/com/android/quickstep/RemoteAnimationTargets.java
+++ b/quickstep/src/com/android/quickstep/RemoteAnimationTargets.java
@@ -15,6 +15,8 @@
  */
 package com.android.quickstep;
 
+import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR;
+
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
 import java.util.ArrayList;
@@ -30,13 +32,15 @@ public class RemoteAnimationTargets {
     public final RemoteAnimationTargetCompat[] unfilteredApps;
     public final RemoteAnimationTargetCompat[] apps;
     public final RemoteAnimationTargetCompat[] wallpapers;
+    public final RemoteAnimationTargetCompat[] nonApps;
     public final int targetMode;
     public final boolean hasRecents;
 
     private boolean mReleased = false;
 
     public RemoteAnimationTargets(RemoteAnimationTargetCompat[] apps,
-            RemoteAnimationTargetCompat[] wallpapers, int targetMode) {
+            RemoteAnimationTargetCompat[] wallpapers, RemoteAnimationTargetCompat[] nonApps,
+            int targetMode) {
         ArrayList<RemoteAnimationTargetCompat> filteredApps = new ArrayList<>();
         boolean hasRecents = false;
         if (apps != null) {
@@ -55,6 +59,7 @@ public class RemoteAnimationTargets {
         this.wallpapers = wallpapers;
         this.targetMode = targetMode;
         this.hasRecents = hasRecents;
+        this.nonApps = nonApps;
     }
 
     public RemoteAnimationTargetCompat findTask(int taskId) {
@@ -66,6 +71,18 @@ public class RemoteAnimationTargets {
         return null;
     }
 
+    /**
+     * Gets the navigation bar remote animation target if exists.
+     */
+    public RemoteAnimationTargetCompat getNavBarRemoteAnimationTarget() {
+        for (RemoteAnimationTargetCompat target : nonApps) {
+            if (target.windowType == TYPE_NAVIGATION_BAR) {
+                return target;
+            }
+        }
+        return null;
+    }
+
     public boolean isAnimatingHome() {
         for (RemoteAnimationTargetCompat target : unfilteredApps) {
             if (target.activityType == RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME) {
@@ -98,6 +115,9 @@ public class RemoteAnimationTargets {
         for (RemoteAnimationTargetCompat target : wallpapers) {
             target.release();
         }
+        for (RemoteAnimationTargetCompat target : nonApps) {
+            target.release();
+        }
     }
 
     /**
diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java
index f14f60bb91..bea1250091 100644
--- a/quickstep/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java
@@ -18,6 +18,11 @@ package com.android.quickstep;
 import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA;
 import static com.android.launcher3.LauncherState.BACKGROUND_APP;
 import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.QuickstepTransitionManager.ANIMATION_DELAY_NAV_FADE_IN;
+import static com.android.launcher3.QuickstepTransitionManager.ANIMATION_NAV_FADE_IN_DURATION;
+import static com.android.launcher3.QuickstepTransitionManager.ANIMATION_NAV_FADE_OUT_DURATION;
+import static com.android.launcher3.QuickstepTransitionManager.NAV_FADE_IN_INTERPOLATOR;
+import static com.android.launcher3.QuickstepTransitionManager.NAV_FADE_OUT_INTERPOLATOR;
 import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DURATION;
 import static com.android.launcher3.Utilities.getDescendantCoordRelativeToAncestor;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
@@ -58,6 +63,7 @@ import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.util.DisplayController;
+import com.android.quickstep.util.MultiValueUpdateListener;
 import com.android.quickstep.util.SurfaceTransactionApplier;
 import com.android.quickstep.util.TaskViewSimulator;
 import com.android.quickstep.util.TransformParams;
@@ -67,6 +73,7 @@ import com.android.quickstep.views.TaskView;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
+import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
 
 /**
  * Utility class for helpful methods related to {@link TaskView} objects and their tasks.
@@ -137,7 +144,8 @@ public final class TaskViewUtils {
 
     public static void createRecentsWindowAnimator(TaskView v, boolean skipViewChanges,
             RemoteAnimationTargetCompat[] appTargets,
-            RemoteAnimationTargetCompat[] wallpaperTargets, DepthController depthController,
+            RemoteAnimationTargetCompat[] wallpaperTargets,
+            RemoteAnimationTargetCompat[] nonAppTargets, DepthController depthController,
             PendingAnimation out) {
         boolean isRunningTask = v.isRunningTask();
         TransformParams params = null;
@@ -146,7 +154,7 @@ public final class TaskViewUtils {
             params = v.getRecentsView().getLiveTileParams();
             tsv = v.getRecentsView().getLiveTileTaskViewSimulator();
         }
-        createRecentsWindowAnimator(v, skipViewChanges, appTargets, wallpaperTargets,
+        createRecentsWindowAnimator(v, skipViewChanges, appTargets, wallpaperTargets, nonAppTargets,
                 depthController, out, params, tsv);
     }
 
@@ -156,7 +164,8 @@ public final class TaskViewUtils {
      */
     public static void createRecentsWindowAnimator(TaskView v, boolean skipViewChanges,
             RemoteAnimationTargetCompat[] appTargets,
-            RemoteAnimationTargetCompat[] wallpaperTargets, DepthController depthController,
+            RemoteAnimationTargetCompat[] wallpaperTargets,
+            RemoteAnimationTargetCompat[] nonAppTargets, DepthController depthController,
             PendingAnimation out, @Nullable TransformParams params,
             @Nullable TaskViewSimulator tsv) {
         boolean isQuickSwitch = v.isEndQuickswitchCuj();
@@ -164,8 +173,9 @@ public final class TaskViewUtils {
 
         boolean inLiveTileMode = LIVE_TILE.get() && v.getRecentsView().getRunningTaskIndex() != -1;
         final RemoteAnimationTargets targets =
-                new RemoteAnimationTargets(appTargets, wallpaperTargets,
+                new RemoteAnimationTargets(appTargets, wallpaperTargets, nonAppTargets,
                         inLiveTileMode ? MODE_CLOSING : MODE_OPENING);
+        final RemoteAnimationTargetCompat navBarTarget = targets.getNavBarRemoteAnimationTarget();
 
         if (params == null) {
             SurfaceTransactionApplier applier = new SurfaceTransactionApplier(v);
@@ -225,6 +235,30 @@ public final class TaskViewUtils {
             TaskViewSimulator finalTsv = tsv;
             TransformParams finalParams = params;
             out.addOnFrameCallback(() -> finalTsv.apply(finalParams));
+            if (navBarTarget != null) {
+                final Rect cropRect = new Rect();
+                out.addOnFrameListener(new MultiValueUpdateListener() {
+                    FloatProp mNavFadeOut = new FloatProp(1f, 0f, 0,
+                            ANIMATION_NAV_FADE_OUT_DURATION, NAV_FADE_OUT_INTERPOLATOR);
+                    FloatProp mNavFadeIn = new FloatProp(0f, 1f, ANIMATION_DELAY_NAV_FADE_IN,
+                            ANIMATION_NAV_FADE_IN_DURATION, NAV_FADE_IN_INTERPOLATOR);
+
+                    @Override
+                    public void onUpdate(float percent) {
+                        final SurfaceParams.Builder navBuilder =
+                                new SurfaceParams.Builder(navBarTarget.leash);
+                        if (mNavFadeIn.value > mNavFadeIn.getStartValue()) {
+                            finalTsv.getCurrentCropRect().round(cropRect);
+                            navBuilder.withMatrix(finalTsv.getCurrentMatrix())
+                                    .withWindowCrop(cropRect)
+                                    .withAlpha(mNavFadeIn.value);
+                        } else {
+                            navBuilder.withAlpha(mNavFadeOut.value);
+                        }
+                        finalParams.applySurfaceParams(navBuilder.build());
+                    }
+                });
+            }
             topMostSimulator = tsv;
         }
 
@@ -320,7 +354,8 @@ public final class TaskViewUtils {
      */
     public static void composeRecentsSplitLaunchAnimator(@NonNull AnimatorSet anim,
             @NonNull TaskView v, @NonNull RemoteAnimationTargetCompat[] appTargets,
-            @NonNull RemoteAnimationTargetCompat[] wallpaperTargets, boolean launcherClosing,
+            @NonNull RemoteAnimationTargetCompat[] wallpaperTargets,
+            @NonNull RemoteAnimationTargetCompat[] nonAppTargets, boolean launcherClosing,
             @NonNull StateManager stateManager, @NonNull DepthController depthController,
             int targetStage) {
         PendingAnimation out = new PendingAnimation(RECENTS_LAUNCH_DURATION);
@@ -336,7 +371,7 @@ public final class TaskViewUtils {
         boolean inLiveTileMode =
                 ENABLE_QUICKSTEP_LIVE_TILE.get() && recentsView.getRunningTaskIndex() != -1;
         final RemoteAnimationTargets targets =
-                new RemoteAnimationTargets(appTargets, wallpaperTargets,
+                new RemoteAnimationTargets(appTargets, wallpaperTargets, nonAppTargets,
                         inLiveTileMode ? MODE_CLOSING : MODE_OPENING);
 
         if (params == null) {
@@ -392,7 +427,8 @@ public final class TaskViewUtils {
 
     public static void composeRecentsLaunchAnimator(@NonNull AnimatorSet anim, @NonNull View v,
             @NonNull RemoteAnimationTargetCompat[] appTargets,
-            @NonNull RemoteAnimationTargetCompat[] wallpaperTargets, boolean launcherClosing,
+            @NonNull RemoteAnimationTargetCompat[] wallpaperTargets,
+            @NonNull RemoteAnimationTargetCompat[] nonAppTargets, boolean launcherClosing,
             @NonNull StateManager stateManager, @NonNull RecentsView recentsView,
             @NonNull DepthController depthController) {
         boolean skipLauncherChanges = !launcherClosing;
@@ -400,7 +436,7 @@ public final class TaskViewUtils {
         TaskView taskView = findTaskViewToLaunch(recentsView, v, appTargets);
         PendingAnimation pa = new PendingAnimation(RECENTS_LAUNCH_DURATION);
         createRecentsWindowAnimator(taskView, skipLauncherChanges, appTargets, wallpaperTargets,
-                depthController, pa);
+                nonAppTargets, depthController, pa);
 
         Animator childStateAnimation = null;
         // Found a visible recents task that matches the opening app, lets launch the app from there
diff --git a/quickstep/src/com/android/quickstep/util/MultiValueUpdateListener.java b/quickstep/src/com/android/quickstep/util/MultiValueUpdateListener.java
index e798d5cbcc..b4ae1ca7fb 100644
--- a/quickstep/src/com/android/quickstep/util/MultiValueUpdateListener.java
+++ b/quickstep/src/com/android/quickstep/util/MultiValueUpdateListener.java
@@ -64,5 +64,12 @@ public abstract class MultiValueUpdateListener implements ValueAnimator.Animator
 
             mAllProperties.add(this);
         }
+
+        /**
+         * Gets the start value.
+         */
+        public float getStartValue() {
+            return mStart;
+        }
     }
 }
diff --git a/quickstep/src/com/android/quickstep/util/RemoteFadeOutAnimationListener.java b/quickstep/src/com/android/quickstep/util/RemoteFadeOutAnimationListener.java
index 958ee2478c..81c124f7e2 100644
--- a/quickstep/src/com/android/quickstep/util/RemoteFadeOutAnimationListener.java
+++ b/quickstep/src/com/android/quickstep/util/RemoteFadeOutAnimationListener.java
@@ -34,7 +34,8 @@ public class RemoteFadeOutAnimationListener implements AnimatorUpdateListener {
 
     public RemoteFadeOutAnimationListener(RemoteAnimationTargetCompat[] appTargets,
             RemoteAnimationTargetCompat[] wallpaperTargets) {
-        mTarget = new RemoteAnimationTargets(appTargets, wallpaperTargets, MODE_CLOSING);
+        mTarget = new RemoteAnimationTargets(appTargets, wallpaperTargets,
+                new RemoteAnimationTargetCompat[0], MODE_CLOSING);
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
index d9154edc8d..e3f29257c5 100644
--- a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
+++ b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
@@ -130,7 +130,7 @@ public class SplitSelectStateController {
             AnimatorSet anim = new AnimatorSet();
             BaseQuickstepLauncher activity = BaseActivity.fromContext(mV.getContext());
             TaskViewUtils.composeRecentsSplitLaunchAnimator(anim, mV,
-                    appTargets, wallpaperTargets, true, activity.getStateManager(),
+                    appTargets, wallpaperTargets, nonAppTargets, true, activity.getStateManager(),
                     activity.getDepthController(), mTargetState);
             result.setAnimation(anim, activity);
         }
diff --git a/quickstep/src/com/android/quickstep/util/TransformParams.java b/quickstep/src/com/android/quickstep/util/TransformParams.java
index 756331dcdf..03d7a37748 100644
--- a/quickstep/src/com/android/quickstep/util/TransformParams.java
+++ b/quickstep/src/com/android/quickstep/util/TransformParams.java
@@ -205,7 +205,7 @@ public class TransformParams {
         return mTargetSet;
     }
 
-    public void applySurfaceParams(SurfaceParams[] params) {
+    public void applySurfaceParams(SurfaceParams... params) {
         if (mSyncTransactionApplier != null) {
             mSyncTransactionApplier.scheduleApply(params);
         } else {
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index c39e7df8c6..524bae160e 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -766,7 +766,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         } else {
             TaskViewUtils.composeRecentsLaunchAnimator(
                     anim, taskView, apps,
-                    mLiveTileParams.getTargetSet().wallpapers, true /* launcherClosing */,
+                    mLiveTileParams.getTargetSet().wallpapers,
+                    mLiveTileParams.getTargetSet().nonApps, true /* launcherClosing */,
                     mActivity.getStateManager(), this,
                     getDepthController());
         }
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 3cd9175764..8c71ab3a6f 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -489,7 +489,7 @@ public class TaskView extends FrameLayout implements Reusable {
             AnimatorSet anim = new AnimatorSet();
             TaskViewUtils.composeRecentsLaunchAnimator(
                     anim, this, targets.apps,
-                    targets.wallpapers, true /* launcherClosing */,
+                    targets.wallpapers, targets.nonApps, true /* launcherClosing */,
                     mActivity.getStateManager(), recentsView,
                     recentsView.getDepthController());
             anim.addListener(new AnimatorListenerAdapter() {
diff --git a/src/com/android/launcher3/anim/PendingAnimation.java b/src/com/android/launcher3/anim/PendingAnimation.java
index 4e90c9e67f..9068331dbe 100644
--- a/src/com/android/launcher3/anim/PendingAnimation.java
+++ b/src/com/android/launcher3/anim/PendingAnimation.java
@@ -117,11 +117,18 @@ public class PendingAnimation implements PropertySetter {
      * Adds a callback to be run on every frame of the animation
      */
     public void addOnFrameCallback(Runnable runnable) {
+        addOnFrameListener(anim -> runnable.run());
+    }
+
+    /**
+     * Adds a listener to be run on every frame of the animation
+     */
+    public void addOnFrameListener(ValueAnimator.AnimatorUpdateListener listener) {
         if (mProgressAnimator == null) {
             mProgressAnimator = ValueAnimator.ofFloat(0, 1);
         }
 
-        mProgressAnimator.addUpdateListener(anim -> runnable.run());
+        mProgressAnimator.addUpdateListener(listener);
     }
 
     /**
-- 
GitLab


From 7a1ca0b299f4711b6511aafe2d6bc24ee7bcc526 Mon Sep 17 00:00:00 2001
From: Andras Kloczl <andraskloczl@google.com>
Date: Thu, 8 Apr 2021 16:08:16 +0200
Subject: [PATCH 0851/1664] Launcher home currentpage refactoring

Calling cancelLongPress on all the visible pages when needed
and enabling hardware acceleration on them when a folder
animation is in progress.

Test: manual
Bug: 174464691
Change-Id: Ib11265abfd184fed41acc9a6347a32aec12895f2
---
 src/com/android/launcher3/PagedView.java     |  3 +--
 src/com/android/launcher3/folder/Folder.java | 27 ++++++++++++++------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 01f7c71daf..7496703f88 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -926,8 +926,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         if (disallowIntercept) {
             // We need to make sure to cancel our long press if
             // a scrollable widget takes over touch events
-            final View currentPage = getPageAt(mCurrentPage);
-            currentPage.cancelLongPress();
+            cancelCurrentPageLongPress();
         }
         super.requestDisallowInterceptTouchEvent(disallowIntercept);
     }
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index a1b79970d8..cf1cb45440 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -78,7 +78,6 @@ import com.android.launcher3.PagedView;
 import com.android.launcher3.R;
 import com.android.launcher3.ShortcutAndWidgetContainer;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.Workspace;
 import com.android.launcher3.Workspace.ItemOperator;
 import com.android.launcher3.accessibility.AccessibleDragListenerAdapter;
 import com.android.launcher3.accessibility.FolderAccessibilityHelper;
@@ -534,9 +533,25 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
     }
 
     private void startAnimation(final AnimatorSet a) {
-        final Workspace workspace = mLauncher.getWorkspace();
-        final CellLayout currentCellLayout =
-                (CellLayout) workspace.getChildAt(workspace.getCurrentPage());
+        mLauncher.getWorkspace().getVisiblePages()
+                .forEach(visiblePage -> addAnimatorListenerForPage(a, (CellLayout) visiblePage));
+
+        a.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+                mState = STATE_ANIMATING;
+                mCurrentAnimator = a;
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                mCurrentAnimator = null;
+            }
+        });
+        a.start();
+    }
+
+    private void addAnimatorListenerForPage(AnimatorSet a, CellLayout currentCellLayout) {
         final boolean useHardware = shouldUseHardwareLayerForAnimation(currentCellLayout);
         final boolean wasHardwareAccelerated = currentCellLayout.isHardwareLayerEnabled();
 
@@ -546,8 +561,6 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
                 if (useHardware) {
                     currentCellLayout.enableHardwareLayer(true);
                 }
-                mState = STATE_ANIMATING;
-                mCurrentAnimator = a;
             }
 
             @Override
@@ -555,10 +568,8 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
                 if (useHardware) {
                     currentCellLayout.enableHardwareLayer(wasHardwareAccelerated);
                 }
-                mCurrentAnimator = null;
             }
         });
-        a.start();
     }
 
     private boolean shouldUseHardwareLayerForAnimation(CellLayout currentCellLayout) {
-- 
GitLab


From 46fbb5c702a5eea697f302ec10e1667c28de5ffc Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pbdr@google.com>
Date: Fri, 9 Apr 2021 10:53:39 +0100
Subject: [PATCH 0852/1664] Update the test appwidget for dynamic colors

Fix: 184924547
Test: Installed widget locally
Change-Id: Icb50cfd5cec053c3cbe9b25fe317ad71e0b16bf6
---
 tests/res/layout/test_layout_appwidget_dynamic_colors.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/res/layout/test_layout_appwidget_dynamic_colors.xml b/tests/res/layout/test_layout_appwidget_dynamic_colors.xml
index 21625c643d..56c343ef4c 100644
--- a/tests/res/layout/test_layout_appwidget_dynamic_colors.xml
+++ b/tests/res/layout/test_layout_appwidget_dynamic_colors.xml
@@ -14,7 +14,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="prim"/>
+            android:text="neut1"/>
         <ImageView
             android:layout_width="24dp"
             android:layout_height="24dp"
@@ -28,7 +28,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="second"/>
+            android:text="accent1"/>
         <ImageView
             android:layout_width="24dp"
             android:layout_height="24dp"
@@ -42,11 +42,11 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="neutral"/>
+            android:text="accent2"/>
         <ImageView
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:background="@android:color/system_neutral2_500"/>
+            android:background="@android:color/system_accent2_500"/>
     </LinearLayout>
 
     </LinearLayout>
\ No newline at end of file
-- 
GitLab


From 369117904157a361abc13ddfa2a1d69de1e8696e Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Fri, 9 Apr 2021 11:15:50 +0100
Subject: [PATCH 0853/1664] Set width & height of app icons in all widgets tray
 to 48dp

Bug: 184877669
Test: Change the grid size and observe app icons in all widgets
      tray stay the same.
Change-Id: I856d5fada579474fffb6296d641fb686623ca2cc
---
 res/layout/widgets_list_row_header.xml                       | 4 +++-
 .../android/launcher3/widget/picker/WidgetsListHeader.java   | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/res/layout/widgets_list_row_header.xml b/res/layout/widgets_list_row_header.xml
index 598041cd3f..8259c16612 100644
--- a/res/layout/widgets_list_row_header.xml
+++ b/res/layout/widgets_list_row_header.xml
@@ -15,6 +15,7 @@
 -->
 <com.android.launcher3.widget.picker.WidgetsListHeader xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto"
     android:id="@+id/widgets_list_header"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -22,7 +23,8 @@
     android:background="@drawable/widgets_list_middle_ripple"
     android:layout_marginBottom="@dimen/widget_list_entry_bottom_margin"
     android:paddingVertical="@dimen/widget_list_header_view_vertical_padding"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    launcher:appIconSize="48dp">
 
     <ImageView
         android:id="@+id/app_icon"
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListHeader.java b/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
index 497c72e540..8794a4a7e7 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
@@ -156,6 +156,11 @@ public final class WidgetsListHeader extends LinearLayout implements ItemInfoUpd
     private void applyDrawables(Drawable icon) {
         icon.setBounds(0, 0, mIconSize, mIconSize);
 
+        LinearLayout.LayoutParams layoutParams =
+                (LinearLayout.LayoutParams) mAppIcon.getLayoutParams();
+        layoutParams.width = mIconSize;
+        layoutParams.height = mIconSize;
+        mAppIcon.setLayoutParams(layoutParams);
         mAppIcon.setImageDrawable(icon);
 
         // If the current icon is a placeholder color, animate its update.
-- 
GitLab


From f22239191dc718b86929eb5bdb8114539f568f56 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Fri, 9 Apr 2021 14:54:35 +0100
Subject: [PATCH 0854/1664] Set a max down scale ratio for recommended widgets

If the down scale ratio is smaller than the max down scale ratio,
recommended widgets won't be shown

Bug: 183500375
Test: Rotate to landscape on Pixel 3 and then launch widget picker.
      Recommended widgets are not shown. Rotate to portrait.
      Recommended widgets are shown.
Change-Id: I48b76b23c5bf505c79da82c7b27ea4db85f5d717
---
 .../picker/WidgetsRecommendationTableLayout.java      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
index 6569fb0d48..73f1f1925f 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
@@ -17,6 +17,7 @@ package com.android.launcher3.widget.picker;
 
 import android.content.Context;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
@@ -38,7 +39,9 @@ import java.util.List;
 
 /** A {@link TableLayout} for showing recommended widgets. */
 public final class WidgetsRecommendationTableLayout extends TableLayout {
-    private static final float SCALE_DOWN_RATIO = 0.9f;
+    private static final String TAG = "WidgetsRecommendationTableLayout";
+    private static final float DOWN_SCALE_RATIO = 0.9f;
+    private static final float MAX_DOWN_SCALE_RATIO = 0.5f;
     private final DeviceProfile mDeviceProfile;
     private final float mWidgetCellTextViewsHeight;
 
@@ -131,6 +134,10 @@ public final class WidgetsRecommendationTableLayout extends TableLayout {
     private RecommendationTableData fitRecommendedWidgetsToTableSpace(
             float previewScale,
             List<ArrayList<WidgetItem>> recommendedWidgetsInTable) {
+        if (previewScale < MAX_DOWN_SCALE_RATIO) {
+            Log.w(TAG, "Hide recommended widgets. Can't down scale previews to " + previewScale);
+            return new RecommendationTableData(List.of(), previewScale);
+        }
         // A naive estimation of the widgets recommendation table height without inflation.
         float totalHeight = 0;
         for (int i = 0; i < recommendedWidgetsInTable.size(); i++) {
@@ -157,7 +164,7 @@ public final class WidgetsRecommendationTableLayout extends TableLayout {
                             /* toIndex= */recommendedWidgetsInTable.size() - 1));
         }
 
-        float nextPreviewScale = previewScale * SCALE_DOWN_RATIO;
+        float nextPreviewScale = previewScale * DOWN_SCALE_RATIO;
         return fitRecommendedWidgetsToTableSpace(nextPreviewScale, recommendedWidgetsInTable);
     }
 
-- 
GitLab


From f7b7faed7747743941177ab4bdb48a50c15a5300 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Fri, 9 Apr 2021 15:25:43 +0100
Subject: [PATCH 0855/1664] Fix drag-n-drop for recommended widgets

Bug: 184917820
Test: Drag-n-drop a recommended widget from the all widgets tray
Change-Id: If9efffc2e156836ff1b4048c3d40782ba4d5976b
---
 .../widget/picker/WidgetsRecommendationTableLayout.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
index 6569fb0d48..eacd01c590 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
@@ -19,6 +19,7 @@ import android.content.Context;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.LayoutInflater;
+import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TableLayout;
 import android.widget.TableRow;
@@ -31,7 +32,6 @@ import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.widget.WidgetCell;
-import com.android.launcher3.widget.WidgetImageView;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -119,9 +119,9 @@ public final class WidgetsRecommendationTableLayout extends TableLayout {
                 getContext()).inflate(R.layout.widget_cell, parent, false);
 
         widget.setOnTouchListener(mWidgetCellOnTouchListener);
-        WidgetImageView preview = widget.findViewById(R.id.widget_preview);
-        preview.setOnClickListener(mWidgetCellOnClickListener);
-        preview.setOnLongClickListener(mWidgetCellOnLongClickListener);
+        View previewContainer = widget.findViewById(R.id.widget_preview_container);
+        previewContainer.setOnClickListener(mWidgetCellOnClickListener);
+        previewContainer.setOnLongClickListener(mWidgetCellOnLongClickListener);
         widget.setAnimatePreview(false);
 
         parent.addView(widget);
-- 
GitLab


From 5eff0bbe13f98cf1efcde90f60bcdc5ed39998ff Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Fri, 9 Apr 2021 10:55:49 -0400
Subject: [PATCH 0856/1664] Remove temp logic added to migrate users to new 4x5
 grid.

Related changes:
- I81a91b8415effbe0bf7ba722f11ab44a4169e3df
- Ia7ae129048bf5878b216f31f949e10c71e608818

Bug: 183965808
Bug: 175329686
Test: manual
Change-Id: If9ae69d746f1c86db98275f0c00ae054e146b67e
---
 .../launcher3/InvariantDeviceProfile.java     |  4 ---
 .../android/launcher3/LauncherAppState.java   | 30 -------------------
 .../launcher3/config/FeatureFlags.java        | 19 ------------
 3 files changed, 53 deletions(-)

diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index 754e988da6..4a0e004db3 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -18,7 +18,6 @@ package com.android.launcher3;
 
 import static com.android.launcher3.Utilities.getDevicePrefs;
 import static com.android.launcher3.Utilities.getPointString;
-import static com.android.launcher3.config.FeatureFlags.ENABLE_FOUR_COLUMNS;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_TWO_PANEL_HOME;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.PackageManagerHelper.getPackageFilter;
@@ -245,9 +244,6 @@ public class InvariantDeviceProfile {
         if (ENABLE_TWO_PANEL_HOME.get()) {
             return ENABLE_TWO_PANEL_HOME.key;
         }
-        if (ENABLE_FOUR_COLUMNS.get()) {
-            return ENABLE_FOUR_COLUMNS.key;
-        }
         return Utilities.isGridOptionsEnabled(context)
                 ? Utilities.getPrefs(context).getString(KEY_IDP_GRID_NAME, null) : null;
     }
diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index 4754558aa1..11585f9f23 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -17,9 +17,6 @@
 package com.android.launcher3;
 
 import static com.android.launcher3.InvariantDeviceProfile.CHANGE_FLAG_ICON_PARAMS;
-import static com.android.launcher3.InvariantDeviceProfile.KEY_MIGRATION_SRC_HOTSEAT_COUNT;
-import static com.android.launcher3.InvariantDeviceProfile.KEY_MIGRATION_SRC_WORKSPACE_SIZE;
-import static com.android.launcher3.config.FeatureFlags.ENABLE_FOUR_COLUMNS;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 import static com.android.launcher3.util.SettingsCache.NOTIFICATION_BADGING_URI;
 
@@ -126,33 +123,6 @@ public class LauncherAppState {
 
         mInvariantDeviceProfile = InvariantDeviceProfile.INSTANCE.get(context);
 
-        // b/175329686 Temporary logic to gracefully migrate group of users to the new 4x5 grid.
-        String gridName = InvariantDeviceProfile.getCurrentGridName(context);
-        if (ENABLE_FOUR_COLUMNS.get()
-                || "reasonable".equals(gridName)
-                || ENABLE_FOUR_COLUMNS.key.equals(gridName)) {
-            // Reset flag and remove it from developer options to prevent it from being enabled
-            // again.
-            ENABLE_FOUR_COLUMNS.reset(context);
-            FeatureFlags.removeFlag(ENABLE_FOUR_COLUMNS);
-
-            // Force migration code to run
-            Utilities.getPrefs(context).edit()
-                    .remove(KEY_MIGRATION_SRC_HOTSEAT_COUNT)
-                    .remove(KEY_MIGRATION_SRC_WORKSPACE_SIZE)
-                    .apply();
-
-            // We make an empty call here to ensure the database is created with the old IDP grid,
-            // so that when we set the new grid the migration can proceeds as expected.
-            LauncherSettings.Settings.call(context.getContentResolver(), "");
-
-            String newGridName = "practical";
-            Utilities.getPrefs(mContext).edit().putString("idp_grid_name", newGridName).commit();
-            mInvariantDeviceProfile.setCurrentGrid(context, "practical");
-        } else {
-            FeatureFlags.removeFlag(ENABLE_FOUR_COLUMNS);
-        }
-
         mIconCache = new IconCache(mContext, mInvariantDeviceProfile, iconCacheFileName);
         mWidgetCache = new WidgetPreviewLoader(mContext, mIconCache);
         mModel = new LauncherModel(context, this, mIconCache, new AppFilter(mContext));
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 6331ef2862..81c841c6bc 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -191,10 +191,6 @@ public final class FeatureFlags {
             "EXPANDED_SMARTSPACE", false, "Expands smartspace height to two rows. "
               + "Any apps occupying the first row will be removed from workspace.");
 
-    public static final DeviceFlag ENABLE_FOUR_COLUMNS = new DeviceFlag(
-            "ENABLE_FOUR_COLUMNS", false, "Uses 4 columns in launcher grid."
-            + "Warning: This will permanently alter your home screen items and is not reversible.");
-
     // TODO: b/172467144 Remove ENABLE_LAUNCHER_ACTIVITY_THEME_CROSSFADE feature flag.
     public static final BooleanFlag ENABLE_LAUNCHER_ACTIVITY_THEME_CROSSFADE = new DeviceFlag(
             "ENABLE_LAUNCHER_ACTIVITY_THEME_CROSSFADE", false, "Enables a "
@@ -234,12 +230,6 @@ public final class FeatureFlags {
         }
     }
 
-    public static void removeFlag(DebugFlag flag) {
-        synchronized (sDebugFlags) {
-            sDebugFlags.remove(flag);
-        }
-    }
-
     static List<DebugFlag> getDebugFlags() {
         synchronized (sDebugFlags) {
             return new ArrayList<>(sDebugFlags);
@@ -317,15 +307,6 @@ public final class FeatureFlags {
                     .getBoolean(key, defaultValue);
         }
 
-        /**
-         * Resets value to default value.
-         */
-        public void reset(Context context) {
-            mCurrentValue = defaultValue;
-            context.getSharedPreferences(FLAGS_PREF_NAME, Context.MODE_PRIVATE)
-                    .edit().putBoolean(key, defaultValue).apply();
-        }
-
         @Override
         protected StringBuilder appendProps(StringBuilder src) {
             return super.appendProps(src).append(", mCurrentValue=").append(mCurrentValue);
-- 
GitLab


From 84b3ee4f28301d678220af48eefc01c2dac0db4b Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Thu, 8 Apr 2021 13:56:15 -0700
Subject: [PATCH 0857/1664] Iterate over all swipeable regions when calculating
 quickswitch gesture bounds

Previously when creating a new CurrentDisplay, we would
never get the correct OrientationRectF from the hashmap
because the size field of CurrentDisplay would be incorrect
for a given rotation.
Ex. Rotation 0 and Rotation 1 would have inverted display sizes
Thus hashcode would return different values and we would only
ever see if a point is contained in the current rotation's
OrientationRectF.

Bug: 183897242
Test: Tested swiping from portrait to landscape app, was
able to swipe continuously

Change-Id: I6de625389956f55cfc2142dcb7aeef2e90c157ac
---
 .../OrientationTouchTransformerTest.java      | 20 +++++++++++++------
 .../OrientationTouchTransformer.java          | 19 ++++++++++--------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/quickstep/robolectric_tests/src/com/android/quickstep/OrientationTouchTransformerTest.java b/quickstep/robolectric_tests/src/com/android/quickstep/OrientationTouchTransformerTest.java
index eca27b5566..e771962ba6 100644
--- a/quickstep/robolectric_tests/src/com/android/quickstep/OrientationTouchTransformerTest.java
+++ b/quickstep/robolectric_tests/src/com/android/quickstep/OrientationTouchTransformerTest.java
@@ -247,10 +247,7 @@ public class OrientationTouchTransformerTest {
     }
 
     @Test
-    @Ignore("There's too much that goes into needing to mock a real motion event so the "
-            + "transforms in native code get applied correctly. Once that happens then maybe we can"
-            + " write slightly more complex unit tests")
-    public void applyTransform_taskNotFrozen_90Rotate_inTwoRegions() {
+    public void applyTransform_taskNotFrozen_90Rotate_withTwoRegions() {
         mTouchTransformer.createOrAddTouchRegion(mInfo);
         mTouchTransformer.enableMultipleRegions(true, mInfo);
         mTouchTransformer
@@ -262,6 +259,7 @@ public class OrientationTouchTransformerTest {
         // Portrait point in landscape orientation axis
         MotionEvent inRegion2 = generateMotionEvent(MotionEvent.ACTION_DOWN, 10, 10);
         mTouchTransformer.transform(inRegion1_down);
+        // no-op
         mTouchTransformer.transform(inRegion2);
         assertTrue(mTouchTransformer.touchInValidSwipeRegions(
                 inRegion1_down.getX(), inRegion1_down.getY()));
@@ -269,9 +267,19 @@ public class OrientationTouchTransformerTest {
         assertFalse(mTouchTransformer.touchInValidSwipeRegions(inRegion2.getX(), inRegion2.getY()));
 
         mTouchTransformer.transform(inRegion1_up);
+    }
 
-        // Set the new region with this MotionEvent.ACTION_DOWN
-        inRegion2 = generateAndTransformMotionEvent(MotionEvent.ACTION_DOWN, 10, 370);
+    @Test
+    public void applyTransform_90Rotate_inRotatedRegion() {
+        // Create regions for both 0 Rotation and 90 Rotation
+        mTouchTransformer.createOrAddTouchRegion(mInfo);
+        mTouchTransformer.enableMultipleRegions(true, mInfo);
+        mTouchTransformer
+                .createOrAddTouchRegion(createDisplayInfo(NORMAL_SCREEN_SIZE, Surface.ROTATION_90));
+        // Portrait point in landscape orientation axis
+        float x1 = generateTouchRegionHeight(NORMAL_SCREEN_SIZE, Surface.ROTATION_0);
+        // bottom of screen, from landscape perspective right side of screen
+        MotionEvent inRegion2 = generateAndTransformMotionEvent(MotionEvent.ACTION_DOWN, x1, 370);
         assertTrue(mTouchTransformer.touchInValidSwipeRegions(inRegion2.getX(), inRegion2.getY()));
     }
 
diff --git a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
index a749f9a868..2a6e478461 100644
--- a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
+++ b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
@@ -53,7 +53,7 @@ import java.util.Objects;
  */
 class OrientationTouchTransformer {
 
-    class CurrentDisplay {
+    private static class CurrentDisplay {
         public Point size;
         public int rotation;
 
@@ -67,6 +67,13 @@ class OrientationTouchTransformer {
             this.rotation = rotation;
         }
 
+        @Override
+        public String toString() {
+            return "CurrentDisplay:"
+                    + " rotation: " + rotation
+                    + " size: " + size;
+        }
+
         @Override
         public boolean equals(Object o) {
             if (this == o) return true;
@@ -86,21 +93,20 @@ class OrientationTouchTransformer {
 
     private static final String TAG = "OrientationTouchTransformer";
     private static final boolean DEBUG = false;
-    private static final int MAX_ORIENTATIONS = 4;
 
     private static final int QUICKSTEP_ROTATION_UNINITIALIZED = -1;
 
     private final Matrix mTmpMatrix = new Matrix();
     private final float[] mTmpPoint = new float[2];
 
-    private Map<CurrentDisplay, OrientationRectF> mSwipeTouchRegions =
+    private final Map<CurrentDisplay, OrientationRectF> mSwipeTouchRegions =
             new HashMap<CurrentDisplay, OrientationRectF>();
     private final RectF mAssistantLeftRegion = new RectF();
     private final RectF mAssistantRightRegion = new RectF();
     private final RectF mOneHandedModeRegion = new RectF();
     private CurrentDisplay mCurrentDisplay = new CurrentDisplay();
     private int mNavBarGesturalHeight;
-    private int mNavBarLargerGesturalHeight;
+    private final int mNavBarLargerGesturalHeight;
     private boolean mEnableMultipleRegions;
     private Resources mResources;
     private OrientationRectF mLastRectTouched;
@@ -374,10 +380,7 @@ class OrientationTouchTransformer {
                     return;
                 }
 
-                for (int i = 0; i < MAX_ORIENTATIONS; i++) {
-                    CurrentDisplay display = new CurrentDisplay(mCurrentDisplay.size, i);
-                    OrientationRectF rect = mSwipeTouchRegions.get(display);
-
+                for (OrientationRectF rect : mSwipeTouchRegions.values()) {
                     if (TestProtocol.sDebugTracing) {
                         Log.d(TestProtocol.NO_SWIPE_TO_HOME, "transform:DOWN, rect=" + rect);
                     }
-- 
GitLab


From b1bbc0f78dfecd07bebfd1ff525da5a9f17ef87b Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Mon, 22 Feb 2021 14:49:27 -0800
Subject: [PATCH 0858/1664] Changes to use new startTasks API

When shell transitions is enabled, this will use the
newer multi-task-launch api and control the animation.

There is no actual animation yet, this just adds the
infrastructure.

Bug: 182002789
Test: enable developer option and enter split via recents
Change-Id: If5be104a86e7b5f743f85efed20b0d2bf1b8bfd1
---
 .../launcher3/BaseQuickstepLauncher.java      |  2 +-
 .../android/quickstep/RecentsActivity.java    |  3 +-
 .../com/android/quickstep/SystemUiProxy.java  | 15 ++++++
 .../com/android/quickstep/TaskViewUtils.java  | 47 +++++++++++++++-
 .../util/SplitSelectStateController.java      | 53 ++++++++++++++++++-
 5 files changed, 114 insertions(+), 6 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index e9ded8a07c..4415b516f1 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -219,7 +219,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
         mSplitPlaceholderView = findViewById(R.id.split_placeholder);
         RecentsView overviewPanel = (RecentsView) getOverviewPanel();
         mSplitPlaceholderView.init(
-                new SplitSelectStateController(SystemUiProxy.INSTANCE.get(this))
+                new SplitSelectStateController(mHandler, SystemUiProxy.INSTANCE.get(this))
         );
         overviewPanel.init(mActionsView, mSplitPlaceholderView);
         mActionsView.updateVerticalMargin(SysUINavigationMode.getMode(this));
diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index 06137f22b0..7c453e7e9d 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -108,8 +108,7 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
 
         SplitPlaceholderView splitPlaceholderView = findViewById(R.id.split_placeholder);
         splitPlaceholderView.init(
-                new SplitSelectStateController(
-                        SystemUiProxy.INSTANCE.get(this))
+                new SplitSelectStateController(mUiHandler, SystemUiProxy.INSTANCE.get(this))
         );
 
         mDragLayer.recreateControllers();
diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index 1f332c4dda..0ee28bc63d 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -35,6 +35,7 @@ import android.util.Log;
 import android.view.MotionEvent;
 
 import com.android.launcher3.util.MainThreadInitializedObject;
+import com.android.launcher3.util.SplitConfigurationOptions;
 import com.android.systemui.shared.recents.ISystemUiProxy;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.system.RemoteTransitionCompat;
@@ -491,6 +492,20 @@ public class SystemUiProxy implements ISystemUiProxy,
         }
     }
 
+    /** Start multiple tasks in split-screen simultaneously. */
+    public void startTasks(int mainTaskId, Bundle mainOptions, int sideTaskId, Bundle sideOptions,
+            @SplitConfigurationOptions.StagePosition int sidePosition,
+            RemoteTransitionCompat remoteTransition) {
+        if (mSystemUiProxy != null) {
+            try {
+                mSplitScreen.startTasks(mainTaskId, mainOptions, sideTaskId, sideOptions,
+                        sidePosition, remoteTransition.getTransition());
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call startTask");
+            }
+        }
+    }
+
     public void startShortcut(String packageName, String shortcutId, int stage, int position,
             Bundle options, UserHandle user) {
         if (mSplitScreen != null) {
diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java
index bea1250091..cbb2a66214 100644
--- a/quickstep/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java
@@ -15,6 +15,9 @@
  */
 package com.android.quickstep;
 
+import static android.view.WindowManager.TRANSIT_OPEN;
+import static android.view.WindowManager.TRANSIT_TO_FRONT;
+
 import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA;
 import static com.android.launcher3.LauncherState.BACKGROUND_APP;
 import static com.android.launcher3.LauncherState.NORMAL;
@@ -47,7 +50,9 @@ import android.graphics.Matrix.ScaleToFit;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.os.Build;
+import android.view.SurfaceControl;
 import android.view.View;
+import android.window.TransitionInfo;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -352,7 +357,47 @@ public final class TaskViewUtils {
      * device is considered in multiWindowMode and things like insets and stuff change
      * and calculations have to be adjusted in the animations for that
      */
-    public static void composeRecentsSplitLaunchAnimator(@NonNull AnimatorSet anim,
+    public static void composeRecentsSplitLaunchAnimator(@NonNull TaskView initialView,
+            @NonNull TaskView v, @NonNull TransitionInfo transitionInfo,
+            SurfaceControl.Transaction t, @NonNull Runnable finishCallback) {
+
+        final TransitionInfo.Change[] splitRoots = new TransitionInfo.Change[2];
+        for (int i = 0; i < transitionInfo.getChanges().size(); ++i) {
+            final TransitionInfo.Change change = transitionInfo.getChanges().get(i);
+            final int taskId = change.getTaskInfo() != null ? change.getTaskInfo().taskId : -1;
+            final int mode = change.getMode();
+            // Find the target tasks' root tasks since those are the split stages that need to
+            // be animated (the tasks themselves are children and thus inherit animation).
+            if (taskId == initialView.getTask().key.id || taskId == v.getTask().key.id) {
+                if (!(mode == TRANSIT_OPEN || mode == TRANSIT_TO_FRONT)) {
+                    throw new IllegalStateException(
+                            "Expected task to be showing, but it is " + mode);
+                }
+                if (change.getParent() == null) {
+                    throw new IllegalStateException("Initiating multi-split launch but the split"
+                            + "root of " + taskId + " is already visible or has broken hierarchy.");
+                }
+                splitRoots[taskId == initialView.getTask().key.id ? 0 : 1] =
+                        transitionInfo.getChange(change.getParent());
+            }
+        }
+
+        // This is where we should animate the split roots. For now, though, just make them visible.
+        for (int i = 0; i < 2; ++i) {
+            t.show(splitRoots[i].getLeash());
+            t.setAlpha(splitRoots[i].getLeash(), 1.f);
+        }
+
+        // This contains the initial state (before animation), so apply this at the beginning of
+        // the animation.
+        t.apply();
+
+        // Once there is an animation, this should be called AFTER the animation completes.
+        finishCallback.run();
+    }
+
+    /** Legacy version (until shell transitions are enabled) */
+    public static void composeRecentsSplitLaunchAnimatorLegacy(@NonNull AnimatorSet anim,
             @NonNull TaskView v, @NonNull RemoteAnimationTargetCompat[] appTargets,
             @NonNull RemoteAnimationTargetCompat[] wallpaperTargets,
             @NonNull RemoteAnimationTargetCompat[] nonAppTargets, boolean launcherClosing,
diff --git a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
index e3f29257c5..9576eac809 100644
--- a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
+++ b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
@@ -16,11 +16,17 @@
 
 package com.android.quickstep.util;
 
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT;
+import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT;
+
 import android.animation.AnimatorSet;
 import android.app.ActivityOptions;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Pair;
+import android.view.SurfaceControl;
+import android.window.TransitionInfo;
 
 import androidx.annotation.Nullable;
 
@@ -31,12 +37,15 @@ import com.android.launcher3.WrappedAnimationRunnerImpl;
 import com.android.launcher3.WrappedLauncherAnimationRunner;
 import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
 import com.android.quickstep.SystemUiProxy;
+import com.android.quickstep.TaskAnimationManager;
 import com.android.quickstep.TaskViewUtils;
 import com.android.quickstep.views.TaskView;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
 import com.android.systemui.shared.system.RemoteAnimationAdapterCompat;
 import com.android.systemui.shared.system.RemoteAnimationRunnerCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
+import com.android.systemui.shared.system.RemoteTransitionCompat;
+import com.android.systemui.shared.system.RemoteTransitionRunner;
 
 /**
  * Represent data needed for the transient state when user has selected one app for split screen
@@ -47,9 +56,11 @@ public class SplitSelectStateController {
     private final SystemUiProxy mSystemUiProxy;
     private TaskView mInitialTaskView;
     private SplitPositionOption mInitialPosition;
+    private final Handler mHandler;
 
-    public SplitSelectStateController(SystemUiProxy systemUiProxy) {
+    public SplitSelectStateController(Handler handler, SystemUiProxy systemUiProxy) {
         mSystemUiProxy = systemUiProxy;
+        mHandler = handler;
     }
 
     /**
@@ -64,6 +75,19 @@ public class SplitSelectStateController {
      * To be called after second task selected
      */
     public void setSecondTaskId(TaskView taskView) {
+        if (TaskAnimationManager.ENABLE_SHELL_TRANSITIONS) {
+            // Assume initial task is for top/left part of screen
+            final int[] taskIds = mInitialPosition.mStagePosition == STAGE_POSITION_TOP_OR_LEFT
+                    ? new int[]{mInitialTaskView.getTask().key.id, taskView.getTask().key.id}
+                    : new int[]{taskView.getTask().key.id, mInitialTaskView.getTask().key.id};
+
+            RemoteSplitLaunchAnimationRunner animationRunner =
+                    new RemoteSplitLaunchAnimationRunner(mInitialTaskView, taskView);
+            mSystemUiProxy.startTasks(taskIds[0], null /* mainOptions */, taskIds[1],
+                    null /* sideOptions */, STAGE_POSITION_BOTTOM_OR_RIGHT,
+                    new RemoteTransitionCompat(animationRunner, MAIN_EXECUTOR));
+            return;
+        }
         // Assume initial mInitialTaskId is for top/left part of screen
         WrappedAnimationRunnerImpl initialSplitRunnerWrapped =  new SplitLaunchAnimationRunner(
                 mInitialTaskView, 0);
@@ -96,6 +120,30 @@ public class SplitSelectStateController {
     }
 
     /**
+     * Requires Shell Transitions
+     */
+    private class RemoteSplitLaunchAnimationRunner implements RemoteTransitionRunner {
+
+        private final TaskView mInitialTaskView;
+        private final TaskView mTaskView;
+
+        RemoteSplitLaunchAnimationRunner(TaskView initialTaskView, TaskView taskView) {
+            mInitialTaskView = initialTaskView;
+            mTaskView = taskView;
+        }
+
+        @Override
+        public void startAnimation(TransitionInfo info, SurfaceControl.Transaction t,
+                Runnable finishCallback) {
+            TaskViewUtils.composeRecentsSplitLaunchAnimator(mInitialTaskView, mTaskView,
+                    info, t, finishCallback);
+            // After successful launch, call resetState
+            resetState();
+        }
+    }
+
+    /**
+     * LEGACY
      * @return the opposite stage and position from the {@param position} provided as first and
      *         second object, respectively
      * Ex. If position is has stage = Main and position = Top/Left, this will return
@@ -109,6 +157,7 @@ public class SplitSelectStateController {
     }
 
     /**
+     * LEGACY
      * Remote animation runner for animation to launch an app.
      */
     private class SplitLaunchAnimationRunner implements WrappedAnimationRunnerImpl {
@@ -129,7 +178,7 @@ public class SplitSelectStateController {
                 LauncherAnimationRunner.AnimationResult result) {
             AnimatorSet anim = new AnimatorSet();
             BaseQuickstepLauncher activity = BaseActivity.fromContext(mV.getContext());
-            TaskViewUtils.composeRecentsSplitLaunchAnimator(anim, mV,
+            TaskViewUtils.composeRecentsSplitLaunchAnimatorLegacy(anim, mV,
                     appTargets, wallpaperTargets, nonAppTargets, true, activity.getStateManager(),
                     activity.getDepthController(), mTargetState);
             result.setAnimation(anim, activity);
-- 
GitLab


From 81ca1f880268cb5ab14df843f572954880ebce41 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 9 Apr 2021 15:40:08 -0700
Subject: [PATCH 0859/1664] Remove some noisy logs by setting DEBUG = false

Change-Id: I050676c0f4750e06a9052fd1c2ebe1e8badcfd92
---
 src/com/android/launcher3/allapps/AllAppsRecyclerView.java   | 2 +-
 src/com/android/launcher3/folder/FolderNameProvider.java     | 2 +-
 src/com/android/launcher3/model/GridSizeMigrationTask.java   | 2 +-
 src/com/android/launcher3/model/GridSizeMigrationTaskV2.java | 2 +-
 src/com/android/launcher3/model/data/ItemInfo.java           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
index 66575eb289..b1c764c1d1 100644
--- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
@@ -51,7 +51,7 @@ import java.util.List;
  */
 public class AllAppsRecyclerView extends BaseRecyclerView {
     private static final String TAG = "AllAppsContainerView";
-    private static final boolean DEBUG = true;
+    private static final boolean DEBUG = false;
 
     private AlphabeticalAppsList mApps;
     private final int mNumAppsPerRow;
diff --git a/src/com/android/launcher3/folder/FolderNameProvider.java b/src/com/android/launcher3/folder/FolderNameProvider.java
index d166e27c23..9c1b24d96c 100644
--- a/src/com/android/launcher3/folder/FolderNameProvider.java
+++ b/src/com/android/launcher3/folder/FolderNameProvider.java
@@ -48,7 +48,7 @@ import java.util.stream.Collectors;
 public class FolderNameProvider implements ResourceBasedOverride {
 
     private static final String TAG = "FolderNameProvider";
-    private static final boolean DEBUG = true;
+    private static final boolean DEBUG = false;
 
     /**
      * IME usually has up to 3 suggest slots. In total, there are 4 suggest slots as the folder
diff --git a/src/com/android/launcher3/model/GridSizeMigrationTask.java b/src/com/android/launcher3/model/GridSizeMigrationTask.java
index 804e72ee29..5e05e9930a 100644
--- a/src/com/android/launcher3/model/GridSizeMigrationTask.java
+++ b/src/com/android/launcher3/model/GridSizeMigrationTask.java
@@ -53,7 +53,7 @@ import java.util.HashSet;
 public class GridSizeMigrationTask {
 
     private static final String TAG = "GridSizeMigrationTask";
-    private static final boolean DEBUG = true;
+    private static final boolean DEBUG = false;
 
     // These are carefully selected weights for various item types (Math.random?), to allow for
     // the least absurd migration experience.
diff --git a/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java b/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java
index c6c0791a17..8e7af55892 100644
--- a/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java
+++ b/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java
@@ -67,7 +67,7 @@ import java.util.Set;
 public class GridSizeMigrationTaskV2 {
 
     private static final String TAG = "GridSizeMigrationTaskV2";
-    private static final boolean DEBUG = true;
+    private static final boolean DEBUG = false;
 
     private final Context mContext;
     private final SQLiteDatabase mDb;
diff --git a/src/com/android/launcher3/model/data/ItemInfo.java b/src/com/android/launcher3/model/data/ItemInfo.java
index e54f1e7705..05fd77d720 100644
--- a/src/com/android/launcher3/model/data/ItemInfo.java
+++ b/src/com/android/launcher3/model/data/ItemInfo.java
@@ -66,7 +66,7 @@ import java.util.Optional;
  */
 public class ItemInfo {
 
-    public static final boolean DEBUG = true;
+    public static final boolean DEBUG = false;
     public static final int NO_ID = -1;
 
     /**
-- 
GitLab


From ad16a7b1df6a0a40c9e4731a226b2fe62355a57f Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pbdr@google.com>
Date: Fri, 9 Apr 2021 15:07:27 +0100
Subject: [PATCH 0860/1664] Restore drag&drop from WidgetsBottomSheet

Fix: 184917820
Test: By hand with various widgets
Change-Id: I488b960daaa83c38aa1bd3cac5b94767ff656103
---
 src/com/android/launcher3/widget/WidgetsBottomSheet.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/widget/WidgetsBottomSheet.java b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
index bbb0d92eac..0670928159 100644
--- a/src/com/android/launcher3/widget/WidgetsBottomSheet.java
+++ b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
@@ -170,9 +170,9 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
         WidgetCell widget = (WidgetCell) LayoutInflater.from(getContext())
                 .inflate(R.layout.widget_cell, parent, false);
 
-        WidgetImageView preview = widget.findViewById(R.id.widget_preview);
-        preview.setOnClickListener(this);
-        preview.setOnLongClickListener(this);
+        View preview_container = widget.findViewById(R.id.widget_preview_container);
+        preview_container.setOnClickListener(this);
+        preview_container.setOnLongClickListener(this);
         widget.setAnimatePreview(false);
 
         parent.addView(widget);
-- 
GitLab


From 92f130fdf52ad852ddf6543a5dd1f47e5cac4c4d Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Mon, 12 Apr 2021 13:11:59 -0400
Subject: [PATCH 0861/1664] Add BubbleTextHolder interface.

Bug: 184817903
Test: manual, verify correct app open animation
Change-Id: I3723922aff5c71ae6ec7340d3c00cffef7b010b8
---
 .../launcher3/shortcuts/DeepShortcutView.java |  4 ++-
 .../launcher3/views/BubbleTextHolder.java     | 25 +++++++++++++++++++
 .../launcher3/views/FloatingIconView.java     |  4 +--
 3 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 src/com/android/launcher3/views/BubbleTextHolder.java

diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutView.java b/src/com/android/launcher3/shortcuts/DeepShortcutView.java
index 1c1418c325..cc658c9ba0 100644
--- a/src/com/android/launcher3/shortcuts/DeepShortcutView.java
+++ b/src/com/android/launcher3/shortcuts/DeepShortcutView.java
@@ -30,12 +30,13 @@ import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.popup.PopupContainerWithArrow;
+import com.android.launcher3.views.BubbleTextHolder;
 
 /**
  * A {@link android.widget.FrameLayout} that contains a {@link DeepShortcutView}.
  * This lets us animate the DeepShortcutView (icon and text) separately from the background.
  */
-public class DeepShortcutView extends FrameLayout {
+public class DeepShortcutView extends FrameLayout implements BubbleTextHolder {
 
     private static final Point sTempPoint = new Point();
 
@@ -64,6 +65,7 @@ public class DeepShortcutView extends FrameLayout {
         mIconView = findViewById(R.id.icon);
     }
 
+    @Override
     public BubbleTextView getBubbleText() {
         return mBubbleText;
     }
diff --git a/src/com/android/launcher3/views/BubbleTextHolder.java b/src/com/android/launcher3/views/BubbleTextHolder.java
new file mode 100644
index 0000000000..47d356374e
--- /dev/null
+++ b/src/com/android/launcher3/views/BubbleTextHolder.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.views;
+
+import com.android.launcher3.BubbleTextView;
+
+/**
+ * Views that contain {@link BubbleTextView} should implement this interface.
+ */
+public interface BubbleTextHolder {
+    BubbleTextView getBubbleText();
+}
diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java
index 23c3722aca..96268cefb2 100644
--- a/src/com/android/launcher3/views/FloatingIconView.java
+++ b/src/com/android/launcher3/views/FloatingIconView.java
@@ -210,8 +210,8 @@ public class FloatingIconView extends FrameLayout implements
     public static void getLocationBoundsForView(Launcher launcher, View v, boolean isOpening,
             RectF outRect, Rect outViewBounds) {
         boolean ignoreTransform = !isOpening;
-        if (v instanceof DeepShortcutView) {
-            v = ((DeepShortcutView) v).getBubbleText();
+        if (v instanceof BubbleTextHolder) {
+            v = ((BubbleTextHolder) v).getBubbleText();
             ignoreTransform = false;
         } else if (v.getParent() instanceof DeepShortcutView) {
             v = ((DeepShortcutView) v.getParent()).getIconView();
-- 
GitLab


From 58dfd4d2095c1c5ce44f7f7cce3a355823259c41 Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Fri, 9 Apr 2021 16:54:56 -0700
Subject: [PATCH 0862/1664] Handle transitining out of overview more gracefully
 for 3P launchers

Bug: 183897242
Test: Tested with Pixel Custom Launcher, as suggested on the bug
Change-Id: I46ceddb9f5eed6b16b7e66406dd68d94e7a30aee
---
 .../quickstep/FallbackActivityInterface.java  | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
index e13d1a4511..8168e88e57 100644
--- a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
@@ -27,6 +27,7 @@ import android.view.MotionEvent;
 import androidx.annotation.Nullable;
 
 import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.quickstep.fallback.RecentsState;
 import com.android.quickstep.util.ActivityInitListener;
@@ -139,7 +140,25 @@ public final class FallbackActivityInterface extends
 
     @Override
     public void onExitOverview(RotationTouchHelper deviceState, Runnable exitRunnable) {
-        // no-op, fake landscape not supported for 3P
+        final StateManager<RecentsState> stateManager = getCreatedActivity().getStateManager();
+        if (stateManager.getState() == HOME) {
+            exitRunnable.run();
+            notifyRecentsOfOrientation(deviceState);
+            return;
+        }
+
+        stateManager.addStateListener(
+                new StateManager.StateListener<RecentsState>() {
+                    @Override
+                    public void onStateTransitionComplete(RecentsState toState) {
+                        // Are we going from Recents to Workspace?
+                        if (toState == HOME) {
+                            exitRunnable.run();
+                            notifyRecentsOfOrientation(deviceState);
+                            stateManager.removeStateListener(this);
+                        }
+                    }
+                });
     }
 
     @Override
-- 
GitLab


From 1e296c10cf6007fbd45c072e9472b9ca7e5a16db Mon Sep 17 00:00:00 2001
From: Pedro Loureiro <pedroql@google.com>
Date: Tue, 9 Mar 2021 18:35:52 +0000
Subject: [PATCH 0863/1664] Add lint baseline to address NewApi errors

We are enabling a new lint check where the min sdk != compile sdk.
It has produced a lot of errors and adding the baseline file(s)
allows us to continue work without introducing more problems.

Bug: 150847901

Test: m lint-check
Change-Id: I827a5b21dd52448d4f68da6743a1a1632d99573d
---
 Android.bp                        |  12 +
 lint-baseline-common-deps-lib.xml |  48 +++
 lint-baseline-go-res-lib.xml      | 576 ++++++++++++++++++++++++++++++
 lint-baseline-launcher3.xml       | 576 ++++++++++++++++++++++++++++++
 lint-baseline-res-lib.xml         |  48 +++
 5 files changed, 1260 insertions(+)
 create mode 100644 lint-baseline-common-deps-lib.xml
 create mode 100644 lint-baseline-go-res-lib.xml
 create mode 100644 lint-baseline-launcher3.xml
 create mode 100644 lint-baseline-res-lib.xml

diff --git a/Android.bp b/Android.bp
index df0a96fe4e..7e6a565f46 100644
--- a/Android.bp
+++ b/Android.bp
@@ -115,6 +115,9 @@ android_library {
     manifest: "AndroidManifest-common.xml",
     sdk_version: "current",
     min_sdk_version: "26",
+    lint: {
+        baseline_filename: "lint-baseline-res-lib.xml",
+    },
 }
 
 //
@@ -127,6 +130,9 @@ android_library {
     sdk_version: "current",
     min_sdk_version: "26",
     manifest: "AndroidManifest-common.xml",
+    lint: {
+        baseline_filename: "lint-baseline-common-deps-lib.xml",
+    },
 }
 
 //
@@ -171,6 +177,9 @@ android_app {
     additional_manifests: [
         "AndroidManifest-common.xml",
     ],
+    lint: {
+        baseline_filename: "lint-baseline-launcher3.xml",
+    },
 }
 
 // Library with all the dependencies for building quickstep
@@ -236,5 +245,8 @@ android_library {
         "AndroidManifest-common.xml",
     ],
     min_sdk_version: "29",
+    lint: {
+        baseline_filename: "lint-baseline-go-res-lib.xml",
+    },
 }
 
diff --git a/lint-baseline-common-deps-lib.xml b/lint-baseline-common-deps-lib.xml
new file mode 100644
index 0000000000..e52f8fbc70
--- /dev/null
+++ b/lint-baseline-common-deps-lib.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0">
+
+    <issue
+        id="NewApi"
+        message="`?android:attr/dialogCornerRadius` requires API level 28 (current min is 26)"
+        errorLine1="        android:topLeftRadius=&quot;?android:attr/dialogCornerRadius&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/res/drawable/add_item_dialog_background.xml"
+            line="6"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="`?android:attr/dialogCornerRadius` requires API level 28 (current min is 26)"
+        errorLine1="        android:topRightRadius=&quot;?android:attr/dialogCornerRadius&quot; />"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/res/drawable/add_item_dialog_background.xml"
+            line="7"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="`@android:style/Widget.DeviceDefault.Button.Colored` requires API level 28 (current min is 26)"
+        errorLine1="    &lt;style name=&quot;Widget.DeviceDefault.Button.Rounded.Colored&quot; parent=&quot;@android:style/Widget.DeviceDefault.Button.Colored&quot;>"
+        errorLine2="                                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/res/values/styles.xml"
+            line="287"
+            column="63"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="`@android:dimen/system_app_widget_background_radius` requires API level 31 (current min is 26)"
+        errorLine1="    &lt;corners android:radius=&quot;@android:dimen/system_app_widget_background_radius&quot; />"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/res/drawable/widget_resize_frame.xml"
+            line="20"
+            column="14"/>
+    </issue>
+
+</issues>
diff --git a/lint-baseline-go-res-lib.xml b/lint-baseline-go-res-lib.xml
new file mode 100644
index 0000000000..c5669f2a61
--- /dev/null
+++ b/lint-baseline-go-res-lib.xml
@@ -0,0 +1,576 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0">
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `android.view.View#getWindowInsetsController`"
+        errorLine1="        getWindowInsetsController().hide(WindowInsets.Type.ime());"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/allapps/AllAppsContainerView.java"
+            line="203"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `android.view.WindowInsets.Type#ime`"
+        errorLine1="        getWindowInsetsController().hide(WindowInsets.Type.ime());"
+        errorLine2="                                                           ~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/allapps/AllAppsContainerView.java"
+            line="203"
+            column="60"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `android.view.WindowInsetsController#hide`"
+        errorLine1="        getWindowInsetsController().hide(WindowInsets.Type.ime());"
+        errorLine2="                                    ~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/allapps/AllAppsContainerView.java"
+            line="203"
+            column="37"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `android.view.View#getWindowInsetsController`"
+        errorLine1="                getWindowInsetsController().hide(WindowInsets.Type.ime());"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/allapps/AllAppsRecyclerView.java"
+            line="193"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `android.view.WindowInsets.Type#ime`"
+        errorLine1="                getWindowInsetsController().hide(WindowInsets.Type.ime());"
+        errorLine2="                                                                   ~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/allapps/AllAppsRecyclerView.java"
+            line="193"
+            column="68"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `android.view.WindowInsetsController#hide`"
+        errorLine1="                getWindowInsetsController().hide(WindowInsets.Type.ime());"
+        errorLine2="                                            ~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/allapps/AllAppsRecyclerView.java"
+            line="193"
+            column="45"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 31 (current min is 29): `android.appwidget.AppWidgetHostView#updateAppWidgetSize`"
+        errorLine1="            widgetView.updateAppWidgetSize(new Bundle(), sizes);"
+        errorLine2="                       ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/AppWidgetResizeFrame.java"
+            line="399"
+            column="24"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 31 (current min is 29): `android.graphics.Rect#inset`"
+        errorLine1="        potentialTaskRect.inset(insets.left, insets.top, insets.right, insets.bottom);"
+        errorLine2="                          ~~~~~">
+        <location
+            file="packages/apps/Launcher3/quickstep/src/com/android/quickstep/BaseActivityInterface.java"
+            line="248"
+            column="27"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 31 (current min is 29): `android.graphics.Rect#inset`"
+        errorLine1="        potentialTaskRect.inset("
+        errorLine2="                          ~~~~~">
+        <location
+            file="packages/apps/Launcher3/quickstep/src/com/android/quickstep/BaseActivityInterface.java"
+            line="249"
+            column="27"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 31 (current min is 29): `android.graphics.Rect#inset`"
+        errorLine1="        outRect.inset(Math.max(insets.left, sideMargin), Math.max(insets.top, topMargin),"
+        errorLine2="                ~~~~~">
+        <location
+            file="packages/apps/Launcher3/quickstep/src/com/android/quickstep/BaseActivityInterface.java"
+            line="291"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 31 (current min is 29): `android.graphics.Rect#inset`"
+        errorLine1="        gridRect.inset(0, dp.overviewTaskThumbnailTopMarginPx, 0, 0);"
+        errorLine2="                 ~~~~~">
+        <location
+            file="packages/apps/Launcher3/quickstep/src/com/android/quickstep/BaseActivityInterface.java"
+            line="315"
+            column="18"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `android.view.WindowManager#getCurrentWindowMetrics`"
+        errorLine1="                    .getCurrentWindowMetrics().getWindowInsets();"
+        errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/DeviceProfile.java"
+            line="236"
+            column="22"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `android.view.WindowMetrics#getWindowInsets`"
+        errorLine1="                    .getCurrentWindowMetrics().getWindowInsets();"
+        errorLine2="                                               ~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/DeviceProfile.java"
+            line="236"
+            column="48"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `android.content.Context#getDisplay`"
+        errorLine1="            if (mContext.getDisplay() != null) {"
+        errorLine2="                         ~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/quickstep/src/com/android/quickstep/interaction/EdgeBackGestureHandler.java"
+            line="115"
+            column="26"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `android.content.Context#getDisplay`"
+        errorLine1="                mContext.getDisplay().getRealSize(mDisplaySize);"
+        errorLine2="                         ~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/quickstep/src/com/android/quickstep/interaction/EdgeBackGestureHandler.java"
+            line="116"
+            column="26"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `android.content.ContextWrapper#getDisplay`"
+        errorLine1="        Display display = getDisplay();"
+        errorLine2="                          ~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java"
+            line="153"
+            column="27"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `java.util.List#of`"
+        errorLine1="                    List.of(new Rect(0, 0, metrics.widthPixels, metrics.heightPixels)));"
+        errorLine2="                         ~~">
+        <location
+            file="packages/apps/Launcher3/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java"
+            line="158"
+            column="26"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 31 (current min is 29): `android.appwidget.AppWidgetHostView#resetColorResources`"
+        errorLine1="            resetColorResources();"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java"
+            line="137"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `java.util.List#of`"
+        errorLine1="            mColorExtractor.addLocation(List.of(mLastLocationRegistered));"
+        errorLine2="                                             ~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java"
+            line="367"
+            column="46"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `java.util.List#of`"
+        errorLine1="                mColorExtractor.addLocation(List.of(mLastLocationRegistered));"
+        errorLine2="                                                 ~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java"
+            line="390"
+            column="50"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 31 (current min is 29): `android.appwidget.AppWidgetProviderInfo#maxResizeWidth`"
+        errorLine1="                (ATLEAST_S &amp;&amp; maxResizeWidth > 0)"
+        errorLine2="                              ~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java"
+            line="91"
+            column="31"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 31 (current min is 29): `android.appwidget.AppWidgetProviderInfo#maxResizeWidth`"
+        errorLine1="                        ? getSpanX(widgetPadding, maxResizeWidth, smallestCellWidth)"
+        errorLine2="                                                  ~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java"
+            line="92"
+            column="51"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 31 (current min is 29): `android.appwidget.AppWidgetProviderInfo#maxResizeHeight`"
+        errorLine1="                (ATLEAST_S &amp;&amp; maxResizeHeight > 0)"
+        errorLine2="                              ~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java"
+            line="95"
+            column="31"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 31 (current min is 29): `android.appwidget.AppWidgetProviderInfo#maxResizeHeight`"
+        errorLine1="                        ? getSpanY(widgetPadding, maxResizeHeight, smallestCellHeight)"
+        errorLine2="                                                  ~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java"
+            line="96"
+            column="51"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 31 (current min is 29): `android.appwidget.AppWidgetProviderInfo#targetCellWidth`"
+        errorLine1="        if (ATLEAST_S &amp;&amp; targetCellWidth >= minSpanX &amp;&amp; targetCellWidth &lt;= maxSpanX"
+        errorLine2="                         ~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java"
+            line="101"
+            column="26"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 31 (current min is 29): `android.appwidget.AppWidgetProviderInfo#targetCellWidth`"
+        errorLine1="        if (ATLEAST_S &amp;&amp; targetCellWidth >= minSpanX &amp;&amp; targetCellWidth &lt;= maxSpanX"
+        errorLine2="                                                        ~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java"
+            line="101"
+            column="57"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 31 (current min is 29): `android.appwidget.AppWidgetProviderInfo#targetCellHeight`"
+        errorLine1="                &amp;&amp; targetCellHeight >= minSpanY &amp;&amp; targetCellHeight &lt;= maxSpanY) {"
+        errorLine2="                   ~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java"
+            line="102"
+            column="20"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 31 (current min is 29): `android.appwidget.AppWidgetProviderInfo#targetCellHeight`"
+        errorLine1="                &amp;&amp; targetCellHeight >= minSpanY &amp;&amp; targetCellHeight &lt;= maxSpanY) {"
+        errorLine2="                                                   ~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java"
+            line="102"
+            column="52"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 31 (current min is 29): `android.appwidget.AppWidgetProviderInfo#targetCellWidth`"
+        errorLine1="            spanX = targetCellWidth;"
+        errorLine2="                    ~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java"
+            line="103"
+            column="21"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 31 (current min is 29): `android.appwidget.AppWidgetProviderInfo#targetCellHeight`"
+        errorLine1="            spanY = targetCellHeight;"
+        errorLine2="                    ~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java"
+            line="104"
+            column="21"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `android.content.Context#getDisplay`"
+        errorLine1="        final Display display = mContext.getDisplay();"
+        errorLine2="                                         ~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/quickstep/src/com/android/quickstep/interaction/NavBarGestureHandler.java"
+            line="94"
+            column="42"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 31 (current min is 29): `android.content.pm.LauncherActivityInfo#getLoadingProgress`"
+        errorLine1="            return (int) (100 * info.getLoadingProgress());"
+        errorLine2="                                     ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/util/PackageManagerHelper.java"
+            line="338"
+            column="38"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `java.util.List#of`"
+        errorLine1="    private List&lt;WidgetsListBaseEntry> mAllWidgets = List.of();"
+        errorLine2="                                                          ~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/popup/PopupDataProvider.java"
+            line="64"
+            column="59"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `java.util.List#of`"
+        errorLine1="    private List&lt;ItemInfo> mRecommendedWidgets = List.of();"
+        errorLine2="                                                      ~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/popup/PopupDataProvider.java"
+            line="66"
+            column="55"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `new android.view.SurfaceControlViewHost`"
+        errorLine1="                    .submit(() -> new SurfaceControlViewHost(mContext, mDisplay, mHostToken))"
+        errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java"
+            line="91"
+            column="35"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `android.view.SurfaceControlViewHost#getSurfacePackage`"
+        errorLine1="            surfacePackage = mSurfaceControlViewHost.getSurfacePackage();"
+        errorLine2="                                                     ~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java"
+            line="93"
+            column="54"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `android.view.SurfaceControlViewHost#setView`"
+        errorLine1="                host.setView(view, view.getMeasuredWidth(), view.getMeasuredHeight());"
+        errorLine2="                     ~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java"
+            line="127"
+            column="22"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Cast from `SurfacePackage` to `Parcelable` requires API level 30 (current min is 29)"
+        errorLine1="        result.putParcelable(KEY_SURFACE_PACKAGE, surfacePackage);"
+        errorLine2="                                                  ~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java"
+            line="132"
+            column="51"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `android.view.SurfaceControlViewHost#release`"
+        errorLine1="                mSurfaceControlViewHost.release();"
+        errorLine2="                                        ~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java"
+            line="149"
+            column="41"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `android.graphics.Outline#setPath`"
+        errorLine1="        outline.setPath(mPath);"
+        errorLine2="                ~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/popup/RoundedArrowDrawable.java"
+            line="88"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 31 (current min is 29): `new android.widget.EdgeEffect`"
+        errorLine1="                ? new EdgeEffect(context, attrs) : new EdgeEffect(context);"
+        errorLine2="                  ~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/views/SpringRelativeLayout.java"
+            line="49"
+            column="19"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 31 (current min is 29): `new android.widget.EdgeEffect`"
+        errorLine1="                ? new EdgeEffect(context, attrs) : new EdgeEffect(context);"
+        errorLine2="                  ~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/views/SpringRelativeLayout.java"
+            line="51"
+            column="19"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `android.view.WindowManager.LayoutParams#setFitInsetsTypes`"
+        errorLine1="        mWindowLayoutParams.setFitInsetsTypes(0);"
+        errorLine2="                            ~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java"
+            line="316"
+            column="29"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `android.view.WindowInsets#getInsets`"
+        errorLine1="            Insets systemInsets = insets.getInsets(WindowInsets.Type.systemBars());"
+        errorLine2="                                         ~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java"
+            line="118"
+            column="42"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `android.view.WindowInsets.Type#systemBars`"
+        errorLine1="            Insets systemInsets = insets.getInsets(WindowInsets.Type.systemBars());"
+        errorLine2="                                                                     ~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java"
+            line="118"
+            column="70"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 31 (current min is 29): `android.appwidget.AppWidgetProviderInfo#loadDescription`"
+        errorLine1="            CharSequence description = mItem.widgetInfo.loadDescription(getContext());"
+        errorLine2="                                                        ~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/WidgetCell.java"
+            line="193"
+            column="57"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 31 (current min is 29): `android.appwidget.AppWidgetProviderInfo#previewLayout`"
+        errorLine1="                &amp;&amp; item.widgetInfo.previewLayout != Resources.ID_NULL) {"
+        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/WidgetCell.java"
+            line="214"
+            column="20"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 31 (current min is 29): `android.appwidget.AppWidgetProviderInfo#previewLayout`"
+        errorLine1="            launcherAppWidgetProviderInfo.initialLayout = item.widgetInfo.previewLayout;"
+        errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/WidgetCell.java"
+            line="222"
+            column="59"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `android.view.View#getWindowInsetsController`"
+        errorLine1="        getWindowInsetsController().hide(WindowInsets.Type.ime());"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java"
+            line="558"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `android.view.WindowInsets.Type#ime`"
+        errorLine1="        getWindowInsetsController().hide(WindowInsets.Type.ime());"
+        errorLine2="                                                           ~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java"
+            line="558"
+            column="60"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `android.view.WindowInsetsController#hide`"
+        errorLine1="        getWindowInsetsController().hide(WindowInsets.Type.ime());"
+        errorLine2="                                    ~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java"
+            line="558"
+            column="37"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 29): `java.util.List#of`"
+        errorLine1="            return new RecommendationTableData(List.of(), previewScale);"
+        errorLine2="                                                    ~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java"
+            line="139"
+            column="53"/>
+    </issue>
+
+</issues>
diff --git a/lint-baseline-launcher3.xml b/lint-baseline-launcher3.xml
new file mode 100644
index 0000000000..469ad942d9
--- /dev/null
+++ b/lint-baseline-launcher3.xml
@@ -0,0 +1,576 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0">
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 26): `android.view.View#getWindowInsetsController`"
+        errorLine1="        getWindowInsetsController().hide(WindowInsets.Type.ime());"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/allapps/AllAppsContainerView.java"
+            line="203"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 26): `android.view.WindowInsets.Type#ime`"
+        errorLine1="        getWindowInsetsController().hide(WindowInsets.Type.ime());"
+        errorLine2="                                                           ~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/allapps/AllAppsContainerView.java"
+            line="203"
+            column="60"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 26): `android.view.WindowInsetsController#hide`"
+        errorLine1="        getWindowInsetsController().hide(WindowInsets.Type.ime());"
+        errorLine2="                                    ~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/allapps/AllAppsContainerView.java"
+            line="203"
+            column="37"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 26): `android.view.View#getWindowInsetsController`"
+        errorLine1="                getWindowInsetsController().hide(WindowInsets.Type.ime());"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/allapps/AllAppsRecyclerView.java"
+            line="193"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 26): `android.view.WindowInsets.Type#ime`"
+        errorLine1="                getWindowInsetsController().hide(WindowInsets.Type.ime());"
+        errorLine2="                                                                   ~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/allapps/AllAppsRecyclerView.java"
+            line="193"
+            column="68"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 26): `android.view.WindowInsetsController#hide`"
+        errorLine1="                getWindowInsetsController().hide(WindowInsets.Type.ime());"
+        errorLine2="                                            ~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/allapps/AllAppsRecyclerView.java"
+            line="193"
+            column="45"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 31 (current min is 26): `android.appwidget.AppWidgetHostView#updateAppWidgetSize`"
+        errorLine1="            widgetView.updateAppWidgetSize(new Bundle(), sizes);"
+        errorLine2="                       ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/AppWidgetResizeFrame.java"
+            line="399"
+            column="24"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 26): `android.view.WindowManager#getCurrentWindowMetrics`"
+        errorLine1="                    .getCurrentWindowMetrics().getWindowInsets();"
+        errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/DeviceProfile.java"
+            line="236"
+            column="22"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 26): `android.view.WindowMetrics#getWindowInsets`"
+        errorLine1="                    .getCurrentWindowMetrics().getWindowInsets();"
+        errorLine2="                                               ~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/DeviceProfile.java"
+            line="236"
+            column="48"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 29 (current min is 26): `android.content.res.Resources#getFloat`"
+        errorLine1="        folderLabelTextScale = res.getFloat(R.dimen.folder_label_text_scale);"
+        errorLine2="                                   ~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/DeviceProfile.java"
+            line="256"
+            column="36"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 29 (current min is 26): `android.content.res.Resources#getFloat`"
+        errorLine1="        return mContext.getResources().getFloat(resId);"
+        errorLine2="                                       ~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/util/DynamicResource.java"
+            line="73"
+            column="40"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 31 (current min is 26): `android.appwidget.AppWidgetHostView#resetColorResources`"
+        errorLine1="            resetColorResources();"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java"
+            line="137"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 26): `java.util.List#of`"
+        errorLine1="            mColorExtractor.addLocation(List.of(mLastLocationRegistered));"
+        errorLine2="                                             ~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java"
+            line="367"
+            column="46"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 26): `java.util.List#of`"
+        errorLine1="                mColorExtractor.addLocation(List.of(mLastLocationRegistered));"
+        errorLine2="                                                 ~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java"
+            line="390"
+            column="50"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 31 (current min is 26): `android.appwidget.AppWidgetProviderInfo#maxResizeWidth`"
+        errorLine1="                (ATLEAST_S &amp;&amp; maxResizeWidth > 0)"
+        errorLine2="                              ~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java"
+            line="91"
+            column="31"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 31 (current min is 26): `android.appwidget.AppWidgetProviderInfo#maxResizeWidth`"
+        errorLine1="                        ? getSpanX(widgetPadding, maxResizeWidth, smallestCellWidth)"
+        errorLine2="                                                  ~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java"
+            line="92"
+            column="51"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 31 (current min is 26): `android.appwidget.AppWidgetProviderInfo#maxResizeHeight`"
+        errorLine1="                (ATLEAST_S &amp;&amp; maxResizeHeight > 0)"
+        errorLine2="                              ~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java"
+            line="95"
+            column="31"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 31 (current min is 26): `android.appwidget.AppWidgetProviderInfo#maxResizeHeight`"
+        errorLine1="                        ? getSpanY(widgetPadding, maxResizeHeight, smallestCellHeight)"
+        errorLine2="                                                  ~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java"
+            line="96"
+            column="51"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 31 (current min is 26): `android.appwidget.AppWidgetProviderInfo#targetCellWidth`"
+        errorLine1="        if (ATLEAST_S &amp;&amp; targetCellWidth >= minSpanX &amp;&amp; targetCellWidth &lt;= maxSpanX"
+        errorLine2="                         ~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java"
+            line="101"
+            column="26"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 31 (current min is 26): `android.appwidget.AppWidgetProviderInfo#targetCellWidth`"
+        errorLine1="        if (ATLEAST_S &amp;&amp; targetCellWidth >= minSpanX &amp;&amp; targetCellWidth &lt;= maxSpanX"
+        errorLine2="                                                        ~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java"
+            line="101"
+            column="57"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 31 (current min is 26): `android.appwidget.AppWidgetProviderInfo#targetCellHeight`"
+        errorLine1="                &amp;&amp; targetCellHeight >= minSpanY &amp;&amp; targetCellHeight &lt;= maxSpanY) {"
+        errorLine2="                   ~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java"
+            line="102"
+            column="20"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 31 (current min is 26): `android.appwidget.AppWidgetProviderInfo#targetCellHeight`"
+        errorLine1="                &amp;&amp; targetCellHeight >= minSpanY &amp;&amp; targetCellHeight &lt;= maxSpanY) {"
+        errorLine2="                                                   ~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java"
+            line="102"
+            column="52"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 31 (current min is 26): `android.appwidget.AppWidgetProviderInfo#targetCellWidth`"
+        errorLine1="            spanX = targetCellWidth;"
+        errorLine2="                    ~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java"
+            line="103"
+            column="21"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 31 (current min is 26): `android.appwidget.AppWidgetProviderInfo#targetCellHeight`"
+        errorLine1="            spanY = targetCellHeight;"
+        errorLine2="                    ~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java"
+            line="104"
+            column="21"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 28 (current min is 26): `android.app.Person#getKey`"
+        errorLine1="        return people.stream().filter(person -> person.getKey() != null)"
+        errorLine2="                                                       ~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/notification/NotificationKeyData.java"
+            line="72"
+            column="56"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Method reference requires API level 28 (current min is 26): `Person::getKey`"
+        errorLine1="                .map(Person::getKey).sorted().toArray(String[]::new);"
+        errorLine2="                     ~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/notification/NotificationKeyData.java"
+            line="73"
+            column="22"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 31 (current min is 26): `android.content.pm.LauncherActivityInfo#getLoadingProgress`"
+        errorLine1="            return (int) (100 * info.getLoadingProgress());"
+        errorLine2="                                     ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/util/PackageManagerHelper.java"
+            line="338"
+            column="38"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 26): `android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_PAGE_LEFT`"
+        errorLine1="                AccessibilityNodeInfo.AccessibilityAction.ACTION_PAGE_LEFT"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/PagedView.java"
+            line="1752"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 26): `android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_PAGE_RIGHT`"
+        errorLine1="                : AccessibilityNodeInfo.AccessibilityAction.ACTION_PAGE_RIGHT);"
+        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/PagedView.java"
+            line="1753"
+            column="19"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 26): `android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_PAGE_RIGHT`"
+        errorLine1="                AccessibilityNodeInfo.AccessibilityAction.ACTION_PAGE_RIGHT"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/PagedView.java"
+            line="1760"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 26): `android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_PAGE_LEFT`"
+        errorLine1="                : AccessibilityNodeInfo.AccessibilityAction.ACTION_PAGE_LEFT);"
+        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/PagedView.java"
+            line="1761"
+            column="19"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 26): `java.util.List#of`"
+        errorLine1="    private List&lt;WidgetsListBaseEntry> mAllWidgets = List.of();"
+        errorLine2="                                                          ~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/popup/PopupDataProvider.java"
+            line="64"
+            column="59"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 26): `java.util.List#of`"
+        errorLine1="    private List&lt;ItemInfo> mRecommendedWidgets = List.of();"
+        errorLine2="                                                      ~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/popup/PopupDataProvider.java"
+            line="66"
+            column="55"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 26): `new android.view.SurfaceControlViewHost`"
+        errorLine1="                    .submit(() -> new SurfaceControlViewHost(mContext, mDisplay, mHostToken))"
+        errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java"
+            line="91"
+            column="35"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 26): `android.view.SurfaceControlViewHost#getSurfacePackage`"
+        errorLine1="            surfacePackage = mSurfaceControlViewHost.getSurfacePackage();"
+        errorLine2="                                                     ~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java"
+            line="93"
+            column="54"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 26): `android.view.SurfaceControlViewHost#setView`"
+        errorLine1="                host.setView(view, view.getMeasuredWidth(), view.getMeasuredHeight());"
+        errorLine2="                     ~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java"
+            line="127"
+            column="22"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Cast from `SurfacePackage` to `Parcelable` requires API level 30 (current min is 26)"
+        errorLine1="        result.putParcelable(KEY_SURFACE_PACKAGE, surfacePackage);"
+        errorLine2="                                                  ~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java"
+            line="132"
+            column="51"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 26): `android.view.SurfaceControlViewHost#release`"
+        errorLine1="                mSurfaceControlViewHost.release();"
+        errorLine2="                                        ~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java"
+            line="149"
+            column="41"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 26): `android.graphics.Outline#setPath`"
+        errorLine1="        outline.setPath(mPath);"
+        errorLine2="                ~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/popup/RoundedArrowDrawable.java"
+            line="88"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 31 (current min is 26): `new android.widget.EdgeEffect`"
+        errorLine1="                ? new EdgeEffect(context, attrs) : new EdgeEffect(context);"
+        errorLine2="                  ~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/views/SpringRelativeLayout.java"
+            line="49"
+            column="19"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 31 (current min is 26): `new android.widget.EdgeEffect`"
+        errorLine1="                ? new EdgeEffect(context, attrs) : new EdgeEffect(context);"
+        errorLine2="                  ~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/views/SpringRelativeLayout.java"
+            line="51"
+            column="19"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 29 (current min is 26): `android.view.WindowInsets#getTappableElementInsets`"
+        errorLine1="            return windowInsets.getTappableElementInsets().bottom > 0;"
+        errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/graphics/SysUiScrim.java"
+            line="190"
+            column="33"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 26): `android.graphics.Insets#bottom`"
+        errorLine1="            return windowInsets.getTappableElementInsets().bottom > 0;"
+        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/graphics/SysUiScrim.java"
+            line="190"
+            column="20"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 28 (current min is 26): `android.appwidget.AppWidgetProviderInfo#widgetFeatures`"
+        errorLine1="        int featureFlags = mProviderInfo.widgetFeatures;"
+        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/WidgetAddFlowHandler.java"
+            line="93"
+            column="28"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 31 (current min is 26): `android.appwidget.AppWidgetProviderInfo#loadDescription`"
+        errorLine1="            CharSequence description = mItem.widgetInfo.loadDescription(getContext());"
+        errorLine2="                                                        ~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/WidgetCell.java"
+            line="193"
+            column="57"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 31 (current min is 26): `android.appwidget.AppWidgetProviderInfo#previewLayout`"
+        errorLine1="                &amp;&amp; item.widgetInfo.previewLayout != Resources.ID_NULL) {"
+        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/WidgetCell.java"
+            line="214"
+            column="20"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 31 (current min is 26): `android.appwidget.AppWidgetProviderInfo#previewLayout`"
+        errorLine1="            launcherAppWidgetProviderInfo.initialLayout = item.widgetInfo.previewLayout;"
+        errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/WidgetCell.java"
+            line="222"
+            column="59"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 26): `android.view.View#getWindowInsetsController`"
+        errorLine1="        getWindowInsetsController().hide(WindowInsets.Type.ime());"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java"
+            line="558"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 26): `android.view.WindowInsets.Type#ime`"
+        errorLine1="        getWindowInsetsController().hide(WindowInsets.Type.ime());"
+        errorLine2="                                                           ~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java"
+            line="558"
+            column="60"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 26): `android.view.WindowInsetsController#hide`"
+        errorLine1="        getWindowInsetsController().hide(WindowInsets.Type.ime());"
+        errorLine2="                                    ~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java"
+            line="558"
+            column="37"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level R (current min is 26): `java.util.List#of`"
+        errorLine1="            return new RecommendationTableData(List.of(), previewScale);"
+        errorLine2="                                                    ~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java"
+            line="139"
+            column="53"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Method reference requires API level 28 (current min is 26): `Person::getKey`"
+        errorLine1="            : Arrays.stream(persons).map(Person::getKey).sorted().toArray(String[]::new);"
+        errorLine2="                                         ~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/model/data/WorkspaceItemInfo.java"
+            line="178"
+            column="42"/>
+    </issue>
+
+</issues>
diff --git a/lint-baseline-res-lib.xml b/lint-baseline-res-lib.xml
new file mode 100644
index 0000000000..e52f8fbc70
--- /dev/null
+++ b/lint-baseline-res-lib.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0">
+
+    <issue
+        id="NewApi"
+        message="`?android:attr/dialogCornerRadius` requires API level 28 (current min is 26)"
+        errorLine1="        android:topLeftRadius=&quot;?android:attr/dialogCornerRadius&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/res/drawable/add_item_dialog_background.xml"
+            line="6"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="`?android:attr/dialogCornerRadius` requires API level 28 (current min is 26)"
+        errorLine1="        android:topRightRadius=&quot;?android:attr/dialogCornerRadius&quot; />"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/res/drawable/add_item_dialog_background.xml"
+            line="7"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="`@android:style/Widget.DeviceDefault.Button.Colored` requires API level 28 (current min is 26)"
+        errorLine1="    &lt;style name=&quot;Widget.DeviceDefault.Button.Rounded.Colored&quot; parent=&quot;@android:style/Widget.DeviceDefault.Button.Colored&quot;>"
+        errorLine2="                                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/res/values/styles.xml"
+            line="287"
+            column="63"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="`@android:dimen/system_app_widget_background_radius` requires API level 31 (current min is 26)"
+        errorLine1="    &lt;corners android:radius=&quot;@android:dimen/system_app_widget_background_radius&quot; />"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/res/drawable/widget_resize_frame.xml"
+            line="20"
+            column="14"/>
+    </issue>
+
+</issues>
-- 
GitLab


From b87f3cdc1c6948f85179526d50d20e47fa47fc9e Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 7 Apr 2021 15:02:37 -0700
Subject: [PATCH 0864/1664] Add support for having more hotseat icons in the DB
 than we show

Split InvariantDeviceProfile#numHotseatIcons into two variables:
numDatabaseHotseatIcons and numShownHotseatIcons. These are generally
the same, but different DisplayOptions within the same GridOption
can choose to show different numbers of hotseat icons while sharing
the same database.

numDatabaseHotseatIcons is used for all reading/writing/migrating
purposes, while numShownHotseatIcons determines how many Hotseat
icons to show in the UI.

Test: Existing tests pass, added two new migration tests
Bug: 184789479
Bug: 171917176

Change-Id: I54583504f61a47a4444b6a637ebb7e3ab31528b7
---
 .../hybridhotseat/HotseatEduController.java   |   6 +-
 .../hybridhotseat/HotseatEduDialog.java       |   6 +-
 .../HotseatPredictionController.java          |  14 +--
 .../hybridhotseat/HotseatRestoreHelper.java   |   4 +-
 .../model/QuickstepModelDelegate.java         |   4 +-
 .../taskbar/TaskbarHotseatController.java     |   2 +-
 res/values/attrs.xml                          |   3 +
 .../launcher3/model/BackupRestoreTest.java    |   2 +-
 .../model/GridSizeMigrationTaskTest.java      |   4 +-
 .../model/GridSizeMigrationTaskV2Test.java    | 104 +++++++++++++++++-
 .../launcher3/model/LoaderCursorTest.java     |   6 +-
 .../launcher3/util/LauncherModelHelper.java   |   2 +-
 .../android/launcher3/AutoInstallsLayout.java |   2 +-
 src/com/android/launcher3/DeviceProfile.java  |   4 +-
 src/com/android/launcher3/Hotseat.java        |   4 +-
 .../launcher3/InvariantDeviceProfile.java     |  30 +++--
 .../android/launcher3/LauncherProvider.java   |   2 +-
 .../search/AppsSearchContainerLayout.java     |   2 +-
 .../graphics/LauncherPreviewRenderer.java     |   4 +-
 .../model/GridSizeMigrationTask.java          |  10 +-
 .../model/GridSizeMigrationTaskV2.java        |  11 +-
 .../android/launcher3/model/LoaderCursor.java |   6 +-
 .../android/launcher3/model/ModelWriter.java  |   2 +-
 .../launcher3/provider/ImportDataTask.java    |   5 +-
 .../launcher3/provider/RestoreDbTask.java     |   4 +-
 25 files changed, 181 insertions(+), 62 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduController.java
index 4451e7a6c1..a6844e48b7 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduController.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduController.java
@@ -89,7 +89,7 @@ public class HotseatEduController {
         ArrayList<WorkspaceItemInfo> putIntoFolder = new ArrayList<>();
 
         //separate folders and items that can get in folders
-        for (int i = 0; i < mLauncher.getDeviceProfile().inv.numHotseatIcons; i++) {
+        for (int i = 0; i < mLauncher.getDeviceProfile().numShownHotseatIcons; i++) {
             View view = mHotseat.getChildAt(i, 0);
             if (view == null) continue;
             ItemInfo info = (ItemInfo) view.getTag();
@@ -188,7 +188,7 @@ public class HotseatEduController {
                     .getInt(LauncherSettings.Settings.EXTRA_VALUE);
             mNewScreens = IntArray.wrap(pageId);
         }
-        for (int i = 0; i < mLauncher.getDeviceProfile().inv.numHotseatIcons; i++) {
+        for (int i = 0; i < mLauncher.getDeviceProfile().numShownHotseatIcons; i++) {
             View child = mHotseat.getChildAt(i, 0);
             if (child == null || child.getTag() == null) continue;
             ItemInfo tag = (ItemInfo) child.getTag();
@@ -224,7 +224,7 @@ public class HotseatEduController {
 
     void showDimissTip() {
         if (mHotseat.getShortcutsAndWidgets().getChildCount()
-                < mLauncher.getDeviceProfile().inv.numHotseatIcons) {
+                < mLauncher.getDeviceProfile().numShownHotseatIcons) {
             Snackbar.show(mLauncher, R.string.hotseat_tip_gaps_filled,
                     R.string.hotseat_prediction_settings, null,
                     () -> mLauncher.startActivity(getSettingsIntent()));
diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java
index c3677ea41e..a2ed21143c 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java
@@ -88,7 +88,7 @@ public class HotseatEduDialog extends AbstractSlideInView implements Insettable
         Rect padding = grid.getHotseatLayoutPadding();
 
         mSampleHotseat.getLayoutParams().height = grid.cellHeightPx;
-        mSampleHotseat.setGridSize(grid.inv.numHotseatIcons, 1);
+        mSampleHotseat.setGridSize(grid.numShownHotseatIcons, 1);
         mSampleHotseat.setPadding(padding.left, 0, padding.right, 0);
 
         Button turnOnBtn = findViewById(R.id.turn_predictions_on);
@@ -178,7 +178,7 @@ public class HotseatEduDialog extends AbstractSlideInView implements Insettable
     }
 
     private void populatePreview(List<WorkspaceItemInfo> predictions) {
-        for (int i = 0; i < mLauncher.getDeviceProfile().inv.numHotseatIcons; i++) {
+        for (int i = 0; i < mLauncher.getDeviceProfile().numShownHotseatIcons; i++) {
             WorkspaceItemInfo info = predictions.get(i);
             PredictedAppIcon icon = PredictedAppIcon.createIcon(mSampleHotseat, info);
             icon.setEnabled(false);
@@ -194,7 +194,7 @@ public class HotseatEduDialog extends AbstractSlideInView implements Insettable
      */
     public void show(List<WorkspaceItemInfo> predictions) {
         if (getParent() != null
-                || predictions.size() < mLauncher.getDeviceProfile().inv.numHotseatIcons
+                || predictions.size() < mLauncher.getDeviceProfile().numShownHotseatIcons
                 || mHotseatEduController == null) {
             return;
         }
diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
index f297343552..67ed5fb5e5 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
@@ -33,10 +33,10 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.DragSource;
 import com.android.launcher3.DropTarget;
 import com.android.launcher3.Hotseat;
-import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.R;
 import com.android.launcher3.anim.AnimationSuccessListener;
@@ -68,7 +68,7 @@ import java.util.stream.Collectors;
  * pinning of predicted apps and manages replacement of predicted apps with user drag.
  */
 public class HotseatPredictionController implements DragController.DragListener,
-        SystemShortcut.Factory<QuickstepLauncher>, InvariantDeviceProfile.OnIDPChangeListener,
+        SystemShortcut.Factory<QuickstepLauncher>, DeviceProfile.OnDeviceProfileChangeListener,
         DragSource, ViewGroup.OnHierarchyChangeListener {
 
     private static final int FLAG_UPDATE_PAUSED = 1 << 0;
@@ -115,10 +115,10 @@ public class HotseatPredictionController implements DragController.DragListener,
     public HotseatPredictionController(QuickstepLauncher launcher) {
         mLauncher = launcher;
         mHotseat = launcher.getHotseat();
-        mHotSeatItemsCount = mLauncher.getDeviceProfile().inv.numHotseatIcons;
+        mHotSeatItemsCount = mLauncher.getDeviceProfile().numShownHotseatIcons;
         mLauncher.getDragController().addDragListener(this);
 
-        launcher.getDeviceProfile().inv.addOnChangeListener(this);
+        launcher.addOnDeviceProfileChangeListener(this);
         mHotseat.getShortcutsAndWidgets().setOnHierarchyChangeListener(this);
     }
 
@@ -281,7 +281,7 @@ public class HotseatPredictionController implements DragController.DragListener,
      * Unregisters callbacks and frees resources
      */
     public void destroy() {
-        mLauncher.getDeviceProfile().inv.removeOnChangeListener(this);
+        mLauncher.removeOnDeviceProfileChangeListener(this);
     }
 
     /**
@@ -446,8 +446,8 @@ public class HotseatPredictionController implements DragController.DragListener,
     }
 
     @Override
-    public void onIdpChanged(int changeFlags, InvariantDeviceProfile profile) {
-        this.mHotSeatItemsCount = profile.numHotseatIcons;
+    public void onDeviceProfileChanged(DeviceProfile profile) {
+        this.mHotSeatItemsCount = profile.numShownHotseatIcons;
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatRestoreHelper.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatRestoreHelper.java
index 90f762e24c..4956fa1b86 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatRestoreHelper.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatRestoreHelper.java
@@ -44,7 +44,7 @@ public class HotseatRestoreHelper {
                             .getBinder(LauncherSettings.Settings.EXTRA_VALUE)) {
                 InvariantDeviceProfile idp = LauncherAppState.getIDP(context);
                 GridBackupTable backupTable = new GridBackupTable(context,
-                        transaction.getDb(), idp.numHotseatIcons, idp.numColumns,
+                        transaction.getDb(), idp.numDatabaseHotseatIcons, idp.numColumns,
                         idp.numRows);
                 backupTable.createCustomBackupTable(HYBRID_HOTSEAT_BACKUP_TABLE);
                 transaction.commit();
@@ -69,7 +69,7 @@ public class HotseatRestoreHelper {
                 }
                 InvariantDeviceProfile idp = LauncherAppState.getIDP(context);
                 GridBackupTable backupTable = new GridBackupTable(context,
-                        transaction.getDb(), idp.numHotseatIcons, idp.numColumns,
+                        transaction.getDb(), idp.numDatabaseHotseatIcons, idp.numColumns,
                         idp.numRows);
                 backupTable.restoreFromCustomBackupTable(HYBRID_HOTSEAT_BACKUP_TABLE, true);
                 transaction.commit();
diff --git a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
index df3657d01d..8c6887250e 100644
--- a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
+++ b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
@@ -111,7 +111,7 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
         mDataModel.extraItems.put(CONTAINER_PREDICTION, mAllAppsState.items);
 
         WorkspaceItemFactory hotseatFactory =
-                new WorkspaceItemFactory(mApp, ums, pinnedShortcuts, mIDP.numHotseatIcons);
+                new WorkspaceItemFactory(mApp, ums, pinnedShortcuts, mIDP.numDatabaseHotseatIcons);
         mHotseatState.items.setItems(
                 mHotseatState.storage.read(mApp.getContext(), hotseatFactory, ums.allUsers::get));
         mDataModel.extraItems.put(CONTAINER_HOTSEAT_PREDICTION, mHotseatState.items);
@@ -211,7 +211,7 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
         registerPredictor(mHotseatState, apm.createAppPredictionSession(
                 new AppPredictionContext.Builder(context)
                         .setUiSurface("hotseat")
-                        .setPredictedTargetCount(mIDP.numHotseatIcons)
+                        .setPredictedTargetCount(mIDP.numDatabaseHotseatIcons)
                         .setExtras(convertDataModelToAppTargetBundle(context, mDataModel))
                         .build()));
 
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java
index b1bafdb879..68829cd0fb 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java
@@ -52,7 +52,7 @@ public class TaskbarHotseatController {
         mLauncher = launcher;
         mHotseat = mLauncher.getHotseat();
         mTaskbarCallbacks = taskbarCallbacks;
-        mNumHotseatIcons = mLauncher.getDeviceProfile().inv.numHotseatIcons;
+        mNumHotseatIcons = mLauncher.getDeviceProfile().numShownHotseatIcons;
     }
 
     protected void init() {
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 381b0fef21..699c2e317f 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -175,6 +175,9 @@
 
         <!-- numAllAppsColumns defaults to GridDisplayOption.numColumns, if not specified -->
         <attr name="numAllAppsColumns" format="integer" />
+
+        <!-- numShownHotseatIcons defaults to GridDisplayOption.numHotseatIcons, if not specified -->
+        <attr name="numShownHotseatIcons" format="integer" />
     </declare-styleable>
 
     <declare-styleable name="CellLayout">
diff --git a/robolectric_tests/src/com/android/launcher3/model/BackupRestoreTest.java b/robolectric_tests/src/com/android/launcher3/model/BackupRestoreTest.java
index 8baf5a3f27..e7606f734f 100644
--- a/robolectric_tests/src/com/android/launcher3/model/BackupRestoreTest.java
+++ b/robolectric_tests/src/com/android/launcher3/model/BackupRestoreTest.java
@@ -134,7 +134,7 @@ public class BackupRestoreTest {
                 { APP_ICON, SHORTCUT, SHORTCUT, NO__ICON},
             }}, 2, OLD_WORK_PROFILE_ID);
         // simulates the creation of backup upon restore
-        new GridBackupTable(RuntimeEnvironment.application, mDb, mIdp.numHotseatIcons,
+        new GridBackupTable(RuntimeEnvironment.application, mDb, mIdp.numDatabaseHotseatIcons,
                 mIdp.numColumns, mIdp.numRows).doBackup(
                         MY_OLD_PROFILE_ID, GridBackupTable.OPTION_REQUIRES_SANITIZATION);
         // reset favorites table
diff --git a/robolectric_tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java b/robolectric_tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java
index 8e00dcb854..d544a0b5f3 100644
--- a/robolectric_tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java
+++ b/robolectric_tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java
@@ -64,7 +64,7 @@ public class GridSizeMigrationTaskTest {
                 mModelHelper.addItem(APP_ICON, 4, HOTSEAT, 0, 0),
         };
 
-        mIdp.numHotseatIcons = 3;
+        mIdp.numDatabaseHotseatIcons = 3;
         new GridSizeMigrationTask(mContext, mDb, mValidPackages, false, 5, 3)
                 .migrateHotseat();
         // First item is dropped as it has the least weight.
@@ -81,7 +81,7 @@ public class GridSizeMigrationTaskTest {
                 mModelHelper.addItem(10, 4, HOTSEAT, 0, 0),
         };
 
-        mIdp.numHotseatIcons = 3;
+        mIdp.numDatabaseHotseatIcons = 3;
         new GridSizeMigrationTask(mContext, mDb, mValidPackages, false, 5, 3)
                 .migrateHotseat();
         // First item is dropped as it has the least weight.
diff --git a/robolectric_tests/src/com/android/launcher3/model/GridSizeMigrationTaskV2Test.java b/robolectric_tests/src/com/android/launcher3/model/GridSizeMigrationTaskV2Test.java
index cca333c14f..8e49fae1c7 100644
--- a/robolectric_tests/src/com/android/launcher3/model/GridSizeMigrationTaskV2Test.java
+++ b/robolectric_tests/src/com/android/launcher3/model/GridSizeMigrationTaskV2Test.java
@@ -120,7 +120,7 @@ public class GridSizeMigrationTaskV2Test {
         };
         mModelHelper.addItem(APP_ICON, 0, DESKTOP, 2, 2, testPackage7);
 
-        mIdp.numHotseatIcons = 4;
+        mIdp.numDatabaseHotseatIcons = 4;
         mIdp.numColumns = 4;
         mIdp.numRows = 4;
         GridSizeMigrationTaskV2.DbReader srcReader = new GridSizeMigrationTaskV2.DbReader(mDb,
@@ -128,16 +128,16 @@ public class GridSizeMigrationTaskV2Test {
                 srcHotseatItems.length);
         GridSizeMigrationTaskV2.DbReader destReader = new GridSizeMigrationTaskV2.DbReader(mDb,
                 LauncherSettings.Favorites.TABLE_NAME, mContext, mValidPackages,
-                mIdp.numHotseatIcons);
+                mIdp.numDatabaseHotseatIcons);
         GridSizeMigrationTaskV2 task = new GridSizeMigrationTaskV2(mContext, mDb, srcReader,
-                destReader, mIdp.numHotseatIcons, new Point(mIdp.numColumns, mIdp.numRows));
+                destReader, mIdp.numDatabaseHotseatIcons, new Point(mIdp.numColumns, mIdp.numRows));
         task.migrate();
 
         // Check hotseat items
         Cursor c = mContext.getContentResolver().query(LauncherSettings.Favorites.CONTENT_URI,
                 new String[]{LauncherSettings.Favorites.SCREEN, LauncherSettings.Favorites.INTENT},
                 "container=" + CONTAINER_HOTSEAT, null, null, null);
-        assertEquals(c.getCount(), mIdp.numHotseatIcons);
+        assertEquals(c.getCount(), mIdp.numDatabaseHotseatIcons);
         int screenIndex = c.getColumnIndex(LauncherSettings.Favorites.SCREEN);
         int intentIndex = c.getColumnIndex(LauncherSettings.Favorites.INTENT);
         c.moveToNext();
@@ -186,5 +186,101 @@ public class GridSizeMigrationTaskV2Test {
         assertTrue(c.getString(intentIndex).contains(testPackage8));
         assertEquals(c.getInt(cellXIndex), 0);
         assertEquals(c.getInt(cellYIndex), 2);
+
+        c.close();
+    }
+
+    @Test
+    public void migrateToLargerHotseat() {
+        int[] srcHotseatItems = {
+                mModelHelper.addItem(APP_ICON, 0, HOTSEAT, 0, 0, testPackage1, 1, TMP_CONTENT_URI),
+                mModelHelper.addItem(SHORTCUT, 1, HOTSEAT, 0, 0, testPackage2, 2, TMP_CONTENT_URI),
+                mModelHelper.addItem(APP_ICON, 2, HOTSEAT, 0, 0, testPackage3, 3, TMP_CONTENT_URI),
+                mModelHelper.addItem(SHORTCUT, 3, HOTSEAT, 0, 0, testPackage4, 4, TMP_CONTENT_URI),
+        };
+
+        int numSrcDatabaseHotseatIcons = srcHotseatItems.length;
+        mIdp.numDatabaseHotseatIcons = 6;
+        mIdp.numColumns = 4;
+        mIdp.numRows = 4;
+        GridSizeMigrationTaskV2.DbReader srcReader = new GridSizeMigrationTaskV2.DbReader(mDb,
+                LauncherSettings.Favorites.TMP_TABLE, mContext, mValidPackages,
+                numSrcDatabaseHotseatIcons);
+        GridSizeMigrationTaskV2.DbReader destReader = new GridSizeMigrationTaskV2.DbReader(mDb,
+                LauncherSettings.Favorites.TABLE_NAME, mContext, mValidPackages,
+                mIdp.numDatabaseHotseatIcons);
+        GridSizeMigrationTaskV2 task = new GridSizeMigrationTaskV2(mContext, mDb, srcReader,
+                destReader, mIdp.numDatabaseHotseatIcons, new Point(mIdp.numColumns, mIdp.numRows));
+        task.migrate();
+
+        // Check hotseat items
+        Cursor c = mContext.getContentResolver().query(LauncherSettings.Favorites.CONTENT_URI,
+                new String[]{LauncherSettings.Favorites.SCREEN, LauncherSettings.Favorites.INTENT},
+                "container=" + CONTAINER_HOTSEAT, null, null, null);
+        assertEquals(c.getCount(), numSrcDatabaseHotseatIcons);
+        int screenIndex = c.getColumnIndex(LauncherSettings.Favorites.SCREEN);
+        int intentIndex = c.getColumnIndex(LauncherSettings.Favorites.INTENT);
+        c.moveToNext();
+        assertEquals(c.getInt(screenIndex), 0);
+        assertTrue(c.getString(intentIndex).contains(testPackage1));
+        c.moveToNext();
+        assertEquals(c.getInt(screenIndex), 1);
+        assertTrue(c.getString(intentIndex).contains(testPackage2));
+        c.moveToNext();
+        assertEquals(c.getInt(screenIndex), 2);
+        assertTrue(c.getString(intentIndex).contains(testPackage3));
+        c.moveToNext();
+        assertEquals(c.getInt(screenIndex), 3);
+        assertTrue(c.getString(intentIndex).contains(testPackage4));
+
+        c.close();
+    }
+
+    @Test
+    public void migrateFromLargerHotseat() {
+        int[] srcHotseatItems = {
+                mModelHelper.addItem(APP_ICON, 0, HOTSEAT, 0, 0, testPackage1, 1, TMP_CONTENT_URI),
+                -1,
+                mModelHelper.addItem(SHORTCUT, 2, HOTSEAT, 0, 0, testPackage2, 2, TMP_CONTENT_URI),
+                mModelHelper.addItem(APP_ICON, 3, HOTSEAT, 0, 0, testPackage3, 3, TMP_CONTENT_URI),
+                mModelHelper.addItem(SHORTCUT, 4, HOTSEAT, 0, 0, testPackage4, 4, TMP_CONTENT_URI),
+                mModelHelper.addItem(APP_ICON, 5, HOTSEAT, 0, 0, testPackage5, 5, TMP_CONTENT_URI),
+        };
+
+        int numSrcDatabaseHotseatIcons = srcHotseatItems.length;
+        mIdp.numDatabaseHotseatIcons = 4;
+        mIdp.numColumns = 4;
+        mIdp.numRows = 4;
+        GridSizeMigrationTaskV2.DbReader srcReader = new GridSizeMigrationTaskV2.DbReader(mDb,
+                LauncherSettings.Favorites.TMP_TABLE, mContext, mValidPackages,
+                numSrcDatabaseHotseatIcons);
+        GridSizeMigrationTaskV2.DbReader destReader = new GridSizeMigrationTaskV2.DbReader(mDb,
+                LauncherSettings.Favorites.TABLE_NAME, mContext, mValidPackages,
+                mIdp.numDatabaseHotseatIcons);
+        GridSizeMigrationTaskV2 task = new GridSizeMigrationTaskV2(mContext, mDb, srcReader,
+                destReader, mIdp.numDatabaseHotseatIcons, new Point(mIdp.numColumns, mIdp.numRows));
+        task.migrate();
+
+        // Check hotseat items
+        Cursor c = mContext.getContentResolver().query(LauncherSettings.Favorites.CONTENT_URI,
+                new String[]{LauncherSettings.Favorites.SCREEN, LauncherSettings.Favorites.INTENT},
+                "container=" + CONTAINER_HOTSEAT, null, null, null);
+        assertEquals(c.getCount(), mIdp.numDatabaseHotseatIcons);
+        int screenIndex = c.getColumnIndex(LauncherSettings.Favorites.SCREEN);
+        int intentIndex = c.getColumnIndex(LauncherSettings.Favorites.INTENT);
+        c.moveToNext();
+        assertEquals(c.getInt(screenIndex), 0);
+        assertTrue(c.getString(intentIndex).contains(testPackage1));
+        c.moveToNext();
+        assertEquals(c.getInt(screenIndex), 1);
+        assertTrue(c.getString(intentIndex).contains(testPackage2));
+        c.moveToNext();
+        assertEquals(c.getInt(screenIndex), 2);
+        assertTrue(c.getString(intentIndex).contains(testPackage3));
+        c.moveToNext();
+        assertEquals(c.getInt(screenIndex), 3);
+        assertTrue(c.getString(intentIndex).contains(testPackage4));
+
+        c.close();
     }
 }
diff --git a/robolectric_tests/src/com/android/launcher3/model/LoaderCursorTest.java b/robolectric_tests/src/com/android/launcher3/model/LoaderCursorTest.java
index fb08c56a40..800311afb6 100644
--- a/robolectric_tests/src/com/android/launcher3/model/LoaderCursorTest.java
+++ b/robolectric_tests/src/com/android/launcher3/model/LoaderCursorTest.java
@@ -160,7 +160,7 @@ public class LoaderCursorTest {
     public void checkItemPlacement_outsideBounds() {
         mIDP.numRows = 4;
         mIDP.numColumns = 4;
-        mIDP.numHotseatIcons = 3;
+        mIDP.numDatabaseHotseatIcons = 3;
 
         // Item outside screen bounds are not placed
         assertFalse(mLoaderCursor.checkItemPlacement(
@@ -171,7 +171,7 @@ public class LoaderCursorTest {
     public void checkItemPlacement_overlappingItems() {
         mIDP.numRows = 4;
         mIDP.numColumns = 4;
-        mIDP.numHotseatIcons = 3;
+        mIDP.numDatabaseHotseatIcons = 3;
 
         // Overlapping mItems are not placed
         assertTrue(mLoaderCursor.checkItemPlacement(
@@ -197,7 +197,7 @@ public class LoaderCursorTest {
     public void checkItemPlacement_hotseat() {
         mIDP.numRows = 4;
         mIDP.numColumns = 4;
-        mIDP.numHotseatIcons = 3;
+        mIDP.numDatabaseHotseatIcons = 3;
 
         // Hotseat mItems are only placed based on screenId
         assertTrue(mLoaderCursor.checkItemPlacement(
diff --git a/robolectric_tests/src/com/android/launcher3/util/LauncherModelHelper.java b/robolectric_tests/src/com/android/launcher3/util/LauncherModelHelper.java
index 849f98b8ff..846e2019a0 100644
--- a/robolectric_tests/src/com/android/launcher3/util/LauncherModelHelper.java
+++ b/robolectric_tests/src/com/android/launcher3/util/LauncherModelHelper.java
@@ -355,7 +355,7 @@ public class LauncherModelHelper {
             throws Exception {
         Context context = RuntimeEnvironment.application;
         InvariantDeviceProfile idp = InvariantDeviceProfile.INSTANCE.get(context);
-        idp.numRows = idp.numColumns = idp.numHotseatIcons = DEFAULT_GRID_SIZE;
+        idp.numRows = idp.numColumns = idp.numDatabaseHotseatIcons = DEFAULT_GRID_SIZE;
         idp.iconBitmapSize = DEFAULT_BITMAP_SIZE;
 
         Settings.Secure.putString(context.getContentResolver(),
diff --git a/src/com/android/launcher3/AutoInstallsLayout.java b/src/com/android/launcher3/AutoInstallsLayout.java
index f61bc055e2..5b655a4740 100644
--- a/src/com/android/launcher3/AutoInstallsLayout.java
+++ b/src/com/android/launcher3/AutoInstallsLayout.java
@@ -89,7 +89,7 @@ public class AutoInstallsLayout {
 
         // Try with grid size and hotseat count
         String layoutName = String.format(Locale.ENGLISH, FORMATTED_LAYOUT_RES_WITH_HOSTEAT,
-                grid.numColumns, grid.numRows, grid.numHotseatIcons);
+                grid.numColumns, grid.numRows, grid.numDatabaseHotseatIcons);
         int layoutId = targetRes.getIdentifier(layoutName, "xml", pkg);
 
         // Try with only grid size
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 35b0f27c79..985a445f81 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -137,6 +137,7 @@ public class DeviceProfile {
     public int folderChildDrawablePaddingPx;
 
     // Hotseat
+    public final int numShownHotseatIcons;
     public int hotseatCellHeightPx;
     // In portrait: size = height, in landscape: size = width
     public int hotseatBarSizePx;
@@ -293,6 +294,7 @@ public class DeviceProfile {
 
         workspaceCellPaddingXPx = res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_padding_x);
 
+        numShownHotseatIcons = inv.numShownHotseatIcons;
         hotseatBarTopPaddingPx =
                 res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_top_padding);
         hotseatBarBottomPaddingPx = (isTallDevice ? 0
@@ -735,7 +737,7 @@ public class DeviceProfile {
             // for this, we pad the left and right of the hotseat with half of the difference of a
             // workspace cell vs a hotseat cell.
             float workspaceCellWidth = (float) widthPx / inv.numColumns;
-            float hotseatCellWidth = (float) widthPx / inv.numHotseatIcons;
+            float hotseatCellWidth = (float) widthPx / inv.numShownHotseatIcons;
             int hotseatAdjustment = Math.round((workspaceCellWidth - hotseatCellWidth) / 2);
             mHotseatPadding.set(
                     hotseatAdjustment + workspacePadding.left + cellLayoutPaddingLeftRightPx
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index 5429806ede..da41200040 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -92,9 +92,9 @@ public class Hotseat extends CellLayout implements Insettable {
         mHasVerticalHotseat = hasVerticalHotseat;
         InvariantDeviceProfile idp = mActivity.getDeviceProfile().inv;
         if (hasVerticalHotseat) {
-            setGridSize(1, idp.numHotseatIcons);
+            setGridSize(1, idp.numShownHotseatIcons);
         } else {
-            setGridSize(idp.numHotseatIcons, 1);
+            setGridSize(idp.numShownHotseatIcons, 1);
         }
     }
 
diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index 5612dafe23..f19877793b 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -122,7 +122,14 @@ public class InvariantDeviceProfile {
     /**
      * Number of icons inside the hotseat area.
      */
-    public int numHotseatIcons;
+    protected int numShownHotseatIcons;
+
+    /**
+     * Number of icons inside the hotseat area that is stored in the database. This is greater than
+     * or equal to numnShownHotseatIcons, allowing for a seamless transition between two hotseat
+     * sizes that share the same DB.
+     */
+    public int numDatabaseHotseatIcons;
 
     /**
      * Number of columns in the all apps list.
@@ -165,7 +172,8 @@ public class InvariantDeviceProfile {
         iconBitmapSize = p.iconBitmapSize;
         iconTextSize = p.iconTextSize;
         landscapeIconTextSize = p.landscapeIconTextSize;
-        numHotseatIcons = p.numHotseatIcons;
+        numShownHotseatIcons = p.numShownHotseatIcons;
+        numDatabaseHotseatIcons = p.numDatabaseHotseatIcons;
         numAllAppsColumns = p.numAllAppsColumns;
         isScalable = p.isScalable;
         devicePaddingId = p.devicePaddingId;
@@ -190,7 +198,7 @@ public class InvariantDeviceProfile {
             Utilities.getPrefs(context).edit().putString(KEY_IDP_GRID_NAME, newGridName).apply();
         }
         Utilities.getPrefs(context).edit()
-                .putInt(KEY_MIGRATION_SRC_HOTSEAT_COUNT, numHotseatIcons)
+                .putInt(KEY_MIGRATION_SRC_HOTSEAT_COUNT, numDatabaseHotseatIcons)
                 .putString(KEY_MIGRATION_SRC_WORKSPACE_SIZE, getPointString(numColumns, numRows))
                 .apply();
 
@@ -229,6 +237,7 @@ public class InvariantDeviceProfile {
                 .add(myDisplayOption);
         result.iconSize = defaultDisplayOption.iconSize;
         result.landscapeIconSize = defaultDisplayOption.landscapeIconSize;
+        result.numShownHotseatIcons = myDisplayOption.numShownHotseatIcons;
         if (defaultDisplayOption.allAppsIconSize < myDisplayOption.allAppsIconSize) {
             result.allAppsIconSize = defaultDisplayOption.allAppsIconSize;
             result.numAllAppsColumns = defaultDisplayOption.numAllAppsColumns;
@@ -279,7 +288,7 @@ public class InvariantDeviceProfile {
         GridOption closestProfile = displayOption.grid;
         numRows = closestProfile.numRows;
         numColumns = closestProfile.numColumns;
-        numHotseatIcons = closestProfile.numHotseatIcons;
+        numDatabaseHotseatIcons = closestProfile.numDatabaseHotseatIcons;
         dbFile = closestProfile.dbFile;
         defaultLayoutId = closestProfile.defaultLayoutId;
         demoModeLayoutId = closestProfile.demoModeLayoutId;
@@ -301,6 +310,7 @@ public class InvariantDeviceProfile {
         minCellHeight = displayOption.minCellHeight;
         minCellWidth = displayOption.minCellWidth;
         borderSpacing = displayOption.borderSpacing;
+        numShownHotseatIcons = Math.round(displayOption.numShownHotseatIcons);
         numAllAppsColumns = Math.round(displayOption.numAllAppsColumns);
 
         if (Utilities.isGridOptionsEnabled(context)) {
@@ -391,7 +401,7 @@ public class InvariantDeviceProfile {
                 numColumns != oldProfile.numColumns ||
                 numFolderColumns != oldProfile.numFolderColumns ||
                 numFolderRows != oldProfile.numFolderRows ||
-                numHotseatIcons != oldProfile.numHotseatIcons) {
+                numDatabaseHotseatIcons != oldProfile.numDatabaseHotseatIcons) {
             changeFlags |= CHANGE_FLAG_GRID;
         }
 
@@ -619,7 +629,7 @@ public class InvariantDeviceProfile {
         private final int numFolderRows;
         private final int numFolderColumns;
 
-        private final int numHotseatIcons;
+        private final int numDatabaseHotseatIcons;
 
         private final String dbFile;
 
@@ -645,7 +655,7 @@ public class InvariantDeviceProfile {
                     R.styleable.GridDisplayOption_defaultLayoutId, 0);
             demoModeLayoutId = a.getResourceId(
                     R.styleable.GridDisplayOption_demoModeLayoutId, defaultLayoutId);
-            numHotseatIcons = a.getInt(
+            numDatabaseHotseatIcons = a.getInt(
                     R.styleable.GridDisplayOption_numHotseatIcons, numColumns);
             numFolderRows = a.getInt(
                     R.styleable.GridDisplayOption_numFolderRows, numRows);
@@ -673,6 +683,7 @@ public class InvariantDeviceProfile {
         private final float minHeightDps;
         private final boolean canBeDefault;
 
+        private float numShownHotseatIcons;
         private float numAllAppsColumns;
         private float minCellHeight;
         private float minCellWidth;
@@ -695,6 +706,8 @@ public class InvariantDeviceProfile {
             minHeightDps = a.getFloat(R.styleable.ProfileDisplayOption_minHeightDps, 0);
             canBeDefault = a.getBoolean(
                     R.styleable.ProfileDisplayOption_canBeDefault, false);
+            numShownHotseatIcons = a.getInt(R.styleable.ProfileDisplayOption_numShownHotseatIcons,
+                    grid.numDatabaseHotseatIcons);
             numAllAppsColumns = a.getInt(R.styleable.ProfileDisplayOption_numAllAppsColumns,
                     grid.numColumns);
 
@@ -725,6 +738,7 @@ public class InvariantDeviceProfile {
             minWidthDps = 0;
             minHeightDps = 0;
             canBeDefault = false;
+            numShownHotseatIcons = 0;
             numAllAppsColumns = 0;
             minCellHeight = 0;
             minCellWidth = 0;
@@ -732,6 +746,7 @@ public class InvariantDeviceProfile {
         }
 
         private DisplayOption multiply(float w) {
+            numShownHotseatIcons *= w;
             numAllAppsColumns *= w;
             iconSize *= w;
             landscapeIconSize *= w;
@@ -746,6 +761,7 @@ public class InvariantDeviceProfile {
         }
 
         private DisplayOption add(DisplayOption p) {
+            numShownHotseatIcons += p.numShownHotseatIcons;
             numAllAppsColumns += p.numAllAppsColumns;
             iconSize += p.iconSize;
             landscapeIconSize += p.landscapeIconSize;
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 2ec5e90280..39b16fd8d6 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -618,7 +618,7 @@ public class LauncherProvider extends ContentProvider {
                 .appendQueryParameter("version", "1")
                 .appendQueryParameter("gridWidth", Integer.toString(grid.numColumns))
                 .appendQueryParameter("gridHeight", Integer.toString(grid.numRows))
-                .appendQueryParameter("hotseatSize", Integer.toString(grid.numHotseatIcons))
+                .appendQueryParameter("hotseatSize", Integer.toString(grid.numDatabaseHotseatIcons))
                 .build();
     }
 
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
index a8185d6eba..24912173ff 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
@@ -106,7 +106,7 @@ public class AppsSearchContainerLayout extends ExtendedEditText
                 - mAppsView.getActiveRecyclerView().getPaddingRight();
 
         int cellWidth = DeviceProfile.calculateCellWidth(rowWidth, dp.cellLayoutBorderSpacingPx,
-                dp.inv.numHotseatIcons);
+                dp.numShownHotseatIcons);
         int iconVisibleSize = Math.round(ICON_VISIBLE_AREA_FACTOR * dp.iconSizePx);
         int iconPadding = cellWidth - iconVisibleSize;
 
diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index 5e9b179d6a..31764c57f5 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -467,7 +467,7 @@ public class LauncherPreviewRenderer extends ContextThemeWrapper
                 }
             }
             IntArray ranks = getMissingHotseatRanks(currentWorkspaceItems,
-                    mIdp.numHotseatIcons);
+                    mDp.numShownHotseatIcons);
             List<ItemInfo> predictions = workspaceResult.mHotseatPredictions == null
                     ? Collections.emptyList() : workspaceResult.mHotseatPredictions.items;
             int count = Math.min(ranks.size(), predictions.size());
@@ -484,7 +484,7 @@ public class LauncherPreviewRenderer extends ContextThemeWrapper
             }
         } else {
             // Add hotseat icons
-            for (int i = 0; i < mIdp.numHotseatIcons; i++) {
+            for (int i = 0; i < mDp.numShownHotseatIcons; i++) {
                 WorkspaceItemInfo info = new WorkspaceItemInfo(mWorkspaceItemInfo);
                 info.container = Favorites.CONTAINER_HOTSEAT;
                 info.screenId = i;
diff --git a/src/com/android/launcher3/model/GridSizeMigrationTask.java b/src/com/android/launcher3/model/GridSizeMigrationTask.java
index 804e72ee29..6a75e6254d 100644
--- a/src/com/android/launcher3/model/GridSizeMigrationTask.java
+++ b/src/com/android/launcher3/model/GridSizeMigrationTask.java
@@ -893,7 +893,7 @@ public class GridSizeMigrationTask {
         String gridSizeString = getPointString(idp.numColumns, idp.numRows);
 
         return !gridSizeString.equals(prefs.getString(KEY_MIGRATION_SRC_WORKSPACE_SIZE, ""))
-                || idp.numHotseatIcons != prefs.getInt(KEY_MIGRATION_SRC_HOTSEAT_COUNT, -1);
+                || idp.numDatabaseHotseatIcons != prefs.getInt(KEY_MIGRATION_SRC_HOTSEAT_COUNT, -1);
     }
 
     /** See {@link #migrateGridIfNeeded(Context, InvariantDeviceProfile)} */
@@ -928,7 +928,7 @@ public class GridSizeMigrationTask {
                 .getBinder(Settings.EXTRA_VALUE)) {
 
             int srcHotseatCount = prefs.getInt(KEY_MIGRATION_SRC_HOTSEAT_COUNT,
-                    idp.numHotseatIcons);
+                    idp.numDatabaseHotseatIcons);
             Point sourceSize = parsePoint(prefs.getString(
                     KEY_MIGRATION_SRC_WORKSPACE_SIZE, gridSizeString));
 
@@ -948,10 +948,10 @@ public class GridSizeMigrationTask {
 
             HashSet<String> validPackages = getValidPackages(context);
             // Hotseat.
-            if (srcHotseatCount != idp.numHotseatIcons
+            if (srcHotseatCount != idp.numDatabaseHotseatIcons
                     && new GridSizeMigrationTask(context, transaction.getDb(), validPackages,
                             migrateForPreview, srcHotseatCount,
-                            idp.numHotseatIcons).migrateHotseat()) {
+                            idp.numDatabaseHotseatIcons).migrateHotseat()) {
                 dbChanged = true;
             }
 
@@ -991,7 +991,7 @@ public class GridSizeMigrationTask {
                 // Save current configuration, so that the migration does not run again.
                 prefs.edit()
                         .putString(KEY_MIGRATION_SRC_WORKSPACE_SIZE, gridSizeString)
-                        .putInt(KEY_MIGRATION_SRC_HOTSEAT_COUNT, idp.numHotseatIcons)
+                        .putInt(KEY_MIGRATION_SRC_HOTSEAT_COUNT, idp.numDatabaseHotseatIcons)
                         .apply();
             }
         }
diff --git a/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java b/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java
index c6c0791a17..cee93041e5 100644
--- a/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java
+++ b/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java
@@ -110,7 +110,7 @@ public class GridSizeMigrationTaskV2 {
         String gridSizeString = getPointString(idp.numColumns, idp.numRows);
 
         return !gridSizeString.equals(prefs.getString(KEY_MIGRATION_SRC_WORKSPACE_SIZE, ""))
-                || idp.numHotseatIcons != prefs.getInt(KEY_MIGRATION_SRC_HOTSEAT_COUNT, -1);
+                || idp.numDatabaseHotseatIcons != prefs.getInt(KEY_MIGRATION_SRC_HOTSEAT_COUNT, -1);
     }
 
     /** See {@link #migrateGridIfNeeded(Context, InvariantDeviceProfile)} */
@@ -148,7 +148,8 @@ public class GridSizeMigrationTaskV2 {
         SharedPreferences prefs = Utilities.getPrefs(context);
         String gridSizeString = getPointString(idp.numColumns, idp.numRows);
         HashSet<String> validPackages = getValidPackages(context);
-        int srcHotseatCount = prefs.getInt(KEY_MIGRATION_SRC_HOTSEAT_COUNT, idp.numHotseatIcons);
+        int srcHotseatCount = prefs.getInt(KEY_MIGRATION_SRC_HOTSEAT_COUNT,
+                idp.numDatabaseHotseatIcons);
 
         if (migrateForPreview) {
             if (!LauncherSettings.Settings.call(
@@ -177,11 +178,11 @@ public class GridSizeMigrationTaskV2 {
             DbReader destReader = new DbReader(t.getDb(),
                     migrateForPreview ? LauncherSettings.Favorites.PREVIEW_TABLE_NAME
                             : LauncherSettings.Favorites.TABLE_NAME,
-                    context, validPackages, idp.numHotseatIcons);
+                    context, validPackages, idp.numDatabaseHotseatIcons);
 
             Point targetSize = new Point(idp.numColumns, idp.numRows);
             GridSizeMigrationTaskV2 task = new GridSizeMigrationTaskV2(context, t.getDb(),
-                    srcReader, destReader, idp.numHotseatIcons, targetSize);
+                    srcReader, destReader, idp.numDatabaseHotseatIcons, targetSize);
             task.migrate();
 
             if (!migrateForPreview) {
@@ -202,7 +203,7 @@ public class GridSizeMigrationTaskV2 {
                 // Save current configuration, so that the migration does not run again.
                 prefs.edit()
                         .putString(KEY_MIGRATION_SRC_WORKSPACE_SIZE, gridSizeString)
-                        .putInt(KEY_MIGRATION_SRC_HOTSEAT_COUNT, idp.numHotseatIcons)
+                        .putInt(KEY_MIGRATION_SRC_HOTSEAT_COUNT, idp.numDatabaseHotseatIcons)
                         .apply();
             }
         }
diff --git a/src/com/android/launcher3/model/LoaderCursor.java b/src/com/android/launcher3/model/LoaderCursor.java
index 19d9af98dc..897b02ede2 100644
--- a/src/com/android/launcher3/model/LoaderCursor.java
+++ b/src/com/android/launcher3/model/LoaderCursor.java
@@ -410,10 +410,10 @@ public class LoaderCursor extends CursorWrapper {
             final GridOccupancy hotseatOccupancy =
                     occupied.get(LauncherSettings.Favorites.CONTAINER_HOTSEAT);
 
-            if (item.screenId >= mIDP.numHotseatIcons) {
+            if (item.screenId >= mIDP.numDatabaseHotseatIcons) {
                 Log.e(TAG, "Error loading shortcut " + item
                         + " into hotseat position " + item.screenId
-                        + ", position out of bounds: (0 to " + (mIDP.numHotseatIcons - 1)
+                        + ", position out of bounds: (0 to " + (mIDP.numDatabaseHotseatIcons - 1)
                         + ")");
                 return false;
             }
@@ -429,7 +429,7 @@ public class LoaderCursor extends CursorWrapper {
                     return true;
                 }
             } else {
-                final GridOccupancy occupancy = new GridOccupancy(mIDP.numHotseatIcons, 1);
+                final GridOccupancy occupancy = new GridOccupancy(mIDP.numDatabaseHotseatIcons, 1);
                 occupancy.cells[item.screenId][0] = true;
                 occupied.put(LauncherSettings.Favorites.CONTAINER_HOTSEAT, occupancy);
                 return true;
diff --git a/src/com/android/launcher3/model/ModelWriter.java b/src/com/android/launcher3/model/ModelWriter.java
index 312435d175..080ce20f31 100644
--- a/src/com/android/launcher3/model/ModelWriter.java
+++ b/src/com/android/launcher3/model/ModelWriter.java
@@ -91,7 +91,7 @@ public class ModelWriter {
         // in the hotseat
         if (container == Favorites.CONTAINER_HOTSEAT) {
             item.screenId = mHasVerticalHotseat
-                    ? LauncherAppState.getIDP(mContext).numHotseatIcons - cellY - 1 : cellX;
+                    ? LauncherAppState.getIDP(mContext).numDatabaseHotseatIcons - cellY - 1 : cellX;
         } else {
             item.screenId = screenId;
         }
diff --git a/src/com/android/launcher3/provider/ImportDataTask.java b/src/com/android/launcher3/provider/ImportDataTask.java
index a5462a6c34..c9af2fe6fc 100644
--- a/src/com/android/launcher3/provider/ImportDataTask.java
+++ b/src/com/android/launcher3/provider/ImportDataTask.java
@@ -284,8 +284,9 @@ public class ImportDataTask {
             insertOperations.clear();
         }
 
-        IntSparseArrayMap<Object> hotseatItems = GridSizeMigrationTask.removeBrokenHotseatItems(mContext);
-        int myHotseatCount = LauncherAppState.getIDP(mContext).numHotseatIcons;
+        IntSparseArrayMap<Object> hotseatItems = GridSizeMigrationTask
+                .removeBrokenHotseatItems(mContext);
+        int myHotseatCount = LauncherAppState.getIDP(mContext).numDatabaseHotseatIcons;
         if (hotseatItems.size() < myHotseatCount) {
             // Insufficient hotseat items. Add a few more.
             HotseatParserCallback parserCallback = new HotseatParserCallback(
diff --git a/src/com/android/launcher3/provider/RestoreDbTask.java b/src/com/android/launcher3/provider/RestoreDbTask.java
index 53183bf210..223f4f1937 100644
--- a/src/com/android/launcher3/provider/RestoreDbTask.java
+++ b/src/com/android/launcher3/provider/RestoreDbTask.java
@@ -103,7 +103,7 @@ public class RestoreDbTask {
      */
     private void backupWorkspace(Context context, SQLiteDatabase db) throws Exception {
         InvariantDeviceProfile idp = LauncherAppState.getIDP(context);
-        new GridBackupTable(context, db, idp.numHotseatIcons, idp.numColumns, idp.numRows)
+        new GridBackupTable(context, db, idp.numDatabaseHotseatIcons, idp.numColumns, idp.numRows)
                 .doBackup(getDefaultProfileId(db), GridBackupTable.OPTION_REQUIRES_SANITIZATION);
     }
 
@@ -111,7 +111,7 @@ public class RestoreDbTask {
             @NonNull DatabaseHelper helper, @NonNull BackupManager backupManager)
             throws Exception {
         final InvariantDeviceProfile idp = LauncherAppState.getIDP(context);
-        GridBackupTable backupTable = new GridBackupTable(context, db, idp.numHotseatIcons,
+        GridBackupTable backupTable = new GridBackupTable(context, db, idp.numDatabaseHotseatIcons,
                 idp.numColumns, idp.numRows);
         if (backupTable.restoreFromRawBackupIfAvailable(getDefaultProfileId(db))) {
             int itemsDeleted = sanitizeDB(helper, db, backupManager);
-- 
GitLab


From be282e9bc8afeabd2cddab5adf9c52e9abc35085 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 7 Apr 2021 15:24:10 -0700
Subject: [PATCH 0865/1664] Update taskbar to add extra hotseat items instead
 of recent apps

Removes recents-related code including the divider between it and
hotseat.

Test: manually on device

Fixes: 184366189
Bug: 184789479
Bug: 171917176
Change-Id: I7776c98659ded70f53a49befddcd23c8353c6440
---
 quickstep/res/layout/taskbar_divider.xml      |  21 ---
 quickstep/res/values/colors.xml               |   1 -
 quickstep/res/values/dimens.xml               |   2 -
 .../launcher3/BaseQuickstepLauncher.java      |   1 +
 .../launcher3/taskbar/TaskbarController.java  |  93 +-------------
 .../taskbar/TaskbarRecentsController.java     | 120 ------------------
 .../launcher3/taskbar/TaskbarView.java        | 110 +---------------
 .../logging/SettingsChangeLogger.java         |   1 +
 8 files changed, 5 insertions(+), 344 deletions(-)
 delete mode 100644 quickstep/res/layout/taskbar_divider.xml
 delete mode 100644 quickstep/src/com/android/launcher3/taskbar/TaskbarRecentsController.java

diff --git a/quickstep/res/layout/taskbar_divider.xml b/quickstep/res/layout/taskbar_divider.xml
deleted file mode 100644
index 87649f752e..0000000000
--- a/quickstep/res/layout/taskbar_divider.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<View
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/taskbar_divider_thickness"
-    android:layout_height="@dimen/taskbar_divider_height"
-    android:background="@color/taskbar_divider" />
\ No newline at end of file
diff --git a/quickstep/res/values/colors.xml b/quickstep/res/values/colors.xml
index 54730f100e..3bc8ddc0a8 100644
--- a/quickstep/res/values/colors.xml
+++ b/quickstep/res/values/colors.xml
@@ -27,5 +27,4 @@
 
     <!-- Taskbar -->
     <color name="taskbar_background">#101010</color>
-    <color name="taskbar_divider">#C0C0C0</color>
 </resources>
\ No newline at end of file
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 3e6c78f4de..99be50295d 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -134,7 +134,5 @@
     <dimen name="taskbar_icon_drag_icon_size">54dp</dimen>
     <!-- Note that this applies to both sides of all icons, so visible space is double this. -->
     <dimen name="taskbar_icon_spacing">8dp</dimen>
-    <dimen name="taskbar_divider_thickness">1dp</dimen>
-    <dimen name="taskbar_divider_height">32dp</dimen>
     <dimen name="taskbar_folder_margin">16dp</dimen>
 </resources>
diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index e9ded8a07c..f0726bb376 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -108,6 +108,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
         SysUINavigationMode.INSTANCE.get(this).removeModeChangeListener(this);
         if (mTaskbarController != null) {
             mTaskbarController.cleanup();
+            mTaskbarController = null;
         }
 
         super.onDestroy();
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index 559ede1956..d772964ecf 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -25,7 +25,6 @@ import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_EXTR
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.app.ActivityOptions;
-import android.content.ComponentName;
 import android.graphics.PixelFormat;
 import android.graphics.Point;
 import android.graphics.Rect;
@@ -56,9 +55,6 @@ import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.WindowManagerWrapper;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Interfaces with Launcher/WindowManager/SystemUI to determine what to show in TaskbarView.
  */
@@ -76,17 +72,11 @@ public class TaskbarController {
     private final TaskbarStateHandler mTaskbarStateHandler;
     private final TaskbarAnimationController mTaskbarAnimationController;
     private final TaskbarHotseatController mHotseatController;
-    private final TaskbarRecentsController mRecentsController;
     private final TaskbarDragController mDragController;
 
     // Initialized in init().
     private WindowManager.LayoutParams mWindowLayoutParams;
 
-    // Contains all loaded Tasks, not yet deduped from Hotseat items.
-    private List<Task> mLatestLoadedRecentTasks;
-    // Contains all loaded Hotseat items.
-    private ItemInfo[] mLatestLoadedHotseatItems;
-
     private @Nullable Animator mAnimator;
     private boolean mIsAnimatingToLauncher;
 
@@ -106,8 +96,6 @@ public class TaskbarController {
                 createTaskbarAnimationControllerCallbacks());
         mHotseatController = new TaskbarHotseatController(mLauncher,
                 createTaskbarHotseatControllerCallbacks());
-        mRecentsController = new TaskbarRecentsController(mLauncher,
-                createTaskbarRecentsControllerCallbacks());
         mDragController = new TaskbarDragController(mLauncher);
     }
 
@@ -220,24 +208,6 @@ public class TaskbarController {
             @Override
             public void updateHotseatItems(ItemInfo[] hotseatItemInfos) {
                 mTaskbarViewInApp.updateHotseatItems(hotseatItemInfos);
-                mLatestLoadedHotseatItems = hotseatItemInfos;
-                dedupeAndUpdateRecentItems();
-            }
-        };
-    }
-
-    private TaskbarRecentsControllerCallbacks createTaskbarRecentsControllerCallbacks() {
-        return new TaskbarRecentsControllerCallbacks() {
-            @Override
-            public void updateRecentItems(ArrayList<Task> recentTasks) {
-                mLatestLoadedRecentTasks = recentTasks;
-                dedupeAndUpdateRecentItems();
-            }
-
-            @Override
-            public void updateRecentTaskAtIndex(int taskIndex, Task task) {
-                mTaskbarViewInApp.updateRecentTaskAtIndex(taskIndex, task);
-                mTaskbarViewOnHome.updateRecentTaskAtIndex(taskIndex, task);
             }
         };
     }
@@ -246,16 +216,13 @@ public class TaskbarController {
      * Initializes the Taskbar, including adding it to the screen.
      */
     public void init() {
-        mTaskbarViewInApp.init(mHotseatController.getNumHotseatIcons(),
-                mRecentsController.getNumRecentIcons());
-        mTaskbarViewOnHome.init(mHotseatController.getNumHotseatIcons(),
-                mRecentsController.getNumRecentIcons());
+        mTaskbarViewInApp.init(mHotseatController.getNumHotseatIcons());
+        mTaskbarViewOnHome.init(mHotseatController.getNumHotseatIcons());
         mTaskbarContainerView.init(mTaskbarViewInApp);
         addToWindowManager();
         mTaskbarStateHandler.setTaskbarCallbacks(createTaskbarStateHandlerCallbacks());
         mTaskbarAnimationController.init();
         mHotseatController.init();
-        mRecentsController.init();
 
         setWhichTaskbarViewIsVisible(mLauncher.hasBeenResumed()
                 ? mTaskbarViewOnHome
@@ -292,7 +259,6 @@ public class TaskbarController {
         mTaskbarStateHandler.setTaskbarCallbacks(null);
         mTaskbarAnimationController.cleanup();
         mHotseatController.cleanup();
-        mRecentsController.cleanup();
 
         setWhichTaskbarViewIsVisible(null);
     }
@@ -425,53 +391,6 @@ public class TaskbarController {
         return mTaskbarViewInApp.isDraggingItem() || mTaskbarViewOnHome.isDraggingItem();
     }
 
-    private void dedupeAndUpdateRecentItems() {
-        if (mLatestLoadedRecentTasks == null || mLatestLoadedHotseatItems == null) {
-            return;
-        }
-
-        final int numRecentIcons = mRecentsController.getNumRecentIcons();
-
-        // From most recent to least recently opened.
-        List<Task> dedupedTasksInDescendingOrder = new ArrayList<>();
-        for (int i = mLatestLoadedRecentTasks.size() - 1; i >= 0; i--) {
-            Task task = mLatestLoadedRecentTasks.get(i);
-            boolean isTaskInHotseat = false;
-            for (ItemInfo hotseatItem : mLatestLoadedHotseatItems) {
-                if (hotseatItem == null) {
-                    continue;
-                }
-                ComponentName hotseatActivity = hotseatItem.getTargetComponent();
-                if (hotseatActivity != null && task.key.sourceComponent.getPackageName()
-                        .equals(hotseatActivity.getPackageName())) {
-                    isTaskInHotseat = true;
-                    break;
-                }
-            }
-            if (!isTaskInHotseat) {
-                dedupedTasksInDescendingOrder.add(task);
-                if (dedupedTasksInDescendingOrder.size() == numRecentIcons) {
-                    break;
-                }
-            }
-        }
-
-        // TaskbarView expects an array of all the recent tasks to show, in the order to show them.
-        // So we create an array of the proper size, then fill it in such that the most recent items
-        // are at the end. If there aren't enough elements to fill the array, leave them null.
-        Task[] tasksArray = new Task[numRecentIcons];
-        for (int i = 0; i < tasksArray.length; i++) {
-            Task task = i >= dedupedTasksInDescendingOrder.size()
-                    ? null
-                    : dedupedTasksInDescendingOrder.get(i);
-            tasksArray[tasksArray.length - 1 - i] = task;
-        }
-
-        mTaskbarViewInApp.updateRecentTasks(tasksArray);
-        mTaskbarViewOnHome.updateRecentTasks(tasksArray);
-        mRecentsController.loadIconsForTasks(tasksArray);
-    }
-
     /**
      * @return Whether the given View is in the same window as Taskbar.
      */
@@ -573,12 +492,4 @@ public class TaskbarController {
     protected interface TaskbarHotseatControllerCallbacks {
         void updateHotseatItems(ItemInfo[] hotseatItemInfos);
     }
-
-    /**
-     * Contains methods that TaskbarRecentsController can call to interface with TaskbarController.
-     */
-    protected interface TaskbarRecentsControllerCallbacks {
-        void updateRecentItems(ArrayList<Task> recentTasks);
-        void updateRecentTaskAtIndex(int taskIndex, Task task);
-    }
 }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarRecentsController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarRecentsController.java
deleted file mode 100644
index 4256d2bd88..0000000000
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarRecentsController.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.taskbar;
-
-import com.android.launcher3.BaseQuickstepLauncher;
-import com.android.quickstep.RecentsModel;
-import com.android.quickstep.util.CancellableTask;
-import com.android.systemui.shared.recents.model.Task;
-import com.android.systemui.shared.system.TaskStackChangeListener;
-import com.android.systemui.shared.system.TaskStackChangeListeners;
-
-import java.util.ArrayList;
-
-/**
- * Works with TaskbarController to update the TaskbarView's Recent items.
- */
-public class TaskbarRecentsController {
-
-    private final int mNumRecentIcons = 2;
-    private final BaseQuickstepLauncher mLauncher;
-    private final TaskbarController.TaskbarRecentsControllerCallbacks mTaskbarCallbacks;
-    private final RecentsModel mRecentsModel;
-
-    private final TaskStackChangeListener mTaskStackChangeListener = new TaskStackChangeListener() {
-        @Override
-        public void onTaskStackChanged() {
-            reloadRecentTasksIfNeeded();
-        }
-    };
-
-    // TODO: add TaskbarVisualsChangedListener as well (for calendar/clock?)
-
-    // Used to keep track of the last requested task list id, so that we do not request to load the
-    // tasks again if we have already requested it and the task list has not changed
-    private int mTaskListChangeId = -1;
-
-    // The current background requests to load the task icons
-    private CancellableTask[] mIconLoadRequests = new CancellableTask[mNumRecentIcons];
-
-    private boolean mIsAlive;
-
-    public TaskbarRecentsController(BaseQuickstepLauncher launcher,
-            TaskbarController.TaskbarRecentsControllerCallbacks taskbarCallbacks) {
-        mLauncher = launcher;
-        mTaskbarCallbacks = taskbarCallbacks;
-        mRecentsModel = RecentsModel.INSTANCE.get(mLauncher);
-    }
-
-    protected void init() {
-        mIsAlive = true;
-        TaskStackChangeListeners.getInstance().registerTaskStackListener(mTaskStackChangeListener);
-        reloadRecentTasksIfNeeded();
-    }
-
-    protected void cleanup() {
-        mIsAlive = false;
-        TaskStackChangeListeners.getInstance().unregisterTaskStackListener(
-                mTaskStackChangeListener);
-        cancelAllPendingIconLoadTasks();
-    }
-
-    private void reloadRecentTasksIfNeeded() {
-        if (!mRecentsModel.isTaskListValid(mTaskListChangeId)) {
-            mTaskListChangeId = mRecentsModel.getTasks(this::onRecentTasksChanged);
-        }
-    }
-
-    private void cancelAllPendingIconLoadTasks() {
-        for (int i = 0; i < mIconLoadRequests.length; i++) {
-            if (mIconLoadRequests[i] != null) {
-                mIconLoadRequests[i].cancel();
-            }
-            mIconLoadRequests[i] = null;
-        }
-    }
-
-    private void onRecentTasksChanged(ArrayList<Task> tasks) {
-        if (mIsAlive) {
-            mTaskbarCallbacks.updateRecentItems(tasks);
-        }
-    }
-
-    /**
-     * For each Task, loads its icon from the cache in the background, then calls
-     * {@link TaskbarController.TaskbarRecentsControllerCallbacks#updateRecentTaskAtIndex}.
-     */
-    protected void loadIconsForTasks(Task[] tasks) {
-        cancelAllPendingIconLoadTasks();
-        for (int i = 0; i < tasks.length; i++) {
-            Task task = tasks[i];
-            if (task == null) {
-                continue;
-            }
-            final int taskIndex = i;
-            mIconLoadRequests[i] = mRecentsModel.getIconCache().updateIconInBackground(
-                    task, updatedTask -> onTaskIconLoaded(task, taskIndex));
-        }
-    }
-
-    private void onTaskIconLoaded(Task task, int taskIndex) {
-        mTaskbarCallbacks.updateRecentTaskAtIndex(taskIndex, task);
-    }
-
-    protected int getNumRecentIcons() {
-        return mNumRecentIcons;
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
index 21a2d512ab..f254844b1d 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
@@ -25,7 +25,6 @@ import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.DragEvent;
 import android.view.MotionEvent;
@@ -47,7 +46,6 @@ import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.views.ActivityContext;
-import com.android.systemui.shared.recents.model.Task;
 
 /**
  * Hosts the Taskbar content such as Hotseat and Recent Apps. Drawn on top of other apps.
@@ -55,8 +53,6 @@ import com.android.systemui.shared.recents.model.Task;
 public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconParent, Insettable {
 
     private final ColorDrawable mBackgroundDrawable;
-    private final int mDividerWidth;
-    private final int mDividerHeight;
     private final int mIconTouchSize;
     private final boolean mIsRtl;
     private final int mTouchSlop;
@@ -74,9 +70,6 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
     private LayoutTransition mLayoutTransition;
     private int mHotseatStartIndex;
     private int mHotseatEndIndex;
-    private View mHotseatRecentsDivider;
-    private int mRecentsStartIndex;
-    private int mRecentsEndIndex;
 
     // Delegate touches to the closest view if within mIconTouchSize.
     private boolean mDelegateTargeted;
@@ -105,8 +98,6 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
 
         Resources resources = getResources();
         mBackgroundDrawable = (ColorDrawable) getBackground();
-        mDividerWidth = resources.getDimensionPixelSize(R.dimen.taskbar_divider_thickness);
-        mDividerHeight = resources.getDimensionPixelSize(R.dimen.taskbar_divider_height);
         mIconTouchSize = resources.getDimensionPixelSize(R.dimen.taskbar_icon_touch_size);
         mIsRtl = Utilities.isRtl(resources);
         mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
@@ -119,18 +110,11 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
         mItemMarginLeftRight = Math.round(mItemMarginLeftRight * mNonIconScale);
     }
 
-    protected void init(int numHotseatIcons, int numRecentIcons) {
+    protected void init(int numHotseatIcons) {
         mHotseatStartIndex = 0;
         mHotseatEndIndex = mHotseatStartIndex + numHotseatIcons - 1;
         updateHotseatItems(new ItemInfo[numHotseatIcons]);
 
-        int dividerIndex = mHotseatEndIndex + 1;
-        mHotseatRecentsDivider = addDivider(dividerIndex);
-
-        mRecentsStartIndex = dividerIndex + 1;
-        mRecentsEndIndex = mRecentsStartIndex + numRecentIcons - 1;
-        updateRecentTasks(new Task[numRecentIcons]);
-
         mLayoutTransition = new LayoutTransition();
         addUpdateListenerForAllLayoutTransitions(() -> {
             if (getLayoutTransition() == mLayoutTransition) {
@@ -165,7 +149,6 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
         endAllLayoutTransitionAnimators();
         setLayoutTransition(null);
         removeAllViews();
-        mHotseatRecentsDivider = null;
     }
 
     private void endAllLayoutTransitionAnimators() {
@@ -248,8 +231,6 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
             }
             updateHotseatItemVisibility(hotseatView);
         }
-
-        updateHotseatRecentsDividerVisibility();
     }
 
     protected void updateHotseatItemsVisibility() {
@@ -273,95 +254,6 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
         }
     }
 
-    private View addDivider(int dividerIndex) {
-        View divider = inflate(R.layout.taskbar_divider);
-        LayoutParams lp = new LayoutParams(mDividerWidth, mDividerHeight);
-        lp.setMargins(mItemMarginLeftRight, 0, mItemMarginLeftRight, 0);
-        divider.setScaleX(mNonIconScale);
-        divider.setScaleY(mNonIconScale);
-        addView(divider, dividerIndex, lp);
-        return divider;
-    }
-
-    /**
-     * Inflates/binds the Recents items to show in the Taskbar given their Tasks.
-     */
-    protected void updateRecentTasks(Task[] tasks) {
-        for (int i = 0; i < tasks.length; i++) {
-            Task task = tasks[i];
-            int recentsIndex = mRecentsStartIndex + i;
-            View recentsView = getChildAt(recentsIndex);
-
-            // Inflate empty icon Views.
-            if (recentsView == null) {
-                BubbleTextView btv = (BubbleTextView) inflate(R.layout.taskbar_app_icon);
-                LayoutParams lp = new LayoutParams(btv.getIconSize(), btv.getIconSize());
-                lp.setMargins(mItemMarginLeftRight, 0, mItemMarginLeftRight, 0);
-                recentsView = btv;
-                addView(recentsView, recentsIndex, lp);
-            }
-
-            // Apply the Task, or hide the view if there is none for a given index.
-            if (recentsView instanceof BubbleTextView && task != null) {
-                applyTaskToBubbleTextView((BubbleTextView) recentsView, task);
-                recentsView.setVisibility(VISIBLE);
-                recentsView.setOnClickListener(mControllerCallbacks.getItemOnClickListener());
-                recentsView.setOnLongClickListener(
-                        mControllerCallbacks.getItemOnLongClickListener());
-            } else {
-                recentsView.setVisibility(GONE);
-                recentsView.setOnClickListener(null);
-                recentsView.setOnLongClickListener(null);
-            }
-        }
-
-        updateHotseatRecentsDividerVisibility();
-    }
-
-    private void applyTaskToBubbleTextView(BubbleTextView btv, Task task) {
-        if (task.icon != null) {
-            Drawable icon = task.icon.getConstantState().newDrawable().mutate();
-            btv.applyIconAndLabel(icon, task.titleDescription);
-        }
-        btv.setTag(task);
-    }
-
-    protected void updateRecentTaskAtIndex(int taskIndex, Task task) {
-        View taskView = getChildAt(mRecentsStartIndex + taskIndex);
-        if (taskView instanceof BubbleTextView) {
-            applyTaskToBubbleTextView((BubbleTextView) taskView, task);
-        }
-    }
-
-    /**
-     * Make the divider VISIBLE between the Hotseat and Recents if there is at least one icon in
-     * each, otherwise make it GONE.
-     */
-    private void updateHotseatRecentsDividerVisibility() {
-        if (mHotseatRecentsDivider == null) {
-            return;
-        }
-
-        boolean hasAtLeastOneHotseatItem = false;
-        for (int i = mHotseatStartIndex; i <= mHotseatEndIndex; i++) {
-            if (getChildAt(i).getVisibility() != GONE) {
-                hasAtLeastOneHotseatItem = true;
-                break;
-            }
-        }
-
-        boolean hasAtLeastOneRecentItem = false;
-        for (int i = mRecentsStartIndex; i <= mRecentsEndIndex; i++) {
-            if (getChildAt(i).getVisibility() != GONE) {
-                hasAtLeastOneRecentItem = true;
-                break;
-            }
-        }
-
-        mHotseatRecentsDivider.setVisibility(hasAtLeastOneHotseatItem && hasAtLeastOneRecentItem
-                ? VISIBLE : GONE);
-    }
-
     @Override
     public boolean onTouchEvent(MotionEvent event) {
         boolean handled = delegateTouchIfNecessary(event);
diff --git a/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java b/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java
index b336d2fcea..4c10822fb8 100644
--- a/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java
+++ b/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java
@@ -149,6 +149,7 @@ public class SettingsChangeLogger implements
 
         SharedPreferences prefs = getPrefs(mContext);
         StatsLogManager.LauncherEvent gridSizeChangedEvent = null;
+        // TODO(b/184981523): This doesn't work for 2-panel grid, which has 6 hotseat icons
         switch (prefs.getInt(KEY_MIGRATION_SRC_HOTSEAT_COUNT, -1)) {
             case 5:
                 gridSizeChangedEvent = LAUNCHER_GRID_SIZE_5;
-- 
GitLab


From a9665751a0a4e3a6f8dc8237788e5f72d32a368c Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Mon, 12 Apr 2021 20:00:45 -0700
Subject: [PATCH 0866/1664] Clearer diag for visible keyguard

Test: presubmit
Bug: 179508881
Change-Id: I69f2e766701e77d927169b570d2dad0bf8d4c75a
---
 tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index d4e8f1f5d0..e7e245f9aa 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -250,7 +250,7 @@ public abstract class AbstractLauncherUiTest {
 
     @Before
     public void setUp() throws Exception {
-        Assert.assertTrue("Keyguard is visible",
+        Assert.assertTrue("Keyguard is visible, which is likely caused by a crash in SysUI",
                 TestHelpers.wait(
                         Until.gone(By.res(SYSTEMUI_PACKAGE, "keyguard_status_view")), 60000));
 
-- 
GitLab


From 76e8fdc2bcdbd551d4ddbcc2164ed1771e29bda6 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 7 Apr 2021 10:16:18 -0700
Subject: [PATCH 0867/1664] Adding support for customize highlight region in
 preference

> Also fixing notification dots setting not getting highlighted

Bug: 184747760
Test: Manual
Change-Id: Ic9c2bfbb9750bed60afc14e824181f650c8cff33
---
 res/xml/launcher_preferences.xml              |  9 +----
 .../settings/NotificationDotsPreference.java  |  6 ++++
 .../settings/PreferenceHighlighter.java       | 33 +++++++++++++++----
 .../launcher3/settings/SettingsActivity.java  |  4 ++-
 4 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/res/xml/launcher_preferences.xml b/res/xml/launcher_preferences.xml
index e4bea508b3..8195cc1997 100644
--- a/res/xml/launcher_preferences.xml
+++ b/res/xml/launcher_preferences.xml
@@ -22,14 +22,7 @@
         android:key="pref_icon_badging"
         android:title="@string/notification_dots_title"
         android:persistent="false"
-        android:widgetLayout="@layout/notification_pref_warning" >
-        <intent android:action="android.settings.NOTIFICATION_SETTINGS">
-            <!-- This extra highlights the "Allow notification dots" field in Notification settings -->
-            <extra
-                android:name=":settings:fragment_args_key"
-                android:value="notification_badging" />
-        </intent>
-    </com.android.launcher3.settings.NotificationDotsPreference>
+        android:widgetLayout="@layout/notification_pref_warning" />
 
     <!--
       LAUNCHER_ADD_NEW_APPS_TO_HOME_SCREEN_ENABLED(613)
diff --git a/src/com/android/launcher3/settings/NotificationDotsPreference.java b/src/com/android/launcher3/settings/NotificationDotsPreference.java
index afcf882e7d..0ee27443ef 100644
--- a/src/com/android/launcher3/settings/NotificationDotsPreference.java
+++ b/src/com/android/launcher3/settings/NotificationDotsPreference.java
@@ -85,6 +85,12 @@ public class NotificationDotsPreference extends Preference
                 Settings.Secure.getUriFor(NOTIFICATION_ENABLED_LISTENERS),
                 false, mListenerListObserver);
         updateUI();
+
+        // Update intent
+        Bundle extras = new Bundle();
+        extras.putString(EXTRA_FRAGMENT_ARG_KEY, "notification_badging");
+        setIntent(new Intent("android.settings.NOTIFICATION_SETTINGS")
+                .putExtra(EXTRA_SHOW_FRAGMENT_ARGS, extras));
     }
 
     private void updateUI() {
diff --git a/src/com/android/launcher3/settings/PreferenceHighlighter.java b/src/com/android/launcher3/settings/PreferenceHighlighter.java
index 8ba814686f..96ee216f6e 100644
--- a/src/com/android/launcher3/settings/PreferenceHighlighter.java
+++ b/src/com/android/launcher3/settings/PreferenceHighlighter.java
@@ -24,16 +24,18 @@ import android.animation.ValueAnimator;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
+import android.graphics.RectF;
 import android.util.Property;
 import android.view.View;
 
-import com.android.launcher3.util.Themes;
-
+import androidx.preference.Preference;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.ItemDecoration;
 import androidx.recyclerview.widget.RecyclerView.State;
 import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 
+import com.android.launcher3.util.Themes;
+
 /**
  * Utility class for highlighting a preference
  */
@@ -62,14 +64,16 @@ public class PreferenceHighlighter extends ItemDecoration implements Runnable {
     private final Paint mPaint = new Paint();
     private final RecyclerView mRv;
     private final int mIndex;
+    private final Preference mPreference;
+    private final RectF mDrawRect = new RectF();
 
     private boolean mHighLightStarted = false;
     private int mHighlightColor = END_COLOR;
 
-
-    public PreferenceHighlighter(RecyclerView rv, int index) {
+    public PreferenceHighlighter(RecyclerView rv, int index, Preference preference) {
         mRv = rv;
         mIndex = index;
+        mPreference = preference;
     }
 
     @Override
@@ -92,7 +96,8 @@ public class PreferenceHighlighter extends ItemDecoration implements Runnable {
         if (!mHighLightStarted) {
             // Start highlight
             int colorTo = setColorAlphaBound(Themes.getColorAccent(mRv.getContext()), 66);
-            ObjectAnimator anim = ObjectAnimator.ofArgb(this, HIGHLIGHT_COLOR, END_COLOR, colorTo);
+            ObjectAnimator anim = ObjectAnimator.ofArgb(this, HIGHLIGHT_COLOR, END_COLOR,
+                    colorTo);
             anim.setDuration(HIGHLIGHT_FADE_IN_DURATION);
             anim.setRepeatMode(ValueAnimator.REVERSE);
             anim.setRepeatCount(4);
@@ -108,7 +113,11 @@ public class PreferenceHighlighter extends ItemDecoration implements Runnable {
 
         View view = holder.itemView;
         mPaint.setColor(mHighlightColor);
-        c.drawRect(0, view.getY(), parent.getWidth(), view.getY() + view.getHeight(), mPaint);
+        mDrawRect.set(0, view.getY(), parent.getWidth(), view.getY() + view.getHeight());
+        if (mPreference instanceof HighlightDelegate) {
+            ((HighlightDelegate) mPreference).offsetHighlight(view, mDrawRect);
+        }
+        c.drawRect(mDrawRect, mPaint);
     }
 
     private void removeHighlight() {
@@ -124,4 +133,16 @@ public class PreferenceHighlighter extends ItemDecoration implements Runnable {
         });
         anim.start();
     }
+
+    /**
+     * Interface to be implemented by a preference to customize the highlight are
+     */
+    public interface HighlightDelegate {
+
+        /**
+         * Allows the preference to update the highlight area
+         */
+        void offsetHighlight(View prefView, RectF bounds);
+
+    }
 }
diff --git a/src/com/android/launcher3/settings/SettingsActivity.java b/src/com/android/launcher3/settings/SettingsActivity.java
index 5b42ac70eb..216510beb1 100644
--- a/src/com/android/launcher3/settings/SettingsActivity.java
+++ b/src/com/android/launcher3/settings/SettingsActivity.java
@@ -237,7 +237,9 @@ public class SettingsActivity extends FragmentActivity
             RecyclerView list = getListView();
             PreferencePositionCallback callback = (PreferencePositionCallback) list.getAdapter();
             int position = callback.getPreferenceAdapterPosition(mHighLightKey);
-            return position >= 0 ? new PreferenceHighlighter(list, position) : null;
+            return position >= 0 ? new PreferenceHighlighter(
+                    list, position, screen.findPreference(mHighLightKey))
+                    : null;
         }
 
         private void requestAccessibilityFocus(@NonNull final RecyclerView rv) {
-- 
GitLab


From 1ccd7efaf06b5fe8462606281f930f0acb411450 Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Tue, 13 Apr 2021 10:41:18 +0100
Subject: [PATCH 0868/1664] Fix UI bugs for widget picker search.

- Mirror search icon in RTL (b/184162989)
- Fix spacing between edit text and cancel button, to make it consistent
with space between search icon and edit text. (b/183602001)
- Scroll to top on every search result. (b/183602001)
- Fix keyboard overlap on orientation change. This is fixed by clearing
text on edit text differently (b/184048899)

Test: Manually tested
Bug: 184162989
Bug: 183602001
Bug: 184048899
Change-Id: I72ed51e1968a55a3105bd8b389d1bbd74d50d8af
---
 res/drawable/ic_allapps_search.xml                |  3 ++-
 res/layout/widgets_search_bar.xml                 |  9 +++++++--
 .../launcher3/widget/picker/WidgetsFullSheet.java |  1 +
 .../widget/picker/WidgetsRecyclerView.java        | 15 +++++++++++++++
 .../picker/search/WidgetsSearchBarController.java |  2 +-
 5 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/res/drawable/ic_allapps_search.xml b/res/drawable/ic_allapps_search.xml
index c0e20f1bb8..dbed824358 100644
--- a/res/drawable/ic_allapps_search.xml
+++ b/res/drawable/ic_allapps_search.xml
@@ -17,7 +17,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
+    android:viewportWidth="24.0"
+    android:autoMirrored="true">
     <path
         android:fillColor="?android:attr/textColorTertiary"
         android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
diff --git a/res/layout/widgets_search_bar.xml b/res/layout/widgets_search_bar.xml
index e3836df108..c3dd19e0bb 100644
--- a/res/layout/widgets_search_bar.xml
+++ b/res/layout/widgets_search_bar.xml
@@ -13,7 +13,9 @@
         android:id="@+id/widgets_search_bar_edit_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="12dp"
+        android:paddingVertical="12dp"
+        android:paddingStart="12dp"
+        android:paddingEnd="0dp"
         android:drawablePadding="8dp"
         android:drawableStart="@drawable/ic_allapps_search"
         android:background="@null"
@@ -21,6 +23,7 @@
         android:maxLines="1"
         android:layout_weight="1"
         android:inputType="text"
+        android:imeOptions="actionSearch"
         android:textColor="?android:attr/textColorSecondary"
         android:textColorHint="?android:attr/textColorTertiary"/>
 
@@ -28,7 +31,9 @@
         android:id="@+id/widgets_search_cancel_button"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:padding="8dp"
+        android:paddingVertical="12dp"
+        android:paddingStart="8dp"
+        android:paddingEnd="12dp"
         android:src="@drawable/ic_gm_close_24"
         android:background="?android:selectableItemBackground"
         android:layout_gravity="center"
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index a4257a208e..f6ff87b504 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -392,6 +392,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         mAdapters.get(AdapterHolder.SEARCH).mWidgetsListAdapter.setWidgetsOnSearch(entries);
         updateNoSearchResultsView(
                 mAdapters.get(AdapterHolder.SEARCH).mWidgetsListAdapter.getItemCount() == 0);
+        mAdapters.get(AdapterHolder.SEARCH).mWidgetsRecyclerView.scrollToTop();
     }
 
     private void setViewVisibilityBasedOnSearch(boolean isInSearchMode) {
diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java b/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
index b016b4f32c..69672f233f 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
@@ -243,4 +243,19 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
          */
         int getHeaderViewHeight();
     }
+
+    @Override
+    public void scrollToTop() {
+        if (mScrollbar != null) {
+            mScrollbar.reattachThumbToScroll();
+        }
+
+        if (getLayoutManager() instanceof LinearLayoutManager) {
+            if (getCurrentScrollY() == 0) {
+                // We are at the top, so don't scrollToPosition (would cause unnecessary relayout).
+                return;
+            }
+        }
+        scrollToPosition(0);
+    }
 }
diff --git a/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarController.java b/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarController.java
index d35a75b80a..a8294c0426 100644
--- a/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarController.java
+++ b/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarController.java
@@ -102,7 +102,7 @@ public class WidgetsSearchBarController implements TextWatcher,
     @Override
     public void clearSearchResult() {
         mSearchAlgorithm.cancel(/* interruptActiveRequests= */ true);
-        mInput.getText().clear();
+        mInput.setText("");
         clearFocus();
         mSearchModeListener.exitSearchMode();
     }
-- 
GitLab


From ca24216cc1e9314fd2f35fe4f0abc173ab994f95 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Tue, 13 Apr 2021 15:38:44 +0100
Subject: [PATCH 0869/1664] Fix drag-n-drop from the pin widget flow

Bug: 185011050
Test: Add a shortcut from Google drive app.

Change-Id: Iec5911a60cbb3ffa96228707539222cc1a5fda90
---
 src/com/android/launcher3/dragndrop/AddItemActivity.java | 8 +++++---
 src/com/android/launcher3/widget/WidgetsBottomSheet.java | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/com/android/launcher3/dragndrop/AddItemActivity.java b/src/com/android/launcher3/dragndrop/AddItemActivity.java
index b7a7366108..fc635a91db 100644
--- a/src/com/android/launcher3/dragndrop/AddItemActivity.java
+++ b/src/com/android/launcher3/dragndrop/AddItemActivity.java
@@ -62,6 +62,7 @@ import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.PendingAddShortcutInfo;
 import com.android.launcher3.widget.PendingAddWidgetInfo;
 import com.android.launcher3.widget.WidgetCell;
+import com.android.launcher3.widget.WidgetCellPreview;
 import com.android.launcher3.widget.WidgetHostViewLoader;
 import com.android.launcher3.widget.WidgetImageView;
 import com.android.launcher3.widget.WidgetManagerHelper;
@@ -121,9 +122,10 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
             }
         }
 
-        WidgetImageView preview = mWidgetCell.findViewById(R.id.widget_preview);
-        preview.setOnTouchListener(this);
-        preview.setOnLongClickListener(this);
+        WidgetCellPreview previewContainer = mWidgetCell.findViewById(
+                R.id.widget_preview_container);
+        previewContainer.setOnTouchListener(this);
+        previewContainer.setOnLongClickListener(this);
 
         // savedInstanceState is null when the activity is created the first time (i.e., avoids
         // duplicate logging during rotation)
diff --git a/src/com/android/launcher3/widget/WidgetsBottomSheet.java b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
index 0670928159..155a285e84 100644
--- a/src/com/android/launcher3/widget/WidgetsBottomSheet.java
+++ b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
@@ -170,9 +170,9 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
         WidgetCell widget = (WidgetCell) LayoutInflater.from(getContext())
                 .inflate(R.layout.widget_cell, parent, false);
 
-        View preview_container = widget.findViewById(R.id.widget_preview_container);
-        preview_container.setOnClickListener(this);
-        preview_container.setOnLongClickListener(this);
+        View previewContainer = widget.findViewById(R.id.widget_preview_container);
+        previewContainer.setOnClickListener(this);
+        previewContainer.setOnLongClickListener(this);
         widget.setAnimatePreview(false);
 
         parent.addView(widget);
-- 
GitLab


From 120d6476f6fd3edc621a17da4954635e0e173d07 Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Fri, 9 Apr 2021 09:58:53 +0100
Subject: [PATCH 0870/1664] Add education tip to widget picker.

A tip is shown on the first widget/shortcut in the recommended table.
If there are no recommended widgets, a tip is shown on first widget
in an expanded header.

There is a delay of few milliseconds, to let the WidgetCells be
completely rendered on screen before getting their location.

Test: Manually tested
Bug: 184920163
Change-Id: I2637e84e7fc467b27888023434e3578a4b8ed4d6
---
 res/values/dimens.xml                         |  3 +
 .../android/launcher3/views/ArrowTipView.java | 61 +++++++++++++-
 .../widget/picker/WidgetsFullSheet.java       | 81 +++++++++++++++++++
 3 files changed, 144 insertions(+), 1 deletion(-)

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 51dddab6f7..638eec7426 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -140,6 +140,9 @@
     <dimen name="widget_row_padding">8dp</dimen>
     <dimen name="widget_row_divider">2dp</dimen>
 
+    <dimen name="widget_picker_education_tip_width">120dp</dimen>
+    <dimen name="widget_picker_education_tip_min_margin">4dp</dimen>
+
     <!-- Padding applied to shortcut previews -->
     <dimen name="shortcut_preview_padding_left">0dp</dimen>
     <dimen name="shortcut_preview_padding_right">0dp</dimen>
diff --git a/src/com/android/launcher3/views/ArrowTipView.java b/src/com/android/launcher3/views/ArrowTipView.java
index 1f12a2f8c8..89ff8216c9 100644
--- a/src/com/android/launcher3/views/ArrowTipView.java
+++ b/src/com/android/launcher3/views/ArrowTipView.java
@@ -21,6 +21,7 @@ import android.graphics.CornerPathEffect;
 import android.graphics.Paint;
 import android.graphics.drawable.ShapeDrawable;
 import android.os.Handler;
+import android.util.Log;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.MotionEvent;
@@ -29,6 +30,8 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+import androidx.annotation.Px;
 import androidx.core.content.ContextCompat;
 
 import com.android.launcher3.AbstractFloatingView;
@@ -43,6 +46,7 @@ import com.android.launcher3.graphics.TriangleShape;
  */
 public class ArrowTipView extends AbstractFloatingView {
 
+    private static final String TAG = ArrowTipView.class.getSimpleName();
     private static final long AUTO_CLOSE_TIMEOUT_MILLIS = 10 * 1000;
     private static final long SHOW_DELAY_MS = 200;
     private static final long SHOW_DURATION_MS = 300;
@@ -105,7 +109,8 @@ public class ArrowTipView extends AbstractFloatingView {
                 arrowLp.width, arrowLp.height, false));
         Paint arrowPaint = arrowDrawable.getPaint();
         TypedValue typedValue = new TypedValue();
-        context.getTheme().resolveAttribute(android.R.attr.colorAccent, typedValue, true);
+        context.getTheme()
+                .resolveAttribute(android.R.attr.colorAccent, typedValue, true);
         arrowPaint.setColor(ContextCompat.getColor(getContext(), typedValue.resourceId));
         // The corner path effect won't be reflected in the shadow, but shouldn't be noticeable.
         arrowPaint.setPathEffect(new CornerPathEffect(
@@ -164,6 +169,60 @@ public class ArrowTipView extends AbstractFloatingView {
         return this;
     }
 
+    /**
+     * Show the ArrowTipView (tooltip) custom aligned.
+     *
+     * @param text The text to be shown in the tooltip.
+     * @param arrowXCoord The X coordinate for the arrow on the tip. The arrow is usually in the
+     *                    center of ArrowTipView unless the ArrowTipView goes beyond screen margin.
+     * @param yCoord The Y coordinate of the bottom of the tooltip.
+     * @return The tool tip view.
+     */
+    @Nullable public ArrowTipView showAtLocation(String text, int arrowXCoord, int yCoord) {
+        ViewGroup parent = mActivity.getDragLayer();
+        @Px int parentViewWidth = parent.getWidth();
+        @Px int textViewWidth = getContext().getResources()
+                .getDimensionPixelSize(R.dimen.widget_picker_education_tip_width);
+        @Px int minViewMargin = getContext().getResources()
+                .getDimensionPixelSize(R.dimen.widget_picker_education_tip_min_margin);
+        if (parentViewWidth < textViewWidth + 2 * minViewMargin) {
+            Log.w(TAG, "Cannot display tip on a small screen of size: " + parentViewWidth);
+            return null;
+        }
+
+        TextView textView = findViewById(R.id.text);
+        textView.setText(text);
+        textView.setWidth(textViewWidth);
+        parent.addView(this);
+        requestLayout();
+
+        post(() -> setY(yCoord - getHeight()));
+        post(() -> {
+            float halfWidth = getWidth() / 2f;
+            float xCoord;
+            if (arrowXCoord - halfWidth < minViewMargin) {
+                xCoord = minViewMargin;
+            } else if (arrowXCoord + halfWidth > parentViewWidth - minViewMargin) {
+                xCoord = parentViewWidth - minViewMargin - getWidth();
+            } else {
+                xCoord = arrowXCoord - halfWidth;
+            }
+            setX(xCoord);
+            findViewById(R.id.arrow).setX(arrowXCoord - xCoord);
+            requestLayout();
+        });
+
+        setAlpha(0);
+        animate()
+                .alpha(1f)
+                .withLayer()
+                .setStartDelay(SHOW_DELAY_MS)
+                .setDuration(SHOW_DURATION_MS)
+                .setInterpolator(Interpolators.DEACCEL)
+                .start();
+        return this;
+    }
+
     /**
      * Register a callback fired when toast is hidden
      */
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index a4257a208e..5d9a2e2f88 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -41,6 +41,7 @@ import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+import androidx.core.view.ViewCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.launcher3.DeviceProfile;
@@ -51,6 +52,7 @@ import com.android.launcher3.R;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.compat.AccessibilityManagerCompat;
 import com.android.launcher3.model.WidgetItem;
+import com.android.launcher3.views.ArrowTipView;
 import com.android.launcher3.views.RecyclerViewFastScroller;
 import com.android.launcher3.views.TopRoundedCornerView;
 import com.android.launcher3.widget.BaseWidgetSheet;
@@ -66,6 +68,7 @@ import com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip.OnActivePag
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Predicate;
+import java.util.stream.IntStream;
 
 /**
  * Popup for showing the full list of available widgets
@@ -78,11 +81,13 @@ public class WidgetsFullSheet extends BaseWidgetSheet
 
     private static final long DEFAULT_OPEN_DURATION = 267;
     private static final long FADE_IN_DURATION = 150;
+    private static final long EDUCATION_TIP_DELAY_MS = 200;
     private static final float VERTICAL_START_POSITION = 0.3f;
     // The widget recommendation table can easily take over the entire screen on devices with small
     // resolution or landscape on phone. This ratio defines the max percentage of content area that
     // the table can display.
     private static final float RECOMMENDATION_TABLE_HEIGHT_RATIO = 0.75f;
+    private static final String WIDGETS_EDUCATION_TIP_SEEN = "launcher.widgets_education_tip_seen";
 
     private final Rect mInsets = new Rect();
     private final boolean mHasWorkProfile;
@@ -92,6 +97,35 @@ public class WidgetsFullSheet extends BaseWidgetSheet
             mCurrentUser.equals(entry.mPkgItem.user);
     private final Predicate<WidgetsListBaseEntry> mWorkWidgetsFilter =
             mPrimaryWidgetsFilter.negate();
+    private final OnLayoutChangeListener mLayoutChangeListenerToShowTips =
+            new OnLayoutChangeListener() {
+                @Override
+                public void onLayoutChange(View v, int left, int top, int right, int bottom,
+                        int oldLeft, int oldTop, int oldRight, int oldBottom) {
+                    if (hasSeenEducationTip()) {
+                        removeOnLayoutChangeListener(this);
+                        return;
+                    }
+
+                    // Widgets are loaded asynchronously, We are adding a delay because we only want
+                    // to show the tip when the widget preview has finished loading and rendering in
+                    // this view.
+                    removeCallbacks(mShowEducationTipTask);
+                    postDelayed(mShowEducationTipTask, EDUCATION_TIP_DELAY_MS);
+                }
+            };
+
+    private final Runnable mShowEducationTipTask = () -> {
+        if (hasSeenEducationTip()) {
+            removeOnLayoutChangeListener(mLayoutChangeListenerToShowTips);
+            return;
+        }
+        View viewForTip = getViewToShowEducationTip();
+        if (viewForTip != null && ViewCompat.isLaidOut(viewForTip)) {
+            removeOnLayoutChangeListener(mLayoutChangeListenerToShowTips);
+            showEducationTipOnView(viewForTip);
+        }
+    };
     private final int mTabsHeight;
     private final int mWidgetCellHorizontalPadding;
 
@@ -170,6 +204,10 @@ public class WidgetsFullSheet extends BaseWidgetSheet
 
         mSearchAndRecommendationViewHolder.mSearchBar.initialize(
                 mLauncher.getPopupDataProvider(), /* searchModeListener= */ this);
+
+        if (!hasSeenEducationTip()) {
+            addOnLayoutChangeListener(mLayoutChangeListenerToShowTips);
+        }
     }
 
     @Override
@@ -563,6 +601,49 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         mSearchAndRecommendationViewHolder.mSearchBar.clearSearchBarFocus();
     }
 
+    private void showEducationTipOnView(View view) {
+        mLauncher.getSharedPrefs().edit().putBoolean(WIDGETS_EDUCATION_TIP_SEEN, true).apply();
+        int[] coords = new int[2];
+        view.getLocationOnScreen(coords);
+        ArrowTipView arrowTipView = new ArrowTipView(mLauncher);
+        arrowTipView.showAtLocation(
+                getContext().getString(R.string.long_press_widget_to_add),
+                /* arrowXCoord= */coords[0] + view.getWidth() / 2,
+                /* yCoord= */coords[1]);
+    }
+
+    @Nullable private View getViewToShowEducationTip() {
+        if (mSearchAndRecommendationViewHolder.mRecommendedWidgetsTable.getVisibility() == VISIBLE
+                && mSearchAndRecommendationViewHolder.mRecommendedWidgetsTable.getChildCount() > 0
+        ) {
+            return ((ViewGroup) mSearchAndRecommendationViewHolder.mRecommendedWidgetsTable
+                    .getChildAt(0)).getChildAt(0);
+        }
+
+        AdapterHolder adapterHolder = mAdapters.get(mIsInSearchMode
+                ? AdapterHolder.SEARCH
+                : mViewPager == null
+                        ? AdapterHolder.PRIMARY
+                        : mViewPager.getCurrentPage());
+        WidgetsRowViewHolder viewHolderForTip =
+                (WidgetsRowViewHolder) IntStream.range(
+                                0, adapterHolder.mWidgetsListAdapter.getItemCount())
+                        .mapToObj(adapterHolder.mWidgetsRecyclerView::
+                                findViewHolderForAdapterPosition)
+                        .filter(viewHolder -> viewHolder instanceof WidgetsRowViewHolder)
+                        .findFirst()
+                        .orElse(null);
+        if (viewHolderForTip != null) {
+            return ((ViewGroup) viewHolderForTip.mTableContainer.getChildAt(0)).getChildAt(0);
+        }
+
+        return null;
+    }
+
+    private boolean hasSeenEducationTip() {
+        return mLauncher.getSharedPrefs().getBoolean(WIDGETS_EDUCATION_TIP_SEEN, false);
+    }
+
     /** A holder class for holding adapters & their corresponding recycler view. */
     private final class AdapterHolder {
         static final int PRIMARY = 0;
-- 
GitLab


From d8ad6b25f4a9c7ab156268a2a505d1c1c26ef74e Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Fri, 9 Apr 2021 16:55:45 -0700
Subject: [PATCH 0871/1664] Make RotationTouchHelper singleton to report single
 rotation state

Multiple instances of RotationTouchHelper were being
created and reporting conflicting and incorrect information
to sysui for current quickswitch state.

Bug: 183897242
Test: Ensure quickswitch gestures work as expected.
Change-Id: Ia8716f2b597033e9e81291e0b4490119c30ad972
---
 .../android/quickstep/RecentsAnimationDeviceState.java   | 2 +-
 .../src/com/android/quickstep/RotationTouchHelper.java   | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index 23e35f6307..4a191e16e7 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -138,7 +138,7 @@ public class RecentsAnimationDeviceState implements
         mDisplayId = mDisplayHolder.getInfo().id;
         mIsOneHandedModeSupported = SystemProperties.getBoolean(SUPPORT_ONE_HANDED_MODE, false);
         runOnDestroy(() -> mDisplayHolder.removeChangeListener(this));
-        mRotationTouchHelper = new RotationTouchHelper(context, mDisplayHolder);
+        mRotationTouchHelper = RotationTouchHelper.INSTANCE.get(context);
         runOnDestroy(mRotationTouchHelper::destroy);
 
         // Register for user unlocked if necessary
diff --git a/quickstep/src/com/android/quickstep/RotationTouchHelper.java b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
index 2cf32122cf..1155482d37 100644
--- a/quickstep/src/com/android/quickstep/RotationTouchHelper.java
+++ b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
@@ -28,9 +28,11 @@ import android.view.MotionEvent;
 import android.view.OrientationEventListener;
 
 import com.android.launcher3.testing.TestProtocol;
+import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.DisplayController.DisplayHolder;
 import com.android.launcher3.util.DisplayController.DisplayInfoChangeListener;
 import com.android.launcher3.util.DisplayController.Info;
+import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.quickstep.util.RecentsOrientedState;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.QuickStepContract;
@@ -43,6 +45,9 @@ public class RotationTouchHelper implements
         SysUINavigationMode.NavigationModeChangeListener,
         DisplayInfoChangeListener {
 
+    public static final MainThreadInitializedObject<RotationTouchHelper> INSTANCE =
+            new MainThreadInitializedObject<>(RotationTouchHelper::new);
+
     private final OrientationTouchTransformer mOrientationTouchTransformer;
     private final DisplayHolder mDisplayHolder;
     private final SysUINavigationMode mSysUiNavMode;
@@ -121,9 +126,9 @@ public class RotationTouchHelper implements
 
     private final Context mContext;
 
-    public RotationTouchHelper(Context context, DisplayHolder displayHolder) {
+    private RotationTouchHelper(Context context) {
         mContext = context;
-        mDisplayHolder = displayHolder;
+        mDisplayHolder = DisplayController.getDefaultDisplay(context);
         Resources resources = mContext.getResources();
         mSysUiNavMode = SysUINavigationMode.INSTANCE.get(context);
         mDisplayId = mDisplayHolder.getInfo().id;
-- 
GitLab


From 81f8175ab12c37eb81a78e2ed27570fd7ddc0d88 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 7 Apr 2021 11:06:40 -0700
Subject: [PATCH 0872/1664] Move taskbar to be closer to QSB

- Offset taskbar to be halfway between QSB and bottom of the screen.
- Add taskbar translationY state property to animate when going
  between launcher and an app.
- Draw the taskbar background in TaskbarContainerView instead of
  TaskbarView so it stays pinned to the bottom as TaskbarView
  translates up. If we want to have a background behind the
  taskbar on home, this should move back to TaskbarView so that
  the drawing can be shared by mTaskbarViewOnHome.

Test: visually on home screen, translates when entering and
exiting an app

Bug: 182981881
Bug: 171917176
Change-Id: I44f8b2c770074f7f015dcccbc2befd3453811193
---
 quickstep/res/layout/taskbar.xml              |  1 -
 .../taskbar/TaskbarAnimationController.java   | 18 ++++++++
 .../taskbar/TaskbarContainerView.java         | 24 +++++++++++
 .../launcher3/taskbar/TaskbarController.java  | 43 ++++++++++++++-----
 .../taskbar/TaskbarStateHandler.java          |  6 +++
 .../launcher3/taskbar/TaskbarView.java        | 11 -----
 .../uioverrides/states/OverviewState.java     |  5 +++
 .../android/quickstep/AbsSwipeUpHandler.java  |  8 ++--
 src/com/android/launcher3/Hotseat.java        | 29 +++++++++----
 src/com/android/launcher3/LauncherState.java  |  4 ++
 10 files changed, 114 insertions(+), 35 deletions(-)

diff --git a/quickstep/res/layout/taskbar.xml b/quickstep/res/layout/taskbar.xml
index 84e23043b0..732222ade8 100644
--- a/quickstep/res/layout/taskbar.xml
+++ b/quickstep/res/layout/taskbar.xml
@@ -24,7 +24,6 @@
         android:id="@+id/taskbar_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@color/taskbar_background"
         android:gravity="center"/>
 
 </com.android.launcher3.taskbar.TaskbarContainerView>
\ No newline at end of file
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java
index 7c54e2d6b9..46e4506f1f 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java
@@ -50,6 +50,10 @@ public class TaskbarAnimationController {
     private final AnimatedFloat mTaskbarScaleForLauncherState = new AnimatedFloat(
             this::updateScale);
 
+    // TranslationY.
+    private final AnimatedFloat mTaskbarTranslationYForLauncherState = new AnimatedFloat(
+            this::updateTranslationY);
+
     public TaskbarAnimationController(BaseQuickstepLauncher launcher,
             TaskbarController.TaskbarAnimationControllerCallbacks taskbarCallbacks) {
         mLauncher = launcher;
@@ -81,6 +85,10 @@ public class TaskbarAnimationController {
         return mTaskbarScaleForLauncherState;
     }
 
+    protected AnimatedFloat getTaskbarTranslationYForLauncherState() {
+        return mTaskbarTranslationYForLauncherState;
+    }
+
     protected Animator createAnimToBackgroundAlpha(float toAlpha, long duration) {
         return mTaskbarBackgroundAlpha.animateToValue(mTaskbarBackgroundAlpha.value, toAlpha)
                 .setDuration(duration);
@@ -95,6 +103,7 @@ public class TaskbarAnimationController {
         mTaskbarCallbacks.updateTaskbarBackgroundAlpha(mTaskbarBackgroundAlpha.value);
         updateVisibilityAlpha();
         updateScale();
+        updateTranslationY();
     }
 
     private void updateVisibilityAlpha() {
@@ -120,6 +129,15 @@ public class TaskbarAnimationController {
         mTaskbarCallbacks.updateTaskbarScale(scale);
     }
 
+    private void updateTranslationY() {
+        // We use mTaskbarBackgroundAlpha as a proxy for whether Launcher is resumed/paused, the
+        // assumption being that Taskbar should always be at translationY 0f regardless of the
+        // current LauncherState if Launcher is paused.
+        float translationY = mTaskbarTranslationYForLauncherState.value;
+        translationY = Utilities.mapRange(mTaskbarBackgroundAlpha.value, translationY, 0f);
+        mTaskbarCallbacks.updateTaskbarTranslationY(translationY);
+    }
+
     private void setNavBarButtonAlpha(float navBarAlpha) {
         SystemUiProxy.INSTANCE.get(mLauncher).setNavBarButtonAlpha(navBarAlpha, false);
     }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
index ccf6b41e5d..621bba7e85 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
@@ -19,6 +19,8 @@ import static com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsI
 import static com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo.TOUCHABLE_INSETS_REGION;
 
 import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
 import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.view.View;
@@ -38,6 +40,7 @@ public class TaskbarContainerView extends BaseDragLayer<TaskbarActivityContext>
 
     private final int[] mTempLoc = new int[2];
     private final int mFolderMargin;
+    private final Paint mTaskbarBackgroundPaint;
 
     // Initialized in TaskbarController constructor.
     private TaskbarController.TaskbarContainerViewCallbacks mControllerCallbacks;
@@ -63,6 +66,8 @@ public class TaskbarContainerView extends BaseDragLayer<TaskbarActivityContext>
             int defStyleAttr, int defStyleRes) {
         super(context, attrs, 1 /* alphaChannelCount */);
         mFolderMargin = getResources().getDimensionPixelSize(R.dimen.taskbar_folder_margin);
+        mTaskbarBackgroundPaint = new Paint();
+        mTaskbarBackgroundPaint.setColor(getResources().getColor(R.color.taskbar_background));
     }
 
     protected void construct(TaskbarController.TaskbarContainerViewCallbacks callbacks) {
@@ -97,11 +102,14 @@ public class TaskbarContainerView extends BaseDragLayer<TaskbarActivityContext>
             // mTaskbarView is, since its position never changes and insets rather than overlays.
             int[] loc = mTempLoc;
             float scale = mTaskbarView.getScaleX();
+            float translationY = mTaskbarView.getTranslationY();
             mTaskbarView.setScaleX(1);
             mTaskbarView.setScaleY(1);
+            mTaskbarView.setTranslationY(0);
             mTaskbarView.getLocationInWindow(loc);
             mTaskbarView.setScaleX(scale);
             mTaskbarView.setScaleY(scale);
+            mTaskbarView.setTranslationY(translationY);
             insetsInfo.contentInsets.left = loc[0];
             insetsInfo.contentInsets.top = loc[1];
             insetsInfo.contentInsets.right = getWidth() - (loc[0] + mTaskbarView.getWidth());
@@ -153,4 +161,20 @@ public class TaskbarContainerView extends BaseDragLayer<TaskbarActivityContext>
     protected TaskbarActivityContext getTaskbarActivityContext() {
         return mActivity;
     }
+
+    @Override
+    protected void dispatchDraw(Canvas canvas) {
+        canvas.drawRect(0, canvas.getHeight() - mTaskbarView.getHeight(), canvas.getWidth(),
+                canvas.getHeight(), mTaskbarBackgroundPaint);
+        super.dispatchDraw(canvas);
+    }
+
+    /**
+     * Sets the alpha of the background color behind all the Taskbar contents.
+     * @param alpha 0 is fully transparent, 1 is fully opaque.
+     */
+    protected void setTaskbarBackgroundAlpha(float alpha) {
+        mTaskbarBackgroundPaint.setAlpha((int) (alpha * 255));
+        invalidate();
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index d772964ecf..c93de00f4f 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -103,7 +103,7 @@ public class TaskbarController {
         return new TaskbarAnimationControllerCallbacks() {
             @Override
             public void updateTaskbarBackgroundAlpha(float alpha) {
-                mTaskbarViewInApp.setBackgroundAlpha(alpha);
+                mTaskbarContainerView.setTaskbarBackgroundAlpha(alpha);
             }
 
             @Override
@@ -117,6 +117,18 @@ public class TaskbarController {
                 mTaskbarViewInApp.setScaleX(scale);
                 mTaskbarViewInApp.setScaleY(scale);
             }
+
+            @Override
+            public void updateTaskbarTranslationY(float translationY) {
+                if (translationY < 0) {
+                    // Resize to accommodate the max translation we'll reach.
+                    setTaskbarWindowHeight(mTaskbarSize.y
+                            + mLauncher.getHotseat().getTaskbarOffsetY());
+                } else {
+                    setTaskbarWindowHeight(mTaskbarSize.y);
+                }
+                mTaskbarViewInApp.setTranslationY(translationY);
+            }
         };
     }
 
@@ -240,6 +252,11 @@ public class TaskbarController {
             public AnimatedFloat getScaleTarget() {
                 return mTaskbarAnimationController.getTaskbarScaleForLauncherState();
             }
+
+            @Override
+            public AnimatedFloat getTranslationYTarget() {
+                return mTaskbarAnimationController.getTaskbarTranslationYForLauncherState();
+            }
         };
     }
 
@@ -406,13 +423,15 @@ public class TaskbarController {
         Rect hotseatBounds = new Rect();
         DeviceProfile grid = mLauncher.getDeviceProfile();
         int hotseatHeight = grid.workspacePadding.bottom + grid.taskbarSize;
-        int hotseatTopDiff = hotseatHeight - grid.taskbarSize;
+        int taskbarOffset = mLauncher.getHotseat().getTaskbarOffsetY();
+        int hotseatTopDiff = hotseatHeight - grid.taskbarSize - taskbarOffset;
+        int hotseatBottomDiff = taskbarOffset;
 
         mTaskbarViewOnHome.getHotseatBounds().roundOut(hotseatBounds);
         mLauncher.getHotseat().setPadding(hotseatBounds.left,
                 hotseatBounds.top + hotseatTopDiff,
                 mTaskbarViewOnHome.getWidth() - hotseatBounds.right,
-                mTaskbarViewOnHome.getHeight() - hotseatBounds.bottom);
+                mTaskbarViewOnHome.getHeight() - hotseatBounds.bottom + hotseatBottomDiff);
     }
 
     private void setWhichTaskbarViewIsVisible(@Nullable TaskbarView visibleTaskbar) {
@@ -438,13 +457,15 @@ public class TaskbarController {
      * Updates the TaskbarContainer to MATCH_PARENT vs original Taskbar size.
      */
     private void setTaskbarWindowFullscreen(boolean fullscreen) {
-        if (fullscreen) {
-            mWindowLayoutParams.width = MATCH_PARENT;
-            mWindowLayoutParams.height = MATCH_PARENT;
-        } else {
-            mWindowLayoutParams.width = mTaskbarSize.x;
-            mWindowLayoutParams.height = mTaskbarSize.y;
-        }
+        setTaskbarWindowHeight(fullscreen ? MATCH_PARENT : mTaskbarSize.y);
+    }
+
+    /**
+     * Updates the TaskbarContainer height (pass mTaskbarSize.y to reset).
+     */
+    private void setTaskbarWindowHeight(int height) {
+        mWindowLayoutParams.width = mTaskbarSize.x;
+        mWindowLayoutParams.height = height;
         mWindowManager.updateViewLayout(mTaskbarContainerView, mWindowLayoutParams);
     }
 
@@ -454,6 +475,7 @@ public class TaskbarController {
     protected interface TaskbarStateHandlerCallbacks {
         AnimatedFloat getAlphaTarget();
         AnimatedFloat getScaleTarget();
+        AnimatedFloat getTranslationYTarget();
     }
 
     /**
@@ -464,6 +486,7 @@ public class TaskbarController {
         void updateTaskbarBackgroundAlpha(float alpha);
         void updateTaskbarVisibilityAlpha(float alpha);
         void updateTaskbarScale(float scale);
+        void updateTaskbarTranslationY(float translationY);
     }
 
     /**
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java
index 9fc7d995a7..6ea51fa5eb 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java
@@ -16,6 +16,7 @@
 package com.android.launcher3.taskbar;
 
 import static com.android.launcher3.LauncherState.TASKBAR;
+import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 
 import androidx.annotation.Nullable;
@@ -54,9 +55,11 @@ public class TaskbarStateHandler implements StateManager.StateHandler<LauncherSt
 
         AnimatedFloat alphaTarget = mTaskbarCallbacks.getAlphaTarget();
         AnimatedFloat scaleTarget = mTaskbarCallbacks.getScaleTarget();
+        AnimatedFloat translationYTarget = mTaskbarCallbacks.getTranslationYTarget();
         boolean isTaskbarVisible = (state.getVisibleElements(mLauncher) & TASKBAR) != 0;
         alphaTarget.updateValue(isTaskbarVisible ? 1f : 0f);
         scaleTarget.updateValue(state.getTaskbarScale(mLauncher));
+        translationYTarget.updateValue(state.getTaskbarTranslationY(mLauncher));
     }
 
     @Override
@@ -68,9 +71,12 @@ public class TaskbarStateHandler implements StateManager.StateHandler<LauncherSt
 
         AnimatedFloat alphaTarget = mTaskbarCallbacks.getAlphaTarget();
         AnimatedFloat scaleTarget = mTaskbarCallbacks.getScaleTarget();
+        AnimatedFloat translationYTarget = mTaskbarCallbacks.getTranslationYTarget();
         boolean isTaskbarVisible = (toState.getVisibleElements(mLauncher) & TASKBAR) != 0;
         animation.setFloat(alphaTarget, AnimatedFloat.VALUE, isTaskbarVisible ? 1f : 0f, LINEAR);
         animation.setFloat(scaleTarget, AnimatedFloat.VALUE, toState.getTaskbarScale(mLauncher),
                 LINEAR);
+        animation.setFloat(translationYTarget, AnimatedFloat.VALUE,
+                toState.getTaskbarTranslationY(mLauncher), ACCEL_DEACCEL);
     }
 }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
index f254844b1d..60a7add7fd 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
@@ -24,7 +24,6 @@ import android.content.res.Resources;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.RectF;
-import android.graphics.drawable.ColorDrawable;
 import android.util.AttributeSet;
 import android.view.DragEvent;
 import android.view.MotionEvent;
@@ -52,7 +51,6 @@ import com.android.launcher3.views.ActivityContext;
  */
 public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconParent, Insettable {
 
-    private final ColorDrawable mBackgroundDrawable;
     private final int mIconTouchSize;
     private final boolean mIsRtl;
     private final int mTouchSlop;
@@ -97,7 +95,6 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
         super(context, attrs, defStyleAttr, defStyleRes);
 
         Resources resources = getResources();
-        mBackgroundDrawable = (ColorDrawable) getBackground();
         mIconTouchSize = resources.getDimensionPixelSize(R.dimen.taskbar_icon_touch_size);
         mIsRtl = Utilities.isRtl(resources);
         mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
@@ -159,14 +156,6 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
         mLayoutTransition.getAnimator(LayoutTransition.DISAPPEARING).end();
     }
 
-    /**
-     * Sets the alpha of the background color behind all the Taskbar contents.
-     * @param alpha 0 is fully transparent, 1 is fully opaque.
-     */
-    public void setBackgroundAlpha(float alpha) {
-        mBackgroundDrawable.setAlpha((int) (alpha * 255));
-    }
-
     /**
      * Inflates/binds the Hotseat views to show in the Taskbar given their ItemInfos.
      */
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
index 6cdeb0f74b..30c07b050f 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -87,6 +87,11 @@ public class OverviewState extends LauncherState {
         return 1f;
     }
 
+    @Override
+    public float getTaskbarTranslationY(Launcher launcher) {
+        return 0f;
+    }
+
     @Override
     public PageAlphaProvider getWorkspacePageAlphaProvider(Launcher launcher) {
         return new PageAlphaProvider(DEACCEL_2) {
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 2a903eb9fc..c547d00250 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -801,11 +801,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
             }
         }
         if (mParallelRunningAnim != null) {
-            if (cancel) {
-                mParallelRunningAnim.cancel();
-            } else {
-                mParallelRunningAnim.end();
-            }
+            // Unlike the above animation, the parallel animation won't have anything to take up
+            // the work if it's canceled, so just end it instead.
+            mParallelRunningAnim.end();
         }
     }
 
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index da41200040..8496fd5d9c 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -199,24 +199,37 @@ public class Hotseat extends CellLayout implements Insettable {
         int left = (r - l - qsbWidth) / 2;
         int right = left + qsbWidth;
 
-        DeviceProfile dp = mActivity.getDeviceProfile();
-        int freeSpace = dp.isTaskbarPresent
-                ? dp.workspacePadding.bottom
-                : dp.hotseatBarSizePx - dp.hotseatCellHeightPx - mQsbHeight;
-        int bottom = b - t
-                - (int) (freeSpace * QSB_CENTER_FACTOR)
-                - (dp.isTaskbarPresent ? dp.taskbarSize : dp.getInsets().bottom);
+        int bottom = b - t - getQsbOffsetY();
         int top = bottom - mQsbHeight;
         mQsb.layout(left, top, right, bottom);
 
         int taskbarWidth = mTaskbarView.getMeasuredWidth();
         left = (r - l - taskbarWidth) / 2;
         right = left + taskbarWidth;
-        bottom = b - t;
+        bottom = b - t - getTaskbarOffsetY();
         top = bottom - mTaskbarViewHeight;
         mTaskbarView.layout(left, top, right, bottom);
     }
 
+    /**
+     * Returns the number of pixels the QSB is translated from the bottom of the screen.
+     */
+    private int getQsbOffsetY() {
+        DeviceProfile dp = mActivity.getDeviceProfile();
+        int freeSpace = dp.isTaskbarPresent
+                ? dp.workspacePadding.bottom
+                : dp.hotseatBarSizePx - dp.hotseatCellHeightPx - mQsbHeight;
+        return (int) (freeSpace * QSB_CENTER_FACTOR)
+                + (dp.isTaskbarPresent ? dp.taskbarSize : dp.getInsets().bottom);
+    }
+
+    /**
+     * Returns the number of pixels the taskbar is translated from the bottom of the screen.
+     */
+    public int getTaskbarOffsetY() {
+        return (getQsbOffsetY() - mTaskbarViewHeight) / 2;
+    }
+
     /**
      * Sets the alpha value of just our ShortcutAndWidgetContainer.
      */
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java
index 0c509a112a..58df9c8f64 100644
--- a/src/com/android/launcher3/LauncherState.java
+++ b/src/com/android/launcher3/LauncherState.java
@@ -184,6 +184,10 @@ public abstract class LauncherState implements BaseState<LauncherState> {
         return launcher.getNormalTaskbarScale();
     }
 
+    public float getTaskbarTranslationY(Launcher launcher) {
+        return -launcher.getHotseat().getTaskbarOffsetY();
+    }
+
     public float getOverviewFullscreenProgress() {
         return 0;
     }
-- 
GitLab


From 6a562d8cbe540a2cedad17375c7b8e1ff197b189 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Tue, 13 Apr 2021 11:22:03 -0700
Subject: [PATCH 0873/1664] Waiting for NexusLauncher to go away after swiping
 up from menu

Swiping up can temporarily bring Nexus Launcher if the
current launcher is a Launcher3 one. Wait for the
current launcher to reappear.

Test: presubmit
Bug: 183615088
Change-Id: Iff6eaf3bf27f7ddca445fab86780f8cf82f97352
---
 .../launcher3/tapl/LauncherInstrumentation.java     | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 475a4ff374..cf935f382a 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -365,7 +365,7 @@ public final class LauncherInstrumentation {
 
             if (hasSystemUiObject("keyguard_status_view")) return "Phone is locked";
 
-            if (!mDevice.wait(Until.hasObject(By.textStartsWith("")), WAIT_TIME_MS)) {
+            if (!mDevice.wait(Until.hasObject(getAnyObjectSelector()), WAIT_TIME_MS)) {
                 return "Screen is empty";
             }
 
@@ -388,7 +388,7 @@ public final class LauncherInstrumentation {
     }
 
     private String getVisiblePackages() {
-        return mDevice.findObjects(By.textStartsWith(""))
+        return mDevice.findObjects(getAnyObjectSelector())
                 .stream()
                 .map(LauncherInstrumentation::getApplicationPackageSafe)
                 .distinct()
@@ -692,6 +692,9 @@ public final class LauncherInstrumentation {
                     try (LauncherInstrumentation.Closable c = addContextLayer(
                             "Swiped up from context menu to home")) {
                         waitUntilLauncherObjectGone(CONTEXT_MENU_RES_ID);
+                        // Swiping up can temporarily bring Nexus Launcher if the current
+                        // Launcher is a Launcher3 one. Wait for the current launcher to reappear.
+                        waitForLauncherObject(getAnyObjectSelector());
                     }
                 }
                 if (hasLauncherObject(WORKSPACE_RES_ID)) {
@@ -736,9 +739,13 @@ public final class LauncherInstrumentation {
         }
     }
 
+    private static BySelector getAnyObjectSelector() {
+        return By.textStartsWith("");
+    }
+
     boolean isLauncherVisible() {
         mDevice.waitForIdle();
-        return hasLauncherObject(By.textStartsWith(""));
+        return hasLauncherObject(getAnyObjectSelector());
     }
 
     /**
-- 
GitLab


From 79ee3f6310a7a77ca83dc5f62285e7a3d45f80ab Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 13 Apr 2021 13:16:56 -0700
Subject: [PATCH 0874/1664] Fixing race condition when an apk is removed.

Since the check was happening on a different thread, the view might have change by the time
the callback comes back on UI thread.

Bug: 185100744
Test: Manual
Change-Id: I1347819bee71ed9d7ba6aa676f4318ea03316ea2
---
 .../com/android/quickstep/RecentsModel.java   | 11 ++--
 .../android/quickstep/views/RecentsView.java  | 64 ++++++++++---------
 2 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/RecentsModel.java b/quickstep/src/com/android/quickstep/RecentsModel.java
index ba24e6a6c7..c786167241 100644
--- a/quickstep/src/com/android/quickstep/RecentsModel.java
+++ b/quickstep/src/com/android/quickstep/RecentsModel.java
@@ -112,20 +112,19 @@ public class RecentsModel extends TaskStackChangeListener {
     }
 
     /**
-     * Finds and returns the task key associated with the given task id.
+     * Checks if a task has been removed or not.
      *
-     * @param callback The callback to receive the task key if it is found or null. This is always
-     *                 called on the UI thread.
+     * @param callback Receives true if task is removed, false otherwise
      */
-    public void findTaskWithId(int taskId, Consumer<Task.TaskKey> callback) {
+    public void isTaskRemoved(int taskId, Consumer<Boolean> callback) {
         mTaskList.getTasks(true /* loadKeysOnly */, (tasks) -> {
             for (Task task : tasks) {
                 if (task.key.id == taskId) {
-                    callback.accept(task.key);
+                    callback.accept(false);
                     return;
                 }
             }
-            callback.accept(null);
+            callback.accept(true);
         });
     }
 
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 524bae160e..87c46bfe49 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -72,7 +72,6 @@ import android.graphics.RectF;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.os.Handler;
 import android.os.UserHandle;
 import android.text.Layout;
 import android.text.StaticLayout;
@@ -96,6 +95,7 @@ import android.widget.FrameLayout;
 import android.widget.ListView;
 
 import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
 
 import com.android.launcher3.BaseActivity;
 import com.android.launcher3.BaseActivity.MultiWindowModeChangedListener;
@@ -111,6 +111,7 @@ import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.anim.SpringProperty;
 import com.android.launcher3.compat.AccessibilityManagerCompat;
 import com.android.launcher3.config.FeatureFlags;
+import com.android.launcher3.icons.cache.HandlerRunnable;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.BaseState;
 import com.android.launcher3.statemanager.StatefulActivity;
@@ -153,6 +154,7 @@ import com.android.systemui.shared.system.PackageManagerWrapper;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
 import com.android.systemui.shared.system.TaskStackChangeListener;
+import com.android.systemui.shared.system.TaskStackChangeListeners;
 import com.android.wm.shell.pip.IPipAnimationListener;
 
 import java.util.ArrayList;
@@ -394,34 +396,27 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 return;
             }
 
-            UI_HELPER_EXECUTOR.execute(() -> {
-                TaskView taskView = getTaskView(taskId);
-                if (taskView == null) {
-                    return;
-                }
-                Handler handler = taskView.getHandler();
-                if (handler == null) {
-                    return;
-                }
-
-                // TODO: Add callbacks from AM reflecting adding/removing from the recents list, and
-                //       remove all these checks
-                Task.TaskKey taskKey = taskView.getTask().key;
-                if (PackageManagerWrapper.getInstance().getActivityInfo(taskKey.getComponent(),
-                        taskKey.userId) == null) {
-                    // The package was uninstalled
-                    handler.post(() ->
-                            dismissTask(taskView, true /* animate */, false /* removeTask */));
-                } else {
-                    mModel.findTaskWithId(taskKey.id, (key) -> {
-                        if (key == null) {
-                            // The task was removed from the recents list
-                            handler.post(() -> dismissTask(taskView, true /* animate */,
-                                    false /* removeTask */));
+            TaskView taskView = getTaskView(taskId);
+            if (taskView == null) {
+                return;
+            }
+            Task.TaskKey taskKey = taskView.getTask().key;
+            UI_HELPER_EXECUTOR.execute(new HandlerRunnable<>(
+                    UI_HELPER_EXECUTOR.getHandler(),
+                    () -> PackageManagerWrapper.getInstance()
+                            .getActivityInfo(taskKey.getComponent(), taskKey.userId) == null,
+                    MAIN_EXECUTOR,
+                    apkRemoved -> {
+                        if (apkRemoved) {
+                            dismissTask(taskId);
+                        } else {
+                            mModel.isTaskRemoved(taskKey.id, taskRemoved -> {
+                                if (taskRemoved) {
+                                    dismissTask(taskId);
+                                }
+                            });
                         }
-                    });
-                }
-            });
+                    }));
         }
     };
 
@@ -668,7 +663,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         updateTaskStackListenerState();
         mModel.getThumbnailCache().getHighResLoadingState().addCallback(this);
         mActivity.addMultiWindowModeChangedListener(mMultiWindowModeChangedListener);
-        ActivityManagerWrapper.getInstance().registerTaskStackListener(mTaskStackListener);
+        TaskStackChangeListeners.getInstance().registerTaskStackListener(mTaskStackListener);
         mSyncTransactionApplier = new SurfaceTransactionApplier(this);
         mLiveTileParams.setSyncTransactionApplier(mSyncTransactionApplier);
         RecentsModel.INSTANCE.get(getContext()).addThumbnailChangeListener(this);
@@ -687,7 +682,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         updateTaskStackListenerState();
         mModel.getThumbnailCache().getHighResLoadingState().removeCallback(this);
         mActivity.removeMultiWindowModeChangedListener(mMultiWindowModeChangedListener);
-        ActivityManagerWrapper.getInstance().unregisterTaskStackListener(mTaskStackListener);
+        TaskStackChangeListeners.getInstance().unregisterTaskStackListener(mTaskStackListener);
         mSyncTransactionApplier = null;
         mLiveTileParams.setSyncTransactionApplier(null);
         RecentsModel.INSTANCE.get(getContext()).removeThumbnailChangeListener(this);
@@ -2177,6 +2172,15 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         controller.start();
     }
 
+    @UiThread
+    private void dismissTask(int taskId) {
+        TaskView taskView = getTaskView(taskId);
+        if (taskView == null) {
+            return;
+        }
+        dismissTask(taskView, true /* animate */, false /* removeTask */);
+    }
+
     public void dismissTask(TaskView taskView, boolean animateTaskView, boolean removeTask) {
         runDismissAnimation(createTaskDismissAnimation(taskView, animateTaskView, removeTask,
                 DISMISS_TASK_DURATION));
-- 
GitLab


From 3ec8f554af9de5a7210015c0e571b4e55dd2ab58 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Tue, 13 Apr 2021 14:17:41 -0700
Subject: [PATCH 0875/1664] Expose the LauncherModel ModelDelegate

Added a getter for LauncherModel's ModelDelegate.

bug: 184179894
Test: manual
Change-Id: I94d2ee535f7c96e0d3672f053f32f55ddd10cba0
---
 src/com/android/launcher3/LauncherModel.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 699495c7f2..eef3980f96 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -130,6 +130,10 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi
         mModelDelegate = ModelDelegate.newInstance(context, app, mBgAllAppsList, mBgDataModel);
     }
 
+    public ModelDelegate getModelDelegate() {
+        return mModelDelegate;
+    }
+
     /**
      * Adds the provided items to the workspace.
      */
-- 
GitLab


From 9ac8b781b929afc424d509378b5a0d8c74b2bff2 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 13 Apr 2021 14:29:19 -0700
Subject: [PATCH 0876/1664] Remove SystemUiProxy#monitorGestureInput() as it's
 no longer used

Test: compiles and runs locally
Bug: 185266621
Change-Id: I4d40de269007178550cf1a9e9e906018badc6f74
---
 .../src/com/android/quickstep/SystemUiProxy.java     | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index 1f332c4dda..3edce6f613 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -254,18 +254,6 @@ public class SystemUiProxy implements ISystemUiProxy,
         }
     }
 
-    @Override
-    public Bundle monitorGestureInput(String name, int displayId) {
-        if (mSystemUiProxy != null) {
-            try {
-                return mSystemUiProxy.monitorGestureInput(name, displayId);
-            } catch (RemoteException e) {
-                Log.w(TAG, "Failed call monitorGestureInput: " + name, e);
-            }
-        }
-        return null;
-    }
-
     @Override
     public void notifyAccessibilityButtonClicked(int displayId) {
         if (mSystemUiProxy != null) {
-- 
GitLab


From 18694a2545eadc30e02fe2353315de7797b2918f Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Fri, 11 Dec 2020 20:41:18 -0800
Subject: [PATCH 0877/1664] Updates quickswitch animation from Launcher.

 - Workspace/All Apps/Hotseat no longer translate down
 - Fading of these elements and scaling of Workspace are tied to the
   wallpaper depth animation
 - At any point in the drag, you can still swipe up to enter Overview

This makes it feel like the apps are tied to the wallpaper and avoids
moving them orthogonally to the finger.

It also makes the "No recent items" animation more elegant.

Demo: https://drive.google.com/file/d/1phuRCqb69vuMp3ijS6PR5lTEcBHScjie/view?usp=sharing&resourcekey=0-2HXtMLUhQ-YU53hYlYV-fQ
Demo with no recent apps: https://drive.google.com/file/d/1wjexqznxs9ZhiUtCDW4-ZK6c7hKDRaXn/view?usp=sharing&resourcekey=0-GugbpJK8_cnFbUBB2Ar30w

Fixes: 174228745
Test: Manual
Change-Id: I1574ff89a0f382b7e63bf03cf4300ec7c695cfec
---
 .../uioverrides/states/QuickSwitchState.java        |  8 +++++++-
 .../NoButtonQuickSwitchTouchController.java         | 13 +++++++------
 src/com/android/launcher3/anim/Interpolators.java   |  1 -
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java
index 965f474b51..53afd211a9 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java
@@ -35,7 +35,13 @@ public class QuickSwitchState extends BackgroundAppState {
         float shiftRange = launcher.getAllAppsController().getShiftRange();
         float shiftProgress = getVerticalProgress(launcher) - NORMAL.getVerticalProgress(launcher);
         float translationY = shiftProgress * shiftRange;
-        return new ScaleAndTranslation(1, 0, translationY);
+        return new ScaleAndTranslation(0.9f, 0, translationY);
+    }
+
+    @Override
+    public float getVerticalProgress(Launcher launcher) {
+        // Don't move all apps shelf while quick-switching (just let it fade).
+        return 1f;
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
index 697516d113..77b0804dd5 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
@@ -23,7 +23,7 @@ import static com.android.launcher3.LauncherState.OVERVIEW_ACTIONS;
 import static com.android.launcher3.LauncherState.QUICK_SWITCH;
 import static com.android.launcher3.anim.AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD;
 import static com.android.launcher3.anim.Interpolators.ACCEL_0_75;
-import static com.android.launcher3.anim.Interpolators.DEACCEL_5;
+import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.Interpolators.scrollInterpolatorForVelocity;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
@@ -31,9 +31,10 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_UNKNOWN_SWIPEUP;
 import static com.android.launcher3.logging.StatsLogManager.getLauncherAtomEvent;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_DEPTH;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_VERTICAL_PROGRESS;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_FADE;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_TRANSLATE;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_ALL_ANIMATIONS;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
 import static com.android.launcher3.touch.BothAxesSwipeDetector.DIRECTION_RIGHT;
@@ -80,9 +81,8 @@ import com.android.quickstep.views.LauncherRecentsView;
 public class NoButtonQuickSwitchTouchController implements TouchController,
         BothAxesSwipeDetector.Listener {
 
-    /** The minimum progress of the scale/translationY animation until drag end. */
     private static final float Y_ANIM_MIN_PROGRESS = 0.25f;
-    private static final Interpolator FADE_OUT_INTERPOLATOR = DEACCEL_5;
+    private static final Interpolator FADE_OUT_INTERPOLATOR = DEACCEL_3;
     private static final Interpolator TRANSLATE_OUT_INTERPOLATOR = ACCEL_0_75;
     private static final Interpolator SCALE_DOWN_INTERPOLATOR = LINEAR;
     private static final long ATOMIC_DURATION_FROM_PAUSED_TO_OVERVIEW = 300;
@@ -187,7 +187,8 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
         StateAnimationConfig nonOverviewBuilder = new StateAnimationConfig();
         nonOverviewBuilder.setInterpolator(ANIM_WORKSPACE_FADE, FADE_OUT_INTERPOLATOR);
         nonOverviewBuilder.setInterpolator(ANIM_ALL_APPS_FADE, FADE_OUT_INTERPOLATOR);
-        nonOverviewBuilder.setInterpolator(ANIM_WORKSPACE_TRANSLATE, TRANSLATE_OUT_INTERPOLATOR);
+        nonOverviewBuilder.setInterpolator(ANIM_WORKSPACE_SCALE, FADE_OUT_INTERPOLATOR);
+        nonOverviewBuilder.setInterpolator(ANIM_DEPTH, FADE_OUT_INTERPOLATOR);
         nonOverviewBuilder.setInterpolator(ANIM_VERTICAL_PROGRESS, TRANSLATE_OUT_INTERPOLATOR);
         updateNonOverviewAnim(QUICK_SWITCH, nonOverviewBuilder);
         mNonOverviewAnim.dispatchOnStart();
@@ -207,7 +208,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
     /** Create state animation to control non-overview components. */
     private void updateNonOverviewAnim(LauncherState toState, StateAnimationConfig config) {
         config.duration = (long) (Math.max(mXRange, mYRange) * 2);
-        config.animFlags = config.animFlags | SKIP_OVERVIEW;
+        config.animFlags |= SKIP_OVERVIEW;
         mNonOverviewAnim = mLauncher.getStateManager()
                 .createAnimationToNewWorkspace(toState, config);
         mNonOverviewAnim.getTarget().addListener(mClearStateOnCancelListener);
diff --git a/src/com/android/launcher3/anim/Interpolators.java b/src/com/android/launcher3/anim/Interpolators.java
index 7980138370..7a389374dc 100644
--- a/src/com/android/launcher3/anim/Interpolators.java
+++ b/src/com/android/launcher3/anim/Interpolators.java
@@ -46,7 +46,6 @@ public class Interpolators {
     public static final Interpolator DEACCEL_2 = new DecelerateInterpolator(2);
     public static final Interpolator DEACCEL_2_5 = new DecelerateInterpolator(2.5f);
     public static final Interpolator DEACCEL_3 = new DecelerateInterpolator(3f);
-    public static final Interpolator DEACCEL_5 = new DecelerateInterpolator(5f);
 
     public static final Interpolator ACCEL_DEACCEL = new AccelerateDecelerateInterpolator();
 
-- 
GitLab


From 7b2e3df2d745add76865e5a56cc18c2af3a24d79 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 1 Mar 2021 15:21:45 -0800
Subject: [PATCH 0878/1664] Add logs to help debug
 TwoButtonNavBarTouchController

Test: TaplTestsQuickstep#testSwitchToOverview()

Bug: 13714484
Change-Id: I21740ac0fd6ddf2923fd081a00c84a463f13673b
---
 .../TwoButtonNavbarTouchController.java       | 22 +++++++++++++++++--
 .../launcher3/testing/TestProtocol.java       |  1 +
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java
index 3f7190f017..c4263290f7 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java
@@ -24,11 +24,13 @@ import static com.android.launcher3.Utilities.EDGE_NAV_BAR;
 
 import android.animation.ValueAnimator;
 import android.os.SystemClock;
+import android.util.Log;
 import android.view.MotionEvent;
 
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
+import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.AbstractStateChangeTouchController;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
 import com.android.quickstep.SystemUiProxy;
@@ -76,9 +78,18 @@ public class TwoButtonNavbarTouchController extends AbstractStateChangeTouchCont
             return true;
         }
         if (AbstractFloatingView.getTopOpenView(mLauncher) != null) {
+            if (TestProtocol.sDebugTracing) {
+                Log.d(TestProtocol.TWO_BUTTON_NORMAL_NOT_OVERVIEW,
+                        "Didn't intercept touch due to top view: "
+                                + AbstractFloatingView.getTopOpenView(mLauncher));
+            }
             return false;
         }
         if ((ev.getEdgeFlags() & EDGE_NAV_BAR) == 0) {
+            if (TestProtocol.sDebugTracing) {
+                Log.d(TestProtocol.TWO_BUTTON_NORMAL_NOT_OVERVIEW,
+                        "Didn't intercept touch because event wasn't from nav bar");
+            }
             return false;
         }
         if (!mIsTransposed && mLauncher.isInState(OVERVIEW)) {
@@ -89,14 +100,21 @@ public class TwoButtonNavbarTouchController extends AbstractStateChangeTouchCont
 
     @Override
     protected LauncherState getTargetState(LauncherState fromState, boolean isDragTowardPositive) {
+        final LauncherState targetState;
         if (mIsTransposed) {
             boolean draggingFromNav =
                     mLauncher.getDeviceProfile().isSeascape() == isDragTowardPositive;
-            return draggingFromNav ? HINT_STATE_TWO_BUTTON : NORMAL;
+            targetState = draggingFromNav ? HINT_STATE_TWO_BUTTON : NORMAL;
         } else {
             LauncherState startState = mStartState != null ? mStartState : fromState;
-            return isDragTowardPositive ^ (startState == OVERVIEW) ? HINT_STATE_TWO_BUTTON : NORMAL;
+            targetState = isDragTowardPositive ^ (startState == OVERVIEW)
+                    ? HINT_STATE_TWO_BUTTON : NORMAL;
+        }
+
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.TWO_BUTTON_NORMAL_NOT_OVERVIEW, "Target state: " + targetState);
         }
+        return targetState;
     }
 
     @Override
diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java
index 943d129047..9a02b66218 100644
--- a/src/com/android/launcher3/testing/TestProtocol.java
+++ b/src/com/android/launcher3/testing/TestProtocol.java
@@ -113,4 +113,5 @@ public final class TestProtocol {
     public static final String WORK_PROFILE_REMOVED = "b/159671700";
     public static final String TIS_NO_EVENTS = "b/180915942";
     public static final String GET_RECENTS_FAILED = "b/177472267";
+    public static final String TWO_BUTTON_NORMAL_NOT_OVERVIEW = "b/13714484";
 }
-- 
GitLab


From 9e7faadba44cb7aba6afbbd8ca2089cd654e983f Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Tue, 13 Apr 2021 20:48:25 -0700
Subject: [PATCH 0879/1664] Reduce the spring effect on All Apps

Bug: 185290838
Test: manual
Change-Id: Ie48ae27071d113603451c4198e762f03feaaa0d6
---
 src/com/android/launcher3/allapps/AllAppsContainerView.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 406e785ad5..41865ce5e2 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -75,9 +75,9 @@ import com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip.OnActivePag
 public class AllAppsContainerView extends SpringRelativeLayout implements DragSource,
         Insettable, OnDeviceProfileChangeListener, OnActivePageChangedListener {
 
-    private static final float FLING_VELOCITY_MULTIPLIER = 1000 * .8f;
+    private static final float FLING_VELOCITY_MULTIPLIER = 1000 * .2f;
     // Starts the springs after at least 55% of the animation has passed.
-    private static final float FLING_ANIMATION_THRESHOLD = 0.55f;
+    private static final float FLING_ANIMATION_THRESHOLD = 0.25f;
 
     protected final BaseDraggingActivity mLauncher;
     protected final AdapterHolder[] mAH;
-- 
GitLab


From d801f5d214e08b21e7319639f5974c7559520c09 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Wed, 14 Apr 2021 10:29:17 -0400
Subject: [PATCH 0880/1664] Have one app open animation properties for both
 cold/start app launch.

If cold start, shell draws icon.
If warm start, launcher draws the icon.

In both cases, the app window scale/crop/position is the
same.

This helps the case where shell does not notify launcher
whether the preview window is drawn before launcher starts the
animation.

Bug: 177264697
Test: manual, cold/warm app launches
Change-Id: I88bff607f68042ebc8230bd9fbaf983fe1f0afac
---
 .../launcher3/QuickstepTransitionManager.java | 32 ++++++-------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 009ca27603..7da6f60e6e 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -566,7 +566,6 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
         // Set the crop here so we can calculate the corner radius below.
         crop.set(left, top, right, bottom);
 
-        RectF targetBounds = new RectF(windowTargetBounds);
         RectF floatingIconBounds = new RectF();
         RectF tmpRectF = new RectF();
         Point tmpPos = new Point();
@@ -655,12 +654,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                 tmpRectF.offset(dragLayerBounds[0], dragLayerBounds[1]);
                 tmpRectF.offset(mDx.value, mDy.value);
                 Utilities.scaleRectFAboutCenter(tmpRectF, mIconScaleToFitScreen.value);
-                float windowTransX0 = tmpRectF.left - offsetX;
-                float windowTransY0 = tmpRectF.top - offsetY;
-                if (hasSplashScreen) {
-                    windowTransX0 -= crop.left * scale;
-                    windowTransY0 -= crop.top * scale;
-                }
+                float windowTransX0 = tmpRectF.left - offsetX - crop.left * scale;
+                float windowTransY0 = tmpRectF.top - offsetY - crop.top * scale;
 
                 // Calculate the icon position.
                 floatingIconBounds.set(launcherIconBounds);
@@ -1213,25 +1208,16 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
             alphaDuration = useUpwardAnimation ? APP_LAUNCH_ALPHA_DURATION
                     : APP_LAUNCH_ALPHA_DOWN_DURATION;
 
-            if (hasSplashScreen) {
-                iconAlphaStart = 0;
-
-                // TOOD: Share value from shell when available.
-                final float windowIconSize = Utilities.pxFromSp(108, r.getDisplayMetrics());
+            iconAlphaStart = hasSplashScreen ? 0 : 1f;
 
-                cropCenterXStart = windowTargetBounds.centerX();
-                cropCenterYStart = windowTargetBounds.centerY();
+            // TOOD: Share value from shell when available.
+            final float windowIconSize = Utilities.pxFromSp(108, r.getDisplayMetrics());
 
-                cropWidthStart = (int) windowIconSize;
-                cropHeightStart = (int) windowIconSize;
-            } else {
-                iconAlphaStart = 1;
+            cropCenterXStart = windowTargetBounds.centerX();
+            cropCenterYStart = windowTargetBounds.centerY();
 
-                cropWidthStart = cropHeightStart =
-                        Math.min(windowTargetBounds.width(), windowTargetBounds.height());
-                cropCenterXStart = cropCenterYStart =
-                        Math.min(windowTargetBounds.centerX(), windowTargetBounds.centerY());
-            }
+            cropWidthStart = (int) windowIconSize;
+            cropHeightStart = (int) windowIconSize;
 
             cropWidthEnd = windowTargetBounds.width();
             cropHeightEnd = windowTargetBounds.height();
-- 
GitLab


From 01320be908b6c8db7265f8d3ab7205668505d846 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 14 Apr 2021 14:51:03 -0700
Subject: [PATCH 0881/1664] Fix regression where StaggeredWorkspaceAnim didn't
 respect animateScrim

Before, this happened to work because we skipped setting the scrim when
doing an atomic animation, but the atomic animation code has been
removed. Add an explicit SKIP_SCRIM config flag instead.

Test: swipe up from overview to home, ensure scrim animates nicely

Bug: 185411781
Change-Id: I7bc14a11d9d416cc7336ea29d21107dcdbdbf782
---
 .../com/android/quickstep/util/StaggeredWorkspaceAnim.java   | 3 ++-
 .../android/launcher3/WorkspaceStateTransitionAnimation.java | 5 ++++-
 src/com/android/launcher3/states/StateAnimationConfig.java   | 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
index c12bd9b301..1df459ef8c 100644
--- a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
+++ b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
@@ -22,6 +22,7 @@ import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_DEPTH_CONTROLLER;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
+import static com.android.launcher3.states.StateAnimationConfig.SKIP_SCRIM;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -181,7 +182,7 @@ public class StaggeredWorkspaceAnim {
      */
     private void prepareToAnimate(Launcher launcher, boolean animateOverviewScrim) {
         StateAnimationConfig config = new StateAnimationConfig();
-        config.animFlags = SKIP_OVERVIEW | SKIP_DEPTH_CONTROLLER;
+        config.animFlags = SKIP_OVERVIEW | SKIP_DEPTH_CONTROLLER | SKIP_SCRIM;
         config.duration = 0;
         // setRecentsAttachedToAppWindow() will animate recents out.
         launcher.getStateManager().createAtomicAnimation(BACKGROUND_APP, NORMAL, config).start();
diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
index 24de19f20e..2956d07c8d 100644
--- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
+++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
@@ -40,6 +40,7 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_F
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_SCRIM_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_TRANSLATE;
+import static com.android.launcher3.states.StateAnimationConfig.SKIP_SCRIM;
 
 import android.animation.ValueAnimator;
 import android.view.View;
@@ -151,7 +152,9 @@ public class WorkspaceStateTransitionAnimation {
         propertySetter.setFloat(mWorkspace.getPageIndicator(), VIEW_TRANSLATE_Y,
                 hotseatScaleAndTranslation.translationY, hotseatTranslationInterpolator);
 
-        setScrim(propertySetter, state, config);
+        if (!config.hasAnimationFlag(SKIP_SCRIM)) {
+            setScrim(propertySetter, state, config);
+        }
     }
 
     /**
diff --git a/src/com/android/launcher3/states/StateAnimationConfig.java b/src/com/android/launcher3/states/StateAnimationConfig.java
index 0dbfb0b15f..2f26b4f70f 100644
--- a/src/com/android/launcher3/states/StateAnimationConfig.java
+++ b/src/com/android/launcher3/states/StateAnimationConfig.java
@@ -31,12 +31,14 @@ public class StateAnimationConfig {
             SKIP_ALL_ANIMATIONS,
             SKIP_OVERVIEW,
             SKIP_DEPTH_CONTROLLER,
+            SKIP_SCRIM,
     })
     @Retention(RetentionPolicy.SOURCE)
     public @interface AnimationFlags {}
     public static final int SKIP_ALL_ANIMATIONS = 1 << 0;
     public static final int SKIP_OVERVIEW = 1 << 1;
     public static final int SKIP_DEPTH_CONTROLLER = 1 << 2;
+    public static final int SKIP_SCRIM = 1 << 3;
 
     public long duration;
     public boolean userControlled;
-- 
GitLab


From 1e8bf031404650f5f525f5c99382e2a3fc4daaa3 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 14 Apr 2021 23:32:04 +0000
Subject: [PATCH 0882/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I0987416705613c144daee763376970859601484c
---
 quickstep/res/values-af/strings.xml     | 53 +++++++++++++-
 quickstep/res/values-am/strings.xml     | 55 ++++++++++++--
 quickstep/res/values-az/strings.xml     | 86 +++++++++++++++++++++-
 quickstep/res/values-bg/strings.xml     | 53 +++++++++++++-
 quickstep/res/values-bs/strings.xml     | 55 ++++++++++++--
 quickstep/res/values-da/strings.xml     | 53 +++++++++++++-
 quickstep/res/values-el/strings.xml     | 55 ++++++++++++--
 quickstep/res/values-en-rAU/strings.xml | 53 +++++++++++++-
 quickstep/res/values-en-rCA/strings.xml | 84 ++++++++++++++++++++++
 quickstep/res/values-en-rGB/strings.xml | 53 +++++++++++++-
 quickstep/res/values-en-rIN/strings.xml | 53 +++++++++++++-
 quickstep/res/values-en-rXC/strings.xml | 84 ++++++++++++++++++++++
 quickstep/res/values-es-rUS/strings.xml | 55 ++++++++++++--
 quickstep/res/values-es/strings.xml     | 88 +++++++++++++++++++++--
 quickstep/res/values-fa/strings.xml     | 55 ++++++++++++--
 quickstep/res/values-fi/strings.xml     | 86 +++++++++++++++++++++-
 quickstep/res/values-fr-rCA/strings.xml | 53 +++++++++++++-
 quickstep/res/values-gl/strings.xml     | 86 +++++++++++++++++++++-
 quickstep/res/values-gu/strings.xml     | 86 +++++++++++++++++++++-
 quickstep/res/values-hr/strings.xml     | 86 +++++++++++++++++++++-
 quickstep/res/values-hy/strings.xml     | 53 +++++++++++++-
 quickstep/res/values-it/strings.xml     | 53 +++++++++++++-
 quickstep/res/values-iw/strings.xml     | 53 +++++++++++++-
 quickstep/res/values-kn/strings.xml     | 53 +++++++++++++-
 quickstep/res/values-ky/strings.xml     | 88 +++++++++++++++++++++--
 quickstep/res/values-lo/strings.xml     | 53 +++++++++++++-
 quickstep/res/values-ml/strings.xml     | 53 +++++++++++++-
 quickstep/res/values-mn/strings.xml     | 90 +++++++++++++++++++++--
 quickstep/res/values-ne/strings.xml     | 96 ++++++++++++++++++++++---
 quickstep/res/values-nl/strings.xml     | 53 +++++++++++++-
 quickstep/res/values-or/strings.xml     | 86 +++++++++++++++++++++-
 quickstep/res/values-pa/strings.xml     | 88 +++++++++++++++++++++--
 quickstep/res/values-pt-rPT/strings.xml | 92 ++++++++++++++++++++++--
 quickstep/res/values-pt/strings.xml     | 53 +++++++++++++-
 quickstep/res/values-si/strings.xml     | 53 +++++++++++++-
 quickstep/res/values-sk/strings.xml     | 53 +++++++++++++-
 quickstep/res/values-sv/strings.xml     | 53 +++++++++++++-
 quickstep/res/values-th/strings.xml     | 88 +++++++++++++++++++++--
 quickstep/res/values-tl/strings.xml     | 53 +++++++++++++-
 quickstep/res/values-tr/strings.xml     | 55 ++++++++++++--
 quickstep/res/values-uz/strings.xml     | 55 ++++++++++++--
 quickstep/res/values-zh-rHK/strings.xml | 86 +++++++++++++++++++++-
 quickstep/res/values-zh-rTW/strings.xml | 86 +++++++++++++++++++++-
 quickstep/res/values-zu/strings.xml     | 53 +++++++++++++-
 44 files changed, 2784 insertions(+), 147 deletions(-)
 create mode 100644 quickstep/res/values-en-rCA/strings.xml
 create mode 100644 quickstep/res/values-en-rXC/strings.xml

diff --git a/quickstep/res/values-af/strings.xml b/quickstep/res/values-af/strings.xml
index 64b8e2c3b1..e3da54fffc 100644
--- a/quickstep/res/values-af/strings.xml
+++ b/quickstep/res/values-af/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Verdeelde skerm"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Speld vas"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Vormvry"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Oorsig"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Geen onlangse items nie"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Maak toe"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Programgebruikinstellings"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Vee alles uit"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Onlangse programme"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Programvoorstelle"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Alle programme"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Jou voorspelde programme"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Kry programvoorstelle in die onderste ry van jou tuisskerm"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Kry programvoorstelle op jou tuisskerm se gunstelingery"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Kry maklik toegang tot jou programme wat die meeste gebruik word, direk van die tuisskerm af. Voorstelle sal verander op grond van jou roetines. Programme in die onderste ry sal opskuif na jou tuisskerm."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Kry maklik toegang tot jou programme wat die meeste gebruik word, direk van die tuisskerm af. Voorstelle sal verander op grond van jou roetines. Programme in die gunstelingery sal na jou tuisskerm toe skuif."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Kry maklik toegang tot jou programme wat die meeste gebruik word, direk van die tuisskerm af. Voorstelle sal verander op grond van jou roetines. Programme in die onderste ry sal na \'n nuwe vouer toe skuif."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Kry programvoorstelle"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Nee, dankie"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Instellings"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Programme wat die meeste gebruik word, verskyn hier, en verander op grond van roetines"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Sleep programme van die onderste ry af om programvoorstelle te kry"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Programvoorstelle is in leë spasie bygevoeg"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Programvoorstelle is geaktiveer"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Programvoorstelle is gedeaktiveer"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Voorspelde program: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Maak seker dat jy van die rand heel links af swiep."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Maak seker dat jy van die linkerrand na die middel van die skerm swiep en laat los."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Dis al! Probeer nou om van die regterrand af te swiep."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Maak seker dat jy van die rand heel regs af swiep."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Maak seker dat jy van die regterrand na die middel van die skerm swiep en laat los."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Jy het die \"gaan terug\"-gebaar voltooi. Nou kan jy leer hoe om na tuisskerm te gaan."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Maak seker dat jy nie te naby aan die onderkant van die skerm swiep nie."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Gaan na Instellings om sensitiwiteit van teruggebaar te verander"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Swiep om terug te gaan"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Swiep van die linker- of regterrand na die middel van die skerm om na die vorige skerm terug te gaan."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Maak seker dat jy van die onderrand van die skerm af opswiep."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Maak seker jy onderbreek nie voordat jy laat los nie."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Maak seker jy swiep reguit op."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Jy het die \"gaan na tuisskerm\"-gebaar voltooi. Nou kan jy leer hoe om tussen programme te wissel."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Swiep om na tuisskerm toe te gaan"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Swiep op van die onderkant van jou skerm af. Hierdie gebaar neem jou altyd na die tuisskerm toe."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Maak seker dat jy van die onderrand van die skerm af opswiep."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Probeer om die venster langer te hou voordat jy laat los."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Maak seker dat jy reguit opswiep en dan onderbreek."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Jy het die \"wissel tussen programme\"-gebaar voltooi. Jy is gereed om jou foon te gebruik!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swiep om tussen programme te wissel"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swiep op van die onderkant van jou skerm af, hou en laat los dan."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Gereed"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Volgende"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Klaar"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Instellings"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Probeer weer"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Mooi so!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutoriaal <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Deel"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Skermkiekie"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Jou organisasie laat nie hierdie program toe nie"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Slaan navigasietutoriaal oor?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Jy kan dit later in die Wenke-program kry"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Kanselleer"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Slaan oor"</string>
 </resources>
diff --git a/quickstep/res/values-am/strings.xml b/quickstep/res/values-am/strings.xml
index 3daa92226c..aa58f464ec 100644
--- a/quickstep/res/values-am/strings.xml
+++ b/quickstep/res/values-am/strings.xml
@@ -19,19 +19,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"የተከፈለ ማያ ገጽ"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"ሰካ"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"ነጻ ቅጽ"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"ማጠቃለያ"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"ምንም የቅርብ ጊዜ ንጥሎች የሉም"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"ዝጋ"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"የመተግበሪያ አጠቃቀም ቅንብሮች"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"ሁሉንም አጽዳ"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"የቅርብ ጊዜ መተግበሪያዎች"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>፣ <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; 1 ደቂቃ"</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"ዛሬ <xliff:g id="TIME">%1$s</xliff:g> ቀርቷል"</string>
-    <string name="title_app_suggestions" msgid="4185902664111965088">"የመተግበሪያ ጥቆማዎች"</string>
+    <string name="title_app_suggestions" msgid="4185902664111965088">"የመተግበሪያ አስተያየቶች"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"ሁሉም መተግበሪያዎች"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"የእርስዎ የሚገመቱ መተግበሪያዎች"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"በመነሻ ገጽዎ ታችኛው ረድፍ ላይ የመተግበሪያ አስተያየት ጥቆማዎችን ያግኙ"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"በመነሻ ማያ ገጽዎ የተወዳጆች ረድፍ ላይ የመተግበሪያ አስተያየት ጥቆማዎችን ያግኙ"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"በጣም ስራ ላይ የዋሉ መተግበሪያዎችዎን በቀላሉ ከመነሻ ገጹ ሆነው ይድረሱባቸው። የአስተያየት ጥቆማዎች በእርስዎ ዕለት ተዕለት ተግባራት ላይ በመመስረት ይቀየራሉ። በታችኛው ረድፍ ላይ ያሉ መተግበሪያዎች ወደ መነሻ ገጽዎ ይወሰዳሉ።"</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"በጣም ሥራ ላይ የዋሉ መተግበሪያዎችዎን በቀላሉ ከመነሻ ገጹ ሆነው ይድረሱባቸው። የአስተያየት ጥቆማዎች በእርስዎ ዕለት ተዕለት ተግባራት ላይ በመመሥረት ይቀየራሉ። በተወዳጆች ረድፍ ውስጥ ያሉ መተግበሪያዎች ወደ የእርስዎ መነሻ ማያ ገጽ ይንቀሳቀሳሉ።"</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"በጣም ስራ ላይ የዋሉ መተግበሪያዎችዎን በቀላሉ ከመነሻ ገጹ ሆነው ይድረሱባቸው። የአስተያየት ጥቆማዎች በእርስዎ ዕለት ተዕለት ተግባራት ላይ በመመስረት ይቀየራሉ። በታችኛው ረድፍ ላይ ያሉ መተግበሪያዎች ወደ አዲስ አቃፊ ይወሰዳሉ።"</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"የመተግበሪያ አስተያየት ጥቆማዎችን አግኝ"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"አይ፣ አመሰግናለሁ"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"ቅንብሮች"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"በብዛት ስራ ላይ የዋሉ መተግበሪያዎች እዚህ ይመጣሉ፣ እና በዕለት ተዕለት ተግባራት ላይ በመመስረት ይቀየራሉ"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"የመተግበሪያ ጥቆማዎችን ለማግኘት መተግበሪያዎችን ከታችኛው ረድፍ ይጎትቱ"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"የመተግበሪያ አስተያየት ጥቆማዎች ወደ ባዶ ቦታ ታክለዋል"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"የመተግበሪያ አስተያየት ጥቆማዎች ነቅቷል"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"የመተግበሪያ አስተያየቶች ቦዝነዋል"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"የተገመተው መተግበሪያ፦ <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ከግራ ጠርዝ ጥግ ጀምሮ ማንሸራተትዎን ያረጋግጡ።"</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ከግራ ጠርዝ ወደ ማያ ገጹ መሃል ማንሸራተትዎን እና መልቀቅዎን ያረጋግጡ።"</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"ይሄው ነው! አሁን ደግሞ ከግራ ጥግ ጠረግ ማንሸራተትን ይሞክሩ።"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ከቀኝ ጠርዝ ጥግ ጀምሮ ማንሸራተትዎን ያረጋግጡ።"</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ከቀኝ ጠርዝ ወደ ማያ ገጹ መሃል ማንሸራተትዎን እና መልቀቅዎን ያረጋግጡ።"</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"ወደኋላ የመመለስ ምልክትን አጠናቀዋል። ቀጥሎም ወደ ቤት እንዴት መሄድ እንደሚችሉ ይወቁ።"</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ከማያ ገጹ ታችኛው ክፍል ጋር በጣም ጠጋ ብለው አለማንሸራተትዎን ያረጋግጡ።"</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ከኋላ ስሜት ሰጭነት ደረጃ ለመለወጥ ወደ ቅንብሮች ይመለሱ"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"ወደኋላ ለመመለስ ያንሸራትቱ"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"ወደ መጨረሻው ማያ ገጽ ለመመለስ ከግራ ወይም ከቀኝ ጠርዝ ወደ ማያ ገጹ መሃል ያንሸራትቱ።"</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ከማያ ገጹ የታችኛው ጫፍ ወደ ላይ ማንሸራተትዎን ያረጋግጡ።"</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ከመልቀቅዎ በፊት ለአፍታ እንዳልቆሙ ያረጋግጡ።"</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"በቀጥታ ወደ ላይ ማንሸራተትዎን ያረጋግጡ።"</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"የመነሻ ምልክትን አጠናቀዋል። ቀጥሎም መተግበሪያዎችን እንዴት መቀየር እንደሚችሉ ይወቁ።"</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"ወደ መነሻ ለመሄድ ያንሸራትቱ"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"ከእርስዎ ማያ ገጽ ግርጌ ላይ ወደ ላይ በጣት ጠረግ ያድርጉ። ይህ የእጅ ውዝዋዜ ሁልጊዜ ወደ መነሻ ማያ ገጽ ይወስድዎታል።"</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ከማያ ገጹ የታችኛው ጫፍ ወደ ላይ ማንሸራተትዎን ያረጋግጡ።"</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"ከመልቀቅዎ በፊት መስኮቱን ረዘም ላለ ጊዜ ለመያዝ ይሞክሩ።"</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"በቀጥታ ወደ ላይ ማንሸራተትዎን ያረጋግጡ፣ ከዚያ ለአፍታ ያቁሙ።"</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"መተግበሪያዎችን የመቀያየር ምልክትን አጠናቀዋል። ስልክዎን ለመጠቀም ዝግጁ ነዎት!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"መተግበሪያዎችን ለመቀየር ያንሸራትቱ"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ከእርስዎ ማያ ገጽ ግርጌ ላይ ወደ ላይ በጣት ጠረግ ያድርጉ፣ ይያዙ፣ በመቀጠል ይልቀቁ።"</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"ሁሉም ዝግጁ"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"ቀጣይ"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"ተጠናቋል"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ቅንብሮች"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"እንደገና ሞክር"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ጥሩ!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"አጋዥ ሥልጠና <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"አጋራ"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"ቅጽበታዊ ገጽ እይታ"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"ይህ ድርጊት በመተግበሪያው ወይም በእርስዎ ድርጅት አይፈቀድም"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"የአሰሳ አጋዥ ሥልጠናን ይዝለሉ?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"ይህንን በኋላ በጠቃሚ ምክሮች መተግበሪያ ውስጥ ማግኘት ይችላሉ"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"ይቅር"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"ዝለል"</string>
 </resources>
diff --git a/quickstep/res/values-az/strings.xml b/quickstep/res/values-az/strings.xml
index aa8fa536ac..acde823d7a 100644
--- a/quickstep/res/values-az/strings.xml
+++ b/quickstep/res/values-az/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Bölünmüş ekran"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Sancın"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Sərbəst rejim"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"İcmal"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Son elementlər yoxdur"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Bağlayın"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Tətbiq istifadə ayarları"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Hamısını silin"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Son tətbiqlər"</string>
@@ -34,4 +31,87 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Tətbiq təklifləri"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Bütün tətbiqlər"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Təklif edilən tətbiqlər"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Ana ekranın aşağı sırasında tətbiq təklifləri alın"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Ana ekranın sevimlilər sırasında tətbiq təklifləri alın"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Birbaşa Ana ekrandan ən çox istifadə edilən tətbiqlərə asanlıqla daxil olun. Təkliflər rejimlərinizə uyğun olaraq dəyişəcək. Aşağı sıradakı tətbiqlər Ana ekrana köçürüləcək."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Birbaşa Ana ekrandan ən çox işlədilən tətbiqlərə asanlıqla girin. Təkliflər rejimlərinizə uyğun olaraq dəyişəcək. Sevimlilər sırasındakı tətbiqlər Əsas ekrana köçürüləcək."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Birbaşa Əsas səhifədən ən çox istifadə edilən tətbiqlərə asanlıqla daxil olun. Təkliflər rejimlərinizə uyğun olaraq dəyişəcək. Aşağı sıradakı tətbiqlər yeni qovluğa köçürüləcək."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Tətbiq təklifləri əldə edin"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Yox, çox sağolun"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Ayarlar"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Ən çox istifadə edilən tətbiqlər burada görünür və rejimlərə uyğun olaraq dəyişir"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Tətbiq təklifləri əldə etmək üçün tətbiqləri aşağı sıradan kənara sürüşdürün"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Tətbiq təklifləri boş sahəyə əlavə edildi"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Tətbiq təklifləri aktivdir"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Tətbiq təklifləri deaktivdir"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Proqnozlaşdırılan tətbiq: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
+    <skip />
+    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
+    <skip />
+    <string name="action_share" msgid="2648470652637092375">"Paylaşın"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Ekran şəkli"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Bu əməliyyata tətbiq və ya təşkilatınız tərəfindən icazə verilmir"</string>
+    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
+    <skip />
+    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <skip />
 </resources>
diff --git a/quickstep/res/values-bg/strings.xml b/quickstep/res/values-bg/strings.xml
index 9e8c54a9c7..ecc879a8bd 100644
--- a/quickstep/res/values-bg/strings.xml
+++ b/quickstep/res/values-bg/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Разделен екран"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Фиксиране"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Свободна форма"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Общ преглед"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Няма скорошни елементи"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Затваряне"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Настройки за използването на приложенията"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Изчистване на всички"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Скорошни приложения"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Предложения за приложения"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Всички приложения"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Предвидени приложения"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Получавайте предложения за приложения на най-долния ред на началния си екран"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Получаване на предложения за приложения в реда с любими на началния екран"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Осъществявайте лесен достъп до най-използваните от вас приложения директно от началния екран. Предложенията ще се променят въз основа на действията ви. Приложенията на най-долния ред ще се преместят на началния ви екран."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Осъществявайте лесен достъп до най-използваните от вас приложения директно от началния екран. Предложенията ще се променят въз основа на действията ви. Приложенията в реда с любими ще бъдат преместени на началния екран."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Осъществявайте лесен достъп до най-използваните от вас приложения директно от началния екран. Предложенията ще се променят въз основа на действията ви. Приложенията на най-долния ред ще се преместят в нова папка."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Предложения"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Не, благодаря"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Настройки"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Най-използваните приложения се показват тук и се променят въз основа на поредиците"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"За да получавате предложения за приложения, с плъзгане премахнете приложенията от най-долния ред"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Предложенията за приложения са добавени на празното място"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Предложенията за приложения са активирани"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Функцията „Предложения за приложения“ е деактивирана"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Предвидено приложение: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Трябва да прекарате пръст от най-лявата част на екрана."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Трябва да прекарате пръст от левия край на екрана до средата, след което да вдигнете пръста си."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Това е всичко! Сега прекарайте пръст от десния край."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Трябва да прекарате пръст от най-дясната част на екрана."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Трябва да прекарате пръст от десния край на екрана до средата, след което да вдигнете пръста си."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Изпълнихте жеста за връщане назад. В следващия урок ще научите как се преминава към началния екран."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Не прекарвайте пръст твърде близо до долната част на екрана."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Променете чувств. на жеста за връщане назад от настройките"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Прекарване на пръст за връщане назад"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"За да се върнете на предишния екран, прекарайте пръст от левия или десния край на екрана до средата."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Трябва да прекарате пръст нагоре от долния край на екрана."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Не задържайте, преди да вдигнете пръста си."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Трябва да прекарате пръст право нагоре."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Изпълнихте жеста за преминаване към началния екран. В следващия урок ще научите как се превключва между приложенията."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Прекарване на пръст за преминаване към началния екран"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Прекарайте пръст нагоре от долната част на екрана. Този жест винаги ще ви отвежда до началния екран."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Трябва да прекарате пръст нагоре от долния край на екрана."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Задръжте прозореца по-дълго, преди да вдигнете пръста си."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Прекарайте пръст право нагоре, след което задръжте."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Изпълнихте жеста за превключване между приложенията. Вече можете да използвате телефона си!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Прекарване на пръст за превключване между приложенията"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Прекарайте пръст нагоре от долната част на екрана, задръжте и след това вдигнете пръста си."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Готово"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Напред"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Готово"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Настройки"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Опитайте отново"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Чудесно!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Урок <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Споделяне"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Екранна снимка"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Това действие не е разрешено от приложението или организацията ви"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Пропускане на урока за навигиране?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Урокът е налице в приложението за съвети"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Отказ"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Пропускане"</string>
 </resources>
diff --git a/quickstep/res/values-bs/strings.xml b/quickstep/res/values-bs/strings.xml
index 7968f7cc68..0e316feece 100644
--- a/quickstep/res/values-bs/strings.xml
+++ b/quickstep/res/values-bs/strings.xml
@@ -19,19 +19,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Način rada podijeljenog ekrana"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Zakači"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Slobodan oblik"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Pregled"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Nema nedavnih stavki"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Zatvaranje"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Postavke korištenja aplikacije"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Obriši sve"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Nedavne aplikacije"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>, <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; 1 min"</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"Preostalo vrijeme: <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="title_app_suggestions" msgid="4185902664111965088">"Prijedlozi za aplikacije"</string>
+    <string name="title_app_suggestions" msgid="4185902664111965088">"Prijedlozi aplikacija"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Sve aplikacije"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Predviđene aplikacije"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Primajte prijedloge aplikacija u donjem redu početnog ekrana"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Primajte prijedloge aplikacija u redu omiljenih stavki početnog ekrana"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Jednostavno pristupite najčešće korištenim aplikacijama direktno na početnom ekranu. Prijedlozi će se mijenjati na osnovu vaših rutina. Aplikacije koje se nalaze u donjem redu će se premjestiti na početni ekran."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Jednostavno pristupite najčešće korištenim aplikacijama direktno na početnom ekranu. Prijedlozi će se mijenjati na osnovu vaših rutina. Aplikacije u redu omiljenih stavki će se premjestiti na početni ekran."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Jednostavno pristupite najčešće korištenim aplikacijama, direktno na početnom ekranu. Prijedlozi će se mijenjati na osnovu vaših rutina. Aplikacije koje se nalaze u donjem redu će se premjestiti u novi folder."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Prikaži prijedloge aplikacija"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Ne, hvala"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Postavke"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Ovdje se prikazuju najčešće korištene aplikacije i njihov prikaz se mijenja na osnovu rutina"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Prevucite aplikacije iz donjeg reda da dobijete prijedloge aplikacija"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Prijedlozi aplikacija su dodani u prazan prostor"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Prijedlozi aplikacija su omogućeni"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Prijedlozi aplikacija su onemogućeni"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predviđena aplikacija: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Obratite pažnju da prevučete s krajnjeg lijevog ruba."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Obratite pažnju da prevučete s lijevog ruba prema sredini ekrana, a zatim pustite."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"To je to! Sada pokušajte prevući s desnog ruba."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Obratite pažnju da prevučete s krajnjeg desnog ruba."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Obratite pažnju da prevučete s desnog ruba prema sredini ekrana, a zatim pustite."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Završili ste pokret za vraćanje. Sljedeće naučite kako otvoriti Početni ekran."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Obratite pažnju da ne prevučete preblizu donjem dijelu ekrana."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Promijenite osjetljivost pokreta za povratak u Postavkama"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Prevucite da se vratite"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Da se vratite na posljednji ekran, prevucite s lijevog ili desnog ruba prema sredini ekrana."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Obratite pažnju da prevučete prema gore s donjeg ruba ekrana."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Obratite pažnju da ne zastanete prije puštanja."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Obratite pažnju da prevučete ravno prema gore."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Završili ste pokret za otvaranje Početnog ekrana. Sljedeće naučite kako prebacivati između aplikacija."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Prevucite da odete na početni ekran"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Prevucite s dna ekrana prema gore. Tim pokretom uvijek idete na Početni ekran."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Obratite pažnju da prevučete prema gore s donjeg ruba ekrana."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Pokušajte zadržati prozor duže prije puštanja."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Obratite pažnju da prevučete ravno prema gore, a zatim zastanite."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Završili ste pokret za prebacivanje između aplikacija. Spremni ste da koristite telefon!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Prevucite da prebacujete između aplikacija"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Prevucite s dna ekrana prema gore, zadržite, a zatim pustite."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Sve je spremno"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Naprijed"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Gotovo"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Postavke"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Pokušaj ponovo"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Lijepo!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Vodič <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Dijeli"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Snimak ekrana"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Ovu radnju ne dozvoljava aplikacija ili vaša organizacija"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Preskočiti vodič za navigiranje?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"To možete pronaći kasnije u Savjetima"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Otkaži"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Preskoči"</string>
 </resources>
diff --git a/quickstep/res/values-da/strings.xml b/quickstep/res/values-da/strings.xml
index b43a76eb94..d8774ac753 100644
--- a/quickstep/res/values-da/strings.xml
+++ b/quickstep/res/values-da/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Opdel skærm"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Fastgør"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Frit format"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Oversigt"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Ingen nye elementer"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Luk"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Indstillinger for appforbrug"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Ryd alt"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Seneste apps"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Appforslag"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Alle apps"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Dine foreslåede apps"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Få appforslag på den nederste række af din startskærm"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Få appforslag i rækken med favoritter på din startskærm"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Få nem adgang til dine mest brugte apps direkte fra startskærmen. Forslagene ændres ud fra dine vaner. Apps i nederste række bliver flyttet op til din startskærm."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Få nem adgang til dine mest brugte apps direkte fra startskærmen. Forslagene ændres ud fra dine vaner. Apps i rækken med favoritter bliver flyttet til din startskærm."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Få nem adgang til dine mest brugte apps direkte fra startskærmen. Forslagene ændres ud fra dine vaner. Apps i nederste række bliver flyttet til en ny mappe."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Få appforslag"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Nej tak"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Indstillinger"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"De mest brugte apps vises her, og visningen ændres ud fra dine vaner"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Træk apps væk fra den nederste række for at få appforslag"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Appforslag blev føjet til tom plads"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Appforslag er aktiveret"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Appforslag er deaktiveret"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App, du forventes at skulle bruge: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Stryg fra kanten yderst til venstre."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Stryg fra venstre kant mod midten af skærmen, og løft fingeren."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Det var det. Nu kan du prøve at stryge fra højre kant."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Stryg fra kanten yderst til højre."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Stryg fra højre kant mod midten af skærmen, og løft fingeren."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Du har fuldført bevægelsen for Gå tilbage. Som det næste kan du se, hvordan du går til startskærmen."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Undgå at stryge for tæt på bunden af skærmen."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Juster følsomheden for bevægelsen Gå tilbage i Indstillinger"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Stryg for at gå tilbage"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Stryg mod midten af skærmen fra venstre eller højre kant for at gå tilbage til den seneste skærm."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Stryg opad fra bunden af skærmen."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Undlad at holde fingeren stille, indtil du løfter fingeren."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Stryg lige opad."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Du har fuldført bevægelsen for Gå til start. Som det næste kan du se, hvordan du skifter app."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Stryg for at gå til startskærmen"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Stryg opad fra bunden af skærmen. Denne bevægelse åbner altid startskærmen."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Stryg opad fra bunden af skærmen."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Prøv at holde fingeren nede på vinduet i længere tid, inden du løfter den."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Stryg lige opad, og hold derefter fingeren stille."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Du har fuldført bevægelsen for Skift app. Du er klar til at bruge din telefon."</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Stryg for at skifte app"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Stryg opad fra bunden af skærmen, hold fingeren stille, og løft den."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Så er du klar"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Næste"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Luk"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Indstillinger"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Prøv igen"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Sådan!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Selvstudie <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Del"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Appen eller din organisation tillader ikke denne handling"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Vil du springe selvstudiet for navigation over?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Du kan finde dette senere i appen Tips"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Annuller"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Spring over"</string>
 </resources>
diff --git a/quickstep/res/values-el/strings.xml b/quickstep/res/values-el/strings.xml
index 87268df749..4580c2a83a 100644
--- a/quickstep/res/values-el/strings.xml
+++ b/quickstep/res/values-el/strings.xml
@@ -19,19 +19,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Διαχωρισμός οθόνης"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Καρφίτσωμα"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Ελεύθερη μορφή"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Επισκόπηση"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Δεν υπάρχουν πρόσφατα στοιχεία"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Κλείσιμο"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Ρυθμίσεις χρήσης εφαρμογής"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Διαγραφή όλων"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Πρόσφατες εφαρμογές"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>, <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; 1 λ."</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"Απομένουν <xliff:g id="TIME">%1$s</xliff:g> σήμερα"</string>
-    <string name="title_app_suggestions" msgid="4185902664111965088">"Προτάσεις εφαρμογών"</string>
+    <string name="title_app_suggestions" msgid="4185902664111965088">"Προτεινόμενες εφαρμογές"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Όλες οι εφαρμογές"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Προβλέψεις εφαρμογών"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Δείτε τις προτεινόμενες εφαρμογές στην κάτω σειρά της αρχικής οθόνης"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Δείτε τις προτεινόμενες εφαρμογές στη σειρά Αγαπημένα της αρχικής οθόνης."</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Αποκτήστε εύκολα πρόσβαση στις εφαρμογές που χρησιμοποιείτε περισσότερο απευθείας από την αρχική οθόνη. Οι προτάσεις θα αλλάζουν με βάση τις ρουτίνες σας. Οι εφαρμογές στην κάτω σειρά θα μετακινηθούν προς τα επάνω στην αρχική οθόνη."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Αποκτήστε εύκολα πρόσβαση στις εφαρμογές που χρησιμοποιείτε περισσότερο απευθείας από την αρχική οθόνη. Οι προτάσεις θα αλλάζουν με βάση τις ρουτίνες σας. Οι εφαρμογές στην σειρά Αγαπημένα θα μετακινηθούν στην αρχική οθόνη σας."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Αποκτήστε εύκολα πρόσβαση στις εφαρμογές που χρησιμοποιείτε περισσότερο, απευθείας από την αρχική οθόνη. Οι προτάσεις θα αλλάζουν με βάση τις ρουτίνες σας. Οι εφαρμογές στην κάτω σειρά θα μεταφερθούν σε νέο φάκελο."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Προβολή προτεινόμενων εφαρμογών"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Όχι, ευχαριστώ"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Ρυθμίσεις"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Οι εφαρμογές που χρησιμοποιείτε περισσότερο εμφανίζονται εδώ και αλλάζουν με βάση τις ρουτίνες"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Σύρετε εφαρμογές μακριά από την κάτω σειρά, για να δείτε τις προτεινόμενες εφαρμογές"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Οι προτεινόμενες εφαρμογές προστέθηκαν στον κενό χώρο"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Οι προτεινόμενες εφαρμογές ενεργοποιήθηκαν"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Οι προτεινόμενες εφαρμογές είναι απενεργοποιημένες"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Εφαρμογή από πρόβλεψη: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Φροντίστε να σύρετε από το άκρο της αριστερής πλευράς."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Φροντίστε να σύρετε από το αριστερό άκρο προς το μέσο της οθόνης και απομακρύνετε το δάχτυλό σας."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Αυτό ήταν! Δοκιμάστε τώρα να σύρετε από το δεξί άκρο."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Φροντίστε να σύρετε από το άκρο της δεξιάς πλευράς."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Φροντίστε να σύρετε από το δεξί άκρο προς το μέσο της οθόνης και απομακρύνετε το δάχτυλό σας."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Ολοκληρώσατε την κίνηση επιστροφής. Στη συνέχεια, μάθετε πώς να μεταβείτε στην αρχική σελίδα."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Φροντίστε να μην σύρετε υπερβολικά κοντά στο κάτω μέρος της οθόνης."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Μεταβείτε στις Ρυθμίσεις για αλλαγή ευαισθ. κίνησης επιστρ."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Σύρετε για επιστροφή"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Για να επιστρέψετε στην τελευτ. οθόνη, σύρετε από το αριστ. ή το δεξί άκρο προς το μέσο της οθόνης."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Φροντίστε να σύρετε προς τα επάνω από το κάτω άκρο της οθόνης."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Φροντίστε να μην κάνετε παύση προτού απομακρύνετε τα δάχτυλά σας."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Φροντίστε να σύρετε απευθείας προς τα επάνω."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Ολοκληρώσατε την κίνηση μετάβασης στην αρχική οθόνη. Στη συνέχεια, μάθετε πώς να κάνετε εναλλαγή εφαρμογών."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Σύρετε για μετάβαση στην αρχική οθόνη"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Σύρετε προς τα πάνω από το κάτω μέρος της οθόνης. Αυτή η κίνηση σάς μεταφέρει πάντα στην αρχ. οθόνη."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Φροντίστε να σύρετε προς τα επάνω από το κάτω άκρο της οθόνης."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Δοκιμάστε να κρατήσετε περισσότερο το παράθυρο προτού απελευθερώσετε."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Φροντίστε να σύρετε απευθείας προς τα επάνω και έπειτα κάντε παύση."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Ολοκληρώσατε την κίνηση εναλλαγής εφαρμογών. Είστε έτοιμοι να χρησιμοποιήσετε το τηλέφωνό σας!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Σύρετε για εναλλαγή εφαρμογών"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Σύρετε προς τα πάνω από το κάτω μέρος της οθόνης σας, κρατήστε παρατεταμένα και έπειτα ελευθερώστε."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Όλα είναι έτοιμα"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Επόμενο"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Τέλος"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Ρυθμίσεις"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Δοκιμάστε ξανά"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Ωραία!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Οδηγός <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Κοινοποίηση"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Στιγμιότυπο οθόνης"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Αυτή η ενέργεια δεν επιτρέπεται από την εφαρμογή ή τον οργανισμό σας."</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Παράβλεψη οδηγού πλοήγησης;"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Βρείτε τον αργότερα στην εφαρ. Συμβουλές"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Ακύρωση"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Παράβλεψη"</string>
 </resources>
diff --git a/quickstep/res/values-en-rAU/strings.xml b/quickstep/res/values-en-rAU/strings.xml
index 2d1418e5f4..a99e36ce7d 100644
--- a/quickstep/res/values-en-rAU/strings.xml
+++ b/quickstep/res/values-en-rAU/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Split screen"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Pin"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Freeform"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Overview"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"No recent items"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Close"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"App usage settings"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Clear all"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Recent apps"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"App suggestions"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"All apps"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Your predicted apps"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Get app suggestions on the bottom row of your home screen"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Get app suggestions on the favourites row of your home screen"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Easily access your most-used apps directly from the home screen. Suggestions will change based on your routines. Apps on the bottom row will move up to your home screen."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Easily access your most-used apps directly from the home screen. Suggestions will change based on your routines. Apps in the favourites row will move to your home screen."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Easily access your most-used apps directly from the home screen. Suggestions will change based on your routines. Apps on the bottom row will be moved to a new folder."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Get app suggestions"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"No, thanks"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Settings"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Most-used apps appear here, and change based on routines"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Drag apps off the bottom row to get app suggestions"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"App suggestions added to empty space"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"App suggestions enabled"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"App suggestions are disabled"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicted app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Make sure that you swipe from the far-left edge."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Make sure that you swipe from the left edge to the middle of the screen and let go."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"That\'s it! Now try swiping from the right edge."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Make sure that you swipe from the far-right edge."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Make sure that you swipe from the right edge to the middle of the screen and let go."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"You completed the go back gesture. Next up, learn how to go Home."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"To change sensitivity of the back gesture, go to Settings"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Swipe to go back"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"To go back to the last screen, swipe from the left or right edge to the middle of the screen."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Make sure that you swipe up from the bottom edge of the screen."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Make sure that you don\'t pause before letting go."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Make sure that you swipe straight up."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"You completed the go home gesture. Next up, learn how to switch apps."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Swipe to go home"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Swipe up from the bottom of your screen. This gesture always takes you to the home screen."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Make sure that you swipe up from the bottom edge of the screen."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Try holding the window for longer before releasing."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Make sure that you swipe straight up, then pause."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"You completed the switch apps gesture. You\'re ready to use your phone!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe to switch apps"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swipe up from the bottom of your screen, hold, then release."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"All set"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Next"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Done"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Settings"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Try again"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Nice!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Share"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Skip navigation tutorial?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"You can find this later in the Tips app"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancel"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Skip"</string>
 </resources>
diff --git a/quickstep/res/values-en-rCA/strings.xml b/quickstep/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000000..a99e36ce7d
--- /dev/null
+++ b/quickstep/res/values-en-rCA/strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2017 The Android Open Source Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="recent_task_option_pin" msgid="7929860679018978258">"Pin"</string>
+    <string name="recent_task_option_freeform" msgid="48863056265284071">"Freeform"</string>
+    <string name="recents_empty_message" msgid="7040467240571714191">"No recent items"</string>
+    <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"App usage settings"</string>
+    <string name="recents_clear_all" msgid="5328176793634888831">"Clear all"</string>
+    <string name="accessibility_recent_apps" msgid="4058661986695117371">"Recent apps"</string>
+    <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>, <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
+    <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; 1 minute"</string>
+    <string name="time_left_for_app" msgid="3111996412933644358">"<xliff:g id="TIME">%1$s</xliff:g> left today"</string>
+    <string name="title_app_suggestions" msgid="4185902664111965088">"App suggestions"</string>
+    <string name="all_apps_label" msgid="8542784161730910663">"All apps"</string>
+    <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Your predicted apps"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Get app suggestions on the bottom row of your home screen"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Get app suggestions on the favourites row of your home screen"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Easily access your most-used apps directly from the home screen. Suggestions will change based on your routines. Apps on the bottom row will move up to your home screen."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Easily access your most-used apps directly from the home screen. Suggestions will change based on your routines. Apps in the favourites row will move to your home screen."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Easily access your most-used apps directly from the home screen. Suggestions will change based on your routines. Apps on the bottom row will be moved to a new folder."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Get app suggestions"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"No, thanks"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Settings"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Most-used apps appear here, and change based on routines"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Drag apps off the bottom row to get app suggestions"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"App suggestions added to empty space"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"App suggestions enabled"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"App suggestions are disabled"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicted app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Make sure that you swipe from the far-left edge."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Make sure that you swipe from the left edge to the middle of the screen and let go."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"That\'s it! Now try swiping from the right edge."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Make sure that you swipe from the far-right edge."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Make sure that you swipe from the right edge to the middle of the screen and let go."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"You completed the go back gesture. Next up, learn how to go Home."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"To change sensitivity of the back gesture, go to Settings"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Swipe to go back"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"To go back to the last screen, swipe from the left or right edge to the middle of the screen."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Make sure that you swipe up from the bottom edge of the screen."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Make sure that you don\'t pause before letting go."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Make sure that you swipe straight up."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"You completed the go home gesture. Next up, learn how to switch apps."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Swipe to go home"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Swipe up from the bottom of your screen. This gesture always takes you to the home screen."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Make sure that you swipe up from the bottom edge of the screen."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Try holding the window for longer before releasing."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Make sure that you swipe straight up, then pause."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"You completed the switch apps gesture. You\'re ready to use your phone!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe to switch apps"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swipe up from the bottom of your screen, hold, then release."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"All set"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Next"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Done"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Settings"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Try again"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Nice!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Share"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Skip navigation tutorial?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"You can find this later in the Tips app"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancel"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Skip"</string>
+</resources>
diff --git a/quickstep/res/values-en-rGB/strings.xml b/quickstep/res/values-en-rGB/strings.xml
index 2d1418e5f4..a99e36ce7d 100644
--- a/quickstep/res/values-en-rGB/strings.xml
+++ b/quickstep/res/values-en-rGB/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Split screen"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Pin"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Freeform"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Overview"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"No recent items"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Close"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"App usage settings"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Clear all"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Recent apps"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"App suggestions"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"All apps"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Your predicted apps"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Get app suggestions on the bottom row of your home screen"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Get app suggestions on the favourites row of your home screen"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Easily access your most-used apps directly from the home screen. Suggestions will change based on your routines. Apps on the bottom row will move up to your home screen."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Easily access your most-used apps directly from the home screen. Suggestions will change based on your routines. Apps in the favourites row will move to your home screen."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Easily access your most-used apps directly from the home screen. Suggestions will change based on your routines. Apps on the bottom row will be moved to a new folder."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Get app suggestions"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"No, thanks"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Settings"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Most-used apps appear here, and change based on routines"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Drag apps off the bottom row to get app suggestions"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"App suggestions added to empty space"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"App suggestions enabled"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"App suggestions are disabled"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicted app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Make sure that you swipe from the far-left edge."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Make sure that you swipe from the left edge to the middle of the screen and let go."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"That\'s it! Now try swiping from the right edge."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Make sure that you swipe from the far-right edge."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Make sure that you swipe from the right edge to the middle of the screen and let go."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"You completed the go back gesture. Next up, learn how to go Home."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"To change sensitivity of the back gesture, go to Settings"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Swipe to go back"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"To go back to the last screen, swipe from the left or right edge to the middle of the screen."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Make sure that you swipe up from the bottom edge of the screen."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Make sure that you don\'t pause before letting go."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Make sure that you swipe straight up."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"You completed the go home gesture. Next up, learn how to switch apps."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Swipe to go home"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Swipe up from the bottom of your screen. This gesture always takes you to the home screen."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Make sure that you swipe up from the bottom edge of the screen."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Try holding the window for longer before releasing."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Make sure that you swipe straight up, then pause."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"You completed the switch apps gesture. You\'re ready to use your phone!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe to switch apps"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swipe up from the bottom of your screen, hold, then release."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"All set"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Next"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Done"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Settings"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Try again"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Nice!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Share"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Skip navigation tutorial?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"You can find this later in the Tips app"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancel"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Skip"</string>
 </resources>
diff --git a/quickstep/res/values-en-rIN/strings.xml b/quickstep/res/values-en-rIN/strings.xml
index 2d1418e5f4..a99e36ce7d 100644
--- a/quickstep/res/values-en-rIN/strings.xml
+++ b/quickstep/res/values-en-rIN/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Split screen"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Pin"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Freeform"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Overview"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"No recent items"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Close"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"App usage settings"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Clear all"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Recent apps"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"App suggestions"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"All apps"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Your predicted apps"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Get app suggestions on the bottom row of your home screen"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Get app suggestions on the favourites row of your home screen"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Easily access your most-used apps directly from the home screen. Suggestions will change based on your routines. Apps on the bottom row will move up to your home screen."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Easily access your most-used apps directly from the home screen. Suggestions will change based on your routines. Apps in the favourites row will move to your home screen."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Easily access your most-used apps directly from the home screen. Suggestions will change based on your routines. Apps on the bottom row will be moved to a new folder."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Get app suggestions"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"No, thanks"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Settings"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Most-used apps appear here, and change based on routines"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Drag apps off the bottom row to get app suggestions"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"App suggestions added to empty space"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"App suggestions enabled"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"App suggestions are disabled"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicted app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Make sure that you swipe from the far-left edge."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Make sure that you swipe from the left edge to the middle of the screen and let go."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"That\'s it! Now try swiping from the right edge."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Make sure that you swipe from the far-right edge."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Make sure that you swipe from the right edge to the middle of the screen and let go."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"You completed the go back gesture. Next up, learn how to go Home."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"To change sensitivity of the back gesture, go to Settings"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Swipe to go back"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"To go back to the last screen, swipe from the left or right edge to the middle of the screen."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Make sure that you swipe up from the bottom edge of the screen."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Make sure that you don\'t pause before letting go."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Make sure that you swipe straight up."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"You completed the go home gesture. Next up, learn how to switch apps."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Swipe to go home"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Swipe up from the bottom of your screen. This gesture always takes you to the home screen."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Make sure that you swipe up from the bottom edge of the screen."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Try holding the window for longer before releasing."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Make sure that you swipe straight up, then pause."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"You completed the switch apps gesture. You\'re ready to use your phone!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe to switch apps"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swipe up from the bottom of your screen, hold, then release."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"All set"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Next"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Done"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Settings"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Try again"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Nice!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Share"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Skip navigation tutorial?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"You can find this later in the Tips app"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancel"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Skip"</string>
 </resources>
diff --git a/quickstep/res/values-en-rXC/strings.xml b/quickstep/res/values-en-rXC/strings.xml
new file mode 100644
index 0000000000..ab2e3cf3be
--- /dev/null
+++ b/quickstep/res/values-en-rXC/strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2017 The Android Open Source Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="recent_task_option_pin" msgid="7929860679018978258">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‎‎‏‎‎‎‎‏‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‎‎‏‏‎‏‏‏‏‎‏‎‎‏‎‎Pin‎‏‎‎‏‎"</string>
+    <string name="recent_task_option_freeform" msgid="48863056265284071">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‎‎‏‎‏‎‏‏‎‏‏‎‎‏‏‎‎‎‏‎‏‏‎‎‎‎‏‏‎‏‎‏‏‏‎‏‎‏‎‏‎‏‎‎‎‎‏‎‎‏‏‏‏‎‎‏‏‏‎Freeform‎‏‎‎‏‎"</string>
+    <string name="recents_empty_message" msgid="7040467240571714191">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‏‎‏‎‎‏‏‎‎‎‎‏‏‏‎‏‎‎‏‏‏‎‎‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‎‏‏‏‎‏‎‏‎‎‎‏‏‏‏‎No recent items‎‏‎‎‏‎"</string>
+    <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‏‏‎‎‏‎‎‏‎‎‏‎‏‏‎‏‎‎‏‏‎‏‏‎‎‎‎‏‎‏‎‏‎‎‎‏‏‏‎‏‎‏‎‏‎App usage settings‎‏‎‎‏‎"</string>
+    <string name="recents_clear_all" msgid="5328176793634888831">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‏‏‎‎‎‏‎‏‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‏‎‏‎‎‎‏‎‏‏‎‎‏‎‏‏‏‎‎‎‏‏‏‏‏‏‏‎Clear all‎‏‎‎‏‎"</string>
+    <string name="accessibility_recent_apps" msgid="4058661986695117371">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‏‎‎‏‏‎‏‎‎‎‎‏‏‏‎‎‏‎‎‏‎‏‎‏‏‏‏‎‎‎‏‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‏‎Recent apps‎‏‎‎‏‎"</string>
+    <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‎‏‎‏‏‎‎‎‎‏‏‎‏‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>‎‏‎‎‏‏‏‎, ‎‏‎‎‏‏‎<xliff:g id="REMAINING_TIME">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‎‎‎‏‏‎‏‎‏‎‎‎‎&lt; 1 minute‎‏‎‎‏‎"</string>
+    <string name="time_left_for_app" msgid="3111996412933644358">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‎‎‎‎‏‎‎‎‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="TIME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ left today‎‏‎‎‏‎"</string>
+    <string name="title_app_suggestions" msgid="4185902664111965088">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‎‏‏‏‎‏‎‏‎‎‎‎‎‏‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‎‏‎‏‎‎‎‎‏‏‏‎‏‎‎‎‎‎‎App suggestions‎‏‎‎‏‎"</string>
+    <string name="all_apps_label" msgid="8542784161730910663">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‎‏‏‏‎‏‏‏‏‏‎‎‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎‏‏‏‎‎‎‏‏‏‎All apps‎‏‎‎‏‎"</string>
+    <string name="all_apps_prediction_tip" msgid="2672336544844936186">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‏‎‏‏‎‎‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‏‏‏‏‎‎‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‎‎Your predicted apps‎‏‎‎‏‎"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎‏‎‏‏‎‎‏‎‎‏‎‏‎‎‎‏‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‎‎Get app suggestions on the bottom row of your Home screen‎‏‎‎‏‎"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‎‏‏‏‎‎‏‎‏‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎‏‎‎‎‎‏‎‏‏‏‏‏‎‏‏‎Get app suggestions on favorites row of your Home screen‎‏‎‎‏‎"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‏‏‎‏‏‎‏‏‎‎‎‏‏‏‏‎‏‎‎‏‏‏‏‏‎‎‏‎‏‏‎‎‏‏‎‎‏‏‎‏‏‏‏‎‏‏‎‎‎‎Easily access your most-used apps right on the Home screen. Suggestions will change based on your routines. Apps on the bottom row will move up to your Home screen.‎‏‎‎‏‎"</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‏‎‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‎‏‎‏‏‏‎‎‏‏‎‎‎‏‎Easily access your most-used apps right on the Home screen. Suggestions will change based on your routines. Apps in favorites row will move to your Home screen.‎‏‎‎‏‎"</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‎‎‎‏‎‏‎‎‎‏‎‎‏‏‎‏‎‎‎‏‎‏‏‏‏‏‎‎‎‏‎‏‏‎‎‎‏‎‏‏‎‏‎‏‎‎‏‎‏‎‎‎Easily access your most-used apps, right on the Home screen. Suggestions will change based on your routines. Apps on the bottom row will move to a new folder.‎‏‎‎‏‎"</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‎‎‎‏‎‎‎‏‏‏‎‏‎Get app suggestions‎‏‎‎‏‎"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‏‏‎‎‎‏‎‏‎‏‎‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‏‎‏‏‎‏‏‎‎‎‏‎‎‎‏‏‎‏‎‏‏‎‏‏‎‎‏‎No thanks‎‏‎‎‏‎"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‎‎‎‎‎‎‏‏‏‎‎‎‏‎‏‎‏‎‏‏‏‏‎‎‎‏‎‏‎‏‏‏‎‎‏‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‏‎‎Settings‎‏‎‎‏‎"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‏‏‏‏‎‎‎‏‎‎‏‏‎‏‏‏‎Most-used apps appear here, and change based on routines‎‏‎‎‏‎"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‎‎‏‎‎‎‎‎‏‏‎‎‏‏‏‏‎‏‎‎‎‏‎‏‏‏‏‎‎‎‏‏‎‏‏‎‏‏‎‏‎‏‎‏‎‎‏‏‏‎‎‎‏‎Drag apps off the bottom row to get app suggestions‎‏‎‎‏‎"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‎‎‎‎‎‏‏‏‎‎‎‎‎‏‎‎‎‎‏‎‎‏‏‏‎‎‏‏‏‏‎‏‎‎‎‏‎‏‏‎‎‎‏‎‏‏‎‏‏‎‎‏‎‎App suggestions added to empty space‎‏‎‎‏‎"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‏‏‏‎‎‏‎‎‎‏‏‏‏‎‏‎‎‎‎‏‎‎App suggestions enabled‎‏‎‎‏‎"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎‎‏‎‏‎‏‎‎‏‏‏‎‎‏‎‏‎‏‎‎‏‏‏‎‏‏‎App suggestions are disabled‎‏‎‎‏‎"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‎‎‏‎‎‏‏‏‎‏‎‏‏‎‎‏‏‏‎‏‏‏‎‎‏‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‎‎‏‏‎Predicted app: ‎‏‎‎‏‏‎<xliff:g id="TITLE">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‏‎‎‎Make sure you swipe from the far-left edge.‎‏‎‎‏‎"</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‎‏‎‏‎‏‎‎‎‏‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‎‎‎‎‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‎‎‎‎‏‎‎Make sure you swipe from the left edge to the middle of the screen and let go.‎‏‎‎‏‎"</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‏‎‎‎‏‏‏‎‏‎‏‏‎‏‏‎‏‏‏‏‎‏‎‏‏‏‎‎‎‎‏‏‎‏‎‎That\'s it! Now try swiping from the right edge.‎‏‎‎‏‎"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‏‏‏‏‎‎‎‏‏‎‏‏‎‏‎‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‎‏‎‏‎‎‏‎‎‏‎‏‎‎‎‎‏‎Make sure you swipe from the far-right edge.‎‏‎‎‏‎"</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‎‎‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‎‎Make sure you swipe from the right edge to the middle of the screen and let go.‎‏‎‎‏‎"</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‏‎‏‎‎‎‎‏‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‎‏‏‏‎‎‏‎‎You completed the go back gesture. Next up, learn how to go Home.‎‏‎‎‏‎"</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‏‎‎‎‎‏‎‎‎‏‎‏‎‎‏‎‎‏‎‎‏‎‏‏‎‎‏‎‎‎‎‏‎‏‏‎Make sure you don\'t swipe too close to the bottom of the screen.‎‏‎‎‏‎"</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‎‏‏‏‎‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‏‎‎‏‏‏‏‏‎‎‏‎‎‎‏‎‎To change the sensitivity of the back gesture, go to Settings‎‏‎‎‏‎"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‎‏‏‏‎‏‎‏‏‏‎‎‎‎‏‏‏‎‎‏‏‏‏‎‎‏‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎‎Swipe to go back‎‏‎‎‏‎"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‏‏‏‎‎‎‏‏‏‏‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‎‏‎‎‏‏‏‎‎‎‎‏‏‎‎‎‏‏‏‎‏‎‏‏‎‏‎To go back to the last screen, swipe from the left or right edge to the middle of the screen.‎‏‎‎‏‎"</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‏‎‏‏‎‏‎‎‏‎‎Make sure you swipe up from the bottom edge of the screen.‎‏‎‎‏‎"</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‏‎‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‎‏‏‏‎‏‎‏‎Make sure you don\'t pause before letting go.‎‏‎‎‏‎"</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‎‏‏‏‎‏‎‎‏‎‎‏‏‎‏‎‎‏‎‎‏‏‏‏‎‎‎‎‏‎‏‏‏‏‎‎Make sure you swipe straight up.‎‏‎‎‏‎"</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‎‎‎‏‏‎‏‎‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‏‎‏‎‎‏‏‎‏‏‎‏‎‎‎‏‎‏‎‎‎‏‏‏‎‏‎You completed the go Home gesture. Next up, learn how to switch apps.‎‏‎‎‏‎"</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‏‏‏‎‎‎‎‏‎‏‎‏‎‎‏‏‏‎‏‎‏‎‎‎‎‎‏‎‎‎‏‏‏‎‏‎‏‏‏‎‏‏‎‎‎‎‏‏‎‎‏‏‎‎Swipe to go home‎‏‎‎‏‎"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‎‏‎‏‏‏‎‎‏‏‎‎‏‎‎‎‎‏‎‎‎‎‎‎‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‏‏‏‏‎‎Swipe up from the bottom of your screen. This gesture always takes you to the Home screen.‎‏‎‎‏‎"</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎‎‏‎‏‎‎‏‏‏‏‎‏‎‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‎‏‏‎‏‏‎‎‏‎‎‎‏‎‎‏‎Make sure you swipe up from the bottom edge of the screen.‎‏‎‎‏‎"</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‏‎‏‎‏‎‏‎‏‏‎‎‎‎‎‏‎‎‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‏‎‏‎‎‎‏‎‎‏‎Try holding the window for longer before releasing.‎‏‎‎‏‎"</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎‏‏‎‏‏‏‎‏‎‏‎‎‎‎‏‏‏‎‎‎‏‎‏‎‎‏‏‏‎‎‏‎‏‏‎‎‎‏‎‏‎‎‎‎‎‎‏‎‏‎‏‎Make sure you swipe straight up, then pause.‎‏‎‎‏‎"</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‎‏‎‏‎‎‏‎‏‏‎‎‎‏‏‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‎You completed the switch apps gesture. You\'re ready to use your phone!‎‏‎‎‏‎"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‎‎‏‏‎‎‎‏‎‏‎‏‏‎‎‎‏‏‏‎‎‏‏‎‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎‏‎‎‎‎‏‎‏‎‎‎‏‎‎Swipe to switch apps‎‏‎‎‏‎"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‎‏‎‏‏‏‎‎‏‎‎‏‎‏‎‎‎‎‏‎‎‏‏‏‎‎‏‏‏‏‏‎‎‎‎‏‏‏‎‎‏‏‏‎‏‏‏‏‏‏‎‏‎‎Swipe up from the bottom of your screen, hold, then release.‎‏‎‎‏‎"</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‎‎‎‏‏‏‎‎‎‏‎‎‏‎‏‏‎‏‎‏‎‏‎‏‏‏‎‏‎‏‏‏‎‏‏‎‏‏‎‎‎All set‎‏‎‎‏‎"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‏‏‏‎‎‏‏‎‏‎‏‎‏‏‏‏‎‎‎‎‏‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‎‎Next‎‏‎‎‏‎"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‎‏‎‏‎‎‏‎‏‏‎‏‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‎‎‏‏‎‎‎‎‏‎‏‎‎‎‏‏‎‏‎‏‎‏‎‏‏‏‎Done‎‏‎‎‏‎"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‎‎‏‎‏‏‎‎‏‎‎‏‏‏‎‏‏‎‏‎‎‏‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎Settings‎‏‎‎‏‎"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‎‎‏‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‎‎‏‏‎‎‏‏‎‎‎‏‏‎‎‏‎Try again‎‏‎‎‏‎"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‏‏‎‎‎‎Nice!‎‏‎‎‏‎"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‎‎‏‎‏‎‏‏‎‏‏‎‏‎‏‏‎‎‏‎‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‎‏‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎Tutorial ‎‏‎‎‏‏‎<xliff:g id="CURRENT">%1$d</xliff:g>‎‏‎‎‏‏‏‎/‎‏‎‎‏‏‎<xliff:g id="TOTAL">%2$d</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="action_share" msgid="2648470652637092375">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‎‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‎‎‎‏‎‏‏‏‎Share‎‏‎‎‏‎"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‎‏‏‎‏‎‏‎‏‏‏‎‏‎‏‎‏‎‏‎‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‎‎‏‏‏‏‎‎‎‏‎‏‎Screenshot‎‏‎‎‏‎"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‏‎‎‏‏‎‎‏‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎This action isn\'t allowed by the app or your organization‎‏‎‎‏‎"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‎‎‏‏‎‏‏‎‏‏‏‎‎‎‎‎‎‎‏‏‏‎‎‏‏‎‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‎‎‏‎‎‏‏‏‎‏‎‎Skip navigation tutorial?‎‏‎‎‏‎"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‎‏‏‎‏‎‎‎‏‏‎‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‎‏‏‎‎‏‎‎‏‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‎You can find this later in the Tips app‎‏‎‎‏‎"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‏‎‎‎‎‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‎Cancel‎‏‎‎‏‎"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎‏‏‎‎‎‎‎‏‎‏‏‎‎‏‏‎‎‏‎‏‎‎‏‏‏‏‎‎‎‏‎‏‎‎‎‎‎‏‎‏‎‎‏‏‎‎‎‎Skip‎‏‎‎‏‎"</string>
+</resources>
diff --git a/quickstep/res/values-es-rUS/strings.xml b/quickstep/res/values-es-rUS/strings.xml
index 5f5d0bdfe9..b882d75310 100644
--- a/quickstep/res/values-es-rUS/strings.xml
+++ b/quickstep/res/values-es-rUS/strings.xml
@@ -19,19 +19,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Pantalla dividida"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Fijar"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Formato libre"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Recientes"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"No hay elementos recientes"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Cerrar"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Configuración de uso de la app"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Borrar todo"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Apps recientes"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g> (<xliff:g id="REMAINING_TIME">%2$s</xliff:g>)"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; 1 minuto"</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"Tiempo restante: <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="title_app_suggestions" msgid="4185902664111965088">"Sugerencias de apps"</string>
+    <string name="title_app_suggestions" msgid="4185902664111965088">"Sugerencias de aplicaciones"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Todas las apps"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Predicción de tus apps"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Obtén sugerencias de aplicaciones en la fila inferior de la pantalla principal"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Obtén sugerencias de apps en la fila de favoritos de la pantalla principal"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Accede fácilmente en la pantalla principal a las apps que más usas. Las sugerencias cambiarán según tus rutinas. Las apps de la fila inferior se desplazarán hacia arriba en la pantalla principal."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Accede fácilmente en la pantalla principal a las apps que más usas. Las sugerencias cambiarán según tus rutinas. Se moverán a la pantalla principal las apps que estén en la fila de favoritos."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Accede fácilmente a las apps que más usas en la pantalla principal. Las sugerencias cambiarán según tus rutinas. Las apps de la fila inferior se moverán a una nueva carpeta."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Obtén sugerencias de aplicaciones"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"No, gracias"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Configuración"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Las apps que más se usan se muestran aquí y cambian según las rutinas"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Arrastra apps fuera de la fila inferior para obtener sugerencias"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Se agregaron sugerencias de aplicaciones a un espacio vacío"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Sugerencias de apps habilitadas"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Las sugerencias de aplicaciones están inhabilitadas"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicción de app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Asegúrate de deslizar el dedo bien desde el borde izquierdo."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Asegúrate de deslizar el dedo del borde izquierdo hacia el centro de la pantalla y, luego, suéltalo."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Eso es todo. Ahora desliza el dedo desde el borde derecho."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Asegúrate de deslizar el dedo bien desde el borde derecho."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Asegúrate de deslizar el dedo del borde derecho hacia el centro de la pantalla y, luego, suéltalo."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Completaste el gesto \"Atrás\". A continuación, obtén información para ir a la página principal."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Asegúrate de no hacerlo muy cerca de la parte inferior de la pantalla."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Cambia sensibilidad de gesto \"Atrás\" en Configuración"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Desliza el dedo para volver"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Desliza el dedo desde el borde derecho o izquierdo para volver a la última pantalla."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Asegúrate de deslizar el dedo hacia arriba desde la borde inferior de la pantalla."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Asegúrate de no detenerte antes de soltarlo."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Asegúrate de deslizar el dedo derecho hacia arriba."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Completaste el gesto para ir a la página principal. A continuación, obtén información para cambiar de app."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Desliza el dedo para ir a la página principal"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Desliza el dedo hacia arriba desde la parte inferior de la pantalla. Este gesto te llevará siempre a la pantalla principal."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Asegúrate de deslizar el dedo hacia arriba desde la borde inferior de la pantalla."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Prueba mantener presionada la ventana más tiempo antes de soltarla."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Asegúrate de deslizar el dedo derecho hacia arriba y, luego, detente."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Completaste el gesto para cambiar de app. El teléfono ya está listo para usar."</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Desliza el dedo para cambiar de app"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Desliza el dedo hacia arriba desde la parte inferior de la pantalla, mantenlo presionado y, luego, suéltalo."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Listo"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Siguiente"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Listo"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Configuración"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Reintentar"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"¡Genial!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Instructivo <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Compartir"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Captura de pantalla"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"La app o tu organización no permiten realizar esta acción"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"¿Omitir el instructivo de navegación?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Encuéntralo luego en app de sugerencias"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancelar"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Omitir"</string>
 </resources>
diff --git a/quickstep/res/values-es/strings.xml b/quickstep/res/values-es/strings.xml
index 329286b3bf..b299acfbcb 100644
--- a/quickstep/res/values-es/strings.xml
+++ b/quickstep/res/values-es/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Dividir pantalla"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Fijar"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Formato libre"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Aplicaciones recientes"</string>
-    <string name="recents_empty_message" msgid="7040467240571714191">"No hay elementos recientes"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Cerrar"</string>
+    <string name="recents_empty_message" msgid="7040467240571714191">"No hay nada reciente"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Ajustes de uso de la aplicación"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Borrar todo"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Aplicaciones recientes"</string>
@@ -34,4 +31,87 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Sugerencias de aplicaciones"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Todas las aplicaciones"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Predicción de aplicaciones"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Obtén sugerencias de aplicaciones en la fila inferior de la pantalla de inicio"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Recibe sugerencias de aplicaciones en la fila de aplicaciones favoritas de la pantalla de inicio"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Accede fácilmente a las aplicaciones que más usas desde la pantalla de inicio. Las sugerencias cambiarán según tus hábitos. Las aplicaciones de la fila inferior pasarán a mostrarse en la pantalla de inicio."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Accede fácilmente a las aplicaciones que más usas desde la pantalla de inicio. Las sugerencias cambiarán según tus hábitos. Las aplicaciones de la fila de aplicaciones favoritas se moverán a la pantalla de inicio."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Accede fácilmente a las aplicaciones que más usas desde la pantalla de inicio. Las sugerencias cambiarán según tus hábitos. Las aplicaciones de la fila inferior se pondrán en una carpeta nueva."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Sí, obtener sugerencias"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"No, gracias"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Ajustes"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Las aplicaciones que más usas aparecen aquí, y van variando según tus rutinas"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Arrastra aplicaciones de la fila inferior para ver sugerencias de aplicaciones"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Sugerencias de aplicaciones añadidas a espacios vacíos"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Sugerencias de aplicaciones habilitadas"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Las sugerencias de aplicaciones están inhabilitadas"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplicación sugerida: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
+    <skip />
+    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
+    <skip />
+    <string name="action_share" msgid="2648470652637092375">"Compartir"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Hacer captura"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"No puedes hacerlo porque la aplicación o tu organización no lo permiten"</string>
+    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
+    <skip />
+    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <skip />
 </resources>
diff --git a/quickstep/res/values-fa/strings.xml b/quickstep/res/values-fa/strings.xml
index cc26695a60..8172c48f2e 100644
--- a/quickstep/res/values-fa/strings.xml
+++ b/quickstep/res/values-fa/strings.xml
@@ -19,19 +19,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"تقسیم صفحه"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"پین"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Freeform"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"نمای کلی"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"بدون موارد اخیر"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"بستن"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"تنظیمات استفاده از برنامه"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"پاک کردن همه"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"برنامه‌های اخیر"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>، <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; ۱ دقیقه"</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"<xliff:g id="TIME">%1$s</xliff:g> باقی‌مانده برای امروز"</string>
-    <string name="title_app_suggestions" msgid="4185902664111965088">"برنامه‌های پیشنهادی"</string>
+    <string name="title_app_suggestions" msgid="4185902664111965088">"پیشنهادهای برنامه"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"همه برنامه‌ها"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"برنامه‌های پیش‌بینی‌شده"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"دریافت پیشنهادهای برنامه در ردیف پایین صفحه اصلی"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"دریافت «پیشنهاد برنامه» در ردیف موارد دلخواه صفحه اصلی"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"به‌راحتی در صفحه اصلی به پرکاربردترین برنامه‌ها دسترسی داشته باشید. پیشنهادها براساس روال‌هایتان تغییر خواهد کرد. برنامه‌های ردیف پایین در صفحه اصلی به بالا منتقل خواهند شد."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"به‌راحتی در صفحه اصلی به پرکاربردترین برنامه‌ها دسترسی داشته باشید. پیشنهادها براساس روال‌هایتان تغییر خواهد کرد. برنامه‌های موجود در ردیف موارد دلخواه به صفحه اصلی منتقل می‌شوند."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"به‌راحتی در صفحه اصلی به پرکاربردترین برنامه‌ها دسترسی داشته باشید. پیشنهادها براساس روال‌هایتان تغییر خواهد کرد. برنامه‌های ردیف پایین به پوشه جدیدی منتقل خواهند شد."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"دریافت پیشنهادهای برنامه"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"نه متشکرم"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"تنظیمات"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"پرکاربردترین برنامه‌ها اینجا ظاهر می‌شوند و براساس روال‌ها تغییر می‌کنند"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"برای دریافت پیشنهادهای برنامه، برنامه‌ها را به بیرون از ردیف پایین بکشید"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"«پیشنهاد برنامه» به فضای خالی اضافه شد"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"«پیشنهاد برنامه» فعال است"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"«پیشنهاد برنامه» غیرفعال است"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"برنامه پیش‌بینی‌شده: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"دقت کنید که از ابتدای لبه سمت چپ تند بکشید."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"دقت کنید که از لبه سمت چپ تند به وسط صفحه بکشید و رها کنید."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"تمام شد! اکنون از لبه سمت راست تند بکشید."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"دقت کنید که از ابتدای لبه سمت راست تند بکشید."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"دقت کنید که از لبه سمت راست تند به وسط صفحه بکشید و رها کنید."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"اشاره برگشتن را تکمیل کردید. مورد بعدی، با نحوه رفتن به «صفحه اصلی» آشنا شوید."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"دقت کنید که موقع تند کشیدن بیش‌از حد به پایین صفحه نزدیک نشوید."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"برای تغییر حساسیت اشاره برگشت، به «تنظیمات» بروید"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"تند بکشید تا به‌عقب برگردید"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"برای برگشتن به صفحه آخر، از لبه سمت چپ یا راست تند به وسط صفحه بکشید."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"دقت کنید که از لبه پایینی صفحه تند به بالا بکشید."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"دقت کنید که تا قبل‌از رها کردن، کشیدن را متوقف نکنید."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"دقت کنید که مستقیماً تند به بالا بکشید."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"اشاره رفتن به «صفحه اصلی» را تکمیل کردید. مورد بعدی، با نحوه جابه‌جا شدن بین برنامه‌ها آشنا شوید."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"تند کشیدن برای رفتن به صفحه اصلی"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"از پایین صفحه، تند به‌سمت بالا بکشید. این اشاره همیشه شما را به صفحه اصلی می‌برد."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"دقت کنید که از لبه پایینی صفحه تند به بالا بکشید."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"سعی کنید قبل‌از رها کردن، پنجره را برای مدت طولانی‌تری نگه دارید."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"دقت کنید که مستقیماً تند به بالا بکشید و سپس توقف کنید."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"اشاره جابه‌جا شدن بین برنامه‌ها را تکمیل کردید. آماده‌اید از تلفنتان استفاده کنید!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"تند کشیدن برای جابه‌جا شدن بین برنامه‌ها"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"از پایین صفحه‌نمایش تند به‌سمت بالا بکشید، نگه دارید، و سپس رها کنید."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"همه چیز آماده است"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"بعدی"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"تمام"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"تنظیمات"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"امتحان مجدد"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"عالی!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"آموزش گام‌به‌گام <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"هم‌رسانی"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"نماگرفت"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"برنامه یا سازمان شما اجازه نمی‌دهد این کنش انجام شود."</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"آموزش گام‌به‌گام پیمایش رد شود؟"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"می‌توانید آن را بعداً در برنامه «نکته‌ها» پیدا کنید"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"لغو"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"رد شدن"</string>
 </resources>
diff --git a/quickstep/res/values-fi/strings.xml b/quickstep/res/values-fi/strings.xml
index f43433e3a1..53044c1b86 100644
--- a/quickstep/res/values-fi/strings.xml
+++ b/quickstep/res/values-fi/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Jaettu näyttö"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Kiinnitä"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Vapaamuotoinen"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Viimeisimmät"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Ei viimeaikaisia kohteita"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Sulje"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Sovelluksen käyttöasetukset"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Poista kaikki"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Viimeisimmät sovellukset"</string>
@@ -34,4 +31,87 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Sovellusehdotukset"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Kaikki sovellukset"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Sovellusennusteet"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Näytä sovellusehdotuksia aloitusnäytön alimmaisella rivillä"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Näytä sovellusehdotuksia aloitusnäytön Suosikit-rivillä"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Voit avata käytetyimmät sovellukset kätevästi aloitusnäytöltä. Ehdotukset muuttuvat rutiiniesi perusteella. Alimmaisella rivillä olevat sovellukset siirretään aloitusnäytön yläosaan."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Voit avata käytetyimmät sovellukset kätevästi aloitusnäytöltä. Ehdotukset muuttuvat rutiiniesi perusteella. Suosikit-rivillä olevat sovellukset siirretään aloitusnäytölle."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Voit avata käytetyimmät sovellukset kätevästi aloitusnäytöltä. Ehdotukset muuttuvat rutiiniesi perusteella. Alimmaisella rivillä olevat sovellukset siirretään uuteen kansioon."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Näytä sovellusehdotuksia"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Ei kiitos"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Asetukset"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Käytetyimmät sovellukset näkyvät täällä ja muuttuvat rutiiniesi perusteella"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Siirrä sovelluksia pois alimmaiselta riviltä, niin voit saada sovellusehdotuksia"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Sovellusehdotuksia lisätty tyhjään kohtaan"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Sovellusehdotukset käytössä"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Sovellusehdotukset on poistettu käytöstä"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Ennakoitu sovellus: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
+    <skip />
+    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
+    <skip />
+    <string name="action_share" msgid="2648470652637092375">"Jaa"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Kuvakaappaus"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Sovellus tai organisaatio ei salli tätä toimintoa"</string>
+    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
+    <skip />
+    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <skip />
 </resources>
diff --git a/quickstep/res/values-fr-rCA/strings.xml b/quickstep/res/values-fr-rCA/strings.xml
index a9a1cffb6d..105edf54fd 100644
--- a/quickstep/res/values-fr-rCA/strings.xml
+++ b/quickstep/res/values-fr-rCA/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Écran divisé"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Épingler"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Forme libre"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Aperçu"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Aucun élément récent"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Fermer"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Paramètres d\'utilisation de l\'application"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Tout effacer"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Applications récentes"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Suggestions d\'applications"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Toutes les applications"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Vos prédictions d\'applications"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Obtenir des suggestions d\'applications dans la rangée du bas de votre écran d\'accueil"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Retrouvez des suggestions d\'applications dans la rangée des favoris de votre écran d\'accueil"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Accédez facilement aux applications que vous utilisez le plus, directement à l\'écran d\'accueil. Les suggestions changeront en fonction de vos habitudes. Les applications dans la rangée du bas seront déplacées vers votre écran d\'accueil."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Accédez facilement aux applications que vous utilisez le plus, directement à l\'écran d\'accueil. Les suggestions changeront en fonction de vos habitudes. Les applications dans la rangée des favoris seront déplacées vers votre écran d\'accueil."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Accédez facilement aux applications que vous utilisez le plus, directement à l\'écran d\'accueil. Les suggestions changeront en fonction de vos habitudes. Les applications dans la rangée du bas seront déplacées vers un nouveau dossier."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Obtenir des suggestions d\'applications"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Non merci"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Paramètres"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Les applications les plus utilisées s\'affichent ici et changent en fonction des habitudes"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Faites glisser des applications hors de la rangée du bas pour obtenir des suggestions d\'applications"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Applications suggérées ajoutées à l\'espace vide"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Les suggestions d\'applications sont activées"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Les suggestions d\'applications sont désactivées"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Application prédite : <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Assurez-vous de balayer l\'écran à partir de l\'extrémité gauche."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Assurez-vous de balayer l\'écran de l\'extrémité gauche jusqu\'au centre, puis de lever le doigt."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"C\'est tout! Maintenant, essayez à partir de la droite."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Assurez-vous de balayer l\'écran à partir de l\'extrémité droite."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Assurez-vous de balayer l\'écran de l\'extrémité droite jusqu\'au centre, puis de lever le doigt."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Vous avez terminé le geste de retour. Ensuite, vous apprendrez comment revenir à l\'écran d\'accueil."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Assurez-vous de ne pas balayer trop près du bas de l\'écran."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Modifiez la sensibilité du geste de retour dans Paramètres"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Balayez l\'écran pour revenir en arrière"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Pour revenir à l\'écran précédent, balayez l\'écran de l\'extrémité gauche ou droite vers le centre"</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Assurez-vous de balayer l\'écran à partir de l\'extrémité inférieure vers le haut."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Assurez-vous de ne pas interrompre le geste avant de lever le doigt."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Assurez-vous de balayer l\'écran en ligne droite vers le haut."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Vous avez terminé le geste de retour à l\'écran d\'accueil. Ensuite, vous apprendrez comment basculer entre les applications."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Balayer pour revenir à l\'écran d\'accueil"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Balayez l\'écran du bas vers le haut. Ce geste vous ramène toujours à l\'écran d\'accueil."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Assurez-vous de balayer l\'écran à partir de l\'extrémité inférieure vers le haut."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Essayez de tenir la fenêtre plus longtemps avant de relâcher."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Assurez-vous de balayer l\'écran vers le haut, puis de faire une pause."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Vous avez terminé le geste de basculement entre les applications. Vous êtes prêt à utiliser votre téléphone!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Balayer pour basculer entre les applications"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Balayez l\'écran de bas en haut, maintenez le doigt en place, puis relâchez-le."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Terminé"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Suivant"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Terminé"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Paramètres"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Réessayer"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bien!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Étape <xliff:g id="CURRENT">%1$d</xliff:g> sur <xliff:g id="TOTAL">%2$d</xliff:g> du tutoriel"</string>
+    <string name="action_share" msgid="2648470652637092375">"Partager"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Capture d\'écran"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"L\'application ou votre organisation n\'autorise pas cette action"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Ignorer le tutoriel sur la navigation?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Vous trouverez le tutoriel dans l\'application Astuces"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Annuler"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Ignorer"</string>
 </resources>
diff --git a/quickstep/res/values-gl/strings.xml b/quickstep/res/values-gl/strings.xml
index 356d10d5da..463b62898b 100644
--- a/quickstep/res/values-gl/strings.xml
+++ b/quickstep/res/values-gl/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Pantalla dividida"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Fixar"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Forma libre"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Visión xeral"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Non hai elementos recentes"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Pecha a aplicación"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Configuración do uso de aplicacións"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Borrar todo"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Apps recentes"</string>
@@ -34,4 +31,87 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Suxestións de aplicacións"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Todas as aplicacións"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"As túas aplicacións preditas"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Recibe suxestións de aplicacións na fila inferior da pantalla de inicio"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Recibe suxestións de aplicacións na fila de Favoritos da pantalla de inicio"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Accede facilmente desde a pantalla de inicio ás aplicacións que máis usas. As suxestións irán cambiando en función das túas rutinas. As aplicacións da fila inferior pasarán á pantalla de inicio."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Accede facilmente desde a pantalla de inicio ás aplicacións que máis usas. As suxestións irán cambiando en función das túas rutinas. As aplicacións da fila de Favoritos moveranse á túa pantalla de inicio."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Accede facilmente desde a pantalla de inicio ás aplicacións que máis usas. As suxestións irán cambiando en función das túas rutinas. As aplicacións da fila inferior pasarán a un cartafol novo."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Recibir suxestións de aplicacións"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Non, grazas"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Configuración"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"As aplicacións máis usadas aparecen aquí e van cambiando en función das túas rutinas"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Arrastra aplicacións desde a fila inferior para recibir suxestións de aplicacións"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Engadíronse suxestións de aplicacións ao espazo baleiro"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"As suxestións de aplicacións están activadas"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"As suxestións de aplicacións están desactivadas"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplicación predita: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
+    <skip />
+    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
+    <skip />
+    <string name="action_share" msgid="2648470652637092375">"Compartir"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Facer captura"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"A aplicación ou a túa organización non permite realizar esta acción"</string>
+    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
+    <skip />
+    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <skip />
 </resources>
diff --git a/quickstep/res/values-gu/strings.xml b/quickstep/res/values-gu/strings.xml
index 660ad87acc..e83cd1e89a 100644
--- a/quickstep/res/values-gu/strings.xml
+++ b/quickstep/res/values-gu/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"સ્ક્રીનને વિભાજિત કરો"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"પિન કરો"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"ફ્રિફોર્મ"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"ઝલક"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"તાજેતરની કોઈ આઇટમ નથી"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"બંધ કરો"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"ઍપ વપરાશનું સેટિંગ"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"બધું સાફ કરો"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"તાજેતરની ઍપ"</string>
@@ -34,4 +31,87 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"ઍપ સૂચનો"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"બધી ઍપ"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"તમારી પૂર્વાનુમાનિત ઍપ"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"તમારી હોમ સ્ક્રીનની નીચલી પંક્તિમાં ઍપના સુઝાવો મેળવો"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"તમારી હોમ સ્ક્રીનની મનપસંદ પંક્તિમાં ઍપના સુઝાવો મેળવો"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"તમારી સૌથી વધુ વપરાતી ઍપને સીધી હોમ સ્ક્રીન પરથી જ સરળતાથી ઍક્સેસ કરો. સૂચનો તમારા રૂટિનના આધારે બદલાશે. નીચેની પંક્તિમાં રહેલી ઍપ તમારી હોમ સ્ક્રીન પર ખસેડાશે."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"તમારી સૌથી વધુ વપરાતી ઍપને સીધી હોમ સ્ક્રીન પરથી જ સરળતાથી ઍક્સેસ કરો. સૂચનો તમારા રૂટિનના આધારે બદલાશે. મનપસંદ પંક્તિમાં રહેલી ઍપ તમારી હોમ સ્ક્રીન પર ખસેડાશે."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"તમારી સૌથી વધુ વપરાતી ઍપને સીધી હોમ સ્ક્રીન પરથી જ સરળતાથી ઍક્સેસ કરો. સૂચનો તમારા રૂટિનના આધારે બદલાશે. નીચેની પંક્તિમાં રહેલી ઍપ નવા ફોલ્ડરમાં ખસેડાશે."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"ઍપ અંગેના સુઝાવો મેળવો"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"ના, આભાર"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"સેટિંગ"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"સૌથી વધુ વપરાતી ઍપ અહીં દેખાય છે અને રૂટિનના આધારે બદલાય છે"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"ઍપ અંગેના સૂચનો મેળવવા માટે ઍપને નીચલી પંક્તિમાંથી બહાર ખેંચો"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"ઍપ અંગેના સૂચનો ખાલી જગ્યામાં ઉમેરાયા"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ઍપના સુઝાવો ચાલુ છે"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ઍપના સુઝાવો બંધ છે"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"પૂર્વાનુમાનિત ઍપ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
+    <skip />
+    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
+    <skip />
+    <string name="action_share" msgid="2648470652637092375">"શેર કરો"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"સ્ક્રીનશૉટ"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"ઍપ કે તમારી સંસ્થા દ્વારા આ ક્રિયા કરવાની મંજૂરી નથી"</string>
+    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
+    <skip />
+    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <skip />
 </resources>
diff --git a/quickstep/res/values-hr/strings.xml b/quickstep/res/values-hr/strings.xml
index ab56e57b50..bb5ddc240f 100644
--- a/quickstep/res/values-hr/strings.xml
+++ b/quickstep/res/values-hr/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Podijeljeni zaslon"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Prikvači"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Slobodni oblik"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Pregled"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Nema nedavnih stavki"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Zatvori"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Postavke upotrebe aplikacija"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Izbriši sve"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Nedavne aplikacije"</string>
@@ -34,4 +31,87 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Predložene aplikacije"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Sve aplikacije"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Vaše predviđene aplikacije"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Prijedloge aplikacija vidjet ćete u donjem retku početnog zaslona"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Primajte prijedloge aplikacija u retku omiljenih na početnom zaslonu"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Lako pristupite najčešće upotrebljavanim aplikacijama s početnog zaslona. Prijedlozi će se mijenjati na temelju vaših rutina. Aplikacije iz donjeg retka pomaknut će se na početni zaslon."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Lako pristupite najčešće upotrebljavanim aplikacijama s početnog zaslona. Prijedlozi će se mijenjati na temelju vaših rutina. Aplikacije koje se nalaze u retku omiljenih pomaknut će se na početni zaslon."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Lako pristupite najčešće upotrebljavanim aplikacijama s početnog zaslona. Prijedlozi će se mijenjati na temelju vaših rutina. Aplikacije iz donjeg retka pomaknut će se u novu mapu."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Predloži mi aplikacije"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Ne, hvala"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Postavke"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Ovdje se prikazuju najčešće upotrebljavane aplikacije i mijenjaju se na temelju rutina"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Povucite aplikacije iz donjeg retka da biste dobili prijedloge aplikacija"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Predložene aplikacije dodane u prazan prostor"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Predlaganje apl. omogućeno"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Predlaganje apl. onemogućeno"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predviđena aplikacija: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
+    <skip />
+    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
+    <skip />
+    <string name="action_share" msgid="2648470652637092375">"Podijeli"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Snimka zaslona"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikacija ili vaša organizacija ne dopuštaju ovu radnju"</string>
+    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
+    <skip />
+    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <skip />
 </resources>
diff --git a/quickstep/res/values-hy/strings.xml b/quickstep/res/values-hy/strings.xml
index 1656a1444d..40b2690f26 100644
--- a/quickstep/res/values-hy/strings.xml
+++ b/quickstep/res/values-hy/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Տրոհել էկրանը"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Ամրացնել"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Կամայական ձև"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Ընդհանուր տեղեկություններ"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Վերջին տարրեր չկան"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Փակել"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Հավելվածի օգտագործման կարգավորումներ"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Փակել բոլորը"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Վերջին օգտագործած հավելվածները"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Առաջարկվող հավելվածներ"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Բոլոր հավելվածները"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Ձեր կանխատեսված հավելվածները"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Ստացեք հավելվածների առաջարկներ հիմնական էկրանի ներքևում"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Ստացեք հավելվածների առաջարկներ հիմնական էկրանի «Ընտրանի» տողում"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Արագ բացեք հաճախ օգտագործվող հավելվածներն անմիջապես հիմնական էկրանից։ Առաջարկները կփոփոխվեն՝ կախված ձեր գործողություններից։ Ներքևում ցուցադրվող հավելվածները կտեղափոխվեն հիմնական էկրանի վերևի մաս։"</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Արագ բացեք հաճախ օգտագործվող հավելվածներն անմիջապես հիմնական էկրանից։ Առաջարկները կփոփոխվեն՝ կախված ձեր գործողություններից։ «Ընտրանի» տողի հավելվածները կտեղափոխվեն հիմնական էկրան։"</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Արագ բացեք հաճախ օգտագործվող հավելվածներն անմիջապես հիմնական էկրանից։ Առաջարկները կփոփոխվեն՝ կախված ձեր գործողություններից։ Ներքևում ցուցադրվող հավելվածները կտեղափոխվեն նոր պանակ։"</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Ստանալ հավելվածների առաջարկներ"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Ոչ, շնորհակալություն"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Կարգավորումներ"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Հաճախ օգտագործվող հավելվածները ցուցադրվում են այստեղ և փոփոխվում են ըստ ձեր գործողությունների հերթականության։"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Քաշեք հավելվածները ներքևի տողից՝ հավելվածների առաջարկները տեսնելու համար"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Առաջարկվող հավելվածները կավելացվեն ազատ տեղերում"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"«Առաջարկվող հավելվածներ» գործառույթը միացված է"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"«Առաջարկվող հավելվածներ» գործառույթն անջատված է"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Առաջարկվող հավելված՝ <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Համոզվեք, որ մատը սահեցնում եք էկրանի ձախ եզրից։"</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Սահեցրեք մատն էկրանի ձախ եզրից դեպի կենտրոն և բաց թողեք։"</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Ահա և վերջ։ Հիմա փորձեք սահեցնել մատն էկրանի աջ եզրից։"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Համոզվեք, որ մատը սահեցնում եք էկրանի աջ եզրից։"</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Սահեցրեք մատն էկրանի աջ եզրից դեպի կենտրոն և բաց թողեք։"</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Դուք սովորեցիք հետ գնալու ժեստը։ Այժմ սովորենք՝ ինչպես անցնել հիմնական էկրան։"</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Համոզվեք, որ մատը չափազանց մոտ չեք սահեցնում էկրանին ներքևի հատվածին։"</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Հետ գնալու ժեստի զգայունությունը փոփոխեք կարգավորումներում"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Սահեցրեք մատը՝ հետ գնալու համար"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Վերջին էկրան վերադառնալու համար էկրանի աջ կամ ձախ եզրից մատը սահեցրեք դեպի կենտրոն։"</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Համոզվեք, որ մատն էկրանի ներքևի եզրից վերև եք սահեցնում։"</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Համոզվեք, որ դադար չեք տալիս նախքան բաց թողնելը։"</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Համոզվեք, որ մատն ուղիղ վերև եք սահեցնում։"</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Դուք սովորեցիք հիմնական էկրան անցնելու ժեստը։ Այժմ սովորենք՝ ինչպես անցնել մի հավելվածից մյուսին։"</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Սահեցրեք մատը՝ հիմնական էկրան անցնելու համար"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Մատը սահեցրեք էկրանի ներքևից վերև։ Այս ժեստը բացում է հիմնական էկրանը։"</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Համոզվեք, որ մատն էկրանի ներքևի եզրից վերև եք սահեցնում։"</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Նախքան բաց թողնելը փորձեք հնարավորինս երկար պահել պատուհանը։"</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Համոզվեք, որ մատն ուղիղ վերև եք սահեցնում, այնուհետև դադար տվեք։"</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Դուք սովորեցիք մի հավելվածից մյուսին անցնելու ժեստը։ Այժմ հանգիստ կարող եք օգտագործել ձեր հեռախոսը։"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Մատը սահեցրեք՝ մյուս հավելվածին անցնելու համար"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Մատը սահեցրեք էկրանի ներքևից վերև, պահեք և բաց թողեք։"</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Պատրաստ է"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Առաջ"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Պատրաստ է"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Կարգավորումներ"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Նորից փորձեք"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Գերազանց է"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Ուղեցույց <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Կիսվել"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Սքրինշոթ անել"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Այս գործողությունն արգելված է հավելվածի կամ ձեր կազմակերպության կողմից"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Բաց թողնե՞լ նավիգացիայի ուղեցույցը"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Սա միշտ կգտնեք «Խորհուրդներ» հավելվածում"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Չեղարկել"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Բաց թողնել"</string>
 </resources>
diff --git a/quickstep/res/values-it/strings.xml b/quickstep/res/values-it/strings.xml
index 559fdb4b6e..5663f741d1 100644
--- a/quickstep/res/values-it/strings.xml
+++ b/quickstep/res/values-it/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Schermo diviso"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Blocca"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Forma libera"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Panoramica"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Nessun elemento recente"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Chiudi"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Impostazioni di utilizzo delle app"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Cancella tutto"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"App recenti"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"App suggerite"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Tutte le app"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Le app previste"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Visualizza app suggerite nella riga inferiore della schermata Home"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Visualizza app suggerite nella riga dei Preferiti della schermata Home"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Accedi facilmente alle app più utilizzate direttamente dalla schermata Home. I suggerimenti varieranno in base alle tue routine. Le app nella riga inferiore verranno spostate più in alto sulla schermata Home."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Accedi facilmente alle app più utilizzate direttamente dalla schermata Home. I suggerimenti varieranno in base alle tue routine. Le app nella riga dei Preferiti verranno spostate nella schermata Home."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Accedi facilmente alle app più utilizzate direttamente dalla schermata Home. I suggerimenti varieranno in base alle tue routine. Le app nella riga inferiore verranno spostate in una nuova cartella."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Visualizza app suggerite"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"No, grazie"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Impostazioni"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Le app più utilizzate vengono visualizzate qui e variano in base alle routine"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Trascina le app fuori dalla riga inferiore per visualizzare le app suggerite"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"App suggerite aggiunte a uno spazio vuoto"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"La funzionalità app suggerite è attiva"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"La funzionalità app suggerite è disattivata"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App prevista: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Assicurati di scorrere dall\'estremità del bordo sinistro."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Assicurati di scorrere dal bordo sinistro verso il centro dello schermo e solleva il dito."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"È tutto. Ora prova a scorrere dal bordo destro."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Assicurati di scorrere dall\'estremità del bordo destro."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Assicurati di scorrere dal bordo destro verso il centro dello schermo e solleva il dito."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Hai completato il gesto Indietro. Ora, impara come andare alla schermata Home."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Assicurati di non scorrere troppo vicino alla parte inferiore dello schermo."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Usa Impostazioni per cambiare sensibilità del gesto Indietro"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Scorri per tornare indietro"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Per tornare all\'ultima schermata, scorri dal bordo sinistro o destro verso il centro dello schermo."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Assicurati di scorrere verso l\'alto dal bordo inferiore dello schermo."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Assicurati di non fare pause prima di sollevare il dito."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Assicurati di scorrere verso l\'alto senza fermarti."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Hai completato il gesto Vai alla schermata Home. Ora, impara come passare da un\'app all\'altra."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Scorri per andare alla schermata Home"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Scorri verso l\'alto dalla parte inferiore dello schermo; così arrivi sempre alla schermata Home."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Assicurati di scorrere verso l\'alto dal bordo inferiore dello schermo."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Prova a tenere premuta la finestra più a lungo prima di rilasciarla."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Assicurati di scorrere verso l\'alto senza fermarti, poi fai una pausa."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Hai completato il gesto Cambia app. Ora puoi usare il telefono."</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Scorri per passare da un\'app all\'altra"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Scorri verso l\'alto dalla parte inferiore dello schermo, tieni premuto e rilascia."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Fatto"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Avanti"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Fine"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Impostazioni"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Riprova"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bene!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Condividi"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Questa azione non è consentita dall\'app o dall\'organizzazione"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Saltare il tutorial di navigazione?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Quando vuoi è nell\'app Suggerimenti"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Annulla"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Salta"</string>
 </resources>
diff --git a/quickstep/res/values-iw/strings.xml b/quickstep/res/values-iw/strings.xml
index 58cab4e0a9..0e1f47181c 100644
--- a/quickstep/res/values-iw/strings.xml
+++ b/quickstep/res/values-iw/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"מסך מפוצל"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"הצמדה"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"מצב חופשי"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"מסכים אחרונים"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"אין פריטים אחרונים"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"סגירה"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"הגדרות שימוש באפליקציה"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"ניקוי הכול"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"אפליקציות אחרונות"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"הצעות לאפליקציות"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"כל האפליקציות"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"האפליקציות החזויות שלך"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"קבלת הצעות לאפליקציות בשורה התחתונה של מסך הבית"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"קבלת הצעות לאפליקציות בשורת המועדפות של מסך הבית"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"גישה נוחה לאפליקציות הכי נפוצות ישירות ממסך הבית. ההצעות ישתנו בהתאם להרגלי השימוש שלך. אפליקציות שמופיעות בשורה התחתונה יעברו למעלה למסך הבית."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"גישה נוחה לאפליקציות שהשתמשת בהן הכי הרבה, ישירות ממסך הבית. ההצעות ישתנו בהתאם להרגלי השימוש שלך. אפליקציות בשורת המועדפות יועברו למסך הבית."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"גישה נוחה לאפליקציות הכי נפוצות ישירות ממסך הבית. ההצעות ישתנו בהתאם להרגלי השימוש שלך. אפליקציות שמופיעות בשורה התחתונה יעברו למעלה למסך הבית."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"קבלת הצעות לאפליקציות"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"לא, תודה"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"הגדרות"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"רוב האפליקציות הכי נפוצות מופיעות כאן ומשתנות בהתאם להרגלי השימוש שלך"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"יש לגרור אפליקציות מהשורה התחתונה כדי לקבל הצעות לאפליקציות"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"הצעות לאפליקציות נוספו לאזור ריק"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ההצעות לאפליקציות מופעלות"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ההצעות לאפליקציות מושבתות"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"האפליקציות החזויות: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"חשוב לוודא שמחליקים מהקצה הימני."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"חשוב לוודא שמחליקים מהקצה הימני למרכז המסך ואז משחררים."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"זהו! עכשיו צריך לנסות להחליק מהקצה השמאלי."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"חשוב לוודא שמחליקים מהקצה השמאלי."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"חשוב לוודא שמחליקים מהקצה השמאלי למרכז המסך ואז משחררים."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"השלמת את תנועת החזרה. בשלב הבא לומדים איך לעבור למסך הבית."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"חשוב לוודא שלא מחליקים קרוב מדי לתחתית המסך."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"כדי לשנות את מידת הרגישות של תנועת החזרה, יש לעבור להגדרות"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"יש להחליק כדי לחזור"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"כדי לחזור למסך הקודם, יש להחליק מהקצה השמאלי או הימני למרכז המסך."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"חשוב לוודא שמחליקים למעלה מהקצה התחתון של המסך."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"חשוב לוודא שלא מחכים לפני שמשחררים."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"חשוב לוודא שמחליקים ישר למעלה."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"השלמת את תנועת המעבר למסך הבית. בשלב הבא לומדים איך לעבור בין אפליקציות."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"יש להחליק כדי לעבור למסך הבית"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"החלקה למעלה מתחתית המסך תמיד תעביר אותך למסך הבית."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"חשוב לוודא שמחליקים למעלה מהקצה התחתון של המסך."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"יש לנסות להחזיק את החלון למשך זמן ארוך יותר לפני שמשחררים."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"חשוב לוודא שמחליקים ישר למעלה ואז מחכים."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"השלמת את תנועת המעבר בין האפליקציות. הטלפון מוכן לשימוש!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"יש להחליק כדי לעבור בין אפליקציות"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"יש להחליק למעלה מתחתית המסך, להחזיק ולאחר מכן לשחרר."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"הכול מוכן"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"הבא"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"סיום"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"הגדרות"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"אפשר לנסות שוב"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"איזה יופי!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"מדריך <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"שיתוף"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"צילום מסך"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"האפליקציה או הארגון שלך אינם מתירים את הפעולה הזאת"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"לדלג על המדריך לניווט?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"אפשר למצוא את המדריך באפליקציית הטיפים"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"ביטול"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"דילוג"</string>
 </resources>
diff --git a/quickstep/res/values-kn/strings.xml b/quickstep/res/values-kn/strings.xml
index 52782610b9..94efa31b3b 100644
--- a/quickstep/res/values-kn/strings.xml
+++ b/quickstep/res/values-kn/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"ಪರದೆಯನ್ನು ಬೇರ್ಪಡಿಸಿ"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"ಪಿನ್ ಮಾಡಿ"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"ಮುಕ್ತಸ್ವರೂಪ"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"ಅವಲೋಕನ"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"ಯಾವುದೇ ಇತ್ತೀಚಿನ ಐಟಂಗಳಿಲ್ಲ"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"ಮುಚ್ಚಿ"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"ಆ್ಯಪ್‌ ಬಳಕೆಯ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"ಎಲ್ಲವನ್ನೂ ತೆರವುಗೊಳಿಸಿ"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"ಇತ್ತೀಚಿನ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"ಆ್ಯಪ್ ಸಲಹೆಗಳು"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"ಎಲ್ಲಾ ಆ್ಯಪ್‌ಗಳು"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"ನಿಮ್ಮ ಸಂಭವನೀಯ ಆ್ಯಪ್‌ಗಳು"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"ನಿಮ್ಮ ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಭಾಗದ ಸಾಲಿನಲ್ಲಿ ಆ್ಯಪ್ ಸಲಹೆಗಳನ್ನು ಪಡೆಯಿರಿ"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"ನಿಮ್ಮ ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನ ಮೆಚ್ಚಿನವುಗಳ ಸಾಲಿನಲ್ಲಿ ಆ್ಯಪ್ ಸಲಹೆಗಳನ್ನು ಪಡೆಯಿರಿ"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿಯೇ ನೀವು ಹೆಚ್ಚು ಬಳಸಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ಸುಲಭವಾಗಿ ಪ್ರವೇಶಿಸಿ. ನಿಮ್ಮ ದಿನಚರಿಯನ್ನು ಆಧರಿಸಿ ಸಲಹೆಗಳು ಬದಲಾಗುತ್ತವೆ. ಕೆಳಭಾಗದ ಸಾಲಿನಲ್ಲಿನ ಆ್ಯಪ್‌ಗಳು ನಿಮ್ಮ ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ ಚಲಿಸುತ್ತವೆ."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿಯೇ ನೀವು ಹೆಚ್ಚು ಬಳಸಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ಸುಲಭವಾಗಿ ಪ್ರವೇಶಿಸಿ. ನಿಮ್ಮ ದಿನಚರಿಯನ್ನು ಆಧರಿಸಿ ಸಲಹೆಗಳು ಬದಲಾಗುತ್ತವೆ. ಮೆಚ್ಚಿನವುಗಳ ಸಾಲಿನಲ್ಲಿನ ಆ್ಯಪ್‌ಗಳು ನಿಮ್ಮ ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ಗೆ ಚಲಿಸುತ್ತವೆ."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿಯೇ ನೀವು ಹೆಚ್ಚು ಬಳಸಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ಸುಲಭವಾಗಿ ಪ್ರವೇಶಿಸಿ. ನಿಮ್ಮ ದಿನಚರಿಯನ್ನು ಆಧರಿಸಿ ಸಲಹೆಗಳು ಬದಲಾಗುತ್ತವೆ. ಕೆಳಭಾಗದ ಸಾಲಿನಲ್ಲಿನ ಆ್ಯಪ್‌ಗಳು ಹೊಸ ಫೋಲ್ಡರ್‌ಗೆ ಚಲಿಸುತ್ತವೆ."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"ಆ್ಯಪ್ ಸಲಹೆಗಳನ್ನು ಪಡೆಯಿರಿ"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"ಬೇಡ"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"ಹೆಚ್ಚು ಬಳಸಿದ ಆ್ಯಪ್‌ಗಳು ಇಲ್ಲಿ ಕಾಣಿಸುತ್ತವೆ ಮತ್ತು ದಿನಚರಿಯನ್ನು ಆಧರಿಸಿ ಬದಲಾಗುತ್ತದೆ"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"ಆ್ಯಪ್ ಸಲಹೆಗಳನ್ನು ಪಡೆಯಲು, ಆ್ಯಪ್‌ಗಳನ್ನು ಕೆಳಭಾಗದ ಸಾಲಿನಿಂದ ಡ್ರ್ಯಾಗ್ ಮಾಡಿ"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"ಆ್ಯಪ್ ಸಲಹೆಗಳನ್ನು ಖಾಲಿ ಸ್ಥಳಕ್ಕೆ ಸೇರಿಸಲಾಗಿದೆ"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ಆ್ಯಪ್ ಸಲಹೆಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ಆ್ಯಪ್ ಸಲಹೆಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ಶಿಫಾರಸು ಮಾಡಿದ ಆ್ಯಪ್: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ನೀವು ದೂರದ ಎಡ ಅಂಚಿನಿಂದ ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ಎಡ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ ಹಾಗೂ ನಿಮ್ಮ ಬೆರಳನ್ನು ಮೇಲೆತ್ತಿ."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"ಅಷ್ಟೇ! ಈಗ ಬಲ ತುದಿಯಿಂದ ಸ್ವೈಪ್ ಮಾಡಲು ಪ್ರಯತ್ನಿಸಿ."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ನೀವು ದೂರದ ಬಲ ಅಂಚಿನಿಂದ ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ಬಲ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ ಹಾಗೂ ನಿಮ್ಮ ಬೆರಳನ್ನು ಮೇಲೆತ್ತಿ."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"ನೀವು ಗೋ ಬ್ಯಾಕ್ ಗೆಸ್ಚರ್ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದ್ದೀರಿ. ಮುಂದೆ, ಹೋಮ್‌ಗೆ ಹೋಗುವುದು ಹೇಗೆ ಎಂದು ತಿಳಿಯಿರಿ."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ನೀವು ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಭಾಗಕ್ಕೆ ಹೆಚ್ಚು ಹತ್ತಿರ ಸ್ವೈಪ್ ಮಾಡದಂತೆ ನೋಡಿಕೊಳ್ಳಿ."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ಬ್ಯಾಕ್ ಗೆಸ್ಚರ್‌ನ ಸೂಕ್ಷ್ಮತೆ ಬದಲಾಯಿಸಲು, ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಹೋಗಿ"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"ಹಿಂದಕ್ಕೆ ಹೋಗಲು ಸ್ವೈಪ್ ಮಾಡಿ"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"ಕೊನೆಯ ಸ್ಕ್ರೀನ್‌ಗೆ ಹಿಂತಿರುಗಲು, ಎಡ ಅಥವಾ ಬಲ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಗಿನ ಅಂಚಿನಿಂದ ನೀವು ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ವಿರಾಮಗೊಳಿಸದೆ ನಿಮ್ಮ ಬೆರಳನ್ನು ಸ್ಕ್ರೀನ್‌ನಿಂದ ಮೇಲೆತ್ತಿ."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ನೀವು ನೇರವಾಗಿ ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"ನೀವು ಗೋ ಹೋಮ್ ಗೆಸ್ಚರ್ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದ್ದೀರಿ. ಮುಂದೆ, ಆ್ಯಪ್‌ಗಳನ್ನು ಬದಲಾಯಿಸುವುದು ಹೇಗೆ ಎಂದು ತಿಳಿಯಿರಿ."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ಗೆ ಹಿಂತಿರುಗಲು ಸ್ವೈಪ್ ಮಾಡಿ"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಗಿನಿಂದ ಮೇಲೆ ಸ್ವೈಪ್ ಮಾಡಿ. ಈ ಗೆಸ್ಚರ್ ಯಾವಾಗಲೂ ನಿಮ್ಮನ್ನು ಹೋಮ್‌ ಸ್ಕ್ರೀನ್‌ಗೆ ಕರೆದೊಯ್ಯುತ್ತದೆ."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಗಿನ ಅಂಚಿನಿಂದ ನೀವು ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"ಬೆರಳನ್ನು ಮೇಲೆತ್ತುವ ಮೊದಲು ವಿಂಡೋವನ್ನು ಹೆಚ್ಚು ಸಮಯ ಹಿಡಿದಿಡಲು ಪ್ರಯತ್ನಿಸಿ."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"ನೀವು ನೇರವಾಗಿ ಸ್ವೈಪ್ ಮಾಡಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ, ನಂತರ ವಿರಾಮಗೊಳಿಸಿ."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"ನೀವು ಆ್ಯಪ್‌ಗಳನ್ನು ಬದಲಾಯಿಸುವ ಗೆಸ್ಚರ್ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದ್ದೀರಿ. ನಿಮ್ಮ ಫೋನ್ ಬಳಸಲು ನೀವು ಸಿದ್ಧರಿದ್ದೀರಿ!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ಆ್ಯಪ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಲು ಸ್ವೈಪ್ ಮಾಡಿ"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ನಿಮ್ಮ ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಗಿನಿಂದ ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ, ಒತ್ತಿ ಹಿಡಿಯಿರಿ, ನಂತರ ಬಿಟ್ಟು ಬಿಡಿ."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"ಸಂಪೂರ್ಣ ಸಿದ್ಧವಾಗಿದೆ"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"ಮುಂದೆ"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"ಮುಗಿದಿದೆ"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ಪುನಃ ಪ್ರಯತ್ನಿಸಿ"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ಚೆನ್ನಾಗಿದೆ!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"ಟ್ಯುಟೋರಿಯಲ್ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"ಹಂಚಿಕೊಳ್ಳಿ"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"ಸ್ಕ್ರೀನ್‌ಶಾಟ್"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"ಆ್ಯಪ್ ಅಥವಾ ನಿಮ್ಮ ಸಂಸ್ಥೆಯು ಈ ಕ್ರಿಯೆಯನ್ನು ಅನುಮತಿಸುವುದಿಲ್ಲ"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"ನ್ಯಾವಿಗೇಷನ್ ಟ್ಯುಟೋರಿಯಲ್ ಸ್ಕಿಪ್ ಮಾಡಿ?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Tips ಆ್ಯಪ್‌ನಲ್ಲಿ ಇದನ್ನು ನಂತರ ಕಾಣಬಹುದು"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"ರದ್ದುಮಾಡಿ"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"ಸ್ಕಿಪ್ ಮಾಡಿ"</string>
 </resources>
diff --git a/quickstep/res/values-ky/strings.xml b/quickstep/res/values-ky/strings.xml
index 4018e57dcc..f84a5c3608 100644
--- a/quickstep/res/values-ky/strings.xml
+++ b/quickstep/res/values-ky/strings.xml
@@ -19,19 +19,99 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Экранды бөлүү"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Кадап коюу"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Эркин форма режими"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Сереп салуу"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Акыркы колдонмолор жок"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Жабуу"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Колдонмону пайдалануу жөндөөлөрү"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Баарын тазалоо"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Акыркы колдонмолор"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>, <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; 1 мүнөт"</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"Бүгүн <xliff:g id="TIME">%1$s</xliff:g> мүнөт калды"</string>
-    <string name="title_app_suggestions" msgid="4185902664111965088">"Колдонмо сунуштары"</string>
+    <string name="title_app_suggestions" msgid="4185902664111965088">"Сунушталган колдонмолор"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Бардык колдонмолор"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Божомолдонгон колдонмолоруңуз"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Сунушталган колдонмолор башкы экрандын ылдый жагында көрүнөт."</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Сунушталган колдонмолор башкы экрандагы тандалмалардын катарында көрүнөт."</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Көп колдонулган колдонмолор башкы экранда жайгашып, алардын тизмеси маал-маалы менен өзгөрүп турат. Ылдый жакта жайгашкан тилкедеги колдонмолор башкы экранга жылдырылат."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Көп иштетилген колдонмолорго Башкы экрандан оңой кириңиз. Сунуштар тартиптин негизинде өзгөрөт. Тандалмалардын катарындагы колдонмолор башкы экраныңызга жылдырылат."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Көп колдонулган колдонмолор башкы экранда жайгашып, алардын тизмеси маал-маалы менен өзгөрүп турат. Ылдый жакта жайгашкан тилкедеги колдонмолор жаңы папкага жылдырылат."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Сунушталган колдонолорду алуу"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Жок, рахмат"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Жөндөөлөр"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Көп иштетилген колдонмолор ушул жерде көрүнүп, тартиптин негизинде өзгөрөт"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Сунуштарды алып туруу үчүн, ылдый жактагы тилкедеги колдонмолорду сүйрөп келиңиз"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Сунушталган колдонмолор бош жерге кошулат"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Сунушталган колдонмолор функциясы иштетилди"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Сунушталган колдонмолор функциясы өчүрүлгөн"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Божомолдонгон колдонмо: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
+    <skip />
+    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
+    <skip />
+    <string name="action_share" msgid="2648470652637092375">"Бөлүшүү"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Скриншот"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Бул аракетти аткарууга колдонмо же ишканаңыз тыюу салган"</string>
+    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
+    <skip />
+    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <skip />
 </resources>
diff --git a/quickstep/res/values-lo/strings.xml b/quickstep/res/values-lo/strings.xml
index e406b7083d..1b2e787de6 100644
--- a/quickstep/res/values-lo/strings.xml
+++ b/quickstep/res/values-lo/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"ແບ່ງໜ້າຈໍ"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"ປັກໝຸດ"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"ຮູບແບບອິດສະຫລະ"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"ພາບຮວມ"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"ບໍ່ມີລາຍການຫຼ້າສຸດ"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"ປິດ"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"ການຕັ້ງຄ່າການນຳໃຊ້ແອັບ"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"ລຶບລ້າງທັງໝົດ"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"ແອັບຫຼ້າສຸດ"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"ການແນະນຳແອັບ"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"ແອັບທັງໝົດ"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"ແອັບທີ່ຄາດເດົາໄວ້ແລ້ວຂອງທ່ານ"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"ຮັບການແນະນຳແອັບຢູ່ແຖວລຸ່ມສຸດຂອງໜ້າຈໍຫຼັກທ່ານ"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"ຮັບການແນະນຳແອັບຢູ່ແຖວລາຍການທີ່ມັກຂອງໜ້າຈໍຫຼັກຂອງທ່ານ"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"ເຂົ້າເຖິງແອັບທີ່ທ່ານໃຊ້ຫຼາຍທີ່ສຸດໄດ້ຢ່າງງ່າຍດາຍທັນທີຈາກໜ້າຈໍຫຼັກ. ການແນະນຳຈະປ່ຽນແປງຕາມການນຳໃຊ້ປະຈຳຂອງທ່ານ. ແອັບຢູ່ແຖວລຸ່ມສຸດຈະຍ້າຍຂຶ້ນໄປໃສ່ໜ້າຈໍຫຼັກຂອງທ່ານ."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"ເຂົ້າເຖິງແອັບທີ່ທ່ານໃຊ້ຫຼາຍທີ່ສຸດໄດ້ຢ່າງງ່າຍດາຍທັນທີຈາກໜ້າຈໍຫຼັກ. ການແນະນຳຈະປ່ຽນແປງຕາມການນຳໃຊ້ປະຈຳຂອງທ່ານ. ຕອນນີ້ແອັບໃນລາຍການທີ່ມັກຈະຍ້າຍໄປໃສ່ໜ້າຈໍຫຼັກຂອງທ່ານ."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"ເຂົ້າເຖິງແອັບທີ່ທ່ານໃຊ້ຫຼາຍທີ່ສຸດໄດ້ຢ່າງງ່າຍດາຍທັນທີຈາກໜ້າຈໍຫຼັກ. ການແນະນຳຈະປ່ຽນແປງຕາມການນຳໃຊ້ປະຈຳຂອງທ່ານ. ແອັບຢູ່ແຖວລຸ່ມສຸດຈະຍ້າຍໄປໂຟນເດີໃໝ່."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"ຮັບການແນະນຳແອັບ"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"ບໍ່, ຂອບໃຈ"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"ການຕັ້ງຄ່າ"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"ແອັບທີ່ໃຊ້ຫຼາຍທີ່ສຸດຈະປາກົດຢູ່ບ່ອນນີ້ ແລະ ປ່ຽນໄປຕາມການນຳໃຊ້ປະຈຳ"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"ລາກແອັບຈາກແຖບລຸ່ມສຸດເພື່ອຮັບການແນະນຳແອັບ"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"ເພີ່ມການແນະນຳແອັບໃສ່ພື້ນທີ່ຫວ່າງແລ້ວ"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ເປີດການນຳໃຊ້ການແນະນຳແອັບແລ້ວ"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ປິດການນຳໃຊ້ການແນະນຳແອັບແລ້ວ"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ແອັບທີ່ຄາດເດົາໄວ້: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ກະລຸນາກວດສອບວ່າທ່ານປັດຈາກຂອບຊ້າຍສຸດ."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ກະລຸນາກວດສອບວ່າທ່ານປັດຈາກຂອບຊ້າຍໄປຫາທາງກາງຂອງຈໍແລ້ວປ່ອຍ."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"ແລ້ວໆ! ຕອນນີ້ໃຫ້ລອງປັດຈາກຂອບຂວາເບິ່ງ."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ກະລຸນາກວດສອບວ່າທ່ານປັດຈາກຂອບຂວາສຸດ."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ກະລຸນາກວດສອບວ່າທ່ານປັດຈາກຂອບຂວາໄປຫາທາງກາງຂອງຈໍແລ້ວປ່ອຍ."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"ທ່ານໃຊ້ທ່າທາງກັບຄືນສຳເລັດແລ້ວ. ຕໍ່ໄປ, ມາສຶກສາວິທີໄປໜ້າຫຼັກ."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ກະລຸນາກວດສອບວ່າທ່ານບໍ່ໄດ້ປັດໃກ້ກັບທາງລຸ່ມຂອງໜ້າຈໍເກີນໄປ."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ເພື່ອປ່ຽນຄວາມລະອຽດອ່ອນຂອງທ່າທາງກັບຄືນ, ໃຫ້ໄປຫາການຕັ້ງຄ່າ"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"ປັດເພື່ອກັບຄືນ"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"ເພື່ອກັບໄປໜ້າຈໍຫຼ້າສຸດ, ໃຫ້ປັດຈາກຂອບຊ້າຍ ຫຼື ຂວາໄປຫາທາງກາງຂອງໜ້າຈໍ."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ກະລຸນາກວດສອບວ່າທ່ານປັດຂຶ້ນຈາກຂອບລຸ່ມສຸດຂອງໜ້າຈໍ."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ກະລຸນາກວດສອບວ່າທ່ານບໍ່ຢຸດຊົ່ວຄາວກ່ອນປ່ອຍນິ້ວ."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ກະລຸນາກວດສອບວ່າທ່ານປັດຂຶ້ນໄປຊື່ໆ."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"ທ່ານໃຊ້ທ່າທາງໄປໜ້າຫຼັກສຳເລັດແລ້ວ. ຕໍ່ໄປ, ມາສຶກສາວິທີສະຫຼັບແອັບ."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"ປັດເພື່ອໄປໜ້າຫຼັກ"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"ປັດຂຶ້ນມາຈາກລຸ່ມສຸດຂອງໜ້າຈໍທ່ານ. ທ່າທາງນີ້ຈະພາທ່ານໄປໂຮມສະກຣີນສະເໝີ."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ກະລຸນາກວດສອບວ່າທ່ານປັດຂຶ້ນຈາກຂອບລຸ່ມສຸດຂອງໜ້າຈໍ."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"ລອງກົດໃສ່ໜ້າຈໍຄ້າງໄວ້ດົນຂຶ້ນກ່ອນປ່ອຍນິ້ວ."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"ກະລຸນາກວດສອບວ່າທ່ານປັດຂຶ້ນຊື່ໆ, ຈາກນັ້ນຢຸດຊົ່ວຄາວ."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"ທ່ານໃຊ້ທ່າທາງສະຫຼັບແອັບສຳເລັດແລ້ວ. ທ່ານພ້ອມໃຊ້ໂທລະສັບຂອງທ່ານແລ້ວ!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ປັດເພື່ອສະຫຼັບແອັບ"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ປັດຂຶ້ນຈາກລຸ່ມສຸດຂອງໜ້າຈໍທ່ານ, ຈາກນັ້ນປ່ອຍ."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"ທຸກຢ່າງພ້ອມແລ້ວ"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"ຕໍ່ໄປ"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"ແລ້ວໆ"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ການຕັ້ງຄ່າ"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ລອງໃໝ່"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ດີ!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"ການສອນການນຳໃຊ້ທີ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"ແບ່ງປັນ"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"ຮູບໜ້າຈໍ"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"ແອັບ ຫຼື ອົງການຂອງທ່ານບໍ່ອະນຸຍາດໃຫ້ໃຊ້ຄຳສັ່ງນີ້"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"ຂ້າມການສອນການນຳໃຊ້ການນຳທາງບໍ?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"ທ່ານສາມາດຊອກສ່ວນນີ້ພາຍຫຼັງໃນແອັບເຄັດລັບ"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"ຍົກເລີກ"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"ຂ້າມ"</string>
 </resources>
diff --git a/quickstep/res/values-ml/strings.xml b/quickstep/res/values-ml/strings.xml
index 2e02e80fa8..17ba6e1fd8 100644
--- a/quickstep/res/values-ml/strings.xml
+++ b/quickstep/res/values-ml/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"സ്‌ക്രീൻ വിഭജിക്കുക"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"പിൻ ചെയ്യുക"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"ഫ്രീഫോം"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"അവലോകനം"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"സമീപകാല ഇനങ്ങൾ ഒന്നുമില്ല"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"അവസാനിപ്പിക്കുക"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"ആപ്പ് ഉപയോഗ ക്രമീകരണം"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"എല്ലാം മായ്‌ക്കുക"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"സമീപകാല ആപ്പുകൾ"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"ആപ്പ് നിർദ്ദേശങ്ങൾ"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"എല്ലാ ആപ്പുകളും"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"നിങ്ങളുടെ പ്രവചിക്കപ്പെട്ട ആപ്പുകൾ"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"നിങ്ങളുടെ ഹോം സ്‌ക്രീനിന്റെ താഴത്തെ നിരയിൽ ആപ്പ് നിർദ്ദേശങ്ങൾ നേടുക"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"നിങ്ങളുടെ ഹോം സ്‌ക്രീനിന്റെ \'പ്രിയപ്പെട്ടവ\' വരിയിൽ ആപ്പ് നിർദ്ദേശങ്ങൾ നേടുക"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"നിങ്ങൾ ഏറ്റവും കൂടുതൽ ഉപയോഗിച്ച ആപ്പുകൾ ഹോം സ്ക്രീനിൽ നിന്ന് തന്നെ എളുപ്പത്തിൽ ആക്‌സസ് ചെയ്യൂ. നിങ്ങളുടെ ദിനചര്യകളുടെ അടിസ്ഥാനത്തിൽ നിർദ്ദേശങ്ങൾ മാറും. താഴത്തെ നിരയിലുള്ള ആപ്പുകൾ നിങ്ങളുടെ ഹോം സ്‌ക്രീനിലേക്ക് നീങ്ങും."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"നിങ്ങൾ ഏറ്റവും കൂടുതൽ ഉപയോഗിച്ച ആപ്പുകൾ ഹോം സ്ക്രീനിൽ നിന്ന് തന്നെ എളുപ്പത്തിൽ ആക്‌സസ് ചെയ്യൂ. നിങ്ങളുടെ ദിനചര്യകളുടെ അടിസ്ഥാനത്തിൽ നിർദ്ദേശങ്ങൾ മാറും. \'പ്രിയപ്പെട്ടവ\' വരിയിലുള്ള ആപ്പുകൾ നിങ്ങളുടെ ഹോം സ്‌ക്രീനിലേക്ക് നീങ്ങും."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"നിങ്ങൾ ഏറ്റവും കൂടുതൽ ഉപയോഗിച്ച ആപ്പുകൾ ഹോം സ്ക്രീനിൽ നിന്ന് തന്നെ എളുപ്പത്തിൽ ആക്‌സസ് ചെയ്യൂ. നിങ്ങളുടെ ദിനചര്യകളുടെ അടിസ്ഥാനത്തിൽ നിർദ്ദേശങ്ങൾ മാറും. താഴത്തെ നിരയിലുള്ള ആപ്പുകൾ പുതിയൊരു ഫോൾഡറിലേക്ക് നീങ്ങും."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"ആപ്പ് നിർദ്ദേശങ്ങൾ നേടുക"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"വേണ്ട"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"ക്രമീകരണം"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"ഏറ്റവുമധികം ഉപയോഗിക്കുന്ന ആപ്പുകൾ ഇവിടെ ദൃശ്യമാകും, ദിനചര്യയ്ക്ക് അനുസരിച്ച് അത് മാറുകയും ചെയ്യും"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"ആപ്പ് നിർദ്ദേശങ്ങൾ നേടാൻ താഴത്തെ നിരയിലെ ആപ്പുകൾ വലിച്ചിടുക"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"ആപ്പ് നിർദ്ദേശങ്ങൾ ഒഴിഞ്ഞ സ്ഥലത്തേക്ക് ചേർത്തു"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ആപ്പ് നിർദ്ദേശങ്ങൾ പ്രവർത്തനക്ഷമമാക്കി"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ആപ്പ് നിർദ്ദേശങ്ങൾ പ്രവർത്തനരഹിതമാക്കി"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"പ്രവചിച്ച ആപ്പ്: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ഇടത്തേയറ്റത്തെ അരികിൽ നിന്ന് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പാക്കുക."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ഇടത്തേ അരികിൽ നിന്ന് സ്‌ക്രീനിന്റെ മധ്യഭാഗത്തേക്ക് സ്വെെപ്പ് ചെയ്‌ത് വിടുക."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"അത്ര മാത്രം! ഇനി വലത്തേ അരികിൽ നിന്ന് സ്വെെപ്പ് ചെയ്യൂ."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"വലത്തേയറ്റത്തെ അരികിൽ നിന്ന് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പാക്കുക."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"വലത്തേ അരികിൽ നിന്ന് സ്‌ക്രീനിന്റെ മധ്യഭാഗത്തേക്ക് സ്വെെപ്പ് ചെയ്‌ത് വിടുക."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"മടങ്ങുക ജെസ്ച്ചർ നിങ്ങൾ പൂർത്തിയാക്കി. അടുത്തത്, ഹോമിലേക്ക് പോകുന്നതെങ്ങനെയെന്ന് മനസ്സിലാക്കുക."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"സ്‌ക്രീനിന്റെ ഏറ്റവും അടിഭാഗത്തേക്ക് സ്വെെപ്പ് ചെയ്യുന്നില്ലെന്ന് ഉറപ്പാക്കുക."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ബാക്ക്ജെസ്റ്ററിന്റെ സെൻസിറ്റിവിറ്റി മാറ്റാൻ ക്രമീകരണത്തിൽ പോകൂ"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"മടങ്ങാൻ സ്വെെപ്പ് ചെയ്യുക"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"മുൻ സ്‌ക്രീനിലേക്ക് മടങ്ങാൻ, ഇടതോ വലതോ അരികിൽ നിന്ന് സ്‌ക്രീനിന്റെ നടുവിലേക്ക് സ്വെെപ്പ് ചെയ്യുക."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"സ്‌ക്രീനിന്റെ താഴത്തെ അരികിൽ നിന്ന് മുകളിലേക്ക് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പാക്കുക."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"വിടുന്നതിന് മുമ്പ് നിങ്ങൾ താൽക്കാലികമായി നിർത്തുന്നില്ലെന്ന് ഉറപ്പാക്കുക."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"നേരെ മുകളിലേക്ക് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പിക്കുക."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"ഹോമിലേക്ക് പോകുക ജെസ്‌ച്ചർ നിങ്ങൾ പൂർത്തിയാക്കി. അടുത്തത്, എങ്ങനെ ആപ്പുകൾ മാറാമെന്ന് മനസ്സിലാക്കുക."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"ഹോമിലേക്ക് പോകാൻ സ്വെെപ്പ് ചെയ്യുക"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"സ്‌ക്രീനിന്റെ താഴെ നിന്ന് മുകളിലേക്ക് സ്വൈപ്പ് ചെയ്യൂ. ഈ ജെസ്ച്ചർ എപ്പോഴും ഹോം സ്‌ക്രീനിലേക്ക് നയിക്കുന്നു."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"സ്‌ക്രീനിന്റെ താഴത്തെ അരികിൽ നിന്ന് മുകളിലേക്ക് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പാക്കുക."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"റിലീസ് ചെയ്യുന്നതിന് മുമ്പ് വിൻഡോ കൂടുതൽ സമയം ഹോൾഡ് ചെയ്യാൻ ശ്രമിക്കുക."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"നേരെ മുകളിലേക്ക് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പാക്കുക, ശേഷം താൽക്കാലികമായി നിർത്തുക."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"ആപ്പുകൾ മാറുക ജെസ്‌ച്ചർ നിങ്ങൾ പൂർത്തിയാക്കി. ഫോൺ ഉപയോഗിക്കാൻ നിങ്ങൾ തയ്യാറാണ്!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ആപ്പുകൾ മാറാൻ സ്വെെപ്പ് ചെയ്യുക"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"സ്‌ക്രീനിന്റെ താഴെ നിന്ന് മുകളിലേക്ക് സ്വൈപ്പ് ചെയ്‌ത് പിടിച്ച ശേഷം വിടുക."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"എല്ലാം സജ്ജീകരിച്ചു"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"അടുത്തത്"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"പൂർത്തിയായി"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ക്രമീകരണം"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"വീണ്ടും ശ്രമിക്കുക"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"കൊള്ളാം!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"ട്യൂട്ടോറിയൽ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"പങ്കിടുക"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"സ്ക്രീൻഷോട്ട്"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"ഈ നടപടി എടുക്കുന്നത് ആപ്പോ നിങ്ങളുടെ സ്ഥാപനമോ അനുവദിക്കുന്നില്ല"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"നാവിഗേഷൻ ട്യൂട്ടോറിയൽ ഒഴിവാക്കണോ?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"നുറുങ്ങുകൾ ആപ്പിൽ ഇത് പിന്നീട് കാണാനാകും"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"റദ്ദാക്കുക"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"ഒഴിവാക്കുക"</string>
 </resources>
diff --git a/quickstep/res/values-mn/strings.xml b/quickstep/res/values-mn/strings.xml
index 5de8602022..5bc925b7a7 100644
--- a/quickstep/res/values-mn/strings.xml
+++ b/quickstep/res/values-mn/strings.xml
@@ -19,19 +19,99 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Дэлгэцийг хуваах"</string>
-    <string name="recent_task_option_pin" msgid="7929860679018978258">"Тогтоох"</string>
+    <string name="recent_task_option_pin" msgid="7929860679018978258">"Бэхлэх"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Чөлөөтэй хувьсах"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Тойм"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Сүүлийн үеийн зүйл алга"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Хаах"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Апп ашиглалтын тохиргоо"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Бүгдийг устгах"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Саяхны аппууд"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>, <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; 1 минут"</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"Өнөөдөр <xliff:g id="TIME">%1$s</xliff:g> үлдсэн"</string>
-    <string name="title_app_suggestions" msgid="4185902664111965088">"Аппын зөвлөмж"</string>
+    <string name="title_app_suggestions" msgid="4185902664111965088">"Санал болгож буй аппууд"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Бүх апп"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Таны таамагласан аппууд"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Үндсэн нүүрнийхээ доод мөрөнд санал болгож буй аппуудыг аваарай"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Үндсэн нүүрний дуртай мөрнөөсөө санал болгож буй аппуудыг аваарай"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Хамгийн их ашигладаг аппууддаа Үндсэн нүүрнээс хялбархан хандаарай. Санал болгож буй аппуудыг таны хэвшлээс хамаарч өөрчилнө. Доод мөрөнд буй аппуудыг таны Үндсэн нүүр лүү дээш зөөнө."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Хамгийн их ашигладаг аппууддаа Үндсэн нүүрнээсээ хялбархан хандаарай. Санал болголтыг таны хэвшлээс хамааран өөрчилнө. Дуртай мөрөнд буй аппуудыг таны үндсэн нүүр лүү зөөнө."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Хамгийн их ашигладаг аппууддаа Үндсэн нүүрнээс хялбархан хандаарай. Санал болгож буй аппуудыг таны хэвшлээс хамаарч өөрчилнө. Доод мөрөнд буй аппуудыг шинэ фолдер луу зөөнө."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Санал болгож буй аппуудыг авах"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Үгүй, баярлалаа"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Тохиргоо"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Хамгийн их ашигладаг аппуудыг энд харуулах бөгөөд хэвшлээс хамаарч өөрчилдөг"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Санал болгож буй аппуудыг авахын тулд доод мөрөөс аппуудыг чирж гаргаарай"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Санал болгож буй аппуудыг хоосон зайд нэмсэн"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Санал болгож буй аппуудыг идэвхжүүлсэн"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Санал болгож буй аппуудыг идэвхгүй болгосон"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Таамаглаж буй апп: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
+    <skip />
+    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
+    <skip />
+    <string name="action_share" msgid="2648470652637092375">"Хуваалцах"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Дэлгэцийн агшин дарах"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Энэ үйлдлийг апп эсвэл танай байгууллага зөвшөөрдөггүй"</string>
+    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
+    <skip />
+    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <skip />
 </resources>
diff --git a/quickstep/res/values-ne/strings.xml b/quickstep/res/values-ne/strings.xml
index 60e9bd5313..d9272a1f46 100644
--- a/quickstep/res/values-ne/strings.xml
+++ b/quickstep/res/values-ne/strings.xml
@@ -19,19 +19,99 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"स्क्रिन विभाजन गर्नुहोस्"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"पिन गर्नुहोस्"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"फ्रिफर्म"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"परिदृश्य"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"हालसालैको कुनै पनि वस्तु छैन"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"बन्द गर्नुहोस्"</string>
-    <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"अनुप्रयोगको उपयोगका सेटिङहरू"</string>
+    <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"एपको उपयोगका सेटिङहरू"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"सबै खाली गर्नुहोस्"</string>
-    <string name="accessibility_recent_apps" msgid="4058661986695117371">"हालसालैका अनुप्रयोगहरू"</string>
+    <string name="accessibility_recent_apps" msgid="4058661986695117371">"हालसालैका एपहरू"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>, <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; १ मिनेट"</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"आज: <xliff:g id="TIME">%1$s</xliff:g> बाँकी"</string>
-    <string name="title_app_suggestions" msgid="4185902664111965088">"अनुप्रयोगसम्बन्धी सुझावहरू"</string>
-    <string name="all_apps_label" msgid="8542784161730910663">"सबै अनुप्रयोगहरू"</string>
-    <string name="all_apps_prediction_tip" msgid="2672336544844936186">"तपाईंका पूर्वानुमानित अनुप्रयोगहरू"</string>
+    <string name="title_app_suggestions" msgid="4185902664111965088">"एपसम्बन्धी सुझावहरू"</string>
+    <string name="all_apps_label" msgid="8542784161730910663">"सबै एपहरू"</string>
+    <string name="all_apps_prediction_tip" msgid="2672336544844936186">"तपाईंका पूर्वानुमानित एपहरू"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"तपाईंको गृह स्क्रिनको पुछारको पङ्क्तिमा सिफारिस गरिएका एपहरू प्राप्त गर्नुहोस्"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"आफ्नो होम स्क्रिनको मन पर्ने नामक पङ्क्तिमा सिफारिस गरिएका एपहरू प्राप्त गर्नुहोस्"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"गृह स्क्रिनबाटै आफूले सबैभन्दा बढी प्रयोग गर्ने एप सजिलै चलाउनुहोस्। सिफारिस गरिने एपहरूको क्रम तपाईंले एप प्रयोग गर्ने समयतालिकाअनुसार बदलिने छ। फेदको पङ्क्तिमा रहेका एपहरू तपाईंको गृह स्क्रिनको सिरानमा सर्ने छन्।"</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"आफूले सबैभन्दा बढी प्रयोग गर्ने एपहरू गृह स्क्रिनबाटै सजिलैसँग खोल्नुहोस्। सिफारिस गरिने एपहरूको क्रम तपाईंको दिनचर्याअनुसार बदलिने छ। मन पर्ने नामक पङ्क्तिमा रहेका एपहरू सारेर होम स्क्रिनमा लगिने छन्।"</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"गृह स्क्रिनबाटै आफूले सबैभन्दा बढी प्रयोग गर्ने एप सजिलै चलाउनुहोस्। सिफारिस गरिने एपहरूको क्रम तपाईंले एप प्रयोग गर्ने समयतालिकाअनुसार बदलिने छ। फेदको पङ्क्तिमा रहेका एपहरू एउटा नयाँ फोल्डरमा सर्ने छन्।"</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"सिफारिस गरिएका एपहरू प्राप्त गर्नुहोस्"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"पर्दैन धन्यवाद"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"सेटिङ"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"सबैभन्दा बढी प्रयोग हुने एपहरू यहाँ देखिन्छन् र यी एपहरूको क्रम तपाईंले एप प्रयोग गर्ने समयतालिकाअनुसार बदलिरहन्छ"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"सिफारिस गरिएका एपहरू प्राप्त गर्न फेदको पङ्क्तिमा रहेका एपहरू ड्र्याग गरी हटाउनुहोस्"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"खाली ठाउँमा सिफारिस गरिएका एपहरू थपिए"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"सिफारिस गरिएका एपहरू देखाउने सुविधा सक्षम पारिएका छन्"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"सिफारिस गरिएका एपहरू देखाउने सुविधा असक्षम पारिएको छ"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"पूर्वानुमान गरिएको एप: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
+    <skip />
+    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
+    <skip />
+    <string name="action_share" msgid="2648470652637092375">"सेयर गर्नुहोस्"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"स्क्रिनसट"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"यो एप वा तपाईंको सङ्गठनले यो कारबाही गर्ने अनुमति दिँदैन"</string>
+    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
+    <skip />
+    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <skip />
 </resources>
diff --git a/quickstep/res/values-nl/strings.xml b/quickstep/res/values-nl/strings.xml
index 8032567e1c..fd297d6318 100644
--- a/quickstep/res/values-nl/strings.xml
+++ b/quickstep/res/values-nl/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Gesplitst scherm"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Vastzetten"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Vrije vorm"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Overzicht"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Geen recente items"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Sluiten"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Instellingen voor app-gebruik"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Alles wissen"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Recente apps"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"App-suggesties"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Alle apps"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Je voorspelde apps"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"App-suggesties ontvangen op de onderste rij van je startscherm"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"App-suggesties ontvangen op de rij met favorieten op het startscherm"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Open je meestgebruikte apps gemakkelijk vanaf het startscherm. De suggesties veranderen op basis van je routines. Apps op de onderste rij worden naar je startscherm verplaatst."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Open je meestgebruikte apps gemakkelijk vanaf het startscherm. De suggesties veranderen op basis van je routines. Apps op de rij met favorieten worden naar het startscherm verplaatst."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Open je meestgebruikte apps gemakkelijk vanaf het startscherm. De suggesties veranderen op basis van je routines. Apps op de onderste rij worden naar een nieuwe map verplaatst."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"App-suggesties ontvangen"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Nee, bedankt"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Instellingen"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"De meestgebruikte apps worden hier weergegeven en kunnen veranderen op basis van je routines"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Sleep apps weg van de onderste rij om app-suggesties te ontvangen"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"App-suggesties toegevoegd aan lege ruimte"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"App-suggesties zijn ingeschakeld"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"App-suggesties zijn uitgeschakeld"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Voorspelde app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Swipe helemaal vanaf de linkerrand."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Swipe vanaf de linkerrand naar het midden van het scherm en laat los."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Dat is alles. Swipe nu vanaf de rechterrand."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Swipe helemaal vanaf de rechterrand."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Swipe vanaf de rechterrand naar het midden van het scherm en laat los."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Je hebt het gebaar Terug voltooid. Ontdek nu hoe je naar het startscherm gaat."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Swipe niet te dicht bij de onderkant van het scherm."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Open Instellingen om de gevoeligheid van Terug te wijzigen"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Swipe om terug te gaan"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Swipe vanaf de linker- of rechterrand naar het midden om terug te gaan naar het vorige scherm."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Swipe vanaf de onderrand van het scherm omhoog."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pauzeer niet voordat je loslaat."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Swipe recht omhoog."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Je hebt het gebaar Naar startscherm voltooid. Ontdek nu hoe je tussen apps schakelt."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Swipe om naar het startscherm te gaan"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Swipe omhoog vanaf de onderkant van het scherm. Met dit gebaar ga je altijd naar het startscherm."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Swipe vanaf de onderrand van het scherm omhoog."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Houd het venster langer vast voordat je loslaat."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Swipe recht omhoog en pauzeer dan."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Je hebt het gebaar Schakelen tussen apps voltooid. Je kunt nu je telefoon gebruiken."</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe om tussen apps te schakelen"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swipe omhoog vanaf de onderkant van het scherm, houd vast en laat dan los."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Klaar"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Volgende"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Klaar"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Instellingen"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Opnieuw"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Dat gaat lekker."</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Delen"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Deze actie wordt niet toegestaan door de app of je organisatie"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Navigatietutorial overslaan?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Je vindt dit later terug in de app Tips"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Annuleren"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Overslaan"</string>
 </resources>
diff --git a/quickstep/res/values-or/strings.xml b/quickstep/res/values-or/strings.xml
index 2ebec4e7c7..eeb2475df5 100644
--- a/quickstep/res/values-or/strings.xml
+++ b/quickstep/res/values-or/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"ସ୍କ୍ରୀନ୍‌କୁ ଭାଗ କରନ୍ତୁ"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"ପିନ୍‍"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"ଫ୍ରିଫର୍ମ"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"ସଂକ୍ଷିପ୍ତ ବିବରଣ"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"କୌଣସି ସାମ୍ପ୍ରତିକ ଆଇଟମ୍ ନାହିଁ"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"ବନ୍ଦ କରନ୍ତୁ"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"ଆପ୍‍ ବ୍ୟବହାର ସେଟିଂସ୍‍"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"ସବୁ ଖାଲି କରନ୍ତୁ"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"ବର୍ତ୍ତମାନର ଆପ୍‌"</string>
@@ -34,4 +31,87 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"ଆପ୍ ପରାମର୍ଶଗୁଡ଼ିକ"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"ସମସ୍ତ ଆପ୍ସ"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"ଆପଣ ପୂର୍ବାନୁମାନ କରିଥିବା ଆପ୍ସ"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"ଆପଣଙ୍କ ମୂଳ ସ୍କ୍ରିନର ତଳ ଧାଡ଼ିରେ ଆପ୍ ପରାମର୍ଶଗୁଡ଼ିକ ପାଆନ୍ତୁ"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"ଆପଣଙ୍କ ମୂଳ ସ୍କ୍ରିନର ପସନ୍ଦର ଧାଡ଼ିରେ ଆପ୍ ପରାମର୍ଶଗୁଡ଼ିକ ପାଆନ୍ତୁ"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"ଆପଣଙ୍କର ସବୁଠାରୁ ଅଧିକ-ବ୍ୟବହୃତ ଆପଗୁଡ଼ିକୁ ସିଧା ମୂଳ ସ୍କ୍ରିନରେ ସହଜରେ ଆକ୍ସେସ୍ କରନ୍ତୁ। ଆପଣଙ୍କ ରୁଟିନଗୁଡ଼ିକ ଆଧାରରେ ପରାମର୍ଶଗୁଡ଼ିକ ପରିବର୍ତ୍ତିତ ହେବ। ତଳ ଧାଡ଼ିରେ ଥିବା ଆପଗୁଡ଼ିକ ଆପଣଙ୍କ ମୂଳ ସ୍କ୍ରିନକୁ ମୁଭ୍ କରିଯିବ।"</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"ମୂଳ ସ୍କ୍ରିନରେ ହିଁ ଆପଣଙ୍କର ସବୁଠାରୁ ଅଧିକ-ବ୍ୟବହୃତ ଆପଗୁଡ଼ିକୁ ସହଜରେ ଆକ୍ସେସ୍ କରନ୍ତୁ। ଆପଣଙ୍କ ରୁଟିନଗୁଡ଼ିକ ଆଧାରରେ ପରାମର୍ଶଗୁଡ଼ିକ ବଦଳିବ। ଆପଣଙ୍କ ମୂଳ ସ୍କ୍ରିନକୁ ପସନ୍ଦର ଧାଡ଼ିରେ ଥିବା ଆପଗୁଡ଼ିକ ମୁଭ୍ ହେବ।"</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"ଆପଣଙ୍କର ସବୁଠାରୁ ଅଧିକ-ବ୍ୟବହୃତ ଆପଗୁଡ଼ିକୁ, ସିଧା ମୂଳ ସ୍କ୍ରିନରେ ସହଜରେ ଆକ୍ସେସ୍ କରନ୍ତୁ। ଆପଣଙ୍କ ରୁଟିନଗୁଡ଼ିକ ଆଧାରରେ ପରାମର୍ଶଗୁଡ଼ିକ ପରିବର୍ତ୍ତିତ ହେବ। ତଳ ଧାଡ଼ିରେ ଥିବା ଆପଗୁଡ଼ିକ ଏକ ନୂଆ ଫୋଲ୍ଡରକୁ ମୁଭ୍ କରିଯିବ।"</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"ଆପ୍ ପରାମର୍ଶଗୁଡ଼ିକ ପାଆନ୍ତୁ"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"ନାହିଁ, ଥାଉ"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"ସେଟିଂସ୍"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"ସବୁଠାରୁ ଅଧିକ-ବ୍ୟବହୃତ ଆପଗୁଡ଼ିକ ଏଠାରେ ଦେଖାଯାଏ ଏବଂ ରୁଟିନଗୁଡ଼ିକ ଆଧାରରେ ପରିବର୍ତ୍ତିତ ହୋଇଥାଏ"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"ଆପ୍ ପରାମର୍ଶଗୁଡ଼ିକ ପାଇବାକୁ ଆପଗୁଡ଼ିକୁ ତଳ ଧାଡ଼ିରୁ ଟାଣି ଆଣନ୍ତୁ"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"ଆପ୍ ପରାମର୍ଶଗୁଡ଼ିକ ଖାଲି ସ୍ଥାନରେ ଯୋଗ କରାଯାଇଛି"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ଆପ୍ ପରାମର୍ଶଗୁଡ଼ିକୁ ସକ୍ଷମ କରାଯାଇଛି"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ଆପ୍ ପରାମର୍ଶଗୁଡ଼ିକୁ ଅକ୍ଷମ କରାଯାଇଛି"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ପୂର୍ବାନୁମାନ କରାଯାଇଥିବା ଆପ୍: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
+    <skip />
+    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
+    <skip />
+    <string name="action_share" msgid="2648470652637092375">"ସେୟାର୍ କରନ୍ତୁ"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"ସ୍କ୍ରିନସଟ୍"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"ଆପ୍ କିମ୍ବା ଆପଣଙ୍କ ସଂସ୍ଥା ଦ୍ୱାରା ଏହି କାର୍ଯ୍ୟକୁ ଅନୁମତି ଦିଆଯାଇ ନାହିଁ"</string>
+    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
+    <skip />
+    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <skip />
 </resources>
diff --git a/quickstep/res/values-pa/strings.xml b/quickstep/res/values-pa/strings.xml
index 58c0d2afa4..4b7fd3170b 100644
--- a/quickstep/res/values-pa/strings.xml
+++ b/quickstep/res/values-pa/strings.xml
@@ -19,19 +19,99 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"ਸਪਲਿਟ ਸਕ੍ਰੀਨ"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"ਪਿੰਨ ਕਰੋ"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"ਫ੍ਰੀਫਾਰਮ"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"ਰੂਪ-ਰੇਖਾ"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"ਕੋਈ ਹਾਲੀਆ ਆਈਟਮਾਂ ਨਹੀਂ"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"ਬੰਦ ਕਰੋ"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"ਐਪ ਵਰਤੋਂ ਦੀਆਂ ਸੈਟਿੰਗਾਂ"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"ਸਭ ਕਲੀਅਰ ਕਰੋ"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"ਹਾਲੀਆ ਐਪਾਂ"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>, <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; 1 ਮਿੰਟ"</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"ਅੱਜ <xliff:g id="TIME">%1$s</xliff:g> ਬਾਕੀ"</string>
-    <string name="title_app_suggestions" msgid="4185902664111965088">"ਐਪ ਸੰਬੰਧੀ ਸੁਝਾਅ"</string>
+    <string name="title_app_suggestions" msgid="4185902664111965088">"ਐਪ ਸੁਝਾਅ"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"ਸਾਰੀਆਂ ਐਪਾਂ"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"ਤੁਹਾਡੀਆਂ ਪੂਰਵ ਅਨੁਮਾਨਿਤ ਐਪਾਂ"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"ਆਪਣੀ ਹੋਮ ਸਕ੍ਰੀਨ ਦੀ ਹੇਠਲੀ ਕਤਾਰ \'ਤੇ ਐਪ ਸੁਝਾਅ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"ਆਪਣੀ ਹੋਮ ਸਕ੍ਰੀਨ ਦੀ ਮਨਪਸੰਦ ਕਤਾਰ \'ਤੇ ਐਪ ਸੁਝਾਅ ਹਾਸਲ ਕਰੋ"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਆਪਣੀਆਂ ਸਭ ਤੋਂ ਵੱਧ ਵਰਤੀਆਂ ਗਈਆਂ ਐਪਾਂ ਤੱਕ ਆਸਾਨੀ ਨਾਲ ਪਹੁੰਚ ਕਰੋ। ਸੁਝਾਅ ਤੁਹਾਡੇ ਨਿਯਮਬੱਧ ਕੰਮਾਂ ਦੇ ਆਧਾਰ \'ਤੇ ਬਦਲਣਗੇ। ਹੇਠਲੀ ਕਤਾਰ ਵਾਲੀਆਂ ਐਪਾਂ ਤੁਹਾਡੀ ਹੋਮ ਸਕ੍ਰੀਨ ਵੱਲ ਉੱਪਰ ਆ ਜਾਣਗੀਆਂ।"</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਆਪਣੀਆਂ ਸਭ ਤੋਂ ਵੱਧ ਵਰਤੀਆਂ ਗਈਆਂ ਐਪਾਂ ਤੱਕ ਆਸਾਨੀ ਨਾਲ ਪਹੁੰਚ ਕਰੋ। ਸੁਝਾਅ ਤੁਹਾਡੇ ਨਿਯਮਬੱਧ ਕੰਮਾਂ ਦੇ ਆਧਾਰ \'ਤੇ ਬਦਲਣਗੇ। ਮਨਪਸੰਦ ਕਤਾਰ ਵਿਚਲੀਆਂ ਐਪਾਂ ਤੁਹਾਡੀ ਹੋਮ ਸਕ੍ਰੀਨ ਉੱਪਰ ਆ ਜਾਣਗੀਆਂ।"</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਆਪਣੀਆਂ ਸਭ ਤੋਂ ਵੱਧ ਵਰਤੀਆਂ ਗਈਆਂ ਐਪਾਂ ਤੱਕ ਆਸਾਨੀ ਨਾਲ ਪਹੁੰਚ ਕਰੋ। ਸੁਝਾਅ ਤੁਹਾਡੇ ਨਿਯਮਬੱਧ ਕੰਮਾਂ ਦੇ ਆਧਾਰ \'ਤੇ ਬਦਲਣਗੇ। ਹੇਠਲੀ ਕਤਾਰ ਵਾਲੀਆਂ ਐਪਾਂ ਇੱਕ ਨਵੇਂ ਫੋਲਡਰ ਵਿੱਚ ਚਲੀਆਂ ਜਾਣਗੀਆਂ।"</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"ਐਪ ਸੁਝਾਅ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"ਨਹੀਂ ਧੰਨਵਾਦ"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"ਸੈਟਿੰਗਾਂ"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"ਸਭ ਤੋਂ ਵੱਧ ਵਰਤੀਆਂ ਗਈਆਂ ਐਪਾਂ ਇੱਥੇ ਦਿਸਦੀਆਂ ਹਨ, ਅਤੇ ਨਿਯਮਬੱਧ ਕੰਮਾਂ ਦੇ ਆਧਾਰ \'ਤੇ ਬਦਲਦੀਆਂ ਹਨ"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"ਐਪ ਸੁਝਾਅ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਹੇਠਲੀ ਕਤਾਰ ਤੋਂ ਐਪਾਂ ਨੂੰ ਘਸੀਟੋ"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"ਐਪ ਸੁਝਾਅ ਖਾਲੀ ਜਗ੍ਹਾ ਵਿੱਚ ਸ਼ਾਮਲ ਕੀਤੇ ਗਏ"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ਐਪ ਸੁਝਾਵਾਂ ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ਐਪ ਸੁਝਾਵਾਂ ਨੂੰ ਬੰਦ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ਪੂਰਵ ਅਨੁਮਾਨਿਤ ਐਪ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
+    <skip />
+    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
+    <skip />
+    <string name="action_share" msgid="2648470652637092375">"ਸਾਂਝਾ ਕਰੋ"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"ਸਕ੍ਰੀਨਸ਼ਾਟ"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"ਐਪ ਜਾਂ ਤੁਹਾਡੀ ਸੰਸਥਾ ਵੱਲੋਂ ਇਸ ਕਾਰਵਾਈ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ"</string>
+    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
+    <skip />
+    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <skip />
 </resources>
diff --git a/quickstep/res/values-pt-rPT/strings.xml b/quickstep/res/values-pt-rPT/strings.xml
index 2fd34d636c..bf6d6b8e77 100644
--- a/quickstep/res/values-pt-rPT/strings.xml
+++ b/quickstep/res/values-pt-rPT/strings.xml
@@ -19,19 +19,99 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Ecrã dividido"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Fixar"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Forma livre"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Vista geral"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Nenhum item recente"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Fechar"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Definições de utilização de aplicações"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Limpar tudo"</string>
-    <string name="accessibility_recent_apps" msgid="4058661986695117371">"Aplicações recentes"</string>
+    <string name="accessibility_recent_apps" msgid="4058661986695117371">"Apps recentes"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>, <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; 1 minuto"</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"Resta(m) <xliff:g id="TIME">%1$s</xliff:g> hoje."</string>
-    <string name="title_app_suggestions" msgid="4185902664111965088">"Sugestões de aplicações"</string>
-    <string name="all_apps_label" msgid="8542784161730910663">"Todas as aplicações"</string>
+    <string name="title_app_suggestions" msgid="4185902664111965088">"Sugestões de apps"</string>
+    <string name="all_apps_label" msgid="8542784161730910663">"Todas as apps"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"As suas aplicações previstas"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Obtenha sugestões de apps na última fila do ecrã principal"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Obtenha sugestões de apps na fila dos favoritos do ecrã principal"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Aceda facilmente às suas apps mais utilizadas, diretamente no ecrã principal. As sugestões mudam em função das suas rotinas. As apps na última fila passam para o ecrã principal."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Aceda facilmente às suas apps mais utilizadas no ecrã principal. As sugestões mudam em função das suas rotinas. As apps na fila dos favoritos passam para o ecrã principal."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Aceda facilmente às suas apps mais utilizadas, diretamente no ecrã principal. As sugestões mudam em função das suas rotinas. As apps na última fila passam para uma nova pasta."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Obter sugestões de apps"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Não, obrigado"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Definições"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"As apps mais utilizadas aparecem aqui e mudam em função das rotinas."</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Arraste as apps para fora da última fila para obter sugestões de apps."</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Sugestões de apps adicionadas a um espaço vazio."</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Sugestões de apps ativadas"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"As sugestões de apps estão desativadas"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App prevista: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
+    <skip />
+    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
+    <skip />
+    <string name="action_share" msgid="2648470652637092375">"Partilhar"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Fazer captura de ecrã"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Esta ação não é permitida pela app ou a sua entidade."</string>
+    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
+    <skip />
+    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <skip />
 </resources>
diff --git a/quickstep/res/values-pt/strings.xml b/quickstep/res/values-pt/strings.xml
index 673dfe2e73..695b969cdc 100644
--- a/quickstep/res/values-pt/strings.xml
+++ b/quickstep/res/values-pt/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Tela dividida"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Fixar"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Forma livre"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Visão geral"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Nenhum item recente"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Fechar"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Configurações de uso do app"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Limpar tudo"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Apps recentes"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Sugestões de apps"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Todos os apps"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Suas predições de apps"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Receba sugestões de apps na linha inferior da tela inicial"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Receba sugestões de apps na linha \"Favoritos\" da tela inicial"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Acesse diretamente na tela inicial os apps que você mais usa. As sugestões mudarão de acordo com sua rotina. Os apps na linha inferior serão movidos para a tela inicial."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Acesse os apps mais usados na tela inicial de forma simples. As sugestões mudarão de acordo com sua rotina. Os apps na linha \"Favoritos\" serão movidos para a tela inicial."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Acesse diretamente na tela inicial os apps que você mais usa. As sugestões mudarão de acordo com sua rotina. Os apps na linha inferior serão movidos para uma nova pasta."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Receber sugestões de apps"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Não"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Configurações"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Os apps mais usados aparecem aqui e mudam de acordo com sua rotina"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Arraste apps da linha inferior para receber sugestões de apps"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Sugestões de apps adicionadas a um espaço vazio"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"O recurso \"sugestões de apps\" está ativado"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"O recurso \"sugestões de apps\" está desativado"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App previsto: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Deslize da borda esquerda."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Deslize da borda esquerda até o meio da tela e solte."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Pronto! Agora tente deslizar da borda direita."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Deslize da borda direita."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Deslize da borda direita até o meio da tela e solte."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Você concluiu o gesto para voltar. A seguir, aprenda a acessar a tela inicial."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Não deslize perto demais da parte inferior da tela."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Mude a sensibilidade do gesto de voltar nas configurações"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Deslize para voltar"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Para voltar à tela anterior, deslize da borda esquerda ou direita até o meio da tela."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Deslize da borda inferior da tela para cima."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Não pare antes de soltar."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Deslize para cima."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Você concluiu o gesto para acessar a tela inicial. A seguir, aprenda a trocar de app."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Deslizar para voltar à tela inicial"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Deslize de baixo para cima na tela. Esse gesto sempre leva você para a tela inicial."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Deslize da borda inferior da tela para cima."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Mantenha a janela pressionada por mais tempo antes de soltar."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Deslize para cima e pare."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Você concluiu o gesto para trocar de app. Você já pode usar o smartphone."</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Deslizar para trocar de app"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Deslize de baixo para cima na tela, mantenha-a pressionada e depois solte."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Tudo pronto"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Próxima"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Concluído"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Configurações"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Tentar novamente"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Muito bem!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Compartilhar"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Capturar tela"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Essa ação não é permitida pelo app ou pela organização"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Pular o tutorial de navegação?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Abra o tutorial mais tarde no app Dicas"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancelar"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Pular"</string>
 </resources>
diff --git a/quickstep/res/values-si/strings.xml b/quickstep/res/values-si/strings.xml
index f6584c4dca..501d488ea9 100644
--- a/quickstep/res/values-si/strings.xml
+++ b/quickstep/res/values-si/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"බෙදුම් තිරය"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"අමුණන්න"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Freeform"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"දළ විශ්ලේෂණය"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"මෑත අයිතම නැත"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"වසන්න"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"යෙදුම් භාවිත සැකසීම්"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"සියල්ල හිස් කරන්න"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"මෑත යෙදුම්"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"යෙදුම් යෝජනා"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"සියලු යෙදුම්"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"ඔබේ පුරෝකථන කළ යෙදුම්"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"ඔබගේ මුල් තිරයේ පහළ පේළියේ යෙදුම් යෝජනා ලබා ගන්න"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"ඔබේ මුල් තිරයේ ප්‍රියතම පේළියේ යෙදුම් යෝජනා ලබා ගන්න"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"ඔබගේ වැඩිපුරම භාවිත කරන යෙදුම්වලට මුල් තිරයේ සිටම පහසුවෙන් ප්‍රවේශ වන්න. ඔබගේ දිනචරියා මත පදනම්ව යෝජනා වෙනස් වනු ඇත. පහළ පේළියේ යෙදුම් ඔබගේ මුල් තිරය දක්වා ගෙන යනු ඇත."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"ඔබගේ වැඩිපුරම භාවිත කරන යෙදුම්වලට මුල් තිරයේ සිටම පහසුවෙන් ප්‍රවේශ වන්න. ඔබගේ දිනචරියා මත පදනම්ව යෝජනා වෙනස් වනු ඇත. ප්‍රියතම තුළ යෙදුම් ඔබේ මුල් තිරය වෙත ගෙන යනු ඇත."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"ඔබගේ වැඩිපුරම භාවිත කරන යෙදුම්වලට මුල් තිරයේ සිටම පහසුවෙන් ප්‍රවේශ වන්න. ඔබගේ දිනචරියා මත පදනම්ව යෝජනා වෙනස් වනු ඇත. පහළ පේළියේ යෙදුම් නව ෆෝල්ඩරයකට ගෙන යනු ඇත."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"යෙදුම් යෝජනා ලබා ගන්න"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"එපා ස්තුතියි"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"සැකසීම්"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"වැඩිපුරම භාවිත කළ යෙදුම් මෙහි දිස්වන අතර දිනචරියා මත පදනම්ව වෙනස් වේ"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"යෙදුම් යෝජනා ලබා ගැනීමට පහළ පේළියෙන් ඉවතට යෙදුම් ඇදගෙන යන්න"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"යෙදුම් යෝජනා හිස් අවකාශයට එක් කර ඇත"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"යෙදුම් යෝජනා සබලිතයි"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"යෙදුම් යෝජනා අබල කර ඇත"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"පුරෝකථනය කළ යෙදුම: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ඔබ ඈත වම් දාරයෙන් ස්වයිප් කරන බවට සහතික කර ගන්න."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ඔබ වම් දාරයේ සිට තිරයේ මැදට ස්වයිප් කර අත හරින බව සහතික කර ගන්න."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"එච්චරයි! දැන් දකුණු දාරයෙන් ස්වයිප් කිරීම උත්සාහ කරන්න."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ඔබ ඈත දකුණු දාරයෙන් ස්වයිප් කරන බවට සහතික කර ගන්න."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ඔබ දකුණු දාරයේ සිට තිරයේ මැදට ස්වයිප් කර අත හරින බව සහතික කර ගන්න."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"ඔබ ආපසු යාමේ ඉංගිතය සම්පූර්ණ කරන ලදි. ඊළඟට, මුල් පිටුවට යන ආකාරය දැන ගන්න."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ඔබ තිරයේ පහළට ඉතාම සමීපව ස්වයිප් නොකරන බවට සහතික කර ගන්න."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ආපසු ඉංගිතයෙහි සංවේදීතාව වෙනස් කිරීමට, සැකසීම් වෙත යන්න"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"ආපසු යාමට ස්වයිප් කරන්න"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"අවසාන තිරයට ආපසු යාමට, වම් හෝ දකුණු දාරයෙන් තිරයේ මැදට ස්වයිප් කරන්න."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ඔබ තිරයේ පහළ දාරයේ සිට ඉහළට ස්වයිප් කරන බව සහතික කර ගන්න."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"යාමට ඉඩ හැරීමට පෙර ඔබ විරාමයක් නොගන්නා බව සහතික කර ගන්න."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ඔබ කෙලින්ම ඉහළට ස්වයිප් කරන බව සහතික කර ගන්න."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"ඔබ මුල් පිටුවට යාමේ ඉංගිතය සම්පූර්ණ කරන ලදි. ඊළඟට, යෙදුම් මාරු කරන ආකාරය දැන ගන්න."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"මුල් පිටුවට යාමට ස්වයිප් කරන්න"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"ඔබගේ තිරයේ පහළින් උඩට ස්වයිප් කරන්න.මෙම ඉංගිතය සැම විටම ඔබව මුල් තිරයට ගෙන යයි."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ඔබ තිරයේ පහළ දාරයේ සිට ඉහළට ස්වයිප් කරන බව සහතික කර ගන්න."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"මුදා හැරීමට පෙර කවුළුව වැඩි වේලාවක් රඳවා තබා ගැනීමට උත්සාහ කරන්න."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"ඔබ කෙලින්ම ඉහළට ස්වයිප් කර, අනතුරුව විරාම කරන බව සහතික කර ගන්න."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"ඔබ යෙදුම් මාරු කිරීමේ ඉංගිතය සම්පූර්ණ කළේය. ඔබ ඔබගේ දුරකථනය භාවිත කිරීමට සූදානම්ය!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"යෙදුම් මාරු කිරීමට ස්වයිප් කරන්න"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ඔබගේ තිරයේ පහළින් උඩට ස්වයිප් කර, අල්ලාගෙන සිට, අනතුරුව මුදා හරින්න."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"සියල්ල සකසා ඇත"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"ඊළඟ"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"නිමයි"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"සැකසීම්"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"නැවත උත්සාහ කරන්න"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"කදිමයි!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"නිබන්ධනය <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"බෙදා ගන්න"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"තිර රුව"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"මෙම ක්‍රියාව යෙදුම හෝ ඔබේ සංවිධානය මගින් ඉඩ නොදේ"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"නිබන්ධනය සංචාලනය මඟ හරින්නද?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"ඔබට මෙය පසුව Tips යෙදුම තුළ සොයා ගත හැක"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"අවලංගු කරන්න"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"මඟ හරින්න"</string>
 </resources>
diff --git a/quickstep/res/values-sk/strings.xml b/quickstep/res/values-sk/strings.xml
index 8a9c7365f2..6d3853388d 100644
--- a/quickstep/res/values-sk/strings.xml
+++ b/quickstep/res/values-sk/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Rozdeliť obrazovku"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Pripnúť"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Voľný režim"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Prehľad"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Žiadne nedávne položky"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Zavrieť"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Nastavenia využívania aplikácie"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Vymazať všetko"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Nedávne aplikácie"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Návrhy aplikácií"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Všetky aplikácie"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Vaše predpovedané aplikácie"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Nechajte si v spodnom riadku na ploche zobrazovať návrhy aplikácií"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Nechajte si na ploche na riadku obľúbených zobrazovať návrhy aplikácií"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Získajte jednoduchý prístup k najpoužívanejším aplikáciám priamo na ploche. Návrhy sa budú meniť podľa vašich zvyklostí. Aplikácie v spodnom riadku sa presunú nahor na plochu."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Získajte jednoduchý prístup k najpoužívanejším aplikáciám priamo na ploche. Návrhy sa budú meniť podľa vašich postupov. Aplikácie v riadku s obľúbenými sa presunú na plochu."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Získajte jednoduchý prístup k najpoužívanejším aplikáciám priamo na ploche. Návrhy sa budú meniť podľa vašich zvyklostí. Aplikácie v spodnom riadku sa presunú do nového priečinka."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Zobrazovať návrhy aplikácií"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Nie, ďakujem"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Nastavenia"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Tu sú zobrazené najpoužívanejšie aplikácie a menia sa podľa postupov"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Ak chcete získať návrhy aplikácií, presuňte aplikácie zo spodného riadka"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Na prázdne miesto pridané návrhy aplikácií"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Návrhy aplikácií zapnuté"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Návrhy aplikácií vypnuté"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predpovedaná aplikácia: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Musite potiahnuť z úplne krajného ľavého okraja."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Musíte potiahnuť z ľavého okraja do stredu obrazovky a uvoľniť."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Hotovo! Teraz skúste potiahnuť z pravého okraja."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Musite potiahnuť z úplne krajného pravého okraja."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Musíte potiahnuť z pravého okraja do stredu obrazovky a uvoľniť."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Dokončili ste gesto na prejdenie späť. V ďalšom kroku sa naučíte, ako prejsť na plochu."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nesmiete potiahnuť príliš blízko dolnej časti obrazovky."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Ak chcete zmeniť citlivosť gesta Späť, prejdite do Nastavení"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Prejdite späť potiahnutím"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Na poslednú obrazovku prejdete potiahnutím z ľavého alebo pravého okraja do stredu obrazovky."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Musíte potiahnuť nahor z dolného okraja obrazovky."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pred uvoľnením nesmiete zastať."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Musíte potiahnuť priamo hore."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Dokončili ste gesto na prechod na plochu. V ďalšom kroku sa naučíte, ako prepínať aplikácie."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Prechod na plochu potiahnutím"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Potiahnite nahor z dolného okraja obrazovky. Týmto gestom sa vždy vrátite na plochu."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Musíte potiahnuť nahor z dolného okraja obrazovky."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Skúste okno pred uvoľnením podržať dlhšie."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Musite potiahnuť priamo hore a potom zastať."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Dokončili ste gesto na prepnutie aplikácií. Môžete začať používať telefón."</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Prepínanie aplikácií potiahnutím"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Potiahnite nahor z dolnej časti obrazovky, pridržte a uvoľnite."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Hotovo"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Ďalej"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Hotovo"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Nastavenia"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Skúste to znova"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Výborne!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Návod <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Zdieľať"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Snímka obrazovky"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikácia alebo vaša organizácia túto akciu nepovoľuje"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Chcete preskočiť návod na navigáciu?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Tento návod nájdete v aplikácii Tipy"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Zrušiť"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Preskočiť"</string>
 </resources>
diff --git a/quickstep/res/values-sv/strings.xml b/quickstep/res/values-sv/strings.xml
index ba7ebcdec7..0561dcc3e2 100644
--- a/quickstep/res/values-sv/strings.xml
+++ b/quickstep/res/values-sv/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Delad skärm"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Fäst"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Fritt format"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Översikt"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Listan med de senaste åtgärderna är tom"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Stäng"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Inställningar för appanvändning"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Rensa alla"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Senaste apparna"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Appförslag"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Alla appar"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Föreslagna appar"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Få appförslag på den nedersta raden på startskärmen"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Få appförslag på raden Favoriter på startskärmen"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Kom enkelt åt de appar du använder mest, direkt från startskärmen. Förslagen ändras efter dina rutiner. Appar på nedersta raden flyttas upp till startskärmen."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Kom enkelt åt de appar du använder mest, direkt från startskärmen. Förslagen ändras efter dina rutiner. Appar på raden Favoriter flyttas till startskärmen."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Kom enkelt åt de appar du använder mest, direkt från startskärmen. Förslagen ändras efter dina rutiner. Appar på nedersta raden flyttas till en ny mapp."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Få appförslag"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Nej tack"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Inställningar"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"De appar som används mest visas här och ändras efter dina rutiner"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Dra appar till den nedersta raden om du vill få appförslag"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Appförslag har lagts till på tom yta"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Appförslag har aktiverats"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Appförslag har inaktiverats"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Appförslag: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Se till att du sveper ända från vänsterkanten."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Se till att du sveper från den vänstra kanten till mitten av skärmen och sedan släpper."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Så där ja! Nu kan du testa att svepa från högerkanten."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Se till att du sveper ända från högerkanten."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Se till att du sveper från den högra kanten till mitten av skärmen och sedan släpper."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Du är klar med rörelsen för att gå tillbaka. Nu ska du få lära dig hur du öppnar startskärmen."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Se till att du inte sveper för nära skärmens nederkant."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Öppna inställningarna om du vill ändra rörelsens känslighet"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Svep för att återgå"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Återgå till den senaste skärmen genom att svepa från skärmens vänster- eller högerkant till mitten."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Se till att du sveper från nederkanten på skärmen."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Se till att du sveper i en jämn rörelse innan du släpper."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Se till att du sveper rakt uppåt."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Du är klar med rörelsen för att öppna startskärmen. Nu ska du få lära dig hur du byter mellan appar."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Svep för att öppna startskärmen"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Svep uppåt från skärmens nederkant. Du kan alltid återgå startskärmen med den här rörelsen."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Se till att du sveper från nederkanten på skärmen."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Testa att trycka längre på fönstret innan du släpper."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Se till att du sveper rakt uppåt och sedan pausar."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Du är klar med rörelsen för att byta mellan appar. Nu kan du börja använda telefonen!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Svep för att byta mellan appar"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Svep uppåt från skärmens nederkant. Håll fingret nedtryckt och släpp sedan."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Klart"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Nästa"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Klar"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Inställningar"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Försök igen"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bra!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Självstudie <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Dela"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Skärmbild"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Appen eller organisationen tillåter inte den här åtgärden"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Vill du hoppa över självstudierna?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Du kan hitta det här igen i Tips-appen"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Avbryt"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Hoppa över"</string>
 </resources>
diff --git a/quickstep/res/values-th/strings.xml b/quickstep/res/values-th/strings.xml
index 0f6821bf19..6cc824b7ad 100644
--- a/quickstep/res/values-th/strings.xml
+++ b/quickstep/res/values-th/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"แยกหน้าจอ"</string>
-    <string name="recent_task_option_pin" msgid="7929860679018978258">"ตรึง"</string>
+    <string name="recent_task_option_pin" msgid="7929860679018978258">"ปักหมุด"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"รูปแบบอิสระ"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"ภาพรวม"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"ไม่มีรายการล่าสุด"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"ปิด"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"การตั้งค่าการใช้แอป"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"ล้างทั้งหมด"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"แอปล่าสุด"</string>
@@ -34,4 +31,87 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"คำแนะนำเกี่ยวกับแอป"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"แอปทั้งหมด"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"แอปที่คาดการณ์ไว้"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"ดูแอปแนะนำที่แถวล่างของหน้าจอหลัก"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"รับคำแนะนำเกี่ยวกับแอปในแถวรายการโปรดของหน้าจอหลัก"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"เข้าถึงแอปที่คุณใช้มากที่สุดได้อย่างง่ายดายจากหน้าจอหลัก คำแนะนำจะเปลี่ยนไปตามแอปที่ใช้งานเป็นประจำ แอปในแถวล่างจะย้ายขึ้นมาอยู่ในหน้าจอหลัก"</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"เข้าถึงแอปที่ใช้มากที่สุดได้อย่างง่ายดายในหน้าจอหลัก คำแนะนำจะเปลี่ยนไปตามการใช้งานประจำ แอปในแถวรายการโปรดจะย้ายไปอยู่ในหน้าจอหลัก"</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"เข้าถึงแอปที่คุณใช้มากที่สุดได้อย่างง่ายดายจากหน้าจอหลัก คำแนะนำจะเปลี่ยนไปตามแอปที่ใช้งานเป็นประจำ แอปในแถวล่างจะย้ายไปอยู่ในโฟลเดอร์ใหม่"</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"ดูแอปแนะนำ"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"ไม่เป็นไร"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"การตั้งค่า"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"แอปที่ใช้มากที่สุดจะปรากฎที่นี่และจะเปลี่ยนไปตามการใช้งานประจำ"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"ลากแอปออกจากแถวล่างเพื่อดูแอปแนะนำ"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"เพิ่มคำแนะนำเกี่ยวกับแอปในพื้นที่ว่างแล้ว"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"เปิดใช้คำแนะนำเกี่ยวกับแอปแล้ว"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ปิดใช้คำแนะนำเกี่ยวกับแอปอยู่"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"แอปที่คาดว่าจะใช้: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
+    <skip />
+    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
+    <skip />
+    <string name="action_share" msgid="2648470652637092375">"แชร์"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"ภาพหน้าจอ"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"แอปหรือองค์กรของคุณไม่อนุญาตการดำเนินการนี้"</string>
+    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
+    <skip />
+    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <skip />
 </resources>
diff --git a/quickstep/res/values-tl/strings.xml b/quickstep/res/values-tl/strings.xml
index 491bac5bd9..ff3b97b276 100644
--- a/quickstep/res/values-tl/strings.xml
+++ b/quickstep/res/values-tl/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Hatiin ang screen"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"I-pin"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Freeform"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Overview"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Walang kamakailang item"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Isara"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Mga setting ng paggamit ng app"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"I-clear lahat"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Mga kamakailang app"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Mga iminumungkahing app"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Lahat ng app"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Iyong mga nahulaang app"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Makakuha ng mga suhestyon sa app sa ibabang row ng iyong Home screen"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Makakuha ng mga iminumungkahing app sa row ng mga paborito ng iyong Home screen"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Madaling ma-access ang mga pinakaginagamit mong app nang direkta sa Home screen. Magbabago ang mga suhestyon batay sa iyong mga routine. Mapupunta sa iyong Home screen ang mga app na nasa ibabang row."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Madaling ma-access ang mga pinakaginagamit mong app nang direkta sa Home screen. Magbabago ang mga suhestyon batay sa iyong mga routine. Mapupunta sa iyong Home screen ang mga app sa row ng mga paborito."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Madaling ma-access ang mga pinakaginagamit mong app, direkta sa Home screen. Magbabago ang mga suhestyon batay sa iyong mga routine. Mapupunta sa isang bagong folder ang mga app na nasa ibabang row."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Kumuha ng mga suhestiyon sa app"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Huwag na lang"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Mga Setting"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Ipinapakita ang mga pinakaginagamit na app dito, at nababago ito batay sa mga routine"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"I-drag ang mga app mula sa ibabang row para makakuha ng mga suhestyon sa app"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Idinagdag sa bakanteng espasyo ang mga iminumungkahing app"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Naka-enable ang mga iminumungkahing app"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Naka-disable ang mga iminumungkahing app"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Hinulaang app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Tiyaking magsa-swipe ka mula sa pinakadulo sa kaliwa."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Tiyaking mag-swipe mula sa kaliwang gilid papunta sa gitna ng screen, saka iangat ang iyong daliri."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Iyon lang! Subukang mag-swipe mula sa kaliwang gilid."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Tiyaking magsa-swipe ka mula sa pinakadulo sa kanan."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Tiyaking mag-swipe mula sa kanang gilid papunta sa gitna ng screen, saka iangat ang iyong daliri."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Nakumpleto mo na ang galaw para bumalik. Susunod, alamin kung paano pumunta sa Home."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Tiyaking hindi ka magsa-swipe nang masyadong malapit sa ibaba ng screen."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Pumunta sa Settings para baguhin ang sensitivity ng pagbalik"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Mag-swipe para bumalik"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Para bumalik sa nakaraang screen, mag-swipe mula sa kaliwa o kanang gilid patungo sa gitna ng screen."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Tiyaking magsa-swipe ka pataas mula sa pinakaibaba ng screen."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Tiyaking hindi ka magpo-pause bago iangat ang iyong daliri."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Tiyaking magsa-swipe ka nang diretso pataas."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Nakumpleto mo na ang galaw para pumunta sa Home. Susunod, alamin kung paano magpalipat-lipat sa mga app."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Mag-swipe para pumunta sa home"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Mag-swipe pataas mula sa ibaba ng iyong screen. Dadalhin ka palagi ng galaw na ito sa Home screen."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Tiyaking magsa-swipe ka pataas mula sa pinakaibaba ng screen."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Subukang pindutin nang mas matagal ang window bago ito bitawan."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Tiyaking magsa-swipe ka nang diretso pataas, pagkatapos ay mag-pause."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Nakumpleto mo na ang galaw para magpalipat-lipat sa mga app. Handa ka nang gamitin ang iyong telepono!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Mag-swipe para lumipat ng app"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Mag-swipe pataas mula sa ibaba ng iyong screen, mag-hold, pagkatapos ay bitawan ito."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Handa na ang lahat"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Susunod"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Tapos na"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Mga Setting"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Subukan ulit"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Magaling!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Ibahagi"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Hindi pinapayagan ng app o ng iyong organisasyon ang pagkilos na ito"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Laktawan ang tutorial sa pag-navigate?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Mahahanap mo ito sa Tips app"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Kanselahin"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Laktawan"</string>
 </resources>
diff --git a/quickstep/res/values-tr/strings.xml b/quickstep/res/values-tr/strings.xml
index ec6d88405c..12df943ca6 100644
--- a/quickstep/res/values-tr/strings.xml
+++ b/quickstep/res/values-tr/strings.xml
@@ -19,19 +19,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Bölünmüş ekran"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Sabitle"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Serbest çalışma"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Genel bakış"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Yeni öğe yok"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Kapat"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Uygulama kullanım ayarları"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Tümünü temizle"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Son uygulamalar"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>, <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; 1 dk."</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"Bugün <xliff:g id="TIME">%1$s</xliff:g> kaldı"</string>
-    <string name="title_app_suggestions" msgid="4185902664111965088">"Uygulama önerileri"</string>
+    <string name="title_app_suggestions" msgid="4185902664111965088">"Önerilen uygulamalar"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Tüm uygulamalar"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Tahmin edilen uygulamalarınız"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Ana ekranınızın alt satırında uygulama önerileri alın"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Ana ekranınızın favoriler satırında uygulama önerileri alın"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"En çok kullanılan uygulamalarınıza Ana ekranda kolayca erişin. Öneriler, rutinlerinize dayalı olarak değişir. Alt satırdaki uygulamalar, yukarı taşınarak Ana ekranınıza alınır."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"En çok kullanılan uygulamalarınıza Ana ekrandan kolayca erişin. Öneriler rutinlerinize dayalı olarak değişir. Favoriler satırındaki uygulamalar Ana ekranınıza taşınır."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"En çok kullanılan uygulamalarınıza Ana ekranda kolayca erişin. Öneriler, rutinlerinize dayalı olarak değişir. Alt satırdaki uygulamalar yeni bir klasöre taşınır."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Uygulama önerileri al"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Hayır, teşekkürler"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Ayarlar"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"En çok kullanılan uygulamalar burada görünür ve rutinlere dayalı olarak değişir"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Önerilen uygulamaları almak için alt satırdaki uygulamaları dışarı sürükleyin"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Önerilen uygulamalar boş alana eklendi"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Uygulama önerileri etkinleştirildi"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Uygulama önerileri devre dışı bırakıldı"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Tahmin edilen uygulama: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Ekranın en solundan kaydırdığınızdan emin olun."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Sol kenardan ekranın ortasına doğru kaydırıp bıraktığınızdan emin olun."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"İşte oldu. Şimdi sağ kenardan kaydırmayı deneyin."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Ekranın en sağından kaydırdığınızdan emin olun."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Sağ kenardan ekranın ortasına doğru kaydırıp bıraktığınızdan emin olun."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Geri dön hareketini tamamladınız. Sırada, Ana ekrana gitmeyi öğrenmek var."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ekranın alt kısmına çok yakın bir şekilde kaydırmadığınızdan emin olun."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Geri hareketinin hassasiyetini değiştirmek için Ayarlar\'a gidin"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Geri dönmek için kaydırın"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Son ekrana geri gitmek için sol veya sağ kenardan ekranın ortasına doğru kaydırın."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Ekranın alt kenarından yukarı kaydırdığınızdan emin olun."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Bırakmadan önce parmağınızı duraklatmadığınızdan emin olun."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Düz bir şekilde yukarı kaydırdığınızdan emin olun."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Ana ekrana git hareketini tamamladınız. Sırada, uygulamalar arasında geçiş yapmayı öğrenmek var."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Ana ekrana gitmek için kaydırma"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Ekranın alt kısmından yukarıya doğru kaydırın. Bu hareket sizi her zaman Ana ekrana götürür."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Ekranın alt kenarından yukarı kaydırdığınızdan emin olun."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Bırakmadan önce pencereyi daha uzun süre tutmayı deneyin."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Düz bir şekilde yukarı kaydırıp ardından parmağınızı duraklattığınızdan emin olun."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Uygulamalar arasında geçiş yapma hareketini tamamladınız. Telefonunuzu kullanmaya hazırsınız."</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Uygulamalar arasında geçiş yapmak için kaydırma"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Ekranınızın alt tarafından yukarı doğru kaydırın, tutun ve sonra bırakın."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Hepsi bu kadar"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Sonraki"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Bitti"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Ayarlar"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Tekrar deneyin"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Güzel!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Eğitici <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Paylaş"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Ekran görüntüsü"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Uygulamanız veya kuruluşunuz bu işleme izin vermiyor"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Gezinme eğitici içeriği atlansın mı?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Bunu İpucu uygulamasında bulabilirsiniz"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"İptal"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Atla"</string>
 </resources>
diff --git a/quickstep/res/values-uz/strings.xml b/quickstep/res/values-uz/strings.xml
index 67c8e91c00..3681aba233 100644
--- a/quickstep/res/values-uz/strings.xml
+++ b/quickstep/res/values-uz/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Ekranni ikkiga ajratish"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Mahkamlash"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Erkin shakl"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Nazar"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Yaqinda ishlatilgan ilovalar yo‘q"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Yopish"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Ilovadan foydalanish sozlamalari"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Hammasini tozalash"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Yaqinda ishlatilgan ilovalar"</string>
@@ -33,5 +30,55 @@
     <string name="time_left_for_app" msgid="3111996412933644358">"Bugun <xliff:g id="TIME">%1$s</xliff:g> qoldi"</string>
     <string name="title_app_suggestions" msgid="4185902664111965088">"Tavsiya etiladigan ilovalar"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Barcha ilovalar"</string>
-    <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Taklif qilingan ilovalaringiz"</string>
+    <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Taklif qilingan ilovalar"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Tavsiya etiladigan ilovalar bosh ekran pastidagi qatorda chiqadi"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Tavsiya etiladigan ilovalar bosh ekranning saralanganlar ruknida chiqadi"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Faol ishlatiladigan ilovalarga bosh ekrandan osongina kira olasiz. Tavsiyalar oxirgi faoliyatingiz asosida almashib boradi. Pastki qatordagi ilovalar bosh ekranga chiqadi."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Faol ishlatiladigan ilovalarga bosh ekrandan osongina kira olasiz. Tavsiyalar oxirgi faoliyatingiz asosida almashib boradi. Saralanganlar qatoridagi ilovalar bosh ekranga chiqadi."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Faol ishlatiladigan ilovalarga bosh ekrandan osongina kira olasiz. Tavsiyalar oxirgi faoliyatingiz asosida almashib boradi. Pastki qatordagi ilovalar yangi jildga chiqadi."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Tavsiyalarni chiqarish"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Kerak emas"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Sozlamalar"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Faol ishlatiladigan ilovalar bu yerda chiqadi va oxirgi faoliyatingiz asosida almashadi"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Tavsiyalar olish uchun ilovalarni pastki qatordan tashqariga oling"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Tavsiya etilgan ilovalarni ochiq joylarga kiriting"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Ilova tavsiyalari yoqildi"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Endi ilova takliflari chiqmaydi"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Taklif etilgan ilova: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Barmoqni chapdagi eng chekkadan suring."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Barmoqni ekranning chap chetidan oʻrtasigacha suring va ekrandan uzing."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Tamom! Endi oʻng chetidan surishga urining."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Barmoqni oʻngdagi eng chekkadan suring."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Barmoqni ekranning oʻng chetidan oʻrtasigacha suring va ekrandan uzing."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Ortga qaytish ishorasi darsini tamomladingiz. Endi Bosh sahifaga qaytishni oʻrganamiz."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Barmoqni ekran pastiga yaqin surmaslikka harakat qiling."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Orqaga ishorasi sezuvchanligi Sozlamalardan oʻzgartiriladi"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Ortga qaytish uchun suring"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Ortga qaytish uchun barmoqni ekranning yon chekkalaridan oʻrtasigacha suring."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Barmoqni ekranning pastki chetidan yuqoriga suring."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Barmoqni ekrandan pauzasiz qoʻyib uzing."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Barmoqni tik tepaga suring."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Bosh ekranni ochish ishorasi darsini tamomladingiz. Endi ilovalarni almashtirishni oʻrganamiz."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Svayp bilan bosh ekranni ochish"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Ekranning pastidan tepaga qarab suring. Bu ishora doim Bosh ekranni ochadi."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Barmoqni ekranning pastki chetidan yuqoriga suring."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Barmoqni uzishdan oldin oynani biroz bosib turing."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Avval tik tepaga surib, keyin pauza qiling."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Ilovalarni almashtirish darsini tamomladingiz. Endi telefondan foydalana olasiz!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Svayp bilan ilovalarni almashtirish"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Ekranning pastidan tepasiga suring, bosib turing va qoʻyib yuboring."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Tayyor"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Keyingisi"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Tayyor"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Sozlamalar"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Qayta urinish"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Yaxshi!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Darslik: <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Ulashish"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Skrinshot"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Bu amal ilova yoki tashkilotingiz tomonidan taqiqlangan"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Navigatsiya darsi yopilsinmi?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Bu darslar Maslahatlar ilovasida chiqadi"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Bekor qilish"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Tashlab ketish"</string>
 </resources>
diff --git a/quickstep/res/values-zh-rHK/strings.xml b/quickstep/res/values-zh-rHK/strings.xml
index ac7e8e9002..12310971d5 100644
--- a/quickstep/res/values-zh-rHK/strings.xml
+++ b/quickstep/res/values-zh-rHK/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"分割畫面"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"固定"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"自由形式"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"概覽"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"最近沒有任何項目"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"關閉"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"應用程式使用情況設定"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"全部清除"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"最近使用的應用程式"</string>
@@ -34,4 +31,87 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"應用程式建議"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"所有應用程式"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"您的預測應用程式"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"在主畫面底部取得應用程式建議"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"在主畫面「我的最愛」列取得應用程式建議"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"在主畫面輕鬆存取常用的應用程式。系統會根據您的日常安排更改建議，並將底部的應用程式移到主畫面。"</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"在主畫面輕鬆存取最常用的應用程式。系統會根據您的日常安排變更建議，「我的最愛」列中的應用程式會移至主畫面。"</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"在主畫面輕鬆存取最常用的應用程式。系統會根據您的日常安排變更建議，並將底列的應用程式移至新資料夾。"</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"取得應用程式建議"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"不用了，謝謝"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"設定"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"最常用的應用程式會在這裡顯示，並會根據日常安排變更"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"將應用程式從底列拖曳出來，即可獲取應用程式建議"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"系統會將應用程式建議新增至空白位置"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"已啟用應用程式建議"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"已停用應用程式建議"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"預測應用程式：<xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
+    <skip />
+    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
+    <skip />
+    <string name="action_share" msgid="2648470652637092375">"分享"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"螢幕截圖"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"應用程式或您的機構不允許此操作"</string>
+    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
+    <skip />
+    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <skip />
 </resources>
diff --git a/quickstep/res/values-zh-rTW/strings.xml b/quickstep/res/values-zh-rTW/strings.xml
index 3323bfd57d..04808032d2 100644
--- a/quickstep/res/values-zh-rTW/strings.xml
+++ b/quickstep/res/values-zh-rTW/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"分割畫面"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"固定"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"自由形式"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"總覽"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"最近沒有任何項目"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"關閉"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"應用程式使用情況設定"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"全部清除"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"最近使用的應用程式"</string>
@@ -34,4 +31,87 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"應用程式建議"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"所有應用程式"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"系統預測你會使用的應用程式"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"在主畫面的底部取得應用程式建議"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"在主畫面的收藏列取得應用程式建議"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"在主畫面上輕鬆存取最常使用的應用程式。應用程式建議會依據你的日常使用習慣而有所不同。系統會將底部列出的應用程式上移到主畫面。"</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"在主畫面上輕鬆存取最常使用的應用程式。系統會根據你的日常使用習慣提供不同的應用程式建議，並在主畫面顯示收藏列中的應用程式。"</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"在主畫面上輕鬆存取最常使用的應用程式。應用程式建議會根據日常安排有所不同。系統會將底部列出的應用程式移到新的資料夾。"</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"取得應用程式建議"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"不用了，謝謝"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"設定"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"最常使用的應用程式會顯示在這裡，顯示的項目會根據日常安排有所不同"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"將應用程式從底部列向外拖曳，即可取得應用程式建議"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"應用程式建議已新增到空白位置"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"應用程式建議功能已啟用"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"應用程式建議功能已停用"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"預測的應用程式：<xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
+    <skip />
+    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
+    <skip />
+    <string name="action_share" msgid="2648470652637092375">"分享"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"擷取螢幕畫面"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"這個應用程式或貴機構不允許執行這個動作"</string>
+    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
+    <skip />
+    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <skip />
 </resources>
diff --git a/quickstep/res/values-zu/strings.xml b/quickstep/res/values-zu/strings.xml
index 0f1d99d7b6..1651068186 100644
--- a/quickstep/res/values-zu/strings.xml
+++ b/quickstep/res/values-zu/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Hlukanisa isikrini"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Phina"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"I-Freeform"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Buka konke"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Azikho izinto zakamuva"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Vala"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Izilungiselelo zokusetshenziswa kohlelo lokusebenza"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Sula konke"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Izinhlelo zokusebenza zakamuva"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Iziphakamiso zohlelo lokusebenza"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Zonke izinhlelo zokusebenza"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Izinhlelo zakho zokusebenza eziqagelwe"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Thola iziphakamiso ze-app emgqeni ongezansi wesikrini sakho sasekhaya"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Thola iziphakamiso zohlelo lokusebenza kumugqa wezintandokazi Zesikrini sakho sasekhaya"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Finyelela kalula izinhlelo zakho zokusebenza ezisetshenziswa kakhulu khona kusikrini sasekhaya. Iziphakamiso zizoshintsha ngokususelwe kwimijikelezo yakho. Izinhlelo zokusebenza ezisemgqeni ongezansi zizoya phezulu kusikrini sakho sasekhaya."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Finyelela kalula izinhlelo zakho zokusebenza ezisetshenziswa kakhulu khona kusikrini sasekhaya. Iziphakamiso zizoshintsha ngokususelwe kwimijikelezo yakho. Izintandokazi zomugqa wezinhlelo zokusebenza zizoya Kusikrini sakho sasekhaya."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Finyelela kalula izinhlelo zakho zokusebenza ezisetshenziswa njalo, kusikrini sasekhaya. Iziphakamiso zizoshintsha ngokususelwe kwimijikelezo yakho. Izinhlelo zokusebenza ezisemgqeni ongezansi zizoya phezulu kufolda entsha."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Thola iziphakamiso zohlelo lokusebenza"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Cha ngiyabonga"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Amasethingi"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Izinhlelo zokusebenza ezisetshenziswa kakhulu zivela lapha, kanye noshintsho olususelwe kwimijikelezo"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Hudula izinhlelo zokusebenza kusuka emgqeni ongezansi ukuthola iziphakamiso zohlelo lokusebenza"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Iziphakamiso zohlelo lokusebenza ezengezwe esikhaleni esingenalutho"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Iziphakamiso zohlelo lokusebenza zinikwe amandla"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Iziphakamiso zohlelo lokusebenza zikhutshaziwe"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Uhlelo lokusebenza olubikezelwe: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Qiniseka ukuthi uswayiphela ekudeni emngceleni ongakwesobunxele."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Qiniseka ukuthi uswayipha kusuka emngceleni okwesobunxele kuya phakathi kwesikrini bese uyadedela."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Yilokho nje! Manje zama ukuswayipha kusuka kwesokudla."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Qiniseka ukuthi uswayiphela ekudeni emngceleni ongakwesokudla."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Qiniseka ukuthi uswayipha kusuka emngceleni okwesokudla kuya phakathi kwesikrini bese uyadedela."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Ukuqedile ukuthinta kokubuyela emuva. Ngokulandelayo, funda indlela yokuya Ekhaya."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Qiniseka ukuba awuswayipheli eduze kakhulu naphansi kwesikrini."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Ukuze ushintshe ukuzwela kokuthinta emuva, iya Kumasethingi"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Swayipha ukuze uye emuva"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Ukuze ubuyele emuva esikrinini sokugcina, swapha kusuka emngceleni wesobunxele noma wesokudla kuya phakathi kwesikrini."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Qiniseka ukuthi uswayiphela phezulu kusuka emngceleni ophansi wesikrini."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Qiniseka ukuthi awumisi ngaphambi kokudedela."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Qiniseka ukuthi uswayiphela ngqo phezulu."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Ukuqedile ukuthinta kokuya Ekhaya. Ngokulandelayo, funda indlela yokushintsha ama-app."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Swayipha ukuze uye ekhaya"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Swayiphela phezulu kusuka phansi kwesikrini sakho.Lokhu kuthinta kuhlala kukusa esikrinini sasekhaya."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Qiniseka ukuthi uswayiphela phezulu kusuka emngceleni ophansi wesikrini."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Zama ukubamba iwindi isikhashana ngaphambi kokulidedela."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Qiniseka ukuthi uswayiphela ngqo phezulu bese uyamisa."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Ukuqedile ukuthinta kokushintsha ama-app. Ukulungele ukusebenzisa ifoni yakho!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swayipha ukuze ushintshe ama-app"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swayiphela phezulu kusuka ngezansi kwesikrini sakho, ubambe, bese udedele."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Konke kusethiwe"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Okulandelayo"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Kwenziwe"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Amasethingi"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Zama futhi"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Kuhle!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Okokufundisa <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Yabelana"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Isithombe-skrini"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Lesi senzo asivunyelwanga uhlelo lokusebenza noma inhlangano yakho"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Yeqa isifundo sokuzulazula?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Lokhu ungakuthola kamuva ku-app Yamathiphu"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Khansela"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Yeqa"</string>
 </resources>
-- 
GitLab


From 83e481e56be01a2ba788d346439a241a0f8e0c93 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 14 Apr 2021 23:32:26 +0000
Subject: [PATCH 0883/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I5bed8e41dee73591239d1685237ec70a2df5e08c
---
 res/values-af/strings.xml     |  65 +++++++++----
 res/values-am/strings.xml     |  64 +++++++++----
 res/values-az/strings.xml     |  84 +++++++++++++----
 res/values-bg/strings.xml     |  67 ++++++++++----
 res/values-bs/strings.xml     |  72 +++++++++-----
 res/values-da/strings.xml     |  73 ++++++++++-----
 res/values-el/strings.xml     |  66 +++++++++----
 res/values-en-rAU/strings.xml |  66 +++++++++----
 res/values-en-rCA/strings.xml | 170 ++++++++++++++++++++++++++++++++++
 res/values-en-rGB/strings.xml |  66 +++++++++----
 res/values-en-rIN/strings.xml |  66 +++++++++----
 res/values-en-rXC/strings.xml | 170 ++++++++++++++++++++++++++++++++++
 res/values-es-rUS/strings.xml |  69 +++++++++-----
 res/values-es/strings.xml     |  83 +++++++++++++----
 res/values-fa/strings.xml     |  69 +++++++++-----
 res/values-fi/strings.xml     |  87 ++++++++++++-----
 res/values-fr-rCA/strings.xml |  67 ++++++++++----
 res/values-gl/strings.xml     |  90 +++++++++++++-----
 res/values-gu/strings.xml     |  96 ++++++++++++++-----
 res/values-hr/strings.xml     |  84 +++++++++++++----
 res/values-hy/strings.xml     |  72 +++++++++-----
 res/values-it/strings.xml     |  65 +++++++++----
 res/values-iw/strings.xml     |  75 ++++++++++-----
 res/values-kn/strings.xml     |  66 +++++++++----
 res/values-ky/strings.xml     |  90 +++++++++++++-----
 res/values-lo/strings.xml     |  67 ++++++++++----
 res/values-ml/strings.xml     |  69 +++++++++-----
 res/values-mn/strings.xml     |  91 +++++++++++++-----
 res/values-ne/strings.xml     | 121 ++++++++++++++++--------
 res/values-nl/strings.xml     |  81 ++++++++++------
 res/values-or/strings.xml     | 105 +++++++++++++++------
 res/values-pa/strings.xml     |  93 ++++++++++++++-----
 res/values-pt-rPT/strings.xml | 106 +++++++++++++++------
 res/values-pt/strings.xml     |  66 +++++++++----
 res/values-si/strings.xml     |  65 +++++++++----
 res/values-sk/strings.xml     |  68 ++++++++++----
 res/values-sv/strings.xml     |  65 +++++++++----
 res/values-th/strings.xml     |  82 ++++++++++++----
 res/values-tl/strings.xml     |  65 +++++++++----
 res/values-tr/strings.xml     |  67 ++++++++++----
 res/values-uz/strings.xml     |  73 ++++++++++-----
 res/values-zh-rHK/strings.xml |  87 ++++++++++++-----
 res/values-zh-rTW/strings.xml |  99 ++++++++++++++------
 res/values-zu/strings.xml     |  66 +++++++++----
 44 files changed, 2675 insertions(+), 903 deletions(-)
 create mode 100644 res/values-en-rCA/strings.xml
 create mode 100644 res/values-en-rXC/strings.xml

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index ca59afa558..f847685b78 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -20,39 +20,58 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Werk"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Program is nie geïnstalleer nie."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Program is nie beskikbaar nie"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Afgelaaide program in veiligmodus gedeaktiveer"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Legstukke gedeaktiveer in Veiligmodus"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Kortpad is nie beskikbaar nie"</string>
-    <string name="home_screen" msgid="806512411299847073">"Tuisskerm"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Gepasmaakte handelinge"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Raak en hou om \'n legstuk op te tel."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Dubbeltik en hou om \'n legstuk op te tel of gebruik gepasmaakte handelinge."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Tuis"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Verdeelde skerm"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Raak en hou om \'n legstuk te skuif."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dubbeltik en hou om \'n legstuk te skuif of gebruik gepasmaakte handelinge."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d breed by %2$d hoog"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Raak en hou om self te plaas"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Voeg outomaties by"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> legstukke</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> legstuk</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> kortpaaie</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> kortpad</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Legstukke"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Soek"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Vee teks in hierdie soekkasie uit"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Geen legstukke beskikbaar nie"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Geen soekresultate nie"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Persoonlik"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Werk"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Gesprekke"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Deursoek programme"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Laai tans programme …"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Kon geen programme kry wat by \"<xliff:g id="QUERY">%1$s</xliff:g>\" pas nie"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Soek meer programme"</string>
     <string name="label_application" msgid="8531721983832654978">"Program"</string>
+    <string name="search_corpus_apps" msgid="1917889409963779022">"Programme"</string>
+    <string name="search_action_try_now" msgid="1458737965476149074">"Probeer nou"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Kennisgewings"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Raak en hou om \'n kortpad op te tel."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Dubbeltik en hou om \'n kortpad op te tel of gebruik gepasmaakte handelinge."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Raak en hou om \'n kortpad te skuif."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dubbeltik en hou om \'n kortpad te skuif of gebruik gepasmaakte handelinge."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Niks meer spasie op die tuisskerm nie."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Geen plek meer in die Gunstelinge-laai nie"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Programmelys"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lys persoonlike programme"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Lys werkprogramme"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Tuis"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Verwyder"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Deïnstalleer"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Programinligting"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Installeer"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Moenie program voorstel nie"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Vasspeldvoorspelling"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"installeer kortpaaie"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Laat \'n program toe om kortpaaie by te voeg sonder gebruikerinmenging."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"lees Tuis-instellings en -kortpaaie"</string>
@@ -63,7 +82,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Kon nie legstuk laai nie"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Stel op"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Dit is \'n stelselprogram en kan nie gedeïnstalleer word nie."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Naamlose vouer"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Wysig naam"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Het <xliff:g id="APP_NAME">%1$s</xliff:g> gedeaktiveer"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, het <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> kennisgewings</item>
@@ -77,8 +96,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Tik om nuwe naam te stoor"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Vouer is gesluit"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Vouer hernoem na <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Vouer: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Legstukke"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Vouer: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> items"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Vouer: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> of meer items"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Muurpapiere"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Style en muurpapiere"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Tuis-instellings"</string>
@@ -92,16 +111,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Skakel programkennisgewings vir <xliff:g id="NAME">%1$s</xliff:g> aan om kennisgewingkolle te sien"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Verander instellings"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Wys kennisgewingkolle"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Voeg ikoon by tuisskerm"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Voeg programikone by tuisskerm"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Vir nuwe programme"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Onbekend"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Verwyder"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Soek"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Hierdie program is nie geïnstalleer nie"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Die program vir hierdie ikoon is nie geïnstalleer nie. Jy kan dit verwyder of die program soek en dit self installeer."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> installeer tans; <xliff:g id="PROGRESS">%2$s</xliff:g> voltooi"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> laai tans af, <xliff:g id="PROGRESS">%2$s</xliff:g> voltooid"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> wag tans om te installeer"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g>-legstukke"</string>
     <string name="widgets_list" msgid="796804551140113767">"Legstukkelys"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Legstukkelys is toegemaak"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Voeg by tuisskerm"</string>
@@ -129,15 +148,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Kortpaaie"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Kortpaaie en kennisgewings"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Maak toe"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Maak toe"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Kennisgewing is toegemaak"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Persoonlik"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Werk"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Werkprofiel"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Kry werkprogramme hier"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Elke werkprogram het \'n kenteken en word deur jou organisasie veilig gehou. Skuif programme na jou tuisskerm toe vir makliker toegang."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Bestuur deur jou organisasie"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Kennisgewings en programme is af"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Maak toe"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Toe"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Persoonlike programme is apart en van werkprogramme versteek."</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Jou IT-admin kan jou werkprogramme en -data sien"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Volgende"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Het dit"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Werkprofiel is onderbreek"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Werkprogramme kan nie vir jou kennisgewings stuur, jou battery gebruik of toegang tot jou ligging kry nie"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Werkprofiel is onderbreek. Werkprogramme kan nie vir jou kennisgewings stuur, jou battery gebruik of toegang tot jou ligging kry nie"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Werkprogramme het \'n kenteken en is sigbaar vir jou IT-administrateur"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Het dit"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Onderbreek werkprogramme"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Skakel aan"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filter"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Onderbreek werkprogramme en kennisgewings"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Misluk: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 0396df6179..ee98cf20af 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -26,32 +26,52 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"የወረደው መተግበሪያ ደህንነቱ በተጠበቀ ሁኔታ ውስጥ ተሰናክሏል"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"ምግብሮች በደህንነቱ የተጠበቀ ሁኔታ ተሰናክለዋል"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"አቋራጭ አይገኝም"</string>
-    <string name="home_screen" msgid="806512411299847073">"መነሻ ገጽ"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"ብጁ እርምጃዎች"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"ፍርግም ለማንሳት ይንኩ እና ይያዙት"</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"አንድ ንዑስ ፕሮግራም ለመምረጥ ወይም ብጁ እርምጃዎችን ለመጠቀም ሁለቴ መታ አድርገው ይያዙ።"</string>
+    <string name="home_screen" msgid="5629429142036709174">"መነሻ"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"የተከፈለ ማያ ገጽ"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"ምግብርን ለማንቀሳቀስ ይንኩ እና ይያዙ።"</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ምግብርን ለማንቀሳቀስ ወይም ብጁ እርምጃዎችን ለመጠቀም ሁለቴ መታ ያድርጉ እና ይያዙ።"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ስፋት በ%2$d ከፍታ"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"ራስዎ ለማስቀመጥ ነክተው ይያዙት"</string>
     <string name="place_automatically" msgid="8064208734425456485">"በራስ-ሰር አክል"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ንዑስ ፕሮግራሞች</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ንዑስ ፕሮግራሞች</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> አቋራጮች</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> አቋራጮች</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>፣ <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"ፍርግሞች"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"ፍለጋ"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"ጽሁፍን ከፍለጋ ሳጥን አጽዳ"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"ምግብሮች አይገኙም"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"ምንም የፍለጋ ውጤቶች የሉም"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"የግል"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ስራ"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"ውይይቶች"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"መተግበሪያዎችን ፈልግ"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"መተግበሪያዎችን በመጫን ላይ…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"ከ«<xliff:g id="QUERY">%1$s</xliff:g>» ጋር የሚዛመዱ ምንም መተግበሪያዎች አልተገኙም"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"ተጨማሪ መተግበሪያዎች ይፈልጉ"</string>
     <string name="label_application" msgid="8531721983832654978">"መተግበሪያ"</string>
+    <string name="search_corpus_apps" msgid="1917889409963779022">"መተግበሪያዎች"</string>
+    <string name="search_action_try_now" msgid="1458737965476149074">"አሁን ይሞክሩ"</string>
     <string name="notifications_header" msgid="1404149926117359025">"ማሳወቂያዎች"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"አንድ አቋራጭ ለመውሰድ ነክተው ይያዙ።"</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"አንድ አቋራጭ ለመውሰድ ወይም ብጁ እርምጃዎችን ለመጠቀም ሁለቴ መታ አድርገው ይያዙ።"</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"አቋራጭን ለማንቀሳቀስ ይንኩ እና ይያዙ"</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"አቋራጭን ለማንቀሳቀስ ወይም ብጁ እርምጃዎችን ለመጠቀም ሁለቴ መታ ያድርጉ እና ይያዙ።"</string>
     <string name="out_of_space" msgid="4691004494942118364">"በዚህ መነሻ ማያ ገጽ ላይ ምንም ቦታ የለም።"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"በተወዳጆች መሣቢያ ውስጥ ተጨማሪ ቦታ የለም"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"የመተግበሪያዎች ዝርዝር"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"የግል መተግበሪያዎች ዝርዝር"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"የሥራ መተግበሪያዎች ዝርዝር"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"መነሻ"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"አስወግድ"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"አራግፍ"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"የመተግበሪያ መረጃ"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"ጫን"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"መተግበሪያውን አይጠቁሙ"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"የፒን ግምት"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"አቋራጮችን ይጭናል"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"መተግበሪያው ያለተጠቃሚ ጣልቃ ገብነት አቋራጭ እንዲያክል ያስችለዋል።"</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"የመነሻ ቅንብሮች እና አቋራጮችን ያነባል"</string>
@@ -62,7 +82,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"ፍርግም የመጫን ችግር"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"ማዋቀሪያ"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"ይህ የስርዓት መተግበሪያ ነው እና ማራገፍ አይቻልም።"</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"ስም-አልባ አቃፊ"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"ስም ያርትዑ"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> ተሰናክሏል"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="one"><xliff:g id="APP_NAME_2">%1$s</xliff:g>፣ <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> ማሳወቂያ አለው</item>
@@ -76,8 +96,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"ዳግም የተሰጠውን ስም ለማስቀመጥ መታ ያድርጉ"</string>
     <string name="folder_closed" msgid="4100806530910930934">"አቃፊ ተዘግቷል"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"አቃፊ <xliff:g id="NAME">%1$s</xliff:g> ተብሎ ዳግም ተሰይሟል"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"አቃፊ፦ <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"ፍርግሞች"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"አቃፊ፦ <xliff:g id="NAME">%1$s</xliff:g>፣ <xliff:g id="SIZE">%2$d</xliff:g> ንጥሎች"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"አቃፊ፦ <xliff:g id="NAME">%1$s</xliff:g>፣ <xliff:g id="SIZE">%2$d</xliff:g> ወይም ተጨማሪ ንጥሎች"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"የግድግዳ ወረቀቶች"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"ቅጦች እና ልጣፎች"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"የመነሻ ቅንብሮች"</string>
@@ -91,16 +111,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"የማሳወቂያ ነጥቦችን ለማሳየት የመተግብሪያ ማሳወቂያዎችን ለ<xliff:g id="NAME">%1$s</xliff:g> ያብሩ"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"ቅንብሮችን ቀይር"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"የማሳወቂያ ነጥቦችን አሳይ"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"አዶ ወደ የመነሻ ማያ ገጽ አክል"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"የመተግበሪያ አዶዎችን ወደ መነሻ ገጹ ያክሉ"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"ለአዲስ መተግበሪያዎች"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"የማይታወቅ"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"አስወግድ"</string>
     <string name="abandoned_search" msgid="891119232568284442">"ፈልግ"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"ይህ መተግበሪያ አልተጫነም"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"የዚህ አዶ መተግበሪያ አልተጫነም። ማስወገድ ወይም መተግበሪያውን መፈለግና ራስዎ መጫን ይችላሉ።"</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> በመጫን ላይ፣ <xliff:g id="PROGRESS">%2$s</xliff:g> ተጠናቅቋል"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> በመውረድ ላይ፣ <xliff:g id="PROGRESS">%2$s</xliff:g> ተጠናቋል"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> ለመጫን በመጠበቅ ላይ"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> ንዑስ ፕሮግራሞች"</string>
     <string name="widgets_list" msgid="796804551140113767">"የመግብሮች ዝርዝር"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"የመግብሮች ዝርዝር ተዘግቷል"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"ወደ መነሻ ማያ ገጽ ያክሉ"</string>
@@ -128,15 +148,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"አቋራጮች"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"አቋራጮች እና ማሳወቂያዎች"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"አሰናብት"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"ዝጋ"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"ማሳወቂያ ተሰናብቷል"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"የግል"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"ሥራ"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"የሥራ መገለጫ"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"የስራ መተግበሪያዎችን እዚህ ያግኙ"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"እያንዳንዱ የሥራ መተግበሪያ ባጅ አለው፣ እና በድርጅትዎ ደህንነቱ ተጠብቋል። ለቀለለ መዳረሻ መተግበሪያዎችን ወደ የእርስዎ መነሻ ማያ ገጽ ይውሰዷቸው።"</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"በእርስዎ ድርጅት የሚተዳደር"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"ማሳወቂያዎች እና መተግበሪያዎች ጠፍተዋል"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"ዝጋ"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"ዝግ"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"የግል ውሂብ የተለየ እና ከሥራ መተግበሪያዎች የተደበቀ ነው"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"የስራ መተግበሪያዎች እና ውሂብ የተለዩ እና ከሥራ መተግበሪያዎች የተደበቁ ናቸው"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"ቀጣይ"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"ገባኝ"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"የሥራ መገለጫ ባለበት ቆሟል"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"የስራ መተግበሪያዎች ማሳወቂያዎችን ወደ እርስዎ መላክ፣ ባትሪዎን መጠቀም ወይም አካባቢዎ ዘንድ መድረስ አይችሉም"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"የሥራ መገለጫ ባለበት ቆሟል። የስራ መተግበሪያዎች ማሳወቂያዎችን ወደ እርስዎ መላክ፣ ባትሪዎን መጠቀም ወይም አካባቢዎ ዘንድ መድረስ አይችሉም"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"የሥራ መተግበሪያዎች ባጅ የተደረገባቸው ሲሆን ለእርስዎ IT ቡድን ታይ ናቸው"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"ገባኝ"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"የሥራ መተግበሪያዎችን ባሉበት አቁም"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"አብራ"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"አጣራ"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"የስራ መተግበሪያዎችን እና ማሳወቂያዎችን ባሉበት ያቁሙ"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"አልተሳካም፦ <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 7c1ce8447d..32b8fe3fe4 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -26,32 +26,62 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Güvənli rejimdə icazə verilməyən tətbiq endirildi"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Vidcetlər Güvənli rejimdə deaktiv edilib"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Qısayol əlçatan deyil"</string>
-    <string name="home_screen" msgid="806512411299847073">"Əsas ekran"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Fərdi əməliyyatlar"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Vidceti götürmək üçün toxunub saxlayın."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Vidceti götürmək üçün &amp; iki dəfə toxunub saxlayın və ya fərdi fəaliyyətləri istifadə edin."</string>
+    <!-- no translation found for home_screen (5629429142036709174) -->
+    <skip />
+    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
+    <skip />
+    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
+    <skip />
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%2$d hündürlük %1$d enində"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Manual olaraq yerləşdirmək üçün toxunaraq basıb saxlayın"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Avtomatik əlavə edin"</string>
+    <!-- no translation found for widgets_count (656794749266073027) -->
+    <!-- no translation found for shortcuts_count (8080294865447938455) -->
+    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
+    <skip />
+    <string name="widget_button_text" msgid="2880537293434387943">"Vidcet"</string>
+    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
+    <skip />
+    <!-- no translation found for no_widgets_available (9140948620298620513) -->
+    <skip />
+    <!-- no translation found for no_search_results (6518732304311458580) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
+    <skip />
+    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Tətbiqləri axtarın"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Tətbiqlər yüklənir…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"<xliff:g id="QUERY">%1$s</xliff:g> sorğusuna uyğun tətbiq tapılmadı"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Daha çox tətbiq üçün axtarış edin"</string>
     <string name="label_application" msgid="8531721983832654978">"Tətbiq"</string>
+    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
+    <skip />
+    <!-- no translation found for search_action_try_now (1458737965476149074) -->
+    <skip />
     <string name="notifications_header" msgid="1404149926117359025">"Bildirişlər"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Qısayolu seçmək üçün basıb saxlayın."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Qısayolu seçmək üçün iki dəfə basıb saxlayın və ya fərdi əməliyyatlardan istifadə edin."</string>
+    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
+    <skip />
     <string name="out_of_space" msgid="4691004494942118364">"Bu Əsas ekranda boş yer yoxdur."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Favoritlər-də yer yoxdur"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Tətbiq siyahısı"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Şəxsi tətbiqlərin siyahısı"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"İş tətbiqlərinin siyahısı"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Əsas səhifə"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Silin"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Sistemdən sil"</string>
-    <string name="app_info_drop_target_label" msgid="692894985365717661">"Tətbiq məlumatı"</string>
+    <string name="app_info_drop_target_label" msgid="692894985365717661">"Tətbiq infosu"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Quraşdırın"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Tətbiq təklif olunmasın"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Proqnozlaşdırılan tətbiqi bərkidin"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"qısayolları quraşdır"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Tətbiqə istifadəçi müdaxiləsi olmadan qısayolları əlavə etməyə icazə verir."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"Əsas Səhifə ayarlarını və qısayolları oxuyun"</string>
@@ -62,7 +92,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Vidcet yükləmə problemi"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Quraşdırma"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Bu sistem tətbiqi olduğu üçün sistemdən silinə bilməz."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Adsız Qovluq"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Adı redaktə edin"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> deaktiv edildi"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g> tətbiqində <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> bildiriş var</item>
@@ -76,8 +106,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Ad dəyişikliyini yadda saxlamaq üçün toxunun"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Qovluq bağlıdır"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Qovluq adı <xliff:g id="NAME">%1$s</xliff:g> ilə dəyişdirildi"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Qovluq: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Vidcet"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Qovluq: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> element"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Qovluq: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> və ya daha çox element"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Divar kağızları"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Üslub və divar kağızları"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Home ayarları"</string>
@@ -91,16 +121,17 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Bildiriş Nöqtələrini göstərmək üçün <xliff:g id="NAME">%1$s</xliff:g> bildirişlərini aktiv edin"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Ayarları dəyişin"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Bildiriş nöqtələrini göstərin"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Əsas ekrana ikona əlavə edin"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Tətbiq ikonalarını Ana ekrana əlavə edin"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Yeni tətbiqlər üçün"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Naməlum"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Yığışdır"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Axtarış"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Bu tətbiq quraşdırılmayıb"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Bu ikona üçün tətbiq quraşdırılmayıb. Onu silə bilərsiniz, və ya tətbiqi taparaq manual yol ilə quraşdıra bilərsiniz."</string>
+    <!-- no translation found for app_installing_title (5864044122733792085) -->
+    <skip />
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> endirilir, <xliff:g id="PROGRESS">%2$s</xliff:g> tamamlandı"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> yüklənmək üçün gözləyir"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> vidcetləri"</string>
     <string name="widgets_list" msgid="796804551140113767">"Vidcet siyahısı"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Vidcet siyahısı bağlandı"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Əsas ekrana əlavə edin"</string>
@@ -128,15 +159,30 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Qısa yollar"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Qısayol və bildirişlər"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Rədd edin"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Bağlayın"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Bildiriş rədd edildi"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Şəxsi"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"İş"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"İş profili"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Burada iş tətbiqləri axtarın"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Hər bir iş tətbiqində təşkilat tərəfindən qorunduğunu göstərən narıncı nişan var. Tətbiqləri daha asan giriş üçün Əsas Səhifə Ekranına köçürün."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Təşkilatınız tərəfindən idarə olunur"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Bildiriş və tətbiqlər deaktivdir"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Bağlayın"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Bağlıdır"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Şəxsi data ayrı olur və iş tətbiqlərindən gizlədilir"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"İş tətbiqləri və datasını İT admininiz görə bilir"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Növbəti"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Anladım"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"İş profilinə fasilə verilib"</string>
+    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
+    <skip />
+    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
+    <skip />
+    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
+    <skip />
+    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
+    <skip />
+    <string name="work_switch_tip" msgid="808075064383839144">"İş tətbiqlərinə və bildirişlərə fasilə verin"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Alınmadı: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 408f205004..3ea7f0672c 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -20,39 +20,58 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Работа"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Приложението не е инсталирано."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Приложението не е налично"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Изтегленото приложение е деактивирано в безопасния режим"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Приспособленията са деактивирани в безопасния режим"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Няма достъп до прекия път"</string>
-    <string name="home_screen" msgid="806512411299847073">"Начален екран"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Персонализирани действия"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Докоснете и задръжте за избор на приспособление."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Докоснете двукратно и задръжте за избор на приспособление или използвайте персонализирани действия."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Начален екран"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Разделен екран"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Докоснете и задръжте за преместване на приспособл."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Докоснете двукратно и задръжте за преместване на приспособление или използвайте персонал. действия."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Ширина %1$d и височина %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Докоснете и задръжте, за да поставите ръчно"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Автоматично добавяне"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> приспособления</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> приспособление</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> преки пътя</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> пряк път</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Приспособления"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Търсене"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Изчистване на текста от полето за търсене"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Няма налични приспособления"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Няма резултати от търсенето"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Лични"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Служебни"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Разговори"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Търсене в приложенията"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Приложенията се зареждат…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Няма намерени приложения, съответстващи на „<xliff:g id="QUERY">%1$s</xliff:g>“"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Търсене на още приложения"</string>
     <string name="label_application" msgid="8531721983832654978">"Приложение"</string>
+    <string name="search_corpus_apps" msgid="1917889409963779022">"Приложения"</string>
+    <string name="search_action_try_now" msgid="1458737965476149074">"Изпробване сега"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Известия"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Докоснете и задръжте за избор на пряк път."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Докоснете двукратно и задръжте за избор на пряк път или използвайте персонализирани действия."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Докоснете и задръжте за преместване на пряк път."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Докоснете двукратно и задръжте за преместване на пряк път или използвайте персонализирани действия."</string>
     <string name="out_of_space" msgid="4691004494942118364">"На този начален екран няма повече място."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Няма повече място в областта с любимите"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Списък с приложения"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Списък с лични приложения"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Списък със служебни приложения"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Начало"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Премахване"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Деинсталиране"</string>
-    <string name="app_info_drop_target_label" msgid="692894985365717661">"Данни за прилож."</string>
+    <string name="app_info_drop_target_label" msgid="692894985365717661">"Информация за прилож."</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Инсталиране"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Без предлагане на приложение"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Фиксиране на предвиждането"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"инсталиране на преки пътища"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Разрешава на приложението да добавя преки пътища без намеса на потребителя."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"четене на настройките и преките пътища в Начало"</string>
@@ -63,7 +82,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Проблем при зареждане на приспособлението"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Настройване"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Това е системно приложение и не може да се деинсталира."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Папка без име"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Редактиране на името"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Деактивирахте <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g> – има <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> известия</item>
@@ -77,8 +96,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Докоснете, за да запазите новото име"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Папката бе затворена"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Папката е преименувана на „<xliff:g id="NAME">%1$s</xliff:g>“"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Папка: „<xliff:g id="NAME">%1$s</xliff:g>“"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Приспособления"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Папка: „<xliff:g id="NAME">%1$s</xliff:g>“ – <xliff:g id="SIZE">%2$d</xliff:g> елемента"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Папка: „<xliff:g id="NAME">%1$s</xliff:g>“ – <xliff:g id="SIZE">%2$d</xliff:g> или повече елементи"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Тапети"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Стилове и тапети"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Настройки за началния екран"</string>
@@ -92,16 +111,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"За да се показват точки за известия, включете известията за приложението <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Промяна на настройките"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Показване на точките за известия"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Добавяне на икона към началния екран"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Добавяне на икони на прил. на нач. екран"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"За нови приложения"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Няма информация"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Премахване"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Търсене"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Това приложение не е инсталирано"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Приложението за тази икона не е инсталирано. Можете да я премахнете или да потърсите приложението и да го инсталирате ръчно."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> се инсталира, <xliff:g id="PROGRESS">%2$s</xliff:g> завършено"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> се изтегля. Завършено: <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> изчаква инсталиране"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Приспособления за <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Списък с приспособления"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Списъкът с приспособления е затворен"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Добавяне към началния екран"</string>
@@ -129,15 +148,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Преки пътища"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Преки пътища и известия"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Отхвърляне"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Затваряне"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Известието е отхвърлено"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Лични"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Служебни"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Служебен потребителски профил"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Тук можете да намерите служебните приложения"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Всяко служебно приложение има значка и организацията ви се грижи за сигурността му. За по-лесен достъп преместете приложенията на началния си екран."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Управлява се от организацията ви"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Известията и приложенията са изключени"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Затваряне"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Затворено"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Личните данни се съхраняват отделно и са скрити от служебните приложения"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Служебните приложения и данни са видими за системния ви администратор"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Напред"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Разбрах"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Служебният потребителски профил е поставен на пауза"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Служебните приложения не могат да ви изпращат известия, да използват батерията или да осъществяват достъп до местоположението ви"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Служебният потребителски профил е поставен на пауза. Служебните приложения не могат да ви изпращат известия, да използват батерията или да осъществяват достъп до местоположението ви"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Служебните приложения са означени със значка и са видими за системния администратор"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Разбрах"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Поставяне на пауза на служебните приложения"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Включване"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Филтър"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Поставете на пауза служебните приложения и известия"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Неуспешно: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 65ad91e9b0..bcc26743c8 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -26,32 +26,54 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Preuzeta aplikacija je onemogućena u sigurnom načinu rada"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Vidžeti su onemogućeni u sigurnom načinu rada."</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Prečica nije dostupna"</string>
-    <string name="home_screen" msgid="806512411299847073">"Početni ekran"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Prilagođene akcije"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Dodirnite &amp; i držite da biste uzeli dodatak."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Dodirnite dvaput &amp; i držite da biste uzeli vidžet ili koristite prilagođene radnje."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Početni ekran"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Podijeljeni ekran"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Dodirnite i zadržite da pomjerite vidžet."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvaput dodirnite i zadržite da pomjerite vidžet ili da koristite prilagođene radnje."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Širina %1$d, visina %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Dodirnite i držite da postavite ručno"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Dodaj automatski"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidžet</item>
+      <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidžeta</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidžeta</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> prečica</item>
+      <item quantity="few"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> prečice</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> prečica</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Vidžeti"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Pretražite"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Brisanje teksta iz okvira za pretraživanje"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Nijedan vidžet nije dostupan"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Nema rezultata pretraživanja"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Lično"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Posao"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Razgovori"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Pretražite aplikacije"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Aplikacije se učitavaju…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nije pronađena nijedna aplikacija za upit \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Pretraži više aplikacija"</string>
     <string name="label_application" msgid="8531721983832654978">"Aplikacija"</string>
+    <string name="search_corpus_apps" msgid="1917889409963779022">"Aplikacije"</string>
+    <string name="search_action_try_now" msgid="1458737965476149074">"Isprobajte odmah"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Obavještenja"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Dodirnite i držite da uzmete prečicu."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Dodirnite dvaput i držite da uzmete prečicu ili koristite prilagođene akcije."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Dodirnite i zadržite da pomjerite prečicu."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dvaput dodirnite i zadržite da pomjerite prečicu ili da koristite prilagođene radnje."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Na ovom početnom ekranu nema više prostora."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Nema više prostora u ladici Omiljeno"</string>
-    <string name="all_apps_button_label" msgid="8130441508702294465">"Spisak aplikacija"</string>
+    <string name="all_apps_button_label" msgid="8130441508702294465">"Lista aplikacija"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista ličnih aplikacija"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Lista poslovnih aplikacija"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Početna"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Ukloni"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Deinstaliraj"</string>
-    <string name="app_info_drop_target_label" msgid="692894985365717661">"Informacije o aplikaciji"</string>
+    <string name="app_info_drop_target_label" msgid="692894985365717661">"Inform. o aplikaciji"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Instaliraj"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Ne predlaži aplikaciju"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Zakači predviđanje"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"instaliraj prečice"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Dopušta aplikaciji dodavanje prečica bez posredovanja korisnika."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"čitaj postavke na početnom ekranu i prečice"</string>
@@ -62,7 +84,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Problem pri učitavanju dodatka"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Postavljanje"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Ovo je sistemska aplikacija i ne može se deinstalirati."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Neimenovani folder"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Uređivanje naziva"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> je onemogućena"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="one">Aplikacija <xliff:g id="APP_NAME_2">%1$s</xliff:g> ima<xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> obavještenje​</item>
@@ -77,8 +99,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Dodirnite da sačuvate promjenu naziva"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Folder je zatvoren"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Ime foldera je promijenjeno u <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Folder: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Vidžeti"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, br. stavki: <xliff:g id="SIZE">%2$d</xliff:g>"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ili više stavki"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Pozadinske slike"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stilovi i pozadinske slike"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Postavke početnog ekrana"</string>
@@ -92,19 +114,19 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Za prikaz tačaka za obavještenja, uključite obavještenja za aplikacije za aplikaciju <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Promijeni postavke"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Prikaži tačke za obavještenja"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Dodaj ikonu na početni ekran"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Dodaj ikone aplikacija na početni ekran"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Za nove aplikacije"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Nepoznato"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Ukloni"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Pretraži"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Ova aplikacija nije instalirana"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Aplikacija za ovu ikonu nije instalirana. Možete je ukloniti ili potražiti aplikaciju i ručno je instalirati."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"Instaliranje aplikacije <xliff:g id="NAME">%1$s</xliff:g>, završeno je <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> se preuzima, završeno <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> čeka da se instalira"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Vidžeti za aplikaciju <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Spisak vidžeta"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Spisak vidžeta je zatvoren"</string>
-    <string name="action_add_to_workspace" msgid="8902165848117513641">"Dodaj na početni ekran"</string>
+    <string name="action_add_to_workspace" msgid="8902165848117513641">"Dodavanje na početni ekran"</string>
     <string name="action_move_here" msgid="2170188780612570250">"Premjesti stavku ovdje"</string>
     <string name="item_added_to_workspace" msgid="4211073925752213539">"Stavka je dodana na Početni ekran."</string>
     <string name="item_removed" msgid="851119963877842327">"Stavka je uklonjena"</string>
@@ -129,15 +151,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Prečice"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Prečice i obavještenja"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Odbaci"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Zatvaranje"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Obavještenje je odbačeno"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Lične"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Poslovne"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Radni profil"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Pronađite poslovne aplikacije ovdje"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Svaka poslovna aplikacija ima značku i osigurava je vaša organizacija. Premjestite aplikacije na Početni ekran, radi lakšeg pristupa."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Upravlja vaša organizacija"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Notifikacije i aplikacije su isključene"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Zatvori"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Zatvoreno"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Lični podaci su odvojeni i sakriveni od poslovnih aplikacija"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Vaš IT administrator može vidjeti poslovne aplikacije i podatke"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Sljedeće"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Razumijem"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Radni profil je pauziran"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Poslovne aplikacije vam ne mogu slati obavještenja, koristiti bateriju niti pristupiti vašoj lokaciji"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Radni profil je pauziran. Poslovne aplikacije vam ne mogu slati obavještenja, koristiti bateriju niti pristupiti vašoj lokaciji"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Poslovne aplikacije su označene i vaš IT administrator ih može vidjeti"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Razumijem"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pauziraj poslovne aplikacije"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Uključi"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtrirajte"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Pauzirajte poslovne aplikacije i obavještenja"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Nije uspjelo: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index dc17516bce..c6a96cea8b 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -20,39 +20,58 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Arbejde"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Appen er ikke installeret."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Appen er ikke tilgængelig"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Downloadet app er deaktiveret i sikker tilstand"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Widgets er deaktiveret i Beskyttet tilstand"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Genvejen er ikke tilgængelig"</string>
-    <string name="home_screen" msgid="806512411299847073">"Startskærm"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Brugerdefinerede handlinger"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Tryk på en widget, og hold den nede for at vælge."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Tryk to gange, og hold fingeren nede for at vælge en widget eller bruge tilpassede handlinger."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Startskærm"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Opdel skærm"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Hold en widget nede for at flytte den."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Tryk to gange, og hold en widget nede for at flytte den eller bruge tilpassede handlinger."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d i bredden og %2$d i højden"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Tryk og hold for at placere manuelt"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Tilføj automatisk"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> genvej</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> genveje</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Søg"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Ryd teksten i søgefeltet"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Der er ingen tilgængelig widget"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Der er ingen søgeresultater"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personlige"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Arbejde"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Samtaler"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Søg efter apps"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Indlæser apps…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Der blev ikke fundet nogen apps, som matcher \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Søg efter flere apps"</string>
     <string name="label_application" msgid="8531721983832654978">"App"</string>
+    <string name="search_corpus_apps" msgid="1917889409963779022">"Apps"</string>
+    <string name="search_action_try_now" msgid="1458737965476149074">"Prøv nu"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Notifikationer"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Hold en genvej nede for at samle den op."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Tryk to gange, og hold en genvej nede for at samle den op eller bruge tilpassede handlinger."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Hold en genvej nede for at flytte den."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Tryk to gange, og hold en genvej nede for at flytte den eller bruge tilpassede handlinger."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Der er ikke mere plads på denne startskærm."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Der er ikke mere plads i bakken Favoritter"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Liste med apps"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Liste over personlige apps"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Liste over apps til arbejdet"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Hjem"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Fjern"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Afinstaller"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Appinfo"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Installer"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Foreslå ikke en app"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Fastgør forslaget"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"installere genveje"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Tillader, at en app tilføjer genveje uden brugerens indgriben."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"læs indstillinger og genveje for startskærmen"</string>
@@ -63,7 +82,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Der er problemer med indlæsning af widgetten"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Konfigurer"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Dette er en systemapp, som ikke kan afinstalleres."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Unavngiven mappe"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Rediger navn"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> er deaktiveret"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="one"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, har <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> notifikation</item>
@@ -77,11 +96,11 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Tryk for at gemme omdøbningen"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Mappen er lukket"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Mappen er omdøbt til <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Mappe: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Mappe: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elementer"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Mappe: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> eller flere elementer"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Baggrunde"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stil og baggrunde"</string>
-    <string name="settings_button_text" msgid="8873672322605444408">"Startskærmindstillinger"</string>
+    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Layout og baggrunde"</string>
+    <string name="settings_button_text" msgid="8873672322605444408">"Indstillinger for startskærm"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Deaktiveret af din administrator"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Tillad rotation af startskærmen"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"Når telefonen roteres"</string>
@@ -89,19 +108,19 @@
     <string name="notification_dots_desc_on" msgid="1679848116452218908">"Til"</string>
     <string name="notification_dots_desc_off" msgid="1760796511504341095">"Fra"</string>
     <string name="title_missing_notification_access" msgid="7503287056163941064">"Kræver adgang til notifikationer"</string>
-    <string name="msg_missing_notification_access" msgid="281113995110910548">"Hvis du vil se notifikationscirkler, skal du aktivere appnotifikationer for <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="msg_missing_notification_access" msgid="281113995110910548">"Hvis du vil se notifikationsprikker, skal du aktivere appnotifikationer for <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Skift indstillinger"</string>
-    <string name="notification_dots_service_title" msgid="4284221181793592871">"Vis notifikationscirkler"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Føj ikon til startskærmen"</string>
+    <string name="notification_dots_service_title" msgid="4284221181793592871">"Vis notifikationsprikker"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Føj appikoner til startskærmen"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"For nye apps"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Ukendt"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Fjern"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Søg"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Denne app er ikke installeret"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Appen, der hører til dette ikon, er ikke installeret. Du kan fjerne den eller prøve at søge efter appen og installere den manuelt."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> installeres. <xliff:g id="PROGRESS">%2$s</xliff:g> fuldført"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> downloades. <xliff:g id="PROGRESS">%2$s</xliff:g> er gennemført"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> venter på at installere"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g>-widgets"</string>
     <string name="widgets_list" msgid="796804551140113767">"Liste med widgets"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Listen med widgets blev lukket"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Føj til startskærm"</string>
@@ -129,15 +148,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Genveje"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Genveje og notifikationer"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Afvis"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Luk"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Notifikationen blev afvist"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personlige"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Arbejde"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Arbejdsprofil"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Find arbejdsapps her"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Alle arbejdsapps har et badge og beskyttes af din organisation. Flyt apps til din startskærm, så du nemmere kan få adgang til dem."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Administreret af din organisation"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Notifikationer og apps er slået fra"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Luk"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Lukket"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Personlige data er adskilt og skjult fra arbejdsapps"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Arbejdsapps og -data er synlige for din it-administrator"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Næste"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Arbejdsprofilen er sat på pause"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Arbejdsapps kan ikke sende dig notifikationer, bruge dit batteri eller få adgang til din placering"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Arbejdsprofilen er sat på pause. Arbejdsapps kan ikke sende dig notifikationer, bruge dit batteri eller få adgang til din placering"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Arbejdsapps har badges og kan ses af din it-administrator"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Sæt arbejdsapps på pause"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Aktivér"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filter"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Sæt arbejdsapps og notifikationer på pause"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Mislykket: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index d80e905d8c..6ff4d7a3b4 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -26,32 +26,52 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Η λήψη εφαρμογών απενεργοποήθηκε στην Ασφαλή λειτουργία"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Τα γραφικά στοιχεία απενεργοποιήθηκαν στην ασφαλή λειτουργία"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Η συντόμευση δεν είναι διαθέσιμη"</string>
-    <string name="home_screen" msgid="806512411299847073">"Αρχική οθόνη"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Προσαρμοσμένες ενέργειες"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Αγγίξτε παρατεταμένα για να πάρετε ένα γραφ.στοιχ."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Πατήστε δύο φορές παρατεταμένα για επιλογή γραφικού στοιχείου ή χρήση προσαρμοσμένων ενεργειών."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Αρχική οθόνη"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Διαχωρισμός οθόνης"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Πατήστε παρατετ. για μετακίνηση γραφ. στοιχείου."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Πατήστε δύο φορές παρατεταμένα για μετακίνηση γραφικού στοιχείου ή χρήση προσαρμοσμένων ενεργειών."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Πλάτος %1$d επί ύψος %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Αγγίξτε παρατεταμένα για μη αυτόματη τοποθέτηση"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Αυτόματη προσθήκη"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> γραφικά στοιχεία</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> γραφικό στοιχείο</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> συντομεύσεις</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> συντόμευση</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Γραφικά στοιχεία"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Αναζήτηση"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Διαγραφή κειμένου από το πλαίσιο αναζήτησης"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Δεν υπάρχουν διαθέσιμα γραφικά στοιχεία"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Κανένα αποτέλεσμα αναζήτησης"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Προσωπικά"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Εργασίας"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Συζητήσεις"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Αναζήτηση εφαρμογών"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Φόρτωση εφαρμογών…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Δεν βρέθηκαν εφαρμογές αντιστοίχισης για \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Αναζήτηση περισσότερων εφαρμογών"</string>
     <string name="label_application" msgid="8531721983832654978">"Εφαρμογή"</string>
+    <string name="search_corpus_apps" msgid="1917889409963779022">"Εφαρμογές"</string>
+    <string name="search_action_try_now" msgid="1458737965476149074">"Δοκιμάστε τώρα"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Ειδοποιήσεις"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Αγγίξτε παρατεταμένα για επιλογή συντόμευσης."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Πατήσετε δύο φορές παρατεταμένα για επιλογή συντόμευσης ή χρήση προσαρμοσμένων ενεργειών."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Πατήστε παρατεταμένα για μετακίνηση συντόμευσης."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Πατήστε δύο φορές παρατεταμένα για μετακίνηση συντόμευσης ή χρήση προσαρμοσμένων ενεργειών."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Δεν υπάρχει χώρος σε αυτήν την αρχική οθόνη."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Δεν υπάρχει επιπλέον χώρος στην περιοχή Αγαπημένα"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Λίστα εφαρμογών"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Λίστα προσωπικών εφαρμογών"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Λίστα εφαρμογών εργασίας"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Αρχική οθόνη"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Κατάργηση"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Απεγκατάσταση"</string>
-    <string name="app_info_drop_target_label" msgid="692894985365717661">"Πληροφορίες εφαρμογής"</string>
+    <string name="app_info_drop_target_label" msgid="692894985365717661">"Πληροφ. εφαρμογής"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Εγκατάσταση"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Να μην προτείνεται η εφαρμογή"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Καρφίτσωμα πρόβλεψης"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"εγκατάσταση συντομεύσεων"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Επιτρέπει σε μια εφαρμογή την προσθήκη συντομεύσεων χωρίς την παρέμβαση του χρήστη."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"ανάγνωση ρυθμίσεων και συντομεύσεων αρχικής οθόνης"</string>
@@ -62,7 +82,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Παρουσιάστηκε πρόβλημα στη φόρτωση του γραφικού στοιχείου"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Ρύθμιση"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Αυτή είναι μια εφαρμογή συστήματος και δεν είναι δυνατή η κατάργηση της εγκατάστασής της."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Φάκελος χωρίς όνομα"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Επεξεργασία ονόματος"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> είναι απενεργοποιημένη"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other">Η εφαρμογή <xliff:g id="APP_NAME_2">%1$s</xliff:g>, έχει <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> ειδοποιήσεις</item>
@@ -76,8 +96,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Πατήστε για να αποθηκεύσετε τη νέα ονομασία"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Ο φάκελος έκλεισε"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Ο φάκελος μετονομάστηκε σε <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Φάκελος: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Γραφικά στοιχεία"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Φάκελος: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> στοιχεία"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Φάκελος: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ή περισσότερα στοιχεία"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Ταπετσαρίες"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Στιλ και ταπετσαρίες"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Ρυθμίσεις Αρχ. Οθ."</string>
@@ -91,16 +111,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Για να εμφανιστούν οι Κουκκίδες ειδοποίησης, ενεργοποιήστε τις κουκκίδες εφαρμογής για την εφαρμογή <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Αλλαγή ρυθμίσεων"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Εμφάνιση κουκκίδων ειδοποιήσεων"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Προσθήκη εικονιδίου στην Αρχική οθόνη"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Προσθ. εικονιδίων εφαρμ. σε αρχική οθόνη"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Για νέες εφαρμογές"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Άγνωστο"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Κατάργηση"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Αναζήτηση"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Αυτή η εφαρμογή δεν είναι εγκατεστημένη"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Η εφαρμογή γι\' αυτό το εικονίδιο δεν είναι εγκατεστημένη. Μπορείτε να το καταργήσετε ή να αναζητήσετε την εφαρμογή και να την εγκαταστήσετε με μη αυτόματο τρόπο."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"Έχει ολοκληρωθεί το <xliff:g id="PROGRESS">%2$s</xliff:g> της εγκατάστασης της εφαρμογής <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"Λήψη <xliff:g id="NAME">%1$s</xliff:g>, ολοκληρώθηκε <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> σε αναμονή για εγκατάσταση"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Γραφικά στοιχεία <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Λίστα γραφικών στοιχείων"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Η λίστα γραφικών στοιχείων έκλεισε"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Προσθήκη στην αρχική οθόνη"</string>
@@ -128,15 +148,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Συντομεύσεις"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Συντομεύσεις και ειδοποιήσεις"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Παράβλεψη"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Κλείσιμο"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Η ειδοποίηση παραβλέφθηκε"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Προσωπικές"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Εργασίας"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Προφίλ εργασίας"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Βρείτε όλες τις εφαρμογές εργασίας εδώ"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Κάθε εφαρμογή εργασίας φέρει ένα σήμα και διατηρείται ασφαλής από τον οργανισμό σας. Μετακινήστε τις εφαρμογές εργασίας στην Αρχική οθόνη, για να έχετε πιο εύκολη πρόσβαση."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Διαχειριζόμενο από τον οργανισμό σας"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Οι ειδοποιήσεις και οι εφαρμογές είναι απενεργοποιημένες"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Κλείσιμο"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Κλειστή"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Τα προσωπικά δεδομένα βρίσκονται σε ξεχωριστή θέση και δεν είναι ορατά από τις εφαρμογές εργασίας"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Οι εφαρμογές εργασίας και τα δεδομένα τους είναι ορατά στον διαχειριστή IT"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Επόμενο"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Το κατάλαβα"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Το προφίλ εργασίας έχει τεθεί σε παύση"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Οι εφαρμογές εργασιών δεν έχουν τη δυνατότητα αποστολής ειδοποιήσεων, χρήσης της μπαταρίας ή πρόσβασης στην τοποθεσία σας."</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Το προφίλ εργασίας έχει τεθεί σε παύση. Οι εφαρμογές εργασιών δεν έχουν τη δυνατότητα αποστολής ειδοποιήσεων, χρήσης της μπαταρίας ή πρόσβασης στην τοποθεσία σας."</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Οι εφαρμογές εργασιών φέρουν σήμα και είναι ορατές στον διαχειριστή IT σας"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Το κατάλαβα"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Παύση εφαρμογών εργασιών"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Ενεργοποίηση"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Φίλτρο"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Παύση εφαρμογών εργασίας και ειδοποιήσεων"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Αποτυχία: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 7adc2187ec..261bca35b3 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -26,32 +26,52 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Downloaded app disabled in Safe mode"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Widgets disabled in Safe mode"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Shortcut isn\'t available"</string>
-    <string name="home_screen" msgid="806512411299847073">"Home screen"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Customised actions"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Touch &amp; hold to pick up a widget."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Double-tap &amp; hold to pick up a widget or use customised actions."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Home"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Split screen"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Touch &amp; hold to move a widget."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Double-tap &amp; hold to move a widget or use custom actions."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d wide by %2$d high"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Touch &amp; hold to place manually"</string>
+    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Touch and hold to place manually"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Add automatically"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> shortcuts</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> shortcut</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Search"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Clear text from search box"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"No widgets available"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"No search results"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personal"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Work"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Conversations"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Search apps"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Loading apps…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"No apps found matching \'<xliff:g id="QUERY">%1$s</xliff:g>\'"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Search for more apps"</string>
     <string name="label_application" msgid="8531721983832654978">"App"</string>
+    <string name="search_corpus_apps" msgid="1917889409963779022">"Apps"</string>
+    <string name="search_action_try_now" msgid="1458737965476149074">"Try now"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Notifications"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Touch &amp; hold to pick up a shortcut."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Double-tap &amp; hold to pick up a shortcut or use custom actions."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Touch &amp; hold to move a shortcut."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Double-tap &amp; hold to move a shortcut or use custom actions."</string>
     <string name="out_of_space" msgid="4691004494942118364">"No more room on this Home screen."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"No more room in the Favourites tray"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Apps list"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Personal apps list"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Work apps list"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Home"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Remove"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Uninstall"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"App info"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Install"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Don\'t suggest app"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Pin prediction"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"install shortcuts"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Allows an app to add shortcuts without user intervention."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"read Home settings and shortcuts"</string>
@@ -62,7 +82,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Problem loading widget"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Setup"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"This is a system app and can\'t be uninstalled."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Unnamed Folder"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Edit Name"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Disabled <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, has <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> notifications</item>
@@ -76,8 +96,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Tap to save rename"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Folder closed"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Folder renamed to <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Folder: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> items"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> or more items"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Wallpapers"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Styles &amp; wallpapers"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Home settings"</string>
@@ -91,16 +111,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"To show Notification Dots, turn on app notifications for <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Change settings"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Show notification dots"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Add icon to Home screen"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Add app icons to the home screen"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"For new apps"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Unknown"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Remove"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Search"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"This app is not installed"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"The app for this icon isn\'t installed. You can remove it, or search for the app and install it manually."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> installing, <xliff:g id="PROGRESS">%2$s</xliff:g> complete"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> downloading, <xliff:g id="PROGRESS">%2$s</xliff:g> complete"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> waiting to install"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> widgets"</string>
     <string name="widgets_list" msgid="796804551140113767">"Widgets list"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Widgets list closed"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Add to Home screen"</string>
@@ -128,15 +148,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Short cuts"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Shortcuts and notifications"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Dismiss"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Close"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Notification dismissed"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personal"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Work"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Work profile"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Find work apps here"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Each work app has a badge and is kept secure by your organisation. Move apps to your Home screen for easier access."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Managed by your organisation"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Notifications and apps are off"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Close"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Closed"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Personal data is separate and hidden from work apps"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Work apps and data are visible to your IT admin"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Next"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Work profile is paused"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Work apps can’t send you notifications, use your battery or access your location"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Work profile is paused. Work apps can’t send you notifications, use your battery or access your location"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Work apps are badged and visible to your IT admin"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pause work apps"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Turn on"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filter"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Pause work apps and notifications"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Failed: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000000..261bca35b3
--- /dev/null
+++ b/res/values-en-rCA/strings.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2008 The Android Open Source Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
+    <string name="work_folder_name" msgid="3753320833950115786">"Work"</string>
+    <string name="activity_not_found" msgid="8071924732094499514">"App isn\'t installed."</string>
+    <string name="activity_not_available" msgid="7456344436509528827">"App isn\'t available"</string>
+    <string name="safemode_shortcut_error" msgid="9160126848219158407">"Downloaded app disabled in Safe mode"</string>
+    <string name="safemode_widget_error" msgid="4863470563535682004">"Widgets disabled in Safe mode"</string>
+    <string name="shortcut_not_available" msgid="2536503539825726397">"Shortcut isn\'t available"</string>
+    <string name="home_screen" msgid="5629429142036709174">"Home"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Split screen"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Touch &amp; hold to move a widget."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Double-tap &amp; hold to move a widget or use custom actions."</string>
+    <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
+    <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d wide by %2$d high"</string>
+    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Touch and hold to place manually"</string>
+    <string name="place_automatically" msgid="8064208734425456485">"Add automatically"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> shortcuts</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> shortcut</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Search"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Clear text from search box"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"No widgets available"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"No search results"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personal"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Work"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Conversations"</string>
+    <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Search apps"</string>
+    <string name="all_apps_loading_message" msgid="5813968043155271636">"Loading apps…"</string>
+    <string name="all_apps_no_search_results" msgid="3200346862396363786">"No apps found matching \'<xliff:g id="QUERY">%1$s</xliff:g>\'"</string>
+    <string name="all_apps_search_market_message" msgid="1366263386197059176">"Search for more apps"</string>
+    <string name="label_application" msgid="8531721983832654978">"App"</string>
+    <string name="search_corpus_apps" msgid="1917889409963779022">"Apps"</string>
+    <string name="search_action_try_now" msgid="1458737965476149074">"Try now"</string>
+    <string name="notifications_header" msgid="1404149926117359025">"Notifications"</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Touch &amp; hold to move a shortcut."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Double-tap &amp; hold to move a shortcut or use custom actions."</string>
+    <string name="out_of_space" msgid="4691004494942118364">"No more room on this Home screen."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"No more room in the Favourites tray"</string>
+    <string name="all_apps_button_label" msgid="8130441508702294465">"Apps list"</string>
+    <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Personal apps list"</string>
+    <string name="all_apps_button_work_label" msgid="7270707118948892488">"Work apps list"</string>
+    <string name="remove_drop_target_label" msgid="7812859488053230776">"Remove"</string>
+    <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Uninstall"</string>
+    <string name="app_info_drop_target_label" msgid="692894985365717661">"App info"</string>
+    <string name="install_drop_target_label" msgid="2539096853673231757">"Install"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Don\'t suggest app"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Pin prediction"</string>
+    <string name="permlab_install_shortcut" msgid="5632423390354674437">"install shortcuts"</string>
+    <string name="permdesc_install_shortcut" msgid="923466509822011139">"Allows an app to add shortcuts without user intervention."</string>
+    <string name="permlab_read_settings" msgid="1941457408239617576">"read Home settings and shortcuts"</string>
+    <string name="permdesc_read_settings" msgid="5833423719057558387">"Allows the app to read the settings and shortcuts in Home."</string>
+    <string name="permlab_write_settings" msgid="3574213698004620587">"write Home settings and shortcuts"</string>
+    <string name="permdesc_write_settings" msgid="5440712911516509985">"Allows the app to change the settings and shortcuts in Home."</string>
+    <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> is not allowed to make phone calls"</string>
+    <string name="gadget_error_text" msgid="6081085226050792095">"Problem loading widget"</string>
+    <string name="gadget_setup_text" msgid="8274003207686040488">"Setup"</string>
+    <string name="uninstall_system_app_text" msgid="4172046090762920660">"This is a system app and can\'t be uninstalled."</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Edit Name"</string>
+    <string name="disabled_app_label" msgid="6673129024321402780">"Disabled <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
+      <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, has <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> notifications</item>
+      <item quantity="one"><xliff:g id="APP_NAME_0">%1$s</xliff:g>, has <xliff:g id="NOTIFICATION_COUNT_1">%2$d</xliff:g> notification</item>
+    </plurals>
+    <string name="default_scroll_format" msgid="7475544710230993317">"Page %1$d of %2$d"</string>
+    <string name="workspace_scroll_format" msgid="8458889198184077399">"Home screen %1$d of %2$d"</string>
+    <string name="workspace_new_page" msgid="257366611030256142">"New home screen page"</string>
+    <string name="folder_opened" msgid="94695026776264709">"Folder opened, <xliff:g id="WIDTH">%1$d</xliff:g> by <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
+    <string name="folder_tap_to_close" msgid="4625795376335528256">"Tap to close folder"</string>
+    <string name="folder_tap_to_rename" msgid="4017685068016979677">"Tap to save rename"</string>
+    <string name="folder_closed" msgid="4100806530910930934">"Folder closed"</string>
+    <string name="folder_renamed" msgid="1794088362165669656">"Folder renamed to <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> items"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> or more items"</string>
+    <string name="wallpaper_button_text" msgid="8404103075899945851">"Wallpapers"</string>
+    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Styles &amp; wallpapers"</string>
+    <string name="settings_button_text" msgid="8873672322605444408">"Home settings"</string>
+    <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Disabled by your admin"</string>
+    <string name="allow_rotation_title" msgid="7728578836261442095">"Allow Home screen rotation"</string>
+    <string name="allow_rotation_desc" msgid="8662546029078692509">"When phone is rotated"</string>
+    <string name="notification_dots_title" msgid="9062440428204120317">"Notification dots"</string>
+    <string name="notification_dots_desc_on" msgid="1679848116452218908">"On"</string>
+    <string name="notification_dots_desc_off" msgid="1760796511504341095">"Off"</string>
+    <string name="title_missing_notification_access" msgid="7503287056163941064">"Notification access needed"</string>
+    <string name="msg_missing_notification_access" msgid="281113995110910548">"To show Notification Dots, turn on app notifications for <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="title_change_settings" msgid="1376365968844349552">"Change settings"</string>
+    <string name="notification_dots_service_title" msgid="4284221181793592871">"Show notification dots"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Add app icons to the home screen"</string>
+    <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"For new apps"</string>
+    <string name="package_state_unknown" msgid="7592128424511031410">"Unknown"</string>
+    <string name="abandoned_clean_this" msgid="7610119707847920412">"Remove"</string>
+    <string name="abandoned_search" msgid="891119232568284442">"Search"</string>
+    <string name="abandoned_promises_title" msgid="7096178467971716750">"This app is not installed"</string>
+    <string name="abandoned_promise_explanation" msgid="3990027586878167529">"The app for this icon isn\'t installed. You can remove it, or search for the app and install it manually."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> installing, <xliff:g id="PROGRESS">%2$s</xliff:g> complete"</string>
+    <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> downloading, <xliff:g id="PROGRESS">%2$s</xliff:g> complete"</string>
+    <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> waiting to install"</string>
+    <string name="widgets_list" msgid="796804551140113767">"Widgets list"</string>
+    <string name="widgets_list_closed" msgid="6141506579418771922">"Widgets list closed"</string>
+    <string name="action_add_to_workspace" msgid="8902165848117513641">"Add to Home screen"</string>
+    <string name="action_move_here" msgid="2170188780612570250">"Move item here"</string>
+    <string name="item_added_to_workspace" msgid="4211073925752213539">"Item added to home screen"</string>
+    <string name="item_removed" msgid="851119963877842327">"Item removed"</string>
+    <string name="undo" msgid="4151576204245173321">"Undo"</string>
+    <string name="action_move" msgid="4339390619886385032">"Move item"</string>
+    <string name="move_to_empty_cell" msgid="2833711483015685619">"Move to row <xliff:g id="NUMBER_0">%1$s</xliff:g> column <xliff:g id="NUMBER_1">%2$s</xliff:g>"</string>
+    <string name="move_to_position" msgid="6750008980455459790">"Move to position <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <string name="move_to_hotseat_position" msgid="6295412897075147808">"Move to favourites position <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <string name="item_moved" msgid="4606538322571412879">"Item moved"</string>
+    <string name="add_to_folder" msgid="9040534766770853243">"Add to folder: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="add_to_folder_with_app" msgid="4534929978967147231">"Add to folder with <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="added_to_folder" msgid="4793259502305558003">"Item added to folder"</string>
+    <string name="create_folder_with" msgid="4050141361160214248">"Create folder with: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="folder_created" msgid="6409794597405184510">"Folder created"</string>
+    <string name="action_move_to_workspace" msgid="1603837886334246317">"Move to Home screen"</string>
+    <string name="action_resize" msgid="1802976324781771067">"Re-size"</string>
+    <string name="action_increase_width" msgid="8773715375078513326">"Increase width"</string>
+    <string name="action_increase_height" msgid="459390020612501122">"Increase height"</string>
+    <string name="action_decrease_width" msgid="1374549771083094654">"Decrease width"</string>
+    <string name="action_decrease_height" msgid="282377193880900022">"Decrease height"</string>
+    <string name="widget_resized" msgid="9130327887929620">"Widget re-sized to width <xliff:g id="NUMBER_0">%1$s</xliff:g> height <xliff:g id="NUMBER_1">%2$s</xliff:g>"</string>
+    <string name="action_deep_shortcut" msgid="2864038805849372848">"Short cuts"</string>
+    <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Shortcuts and notifications"</string>
+    <string name="action_dismiss_notification" msgid="5909461085055959187">"Dismiss"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Close"</string>
+    <string name="notification_dismissed" msgid="6002233469409822874">"Notification dismissed"</string>
+    <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personal"</string>
+    <string name="all_apps_work_tab" msgid="4884822796154055118">"Work"</string>
+    <string name="work_profile_toggle_label" msgid="3081029915775481146">"Work profile"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Personal data is separate and hidden from work apps"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Work apps and data are visible to your IT admin"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Next"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Work profile is paused"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Work apps can’t send you notifications, use your battery or access your location"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Work profile is paused. Work apps can’t send you notifications, use your battery or access your location"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Work apps are badged and visible to your IT admin"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pause work apps"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Turn on"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filter"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Pause work apps and notifications"</string>
+    <string name="remote_action_failed" msgid="1383965239183576790">"Failed: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
+</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 7adc2187ec..261bca35b3 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -26,32 +26,52 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Downloaded app disabled in Safe mode"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Widgets disabled in Safe mode"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Shortcut isn\'t available"</string>
-    <string name="home_screen" msgid="806512411299847073">"Home screen"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Customised actions"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Touch &amp; hold to pick up a widget."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Double-tap &amp; hold to pick up a widget or use customised actions."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Home"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Split screen"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Touch &amp; hold to move a widget."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Double-tap &amp; hold to move a widget or use custom actions."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d wide by %2$d high"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Touch &amp; hold to place manually"</string>
+    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Touch and hold to place manually"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Add automatically"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> shortcuts</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> shortcut</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Search"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Clear text from search box"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"No widgets available"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"No search results"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personal"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Work"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Conversations"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Search apps"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Loading apps…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"No apps found matching \'<xliff:g id="QUERY">%1$s</xliff:g>\'"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Search for more apps"</string>
     <string name="label_application" msgid="8531721983832654978">"App"</string>
+    <string name="search_corpus_apps" msgid="1917889409963779022">"Apps"</string>
+    <string name="search_action_try_now" msgid="1458737965476149074">"Try now"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Notifications"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Touch &amp; hold to pick up a shortcut."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Double-tap &amp; hold to pick up a shortcut or use custom actions."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Touch &amp; hold to move a shortcut."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Double-tap &amp; hold to move a shortcut or use custom actions."</string>
     <string name="out_of_space" msgid="4691004494942118364">"No more room on this Home screen."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"No more room in the Favourites tray"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Apps list"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Personal apps list"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Work apps list"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Home"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Remove"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Uninstall"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"App info"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Install"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Don\'t suggest app"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Pin prediction"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"install shortcuts"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Allows an app to add shortcuts without user intervention."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"read Home settings and shortcuts"</string>
@@ -62,7 +82,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Problem loading widget"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Setup"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"This is a system app and can\'t be uninstalled."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Unnamed Folder"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Edit Name"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Disabled <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, has <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> notifications</item>
@@ -76,8 +96,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Tap to save rename"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Folder closed"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Folder renamed to <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Folder: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> items"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> or more items"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Wallpapers"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Styles &amp; wallpapers"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Home settings"</string>
@@ -91,16 +111,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"To show Notification Dots, turn on app notifications for <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Change settings"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Show notification dots"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Add icon to Home screen"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Add app icons to the home screen"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"For new apps"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Unknown"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Remove"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Search"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"This app is not installed"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"The app for this icon isn\'t installed. You can remove it, or search for the app and install it manually."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> installing, <xliff:g id="PROGRESS">%2$s</xliff:g> complete"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> downloading, <xliff:g id="PROGRESS">%2$s</xliff:g> complete"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> waiting to install"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> widgets"</string>
     <string name="widgets_list" msgid="796804551140113767">"Widgets list"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Widgets list closed"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Add to Home screen"</string>
@@ -128,15 +148,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Short cuts"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Shortcuts and notifications"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Dismiss"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Close"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Notification dismissed"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personal"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Work"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Work profile"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Find work apps here"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Each work app has a badge and is kept secure by your organisation. Move apps to your Home screen for easier access."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Managed by your organisation"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Notifications and apps are off"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Close"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Closed"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Personal data is separate and hidden from work apps"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Work apps and data are visible to your IT admin"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Next"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Work profile is paused"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Work apps can’t send you notifications, use your battery or access your location"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Work profile is paused. Work apps can’t send you notifications, use your battery or access your location"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Work apps are badged and visible to your IT admin"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pause work apps"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Turn on"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filter"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Pause work apps and notifications"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Failed: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 7adc2187ec..261bca35b3 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -26,32 +26,52 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Downloaded app disabled in Safe mode"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Widgets disabled in Safe mode"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Shortcut isn\'t available"</string>
-    <string name="home_screen" msgid="806512411299847073">"Home screen"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Customised actions"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Touch &amp; hold to pick up a widget."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Double-tap &amp; hold to pick up a widget or use customised actions."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Home"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Split screen"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Touch &amp; hold to move a widget."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Double-tap &amp; hold to move a widget or use custom actions."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d wide by %2$d high"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Touch &amp; hold to place manually"</string>
+    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Touch and hold to place manually"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Add automatically"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> shortcuts</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> shortcut</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Search"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Clear text from search box"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"No widgets available"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"No search results"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personal"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Work"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Conversations"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Search apps"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Loading apps…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"No apps found matching \'<xliff:g id="QUERY">%1$s</xliff:g>\'"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Search for more apps"</string>
     <string name="label_application" msgid="8531721983832654978">"App"</string>
+    <string name="search_corpus_apps" msgid="1917889409963779022">"Apps"</string>
+    <string name="search_action_try_now" msgid="1458737965476149074">"Try now"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Notifications"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Touch &amp; hold to pick up a shortcut."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Double-tap &amp; hold to pick up a shortcut or use custom actions."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Touch &amp; hold to move a shortcut."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Double-tap &amp; hold to move a shortcut or use custom actions."</string>
     <string name="out_of_space" msgid="4691004494942118364">"No more room on this Home screen."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"No more room in the Favourites tray"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Apps list"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Personal apps list"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Work apps list"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Home"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Remove"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Uninstall"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"App info"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Install"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Don\'t suggest app"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Pin prediction"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"install shortcuts"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Allows an app to add shortcuts without user intervention."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"read Home settings and shortcuts"</string>
@@ -62,7 +82,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Problem loading widget"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Setup"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"This is a system app and can\'t be uninstalled."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Unnamed Folder"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Edit Name"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Disabled <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, has <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> notifications</item>
@@ -76,8 +96,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Tap to save rename"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Folder closed"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Folder renamed to <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Folder: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> items"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> or more items"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Wallpapers"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Styles &amp; wallpapers"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Home settings"</string>
@@ -91,16 +111,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"To show Notification Dots, turn on app notifications for <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Change settings"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Show notification dots"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Add icon to Home screen"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Add app icons to the home screen"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"For new apps"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Unknown"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Remove"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Search"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"This app is not installed"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"The app for this icon isn\'t installed. You can remove it, or search for the app and install it manually."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> installing, <xliff:g id="PROGRESS">%2$s</xliff:g> complete"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> downloading, <xliff:g id="PROGRESS">%2$s</xliff:g> complete"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> waiting to install"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> widgets"</string>
     <string name="widgets_list" msgid="796804551140113767">"Widgets list"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Widgets list closed"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Add to Home screen"</string>
@@ -128,15 +148,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Short cuts"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Shortcuts and notifications"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Dismiss"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Close"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Notification dismissed"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personal"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Work"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Work profile"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Find work apps here"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Each work app has a badge and is kept secure by your organisation. Move apps to your Home screen for easier access."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Managed by your organisation"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Notifications and apps are off"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Close"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Closed"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Personal data is separate and hidden from work apps"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Work apps and data are visible to your IT admin"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Next"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Work profile is paused"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Work apps can’t send you notifications, use your battery or access your location"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Work profile is paused. Work apps can’t send you notifications, use your battery or access your location"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Work apps are badged and visible to your IT admin"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pause work apps"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Turn on"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filter"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Pause work apps and notifications"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Failed: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
new file mode 100644
index 0000000000..9957cfcb15
--- /dev/null
+++ b/res/values-en-rXC/strings.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2008 The Android Open Source Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="649227358658669779">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‎‏‎‏‎‎‎‎‏‎‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‎‎‎‏‎‏‎‏‏‎‎‏‏‎‏‎‎‏‏‎Launcher3‎‏‎‎‏‎"</string>
+    <string name="work_folder_name" msgid="3753320833950115786">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‎‏‏‎‎‏‏‏‏‎‎‏‎‏‏‎‏‎‎‏‏‎‎‏‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‎‎‏‏‏‏‏‎‎‏‎‏‎‎Work‎‏‎‎‏‎"</string>
+    <string name="activity_not_found" msgid="8071924732094499514">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‎‏‎‎‏‏‏‏‎‎‏‏‎‎‎‏‏‎‏‏‏‎‎‏‏‎‎‎‏‎‏‏‏‎‏‏‎‎‏‎‏‎‏‎‏‏‏‎‏‎‎App isn\'t installed.‎‏‎‎‏‎"</string>
+    <string name="activity_not_available" msgid="7456344436509528827">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‏‏‎‎‎‎‏‎‎‏‏‏‎‏‎‏‎‎‎‏‏‏‎‎‎‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎App isn\'t available‎‏‎‎‏‎"</string>
+    <string name="safemode_shortcut_error" msgid="9160126848219158407">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‎‏‎‏‏‎‎‎‎‎‎‏‎‏‏‎‎‏‏‏‏‏‎‎‎‏‎‏‏‏‏‎‎‎‎‏‏‏‎Downloaded app disabled in Safe mode‎‏‎‎‏‎"</string>
+    <string name="safemode_widget_error" msgid="4863470563535682004">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‏‎‏‎‏‏‎‏‏‎‎‏‏‎‎‎‏‏‏‎‎‏‏‏‏‏‎‎‏‏‏‎‏‎‏‎‎‎Widgets disabled in Safe mode‎‏‎‎‏‎"</string>
+    <string name="shortcut_not_available" msgid="2536503539825726397">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‎‎‏‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‎‏‎‏‎‏‎‎‏‏‏‎‏‏‏‏‎‏‎Shortcut isn\'t available‎‏‎‎‏‎"</string>
+    <string name="home_screen" msgid="5629429142036709174">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎Home‎‏‎‎‏‎"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‎‎‏‎‏‏‎‎‏‏‏‏‏‏‎‎‎‎‏‏‎‏‏‎‎‏‏‎‎‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‏‏‎Split screen‎‏‎‎‏‎"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‏‎‏‎‎‎‎‏‏‏‎‏‏‎‎‎‏‏‎‎‏‏‎‎‎‏‎‎‎‎‏‎‏‎‎‏‎‎‎‏‏‎‎‎‎‎‏‎‏‎‎‏‎Touch &amp; hold to move a widget.‎‏‎‎‏‎"</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‎‏‏‏‏‎‎‎‎‏‏‎‏‎‏‏‎‎‎‎‎‎‏‎‏‎‎‎‎‎‎‎‎‎‏‏‎‎Double-tap &amp; hold to move a widget or use custom actions.‎‏‎‎‏‎"</string>
+    <string name="widget_dims_format" msgid="2370757736025621599">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‎‎‏‎‎‎‎‎‏‎‎‎‏‎‏‏‏‏‏‎%1$d × %2$d‎‏‎‎‏‎"</string>
+    <string name="widget_accessible_dims_format" msgid="3640149169885301790">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‎‏‎‎‎‏‏‎‏‎‎‎‎‏‏‎‎‎‏‎‎‎‏‏‏‎‎‎‎‏‏‏‎‎‏‎‎‏‎‎‏‏‎‎‎‎‎‏‏‏‏‎‎%1$d wide by %2$d high‎‏‎‎‏‎"</string>
+    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‎‎‎‎‎‎‏‎‏‏‎‎‎‏‎‏‎‏‏‏‎‎‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‏‎Touch &amp; hold to place manually‎‏‎‎‏‎"</string>
+    <string name="place_automatically" msgid="8064208734425456485">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎Add automatically‎‏‎‎‏‎"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‏‏‏‎‏‎‏‏‎‎‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‏‎‎‎‎‏‎‏‏‎‎‎‏‎‎‏‎‏‎‏‏‏‎‎‎‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g>‎‏‎‎‏‏‏‎ widgets‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‏‏‏‎‏‎‏‏‎‎‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‏‎‎‎‎‏‎‏‏‎‎‎‏‎‎‏‎‏‎‏‏‏‎‎‎‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g>‎‏‎‎‏‏‏‎ widget‎‏‎‎‏‎</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‎‎‏‎‏‏‏‏‏‎‎‏‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g>‎‏‎‎‏‏‏‎ shortcuts‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‎‎‏‎‏‏‏‏‏‎‎‏‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g>‎‏‎‎‏‏‏‎ shortcut‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‏‎‎‏‎‏‎‎‎‎‎‎‏‎‎‏‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>‎‏‎‎‏‏‏‎, ‎‏‎‎‏‏‎<xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‎‎‏‎‏‏‎‏‎‎‎‎‎‎‏‏‎‎‏‎‏‏‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎Widgets‎‏‎‎‏‎"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‎‎‎‎‏‎‎‎‏‏‎‏‏‏‎‎‏‏‏‎‏‎‎‏‎Search‎‏‎‎‏‎"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‎‎‏‎‏‏‎‎‎‏‎‏‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‎‎‎‎‏‎‏‏‎‎‎‏‏‎‏‏‎‏‎‎‏‎‎‏‎‏‎Clear text from search box‎‏‎‎‏‎"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‎‏‎‏‏‎‎‎‏‎‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‏‏‎‎‎‎‏‎No widgets available‎‏‎‎‏‎"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‏‏‏‎‎‏‏‎‎‎‎‎‏‏‏‏‏‏‎‎‎‏‏‏‎‎‎‎‏‎‏‏‎‎‏‎‎‎‏‏‎‏‏‎‎‎‏‎‏‎‎‎No search results‎‏‎‎‏‎"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‏‎‎‏‏‎‎‎‎‎‎‏‏‎‎‏‏‎‎‎‎‏‎‏‎‏‏‎‏‏‏‎‎‎‎‎‎‎‎‎‎‎‏‎‏‎‎‏‏‎‏‏‎‎Personal‎‏‎‎‏‎"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‎‏‎‎‎‎‏‎‏‎‎‎‏‎‎‏‎‎‏‎‏‎Work‎‏‎‎‏‎"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‎‏‎‎‎‎‏‎‎‏‏‏‎‎‎‎‎‎‎‏‎‏‎‏‎‏‏‎‎‏‏‎‏‎‏‏‏‎‎Conversations‎‏‎‎‏‎"</string>
+    <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎‎‏‏‎‎‎‎‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‎‏‏‏‏‎‎‏‎‎‎‏‏‎‎‏‏‏‎‏‎‎‎‎‏‎‎‏‏‏‎‎Search apps‎‏‎‎‏‎"</string>
+    <string name="all_apps_loading_message" msgid="5813968043155271636">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‏‏‏‏‎‏‎‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎‎‏‎‏‏‏‏‏‏‎‏‎‏‎‎‎Loading apps…‎‏‎‎‏‎"</string>
+    <string name="all_apps_no_search_results" msgid="3200346862396363786">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‏‎‎‏‏‏‏‎‏‎‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‎‏‏‏‏‎‏‎‏‎‎‎‎‎‎‏‎‏‎‎No apps found matching \"‎‏‎‎‏‏‎<xliff:g id="QUERY">%1$s</xliff:g>‎‏‎‎‏‏‏‎\"‎‏‎‎‏‎"</string>
+    <string name="all_apps_search_market_message" msgid="1366263386197059176">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‎‏‎‏‏‏‏‏‎‎‎‏‎‏‎‎‏‏‏‏‏‎‎‏‏‎‏‏‏‏‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‎‏‎‎‎‎Search for more apps‎‏‎‎‏‎"</string>
+    <string name="label_application" msgid="8531721983832654978">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‎‎‎‎‎‏‎‎App‎‏‎‎‏‎"</string>
+    <string name="search_corpus_apps" msgid="1917889409963779022">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‏‏‎‏‏‎‏‏‎‏‏‎‎‏‎‎‎‎‎‏‏‏‎‎‎‏‏‏‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‏‏‏‎‎Apps‎‏‎‎‏‎"</string>
+    <string name="search_action_try_now" msgid="1458737965476149074">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‏‏‏‎‎‏‏‎‏‏‎‏‏‎‎‏‎‎‏‎‏‎‎‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‎Try Now‎‏‎‎‏‎"</string>
+    <string name="notifications_header" msgid="1404149926117359025">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎‏‎‏‏‎‎‏‏‏‎‏‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‏‎Notifications‎‏‎‎‏‎"</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‎‎‎‎‏‏‏‎‎‏‎‏‎‏‏‏‎‏‎‏‏‏‏‎‎‎‏‏‏‎‏‎‎‏‏‎‎‏‎‎‏‎‏‏‎‏‎‏‏‎‏‎‎‏‎Touch &amp; hold to move a shortcut.‎‏‎‎‏‎"</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‎‎‏‎‏‎‎‏‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‎‏‎‏‎‎‏‎‏‎‏‎‏‏‎‏‎‎‎Double-tap &amp; hold to move a shortcut or use custom actions.‎‏‎‎‏‎"</string>
+    <string name="out_of_space" msgid="4691004494942118364">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‏‎‎‏‏‏‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‎‎‏‎‎‏‎‎‎‎‏‏‏‎‏‏‏‎‎‎No more room on this Home screen.‎‏‎‎‏‎"</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‏‎‏‏‏‏‎‏‎No more room in the Favorites tray‎‏‎‎‏‎"</string>
+    <string name="all_apps_button_label" msgid="8130441508702294465">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‏‎‏‎‎‏‎‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‎‎‏‎‏‎‎‏‎‏‎‏‎‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎Apps list‎‏‎‎‏‎"</string>
+    <string name="all_apps_button_personal_label" msgid="1315764287305224468">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‎‏‎‏‎‎‎‏‎‎‎‏‎‏‎‎‏‎‏‏‏‏‎‏‎‎‎‏‏‏‏‏‎‎‏‎‎‎‏‎‎‎‏‎‎‎‏‎‏‎‎‎Personal apps list‎‏‎‎‏‎"</string>
+    <string name="all_apps_button_work_label" msgid="7270707118948892488">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‏‏‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‏‎‎‏‎‏‎‎‏‎‏‏‎‏‏‎‏‎‎‎‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎Work apps list‎‏‎‎‏‎"</string>
+    <string name="remove_drop_target_label" msgid="7812859488053230776">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎‎‏‎‎‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‏‎‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎Remove‎‏‎‎‏‎"</string>
+    <string name="uninstall_drop_target_label" msgid="4722034217958379417">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‎‏‎‎‎‎‎‎‎‏‎‎‏‎‎‎‏‏‎‏‎‎‏‎‏‎‎‏‎‏‎‏‎‎‏‏‎‎‎‎‎‏‏‏‏‏‎‎‏‏‎‎‏‎Uninstall‎‏‎‎‏‎"</string>
+    <string name="app_info_drop_target_label" msgid="692894985365717661">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‏‏‏‎‏‏‎‏‎‏‎‎‎‎‏‎‏‎‎‎‏‎‏‏‎‏‏‎‏‎‏‎‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‎‏‏‏‎‏‎App info‎‏‎‎‏‎"</string>
+    <string name="install_drop_target_label" msgid="2539096853673231757">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‏‎‎‏‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‎‎‏‎‏‏‎‎‎‏‏‎‏‎Install‎‏‎‎‏‎"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎‏‏‎‎‎‎‏‏‏‎‏‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‏‏‎‏‏‎‏‎‎‏‎‎Don\'t suggest app‎‏‎‎‏‎"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‏‏‎‎‏‎‏‏‎‎‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‎‎‎‎‏‏‎‎‏‎‎‏‏‏‎‎‏‎‏‎‏‎‎‏‎‎Pin Prediction‎‏‎‎‏‎"</string>
+    <string name="permlab_install_shortcut" msgid="5632423390354674437">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‏‎‏‎‏‎‎‏‏‎‎‎‏‏‎‎‏‏‏‎‏‏‎‏‎‎‏‏‏‎‏‎‏‏‎‎‎‏‎‎‎‏‎‎‏‏‎‎‎‎‎‏‎‏‎install shortcuts‎‏‎‎‏‎"</string>
+    <string name="permdesc_install_shortcut" msgid="923466509822011139">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎‏‏‏‎‎‎‎‎‎‏‏‎Allows an app to add shortcuts without user intervention.‎‏‎‎‏‎"</string>
+    <string name="permlab_read_settings" msgid="1941457408239617576">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‏‏‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‎‎‏‎‎‎‏‏‎‎‎‏‎‏‎‎‎‎read Home settings and shortcuts‎‏‎‎‏‎"</string>
+    <string name="permdesc_read_settings" msgid="5833423719057558387">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‎‏‎‎‎‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‏‏‎‎‎‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‎‎‏‏‎Allows the app to read the settings and shortcuts in Home.‎‏‎‎‏‎"</string>
+    <string name="permlab_write_settings" msgid="3574213698004620587">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‎‏‏‎‏‎‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‎‎‏‏‎‏‎‎‏‎‏‎‏‎‎‏‎‏‎‏‏‎write Home settings and shortcuts‎‏‎‎‏‎"</string>
+    <string name="permdesc_write_settings" msgid="5440712911516509985">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‏‎‎‏‎‏‏‏‎‎‏‎‎‎‏‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‎‏‏‏‎‎‏‎‎‎‎‏‎Allows the app to change the settings and shortcuts in Home.‎‏‎‎‏‎"</string>
+    <string name="msg_no_phone_permission" msgid="9208659281529857371">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‏‎‏‎‏‏‎‏‎‎‏‏‏‎‏‏‎‏‎‏‎‎‏‏‎‎‎‎‏‏‏‎‎‏‎‏‎‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ is not allowed to make phone calls‎‏‎‎‏‎"</string>
+    <string name="gadget_error_text" msgid="6081085226050792095">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‏‎‎‏‎‏‏‎‏‎‎‏‎‏‏‏‎‏‎‎‎‏‎‎‎‏‎‏‎‏‎‏‎‎‏‏‏‏‏‎Problem loading widget‎‏‎‎‏‎"</string>
+    <string name="gadget_setup_text" msgid="8274003207686040488">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‏‏‎‎‏‎‏‎‏‎‎‎‎‏‎‏‎‎‎‏‏‏‎‎‎‎‏‎‎‏‎‎‎‏‏‎‏‎‏‎‏‏‏‎‏‎‏‎‎‎‎Setup‎‏‎‎‏‎"</string>
+    <string name="uninstall_system_app_text" msgid="4172046090762920660">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‏‏‏‎‏‎‎‎‎‏‎‏‎‏‎‏‎‎‏‏‏‏‎‏‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‎‎‎This is a system app and can\'t be uninstalled.‎‏‎‎‏‎"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‏‏‎‎‎‏‎‎‏‎‏‎‏‏‎‏‎‎‎‏‎‏‎‎‏‎‎‎‎‏‏‏‎‏‏‎‏‎‏‏‎‎‎‎‎Edit Name‎‏‎‎‏‎"</string>
+    <string name="disabled_app_label" msgid="6673129024321402780">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‎‎‎Disabled ‎‏‎‎‏‏‎<xliff:g id="APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‏‎‏‏‎‏‎‏‏‎‏‎‎‏‏‏‎‎‎‏‎‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‏‎‏‎‎‎‏‎‏‎‎‏‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="APP_NAME_2">%1$s</xliff:g>‎‏‎‎‏‏‏‎, has ‎‏‎‎‏‏‎<xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g>‎‏‎‎‏‏‏‎ notifications‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‏‎‏‏‎‏‎‏‏‎‏‎‎‏‏‏‎‎‎‏‎‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‏‎‏‎‎‎‏‎‏‎‎‏‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="APP_NAME_0">%1$s</xliff:g>‎‏‎‎‏‏‏‎, has ‎‏‎‎‏‏‎<xliff:g id="NOTIFICATION_COUNT_1">%2$d</xliff:g>‎‏‎‎‏‏‏‎ notification‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="default_scroll_format" msgid="7475544710230993317">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‏‎‎‎‎‏‎‎‏‏‏‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‎‎‏‏‎‏‎‎‏‎‏‎Page %1$d of %2$d‎‏‎‎‏‎"</string>
+    <string name="workspace_scroll_format" msgid="8458889198184077399">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‎‎‎‎‎‎‎‏‎‏‏‏‎‏‎‎‎‏‎‎‏‏‏‎‎‎‎‏‎‎‏‏‎‏‎‎‏‏‎‎‎‎‏‎‏‎‏‏‏‎Home screen %1$d of %2$d‎‏‎‎‏‎"</string>
+    <string name="workspace_new_page" msgid="257366611030256142">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‎‎‏‎‎‏‎‏‏‎‎‏‏‎‎‏‎‎‎‏‏‎‏‏‎‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‏‎‏‎‎‎‎‎‏‏‏‎‎New home screen page‎‏‎‎‏‎"</string>
+    <string name="folder_opened" msgid="94695026776264709">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‎‏‏‎‏‎‏‎‎‎‎‎‏‏‎‏‏‎‎‏‎‏‎‎‎‎‎‎‎‎‎‏‎‎‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‎‎‏‎‏‎Folder opened, ‎‏‎‎‏‏‎<xliff:g id="WIDTH">%1$d</xliff:g>‎‏‎‎‏‏‏‎ by ‎‏‎‎‏‏‎<xliff:g id="HEIGHT">%2$d</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="folder_tap_to_close" msgid="4625795376335528256">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‏‎‎‏‎‎‎‏‎‎‎‎‎‎‏‏‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‎‎‎‎‎‎Tap to close folder‎‏‎‎‏‎"</string>
+    <string name="folder_tap_to_rename" msgid="4017685068016979677">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‎‎‏‎‏‎‎‎‏‎‏‏‎‎‎‎‏‏‏‎‏‏‎‏‏‏‎‏‎Tap to save rename‎‏‎‎‏‎"</string>
+    <string name="folder_closed" msgid="4100806530910930934">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‎‏‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‏‎‏‏‏‏‎‎‎‏‏‎‎‎‏‎‎‎‏‏‏‏‏‏‏‎‏‏‎‎Folder closed‎‏‎‎‏‎"</string>
+    <string name="folder_renamed" msgid="1794088362165669656">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‏‏‎‎‎‎‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎‏‎‏‎‎‎‏‏‎‎‎‎‎‎‏‏‏‏‎‎‎‏‏‎‎‎‎Folder renamed to ‎‏‎‎‏‏‎<xliff:g id="NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‏‎‎‎‏‏‏‎‎‏‎‎‎‎‎‎‎‏‏‎Folder: ‎‏‎‎‏‏‎<xliff:g id="NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎, ‎‏‎‎‏‏‎<xliff:g id="SIZE">%2$d</xliff:g>‎‏‎‎‏‏‏‎ items‎‏‎‎‏‎"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‏‏‏‏‎‎‏‎‏‏‎‏‎‎‏‎‏‏‏‎‏‎‎‏‎‎‏‎‎‏‏‎‏‏‎‎‏‎‎‏‏‏‏‏‏‏‏‎Folder: ‎‏‎‎‏‏‎<xliff:g id="NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎, ‎‏‎‎‏‏‎<xliff:g id="SIZE">%2$d</xliff:g>‎‏‎‎‏‏‏‎ or more items‎‏‎‎‏‎"</string>
+    <string name="wallpaper_button_text" msgid="8404103075899945851">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‎‏‎‏‎‏‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‏‎‏‏‎‎‏‏‎‏‏‏‏‎‏‏‎Wallpapers‎‏‎‎‏‎"</string>
+    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‎‎‏‎‏‎‎‎‏‎‎‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‏‎‎‎‏‏‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎Styles &amp; wallpapers‎‏‎‎‏‎"</string>
+    <string name="settings_button_text" msgid="8873672322605444408">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‏‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‏‎‎‎‎‏‏‏‎‎‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎‎‎Home settings‎‏‎‎‏‎"</string>
+    <string name="msg_disabled_by_admin" msgid="6898038085516271325">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‏‎‎‎‏‎‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‎‎‎‎‎‎‎‏‏‏‏‎‏‏‎‏‏‏‎‏‎Disabled by your admin‎‏‎‎‏‎"</string>
+    <string name="allow_rotation_title" msgid="7728578836261442095">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‎‎‏‎‏‏‎‏‏‎‏‏‎‎‎‎‎‎‎‏‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎Allow Home screen rotation‎‏‎‎‏‎"</string>
+    <string name="allow_rotation_desc" msgid="8662546029078692509">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‎‏‏‎‏‏‏‏‎‏‎‎‎‎‏‏‎‏‏‎‏‎‎‏‏‎‎‎‎‏‎‏‎‎‏‏‏‎‏‎When phone is rotated‎‏‎‎‏‎"</string>
+    <string name="notification_dots_title" msgid="9062440428204120317">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‎‎‎‎‎‏‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‏‏‏‏‏‎‏‎Notification dots‎‏‎‎‏‎"</string>
+    <string name="notification_dots_desc_on" msgid="1679848116452218908">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‏‎‎‎‎‎‎‎‎‎‏‎‎‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‏‏‎‏‏‏‏‏‎‎‏‎‏‏‎‎‎‎‎‎‏‏‏‎‎‎On‎‏‎‎‏‎"</string>
+    <string name="notification_dots_desc_off" msgid="1760796511504341095">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‎‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‎‎‏‎‎‎‏‏‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‎‎‏‏‎‎‏‏‏‎Off‎‏‎‎‏‎"</string>
+    <string name="title_missing_notification_access" msgid="7503287056163941064">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‎‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‏‏‎‎‏‏‏‎‎‏‏‏‎‎‎‎‎‎‏‎‏‎‏‎‏‏‎‎‏‎‎‎‎Notification access needed‎‏‎‎‏‎"</string>
+    <string name="msg_missing_notification_access" msgid="281113995110910548">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‏‎‏‎‏‏‎‏‏‏‏‎‏‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‎‎‏‎‏‎‏‎‎‎To show Notification Dots, turn on app notifications for ‎‏‎‎‏‏‎<xliff:g id="NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="title_change_settings" msgid="1376365968844349552">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‏‏‎‎‏‏‏‎‏‎‏‎‏‏‎‎‎‏‏‏‎‎‏‏‎‏‏‎‏‏‏‏‎‎‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‎‎‎‎‎Change settings‎‏‎‎‏‎"</string>
+    <string name="notification_dots_service_title" msgid="4284221181793592871">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‎‎‎‎‎‎‎‎‎‎‏‎‏‏‏‎‎‏‏‎‎‎‏‎‎‏‏‏‎Show notification dots‎‏‎‎‏‎"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‎‎‏‎‎‏‏‏‎‎‎‏‎‏‎‎‎‎‎‏‏‎‎‏‎‎‎‎‏‎‏‏‏‏‎‎‎‏‏‏‏‎‏‎Add app icons to Home screen‎‏‎‎‏‎"</string>
+    <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‎‏‎‏‏‎‎‎‏‏‏‎‎‎‏‏‏‎‏‎‎‎‎‎‏‎‏‎‏‎‏‎‏‎‎‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎For new apps‎‏‎‎‏‎"</string>
+    <string name="package_state_unknown" msgid="7592128424511031410">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‏‎‎‏‎‏‎‏‎‎‎‏‎‎‏‎‎‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‎‎‏‎‎Unknown‎‏‎‎‏‎"</string>
+    <string name="abandoned_clean_this" msgid="7610119707847920412">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‏‏‏‎‎‎‏‏‎‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‏‏‎‎‎‏‎‏‏‎‎‎‏‏‏‎‎‎Remove‎‏‎‎‏‎"</string>
+    <string name="abandoned_search" msgid="891119232568284442">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‎‎‎‎‏‏‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‎‏‎‏‎‏‎‏‎‎‎‏‏‎‏‎‎Search‎‏‎‎‏‎"</string>
+    <string name="abandoned_promises_title" msgid="7096178467971716750">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‏‎‏‎‏‎‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‎‏‏‎‏‎‏‏‎‏‎‎‎‏‏‏‎‎This app is not installed‎‏‎‎‏‎"</string>
+    <string name="abandoned_promise_explanation" msgid="3990027586878167529">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‏‎‎‏‏‎‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‏‏‏‏‎‏‎‎‏‎The app for this icon isn\'t installed. You can remove it, or search for the app and install it manually.‎‏‎‎‏‎"</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‎‎‎‎‏‎‏‎‎‎‏‎‏‎‎‎‎‏‏‏‏‏‎‎‎‎‎‏‎‏‏‎‎‎‎‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ installing, ‎‏‎‎‏‏‎<xliff:g id="PROGRESS">%2$s</xliff:g>‎‏‎‎‏‏‏‎ complete‎‏‎‎‏‎"</string>
+    <string name="app_downloading_title" msgid="8336702962104482644">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‎‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‎‎‏‎‎‏‏‏‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‎‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ downloading, ‎‏‎‎‏‏‎<xliff:g id="PROGRESS">%2$s</xliff:g>‎‏‎‎‏‏‏‎ complete‎‏‎‎‏‎"</string>
+    <string name="app_waiting_download_title" msgid="7053938513995617849">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‏‎‎‏‎‎‏‏‏‏‏‏‎‏‏‎‏‎‎‏‎‎‎‎‎‏‎‎‎‏‎‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‏‎‎‏‎‎‏‎‎‏‏‎<xliff:g id="NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ waiting to install‎‏‎‎‏‎"</string>
+    <string name="widgets_list" msgid="796804551140113767">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‎‎‎‎‏‏‏‎‏‏‎‏‎‎‎‏‏‎‎‎‎‏‎‎‏‎‎‎‎‎‏‎‎‎‎‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‎Widgets list‎‏‎‎‏‎"</string>
+    <string name="widgets_list_closed" msgid="6141506579418771922">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‎‏‏‎‎‎‏‏‏‏‎‎‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‏‏‏‎‏‎‎‏‎‎Widgets list closed‎‏‎‎‏‎"</string>
+    <string name="action_add_to_workspace" msgid="8902165848117513641">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‏‎‏‏‎‎‎‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‎‏‎‏‎‏‎‎‎‏‎‎‎‏‏‎‏‏‎‏‎‏‎‎‏‎Add to Home screen‎‏‎‎‏‎"</string>
+    <string name="action_move_here" msgid="2170188780612570250">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‎‏‎‏‎‏‎‎‎‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‏‎‎‏‎‎‎‏‎‏‎‎Move item here‎‏‎‎‏‎"</string>
+    <string name="item_added_to_workspace" msgid="4211073925752213539">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‎‎‎‎‏‎‏‏‏‏‎‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎‏‏‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‏‎‎‎‏‏‎Item added to home screen‎‏‎‎‏‎"</string>
+    <string name="item_removed" msgid="851119963877842327">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‏‎‏‏‏‎‏‎‎‏‏‏‎‏‏‎‎‏‎‏‏‏‎Item removed‎‏‎‎‏‎"</string>
+    <string name="undo" msgid="4151576204245173321">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‏‏‏‎‏‎‏‎‏‏‏‎‎‏‎‎‎‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‏‎‎‏‎‎‏‎Undo‎‏‎‎‏‎"</string>
+    <string name="action_move" msgid="4339390619886385032">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‏‎‎‎‏‎‎‏‏‏‎‎‏‏‎‎‎‏‏‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‎Move item‎‏‎‎‏‎"</string>
+    <string name="move_to_empty_cell" msgid="2833711483015685619">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‏‎‎‏‏‎‏‎‏‏‏‎‏‏‎‎‏‎‏‎‎‏‎‎‎‎‏‎‏‎‎‎‏‏‎‎‎‎‏‏‎‎‏‎‏‏‏‏‏‎‎‏‏‎Move to row ‎‏‎‎‏‏‎<xliff:g id="NUMBER_0">%1$s</xliff:g>‎‏‎‎‏‏‏‎ column ‎‏‎‎‏‏‎<xliff:g id="NUMBER_1">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="move_to_position" msgid="6750008980455459790">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‎‏‏‎‎‏‎‏‏‎‎‏‏‏‏‎‎‏‎‏‏‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎Move to position ‎‏‎‎‏‏‎<xliff:g id="NUMBER">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="move_to_hotseat_position" msgid="6295412897075147808">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‏‏‎‏‏‏‎‎‏‏‎‎‏‎‏‎‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‎‎‎‎Move to favorites position ‎‏‎‎‏‏‎<xliff:g id="NUMBER">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="item_moved" msgid="4606538322571412879">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‏‎‎‎‏‏‎‎‏‎‏‎‏‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‎‎‏‎‏‏‎‎‎‏‏‏‏‎Item moved‎‏‎‎‏‎"</string>
+    <string name="add_to_folder" msgid="9040534766770853243">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‏‎‏‏‏‎‎‏‏‏‏‎‎‎‏‎‏‏‏‎‎‎‏‏‏‏‎‎‏‎‎‎‎‏‎‏‎‏‎‏‏‏‏‎‏‏‎Add to folder: ‎‏‎‎‏‏‎<xliff:g id="NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="add_to_folder_with_app" msgid="4534929978967147231">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‏‎‎‏‏‏‎‏‏‎‎‏‎‎‏‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎‎‎‎‏‎‏‏‎‏‏‏‏‏‎Add to folder with ‎‏‎‎‏‏‎<xliff:g id="NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="added_to_folder" msgid="4793259502305558003">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‎‎‏‎‏‎‎‎‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‏‏‏‏‎‎‏‏‎Item added to folder‎‏‎‎‏‎"</string>
+    <string name="create_folder_with" msgid="4050141361160214248">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‎‎‎‎‎‏‎‎‎‎‏‎‎‏‎‎‏‎‏‎‏‏‎‏‏‏‎‏‎‎‎‎Create folder with: ‎‏‎‎‏‏‎<xliff:g id="NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="folder_created" msgid="6409794597405184510">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‏‎‎‎‎‏‎‏‎‏‎‎‎‏‏‏‎‎‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‎‏‏‏‎‏‎‎‎‏‏‏‏‏‏‏‏‎‎Folder created‎‏‎‎‏‎"</string>
+    <string name="action_move_to_workspace" msgid="1603837886334246317">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‎‏‎‎‎‏‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‎‏‎‏‏‎‏‎Move to Home screen‎‏‎‎‏‎"</string>
+    <string name="action_resize" msgid="1802976324781771067">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‎‎‏‎‏‎‏‏‏‎‏‎‏‎‏‏‎‏‎‏‎‎‎‏‏‎‎‎‏‎‎‎‎‏‏‏‎‏‎‎‎‏‎‎‏‎‎‏‏‏‎‏‏‎Resize‎‏‎‎‏‎"</string>
+    <string name="action_increase_width" msgid="8773715375078513326">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‎‎‎‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‎‏‎‏‎‏‎‏‏‏‎‎Increase width‎‏‎‎‏‎"</string>
+    <string name="action_increase_height" msgid="459390020612501122">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‎‏‎‎‏‏‎‎‏‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‏‎‏‎‎‎‎‎‏‎‎Increase height‎‏‎‎‏‎"</string>
+    <string name="action_decrease_width" msgid="1374549771083094654">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‏‎‎‏‏‎‏‏‎‎‎‎‏‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‎‎‎‏‎‎‏‏‎‏‎‎‏‏‏‏‏‏‎‎Decrease width‎‏‎‎‏‎"</string>
+    <string name="action_decrease_height" msgid="282377193880900022">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‏‎‎‎‏‎‏‎‏‎‎‎‏‏‎‏‏‎‏‏‎‎Decrease height‎‏‎‎‏‎"</string>
+    <string name="widget_resized" msgid="9130327887929620">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‏‏‎‎‎‏‎‏‏‎‎‎‎‏‎‎‎‏‎‏‎‎‎Widget resized to width ‎‏‎‎‏‏‎<xliff:g id="NUMBER_0">%1$s</xliff:g>‎‏‎‎‏‏‏‎ height ‎‏‎‎‏‏‎<xliff:g id="NUMBER_1">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="action_deep_shortcut" msgid="2864038805849372848">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‏‏‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‏‏‎‏‏‎‎‏‎‏‎‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‎‎‎Shortcuts‎‏‎‎‏‎"</string>
+    <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‏‎‎‏‎‏‎‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎‏‎‎‏‎‎‎‏‏‎‎‏‎‎‏‎‎‏‏‎‎‎‎‏‏‎‎‏‎‎‎‏‎Shortcuts and notifications‎‏‎‎‏‎"</string>
+    <string name="action_dismiss_notification" msgid="5909461085055959187">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‎‎‏‎‏‎‎‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‎‏‎‏‎‎‏‏‎‎‎‎‎‏‎‏‎‎‎‎‎‎‏‎‎‏‎‎‏‏‎Dismiss‎‏‎‎‏‎"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‎‏‏‏‎‎‎‏‎‎‏‏‏‏‎‎‏‎‎‎‎‏‏‎‏‏‎‎‏‎‎‏‎‎‏‏‎‏‎‎‎‏‏‏‎‎Close‎‏‎‎‏‎"</string>
+    <string name="notification_dismissed" msgid="6002233469409822874">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‏‏‎‎‎‎‏‏‎‏‏‏‏‎‎‎‏‎‏‎‎‎‎‎‏‎‏‏‎‎‏‎‎‎‏‎‎‎‎‎‏‎‎‎‏‎‎‏‏‎‏‎‎Notification dismissed‎‏‎‎‏‎"</string>
+    <string name="all_apps_personal_tab" msgid="4190252696685155002">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‎‏‎‎‎‎‎‎‏‏‏‎‎‎‏‎‎‎‎‏‎‏‎‏‎‎‏‎‎‏‎‏‎‏‏‏‎‏‎‎Personal‎‏‎‎‏‎"</string>
+    <string name="all_apps_work_tab" msgid="4884822796154055118">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‏‎‏‎‎‏‏‎‎‎‎‎‎‏‏‏‎‎‏‏‏‏‎‎‎‎‏‏‎‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‏‏‎‎‏‏‏‎‎Work‎‏‎‎‏‎"</string>
+    <string name="work_profile_toggle_label" msgid="3081029915775481146">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‎‎‏‎‎‎‎‎‎‏‎‎‎‏‏‎‎‎‏‎‎‏‏‎‏‎‎‎‎‎‏‎‎‏‏‎‎‎‏‏‎‏‎‏‎‎‏‏‏‎‏‎‎Work profile‎‏‎‎‏‎"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‏‎‏‏‎‏‏‎‏‏‏‎‎‏‎‎‏‏‎‎‎‏‎‎‏‎‏‏‏‏‏‎‎‏‎‏‏‎‎‎‎‏‎‏‎‏‎‎‎‎‎‏‎Personal data is separate &amp; hidden from work apps‎‏‎‎‏‎"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‎‏‎‎‎‏‎‏‏‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‎‏‏‏‎‏‎‎‏‎‏‏‏‎‏‎‎‏‎‏‎‏‎‎‏‎‎Work apps &amp; data are visible to your IT admin‎‏‎‎‏‎"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‎‎‏‏‏‏‏‎‎‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‎‎‎‏‎‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‎‏‏‎‏‎Next‎‏‎‎‏‎"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‏‏‎‎‎‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎Got it‎‏‎‎‏‎"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‎‏‎‏‎‎‎‎‎‏‎‎‎‏‎‎‏‏‎‏‎‎‎‏‏‎‏‎‎‏‏‎‎‏‏‏‎‎‎‏‏‏‎‎‎‎‎‏‎‏‏‎Work profile is paused‎‏‎‎‏‎"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‏‎‎‏‏‎‏‎‏‏‎‎‎‏‎‎‎‎‏‎‎‏‏‏‏‎‎‏‏‎‏‏‎‏‏‏‏‎‎‎‎‏‎‏‏‎‏‏‎‏‎‎‎Work apps can’t send you notifications, use your battery, or access your location‎‏‎‎‏‎"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‏‎‎‎‏‎‏‎‎‏‏‏‏‎‎‎‎‎‎‏‎‏‏‏‏‎‎‎‏‏‎‏‎‏‏‏‎‎‎‏‏‎‎‎‎‎‎‏‎‏‏‎Work profile is paused. Work apps can’t send you notifications, use your battery, or access your location‎‏‎‎‏‎"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‎‏‎‎‎‏‏‏‏‎‏‎‎‎‏‎‎‎‎‏‎‎‏‎‏‎‏‎‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‏‎‏‎‎Work apps are badged and visible to your IT admin‎‏‎‎‏‎"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‎‎‏‎‏‎‏‏‎‎‏‎‏‏‎‎‎‎‏‏‏‏‎‎‏‏‏‎‎‎‏‏‎‏‎‏‎‏‎‏‏‏‏‏‎‎‎‎‏‎‎‎Got it‎‏‎‎‏‎"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‏‏‎‎‎‏‎‎‎‏‏‏‎‎‎‎‎‎‎‏‏‎‎‏‏‏‎‏‎‏‎‏‏‎‎‏‏‎‎Pause work apps‎‏‎‎‏‎"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‎‏‏‎‎‏‎‎‎‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‏‎‎‏‏‎‏‏‎‏‏‎‎‏‎‎‎‎‏‎‏‎‎‎‎‎‏‏‎‎‏‎‎‎‎‎Turn on‎‏‎‎‏‎"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‏‎‏‏‎‏‏‎‏‎‎‎‎‏‏‏‎‎‎‏‏‏‎‏‎‎‏‎‏‎‎‎‎‎‎‎‎‎‎‏‎‏‎‎‏‎‎‎‎‎‎‎Filter‎‏‎‎‏‎"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‏‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‎‏‏‏‎‎‏‏‎‎‎‏‏‎‏‏‏‎‏‎‏‎‎‎‎Pause work apps and notifications‎‏‎‎‏‎"</string>
+    <string name="remote_action_failed" msgid="1383965239183576790">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‏‎‏‎‎‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎‏‎‏‏‎‏‏‏‏‎‎‎‎‎‏‏‎‏‎‎‎‏‏‏‎‏‏‎‏‎‏‏‎‎Failed: ‎‏‎‎‏‏‎<xliff:g id="WHAT">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index d10c84b9ca..8dfae0b6f1 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -20,39 +20,58 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Trabajo"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"No se instaló la aplicación."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"La aplicación no está disponible."</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Aplicación descargada inhabilitada en modo seguro"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Widgets inhabilitados en modo seguro"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"El acceso directo no está disponible"</string>
-    <string name="home_screen" msgid="806512411299847073">"Pantalla principal"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Acciones personalizadas"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Mantén presionado el widget que desees elegir."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Presiona dos veces y mantén presionado para elegir un widget o usa una acción personalizada."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Pantalla principal"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Pantalla dividida"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Presiona y mantén presionado para mover un widget."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Presiona dos veces y mantén presionado para mover un widget o usar acciones personalizadas."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de ancho por %2$d de alto"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Mantén presionado para ubicarlo manualmente"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Agregar automáticamente"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> accesos directos</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> acceso directo</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Buscar"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Borra el texto del cuadro de búsqueda"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"No hay widgets disponibles"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"La búsqueda no arrojó resultados"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personal"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Trabajo"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Conversaciones"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Buscar apps"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Cargando apps…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"No hay apps que coincidan con \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Buscar más apps"</string>
     <string name="label_application" msgid="8531721983832654978">"App"</string>
+    <string name="search_corpus_apps" msgid="1917889409963779022">"Apps"</string>
+    <string name="search_action_try_now" msgid="1458737965476149074">"Probar ahora"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Notificaciones"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Mantén presionado para elegir un acceso directo."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Presiona dos veces y mantén presionado para elegir un acceso directo o usar acciones personalizadas."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Mantén presionado para mover un acceso directo."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Presiona dos veces y mantén presionado para mover un acceso directo o usar acciones personalizadas."</string>
     <string name="out_of_space" msgid="4691004494942118364">"No hay más espacio en esta pantalla principal."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"La bandeja de favoritos está llena."</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista de apps"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista de apps personales"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Lista de apps del trabajo"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Pantalla principal"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Quitar"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Desinstalar"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Información de app"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Instalar"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"No sugerir app"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Fijar predicción"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"instalar accesos directos"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Permite que una aplicación agregue accesos directos sin que el usuario intervenga."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"leer configuración y accesos directos de la pantalla principal"</string>
@@ -63,7 +82,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Problema al cargar el widget"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Configuración"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Esta es una aplicación del sistema y no se puede desinstalar."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Carpeta sin nombre"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Editar nombre"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Se inhabilitó <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g> tiene <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> notificaciones</item>
@@ -77,11 +96,11 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Presiona para guardar el cambio de nombre"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Carpeta cerrada"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"El nombre de la carpeta se cambió a <xliff:g id="NAME">%1$s</xliff:g>."</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Carpeta: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Carpeta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elementos"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Carpeta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> o más elementos"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fondos de pantalla"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Estilos y fondos de pantalla"</string>
-    <string name="settings_button_text" msgid="8873672322605444408">"Configuración de página principal"</string>
+    <string name="settings_button_text" msgid="8873672322605444408">"Configuración de pantalla principal"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"El administrador inhabilitó esta función"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Permitir la rotación de la pantalla principal"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"Al girar el teléfono"</string>
@@ -92,16 +111,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Para mostrar los puntos de notificación, activa las notificaciones de la app para <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Cambiar la configuración"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Mostrar puntos de notificación"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Agregar ícono a la pantalla principal"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Agrega íconos de apps a pantalla principal"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Para nuevas apps"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Desconocido"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Eliminar"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Buscar"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Esta aplicación no está instalada"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"La aplicación para este ícono no está instalada. Puedes eliminar el ícono o buscar la aplicación e instarla manualmente."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"Se está instalando <xliff:g id="NAME">%1$s</xliff:g>; <xliff:g id="PROGRESS">%2$s</xliff:g> completado"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"Se completó el <xliff:g id="PROGRESS">%2$s</xliff:g> de la descarga de <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"Instalación de <xliff:g id="NAME">%1$s</xliff:g> en espera"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Widgets de <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Lista de widgets"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Se cerró la lista de widgets"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Agregar a la pantalla principal"</string>
@@ -129,15 +148,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Accesos directos"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Accesos directos y notificaciones"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Descartar"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Cerrar"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Se descartó la notificación"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personales"</string>
-    <string name="all_apps_work_tab" msgid="4884822796154055118">"Laborales"</string>
+    <string name="all_apps_work_tab" msgid="4884822796154055118">"De trabajo"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de trabajo"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Apps de trabajo"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Cada app de trabajo tiene una insignia y está protegida por tu organización. Transfiere las apps a la pantalla principal para acceder a ellas con mayor facilidad."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Administrado por tu organización"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Las notificaciones y las apps están desactivadas"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Cerrar"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Cerrado"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Los datos personales están separados y ocultos de las apps de trabajo"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"El administrador de TI puede ver las apps de trabajo y los datos"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Siguiente"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Entendido"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"El perfil de trabajo está en pausa"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Las apps de trabajo no pueden enviarte notificaciones, usar la batería ni acceder a tu ubicación"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"El perfil de trabajo está en pausa. Las apps de trabajo no pueden enviarte notificaciones, usar la batería ni acceder a tu ubicación"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Las apps de trabajo tienen una insignia y el administrador de IT las puede ver"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Entendido"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Detener apps de trabajo"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Activar"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtro"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Pon en pausa las apps de trabajo y las notificaciones"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Error: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 09b1239972..74f4c932ff 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -20,39 +20,68 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Trabajo"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"La aplicación no está instalada."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"La aplicación no está disponible"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Aplicación descargada inhabilitada en modo seguro"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Widgets inhabilitados en modo seguro"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Acceso directo no disponible"</string>
-    <string name="home_screen" msgid="806512411299847073">"Pantalla de inicio"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Acciones personalizadas"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Mantén pulsado el widget que quieras seleccionar."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Toca dos veces y mantén pulsado el widget que quieras seleccionar o utiliza acciones personalizadas."</string>
+    <!-- no translation found for home_screen (5629429142036709174) -->
+    <skip />
+    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
+    <skip />
+    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
+    <skip />
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de ancho por %2$d de alto"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Mantenlo pulsado para añadirlo manualmente"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Añadir automáticamente"</string>
+    <!-- no translation found for widgets_count (656794749266073027) -->
+    <!-- no translation found for shortcuts_count (8080294865447938455) -->
+    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
+    <skip />
+    <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
+    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
+    <skip />
+    <!-- no translation found for no_widgets_available (9140948620298620513) -->
+    <skip />
+    <!-- no translation found for no_search_results (6518732304311458580) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
+    <skip />
+    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Buscar aplicaciones"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Cargando aplicaciones…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"No se han encontrado aplicaciones que contengan \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Buscar más aplicaciones"</string>
     <string name="label_application" msgid="8531721983832654978">"Aplicación"</string>
+    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
+    <skip />
+    <!-- no translation found for search_action_try_now (1458737965476149074) -->
+    <skip />
     <string name="notifications_header" msgid="1404149926117359025">"Notificaciones"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Mantén pulsado para elegir un acceso directo."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Toca dos veces y mantén pulsado para elegir un acceso directo o utilizar acciones personalizadas."</string>
+    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
+    <skip />
     <string name="out_of_space" msgid="4691004494942118364">"No queda espacio en la pantalla de inicio."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"La bandeja de favoritos está completa"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista de aplicaciones"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista de aplicaciones personales"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Lista de aplicaciones del trabajo"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Inicio"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Quitar"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Desinstalar"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Información de la aplicación"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Instalar"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"No sugerir aplicación"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Fijar predicción"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"instalar accesos directos"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Permite que una aplicación añada accesos directos sin intervención del usuario."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"leer información de accesos directos y de ajustes de la pantalla de inicio"</string>
@@ -63,7 +92,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Problema al cargar el widget"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Configuración"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Esta aplicación es del sistema y no se puede desinstalar."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Carpeta sin nombre"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Editar nombre"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Se ha inhabilitado <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g> tiene <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> notificaciones</item>
@@ -77,8 +106,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Toca para guardar el nuevo nombre"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Carpeta cerrada"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Se ha cambiado el nombre de la carpeta a <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Carpeta: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Carpeta: <xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="SIZE">%2$d</xliff:g> elementos)"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Carpeta: <xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="SIZE">%2$d</xliff:g> o más elementos)"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fondos de pantalla"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Estilos y fondos de pantalla"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Ajustes de la pantalla de inicio"</string>
@@ -92,16 +121,17 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Para mostrar puntos de notificación, activa las notificaciones de <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Cambiar ajustes"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Mostrar puntos de notificación"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Añadir icono a la pantalla de inicio"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Añadir aplicaciones a la pantalla de inicio"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Para aplicaciones nuevas"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Desconocido"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Quitar"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Buscar"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Esta aplicación no está instalada"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"La aplicación de este icono no está instalada. Puedes quitar el icono o buscar la aplicación e instalarla manualmente."</string>
+    <!-- no translation found for app_installing_title (5864044122733792085) -->
+    <skip />
     <string name="app_downloading_title" msgid="8336702962104482644">"Descargando <xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="PROGRESS">%2$s</xliff:g> completado)"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"Esperando para instalar <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Widgets de <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Lista de widgets"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Lista de widgets cerrada"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Añadir a la pantalla de inicio"</string>
@@ -129,15 +159,30 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Accesos directos"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Accesos directos y notificaciones"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Cerrar"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Cerrar"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Notificación ignorada"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personal"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Trabajo"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de trabajo"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Aplicaciones de trabajo"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Cada aplicación de trabajo tiene una insignia y está protegida por tu organización. Mueve las aplicaciones a la pantalla de inicio para acceder a ellas más fácilmente."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Administrada por tu organización"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Las notificaciones y las aplicaciones están desactivadas"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Cerrar"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Cerrada"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Los datos personales están separados y ocultos de las aplicaciones de trabajo"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Tu administrador de TI puede ver tus aplicaciones y datos de trabajo"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Siguiente"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Listo"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"El perfil de trabajo está en pausa"</string>
+    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
+    <skip />
+    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
+    <skip />
+    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
+    <skip />
+    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
+    <skip />
+    <string name="work_switch_tip" msgid="808075064383839144">"Pausa apps y notificaciones de trabajo"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Se ha producido un error: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 926cdb9b1c..1856d2e6d7 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -20,39 +20,58 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"کاری"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"برنامه نصب نشده است."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"برنامه در دسترس نیست"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"برنامه بارگیری شده در حالت ایمن غیرفعال شد"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"ابزارک‌ها در حالت ایمن غیرفعال هستند"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"میان‌بر دردسترس نیست"</string>
-    <string name="home_screen" msgid="806512411299847073">"صفحه اصلی"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"کنش‌های سفارشی"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"برای انتخاب ابزارک لمس کنید و نگه دارید."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"برای انتخاب یک ابزارک، دو ضربه سریع بزنید و نگه‌دارید یا از کنش‌های سفارشی استفاده کنید."</string>
+    <string name="home_screen" msgid="5629429142036709174">"صفحه اصلی"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"صفحهٔ دونیمه"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"برای جابه‌جا کردن ابزارک، لمس کنید و نگه دارید."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"برای جابه‌جا کردن ابزارک یا استفاده از کنش‌های سفارشی، دوضربه بزنید و نگه دارید."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"‏%1$d عرض در %2$d طول"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"آن را لمس کنید و بکشید تا به‌صورت دستی اضافه شود"</string>
     <string name="place_automatically" msgid="8064208734425456485">"افزودن خودکار"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ابزارک</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ابزارک</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> میان‌بر</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> میان‌بر</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>،<xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"ابزارک‌ها"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"جستجو"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"پاک کردن نوشتار از چارگوش جستجو"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"ابزارکی دردسترس نیست"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"بدون نتیجه جستجو"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"شخصی"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"کار"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"مکالمه‌ها"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"جستجوی برنامه‌ها"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"درحال بارگیری برنامه‌‌ها…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"هیچ برنامه‌ای در مطابقت با «<xliff:g id="QUERY">%1$s</xliff:g>» پیدا نشد"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"جستجوی برنامه‌های بیشتر"</string>
     <string name="label_application" msgid="8531721983832654978">"برنامه"</string>
+    <string name="search_corpus_apps" msgid="1917889409963779022">"برنامه‌ها"</string>
+    <string name="search_action_try_now" msgid="1458737965476149074">"اکنون امتحان کنید"</string>
     <string name="notifications_header" msgid="1404149926117359025">"اعلان‌ها"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"برای انتخاب میان‌بر، لمس کنید و نگه‌دارید."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"برای انتخاب میان‌بر، دو ضربه سریع بزنید و نگه‌دارید یا از کنش‌های سفارشی استفاده کنید."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"برای جابه‌جا کردن میان‌بر، لمس کنید و نگه دارید."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"برای جابه‌جا کردن میان‌بر یا استفاده از کنش‌های سفارشی، دوضربه بزنید و نگه دارید."</string>
     <string name="out_of_space" msgid="4691004494942118364">"فضای بیشتری در این صفحه اصلی موجود نیست."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"فضای بیشتری در سینی موارد دلخواه وجود ندارد"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"فهرست برنامه‌ها"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"فهرست برنامه‌های شخصی"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"فهرست برنامه‌های کاری"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"صفحه اصلی"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"برداشتن"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"حذف نصب"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"اطلاعات برنامه"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"نصب"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"برنامه پیشنهاد داده نشود"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"سنجاق کردن پیشنهاد"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"نصب میان‌برها"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"به برنامه اجازه می‌دهد میان‌برها را بدون دخالت کاربر اضافه کند."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"خواندن تنظیمات و میان‌برهای صفحه اصلی"</string>
@@ -63,7 +82,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"مشکل در بارگیری ابزارک"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"تنظیم"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"این برنامه سیستمی است و حذف نصب نمی‌شود."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"پوشه بی‌نام"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"ویرایش نام"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> غیرفعال شد"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="one"><xliff:g id="APP_NAME_2">%1$s</xliff:g>، <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> اعلان دارد</item>
@@ -77,13 +96,13 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"برای ذخیره تغییر نام، ضربه بزنید"</string>
     <string name="folder_closed" msgid="4100806530910930934">"پوشه بسته شد"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"نام پوشه به <xliff:g id="NAME">%1$s</xliff:g> تغییر کرد"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"پوشه: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"ابزارک‌ها"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"پوشه: <xliff:g id="NAME">%1$s</xliff:g>، <xliff:g id="SIZE">%2$d</xliff:g> مورد"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"پوشه: <xliff:g id="NAME">%1$s</xliff:g>، <xliff:g id="SIZE">%2$d</xliff:g> مورد یا بیشتر"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"کاغذدیواری‌ها"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"سبک و کاغذدیواری"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"تنظیمات صفحه اصلی"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"توسط سرپرست سیستم غیرفعال شده است"</string>
-    <string name="allow_rotation_title" msgid="7728578836261442095">"امکان دادن به چرخش صفحه اصلی"</string>
+    <string name="allow_rotation_title" msgid="7728578836261442095">"قابل‌چرخش بودن صفحه اصلی"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"وقتی تلفن چرخانده می‌شود"</string>
     <string name="notification_dots_title" msgid="9062440428204120317">"نقطه‌های اعلان"</string>
     <string name="notification_dots_desc_on" msgid="1679848116452218908">"روشن"</string>
@@ -92,16 +111,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"برای نمایش «نقطه‌های اعلان»، اعلان‌های برنامه را برای <xliff:g id="NAME">%1$s</xliff:g> روشن کنید"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"تغییر تنظیمات"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"نمایش نقطه‌های اعلان"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"افزودن نماد به صفحه اصلی"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"افزودن نماد برنامه‌ها به صفحه اصلی"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"برای برنامه‌های جدید"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"نامشخص"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"حذف"</string>
     <string name="abandoned_search" msgid="891119232568284442">"جستجو"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"این برنامه نصب نشده است."</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"برنامه برای این نماد نصب نشده است. می‌توانید آن را حذف کنید یا سعی کنید برنامه را جستجو کنید و آن را به صورت دستی نصب کنید."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> درحال نصب است، <xliff:g id="PROGRESS">%2$s</xliff:g> تکمیل شده است"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"درحال بارگیری <xliff:g id="NAME">%1$s</xliff:g>، <xliff:g id="PROGRESS">%2$s</xliff:g> کامل شد"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> درانتظار نصب"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"ابزارک‌های <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"فهرست ابزارک‌ها"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"فهرست ابزارک‌ها بسته شد"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"افزودن به صفحه اصلی"</string>
@@ -129,15 +148,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"میان‌برها"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"میان‌برها و اعلان‌ها"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"رد کردن"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"بستن"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"اعلان رد شد"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"شخصی"</string>
-    <string name="all_apps_work_tab" msgid="4884822796154055118">"محل کار"</string>
+    <string name="all_apps_work_tab" msgid="4884822796154055118">"کاری"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"نمایه کاری"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"اینجا برنامه‌های کاری را پیدا کنید"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"همه برنامه‌های کاری نشانی دارند و توسط سازمانتان ایمن نگه داشته می‌شوند. برنامه‌های کاری را برای دسترسی آسان‌تر به صفحه اصلی انتقال دهید."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"توسط سازمانتان مدیریت می‌شود"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"اعلان‌ها و برنامه‌ها خاموش هستند"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"بستن"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"بسته‌شده"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"داده‌های شخصی از برنامه‌های کاری جدا و از دسترس آن‌ها پنهان هستند"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"برنامه‌های کاری و داده‌ها برای سرپرست فناوری اطلاعات نمایان هستند"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"بعدی"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"متوجه‌ام"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"نمایه کاری موقتاً متوقف شده است"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"برنامه‌های کاری نمی‌توانند برای شما اعلان ارسال کنند، از باتری استفاده کنند، یا به مکانتان دسترسی داشته باشند"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"نمایه کاری موقتاً متوقف شده است. برنامه‌های کاری نمی‌توانند برای شما اعلان ارسال کنند، از باتری استفاده کنند، یا به مکانتان دسترسی داشته باشند"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"برنامه‌های کاری دارای نشان هستند و سرپرست سیستم می‌تواند آن‌ها را ببیند."</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"متوجه‌ام"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"توقف موقت برنامه‌های کاری"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"روشن کردن"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"فیلتر"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"توقف موقت برنامه‌های کاری و اعلان‌ها"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"ناموفق بود: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index f87441ff3d..f1a3ce25b3 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -20,39 +20,68 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Työ"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Sovellusta ei ole asennettu."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Sovellus ei ole käytettävissä"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Ladattu sovellus poistettiin käytöstä suojatussa tilassa"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Widgetit poistettu käytöstä vikasietotilassa"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Pikakuvake ei ole käytettävissä."</string>
-    <string name="home_screen" msgid="806512411299847073">"Aloitusnäyttö"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Muokatut toiminnot"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Valitse widget painamalla sitä pitkään."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Valitse widget tai käytä muokattuja toimintoja kaksoisnapauttamalla ja painamalla kohdetta pitkään."</string>
+    <!-- no translation found for home_screen (5629429142036709174) -->
+    <skip />
+    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
+    <skip />
+    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
+    <skip />
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Leveys: %1$d, korkeus: %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Sijoita manuaalisesti koskettamalla pitkään"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Lisää automaattisesti"</string>
+    <!-- no translation found for widgets_count (656794749266073027) -->
+    <!-- no translation found for shortcuts_count (8080294865447938455) -->
+    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
+    <skip />
+    <string name="widget_button_text" msgid="2880537293434387943">"Widgetit"</string>
+    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
+    <skip />
+    <!-- no translation found for no_widgets_available (9140948620298620513) -->
+    <skip />
+    <!-- no translation found for no_search_results (6518732304311458580) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
+    <skip />
+    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Hae sovelluksia"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Ladataan sovelluksia…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"<xliff:g id="QUERY">%1$s</xliff:g> ei palauttanut sovelluksia."</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Hae lisää sovelluksia"</string>
     <string name="label_application" msgid="8531721983832654978">"Sovellus"</string>
+    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
+    <skip />
+    <!-- no translation found for search_action_try_now (1458737965476149074) -->
+    <skip />
     <string name="notifications_header" msgid="1404149926117359025">"Ilmoitukset"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Valitse pikakuvake painamalla sitä pitkään."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Valitse pikakuvake tai käytä muokattuja toimintoja kaksoisnapauttamalla ja painamalla pitkään."</string>
+    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
+    <skip />
     <string name="out_of_space" msgid="4691004494942118364">"Tässä aloitusruudussa ei ole enää tilaa."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Suosikit-valikossa ei ole enää tilaa"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Sovellusluettelo"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Omat sovellukset ‑luettelo"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Työsovellusluettelo"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Aloitusruutu"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Poista"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Poista asennus"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Sovelluksen tiedot"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Asenna"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Älä ehdota sovellusta"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Kiinnitä sovellus"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"asenna pikakuvakkeita"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Antaa sovelluksen lisätä pikakuvakkeita itsenäisesti ilman käyttäjän valintaa."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"lue aloitusruudun asetuksia ja pikakuvakkeita"</string>
@@ -63,7 +92,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Ongelma ladattaessa widgetiä"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Asetus"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Tämä on järjestelmäsovellus, eikä sitä voi poistaa."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Nimetön kansio"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Muokkaa nimeä"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> poistettiin käytöstä"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g>: <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> ilmoitusta</item>
@@ -77,31 +106,32 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Tallenna uusi nimi koskettamalla."</string>
     <string name="folder_closed" msgid="4100806530910930934">"Kansio on suljettu"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Kansion nimeksi vaihdettiin <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Kansio: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Widgetit"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Kansio: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> kohdetta"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Kansio: <xliff:g id="NAME">%1$s</xliff:g>, ainakin <xliff:g id="SIZE">%2$d</xliff:g> kohdetta"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Taustakuvat"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Tyylit ja taustakuvat"</string>
-    <string name="settings_button_text" msgid="8873672322605444408">"Kotiasetukset"</string>
+    <string name="settings_button_text" msgid="8873672322605444408">"Aloitusnäyttö"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Järjestelmänvalvoja on poistanut toiminnon käytöstä."</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Salli aloitusnäytön kiertäminen"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"Kun puhelinta kierretään"</string>
     <string name="notification_dots_title" msgid="9062440428204120317">"Pistemerkit"</string>
     <string name="notification_dots_desc_on" msgid="1679848116452218908">"Käytössä"</string>
-    <string name="notification_dots_desc_off" msgid="1760796511504341095">"Ei käytössä"</string>
+    <string name="notification_dots_desc_off" msgid="1760796511504341095">"Ei päällä"</string>
     <string name="title_missing_notification_access" msgid="7503287056163941064">"Ilmoituksien käyttöoikeus tarvitaan"</string>
     <string name="msg_missing_notification_access" msgid="281113995110910548">"<xliff:g id="NAME">%1$s</xliff:g> tarvitsee ilmoitusten käyttöoikeuden, jotta pistemerkkejä voidaan näyttää."</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Muuta asetuksia"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Näytä ilmoituksista kertovat pistemerkit"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Lisää kuvake aloitusruutuun"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Lisää sovelluskuvakkeet aloitusnäytölle"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Uusille sovelluksille"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Tuntematon"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Poista"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Haku"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Sovellusta ei ole asennettu"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Kuvakkeen sovellusta ei ole asennettu. Voit poistaa kuvakkeen tai etsiä sovelluksen ja asentaa sen manuaalisesti."</string>
+    <!-- no translation found for app_installing_title (5864044122733792085) -->
+    <skip />
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> latautuu, valmiina <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> odottaa asennusta"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Widgetit: <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Widget-luettelo"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Widget-luettelo suljettu"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Lisää aloitusnäytölle"</string>
@@ -129,15 +159,30 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Pikakuvakkeet"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Pikakuvakkeet ja ilmoitukset"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Hylkää"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Sulje"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Ilmoitus hylätty"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Henkilökohtaiset"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Työsovellukset"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Työprofiili"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Etsi työsovelluksia tästä"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Kaikki työsovellukset on merkitty, ja organisaatiosi vastaa niiden suojaamisesta. Voit siirtää työsovelluksia aloitusnäytölle käytön helpottamiseksi."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Organisaatiosi hallinnoima"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Ilmoitukset ja sovellukset ovat poissa käytöstä"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Sulje"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Suljettu"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Henkilökohtainen data pidetään erillään, piilotettuna työsovelluksilta"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Työsovellukset ja ‑data näkyvät IT-järjestelmänvalvojalle"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Seuraava"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Selvä"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Työprofiilin käyttö on keskeytetty"</string>
+    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
+    <skip />
+    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
+    <skip />
+    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
+    <skip />
+    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
+    <skip />
+    <string name="work_switch_tip" msgid="808075064383839144">"Keskeytä työsovellukset ja ‑ilmoitukset"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Epäonnistui: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 5ac514d448..bf23b3367f 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -20,39 +20,58 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Lanceur3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Travail"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"L\'application n\'est pas installée."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Application indisponible"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"L\'application téléchargée est désactivée en mode sans échec."</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Widgets désactivés en mode sans échec"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Le raccourci n\'est pas disponible"</string>
-    <string name="home_screen" msgid="806512411299847073">"Écran d\'accueil"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Actions personnalisées"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Maintenez un doigt sur le widget pour l\'ajouter."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Touchez 2x un widget et maintenez doigt dessus pour l’ajouter ou utiliser des actions personnalisées"</string>
+    <string name="home_screen" msgid="5629429142036709174">"Accueil"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Écran partagé"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Maintenez le doigt sur un widget pour le déplacer."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Touchez 2x un widget et maintenez le doigt dessus pour le déplacer ou utiliser des actions personnalisées."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de largeur sur %2$d de hauteur"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Maintenez le doigt sur l\'élément pour le placer manuellement"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Ajouter automatiquement"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> raccourci</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> raccourcis</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Rechercher"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Effacer le texte dans le champ de recherche"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Aucun widget n\'est installé"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Aucun résultat de recherche"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personnels"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Professionnels"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Conversations"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Rechercher dans les applications"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Chargement des applications en cours…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Aucune application trouvée correspondant à « <xliff:g id="QUERY">%1$s</xliff:g> »"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Rechercher plus d\'applications"</string>
     <string name="label_application" msgid="8531721983832654978">"Application"</string>
+    <string name="search_corpus_apps" msgid="1917889409963779022">"Applications"</string>
+    <string name="search_action_try_now" msgid="1458737965476149074">"Essayer maintenant"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Notifications"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Maintenez un doigt sur le raccourci pour l\'ajouter"</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Touchez 2x un raccourci et maintenez doigt dessus pour l’aj. ou utiliser des actions personnalisées."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Maintenez le doigt sur un raccourci pour le déplacer."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Touchez deux fois un raccourci et maintenez le doigt dessus pour le déplacer ou utiliser des actions personnalisées."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Pas d\'espace libre sur l\'écran d\'accueil."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Il n\'y a plus d\'espace dans la zone des favoris"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Liste des applications"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Liste des applications personnelles"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Liste des applications professionnelles"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Accueil"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Supprimer"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Désinstaller"</string>
-    <string name="app_info_drop_target_label" msgid="692894985365717661">"Détails de l\'application"</string>
+    <string name="app_info_drop_target_label" msgid="692894985365717661">"Détails de l\'appli"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Installer"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Ne pas suggérer d\'application"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Épingler la prédiction"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"installer des raccourcis"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Permet à une application d\'ajouter des raccourcis sans l\'intervention de l\'utilisateur."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"lire les paramètres et les raccourcis de la page d\'accueil"</string>
@@ -63,7 +82,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Problème lors du chargement du widget"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Configuration"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Impossible de désinstaller cette application, car il s\'agit d\'une application système."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Dossier sans nom"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Modifier le nom"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"L\'application <xliff:g id="APP_NAME">%1$s</xliff:g> est désactivée"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="one"><xliff:g id="APP_NAME_2">%1$s</xliff:g> a <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> notification</item>
@@ -77,8 +96,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Touchez pour enregistrer le nouveau nom"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Dossier fermé"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Nouveau nom du dossier : <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Dossier : <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Dossier : <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> élément(s)"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Dossier : <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> éléments ou plus"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fonds d\'écran"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Styles et fonds d\'écran"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Paramètres d\'accueil"</string>
@@ -92,16 +111,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Pour afficher les points de notification, activez les notifications d\'application pour <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Modifier les paramètres"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Afficher les points de notification"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Ajouter l\'icône à l\'écran d\'accueil"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Ajouter icônes d\'applis à l\'écran d\'accueil"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Pour les nouvelles applications"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Inconnu"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Supprimer"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Rechercher"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Cette application n\'est pas installée"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"L\'application liée à cette icône n\'est pas installée. Vous pouvez la supprimer ou rechercher l\'application et l\'installer manuellement."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"Installation de l\'application <xliff:g id="NAME">%1$s</xliff:g> en cours, <xliff:g id="PROGRESS">%2$s</xliff:g> terminée"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"Téléchargement de <xliff:g id="NAME">%1$s</xliff:g> : <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> en attente d\'installation"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Widgets pour <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Liste des widgets"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Liste des widgets fermée"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Ajouter à l\'écran d\'accueil"</string>
@@ -129,15 +148,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Raccourcis"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Raccourcis et notifications"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Ignorer"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Fermer"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Notification ignorée"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personnel"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Travail"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profil professionnel"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Trouvez ici des applications professionnelles"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Chaque application professionnelle comporte un badge, ce qui signifie qu\'elle est sécurisée par votre organisation. Vous pouvez déplacer vos applications vers l\'écran d\'accueil afin d\'y accéder plus facilement."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Géré par votre organisation"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Les notifications et les applications sont désactivées"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Fermer"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Fermé"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Les données personnelles sont distinctes et masquées des applications professionnelles"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Les applications et les données professionnelles sont visibles pour votre administrateur informatique"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Suivant"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Le profil professionnel est interrompu"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Les applications professionnelles ne peuvent ni vous envoyer de notifications, ni utiliser la pile, ni accéder à votre position"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Le profil professionnel est interrompu. Les applications professionnelles ne peuvent ni vous envoyer de notifications, ni utiliser la pile, ni accéder à votre position"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Les applications professionnelles sont indiquées par un badge et sont visibles pour votre administrateur informatique"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Mettre en pause les applications professionnelles"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Activer"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtrer"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Interrompre les applications et les notifications professionnelles"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Échec : <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index ca5ba3c5e4..e994f992aa 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -26,32 +26,62 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"A aplicación que descargaches está desactivada no modo seguro"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Os widgets están desactivados no modo seguro"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"O atallo non está dispoñible"</string>
-    <string name="home_screen" msgid="806512411299847073">"Pantalla de inicio"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Accións personalizadas"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Mantén premido un widget para seleccionalo."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Toca dúas veces e mantén premido para seleccionar un widget ou utiliza accións personalizadas."</string>
+    <!-- no translation found for home_screen (5629429142036709174) -->
+    <skip />
+    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
+    <skip />
+    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
+    <skip />
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de largo por %2$d de alto"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Mantén premido o elemento para colocalo manualmente"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Engadir automaticamente"</string>
+    <!-- no translation found for widgets_count (656794749266073027) -->
+    <!-- no translation found for shortcuts_count (8080294865447938455) -->
+    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
+    <skip />
+    <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
+    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
+    <skip />
+    <!-- no translation found for no_widgets_available (9140948620298620513) -->
+    <skip />
+    <!-- no translation found for no_search_results (6518732304311458580) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
+    <skip />
+    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Buscar aplicacións"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Cargando aplicacións…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Non se atoparon aplicacións que coincidan con \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Buscar máis aplicacións"</string>
     <string name="label_application" msgid="8531721983832654978">"Aplicación"</string>
+    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
+    <skip />
+    <!-- no translation found for search_action_try_now (1458737965476149074) -->
+    <skip />
     <string name="notifications_header" msgid="1404149926117359025">"Notificacións"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Mantén premido un atallo para seleccionalo."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Toca dúas veces e mantén premido para seleccionar un atallo ou utiliza accións personalizadas."</string>
+    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
+    <skip />
     <string name="out_of_space" msgid="4691004494942118364">"Non hai máis espazo nesta pantalla de inicio."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Non hai máis espazo na bandexa de favoritos"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista de aplicacións"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista de aplicacións persoais"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Lista de aplicacións de traballo"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Inicio"</string>
-    <string name="remove_drop_target_label" msgid="7812859488053230776">"Eliminar"</string>
+    <string name="remove_drop_target_label" msgid="7812859488053230776">"Quitar"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Desinstalar"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Info. da aplicación"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Instalar"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Non suxerir aplicación"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Fixar predición"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"instalar atallos"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Permite a unha aplicación engadir atallos sen intervención do usuario."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"ler a configuración e os atallos da pantalla de inicio"</string>
@@ -62,7 +92,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Produciuse un problema ao cargar o widget"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Configuración"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Esta aplicación é do sistema e non se pode desinstalar."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Cartafol sen nome"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Edita o nome"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Desactivouse <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other">A aplicación <xliff:g id="APP_NAME_2">%1$s</xliff:g> ten <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> notificacións</item>
@@ -76,8 +106,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Toca fóra para cambiar o nome do cartafol"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Pechouse o cartafol"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"O cartafol cambiou o nome a <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Cartafol: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Cartafol: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elementos"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Cartafol: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elementos ou máis"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fondos de pantalla"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Estilos/fondos de pantalla"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Axustes de Inicio"</string>
@@ -91,22 +121,23 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Para que se mostren os puntos de notificacións, activa as notificacións da aplicación <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Cambiar configuración"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Mostrar puntos de notificacións"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Engadir icona á pantalla de inicio"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Engadir iconas de aplicacións á pantalla de inicio"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Para novas aplicacións"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Descoñecido"</string>
-    <string name="abandoned_clean_this" msgid="7610119707847920412">"Eliminar"</string>
+    <string name="abandoned_clean_this" msgid="7610119707847920412">"Quitar"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Buscar"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Esta aplicación non está instalada"</string>
-    <string name="abandoned_promise_explanation" msgid="3990027586878167529">"A aplicación para esta icona non está instalada. Podes eliminala ou buscar a aplicación e instalala manualmente."</string>
+    <string name="abandoned_promise_explanation" msgid="3990027586878167529">"A aplicación para esta icona non está instalada. Podes quitala ou buscar a aplicación e instalala manualmente."</string>
+    <!-- no translation found for app_installing_title (5864044122733792085) -->
+    <skip />
     <string name="app_downloading_title" msgid="8336702962104482644">"Descargando <xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="PROGRESS">%2$s</xliff:g> completado)"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"Esperando para instalar <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Widgets de: <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Lista de widgets"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Pechouse a lista de widgets"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Engadir á pantalla de inicio"</string>
     <string name="action_move_here" msgid="2170188780612570250">"Mover elemento aquí"</string>
     <string name="item_added_to_workspace" msgid="4211073925752213539">"Engadiuse o elemento á pantalla de inicio"</string>
-    <string name="item_removed" msgid="851119963877842327">"Eliminouse o elemento"</string>
+    <string name="item_removed" msgid="851119963877842327">"Quitouse o elemento"</string>
     <string name="undo" msgid="4151576204245173321">"Desfacer"</string>
     <string name="action_move" msgid="4339390619886385032">"Mover elemento"</string>
     <string name="move_to_empty_cell" msgid="2833711483015685619">"Mover á fila <xliff:g id="NUMBER_0">%1$s</xliff:g> columna <xliff:g id="NUMBER_1">%2$s</xliff:g>"</string>
@@ -128,15 +159,30 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Atallos"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Atallos e notificacións"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Ignorar"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Pechar"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Ignorouse a notificación"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Persoal"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Traballo"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de traballo"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Buscar aplicacións do traballo aquí"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"As aplicacións do traballo teñen unha insignia e están protexidas pola túa organización. Traslada as aplicacións á pantalla de inicio para acceder a elas de forma máis fácil."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Perfil xestionado pola túa organización"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"As notificacións e as aplicacións están desactivadas"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Pechar"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Pechada"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Os datos persoais sepáranse e ocúltanse das aplicacións do traballo"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"O teu administrador de TI pode ver as aplicacións e os datos do traballo"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Seguinte"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Entendido"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"O perfil de traballo está en pausa"</string>
+    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
+    <skip />
+    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
+    <skip />
+    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
+    <skip />
+    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
+    <skip />
+    <string name="work_switch_tip" msgid="808075064383839144">"Pon en pausa as aplicacións e as notificacións do traballo"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Erro: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 3228dea004..84fe49c79c 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -20,38 +20,68 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="work_folder_name" msgid="3753320833950115786">"કાર્યાલય"</string>
+    <string name="work_folder_name" msgid="3753320833950115786">"ઑફિસ"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"ઍપ્લિકેશન ઇન્સ્ટોલ થઈ નથી."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"ઍપ્લિકેશન ઉપલબ્ધ નથી"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"સુરક્ષિત મોડમાં ડાઉનલોડ કરેલ ઍપ્લિકેશન અક્ષમ કરી"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"સુરક્ષિત મોડમાં વિજેટ્સ અક્ષમ કર્યા"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"શૉર્ટકટ ઉપલબ્ધ નથી"</string>
-    <string name="home_screen" msgid="806512411299847073">"હોમ સ્ક્રીન"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"કસ્ટમ ક્રિયાઓ"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"વિજેટ ચૂંટવા માટે સ્પર્શ કરો અને પકડી રાખો."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"વિજેટ ચૂંટવા અથવા કસ્ટમ ક્રિયાઓનો ઉપયોગ કરવા માટે બે વાર ટેપ કરો અને પકડી રાખો."</string>
+    <!-- no translation found for home_screen (5629429142036709174) -->
+    <skip />
+    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
+    <skip />
+    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
+    <skip />
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d પહોળાઈ X %2$d ઊંચાઈ"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"મેન્યુઅલી મૂકવા માટે ટચ કરી દબાવી રાખો"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"આપમેળે ઉમેરો"</string>
+    <string name="place_automatically" msgid="8064208734425456485">"ઑટોમૅટિક રીતે ઉમેરો"</string>
+    <!-- no translation found for widgets_count (656794749266073027) -->
+    <!-- no translation found for shortcuts_count (8080294865447938455) -->
+    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
+    <skip />
+    <string name="widget_button_text" msgid="2880537293434387943">"વિજેટ્સ"</string>
+    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
+    <skip />
+    <!-- no translation found for no_widgets_available (9140948620298620513) -->
+    <skip />
+    <!-- no translation found for no_search_results (6518732304311458580) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
+    <skip />
+    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"શોધ ઍપ્લિકેશનો"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ઍપ્લિકેશનો લોડ કરી રહ્યું છે…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\"થી મેળ ખાતી કોઈ ઍપ્લિકેશનો મળી નથી"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"વધુ ઍપ્લિકેશનો શોધો"</string>
     <string name="label_application" msgid="8531721983832654978">"ઍપ"</string>
+    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
+    <skip />
+    <!-- no translation found for search_action_try_now (1458737965476149074) -->
+    <skip />
     <string name="notifications_header" msgid="1404149926117359025">"નોટિફિકેશનો"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"એક શૉર્ટકટ ચૂંટવા માટે સ્પર્શ કરી રાખો."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"એક શૉર્ટકટ ચૂંટવા અથવા કોઈ કસ્ટમ ક્રિયાઓનો ઉપયોગ કરવા માટે બે વાર ટૅપ કરીને દબાવી રાખો."</string>
+    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
+    <skip />
     <string name="out_of_space" msgid="4691004494942118364">"આ હોમ સ્ક્રીન પર વધુ જગ્યા નથી."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"મનપસંદ ટ્રે પર વધુ જગ્યા નથી"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ઍપ્લિકેશનોની સૂચિ"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"વ્યક્તિગત ઍપની સૂચિ"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"કાર્યસ્થળની ઍપની સૂચિ"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"હોમ"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"દૂર કરો"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"અનઇન્સ્ટોલ કરો"</string>
-    <string name="app_info_drop_target_label" msgid="692894985365717661">"ઍપ્લિકેશન માહિતી"</string>
+    <string name="app_info_drop_target_label" msgid="692894985365717661">"ઍપની માહિતી"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"ઇન્સ્ટૉલ કરો"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"ઍપ સૂચવશો નહીં"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"પૂર્વાનુમાનને પિન કરો"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"શોર્ટકટ્સ ઇન્સ્ટોલ કરો"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"એપ્લિકેશનને વપરાશકર્તા હસ્તક્ષેપ વગર શોર્ટકટ્સ ઉમેરવાની મંજૂરી આપે છે."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"હોમ સેટિંગ્સ અને શોર્ટકટ્સ વાંચો"</string>
@@ -62,7 +92,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"વિજેટ લોડ કરવામાં સમસ્યા"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"સેટઅપ"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"આ એક સિસ્ટમ ઍપ્લિકેશન છે અને અનઇન્સ્ટોલ કરી શકાતી નથી."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"અનામી ફોલ્ડર"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"નામમાં ફેરફાર કરો"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> અક્ષમ કરી"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="one"><xliff:g id="APP_NAME_2">%1$s</xliff:g>ના <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> નોટિફિકેશન છે</item>
@@ -76,11 +106,11 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"નામ બદલવાનું સાચવવા માટે ટૅપ કરો"</string>
     <string name="folder_closed" msgid="4100806530910930934">"ફોલ્ડર બંધ કર્યું"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"ફોલ્ડરનું નામ બદલીને <xliff:g id="NAME">%1$s</xliff:g> કર્યું"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"ફોલ્ડર: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"વિજેટ્સ"</string>
-    <string name="wallpaper_button_text" msgid="8404103075899945851">"વૉલપેપર્સ"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"ફોલ્ડર: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> આઇટમ"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"ફોલ્ડર: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> કે વધુ આઇટમ"</string>
+    <string name="wallpaper_button_text" msgid="8404103075899945851">"વૉલપેપર"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"શૈલીઓ અને વૉલપેપર"</string>
-    <string name="settings_button_text" msgid="8873672322605444408">"હોમ સેટિંગ્સ"</string>
+    <string name="settings_button_text" msgid="8873672322605444408">"હોમ સેટિંગ"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"તમારા વ્યવસ્થાપક દ્વારા અક્ષમ કરેલ"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"હોમ સ્ક્રીનને ફેરવવાની મંજૂરી આપો"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"જ્યારે ફોન ફેરવવામાં આવે ત્યારે"</string>
@@ -91,16 +121,17 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"નોટિફિકેશન માટેનું ચિહ્ન બતાવવા હેતુ, <xliff:g id="NAME">%1$s</xliff:g> માટેની ઍપ્લિકેશન નોટિફિકેશન ચાલુ કરો"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"સેટિંગ્સ બદલો"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"નોટિફિકેશન માટેના ચિહ્ન બતાવો"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"હોમ સ્ક્રીન પર આઇકન ઉમેરો"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"ઍપના આઇકન હોમ સ્ક્રીન પર ઉમેરો"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"નવી ઍપ્લિકેશનો માટે"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"અજાણ્યો"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"દૂર કરો"</string>
     <string name="abandoned_search" msgid="891119232568284442">"શોધો"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"આ ઍપ્લિકેશન ઇન્સ્ટોલ થયેલ નથી"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"આ આયકન માટેની ઍપ્લિકેશન ઇન્સ્ટોલ થયેલ નથી. તમે તેને દૂર કરી શકો છો અથવા ઍપ્લિકેશન માટે શોધ કરી અને તેને મેન્યુઅલી ઇન્સ્ટોલ કરી શકો છો."</string>
+    <!-- no translation found for app_installing_title (5864044122733792085) -->
+    <skip />
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> ડાઉનલોડ કરી રહ્યાં છે, <xliff:g id="PROGRESS">%2$s</xliff:g> પૂર્ણ"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g>, ઇન્સ્ટૉલ થવાની રાહ જોઈ રહ્યું છે"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> વિજેટ"</string>
     <string name="widgets_list" msgid="796804551140113767">"વિજેટની સૂચિ"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"વિજેટની સૂચિ બંધ કરવામાં આવી છે"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"હોમ સ્ક્રીન પર ઉમેરો"</string>
@@ -128,15 +159,30 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"શૉર્ટકટ્સ"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"શૉર્ટકટ અને નોટિફિકેશનો"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"છોડી દો"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"બંધ કરો"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"સૂચના છોડી દીધી"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"મનગમતી ઍપ"</string>
-    <string name="all_apps_work_tab" msgid="4884822796154055118">"કાર્યાલયની ઍપ"</string>
-    <string name="work_profile_toggle_label" msgid="3081029915775481146">"કાર્યાલયની પ્રોફાઇલ"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"કાર્ય ઍપને અહીંથી મેળવો"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"દરેક કાર્ય ઍપ પાસે એક બૅજ હોય છે અને તમારી સંસ્થા દ્વારા તેને સુરક્ષિત રાખવામાં આવે છે. વધુ સરળ ઍક્સેસ માટે ઍપને તમારી હોમ સ્ક્રીન પર ખસેડો."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"તમારી સંસ્થા દ્વારા મેનેજ કરેલ"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"નોટિફિકેશન અને ઍપ બંધ છે"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"બંધ કરો"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"બંધ"</string>
+    <string name="all_apps_work_tab" msgid="4884822796154055118">"ઑફિસની ઍપ"</string>
+    <string name="work_profile_toggle_label" msgid="3081029915775481146">"ઑફિસની પ્રોફાઇલ"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"વ્યક્તિગત ડેટા ઑફિસ માટેની ઍપથી અલગ અને છુપાવીને રાખેલો છે"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"ઑફિસ માટેની ઍપ અને ડેટા તમારા IT વ્યવસ્થાપકને દેખાય છે"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"આગળ"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"સમજાઈ ગયું"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"ઑફિસની પ્રોફાઇલ થોભાવી છે"</string>
+    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
+    <skip />
+    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
+    <skip />
+    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
+    <skip />
+    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
+    <skip />
+    <string name="work_switch_tip" msgid="808075064383839144">"ઑફિસ માટેની ઍપ અને નોટિફિકેશન થોભાવો"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"નિષ્ફળ: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index b738bc0739..9923cea975 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -26,32 +26,62 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Preuzeta aplikacija onemogućena je u Sigurnom načinu rada"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Widgeti su onemogućeni u Sigurnom načinu rada"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Prečac nije dostupan"</string>
-    <string name="home_screen" msgid="806512411299847073">"Početni zaslon"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Prilagođene radnje"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Dodirnite i držite kako biste podigli widget."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Dodirnite dvaput i držite kako biste podigli widget ili pokušajte prilagođenim radnjama."</string>
+    <!-- no translation found for home_screen (5629429142036709174) -->
+    <skip />
+    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
+    <skip />
+    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
+    <skip />
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d širine i %2$d visine"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Dodirnite i zadržite stavku da biste je postavili ručno"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Dodaj automatski"</string>
+    <!-- no translation found for widgets_count (656794749266073027) -->
+    <!-- no translation found for shortcuts_count (8080294865447938455) -->
+    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
+    <skip />
+    <string name="widget_button_text" msgid="2880537293434387943">"Widgeti"</string>
+    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
+    <skip />
+    <!-- no translation found for no_widgets_available (9140948620298620513) -->
+    <skip />
+    <!-- no translation found for no_search_results (6518732304311458580) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
+    <skip />
+    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Pretraži aplikacije"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Učitavanje aplikacija…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nema aplikacija podudarnih s upitom \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Traži više aplikacija"</string>
     <string name="label_application" msgid="8531721983832654978">"Aplikacija"</string>
+    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
+    <skip />
+    <!-- no translation found for search_action_try_now (1458737965476149074) -->
+    <skip />
     <string name="notifications_header" msgid="1404149926117359025">"Obavijesti"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Dodirnite i zadržite kako biste podigli prečac."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Dvaput dodirnite i zadržite pritisak kako biste podigli prečac ili pokušajte prilagođenim radnjama."</string>
+    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
+    <skip />
     <string name="out_of_space" msgid="4691004494942118364">"Na ovom početnom zaslonu više nema mjesta."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Nema više prostora na traci Favoriti"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Popis aplikacija"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Popis osobnih aplikacija"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Popis radnih aplikacija"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Početna"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Ukloni"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Deinstaliraj"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Info o aplikaciji"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Instaliraj"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Ne predlaži aplikaciju"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Prikvači predviđenu apl."</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"instaliranje prečaca"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Aplikaciji omogućuje dodavanje prečaca bez intervencije korisnika."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"čitanje postavki početnog zaslona i prečaca"</string>
@@ -62,7 +92,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Problem pri učitavanju widgeta"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Postavljanje"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Ovo je aplikacija sustava i ne može se ukloniti."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Neimenovana mapa"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Uređivanje naziva"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> onemogućena"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="one"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, ima <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> obavijest</item>
@@ -77,8 +107,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Dodirnite da biste spremili promijenjeni naziv"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Mapa je zatvorena"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Mapa je preimenovana u <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Mapa: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Widgeti"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Mapa: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> stavke"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Mapa: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ili više stavki"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Pozadine"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stilovi i pozadine"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Postavke početnog zaslona"</string>
@@ -92,16 +122,17 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Za prikaz točaka obavijesti uključite obavijesti aplikacije <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Promjena postavki"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Prikaži točke obavijesti"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Dodaj ikonu na početni zaslon"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Dodajte ikone aplikacija na početni zaslon"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Za nove aplikacije"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Nepoznato"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Ukloni"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Traži"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Ta aplikacija nije instalirana"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Aplikacija ove ikone nije instalirana. Možete je ukloniti ili potražiti aplikaciju i instalirati je ručno."</string>
+    <!-- no translation found for app_installing_title (5864044122733792085) -->
+    <skip />
     <string name="app_downloading_title" msgid="8336702962104482644">"Preuzimanje aplikacije <xliff:g id="NAME">%1$s</xliff:g>, dovršeno <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"Čekanje na instaliranje aplikacije <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> widgeti"</string>
     <string name="widgets_list" msgid="796804551140113767">"Popis widgeta"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Popis widgeta zatvoren"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Dodavanje na početni zaslon"</string>
@@ -129,15 +160,30 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Prečaci"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Prečaci i obavijesti"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Odbaci"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Zatvori"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Obavijest je odbačena"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Osobno"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Posao"</string>
-    <string name="work_profile_toggle_label" msgid="3081029915775481146">"Radni profil"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Ovdje možete pronaći radne aplikacije"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Svaka radna aplikacija ima značku i štiti je vaša organizacija. Premjestite aplikacije na početni zaslon radi lakšeg pristupa."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Pod upravljanjem vaše organizacije"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Obavijesti i aplikacije isključeni su"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Zatvori"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Zatvoreno"</string>
+    <string name="work_profile_toggle_label" msgid="3081029915775481146">"Poslovni profil"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Osobni podaci odvojeni su i skriveni od poslovnih aplikacija"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Podaci poslovnih aplikacija vidljivi su vašem IT administratoru"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Dalje"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Shvaćam"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Poslovni profil je pauziran"</string>
+    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
+    <skip />
+    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
+    <skip />
+    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
+    <skip />
+    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
+    <skip />
+    <string name="work_switch_tip" msgid="808075064383839144">"Pauzirajte poslovne aplikacije i obavijesti"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Nije uspjelo: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 93404e6f5f..c7e7260a61 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -26,32 +26,52 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Ներբեռնված ծրագիրն անջատված է Անվտանգ ռեժիմում"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Վիջեթներն անջատված են անվտանգ ռեժիմում"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Դյուրանցումն անհասանելի է"</string>
-    <string name="home_screen" msgid="806512411299847073">"Հիմնական էկրան"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Հատուկ գործողություններ"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Հպեք և պահեք՝ վիջեթն ընտրելու համար:"</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Կրկնակի հպեք և պահեք՝ վիջեթ ավելացնելու համար կամ օգտվեք հարմարեցրած գործողություններից:"</string>
+    <string name="home_screen" msgid="5629429142036709174">"Հիմնական էկրան"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Տրոհել էկրանը"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Հպեք և պահեք՝ վիջեթ տեղափոխելու համար։"</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Կրկնակի հպեք և պահեք՝ վիջեթ տեղափոխելու համար, կամ օգտվեք հատուկ գործողություններից։"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Լայնությունը՝ %1$d, բարձրությունը՝ %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Հպեք և պահեք՝ ձեռքով տեղադրելու համար"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Ավելացնել ավտոմատ կերպով"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> վիջեթ</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> վիջեթ</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> դյուրանցում</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> դյուրանցում</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Վիջեթներ"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Որոնեք"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Մաքրել որոնման դաշտի տեքստը"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Վիջեթներ չկան"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Որոնման արդյունքներ չկան"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Անձնական"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Աշխատանքային"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Զրույցներ"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Որոնել հավելվածներ"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Հավելվածների բեռնում…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"«<xliff:g id="QUERY">%1$s</xliff:g>» հարցմանը համապատասխանող հավելվածներ չեն գտնվել"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Որոնել այլ հավելվածներ"</string>
     <string name="label_application" msgid="8531721983832654978">"Հավելված"</string>
+    <string name="search_corpus_apps" msgid="1917889409963779022">"Հավելվածներ"</string>
+    <string name="search_action_try_now" msgid="1458737965476149074">"Փորձել"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Ծանուցումներ"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Կրկնակի հպեք և պահեք՝ դյուրանցում ընտրելու համար։"</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Կրկնակի հպեք և պահեք՝ դյուրանցում ընտրելու համար կամ օգտվեք հարմարեցրած գործողություններից:"</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Հպեք և պահեք՝ դյուրանցում տեղափոխելու համար։"</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Կրկնակի հպեք և պահեք՝ դյուրանցում տեղափոխելու համար, կամ օգտվեք հատուկ գործողություններից։"</string>
     <string name="out_of_space" msgid="4691004494942118364">"Այլևս տեղ չկա այս հիմնական էկրանին:"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Ընտրյալների ցուցակում այլևս ազատ տեղ չկա"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Հավելվածների ցանկ"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Անձնական հավելվածների ցանկ"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Աշխատանքային հավելվածների ցանկ"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Հիմնական"</string>
-    <string name="remove_drop_target_label" msgid="7812859488053230776">"Ապատեղադրել"</string>
-    <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Հեռացնել"</string>
-    <string name="app_info_drop_target_label" msgid="692894985365717661">"Հավելվածի տվյալներ"</string>
+    <string name="remove_drop_target_label" msgid="7812859488053230776">"Հեռացնել"</string>
+    <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Ապատեղադրել"</string>
+    <string name="app_info_drop_target_label" msgid="692894985365717661">"Հավելվածի մասին"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Տեղադրել"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Թաքցնել առաջարկը"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Ամրացնել առաջարկվող հավելվածը"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"տեղադրել դյուրանցումներ"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Ծրագրին թույլ է տալիս ավելացնել դյուրանցումներ՝ առանց օգտագործողի միջամտության:"</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"կարդալ հիմնաէջի կարգավորումներն ու դյուրանցումները"</string>
@@ -62,7 +82,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Վիջեթի բեռնման խնդիր կա"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Կարգավորում"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Սա համակարգային ծրագիր է և չի կարող ապատեղադրվել:"</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Անանուն պանակ"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Փոխել անունը"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> հավելվածն անջատված է"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="one"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, ունի <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> ծանուցում</item>
@@ -76,8 +96,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Հպեք՝ նոր անվանումը պահելու համար"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Պանակը փակ է"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Պանակը վերանվանվեց <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Պանակ՝ <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Վիջեթներ"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Պանակ՝ <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> տարր"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Պանակ՝ <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> կամ ավելի տարրեր"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Պաստառներ"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Ոճեր և պաստառներ"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Գլխավոր էջի կարգավորումներ"</string>
@@ -91,16 +111,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Ծանուցումների կետիկները ցուցադրելու համար միացրեք ծանուցումները <xliff:g id="NAME">%1$s</xliff:g>-ի համար"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Փոխել կարգավորումները"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Ցուցադրել ծանուցումների կետիկները"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Ավելացնել պատկերակը Հիմնական էկրանին"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Ավելացնել պատկերակները հիմնական էկրանին"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Նոր հավելվածների համար"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Անհայտ է"</string>
-    <string name="abandoned_clean_this" msgid="7610119707847920412">"Ապատեղադրել"</string>
+    <string name="abandoned_clean_this" msgid="7610119707847920412">"Հեռացնել"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Գտնել"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Այս ծրագիրը տեղադրված չէ:"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Այս պատկերակի ծրագիրը տեղադրված չէ: Դուք կարող եք հեռացնել այն կամ գտնել ծրագիրը և տեղադրել այն ձեռքով:"</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> հավելվածը տեղադրվում է, կատարված է <xliff:g id="PROGRESS">%2$s</xliff:g>-ը"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g>–ի ներբեռնում (<xliff:g id="PROGRESS">%2$s</xliff:g>)"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g>-ի տեղադրման սպասում"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> վիջեթներ"</string>
     <string name="widgets_list" msgid="796804551140113767">"Վիջեթների ցանկ"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Վիջեթների ցանկը փակվեց"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Ավելացնել Հիմնական էկրանին"</string>
@@ -128,15 +148,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Դյուրանցումներ"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Դյուրանցումներ և ծանուցումներ"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Անտեսել"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Փակել"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Ծանուցումը մերժված է"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Անձնական"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Աշխատանքային"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Աշխատանքային պրոֆիլ"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Գտեք աշխատանքային հավելվածներ այստեղ"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Աշխատանքային հավելվածները նշված են հատուկ նշանով: Նման հավելվածների անվտանգությունը ապահովում է ձեր կազմակերպությունը։ Հարմարության համար աշխատանքային հավելվածները կարող եք տեղափոխել հիմնական էկրան։"</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Կառավարվում է ձեր կազմակերպության կողմից"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Ծանուցումներն ու հավելվածներն անջատված են"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Փակել"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Փակվեց"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Անձնական տվյալները թաքցված են և առանձնացված աշխատանքային հավելվածներից"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Աշխատանքային հավելվածներն ու դրանց տվյալները տեսանելի են ձեր ադմինիստրատորին"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Առաջ"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Եղավ"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Աշխատանքային պրոֆիլը դադարեցված է"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Աշխատանքային հավելվածները չեն կարող ձեզ ծանուցումներ ուղարկել, օգտագործել ձեր մարտկոցը և ձեր տեղադրության մասին տվյալներ ստանալ։"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Աշխատանքային պրոֆիլը դադարեցված է։ Աշխատանքային հավելվածները չեն կարող ձեզ ծանուցումներ ուղարկել, օգտագործել ձեր մարտկոցը և ձեր տեղադրության մասին տվյալներ ստանալ։"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Աշխատանքային հավելվածները նշանակներ ունեն և տեսանելի են ձեր ՏՏ ադմինիստրատորին"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Եղավ"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Դադարեցնել աշխատանքային հավելվածները"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Միացնել"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Զտեք"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Դադարեցնել աշխատանքային հավելվածներն ու ծանուցումները"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Չհաջողվեց կատարել գործողությունը (<xliff:g id="WHAT">%1$s</xliff:g>)"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 8c4e3c5281..3956d50635 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -20,39 +20,58 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Lavoro"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"App non installata."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"App non disponibile"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"L\'app scaricata è stata disattivata in modalità provvisoria"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Widget disabilitati in modalità provvisoria"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"La scorciatoia non è disponibile"</string>
-    <string name="home_screen" msgid="806512411299847073">"Schermata Home"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Azioni personalizzate"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Tocca e tieni premuto per scegliere un widget."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Tocca due volte e tieni premuto per scegliere un widget o per utilizzare azioni personalizzate."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Home"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Schermo diviso"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Tocca e tieni premuto per spostare un widget."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Tocca due volte e tieni premuto per spostare un widget o per usare le azioni personalizzate."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d di larghezza per %2$d di altezza"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Tieni premuto per posizionare l\'elemento manualmente"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Aggiungi automaticamente"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> scorciatoie</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> scorciatoia</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Widget"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Cerca"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Cancella il testo nella casella di ricerca"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Nessun widget disponibile"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Nessun risultato di ricerca"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personali"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Lavoro"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Conversazioni"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Cerca nelle app"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Caricamento delle app…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nessuna app trovata corrispondente a \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Cerca altre app"</string>
     <string name="label_application" msgid="8531721983832654978">"App"</string>
+    <string name="search_corpus_apps" msgid="1917889409963779022">"App"</string>
+    <string name="search_action_try_now" msgid="1458737965476149074">"Prova subito"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Notifiche"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Tocca e tieni premuto per scegliere la scorciatoia"</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Tocca due volte e tieni premuto per scegliere una scorciatoia o per usare azioni personalizzate."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Tocca e tieni premuto per spostare una scorciatoia."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Tocca due volte e tieni premuto per spostare una scorciatoia o per usare le azioni personalizzate."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Spazio nella schermata Home esaurito."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Spazio esaurito nella barra dei Preferiti"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Elenco di app"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Elenco di app personali"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Elenco di app di lavoro"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Home page"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Rimuovi"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Disinstalla"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Informazioni app"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Installa"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Non suggerire app"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Blocca previsione"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"aggiunta di scorciatoie"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Consente a un\'app di aggiungere scorciatoie automaticamente."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"lettura di impostazioni e scorciatoie in Home"</string>
@@ -63,7 +82,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Errore durante il caricamento del widget"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Configurazione"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Questa è un\'app di sistema e non può essere disinstallata."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Cartella senza nome"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Modifica nome"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"App <xliff:g id="APP_NAME">%1$s</xliff:g> disattivata"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, ha <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> notifiche</item>
@@ -77,8 +96,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Tocca per salvare il nuovo nome"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Cartella chiusa"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Nome della cartella sostituito con <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Cartella: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Widget"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Cartella: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elementi"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Cartella: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> o più elementi"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Sfondi"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stili e sfondi"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Impostazioni Home"</string>
@@ -92,16 +111,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Per mostrare gli indicatori di notifica, attiva le notifiche per l\'app <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Modifica impostazioni"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Mostra indicatori di notifica"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Aggiungi icone alla schermata Home"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Aggiungi icone app a schermata Home"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Per le nuove app"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Sconosciuto"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Rimuovi"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Cerca"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"L\'app non è installata"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"L\'app per questa icona non è installata. Puoi rimuoverla o cercare l\'app e installarla manualmente."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"Installazione di <xliff:g id="NAME">%1$s</xliff:g>, completamento: <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"Download di <xliff:g id="NAME">%1$s</xliff:g> in corso, <xliff:g id="PROGRESS">%2$s</xliff:g> completato"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> in attesa di installazione"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Widget di <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Elenco di widget"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Elenco di widget chiuso"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Aggiungi a schermata Home"</string>
@@ -129,15 +148,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Scorciatoie"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Scorciatoie e notifiche"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Ignora"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Esci"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Notifica ignorata"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personali"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Lavoro"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profilo di lavoro"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Qui puoi trovare le tue app di lavoro"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Ogni app di lavoro è contrassegnata da un badge e viene tenuta al sicuro dalla tua organizzazione. Sposta le app nella schermata Home per accedervi più facilmente."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Gestito dalla tua organizzazione"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Le notifiche e le app non sono attive"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Chiudi"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Chiusa"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"I dati personali sono separati e non sono visibili nelle app di lavoro"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"I dati e le app di lavoro sono visibili all\'amministratore IT"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Avanti"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Profilo di lavoro in pausa"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Le app di lavoro non possono inviarti notifiche, usare la tua batteria o accedere alla tua posizione"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Profilo di lavoro in pausa. Le app di lavoro non possono inviarti notifiche, usare la tua batteria o accedere alla tua posizione"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Le app di lavoro sono contrassegnate con un badge e sono visibili dal tuo amministratore IT"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Metti in pausa le app di lavoro"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Attiva"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtra"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Metti in pausa le app di lavoro e le relative notifiche"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Operazione non riuscita: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index c25e8795f7..77eb7784c6 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -20,39 +20,62 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"עבודה"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"האפליקציה לא מותקנת."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"האפליקציה אינה זמינה"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"אפליקציה שהורדת הושבתה במצב בטוח"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"ווידג\'טים מושבתים במצב בטוח"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"קיצור הדרך אינו זמין"</string>
-    <string name="home_screen" msgid="806512411299847073">"מסך דף הבית"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"פעולות מותאמות אישית"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"אפשר לבחור את הווידג\'ט אם נוגעים בו נגיעה רציפה."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"הקש פעמיים וגע נגיעה רציפה בווידג\'ט כדי לבחור בו, או השתמש בפעולות מותאמות אישית."</string>
+    <string name="home_screen" msgid="5629429142036709174">"בית"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"מסך מפוצל"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"יש לגעת ולהחזיק כדי להעביר ווידג\'ט למקום אחר."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"יש ללחוץ פעמיים ולהמשיך את הלחיצה כדי להעביר ווידג\'ט למקום אחר או להשתמש בפעולות מותאמות אישית."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"‏רוחב %1$d על גובה %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"יש ללחוץ לחיצה ארוכה כדי להוסיף ידנית"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"הוסף באופן אוטומטי"</string>
+    <string name="place_automatically" msgid="8064208734425456485">"הוספה אוטומטית"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="two"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ווידג\'טים</item>
+      <item quantity="many"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ווידג\'טים</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ווידג\'טים</item>
+      <item quantity="one">ווידג\'ט אחד (<xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g>)</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="two"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> קיצורי דרך</item>
+      <item quantity="many"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> קיצורי דרך</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> קיצורי דרך</item>
+      <item quantity="one">קיצור דרך אחד (<xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g>)</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"ווידג\'טים"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"חיפוש"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"מחיקת טקסט מתיבת החיפוש"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"אין ווידג\'טים זמינים"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"אין תוצאות חיפוש"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"אישי"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"עבודה"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"שיחות"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"חיפוש אפליקציות"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"טוען אפליקציות…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"לא נמצאו אפליקציות התואמות ל-\"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"חפש אפליקציות נוספות"</string>
     <string name="label_application" msgid="8531721983832654978">"אפליקציה"</string>
+    <string name="search_corpus_apps" msgid="1917889409963779022">"אפליקציות"</string>
+    <string name="search_action_try_now" msgid="1458737965476149074">"זה הרגע לנסות"</string>
     <string name="notifications_header" msgid="1404149926117359025">"התראות"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"כדי להוסיף קיצור דרך, יש לגעת בו ולהחזיק אותו."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"כדי להוסיף קיצור דרך או להשתמש בפעולות מותאמות אישית, יש להקיש על קיצור הדרך פעמיים ולהחזיק אותו."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"יש לגעת ולהחזיק כדי להעביר קיצור דרך למקום אחר."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"יש ללחוץ פעמיים ולהמשיך את הלחיצה כדי להעביר קיצור דרך למקום אחר או להשתמש בפעולות מותאמות אישית."</string>
     <string name="out_of_space" msgid="4691004494942118364">"אין עוד מקום במסך דף הבית הזה."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"אין עוד מקום במגש המועדפים"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"רשימת אפליקציות"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"רשימת אפליקציות אישיות"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"רשימת אפליקציות עבודה"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"דף הבית"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"הסר"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"להסרת התקנה"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"פרטי אפליקציה"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"התקנה"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"בלי להציע את האפליקציה"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"הצמדת החיזוי"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"התקן קיצורי דרך"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"מאפשר לאפליקציה להוסיף קיצורי דרך ללא התערבות המשתמש."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"קרא הגדרות וקיצורי דרך של דף הבית"</string>
@@ -63,7 +86,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"בעיה בטעינת ווידג\'ט"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"הגדרה"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"זוהי אפליקציית מערכת ולא ניתן להסיר את התקנתה."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"תיקיה ללא שם"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"עריכת השם"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> מושבתת"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="two">לאפליקציה <xliff:g id="APP_NAME_2">%1$s</xliff:g> יש <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> התראות</item>
@@ -79,8 +102,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"הקש כדי לשמור שינוי שם"</string>
     <string name="folder_closed" msgid="4100806530910930934">"התיקיה נסגרה"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"שם התיקיה שונה ל-<xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"תיקיה: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"רכיבי ווידג\'ט"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"תיקייה: <xliff:g id="NAME">%1$s</xliff:g>, מספר הפריטים: <xliff:g id="SIZE">%2$d</xliff:g>"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"תיקייה: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> פריטים או יותר"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"טפטים"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"סגנונות וטפטים"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"הגדרות דף הבית"</string>
@@ -94,19 +117,19 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"כדי להציג את סימני ההתראות,יש להפעיל התראות מהאפליקציה <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"שנה את ההגדרות"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"הצגת סימני ההתראות"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"הוספת סמל במסך דף הבית"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"הוספת סמלי אפליקציות למסך הבית"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"לאפליקציות חדשות"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"לא ידוע"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"הסר"</string>
     <string name="abandoned_search" msgid="891119232568284442">"חיפוש"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"אפליקציה זו אינה מותקנת"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"האפליקציה של סמל זה אינה מותקנת. ניתן להסיר אותו, או לחפש את האפליקציה ולהתקין אותה ידנית."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> בתהליך התקנה, <xliff:g id="PROGRESS">%2$s</xliff:g> הושלמו"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"מוריד את <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="PROGRESS">%2$s</xliff:g> הושלמו"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"מחכה להתקנה של <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"ווידג\'טים של <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"רשימת ווידג\'טים"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"רשימת הווידג\'טים נסגרה"</string>
-    <string name="action_add_to_workspace" msgid="8902165848117513641">"הוסף למסך דף הבית"</string>
+    <string name="action_add_to_workspace" msgid="8902165848117513641">"הוספה למסך דף הבית"</string>
     <string name="action_move_here" msgid="2170188780612570250">"העבר את הפריט לכאן"</string>
     <string name="item_added_to_workspace" msgid="4211073925752213539">"הפריט הועבר אל מסך דף הבית"</string>
     <string name="item_removed" msgid="851119963877842327">"הפריט הוסר"</string>
@@ -130,16 +153,24 @@
     <string name="widget_resized" msgid="9130327887929620">"גודל הווידג\'ט שונה - רוחב <xliff:g id="NUMBER_0">%1$s</xliff:g> גובה <xliff:g id="NUMBER_1">%2$s</xliff:g>"</string>
     <string name="action_deep_shortcut" msgid="2864038805849372848">"קיצורי דרך"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"קיצורי דרך והתראות"</string>
-    <string name="action_dismiss_notification" msgid="5909461085055959187">"סגור"</string>
+    <string name="action_dismiss_notification" msgid="5909461085055959187">"סגירה"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"סגירה"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"ההתראה נסגרה"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"אישיות"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"עבודה"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"פרופיל עבודה"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"ניתן למצוא כאן את אפליקציות העבודה"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"לכל אפליקציית עבודה יש תג ואבטחתה מטופלת בידי הארגון. אפשר להעביר אפליקציות אל מסך דף הבית כדי להקל את הגישה אליהן."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"מנוהל בידי הארגון"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"התראות ואפליקציות כבויות"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"סגירה"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"סגור"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"מידע אישי מאוחסן בנפרד ומוסתר מאפליקציות לעבודה"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"‏אפליקציות לעבודה ונתוני העבודה שלך גלויים למנהל ה-IT"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"הבא"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"הבנתי"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"פרופיל העבודה מושהה"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"האפליקציות לעבודה לא יכולות לשלוח לך התראות, להשתמש בסוללה או לגשת למיקום שלך"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"פרופיל העבודה מושהה. האפליקציות לעבודה לא יכולות לשלוח לך התראות, להשתמש בסוללה או לגשת למיקום שלך"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"‏האפליקציות לעבודה מתויגות ומוצגות למנהל ה-IT"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"הבנתי"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"השהיית האפליקציות לעבודה"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"הפעלה"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"סינון"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"השהיה של התראות ואפליקציות לעבודה"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"הפעולה נכשלה: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 67ea6a830a..0be0f1bc17 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -26,32 +26,52 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"ಡೌನ್‌ಲೋಡ್ ಮಾಡಲಾದ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಸುರಕ್ಷಿತ ಮೋಡ್‌ನಲ್ಲಿ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"ಸುರಕ್ಷಿತ ಮೋಡ್‌ನಲ್ಲಿ ವಿಜೆಟ್‌ಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"ಶಾರ್ಟ್‌ಕಟ್ ಲಭ್ಯವಿಲ್ಲ"</string>
-    <string name="home_screen" msgid="806512411299847073">"ಮುಖಪುಟದ ಪರದೆ"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"ಕಸ್ಟಮ್ ಕ್ರಿಯೆಗಳು"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"ವಿಜೆಟ್ ಅನ್ನು ಆರಿಸಿಕೊಳ್ಳಲು ಸ್ಪರ್ಶಿಸಿ &amp; ಹಿಡಿದುಕೊಳ್ಳಿ."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"ಡಬಲ್ ಟ್ಯಾಪ್ ಮಾಡಿ ಮತ್ತು ವಿಜೆಟ್ ಆರಿಸಿಕೊಳ್ಳಲು ಹೋಲ್ಡ್ ಮಾಡಿ ಅಥವಾ ಕಸ್ಟಮ್ ಕ್ರಿಯೆಗಳನ್ನು ಬಳಸಿ"</string>
+    <string name="home_screen" msgid="5629429142036709174">"ಹೋಮ್"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"ಸ್ಪ್ಲಿಟ್ ಸ್ಕ್ರೀನ್"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"ವಿಜೆಟ್ ಸರಿಸಲು ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಹಿಡಿದುಕೊಳ್ಳಿ."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ವಿಜೆಟ್ ಸರಿಸಲು ಅಥವಾ ಕಸ್ಟಮ್ ಕ್ರಿಯೆಗಳನ್ನು ಬಳಸಲು ಡಬಲ್-ಟ್ಯಾಪ್ ಮಾಡಿ ಮತ್ತು ಹಿಡಿದುಕೊಳ್ಳಿ."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ಅಗಲ ಮತ್ತು %2$d ಎತ್ತರ"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"ಹಸ್ತಚಾಲಿತವಾಗಿ ಸೇರಿಸಲು ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಹೋಲ್ಡ್ ಮಾಡಿ"</string>
     <string name="place_automatically" msgid="8064208734425456485">"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸೇರಿಸಿ"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ವಿಜೆಟ್‌ಗಳು</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ವಿಜೆಟ್‌ಗಳು</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> ಶಾರ್ಟ್‌ಕಟ್‌ಗಳು</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> ಶಾರ್ಟ್‌ಕಟ್‌ಗಳು</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"ವಿಜೆಟ್‌ಗಳು"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"ಹುಡುಕಿ"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"ಹುಡುಕಾಟ ಪೆಟ್ಟಿಗೆಯಿಂದ ಪಠ್ಯವನ್ನು ತೆರವುಗೊಳಿಸಿ"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"ಯಾವುದೇ ವಿಜೆಟ್‌ಗಳು ಲಭ್ಯವಿಲ್ಲ"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"ಯಾವುದೇ ಹುಡುಕಾಟ ಫಲಿತಾಂಶಗಳಿಲ್ಲ"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ವೈಯಕ್ತಿಕ"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ಕೆಲಸ"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"ಸಂವಾದಗಳು"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಹುಡುಕಿ"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" ಹೊಂದಿಕೆಯ ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಕಂಡುಬಂದಿಲ್ಲ"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"ಮತ್ತಷ್ಟು ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಹುಡುಕಿ"</string>
     <string name="label_application" msgid="8531721983832654978">"ಆ್ಯಪ್"</string>
+    <string name="search_corpus_apps" msgid="1917889409963779022">"ಆ್ಯಪ್‌ಗಳು"</string>
+    <string name="search_action_try_now" msgid="1458737965476149074">"ಈಗಲೇ ಬಳಸಿ ನೋಡಿ"</string>
     <string name="notifications_header" msgid="1404149926117359025">"ಅಧಿಸೂಚನೆಗಳು"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಶಾರ್ಟ್‌ಕಟ್ ಆರಿಸಲು ಹೋಲ್ಡ್ ಮಾಡಿ."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"ಡಬಲ್ ಟ್ಯಾಪ್ ಮಾಡಿ ಮತ್ತು ಶಾರ್ಟ್‌ಕಟ್ ಆರಿಸಿಕೊಳ್ಳಲು ಹೋಲ್ಡ್ ಮಾಡಿ ಅಥವಾ ಕಸ್ಟಮ್ ಕ್ರಿಯೆಗಳನ್ನು ಬಳಸಿ."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"ಶಾರ್ಟ್‌ಕಟ್ ಸರಿಸಲು ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಹಿಡಿದುಕೊಳ್ಳಿ."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ಶಾರ್ಟ್‌ಕಟ್ ಸರಿಸಲು ಅಥವಾ ಕಸ್ಟಮ್ ಕ್ರಿಯೆಗಳನ್ನು ಬಳಸಲು ಡಬಲ್-ಟ್ಯಾಪ್ ಮಾಡಿ ಮತ್ತು ಹಿಡಿದುಕೊಳ್ಳಿ."</string>
     <string name="out_of_space" msgid="4691004494942118364">"ಈ ಮುಖಪುಟದ ಪರದೆಯಲ್ಲಿ ಹೆಚ್ಚು ಸ್ಥಳಾವಕಾಶವಿಲ್ಲ."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ಮೆಚ್ಚಿನವುಗಳ ಟ್ರೇನಲ್ಲಿ ಹೆಚ್ಚಿನ ಸ್ಥಳಾವಕಾಶವಿಲ್ಲ"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಪಟ್ಟಿ"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"ವೈಯಕ್ತಿಕ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಪಟ್ಟಿ"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"ಕೆಲಸದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಪಟ್ಟಿ"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"ಮುಖಪುಟ"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"ತೆಗೆದುಹಾಕಿ"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"ಅನ್‌ಇನ್‌ಸ್ಟಾಲ್"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"ಅಪ್ಲಿಕೇಶನ್ ಮಾಹಿತಿ"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"ಸ್ಥಾಪಿಸಿ"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"ಆ್ಯಪ್ ಅನ್ನು ಸೂಚಿಸಬೇಡಿ"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"ಮುನ್ನೋಟ ಪಿನ್ ಮಾಡಿ"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"ಶಾರ್ಟ್‌ಕಟ್‌ಗಳನ್ನು ಸ್ಥಾಪಿಸಿ"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"ಬಳಕೆದಾರರ ಹಸ್ತಕ್ಷೇಪವಿಲ್ಲದೆ ಶಾರ್ಟ್‌ಕಟ್‌ಗಳನ್ನು ಸೇರಿಸಲು ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"ಮುಖಪುಟದ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಮತ್ತು ಶಾರ್ಟ್‌ಕಟ್‌ಗಳನ್ನು ಓದಿ"</string>
@@ -62,7 +82,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"ವಿಜೆಟ್ ಲೋಡ್‌ ಮಾಡುವಲ್ಲಿ ಸಮಸ್ಯೆ"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"ಸೆಟಪ್"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"ಇದೊಂದು ಅಪ್ಲಿಕೇಶನ್ ಆಗಿದೆ ಮತ್ತು ಅಸ್ಥಾಪಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"ಹೆಸರಿಲ್ಲದ ಫೋಲ್ಡರ್"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"ಹೆಸರನ್ನು ಎಡಿಟ್ ಮಾಡಿ"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="one"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> ಅಧಿಸೂಚನೆಗಳನ್ನು ಹೊಂದಿದೆ</item>
@@ -76,8 +96,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"ಮರುಹೆಸರನ್ನು ಉಳಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="folder_closed" msgid="4100806530910930934">"ಫೋಲ್ಡರ್ ಮುಚ್ಚಿದೆ"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"ಫೋಲ್ಡರ್‌ ಅನ್ನು <xliff:g id="NAME">%1$s</xliff:g> ಗೆ ಮರುಹೆಸರಿಸಲಾಗಿದೆ"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"ಫೋಲ್ಡರ್: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"ವಿಜೆಟ್‌ಗಳು"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"ಫೋಲ್ಡರ್: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ಐಟಂಗಳು"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"ಫೋಲ್ಡರ್: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ಅಥವಾ ಹೆಚ್ಚಿನ ಐಟಂಗಳು"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"ವಾಲ್‌ಪೇಪರ್‌ಗಳು"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"ಶೈಲಿಗಳು &amp; ವಾಲ್‌ಪೇಪರ್‌ಗಳು"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"ಮುಖಪುಟ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
@@ -91,16 +111,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"ಅಧಿಸೂಚನೆ ಚುಕ್ಕೆಗಳನ್ನು ತೋರಿಸಲು, <xliff:g id="NAME">%1$s</xliff:g> ಗೆ ಅಪ್ಲಿಕೇಶನ್‌ ಅಧಿಸೂಚನೆಗಳನ್ನು ಆನ್‌ ಮಾಡಿ"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"ಸೆಟ್ಟಿಂಗ್‌‌ಗಳನ್ನು ಬದಲಾಯಿಸಿ"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"ಅಧಿಸೂಚನೆ ಡಾಟ್‌ಗಳನ್ನು ತೋರಿಸಿ"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"ಮುಖಪುಟದ ಪರದೆಗೆ ಐಕಾನ್ ಸೇರಿಸಿ"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ಗೆ ಆ್ಯಪ್ ಐಕಾನ್‌ಗಳು ಸೇರಿಸಿ"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"ಹೊಸ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"ಅಪರಿಚಿತ"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"ತೆಗೆದುಹಾಕಿ"</string>
-    <string name="abandoned_search" msgid="891119232568284442">"ಹುಡುಕಿ"</string>
+    <string name="abandoned_search" msgid="891119232568284442">"Search"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"ಈ ಅಪ್ಲಿಕೇಶನ್ ಸ್ಥಾಪನೆಗೊಂಡಿಲ್ಲ"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"ಈ ಐಕಾನ್ ಅಪ್ಲಿಕೇಶನ್ ಸ್ಥಾಪನೆಗೊಂಡಿಲ್ಲ. ನೀವು ಅದನ್ನು ತೆಗೆದುಹಾಕಬಹುದು ಅಥವಾ ಅಪ್ಲಿಕೇಶನ್ ಹುಡುಕಬಹುದು ಮತ್ತು ಹಸ್ತಚಾಲಿತವಾಗಿ ಅದನ್ನು ಸ್ಥಾಪಿಸಬಹುದು."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಲಾಗುತ್ತಿದೆ, <xliff:g id="PROGRESS">%2$s</xliff:g> ಪೂರ್ಣಗೊಂಡಿದೆ"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> ಡೌನ್‌ಲೋಡ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ, <xliff:g id="PROGRESS">%2$s</xliff:g> ಪೂರ್ಣಗೊಂಡಿದೆ"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> ಸ್ಥಾಪಿಸಲು ಕಾಯಲಾಗುತ್ತಿದೆ"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> ವಿಜೆಟ್‌ಗಳು"</string>
     <string name="widgets_list" msgid="796804551140113767">"ವಿಜೆಟ್ ಪಟ್ಟಿ"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"ವಿಜೆಟ್ ಪಟ್ಟಿಯನ್ನು ಮುಚ್ಚಲಾಗಿದೆ"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"ಮುಖಪುಟಕ್ಕೆ ಸೇರಿಸಿ"</string>
@@ -128,15 +148,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"ಶಾರ್ಟ್‌ಕಟ್‌ಗಳು"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"ಶಾರ್ಟ್‌ಕಟ್‌ಗಳು ಮತ್ತು ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"ವಜಾಗೊಳಿಸಿ"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"ಮುಚ್ಚಿರಿ"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"ಅಧಿಸೂಚನೆಯನ್ನು ವಜಾಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ವೈಯಕ್ತಿಕ"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"ಕೆಲಸ"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"ಕೆಲಸದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಇಲ್ಲಿ ಹುಡುಕಿ"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"ಕೆಲಸದ ಪ್ರತಿ ಅಪ್ಲಿಕೇಶನ್ ಬ್ಯಾಡ್ಜ್ ಹೊಂದಿದೆ ಮತ್ತು ನಿಮ್ಮ ಸಂಸ್ಥೆಯಿಂದ ಸುರಕ್ಷಿತವಾಗಿ ಇರಿಸಲಾಗುತ್ತದೆ. ಸುಲಭ ಪ್ರವೇಶಕ್ಕಾಗಿ ನಿಮ್ಮ ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ಗೆ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಸರಿಸಿ."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"ನಿಮ್ಮ ಸಂಸ್ಥೆಯ ಮೂಲಕ ನಿರ್ವಹಿಸಲಾಗಿದೆ"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"ಅಧಿಸೂಚನೆಗಳು ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಆಫ್ ಆಗಿವೆ"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"ಮುಚ್ಚಿ"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"ಮುಚ್ಚಲಾಗಿದೆ"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"ವೈಯಕ್ತಿಕ ಡೇಟಾ ಬೇರೆಯದಾಗಿದೆ ಮತ್ತು ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ನಿಂದ ಮರೆ ಮಾಡಲಾಗಿದೆ"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"ನಿಮ್ಮ IT ನಿರ್ವಾಹಕರಿಗೆ ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳು ಮತ್ತು ಡೇಟಾ ಗೋಚರಿಸುತ್ತದೆ"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"ಮುಂದೆ"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"ಸರಿ"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್‌ ಅನ್ನು ವಿರಾಮಗೊಳಿಸಲಾಗಿದೆ"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳಿಗೆ ನಿಮಗೆ ಅಧಿಸೂಚನೆಗಳನ್ನು ಕಳುಹಿಸಲು, ನಿಮ್ಮ ಬ್ಯಾಟರಿಯನ್ನು ಬಳಸಲು ಅಥವಾ ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್‌ ಅನ್ನು ವಿರಾಮಗೊಳಿಸಲಾಗಿದೆ. ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳಿಗೆ ನಿಮಗೆ ಅಧಿಸೂಚನೆಗಳನ್ನು ಕಳುಹಿಸಲು, ನಿಮ್ಮ ಬ್ಯಾಟರಿಯನ್ನು ಬಳಸಲು ಅಥವಾ ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳು ಬ್ಯಾಡ್ಜ್ ಮಾಡಲಾಗಿದೆ ಮತ್ತು ನಿಮ್ಮ IT ನಿರ್ವಾಹಕರಿಗೆ ಗೋಚರಿಸುತ್ತದೆ"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"ಅರ್ಥವಾಯಿತು"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ವಿರಾಮಗೊಳಿಸಿ"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"ಆನ್ ಮಾಡಿ"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"ಫಿಲ್ಟರ್‌"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳು ಮತ್ತು ಅಧಿಸೂಚನೆಗಳನ್ನು ವಿರಾಮಗೊಳಿಸಿ"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"ವಿಫಲವಾಗಿದೆ: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index d52446c83c..2c23c06d86 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -26,32 +26,62 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Жүктөп алынган колдонмо Коопсуз режиминде иштен чыгарылды"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Виджеттер Коопсуз режимде өчүрүлгөн"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Кыска жол жок"</string>
-    <string name="home_screen" msgid="806512411299847073">"Башкы экран"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Ыңгайлаштырылган аракеттер"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Виджетти тандаш үчүн, басып туруңуз"</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Виджет тандоо үчүн эки жолу таптап, кармап туруңуз же ыңгайлаштырылган аракеттерди колдонуңуз."</string>
+    <!-- no translation found for home_screen (5629429142036709174) -->
+    <skip />
+    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
+    <skip />
+    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
+    <skip />
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Туурасы: %1$d, бийиктиги: %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Кол менен кошуу үчүн кое бербей басып туруңуз"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Автоматтык түрдө кошуу"</string>
+    <!-- no translation found for widgets_count (656794749266073027) -->
+    <!-- no translation found for shortcuts_count (8080294865447938455) -->
+    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
+    <skip />
+    <string name="widget_button_text" msgid="2880537293434387943">"Виджеттер"</string>
+    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
+    <skip />
+    <!-- no translation found for no_widgets_available (9140948620298620513) -->
+    <skip />
+    <!-- no translation found for no_search_results (6518732304311458580) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
+    <skip />
+    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Колдонмолорду издөө"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Колдонмолор жүктөлүүдө…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" сурамына дал келген колдонмолор табылган жок"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Көбүрөөк колдонмолорду издөө"</string>
     <string name="label_application" msgid="8531721983832654978">"Колдонмо"</string>
+    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
+    <skip />
+    <!-- no translation found for search_action_try_now (1458737965476149074) -->
+    <skip />
     <string name="notifications_header" msgid="1404149926117359025">"Билдирмелер"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Кыска жолду тандоо үчүн басып туруңуз."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Кыска жолду тандоо үчүн эки жолу таптап, кармап туруңуз же ыңгайлаштырылган аракеттерди колдонуңуз."</string>
+    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
+    <skip />
     <string name="out_of_space" msgid="4691004494942118364">"Бул Үй экранында бош орун жок."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Тандамалдар тайпасында орун калган жок"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Колдонмолор тизмеси"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Жеке колдономолордун тизмеси"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Жумуш колдонмолорунун тизмеси"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Үйгө"</string>
-    <string name="remove_drop_target_label" msgid="7812859488053230776">"Алып салуу"</string>
+    <string name="remove_drop_target_label" msgid="7812859488053230776">"Өчүрүү"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Чыгарып салуу"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Колдонмо тууралуу"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Орнотуу"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Колдонмо сунушталбасын"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Божомолдонгон колдонмону кадап коюу"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"тез чакырмаларды орнотуу"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Колдонмого колдонуучуга кайрылбастан тез чакырма кошууга уруксат берет."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"Үйдүн тууралоолорун жана тез чакырмаларын окуу"</string>
@@ -62,7 +92,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Виджетти жүктөөдө маселе бар"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Орнотуу"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Бул системдик колдонмо жана аны чечкенге болбойт."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Аты жок фолдер"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Аталышын түзөтүү"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> өчүрүлгөн"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> билдирмеси бар</item>
@@ -76,8 +106,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Өзгөртүлгөн аталышын сактоо үчүн таптаңыз"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Фолдер жабык"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Фолдердин аты <xliff:g id="NAME">%1$s</xliff:g> деп өзгөртүлдү"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Фолдер: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Виджеттер"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"<xliff:g id="NAME">%1$s</xliff:g> папкасындагы объекттер: <xliff:g id="SIZE">%2$d</xliff:g>"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"<xliff:g id="NAME">%1$s</xliff:g> папкасындагы объекттер: <xliff:g id="SIZE">%2$d</xliff:g> же андан көбүрөөк"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Тушкагаздар"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Стилдер жана тушкагаздар"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Башкы бет жөндөөлөрү"</string>
@@ -88,19 +118,20 @@
     <string name="notification_dots_desc_on" msgid="1679848116452218908">"Күйүк"</string>
     <string name="notification_dots_desc_off" msgid="1760796511504341095">"Өчүк"</string>
     <string name="title_missing_notification_access" msgid="7503287056163941064">"Эскертмелерге уруксат берилиши керек"</string>
-    <string name="msg_missing_notification_access" msgid="281113995110910548">"Эскертме белгилерин көрсөтүү максатында, <xliff:g id="NAME">%1$s</xliff:g> үчүн колдонмонун эскертмелерин күйгүзүү керек"</string>
+    <string name="msg_missing_notification_access" msgid="281113995110910548">"Эскертме белгилерин көрсөтүү максатында, <xliff:g id="NAME">%1$s</xliff:g> үчүн колдонмонун билдирмелерин күйгүзүү керек"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Жөндөөлөрдү өзгөртүү"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Билдирмелер белгилерин көрсөтүү"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Башкы экранга сүрөтчө кошуу"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Колдонмонун сүрөтчөсүн Башкы экранга кошуу"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Жаңы колдонмолор үчүн"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Белгисиз"</string>
-    <string name="abandoned_clean_this" msgid="7610119707847920412">"Алып салуу"</string>
+    <string name="abandoned_clean_this" msgid="7610119707847920412">"Өчүрүү"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Издөө"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Бул колдонмо орнотулган эмес"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Бул сүрөтчөнүн колдонмосу орнотулган эмес. Аны алып салсаңыз же колдонмону издеп, кол менен орнотсоңуз болот."</string>
+    <!-- no translation found for app_installing_title (5864044122733792085) -->
+    <skip />
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> жүктөлүп алынууда, <xliff:g id="PROGRESS">%2$s</xliff:g> аяктады"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> орнотулушу күтүлүүдө"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> виджеттери"</string>
     <string name="widgets_list" msgid="796804551140113767">"Виджеттердин тизмеси"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Виджеттердин тизмеси жабык"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Башкы экранга кошуу"</string>
@@ -111,7 +142,7 @@
     <string name="action_move" msgid="4339390619886385032">"Муну жылдыруу"</string>
     <string name="move_to_empty_cell" msgid="2833711483015685619">"<xliff:g id="NUMBER_0">%1$s</xliff:g> катарга <xliff:g id="NUMBER_1">%2$s</xliff:g> тилкеге жылдыруу"</string>
     <string name="move_to_position" msgid="6750008980455459790">"<xliff:g id="NUMBER">%1$s</xliff:g> орунга жылдыруу"</string>
-    <string name="move_to_hotseat_position" msgid="6295412897075147808">"Сүйүктүүлөргө <xliff:g id="NUMBER">%1$s</xliff:g> жылдыруу"</string>
+    <string name="move_to_hotseat_position" msgid="6295412897075147808">"Тандалмаларга <xliff:g id="NUMBER">%1$s</xliff:g> жылдыруу"</string>
     <string name="item_moved" msgid="4606538322571412879">"Нерсе жылдырылды"</string>
     <string name="add_to_folder" msgid="9040534766770853243">"Куржунга кошуу: <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="add_to_folder_with_app" msgid="4534929978967147231">"<xliff:g id="NAME">%1$s</xliff:g> куржунуна кошуу"</string>
@@ -128,15 +159,30 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Кыска жолдор"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Кыска жолдор жана билдирмелер"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Этибарга албоо"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Жабуу"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Эскертме көз жаздымда калтырылды"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Жеке колдонмолор"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Жумуш колдонмолору"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Жумуш профили"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Жумуш колдонмолорун бул жерден таап алыңыз"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Ар бир жумуш колдонмосунун бейджиги бар жана ал уюмуңуз тарабынан коопсуз сакталат. Колдонмолорго тез өтүү үчүн аларды Башкы экранга кошуп алыңыз."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Уюмуңуз тарабынан башкарылат"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Билдирүүлөр жана колдонмолор өчүрүлгөн"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Жабуу"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Жабык"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Жеке маалымат жумуш колдонмолорунан өзүнчө сакталат"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Жумуш колдонмолору жана маалымат IT администраторго гана көрүнөт"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Кийинки"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Түшүндүм"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Жумуш профили тындырылган"</string>
+    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
+    <skip />
+    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
+    <skip />
+    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
+    <skip />
+    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
+    <skip />
+    <string name="work_switch_tip" msgid="808075064383839144">"Жумуш колдонмолорун жана билдирмелерди тындыруу"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Аткарылган жок: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index afe7664d51..fc3ef834ce 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -20,39 +20,58 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"ວຽກ"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"ແອັບຯບໍ່ໄດ້ຖືກຕິດຕັ້ງ."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"ແອັບຯ​ໃຊ້​ບໍ່​ໄດ້"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"ແອັບຯ​ທີ່​ດາວ​ໂຫລດ​ແລ້ວ​ຖືກ​ປິດ​ການ​ນຳ​ໃຊ້​ໃນ Safe mode"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"​ວິດ​ເຈັດ​ຖືກ​ປິດ​ໃນ Safe mode"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"ບໍ່ສາມາດໃຊ້ທາງລັດໄດ້"</string>
-    <string name="home_screen" msgid="806512411299847073">"ໜ້າຈໍຫຼັກ"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"ຄຳສັ່ງແບບກຳນົດເອງ"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"ສຳພັດຄ້າງໄວ້ ເພື່ອຈັບວິດເຈັດ."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"ແຕະ​ຄ້າງ​ໄວ້ ເພື່ອ​ເລືອກວິດ​ເຈັດ ຫຼື ໃຊ້​ການ​ດຳ​ເນີນ​ການ​ກຳ​ນົດ​ເອງ."</string>
+    <string name="home_screen" msgid="5629429142036709174">"ໂຮມສະກຣີນ"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"ແບ່ງໜ້າຈໍ"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"ແຕະຄ້າງໄວ້ເພື່ອຍ້າຍວິດເຈັດ."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ແຕະສອງເທື່ອຄ້າງໄວ້ເພື່ອຍ້າຍວິດເຈັດ ຫຼື ໃຊ້ຄຳສັ່ງກຳນົດເອງ."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"ກວ້າງ %1$d ຄູນສູງ %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"ແຕະຄ້າງໄວ້ເພື່ອວາງດ້ວຍຕົນເອງ"</string>
     <string name="place_automatically" msgid="8064208734425456485">"ເພີ່ມໂດຍອັດຕະໂນມັດ"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ວິດເຈັດ</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> ວິດເຈັດ</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> ທາງລັດ</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> ທາງລັດ</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"ວິດເຈັດ"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"ຊອກຫາ"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"ລຶບລ້າງຂໍ້ຄວາມຈາກກ່ອງຊອກຫາ"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"ບໍ່ມີວິດເຈັດທີ່ສາມາດໃຊ້ໄດ້"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"ບໍ່​ມີ​ຜົນ​​ການ​ຊອກຫາ​"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ສ່ວນຕົວ"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ວຽກ"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"ການສົນທະນາ"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ຊອກຫາແອັບ"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ກໍາລັງໂຫຼດແອັບ…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"ບໍ່ພົບແອັບທີ່ກົງກັບ \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"ຊອກຫາແອັບເພີ່ມເຕີມ"</string>
     <string name="label_application" msgid="8531721983832654978">"ແອັບ"</string>
+    <string name="search_corpus_apps" msgid="1917889409963779022">"ແອັບ"</string>
+    <string name="search_action_try_now" msgid="1458737965476149074">"ລອງຕອນນີ້ເລີຍ"</string>
     <string name="notifications_header" msgid="1404149926117359025">"ການແຈ້ງເຕືອນ"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"ແຕະຄ້າງໄວ້ເພື່ອຮັບປຸ່ມລັດ."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"ແຕະສອງເທື່ອຄ້າງໄວ້ເພື່ອຮັບປຸ່ມລັດ ຫຼື ໃຊ້ຄຳສັ່ງແບບກຳນົດເອງ."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"ແຕະຄ້າງໄວ້ເພື່ອຍ້າຍທາງລັດ."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ແຕະສອງເທື່ອຄ້າງໄວ້ເພື່ອຍ້າຍທາງລັດ ຫຼື ໃຊ້ຄຳສັ່ງກຳນົດເອງ."</string>
     <string name="out_of_space" msgid="4691004494942118364">"ບໍ່ມີຫ້ອງເຫຼືອໃນໜ້າຈໍຫຼັກນີ້."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ບໍ່ມີບ່ອນຫວ່າງໃນຖາດສຳລັບເກັບສິ່ງທີ່ໃຊ້ເປັນປະຈຳ"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ລາຍຊື່ແອັບ"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"ລາຍຊື່ແອັບສ່ວນຕົວ"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"ລາຍຊື່ແອັບເຮັດວຽກ"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"ໜ້າຫຼັກ"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"ເອົາ​ອອກ"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"ຖອນ​ການ​ຕິດ​ຕັ້ງ"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"ຂໍ້ມູນແອັບ"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"ຕິດຕັ້ງ"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"ຢ່າແນະນຳແອັບ"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"ປັກໝຸດການຄາດເດົາ"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"ຕິດຕັ້ງທາງລັດ"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"ອະນຸຍາດໃຫ້ແອັບຯ ເພີ່ມທາງລັດໂດຍບໍ່ຕ້ອງຮັບການຢືນຢັນຈາກຜູ່ໃຊ້."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"ອ່ານການຕັ້ງຄ່າໜ້າຫຼັກ ແລະທາງລັດ"</string>
@@ -63,7 +82,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"ມີບັນຫາໃນການໂຫລດວິດເຈັດ"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"ຕິດຕັ້ງ"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"ນີ້ແມ່ນແອັບຯຂອງລະບົບ ແລະບໍ່ສາມາດຖອນການຕິດຕັ້ງອອກໄດ້."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"ໂຟນເດີຍັງບໍ່ຖືກຕັ້ງຊື່"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"ແກ້ໄຂຊື່"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"ປິດການນຳໃຊ້ <xliff:g id="APP_NAME">%1$s</xliff:g> ແລ້ວ"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, ມີ <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> ການແຈ້ງເຕືອນ</item>
@@ -77,13 +96,13 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"ແຕະເພື່ອບັນທຶກການປ່ຽນຊື່"</string>
     <string name="folder_closed" msgid="4100806530910930934">"ປິດໂຟນເດີແລ້ວ"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"ປ່ຽນຊື່ໂຟນເດີເປັນ <xliff:g id="NAME">%1$s</xliff:g> ແລ້ວ"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"ໂຟນເດີ: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"ວິດເຈັດ"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"ໂຟນເດີ: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ລາຍການ"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"ໂຟນເດີ: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ຫຼື ລາຍການເພີ່ມເຕີມ"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"ພາບພື້ນຫຼັງ"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"ຮູບແບບ ແລະ ຮູບພື້ນຫຼັງ"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"ການຕັ້ງຄ່າ Home"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"ຖືກປິດການນຳໃຊ້ໂດຍຜູ້ເບິ່ງແຍງລະບົບຂອງທ່ານ"</string>
-    <string name="allow_rotation_title" msgid="7728578836261442095">"ອະນຸຍາດໃຫ້ໝຸນໜ້າຈໍທຳອິດໄດ້"</string>
+    <string name="allow_rotation_title" msgid="7728578836261442095">"ອະນຸຍາດໃຫ້ໝຸນໜ້າຈໍຢູ່ໜ້າຫຼັກໄດ້"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"ເມື່ອໝຸນໂທລະສັບ"</string>
     <string name="notification_dots_title" msgid="9062440428204120317">"ຈຸດການແຈ້ງເຕືອນ"</string>
     <string name="notification_dots_desc_on" msgid="1679848116452218908">"ເປີດ"</string>
@@ -92,16 +111,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"ເພື່ອສະແດງຈຸດການແຈ້ງເຕືອນ, ໃຫ້ເປີດການແຈ້ງເຕືອນສຳລັບ <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"ບັນທຶກການຕັ້ງຄ່າ"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"ສະແດງຈຸດການແຈ້ງເຕືອນ"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"ເພີ່ມໄອຄອນໃສ່ໜ້າຈໍຫຼັກ"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"ເພີ່ມໄອຄອນແອັບໄປໃສ່ໜ້າຈໍຫຼັກ"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"ສຳລັບແອັບໃໝ່"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"​ບໍ່​ຮູ້​ຈັກ"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"ລຶບ​"</string>
     <string name="abandoned_search" msgid="891119232568284442">"ຊອກຫາ"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"ແອັບຯ​ນີ້​ຍັງ​ບໍ່​ໄດ້​ຕິດ​ຕັ້ງ​ເທື່ອ"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"​ແອັບຯ​ສຳ​ລັບ​ໄອ​ຄອນ​ນີ້​ຍັງ​ບໍ່ໄດ້​ຕິດ​ຕັ້ງ​ເທື່ອ. ທ່ານ​ສາ​ມາດ​ລຶບ​ມັນ​ອອກ ຫຼື​ຊອກ​ຫາ​ແອັບຯ ແລ້ວ​ຕິດ​ຕັ້ງ​ມັນ​ໄດ້​ດ້ວຍ​ຕົນ​ເອງ."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"ກຳລັງຕິດຕັ້ງ <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="PROGRESS">%2$s</xliff:g> ສຳເລັດແລ້ວ"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> ກຳ​ລັງ​ດາວ​ໂຫຼດ, <xliff:g id="PROGRESS">%2$s</xliff:g> ສຳ​ເລັດ"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> ກຳ​ລັງ​ລໍ​ຖ້າ​ຕິດ​ຕັ້ງ"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"ວິດເຈັດ <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"ລາຍຊື່ວິດເຈັດ"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"ປິດລາຍຊື່ວິດເຈັດແລ້ວ"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"ເພີ່ມໃສ່ໜ້າຈໍຫຼັກ"</string>
@@ -129,15 +148,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"ທາງລັດ"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"ປຸ່ມລັດ ແລະ ການແຈ້ງເຕືອນ"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"ປິດໄວ້"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"ປິດ"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"ປິດການແຈ້ງເຕືອນແລ້ວ"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ສ່ວນຕົວ"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"ວຽກ"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"ຊອກຫາແອັບວຽກຢູ່ບ່ອນນີ້"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"ແຕ່ລະແອັບວຽກຈະມີປ້າຍ ແລະ ຖືກຈັດເກັບໄວ້ຢ່າງປອດໄພໂດຍອົງກອນຂອງທ່ານ. ທ່ານສາມາດຍ້າຍແອັບໄປໃສ່ໜ້າຈໍຫຼັກເພື່ອໃຫ້ເຂົ້າໃຊ້ງ່າຍຂຶ້ນໄດ້."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"ຈັດການໂດຍອົງກອນຂອງທ່ານ"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"ການແຈ້ງເຕືອນ ແລະ ແອັບຖືກປິດໄວ້"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"ປິດ"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"ປິດແລ້ວ"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"ຂໍ້ມູນສ່ວນຕົວຈະຖືກແຍກອອກ ແລະ ເຊື່ອງໄວ້ຈາກແອັບວຽກ"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"ແອັບ ແລະ ຂໍ້ມູນວຽກຈະສະແດງໃຫ້ຜູ້ເບິ່ງແຍງໄອທີຂອງທ່ານເຫັນ"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"ຕໍ່ໄປ"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"ເຂົ້າໃຈແລ້ວ"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"ຢຸດໂປຣໄຟລ໌ວຽກໄວ້ຊົ່ວຄາວແລ້ວ"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"ແອັບບ່ອນເຮັດວຽກຈະບໍ່ສາມາດສົ່ງການແຈ້ງເຕືອນຫາທ່ານ, ໃຊ້ແບັດເຕີຣີຂອງທ່ານ ຫຼື ເຂົ້າເຖິງສະຖານທີ່ຂອງທ່ານໄດ້"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"ຢຸດໂປຣໄຟລ໌ບ່ອນເຮັດວຽກໄວ້ຊົ່ວຄາວແລ້ວ. ແອັບບ່ອນເຮັດວຽກຈະບໍ່ສາມາດສົ່ງການແຈ້ງເຕືອນຫາທ່ານ, ໃຊ້ແບັດເຕີຣີຂອງທ່ານ ຫຼື ເຂົ້າເຖິງສະຖານທີ່ຂອງທ່ານໄດ້"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"ແອັບບ່ອນເຮັດວຽກແມ່ນຖືກຕິດປ້າຍ ແລະ ສະແດງໃຫ້ຜູ້ເບິ່ງແຍງໄອທີຂອງທ່ານເຫັນ"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"ເຂົ້າໃຈແລ້ວ"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"ຢຸດແອັບບ່ອນເຮັດວຽກຊົ່ວຄາວ"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"ເປີດໃຊ້"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"ກັ່ນຕອງ"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"ຢຸດແອັບວຽກ ແລະ ການແຈ້ງເຕືອນໄວ້ຊົ່ວຄາວ"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"ບໍ່ສຳເລັດ: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 4362e7cca5..b95e1a7172 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -20,39 +20,58 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"ലോഞ്ചർ3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"ഔദ്യോഗികം"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"അപ്ലിക്കേഷൻ ഇൻസ്‌റ്റാളുചെ‌യ്‌തിട്ടില്ല."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"അപ്ലിക്കേഷൻ ലഭ്യമല്ല"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"ഡൗൺലോഡുചെയ്‌ത അപ്ലിക്കേഷൻ സുരക്ഷാ മോഡിൽ പ്രവർത്തനരഹിതമാക്കി"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"സുരക്ഷിത മോഡിൽ വിജറ്റുകൾ പ്രവർത്തനരഹിതമാക്കി"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"കുറുക്കുവഴി ലഭ്യമല്ല"</string>
-    <string name="home_screen" msgid="806512411299847073">"ഹോം സ്‌ക്രീൻ"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"ഇഷ്‌ടാനുസൃത പ്രവർത്തനങ്ങൾ"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"ഒരു വിജറ്റ് ചേർക്കുന്നതിന് അത് സ്‌പർശിച്ച് പിടിക്കുക."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"വിജറ്റ് തിരഞ്ഞെടുക്കാനോ ഇഷ്ടാനുസൃത പ്രവർത്തനങ്ങൾ ഉപയോഗിക്കാനോ രണ്ടുതവണ ടാപ്പുചെയ്ത് പിടിക്കുക."</string>
+    <string name="home_screen" msgid="5629429142036709174">"ഹോം"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"സ്‌ക്രീൻ വിഭജന മോഡ്"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"വിജറ്റ് നീക്കാൻ സ്‌പർശിച്ച് പിടിക്കുക."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"വിജറ്റ് നീക്കാൻ ഡബിൾ ടാപ്പ് ചെയ്യൂ, ഹോൾഡ് ചെയ്യൂ അല്ലെങ്കിൽ ഇഷ്‌ടാനുസൃത പ്രവർത്തനങ്ങൾ ഉപയോഗിക്കൂ."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d വീതിയും %2$d ഉയരവും"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"നേരിട്ട് സ്ഥാപിക്കുന്നതിന് സ്‌പർശിച്ചുപിടിക്കുക"</string>
     <string name="place_automatically" msgid="8064208734425456485">"സ്വയമേവ ചേർക്കുക"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> വിജറ്റുകൾ</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> വിജറ്റ്</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> കുറുക്കുവഴികൾ</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> കുറുക്കുവഴി</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"വിഡ്ജെറ്റുകൾ"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"തിരയൽ"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"സെർച്ച് ബോക്‌സിൽ നിന്ന് ടെക്‌സ്‌റ്റ് മായ്‌ക്കുക"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"ഒരു വിജറ്റുകളും ലഭ്യമല്ല"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"തിരയൽ ഫലങ്ങളൊന്നുമില്ല"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"വ്യക്തിപരം"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ജോലി"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"സംഭാഷണങ്ങൾ"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ആപ്പുകൾ തിരയുക"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ആപ്പുകൾ ലോഡുചെയ്യുന്നു..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" എന്നതുമായി പൊരുത്തപ്പെടുന്ന ആപ്പുകളൊന്നും കണ്ടെത്തിയില്ല"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"കൂടുതൽ ആപ്പുകൾക്ക് തിരയുക"</string>
     <string name="label_application" msgid="8531721983832654978">"ആപ്പ്"</string>
+    <string name="search_corpus_apps" msgid="1917889409963779022">"ആപ്പുകൾ"</string>
+    <string name="search_action_try_now" msgid="1458737965476149074">"ഇപ്പോൾ പരീക്ഷിക്കുക"</string>
     <string name="notifications_header" msgid="1404149926117359025">"അറിയിപ്പുകൾ"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"തിരഞ്ഞെടുക്കുന്നതിന് കുറുക്കുവഴി സ്‌പർശിച്ച് പിടിക്കുക."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"കുറുക്കുവഴി തിരഞ്ഞെടുക്കാനോ ഇഷ്‌ടാനുസൃത പ്രവർത്തനങ്ങൾ ഉപയോഗിക്കാനോ 2 തവണ ടാപ്പ് ചെയ്‌ത് പിടിക്കുക."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"കുറുക്കുവഴി നീക്കാൻ സ്‌പർശിച്ച് പിടിക്കുക."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"കുറുക്കുവഴി നീക്കാൻ ഡബിൾ ടാപ്പ് ചെയ്യൂ, ഹോൾഡ് ചെയ്യൂ അല്ലെങ്കിൽ ഇഷ്‌ടാനുസൃത പ്രവർത്തനങ്ങൾ ഉപയോഗിക്കൂ."</string>
     <string name="out_of_space" msgid="4691004494942118364">"ഈ ഹോം സ്‌ക്രീനിൽ ഒഴിവൊന്നുമില്ല."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"പ്രിയപ്പെട്ടവയുടെ ട്രേയിൽ ഒഴിവൊന്നുമില്ല"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"അപ്ലിക്കേഷനുകളുടെ ലിസ്‌റ്റ്"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"വ്യക്തിഗത ആപ്പുകളുടെ ലിസ്റ്റ്"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"ഔദ്യോഗിക ആപ്പുകളുടെ ലിസ്റ്റ്"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"ഹോം"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"നീക്കംചെയ്യുക"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"അൺഇൻസ്റ്റാളുചെയ്യുക"</string>
-    <string name="app_info_drop_target_label" msgid="692894985365717661">"ആപ്പ് വിവരം"</string>
+    <string name="app_info_drop_target_label" msgid="692894985365717661">"ആപ്പ് വിവരങ്ങൾ"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"ഇൻസ്‌റ്റാൾ ചെയ്യുക"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"ആപ്പ് നിർദ്ദേശിക്കരുത്"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"പ്രവചനം പിൻ ചെയ്യുക"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"കുറുക്കുവഴികൾ ഇൻസ്റ്റാളുചെയ്യുക"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"ഉപയോക്തൃ ഇടപെടൽ ഇല്ലാതെ കുറുക്കുവഴികൾ ചേർക്കാൻ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"ഹോം ക്രമീകരണങ്ങളും കുറുക്കുവഴികളും റീഡുചെയ്യുക"</string>
@@ -63,7 +82,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"വിജറ്റ് ലോഡുചെയ്യുന്നതിൽ പ്രശ്നമുണ്ട്"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"സജ്ജീകരിക്കുക"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"ഇതൊരു സിസ്‌റ്റം അപ്ലിക്കേഷനായതിനാൽ അൺഇൻസ്‌റ്റാളുചെയ്യാനാവില്ല."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"പേരുനൽകാത്ത ഫോൾഡർ"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"പേര് എഡിറ്റ് ചെയ്യുക"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> പ്രവർത്തനരഹിതമാക്കി"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g> എന്ന ആപ്പിന്, <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> അറിയിപ്പുകൾ ഉണ്ട്</item>
@@ -77,8 +96,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"പേരുമാറ്റം സംരക്ഷിക്കുന്നതിന് ടാപ്പുചെയ്യുക"</string>
     <string name="folder_closed" msgid="4100806530910930934">"ഫോൾഡർ അടച്ചു"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"ഫോൾഡറിന്റെ പേര് <xliff:g id="NAME">%1$s</xliff:g> എന്നായി മാറ്റി"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"ഫോൾഡർ: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"വിഡ്ജെറ്റുകൾ"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"ഫോൾഡർ: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ഇനങ്ങൾ"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"ഫോൾഡർ: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> അല്ലെങ്കിൽ അതിലധികം ഇനങ്ങൾ"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"വാൾപേപ്പർ"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"സ്‌റ്റൈലുകളും വാൾപേപ്പറുകളും"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"ഹോം ക്രമീകരണം"</string>
@@ -92,16 +111,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"അറിയിപ്പ് ഡോട്ടുകൾ കാണിക്കുന്നതിന്, <xliff:g id="NAME">%1$s</xliff:g> എന്നയാളിനായുള്ള ആപ്പ് അറിയിപ്പുകൾ ഓണാക്കുക"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"ക്രമീകരണം മാറ്റുക"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"അറിയിപ്പ് ഡോട്ടുകൾ കാണിക്കുക"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"ഹോം സ്ക്രീനിലേക്ക് ഐക്കൺ ചേർക്കുക"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"ഹോം സ്‌ക്രീനിൽ ആപ്പ് ഐക്കണുകൾ ചേർക്കൂ"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"പുതിയ ആപ്പുകൾക്ക്"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"അജ്ഞാതം"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"നീക്കംചെയ്യുക"</string>
-    <string name="abandoned_search" msgid="891119232568284442">"തിരയുക"</string>
+    <string name="abandoned_search" msgid="891119232568284442">"Search"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"ഈ അപ്ലിക്കേഷൻ ഇൻസ്റ്റാളുചെയ്‌തിട്ടില്ല"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"ഈ ഐക്കണുവേണ്ടി അപ്ലിക്കേഷൻ ഇൻസ്റ്റാളുചെയ്‌തിട്ടില്ല. നിങ്ങൾക്കത് നീക്കംചെയ്യാനാകും അല്ലെങ്കിൽ അപ്ലിക്കേഷനുവേണ്ടി തിരഞ്ഞുകൊണ്ട് അത് സ്വമേധയാ ഇൻസ്റ്റാളുചെയ്യുക."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> ഇൻസ്‌റ്റാൾ ചെയ്യുന്നു, <xliff:g id="PROGRESS">%2$s</xliff:g> പൂർത്തിയായി"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> ഡൗൺലോഡ് ചെയ്യുന്നു, <xliff:g id="PROGRESS">%2$s</xliff:g> പൂർത്തിയായി"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"ഇൻസ്റ്റാൾ ചെയ്യാൻ <xliff:g id="NAME">%1$s</xliff:g> കാക്കുന്നു"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> വിജറ്റുകൾ"</string>
     <string name="widgets_list" msgid="796804551140113767">"വിജറ്റുകളുടെ ലിസ്‌റ്റ്"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"വിജറ്റുകളുടെ ലിസ്‌റ്റ് അവസാനിപ്പിച്ചു"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"ഹോം സ്ക്രീനിൽ ചേർക്കുക"</string>
@@ -129,15 +148,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"കുറുക്കുവഴികൾ"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"കുറുക്കുവഴികളും അറിയിപ്പുകളും"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"നിരസിക്കുക"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"അടയ്ക്കൂ"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"അറിയിപ്പ് നിരസിച്ചു"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"വ്യക്തിപരം"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"ജോലി"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"ഔദ്യോഗിക പ്രൊഫൈൽ"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"ഔദ്യോഗിക ആപ്പുകൾ ഇവിടെ കണ്ടെത്തുക"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"എല്ലാ ഔദ്യോഗിക ആപ്പിനും ഒരു ബാഡ്‌ജ് ഉണ്ട്, നിങ്ങളുടെ സ്ഥാപനം അത് സുരക്ഷിതമായി സൂക്ഷിക്കുന്നു. എളുപ്പത്തിൽ ആക്സസ് ചെയ്യാൻ ആപ്പുകളെ ഹോം സ്‌ക്രീനിലേക്ക് നീക്കുക."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"നിങ്ങളുടെ സ്ഥാപനം നിയന്ത്രിക്കുന്നത്"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"അറിയിപ്പുകളും ആപ്പുകളും ഓഫാണ്"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"അടയ്ക്കുക"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"അടച്ചു"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"ഔദ്യോഗിക ആപ്പുകളിൽ നിന്ന് വ്യക്തിപരമായ ഡാറ്റ വേർതിരിച്ച് മറച്ചിരിക്കുന്നു"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"ഔദ്യോഗിക ആപ്പുകളും ഡാറ്റയും നിങ്ങളുടെ ഐടി അഡ്‌മിന് ദൃശ്യമാണ്"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"അടുത്തത്"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"മനസ്സിലായി"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"ഔദ്യോഗിക പ്രൊഫൈൽ തൽക്കാലം നിർത്തിയിരിക്കുന്നു"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"നിങ്ങൾക്ക് അറിയിപ്പുകൾ അയയ്ക്കാനോ ബാറ്ററി ഉപയോഗിക്കാനോ ലൊക്കേഷൻ ആക്‌സസ് ചെയ്യാനോ ഔദ്യോഗിക ആപ്പുകൾക്ക് കഴിയില്ല"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"ഔദ്യോഗിക പ്രൊഫൈൽ താൽക്കാലികമായി നിർത്തിയിരിക്കുന്നു. നിങ്ങൾക്ക് അറിയിപ്പുകൾ അയയ്ക്കാനോ ബാറ്ററി ഉപയോഗിക്കാനോ ലൊക്കേഷൻ ആക്‌സസ് ചെയ്യാനോ ഔദ്യോഗിക ആപ്പുകൾക്ക് കഴിയില്ല"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"ഔദ്യോഗിക ആപ്പുകൾക്ക് ബാഡ്‌ജ് നൽകിയിരിക്കുന്നു, അവ നിങ്ങളുടെ ഐടി അഡ്‌മിന് കാണാനും കഴിയും"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"മനസ്സിലായി"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"ഔദ്യോഗിക ആപ്പുകൾ താൽക്കാലികമായി നിർത്തുക"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"ഓണാക്കുക"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"ഫിൽട്ടർ ചെയ്യുക"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"ഔദ്യോഗിക ആപ്പുകളും അറിയിപ്പുകളും താൽക്കാലികമായി നിർത്തുക"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"പരാജയപ്പെട്ടു: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index ab02ac655c..577af39d60 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -20,39 +20,68 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Ажил"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Апп суугаагүй байна."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Апп-г ашиглах боломжгүй"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Татаж авсан апп-г Аюулгүй горим дотроос идэвхгүйжүүлсэн"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Safe горимд виджетүүдийг идэвхгүйжүүлсэн"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Товчлол алга"</string>
-    <string name="home_screen" msgid="806512411299847073">"Үндсэн нүүр"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Захиалгат үйлдэл"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Виджетийг авах бол хүрээд барина уу."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Жижиг хэрэгсэл авах болон тохируулсан үйлдлийг ашиглахын тулд 2 удаа товшоод барина уу."</string>
+    <!-- no translation found for home_screen (5629429142036709174) -->
+    <skip />
+    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
+    <skip />
+    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
+    <skip />
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d өргөн %2$d өндөр"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Гараар байршуулахын тулд дараад хүлээнэ үү"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Автоматаар нэмэх"</string>
+    <!-- no translation found for widgets_count (656794749266073027) -->
+    <!-- no translation found for shortcuts_count (8080294865447938455) -->
+    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
+    <skip />
+    <string name="widget_button_text" msgid="2880537293434387943">"Виджет"</string>
+    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
+    <skip />
+    <!-- no translation found for no_widgets_available (9140948620298620513) -->
+    <skip />
+    <!-- no translation found for no_search_results (6518732304311458580) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
+    <skip />
+    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Апп хайх"</string>
-    <string name="all_apps_loading_message" msgid="5813968043155271636">"Аппыг ачааллаж байна..."</string>
+    <string name="all_apps_loading_message" msgid="5813968043155271636">"Аппыг ачаалж байна..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\"-д тохирох апп олдсонгүй"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Бусад апп-г хайх"</string>
     <string name="label_application" msgid="8531721983832654978">"Апп"</string>
+    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
+    <skip />
+    <!-- no translation found for search_action_try_now (1458737965476149074) -->
+    <skip />
     <string name="notifications_header" msgid="1404149926117359025">"Мэдэгдэл"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Товчлол авах бол удаан дарна уу."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Товчлол авах эсвэл тохируулсан үйлдлийг ашиглахын тулд давхар товшоод хүлээнэ үү."</string>
+    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
+    <skip />
     <string name="out_of_space" msgid="4691004494942118364">"Энэ Нүүр дэлгэц зайгүй."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"\"Дуртай\" трей дээр өөр зай байхгүй байна"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Апп-н жагсаалт"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Хувийн аппын жагсаалт"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Ажлын аппын жагсаалт"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Нүүр"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Арилгах"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Устгах"</string>
-    <string name="app_info_drop_target_label" msgid="692894985365717661">"Апп-н мэдээлэл"</string>
+    <string name="app_info_drop_target_label" msgid="692894985365717661">"Аппын мэдээлэл"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Суулгах"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Апп бүү санал болго"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Таамаглалыг бэхлэх"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"товчлол суулгах"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Апп нь хэрэглэгчийн оролцоогүйгээр товчлолыг нэмэж чадна"</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"Нүүрний тохиргоо болон товчлолыг унших"</string>
@@ -63,7 +92,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Виджет ачаалахад асуудал гарав"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Тохируулга"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Энэ апп нь системийн апп ба устгах боломжгүй."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Нэргүй фолдер"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Нэр засах"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g>-г идэвхгүй болгосон"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> мэдэгдэлтэй байна</item>
@@ -77,10 +106,10 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Шинэ нэрийг хадгалахын тулд дарна уу."</string>
     <string name="folder_closed" msgid="4100806530910930934">"Фолдер хаагдав"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Фолдерын нэр <xliff:g id="NAME">%1$s</xliff:g> болов"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Фолдер: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Виджет"</string>
-    <string name="wallpaper_button_text" msgid="8404103075899945851">"Ханын зураг"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Загвар ба ханын зураг"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Фолдер: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> зүйл"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Фолдер: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> эсвэл үүнээс олон зүйл"</string>
+    <string name="wallpaper_button_text" msgid="8404103075899945851">"Дэлгэцийн зураг"</string>
+    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Загвар ба дэлгэцийн зураг"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Нүүр хуудасны тохиргоо"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Таны админ идэвхгүй болгосон"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Нүүр дэлгэцийг эргүүлэхийг зөвшөөрөх"</string>
@@ -92,16 +121,17 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Мэдэгдлийн цэгийг харуулахын тулд <xliff:g id="NAME">%1$s</xliff:g>-д аппын мэдэгдлийг асаана уу"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Тохиргоог өөрчлөх"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Мэдэгдлийн цэгийг харуулах"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Нүүр хуудаст дүрс тэмдэг нэмэх"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Аппын дүрс тэмдгийг Үндсэн нүүрэнд нэмэх"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Шинэ аппад зориулсан"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Тодорхойгүй"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Хасах"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Хайх"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Энэ апп-г суулгаагүй байна"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Энэ дүрсний апп-г суулгаагүй байна. Та үүнийг устгах буюу апп-г хайж суулгах боломжтой."</string>
+    <!-- no translation found for app_installing_title (5864044122733792085) -->
+    <skip />
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g>-г татаж байна, <xliff:g id="PROGRESS">%2$s</xliff:g> татсан"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> нь суулгахыг хүлээж байна"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> жижиг хэрэгсэл"</string>
     <string name="widgets_list" msgid="796804551140113767">"Жижиг хэрэгслийн жагсаалт"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Жижиг хэрэгслийн жагсаалтыг хаасан"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Нүүр дэлгэцэд нэмэх"</string>
@@ -129,15 +159,30 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Товчлол"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Товчлол болон мэдэгдэл"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Хаах"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Хаах"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Мэдэгдлийг хаасан"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Хувийн"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Ажил"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Ажлын профайл"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Ажлын аппыг эндээс олно уу"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Ажлын апп тус бүр тэмдэгтэй ба эдгээрийг танай байгууллагаас аюулгүй байлгадаг. Аппуудад хялбар хандахын тулд тэдгээрийг Үндсэн нүүр хэсэгт зөөнө үү."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Танай байгууллагаас удирддаг"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Мэдэгдэл, апп унтраалттай байна"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Хаах"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Хаасан"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Хувийн өгөгдөл нь ажлын аппаас тусдаа бөгөөд нуугдмал байна"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Ажлын апп болон өгөгдөл нь таны мэдээлэл технологийн админд харагдана"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Дараах"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Ойлголоо"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Ажлын профайлыг түр зогсоосон"</string>
+    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
+    <skip />
+    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
+    <skip />
+    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
+    <skip />
+    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
+    <skip />
+    <string name="work_switch_tip" msgid="808075064383839144">"Ажлын апп болон мэдэгдлийг түр зогсоох"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Амжилтгүй болсон: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 1e7aee9e9e..f55d6bbd36 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -20,50 +20,79 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"कार्य"</string>
-    <string name="activity_not_found" msgid="8071924732094499514">"अनुप्रयोग स्थापित छैन।"</string>
-    <string name="activity_not_available" msgid="7456344436509528827">"अनुप्रयोग उपलब्ध छैन"</string>
-    <string name="safemode_shortcut_error" msgid="9160126848219158407">"सुरक्षित मोडमा डाउनलोड गरेको अनुप्रयोग अक्षम गरिएको छ"</string>
+    <string name="activity_not_found" msgid="8071924732094499514">"एप स्थापित छैन।"</string>
+    <string name="activity_not_available" msgid="7456344436509528827">"एप उपलब्ध छैन"</string>
+    <string name="safemode_shortcut_error" msgid="9160126848219158407">"सुरक्षित मोडमा डाउनलोड गरेको एप अक्षम गरिएको छ"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"सुरक्षित मोडमा विगेटहरू अक्षम गरियो"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"सर्टकट उपलब्ध छैन"</string>
-    <string name="home_screen" msgid="806512411299847073">"गृह स्क्रिन"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"आफू अनुकूलका कारबाहीहरू"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"एउटा विजेटलाई टिप्नको लागि टच गरेर होल्ड गर्नुहोस्।"</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"विजेटलाई छान्न वा आफू अनुकूल कार्यहरू प्रयोग गर्न डबल ट्याप गरी होल्ड गर्नुहोस्।"</string>
+    <!-- no translation found for home_screen (5629429142036709174) -->
+    <skip />
+    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
+    <skip />
+    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
+    <skip />
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d चौडाइ गुणा %2$d उचाइ"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"म्यानुअल तरिकाले थप्न छुनुहोस् र थिची राख्नुहोस्‌"</string>
+    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"थप्न टच एण्ड होल्ड गर्नुहोस्"</string>
     <string name="place_automatically" msgid="8064208734425456485">"स्वतः थप्नुहोस्"</string>
-    <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"खोजसम्बन्धी अनुप्रयोगहरू"</string>
-    <string name="all_apps_loading_message" msgid="5813968043155271636">"अनुप्रयोगहरू लोड गर्दै…"</string>
-    <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" सँग मिल्दो कुनै अनुप्रयोग भेटिएन"</string>
-    <string name="all_apps_search_market_message" msgid="1366263386197059176">"थप अनुप्रयोगहरू खोज्नुहोस्"</string>
-    <string name="label_application" msgid="8531721983832654978">"अनुप्रयोग"</string>
+    <!-- no translation found for widgets_count (656794749266073027) -->
+    <!-- no translation found for shortcuts_count (8080294865447938455) -->
+    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
+    <skip />
+    <string name="widget_button_text" msgid="2880537293434387943">"विजेटहरू"</string>
+    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
+    <skip />
+    <!-- no translation found for no_widgets_available (9140948620298620513) -->
+    <skip />
+    <!-- no translation found for no_search_results (6518732304311458580) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
+    <skip />
+    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
+    <skip />
+    <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"खोजसम्बन्धी एपहरू"</string>
+    <string name="all_apps_loading_message" msgid="5813968043155271636">"एपहरू लोड गर्दै…"</string>
+    <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" सँग मिल्दो कुनै एप भेटिएन"</string>
+    <string name="all_apps_search_market_message" msgid="1366263386197059176">"थप एपहरू खोज्नुहोस्"</string>
+    <string name="label_application" msgid="8531721983832654978">"एप"</string>
+    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
+    <skip />
+    <!-- no translation found for search_action_try_now (1458737965476149074) -->
+    <skip />
     <string name="notifications_header" msgid="1404149926117359025">"सूचनाहरू"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"कुनै सर्टकट छनौट गर्न छोइराख्नुहोस्।"</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"कुनै सर्टकट छनौट गर्न वा रोजेका कारबाहीहरू प्रयोग गर्न डबल ट्याप गरेर छोइराख्नुहोस्।"</string>
+    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
+    <skip />
     <string name="out_of_space" msgid="4691004494942118364">"यो गृह स्क्रिनमा कुनै थप ठाउँ छैन।"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"मन पर्ने ट्रे अब कुनै ठाँउ छैन"</string>
-    <string name="all_apps_button_label" msgid="8130441508702294465">"अनुप्रयोगको सूची"</string>
+    <string name="all_apps_button_label" msgid="8130441508702294465">"एपको सूची"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"व्यक्तिगत अनुप्रयोगहरूको सूची"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"कार्यसम्बन्धी अनुप्रयोगहरूको सूची"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"गृह"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"हटाउनुहोस्"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"विस्थापित गर्नुहोस्"</string>
-    <string name="app_info_drop_target_label" msgid="692894985365717661">"अनुप्रयोग जानकारी"</string>
+    <string name="app_info_drop_target_label" msgid="692894985365717661">"एपसम्बन्धी जानकारी"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"स्थापना गर्नुहोस्"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"यो एप सिफारिस नगरियोस्"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"सिफारिस गरिएको एप पिन गर्नुहोस्"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"सर्टकट स्थापना गर्नेहोस्"</string>
-    <string name="permdesc_install_shortcut" msgid="923466509822011139">"प्रयोगकर्ताको हस्तक्षेप बिना एउटा अनुप्रयोगलाई सर्टकटमा थप्नको लागि अनुमति दिनुहोस्।"</string>
+    <string name="permdesc_install_shortcut" msgid="923466509822011139">"प्रयोगकर्ताको हस्तक्षेप बिना एउटा एपलाई सर्टकटमा थप्नको लागि अनुमति दिनुहोस्।"</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"गृह सेटिङहरू र सर्टकटहरू पढ्नुहोस्"</string>
-    <string name="permdesc_read_settings" msgid="5833423719057558387">"गृहमा एउटा अनुप्रयोगलाई सेटिङहरू र सर्टकटहरू पढ्न अनुमति दिनुहोस्।"</string>
+    <string name="permdesc_read_settings" msgid="5833423719057558387">"गृहमा एउटा एपलाई सेटिङहरू र सर्टकटहरू पढ्न अनुमति दिनुहोस्।"</string>
     <string name="permlab_write_settings" msgid="3574213698004620587">"गृह सेटिङहरू र सर्टकटहरू लेख्नुहोस्"</string>
-    <string name="permdesc_write_settings" msgid="5440712911516509985">"गृहमा एउटा अनुप्रयोगलाई सेटिङ र सर्टकट बदल्न अनुमति दिनुहोस्।"</string>
+    <string name="permdesc_write_settings" msgid="5440712911516509985">"गृहमा एउटा एपलाई सेटिङ र सर्टकट बदल्न अनुमति दिनुहोस्।"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> ले फोन कलहरू गर्न अनुमति छैन"</string>
     <string name="gadget_error_text" msgid="6081085226050792095">"समस्या लोडिङ गर्ने विजेट"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"सेटअप"</string>
-    <string name="uninstall_system_app_text" msgid="4172046090762920660">"यो प्रणाली अनुप्रयोग हो र यसलाई स्थापना रद्द गर्न सकिँदैन।"</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"बेनाम फोल्डर"</string>
+    <string name="uninstall_system_app_text" msgid="4172046090762920660">"यो प्रणाली एप हो र यसलाई स्थापना रद्द गर्न सकिँदैन।"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"नाम सम्पादन गर्नुहोस्"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"असक्षम पारिएको <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, का <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> सूचनाहरू छन्</item>
@@ -77,8 +106,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"पुनःनामाकरणलाई सुरक्षित गर्न ट्याप गर्नुहोस्"</string>
     <string name="folder_closed" msgid="4100806530910930934">"फोल्डर बन्द भयो"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"फोल्डर <xliff:g id="NAME">%1$s</xliff:g> मा पुनःनामाकरण गरियो।"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"फोल्डर: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"विजेटहरू"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"फोल्डर: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> वस्तुहरू"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"फोल्डर: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> वा सोभन्दा बढी वस्तुहरू"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"वालपेपरहरु"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"शैली तथा वालपेपरहरू"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"गृहपृष्ठका सेटिङहरू"</string>
@@ -89,19 +118,20 @@
     <string name="notification_dots_desc_on" msgid="1679848116452218908">"सक्रिय"</string>
     <string name="notification_dots_desc_off" msgid="1760796511504341095">"निष्क्रिय"</string>
     <string name="title_missing_notification_access" msgid="7503287056163941064">"सूचनासम्बन्धी पहुँच आवश्यक हुन्छ"</string>
-    <string name="msg_missing_notification_access" msgid="281113995110910548">"सूचनाको प्रतीक जनाउने थोप्लाहरू देखाउन <xliff:g id="NAME">%1$s</xliff:g> को अनुप्रयोगसम्बन्धी सूचनाहरूलाई सक्रिय गर्नुहोस्"</string>
+    <string name="msg_missing_notification_access" msgid="281113995110910548">"सूचनाको प्रतीक जनाउने थोप्लाहरू देखाउन <xliff:g id="NAME">%1$s</xliff:g> को एपसम्बन्धी सूचनाहरूलाई सक्रिय गर्नुहोस्"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"सेटिङहरू बदल्नुहोस्"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"सूचनाको प्रतीक जनाउने थोप्लाहरू देखाउनुहोस्"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"गृह स्क्रिनमा आइकन थप्नुहोस्"</string>
-    <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"नयाँ अनुप्रयोगका लागि"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"गृह स्क्रिनमा एपका आइकनहरू थप्नुहोस्"</string>
+    <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"नयाँ एपका लागि"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"अज्ञात"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"हटाउनुहोस्"</string>
     <string name="abandoned_search" msgid="891119232568284442">"खोजी गर्नुहोस्"</string>
-    <string name="abandoned_promises_title" msgid="7096178467971716750">"यो अनुप्रयोग स्थापित छैन"</string>
-    <string name="abandoned_promise_explanation" msgid="3990027586878167529">"यो प्रतिमाका लागि अनुप्रयोगलाई स्थापना गरिएको छैन। तपाईं यसलाई हटाउन, वा अनुप्रयोग खोजी र स्वयं यो स्थापित गर्न सक्नुहुन्छ।"</string>
+    <string name="abandoned_promises_title" msgid="7096178467971716750">"यो एप स्थापित छैन"</string>
+    <string name="abandoned_promise_explanation" msgid="3990027586878167529">"यो प्रतिमाका लागि एपलाई स्थापना गरिएको छैन। तपाईं यसलाई हटाउन, वा एप खोजी र स्वयं यो स्थापित गर्न सक्नुहुन्छ।"</string>
+    <!-- no translation found for app_installing_title (5864044122733792085) -->
+    <skip />
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> डाउनलोड गर्दै, <xliff:g id="PROGRESS">%2$s</xliff:g> सम्पन्‍न"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> स्थापना गर्न प्रतीक्षा गर्दै"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> विजेटहरू"</string>
     <string name="widgets_list" msgid="796804551140113767">"विजेटहरूको सूची"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"विजेटहरूको सूची बन्द गरियो"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"गृह स्क्रिनमा थप्नुहोस्"</string>
@@ -129,15 +159,30 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"सर्टकटहरू"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"सर्टकट तथा सूचनाहरू"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"खारेज गर्नुहोस्"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"बन्द गर्नुहोस्"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"सूचना खारेज गरियो"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"व्यक्तिगत"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"कार्यसम्बन्धी"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"कार्य प्रोफाइल"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"कार्यसम्बन्धी अनुप्रयोगहरू यहाँ प्राप्त गर्नुहोस्"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"कार्यसम्बन्धी प्रत्येक अनुप्रयोगमा एउटा ब्याज छ र तपाईंको संगठनले यसलाई सुरक्षित राखेको छ । अझ सजिलो गरी पहुँच राख्नका लागि अनुप्रयोगहरूलाई आफ्नो गृहस्क्रिनमा सार्नुहोस्‌।"</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"तपाईंको सङ्गठनले व्यवस्थापन गरेको"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"सूचना र अनुप्रयोगहरू निष्क्रिय छन्‌"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"बन्द गर्नुहोस्"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"बन्द गरियो"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"व्यक्तिगत डेटा कामसम्बन्धी एपहरूबाट लुकाएर छुट्टै राखिन्छ"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"तपाईंका IT एड्मिनले कामसम्पबन्धी एपहरू र डेटा हेर्न सक्छन्"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"अर्को"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"बुझेँ"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"कार्यालयको प्रोफाइल अस्थायी रूपमा रोक्का गरिएको छ"</string>
+    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
+    <skip />
+    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
+    <skip />
+    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
+    <skip />
+    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
+    <skip />
+    <string name="work_switch_tip" msgid="808075064383839144">"कामसम्बन्धी एप र सूचनाहरू अस्थायी रूपमा रोक्का गर्नुहोस्"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"कार्य पूरा गर्न सकिएन: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index ec30d8c6b2..7966e5d07e 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -20,39 +20,58 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Werk"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"App is niet geïnstalleerd."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"App is niet beschikbaar"</string>
-    <string name="safemode_shortcut_error" msgid="9160126848219158407">"Gedownloade app uitgeschakeld in veilige modus"</string>
-    <string name="safemode_widget_error" msgid="4863470563535682004">"Widgets uitgeschakeld in Veilige modus"</string>
+    <string name="safemode_shortcut_error" msgid="9160126848219158407">"Gedownloade app uitgezet in veilige modus"</string>
+    <string name="safemode_widget_error" msgid="4863470563535682004">"Widgets uitgezet in veilige modus"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Snelkoppeling is niet beschikbaar"</string>
-    <string name="home_screen" msgid="806512411299847073">"Startscherm"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Aangepaste acties"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Blijf aanraken om een widget toe te voegen."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Dubbeltik en blijf aanraken om een widget toe te voegen of aangepaste acties te gebruiken."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Startscherm"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Gesplitst scherm"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Tik en houd vast om een widget te verplaatsen."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dubbeltik en houd vast om een widget te verplaatsen of aangepaste acties te gebruiken."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d breed en %2$d hoog"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Tik en houd vast om handmatig te plaatsen"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Automatisch toevoegen"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> snelkoppelingen</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> snelkoppeling</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Zoeken"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Tekst in zoekvak wissen"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Geen widgets beschikbaar"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Geen zoekresultaten"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Persoonlijk"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Werk"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Gesprekken"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Apps zoeken"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Apps laden…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Er zijn geen apps gevonden die overeenkomen met \'<xliff:g id="QUERY">%1$s</xliff:g>\'"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Zoeken naar meer apps"</string>
     <string name="label_application" msgid="8531721983832654978">"App"</string>
+    <string name="search_corpus_apps" msgid="1917889409963779022">"Apps"</string>
+    <string name="search_action_try_now" msgid="1458737965476149074">"Nu proberen"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Meldingen"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Tik en houd vast om snelkoppeling toe te voegen."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Dubbeltik en houd vast om een snelkoppeling toe te voegen of aangepaste acties te gebruiken."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Tik en houd vast om een snelkoppeling te verplaatsen."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dubbeltik en houd vast om een snelkoppeling te verplaatsen of aangepaste acties te gebruiken."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Er is geen ruimte meer op dit startscherm."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Geen ruimte meer in het vak \'Favorieten\'"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lijst met apps"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lijst met persoonlijke apps"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Lijst met werk-apps"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Homepage"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Verwijderen"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Deïnstalleren"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"App-info"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Installeren"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Geen app voorstellen"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Vastzetvoorspelling"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"Snelle links instellen"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Een app toestaan snelkoppelingen toe te voegen zonder tussenkomst van de gebruiker."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"instellingen en snelkoppelingen op startscherm lezen"</string>
@@ -63,8 +82,8 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Probleem bij het laden van widget"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Configuratie"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Dit is een systeemapp die niet kan worden verwijderd."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Naamloze map"</string>
-    <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> is uitgeschakeld"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Naam bewerken"</string>
+    <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> staat uit"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, heeft <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> meldingen</item>
       <item quantity="one"><xliff:g id="APP_NAME_0">%1$s</xliff:g>, heeft <xliff:g id="NOTIFICATION_COUNT_1">%2$d</xliff:g> melding</item>
@@ -77,31 +96,31 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Tik om de gewijzigde naam op te slaan"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Map gesloten"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"De naam van de map is gewijzigd in <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Map: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Map: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> items"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Map: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> of meer items"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Achtergrond"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stijl en achtergrond"</string>
-    <string name="settings_button_text" msgid="8873672322605444408">"Instellingen startscherm"</string>
-    <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Uitgeschakeld door je beheerder"</string>
+    <string name="settings_button_text" msgid="8873672322605444408">"Instellingen start"</string>
+    <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Uitgezet door je beheerder"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Draaien van startscherm toestaan"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"Wanneer de telefoon gedraaid is"</string>
     <string name="notification_dots_title" msgid="9062440428204120317">"Meldingsstipjes"</string>
     <string name="notification_dots_desc_on" msgid="1679848116452218908">"Aan"</string>
     <string name="notification_dots_desc_off" msgid="1760796511504341095">"Uit"</string>
     <string name="title_missing_notification_access" msgid="7503287056163941064">"Toegang tot meldingen vereist"</string>
-    <string name="msg_missing_notification_access" msgid="281113995110910548">"Als je meldingsstipjes wilt weergeven, schakel je app-meldingen in voor <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="msg_missing_notification_access" msgid="281113995110910548">"Als je meldingsstipjes wilt tonen, zet je app-meldingen aan voor <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Instellingen wijzigen"</string>
-    <string name="notification_dots_service_title" msgid="4284221181793592871">"Meldingsstipjes weergeven"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Pictogram toevoegen aan startscherm"</string>
+    <string name="notification_dots_service_title" msgid="4284221181793592871">"Meldingsstipjes tonen"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"App-iconen toevoegen aan startscherm"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Voor nieuwe apps"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Onbekend"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Verwijderen"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Zoeken"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Deze app is niet geïnstalleerd"</string>
-    <string name="abandoned_promise_explanation" msgid="3990027586878167529">"De app voor dit pictogram is niet geïnstalleerd. Je kunt het pictogram verwijderen of de app zoeken en handmatig installeren."</string>
+    <string name="abandoned_promise_explanation" msgid="3990027586878167529">"De app voor dit icoon is niet geïnstalleerd. Je kunt het icoon verwijderen of de app zoeken en handmatig installeren."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> installeren, <xliff:g id="PROGRESS">%2$s</xliff:g> voltooid"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> wordt gedownload, <xliff:g id="PROGRESS">%2$s</xliff:g> voltooid"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> wacht op installatie"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g>-widgets"</string>
     <string name="widgets_list" msgid="796804551140113767">"Lijst met widgets"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Lijst met widgets gesloten"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Toevoegen aan startscherm"</string>
@@ -129,15 +148,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Snelkoppelingen"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Snelkoppelingen en meldingen"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Sluiten"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Sluiten"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Melding gesloten"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Privé"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Werk"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Werkprofiel"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Zoek hier naar werk-apps"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Elke werk-app heeft een badge en wordt beveiligd door je organisatie. Verplaats apps naar je startscherm voor snelle toegang."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Beheerd door je organisatie"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Meldingen en apps zijn uitgeschakeld"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Sluiten"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Gesloten"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Persoonlijke gegevens zijn afgescheiden en verborgen voor werk-apps"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Werk-apps en -gegevens zijn zichtbaar voor je IT-beheerder"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Volgende"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Werkprofiel is onderbroken"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Werk-apps kunnen je geen meldingen sturen, niet je batterij gebruiken en geen toegang krijgen tot je locatie"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Werkprofiel is gepauzeerd. Werk-apps kunnen je geen meldingen sturen, niet je batterij gebruiken en geen toegang krijgen tot je locatie."</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Werk-apps hebben badges en zijn zichtbaar voor je IT-beheerder"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Werk-apps pauzeren"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Aanzetten"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filteren"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Werk-apps en -meldingen onderbreken"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Mislukt: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 4ddc903474..368b4ef98a 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -20,39 +20,68 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"ଲଞ୍ଚର୍3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="work_folder_name" msgid="3753320833950115786">"କାମ"</string>
+    <string name="work_folder_name" msgid="3753320833950115786">"ୱାର୍କ"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"ଆପ୍‌ ଇନଷ୍ଟଲ୍‌ ହୋଇନାହିଁ"</string>
     <string name="activity_not_available" msgid="7456344436509528827">"ଆପ୍‌ ଉପଲବ୍ଧ ନାହିଁ"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"ନିରାପଦ ମୋଡରେ ଡାଉନଲୋଡ୍‌ ହେଇଥିବା ଆପ୍‌ ଅକ୍ଷମ କରାଗଲା"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"ନିରାପଦ ମୋଡରେ ୱିଜେଟ୍‌ ଅକ୍ଷମ କରାଗଲା"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"ଶର୍ଟକଟ୍‌ ଉପଲବ୍ଧ ନାହିଁ"</string>
-    <string name="home_screen" msgid="806512411299847073">"ହୋମ୍‌ ସ୍କ୍ରୀନ୍‌"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"କାର୍ଯ୍ୟ କଷ୍ଟମ୍ କରନ୍ତୁ"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"ୱିଜେଟ୍‌ ନେବାକୁ ସ୍ପର୍ଶ କରନ୍ତୁ ଏବଂ ଧରି ରଖନ୍ତୁ।"</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"ଡବଲ୍‌-ଟାପ୍‌ କରନ୍ତୁ ଏବଂ ଏକ ୱିଜେଟ୍‌ ନେବାକୁ ଧରି ରଖନ୍ତୁ କିମ୍ୱା କଷ୍ଟମ୍ କାର୍ଯ୍ୟପ୍ରକ୍ରିୟା ବ୍ୟବହାର କରନ୍ତୁ।"</string>
+    <!-- no translation found for home_screen (5629429142036709174) -->
+    <skip />
+    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
+    <skip />
+    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
+    <skip />
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ଓସାର ଓ %2$d ଉଚ୍ଚ"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"ମାନୁଆଲ୍‌ ଭାବରେ ରଖିବାକୁ ସ୍ପର୍ଶ କରନ୍ତୁ ଏବଂ ଧରି ରଖନ୍ତୁ"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"ସ୍ୱଚାଳିତ ଭାବେ ଯୋଡ଼ନ୍ତୁ"</string>
+    <string name="place_automatically" msgid="8064208734425456485">"ସ୍ୱଚାଳିତ ଭାବେ ଯୋଗ କରନ୍ତୁ"</string>
+    <!-- no translation found for widgets_count (656794749266073027) -->
+    <!-- no translation found for shortcuts_count (8080294865447938455) -->
+    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
+    <skip />
+    <string name="widget_button_text" msgid="2880537293434387943">"ୱିଜେଟ୍‌"</string>
+    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
+    <skip />
+    <!-- no translation found for no_widgets_available (9140948620298620513) -->
+    <skip />
+    <!-- no translation found for no_search_results (6518732304311458580) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
+    <skip />
+    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ଆପ୍‌ ଖୋଜନ୍ତୁ"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ଆପ୍‌ ଲୋଡ୍‌ ହେଉଛି..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" ସହିତ ମେଳ ହେଉଥିବା କୌଣସି ଆପ୍‌ ମିଳିଲା ନାହିଁ"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"ଅଧିକ ଆପ୍‌ ଖୋଜନ୍ତୁ"</string>
     <string name="label_application" msgid="8531721983832654978">"ଆପ୍"</string>
+    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
+    <skip />
+    <!-- no translation found for search_action_try_now (1458737965476149074) -->
+    <skip />
     <string name="notifications_header" msgid="1404149926117359025">"ବିଜ୍ଞପ୍ତି"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"ଏକ ଶର୍ଟକଟ୍ ଚୟନ କରିବାକୁ ସ୍ପର୍ଶ କରି ଧରି ରଖନ୍ତୁ।"</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"ଡବଲ୍‌-ଟାପ୍‌ କରନ୍ତୁ ଏବଂ ଏକ ଶର୍ଟକଟ୍ ଚୟନ କରିବାକୁ ଧରି ରଖନ୍ତୁ କିମ୍ୱା କଷ୍ଟମ୍ ପ୍ରକ୍ରିୟା ବ୍ୟବହାର କରନ୍ତୁ।"</string>
+    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
+    <skip />
     <string name="out_of_space" msgid="4691004494942118364">"ହୋମ୍‌ ସ୍କ୍ରୀନ ପାଇଁ ଆଉ କୋଠରୀ ନାହିଁ"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ମନପସନ୍ଦ ଟ୍ରେରେ ଆଉ କୋଠରୀ ନାହିଁ"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ଆପ୍‌ ତାଲିକା"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"ବ୍ୟକ୍ତିଗତ ଆପ୍ ତାଲିକା"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"କାର୍ଯ୍ୟକାରୀ ଆପ୍‌ ତାଲିକା"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"ହୋମ୍"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"ବାହାର କରନ୍ତୁ"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"ଅନଇନଷ୍ଟଲ୍‌ କରନ୍ତୁ"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"ଆପ୍‌ ସୂଚନା"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"ଇନଷ୍ଟଲ୍‌ କରନ୍ତୁ"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"ଆପ୍ ପରାମର୍ଶ ଦିଅନ୍ତୁ ନାହିଁ"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"ପୂର୍ବାନୁମାନକୁ ପିନ୍ କରନ୍ତୁ"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"ଶର୍ଟକଟ୍‍ ଇନଷ୍ଟଲ୍‌ କରନ୍ତୁ"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"ୟୁଜରଙ୍କ ବିନା ହସ୍ତକ୍ଷେପରେ ଶର୍ଟକଟ୍‌ ଯୋଡ଼ିବାକୁ ଆପକୁ ଅନୁମତି ଦିଏ।"</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"ହୋମ୍‌ ସେଟିଙ୍ଗ ଏବଂ ଶର୍ଟକଟ୍‌ ପଢ଼ନ୍ତୁ"</string>
@@ -63,7 +92,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"ୱିଜେଟ୍‌ ଲୋଡ୍‌ ହେବାରେ ସମସ୍ୟା ଅଛି"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"ସେଟ୍ ଅପ୍ କରନ୍ତୁ"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"ଏହା ଏକ ସିଷ୍ଟମ୍‌ ଆପ୍‌ ଅଟେ ଏବଂ ଏହା ଅନଇନଷ୍ଟଲ୍‌ କରାଯାଇ ପାରିବ ନାହିଁ।"</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"ବେନାମୀ ଫୋଲ୍ଡର୍‌"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"ନାମ ସମ୍ପାଦନ କରନ୍ତୁ"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> ଅକ୍ଷମ କରାଗଲା"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g>ଟି ବିଜ୍ଞପ୍ତି ରହିଛି</item>
@@ -77,31 +106,32 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"ନାମ ବଦଳାଇବା ସେଭ୍ କରିବାକୁ ଟାପ୍‌ କରନ୍ତୁ"</string>
     <string name="folder_closed" msgid="4100806530910930934">"ଫୋଲ୍ଡର ବନ୍ଦ କରାଗଲା"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"ଫୋଲ୍ଡରର ନାମ <xliff:g id="NAME">%1$s</xliff:g>କୁ ବଦଳାଗଲା"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"ଫୋଲ୍ଡର: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"ୱିଜେଟ୍‌"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"ଫୋଲ୍ଡର୍: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ଆଇଟମଗୁଡ଼ିକ"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"ଫୋଲ୍ଡର୍: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> କିମ୍ବା ଅଧିକ ଆଇଟମ୍"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"ୱାଲପେପର୍‌"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"ଶୈଳୀ ଏବଂ ୱାଲ୍‍‍ପେପର୍"</string>
-    <string name="settings_button_text" msgid="8873672322605444408">"ହୋମ୍‌ ସେଟିଙ୍ଗ"</string>
+    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"ଷ୍ଟାଇଲ୍ ଏବଂ ୱାଲ୍‍‍ପେପର୍"</string>
+    <string name="settings_button_text" msgid="8873672322605444408">"ହୋମ୍‌ ସେଟିଂସ୍"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"ଆପଣଙ୍କ ଆଡମିନଙ୍କ ଦ୍ୱାରା ଅକ୍ଷମ କରାଯାଇଛି"</string>
-    <string name="allow_rotation_title" msgid="7728578836261442095">"ହୋମ୍‌ ସ୍କ୍ରୀନ୍ ବୁଲାଇବା ଅନୁମତି ଦିଅନ୍ତୁ"</string>
+    <string name="allow_rotation_title" msgid="7728578836261442095">"ହୋମ୍‌ ସ୍କ୍ରିନ୍ ବୁଲାଇବାକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"ଯେତେବେଳେ ଫୋନକୁ ବୁଲାଯାଇଥାଏ"</string>
-    <string name="notification_dots_title" msgid="9062440428204120317">"ବିଜ୍ଞପ୍ତି ବିନ୍ଦୁଗୁଡ଼ିକ"</string>
-    <string name="notification_dots_desc_on" msgid="1679848116452218908">"ଚାଲୁ କରନ୍ତୁ"</string>
+    <string name="notification_dots_title" msgid="9062440428204120317">"ବିଜ୍ଞପ୍ତି ଡଟ୍ସ"</string>
+    <string name="notification_dots_desc_on" msgid="1679848116452218908">"ଚାଲୁ"</string>
     <string name="notification_dots_desc_off" msgid="1760796511504341095">"ବନ୍ଦ କରନ୍ତୁ"</string>
     <string name="title_missing_notification_access" msgid="7503287056163941064">"ବିଜ୍ଞପ୍ତି ଆକ୍ସେସ୍‌ ଆବଶ୍ୟକ ଅଟେ"</string>
     <string name="msg_missing_notification_access" msgid="281113995110910548">"ବିଜ୍ଞପ୍ତି ବିନ୍ଦୁ ଦେଖାଇବାକୁ, <xliff:g id="NAME">%1$s</xliff:g> ପାଇଁ ଆପ୍‌ ବିଜ୍ଞପ୍ତି ଅନ୍‌ କରନ୍ତୁ"</string>
-    <string name="title_change_settings" msgid="1376365968844349552">"ସେଟିଙ୍ଗ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</string>
+    <string name="title_change_settings" msgid="1376365968844349552">"ସେଟିଂସ୍ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"ବିଜ୍ଞପ୍ତି ଡଟ୍‌ଗୁଡ଼ିକୁ ଦେଖାନ୍ତୁ"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"ହୋମ୍‌ ସ୍କ୍ରୀନରେ ଆଇକନ୍‌କୁ ଯୋଡ଼ନ୍ତୁ"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"ହୋମ୍ ସ୍କ୍ରିନରେ ଆପ୍ ଆଇକନଗୁଡ଼ିକୁ ଯୋଗ କରନ୍ତୁ"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"ନୂଆ ଆପ୍‌ ପାଇଁ"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"ଅଜଣା"</string>
-    <string name="abandoned_clean_this" msgid="7610119707847920412">"ବାହାର କରନ୍ତୁ"</string>
-    <string name="abandoned_search" msgid="891119232568284442">"ସର୍ଚ୍ଚ କରନ୍ତୁ"</string>
+    <string name="abandoned_clean_this" msgid="7610119707847920412">"କାଢ଼ି ଦିଅନ୍ତୁ"</string>
+    <string name="abandoned_search" msgid="891119232568284442">"Search"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"ଏହି ଆପ୍‌ ଇନଷ୍ଟଲ୍‌ ହୋଇନାହିଁ"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"ଏହି ଆଇକନ୍‌ ପାଇଁ ଆପ୍‌ ଇନଷ୍ଟଲ୍‌ ହୋଇନାହିଁ। ଏହାକୁ ଆପଣ ଆପ୍‌ ପାଇଁ ବାହାର କରିପାରିବେ କିମ୍ୱା ସର୍ଚ୍ଚ କରି ପାରିବେ ଏବଂ ଏହାକୁ ମାନୁଆଲ୍‌ ଭାବରେ ଇନଷ୍ଟଲ୍‌ କରିପାରିବେ।"</string>
+    <!-- no translation found for app_installing_title (5864044122733792085) -->
+    <skip />
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> ଡାଉନଲୋଡ୍‌ ହେଉଛି, <xliff:g id="PROGRESS">%2$s</xliff:g> ସମ୍ପୂର୍ଣ୍ଣ"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> ଇନଷ୍ଟଲ୍‌ ହେବାକୁ ଅପେକ୍ଷା କରିଛି"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> ୱିଜେଟ୍‌"</string>
     <string name="widgets_list" msgid="796804551140113767">"ୱିଜେଟ୍ ତାଲିକା"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"ୱିଜେଟ୍ ତାଲିକା ବନ୍ଦ ହୋଇଛି"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"ହୋମ୍‌ ସ୍କ୍ରୀନରେ ଯୋଡ଼ନ୍ତୁ"</string>
@@ -129,15 +159,30 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"ଶର୍ଟକଟ୍‍"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"ଶର୍ଟକଟ୍ ଓ ବିଜ୍ଞପ୍ତି"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"ଖାରଜ କରନ୍ତୁ"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"ବନ୍ଦ କରନ୍ତୁ"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"ବିଜ୍ଞପ୍ତି ଖାରଜ କରାଗଲା"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ବ୍ୟକ୍ତିଗତ"</string>
-    <string name="all_apps_work_tab" msgid="4884822796154055118">"କାମ"</string>
+    <string name="all_apps_work_tab" msgid="4884822796154055118">"ୱାର୍କ"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"ୱର୍କ ପ୍ରୋଫାଇଲ୍‌"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"ଏଠାରେ କାମ ଆପ୍‌ ଖୋଜନ୍ତୁ"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"ପ୍ରତ୍ୟେକ କାଯ୍ୟକାରୀ ଆପ୍‌ର ଗୋଟିଏ ବ୍ୟାଜ୍ (ଚିହ୍ନ) ଅଛି, ଯାହାକୁ ଆପଣଙ୍କ ସଂସ୍ଥା ସୁରକ୍ଷିତ ରଖିଥାଏ। ସହଜରେ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ଆପ୍‌କୁ ହୋମ୍ ସ୍କ୍ରୀନ୍ ଉପରକୁ ଆଣନ୍ତୁ।"</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"ଆପଣଙ୍କ ସଂସ୍ଥା ଦ୍ୱାରା ପରିଚାଳିତ"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"ବିଜ୍ଞପ୍ତି ଓ ଆପ୍‌ଗୁଡ଼ିକ ବନ୍ଦ ଅଛି"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"ବନ୍ଦ କରନ୍ତୁ"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"ବନ୍ଦ ହୋଇଯାଇଛି"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"ବ୍ୟକ୍ତିଗତ ଡାଟା କାର୍ଯ୍ୟସ୍ଥଳୀ ଆପଗୁଡ଼ିକ ଠାରୁ ପୃଥକ୍ ଓ ଲୁକ୍କାୟିତ ଅଟେ"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"କାର୍ଯ୍ୟସ୍ଥଳୀ ଆପଗୁଡ଼ିକ ଓ ଡାଟା ଆପଣଙ୍କ IT ଆଡମିନଙ୍କୁ ଦେଖାଯାଏ"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"ପରବର୍ତ୍ତୀ"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"ବୁଝିଗଲି"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"ୱାର୍କ ପ୍ରୋଫାଇଲକୁ ବିରତ କରାଯାଇଛି"</string>
+    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
+    <skip />
+    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
+    <skip />
+    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
+    <skip />
+    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
+    <skip />
+    <string name="work_switch_tip" msgid="808075064383839144">"କାର୍ଯ୍ୟସ୍ଥଳୀ ଆପ୍ ଏବଂ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ବିରତ କରନ୍ତୁ"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"ବିଫଳ ହୋଇଛି: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index d4cd5be4bc..de986b7a62 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -20,39 +20,68 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="work_folder_name" msgid="3753320833950115786">"ਦਫ਼ਤਰ"</string>
+    <string name="work_folder_name" msgid="3753320833950115786">"ਕਾਰਜ-ਸਥਾਨ"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"ਐਪ ਇੰਸਟੌਲ ਨਹੀਂ ਕੀਤਾ ਹੋਇਆ ਹੈ।"</string>
     <string name="activity_not_available" msgid="7456344436509528827">"ਐਪ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"ਡਾਊਨਲੋਡ ਕੀਤਾ ਐਪ ਸੁਰੱਖਿਅਤ ਮੋਡ ਵਿੱਚ ਅਸਮਰਥਿਤ"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"ਵਿਜੇਟ ਸੁਰੱਖਿਅਤ ਮੋਡ ਵਿੱਚ ਅਸਮਰਥਿਤ"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"ਸ਼ਾਰਟਕੱਟ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
-    <string name="home_screen" msgid="806512411299847073">"ਹੋਮ ਸਕ੍ਰੀਨ"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"ਵਿਉਂਂਤੀ ਕਾਰਵਾਈਆਂ"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"ਇੱਕ ਵਿਜੇਟ ਚੁਣਨ ਲਈ ਛੋਹਵੋT &amp; ਹੋਲਡ ਕਰੋ।"</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"ਇੱਕ ਵਿਜੇਟ ਚੁਣਨ ਲਈ ਜਾਂ ਵਿਉਂਂਤੀ ਕਾਰਵਾਈਆਂ ਵਰਤਣ ਲਈ ਦੋ ਵਾਰ ਟੈਪ ਕਰੋ ਅਤੇ ਦਬਾ ਕੇ ਰੱਖੋ।"</string>
+    <!-- no translation found for home_screen (5629429142036709174) -->
+    <skip />
+    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
+    <skip />
+    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
+    <skip />
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ਚੌੜਾਈ ਅਤੇ %2$d ਲੰਬਾਈ"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"ਹੱਥੀਂ ਰੱਖਣ ਲਈ ਸਪੱਰਸ਼ ਕਰੋ ਅਤੇ ਦਬਾਈ ਰੱਖੋ"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"ਸਵੈਚਲਿਤ ਤਰੀਕੇ ਨਾਲ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"ਹੱਥੀਂ ਰੱਖਣ ਲਈ ਸਪਰਸ਼ ਕਰਕੇ ਰੱਖੋ"</string>
+    <string name="place_automatically" msgid="8064208734425456485">"ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <!-- no translation found for widgets_count (656794749266073027) -->
+    <!-- no translation found for shortcuts_count (8080294865447938455) -->
+    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
+    <skip />
+    <string name="widget_button_text" msgid="2880537293434387943">"ਵਿਜੇਟ"</string>
+    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
+    <skip />
+    <!-- no translation found for no_widgets_available (9140948620298620513) -->
+    <skip />
+    <!-- no translation found for no_search_results (6518732304311458580) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
+    <skip />
+    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ਐਪਾਂ ਖੋਜੋ"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ਐਪਾਂ ਨੂੰ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" ਨਾਲ ਮੇਲ ਖਾਂਦੀਆਂ ਕੋਈ ਐਪਾਂ ਨਹੀਂ ਮਿਲੀਆਂ"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"ਹੋਰ ਐਪਾਂ ਖੋਜੋ"</string>
     <string name="label_application" msgid="8531721983832654978">"ਐਪ"</string>
+    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
+    <skip />
+    <!-- no translation found for search_action_try_now (1458737965476149074) -->
+    <skip />
     <string name="notifications_header" msgid="1404149926117359025">"ਸੂਚਨਾਵਾਂ"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"ਕੋਈ ਸ਼ਾਰਟਕੱਟ ਚੁਣਨ ਲਈ ਸਪੱਰਸ਼ ਕਰਕੇ ਦਬਾਈ ਰੱਖੋ।"</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"ਕੋਈ ਸ਼ਾਰਟਕੱਟ ਚੁਣਨ ਲਈ ਡਬਲ ਟੈਪ ਕਰਕੇ ਦਬਾਈ ਰੱਖੋ ਜਾਂ ਵਿਉਂਤੀਆਂ ਕਾਰਵਾਈਆਂ ਵਰਤੋ।"</string>
+    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
+    <skip />
     <string name="out_of_space" msgid="4691004494942118364">"ਇਸ ਹੋਮ ਸਕ੍ਰੀਨ ਲਈ ਹੋਰ ਖਾਲੀ ਸਥਾਨ ਨਹੀਂ ਹੈ।"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ਮਨਪਸੰਦ ਟ੍ਰੇ ਵਿੱਚ ਹੋਰ ਖਾਲੀ ਸਥਾਨ ਨਹੀਂ।"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ਐਪ ਸੂਚੀ"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"ਨਿੱਜੀ ਐਪਾਂ ਦੀ ਸੂਚੀ"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"ਕਾਰਜ-ਸਥਾਨ ਸੰਬੰਧੀ ਐਪਾਂ ਦੀ ਸੂਚੀ"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"ਹੋਮ"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"ਹਟਾਓ"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"ਅਣਸਥਾਪਤ ਕਰੋ"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"ਐਪ ਜਾਣਕਾਰੀ"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"ਸਥਾਪਤ ਕਰੋ"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"ਐਪ ਦਾ ਸੁਝਾਅ ਨਾ ਦਿਓ"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"ਪੂਰਵ-ਅਨੁਮਾਨ ਪਿੰਨ ਕਰੋ"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"ਸ਼ਾਰਟਕੱਟ ਸਥਾਪਤ ਕਰੋ"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"ਇੱਕ ਐਪ ਨੂੰ ਵਰਤੋਂਕਾਰ ਦੇ ਦਖ਼ਲ ਤੋਂ ਬਿਨਾਂ ਸ਼ਾਰਟਕੱਟ ਸ਼ਾਮਲ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"ਹੋਮ ਸੈਟਿੰਗਾਂ ਅਤੇ ਸ਼ਾਰਟਕੱਟ ਪੜ੍ਹੋ"</string>
@@ -63,7 +92,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"ਵਿਜੇਟ ਲੋਡ ਕਰਨ ਵਿੱਚ ਸਮੱਸਿਆ"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"ਸਥਾਪਤ ਕਰੋ"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"ਇਹ ਇੱਕ ਸਿਸਟਮ ਐਪ ਹੈ ਅਤੇ ਇਸਨੂੰ ਅਣਇੰਸਟੌਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ।"</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"ਬਿਨਾਂ ਨਾਮ ਦਿੱਤਾ ਫੋਲਡਰ"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"ਨਾਮ ਦਾ ਸੰਪਾਦਨ ਕਰੋ"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਨੂੰ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="one"><xliff:g id="APP_NAME_2">%1$s</xliff:g> ਦੀ <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> ਸੂਚਨਾ</item>
@@ -77,14 +106,14 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"ਬਦਲੇ ਗਏ ਨਾਮ ਨੂੰ ਰੱਖਿਅਤ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ"</string>
     <string name="folder_closed" msgid="4100806530910930934">"ਫੋਲਡਰ ਬੰਦ ਕੀਤਾ"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"ਫੋਲਡਰ ਨੂੰ <xliff:g id="NAME">%1$s</xliff:g> ਮੁੜ ਨਾਮ ਦਿੱਤਾ ਗਿਆ"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"ਫੋਲਡਰ: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"ਵਿਜੇਟ"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"ਫੋਲਡਰ: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ਆਈਟਮਾਂ"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"ਫੋਲਡਰ: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ਜਾਂ ਹੋਰ ਆਈਟਮਾਂ"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"ਵਾਲਪੇਪਰ"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"ਸ਼ੈਲੀਆਂ ਅਤੇ ਵਾਲਪੇਪਰ"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"ਹੋਮ ਸੈਟਿੰਗਾਂ"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"ਤੁਹਾਡੇ ਪ੍ਰਸ਼ਾਸਕ ਦੁਆਰਾ ਅਯੋਗ ਬਣਾਈ ਗਈ"</string>
-    <string name="allow_rotation_title" msgid="7728578836261442095">"ਹੋਮ ਸਕ੍ਰੀਨ ਨੂੰ ਘੁੰਮਾਉਣ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
-    <string name="allow_rotation_desc" msgid="8662546029078692509">"ਜਦੋਂ ਫ਼ੋਨ ਘੁੰਮਾਇਆ ਜਾਂਦਾ ਹੈ"</string>
+    <string name="allow_rotation_title" msgid="7728578836261442095">"ਹੋਮ ਸਕ੍ਰੀਨ ਨੂੰ ਘੁਮਾਉਣ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+    <string name="allow_rotation_desc" msgid="8662546029078692509">"ਜਦੋਂ ਫ਼ੋਨ ਘੁਮਾਇਆ ਜਾਂਦਾ ਹੈ"</string>
     <string name="notification_dots_title" msgid="9062440428204120317">"ਸੂਚਨਾ ਬਿੰਦੂ"</string>
     <string name="notification_dots_desc_on" msgid="1679848116452218908">"ਚਾਲੂ"</string>
     <string name="notification_dots_desc_off" msgid="1760796511504341095">"ਬੰਦ"</string>
@@ -92,16 +121,17 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"ਸੂਚਨਾ ਬਿੰਦੂਆਂ ਦਿਖਾਉਣ ਲਈ, <xliff:g id="NAME">%1$s</xliff:g> ਲਈ ਐਪ ਸੂਚਨਾਵਾਂ ਚਾਲੂ ਕਰੋ"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"ਸੈਟਿੰਗਾਂ ਬਦਲੋ"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"ਸੂਚਨਾ ਬਿੰਦੂ ਦਿਖਾਓ"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਪ੍ਰਤੀਕ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਐਪ ਪ੍ਰਤੀਕਾਂ ਨੂੰ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"ਨਵੀਆਂ ਐਪਾਂ ਲਈ"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"ਅਗਿਆਤ"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"ਹਟਾਓ"</string>
     <string name="abandoned_search" msgid="891119232568284442">"ਖੋਜੋ"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"ਇਹ ਐਪ ਇੰਸਟੌਲ ਨਹੀਂ ਕੀਤਾ ਹੋਇਆ ਹੈ।"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"ਇਸ ਪ੍ਰਤੀਕ ਲਈ ਐਪ ਸਥਾਪਤ ਨਹੀਂ ਕੀਤਾ ਹੋਇਆ ਹੈ। ਤੁਸੀਂ ਇਸਨੂੰ ਹਟਾ ਸਕਦੇ ਹੋ ਜਾਂ ਐਪ ਖੋਜ ਸਕਦੇ ਹੋ ਅਤੇ ਇਸਨੂੰ ਮੈਨੂਅਲੀ ਸਥਾਪਤ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+    <!-- no translation found for app_installing_title (5864044122733792085) -->
+    <skip />
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> ਡਾਉਨਲੋਡ ਹੋਰ ਰਿਹਾ ਹੈ, <xliff:g id="PROGRESS">%2$s</xliff:g> ਸੰਪੂਰਣ"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> ਸਥਾਪਤ ਕਰਨ ਦੀ ਉਡੀਕ ਕਰ ਰਿਹਾ ਹੈ"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> ਵਿਜੇਟ"</string>
     <string name="widgets_list" msgid="796804551140113767">"ਵਿਜੇਟਾਂ ਦੀ ਸੂਚੀ"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"ਵਿਜੇਟਾਂ ਦੀ ਸੂਚੀ ਬੰਦ ਕੀਤੀ ਗਈ"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਸ਼ਾਮਲ ਕਰੋ"</string>
@@ -129,15 +159,30 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"ਸ਼ਾਰਟਕੱਟ"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"ਸ਼ਾਰਟਕੱਟ ਅਤੇ ਸੂਚਨਾਵਾਂ"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"ਖਾਰਜ ਕਰੋ"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"ਬੰਦ ਕਰੋ"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"ਸੂਚਨਾ ਖਾਰਜ ਕੀਤੀ ਗਈ"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ਨਿੱਜੀ"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"ਕਾਰਜ-ਸਥਾਨ"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"ਕਾਰਜ-ਸਥਾਨ ਐਪਾਂ ਇੱਥੇ ਲੱਭੋ"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"ਹਰੇਕ ਕਾਰਜ-ਸਥਾਨ ਐਪ ਦਾ ਇੱਕ ਬੈਜ ਹੁੰਦਾ ਹੈ ਅਤੇ ਉਸਨੂੰ ਤੁਹਾਡੀ ਸੰਸਥਾ ਵੱਲੋਂ ਸੁਰੱਖਿਅਤ ਰੱਖਿਆ ਜਾਂਦਾ ਹੈ। ਵਧੇਰੇ ਆਸਾਨ ਪਹੁੰਚ ਲਈ ਐਪਾਂ ਨੂੰ ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਲਿਜਾਓ।"</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"ਤੁਹਾਡੀ ਸੰਸਥਾ ਵੱਲੋਂ ਪ੍ਰਬੰਧਿਤ ਕੀਤਾ ਜਾਂਦਾ ਹੈ"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"ਸੂਚਨਾਵਾਂ ਅਤੇ ਐਪਾਂ ਬੰਦ ਹਨ"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"ਬੰਦ ਕਰੋ"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"ਬੰਦ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"ਨਿੱਜੀ ਡਾਟਾ ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਤੋਂ ਵੱਖ ਅਤੇ ਲੁਕਾਇਆ ਹੋਇਆ ਹੈ"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਅਤੇ ਡਾਟਾ ਤੁਹਾਡੇ ਆਈ.ਟੀ. ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਦਿਖਣਯੋਗ ਹੈ"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"ਅੱਗੇ"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"ਸਮਝ ਲਿਆ"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਰੋਕਿਆ ਗਿਆ ਹੈ"</string>
+    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
+    <skip />
+    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
+    <skip />
+    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
+    <skip />
+    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
+    <skip />
+    <string name="work_switch_tip" msgid="808075064383839144">"ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਅਤੇ ਸੂਚਨਾਵਾਂ ਨੂੰ ਰੋਕੋ"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"ਇਹ ਕਾਰਵਾਈ ਅਸਫਲ ਹੋਈ: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index e0d2c74645..a01f71a9bd 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -21,52 +21,82 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
     <string name="work_folder_name" msgid="3753320833950115786">"Trabalho"</string>
-    <string name="activity_not_found" msgid="8071924732094499514">"A aplicação não está instalada."</string>
-    <string name="activity_not_available" msgid="7456344436509528827">"A aplicação não está disponível"</string>
+    <string name="activity_not_found" msgid="8071924732094499514">"A app não está instalada."</string>
+    <string name="activity_not_available" msgid="7456344436509528827">"A app não está disponível"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Aplicação transferida desativada no Modo de segurança"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Widgets desativados no Modo de segurança"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"O atalho não está disponível"</string>
-    <string name="home_screen" msgid="806512411299847073">"Ecrã principal"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Ações personalizadas"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Prima sem soltar para escolher um widget."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Toque duas vezes sem soltar para escolher um widget ou utilize ações personalizadas."</string>
+    <!-- no translation found for home_screen (5629429142036709174) -->
+    <skip />
+    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
+    <skip />
+    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
+    <skip />
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de largura por %2$d de altura"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Toque sem soltar para colocar manualmente"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Adicionar automaticamente"</string>
+    <!-- no translation found for widgets_count (656794749266073027) -->
+    <!-- no translation found for shortcuts_count (8080294865447938455) -->
+    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
+    <skip />
+    <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
+    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
+    <skip />
+    <!-- no translation found for no_widgets_available (9140948620298620513) -->
+    <skip />
+    <!-- no translation found for no_search_results (6518732304311458580) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
+    <skip />
+    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Pesquisar aplicações"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"A carregar aplicações…"</string>
-    <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nenhuma aplicação correspondente a \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
+    <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nenhuma app correspondente a \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Pesquisar mais aplicações"</string>
     <string name="label_application" msgid="8531721983832654978">"Aplicação"</string>
+    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
+    <skip />
+    <!-- no translation found for search_action_try_now (1458737965476149074) -->
+    <skip />
     <string name="notifications_header" msgid="1404149926117359025">"Notificações"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Toque sem soltar para escolher um atalho."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Toque duas vezes sem soltar para escolher um atalho ou utilize ações personalizadas."</string>
+    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
+    <skip />
     <string name="out_of_space" msgid="4691004494942118364">"Sem espaço suficiente neste Ecrã principal."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Não existe mais espaço no tabuleiro de Favoritos"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista de aplicações"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista de aplicações pessoais"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Lista de aplicações de trabalho"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Ecrã principal"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Remover"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Desinstalar"</string>
-    <string name="app_info_drop_target_label" msgid="692894985365717661">"Info. da aplicação"</string>
+    <string name="app_info_drop_target_label" msgid="692894985365717661">"Info. da app"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Instalar"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Não sugerir app"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Fixar previsão"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"instalar atalhos"</string>
-    <string name="permdesc_install_shortcut" msgid="923466509822011139">"Permite a uma aplicação adicionar atalhos sem a intervenção do utilizador."</string>
+    <string name="permdesc_install_shortcut" msgid="923466509822011139">"Permite a uma app adicionar atalhos sem a intervenção do utilizador."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"ler definições e atalhos do Ecrã Principal"</string>
-    <string name="permdesc_read_settings" msgid="5833423719057558387">"Permite à aplicação ler as definições e os atalhos no Ecrã Principal."</string>
+    <string name="permdesc_read_settings" msgid="5833423719057558387">"Permite à app ler as definições e os atalhos no Ecrã Principal."</string>
     <string name="permlab_write_settings" msgid="3574213698004620587">"escrever definições e atalhos do Ecrã principal"</string>
-    <string name="permdesc_write_settings" msgid="5440712911516509985">"Permite à aplicação alterar as definições e os atalhos no Ecrã Principal."</string>
+    <string name="permdesc_write_settings" msgid="5440712911516509985">"Permite à app alterar as definições e os atalhos no Ecrã Principal."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"O <xliff:g id="APP_NAME">%1$s</xliff:g> não tem autorização para efetuar chamadas telefónicas"</string>
     <string name="gadget_error_text" msgid="6081085226050792095">"Problema ao carregar o widget"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Configuração"</string>
-    <string name="uninstall_system_app_text" msgid="4172046090762920660">"É uma aplicação de sistema e não pode ser desinstalada."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Pasta sem nome"</string>
+    <string name="uninstall_system_app_text" msgid="4172046090762920660">"É uma app de sistema e não pode ser desinstalada."</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Edite o nome"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> desativado"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
-      <item quantity="other">A aplicação <xliff:g id="APP_NAME_2">%1$s</xliff:g> tem <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> notificações.</item>
-      <item quantity="one">A aplicação <xliff:g id="APP_NAME_0">%1$s</xliff:g> tem <xliff:g id="NOTIFICATION_COUNT_1">%2$d</xliff:g> notificação</item>
+      <item quantity="other">A app <xliff:g id="APP_NAME_2">%1$s</xliff:g> tem <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> notificações.</item>
+      <item quantity="one">A app <xliff:g id="APP_NAME_0">%1$s</xliff:g> tem <xliff:g id="NOTIFICATION_COUNT_1">%2$d</xliff:g> notificação</item>
     </plurals>
     <string name="default_scroll_format" msgid="7475544710230993317">"Página %1$d de %2$d"</string>
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Ecrã principal %1$d de %2$d"</string>
@@ -76,8 +106,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Tocar para guardar o nome novo"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Pasta fechada"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Nome de pasta alterado para <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Pasta: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Pasta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> itens"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Pasta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ou mais itens"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Imagens de fundo"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Estilos e imagens de fundo"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Definições de início"</string>
@@ -91,16 +121,17 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Para mostrar os Pontos de notificação, ative as notificações de aplicações para o <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Alterar definições"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Mostrar pontos de notificação"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Adicionar ícone ao ecrã principal"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Adic. ícones de apps ao ecrã principal"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Para novas aplicações"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Desconhecido"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Remover"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Pesquisar"</string>
-    <string name="abandoned_promises_title" msgid="7096178467971716750">"Esta aplicação não está instalada"</string>
-    <string name="abandoned_promise_explanation" msgid="3990027586878167529">"A aplicação deste ícone não está instalada. Pode removê-lo ou pesquisar a aplicação e instalá-la manualmente."</string>
+    <string name="abandoned_promises_title" msgid="7096178467971716750">"Esta app não está instalada"</string>
+    <string name="abandoned_promise_explanation" msgid="3990027586878167529">"A app deste ícone não está instalada. Pode removê-lo ou pesquisar a app e instalá-la manualmente."</string>
+    <!-- no translation found for app_installing_title (5864044122733792085) -->
+    <skip />
     <string name="app_downloading_title" msgid="8336702962104482644">"A transferir o <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="PROGRESS">%2$s</xliff:g> concluído"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"A aguardar a instalação do <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Widgets de <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Lista de widgets"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Lista de widgets fechada."</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Adicionar ao ecrã principal"</string>
@@ -128,15 +159,30 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Atalhos"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Atalhos e notificações"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Ignorar"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Fechar"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Notificação ignorada"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Pessoal"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Trabalho"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de trabalho"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Encontrar as aplicações de trabalho aqui"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Cada aplicação de trabalho apresenta um emblema, pelo que a sua entidade a mantém em segurança. Pode mover as aplicações para o ecrã principal para facilitar o acesso."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Gerido pela sua entidade"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"As notificações e as aplicações estão desativadas."</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Fechar"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Fechado"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Os dados pessoais são separados e ocultos das apps de trabalho"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Os dados e apps de trabalho estão visíveis para o seu administrador de TI"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Seguinte"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Perfil de trabalho em pausa"</string>
+    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
+    <skip />
+    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
+    <skip />
+    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
+    <skip />
+    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
+    <skip />
+    <string name="work_switch_tip" msgid="808075064383839144">"Coloque as apps de trabalho e as notificações em pausa."</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Falhou: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index bb4834f69d..aad52dc8dc 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -26,32 +26,52 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"App transferido por download desativado no modo de segurança"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Widgets desativados no modo de segurança"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"O atalho não está disponível"</string>
-    <string name="home_screen" msgid="806512411299847073">"Tela inicial"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Ações personalizadas"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Toque e pressione para selecionar um widget."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Toque duas vezes e segure para selecionar um widget ou usar ações personalizadas."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Início"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Tela dividida"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Toque e mantenha a tela pressionada para mover um widget."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Toque duas vezes e mantenha a tela pressionada para mover um widget ou usar ações personalizadas."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de largura por %2$d de altura"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Toque e mantenha pressionado para mover manualmente"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Adicionar automaticamente"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> atalho</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> atalhos</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Pesquisa"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Limpar texto da caixa de pesquisa"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Nenhum widget disponível"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Nenhum resultado de pesquisa"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Pessoal"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Trabalho"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Conversas"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Apps de pesquisa"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Carregando apps…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nenhum app encontrado que corresponda a \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Pesquisar mais apps"</string>
     <string name="label_application" msgid="8531721983832654978">"App"</string>
+    <string name="search_corpus_apps" msgid="1917889409963779022">"Apps"</string>
+    <string name="search_action_try_now" msgid="1458737965476149074">"Testar agora"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Notificações"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Toque e segure para selecionar um atalho."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Toque duas vezes na tela e segure para selecionar um atalho ou usar ações personalizadas."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Toque e mantenha a tela pressionada para mover um atalho."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Toque duas vezes e mantenha a tela pressionada para mover um atalho ou usar ações personalizadas."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Não há mais espaço na tela inicial."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Sem espaço na bandeja de favoritos"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista de apps"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista de apps pessoais"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Lista de apps profissionais"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Início"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Remover"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Desinstalar"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Informações do app"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Instalar"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Não sugerir esse app"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Fixar previsão"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"instalar atalhos"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Permite que um app adicione atalhos sem intervenção do usuário."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"ler configurações e atalhos da tela inicial"</string>
@@ -62,7 +82,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Problema ao carregar o widget"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Configuração"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Este é um app do sistema e não pode ser desinstalado."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Pasta sem nome"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Editar nome"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> desativado"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="one">O app <xliff:g id="APP_NAME_2">%1$s</xliff:g>tem <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> notificação</item>
@@ -76,8 +96,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Toque para salvar o novo nome"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Pasta fechada"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Pasta renomeada para <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Pasta: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Pasta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> itens"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Pasta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ou mais itens"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Planos de fundo"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Estilos e planos de fundo"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Config. tela inicial"</string>
@@ -91,16 +111,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Para mostrar pontos de notificação, ative as notificações de app para <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Alterar configurações"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Mostrar pontos de notificação"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Adicionar ícone à tela inicial"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Adicionar ícones de apps à tela inicial"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Para novos apps"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Desconhecido"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Remover"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Pesquisar"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Este app não está instalado"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"O app deste ícone não está instalado. Você pode remover o ícone, ou procurar o app e instalá-lo manualmente."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"Instalando <xliff:g id="NAME">%1$s</xliff:g>. <xliff:g id="PROGRESS">%2$s</xliff:g> concluído"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"Fazendo download de <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="PROGRESS">%2$s</xliff:g> concluído"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"Aguardando instalação de <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Widgets do <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Lista de widgets"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Lista de widgets fechada"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Adicionar à tela inicial"</string>
@@ -128,15 +148,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Atalhos"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Atalhos e notificações"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Dispensar"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Fechar"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Notificação dispensada"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Pessoais"</string>
-    <string name="all_apps_work_tab" msgid="4884822796154055118">"Comerciais"</string>
+    <string name="all_apps_work_tab" msgid="4884822796154055118">"Trabalho"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de trabalho"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Localizar apps de trabalho aqui"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Cada app de trabalho tem um selo e é mantido em segurança pela sua organização. Mova os apps para sua tela inicial para facilitar o acesso."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Gerenciados pela sua organização"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"As notificações e os apps estão desativados"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Fechar"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Fechado"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Os dados pessoais ficam separados e ocultos dos apps de trabalho"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Os dados de apps de trabalho ficam visíveis para seu administrador de TI"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Próxima"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Ok"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"O perfil de trabalho está pausado"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Os apps de trabalho não podem enviar notificações, usar a bateria nem acessar o local"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"O perfil de trabalho está pausado. Os apps de trabalho não podem enviar notificações, usar a bateria nem acessar o local"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Os apps de trabalho têm um ícone e ficam visíveis para o administrador de TI"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Ok"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pausar apps de trabalho"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Ativar"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtrar"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Pausar apps e notificações de trabalho"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Falha: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index ef99a59e4e..f680435a75 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -20,39 +20,58 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"කාර්යාලය"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"යෙදුම ස්ථාපනය කර නැත."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"යෙදුම නොතිබේ"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"ආරක්ෂිත ආකාරය තුළ බාගන්න ලද යෙදුම් අබල කරන්න"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"සුරක්ෂිත ආකාරය තුළ විජටය අබල කරන ලදි"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"කෙටි මග ලබා ගත නොහැකිය"</string>
-    <string name="home_screen" msgid="806512411299847073">"මුල් පිටු තිරය"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"අභිරුචි ක්‍රියා"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"විජට් එක ස්පර්ශ කර අහුලා ගැනීමට අල්ලාගෙන සිටින්න."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"විජට් එකක් අහුලා ගැනීමට හෝ අභිරුචි ක්‍රියා කිරීමට ඩබල් ටැප් කර අල්ලා ගෙන සිටින්න."</string>
+    <string name="home_screen" msgid="5629429142036709174">"මුල් පිටුව"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"බෙදුම් තිරය"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"විජට් එකක් ගෙන යාමට ස්පර්ශ කර අල්ලා ගෙන සිටින්න."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"විජට් එකක් ගෙන යාමට හෝ අභිරුචි ක්‍රියා භාවිත කිරීමට දෙවරක් තට්ටු කර අල්ලා ගෙන සිටින්න."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"පළල %1$d උස %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"අතින් ස්ථානගත කිරීමට ස්පර්ශ කර අල්ලාගෙන සිටින්න"</string>
     <string name="place_automatically" msgid="8064208734425456485">"ස්වයංක්‍රියව එක් කරන්න"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="one">විජට් <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
+      <item quantity="other">විජට් <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="one">කෙටි මං <xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g></item>
+      <item quantity="other">කෙටි මං <xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g></item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"විජට්"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"සෙවීම"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"සෙවීම් කොටුවෙන් පෙළ හිස් කරන්න"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"ලබා ගත හැකි විජට් නැත"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"සෙවීම් ප්‍රතිඵල නැත"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"පුද්ගලික"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"කාර්යාලය"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"සංවාද"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"යෙදුම් සොයන්න"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"යෙදුම් පූරණය වෙමින්…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" සමග ගැළපෙන යෙදුම් හමු නොවිණි"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"තව යෙදුම් සඳහා සොයන්න"</string>
     <string name="label_application" msgid="8531721983832654978">"යෙදුම"</string>
+    <string name="search_corpus_apps" msgid="1917889409963779022">"යෙදුම්"</string>
+    <string name="search_action_try_now" msgid="1458737965476149074">"දැන් උත්සාහ කරන්න"</string>
     <string name="notifications_header" msgid="1404149926117359025">"දැනුම්දීම්"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"කෙටි මගක් තෝරා ගැනීමට ස්පර්ශ කර අල්ලාගෙන සිටින්න."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"විජට් එකක් තෝරා ගැනීමට හෝ අභිරුචි භාවිත කිරීමට දෙවරක් තට්ටු කර අල්ලා ගෙන සිටින්න."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"කෙටි මගක් ගෙන යාමට ස්පර්ශ කර අල්ලාගෙන සිටින්න."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"කෙටි මගක් ගෙන යාමට හෝ අභිරුචි ක්‍රියා භාවිත කිරීමට දෙවරක් තට්ටු කර අල්ලා ගෙන සිටින්න."</string>
     <string name="out_of_space" msgid="4691004494942118364">"මෙම මුල් පිටු තිරය මත තවත් අවසර නැත."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ප්‍රියතම දෑ ඇති තැටියේ තවත් ඉඩ නොමැත"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"යෙදුම් ලැයිස්තුව"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"පෞද්ගලික යෙදුම් ලැයිස්තුව"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"වැඩ යෙදුම් ලැයිස්තුව"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"මුල් පිටුව"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"ඉවත් කරන්න"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"අස්ථාපනය කරන්න"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"යෙදුම් තොරතුරු"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"ස්ථාපනය කරන්න"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"යෙදුම යෝජනා නොකරන්න"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"පුරෝකථනය අමුණන්න"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"කෙටිමං ස්ථාපනය කරන්න"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"පරිශීලක මැදිහත්වීමෙන් තොරව කෙටිමං එක් කිරීමට යෙදුමකට අවසර දෙයි."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"මුල් පිටු සැකසීම් සහ කෙටිමං කියවන්න"</string>
@@ -63,7 +82,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"ගැටලු පූරණ විජට් එක"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"ස්ථාපනය කරන්න"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"මෙය පද්ධති යෙදුමක් වන අතර අස්ථාපනය කළ නොහැක."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"නම් නොකළ ෆෝල්ඩරය"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"නම සංස්කරණය කරන්න"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> අබල කෙරිණි"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="one"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, දැනුම්දීම් <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g>ක් ඇත</item>
@@ -77,8 +96,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"යළි නම් කිරීම සුරැකීමට තට්ටු කරන්න"</string>
     <string name="folder_closed" msgid="4100806530910930934">"ෆෝල්ඩරය වසා ඇත"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"<xliff:g id="NAME">%1$s</xliff:g> වෙත ෆෝල්ඩරය නැවත නම් කෙරිණි"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"ෆෝල්ඩරය: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"විජට්"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"ෆෝල්ඩරය: <xliff:g id="NAME">%1$s</xliff:g>, අයිතම <xliff:g id="SIZE">%2$d</xliff:g>"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"ෆෝල්ඩර: <xliff:g id="NAME">%1$s</xliff:g>, අයිතම <xliff:g id="SIZE">%2$d</xliff:g>ක් හෝ වැඩි ගණනක්"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"වෝල්පේපර"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"විලාස සහ වෝල්පේපර"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"නිවසේ සැකසීම්"</string>
@@ -92,16 +111,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"දැනුම්දීම් තිත් පෙන්වීමට, <xliff:g id="NAME">%1$s</xliff:g> සඳහා යෙදුම් දැනුම්දීම් සබල කරන්න"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"සැකසීම් වෙනස් කරන්න"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"දැනුම්දීම් තිත් පෙන්වන්න"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"මුල් පිටු තිරය වෙත අයිකනය එක් කරන්න"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"මුල් තිරයට යෙදුම් අයිකන එක් කරන්න"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"නව යෙදුම් සඳහා"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"නොදනී"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"ඉවත් කරන්න"</string>
     <string name="abandoned_search" msgid="891119232568284442">"සොයන්න"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"මෙම යෙදුම ස්ථාපනය කර නොමැත"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"මෙම නිරුපකයට යෙදුම ස්ථාපනය කර නොමැත. ඔබට එය ඉවත් කළ හැක, හෝ යෙදුම් සඳහා සොයන්න සහ අතින් ස්ථාපනය කරන්න."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> ස්ථාපනය කරමින්, <xliff:g id="PROGRESS">%2$s</xliff:g> සම්පූර්ණයි"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> බාගත කරමින්, <xliff:g id="PROGRESS">%2$s</xliff:g> සම්පූර්ණයි"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> ස්ථාපනය කිරීමට බලා සිටිමින්"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> විජට්"</string>
     <string name="widgets_list" msgid="796804551140113767">"විජට් ලැයිස්තුව"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"විජට් ලැයිස්තුව වසා ඇත"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"මුල් තිරය වෙත එක් කරන්න"</string>
@@ -129,15 +148,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"කෙටිමං"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"කෙටි මං සහ දැනුම්දීම්"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"ඉවතලන්න"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"වසන්න"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"දැනුම්දීම ඉවතලන ලදී"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"පුද්ගලික"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"කාර්යාලය"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"කාර්යාල පැතිකඩ"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"මෙහි කාර්යාල යෙදුම් සොයා ගන්න"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"සෑම කාර්යාල යෙදුමකම ලාංඡනයක් ඇත ඇති අතර එය ඔබේ සංවිධානය මගින් සුරක්ෂිතව තබා ගනී. වඩාත් පහසු ප්‍රවේශයකට යෙදුම් ඔබේ මුල් පිටු තිරය වෙත ගෙන යන්න."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"ඔබේ සංවිධානය විසින් කළමනාකරණය කරනු ලැබේ"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"දැනුම්දීම් සහ යෙදුම් ක්‍රියාවිරහිතයි"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"වසන්න"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"වසා ඇත"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"පෞද්ගලික දත්ත කාර්යාල යෙදුම්වලින් වෙන් කර සඟවා ඇත"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"කාර්යාල යෙදුම් &amp; දත්ත ඔබගේ IT පරිපාලකට දෘශ්‍යමාන වේ"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"ඊළඟ"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"තේරුණා"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"කාර්යාල පැතිකඩ විරාම කර ඇත"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"කාර්යාල යෙදුම්වලට ඔබට දැනුම්දීම් එවීමට, ඔබගේ බැටරිය භාවිත කිරීමට හෝ ඔබගේ ස්ථානයට ප්‍රවේශ වීමට නොහැකිය"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"කාර්යාල පැතිකඩ විරාම කර ඇත. කාර්යාල යෙදුම්වලට ඔබට දැනුම්දීම් එවීමට, ඔබගේ බැටරිය භාවිත කිරීමට හෝ ඔබගේ ස්ථානයට ප්‍රවේශ වීමට නොහැකිය"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"කාර්යාල යෙදුම්වලට ලාංඡන යොදා ඇති අතර ඔබගේ IT පරිපාලකට දෘශ්‍යමාන වේ"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"තේරුණා"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"කාර්යාල යෙදුම් විරාම කරන්න"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"ක්‍රියාත්මක කරන්න"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"පෙරහන"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"කාර්යාල යෙදුම් සහ දැනුම් දීම් විරාම කරන්න"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"අසාර්ථකයි: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 5bbf7c3cdc..f6a97b5313 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -26,32 +26,56 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Stiahnutá aplikácia je v núdzovom režime zakázaná"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Miniaplikácie sú v núdzovom režime zakázané"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Skratky nie sú k dispozícii"</string>
-    <string name="home_screen" msgid="806512411299847073">"Plocha"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Vlastné akcie"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Miniaplikáciu pridáte stlačením a podržaním."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Miniaplikáciu pridáte dvojitým klepnutím a pridržaním alebo pomocou vlastných akcií."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Domov"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Rozdeliť obrazovku"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Pridržaním presuňte miniaplikáciu."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvojitým klepnutím a pridržaním presuňte miniaplikáciu alebo použite vlastné akcie."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"šírka %1$d, výška %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Ak chcete položku umiestniť ručne, pridržte ju"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Pridať automaticky"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> miniaplikácie</item>
+      <item quantity="many"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> miniaplikácií</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> miniaplikácia</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="few"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> skratky</item>
+      <item quantity="many"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> shortcuts</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> skratiek</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> skratka</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Miniaplikácie"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Vyhľadajte"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Vymazať text z vyhľadávacieho poľa"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Nie sú k dispozícii žiadne miniaplikácie"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Žiadne výsledky vyhľadávania"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Osobné"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Práca"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Konverzácie"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Hľadať aplikácie"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Načítavajú sa aplikácie…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nenašli sa žiadne aplikácie zodpovedajúce dopytu <xliff:g id="QUERY">%1$s</xliff:g>"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Hľadať ďalšie aplikácie"</string>
     <string name="label_application" msgid="8531721983832654978">"Aplikácia"</string>
+    <string name="search_corpus_apps" msgid="1917889409963779022">"Aplikácie"</string>
+    <string name="search_action_try_now" msgid="1458737965476149074">"Vyskúšať"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Upozornenia"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Skratku pridáte pridržaním."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Skratku pridáte dvojitým klepnutím a pridržaním alebo pomocou vlastných akcií."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Pridržaním presuňte skratku."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dvojitým klepnutím a pridržaním presuňte odkaz alebo použite vlastné akcie."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Na tejto ploche už nie je miesto"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Na paneli Obľúbené položky už nie je miesto"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Zoznam aplikácií"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Zoznam osobných aplikácií"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Zoznam pracovných aplikácií"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Domovská stránka"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Odstrániť"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Odinštalovať"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Info o aplikácii"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Inštalovať"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Nenavrhovať aplikáciu"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Pripnúť predpoveď"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"inštalovať odkazy"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Povoľuje aplikácii pridať odkazy bez zásahu používateľa."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"čítanie nastavení a odkazov plochy"</string>
@@ -62,7 +86,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Problém s načítaním miniaplikácií"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Nastavenie"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Toto je systémová aplikácia a nedá sa odinštalovať."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Nepomenovaný priečinok"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Úprava názvu"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g> je deaktivovaná"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="few"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, má <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> upozornenia</item>
@@ -78,8 +102,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Nový názov uložíte klepnutím"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Priečinok je uzavretý"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Priečinok bol premenovaný na <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Priečinok: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Miniaplikácie"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Priečinok: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> položky"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Priečinok: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> alebo viac položiek"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Tapety"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Štýly a tapety"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Nastavenia plochy"</string>
@@ -93,16 +117,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Ak chcete, aby sa zobrazovali bodky upozornení, zapnite upozornenia aplikácie <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Zmeniť nastavenia"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Zobrazovať bodky upozornení"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Pridať ikonu na plochu"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Pridať ikony aplikácií na plochu"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Pri inštalácii novej aplikácie"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Neznáme"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Odstrániť"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Vyhľadať"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Táto aplikácia nie je nainštalovaná"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Aplikácia, ktorú zastupuje táto ikona, nie je nainštalovaná. Ikonu môžete odstrániť alebo vyhľadajte aplikáciu a ručne ju nainštalujte."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"Inštaluje sa <xliff:g id="NAME">%1$s</xliff:g>. Dokončené: <xliff:g id="PROGRESS">%2$s</xliff:g>."</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"Sťahuje sa aplikácia <xliff:g id="NAME">%1$s</xliff:g>. Stiahnuté: <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"Aplikácia <xliff:g id="NAME">%1$s</xliff:g> čaká na inštaláciu"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Miniaplikácie <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Zoznam miniaplikácií"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Zoznam miniaplikácií je zavretý"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Pridať na plochu"</string>
@@ -130,15 +154,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Skratky"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Odkazy a upozornenia"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Zavrieť"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Zavrieť"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Upozornenie bolo zavreté"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Osobné"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Pracovné"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Pracovný profil"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Tu nájdete pracovné aplikácie"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Všetky pracovné aplikácie majú štítok a sú bezpečne uchovávané vašou organizáciou. Ak chcete mať k aplikáciám ľahší prístup, presuňte ich na plochu."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Spravované vašou organizáciou"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Upozornenia a aplikácie sú vypnuté"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Zavrieť"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Zavreté"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Osobné údaje sú oddelené a sú pred pracovnými aplikáciami skryté"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Pracovné aplikácie a údaje môže vidieť váš správca IT"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Ďalej"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Dobre"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Pracovný profil je pozastavený"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Pracovné aplikácie nemôžu posielať upozornenia, používať batériu ani polohu"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Pracovný profil je pozastavený. Pracovné aplikácie nemôžu posielať upozornenia, používať batériu ani polohu."</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Pracovné aplikácie majú odznak a zobrazujú sa správcovi IT"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Dobre"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pozastaviť pracovné aplikácie"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Zapnúť"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtrujte"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Pozastavte pracovné aplikácie a upozornenia"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Zlyhalo: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index e7400a6d00..895959e10c 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -20,39 +20,58 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Arbete"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Appen är inte installerad."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Appen är inte tillgänglig"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Den hämtade appen inaktiverades i säkert läge"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Widgets är inaktiverade i felsäkert läge"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Genvägen är inte tillgänglig"</string>
-    <string name="home_screen" msgid="806512411299847073">"Startskärm"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Anpassade åtgärder"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Tryck länge om du vill flytta en widget."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Tryck två gånger och håll kvar om du vill ta upp en widget eller använda anpassade åtgärder."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Startskärm"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Delad skärm"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Tryck länge för att flytta en widget."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Tryck snabbt två gånger och håll kvar för att flytta en widget eller använda anpassade åtgärder."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d bred gånger %2$d hög"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Placera manuellt genom att trycka länge"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Lägg till automatiskt"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgetar</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> genvägar</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> genväg</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Widgetar"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Sök"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Rensa texten från sökrutan"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Det finns inga tillgängliga widgetar"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Inga sökresultat"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Privata widgetar"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Arbete"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Konversationer"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Sök efter appar"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Läser in appar …"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Inga appar som matchar <xliff:g id="QUERY">%1$s</xliff:g> hittades"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Sök efter fler appar"</string>
     <string name="label_application" msgid="8531721983832654978">"App"</string>
+    <string name="search_corpus_apps" msgid="1917889409963779022">"Appar"</string>
+    <string name="search_action_try_now" msgid="1458737965476149074">"Testa nu"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Aviseringar"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Tryck länge om du vill ta upp en genväg."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Tryck snabbt två gånger och håll kvar om du vill ta upp en genväg eller använda anpassade åtgärder."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Tryck länge för att flytta en genväg."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Tryck snabbt två gånger och håll kvar för att flytta en genväg eller använda anpassade åtgärder."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Det finns inte plats för mer på den här startskärmen."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Favoritfältet är fullt"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Applista"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Listan Personliga appar"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Listan Jobbappar"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Startskärm"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Ta bort"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Avinstallera"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Info om appen"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Installera"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Föreslå inte app"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Fäst förslag"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"installera genvägar"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Tillåter att en app lägger till genvägar utan åtgärd från användaren."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"läsa inställningar och genvägar för startsidan"</string>
@@ -63,7 +82,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Det gick inte att läsa in widgeten"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Konfiguration"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Det här är en systemapp som inte kan avinstalleras."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Namnlös mapp"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Redigera namn"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> har inaktiverats"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g> har <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> aviseringar</item>
@@ -77,8 +96,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Tryck för att spara namnändringen"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Mappen är stängd"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Mappen har bytt namn till <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Mapp: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Widgetar"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Mapp: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> objekt"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Mapp: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> eller fler objekt"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Bakgrunder"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Format och bakgrunder"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Startinställningar"</string>
@@ -92,16 +111,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Aktivera appaviseringar för <xliff:g id="NAME">%1$s</xliff:g> om du vill att aviseringsprickar ska visas"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Ändra inställningar"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Visa aviseringsprickar"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Lägg till ikonen på startskärmen"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Lägg till appikoner på startskärmen"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"För nya appar"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Okänt"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Ta bort"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Sök"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Appen är inte installerad"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Appen för den här ikonen har inte installerats. Du kan ta bort den eller söka efter appen och installera den manuellt."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> installeras. <xliff:g id="PROGRESS">%2$s</xliff:g> har slutförts"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> laddas ned, <xliff:g id="PROGRESS">%2$s</xliff:g> klart"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> väntar på installation"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> widgetar"</string>
     <string name="widgets_list" msgid="796804551140113767">"Widgetlista"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Widgetslistan har stängts"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Lägg till på startskärmen"</string>
@@ -129,15 +148,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Genvägar"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Genvägar och aviseringar"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Ignorera"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Stäng"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Aviseringen togs bort"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Privat"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Arbete"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Jobbprofil"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Här hittar du jobbappar"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Alla jobbappar har ett märke och organisationen ser till att de är skyddade. Flytta apparna till startskärmen så kommer du åt dem lättare."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Hanteras av organisationen"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Aviseringar och appar är inaktiverade"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Stäng"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Stängd"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Privat data lagras för sig och är inte synlig för jobbapparna"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Jobbappar och jobbdata är synliga för IT-administratören"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Nästa"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Jobbprofilen är pausad"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Jobbappar kan inte skicka aviseringar, använda batteriet eller komma åt din plats"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Jobbprofilen är pausad. Jobbappar kan inte skicka aviseringar, använda batteriet eller komma åt din plats"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Jobbappar är märkta och synliga för IT-administratören"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pausa jobbappar"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Aktivera"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filter"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Pausa jobbappar och jobbaviseringar"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Misslyckades: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 5ab9b860ef..1a57992439 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -26,32 +26,62 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"แอปที่ดาวน์โหลดถูกปิดในโหมดปลอดภัย"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"มีการปิดใช้งานวิดเจ็ตในเซฟโหมด"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"ทางลัดไม่พร้อมใช้งาน"</string>
-    <string name="home_screen" msgid="806512411299847073">"หน้าจอหลัก"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"การทำงานที่กำหนดเอง"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"แตะค้างเพื่อรับวิดเจ็ต"</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"แตะ 2 ครั้งค้างไว้เพื่อเลือกวิดเจ็ตหรือใช้การกระทำที่กำหนดเอง"</string>
+    <!-- no translation found for home_screen (5629429142036709174) -->
+    <skip />
+    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
+    <skip />
+    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
+    <skip />
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"กว้าง %1$d x สูง %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"แตะค้างไว้เพื่อวางด้วยตัวเอง"</string>
     <string name="place_automatically" msgid="8064208734425456485">"เพิ่มโดยอัตโนมัติ"</string>
+    <!-- no translation found for widgets_count (656794749266073027) -->
+    <!-- no translation found for shortcuts_count (8080294865447938455) -->
+    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
+    <skip />
+    <string name="widget_button_text" msgid="2880537293434387943">"วิดเจ็ต"</string>
+    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
+    <skip />
+    <!-- no translation found for no_widgets_available (9140948620298620513) -->
+    <skip />
+    <!-- no translation found for no_search_results (6518732304311458580) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
+    <skip />
+    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ค้นหาแอป"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"กำลังโหลดแอป…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"ไม่พบแอปที่ตรงกับ \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"ค้นหาแอปเพิ่มเติม"</string>
     <string name="label_application" msgid="8531721983832654978">"แอป"</string>
+    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
+    <skip />
+    <!-- no translation found for search_action_try_now (1458737965476149074) -->
+    <skip />
     <string name="notifications_header" msgid="1404149926117359025">"การแจ้งเตือน"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"แตะค้างไว้เพื่อเลือกทางลัด"</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"แตะสองครั้งค้างไว้เพื่อเลือกทางลัดหรือใช้การกระทำที่กำหนดเอง"</string>
+    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
+    <skip />
     <string name="out_of_space" msgid="4691004494942118364">"ไม่มีที่ว่างในหน้าจอหลักนี้"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ไม่มีพื้นที่เหลือในถาดรายการโปรด"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"รายชื่อแอป"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"รายการแอปส่วนตัว"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"รายการแอปสำหรับทำงาน"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"หน้าแรก"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"นำออก"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"ถอนการติดตั้ง"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"ข้อมูลแอป"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"ติดตั้ง"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"ไม่ต้องแนะนำแอป"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"ปักหมุดแอปที่คาดการณ์ไว้"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"ติดตั้งทางลัด"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"อนุญาตให้แอปเพิ่มทางลัดโดยไม่ต้องให้ผู้ใช้จัดการ"</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"อ่านการตั้งค่าและทางลัดหน้าแรกแล้ว"</string>
@@ -62,7 +92,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"มีปัญหาขณะโหลดวิดเจ็ต"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"ตั้งค่า"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"นี่เป็นแอประบบและไม่สามารถถอนการติดตั้งได้"</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"โฟลเดอร์ที่ไม่มีชื่อ"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"แก้ไขชื่อ"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"ปิดใช้ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g> มีการแจ้งเตือน <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> รายการ</item>
@@ -76,8 +106,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"แตะเพื่อบันทึกการเปลี่ยนชื่อ"</string>
     <string name="folder_closed" msgid="4100806530910930934">"โฟลเดอร์ปิดอยู่"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"เปลี่ยนชื่อโฟลเดอร์เป็น <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"โฟลเดอร์: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"วิดเจ็ต"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"โฟลเดอร์: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> รายการ"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"โฟลเดอร์: <xliff:g id="NAME">%1$s</xliff:g>, อย่างน้อย <xliff:g id="SIZE">%2$d</xliff:g> รายการ"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"วอลเปเปอร์"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"รูปแบบและวอลเปเปอร์"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"การตั้งค่าหน้าแรก"</string>
@@ -91,16 +121,17 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"เปิดการแจ้งเตือนแอปของ <xliff:g id="NAME">%1$s</xliff:g> เพื่อแสดงจุดแจ้งเตือน"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"เปลี่ยนการตั้งค่า"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"แสดงเครื่องหมายจุดแสดงการแจ้งเตือน"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"เพิ่มไอคอนในหน้าจอหลัก"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"เพิ่มไอคอนแอปในหน้าจอหลัก"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"สำหรับแอปใหม่"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"ไม่รู้จัก"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"ลบ"</string>
     <string name="abandoned_search" msgid="891119232568284442">"ค้นหา"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"ไม่ได้ติดตั้งแอปนี้"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"ยังไม่ได้ติดตั้งแอปสำหรับไอคอนนี้ คุณสามารถนำไอคอนออก หรือค้นหาแอปดังกล่าวแล้วติดตั้งด้วยตนเอง"</string>
+    <!-- no translation found for app_installing_title (5864044122733792085) -->
+    <skip />
     <string name="app_downloading_title" msgid="8336702962104482644">"กำลังดาวน์โหลด <xliff:g id="NAME">%1$s</xliff:g> เสร็จแล้ว <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> กำลังรอติดตั้ง"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"วิดเจ็ตของ <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"รายการวิดเจ็ต"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"ปิดรายการวิดเจ็ตแล้ว"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"เพิ่มลงในหน้าจอหลัก"</string>
@@ -128,15 +159,30 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"ทางลัด"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"ทางลัดและการแจ้งเตือน"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"ปิด"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"ปิด"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"ปิดการแจ้งเตือนแล้ว"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ส่วนตัว"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"งาน"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"โปรไฟล์งาน"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"หาแอปงานที่นี่"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"แอปงานแต่ละแอปมีป้ายและได้รับการรักษาความปลอดภัยจากองค์กรของคุณ ย้ายแอปไปยังหน้าจอหลักเพื่อให้เข้าถึงได้ง่ายขึ้น"</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"จัดการโดยองค์กร"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"ปิดการแจ้งเตือนและแอปอยู่"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"ปิด"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"ปิด"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"ข้อมูลส่วนตัวจะอยู่แยกต่างหากและซ่อนจากแอปงาน"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"ผู้ดูแลระบบไอทีจะดูแอปและข้อมูลงานได้"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"ถัดไป"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"รับทราบ"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"โปรไฟล์งานหยุดชั่วคราว"</string>
+    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
+    <skip />
+    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
+    <skip />
+    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
+    <skip />
+    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
+    <skip />
+    <string name="work_switch_tip" msgid="808075064383839144">"หยุดแอปงานและการแจ้งเตือนไว้ชั่วคราว"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"ไม่สำเร็จ: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 0df94c7104..a5b9d3efa5 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -20,39 +20,58 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Trabaho"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Hindi naka-install ang app."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Hindi available ang app"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Naka-disable ang na-download na app sa Safe mode"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Naka-disable ang mga widget sa Safe mode"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Hindi available ang shortcut"</string>
-    <string name="home_screen" msgid="806512411299847073">"Home screen"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Mga custom na pagkilos"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Pindutin nang matagal upang kumuha ng widget."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"I-double tap nang matagal upang pumili ng widget o gumamit ng mga custom na pagkilos."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Home"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Split screen"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Pindutin nang matagal para ilipat ang widget."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"I-double tap at pindutin nang matagal para ilipat ang widget o gumamit ng mga custom na pagkilos."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ang lapad at %2$d ang taas"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Pindutin nang matagal para manual na ilagay"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Awtomatikong idagdag"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> na widget</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> shortcut</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> na shortcut</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Mga Widget"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Maghanap"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"I-clear ang text sa box para sa paghahanap"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Walang available na widget"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Walang resulta ng paghahanap"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personal"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Trabaho"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Mga Pag-uusap"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Maghanap ng mga app"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Naglo-load ng mga app…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Walang nahanap na app na tumutugma sa \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Maghanap ng higit pang mga app"</string>
     <string name="label_application" msgid="8531721983832654978">"App"</string>
+    <string name="search_corpus_apps" msgid="1917889409963779022">"Mga App"</string>
+    <string name="search_action_try_now" msgid="1458737965476149074">"Subukan Ngayon"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Mga Notification"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Pindutin nang matagal para kumuha ng shortcut."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"I-double tap nang matagal para kumuha ng shortcut o gumamit ng mga custom na pagkilos."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Pindutin nang matagal para ilipat ang shortcut."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"I-double tap at pindutin nang matagal para ilipat ang shortcut o gumamit ng mga custom na pagkilos."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Wala nang lugar sa Home screen na ito."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Wala nang lugar sa tray ng Mga Paborito"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Listahan ng mga app"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Listahan ng mga personal na app"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Listahan ng mga app sa trabaho"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Home"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Alisin"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"I-uninstall"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Impormasyon ng app"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"I-install"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Huwag magmungkahi ng app"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"I-pin ang Hula"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"i-install ang mga shortcut"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Pinapayagan ang isang app na magdagdag ng mga shortcut nang walang panghihimasok ng user."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"basahin ang mga setting at shortcut ng Home"</string>
@@ -63,7 +82,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Problema sa pag-load ng widget"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"I-setup"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Isa itong app ng system at hindi maaaring i-uninstall."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Walang Pangalang Folder"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"I-edit ang Pangalan"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Naka-disable ang <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="one">May <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> (na) notification ang <xliff:g id="APP_NAME_2">%1$s</xliff:g></item>
@@ -77,8 +96,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"I-tap upang i-save ang bagong pangalan"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Nakasara ang folder"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Pinalitan ang pangalan ng folder ng <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Folder: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Mga Widget"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> (na) item"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> o higit pang item"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Mga Wallpaper"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Mga istilo at wallpaper"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Mga setting ng Home"</string>
@@ -92,16 +111,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Upang ipakita ang Mga Notification Dot, i-on ang mga notification ng app para sa <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Baguhin ang mga setting"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Ipakita ang mga notification dot"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Idagdag ang icon sa Home screen"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Magdagdag ng mga app icon sa Home screen"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Para sa mga bagong app"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Hindi kilala"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Alisin"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Maghanap"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Hindi naka-install ang app na ito"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Hindi naka-install ang app para sa icon na ito. Puwede mo itong alisin, o maaari mong hanapin ang app at i-install ito nang manual."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"Ini-install ang <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="PROGRESS">%2$s</xliff:g> kumpleto"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"Dina-download na ang <xliff:g id="NAME">%1$s</xliff:g>, tapos na ang <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"Hinihintay nang mag-install ang <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Mga widget ng <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Listahan ng mga widget"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Nakasara ang listahan ng mga widget"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Idagdag sa Home screen"</string>
@@ -129,15 +148,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Mga Shortcut"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Mga shortcut at notification"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"I-dismiss"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Isara"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Na-dismiss ang notification"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personal"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Trabaho"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profile sa trabaho"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Maghanap ng mga app para sa trabaho rito"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Ang bawat app para sa trabaho ay may badge at pinapanatiling ligtas ng iyong organisasyon. Ilipat ang mga app sa iyong Home screen para mas madaling ma-access."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Pinamamahalaan ng iyong organisasyon"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Naka-off ang mga notification at app"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Isara"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Nakasara"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Hiwalay at nakatago ang personal na data sa mga app para sa trabaho"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Makikita ng iyong IT admin ang mga app at data para sa trabaho"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Susunod"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Naka-pause ang profile sa trabaho"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Ang mga app para sa trabaho ay hindi makakapagpadala sa iyo ng mga notification, makakagamit ng battery mo, o makaka-access ng iyong lokasyon"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Naka-pause ang profile sa trabaho. Ang mga app para sa trabaho ay hindi makakapagpadala sa iyo ng mga notification, makakagamit ng battery mo, o makaka-access ng iyong lokasyon"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"May badge at nakikita ng iyong IT admin ang mga app para sa trabaho"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"I-pause ang mga app para sa trabaho"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"I-on"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filter"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"I-pause ang mga app at notification para sa trabaho"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Hindi nagawa: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 56f8447bf1..7085f6e762 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -20,39 +20,58 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"İş"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Uygulama yüklü değil."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Uygulama kullanılamıyor"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"İndirilen uygulama Güvenli modda devre dışı bırakıldı"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Güvenli modda widget\'lar devre dışı"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Kısayol kullanılamıyor"</string>
-    <string name="home_screen" msgid="806512411299847073">"Ana ekran"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Özel işlemler"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Widget seçmek için dokunun ve basılı tutun."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Bir widget\'ı seçmek veya özel işlemleri kullanmak için iki kez dokunun ve basılı tutun."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Ana ekran"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Bölünmüş ekran"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Widget\'ı taşımak için dokunup basılı tutun."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Widget\'ı taşımak veya özel işlemleri kullanmak için iki kez dokunup basılı tutun."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"genişlik: %1$d, yükseklik: %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Manuel olarak yerleştirmek için dokunun ve basılı tutun"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Otomatik olarak ekle"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> kısayol</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> kısayol</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Widget\'lar"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Ara"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Arama kutusundaki metni temizle"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Kullanılabilir widget yok"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Arama sonucu yok"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Kişisel"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"İş"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Görüşmeler"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Uygulamalarda ara"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Uygulamalar yükleniyor…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" ile eşleşen uygulama bulunamadı"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Başka uygulamalar ara"</string>
     <string name="label_application" msgid="8531721983832654978">"Uygulama"</string>
+    <string name="search_corpus_apps" msgid="1917889409963779022">"Uygulamalar"</string>
+    <string name="search_action_try_now" msgid="1458737965476149074">"Hemen Dene"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Bildirimler"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Kısayol seçmek için dokunun ve basılı tutun."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Bir kısayolu seçmek veya özel işlemleri kullanmak için iki kez dokunun ve basılı tutun."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Kısayolu taşımak için dokunup basılı tutun."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Kısayolu taşımak veya özel işlemleri kullanmak için iki kez dokunup basılı tutun."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Bu Ana ekranda yer kalmadı."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Favoriler tepsisinde başka yer kalmadı"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Uygulamalar listesi"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Kişisel uygulamalar listesi"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"İş uygulamaları listesi"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Ana ekran"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Kaldır"</string>
-    <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Yüklemeyi kaldır"</string>
+    <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Kaldır"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Uygulama bilgileri"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Yükle"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Uygulama önerme"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Tahmini Sabitle"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"kısayolları yükle"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Uygulamaya, kullanıcı müdahalesi olmadan kısayol ekleme izni verir."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"Ana ekran ayarlarını ve kısayollarını oku"</string>
@@ -63,7 +82,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Widget yüklenirken sorun oluştu"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Kurulum"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Bu bir sistem uygulamasıdır ve yüklemesi kaldırılamaz."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Adsız Klasör"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Adı Düzenle"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> devre dışı"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g> uygulamasının <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> bildirimi var</item>
@@ -77,8 +96,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Yeni adın kaydedilmesi için dokunun"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Klasör kapatıldı"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Klasörün adı <xliff:g id="NAME">%1$s</xliff:g> olarak değiştirildi"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Klasör: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Widget\'lar"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Klasör: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> öğe"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Klasör: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> veya daha fazla öğe"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Duvar Kağıtları"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stiller ve duvar kağıtları"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Ana ekran ayarları"</string>
@@ -92,16 +111,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Bildirim Noktaları\'nı göstermek için <xliff:g id="NAME">%1$s</xliff:g> uygulamasının bildirimlerini açın"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Ayarları değiştir"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Bildirim noktalarını göster"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Ana ekrana simge ekle"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Uygulama simgelerini Ana ekrana ekleyin"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Yeni uygulamalar için"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Bilinmiyor"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Kaldır"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Ara"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Bu uygulama yüklü değil"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Bu simgenin uygulaması yüklü değil. Uygulamayı kaldırabilir veya arayıp manuel olarak yükleyebilirsiniz."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> yükleniyor, <xliff:g id="PROGRESS">%2$s</xliff:g> tamamlandı"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> indiriliyor, <xliff:g id="PROGRESS">%2$s</xliff:g> tamamlandı"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> uygulaması yüklenmek için bekliyor"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> widget\'ları"</string>
     <string name="widgets_list" msgid="796804551140113767">"Widget listesi"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Widget listesi kapalı"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Ana ekrana ekle"</string>
@@ -129,15 +148,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Kısayollar"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Kısayollar ve bildirimler"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Kapat"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Kapat"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Bildirim kapatıldı"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Kişisel"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"İş"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"İş profili"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"İş uygulamalarını burada bulabilirsiniz"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Her iş uygulamasında, uygulama güvenliğinin kuruluşunuz tarafından sağlandığını gösteren bir rozet bulunur. Daha kolay erişim için uygulamaları Ana ekranınıza taşıyın."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Kuruluşunuz tarafından yönetiliyor"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Bildirimler ve uygulamalar kapalı"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Kapat"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Kapalı"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Kişisel veriler ayrı olup iş uygulamalarından gizlenir"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"BT yöneticiniz iş uygulamalarını ve verilerini görebilir"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"İleri"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Anladım"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"İş profili duraklatıldı"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"İş uygulamaları size bildirim gönderemez, pilinizi kullanamaz veya konum bilginize erişemez"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"İş profili duraklatıldı. İş uygulamaları size bildirim gönderemez, pilinizi kullanamaz veya konum bilginize erişemez"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"İş uygulamaları rozetle işaretlenmiş olup BT yöneticisi tarafından görülebilir"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Anladım"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"İş uygulamalarını duraklat"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Aç"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtre"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"İş uygulamalarını ve bildirimlerini duraklatın"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Başarısız: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 69084d7041..d433e2a8ec 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -20,39 +20,58 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="work_folder_name" msgid="3753320833950115786">"Ishga oid"</string>
+    <string name="work_folder_name" msgid="3753320833950115786">"Ish"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Ilova o‘rnatilmadi."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Ilova mavjud emas"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Yuklab olingan ilova xavfsiz rejimda o‘chirib qo‘yildi"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Xavfsiz rejimda vidjetlar o‘chirib qo‘yilgan"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Tezkor tugmadan foydalanib bo‘lmaydi"</string>
-    <string name="home_screen" msgid="806512411299847073">"Bosh ekran"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Maxsus amallar"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Vidjetni tanlash uchun bosib turing."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Ikki marta bosib va bosib turgan holatda vidjetni tanlang yoki maxsus amaldan foydalaning."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Bosh ekran"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Ekranni ikkiga ajratish"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Vidjetni bosib turgan holatda suring."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Ikki marta bosib va bosib turgan holatda vidjetni tanlang yoki maxsus amaldan foydalaning."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Eni %1$d, bo‘yi %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Joylash uchun bosib turing"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Avtomatik chiqarish"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ta vidjet</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> ta vidjet</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> ta yorliq</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> ta yorliq</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Vidjetlar"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Qidiruv"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Qidiruv maydoni matnini tozalash"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Hech qanday vidjet mavjud emas"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Hech narsa topilmadi"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Shaxsiy"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Ish"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Suhbatlar"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Ilovalarni qidirish"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Ilovalar yuklanmoqda…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"“<xliff:g id="QUERY">%1$s</xliff:g>” bilan mos hech qanday ilova topilmadi"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Boshqa ilovalarni qidirish"</string>
     <string name="label_application" msgid="8531721983832654978">"Ilova"</string>
+    <string name="search_corpus_apps" msgid="1917889409963779022">"Ilovalar"</string>
+    <string name="search_action_try_now" msgid="1458737965476149074">"Hoziroq sinang"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Bildirishnomalar"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Yorliqni tanlab olish uchun bosib turing."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Ikki marta bosib va bosib turgan holatda yorliqni tanlang yoki maxsus amaldan foydalaning."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Yorliqni bosib turgan holatda suring."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Ikki marta bosing va yorliqni bosib turgan holatda suring yoki maxsus amaldan foydalaning."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Uy ekranida bitta ham xona yo‘q."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Ajratilganlarda birorta ham xona yo‘q"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Ilovalar ro‘yxati"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Shaxsiy ilovalar ro‘yxati"</string>
-    <string name="all_apps_button_work_label" msgid="7270707118948892488">"Ishchi ilovalar ro‘yxati"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Bosh sahifa"</string>
+    <string name="all_apps_button_work_label" msgid="7270707118948892488">"Ishga oid ilovalar ro‘yxati"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Olib tashlash"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"O‘chirib tashlash"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Ilova haqida"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"O‘rnatish"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Tavsiya qilinmasin"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Tavsiyani mahkamlash"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"yorliqlar yaratish"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Ilovalarga foydalanuvchidan so‘ramasdan yorliqlar qo‘shishga ruxsat beradi."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"Uy sozlamalari va yorliqlarini o‘qish"</string>
@@ -63,7 +82,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Vidjetni yuklashda muammo"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Sozlash"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Bu tizim ilovasi, shuning uchun o‘chirib bo‘lmaydi."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Nomsiz jild"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Nomini tahrirlash"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> ilovasi o‘chirib qo‘yildi"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g> ilovasida <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> ta bildirishnoma bor</item>
@@ -77,8 +96,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"O‘zgarishni saqlash uchun ustiga bosing"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Jild yopildi"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Jild nomi <xliff:g id="NAME">%1$s</xliff:g>ga o‘zgartirildi"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Jild: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Vidjetlar"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Jild: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> fayllar"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Jild: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> va undan ortiq fayllar"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fon rasmlari"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Mavzu va fon rasmlari"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Bosh ekran sozlamalari"</string>
@@ -92,16 +111,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Bildirishnoma belgilarini ko‘rsatish uchun <xliff:g id="NAME">%1$s</xliff:g> ilovasida bildirishnomalarni yoqing"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Sozlamalarni o‘zgartirish"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Bildirishnoma belgilarini chiqarish"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Bosh ekranga ikonka chiqarish"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Ilova ikonkalarini bosh ekranga chiqarish"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Yangi o‘rnatilgan ilovalar ikonkasini bosh ekranga chiqarish"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Noma’lum"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Olib tashlash"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Qidirish"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Ushbu ilova o‘rnatilmagan"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Ilova o‘rnatilmagan. Belgini o‘chirib tashlashingiz yoki ilovani topib, uni qo‘lda o‘rnatishingiz mumkin."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> oʻrnatlmoqda, <xliff:g id="PROGRESS">%2$s</xliff:g> yakunlandi"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> yuklab olinmoqda, <xliff:g id="PROGRESS">%2$s</xliff:g> bajarildi"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> ilovasi o‘rnatilishi kutilmoqda"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> vidjetlari"</string>
     <string name="widgets_list" msgid="796804551140113767">"Vidjetlar ro‘yxati"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Vidjetlar ro‘yxati yopildi"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Bosh ekranga chiqarish"</string>
@@ -129,15 +148,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Tezkor tugmalar"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Yorliqlar va bildirishnomalar"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Yopish"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Yopish"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Bildirishnoma yopildi"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Shaxsiy"</string>
-    <string name="all_apps_work_tab" msgid="4884822796154055118">"Ishchi"</string>
-    <string name="work_profile_toggle_label" msgid="3081029915775481146">"Ishchi profil"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Ishga oid ilovalarni shu yerdan topish mumkin"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Nishonga ega har bir ishga oid ilova tashkilotingiz tomonidan himoyalanadi. Ishga oid ilovalarga osonroq kirish uchun ularni bosh ekranga chiqaring."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Tashkilotingiz tomonidan boshqariladi"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Bildirishnomalar va ilovalar faol emas"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Yopish"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Yopiq"</string>
+    <string name="all_apps_work_tab" msgid="4884822796154055118">"Ish"</string>
+    <string name="work_profile_toggle_label" msgid="3081029915775481146">"Ish profili"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Shaxsiy maʼlumotlar ishga oid ilovalardan alohida va berkitilgan"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Ishga oid ilovalar va maʼlumotlarni AT administratoringiz koʻra oladi"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Keyingisi"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Ish profili pauzada"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Ishga oid ilovalar batareya sarfi haqida bildirishnomalar yubora olmaydi va joylashuv axborotidan foydalana olmaydi"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Ish profili pauzada. Ishga oid ilovalar batareya sarfi haqida bildirishnomalar yubora olmaydi va joylashuv axborotidan foydalana olmaydi"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Ishga oid ilovalar qadalgan va IT administratoringizga koʻrinadi"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Ishga oid ilovalarni pauza qilish"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Yoqish"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Saralash"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Ishga oid ilova va bildirishnomalarni pauza qilish"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Xato: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index e7377440c1..54902f6873 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -20,39 +20,68 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"工作"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"尚未安裝應用程式。"</string>
     <string name="activity_not_available" msgid="7456344436509528827">"目前無法使用這個應用程式"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"在安全模式中無法使用「已下載的應用程式」功能"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"在安全模式中無法使用小工具"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"沒有可用的捷徑"</string>
-    <string name="home_screen" msgid="806512411299847073">"主畫面"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"自訂操作"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"輕觸並按住小工具即可選取。"</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"連扲兩下，然後扲住，就可以新增小工具，或者執行自訂操作。"</string>
+    <!-- no translation found for home_screen (5629429142036709174) -->
+    <skip />
+    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
+    <skip />
+    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
+    <skip />
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d 闊，%2$d 高"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"按住即可手動新增"</string>
     <string name="place_automatically" msgid="8064208734425456485">"自動新增"</string>
+    <!-- no translation found for widgets_count (656794749266073027) -->
+    <!-- no translation found for shortcuts_count (8080294865447938455) -->
+    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
+    <skip />
+    <string name="widget_button_text" msgid="2880537293434387943">"小工具"</string>
+    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
+    <skip />
+    <!-- no translation found for no_widgets_available (9140948620298620513) -->
+    <skip />
+    <!-- no translation found for no_search_results (6518732304311458580) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
+    <skip />
+    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"搜尋應用程式"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"正在載入應用程式…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"找不到與「<xliff:g id="QUERY">%1$s</xliff:g>」相符的應用程式"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"搜尋更多應用程式"</string>
     <string name="label_application" msgid="8531721983832654978">"應用程式"</string>
+    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
+    <skip />
+    <!-- no translation found for search_action_try_now (1458737965476149074) -->
+    <skip />
     <string name="notifications_header" msgid="1404149926117359025">"通知"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"按住捷徑即可選取。"</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"連㩒兩下之後繼續㩒住，就可以揀選捷徑或者用自訂嘅操作。"</string>
+    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
+    <skip />
     <string name="out_of_space" msgid="4691004494942118364">"主畫面已無空間。"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"我的收藏寄存區沒有足夠空間"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"應用程式清單"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"個人應用程式清單"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"工作應用程式清單"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"主畫面"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"移除"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"解除安裝"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"應用程式資料"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"安裝"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"不要提供應用程式建議"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"固定預測"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"安裝捷徑"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"允許應用程式無需使用者許可也可新增捷徑。"</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"讀取主畫面的設定和捷徑"</string>
@@ -63,7 +92,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"載入小工具時發生問題"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"設定"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"這是系統應用程式，無法將其解除安裝。"</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"未命名的資料夾"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"編輯名稱"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」已停用"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g>，有 <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> 項通知</item>
@@ -77,8 +106,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"輕按即可儲存新名稱"</string>
     <string name="folder_closed" msgid="4100806530910930934">"已關閉資料夾"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"資料夾已重新命名為「<xliff:g id="NAME">%1$s</xliff:g>」"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"資料夾：<xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"小工具"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"資料夾：<xliff:g id="NAME">%1$s</xliff:g>，<xliff:g id="SIZE">%2$d</xliff:g> 個項目"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"資料夾：<xliff:g id="NAME">%1$s</xliff:g>，<xliff:g id="SIZE">%2$d</xliff:g> 個或以上的項目"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"桌布"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"樣式和桌布"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"主畫面設定"</string>
@@ -92,16 +121,17 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"如要顯示「通知圓點」，請開啟「<xliff:g id="NAME">%1$s</xliff:g>」的應用程式通知功能"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"變更設定"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"顯示通知圓點"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"將圖示加到主畫面"</string>
-    <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"適用於新安裝的應用程式"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"將應用程式圖示新增至主畫面"</string>
+    <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"新安裝的應用程式"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"不明"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"移除"</string>
     <string name="abandoned_search" msgid="891119232568284442">"搜尋"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"尚未安裝這個應用程式"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"您尚未安裝這個圖示代表的應用程式。您可以移除這個圖示，也可以搜尋該應用程式並手動安裝。"</string>
+    <!-- no translation found for app_installing_title (5864044122733792085) -->
+    <skip />
     <string name="app_downloading_title" msgid="8336702962104482644">"正在下載 <xliff:g id="NAME">%1$s</xliff:g>，已完成 <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"正在等待安裝 <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g>小工具"</string>
     <string name="widgets_list" msgid="796804551140113767">"小工具清單"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"已經關閉嘅小工具清單"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"新增至主畫面"</string>
@@ -129,15 +159,30 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"捷徑"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"捷徑同通知"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"關閉"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"關閉"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"關閉咗通知"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"個人"</string>
-    <string name="all_apps_work_tab" msgid="4884822796154055118">"商務"</string>
+    <string name="all_apps_work_tab" msgid="4884822796154055118">"工作"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"工作設定檔"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"請在此處尋找工作應用程式"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"每個工作應用程式都有一個徽章，並由您的機構負責保持安全。您可以將工作應用程式移至主畫面，以便輕鬆存取。"</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"由您的機構管理"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"通知和應用程式已關閉"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"關閉"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"已關閉"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"個人資料會獨立儲存，並在工作應用程式中隱藏。"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"IT 管理員能看到工作應用程式的資料"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"繼續"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"知道了"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"工作設定檔已暫停使用"</string>
+    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
+    <skip />
+    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
+    <skip />
+    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
+    <skip />
+    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
+    <skip />
+    <string name="work_switch_tip" msgid="808075064383839144">"暫停工作應用程式和通知"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"操作失敗：<xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index e971b69f1f..a594147546 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -20,70 +20,99 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"公司"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"應用程式未安裝。"</string>
     <string name="activity_not_available" msgid="7456344436509528827">"應用程式目前無法使用"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"在安全模式中無法使用「已下載的應用程式」功能"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"在安全模式下無法使用小工具"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"目前無法使用捷徑"</string>
-    <string name="home_screen" msgid="806512411299847073">"主螢幕"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"自訂動作"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"輕觸並按住小工具即可選取。"</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"輕觸兩下並按住小工具即可選取，你也可以使用自訂動作。"</string>
+    <!-- no translation found for home_screen (5629429142036709174) -->
+    <skip />
+    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
+    <skip />
+    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
+    <skip />
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"寬度為 %1$d，高度為 %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"按住圖示即可手動新增"</string>
     <string name="place_automatically" msgid="8064208734425456485">"自動新增"</string>
+    <!-- no translation found for widgets_count (656794749266073027) -->
+    <!-- no translation found for shortcuts_count (8080294865447938455) -->
+    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
+    <skip />
+    <string name="widget_button_text" msgid="2880537293434387943">"小工具"</string>
+    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
+    <skip />
+    <!-- no translation found for no_widgets_available (9140948620298620513) -->
+    <skip />
+    <!-- no translation found for no_search_results (6518732304311458580) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
+    <skip />
+    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"搜尋應用程式"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"正在載入應用程式…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"找不到與「<xliff:g id="QUERY">%1$s</xliff:g>」相符的應用程式"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"搜尋更多應用程式"</string>
     <string name="label_application" msgid="8531721983832654978">"應用程式"</string>
+    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
+    <skip />
+    <!-- no translation found for search_action_try_now (1458737965476149074) -->
+    <skip />
     <string name="notifications_header" msgid="1404149926117359025">"通知"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"按住捷徑即可選取。"</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"輕觸兩下並按住捷徑即可選取，你也可以使用自訂動作。"</string>
-    <string name="out_of_space" msgid="4691004494942118364">"這個主螢幕已無空間。"</string>
+    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
+    <skip />
+    <string name="out_of_space" msgid="4691004494942118364">"這個主畫面已無空間。"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"「我的最愛」匣已無可用空間"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"應用程式清單"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"個人應用程式清單"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"辦公應用程式清單"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"主螢幕"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"移除"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"解除安裝"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"應用程式資訊"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"安裝"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"不要提供應用程式建議"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"固定預測的應用程式"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"安裝捷徑"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"允許應用程式自動新增捷徑。"</string>
-    <string name="permlab_read_settings" msgid="1941457408239617576">"讀取主螢幕的設定和捷徑"</string>
-    <string name="permdesc_read_settings" msgid="5833423719057558387">"允許應用程式讀取主螢幕中的設定和捷徑。"</string>
-    <string name="permlab_write_settings" msgid="3574213698004620587">"寫入主螢幕設定和捷徑"</string>
-    <string name="permdesc_write_settings" msgid="5440712911516509985">"允許應用程式變更主螢幕中的設定和捷徑。"</string>
+    <string name="permlab_read_settings" msgid="1941457408239617576">"讀取主畫面的設定和捷徑"</string>
+    <string name="permdesc_read_settings" msgid="5833423719057558387">"允許應用程式讀取主畫面中的設定和捷徑。"</string>
+    <string name="permlab_write_settings" msgid="3574213698004620587">"寫入主畫面設定和捷徑"</string>
+    <string name="permdesc_write_settings" msgid="5440712911516509985">"允許應用程式變更主畫面中的設定和捷徑。"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> 無法撥打電話"</string>
     <string name="gadget_error_text" msgid="6081085226050792095">"載入小工具時發生問題"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"設定"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"這是系統應用程式，不可解除安裝。"</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"未命名的資料夾"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"編輯名稱"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"已停用 <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g>，有 <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> 則通知</item>
       <item quantity="one"><xliff:g id="APP_NAME_0">%1$s</xliff:g>，有 <xliff:g id="NOTIFICATION_COUNT_1">%2$d</xliff:g> 則通知</item>
     </plurals>
     <string name="default_scroll_format" msgid="7475544710230993317">"第 %1$d 頁，共 %2$d 頁"</string>
-    <string name="workspace_scroll_format" msgid="8458889198184077399">"主螢幕：第 %1$d 頁，共 %2$d 頁"</string>
+    <string name="workspace_scroll_format" msgid="8458889198184077399">"主畫面：第 %1$d 頁，共 %2$d 頁"</string>
     <string name="workspace_new_page" msgid="257366611030256142">"新的主畫面頁面"</string>
     <string name="folder_opened" msgid="94695026776264709">"資料夾已開啟 (<xliff:g id="WIDTH">%1$d</xliff:g> x <xliff:g id="HEIGHT">%2$d</xliff:g>)"</string>
     <string name="folder_tap_to_close" msgid="4625795376335528256">"輕觸即可關閉資料夾"</string>
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"輕觸即可儲存新名稱"</string>
     <string name="folder_closed" msgid="4100806530910930934">"資料夾已關閉"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"已將資料夾重新命名為「<xliff:g id="NAME">%1$s</xliff:g>」"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"資料夾：<xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"小工具"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"資料夾：<xliff:g id="NAME">%1$s</xliff:g>，<xliff:g id="SIZE">%2$d</xliff:g> 個項目"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"資料夾：<xliff:g id="NAME">%1$s</xliff:g>，<xliff:g id="SIZE">%2$d</xliff:g> 個以上的項目"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"桌布"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"樣式和桌布"</string>
-    <string name="settings_button_text" msgid="8873672322605444408">"主螢幕設定"</string>
+    <string name="settings_button_text" msgid="8873672322605444408">"主畫面設定"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"已由你的管理員停用"</string>
-    <string name="allow_rotation_title" msgid="7728578836261442095">"允許旋轉主螢幕"</string>
+    <string name="allow_rotation_title" msgid="7728578836261442095">"允許旋轉主畫面"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"當手機旋轉時"</string>
     <string name="notification_dots_title" msgid="9062440428204120317">"通知圓點"</string>
     <string name="notification_dots_desc_on" msgid="1679848116452218908">"開啟"</string>
@@ -92,16 +121,17 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"如要顯示通知圓點，請開啟「<xliff:g id="NAME">%1$s</xliff:g>」的應用程式通知功能"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"變更設定"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"顯示通知圓點"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"將圖示加到主螢幕"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"將應用程式圖示新增到主畫面"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"適用於新安裝的應用程式"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"不明"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"移除"</string>
     <string name="abandoned_search" msgid="891119232568284442">"搜尋"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"尚未安裝這個應用程式"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"你尚未安裝這個圖示代表的應用程式。你可以移除這個圖示，也可以搜尋該應用程式並手動安裝。"</string>
+    <!-- no translation found for app_installing_title (5864044122733792085) -->
+    <skip />
     <string name="app_downloading_title" msgid="8336702962104482644">"正在下載「<xliff:g id="NAME">%1$s</xliff:g>」，已完成 <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"正在等待安裝「<xliff:g id="NAME">%1$s</xliff:g>」"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"「<xliff:g id="NAME">%1$s</xliff:g>」小工具"</string>
     <string name="widgets_list" msgid="796804551140113767">"小工具清單"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"已關閉小工具清單"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"新增至主畫面"</string>
@@ -129,15 +159,30 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"捷徑"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"捷徑和通知"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"關閉"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"關閉"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"已關閉通知"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"個人"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"公司"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"工作資料夾"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"在這裡尋找辦公應用程式"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"每個辦公應用程式都有徽章，並由貴機構負責管理及確保其安全。請將辦公應用程式移至主螢幕以便輕鬆存取。"</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"由貴機構所管理"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"已關閉通知和應用程式"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"關閉"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"已關閉"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"系統會區隔個人資料與工作資料，因此兩者不會同時顯示"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"你的 IT 管理員可以查看工作應用程式和工作資料"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"繼續"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"我知道了"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"工作資料夾已暫停"</string>
+    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
+    <skip />
+    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
+    <skip />
+    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
+    <skip />
+    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
+    <skip />
+    <string name="work_switch_tip" msgid="808075064383839144">"暫停工作應用程式和通知"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"失敗：<xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index b937764ace..fc84846683 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -26,32 +26,52 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Uhlelo lokusebenza olulandiwe lukhutshaziwe kumodi ephephile"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Amawijethi akhutshaziwe kwimodi yokuphepha"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Isinqamuleli asitholakali"</string>
-    <string name="home_screen" msgid="806512411299847073">"Isikrini sasekhaya"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Izenzo zangokwezifiso"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Thinta uphinde ubambe ukuze uphakamise iwijethi."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Thepha kabili bese uyabamba ukuze uthathe iwijethi noma sebenzisa izenzo ezingokwezifiso."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Ikhaya"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Hlukanisa isikrini"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Thinta uphinde ubambe ukuze uhambise iwijethi."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Thepha kabili uphinde ubambe ukuze uhambise iwijethi noma usebenzise izindlela ezingokwezifiso."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ububanzi ngokungu-%2$d ukuya phezulu"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Thinta futhi ubambe ukuze ubeke ngokwenza"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Engeza ngokuzenzakalelayo"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="one">Amawijethi angu-<xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
+      <item quantity="other">Amawijethi angu-<xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="one">Izinqamuleli ezingu-<xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g></item>
+      <item quantity="other">Izinqamuleli ezingu-<xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g></item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Amawijethi"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Sesha"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Sula umbhalo ovela ebhokisini lokusesha"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Awekho amawijethi atholakalayo"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Ayikho imiphumela yosesho"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Okomuntu siqu"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Umsebenzi"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Izingxoxo"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Sesha izinhlelo zokusebenza"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Ilayisha izinhlelo zokusebenza..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Azikho izinhlelo zokusebenza ezitholiwe ezifana ne-\"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Sesha izinhlelo zokusebenza eziningi"</string>
     <string name="label_application" msgid="8531721983832654978">"Uhlelo lokusebenza"</string>
+    <string name="search_corpus_apps" msgid="1917889409963779022">"Ama-app"</string>
+    <string name="search_action_try_now" msgid="1458737965476149074">"Zama manje"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Izaziso"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Thinta futhi ubambe ukuze ukhethe isinqamuleli."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Thepha kabili uphinde ubambe ukuze uphakamise isinqamuleli noma usebenzise izenzo zangokwezifiso."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Thinta uphinde ubambe ukuze uhambise isinqamuleli."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Thepha kabili uphinde ubambe ukuze uhambise isinqamuleli noma usebenzise izenzo ezingokwezifiso."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Asisekho isikhala kulesi sikrini Sasekhaya."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Asisekho isikhala kwitreyi lezintandokazi"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Uhlu lwezinhlelo zokusebenza"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Uhlu lwezinhlelo zokusebenza zomuntu siqu"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Uhlu lwezinhlelo zokusebenza zomsebenzi"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Ikhaya"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Susa"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Khipha"</string>
-    <string name="app_info_drop_target_label" msgid="692894985365717661">"Ulwazi lohlelo lokusebenza"</string>
+    <string name="app_info_drop_target_label" msgid="692894985365717661">"Ulwazi nge-app"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Faka"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Ungaphakamisi uhlelo lokusebenza"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Ukubikezela Iphinikhodi"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"faka izinqamuleli"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Ivumela uhlelo lokusebenza ukufaka izinqamuleli ngaphandle kokungenelela komsebenzisi."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"funda izilungiselelo zokuthi Ikhaya nezinqamuleli"</string>
@@ -62,7 +82,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Inkinga yokulayisha iwijethi"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Ukumisa"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Lolu uhlelo lokusebenza lwesistimu futhi alikwazi ukukhishwa."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Ifolda engenagama"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Hlela igama"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Kukhutshaziwe <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="one"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, unezaziso ezingu-<xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g></item>
@@ -76,8 +96,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Thepha ukuze ulondoloze ukuqamba kabusha"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Ifolda ivaliwe"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Ifolda iqanjwe kabusha ngo-<xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Ifolda: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Amawijethi"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Ifolda: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> izinto"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Ifolda: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> noma izinto eziningi"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Izithombe zangemuva"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Izitayela nezithombe zangemuva"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Izilungiselelo zasekhaya"</string>
@@ -91,16 +111,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Ukuze ubonisa amcashazi esaziso, vula izaziso zohlelo lokusebenza ze-<xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Shintsha izilungiselelo"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Bonisa amacashazi esaziso"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Engeza isithonjana eskrinini sasekhaya"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Engeza izithonjana zohlelo lokusebenza kusikrini sasekhaya"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Kwezinhlelo zokusebenza ezintsha"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Akwaziwa"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Susa"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Sesha"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Lolu hlelo lokusebenza alifakiwe"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Uhlelo lokusebenza lalesi sithonjana alufakiwe. Ungalisusa, noma sesha uhlelo lokusebenza bese uzifakela lona ngokuzenzela."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"I-<xliff:g id="NAME">%1$s</xliff:g> iyafakwa, seyiqede <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"I-<xliff:g id="NAME">%1$s</xliff:g> iyalandwa, <xliff:g id="PROGRESS">%2$s</xliff:g> kuqediwe"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> ilinde ukufakwa"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> amawijethi"</string>
     <string name="widgets_list" msgid="796804551140113767">"Uhlu lwamawijethi"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Uhlu lwamawijethi luvaliwe"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Faka kusikrini sasekhaya"</string>
@@ -128,15 +148,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Izinqamuleli"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Izinqamuleli nezaziso"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Cashisa"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Vala"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Isaziso sicashisiwe"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Okomuntu siqu"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Umsebenzi"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Iphrofayela yomsebenzi"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Thola izinhlelo zokusebenza lapha"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Uhlo lokusebenza ngalunye lomsebenzi linebheji futhi igcinwa iphephile inhlangano yakho. Hambisa izinhlelo zokusebenza esikrinini sakho sasekhaya ngokufinyelela okulula."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Kuphethwe inhlangano yakho"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Izaziso nezinhlelo zokusebenza kuvaliwe"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Vala"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Kuvaliwe"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Idatha yomuntu siqu yehlukile futhi ifihliwe kusuka kuzinhlelo zokusebenza zomsebenzi"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Izinhlelo zokusebenza zomsebenzi nedatha kuyobonakala kumphathi wakho we-IT"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Okulandelayo"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Ngiyezwa"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Iphrofayela yomsebenzi iphunyuziwe"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Ama-app omsebenzi awakwazi ukukuthumela izaziso, ukusebenzisa ibhethri lakho, noma ukufinyelela indawo yakho"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Iphrofayela yomsebenzi iphunyuziwe. Ama-app omsebenzi awakwazi ukukuthumela izaziso, ukusebenzisa ibhethri lakho, noma ukufinyelela indawo yakho"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Ama-app omsebenzi anebheji futhi ayabonakala kumphathi wakho we-IT"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Ngiyezwa"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Misa ama-app omsebenzi"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Vula"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Hlunga"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Phumuza izinhlelo zokusebenza zomsebenzi nezaziso"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Yehlulekile: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
-- 
GitLab


From 23a76dae18c9120247146af7906a14632a366e6d Mon Sep 17 00:00:00 2001
From: Jon Spivack <spivack@google.com>
Date: Wed, 14 Apr 2021 18:46:32 -0700
Subject: [PATCH 0884/1664] Go Launcher: Update Overview Actions buttons

This updates the layout of the overview buttons to better match more recent UX mocks. It also restores the buttons' captions, which had gone missing.

Bug: 183448909
Test: Manual (verified on Wembley and Sargo)
Change-Id: I931df92cd0d255289168694d4a950649eec7da75
---
 .../res/layout/overview_actions_container.xml | 49 ++++++++++++-------
 go/quickstep/res/values/styles.xml            | 26 ++++++++++
 2 files changed, 56 insertions(+), 19 deletions(-)
 create mode 100644 go/quickstep/res/values/styles.xml

diff --git a/go/quickstep/res/layout/overview_actions_container.xml b/go/quickstep/res/layout/overview_actions_container.xml
index 866eac6e51..4aa77744aa 100644
--- a/go/quickstep/res/layout/overview_actions_container.xml
+++ b/go/quickstep/res/layout/overview_actions_container.xml
@@ -24,8 +24,8 @@
     <LinearLayout
         android:id="@+id/action_buttons"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/overview_actions_height"
-        android:layout_gravity="bottom|center_horizontal"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
         android:orientation="horizontal">
 
         <Space
@@ -33,19 +33,9 @@
             android:layout_height="1dp"
             android:layout_weight="1" />
 
-        <Button
-            android:id="@+id/action_listen"
-            style="@style/OverviewActionButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawableTop="@drawable/ic_listen"
-            android:drawablePadding="1dp"
-            android:text="@string/action_listen"
-            android:theme="@style/ThemeControlHighlightWorkspaceColor" />
-
         <Button
             android:id="@+id/action_translate"
-            style="@style/OverviewActionButton"
+            style="@style/GoOverviewActionButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:drawableTop="@drawable/ic_translate"
@@ -53,19 +43,29 @@
             android:text="@string/action_translate"
             android:theme="@style/ThemeControlHighlightWorkspaceColor" />
 
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
+
         <Button
-            android:id="@+id/action_search"
-            style="@style/OverviewActionButton"
+            android:id="@+id/action_listen"
+            style="@style/GoOverviewActionButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:drawableTop="@drawable/ic_search"
+            android:drawableTop="@drawable/ic_listen"
             android:drawablePadding="1dp"
-            android:text="@string/action_search"
+            android:text="@string/action_listen"
             android:theme="@style/ThemeControlHighlightWorkspaceColor" />
 
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
+
         <Button
             android:id="@+id/action_screenshot"
-            style="@style/OverviewActionButton"
+            style="@style/GoOverviewActionButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:drawableTop="@drawable/ic_screenshot"
@@ -78,9 +78,20 @@
             android:layout_height="1dp"
             android:layout_weight="1" />
 
+        <Button
+            android:id="@+id/action_search"
+            style="@style/GoOverviewActionButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableTop="@drawable/ic_search"
+            android:drawablePadding="1dp"
+            android:text="@string/action_search"
+            android:theme="@style/ThemeControlHighlightWorkspaceColor"
+            android:visibility="gone" />
+
         <Button
             android:id="@+id/action_share"
-            style="@style/OverviewActionButton"
+            style="@style/GoOverviewActionButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:drawableStart="@drawable/ic_share"
diff --git a/go/quickstep/res/values/styles.xml b/go/quickstep/res/values/styles.xml
new file mode 100644
index 0000000000..927c49aa05
--- /dev/null
+++ b/go/quickstep/res/values/styles.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <style name="GoOverviewActionButton"
+        parent="@android:style/Widget.DeviceDefault.Button">
+        <item name="android:textColor">@color/overview_button</item>
+        <item name="android:drawableTint">@color/overview_button</item>
+        <item name="android:tint">?android:attr/textColorPrimary</item>
+        <item name="android:drawablePadding">8dp</item>
+        <item name="android:textAllCaps">false</item>
+    </style>
+</resources>
\ No newline at end of file
-- 
GitLab


From 08f3d4d675b211b3b1bb4f95192bce15735dd5b0 Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Thu, 15 Apr 2021 01:50:02 +0000
Subject: [PATCH 0885/1664] Revert "Make RotationTouchHelper singleton to
 report single rotation state"

This reverts commit d8ad6b25f4a9c7ab156268a2a505d1c1c26ef74e.

Reason for revert: b/185382799, b/185383656

Change-Id: Ie500fd5c4f2937df56fbd8afe5556f1a71b90d87
---
 .../android/quickstep/RecentsAnimationDeviceState.java   | 2 +-
 .../src/com/android/quickstep/RotationTouchHelper.java   | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index 4a191e16e7..23e35f6307 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -138,7 +138,7 @@ public class RecentsAnimationDeviceState implements
         mDisplayId = mDisplayHolder.getInfo().id;
         mIsOneHandedModeSupported = SystemProperties.getBoolean(SUPPORT_ONE_HANDED_MODE, false);
         runOnDestroy(() -> mDisplayHolder.removeChangeListener(this));
-        mRotationTouchHelper = RotationTouchHelper.INSTANCE.get(context);
+        mRotationTouchHelper = new RotationTouchHelper(context, mDisplayHolder);
         runOnDestroy(mRotationTouchHelper::destroy);
 
         // Register for user unlocked if necessary
diff --git a/quickstep/src/com/android/quickstep/RotationTouchHelper.java b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
index 1155482d37..2cf32122cf 100644
--- a/quickstep/src/com/android/quickstep/RotationTouchHelper.java
+++ b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
@@ -28,11 +28,9 @@ import android.view.MotionEvent;
 import android.view.OrientationEventListener;
 
 import com.android.launcher3.testing.TestProtocol;
-import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.DisplayController.DisplayHolder;
 import com.android.launcher3.util.DisplayController.DisplayInfoChangeListener;
 import com.android.launcher3.util.DisplayController.Info;
-import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.quickstep.util.RecentsOrientedState;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.QuickStepContract;
@@ -45,9 +43,6 @@ public class RotationTouchHelper implements
         SysUINavigationMode.NavigationModeChangeListener,
         DisplayInfoChangeListener {
 
-    public static final MainThreadInitializedObject<RotationTouchHelper> INSTANCE =
-            new MainThreadInitializedObject<>(RotationTouchHelper::new);
-
     private final OrientationTouchTransformer mOrientationTouchTransformer;
     private final DisplayHolder mDisplayHolder;
     private final SysUINavigationMode mSysUiNavMode;
@@ -126,9 +121,9 @@ public class RotationTouchHelper implements
 
     private final Context mContext;
 
-    private RotationTouchHelper(Context context) {
+    public RotationTouchHelper(Context context, DisplayHolder displayHolder) {
         mContext = context;
-        mDisplayHolder = DisplayController.getDefaultDisplay(context);
+        mDisplayHolder = displayHolder;
         Resources resources = mContext.getResources();
         mSysUiNavMode = SysUINavigationMode.INSTANCE.get(context);
         mDisplayId = mDisplayHolder.getInfo().id;
-- 
GitLab


From 8d8383ab40f04c10df88c2f2e898aa43f8b173cd Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 14 Apr 2021 23:52:05 -0700
Subject: [PATCH 0886/1664] Add logs to verify receiver is unregistered

Bug: 185385047
Test: Adding logs
Change-Id: I0ab5a819902bfa4e836f59e854c53f70c4ca877b
---
 src/com/android/launcher3/testing/TestProtocol.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java
index 943d129047..fdd7fc4817 100644
--- a/src/com/android/launcher3/testing/TestProtocol.java
+++ b/src/com/android/launcher3/testing/TestProtocol.java
@@ -109,6 +109,7 @@ public final class TestProtocol {
     public static final String REQUEST_MOCK_SENSOR_ROTATION = "mock-sensor-rotation";
 
     public static final String PERMANENT_DIAG_TAG = "TaplTarget";
+    public static final String RECEIVER_LEAK = "b/185385047";
     public static final String NO_SWIPE_TO_HOME = "b/158017601";
     public static final String WORK_PROFILE_REMOVED = "b/159671700";
     public static final String TIS_NO_EVENTS = "b/180915942";
-- 
GitLab


From f4cf80ea739d92bb86408f77ee7483e49d0e6e37 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Wed, 7 Apr 2021 15:38:34 +0100
Subject: [PATCH 0887/1664] Handle swipe up after quick switch in overview grid

- If swipe up after task launches, move the task to be the first and focused it
- If swipe up before task launches, make sure the task can be sanpped to by moving ClearAllButton further away
- Before snapping to page on swipe up, make sure scroll calculation is up to date and consider the target gesture state
- Removed home task special casing in fallback recents, as the snapped page logic handles invariant scroll generically
- Invoke reset when launching home in fallback recents

Bug: 175939487
Fixes: 184262404
Fixes: 185468049
Test: Manual
Change-Id: I5a6c581f15cd62748cfe6c77342d959f4dd1bfaf
---
 .../android/quickstep/AbsSwipeUpHandler.java  |   3 +
 .../fallback/FallbackRecentsView.java         |  19 +-
 .../quickstep/views/ClearAllButton.java       |   6 +-
 .../android/quickstep/views/RecentsView.java  | 291 +++++++++++-------
 .../com/android/quickstep/views/TaskView.java |  29 +-
 5 files changed, 225 insertions(+), 123 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 2a903eb9fc..654f5de5d1 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -968,6 +968,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
             if (mRecentsView != null) {
                 int nearestPage = mRecentsView.getDestinationPage();
                 boolean isScrolling = false;
+                // Update page scroll before snapping to page to make sure we snapped to the
+                // position calculated with target gesture in mind.
+                mRecentsView.updateScrollSynchronously();
                 if (mRecentsView.getNextPage() != nearestPage) {
                     // We shouldn't really scroll to the next page when swiping up to recents.
                     // Only allow settling on the next page if it's nearest to the center.
diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
index 854a140d71..4d4b6e1467 100644
--- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
+++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
@@ -17,6 +17,7 @@ package com.android.quickstep.fallback;
 
 import static com.android.quickstep.GestureState.GestureEndTarget.RECENTS;
 import static com.android.quickstep.fallback.RecentsState.DEFAULT;
+import static com.android.quickstep.fallback.RecentsState.HOME;
 import static com.android.quickstep.fallback.RecentsState.MODAL_TASK;
 
 import android.annotation.TargetApi;
@@ -97,6 +98,15 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity, RecentsSta
         }
     }
 
+    @Override
+    public void onGestureAnimationEnd() {
+        if (mCurrentGestureEndTarget == GestureState.GestureEndTarget.HOME) {
+            // Clean-up logic that occurs when recents is no longer in use/visible.
+            reset();
+        }
+        super.onGestureAnimationEnd();
+    }
+
     @Override
     public void setCurrentTask(int runningTaskId) {
         super.setCurrentTask(runningTaskId);
@@ -155,11 +165,6 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity, RecentsSta
         super.setRunningTaskHidden(isHidden);
     }
 
-    @Override
-    protected boolean isHomeTask(TaskView taskView) {
-        return mHomeTaskInfo != null && taskView.hasTaskId(mHomeTaskInfo.taskId);
-    }
-
     @Override
     public void setModalStateEnabled(boolean isModalState) {
         super.setModalStateEnabled(isModalState);
@@ -182,6 +187,10 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity, RecentsSta
 
     @Override
     public void onStateTransitionComplete(RecentsState finalState) {
+        if (finalState == HOME) {
+            // Clean-up logic that occurs when recents is no longer in use/visible.
+            reset();
+        }
         setOverlayEnabled(finalState == DEFAULT || finalState == MODAL_TASK);
         setFreezeViewVisibility(false);
     }
diff --git a/quickstep/src/com/android/quickstep/views/ClearAllButton.java b/quickstep/src/com/android/quickstep/views/ClearAllButton.java
index 4300329671..b9a90062b7 100644
--- a/quickstep/src/com/android/quickstep/views/ClearAllButton.java
+++ b/quickstep/src/com/android/quickstep/views/ClearAllButton.java
@@ -97,7 +97,7 @@ public class ClearAllButton extends Button {
         }
     }
 
-    public void onRecentsViewScroll(int scrollFromEdge, boolean gridEnabled) {
+    public void onRecentsViewScroll(int scroll, boolean gridEnabled) {
         RecentsView recentsView = getRecentsView();
         if (recentsView == null) {
             return;
@@ -109,8 +109,8 @@ public class ClearAllButton extends Button {
             return;
         }
 
-        int leftEdgeScroll = recentsView.getLeftMostChildScroll();
-        int adjustedScrollFromEdge = scrollFromEdge - leftEdgeScroll;
+        int clearAllScroll = recentsView.getClearAllScroll();
+        int adjustedScrollFromEdge = Math.abs(scroll - clearAllScroll);
         float shift = Math.min(adjustedScrollFromEdge, orientationSize);
         mNormalTranslationPrimary = mIsRtl ? -shift : shift;
         if (!gridEnabled) {
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 524bae160e..f8b35858af 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -353,7 +353,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     private float mGridProgress = 0;
 
     // The GestureEndTarget that is still in progress.
-    private GestureState.GestureEndTarget mCurrentGestureEndTarget;
+    protected GestureState.GestureEndTarget mCurrentGestureEndTarget;
 
     IntSet mTopIdSet = new IntSet();
 
@@ -823,9 +823,9 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
 
     private boolean isTaskViewWithinBounds(TaskView tv, int start, int end) {
         int taskStart = mOrientationHandler.getChildStart(tv) + (int) tv.getOffsetAdjustment(
-                mOverviewFullscreenEnabled, showAsGrid());
+                showAsFullscreen(), showAsGrid());
         int taskSize = (int) (mOrientationHandler.getMeasuredSize(tv) * tv.getSizeAdjustment(
-                mOverviewFullscreenEnabled));
+                showAsFullscreen()));
         int taskEnd = taskStart + taskSize;
         return (taskStart >= start && taskStart <= end) || (taskEnd >= start
                 && taskEnd <= end);
@@ -1199,16 +1199,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
 
         float accumulatedTranslationX = 0;
         float[] fullscreenTranslations = new float[taskCount];
-        int firstNonHomeTaskIndex = 0;
         for (int i = 0; i < taskCount; i++) {
             TaskView taskView = getTaskViewAt(i);
-            if (isHomeTask(taskView)) {
-                if (firstNonHomeTaskIndex == i) {
-                    firstNonHomeTaskIndex++;
-                }
-                continue;
-            }
-
             taskView.updateTaskSize();
             fullscreenTranslations[i] += accumulatedTranslationX;
             // Compensate space caused by TaskView scaling.
@@ -1220,16 +1212,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             accumulatedTranslationX += fullscreenTranslationX;
         }
 
-        // We need to maintain first non-home task's full screen translation at 0, now shift
-        // translation of all the TaskViews to achieve that.
-        for (int i = firstNonHomeTaskIndex; i < taskCount; i++) {
-            getTaskViewAt(i).setFullscreenTranslationX(
-                    fullscreenTranslations[i] - fullscreenTranslations[firstNonHomeTaskIndex]);
+        for (int i = 0; i < taskCount; i++) {
+            getTaskViewAt(i).setFullscreenTranslationX(fullscreenTranslations[i]);
         }
-        mClearAllButton.setFullscreenTranslationPrimary(
-                accumulatedTranslationX - fullscreenTranslations[firstNonHomeTaskIndex]);
+        mClearAllButton.setFullscreenTranslationPrimary(accumulatedTranslationX);
 
-        updateGridProperties(false);
+        updateGridProperties(/*isTaskDismissal=*/false);
     }
 
     public void getTaskSize(Rect outRect) {
@@ -1316,13 +1304,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             return;
         }
         int scroll = mOrientationHandler.getPrimaryScroll(this);
-        int scrollFromEdge = mIsRtl ? scroll : (mMaxScroll - scroll);
-        mClearAllButton.onRecentsViewScroll(scrollFromEdge, mOverviewGridEnabled);
+        mClearAllButton.onRecentsViewScroll(scroll, mOverviewGridEnabled);
     }
 
     @Override
     protected int getDestinationPage(int scaledScroll) {
-        if (!showAsGrid()) {
+        if (!(mActivity.getDeviceProfile().isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get())) {
             return super.getDestinationPage(scaledScroll);
         }
 
@@ -1331,8 +1318,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             return -1;
         }
 
-        // When in grid, return the page which scroll is closest to screenStart instead of page
-        // nearest to center of screen.
+        // When in tablet with variable task width, return the page which scroll is closest to
+        // screenStart instead of page nearest to center of screen.
         int minDistanceFromScreenStart = Integer.MAX_VALUE;
         int minDistanceFromScreenStartIndex = -1;
         for (int i = 0; i < childCount; ++i) {
@@ -1583,10 +1570,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
      */
     public void onGestureEndTargetCalculated(GestureState.GestureEndTarget endTarget) {
         mCurrentGestureEndTarget = endTarget;
-        if (showAsGrid()) {
-            mFocusedTaskId = mRunningTaskId;
-            mFocusedTaskRatio =
-                    mLastComputedTaskSize.width() / (float) mLastComputedTaskSize.height();
+        if (endTarget == GestureState.GestureEndTarget.NEW_TASK
+                || endTarget == GestureState.GestureEndTarget.LAST_TASK) {
+            // When switching to tasks in quick switch, ensures the snapped page's scroll maintain
+            // invariant between quick switch and overview grid, to ensure a smooth animation
+            // transition.
+            updateGridProperties(/*isTaskDismissal=*/false);
         }
     }
 
@@ -1650,7 +1639,11 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         }
 
         boolean runningTaskTileHidden = mRunningTaskTileHidden;
-        setCurrentTask(runningTaskInfo == null ? -1 : runningTaskInfo.taskId);
+        int runningTaskId = runningTaskInfo == null ? -1 : runningTaskInfo.taskId;
+        setCurrentTask(runningTaskId);
+        if (mActivity.getDeviceProfile().isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get()) {
+            setFocusedTask(runningTaskId);
+        }
         setCurrentPage(getRunningTaskIndex());
         setRunningTaskViewShowScreenshot(false);
         setRunningTaskHidden(runningTaskTileHidden);
@@ -1663,7 +1656,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
 
     /**
      * Sets the running task id, cleaning up the old running task if necessary.
-     * @param runningTaskId
      */
     public void setCurrentTask(int runningTaskId) {
         if (mRunningTaskId == runningTaskId) {
@@ -1679,6 +1671,15 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         mRunningTaskId = runningTaskId;
     }
 
+    /**
+     * Sets the focused task id and store the width to height ratio of the focused task.
+     */
+    protected void setFocusedTask(int focusedTaskId) {
+        mFocusedTaskId = focusedTaskId;
+        mFocusedTaskRatio =
+                mLastComputedTaskSize.width() / (float) mLastComputedTaskSize.height();
+    }
+
     /**
      * Hides the tile associated with {@link #mRunningTaskId}
      */
@@ -1773,74 +1774,115 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         IntSet topSet = new IntSet();
         IntSet bottomSet = new IntSet();
         float[] gridTranslations = new float[taskCount];
-        int firstNonHomeTaskIndex = 0;
+
+        int focusedTaskIndex = Integer.MAX_VALUE;
+        int focusedTaskShift = 0;
+        int focusedTaskWidthAndSpacing = 0;
+        int snappedTaskRowWidth = 0;
+        int snappedPage = getNextPage();
+        TaskView snappedTaskView = getTaskViewAtByAbsoluteIndex(snappedPage);
 
         if (!isTaskDismissal) {
             mTopIdSet.clear();
         }
         for (int i = 0; i < taskCount; i++) {
             TaskView taskView = getTaskViewAt(i);
-            if (isHomeTask(taskView)) {
-                if (firstNonHomeTaskIndex == i) {
-                    firstNonHomeTaskIndex++;
-                }
-                continue;
-            }
-
+            int taskWidthAndSpacing = taskView.getLayoutParams().width + mPageSpacing;
             // Evenly distribute tasks between rows unless rearranging due to task dismissal, in
             // which case keep tasks in their respective rows. For the running task, don't join
             // the grid.
-            if (taskView.isRunningTask()) {
-                topRowWidth += taskView.getLayoutParams().width + mPageSpacing;
-                bottomRowWidth += taskView.getLayoutParams().width + mPageSpacing;
+            if (taskView.isFocusedTask()) {
+                topRowWidth += taskWidthAndSpacing;
+                bottomRowWidth += taskWidthAndSpacing;
+
+                focusedTaskIndex = i;
+                focusedTaskWidthAndSpacing = taskWidthAndSpacing;
+                gridTranslations[i] += focusedTaskShift;
+                gridTranslations[i] += mIsRtl ? taskWidthAndSpacing : -taskWidthAndSpacing;
 
                 // Center view vertically in case it's from different orientation.
                 taskView.setGridTranslationY((mLastComputedTaskSize.height() + taskTopMargin
                         - taskView.getLayoutParams().height) / 2f);
-            } else if ((!isTaskDismissal && topRowWidth <= bottomRowWidth) || (isTaskDismissal
-                        && mTopIdSet.contains(taskView.getTask().key.id))) {
-                gridTranslations[i] += topAccumulatedTranslationX;
-                topRowWidth += taskView.getLayoutParams().width + mPageSpacing;
-                topSet.add(i);
-                mTopIdSet.add(taskView.getTask().key.id);
-
-                taskView.setGridTranslationY(taskGridVerticalDiff);
-
-                // Move horizontally into empty space.
-                float widthOffset = 0;
-                for (int j = i - 1; bottomSet.contains(j); j--) {
-                    widthOffset += getTaskViewAt(j).getLayoutParams().width + mPageSpacing;
-                }
 
-                float gridTranslationX = mIsRtl ? widthOffset : -widthOffset;
-                gridTranslations[i] += gridTranslationX;
-                topAccumulatedTranslationX += gridTranslationX;
+                if (taskView == snappedTaskView) {
+                    // If focused task is snapped, the row width is just task width and spacing.
+                    snappedTaskRowWidth = taskWidthAndSpacing;
+                }
             } else {
-                gridTranslations[i] += bottomAccumulatedTranslationX;
-                bottomRowWidth += taskView.getLayoutParams().width + mPageSpacing;
-                bottomSet.add(i);
+                if (i > focusedTaskIndex) {
+                    // For tasks after the focused task, shift by focused task's width and spacing.
+                    gridTranslations[i] +=
+                            mIsRtl ? focusedTaskWidthAndSpacing : -focusedTaskWidthAndSpacing;
+                } else {
+                    // For task before the focused task, accumulate the width and spacing to
+                    // calculate the distance focused task need to shift.
+                    focusedTaskShift += mIsRtl ? taskWidthAndSpacing : -taskWidthAndSpacing;
+                }
+                boolean isTopRow = isTaskDismissal ? mTopIdSet.contains(taskView.getTask().key.id)
+                        : topRowWidth <= bottomRowWidth;
+                if (isTopRow) {
+                    gridTranslations[i] += topAccumulatedTranslationX;
+                    topRowWidth += taskWidthAndSpacing;
+                    topSet.add(i);
+                    mTopIdSet.add(taskView.getTask().key.id);
+
+                    taskView.setGridTranslationY(taskGridVerticalDiff);
+
+                    // Move horizontally into empty space.
+                    float widthOffset = 0;
+                    for (int j = i - 1; !topSet.contains(j) && j >= 0; j--) {
+                        if (j == focusedTaskIndex) {
+                            continue;
+                        }
+                        widthOffset += getTaskViewAt(j).getLayoutParams().width + mPageSpacing;
+                    }
 
-                // Move into bottom row.
-                taskView.setGridTranslationY(heightOffset + taskGridVerticalDiff);
+                    float gridTranslationX = mIsRtl ? widthOffset : -widthOffset;
+                    gridTranslations[i] += gridTranslationX;
+                    topAccumulatedTranslationX += gridTranslationX;
+                } else {
+                    gridTranslations[i] += bottomAccumulatedTranslationX;
+                    bottomRowWidth += taskWidthAndSpacing;
+                    bottomSet.add(i);
+
+                    // Move into bottom row.
+                    taskView.setGridTranslationY(heightOffset + taskGridVerticalDiff);
+
+                    // Move horizontally into empty space.
+                    float widthOffset = 0;
+                    for (int j = i - 1; !bottomSet.contains(j) && j >= 0; j--) {
+                        if (j == focusedTaskIndex) {
+                            continue;
+                        }
+                        widthOffset += getTaskViewAt(j).getLayoutParams().width + mPageSpacing;
+                    }
 
-                // Move horizontally into empty space.
-                float widthOffset = 0;
-                for (int j = i - 1; topSet.contains(j); j--) {
-                    widthOffset += getTaskViewAt(j).getLayoutParams().width + mPageSpacing;
+                    float gridTranslationX = mIsRtl ? widthOffset : -widthOffset;
+                    gridTranslations[i] += gridTranslationX;
+                    bottomAccumulatedTranslationX += gridTranslationX;
+                }
+                if (taskView == snappedTaskView) {
+                    snappedTaskRowWidth = isTopRow ? topRowWidth : bottomRowWidth;
                 }
-
-                float gridTranslationX = mIsRtl ? widthOffset : -widthOffset;
-                gridTranslations[i] += gridTranslationX;
-                bottomAccumulatedTranslationX += gridTranslationX;
             }
         }
 
-        // We need to maintain first non-home task's grid translation at 0, now shift translation
-        // of all the TaskViews to achieve that.
-        for (int i = firstNonHomeTaskIndex; i < taskCount; i++) {
+        // We need to maintain snapped task's page scroll invariant between quick switch and
+        // overview, so we sure snapped task's grid translation is 0, and add a non-fullscreen
+        // translationX that is the same as snapped task's full scroll adjustment.
+        float snappedTaskFullscreenScrollAdjustment = 0;
+        float snappedTaskGridTranslationX = 0;
+        if (snappedTaskView != null) {
+            snappedTaskFullscreenScrollAdjustment = snappedTaskView.getScrollAdjustment(
+                    /*fullscreenEnabled=*/true, /*gridEnabled=*/false);
+            snappedTaskGridTranslationX = gridTranslations[snappedPage - mTaskViewStartIndex];
+        }
+
+
+        for (int i = 0; i < taskCount; i++) {
             TaskView taskView = getTaskViewAt(i);
-            taskView.setGridTranslationX(
-                    gridTranslations[i] - gridTranslations[firstNonHomeTaskIndex]);
+            taskView.setGridTranslationX(gridTranslations[i] - snappedTaskGridTranslationX);
+            taskView.setNonFullscreenTranslationX(snappedTaskFullscreenScrollAdjustment);
         }
 
         // Use the accumulated translation of the longer row.
@@ -1866,7 +1908,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         // If the total width is shorter than one grid's width, move ClearAllButton further away
         // accordingly.
         float clearAllShortTotalCompensation = 0;
-        float longRowWidth = Math.max(topRowWidth, bottomRowWidth);
+        int longRowWidth = Math.max(topRowWidth, bottomRowWidth);
         if (longRowWidth < mLastComputedGridSize.width()) {
             float shortTotalCompensation = mLastComputedGridSize.width() - longRowWidth;
             clearAllShortTotalCompensation =
@@ -1875,10 +1917,27 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
 
         float clearAllTotalTranslationX =
                 clearAllAccumulatedTranslation + clearAllShorterRowCompensation
-                        + clearAllShortTotalCompensation;
+                        + clearAllShortTotalCompensation + snappedTaskFullscreenScrollAdjustment;
+        if (focusedTaskIndex < taskCount) {
+            // Shift by focused task's width and spacing if a task is focused.
+            clearAllTotalTranslationX +=
+                    mIsRtl ? focusedTaskWidthAndSpacing : -focusedTaskWidthAndSpacing;
+        }
+
+        // Make sure there are enough space between snapped page and ClearAllButton, for the case
+        // of swiping up after quick switch.
+        if (snappedTaskView != null) {
+            int distanceFromClearAll = longRowWidth - snappedTaskRowWidth;
+            int minimumDistance =
+                    mLastComputedGridSize.width() - snappedTaskView.getLayoutParams().width;
+            if (distanceFromClearAll < minimumDistance) {
+                int distanceDifference = minimumDistance - distanceFromClearAll;
+                clearAllTotalTranslationX += mIsRtl ? -distanceDifference : distanceDifference;
+            }
+        }
 
         mClearAllButton.setGridTranslationPrimary(
-                clearAllTotalTranslationX - gridTranslations[firstNonHomeTaskIndex]);
+                clearAllTotalTranslationX - snappedTaskGridTranslationX);
         mClearAllButton.setGridScrollOffset(
                 mIsRtl ? mLastComputedTaskSize.left - mLastComputedGridSize.left
                         : mLastComputedTaskSize.right - mLastComputedGridSize.right);
@@ -1886,10 +1945,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         setGridProgress(mGridProgress);
     }
 
-    protected boolean isHomeTask(TaskView taskView) {
-        return false;
-    }
-
     /**
      * Moves TaskView and ClearAllButton between carousel and 2 row grid.
      *
@@ -2112,7 +2167,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                     } else {
                         snapToPageImmediately(pageToSnapTo);
                         // Grid got messed up, reapply.
-                        updateGridProperties(true);
+                        updateGridProperties(/*isTaskDismissal=*/true);
                         if (showAsGrid() && getFocusedTaskView() == null) {
                             animateActionsViewOut();
                         }
@@ -2977,44 +3032,62 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         }
     }
 
+    /**
+     * Updates page scroll synchronously and layout child views.
+     */
+    public void updateScrollSynchronously() {
+        onLayout(false /*  changed */, getLeft(), getTop(), getRight(), getBottom());
+        updateMinAndMaxScrollX();
+    }
+
     @Override
     protected int computeMinScroll() {
         if (getTaskViewCount() > 0) {
-            if (mIsRtl && mDisallowScrollToClearAll) {
-                // We aren't showing the clear all button,
-                // so use the leftmost task as the min scroll.
-                return getScrollForPage(indexOfChild(getTaskViewAt(getTaskViewCount() - 1)));
+            if (mIsRtl) {
+                // If we aren't showing the clear all button, use the rightmost task as the min
+                // scroll.
+                return getScrollForPage(mDisallowScrollToClearAll ? indexOfChild(
+                        getTaskViewAt(getTaskViewCount() - 1)) : indexOfChild(mClearAllButton));
+            } else {
+                TaskView focusedTaskView = showAsGrid() ? getFocusedTaskView() : null;
+                return getScrollForPage(focusedTaskView != null ? indexOfChild(focusedTaskView)
+                        : mTaskViewStartIndex);
             }
-            return getLeftMostChildScroll();
         }
         return super.computeMinScroll();
     }
 
-    /**
-     * Returns page scroll of the left most child.
-     */
-    public int getLeftMostChildScroll() {
-        return getScrollForPage(mIsRtl ? indexOfChild(mClearAllButton) : mTaskViewStartIndex);
-    }
-
     @Override
     protected int computeMaxScroll() {
         if (getTaskViewCount() > 0) {
-            if (!mIsRtl && mDisallowScrollToClearAll) {
-                // We aren't showing the clear all button,
-                // so use the rightmost task as the min scroll.
-                return getScrollForPage(indexOfChild(getTaskViewAt(getTaskViewCount() - 1)));
+            if (mIsRtl) {
+                TaskView focusedTaskView = showAsGrid() ? getFocusedTaskView() : null;
+                return getScrollForPage(focusedTaskView != null ? indexOfChild(focusedTaskView)
+                        : mTaskViewStartIndex);
+            } else {
+                // If we aren't showing the clear all button, use the leftmost task as the min
+                // scroll.
+                return getScrollForPage(mDisallowScrollToClearAll ? indexOfChild(
+                        getTaskViewAt(getTaskViewCount() - 1)) : indexOfChild(mClearAllButton));
             }
-            return getScrollForPage(mIsRtl ? mTaskViewStartIndex : indexOfChild(mClearAllButton));
         }
         return super.computeMaxScroll();
     }
 
+    /**
+     * Returns page scroll of ClearAllButton.
+     */
+    public int getClearAllScroll() {
+        return getScrollForPage(indexOfChild(mClearAllButton));
+    }
+
     @Override
     protected boolean getPageScrolls(int[] outPageScrolls, boolean layoutChildren,
             ComputePageScrollsLogic scrollLogic) {
         boolean pageScrollChanged = super.getPageScrolls(outPageScrolls, layoutChildren,
                 scrollLogic);
+        boolean showAsFullscreen = showAsFullscreen();
+        boolean showAsGrid = showAsGrid();
 
         // Align ClearAllButton to the left (RTL) or right (non-RTL), which is different from other
         // TaskViews. This must be called after laying out ClearAllButton.
@@ -3028,11 +3101,10 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             View child = getChildAt(i);
             float scrollDiff = 0;
             if (child instanceof TaskView) {
-                scrollDiff = ((TaskView) child).getScrollAdjustment(mOverviewFullscreenEnabled,
-                        showAsGrid());
+                scrollDiff = ((TaskView) child).getScrollAdjustment(showAsFullscreen, showAsGrid);
             } else if (child instanceof ClearAllButton) {
-                scrollDiff = ((ClearAllButton) child).getScrollAdjustment(
-                        mOverviewFullscreenEnabled, showAsGrid());
+                scrollDiff = ((ClearAllButton) child).getScrollAdjustment(showAsFullscreen,
+                        showAsGrid);
             }
 
             if (scrollDiff != 0) {
@@ -3048,7 +3120,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         int childOffset = super.getChildOffset(index);
         View child = getChildAt(index);
         if (child instanceof TaskView) {
-            childOffset += ((TaskView) child).getOffsetAdjustment(mOverviewFullscreenEnabled,
+            childOffset += ((TaskView) child).getOffsetAdjustment(showAsFullscreen(),
                     showAsGrid());
         } else if (child instanceof ClearAllButton) {
             childOffset += ((ClearAllButton) child).getOffsetAdjustment(mOverviewFullscreenEnabled,
@@ -3064,7 +3136,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             return super.getChildVisibleSize(index);
         }
         return (int) (super.getChildVisibleSize(index) * taskView.getSizeAdjustment(
-                mOverviewFullscreenEnabled));
+                showAsFullscreen()));
     }
 
     public ClearAllButton getClearAllButton() {
@@ -3264,6 +3336,11 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 mCurrentGestureEndTarget).displayOverviewTasksAsGrid(mActivity.getDeviceProfile()));
     }
 
+    private boolean showAsFullscreen() {
+        return mOverviewFullscreenEnabled
+                && mCurrentGestureEndTarget != GestureState.GestureEndTarget.RECENTS;
+    }
+
     public boolean shouldShowOverviewActionsForState(STATE_TYPE state) {
         return !state.displayOverviewTasksAsGrid(mActivity.getDeviceProfile())
                 || getFocusedTaskView() != null;
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 8c71ab3a6f..e6143fb055 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -29,14 +29,12 @@ import static android.widget.Toast.LENGTH_SHORT;
 
 import static com.android.launcher3.AbstractFloatingView.TYPE_TASK_MENU;
 import static com.android.launcher3.LauncherState.OVERVIEW_SPLIT_SELECT;
-import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DURATION;
 import static com.android.launcher3.Utilities.comp;
 import static com.android.launcher3.Utilities.getDescendantCoordRelativeToAncestor;
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.anim.Interpolators.EXAGGERATED_EASE;
 import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
-import static com.android.launcher3.anim.Interpolators.TOUCH_RESPONSE_INTERPOLATOR;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_ICON_TAP_OR_LONGPRESS;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_TAP;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
@@ -78,7 +76,6 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
@@ -287,6 +284,9 @@ public class TaskView extends FrameLayout implements Reusable {
     private float mTaskResistanceTranslationY;
     // The following translation variables should only be used in the same orientation as Launcher.
     private float mFullscreenTranslationX;
+    // Applied as a complement to fullscreenTranslation, for adjusting the carousel overview, or the
+    // in transition carousel before forming the grid on tablets.
+    private float mNonFullscreenTranslationX;
     private float mBoxTranslationY;
     // The following grid translations scales with mGridProgress.
     private float mGridTranslationX;
@@ -784,7 +784,8 @@ public class TaskView extends FrameLayout implements Reusable {
 
     @Override
     public void onRecycle() {
-        mFullscreenTranslationX = mGridTranslationX = mGridTranslationY = mBoxTranslationY = 0f;
+        mFullscreenTranslationX = mNonFullscreenTranslationX =
+                mGridTranslationX = mGridTranslationY = mBoxTranslationY = 0f;
         resetViewTransforms();
         // Clear any references to the thumbnail (it will be re-read either from the cache or the
         // system on next bind)
@@ -931,6 +932,11 @@ public class TaskView extends FrameLayout implements Reusable {
         applyTranslationX();
     }
 
+    public void setNonFullscreenTranslationX(float nonFullscreenTranslationX) {
+        mNonFullscreenTranslationX = nonFullscreenTranslationX;
+        applyTranslationX();
+    }
+
     public void setGridTranslationX(float gridTranslationX) {
         mGridTranslationX = gridTranslationX;
         applyTranslationX();
@@ -953,6 +959,8 @@ public class TaskView extends FrameLayout implements Reusable {
         float scrollAdjustment = 0;
         if (fullscreenEnabled) {
             scrollAdjustment += mFullscreenTranslationX;
+        } else {
+            scrollAdjustment += mNonFullscreenTranslationX;
         }
         if (gridEnabled) {
             scrollAdjustment += mGridTranslationX;
@@ -980,6 +988,7 @@ public class TaskView extends FrameLayout implements Reusable {
     private void applyTranslationX() {
         setTranslationX(mDismissTranslationX + mTaskOffsetTranslationX + mTaskResistanceTranslationX
                 + getFullscreenTrans(mFullscreenTranslationX)
+                + getNonFullscreenTrans(mNonFullscreenTranslationX)
                 + getGridTrans(mGridTranslationX));
     }
 
@@ -1201,12 +1210,12 @@ public class TaskView extends FrameLayout implements Reusable {
             int boxHeight;
             float thumbnailRatio;
             boolean isFocusedTask = isFocusedTask();
-            if (isFocusedTask || isRunningTask()) {
-                // Task will be focused and should use focused task size. Use runningTaskRatio
-                // that is associated with the original orientation of the focused task if possible.
+            if (isFocusedTask) {
+                // Task will be focused and should use focused task size. Use focusTaskRatio
+                // that is associated with the original orientation of the focused task.
                 boxWidth = taskWidth;
                 boxHeight = taskHeight;
-                thumbnailRatio = isFocusedTask ? getRecentsView().getFocusedTaskRatio() : 0;
+                thumbnailRatio = getRecentsView().getFocusedTaskRatio();
             } else {
                 // Otherwise task is in grid, and should use lastComputedGridTaskSize.
                 Rect lastComputedGridTaskSize = getRecentsView().getLastComputedGridTaskSize();
@@ -1262,6 +1271,10 @@ public class TaskView extends FrameLayout implements Reusable {
         return Utilities.mapRange(progress, 0, endTranslation);
     }
 
+    private float getNonFullscreenTrans(float endTranslation) {
+        return endTranslation - getFullscreenTrans(endTranslation);
+    }
+
     public boolean isRunningTask() {
         if (getRecentsView() == null) {
             return false;
-- 
GitLab


From 27e6c78feed0b15418f2c9b927c13fb1784793a4 Mon Sep 17 00:00:00 2001
From: Becky Qiu <xuqiu@google.com>
Date: Thu, 15 Apr 2021 11:58:04 -0700
Subject: [PATCH 0888/1664] [Overview Sharing] Add logging events for overview
 sharing.

Event IDs were generated by command line on my workstation using uieventscli.
Manually added events to StatsLogManager. Will be used in Overview events.

Bug: 179831990
Test: will test in overview when add to code implementation.
Change-Id: If6ad7f42c899b78b53fb4a54d33a6c8df264dff2
---
 .../launcher3/logging/StatsLogManager.java    | 47 ++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index c5ffff99fb..d065469156 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -413,7 +413,52 @@ public class StatsLogManager implements ResourceBasedOverride {
         LAUNCHER_ALLAPPS_VERTICAL_SWIPE_BEGIN(724),
 
         @UiEvent(doc = "All apps vertical fling ended.")
-        LAUNCHER_ALLAPPS_VERTICAL_SWIPE_END(725)
+        LAUNCHER_ALLAPPS_VERTICAL_SWIPE_END(725),
+
+        @UiEvent(doc = "Show URL indicator for Overview Sharing")
+        LAUNCHER_OVERVIEW_SHARING_SHOW_URL_INDICATOR(764),
+
+        @UiEvent(doc = "Show image indicator for Overview Sharing")
+        LAUNCHER_OVERVIEW_SHARING_SHOW_IMAGE_INDICATOR(765),
+
+        @UiEvent(doc = "User taps URL indicator in Overview")
+        LAUNCHER_OVERVIEW_SHARING_URL_INDICATOR_TAP(766),
+
+        @UiEvent(doc = "User taps image indicator in Overview")
+        LAUNCHER_OVERVIEW_SHARING_IMAGE_INDICATOR_TAP(767),
+
+        @UiEvent(doc = "User long presses an image in Overview")
+        LAUNCHER_OVERVIEW_SHARING_IMAGE_LONG_PRESS(768),
+
+        @UiEvent(doc = "User drags a URL in Overview")
+        LAUNCHER_OVERVIEW_SHARING_URL_DRAG(769),
+
+        @UiEvent(doc = "User drags an image in Overview")
+        LAUNCHER_OVERVIEW_SHARING_IMAGE_DRAG(770),
+
+        @UiEvent(doc = "User drops URL to a direct share target")
+        LAUNCHER_OVERVIEW_SHARING_DROP_URL_TO_TARGET(771),
+
+        @UiEvent(doc = "User drops an image to a direct share target")
+        LAUNCHER_OVERVIEW_SHARING_DROP_IMAGE_TO_TARGET(772),
+
+        @UiEvent(doc = "User drops URL to the More button")
+        LAUNCHER_OVERVIEW_SHARING_DROP_URL_TO_MORE(773),
+
+        @UiEvent(doc = "User drops an image to the More button")
+        LAUNCHER_OVERVIEW_SHARING_DROP_IMAGE_TO_MORE(774),
+
+        @UiEvent(doc = "User taps a share target to share URL")
+        LAUNCHER_OVERVIEW_SHARING_TAP_TARGET_TO_SHARE_URL(775),
+
+        @UiEvent(doc = "User taps a share target to share an image")
+        LAUNCHER_OVERVIEW_SHARING_TAP_TARGET_TO_SHARE_IMAGE(776),
+
+        @UiEvent(doc = "User taps the More button to share URL")
+        LAUNCHER_OVERVIEW_SHARING_TAP_MORE_TO_SHARE_URL(777),
+
+        @UiEvent(doc = "User taps the More button to share an image")
+        LAUNCHER_OVERVIEW_SHARING_TAP_MORE_TO_SHARE_IMAGE(778)
         ;
 
         // ADD MORE
-- 
GitLab


From f7ca3b4e3fcc1599bfb4f860dc7a497d808d4ca0 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Mon, 22 Feb 2021 11:03:58 -0800
Subject: [PATCH 0889/1664] Update drag and drop visualizations

=> Remove the bitmap-based icon outline
=> Add simple cell based location preview of drop location
=> Round corners of page outlines
=> Get rid of page background for focused page
=> Update colors to use system accent color

Bug: 185163323

Test: manual

Change-Id: Id604c59201536967e25236f305eeeb0aafc9c022
---
 res/color/cell_layout_bg_color_active.xml     |   5 +
 res/color/cell_layout_bg_color_inactive.xml   |   5 +
 res/drawable/bg_celllayout.xml                |   9 +-
 res/values/attrs.xml                          |   1 +
 res/values/config.xml                         |   2 +-
 res/values/dimens.xml                         |   6 +-
 res/values/styles.xml                         |   1 +
 src/com/android/launcher3/CellLayout.java     | 252 ++++++++++--------
 src/com/android/launcher3/Workspace.java      |  38 ++-
 .../WorkspaceStateTransitionAnimation.java    |  14 +-
 .../launcher3/dragndrop/DragLayer.java        |  10 +-
 .../graphics/WorkspaceDragScrim.java          |  74 -----
 12 files changed, 199 insertions(+), 218 deletions(-)
 create mode 100644 res/color/cell_layout_bg_color_active.xml
 create mode 100644 res/color/cell_layout_bg_color_inactive.xml
 delete mode 100644 src/com/android/launcher3/graphics/WorkspaceDragScrim.java

diff --git a/res/color/cell_layout_bg_color_active.xml b/res/color/cell_layout_bg_color_active.xml
new file mode 100644
index 0000000000..e826489944
--- /dev/null
+++ b/res/color/cell_layout_bg_color_active.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="0.4"
+      android:color="?android:attr/colorAccent"/>
+</selector>
diff --git a/res/color/cell_layout_bg_color_inactive.xml b/res/color/cell_layout_bg_color_inactive.xml
new file mode 100644
index 0000000000..d60a27a120
--- /dev/null
+++ b/res/color/cell_layout_bg_color_inactive.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="0.3"
+        android:color="?android:attr/colorAccent"/>
+</selector>
\ No newline at end of file
diff --git a/res/drawable/bg_celllayout.xml b/res/drawable/bg_celllayout.xml
index b81b37f06f..d7181ad576 100644
--- a/res/drawable/bg_celllayout.xml
+++ b/res/drawable/bg_celllayout.xml
@@ -23,13 +23,16 @@
         <shape android:shape="rectangle" >
             <stroke
                 android:width="@dimen/spring_loaded_panel_border"
-                android:color="@color/spring_loaded_highlighted_panel_border_color" />
-            <solid android:color="@color/spring_loaded_panel_color" />
+                android:color="?android:attr/colorAccent" />
+            <solid android:color="@color/cell_layout_bg_color_active"/>
+            <corners android:radius="@dimen/bg_round_rect_radius"></corners>
+
         </shape>
     </item>
     <item>
         <shape android:shape="rectangle" >
-            <solid android:color="@color/spring_loaded_panel_color" />
+            <solid android:color="@color/cell_layout_bg_color_inactive"/>
+            <corners android:radius="@dimen/bg_round_rect_radius"></corners>
         </shape>
     </item>
 </selector>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 381b0fef21..39e985ef27 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -43,6 +43,7 @@
     <attr name="folderTextColor" format="color" />
     <attr name="folderHintColor" format="color" />
     <attr name="workProfileOverlayTextColor" format="color" />
+    <attr name="gridColor" format="color" />
 
     <!-- BubbleTextView specific attributes. -->
     <declare-styleable name="BubbleTextView">
diff --git a/res/values/config.xml b/res/values/config.xml
index 57f626cf54..db9881161b 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -38,7 +38,7 @@
     <integer name="config_dragOutlineFadeTime">900</integer>
 
     <!-- The alpha value at which to show the most recent drop visualization outline. -->
-    <integer name="config_dragOutlineMaxAlpha">128</integer>
+    <integer name="config_dragOutlineMaxAlpha">255</integer>
 
     <!-- Parameters controlling the animation for when an item is dropped on the home screen,
          and it animates from its old position to the new one. -->
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 51dddab6f7..08da6320e1 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -166,7 +166,7 @@
 
     <dimen name="drag_flingToDeleteMinVelocity">-1500dp</dimen>
 
-    <dimen name="spring_loaded_panel_border">1dp</dimen>
+    <dimen name="spring_loaded_panel_border">2dp</dimen>
     <dimen name="keyboard_drag_stroke_width">4dp</dimen>
 
 <!-- Folders -->
@@ -298,4 +298,8 @@
     <dimen name="task_thumbnail_icon_size_grid">0dp</dimen>
     <dimen name="overview_task_margin">0dp</dimen>
 
+<!-- Workspace grid visualization parameters -->
+    <dimen name="grid_visualization_rounding_radius">28dp</dimen>
+    <dimen name="grid_visualization_cell_spacing">6dp</dimen>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index fd77b80811..37b7e2d14f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -56,6 +56,7 @@
         <item name="workProfileOverlayTextColor">#FF212121</item>
         <item name="eduHalfSheetBGColor">?android:attr/colorAccent</item>
         <item name="disabledIconAlpha">.54</item>
+        <item name="gridColor">?android:attr/colorAccent</item>
 
         <item name="android:windowTranslucentStatus">false</item>
         <item name="android:windowTranslucentNavigation">false</item>
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index c16c44b60e..fc09295d7b 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -30,18 +30,19 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
-import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Point;
 import android.graphics.PointF;
 import android.graphics.Rect;
+import android.graphics.RectF;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Parcelable;
 import android.util.ArrayMap;
 import android.util.AttributeSet;
+import android.util.FloatProperty;
 import android.util.Log;
 import android.util.Property;
 import android.util.SparseArray;
@@ -53,6 +54,7 @@ import android.view.accessibility.AccessibilityEvent;
 
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
+import androidx.core.graphics.ColorUtils;
 import androidx.core.view.ViewCompat;
 
 import com.android.launcher3.LauncherSettings.Favorites;
@@ -60,9 +62,7 @@ import com.android.launcher3.accessibility.DragAndDropAccessibilityDelegate;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.dragndrop.AppWidgetHostViewDrawable;
-import com.android.launcher3.dragndrop.DraggableView;
 import com.android.launcher3.folder.PreviewBackground;
-import com.android.launcher3.graphics.DragPreviewProvider;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.util.CellAndSpan;
 import com.android.launcher3.util.GridOccupancy;
@@ -106,11 +106,6 @@ public class CellLayout extends ViewGroup {
     @Thunk final int[] mTempLocation = new int[2];
     final PointF mTmpPointF = new PointF();
 
-    // Used to visualize / debug the Grid of the CellLayout
-    private static final boolean VISUALIZE_GRID = false;
-    private Rect mVisualizeGridRect = new Rect();
-    private Paint mVisualizeGridPaint = new Paint();
-
     private GridOccupancy mOccupied;
     private GridOccupancy mTmpOccupied;
 
@@ -132,7 +127,7 @@ public class CellLayout extends ViewGroup {
 
     // These arrays are used to implement the drag visualization on x-large screens.
     // They are used as circular arrays, indexed by mDragOutlineCurrent.
-    @Thunk final Rect[] mDragOutlines = new Rect[4];
+    @Thunk final CellLayout.LayoutParams[] mDragOutlines = new CellLayout.LayoutParams[4];
     @Thunk final float[] mDragOutlineAlphas = new float[mDragOutlines.length];
     private final InterruptibleInOutAnimator[] mDragOutlineAnims =
             new InterruptibleInOutAnimator[mDragOutlines.length];
@@ -146,8 +141,21 @@ public class CellLayout extends ViewGroup {
 
     private boolean mItemPlacementDirty = false;
 
+    // Used to visualize the grid and drop locations
+    private boolean mVisualizeCells = false;
+    private boolean mVisualizeDropLocation = true;
+    private RectF mVisualizeGridRect = new RectF();
+    private Paint mVisualizeGridPaint = new Paint();
+    private int mGridVisualizationPadding;
+    private int mGridVisualizationRoundingRadius;
+    private float mGridAlpha = 0f;
+    private int mGridColor = 0;
+    private float mSpringLoadedProgress = 0f;
+    private float mScrollProgress = 0f;
+
     // When a drag operation is in progress, holds the nearest cell to the touch point
     private final int[] mDragCell = new int[2];
+    private final int[] mDragCellSpan = new int[2];
 
     private boolean mDragging = false;
 
@@ -191,6 +199,20 @@ public class CellLayout extends ViewGroup {
     // Related to accessible drag and drop
     DragAndDropAccessibilityDelegate mTouchHelper;
 
+
+    public static final FloatProperty<CellLayout> SPRING_LOADED_PROGRESS =
+            new FloatProperty<CellLayout>("spring_loaded_progress") {
+                @Override
+                public Float get(CellLayout cl) {
+                    return cl.getSpringLoadedProgress();
+                }
+
+                @Override
+                public void setValue(CellLayout cl, float progress) {
+                    cl.setSpringLoadedProgress(progress);
+                }
+            };
+
     public CellLayout(Context context) {
         this(context, null);
     }
@@ -231,19 +253,26 @@ public class CellLayout extends ViewGroup {
         mFolderLeaveBehind.mDelegateCellY = -1;
 
         setAlwaysDrawnWithCacheEnabled(false);
-        final Resources res = getResources();
 
-        mBackground = res.getDrawable(R.drawable.bg_celllayout);
+        Resources res = getResources();
+
+        mBackground = getContext().getDrawable(R.drawable.bg_celllayout);
         mBackground.setCallback(this);
         mBackground.setAlpha(0);
 
+        mGridColor = Themes.getAttrColor(getContext(), R.attr.gridColor);
+        mGridVisualizationPadding =
+                res.getDimensionPixelSize(R.dimen.grid_visualization_cell_spacing);
+        mGridVisualizationRoundingRadius =
+                res.getDimensionPixelSize(R.dimen.grid_visualization_rounding_radius);
         mReorderPreviewAnimationMagnitude = (REORDER_PREVIEW_MAGNITUDE * deviceProfile.iconSizePx);
 
         // Initialize the data structures used for the drag visualization.
         mEaseOutInterpolator = Interpolators.DEACCEL_2_5; // Quint ease out
         mDragCell[0] = mDragCell[1] = -1;
+        mDragCellSpan[0] = mDragCellSpan[1] = -1;
         for (int i = 0; i < mDragOutlines.length; i++) {
-            mDragOutlines[i] = new Rect(-1, -1, -1, -1);
+            mDragOutlines[i] = new CellLayout.LayoutParams(0, 0, 0, 0);
         }
         mDragOutlinePaint.setColor(Themes.getAttrColor(context, R.attr.workspaceTextColor));
 
@@ -264,34 +293,14 @@ public class CellLayout extends ViewGroup {
             final int thisIndex = i;
             anim.getAnimator().addUpdateListener(new AnimatorUpdateListener() {
                 public void onAnimationUpdate(ValueAnimator animation) {
-                    final Bitmap outline = (Bitmap)anim.getTag();
-
                     // If an animation is started and then stopped very quickly, we can still
                     // get spurious updates we've cleared the tag. Guard against this.
-                    if (outline == null) {
-                        if (LOGD) {
-                            Object val = animation.getAnimatedValue();
-                            Log.d(TAG, "anim " + thisIndex + " update: " + val +
-                                     ", isStopped " + anim.isStopped());
-                        }
-                        // Try to prevent it from continuing to run
-                        animation.cancel();
-                    } else {
-                        mDragOutlineAlphas[thisIndex] = (Float) animation.getAnimatedValue();
-                        CellLayout.this.invalidate(mDragOutlines[thisIndex]);
-                    }
+                    mDragOutlineAlphas[thisIndex] = (Float) animation.getAnimatedValue();
+                    CellLayout.this.invalidate();
                 }
             });
             // The animation holds a reference to the drag outline bitmap as long is it's
             // running. This way the bitmap can be GCed when the animations are complete.
-            anim.getAnimator().addListener(new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationEnd(Animator animation) {
-                    if ((Float) ((ValueAnimator) animation).getAnimatedValue() == 0f) {
-                        anim.setTag(null);
-                    }
-                }
-            });
             mDragOutlineAnims[i] = anim;
         }
 
@@ -430,16 +439,6 @@ public class CellLayout extends ViewGroup {
             mBackground.draw(canvas);
         }
 
-        final Paint paint = mDragOutlinePaint;
-        for (int i = 0; i < mDragOutlines.length; i++) {
-            final float alpha = mDragOutlineAlphas[i];
-            if (alpha > 0) {
-                final Bitmap b = (Bitmap) mDragOutlineAnims[i].getTag();
-                paint.setAlpha((int)(alpha + .5f));
-                canvas.drawBitmap(b, null, mDragOutlines[i], paint);
-            }
-        }
-
         if (DEBUG_VISUALIZE_OCCUPIED) {
             int[] pt = new int[2];
             ColorDrawable cd = new ColorDrawable(Color.RED);
@@ -475,34 +474,109 @@ public class CellLayout extends ViewGroup {
             canvas.restore();
         }
 
-        if (VISUALIZE_GRID) {
+        if (mVisualizeCells || mVisualizeDropLocation) {
             visualizeGrid(canvas);
         }
     }
 
+    /**
+     * Indicates the progress of the Workspace entering the SpringLoaded state; allows the
+     * CellLayout to update various visuals for this state.
+     *
+     * @param progress
+     */
+    public void setSpringLoadedProgress(float progress) {
+        if (Float.compare(progress, mSpringLoadedProgress) != 0) {
+            mSpringLoadedProgress = progress;
+            updateBgAlpha();
+            setGridAlpha(progress);
+        }
+    }
+
+    /**
+     * See setSpringLoadedProgress
+     * @return progress
+     */
+    public float getSpringLoadedProgress() {
+        return mSpringLoadedProgress;
+    }
+
+    private void updateBgAlpha() {
+        mBackground.setAlpha((int) (mSpringLoadedProgress * mScrollProgress * 255));
+    }
+
+    /**
+     * Set the progress of this page's scroll
+     *
+     * @param progress 0 if the screen is centered, +/-1 if it is to the right / left respectively
+     */
+    public void setScrollProgress(float progress) {
+        if (Float.compare(Math.abs(progress), mScrollProgress) != 0) {
+            mScrollProgress = Math.abs(progress);
+            updateBgAlpha();
+        }
+    }
+
+    private void setGridAlpha(float gridAlpha) {
+        if (Float.compare(gridAlpha, mGridAlpha) != 0) {
+            mGridAlpha = gridAlpha;
+            invalidate();
+        }
+    }
+
     protected void visualizeGrid(Canvas canvas) {
-        mVisualizeGridRect.set(0, 0, mCellWidth, mCellHeight);
-        mVisualizeGridPaint.setStrokeWidth(4);
+        mVisualizeGridRect.set(mGridVisualizationPadding, mGridVisualizationPadding,
+                mCellWidth - mGridVisualizationPadding,
+                mCellHeight - mGridVisualizationPadding);
+
+        mVisualizeGridPaint.setStrokeWidth(8);
+        int paintAlpha = (int) (120 * mGridAlpha);
+        mVisualizeGridPaint.setColor(ColorUtils.setAlphaComponent(mGridColor, paintAlpha));
+
+        if (mVisualizeCells) {
+            for (int i = 0; i < mCountX; i++) {
+                for (int j = 0; j < mCountY; j++) {
+                    int transX = i * mCellWidth + (i * mBorderSpacing) + getPaddingLeft()
+                            + mGridVisualizationPadding;
+                    int transY = j * mCellHeight + (j * mBorderSpacing) + getPaddingTop()
+                            + mGridVisualizationPadding;
+
+                    mVisualizeGridRect.offsetTo(transX, transY);
+                    mVisualizeGridPaint.setStyle(Paint.Style.FILL);
+                    canvas.drawRoundRect(mVisualizeGridRect, mGridVisualizationRoundingRadius,
+                            mGridVisualizationRoundingRadius, mVisualizeGridPaint);
+                }
+            }
+        }
 
-        for (int i = 0; i < mCountX; i++) {
-            for (int j = 0; j < mCountY; j++) {
-                canvas.save();
+        if (mVisualizeDropLocation) {
+            for (int i = 0; i < mDragOutlines.length; i++) {
+                final float alpha = mDragOutlineAlphas[i];
+                if (alpha <= 0) continue;
 
-                int transX = i * mCellWidth + (i * mBorderSpacing);
-                int transY = j * mCellHeight + (j * mBorderSpacing);
+                mVisualizeGridPaint.setAlpha(255);
+                int x = mDragOutlines[i].cellX;
+                int y = mDragOutlines[i].cellY;
+                int spanX = mDragOutlines[i].cellHSpan;
+                int spanY = mDragOutlines[i].cellVSpan;
 
-                canvas.translate(getPaddingLeft() + transX, getPaddingTop() + transY);
+                mVisualizeGridRect.set(mGridVisualizationPadding, mGridVisualizationPadding,
+                        mCellWidth * spanX - mGridVisualizationPadding,
+                        mCellHeight * spanY - mGridVisualizationPadding);
 
-                mVisualizeGridPaint.setStyle(Paint.Style.FILL);
-                mVisualizeGridPaint.setColor(Color.argb(80, 255, 100, 100));
+                int transX = x * mCellWidth + (x * mBorderSpacing)
+                        + getPaddingLeft() + mGridVisualizationPadding;
+                int transY = y * mCellHeight + (y * mBorderSpacing)
+                        + getPaddingTop() + mGridVisualizationPadding;
 
-                canvas.drawRect(mVisualizeGridRect, mVisualizeGridPaint);
+                mVisualizeGridRect.offsetTo(transX, transY);
 
                 mVisualizeGridPaint.setStyle(Paint.Style.STROKE);
-                mVisualizeGridPaint.setColor(Color.argb(255, 255, 100, 100));
+                mVisualizeGridPaint.setColor(Color.argb((int) (alpha),
+                        Color.red(mGridColor), Color.green(mGridColor), Color.blue(mGridColor)));
 
-                canvas.drawRect(mVisualizeGridRect, mVisualizeGridPaint);
-                canvas.restore();
+                canvas.drawRoundRect(mVisualizeGridRect, mGridVisualizationRoundingRadius,
+                        mGridVisualizationRoundingRadius, mVisualizeGridPaint);
             }
         }
     }
@@ -846,10 +920,6 @@ public class CellLayout extends ViewGroup {
                 - ((mCountX - 1) * mBorderSpacing);
     }
 
-    public Drawable getScrimBackground() {
-        return mBackground;
-    }
-
     @Override
     protected boolean verifyDrawable(Drawable who) {
         return super.verifyDrawable(who) || (who == mBackground);
@@ -959,61 +1029,32 @@ public class CellLayout extends ViewGroup {
         return false;
     }
 
-    void visualizeDropLocation(DraggableView v, DragPreviewProvider outlineProvider, int cellX, int
-            cellY, int spanX, int spanY, boolean resize, DropTarget.DragObject dragObject) {
-        final int oldDragCellX = mDragCell[0];
-        final int oldDragCellY = mDragCell[1];
-
-        if (cellX != oldDragCellX || cellY != oldDragCellY) {
+    void visualizeDropLocation(int cellX, int cellY, int spanX, int spanY,
+            DropTarget.DragObject dragObject) {
+        if (mDragCell[0] != cellX || mDragCell[1] != cellY || mDragCellSpan[0] != spanX
+                || mDragCellSpan[1] != spanY) {
             mDragCell[0] = cellX;
             mDragCell[1] = cellY;
-
-            applyColorExtraction(dragObject, mDragCell, spanX, spanY);
-
-            if (outlineProvider == null || outlineProvider.generatedDragOutline == null) {
-                return;
-            }
-
-            Bitmap dragOutline = outlineProvider.generatedDragOutline;
+            mDragCellSpan[0] = spanX;
+            mDragCellSpan[1] = spanY;
 
             final int oldIndex = mDragOutlineCurrent;
             mDragOutlineAnims[oldIndex].animateOut();
             mDragOutlineCurrent = (oldIndex + 1) % mDragOutlines.length;
-            Rect r = mDragOutlines[mDragOutlineCurrent];
-
-            cellToRect(cellX, cellY, spanX, spanY, r);
-            int left = r.left;
-            int top = r.top;
 
-            int width = dragOutline.getWidth();
-            int height = dragOutline.getHeight();
+            LayoutParams cell = mDragOutlines[mDragOutlineCurrent];
+            cell.cellX = cellX;
+            cell.cellY = cellY;
+            cell.cellHSpan = spanX;
+            cell.cellVSpan = spanY;
 
-            if (resize) {
-                width = r.width();
-                height = r.height();
-            }
-
-            // Center horizontaly
-            left += (r.width() - dragOutline.getWidth()) / 2;
-
-            if (v != null && v.getViewType() == DraggableView.DRAGGABLE_WIDGET) {
-                // Center vertically
-                top += (r.height() - dragOutline.getHeight()) / 2;
-            } else if (v != null && v.getViewType() == DraggableView.DRAGGABLE_ICON) {
-                int cHeight = getShortcutsAndWidgets().getCellContentHeight();
-                int cellPaddingY = (int) Math.max(0, ((mCellHeight - cHeight) / 2f));
-                top += cellPaddingY;
-            }
-
-            r.set(left, top, left + width, top + height);
-
-            Utilities.scaleRectAboutCenter(r, mChildScale);
-            mDragOutlineAnims[mDragOutlineCurrent].setTag(dragOutline);
             mDragOutlineAnims[mDragOutlineCurrent].animateIn();
+            invalidate();
 
             if (dragObject.stateAnnouncer != null) {
                 dragObject.stateAnnouncer.announce(getItemMoveDescription(cellX, cellY));
             }
+
         }
     }
 
@@ -2504,6 +2545,7 @@ public class CellLayout extends ViewGroup {
 
         // Invalidate the drag data
         mDragCell[0] = mDragCell[1] = -1;
+        mDragCellSpan[0] = mDragCellSpan[1] = -1;
         mDragOutlineAnims[mDragOutlineCurrent].animateOut();
         mDragOutlineCurrent = (mDragOutlineCurrent + 1) % mDragOutlineAnims.length;
         revertTempState();
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 981cf8967a..c9e575d4a4 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -81,7 +81,6 @@ import com.android.launcher3.folder.FolderIcon;
 import com.android.launcher3.folder.PreviewBackground;
 import com.android.launcher3.graphics.DragPreviewProvider;
 import com.android.launcher3.graphics.PreloadIconDrawable;
-import com.android.launcher3.graphics.WorkspaceDragScrim;
 import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.logger.LauncherAtom;
@@ -204,8 +203,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
 
     private DragPreviewProvider mOutlineProvider = null;
 
-    private WorkspaceDragScrim mWorkspaceDragScrim;
-
     private boolean mWorkspaceFadeInAdjacentScreens;
 
     final WallpaperOffsetInterpolator mWallpaperOffset;
@@ -634,6 +631,8 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         addView(newScreen, insertIndex);
         mStateTransitionAnimation.applyChildState(
                 mLauncher.getStateManager().getState(), newScreen, insertIndex);
+
+        updatePageScrollValues();
         return newScreen;
     }
 
@@ -1007,6 +1006,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         }
 
         updatePageAlphaValues();
+        updatePageScrollValues();
         enableHwLayersOnVisiblePages();
     }
 
@@ -1212,19 +1212,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         }
     }
 
-    public void setWorkspaceDragScrim(WorkspaceDragScrim workspaceDragScrim) {
-        mWorkspaceDragScrim = workspaceDragScrim;
-    }
-
-    @Override
-    public void invalidate() {
-        // The workspace scrim may need to be re-rendered based on the workspace scroll
-        if (mWorkspaceDragScrim != null) {
-            mWorkspaceDragScrim.invalidate();
-        }
-        super.invalidate();
-    }
-
     @Override
     public void computeScroll() {
         super.computeScroll();
@@ -1266,6 +1253,17 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         }
     }
 
+    private void updatePageScrollValues() {
+        int screenCenter = getScrollX() + getMeasuredWidth() / 2;
+        for (int i = 0; i < getChildCount(); i++) {
+            CellLayout child = (CellLayout) getChildAt(i);
+            if (child != null) {
+                float scrollProgress = getScrollProgress(screenCenter, child, i);
+                child.setScrollProgress(scrollProgress);
+            }
+        }
+    }
+
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
         mWallpaperOffset.setWindowToken(getWindowToken());
@@ -2254,8 +2252,8 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
                     item.spanY, child, mTargetCell);
 
             if (!nearestDropOccupied) {
-                mDragTargetLayout.visualizeDropLocation(d.originalView, mOutlineProvider,
-                        mTargetCell[0], mTargetCell[1], item.spanX, item.spanY, false, d);
+                mDragTargetLayout.visualizeDropLocation(mTargetCell[0], mTargetCell[1],
+                        item.spanX, item.spanY, d);
             } else if ((mDragMode == DRAG_MODE_NONE || mDragMode == DRAG_MODE_REORDER)
                     && !mReorderAlarm.alarmPending() && (mLastReorderX != reorderX ||
                     mLastReorderY != reorderY)) {
@@ -2445,8 +2443,8 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
             }
 
             boolean resize = resultSpan[0] != spanX || resultSpan[1] != spanY;
-            mDragTargetLayout.visualizeDropLocation(dragObject.originalView, mOutlineProvider,
-                mTargetCell[0], mTargetCell[1], resultSpan[0], resultSpan[1], resize, dragObject);
+            mDragTargetLayout.visualizeDropLocation(mTargetCell[0], mTargetCell[1],
+                    resultSpan[0], resultSpan[1], dragObject);
         }
     }
 
diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
index 24de19f20e..e2466ac5ab 100644
--- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
+++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
@@ -18,13 +18,11 @@ package com.android.launcher3;
 
 import static androidx.dynamicanimation.animation.DynamicAnimation.MIN_VISIBLE_CHANGE_SCALE;
 
-import static com.android.launcher3.LauncherAnimUtils.DRAWABLE_ALPHA;
 import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
 import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA;
 import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_X;
 import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y;
 import static com.android.launcher3.LauncherState.FLAG_HAS_SYS_UI_SCRIM;
-import static com.android.launcher3.LauncherState.FLAG_WORKSPACE_HAS_BACKGROUNDS;
 import static com.android.launcher3.LauncherState.HINT_STATE;
 import static com.android.launcher3.LauncherState.HOTSEAT_ICONS;
 import static com.android.launcher3.LauncherState.NORMAL;
@@ -50,8 +48,9 @@ import com.android.launcher3.LauncherState.ScaleAndTranslation;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.anim.PropertySetter;
 import com.android.launcher3.anim.SpringAnimationBuilder;
+import com.android.launcher3.graphics.Scrim;
 import com.android.launcher3.graphics.SysUiScrim;
-import com.android.launcher3.graphics.WorkspaceDragScrim;
+import com.android.launcher3.states.SpringLoadedState;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.util.DynamicResource;
 import com.android.systemui.plugins.ResourceProvider;
@@ -168,7 +167,7 @@ public class WorkspaceStateTransitionAnimation {
 
     public void setScrim(PropertySetter propertySetter, LauncherState state,
             StateAnimationConfig config) {
-        WorkspaceDragScrim workspaceDragScrim = mLauncher.getDragLayer().getWorkspaceDragScrim();
+        Scrim workspaceDragScrim = mLauncher.getDragLayer().getWorkspaceDragScrim();
         propertySetter.setFloat(workspaceDragScrim, SCRIM_PROGRESS,
                 state.getWorkspaceBackgroundAlpha(mLauncher), LINEAR);
 
@@ -190,11 +189,10 @@ public class WorkspaceStateTransitionAnimation {
             PageAlphaProvider pageAlphaProvider, PropertySetter propertySetter,
             StateAnimationConfig config) {
         float pageAlpha = pageAlphaProvider.getPageAlpha(childIndex);
-        int drawableAlpha = state.hasFlag(FLAG_WORKSPACE_HAS_BACKGROUNDS)
-                ? Math.round(pageAlpha * 255) : 0;
+        float springLoadedProgress = (state instanceof SpringLoadedState) ? 1.0f : 0f;
 
-        propertySetter.setInt(cl.getScrimBackground(),
-                DRAWABLE_ALPHA, drawableAlpha, ZOOM_OUT);
+        propertySetter.setFloat(cl,
+                CellLayout.SPRING_LOADED_PROGRESS, springLoadedProgress, ZOOM_OUT);
         Interpolator fadeInterpolator = config.getInterpolator(ANIM_WORKSPACE_FADE,
                 pageAlphaProvider.interpolator);
         propertySetter.setFloat(cl.getShortcutsAndWidgets(), VIEW_ALPHA,
diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java
index c80fd90537..274e033555 100644
--- a/src/com/android/launcher3/dragndrop/DragLayer.java
+++ b/src/com/android/launcher3/dragndrop/DragLayer.java
@@ -46,8 +46,8 @@ import com.android.launcher3.R;
 import com.android.launcher3.ShortcutAndWidgetContainer;
 import com.android.launcher3.Workspace;
 import com.android.launcher3.folder.Folder;
+import com.android.launcher3.graphics.Scrim;
 import com.android.launcher3.graphics.SysUiScrim;
-import com.android.launcher3.graphics.WorkspaceDragScrim;
 import com.android.launcher3.keyboard.ViewGroupFocusHelper;
 import com.android.launcher3.util.Thunk;
 import com.android.launcher3.views.BaseDragLayer;
@@ -83,7 +83,7 @@ public class DragLayer extends BaseDragLayer<Launcher> {
 
     // Related to adjacent page hints
     private final ViewGroupFocusHelper mFocusIndicatorHelper;
-    private WorkspaceDragScrim mWorkspaceDragScrim;
+    private Scrim mWorkspaceDragScrim;
     private SysUiScrim mSysUiScrim;
     private LauncherRootView mRootView;
 
@@ -106,9 +106,7 @@ public class DragLayer extends BaseDragLayer<Launcher> {
     public void setup(DragController dragController, Workspace workspace) {
         mDragController = dragController;
         recreateControllers();
-
-        mWorkspaceDragScrim = new WorkspaceDragScrim((this));
-        mWorkspaceDragScrim.setWorkspace(workspace);
+        mWorkspaceDragScrim = new Scrim(this);
 
         // We delegate drawing of the workspace scrim to LauncherRootView (one level up), so as
         // to avoid artifacts when translating the entire drag layer in the -1 transition.
@@ -540,7 +538,7 @@ public class DragLayer extends BaseDragLayer<Launcher> {
         mSysUiScrim.onInsetsChanged(insets, mAllowSysuiScrims);
     }
 
-    public WorkspaceDragScrim getWorkspaceDragScrim() {
+    public Scrim getWorkspaceDragScrim() {
         return mWorkspaceDragScrim;
     }
 
diff --git a/src/com/android/launcher3/graphics/WorkspaceDragScrim.java b/src/com/android/launcher3/graphics/WorkspaceDragScrim.java
deleted file mode 100644
index d8dc563ce8..0000000000
--- a/src/com/android/launcher3/graphics/WorkspaceDragScrim.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.graphics;
-
-import android.graphics.Canvas;
-import android.graphics.Rect;
-import android.graphics.Region;
-import android.view.View;
-
-import com.android.launcher3.CellLayout;
-import com.android.launcher3.Workspace;
-
-/**
- * Scrim drawn during SpringLoaded State (ie. Drag and Drop). Darkens the workspace except for
- * the focused CellLayout.
- */
-public class WorkspaceDragScrim extends Scrim {
-
-    private final Rect mHighlightRect = new Rect();
-
-    private Workspace mWorkspace;
-
-    public WorkspaceDragScrim(View view) {
-        super(view);
-        onExtractedColorsChanged(mWallpaperColorInfo);
-    }
-
-    /**
-     * Set the workspace that this scrim is acting on
-     * @param workspace
-     */
-    public void setWorkspace(Workspace workspace)  {
-        mWorkspace = workspace;
-        mWorkspace.setWorkspaceDragScrim(this);
-    }
-
-    /**
-     * Cut out the focused paged of the Workspace and then draw the scrim
-     * @param canvas
-     */
-    public void draw(Canvas canvas) {
-        // Draw the background below children.
-        if (mScrimAlpha > 0) {
-            // Update the scroll position first to ensure scrim cutout is in the right place.
-            mWorkspace.computeScrollWithoutInvalidation();
-            CellLayout currCellLayout = mWorkspace.getCurrentDragOverlappingLayout();
-            canvas.save();
-            if (currCellLayout != null && currCellLayout != mLauncher.getHotseat()) {
-                // Cut a hole in the darkening scrim on the page that should be highlighted, if any.
-                mLauncher.getDragLayer()
-                        .getDescendantRectRelativeToSelf(currCellLayout, mHighlightRect);
-                canvas.clipRect(mHighlightRect, Region.Op.DIFFERENCE);
-            }
-
-            super.draw(canvas);
-            canvas.restore();
-        }
-    }
-
-}
-- 
GitLab


From eb104ad9feac6e3cbc1e608bd623bda36cd3600b Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 15 Apr 2021 12:56:15 -0700
Subject: [PATCH 0890/1664] Adding surface-release check for live-tiles

Bug: 181615944
Test: Will wait for newer more bugreports
Change-Id: If82efbfa738ceb9890a9994607b13fd2bde096c4
---
 quickstep/src/com/android/quickstep/views/RecentsView.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 87c46bfe49..30560815b4 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2937,6 +2937,9 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             RecentsAnimationTargets recentsAnimationTargets) {
         mRecentsAnimationController = recentsAnimationController;
         if (recentsAnimationTargets != null && recentsAnimationTargets.apps.length > 0) {
+            if (mSyncTransactionApplier != null) {
+                recentsAnimationTargets.addReleaseCheck(mSyncTransactionApplier);
+            }
             mLiveTileTaskViewSimulator.setPreview(
                     recentsAnimationTargets.apps[recentsAnimationTargets.apps.length - 1]);
             mLiveTileParams.setTargetSet(recentsAnimationTargets);
-- 
GitLab


From a1817425d35c195f2f1e86b3ac7e763fae908bc6 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Thu, 15 Apr 2021 20:39:39 +0000
Subject: [PATCH 0891/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I601faa07c1a2ff65abe3fe14f9aef89b553c12b2
---
 quickstep/res/values-ar/strings.xml        | 55 +++++++++++-
 quickstep/res/values-as/strings.xml        | 88 ++++++++++++++++++-
 quickstep/res/values-b+sr+Latn/strings.xml | 53 +++++++++++-
 quickstep/res/values-be/strings.xml        | 53 +++++++++++-
 quickstep/res/values-bn/strings.xml        | 86 ++++++++++++++++++-
 quickstep/res/values-ca/strings.xml        | 53 +++++++++++-
 quickstep/res/values-cs/strings.xml        | 55 +++++++++++-
 quickstep/res/values-de/strings.xml        | 90 ++++++++++++++++++--
 quickstep/res/values-es/strings.xml        | 99 ++++++++--------------
 quickstep/res/values-et/strings.xml        | 53 +++++++++++-
 quickstep/res/values-eu/strings.xml        | 57 +++++++++++--
 quickstep/res/values-fi/strings.xml        | 99 ++++++++--------------
 quickstep/res/values-fr/strings.xml        | 88 ++++++++++++++++++-
 quickstep/res/values-gl/strings.xml        | 99 ++++++++--------------
 quickstep/res/values-hi/strings.xml        | 88 ++++++++++++++++++-
 quickstep/res/values-hr/strings.xml        | 99 ++++++++--------------
 quickstep/res/values-hu/strings.xml        | 55 +++++++++++-
 quickstep/res/values-in/strings.xml        | 57 +++++++++++--
 quickstep/res/values-is/strings.xml        | 53 +++++++++++-
 quickstep/res/values-ja/strings.xml        | 53 +++++++++++-
 quickstep/res/values-ka/strings.xml        | 55 +++++++++++-
 quickstep/res/values-kk/strings.xml        | 88 ++++++++++++++++++-
 quickstep/res/values-km/strings.xml        | 55 +++++++++++-
 quickstep/res/values-ko/strings.xml        | 55 +++++++++++-
 quickstep/res/values-lt/strings.xml        | 53 +++++++++++-
 quickstep/res/values-lv/strings.xml        | 53 +++++++++++-
 quickstep/res/values-mk/strings.xml        | 57 +++++++++++--
 quickstep/res/values-mn/strings.xml        | 99 ++++++++--------------
 quickstep/res/values-mr/strings.xml        | 86 ++++++++++++++++++-
 quickstep/res/values-ms/strings.xml        | 53 +++++++++++-
 quickstep/res/values-my/strings.xml        | 55 +++++++++++-
 quickstep/res/values-nb/strings.xml        | 53 +++++++++++-
 quickstep/res/values-pl/strings.xml        | 88 ++++++++++++++++++-
 quickstep/res/values-pt-rPT/strings.xml    | 99 ++++++++--------------
 quickstep/res/values-ro/strings.xml        | 53 +++++++++++-
 quickstep/res/values-ru/strings.xml        | 55 +++++++++++-
 quickstep/res/values-sl/strings.xml        | 55 +++++++++++-
 quickstep/res/values-sq/strings.xml        | 55 +++++++++++-
 quickstep/res/values-sr/strings.xml        | 53 +++++++++++-
 quickstep/res/values-sw/strings.xml        | 53 +++++++++++-
 quickstep/res/values-ta/strings.xml        | 53 +++++++++++-
 quickstep/res/values-te/strings.xml        | 88 ++++++++++++++++++-
 quickstep/res/values-th/strings.xml        | 99 ++++++++--------------
 quickstep/res/values-uk/strings.xml        | 55 +++++++++++-
 quickstep/res/values-ur/strings.xml        | 88 ++++++++++++++++++-
 quickstep/res/values-vi/strings.xml        | 53 +++++++++++-
 quickstep/res/values-zh-rCN/strings.xml    | 88 ++++++++++++++++++-
 quickstep/res/values-zh-rHK/strings.xml    | 99 ++++++++--------------
 quickstep/res/values-zh-rTW/strings.xml    | 99 ++++++++--------------
 49 files changed, 2687 insertions(+), 741 deletions(-)

diff --git a/quickstep/res/values-ar/strings.xml b/quickstep/res/values-ar/strings.xml
index b036bc1ebd..b55eb08b12 100644
--- a/quickstep/res/values-ar/strings.xml
+++ b/quickstep/res/values-ar/strings.xml
@@ -19,19 +19,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"تقسيم الشاشة"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"تثبيت"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"شكل مجاني"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"نظرة عامة"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"ليست هناك عناصر تم استخدامها مؤخرًا"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"إغلاق"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"إعدادات استخدام التطبيق"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"محو الكل"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"التطبيقات المستخدمة مؤخرًا"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>، <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"أقل من دقيقة"</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"يتبقى اليوم <xliff:g id="TIME">%1$s</xliff:g>."</string>
-    <string name="title_app_suggestions" msgid="4185902664111965088">"اقتراحات التطبيقات"</string>
+    <string name="title_app_suggestions" msgid="4185902664111965088">"التطبيقات المقترحة"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"جميع التطبيقات"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"تطبيقاتك المتوقّعة"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"رؤية التطبيقات المقترحة في الصف السفلي من الشاشة الرئيسية"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"رؤية التطبيقات المقترحة في صف التطبيقات المفضّلة في الشاشة الرئيسية"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"يمكنك الوصول إلى التطبيقات الأكثر استخدامًا بسهولة من الشاشة الرئيسية مباشرةً. سيتم تغيير الاقتراحات استنادًا إلى استخدامك الروتيني. وسيتم نقل التطبيقات من الصف السفلي في الشاشة الرئيسية إلى الصف الأعلى."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"يمكنك الوصول إلى التطبيقات الأكثر استخدامًا بسهولة من الشاشة الرئيسية مباشرةً. سيتم تغيير الاقتراحات استنادًا إلى سلاسل الإجراءات. سيتم نقل التطبيقات من صف التطبيقات المفضّلة إلى الشاشة الرئيسية."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"يمكنك الوصول إلى التطبيقات الأكثر استخدامًا بسهولة من الشاشة الرئيسية مباشرةً. سيتم تغيير الاقتراحات استنادًا إلى سلاسل الإجراءات. سيتم نقل التطبيقات من الصف الأسفل إلى مجلد جديد."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"رؤية تطبيقات مقترحة"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"لا، شكرًا"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"الإعدادات"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"تظهر هنا التطبيقات الأكثر استخدامًا، ويستند التغيير إلى سلاسل الإجراءات."</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"يمكنك سحب التطبيقات من الصف الأسفل لتلقّي اقتراحات."</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"تمت إضافة التطبيقات المقترحة إلى مساحة فارغة."</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"تم تفعيل ميزة \"التطبيقات المقترحة\"."</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ميزة \"التطبيقات المقترحة\" غير مفعّلة."</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"التطبيق المتوقع: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"تأكّد من التمرير سريعًا من أقصى الحافة اليمنى."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"تأكّد من التمرير سريعًا من الحافة اليمنى إلى وسط الشاشة ثم ارفع إصبعك."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"أكملت هذه الخطوة. جرِّب الآن التمرير سريعًا من الحافة اليسرى"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"تأكّد من التمرير سريعًا من أقصى الحافة اليسرى."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"تأكّد من التمرير سريعًا من الحافة اليسرى إلى وسط الشاشة ثم ارفع إصبعك."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"لقد أكملت التدريب على إيماءة الرجوع. تعرّف بعد ذلك على كيفية الانتقال إلى الشاشة الرئيسية."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"تأكّد من عدم التمرير بالقرب من أسفل الشاشة."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"لتغيير مستوى حساسية إيماءة الرجوع، انتقِل إلى \"الإعدادات\""</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"مرِّر سريعًا للرجوع."</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"للرجوع إلى الشاشة السابقة، مرِّر سريعًا من الحافة اليسرى أو الحافة اليمنى إلى وسط الشاشة."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"تأكّد من التمرير سريعًا من الحافة السفلى للشاشة إلى أعلاها."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"تأكّد من عدم التوقّف قليلاً قبل رفع إصبعك."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"تأكّد من التمرير إلى الأعلى مباشرةً."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"أكملت التدريب على إيماءة الانتقال إلى الشاشة الرئيسية. تعرّف بعد ذلك على كيفية التبديل بين التطبيقات."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"مرِّر سريعًا للانتقال إلى الشاشة الرئيسية"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"مرِّر سريعًا من أسفل الشاشة إلى أعلاها. تنقلك هذه الإيماءة دائمًا إلى الشاشة الرئيسية."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"تأكّد من التمرير سريعًا من الحافة السفلى للشاشة إلى أعلاها."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"حاوِل إبقاء إصبعك على النافذة لمدة أطول قبل رفعه."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"تأكّد من التمرير سريعًا للأعلى مباشرةً ثم التوقّف قليلاً."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"أكملت التدريب على إيماءة التبديل بين التطبيقات. أنت جاهز لاستخدام هاتفك."</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"مرِّر سريعًا للتبديل بين التطبيقات"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"مرِّر سريعًا من أسفل الشاشة إلى أعلاها، وأبقِ إصبعك على الشاشة قليلاً ثم ارفعه."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"اكتمل التدريب على الإيماءة"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"التالي"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"تم"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"الإعدادات"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"إعادة المحاولة"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"أحسنت"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"الدليل التوجيهي <xliff:g id="CURRENT">%1$d</xliff:g> من إجمالي <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"مشاركة"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"لقطة شاشة"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"لا يسمح التطبيق أو لا تسمح مؤسستك بهذا الإجراء."</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"هل تريد تخطي الدليل التوجيهي؟"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"يمكنك العثور على هذا الدليل التوجيهي لاحقًا في التطبيق \"نصائح\""</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"إلغاء"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"التخطي"</string>
 </resources>
diff --git a/quickstep/res/values-as/strings.xml b/quickstep/res/values-as/strings.xml
index c188493e59..acbbe16a97 100644
--- a/quickstep/res/values-as/strings.xml
+++ b/quickstep/res/values-as/strings.xml
@@ -19,19 +19,99 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"বিভাজিত স্ক্ৰীণ"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"পিন"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Freeform"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"অৱলোকন"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"কোনো শেহতীয়া বস্তু নাই"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"বন্ধ কৰক"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"এপে ব্যৱহাৰ কৰা ডেটাৰ ছেটিংসমূহ"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"সকলো মচক"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"শেহতীয়া এপসমূহ"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>, <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; ১ মিনিট"</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"আজি <xliff:g id="TIME">%1$s</xliff:g> বাকী আছ"</string>
-    <string name="title_app_suggestions" msgid="4185902664111965088">"এপৰ পৰামৰ্শসমূহ"</string>
+    <string name="title_app_suggestions" msgid="4185902664111965088">"এপ চাজেশ্বন"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"সকলো এপ্"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"আপোনাৰ অনুমানিক এপ্"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"আপোনাৰ গৃহ স্ক্ৰীনৰ একেবাৰে তলৰ শাৰীটোত এপৰ পৰামর্শসমূহ পাওক"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"আপোনাৰ গৃহ স্ক্ৰীনৰ প্ৰিয় সমলৰ শাৰীটোত এপৰ পৰামর্শসমূহ পাওক"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"আপোনাৰ সকলোতকৈ বেছিকৈ ব্যৱহৃত এপ্‌সমূহ গৃহ স্ক্ৰীনতে সহজে এক্সেছ কৰক। আপোনাৰ ৰুটিনসমূহৰ ভিত্তিত পৰামর্শসমূহ সলনি হ\'ব। একেবাৰে তলৰ শাৰীটোত থকা এপ্‌সমূহ ওপৰৰ আপোনাৰ গৃহ স্ক্ৰীনলৈ যাব।"</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"আপোনাৰ সকলোতকৈ বেছিকৈ ব্যৱহৃত এপ্‌সমূহ গৃহ স্ক্ৰীনতে সহজে এক্সেছ কৰক। আপোনাৰ ৰুটিনসমূহৰ ভিত্তিত পৰামর্শসমূহ সলনি হ’ব। প্ৰিয় সমলৰ শাৰীত থকা এপ্‌সমূহ আপোনাৰ গৃহ স্ক্রীনলৈ যাব।"</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"আপোনাৰ সকলোতকৈ বেছিকৈ ব্যৱহৃত এপ্‌সমূহ গৃহ স্ক্ৰীনতে সহজে এক্সেছ কৰক। আপোনাৰ ৰুটিনসমূহৰ ভিত্তিত পৰামর্শসমূহ সলনি হ\'ব। একেবাৰে তলৰ শাৰীটোত থকা এপ্‌সমূহ এটা নতুন ফ\'ল্ডাৰলৈ যাব।"</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"এপৰ পৰামর্শসমূহ পাওক"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"নালাগে, ধন্যবাদ"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"ছেটিংসমূহ"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"সকলোতকৈ বেছিকৈ ব্যৱহৃত এপ্‌সমূহ ইয়াত প্ৰদর্শিত হয় আৰু ৰুটিনসমূহ ওপৰত ভিত্তি কৰি সলনি হয়"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"এপৰ পৰামর্শসমূহ পাবলৈ একেবাৰে তলৰ শাৰীত থকা এপ্‌সমূহ টানি আঁতৰাওক"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"খালী ঠাইত এপৰ পৰামর্শসমূহ যোগ কৰা হ\'ল"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"এপৰ পৰামৰ্শসমূহ সক্ষম কৰা আছে"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"এপৰ পৰামৰ্শসমূহ অক্ষম কৰা আছে"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"পূৰ্বানুমান কৰা এপ্: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
+    <skip />
+    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
+    <skip />
+    <string name="action_share" msgid="2648470652637092375">"শ্বেয়াৰ কৰক"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"স্ক্ৰীনশ্বট"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"এপ্‌টোৱে অথবা আপোনাৰ প্ৰতিষ্ঠানে এই কাৰ্যটোৰ অনুমতি নিদিয়ে"</string>
+    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
+    <skip />
+    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <skip />
 </resources>
diff --git a/quickstep/res/values-b+sr+Latn/strings.xml b/quickstep/res/values-b+sr+Latn/strings.xml
index fbbe9d2dc5..71e57f8cde 100644
--- a/quickstep/res/values-b+sr+Latn/strings.xml
+++ b/quickstep/res/values-b+sr+Latn/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Podeljeni ekran"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Zakači"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Slobodni oblik"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Pregled"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Nema nedavnih stavki"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Zatvori"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Podešavanja korišćenja aplikacije"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Obriši sve"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Nedavne aplikacije"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Predlozi aplikacija"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Sve aplikacije"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Predviđene aplikacije"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Dobijajte predloge aplikacija u donjem redu početnog ekrana"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Dobijajte predloge aplikacija u redu sa omiljenim stavkama na početnom ekranu"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Lako pristupajte aplikacijama koje najčešće koristite direktno sa početnog ekrana. Predlozi se menjaju na osnovu upotrebe. Aplikacije iz donjeg reda se premeštaju nagore na početni ekran."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Lako pristupajte aplikacijama koje najčešće koristite direktno sa početnog ekrana. Predlozi se menjaju na osnovu vaših rutina. Aplikacije iz reda sa omiljenim stavkama se premeštaju na početni ekran."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Lako pristupajte aplikacijama koje najčešće koristite direktno sa početnog ekrana. Predlozi se menjaju na osnovu upotrebe. Aplikacije iz donjeg reda se premeštaju u nov folder."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Prikazuj predloge aplikacija"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Ne, hvala"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Podešavanja"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Ovde se prikazuju najčešće korišćene aplikacije i menjaju se u zavisnosti od upotrebe"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Prevucite aplikacije iz donjeg reda da biste dobili predloge"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Predlozi aplikacija se dodaju na prazno mesto"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Predlozi aplikacija su omogućeni"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Predlozi aplikacija su onemogućeni"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predviđamo aplikaciju: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Obavezno prevucite od same leve ivice."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Obavezno prevucite od leve ivice do sredine ekrana i otpustite."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"To je sve! Sada probajte da prevučete od desne ivice."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Obavezno prevucite od same desne ivice."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Obavezno prevucite od desne ivice do sredine ekrana i otpustite."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Dovršili ste pokret za povratak. Sada saznajte kako da odete na početnu stranicu."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nikako ne prevlačite previše blizu dna ekrana."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Osetljivost pok. za nazad možete da promenite u Podešavanjima"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Prevucite da biste se vratili"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Da biste se vratili na poslednji ekran, prevucite od leve ili desne ivice do sredine ekrana."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Obavezno prevucite nagore od donje ivice ekrana."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Nikako ne stajte pre otpuštanja."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Obavezno prevucite pravo nagore."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Dovršili ste pokret za povratak na početnu stranicu. Sada saznajte kako da promenite aplikacije."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Prevucite da biste otišli na početnu stranicu"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Prevucite nagore od dna ekrana. Ovaj pokret vas uvek vodi na početni ekran."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Obavezno prevucite nagore od donje ivice ekrana."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Probajte da držite prozor duže pre otpuštanja."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Obavezno prevucite pravo nagore, pa zastanite."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Dovršili ste pokret za promenu aplikacija. Spremni ste za korišćenje telefona!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Prevucite da biste promenili aplikacije"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Prevucite nagore od dna ekrana, zadržite, pa pustite."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"To je to"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Dalje"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Gotovo"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Podešavanja"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Probajte ponovo"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Svaka čast!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Vodič <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Deli"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Snimak ekrana"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikacija ili organizacija ne dozvoljavaju ovu radnju"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Želite da preskočite vodič za kretanje?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Možete da pronađete ovo u apl. Saveti"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Otkaži"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Preskoči"</string>
 </resources>
diff --git a/quickstep/res/values-be/strings.xml b/quickstep/res/values-be/strings.xml
index c4a277267c..e062b8d277 100644
--- a/quickstep/res/values-be/strings.xml
+++ b/quickstep/res/values-be/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Падзяліць экран"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Замацаваць"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Адвольная форма"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Агляд"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Няма новых элементаў"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Закрыць"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Налады выкарыстання праграмы"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Ачысціць усё"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Нядаўнія праграмы"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Прапановы праграм"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Усе праграмы"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Вашы праграмы з падказак"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Атрымлівайце прапановы праграм у ніжнім радку на Галоўным экране."</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Атрымлівайце прапановы праграм у пераліку абраных на Галоўным экране"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Атрымлiвайце доступ да праграм, якімі вы карыстаецеся найбольш часта, непасрэдна з Галоўнага экрана. Прапановы будуць змяняцца ў залежнасці ад вашых дзеянняў. Праграмы, якія знаходзяцца ў ніжнім радку, будуць перамешчаны на Галоўны экран."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Атрымлівайце доступ да праграм, якімі вы карыстаецеся найбольш часта, непасрэдна з Галоўнага экрана. Прапановы будуць змяняцца ў залежнасці ад вашых дзеянняў. Пералік абраных праграм будзе перамешчаны на Галоўны экран."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Атрымлiвайце просты доступ да праграм, якімі вы карыстаецеся найбольш часта, непасрэдна з Галоўнага экрана. Прапановы будуць змяняцца ў залежнасці ад вашых дзеянняў. Праграмы, якія знаходзяцца ў ніжнім радку, будуць перамешчаны ў новую папку."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Атрымаць прапановы праграм"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Не, дзякуй"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Налады"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Тут з\'яўляюцца праграмы, якімі вы карыстаецеся найбольш часта. Гэты спіс змяняецца на падставе вашых дзеянняў"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Перацягніце праграмы з ніжняга радка, каб атрымаць прапановы праграм"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Прапановы праграм дададзены на свабоднае месца"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Прапановы праграм уключаны"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Прапановы праграм выключаны"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Праграма з падказкі: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Пераканайцеся, што вы не праводзіце пальцам занадта далёка ад левага вугла экрана."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Пераканайцеся, што праводзіце пальцам з левага вугла ў цэнтр экрана, а потым адпускаеце."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Гатова! Цяпер правядзіце пальцам ад правага краю."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Пераканайцеся, што вы не праводзіце пальцам занадта далёка ад правага вугла экрана."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Пераканайцеся, што праводзіце пальцам з правага вугла ў цэнтр экрана, а потым адпускаеце."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Вы навучыліся рабіць жэст вяртання. А зараз даведайцеся, як перайсці на галоўны экран."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Пераканайцеся, што вы не праводзіце пальцам занадта блізка да ніжняга краю экрана."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Каб змяніць адчувальнасць жэста вяртання, адкрыйце налады"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Правядзіце пальцам, каб вярнуцца"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Каб вярнуцца на папярэдні экран, правядзіце пальцам ад левага ці правага краю да цэнтра экрана."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Пераканайцеся, што праводзіце пальцам па экране знізу ўверх."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Пераканайцеся, што не затрымліваецеся перад адпусканнем."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Пераканайцеся, што праводзіце пальцам вертыкальна."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Вы навучыліся рабіць жэст пераходу на галоўны экран. А зараз даведайцеся, як пераключацца паміж праграмамі."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Правесці пальцам для пераходу на галоўны экран"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Правядзіце пальцам па экране знізу ўверх. Гэты жэст дазваляе вярнуцца на Галоўны экран."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Пераканайцеся, што праводзіце пальцам па экране знізу ўверх."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Перш чым адпусціць палец, паспрабуйце даўжэй утрымліваць акно націснутым."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Пераканайцеся, што праводзіце пальцам вертыкальна, а потым затрымліваеце яго."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Вы навучыліся рабіць жэст пераключэння паміж праграмамі. Цяпер вы можаце выкарыстоўваць тэлефон!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Правесці пальцам для пераключэння паміж праграмамі"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Правядзіце па экране знізу ўверх, утрымліваючы палец націснутым, потым адпусціце."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Гатова"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Далей"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Гатова"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Налады"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Паўтарыць спробу"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Выдатна!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Дапаможнік <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Абагуліць"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Здымак экрана"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Гэта дзеянне не дазволена праграмай ці вашай арганізацыяй"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Прапусціць дапаможнік па навігацыі?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Знайсці дапаможнік можна ў \"Парадах\""</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Скасаваць"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Прапусціць"</string>
 </resources>
diff --git a/quickstep/res/values-bn/strings.xml b/quickstep/res/values-bn/strings.xml
index 57f92e5a0c..1d5fd2b559 100644
--- a/quickstep/res/values-bn/strings.xml
+++ b/quickstep/res/values-bn/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"স্ক্রিন স্প্লিট করুন"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"পিন করুন"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"ফ্রি-ফর্ম"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"এক নজরে"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"কোনো সাম্প্রতিক আইটেম নেই"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"বন্ধ করুন"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"অ্যাপ ব্যবহারের সেটিংস"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"সবকিছু খালি করুন"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"সম্প্রতি ব্যবহৃত অ্যাপ"</string>
@@ -34,4 +31,87 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"অ্যাপের সাজেশন"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"সব অ্যাপ"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"আপনার প্রয়োজন হতে পারে এমন অ্যাপ"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"আপনার হোম স্ক্রিনের নিচে সারিতে অ্যাপ সাজেশন পান"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"হোম স্ক্রিনের \'ফেভারিট রো\' বিকল্পের জন্য অ্যাপ সাজেশন পান"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"হোম স্ক্রিন থেকে সরাসরি সব থেকে বেশি ব্যবহার করা অ্যাপগুলি অ্যাক্সেস করুন। আপনার রুটিনের উপর ভিত্তি করে সাজেশন পরির্তন করা হবে। নিচের সারিতে থাকা অ্যাপ আপনার হোম স্ক্রিনে সরানো হবে।"</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"খুব বেশি ব্যবহার করেন এমন অ্যাপগুলি হোম স্ক্রিন থেকে সহজে সরাসরি অ্যাক্সেস করুন। আপনার রুটিন অনুযায়ী সাজেশন পরির্তন করা হবে। \'ফেভারিট রো\' বিকল্পে থাকা অ্যাপগুলি হোম স্ক্রিনে সরিয়ে দেওয়া হবে।"</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"হোম স্ক্রিনের পাশে সব থেকে ব্যবহার করা অ্যাপ সহজেই অ্যাক্সেস করুন। আপনার রুটিনের উপর ভিত্তি করে সাজেশন পরির্তন করা হবে। নিচের সারিতে থাকা অ্যাপ নতুন ফোল্ডারে সরানো হবে।"</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"অ্যাপ সাজেশন পান"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"না থাক"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"সেটিংস"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"সব থেকে বেশি ব্যবহার করা অ্যাপ এখানে দেখানো হয় এবং রুটিনের উপর ভিত্তি করে পরিবর্তন হতে পারে"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"অ্যাপ সাজেশন পেতে নিচের সারিতে অ্যাপগুলি টেনে আনুন"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"খালি জায়গাতে অ্যাপ সাজেশন যোগ করা হয়েছে"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"অ্যাপ সাজেশন চালু করা আছে"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"অ্যাপ সাজেশন বন্ধ করা আছে"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"আপনার প্রয়োজন হতে পারে এমন অ্যাপ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
+    <skip />
+    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
+    <skip />
+    <string name="action_share" msgid="2648470652637092375">"শেয়ার করুন"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"স্ক্রিনশট নিন"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"এই অ্যাপ বা আপনার প্রতিষ্ঠান এই অ্যাকশনটি পারফর্ম করার অনুমতি দেয়নি"</string>
+    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
+    <skip />
+    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <skip />
 </resources>
diff --git a/quickstep/res/values-ca/strings.xml b/quickstep/res/values-ca/strings.xml
index 6420aa8cb8..a13aa4b340 100644
--- a/quickstep/res/values-ca/strings.xml
+++ b/quickstep/res/values-ca/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Pantalla dividida"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Fixa"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Format lliure"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Aplicacions recents"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"No hi ha cap element recent"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Tanca"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Configuració d\'ús d\'aplicacions"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Esborra-ho tot"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Aplicacions recents"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Suggeriments d\'aplicacions"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Totes les aplicacions"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Prediccions d\'aplicacions"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Obtén suggeriments d\'aplicacions a la fila inferior de la pantalla d\'inici"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Obtén suggeriments d\'aplicacions a la fila Preferides de la teva pantalla d\'inici"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Accedeix fàcilment a les aplicacions que més utilitzes des de la pantalla d\'inici. Els suggeriments variaran en funció dels teus hàbits. Les aplicacions de la fila inferior pujaran a la pantalla d\'inici."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Accedeix fàcilment a les aplicacions que més utilitzes des de la pantalla d\'inici. Els suggeriments variaran en funció dels teus hàbits. Les aplicacions de la fila Preferides es mouran a la teva pantalla d\'inici."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Accedeix fàcilment a les aplicacions que més utilitzes des de la pantalla d\'inici. Els suggeriments variaran en funció dels teus hàbits. Les aplicacions de la fila inferior es mouran a una carpeta nova."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Mostra suggeriments d\'aplicacions"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"No, gràcies"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Configuració"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Les aplicacions que més utilitzes apareixen aquí i poden variar en funció dels teus hàbits"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Arrossega les aplicacions fora de la fila inferior per obtenir suggeriments d\'aplicacions"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"S\'han afegit suggeriments d\'aplicacions en un espai buit"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Els suggeriments d\'aplicacions estan activats"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Els suggeriments d\'aplicacions estan desactivats"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicció d\'aplicació: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Assegura\'t de lliscar des de l\'extrem esquerre de la pantalla."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Assegura\'t de lliscar des de la vora esquerra cap al centre de la pantalla i deixa anar."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Ja està! Ara, prova de lliscar des de la vora dreta."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Assegura\'t de lliscar des de l\'extrem dret de la pantalla."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Assegura\'t de lliscar des de la vora dreta cap al centre de la pantalla i deixa anar."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Has completat el gest per anar enrere. Ara, descobreix com pots anar a la pantalla d\'inici."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Assegura\'t de no lliscar massa a prop de la part inferior de la pantalla."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Per canviar la sensibilitat del gest, ves a Configuració"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Llisca per anar enrere"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Per tornar a la darrera pantalla, llisca des de la vora esquerra o dreta cap al centre de la pantalla."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Assegura\'t de lliscar des de la vora inferior de la pantalla."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Assegura\'t de no aturar-te abans de deixar anar."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Assegura\'t de lliscar directament cap amunt."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Has completat el gest per anar a la pantalla d\'inici. Ara, descobreix com pots canviar d\'aplicació."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Llisca per anar a la pantalla d\'inici"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Llisca cap amunt des de la part inferior de la pantalla. Aquest gest et porta a la pantalla d\'inici."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Assegura\'t de lliscar des de la vora inferior de la pantalla."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Prova de mantenir premuda la finestra durant més temps abans de deixar anar."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Assegura\'t de lliscar directament cap amunt i després aturar-te."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Has completat el gest per canviar d\'aplicació. Ja ho tens tot a punt per utilitzar el telèfon."</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Llisca per canviar d\'aplicació"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Llisca cap amunt des de la part inferior de la pantalla, mantén premut i deixa anar."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Tot a punt"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Següent"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Fet"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Configuració"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Torna-ho a provar"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Molt bé!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Comparteix"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Captura de pantalla"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"L\'aplicació o la teva organització no permeten aquesta acció"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Vols ometre el tutorial de navegació?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Pots trobar-ho més tard a l\'app Consells"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancel·la"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Omet"</string>
 </resources>
diff --git a/quickstep/res/values-cs/strings.xml b/quickstep/res/values-cs/strings.xml
index 194ff87dc5..8d5010f99b 100644
--- a/quickstep/res/values-cs/strings.xml
+++ b/quickstep/res/values-cs/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Rozdělená obrazovka"</string>
-    <string name="recent_task_option_pin" msgid="7929860679018978258">"PIN"</string>
+    <string name="recent_task_option_pin" msgid="7929860679018978258">"Připnout"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Neomezený režim"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Přehled"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Žádné nedávné položky"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Zavřít"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Nastavení využití aplikací"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Vymazat vše"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Poslední aplikace"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Návrhy aplikací"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Všechny aplikace"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Vaše předpovídané aplikace"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Nechte si ve spodním řádku na ploše zobrazovat návrhy aplikací"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Nechte si na řádku oblíbených na ploše zobrazovat návrhy aplikací"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Mějte nejpoužívanější aplikace k dispozici přímo na ploše. Návrhy se budou měnit v závislosti na sledech činností. Aplikace ve spodním řádku se přesunou na vaši plochu."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Mějte nejpoužívanější aplikace k dispozici přímo na ploše. Návrhy se budou měnit v závislosti na sledech činností. Aplikace na řádku oblíbených se přesunou na plochu."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Mějte nejpoužívanější aplikace k dispozici přímo na ploše. Návrhy se budou měnit v závislosti na sledech činností. Aplikace ve spodním řádku se přesunou do nové složky."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Zobrazovat návrhy aplikací"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Ne, díky"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Nastavení"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Zde se zobrazují nejpoužívanější aplikace (které se mění podle sledů činností)"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Chcete-li získat návrhy aplikací, přetáhněte aplikace z dolního řádku"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Volné místo bylo vyplněno návrhy aplikací"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Návrhy aplikací jsou povoleny"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Návrhy aplikací jsou zakázány"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Předpokládaná aplikace: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Přejeďte prstem z úplného levého okraje obrazovky."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Přejeďte prstem z levého okraje doprostřed obrazovky a zdvihněte prst."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"A je to! Teď zkuste přejet prstem z pravého okraje."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Přejeďte prstem z úplného pravého okraje obrazovky."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Přejeďte prstem z pravého okraje doprostřed obrazovky a zdvihněte prst."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Dokončili jste gesto pro přechod zpět. Teď se naučíme přejít na plochu."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Dejte pozor, abyste prstem nepřejížděli moc blízko ke spodnímu okraji obrazovky."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Citlivost gesta pro přechod zpět můžete změnit v Nastavení"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Přejetím prstem se vrátíte zpět"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"K návratu na poslední obrazovku přejeďte prstem z levého nebo pravého okraje obrazovky doprostřed."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Přejeďte prstem nahoru z dolního okraje obrazovky."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Před zdvihnutím prstu nedělejte pauzu."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Přejeďte prstem přímo nahoru."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Dokončili jste gesto pro přechod na plochu. Teď se naučíme přepínat aplikace."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Přechod na plochu přejetím prstem"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Přejeďte prstem ze spodní části obrazovky nahoru. Tímto gestem se vždy dostanete na plochu."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Přejeďte prstem nahoru z dolního okraje obrazovky."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Zkuste podržet okno delší dobu, než ho uvolníte."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Přejeďte prstem přímo nahoru a pak udělejte pauzu."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Dokončili jste gesto pro přepínání aplikací. Jste připraveni používat telefon."</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Přepínání aplikací přejetím prstem"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Přejeďte prstem nahoru z dolního okraje obrazovky, podržte obrazovku a potom prst uvolněte."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Vše je nastaveno"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Další"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Hotovo"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Nastavení"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Zkusit znovu"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Skvělé!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Výukový program <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Sdílet"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Snímek obrazovky"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikace nebo organizace zakazuje tuto akci"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Přeskočit výukový program k navigaci?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Program později najdete v aplikaci Tipy"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Zrušit"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Přeskočit"</string>
 </resources>
diff --git a/quickstep/res/values-de/strings.xml b/quickstep/res/values-de/strings.xml
index 449cc8c11d..c5ccfb6dfc 100644
--- a/quickstep/res/values-de/strings.xml
+++ b/quickstep/res/values-de/strings.xml
@@ -19,19 +19,99 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Splitscreen"</string>
-    <string name="recent_task_option_pin" msgid="7929860679018978258">"Anpinnen"</string>
+    <string name="recent_task_option_pin" msgid="7929860679018978258">"Fixieren"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Freeform-Modus"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Übersicht"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Keine kürzlich verwendeten Elemente"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Schließen"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Einstellungen zur App-Nutzung"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Alle Apps schließen"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Zuletzt aktive Apps"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>, <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
-    <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; 1 min"</string>
+    <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; 1 Min."</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"Heute noch <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="title_app_suggestions" msgid="4185902664111965088">"App-Vorschläge"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Alle Apps"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"App-Vorschläge für dich"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Lass dir in der unteren Reihe auf deinem Startbildschirm Vorschläge für Apps anzeigen"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Lass dir in der Favoritenleiste auf dem Startbildschirm App-Vorschläge anzeigen"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Schneller Zugriff auf deine meistverwendeten Apps direkt über den Startbildschirm. Die Vorschläge werden deiner Nutzung entsprechend laufend angepasst. Apps in der unteren Reihe werden nach oben auf den Startbildschirm verschoben."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Schneller Zugriff auf deine meistverwendeten Apps direkt über den Startbildschirm. Die Vorschläge werden deiner Nutzung entsprechend laufend angepasst. Apps der Favoritenleiste werden auf den Startbildschirm verschoben."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Schneller Zugriff auf deine meistverwendeten Apps direkt über den Startbildschirm. Die Vorschläge werden deiner Nutzung entsprechend laufend angepasst. Apps in der unteren Reihe werden in einen neuen Ordner verschoben."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"App-Vorschläge erhalten"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Nein danke"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Einstellungen"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Hier erscheinen die meistverwendeten Apps. Die Angaben können sich je nach deiner gewöhnlichen Nutzung ändern"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Ziehe Apps aus der unteren Reihe heraus, um Vorschläge für Apps zu erhalten"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"App-Vorschläge in freiem Bereich hinzugefügt"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Funktion \"App-Vorschläge\" aktiviert"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Funktion \"App-Vorschläge\" deaktiviert"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Vorgeschlagene App: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
+    <skip />
+    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
+    <skip />
+    <string name="action_share" msgid="2648470652637092375">"Teilen"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Die App oder deine Organisation lässt diese Aktion nicht zu"</string>
+    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
+    <skip />
+    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <skip />
 </resources>
diff --git a/quickstep/res/values-es/strings.xml b/quickstep/res/values-es/strings.xml
index b299acfbcb..15e582ecec 100644
--- a/quickstep/res/values-es/strings.xml
+++ b/quickstep/res/values-es/strings.xml
@@ -45,73 +45,40 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Sugerencias de aplicaciones habilitadas"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Las sugerencias de aplicaciones están inhabilitadas"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplicación sugerida: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
-    <skip />
-    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Desliza el dedo desde el extremo izquierdo."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Desliza el dedo desde el borde izquierdo de la pantalla hasta el centro y levántalo."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Eso es todo. Ahora desliza el dedo desde el borde derecho."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Desliza el dedo desde el extremo derecho."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Desliza el dedo desde el borde derecho de la pantalla hasta el centro y levántalo."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Has completado el gesto para volver. Ahora, descubre cómo ir a la pantalla de inicio."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"No deslices el dedo demasiado cerca de la parte inferior de la pantalla."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Para cambiar la sensibilidad del gesto, ve a Ajustes"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Desliza el dedo para volver"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Para volver a la última pantalla, desliza el dedo desde un lateral de la pantalla hasta el centro."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Desliza el dedo hacia arriba desde el borde inferior de la pantalla."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"No hagas ninguna pausa antes de levantar el dedo."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Desliza el dedo directamente hacia arriba."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Has completado el gesto para ir a la pantalla de inicio. Ahora, descubre cómo cambiar de aplicación."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Desliza el dedo para ir a la pantalla de inicio"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Desliza hacia arriba desde la parte inferior. Con este gesto, siempre irás a la pantalla de inicio."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Desliza el dedo hacia arriba desde el borde inferior de la pantalla."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Prueba a mantener pulsada la ventana durante más tiempo antes de soltarla."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Desliza el dedo directamente hacia arriba y luego mantenlo pulsado."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Has completado el gesto para cambiar de aplicación. Ya puedes usar el teléfono."</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Deslizar el dedo para cambiar de aplicación"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Desliza el dedo hacia arriba desde la parte inferior de la pantalla, mantenlo pulsado y levántalo."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Listo"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Siguiente"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Listo"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Ajustes"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Reintentar"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"¡Muy bien!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="action_share" msgid="2648470652637092375">"Compartir"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Hacer captura"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"No puedes hacerlo porque la aplicación o tu organización no lo permiten"</string>
-    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
-    <skip />
-    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
-    <skip />
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"¿Saltar tutorial de navegación?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Tutorial disponible en Consejos para Pixel"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancelar"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Saltar"</string>
 </resources>
diff --git a/quickstep/res/values-et/strings.xml b/quickstep/res/values-et/strings.xml
index 0577b0f562..a40cd2b9e3 100644
--- a/quickstep/res/values-et/strings.xml
+++ b/quickstep/res/values-et/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Jagatud ekraan"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Kinnita"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Vabavorm"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Ülevaade"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Hiljutisi üksusi pole"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Sule"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Rakenduse kasutuse seaded"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Sule kõik"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Hiljutised rakendused"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Rakenduste soovitused"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Kõik rakendused"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Teie ennustatud rakendused"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Hankige avakuva alumisel real rakenduste soovitusi"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Hankige avakuva lemmikute reale rakenduste soovitusi"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Pääsete enim kasutatavatele rakendustele hõlpsasti juurde otse avakuvalt. Soovitused muutuvad olenevalt teie rutiinist. Alumisel real olevad rakendused teisaldatakse teie avakuvale."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Pääsete enim kasutatavatele rakendustele hõlpsasti juurde otse avakuvalt. Soovitused muutuvad olenevalt teie rutiinist. Lemmikute real olevad rakendused teisaldatakse teie avakuvale."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Pääsete enim kasutatavatele rakendustele hõlpsasti juurde otse avakuvalt. Soovitused muutuvad olenevalt teie rutiinist. Alumisel real olevad rakendused teisaldatakse uude kausta."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Hangi rakenduste soovitusi"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Tänan, ei"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Seaded"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Siin kuvatakse enim kasutatavad rakendused, mis võivad olenevalt rutiinist muutuda."</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Rakenduste soovituste hankimiseks lohistage rakendused alumiselt realt ära"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Rakenduste soovitused lisati tühjale kohale"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Rakenduste soovitused on lubatud"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Rakenduste soovitused on keelatud"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Ennustatud rakendus: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pühkige kindlasti vasakpoolsest servast."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pühkige ekraanikuva vasakust servast keskele ja eemaldage sõrm."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Ongi kõik! Nüüd proovige paremast servast pühkida."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pühkige kindlasti parempoolsest servast."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pühkige ekraanikuva paremast servast keskele ja eemaldage sõrm."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Tegite tagasiliikumise liigutuse. Järgmisena vaadake, kuidas minna avakuvale."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Veenduge, et te ei pühiks liiga ekraanikuva allosa lähedalt."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Tagasiliigutuse tundlikkuse muutmiseks avage menüü Seaded"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Tagasiliikumiseks pühkige"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Eelmisele ekraanikuvale naasmiseks pühkige vasakust või paremast servast ekraanikuva keskele."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pühkige kindlasti ekraanikuva alumisest servast üles."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Veenduge, et te enne vabastamist liigutust ei peataks."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pühkige kindlasti otse üles."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Tegite avakuvale minemise liigutuse. Järgmisena vaadake, kuidas rakenduste vahel vahetada."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Pühkimine avakuvale minemiseks"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Pühkige ekraani alaosast üles. See liigutus viib teid alati tagasi avakuvale."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Pühkige kindlasti ekraanikuva alumisest servast üles."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Hoidke sõrme aknal pisut kauem, enne kui vabastate."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Pühkige kindlasti otse üles, seejärel peatuge."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Tegite rakenduste vahel vahetamise liigutuse. Olete oma telefoni kasutamiseks valmis!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Rakenduste vahel vahetamiseks pühkimine"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Pühkige ekraanikuva alaosast üles, hoidke ja seejärel vabastage."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Valmis"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Järgmine"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Valmis"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Seaded"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Proovige uuesti"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Tubli töö!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Õpetus <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Jaga"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Ekraanipilt"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Rakendus või teie organisatsioon on selle toimingu keelanud"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Kas jätta navigeerimise õpetused vahele?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Leiate selle hiljem rakendusest Nõuanded"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Tühista"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Jäta vahele"</string>
 </resources>
diff --git a/quickstep/res/values-eu/strings.xml b/quickstep/res/values-eu/strings.xml
index c2d149e362..1a09676eca 100644
--- a/quickstep/res/values-eu/strings.xml
+++ b/quickstep/res/values-eu/strings.xml
@@ -19,19 +19,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Zatitu pantaila"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Ainguratu"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Modu librea"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Ikuspegi orokorra"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Ez dago azkenaldi honetako ezer"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Itxi"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Aplikazioen erabileraren ezarpenak"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Garbitu guztiak"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Azken aplikazioak"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g> (<xliff:g id="REMAINING_TIME">%2$s</xliff:g>)"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; 1 min"</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"<xliff:g id="TIME">%1$s</xliff:g> gelditzen dira gaur"</string>
-    <string name="title_app_suggestions" msgid="4185902664111965088">"Iradokitako aplikazioak"</string>
+    <string name="title_app_suggestions" msgid="4185902664111965088">"Aplikazioen iradokizunak"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Aplikazio guztiak"</string>
-    <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Lagungarri izan dakizkizukeen aplikazioak"</string>
+    <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Iradokitako aplikazioak"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Jaso aplikazioen iradokizunak hasierako pantailaren beheko errenkadan"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Jaso aplikazioen iradokizunak hasierako pantailako gogokoen errenkadan"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Atzitu erraz aplikazio erabilienak hasierako pantailatik bertatik. Ohituren arabera aldatuko dira iradokizunak. Hasierako pantailara eramango dira beheko errenkadan dauden aplikazioak."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Atzitu erraz aplikazio erabilienak hasierako pantailatik bertatik. Ohituren arabera aldatuko dira iradokizunak. Gogokoen errenkadako aplikazioak hasierako pantailara eramango ditugu."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Atzitu erraz aplikazio erabilienak hasierako pantailatik bertatik. Ohituren arabera aldatuko dira iradokizunak. Karpeta berri batera eramango dira beheko errenkadan dauden aplikazioak."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Jaso aplikazioen iradokizunak"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Ez"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Ezarpenak"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Hemen agertzen dira aplikazio erabilienak, eta ohituren arabera aldatzen dira"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Arrastatu aplikazioak beheko errenkadatik aplikazioen iradokizunak jasotzeko"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Aplikazioen iradokizunak eremu huts batean gehitu dira"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Gaituta daude aplikazioen iradokizunak"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Desgaituta daude aplikazioen iradokizunak"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Iragarritako aplikazioa: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Ziurtatu hatza ezkerreko ertzetik pasatzen duzula."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Ziurtatu hatza pantailaren ezkerreko ertzetik erdialdera pasatzen eta askatzen duzula."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Hori da. Orain, saiatu hatza eskuineko ertzetik pasatzen."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Ziurtatu hatza eskuineko ertzetik pasatzen duzula."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Ziurtatu hatza pantailaren eskuineko ertzetik erdialdera pasatzen eta askatzen duzula."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Ikasi duzu atzera egiteko keinua. Jarraian, ikasi hasierako pantailara joaten."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ziurtatu hatza ez duzula pantailaren behealdetik gertuegi pasatzen."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Keinuaren sentikortasuna aldatzeko, joan ezarpenetara"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Pasatu hatza atzera egiteko"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Aurreko pantailara itzultzeko, pasa hatza pantailaren ezkerreko edo eskuineko ertzetik erdialdera."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Ziurtatu hatza pantailaren beheko ertzetik gora pasatzen duzula."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Ziurtatu askatu aurretik ez duzula hatza gelditzen."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Ziurtatu hatza zuzen gora pasatzen duzula."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Ikasi duzu hasierako pantailara joateko keinua. Jarraian, ikasi aplikazioa aldatzen."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Pasatu hatza hasierako pantailara joateko"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Pasatu hatza pantailaren behealdetik gora. Keinu horrek hasierako pantailara eramango zaitu beti."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Ziurtatu hatza pantailaren beheko ertzetik gora pasatzen duzula."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Saiatu leihoa denbora gehiagoz mantentzen hatza altxatu aurretik."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Ziurtatu hatza zuzen gora pasatzen duzula; ondoren, gelditu."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Ikasi duzu aplikazioa aldatzeko keinua. Prest zaude telefonoa erabiltzeko."</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Pasatu hatza aplikazioa aldatzeko"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Pasatu hatza pantailaren behealdetik gora, eduki pantaila sakatuta, eta kendu hatza."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Dena prest"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Hurrengoa"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Eginda"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Ezarpenak"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Saiatu berriro"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Ederki!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutoriala: <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Partekatu"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Atera pantaila-argazki bat"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikazioak edo erakundeak ez du eman ekintza hori gauzatzeko baimena"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Nabigazio-tutoriala saltatu nahi duzu?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Tutorial hau Aholkuak aplikazioan aurki dezakezu geroago"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Utzi"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Saltatu"</string>
 </resources>
diff --git a/quickstep/res/values-fi/strings.xml b/quickstep/res/values-fi/strings.xml
index 53044c1b86..af1097319d 100644
--- a/quickstep/res/values-fi/strings.xml
+++ b/quickstep/res/values-fi/strings.xml
@@ -45,73 +45,40 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Sovellusehdotukset käytössä"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Sovellusehdotukset on poistettu käytöstä"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Ennakoitu sovellus: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
-    <skip />
-    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Muista pyyhkäistä aivan vasemmasta reunasta."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pyyhkäise näytön vasemmasta reunasta keskelle ja päästä irti."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Valmista tuli! Kokeile nyt pyyhkäistä oikeasta reunasta."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Muista pyyhkäistä aivan oikeasta reunasta."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pyyhkäise näytön oikeasta reunasta keskelle ja päästä irti."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Olet oppinut Takaisin-eleen. Opettele seuraavaksi siirtymään aloitusnäytölle."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Varo, ettet pyyhkäise liian lähellä alareunaa."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Voit muuttaa Takaisin-eleen herkkyyttä asetuksista"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Siirry takaisin pyyhkäisemällä"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Voit palata edelliseen näkymään pyyhkäisemällä näytön vasemmasta tai oikeasta reunasta keskelle."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pyyhkäise ylös näytön alareunasta."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Varo keskeyttämästä ennen kuin päästät irti."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Muista pyyhkäistä suoraan ylöspäin."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Olet oppinut aloitusnäytölle palaamiseleen. Opettele seuraavaksi vaihtamaan sovellusta."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Siirry aloitusnäytölle pyyhkäisemällä"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Pyyhkäise ylös näytön alareunasta. Tämä ele vie sinut aina aloitusnäytölle."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Pyyhkäise ylös näytön alareunasta."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Kokeile pitää ikkunaa painettuna pidempään ennen kuin päästät irti."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Muista pyyhkäistä suoraan ylöspäin ja keskeytä sitten."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Olet oppinut sovellusten vaihtamiseleen. Olet valmis käyttämään puhelintasi."</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Vaihda sovellusta pyyhkäisemällä"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Pyyhkäise ylöspäin näytön alareunasta ja päästä irti."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Valmista"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Seuraava"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Valmis"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Asetukset"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Yritä uudelleen"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Hienoa!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Ohje <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="action_share" msgid="2648470652637092375">"Jaa"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Kuvakaappaus"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Sovellus tai organisaatio ei salli tätä toimintoa"</string>
-    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
-    <skip />
-    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
-    <skip />
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Ohitetaanko navigointiohje?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Löydät tämän Vinkit-sovelluksesta"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Peru"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Ohita"</string>
 </resources>
diff --git a/quickstep/res/values-fr/strings.xml b/quickstep/res/values-fr/strings.xml
index 01dcff202d..4fe04be3a0 100644
--- a/quickstep/res/values-fr/strings.xml
+++ b/quickstep/res/values-fr/strings.xml
@@ -19,19 +19,99 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Écran partagé"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Épingler"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Format libre"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Aperçu"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Aucun élément récent"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Fermer"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Paramètres de consommation de l\'application"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Tout effacer"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Applications récentes"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>, <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; 1 min"</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"Encore <xliff:g id="TIME">%1$s</xliff:g> aujourd\'hui"</string>
-    <string name="title_app_suggestions" msgid="4185902664111965088">"Suggestions d\'applications"</string>
+    <string name="title_app_suggestions" msgid="4185902664111965088">"Applications suggérées"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Toutes les applications"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Applications prévues pour vous"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Retrouvez vos applications favorites au bas de votre écran d\'accueil"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Retrouvez des suggestions d\'applications dans la zone des favoris de votre écran d\'accueil"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Les suggestions d\'applications permettent d\'afficher vos applications favorites au bas de votre écran d\'accueil. Elles s\'adaptent à vos habitudes d\'utilisation. Les icônes auparavant affichées au bas de l\'écran seront déplacées vers le haut."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Accédez facilement aux applications dont vous vous servez le plus, directement depuis l\'écran d\'accueil. Ces suggestions peuvent varier en fonction de vos habitudes d\'utilisation. Les applications de la zone des favoris seront transférées sur votre écran d\'accueil."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Les suggestions d\'applications permettent d\'afficher vos applications favorites au bas de votre écran d\'accueil. Elles s\'adaptent à vos habitudes d\'utilisation. Les icônes auparavant affichées au bas de l\'écran seront placées dans un nouveau dossier."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Activer les suggestions"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Non, merci"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Paramètres"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Les applications dont vous vous servez le plus s\'affichent ici (ces suggestions peuvent varier en fonction de vos habitudes d\'utilisation)"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Faites glisser des applications hors de la rangée du bas pour obtenir des suggestions d\'applications"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Des suggestions d\'applications ont été ajoutées à un emplacement vide"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Suggestions d\'applications activées"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Les suggestions d\'applications sont désactivées"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Application prédite : <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
+    <skip />
+    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
+    <skip />
+    <string name="action_share" msgid="2648470652637092375">"Partager"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Capture d\'écran"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Cette action n\'est pas autorisée par l\'application ou par votre organisation"</string>
+    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
+    <skip />
+    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <skip />
 </resources>
diff --git a/quickstep/res/values-gl/strings.xml b/quickstep/res/values-gl/strings.xml
index 463b62898b..e8457a7113 100644
--- a/quickstep/res/values-gl/strings.xml
+++ b/quickstep/res/values-gl/strings.xml
@@ -45,73 +45,40 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"As suxestións de aplicacións están activadas"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"As suxestións de aplicacións están desactivadas"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplicación predita: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
-    <skip />
-    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Asegúrate de pasar o dedo desde o bordo esquerdo máis afastado."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Asegúrate de pasar o dedo desde o bordo esquerdo ata o medio da pantalla e avanza."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Xa está! Proba a pasar o dedo desde o bordo dereito."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Asegúrate de pasar o dedo desde o bordo dereito máis afastado."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Asegúrate de pasar o dedo desde o bordo dereito ata o medio da pantalla e avanza."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Completaches o xesto de volver. O próximo é aprender a ir ao inicio."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Asegúrate de non pasar o dedo demasiado preto da parte inferior da pantalla."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Podes cambiar a sensibilidade do xesto en Configuración"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Pasar o dedo para volver"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Para volver á última pantalla, pasa o dedo cara ao medio desde o bordo dereito ou esquerdo."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Asegúrate de pasar o dedo cara arriba desde o bordo inferior da pantalla."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Asegúrate de non facer unha pausa antes de avanzar."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Asegúrate de pasar o dedo cara arriba cun movemento vertical."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Completaches o xesto de ir ao inicio. O próximo é aprender a cambiar de aplicación."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Pasar o dedo para ir ao inicio"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Pasa o dedo cara arriba desde a parte inferior da pantalla. Ao facelo, irás á pantalla de inicio."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Asegúrate de pasar o dedo cara arriba desde o bordo inferior da pantalla."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Proba a manter premida a pantalla máis tempo antes de soltala."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Asegúrate de pasar o dedo cara arriba cun movemento vertical. Despois, fai unha pausa."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Completaches o xesto para cambiar de aplicación. Xa podes usar o teléfono!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Pasar o dedo para cambiar de aplicación"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Pasa o dedo cara arriba desde a parte inferior da pantalla, mantena premida e sepárao."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Todo listo"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Seguinte"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Feito"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Configuración"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Téntao de novo"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Excelente!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Titorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="action_share" msgid="2648470652637092375">"Compartir"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Facer captura"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"A aplicación ou a túa organización non permite realizar esta acción"</string>
-    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
-    <skip />
-    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
-    <skip />
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Queres omitir o titorial de navegación?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Atopa isto máis tarde na app Consellos"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancelar"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Omitir"</string>
 </resources>
diff --git a/quickstep/res/values-hi/strings.xml b/quickstep/res/values-hi/strings.xml
index 387d509587..dcee19a5c0 100644
--- a/quickstep/res/values-hi/strings.xml
+++ b/quickstep/res/values-hi/strings.xml
@@ -19,19 +19,99 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"स्क्रीन को दो हिस्सों में बाँटना (स्प्लिट स्क्रीन)"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"पिन करना"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"फ़्रीफ़ॉर्म"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"खास जानकारी"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"हाल ही में इस्तेमाल किया गया कोई ऐप्लिकेशन नहीं है"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"बंद करें"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"ऐप्लिकेशन इस्तेमाल की सेटिंग"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"सभी ऐप्लिकेशन बंद करें"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"हाल ही में इस्तेमाल किए गए ऐप्लिकेशन"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>, <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt;1 मिनट"</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"आज <xliff:g id="TIME">%1$s</xliff:g> और चलेगा"</string>
-    <string name="title_app_suggestions" msgid="4185902664111965088">"ऐप्लिकेशन के सुझाव"</string>
+    <string name="title_app_suggestions" msgid="4185902664111965088">"सुझाए गए ऐप्लिकेशन"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"सभी ऐप्लिकेशन"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"आपके काम के ऐप्लिकेशन"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"अपने होम स्क्रीन की सबसे नीचे वाली पंक्ति में ऐप्लिकेशन के सुझाव पाएं"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"अपने होम स्क्रीन की सबसे नीचे वाली पंक्ति में पसंदीदा ऐप्लिकेशन के सुझाव पाएं"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"आप जिन ऐप्लिकेशन का ज़्यादा इस्तेमाल करते हैं उन्हें सीधा अपने होम स्क्रीन पर पाएं. ऐप्लिकेशन इस्तेमाल करने के आपके रूटीन के हिसाब से सुझाव बदलते रहते हैं. नीचे की पंक्ति के ऐप्लिकेशन होम स्क्रीन पर आ जाएंगे."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"सबसे ज़्यादा इस्तेमाल होने वाले ऐप्लिकेशन सीधे होम स्क्रीन पर देखें. आप ऐप्लिकेशन का कितना इस्तेमाल कर रहे हैं, उसके हिसाब से सुझाव बदलते रहते हैं. आपके पसंदीदा ऐप्लिकेशन, होम स्क्रीन पर नीचे की पंक्ति में दिखाई देंगे."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"सबसे ज़्यादा इस्तेमाल होने वाले ऐप्लिकेशन, सीधे होम स्क्रीन पर पाएं. आपके ऐप्लिकेशन इस्तेमाल करने के रूटीन के हिसाब से सुझाव बदलते रहते हैं. नीचे की पंक्ति के ऐप्लिकेशन एक नए फ़ोल्डर में चले जाएंगे."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"ऐप्लिकेशन के बारे में सुझाव पाएं"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"रहने दें"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"सेटिंग"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"सबसे ज़्यादा इस्तेमाल होने वाले ऐप्लिकेशन यहां दिखेंगे. यह ऐप्लिकेशन, आपके इस्तेमाल के रूटीन के हिसाब से बदलते रहते हैं"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"नीचे वाली पंक्ति से ऐप्लिकेशन को खींचकर हटाएं, ताकि आप ऐप्लिकेशन के सुझाव पा सकें"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"खाली जगह पर ऐप्लिकेशन के सुझाव जोड़े गए"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"सुझाए गए ऐप्लिकेशन की सुविधा चालू है"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"सुझाए गए ऐप्लिकेशन की सुविधा बंद है"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"सुझाया गया ऐप्लिकेशन: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
+    <skip />
+    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
+    <skip />
+    <string name="action_share" msgid="2648470652637092375">"शेयर करें"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"स्क्रीनशॉट"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"ऐप्लिकेशन या आपका संगठन इस कार्रवाई की अनुमति नहीं देता"</string>
+    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
+    <skip />
+    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <skip />
 </resources>
diff --git a/quickstep/res/values-hr/strings.xml b/quickstep/res/values-hr/strings.xml
index bb5ddc240f..3f988725e2 100644
--- a/quickstep/res/values-hr/strings.xml
+++ b/quickstep/res/values-hr/strings.xml
@@ -45,73 +45,40 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Predlaganje apl. omogućeno"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Predlaganje apl. onemogućeno"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predviđena aplikacija: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
-    <skip />
-    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pazite da prijeđete prstom od krajnjeg lijevog ruba."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pazite da prijeđete prstom od lijevog ruba do sredine zaslona i podignite prst."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"To je to! Sad pokušajte prijeći prstom od desnog ruba."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pazite da prijeđete prstom od krajnjeg desnog ruba."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pazite da prijeđete prstom od desnog ruba do sredine zaslona i podignite prst."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Izvršili ste pokret za povratak. Sad saznajte kako otvoriti početni zaslon."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pazite da ne prijeđete prstom preblizu dnu zaslona."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Osjetljivost pokreta povratka promijenite u postavkama"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Prijeđite prstom da biste se vratili"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Za povratak na zadnji zaslon prijeđite prstom od lijevog ili desnog ruba do sredine zaslona."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pazite da prijeđete prstom prema gore od donjeg ruba zaslona."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pazite da ne zastanete prije podizanja prsta."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pazite da prijeđete prstom ravno prema gore."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Izvršili ste pokret za otvaranje početnog zaslona. Sad saznajte kako promijeniti aplikaciju."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Prijeđite prstom da biste otvorili početni zaslon"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Prijeđite prstom od dna zaslona prema gore. Tim pokretom uvijek će se otvoriti početni zaslon."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Pazite da prijeđete prstom prema gore od donjeg ruba zaslona."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Pokušajte zadržati prozor dulje prije podizanja prsta."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Pazite da prijeđete prstom ravno prema gore, a zatim zastanete."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Izvršili ste pokret za promjenu aplikacije. Spremni ste za upotrebu telefona!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Prijeđite prstom da biste promijenili aplikaciju"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Prijeđite prstom od dna zaslona prema gore, zadržite pritisak pa podignite prst."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Sve je spremno"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Dalje"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Gotovo"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Postavke"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Pokušajte ponovo"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Odlično!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Vodič <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="action_share" msgid="2648470652637092375">"Podijeli"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Snimka zaslona"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikacija ili vaša organizacija ne dopuštaju ovu radnju"</string>
-    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
-    <skip />
-    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
-    <skip />
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Želite li preskočiti vodič za kretanje?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Možete ga pronaći i u aplikaciji Savjeti"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Odustani"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Preskoči"</string>
 </resources>
diff --git a/quickstep/res/values-hu/strings.xml b/quickstep/res/values-hu/strings.xml
index dec6ea0158..37b3a8babb 100644
--- a/quickstep/res/values-hu/strings.xml
+++ b/quickstep/res/values-hu/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Osztott képernyő"</string>
-    <string name="recent_task_option_pin" msgid="7929860679018978258">"Rögzítés"</string>
+    <string name="recent_task_option_pin" msgid="7929860679018978258">"Kitűzés"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Szabad forma"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Áttekintés"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Nincsenek mostanában használt elemek"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Bezárás"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Alkalmazáshasználati beállítások"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Összes törlése"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Legutóbbi alkalmazások"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Alkalmazásjavaslatok"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Az összes alkalmazás"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Várható alkalmazások"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Alkalmazásjavaslatokat kaphat a kezdőképernyő alsó sorában"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Alkalmazásjavaslatokat kaphat a kezdőképernyőn megjelenő kedvencek sorában"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"A kezdőképernyőről könnyedén hozzáférhet a leggyakrabban használt alkalmazásokhoz. A javaslatok a rutinjai alapján változni fognak. Az alsó sorban lévő alkalmazások felkerülnek a kezdőképernyőre."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"A kezdőképernyőről könnyedén hozzáférhet a leggyakrabban használt alkalmazásokhoz. A javaslatok a rutinjai alapján változnak majd. A kedvencek sorában lévő alkalmazások a kezdőképernyőre kerülnek."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"A kezdőképernyőről könnyedén hozzáférhet a leggyakrabban használt alkalmazásokhoz. A javaslatok a rutinjai alapján változni fognak. Az alsó sorban lévő alkalmazások egy új mappába kerülnek."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Kérek javaslatokat"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Köszönöm, nem"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Beállítások"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"A leggyakrabban használt alkalmazások jelennek meg itt; a lista a rutinok alapján változhat"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Alkalmazásjavaslatok kéréséhez húzzon ki alkalmazásokat az alsó sorból"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Alkalmazásjavaslatok hozzáadva az üres területhez"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Alkalmazásjavaslatok engedélyezve"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Alkalmazásjavaslatok letiltva"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Várható alkalmazás: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Csúsztasson a képernyő bal széléről."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Csúsztasson a képernyő bal széléről a képernyő közepéig, és engedje el a képernyőt."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Ennyi az egész! Most csúsztasson a jobb szélről."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Csúsztasson a képernyő jobb széléről."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Csúsztasson a képernyő jobb széléről a képernyő közepéig, és engedje el a képernyőt."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Teljesítette a visszalépési kézmozdulatot. Most megtanulhatja, hogyan léphet a kezdőképernyőre."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ne csúsztasson túl közel a képernyő aljához."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"A vissza mozdulat érzékenysége a Beállításokban módosítható"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Csúsztasson a visszalépéshez"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Ha visszatérne a legutóbbi képernyőre, csúsztasson a képernyő közepére a bal vagy a jobb széléről."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Csúsztasson felfelé a képernyő aljától."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Ne álljon meg, mielőtt elengedi a képernyőt."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Csúsztasson egyenesen felfelé."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Teljesítette a kezdőképernyőre lépés kézmozdulatát. Most megtanulhatja, hogyan válthat az alkalmazások között."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Csúsztatás a kezdőképernyőre lépéshez"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Csúsztassa ujját felfelé a képernyő aljától. Ez a mozdulat mindig a kezdőképernyőre visz."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Csúsztasson felfelé a képernyő aljától."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Próbálja tovább lenyomva tartani az ablakot, mielőtt elengedi a képernyőt."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Csúsztasson egyenesen felfelé, majd várjon egy kicsit."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Teljesítette az alkalmazásváltás kézmozdulatát. Készen áll a telefonja használatára!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Alkalmazásváltás csúsztatással"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Csúsztasson felfelé a képernyő aljáról, tartsa lenyomva az ujját, majd emelje fel."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Minden kész"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Tovább"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Kész"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Beállítások"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Újra"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Remek!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Útmutató (<xliff:g id="TOTAL">%2$d</xliff:g>/<xliff:g id="CURRENT">%1$d</xliff:g>.)"</string>
+    <string name="action_share" msgid="2648470652637092375">"Megosztás"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Képernyőkép"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Az alkalmazás vagy az Ön szervezete nem engedélyezi ezt a műveletet"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Kihagyja a navigáció bemutatóját?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Ezt később megtalálhatja a Tippek appban"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Mégse"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Kihagyás"</string>
 </resources>
diff --git a/quickstep/res/values-in/strings.xml b/quickstep/res/values-in/strings.xml
index 6824d16b40..a4631d08c4 100644
--- a/quickstep/res/values-in/strings.xml
+++ b/quickstep/res/values-in/strings.xml
@@ -19,19 +19,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Layar terpisah"</string>
-    <string name="recent_task_option_pin" msgid="7929860679018978258">"Pasang pin"</string>
+    <string name="recent_task_option_pin" msgid="7929860679018978258">"Sematkan"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Format bebas"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Ringkasan"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Tidak ada item yang baru dibuka"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Tutup"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Setelan penggunaan aplikasi"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Hapus semua"</string>
-    <string name="accessibility_recent_apps" msgid="4058661986695117371">"Aplikasi baru-baru ini"</string>
+    <string name="accessibility_recent_apps" msgid="4058661986695117371">"Aplikasi terbaru"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>, <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; 1 menit"</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"<xliff:g id="TIME">%1$s</xliff:g> tersisa hari ini"</string>
     <string name="title_app_suggestions" msgid="4185902664111965088">"Saran aplikasi"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Semua aplikasi"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Aplikasi yang diprediksi"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Dapatkan saran aplikasi di baris paling bawah Layar utama"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Dapatkan saran aplikasi di baris favorit Layar utama"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Akses aplikasi yang paling sering digunakan dengan mudah, langsung di Layar utama. Saran akan berubah berdasarkan rutinitas Anda. Aplikasi di baris paling bawah akan berpindah naik ke Layar utama."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Mudah mengakses aplikasi yang paling sering digunakan, langsung di Layar utama. Saran akan berubah berdasarkan rutinitas Anda. Aplikasi di baris favorit akan berpindah ke Layar utama."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Akses aplikasi yang paling sering digunakan dengan mudah, langsung di Layar utama. Saran akan berubah berdasarkan rutinitas Anda. Aplikasi di baris paling bawah akan berpindah ke folder baru."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Dapatkan saran aplikasi"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Lain kali"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Setelan"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Aplikasi yang paling sering digunakan muncul di sini, dan berubah berdasarkan rutinitas"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Tarik aplikasi dari baris paling bawah untuk mendapatkan saran aplikasi"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Saran aplikasi ditambahkan ke ruang kosong"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Saran aplikasi diaktifkan"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Saran aplikasi dinonaktifkan"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplikasi yang diprediksi: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pastikan Anda menggeser dari tepi ujung kiri."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pastikan Anda menggeser dari tepi kiri ke tengah layar, lalu lepaskan."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Selesai. Sekarang, coba geser dari tepi kanan."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pastikan Anda menggeser dari tepi ujung kanan."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pastikan Anda menggeser dari tepi kanan ke tengah layar, lalu lepaskan."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Anda telah menyelesaikan gestur kembali. Selanjutnya, pelajari cara beralih ke Layar utama."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pastikan Anda tidak menggeser terlalu dekat ke bagian bawah layar."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Untuk mengubah sensitivitas gestur kembali, buka Setelan"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Geser untuk kembali"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Untuk kembali ke layar terakhir, geser dari tepi kiri atau kanan ke tengah layar."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pastikan Anda menggeser ke atas dari tepi bawah layar."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pastikan Anda tidak menjeda sebelum melepaskan."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pastikan Anda menggeser lurus ke atas."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Anda telah menyelesaikan gestur beralih ke Layar utama. Selanjutnya, pelajari cara beralih aplikasi."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Geser untuk beralih ke layar utama"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Geser ke atas dari bagian bawah layar. Gestur ini akan selalu membawa Anda ke Layar utama."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Pastikan Anda menggeser ke atas dari tepi bawah layar."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Coba tahan jendela lebih lama sebelum melepaskan."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Pastikan Anda menggeser lurus ke atas, lalu menjedanya."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Anda telah menyelesaikan gestur beralih aplikasi. Anda siap menggunakan ponsel Anda!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Geser untuk beralih aplikasi"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Geser ke atas dari bagian bawah layar, tahan, lalu lepaskan."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Semua siap"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Berikutnya"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Selesai"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Setelan"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Coba lagi"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bagus!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Bagikan"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Tindakan ini tidak diizinkan oleh aplikasi atau organisasi Anda"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Lewati tutorial navigasi?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Anda dapat menemukan ini di apl Tips"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Batal"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Lewati"</string>
 </resources>
diff --git a/quickstep/res/values-is/strings.xml b/quickstep/res/values-is/strings.xml
index f60a2c6802..e2efb7ef35 100644
--- a/quickstep/res/values-is/strings.xml
+++ b/quickstep/res/values-is/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Skipta skjá"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Festa"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Frjálst snið"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Yfirlit"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Engin nýleg atriði"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Loka"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Notkunarstillingar forrits"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Hreinsa allt"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Nýleg forrit"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Tillögur að forritum"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Öll forrit"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Spáð forrit"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Fáðu tillögur að forritum í neðstu röð heimaskjásins"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Fáðu tillögur að forritum á eftirlætissvæði heimaskjásins"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Nálgastu forritin sem þú notar mest auðveldlega á heimaskjánum. Tillögurnar breytast í samræmi við notkun þína. Forrit í neðstu röð færast upp á heimaskjáinn."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Nálgastu forritin sem þú notar mest á einfaldan hátt á heimaskjánum. Tillögurnar breytast í samræmi við notkun þína. Forrit á eftirlætissvæði færast á heimaskjáinn."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Nálgastu forritin sem þú notar mest auðveldlega á heimaskjánum. Tillögurnar breytast í samræmi við notkun þína. Forrit í neðstu röð færast í nýja möppu."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Fá tillögur að forritum"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Nei, takk"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Stillingar"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Mest notuðu forritin birtast hér og breytast í samræmi við rútínur"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Dragðu forrit af neðstu röð til að fá tillögð forrit"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Tillögðum forritum bætt við autt svæði"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Kveikt á tillögum að forritum"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Slökkt er á tillögðum forritum"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Tillaga að forriti: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Passaðu að strjúka frá jaðri vinstri brúnar."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Passaðu að strjúka frá vinstri brún skjásins að miðju hans og sleppa svo."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Það er komið! Prófaðu að strjúka frá vinstri brúninni."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Passaðu að strjúka frá jaðri hægri brúnar."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Passaðu að strjúka frá hægri brún skjásins að miðju hans og sleppa svo."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Þú laukst við að kynna þér bendinguna „til baka“. Næst skaltu læra hvernig þú ferð „heim“."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Passaðu að strjúka ekki of nálægt neðri brún skjásins."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Til að breyta næmi til baka-bendingar ferðu í stillingar"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Strjúktu til að fara til baka"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Til að fara til baka á síðasta skjá skaltu strjúka frá vinstri eða hægri brún að miðju skjásins."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Passaðu að strjúka upp frá neðri brún skjásins."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Passaðu að stoppa ekki áður en þú sleppir."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Passaðu að strjúka beint upp."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Þú laukst við að kynna þér bendinguna „heim“. Næst skaltu læra hvernig þú skiptir á milli forrita."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Strjúktu til að fara heim"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Strjúktu upp frá neðri hluta skjásins. Þetta flytur þig alltaf á heimaskjáinn."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Passaðu að strjúka upp frá neðri brún skjásins."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Prófaðu að halda fingrinum lengur á glugganum áður en þú sleppir."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Passaðu að strjúka beint upp og stoppa svo."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Þú laukst við að kynna þér bendinguna „skipta um forrit“. Nú geturðu notað símann þinn!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Strjúktu til að skipta á milli forrita"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Strjúktu upp frá neðri hluta skjásins, haltu fingrinum á skjánum og slepptu svo."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Allt til reiðu"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Áfram"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Lokið"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Stillingar"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Reyna aftur"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Flott!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Leiðsögn <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Deila"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Skjámynd"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Forritið eða fyrirtækið leyfir ekki þessa aðgerð"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Sleppa flettileiðsögn?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Nálgastu þetta síðar í forritinu „Trikk“"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Hætta við"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Sleppa"</string>
 </resources>
diff --git a/quickstep/res/values-ja/strings.xml b/quickstep/res/values-ja/strings.xml
index d3fecde208..adab4a9ade 100644
--- a/quickstep/res/values-ja/strings.xml
+++ b/quickstep/res/values-ja/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"分割画面"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"固定"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"フリーフォーム"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"概要"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"最近のアイテムはありません"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"閉じる"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"アプリの使用状況の設定"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"すべてクリア"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"最近使ったアプリ"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"アプリの候補"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"すべてのアプリ"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"予測されたアプリ"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"ホーム画面の一番下の行でアプリの候補を利用できます"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"ホーム画面のお気に入りの行でアプリの候補を利用できます"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"ホーム画面で、使用頻度の高いアプリに簡単にアクセスできるようになります。アプリの候補はルーティンに応じて変わります。一番下の行にあるアプリがホーム画面に移動します。"</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"ホーム画面で、使用頻度の高いアプリに簡単にアクセスできるようになります。アプリの候補はルーティンに応じて変わります。お気に入りの行にあるアプリがホーム画面に移動します。"</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"ホーム画面で、使用頻度の高いアプリに簡単にアクセスできるようになります。アプリの候補はルーティンに応じて変わります。一番下の行にあるアプリが新しいフォルダに移動します。"</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"アプリの候補を利用"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"使用しない"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"設定"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"使用頻度の高いアプリがここに表示されます（ルーティンに応じて変わります）"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"一番下の行からアプリをドラッグするとアプリの候補が表示されます"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"空いたスペースにアプリの候補が追加されます"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"アプリの候補は有効です"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"アプリの候補は無効です"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"予測されたアプリ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"一番左端からスワイプしてください。"</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"画面の左端から中央に向かってスワイプし、指を離してください。"</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"そのとおりです。次に、右端からスワイプしてみましょう。"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"一番右端からスワイプしてください。"</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"画面の右端から中央に向かってスワイプし、指を離してください。"</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"「戻る」操作を完了しました。次は、ホームに戻る方法を覚えましょう。"</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"スワイプする際は画面の下部に近づきすぎないようにしましょう。"</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"「戻る」操作の感度を変更するには [設定] に移動します"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"スワイプで戻りましょう"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"直前の画面に戻るには、画面の左端または右端から中央に向かってスワイプします。"</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"画面の下端から上にスワイプしてください。"</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"指を離す前にいったん止めないでください。"</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"まっすぐ上にスワイプしてください。"</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"「ホームに戻る」操作を完了しました。次は、アプリを切り替える方法を覚えましょう。"</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"スワイプでホームに戻る"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"画面を下から上にスワイプします。この操作でいつでもホーム画面に戻れます。"</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"画面の下端から上にスワイプしてください。"</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"指を離す前にウィンドウをもう少し長押ししてみましょう。"</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"まっすぐ上にスワイプしてから、いったん指を止めてください。"</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"「アプリを切り替える」操作を完了しました。スマートフォンをご利用いただけるようになりました。"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"スワイプでアプリを切り替え"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"画面を下から上にスワイプして長押しし、指を離します。"</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"設定完了"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"次へ"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"完了"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"設定"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"再試行"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"成功"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"チュートリアル <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"共有"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"スクリーンショット"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"この操作はアプリまたは組織で許可されていません"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"操作チュートリアルをスキップしますか？"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"これは後からガイドアプリで確認できます"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"キャンセル"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"スキップ"</string>
 </resources>
diff --git a/quickstep/res/values-ka/strings.xml b/quickstep/res/values-ka/strings.xml
index 67b03a754f..01086d30ef 100644
--- a/quickstep/res/values-ka/strings.xml
+++ b/quickstep/res/values-ka/strings.xml
@@ -19,19 +19,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"ეკრანის გაყოფა"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"ჩამაგრება"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"თავისუფალი ფორმა"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"მიმოხილვა"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"ბოლოს გამოყენებული ერთეულები არ არის"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"დახურვა"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"აპების გამოყენების პარამეტრები"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"ყველას გასუფთავება"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"ბოლოდროინდელი აპები"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>, <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; 1 წუთი"</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"დღეს დარჩენილია <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="title_app_suggestions" msgid="4185902664111965088">"აპების შემოთავაზებები"</string>
+    <string name="title_app_suggestions" msgid="4185902664111965088">"აპის შემოთავაზებები"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"ყველა აპი"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"თქვენი პროგნოზირებული აპები"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"მიიღეთ აპის შეთავაზებები მთავარი ეკრანის ქვედა რიგში"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"მიიღეთ აპების შემოთავაზებები მთავარი ეკრანის რჩეულების მწკრივში"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"მარტივად იქონიეთ ყველაზე ხშირად გამოყენებულ აპებზე წვდომა მთავარი ეკრანიდან. შეთავაზებები შეიცვლება თქვენი რუტინების მიხედვით. მოხდება ქვედა რიგში არსებული აპების მთავარ ეკრანზე გადატანა."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"მარტივად იქონიეთ წვდომა ყველაზე ხშირად გამოყენებულ აპებზე მთავარი ეკრანიდან. შეთავაზებები შეიცვლება თქვენი რუტინების მიხედვით. რჩეულების მწკრივში არსებული აპები თქვენს მთავარ ეკრანზე გადავა."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"მარტივად იქონიეთ ყველაზე ხშირად გამოყენებულ აპებზე წვდომა მთავარი ეკრანიდან. შეთავაზებები შეიცვლება თქვენი რუტინების მიხედვით. მოხდება ქვედა რიგში არსებული აპების ახალ საქაღალდეში გადატანა."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"აპის შეთავაზებების მიღება"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"არა, გმადლობთ"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"პარამეტრები"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"ყველაზე ხშირად გამოყენებული აპები აქ ჩანს და ცვალებადობს რუტინების მიხედვით"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"გადაიტანეთ აპები ეკრანის ქვედა რიგში, რათა აპის შეთავაზებები მიიღოთ"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"აპის შეთავაზებები დამატებულია ცარიელ სივრცეში"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"აპის შეთავაზებები ჩართულია"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"აპის შეთავაზებები გათიშულია"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ნაწინასწარმეტყველები აპი: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"არ გადაფურცლოთ მარცხენა კიდის ბოლოდან."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"გადაფურცლეთ მარცხენა კიდიდან ეკრანის ცენტრისკენ და თითი აუშვით."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"სულ ეს არის! ახლა კი ცადეთ, გადაფურცლოთ მარჯვენა კიდიდან."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"არ გადაფურცლოთ მარჯვენა კიდის ბოლოდან."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"გადაფურცლეთ მარჯვენა კიდიდან ეკრანის ცენტრისკენ და თითი აუშვით."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"თქვენ შეასრულეთ უკან დაბრუნების ჟესტი. ახლა კი შევიტყოთ, თუ როგორ დავბრუნდეთ მთავარ გვერდზე."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"არ გადაფურცლოთ ეკრანის ბოლოსთან ახლოს."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"დაბრუნების ჟესტის მგრძნობელობის შესაცვლელად გადადით პარამეტრებზე"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"უკან დასაბრუნებლად გადაფურცლეთ"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"ბოლო ეკრანზე დასაბრუნებლად გადაფურცლეთ მარცხენა ან მარჯვენა კიდიდან ეკრანის ცენტრისკენ."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"გადაფურცლეთ ეკრანის ქვედა კიდიდან ზემოთ."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"არ დააპაუზოთ თითის აშვებამდე."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"გადაფურცლეთ ზემოთ."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"თქვენ შეასრულეთ მთავარ ეკრანზე დაბრუნების ჟესტი. ახლა კი შევიტყოთ, როგორ გადავრთოთ აპები."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"მთავარ გვერდზე გადასასვლელად გადაფურცლეთ"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"გადაფურცლეთ ეკრანის ქვედა კიდიდან ზემოთ. ამ ჟესტს ყოველთვის მთავარი გვერდის ეკრანზე გადაყავხართ."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"გადაფურცლეთ ეკრანის ქვედა კიდიდან ზემოთ."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"უფრო ხანგრძლივად დააჭირეთ თითი ფანჯარას, რომ არ დაიხუროს."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"გადაფურცლეთ პირდაპირ ზემოთ და შემდეგ დააპაუზეთ."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"თქვენ შეასრულეთ აპების გადართვის ჟესტი. შეგიძლიათ ტელეფონით სარგებლობა!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"აპების გადასართავად გადაფურცლეთ"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"გადაფურცლეთ ეკრანის ქვედა კიდიდან ზემოთ, დააყოვნეთ, შემდეგ თითი აუშვით."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"მზად არის"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"შემდეგ"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"მზადაა"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"პარამეტრები"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ხელახლა ცდა"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"მშვენიერია!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"სახელმძღვანელო <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"გაზიარება"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"ეკრანის ანაბეჭდი"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"ეს მოქმედება არ არის დაშვებული აპის ან თქვენი ორგანიზაციის მიერ"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"გსურთ, გამოტოვოთ ნავიგაციის სახელმძღვანელო?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"ამის მოგვიანებით პოვნა „მინიშნების“ აპში შეგიძლიათ"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"გაუქმება"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"გამოტოვება"</string>
 </resources>
diff --git a/quickstep/res/values-kk/strings.xml b/quickstep/res/values-kk/strings.xml
index a9fcbedb20..4919d11e47 100644
--- a/quickstep/res/values-kk/strings.xml
+++ b/quickstep/res/values-kk/strings.xml
@@ -19,19 +19,99 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Экранды бөлу"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Бекіту"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Еркін форма"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Шолу"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Соңғы элементтер жоқ"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Жабу"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Қолданбаны пайдалану параметрлері"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Барлығын өшіру"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Соңғы пайдаланылған қолданбалар"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>, <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; 1 мин"</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"Бүгін <xliff:g id="TIME">%1$s</xliff:g> қалды"</string>
-    <string name="title_app_suggestions" msgid="4185902664111965088">"Қолданба ұсыныстары"</string>
+    <string name="title_app_suggestions" msgid="4185902664111965088">"Ұсынылған қолданбалар"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Барлық қолданбалар"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Ұсынылатын қолданбалар"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Негізгі экранның төменгі жолында қолданбаларды ұсыну"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Ұсынылған қолданбалар негізгі экранда таңдаулылар арасында көрсетілетін болады"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Жиі пайдаланылатын қолданбаларға негізгі экраннан кіруге болады. Ұсыныстар күнделікті әрекеттеріңізге сәйкес өзгереді. Төменгі қатардағы қолданбалар негізгі экранға қарай жоғары жылжиды."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Жиі пайдаланылатын қолданбаларға негізгі экраннан оңай кіре аласыз. Ұсыныстар күнделікті әрекеттеріңізге сәйкес өзгереді. Таңдаулылар жолындағы қолданбалар негізгі экранға ауысады."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Жиі пайдаланылатын қолданбаларға негізгі экраннан кіруге болады. Ұсыныстар күнделікті әрекеттеріңізге сәйкес өзгереді. Төменгі қатардағы қолданбалар жаңа қалтаға жылжиды."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Ұсынылған қолданбаларды көру"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Жоқ, рақмет"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Параметрлер"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Жиі пайдаланылатын қолданбалар осы жерде көрсетіледі. Олар күнделікті әрекеттеріңізге сәйкес өзгереді."</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Ұсынылған қолданбаларды көру үшін төменгі қатардан керектерін сүйреп шығарыңыз."</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Ұсынылған қолданбалар бос орынға қосылды."</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"\"Ұсынылған қолданбалар\" функциясы қосулы."</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"\"Ұсынылған қолданбалар\" функциясы өшірулі."</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Болжалды қолданба: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
+    <skip />
+    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
+    <skip />
+    <string name="action_share" msgid="2648470652637092375">"Бөлісу"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Скриншот"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Бұл әрекетке қолданба не ұйым рұқсат етпейді."</string>
+    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
+    <skip />
+    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <skip />
 </resources>
diff --git a/quickstep/res/values-km/strings.xml b/quickstep/res/values-km/strings.xml
index c422041e7a..847c577dfb 100644
--- a/quickstep/res/values-km/strings.xml
+++ b/quickstep/res/values-km/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"មុខងារ​បំបែកអេក្រង់"</string>
-    <string name="recent_task_option_pin" msgid="7929860679018978258">"ដៅ"</string>
+    <string name="recent_task_option_pin" msgid="7929860679018978258">"ខ្ទាស់"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"មុខងារទម្រង់សេរី"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"ទិដ្ឋភាពរួម"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"មិនមានធាតុថ្មីៗទេ"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"បិទ"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"ការកំណត់​ការប្រើប្រាស់​កម្មវិធី"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"សម្អាត​ទាំងអស់"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"កម្មវិធី​ថ្មីៗ"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"ការណែនាំកម្មវិធី"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"កម្មវិធី​ទាំងអស់"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"កម្មវិធី​ដែលបាន​ព្យាករ​របស់អ្នក"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"ទទួលបាន​ការណែនាំកម្មវិធី​នៅជួរខាងក្រោម​នៃអេក្រង់ដើម​របស់អ្នក"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"ទទួលបាន​ការណែនាំកម្មវិធី​នៅលើ​ជួរដេកសំណព្វ​នៃអេក្រង់ដើម​របស់អ្នក"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"ចូលប្រើ​កម្មវិធី​ដែលអ្នកប្រើ​ញឹកញាប់បំផុត​បានយ៉ាង​ងាយស្រួល​នៅលើ​អេក្រង់ដើម​ផ្ទាល់។ ការណែនាំ​នឹងប្រែប្រួល​ទៅតាម​ទម្លាប់​របស់អ្នក។ កម្មវិធី​នៅជួរ​ខាងក្រោម​នឹងផ្លាស់ទីឡើង​ទៅអេក្រង់ដើម​របស់អ្នក។"</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"ចូលប្រើ​កម្មវិធី​ដែលអ្នកប្រើ​ញឹកញាប់បំផុត​បានយ៉ាង​ងាយស្រួល​នៅលើ​អេក្រង់ដើមដោយផ្ទាល់។ ការណែនាំ​នឹងប្រែប្រួល​ទៅតាម​ទម្លាប់​របស់អ្នក។ កម្មវិធី​នៅក្នុង​ជួរដេក​សំណព្វ​នឹងផ្លាស់ទី​ទៅអេក្រង់ដើម​របស់អ្នក។"</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"ចូលប្រើ​កម្មវិធី​ដែលអ្នកប្រើ​ញឹកញាប់បំផុត​បានយ៉ាង​ងាយស្រួល​នៅលើ​អេក្រង់ដើម​ផ្ទាល់។ ការណែនាំ​នឹងប្រែប្រួល​ទៅតាម​ទម្លាប់​របស់អ្នក។ កម្មវិធី​នៅជួរ​ខាងក្រោម​នឹងផ្លាស់ទី​ទៅថតថ្មី។"</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"ទទួលការណែនាំ​កម្មវិធី"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"ទេ អរគុណ"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"ការកំណត់"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"កម្មវិធី​ដែលប្រើ​ញឹកញាប់បំផុត​បង្ហាញ​នៅទីនេះ និង​ប្រែប្រួល​ទៅតាមទម្លាប់"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"អូស​កម្មវិធី​ចេញពី​ជួរខាងក្រោម ដើម្បី​ទទួលបាន​ការណែនាំ​កម្មវិធី"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"បានបញ្ចូល​ការណែនាំកម្មវិធី​ទៅក្នុង​កន្លែងទំនេរ"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"បានបើក​ការណែនាំ​កម្មវិធី"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"បានបិទ​ការណែនាំ​កម្មវិធី"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"កម្មវិធី​ដែលបាន​ព្យាករ៖ <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ត្រូវប្រាកដថា​អ្នកអូសពី​ចុងគែម​ខាងឆ្វេង​។"</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ត្រូវប្រាកដថា​អ្នកអូសពី​គែមខាងឆ្វេង​ទៅផ្នែកកណ្ដាល​នៃអេក្រង់ រួច​ដកដៃ​។"</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"ត្រឹមត្រូវហើយ! ឥឡូវនេះ សូមសាកល្បង​អូសពីគែម​ខាងស្ដាំ។"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ត្រូវប្រាកដថា​អ្នកអូសពី​ចុងគែម​ខាងស្ដាំ​។"</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ត្រូវប្រាកដថា​អ្នកអូសពី​គែមខាងស្ដាំ​ទៅផ្នែកកណ្ដាល​នៃអេក្រង់ រួច​ដកដៃ​។"</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"អ្នក​បានបញ្ចប់​ចលនា​ថយក្រោយ​ហើយ។ បន្ទាប់​ទៀត សូមស្វែងយល់​ពីរបៀប​ចូលទៅកាន់​អេក្រង់ដើម​។"</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ត្រូវប្រាកដថា​អ្នកមិនអូស​ទៅជិត​ផ្នែកខាងក្រោម​នៃអេក្រង់ពេក​។"</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ដើម្បីប្ដូរកម្រិត​រំញោចនឹង​ចលនាថយក្រោយ សូមចូលទៅកាន់​ការកំណត់"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"អូស​ដើម្បី​ត្រឡប់​ទៅវិញ"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"ដើម្បី​ត្រឡប់ទៅ​អេក្រង់​ចុងក្រោយវិញ សូមអូស​ពីគែម​ខាងឆ្វេង ឬខាងស្ដាំ​ទៅផ្នែកកណ្ដាល​នៃអេក្រង់​។"</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ត្រូវប្រាកដថា​អ្នកអូសឡើងលើ​ពីគែមខាងក្រោម​នៃអេក្រង់​។"</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ត្រូវប្រាកដថា​អ្នកមិនផ្អាក មុនពេល​ដកដៃ​។"</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ត្រូវប្រាកដថា​អ្នកអូស​ត្រង់ឡើងលើ​។"</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"អ្នក​បានបញ្ចប់​ចលនា​ចូលទៅកាន់​អេក្រង់ដើម​ហើយ។ បន្ទាប់​ទៀត សូមស្វែងយល់​ពីរបៀប​ប្ដូរកម្មវិធី​។"</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"អូស​ដើម្បីចូល​ទៅកាន់​អេក្រង់ដើម"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"អូស​ឡើងលើ​ពីផ្នែកខាងក្រោម​នៃ​អេក្រង់របស់អ្នក។ ចលនា​នេះ​នាំ​អ្នក​ទៅ​អេក្រង់ដើម​ជានិច្ច។"</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ត្រូវប្រាកដថា​អ្នកអូសឡើងលើ​ពីគែមខាងក្រោម​នៃអេក្រង់​។"</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"សាកល្បង​សង្កត់វិនដូ​ឱ្យបានយូរ​ជាងនេះ មុនពេល​ដកដៃ​។"</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"ត្រូវប្រាកដថា​អ្នកអូស​ត្រង់ឡើងលើ រួចផ្អាក។"</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"អ្នក​បានបញ្ចប់​ចលនា​ប្ដូរកម្មវិធី​ហើយ។ អ្នក​អាចប្រើ​ទូរសព្ទ​របស់អ្នក​បានហើយ!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"អូស​ដើម្បីប្ដូរ​កម្មវិធី"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"អូសឡើងលើ​ពីផ្នែកខាងក្រោមនៃអេក្រង់​របស់អ្នក រួចសង្កត់​ឱ្យជាប់ បន្ទាប់មកដកដៃចេញ។"</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"រួចហើយ"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"បន្ទាប់"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"រួចរាល់"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ការកំណត់"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ព្យាយាមម្ដងទៀត"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ល្អ!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"មេរៀនទី <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"ចែករំលែក"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"រូបថតអេក្រង់"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"សកម្មភាពនេះ​មិនត្រូវបានអនុញ្ញាតដោយកម្មវិធី​ ឬ​ស្ថាប័ន​របស់អ្នកទេ"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"រំលង​មេរៀន​អំពី​ការរុករក​ឬ?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"អ្នកអាចស្វែងរកមេរៀននេះនៅពេលក្រោយក្នុងកម្មវិធី \"គន្លឹះ\""</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"បោះបង់"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"រំលង"</string>
 </resources>
diff --git a/quickstep/res/values-ko/strings.xml b/quickstep/res/values-ko/strings.xml
index 7a8e6a1f9a..3cb3a242ca 100644
--- a/quickstep/res/values-ko/strings.xml
+++ b/quickstep/res/values-ko/strings.xml
@@ -19,19 +19,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"화면 분할"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"고정"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"자유 형식"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"최근 사용"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"최근 항목이 없습니다."</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"닫기"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"앱 사용 설정"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"모두 삭제"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"최근 앱"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>, <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; 1분"</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"오늘 <xliff:g id="TIME">%1$s</xliff:g> 남음"</string>
-    <string name="title_app_suggestions" msgid="4185902664111965088">"앱 추천"</string>
+    <string name="title_app_suggestions" msgid="4185902664111965088">"앱 제안"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"모든 앱"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"추천 앱"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"홈 화면 하단에서 앱 제안 보기"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"홈 화면의 즐겨찾기 행에서 앱 제안 보기"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"홈 화면에서 자주 사용하는 앱에 바로 액세스할 수 있습니다. 제안은 사용 습관에 따라 바뀌며, 하단의 앱들은 홈 화면으로 이동합니다."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"홈 화면에서 가장 많이 사용한 앱에 바로 액세스할 수 있습니다. 제안은 루틴에 따라 달라집니다. 즐겨찾기 행의 앱이 홈 화면으로 이동합니다."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"홈 화면에서 자주 사용하는 앱에 바로 액세스할 수 있습니다. 제안은 사용 습관에 따라 바뀌며, 하단의 앱들은 새 폴더로 이동합니다."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"앱 제안받기"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"나중에"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"설정"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"가장 많이 사용한 앱이 여기에 표시되며 루틴에 따라 달라짐"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"하단 행에서 앱을 드래그하여 앱 제안 받기"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"빈 공간에 앱 제안이 추가됨"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"앱 제안이 사용 설정됨"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"앱 제안이 사용 중지됨"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"예상 앱: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"왼쪽 가장자리 끝에서 스와이프하세요."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"왼쪽 가장자리에서 화면 중앙으로 스와이프한 후 손가락을 떼세요."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"좋습니다. 이번에는 오른쪽 가장자리에서 스와이프해 보세요."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"오른쪽 가장자리 끝에서 스와이프하세요."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"오른쪽 가장자리에서 화면 중앙으로 스와이프한 후 손가락을 떼세요."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"돌아가기 동작을 완료했습니다. 이번에는 홈으로 가는 방법을 알아보겠습니다."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"화면 하단에 지나치게 가까운 곳에서 스와이프하면 안 됩니다."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"돌아가기 동작의 민감도를 변경하려면 설정으로 이동하세요"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"스와이프하여 돌아가기"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"마지막 화면으로 돌아가려면 왼쪽 또는 오른쪽 가장자리에서 화면 중앙으로 스와이프하세요"</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"화면 하단 가장자리에서 위로 스와이프하세요."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"손가락을 떼기 전에 멈추지 않아야 합니다."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"위로 똑바르게 스와이프하세요."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"홈으로 이동 동작을 완료했습니다. 이번에는 앱 전환 방법을 알아보겠습니다."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"스와이프하여 홈으로 이동"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"화면 하단에서 위로 스와이프합니다. 이 동작을 사용하면 언제든지 홈 화면으로 이동할 수 있습니다"</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"화면 하단 가장자리에서 위로 스와이프하세요."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"창을 더 오래 누르고 있다가 손가락을 떼 보세요."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"위로 똑바르게 스와이프한 후 잠깐 멈추세요."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"앱 전환 동작을 완료했습니다. 휴대전화를 사용할 준비가 됐습니다."</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"스와이프로 앱 전환"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"화면 하단에서 위로 스와이프하고 잠시 멈춘 다음 손가락을 떼세요"</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"설정 완료"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"다음"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"완료"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"설정"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"다시 시도"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"잘하셨습니다"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"튜토리얼 <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"공유"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"스크린샷"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"이 작업은 앱 또는 조직에서 허용되지 않습니다."</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"이동 방법 튜토리얼을 건너뛰시겠습니까?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"이 내용은 팁 앱에서 다시 볼 수 있습니다"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"취소"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"건너뛰기"</string>
 </resources>
diff --git a/quickstep/res/values-lt/strings.xml b/quickstep/res/values-lt/strings.xml
index ed1fc373e2..59f598805b 100644
--- a/quickstep/res/values-lt/strings.xml
+++ b/quickstep/res/values-lt/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Skaidyti ekraną"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Prisegti"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Laisva forma"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Apžvalga"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Nėra jokių naujausių elementų"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Uždaryti"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Programos naudojimo nustatymai"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Išvalyti viską"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Naujausios programos"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Programų pasiūlymai"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Visos programos"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Numatomos programos"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Gaukite programų pasiūlymų apatinėje pagrindinio ekrano eilutėje"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Gaukite programų pasiūlymų pagrindinio ekrano eilutėje „Mėgstamiausios“"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Lengvai pasiekite dažniausiai naudojamas programas iškart pagrindiniame ekrane. Pasiūlymai keisis atsižvelgiant į tai, kaip jas naudojate. Apatinėje eilutėje esančios programos bus perkeltos į pagrindinį ekraną."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Lengvai pasiekite dažniausiai naudojamas programas iškart pagrindiniame ekrane. Pasiūlymai keisis atsižvelgiant į tai, kaip jas naudojate. Eilutėje „Mėgstamiausios“ rodomos programos bus perkeltos į pagrindinį ekraną."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Lengvai pasiekite dažniausiai naudojamas programas iškart pagrindiniame ekrane. Pasiūlymai keisis atsižvelgiant į tai, kaip jas naudojate. Apatinėje eilutėje esančios programos bus perkeltos į naują aplanką."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Gauti programų pasiūlymų"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Ne, ačiū"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Nustatymai"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Dažniausiai naudojamos programos rodomos čia ir keičiasi pagal tai, kaip jas naudojate"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Nuvilkę programas į apatinę eilutę gausite programų pasiūlymų"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Programų pasiūlymai pridedami tuščioje vietoje"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Siūlomų programų funkcija įgalinta"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Siūlomų programų funkcija išjungta"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Numatoma programa: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Turite perbraukti nuo kairiojo krašto."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Turite perbraukti nuo kairiojo krašto link ekrano vidurio ir pakelti pirštą."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Tai viskas! Dabar pabandykite perbr. nuo dešiniojo krašto."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Turite perbraukti nuo dešiniojo krašto."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Turite perbraukti nuo dešiniojo krašto link ekrano vidurio ir pakelti pirštą."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Atlikote grįžimo atgal gestą. Toliau sužinosite, kaip pereiti į pagrindinį ekraną."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nebraukite per arti ekrano apačios."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Norėd. pak. grįžimo gesto jautr., eikite į sk. „Nustatymai“"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Norėdami grįžti, perbraukite"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Norėdami grįžti į ankstesnį ekraną, perbr. nuo kairiojo arba dešinio krašto link ekrano vidurio."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Turite perbraukti aukštyn nuo apatinio ekrano krašto."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Nepristabdykite prieš pakeldami pirštą."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Turite tiesiai perbraukti aukštyn."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Atlikote perėjimo į pagrindinį ekraną gestą. Toliau sužinosite, kaip perjungti programas."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Perbraukite, kad pereitumėte į pagrindinį ekraną"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Perbraukite aukštyn nuo ekrano apačios. Atlikus šį gestą, visada nukreipiama į pagrindinį ekraną."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Turite perbraukti aukštyn nuo apatinio ekrano krašto."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Pabandykite palaikyti langą ilgiau prieš pakeldami pirštą."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Turite tiesiai perbraukti aukštyn, o tada pristabdyti."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Atlikote programų perjungimo gestą. Esate pasirengę naudoti telefoną!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Perbraukite, kad perjungtumėte programas"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Perbraukite aukštyn nuo ekrano apačios, palaikykite ir paleiskite."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Viskas nustatyta"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Kitas"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Atlikta"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Nustatymai"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Bandykite dar kartą"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Šaunu!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Mokymo programa: <xliff:g id="CURRENT">%1$d</xliff:g> iš <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Bendrinti"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Ekrano kopija"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Jūsų organizacijoje arba naudojant šią programą neleidžiama atlikti šio veiksmo"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Praleisti naršymo mokymo programą?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Tai gal. rasti vėliau patar. programoje"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Atšaukti"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Praleisti"</string>
 </resources>
diff --git a/quickstep/res/values-lv/strings.xml b/quickstep/res/values-lv/strings.xml
index 85ce0e017d..4f0074e68a 100644
--- a/quickstep/res/values-lv/strings.xml
+++ b/quickstep/res/values-lv/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Sadalīt ekrānu"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Piespraust"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Brīva forma"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Pārskats"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Nav nesenu vienumu."</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Aizvērt"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Lietotņu izmantošanas iestatījumi"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Notīrīt visu"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Pēdējās izmantotās lietotnes"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Ieteicamās lietotnes"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Visas lietotnes"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Jūsu prognozētās lietotnes"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Sākuma ekrāna apakšējā rindā tiks rādītas ieteicamās lietotnes"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Saņemiet lietotņu ieteikumus izlases rindā sākuma ekrānā"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Varat sākuma ekrānā ērti piekļūt savām visbiežāk izmantotajām lietotnēm. Ieteikumi mainīsies atkarībā no jūsu paradumiem. Apakšējā rindā esošās lietotnes tiks pārvietotas uz augšu — uz sākuma ekrānu."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Varat sākuma ekrānā ērti piekļūt savām visbiežāk izmantotajām lietotnēm. Ieteikumi mainīsies atkarībā no jūsu paradumiem. Lietotnes no izlases rindas tiks pārvietotas uz sākuma ekrānu."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Varat sākuma ekrānā ērti piekļūt savām visbiežāk izmantotajām lietotnēm. Ieteikumi mainīsies atkarībā no jūsu paradumiem. Apakšējā rindā esošās lietotnes tiks pārvietotas uz jaunu mapi."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Rādīt ieteicamās lietotnes"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Nē, paldies"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Iestatījumi"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Šeit tiek rādītas visbiežāk izmantotās lietotnes, un tās mainās atkarībā no jūsu paradumiem"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Lai skatītu ieteicamās lietotnes, velciet lietotnes prom no apakšējās rindas"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Ieteicamās lietotnes tika pievienotas tukšajā vietā"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Ieteicamās lietotnes ir iespējotas"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Ieteicamās lietotnes ir atspējotas"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Prognozētā lietotne: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Jāvelk no pašas kreisās malas."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Jāvelk no ekrāna kreisās malas uz vidu un jāatlaiž."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Tas arī viss! Tagad mēģiniet vilkt no labās malas."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Jāvelk no pašas labās malas."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Jāvelk no ekrāna labās malas uz vidu un jāatlaiž."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Jūs sekmīgi veicāt atgriešanās žestu. Tagad varat iemācīties, kā pāriet uz sākumu."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nevelciet pārāk tuvu ekrāna apakšdaļai."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Atgriešanās žesta jutīguma līmeni varat mainīt iestatījumos."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Vilkšana, lai atgrieztos"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Lai atgrieztos iepriekšējā ekrānā, velciet no kreisās vai labās malas uz ekrāna vidu."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Jāvelk augšup no ekrāna apakšmalas."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pirms atlaišanas nepārtrauciet kustību."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Jāvelk tieši uz augšu."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Jūs sekmīgi veicāt sākuma ekrāna atvēršanas žestu. Tagad varat iemācīties, kā pārslēgt lietotnes."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Vilkšana, lai pārietu uz sākumu"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Velciet augšup no ekrāna apakšdaļas. Ar šo žestu vienmēr varat atvērt sākuma ekrānu."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Jāvelk augšup no ekrāna apakšmalas."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Mēģiniet ilgāk turēt logu, pirms atlaižat."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Jāvelk tieši uz augšu un pēc tam jāaptur kustība."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Jūs sekmīgi veicāt lietotņu pārslēgšanas žestu. Esat gatavs izmantot tālruni!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Vilkšana, lai pārslēgtu lietotnes"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Velciet augšup no ekrāna apakšdaļas, turiet un pēc tam atlaidiet."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Gatavs"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Tālāk"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Gatavs"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Iestatījumi"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Mēģināt vēlreiz"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Lieliski!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"<xliff:g id="CURRENT">%1$d</xliff:g>. mācību darbība no <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Kopīgot"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Veikt ekrānuzņēmumu"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Lietotne vai jūsu organizācija neatļauj veikt šo darbību."</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Vai izlaist navigācijas mācības?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Varēsiet tās atrast lietotnē Padomi"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Atcelt"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Izlaist"</string>
 </resources>
diff --git a/quickstep/res/values-mk/strings.xml b/quickstep/res/values-mk/strings.xml
index 9f11521df3..b1295acacb 100644
--- a/quickstep/res/values-mk/strings.xml
+++ b/quickstep/res/values-mk/strings.xml
@@ -19,14 +19,11 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Поделен екран"</string>
-    <string name="recent_task_option_pin" msgid="7929860679018978258">"Прикачување"</string>
+    <string name="recent_task_option_pin" msgid="7929860679018978258">"Закачи"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Freeform"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Преглед"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Нема неодамнешни ставки"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Затвори"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Поставки за користење на апликациите"</string>
-    <string name="recents_clear_all" msgid="5328176793634888831">"Исчисти ги сите"</string>
+    <string name="recents_clear_all" msgid="5328176793634888831">"Избриши ги сите"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Неодамнешни апликации"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>, <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; 1 минута"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Предлози за апликации"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Сите апликации"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Вашите предвидени апликации"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Добивајте предлози за апликации на долниот ред од почетниот екран"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Добивајте предлози за апликации во редот со омилени на почетниот екран"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Лесно пристапувајте до најкористените апликации директно на почетниот екран. Предлозите ќе се менуваат според рутините. Апликациите од последниот ред ќе се поместуваат нагоре до почетниот екран."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Лесно пристапувајте до најкористените апликации на почетниот екран. Предлозите ќе се менуваат според рутините. Апликациите од редот со омилени ќе се преместат на почетниот екран."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Лесно пристапувајте до најкористените апликации директно на почетниот екран. Предлозите ќе се менуваат според рутините. Апликациите од последниот ред ќе се преместуваат во нова папка."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Добивајте предлози за апликации"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Не, фала"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Поставки"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Најкористените апликации се појавуваат тука и се менуваат според рутините"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Отстранете апликации од долниот ред со повлекување за да добивате предлози за апликации"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Предлозите за апликации се додадени во празен простор"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Предлозите за апликации се овозможени"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Предлозите за апликации се оневозможени"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Предвидена апликација: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Повлечете од подалечниот лев агол."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Повлечете од левиот раб кон средината на екранот и пуштете."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Тоа е сѐ! Сега пробајте да повлечете од десниот раб."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Повлечете од подалечниот десен агол."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Повлечете од десниот раб кон средината на екранот и пуштете."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Завршивте со упатството за враќање назад. Следно, дознајте како да одите на почетната страница."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Не повлекувајте преблиску до долниот раб на екранот."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"За да ја промените чувствителноста, одете во „Поставки“"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Повлечете за да се вратите назад"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"За да се вратите на последниот екран, повлечете од левиот или десниот раб кон средината на екранот."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Повлечете нагоре од долниот раб на екранот."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Не правете пауза пред да пуштите."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Повлечете право нагоре."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Завршивте со упатството за почетната страница. Следно, дознајте како да се префрлате помеѓу апликации."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Повлечете за да одите на почетната страница"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Повлечете нагоре од долниот раб на екранот. Ова движење секогаш ќе ве одведе на почетниот екран."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Повлечете нагоре од долниот раб на екранот."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Задржете го прозорецот подолго пред да го пуштите."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Повлечете право нагоре, а потоа застанете."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Завршивте со упатството за префрлање помеѓу апликации. Спремни сте да го користите телефонот."</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Повлечете за префрлање помеѓу апликации"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Повлечете нагоре од дното на екранот и задржете, па пуштете."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Готово"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Следно"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Готово"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Поставки"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Обиди се пак"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Одлично!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Упатство <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Сподели"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Слика од екранот"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Апликацијата или вашата организација не го дозволува дејствово"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Да се прескокне упатството за навигација?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Ова може да го најдете и во „Совети“"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Откажи"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Прескокни"</string>
 </resources>
diff --git a/quickstep/res/values-mn/strings.xml b/quickstep/res/values-mn/strings.xml
index 5bc925b7a7..d9e9f16c99 100644
--- a/quickstep/res/values-mn/strings.xml
+++ b/quickstep/res/values-mn/strings.xml
@@ -45,73 +45,40 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Санал болгож буй аппуудыг идэвхжүүлсэн"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Санал болгож буй аппуудыг идэвхгүй болгосон"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Таамаглаж буй апп: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
-    <skip />
-    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Та зүүн захын булангаас шударна уу."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Та дэлгэцийн зүүн булангаас дунд хэсэг хүртэл шударч, суллаарай."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Ингээд л боллоо! Одоо баруун булангаас шударч үзнэ үү."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Та баруун захын булангаас шударна уу."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Та дэлгэцийн баруун булангаас дунд хэсэг хүртэл шударч, суллаарай."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Та буцах зангааг гүйцэтгэлээ. Дараа нь Нүүр лүү хэрхэн очихыг мэдэж авна уу."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Та дэлгэцийн доод хэсэгтэй хэт ойр бүү шудраарай."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Буцах зангааны мэдрэгшлийг өөрчлөх бол Тохиргоо руу очно уу"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Буцахын тулд шудрах"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Сүүлийн дэлгэц рүү буцахын тулд дэлгэцийн зүүн эсвэл баруун булангаас дунд хэсэг рүү шударна уу."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Та дэлгэцийн доод булангаас дээш шударна уу."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Та суллахаасаа өмнө түр зогсоож болохгүй."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Та чигээрээ шударна уу."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Та Нүүр лүү очих зангааг гүйцэтгэлээ. Дараа нь аппуудыг хэрхэн сэлгэх талаар мэдэж авна уу."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Нүүр лүү очихын тулд шудрах"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Дэлгэцийнхээ доороос дээш шударна уу. Энэ зангаа таныг тогтмол Үндсэн нүүрэнд аваачна."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Та дэлгэцийн доод булангаас дээш шударна уу."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Суллахаасаа өмнө цонхыг илүү удаан дарж үзнэ үү."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Та чигээрээ шударч, дараа нь түр зогсооно уу."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Та аппуудыг сэлгэх зангааг гүйцэтгэлээ. Та утсаа ашиглахад бэлэн боллоо!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Аппуудыг сэлгэхийн тулд шудрах"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Дэлгэцийнхээ доод хэсгээс дээш шударч, удаан дараад суллана уу."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Бүгдийг тохируулсан"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Дараах"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Дууссан"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Тохиргоо"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Дахин оролдох"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Янзтай!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"<xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g> практик хичээл"</string>
     <string name="action_share" msgid="2648470652637092375">"Хуваалцах"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Дэлгэцийн агшин дарах"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Энэ үйлдлийг апп эсвэл танай байгууллага зөвшөөрдөггүй"</string>
-    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
-    <skip />
-    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
-    <skip />
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Навигацын практик хичээлийг алгасах уу?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Та үүнийг дараа нь Tips аппаас олж болно"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Цуцлах"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Алгасах"</string>
 </resources>
diff --git a/quickstep/res/values-mr/strings.xml b/quickstep/res/values-mr/strings.xml
index cccece749c..386365c71c 100644
--- a/quickstep/res/values-mr/strings.xml
+++ b/quickstep/res/values-mr/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"विभाजित स्क्रीन"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"पिन करा"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"फ्रीफॉर्म"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"अवलोकन"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"कोणतेही अलीकडील आयटम नाहीत"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"बंद"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"अ‍ॅप वापर सेटिंग्ज"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"सर्व साफ करा"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"अलीकडील अ‍ॅप्स"</string>
@@ -34,4 +31,87 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"अ‍ॅप सूचना"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"सर्व अ‍ॅप्स"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"तुमची पूर्वानुमानीत अ‍ॅप्स"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"तुमच्या होम स्क्रीनच्या तळाशी अ‍ॅप सूचना मिळवा"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"तुमच्या होम स्क्रीनच्या पसंतीच्या पंक्तीवर अ‍ॅप सूचना मिळवा"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"तुमची सर्वाधिक वापरली जाणारी अ‍ॅप्स होम स्क्रीनवरच सहजपणे अ‍ॅक्सेस करा. तुमच्या दिनक्रमानुसार तुम्हाला मिळणाऱ्या सूचना बदलतील. तळाशी असणारी अ‍ॅप्स तुमच्या होम स्क्रीनवर जातील."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"तुमची सर्वाधिक वापरली जाणारी अ‍ॅप्स होम स्क्रीनवर सहजपणे अ‍ॅक्सेस करा. सूचना तुमच्या दिनक्रमांनुसार बदलतील. पसंतीच्या पंक्तीमधील अ‍ॅप्स तुमच्या होम स्क्रीनवर हलवली जातील."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"तुमची सर्वाधिक वापरली जाणारी अ‍ॅप्स होम स्क्रीनवरच सहजपणे अ‍ॅक्सेस करा. सूचना तुमच्या दिनक्रमांच्या आधारावर बदलतील. तळाच्या पंक्तीवरील अ‍ॅप्स नवीन फोल्डरवर जातील."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"अ‍ॅप सूचना मिळवा"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"नाही, नको"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"सेटिंग्ज"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"सर्वाधिक वापरली जाणारी अ‍ॅप्स येथे दिसतात आणि दिनक्रमांच्या आधारावर बदलतात"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"अ‍ॅप सूचना मिळवण्यासाठी तळाच्या पंक्तीवरून अ‍ॅप्स ड्रॅग करा"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"रिकाम्या जागेवर जोडलेल्या अ‍ॅप सूचना"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"अ‍ॅप सूचना सुरू केल्या आहेत"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"अ‍ॅप सूचना बंद केल्या आहेत"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"पूर्वानुमान केलेले अ‍ॅप: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
+    <skip />
+    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
+    <skip />
+    <string name="action_share" msgid="2648470652637092375">"शेअर करा"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"स्क्रीनशॉट"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"अ‍ॅप किंवा तुमच्या संस्थेद्वारे ही क्रिया करण्याची अनुमती नाही"</string>
+    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
+    <skip />
+    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <skip />
 </resources>
diff --git a/quickstep/res/values-ms/strings.xml b/quickstep/res/values-ms/strings.xml
index 2542963769..71154ee047 100644
--- a/quickstep/res/values-ms/strings.xml
+++ b/quickstep/res/values-ms/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Skrin pisah"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Semat"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Bentuk bebas"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Ikhtisar"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Tiada item terbaharu"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Tutup"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Tetapan penggunaan apl"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Kosongkan semua"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Apl terbaharu"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Cadangan apl"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Semua apl"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Apl ramalan anda"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Dapatkan cadangan apl di baris bawah Skrin utama anda"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Dapatkan cadangan apl di baris kegemaran Skrin utama anda"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Akses apl yang paling kerap anda gunakan dengan mudah pada Skrin utama. Cadangan akan berubah berdasarkan rutin anda. Apl di baris bawah akan beralih ke atas, ke Skrin utama anda."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Akses apl yang paling kerap anda gunakan dengan mudah pada Skrin utama. Cadangan akan berubah berdasarkan rutin anda. Apl di baris kegemaran akan beralih ke Skrin utama anda."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Akses apl yang paling kerap anda gunakan dengan mudah, terus pada Skrin utama. Cadangan akan berubah berdasarkan rutin anda. Apl di baris bawah akan beralih ke folder baharu."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Dapatkan cadangan apl"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Tidak perlu"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Tetapan"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Apl yang paling kerap digunakan dipaparkan di sini dan berubah berdasarkan rutin"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Seret apl keluar dari baris bawah untuk mendapatkan cadangan apl"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Cadangan apl ditambahkan pada ruang kosong"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Cadangan apl didayakan"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Cadangan apl dilumpuhkan"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Apl yang diramalkan: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pastikan anda meleret dari hujung sebelah kiri."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pastikan anda meleret dari tepi sebelah kiri ke tengah skrin dan lepaskan."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Itu sahaja! Sekarang, cuba leret dari tepi sebelah kanan."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pastikan anda meleret dari hujung sebelah kanan."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pastikan anda meleret dari tepi sebelah kanan ke tengah skrin dan lepaskan."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Anda telah melengkapkan gerak isyarat undur. Seterusnya, ketahui cara kembali ke Laman Utama."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pastikan anda tidak meleret terlalu dekat dengan bahagian bawah skrin."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Utk mengubah kepekaan gerak isyarat undur, pergi ke Tetapan"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Leret untuk kembali"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Untuk kembali ke skrin terakhir, leret dari tepi sebelah kiri atau kanan ke tengah skrin."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pastikan anda meleret ke atas dari tepi sebelah bawah skrin."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pastikan anda tidak menjeda sebelum melepaskan gerak isyarat tersebut."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pastikan anda meleret terus ke atas."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Anda telah melengkapkan gerak isyarat kembali ke Laman Utama. Seterusnya, ketahui cara menukar apl."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Leret untuk kembali ke laman utama"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Leret ke atas dari bahagian bawah skrin. Gerak isyarat ini sentiasa membawa anda ke Skrin utama."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Pastikan anda meleret ke atas dari tepi sebelah bawah skrin."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Cuba tahan tetingkap untuk tempoh yang lebih lama sebelum melepaskan."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Pastikan anda meleret ke atas, kemudian menjeda."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Anda telah melengkapkan gerak isyarat menukar apl. Telefon anda sudah bersedia untuk digunakan!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Leret untuk menukar apl"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Leret ke atas dari bahagian bawah skrin anda, tahan, kemudian lepaskan."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Selesai"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Seterusnya"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Selesai"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Tetapan"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Cuba lagi"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bagus!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Kongsi"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Tangkapan skrin"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Tindakan ini tidak dibenarkan oleh apl atau organisasi anda"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Langkau tutorial navigasi?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Anda boleh mendapatkan tutorial ini kemudian dalam apl Petua"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Batal"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Langkau"</string>
 </resources>
diff --git a/quickstep/res/values-my/strings.xml b/quickstep/res/values-my/strings.xml
index 7683e05990..4dd45d0aac 100644
--- a/quickstep/res/values-my/strings.xml
+++ b/quickstep/res/values-my/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"မျက်နှာပြင် ခွဲ၍ပြသခြင်း"</string>
-    <string name="recent_task_option_pin" msgid="7929860679018978258">"ပင်ထိုးခြင်း"</string>
+    <string name="recent_task_option_pin" msgid="7929860679018978258">"ပင်ထိုးရန်"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"အလွတ်ပုံစံ"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"အနှစ်ချုပ်"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"မကြာမီကဖွင့်ထားသည်များ မရှိပါ"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"ပိတ်ရန်"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"အက်ပ်အသုံးပြုမှု ဆက်တင်များ"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"အားလုံးကို ရှင်းရန်"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"လတ်တလောသုံး အက်ပ်များ"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"အက်ပ်အကြံပြုချက်များ"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"အက်ပ်အားလုံး"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"သင်၏ ခန့်မှန်းအက်ပ်များ"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"သင်၏ \'ပင်မစာမျက်နှာ\' အောက်ခြေအတန်းတွင် အက်ပ်အကြံပြုချက်များ ရယူခြင်း"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"သင်၏ \'ပင်မစာမျက်နှာ\' ၏ အနှစ်သက်ဆုံးများအတန်းတွင် အက်ပ်အကြံပြုချက်များ ရယူခြင်း"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"အသုံးအများဆုံးအက်ပ်များကို \'ပင်မစာမျက်နှာ\' တွင် အလွယ်တကူ ဖွင့်နိုင်သည်။ သင်၏ ပုံမှန်လုပ်ဆောင်ချက်များပေါ် အခြေခံ၍ အကြံပြုချက်များ ပြောင်းလဲပါမည်။ အောက်ခြေအတန်းရှိ အက်ပ်များကို သင်၏ \'ပင်မစာမျက်နှာ\' သို့ရွှေ့လိုက်မည်။"</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"အသုံးအများဆုံးအက်ပ်များကို \'ပင်မစာမျက်နှာ\' တွင် အလွယ်တကူ သုံးနိုင်သည်။ သင်၏ ပုံမှန်အစီအစဉ်များပေါ် အခြေခံ၍ အကြံပြုချက်များ ပြောင်းလဲပါမည်။ အနှစ်သက်ဆုံးများအတန်းရှိ အက်ပ်များကို သင်၏ \'ပင်မစာမျက်နှာ\' သို့ရွှေ့လိုက်မည်။"</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"အသုံးအများဆုံးအက်ပ်များကို \'ပင်မစာမျက်နှာ\' တွင် အလွယ်တကူ သုံးနိုင်သည်။ သင်၏ ပုံမှန်အစီအစဉ်များပေါ် အခြေခံ၍ အကြံပြုချက်များ ပြောင်းလဲပါမည်။ အောက်ခြေအတန်းရှိ အက်ပ်များကို ဖိုင်တွဲအသစ်သို့ ရွှေ့လိုက်မည်။"</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"အက်ပ်အကြံပြုချက်များ ရယူရန်"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"မလိုပါ"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"ဆက်တင်များ"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"အသုံးအများဆုံးအက်ပ်များကို ဤနေရာတွင် ပြပြီး ပုံမှန်အစီအစဉ်များပေါ် အခြေခံ၍ ပြောင်းလဲသည်"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"အက်ပ်အကြံပြုချက်များ ရယူရန် အောက်ခြေအတန်းရှိ အက်ပ်များကို ဖိဆွဲထုတ်လိုက်ပါ"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"အက်ပ်အကြံပြုချက်များကို နေရာလွတ်သို့ ထည့်လိုက်သည်"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"အက်ပ်အကြံပြုချက်များ ဖွင့်ထားသည်"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"အက်ပ်အကြံပြုချက်များကို ပိတ်ထားသည်"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ကြိုတင်မှန်းဆထားသော အက်ပ်− <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ဘယ်ဘက်အစွန် ခပ်လှမ်းလှမ်းမှ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ဘယ်ဘက်အစွန်မှ ဖန်သားပြင်အလယ်သို့ ပွတ်ဆွဲပြီး လွှတ်လိုက်ကြောင်း သေချာပါစေ။"</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"ရပါပြီ။ ညာဘက်အစွန်မှနေ၍ ယခု ပွတ်ဆွဲကြည့်ပါ။"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ညာဘက်အစွန် ခပ်လှမ်းလှမ်းမှ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ညာဘက်အစွန်မှ ဖန်သားပြင်အလယ်သို့ ပွတ်ဆွဲပြီး လွှတ်လိုက်ကြောင်း သေချာပါစေ။"</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"နောက်ဆုတ်လက်ဟန် ရှင်းလင်းပို့ချချက် ပြီးပါပြီ။ နောက်အဆင့်တွင် ပင်မစာမျက်နှာသို့ သွားနည်းကို လေ့လာပါ။"</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ဖန်သားပြင် အောက်ခြေနှင့် အလွန်နီးကပ်စွာ ပွတ်ဆွဲခြင်းမရှိကြောင်း သေချာပါစေ။"</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"နောက်ဆုတ်လက်ဟန်၏ အာရုံခံစွမ်းကိုပြောင်းရန် ‘ဆက်တင်များ’ သို့ သွားပါ"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"နောက်ပြန်သွားရန် ပွတ်ဆွဲပါ"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"နောက်ဆုံးဖန်သားပြင်သို့ ပြန်သွားရန် ဘယ်ဘက် (သို့) ညာဘက်အစွန်မှ ဖန်သားပြင်အလယ်သို့ ပွတ်ဆွဲပါ။"</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ဖန်သားပြင် အောက်ခြေအစွန်မှ အပေါ်သို့ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"လက်မလွှတ်ခင် ခဏရပ်ခြင်းမရှိကြောင်း သေချာပါစေ။"</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"အပေါ်တည့်တည့်သို့ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"ပင်မစာမျက်နှာသို့သွားသည့် လက်ဟန် ရှင်းလင်းပို့ချချက် ပြီးပါပြီ။ နောက်အဆင့်တွင် အက်ပ်များပြောင်းနည်းကို လေ့လာပါ။"</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"ပင်မစာမျက်နှာသို့သွားရန် ပွတ်ဆွဲပါ"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"သင့်ဖန်သားပြင် အောက်ခြေမှ အပေါ်သို့ပွတ်ဆွဲပါ။ ဤလက်ဟန်ဖြင့် ပင်မစာမျက်နှာသို့ အမြဲပြန်သွားနိုင်သည်။"</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ဖန်သားပြင် အောက်ခြေအစွန်မှ အပေါ်သို့ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"မလွှတ်ခင် ဝင်းဒိုးကို အချိန်ကြာကြာ ဖိထားကြည့်ပါ။"</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"အပေါ်တည့်တည့်သို့ ပွတ်ဆွဲပြီးနောက် ခဏရပ်ကြောင်း သေချာပါစေ။"</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"အက်ပ်များပြောင်းသည့် လက်ဟန် ရှင်းလင်းပို့ချချက် ပြီးပါပြီ။ သင့်ဖုန်းကို သုံးရန် အဆင်သင့်ဖြစ်ပါပြီ။"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"အက်ပ်များပြောင်းရန် ပွတ်ဆွဲပါ"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"သင့်ဖန်သားပြင် အောက်ခြေမှ အပေါ်သို့ ပွတ်ဆွဲပါ၊ ဖိထားပြီးနောက် လွှတ်လိုက်ပါ။"</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"အားလုံးအဆင်သင့်ဖြစ်ပါပြီ"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"ရှေ့သို့"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"ပြီးပြီ"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ဆက်တင်များ"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ထပ်စမ်းကြည့်ရန်"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ကောင်းသည်။"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"ရှင်းလင်းပို့ချချက် <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"မျှဝေရန်"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"ဖန်သားပြင်ဓာတ်ပုံ"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"ဤလုပ်ဆောင်ချက်ကို အက်ပ် သို့မဟုတ် သင်၏အဖွဲ့အစည်းက ခွင့်မပြုပါ"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"လမ်းညွှန်ခြင်း ရှင်းလင်းပို့ချချက်ကို ကျော်မလား။"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"၎င်းကို နောက်မှ ‘အကြံပြုချက်များ အက်ပ်’ တွင် ရှာနိုင်သည်"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"မလုပ်တော့"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"ကျော်ရန်"</string>
 </resources>
diff --git a/quickstep/res/values-nb/strings.xml b/quickstep/res/values-nb/strings.xml
index 01bbb6a75d..c743e98e03 100644
--- a/quickstep/res/values-nb/strings.xml
+++ b/quickstep/res/values-nb/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Delt skjerm"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Fest"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Fritt format"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Oversikt"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Ingen nylige elementer"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Lukk"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Innstillinger for appbruk"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Fjern alt"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Nylige apper"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Appanbefalinger"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Alle apper"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Forslag til apper"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Få appforslag i den nederste raden på startskjermen"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Få appforslag i favoritter-raden på startskjermen"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Få enkel tilgang til appene du bruker oftest, rett fra startskjermen. Forslagene endres basert på rutinene dine. Appene i den nederste raden flyttes opp til startskjermen."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Få enkel tilgang til appene du bruker oftest, rett fra startskjermen. Forslagene endres basert på rutinene dine. Apper i favoritter-raden blir flyttet til startskjermen."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Få enkel tilgang til appene du bruker oftest, rett fra startskjermen. Forslagene endres basert på rutinene dine. Appene i den nederste raden flyttes til en ny mappe."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Få appforslag"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Nei takk"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Innstillinger"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Appene som brukes oftest, vises her og endres basert på rutiner"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Dra appene vekk fra den nederste raden for å få appforslag."</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Appforslag er lagt til på et tomt område"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Appforslag er på"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Appforslag er slått av"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Foreslått app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Sørg for at du sveiper fra kanten helt til venstre."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Sørg for at du sveiper fra den venstre kanten til midten av skjermen og slipper."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Så enkelt er det! Prøv nå å sveipe fra den høyre kanten."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Sørg for at du sveiper fra kanten helt til høyre."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Sørg for at du sveiper fra den høyre kanten til midten av skjermen og slipper."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Du har fullført bevegelsen for å gå tilbake. I neste trinn ser du hvordan du går til startskjermen."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Sørg for at du ikke sveiper for nær bunnen av skjermen."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Gå til Innstillinger for å endre tilbakebevegelsefølsomheten"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Sveip for å gå tilbake"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"For å gå tilbake til forrige skjerm, sveip fra venstre eller høyre kant til midten av skjermen."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Sørg for at du sveiper opp fra den nederste kanten av skjermen."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Sørg for at du ikke setter på pause før du slipper."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Sørg for at du sveiper rett opp."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Du har fullført bevegelsen for å gå til startskjermen. I neste trinn lærer du hvordan du bytter app."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Sveip for å gå til startskjermen"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Sveip opp fra bunnen av skjermen. Denne bevegelsen tar deg alltid til startskjermen."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Sørg for at du sveiper opp fra den nederste kanten av skjermen."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Prøv å holde vinduet lenger før du slipper."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Sørg for at du sveiper rett opp, og så stopper du."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Du har fullført bevegelsen for å bytte app. Du er klar til å bruke telefonen."</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Sveip for å bytte app"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Sveip opp fra bunnen av skjermen, hold og slipp."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Ferdig"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Neste"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Ferdig"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Innstillinger"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Prøv igjen"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bra!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Veiledning <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Del"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Skjermdump"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Appen eller organisasjonen din tillater ikke denne handlingen"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Vil du hoppe over navigeringsveiledning?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Du kan finne dette i Tips-appen senere"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Avbryt"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Hopp over"</string>
 </resources>
diff --git a/quickstep/res/values-pl/strings.xml b/quickstep/res/values-pl/strings.xml
index d83160dffb..017936f673 100644
--- a/quickstep/res/values-pl/strings.xml
+++ b/quickstep/res/values-pl/strings.xml
@@ -19,19 +19,99 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Podziel ekran"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Przypnij"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Tryb dowolny"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Przegląd"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Brak ostatnich elementów"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Zamknij"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Ustawienia użycia aplikacji"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Wyczyść wszystko"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Ostatnie aplikacje"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>, <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&gt; 1 min"</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"Na dziś zostało <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="title_app_suggestions" msgid="4185902664111965088">"Sugerowane aplikacje"</string>
+    <string name="title_app_suggestions" msgid="4185902664111965088">"Sugestie aplikacji"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Wszystkie aplikacje"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Przewidywane aplikacje"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Otrzymuj sugestie aplikacji w dolnym wierszu ekranu głównego"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Otrzymuj sugestie aplikacji w wierszu ulubionych na ekranie głównym"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Łatwo uruchamiaj najczęściej używane aplikacje z ekranu głównego. Sugestie będą zmieniać się w zależności od Twoich nawyków. Aplikacje z dolnych wierszy będą przesuwane w górę, do ekranu głównego."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Zyskaj łatwy dostęp do najczęściej używanych aplikacji na ekranie głównym. Sugestie będą się zmieniać na podstawie Twojej rutyny. Aplikacje z wiersza ulubionych zostaną przeniesione na ekran główny."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Korzystaj z najczęściej używanych aplikacji na ekranie głównym w łatwy sposób. Sugestie będą się zmieniać na podstawie Twojej rutyny. Aplikacje z dolnych wierszy będą się przenosić do nowego folderu."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Otrzymuj sugestie aplikacji"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Nie, dziękuję"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Ustawienia"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Najczęściej używane aplikacje wyświetlają się tutaj i zmieniają się w zależności od rutyny"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Przeciągnij aplikacje z dolnego wiersza, aby otrzymać sugestie aplikacji"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Sugestie aplikacji dodane w pustym obszarze"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Włączono sugestie aplikacji"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Sugestie aplikacji są wyłączone"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Przewidywana aplikacja: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
+    <skip />
+    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
+    <skip />
+    <string name="action_share" msgid="2648470652637092375">"Udostępnij"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Zrzut ekranu"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Nie możesz wykonać tego działania, bo nie zezwala na to aplikacja lub Twoja organizacja"</string>
+    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
+    <skip />
+    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <skip />
 </resources>
diff --git a/quickstep/res/values-pt-rPT/strings.xml b/quickstep/res/values-pt-rPT/strings.xml
index bf6d6b8e77..13939bfc8a 100644
--- a/quickstep/res/values-pt-rPT/strings.xml
+++ b/quickstep/res/values-pt-rPT/strings.xml
@@ -45,73 +45,40 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Sugestões de apps ativadas"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"As sugestões de apps estão desativadas"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App prevista: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
-    <skip />
-    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Garanta que desliza rapidamente com o dedo a partir da extremidade esquerda."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Garanta que desliza rapidamente com o dedo do limite esquerdo até ao centro do ecrã e solta."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Já está! Agora deslize rapidamente do limite direito."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Garanta que desliza rapidamente com o dedo a partir da extremidade direita."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Garanta que desliza rapidamente com o dedo do limite direito até ao centro do ecrã e solta."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Concluiu o gesto para retroceder. A seguir, saiba como aceder à Página inicial."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Garanta que não desliza rapidamente com o dedo demasiado perto da parte inferior do ecrã."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Altere a sensibilidade do gesto para voltar nas Definições."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Deslize rapidamente com o dedo para retroceder"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Para voltar ao último ecrã, deslize rapidamente do limite esquerdo ou direito até ao centro do ecrã."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Garanta que desliza rapidamente com o dedo a partir do limite inferior do ecrã."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Garanta que não faz uma pausa antes de soltar."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Garanta que desliza rapidamente com o dedo para cima."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Concluiu o gesto para aceder à Página inicial. A seguir, saiba como alternar entre apps."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Deslize rapidamente com o dedo para aceder à Página inicial"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Deslize rapidamente para cima a partir da parte inferior. Este gesto abre sempre o ecrã principal."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Garanta que desliza rapidamente com o dedo a partir do limite inferior do ecrã."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Experimente premir a janela durante mais tempo antes de soltar."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Garanta que desliza rapidamente com o dedo para cima e, em seguida, faz uma pausa."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Concluiu o gesto para alternar entre apps. Já pode utilizar o seu telemóvel!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Deslize rapidamente com o dedo para alternar entre apps"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Deslize rapidamente para cima a partir da parte inferior do ecrã sem soltar e, em seguida, solte."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Está tudo pronto"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Seguinte"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Concluído"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Definições"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Tente novamente"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Boa!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="action_share" msgid="2648470652637092375">"Partilhar"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Fazer captura de ecrã"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Esta ação não é permitida pela app ou a sua entidade."</string>
-    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
-    <skip />
-    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
-    <skip />
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Ignorar o tutorial de navegação?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Pode encontrar isto na app Dicas"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancelar"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Ignorar"</string>
 </resources>
diff --git a/quickstep/res/values-ro/strings.xml b/quickstep/res/values-ro/strings.xml
index 2ac783eb0e..e36b62abbc 100644
--- a/quickstep/res/values-ro/strings.xml
+++ b/quickstep/res/values-ro/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Ecran împărțit"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Fixați"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Formă liberă"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Recente"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Niciun element recent"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Închideți"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Setări de utilizare a aplicației"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Ștergeți tot"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Aplicații recente"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Sugestii de aplicații"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Toate aplicațiile"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Aplicațiile estimate"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Primiți sugestii de aplicații în rândul de jos al ecranului de pornire"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Primiți sugestii de aplicații în rândul de preferințe al ecranului de pornire"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Accesați cu ușurință cele mai folosite aplicații direct din ecranul de pornire. Sugestiile se vor modifica în funcție de rutine. Aplicațiile din rândul de jos se vor muta în sus pe ecranul de pornire."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Accesați cu ușurință cele mai folosite aplicații direct din ecranul de pornire. Sugestiile se vor schimba în funcție de rutina dvs. Aplicațiile din rândul de preferințe se vor muta în ecranul de pornire."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Accesați cu ușurință cele mai folosite aplicații, direct din ecranul de pornire. Sugestiile se vor modifica în funcție de rutine. Aplicațiile din rândul de jos se vor muta într-un dosar nou."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Primiți sugestii de aplicații"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Nu, mulțumesc"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Setări"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Cele mai folosite aplicații apar aici și se modifică în funcție de rutine"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Trageți aplicații din rândul de jos pentru a primi sugestii de aplicații"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Sugestiile de aplicații sunt adăugate în spațiile goale"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Sugestiile de aplicații au fost activate"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Sugestiile de aplicații au fost dezactivate"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplicația estimată: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Glisați dinspre marginea stângă îndepărtată."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Glisați dinspre marginea stângă spre mijlocul ecranului și eliberați."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Atât! Acum încercați să glisați dinspre marginea dreaptă."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Glisați dinspre marginea dreaptă îndepărtată."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Glisați dinspre marginea dreaptă spre mijlocul ecranului și eliberați."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Ați finalizat gestul „Înapoi”. În continuare, aflați cum să accesați pagina de pornire."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nu glisați prea aproape de partea de jos a ecranului."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Schimbați sensibilitatea gestului „Înapoi” accesând Setările"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Glisați pentru a reveni"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Pentru a reveni la ultimul ecran, glisați de la marginea stângă sau dreaptă spre mijlocul ecranului."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Glisați în sus dinspre marginea de jos a ecranului."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Nu întrerupeți gestul înainte de a elibera."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Glisați direct în sus."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Ați finalizat gestul „Pagina de pornire”. În continuare, aflați cum să comutați aplicațiile."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Glisați pentru a accesa pagina de pornire"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Glisați în sus din partea de jos a ecranului. Cu acest gest accesați întotdeauna ecranul de pornire."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Glisați în sus dinspre marginea de jos a ecranului."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Încercați să țineți fereastra mai mult înainte s-o eliberați."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Glisați direct în sus, apoi întrerupeți."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Ați finalizat gestul „schimbați aplicațiile”. Sunteți gata să vă folosiți telefonul!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Glisați pentru a comuta între aplicații"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Glisați în sus din partea de jos a ecranului, așteptați, apoi eliberați."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Gata"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Înainte"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Gata"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Setări"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Reîncercați"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bravo!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorialul <xliff:g id="CURRENT">%1$d</xliff:g> / <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Distribuiți"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Captură de ecran"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Această acțiune nu este permisă de aplicație sau de organizația dvs."</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Omiteți tutorialul de navigare?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Îl puteți găsi mai târziu în Sfaturi"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Anulați"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Omiteți"</string>
 </resources>
diff --git a/quickstep/res/values-ru/strings.xml b/quickstep/res/values-ru/strings.xml
index 5dd89a644b..9745821bc5 100644
--- a/quickstep/res/values-ru/strings.xml
+++ b/quickstep/res/values-ru/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Разделить экран"</string>
-    <string name="recent_task_option_pin" msgid="7929860679018978258">"Блокировать"</string>
+    <string name="recent_task_option_pin" msgid="7929860679018978258">"Закрепить"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Произвольная форма"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Обзор"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Здесь пока ничего нет."</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Закрыть"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Настройки использования приложения"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Очистить все"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Недавние приложения"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Рекомендуемые приложения"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Все приложения"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Ваши рекомендуемые приложения"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Рекомендуемые приложения будут появляться в нижнем ряду на главном экране"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Рекомендуемые приложения будут появляться в разделе избранных на главном экране"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Быстрый доступ к часто используемым приложениям на главном экране. Список меняется с учетом ваших привычек. Приложения из нижнего ряда будут перемещены вверх на главный экран."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Включите функцию для быстрого доступа к часто используемым приложениям на главном экране. Список меняется с учетом ваших действий. Приложения из раздела избранных будут перемещены на главный экран."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Быстрый доступ к часто используемым приложениям на главном экране. Список меняется с учетом ваших привычек. Приложения из нижнего ряда будут перемещены в новую папку."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Показывать рекомендации"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Отмена"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Настройки"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Здесь появляются часто используемые приложения. Список меняется с учетом ваших привычек."</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Перетащите приложения из нижнего ряда, чтобы получить рекомендации"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Рекомендуемые приложения будут появляться на свободных местах."</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Функция \"Рекомендуемые приложения\" включена."</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Функция \"Рекомендуемые приложения\" отключена."</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Рекомендуемое приложение: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Проведите слева направо от самого края экрана."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Проведите от левого края экрана до середины дисплея и отпустите палец."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Готово! Теперь попробуйте провести от правого края экрана."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Проведите справа налево от самого края экрана."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Проведите от правого края экрана до середины дисплея и отпустите палец."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Вы выполнили жест \"Назад\". Далее мы расскажем, как переходить на главный экран."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Проведите пальцем не слишком близко к нижнему краю экрана."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Уровень чувствительности можно изменить в настройках."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Возврат к предыдущему экрану"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Чтобы вернуться к предыдущему экрану, проведите от левого или правого края дисплея к центру."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Проведите снизу вверх от самого края экрана."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Не приостанавливайтесь перед тем, как отпустить палец."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Проведите по экрану ровно вверх."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Вы выполнили жест \"На главный экран\". Далее мы расскажем, как переключаться между приложениями."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Переход на главный экран"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Проведите вверх от нижнего края дисплея. Этот жест открывает главный экран."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Проведите снизу вверх от самого края экрана."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Прежде чем отпускать палец, задержите его на дисплее подольше."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Проведите по экрану ровно вверх, а затем задержите палец в крайнем положении."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Вы выполнили жест \"Переключение между приложениями\". Теперь вы готовы начать работу с телефоном."</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Переключение между приложениями"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Проведите вверх от нижнего края экрана, задержите палец в крайнем положении, а затем отпустите."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Готово"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Далее"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Готово"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Настройки"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Повторите попытку"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Поздравляем!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Руководство (шаг <xliff:g id="CURRENT">%1$d</xliff:g> из <xliff:g id="TOTAL">%2$d</xliff:g>)"</string>
+    <string name="action_share" msgid="2648470652637092375">"Поделиться"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Скриншот"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Это действие заблокировано приложением или организацией."</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Пропустить руководство по жестам?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Его можно найти в приложении \"Советы\"."</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Отмена"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Пропустить"</string>
 </resources>
diff --git a/quickstep/res/values-sl/strings.xml b/quickstep/res/values-sl/strings.xml
index 15f8f89cc7..96a0e0e391 100644
--- a/quickstep/res/values-sl/strings.xml
+++ b/quickstep/res/values-sl/strings.xml
@@ -19,19 +19,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Razdeljen zaslon"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Pripni"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Prosta oblika"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Pregled"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Ni nedavnih elementov"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Zapri"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Nastavitve uporabe aplikacij"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Počisti vse"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Nedavne aplikacije"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>, <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; 1 min"</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"Danes je ostalo še <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="title_app_suggestions" msgid="4185902664111965088">"Predlogi za aplikacije"</string>
+    <string name="title_app_suggestions" msgid="4185902664111965088">"Predlagane aplikacije"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Vse aplikacije"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Predvidene aplikacije"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Oglejte si predlagane aplikacije v spodnji vrstici začetnega zaslona"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Prejemajte predloge aplikacij v vrstici s priljubljenimi na začetnem zaslonu"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Preprosto dostopajte do najpogosteje uporabljenih aplikacij kar na začetnem zaslonu. Predlogi se spreminjajo na podlagi dejanj, ki jih pogosto izvajate. Aplikacije se iz spodnje vrstice premaknejo na začetni zaslon."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Preprosto dostopajte do najpogosteje uporabljenih aplikacij kar na začetnem zaslonu. Predlogi se spreminjajo na podlagi dejanj, ki jih pogosto izvajate. Aplikacije v vrstici s priljubljenimi bodo premaknjene na začetni zaslon."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Preprosto dostopajte do najpogosteje uporabljenih aplikacij kar na začetnem zaslonu. Predlogi se spreminjajo na podlagi dejanj, ki jih pogosto izvajate. Aplikacije se iz spodnje vrstice premaknejo v novo mapo."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Prikaži predlagane aplikacije"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Ne, hvala"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Nastavitve"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Tukaj so navedene najpogosteje uporabljene aplikacije in spremembe na podlagi rutin"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Če si želite ogledati predlagane aplikacije, povlecite aplikacije iz spodnje vrstice"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Predlagane aplikacije so bile dodane v prazni prostor"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Predlogi aplikacij so omogočeni"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Predlogi aplikacij so onemogočeni"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predvidena aplikacija: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pazite, da ne povlečete s skrajno levega roba."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pazite, da povlečete z levega roba do sredine zaslona in dvignete prst."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"To je vse. Zdaj preizkusite vlečenje z levega roba."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pazite, da ne povlečete s skrajno desnega roba."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pazite, da povlečete z desnega roba do sredine zaslona in dvignete prst."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Izvedli ste potezo za nazaj. Zdaj se naučite, kako se pomaknete na začetni zaslon."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pazite, da ne povlečete preblizu dna zaslona."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Občutljivost poteze za nazaj lahko spremenite v nastavitvah."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Povlecite za vrnitev."</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Če se želite vrniti na zadnji zaslon, povlecite z levega ali desnega roba do sredine zaslona."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pazite, da povlečete s spodnjega roba zaslona navzgor."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pazite, da ne zaustavite prsta, preden ga dvignete."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pazite, da povlečete naravnost navzgor."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Izvedli ste potezo za pomik na začetni zaslon. Zdaj se naučite preklapljanja med aplikacijami."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Vlečenje za pomik na začetni zaslon"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Z dna zaslona s prstom povlecite navzgor. S to potezo lahko vedno odprete začetni zaslon."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Pazite, da povlečete s spodnjega roba zaslona navzgor."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Poskusite okno pridržati dalj časa, preden ga izpustite."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Pazite, da povlečete naravnost navzgor in nato zaustavite prst."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Izvedli ste potezo za preklapljanje med aplikacijami. Pripravljeni ste na uporabo telefona."</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Vlečenje za preklapljanje med aplikacijami"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Povlecite navzgor z dna zaslona, pridržite, nato izpustite."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Zdaj znate"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Naprej"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Končano"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Nastavitve"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Poskusite znova"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Odlično!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Vadnica <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Deli"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Posnetek zaslona"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikacija ali vaša organizacija ne dovoljuje tega dejanja"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Želite preskočiti vadnico za krmarjenje?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"To pozneje najdete v aplikaciji Nasveti."</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Prekliči"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Preskoči"</string>
 </resources>
diff --git a/quickstep/res/values-sq/strings.xml b/quickstep/res/values-sq/strings.xml
index d8f5f28b42..f129aca0f3 100644
--- a/quickstep/res/values-sq/strings.xml
+++ b/quickstep/res/values-sq/strings.xml
@@ -19,19 +19,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Ekrani i ndarë"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Gozhdo"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Formë e lirë"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Përmbledhja"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Nuk ka asnjë artikull të fundit"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Mbyll"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Cilësimet e përdorimit të aplikacionit"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Pastroji të gjitha"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Aplikacionet e fundit"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>, <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; 1 minutë"</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"<xliff:g id="TIME">%1$s</xliff:g> të mbetura sot"</string>
-    <string name="title_app_suggestions" msgid="4185902664111965088">"Sugjerimet e aplikacioneve"</string>
+    <string name="title_app_suggestions" msgid="4185902664111965088">"Aplikacionet e sugjeruara"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Të gjitha aplikacionet"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Aplikacionet e tua të parashikuara"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Merr aplikacione të sugjeruara në rreshtin e poshtëm të ekranit tënd bazë"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Merr aplikacione të sugjeruara në rreshtin e të preferuarave të ekranit tënd bazë"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Qasu me lehtësi në aplikacionet më të përdorura direkt në ekranin bazë. Sugjerimet do të ndryshojnë bazuar në rutinat e tua. Aplikacionet në rreshtin e poshtëm do të zhvendosen lart në ekranin tënd bazë."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Qasu me lehtësi në aplikacionet më të përdorura direkt në ekranin bazë. Sugjerimet do të ndryshojnë bazuar në rutinat e tua. Aplikacionet në rreshtin e të preferuarave do të zhvendosen në ekranin tënd bazë."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Qasu me lehtësi në aplikacionet më të përdorura, direkt në ekranin bazë. Sugjerimet do të ndryshojnë bazuar në rutinat e tua. Aplikacionet në rreshtin e poshtëm do të zhvendosen në një dosje tjetër."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Merr aplikacione të sugjeruara"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Jo, faleminderit"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Cilësimet"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Aplikacionet më të përdorura shfaqen këtu dhe ndryshojnë bazuar në rutinat"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Zvarrit aplikacionet jashtë rreshtit të poshtëm për të marrë aplikacione të sugjeruara"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Aplikacionet e sugjeruara u shtuan në hapësirën bosh"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Aplikacionet e sugjeruara janë aktivizuar"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Sugjerimet e aplikacioneve janë çaktivizuar"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplikacioni i parashikuar: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Sigurohu që të rrëshqasësh shpejt nga skaji sa më majtas."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Sigurohu që të rrëshqasësh shpejt nga skaji i majtë drejt mesit të ekranit dhe lëshoje."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Kaq ishte! Tani provo të rrëshqasësh shpejt nga skaji i djathtë."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Sigurohu që të rrëshqasësh shpejt nga skaji sa më djathtas."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Sigurohu që të rrëshqasësh shpejt nga skaji i djathtë drejt mesit të ekranit dhe lëshoje."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"E ke përfunduar gjestin e kthimit prapa. Në vijim do të mësosh si të shkosh tek ekrani bazë."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Sigurohu që të mos rrëshqasësh shumë afër fundit të ekranit."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Për të ndryshuar ndjeshmërinë e gjestit të kthimit prapa, shko te \"Cilësimet\""</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Rrëshqit shpejt për t\'u kthyer prapa"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Për t\'u kthyer prapa tek ekrani i fundit, rrëshqit shpejt nga skaji i majtë ose i djathtë drejt mesit të ekranit"</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Sigurohu që të rrëshqasësh shpejt lart nga skaji i poshtëm i ekranit."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Sigurohu që të mos ndalosh para se ta lëshosh."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Sigurohu që të rrëshqasësh shpejt drejt lart."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"E ke përfunduar gjestin e kalimit tek ekrani bazë. Në vijim do të mësosh se si t\'i ndërrosh aplikacionet."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Rrëshqit shpejt për të kaluar tek ekrani bazë"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Rrëshqit shpejt lart nga fundi i ekranit tënd. Ky gjest të dërgon gjithmonë tek ekrani bazë."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Sigurohu që të rrëshqasësh shpejt lart nga skaji i poshtëm i ekranit."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Provo ta mbash shtypur dritaren për një kohë më të gjatë para se ta lëshosh."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Sigurohu që të rrëshqasësh shpejt drejt lart dhe më pas ndalo."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"E ke përfunduar gjestin e ndërrimit të aplikacioneve. Je gati për të përdorur telefonin!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Rrëshqit shpejt për të ndërruar aplikacionet"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Rrëshqit shpejt lart nga fundi i ekranit, mbaje të shtypur dhe më pas lëshoje."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Plotësisht gati"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Para"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"U krye"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Cilësimet"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Provo përsëri"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bukur!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Udhëzuesi <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Ndaj"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Pamja e ekranit"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Ky veprim nuk lejohet nga aplikacioni ose organizata jote"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Të kapërcehet udhëzuesi i navigimit?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Këtë mund ta gjesh më vonë tek aplikacioni \"Këshillat\""</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Anulo"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Kapërce"</string>
 </resources>
diff --git a/quickstep/res/values-sr/strings.xml b/quickstep/res/values-sr/strings.xml
index b721641446..af30acb6e4 100644
--- a/quickstep/res/values-sr/strings.xml
+++ b/quickstep/res/values-sr/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Подељени екран"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Закачи"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Слободни облик"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Преглед"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Нема недавних ставки"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Затвори"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Подешавања коришћења апликације"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Обриши све"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Недавне апликације"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Предлози апликација"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Све апликације"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Предвиђене апликације"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Добијајте предлоге апликација у доњем реду почетног екрана"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Добијајте предлоге апликација у реду са омиљеним ставкама на почетном екрану"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Лако приступајте апликацијама које најчешће користите директно са почетног екрана. Предлози се мењају на основу употребе. Апликације из доњег реда се премештају нагоре на почетни екран."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Лако приступајте апликацијама које најчешће користите директно са почетног екрана. Предлози се мењају на основу ваших рутина. Апликације из реда са омиљеним ставкама се премештају на почетни екран."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Лако приступајте апликацијама које најчешће користите директно са почетног екрана. Предлози се мењају на основу употребе. Апликације из доњег реда се премештају у нов фолдер."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Приказуј предлоге апликација"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Не, хвала"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Подешавања"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Овде се приказују најчешће коришћене апликације и мењају се у зависности од употребе"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Превуците апликације из доњег реда да бисте добили предлоге"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Предлози апликација се додају на празно место"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Предлози апликација су омогућени"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Предлози апликација су онемогућени"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Предвиђамо апликацију: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Обавезно превуците од саме леве ивице."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Обавезно превуците од леве ивице до средине екрана и отпустите."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"То је све! Сада пробајте да превучете од десне ивице."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Обавезно превуците од саме десне ивице."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Обавезно превуците од десне ивице до средине екрана и отпустите."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Довршили сте покрет за повратак. Сада сазнајте како да одете на почетну страницу."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Никако не превлачите превише близу дна екрана."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Осетљивост пок. за назад можете да промените у Подешавањима"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Превуците да бисте се вратили"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Да бисте се вратили на последњи екран, превуците од леве или десне ивице до средине екрана."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Обавезно превуците нагоре од доње ивице екрана."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Никако не стајте пре отпуштања."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Обавезно превуците право нагоре."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Довршили сте покрет за повратак на почетну страницу. Сада сазнајте како да промените апликације."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Превуците да бисте отишли на почетну страницу"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Превуците нагоре од дна екрана. Овај покрет вас увек води на почетни екран."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Обавезно превуците нагоре од доње ивице екрана."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Пробајте да држите прозор дуже пре отпуштања."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Обавезно превуците право нагоре, па застаните."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Довршили сте покрет за промену апликација. Спремни сте за коришћење телефона!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Превуците да бисте променили апликације"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Превуците нагоре од дна екрана, задржите, па пустите."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"То је то"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Даље"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Готово"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Подешавања"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Пробајте поново"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Свака част!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Водич <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Дели"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Снимак екрана"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Апликација или организација не дозвољавају ову радњу"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Желите да прескочите водич за кретање?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Можете да пронађете ово у апл. Савети"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Откажи"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Прескочи"</string>
 </resources>
diff --git a/quickstep/res/values-sw/strings.xml b/quickstep/res/values-sw/strings.xml
index 24db429093..37e0fc3542 100644
--- a/quickstep/res/values-sw/strings.xml
+++ b/quickstep/res/values-sw/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Gawa skrini"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Bandika"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Muundo huru"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Muhtasari"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Hakuna vipengee vya hivi karibuni"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Funga"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Mipangilio ya matumizi ya programu"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Ondoa zote"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Programu za hivi karibuni"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Mapendekezo ya programu"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Programu zote"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Programu zako zinazopendekezwa"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Pata mapendekezo ya programu kwenye sehemu ya chini ya Skrini yako ya kwanza"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Pata mapendekezo ya programu katika safu ya vipendwa ya Skrini yako ya kwanza"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Fikia kwa urahisi programu unazotumia sana moja kwa moja kwenye Skrini ya kwanza. Mapendekezo yatabadilika kulingana na ratiba zako. Programu zilizo kwenye sehemu ya chini zitahamishiwa kwenye Skrini yako ya kwanza."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Fikia kwa urahisi programu unazotumia sana moja kwa moja kwenye Skrini ya kwanza. Mapendekezo yatabadilika kulingana na utumiaji wako. Programu zilizo katika safu ya vipendwa zitahamishiwa kwenye Skrini yako ya kwanza."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Fikia kwa urahisi programu unazotumia zaidi, moja kwa moja kwenye Skrini ya kwanza. Mapendekezo yatabadilika kulingana na ratiba zako. Programu zilizo kwenye safu ya chini zitahamishiwa kwenye folda mpya."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Pata mapendekezo ya programu"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Hapana"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Mipangilio"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Programu zinazotumiwa zaidi huonekana hapa na hubadilika kulingana na ratiba"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Buruta programu kutoka kwenye safu ya chini ili upate mapendekezo ya programu"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Mapendekezo ya programu yamewekwa kwenye nafasi isiyo na kitu"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Mapendekezo ya programu yamewashwa"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Umezima mapendekezo ya programu"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Programu iliyotabiriwa: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Hakikisha unatelezesha kidole kuanzia ukingo wa mbali wa kushoto."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Hakikisha unatelezesha kidole kuanzia ukingo wa kushoto kuelekea katikati ya skrini na uachilie."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Ni hivyo tu! Sasa jaribu kutelezesha kidole kuanzia ukingo wa kuilia."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Hakikisha unatelezesha kidole kuanzia ukingo wa mbali wa kulia."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Hakikisha unatelezesha kidole kuanzia ukingo wa kulia kuelekea katikati ya skrini na uachilie."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Umekamilisha ishara ya kurudi nyuma. Inayofuata, jifunze jinsi ya kwenda kwenye Skrini ya kwanza."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Hakikisha hutelezeshi kidole karibu sana na sehemu ya chini ya skrini."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Kubadilisha hisi ya ishara ya nyuma, nenda kwenye Mipangilio"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Telezesha kidole ili urudi nyuma"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Ili urudi kwenye skrini iliyotangulia, telezesha kidole kuanzia ukingo wa kushoto au wa kulia kuelekea katikati ya skrini."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Hakikisha unatelezesha kidole juu kuanzia ukingo wa chini wa skrini."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Hakikisha kuwa husimamishi kabla ya kuachilia."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Hakikisha unatelezesha kidole kuelekea juu."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Umekamilisha ishara ya kwenda kwenye Skrini ya kwanza. Hatua inayofuata, jifunze jinsi ya kubadilisha programu."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Telezesha kidole ili uende kwenye skrini ya kwanza"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Telezesha kidole juu kuanzia chini ya skrini yako. Ishara hii kila wakati hukupeleka kwenye Skrini ya kwanza."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Hakikisha unatelezesha kidole juu kuanzia ukingo wa chini wa skrini."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Jaribu kushikilia dirisha kwa muda mrefu kabla ya kuachilia."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Hakikisha unatelezesha kidole kuelekea juu, kisha usimamishe."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Umekamilisha ishara ya kubadilisha programu. Uko tayari kutumia simu yako!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Telezesha kidole ili ubadilishe programu"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Telezesha kidole juu kuanzia sehemu ya chini ya skrini yako, ushikilie, kisha uachilie."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Kila kitu kiko tayari"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Endelea"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Nimemaliza"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Mipangilio"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Jaribu tena"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Safi!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Mafunzo ya <xliff:g id="CURRENT">%1$d</xliff:g> kati ya <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Shiriki"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Picha ya skrini"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Kitendo hiki hakiruhusiwi na programu au shirika lako"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Ungependa kuruka mafunzo ya usogezaji?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Utapata mafunzo haya baadaye katika programu ya Vidokezo"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Ghairi"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Ruka"</string>
 </resources>
diff --git a/quickstep/res/values-ta/strings.xml b/quickstep/res/values-ta/strings.xml
index 97d51cd35f..6232a4f37f 100644
--- a/quickstep/res/values-ta/strings.xml
+++ b/quickstep/res/values-ta/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"திரைப் பிரிப்பு"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"பின் செய்தல்"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"குறிப்பிட்ட வடிவமில்லாத பயன்முறை"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"மேலோட்டப் பார்வை"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"சமீபத்தியவை எதுவுமில்லை"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"மூடும்"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"ஆப்ஸ் உபயோக அமைப்புகள்"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"எல்லாம் அழி"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"சமீபத்திய ஆப்ஸ்"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"ஆப்ஸ் பரிந்துரைகள்"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"அனைத்து ஆப்ஸும்"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"நீங்கள் கணித்த ஆப்ஸ்"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"முகப்புத் திரையின் கடைசி வரிசையில் ஆப்ஸ் பரிந்துரைகளைப் பெறலாம்"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"உங்கள் முகப்புத் திரையின் \'பிடித்தவை\' வரிசையில் ஆப்ஸ் பரிந்துரைகளைப் பெறலாம்"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"அதிகமாகப் பயன்படுத்திய ஆப்ஸை முகப்புத் திரையிலேயே அணுகலாம். உங்கள் வழக்கங்களின் அடிப்படையில் பரிந்துரைகள் மாறும். கடைசி வரிசையிலுள்ள ஆப்ஸ் உங்கள் முகப்புத் திரைக்கு நகர்த்தப்படும்."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"அதிகமாகப் பயன்படுத்திய ஆப்ஸை முகப்புத் திரையிலேயே எளிதாக அணுகலாம். உங்கள் வழக்கங்களின் அடிப்படையில் பரிந்துரைகள் மாறும். பிடித்தவை வரிசையில் உள்ள ஆப்ஸ் உங்கள் முகப்புத் திரைக்கு நகர்த்தப்படும்."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"அதிகமாகப் பயன்படுத்திய ஆப்ஸை முகப்புத் திரையிலேயே அணுகலாம். உங்கள் வழக்கங்களின் அடிப்படையில் பரிந்துரைகள் மாறும். கடைசி வரிசையிலுள்ள ஆப்ஸ் புதிய கோப்புறைக்கு நகர்த்தப்படும்."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"ஆப்ஸ் பரிந்துரைகளைப் பெறுக"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"வேண்டாம்"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"அமைப்புகள்"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"அதிகமாகப் பயன்படுத்திய ஆப்ஸ் இங்கே தோன்றும், வழக்கங்களின் அடிப்படையில் அவை மாறும்"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"ஆப்ஸ் பரிந்துரைகளைப் பெற கடைசி வரிசையிலிருந்து ஆப்ஸை இழுக்கவும்"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"ஆப்ஸ் பரிந்துரைகள் காலி இடத்தில் சேர்க்கப்பட்டன"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ஆப்ஸ் பரிந்துரைகள் இயக்கப்பட்டுள்ளன"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ஆப்ஸ் பரிந்துரைகள் முடக்கப்பட்டுள்ளன"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"கணித்த ஆப்ஸ்: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"இடது ஓரத்தின் விளிம்பிலிருந்து ஸ்வைப் செய்கிறீர்கள் என்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"இடது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்தபிறகு விடுவிப்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"அவ்வளவுதான்! இப்போது வலது ஓரத்திலிருந்து ஸ்வைப் செய்க."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"வலது ஓரத்தின் விளிம்பிலிருந்து ஸ்வைப் செய்கிறீர்கள் என்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"வலது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்தபிறகு விடுவிப்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"பின்செல் சைகைப் பயிற்சியை முடித்துவிட்டீர்கள். அடுத்து, முகப்புக்குச் செல்வது எப்படி என்பதை அறிக."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"திரையின் கீழ்பகுதிக்கு மிக நெருக்கமாக ஸ்வைப் செய்யவில்லை என்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"பின்செல் சைகையின் உணர்திறனை மாற்ற அமைப்புகளுக்குச் செல்க"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"பின்செல்ல ஸ்வைப் செய்யுங்கள்"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"முந்தைய திரைக்கு மீண்டும் செல்ல, இடது/வலது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்க."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"திரையின் கீழ் ஓரத்திலிருந்து மேல்நோக்கி ஸ்வைப் செய்வதை உறுதிசெய்துகொள்ளுங்கள்."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"விடுவிப்பதற்கு முன்பாக இடைநிறுத்தவில்லை என்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"மேல்நோக்கி நேராக ஸ்வைப் செய்வதை உறுதிசெய்துகொள்ளுங்கள்."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"முகப்புக்குச் செல் சைகைப் பயிற்சியை முடித்துவிட்டீர்கள். அடுத்து, ஆப்ஸுக்கிடையே மாறுவது எப்படி என்பதை அறிக."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"முகப்புக்குச் செல்ல ஸ்வைப் செய்யுங்கள்"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"திரையின் கீழிருந்து மேலாக ஸ்வைப் செய்க. இந்தச் சைகை எப்போதும் முகப்புத் திரைக்கு அழைத்துச் செல்லும்."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"திரையின் கீழ் ஓரத்திலிருந்து மேல்நோக்கி ஸ்வைப் செய்வதை உறுதிசெய்துகொள்ளுங்கள்."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"விடுவிப்பதற்கு முன்பாக நீண்டநேரம் சாளரத்தை அழுத்திப் பிடித்திருங்கள்."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"மேல்நோக்கி நேராக ஸ்வைப் செய்தபிறகு இடைநிறுத்துவதை உறுதிசெய்துகொள்ளுங்கள்."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"ஆப்ஸுக்கிடையே மாறும் சைகைப் பயிற்சியை முடித்துவிட்டீர்கள். உங்கள் மொபைலைப் பயன்படுத்தத் தயாராகிவிட்டீர்கள்!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ஆப்ஸுக்கிடையே மாற ஸ்வைப் செய்யுங்கள்"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"திரையின் கீழிலிருந்து மேலாக ஸ்வைப் செய்து, சில விநாடிகள் பிடித்திருந்து, பிறகு விரலை எடுங்கள்."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"எல்லாம் தயார்"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"அடுத்து"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"முடிந்தது"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"அமைப்புகள்"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"மீண்டும் முயல்க"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"அருமை!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"பயிற்சி <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"பகிர்"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"ஸ்கிரீன்ஷாட்"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"ஆப்ஸோ உங்கள் நிறுவனமோ இந்த செயலை அனுமதிப்பதில்லை"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"வழிகாட்டுதல் பயிற்சியைத் தவிர்க்கவா?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Tips ஆப்ஸில் இதைப் பிறகு கண்டறியலாம்"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"ரத்துசெய்"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"தவிர்"</string>
 </resources>
diff --git a/quickstep/res/values-te/strings.xml b/quickstep/res/values-te/strings.xml
index 24b37f75d4..15ab20543e 100644
--- a/quickstep/res/values-te/strings.xml
+++ b/quickstep/res/values-te/strings.xml
@@ -19,19 +19,99 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"స్క్రీన్‌ని విభజించు"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"పిన్ చేయి"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"సంప్రదాయేతర"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"అవలోకనం"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"ఇటీవలి అంశాలు ఏవీ లేవు"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"మూసివేయండి"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"యాప్ వినియోగ సెట్టింగ్‌లు"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"అన్నీ తీసివేయండి"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"ఇటీవలి యాప్‌లు"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>, <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; 1 నిమిషం"</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"నేటికి <xliff:g id="TIME">%1$s</xliff:g> మిగిలి ఉంది"</string>
-    <string name="title_app_suggestions" msgid="4185902664111965088">"యాప్ సూచనలు"</string>
+    <string name="title_app_suggestions" msgid="4185902664111965088">"యాప్ సలహాలు"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"అన్ని యాప్‌లు"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"మీ సూచించబడిన యాప్‌లు"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"మీ హోమ్ స్క్రీన్‌ దిగువ వరుసలో యాప్ సలహాలను పొందండి"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"మీ హోమ్ స్క్రీన్‌లోని ఇష్టమైన వాటి వరుసలో యాప్ సూచ‌న‌లు పొందండి"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"మీరు ఎక్కువగా ఉపయోగించే యాప్‌లను నేరుగా హోమ్ స్క్రీన్‌లోనే సులభంగా యాక్సెస్ చేయండి. మీ రోజువారీ కార్యకలాపాలను బట్టి సూచనలు మారతాయి. దిగువ వరుసలోని యాప్‌లు మీ హోమ్ స్క్రీన్ పైకి చేరుకుంటాయి."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"మీరు ఎక్కువగా ఉపయోగించే యాప్‌లను నేరుగా హోమ్ స్క్రీన్‌లోనే సులభంగా యాక్సెస్ చేయండి. మీ రోజువారీ కార్యకలాపాలను బట్టి సూచనలు మారతాయి. ఇష్టమైన వాటి వరుసలోని యాప్‌లు మీ హోమ్ స్క్రీన్‌కు చేరుకుంటాయి."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"మీరు ఎక్కువగా ఉపయోగించే యాప్‌లను నేరుగా హోమ్ స్క్రీన్‌లోనే సులభంగా యాక్సెస్ చేయండి. మీ రోజువారీ కార్యకలాపాలను బట్టి సూచనలు మారతాయి. దిగువ వరుసలోని యాప్‌లు కొత్త ఫోల్డర్‌కు తరలించబడతాయి."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"యాప్ సూచ‌న‌లను పొందండి"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"వద్దు"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"సెట్టింగ్‌లు"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"ఎక్కువగా ఉపయోగించిన యాప్‌లు ఇక్కడ కనిపిస్తాయి, అవి రోజువారీ కార్యకలాపాలను బట్టి మారుతూ ఉంటాయి"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"యాప్ సలహాలను పొందడానికి దిగువ వరుస నుండి యాప్‌లను లాగండి"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"యాప్ సూచ‌న‌లు ఖాళీ స్పేస్‌కు జోడించబడ్డాయి"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"యాప్ సలహాలు ఎనేబుల్ చేయబడ్డాయి"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"యాప్ సూచ‌న‌లు డిజేబుల్‌ చేయబడ్డాయి"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"సూచించబడిన యాప్: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
+    <skip />
+    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
+    <skip />
+    <string name="action_share" msgid="2648470652637092375">"షేర్ చేయండి"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"స్క్రీన్‌షాట్"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"ఈ చర్యను యాప్ గానీ, మీ సంస్థ గానీ అనుమతించవు"</string>
+    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
+    <skip />
+    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <skip />
 </resources>
diff --git a/quickstep/res/values-th/strings.xml b/quickstep/res/values-th/strings.xml
index 6cc824b7ad..e483221bf2 100644
--- a/quickstep/res/values-th/strings.xml
+++ b/quickstep/res/values-th/strings.xml
@@ -45,73 +45,40 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"เปิดใช้คำแนะนำเกี่ยวกับแอปแล้ว"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ปิดใช้คำแนะนำเกี่ยวกับแอปอยู่"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"แอปที่คาดว่าจะใช้: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
-    <skip />
-    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ตรวจสอบว่าปัดจากขอบด้านซ้ายสุด"</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ตรวจสอบว่าปัดจากขอบด้านซ้ายไปตรงกลางหน้าจอ แล้วยกนิ้วขึ้น"</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"เท่านี้ก็เรียบร้อย คราวนี้ให้ลองปัดจากขอบด้านขวา"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ตรวจสอบว่าปัดจากขอบด้านขวาสุด"</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ตรวจสอบว่าปัดจากขอบด้านขวาไปตรงกลางหน้าจอ แล้วยกนิ้วขึ้น"</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"คุณทำท่าทางสัมผัสเพื่อย้อนกลับเสร็จแล้ว ต่อไปดูวิธีไปที่หน้าแรก"</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ตรวจสอบว่าไม่ได้ปัดใกล้กับด้านล่างของหน้าจอมากเกินไป"</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"เปลี่ยนความไวของท่าทางสัมผัสเพื่อย้อนกลับได้ที่การตั้งค่า"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"ปัดเพื่อย้อนกลับ"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"หากต้องการย้อนกลับไปที่หน้าจอล่าสุด ให้ปัดจากขอบด้านซ้ายหรือขวาไปตรงกลางหน้าจอ"</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ตรวจสอบว่าปัดขึ้นจากขอบด้านล่างของหน้าจอ"</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ตรวจสอบว่าไม่มีการหยุดชั่วคราวก่อนยกนิ้วขึ้น"</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ตรวจสอบว่าปัดขึ้นในแนวตรง"</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"คุณทำท่าทางสัมผัสเพื่อไปที่หน้าแรกเสร็จแล้ว ต่อไปดูวิธีสลับแอป"</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"ปัดเพื่อไปที่หน้าแรก"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"ปัดขึ้นจากด้านล่างของหน้าจอ ท่าทางสัมผัสนี้จะนำคุณไปที่หน้าจอหลักเสมอ"</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ตรวจสอบว่าปัดขึ้นจากขอบด้านล่างของหน้าจอ"</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"ลองแตะหน้าต่างค้างไว้นานขึ้นก่อนปล่อยนิ้ว"</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"ตรวจสอบว่าปัดขึ้นในแนวตรง แล้วหยุดชั่วคราว"</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"คุณทำท่าทางสัมผัสเพื่อสลับแอปเสร็จแล้ว คุณพร้อมใช้โทรศัพท์แล้ว"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ปัดเพื่อสลับแอป"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ปัดขึ้นจากด้านล่างของหน้าจอค้างไว้ แล้วปล่อย"</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"เรียบร้อย"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"ถัดไป"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"เสร็จสิ้น"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"การตั้งค่า"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ลองอีกครั้ง"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ดีมาก"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"บทแนะนำ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="action_share" msgid="2648470652637092375">"แชร์"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ภาพหน้าจอ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"แอปหรือองค์กรของคุณไม่อนุญาตการดำเนินการนี้"</string>
-    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
-    <skip />
-    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
-    <skip />
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"ข้ามบทแนะนำการนำทางไหม"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"คุณดูบทแนะนำนี้ได้ภายหลังในแอป Tips"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"ยกเลิก"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"ข้าม"</string>
 </resources>
diff --git a/quickstep/res/values-uk/strings.xml b/quickstep/res/values-uk/strings.xml
index 77360625db..d00115bbd5 100644
--- a/quickstep/res/values-uk/strings.xml
+++ b/quickstep/res/values-uk/strings.xml
@@ -19,19 +19,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Розділити екран"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Закріпити"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Довільна форма"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Огляд"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Немає нещодавніх додатків"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Закрити"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Налаштування використання додатка"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Очистити все"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Нещодавні додатки"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>, <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; 1 хв"</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"Сьогодні залишилося <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="title_app_suggestions" msgid="4185902664111965088">"Пропозиції додатків"</string>
+    <string name="title_app_suggestions" msgid="4185902664111965088">"Рекомендовані додатки"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Усі додатки"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Передбачені додатки"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Рекомендовані додатки з\'являтимуться в нижньому рядку головного екрана"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Рекомендовані додатки з\'являтимуться в рядку \"Вибране\" на головному екрані"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"З легкістю відкривайте на головному екрані ті додатки, які використовуєте найчастіше. Рекомендації змінюватимуться залежно від ваших дій. Додатки в нижньому рядку перемістяться на головний екран."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"З легкістю відкривайте найпотрібніші додатки просто з головного екрана. Рекомендації змінюватимуться залежно від ваших дій. Додатки з рядка \"Вибране\" буде переміщено на головний екран."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"З легкістю відкривайте найвикористовуваніші додатки просто з головного екрана. Рекомендації змінюватимуться залежно від ваших дій. Додатки в нижньому рядку буде переміщено в нову папку."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Показувати рекомендації"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Не потрібно"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Налаштування"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Тут з\'являються найвикористовуваніші додатки, список яких змінюється залежно від ваших дій"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Щоб побачити рекомендовані додатки, перетягніть наявні з нижнього рядка"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Рекомендовані додатки додано у вільну область"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Рекомендовані додатки ввімкнено"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Рекомендовані додатки вимкнено"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Передбачений додаток: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Проведіть пальцем саме від лівого краю екрана."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Проведіть пальцем від лівого краю до середини екрана й підніміть палець."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Це й усе! Тепер проведіть пальцем від правого краю."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Проведіть пальцем саме від правого краю екрана."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Проведіть пальцем від правого краю до середини екрана й підніміть палець."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Ви виконали жест \"Назад\". Далі дізнайтеся, як перейти на головний екран."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Не проводьте пальцем надто близько до нижнього краю екрана."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Щоб змінити чутливість жесту \"Назад\", відкрийте налаштування"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Щоб повернутися, проведіть пальцем по екрану"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Щоб перейти на попередній екран, проведіть пальцем від лівого чи правого краю до середини екрана."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Проведіть пальцем угору від нижнього краю екрана."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Не робіть паузу перед тим, як відірвати палець від екрана."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Проводьте пальцем вертикально вгору."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Ви виконали жест переходу на головний екран. Тепер дізнайтеся, як переходити між додатками."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Проведіть пальцем, щоб перейти на головний екран"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Проведіть пальцем по екрану знизу вгору. Цей жест завжди повертатиме вас на головний екран."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Проведіть пальцем угору від нижнього краю екрана."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Спробуйте втримувати вікно довше, перш ніж відпустити."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Проведіть пальцем вертикально вгору, а тоді зробіть паузу."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Ви виконали жест переходу в інший додаток. Усе готово! Почніть користуватися телефоном."</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Проведіть пальцем, щоб перейти в інший додаток"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Проведіть пальцем вгору від низу екрана, утримуйте палець на екрані, а потім відпустіть."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Усе готово!"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Далі"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Готово"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Налаштування"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Спробуйте ще"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Чудово!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Навчальний посібник <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Поділитися"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Знімок екрана"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Ця дія заборонена додатком або адміністратором організації"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Пропустити посібник із навігації?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Ви знайдете його в додатку Поради"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Скасувати"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Пропустити"</string>
 </resources>
diff --git a/quickstep/res/values-ur/strings.xml b/quickstep/res/values-ur/strings.xml
index 87b303f2af..3298958a68 100644
--- a/quickstep/res/values-ur/strings.xml
+++ b/quickstep/res/values-ur/strings.xml
@@ -19,19 +19,99 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"اسپلٹ اسکرین وضع"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"پن کریں"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"فری فارم"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"مجموعی جائزہ"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"کوئی حالیہ آئٹم نہیں"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"بند کریں"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"ایپ کے استعمال کی ترتیبات"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"سبھی کو صاف کریں"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"حالیہ ایپس"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>،<xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"‏&lt; 1 منٹ"</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"آج <xliff:g id="TIME">%1$s</xliff:g> بچا ہے"</string>
-    <string name="title_app_suggestions" msgid="4185902664111965088">"ایپ کی تجاویز"</string>
+    <string name="title_app_suggestions" msgid="4185902664111965088">"ایپس کی تجاویز"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"تمام ایپس"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"آپ کی پیشن گوئی کردہ ایپس"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"اپنی ہوم اسکرین کی نچلی قطار پر ایپ کی تجاویز حاصل کریں"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"اپنی ہوم اسکرین کی پسندیدہ قطار پر ایپ کی تجاویز حاصل کریں"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"ہوم اسکرین پر آسانی سے اپنی سب سے زیادہ مستعمل ایپس تک رسائی حاصل کریں۔ آپ کی روٹینز کی بنیاد پر تجاویز تبدیل ہوں گی۔ نچلی قطار میں موجود ایپس آپ کی ہوم اسکرین کے اوپر منتقل ہوں گی۔"</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"ہوم اسکرین پر آسانی سے اپنی سب سے زیادہ مستعمل ایپس تک رسائی حاصل کریں۔ آپ کی روٹینز کی بنیاد پر تجاویز تبدیل ہوں گی۔ پسندیدہ میں موجود ایپس آپ کی ہوم اسکرین کے اوپر منتقل ہوں گی۔"</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"ہوم اسکرین پر، آسانی سے اپنی سب سے زیادہ مستعمل ایپس تک رسائی حاصل کریں۔ آپ کی روٹینز کی بنیاد پر تجاویز تبدیل ہوں گی۔ نچلی قطار میں موجود ایپس نئے فولڈر میں منتقل ہوں گی۔"</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"ایپس کی تجاویز حاصل کریں"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"نہیں شکریہ"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"ترتیبات"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"سب سے زیادہ مستعمل ایپس یہاں ظاہر ہوتی ہیں، اور روٹینز کی بنیاد پر تبدیل ہوتی ہیں"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"ایپس کی تجاویز حاصل کرنے کیلئے ایپس کو نچلی قطار سے نیچے گھسیٹیں"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"ایپس کی تجاویز کو خالی اسپیس میں شامل کر دیا گیا"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ایپ کی تجاویز فعال ہیں"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ایپ کی تجاویز غیر فعال ہیں"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"پیشن گوئی کردہ ایپ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
+    <skip />
+    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
+    <skip />
+    <string name="action_share" msgid="2648470652637092375">"اشتراک کریں"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"اسکرین شاٹ"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"ایپ یا آپ کی تنظیم کی جانب سے اس کارروائی کی اجازت نہیں ہے"</string>
+    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
+    <skip />
+    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <skip />
 </resources>
diff --git a/quickstep/res/values-vi/strings.xml b/quickstep/res/values-vi/strings.xml
index 34c89efcf1..82538a8334 100644
--- a/quickstep/res/values-vi/strings.xml
+++ b/quickstep/res/values-vi/strings.xml
@@ -19,12 +19,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Chia đôi màn hình"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"Ghim"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Dạng tự do"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Tổng quan"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Không có mục gần đây nào"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"Đóng"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Cài đặt mức sử dụng ứng dụng"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Xóa tất cả"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"Ứng dụng gần đây"</string>
@@ -34,4 +31,54 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Các ứng dụng đề xuất"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Tất cả ứng dụng"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Các ứng dụng gợi ý của bạn"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Nhận các ứng dụng đề xuất ở cuối Màn hình chính"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Nhận các ứng dụng đề xuất trên hàng mục ưa thích của Màn hình chính"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Ngay từ Màn hình chính, bạn có thể dễ dàng truy cập vào những ứng dụng mà mình dùng thường xuyên nhất. Các ứng dụng đề xuất sẽ thay đổi dựa trên thói quen của bạn. Các ứng dụng ở hàng dưới cùng sẽ chuyển lên phía trên của Màn hình chính."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Ngay trên Màn hình chính, bạn có thể dễ dàng mở những ứng dụng mà mình dùng thường xuyên nhất. Các ứng dụng đề xuất sẽ thay đổi dựa trên thói quen của bạn. Các ứng dụng ở hàng mục ưa thích sẽ chuyển sang Màn hình chính."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Ngay từ Màn hình chính, bạn có thể dễ dàng truy cập vào những ứng dụng mà mình dùng thường xuyên nhất. Các ứng dụng đề xuất sẽ thay đổi dựa trên thói quen của bạn. Các ứng dụng ở hàng dưới cùng sẽ chuyển đến một thư mục mới."</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Nhận ứng dụng đề xuất"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Không, cảm ơn"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Cài đặt"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Các ứng dụng dùng thường xuyên nhất sẽ hiển thị ở đây và thay đổi dựa trên thói quen"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Kéo ứng dụng ra khỏi hàng dưới cùng để xem ứng dụng đề xuất"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Thêm ứng dụng đề xuất vào không gian trống"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Đã bật tính năng Ứng dụng đề xuất"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Tính năng Ứng dụng đề xuất bị tắt"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Ứng dụng dự đoán: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Hãy vuốt từ mép ngoài cùng bên trái."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Hãy vuốt từ mép trái tới chính giữa màn hình rồi nhấc ngón tay."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Vậy là xong! Bây giờ, hãy thử vuốt từ mép phải."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Hãy vuốt từ mép ngoài cùng bên phải."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Hãy vuốt từ mép phải tới chính giữa màn hình rồi nhấc ngón tay."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Bạn đã thực hiện xong cử chỉ quay lại. Tiếp theo, hãy tìm hiểu cách chuyển đến Màn hình chính."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Hãy nhớ không được vuốt quá gần phần cuối màn hình."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Để thay đổi độ nhạy của cử chỉ quay lại, hãy vào mục Cài đặt"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Hãy vuốt để quay lại"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Để quay lại màn hình gần đây nhất, hãy vuốt từ mép trái hoặc mép phải tới chính giữa màn hình."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Hãy vuốt lên từ mép dưới cùng của màn hình."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Hãy nhớ không được tạm dừng trước khi nhấc ngón tay."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Hãy vuốt thẳng lên."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Bạn đã thực hiện xong cử chỉ chuyển đến Màn hình chính. Tiếp theo, hãy tìm hiểu cách chuyển đổi ứng dụng."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Vuốt để chuyển đến Màn hình chính"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Vuốt lên từ cuối màn hình. Cử chỉ này luôn đưa bạn đến Màn hình chính."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Hãy vuốt lên từ mép dưới cùng của màn hình."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Hãy thử giữ cửa sổ lâu hơn trước khi thả tay ra."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Hãy vuốt thẳng lên, sau đó tạm dừng."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Bạn đã thực hiện xong cử chỉ chuyển đổi ứng dụng. Bạn đã sẵn sàng sử dụng điện thoại!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Vuốt để chuyển đổi ứng dụng"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Vuốt lên từ cuối màn hình, giữ rồi thả tay ra."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Đã hoàn tất"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Tiếp theo"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Xong"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Cài đặt"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Thử lại"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Tuyệt vời!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Hướng dẫn <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="action_share" msgid="2648470652637092375">"Chia sẻ"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Chụp ảnh màn hình"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"Ứng dụng hoặc tổ chức của bạn không cho phép thực hiện hành động này"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Bỏ qua phần hướng dẫn thao tác?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Bạn có thể tìm phần này sau trong ứng dụng Mẹo"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Hủy"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Bỏ qua"</string>
 </resources>
diff --git a/quickstep/res/values-zh-rCN/strings.xml b/quickstep/res/values-zh-rCN/strings.xml
index 0e83977fa3..969d63393c 100644
--- a/quickstep/res/values-zh-rCN/strings.xml
+++ b/quickstep/res/values-zh-rCN/strings.xml
@@ -19,19 +19,99 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"分屏"</string>
     <string name="recent_task_option_pin" msgid="7929860679018978258">"固定"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"自由窗口"</string>
-    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"概览"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"近期没有任何内容"</string>
-    <string name="accessibility_close_task" msgid="5354563209433803643">"关闭"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"应用使用设置"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"全部清除"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"最近用过的应用"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>（<xliff:g id="REMAINING_TIME">%2$s</xliff:g>）"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"不到 1 分钟"</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"今天还可使用 <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="title_app_suggestions" msgid="4185902664111965088">"应用推荐"</string>
+    <string name="title_app_suggestions" msgid="4185902664111965088">"应用建议"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"所有应用"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"您的预测应用"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"在主屏幕底部获取应用建议"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"在主屏幕的收藏行获取应用建议"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"直接在主屏幕上轻松访问您最常用的应用。系统会根据您的日常安排提供不同的建议。最下面一排中的应用会向上移动到主屏幕中。"</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"直接在主屏幕上轻松访问您最常用的应用。建议会因您的日常安排而变化，收藏行中的应用将移到主屏幕上。"</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"直接在主屏幕上轻松访问您最常用的应用。系统会根据您的日常安排提供不同的建议。最下面一排中的应用会移到新文件夹中。"</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"获取应用建议"</string>
+    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"不用了"</string>
+    <string name="hotseat_prediction_settings" msgid="6246554993566070818">"设置"</string>
+    <string name="hotseat_auto_enrolled" msgid="522100018967146807">"最常用的应用会显示在此处，显示的项目会根据日常安排而发生变化"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"将应用拖离底部，以获取应用建议"</string>
+    <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"应用建议已添加到空白区域"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"已启用应用建议"</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"已停用应用建议"</string>
+    <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"预测的应用：<xliff:g id="TITLE">%1$s</xliff:g>"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
+    <skip />
+    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
+    <skip />
+    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
+    <skip />
+    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
+    <skip />
+    <string name="action_share" msgid="2648470652637092375">"分享"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"屏幕截图"</string>
+    <string name="blocked_by_policy" msgid="2071401072261365546">"该应用或您所在的单位不允许执行此操作"</string>
+    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
+    <skip />
+    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
+    <skip />
+    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <skip />
 </resources>
diff --git a/quickstep/res/values-zh-rHK/strings.xml b/quickstep/res/values-zh-rHK/strings.xml
index 12310971d5..7284e898a5 100644
--- a/quickstep/res/values-zh-rHK/strings.xml
+++ b/quickstep/res/values-zh-rHK/strings.xml
@@ -45,73 +45,40 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"已啟用應用程式建議"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"已停用應用程式建議"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"預測應用程式：<xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
-    <skip />
-    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"請從螢幕左側邊緣滑動。"</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"請從螢幕左側邊緣往中央滑動，然後放開手指。"</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"大功告成！現在試試從螢幕右側邊緣滑動。"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"請從螢幕右側邊緣滑動。"</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"請從螢幕右側邊緣往中央滑動，然後放開手指"</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"您已完成「返回」手勢的教學課程。接下來一起瞭解如何返回主畫面。"</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"滑動時，手的位置不要太接近螢幕底部。"</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"如要變更「返回」手勢的敏感度，請前往「設定」"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"滑動即可返回"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"如要返回上一個畫面，請從螢幕左側或右側邊緣往中央滑動。"</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"請從螢幕底部邊緣向上滑動。"</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"放開手指前請勿停下來。"</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"請向上滑動。"</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"您已完成「返回主畫面」手勢的教學課程。接下來一起瞭解如何切換應用程式。"</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"向上滑動即可返回主畫面。"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"從螢幕底部向上滑動。這個手勢在所有畫面下都可讓您返回主畫面。"</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"請從螢幕底部邊緣向上滑動。"</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"請嘗試按住視窗更長時間，然後再放開。"</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"請向上滑動，然後停住。"</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"您已完成「切換應用程式」手勢的教學課程。現在可以開始使用手機了！"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"滑動即可切換應用程式"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"從螢幕底部向上滑動並按住，然後放開。"</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"大功告成"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"繼續"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"完成"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"設定"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"再試一次"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"很好！"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"教學課程 <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="action_share" msgid="2648470652637092375">"分享"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"螢幕截圖"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"應用程式或您的機構不允許此操作"</string>
-    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
-    <skip />
-    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
-    <skip />
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"要略過手勢操作教學課程嗎？"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"您之後可以在「提示」應用程式找到這些說明"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"取消"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"略過"</string>
 </resources>
diff --git a/quickstep/res/values-zh-rTW/strings.xml b/quickstep/res/values-zh-rTW/strings.xml
index 04808032d2..adf0bb5e37 100644
--- a/quickstep/res/values-zh-rTW/strings.xml
+++ b/quickstep/res/values-zh-rTW/strings.xml
@@ -45,73 +45,40 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"應用程式建議功能已啟用"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"應用程式建議功能已停用"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"預測的應用程式：<xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
-    <skip />
-    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"請從螢幕左側邊緣滑動。"</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"請從螢幕左側邊緣往中央滑動，然後放開手指。"</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"大功告成！現在請試著從螢幕右側邊緣滑動。"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"請從螢幕右側邊緣滑動。"</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"請從螢幕右側邊緣往中央滑動，然後放開手指。"</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"你已完成「返回」手勢的教學課程。接著，一起來瞭解如何返回主畫面。"</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"滑動時，手的位置不要太接近螢幕底部。"</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"如要變更「返回」手勢的敏感度，請前往「設定」"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"滑動即可返回"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"如要返回上一個畫面，請從螢幕左側或右側邊緣往中央滑動。"</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"請從螢幕底部邊緣向上滑動。"</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"放開手指前請勿停下來。"</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"請向上滑動。"</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"你已完成「返回主畫面」手勢的教學課程。接著，一起來瞭解如何切換應用程式。"</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"使用滑動手勢返回主畫面"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"從螢幕底部向上滑動，即可返回主畫面。"</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"請從螢幕底部邊緣向上滑動。"</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"請按住視窗久一點，然後再放開。"</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"請向上滑動，然後停住。"</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"你已完成「切換應用程式」手勢的教學課程。現在可以開始使用手機了！"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"使用滑動手勢切換應用程式"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"從螢幕底部向上滑動並按住，然後放開。"</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"大功告成"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"繼續"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"完成"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"設定"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"重試"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"很好！"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"教學課程 <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="action_share" msgid="2648470652637092375">"分享"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"擷取螢幕畫面"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"這個應用程式或貴機構不允許執行這個動作"</string>
-    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
-    <skip />
-    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
-    <skip />
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"要略過手勢操作教學課程嗎？"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"你之後可以在「提示」應用程式找到這些說明"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"取消"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"略過"</string>
 </resources>
-- 
GitLab


From 0cfa744c8ab7b748d2140d8258a07b0114632752 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Thu, 15 Apr 2021 20:40:19 +0000
Subject: [PATCH 0892/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I063d8e9209e92bd5941af2597c180923e759252c
---
 res/values-af/strings.xml        |  2 -
 res/values-am/strings.xml        |  2 -
 res/values-ar/strings.xml        | 77 +++++++++++++++++++--------
 res/values-as/strings.xml        | 81 ++++++++++++++++++++++-------
 res/values-az/strings.xml        |  4 --
 res/values-b+sr+Latn/strings.xml | 87 ++++++++++++++++++++-----------
 res/values-be/strings.xml        | 71 +++++++++++++++++--------
 res/values-bg/strings.xml        |  2 -
 res/values-bn/strings.xml        | 80 +++++++++++++++++++++-------
 res/values-bs/strings.xml        |  2 -
 res/values-ca/strings.xml        | 72 +++++++++++++++++---------
 res/values-cs/strings.xml        | 67 +++++++++++++++++-------
 res/values-da/strings.xml        |  2 -
 res/values-de/strings.xml        | 81 ++++++++++++++++++++++-------
 res/values-el/strings.xml        |  2 -
 res/values-en-rAU/strings.xml    |  2 -
 res/values-en-rCA/strings.xml    |  2 -
 res/values-en-rGB/strings.xml    |  2 -
 res/values-en-rIN/strings.xml    |  2 -
 res/values-en-rXC/strings.xml    |  2 -
 res/values-es-rUS/strings.xml    |  2 -
 res/values-es/strings.xml        | 80 +++++++++++-----------------
 res/values-et/strings.xml        | 65 ++++++++++++++++-------
 res/values-eu/strings.xml        | 66 ++++++++++++++++-------
 res/values-fa/strings.xml        |  2 -
 res/values-fi/strings.xml        | 80 +++++++++++-----------------
 res/values-fr-rCA/strings.xml    |  2 -
 res/values-fr/strings.xml        | 82 ++++++++++++++++++++++-------
 res/values-gl/strings.xml        | 80 +++++++++++-----------------
 res/values-gu/strings.xml        |  6 +--
 res/values-hi/strings.xml        | 82 ++++++++++++++++++++++-------
 res/values-hr/strings.xml        | 82 ++++++++++++-----------------
 res/values-hu/strings.xml        | 67 ++++++++++++++++--------
 res/values-hy/strings.xml        |  2 -
 res/values-in/strings.xml        | 64 ++++++++++++++++-------
 res/values-is/strings.xml        | 63 +++++++++++++++-------
 res/values-it/strings.xml        |  2 -
 res/values-iw/strings.xml        |  2 -
 res/values-ja/strings.xml        | 63 +++++++++++++++-------
 res/values-ka/strings.xml        | 63 +++++++++++++++-------
 res/values-kk/strings.xml        | 79 +++++++++++++++++++++-------
 res/values-km/strings.xml        | 64 ++++++++++++++++-------
 res/values-kn/strings.xml        |  2 -
 res/values-ko/strings.xml        | 65 ++++++++++++++++-------
 res/values-ky/strings.xml        |  4 --
 res/values-lo/strings.xml        |  2 -
 res/values-lt/strings.xml        | 67 +++++++++++++++++-------
 res/values-lv/strings.xml        | 65 ++++++++++++++++-------
 res/values-mk/strings.xml        | 68 ++++++++++++++++--------
 res/values-ml/strings.xml        |  2 -
 res/values-mn/strings.xml        | 80 +++++++++++-----------------
 res/values-mr/strings.xml        | 89 +++++++++++++++++++++++---------
 res/values-ms/strings.xml        | 63 +++++++++++++++-------
 res/values-my/strings.xml        | 64 ++++++++++++++++-------
 res/values-nb/strings.xml        | 63 +++++++++++++++-------
 res/values-ne/strings.xml        |  4 --
 res/values-nl/strings.xml        |  2 -
 res/values-or/strings.xml        |  4 --
 res/values-pa/strings.xml        |  4 --
 res/values-pl/strings.xml        | 89 +++++++++++++++++++++++---------
 res/values-pt-rPT/strings.xml    | 80 +++++++++++-----------------
 res/values-pt/strings.xml        |  2 -
 res/values-ro/strings.xml        | 64 ++++++++++++++++-------
 res/values-ru/strings.xml        | 69 ++++++++++++++++++-------
 res/values-si/strings.xml        |  2 -
 res/values-sk/strings.xml        |  2 -
 res/values-sl/strings.xml        | 71 +++++++++++++++++--------
 res/values-sq/strings.xml        | 66 ++++++++++++++++-------
 res/values-sr/strings.xml        | 87 ++++++++++++++++++++-----------
 res/values-sv/strings.xml        |  2 -
 res/values-sw/strings.xml        | 68 ++++++++++++++++--------
 res/values-ta/strings.xml        | 66 ++++++++++++++++-------
 res/values-te/strings.xml        | 88 ++++++++++++++++++++++---------
 res/values-th/strings.xml        | 80 +++++++++++-----------------
 res/values-tl/strings.xml        |  2 -
 res/values-tr/strings.xml        |  2 -
 res/values-uk/strings.xml        | 67 +++++++++++++++++-------
 res/values-ur/strings.xml        | 79 +++++++++++++++++++++-------
 res/values-uz/strings.xml        |  2 -
 res/values-vi/strings.xml        | 71 ++++++++++++++++---------
 res/values-zh-rCN/strings.xml    | 79 +++++++++++++++++++++-------
 res/values-zh-rHK/strings.xml    | 80 +++++++++++-----------------
 res/values-zh-rTW/strings.xml    | 80 +++++++++++-----------------
 res/values-zu/strings.xml        |  2 -
 84 files changed, 2328 insertions(+), 1360 deletions(-)

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index f847685b78..6894e3cead 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -56,8 +56,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Kon geen programme kry wat by \"<xliff:g id="QUERY">%1$s</xliff:g>\" pas nie"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Soek meer programme"</string>
     <string name="label_application" msgid="8531721983832654978">"Program"</string>
-    <string name="search_corpus_apps" msgid="1917889409963779022">"Programme"</string>
-    <string name="search_action_try_now" msgid="1458737965476149074">"Probeer nou"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Kennisgewings"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Raak en hou om \'n kortpad te skuif."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dubbeltik en hou om \'n kortpad te skuif of gebruik gepasmaakte handelinge."</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index ee98cf20af..8097ba1b59 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -56,8 +56,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"ከ«<xliff:g id="QUERY">%1$s</xliff:g>» ጋር የሚዛመዱ ምንም መተግበሪያዎች አልተገኙም"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"ተጨማሪ መተግበሪያዎች ይፈልጉ"</string>
     <string name="label_application" msgid="8531721983832654978">"መተግበሪያ"</string>
-    <string name="search_corpus_apps" msgid="1917889409963779022">"መተግበሪያዎች"</string>
-    <string name="search_action_try_now" msgid="1458737965476149074">"አሁን ይሞክሩ"</string>
     <string name="notifications_header" msgid="1404149926117359025">"ማሳወቂያዎች"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"አቋራጭን ለማንቀሳቀስ ይንኩ እና ይያዙ"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"አቋራጭን ለማንቀሳቀስ ወይም ብጁ እርምጃዎችን ለመጠቀም ሁለቴ መታ ያድርጉ እና ይያዙ።"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index a80ecb0b14..04fb528a93 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -20,39 +20,64 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"العمل"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"لم يتم تثبيت التطبيق."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"التطبيق ليس متاحًا"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"تم إيقاف التطبيق الذي تم تنزيله في الوضع الآمن"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"الأدوات غير مفعّلة في الوضع الآمن"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"الاختصار غير متاح"</string>
-    <string name="home_screen" msgid="806512411299847073">"الشاشة الرئيسية"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"الإجراءات المخصّصة"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"المس مع الاستمرار لاختيار إحدى الأدوات."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"انقر مرّتين مع الاستمرار لاختيار أداة أو استخدم الإجراءات المخصصة."</string>
+    <string name="home_screen" msgid="5629429142036709174">"الشاشة الرئيسية"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"تقسيم الشاشة"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"انقر مرتين مع تثبيت إصبعك لنقل أداة."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"انقر مرتين مع تثبيت إصبعك لنقل أداة أو استخدام الإجراءات المخصّصة."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"‏العرض %1$d الطول %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"انقر مع الاستمرار لإضافة العنصر يدويًا"</string>
     <string name="place_automatically" msgid="8064208734425456485">"الإضافة تلقائيًا"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="zero"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> أداة</item>
+      <item quantity="two">أداتان (<xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g>)</item>
+      <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> أدوات</item>
+      <item quantity="many"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> أداة</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> أداة</item>
+      <item quantity="one">أداة واحدة (<xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g>)</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="zero"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> اختصار</item>
+      <item quantity="two">اختصاران (<xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g>)</item>
+      <item quantity="few"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> اختصارات</item>
+      <item quantity="many"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> اختصارًا</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> اختصار</item>
+      <item quantity="one">اختصار واحد (<xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g>)</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>، <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"الأدوات"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"بحث"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"محو النص من مربّع البحث"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"ما مِن أدوات متاحة."</string>
+    <string name="no_search_results" msgid="6518732304311458580">"ما مِن نتائج بحث."</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"الأدوات الشخصية"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"أدوات العمل"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"المحادثات"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"بحث في التطبيقات"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"جارٍ تحميل التطبيقات…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"لم يتم العثور على أي تطبيقات تتطابق مع \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"البحث عن مزيد من التطبيقات"</string>
     <string name="label_application" msgid="8531721983832654978">"تطبيق"</string>
     <string name="notifications_header" msgid="1404149926117359025">"الإشعارات"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"انقر مع الاستمرار لاختيار اختصار."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"يمكنك النقر مرّتين مع الاستمرار لاختيار اختصار أو استخدام الإجراءات المخصصة."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"انقر مرتين مع تثبيت إصبعك لنقل اختصار."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"انقر مرتين مع تثبيت إصبعك لنقل اختصار أو استخدام الإجراءات المخصّصة."</string>
     <string name="out_of_space" msgid="4691004494942118364">"ليس هناك مساحة أخرى في هذه الشاشة الرئيسية."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"لا يوجد المزيد من الحقول في علبة المفضلة"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"قائمة التطبيقات"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"قائمة التطبيقات الشخصية"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"قائمة تطبيقات العمل"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"الرئيسية"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"إزالة"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"إلغاء التثبيت"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"معلومات عن التطبيق"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"تثبيت"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"عدم اقتراح التطبيق"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"تثبيت التطبيق المتوقّع"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"تثبيت اختصارات"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"للسماح لتطبيق ما بإضافة اختصارات بدون تدخل المستخدم."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"قراءة إعدادات واختصارات الشاشة الرئيسية"</string>
@@ -63,7 +88,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"حدثت مشكلة أثناء تحميل الأداة"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"الإعداد"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"هذا تطبيق نظام وتتعذر إزالته."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"مجلد بدون اسم"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"تعديل الاسم"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"تم إيقاف <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="zero">يتضمن تطبيق <xliff:g id="APP_NAME_2">%1$s</xliff:g> <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> إشعار.​</item>
@@ -81,8 +106,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"انقر لحفظ الاسم الجديد"</string>
     <string name="folder_closed" msgid="4100806530910930934">"تم إغلاق المجلد"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"تمت إعادة تسمية المجلد إلى <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"المجلد: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"الأدوات"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"المجلد: <xliff:g id="NAME">%1$s</xliff:g>، <xliff:g id="SIZE">%2$d</xliff:g> عنصر"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"المجلد: <xliff:g id="NAME">%1$s</xliff:g>، <xliff:g id="SIZE">%2$d</xliff:g> عنصر أو أكثر"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"الخلفيات"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"الأنماط والخلفيات"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"إعدادات الشاشة الرئيسية"</string>
@@ -92,23 +117,23 @@
     <string name="notification_dots_title" msgid="9062440428204120317">"نقاط الإشعارات"</string>
     <string name="notification_dots_desc_on" msgid="1679848116452218908">"مفعّل"</string>
     <string name="notification_dots_desc_off" msgid="1760796511504341095">"غير مفعّل"</string>
-    <string name="title_missing_notification_access" msgid="7503287056163941064">"يلزم تفعيل الوصول إلى الإشعارات"</string>
-    <string name="msg_missing_notification_access" msgid="281113995110910548">"لعرض نقاط الإشعارات، يجب تشغيل إشعارات التطبيق في <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="title_missing_notification_access" msgid="7503287056163941064">"يلزم تمكين الوصول إلى الإشعارات"</string>
+    <string name="msg_missing_notification_access" msgid="281113995110910548">"لعرض نقاط الإشعارات، يجب تفعيل إشعارات التطبيق في <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"تغيير الإعدادات"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"عرض نقاط الإشعارات"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"إضافة رمز إلى الشاشة الرئيسية"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"إضافة رموز التطبيقات إلى الشاشة الرئيسية"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"للتطبيقات الجديدة"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"غير معروفة"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"إزالة"</string>
     <string name="abandoned_search" msgid="891119232568284442">"بحث"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"لم يتم تثبيت هذا التطبيق"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"لم يتم تثبيت تطبيق لهذا الرمز. يمكنك إزالته أو البحث عن التطبيق وتثبيته يدويًا."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"جارٍ تثبيت <xliff:g id="NAME">%1$s</xliff:g>، مستوى التقدم: <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"جارٍ تنزيل <xliff:g id="NAME">%1$s</xliff:g>، اكتمل <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> في انتظار التثبيت"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"أدوات <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"قائمة الأدوات"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"تم إغلاق قائمة الأدوات."</string>
-    <string name="action_add_to_workspace" msgid="8902165848117513641">"الإضافة إلى الشاشة الرئيسية"</string>
+    <string name="action_add_to_workspace" msgid="8902165848117513641">"الإضافة إلى شاشة الصفحة الرئيسية"</string>
     <string name="action_move_here" msgid="2170188780612570250">"نقل العنصر إلى هنا"</string>
     <string name="item_added_to_workspace" msgid="4211073925752213539">"تمت إضافة العنصر إلى الشاشة الرئيسية"</string>
     <string name="item_removed" msgid="851119963877842327">"تم حذف العنصر"</string>
@@ -133,15 +158,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"الاختصارات"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"الاختصارات والإشعارات"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"تجاهل"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"إغلاق"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"تم تجاهل الإشعار"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"شخصية"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"للعمل"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"الملف الشخصي للعمل"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"البحث عن تطبيقات العمل هنا"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"يحتوي كل تطبيق للعمل على شارة ويظل تحت حماية مؤسستك. يمكنك نقل التطبيقات إلى شاشتك الرئيسية لتسهيل الوصول إليها."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"ملف شخصي للعمل تديره مؤسستك"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"الإشعارات والتطبيقات متوقفة."</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"إغلاق"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"تمّ الإغلاق"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"إن البيانات الشخصية منفصلة عن تطبيقات العمل ومخفية عنها"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"إن بيانات وتطبيقات العمل مرئية لمشرف تكنولوجيا المعلومات في مؤسستك"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"التالي"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"حسنًا"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"تم إيقاف الملف الشخصي للعمل مؤقتًا"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"لا يمكن لتطبيقات العمل إرسال إشعارات إليك أو استخدام بطاريتك أو الوصول إلى موقعك الجغرافي."</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"تم إيقاف الملف الشخصي للعمل مؤقتًا. لا يمكن لتطبيقات العمل إرسال إشعارات إليك أو استخدام بطاريتك أو الوصول إلى موقعك الجغرافي."</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"تحمل تطبيقات العمل شارة وتكون مرئية لمشرف تكنولوجيا المعلومات."</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"حسنًا"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"إيقاف تطبيقات العمل مؤقتًا"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"تفعيل"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"فلتر"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"إيقاف تطبيقات العمل وإشعاراتها مؤقتًا"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"تعذَّر <xliff:g id="WHAT">%1$s</xliff:g>."</string>
 </resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 2984603818..3cfb1158ff 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -20,39 +20,64 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"কৰ্মস্থান"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"এপটো ইনষ্টল কৰা নহ\'ল।"</string>
     <string name="activity_not_available" msgid="7456344436509528827">"এপটো নাই"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"ডাউনল’ড কৰা এপটোক সুৰক্ষিত ম\'ডত অক্ষম কৰা হ’ল"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"ৱিজেটবোৰক সুৰক্ষিত ম\'ডত অক্ষম কৰা হ’ল"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"শ্বৰ্টকাট নাই"</string>
-    <string name="home_screen" msgid="806512411299847073">"গৃহ স্ক্ৰীণ"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"উপযোগিতা অনুসৰি কৰা কাৰ্যবিলাক"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"কোনো ৱিজেট বাছনি কৰিবলৈ স্পৰ্শ কৰি থাকক।"</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"কোনো ৱিজেট বাছনি কৰিবলৈ অথবা উপযোগিতা অনুসৰি কাৰ্যবিলাক ব্য়ৱহাৰ কৰিবলৈ দুবাৰ টিপি থাকক।"</string>
+    <!-- no translation found for home_screen (5629429142036709174) -->
+    <skip />
+    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
+    <skip />
+    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
+    <skip />
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d বহল x %2$d ওখ"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"মেনুৱেলভাৱে ৰাখিবলৈ স্পৰ্শ কৰি থাকক"</string>
     <string name="place_automatically" msgid="8064208734425456485">"স্বয়ংক্ৰিয়ভাবে যোগ কৰক"</string>
+    <!-- no translation found for widgets_count (656794749266073027) -->
+    <!-- no translation found for shortcuts_count (8080294865447938455) -->
+    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
+    <skip />
+    <string name="widget_button_text" msgid="2880537293434387943">"ৱিজেটসমূহ"</string>
+    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
+    <skip />
+    <!-- no translation found for no_widgets_available (9140948620298620513) -->
+    <skip />
+    <!-- no translation found for no_search_results (6518732304311458580) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
+    <skip />
+    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"এপসমূহ সন্ধান কৰক"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"এপসমূহ ল’ড কৰি থকা হৈছে…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\"ৰ সৈতে মিলা কোনো এপ্ বিচাৰি পোৱা নগ\'ল"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"আৰু অধিক এপবোৰ সন্ধান কৰক"</string>
     <string name="label_application" msgid="8531721983832654978">"এপ্"</string>
     <string name="notifications_header" msgid="1404149926117359025">"জাননীসমূহ"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"কোনো শ্বৰ্টকাট বাছনি কৰিবলৈ স্পৰ্শ কৰি হেঁচি ধৰক।"</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"কোনো শ্বৰ্টকাট বাছনি কৰিবলৈ দুবাৰ টিপি হেঁচি ধৰক, বা নিজৰ উপযোগিতা অনুসৰি সৃষ্টি কৰা কাৰ্যসমূহ ব্যৱহাৰ কৰক।"</string>
+    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
+    <skip />
     <string name="out_of_space" msgid="4691004494942118364">"এই গৃহ স্ক্ৰীণত আৰু বেছি ঠাই নাই।"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"পছন্দৰ ট্ৰে\'ত আৰু বেছি ঠাই নাই"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"এপৰ সূচী"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"ব্যক্তিগত এপৰ তালিকা"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"কৰ্মস্থানৰ এপৰ তালিকা"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"গৃহপৃষ্ঠা"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"আঁতৰাওক"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"আনইনষ্টল কৰক"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"এপ সম্পৰ্কীয় তথ্য"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"ইনষ্টল কৰক"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"এপৰ পৰামৰ্শ নিদিব"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"পূৰ্বানুমান কৰা এপ্‌টো পিন কৰক"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"শ্বৰ্টকাট ইনষ্টল কৰিব পাৰে"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"ব্য়ৱহাৰকাৰীৰ হস্তক্ষেপ অবিহনেই কোনো এপক শ্বৰ্টকাটবোৰ যোগ কৰাৰ অনুমতি দিয়ে।"</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"গৃহ ছেটিং আৰু শ্বৰ্টকাটবোৰ পঢ়িব পাৰে"</string>
@@ -63,7 +88,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"ৱিজেট ল\'ড কৰাত সমস্য়া"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"ছেটআপ কৰক"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"এইটো এটা ছিষ্টেম এপ আৰু ইয়াক আনইনষ্টল কৰিব নোৱৰি"</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"নামবিহীন ফ\'ল্ডাৰ"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"নাম সম্পাদনা কৰক"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> অক্ষম কৰা হ’ল"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="one"><xliff:g id="APP_NAME_2">%1$s</xliff:g>ৰ <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g>টা জাননী আছে</item>
@@ -77,8 +102,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"সলনি কৰা নাম ছেভ কৰিবলৈ টিপক"</string>
     <string name="folder_closed" msgid="4100806530910930934">"ফ\'ল্ডাৰ বন্ধ কৰা হ’ল"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"ফ\'ল্ডাৰৰ নাম সলনি কৰি <xliff:g id="NAME">%1$s</xliff:g> কৰা হৈছে"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"ফ’ল্ডাৰ: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"ৱিজেটসমূহ"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"ফ’ল্ডাৰ: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> টা বস্তু"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"ফ’ল্ডাৰ: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> টা অথবা তাতকৈ অধিক বস্তু"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"ৱালপেপাৰসমূহ"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"ষ্টাইল &amp; ৱালপেপাৰ"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"গৃহ ছেটিংসমূহ"</string>
@@ -92,16 +117,17 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"জাননী সম্পৰ্কীয় বিন্দুবোৰ দেখুৱাবলৈ <xliff:g id="NAME">%1$s</xliff:g>ৰ বাবে এপৰ জাননীসমূহ অন কৰক"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"ছেটিংসমূহ সলনি কৰক"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"জাননী বিন্দু দেখুৱাওক"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"গৃহ স্ক্ৰীণত আইকনটো যোগ কৰক"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"গৃহ স্ক্ৰীনত এপ্ চিহ্নসমূহ যোগ দিয়ক"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"নতুন এপসমূহৰ বাবে"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"অজ্ঞাত"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"আঁতৰাওক"</string>
-    <string name="abandoned_search" msgid="891119232568284442">"সন্ধান কৰক"</string>
+    <string name="abandoned_search" msgid="891119232568284442">"Search"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"এই এপটো ইনষ্টল কৰা হোৱা নাই"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"এই আইকনৰ এপটো ইনষ্টল কৰা হোৱা নাই। আপুনি এইটো আঁতৰাব পাৰে অথবা এপটো বিচাৰি মেনুৱেলভাৱে ইনষ্টল কৰিব পাৰে।"</string>
+    <!-- no translation found for app_installing_title (5864044122733792085) -->
+    <skip />
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> ডাউনল’ড কৰি থকা হৈছে, <xliff:g id="PROGRESS">%2$s</xliff:g> সম্পূৰ্ণ হ’ল"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> ইনষ্টল হোৱালৈ অপেক্ষা কৰি থকা হৈছে"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> ৱিজেট"</string>
     <string name="widgets_list" msgid="796804551140113767">"ৱিজেটৰ তালিকা"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"ৱিজেটৰ তালিকা বন্ধ কৰা হ’ল"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"গৃহ স্ক্ৰীণত যোগ কৰক"</string>
@@ -129,15 +155,30 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"শ্বৰ্টকাটসমূহ"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"শ্বৰ্টকাট আৰু জাননীসমূহ"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"অগ্ৰাহ্য কৰক"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"বন্ধ কৰক"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"জাননী অগ্ৰাহ্য কৰা হৈছে"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ব্যক্তিগত"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"কৰ্মস্থান"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"কৰ্মস্থানৰ প্ৰ\'ফাইল"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"ইয়াত কৰ্মস্থানৰ এপ্ বিচাৰি পাওক"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"কৰ্মস্থানৰ প্ৰতিটো এপৰে একোটা প্ৰতীক আছে আৰু তাক আপোনাৰ প্ৰতিষ্ঠানে সুৰক্ষিত কৰি ৰাখে। ব্যৱহাৰ কৰাত সুবিধা হ\'বলৈ এপসমূহ আপোনাৰ গৃহ স্ক্ৰীণলৈ স্থানান্তৰ কৰক।"</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"আপোনাৰ প্ৰতিষ্ঠানৰ দ্বাৰা পৰিচালিত"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"জাননী আৰু এপসমূহ অফ হৈ আছে"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"বন্ধ কৰক"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"বন্ধ"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"ব্যক্তিগত ডেটাখিনি পৃথক হয় আৰু সেইখিনি কর্মস্থানৰ এপ্‌সমূহৰ পৰা লুকুওৱা আছে"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"আপোনাৰ আইটি প্ৰশাসকে কর্মস্থানৰ এপ্‌সমূহ আৰু ডেটা দেখা পায়"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"পৰৱৰ্তী"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"বুজি পালোঁ"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"কৰ্মস্থানৰ প্ৰ\'ফাইলটো পজ কৰা আছে"</string>
+    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
+    <skip />
+    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
+    <skip />
+    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
+    <skip />
+    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
+    <skip />
+    <string name="work_switch_tip" msgid="808075064383839144">"কর্মস্থানৰ এপ্‌সমূহ আৰু জাননীসমূহ পজ কৰক"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"বিফল: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 32b8fe3fe4..93936bee43 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -62,10 +62,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"<xliff:g id="QUERY">%1$s</xliff:g> sorğusuna uyğun tətbiq tapılmadı"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Daha çox tətbiq üçün axtarış edin"</string>
     <string name="label_application" msgid="8531721983832654978">"Tətbiq"</string>
-    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
-    <skip />
-    <!-- no translation found for search_action_try_now (1458737965476149074) -->
-    <skip />
     <string name="notifications_header" msgid="1404149926117359025">"Bildirişlər"</string>
     <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
     <skip />
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 883003c5c0..ed08ca2d4b 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -20,39 +20,58 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Work"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Aplikacija nije instalirana."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Aplikacija nije dostupna"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Preuzeta aplikacija je onemogućena u Bezbednom režimu"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Vidžeti su onemogućeni u Bezbednom režimu"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Prečica nije dostupna"</string>
-    <string name="home_screen" msgid="806512411299847073">"Početni ekran"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Prilagođene radnje"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Dodirnite i zadržite da biste izabrali vidžet."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Dvaput dodirnite i zadržite da biste izabrali vidžet ili koristite prilagođene radnje."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Početni ekran"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Podeljeni ekran"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Dvaput dodirnite i zadržite radi pomeranja vidžeta."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvaput dodirnite i zadržite da biste pomerali vidžet ili koristite prilagođene radnje."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d×%2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"širina od %1$d i visina od %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Dodirnite i zadržite da biste postavili ručno"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Automatski dodaj"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidžet</item>
+      <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidžeta</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidžeta</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> prečica</item>
+      <item quantity="few"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> prečice</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> prečica</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Vidžeti"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Pretraga"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Obrišite tekst iz okvira za pretragu"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Nije dostupan nijedan vidžet"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Nema rezultata pretrage"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Lično"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Posao"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Konverzacije"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Pretražite aplikacije"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Aplikacije se učitavaju…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nije pronađena nijedna aplikacija za „<xliff:g id="QUERY">%1$s</xliff:g>“"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Pretraži još aplikacija"</string>
     <string name="label_application" msgid="8531721983832654978">"Aplikacija"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Obaveštenja"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Dodirnite i zadržite da biste izabrali prečicu."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Dvaput dodirnite i zadržite da biste izabrali prečicu ili koristite prilagođene radnje."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Dvaput dodirnite i zadržite radi pomeranja prečice."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dvaput dodirnite i zadržite da biste pomerali prečicu ili koristite prilagođene radnje."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Nema više prostora na ovom početnom ekranu."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Nema više prostora na traci Omiljeno"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista aplikacija"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista ličnih aplikacija"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Lista poslovnih aplikacija"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Početna"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Ukloni"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Deinstaliraj"</string>
-    <string name="app_info_drop_target_label" msgid="692894985365717661">"Inform. o aplikaciji"</string>
+    <string name="app_info_drop_target_label" msgid="692894985365717661">"Infor. o aplikaciji"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Instaliraj"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Ne predlaži aplikaciju"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Zakači predviđanje"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"instaliranje prečica"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Dozvoljava aplikaciji da dodaje prečice bez intervencije korisnika."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"čitanje podešavanja i prečica na početnom ekranu"</string>
@@ -63,7 +82,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Problem pri učitavanju vidžeta"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Podešavanje"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Ovo je sistemska aplikacija i ne može da se deinstalira."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Neimenovani direktorijum"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Izmenite naziv"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> je onemogućena"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="one"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, ima <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> obaveštenje</item>
@@ -73,13 +92,13 @@
     <string name="default_scroll_format" msgid="7475544710230993317">"%1$d. stranica od %2$d"</string>
     <string name="workspace_scroll_format" msgid="8458889198184077399">"%1$d. početni ekran od %2$d"</string>
     <string name="workspace_new_page" msgid="257366611030256142">"Nova stranica početnog ekrana"</string>
-    <string name="folder_opened" msgid="94695026776264709">"Direktorijum je otvoren, <xliff:g id="WIDTH">%1$d</xliff:g> puta <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
-    <string name="folder_tap_to_close" msgid="4625795376335528256">"Dodirnite da biste zatvorili direktorijum"</string>
+    <string name="folder_opened" msgid="94695026776264709">"Folder je otvoren, <xliff:g id="WIDTH">%1$d</xliff:g> puta <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
+    <string name="folder_tap_to_close" msgid="4625795376335528256">"Dodirnite da biste zatvorili folder"</string>
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Dodirnite da biste sačuvali preimenovanje"</string>
-    <string name="folder_closed" msgid="4100806530910930934">"Direktorijum je zatvoren"</string>
-    <string name="folder_renamed" msgid="1794088362165669656">"Direktorijum je preimenovan u <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Direktorijum: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Vidžeti"</string>
+    <string name="folder_closed" msgid="4100806530910930934">"Folder je zatvoren"</string>
+    <string name="folder_renamed" msgid="1794088362165669656">"Folder je preimenovan u <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> stavke"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ili više stavki"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Pozadine"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stilovi i pozadine"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Podešavanja početnog ekrana"</string>
@@ -93,16 +112,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Da biste prikazali tačke za obaveštenja, uključite obaveštenja za aplikaciju <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Promenite podešavanja"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Prikazuj tačke za obaveštenja"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Dodaj ikonu na početni ekran"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Dodaj ikone aplikacija na početni ekran"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Za nove aplikacije"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Nepoznato"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Ukloni"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Pretraži"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Ova aplikacija nije instalirana"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Aplikacija za ovu ikonu nije instalirana. Možete da je uklonite ili da potražite aplikaciju i instalirate je ručno."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> se instalira, <xliff:g id="PROGRESS">%2$s</xliff:g> gotovo"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> se preuzima, završeno je <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> čeka na instaliranje"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Vidžeti za <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Lista vidžeta"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Lista vidžeta je zatvorena"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Dodajte na početni ekran"</string>
@@ -115,11 +134,11 @@
     <string name="move_to_position" msgid="6750008980455459790">"Premesti na <xliff:g id="NUMBER">%1$s</xliff:g>. poziciju"</string>
     <string name="move_to_hotseat_position" msgid="6295412897075147808">"Premesti na <xliff:g id="NUMBER">%1$s</xliff:g>. poziciju u omiljenim"</string>
     <string name="item_moved" msgid="4606538322571412879">"Stavka je premeštena"</string>
-    <string name="add_to_folder" msgid="9040534766770853243">"Dodaj u direktorijum: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="add_to_folder_with_app" msgid="4534929978967147231">"Dodaj u direktorijum u kome je <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="added_to_folder" msgid="4793259502305558003">"Stavka je dodata u direktorijum"</string>
-    <string name="create_folder_with" msgid="4050141361160214248">"Napravite direktorijum sa: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_created" msgid="6409794597405184510">"Direktorijum je napravljen"</string>
+    <string name="add_to_folder" msgid="9040534766770853243">"Dodaj u folder: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="add_to_folder_with_app" msgid="4534929978967147231">"Dodaj u folder u kome je <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="added_to_folder" msgid="4793259502305558003">"Stavka je dodata u folder"</string>
+    <string name="create_folder_with" msgid="4050141361160214248">"Napravite folder sa: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="folder_created" msgid="6409794597405184510">"Folder je napravljen"</string>
     <string name="action_move_to_workspace" msgid="1603837886334246317">"Premesti na početni ekran"</string>
     <string name="action_resize" msgid="1802976324781771067">"Promeni veličinu"</string>
     <string name="action_increase_width" msgid="8773715375078513326">"Povećaj širinu"</string>
@@ -130,15 +149,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Prečice"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Prečice i obaveštenja"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Odbaci"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Zatvori"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Obaveštenje je odbačeno"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Lične"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Poslovne"</string>
-    <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profil za Work"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Pronađite poslovne aplikacije ovde"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Svaka poslovna aplikacija ima značku i štiti je vaša organizacija. Premestite aplikacije na početni ekran da biste im lakše pristupali."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Ovim upravlja organizacija"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Obaveštenja i aplikacije su isključeni"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Zatvori"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Zatvoreno"</string>
+    <string name="work_profile_toggle_label" msgid="3081029915775481146">"Poslovni profil"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Lični podaci su odvojeni i sakriveni od aplikacija za posao"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"IT administrator vidi poslovne aplikacije i podatke"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Dalje"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Važi"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Poslovni profil je pauziran"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Poslovne aplikacije ne mogu da vam šalju obaveštenja, koriste bateriju niti pristupaju lokaciji"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Poslovni profil je pauziran. Poslovne aplikacije ne mogu da vam šalju obaveštenja, koriste bateriju niti pristupaju lokaciji"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Poslovne aplikacije su označene značkom i IT administrator može da ih vidi"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Važi"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pauziraj poslovne aplikacije"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Uključi"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filter"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Pauzirajte poslovne aplikacije i obaveštenja"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Nije uspelo: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index b4cf913de4..20821d3320 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -20,39 +20,60 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Працоўная"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Праграма не ўсталявана."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Праграма недаступная"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Спампаваная праграма адключана ў Бяспечным рэжыме"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Віджэты адключаны ў Бяспечным рэжыме"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Ярлык недаступны"</string>
-    <string name="home_screen" msgid="806512411299847073">"Галоўны экран"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Спецыяльныя дзеянні"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Дакраніцеся і ўтрымлiвайце віджэт, каб выбр. яго."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Дакраніцеся двойчы і ўтрымлівайце, каб выбраць віджэт або выкарыстоўваць карыстальніцкія дзеянні."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Галоўны экран"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Падзелены экран"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Націсніце і ўтрымлівайце віджэт для перамяшчэння."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Дакраніцеся двойчы і ўтрымлівайце, каб перамясціць віджэт або выкарыстоўваць спецыяльныя дзеянні."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Шырына: %1$d, вышыня: %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Каб размясціць уручную, дакраніцеся і ўтрымлівайце"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Дадаць аўтаматычна"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> віджэт</item>
+      <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> віджэты</item>
+      <item quantity="many"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> віджэтаў</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> віджэта</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> ярлык</item>
+      <item quantity="few"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> ярлыкі</item>
+      <item quantity="many"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> ярлыкоў</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> ярлыка</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Віджэты"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Пошук"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Ачысціць тэкст у полі пошуку"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Віджэты недаступныя"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Няма вынікаў пошуку"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Асабістыя"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Працоўныя"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Размовы"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Пошук праграм"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Праграмы загружаюцца…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Праграм, якія адпавядаюць запыту \"<xliff:g id="QUERY">%1$s</xliff:g>\", не знойдзена"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Шукаць іншыя праграмы"</string>
     <string name="label_application" msgid="8531721983832654978">"Праграма"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Апавяшчэнні"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Дакраніцеся і ўтрымлiвайце ярлык, каб дадаць яго."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Дакраніцеся двойчы і ўтрымлівайце, каб выбраць ярлык або выкарыстоўваць спецыяльныя дзеянні."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Націсніце і ўтрымлівайце ярлык для перамяшчэння."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Дакраніцеся двойчы і ўтрымлівайце, каб перамясціць ярлык або выкарыстоўваць спецыяльныя дзеянні."</string>
     <string name="out_of_space" msgid="4691004494942118364">"На гэтым Галоўным экране больш няма месца."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"У латку \"Абранае\" больш няма месца"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Спіс праграм"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Спіс персанальных праграм"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Спіс працоўных праграм"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Галоўная"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Выдаліць"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Дэінсталяваць"</string>
-    <string name="app_info_drop_target_label" msgid="692894985365717661">"Звесткі пра праграмы"</string>
+    <string name="app_info_drop_target_label" msgid="692894985365717661">"Пра праграму"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Усталяваць"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Не прапаноўваць праграму"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Замацаваць прапанаваную праграму"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"усталёўваць ярлыкі"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Дазваляе праграмам дадаваць ярлыкі без умяшання карыстальніка."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"счытваць налады і ярлыкі на Галоўнай старонцы"</string>
@@ -63,7 +84,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Праблема загрузкі віджэта"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Наладжванне"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Гэта сістэмная праграма, яе нельга выдаліць."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Папка без назвы"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Змяніць назву"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> адключана"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="one"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, мае <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> апавяшчэнне</item>
@@ -79,8 +100,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Краніце, каб захаваць новую назву"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Папка закрыта"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Папка перайменавана ў <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Папка: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Віджэты"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Папка: <xliff:g id="NAME">%1$s</xliff:g>, элементы: <xliff:g id="SIZE">%2$d</xliff:g>"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Папка: <xliff:g id="NAME">%1$s</xliff:g>, элементы: <xliff:g id="SIZE">%2$d</xliff:g> ці больш"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Шпалеры"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Стылі і шпалеры"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Налады галоўнага экрана"</string>
@@ -94,16 +115,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Каб паказваліся значкі апавяшчэнняў, уключыце апавяшчэнні праграм для <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Змяніць налады"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Паказваць значкі апавяшчэнняў"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Дадаць значок на Галоўны экран"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Дадаць значкі праграм на Галоўны экран"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Для новых праграм"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Невядома"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Выдаліць"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Шукаць"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Гэта праграма не ўсталявана"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Праграма для гэтага значка не ўсталявана. Вы можаце выдаліць яе або выканаць пошук і ўсталяваць яе ўручную."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"Усталёўваецца праграма \"<xliff:g id="NAME">%1$s</xliff:g>\", завершана <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"Ідзе спампоўка <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="PROGRESS">%2$s</xliff:g> завершана"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> чакае ўсталёўкі"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Віджэты <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Спіс віджэтаў"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Спіс віджэтаў закрыты"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Дадаць на Галоўны экран"</string>
@@ -131,15 +152,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Ярлыкі"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Ярлыкі і апавяшчэнні"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Адхіліць"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Закрыць"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Апавяшчэнне адхілена"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Асабістыя"</string>
-    <string name="all_apps_work_tab" msgid="4884822796154055118">"Праца"</string>
+    <string name="all_apps_work_tab" msgid="4884822796154055118">"Працоўныя"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Працоўны профіль"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Знайдзіце працоўныя праграмы тут"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Кожная працоўная праграма мае значок і знаходзіцца пад аховай вашай арганізацыі. Для больш простага доступу перамясціце праграмы на Галоўны экран."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Пад кіраваннем вашай арганізацыі"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Апавяшчэнні і праграмы выключаны"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Закрыць"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Закрытыя"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Асабістыя даныя схаваны і паказваюцца адасоблена ад працоўных праграм"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Ваш IТ-адміністратар мае доступ да працоўных праграм і іх даных"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Далей"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Зразумела"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Працоўны профіль прыпынены"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Працоўныя праграмы не могуць адпраўляць вам апавяшчэнні, выкарыстоўваць акумулятар або атрымліваць доступ да даных пра ваша месцазнаходжанне"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Працоўны профіль прыпынены. Працоўныя праграмы не могуць адпраўляць вам апавяшчэнні, выкарыстоўваць акумулятар або атрымліваць доступ да даных пра ваша месцазнаходжанне"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Працоўныя праграмы маюць значкі і бачныя IT-адміністратару"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Зразумела"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Прыпыніць працоўныя праграмы"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Уключыць"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Фільтр"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Прыпыніць працоўныя праграмы і апавяшчэнні"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Не ўдалося: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 3ea7f0672c..390a8f851a 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -56,8 +56,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Няма намерени приложения, съответстващи на „<xliff:g id="QUERY">%1$s</xliff:g>“"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Търсене на още приложения"</string>
     <string name="label_application" msgid="8531721983832654978">"Приложение"</string>
-    <string name="search_corpus_apps" msgid="1917889409963779022">"Приложения"</string>
-    <string name="search_action_try_now" msgid="1458737965476149074">"Изпробване сега"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Известия"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Докоснете и задръжте за преместване на пряк път."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Докоснете двукратно и задръжте за преместване на пряк път или използвайте персонализирани действия."</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 09608b5426..e61c820b00 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -26,32 +26,58 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"ডাউনলোড করা অ্যাপ্লিকেশান নিরাপদ মোডে অক্ষম রয়েছে"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"সুরক্ষিত মোডে উইজেট নিষ্ক্রিয় থাকে"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"শর্টকাটগুলি অনুপলব্ধ"</string>
-    <string name="home_screen" msgid="806512411299847073">"হোম স্ক্রিন"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"কাস্টম অ্যাকশন"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"একটি উইজেট তুলতে তা স্পর্শ করে ধরে রাখুন৷"</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"কোনো উইজেট বেছে নিতে দুবার-আলতো চেপে ধরে থাকুন অথবা কাস্টম ক্রিয়াগুলি ব্যবহার করুন৷"</string>
+    <!-- no translation found for home_screen (5629429142036709174) -->
+    <skip />
+    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
+    <skip />
+    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
+    <skip />
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%2$d উচ্চতা অনুযায়ী %1$d প্রস্থ"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"নিজে যোগ করতে টাচ করে ধরে রাখুন"</string>
     <string name="place_automatically" msgid="8064208734425456485">"স্বয়ংক্রিয়ভাবে যোগ করুন"</string>
+    <!-- no translation found for widgets_count (656794749266073027) -->
+    <!-- no translation found for shortcuts_count (8080294865447938455) -->
+    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
+    <skip />
+    <string name="widget_button_text" msgid="2880537293434387943">"উইজেট"</string>
+    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
+    <skip />
+    <!-- no translation found for no_widgets_available (9140948620298620513) -->
+    <skip />
+    <!-- no translation found for no_search_results (6518732304311458580) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
+    <skip />
+    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"অ্যাপ খুঁজুন"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"অ্যাপ লোড হচ্ছে…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" এর সাথে মেলে এমন কোনো অ্যাপ পাওয়া যায়নি"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"আরও অ্যাপ্লিকেশানের জন্য খুঁজুন"</string>
     <string name="label_application" msgid="8531721983832654978">"অ্যাপ"</string>
     <string name="notifications_header" msgid="1404149926117359025">"বিজ্ঞপ্তি"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"কোনও শর্টকাট বেছে নিতে টাচ করে ধরে থাকুন।"</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"কোনও শর্টকাট বেছে নিতে ডবল ট্যাপ করে ধরে থাকুন অথবা কাস্টম অ্যাকশন ব্যবহার করুন।"</string>
+    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
+    <skip />
     <string name="out_of_space" msgid="4691004494942118364">"এই হোম স্ক্রীনে আর কোনো জায়গা নেই৷"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"পছন্দসই ট্রে-তে আর কোনো জায়গা নেই"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"অ্যাপ্লিকেশানগুলির তালিকা"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"ব্যক্তিগত অ্যাপের তালিকা"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"কাজের অ্যাপের তালিকা"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"হোম"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"সরান"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"আনইনস্টল করুন"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"অ্যাপের তথ্য"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"ইনস্টল করুন"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"অ্যাপ সাজেস্ট করবেন না"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"আপনার প্রয়োজন হতে পারে এমন অ্যাপ পিন করুন"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"শর্টকাটগুলি ইনস্টল করে"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"একটি অ্যাপ্লিকেশানকে ব্যবহারকারীর হস্তক্ষেপ ছাড়াই শর্টকাটগুলি যোগ করার অনুমতি দেয়৷"</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"হোম সেটিংস এবং শর্টকাটগুলি পড়ে"</string>
@@ -62,7 +88,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"উইজেট লোড হতে সমস্যা হয়েছে"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"সেটআপ"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"এটি একটি সিস্টেম অ্যাপ্লিকেশান এবং আনইনস্টল করা যাবে না৷"</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"নামবিহীন ফোল্ডার"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"নাম এডিট করুন"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> অক্ষম করা হয়েছে"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="one"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g>টি বিজ্ঞপ্তি আছে</item>
@@ -76,8 +102,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"পুনঃনামকরণ সংরক্ষণ করতে আলতো চাপ দিন"</string>
     <string name="folder_closed" msgid="4100806530910930934">"ফোল্ডার বন্ধ করা হয়েছে"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"ফোল্ডারের নাম পাল্টে <xliff:g id="NAME">%1$s</xliff:g> করা হয়েছে"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"ফোল্ডার: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"উইজেট"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"ফোল্ডার: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g>টি আইটেম"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"ফোল্ডার: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g>টি বা তার বেশি আইটেম"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"ওয়ালপেপারগুলি"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"স্টাইল এবং ওয়ালপেপার"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"হোম সেটিংস"</string>
@@ -91,16 +117,17 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"বিজ্ঞপ্তির ডটগুলি দেখানোর জন্য, <xliff:g id="NAME">%1$s</xliff:g> এর অ্যাপ বিজ্ঞপ্তি চালু করুন"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"সেটিংস পরিবর্তন করুন"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"বিজ্ঞপ্তির ডট দেখুন"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"হোম স্ক্রিনে আইকন যোগ করুন"</string>
-    <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"নতুন অ্যাপ্লিকেশানগুলির জন্যে"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"হোম স্ক্রিনে অ্যাপ আইকন যোগ করুন"</string>
+    <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"নতুন অ্যাপের জন্য"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"অজানা"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"সরান"</string>
     <string name="abandoned_search" msgid="891119232568284442">"সার্চ"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"এই অ্যাপ্লিকেশানটি ইন্সটল করা নাই"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"এই আইকনের অ্যাপ্লিকেশানটি ইন্সটল করা নাই। আপনি এটি সরাতে পারেন বা অ্যাপ্লিকেশানটি সার্চ করে এটি নিজে ইন্সটল করতে পারেন।"</string>
+    <!-- no translation found for app_installing_title (5864044122733792085) -->
+    <skip />
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> ডাউনলোড হচ্ছে <xliff:g id="PROGRESS">%2$s</xliff:g> সম্পন্ন হয়েছে"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> ইনস্টলের অপেক্ষায় রয়েছে"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> উইজেট"</string>
     <string name="widgets_list" msgid="796804551140113767">"উইজেটের তালিকা"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"উইজেটের তালিকা বন্ধ করা হয়েছে"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"হোম স্ক্রিনে যোগ করুন"</string>
@@ -128,15 +155,30 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"শর্টকাট"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"শর্টকাট এবং বিজ্ঞপ্তি"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"খারিজ করুন"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"বন্ধ করুন"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"বিজ্ঞপ্তি খারিজ করা হয়েছে"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ব্যক্তিগত"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"অফিস"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"অফিসের প্রোফাইল"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"এখানে কাজের অ্যাপ্সগুলি খুঁজুন"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"প্রতিটি কাজের অ্যাপে একটি করে ব্যাজ রয়েছে এবং অ্যাপগুলি আপনার প্রতিষ্ঠানের দ্বারা সুরক্ষিত। সহজে অ্যাক্সেস করার জন্য অ্যাপগুলি হোম স্ক্রিনে রাখুন।"</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"আপনার প্রতিষ্ঠানের দ্বারা পরিচালিত"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"বিজ্ঞপ্তি এবং অ্যাপ বন্ধ আছে"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"বন্ধ করুন"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"বন্ধ"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"অফিসের অ্যাপের থেকে ব্যক্তিগত ডেটা আলাদা করে লুকিয়ে রাখা হয়"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"আপনার আইটি অ্যাডমিন অফিস অ্যাপ এবং ডেটা দেখতে পাবেন"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"পরের"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"বুঝেছি"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"অফিস প্রোফাইল বন্ধ করা আছে"</string>
+    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
+    <skip />
+    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
+    <skip />
+    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
+    <skip />
+    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
+    <skip />
+    <string name="work_switch_tip" msgid="808075064383839144">"অফিস অ্যাপ এবং বিজ্ঞপ্তি বন্ধ করুন"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"কাজটি করা যায়নি: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index bcc26743c8..ae46d5bb06 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -58,8 +58,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nije pronađena nijedna aplikacija za upit \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Pretraži više aplikacija"</string>
     <string name="label_application" msgid="8531721983832654978">"Aplikacija"</string>
-    <string name="search_corpus_apps" msgid="1917889409963779022">"Aplikacije"</string>
-    <string name="search_action_try_now" msgid="1458737965476149074">"Isprobajte odmah"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Obavještenja"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Dodirnite i zadržite da pomjerite prečicu."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dvaput dodirnite i zadržite da pomjerite prečicu ili da koristite prilagođene radnje."</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 4ef9ec3a2c..ac7c84b8f1 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -20,38 +20,56 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="work_folder_name" msgid="3753320833950115786">"Feina"</string>
+    <string name="work_folder_name" msgid="3753320833950115786">"Treball"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"L\'aplicació no s\'ha instal·lat."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"L\'aplicació no està disponible."</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"L\'aplicació que has baixat està desactivada al mode segur."</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"En Mode segur, els widgets estan desactivats."</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"La drecera no està disponible"</string>
-    <string name="home_screen" msgid="806512411299847073">"Pantalla d\'inici"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Accions personalitzades"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Mantén premut un widget per triar-lo."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Fes doble toc i mantén premut per seleccionar un widget o per utilitzar les accions personalitzades."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Inici"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Pantalla dividida"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Fes doble toc i mantén premut per moure un widget."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Fes doble toc i mantén premut per moure un widget o per utilitzar accions personalitzades."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d d\'amplada per %2$d d\'alçada"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Mantén premut l\'element per afegir-lo manualment"</string>
+    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Mantén-lo premut per afegir-lo manualment"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Afegeix automàticament"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> dreceres</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> drecera</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Cerca"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Esborra el text del quadre de cerca"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"No hi ha widgets disponibles"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"No hi ha cap resultat de la cerca"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personal"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Treball"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Converses"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Cerca aplicacions"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"S\'estan carregant les aplicacions…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"No s\'ha trobat cap aplicació que coincideixi amb \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Cerca més aplicacions"</string>
     <string name="label_application" msgid="8531721983832654978">"Aplicació"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Notificacions"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Mantén premuda una drecera per seleccionar-la."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Fes doble toc i mantén premut per seleccionar una drecera o per utilitzar accions personalitzades."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Fes doble toc i mantén premut per moure una drecera."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Fes doble toc i mantén premut per moure una drecera o per utilitzar accions personalitzades."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Ja no queda espai en aquesta pantalla d\'inici."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"No hi ha més espai a la safata Preferits."</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Llista d\'aplicacions"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Llista d\'aplicacions personals"</string>
-    <string name="all_apps_button_work_label" msgid="7270707118948892488">"Llista d\'aplicacions per a la feina"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Inici"</string>
+    <string name="all_apps_button_work_label" msgid="7270707118948892488">"Llista d\'aplicacions de treball"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Suprimeix"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Desinstal·la"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Informació de l\'aplicació"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Instal·la"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"No suggereixis l\'aplicació"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Fixa la predicció"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"instal·la dreceres"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Permet que una aplicació afegeixi dreceres sense la intervenció de l\'usuari."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"llegeix la configuració i les dreceres de la pantalla d\'inici"</string>
@@ -62,7 +80,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"S\'ha produït un problema en carregar el widget"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Configuració"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Aquesta aplicació és una aplicació del sistema i no es pot desinstal·lar."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Carpeta sense nom"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Edita el nom"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"S\'ha desactivat <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g>​ té <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> notificacions</item>
@@ -76,8 +94,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Toca per desar el nom nou"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Carpeta tancada"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"S\'ha canviat el nom de la carpeta a <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Carpeta: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Carpeta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elements"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Carpeta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> o més elements"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fons de pantalla"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Estils i fons de pantalla"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Config. pantalla d\'inici"</string>
@@ -91,16 +109,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Per veure els punts de notificació, activa les notificacions de l\'aplicació <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Canvia la configuració"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Mostra els punts de notificació"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Afegeix icona a la pantalla d\'inici"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Afegeix icones a la pantalla d\'inici"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Per a les aplicacions noves"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Desconegut"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Suprimeix"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Cerca"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Aquesta aplicació no està instal·lada"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"L\'aplicació d\'aquesta icona no està instal·lada. Pots suprimir-la o cercar l\'aplicació i instal·lar-la manualment."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"S\'està instal·lant <xliff:g id="NAME">%1$s</xliff:g>; s\'ha completat un <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"S\'està baixant <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="PROGRESS">%2$s</xliff:g> completat"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"S\'està esperant per instal·lar <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Widgets de: <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Llista de widgets"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"S\'ha tancat la llista de widgets"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Afegeix a la pantalla d\'inici"</string>
@@ -128,15 +146,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Dreceres"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Dreceres i notificacions"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Ignora"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Tanca"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"S\'ha ignorat la notificació"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personal"</string>
-    <string name="all_apps_work_tab" msgid="4884822796154055118">"Feina"</string>
-    <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil professional"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Cerca aplicacions per a la feina aquí"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Totes les aplicacions per a la feina tenen una insígnia que indica que estan protegides per la teva organització. Mou les aplicacions a la pantalla d\'inici per poder-hi accedir més fàcilment."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Gestionat per la teva organització"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Les notificacions i les aplicacions estan desactivades"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Tanca"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"S\'ha tancat"</string>
+    <string name="all_apps_work_tab" msgid="4884822796154055118">"Treball"</string>
+    <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de treball"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Les dades personals s\'oculten i se separen de les aplicacions de treball"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"L\'administrador de TI pot veure les dades i les aplicacions de treball"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Següent"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Entesos"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"El perfil de treball està en pausa"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Les aplicacions de treball no poden enviar-te notificacions, consumir bateria ni accedir a la teva ubicació"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"El perfil de treball està en pausa. Les aplicacions de treball no poden enviar-te notificacions, consumir bateria ni accedir a la teva ubicació."</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Les aplicacions de treball tenen una insígnia i són visibles per al teu administrador de TI"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Entesos"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Posa en pausa les aplicacions de treball"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Activa"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtra"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Posa en pausa les notificacions i les aplicacions de treball"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Error: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 692b57d46e..a742f2f44d 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -20,39 +20,60 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Práce"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Aplikace není nainstalována."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Aplikace není k dispozici."</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Stažená aplikace je v nouzovém režimu zakázána"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"V nouzovém režimu jsou widgety zakázány."</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Zkratka není k dispozici"</string>
-    <string name="home_screen" msgid="806512411299847073">"Plocha"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Vlastní akce"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Widget vyberete dotykem a podržením."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Dvojitým klepnutím a podržením vyberte widget, případně použijte vlastní akce."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Domů"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Rozdělená obrazovka"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Klepnutím a podržením přesunete widget."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvojitým klepnutím a podržením přesunete widget, případně použijte vlastní akce."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"šířka %1$d, výška %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Chcete-li položku umístit ručně, klepněte na ni a podržte ji"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Přidat automaticky"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgety</item>
+      <item quantity="many"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgetu</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgetů</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="few"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> zkratky</item>
+      <item quantity="many"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> zkratky</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> zkratek</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> zkratka</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Widgety"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Vyhledávání"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Vymazat text z vyhledávacího pole"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Nejsou k dispozici žádné widgety"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Žádné výsledky hledání"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Osobní"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Práce"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Konverzace"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Hledat v aplikacích"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Načítání aplikací…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Dotazu „<xliff:g id="QUERY">%1$s</xliff:g>“ neodpovídají žádné aplikace"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Vyhledat další aplikace"</string>
     <string name="label_application" msgid="8531721983832654978">"Aplikace"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Oznámení"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Zkratku vyberete podržením."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Dvojitým klepnutím a podržením vyberte zkratku, případně použijte vlastní akce."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Klepnutím a podržením přesunete zkratku."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dvojitým klepnutím a podržením přesunete zkratku, případně použijte vlastní akce."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Na této ploše již není místo."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Na panelu Oblíbené položky již není místo."</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Seznam aplikací"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Seznam osobních aplikací"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Seznam pracovních aplikací"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Plocha"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Odstranit"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Odinstalovat"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"O aplikaci"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Nainstalovat"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Aplikaci nenavrhovat"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Připnout předpověď"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"instalace zástupce"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Umožňuje aplikaci přidat zástupce bez zásahu uživatele."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"čtení nastavení a odkazů plochy"</string>
@@ -63,7 +84,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Problém s načtením widgetu"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Nastavení"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Toto je systémová aplikace a nelze ji odinstalovat."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Složka bez názvu"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Upravit název"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> je zakázána"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="few">Aplikace <xliff:g id="APP_NAME_2">%1$s</xliff:g> má <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> oznámení</item>
@@ -79,8 +100,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Klepnutím změnu názvu uložíte"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Složka je uzavřena"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Složka přejmenována na <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Složka: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Widgety"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Složka: <xliff:g id="NAME">%1$s</xliff:g>, počet položek: <xliff:g id="SIZE">%2$d</xliff:g>"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Složka: <xliff:g id="NAME">%1$s</xliff:g>, počet položek: <xliff:g id="SIZE">%2$d</xliff:g> nebo více"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Tapety"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Styly a tapety"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Nastavení plochy"</string>
@@ -94,16 +115,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Chcete-li zobrazovat puntíky s oznámením, zapněte oznámení z aplikace <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Změnit nastavení"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Zobrazovat puntíky s oznámením"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Přidat ikonu na plochu"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Přidat na plochu ikony aplikací"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Pro nové aplikace"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Neznámé"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Odstranit"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Hledat"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Tato aplikace není nainstalována"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Aplikace pro tuto ikonu není nainstalována. Můžete ikonu odstranit nebo zkusit aplikaci vyhledat a nainstalovat ručně."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"Instalace aplikace <xliff:g id="NAME">%1$s</xliff:g>, dokončeno <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"Stahování aplikace <xliff:g id="NAME">%1$s</xliff:g> (dokončeno <xliff:g id="PROGRESS">%2$s</xliff:g>)"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"Instalace aplikace <xliff:g id="NAME">%1$s</xliff:g> čeká na zahájení"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Widgety <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Seznam widgetů"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Seznam widgetů zavřen"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Přidat na plochu"</string>
@@ -131,15 +152,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Zkratky"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Zkratky a oznámení"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Zavřít"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Zavřít"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Oznámení bylo zavřeno"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Osobní"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Pracovní"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Pracovní profil"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Zde naleznete pracovní aplikace"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Každá pracovní aplikace má odznak a je zabezpečena vaší organizací. Aplikace si můžete pro jednoduchost přesunout na plochu."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Spravováno vaší organizací"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Oznámení a aplikace jsou vypnuty"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Zavřít"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Zavřeno"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Osobní údaje jsou oddělené a jsou před pracovními aplikacemi skryty"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"K datům pracovních aplikací má přístup váš administrátor IT"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Další"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Rozumím"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Pracovní profil je pozastaven"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Pracovní aplikace vám nemohou zasílat oznámení, používat vaši baterii ani získat přístup k vaší poloze"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Pracovní profil je pozastaven. Pracovní aplikace vám nemohou zasílat oznámení, používat vaši baterii ani získat přístup k vaší poloze"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Pracovní aplikace jsou označené a viditelné vašemu administrátorovi IT"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pozastavit pracovní aplikace"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Zapnout"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtr"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Pozastavit pracovní aplikace a oznámení"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Selhalo: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index c6a96cea8b..c6496fac3d 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -56,8 +56,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Der blev ikke fundet nogen apps, som matcher \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Søg efter flere apps"</string>
     <string name="label_application" msgid="8531721983832654978">"App"</string>
-    <string name="search_corpus_apps" msgid="1917889409963779022">"Apps"</string>
-    <string name="search_action_try_now" msgid="1458737965476149074">"Prøv nu"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Notifikationer"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Hold en genvej nede for at flytte den."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Tryk to gange, og hold en genvej nede for at flytte den eller bruge tilpassede handlinger."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index a345babd5c..63e5192067 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -20,39 +20,64 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Arbeit"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"App ist nicht installiert."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"App nicht verfügbar"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Heruntergeladene App im abgesicherten Modus deaktiviert"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Widgets im abgesicherten Modus deaktiviert"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Verknüpfung nicht verfügbar"</string>
-    <string name="home_screen" msgid="806512411299847073">"Startbildschirm"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Benutzerdefinierte Aktionen"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Zum Hinzufügen Widget berühren und halten"</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Zum Hinzufügen auf Widget doppeltippen und gedrückt halten oder benutzerdefinierte Aktionen verwenden."</string>
+    <!-- no translation found for home_screen (5629429142036709174) -->
+    <skip />
+    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
+    <skip />
+    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
+    <skip />
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d breit und %2$d hoch"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Zum manuellen Hinzufügen gedrückt halten"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Automatisch hinzufügen"</string>
+    <!-- no translation found for widgets_count (656794749266073027) -->
+    <!-- no translation found for shortcuts_count (8080294865447938455) -->
+    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
+    <skip />
+    <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
+    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
+    <skip />
+    <!-- no translation found for no_widgets_available (9140948620298620513) -->
+    <skip />
+    <!-- no translation found for no_search_results (6518732304311458580) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
+    <skip />
+    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Apps finden"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Apps werden geladen…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Keine Apps für \"<xliff:g id="QUERY">%1$s</xliff:g>\" gefunden"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Weitere Apps suchen"</string>
     <string name="label_application" msgid="8531721983832654978">"App"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Benachrichtigungen"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Tippen und halten, um eine Verknüpfung auszuwählen."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Doppeltippen und halten, um eine Verknüpfung auszuwählen oder benutzerdefinierte Aktionen zu nutzen."</string>
+    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
+    <skip />
     <string name="out_of_space" msgid="4691004494942118364">"Auf diesem Startbildschirm ist kein Platz mehr vorhanden."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Ablage \"Favoriten\" ist voll."</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Liste der Apps"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Liste der privaten Apps"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Liste der geschäftlichen Apps"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Startseite"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Entfernen"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Deinstallieren"</string>
-    <string name="app_info_drop_target_label" msgid="692894985365717661">"App-Details"</string>
+    <string name="app_info_drop_target_label" msgid="692894985365717661">"App-Info"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Installieren"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"App nicht vorschlagen"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Vorgeschlagene App anpinnen"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"Verknüpfungen installieren"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Ermöglicht einer App das Hinzufügen von Verknüpfungen ohne Eingreifen des Nutzers"</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"Einstellungen und Verknüpfungen auf dem Startbildschirm lesen"</string>
@@ -63,7 +88,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Problem beim Laden des Widgets"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Einrichten"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Dies ist eine Systemanwendung, die nicht deinstalliert werden kann."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Unbenannter Ordner"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Name bearbeiten"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> deaktiviert"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, hat <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> Benachrichtigungen</item>
@@ -77,8 +102,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Neuen Namen zum Speichern antippen"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Ordner geschlossen"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Ordner umbenannt in <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Ordner: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Ordner: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> Elemente"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Ordner: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> oder mehr Elemente"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Hintergründe"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Designs und Hintergründe"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Startbildschirm-Einstellungen"</string>
@@ -92,16 +117,17 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Um dir Benachrichtigungspunkte anzeigen zu lassen, aktiviere die Benachrichtigungen für die App \"<xliff:g id="NAME">%1$s</xliff:g>\""</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Einstellungen ändern"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"App-Benachrichtigungspunkte anzeigen"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Symbol zum Startbildschirm hinzufügen"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"App-Symbole auf Startbildschirm setzen"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Bei neuen Apps"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Unbekannt"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Entfernen"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Suchen"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Diese App ist nicht installiert"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Die App für dieses Symbol ist nicht installiert. Du kannst das Symbol entfernen oder die App lokalisieren und dann manuell installieren."</string>
+    <!-- no translation found for app_installing_title (5864044122733792085) -->
+    <skip />
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> wird heruntergeladen, <xliff:g id="PROGRESS">%2$s</xliff:g> abgeschlossen"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"Warten auf Installation von <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g>-Widgets"</string>
     <string name="widgets_list" msgid="796804551140113767">"Widgetliste"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Widgetliste geschlossen"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Zum Startbildschirm hinzufügen"</string>
@@ -129,15 +155,30 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Verknüpfungen"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Verknüpfungen und Benachrichtigungen"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Schließen"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Schließen"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Benachrichtigung geschlossen"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Privat"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Geschäftlich"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Arbeitsprofil"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Hier findest du Apps für die Arbeit"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Jede App für die Arbeit ist mit einem Logo gekennzeichnet. Deine Organisation kümmert sich um den entsprechenden Schutz. Damit du leichter auf Apps zugreifen kannst, verschiebe sie auf deinen Startbildschirm."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Wird von deiner Organisation verwaltet"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Benachrichtigungen und Apps sind deaktiviert"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Schließen"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Geschlossen"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Personenbezogene Daten sind für geschäftlichen Apps nicht sichtbar oder zugänglich"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Geschäftliche Apps und Daten können von deinem IT-Administrator eingesehen werden"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Weiter"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Arbeitsprofil pausiert"</string>
+    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
+    <skip />
+    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
+    <skip />
+    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
+    <skip />
+    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
+    <skip />
+    <string name="work_switch_tip" msgid="808075064383839144">"Geschäftliche Apps und Benachrichtigungen pausieren"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Fehler: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 6ff4d7a3b4..c81b96adbb 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -56,8 +56,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Δεν βρέθηκαν εφαρμογές αντιστοίχισης για \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Αναζήτηση περισσότερων εφαρμογών"</string>
     <string name="label_application" msgid="8531721983832654978">"Εφαρμογή"</string>
-    <string name="search_corpus_apps" msgid="1917889409963779022">"Εφαρμογές"</string>
-    <string name="search_action_try_now" msgid="1458737965476149074">"Δοκιμάστε τώρα"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Ειδοποιήσεις"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Πατήστε παρατεταμένα για μετακίνηση συντόμευσης."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Πατήστε δύο φορές παρατεταμένα για μετακίνηση συντόμευσης ή χρήση προσαρμοσμένων ενεργειών."</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 261bca35b3..f26f28496b 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -56,8 +56,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"No apps found matching \'<xliff:g id="QUERY">%1$s</xliff:g>\'"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Search for more apps"</string>
     <string name="label_application" msgid="8531721983832654978">"App"</string>
-    <string name="search_corpus_apps" msgid="1917889409963779022">"Apps"</string>
-    <string name="search_action_try_now" msgid="1458737965476149074">"Try now"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Notifications"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Touch &amp; hold to move a shortcut."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Double-tap &amp; hold to move a shortcut or use custom actions."</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 261bca35b3..f26f28496b 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -56,8 +56,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"No apps found matching \'<xliff:g id="QUERY">%1$s</xliff:g>\'"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Search for more apps"</string>
     <string name="label_application" msgid="8531721983832654978">"App"</string>
-    <string name="search_corpus_apps" msgid="1917889409963779022">"Apps"</string>
-    <string name="search_action_try_now" msgid="1458737965476149074">"Try now"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Notifications"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Touch &amp; hold to move a shortcut."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Double-tap &amp; hold to move a shortcut or use custom actions."</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 261bca35b3..f26f28496b 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -56,8 +56,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"No apps found matching \'<xliff:g id="QUERY">%1$s</xliff:g>\'"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Search for more apps"</string>
     <string name="label_application" msgid="8531721983832654978">"App"</string>
-    <string name="search_corpus_apps" msgid="1917889409963779022">"Apps"</string>
-    <string name="search_action_try_now" msgid="1458737965476149074">"Try now"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Notifications"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Touch &amp; hold to move a shortcut."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Double-tap &amp; hold to move a shortcut or use custom actions."</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 261bca35b3..f26f28496b 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -56,8 +56,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"No apps found matching \'<xliff:g id="QUERY">%1$s</xliff:g>\'"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Search for more apps"</string>
     <string name="label_application" msgid="8531721983832654978">"App"</string>
-    <string name="search_corpus_apps" msgid="1917889409963779022">"Apps"</string>
-    <string name="search_action_try_now" msgid="1458737965476149074">"Try now"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Notifications"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Touch &amp; hold to move a shortcut."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Double-tap &amp; hold to move a shortcut or use custom actions."</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 9957cfcb15..b700502622 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -56,8 +56,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‏‎‎‏‏‏‏‎‏‎‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‎‏‏‏‏‎‏‎‏‎‎‎‎‎‎‏‎‏‎‎No apps found matching \"‎‏‎‎‏‏‎<xliff:g id="QUERY">%1$s</xliff:g>‎‏‎‎‏‏‏‎\"‎‏‎‎‏‎"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‎‏‎‏‏‏‏‏‎‎‎‏‎‏‎‎‏‏‏‏‏‎‎‏‏‎‏‏‏‏‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‎‏‎‎‎‎Search for more apps‎‏‎‎‏‎"</string>
     <string name="label_application" msgid="8531721983832654978">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‎‎‎‎‎‏‎‎App‎‏‎‎‏‎"</string>
-    <string name="search_corpus_apps" msgid="1917889409963779022">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‏‏‎‏‏‎‏‏‎‏‏‎‎‏‎‎‎‎‎‏‏‏‎‎‎‏‏‏‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‏‏‏‎‎Apps‎‏‎‎‏‎"</string>
-    <string name="search_action_try_now" msgid="1458737965476149074">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‏‏‏‎‎‏‏‎‏‏‎‏‏‎‎‏‎‎‏‎‏‎‎‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‎Try Now‎‏‎‎‏‎"</string>
     <string name="notifications_header" msgid="1404149926117359025">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎‏‎‏‏‎‎‏‏‏‎‏‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‏‎Notifications‎‏‎‎‏‎"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‎‎‎‎‏‏‏‎‎‏‎‏‎‏‏‏‎‏‎‏‏‏‏‎‎‎‏‏‏‎‏‎‎‏‏‎‎‏‎‎‏‎‏‏‎‏‎‏‏‎‏‎‎‏‎Touch &amp; hold to move a shortcut.‎‏‎‎‏‎"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‎‎‏‎‏‎‎‏‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‎‏‎‏‎‎‏‎‏‎‏‎‏‏‎‏‎‎‎Double-tap &amp; hold to move a shortcut or use custom actions.‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 8dfae0b6f1..acd4a4fe3a 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -56,8 +56,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"No hay apps que coincidan con \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Buscar más apps"</string>
     <string name="label_application" msgid="8531721983832654978">"App"</string>
-    <string name="search_corpus_apps" msgid="1917889409963779022">"Apps"</string>
-    <string name="search_action_try_now" msgid="1458737965476149074">"Probar ahora"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Notificaciones"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Mantén presionado para mover un acceso directo."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Presiona dos veces y mantén presionado para mover un acceso directo o usar acciones personalizadas."</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 74f4c932ff..98d970c0dd 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -26,51 +26,39 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Aplicación descargada inhabilitada en modo seguro"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Widgets inhabilitados en modo seguro"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Acceso directo no disponible"</string>
-    <!-- no translation found for home_screen (5629429142036709174) -->
-    <skip />
-    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
-    <skip />
-    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
-    <skip />
+    <string name="home_screen" msgid="5629429142036709174">"Inicio"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Pantalla dividida"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Mantén pulsado un widget para moverlo."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Toca dos veces y mantén pulsado un widget para moverlo o usar acciones personalizadas."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de ancho por %2$d de alto"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Mantenlo pulsado para añadirlo manualmente"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Añadir automáticamente"</string>
-    <!-- no translation found for widgets_count (656794749266073027) -->
-    <!-- no translation found for shortcuts_count (8080294865447938455) -->
-    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
-    <skip />
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other">Widgets: <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
+      <item quantity="one">Widget: <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g></item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other">Accesos directos: <xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g></item>
+      <item quantity="one">Acceso directo: <xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g></item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
-    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
-    <skip />
-    <!-- no translation found for no_widgets_available (9140948620298620513) -->
-    <skip />
-    <!-- no translation found for no_search_results (6518732304311458580) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
-    <skip />
-    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
-    <skip />
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Buscar"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Borrar texto del cuadro de búsqueda"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"No hay widgets disponibles"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"No hay resultados de búsqueda"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personal"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Trabajo"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Conversaciones"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Buscar aplicaciones"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Cargando aplicaciones…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"No se han encontrado aplicaciones que contengan \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Buscar más aplicaciones"</string>
     <string name="label_application" msgid="8531721983832654978">"Aplicación"</string>
-    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
-    <skip />
-    <!-- no translation found for search_action_try_now (1458737965476149074) -->
-    <skip />
     <string name="notifications_header" msgid="1404149926117359025">"Notificaciones"</string>
-    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
-    <skip />
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Mantén pulsado un acceso directo para moverlo."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Toca dos veces y mantén pulsado un acceso directo para moverlo o usar acciones personalizadas."</string>
     <string name="out_of_space" msgid="4691004494942118364">"No queda espacio en la pantalla de inicio."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"La bandeja de favoritos está completa"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista de aplicaciones"</string>
@@ -128,8 +116,7 @@
     <string name="abandoned_search" msgid="891119232568284442">"Buscar"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Esta aplicación no está instalada"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"La aplicación de este icono no está instalada. Puedes quitar el icono o buscar la aplicación e instalarla manualmente."</string>
-    <!-- no translation found for app_installing_title (5864044122733792085) -->
-    <skip />
+    <string name="app_installing_title" msgid="5864044122733792085">"Instalando <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="PROGRESS">%2$s</xliff:g> completado"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"Descargando <xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="PROGRESS">%2$s</xliff:g> completado)"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"Esperando para instalar <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Lista de widgets"</string>
@@ -169,20 +156,13 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"Siguiente"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Listo"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"El perfil de trabajo está en pausa"</string>
-    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
-    <skip />
-    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
-    <skip />
-    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
-    <skip />
-    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
-    <skip />
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Las aplicaciones de trabajo no pueden enviarte notificaciones, consumir tu batería ni acceder a tu ubicación"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"El perfil de trabajo está en pausa. Las aplicaciones de trabajo no pueden enviarte notificaciones, consumir tu batería ni acceder a tu ubicación"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Las aplicaciones de trabajo tienen una insignia y tu administrador de TI las puede ver"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Listo"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pausar aplicaciones de trabajo"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Activar"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtro"</string>
     <string name="work_switch_tip" msgid="808075064383839144">"Pausa apps y notificaciones de trabajo"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Se ha producido un error: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 1e470e15a7..08714ad143 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -20,39 +20,56 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Töö"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Rakendus pole installitud."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Rakendus ei ole saadaval"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Allalaetud rakendus on turvarežiimis keelatud"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Turvarežiimis on vidinad keelatud"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Otsetee pole saadaval"</string>
-    <string name="home_screen" msgid="806512411299847073">"Avakuva"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Kohandatud toimingud"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Vidina valimiseks vajutage ja hoidke seda all."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Topeltpuudutage ja hoidke vidina valimiseks või kohandatud toimingute kasutamiseks."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Avakuva"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Jagatud ekraanikuva"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Vidina teisaldamiseks puudutage ja hoidke all."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Vidina teisaldamiseks või kohandatud toimingute kasutamiseks topeltpuudutage ja hoidke all."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d lai ja %2$d kõrge"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Puudutage pikalt, et käsitsi asetada"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Lisa automaatselt"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidinat</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> vidin</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> otseteed</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> otsetee</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Vidinad"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Otsing"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Kustuta otsingukastis olev tekst"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Ühtki vidinat pole saadaval"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Otsingutulemused puuduvad"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Isiklik"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Töö"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Vestlused"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Otsige rakendusi"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Rakenduste laadimine …"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Päringule „<xliff:g id="QUERY">%1$s</xliff:g>” ei vastanud ükski rakendus"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Otsi rohkem rakendusi"</string>
     <string name="label_application" msgid="8531721983832654978">"Rakendus"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Märguanded"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Otsetee valimiseks puudutage seda pikalt."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Topeltpuudutage ja hoidke otsetee valimiseks või kohandatud toimingute kasutamiseks."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Otsetee teisaldamiseks puudutage ja hoidke all."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Otsetee teisaldamiseks või kohandatud toimingute kasutamiseks topeltpuudutage ja hoidke all."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Sellel avaekraanil pole enam ruumi."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Salves Lemmikud pole rohkem ruumi"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Rakenduste loend"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Isiklike rakenduste loend"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Töörakenduste loend"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Avakuva"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Eemalda"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Desinstalli"</string>
-    <string name="app_info_drop_target_label" msgid="692894985365717661">"Rakenduse teave"</string>
+    <string name="app_info_drop_target_label" msgid="692894985365717661">"Rakenduste teave"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Installimine"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Ära soovita rakendust"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Kinnita ennustus"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"installi otseteed"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Võimaldab rakendusel lisada otseteid kasutaja sekkumiseta."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"avakuva seadete ja otseteede lugemine"</string>
@@ -63,7 +80,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Probleem vidina laadimisel"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Seadistamine"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"See on süsteemirakendus ja seda ei saa desinstallida."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Nimetu kaust"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Muuda nime"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Rakendus <xliff:g id="APP_NAME">%1$s</xliff:g> on keelatud"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> märguannet</item>
@@ -77,8 +94,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Puudutage ümbernimetamise salvestamiseks"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Kaust on suletud"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Kausta uus nimi: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Kaust: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Vidinad"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Kaust: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> üksust"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Kaust: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> või rohkem üksust"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Taustapildid"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stiilid ja taustapildid"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Avakuva seaded"</string>
@@ -92,16 +109,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Märguandetäppide kuvamiseks lülitage sisse rakenduse <xliff:g id="NAME">%1$s</xliff:g> märguanded"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Seadete muutmine"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Kuva märguandetäpid"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Lisa ikoon avakuvasse"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Lisa rakenduste ikoonid avakuvale"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Uute rakenduste puhul"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Teadmata"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Eemalda"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Otsing"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"See rakendus ei ole installitud"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Selle ikooni rakendust pole installitud. Saate selle eemaldada või rakendust otsida ja käsitsi installida."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"Üksust <xliff:g id="NAME">%1$s</xliff:g> installitakse, <xliff:g id="PROGRESS">%2$s</xliff:g> on valmis"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"Rakenduse <xliff:g id="NAME">%1$s</xliff:g> allalaadimine, <xliff:g id="PROGRESS">%2$s</xliff:g> on valmis"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> on installimise ootel"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Teenuse <xliff:g id="NAME">%1$s</xliff:g> vidinad"</string>
     <string name="widgets_list" msgid="796804551140113767">"Vidinate loend"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Vidinate loend on suletud"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Lisa avakuvasse"</string>
@@ -129,15 +146,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Otseteed"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Otseteed ja märguanded"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Loobu"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Sule"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Märguandest loobuti"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Isiklik"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Töö"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Tööprofiil"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Töörakendused leiate siit"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Igal töörakendusel on märk ja teie organisatsioon tagab selle turvalisuse. Teisaldage rakendused avaekraanile, et neile oleks lihtsam juurde pääseda."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Haldab teie organisatsioon"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Märguanded ja rakendused on välja lülitatud"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Sule"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Suletud"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Isiklikke andmeid hoitakse töörakendustest eraldi"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Teie IT-administraator näeb töörakendusi ja -andmeid"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Järgmine"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Selge"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Tööprofiil on peatatud"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Töörakendused ei saa teile märguandeid saata, akut kasutada ega teie asukohale juurde pääseda"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Tööprofiil on peatatud. Töörakendused ei saa teile märguandeid saata, akut kasutada ega teie asukohale juurde pääseda"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Töörakendustel on märk ja need on teie IT-administraatorile nähtavad"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Selge"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Peata töörakendused"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Lülita sisse"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filter"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Peatage töörakendused ja märguanded"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Nurjus: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 10aebe7ad6..6774f60ee1 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -26,32 +26,50 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Deskargatutako aplikazioa modu seguruan desgaitu da"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Widgetak desgaitu egin dira modu seguruan"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Lasterbideak ez daude erabilgarri"</string>
-    <string name="home_screen" msgid="806512411299847073">"Hasierako pantaila"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Ekintza pertsonalizatuak"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Eduki sakatuta widgeta aukeratzeko."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Sakatu birritan eta eduki sakatuta widgeta aukeratzeko edo ekintza pertsonalizatuak erabiltzeko."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Hasierako pantaila"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Pantaila zatitu"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Eduki sakatuta widgeta mugitzeko."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Sakatu birritan eta eduki sakatuta widgeta mugitzeko edo ekintza pertsonalizatuak erabiltzeko."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d zabal eta %2$d luze"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Eduki sakatuta eskuz gehitzeko"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Gehitu automatikoki"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> lasterbide</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> lasterbide</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>: <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Widgetak"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Bilatu"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Garbitu bilaketa-koadroko testua"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Ez dago widget erabilgarririk"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Ez dago bilaketa-emaitzarik"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Pertsonalak"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Lanekoak"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Elkarrizketak"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Bilatu aplikazioetan"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Aplikazioak kargatzen…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Ez da aurkitu \"<xliff:g id="QUERY">%1$s</xliff:g>\" bilaketaren emaitzarik"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Bilatu aplikazio gehiago"</string>
     <string name="label_application" msgid="8531721983832654978">"Aplikazioa"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Jakinarazpenak"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Eduki sakatuta lasterbide bat aukeratzeko."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Sakatu birritan eta eduki sakatuta lasterbide bat aukeratzeko edo ekintza pertsonalizatuak erabiltzeko."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Eduki sakatuta lasterbidea mugitzeko."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Sakatu birritan eta eduki sakatuta lasterbidea mugitzeko edo ekintza pertsonalizatuak erabiltzeko."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Hasierako pantaila honetan ez dago toki gehiago."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Ez dago toki gehiago Gogokoak erretiluan"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Aplikazioen zerrenda"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Aplikazio pertsonalen zerrenda"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Laneko aplikazioen zerrenda"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Hasiera"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Kendu"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Desinstalatu"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Aplikazioaren datuak"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Instalatu"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Ez iradoki aplikazioa"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Ainguratu iragarpena"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"Instalatu lasterbideak"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Erabiltzaileak ezer egin gabe lasterbideak gehitzeko baimena ematen die aplikazioei."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"Irakurri hasierako ezarpenak eta lasterbideak"</string>
@@ -62,7 +80,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Arazo bat izan da widgeta kargatzean"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Konfigurazioa"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Sistema-aplikazioa da hau eta ezin da desinstalatu."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Izenik gabeko karpeta"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Editatu izena"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> desgaituta dago"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g> aplikazioak <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> jakinarazpen ditu</item>
@@ -71,19 +89,19 @@
     <string name="default_scroll_format" msgid="7475544710230993317">"%1$d/%2$d orria"</string>
     <string name="workspace_scroll_format" msgid="8458889198184077399">"%1$d/%2$d hasierako pantaila"</string>
     <string name="workspace_new_page" msgid="257366611030256142">"Hasierako pantailaren orri berria"</string>
-    <string name="folder_opened" msgid="94695026776264709">"Karpeta ireki da: <xliff:g id="WIDTH">%1$d</xliff:g> x <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
+    <string name="folder_opened" msgid="94695026776264709">"Karpeta ireki da: <xliff:g id="WIDTH">%1$d</xliff:g> × <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
     <string name="folder_tap_to_close" msgid="4625795376335528256">"Karpeta ixteko, sakatu hau"</string>
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Izen berria gordetzeko, sakatu hau"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Karpeta itxi da"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Karpetari <xliff:g id="NAME">%1$s</xliff:g> izena eman zaio"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Karpeta: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Widgetak"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"<xliff:g id="NAME">%1$s</xliff:g> karpeta (<xliff:g id="SIZE">%2$d</xliff:g> elementu)"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"<xliff:g id="NAME">%1$s</xliff:g> karpeta (<xliff:g id="SIZE">%2$d</xliff:g> elementu edo gehiago)"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Horma-paperak"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Estiloak eta horma-paperak"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Hasierako pantailaren ezarpenak"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Administratzaileak desgaitu du"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Eman hasierako pantaila biratzeko baimena"</string>
-    <string name="allow_rotation_desc" msgid="8662546029078692509">"Telefonoa biratzen denean"</string>
+    <string name="allow_rotation_desc" msgid="8662546029078692509">"Telefonoa biratzean"</string>
     <string name="notification_dots_title" msgid="9062440428204120317">"Jakinarazpen-biribiltxoak"</string>
     <string name="notification_dots_desc_on" msgid="1679848116452218908">"Aktibatuta"</string>
     <string name="notification_dots_desc_off" msgid="1760796511504341095">"Desaktibatuta"</string>
@@ -91,16 +109,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Jakinarazpen-biribiltxoak ikusteko, aktibatu <xliff:g id="NAME">%1$s</xliff:g> aplikazioaren jakinarazpenak"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Aldatu ezarpenak"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Erakutsi jakinarazpen-biribiltxoak"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Gehitu ikonoa hasierako pantailan"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Gehitu aplikazioen ikonoak hasierako pantailan"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Aplikazio berrien kasuan"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Ezezaguna"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Kendu"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Bilatu"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Aplikazio hau ez dago instalatuta"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Ikono honen aplikazioa ez dago instalatuta. Ikonoa ken dezakezu, edo aplikazioa bilatu eta eskuz instalatu."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> aplikazioa instalatzen, <xliff:g id="PROGRESS">%2$s</xliff:g> osatuta"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> deskargatzen, <xliff:g id="PROGRESS">%2$s</xliff:g> osatuta"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> instalatzeko zain"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> widgetak"</string>
     <string name="widgets_list" msgid="796804551140113767">"Widget-zerrenda"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Itxi da widget-zerrenda"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Gehitu hasierako pantailan"</string>
@@ -128,15 +146,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Lasterbideak"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Lasterbideak eta jakinarazpenak"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Baztertu"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Itxi"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Baztertu egin da jakinarazpena"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Pertsonalak"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Lanekoak"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Laneko profila"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Hemen dituzu laneko aplikazioak"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Laneko aplikazio bakoitzak bereizgarri bat dauka eta erakundeak babesten du. Aplikazioak errazago atzitzeko, eraman itzazu hasierako pantailara."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Erakundeak kudeatzen du"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Jakinarazpenak eta aplikazioak desaktibatuta daude"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Itxi"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Itxita"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Datu pertsonalak bananduta daude eta ez daude laneko aplikazioen artean ikusgai"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"IKT saileko administratzaileak laneko aplikazioak eta datuak ikus ditzake"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Hurrengoa"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Ados"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Laneko profila pausatuta dago"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Laneko aplikazioek ezin dute jakinarazpenik bidali, bateria erabili edo kokapena atzitu"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Laneko profila pausatuta dago. Laneko aplikazioek ezin dute jakinarazpenik bidali, bateria erabili edo kokapena atzitu"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Laneko aplikazioek bereizgarriak dituzte, eta IKT saileko administratzaileak ikus ditzake"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Ados"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pausatu laneko aplikazioak"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Aktibatu"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Iragazi"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Pausatu laneko aplikazioak eta jakinarazpenak"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Huts egin du: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 1856d2e6d7..0b3e7b0bee 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -56,8 +56,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"هیچ برنامه‌ای در مطابقت با «<xliff:g id="QUERY">%1$s</xliff:g>» پیدا نشد"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"جستجوی برنامه‌های بیشتر"</string>
     <string name="label_application" msgid="8531721983832654978">"برنامه"</string>
-    <string name="search_corpus_apps" msgid="1917889409963779022">"برنامه‌ها"</string>
-    <string name="search_action_try_now" msgid="1458737965476149074">"اکنون امتحان کنید"</string>
     <string name="notifications_header" msgid="1404149926117359025">"اعلان‌ها"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"برای جابه‌جا کردن میان‌بر، لمس کنید و نگه دارید."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"برای جابه‌جا کردن میان‌بر یا استفاده از کنش‌های سفارشی، دوضربه بزنید و نگه دارید."</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index f1a3ce25b3..2b1477c5bb 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -26,51 +26,39 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Ladattu sovellus poistettiin käytöstä suojatussa tilassa"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Widgetit poistettu käytöstä vikasietotilassa"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Pikakuvake ei ole käytettävissä."</string>
-    <!-- no translation found for home_screen (5629429142036709174) -->
-    <skip />
-    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
-    <skip />
-    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
-    <skip />
+    <string name="home_screen" msgid="5629429142036709174">"Etusivu"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Jaettu näyttö"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Kosketa pitkään, niin voit siirtää widgetiä."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Kaksoisnapauta ja paina pitkään, niin voit siirtää widgetiä tai käyttää muokattuja toimintoja."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Leveys: %1$d, korkeus: %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Sijoita manuaalisesti koskettamalla pitkään"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Lisää automaattisesti"</string>
-    <!-- no translation found for widgets_count (656794749266073027) -->
-    <!-- no translation found for shortcuts_count (8080294865447938455) -->
-    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
-    <skip />
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgetiä</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> pikakuvaketta</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> pikakuvake</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"Widgetit"</string>
-    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
-    <skip />
-    <!-- no translation found for no_widgets_available (9140948620298620513) -->
-    <skip />
-    <!-- no translation found for no_search_results (6518732304311458580) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
-    <skip />
-    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
-    <skip />
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Haku"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Tyhjennä teksti hakukentästä"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Ei widgetejä käytettävissä"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Ei hakutuloksia"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Henkilökohtainen"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Työ"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Keskustelut"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Hae sovelluksia"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Ladataan sovelluksia…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"<xliff:g id="QUERY">%1$s</xliff:g> ei palauttanut sovelluksia."</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Hae lisää sovelluksia"</string>
     <string name="label_application" msgid="8531721983832654978">"Sovellus"</string>
-    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
-    <skip />
-    <!-- no translation found for search_action_try_now (1458737965476149074) -->
-    <skip />
     <string name="notifications_header" msgid="1404149926117359025">"Ilmoitukset"</string>
-    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
-    <skip />
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Kosketa pitkään, niin voit siirtää pikakuvaketta."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Kaksoisnapauta ja paina pitkään, niin voit siirtää pikakuvaketta tai käyttää muokattuja toimintoja."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Tässä aloitusruudussa ei ole enää tilaa."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Suosikit-valikossa ei ole enää tilaa"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Sovellusluettelo"</string>
@@ -128,8 +116,7 @@
     <string name="abandoned_search" msgid="891119232568284442">"Haku"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Sovellusta ei ole asennettu"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Kuvakkeen sovellusta ei ole asennettu. Voit poistaa kuvakkeen tai etsiä sovelluksen ja asentaa sen manuaalisesti."</string>
-    <!-- no translation found for app_installing_title (5864044122733792085) -->
-    <skip />
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> asennetaan, <xliff:g id="PROGRESS">%2$s</xliff:g> valmis"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> latautuu, valmiina <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> odottaa asennusta"</string>
     <string name="widgets_list" msgid="796804551140113767">"Widget-luettelo"</string>
@@ -169,20 +156,13 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"Seuraava"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Selvä"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"Työprofiilin käyttö on keskeytetty"</string>
-    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
-    <skip />
-    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
-    <skip />
-    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
-    <skip />
-    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
-    <skip />
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Työsovellukset eivät voi lähettää sinulle ilmoituksia eivätkä käyttää akkuasi tai paikantaa sijaintiasi"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Työprofiilin käyttö on keskeytetty. Työsovellukset eivät voi lähettää sinulle ilmoituksia eivätkä käyttää akkuasi tai paikantaa sijaintiasi"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Työsovellukset on merkitty ja ne näkyvät IT-järjestelmänvalvojalle"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Keskeytä työsovellusten käyttö"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Laita päälle"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Suodatin"</string>
     <string name="work_switch_tip" msgid="808075064383839144">"Keskeytä työsovellukset ja ‑ilmoitukset"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Epäonnistui: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index bf23b3367f..34fcb367f4 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -56,8 +56,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Aucune application trouvée correspondant à « <xliff:g id="QUERY">%1$s</xliff:g> »"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Rechercher plus d\'applications"</string>
     <string name="label_application" msgid="8531721983832654978">"Application"</string>
-    <string name="search_corpus_apps" msgid="1917889409963779022">"Applications"</string>
-    <string name="search_action_try_now" msgid="1458737965476149074">"Essayer maintenant"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Notifications"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Maintenez le doigt sur un raccourci pour le déplacer."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Touchez deux fois un raccourci et maintenez le doigt dessus pour le déplacer ou utiliser des actions personnalisées."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 65db47e8a7..ee41e87152 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -20,38 +20,64 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="work_folder_name" msgid="3753320833950115786">"Android Work"</string>
+    <string name="work_folder_name" msgid="3753320833950115786">"Travail"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"L\'application n\'est pas installée."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Application indisponible"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"L\'application téléchargée est désactivée en mode sécurisé."</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Les widgets sont désactivés en mode sécurisé."</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Raccourci non disponible"</string>
-    <string name="home_screen" msgid="806512411299847073">"Écran d\'accueil"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Actions personnalisées"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"App. de manière prolongée pour sélectionner widget."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Appuyez 2 fois et maintenez la pression pour sélectionner widget ou utilisez actions personnalisées."</string>
+    <!-- no translation found for home_screen (5629429142036709174) -->
+    <skip />
+    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
+    <skip />
+    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
+    <skip />
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d x %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de largeur et %2$d de hauteur"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Appuyez de manière prolongée pour placer l\'élément manuellement."</string>
     <string name="place_automatically" msgid="8064208734425456485">"Ajouter automatiquement"</string>
+    <!-- no translation found for widgets_count (656794749266073027) -->
+    <!-- no translation found for shortcuts_count (8080294865447938455) -->
+    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
+    <skip />
+    <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
+    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
+    <skip />
+    <!-- no translation found for no_widgets_available (9140948620298620513) -->
+    <skip />
+    <!-- no translation found for no_search_results (6518732304311458580) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
+    <skip />
+    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Rechercher dans les applications"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Chargement des applications…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Aucune application ne correspond à la requête \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Rechercher plus d\'applications"</string>
     <string name="label_application" msgid="8531721983832654978">"Application"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Notifications"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Appui prolongé pour sélectionner un raccourci."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Appuyez 2X et maintenez la pression pour choisir un raccourci ou utilisez les actions personnalisées"</string>
+    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
+    <skip />
     <string name="out_of_space" msgid="4691004494942118364">"Pas d\'espace libre sur cet écran d\'accueil."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Plus d\'espace disponible dans la zone de favoris."</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Liste d\'applications"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Liste des applications personnelles"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Liste des applications professionnelles"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Accueil"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Supprimer"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Désinstaller"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Infos sur l\'appli"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Installer"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Ne pas suggérer d\'application"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Épingler la prédiction"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"installer des raccourcis"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Permettre à une application d\'ajouter des raccourcis sans l\'intervention de l\'utilisateur"</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"lire les paramètres et les raccourcis de l\'écran d\'accueil"</string>
@@ -62,7 +88,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Problème lors du chargement du widget."</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Configuration"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Impossible de désinstaller cette application, car il s\'agit d\'une application système."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Dossier sans nom"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Modifier le nom"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> est désactivé."</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="one"><xliff:g id="APP_NAME_2">%1$s</xliff:g> comporte <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> notification</item>
@@ -76,11 +102,11 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Appuyez pour enregistrer le nouveau nom du dossier."</string>
     <string name="folder_closed" msgid="4100806530910930934">"Dossier fermé"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Nouveau nom du dossier : <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Dossier \"<xliff:g id="NAME">%1$s</xliff:g>\""</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Dossier : <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> éléments"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Dossier : <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> éléments ou plus"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fonds d\'écran"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Styles et fonds d\'écran"</string>
-    <string name="settings_button_text" msgid="8873672322605444408">"Paramètres d\'écran d\'accueil"</string>
+    <string name="settings_button_text" msgid="8873672322605444408">"Paramètres d\'accueil"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Désactivé par votre administrateur"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Autoriser la rotation de l\'écran d\'accueil"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"Lorsque vous faites pivoter le téléphone"</string>
@@ -91,16 +117,17 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Pour afficher les pastilles de notification, activez les notifications de l\'application <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Modifier les paramètres"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Afficher les pastilles de notification"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Ajouter l\'icône à l\'écran d\'accueil"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Ajouter icônes d\'applis à l\'écran d\'acc."</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Pour les nouvelles applications"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Inconnu"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Supprimer"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Rechercher"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Cette application n\'est pas installée"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"L\'application correspondant à cette icône n\'est pas installée. Vous pouvez supprimer cette dernière, ou essayer de rechercher l\'application et de l\'installer manuellement."</string>
+    <!-- no translation found for app_installing_title (5864044122733792085) -->
+    <skip />
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> en cours de téléchargement, <xliff:g id="PROGRESS">%2$s</xliff:g> effectué(s)"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> en attente d\'installation"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Widgets <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Liste des widgets"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"La liste des widgets est fermée"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Ajouter à l\'écran d\'accueil"</string>
@@ -128,15 +155,30 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Raccourcis"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Raccourcis et notifications"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Ignorer"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Fermer"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Notification ignorée"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personnelles"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Professionnelles"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profil professionnel"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Retrouvez ici vos applications professionnelles"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Les applications professionnelles sont accompagnées d\'un badge et sont sécurisées par votre organisation. Vous pouvez les déplacer vers votre écran d\'accueil pour y accéder plus facilement."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Géré par votre organisation"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Notifications et applications désactivées"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Fermer"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Fermé"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Les applications professionnelles n\'ont pas accès aux données personnelles"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Votre administrateur informatique a accès à vos applications et données professionnelles"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Suivant"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Profil professionnel en pause"</string>
+    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
+    <skip />
+    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
+    <skip />
+    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
+    <skip />
+    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
+    <skip />
+    <string name="work_switch_tip" msgid="808075064383839144">"Mettre en pause vos applications et notifications professionnelles"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Échec : <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index e994f992aa..7d65a14957 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -26,51 +26,39 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"A aplicación que descargaches está desactivada no modo seguro"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Os widgets están desactivados no modo seguro"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"O atallo non está dispoñible"</string>
-    <!-- no translation found for home_screen (5629429142036709174) -->
-    <skip />
-    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
-    <skip />
-    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
-    <skip />
+    <string name="home_screen" msgid="5629429142036709174">"Inicio"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Dividir pantalla"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Mantén premido un widget para movelo."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Toca dúas veces un widget e manteno premido para movelo ou utiliza accións personalizadas."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de largo por %2$d de alto"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Mantén premido o elemento para colocalo manualmente"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Engadir automaticamente"</string>
-    <!-- no translation found for widgets_count (656794749266073027) -->
-    <!-- no translation found for shortcuts_count (8080294865447938455) -->
-    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
-    <skip />
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> atallos</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> atallo</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
-    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
-    <skip />
-    <!-- no translation found for no_widgets_available (9140948620298620513) -->
-    <skip />
-    <!-- no translation found for no_search_results (6518732304311458580) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
-    <skip />
-    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
-    <skip />
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Busca Widgets"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Borrar texto da caixa de busca"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Non hai widgets dispoñibles"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Non hai resultados da busca"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Widgets persoais"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Widgets do traballo"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Conversas"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Buscar aplicacións"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Cargando aplicacións…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Non se atoparon aplicacións que coincidan con \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Buscar máis aplicacións"</string>
     <string name="label_application" msgid="8531721983832654978">"Aplicación"</string>
-    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
-    <skip />
-    <!-- no translation found for search_action_try_now (1458737965476149074) -->
-    <skip />
     <string name="notifications_header" msgid="1404149926117359025">"Notificacións"</string>
-    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
-    <skip />
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Mantén premido un atallo para movelo."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Toca dúas veces un atallo e manteno premido para movelo ou utiliza accións personalizadas."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Non hai máis espazo nesta pantalla de inicio."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Non hai máis espazo na bandexa de favoritos"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista de aplicacións"</string>
@@ -128,8 +116,7 @@
     <string name="abandoned_search" msgid="891119232568284442">"Buscar"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Esta aplicación non está instalada"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"A aplicación para esta icona non está instalada. Podes quitala ou buscar a aplicación e instalala manualmente."</string>
-    <!-- no translation found for app_installing_title (5864044122733792085) -->
-    <skip />
+    <string name="app_installing_title" msgid="5864044122733792085">"Instalando <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="PROGRESS">%2$s</xliff:g> completado"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"Descargando <xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="PROGRESS">%2$s</xliff:g> completado)"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"Esperando para instalar <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Lista de widgets"</string>
@@ -169,20 +156,13 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"Seguinte"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Entendido"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"O perfil de traballo está en pausa"</string>
-    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
-    <skip />
-    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
-    <skip />
-    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
-    <skip />
-    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
-    <skip />
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"As aplicacións do traballo non poden enviarche notificacións, utilizar a batería nin acceder á túa localización"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"O perfil de traballo está en pausa. As aplicacións do traballo non poden enviarche notificacións, utilizar a batería nin acceder á túa localización"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"O administrador de TI pode ver as aplicacións do traballo e engadirlles indicadores"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Entendido"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pór en pausa aplicacións do traballo"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Activar"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtra"</string>
     <string name="work_switch_tip" msgid="808075064383839144">"Pon en pausa as aplicacións e as notificacións do traballo"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Erro: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 84fe49c79c..4cf3dc9b34 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -62,11 +62,7 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\"થી મેળ ખાતી કોઈ ઍપ્લિકેશનો મળી નથી"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"વધુ ઍપ્લિકેશનો શોધો"</string>
     <string name="label_application" msgid="8531721983832654978">"ઍપ"</string>
-    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
-    <skip />
-    <!-- no translation found for search_action_try_now (1458737965476149074) -->
-    <skip />
-    <string name="notifications_header" msgid="1404149926117359025">"નોટિફિકેશનો"</string>
+    <string name="notifications_header" msgid="1404149926117359025">"નોટિફિકેશન"</string>
     <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
     <skip />
     <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 8fa02c0165..a10b42d923 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -20,38 +20,64 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="work_folder_name" msgid="3753320833950115786">"कार्यस्‍थल"</string>
+    <string name="work_folder_name" msgid="3753320833950115786">"दफ़्तर"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"ऐप्‍लिकेशन इंस्‍टॉल नहीं है."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"ऐप्लिकेशन उपलब्ध नहीं है"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"डाउनलोड किए गए ऐप्लिकेशन सुरक्षित मोड में अक्षम है"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"विजेट सुरक्षित मोड में अक्षम हैं"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"शॉर्टकट उपलब्ध नहीं है"</string>
-    <string name="home_screen" msgid="806512411299847073">"होम स्क्रीन"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"कस्टम कार्रवाइयां"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"विजेट को चुनने के लिए दबाकर रखें"</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"कोई विजेट चुनने के लिए दो बार छूएं और दबाये रखें या अपने मुताबिक कार्रवाइयां चुनें."</string>
+    <!-- no translation found for home_screen (5629429142036709174) -->
+    <skip />
+    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
+    <skip />
+    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
+    <skip />
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d चौड़ाई गुणा %2$d ऊंचाई"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"खुद जोड़ने के लिए दबाकर रखें"</string>
     <string name="place_automatically" msgid="8064208734425456485">"अपने आप जोड़ें"</string>
+    <!-- no translation found for widgets_count (656794749266073027) -->
+    <!-- no translation found for shortcuts_count (8080294865447938455) -->
+    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
+    <skip />
+    <string name="widget_button_text" msgid="2880537293434387943">"विजेट"</string>
+    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
+    <skip />
+    <!-- no translation found for no_widgets_available (9140948620298620513) -->
+    <skip />
+    <!-- no translation found for no_search_results (6518732304311458580) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
+    <skip />
+    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ऐप सर्च करें"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ऐप्लिकेशन लोड हो रहे हैं…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" से मिलता-जुलता कोई ऐप्लिकेशन नहीं मिला"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"और ऐप सर्च करें"</string>
     <string name="label_application" msgid="8531721983832654978">"ऐप्लिकेशन"</string>
     <string name="notifications_header" msgid="1404149926117359025">"सूचनाएं"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"शॉर्टकट चुनने के लिए दबाकर रखें."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"शॉर्टकट चुनने या पसंद के मुताबिक कार्रवाई करने के लिए दो बार टैप करें और कुछ देर दबाए रखें."</string>
+    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
+    <skip />
     <string name="out_of_space" msgid="4691004494942118364">"इस होम स्‍क्रीन पर जगह नहीं बची है"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"पसंदीदा ट्रे में और जगह नहीं है"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ऐप्लिकेशन सूची"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"निजी ऐप्लिकेशन की सूची"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"काम से जुड़े ऐप्लिकेशन की सूची"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"होम पेज"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"निकालें"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"अनइंस्टॉल करें"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"ऐप्लिकेशन की जानकारी"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"इंस्‍टॉल करें"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"ऐप्लिकेशन का सुझाव न दें"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"सुझाए गए ऐप्लिकेशन को पिन करें"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"शॉर्टकट इंस्‍टॉल करें"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"ऐप को उपयोगकर्ता के हस्‍तक्षेप के बिना शॉर्टकट जोड़ने देती है."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"होम पेज की सेटिंग और शॉर्टकट पढ़ें"</string>
@@ -62,7 +88,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"विजेट लोड करने में समस्‍या"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"सेटअप"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"यह एक सिस्टम ऐप्लिकेशन है और इसे अनइंस्टॉल नहीं किया जा सकता."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"अनामित फ़ोल्डर"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"नाम में बदलाव करें"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> अक्षम है"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="one"><xliff:g id="APP_NAME_2">%1$s</xliff:g> की <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> सूचना है</item>
@@ -76,8 +102,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"नाम बदलना सहेजने के लिए टैप करें"</string>
     <string name="folder_closed" msgid="4100806530910930934">"फ़ोल्डर बंद किया गया"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"फ़ोल्डर का नाम बदलकर <xliff:g id="NAME">%1$s</xliff:g> किया गया"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"फ़ोल्डर: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"विजेट"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"फ़ोल्डर: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> आइटम"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"फ़ोल्डर: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> या इससे ज़्यादा आइटम"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"वॉलपेपर"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"स्टाइल और वॉलपेपर"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"होम पेज की सेटिंग"</string>
@@ -91,16 +117,17 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"सूचना बिंदु दिखाने के लिए, <xliff:g id="NAME">%1$s</xliff:g> के ऐप्लिकेशन सूचना चालू करें"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"सेटिंग बदलें"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"नई सूचनाएं बताने वाला गोल निशान दिखाएं"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"होम स्क्रीन में आइकॉन जोड़ें"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"होम स्क्रीन पर ऐप्लिकेशन के आइकॉन जोड़ें"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"नए ऐप्लिकेशन के लिए"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"अज्ञात"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"निकालें"</string>
-    <string name="abandoned_search" msgid="891119232568284442">"सर्च करें"</string>
+    <string name="abandoned_search" msgid="891119232568284442">"खोजें"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"यह ऐप्लिकेशन इंस्टॉल नहीं है"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"इस आइकॉन का ऐप इंस्टॉल नहीं है. आप उसे निकाल सकते हैं या ऐप को खोज कर उसे मैन्युअल रूप से इंस्टॉल कर सकते हैं."</string>
+    <!-- no translation found for app_installing_title (5864044122733792085) -->
+    <skip />
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> डाउनलोड हो रहा है, <xliff:g id="PROGRESS">%2$s</xliff:g> पूरी हुई"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> के इंस्टॉल होने की प्रतीक्षा की जा रही है"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> विजेट"</string>
     <string name="widgets_list" msgid="796804551140113767">"विजेट की सूची"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"विजेट की सूची बंद हो गई है"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"होम स्‍क्रीन में जोड़ें"</string>
@@ -128,15 +155,30 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"शॉर्टकट"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"शॉर्टकट और सूचनाएं"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"खारिज करें"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"बंद करें"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"सूचना को खारिज किया गया"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"निजी ऐप"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"काम से जुड़े ऐप"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"वर्क प्रोफ़ाइल"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"काम से जुड़े सभी ऐप्लिकेशन यहां पाएं"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"काम से जुड़े हर ऐप्लिकेशन पर एक बैज (निशान) होता है और इन ऐप्लिकेशन की सुरक्षा आपका संगठन करता है. आसानी से इस्तेमाल करने के लिए ऐप्लिकेशन को अपनी होम स्क्रीन पर ले जाएं."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"आपका संगठन प्रबंधित कर रहा है"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"सूचनाएं और ऐप्लिकेशन बंद हैं"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"बंद करें"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"बंद कर दिया गया"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"निजी डेटा को अलग रखा जाता है. साथ ही, ऑफ़िस के काम से जुड़े ऐप्लिकेशन से छिपा कर रखा जाता है"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन और डेटा, आपके आईटी एडमिन को दिखते हैं"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"आगे बढ़ें"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"ठीक है"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"वर्क प्रोफ़ाइल रोक दी गई है"</string>
+    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
+    <skip />
+    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
+    <skip />
+    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
+    <skip />
+    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
+    <skip />
+    <string name="work_switch_tip" msgid="808075064383839144">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन और सूचनाएं रोकें"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"पूरा नहीं हुआ: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 9923cea975..7589ea87bb 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -26,51 +26,41 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Preuzeta aplikacija onemogućena je u Sigurnom načinu rada"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Widgeti su onemogućeni u Sigurnom načinu rada"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Prečac nije dostupan"</string>
-    <!-- no translation found for home_screen (5629429142036709174) -->
-    <skip />
-    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
-    <skip />
-    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
-    <skip />
+    <string name="home_screen" msgid="5629429142036709174">"Početni zaslon"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Podijeljeni zaslon"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Dodirnite i zadržite da biste premjestili widget."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvaput dodirnite i zadržite pritisak da biste premjestili widget ili upotrijebite prilagođene radnje"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d širine i %2$d visine"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Dodirnite i zadržite stavku da biste je postavili ručno"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Dodaj automatski"</string>
-    <!-- no translation found for widgets_count (656794749266073027) -->
-    <!-- no translation found for shortcuts_count (8080294865447938455) -->
-    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
-    <skip />
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
+      <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgeta</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgeta</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> prečac</item>
+      <item quantity="few"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> prečaca</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> prečaca</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"Widgeti"</string>
-    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
-    <skip />
-    <!-- no translation found for no_widgets_available (9140948620298620513) -->
-    <skip />
-    <!-- no translation found for no_search_results (6518732304311458580) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
-    <skip />
-    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
-    <skip />
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Pretražite"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Izbrišite tekst iz okvira za pretraživanje"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Nije dostupan nijedan widget"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Nema rezultata pretraživanja"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Osobno"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Posao"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Razgovori"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Pretraži aplikacije"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Učitavanje aplikacija…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nema aplikacija podudarnih s upitom \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Traži više aplikacija"</string>
     <string name="label_application" msgid="8531721983832654978">"Aplikacija"</string>
-    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
-    <skip />
-    <!-- no translation found for search_action_try_now (1458737965476149074) -->
-    <skip />
     <string name="notifications_header" msgid="1404149926117359025">"Obavijesti"</string>
-    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
-    <skip />
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Dodirnite i zadržite da biste premjestili prečac."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dvaput dodirnite i zadržite pritisak da biste premjestili prečac ili upotrijebite prilagođene radnje."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Na ovom početnom zaslonu više nema mjesta."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Nema više prostora na traci Favoriti"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Popis aplikacija"</string>
@@ -129,8 +119,7 @@
     <string name="abandoned_search" msgid="891119232568284442">"Traži"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Ta aplikacija nije instalirana"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Aplikacija ove ikone nije instalirana. Možete je ukloniti ili potražiti aplikaciju i instalirati je ručno."</string>
-    <!-- no translation found for app_installing_title (5864044122733792085) -->
-    <skip />
+    <string name="app_installing_title" msgid="5864044122733792085">"Instaliranje aplikacije <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="PROGRESS">%2$s</xliff:g> dovršeno"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"Preuzimanje aplikacije <xliff:g id="NAME">%1$s</xliff:g>, dovršeno <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"Čekanje na instaliranje aplikacije <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Popis widgeta"</string>
@@ -170,20 +159,13 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"Dalje"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Shvaćam"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"Poslovni profil je pauziran"</string>
-    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
-    <skip />
-    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
-    <skip />
-    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
-    <skip />
-    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
-    <skip />
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Poslovne aplikacije ne mogu vam slati obavijesti, trošiti bateriju niti pristupiti vašoj lokaciji"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Poslovni profil je pauziran. Poslovne aplikacije ne mogu vam slati obavijesti, trošiti bateriju niti pristupiti vašoj lokaciji"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Poslovne su aplikacije označene i vidljive vašem IT administratoru"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Shvaćam"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pauziraj poslovne aplikacije"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Uključi"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtrirajte"</string>
     <string name="work_switch_tip" msgid="808075064383839144">"Pauzirajte poslovne aplikacije i obavijesti"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Nije uspjelo: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 3327590a45..d0aea228bb 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -20,39 +20,56 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Munka"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Az alkalmazás nincs telepítve."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Az alkalmazás nem érhető el"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"A letöltött alkalmazás Csökkentett módban ki van kapcsolva"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"A modulok ki vannak kapcsolva Csökkentett módban"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"A gyorsparancs nem áll rendelkezésre"</string>
-    <string name="home_screen" msgid="806512411299847073">"Kezdőképernyő"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Egyéni műveletek"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Modul felvételéhez érintse meg, és tartsa lenyomva"</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Modul mozgatásához koppintson rá duplán és tartsa lenyomva, vagy használjon egyéni műveleteket."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Kezdőképernyő"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Osztott képernyő"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Tartsa lenyomva a modult az áthelyezéshez."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Modul áthelyezéséhez koppintson duplán, tartsa nyomva az ujját, vagy használjon egyéni műveleteket."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d széles és %2$d magas"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Tartsa lenyomva a manuális hozzáadáshoz"</string>
+    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Tartsd lenyomva a manuális hozzáadáshoz"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Automatikus hozzáadás"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> modul</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> modul</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> parancsikon</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> parancsikon</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Modulok"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Keresés"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Keresőmezőben lévő szöveg törlése"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Nincs rendelkezésre álló modul"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Nincsenek keresési találatok"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Személyes"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Munka"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Beszélgetések"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Alkalmazások keresése"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Alkalmazások betöltése…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nem található alkalmazás a(z) „<xliff:g id="QUERY">%1$s</xliff:g>” lekérdezésre"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"További alkalmazások keresése"</string>
     <string name="label_application" msgid="8531721983832654978">"Alkalmazás"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Értesítések"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Felvételhez tartsa nyomva a parancsikont."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Parancsikon felvételéhez koppintson rá duplán és tartsa nyomva, vagy használjon egyéni műveleteket."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Tartsa lenyomva a parancsikont az áthelyezéshez."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Parancsikon áthelyezéséhez koppintson duplán, és tartsa nyomva az ujját, vagy használjon egyéni műveleteket."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Nincs több hely ezen a kezdőképernyőn."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Nincs több hely a Kedvencek tálcán"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Alkalmazások listája"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Személyes alkalmazások listája"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Munkahelyi alkalmazások listája"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Főoldal"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Törlés"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Eltávolítás"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Alkalmazásinformáció"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Telepítés"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Ne javasoljon alkalmazást"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Várható kitűzése"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"parancsikonok telepítése"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Lehetővé teszi egy alkalmazás számára, hogy felhasználói beavatkozás nélkül adjon hozzá parancsikonokat."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"Főoldal beállításainak és parancsikonjainak beolvasása"</string>
@@ -63,7 +80,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Probléma történt a modul betöltésekor"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Beállítás"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Ez egy rendszeralkalmazás, és nem lehet eltávolítani."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Névtelen mappa"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Név módosítása"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"A(z) <xliff:g id="APP_NAME">%1$s</xliff:g> letiltva"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other">A(z) <xliff:g id="APP_NAME_2">%1$s</xliff:g> <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> értesítéssel rendelkezik</item>
@@ -77,11 +94,11 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Koppintson ide az átnevezés mentéséhez"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Mappa lezárva"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"A mappa új neve: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Mappa: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Modulok"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Mappa: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elem"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Mappa: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> vagy több elem"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Háttérképek"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stílusok és háttérképek"</string>
-    <string name="settings_button_text" msgid="8873672322605444408">"Kezdőoldal beállításai"</string>
+    <string name="settings_button_text" msgid="8873672322605444408">"Kezdőképernyő beállításai"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"A rendszergazda letiltotta"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"A kezdőképernyő elforgatásának engedélyezése"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"A telefon elforgatásakor"</string>
@@ -92,16 +109,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Az értesítési pöttyök megjelenítéséhez kapcsolja be a(z) <xliff:g id="NAME">%1$s</xliff:g> alkalmazás értesítéseit"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Beállítások módosítása"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Értesítési pöttyök megjelenítése"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Ikon hozzáadása a kezdőképernyőhöz"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Appikonok hozzáadása a kezdőképernyőhöz"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Új alkalmazásoknál"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Ismeretlen"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Törlés"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Keresés"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Az alkalmazás nincs telepítve"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Az ikonhoz tartozó alkalmazás nincs telepítve. Törölheti az ikont, vagy az alkalmazás megkeresése után manuálisan telepítheti azt."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"Folyamatban van a(z) <xliff:g id="NAME">%1$s</xliff:g> telepítése, <xliff:g id="PROGRESS">%2$s</xliff:g> kész"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"A(z) <xliff:g id="NAME">%1$s</xliff:g> letöltése, <xliff:g id="PROGRESS">%2$s</xliff:g> kész"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"A(z) <xliff:g id="NAME">%1$s</xliff:g> telepítésre vár"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g>-modulok"</string>
     <string name="widgets_list" msgid="796804551140113767">"Widgetlista"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Widgetlista bezárva"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Hozzáadás a kezdőképernyőhöz"</string>
@@ -129,15 +146,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Gyorsparancsok"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Parancsikonok és értesítések"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Elvetés"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Bezárás"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Értesítés elvetve"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Személyes"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Munkahelyi"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Munkaprofil"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Itt kereshet munkahelyi alkalmazásokat"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"A munkahelyi alkalmazásoknál jelvény található, és biztonságukról az Ön szervezete gondoskodik. A könnyebb hozzáférés érdekében helyezze át az alkalmazásokat a kezdőképernyőre."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Az Ön szervezete kezeli"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Az értesítések és az alkalmazások ki vannak kapcsolva"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Bezárás"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Bezárva"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"A személyes adatok el vannak különítve a munkahelyi alkalmazásoktól, amelyek nem is látják őket"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"A munkahelyi alkalmazásokat és adatokat látja a rendszergazda"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Tovább"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Értem"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"A munkaprofil használata szünetel"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"A munkahelyi alkalmazások nem küldhetnek értesítéseket, nem használhatják az akkumulátort, és nem férhetnek hozzá az Ön tartózkodási helyéhez."</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"A munkaprofil szüneteltetve van. A munkahelyi alkalmazások nem küldhetnek értesítéseket, nem használhatják az akkumulátort, és nem férhetnek hozzá az Ön tartózkodási helyéhez."</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"A munkahelyi alkalmazások jelvénnyel vannak megjelölve, és láthatók a rendszergazda számára"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Értem"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Munkahelyi alkalmazások szüneteltetése"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Bekapcsolás"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Szűrő"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Munkahelyi alkalmazások és értesítések szüneteltetése"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Sikertelen: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index c7e7260a61..fbbcf1c5b7 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -56,8 +56,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"«<xliff:g id="QUERY">%1$s</xliff:g>» հարցմանը համապատասխանող հավելվածներ չեն գտնվել"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Որոնել այլ հավելվածներ"</string>
     <string name="label_application" msgid="8531721983832654978">"Հավելված"</string>
-    <string name="search_corpus_apps" msgid="1917889409963779022">"Հավելվածներ"</string>
-    <string name="search_action_try_now" msgid="1458737965476149074">"Փորձել"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Ծանուցումներ"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Հպեք և պահեք՝ դյուրանցում տեղափոխելու համար։"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Կրկնակի հպեք և պահեք՝ դյուրանցում տեղափոխելու համար, կամ օգտվեք հատուկ գործողություններից։"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 92c7accaa8..7bc91c2a77 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -26,32 +26,50 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Aplikasi yang didownload dinonaktifkan dalam mode Aman"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Widget dinonaktifkan dalam mode Aman"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Pintasan tidak tersedia"</string>
-    <string name="home_screen" msgid="806512411299847073">"Layar utama"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Tindakan khusus"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Sentuh lama untuk memilih widget."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Ketuk dua kali &amp; tahan untuk mengambil widget atau menggunakan tindakan khusus."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Layar utama"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Layar terpisah"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Sentuh lama untuk memindahkan widget."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Ketuk dua kali &amp; tahan untuk memindahkan widget atau gunakan tindakan khusus."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"lebar %1$d x tinggi %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Sentuh lama untuk menempatkan secara manual"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Tambahkan otomatis"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> pintasan</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> pintasan</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Widget"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Telusuri"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Hapus teks dari kotak penelusuran"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Widget tidak tersedia"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Tidak ada hasil penelusuran"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Pribadi"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Kantor"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Percakapan"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Telusuri aplikasi"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Memuat aplikasi…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Tidak ditemukan aplikasi yang cocok dengan \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Telusuri aplikasi lainnya"</string>
     <string name="label_application" msgid="8531721983832654978">"Aplikasi"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Notifikasi"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Sentuh lama untuk memilih pintasan."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Ketuk dua kali &amp; tahan untuk memilih pintasan atau menggunakan tindakan khusus."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Sentuh lama untuk memindahkan pintasan."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Ketuk dua kali &amp; tahan untuk memindahkan pintasan atau gunakan tindakan khusus."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Tidak ada ruang lagi pada layar Utama ini."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Tidak ada ruang tersisa di baki Favorit"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Daftar aplikasi"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Daftar aplikasi pribadi"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Daftar aplikasi kantor"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Layar Utama"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Hapus"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Uninstal"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Info aplikasi"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Instal"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Jangan sarankan aplikasi"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Pin Prediksi"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"memasang pintasan"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Mengizinkan aplikasi menambahkan pintasan tanpa campur tangan pengguna."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"membaca setelan dan pintasan layar Utama"</string>
@@ -62,7 +80,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Masalah memuat widget"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Siapkan"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Ini adalah aplikasi sistem dan tidak dapat dicopot pemasangannya."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Folder Tanpa Nama"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Sunting Nama"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> dinonaktifkan"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, memiliki <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> notifikasi</item>
@@ -76,8 +94,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Ketuk untuk menyimpan ganti nama"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Folder ditutup"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Folder diganti namanya menjadi <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Folder: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Widget"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> item"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> item atau lebih"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Wallpaper"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Gaya &amp; wallpaper"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Setelan layar utama"</string>
@@ -91,16 +109,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Guna menampilkan Titik Notifikasi, aktifkan notifikasi aplikasi untuk <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Ubah setelan"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Tampilkan titik notifikasi"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Tambahkan ikon ke Layar utama"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Tambahkan ikon aplikasi ke Layar utama"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Untuk aplikasi baru"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Tidak dikenal"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Buang"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Telusuri"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Aplikasi ini belum terpasang"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Aplikasi untuk ikon ini belum dipasang. Anda dapat membuangnya, atau menelusuri aplikasi dan memasangnya secara manual."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> sedang diinstal, <xliff:g id="PROGRESS">%2$s</xliff:g> selesai"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> sedang didownload, <xliff:g id="PROGRESS">%2$s</xliff:g> selesai"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> menunggu dipasang"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Widget <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Daftar widget"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Daftar widget ditutup"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Tambahkan ke Layar Utama"</string>
@@ -128,15 +146,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Pintasan"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Pintasan dan notifikasi"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Tutup"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Tutup"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Notifikasi ditutup"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Pribadi"</string>
-    <string name="all_apps_work_tab" msgid="4884822796154055118">"Kantor"</string>
+    <string name="all_apps_work_tab" msgid="4884822796154055118">"Kerja"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profil kerja"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Temukan aplikasi kerja di sini"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Setiap aplikasi kerja memiliki badge dan dibuat tetap aman oleh organisasi. Pindahkan aplikasi ke Layar utama untuk memudahkan akses."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Dikelola oleh organisasi"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Notifikasi dan aplikasi nonaktif"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Tutup"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Ditutup"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Data pribadi terpisah &amp; tersembunyi dari aplikasi kerja"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Aplikasi &amp; data kerja terlihat oleh admin IT"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Berikutnya"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Oke"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Profil kerja dijeda"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Aplikasi kerja tidak dapat mengirimi Anda notifikasi, menggunakan baterai, atau mengakses lokasi Anda"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Profil kerja dijeda. Aplikasi kerja tidak dapat mengirimi Anda notifikasi, menggunakan baterai, atau mengakses lokasi Anda"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Aplikasi kerja diberi badge dan terlihat oleh admin IT"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Oke"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Jeda aplikasi kerja"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Aktifkan"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filter"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Jeda notifikasi dan aplikasi kerja"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Gagal: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index d66ca3243a..2397e92c62 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -20,39 +20,56 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Vinna"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Forritið er ekki uppsett."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Forritið er ekki í boði"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Sótt forrit er óvirkt í öryggisstillingu"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Græjur eru óvirkar í öruggri stillingu"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Flýtileið er ekki tiltæk"</string>
-    <string name="home_screen" msgid="806512411299847073">"Heimaskjár"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Sérsniðnar aðgerðir"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Haltu fingri á græju til að grípa hana."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Ýttu tvisvar og haltu fingri á græju til að grípa hana eða notaðu sérsniðnar aðgerðir."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Heim"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Skipta skjá"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Haltu fingri á græju til að færa hana."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Ýttu tvisvar og haltu fingri á græju til að færa hana eða notaðu sérsniðnar aðgerðir."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d á breidd og %2$d á hæð"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Haltu inni til að staðsetja handvirkt"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Bæta sjálfkrafa við"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> græja</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> græjur</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> flýtileið</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> flýtileiðir</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Græjur"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Leit"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Hreinsa texta úr leitarreit"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Engar græjur í boði"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Engar leitarniðurstöður"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Persónulegt"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Vinna"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Samtöl"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Leita í forritum"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Hleður forrit…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Ekki fundust forrit sem samsvara „<xliff:g id="QUERY">%1$s</xliff:g>“"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Leita að fleiri forritum"</string>
     <string name="label_application" msgid="8531721983832654978">"Forrit"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Tilkynningar"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Haltu fingri á flýtileið til að grípa hana."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Ýttu tvisvar og haltu fingri á flýtileið til að grípa hana eða notaðu sérsniðnar aðgerðir."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Haltu fingri á flýtileið til að færa hana."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Ýttu tvisvar og haltu fingri á flýtileið til að færa hana eða notaðu sérsniðnar aðgerðir."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Ekki meira pláss á þessum heimaskjá."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Ekki meira pláss í bakka fyrir uppáhald"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Forritalisti"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Listi yfir eigin forrit"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Listi yfir vinnuforrit"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Heim"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Taka niður"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Fjarlægja"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Forritsupplýsingar"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Setja upp"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Ekki fá tillögu að forriti"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Festa tillögu"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"setja upp flýtileiðir"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Leyfir forriti að bæta við flýtileiðum án íhlutunar notanda."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"lesa stillingar og flýtileiðir heimaskjás"</string>
@@ -63,7 +80,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Vandamál við að hlaða græju"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Uppsetning"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Þetta er kerfisforrit sem ekki er hægt að fjarlægja."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Ónefnd mappa"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Breyta nafni"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Óvirkt <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="one"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, er með <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> tilkynningu</item>
@@ -77,8 +94,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Ýttu til að vista breytt heiti"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Möppu lokað"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Heiti möppu breytt í <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Mappa: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Græjur"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Mappa: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> atriði"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Mappa: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> eða fleiri atriði"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Veggfóður"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stílar og veggfóður"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Heimastillingar"</string>
@@ -92,16 +109,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Til að sýna tilkynningarpunkta skaltu kveikja á forritstilkynningum fyrir <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Breyta stillingum"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Sýna tilkynningapunkta"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Bæta tákni á heimaskjáinn"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Bæta forritatáknum við heimaskjáinn"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Fyrir ný forrit"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Óþekkt"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Taka niður"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Leita"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Þetta forrit er ekki uppsett"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Forritið fyrir þetta tákn er ekki uppsett. Þú getur fjarlægt það eða leitað að forritinu og sett það upp handvirkt."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"Setur upp <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="PROGRESS">%2$s</xliff:g> lokið"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> í niðurhali, <xliff:g id="PROGRESS">%2$s</xliff:g> lokið"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> bíður uppsetningar"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g>-græjur"</string>
     <string name="widgets_list" msgid="796804551140113767">"Græjulisti"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Græjulista lokað"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Bæta á heimaskjá"</string>
@@ -129,15 +146,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Flýtileiðir"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Flýtileiðir og tilkynningar"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Hunsa"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Loka"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Tilkynningu lokað"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Persónulegt"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Vinna"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Vinnusnið"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Hér finnurðu vinnuforrit"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Öll vinnuforrit eru með merki og fyrirtækið þitt tryggir öryggi þeirra. Færðu forrit yfir á heimaskjáinn til að fá auðveldari aðgang að þeim."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Stjórnað af fyrirtækinu þínu"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Slökkt er á tilkynningum og forritum"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Loka"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Lokað"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Persónuupplýsingar eru aðskildar og faldar í vinnuforritum"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Gögn vinnuforrita eru sýnileg kerfisstjóranum þínum"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Áfram"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Ég skil"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Hlé gert á vinnusniði"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Vinnuforrit geta ekki sent þér tilkynningar, notað rafhlöðuorku eða fengið aðgang að staðsetningu þinni"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Hlé gert á vinnusniði. Vinnuforrit geta ekki sent þér tilkynningar, notað rafhlöðuorku eða fengið aðgang að staðsetningu þinni"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Vinnuforrit eru merkt og kerfisstjórinn getur séð þau"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Ég skil"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Setja vinnuforrit í bið"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Kveikja"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Sía"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Gera hlé á vinnuforritum og tilkynningum"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Mistókst: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 3956d50635..7b4cf02603 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -56,8 +56,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nessuna app trovata corrispondente a \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Cerca altre app"</string>
     <string name="label_application" msgid="8531721983832654978">"App"</string>
-    <string name="search_corpus_apps" msgid="1917889409963779022">"App"</string>
-    <string name="search_action_try_now" msgid="1458737965476149074">"Prova subito"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Notifiche"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Tocca e tieni premuto per spostare una scorciatoia."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Tocca due volte e tieni premuto per spostare una scorciatoia o per usare le azioni personalizzate."</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 77eb7784c6..051982d130 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -60,8 +60,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"לא נמצאו אפליקציות התואמות ל-\"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"חפש אפליקציות נוספות"</string>
     <string name="label_application" msgid="8531721983832654978">"אפליקציה"</string>
-    <string name="search_corpus_apps" msgid="1917889409963779022">"אפליקציות"</string>
-    <string name="search_action_try_now" msgid="1458737965476149074">"זה הרגע לנסות"</string>
     <string name="notifications_header" msgid="1404149926117359025">"התראות"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"יש לגעת ולהחזיק כדי להעביר קיצור דרך למקום אחר."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"יש ללחוץ פעמיים ולהמשיך את הלחיצה כדי להעביר קיצור דרך למקום אחר או להשתמש בפעולות מותאמות אישית."</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 354f02032e..dc92748bbf 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -20,39 +20,56 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"仕事用"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"このアプリはインストールされていません。"</string>
     <string name="activity_not_available" msgid="7456344436509528827">"このアプリは使用できません"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"ダウンロードしたアプリは、セーフモードでは無効です"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"セーフモードではウィジェットは無効です"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"ショートカットは使用できません"</string>
-    <string name="home_screen" msgid="806512411299847073">"ホーム画面"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"カスタム操作"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"ウィジェットを追加するには押し続けます。"</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"ダブルタップ後に押し続けてウィジェットを選択するか、カスタム操作を使用してください。"</string>
+    <string name="home_screen" msgid="5629429142036709174">"ホーム"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"分割画面"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"長押ししてウィジェットを移動してください。"</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ウィジェットをダブルタップして長押ししながら移動するか、カスタム操作を使用してください。"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$dx%2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"幅 %1$d、高さ %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"長押しすると、手動で追加できます"</string>
     <string name="place_automatically" msgid="8064208734425456485">"自動的に追加"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> 件のウィジェット</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> 件のウィジェット</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> 件のショートカット</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> 件のショートカット</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>、<xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"ウィジェット"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"検索"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"検索ボックスからテキストを消去します"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"利用できるウィジェットはありません"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"検索結果がありません"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"個人用"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"仕事用"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"会話"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"アプリを検索"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"アプリを読み込んでいます…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"「<xliff:g id="QUERY">%1$s</xliff:g>」に一致するアプリは見つかりませんでした"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"他のアプリを検索"</string>
     <string name="label_application" msgid="8531721983832654978">"アプリ"</string>
     <string name="notifications_header" msgid="1404149926117359025">"通知"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"ショートカットを追加するには押し続けます。"</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"ダブルタップ後に押し続けてショートカットを選択するか、カスタム操作を使用してください。"</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"長押ししてショートカットを移動してください。"</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ショートカットをダブルタップして長押ししながら移動するか、カスタム操作を使用してください。"</string>
     <string name="out_of_space" msgid="4691004494942118364">"このホーム画面に空きスペースがありません。"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"お気に入りトレイに空きスペースがありません"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"アプリのリスト"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"個人用アプリのリスト"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"仕事用アプリのリスト"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"ホーム"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"削除"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"アンインストール"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"アプリ情報"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"インストール"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"アプリの候補を表示しない"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"アプリの候補を固定"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"ショートカットのインストール"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"ユーザー操作なしでショートカットを追加することをアプリに許可します。"</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"ホームの設定とショートカットの読み取り"</string>
@@ -63,7 +80,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"ウィジェットを表示できません"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"セットアップ"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"このシステムアプリはアンインストールできません。"</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"名前のないフォルダ"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"名前の編集"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」は無効です"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g> の通知が <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> 件あります</item>
@@ -77,8 +94,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"タップして変更後の名前を保存します"</string>
     <string name="folder_closed" msgid="4100806530910930934">"フォルダは閉じています"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"フォルダの名前を「<xliff:g id="NAME">%1$s</xliff:g>」に変更しました"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"フォルダ: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"ウィジェット"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"フォルダ: <xliff:g id="NAME">%1$s</xliff:g>、<xliff:g id="SIZE">%2$d</xliff:g> 件のアイテム"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"フォルダ: <xliff:g id="NAME">%1$s</xliff:g>、<xliff:g id="SIZE">%2$d</xliff:g> 件以上のアイテム"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"壁紙"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"スタイルと壁紙"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"ホームの設定"</string>
@@ -92,16 +109,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"通知ドットを表示するには、「<xliff:g id="NAME">%1$s</xliff:g>」のアプリ通知を ON にしてください"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"設定を変更"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"通知ドットの表示"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"ホーム画面にアイコンを追加"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"ホーム画面にアプリのアイコンを追加"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"新しいアプリをダウンロードしたとき"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"不明"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"削除"</string>
     <string name="abandoned_search" msgid="891119232568284442">"検索"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"このアプリはインストールされていません"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"このアイコンのアプリはインストールされていません。このアイコンは削除できます。または、手動でアプリを検索してインストールしください。"</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> をインストールしています: <xliff:g id="PROGRESS">%2$s</xliff:g> 完了"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g>をダウンロード中、<xliff:g id="PROGRESS">%2$s</xliff:g>完了"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g>のインストール待ち"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g>のウィジェット"</string>
     <string name="widgets_list" msgid="796804551140113767">"ウィジェット リスト"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"ウィジェット リストを閉じました"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"ホーム画面に追加"</string>
@@ -129,15 +146,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"ショートカット"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"ショートカットと通知"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"表示しない"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"閉じる"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"通知を非表示にしました"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"個人用"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"仕事用"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"仕事用プロファイル"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"ここには仕事用アプリが表示されます"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"仕事用アプリにはバッジが表示され、組織によって安全に保護されています。仕事用アプリをホーム画面に移動すると、簡単にアクセスできます。"</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"組織によって管理されています"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"通知とアプリは OFF です"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"閉じる"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"終了"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"個人データは仕事用アプリとは別に保存され、一緒に表示されません"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"仕事用アプリと仕事用データは IT 管理者に公開されます"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"次へ"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"仕事用プロファイルが一時停止しています"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"仕事用アプリは、通知の送信、バッテリーの使用、位置情報へのアクセスを行えません"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"仕事用プロファイルが一時停止しています。仕事用アプリは、通知の送信、バッテリーの使用、位置情報へのアクセスを行えません"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"仕事用アプリはバッジが付き、IT 管理者に公開されます"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"仕事用アプリを一時停止"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"ON にする"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"フィルタ"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"仕事用のアプリと通知を一時停止します"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"失敗: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index e9afef9077..7a0ec8d98c 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -20,39 +20,56 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"სამუშაო"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"აპი არ არის დაყენებული."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"აპი მიუწვდომელია"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"უსაფრთხო რეჟიმში ჩამოტვირთული აპი გაუქმებულია"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"უსაფრთხო რეჟიმში ვიჯეტი გამორთულია"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"მალსახმობი მიუწვდომელია"</string>
-    <string name="home_screen" msgid="806512411299847073">"მთავარი ეკრანი"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"მორგებული ქმედებები"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"შეეხეთ და დააყოვნეთ ვიჯეტის ასარჩევად."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"ორმაგად შეეხეთ და გეჭიროთ ვიჯეტის ასარჩევად ან მორგებული მოქმედებების გამოსაყენებლად."</string>
+    <string name="home_screen" msgid="5629429142036709174">"მთავარი გვერდი"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"ეკრანის გაყოფა"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"შეხებით აირჩიეთ და გეჭიროთ ვიჯეტის გადასაადგილებლად."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ორმაგი შეხებით აირჩიეთ და გეჭიროთ ვიჯეტის გადასაადგილებლად ან მორგებული მოქმედებების გამოსაყენებლად."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"სიგრძე: %1$d, სიგანე: %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"ხანგრძლივად შეეხეთ ხელით განსათავსებლად"</string>
     <string name="place_automatically" msgid="8064208734425456485">"ავტომატურად დამატება"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ვიჯეტი</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> ვიჯეტი</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> მალსახმობი</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> მალსახმობი</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"ვიჯეტები"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"ძიება"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"ტექსტის გასუფთავება საძიებო ველიდან"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"ვიჯეტები მიუწვდომელია"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"ძიების შედეგები ვერ მოიძებნა"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"პირადი"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"სამსახური"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"მიმოწერები"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"აპების ძიება"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"აპები იტვირთება…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"„<xliff:g id="QUERY">%1$s</xliff:g>“-ის თანხვედრი აპები არ მოიძებნა"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"მეტი აპის პოვნა"</string>
     <string name="label_application" msgid="8531721983832654978">"აპი"</string>
     <string name="notifications_header" msgid="1404149926117359025">"შეტყობინებები"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"შეეხეთ და დააყოვნეთ მალსახმობის ასარჩევად."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"ორმაგად შეეხეთ და გეჭიროთ მალსახმობის ასარჩევად ან მორგებული მოქმედებების გამოსაყენებლად."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"შეხებით აირჩიეთ და გეჭიროთ მალსახმობის გადასაადგილებლად."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ორმაგი შეხებით აირჩიეთ და გეჭიროთ მალსახმობის გადასაადგილებლად ან მორგებული მოქმედებების გამოსაყენებლად."</string>
     <string name="out_of_space" msgid="4691004494942118364">"ამ მთავარ ეკრანზე ადგილი აღარ არის."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"რჩეულების თაროზე ადგილი არ არის"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"აპების სია"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"პერსონალური აპების სია"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"სამსახურის აპების სია"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"მთავარი"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"ამოშლა"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"დეინსტალაცია"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"აპის შესახებ"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"ინსტალაცია"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"არ შემომთავაზო აპი"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"ჩამაგრების პროგნოზირება"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"მალსახმობების დაყენება"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"აპისთვის მალსახმობების დამოუკიდებლად დამატების უფლების მიცემა."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"მთავარი ეკრანის პარამეტრებისა და მალსახმობების წაკითხვა"</string>
@@ -63,7 +80,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"პრობლემა ვიჯეტის ჩატვირთვისას"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"დაყენება"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"ეს სისტემური აპია და მისი წაშლა შეუძლებელია."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"უსახელო საქაღალდე"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"სახელის რედაქტირება"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> გაითიშა"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g>-ში არის <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> შეტყობინება</item>
@@ -77,8 +94,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"შეეხეთ გადარქმეული სახელის შესანახად"</string>
     <string name="folder_closed" msgid="4100806530910930934">"საქაღალდე დაიხურა"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"საქაღალდეს შეეცვალა სახელი „<xliff:g id="NAME">%1$s</xliff:g>“-ად"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"საქაღალდე: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"ვიჯეტები"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"საქაღალდე: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ერთეული"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"საქაღალდე: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ან მეტი ერთეული"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"ფონები"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"სტილები და ფონები"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"მთავარი გვერდის პარამეტრები"</string>
@@ -92,16 +109,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"შეტყობინებათა ნიშნულების საჩვენებლად, ჩართეთ აპის შეტყობინებები <xliff:g id="NAME">%1$s</xliff:g>-ისთვის"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"პარამეტრების შეცვლა"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"შეტყობინების ნიშნულების ჩვენება"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"ხატულას მთავარ ეკრანზე დამატება"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"აპის ხატულების მთავარ ეკრანზე დამატება"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"ახალი აპებისთვის"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"უცნობი"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"ამოშლა"</string>
     <string name="abandoned_search" msgid="891119232568284442">"ძიება"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"ეს აპი დაყენებული არ არის"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"ამ ხატულის აპი დაყენებული არ არის. შეგიძლიათ ამოშალოთ, ან მოიძიოთ აპი და ხელით მოახდინოთ მისი ინსტალაცია."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"ინსტალირდება <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="PROGRESS">%2$s</xliff:g> დასრულებულია"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"მიმდინარეობს <xliff:g id="NAME">%1$s</xliff:g>-ის ჩამოტვირთვა, <xliff:g id="PROGRESS">%2$s</xliff:g> დასრულდა"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> ელოდება ინსტალაციას"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g>-ის ვიჯეტები"</string>
     <string name="widgets_list" msgid="796804551140113767">"ვიჯეტების სია"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"ვიჯეტების სია დაიხურა"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"მთავარ ეკრანზე დამატება"</string>
@@ -129,15 +146,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"მალსახმობები"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"მალსახმობები და შეტყობინებები"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"დახურვა"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"დახურვა"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"შეტყობინება დაიხურა"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"პირადი"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"სამსახური"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"სამსახურის პროფილი"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"აქ თავმოყრილია სამსახურის აპები"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"სამსახურის თითოეულ აპს აქვს ბეჯი, რაც ნიშნავს, რომ მათ უსაფრთხოებას თქვენი ორგანიზაცია უზრუნველყოფს. მარტივი წვდომისთვის, შეგიძლიათ სამსახურის აპები მთავარი ეკრანზე გადაიტანოთ."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"იმართება თქვენი ორგანიზაციის მიერ"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"შეტყობინებები და აპები გამორთულია"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"დახურვა"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"დახურული"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"პერსონალური მონაცემები განცალკევებულია და თქვენი სამსახურის აპებისთვის უხილავია"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"თქვენი IT ადმინისტრატორი თქვენს სამსახურის აპებში არსებულ მონაცემებს ხედავს"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"შემდეგ"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"გასაგებია"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"სამსახურის პროფილი დაპაუზებულია"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"სამსახურის აპებს არ შეუძლია თქვენთვის შეტყობინებების გამოგზავნა, თქვენი ბატარეის გამოყენება, ან თქვენს მდებარეობაზე წვდომა"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"სამსახურის პროფილი დაპაუზებულია. სამსახურის აპებს არ შეუძლია თქვენთვის შეტყობინებების გამოგზავნა, თქვენი ბატარეის გამოყენება, ან თქვენს მდებარეობაზე წვდომა"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"სამსახურის აპები ბეჯით არის მონიშნული და ხილულია IT ადმინისტრატორისთვის"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"გასაგებია"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"სამსახურის აპების დაპაუზება"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"ჩართვა"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"ფილტრი"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"სამსახურის აპებისა და შეტყობინებების დაპაუზება"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"ვერ მოხერხდა: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 1cd9045b76..071e08c81b 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -20,39 +20,64 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Жұмыс"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Қолданба орнатылмаған."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Қолданба қол жетімді емес"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Жүктелген қолданба қауіпсіз режимде өшірілген"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Қауіпсіз режимде виджеттер өшіріледі"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Таңбаша қолжетімді емес"</string>
-    <string name="home_screen" msgid="806512411299847073">"Негізгі экран"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Арнаулы әрекеттер"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Виджетті таңдау үшін түртіп, мықтап ұстаңыз."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Виджетті таңдау немесе арнаулы әрекеттерді таңдау үшін екі рет түртіп, ұстап тұрыңыз."</string>
+    <!-- no translation found for home_screen (5629429142036709174) -->
+    <skip />
+    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
+    <skip />
+    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
+    <skip />
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Ені: %1$d, биіктігі: %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Қолмен қою үшін басып тұрыңыз"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Автоматты қосу"</string>
+    <!-- no translation found for widgets_count (656794749266073027) -->
+    <!-- no translation found for shortcuts_count (8080294865447938455) -->
+    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
+    <skip />
+    <string name="widget_button_text" msgid="2880537293434387943">"Виджеттер"</string>
+    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
+    <skip />
+    <!-- no translation found for no_widgets_available (9140948620298620513) -->
+    <skip />
+    <!-- no translation found for no_search_results (6518732304311458580) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
+    <skip />
+    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Қолданбаларды іздеу"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Қолданбалар жүктелуде…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" сұрауына сәйкес келетін қолданбалар жоқ"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Қосымша қолданбалар іздеу"</string>
     <string name="label_application" msgid="8531721983832654978">"Қолданба"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Хабарландырулар"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Таңбашаны таңдау үшін оны басып, ұстап тұрыңыз."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Екі рет басып, ұстап тұрып, таңбашаны таңдаңыз немесе арнаулы әрекеттерді пайдаланыңыз."</string>
+    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
+    <skip />
     <string name="out_of_space" msgid="4691004494942118364">"Бұл Негізгі экранда орын қалмады."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Қалаулылар науасында орын қалмады"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Қолданбалар тізімі"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Жеке қолданбалар тізімі"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Жұмыс қолданбаларының тізімі"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Негізгі"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Алып тастау"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Жою"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Қолданба ақпараты"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Орнату"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Қолданбаны ұсынбау"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Болжанған қолданбаны бекіту"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"төте пернелерді орнату"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Қолданбаға пайдаланушының қатысуынсыз төте пернелерді қосу мүмкіндігін береді."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"Негізгі экрандағы параметрлер мен төте пернелерді оқу"</string>
@@ -63,7 +88,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Виджетті жүктеу барысында мәселе орын алды"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Орнату"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Бұл жүйе қолданбасы, сондықтан оны алу мүмкін емес."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Атауы жоқ қалта"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Атын өңдеу"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> өшірілді"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g> қолданбасында <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> хабарландыру бар</item>
@@ -77,8 +102,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Қайта атауды сақтау үшін түртіңіз"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Қалта жабылды"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Қалта атауы <xliff:g id="NAME">%1$s</xliff:g> болып өзгертілді"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Қалта: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Виджеттер"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Қалта: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> элемент бар"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Қалта: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> не одан көп элемент бар"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Тұсқағаздар"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Стильдер мен тұсқағаздар"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Негізгі экран параметрлері"</string>
@@ -92,16 +117,17 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Хабарландыру белгілерін көрсету үшін <xliff:g id="NAME">%1$s</xliff:g> қолданбасының қолданба хабарландыруларын қосыңыз"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Параметрлерді өзгерту"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Хабарландыру белгілерін көрсету"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Негізгі экранға белгіше енгізу"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Қолданба белгішесін негізгі экранға қосу"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Жаңа қолданбаларға арналған"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Белгісіз"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Алып тастау"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Іздеу"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Бұл қолданба орнатылмаған"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Осы белгіше үшін қолданба орнатылмаған. Оны жоюға болады немесе қолданбаны іздеп, қолмен орнатуға болады."</string>
+    <!-- no translation found for app_installing_title (5864044122733792085) -->
+    <skip />
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> жүктелуде, <xliff:g id="PROGRESS">%2$s</xliff:g> аяқталды"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> орнату күтілуде"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> виджеті"</string>
     <string name="widgets_list" msgid="796804551140113767">"Виджеттер тізімі"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Видджеттер тізімі жабылды"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Негізгі экранға қосу"</string>
@@ -129,15 +155,30 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Таңбашалар"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Таңбашалар мен хабарландырулар"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Бас тарту"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Жабу"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Хабарландырудан бас тартылды"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Жеке"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Жұмыс"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Жұмыс профилі"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Жұмыс қолданбалары осы жерде берілген"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Әрбір жұмыс қолданбасында танымбелгі бар. Ол оның қауіпсіздігі ұйым арқылы қамтамасыз етілетінін білдіреді. Жұмыс қолданбаларына оңай кіру үшін, оларды Негізгі экранға жылжытуға болады."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Ұйым арқылы басқарылады"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Хабарландырулар мен қолданбалар өшірулі"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Жабу"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Жабық"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Жеке деректер бөлек орналасқан және жұмыс қолданбаларынан жасырылған"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Әкімшіңіз жұмыс қолданбалары мен деректерді көре алады"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Келесі"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Түсінікті"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Жұмыс профилі кідіртілді"</string>
+    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
+    <skip />
+    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
+    <skip />
+    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
+    <skip />
+    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
+    <skip />
+    <string name="work_switch_tip" msgid="808075064383839144">"Жұмыс қолданбалары мен хабарландыруларды кідірту"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Қате шықты: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 973804200a..bc70a3d580 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -26,32 +26,50 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"បាន​បិទ​កម្មវិធី​ដែល​បាន​ទាញ​យក​ក្នុង​របៀប​សុវត្ថិភាព"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"បាន​បិទ​ធាតុ​ក្រាហ្វិក​ក្នុង​របៀប​សុវត្ថិភាព"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"ផ្លូវកាត់មិនអាចប្រើបានទេ"</string>
-    <string name="home_screen" msgid="806512411299847073">"អេក្រង់ដើម"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"សកម្មភាព​ផ្ទាល់ខ្លួន"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"ប៉ះ &amp; សង្កត់ ដើម្បី​ជ្រើស​ធាតុ​ក្រាហ្វិក។"</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"ប៉ះពីរដង ហើយចុចឲ្យជាប់ដើម្បីជ្រើសយកធាតុក្រាហ្វិក ឬប្រើសកម្មភាពផ្ទាល់ខ្លួន។"</string>
+    <string name="home_screen" msgid="5629429142036709174">"អេក្រង់ដើម"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"មុខងារ​បំបែកអេក្រង់"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"ចុចឱ្យជាប់​ដើម្បីផ្លាស់ទី​ធាតុក្រាហ្វិក​។"</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ចុចពីរដង រួចសង្កត់ឱ្យជាប់ ដើម្បីផ្លាស់ទី​ធាតុក្រាហ្វិក ឬប្រើ​សកម្មភាព​តាមបំណង​។"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"ទទឺង %1$d គុណនឹងកម្ពស់ %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"ចុច​ឲ្យជាប់​ដើម្បី​បញ្ចូលវា​ដោយផ្ទាល់"</string>
     <string name="place_automatically" msgid="8064208734425456485">"បញ្ចូល​ដោយ​ស្វ័យ​ប្រវត្តិ"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other">ធាតុ​ក្រាហ្វិក <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
+      <item quantity="one">ធាតុ​ក្រាហ្វិក <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g></item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other">ផ្លូវកាត់ <xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g></item>
+      <item quantity="one">ផ្លូវកាត់ <xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g></item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"ធាតុ​ក្រាហ្វិក"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"ស្វែងរក"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"សម្អាត​ពាក្យឬឃ្លា​ចេញពី​ប្រអប់ស្វែងរក"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"គ្មាន​ធាតុក្រាហ្វិក​ទេ"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"គ្មាន​លទ្ធផល​ស្វែងរក​ទេ"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ផ្ទាល់ខ្លួន"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ការងារ"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"ការសន្ទនា"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ស្វែងរក​កម្មវិធី"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"កំពុងផ្ទុកកម្មវិធី…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"រកមិនឃើញកម្មវិធី​ដែលត្រូវគ្នាជាមួយ \"<xliff:g id="QUERY">%1$s</xliff:g>\" ទេ"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"ស្វែងរកកម្មវិធីច្រើនទៀត"</string>
     <string name="label_application" msgid="8531721983832654978">"កម្មវិធី"</string>
     <string name="notifications_header" msgid="1404149926117359025">"ការ​ជូនដំណឹង"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"ចុច​ឱ្យ​ជាប់​ដើម្បី​ជ្រើស​រើស​ផ្លូវកាត់​មួយ។"</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"ចុច​ពីរ​ដង ហើយ​ចុច​ឱ្យ​ជាប់​ដើម្បី​ជ្រើសរើស​ផ្លូវកាត់​មួយ ឬ​ប្រើ​សកម្មភាព​ផ្ទាល់ខ្លួន។"</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"ចុចឱ្យជាប់​ដើម្បីផ្លាស់ទី​ផ្លូវកាត់​។"</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ចុចពីរដង រួចសង្កត់ឱ្យជាប់ ដើម្បីផ្លាស់ទី​ផ្លូវកាត់ ឬប្រើ​សកម្មភាព​តាមបំណង​។"</string>
     <string name="out_of_space" msgid="4691004494942118364">"គ្មាន​បន្ទប់​នៅ​លើ​អេក្រង់​ដើម​នេះ​ទៀត​ទេ។"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"គ្មាន​បន្ទប់​​ក្នុង​ថាស​និយម​ប្រើ"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"បញ្ជីកម្មវិធី"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"បញ្ជី​កម្មវិធី​ផ្ទាល់ខ្លួន"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"បញ្ជី​កម្មវិធី​ការងារ"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"ដើម"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"យកចេញ"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"លុបការដំឡើង"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"ព័ត៌មាន​កម្មវិធី"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"ដំឡើង"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"កុំណែនាំកម្មវិធី"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"ខ្ទាស់ការ​ព្យាករ"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"ដំឡើង​ផ្លូវកាត់"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"អនុញ្ញាត​ឲ្យ​កម្មវិធី​បន្ថែម​ផ្លូវកាត់​ ដោយ​មិន​ចាំបាច់​​អំពើ​ពី​អ្នក​ប្រើ។"</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"អាន​ការ​កំណត់​ និង​ផ្លូវកាត់​​អេក្រង់​ដើម"</string>
@@ -62,7 +80,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"បញ្ហា​ក្នុង​ការ​ផ្ទុក​ធាតុ​​ក្រាហ្វិក"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"រៀបចំ"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"នេះ​​​ជា​កម្មវិធី​ប្រព័ន្ធ មិន​អាច​លុប​បាន​ទេ។"</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"ថត​គ្មាន​ឈ្មោះ"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"កែ​ឈ្មោះ"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"បានបិទដំណើរការ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, មាន​ការជូនដំណឹង <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g></item>
@@ -76,8 +94,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"ប៉ះដើម្បីរក្សាទុកឈ្មោះដែលបានប្តូរ"</string>
     <string name="folder_closed" msgid="4100806530910930934">"បាន​បិទ​ថត"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"បាន​ប្ដូរ​ឈ្មោះ​ថត​ជា <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"ថត៖ <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"ធាតុ​ក្រាហ្វិក"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"ថត៖ <xliff:g id="NAME">%1$s</xliff:g>, ធាតុ <xliff:g id="SIZE">%2$d</xliff:g>"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"ថត៖ <xliff:g id="NAME">%1$s</xliff:g>, ធាតុ <xliff:g id="SIZE">%2$d</xliff:g> ឬច្រើនជាងនេះ"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"ផ្ទាំង​រូបភាព"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"រចនាប័ទ្ម និង​ផ្ទាំង​រូបភាព"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"ការកំណត់​ទំព័រដើម"</string>
@@ -91,16 +109,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"ដើម្បីបង្ហាញស្លាកជូនដំណឹង សូមបើកការជូនដំណឹងកម្មវិធីសម្រាប់ <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"ប្ដូរ​ការកំណត់"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"បង្ហាញ​ស្លាក​ជូនដំណឹង"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"បញ្ចូល​រូបតំណាង​ទៅ​អេក្រង់​ដើម"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"បញ្ចូល​រូបកម្មវិធី​ទៅក្នុង​អេក្រង់ដើម"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"សម្រាប់កម្មវិធីថ្មី"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"មិន​ស្គាល់"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"លុបចេញ"</string>
     <string name="abandoned_search" msgid="891119232568284442">"ស្វែងរក"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"មិន​បាន​ដំឡើង​កម្មវិធី​នេះ"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"មិន​បាន​ដំឡើង​កម្មវិធី​សម្រាប់​រូបតំណាង​នេះ។ អ្នក​អាច​លុប​វា ឬ​ស្វែងរក​កម្មវិធី និង​ដំឡើង​វា​ដោយ​ដៃ។"</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"កំពុង​ដំឡើង <xliff:g id="NAME">%1$s</xliff:g>, បាន​បញ្ចប់ <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"កំពុងដោនឡូត <xliff:g id="NAME">%1$s</xliff:g> បានបញ្ចប់ <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> កំពុងរង់ចាំការដំឡើង"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"ធាតុ​ក្រាហ្វិក <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"បញ្ជីធាតុ​ក្រាហ្វិក"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"បាន​បិទ​បញ្ជីធាតុ​ក្រាហ្វិក"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"បញ្ចូលទៅអេក្រង់ដើម"</string>
@@ -127,16 +145,24 @@
     <string name="widget_resized" msgid="9130327887929620">"ធាតុក្រាហ្វិកដែលបានប្តូរទំហំទៅទទឹងប្រវែង <xliff:g id="NUMBER_0">%1$s</xliff:g> កម្ពស់ប្រវែង <xliff:g id="NUMBER_1">%2$s</xliff:g>"</string>
     <string name="action_deep_shortcut" msgid="2864038805849372848">"ផ្លូវកាត់"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"ផ្លូវកាត់ និង​ការជូនដំណឹង"</string>
-    <string name="action_dismiss_notification" msgid="5909461085055959187">"បដិសេធ"</string>
+    <string name="action_dismiss_notification" msgid="5909461085055959187">"ច្រានចោល"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"បិទ"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"បាន​បដិសេធ​ការជូនដំណឹង"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ផ្ទាល់ខ្លួន"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"ការងារ"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"កម្រងព័ត៌មានការងារ"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"ស្វែង​រក​កម្មវិធី​ការងារ​នៅទីនេះ"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"កម្មវិធី​ការងារ​នីមួយៗ​មាន​ស្លាកមួយ និងត្រូវ​បានរក្សាទុក​យ៉ាងមានសុវត្ថិភាព​ដោយស្ថាប័ន​របស់អ្នក។ សូម​ផ្លាស់ទី​កម្មវិធី​ទៅកាន់​អេក្រង់​ដើម​របស់អ្នក​ ដើម្បី​ងាយស្រួល​ចូលប្រើជាងមុន។"</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"គ្រប់គ្រងដោយ​ស្ថាប័ន​របស់អ្នក"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"ការជូនដំណឹង​ និងកម្មវិធី​ត្រូវបានបិទ"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"បិទ"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"បានបិទ"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"ទិន្នន័យ​ផ្ទាល់ខ្លួន​ស្ថិតនៅ​ដាច់ដោយឡែក និង​ត្រូវបាន​លាក់ពី​កម្មវិធី​ការងារ"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"ទិន្នន័យ និង​កម្មវិធី​ការងារ​គឺអាចមើលឃើញដោយ​អ្នកគ្រប់គ្រង​ផ្នែកព័ត៌មានវិទ្យា​របស់អ្នក"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"បន្ទាប់"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"យល់ហើយ"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"កម្រងព័ត៌មានការងារត្រូវបាន​ផ្អាក"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"កម្មវិធី​ការងារ​មិនអាចផ្ញើ​ការជូនដំណឹង​ទៅអ្នក ប្រើប្រាស់ថ្ម​របស់អ្នក ឬ​ចូលប្រើ​ទីតាំង​របស់អ្នក​បានទេ"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"កម្រងព័ត៌មាន​ការងារ​ត្រូវបាន​ផ្អាក។ កម្មវិធី​ការងារ​មិនអាចផ្ញើ​ការជូនដំណឹង​ទៅអ្នក ប្រើប្រាស់ថ្ម​របស់អ្នក ឬ​ចូលប្រើ​ទីតាំង​របស់អ្នក​បានទេ"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"កម្មវិធីការងារ​ត្រូវបានដាក់​គ្រឿងសម្គាល់ ហើយ​អ្នកគ្រប់គ្រង​ផ្នែកព័ត៌មានវិទ្យា​របស់អ្នក​អាចមើលឃើញ"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"យល់ហើយ"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"ផ្អាក​កម្មវិធី​ការងារ"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"បើក"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"តម្រង"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"ផ្អាក​ការជូនដំណឹង និង​កម្មវិធី​ការងារ"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"បានបរាជ័យ៖ <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 0be0f1bc17..b12c631e36 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -56,8 +56,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" ಹೊಂದಿಕೆಯ ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಕಂಡುಬಂದಿಲ್ಲ"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"ಮತ್ತಷ್ಟು ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಹುಡುಕಿ"</string>
     <string name="label_application" msgid="8531721983832654978">"ಆ್ಯಪ್"</string>
-    <string name="search_corpus_apps" msgid="1917889409963779022">"ಆ್ಯಪ್‌ಗಳು"</string>
-    <string name="search_action_try_now" msgid="1458737965476149074">"ಈಗಲೇ ಬಳಸಿ ನೋಡಿ"</string>
     <string name="notifications_header" msgid="1404149926117359025">"ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"ಶಾರ್ಟ್‌ಕಟ್ ಸರಿಸಲು ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಹಿಡಿದುಕೊಳ್ಳಿ."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ಶಾರ್ಟ್‌ಕಟ್ ಸರಿಸಲು ಅಥವಾ ಕಸ್ಟಮ್ ಕ್ರಿಯೆಗಳನ್ನು ಬಳಸಲು ಡಬಲ್-ಟ್ಯಾಪ್ ಮಾಡಿ ಮತ್ತು ಹಿಡಿದುಕೊಳ್ಳಿ."</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 58b65da032..81285ca32f 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -20,39 +20,56 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"업무"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"앱이 설치되지 않았습니다."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"앱을 사용할 수 없음"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"다운로드한 앱은 안전 모드에서 사용할 수 없습니다."</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"안전 모드에서 위젯 사용 중지됨"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"바로가기를 사용할 수 없음"</string>
-    <string name="home_screen" msgid="806512411299847073">"홈 화면"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"맞춤 작업"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"위젯을 선택하려면 길게 터치하세요."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"위젯을 선택하려면 두 번 탭한 다음 길게 터치하거나 맞춤 액션을 사용합니다."</string>
+    <string name="home_screen" msgid="5629429142036709174">"홈"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"화면 분할"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"길게 터치하여 위젯을 이동하세요."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"두 번 탭한 다음 길게 터치하여 위젯을 이동하거나 맞춤 작업을 사용하세요."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d×%2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"너비 %1$d, 높이 %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"길게 터치하여 직접 추가"</string>
+    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"길게 터치하여 직접 추가하세요."</string>
     <string name="place_automatically" msgid="8064208734425456485">"자동으로 추가"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other">위젯 <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g>개</item>
+      <item quantity="one">위젯 <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g>개</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other">바로가기 <xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g>개</item>
+      <item quantity="one">바로가기 <xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g>개</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"위젯"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"검색"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"검색창에서 텍스트 지우기"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"사용 가능한 위젯 없음"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"검색결과 없음"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"개인 위젯"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"직장 위젯"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"대화"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"앱 검색"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"앱 로드 중…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\'<xliff:g id="QUERY">%1$s</xliff:g>\'과(와) 일치하는 앱이 없습니다."</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"더 많은 앱 검색"</string>
     <string name="label_application" msgid="8531721983832654978">"앱"</string>
     <string name="notifications_header" msgid="1404149926117359025">"알림"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"바로가기를 선택하려면 길게 터치하세요."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"바로가기를 선택하려면 두 번 탭한 다음 길게 터치하거나 맞춤 동작을 사용하세요."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"길게 터치하여 바로가기를 이동하세요."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"두 번 탭한 다음 길게 터치하여 바로가기를 이동하거나 맞춤 작업을 사용하세요."</string>
     <string name="out_of_space" msgid="4691004494942118364">"홈 화면에 더 이상 공간이 없습니다."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"즐겨찾기 트레이에 더 이상 공간이 없습니다."</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"앱 목록"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"개인 앱 목록"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"업무용 앱 목록"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"홈"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"삭제"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"제거"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"앱 정보"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"설치"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"앱 제안 받지 않음"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"예상 앱 고정"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"바로가기 설치"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"앱이 사용자의 작업 없이 바로가기를 추가할 수 있도록 합니다."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"홈 설정 및 바로가기 읽기"</string>
@@ -63,7 +80,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"위젯을 로드하는 중 문제가 발생했습니다."</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"설정"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"시스템 앱은 제거할 수 없습니다."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"이름이 없는 폴더"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"이름 수정"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> 사용 안함"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g>에 <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g>개의 알림이 있음</item>
@@ -77,8 +94,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"탭하여 변경된 이름 저장"</string>
     <string name="folder_closed" msgid="4100806530910930934">"폴더 닫음"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"폴더 이름 변경: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"폴더: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"위젯"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"폴더: <xliff:g id="NAME">%1$s</xliff:g>, 항목 <xliff:g id="SIZE">%2$d</xliff:g>개"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"폴더: <xliff:g id="NAME">%1$s</xliff:g>, 항목 <xliff:g id="SIZE">%2$d</xliff:g>개 이상"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"배경화면"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"스타일 및 배경화면"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"홈 설정"</string>
@@ -92,16 +109,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"알림 표시점을 표시하려면 <xliff:g id="NAME">%1$s</xliff:g>의 앱 알림을 사용 설정하세요."</string>
     <string name="title_change_settings" msgid="1376365968844349552">"설정 변경"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"알림 표시 점 보기"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"홈 화면에 아이콘 추가"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"홈 화면에 앱 아이콘 추가"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"새로 설치한 앱에 적용"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"알 수 없음"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"삭제"</string>
     <string name="abandoned_search" msgid="891119232568284442">"검색"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"이 앱이 설치되어 있지 않음"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"이 아이콘의 앱이 설치되어 있지 않습니다. 아이콘을 삭제하거나 앱을 검색하여 수동으로 설치하세요."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> 설치 중, <xliff:g id="PROGRESS">%2$s</xliff:g> 완료"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> 다운로드 중, <xliff:g id="PROGRESS">%2$s</xliff:g> 완료"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> 설치 대기 중"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> 위젯"</string>
     <string name="widgets_list" msgid="796804551140113767">"위젯 목록"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"위젯 목록 닫힘"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"홈 화면에 추가"</string>
@@ -129,15 +146,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"바로가기"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"바로가기 및 알림"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"닫기"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"닫기"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"알림이 해제되었습니다."</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"개인"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"직장"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"직장 프로필"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"여기에서 업무용 앱 찾기"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"각 업무용 앱에는 배지가 있으며 업무용 앱은 조직에서 안전하게 보호됩니다. 앱을 홈 화면으로 이동하여 더 간편하게 사용하세요."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"조직에서 관리"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"알림 및 앱 사용 중지됨"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"닫기"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"종료됨"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"개인 정보는 직장 앱에서 분리되어 숨겨짐"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"직장 앱 및 데이터가 IT 관리자에게 표시됨"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"다음"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"확인"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"직장 프로필이 일시중지됨"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"직장 앱에서 알림을 보내거나 배터리를 사용하거나 내 위치 정보에 액세스할 수 없습니다."</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"직장 프로필이 일시중지되었습니다. 직장 앱에서 알림을 보내거나 배터리를 사용하거나 내 위치 정보에 액세스할 수 없습니다."</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"직장 앱에는 배지가 있으며, IT 관리자는 직장 앱을 확인할 수 있습니다."</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"확인"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"직장 앱 일시중지"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"사용 설정"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"필터"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"직장 앱 및 알림 일시중지"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"실패: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 2c23c06d86..0c7b072f9a 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -62,10 +62,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" сурамына дал келген колдонмолор табылган жок"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Көбүрөөк колдонмолорду издөө"</string>
     <string name="label_application" msgid="8531721983832654978">"Колдонмо"</string>
-    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
-    <skip />
-    <!-- no translation found for search_action_try_now (1458737965476149074) -->
-    <skip />
     <string name="notifications_header" msgid="1404149926117359025">"Билдирмелер"</string>
     <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
     <skip />
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index fc3ef834ce..967a22e085 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -56,8 +56,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"ບໍ່ພົບແອັບທີ່ກົງກັບ \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"ຊອກຫາແອັບເພີ່ມເຕີມ"</string>
     <string name="label_application" msgid="8531721983832654978">"ແອັບ"</string>
-    <string name="search_corpus_apps" msgid="1917889409963779022">"ແອັບ"</string>
-    <string name="search_action_try_now" msgid="1458737965476149074">"ລອງຕອນນີ້ເລີຍ"</string>
     <string name="notifications_header" msgid="1404149926117359025">"ການແຈ້ງເຕືອນ"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"ແຕະຄ້າງໄວ້ເພື່ອຍ້າຍທາງລັດ."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ແຕະສອງເທື່ອຄ້າງໄວ້ເພື່ອຍ້າຍທາງລັດ ຫຼື ໃຊ້ຄຳສັ່ງກຳນົດເອງ."</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 6571582cec..c75afbcd4e 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -20,39 +20,60 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Darbas"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Programa neįdiegta."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Programa nepasiekiama"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Atsisiųsta programa išjungta Saugos režimu"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Valdikliai išjungti Saugiame režime"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Sparčiojo klavišo negalima naudoti"</string>
-    <string name="home_screen" msgid="806512411299847073">"Pagrindinis ekranas"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Tinkinti veiksmai"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Palieskite ir laikykite, kad pasirinkt. valdiklį."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Dukart palieskite ir laikykite, kad pasirinktumėte valdiklį ar naudotumėte tinkintus veiksmus."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Pagrindinis"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Išskaidyto ekrano režimas"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Dukart pal. ir palaik., kad perkeltumėte valdiklį."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dukart palieskite ir palaikykite, kad perkeltumėte valdiklį ar naudotumėte tinkintus veiksmus."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d plotis ir %2$d aukštis"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Palieskite ir palaikykite, kad padėtumėte patys"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Pridėti automatiškai"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> valdiklis</item>
+      <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> valdikliai</item>
+      <item quantity="many"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> valdiklio</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> valdiklių</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> spartusis klavišas</item>
+      <item quantity="few"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> spartieji klavišai</item>
+      <item quantity="many"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> sparčiojo klavišo</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> sparčiųjų klavišų</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Valdikliai"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Paieška"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Išvalyti tekstą iš paieškos laukelio"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Nėra jokių pasiekiamų valdiklių"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Nėra jokių paieškos rezultatų"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Asmeniniai"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Darbas"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Pokalbiai"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Paieškos programos"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Įkeliamos programos…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nerasta jokių užklausą „<xliff:g id="QUERY">%1$s</xliff:g>“ atitinkančių programų"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Ieškoti daugiau programų"</string>
     <string name="label_application" msgid="8531721983832654978">"Programa"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Pranešimai"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Paliesk. ir palaikyk., kad pasirinkt. spart. klav."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Dukart palieskite ir palaikykite, kad pasirinkt. spartųjį klavišą ar naudotumėte tinkintus veiksmus."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Dukart pal. ir palaik., kad perk. spart. klavišą."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dukart palieskite ir palaikykite, kad perkeltumėte spartųjį klavišą ar naudotumėte tinkintus veiksmus."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Šiame pagrindiniame ekrane vietos nebėra."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Mėgstamiausių dėkle nebėra vietos"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Programų sąrašas"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Asmeninių programų sąrašas"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Darbo programų sąrašas"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Pagrindinis"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Ištrinti"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Pašalinti"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Programos inform."</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Įdiegti"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Nesiūlyti programos"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Prisegti numatymą"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"įdiegti sparčiuosius klavišus"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Programai leidžiama pridėti sparčiuosius klavišus be naudotojo įsikišimo."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"skaityti pagrindinio puslapio nustatymus ir sparčiuosius klavišus"</string>
@@ -63,7 +84,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Problema įkeliant valdiklį"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Sąranka"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Tai sistemos programa ir jos negalima pašalinti."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Aplankas be pavadinimo"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Pavadinimo redagavimas"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"„<xliff:g id="APP_NAME">%1$s</xliff:g>“ išjungta"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="one">Programoje „<xliff:g id="APP_NAME_2">%1$s</xliff:g>“ yra <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> pranešimas</item>
@@ -79,8 +100,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Palieskite, kad išsaugotumėte pakeistą pavadinimą"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Aplankas uždarytas"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Aplankas pervardytas kaip „<xliff:g id="NAME">%1$s</xliff:g>“"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Aplankas: „<xliff:g id="NAME">%1$s</xliff:g>“"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Valdikliai"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Aplankas: „<xliff:g id="NAME">%1$s</xliff:g>“, elementų: <xliff:g id="SIZE">%2$d</xliff:g>"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Aplankas: „<xliff:g id="NAME">%1$s</xliff:g>“, elementų: <xliff:g id="SIZE">%2$d</xliff:g> ar daugiau"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Ekrano fonai"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stiliai ir ekrano fonai"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"„Home“ nustatymai"</string>
@@ -94,16 +115,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Kad būtų rodomi pranešimų taškai, įjunkite programos „<xliff:g id="NAME">%1$s</xliff:g>“ pranešimus."</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Keisti nustatymus"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Rodyti pranešimų taškus"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Pridėti piktogr. prie pagrindinio ekrano"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Pridėti progr. piktogr. pagrind. ekrane"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Skirta naujoms programoms"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Nežinoma"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Panaikinti"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Ieškoti"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Ši programa neįdiegta"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Šios piktogramos programa neįdiegta. Galite ją pašalinti arba bandyti ieškoti programos ir ją įdiegti patys."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"Įdiegiama: „<xliff:g id="NAME">%1$s</xliff:g>“; baigta: <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"Atsisiunčiama programa „<xliff:g id="NAME">%1$s</xliff:g>“, <xliff:g id="PROGRESS">%2$s</xliff:g> baigta"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"Laukiama, kol bus įdiegta programa „<xliff:g id="NAME">%1$s</xliff:g>“"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"„<xliff:g id="NAME">%1$s</xliff:g>“ valdikliai"</string>
     <string name="widgets_list" msgid="796804551140113767">"Valdiklių sąrašas"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Valdiklių sąrašas uždarytas"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Pridėti prie pagrind. ekrano"</string>
@@ -131,15 +152,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Spartieji klavišai"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Spartieji klavišai ir pranešimai"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Atsisakyti"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Uždaryti"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Pranešimo atsisakyta"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Asmeninės"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Darbo"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Darbo profilis"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Darbo programas rasite čia"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Kiekvienai darbo programai priskirtas ženklelis, o tokių programų sauga rūpinasi jūsų organizacija. Perkelkite programas į pagrindinį ekraną, kad galėtumėte lengviau jas pasiekti."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Tvarko jūsų organizacija"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Programos ir pranešimai išjungti"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Uždaryti"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Uždaryta"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Asmens duomenys laikomi atskirai ir paslėpti nuo darbo programų"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Darbo programas ir duomenis mato jūsų IT administratorius"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Kitas"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Supratau"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Darbo profilis pristabdytas"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Darbo programos negali siųsti jums pranešimų, naudoti jūsų akumuliatoriaus ar pasiekti jūsų vietovės"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Darbo profilis pristabdytas. Darbo programos negali siųsti jums pranešimų, naudoti jūsų akumuliatoriaus ar pasiekti jūsų vietovės"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Darbo programos yra pažymėtos ženkleliu ir matomos IT administratoriui"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Supratau"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pristabdyti darbo programas"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Įjungti"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtruoti"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Pristabdykite darbo programas ir pranešimus"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Nepavyko: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 3da0fbb2e5..dc2117f024 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -20,39 +20,58 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Darbs"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Lietotne nav instalēta."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Lietotne nav pieejama."</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Lejupielādētā lietotne ir atspējota drošajā režīmā."</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Logrīki atspējoti drošajā režīmā"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Saīsne nav pieejama."</string>
-    <string name="home_screen" msgid="806512411299847073">"Sākuma ekrāns"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Pielāgotās darbības"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Lai izvēlētos logrīku, pieskarieties un turiet to."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Lai atlasītu logrīku, veiciet dubultskārienu uz tā un turiet to vai arī veiciet pielāgotas darbības."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Sākums"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Sadalīt ekrānu"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Lai pārvietotu logrīku, pieskarieties un turiet."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Lai pārvietotu logrīku, uz tā veiciet dubultskārienu un turiet. Varat arī veikt pielāgotas darbības."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d plats un %2$d augsts"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Pieskarieties un turiet, lai manuāli pievienotu"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Pievienot automātiski"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="zero"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> logrīku</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> logrīks</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> logrīki</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="zero"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> saīšņu</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> saīsne</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> saīsnes</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Logrīki"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Meklēt"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Notīrīt tekstu no meklēšanas lodziņa"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Nav pieejams neviens logrīks"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Nav meklēšanas rezultātu"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personīgie"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Darba"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Sarunas"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Meklēt lietotnes"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Notiek lietotņu ielāde…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Vaicājumam “<xliff:g id="QUERY">%1$s</xliff:g>” neatbilda neviena lietotne"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Meklēt citas lietotnes"</string>
     <string name="label_application" msgid="8531721983832654978">"Lietotne"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Paziņojumi"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Lai atlasītu saīsni, pieskarieties un turiet to."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Lai atlasītu saīsni, veiciet dubultskārienu uz tās un turiet to. Varat arī veikt pielāgotas darbības."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Lai pārvietotu saīsni, pieskarieties un turiet."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Lai pārvietotu saīsni, uz tās veiciet dubultskārienu un turiet. Varat arī veikt pielāgotas darbības."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Šajā sākuma ekrānā vairs nav vietas."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Izlases joslā vairs nav vietas."</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lietotņu saraksts"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Personīgo lietotņu saraksts"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Darba lietotņu saraksts"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Sākums"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Noņemt"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Atinstalēt"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Par lietotni"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Instalēt"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Neieteikt lietotni"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Piespraust prognozēto lietotni"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"instalēt saīsnes"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Ļauj lietotnei pievienot saīsnes, nejautājot lietotājam."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"lasīt sākuma ekrāna iestatījumus un saīsnes"</string>
@@ -63,7 +82,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Ielādējot logrīku, radās problēma."</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Notiek iestatīšana"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Šī ir sistēmas lietotne, un to nevar atinstalēt."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Mape bez nosaukuma"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Nosaukuma rediģēšana"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Lietotne <xliff:g id="APP_NAME">%1$s</xliff:g> ir atspējota"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="zero">Lietotnē <xliff:g id="APP_NAME_2">%1$s</xliff:g> ir <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> paziņojumi</item>
@@ -78,8 +97,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Pieskarieties, lai saglabātu jauno nosaukumu."</string>
     <string name="folder_closed" msgid="4100806530910930934">"Mape aizvērta"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Mape pārdēvēta par: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Mape: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Logrīki"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Mape <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> vienumi"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Mape <xliff:g id="NAME">%1$s</xliff:g>, vienumu skaits mapē: vismaz <xliff:g id="SIZE">%2$d</xliff:g>"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fona tapetes"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stili un fona tapetes"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Sākumlapas iestatījumi"</string>
@@ -93,16 +112,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Lai tiktu rādīti paziņojumu punkti, ieslēdziet paziņojumus lietotnei <xliff:g id="NAME">%1$s</xliff:g>."</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Mainīt iestatījumus"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Rādīt paziņojumu punktus"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Pievienot ikonu sākuma ekrānā"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Pievienot lietotņu ikonas sākuma ekrānam"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Jaunām lietotnēm"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Nezināma"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Noņemt"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Meklēt"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Šī lietotne nav instalēta"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Šai ikonai paredzētā lietotne nav instalēta. Varat noņemt ikonu vai meklēt lietotni un instalēt to manuāli."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"Notiek lietotnes “<xliff:g id="NAME">%1$s</xliff:g>” instalēšana. Norise: <xliff:g id="PROGRESS">%2$s</xliff:g>."</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"Lietotnes <xliff:g id="NAME">%1$s</xliff:g> lejupielāde (<xliff:g id="PROGRESS">%2$s</xliff:g> pabeigti)"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"Notiek <xliff:g id="NAME">%1$s</xliff:g> instalēšana"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> logrīki"</string>
     <string name="widgets_list" msgid="796804551140113767">"Logrīku saraksts"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Logrīku saraksts aizvērts"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Pievienot sākuma ekrānam"</string>
@@ -130,15 +149,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Saīsnes"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Saīsnes un paziņojumi"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Nerādīt"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Aizvērt"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Paziņojums netiek rādīts"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personīgās lietotnes"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Darba lietotnes"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Darba profils"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Meklējiet darba lietotnes šeit"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Katrai darba lietotnei ir emblēma, un jūsu organizācija aizsargā šīs lietotnes. Lai varētu ērtāk piekļūt lietotnēm, pārvietojiet tās uz sākuma ekrānu."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Pārvalda jūsu organizācija"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Paziņojumi un lietotnes ir izslēgtas"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Aizvērt"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Aizvērta"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Personas dati ir atsevišķi un paslēpti no darba lietotnēm"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Jūsu IT administrators var skatīt darba lietotnes un datus"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Tālāk"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Labi"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Darba profila darbība ir pārtraukta"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Darba lietotnes nevar sūtīt jums paziņojumus, izmantot akumulatoru un piekļūt jūsu atrašanās vietai."</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Darba profila darbība ir pārtraukta. Darba lietotnes nevar sūtīt jums paziņojumus, izmantot akumulatoru un piekļūt jūsu atrašanās vietai."</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Darba lietotnēm ir pievienota emblēma, un tās ir redzamas jūsu IT administratoram"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Labi"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pārtraukt darba lietotņu darbību"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Ieslēgt"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtrs"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Pārtraukt darba lietotņu darbību un paziņojumu sūtīšanu"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Neizdevās: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index ab14e8900b..247144df98 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -26,32 +26,50 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Преземената апликација е оневозможена во безбеден режим"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Додатоците се оневозможени во безбеден режим"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Кратенката не е достапна"</string>
-    <string name="home_screen" msgid="806512411299847073">"Почетен екран"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Приспособени дејства"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Допри и задржи за да се избере виџетот."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Допрете двапати и задржете за да изберете додаток или да користите приспособени дејства."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Почетен екран"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Поделен екран"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Допрете и задржете за да преместите виџет."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Допрете двапати и задржете за да преместите виџет или користете приспособени дејства."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d широк на %2$d висок"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Допрете и задржете за рачно поставување"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Додај автоматски"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виџет</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виџети</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> кратенка</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> кратенки</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Виџети"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Пребарувајте"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Избриши го текстот од полето за пребарување"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Нема достапни виџети"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Нема резултати од пребарувањето"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Лични"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Работни"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Разговори"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Пребарувајте апликации"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Се вчитуваат апликации…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Не се најдени апликации што одговараат на „<xliff:g id="QUERY">%1$s</xliff:g>“"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Пребарај други апликации"</string>
     <string name="label_application" msgid="8531721983832654978">"Апликација"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Известувања"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Допрете двапати и задржете за избор на кратенка."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Допрете двапати и задржете за избор на кратенка или користете приспособени дејства."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Допрете и задржете за да преместите кратенка."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Допрете двапати и задржете за да преместите кратенка или користете приспособени дејства."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Нема повеќе простор на овој екран на почетната страница."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Нема повеќе простор на лентата „Омилени“"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Список со апликации"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Список со лични апликации"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Список со апликации за работа"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Почетна страница"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Отстрани"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Деинсталирај"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Инф. за апликација"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Инсталирај"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Не предлагај апликација"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Закачи го предвидувањето"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"инсталирај кратенки"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Овозможува апликацијата да додава кратенки без интервенција на корисникот."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"чита поставки и кратенки на почетна страница"</string>
@@ -62,7 +80,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Проблем при вчитувањето на виџетот"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Поставување"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Ова е системска апликација и не може да се деинсталира."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Неименувана папка"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Изменете го името"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> е оневозможена"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="one"><xliff:g id="APP_NAME_2">%1$s</xliff:g> има <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> известување</item>
@@ -76,13 +94,13 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Допрете за да го зачувате преименувањето"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Папката е затворена"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Папката е преименувана во <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Папка: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Виџети"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Папка: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ставки"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Папка: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> или повеќе ставки"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Тапети"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Стилови и тапети"</string>
-    <string name="settings_button_text" msgid="8873672322605444408">"Поставки за Home"</string>
+    <string name="settings_button_text" msgid="8873672322605444408">"Поставки за почетен екран"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Оневозможено од администраторот"</string>
-    <string name="allow_rotation_title" msgid="7728578836261442095">"Дозволете ротација на Почетниот екран"</string>
+    <string name="allow_rotation_title" msgid="7728578836261442095">"Дозволи ротација на почетниот екран"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"Кога телефонот се ротира"</string>
     <string name="notification_dots_title" msgid="9062440428204120317">"Точки за известување"</string>
     <string name="notification_dots_desc_on" msgid="1679848116452218908">"Вклучено"</string>
@@ -91,19 +109,19 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"За да се прикажуваат „Точки за известување“, вклучете ги известувањата за апликацијата <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Промени ги поставките"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Прикажувај точки за известување"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Додај икона на почетниот екран"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Додавај икони за апликации на почетен екран"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"За нови апликации"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Непознато"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Отстрани"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Барај"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Апликацијата не е инсталирана"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Апликацијата за оваа икона не е инсталирана. Може да ја отстраните или да се обидете да ја најдете апликацијата и да ја инсталирате рачно."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> се инсталира, <xliff:g id="PROGRESS">%2$s</xliff:g> завршено"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"Се презема <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="PROGRESS">%2$s</xliff:g> завршено"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> чека да се инсталира"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Виџети за <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Список со виџети"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Списокот со виџети е затворен"</string>
-    <string name="action_add_to_workspace" msgid="8902165848117513641">"Додај на Почетен екран"</string>
+    <string name="action_add_to_workspace" msgid="8902165848117513641">"Додај на почетниот екран"</string>
     <string name="action_move_here" msgid="2170188780612570250">"Премести ја ставката овде"</string>
     <string name="item_added_to_workspace" msgid="4211073925752213539">"Ставката е додадена на почетниот екран"</string>
     <string name="item_removed" msgid="851119963877842327">"Ставката е отстранета"</string>
@@ -128,15 +146,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Кратенки"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Кратенки и известувања"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Отфрли"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Затвори"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Известувањето е отфрлено"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Лично"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"За работа"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Работен профил"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Најдете апликации за работа тука"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Секоја апликација за работа има значка, а организацијата се грижи за нејзината безбедност. За полесен пристап, преместете ги апликациите на почетниот екран."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Управувано од вашата организација"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Известувањата и апликациите се исклучени"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Затвори"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Затворено"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Личните податоци се одделни и сокриени од работните апликации"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Работните апликации и податоци се видливи за IT-администраторот"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Следно"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Сфатив"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Работниот профил е паузиран"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Работните апликации не можат да ви испраќаат известувања, да ја користат батеријата или да пристапуваат до вашата локација"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Работниот профил е паузиран. Работните апликации не можат да ви испраќаат известувања, да ја користат батеријата или да пристапуваат до вашата локација"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Работните апликации имаат значка и се видливи за IT-администраторот"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Сфатив"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Паузирај ги работните апликации"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Вклучи"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Филтер"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Паузирајте работни апликации и известувања"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Не успеа: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index b95e1a7172..3ab0b3532d 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -56,8 +56,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" എന്നതുമായി പൊരുത്തപ്പെടുന്ന ആപ്പുകളൊന്നും കണ്ടെത്തിയില്ല"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"കൂടുതൽ ആപ്പുകൾക്ക് തിരയുക"</string>
     <string name="label_application" msgid="8531721983832654978">"ആപ്പ്"</string>
-    <string name="search_corpus_apps" msgid="1917889409963779022">"ആപ്പുകൾ"</string>
-    <string name="search_action_try_now" msgid="1458737965476149074">"ഇപ്പോൾ പരീക്ഷിക്കുക"</string>
     <string name="notifications_header" msgid="1404149926117359025">"അറിയിപ്പുകൾ"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"കുറുക്കുവഴി നീക്കാൻ സ്‌പർശിച്ച് പിടിക്കുക."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"കുറുക്കുവഴി നീക്കാൻ ഡബിൾ ടാപ്പ് ചെയ്യൂ, ഹോൾഡ് ചെയ്യൂ അല്ലെങ്കിൽ ഇഷ്‌ടാനുസൃത പ്രവർത്തനങ്ങൾ ഉപയോഗിക്കൂ."</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 577af39d60..9cf4cb853b 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -26,51 +26,39 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Татаж авсан апп-г Аюулгүй горим дотроос идэвхгүйжүүлсэн"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Safe горимд виджетүүдийг идэвхгүйжүүлсэн"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Товчлол алга"</string>
-    <!-- no translation found for home_screen (5629429142036709174) -->
-    <skip />
-    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
-    <skip />
-    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
-    <skip />
+    <string name="home_screen" msgid="5629429142036709174">"Нүүр"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Дэлгэцийг хуваах"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Жижиг хэрэгслийг зөөх бол хүрээд, удаан дарна уу."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Жижиг хэрэгслийг зөөх эсвэл захиалгат үйлдлийг ашиглахын тулд хоёр товшоод, удаан дарна уу."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d өргөн %2$d өндөр"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Гараар байршуулахын тулд дараад хүлээнэ үү"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Автоматаар нэмэх"</string>
-    <!-- no translation found for widgets_count (656794749266073027) -->
-    <!-- no translation found for shortcuts_count (8080294865447938455) -->
-    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
-    <skip />
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> жижиг хэрэгсэл</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> жижиг хэрэгсэл</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> товчлол</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> товчлол</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"Виджет"</string>
-    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
-    <skip />
-    <!-- no translation found for no_widgets_available (9140948620298620513) -->
-    <skip />
-    <!-- no translation found for no_search_results (6518732304311458580) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
-    <skip />
-    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
-    <skip />
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Хайх"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Хайх хэсгээс текстийг арилгах"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Боломжтой жижиг хэрэгсэл байхгүй"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Хайлтын илэрц байхгүй"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Хувийн"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Ажил"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Харилцан яриа"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Апп хайх"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Аппыг ачаалж байна..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\"-д тохирох апп олдсонгүй"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Бусад апп-г хайх"</string>
     <string name="label_application" msgid="8531721983832654978">"Апп"</string>
-    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
-    <skip />
-    <!-- no translation found for search_action_try_now (1458737965476149074) -->
-    <skip />
     <string name="notifications_header" msgid="1404149926117359025">"Мэдэгдэл"</string>
-    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
-    <skip />
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Товчлолыг зөөхийн тулд хүрээд, удаан дарна уу."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Товчлолыг зөөх эсвэл захиалгат үйлдлийг ашиглахын тулд хоёр товшоод, удаан дарна уу."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Энэ Нүүр дэлгэц зайгүй."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"\"Дуртай\" трей дээр өөр зай байхгүй байна"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Апп-н жагсаалт"</string>
@@ -128,8 +116,7 @@
     <string name="abandoned_search" msgid="891119232568284442">"Хайх"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Энэ апп-г суулгаагүй байна"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Энэ дүрсний апп-г суулгаагүй байна. Та үүнийг устгах буюу апп-г хайж суулгах боломжтой."</string>
-    <!-- no translation found for app_installing_title (5864044122733792085) -->
-    <skip />
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g>-г суулгаж байна. <xliff:g id="PROGRESS">%2$s</xliff:g> дууссан"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g>-г татаж байна, <xliff:g id="PROGRESS">%2$s</xliff:g> татсан"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> нь суулгахыг хүлээж байна"</string>
     <string name="widgets_list" msgid="796804551140113767">"Жижиг хэрэгслийн жагсаалт"</string>
@@ -169,20 +156,13 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"Дараах"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Ойлголоо"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"Ажлын профайлыг түр зогсоосон"</string>
-    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
-    <skip />
-    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
-    <skip />
-    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
-    <skip />
-    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
-    <skip />
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Ажлын аппууд танд мэдэгдэл илгээх, таны батарейг ашиглах эсвэл байршилд тань хандах боломжгүй"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Ажлын профайлыг түр зогсоосон. Ажлын аппууд танд мэдэгдэл илгээх, таны батарейг ашиглах эсвэл байршилд тань хандах боломжгүй"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Ажлын аппуудыг тэмдэглэсэн бөгөөд танай IT админд харагдана"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Ойлголоо"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Ажлын аппуудыг түр зогсоох"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Асаах"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Шүүлтүүр"</string>
     <string name="work_switch_tip" msgid="808075064383839144">"Ажлын апп болон мэдэгдлийг түр зогсоох"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Амжилтгүй болсон: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 49e38982cd..82eb841b0b 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -20,39 +20,64 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"कार्य"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"अ‍ॅप इंस्टॉल केलेला नाही."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"अ‍ॅप उपलब्ध नाही"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"डाउनलोड केलेला अ‍ॅप सुरक्षित मोड मध्‍ये अक्षम केला"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"विजेट सुरक्षित मोडमध्ये अक्षम झाले"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"शॉर्टकट उपलब्ध नाही"</string>
-    <string name="home_screen" msgid="806512411299847073">"होम स्क्रीन"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"कस्टम क्रिया"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"विजेट निवडण्यासाठी स्पर्श करा आणि धरून ठेवा."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"एक विजेट निवडण्यासाठी दोनदा टॅप करा आणि धरून ठेवा किंवा कस्टम क्रिया वापरा."</string>
+    <!-- no translation found for home_screen (5629429142036709174) -->
+    <skip />
+    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
+    <skip />
+    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
+    <skip />
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d रूंद बाय %2$d उंच"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"स्वतः ठेवण्यासाठी स्पर्श करा आणि धरून ठेवा"</string>
     <string name="place_automatically" msgid="8064208734425456485">"आपोआप जोडा"</string>
+    <!-- no translation found for widgets_count (656794749266073027) -->
+    <!-- no translation found for shortcuts_count (8080294865447938455) -->
+    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
+    <skip />
+    <string name="widget_button_text" msgid="2880537293434387943">"विजेट"</string>
+    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
+    <skip />
+    <!-- no translation found for no_widgets_available (9140948620298620513) -->
+    <skip />
+    <!-- no translation found for no_search_results (6518732304311458580) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
+    <skip />
+    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"अ‍ॅप्स शोधा"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"अ‍ॅप्स लोड करत आहे…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" शी जुळणारे कोणतेही अ‍ॅप्स आढळले नाहीत"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"अधिक अ‍ॅप्स शोधा"</string>
     <string name="label_application" msgid="8531721983832654978">"ॲप"</string>
     <string name="notifications_header" msgid="1404149926117359025">"सूचना"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"शॉर्टकट निवडण्यासाठी स्पर्श करा आणि धरून ठेवा."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"शॉर्टकट निवडण्यासाठी किंवा कस्टम क्रिया वापरण्यासाठी दोनदा टॅप करा आणि धरून ठेवा."</string>
+    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
+    <skip />
     <string name="out_of_space" msgid="4691004494942118364">"या मुख्य स्क्रीनवर आणखी जागा नाही."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"आवडीच्या ट्रे मध्ये आणखी जागा नाही"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"अ‍ॅप्स सूची"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"वैयक्तिक अ‍ॅप्स सूची"</string>
-    <string name="all_apps_button_work_label" msgid="7270707118948892488">"कामाच्या ठिकाणी वापरली जाणाऱ्या अॅप्सची सूची"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"होम"</string>
+    <string name="all_apps_button_work_label" msgid="7270707118948892488">"कामाच्या ठिकाणी वापरली जाणाऱ्या ॲप्सची सूची"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"काढा"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"अनइंस्टॉल करा"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"अ‍ॅप माहिती"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"इंस्टॉल करा"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"ॲप सुचवू नका"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"पूर्वानुमान पिन करा"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"शॉर्टकट स्‍थापित करा"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"वापरकर्ता हस्तक्षेपाशिवाय शॉर्टकट जोडण्यास अ‍ॅप ला अनुमती देते."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"होम सेटिंग्ज आणि शॉर्टकट वाचा"</string>
@@ -63,7 +88,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"विजेट लोड करण्यात समस्या"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"सेटअप"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"हा सिस्टम अ‍ॅप आहे आणि अनइंस्टॉल केला जाऊ शकत नाही."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"अनामित फोल्डर"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"नाव संपादित करा"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> अक्षम केला आहे"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g>साठी <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> सूचना आहेत</item>
@@ -77,31 +102,32 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"पुनर्नामित करणे सेव्ह करण्यासाठी टॅप करा"</string>
     <string name="folder_closed" msgid="4100806530910930934">"फोल्डर बंद"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"फोल्डरचे नाव बदलून <xliff:g id="NAME">%1$s</xliff:g> असे ठेवले"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"फोल्डर: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"विजेट"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"फोल्डर: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> आयटम"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"फोल्डर: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> किंवा त्याहून अधिक आयटम"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"वॉलपेपर"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"शैली आणि वॉलपेपर"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"होम सेटिंग्‍ज"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"आपल्या प्रशासकाने अक्षम केले"</string>
-    <string name="allow_rotation_title" msgid="7728578836261442095">"मुख्यस्क्रीन फिरविण्‍यास अनुमती द्या"</string>
+    <string name="allow_rotation_title" msgid="7728578836261442095">"मुख्य स्क्रीन फिरविण्‍यास अनुमती द्या"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"फोन फिरविला जातो तेव्हा"</string>
     <string name="notification_dots_title" msgid="9062440428204120317">"सूचना बिंदू"</string>
     <string name="notification_dots_desc_on" msgid="1679848116452218908">"सुरू"</string>
     <string name="notification_dots_desc_off" msgid="1760796511504341095">"बंद"</string>
     <string name="title_missing_notification_access" msgid="7503287056163941064">"सूचनांच्या अ‍ॅक्सेसची आवश्यकता आहे"</string>
-    <string name="msg_missing_notification_access" msgid="281113995110910548">"सूचना बिंदू दाखवण्यासाठी, <xliff:g id="NAME">%1$s</xliff:g> साठी अ‍ॅप सूचना चालू करा"</string>
+    <string name="msg_missing_notification_access" msgid="281113995110910548">"सूचना बिंदू दाखवण्यासाठी, <xliff:g id="NAME">%1$s</xliff:g> साठी अ‍ॅप सूचना सुरू करा"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"सेटिंग्ज बदला"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"सूचना बिंदू दाखवा"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"होम स्क्रीनवर आयकन जोडा"</string>
-    <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"नवीन अॅप्ससाठी"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"होम स्क्रीनवर ॲप आयकन जोडा"</string>
+    <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"नवीन ॲप्ससाठी"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"अज्ञात"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"काढा"</string>
-    <string name="abandoned_search" msgid="891119232568284442">"शोधा"</string>
+    <string name="abandoned_search" msgid="891119232568284442">"Search"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"हा अ‍ॅप इंस्टॉल केलेला नाही"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"या चिन्हासाठी अ‍ॅप इंस्टॉल केलेला नाही. तुम्ही ते काढू शकता किंवा अ‍ॅपचा शोध घेऊ शकता आणि त्यास व्यक्तिचलितपणे इंस्टॉल करू शकता."</string>
+    <!-- no translation found for app_installing_title (5864044122733792085) -->
+    <skip />
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> डाउनलोड होत आहे , <xliff:g id="PROGRESS">%2$s</xliff:g> पूर्ण झाले"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> इंस्टॉल करण्याची प्रतिक्षा करत आहे"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> विजेट"</string>
     <string name="widgets_list" msgid="796804551140113767">"विजेट सूची"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"विजेट सूची बंद केली"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"होम स्क्रीनवर जोडा"</string>
@@ -129,15 +155,30 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"शॉर्टकट"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"शॉर्टकट आणि सूचना"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"डिसमिस करा"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"बंद करा"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"सूचना डिसमिस केली"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"वैयक्तिक"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"कार्यालय"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"कार्य प्रोफाइल"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"कामाची अ‍ॅप्स येथे मिळवा"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"प्रत्येक कार्य अ‍ॅपला एक बॅज असतो आणि तो तुमच्या संस्थेकडून सुरक्षित ठेवला जातो. अधिक सहज अ‍ॅक्सेससाठी अ‍ॅप्स तुमच्या होम स्क्रीनवर हलवा."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"तुमच्या संस्थेकडून व्यवस्थापित"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"सूचना आणि अ‍ॅप्स बंद आहेत"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"बंद करा"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"बंद केले"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"वैयक्तिक डेटा वेगळा असतो आणि तो ऑफिस अ‍ॅप्सपासून लपवलेला असतो"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"कार्य अ‍ॅप्स आणि डेटा तुमच्या अ‍ॅडमिनला दृश्यमान असतो"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"पुढील"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"समजले"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"कार्य प्रोफाइल थांबवली आहे"</string>
+    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
+    <skip />
+    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
+    <skip />
+    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
+    <skip />
+    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
+    <skip />
+    <string name="work_switch_tip" msgid="808075064383839144">"कार्य अ‍ॅप्स आणि सूचना थांबवा"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"हे करता आले नाही: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 7d054124fb..e54c6fe628 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -20,39 +20,56 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Kerja"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Apl tidak dipasang."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Apl tidak tersedia"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Apl yang dimuat turun dilumpuhkan dalam mod Selamat"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Widget dilumpuhkan dalam mod Selamat"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Pintasan tidak tersedia"</string>
-    <string name="home_screen" msgid="806512411299847073">"Skrin utama"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Tindakan tersuai"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Sentuh &amp; tahan untuk mengambil widget."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Ketik dua kali &amp; tahan untuk mengambil widget atau menggunakan tindakan tersuai"</string>
+    <string name="home_screen" msgid="5629429142036709174">"Rumah"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Skrin pisah"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Sentuh &amp; tahan untuk menggerakkan widget."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Ketik dua kali &amp; tahan untuk menggerakkan widget atau menggunakan tindakan tersuai."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Lebar %1$d kali tinggi %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Sentuh &amp; tahan untuk meletakkan widget/ikon secara manual"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Tambahkan secara automatik"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> pintasan</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> pintasan</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Widget"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Cari"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Kosongkan teks daripada kotak carian"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Widget tidak tersedia"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Tiada hasil carian"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Peribadi"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Tempat kerja"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Perbualan"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Cari apl"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Memuatkan apl…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Tiada apl yang ditemui sepadan dengan \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Cari lagi apl"</string>
     <string name="label_application" msgid="8531721983832654978">"Apl"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Pemberitahuan"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Sentuh &amp; tahan untuk mengambil pintasan."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Ketik dua kali &amp; tahan untuk mengambil pintasan atau menggunakan tindakan tersuai."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Sentuh &amp; tahan untuk menggerakkan pintasan."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Ketik dua kali &amp; tahan untuk menggerakkan pintasan atau menggunakan tindakan tersuai."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Tiada lagi ruang pada skrin Laman Utama ini."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Tiada ruang dalam dulang Kegemaran lagi"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Senarai apl"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Senarai apl peribadi"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Senarai apl kerja"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Laman Utama"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Alih keluar"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Nyahpasang"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Maklumat apl"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Pasang"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Jangan cadangkan apl"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Sematkan Ramalan"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"pasang pintasan"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Membenarkan apl menambah pintasan tanpa campur tangan pengguna."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"baca tetapan dan pintasan Laman Utama"</string>
@@ -63,7 +80,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Masalah memuatkan widget"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Persediaan"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Ini ialah apl sistem dan tidak boleh dinyahpasang."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Folder Tanpa Nama"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Edit Nama"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> dilumpuhkan"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, mempunyai <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> pemberitahuan</item>
@@ -77,8 +94,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Ketik untuk menyimpan penamaan semula"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Folder ditutup"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Folder dinamakan semula kepada <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Folder: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Widget"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> item"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> atau lebih banyak item"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Kertas dinding"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Gaya &amp; kertas dinding"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Tetapan laman utama"</string>
@@ -92,16 +109,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Untuk menunjukkan Titik Pemberitahuan, hidupkan pemberitahuan apl untuk <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Tukar tetapan"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Tunjukkan titik pemberitahuan"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Tambahkan ikon pada Skrin Utama"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Tambahkan ikon apl pada Skrin utama"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Untuk apl baharu"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Tidak diketahui"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Alih keluar"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Carian"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Apl ini tidak dipasang"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Apl untuk ikon ini tidak dipasang. Anda boleh mengalih keluar atau mencari dan memasang apl itu secara manual."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> dipasang, <xliff:g id="PROGRESS">%2$s</xliff:g> selesai"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> memuat turun, <xliff:g id="PROGRESS">%2$s</xliff:g> selesai"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> menunggu untuk dipasang"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Widget <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Senarai widget"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Senarai widget ditutup"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Tambahkan pada Skrin Utama"</string>
@@ -129,15 +146,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Pintasan"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Pintasan dan pemberitahuan"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Ketepikan"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Tutup"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Pemberitahuan diketepikan"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Peribadi"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Kerja"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profil kerja"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Temui apl kerja di sini"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Setiap apl kerja terdapat lencana dan dilindungi oleh organisasi anda. Alihkan apl ke Skrin Utama untuk akses yang lebih mudah."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Diurus oleh organisasi anda"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Pemberitahuan dan apl dimatikan"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Tutup"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Ditutup"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Data peribadi adalah berasingan &amp; disembunyikan daripada apl kerja"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Apl &amp; data kerja kelihatan kepada pentadbir IT anda"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Seterusnya"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Profil kerja dijeda"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Apl kerja tidak boleh menghantar pemberitahuan kepada anda, menggunakan bateri anda atau mengakses lokasi anda"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Profil kerja dijeda. Apl kerja tidak boleh menghantar pemberitahuan kepada anda, menggunakan bateri anda atau mengakses lokasi anda"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Apl kerja mempunyai lencana dan kelihatan kepada pentadbir IT anda"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Jeda apl kerja"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Hidupkan"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Tapis"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Jeda apl kerja dan pemberitahuan"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Gagal: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 78856f657d..c7960a663a 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -26,32 +26,50 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"ဒေါင်းလုဒ် အက်ပ်ကို လုံခြုံရေး မုဒ်ထဲမှာ ပိတ်ထား"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"လုံခြုံရေး မုဒ်ထဲမှာ ဝီဂျက်များကို ပိတ်ထား"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"ဖြတ်လမ်း မရနိုင်ပါ"</string>
-    <string name="home_screen" msgid="806512411299847073">"ပင်မစာမျက်နှာ"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"စိတ်ကြိုက် လုပ်ဆောင်ချက်များ"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"ဝဒ်ဂျက်တစ်ခုကို ကောက်ယူရန် ဖိနှိပ်ထားပါ"</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"ဝစ်ဂျက်တစ်ခုကိုရယူရန် သို့မဟုတ် စိတ်ကြိုက်လုပ်ဆောင်မှုများကို အသုံးပြုရန် နှစ်ချက်တို့ပြီး ကိုင်ထားပါ။"</string>
+    <string name="home_screen" msgid="5629429142036709174">"ပင်မစာမျက်နှာ"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"မျက်နှာပြင် ခွဲ၍ပြသခြင်း"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"ဝိဂျက်ကို ရွှေ့ရန် နှစ်ချက်တို့ပြီး ဖိထားပါ။"</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ဝိဂျက်ကို ရွှေ့ရန် (သို့) စိတ်ကြိုက်လုပ်ဆောင်ချက်များကို သုံးရန် နှစ်ချက်တို့ပြီး ဖိထားပါ။"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"အလျား %1$d နှင့် အမြင့် %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"ကိုယ်တိုင်ထည့်ရန် ထိထားပါ"</string>
     <string name="place_automatically" msgid="8064208734425456485">"အလိုအလျောက် ထည့်ရန်"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other">ဝိဂျက် <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ခု</item>
+      <item quantity="one">ဝိဂျက် <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> ခု</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other">ဖြတ်လမ်းလင့်ခ် <xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> ခု</item>
+      <item quantity="one">ဖြတ်လမ်းလင့်ခ် <xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> ခု</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>၊ <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"ဝိဂျက်များ"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"ရှာရန်"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"ရှာဖွေစာလုံးဖြည့်ကွက်လပ်မှ စာသားကို ရှင်းလင်းပါ"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"ဝိဂျက်များ မရနိုင်ပါ"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"ရှာဖွေမှု ရလဒ်များ မရှိပါ"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ကိုယ်ပိုင်"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"အလုပ်"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"စကားဝိုင်းများ"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ရှာဖွေမှု အက်ပ်များ"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"အက်ပ်များကို ဖွင့်နေသည်…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" နှင့်ကိုက်ညီသည့် အပ်ပ်များကို မတွေ့ပါ"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"နောက်ထပ် အက်ပ်များကို ရှာပါ"</string>
     <string name="label_application" msgid="8531721983832654978">"အက်ပ်"</string>
     <string name="notifications_header" msgid="1404149926117359025">"အကြောင်းကြားချက်များ"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"ဖြတ်လမ်းလင့်ခ်တစ်ခုကို ရွေးရန် ထိပြီး ဖိထားပါ။"</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"ဖြတ်လမ်းလင့်ခ်ကို ရွေးရန် (သို့) စိတ်ကြိုက်လုပ်ဆောင်ချက်များကို သုံးရန် နှစ်ချက်တို့ပြီး ဖိထားပါ။"</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"ဖြတ်လမ်းလင့်ခ်ကို ရွှေ့ရန် နှစ်ချက်တို့ပြီး ဖိထားပါ။"</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ဖြတ်လမ်းလင့်ခ်ကို ရွှေ့ရန် (သို့) စိတ်ကြိုက်လုပ်ဆောင်ချက်များကို သုံးရန် နှစ်ချက်တို့ပြီး ဖိထားပါ။"</string>
     <string name="out_of_space" msgid="4691004494942118364">"ဤပင်မမျက်နှာစာတွင် နေရာလွတ် မကျန်တော့ပါ"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"အနှစ်သက်ဆုံးများ ထားရာတွင် နေရာလွတ် မကျန်တော့ပါ"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"အက်ပ်စာရင်း"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"တစ်ကိုယ်ရေသုံး အက်ပ်စာရင်း"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"အလုပ်သုံး အက်ပ်စာရင်း"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"ပင်မစာမျက်နှာ"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"ဖယ်ရှားမည်"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"ဖြုတ်ရန်"</string>
-    <string name="app_info_drop_target_label" msgid="692894985365717661">"အက်ပ်အချက်အလက်များ"</string>
+    <string name="app_info_drop_target_label" msgid="692894985365717661">"အက်ပ်အချက်အလက်"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"ထည့်သွင်းရန်"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"အက်ပ်ကို အကြံမပြုပါနှင့်"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"ခန့်မှန်းချက်ကို ပင်ထိုးရန်"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"အတိုကောက်မှတ်သားမှုများအား ထည့်သွင်းခြင်း"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"အသုံးပြုသူ လုပ်ဆောင်မှုမရှိပဲ အပ်ပလီကေးရှင်းကို အတိုကောက်မှတ်သားမှုများ ပြုလုပ်ခွင့် ပေးခြင်း"</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"ပင်မမျက်နှာစာ အပြင်အဆင် နှင့် အတိုကောက်မှတ်သားမှုများအား ဖတ်ခြင်း"</string>
@@ -62,7 +80,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"ဝဒ်ဂျက် တင်ရာတွင် ပြသနာ ရှိပါသည်"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"စဖွင့်သတ်မှတ်ရန်"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"ဤအပ်ပလီကေးရှင်းမှာ စစ်စတန်ပိုင်းဆိုင်ရာ အပ်ပလီကေးရှင်းဖြစ်ပါသည်။ ထုတ်ပစ်၍ မရပါ"</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"အမည်မရှိအကန့်"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"အမည်ကို တည်းဖြတ်ပါ"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> ကို ပိတ်ထားသည်"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g> တွင် သတိပေးချက် <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> ခု ရှိသည်</item>
@@ -76,8 +94,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"အမည်ပြောင်းခြင်းကို သိမ်းရန် တို့ပါ"</string>
     <string name="folder_closed" msgid="4100806530910930934">"ပိတ်ထားသောအကန့်"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"ပြောင်းလဲလိုက်သော အကန့်အမည် <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"အကန့်အမည်: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"ဝိဂျက်များ"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"ဖိုင်တွဲ - <xliff:g id="NAME">%1$s</xliff:g>၊ <xliff:g id="SIZE">%2$d</xliff:g> ဖိုင်များ"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"ဖိုင်တွဲ - <xliff:g id="NAME">%1$s</xliff:g>၊ <xliff:g id="SIZE">%2$d</xliff:g> သို့မဟုတ် နောက်ထပ်ဖိုင်များ"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"နောက်ခံများ"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"ပုံစံနှင့် နောက်ခံပုံများ"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"ပင်မဆက်တင်များ"</string>
@@ -91,16 +109,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"အကြောင်းကြားချက် အစက်များကို ပြသရန် <xliff:g id="NAME">%1$s</xliff:g> အတွက် အက်ပ်အကြောင်းကြားချက်များကို ဖွင့်ပါ"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"ဆက်တင်များ ပြောင်းရန်"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"သတိပေးချက် အစက်များ ပြရန်"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"ပင်မစာမျက်နှာသို့ သင်္ကေတပုံ ထည့်ရန်"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"\'ပင်မစာမျက်နှာ\' တွင် အက်ပ်သင်္ကေတထည့်ရန်"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"အက်ပ်အသစ်များအတွက်"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"မသိ"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"ဖယ်ရှားရန်"</string>
     <string name="abandoned_search" msgid="891119232568284442">"ရှာဖွေရန်"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"အက်ပ်မတပ်ဆင်ရသေးပါ"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"ဤအိုင်ကွန်အတွက် အက်ပ်အားမထည့်သွင်းထားပါ။ You can remove it, or search for the အက်ပ်and install it manually."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> ကို ထည့်သွင်းနေသည်၊ <xliff:g id="PROGRESS">%2$s</xliff:g> ပြီးပါပြီ"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> ဒေါင်းလုဒ်လုပ်နေသည်၊ <xliff:g id="PROGRESS">%2$s</xliff:g> ပြီးပါပြီ"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> ကိုထည့်သွင်းရန်စောင့်နေသည်"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> ဝိဂျက်များ"</string>
     <string name="widgets_list" msgid="796804551140113767">"ဝိဂျက်စာရင်း"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"ဝိဂျက်စာရင်းကို ပိတ်ထားသည်"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"ပင်မမျက်နှာစာသို့ ထည့်ပါ"</string>
@@ -128,15 +146,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"ဖြတ်လမ်းများ"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"ဖြတ်လမ်းလင့်ခ်နှင့် အကြောင်းကြားချက်များ"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"ပယ်ရန်"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"ပိတ်ရန်"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"အသိပေးချက်ကို ဖယ်ထုတ်ပြီးပါပြီ"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ကိုယ်ပိုင်"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"အလုပ်"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"အလုပ်ပရိုဖိုင်"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"အလုပ်အက်ပ်များကို ဤနေရာတွင်ရှာဖွေပါ"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"အလုပ်အက်ပ်တိုင်းတွင် တံဆိပ် တစ်ခုစီရှိပြီး သင်၏ အဖွဲ့အစည်းက လုံခြုံအောင် ထားရှိပါသည်။ အသုံးပြုရ ပိုမိုလွယ်ကူစေရန် အက်ပ်များကို သင်၏ ပင်မမျက်နှာပြင်သို့ ရွှေ့ပါ။"</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"သင်၏ အဖွဲ့အစည်းက စီမံခန့်ခွဲထားပါသည်"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"အကြောင်းကြားချက်များနှင့် အက်ပ်များကို ပိတ်ထားသည်"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"ပိတ်ရန်"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"ပိတ်ထားသည်"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"ကိုယ်ပိုင်ဒေတာများသည် သီးသန့်ဖြစ်ပြီး အလုပ်အက်ပ်များမှ ဖျောက်ထားသည်"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"အလုပ်သုံးအက်ပ်နှင့် ဒေတာများကို သင်၏ IT စီမံခန့်ခွဲသူက မြင်ရပါသည်"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"ရှေ့သို့"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Ok"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"အလုပ်ပရိုဖိုင် ခဏရပ်ထားသည်"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"အလုပ်သုံးအက်ပ်များက အကြောင်းကြားချက်များ ပို့ခြင်း၊ သင့်ဘက်ထရီ သုံးခြင်း (သို့) သင့်တည်နေရာ သုံးခြင်းတို့ မပြုလုပ်နိုင်ပါ"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"အလုပ်ပရိုဖိုင် ခဏရပ်ထားသည်။ အလုပ်သုံးအက်ပ်များက အကြောင်းကြားချက်များ ပို့ခြင်း၊ သင့်ဘက်ထရီ သုံးခြင်း (သို့) သင့်တည်နေရာ သုံးခြင်းတို့ မပြုလုပ်နိုင်ပါ"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"အလုပ်သုံးအက်ပ်များကို တံဆိပ်တပ်ထားပြီး သင်၏ IT စီမံခန့်ခွဲသူက မြင်နိုင်ပါသည်"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"ရပြီ"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"အလုပ်သုံးအက်ပ်များကို ခဏရပ်ရန်"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"ဖွင့်ရန်"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"စစ်ထုတ်ရန်"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"အလုပ်သုံးအက်ပ်နှင့် အကြောင်းကြားချက်များ ခဏရပ်ရန်"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"မအောင်မြင်ပါ− <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 2257367a6a..8245608e54 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -20,39 +20,56 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Jobb"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Appen er ikke installert."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Appen er ikke tilgjengelig"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"En nedlastet app er deaktivert i sikker modus"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Moduler er deaktivert i sikker modus"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Snarveien er ikke tilgjengelig"</string>
-    <string name="home_screen" msgid="806512411299847073">"Startskjerm"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Tilpassede handlinger"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Trykk og hold inne for å plukke opp en modul."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Dobbelttrykk og hold inne for å velge en modul eller bruke tilpassede handlinger."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Startskjerm"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Delt skjerm"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Trykk og hold for å flytte en modul."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dobbelttrykk og hold inne for å flytte en modul eller bruke tilpassede handlinger."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d bredde x %2$d høyde"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Trykk og hold for å plassere manuelt"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Legg til automatisk"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> moduler</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> modul</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> snarveier</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> snarvei</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Moduler"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Søk"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Tøm tekst fra søkefeltet"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Ingen moduler er tilgjengelige"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Ingen søkeresultater"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personlig"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Jobb"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Samtaler"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Søk etter apper"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Laster inn appene …"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Fant ingen apper som samsvarer med «<xliff:g id="QUERY">%1$s</xliff:g>»"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Søk etter flere apper"</string>
     <string name="label_application" msgid="8531721983832654978">"App"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Varsler"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Trykk og hold for å velge en snarvei."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Dobbelttrykk og hold for å velge en snarvei eller bruke tilpassede handlinger."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Trykk og hold for å flytte en snarvei."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dobbelttrykk og hold for å flytte en snarvei eller bruke tilpassede handlinger."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Denne startsiden er full."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Favoritter-skuffen er full"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"App-liste"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Personlige apper-liste"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Jobbapper-liste"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Startside"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Fjern"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Avinstaller"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Info om appen"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Installer"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Ikke foreslå app"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Fest forslaget"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"installere snarveier"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Gir apper tillatelse til å legge til snarveier uten innblanding fra brukeren."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"lese startsideinnstillinger og -snarveier"</string>
@@ -63,7 +80,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Problem ved innlasting av modul"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Konfigurering"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Dette er en systemapp som ikke kan avinstalleres."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Mappe uten navn"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Rediger navn"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Slo av <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g> har <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> varsler</item>
@@ -77,8 +94,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Trykk for å lagre det nye navnet"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Mappen ble lukket"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Mappen heter nå <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Mappe: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Moduler"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Mappe: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elementer"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Mappe: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> eller flere elementer"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Bakgrunner"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stiler og bakgrunner"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Startsideinnstillinger"</string>
@@ -92,16 +109,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Slå på appvarsler for <xliff:g id="NAME">%1$s</xliff:g> for å vise varselsprikker"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Endre innstillingene"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Vis varselsprikker"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Legg til ikon på startsiden"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Legg til appikoner på startskjermen"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"For nye apper"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Ukjent"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Fjern"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Søk"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Denne appen er ikke installert"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Appen for dette ikonet er ikke installert. Du kan fjerne det, eller prøve å søke etter appen og installere den manuelt."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> installerer, <xliff:g id="PROGRESS">%2$s</xliff:g> er fullført"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"Laster ned <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="PROGRESS">%2$s</xliff:g> er fullført"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"Venter på å installere <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g>-moduler"</string>
     <string name="widgets_list" msgid="796804551140113767">"Modulliste"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Modullisten er lukket"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Legg til på startskjermen"</string>
@@ -129,15 +146,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Snarveier"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Snarveier og varsler"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Avvis"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Lukk"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Varselet ble avvist"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personlig"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Jobb"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Jobbprofil"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Finn jobbapper her"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Alle jobbapper har et merke og sikres av organisasjonen din. Flytt apper til startskjermen for å gjøre det enklere å finne dem."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Administreres av organisasjonen din"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Varsler og apper er slått av"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Lukk"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Lukket"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Personlige data er atskilte og skjules fra jobbapper"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Jobbapper og -data er synlige for IT-administratoren din"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Neste"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Greit"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Jobbprofilen er satt på pause"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Jobbapper kan ikke sende deg varsler, bruke batteriet eller få tilgang til posisjonen din"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Jobbprofilen er satt på pause. Jobbapper kan ikke sende deg varsler, bruke batteriet eller få tilgang til posisjonen din"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Jobbapper er merket og synlige for IT-administratoren din"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Greit"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Sett jobbapper på pause"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Slå på"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filter"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Sett jobbapper og -varsler på pause"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Mislyktes: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index f55d6bbd36..6f2afc23e0 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -62,10 +62,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" सँग मिल्दो कुनै एप भेटिएन"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"थप एपहरू खोज्नुहोस्"</string>
     <string name="label_application" msgid="8531721983832654978">"एप"</string>
-    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
-    <skip />
-    <!-- no translation found for search_action_try_now (1458737965476149074) -->
-    <skip />
     <string name="notifications_header" msgid="1404149926117359025">"सूचनाहरू"</string>
     <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
     <skip />
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 7966e5d07e..5af9252425 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -56,8 +56,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Er zijn geen apps gevonden die overeenkomen met \'<xliff:g id="QUERY">%1$s</xliff:g>\'"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Zoeken naar meer apps"</string>
     <string name="label_application" msgid="8531721983832654978">"App"</string>
-    <string name="search_corpus_apps" msgid="1917889409963779022">"Apps"</string>
-    <string name="search_action_try_now" msgid="1458737965476149074">"Nu proberen"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Meldingen"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Tik en houd vast om een snelkoppeling te verplaatsen."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dubbeltik en houd vast om een snelkoppeling te verplaatsen of aangepaste acties te gebruiken."</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 368b4ef98a..d182ad4a7d 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -62,10 +62,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" ସହିତ ମେଳ ହେଉଥିବା କୌଣସି ଆପ୍‌ ମିଳିଲା ନାହିଁ"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"ଅଧିକ ଆପ୍‌ ଖୋଜନ୍ତୁ"</string>
     <string name="label_application" msgid="8531721983832654978">"ଆପ୍"</string>
-    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
-    <skip />
-    <!-- no translation found for search_action_try_now (1458737965476149074) -->
-    <skip />
     <string name="notifications_header" msgid="1404149926117359025">"ବିଜ୍ଞପ୍ତି"</string>
     <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
     <skip />
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index de986b7a62..7ae1d1ae63 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -62,10 +62,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" ਨਾਲ ਮੇਲ ਖਾਂਦੀਆਂ ਕੋਈ ਐਪਾਂ ਨਹੀਂ ਮਿਲੀਆਂ"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"ਹੋਰ ਐਪਾਂ ਖੋਜੋ"</string>
     <string name="label_application" msgid="8531721983832654978">"ਐਪ"</string>
-    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
-    <skip />
-    <!-- no translation found for search_action_try_now (1458737965476149074) -->
-    <skip />
     <string name="notifications_header" msgid="1404149926117359025">"ਸੂਚਨਾਵਾਂ"</string>
     <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
     <skip />
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 68859605fb..43b1c6d2e4 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -20,39 +20,64 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="work_folder_name" msgid="3753320833950115786">"Praca"</string>
+    <string name="work_folder_name" msgid="3753320833950115786">"Służbowy"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Aplikacja nie jest zainstalowana."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Aplikacja niedostępna"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Pobrana aplikacja została wyłączona w trybie awaryjnym"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Widżety są wyłączone w trybie bezpiecznym"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Skrót nie jest dostępny"</string>
-    <string name="home_screen" msgid="806512411299847073">"Ekran główny"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Działania niestandardowe"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Aby dodać widżet, kliknij go i przytrzymaj."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Kliknij dwukrotnie i przytrzymaj, by wybrać widżet lub użyć działań niestandardowych."</string>
+    <!-- no translation found for home_screen (5629429142036709174) -->
+    <skip />
+    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
+    <skip />
+    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
+    <skip />
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Szerokość %1$d, wysokość %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Kliknij i przytrzymaj, by umieścić ręcznie"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Dodaj automatycznie"</string>
+    <!-- no translation found for widgets_count (656794749266073027) -->
+    <!-- no translation found for shortcuts_count (8080294865447938455) -->
+    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
+    <skip />
+    <string name="widget_button_text" msgid="2880537293434387943">"Widżety"</string>
+    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
+    <skip />
+    <!-- no translation found for no_widgets_available (9140948620298620513) -->
+    <skip />
+    <!-- no translation found for no_search_results (6518732304311458580) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
+    <skip />
+    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Wyszukaj aplikacje"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Ładuję aplikacje…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nie znaleziono aplikacji pasujących do zapytania „<xliff:g id="QUERY">%1$s</xliff:g>”"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Wyszukaj więcej aplikacji"</string>
     <string name="label_application" msgid="8531721983832654978">"Aplikacja"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Powiadomienia"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Kliknij i przytrzymaj, by wybrać skrót."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Kliknij dwukrotnie i przytrzymaj, by wybrać skrót lub użyć działań niestandardowych."</string>
+    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
+    <skip />
     <string name="out_of_space" msgid="4691004494942118364">"Brak miejsca na tym ekranie głównym."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Brak miejsca w Ulubionych"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista aplikacji"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista aplikacji osobistych"</string>
-    <string name="all_apps_button_work_label" msgid="7270707118948892488">"Lista aplikacji do pracy"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Ekran główny"</string>
+    <string name="all_apps_button_work_label" msgid="7270707118948892488">"Lista aplikacji służbowych"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Usuń"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Odinstaluj"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"O aplikacji"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Zainstaluj"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Nie proponuj aplikacji"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Przypnij podpowiedź"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"instalowanie skrótów"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Pozwala aplikacji dodawać skróty bez interwencji użytkownika."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"odczytywanie ustawień i skrótów na ekranie głównym"</string>
@@ -63,7 +88,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Problem podczas ładowania widżetu"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Konfiguracja"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"To aplikacja systemowa i nie można jej odinstalować."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Folder bez nazwy"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Edytuj nazwę"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Aplikacja <xliff:g id="APP_NAME">%1$s</xliff:g> jest wyłączona"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="few"><xliff:g id="APP_NAME_2">%1$s</xliff:g> – <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> powiadomienia</item>
@@ -79,11 +104,11 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Kliknij, by zapisać nową nazwę"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Folder zamknięty"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Nazwa folderu zmieniona na <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Folder: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Widżety"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elementy"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, liczba elementów: <xliff:g id="SIZE">%2$d</xliff:g> lub więcej"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Tapety"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Style i tapety"</string>
-    <string name="settings_button_text" msgid="8873672322605444408">"Ustawienia strony głównej"</string>
+    <string name="settings_button_text" msgid="8873672322605444408">"Ustawienia ekranu głównego"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Funkcja wyłączona przez administratora"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Zezwalaj na obrót ekranu głównego"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"Po obróceniu telefonu"</string>
@@ -94,16 +119,17 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Aby pokazać plakietki z powiadomieniami, włącz powiadomienia aplikacji <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Zmień ustawienia"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Pokaż plakietki z powiadomieniami"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Dodaj ikonę do ekranu głównego"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Dodaj ikony aplikacji do ekranu głównego"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"W przypadku nowych aplikacji"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Brak informacji"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Usuń"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Szukaj"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Ta aplikacja nie jest zainstalowana"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Aplikacja, której odpowiada ta ikona, nie jest zainstalowana. Możesz usunąć ikonę lub wyszukać aplikację i zainstalować ją ręcznie."</string>
+    <!-- no translation found for app_installing_title (5864044122733792085) -->
+    <skip />
     <string name="app_downloading_title" msgid="8336702962104482644">"Pobieranie elementu <xliff:g id="NAME">%1$s</xliff:g>, ukończono: <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> oczekuje na instalację"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> – widżety"</string>
     <string name="widgets_list" msgid="796804551140113767">"Lista widgetów"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Lista widgetów zamknięta"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Dodaj do ekranu głównego"</string>
@@ -130,16 +156,31 @@
     <string name="widget_resized" msgid="9130327887929620">"Szerokość i wysokość widżetu zmieniła się na <xliff:g id="NUMBER_0">%1$s</xliff:g> x <xliff:g id="NUMBER_1">%2$s</xliff:g>"</string>
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Skróty"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Skróty i powiadomienia"</string>
-    <string name="action_dismiss_notification" msgid="5909461085055959187">"Odrzuć"</string>
+    <string name="action_dismiss_notification" msgid="5909461085055959187">"Zamknij"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Zamknij"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Powiadomienie odrzucone"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Osobiste"</string>
-    <string name="all_apps_work_tab" msgid="4884822796154055118">"Praca"</string>
+    <string name="all_apps_work_tab" msgid="4884822796154055118">"Służbowe"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profil służbowy"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Aplikacje do pracy"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Każda aplikacja do pracy ma plakietkę, a o jej bezpieczeństwo dba Twoja organizacja. Aplikacje można przenieść na ekran główny, by były łatwiej dostępne."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Profil zarządzany przez Twoją organizację"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Powiadomienia i aplikacje są wyłączone"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Zamknij"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Zamknięto"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Dane osobiste znajdują się w innym miejscu i są niewidoczne dla aplikacji służbowych"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Dane i aplikacje z profilu służbowego są widoczne dla Twojego administratora IT"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Dalej"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Wstrzymano profil służbowy"</string>
+    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
+    <skip />
+    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
+    <skip />
+    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
+    <skip />
+    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
+    <skip />
+    <string name="work_switch_tip" msgid="808075064383839144">"Wstrzymaj aplikacje służbowe i powiadomienia"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Niepowodzenie: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index a01f71a9bd..243f665b8e 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -26,51 +26,39 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Aplicação transferida desativada no Modo de segurança"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Widgets desativados no Modo de segurança"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"O atalho não está disponível"</string>
-    <!-- no translation found for home_screen (5629429142036709174) -->
-    <skip />
-    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
-    <skip />
-    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
-    <skip />
+    <string name="home_screen" msgid="5629429142036709174">"Página inicial"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Ecrã dividido"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Toque sem soltar para mover um widget."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Toque duas vezes sem soltar para mover um widget ou utilizar ações personalizadas."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de largura por %2$d de altura"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Toque sem soltar para colocar manualmente"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Adicionar automaticamente"</string>
-    <!-- no translation found for widgets_count (656794749266073027) -->
-    <!-- no translation found for shortcuts_count (8080294865447938455) -->
-    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
-    <skip />
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> atalhos</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> atalho</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
-    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
-    <skip />
-    <!-- no translation found for no_widgets_available (9140948620298620513) -->
-    <skip />
-    <!-- no translation found for no_search_results (6518732304311458580) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
-    <skip />
-    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
-    <skip />
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Pesquisar"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Limpe o texto da caixa de pesquisa"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Nenhum widget disponível"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Nenhum resultado da pesquisa"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Pessoais"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Trabalho"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Conversas"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Pesquisar aplicações"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"A carregar aplicações…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nenhuma app correspondente a \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Pesquisar mais aplicações"</string>
     <string name="label_application" msgid="8531721983832654978">"Aplicação"</string>
-    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
-    <skip />
-    <!-- no translation found for search_action_try_now (1458737965476149074) -->
-    <skip />
     <string name="notifications_header" msgid="1404149926117359025">"Notificações"</string>
-    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
-    <skip />
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Toque sem soltar para mover um atalho."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Toque duas vezes sem soltar para mover um atalho ou utilizar ações personalizadas."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Sem espaço suficiente neste Ecrã principal."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Não existe mais espaço no tabuleiro de Favoritos"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista de aplicações"</string>
@@ -128,8 +116,7 @@
     <string name="abandoned_search" msgid="891119232568284442">"Pesquisar"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Esta app não está instalada"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"A app deste ícone não está instalada. Pode removê-lo ou pesquisar a app e instalá-la manualmente."</string>
-    <!-- no translation found for app_installing_title (5864044122733792085) -->
-    <skip />
+    <string name="app_installing_title" msgid="5864044122733792085">"A instalar <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="PROGRESS">%2$s</xliff:g> concluído"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"A transferir o <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="PROGRESS">%2$s</xliff:g> concluído"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"A aguardar a instalação do <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Lista de widgets"</string>
@@ -169,20 +156,13 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"Seguinte"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"Perfil de trabalho em pausa"</string>
-    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
-    <skip />
-    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
-    <skip />
-    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
-    <skip />
-    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
-    <skip />
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"As apps de trabalho não podem enviar-lhe notificações, utilizar a sua bateria ou aceder à sua localização"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"O perfil de trabalho está em pausa. As apps de trabalho não podem enviar-lhe notificações, utilizar a sua bateria ou aceder à sua localização"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"As apps de trabalho têm um emblema e estão visíveis para o seu administrador de TI"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Colocar apps de trabalho em pausa"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Ativar"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtrar"</string>
     <string name="work_switch_tip" msgid="808075064383839144">"Coloque as apps de trabalho e as notificações em pausa."</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Falhou: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index aad52dc8dc..22a041de3c 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -56,8 +56,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nenhum app encontrado que corresponda a \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Pesquisar mais apps"</string>
     <string name="label_application" msgid="8531721983832654978">"App"</string>
-    <string name="search_corpus_apps" msgid="1917889409963779022">"Apps"</string>
-    <string name="search_action_try_now" msgid="1458737965476149074">"Testar agora"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Notificações"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Toque e mantenha a tela pressionada para mover um atalho."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Toque duas vezes e mantenha a tela pressionada para mover um atalho ou usar ações personalizadas."</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index f8a61f11f7..20b335375b 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -26,32 +26,52 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Aplicația descărcată este dezactivată în modul de siguranță"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Widgeturile sunt dezactivate în modul de siguranță"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Comanda rapidă nu este disponibilă"</string>
-    <string name="home_screen" msgid="806512411299847073">"Ecran de pornire"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Acțiuni personalizate"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Atingeți lung un widget pentru a-l alege."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Atingeți de două ori și mențineți apăsat ca să alegeți un widget sau folosiți acțiuni personalizate."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Pagina de pornire"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Ecran împărțit"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Atingeți și țineți apăsat pentru a muta un widget."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Atingeți de două ori și țineți apăsat pentru a muta un widget sau folosiți acțiuni personalizate."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d lățime și %2$d înălțime"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Atingeți lung pentru a plasa manual"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Adăugați automat"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgeturi</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> de widgeturi</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="few"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> comenzi rapide</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> de comenzi rapide</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> comandă rapidă</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g> <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Widgeturi"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Căutare"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Ștergeți textul din caseta de căutare"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Niciun widget disponibil"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Niciun rezultat al căutării"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personale"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Serviciu"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Conversații"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Căutați aplicații"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Se încarcă aplicații…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nu s-a găsit nicio aplicație pentru „<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Căutați mai multe aplicații"</string>
     <string name="label_application" msgid="8531721983832654978">"Aplicație"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Notificări"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Atingeți lung pentru a selecta o comandă rapidă."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Atingeți lung pentru a selecta o comandă rapidă sau folosiți acțiuni personalizate."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Atingeți și țineți apăsat pentru a muta comanda rapidă."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Atingeți de două ori și țineți apăsat pentru a muta o comandă rapidă sau folosiți acțiuni personalizate."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Nu mai este loc pe acest Ecran de pornire."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Spațiu epuizat în bara Preferate"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista de aplicații"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista de aplicații personale"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Lista de aplicații de serviciu"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Ecran de pornire"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Eliminați"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Dezinstalați"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Informații despre aplicații"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Instalați"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Nu sugera aplicația"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Fixează predicția"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"instalează comenzi rapide"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Permite unei aplicații să adauge comenzi rapide fără intervenția utilizatorului."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"citește setări și comenzi rapide pentru ecranul de pornire"</string>
@@ -62,7 +82,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Problemă la încărcarea widgetului"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Configurați"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Aceasta este o aplicație de sistem și nu poate fi dezinstalată."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Dosar fără nume"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Modificați numele"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"S-a dezactivat <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="few"><xliff:g id="APP_NAME_2">%1$s</xliff:g> are <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> notificări</item>
@@ -77,8 +97,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Atingeți pentru a salva noul nume"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Dosar închis"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Dosar redenumit <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Dosar: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Widgeturi"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Dosar: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elemente"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Dosar: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> sau mai multe elemente"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Imagini de fundal"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stiluri și imagini de fundal"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Setări ecran de pornire"</string>
@@ -92,16 +112,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Pentru a afișa punctele de notificare, activați notificările din aplicație pentru <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Modificați setările"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Afișați punctele de notificare"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Adaugă pictograme în ecranul de pornire"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Adaugă pictograme de aplicații pe ecran"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Pentru aplicații noi"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Necunoscut"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Eliminați"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Căutați"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Aplicația nu este instalată"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Aplicația pentru această pictogramă nu este instalată. Puteți să ștergeți pictograma sau să căutați aplicația și s-o instalați manual."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> se instalează, <xliff:g id="PROGRESS">%2$s</xliff:g> finalizat"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> se descarcă (finalizat <xliff:g id="PROGRESS">%2$s</xliff:g>)"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> așteaptă instalarea"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Widgeturi <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Listă de widgeturi"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Lista de widgeturi este închisă"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Adăugați pe ecranul de pornire"</string>
@@ -129,15 +149,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Comenzi rapide"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Comenzi rapide și notificări"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Închideți"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Închideți"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Notificare închisă"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personale"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Profesionale"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profil de serviciu"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Găsiți aplicații de serviciu aici"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Fiecare aplicație de serviciu are o insignă și este păstrată în siguranță de organizația dvs. Mutați aplicațiile pe ecranul de pornire pentru acces mai ușor."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Gestionat de organizația dvs."</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Notificările și aplicațiile sunt dezactivate"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Închideți"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Închis"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Datele cu caracter personal sunt separate și ascunse de aplicațiile pentru lucru"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Aplicațiile și datele pentru lucru sunt vizibile pentru administratorul IT"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Înainte"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Profilul de serviciu este întrerupt"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Aplicațiile pentru lucru nu pot să vă trimită notificări, să folosească bateria sau să vă acceseze locația"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Profilul de serviciu este întrerupt. Aplicațiile pentru lucru nu pot să vă trimită notificări, să folosească bateria sau să vă acceseze locația"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Aplicațiile pentru lucru sunt marcate și vizibile pentru administratorul IT"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Întrerupeți aplicațiile pentru lucru"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Activați"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtru"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Întrerupeți aplicațiile pentru lucru și notificările"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Eșuare: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 23b00d0936..2e17d443aa 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -20,39 +20,60 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Работа"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Приложение удалено"</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Приложение недоступно"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Скачанное приложение отключено в безопасном режиме"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Виджеты отключены в безопасном режиме"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Ярлык недоступен"</string>
-    <string name="home_screen" msgid="806512411299847073">"Главный экран"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Специальные действия"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Чтобы выбрать виджет, нажмите на значок и удерживайте его."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Чтобы выбрать виджет или использовать специальные действия, нажмите на него дважды и не отпускайте."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Главный экран"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Разделить экран"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Нажмите и удерживайте для переноса виджета."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Чтобы использовать специальные действия или перенести виджет, нажмите на него дважды и удерживайте."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d x %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Ширина %1$d, высота %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Нажмите и удерживайте, чтобы добавить вручную."</string>
     <string name="place_automatically" msgid="8064208734425456485">"Добавить автоматически"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виджет</item>
+      <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виджета</item>
+      <item quantity="many"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виджетов</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виджета</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> ярлык</item>
+      <item quantity="few"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> ярлыка</item>
+      <item quantity="many"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> ярлыков</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> ярлыка</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Виджеты"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Поиск"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Удалить текст из окна поиска"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Нет доступных виджетов."</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Ничего не найдено."</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Личные виджеты"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Рабочие виджеты"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Разговоры"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Поиск приложений"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Загрузка приложений…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"По запросу \"<xliff:g id="QUERY">%1$s</xliff:g>\" ничего не найдено"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Искать другие приложения"</string>
     <string name="label_application" msgid="8531721983832654978">"Приложение"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Уведомления"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Нажмите и удерживайте, чтобы выбрать ярлык."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Нажмите дважды и удерживайте, чтобы выбрать ярлык или использовать специальные действия."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Нажмите и удерживайте для переноса ярлыка."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Чтобы использовать специальные действия или перенести ярлык, нажмите на него дважды и удерживайте."</string>
     <string name="out_of_space" msgid="4691004494942118364">"На этом экране все занято"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"В разделе \"Избранное\" больше нет места"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Список приложений"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Открыть список личных приложений"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Открыть список приложений для работы"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Главный экран"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Убрать"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Удалить"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"О приложении"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Установить"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Не рекомендовать"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Закрепить рекомендацию"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"Создание ярлыков"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Приложение сможет самостоятельно добавлять ярлыки."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"Доступ к настройкам и ярлыкам главного экрана"</string>
@@ -63,7 +84,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Не удалось загрузить виджет"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Настройка"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Это системное приложение, его нельзя удалить."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Папка без названия"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Измените название"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Приложение <xliff:g id="APP_NAME">%1$s</xliff:g> отключено"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="one">В приложении \"<xliff:g id="APP_NAME_2">%1$s</xliff:g>\" <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> уведомление</item>
@@ -79,14 +100,14 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Нажмите, чтобы подтвердить переименование"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Папка закрыта"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Папка переименована в \"<xliff:g id="NAME">%1$s</xliff:g>\""</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Папка: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Виджеты"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Папка \"<xliff:g id="NAME">%1$s</xliff:g>\" (объектов: <xliff:g id="SIZE">%2$d</xliff:g>)"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Папка \"<xliff:g id="NAME">%1$s</xliff:g>\" (объектов: <xliff:g id="SIZE">%2$d</xliff:g> или больше)"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Обои"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Стили и обои"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Главный экран"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Функция отключена администратором"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Разрешить поворачивать главный экран"</string>
-    <string name="allow_rotation_desc" msgid="8662546029078692509">"Когда телефон повернут"</string>
+    <string name="allow_rotation_desc" msgid="8662546029078692509">"При повороте телефона"</string>
     <string name="notification_dots_title" msgid="9062440428204120317">"Значки уведомлений"</string>
     <string name="notification_dots_desc_on" msgid="1679848116452218908">"Включены"</string>
     <string name="notification_dots_desc_off" msgid="1760796511504341095">"Отключены"</string>
@@ -94,16 +115,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Чтобы показывать значки уведомлений, включите уведомления в приложении \"<xliff:g id="NAME">%1$s</xliff:g>\""</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Изменить настройки"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Показывать значки уведомлений"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Добавлять значки"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Добавлять значки на главный экран"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Добавлять значки установленных приложений на главный экран"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Неизвестно"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Убрать"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Найти"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Приложение не установлено"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Приложение не установлено. Вы можете удалить значок или найти приложение и установить его вручную."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"Установка приложения \"<xliff:g id="NAME">%1$s</xliff:g>\" (выполнено <xliff:g id="PROGRESS">%2$s</xliff:g>)"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"Скачивается \"<xliff:g id="NAME">%1$s</xliff:g>\" (<xliff:g id="PROGRESS">%2$s</xliff:g>)"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"Ожидание установки \"<xliff:g id="NAME">%1$s</xliff:g>\""</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g>: виджеты"</string>
     <string name="widgets_list" msgid="796804551140113767">"Список виджетов"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Список виджетов закрыт"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Добавить на главный экран"</string>
@@ -131,15 +152,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Ярлыки"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Ярлыки и уведомления"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Закрыть"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Закрыть"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Уведомление закрыто"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Личные"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Рабочие"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Рабочий профиль"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Приложения для работы"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Рабочие приложения отмечены специальным значком. Их безопасность обеспечивает ваша организация. Для удобства перенесите эти приложения на главный экран."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Управляется вашей организацией"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Уведомления и приложения отключены."</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Закрыть"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Закрыта"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Личные данные скрыты от рабочих приложений и недоступны им."</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Рабочие приложения и данные видны системному администратору."</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Далее"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"ОК"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Действие рабочего профиля приостановлено."</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Рабочие приложения не могут отправлять уведомления, расходовать заряд батареи и получать доступ к данным о вашем местоположении."</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Рабочий профиль приостановлен. Рабочие приложения не могут отправлять уведомления, расходовать заряд батареи и получать доступ к данным о вашем местоположении."</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"У рабочих приложений есть специальная пометка. Они видны системному администратору."</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"ОК"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Приостановить рабочие приложения"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Включить"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Фильтр"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Приостановить рабочие приложения и уведомления"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Не удалось выполнить действие (<xliff:g id="WHAT">%1$s</xliff:g>)."</string>
 </resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index f680435a75..22baa2acec 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -56,8 +56,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" සමග ගැළපෙන යෙදුම් හමු නොවිණි"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"තව යෙදුම් සඳහා සොයන්න"</string>
     <string name="label_application" msgid="8531721983832654978">"යෙදුම"</string>
-    <string name="search_corpus_apps" msgid="1917889409963779022">"යෙදුම්"</string>
-    <string name="search_action_try_now" msgid="1458737965476149074">"දැන් උත්සාහ කරන්න"</string>
     <string name="notifications_header" msgid="1404149926117359025">"දැනුම්දීම්"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"කෙටි මගක් ගෙන යාමට ස්පර්ශ කර අල්ලාගෙන සිටින්න."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"කෙටි මගක් ගෙන යාමට හෝ අභිරුචි ක්‍රියා භාවිත කිරීමට දෙවරක් තට්ටු කර අල්ලා ගෙන සිටින්න."</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index f6a97b5313..1bcf5285dd 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -60,8 +60,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nenašli sa žiadne aplikácie zodpovedajúce dopytu <xliff:g id="QUERY">%1$s</xliff:g>"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Hľadať ďalšie aplikácie"</string>
     <string name="label_application" msgid="8531721983832654978">"Aplikácia"</string>
-    <string name="search_corpus_apps" msgid="1917889409963779022">"Aplikácie"</string>
-    <string name="search_action_try_now" msgid="1458737965476149074">"Vyskúšať"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Upozornenia"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Pridržaním presuňte skratku."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dvojitým klepnutím a pridržaním presuňte odkaz alebo použite vlastné akcie."</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 044a4b42b0..5879f91f3f 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -20,39 +20,60 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Služba"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Aplikacija ni nameščena."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Aplikacija ni na voljo"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Prenesena aplikacija je onemogočena v Varnem načinu"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Pripomočki so onemogočeni v varnem načinu"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Bližnjica ni na voljo"</string>
-    <string name="home_screen" msgid="806512411299847073">"Začetni zaslon"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Dejanja po meri"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Za izbiro pripomočka se ga dotaknite in pridržite."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Če želite izbrati pripomoček ali uporabiti dejanja po meri, se ga dvakrat dotaknite in ga pridržite."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Začetni zaslon"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Razdeljen zaslon"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Pridržite pripomoček, da ga premaknete."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvakrat se dotaknite pripomočka in ga pridržite, da ga premaknete, ali pa uporabite dejanja po meri."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Širina %1$d, višina %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Dotaknite se elementa in ga pridržite, da ga ročno dodate"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Samodejno dodaj"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> pripomoček</item>
+      <item quantity="two"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> pripomočka</item>
+      <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> pripomočki</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> pripomočkov</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> bližnjica</item>
+      <item quantity="two"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> bližnjici</item>
+      <item quantity="few"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> bližnjice</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> bližnjic</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Pripomočki"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Iskanje"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Brisanje besedila v iskalnem polju"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Ni pripomočkov"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Ni rezultatov iskanja"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Osebno"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Služba"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Pogovori"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Iskanje programov"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Nalaganje aplikacij …"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Ni aplikacij, ki bi ustrezale poizvedbi »<xliff:g id="QUERY">%1$s</xliff:g>«"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Iskanje več aplikacij"</string>
     <string name="label_application" msgid="8531721983832654978">"Aplikacija"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Obvestila"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Pridržite bližnjico, da jo izberete."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Dvakrat se dotaknite bližnjice in jo pridržite, da jo izberete, ali pa uporabite dejanja po meri."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Pridržite bližnjico, da jo premaknete."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dvakrat se dotaknite bližnjice in jo pridržite, da jo premaknete, ali pa uporabite dejanja po meri."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Na tem začetnem zaslonu ni več prostora."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"V vrstici za priljubljene ni več prostora"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Seznam aplikacij"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Seznam osebnih aplikacij"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Seznam delovnih aplikacij"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Začetni zaslon"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Odstrani"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Odmesti"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Podatki o aplikaciji"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Namesti"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Ne predlagaj aplikacij"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Predvidevanje pripenjanja"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"namestitev bližnjic"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Aplikaciji dovoli dodajanje bližnjic brez posredovanja uporabnika."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"branje nastavitev in bližnjic na začetnem zaslonu"</string>
@@ -63,7 +84,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Težava pri nalaganju pripomočka"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Nastavitev"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"To je sistemska aplikacija in je ni mogoče odstraniti."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Neimenovana mapa"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Urejanje imena"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> je onemogočena"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="one"><xliff:g id="APP_NAME_2">%1$s</xliff:g> ima <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> obvestilo</item>
@@ -79,11 +100,11 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Dotaknite se, da shranite preimenovanje"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Mapa je zaprta"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Mapa je preimenovana v <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Mapa: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Pripomočki"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Mapa: <xliff:g id="NAME">%1$s</xliff:g>, št. elementov: <xliff:g id="SIZE">%2$d</xliff:g>"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Mapa: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ali več elementov"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Ozadja"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Slogi in ozadja"</string>
-    <string name="settings_button_text" msgid="8873672322605444408">"Nastavitve začetnega zaslona"</string>
+    <string name="settings_button_text" msgid="8873672322605444408">"Domače nastavitve"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Onemogočil skrbnik."</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Omogočanje sukanja začetnega zaslona"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"Ko se telefon zasuka"</string>
@@ -94,16 +115,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Za prikaz obvestilnih pik vklopite obvestila aplikacije <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Spremeni nastavitve"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Pokaži obvestilne pike"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Dodaj ikono na začetni zaslon"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Dodaj ikone aplikacij na začetni zaslon"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Za nove aplikacije"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Neznano"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Odstrani"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Iskanje"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Ta aplikacija ni nameščena."</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Aplikacija za to ikono ni nameščena. Lahko jo odstranite ali poiščete aplikacijo in to namestite ročno."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> se namešča, dokončano: <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"Prenašanje aplikacije <xliff:g id="NAME">%1$s</xliff:g>; preneseno <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"Aplikacija <xliff:g id="NAME">%1$s</xliff:g> čaka na namestitev"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Pripomočki za <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Seznam pripomočkov"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Seznam pripomočkov se je zaprl"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Dodajanje na začetni zaslon"</string>
@@ -131,15 +152,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Bližnjice"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Bližnjice in obvestila"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Opusti"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Zapri"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Obvestilo je bilo opuščeno"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Osebno"</string>
-    <string name="all_apps_work_tab" msgid="4884822796154055118">"Služba"</string>
+    <string name="all_apps_work_tab" msgid="4884822796154055118">"Delo"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Delovni profil"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Tukaj poiščite delovne aplikacije"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Vsaka delovna aplikacija ima značko. Za varnost teh aplikacij skrbi vaša organizacija. Za preprostejši dostop premaknite aplikacije na začetni zaslon."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Upravlja vaša organizacija"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Obvestila in aplikacije – izklopljeno"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Zapri"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Zaprto"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Osebni podatki so ločeni in skriti pred delovnimi aplikacijami"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Delovne aplikacije in službeni podatki so vidni skrbniku za IT"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Naprej"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Razumem"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Delovni profil je začasno zaustavljen"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Delovne aplikacije ne smejo pošiljati obvestil, porabljati energije baterije ali dostopati do lokacije."</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Delovni profil je začasno zaustavljen. Delovne aplikacije ne smejo pošiljati obvestil, porabljati energije baterije ali dostopati do lokacije."</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Delovne aplikacije so označene z značko in vidne skrbniku za IT."</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"V redu"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Začasno zaustavi delovne aplikacije"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Vklopi"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtriranje"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Začasna zaustavitev delovnih aplikacij in obvestil"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Ni uspelo: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 7f2567c60c..f2c16b4667 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -26,32 +26,50 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Aplikacioni i shkarkuar është i çaktivizuar në modalitetin e sigurt"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Miniaplikacionet janë të çaktivizuara në modalitetin e sigurt"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Shkurtorja nuk është e disponueshme"</string>
-    <string name="home_screen" msgid="806512411299847073">"Ekrani bazë"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Veprimet e personalizuara"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Prek dhe mbaj shtypur për të zgjedhur një miniaplikacion."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Prek dy herë dhe mbaj shtypur për të zgjedhur një miniaplikacion ose për të përdorur veprimet e personalizuara."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Ekrani bazë"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Ekrani i ndarë"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Prek dhe mbaj shtypur një miniaplikacion për ta zhvendosur."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Trokit dy herë dhe mbaje shtypur një miniapliikacion për ta zhvendosur atë ose për të përdorur veprimet e personalizuara."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d i gjerë me %2$d i lartë"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Prek dhe mbaj të shtypur për të vendosur në mënyrë manuale"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Shto automatikisht"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> miniaplikacione</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> miniaplikacion</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> shkurtore</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> shkurtore</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Miniaplikacionet"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Kërko"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Pastro tekstin nga kutia e kërkimit"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Nuk ka asnjë miniaplikacion"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Asnjë rezultat kërkimi"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personale"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Puna"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Bisedat"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Kërko për aplikacione"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Po ngarkon aplikacionet..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nuk u gjet asnjë aplikacion që përputhet me \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Kërko për më shumë aplikacione"</string>
     <string name="label_application" msgid="8531721983832654978">"Aplikacioni"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Njoftimet"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Prek dhe mbaj të shtypur për të zgjedhur një shkurtore."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Prek dy herë dhe mbaj të shtypur për të zgjedhur një shkurtore ose për të përdorur veprimet e personalizuara."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Prek dhe mbaj shtypur një shkurtore për ta zhvendosur."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Trokit dy herë dhe mbaje shtypur një shkurtore për ta zhvendosur atë ose për të përdorur veprimet e personalizuara."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Nuk ka më hapësirë në këtë ekran bazë."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Nuk ka më hapësirë në tabakanë \"Të preferuarat\""</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista e aplikacioneve"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista e aplikacioneve personale"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Lista e aplikacioneve të punës"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Faqja kryesore"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Hiqe"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Çinstalo"</string>
-    <string name="app_info_drop_target_label" msgid="692894985365717661">"Informacion mbi aplikacionin"</string>
+    <string name="app_info_drop_target_label" msgid="692894985365717661">"Info mbi aplikacionin"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Instalo"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Mos sugjero aplikacion"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Gozhdo parashikimin"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"instalo shkurtore"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Lejon një aplikacion të shtojë shkurtore pa ndërhyrjen e përdoruesit."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"lexo cilësimet dhe shkurtoret e ekranit bazë"</string>
@@ -62,7 +80,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Problem në ngarkimin e miniaplikacionit"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Konfiguro"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Ky është aplikacion sistemi dhe nuk mund të çinstalohet."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Dosje e paemërtuar"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Redakto emrin"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> u çaktivizua"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, ka <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> njoftime</item>
@@ -76,11 +94,11 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Trokit për të ruajtur riemërtimin"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Dosja u mbyll"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Dosja u riemërtua në <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Dosja: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Miniaplikacionet"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Dosja: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> artikuj"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Dosja: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ose më shumë artikuj"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Imazhet e sfondit"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stilet dhe imazhet e sfondit"</string>
-    <string name="settings_button_text" msgid="8873672322605444408">"Cilësimet e Home"</string>
+    <string name="settings_button_text" msgid="8873672322605444408">"Cilësimet e ekranit bazë"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Çaktivizuar nga administratori"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Lejo rrotullimin e ekranit kryesor"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"Kur telefoni rrotullohet"</string>
@@ -91,16 +109,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Për të shfaqur \"Pikat e njoftimeve\", aktivizo njoftimet e aplikacionit për <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Ndrysho cilësimet"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Shfaq pikat e njoftimeve"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Shto ikonë në ekranin bazë"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Shto ikona aplikacionesh në ekranin bazë"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Për aplikacionet e reja"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"I panjohur"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Hiq"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Kërko"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Aplikacioni nuk është i instaluar"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Aplikacioni për këtë ikonë nuk është i instaluar. Mund ta heqësh ose të kërkosh aplikacionin dhe ta instalosh atë në mënyrë manuale."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> po instalohet, <xliff:g id="PROGRESS">%2$s</xliff:g> i përfunduar"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> po shkarkohet, <xliff:g id="PROGRESS">%2$s</xliff:g> të përfunduara"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> po pret të instalohet"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Miniaplikacionet e <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Lista e miniaplikacioneve"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Lista e miniaplikacioneve u mbyll"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Shto në Ekranin bazë"</string>
@@ -128,15 +146,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Shkurtoret"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Shkurtoret dhe njoftimet"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Hiqe"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Mbyll"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Njoftimi u hoq"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personale"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Punë"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profili i punës"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Gjej këtu aplikacionet e punës"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Secili aplikacion pune ka një distinktiv dhe mbahet i sigurt nga organizata jote. Zhvendosi aplikacionet e punës në ekranin tënd kryesor për qasje më të lehtë."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Menaxhohet nga organizata jote"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Njoftimet dhe aplikacionet janë joaktive"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Mbyll"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Mbyllur"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Të dhënat personale janë të ndara dhe të fshehura nga aplikacionet e punës"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Aplikacionet e punës dhe të dhënat janë të dukshme për administratorin e teknologjisë së informacionit."</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Para"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"E kuptova"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Profili i punës është në pauzë"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Aplikacionet e punës nuk mund të të dërgojnë njoftime, të përdorin baterinë tënde apo të kenë qasje në vendndodhjen tënde"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Profili i punës është në pauzë. Aplikacionet e punës nuk mund të të dërgojnë njoftime, të përdorin baterinë tënde apo të kenë qasje në vendndodhjen tënde"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Aplikacionet e punës janë të shënuara dhe të dukshme për administratorin e teknologjisë së informacionit"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"E kuptova"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Vendos në pauzë aplikacionet e punës"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Aktivizo"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtro"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Vendos në pauzë aplikacionet e punës dhe njoftimet"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Dështoi: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 4e52592687..4809087252 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -20,39 +20,58 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Work"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Апликација није инсталирана."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Апликација није доступна"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Преузета апликација је онемогућена у Безбедном режиму"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Виџети су онемогућени у Безбедном режиму"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Пречица није доступна"</string>
-    <string name="home_screen" msgid="806512411299847073">"Почетни екран"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Прилагођене радње"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Додирните и задржите да бисте изабрали виџет."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Двапут додирните и задржите да бисте изабрали виџет или користите прилагођене радње."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Почетни екран"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Подељени екран"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Двапут додирните и задржите ради померања виџета."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Двапут додирните и задржите да бисте померали виџет или користите прилагођене радње."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d×%2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"ширина од %1$d и висина од %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Додирните и задржите да бисте поставили ручно"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Аутоматски додај"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виџет</item>
+      <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виџета</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виџета</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> пречица</item>
+      <item quantity="few"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> пречице</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> пречица</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Виџети"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Претрага"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Обришите текст из оквира за претрагу"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Није доступан ниједан виџет"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Нема резултата претраге"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Лично"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Посао"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Конверзације"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Претражите апликације"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Апликације се учитавају…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Није пронађена ниједна апликација за „<xliff:g id="QUERY">%1$s</xliff:g>“"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Претражи још апликација"</string>
     <string name="label_application" msgid="8531721983832654978">"Апликација"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Обавештења"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Додирните и задржите да бисте изабрали пречицу."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Двапут додирните и задржите да бисте изабрали пречицу или користите прилагођене радње."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Двапут додирните и задржите ради померања пречице."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Двапут додирните и задржите да бисте померали пречицу или користите прилагођене радње."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Нема више простора на овом почетном екрану."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Нема више простора на траци Омиљено"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Листа апликација"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Листа личних апликација"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Листа пословних апликација"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Почетна"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Уклони"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Деинсталирај"</string>
-    <string name="app_info_drop_target_label" msgid="692894985365717661">"Информ. о апликацији"</string>
+    <string name="app_info_drop_target_label" msgid="692894985365717661">"Инфор. о апликацији"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Инсталирај"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Не предлажи апликацију"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Закачи предвиђање"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"инсталирање пречица"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Дозвољава апликацији да додаје пречице без интервенције корисника."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"читање подешавања и пречица на почетном екрану"</string>
@@ -63,7 +82,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Проблем при учитавању виџета"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Подешавање"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Ово је системска апликација и не може да се деинсталира."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Неименовани директоријум"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Измените назив"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Апликација <xliff:g id="APP_NAME">%1$s</xliff:g> је онемогућена"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="one"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, има <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> обавештење</item>
@@ -73,13 +92,13 @@
     <string name="default_scroll_format" msgid="7475544710230993317">"%1$d. страница од %2$d"</string>
     <string name="workspace_scroll_format" msgid="8458889198184077399">"%1$d. почетни екран од %2$d"</string>
     <string name="workspace_new_page" msgid="257366611030256142">"Нова страница почетног екрана"</string>
-    <string name="folder_opened" msgid="94695026776264709">"Директоријум је отворен, <xliff:g id="WIDTH">%1$d</xliff:g> пута <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
-    <string name="folder_tap_to_close" msgid="4625795376335528256">"Додирните да бисте затворили директоријум"</string>
+    <string name="folder_opened" msgid="94695026776264709">"Фолдер је отворен, <xliff:g id="WIDTH">%1$d</xliff:g> пута <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
+    <string name="folder_tap_to_close" msgid="4625795376335528256">"Додирните да бисте затворили фолдер"</string>
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Додирните да бисте сачували преименовање"</string>
-    <string name="folder_closed" msgid="4100806530910930934">"Директоријум је затворен"</string>
-    <string name="folder_renamed" msgid="1794088362165669656">"Директоријум је преименован у <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Директоријум: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Виџети"</string>
+    <string name="folder_closed" msgid="4100806530910930934">"Фолдер је затворен"</string>
+    <string name="folder_renamed" msgid="1794088362165669656">"Фолдер је преименован у <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Фолдер: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ставке"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Фолдер: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> или више ставки"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Позадине"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Стилови и позадине"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Подешавања почетног екрана"</string>
@@ -93,16 +112,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Да бисте приказали тачке за обавештења, укључите обавештења за апликацију <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Промените подешавања"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Приказуј тачке за обавештења"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Додај икону на почетни екран"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Додај иконе апликација на почетни екран"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"За нове апликације"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Непознато"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Уклони"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Претражи"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Ова апликација није инсталирана"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Апликација за ову икону није инсталирана. Можете да је уклоните или да потражите апликацију и инсталирате је ручно."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> се инсталира, <xliff:g id="PROGRESS">%2$s</xliff:g> готово"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> се преузима, завршено је <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> чека на инсталирање"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Виџети за <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Листа виџета"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Листа виџета је затворена"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Додајте на почетни екран"</string>
@@ -115,11 +134,11 @@
     <string name="move_to_position" msgid="6750008980455459790">"Премести на <xliff:g id="NUMBER">%1$s</xliff:g>. позицију"</string>
     <string name="move_to_hotseat_position" msgid="6295412897075147808">"Премести на <xliff:g id="NUMBER">%1$s</xliff:g>. позицију у омиљеним"</string>
     <string name="item_moved" msgid="4606538322571412879">"Ставка је премештена"</string>
-    <string name="add_to_folder" msgid="9040534766770853243">"Додај у директоријум: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="add_to_folder_with_app" msgid="4534929978967147231">"Додај у директоријум у коме је <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="added_to_folder" msgid="4793259502305558003">"Ставка је додата у директоријум"</string>
-    <string name="create_folder_with" msgid="4050141361160214248">"Направите директоријум са: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_created" msgid="6409794597405184510">"Директоријум је направљен"</string>
+    <string name="add_to_folder" msgid="9040534766770853243">"Додај у фолдер: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="add_to_folder_with_app" msgid="4534929978967147231">"Додај у фолдер у коме је <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="added_to_folder" msgid="4793259502305558003">"Ставка је додата у фолдер"</string>
+    <string name="create_folder_with" msgid="4050141361160214248">"Направите фолдер са: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="folder_created" msgid="6409794597405184510">"Фолдер је направљен"</string>
     <string name="action_move_to_workspace" msgid="1603837886334246317">"Премести на почетни екран"</string>
     <string name="action_resize" msgid="1802976324781771067">"Промени величину"</string>
     <string name="action_increase_width" msgid="8773715375078513326">"Повећај ширину"</string>
@@ -130,15 +149,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Пречице"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Пречице и обавештења"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Одбаци"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Затвори"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Обавештење је одбачено"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Личне"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Пословне"</string>
-    <string name="work_profile_toggle_label" msgid="3081029915775481146">"Профил за Work"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Пронађите пословне апликације овде"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Свака пословна апликација има значку и штити је ваша организација. Преместите апликације на почетни екран да бисте им лакше приступали."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Овим управља организација"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Обавештења и апликације су искључени"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Затвори"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Затворено"</string>
+    <string name="work_profile_toggle_label" msgid="3081029915775481146">"Пословни профил"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Лични подаци су одвојени и сакривени од апликација за посао"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"ИТ администратор види пословне апликације и податке"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Даље"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Важи"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Пословни профил је паузиран"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Пословне апликације не могу да вам шаљу обавештења, користе батерију нити приступају локацији"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Пословни профил је паузиран. Пословне апликације не могу да вам шаљу обавештења, користе батерију нити приступају локацији"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Пословне апликације су означене значком и ИТ администратор може да их види"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Важи"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Паузирај пословне апликације"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Укључи"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Филтер"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Паузирајте пословне апликације и обавештења"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Није успело: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 895959e10c..aad4e4ec6a 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -56,8 +56,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Inga appar som matchar <xliff:g id="QUERY">%1$s</xliff:g> hittades"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Sök efter fler appar"</string>
     <string name="label_application" msgid="8531721983832654978">"App"</string>
-    <string name="search_corpus_apps" msgid="1917889409963779022">"Appar"</string>
-    <string name="search_action_try_now" msgid="1458737965476149074">"Testa nu"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Aviseringar"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Tryck länge för att flytta en genväg."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Tryck snabbt två gånger och håll kvar för att flytta en genväg eller använda anpassade åtgärder."</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 445e382f2d..3ff05e1b32 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -26,32 +26,50 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Programu iliyopakuliwa imezimwa katika Hali Salama"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Wijeti zimezimwa katika hali ya Usalama"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Hakuna njia ya mkato"</string>
-    <string name="home_screen" msgid="806512411299847073">"Skrini ya kwanza"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Vitendo maalum"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Gusa na ushikilie ili kuteua wijeti."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Gusa mara mbili na ushikilie ile uchague wijeti au utumie vitendo maalum."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Skrini ya kwanza"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Gawa skrini"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Gusa na ushikilie ili usogeze wijeti."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Gusa mara mbili na ushikilie ili usogeze wijeti au utumie vitendo maalum."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Upana wa %1$d na kimo cha %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Gusa na ushikilie ili uweke mwenyewe"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Ongeza kiotomatiki"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other">Wijeti <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
+      <item quantity="one">Wijeti <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g></item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other">Njia <xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> za mkato</item>
+      <item quantity="one">Njia <xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> ya mkato</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Wijeti"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Tafuta"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Futa maandishi kwenye kisanduku cha kutafutia"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Hamna wijeti zinazopatikana"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Hamna matokeo ya utafutaji"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Binafsi"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Kazini"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Mazungumzo"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Tafuta programu"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Inapakia programu..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Haikupata programu zozote zinazolingana na \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Tafuta programu zaidi"</string>
     <string name="label_application" msgid="8531721983832654978">"Programu"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Arifa"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Gusa na ushikilie ili uchague njia ya mkato."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Gusa mara mbili na ushikilie ili uchague njia ya mkato au utumie vitendo maalum."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Gusa na ushikilie ili usogeze njia ya mkato."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Gusa mara mbili na ushikilie ili usogeze njia ya mkato au utumie vitendo maalum."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Hakuna nafasi katika skrini hii ya Mwanzo."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Hakuna nafasi zaidi katika treya ya Vipendeleo"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Orodha ya programu"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Orodha ya programu za binafsi"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Orodha ya programu za kazini"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Mwanzo"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Ondoa"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Sakinua"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Maelezo ya programu"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Sakinisha"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Isipendekeze programu"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Bandika Utabiri"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"kuweka njia za mkato"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Huruhusu programu kuongeza njia za mkato bila mtumiaji kuingilia kati."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"soma mipangilio ya Mwanzo na njia za mkato"</string>
@@ -62,24 +80,22 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Tatizo la kupakia wijeti"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Sanidi"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Hii ni programu ya mfumo na haiwezi kuondolewa."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Folda isiyo na jina"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Badilisha Jina"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> imezimwa"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, ina arifa <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g></item>
       <item quantity="one"><xliff:g id="APP_NAME_0">%1$s</xliff:g>, ina arifa <xliff:g id="NOTIFICATION_COUNT_1">%2$d</xliff:g></item>
     </plurals>
     <string name="default_scroll_format" msgid="7475544710230993317">"Ukurasa%1$d wa %2$d"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for workspace_scroll_format (8458889198184077399) -->
-    <skip />
+    <string name="workspace_scroll_format" msgid="8458889198184077399">"Skrini ya mwanzo %1$d ya %2$d"</string>
     <string name="workspace_new_page" msgid="257366611030256142">"Ukurasa mpya wa skrini ya kwanza"</string>
     <string name="folder_opened" msgid="94695026776264709">"Folda imefunguliwa, <xliff:g id="WIDTH">%1$d</xliff:g> kwa <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
     <string name="folder_tap_to_close" msgid="4625795376335528256">"Gusa ili ufunge folda"</string>
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Gusa ili ubadilishe jina"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Folda imefungwa"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Folda imebadilishwa jina kuwa <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Folda: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Wijeti"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Folda: <xliff:g id="NAME">%1$s</xliff:g>, vipengee <xliff:g id="SIZE">%2$d</xliff:g>"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folda: <xliff:g id="NAME">%1$s</xliff:g>, vipengee <xliff:g id="SIZE">%2$d</xliff:g> au zaidi"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Mandhari"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Mitindo na mandhari"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Mipangilio ya mwanzo"</string>
@@ -93,19 +109,19 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Ili kuonyesha Vitone vya Arifa, washa kipengele cha arifa za programu katika <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Badilisha mipangilio"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Onyesha vitone vya arifa"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Ongeza aikoni kwenye Skrini ya kwanza"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Weka aikoni za programu kwenye Skrini ya kwanza"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Kwa ajili ya programu mpya"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Yasiyojulikana"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Ondoa"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Tafuta"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Programu hii haijasakinishwa"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Programu ya aikoni hii haijasakinishwa. Unaweza kuiondoa, au utafute programu na uisakinishe wewe mwenyewe."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"Inasakinisha <xliff:g id="NAME">%1$s</xliff:g>, imekamilika <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> inapakuliwa, <xliff:g id="PROGRESS">%2$s</xliff:g> imekamilika"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> inasubiri kusakinisha"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Wijeti za <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Orodha ya wijeti"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Orodha ya wijeti imefungwa"</string>
-    <string name="action_add_to_workspace" msgid="8902165848117513641">"Ongeza kwenye Skrini ya Kwanza"</string>
+    <string name="action_add_to_workspace" msgid="8902165848117513641">"Weka kwenye Skrini ya Kwanza"</string>
     <string name="action_move_here" msgid="2170188780612570250">"Hamishia kipengee hapa"</string>
     <string name="item_added_to_workspace" msgid="4211073925752213539">"Kipengee kimeongezwa kwenye skrini ya kwanza"</string>
     <string name="item_removed" msgid="851119963877842327">"Kipengee kimeondolewa"</string>
@@ -130,15 +146,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Njia za mkato"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Arifa na njia za mkato"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Ondoa"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Funga"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Arifa imeondolewa"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Binafsi"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Kazini"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Wasifu wa kazini"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Pata programu za kazi hapa"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Kila programu ya kazi ina beji na hulindwa na shirika lako. Hamishia programu kwenye skrini yako ya kwanza ili uzifikie kwa urahisi."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Inasimamiwa na shirika lako"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Vipenge vya arifa na programu vimezimwa"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Funga"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Imefungwa"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Data binafsi iko kando na haionyeshwi kwenye programu za kazini"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Programu na data ya kazini huonekana kwa msimamizi wako wa TEHAMA"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Endelea"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Nimeelewa"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Wasifu wa kazini umesimamishwa"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Programu za kazini haziwezi kukutumia arifa, kutumia betri yako au kufikia maelezo ya mahali ulipo"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Wasifu wa kazini umesimamishwa. Programu za kazini haziwezi kukutumia arifa, kutumia betri yako au kufikia maelezo ya mahali ulipo"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Programu za kazini zina beji na zinaonekana kwa msimamizi wako wa TEHAMA"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Nimeelewa"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Simamisha programu za kazini"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Washa"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Kichujio"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Simamisha arifa na programu za kazini"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Hitilafu: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 6e933a12e3..9d565aa7a4 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -26,32 +26,50 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"இறக்கிய ஆப்ஸ் பாதுகாப்பு முறையில் முடக்கப்பட்டது"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"பாதுகாப்புப் பயன்முறையில் விட்ஜெட்கள் முடக்கப்பட்டுள்ளன"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"ஷார்ட்கட் இல்லை"</string>
-    <string name="home_screen" msgid="806512411299847073">"முகப்புத் திரை"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"தனிப்பயன் செயல்கள்"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"விட்ஜெட்டைத் தேர்வுசெய்ய தொட்டுப் பிடிக்கவும்."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"விட்ஜெட்டைத் தேர்ந்தெடுக்க இருமுறை தட்டிப் பிடிக்கவும் அல்லது தனிப்பயன் செயல்களைப் பயன்படுத்தவும்."</string>
+    <string name="home_screen" msgid="5629429142036709174">"முகப்பு"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"திரைப் பிரிப்பு"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"விட்ஜெட்டை நகர்த்தத் தொட்டுப் பிடிக்கவும்."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"விட்ஜெட்டை நகர்த்த இருமுறை தட்டிப் பிடிக்கவும் அல்லது பிரத்தியேகச் செயல்களைப் பயன்படுத்தவும்."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d அகலத்திற்கு %2$d உயரம்"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"நீங்களே சேர்க்க, தொட்டுப் பிடித்திருக்கவும்"</string>
     <string name="place_automatically" msgid="8064208734425456485">"தானாகவே சேர்"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> விட்ஜெட்டுகள்</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> விட்ஜெட்</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> ஷார்ட்கட்கள்</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> ஷார்ட்கட்</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"விட்ஜெட்கள்"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"தேடுக"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"தேடல் பெட்டியிலுள்ள உரையை அழிக்கும்"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"விட்ஜெட்டுகள் எதுவுமில்லை"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"தேடல் முடிவுகள் இல்லை"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"தனிப்பட்டவை"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"பணி"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"உரையாடல்கள்"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"பயன்பாடுகளில் தேடுக"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ஆப்ஸை ஏற்றுகிறது…"</string>
-    <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" உடன் பொருந்தும் பயன்பாடுகள் இல்லை"</string>
+    <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" உடன் பொருந்தும் ஆப்ஸ் இல்லை"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"கூடுதல் பயன்பாடுகளைத் தேடு"</string>
     <string name="label_application" msgid="8531721983832654978">"ஆப்ஸ்"</string>
     <string name="notifications_header" msgid="1404149926117359025">"அறிவிப்புகள்"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"ஷார்ட்கட்டைச் சேர்க்க, தொட்டு பிடித்திருக்கவும்."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"ஷார்ட்கட்டைச் சேர்க்க, இருமுறை தட்டிப் பிடித்திருக்கவும் (அ) தனிப்பயன் செயல்களைப் பயன்படுத்தவும்."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"ஷார்ட்கட்டை நகர்த்தத் தொட்டுப் பிடிக்கவும்."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ஷார்ட்கட்டை நகர்த்த இருமுறை தட்டிப் பிடிக்கவும் அல்லது பிரத்தியேகச் செயல்களைப் பயன்படுத்தவும்."</string>
     <string name="out_of_space" msgid="4691004494942118364">"முகப்புத் திரையில் இடமில்லை."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"பிடித்தவை ட்ரேயில் இடமில்லை"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ஆப்ஸின் பட்டியல்"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"தனிப்பட்ட ஆப்ஸ் பட்டியல்"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"பணி ஆப்ஸ் பட்டியல்"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"முகப்பு"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"அகற்று"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"நிறுவல் நீக்கு"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"ஆப்ஸ் தகவல்"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"நிறுவு"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"ஆப்ஸைப் பரிந்துரைக்க வேண்டாம்"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"கணிக்கப்பட்ட ஆப்ஸைப் பின் செய்தல்"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"குறுக்குவழிகளை நிறுவுதல்"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"பயனரின் அனுமதி இல்லாமல் குறுக்குவழிகளைச் சேர்க்கப் ஆப்ஸை அனுமதிக்கிறது."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"முகப்பின் அமைப்பு மற்றும் குறுக்குவழிகளைப் படித்தல்"</string>
@@ -62,7 +80,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"விட்ஜெட்டை ஏற்றுவதில் சிக்கல்"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"அமைவு"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"இது அமைப்பு ஆப்ஸ் என்பதால் நிறுவல் நீக்கம் செய்ய முடியாது."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"பெயரிடப்படாத கோப்புறை"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"பெயரைத் திருத்துதல்"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> முடக்கப்பட்டது"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g> ஆப்ஸில் <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> அறிவிப்புகள் வந்துள்ளன</item>
@@ -76,8 +94,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"மாற்றிய பெயரைச் சேமிக்க, தட்டவும்"</string>
     <string name="folder_closed" msgid="4100806530910930934">"கோப்புறை மூடப்பட்டது"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"கோப்புறை <xliff:g id="NAME">%1$s</xliff:g> என மறுபெயரிடப்பட்டது"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"கோப்புறை: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"விட்ஜெட்கள்"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"கோப்புறை: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> கோப்புகள்"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"கோப்புறை: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> அல்லது அதற்கு அதிகமான கோப்புகள்"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"வால்பேப்பர்கள்"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"ஸ்டைல்கள் &amp; வால்பேப்பர்கள்"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"முகப்பு அமைப்புகள்"</string>
@@ -91,19 +109,19 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"அறிவிப்புப் புள்ளிகளைக் காட்ட, <xliff:g id="NAME">%1$s</xliff:g> இன் ஆப்ஸ் அறிவிப்புகளை இயக்கவும்"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"அமைப்புகளை மாற்று"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"அறிவிப்புப் புள்ளிகளைக் காட்டு"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"முகப்புத் திரையில் ஐகானைச் சேர்"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"முகப்புத் திரையில் ஆப்ஸ் ஐகான்களைச் சேர்"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"புதிய ஆப்ஸை நிறுவும்போது"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"தெரியாதது"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"அகற்று"</string>
     <string name="abandoned_search" msgid="891119232568284442">"தேடு"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"ஆப்ஸ் நிறுவப்படவில்லை"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"ஐகானுக்கான ஆப்ஸ் நிறுவப்படவில்லை. இதை அகற்றலாம் அல்லது பயன்பாட்டைத் தேடி கைமுறையாக நிறுவலாம்."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> நிறுவப்படுகிறது, <xliff:g id="PROGRESS">%2$s</xliff:g> முடிந்தது"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g>ஐப் பதிவிறக்குகிறது, <xliff:g id="PROGRESS">%2$s</xliff:g> முடிந்தது"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g>ஐ நிறுவுவதற்காகக் காத்திருக்கிறது"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> விட்ஜெட்டுகள்"</string>
     <string name="widgets_list" msgid="796804551140113767">"விட்ஜெட்கள் பட்டியல்"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"விட்ஜெட்கள் பட்டியல் மூடப்பட்டது"</string>
-    <string name="action_add_to_workspace" msgid="8902165848117513641">"முகப்புத் திரையில் சேர்"</string>
+    <string name="action_add_to_workspace" msgid="8902165848117513641">"முகப்புத் திரையில் சேருங்கள்"</string>
     <string name="action_move_here" msgid="2170188780612570250">"இங்கு நகர்த்து"</string>
     <string name="item_added_to_workspace" msgid="4211073925752213539">"முகப்புத் திரையில் சேர்க்கப்பட்டது"</string>
     <string name="item_removed" msgid="851119963877842327">"அகற்றப்பட்டது"</string>
@@ -128,15 +146,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"ஷார்ட்கட்கள்"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"ஷார்ட்கட்கள் மற்றும் அறிவிப்புகள்"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"நிராகரி"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"மூடும் பட்டன்"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"அறிவிப்பு நிராகரிக்கப்பட்டது"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"தனிப்பட்டவை"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"பணி"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"பணிக் கணக்கு"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"பணி ஆப்ஸை இங்கு காணலாம்"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"ஒவ்வொரு பணிப் பயன்பாடும் ஒரு பேட்ஜைக் கொண்டிருக்கும். இவை, ஆப்ஸ் உங்கள் நிறுவனத்தால் பாதுகாப்பாக வைக்கப்பட்டுள்ளன என்பதைக் குறிக்கின்றன. இந்த ஆப்ஸை எளிதாக அணுக, முகப்புத் திரைக்கு நகர்த்திக்கொள்ளவும்."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"உங்கள் நிறுவனம் நிர்வகிக்கிறது"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"ஆப்ஸும் அறிவிப்புகளும் ஆஃப் செய்யப்பட்டுள்ளன"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"மூடுக"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"மூடப்பட்டது"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"தனிப்பட்ட தரவு பணி ஆப்ஸுடன் சேர்ந்ததல்ல என்பதோடு பணி ஆப்ஸில் இருந்து அவை மறைக்கப்பட்டிருக்கும்"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"பணி ஆப்ஸையும் தரவையும் உங்கள் IT நிர்வாகியால் பார்க்க முடியும்"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"அடுத்து"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"முடிந்தது"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"பணிக் கணக்கு இடைநிறுத்தப்பட்டது"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"பணி ஆப்ஸால் அறிவிப்புகளை அனுப்பவோ பேட்டரியைப் பயன்படுத்தவோ இருப்பிடத்தை அணுகவோ முடியாது"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"பணிக் கணக்கு இடைநிறுத்தப்பட்டது. பணி ஆப்ஸால் அறிவிப்புகளை அனுப்பவோ பேட்டரியைப் பயன்படுத்தவோ இருப்பிடத்தை அணுகவோ முடியாது"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"பணி ஆப்ஸ் பேட்ஜ் குறியிடப்பட்டுள்ளன. மேலும் உங்கள் IT நிர்வாகியால் அவற்றைப் பார்க்க முடியும்"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"சரி"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"பணி ஆப்ஸை இடைநிறுத்து"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"இயக்கு"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"வடிப்பான்"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"பணி தொடர்பான ஆப்ஸையும் அறிவிப்புகளையும் இடைநிறுத்தும்"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"தோல்வி: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 1f8d3b8c4f..29be024f42 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -26,43 +26,69 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"డౌన్‌లోడ్ చేసిన యాప్ సురక్షిత మోడ్‌లో నిలిపివేయబడింది"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"సురక్షిత మోడ్‌లో విడ్జెట్‌లు నిలిపివేయబడ్డాయి"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"షార్ట్‌కట్ అందుబాటులో లేదు"</string>
-    <string name="home_screen" msgid="806512411299847073">"హోమ్ స్క్రీన్"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"అనుకూల చర్యలు"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"విడ్జెట్‌ను ఎంచుకోవడానికి తాకి &amp; నొక్కి పెట్టండి."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"విడ్జెట్‌ను ఎంచుకోవడానికి లేదా అనుకూల చర్యలను ఉపయోగించడానికి రెండుసార్లు నొక్కి, ఉంచండి."</string>
+    <!-- no translation found for home_screen (5629429142036709174) -->
+    <skip />
+    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
+    <skip />
+    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
+    <skip />
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d వెడల్పు X %2$d ఎత్తు"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"మాన్యువల్‌గా ఉంచడానికి నొక్కి, పట్టుకోండి"</string>
     <string name="place_automatically" msgid="8064208734425456485">"ఆటోమేటిక్‌గా జోడించు"</string>
+    <!-- no translation found for widgets_count (656794749266073027) -->
+    <!-- no translation found for shortcuts_count (8080294865447938455) -->
+    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
+    <skip />
+    <string name="widget_button_text" msgid="2880537293434387943">"విడ్జెట్‌లు"</string>
+    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
+    <skip />
+    <!-- no translation found for no_widgets_available (9140948620298620513) -->
+    <skip />
+    <!-- no translation found for no_search_results (6518732304311458580) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
+    <skip />
+    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"అప్లికేషన్‌లను శోధించండి"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"అప్లికేషన్‌లను లోడ్ చేస్తోంది…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\"కి సరిపోలే అప్లికేషన్‌లేవీ కనుగొనబడలేదు"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"మరిన్ని యాప్‌ల కోసం వెతుకు"</string>
     <string name="label_application" msgid="8531721983832654978">"యాప్"</string>
     <string name="notifications_header" msgid="1404149926117359025">"నోటిఫికేషన్‌లు"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"షార్ట్‌కట్‌ని ఎంచుకోవడం కోసం నొక్కి, పట్టుకోండి."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"రెండుసార్లు నొక్కి, పట్టుకోవడం ద్వారా షార్ట్‌కట్‌ని ఎంచుకోండి లేదా అనుకూల చర్యలను ఉపయోగించండి."</string>
+    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
+    <skip />
     <string name="out_of_space" msgid="4691004494942118364">"ఈ హోమ్ స్క్రీన్‌లో ఖాళీ లేదు."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ఇష్టమైనవి ట్రేలో ఖాళీ లేదు"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"అనువర్తనాల జాబితా"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"వ్యక్తిగత యాప్‌ల జాబితా"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"కార్యాలయ యాప్‌ల జాబితా"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"హోమ్"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"తీసివేయి"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"అన్ఇన్‌స్టాల్ చేయి"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"యాప్ సమాచారం"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"ఇన్‌స్టాల్ చేయండి"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"యాప్‌ను సూచించవద్దు"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"సూచనను పిన్ చేయండి"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"షార్ట్‌కట్‌లను ఇన్‌స్టాల్ చేయడం"</string>
-    <string name="permdesc_install_shortcut" msgid="923466509822011139">"వినియోగదారు ప్రమేయం లేకుండా సత్వరమార్గాలను జోడించడానికి అనువర్తనాన్ని అనుమతిస్తుంది."</string>
+    <string name="permdesc_install_shortcut" msgid="923466509822011139">"వినియోగదారు ప్రమేయం లేకుండా సత్వరమార్గాలను జోడించడానికి యాప్‌ను అనుమతిస్తుంది."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"హోమ్ సెట్టింగ్‌లు మరియు సత్వరమార్గాలను చదవడం"</string>
-    <string name="permdesc_read_settings" msgid="5833423719057558387">"హోమ్‌లో సెట్టింగ్‌లు మరియు సత్వరమార్గాలను చదవడానికి అనువర్తనాన్ని అనుమతిస్తుంది."</string>
+    <string name="permdesc_read_settings" msgid="5833423719057558387">"హోమ్‌లో సెట్టింగ్‌లు మరియు సత్వరమార్గాలను చదవడానికి యాప్‌ను అనుమతిస్తుంది."</string>
     <string name="permlab_write_settings" msgid="3574213698004620587">"హోమ్ సెట్టింగ్‌లు మరియు సత్వరమార్గాలను వ్రాయడం"</string>
-    <string name="permdesc_write_settings" msgid="5440712911516509985">"హోమ్‌లో సెట్టింగ్‌లు మరియు సత్వరమార్గాలను మార్చడానికి అనువర్తనాన్ని అనుమతిస్తుంది."</string>
+    <string name="permdesc_write_settings" msgid="5440712911516509985">"హోమ్‌లో సెట్టింగ్‌లు మరియు సత్వరమార్గాలను మార్చడానికి యాప్‌ను అనుమతిస్తుంది."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"ఫోన్ కాల్‌లను చేసేందుకు <xliff:g id="APP_NAME">%1$s</xliff:g>కి అనుమతి లేదు"</string>
     <string name="gadget_error_text" msgid="6081085226050792095">"విడ్జెట్‌ను లోడ్ చేయడంలో సమస్య"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"సెటప్ చేయి"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"ఇది సిస్టమ్ యాప్ మరియు దీన్ని అన్‌ఇన్‌స్టాల్ చేయడం సాధ్యపడదు."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"పేరు లేని ఫోల్డర్"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"పేరును ఎడిట్ చేయండి"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> నిలిపివేయబడింది"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, నుంచి <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> నోటిఫికేషన్‌లు ఉన్నాయి</item>
@@ -76,8 +102,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"పేరు మార్పును సేవ్ చేయడానికి నొక్కండి"</string>
     <string name="folder_closed" msgid="4100806530910930934">"ఫోల్డర్ మూసివేయబడింది"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"ఫోల్డర్ పేరు <xliff:g id="NAME">%1$s</xliff:g>గా మార్చబడింది"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"ఫోల్డర్: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"విడ్జెట్‌లు"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"ఫోల్డర్: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ఐటెమ్‌లు"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"ఫోల్డర్: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> లేదా అంతకంటే ఎక్కువ ఐటెమ్‌లు"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"వాల్‌పేపర్‌లు"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"స్ట‌యిల్స్‌ &amp; వాల్‌పేపర్‌లు"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"హోమ్ సెట్టింగ్‌లు"</string>
@@ -91,19 +117,20 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"నోటిఫికేషన్ డాట్‌లను చూపించడానికి <xliff:g id="NAME">%1$s</xliff:g>కు యాప్ నోటిఫికేషన్‌లను ఆన్ చేయండి"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"సెట్టింగ్‌లను మార్చు"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"నోటిఫికేషన్ డాట్‌లను చూపు"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"హోమ్ స్క్రీన్‌కి చిహ్నాన్ని జోడించు"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"యాప్ చిహ్నాలను హోమ్ స్క్రీన్‌కు జోడించు"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"కొత్త యాప్‌ల కోసం"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"తెలియదు"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"తీసివేయి"</string>
-    <string name="abandoned_search" msgid="891119232568284442">"వెతుకు"</string>
+    <string name="abandoned_search" msgid="891119232568284442">"సెర్చ్"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"ఈ యాప్ ఇన్‌స్టాల్ చేయబడలేదు"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"ఈ చిహ్నం యొక్క యాప్ ఇన్‌స్టాల్ చేయబడలేదు. మీరు దీన్ని తీసివేయవచ్చు లేదా ఆ యాప్ కోసం శోధించి దాన్ని మాన్యువల్‌గా ఇన్‌స్టాల్ చేయవచ్చు."</string>
+    <!-- no translation found for app_installing_title (5864044122733792085) -->
+    <skip />
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> డౌన్‌లోడ్ అవుతోంది, <xliff:g id="PROGRESS">%2$s</xliff:g> పూర్తయింది"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> ఇన్‌స్టాల్ కావడానికి వేచి ఉంది"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> విడ్జెట్‌లు"</string>
     <string name="widgets_list" msgid="796804551140113767">"విడ్జెట్‌ల జాబితా"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"విడ్జెట్‌ల జాబితా మూసివేయబడింది"</string>
-    <string name="action_add_to_workspace" msgid="8902165848117513641">"హోమ్ స్క్రీన్‌కు జోడించు"</string>
+    <string name="action_add_to_workspace" msgid="8902165848117513641">"హోమ్ స్క్రీన్‌కు జోడించండి"</string>
     <string name="action_move_here" msgid="2170188780612570250">"అంశాన్ని ఇక్కడికి తరలించు"</string>
     <string name="item_added_to_workspace" msgid="4211073925752213539">"అంశం హోమ్‌స్క్రీన్‌కి జోడించబడింది"</string>
     <string name="item_removed" msgid="851119963877842327">"అంశం తీసివేయబడింది"</string>
@@ -128,15 +155,30 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"సత్వరమార్గాలు"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"షార్ట్‌కట్‌లు మరియు నోటిఫికేషన్‌లు"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"తీసివేయి"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"మూసివేస్తుంది"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"నోటిఫికేషన్ తీసివేయబడింది"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"వ్యక్తిగతం"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"కార్యాలయం"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"కార్యాలయ ప్రొఫైల్"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"కార్యాలయ యాప్‌లను ఇక్కడ కనుగొనండి"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"ప్రతి కార్యాలయ యాప్‌కు బ్యాడ్జ్‌ ఉంది మరియు మీ సంస్థ ద్వారా సురక్షితంగా ఉంచబడుతుంది. సులభ యాక్సెస్ కోసం యాప్‌లను మీ హోమ్ స్క్రీన్‌కి తరలించండి."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"మీ సంస్థ ద్వారా నిర్వహించబడతాయి"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"నోటిఫికేషన్‌లు మరియు యాప్‌లు ఆఫ్ చేయబడ్డాయి"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"మూసివేయి"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"మూసివేయబడింది"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"వ్యక్తిగత డేటా అనేది విడిగా &amp; ఆఫీస్ యాప్‌లకు యాక్సెస్ లేకుండా, దాచబడి ఉంటుంది"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"ఆఫీస్ యాప్‌లు &amp; డేటా మీ IT అడ్మిన్‌కు కనిపిస్తాయి"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"తర్వాత"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"అర్థమైంది"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"ఆఫీస్ ప్రొఫైల్ పాజ్ చేయబడింది"</string>
+    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
+    <skip />
+    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
+    <skip />
+    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
+    <skip />
+    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
+    <skip />
+    <string name="work_switch_tip" msgid="808075064383839144">"ఆఫీస్ యాప్‌లు, నోటిఫికేషన్‌లను పాజ్ చేయండి"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"విఫలమైంది: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 1a57992439..ea6a7c2aae 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -26,51 +26,39 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"แอปที่ดาวน์โหลดถูกปิดในโหมดปลอดภัย"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"มีการปิดใช้งานวิดเจ็ตในเซฟโหมด"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"ทางลัดไม่พร้อมใช้งาน"</string>
-    <!-- no translation found for home_screen (5629429142036709174) -->
-    <skip />
-    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
-    <skip />
-    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
-    <skip />
+    <string name="home_screen" msgid="5629429142036709174">"หน้าแรก"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"แบ่งหน้าจอ"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"แตะค้างไว้เพื่อย้ายวิดเจ็ต"</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"แตะสองครั้งค้างไว้เพื่อย้ายวิดเจ็ตหรือใช้การดำเนินการที่กำหนดเอง"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"กว้าง %1$d x สูง %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"แตะค้างไว้เพื่อวางด้วยตัวเอง"</string>
     <string name="place_automatically" msgid="8064208734425456485">"เพิ่มโดยอัตโนมัติ"</string>
-    <!-- no translation found for widgets_count (656794749266073027) -->
-    <!-- no translation found for shortcuts_count (8080294865447938455) -->
-    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
-    <skip />
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other">วิดเจ็ต <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> รายการ</item>
+      <item quantity="one">วิดเจ็ต <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> รายการ</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other">ทางลัด <xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> รายการ</item>
+      <item quantity="one">ทางลัด <xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> รายการ</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"วิดเจ็ต"</string>
-    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
-    <skip />
-    <!-- no translation found for no_widgets_available (9140948620298620513) -->
-    <skip />
-    <!-- no translation found for no_search_results (6518732304311458580) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
-    <skip />
-    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
-    <skip />
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"ค้นหา"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"ล้างข้อความออกจากช่องค้นหา"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"ไม่มีวิดเจ็ตพร้อมใช้งาน"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"ไม่พบผลการค้นหา"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ส่วนตัว"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"งาน"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"การสนทนา"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ค้นหาแอป"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"กำลังโหลดแอป…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"ไม่พบแอปที่ตรงกับ \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"ค้นหาแอปเพิ่มเติม"</string>
     <string name="label_application" msgid="8531721983832654978">"แอป"</string>
-    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
-    <skip />
-    <!-- no translation found for search_action_try_now (1458737965476149074) -->
-    <skip />
     <string name="notifications_header" msgid="1404149926117359025">"การแจ้งเตือน"</string>
-    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
-    <skip />
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"แตะค้างไว้เพื่อย้ายทางลัด"</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"แตะสองครั้งค้างไว้เพื่อย้ายทางลัดหรือใช้การดำเนินการที่กำหนดเอง"</string>
     <string name="out_of_space" msgid="4691004494942118364">"ไม่มีที่ว่างในหน้าจอหลักนี้"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ไม่มีพื้นที่เหลือในถาดรายการโปรด"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"รายชื่อแอป"</string>
@@ -128,8 +116,7 @@
     <string name="abandoned_search" msgid="891119232568284442">"ค้นหา"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"ไม่ได้ติดตั้งแอปนี้"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"ยังไม่ได้ติดตั้งแอปสำหรับไอคอนนี้ คุณสามารถนำไอคอนออก หรือค้นหาแอปดังกล่าวแล้วติดตั้งด้วยตนเอง"</string>
-    <!-- no translation found for app_installing_title (5864044122733792085) -->
-    <skip />
+    <string name="app_installing_title" msgid="5864044122733792085">"กำลังติดตั้ง <xliff:g id="NAME">%1$s</xliff:g> เสร็จแล้ว <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"กำลังดาวน์โหลด <xliff:g id="NAME">%1$s</xliff:g> เสร็จแล้ว <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> กำลังรอติดตั้ง"</string>
     <string name="widgets_list" msgid="796804551140113767">"รายการวิดเจ็ต"</string>
@@ -169,20 +156,13 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"ถัดไป"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"รับทราบ"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"โปรไฟล์งานหยุดชั่วคราว"</string>
-    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
-    <skip />
-    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
-    <skip />
-    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
-    <skip />
-    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
-    <skip />
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"แอปงานจะส่งการแจ้งเตือน ใช้แบตเตอรี่ หรือเข้าถึงตำแหน่งของคุณไม่ได้"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"โปรไฟล์งานหยุดชั่วคราว แอปงานจะส่งการแจ้งเตือน ใช้แบตเตอรี่ หรือเข้าถึงตำแหน่งของคุณไม่ได้"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"แอปงานจะติดป้ายไว้และผู้ดูแลระบบไอทีจะมองเห็น"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"รับทราบ"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"หยุดแอปงานชั่วคราว"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"เปิด"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"ตัวกรอง"</string>
     <string name="work_switch_tip" msgid="808075064383839144">"หยุดแอปงานและการแจ้งเตือนไว้ชั่วคราว"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"ไม่สำเร็จ: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index a5b9d3efa5..f112ec9a59 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -56,8 +56,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Walang nahanap na app na tumutugma sa \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Maghanap ng higit pang mga app"</string>
     <string name="label_application" msgid="8531721983832654978">"App"</string>
-    <string name="search_corpus_apps" msgid="1917889409963779022">"Mga App"</string>
-    <string name="search_action_try_now" msgid="1458737965476149074">"Subukan Ngayon"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Mga Notification"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Pindutin nang matagal para ilipat ang shortcut."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"I-double tap at pindutin nang matagal para ilipat ang shortcut o gumamit ng mga custom na pagkilos."</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 7085f6e762..993653890f 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -56,8 +56,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" ile eşleşen uygulama bulunamadı"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Başka uygulamalar ara"</string>
     <string name="label_application" msgid="8531721983832654978">"Uygulama"</string>
-    <string name="search_corpus_apps" msgid="1917889409963779022">"Uygulamalar"</string>
-    <string name="search_action_try_now" msgid="1458737965476149074">"Hemen Dene"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Bildirimler"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Kısayolu taşımak için dokunup basılı tutun."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Kısayolu taşımak veya özel işlemleri kullanmak için iki kez dokunup basılı tutun."</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 13ba701815..87ae581c8e 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -20,39 +20,60 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Робоча папка"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Додаток видалено."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Додаток недоступний"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Завантажений додаток вимкнено в безпечному режимі"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"У безпечному режимі віджети вимкнено"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Ярлик недоступний"</string>
-    <string name="home_screen" msgid="806512411299847073">"Головний екран"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Спеціальні дії"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Натисніть і утримуйте, щоб вибрати віджет."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Двічі натисніть і утримуйте, щоб вибрати віджет, або виконайте іншу дію."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Головний екран"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Розділити екран"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Натисніть і втримуйте, щоб перемістити віджет."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Двічі натисніть і втримуйте віджет, щоб перемістити його або виконати інші дії."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Ширина – %1$d, висота – %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Натисніть і утримуйте, щоб додати вручну"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Додати автоматично"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> віджет</item>
+      <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> віджети</item>
+      <item quantity="many"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> віджетів</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> віджета</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> ярлик</item>
+      <item quantity="few"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> ярлики</item>
+      <item quantity="many"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> ярликів</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> ярлика</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Віджети"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Пошук"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Очистити текст у полі пошуку"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Немає доступних віджетів"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Нічого не знайдено"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Особисті"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Робочі"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Розмови"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Пошук додатків"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Завантаження додатків…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Немає додатків для запиту \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Шукати ще додатки"</string>
     <string name="label_application" msgid="8531721983832654978">"Додаток"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Сповіщення"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Натисніть і втримуйте, щоб вибрати ярлик."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Двічі натисніть і втримуйте, щоб вибрати ярлик, або виконайте іншу дію."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Натисніть і втримуйте, щоб перемістити ярлик."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Двічі натисніть і втримуйте ярлик, щоб перемістити його або виконати інші дії."</string>
     <string name="out_of_space" msgid="4691004494942118364">"На цьому головному екрані більше немає місця."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"В області \"Вибране\" немає місця"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Список додатків"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Список особистих додатків"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Список робочих додатків"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Головний екран"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Видалити"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Видалити додаток"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Про додаток"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Установити"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Не пропонувати додаток"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Закріпити передбачений додаток"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"створення ярликів"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Дозволяє програмі самостійно додавати ярлики."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"читати налаштування та ярлики головного екрана"</string>
@@ -63,7 +84,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"Проблема із завантаженням віджета"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Налаштування"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Це системна програма, її неможливо видалити."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Папка без назви"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Редагувати назву"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> вимкнено"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="one">Додаток <xliff:g id="APP_NAME_2">%1$s</xliff:g> має <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> сповіщення</item>
@@ -79,8 +100,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Торкніться, щоб зберегти зміни"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Папку закрито"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Папку перейменовано на <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Папка <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Віджети"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Папка \"<xliff:g id="NAME">%1$s</xliff:g>\", елементів: <xliff:g id="SIZE">%2$d</xliff:g>"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Папка \"<xliff:g id="NAME">%1$s</xliff:g>\", елементів: <xliff:g id="SIZE">%2$d</xliff:g> або більше"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Фонові малюнки"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Стиль і фон"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Налаштування головного екрана"</string>
@@ -94,16 +115,16 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Щоб показувати значки сповіщень, увімкніть сповіщення в додатку <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Змінити налаштування"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Показувати значки сповіщень"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Додавати значок на головний екран"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Додавати значки додатків на головний екран"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Для нових додатків"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Невідомо"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Прибрати"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Шукати"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Цей додаток не встановлено"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Додаток для цього значка не встановлено. Можна видалити значок або знайти додаток і встановити його вручну."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> встановлюється, виконано <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> завантажується, <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> очікує на завантаження"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Віджети додатка <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Список віджетів"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Список віджектів закрито"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Додати на головний екран"</string>
@@ -131,15 +152,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Ярлики"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Ярлики та сповіщення"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Закрити"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Закрити"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Сповіщення закрито"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Особисті додатки"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Робочі додатки"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Робочий профіль"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Робочі додатки містяться тут"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Кожний робочий додаток має значок і перебуває під захистом організації. Перенесіть додатки на головний екран, щоб швидко запускати їх."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Профілем керує ваша організація"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Сповіщення та додатки вимкнено"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Закрити"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Закрито"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Персональні дані зберігаються окремо, вони недоступні для робочих додатків"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"ІТ-адміністратор бачить ваші робочі додатки й дані"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Далі"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Робочий профіль призупинено"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Робочі додатки не можуть надсилати сповіщення, використовувати заряд акумулятора й отримувати доступ до геоданих"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Робочий профіль призупинено. Робочі додатки не можуть надсилати сповіщення, використовувати заряд акумулятора й отримувати доступ до геоданих"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Робочі додатки відповідно позначені й видимі системному адміністратору"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Зрозуміло"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Призупинити робочі додатки"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Увімкнути"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Фільтр"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Призупинити робочі додатки й сповіщення"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Не вдалося <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 4f776701e5..150f31fa49 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -20,39 +20,64 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"دفتری"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"ایپ انسٹال نہیں ہے۔"</string>
     <string name="activity_not_available" msgid="7456344436509528827">"ایپ دستیاب نہیں ہے"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"ڈاؤن لوڈ کردہ ایپ کو محفوظ وضع میں غیر فعال کر دیا گیا"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"ویجیٹس کو محفوظ وضع میں غیر فعال کر دیا گیا"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"شارٹ کٹ دستیاب نہیں ہے"</string>
-    <string name="home_screen" msgid="806512411299847073">"ہوم اسکرین"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"حسب ضرورت کارروائیاں"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"کوئی ویجیٹ منتخب کرنے کیلئے ٹچ کریں اور پکڑے رہیں۔"</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"کوئی ویجٹ منتخب کرنے یا حسب ضرورت کاروائیاں استعمال کرنے کیلئے دو بار تھپتھپائیں اور پکڑے رکھیں۔"</string>
+    <!-- no translation found for home_screen (5629429142036709174) -->
+    <skip />
+    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
+    <skip />
+    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
+    <skip />
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"‏%1$d چوڑا اور ‎%2$d اونچا"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"‏دستی طور پر رکھنے کیلئے ‎ٹچ کر کے دبائے رکھیں"</string>
     <string name="place_automatically" msgid="8064208734425456485">"خود کار طور پر شامل کریں"</string>
+    <!-- no translation found for widgets_count (656794749266073027) -->
+    <!-- no translation found for shortcuts_count (8080294865447938455) -->
+    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
+    <skip />
+    <string name="widget_button_text" msgid="2880537293434387943">"ویجیٹس"</string>
+    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
+    <skip />
+    <!-- no translation found for no_widgets_available (9140948620298620513) -->
+    <skip />
+    <!-- no translation found for no_search_results (6518732304311458580) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
+    <skip />
+    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ایپس تلاش کریں"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ایپس لوڈ کی جا رہی ہیں…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" سے مماثل کوئی ایپس نہیں ملیں"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"مزید ایپس تلاش کریں"</string>
     <string name="label_application" msgid="8531721983832654978">"ایپ"</string>
     <string name="notifications_header" msgid="1404149926117359025">"اطلاعات"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"ایک شارٹ کٹ منتخب کرنے کیلئے ٹچ کر کے دبائے رکھیں۔"</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"ایک شارٹ کٹ منتخب کرنے یا حسب ضرورت کارروائیاں استعمال کرنے کیلئے دو بار تھپتھپائیں اور دبائے رکھیں۔"</string>
+    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
+    <skip />
     <string name="out_of_space" msgid="4691004494942118364">"اس ہوم اسکرین پر مزید کوئی گنجائش نہیں ہے۔"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"پسندیدہ ٹرے میں مزید کوئی گنجائش نہیں ہے"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ایپس کی فہرست"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"ذاتی ایپس کی فہرست"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"دفتری ایپس کی فہرست"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"ہوم"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"ہٹائیں"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"اَن انسٹال کریں"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"ایپ کی معلومات"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"انسٹال کریں"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"ایپ تجویز نہ کریں"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"پیشگوئی پن کریں"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"شارٹ کٹس انسٹال کریں"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"کسی ایپ کو صارف کی مداخلت کے بغیر شارٹ کٹس شامل کرنے کی اجازت دیتا ہے۔"</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"ہوم ترتیبات اور شارٹ کٹس کو پڑھیں"</string>
@@ -63,7 +88,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"ویجیٹ کو لوڈ کرنے میں مسئلہ"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"ترتیب دیں"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"یہ ایک سسٹم ایپ ہے اور اسے اَن انسٹال نہیں کیا جا سکتا ہے۔"</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"بلا نام فولڈر"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"نام میں ترمیم کریں"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> غیر فعال ہے"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g> میں<xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> اطلاعات ہیں</item>
@@ -77,8 +102,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"نام کی تبدیلی محفوظ کرنے کیلئے تھپتھپائیں"</string>
     <string name="folder_closed" msgid="4100806530910930934">"فولڈر بند ہو گیا"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"فولڈر کا نام تبدیل کر کے <xliff:g id="NAME">%1$s</xliff:g> کر دیا گیا"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"فولڈر: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"ویجیٹس"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"فولڈر: <xliff:g id="NAME">%1$s</xliff:g>، <xliff:g id="SIZE">%2$d</xliff:g> آئٹمز"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"فولڈر: <xliff:g id="NAME">%1$s</xliff:g>، <xliff:g id="SIZE">%2$d</xliff:g> یا مزید آئٹمز"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"وال پیپرز"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"طرزیں اور وال پیپر"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"ہوم ترتیبات"</string>
@@ -92,16 +117,17 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"اطلاعاتی ڈاٹس دکھانے کی خاطر <xliff:g id="NAME">%1$s</xliff:g> کیلئے ایپ کی اطلاعات آن کریں"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"ترتیبات تبدیل کریں"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"اطلاعاتی ڈاٹس دکھائیں"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"آئیکن کو ہوم اسکرین میں شامل کریں"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"ہوم اسکرین میں ایپ آئیکنز شامل کریں"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"نئی ایپس کیلئے"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"نامعلوم"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"ہٹائیں"</string>
     <string name="abandoned_search" msgid="891119232568284442">"تلاش کریں"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"یہ ایپ انسٹال کردہ نہیں ہے"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"اس آئیکن کیلئے ایپ انسٹال کردہ نہیں ہے۔ آپ اسے ہٹا سکتے ہیں یا ایپ کو تلاش کر سکتے اور دستی طور پر اسے انسٹال کر سکتے ہیں۔"</string>
+    <!-- no translation found for app_installing_title (5864044122733792085) -->
+    <skip />
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> ڈاؤن لوڈ ہو رہا ہے، <xliff:g id="PROGRESS">%2$s</xliff:g> مکمل ہو گیا"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> انسٹال ہونے کا انتظار کر رہی ہے"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g> ویجیٹس"</string>
     <string name="widgets_list" msgid="796804551140113767">"ویجیٹس کی فہرست"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"ویجیٹس کی فہرست بند کر دی گئی"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"ہوم اسکرین میں شامل کریں"</string>
@@ -129,15 +155,30 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"شارٹ کٹس"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"شارٹ کٹس اور اطلاعات"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"برخاست کریں"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"بند کریں"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"اطلاع مسترد ہو گئی"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ذاتی"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"دفتری"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"دفتری پروفائل"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"یہاں دفتری ایپس تلاش کریں"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"ہر دفتری ایپ میں ایک بَیج ہوتا ہے اور اسے آپ کی تنظیم محفوظ رکھتی ہے۔ زیادہ آسان رسائی کیلئے ایپس کو اپنی ہوم اسکرین پر منتقل کریں۔"</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"آپ کی تنظیم کے زیر انتظام"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"اطلاعات اور ایپس آف ہیں"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"بند کریں"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"بند"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"ذاتی ڈیٹا ورک ایپس سے الگ اور پوشیدہ ہے"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"‏آپ کا IT منتظم ورک ایپس اور ڈیٹا کو دیکھ سکتا ہے"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"اگلا"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"سمجھ آ گئی"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"دفتری پروفائل روک دی گئی ہے"</string>
+    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
+    <skip />
+    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
+    <skip />
+    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
+    <skip />
+    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
+    <skip />
+    <string name="work_switch_tip" msgid="808075064383839144">"ورک ایپس اور اطلاعات کو روکیں"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"ناکام ہو گيا: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index d433e2a8ec..d31aea9474 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -56,8 +56,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"“<xliff:g id="QUERY">%1$s</xliff:g>” bilan mos hech qanday ilova topilmadi"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Boshqa ilovalarni qidirish"</string>
     <string name="label_application" msgid="8531721983832654978">"Ilova"</string>
-    <string name="search_corpus_apps" msgid="1917889409963779022">"Ilovalar"</string>
-    <string name="search_action_try_now" msgid="1458737965476149074">"Hoziroq sinang"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Bildirishnomalar"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Yorliqni bosib turgan holatda suring."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Ikki marta bosing va yorliqni bosib turgan holatda suring yoki maxsus amaldan foydalaning."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 71decfca68..f7bef37440 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -20,39 +20,56 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Trình chạy 3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Work"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Ứng dụng chưa được cài đặt."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Ứng dụng không có sẵn"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Ứng dụng đã tải xuống bị tắt ở chế độ An toàn"</string>
-    <string name="safemode_widget_error" msgid="4863470563535682004">"Tiện ích con bị vô hiệu hóa ở chế độ an toàn"</string>
+    <string name="safemode_widget_error" msgid="4863470563535682004">"Tiện ích bị vô hiệu hóa ở chế độ an toàn"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Lối tắt không khả dụng"</string>
-    <string name="home_screen" msgid="806512411299847073">"Màn hình chính"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"Tác vụ tùy chỉnh"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Chạm và giữ để chọn tiện ích con."</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Nhấn đúp và giữ để chọn tiện ích hoặc sử dụng tác vụ tùy chỉnh."</string>
+    <string name="home_screen" msgid="5629429142036709174">"Màn hình chính"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Chia đôi màn hình"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Chạm và giữ để di chuyển một tiện ích."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Nhấn đúp và giữ để di chuyển một tiện ích hoặc sử dụng các thao tác tùy chỉnh."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Rộng %1$d x cao %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Chạm và giữ để thêm theo cách thủ công"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Tự động thêm"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> tiện ích</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> tiện ích</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> lối tắt</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> lối tắt</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"Tiện ích"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Tìm kiếm"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Xóa văn bản khỏi hộp tìm kiếm"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Không có tiện ích nào"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Không có kết quả tìm kiếm nào"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Cá nhân"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Công việc"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Cuộc trò chuyện"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Tìm kiếm ứng dụng"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Đang tải ứng dụng…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Không tìm thấy ứng dụng nào phù hợp với \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Tìm kiếm thêm ứng dụng"</string>
     <string name="label_application" msgid="8531721983832654978">"Ứng dụng"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Thông báo"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"Chạm và giữ để chọn lối tắt."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"Nhấn đúp và giữ để chọn lối tắt hoặc sử dụng hành động tùy chỉnh."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Chạm và giữ để di chuyển một lối tắt."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Nhấn đúp và giữ để di chuyển một lối tắt hoặc sử dụng các thao tác tùy chỉnh."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Không còn chỗ trên Màn hình chính này."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Không còn chỗ trong khay Mục yêu thích"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Danh sách ứng dụng"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Danh sách ứng dụng cá nhân"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Danh sách ứng dụng công việc"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"Màn hình chính"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Xóa"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Gỡ cài đặt"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"Thông tin ứng dụng"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Cài đặt"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"Không đề xuất ứng dụng"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Ghim ứng dụng dự đoán"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"cài đặt lối tắt"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Cho phép ứng dụng thêm lối tắt mà không cần sự can thiệp của người dùng."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"đọc cài đặt và lối tắt trên Màn hình chính"</string>
@@ -60,10 +77,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"ghi cài đặt và lối tắt trên Màn hình chính"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Cho phép ứng dụng thay đổi cài đặt và lối tắt trên Màn hình chính."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> không được phép thực hiện cuộc gọi điện thoại"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Sự cố khi tải tiện ích con"</string>
+    <string name="gadget_error_text" msgid="6081085226050792095">"Sự cố khi tải tiện ích"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"Thiết lập"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Đây là ứng dụng hệ thống và không thể gỡ cài đặt."</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"Thư mục chưa đặt tên"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"Chỉnh sửa tên"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Đã vô hiệu hóa <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g>, có <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> thông báo</item>
@@ -77,8 +94,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"Nhấn để lưu đổi tên"</string>
     <string name="folder_closed" msgid="4100806530910930934">"Đã đóng thư mục"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"Đã đổi tên thư mục thành <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"Thư mục: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"Tiện ích"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"Thư mục: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> mục"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"Thư mục: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> mục trở lên"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Hình nền"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Kiểu và hình nền"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Cài đặt màn hình chính"</string>
@@ -86,22 +103,22 @@
     <string name="allow_rotation_title" msgid="7728578836261442095">"Cho phép xoay Màn hình chính"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"Khi xoay điện thoại"</string>
     <string name="notification_dots_title" msgid="9062440428204120317">"Dấu chấm thông báo"</string>
-    <string name="notification_dots_desc_on" msgid="1679848116452218908">"Bật"</string>
+    <string name="notification_dots_desc_on" msgid="1679848116452218908">"Đang bật"</string>
     <string name="notification_dots_desc_off" msgid="1760796511504341095">"Tắt"</string>
     <string name="title_missing_notification_access" msgid="7503287056163941064">"Cần quyền truy cập thông báo"</string>
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Để hiển thị Dấu chấm thông báo, hãy bật thông báo ứng dụng cho <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Thay đổi cài đặt"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Hiển thị dấu chấm thông báo"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"Thêm biểu tượng vào màn hình chính"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Thêm biểu tượng ứng dụng vào Màn hình chính"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Cho ứng dụng mới"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Không xác định"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Xóa"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Tìm kiếm"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Ứng dụng này chưa được cài đặt"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Ứng dụng cho biểu tượng này chưa được cài đặt. Bạn có thể xóa ứng dụng hoặc tìm kiếm và cài đặt ứng dụng theo cách thủ công."</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"Đang cài đặt <xliff:g id="NAME">%1$s</xliff:g>, hoàn tất <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"Đang tải xuống <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="PROGRESS">%2$s</xliff:g> hoàn tất"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"Đang chờ cài đặt <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Tiện ích của <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Danh sách tiện ích"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"Đã đóng danh sách tiện ích"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Thêm vào màn hình chính"</string>
@@ -129,15 +146,23 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"Lối tắt"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Phím tắt và thông báo"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Loại bỏ"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"Đóng"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"Đã loại bỏ thông báo"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Cá nhân"</string>
-    <string name="all_apps_work_tab" msgid="4884822796154055118">"Cơ quan"</string>
+    <string name="all_apps_work_tab" msgid="4884822796154055118">"Công việc"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Hồ sơ công việc"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"Tìm ứng dụng công việc tại đây"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"Mỗi ứng dụng công việc đều có một huy hiệu và được tổ chức của bạn bảo mật. Bạn có thể di chuyển ứng dụng đến Màn hình chính để truy cập dễ dàng hơn."</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"Do tổ chức của bạn quản lý"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"Thông báo và ứng dụng đang tắt"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"Đóng"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"Đã đóng"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Dữ liệu cá nhân được lưu trữ riêng biệt và ẩn khỏi các ứng dụng công việc"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Quản trị viên CNTT của bạn có thể xem dữ liệu và các ứng dụng công việc"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"Tiếp theo"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Hồ sơ công việc của bạn đã bị tạm dừng"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Các ứng dụng công việc không thể gửi thông báo cho bạn, sử dụng pin hoặc truy cập thông tin vị trí của bạn"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Hồ sơ công việc đã bị tạm dừng. Các ứng dụng công việc không thể gửi thông báo cho bạn, sử dụng pin hoặc truy cập thông tin vị trí của bạn"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Các ứng dụng công việc được gắn huy hiệu và quản trị viên CNTT sẽ nhìn thấy các ứng dụng này"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Tôi hiểu"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Tạm dừng các ứng dụng công việc"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Bật"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Bộ lọc"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Tạm dừng các ứng dụng và thông báo liên quan tới công việc"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Không thực hiện được thao tác: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 9804af1e89..ae7afcdc61 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -20,39 +20,64 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
     <string name="work_folder_name" msgid="3753320833950115786">"Work"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"未安装该应用。"</string>
     <string name="activity_not_available" msgid="7456344436509528827">"应用不可用"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"安全模式下不允许使用下载的此应用"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"安全模式下不允许使用微件"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"无法使用快捷方式"</string>
-    <string name="home_screen" msgid="806512411299847073">"主屏幕"</string>
-    <string name="custom_actions" msgid="3747508247759093328">"自定义操作"</string>
-    <string name="long_press_widget_to_add" msgid="7699152356777458215">"触摸并按住微件即可选择。"</string>
-    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"点按两次并按住微件即可选择微件，您也可以使用自定义操作。"</string>
+    <!-- no translation found for home_screen (5629429142036709174) -->
+    <skip />
+    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
+    <skip />
+    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
+    <skip />
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"宽 %1$d，高 %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"轻触并按住即可手动放置"</string>
     <string name="place_automatically" msgid="8064208734425456485">"自动添加"</string>
+    <!-- no translation found for widgets_count (656794749266073027) -->
+    <!-- no translation found for shortcuts_count (8080294865447938455) -->
+    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
+    <skip />
+    <string name="widget_button_text" msgid="2880537293434387943">"微件"</string>
+    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
+    <skip />
+    <!-- no translation found for no_widgets_available (9140948620298620513) -->
+    <skip />
+    <!-- no translation found for no_search_results (6518732304311458580) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
+    <skip />
+    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
+    <skip />
+    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"搜索应用"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"正在加载应用…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"未找到与“<xliff:g id="QUERY">%1$s</xliff:g>”相符的应用"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"搜索更多应用"</string>
     <string name="label_application" msgid="8531721983832654978">"应用"</string>
     <string name="notifications_header" msgid="1404149926117359025">"通知"</string>
-    <string name="long_press_shortcut_to_add" msgid="4524750017792716791">"触摸并按住快捷方式即可选择快捷方式。"</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"点按两次并按住快捷方式即可选择快捷方式，您也可以使用自定义操作。"</string>
+    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
+    <skip />
+    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
+    <skip />
     <string name="out_of_space" msgid="4691004494942118364">"此主屏幕上已没有空间。"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"收藏栏已满"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"应用列表"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"个人应用列表"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"工作应用列表"</string>
-    <string name="all_apps_home_button_label" msgid="252062713717058851">"主屏幕"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"移除"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"卸载"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"应用信息"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"安装"</string>
+    <string name="dismiss_prediction_label" msgid="3357562989568808658">"不要提供应用建议"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"固定预测的应用"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"安装快捷方式"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"允许应用自行添加快捷方式。"</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"读取主屏幕设置和快捷方式"</string>
@@ -63,7 +88,7 @@
     <string name="gadget_error_text" msgid="6081085226050792095">"加载微件时出现问题"</string>
     <string name="gadget_setup_text" msgid="8274003207686040488">"设置"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"这是系统应用，无法卸载。"</string>
-    <string name="folder_hint_text" msgid="6617836969016293992">"未命名文件夹"</string>
+    <string name="folder_hint_text" msgid="5174843001373488816">"修改名称"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"已停用<xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <plurals name="dotted_app_label" formatted="false" msgid="5194538107138265416">
       <item quantity="other"><xliff:g id="APP_NAME_2">%1$s</xliff:g>，有 <xliff:g id="NOTIFICATION_COUNT_3">%2$d</xliff:g> 个通知</item>
@@ -77,8 +102,8 @@
     <string name="folder_tap_to_rename" msgid="4017685068016979677">"点按可保存新名称"</string>
     <string name="folder_closed" msgid="4100806530910930934">"文件夹已关闭"</string>
     <string name="folder_renamed" msgid="1794088362165669656">"已将文件夹重命名为“<xliff:g id="NAME">%1$s</xliff:g>”"</string>
-    <string name="folder_name_format" msgid="6629239338071103179">"文件夹：<xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"微件"</string>
+    <string name="folder_name_format_exact" msgid="8626242716117004803">"文件夹：<xliff:g id="NAME">%1$s</xliff:g>，<xliff:g id="SIZE">%2$d</xliff:g> 个项目"</string>
+    <string name="folder_name_format_overflow" msgid="4270108890534995199">"文件夹：<xliff:g id="NAME">%1$s</xliff:g>，<xliff:g id="SIZE">%2$d</xliff:g> 个或更多项目"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"壁纸"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"样式和壁纸"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"主屏幕设置"</string>
@@ -92,16 +117,17 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"要显示通知圆点，请开启<xliff:g id="NAME">%1$s</xliff:g>的应用通知功能"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"更改设置"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"显示通知圆点"</string>
-    <string name="auto_add_shortcuts_label" msgid="8222286205987725611">"将图标添加到主屏幕"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"将应用图标添加到主屏幕"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"适用于新应用"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"未知"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"移除"</string>
     <string name="abandoned_search" msgid="891119232568284442">"搜索"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"未安装此应用"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"未安装此图标对应的应用。您可以移除此图标，也可以尝试搜索相应的应用并手动安装。"</string>
+    <!-- no translation found for app_installing_title (5864044122733792085) -->
+    <skip />
     <string name="app_downloading_title" msgid="8336702962104482644">"正在下载<xliff:g id="NAME">%1$s</xliff:g>，已完成 <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g>正在等待安装"</string>
-    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"<xliff:g id="NAME">%1$s</xliff:g>微件"</string>
     <string name="widgets_list" msgid="796804551140113767">"微件列表"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"微件列表已关闭"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"添加到主屏幕"</string>
@@ -129,15 +155,30 @@
     <string name="action_deep_shortcut" msgid="2864038805849372848">"快捷方式"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"快捷方式和通知"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"关闭"</string>
+    <string name="accessibility_close" msgid="2277148124685870734">"关闭"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"已关闭通知"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"个人"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"工作"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"工作资料"</string>
-    <string name="bottom_work_tab_user_education_title" msgid="5785851780786322825">"请在此处查找工作应用"</string>
-    <string name="bottom_work_tab_user_education_body" msgid="2818107472360579152">"每个工作应用均有一个徽标，并由贵单位负责确保其安全。请将工作应用移到主屏幕，以便轻松访问。"</string>
-    <string name="work_mode_on_label" msgid="4781128097185272916">"由贵单位管理"</string>
-    <string name="work_mode_off_label" msgid="3194894777601421047">"通知和应用均已关闭"</string>
-    <string name="bottom_work_tab_user_education_close_button" msgid="4224492243977802135">"关闭"</string>
-    <string name="bottom_work_tab_user_education_closed" msgid="1098340939861869465">"已关闭"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"工作应用与个人数据相互独立，它们无法获取此类数据"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"您的 IT 管理员可以查看工作应用和工作数据"</string>
+    <string name="work_profile_edu_next" msgid="8783418929296503629">"继续"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"知道了"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"工作资料已被暂停"</string>
+    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
+    <skip />
+    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
+    <skip />
+    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
+    <skip />
+    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
+    <skip />
+    <string name="work_switch_tip" msgid="808075064383839144">"暂停工作应用及其通知"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"失败：<xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 54902f6873..8929aa8482 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -26,51 +26,39 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"在安全模式中無法使用「已下載的應用程式」功能"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"在安全模式中無法使用小工具"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"沒有可用的捷徑"</string>
-    <!-- no translation found for home_screen (5629429142036709174) -->
-    <skip />
-    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
-    <skip />
-    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
-    <skip />
+    <string name="home_screen" msgid="5629429142036709174">"主畫面"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"分割螢幕"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"輕觸並按住即可移動小工具。"</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"㩒兩下之後㩒住，就可以郁小工具或者用自訂操作。"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d 闊，%2$d 高"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"按住即可手動新增"</string>
     <string name="place_automatically" msgid="8064208734425456485">"自動新增"</string>
-    <!-- no translation found for widgets_count (656794749266073027) -->
-    <!-- no translation found for shortcuts_count (8080294865447938455) -->
-    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
-    <skip />
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> 個小工具</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> 個小工具</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> 個捷徑</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> 個捷徑</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>、<xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"小工具"</string>
-    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
-    <skip />
-    <!-- no translation found for no_widgets_available (9140948620298620513) -->
-    <skip />
-    <!-- no translation found for no_search_results (6518732304311458580) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
-    <skip />
-    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
-    <skip />
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"搜尋"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"清除搜尋框中的文字"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"沒有可用的小工具"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"沒有相符的搜尋結果"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"個人"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"工作"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"對話"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"搜尋應用程式"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"正在載入應用程式…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"找不到與「<xliff:g id="QUERY">%1$s</xliff:g>」相符的應用程式"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"搜尋更多應用程式"</string>
     <string name="label_application" msgid="8531721983832654978">"應用程式"</string>
-    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
-    <skip />
-    <!-- no translation found for search_action_try_now (1458737965476149074) -->
-    <skip />
     <string name="notifications_header" msgid="1404149926117359025">"通知"</string>
-    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
-    <skip />
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"輕觸並按住即可移動捷徑。"</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"㩒兩下之後㩒住，就可以郁捷徑或者用自訂操作。"</string>
     <string name="out_of_space" msgid="4691004494942118364">"主畫面已無空間。"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"我的收藏寄存區沒有足夠空間"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"應用程式清單"</string>
@@ -128,8 +116,7 @@
     <string name="abandoned_search" msgid="891119232568284442">"搜尋"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"尚未安裝這個應用程式"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"您尚未安裝這個圖示代表的應用程式。您可以移除這個圖示，也可以搜尋該應用程式並手動安裝。"</string>
-    <!-- no translation found for app_installing_title (5864044122733792085) -->
-    <skip />
+    <string name="app_installing_title" msgid="5864044122733792085">"正在安裝「<xliff:g id="NAME">%1$s</xliff:g>」(已完成 <xliff:g id="PROGRESS">%2$s</xliff:g>)"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"正在下載 <xliff:g id="NAME">%1$s</xliff:g>，已完成 <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"正在等待安裝 <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"小工具清單"</string>
@@ -169,20 +156,13 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"繼續"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"知道了"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"工作設定檔已暫停使用"</string>
-    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
-    <skip />
-    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
-    <skip />
-    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
-    <skip />
-    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
-    <skip />
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"工作應用程式無法向您傳送通知、使用電池或存取位置"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"工作設定檔已暫停。工作應用程式無法向您傳送通知、使用電池或存取位置"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"IT 管理員可看到工作應用程式和相關標誌"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"知道了"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"暫停工作應用程式"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"開啟"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"篩選器"</string>
     <string name="work_switch_tip" msgid="808075064383839144">"暫停工作應用程式和通知"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"操作失敗：<xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index a594147546..fd0ff0ecef 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -26,51 +26,39 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"在安全模式中無法使用「已下載的應用程式」功能"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"在安全模式下無法使用小工具"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"目前無法使用捷徑"</string>
-    <!-- no translation found for home_screen (5629429142036709174) -->
-    <skip />
-    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
-    <skip />
-    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
-    <skip />
+    <string name="home_screen" msgid="5629429142036709174">"主畫面"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"分割畫面"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"按住即可移動小工具。"</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"輕觸兩下並按住即可移動小工具或使用自訂操作。"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"寬度為 %1$d，高度為 %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"按住圖示即可手動新增"</string>
     <string name="place_automatically" msgid="8064208734425456485">"自動新增"</string>
-    <!-- no translation found for widgets_count (656794749266073027) -->
-    <!-- no translation found for shortcuts_count (8080294865447938455) -->
-    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
-    <skip />
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> 項小工具</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> 項小工具</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> 個捷徑</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> 個捷徑</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>、<xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"小工具"</string>
-    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
-    <skip />
-    <!-- no translation found for no_widgets_available (9140948620298620513) -->
-    <skip />
-    <!-- no translation found for no_search_results (6518732304311458580) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
-    <skip />
-    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
-    <skip />
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"搜尋"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"清除搜尋框中的文字"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"沒有可用的小工具"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"找不到相符的搜尋結果"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"個人"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"工作"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"對話"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"搜尋應用程式"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"正在載入應用程式…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"找不到與「<xliff:g id="QUERY">%1$s</xliff:g>」相符的應用程式"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"搜尋更多應用程式"</string>
     <string name="label_application" msgid="8531721983832654978">"應用程式"</string>
-    <!-- no translation found for search_corpus_apps (1917889409963779022) -->
-    <skip />
-    <!-- no translation found for search_action_try_now (1458737965476149074) -->
-    <skip />
     <string name="notifications_header" msgid="1404149926117359025">"通知"</string>
-    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
-    <skip />
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"按住即可移動捷徑。"</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"輕觸兩下並按住即可移動捷徑或使用自訂操作。"</string>
     <string name="out_of_space" msgid="4691004494942118364">"這個主畫面已無空間。"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"「我的最愛」匣已無可用空間"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"應用程式清單"</string>
@@ -128,8 +116,7 @@
     <string name="abandoned_search" msgid="891119232568284442">"搜尋"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"尚未安裝這個應用程式"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"你尚未安裝這個圖示代表的應用程式。你可以移除這個圖示，也可以搜尋該應用程式並手動安裝。"</string>
-    <!-- no translation found for app_installing_title (5864044122733792085) -->
-    <skip />
+    <string name="app_installing_title" msgid="5864044122733792085">"正在安裝「<xliff:g id="NAME">%1$s</xliff:g>」(已完成 <xliff:g id="PROGRESS">%2$s</xliff:g>)"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"正在下載「<xliff:g id="NAME">%1$s</xliff:g>」，已完成 <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"正在等待安裝「<xliff:g id="NAME">%1$s</xliff:g>」"</string>
     <string name="widgets_list" msgid="796804551140113767">"小工具清單"</string>
@@ -169,20 +156,13 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"繼續"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"我知道了"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"工作資料夾已暫停"</string>
-    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
-    <skip />
-    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
-    <skip />
-    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
-    <skip />
-    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
-    <skip />
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"工作應用程式將無法傳送通知，也無法存取你的位置資訊。你還可以省下這類應用程式消耗的電量"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"工作資料夾已暫停。工作應用程式將無法傳送通知，也無法存取你的位置資訊。你還可以省下這類應用程式消耗的電量"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"你的 IT 管理員可以看見工作應用程式和相關標記"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"我知道了"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"暫停工作應用程式"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"開啟"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"篩選器"</string>
     <string name="work_switch_tip" msgid="808075064383839144">"暫停工作應用程式和通知"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"失敗：<xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index fc84846683..8296853504 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -56,8 +56,6 @@
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Azikho izinhlelo zokusebenza ezitholiwe ezifana ne-\"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Sesha izinhlelo zokusebenza eziningi"</string>
     <string name="label_application" msgid="8531721983832654978">"Uhlelo lokusebenza"</string>
-    <string name="search_corpus_apps" msgid="1917889409963779022">"Ama-app"</string>
-    <string name="search_action_try_now" msgid="1458737965476149074">"Zama manje"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Izaziso"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Thinta uphinde ubambe ukuze uhambise isinqamuleli."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Thepha kabili uphinde ubambe ukuze uhambise isinqamuleli noma usebenzise izenzo ezingokwezifiso."</string>
-- 
GitLab


From 9f2acdd552fb66d792099987a8b280c1e73c126b Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 15 Apr 2021 16:47:47 -0700
Subject: [PATCH 0893/1664] Unifying icon loading methods

Bug: 183641907
Test: Presubmit
Change-Id: I255e81a128635910b531b3d00f707fa352050f2e
---
 src/com/android/launcher3/Utilities.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 1776777934..6f12ec784f 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -600,7 +600,7 @@ public final class Utilities {
             LauncherActivityInfo activityInfo = launcher.getSystemService(LauncherApps.class)
                     .resolveActivity(info.getIntent(), info.user);
             outObj[0] = activityInfo;
-            return activityInfo == null ? null : new IconProvider(launcher).getIconForUI(
+            return activityInfo == null ? null : new IconProvider(launcher).getIcon(
                     activityInfo, launcher.getDeviceProfile().inv.fillResIconDpi);
         } else if (info.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT) {
             if (info instanceof PendingAddShortcutInfo) {
-- 
GitLab


From f089f741adf3da7a0a5c3900baa4af3ca2f426c0 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Thu, 15 Apr 2021 16:03:28 +0100
Subject: [PATCH 0894/1664] Fix app widget preview layout drag-n-drop &
 rendering

1. Before this CL, preview layouts are not rendered in both the
   BottomWidgetSheet and SearchPopupSheet because the preview
   width & height are not set correctly.
2. Also applies the right padding to preview layouts.

Bug: 185374336
Test: Drag-n-drop preview layout from the full widgets picker,
      the bottom widgets picker and the search widgets picker.

Change-Id: I2b6303bfe4eb86a4935a5569f6107e9d46448902
---
 .../widget/LauncherAppWidgetHostView.java     |  9 +++--
 .../android/launcher3/widget/WidgetCell.java  | 39 +++++++++----------
 .../launcher3/widget/WidgetCellPreview.java   | 25 ++++++++++++
 3 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
index 687318f775..0d53f207f8 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
@@ -325,9 +325,12 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         float relativeScreenWidth = 1f / numScreens;
         float absoluteTop = widgetLocation.top;
         float absoluteBottom = widgetLocation.bottom;
-        for (View v = (View) getParent();
-                v != null && v.getId() != R.id.launcher;
-                v = (View) v.getParent()) {
+        View v = this;
+        while (v.getParent() instanceof View) {
+            v = (View) v.getParent();
+            if (v.getId() != R.id.launcher) {
+                break;
+            }
             absoluteBottom += v.getTop();
             absoluteTop += v.getTop();
         }
diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index 5e7c961708..c08160bbef 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -21,14 +21,15 @@ import static com.android.launcher3.Utilities.ATLEAST_S;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
+import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.CancellationSignal;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnLayoutChangeListener;
-import android.view.ViewGroup;
 import android.view.ViewPropertyAnimator;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.FrameLayout;
@@ -96,7 +97,6 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     private Drawable mDeferredDrawable;
 
     protected final BaseActivity mActivity;
-    protected final DeviceProfile mDeviceProfile;
     private final CheckLongPressHelper mLongPressHelper;
     private final float mEnforcedCornerRadius;
 
@@ -115,7 +115,6 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
         super(context, attrs, defStyle);
 
         mActivity = BaseActivity.fromContext(context);
-        mDeviceProfile = mActivity.getDeviceProfile();
         mLongPressHelper = new CheckLongPressHelper(this);
 
         mLongPressHelper.setLongPressTimeoutFactor(1);
@@ -127,7 +126,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     }
 
     private void setContainerWidth() {
-        mCellSize = (int) (mDeviceProfile.allAppsIconSizePx * WIDTH_SCALE);
+        mCellSize = (int) (mActivity.getDeviceProfile().allAppsIconSizePx * WIDTH_SCALE);
         mPresetPreviewSize = (int) (mCellSize * PREVIEW_SCALE);
         mPreviewWidth = mPreviewHeight = mPresetPreviewSize;
     }
@@ -222,16 +221,11 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
             launcherAppWidgetProviderInfo.initialLayout = item.widgetInfo.previewLayout;
             mAppWidgetHostViewPreview.setAppWidget(/* appWidgetId= */ -1,
                     launcherAppWidgetProviderInfo);
-            mAppWidgetHostViewPreview.setPadding(/* left= */ 0, /* top= */0, /* right= */
-                    0, /* bottom= */ 0);
+            Rect padding = new Rect();
+            mAppWidgetHostViewPreview.getWidgetInset(mActivity.getDeviceProfile(), padding);
+            mAppWidgetHostViewPreview.setPadding(padding.left, padding.top, padding.right,
+                    padding.bottom);
             mAppWidgetHostViewPreview.updateAppWidget(/* remoteViews= */ null);
-            // Gravity 77 = "fill"
-            FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    ViewGroup.LayoutParams.MATCH_PARENT, /* gravity= */ 77);
-            mAppWidgetHostViewPreview.setLayoutParams(params);
-            mWidgetImageContainer.addView(mAppWidgetHostViewPreview, /* index= */ 0);
-            mWidgetImage.setVisibility(View.GONE);
         }
     }
 
@@ -284,7 +278,8 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
             }
         }
         Drawable badge = mWidgetPreviewLoader.getBadgeForUser(mItem.user,
-                BaseIconFactory.getBadgeSizeForIconSize(mDeviceProfile.allAppsIconSizePx));
+                BaseIconFactory.getBadgeSizeForIconSize(
+                        mActivity.getDeviceProfile().allAppsIconSizePx));
         if (badge == null) {
             mWidgetBadge.setVisibility(View.GONE);
         } else {
@@ -318,11 +313,12 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
         }
 
         if (mAppWidgetHostViewPreview != null) {
-            DeviceProfile dp = mActivity.getDeviceProfile();
-            int viewWidth = dp.cellWidthPx * mItem.spanX;
-            int viewHeight = dp.cellHeightPx * mItem.spanY;
-
-            setContainerSize(viewWidth, viewHeight);
+            setContainerSize(mPreviewWidth, mPreviewHeight);
+            FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
+                    mPreviewWidth, mPreviewHeight, Gravity.FILL);
+            mAppWidgetHostViewPreview.setLayoutParams(params);
+            mWidgetImageContainer.addView(mAppWidgetHostViewPreview, /* index= */ 0);
+            mWidgetImage.setVisibility(View.GONE);
             applyPreview((Drawable) null);
             return;
         }
@@ -342,8 +338,9 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     public void setPreviewSize(int spanX, int spanY, float previewScale) {
         int padding = 2 * getResources()
                 .getDimensionPixelSize(R.dimen.widget_preview_shortcut_padding);
-        mPreviewWidth = mDeviceProfile.cellWidthPx * spanX + padding;
-        mPreviewHeight = mDeviceProfile.cellHeightPx * spanY + padding;
+        DeviceProfile deviceProfile = mActivity.getDeviceProfile();
+        mPreviewWidth = deviceProfile.cellWidthPx * spanX + padding;
+        mPreviewHeight = deviceProfile.cellHeightPx * spanY + padding;
         mPreviewScale = previewScale;
     }
 
diff --git a/src/com/android/launcher3/widget/WidgetCellPreview.java b/src/com/android/launcher3/widget/WidgetCellPreview.java
index ad3a61abb4..9f45d71c47 100644
--- a/src/com/android/launcher3/widget/WidgetCellPreview.java
+++ b/src/com/android/launcher3/widget/WidgetCellPreview.java
@@ -20,6 +20,8 @@ import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.widget.FrameLayout;
 
+import androidx.annotation.Nullable;
+
 /**
  * View group managing the widget preview: either using a {@link WidgetImageView} or an actual
  * {@link LauncherAppWidgetHostView}.
@@ -43,4 +45,27 @@ public class WidgetCellPreview extends FrameLayout {
         return true;
     }
 
+    /** Returns {@code true} if this container has a preview layout. */
+    public boolean hasPreviewLayout() {
+        for (int i = 0; i < getChildCount(); i++) {
+            if (getChildAt(i) instanceof LauncherAppWidgetHostView) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Returns {@link LauncherAppWidgetHostView} if this container has a preview layout. Otherwise,
+     * returns null.
+     */
+    @Nullable
+    public LauncherAppWidgetHostView getPreviewLayout() {
+        for (int i = 0; i < getChildCount(); i++) {
+            if (getChildAt(i) instanceof LauncherAppWidgetHostView) {
+                return (LauncherAppWidgetHostView) getChildAt(i);
+            }
+        }
+        return null;
+    }
 }
-- 
GitLab


From 0d309db47e5be3ab98666ffbd411e0a59a326b32 Mon Sep 17 00:00:00 2001
From: Cyrus Boadway <boadway@google.com>
Date: Wed, 14 Apr 2021 12:29:14 +0000
Subject: [PATCH 0895/1664] Use Quickstep ActivityOptions when launching
 activities from App Widgets

Set a Quickstep specific InteractionHandler on QuickstepLauncher's
AppWidgetHost, which provides QuickstepTransitionManager-generated
ActivityOptions when starting activities from app widget interactions.

Bug: 169042867
Test: manual
Topic: quickstep-widget-app-launch
Change-Id: I231122b09aede940c047f19a5b5d1e7c562f6d3f
---
 .../QuickstepInteractionHandler.java          | 63 +++++++++++++++++++
 .../uioverrides/QuickstepLauncher.java        | 13 ++++
 src/com/android/launcher3/Launcher.java       |  8 ++-
 3 files changed, 82 insertions(+), 2 deletions(-)
 create mode 100644 quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java

diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
new file mode 100644
index 0000000000..66e4f4c61c
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.uioverrides;
+
+import android.app.ActivityOptions;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.util.Log;
+import android.util.Pair;
+import android.view.View;
+import android.widget.RemoteViews;
+
+import com.android.launcher3.util.ActivityOptionsWrapper;
+import com.android.launcher3.widget.LauncherAppWidgetHostView;
+
+/** Provides a Quickstep specific animation when launching an activity from an app widget. */
+class QuickstepInteractionHandler implements RemoteViews.InteractionHandler {
+
+    private static final String TAG = "QuickstepInteractionHandler";
+
+    private final QuickstepLauncher mLauncher;
+
+    QuickstepInteractionHandler(QuickstepLauncher launcher) {
+        mLauncher = launcher;
+    }
+
+    @Override
+    public boolean onInteraction(View view, PendingIntent pendingIntent,
+            RemoteViews.RemoteResponse remoteResponse) {
+        LauncherAppWidgetHostView hostView = findHostViewAncestor(view);
+        if (hostView == null) {
+            Log.e(TAG, "View did not have a LauncherAppWidgetHostView ancestor.");
+            return RemoteViews.startPendingIntent(hostView, pendingIntent,
+                    remoteResponse.getLaunchOptions(view));
+        }
+        Pair<Intent, ActivityOptions> options = remoteResponse.getLaunchOptions(hostView);
+        ActivityOptionsWrapper activityOptions = mLauncher.getAppTransitionManager()
+                .getActivityLaunchOptions(mLauncher, hostView);
+        options = Pair.create(options.first, activityOptions.options);
+        return RemoteViews.startPendingIntent(hostView, pendingIntent, options);
+    }
+
+    private LauncherAppWidgetHostView findHostViewAncestor(View v) {
+        while (v != null) {
+            if (v instanceof LauncherAppWidgetHostView) return (LauncherAppWidgetHostView) v;
+            v = (View) v.getParent();
+        }
+        return null;
+    }
+}
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 0ceb8c74f9..f09d9e087e 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -36,6 +36,7 @@ import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SY
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
+import android.os.SystemProperties;
 import android.view.HapticFeedbackConstants;
 import android.view.View;
 
@@ -71,6 +72,7 @@ import com.android.launcher3.util.OnboardingPrefs;
 import com.android.launcher3.util.TouchController;
 import com.android.launcher3.util.UiThreadHelper;
 import com.android.launcher3.util.UiThreadHelper.AsyncCommand;
+import com.android.launcher3.widget.LauncherAppWidgetHost;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.SystemUiProxy;
@@ -88,6 +90,9 @@ import java.util.stream.Stream;
 
 public class QuickstepLauncher extends BaseQuickstepLauncher {
 
+    private static final boolean ENABLE_APP_WIDGET_LAUNCH_ANIMATION =
+            SystemProperties.getBoolean("persist.debug.quickstep_app_widget_launch", false);
+
     public static final boolean GO_LOW_RAM_RECENTS_ENABLED = false;
     /**
      * Reusable command for applying the shelf height on the background thread.
@@ -320,6 +325,14 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
         return new QuickstepAtomicAnimationFactory(this);
     }
 
+    protected LauncherAppWidgetHost createAppWidgetHost() {
+        LauncherAppWidgetHost appWidgetHost = super.createAppWidgetHost();
+        if (ENABLE_APP_WIDGET_LAUNCH_ANIMATION) {
+            appWidgetHost.setInteractionHandler(new QuickstepInteractionHandler(this));
+        }
+        return appWidgetHost;
+    }
+
     private static final class LauncherTaskViewController extends
             TaskViewTouchController<Launcher> {
 
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 50915439da..3236f5d542 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -436,8 +436,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         mOnboardingPrefs = createOnboardingPrefs(mSharedPrefs);
 
         mAppWidgetManager = new WidgetManagerHelper(this);
-        mAppWidgetHost = new LauncherAppWidgetHost(this,
-                appWidgetId -> getWorkspace().removeWidget(appWidgetId));
+        mAppWidgetHost = createAppWidgetHost();
         mAppWidgetHost.startListening();
 
         inflateRootView(R.layout.launcher);
@@ -1428,6 +1427,11 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         return mAppWidgetHost;
     }
 
+    protected LauncherAppWidgetHost createAppWidgetHost() {
+        return new LauncherAppWidgetHost(this,
+                appWidgetId -> getWorkspace().removeWidget(appWidgetId));
+    }
+
     public LauncherModel getModel() {
         return mModel;
     }
-- 
GitLab


From 9594c6987ff70f3630eb47435c7f00f11e289db7 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Tue, 13 Apr 2021 21:59:42 +0100
Subject: [PATCH 0896/1664] Handle page offset for grid overview

- Use TaskView's actual position with grid/fullscreen translation considered for taskPosition calculation
- Shift taskPosition by midpoint scroll, and no longer assumes midpoint is on middle of the screen
- Handle situation that TaskView is on left/right of midpoint, making the calculation generic to be able to handle grid situation

Bug: 175939487
Test: Launch modal view with wide/, RTL/non-RTL, orientation/simulated landscape combinations
Change-Id: Idd0cc9c5e24f453d830e1420319a38d3d784270d
---
 .../android/quickstep/views/RecentsView.java  | 134 +++++++++++++-----
 .../com/android/quickstep/views/TaskView.java |  33 +++--
 .../touch/LandscapePagedViewHandler.java      |  15 ++
 .../touch/PagedOrientationHandler.java        |   3 +
 .../touch/PortraitPagedViewHandler.java       |  15 ++
 5 files changed, 152 insertions(+), 48 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 5d3e0b8bf7..1df3d3c18a 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -270,7 +270,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 public void setValue(RecentsView view, float scale) {
                     view.setScaleX(scale);
                     view.setScaleY(scale);
-                    view.mLastComputedTaskPushOutDistance = null;
+                    view.mLastComputedTaskStartPushOutDistance = null;
+                    view.mLastComputedTaskEndPushOutDistance = null;
                     view.mLiveTileTaskViewSimulator.recentsViewScale.value = scale;
                     view.updatePageOffsets();
                     view.setTaskViewsResistanceTranslation(view.mTaskViewsSecondaryTranslation);
@@ -308,7 +309,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     protected final Rect mLastComputedGridSize = new Rect();
     protected final Rect mLastComputedGridTaskSize = new Rect();
     // How much a task that is directly offscreen will be pushed out due to RecentsView scale/pivot.
-    protected Float mLastComputedTaskPushOutDistance = null;
+    protected Float mLastComputedTaskStartPushOutDistance = null;
+    protected Float mLastComputedTaskEndPushOutDistance = null;
     protected boolean mEnableDrawingLiveTile = false;
     protected final Rect mTempRect = new Rect();
     protected final RectF mTempRectF = new RectF();
@@ -2467,7 +2469,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         setPivotX(mTempPointF.x);
         setPivotY(mTempPointF.y);
         setTaskModalness(mTaskModalness);
-        mLastComputedTaskPushOutDistance = null;
+        mLastComputedTaskStartPushOutDistance = null;
+        mLastComputedTaskEndPushOutDistance = null;
         updatePageOffsets();
         setImportantForAccessibility(isModal() ? IMPORTANT_FOR_ACCESSIBILITY_NO
                 : IMPORTANT_FOR_ACCESSIBILITY_AUTO);
@@ -2476,10 +2479,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     private void updatePageOffsets() {
         float offset = mAdjacentPageOffset;
         float modalOffset = ACCEL_0_75.getInterpolation(mTaskModalness);
-        if (mIsRtl) {
-            offset = -offset;
-            modalOffset = -modalOffset;
-        }
         int count = getChildCount();
 
         TaskView runningTask = mRunningTaskId == -1 || !mRunningTaskTileHidden
@@ -2495,13 +2494,27 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 ? getOffsetSize(midpoint + 1, midpoint, offset)
                 : 0;
 
+        boolean showAsGrid = showAsGrid();
         float modalMidpointOffsetSize = 0;
-        float modalLeftOffsetSize = modalMidpoint - 1 >= 0
-                ? -getOffsetSize(modalMidpoint - 1, modalMidpoint, modalOffset)
-                : 0;
-        float modalRightOffsetSize = modalMidpoint + 1 < count
-                ? getOffsetSize(modalMidpoint + 1, modalMidpoint, modalOffset)
-                : 0;
+        float modalLeftOffsetSize = 0;
+        float modalRightOffsetSize = 0;
+        float gridOffsetSize = 0;
+
+        if (showAsGrid) {
+            // In grid, we only focus the task on the side. The reference index used for offset
+            // calculation is the task directly next to the focus task in the grid.
+            int referenceIndex = modalMidpoint == 0 ? 1 : 0;
+            gridOffsetSize = referenceIndex < count
+                    ? getOffsetSize(referenceIndex, modalMidpoint, modalOffset)
+                    : 0;
+        } else {
+            modalLeftOffsetSize = modalMidpoint - 1 >= 0
+                    ? getOffsetSize(modalMidpoint - 1, modalMidpoint, modalOffset)
+                    : 0;
+            modalRightOffsetSize = modalMidpoint + 1 < count
+                    ? getOffsetSize(modalMidpoint + 1, modalMidpoint, modalOffset)
+                    : 0;
+        }
 
         for (int i = 0; i < count; i++) {
             float translation = i == midpoint
@@ -2511,20 +2524,36 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                             : rightOffsetSize;
             float modalTranslation = i == modalMidpoint
                     ? modalMidpointOffsetSize
-                    : i < modalMidpoint
-                            ? modalLeftOffsetSize
-                            : modalRightOffsetSize;
+                    : showAsGrid
+                            ? gridOffsetSize
+                            : i < modalMidpoint ? modalLeftOffsetSize : modalRightOffsetSize;
             float totalTranslation = translation + modalTranslation;
             View child = getChildAt(i);
             FloatProperty translationProperty = child instanceof TaskView
                     ? ((TaskView) child).getPrimaryTaskOffsetTranslationProperty()
                     : mOrientationHandler.getPrimaryViewTranslate();
-            translationProperty.set(child,
-                    totalTranslation * mOrientationHandler.getPrimaryTranslationDirectionFactor());
+            translationProperty.set(child, totalTranslation);
         }
         updateCurveProperties();
     }
 
+    /**
+     * Computes the child position with persistent translation considered (see
+     * {@link TaskView#getPersistentTranslationX()}.
+     */
+    private void getPersistentChildPosition(int childIndex, int midPointScroll, RectF outRect) {
+        View child = getChildAt(childIndex);
+        outRect.set(child.getLeft(), child.getTop(), child.getRight(), child.getBottom());
+        if (child instanceof TaskView) {
+            TaskView taskView = (TaskView) child;
+            outRect.offset(taskView.getPersistentTranslationX(),
+                    taskView.getPersistentTranslationY());
+            outRect.top += mActivity.getDeviceProfile().overviewTaskThumbnailTopMarginPx;
+        }
+        outRect.offset(mOrientationHandler.getPrimaryValue(-midPointScroll, 0),
+                mOrientationHandler.getSecondaryValue(-midPointScroll, 0));
+    }
+
     /**
      * Computes the distance to offset the given child such that it is completely offscreen when
      * translating away from the given midpoint.
@@ -2535,33 +2564,60 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             // Don't bother calculating everything below if we won't offset anyway.
             return 0;
         }
+
         // First, get the position of the task relative to the midpoint. If there is no midpoint
         // then we just use the normal (centered) task position.
-        mTempRectF.set(mLastComputedTaskSize);
         RectF taskPosition = mTempRectF;
-        float desiredLeft = getWidth();
-        // Used to calculate the scale of the task view based on its new offset.
+        // Whether the task should be shifted to start direction (i.e. left edge for portrait, top
+        // edge for landscape/seascape).
+        boolean isStartShift;
         if (midpointIndex > -1) {
             // When there is a midpoint reference task, adjacent tasks have less distance to travel
             // to reach offscreen. Offset the task position to the task's starting point.
-            View child = getChildAt(childIndex);
-            View midpointChild = getChildAt(midpointIndex);
-            int distanceFromMidpoint = Math.abs(mOrientationHandler.getChildStart(child)
-                    - mOrientationHandler.getChildStart(midpointChild)
-                    + getDisplacementFromScreenCenter(midpointIndex));
-            taskPosition.offset(distanceFromMidpoint, 0);
-        }
-        float distanceToOffscreen = desiredLeft - taskPosition.left;
-        // Finally, we need to account for RecentsView scale, because it moves tasks based on its
-        // pivot. To do this, we move the task position to where it would be offscreen at scale = 1
-        // (computed above), then we apply the scale via getMatrix() to determine how much that
-        // moves the task from its desired position, and adjust the computed distance accordingly.
-        if (mLastComputedTaskPushOutDistance == null) {
-            taskPosition.offsetTo(desiredLeft, 0);
-            getMatrix().mapRect(taskPosition);
-            mLastComputedTaskPushOutDistance = (taskPosition.left - desiredLeft) / getScaleX();
-        }
-        distanceToOffscreen -= mLastComputedTaskPushOutDistance;
+            int midpointScroll = getScrollForPage(midpointIndex);
+            getPersistentChildPosition(midpointIndex, midpointScroll, taskPosition);
+            float midpointStart = mOrientationHandler.getStart(taskPosition);
+
+            getPersistentChildPosition(childIndex, midpointScroll, taskPosition);
+            // Assume child does not overlap with midPointChild.
+            isStartShift = mOrientationHandler.getStart(taskPosition) < midpointStart;
+        } else {
+            // Position the task at scroll position.
+            getPersistentChildPosition(childIndex, getScrollForPage(childIndex), taskPosition);
+            isStartShift = mIsRtl;
+        }
+
+        // Next, calculate the distance to move the task off screen. We also need to account for
+        // RecentsView scale, because it moves tasks based on its pivot. To do this, we move the
+        // task position to where it would be offscreen at scale = 1 (computed above), then we
+        // apply the scale via getMatrix() to determine how much that moves the task from its
+        // desired position, and adjust the computed distance accordingly.
+        float distanceToOffscreen;
+        if (isStartShift) {
+            float desiredStart = -mOrientationHandler.getPrimarySize(taskPosition);
+            distanceToOffscreen = -mOrientationHandler.getEnd(taskPosition);
+            if (mLastComputedTaskStartPushOutDistance == null) {
+                taskPosition.offsetTo(
+                        mOrientationHandler.getPrimaryValue(desiredStart, 0f),
+                        mOrientationHandler.getSecondaryValue(desiredStart, 0f));
+                getMatrix().mapRect(taskPosition);
+                mLastComputedTaskStartPushOutDistance = mOrientationHandler.getEnd(taskPosition)
+                        / mOrientationHandler.getPrimaryScale(this);
+            }
+            distanceToOffscreen -= mLastComputedTaskStartPushOutDistance;
+        } else {
+            float desiredStart = mOrientationHandler.getPrimarySize(this);
+            distanceToOffscreen = desiredStart - mOrientationHandler.getStart(taskPosition);
+            if (mLastComputedTaskEndPushOutDistance == null) {
+                taskPosition.offsetTo(
+                        mOrientationHandler.getPrimaryValue(desiredStart, 0f),
+                        mOrientationHandler.getSecondaryValue(desiredStart, 0f));
+                getMatrix().mapRect(taskPosition);
+                mLastComputedTaskEndPushOutDistance = (mOrientationHandler.getStart(taskPosition)
+                        - desiredStart) / mOrientationHandler.getPrimaryScale(this);
+            }
+            distanceToOffscreen -= mLastComputedTaskEndPushOutDistance;
+        }
         return distanceToOffscreen * offsetProgress;
     }
 
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index e6143fb055..8f22622058 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -987,20 +987,30 @@ public class TaskView extends FrameLayout implements Reusable {
 
     private void applyTranslationX() {
         setTranslationX(mDismissTranslationX + mTaskOffsetTranslationX + mTaskResistanceTranslationX
-                + getFullscreenTrans(mFullscreenTranslationX)
-                + getNonFullscreenTrans(mNonFullscreenTranslationX)
-                + getGridTrans(mGridTranslationX));
+                + getPersistentTranslationX());
     }
 
     private void applyTranslationY() {
-        setTranslationY(
-                mDismissTranslationY + mTaskOffsetTranslationY + mTaskResistanceTranslationY
-                        + getGridTrans(mGridTranslationY) + mBoxTranslationY);
+        setTranslationY(mDismissTranslationY + mTaskOffsetTranslationY + mTaskResistanceTranslationY
+                + getPersistentTranslationY());
     }
 
-    private float getGridTrans(float endTranslation) {
-        float progress = ACCEL_DEACCEL.getInterpolation(mGridProgress);
-        return Utilities.mapRange(progress, 0, endTranslation);
+    /**
+     * Returns addition of translationX that is persistent (e.g. fullscreen and grid), and does not
+     * change according to a temporary state (e.g. task offset).
+     */
+    public float getPersistentTranslationX() {
+        return getFullscreenTrans(mFullscreenTranslationX)
+                + getNonFullscreenTrans(mNonFullscreenTranslationX)
+                + getGridTrans(mGridTranslationX);
+    }
+
+    /**
+     * Returns addition of translationY that is persistent (e.g. fullscreen and grid), and does not
+     * change according to a temporary state (e.g. task offset).
+     */
+    public float getPersistentTranslationY() {
+        return getGridTrans(mGridTranslationY) + mBoxTranslationY;
     }
 
     public FloatProperty<TaskView> getPrimaryDismissTranslationProperty() {
@@ -1275,6 +1285,11 @@ public class TaskView extends FrameLayout implements Reusable {
         return endTranslation - getFullscreenTrans(endTranslation);
     }
 
+    private float getGridTrans(float endTranslation) {
+        float progress = ACCEL_DEACCEL.getInterpolation(mGridProgress);
+        return Utilities.mapRange(progress, 0, endTranslation);
+    }
+
     public boolean isRunningTask() {
         if (getRecentsView() == null) {
             return false;
diff --git a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
index a241e637be..18e27a4ba5 100644
--- a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
+++ b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
@@ -121,11 +121,26 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
         return view.getMeasuredHeight();
     }
 
+    @Override
+    public int getPrimarySize(View view) {
+        return view.getHeight();
+    }
+
     @Override
     public float getPrimarySize(RectF rect) {
         return rect.height();
     }
 
+    @Override
+    public float getStart(RectF rect) {
+        return rect.top;
+    }
+
+    @Override
+    public float getEnd(RectF rect) {
+        return rect.bottom;
+    }
+
     @Override
     public int getClearAllSidePadding(View view, boolean isRtl) {
         return (isRtl ? view.getPaddingBottom() : - view.getPaddingTop()) / 2;
diff --git a/src/com/android/launcher3/touch/PagedOrientationHandler.java b/src/com/android/launcher3/touch/PagedOrientationHandler.java
index b85d08addd..560df86379 100644
--- a/src/com/android/launcher3/touch/PagedOrientationHandler.java
+++ b/src/com/android/launcher3/touch/PagedOrientationHandler.java
@@ -65,7 +65,10 @@ public interface PagedOrientationHandler {
     float getPrimaryDirection(MotionEvent event, int pointerIndex);
     float getPrimaryVelocity(VelocityTracker velocityTracker, int pointerId);
     int getMeasuredSize(View view);
+    int getPrimarySize(View view);
     float getPrimarySize(RectF rect);
+    float getStart(RectF rect);
+    float getEnd(RectF rect);
     int getClearAllSidePadding(View view, boolean isRtl);
     int getSecondaryDimension(View view);
     FloatProperty<View> getPrimaryViewTranslate();
diff --git a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
index 2fb5952372..86508c4ee2 100644
--- a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
+++ b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
@@ -117,11 +117,26 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
         return view.getMeasuredWidth();
     }
 
+    @Override
+    public int getPrimarySize(View view) {
+        return view.getWidth();
+    }
+
     @Override
     public float getPrimarySize(RectF rect) {
         return rect.width();
     }
 
+    @Override
+    public float getStart(RectF rect) {
+        return rect.left;
+    }
+
+    @Override
+    public float getEnd(RectF rect) {
+        return rect.right;
+    }
+
     @Override
     public int getClearAllSidePadding(View view, boolean isRtl) {
         return (isRtl ? view.getPaddingRight() : - view.getPaddingLeft()) / 2;
-- 
GitLab


From ffde1471e46ac27ac5965b7dcc6e5d63071d2d82 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Fri, 16 Apr 2021 18:02:23 +0100
Subject: [PATCH 0897/1664] Only setup widget adapters once after inflation

Bug: 185587905
Test: Switch to a new Guest user. Then, quickly open the all widgets
      picker and scroll to the bottom. The widgets picker no longer
      scroll to top even after app icons are loaded.
Change-Id: I1ffef95af56935d101d12520a20be97931d1429d
---
 .../android/launcher3/widget/picker/WidgetsFullSheet.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 90cd515349..8c8c49e0b8 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -167,6 +167,8 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         layoutInflater.inflate(contentLayoutRes, springLayout, true);
 
         RecyclerViewFastScroller fastScroller = findViewById(R.id.fast_scroller);
+        mAdapters.get(AdapterHolder.PRIMARY).setup(findViewById(R.id.primary_widgets_list_view));
+        mAdapters.get(AdapterHolder.SEARCH).setup(findViewById(R.id.search_widgets_list_view));
         if (mHasWorkProfile) {
             mViewPager = findViewById(R.id.widgets_view_pager);
             mViewPager.initParentViews(this);
@@ -178,6 +180,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
             findViewById(R.id.tab_work)
                     .setOnClickListener((View view) -> mViewPager.snapToPage(1));
             fastScroller.setIsRecyclerViewFirstChildInParent(false);
+            mAdapters.get(AdapterHolder.WORK).setup(findViewById(R.id.work_widgets_list_view));
         } else {
             mViewPager = null;
         }
@@ -391,15 +394,11 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         List<WidgetsListBaseEntry> allWidgets = mLauncher.getPopupDataProvider().getAllWidgets();
 
         AdapterHolder primaryUserAdapterHolder = mAdapters.get(AdapterHolder.PRIMARY);
-        primaryUserAdapterHolder.setup(findViewById(R.id.primary_widgets_list_view));
-        AdapterHolder searchAdapterHolder = mAdapters.get(AdapterHolder.SEARCH);
-        searchAdapterHolder.setup(findViewById(R.id.search_widgets_list_view));
         primaryUserAdapterHolder.mWidgetsListAdapter.setWidgets(allWidgets);
         updateNoWidgetsView(primaryUserAdapterHolder);
 
         if (mHasWorkProfile) {
             AdapterHolder workUserAdapterHolder = mAdapters.get(AdapterHolder.WORK);
-            workUserAdapterHolder.setup(findViewById(R.id.work_widgets_list_view));
             workUserAdapterHolder.mWidgetsListAdapter.setWidgets(allWidgets);
             onActivePageChanged(mViewPager.getCurrentPage());
         }
-- 
GitLab


From 8181479443c2ca4cf9dfd5b80e48fc1bcf2b87b5 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Thu, 15 Apr 2021 20:14:41 +0100
Subject: [PATCH 0898/1664] Consider orientationHandler when calculating
 ClearAllButton scrollOffset

Bug: 185498648
Fixes: 185498648
Test: Manual
Change-Id: I7aaab4e62c3e7edf3ecdb3fe40020b8064e0109b
---
 quickstep/src/com/android/quickstep/views/RecentsView.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 1df3d3c18a..57e14aabd8 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -3152,7 +3152,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         // Align ClearAllButton to the left (RTL) or right (non-RTL), which is different from other
         // TaskViews. This must be called after laying out ClearAllButton.
         if (layoutChildren) {
-            int clearAllWidthDiff = mTaskWidth - mClearAllButton.getWidth();
+            int clearAllWidthDiff = mOrientationHandler.getPrimaryValue(mTaskWidth, mTaskHeight)
+                    - mOrientationHandler.getPrimarySize(mClearAllButton);
             mClearAllButton.setScrollOffsetPrimary(mIsRtl ? clearAllWidthDiff : -clearAllWidthDiff);
         }
 
-- 
GitLab


From 29f6b0ba05b4f12230517f1f19757be027b6e628 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Fri, 16 Apr 2021 17:11:47 +0100
Subject: [PATCH 0899/1664] Add debug logs for widget recommendation down scale
 calculation

Bug: 185508758
Test: None
Change-Id: I0b4789075bcc5ffc26f30dcd483f7c97bee9f410
---
 .../android/launcher3/widget/picker/WidgetsFullSheet.java    | 5 +++++
 .../widget/picker/WidgetsRecommendationTableLayout.java      | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 90cd515349..70127c5354 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -28,6 +28,7 @@ import android.graphics.Rect;
 import android.os.Process;
 import android.os.UserHandle;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.util.Pair;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
@@ -461,6 +462,10 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         WidgetsRecommendationTableLayout table =
                 mSearchAndRecommendationViewHolder.mRecommendedWidgetsTable;
         if (recommendedWidgets.size() > 0) {
+            // TODO(b/185508758): Revert the following log after debugging.
+            if (getHeaderViewHeight() == 0) {
+                Log.d(TAG, "Header view height is 0 when inflating recommended widgets");
+            }
             float maxTableHeight =
                     (mLauncher.getDeviceProfile().heightPx - mTabsHeight - getHeaderViewHeight())
                             * RECOMMENDATION_TABLE_HEIGHT_RATIO;
diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
index b95bb16bdf..1bfffc29fc 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
@@ -89,6 +89,9 @@ public final class WidgetsRecommendationTableLayout extends TableLayout {
         mRecommendationTableMaxHeight = recommendationTableMaxHeight;
         RecommendationTableData data = fitRecommendedWidgetsToTableSpace(/* previewScale= */ 1f,
                 recommendedWidgets);
+        // TODO(b/185508758): Revert the following logs after debugging.
+        Log.d(TAG, "Recommended widgets section max height: " + recommendationTableMaxHeight);
+        Log.d(TAG, "Recommended widget down scale: " + data.mPreviewScale);
         bindData(data);
     }
 
-- 
GitLab


From 4ae6d0b286fe7007222f50ef06940de815cf9401 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Fri, 16 Apr 2021 11:10:54 -0700
Subject: [PATCH 0900/1664] Fix the corner radius on workspace page outlines

Bug: 185163323

Test: manual
Change-Id: Ibc84b93147e2a5020b266e0a81f12a8e18258d29
---
 res/drawable/bg_celllayout.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/drawable/bg_celllayout.xml b/res/drawable/bg_celllayout.xml
index d7181ad576..0401c8482b 100644
--- a/res/drawable/bg_celllayout.xml
+++ b/res/drawable/bg_celllayout.xml
@@ -25,14 +25,14 @@
                 android:width="@dimen/spring_loaded_panel_border"
                 android:color="?android:attr/colorAccent" />
             <solid android:color="@color/cell_layout_bg_color_active"/>
-            <corners android:radius="@dimen/bg_round_rect_radius"></corners>
+            <corners android:radius="?android:attr/dialogCornerRadius"></corners>
 
         </shape>
     </item>
     <item>
         <shape android:shape="rectangle" >
             <solid android:color="@color/cell_layout_bg_color_inactive"/>
-            <corners android:radius="@dimen/bg_round_rect_radius"></corners>
+            <corners android:radius="?android:attr/dialogCornerRadius"></corners>
         </shape>
     </item>
 </selector>
-- 
GitLab


From dfc22b8ff1de0085a4e54e038f2223ded1cd841d Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 16 Apr 2021 11:58:52 -0700
Subject: [PATCH 0901/1664] Fixing recents command not working properly in
 gesture mode

Bug: 185445289
Test: Manual
Change-Id: I233ee493ea0d42bbfca14b17e921d907cc65da53
---
 .../android/quickstep/AbsSwipeUpHandler.java   |  6 +++---
 .../com/android/quickstep/GestureState.java    | 18 ++++++++++++++++++
 .../quickstep/OverviewCommandHelper.java       |  1 +
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index c547d00250..dd6483c389 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -621,7 +621,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         final boolean passed = mCurrentShift.value >= MIN_PROGRESS_FOR_OVERVIEW;
         if (passed != mPassedOverviewThreshold) {
             mPassedOverviewThreshold = passed;
-            if (mDeviceState.isTwoButtonNavMode()) {
+            if (mDeviceState.isTwoButtonNavMode() && !mGestureState.isHandlingAtomicEvent()) {
                 performHapticFeedback();
             }
         }
@@ -854,7 +854,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
 
     private GestureEndTarget calculateEndTarget(PointF velocity, float endVelocity, boolean isFling,
             boolean isCancel) {
-        if (mDeviceState.isButtonNavMode()) {
+        if (mGestureState.isHandlingAtomicEvent()) {
             // Button mode, this is only used to go to recents
             return RECENTS;
         }
@@ -976,7 +976,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                     mRecentsView.snapToPage(mRecentsView.getNextPage(), (int) MAX_SWIPE_DURATION);
                     isScrolling = true;
                 }
-                if (!mDeviceState.isButtonNavMode() || isScrolling) {
+                if (!mGestureState.isHandlingAtomicEvent() || isScrolling) {
                     duration = Math.max(duration, mRecentsView.getScroller().getDuration());
                 }
             }
diff --git a/quickstep/src/com/android/quickstep/GestureState.java b/quickstep/src/com/android/quickstep/GestureState.java
index ebdc1e6454..6ad7f55a3a 100644
--- a/quickstep/src/com/android/quickstep/GestureState.java
+++ b/quickstep/src/com/android/quickstep/GestureState.java
@@ -146,6 +146,8 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL
     /** The time when the swipe up gesture is triggered. */
     private long mSwipeUpStartTimeMs;
 
+    private boolean mHandlingAtomicEvent;
+
     public GestureState(OverviewComponentObserver componentObserver, int gestureId) {
         mHomeIntent = componentObserver.getHomeIntent();
         mOverviewIntent = componentObserver.getOverviewIntent();
@@ -314,6 +316,22 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL
         }
     }
 
+    /**
+     * Indicates if the gesture is handling an atomic event like a click and not a
+     * user controlled gesture.
+     */
+    public void setHandlingAtomicEvent(boolean handlingAtomicEvent) {
+        mHandlingAtomicEvent = true;
+    }
+
+    /**
+     * Returns true if the gesture is handling an atomic event like a click and not a
+     * user controlled gesture.
+     */
+    public boolean isHandlingAtomicEvent() {
+        return mHandlingAtomicEvent;
+    }
+
     /**
      * @return whether the current gesture is still running a recents animation to a state in the
      *         Launcher or Recents activity.
diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
index 923d4f1e40..dbdd75fc13 100644
--- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
@@ -179,6 +179,7 @@ public class OverviewCommandHelper {
         }
 
         GestureState gestureState = mService.createGestureState(GestureState.DEFAULT_STATE);
+        gestureState.setHandlingAtomicEvent(true);
         AbsSwipeUpHandler interactionHandler = mService.getSwipeUpHandlerFactory()
                 .newHandler(gestureState, cmd.createTime);
         interactionHandler.setGestureEndCallback(
-- 
GitLab


From 3ce81f275f055240b5e504a5e53782040b3da326 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Fri, 16 Apr 2021 13:38:26 -0700
Subject: [PATCH 0902/1664] Update gesture navigation string resource for
 translations.

Updated the gesture navigation tutorial skip dialog's subtitle string resource and description:
1. increase char limit.
2. Added a placeholder string.
3. Updated the description to be clearer for translators.

bug: 185381331
Test: none
Change-Id: I6f06991694d48a9babf98777b377393f32998956
---
 quickstep/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml
index 2a0683079f..eeb9e9912f 100644
--- a/quickstep/res/values/strings.xml
+++ b/quickstep/res/values/strings.xml
@@ -188,8 +188,8 @@
     <!-- ******* Skip tutorial dialog ******* -->
     <!-- Title for the dialog that allows the user to skip the gesture navigation tutorial. [CHAR_LIMIT=40] -->
     <string name="skip_tutorial_dialog_title">Skip navigation tutorial?</string>
-    <!-- Subtitle for the dialog that allows the user to skip the gesture navigation tutorial. [CHAR_LIMIT=40] -->
-    <string name="skip_tutorial_dialog_subtitle">You can find this later in the Tips app</string>
+    <!-- Subtitle for the dialog that allows the user to skip the gesture navigation tutorial. This directs the user to where they can find the gesture tutorial again. [CHAR_LIMIT=100] -->
+    <string name="skip_tutorial_dialog_subtitle">You can find this later in the <xliff:g id="name">%1$s</xliff:g> app</string>
     <!-- Button text shown on a button on the tutorial skip dialog to return to the tutorial. [CHAR LIMIT=14] -->
     <string name="gesture_tutorial_action_button_label_cancel">Cancel</string>
     <!-- Button text shown on a button on the tutorial skip dialog to exit the tutorial. [CHAR LIMIT=14] -->
-- 
GitLab


From a1c5443a1c3ee7d40bfeed7a9964b9d140862046 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 16 Apr 2021 21:30:34 +0000
Subject: [PATCH 0903/1664] Revert "Add logs to verify receiver is
 unregistered"

Revert "Add logs to verify receiver is unregistered"

Revert submission 14193940-receiver_logs

Reason for revert: Not needed
Reverted Changes:
I67fb3d8a0:Add logs to verify receiver is unregistered
I0ab5a8199:Add logs to verify receiver is unregistered

Change-Id: I32a05ff6639a7512fac2391430dde8b939d136df
---
 src/com/android/launcher3/testing/TestProtocol.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java
index fdd7fc4817..943d129047 100644
--- a/src/com/android/launcher3/testing/TestProtocol.java
+++ b/src/com/android/launcher3/testing/TestProtocol.java
@@ -109,7 +109,6 @@ public final class TestProtocol {
     public static final String REQUEST_MOCK_SENSOR_ROTATION = "mock-sensor-rotation";
 
     public static final String PERMANENT_DIAG_TAG = "TaplTarget";
-    public static final String RECEIVER_LEAK = "b/185385047";
     public static final String NO_SWIPE_TO_HOME = "b/158017601";
     public static final String WORK_PROFILE_REMOVED = "b/159671700";
     public static final String TIS_NO_EVENTS = "b/180915942";
-- 
GitLab


From 868cab175b4f906466c851bc19f3ed03b5bc444b Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Fri, 16 Apr 2021 16:09:04 -0700
Subject: [PATCH 0904/1664] Fix errorprone build

=> dialogCornerRadius introduced in v28; this is enforced by errorprone build

Bug: 185623950

Test: manual

Change-Id: I8913cc4645a2f5a26f9b98226ba66f8a8b27c77c
---
 res/drawable-v28/bg_celllayout.xml | 38 ++++++++++++++++++++++++++++++
 res/drawable/bg_celllayout.xml     |  4 ++--
 2 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 res/drawable-v28/bg_celllayout.xml

diff --git a/res/drawable-v28/bg_celllayout.xml b/res/drawable-v28/bg_celllayout.xml
new file mode 100644
index 0000000000..c68bdecc81
--- /dev/null
+++ b/res/drawable-v28/bg_celllayout.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2021, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_active="true" >
+        <shape android:shape="rectangle" >
+            <stroke
+                android:width="@dimen/spring_loaded_panel_border"
+                android:color="?android:attr/colorAccent" />
+            <solid android:color="@color/cell_layout_bg_color_active"/>
+            <corners android:radius="?android:attr/dialogCornerRadius" />
+
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle" >
+            <solid android:color="@color/cell_layout_bg_color_inactive"/>
+            <corners android:radius="?android:attr/dialogCornerRadius" />
+        </shape>
+    </item>
+</selector>
diff --git a/res/drawable/bg_celllayout.xml b/res/drawable/bg_celllayout.xml
index 0401c8482b..4e7e82f5f0 100644
--- a/res/drawable/bg_celllayout.xml
+++ b/res/drawable/bg_celllayout.xml
@@ -25,14 +25,14 @@
                 android:width="@dimen/spring_loaded_panel_border"
                 android:color="?android:attr/colorAccent" />
             <solid android:color="@color/cell_layout_bg_color_active"/>
-            <corners android:radius="?android:attr/dialogCornerRadius"></corners>
+            <corners android:radius="@dimen/bg_round_rect_radius" />
 
         </shape>
     </item>
     <item>
         <shape android:shape="rectangle" >
             <solid android:color="@color/cell_layout_bg_color_inactive"/>
-            <corners android:radius="?android:attr/dialogCornerRadius"></corners>
+            <corners android:radius="@dimen/bg_round_rect_radius" />
         </shape>
     </item>
 </selector>
-- 
GitLab


From ddc33d634452f664bcb15be22d336694dfaef0cd Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Fri, 16 Apr 2021 16:35:42 -0700
Subject: [PATCH 0905/1664] Check if the TaskView is a live tile task in task
 launch animation

Fixes: 185540107
Test: manual
Change-Id: I7f1503d8ac6dee4c153a60d5f72fae9a37f1c387
---
 quickstep/src/com/android/quickstep/views/RecentsView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index c5deeded8a..08889b111b 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2944,7 +2944,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         }
         mPendingAnimation.addEndListener(isSuccess -> {
             if (isSuccess) {
-                if (LIVE_TILE.get()) {
+                if (LIVE_TILE.get() && tv.isRunningTask()) {
                     finishRecentsAnimation(false /* toRecents */, null);
                     onTaskLaunchAnimationEnd(true /* success */);
                 } else {
-- 
GitLab


From 855072cda5d1ad11448e75f1cb1d20ed117c1d96 Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Mon, 28 Dec 2020 15:00:52 -0800
Subject: [PATCH 0906/1664] Sandbox changes for use in UXR prototype.

 - "All Set" screen doesn't show after Home/Overview/Back tutorials.
 - X button in top left is hidden (we'll want to move this to the
   feedback view).
 - Feedback pops in and out from the top of the screen.
 - Hand animation is replaced by video feedback at start and after
   incorrect gesture.
 - Back tutorial goes left then right, in order to match video.
 - Updated strings and marked translatable (UX-reviewed already).
 - Added Chinese translations.
 - Many other things.

Test: Manual
Change-Id: I126a3ea0dad645014fab9cdee2ed19e06a8a56e9
---
 .../res/drawable/bg_sandbox_feedback.xml      |  10 +
 .../default_sandbox_app_task_thumbnail.xml    | 238 +++++++++++++++++-
 .../default_sandbox_mock_launcher.xml         |  21 ++
 .../drawable/sandbox_fake_google_search.xml   |  79 ++++++
 .../res/layout/gesture_tutorial_fragment.xml  |  60 +++--
 quickstep/res/raw/tips_nav_back_left.mp4      | Bin 0 -> 485479 bytes
 quickstep/res/raw/tips_nav_back_right.mp4     | Bin 0 -> 472301 bytes
 quickstep/res/raw/tips_nav_home.mp4           | Bin 0 -> 585968 bytes
 quickstep/res/raw/tips_nav_overview.mp4       | Bin 0 -> 991554 bytes
 quickstep/res/values/styles.xml               |  18 +-
 .../AssistantGestureTutorialController.java   |   9 +-
 .../AssistantGestureTutorialFragment.java     |   6 -
 .../BackGestureTutorialController.java        |  42 ++--
 .../BackGestureTutorialFragment.java          |   9 +-
 .../interaction/GestureSandboxActivity.java   |   1 +
 .../HomeGestureTutorialController.java        |  23 +-
 .../HomeGestureTutorialFragment.java          |   7 +-
 .../OverviewGestureTutorialController.java    |  39 ++-
 .../OverviewGestureTutorialFragment.java      |   7 +-
 .../SandboxModeTutorialController.java        |   8 +-
 .../SwipeUpGestureTutorialController.java     | 138 ++++++----
 .../interaction/TutorialController.java       | 166 ++++++++----
 .../interaction/TutorialFragment.java         |  78 ++++--
 .../interaction/TutorialHandAnimation.java    |  78 ------
 res/values/colors.xml                         |   2 +-
 .../settings/DeveloperOptionsFragment.java    |   2 +-
 26 files changed, 746 insertions(+), 295 deletions(-)
 create mode 100644 quickstep/res/drawable/bg_sandbox_feedback.xml
 create mode 100644 quickstep/res/drawable/default_sandbox_mock_launcher.xml
 create mode 100644 quickstep/res/drawable/sandbox_fake_google_search.xml
 create mode 100644 quickstep/res/raw/tips_nav_back_left.mp4
 create mode 100644 quickstep/res/raw/tips_nav_back_right.mp4
 create mode 100644 quickstep/res/raw/tips_nav_home.mp4
 create mode 100644 quickstep/res/raw/tips_nav_overview.mp4
 delete mode 100644 quickstep/src/com/android/quickstep/interaction/TutorialHandAnimation.java

diff --git a/quickstep/res/drawable/bg_sandbox_feedback.xml b/quickstep/res/drawable/bg_sandbox_feedback.xml
new file mode 100644
index 0000000000..1b3265dbd5
--- /dev/null
+++ b/quickstep/res/drawable/bg_sandbox_feedback.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="394dp"
+    android:height="172dp"
+    android:viewportWidth="394"
+    android:viewportHeight="172">
+  <path
+      android:pathData="M20,0L374,0A20,20 0,0 1,394 20L394,152A20,20 0,0 1,374 172L20,172A20,20 0,0 1,0 152L0,20A20,20 0,0 1,20 0z"
+      android:fillColor="?android:attr/colorBackgroundFloating"
+      android:fillAlpha="0.9"/>
+</vector>
diff --git a/quickstep/res/drawable/default_sandbox_app_task_thumbnail.xml b/quickstep/res/drawable/default_sandbox_app_task_thumbnail.xml
index 9d4cc95c56..0d85c9a5d5 100644
--- a/quickstep/res/drawable/default_sandbox_app_task_thumbnail.xml
+++ b/quickstep/res/drawable/default_sandbox_app_task_thumbnail.xml
@@ -11,7 +11,237 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-  <solid android:color="@color/gesture_tutorial_fake_task_view_color" />
-</shape>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="412dp"
+    android:height="892dp"
+    android:viewportWidth="412"
+    android:viewportHeight="892">
+  <path
+      android:pathData="M0,101h412v791h-412z"
+      android:fillColor="#DADCE0"/>
+  <path
+      android:pathData="M28,222L282,222A4,4 0,0 1,286 226L286,254A4,4 0,0 1,282 258L28,258A4,4 0,0 1,24 254L24,226A4,4 0,0 1,28 222z"
+      android:fillColor="#BDC1C6"/>
+  <path
+      android:pathData="M28,266L344,266A4,4 0,0 1,348 270L348,298A4,4 0,0 1,344 302L28,302A4,4 0,0 1,24 298L24,270A4,4 0,0 1,28 266z"
+      android:fillColor="#BDC1C6"/>
+  <path
+      android:pathData="M28,310L257,310A4,4 0,0 1,261 314L261,342A4,4 0,0 1,257 346L28,346A4,4 0,0 1,24 342L24,314A4,4 0,0 1,28 310z"
+      android:fillColor="#BDC1C6"/>
+  <path
+      android:pathData="M28,354L67,354A4,4 0,0 1,71 358L71,362A4,4 0,0 1,67 366L28,366A4,4 0,0 1,24 362L24,358A4,4 0,0 1,28 354z"
+      android:fillColor="#BDC1C6"/>
+  <path
+      android:pathData="M86,354L125,354A4,4 0,0 1,129 358L129,362A4,4 0,0 1,125 366L86,366A4,4 0,0 1,82 362L82,358A4,4 0,0 1,86 354z"
+      android:fillColor="#BDC1C6"/>
+  <path
+      android:pathData="M28,390L384,390A4,4 0,0 1,388 394L388,626A4,4 0,0 1,384 630L28,630A4,4 0,0 1,24 626L24,394A4,4 0,0 1,28 390z"
+      android:fillColor="#5F6368"/>
+  <path
+      android:pathData="M101.322,469.362L71.101,577.73H131.543L101.322,469.362Z"
+      android:strokeWidth="2"
+      android:fillColor="#5F6368"
+      android:strokeColor="#9ADCB2"/>
+  <path
+      android:pathData="M101.322,522.516V543.644V611.743"
+      android:fillColor="#5F6368"/>
+  <path
+      android:pathData="M101.322,522.516V543.644V611.743"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#9ADCB2"/>
+  <path
+      android:pathData="M109.577,532.822L101.322,548.135"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#9ADCB2"/>
+  <path
+      android:pathData="M109.577,558.221L101.322,574.196"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#9ADCB2"/>
+  <path
+      android:pathData="M94.54,524.945L101.322,534.442"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#9ADCB2"/>
+  <path
+      android:pathData="M90.929,549.239L101.322,561.166"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#9ADCB2"/>
+  <path
+      android:pathData="M62.772,412.307L30.855,563.669H94.688L62.772,412.307Z"
+      android:strokeWidth="2"
+      android:fillColor="#5F6368"
+      android:strokeColor="#9ADCB2"/>
+  <path
+      android:pathData="M62.772,486.516V516.037V611.154"
+      android:fillColor="#5F6368"/>
+  <path
+      android:pathData="M62.772,486.516V516.037V611.154"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#9ADCB2"/>
+  <path
+      android:pathData="M74.344,500.944L62.772,522.368"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#9ADCB2"/>
+  <path
+      android:pathData="M74.344,536.43L62.772,558.736"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#9ADCB2"/>
+  <path
+      android:pathData="M53.263,489.976L62.772,503.154"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#9ADCB2"/>
+  <path
+      android:pathData="M48.251,523.914L62.772,540.552"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#9ADCB2"/>
+  <path
+      android:pathData="M37,612H377"
+      android:strokeWidth="4"
+      android:fillColor="#00000000"
+      android:strokeColor="#9AA0A6"/>
+  <path
+      android:pathData="M81.24,441.187L84.066,443.127L87.333,441.98L86.273,445.244L88.393,447.978H84.949L83.006,450.8L81.947,447.537L78.679,446.655L81.417,444.626L81.24,441.187Z"
+      android:fillColor="#DADCE0"/>
+  <path
+      android:pathData="M172.561,469L175.387,471.029L178.654,469.794L177.594,473.057L179.714,475.791H176.27L174.327,478.702L173.267,475.438L170,474.468L172.737,472.44L172.561,469Z"
+      android:fillColor="#DADCE0"/>
+  <path
+      android:pathData="M278.073,481.229L280.81,483.257L284.078,482.022L283.018,485.286L285.137,488.02H281.693L279.839,490.93L278.691,487.667L275.424,486.697L278.161,484.668L278.073,481.229Z"
+      android:fillColor="#DADCE0"/>
+  <path
+      android:pathData="M325.561,459L328.387,460.94L331.654,459.794L330.594,463.057L332.714,465.791H329.27L327.327,468.613L326.267,465.35L323,464.468L325.737,462.44L325.561,459Z"
+      android:fillColor="#DADCE0"/>
+  <path
+      android:pathData="M209.649,517L212.475,519.029L215.654,517.794L214.682,521.057L216.802,523.791H213.358L211.415,526.702L210.356,523.438L207,522.468L209.737,520.44L209.649,517Z"
+      android:fillColor="#DADCE0"/>
+  <path
+      android:pathData="M128.836,482.816L129.455,485.11L131.662,485.815L129.808,487.314L129.896,489.784L128.042,488.285L125.922,489.078L126.629,486.785L125.304,484.757L127.512,484.845L128.836,482.816Z"
+      android:fillColor="#DADCE0"/>
+  <path
+      android:pathData="M37.532,450L38.239,452.381L40.358,453.087L38.504,454.498L38.592,456.968L36.737,455.556L34.618,456.35L35.325,453.969L34,452.029H36.208L37.532,450Z"
+      android:fillColor="#DADCE0"/>
+  <path
+      android:pathData="M284.077,516.947L284.784,519.329L286.903,520.034L285.048,521.445L285.137,523.915L283.282,522.415L281.163,523.297L281.869,520.916L280.545,518.976H282.753L284.077,516.947Z"
+      android:fillColor="#DADCE0"/>
+  <path
+      android:pathData="M232.771,444.893L233.478,447.274L235.597,447.979L233.743,449.391L233.831,451.86L231.977,450.449L229.857,451.243L230.564,448.861L229.239,446.921H231.447L232.771,444.893Z"
+      android:fillColor="#DADCE0"/>
+  <path
+      android:pathData="M152.384,521L152.914,522.676L154.415,523.117L153.091,524.175L153.179,525.851L151.854,524.881L150.442,525.41L150.883,523.734L150,522.411H151.501L152.384,521Z"
+      android:fillColor="#DADCE0"/>
+  <path
+      android:pathData="M136.473,515L136.914,516.676L138.415,517.117L137.179,518.175V519.851L135.943,518.881L134.442,519.41L134.971,517.822L134,516.411H135.589L136.473,515Z"
+      android:fillColor="#DADCE0"/>
+  <path
+      android:pathData="M314.454,410.406L314.896,412.082L316.397,412.523L315.16,413.493V415.257L313.924,414.199L312.423,414.816L312.953,413.14L311.981,411.817H313.571L314.454,410.406Z"
+      android:fillColor="#DADCE0"/>
+  <path
+      android:pathData="M344.212,488.195L344.742,489.871L346.243,490.4L344.919,491.37L345.007,493.046L343.683,492.076L342.27,492.605L342.711,491.018L341.828,489.606H343.329L344.212,488.195Z"
+      android:fillColor="#DADCE0"/>
+  <path
+      android:pathData="M47.067,420.814L47.508,422.402L49.009,422.931L47.773,423.901V425.665L46.537,424.607L45.036,425.136L45.566,423.549L44.594,422.137L46.184,422.226L47.067,420.814Z"
+      android:fillColor="#DADCE0"/>
+  <path
+      android:pathData="M265.887,448.42L266.328,450.007L267.829,450.537L266.593,451.507V453.271L265.357,452.212L263.856,452.83L264.385,451.154L263.414,449.831H265.004L265.887,448.42Z"
+      android:fillColor="#DADCE0"/>
+  <path
+      android:pathData="M110.912,413.759L111.441,415.435L112.854,415.876L111.618,416.934V418.61L110.382,417.551L108.969,418.169L109.41,416.493L108.439,415.17H110.028L110.912,413.759Z"
+      android:fillColor="#DADCE0"/>
+  <path
+      android:pathData="M149.412,418.344L152.238,420.372L155.505,419.138L154.445,422.489L156.565,425.135L153.121,425.223L151.178,428.045L150.118,424.782L146.851,423.812L149.589,421.783L149.412,418.344Z"
+      android:fillColor="#DADCE0"/>
+  <path
+      android:pathData="M37.532,450L38.239,452.381L40.358,453.087L38.504,454.498L38.592,456.968L36.737,455.556L34.618,456.35L35.325,453.969L34,452.029H36.208L37.532,450Z"
+      android:fillColor="#DADCE0"/>
+  <path
+      android:pathData="M141.906,455.74L142.612,458.122L144.731,458.827L142.877,460.238L142.965,462.708L141.111,461.208L139.08,462.09L139.786,459.709L138.374,457.769H140.669L141.906,455.74Z"
+      android:fillColor="#DADCE0"/>
+  <path
+      android:pathData="M201.777,459.267L202.395,461.56L204.603,462.265L202.748,463.765L202.836,466.146L200.982,464.735L198.863,465.529L199.569,463.235L198.245,461.207H200.452L201.777,459.267Z"
+      android:fillColor="#DADCE0"/>
+  <path
+      android:pathData="M370.175,504.248L370.793,506.629L373.001,507.335L371.146,508.746L371.234,511.216L369.38,509.716L367.261,510.598L367.967,508.217L366.643,506.277H368.85L370.175,504.248Z"
+      android:fillColor="#DADCE0"/>
+  <path
+      android:pathData="M300.532,437L301.239,439.381L303.358,440.087L301.592,441.498V443.968L299.826,442.468L297.706,443.35L298.413,440.969L297,439.029H299.296L300.532,437Z"
+      android:fillColor="#DADCE0"/>
+  <path
+      android:pathData="M193.384,420L193.914,421.676L195.415,422.117L194.091,423.087L194.179,424.851L192.854,423.792L191.442,424.41L191.883,422.734L191,421.411H192.501L193.384,420Z"
+      android:fillColor="#DADCE0"/>
+  <path
+      android:pathData="M248.313,469.323L248.843,470.911L250.256,471.44L249.02,472.41V474.174L247.784,473.116L246.371,473.645L246.812,472.057L245.841,470.646L247.43,470.734L248.313,469.323Z"
+      android:fillColor="#DADCE0"/>
+  <path
+      android:pathData="M169.988,496.751L170.518,498.427L172.019,498.956L170.694,499.926L170.782,501.602L169.458,500.632L168.045,501.161L168.487,499.573L167.604,498.162H169.105L169.988,496.751Z"
+      android:fillColor="#DADCE0"/>
+  <path
+      android:pathData="M222.441,400L222.882,401.676L224.384,402.117L223.059,403.175L223.147,404.851L221.911,403.792L220.41,404.41L220.851,402.734L219.968,401.411H221.469L222.441,400Z"
+      android:fillColor="#DADCE0"/>
+  <path
+      android:pathData="M211.754,492.341L212.284,493.928L213.785,494.458L212.461,495.428L212.549,497.192L211.225,496.133L209.812,496.662L210.253,495.075L209.37,493.664L210.871,493.752L211.754,492.341Z"
+      android:fillColor="#DADCE0"/>
+  <path
+      android:pathData="M254.054,420.814L254.584,422.402L256.085,422.931L254.761,423.901L254.849,425.665L253.524,424.607L252.111,425.136L252.553,423.549L251.67,422.137L253.171,422.226L254.054,420.814Z"
+      android:fillColor="#DADCE0"/>
+  <path
+      android:pathData="M307.162,602.392H205L255.565,502.27H322.273L374.238,602.392H307.162L255.565,502.785L307.162,602.392Z"
+      android:fillColor="#5F6368"/>
+  <path
+      android:pathData="M307.162,602.392H205L255.565,502.27H322.273L374.238,602.392H307.162ZM307.162,602.392L255.565,502.785"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#A8CBFE"/>
+  <path
+      android:pathData="M255.565,503.079V602.392"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#A8CBFE"/>
+  <path
+      android:pathData="M356.686,430.931C358.218,423.774 353.2,416.635 345.477,414.986C337.754,413.337 330.251,417.801 328.719,424.958C327.186,432.115 332.205,439.254 339.928,440.903C347.651,442.553 355.154,438.088 356.686,430.931Z"
+      android:fillColor="#FEEFC3"/>
+  <path
+      android:pathData="M344.708,427.026C345.789,421.976 342.244,416.939 336.79,415.774C331.336,414.609 326.038,417.759 324.957,422.808C323.876,427.858 327.421,432.895 332.875,434.06C338.329,435.225 343.627,432.076 344.708,427.026Z"
+      android:fillColor="#5F6368"/>
+  <path
+      android:pathData="M2,101L410,101A2,2 0,0 1,412 103L412,187A2,2 0,0 1,410 189L2,189A2,2 0,0 1,0 187L0,103A2,2 0,0 1,2 101z"
+      android:fillColor="#E8EAED"/>
+  <path
+      android:pathData="M99,129L313,129A2,2 0,0 1,315 131L315,159A2,2 0,0 1,313 161L99,161A2,2 0,0 1,97 159L97,131A2,2 0,0 1,99 129z"
+      android:fillColor="#80868B"/>
+  <path
+      android:pathData="M32,123L60,123A8,8 0,0 1,68 131L68,159A8,8 0,0 1,60 167L32,167A8,8 0,0 1,24 159L24,131A8,8 0,0 1,32 123z"
+      android:fillColor="#80868B"/>
+  <path
+      android:pathData="M0,0h412v101h-412z"
+      android:fillColor="#202124"/>
+  <path
+      android:pathData="M34.5,48L377.5,48A18.5,18.5 0,0 1,396 66.5L396,66.5A18.5,18.5 0,0 1,377.5 85L34.5,85A18.5,18.5 0,0 1,16 66.5L16,66.5A18.5,18.5 0,0 1,34.5 48z"
+      android:fillColor="#3C4043"/>
+  <path
+      android:pathData="M28,654L356,654A4,4 0,0 1,360 658L360,672A4,4 0,0 1,356 676L28,676A4,4 0,0 1,24 672L24,658A4,4 0,0 1,28 654z"
+      android:fillColor="#BDC1C6"/>
+  <path
+      android:pathData="M28,684L367,684A4,4 0,0 1,371 688L371,702A4,4 0,0 1,367 706L28,706A4,4 0,0 1,24 702L24,688A4,4 0,0 1,28 684z"
+      android:fillColor="#BDC1C6"/>
+  <path
+      android:pathData="M28,714L337,714A4,4 0,0 1,341 718L341,732A4,4 0,0 1,337 736L28,736A4,4 0,0 1,24 732L24,718A4,4 0,0 1,28 714z"
+      android:fillColor="#BDC1C6"/>
+  <path
+      android:pathData="M28,744L210,744A4,4 0,0 1,214 748L214,762A4,4 0,0 1,210 766L28,766A4,4 0,0 1,24 762L24,748A4,4 0,0 1,28 744z"
+      android:fillColor="#BDC1C6"/>
+  <path
+      android:pathData="M28,790L344,790A4,4 0,0 1,348 794L348,808A4,4 0,0 1,344 812L28,812A4,4 0,0 1,24 808L24,794A4,4 0,0 1,28 790z"
+      android:fillColor="#BDC1C6"/>
+  <path
+      android:pathData="M28,820L337,820A4,4 0,0 1,341 824L341,838A4,4 0,0 1,337 842L28,842A4,4 0,0 1,24 838L24,824A4,4 0,0 1,28 820z"
+      android:fillColor="#BDC1C6"/>
+</vector>
diff --git a/quickstep/res/drawable/default_sandbox_mock_launcher.xml b/quickstep/res/drawable/default_sandbox_mock_launcher.xml
new file mode 100644
index 0000000000..38fbcf09b6
--- /dev/null
+++ b/quickstep/res/drawable/default_sandbox_mock_launcher.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="360dp"
+    android:height="146dp"
+    android:viewportWidth="360"
+    android:viewportHeight="146">
+  <path
+      android:pathData="M25,96L335,96A25,25 0,0 1,360 121L360,121A25,25 0,0 1,335 146L25,146A25,25 0,0 1,0 121L0,121A25,25 0,0 1,25 96z"
+      android:fillColor="#3C4043"/>
+  <path
+      android:pathData="M30,30m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"
+      android:fillColor="#8AB4F8"/>
+  <path
+      android:pathData="M130,30m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"
+      android:fillColor="#F28B82"/>
+  <path
+      android:pathData="M230,30m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"
+      android:fillColor="#FDD663"/>
+  <path
+      android:pathData="M330,30m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"
+      android:fillColor="#81C995"/>
+</vector>
diff --git a/quickstep/res/drawable/sandbox_fake_google_search.xml b/quickstep/res/drawable/sandbox_fake_google_search.xml
new file mode 100644
index 0000000000..f06b92784c
--- /dev/null
+++ b/quickstep/res/drawable/sandbox_fake_google_search.xml
@@ -0,0 +1,79 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="412dp"
+    android:height="892dp"
+    android:viewportWidth="412"
+    android:viewportHeight="892">
+  <group>
+    <clip-path
+        android:pathData="M24,0L388,0A24,24 0,0 1,412 24L412,868A24,24 0,0 1,388 892L24,892A24,24 0,0 1,0 868L0,24A24,24 0,0 1,24 0z"/>
+    <path
+        android:pathData="M24,0L388,0A24,24 0,0 1,412 24L412,868A24,24 0,0 1,388 892L24,892A24,24 0,0 1,0 868L0,24A24,24 0,0 1,24 0z"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="M183,464L183,464A46,46 0,0 1,137 510L-81,510A46,46 0,0 1,-127 464L-127,464A46,46 0,0 1,-81 418L137,418A46,46 0,0 1,183 464z"
+        android:strokeAlpha="0.6"
+        android:fillColor="#EA4335"
+        android:fillAlpha="0.3"/>
+    <path
+        android:pathData="M91,464C91,489.405 111.595,510 137,510C162.405,510 183,489.405 183,464C183,438.595 162.405,418 137,418C111.595,418 91,438.595 91,464Z"
+        android:strokeAlpha="0.6"
+        android:fillColor="#EA4335"
+        android:fillAlpha="0.6"/>
+    <path
+        android:pathData="M100,464C100,484.435 116.565,501 137,501C157.434,501 174,484.435 174,464C174,443.565 157.434,427 137,427C116.565,427 100,443.565 100,464Z"
+        android:fillColor="#EA4335"/>
+    <path
+        android:pathData="M24,0L388,0A24,24 0,0 1,412 24L412,868A24,24 0,0 1,388 892L24,892A24,24 0,0 1,0 868L0,24A24,24 0,0 1,24 0z"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="M24,0L388,0A24,24 0,0 1,412 24L412,868A24,24 0,0 1,388 892L24,892A24,24 0,0 1,0 868L0,24A24,24 0,0 1,24 0z"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="M0,101h412v791h-412z"
+        android:fillColor="#F1F3F4"/>
+    <path
+        android:pathData="M0,0h412v101h-412z"
+        android:fillColor="#202124"/>
+    <path
+        android:pathData="M34.5,48L377.5,48A18.5,18.5 0,0 1,396 66.5L396,66.5A18.5,18.5 0,0 1,377.5 85L34.5,85A18.5,18.5 0,0 1,16 66.5L16,66.5A18.5,18.5 0,0 1,34.5 48z"
+        android:fillColor="#3C4043"/>
+    <path
+        android:pathData="M168,875L244,875A2,2 0,0 1,246 877L246,877A2,2 0,0 1,244 879L168,879A2,2 0,0 1,166 877L166,877A2,2 0,0 1,168 875z"
+        android:fillColor="#373737"/>
+    <path
+        android:pathData="M57,355L355,355A25,25 0,0 1,380 380L380,380A25,25 0,0 1,355 405L57,405A25,25 0,0 1,32 380L32,380A25,25 0,0 1,57 355z"
+        android:strokeWidth="4"
+        android:fillColor="#DADCE0"
+        android:strokeColor="#BDC1C6"/>
+    <path
+        android:pathData="M104,429L192,429A4,4 0,0 1,196 433L196,449A4,4 0,0 1,192 453L104,453A4,4 0,0 1,100 449L100,433A4,4 0,0 1,104 429z"
+        android:fillColor="#DADCE0"/>
+    <path
+        android:pathData="M220,429L308,429A4,4 0,0 1,312 433L312,449A4,4 0,0 1,308 453L220,453A4,4 0,0 1,216 449L216,433A4,4 0,0 1,220 429z"
+        android:fillColor="#DADCE0"/>
+    <path
+        android:pathData="M120,242L120,242A26,26 0,0 1,146 268L146,268A26,26 0,0 1,120 294L120,294A26,26 0,0 1,94 268L94,268A26,26 0,0 1,120 242z"
+        android:fillColor="#4285F4"/>
+    <path
+        android:pathData="M243,261L243,261A17,17 0,0 1,260 278L260,294A17,17 0,0 1,243 311L243,311A17,17 0,0 1,226 294L226,278A17,17 0,0 1,243 261z"
+        android:fillColor="#4285F4"/>
+    <path
+        android:pathData="M272,244L272,244A8,8 0,0 1,280 252L280,286A8,8 0,0 1,272 294L272,294A8,8 0,0 1,264 286L264,252A8,8 0,0 1,272 244z"
+        android:fillColor="#34A853"/>
+    <path
+        android:pathData="M167,261L167,261A17,17 0,0 1,184 278L184,278A17,17 0,0 1,167 295L167,295A17,17 0,0 1,150 278L150,278A17,17 0,0 1,167 261z"
+        android:fillColor="#E94235"/>
+    <path
+        android:pathData="M301,261L301,261A17,17 0,0 1,318 278L318,278A17,17 0,0 1,301 295L301,295A17,17 0,0 1,284 278L284,278A17,17 0,0 1,301 261z"
+        android:fillColor="#E94235"/>
+    <path
+        android:pathData="M205,261L205,261A17,17 0,0 1,222 278L222,278A17,17 0,0 1,205 295L205,295A17,17 0,0 1,188 278L188,278A17,17 0,0 1,205 261z"
+        android:fillColor="#FABB05"/>
+    <path
+        android:pathData="M34,128L50,128A4,4 0,0 1,54 132L54,148A4,4 0,0 1,50 152L34,152A4,4 0,0 1,30 148L30,132A4,4 0,0 1,34 128z"
+        android:fillColor="#BDC1C6"/>
+    <path
+        android:pathData="M68,131L117,131A4,4 0,0 1,121 135L121,145A4,4 0,0 1,117 149L68,149A4,4 0,0 1,64 145L64,135A4,4 0,0 1,68 131z"
+        android:fillColor="#BDC1C6"/>
+  </group>
+</vector>
diff --git a/quickstep/res/layout/gesture_tutorial_fragment.xml b/quickstep/res/layout/gesture_tutorial_fragment.xml
index 9d06dfbe68..16b2c56b17 100644
--- a/quickstep/res/layout/gesture_tutorial_fragment.xml
+++ b/quickstep/res/layout/gesture_tutorial_fragment.xml
@@ -16,13 +16,16 @@
 <com.android.quickstep.interaction.RootSandboxLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:clipChildren="false">
 
-    <View
-        android:id="@+id/gesture_tutorial_ripple_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/gesture_tutorial_ripple"/>
+    <ImageView
+        android:id="@+id/gesture_tutorial_fake_launcher_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="70dp" />
 
     <com.android.launcher3.views.ClipIconView
         android:id="@+id/gesture_tutorial_fake_icon_view"
@@ -42,13 +45,22 @@
         android:id="@+id/gesture_tutorial_fake_task_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="invisible" />
+        android:visibility="visible" />
 
-    <ImageView
-        android:id="@+id/gesture_tutorial_fragment_hand_coaching"
+    <View
+        android:id="@+id/gesture_tutorial_ripple_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scaleType="centerCrop"/>
+        android:background="@drawable/gesture_tutorial_ripple"/>
+
+    <VideoView
+        android:id="@+id/gesture_tutorial_feedback_video"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentEnd="true"/>
 
     <ImageButton
         android:id="@+id/gesture_tutorial_fragment_close_button"
@@ -63,7 +75,8 @@
         android:contentDescription="@string/gesture_tutorial_close_button_content_description"
         android:padding="18dp"
         android:src="@drawable/gesture_tutorial_close_button"
-        android:tint="?android:attr/textColorPrimary"/>
+        android:tint="?android:attr/textColorPrimary"
+        android:visibility="gone"/>
 
     <LinearLayout
         android:id="@+id/gesture_tutorial_fragment_titles_container"
@@ -93,16 +106,33 @@
             android:layout_marginEnd="@dimen/gesture_tutorial_subtitle_margin_start_end"/>
     </LinearLayout>
 
-    <TextView
+    <LinearLayout
         android:id="@+id/gesture_tutorial_fragment_feedback_view"
-        style="@style/TextAppearance.GestureTutorial.Feedback"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/gesture_tutorial_fragment_titles_container"
+        android:orientation="vertical"
+        android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
         android:layout_marginStart="@dimen/gesture_tutorial_feedback_margin_start_end"
         android:layout_marginEnd="@dimen/gesture_tutorial_feedback_margin_start_end"
-        android:layout_marginTop="40dp"/>
+        android:layout_marginTop="24dp"
+        android:padding="24dp"
+        android:gravity="center_vertical"
+        android:background="@drawable/bg_sandbox_feedback">
+
+        <TextView
+            android:id="@+id/gesture_tutorial_fragment_feedback_title"
+            style="@style/TextAppearance.GestureTutorial.Feedback.Title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"/>
+
+        <TextView
+            android:id="@+id/gesture_tutorial_fragment_feedback_subtitle"
+            style="@style/TextAppearance.GestureTutorial.Feedback.Subtitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+    </LinearLayout>
 
     <!-- android:stateListAnimator="@null" removes shadow and normal on click behavior (increase
          of elevation and shadow) which is replaced by ripple effect in android:foreground -->
diff --git a/quickstep/res/raw/tips_nav_back_left.mp4 b/quickstep/res/raw/tips_nav_back_left.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..f40b3b7b727016de24d593989e6b667d17fc3da1
GIT binary patch
literal 485479
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
Zk0E?O>R-mAnjS!TRMP_-e;V1@`7eZTnxy~$

literal 0
HcmV?d00001

diff --git a/quickstep/res/raw/tips_nav_back_right.mp4 b/quickstep/res/raw/tips_nav_back_right.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..93841c792f6e7bbb5cd04366a3b00ee7c231d991
GIT binary patch
literal 472301
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%0Du#CIQc*8-xHA??zbh;?nS4SS0jzCYkn4F`u%O
zu&XeJAyOZHqgS<y&VaYK*HAWwbxyQD=adY{XT?>96rZ8+{EB)*gkRQ|1rx~TX(2w0
z^NoY_n|<Z;R_?;U_qJGb`4-X)vu+qCB?+mX({u0pX(7;C*lz-+8n2xe&{iN6%8ovt
z?_D%y?ih&n5@O&JIzVEY$<}e7dG~|JvFC$xriih@k?QEH)h^^citTJlGF6{tCvp>j
zZ?Ma#uurL1c*Tm_7a*U79(F(bB%sDmv?T{_YYr&spfby)P+$uOXdGm{@QiSsYd3+4
zS0YlD$f*YPjep&DOnI7{a=&dEy3s0A@Ymbx6ZpZ%V(wR`)c@&GT%9PGV~Itoezz36
zp7{)$k|bGjA{x0V6CbTi*Zxf_^Pt<s&xkY=_`FFQ@P4D)!yW?SKGmWWlhF>g`zUOO
zAdPX%+crCKlS;?ohuH@FRQ-NoC}_<<8UHlO=l6z^7QP%gvrDo4Qw(eSSv;0!CZL|w
z@(>bZbfWQt#>kzkv#uBYJi>G+hF7xFAWeV}rdBiSdh*+&-nT+z+UE2TCHO}*bQ@AF
zLxhV@z$2TxXgsDr(K=y|(MAYYmuh17E_}VT;(X4wWrZvx4L?)JO{j3t_^tOw9iE){
zz8*~!A=C(lOCsS{y)|dQ%YkX_Yd^wx;dGr@h{;TTLB(e}zz5w8N2wj1QP}4BM#l!U
z4URoQjetSZ;suS!Bi~!cZuSNt`Xd69qMj6|8|m7U*yWw02^-iN>_Wy*KA4ERhN0{J
z3s>O=CFe4y$WKWnmcm@0i{J!mmyt+Uc!^Fz1^f0KHj>O|V!ux^ze?g#*F~WzI4gH|
zZSM&AC9Khi`{TIm(KsQPjBT9!2W+a(`v{+_?_1;;A2n@vr0QI6`^JwSwgIzU3nyP;
zUcz&qNM^#{cqKWfaH@%`BZ?0m0nOqF=!!ksQnfVpu?L?`P@fzj+y+tLeYKyo27TG+
z_RFMR@pgLx0dwouH(guRg3hdo;hL%QEfmOc8IA!j(kB~rH_pQy>yjT|(G{pUs2mhP
z<@&5~>0xWLXW(+k;~x4r)wA#3<=oc(Zhk)4>Yd}kc)|JTShSSIKx!jYK_c0#xrcm@
z%!ntzDqgCY-`>a#LD1zR<pW~x8%d*wQ<d}j6$FgXeyd&3(TM^+4RcmUUgx3wdE?>i
zaq3m04AQm3o~gi55k=-oZtkod@?d_*eOrI@=jQ_3z8!9B;A%}6FhlU1sva3G;9uUG
zQnoe($w%BHARxLarZmoQQ4L&3s7J~cV#JO50leo9b%`UYcvT;KL-OIjrd{qoLjbYv
zPH-$Ml2jxp<CBWTV-8cUks>uK_&uG?!{v1Yt{?E0M_DB{Btam!bbE`71F*{1kPu_E
z*HX}?=Jz){6P_9ic3_2<F!ttH!<2x}=BvMWNaEU6C<Umy`fRvqh7>RA+?tkcsUCI2
zHb?qY*90}95v|`p`v(TvtJN)@kITCKl4FTqCs#A9_g0O(RyTbOVT$}cAbgx!;-43{
z04xg^XHee<zdDDgzOy)XHvc_9W7N6l66<}dfi#l>X2sv6+d_g?HLRA9M?mbS3Cp5+
z@~XU`4cO8weZ+6()VfmNO(kGHDD1^1*WQgyrN`fKLV9QB0Jj&kN<iK_-=|@A)W{hD
z@8>>N>C9#=Sqs52J)1qVFZ|3lAZi@sM*rg1ns9fhe(6d{dASa2Z*1m4aj8qdxTYzr
z+vn38FI53yDs)vS?DD-$JVJ1u>}hpL`f}DMkuHGvPe43F$b9XSHNV8|k0ap<olX)S
zguQ2aa9Oh$4miZmU(0qtT~dDQ`f13u`7_iLu@?KTMB1fd%_(a#R-+|IK9=nd6|e<M
zO;u0hTyHk^pkTj#2p@D$z2N*N%)&%EL}(|10%lc(jnhWJR<F9+cBtSjw9*F1v!i~%
zR1fTofLsgnLKfySw|NT5dHGYw7r@H3P$=#<AqgWG7s`Y!uLt^5WX5T@nZp0z@<`kR
zkAT`DS@z`BTsJrGf6D2|-r_RPLrRrgqny_&z-sMeKuZkLscn)g;KN~ywHk_W`-GUW
zuiLGY9C_|8ya4)Fm2Jox;vE!VqW_N9st_N2D?%p5)J>aW5CHDH8u=sMf6cc{B^f20
zd%CKi221Mmm7i=S5ri9k6BT?JE65&V(gsb72P;8_x0}yfhh=CcJ8cDKs^ZpezU!G*
zz$yV-8?4}7+}D1{az?s#&XirZxtl1vlP2A4&8NPWebMDvP~@B<Md<hUxKj<0doo6i
zo|zNsMBH$=@S>oUh4<`bjQ}GWPP?ws!0)c7i&<of0U|j(u18gGt4ODdW%7ld_ppm)
z3fT*KPlfnAuBXkMTo}|}1IgesXrg5bIUGLAk0W2>3q~D-5nmIO&Sq}?{u<|z!{ky%
z_?l_;PIn#cYbNQSV;JJE3$p}lyiLBwPnq;~#l8-U7Sj&4s$W-#8$xmdMZzn=2y(CJ
zmuh797{C?)Q`0E*)WdddpSue0N{$Ioa%G2<NfU#y+S?iY1TidVZrm5ct#OFi@#y4}
zALAjYjjSXQQnGPCTiYVS-=k?B&&Ma^XCz3>BqMa<!1POE(+_0DTXAPX`G7CcnC<Sw
zJ4BLiGWR{^x07FfDolU2oYyYd{#|r=FE>^+aNLwWrAt^lBk^ZnSIUBpvM;SAqwe_;
zAf}AJ=nyAIKRqQ0hUr@O#Qq%Jl+5VTth;o{P04g!kn;6wS)C(K!oO6o&A~en=~7s)
z@=z@Uz66ezI1O<Qz~z5X$K&VL4j#oe>AHp3e>p`cq{xUB)%ePl<D<C6j1Kg26e@5n
zwiM^H6^#0)BFW1kqE#;~9w+oX<Tc44u>-1(do0YU*qz)Q;y6Z4r5I<Bo<9ii_CEW@
zx*lBC#BA|m<Tdg++usVA8gBdBe?Y{`s*@JK_QF1n!^a%|3JUDpbh?h!UC6P5J|)=C
zrF|y>YZ}uSusy^*Ng?;i2$bkEHJ@bV7^8i5CKA#tE7PWzc6u4$+<mNM+OG71RB3US
zuhy}bny_Cl#lpv)!;ym=u_Xf@$z79~;q6OUE-TLw&Wwztm_aRg!sH&;dEsy6k-KZm
zMXS+YwC?}8B+ztim1HR>7?r2^%y}GvyQ6}|7Z(tADHorgP63*jk3{#|IN(a$hpiDO
zzS-fKIU}#Pzk}ggSBXwaR07VVg8j3l56{MkT~LuF>Q)M`K!h)mywdxj7iE8NbEoKT
z!_g~IV<oa)U1Fu_g$MYxW2A=7$6va$b}bg`#-}Bc@NRm7-)~{i_uKK@=nz_-4nuQ?
zK6Q;fWk)4EtPF_<unA~Eq^|lt@Dy<)3|f-^RqC%JwZN-SbklX?Q*faDwp+i;G|Qc$
zYO?ktzPC)Q{`74OEWFcglL%eRC_G(}i_CVW)=td9YShE)_bV~u%EEOeu;9GPtPhKu
zxpO7fq<RUAJeHvlMZVlhk6k!3uy-h?=>Er<&yj0_v0c|(p|>xhd@k$I4c6T&6ZTGF
zvXkPb&DIxVtY`gOwp4kiiZ+ah)iT=VU*q`=ALgj4RhQ|2WO?po14>%0(nA!$Cml0p
z&iXKjBO>>@;LE%8#cKqQHr-$!qymKci#8qWlZf-G!&WT8dTwHrbvNIooYN@QO9~~8
z9^G|U&QJKx;<^Zd4<YxMJ-kKKT)y*?B)gS)xx`ZHZJ_!pQ(9kAV7OAqO}iJz>@XI_
z!OHzuMdz-n_tl`=BzXvcVqbXWE}NE3gA60+xPg@3IZS53VS`gjWE$p<z}!iCq%F`$
zf0xQ-atAJSq@;%yZS#hZV07xD%(!O+j4TMx^MLY)9CSS(u<C$)co!EqW|8-&!98Lh
zz3#!9f8rxxR2D&Rp5{fK4jQ@>C4>yn)vkP`ar*e$k;ye%vv-FWRPO6z+8DmCHodIF
zhJW*nFaeu$z;H&tF>urcVLlC#r;X5HkYE|+{04>TAB(9fvF!+<C9<;WbV#{Fs~;|e
z=M4YMtz6AcYNGjv&m!P439nIv188e@;WgnZ@349~J7n@$kFnhJpr#;~fJ}d?wFV@o
zJC!yZGVE(Vox0J<kc{ypZts+J;kor&Xpi8NGp7eRT)E|M;<1X0icUq#Y^6O9lGfrk
z89B#o5;n>Lh}y;zDWH)^5zT;E_?~1ymf_w37faPDN>=m0XeTNp4w$(4(Z`9UaNaNO
zrvuXqDFAm11Lkjhq9Cun0u>Vh<a_;+-atyD*QA`&&QGvKF|b-y<)sN!6zR=~=*3O9
z>q*!tG4*s$iLa0)B`_1v)rD$F5kc$voV)INb;2ly?qe*yX32;@3iZ3<P4=9wcfWE6
z`~l~=g^nM#<xXNgVGP3%aQX;?CTxqyq~G{DNNOdE6pd<TJy?kEpvWkQ0ick-5;<Y_
zlbDr2DYsT1=UG+iHVdb$A!Pn->pOW^p}uT;_Q|2F*1r}74JVp^+j>%d52$~eN8D4D
zf1ij1s`KyFV;E@p-^)w`lkFfUAJH82lO$0dckIeg$t<Nl<rJbeq{4Bs_p_514`vWr
z3LBQtzG)!GbNN(S*nn+N%n%5omZ4y8_`oOt@MtG@eqJ9@;T>KQV+=3X61yB-dJxgx
zEi)m@55k2JUmxl&m`Iq4WJVj%F`zvaw!}jgF!HrvgXRF2g9C~Gf4gFU{IDCkdh;iZ
zC4OkkoPF#6SBwJhsa>V{?~eEWp$9#l$!;s7hm(-PwC1%O?n&nd1{fM-vNw#ESqZ&Z
z^iKj-m$7IE;BPrpl`+tEDGHJ2kVJd}&$z*)U-t<VAlqRLqivR>Q~1NCmd;NAd)18K
zJ&;8$vog7#Ar;&cP{Ly~#9&N=e0}8|l+ltQ;vufP3)|m<ZStP(-2tuRDRr9$SEhmD
zFYfsU+KD`E!IPLeWg{uAxwbnSYYGkGnG-MicVCI1s3Z8O!L8Tdf2P=7dvZcE$mK>+
z@0hlFEUwP*v-~-JXF0&@Kx%ABz%Pa+Nx*!>q|sceZb?~8<XSdE_dh)7$5}|%ro5yJ
zDx<R<S%i?K@zhchj@cy6z_?vAAzUc^weE>81+~Jn^K_ZDZkN9gB5?^MH}QTwjgpXJ
z9SS~aO^hPc*2YcyRTI8y*|;&yh$JZ<K^9shpB>5rOU82pw!Qb-1^bv$8LMfIzJ^VT
zZ)4$6B+|1bC6%`uX$>EZbv4W5lHKoh=xu4<=NSZtm}Q~I2*V%SnY8g)W2l<(Jm_aZ
zxEn9kc{V4#+Of@51IVeWkQ}a*lQOG|c(|A1(>pbfh!M0dSEnvF$K$qt%j}corFQ)%
z+MbRlrf!s<Fl6Z<;a%s7Ey?@p1qP3GB~2n%K!hfvTQEk!?N{j~H};%>Uk8>hIq(}L
zIm1af`bS%AsT!cP*9g^=5CD90tJJDaE`9F$w{z0x@xZ`VsUwZ^*EG;@x@_6_i{&Ws
zus^9HQT---vr=>$Eppok7S9y2%(}MuBR?vU2c(Sn_oTs>fv5Yg2f4}2Gs=%Z@5~xb
zMf~$w_Hk#oy!EEQY?`8?1U3K)v;<;*<g<QBBRH0GN5WyP54C_`T#+ZjcLL5mM)WHX
z>a55Bp>ZUZ0fG}KNg$9;kL`1wQlB25KO5x?wTY7X=i20?R7T9dLBh7bPy`-+4o{lB
z3x5@iKos{7D1?OD9)dRvJkm^17!P*S8WSzT7p-G4*Tvf|Txd4o)DnYCVh-6KWG@6v
z_Zu`J>*-&`GQK^*ESWPy4Xe1n#Aow?ra#%ODX==;Wo@n;XGyXIznPQX=FyinbjBhQ
z70W`>Pih9d#`m>KxjQdkoiw0R`L45GZeuLc1wqKWDjtv#f=9bkpDWDxV}r5~QT&<;
zya_)S`H4ten#*b|5oIIC!|<+2^6Lvwuu|e3G+?3s-yU`9rF*k^fPl;c${~g-i+trw
z+M_smz*$YK?8z}kM<8!);pGx=m2EC3qTtb+c}ViGaQO)T`gX##gu>1onU(rC-(iY`
z0utWZoxWRJCqwQ#1o5l6bg?ZNMtkbkAEKllCe2<4cd(peXIW9z)5SV#`^g7sTGHr|
z+;t+F!KrtZ7!lUIXxFS$>o)l1cJpvmSpw&x=Znsmn{C6Yl2K1)Bypz#&hapaT*<e_
z@Nm8`4dLCGv%mGOwk+~U#rlie{74{@3g=iZwxHYMWo1mjS$1Vbmd99C)XIQCQAAfc
zB3Q|35a082h)7|Zgs1T6`F3`Hn?nN%1tJ=G84sP(l;OeNu7_hx+8V?@@tA0usem+y
z+3YTVNO*Hjs^w2~T`ej)xs4a7OjUp|*PCk7B@Hwls%+PY-TKsrabCw)+IwdYgY$E;
zIcEG|L;ip#MVUvT!i9&h`7_lz)y;=H61rEE?aTsi&${{yi>AQIzv_B|2>wWO-+|3>
zc-FekeNKU15eo#NqF($1S4`Cwv`3KgB_ygNvFIZ}goN(ty)Q$7m4F_11qdfZY(xI>
zXk5*)i)){pDmuS8Od%2sw(RE?#Nhc!kN;5#JlD|BL(Di<e?@g~rKA;A`DUD)vON%x
zaEQzxeJe`vlP~%Cp@p#XY1)qpF7?hH)V?}+Ik-S<D-o92*%Kty$6V?bwjJ-6vkj2%
zyzI&zE;yuPwPielr>Iuf%b}{w@Gfx~tiT+tX>Qij->bfAcNqw$Uwz<fu)rEa1k5)!
zNv3Tu1YMVb1G(!BBc-qjLS!84Nky_bv~ptfs_n=`+2W{(5PdhWZb}2c1D=s}Hlm7p
zQAM7%`#8bW_cDELpOhcjU=ItH;iP(x8#hS3+}xJZDRX?%&`#X*;_*A*v`82z(S{wr
zF(FSCJN~@Nb&W(&m#`Y%Q=ePMUy(LKF0GcfwZA`&6N|4Ieo*Hicfbuo&SSdwc>}nN
zl2zrw#qDTg8MR&+TMMzCFI2YyYINjPDl&6#i^2Rqd`!t#LwZSnSPsb0#^bGuJ!W!A
zNr#pM`r4%lDl~s(5^AK&Uc<^EHx(eKdsgiR1jVM2hB86!;M^&krt<n^W2Q6Za5tT$
z<x~wo4&~_PcWlK?Oxck#@(X)tP|G42;5C)G_qG4P7Z}=UEqXDw@tggHcPS?!)*AZE
zMf_<>I{6WJM3MDy(X$q*2tQ^<GD2E7!@?~Pbe>cPA>SYRuB2n2z`Q(y+|e`3E$}il
z+ekt+AiJ?@UUz%9=MQ62Ek*(2HUKhGQgTIEl6VR>vcI`Lg3Pjq87EF7Vi7bH%8(Q$
z#CaKC=s+^^_TJ3u#h8`FGXiFqgWZUnMcwe42syqZz}MnWiFMHh=xyuymH@VbjIyFR
z$O<yiVN(R#M_%amkgD}3uaGhXK4qx5FA;AN(AhPJA0~AuPZ*WNy4V<eVu6#Sj4LzN
z<I|dG;Tm(TkW3rFMT`Uvl#dJe@)`cV{#yY~K)`=D{~m#W8~}e+_zwlPu>Pa-&nEEO
zU!4A_$iI4jar%cQe{uSU99tOw=>A6s`13DK{~^bJHUHA|4^95k^ba}y7n<(>()16h
z{@wXY(?2x%OVdB(_}^T;kH0wmL#w|y{ZBdm;`9$q{+GpR_AgEUkm@f@|5J{?H2p)9
z|AnUczcl?rs=qY-PdWb5^bbw`H&^fJFHZl^>Mu_JQ;xql{X>)gWpTRvI<f0(_ey~L
zf8})9YVXQKvFTSQ<jMcn&J|ZFd#4l*H`Gq;WMVS2j7Du!Qvj-$oetSKB3_i2i-QlP
zs(4g+Lv08+<(O6|2fM$kLuJMo6P~c-(<DC-LB@g(!~*qQ{(-3^$xg09?V>nb?Ctk5
zKcS|eicm941(2SuscwOkhVsbXqj<m{?v5<<H+@jzQqkkUiHPZWHnX03K=J@>q`l1Q
zVr-*{nVFiM(%8_yzS!IA`BMys(O1)wcn1U6=>O>1K0?Xur%k&z=EI?#!;A6D=!SKl
zcZ-U=WZuu!t=PjGvMFw22XKBH-BCE5Db$$(9<0y(9=n(s8exUkm1g5q=xb?ze38^v
z{Z2nv6qD0D9sO|sv)#;^l&(6NXdR0aQr9Fzg<Eeus5{9CE2tBnC|OU^3V5H&9TL>h
zH#wIJ#HiivXc_G4ltREN^@@0d=}>rY$K<;PBbyzh`d%KYU5wH=M#ISJ5L;J(IF=wP
z4TYogK{hiIhCT}0^`}1I>{N9H5oOLdP$|VPhi<#9Mi{7~J)EIiZlWj%Qdre?E+^5M
zEB?wDqn07;4>TMcWj5ZO1X{jgMOiWBG>t0B1NlO3c)KxQG(Xohx#@BG&P0@Tj`%OU
zQOt{;#9x=;gC%H1SVnPwnB>2zW&2Rpj%q?Gz<NZY#?qKRZj_2IF4*2#ET*^MOSSE&
znAm$z?|r9fxaG?l86?u~xJ8fsP}1}4Lb$KW-F;?`;h73fBab@-xz-Xe&f5x05>(p3
z<nw7N1`ohYtK9u$SVTE~N=ctk_WTy_fVbTA8!7zOEv?HH>TGIZ<Jnuf+3*;oP7s5?
z4q3LmNa=ISZcl07kj?RkVBfGqv{yW7xKIq{CrLh?zK?AiFH{(LAMIp4PU;J!dU%u7
z+?j3fxdHxG38X}M-}!xd((k;jQ4Bo5J$`petpn3U$%X@ymU~(Rczj8Lav>(B={E{s
zBN1P6b^HunJQY;3;RXeKK0QOE!<%t~VCb?6X2Xyj7PeMM6%B)_aMLJZnkm#MawXv<
zju@6;bI*QkwO#e^<gD;*7B;Bfwh7(^kv{OscxeY-oT*MfY8f=xGqdbBGvG#px~qn-
zC#ZjgF8@^3{0K99F(DbW7yt1JJz%M(i&aIr{^8^vt7G$W41k)u&ed%VUGO~F3mCVd
z)94|To7w8AeR%Sa)rz4!AuwOY+L#{cOkT<eXI>J`uq{0{K|dA54~~zLT}4FufIl?f
z;tUtx`_`+!Y4C7bsh*PN^$?-rP-XAa99^i(y$`Q9AdMNTcFWy*gLOQ&d!;A^^b+u8
zDk6Z(A%N8X!&LkW#jiJLVGiHpiSyZ{bMt)psaQ81Y3$8$8s=CdN1Yt2{j0=Fj~4El
zudkh90xwbf8`q}XBZI;tgok(RvD61RXKj?7iES3v4kj7F;%*faQ_(uHzLLYbArmU|
z#@5Rd$%_VkNDp;Urjz4p0M5TYj{nOxfsGRHU;zjGpK<?+j&`O<9|KqeaB?39fh$tO
z6}Syk)n}D=GxG|sD<Bhi&%Bh5G&1TP;g4Uu7?De>iKE(k3hyHib^{AZ!Z;L@9;}tT
zl^l7n-{F~KgiA5|(E!1w%wY0N6(qNBXmOPIKTc{LI4ZIB#@JZ9W&kQ8`i|fdY)K6f
zw%`i&SSU)!7q4j82W!5i*SXA)NP5nWjo)yDM<(^b2KI60OwsBLI~pNZ%Y!cJ={Vpq
zpgznM(A~FM3xl5fdl$l-pIOFR%>bT^YeJQ)=`m0z+I_o9uw7d!j0r4QN74}t48o=P
z9Ob1H`3H<DSFMy%F9g7Vye^cJM<9oP1La)21lOKR{Zvq?AljfB0|sxi$@bL>$-%6>
zwWw1dB&Cw`ll>K#)9oxGNva=FNKfb;ny<EjtVg9r<EnSZkb|d3wkpuUM+3#e|73v)
zTaaL`!WMFp#+Ofwur@aUA<bj-lMq+t&QsHb3*V!c+>^+8&Vd*XN274#TCYydcg&Wa
zj%PFd@jI6-d{DpLVd7V=&g2iPi=X)r3VKO=E}j(ZN6(ZMe<ZUJitOTIK~tvDN~%u}
zV4R0KMSZFn=u_Os+n~=QfF4c@cD4|w)r8edJZPzLp$Wq|Ja8fRkl(UOO>s_Ou1}dP
zHtg7jD{rk&0%@S^JnCDT)Sxa}5-L-tAE`6&p4V3rg-G@)Jb2na<1uK@1drz9+f-N*
zKz{VQyO)_SVP*}k&;^ieYK#p@sm@4zUueFkOZPr?MOTqWEN3MfucUv3<Zlasab$oK
zf`Br$c^X^U!WimyR(ha*O`JKgvLFt@=(<ItLmFvT56+ik*Fa_;1RJY8axO9LZE>Qa
zUJ$Q>=23M)MG;@AOhiPVn3)B~sfE*6K0!w<FwbmniIc_#bNTadV79u-Na(-LR;>C%
z{QGy)W2p<=zG`FsNu9)uo4{d0p4AlZ#)0(O?J7EA2upm}`Sqnv0Z+tqY>T%#or8H`
zzfj*)*!uWk(m;)JH5*d8J5zEw7Hrm=(PMD39%S@q&t{W3WiLlHBk0|yrh4=m?e-*!
zWEwiu3)=V7@vczPos+Y;8eupwP0D;ZLioM3N$9uOpPbbKmsQa{tv+zi#`1fO>W!mj
zM+Uyl!7Z@Wa@I&4lMHwFn$8#)H{20VW8dZ?%*GIBhk5oJ+U1M;P!f@GRuqjYcj2Ik
zBGX)cW_R4ecOE`)|1e;IN0{O@2H#zoh>duIRoIsFv-$n&!=`xxqH-|Nv$yvf2iO!d
zC}r|6HPD6to6JTzGRL+0gb#P>kQrbs&r~*;>d7xI(3xp#b2%iQ@9<S^tp8Ujm)ZK#
zJ=0gY={TyeSG<f$XF5eSli2;SB<DmI0EfJUNlYM(Q^Aw5WYyaW@`^<2O7uDieKqx6
z+Xrq7V;*;LdA`dX=DoR+n)v|vG@0O0tsSW;FBa%{RFkdp<jJ&?M6V&#Pk8~Gvtp*N
zm=>F)v+oSli&LcsE*iM%_oT%G5R^(~{i5TZ)^AKYo)YOn$c|rTHRH>y2I&98tU|%b
zaNVm>GXj9+MHY5ngIF#1Ko4er{l1JZ2McwiQAh&CDmZS`mmBDdl82>X5sVvbO7Q|~
zA6mIp(~ow5DIITqSYGnp0Rn=ey(IcjRmjT;p;@h&OPV@iJ$rDxTUnIoy^4U0rG|Kg
z%tQL=bXyIN$dzV`+G}7~vx*S<hmqi4b{2g2D;kM~cn1eK|NqX;@}vwb<%0MKj*+H=
zetRz_t@ss@Olx@yRM=LJYX3<|-I;0A;k!V&keRpJGYffy`Fja@Pj-HoUdU!u%bFWT
z2t`buWD(5!#-Hw_kj3i&%+k&F=>tClbVtpv1&(VYL#CJh;2lI2;fCnObp{kx#`OW4
ze97-)qIP$70N5L{=~ZCI9ruLV>05N^pAC#-h+K<icGzc06wRy*T#QGc`1hg42pe6_
z3z;5`0=FPx?84<^!M2Q*!OFQ-DY=&i)i`urgn%hodNXmuA2Ic^N@sIzxaAqIraOo%
z3NDT7n+a+pcH>)9Sw_nr9|60xnbOg^Y-LEJBL`y71-Qd!9ETw+AoRDPWPwETOL#XP
zRFJPSyI0ZvS@PU9;y?BxVWxp9h^iMeB||*7fkyvW083eFb!v{Lu4UKT=3sia+zZEN
zs_2w@0C=XjT}qDX1_5}=@BLn&=y4>ZQZ4YDPGG|bzjco}=Y&3KixlM^ucc|`Zm7ts
zm!UPG-&QebypC&X*&&sNr#@2vC1bpZE$T)CDlnV_JqLWOx1pQgKY7lBrOVc?<=R#9
z6Cj5Ca9Go0V?_WVj}P}X;EJ_o97_3RDLvnyIU?9QGY`~F>7bOaQrW^)1allKYFT!5
za;I!OZ_Br8twWbtf)R<(o<+*(d)mhfT+OMSDSpQ{f7Dc_$kujN7}O4;47tXVTKSI0
z>ZA_=Q%ds~{7LURSsOLMd9`wWADC`%{>oUrySiyruMz3ocvP94oOzc&>WlpfwqGLo
zdm}@yi_s8E?~`uDA39DP53Sa|;(1XOIkZO&@-=N#*w}@`<@Ql3sNqU^&TH&p0+t2z
zy>ZH-f_*kLG;i09L`Y5)uYt_Z)DZ1p$~C;NlYn$}ILkRb_R*Kyvrdn0{q9M!#vl7b
z!M?zK(g$<J6hfvphKUfywSMu{C@QMa!W@|z^wpE{B~YH*3RmZ-=!Mcq$eK{w{tr&e
zuR+4Fl@cD*&(9wM($CN$96a}<^S+`?U4!5xqMVOfcnBw``bn&Z-+BRWDuEbG`iXk$
zPh%aW#E6)2cnICv{=Gz^+V(61_r9>;mZaVAtGon(WUz1)gAS5RV=vxPIA=1Q_)peL
zPw_-Lm(%pRGv9X>0>~3ct+nkQ2)i1ip0MTuq+IJAS!b{a=3L%IuVJ9F$N~bgT(`Qg
zNGpkV>MGuOzTsyD*wRz86to6r72mNtdzKo|8zJ9^S3IN@$;igh^h#eOSebnmJ5nRL
z5s~keDEUR@&oTjO9pBGSfv?hHzEjKmsE8RP!?T~1+pF<V%AH%<GsW%!f$Kiw5%j3K
z9rRA-5@H{eAUJ{TiS6kb5b(!~5bBvjrn-?@EX2`NLAx_0Q#8#N?h*MR#6P}0hj|l5
zD>ZS#ttuI#PTV*C{rRmL0}MP_O~t#4=bqO$-nl63YEF#eH8%?VChu-Qr{3+ePuAn|
zYW;Y~$Us>sw6*`7%x>SI#dwoa#?l`snY^6<eAsYl6;>>hpRt1ZW;Qnsp02KQedRc1
zGWR0Jm3hzr6M&JoCfM6<xSfUeguvd}VBjuattwTG$4t&dU+hK;kW1_K-1-I{SegI=
zP4J12{BoOS3(_wbqS-xRXxlqi^6i_vN2ZQyj(fK!VSA!SwXdgay{lVl?gLNo&^2>;
z?!ny;#2SB)_dS+-Ql?+7WTPO}Oiw&_`(nc1Ng_`Wd0~Xou#R+~3t@>2S@eb0C7dtM
z=ItB?-M?c$f;*->1flal^vx{FCJ*GqE-|>i9`K!Vga7*2Nb0^w1ch0-Y;r~J1XeK9
zEL)knpA?Vwuw}b};AOhno|9oRNh|8=tDv+Swq6@evczBMDQQgrocIU^P&J9G`(W}*
zas;G!%wi8?j(5`l<om$fLBTsC8aeF!)kgDntQu<w)s#3E_NQN6y0m28`)Bz{`3`3+
zzH`7K2*#!e4-}+c){z>)B2?rWDw^GN9o+xn)*JxO60gmT+#JefCuxgU=fmM58V-b4
zoYcn5J&LOVo+CTlX0HxAJDLo%%(g5<vqdj;CHbmn+2*YMX&twpNL~EL;-$$Q`V7-;
zlRRgLU|*JXeeeG5kitts5^_B}C0$FEU)+js?8skicP$TkKGRM_ugA+jDH?XRJYZo-
z6l#~LO7#spEhwq`(jmTy$bNoGln5cmO1^sqlo_`w&Cu$`y8V@)^SQTe)5JkmK@|{e
zk{~x76-RreL_l%Xo#FLXy$i++3{K>Q;?=7IjwR@TkfO~jrjl#lX<Dv+>792cf@In;
zx=*KMUG$+{%`huqu6ACZ{q*aBfj}IECS3L#KuF}|xpKE+1`-bl2$%u591_U<KbCYb
zSap2#CE4}L0S=CehTQH+_CAk#-h}JNVZBr!rYGu{T`8dLegD#U+`i5nsx>L|0fzDK
zow&o6ZhM>*8@;@A_abcc+*_Pysv;SeC6H?55S%HH8-QS9FN$Pmjk>ykDIp<H0X8yv
zl;?o>S3^Gow%RGIfj%(Qkp>Vyv;O;+MVAe=?@;mCpcEZtz@{g@QZv-iFX!pXZYj>_
zCQ^dLurH9G5MW_F-B6+@x<ppO2nb}Apn)ly5+1y-w0)*DImFbC@{##EhH#AwBFw+R
zhD%DE);~T&Cb>UsH{xcIk;;M-7eeg1r9d!Onoq9QC4zSiELD$`e8f8n0#&8&xc2oK
z5!RJf+*|tSl3qp0mHz9$<CmYoX!PZ$JQ45U0r&sk`5EYFe-4bM@q^^I5U`tZdI+7A
z!e}g_x_qm9{l$9Ab9}4W92)aP6+r1DJZ3Al-#~SQC{Z=k*<qX+dkP$_G$dSHv1LoW
z$Wp7O=9i^E-K@CMJe$5x3k27We-P7(Y4A|1ACDIgx$l4Eahq;LL8s%$YZ5O!xGK@J
z0<iPlNxCJ+7JzFE7v!0AFaR{Wzsu%uYg>Y^kyd-TDZ1JSg;9ov0ZNtURn(Y)am1IC
z_pcY=bMQ7ljD9Uy{_$>mL^p@(BPMjVV$7NPw1{3-7>Q0GzTB>$221V`m@7X~N!cx1
zkC~kRNqPCIC!ry+zSo0!{S}+g)=z)^658eL&QGM9aENZFOTg!lN#U-}yJf{BLgez;
z5LzZEd*;*Q7S|FXdz`o8P7lm+cc>Kny|{%{EJwW&=k<V$-iqa3p}5LHxlL8yf%vsy
z5&XC3ShNoW+BgSqDXsMi?B|4C1dNeQXtkZ&(?^D3GCSr(IDF2DvC1cV;3rJT#te`3
z%Ldeq1@fW;m;cCh%CCq&K8Jei(7~Uiy7G~*bz@JE45*o;cYgdm-lZAaB}q+Of6l&2
z%56Y4#8Z>M8e)d~PY;YxGC7WnZg42+?skTs<<<HnVulKu%bAnwue(C-HTc_mZMxY(
zai0L|RZs&P>MYWKm@WeH>MP&f!NiU)R|-CHi$y<8+MvI&bZo)2c6PR0#h#j1ZZKHb
zTVZ9lTywg2>(FGoG!}HmVr*#nk9lRjD`Z{GXVP_<2&4^M2dU_7ph<lSf~8bt1wkS9
z>Wb{t@lQfrUiI1mVHnijFYt8bLjvO(#s2Kj*3kN~BhOjIrcR5;WR~l$bz~lgUw(%*
zX&!EhtKzYh)cYJE<9ELJco}eASe<bz)KjJ#PKu#dx~~&OwgKOt76S@vutD{ez2j%Q
z)Ebs!MmH|3yjNiEFRk0QsPb86JHW`tS>0VgW3)!b+`NHCc~-dS^DE6*ppfe8{K7K^
z$x@!0T@mOw*+u+OwtkXx?~dPChI!v)EZGS04e7&DyY$FGv%t4cploENL}$}uIC;dD
zfO@ltWh^vpblr^H6V0rimrt$9ICZF=lJMB>&$XX!usO5-5sjd{IeIZxj*j_pF<cO-
z5g_JGY#>fR<~K=Rb2NvY<6Xt4$K|UK<EJ6TPHi1r?MDVbj7e)Pw~(-tZytVmJ3V+r
zoLrIJ4w=tTu-==3CgXQ^<J1ytt)=f$=2#0vL_keLJUw@r0f$`<`f#>YFb4bXQ+YQC
zW#GgdiY2#d@yj#T)>-t}maD+|*ET_3AYs0IHxo@aV{540QswxbCRWE{#lAz8&=n|R
z4}08uz#dAAi7@Wc1fNumN^MMCe_Z@H_hy>nEuPoTxJ4-6Wyhj#?of44!|g<W^Lui`
zEbqaTiE8+jxYR%;;qoGX`6og(cKyX4PCO(8Csljt1@hi<pD2HJg!0}BuP7e6wLX2V
zXsGK1$*3F6apheeER$cPpL!0=sLla+k-x3*@yUZYaV?i+?KJ6rZ6nK*JYr-f42lV2
zH%S4^p9C(BMN4+uva~V*7`j5<pr){m+Ivu0&#+=^b4M)a$HQ8+IBR4f;Yn>D7cK-n
z8ThE`NdYN)T_TwQ!Uj4G3^1}}PVc!)qkRbK4ECT_ucIS^hnC8Q<eED+ho16M@>ye>
z9)b@Eq_W|1Ic{K0y2Zx+s!^hhLy&5<$Ml;rB=w4D2ymE`_^wO=2Do-d-3c}%3;4h7
z<=;Dv6BFoG+#`^Gu;Qf!{Gj4d!G)T>vp;C}VU~+|I7Ui6oP`*nH9LG=N*!APWuKa<
zZ0;#M(F)KIh6;Go8<XYU+J%C)vB+9|HF98t%4F0^0yB>l{irOuGW{{)Iwo9faOsR^
ztYr*F6hkwROI<GduDx}UTgxyxc$2t~93~Tyu9`OuNt}*D4Cglj@0>8r+}krTEtI>L
z=lBh^m_mxW+`BRk)eE5ph%)zK?aWd?C!S?mt|F+rm%)}94mYGr6~Au)Pzu`>IE)oW
zkYXjk91D_YZ2a*H6hPvv(T;9<SXW<49q(Tk{StTO>oAgM4)L4YGj42>+qlzH8ZN<=
z6(@Bwt%eJ=+V|D<+L#~l4qxNiw3C8*o+@m%(o!x|+6M?8CD>IQ^<m+m4wzBgimi&F
zBwnK4N;3gY;?1^5Fw^=924AtNf}Q~7u8klg-{V`$f~-Y-izU(T`}-BdTTrHbEb=4a
z2J1x#&bO>`rp&J9{4BbmhY<X^<<+s&6QUT}GD6aRj^GazPCC&;+4{%2hy<9+O3N-P
z%67VHp^$-s{odSGwEY>~8v`ah5fv%cOC1uDw&OpSq)^f&=*470P>kL$&FvGf3T8v?
z{+f<B3Tzo~`!oT&qih2<`9N~iAJ+oYqKHSJSSSL*dx%j9^M$y4?U-AZ*DO`e##RJ?
z92tEdC0ka`O7z?XR)%43PFwb_00(*E-%W986XsyrQV6SiF@Bm&6<ci#NU`7zXeU+$
zF5CVh^X0i7vi<i9C|B^?TP5JH2DRQS5%mKcSNRj8waI$r7B}lQ6-m_^kZRixlZ2qI
zV(VPEMYnNBM=$q%g_aTDSu^|<6LdIbXN6&PXxUOWVe03vmE}84jX9VKILzjEMpLEV
z*+s*<k}x(6)y=D_#vFB=8&giONiHg-$#3hGbA$__c)WkGf)!{4sF%miWIf)C{Jy3Q
z*=#lh1&+{6maQ3TR_gKy<~S+RVPSrX|2aekI?LC$TM{*IIr#z-l(gU%CYpSC)5(gW
zppJMT=`60%LQI#Tq`DDzL0wg2MT?3d<Oi5lag<ea#Q;~&9i1U&pO4x#HN9y_R9oas
zrFR<qHp7bW$YSqT7M^1F1mkGEo}ElGXU8OQG6TE>h*qpf3+1(c4`Vj-DHj*QI_bVF
z3`hQUa=fu4y6GygBAYf+?N|JD|7Z5gSq!lIPiGNBwNK9BbFsGfr5geH)=9|UDRUi^
z+sepFyY+Vd_7%tPCbw`<mECGH<04Y#M8~Rz>}f#wMa?#Go$(CSq;-LX{k!HauNSm>
zycC=tl-wK4;k(Xi2r!;4Ux|lcw@1N8&!;787HQDJ7P97bS)G#Xz~~}esW`gM0vX7a
zg7I)$TGZYa3K$#;fdIXj{8{`rT8|@L6G*f24fV~@p!6VXCWc8G!colDW*3QrHc@oh
znm2`j|8nSnn}C4eUWs=IfOr1eoAVMs)_#bt#Kn$9gB}SlPg@^>I&QSnCehqv+dIh5
zQfnkF4sihjT8hyW+@j4ZwtMP+cS34}A>BQJ9|&jzneI&q0Jby{Vtfi;on~Cu(*B;l
zNc<@eUp4?g2>F2LQK~*+ZDcP5O73+W5QawEfLZj?eU&m`tiW&s!fJ}M@xy!@{O%2K
z|AKN0pF*)5Qx7?Ap{CsD&T~p7^L893^b7C;ctgGU@DBP3p$!NZ^iehN{1mMtXYLQw
zDy9z8AC_1v<FtaNtO3&Cra>24uQj^wY=4<CZONW}h#&)!M()dEJ#km|k?oXkz%jCs
zYG$j8g_2^@_|~hwUpq~p*p1f0e!-WlYxJQS8Wt1<s-{w9{z#tj3od-{b;WCP;ut*f
zG5B+f`s-$NM?)f%GMn3&npN;u(W|2+=-1lXF&{s%)>33(eB*TQKzT4IDIgrOy2U2Y
z>E~;>UT+zn+F`B&;^K-%Ldzw}e%^dP$D)d##n)C>cA8otVqJ->CYq`n`2!eU7Ouw^
z_2)-&6;OK24BZ`a0EO1gju30$l$&J-l(WF>?IVTE9WS8v8X1s}=A1Vfg$*)f`mXt0
z#F_WhdC$B$A)*cWan!2s7|emKP7@~;@eKC;WDu7*YS)1Q4pR$%s3fsze0bA&P4Ka*
zEXK&=W1#i=`bsA>@3ym_eQJ-C^h2c1HK9cmRyj3i@-2VHWwGj7k_(3Xn%pCY%&3Da
zJ^-*Zp<=IOiaIKvqC(>jos-Fv-VXz=_(4V6m{;I8@m4!zlD^S8SeZ1_t$rl^7#H;)
zzaKdAu#+B-Anc&)6L+KH5OVfIe)yolLF&V}gla6!Q7A_;iorBr6@mfdH`a4DbBjI<
zN2kdSpqAXy=acO4Ihm&b-der;(8U(ud#c;Zb$IV2wI~SSODR2cnM#m8S|EgVU3VjC
z`IE9yjtQ!>_9PEhWAP!u7+~mL=iORG4Pn7r0Rh+ggUu649g{IOGnm}62l>j8cOP|i
zd)7-q7rcd?t(nY;${!rtbeKa)1wE}X$@TkK>Q;U$qc1ThG!ffIk1B~pp33Nrip9#u
zLMIMHi(<=)|FlEi;OkpBs%7PzvRi6(U4+t1^`x=O13(>AhbOZO*XrgEBQkv0yTrVC
zGLQh7qn~XA2Z#4&aXNrE(r$v@rHa%=w7R1#*Y!$dLIoAH+TqRqY0rO=Q*W(~Q2ZFz
zFW_(^S@CBP3av~Vi}@i4R_({&52eDKm232>kpjqS26qEZTMGZY$=7BYno!><mSBSe
zqjKd`SvSm%?06>HYAa#W%EF=Vem0oA(;A-hr3PH`A4qJ@{nN}?;uVo~s_>}EQ_*a(
z0?`7`89~yW`z}>DDLf7el-G8$M<1`<4cj#hOjGyY&Is>#m9lptV-#B2%Fz9EX+WfP
z+!-#!YH|Y-Z}53OJu{BoWlX1;^W8T@A5juCo$S}7c%mOT`Z8=94;ocDNmy!^OW{F7
zd|*4M6+m<h-X$QmMpAEmunEd|EH~Tmg>VnPH6@_-=MQC#GBYo{aZT6D&!8_ur+2bt
zcj0?=Uw<w<$}9Se$GQ_MWvW0QD&~O%@d<n&fvA_3tjvLM_Hicwv0<_xcB_*jg`MPw
z{B&GUv^033;@1Kfl3gn}5F#hYL?%Qbbv6fTIFWGzpo4Bvf9~>H%S6arMv}28`>FO+
zHEF!a{XurmPCGyUZI~b<>~q(BO5o%4hHxp1f|U)caK}gVi=i<t&kf2Mc?Dl{!v885
z6YBHeA%NUZuq6T4!7Dl%<k?ITD~I6bV>r`i8MZ36@r|16P=A$}%657AV+eVm;zvi2
z&RyhD3Rp;9^90)FdAK7w1mU0tJLx8=UtUMRTC`nFJ-ovzQ3B!Ep)x;<>=5FFT*U7o
zO>aA8WQS97PvQ~51*qm^zdo4WI`9255E&*8BZQKa;=C^2D0X@(W0J&muaT>y`nQPe
z$Q#)OYB7{=Xx$~CFo*Qh%y#1OL~6FWY($Aam9|q7P>dS_8LxuWJBt%E<egt1I;Rhp
z9GseJFDd324tA<QYJYaXDZL1r!dJ4jTY-}s-CpT6>hdop$IR9UF00XkPs)gFbcdvR
znA!`PGYwZfzl=w?WqNMxBWbWx*M!t6^-p%09(1OTp_{i$DLC`p=VW|@8xG*JX00<p
zJ<Z+dPO0Cjc~Oq+5yXpO#pQ}JZC2+L?H!-BHw_o@Xyv(zKA~0X)E;y(xZ{Tg?j8g1
zs{Ifi*6y**JQ3+9v7)*Q<EPFUSSQq~q3W3IHZTo+)^G8P(H0ZR=FuEP;7>N-&B*xr
zl|GOJ)i|yERjQ0o+f?N=K_mQ6e1X%Q-q?XRiT|9?O}p-VV5mv<{FHYtf5Ul4yoXa5
zof=sUPlo$>%o*@a4mMgoV58F+W2k6@(Kf9GH?KF>LlO4c2P~|7dc6R=F>OQe0_Ni?
z=mRgEj~&R_80gb#E(Br_-SI7oJN-0Gw(Froe5OWq`OQ;nAT-Ds5{H=SjOwmL!31fH
z483_u>C3lXcwi02Xed{P%_TQ_7*;FTCzZY|KFY>32`BzGS<5d(nX#r$TzA>5gBCwk
zfzvWQsM=bQ*<t1aUu!1G4CM?P_&wV@SXplqUP8pzqtid>3dq_3*;g#^Nj`jT`;~sC
zP4uv(oU6(REdt`#3m;q_HIFr1BQ<ZfC{!OSdXx;;&KWk+ZwfN%`R^xN{Ol&g-S>sB
z1PKVXoMvYYrSL4->a*Fo2MtO)<d1TMpxG;ddI=9bF|Bxyp+*;BD+p%zAdsG1x9fKe
z6R7Y>5Kh-`sqQ!$^`7k|*j~ympP~7J+-;FMzH8Y*36CCQDeVnv_g^KP`VR}A?~^%f
zGo({u?3Mgm91QCY#_DcXvq!H;ZbmY8P=nkpdr~%LFBd5PVABdgFDTa2sEBO39Cje^
zS3ulApcC}mmXLdQx0b;+oT8+T|0p+Kv1;u`>Rj68BIfGM4vl_CS(wZS<`1%SW(uNI
z=~>Re#ad#)pvEzcaN_*2s5(k0gR(<x3HB2<#5C~(c+Q*&zF;Vn8wFGtOxq~a2A9~$
z=?&2AS6r^PKNzvOI6>f_(qeN<gAQDWKoeJg`-ynL45_e*xKoxQhHsu%r>@DP2Qd7B
zGodyq><`|9kg{wqeLPt|#3p;EqfIhp^?Tdb4pBekHs%CAXKL+(Lyx8byIr>glxLmO
z(pM1P;DT$!7sw6roX#3{{i~9q+3I`E5;XB^R+Uox(q;Gp9i9C784qD&3f-^1W`t&_
z2CtLFcIszTtX0;=>V?uZbVi1zo=s{(z((?vYKI*_wrRHX=l8p+d~a=$ACqq{{`$@W
z*l-oO6J&@|A$)$nn^?sxx_-zNa*o8Ml;)4&B{iIGMul?*SBc{rmnp>qc{}Zewkttr
zt|-4uTn$Q4WZ~39R72j+V+AN65UHNGeLdTjf-R6A0NLBOID$@%AnIR~vKVG#a9dKr
za^JLq@3|YVgk(0Vv~u%6_+CUwKlaOEls!%|^t>GLt&0>GYVW{Jm`Qi^*8|XrYO%Q%
z@F%BJI1(**6{-G-#{!SqM7wPu^X!^N$@!Y1rWJ>)RXoA@F-iT={WSxbMX%#NL%f)l
z%wF!U<*9~S=C2Wf&W=OfZ5B8ij18J%=MoXE@)a!0hAUu5X_j(rclTN32?DO4KEq;Q
z(m2Bp1V-D4Q<)-nzJ$O+4imnm$?nKSsrpp#?9>NW+XV0!+CPO|SE;us8+*-SD8NUD
zI0xcME<{a`^=8%j8`al8SfZO@jnu)Ch@=c7`kgZc;fI)(O^0j(=+hy5lJm(wv?Wgg
zn<<MTzT?z<GE2v)=QdYRF+Uwlx8obi@9sX(uszcsu5#_sac+8e+jV@B{KtVn>ujMF
zbEg<=lDCtzPZrcsKuHUAR7c{*aF23RwvPBcIO!avXMteh0wCvA62Zj<oXCw6J{Yx`
z*gKPcmT@7E_JIQqlLXV*kH?!7-t{%ab5k@H_%$9<^N0&mF|!8?6@T4FPWfjeH|UO?
zZXliDiK@WsSNu6ijuyQREv{D0Ax2xeUWQ>SA*zCbg0lP5!I84C+`fwCL|JR14IPZH
z1)&E8>h`OM?3M-ld{9PkK&7FFt)}Y1e4ny;(g_B#r>0alj!s>kAi(-8gGN>TEaHfA
z5_$Unv3E{EdPdK>|HihJv2A5+Gh^GfzOilF$QT*h%GfqC%2+40_dXXnr|N&bFY?~?
z?XT*2dv&j8b+>ggCIHzR8ViNW^{x*#j(77x{V@A<$wj@EAmj7ipW}x!xM=gZ;Z^*k
z&r-k7Io@PvI8z~M@ebU-ZC+;z((TTT8ODz}7(2*V0K8H-LO{#49zehOE}`mFk`%-y
z7~dVNBb&T-EFw+lqHWrR)qeb0lkA`vOAgh0+Z><TExE24dW3pqrL{4DkCYvl1UzR#
z*7{i;Rl2L{M&J1Ui&D4upF#OgN&EkN|DJaK1>~PW`7a#*!Js_xPfdTJ`mf-hn*L()
zPfdT}_)o8A{>{Ys3)O!I|K#)+lz(#i3&(#*P7nW*(_g6mEBL3TznJ_}(_c9LgPK<V
zsp&6N|J3yV<M^khznJ`|qu#&D=`U3O9sEm9e?j>tr@wIghvfA1FFE~%>c4`2YWj=G
zKQ;Y@<3FhB=%1SYLiJBg|38j@YWj=Ge>&=o0RW)HAmz{i*Z=kq@(P|kLWzApYy5V~
zW6f-?r3?C9!cFf`0dfFklYKdu=g%f}JOZMrHKD>oPR~qXuM+wkqk*@h<#O%c=<9Os
zrMu_EFrmkWLqlkO<RLj;EX`iUiEMZjc4!g3)W19bTvTJrrP6m@V1>VFa7F@EOB4LE
z*8$03sC{ap1=bD}9k8dJxEI%WzxufekXs#*^7)6zSD`WPj@~6RIK^B`3j1l8-v8Vz
zLp>P>?LHcej^5hz=u2)ki;@DOq90u2$|epgAy^FEcvNpyv!)O9%15zlU9}M)@cqON
zhLiQ7@(f~hs)_2A-a@eGAWSI1XSsx(!B2q)FdEG#j1!h+V$B9oiovEnr_I&1j4;^1
z`~@c5W}~anAr&MJzl6Q{hgu){<NYtUB3s#vAzNWQY29_G9ok*Q$`F&|;Wu!thz8Dr
z!3Ro{z82tjG0YShfS!2lq31-$iXUOt4HAJ@dV3N9AQ+HW)$tS|s8eFTXch`_?Pl%c
zQ?fE8GPdj0>@!0TGgl+>72(@0o1o!Hww!p+Ap@zgonZ^G?oj1P%hEIhA#VOE5QxRP
zBsw@7sh%kOCfM{HP|NW=WSQ2+cb{|K68e5J&ezF~D$1+@h!WWWPcZZ+sKuMm>FMp%
z$;@!90{l%n#+D)MD@*HQp}Ajti&+St!ZvS3*5CkX%j0r`lbDnS_I7*ABc!t#4Zo<$
zUU;ej00epB9U@S`|5jHf_#a=ha=Gsom-fM|4BNrX^XWQlt}i;e_ZMndGxkE@;B(ia
zbgovw?4znfsXulf=GJnAxb~+8kfatZ-??2w1xL|d;MM$t5Zhagb2ylyU-pL*@wx<j
z6;d|7@}Ya#+KW72kL=-;!lC_k4fj+u!uC>et$P9VMUBN$&N2MA*reKWkL3X%e;nzq
zFY#Gak>>`jxL)7)!B5R#2=+i|Zme&r;2NQzbkn}KN4w@7{poL=s#JXX-t-1Y>^A;G
zWIu1Erif!rvh0Xomi7#Y*!VhnD&?AWCi2iIVb&x3w<IgNuEmM;x8e6=Y-TR9wccL<
z^Kd1@dB2@-Gl4y96*H3GTRVP7I=GL@Kd80n->b7sWs1S6Zwko?7%n%sPGsMjO;dd@
ziGZKF|GZk2>p`k?RR&}5eI%PD*p1IEo93it8}9X94B-Zy$F&5z^u-Uq@6<@i8_e6%
zGc2eZyyQ5;C55Yh#t7~>)RASjfTN9j#Bxbk;$u*AuJun>1L1+^&Y5$$675nxIV7rL
zk;H9=``TD!XX9ikC|}xXtjS6l`#!?pp0Y6`craD=GR&6Hx-vEgfTGfnFl!JRk)VOI
zQPGl<#Kno2oBXb@i@b0ch&c;#dYN{dKcE%wLp8Wy{E(96w_9kHluU06()k>2PyrY8
zJqCN6u=(Ma&&KfHgW1st!Fjygcq@L+bNOYA_zNsXn=3Fe6@jS0K0fX=?I2zx;}aBY
zYh?2-ZylX?he9D7SW%dD4`JDxl8&53m0&oF&wC~0$oPB~Vo6@CmV8J*L1hW-V|8HA
zG<pGxkm0(tCzGa^aTUuukq(#hJS3`+lhHU<z^2Nq>t#O}>A^xxvEVZ8(`3a0up~xu
zo#8w9y=TvqCqbUaeaVzGm+dNX$jp79&Kxk0m^z(chZT~foY!323sbWV0!Jc>&WI}B
zbmq?d238<--ni_Rty#AnKGMOHlGSo8n(LwzvUy(cn#2hXzS?IZ$c*!op^n-KUu`pS
z+EgTyLXEGCp`7WUFBiUDaktZqYvGVPW@Cjfd&mvOLpNQ}4I(dgc4Heuohl~b=t^oB
z=Cc?S8mTMFyn|!fDaqi&%RKgUPa{<Gz7K)>7abSlBvh8$#d{eNvU{Oi-h0xvh|S=8
z=z~xpo}S30nbI=I0*t(hYp}%6oKLvEy`jkQ(Dwt1BRLw~1%0=@yz=VH)FPyB{2{G|
zzA6RG9(UW*PRh-?lxJG0nfH314o)}h?JAB}m43n9-@qxZ3svOANE~p!3&nMN&~sJW
z<SamWLYrj1a<*U_aaD&^i(@k8T4nz+iG4IoL-U4gCo{*uE;-m<QhiyqSCE60?Z#uc
z{FFYUC4<T9Aiu(1Oz`f}c%Eu{`vPA90wpZ7`9+2fg&0w$(u6Aq8w^JCZtT}f2>zFp
zt%!k`-U`2R-*!bd12mcFq6eWFU`@*q`<j=X<2RZvlJ$f4@$s1@{NXiQn#A^xneX1P
z&cmr+&YF!LG9Icu`{Wi-XV@J>PoO22;IW5%{5q6xt2WEjlyALQY;-qQ_%}qF&DDJ&
zsk`}Wyz^R11Csq`@QzlwEtHR%IV#CC_F$|Dj^C5_=Im6k568d5>A>)li1SpYEn0MF
zMIHSDt7`vI&7qaP(z>P}=V3qeLk3DMKJRu*!0H<&VbX+-b9pf@Irur>G3@ov)Alat
zAXk0CdAZB2;9-C7_yM*x=C>_}nZk$W*#yvw)JJOqW-Hq@*x@M05QPpU?$L&np+ORk
zBy#bZ8P}AXsRywIg^cB9T&VUguQ0bYcdTmfu!@!=A6Y<;{}@AUxUhbPE4Ldbo4%x%
zg$@aoHx<<#(U^eQ@c{yJmES;Tux%2XLE;n43cNlKGTZ#3oy&r<MBGV&H;ISXic2iI
z9@^fqoWdUmwcWUyKY#;brs;5{=dvqeI42X)ht{DghK5pkSC{oIopDH@%I~F-Y-l9T
z!dX$?q2Pt2H1`zQ@5LZPP`5+uql29H?J$tPBIJClDcKUAxLG9=Hh(HCZo{5hJ{zHs
zW<5SlE4alGG5}e{zm05nDzc7@{9Hzvev#S6vbPALQC7^G;&%)qiKdTdz<c;}T8GG%
ztpDa&^k+3#h)^8^cGW@o?P>e`;BCIkXu^jdc8PI08RL(%M14+Ei*cO+bL=$ZI<3-b
z1i+;FLo=Z_7&SVs?zPSFUXDC#$pEqCl7z2H?ubp|M)6mM4%StGxPhRpd^G!#Hes$Y
z@$7_5r!QK?huR@Le{-9{eJI_FiEr)*+!t-*aD%3&E~|zbj3FAgD5vR+ED_UVb3vyu
zwxwk!Oq4Cu%>IQi$LEAQog0GE8Dd6hH#T9FO3T&4bkq;(rNxq~SrD?UjUdrp`R@HU
z$MRIDa8)QqBIvn6l&K@)48yj$=cP!>`7WXR?)uGOHDx+G5qkI5H;pWAfwF4tNbbyA
z@XH`+Cf2B9$>sdrp{X+K^(R8K*Ea8=J-Y*Nl1nt23Pn%-QPMGBYVH@f*0adIBZ>Q2
z9-SS!J{Ph|T%&6!NX;_H&F9zmB?aJC&4(R}4FOGodbFKHac5$EwE#yz7a=1N+shXo
zZ{K`<uXV3&I+8B0ReN>axh;<S8_8G=)tE_gBu$)S=fVhA7b>l^w%-loYfE&>oeXc+
zM)GS5i0rBWM2YHl$XJ+#+q2Ni)^XuND?J52A_EHRn$Qj?V(=(8U=vLj{d0oVZ^5|z
ztTdI>#2+>!ASaTE-#cRK*!(-UARE81w~$l&n^+<2Ef{c9&HFXB>DJeD@Y#&tkw+w6
zEN=ub<$GSS@x+D~n-ikcB7<n9n2C@r)Pf7g)7Gv&e3ie*JeGqcWr)2OUk%F5lm2$j
z+%KW}Or4>RxQy|!Y(4f9Pi2K}V`OD?0b!-8EI>Z{v7^p|kanrk5^1}Ocq=OxjREGR
zZ4~z9W^s{hNdPnsw7NaH7}o$Q6%^_8Og1<Tq;x81RU6FBB@TGUzadrzk8=Tp`(h={
zpD$San~=vVx&l)|FGbBFS46<MpBpKKBI!}xfwQyX?s;YbN1v<fAm0JEOpaDK^Rlx(
z(OuA!M!%Jyc=$AlAB@s5&;gJbU3iX&#Ad64#5WkD!9SaCfPB*7y*ng?|3;J=2W=wp
zsL*L0_65C)9`%}PV)_<>Dp&wbhqJINistJe`N+yqU(c($BJIiM5v~h7P<i0&20j?|
zRZ%Axlm4~o$o@qE$J>rHJsRdK>GRKc-DKsamkPHcz8(q`uWc0^0Ho$-_(%Kzi>-#X
zEQV#m>SbNquw%t)(ew4=AP>VdT;akn_H}DM;uAAJSERIG8uZ;3tlEO1w1I|Ae$0Lu
zcVJO`!M%#}TnhbN9wKYPG;Xdq+N%<w_CeA$Gc2@kcnl5=Ml=N>BCaUD5qf3p5vo*%
z9v>Y*I(^BAIR9F*I1L(BI4pqj2=nOZ<%il%Is+9Hy!mb;vH)DM;{a0&`e$T3*zMCm
z<W%I`a<TEQ)ZLuhFC~YN4P3?auAck&(sih(nMkt)2hJ27*Bf10+9*U5>th^5$JDn9
z_^DPa&~a;bkc9o)Nm;}GC{EGD4SJ$%4x#P^<{0XDMK#yeo><s2a}sumHc~MaClsxY
z^BIjtYL6_5Koz}Ok-55uxF6O-SUe5-x3IF)gs{YWop?HRz&5+uvc&380zY;7FHDWw
z<m4G^#LS0p&Ad{Lht_x^_Kc2phMkh$V*+*L-k@|E*G5dof!)zbj3XVeo9HQ0hI)ll
zEFR?G9yZxCq1??QS<|!&j?G`;SgbvVz}dG)p|x}TrGhf-(nR1gHwjQQfvPgj&T$MN
z`sG<#5rM8CD|1uflZYMAU$_OmEc7=MZ0EfaybCZANexG!Voi(GPz63(^q&a!+jhUT
zv(lXwzrK(MN-9o}J=h+Ha5iEPHQ$eExUfHYk_?{H_LYE=ZT!+|^Z=u)j+T46s`XAw
zO}Q;uCPzEGIm%DQaWsoo(c>a~A~e7$p-U)NWQPld?)!00%K)MTE(e!Kgq$9Ji@Rrs
zqMik%Fp5uG>&_8%$&oeq>)g>7ocMD)$!H{&*w98vRK>qSWxlP(oF()H>z;ydN$S04
zx5_H6?()rv|G=5@cq!!lk{$=QEz~@?k3lEZ<l?T_dbR~L6075eMW+QKG2J~qCcuQQ
zpmnEF-ma7QG8+JW7PSzCfcCY>I_){27?UC`A7GI<zh`f`EOyswuiJqDvhO(HNU#II
zeAoqmN8I~^OD6#kgEIjdladgYI)I$1e9ZgOd&0_0fk~L@DI3u#;u2Br(?4Z5>7TOO
z-}ir>?ipE=Hh+-=Q4k^qNCY%WeNqJC@}fK(WrGhCd9X`KBQwjWPeHWD`(gq?2qew@
z61N)(D{c#&K~TL|9tM8H!vdfKyE5W_7L*WjQ#sUy(ytt?p(lkPIoU5=$@JBsj)Ej3
zEE%)8-Xb=MfAb4#C@aVa#FVfCbFUD~JGMg?RgC8x6}Zhu3NXiy82Y-slIknRyznJ2
z3{}3<*NCdVdZT3fGq#n=A>S4TXkgxDmT~k%uK~5qa*=!Bo5%WQXm>@74zww)D^z?6
zFa?1gi3EKpV%^emjVl*E*od>PsVocTYe=M){f%L?E(zAvSi;0JJ@X>3e~Ab%inz7E
zrEKMoxiy^2=nb)&SCI~Uwf`!Zl0fvjEE7t1h`lNc27&*=(79TP`wg;M{x;gp?uU^N
zvL~K9-s|U9KDq&y7Zs+|8M+TxA*{#qFKJGHc_>>;1k$3Np?p0OL`MkS8WYTyh&!;P
zqY40Ig5|MjBc*CaB({WZg1R-OJcu1@o=g*h5Wg_?#V_-wFd;6`j$z-#`(nw=_n5MP
zHze`FwQWgv1STpo@@J@EQWp?+DqRS{1iq9M4iJfR)1yR7$xJ*>B%=V9a23~fvE7cZ
z_PD|HS4*=p++x~%tyD4rl|^@lRsG9zWov@6=27oCVf=#Y2L<T?1!_)TxoPYRew*oh
zVD<|C-?0|ll~lpV0n1Fi{r~_XE%6QsDAE7o!kg-w0u<bo$s0(*7%|D<Z3-isuQCqE
zaabF(qzZG5N{~;ha+)-T+5$J*tPm0J(Y?bVHJJ26r!>p<%fJH+JS0G}=9cBBZph5j
z`deTU|IQZrhI4+F4?V{9g|{YEvxH3kE|kE9YZWoA9G8IVF$WU|#y2SR6PM`|&L5%v
z?a4(LIK81D%|77D!nZIJLZ7Mhd0c$~^I}-r`Ys2_dT8YGQ;PYSO`NToD(RuUMo!1K
zos8$bcpOi`=u{CjuS~+ZGt;ptmb<`Um*?mX@A#JVNc<+Jk1#?ej&;LP3y7>3{!4D^
zVRLOPAdZF>!;XB3z@NR}nDhZWDZQ<YV^)xzJJD8k{Vdh(Gm+~ozPE$CH`(ByOAEv(
z5@kECBCcv=J&!nn80q}r4Ag@od$#2VPMv20Pu>SY?7SSVhal<!-%4t4Qm%DEo$A>@
zkffLuii0P$zA!#;CwQ8!ss|R8&CUF7$W24RdAg`iNZ$zqQ>4;T(4LXr+mPJ}GJz<+
zOVb0WKiWuimOWap)z4YiCR+!!qI~k(6!DJ{oVEvWVSdr!AjDFha8VlvFGIo#j5}j`
zA$Vbo67P;P^Ct?$fVH^A)ayl3dFJhf&hI&<(V6+>TkZM@q(ITSZT4e8w&W0-f=D;!
ze7Id@W$Fh3i|A!8BmYTJP`J|2^@=YBsc`FhuJ%iyJ%!u1G^$PA=+wrN66a|$Q`Irm
z$n{<k)ruyEnHgDzc1)V}x19o4Md$oCyF3yIwSFimgy2->4-Lr}5j19}{jX;-vQHd*
z;CQj{gw|T;R?+n!IH+#Bq5M4~Q3`b^@Ih}o4n$bT3Hqc!anbVK(AA{0_}QrY0Cycw
z+`)n<LnqT+{2k>Mf??Cv(+t%3z665LY}=k9-EFi>3O%O0Vz>J)ZZnFAg^P!xGjnD6
zB-O7EyEdxg09W|{kxnx~LRktNn3iyDvASZ{46<RM#|LrL8#02Ny2N&haVS`ujPt<{
z^$c7L!Ul7MG9@p$V`v(NZk)bVvQZLO6x%^(kxTy-`$4Z?9~BRje`bjs6-!8-AsoL!
z_)YS8XPMYCNFCXoy47Qy!k_6`yrDH{6a9(+bTWV>^<a&B^c{xyiYVyl7t(*(0<T*7
z_^nu1Z#_tG8Bq3XPM%$9Q`&*<O06FnLkQ%vA<?k<g_i48;R?qR`03}LR#j^y^9V`J
z_}qotVQh6j&w4;+buHCCI+KD|M|<N9*~0!QrmdQh`rA-n!b&~#h|I>4Y>;x`JSQuE
zEn8`p=1no9s2DAo8usksWy^$+n@Onr8DHU|c^gX()vAL_V`?R2=6eH;Ub+9aEsuF(
zKmG8{)%OCDoe_h9xP+?uDngiJdQ~LvD9(J#f#y~%t5GD8Ji{Uc^XBb>=-Gkd1-kZ0
zvz)neXUwT_Fiw75iPGA$uW6AdW>KcGOkJlISEeq0LF68emQY7OI=>_Ldd&JBCJa~B
zS7u=+gsW7~x{luK)0L6z<FhD?YAi_13F4~{-(&HLJCo0}c1gN4)8ROK8H5qE`4}>B
zK!oUB6zdN3;VhVT6ss94=0Ta}2s{uq^yD6|%!rNS&$sIVw?Ev~E%#GVq||l^Y&hXy
z_p&$mJ@Z9qMi*Ids?g9LliA0^IBhU)Ah~p#NGR1j;sh%S$qc=cmDslHNzi)6!1w?O
z{S&yx1|GDJA70%BW<sTR<Gl+rKz?Xna*o(*jf2bLrFuQ{ARg%B&Tlk1V13dJNtK?6
z0TA=VyqH~Zl7w=Ru!YxCOw(7R346)oE4*i`teybN&aN9Z+F87{%uER^aaK$JDeQjQ
zgaU_6-V}<(T6B2x8_*wCMl|fs>&`ObIFQm94p_iOVSy|+O_YlWQn-ARB$yRKUNGR+
zE~`coasa<Qi1nz~$F}Jj&NQAam~v4Qi(NfmH=DmB=Uk!sM?B=Bkt4glEXmIZ?FAJP
z8(j{iqBt61^>IuT2XMIgsoW1<tRGtwqh(OAUs<%)lGRq{hm|%gB}#-5c$jH>o~fa5
zaUs)iC`?=9VYf}-Lb1(&zSV*sdgD!PgV5$a5W8trbG2w&Hpe^PAi1+|h9xw$FD8R5
z)wmuCMN6-Ou)|(79h<ogSaSiMz*Ap+e?sr^(g9P?Zcf)um5e-6^9)W<zYC-MDWDAa
zCjiH`Ma<5zOKstu?%WaQ3y2y@<_}#XmV~eXNCG&b0sJINGHl__3m$c<9MCK$)S{);
zF>bNePgnNUbH~wm8qwVi4Wrt`qA}r=Ct5`Bs|oA&*fi4W7)iwoy<c(W4YxrCp@Jdo
zrNqN%j<$8<KFDgUTvn1zf&KZHfZyf-O&}M?rW(6Xf7hb06t?&xyFSW7Vh5B!n&Gxd
zFRBvFvQ)szDtda4`_9LHvUk8u`JoZ55lSn}{opzwZ~W|4FN*eHq#i=r?h}$;0e5_1
zdc!6nr=Ffb;7Mvor2e3pT#;|+jWu7N)7C5<SS+T!5eebcPRAexrWYgWeJ^`#x;?5S
zWz{Qb_zHOsmduG|H_LuED>7pfF6F{9bKeR+FkP)(oVRxam*F!;WS)M7cH2yw7LS_3
z5oFrD(q)aOTZGT5g+QB#heVp|D7%6MyqI+{7DxK$qo+Z`({S!$(L;LMcN6lZ$0cdr
zAn&#}9X85%%6j-&9qdcwnC4HAo4jW0=UeRY(=$HNMQ-jj$mPMdk)2S5_9S5o;Vx@n
zVOh$X_ViDjZa`0|`<}bWiuc~3)%Dj+#x<HpyKt91jyYlP;y^>%wk8e~LY7o07NPoI
z^n#}w2JxNLw!AY5q4pyw+zO-6-^D_36SH^m%ZJl>;iFKthUo~NtCi8JgfkeRO4xZ-
z$%2_y_WDk764a}&aVvOvUjd;Z4m+HB$II$=Vp?7EXUyFbE`pSBWSbQBec-K7tb4dx
z{_XocQ4hy~*5N#-g3u{O=4<vND*AGIKUcu`(S0}Aev4s=x=c^=<3rf>$LyS<xvoi<
z7nBLU@P56@BY*fgcsB;|3|iBRfl54lOCe(hm`eug7eSo8i%(<~f9L<anV`3XkHJv_
zcut>-{h7DJhY*P!N_<sDymJF-zIwLCj#G^mL~dNhJXww~+iW_DjJXYaGyt4O+>M;J
zbnF7|S4FhgeY=qY`Is>0YYnea;zY}yiM`}aPnCyG8@!C}WT5P>oiuJQ7dFW<O{zwS
zA^Q=H8yoDrI}FC-<-Ip1xp0&^?s!I0Pxq5XE?W`c9?kBXZ1Gg6>lXU6F}x!DH2eFS
z{w%k|h`L-uA`oO>ZP0?0HNtTT(I@9g+2q-`2l2yW<=JM0>X|wP=T65aw&AS-%h{+`
zj{4-l2pl!aU7>d;FuGsKX_CnNPH47fEh|<%?Qo~RJh%?5>9AwEP27FY-|VYSs}!q+
z!)^fDlu;YQ9<TIVxSf{66=kqfwL4nSFKp<l{^yR|c1f82X~26!K2VKcxoTH_z_kYR
z+9v@9XEEQGXaymRMk~CT#gnyD1`7N1J;RCa*3|S{(Xsx7C|;fd=oA)gcfvm4S3O<v
znLxAn_fJ1uPs027^xeXH0ilDAXPfU_$IjjXqZ_PrWC$hiMhhjONrECOqO-^>GSw;4
zY>T|Q7#B*vIM=uUfUwaX9ibh!!S}J~(x|agCGSAdsV=Jhin#MQ`@@a89#`+MjT=fv
z4k%gL7|SQPI%ua?)<#A)*aOTZ9!;a2vZ3G1xS+eNh3%F^inlKQgI8`<$A02b0#~%b
z1Qb5WyFvJEK6mRkK*%EH5K|tk2xqY+oe<Q3xqf21r7m5B7o6`!?4MX5jkFn+FDAE1
zklL4$SD|Ne%b|Dhm2(7CVkl9%;MvM8CgohYuCJ{|XP^638;ABPBq(^`dxy0Mxua6#
zJp_y=AW?Nf<&HAzm;;-Vs)tT<xavB;+spahk2T;pIKal|IlK7oTH+`ne`DjX@*Jsk
z)_}0T_%WXeicWli^NN3HtZVxX2Vim(4a8PYBEy@lWCNb4HfjYA6?$uGYrVtcRl^V&
zB_(PvR>eQa8xQpTwAc`NR$3^J8b}G6-oZk?b-99gc(BKeZfMFnUCo7C*s=xxbhk9M
z96f7PUXYAlKH9#cIIM}2iB&kihVo!%!%d%2<O_waVtQ<?nb~%~=Wyn%)eZD*Yi)6%
zPH6P~wc-yLcDv^F$FFV-g?0E%^;32*O9Q%MRtA?D$C3s84vE)V;7#hY=P7gs_==f5
z?%Zw0=}GrW(__m=9$-LDcC4B9Lnf#hio{RuR4h8Y;FC=RQzVR!B`!>oe?;p@=g}03
z1u7S5;Y!^5L(Xe<%hdc@O$anSh2nWXvZ)_gv;;PK@($doBaqq$q&nbZX+@M~<XuUc
zDFXfoMs7UI+`nPZu6q<X0u33mSX=e^XtKRh&>g9;VxJ5p(rLp3#v?_*J$6;EZJP)^
zYcJ*qr+7AWA$z7r3=Ivow#wxfX$9;0^Jq9Z2h7~&H>a?tvC}4LYDw2DB2tfk07xjD
zZQI=3qc{o3HF!s}m=f%!w=NtJIJ<u@AVOIXpcc#pSgi2}zYO;OW?=#CXb<@4sEq6+
z8c^weoEDvN{`s_>P9Bc`XCO3a2uL{$Amp#E0vPG@+M*b#xD2AbX%W$%=3Sr0$wSd;
zhm~aNyTT2#<p6RgGWnXoOJ&MKTuZr%t_|2`4^p6_oy2huo9Hs=I9+I8m?*=^FF3xc
z7gKVdz7y41i*O8td<U268m0^!Jsr?_lP%P;9_VB{_7^xxoDt+0KE~(_M!s@WRxF{G
zE*|n#N4=3zWvXYQtU#5XbPi~d^rt%<NPb?`JRjL3@K&)pBg_?L+EpaTUiyLFU{1tu
zVVsez>JKJwBwv<@Y_1!xVZ<BIJ|ou<q%EhnaPCG`reJ)8B|CoDChNVKI3fgnSD2$`
zhcAlSqpppbDFbZCnnFI3S!f28kjbuoU1KP~$_jTnE`{uZ@qN+&M=W$oH;59zHffy(
z5vFj+BZb|E^nkV3ZXW9pxV3{**H8+mIS*6D)`)F%ui@$Shuu__naG*=F8BtelXTu2
z``BI;0EsRU7;3kr$isEhub|8cg4s4u3s}w8V)Cn5u@I}IocBU_#G}WB;2Q<*Yeo{|
z^4~cTM4-=1B3a8}-Dd^<u%;wZ9`MPx1IwQxjZfEYA!s=L#kCUTFnBngzg$ngR`#MN
zTxFij9ww6f-f4rcp>+Dl6WQ5uZrr7#*>9^!TWyEY9Qz|-dLk_9>`Ap+<E|56PXf+Z
zi}&d2Z2$nUo*be~@G>{S3IYHIAH%p<&HeyBXZ1^=d=SX_7t9lgL{9K9(7qNxG~ot?
zX`(*e&nErPZRFoo^bQu=9(w8CiCR&bm`?gY<fnD{-%{+wve_23AJ3h2wI`OUzusR{
zDew)BC9NLcznhRq!B=?PNCm_6{!jO!>84Q({7>J)mw1N^RPcXm-vZ>PbeAo~;(^in
zgA{UBr5DZ}?bmnLz}ZdygH(+&hR_h!b;>Aq#sMAc94Rut_4UBFK*b9&JM%&lITC^U
zuv>CYlSW*ICUnY^m$07i0-Ny~wr{&~V=FIbH=dD^w5LqxyzaT(q^Z)faUf@CjKMa=
zy_Q`3@0Kb%0nQ}b`%)jAwJfXoDze=I;hu#7H{t>^gV=JL)H4Q#%T}2dTjq7WIhGb1
z`;^Gg2oHWAT$DNH(;PW@={`HazSJoDl;4y~fhgg$M#dpIG6%)XxcEyJYUDjMnZ-z_
z_IF=Pzv|<qh3l2m<O82uR9M&Mdzn*T>u8fl($h$o$~XKO!m@Bj<+Z#+CHz424Cj}&
z8nS8tfs_uakK`j;)1;PhGOh065a8}q94{)|DE9lBRgl6G)fVQq)tFdUKS&Ob&FEF$
zs)a=|+}r8K=@xrF##B6_gopGaRcc%hy(t;#1jrl2Ab+aEG{S+l+I(YT$CG5D?&Kv>
zHe+BrX1?~uRhV4&-F%&b>8IvrS9Hd#`lcyfRmvA0X3K<ADf?&#g1^R(PVBSA*@cVN
zoNWM)bB-vsM5j&PAGa}}HGMW&1;v#LMUvYb3YwT}A%<vpt*XJQ{E_bqi#1(IOPZ2N
zwFk-|A{UDtpqIaTjmOX*g69}o^sqX#VM}i_QY{!-D!ArQjtY=$r?Q#n4clU^x3j`_
z3cR{V_?q>n4yG5~TdCVuKu-{2cke0|s?DTkJ0rgO*<|3#B>UQkf?StE5fP;ZLS?a>
zS(@DsB4m*E0pdsqfmSlf9%=crmE_Yo=p&gx_`&k4i_3t9r#vBY7Ke>dz!g{N^-o9T
zB!t|v(O?7Zpal=D!Do4c(&(|pZ}?=SL8$J9MI#}h)<5ZOU-2|L)XyOv^*$m3o0X2z
zD{8Gs6TmawB42&z8LoaM0CVjPWnYA|AWg5xC;$eGOumxnE?I)zCHTnsxhxk6Q1Cic
z2pCua+#Rm%EGgyRjbK8pz&0GcZ5aF&#-yI^40}Q8R#4T*e_6!u?4d)A=y<%l+2fQi
zDRhzhOt9f+++`@YuGr`-`qTHjILIN{2O&fpwGK2uGrtH_L2dY}-QcARL|(_bfE7lg
zJNz2z?9^I!ttVBn#oB{oiBc-Di0+I>G!?Qqzd%d0jyt|TvGTqgE(%e87nBq<W#bK>
zs1jN}7q(7*%quH>jkl@2yB*^SoMg<O-e;2H>U~6s(@SiA$E`rIa?Pu~86OR8>6+WZ
zxe{l;HzSM0H!Nv-U!B+dT`b}8UQGKo$94Qo25kF=t}_$BUXjD(sUTC?oqyo{mdWYx
zyC#}Z08?zBa;r5m!sG$O(ZXqM@=#2~Q!^6Ekrt}0!8@kr?Rl|-n7iNgdq|X1Z5r%^
zIG-(SoGvxV7nGfGZomO|SO=pWM2pn^6E<h0-1h+VH$MOIH^WYY(z=O37J`v3bH@@Q
za!}d*%bobsW3xw*J|`)dAK!Tq&}FVK4kt6azVMZ-6Z*^%Py`H^+(Qhd*(@8t?dy^$
z<Hd#_A+}mR_oI`wncDKCbUj@jac7s8xDc2sX0=H`GG6&VM1E>2@pfQwDy_r2j~prv
z1k#;Sr|Fn4vyqUW{RnWTjJpnc-ki>+g;x1t^mJ#c#RZAPvf`W>>)J2NIWJFoq%3m&
zR9R2*fPMe-wSD4cc42atw?-&>tP!>^Ye>hYVvY=l(cNn2`trtmiuy(VhMxRcehUqQ
zd8U$fiE0qdbKGJ_^1i75P+rBjZ`+pKb(AH$@duQ;&*j3ROTAoIUl^xjR_q|sl<|x+
zY9a_C3iYm#Vkjsd_$xtp@=ERer0mv%gPUiLPU}lz12a#R-M%M(Pao3MbyU-5d<l+`
zSV@#w_{~^d2OdxT377giTM{SJAOmY!PdTG>8#qSKOLlL30yNic=rp%DO?*OV-<m#y
z@{9`LBfwrZ&jA)#h;(0WcGCZPOwYI;)!UsMK<M$gda#~6fQ6PWJT+fyfx5V)+5Hs_
zf=Qd$71$?S@YU~fMNTL#&f0;m6Wc~MK<zE2xabsP=a}Zh_8Op4ruiW&ST`YPckTZ9
zAy5CgW-ty~PWlLkbk3)!B~i-P%p#Z%XN!$jt|#^>u(+I?`1VsxsbscrHLNwP9e}9e
zZ{HzUuNGZ72yvCe++wvkOeRqppT+g@=6$Z~gpRbiIAtct7P}<m#wt)OCQS(P-8Om0
zxq?LHmW-8{9Tm;}5tK$N4CMC?kzmAFsbJP-Sz1<Ab$ofV!f|B&BbO)cR8`B9+LEn0
zaZT-?J{a*vt!1@Th2V)ZBa6*3id21f+Oxi0y>|$Bw;dL?M(g$UcC4jj^*4V!b;QE!
z^{7v=99<g3#iY%KdUOUNBL)8P6~fKoee#Zy*Y!&$&LjIT4WvKjqH;#6)134`@~R_T
z{5diw9WyoMkk8cth!{WG^iF%hyR#4r_4*kDT}hRxuR*3j1b48|hG~$>-P^&lz}8?M
z?9`@|K=PU~Zlbn2zWvz<b6e<w2x%!aaV@;<v@G4DW4Y84;RF!yYL{>CaR25oL8OsG
zcc5W;i6$$DDFNo>ka{|rQx?jep)Bn%TUjO&I@dI-XA_wcDjUtU!$V>xis+5;Dv|tt
zz0{*>i-67Ren9TD+^fR{*%Tbv;B)kn5e}(Ea{RL=FmX{pi89a=L1FiOeMi*j&-$ev
z6T<;o4vcq*K~ND?8BiH`njD%33^5ANUkbEWEF$+UVxZ_aWyPVOmlFZ2@rKT}WGg)!
zneflSlwp!@2W0JFl73}91S90DTSm*K=h_v-^$fz3Ki(tbmfV+x(fq#losH?1n28$L
z1Vdzr%=mXn+0$!KeyGZ1Gw*%zfeF^6S|Y>Xu2%n*epG{=_+?@1B`C_b1M%&9YWl1e
z2?abM_7Q}vO_q3Yzsx&(eHF2#14dyU1LLH`Pa2M+E3$FyuM{MRmU~f-=T#UM{h`zy
zs3{68O_%%G+y~z9+x?inv3pa)Xo=i~Wk+APkIt(aQ|wJG&fAK>UBTErDpKjvwgyWu
z?7k*1!FauLzqHKY)WAX8i_+M;SL1DG_RbSAi&$ou^$jOZ$6X(5_%$LB#Fks`m-U(7
z=i!P`$2uF(=F^N66^9^ctzU%<sE1@WGmq^n`upMEZRXIjDc)z<;=;r)JCIVqYzZJK
zF07lE#MUBRMEvOb(V8nxKls&U<KXT|$-6n4*K7Uc1th7K4$|AGg#GY3!K1EXvf#@A
zF=4^mjuVe?)0vfoVcr4biRu{CGYIG-{<Xg1nAS>O*I`rkH>TH#f-}*6*iq=Tfbr`r
z-b9Qi8+AeAA3hl>ZK0DL#^S|ht}*cVNi*x)M_vY&+rdqs4zHVz5tsEG19v%&(G=L1
zcYC6ftv)>(0K1x%-Os5r(Lhr8hx!Z|eTOM)Z!rf{4A4!{<#br;3St3oLVZw><)j+P
z_0w1U_*|DCoql~l7Emmw)Y8{W_k$)885Q(OX9ulo09iww5(C`lVU`aGY`nem&ihch
z8@wk}nucqab`;W5NWbjxt%%e4%9NBD{}<`mCJc!69hc6?@b@j^cf+<y25nc*>)$ZH
z;iM6(l3$YC4z@$(7t2DtQ+C~}Ec0D^u%fSTz2I0qrSs~v(6Kl}LQaFt&Nqydr1=!F
zx_fZcD<c+y3ewz%0f=_{+|9BVW2fHXpgx=z+Ds84k(e>|xeYRMBNQNCufQMkqz?PB
zL7gf^0ryj#kp#?SotjuX&+ls#m>sI*Wf&=RLh_0;hTo~MI%M}`r%su9P<RZ0P}0*6
zh7Tw%iypFd@=Ih<(`zXrz{=TiP#3X@JzE`-STB5GHP^m6a_Uj$l}IdtetD!9=gE;K
z7s&cUD1tXKsv$fK`50T=ki1gFm*0tzSNw}g@qS2wgdcoK`EEwXEM8Dp;<7DVX2v0;
zNeeNSGKE-iwH*l$S0L0)(EA0k<Kb9vXq@(w0$)yd@8aGOR;e8(Dt`<^RQ>t8-Ct*k
zW}>mt`<W~ztdcoSCG(=Z-Oy!1puf=^*(pC7t+r5c1841qei8cWfUTx1@g}8T=?&#n
z@z~m8tv&!XP_;G&v)-i|Dwck3MVr@~4j#xbFw~{`idCdf4CV{FrN3X9M3Fu}m69K~
zSEZ*2Omu<k`GrBG?t_jUaP8C;mss(wd+gT2<;UQ);k!ttm1#j;cKOZ-!+8IeO$o|K
zzIg1vj=TA@*Fh9fU-0?{IeYpz9mJzRL=mmp3OVumiQ}f8+>F~DTOa<U+m*@l>+kc(
z-xr&LdYcOny>qiCN+3$4MsftXZH5-2{0R+WLauY%!6ei2F`cghUeCLqWAQ&wV%HZW
zM&<E7m@DFu6UcECs&TDNzcz@V7ZHK5;7Hj+#7o3V4CEaU9SZcwBRlyJ)1Fd76LCt{
zRuyRSWp|INkkzn7``IVRg1_HEfdcdK)_6oF{mp(mIbC|-yFb4XN`0p)oIn~{?6W8}
zRm%^8k~*Xx>3JT&f2+2lvkp1mn{^^sn>F&9EXS<Bg8h~WtsYBjRMBd&zrBM%@Zuj5
zq}a4aXYT@v{!9v>+<FtwP-~Rz*pm;sV5$vje7}UbZcd1BD+i_El$cm8_hGi1q!sM&
zn5j?H%mqk3ka=OCGKaOtWj+Y_`i*vbfV<i;fudai0A8z10Ht*Yz_xcU_y`_A*l`6?
zFa%H_uam;vi`&=vrx*p*`qK&VkNK+;0;0gbZ`W(HT?k>yF3u(O8{)nevjyq`+stg;
z21+@cG+S1wlloirpud-wkKAwYk#>&}MmteT7p3{IpC{Q}b?*W(X;G=DcfDS)(pGAr
zfryDAr0T~SB1CX|qhj@PAlD)%Tr=$Y?tbSUW%%Uu=Q%v-C8Qi3R4qV{c&auaq3jpq
z8nVFVz-S)A&@Ya&yGCc)1JB9#@Di&cy&F-QuJ5qKl(|?E^yym3XFrcdD}8-8FM+Xg
z(1jR8!e3Cup;0y*8(*IGy7W~c0inWzba8jHQdZU~Fo-{ge#+M72V+Qpn+3tJ=)^65
z=Js=*zFRO>gBHlnRDOSw2h2wmJNPVpSf_Ju%zdR(pVlLQDI{2HjROAc2Ky{9gC50L
z27g$F!8mN8A$(UTg9R#1HrhjAOOXJx{8=&C+?#OHNTqulF1BOV6TS&IP-4-R7@yEI
zS`R+&kNo~9<kZKc?wFb6G3Z3~ctk9VQy0f6#8KdoUfjs!qB(b-gg8*i7~&M-glpW}
zW08_mPy3nz$_rsSuF{w8$vfbS+gySNnLF;iBv;ZM%*A9obyKCF(S&}(Bl`T*BIiEL
zPlAbbPwg`AEe<~pP+kW>?`LL6?~dAe4iC3G^PU7~aZKwu6q)KdW;#hES$X*IRQ@2B
z{3gIg^RyTAvFwGWt)^nj8xLV**$Hz)N7IQ=Dyleks37vQ39sz|3L(=v+j+n)nJ$OB
z1Nv7%Vw$=cnzsdT9;zQ+a1@Q{=vy!3|Fvewuwp9WG64Wc;KVx=pa%bo+Zzy~rOiDF
zuBOhJL$-((-#>y8_=#q0%kjN!<jodB%$e9ks_**2*CDHkodwPIZ#hGIFY{q`f5X4N
zWwU<0+!|vfcn;o_|Mk)KNmP{PT51B#4m)=n?r}ZCtfMJvels2VT{74L?Q_Yt3+S!Y
zo0beBVh?ibeWZTa17%{{z8x4(#g~dACN8O%h5Bk^<=v{q@z~%Yuxs)*GDJIJS7WOY
zyx6~ifdj}x1F^>9ZgUxlhhPOSs>y-XguQ>x+6x&wGzSH^U$mZmgAL4Wi-Vk(x}T?W
z$)jn2?B7HA;GZ}Y6Ik(IBP0q`IAz$aXtP~@G!F`2(75<&)a`oS#F{az_zq;HO;I2S
z+FUK_cv+Df7yLfYAEi!9K_e>+d7LX1vl`Sh(5h@q<#9<IC743$-}8hVn2J12%GdSD
z!|@%7rr4{5hnWpiT@vO9Bk4KoMzp!7^DQDscs3-Kg?#-Pqu}~$j+zEXy*J6`E|{pr
zown~w3Q-$a2Hf3hrBF(x4e+)mD~w<%ZyAwB8kH(ulnvDeIfU^FdgICtG@Fl18wt<<
z2BVPpW;jyS;ma|FgApEf=`*UcoLPdbbF@X%*%=A)nRY6CS6Phw+>4I?dvJV-m#Mzw
z_gtf66ZD6IRb`z^FgFO5?&pa3uF>xYZ+!DE4oJt1pIS9u@$Em4ov2G*b+c8Us36sH
z!neOz%)a7IL{02Po9dSqxrMs!Fw<~zd{NIHEscEwcTKN)HffVV5UhuTgs5;u5ZISw
zv8zr@%_gpjTT_%GD%fbO%0|x|RRMoE_l4J!^^_iegqJ>KB)k?TPdr#zA~HF+h60i}
z)eP~`0$*!|wDjVkO64Zlkx!(c{nQQ*nd_$xRwFw&hB7Mr<{xM|D2lMwKNpy@AJ_LO
z#0juiZ6f8#jAB_UlsBfqv2+FvacbPE{Mgi{C^V(fqIcwt-A1;{rLQi}%mI)$QGXl)
zjzP21R<$@(fkH{I>I5e8-z=6&uuk`R*<l)N(^MhWT~B1)ZRp&zue=Qn%eT5Qa$2gg
zrw!Z#3HDM5-0%%^)xd;`47&0`vWCYAJ;L&DU}Z^4+iL9l`xo}2Vr<3gH{N8l9Glnf
zw2^(nro`fL$+92wsm}|XAc3seVPO$a>9nyYTx6o63Y95&1>&`BY53_qqNSxg*{9eH
zYQ=HhYCx1`b|{UDZm!Pb{fR9O-&~jz-ZuIhnTLxq(-mS9zF++hKokZ3t1X5R%N)Bq
zqLQX2n+?UbYY+QqV}DuvTH)Nzk17@Hwm5C<jth-2f7J>;0iy+JAMq0TYqMLxY-dp7
zCd-P~=|Ykh4p#bWfm&+%h90N^iqf!K<P4dNI-djj86vOCDl26L`g={UQS)*E-fEKb
zYYgiOLixi<3lbV#3>-TuA<5zoKF6a6lSn@m3vLPOq53CUgw5rU_DGFo2V*BRX1h0R
zxxx_F^C4&hpi-3=)n}j%LM?6T+qmKtV_rPNZL_eo4_I*V&$vsl?S=CvBMpA|7~x&}
z<}7tL59$4}_M!4P^N}~J0|TKCIKNOV-5%_Y^&l69LD>mJ&ii#ngNL1`Tz8%_I5~FQ
zkzEPKo_cI*{&DnSe{+~_4EfiWA@)O8fjfIdY5t;VR9xjb8xsOT?Z|KL&<R#Jc<B4#
z;&X3uB4G_FQmALJJip7*>Fm|s>WL0FE}FYshDL`?)75k%)CKU!lWAlkONj2~Lkw%~
z;WZs_QDCadP`)Bo9;=;viyJ{Dryo8-Q@lPpi8Wk2Ulu4C05jo>_b!Pn>5^zr5^{m_
zCJIZg(-g<YvNMC#YWm?K9M<3tGsvR-nY-)6%MrPXus=<#0Nxmp-`d<g3|`hvVc-4D
zxU&Aw9Pr%7CnpL?Ka)d0Har2tk)CW)T+Ez?9j2ctM5eS}mw7TBpl=a|$03YCK*2rQ
z5YcY7uh{rO2J@}nT?SB_J0Oiw;`#0*^|WKptb5<*FCf`@h1{}pf_{`;;>+vv1z_CE
z^zj+TAcE9QMFKq$PS>_@)1vIGk?tp-WK)dkAb1jfUuW*8HPS$V&Gt#{O^MBB8<nLk
z7$RkZ9h%whT=*5hvI;#e_Rki8fm;EJExFV#c-UuxRT*~F`4_%0NJ*HFQvm%Ia3E%Y
zd5(S6b?MG(;d97&VJ*QX>=pTUpE5N^YoTD+iSkNF%0A+xE)JCV<#?muf!(qE_rxa+
z)QSVB7~q~{WPwPs=_Z2{L2(mE*$E{^rC*R2*A{gP+-5AJLg&4}|6~O7iG<oy-s~>h
zKkJ|ofd_5O`+U7)pI}}F<gvl&w;UFOX8qrExy%W-pT@cB$=g$`I$Yyb!X*5trAuzr
zDRK$_RDGLL?R7weZt%5vW+jml%5y`GnSr{)4-0U8Ql=-(cVlhX3TpC3-o*naa_W{f
zvlcoQd#KRwa;8>&V2E}F^V784QK|W4Z7+`nJ1(g>C~HcYp7XK?s%jLRAuCy%4Yv=2
ztL+3^Q`nY28m8qDGgBdLweNrt$Q(C@5u^o(_d#N;UH+v2ER5ErB^jm9*qXwL@Ogzv
zR9#S{#UM*-@7R}*xS%wl)U;IZ<z4y{jCB=P{6bqnRtn7hNivDOJvgRHSld}quh|W@
z0skDIzInziSJ`f8@p2LEc61WFZ>t;)4|Go9^8)c(OpqeRT(*;sLh$%Iac?!Fn3;)v
zqvzA!BT!sTfk_C)8b2FFiJ${eQxT%a?5hM9)hXNQ3OH>x_<1*1D9nYM$wq{EQj~q1
z&!UVn;*Yi+P*ie8-dJ-0nLX1x6~Dkzp{9|oSF0aP5E9AwV%=VZl@63kgqs=i-q$d5
zX-J}P0KLO*>thkT+vI3_Fpw2-%(yZ?clpPENcO~yezdW`E^Y)qD*3;i^g1TYdWmDF
z&*S+`$3i9e7OeLnc-h@rg{FEaSX=xyy2*Av{<XiM@@wnJq&z_r`9k3;iJuUj=Y%$h
z12}%yJ+Q$GYxW}+>;@I#l`HLNip-|kCh`W0=^+$s;UVA&f*q_RIRCf)?`!x+%9D|*
zo`@~J^P$Ia!>=-(9!kN%sGE0pwfpphHnw^clqwLpKpi*0`@F2e%AsaGx{yrgxUroX
zeO|FBe4Geg+KfJo1P*wdl5O^ji;r#1#JbeIxo%@$^G9!Rwku+=0}x+{5&c_4)c_u}
zP{NC+;M}8N_*a=PFtp&@Jaxi|VmnqtXn5#7U0vv&Z!S_;qPWn~K|7;wMCiLlqNRJ~
zVfuQRFO@f@znD)vJvqP9S5kk0P2y9o6Y{xz*}_*omLi8~^qISt_<VUeQJ$Bo>vW0l
zoj&!srxdw0{$pZdf_!lT_kL2m^7Q!(F*1AdM<eRdjmj8Ax<lN->f~y_PtQ_~-rYI`
z^<{xW>rUzn^^E{{ko1>KZaDTKqpWNb7$<5&QYs$||FlHTM-EC$#ZezW?z}hg_RE}|
zJ?0;xmN!}9Ds0-~qiHngg>?hyqN`7v`UVxSMcLB(v@c+Y^^U3nDgDH{&GiX;Gm`Di
z%7t$na5fHHOca1$Tx?6>Rt+hw4>*yN85e~L+eLO;+TZ)evm1taO9-}40;`K%1(z;p
zqK}kEzs4VS%!rW@k3y-;`E&aMs7U;$_DhUI?e0Z19Y3Hp8Cs1EJc9*#@0a3&bK{@x
z+CVSxE1Yg~9nA2(doD_67siBzrj++*G7&atlP_r9HK#jI6wB?FFOGl~X~2;cnJLd1
z5RNfX6y+K(LF-$d#doVE^I@omgshN>KTBzZTR)R>T+1sA?&F8rb@@0!M+g)U;ci!c
zOb(RG9v|>-n6L~fYb$&83_NH-u@MD|0LffzDgaP)f^3KReX5@#tvfw|8BsX^(Q<h6
z<`Vny@X9*h>Q=`AZs?SzO3WVWRJA7vAhazA-{1s)C$0`*IY$ZysauO1h2n)pc#BIG
zNNn@=CEQnHHD~jjSnZF*)qRbN8i=B4o##M3*r>o`oH!BWFXnqjeQp<=)vRrDs&E#(
z*@V@5c49`MU*ID~!#ZdjIVj~ABTo>Vtu*0Y_@*Nvn?ITT6Yp+!eJu#+m*FI+G0CYc
zP#*1?{J_6_0s$Pv?1I*v&hU&oAHR_8-10Lg`&MOVNb1y{$)Z&CN;%^g6H-+azC&(w
z%hX^QUmORN#g13E3<H@G)=%<b4WwQXP}kY~BS4(V%=g8|J4?f}iM9k%_&a-^UrXAG
zszu?kcbXE4w+ZB}W=S<Y%Ryp1bTzYr#2U!y103)pZ)+!%KfekOa_!Hx2QzEibOmn7
zo%aGI&a4;rnB4f{$Kz#LYZ-`7Ab+@BJ-Vf;Rr~q;tP7Uk{IU2VcljzsV8>s5fumAa
zEw<_|h>|Q_#5B%^6JKYOEL9m0pjzxhJQ?G%V`J+gj7d$y-il_N>^r<sF{Yav55V=F
zh~9z!RIP#j$r^$4*-jc4OrUh4HhV1^x?OvFh|M~gdDb3%!GuRUAwjgnSvi`@HQ*wY
z0)e<$Rw;A`Jz=jc2Bwi;R3~GAKs0(wVtC`N%*Tm#OGYywaLb!Ptz|hjQkYlZ&*{<v
z*5};^Oy@_*{I04<bTROxP#zAL&jp8)t-u-M0pmrr#d)%L(vEJ0B}duUDA7_))lT?M
zuh*PK-ZcH{K@*^=(<!VcM7ib${hTtB9-^!lGr~#Bfz_z%Zthte=m|Ujk}<Vvv+~0|
zSupIQ<yDVSZp|EAWOsk%C7UI3AbQThyVK$w`@=DsmI@!IAFcKo^6hQ~UfVbxtL6l>
z%J7l7GMK9E03S23tTF%pwD;CQS$<u^_C+_+-JObbw<3ao(kTc?Nq2V%NSAb%fONNj
zlypc4N(#~-CGc|V{meJ#<L~47ZpZoN@%3c*XU|-J9kY(L*WPPg`wFm8w7Pg2uTj0R
zPt|>klNo}o-M^J4an<U<VdhyGY-uQg|H$lE>y9A9sv+MA`#i7}YPWg;hE+fm-7Fgt
z35h`VQG((t_LaNYW-%XreD!OkBT)Iskl6or%W_{9=fk=+;S0;YSar=QpA?!iBVB$}
z`BVBPS9$ntNnc6hs0)<9aYe(@cj*=P8JU^WYZe7e`8RRhL=9zn$MAD1m6Z}H`I!B7
z-ay~je=t}$+pxwmGiKtkrca`(WsOR;nmj>rUe3dMC>Vc}47CoMLuu`~JRwcKbQt;3
z>nGbmgeJH&yX-TGTCF)VE$e#(H>!lUE>CARiZJ*i2U%zw^ZQ`0E@82ns>?9k(PvLt
zH<<8|B6!q;`vq&sXx>r1@oIY@a>nb=fH)ITyHFqc8YRBZWad`brPgBVEGM->sJ7A*
zJ!TI4A%Db=sW!RTE^O*t@V#l0J1T-+DSVYWXl{{l{14|7*YKzLlS}IfS!F*V4cmNr
zdMBHJjmt51-$imjf}+o8T%!=(+;r><Ma_O02Hm1*JOn*amMdD|&JGij<{*)%=ZcsN
z%-C+LiNsyRz){4^uDkJ^x~?Pl=N-=8xnDL(;`?hX3|8t^td8LI8$1|0Ye&LBcU0;w
zMeyWT*d|eXrk}0`Dd<x--?OY|mKKK?iI$O)J?IwBrF@82$_szkWpiHbva+F3QJ(+r
z>ka4|dO<htUEOYIQ7$k*d;KrI-Dt|?$!nYQUJz)=)u`lPPCO;c&AS?6c)(4wZBE&_
zXH{VFBD3;M>=5JUQ|D%*r2@zSimgloWWoh1{l2j0D-jP!xnMzXr(u=cBe9W1`{vJ=
z+IoF&cJ+w}57o&RViMwnY#h*Z;NBx#jKS24NjcRaI`6m@6embV+HfpioSXErwKh<d
zehg+yBT~>wu3o#Dxq-dGq{p!9aN;)*6omJF!CJp=xz`cPiDc@+jR8qlL6-r6td?RK
zqo;xSRFS=>je5pWCjYJX8%b=7yqo^b@afe>JoK@eP(dgW>GJH2nQ+A^2AnCRo(9%4
z&5oou2U|srAxbprkCa?ANVXKz=UYn@Nh?O<Zk>^r&l-=16)h|1hq}hM-FA>B_9#`M
z#N}Gx{XE|Z8*%ygW_Q7OrsECdWE4s_o-VX4cRSS!$MZ$%=ws%&muS_z3<b^MD_bv9
zE+^~^v^yOiP1~52+jO01YfY<Gc6_RI!&9CL(HiTEq!t-CW*pZKLq>k~noiF~{p<|t
z)tkNb#KGS3SWPx%XlY^OPz|}tSZSim`H8_(T}iYDcdN|W;dnZYUTWWtD>$qAT6}zR
za64^VNnVweCdRUm;N|Fc6cL>g>cw#oXK&Vqgj^^Nyz5uOT^IZ>uWbmL&`Wq^&sROY
zo;Q^2pc6l<=TO;!?ZzQAT;W>^Sp3G9IzXVO3-zMM0?t)JGF6pk*kuK0CS>8Rq7_p~
z=UyVwzdA)GwiCG&0jdNVB(JF9H>azt`94~RiVs<0dm~8iM<75!7js2=X;KZFDter7
z&hzCkNU9q<SQ2O;o6J9CwX<}@48{7&<6)3p-kDJ-)acTxw+dhCNZGsOzG!P-PH!Si
zk;|{jLF|LZ*+QGxZ7^in?*1}>%d1|aCB}F^=RM!cfGjO3;gNVWa?3q)J<4~ArAe&a
z+a#*7GR|}YNpv3l>Ds~_>JL~u1PCr>tDGk0$?1n(_3h-IG+sbf8J;xHy{)ny*nUjh
z{`SO}U?kL(-N;O-z>u>ZyLP7)UxG`>|F)#mwmxE2<=u$Y+fv_D@iQzrOFUM}DL$~z
zK6g)e{Cp(r(y(Et`$?|ftl(LH>kF>R1uVP9Za#&NdPNp;bqrZz)Ee5m%p4a*w#|N6
zQ1~|0dgrWGSLr1S7UmwhwTz5yU%*j!7v979P;RD1jkYCuoZ)d1--e|Dhk_!a@q9^m
zh?~tK;e7$V^zPMH`Dp%+9Lh4K2VKx^-Vs1Yp`hTmdXh$=9($=>XefJ%0Qrh)Jm=>*
zyTA5crl+ETA!GvaWzrF4qij8_wYDmUrCzyiun(68Rh2w^eV7PlJX7Agl37dwydL2P
ziHmw(b#xytDGFCOH$}r-LLyt%wkm~=$|WX}+KS?$0x<HU3CB$hkID+sKTdW~@VPAu
zRp`}`bxBw&`JL*n6zA0MDc^X@Cvq<~m`kFAUrC1_UH~O=4xJz`7eQS7>DLkQcH5Fy
zy`B$EZ{K4<CNyNyp1*e@@*ye%?rG|iki_RQJ5_fcM>#rhAbTWynk~1h)x2@l2=<A2
zADZE6QG;K2AYOoAQ?~RK_Uu_2<-HX5zDq?GD@tCHdB;V2@0ba3s|&9HfquPPVI0*o
zLvcf0mi@$70gi4(t9g0{rl*a<cf5-@HhYk$rTr*cE!T2}yQp$k+&)X7)gGGi$ykVS
z9~S9gjZDs)N(dp|iKaG?KE{X%eTJEX?j-d{O!XbK4!<+g_RgvZ?dKc!1Rkmg2c3&}
z5?2gsx!q1b>{8>w7CU?A4Be3HI~oPk4Sfses{#AFZ0dZN33<t!`<`kQO2fx-%iRg}
z+XI@(PvuonBM)8?zM0N@G}R=T%O3pn;WK!vqI6*_#H-&Q^o!LEPLik>?fa<kp1Z^^
z39H8$Qu4HJ#O8ic@a$WpguKyosTHHAvAEn1hbP3t(_lT}DQ5IOo%syI9IGF+oMNQ9
zY(XOYr<K<v-rqB%Oe7y8L?4iCw^t?G=bzm$^S!6`UiFas{IOikgtT&daKDEF{-U>*
zn<E*V8k>S%y06ELH~X-a3c0Hm$Ki|&ca>uUUm}cB+|i&h5Brqx7%#Os))UV7-aS8x
z(ei;VjiYQ*JZDSgy<s)CN3~vqWb92vNw=b&i$aHNJosWj<m@%ot8~!$E>&CfT!e{Y
zn-I>7PW9zWo^##&N@3<aHf3X7`EWE*t(a1D5l=6fEpP2dd=Y9Iq^=G5p`p+hyj<$H
z=|s-@4dG+i(Ax^fb_q!=FE6$~)Z2$}*L_*7a-!`_`(TC|FO@Psu;8h_=G$zrhOkd5
zJs$8SH~JBBy@jxw4Q30w-|CIRig!Gul;|$LQLr?Ml2jt~oFD9s3eK9*iabXp;LHd|
zp7PLZ`E9puo6LAvII<Ax?T;%~9v(eMF3@NHtjps)<UJYu;Spn?XQo^9ts3l10!B7*
z9BE95LgC24NZK^aDn`0a*6Z8EZykbEc*Vk=-G?q0V=XQfW0X%-u6B<OjC|oJ5pTPj
zpBmQcrgT@CQ8bP&Ee&2E+)o0dtE9az?!)WX5J4P|$QN}{Ee?wzbW<5>=+ZGsee|WB
zol}$FLe6#5Ka<o5M6us$)U<E5m|vUN7(9x29OHcUjCAwW0}4u}s2;NJg*)dZ-?j)d
zpqlQo`h8m&?NoG<7_H6Nx%qynj{|COk9<{i;V#}Ql#4X$aa@mY>3BHMgL*xZkSK;m
zrL3Jk?o|t=LT1vdd^r{)PdGghpoU{mi~c!zi=0`CyXsM(SjdNx5V#Li0g6etY1!Si
z^*r(=o#=ueY9{b|V;Z1`o^)u@?6(A$S5nn)PtPx%hy**J+{RHCGq<{$AuN5=YtXfJ
zN>Jk#Zzx88Ul~c8KJvpG56<<SFC+BW8oZJ?d}*kcCdr@UlNz1;;ObOVRAsh&dBeq=
zqVL$eD6PvAkG<cUC;3#0kAUb|6L<ZWVHTH-rCQtvyi@e&HZ_Zbh3l-zFw>8`Vys9)
zwft{)@$6n~N)Z+44~B*N2Pc=`UrM1MY$PvH3eVs6T?<QNSEe%-Z8koyrOPDHzEk$3
zDhDcyyW4AiBP&-0(z{mHoxxL$_zLv`ml84coTSBy+<ou%@|;TQn{tQ><=K~ypLaQx
zH=h=K!t=c!6aT4MVGL(=W!5umE&oKbR{lPPI=$2Ug0ra)Gn^=kJxg|H^Z-3Ve333s
zuGaB;TzaV<CnRk%ertP;3pQup2U%<D)|&VH@CZk&rJft$YCA1AHg7K06&XC@`Iep9
zy>7_(7;%G$qy0H73j>PZ>}-@G96y7OVQj!ck(-+Jr!OdCdF5q?H=x_=Gqrv99K#ji
zmSO|xk2Yf{B<uVfE=B};2m76hgBf)=0+yUf1t{qb6~e6V@NnuiyerAG4l~(saF}H8
zlD~~<_$2XhP*WvwB8xcjEe&)++v#v^WPylfC1({3M-gNsGBy7abAIcShlvl=%CtJ1
zaFM6`PPnc0ob@b}V;L_Ch&!GHniEWZ`sB*YVh}Sz`E4mQKfNhUZ_Hw0=$-cqJmtD_
z?decDAEiUlQ8MvthstvCBWai?x^m@lD)*De)@kZzv*hnHOoj6szOcReu05<uWBkW-
z@f4B<rfD16=+o>7(dnKX$u~o`rsBd10dFHi`Mh#v?;LlsGr$I&J6hhlB!_(%Q;$*m
zEh`+En#S0UKb&!66n9NykTzD6J;eh(yBLXForPxjeTy`o3+*x@g7~QRVoOhkQ<Otc
zt;bjZEYS#snJCk|PPQFk;O&#p;?pCTo6;MCMA7P~^0h2ZYHJ?FW}{!HWA{p?^pV=L
ztrO4)7=`d{38du5I~wKAvoyPPh7EF21DHvoH?Z2XI%-5y<~ua1+eQ*q*zn0CYTxvH
zWwyYT6_qFB^Uc`H`jqg6g#Y%d8_bn=I3Mk57EMglzbinCUUZFict!0x!R(@Sv(i{%
zMdG1|H7YuR)oRx$X@)VBui)C8&3z%2HSr|j8p#`>2z-q*t&KMh0+;q{7{e4B6a{P;
zw^`@Ok`kF|S{XDCV05hlBUM%thmB-THd1J{HRfXqX4_NyFh=Jcp=>rgu@H;d(r#v&
zgf%VQde~4Dr>P}#t5uwLfSu8O;1h{}y<141pGE*_b{psN`n()69ui_CPb2f%mN+XK
z@$H*-7*)OxnAKZKG1G2{2$;HZ54J{(P(fhd&+^{*HfWMV=aFu9TFEuYdr~dPThGb-
za+Ce2#f~G3)ac%2*KtAb@#RfR-w;c8s;87z{Mcjj`Cs08apJj931^~+%|T`xMN1kj
z?N{*8k_yjmycp}7e)lLoI6IsC0X0sfl?XY_K=mNzJ*d38#}=i}-Gf`H$>+b$$_>j}
zSEj<RM?$N51(&~I6l2yY?|k|Qg{cWKyQPLofwp1tODdEI{%z4O)ndL=%UptX0+Kuk
zm`JKvh0<SlZ>6#tWv72!Zi4USSlO2<*!i|gAErnbEYC#L<|j49_}0)ZBDP*rBekc+
ztS=eC2_08pGZB3?@qPShLxMbRw!Ik@AzI*_Iq7UPbqVZXzMUwM9u+E)l<a)0lnLS6
zx@O4>-bM4RP?bV7LXa2gs}XwXaiM{RJ?UY=)1pvnmST*Uks?N(5{`F>FACC>jN9m2
ztzI8E9OJ4Z&9$e>5T)x9;9I%}U2;DNxm=e|Mclm5c?EG5*k|@0=Qy~_I`l0OB@+Jt
z74|ijlBZ?UTip%Q<VSKDYL&{oN%63?9um9J5dYTUa>7L~Eh@zoiG{&=Dl&Znn})Lq
zfq^amL}!Jgoq7B&j*plPIjC<Kd*A!3qCPE*fhtfDYhg@wy6-1+zHhi}CgFx>cgsKz
z11gp#<dK>x|7nZ&=QmUx7Mj{E?e~}{#NO*s$(^Ev<BVI-ny-D!P&Rw=u2DJ%YVp#X
z{!QY9Uhil3jXWoZ>bP_ai0c~HgD2BB+pI;kO=i<E8q+I8`tP*EqdY0Q-Pg|ZuC9{=
zIlET+vXb!WYdD8vQE1y*2&|E{7e#76)OdL-T{j{uL2)O8$T1G*0{DV0<flLIJ!k+D
z@C91{j%(h727jvnK<dW=v<UzOv<ZOY8k;_WdlLZF_XTJZfC*?50LOK&tM7n10a$@L
z{fq<D3Bcr<&FLJp34jW;>1Q0EO#mj>*whZ%1V9Da^fM07CIFM`O1%+KCjcu@r=M|v
zIsuqmvpHQ{eSb6RYO>HP1vpuFzj4n}c3(-~FHPdp$J@?FP5oHXbtgkouLz7RahoWu
zpsOs46q{GyS#4denGLt(b}sp_+>tC0E{O|ax^;i=^suL|GE$v0tGv8EP_uA=&u%9A
zGm146?u+7C)^};0Hy-5*Fw9ga>1@JM=L+&DtQ;{uNz3vMZ0h2-BOw+`asBYEHlk!Y
zAC5CaT_;&ABM6=LR!}~jV3*IHuSYiR^ue<rri9=#LE-=jHe3m740=t(dQoH2Q|%0W
z4x!m<dwk-00S;pCMC<!d5C^YT-9p*-&nF~ZZl&yCi8e<k9o_x<5h_XcgJkY0^o~SE
zYpL8yskDGALZ<A6)kBJ16p|SDS`<NDE~DK7)VoIMi0Oy?X#E;H-P!dHNvdPrs|X?J
zQ$E>=CMGmB_}?N1N$-gp=*_OF*~HSbpl*0OGk2EL;)VH~D=!|PGs8F}Rn+Cjs?=IN
zt^Qp1`Iu(@m7H1~EuD7l@yFKekee)%g|H`226J{T$lFO9zBMBZo*fLm+B;L%OEMZ@
zR&VZ@A!q4$CqaxqpruIsyjLPrTq}hjx9QR4ltT~)^jFt*DjOnge__Rb<U1N-5%-5V
zjx4x1A`peoZ(4W`K_IlpirX|-Q-?6BDkMB?5VF(-FHs1^@RvmlDDvWCzKu5hc8ck4
zsAn(?lq}9<p%dQUZcmdt=igord->iE2ThCrMoR_yWjx!rav5r$<{SayxtaUc?S!lH
zi;f|Svrq>nBDdbWLJ=3}p3*f<*{H~9e`%}WPSZ}(LdDhhToMNUR_;rO84_z+c^!4V
z6M@0~+4w?9hH+Wxw*$`B2SxKPMON*@o8E$bUjLqqgm0n_k5#yO*6J1I0uyxl|KiEW
zTz`MImE|G{_D)r{A48F{{~n5@aee7Y>?wKmm5y_5Q)dK$!i_*07nljI6tr>yy}MAX
zZ>mdhjhRr(mc(42OjaZ$jp{G3&fp|WVB5dpX4EH3J}rCT_IR=3#Deat!GU;4{6HJU
zW4mOMcpS15V{E53E5|`;gwdlZdUk{;Me9rDCmUWCTY-(Nx6y3g6DKEpbxiYM#eL`b
zjilN}-2EOwr{)*v*j0ramkFg`Bxz8gnF#ujNylX=^J}`N-v(;ECM8jEdI`&uxHT<t
zwv{M}j9a>+H4y$#tB2@Pm;LU2A(L6XX>@sx1Uxn84HP~^kNnAG3M;jQCD%K&%Th90
zp@~~4C7iP*?M&&bRyk6(V@qbS5vrka6b`v0eVm&Pow-<K?28GnZ>DNXt@@hHC=ca*
zrYw2cCN5hBwfo^l>)~M=7V6P%2vvIG>akeiIjMn{>+L1VhwJT(pSiROisJ5zKP8={
zef)-TRX&5bwnaE&JRz#vd}twr_OV)I@7XPkBJqA6-^vStr<9+!SM)b;FNZC+*SGt9
z$~O+Td_8AfY9F4J7lu>a8YDevIE4AtS?5Cbow6757M5RTF}6xY-*X8xN1w=?wv^6$
zhUGnH`g2B4lMmu?(LVHQcu8Z)J;koT5vW}h8D$`#PDHcD%o;*svVCL_p*1{9(zEQ%
z6H(7obs~rn{W#|Ft}AEP9kDykJMTVy{)lGn*FTXQP$odIfM{!`FHM&DiUh_>?4fQY
z(zlwY`ghH^_$xxTFP9g|6&}{0`Bjjw4hEYZZRLkTct&o|4R{MV@(51T#o0N`oXQY)
z=ANA!7Y#+<<W;95Dw!-jJb0+#HrO#oaIS3nVAF5yWdYRPL<38YaqqyQ(u9xM^px)#
z6M6jxJE~u;9&cN{tt8HCN5-F|a8Li7)^zy|lQ0u@$~y}-*Z3rBVRRf8QmOvdb}o}&
zp;ALj2K`(4r)=i73S)CA;rB>^J)@XKg5z=}T7g>jx1z0FDDOi2C*I2h4q<DrY{QLY
zLs=2Gk{@@j!<y<TysA>G6j1Vl+t=k@I{%bg;$N6CU;)=x<Z>jer|Vg_yBLQqPT200
z`#i<yrMos?hS|a%R#>dp;^I2p_-jXKc4AFDr;ND4cz^p<&s;C{Hb*kz$wT~olunON
zNFOmwZEvPF5OYrWw)Lv$^$QCPNlUOW5K7jgO&3VeJlc;Dbkes(dOIF>2bp)*G{0T^
zMr7ASCRGfAu0uvZg^n**7bim{OK8#N?I?oMydY!q(a+&W107HMEWBZPF~kOhXb<aF
zG2>uTGhj2{vgIxxOl8DNe-4>&<5Wkw883T2@P)GX?!8E9jRxzOJ&_sH$2p{|Vn>?h
zC#AJwsQ1WAx-{^(B{<q&JpA;AI=fAO<DJv%L!t=&UKtI;{%;H=4_h1y7G>5YYZk(9
zKcU`}O}cv8F%Y9M#|;x#Q;*=}#<@ovr>Dll%?|g=-My!Y&Za~jydTKldKIaoz+;=Y
z<g{rasxf_HqRUsi`6A_5tN$WG@dX^KNDyIf(RzgYFvc1ZANAYt^e;^?R6D}WiaEt|
z`$OH{#ml-Jyyfb}Jm!}7v)TrVU9ip)<&l$h*zQ$?>E}Kc4zi=OiOz<&k`LUb5~?ai
zOu*fruj;qSFr7s$Q`hFm?jwu;26y%I7!So>$-Gm8?B7AIdMU#|pwrB*7Wo7^{P-oq
z)iYGnCJ>yWWI~LSwA86Q#KM3F&^2F1D@Af&-cjtDiu`JAaq55(CIQdSxe!36+3&%&
zmvrpiOEtEc^m<6?+vcN(&Sg9a$cABWeJVy1RPDCDG8wP&8^wy}amK#&BaO^Hg?W&T
za2VoPub7Oizmr6S$}y}h;xeCaHAAW4hwma=t~{D}jvBMZA!%RrJeCq)#GKJ;Qz&rA
zclkYk&$MIvDqG6KgZgvCJ4>kwf=2xNPQ>k*0d^vpaYW$`nOeDM?y%>}-1hmt8irGW
z_1b+yaBoW)P7d`yzR^uFIgIvG9NWB9b*SDQCXAtgT=J-}HS)}QW#5E3YZf0C;6a^V
zAC+y+e`G0hC%Sfoq*Z6K(b_husG%miyThCcnt7n=S$t`l%`?*3v)Y`3yr`gQ(#Kxw
zONK>7BNyR*TCAe-!L!a6wK1})XcPvDqRPiD-cQ9onCnXq!ah;@vTcS4S7juv{&r2U
z&8I!2Wbu%|z$zX2i%G(bM18yF4h$J~FPV3NLiqb_H;}yB7hw9VZ$8^XXGE;(Yzp0}
zFm+=ZccNLhlf`16wRLaEt?XIozNkA`e!fR8`|_4Ws!h8`&AOz^a$8*iT!8=Q(m6k?
z+s#adyky*V6&W1vY!aU?OOkx`<|-3miaYiTv(VzTgZ4Y5SM5o1<!i7CC@@O=Y&6$Z
z><sj@ci>RT6CgBNadj#BT|K=C@Dng)T^UtNukA8Jtme!1U#SK{c7y1}B<E`4{80GV
z{Z$&@t*$wA95807z2Q<@R&2NYR_M$r!(C{^OvhI-6*p2UhH1{uUL|O$x6&6QKBeBP
zp<qBn1iSDw=(A*)945OVOj{G%qdlqZie)X`!p0FYR5`5I4vG8oPWUcdp4GimA5TwT
z6MHX^qo7YdV?Pr*g~MxYU#0Ofp(T8AE_w=QCTAyuftH51bt;xM@iB?ceCW1^e>uFG
zC2K`V;hysP!_zm!8jj=X0X~Pe&rgf&<eFT`QAVkCbRCHA9~x*+rM^Bf+RwM@p{TWf
zXeQ8!jcw#?Klf37(m#9>jlOxuM@PyH2f_Y%KMd9M$D^hrRdwfJ!f&a`HX*^pDBXDI
zp9Du-gWh%;U2LMl6N<{o$a_=_aq1pgAv%lkeMG5jx_xLU&vzg?S^Bbn(<(8A_HLKr
znmAhu55Z7MiD9@RS-><5>ya6@>H4c$G`xss>>D=&OvV`!s?<iq;IwdWV%lnQ^Ot;^
z5oGivN?35mx?4I|s`ynZB`4C&{Ox46{K{mb+QvPWv5tj8T@PgiMMr2A(d0WJ3u16c
z&Wl-Ma)l-w{v^_bsJAxO^?i(QxU^h6rJYbxKI9+MSRQ^7wx@1y$SyM-O;!qt`{sQ_
zBRjd@MZ?J@b&fZLl$oo!mMWb^-+ZxBwjPdkZjT+t>+CpGB<|JDxHV7P*wb3?Npf7>
z(xZWao5_~KFn$mrquBM>Z2QrU?|z8c>{QASR?*xuyjr=(+@bg%tdz4H=_=g}ok;!t
zxrtKgdk2-E@1Sr-a4GG6fLV;>F5(J36}~vp=W^4NX*u<pyjkQpO<~hW-aE&$g!706
zSz4Votax99NejkKi^k2QUsmThDj2t7@ByBcoN~2D2VO_rO$ol)&oij~I*0+Tkjw<^
zFO#NQGxwZPx{UXv=FiEVw4UJ*e8n^lSYp7ukXh0W!>q*HB(B46OM*y^=Svv~CAvV<
zXSv8j#FaW41)6;eG^y(d@Ms^CcB*Dm-RMT-AXCuYwJyZjvl$x}KT?p{v95~1G$KYT
z!G8i3h-5O-dmGX1JW<IkVG3hsGLn(4=;GM)h1^XAre&K4OYhUf#P|psl)g=!(ma>D
zjC@aTfXSPfrqjIXx_d--|AAkwhR?znV@Dddxj33FrD6A^gQ~~U<GPz3BgVZVTh*3b
z$qZ8dZG~BD2(gQAYIiQgKk6dZPKY2qbERTBzW>3aE%L?vR-$2-L3EzcrcHu-C-h=+
zmf|HGdH2T}sdR}**H6?n*-KsW%miHIL!)op|BSNjlTQDYg{{<0e6;+5D}Fvh9ivLB
z>sr4ABAp&}^g&*CL1CJ|>4LQ)o(t9`7WbD0qq=H+z7F{Ii?{fW83HVn%yCuQxN??P
zGbM^Wiiy-8EsS4T$HH(nbX3u0nFv`|$QA~+yEH%9W5A=VVe{M&EAilJv*^oINLP4f
z`9)krA;dkUa!%X`LghtfJun?HiZ4V}9QCRgwYYQ?wd}FO37fr7ja=9}WUD}ww1|6l
zJSHyPiIp>34-Kt~208}GRhB<0U$z^yg`_Rt3frb=Wd5+XX390DD{cobjOW_!mx>n$
zX|(g<*1=Xat)}Zpf_*D&a7m{-<^Jr`!F=t@hR$M5+{4*hNW<IqQKP~ap3X}wwAF|&
z?yoLWOJce$;Oy3z&S=i&7+JTxlwD|)<PL|^E5OHu8tR;FbqfA4qs$UPcD%Shr`*qu
z+3RC7SUr|L?6aA_zD<_-E>q%5rWEcZoi6F7xyJ%hmX0n<gXLLfe(y88bRG(={Tf$u
z@i)`6?q7}s$@%anWd;%QZk<hqvm~<HLsZ#pYVGDlS<5{*X;+v#pGWjP525PE=9&-Y
zORY=bHa*`@QG$70Tv1;wG3Q*)EBobw$o3?z4qtjApTsGR$N<~1uj{OWNn}3<H}Wnb
z6D9*U%c6*btpcL%+9#3joeXSG$-|iD<s9dTqa<Z)=5d`TIexRjNrCFs`WRH@!<bTv
zjhxzjC%d<Hn$05Jl-;Pv0=;|TJ#DKI8$UB}QPMYm{o0aMwtFAhE!bAQ+#~sElsR5a
zmrCD_+&TIoL#?{CyvsfEH8?JevJ&t5!BJ`-SP875k`$)weOyHtsN~*{PV66v;wl}*
zR*!Q>OCMNx2$Fr_BaBYt3#aZXvv?oC<^4)D_3Ept+%IQWmUoW2+$I{}<ED`i&9Y5J
zZDYI`CFfsqn?c|Ea_8_OP^8p70a}m=PLg=PXQA%`16~eVaCApTWEFMASl*~sgZGJ=
zyhO2m5>I@grW-^(MFB!_n+n3F$pAU@p+Kbj4CzXS;Bk=5QQui;h2FaQe&#AvJ_;n~
zzu%(F79EJb%FXXa6803v!WJ~DP#oL$AE@(M6>Kx&gpUua<lsV(JbQE88k(cE9GRr=
zoiQ{SmQS7$`L%zLsGt6*)5Px!jp>KyhP(l3#D%wHWIkr?4sWG9i&ok^tLiLP_KQA~
z<Z@6<^bfxKC3h}LZo9-Odj(Ht$l~g;MEd7Vda6AzmALfKkxmAZNn4CvOV~rJvd`h(
zid?qLv=;E(*5KN7#~(MZ7!|2+?7-RII+ZO7qdmOkd_JVwj#*jcR=K25e03Oyfr4m~
z9$O2N#M1QaUYIrTGkOSFLdu_w_$mlJ5VlZ`^22-k6(cTPr~2Cj<IT*|T0Y7WBX3b5
z9-9l5?A2(NDc*rS0$n0L>%_~PFXA&po41Fc?9TP3XwowFr6EwgOHVGQRF9k7>z?(-
zK(fdZ*PvvF=+LmsjG42w@0twf`yb7@u{yiE_j4P0Im?eh9@XRxSbunMD(+$Ms!evc
z{fK1?;VacA-Zu)%U6MUetw|%XHTir!Ta%bOoL#}MD9@&L6;3~!zRBu&5y?WY?kqzj
z>dhKpiBSFK3BNyf`vWqu1Zm7E<_MwzxVq#`y?b@LZx47@Uw+Xt+L6@EBhvZz-2|*I
zsW&wQ0((TczyjU+zxisyU7on!@PE9TaKrzHtBL%()H@p#*5|<}7Eit+U)mNtnQ?W@
zSD1*H-`oy)=~nSjMHRsw>!F#3WVorgkeke%z~Yqy$Z>q~i?u$6bh7tpr_U2ZR`U2_
zW<C(6wAG#Qa8h#4yvrzmkuT&hC;Q~3{jHpgi&p*67rf=9@GM$pH7-;Y=n)X)D6x1s
zrnf!8BOe524exULcgQfuy+*Zx(RpGd9Tj1h<z+e{mzpH|F0aha8UGzZpAo@AHP*#e
zu3~f_j8osfp=w!lLzOG5RrozVSOpu%6MmMf_tsEqR9ACC?d)VZHHme$OllFd(cJRQ
z2@}!0AEOlwbX~kwZiRUDtc7F0xxFor(PPJt4z(I$MvZPpb=1rqx|XEnGZ{=5=z{z~
zE)DbWC<G5;bQ2Z3*8>ho-$2h+Zr@)r93R@%4=So5hddAi|AyhZa4^OG<A%15#&?|U
zIC;%P=?T^ew09QAJsP4uUs5${S1f2aimF&YZzrI(Hx{VI_Z1O-``$EMU&+{gF0Hu?
zMzd?QAX-1ol(I1MhIHgXH<wuAjf(sb>efn<yKyU}@_Ev&V-*^a*w2fe8x;#JQNw>^
z=ty`Z<jszKOKKtfC1dAD@wzYxTnzXJj98`^$aa^7A8rjYJ`aTL8q7w;s=^iwl!srl
zp}K22(rkkWZ-1;a?5eC~CFN_NwiO)mxC**8TDtTuKH9Spy|0&f&XIRWg>r=9SDq@8
z5q=V&-u}YkoE<aAr;Q_hT>3!GOPHvK!;+hdct_c+Xf0@OC59^R7>ikclFfd6f1Z7Q
zO7yj-z~f{)`(rKro8FU=X2_-eq@2&X5%8QGmx8zO(pZ}GIg~?f0*rX)nAsdErZzuJ
zVWBh)^O1fy#i7<A?7yQdhao!o^vJ_gs_c=UjjV3zw4vE$@D~L6=WonjT1}$gWiKPA
zx)HslsMfS*s;BxUh2(?+^43345FQc>kGIaX>U;RmGG1K1#o(4PVJs;eMaobohW<yx
z797%aw2S*UPI-d-ax}ioI`cklW%iDfX?@n9E`=Z@sx>YME4w!qRLDfjA+Hv+P?wVb
zj<;g3lH*Rx+;;PMu55|^;IM*Na=x*IrgA;@3l5v9QP;ilnBE)`y<C<mO$%#IBbAnC
zkLIbzq?#WPlQ2;g>zNgn?iYP~nq#V+G8CV{&-#TFR%>Y@N<M}y$+A#o10^x#K)R<H
zi;0?S&j-hXQ-HbPE)v&N!?K@?ni0JCdwbWL+idr!%D32eW_MtN_G<djxuI}REVSz7
zAQE_eD1`3{=RZ&_JCe9Xx-m_4v%lb#PaDu+VGdBUzK<jnXu4I*W|yKc290eIs3qw6
zDQ10Y(5HQt$6?02r9-=`H;NmU5E)Y8Y6bCzf<VPS^g@c%fF!cEqQ6asMjiJ`J;Pb0
z&A!^@#IANZuj2n~my1+6F*znlAeW8J@F7+{S0HoexwYN2R?y#R-!{zBv*W9sV$4q`
z8PDF`|Aw%oS5#;#`<pM7l5@gEow`P@G69X6^^2EEu3QkS;h~~OY(f{RcLmYc{a@*I
zTQ0Tiq;2ZF`wGS8y;d&{dB8s7D8c(&ql5IVD9k2R+Q73G974$&A&(M@;RM4FzLo*U
zOCQfxH^?gvggN~SgV_a$=`O-3lo|qL%q0q4tjqTz#e(D+T7OEkT$fyR&D>V!v+3s~
z3usG4<0y0lZyxZS^_9@fJ^!4s)0dd%&Rh<WZ=#pCqQH4LD`|WzDE30$)YFs40s%p5
zgjA=P*1t*?4yH{<^xxYD)Z~5hC#_cvm-mzlH=!5)*X|$f=pW;XQHPxhZ5ld=TQPJ(
zwLcdumyJ0-8@uO8?6KZ*(@9<tp-pf`P6S0>G-5VkdS%;k^>G%mIEjmY%IeGj(Z(pL
z4AB4%g@?w>axGhcICS4L2Hp2okM=)LV6dgU?#vZdW6)tK-_CvdH764S#aw3;>iw-B
z<0L;i=fbC^=O%`6l~yI>g7#pH?FN;SW=ZG64HZ7FNrRi#Lc{!a)V9S)5Cm6#zZaxc
z5K~dC<o77Jn~JAU<FP5PvzgBvPj#)3HX|(K&^7Sx@un3+Jem8N9$&rAk<@P)`{9|!
zfQJc>4=T^VT{WZ_Jp$eBvuW6lW&t81cZ^XJfg=arI0j{r)wh<<lXEK{RUkr-A53iI
zZnKOBJZlZSc>fMvAl1l<fQf$1!@7S&9m)Td-w9i?Br2_gOd|b~-lCxH>sk4%T`K+|
zQnvV$R<`Is`dAUu7`6z`8d$|>GLcUDM{nCWm`{S;VPKQ{7o=YxWd|W%y?DpXSYi4;
zjma&FxLL#lrS;vLf*0RN`s2KpbHeDe)zH_Zl1KKFdP#+-P`csop;+6&Oy5~wZ4x;f
zU-mMU%yipdxFq7C*}0|m-~*hFUagm}5O;YnQa36UQ@kkTqo{q~q0~3wuPRbptJ;Uh
z$Azf28y-g*d6}+-30>g?m_j<eITf#>IzKm=g(9dv4oFl`>B_2QB7$wF_1Asv@~z}+
zQ>%Oe6mz96gr%|>Lcx0vVj8pt9Y8C}aF-L7A=ArUB#Np0D@1$YD!3tQQ2D5ks{bfM
zz|rfF-b_fdx!E6B$1o4|y8D^6G$-kY@||b)77<6z)pumo4ihI|z7JOCDOIfWe}7>z
zs8Pa-Lz`u&(VYL$+*f0meQEFgK1_WPW{jZ01{5~uj_=*0jpnmdhIUe?uv-as4ifwm
za#BZ8jd98kVFqj`rXo$({8Dalt}mb4ma%HJvn{un^BM~*BGsaY*h>!kB6LEM4XJ}%
z%;R~^rXnAF^*0#|aeDe+B10Qt%dw|lWy5321vVJS|8*jZsfs&@lM(s`B?QnO?oEz|
zrwQ|!Uw*Y+6OX$TLgPV_h;GWqEbt@6R?NQF3dK4>W|jsA-&2%p+F_6JWz=!wRN9p-
z4`QV>zfSJw9Qp0k;`q(o0S&^Cy|>KH1KX0CqR`^`U&;9NpqS2_K9EXxh|S;lx<f;&
zFv4Y>h`kcRAr*5e-R_}$i@m%=?x`8|aWWPMx$yy}!w$rSHJ*}Xk$xVr*uZCO#xNo(
z2<jL?I)apet4g%YoU66~iuj@n&Mi|k`ADyQC&1G&^BV@&Fe8%rJl*tUURuD)B;`zJ
zo+yv#t5%rxb%L<<ave)JD}KvS!B8D3THn{itq|AnR>(cu2uLkrE6h_LQQEtxFk(0m
z*Dfo<$69c6T1WKG$lDB8asKiu&b^xcqd13>ANfRzdcogVM-0E^9N@SbzIbp<SZ;%K
znSST3piUl<v~PY*vmI3QLepZaDn1F<?oQdT-m?#S4eS}L>@EGw@dHusG~YdEq{&*n
zG<RFR`H`Wv%zK%=jO~uszxNpWz19PktH>;-TwsTx_`feQH8zM$8V*^-Z)vf5Jv5BF
zJmWi{l<{N=Nb)nGF?npp#xC9I!>l6;CGg73&M9_t`<YKiG*81}FSO}+?}^X5nRA);
zz%Sb#VouAU&9YA*1ZoWawkx7&!siX|Q{X<~u3cJO%An&5Wuoqt^@s-@-8e|5Uw*Uz
zDN0LzKY)4wL&>HAUnLyDh|b}wN22{C)2ZSlrYkkw)gTeVy9bkOJhPdpp-mCAz-8h_
zqDxem4Vm|$z$Us66>>_!CnJbj{}84q&bul>bp4PbURYGl;`Ji8U676vIMQ?_)PMT}
zzYGEZ0**8Ra9lIe^cJ)Ufa?1Kv<bijv<ZOYx_R4mP$vK@P^X`9fI0z~T(dcWZ&CnA
z{aApT695Wm69C6GHm!hr69Cos1!xn131|}l$91LNDX0^G6{yqCI6$2MOs?6S!0-J6
zNc~uVn-c&EXcGX(H8#zFdlLZF_XTJZfC*?50LOKu-qO`4J)rW@Af5kV2lJ@bgI|O>
zfwt{~$0-sMH<u5)qXw2LKkahJT!_~s(T-{~Mc-|Mkg#_dR1<0_iA3E)Y~9gbFNcC;
z^x~raHA?!ge^cDN-l?lDWdY>^CyeOd+@+)r$4_Of5h^W2m;JCkRUEBSqS}w=Fu$&Y
zBVy#bhtkbrxTlW+X>XHcPGg6d9Bt87+u;YPW}P>jv+!zt4dUqSrbVWn6&bNgi<PmJ
z9Mhsn_3|Ug5yQ8HAY$0r7v%Ck=B=%AVA0^1Aw|qshYE~)Oxo0uqBaqK58A_i2=!{X
z*L+V9UQ<pqVSR!4Z~|W2#0Q65^zd`Kt+&<v1TT7Gt7A6kdW5UdFNpJ1xOffxO1NMU
zyml>HK1xI{OPy>!7*bg-F~ci_t0<{H-4L}LRfkyIyH^FNxf`f<3{Rl?n0SmqmgwJs
z0(l)xdSmA*QgSF4xM6hv=14Jnb$r#&o`?S4&mLI#AN$!Rr2nt|?Ac*1d?fmGN_a+v
zJ2S1&u%x6WbH`?@_;@9qAwv`h)zT3#;VjKOhLQx(&7BIURV@&+vTS&cq1J>ICj!p9
z@LU}}u!8>z5}U5q_g^m1k$kPs=$R0(@Vbf;SEzh+$oQ{B$^V#CWD+U=pPZ6M^1xVB
z<G&IL%v+00mDV3|!h7{4+m?$eCNEec=R2$FharW;gkd;Hoq_rBGo6U5<>u;Cs&ky5
zmeP}y%Bi#cY$1^GP*sr+%xT%?M~&aCG0KstKdzy*dDTD<G{<;B89x!dbrkr1;MR<q
zx=X?+<;4TEyf(CUghLX?T;*O<T?<hdTIW@-037Br{H&A4?U*(_xtqJt9Qs7Fafb77
z`)8L2Cs=!EF?185uc3Z*v`*~*``iO{DB4v<5w!Y|QF>wir;I}X@;}NbRW|>XQFv4S
zol%I(Gf|-)KgoyJnD^qE8i65P)0MRqL?xnzA^O+`O-A8zFvO>?M*F}D8{Jh~VOjQL
z)Q@a}?lt!-aq@ez2|rBw-y9{saXRK7vdQf2e`k|-Ccl_X#*_Xlo7{jb|4Nknu52O*
z)A~2Z$^ZZL$$ywlWNf0qli^i9{cnHZ$q)bpJQ)ITTyxK|1=<8a^?d=_1YiQ%1i*2P
zP4l2l092q&KjQ#x0x-Gm)^Zfo3BU@}>1Q0EP5>s?Y)*TiO#oD&O+VuRZ2~a4#-<a{
zCIBkXrk`<uHUXGiSL*eGIssULI{l0T)Cs`kn#~EEo&u2iu>f!N08l`i064C(>FT+^
ze@(;O@Y?*9&gAduUkk%5{LOvIKW7>S19JE)QS!U`*P^hHzd26+oM{*guk&Atli!m~
z#9=A^<|z4dreQFl;C>}aepfb;gcbdp<K$16hWSyOV0xqdN}T+jY;qS?_iv7pKcO}O
zZ&v`t{`UoV9t1D}&w~IQ*IibEZ{z?_{aAoH0ib|70dQP%y#ikS14w~3{R0lrCIFOc
zYyy8T89)lO=^t=_HUXeqSL%UJP61GXI{gC<P$vMCYc{7I@E!ty>iYsbI02Y|HUV&4
zV-t7{0U-5b0onwB0@?(?ab2l54Q@^VR^Jz(P5>sLP5>O&Y)+r9K6v#w3>FmbuQVoq
zR|ESVtk>V%n*4LdVX(YOe<e<SPXqftZ2I3EC4bI13^o+)uSCi3$|ka~t$%Zz{5j(=
z*xsza5+}bWo5;Z~{LNAFCyc}Vs7-L7xPB!{epfb8fP?(aaq=hBCg6z>Q0{+UfG0u#
z6YxX`z;Vrq5d6k8fYgr#XcGVmXcGX(b=Q^P*c1R2sM9~-0CfUDxn^^k082dps_zSM
za{@2{Z35u9#->ZqCIBkXrk`<uHUXGiSL$tpIssULI{l0T)Cs`kn$779v<ZL;wCQIY
zpiKZK*VqKU(F-8;V*wtV08l`i064BI^$xB+dG*#5j<?XSv?hN~1N#vi#oyeR{By=(
zaG~z}N|gMr2DTEM=-(VCf6h1zuJ?mqiId-xO;q4?|K=$9bH-utpp<_lN`6;1QG@gP
zo8#n97>D^$o8WnC|4N+vo@}B4m;N_L$)8Z0fY&R4YXAEJJP-nyfCoYVj%%)0&Ow_1
zs6d;3#sS&{U~-L3-JneXRG>{i;{a^}FuCrs@&l+7fEB3I&p1Gx08FmgoQ^@80H{El
ze#QaX1YmNFP2kKFfYgr#cntx70@?(?ab2kg>I6Uq>hupdK%D?kuGyU4gQXq-)%OLs
zIRTh}HUV&4W7E>r2d|!*!iO^amA>Tf>R)TYwf@bW$v<Zr2H)HKSK{RN^sjZ`7XIca
z`E#aW2%zkLB}#r*HqnKL{LOLl=S;&8c)R~focx|_@&umZZ;p~bVH)N~Z9)j;|0_}Q
zyRwM^yy)K?Cx1e10-gu~<^J~tcp?Na0Z)Vg9N={&0LTBl0CfT|0(Ao5xaNZ86Sz46
zP<>y3HUXG`HUV&4W78C9695%x)6Y0Sn*dC%EA^H@odB#roqomv>I7hN&E~WP+5|ua
z+VnFH&?W$rYi#NRZ33VIZTcApXcK_Rb){a%)hDkW$076%`;}(O?`gR`h1dO?TPc4|
z1D^;g_E)0hceUJ%;l2LmIQerL_(a|*zY-_EC!3hUr~l1S^5-=0iJ@|SB}#r*HhBi$
z`ZvePpU}YnQJWBZ7yn9}{GM!L0l)A!N6DX1n}7#GK(+sU0d~>=Ouz#n0LL}gD+i!W
z092q&KjQ#x0x-G8rXJ8H04mU?pK*XT0hnBOSqa|#15o`~fTbP)3aAqR$2FT1_&5%L
z6ll{w-~ep`K)J>yaG)1J3bg4TaDX-epj=n#t%D~g0ITl{u+#%E0d)f4xMp)|2W<kN
z0&V&k2WS(3$u&03Tz&BBaU2q;s$c0#{;vMD6$0dM?o9qU(=a67O}`Q+zo&m~gFx{&
zN6DWv4MPgm`72TKyRwNLg6Q8ICx6Z~45|0Puf)mk$tDg6x_@(&{0Y-AKWY;)sPSKk
zlHZa|qA3@g5Uj*JFACxyR02%~%Er4W^y{k!c7-=qG~?N#^^q(XHyV`eVLVS~(gth8
z?k_+fRWIgYHO^LEY`3r4K4$g_#*Wg{4no-!BeRx;C~&C|1hPTyyOc;CN!`U06V(ks
zU1+TM{2;J*?osoLpa@Y|!*y5D6~>w;Fq!)loZN3=*R|}B=pLF`mZZ4h4~ks&%yM*c
zcX5yHc%d@Qxg94w4e3;jo^#Yr?Ar~023rFA27S@FtaO~b&G4dv*}h|z*Sv+?KQH~B
zMZdYNW6kEKU3-MotEi$6(8Ify$)okE$hadC2dZ1s^A<*B;}iq<8Ihjb<Z~1d!U`IE
zi)xfozVKz!Y{f<-h#_nDa>apH9MwGK6Ps@lrVhqBANPqM1giSVJqEAQ1!M7+{Jwld
zD#})u$7C|_@ieb|TRT?aZs}PQH+HYrZDzsjkqc}JhLveE2dj<2rDq;@<|`Pj({w(4
zLtR)w+*bP7326T!FJ*2Dw1PnBy=iYOItpuEHX$zxHjf}iw;kHX5q^b}nt>PK`43Rs
ze_w#NDF7zm`452Oy35HmP$vK@P^X`9fI0z~TyvcQ4oLw>{aApT695Wm69C6GHi54V
z07!v0{R0lrCIFP{O1%-V)B~{kz5q8T025Fr0FG-mrxVa704mU?pK*XT0hnB46Zk{s
z08&2|;NAp)0@?(?ab2l52yRXQR^Jz(P5>sLP5>O&Y);^JwE(1kEI^w8P(YgiIIgh?
We32JG3bg4TaDX-epj=n#ef~eFN#`d3

literal 0
HcmV?d00001

diff --git a/quickstep/res/raw/tips_nav_home.mp4 b/quickstep/res/raw/tips_nav_home.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..ce33df2876c9231b9e0379418c2beb3216f305be
GIT binary patch
literal 585968
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%0DhMLO*vnMeoO>~NvU*}BM``Q7fXNl|B|*3{=dVM
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%0D+JzFU=gA_sN;tZKrGB
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
X`vIx{7D$^OKtbB{0LQ;pSoi)Pw+ssq

literal 0
HcmV?d00001

diff --git a/quickstep/res/raw/tips_nav_overview.mp4 b/quickstep/res/raw/tips_nav_overview.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..17f4b80af81355d6918068824aee325124fcfe7f
GIT binary patch
literal 991554
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%0Akz6*6@QHSw-gV`!Ol
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%0Am+
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%0D6i0edXA-Ize311vyvOdnmG|&
z0Ju%-N<!E9i_4bcGJP<%x(^!&r9x!J#0TBtrC!2Q?K9QuDxYxxYF~M+vNu}Bg~5m_
zhjWIBGTce0=*A;V{u8C2&s&(S{t2vi#TY629st0*(TitW3IKXm-+DJP0YLr8o%sRS
z4Jz_fiA5r>E%N^>hatcKm4gFR|G$!^sXTu?uYiL06IB~HPiQK?FvBmn`p6-E(I2(1
zuoYN&pM1O~6)b{ZNcMGZg4xR&4v$yBI63_u4^Pi*A4>~tG3Q75WVvfb7-)CSW8-0O
z>O8APH)JhEotoE2-@+SQxyy9(6GP^`^$gTU*=^{&aps-g?aflV0mSz3yG(2Mvbb4=
zoYl_gG*x#&GkCpobSJE_%lDNrEb0SQi!=gzqXeoto0rSPhHuzsJW$&Kl+`bg+V^$L
zzc7KUjdNQil+!)w6b$<3pAy=oH54g-m{RXp=G#83_Ah<<%=O6$-Cdy(6ow&6sYN+}
zv%(sLI)EdzrHgoCFp1IcYb1b!yijqI^h1_b;FGLf_H1CnU%^%FaJ!nXN44&#&m_bz
zrpx7E8`rF#77ywc1vZBy4FjfkT!-zhbPohHn=AWAe%pediSjmj(7_(J7=#U?iv}p5
zFAi5BoSL{_vC$!Tptad)CY;hA0xjUC_^H^&BR;AY{#z5~4pTF#u$_;q#C>++W$8U9
zMmUV~#k`NYVF#Bq2tXH*^wr#T>bA~Pt_)<YB*^h8N~v7!)Q$^Z|FUwBe9}G71zhzP
z+M`ki%y>K74{$S5zf)dsR97yRr$Kee|5Hl*<sR4M5tlknW0%8FxCRi-B{*}?yagt`
zBGr(b<ZERJbZg0d75pvB%o?b&*_bk!E71i_%!N}}-yX_5`37UCLhxUcT+B!b4`@2i
zKmdn;yX<dqQ7#68?Y4d#8YzZ>^*=Ac&-39`$2O?~ocp7B=C?>&^bfdup0TmC+?ZNe
zlG2v)n+JGxh^`E-?__=;6R<<g2XXV`%7F!1T_L+KPc?u^41Y1b&^-Xm7`LK%^D%cP
zGfYK&rPSY$7Ap~DexVUu!3bAuA{*7&`zZqh1utWDB#}{H!T!v>+ZMsa(v4V_dZpg8
z@FbV!(#BHH=@qht<m+<NIrrXw9+7FUP3p1n3tc#?6%6kQ-w`-1Pbxs)d4LB8fxo8V
zDnLA-B9NFa#!enPCkEg&rZuJ_HT<bhMxP^%gAk5aypZPLEdYOZq5~KQnf+djxiQQ?
z_A)npF#1Nwe5AM;U8OVSUCJQOnh@f*h>~I_*o|%nxq`teMz&dj;n>D|G|#YpP%H-(
z#YaV@Y!3Gl%-oR|0MQF!YD=AD*MK9TGEtiM2fw+^DWsL8wyNOEXTbV;PqC}C`F=Cr
zqDR$L+Rj#<%xfb!N0a2KX=#WZS!U|UchB{jYSp;Zxrk>^<6`N%h@quP*V(k6Ja0L4
zZKT%{q%TzO%d^#ESxGe6vvqXJ{5m;AFlh8{lydhC=ztq7e+9$IuN0{|ZdxO#5ZF|r
z;qCQL9d>D%ikS}rn+rD$;Ge{<o>Ll?k@{(1yO&b-w0EJn9&{u$A6+o47)2LK|3uZd
z3=6}$F>pbX3TJ(4@B(EHXiuTH)8kE5uS>q@6c=g88;Jg9h#jgnE6?d$%uIG#8av6b
zsgWz14Ojy8!cQBUBv9a`8n5qQs%mHuH>g7(3R~PplBvTe1Bp1?ImgmG+_~0I1a?1e
zKDpu3t&qA&Fd3KanZck$k6*im*jtfv2)Qj4zz$JoX2(|6udFNgZO6dUW&hsc82cR$
ze}#wzXtZ3Hg+yWf`5wm;n5TmH3VLD{i4d-SX?MCgc0}N_Yy$V2MiF@cyG=yHU}+<7
zih>@}OX3Ey*bz@gWycjGSlg3W+csOv4|WBQdQa_V7q;e9C%hI^I!neI<RTOdn<ra4
z2NfbT&<cytqMA*$(K?(bjl7eOnrY5ZYI?Vhk7qm;K0xLmlh5Wr&T4FRP|LCnB_IxY
zI+va>)6+99-R^P+II6;T>l|6K?@Ih<qL$TXBQ<b=bE3{^@td~CpWg`^vqO{`=BObD
z^+TbL-X-PtH|{z=0Bg>-aj9re_*U`mKf<%NQ~ghyAfz!#2VSkd2sM67wlv(2*Pha1
zf6PQk63TtqVXfLZo_XV_;O!6m7GK{(%%{X1%j4@zs`)#+oIJx6n9lT;F<edi&ZhcE
zvx>_ZLS24|4>A@WR2GZM6-;p(GYNkp+=x>bY72qJ$nuk>x^Xz1?k;|*i~OjX4d&CE
zk%5}9_6AvFfE!qhK&prL7r(yKLI#W!&tDV8P#i^vpzD2wi+!WbcG*0<b5&SMA+pj#
zL-m#0LPwnaBS5M|^IxLkF?zgE4n>7-fR^N5VYt=BE#^KzzAG0IGvB%hV1M<*vD(z#
zCsf8=HcWq_pi@gi#S(I|cV22$vHjm6sUJNSQM+r#yts*}tV-S=F=?}Y+Z>JWPt!@2
ziBZ=}Wawf|8-=b}_!SYE2kzB(E1^6E61W1d{9sA78S%o_X#WsXWDqqtW@prmT2EM3
zV&!&xlo$G$@)i9#n$zMJnE&9B#hbBu6pn~TESI_Hm<x2k$UJ-=@FKihl0VZ1)#_^v
zj@znPM+QGtpMKK^%>H@c%Mvs<4}NI#qgFv;X8kTb*dRYJhbZ{Ur2_??m7&Hn!3ZkR
zgwx_QK}NYAM<bn0Q`jag^+btMYJ)=BY4Q^pS<)gh^U)%O8}i%WDhTODqR0v$MUtrN
zaf4uW2P!QJ5N_wB!#suG=|9Gm+<T`Pf_R<8kMuueG|ziSl_;m%isT7IejUaXKE;BV
zsJeT}`S#Ija`cIKfo2w+t3=Mq_<U(JNLRW@VZhxXUX0!+D^A56<OzK4l98FpTakmr
z#=Va!L|C`XoN2g%c4Emtl1?>lBL7ubz~X5YQMUJdO1H4B?OyEHkGp6*k>g<0qf?KY
z;4gJiA``3uqMMeX#1WA>|MK<U@xm!_CcoYOvu{s|)7iCqWkws;=8|_?gYTX6xx*|C
z`Lu<*+`Vi5K`jtKl5YcnK>5`>+rjta9R6=;Q<hQj@@ezL?7W0(DAvmXr;B+(E-1VK
zosCFuU?4>H^x8Gvlh0*6E!VM{vpS~O8TemeWYFW_V&7p4{9f~SQb`c4dwtOd;r9;$
zef!aIkw{wW;AO;D4?3qDzt{ctoM-dTp#(mkoT^6gzkj9rb$(0V|Fo*P`nqy1ymePI
z&}X%2r4{mt7Ua)TQKLG)N7KbFIcEZ&Gc>$7f1NYnA!yeuGFD7%&kfciLAJ?pJ-0#g
zfc8n67&zS%bNbwSI^*?eVI7vbQ|=z!{YSqP)Gg6o&nOLGh=wuLr^L==U`eg+5?j_W
zTVc25?S(DMt3(h=e(3xBtdn;=`?Wwa$<>Hi@1VC(7FMv)X~H{RrucV3!*St`UmWH)
zD!#QB{Mdo2@)1&!RwDQLc|UDu;8!tREp;3TWh|!dk#VaR;^;15_(zR9{9cO9#r??`
z5<#}m=IsRXo7xZ*2EY4UBddMKB53v9@z3pl*XHpoBggAGDOm{?1K+w|eNQQ>s!ift
z(tpzMI~Uq)qTLioHJ;_F4f@LLmHUJGZ?T0!O}UF+g1laC{H1MZ^|ek=bcz|fE-e&5
zgx^XMeW82jQSByy{lgm5kaAgp`b8rWOB6PIjU7wwq+NS<K6H2aO;SD5=7In{Uba0m
zhU8V(iAW)#jJ+9=Pv;Jl*Or8n%->rh--)NL32#b5>!Kslkmde%VZis4SijoFPY*4N
zj+8*bVFnp?^$Blupq(yG<;d4!-V2tiQpc>KwO2y$H#K+~P>#9{O-=i9f9Fe!XAKi_
zzME1Erj|_oee}m<X5G1Q+Sr2ByiNMqZckP_MEH)}T`Iv)i3cWuY`O1F44hLPM(&t}
z`8{Z^`b$nb{owg=5TCkcE%wGXf4h7#W$M)b(hcf<DR$8pLp>>pePz##KU%CvSCUBL
zi$C<ikX)fPUFm#8wqJQA7rGjX7O2=^ZYM~{*+agPWkxrGa@rp)OA;`_P$i*!wWe$z
z86Z>Jmr6jfX0a-PeqjK@`CD*Nix#aKj*ugsfc$q7mO+%1Io$SteDp_zy_|W0g$^Qx
z4zXYfA6=gj2f4cdoz_VU+fyGWzNj29x$z&+F7L<8<Cm8ff|!Wmh-!v)9z}c@X}<<w
z3s;uEJ(7d~FpSlE&ICXUcMt^t&N2x&RN-ZhJS<jojM3@4?2h{Zj<gVVf^pZw*0&oe
zq9LE*Wc*1M(chH-<^&&=$J)YWHsRcRxkhAT<D1%0L4QO~QQ9L6Ap7RdG*HwJym1Hl
zbw~&RkDt!?=X4nXGN;S}8?3?T4%K!>YVvkkNFE0_C<zjr52w%P(4C!Z74;VV@E?it
zUmTt&x`m=^|ApjBB#KnPvnU55=ay(3dw}%YKx1b{3vru;H=r+45Omf8jf@ZofCq&X
z3eOn&eXBni3p)oEWNnwqbrji9OL{~>4=-YztqL`u=^FMNnVT2@MIGCbx|;9Gk<ZBD
zMW(u|Cc%3v4aH;A522Dd+Jib(jXa~NZtJfpf70>=SAA;)4TwHL<^u)vLVynnbW;4e
zm1Bm*F0#Kje00-PB9e$`!dPJw)}*#G=t0C9Be93m7^`n9-6>Azf*1@6^me*8J5(nm
zdW{YL?GdjSHB9R$bnB=T@0*<1Q+kNayr2rOp^KdjPic1fGg%|hpC5N}uy8hVqhiO#
zbWxo$9>PT7^^Gqd4U!S?JhanMq3y-j7WJ~NY|g2H6qb_b^<n~}<FnISee5JEv75Rh
z`=fX>xj8o}rf|mKR~pKYfkF}x`GPl&V^nw65}9#8Y46vW=JyWudc?u0mD<Y|Pq8UA
zP-|BY00<+gq?teVc%kw)icW+LqlEkx)u?Ua#`iITgs-GS3}HI|&W-d@k2n)M&!Yth
zz!Gph0aFGAkhZTZmwi+^#iNPXgscj>K5y(-nSp(QbhnZcsI73J97lwof3Pcs6za0P
z5U4%^y66v|-i!#gye_JFad)pazQA+DqPnVPR}z!;hy!5T1;}_{IsY`#^$ibpg>C_Z
zL}GA|(E%w8L{aV`Jiv~M*{ZS$q*pQ81$RXq!j@byt`xpO{bPc(WDZXh90@HO-WB`~
zr)F-*r&eQHAYB;<j1M%BGvF|I0MW<tFxpS^phZxd*JP#sgGVi3C=MJo&R^MGFU}YL
z=0=E@g}X*?6$1nT0HBi+?PCH3{O{Tk=R^<QkE!iqpi6Tv(;;O4kqyHho3ZgQvoTSV
z%Qpd2ZC;MR$%#jFz-+HbTARn!)wqUe@)i6-nKTBug!05FeD#>$ipHjto`n7NU8M^i
z5!nK>eUXZ`B4K@+5n;wxY(&D`z`5JU!W9qgazVnvLsjW-3TGxPNWmQYdkQwZMX@XA
zQzVSK0M_TeQgqn;=6dErES%!(b$F^rEn_!i>)^Y*+JyrE>kW9ojD4;V<bl3EkQNR*
zR8m8C_QV+o6t~ddZ5Ixw<jaPw?O*@!$0*|yJvnK7_VcZR5O5P=u0RCFf^e{FF8%Mc
z08UO0@de^dtJG?pXnPZP>EW#NIV|dMwSrr~>9&A!O_^g+$;E5~Di`8V<Ls4DQLJcs
zLYPXOxZ%}>3_!$(B-Lov;5vUY4N@a=a`RGaXRni4EJxKVX3Qbemd4iUaQ5>{^^8^V
z9ct|Cv)~Nw5;uKFnK_5OQS<NL|BCLyU+)XR@F5-);WPn03Ln=P1SoYF8D1mySpq#n
z>CBLj-&~$km*1w2;lEZFPyym3N0rSK4N7$8AP1n$1md!$5agFxdKK{QJkC03P}{86
zX5H|#jwX|AvKL`qn{Iz{*wB^Q*n`lShj`j42iwQ(@FG|8mbPJkSSl(-G!)0iBg<9;
zheVXAKW&2d>j2>~dqO2R-<4D0^|v=8=WK_u8Nf{#bt4h7{I|BiOzoWI3KgIY=&^|Q
z0S>|YlnJ-0f}Sp*9>voU&^WQjhuRG^2Ip!_h%u<X6UX-DAq+VXt3-Akz8ZZ~TsB3u
z>1kyU7xM$OkPsz-J?SM)ND+cVgg0<!mf3gMaCOBj%zkjtW)*CIn<Q|00;x~dcq~dB
z(b@@;{%q(&<bKzpi(&CAzbo9GhLKZ;Y&%nT=Q<fY5;&8gSBKtpA}lMckqa#s{zW_I
zn&vTnp`899oV+4t{@Pn=()3y#;>+eui0Gy<=bs2`&Fj@gg&wW0Y&t4bRPY~61NsUT
zno?d@KJn<7%`Lg!7%pLS1Gzk6biiRhLU0hUm-|{E-NtFNZ<0W<*08z*c4ZTV|Lukx
zD$VAemnO&?%RXch9}Vz0;=b-vwIJTY_zoMgh41Q2JsmTA`6Tg%?W&<MPHcM%6`!H#
zp&)M}B@wT^&m<akZVUV`8(CW{&X?Z=ul8Ag`JOp0^G@P}&`}Y=XdJTbds2886x_aG
z{$wZDk*b9FT`7+Lep)32?`F$fJHC?Yc%}(17cysjUtq&LPyy53=6g7rMSFqB<KTe<
zpmf1oGpeS95*1bY08y{Yt!L7J;d|VU;dEYaiR2|3sZ16Ed!jE#7hyH3UrpN)EB>$y
zKqUrZhP~Pv;Nvq>H3bKlEG?&Hlxo5uM{?U?OzO>BOXMgC43d}qz~uQhSxRyK1cq&6
zI5~!fCZ<bT7tIpV{Q&vS^Z}8b3>XU&K?=x!$>HZbo-RZI6-rp2%$Xbs^GMqH&8xAU
z0dEEoWE95!oH@j`4Og+8i}&@=QB=+fu9@FnVZ+VJPc*EVtb_f9cG-Bmb(jp8BhF(Z
zBx3VB-v{d&*#~?yNU_@SgGKYjL0Qwv;E-NJ2zXZIC%>4*R9mxh{t8c1O@C*Zz~la&
z<;WYj&KXqyMp&;tilqLaZDWao4fm{LO*e`IE#xfg8Z_QqH}8_#zQ@1^_ZuB7wkS~!
zqB(~41s-Mt3_TW7g20W%ti^tvZ)0XpQD*Hy#ey6XzTiTU(g<(<nbSD~0FrhOmp{|Y
z)9PBDw*nzBItJ0|9kd}!lrcqoEWN4WNva8^oeZ6UsSiY@EpLJtc&ZW3hV+B#tB25$
z;dc#sO^2Yl)7(+<jWww)m+IUUu)M=Y#4^!MsF-D+-|(C1>#rmd@2_iskXr2}@jvLP
z`upj;Fe|=SHS`B@H_l>e7raN=%a2=lrUu6ErXF>&4iTD+W;i~0V})fC_}@lso+RuS
z_wz1dUU+eX5fVCcsD0jHI3^sL>z5Yzvg7BOfE^APtkL|7d@ohiQ=YCQhwk+CtzCM1
zYn#2z{zx1SXE`5dDig4MEH8z7HaHnazZN3z&|AEdm-1U-(FRhEAWFm*D>wrw)2<{X
zMNB0w(FTe#)}^FAS|C@~N#QD9qKYrhLV_TGNb$c0S9Uufeu*6`pmz*zHN;Z!SMk~a
z#tx2$rRoQ0cFd*7WJ}gsI$!w1u{xAd=H4pA(kRun)tf6E_%~dr9(Q6bso&V9APC;<
zER!d?toS<vq0YR27v6aoj#ZM16exiddid!FijP&(^y_o|40aaMHE*Z0Oc96mn05Jr
zFgwIiVma7fLm(=iK`krfl?5d(8dV2DrLX3AX>L?s+_JtkOYG(9&OR%E9a6+lZ-`1A
z$hRqtt;<WeUF}_sLpdU!U3YPg4jU~pff3eD!HB*4GofVnP(}zxJb82QdSWFkv!llR
z;(>F$`}OZ`nvPlsckg6kpJav<1-dAx8-(056x%oM+t^tbo7gQ&B8&&M{?<oX!ZE;;
zba~*m!e|QEZnMuwqqkmx?yCRNJ@fJPyY3ZNRq45*g4fhIt~$zJ%`QRSHTNYUW!uUa
zF0Pll#2<KfFsxb1ITal!no{g&KW(ryWJRJZa?&y_GGF7A%(Wb9P>s!N%T%uwJx<OK
zZAWR1Od%L-;eO)21iyD@j+Be|!9nCIbb*M?R~2fH4|v~EL1%ER!qGD`4dI^mIqC^y
zBLFrH6_|Bg%UHVylTKVL44*s%mg_;4mgarThyKfLc_jKVKe8NOSwb#Ey2joyOMe;H
zr~QaHUu>98y(w(H0~Ea<Ug$3%G`xIZO{`^MgNlgHw|%YB=PIK8P=k|X!}<Oxzi6s5
z(W_H&SPgSCmC$kDx2T#rviPrRYYBM1Ksxa0$s0&&S}r>|@)oJQdLH6c&A?{(qa#bh
zn}pDc-F?nPmE+H5tqH`7V{Td5k5hB=k|)iEVUbURH?x_=)C;sSP&Jd)-3D8_kWg`)
z7DSz{nghC;eHT5(9|}U71Cr=?GOG*#P{f=QuFBMbp$%7Yej1FCOX!KBmkk{<Th*G$
z-}b4_et&0W^w_p;JH-$d0tj)i=0e|s7o{5BEoC@Xbs9V9)2k=82s4jKkEDUQ3z0K(
z&0=nIi!Q8ilTouCZMbrK%z|twSC3I;3$%wa=sy)Gcih(f=ggUZZ}z{Xj*dpXdd$3Y
z=hFEjTgi-7Kecxcf)S`85;tRq1-25??2s5UcL+{*p@66ch!21Lq{=JA|E!%<@wkje
zTm-*kv{DR9j_A8PsG?ia#t@56^{dCdW3uqV>Gx7&XfI(q2m;F*9_@jMVh0g5`H**V
zy|RxNER$PKFpeV~B(-C&!BX_ZF_fHbP`bEev$5U$3uun;vyQxvy$ET8z;@mzNlb(F
zT%%9Fcf9u0l6Q8F{Gj$MtbPLr*-5Epmy`aTE~Sa)x??94(p6q;*bQq^(lIJ5X^k&D
z8N5rmO@2e)Ev?%I%OKjER;4<SXCw8Kll^|P;#&@52Zv_MS<sh>?r3>D)Hw9|OK2#=
zcth<RMYYK>X$0hn5g85w$v|<45h?od)x6AR+iMl6J_p=|pN|SNwFfPAPE`(xlr#O{
z21fa2YolP`1gP#eDLC30xN@`MPD(NxzJ5;xk##{doBUER`9HqSX-N<$38HOJ+qP}n
zw(Xv_ZQHhO+qP}n*3Q$$KJ7Q$h^kwaC$qFo_)^n7BTZwC*${Kg`u-{G;h2~8vFWo<
z;UB_Hly?=5rnpc?7{jY*C&10>4(Wm88P6mEQbcp7>~nJc9oE2b@eBIf@rmuqEl#xq
z#V_$rClK8~9>tg&FMSog@<&%>N{Z`J+cUIs&!@#BjM5TYCUe^fdKUztrF<Z4@%sbS
zQN1YvX_PlJ_D-vump~?-;#W&t99&D3TPrHOH(|_GR3nVgldG6OBIPto72T6n#2hg0
zs(B(wPGSronsp+REcT;`la<xuDI=7ceoCc5R{50Q?JZ#vkYNJP1&V$(#FfJ@!Y%#z
zRtG!bdar#|4!kpKBtGP=9F=~R^v$u2c_zs_%xQOIs$<kv_0=hiY#TCN>VKay+Rd`b
zssSmv((`452(gtq$rsIBpWd|)8iopw{cpw5eSH-lfDwD2=i=GHUH=wS^Lbn==W1y(
z4jBh!$sY2-JE;VusG<k$OELo~k>`rtYbzCuNtnc!Xi#kIZU=;o3?yZaq#m@(VcVW&
z69u(bAt?k%P!yD!{qV1^v*q+tXEuNuX0BVw)&RfMKf_xg^#-PR7}li<(CQ(hq%dsv
z#q-<*8xsZFFMP6Kp*424Mm&l5c9?}p5tcfm`%BsCk65fi<(D1{f-CYwj)DK1QXpYQ
z3BaM`0XzmsbY%5H-b63CU*AL1ec(&E5#u`ROZdup6JO8NUF_k&75rM87KFeiH)9BH
zd^)1CG?Xz>V+!#hLTiO9N)V;`+rk*<pN5j#L+^y3($GkL`;{f}N!0a9LLe}+XYq)c
zta1bQV941Vi!`<_OKGQ+lHVcpqG2#d{;1uJ0dgAVkcfjn*XRbt(jzc5Vl<VL5JVd4
zpq68=C?5l+00gsXj<0Jz<|@|4vfUBE+z*ULX5vViHzlbv&(4L36D^nheEIjbS=F2e
zZ)|Io?fpX2#<xQO*5o2~k)!g9jO=Ds&12j0nUb<}X<tOa+ZIBjM*LLPu)^%Y)P~3z
zJikkuxTQW+^ykFX$qbO2wD}X*bcIN0|A@x4>)>w2g;Y&>tgCZTr!5Uu${Ae5FxT&{
zJzF5N;k>27bo<zz=_oJVR&NWrHnnF*uCY}D73Q<K5M^}>W_#9w--uDi{-U3iL8%SF
z=hC$`GeI!)#|pky+JYz?0KI(1h$6>3I|BmW2P^FH#Ue9>`ixGm_bb8}n29=w3-_Dw
zyC{Z+eV$)>3kOv9{`N+lK&dNH5><tXv2D>qSW6{CA?Jh8{H56(j$T7Hs<CPYio>g(
z$_+%d6A6++X=vO&0&|9CU_DsK+P2z_;uv*<GC3AAqIh{<tG{@i+>7m;6y)03(dm1m
z^8<K#eCB1@MLL9wS=5kGtUmLa!B%|yfbaJ@m^+5?izineNC=sS46;Ov!0$RayLe;}
ze2GV_omRCc_v4&K`~pd?{1(a1*k79pW9-V|`$g8w0sfjHO)(0ad)8-N!1ewEGE!t!
zHLPy`xtANgX&UW>TfNx(<A0r!6qjXsT_ej{t@BrRnEsmlP^|~@c69+OJn0*RJD5;{
z78u8Xpd#!xsnK|MDyck(Dh#DO>|(4J*VD80#x2p<I?I;=RP5#2rAnFf!=<s~v1mh;
zj-YIczu4;uoe{9#xQb}9TP`@cl>m?3ob|Jn*FTm(fX@vGfj%OqbVF}9_%}JQ><>T$
z2Zq&NHU_p;ZGUJkU7R3^i$Y;YO|mFwDs-uO&#gS7G7pJ*1y|8%(3U280no&*)eG)`
zL;}>SckigDLAj#E{quAJmDLjr-hz@8(C+&b;yk_)Vmv$WEVDUV`Dz*c!T=v4(%tl}
zBoL5PuC0f}<K4*2g@i(!!u9FXwM8KinPxpql`#OQ(C<mjb{|HfVSnJHft%|6C-o3(
z+4=(zNWVtj>0>&(KU(=IJnS7Fq@azgtpP9ksgY7A61Xf7?vZL|-Nv#joe|#CV~$v_
z+n-?<>2(h`z+pciuXfeqQK6Fa8z>_Eu&J$yzM}c`e0pFc@?J|@ojg8z?Ok#hMNNVL
z!ih-zNc^gU$iju0enr_V7a147G!u<XGEKZ9nWPu8S4H(Hz7TKl32e#3J^FY5)JnOm
zD9xKGd(~~dr;ClT@&3b?uD~f{7fo5MYqcW)@NoDKII63`9o!;)2Sv+(4-wG9;7@u0
za^KNl`>8c37oQa9BQRMJH9m>@bzopsA~&m`Z|NJ|V3m&?#<8fBrHcmf%is_6yoMrV
z)mJrX>Q@<`k4U}j6Ux{V@T=>Q)&8D5ql0QNtdgzljW1G!rq0n=!1tnd$IL63LvcWm
zT^mTor?x4MSKaEgh>-O5H4F^kXfbMJzXpwwIi?AA$pb5#nl!Y;G4;-4LLShORWTI?
zt_6veqtU@}m@LXHA@Wmxu<w5Tp*r-HcdI(4;VJqN8FPfWlOu8<-*GFq^%eloG%|_V
zUkN*`8|+@^0lLqU(Vw#2p*U|<f15}y`y~;Wdd3!OZL~sJ!$Ii8!4&Kwx4+i-r!Avg
ztYyU0zYjXVrXii3&!6>LeW>UkR@DHVZWv=Q`^+6RbUnnbhoYWXP3ZJAd-+=Tqu4~Y
zM@+;4SC7=JFBFbR>({rkGM;-7eUCKQ#%g=&P`DV`ZI8Hxjf9swIl@>FMo2KGvsBdF
zUiz7@*O6;u0qB@}o;K#r6X)tS<~2&<?XlIKfG0w*#y1W5Bg&{5G?|6J%ioi5N6mlo
zAj;MXbfnkoVGY%%AP4gN)SS;`XC62_Q~)OsOclwVPvG?;tyE49_N#*cGB#kch?SxT
z0kZ&`Sj<M57fkWzlFBef4ihZ`BA60lkvXg$W+asAWNKc`S840hW~u{7dTz*D*L>a9
zRcKp1{tg#m*SBQSc;tbCE@K(``z#>u82KiIO3-`7P3Y6DTAzQ+rwc~<*Ac_M)S(c|
z4NzAeK~a^xno}J3<eMUUugl8q{+33CHSK!z!2UdyH}3oq6IdrncQ-7y7A)mnU>nX`
zrWLY>?Iqa{n~B{Wr&`7zDOS=AV*(=M73zZO@LDI3pClhcN(EY!)~!t&vQbk3&A3%I
z^`JfawA?+L2F((opj(ui*$hVg_E{s|FpIJ`(j((w1nqpaeIA5`?%|p~O3XzG@TTI)
zG`Diz9A%--SN?6#iJ=g7dKoTu3YV^*t%mp5dVj|EklmxWmWZ`8#Hf}6PERD7T0Ms}
z+#dzNBbPRn00HFb12~>HZ~&tz#?C@%;eN=U-B{GDYjaXb%+}(E119lpf2!OH?A=g{
z&D<;RYBIJ}x9rI+LDp`26x9Wd*!(EZ$_N7MGFF)P^KnE0=-2GS@{5L>mG-F>)7&16
zh{pTF#pBfISQU)uY|z=;Xh0vMR~(-Xr=Xl226r!Lr~!Pgw7PTF#K1&!2H$dpKJHw<
zm6Ht|ubB?QW|#+BvX0sBbWJu&iP)v<tHt%j)eo#Zm?Rt`oQBAk7v+f)U@~*q>P(KP
z=PH_{fw6ANK9Ks3p#!3^(mv#F3kLWNYYmm9m9b87?QDpFo^m-M>D`!zVf@qhWUpW)
zsI{j?#iA_S5XkNg_s1i%?6J6onL7({gOrt9GbIw)PQ5RZyLSerflW|ywR=TzcG6cT
z&IhAaIzVOtqORM5?)uC+dnQ}`Ma%{-#!C3vpYz!(EjB6-AGZ18X5dKhyR7V3!qJHV
z7mSI7t2`IeAz9d@(pvkeIq~ppUibxxx?61Q0Zc-WB*Cl_LzO=AL2>rMkfv`qcQ88Y
zc{7iV*Jjp;b>J9UrJW&!9RQ#arw_mZYn46!5S+dDpGW~C_Ya%$)A=tpm7k;DYz*ON
zb~$1XOrCbW+BnHLZlDc`*$i`+u5mM=m5?}ir9DW=fnzr(SNBA`Q?(A)-80&6`AMkS
zzTXf~6S`AQCQy)%^ww^=3dEfC*cu#OKD<FJA5{iasdY)sgcmR85l+$9D4~E$Vwde6
z2620+H=nBpIR$pWSH~wMIx4OPEz=>27AB(BtIN{G6COq8Ehms#HP_jk*9;COd!i>V
zGVLHDT;ttKwjxiX_AegkgJb#GN^_!)QJKQF@}OzQmx8g}M@G8M2t_)l5)uCRJ|Wq^
z&tL2JcCIU|A$+HCkQ}6$QKO>)+R(3*SNn)&wHkFwMlxW%Ay-Y&#xll4Rvr9EMynE0
zu_Go?6lbw!oFJb)n21e?qT$cCLaT`0kYity2GkVQ<VqMIhy+sp&*v}hbzt+UTssy_
zX6D^K)ey2<JnYP-I*6A5AIVgp5j*U0tp1+DxQGhzAJsQe+IIUd5gBt)MWhj?leZu=
zW`CZLcBtjXUt!+wD46*H1L))WbJtsobj;cxxnSpGZLF~O+_jgvyO#q;;rJ2EReR7>
z|Cbc*JOBVC(LDhkKe#7bKOk{#TrXepH*SJrTe|ao#H;pQz4*X)_irSwB6z9WvMyx(
zaX2RL6&@TGj7kA7t|X?hKx`{&0PWzx$sA#oKnSLh8PGBL!)e%XLYM`92N5wDt1sz;
zq+jB51`+11bXgfEq;<=&7gDcW57-fKR)l_SBA=hu8K;$sCXON<%EyavO$lZm`e0A@
zr2@@@b5Si!>Fy`cqL*X>)xyeuMi(v?>}F3Ts_WS^2J^7saVdNoE@ql&LcF3dx<Aq?
zqC*Dm<#-0mQCY#q5drQ2pLNk1X@5D@bq+Df->*<39U4{OR6KSc&$Ly}qbbjz4qRWp
zz(%a|Q4jpiB6<q@xirZc8UCoThwor?0^Z;Lei1YJ;RaBsMAZ&_+B17m1&+kIq(56;
z=EhsaTcZssr;@1WAi^bcf<?fEF*p+TenAlxUhn2|GCj!PQkj=BP#6EaDge!ZB4SCK
ztT*qjE$eU0GXJ!$)dM2;M-so*s7=y0<~{o|B66jA`vc3pc``>wz%Kqh<E2f9(zjZk
zdVk9KISlReM-G6~JksOzS3zP2IBPgYkwqg#;#-RM)Z|a}wcOV9!74PMasb&V0xBD-
zU#G21o(@Umh1X6>#Dib2XqFtY*&!qLnPAjiT@T0c+OzKexQg;OuJ`w3#pK+XUxxxw
z5Y1jD@B(^FURMrD<Us2*`t&av`h_usM9yL~!LIP>!xrTt2(EC0n2b=y8gIg|GgSQx
zjF4`YC5+@MdCUv<tX+1b3hrfaPtRM>7@=Gd1oH^R#x}}(aTq)$N6njYJ;;s92G3}<
zj-Q0#V+(YqN!m1iLj8Htl#h#GBL%b7lW5W27>9+L-r368TE+~D&7~Lm9(2b~)f#OT
zxh20^>_PjY*!gX!H*vpt%vrm+D{ID`KI!Z&NXcXR<|g>nPPD8&;dQzOf>O5DL5MmT
zFP}KH&-3<?D~&@o(EnkpR+cE-)D)4a`}{&cIJyA#ELff5W%R@~idwL*5pdK9Vlj1J
zo%*F_bPzYVPx!2s-s+&RG5d2<Pe4XP213~*U`yx-DpTpgCDw?E`5toPhnDX<2Ds{L
zyatI?XVt1zpRr#K-Iicd^Lqv3#qcV32l4(Jn0W{b0fjUtM0rYl+B|`Vl#elf1tQ8z
z*iTuhe9!?yr6=d$nRs-1OYbFc)B_{)(5R370jXd958_r)ffT5W9zUQ~n%-36SQ_Sf
z>Z%7`o6mNFW`9FjM;d11X(pzcsD6>aZiWx}Ne&h$cQPF#!fy0DgXn)V))oUSv-G3=
z04GeKM@2%oOze*z;0@Wa*rU#y8QlTlg*0y~vo4rXrYL5?Nhb0$`@UpKZ<JU}`(c`j
zPS|&)3!q_jS*gK2A^7RRuT@`x4>J$q_L*_JEXU#JHSpD&5FqUB-wTaHt!g>u>dpq8
zb~S-GsWU%FPqiuaF3-YG{G)ou9|qg_EgWEXfxbTxiG0vg9Z?@Tr>J<T)6T!A?`E|)
z15ifF&n9&3faeZ(T2>Sm%28}EYEb$_KH|x>-vu1-(87QWubnjlR_!Lk-E387Q`ex$
zTLN~ao{<k;H`unJ8Z7f=i>;N<!O=*&j<o!K7Tu|Dg#F#>*kkl9iv$M`Imo=8WOs7g
z1QB0rr3FX>n#JHlm@IY&#}f|u=BB-(O@bH^TW1KdS}ZVDWY$;#-3`?Uy@TlNLvHGF
z$j7xe&YD7cw~;7ecZ#a7UyV6%&{)#IC#%yLr~cRW-~gaC36EAi|77N%za6Pl#3J$?
zc-{}`QU)^ACTn<w?ps)pHwc@k+ScDM@lmZ9mTv6PjQoI-s8nhZ554HK$&o5U9$k!9
z)ZTGQPbQVd<nbj|DeX?DkTA~f%(RQHR9Mac{ck;@ydPhmGmUTChD=|vqq8U}25JZj
z*^=Us!KW$%i2JPokYaYWZ=5CO79!^|u77iM#hW))cyB`Ho_hcpA(kONu3<KL%lJ2c
zr<->k*jD2v%wIK=5MR82`%*R}^`uM~&@6!AApScG`2k`5wLen!Jl{2zNoFCNyHw>E
z5DuR|zA&<!`v|MSM4YU<>qYLc1EK$r(sq77DN`^{ANmUB-{Ow|`~ke_kqcTABg!Ho
z_$~ZduwBlhSJu!HMfRoc<q<e^xndtQKz5s)BIdG^i<qN~n25FXJ?u!|I|!Y$@88fI
z8(2TbopCt#^5;6z@?nr=$LIRMkmL{Y1971!twcN0x9ZG}si{{J$ell4IP$+p@aeu~
z6|e%IVSimZ1)E>tSHJBi>jlFAfW@hw<5vJ(H~*dRodqdUfa$rc;xxf<20(*d!GVDh
zL6*0ji2D=lOV>e<+KD*z0-#L}t_=(!+pnfSylns-NSoUeckdSP*6VAo&`6LJQr@c<
zd5`AS2Z;B!W)=-FzDLNFHJ>-b0DLBpCTEYiF~HnYpbni*bF@xq)sA5@8oiN@4nQq}
zH27!^=Hlafqy4oW#9F3pPwU9}%ea5E_3S-fG9@aSAwW)C7hW;Fzotr|o<*gLztlFw
z+kRbmkRbYZzus_`PrgWomMu%;)EGGH`FXh4_WO>#_xE7cN>t)FsP_Ho6anL;=9}Wo
zKpE6ws|Xtd8;H?L;)_o~lj>j-R62>1-=$3NU+SXIA<DV}6vSH<qmB`KmX{CLwyf76
zLgRcX4d~>R-f!mqK0fdJ#r%)=ZK1ZB0*`?EgBGu@{ZtIRw2JjT<`|*9LfFc5R<=&7
zc6hkK(kW3bc3w@hHLsq@pEfMKauK)@MsMnb%e>+^8uP|%F+aSsuthX(S9W9%!V;q3
z<D<9Ma32cQYRifn=gtHKN==v}CLC=+4}bP{R_6Btd+BGAtXy*<5p%TEHB}WkZiTD6
zdw~xSV2WcxE|ooi2E{$LXNej!qizf1(wF$dYLgb;c(lZB7y0tryXM%uQVu21LH+rA
z7U#X`5cR&$raaKNrx!n=8~otCi{a}*Y^a)vEVco6bIDV;=?yl^%*>#{i6ylypE1AJ
z4PB@oic}q?^J4hqtLUoE5x*jwns#4$t(4fGGYG((YqjFRR~Zz%WvEpknVAd7b%>`w
zN4Mx>8Axyze|qu`)lpO5=I)u4DVP4Lq{nlSeN$u}(*1x3)Qksi&p@pX>ep(dWqx%f
zLjH>)E$Z&WN-DZ}nV|&gwzsUDYp`Ao1pt6YOwgjz2WWU2>c_ze653SfyzgedFjKzB
z;HFjQQV6X{R?B?9^BF<0kKbswe;8TmiEfOq?0&KWxXu0N=YdQVkfHatTztRP#yfeA
z7lZs)qFEGsofoW`_>fmNBVrf-mAif!aAE&VE#kX5YQibC*yjwze()JmTF+HJ9$i6H
zGc<>~u0e25f>2E3$KR;Ze8^3*%t;r{9>NZ<HuB7GGnEnwUGm=G$iH`Uk{+&=Qc{@u
z3NI+>2CmGq9<X<m#*4UN*p_AsJ6<XoSP_DajOTQ=h2Mm+9Fy~*ET-uR0QIlA+=DjC
z67h`F);gW!3Bm=r;N+200uNbU;SvhQ0;NB>_{?16TvaOJF(8VNcS==l;jgH`rJ%xS
zblkF1#Z~d6Vt$SPMhfIzf;~*Yy#I@ysOKkvD%bW_*aRq7b0|x98!MTt#0~H$jvk4o
z=p`|cPANc*KV8p6Ze2Y4^L55<X=am_xml+6L+dYWrL;9&Ed}=`Mq$s1b+7bSBywUX
zFvM$4-SYL{ssI$yZp$fdDxz-%DOR2}MH*Qw1wmx@S$a3_#R=mRFRJ{Q_IV@p@E!lq
zbm2b7Vb;-atYdYYg-Gh$7jkb027IyMLx_?CK+b{JTFaZ7@^dklnlRqwb3F@q93Xc6
z1UKb=OXH=2gyti1wA!t-N*(zb(I1@c<&a$57qRzlO&Q4?(qOo|7e@E)wf<3aqlhkL
zuq>FXqtd<dvWnK2y0YwhM<MLGYd58MwSVJ}+mhbhXo*B6Z&M%)Muo3u7Kf-voYhA@
z5q_wGdw!?%OLlF1yt23qF^3z-_pT2q-&&W)w4H`d@>i4PO9#;%EAN=ngJ%pqUMfUP
zCiTw)Cp0m?)5N|bxUG1-h>aYGpK3+D+8sy{;Wb#nsG}?Cki>y&h};ry4W|BFj25CJ
zp4mBJR#lz<0yA=G?nq#>hfa%BQ&bG;W}Q~KkqZ*67fg>1mIE5b?jZ$GjE+;p!7MEE
zQJ_O{LVZ_|LLQ-=Q0oOIWJkGhlCdBzq*#?sAe4WO3OEd@luCnZWx`c~33V@8<nA`w
zEerOy%|&a*wp8I1_cXG)9w4bP*op`1v^mBq9JZHi*+@CoIdl$j9U3C>ALv%i*woza
zfA}~d(a#iUw!xdqRkwh5d?(KC69|QGMLU&LcVN-=zIOm;+rum4appYQ`QDGd{&Z-9
zKy%h`GgBf#G%u~yb`s&3e=VMdyd5@CqUIHyW$ei7IgE%VuMGAdmw9$4$u`=()-|x*
z^8^%k=EzZRxf7qvnFg3gkv+Y6U)C|7?L>6eyIt1|zwjliU`8jgM_U#`z#G61nZ$Co
z-&-(OEbD7_WcA-@kZlX5xEY~>Z#^V$5qnGeZDj`3@B}37$!`)L*vVQj#dP(n-t}GM
z4t0_ZCW<XsjJ$x|WpG1+f{ivOh5@|#hHdXVQ~HelN}wEaHZFlZM5Y*;*?xqz7C&Kp
z`cei^!BMH|^X7l1HV<ln0T~_t(5#&ag~kGlYV=0(nV*cf=^nhbLTKJ>M>4*hX5>-}
z2tpMcyOjZDZ-^UUc!koPLR`Cp)s3J9m3aS58boj~l&+ogFM;*rM-T<)H-4me*?`m<
zZg7P>7+HW})3tA!l}j{?(b{VCzsm(DHPEDxyJHwcbEJ8Cy|hQ5U}84PRKOZ!g(*n3
z_kU{=7ftXZkx8eOB*3Yb1e8o)SJ4cys}$%}FKQ3^1YDojfgXpO3!3t5BJX=j7zCEl
z>qg>Ru}G-2)}&{DdE~z^gRLYc6D!QY&ijN<8{Eaqq0#7^o?saBKB~!NDS=;Z-K$>w
z9{K^7!I~?b-qBfVf-Kr6Ri%;3X5v4e1I8Boy0s~KULnl%5VEKMG38@Pi`su!%=}vf
zc|D&D)bSw#-40#xRvg&Wyo?U_cef^?Mw~NmFxph&Y<mE2BbTgd!8KYK1RT^Q#`wiv
z3mO5<F9Ah>@R8_}mAXcj;odWn`W^_p!k~{-ogoNx3uCi)w@5wkD;abAC*!K2EE@t8
z>fxpF9}rGhx=wDz$WY|{EBgQ>c#b8N?s_5#S?R|!ukNG({h$qJ=J!XTwx_|M5s$t&
zn{e(9H(>1V5?EQqiEDv926yDKo-XzQ&Y*?W*m$Rco265i-Sf3T!PJ2Zy>+SaU92_n
znO)LtNuyErNj9A_7!O{;*{tk|!4~Bg4e8klGtmtVHvQ=;*Kb$mkVY40z0_QqSd*+{
zZqR2V0okDl;0PWWS((mDHG0v6F~aVxgXZvG#0REByWc_01)oJZVKpn=@B4|`A&&=R
z0%n9Z76}7e3ebuV>%?_BnN6f`yBd4nH(Aij2t1m4EK9r%(yr*ZU3IiR#0rKix-)j#
zk}UcrWv6!oVMG6wB+-;~8W!Pz$S?cRlL31`yND2_n6A`}8`nr5Rg~m^xm!^FAf4$L
z=D1tV&W9HCuN~SJAjsED<YGieT5Wpb+dYRz#qp9C!49NfWT|+5`@69*0V=XuE-pI_
z{MQPL@s1U$uOwUR@VFq7;B}6FDP9NIsQg2kppufJrGLK&gm<<w^gU@Yw639OTa?j+
z{N-*5z=XnX5~3cyV)kmzsgXT7u;tjo*`~ZHG#gX)b7c|an69C!g_Cm$fxiUeao&P0
z$i&PTxqC0Vod-!kkTlLtKf_2VQdSk+2`_}<*lY`d`f3qO2eBS!-kTjT<(#OY9@AA|
z?!Ij(I26wLKJ<P(T&vEy60i(PtiWinc=U<h<Wz0kQ?iD_UfZ48fK%%(X+O<()+X*A
z^4bVMYsy?t%wG;=0TBHnwx|#DxD5L<S$y6v%=Ay<{5$v~8s#gvW>*5up}d}HO55=y
z&F~(W7;M!fWl%1lv@klD6}VY+{)sg|>UPTD9!w2cZI<3qDQMBAnfB76RpaY>rws>x
zPjD|A`3VGy6JZ^^qcH9c*d45W$cjJuZhoe9@{Dg3_OMiz@C)z*y2I$D9?!FO16pb^
zQ7j!y{w+Aje95HiI1gi01OqKP0+!$0YMe}ZDt=}`z3Q37XttI9giBCD)UD|CKC^f(
zi9{O7P*?T-wGuJ@_-<{+r*cB*kPc+hqcmL61gQ{MA%4*cDOBK9udGH+l_4getNm>`
zPPgU*u-hh*qfPqLK<aZ?M{qq;Hu#&urlH#wmK~`DC4j{`Y^1WE?bm=zo%JG=>md($
zT|Io!v=JsDZV3I;@~$M^PLKw$bp|Gw=v4TeuQA`LEi<kl1>HdK#Q0g=FI+i$!4X}R
zVi<f`Y#6MKm-AU;xM3S$#f9J)=*7#N^xd)HJt53@`Lg#nVi8hCAZinV{j%^uLaLPt
z5h?D?@0W9;x(BFSWXPPPWzDC6emtiwwbQ0FIN2s@4skzvwwgrW<iZUr+mt&y%K{@`
zpYumuHuo%mz37@ilX(y%{iNn#18PTxt{yt3fIc?ZT#E~|ln~ovMC_yL^ksl3$c#Yn
z%o)jK=m1*RI!h`~O@s$>nIfs*ab505dJVzGsM3pWxZU#UTiGRcAAf!G83%SyLOx8j
zEG~}eDb<^aP@?<RKik1bowr$U5_!suxoU^VKK{|S|MU-!6j>D)uxo~qmxzHWrZ|_|
zF$$f>ya{X*OPY|xJ;@_h3fU>=@`C<PkZ2lh+JzvQqk!nqQ=Sa-mg;vC#rS2eVRCWF
z-L-HOVVy8v;=^mE2q#~>s?g$}cFw)k4L19I4&<k%`1bc1qJ(#=Y3?C}?PDC%?1-iA
zM1=ZvW6mslJ{@(gOoC;e$Z~IV-<k<lqp>HKB6E3kwkJ8D1-2{Z?h?1Ny!!jQLfx`P
z@RF~xAMeh&0e2p4ug95Qr~cUCbtpiRPeUHP;qZDW7JAN!0L>!ReA?dQJ+zQ6D{TQ*
zvnV#hlqQRaI;zn_zgSF05D>U}lpt8u`ek$>-Pl(bHAwcM$EIS9{U%6nDzD}#2{5?X
zEQ?gIbES?E8A2gd6ihj9PdlfPNRLxn1GO$U`tNsA97n$X2BgEXyEr7*`l4SGz0Sfx
zu{}OR8YVo6d~i;8mUKfi+-Bqlj9m%D^(W282VzY5Flv^AqaMQtAywHGEB#>CCQa7K
zrUl^E!fv2=OK2T1vv2~U*0WQ);u}M?&hczUbO;w)K-e7k^?)6=zcX0L9?9MAAHd{E
zsacjwqORQ4?o54i_`!*ptSt1}P;g67nQ99uJ(!{@O`^h*Nxxob=cZR*b>89knGjYg
zgml;QaZ<F$W^OpOe0U(30*f*$C)<+q{*o*s+k{`1xwdw$Hu*plhebY<MyF2=on`tq
z53<l)y_T+E4iRV@zt_B2tus(^Jpq)zy0f=O9L|*Jemi}@K8r(ox(T2<pSSYFO}?{i
z;ljp9#bM{}m2+^l1QKxgG%DRrs2_s(#)@)B)1$ks<1`}^VgdJ(%0DyaxJC07f0Hu|
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
Pv>pf431C8`IW_(Vlh5dv

literal 0
HcmV?d00001

diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml
index e56397aa94..387d4ecb59 100644
--- a/quickstep/res/values/styles.xml
+++ b/quickstep/res/values/styles.xml
@@ -47,12 +47,24 @@
         <item name="android:textSize">21sp</item>
     </style>
 
-    <style name="TextAppearance.GestureTutorial.Feedback"
+    <style name="TextAppearance.GestureTutorial.Feedback.Title"
         parent="TextAppearance.GestureTutorial">
-        <item name="android:gravity">center</item>
+        <item name="android:gravity">start</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:fontFamily">google-sans-display</item>
         <item name="android:letterSpacing">0.03</item>
-        <item name="android:textSize">21sp</item>
+        <item name="android:textSize">36sp</item>
+        <item name="android:lineHeight">42sp</item>
+    </style>
+
+    <style name="TextAppearance.GestureTutorial.Feedback.Subtitle"
+        parent="TextAppearance.GestureTutorial">
+        <item name="android:gravity">start</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:fontFamily">google-sans</item>
+        <item name="android:letterSpacing">0.03</item>
+        <item name="android:textSize">18sp</item>
+        <item name="android:lineHeight">24sp</item>
     </style>
 
     <style name="TextAppearance.GestureTutorial.ButtonLabel"
diff --git a/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialController.java
index 5c81e5f37b..7c293c330d 100644
--- a/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialController.java
@@ -18,7 +18,6 @@ package com.android.quickstep.interaction;
 import static com.android.quickstep.interaction.TutorialController.TutorialType.ASSISTANT_COMPLETE;
 
 import android.graphics.PointF;
-import android.view.View;
 
 import com.android.launcher3.R;
 import com.android.quickstep.interaction.EdgeBackGestureHandler.BackGestureResult;
@@ -59,11 +58,6 @@ final class AssistantGestureTutorialController extends TutorialController {
         return null;
     }
 
-    @Override
-    void onActionButtonClicked(View button) {
-        mTutorialFragment.closeTutorial();
-    }
-
     @Override
     public void onBackGestureAttempted(BackGestureResult result) {
         switch (mTutorialType) {
@@ -101,8 +95,7 @@ final class AssistantGestureTutorialController extends TutorialController {
                         showFeedback(R.string.assistant_gesture_feedback_swipe_too_far_from_corner);
                         break;
                     case ASSISTANT_COMPLETED:
-                        hideFeedback();
-                        hideHandCoachingAnimation();
+                        hideFeedback(true);
                         showRippleEffect(
                                 () -> {
                                     if (mTutorialFragment.isTutorialComplete()) {
diff --git a/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialFragment.java
index 16886ec177..b797f0cba3 100644
--- a/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialFragment.java
@@ -18,16 +18,10 @@ package com.android.quickstep.interaction;
 import android.view.MotionEvent;
 import android.view.View;
 
-import com.android.launcher3.R;
 import com.android.quickstep.interaction.TutorialController.TutorialType;
 
 /** Shows the Home gesture interactive tutorial. */
 public class AssistantGestureTutorialFragment extends TutorialFragment {
-    @Override
-    Integer getHandAnimationResId() {
-        return R.drawable.assistant_gesture;
-    }
-
     @Override
     TutorialController createController(TutorialType type) {
         return new AssistantGestureTutorialController(this, type);
diff --git a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
index a1b7e010c6..300ca7d77e 100644
--- a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
@@ -17,10 +17,14 @@ package com.android.quickstep.interaction;
 
 import static com.android.quickstep.interaction.TutorialController.TutorialType.BACK_NAVIGATION_COMPLETE;
 import static com.android.quickstep.interaction.TutorialController.TutorialType.LEFT_EDGE_BACK_NAVIGATION;
+import static com.android.quickstep.interaction.TutorialController.TutorialType.RIGHT_EDGE_BACK_NAVIGATION;
 
 import android.graphics.PointF;
 import android.view.View;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
+
 import com.android.launcher3.R;
 import com.android.quickstep.interaction.EdgeBackGestureHandler.BackGestureResult;
 import com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult;
@@ -73,13 +77,14 @@ final class BackGestureTutorialController extends TutorialController {
     }
 
     @Override
-    void onActionButtonClicked(View button) {
-        mTutorialFragment.closeTutorial();
+    void onActionTextButtonClicked(View button) {
+        mTutorialFragment.startSystemNavigationSetting();
     }
 
+    @Nullable
     @Override
-    void onActionTextButtonClicked(View button) {
-        mTutorialFragment.startSystemNavigationSetting();
+    public View getMockLauncherView() {
+        return null;
     }
 
     @Override
@@ -103,10 +108,12 @@ final class BackGestureTutorialController extends TutorialController {
     private void handleAttemptFromRight(BackGestureResult result) {
         switch (result) {
             case BACK_COMPLETED_FROM_RIGHT:
-                hideFeedback();
-                hideHandCoachingAnimation();
-                showRippleEffect(
-                        () -> mTutorialFragment.changeController(LEFT_EDGE_BACK_NAVIGATION));
+                hideFeedback(true);
+                mFakeTaskView.setBackground(AppCompatResources.getDrawable(mContext,
+                        R.drawable.sandbox_fake_google_search));
+                showRippleEffect(null);
+                showFeedback(R.string.back_gesture_feedback_complete,
+                        mTutorialFragment::continueTutorial);
                 break;
             case BACK_CANCELLED_FROM_RIGHT:
                 showFeedback(R.string.back_gesture_feedback_cancelled_right_edge);
@@ -125,16 +132,12 @@ final class BackGestureTutorialController extends TutorialController {
     private void handleAttemptFromLeft(BackGestureResult result) {
         switch (result) {
             case BACK_COMPLETED_FROM_LEFT:
-                hideFeedback();
-                hideHandCoachingAnimation();
-                showRippleEffect(
-                        () -> {
-                            if (mTutorialFragment.isTutorialComplete()) {
-                                mTutorialFragment.changeController(BACK_NAVIGATION_COMPLETE);
-                            } else {
-                                mTutorialFragment.continueTutorial();
-                            }
-                        });
+                hideFeedback(true);
+                mFakeTaskView.setBackground(AppCompatResources.getDrawable(mContext,
+                        R.drawable.sandbox_fake_google_search));
+                showRippleEffect(null);
+                showFeedback(R.string.back_gesture_feedback_complete_left_edge,
+                        () -> mTutorialFragment.changeController(RIGHT_EDGE_BACK_NAVIGATION));
                 break;
             case BACK_CANCELLED_FROM_LEFT:
                 showFeedback(R.string.back_gesture_feedback_cancelled_left_edge);
@@ -156,6 +159,9 @@ final class BackGestureTutorialController extends TutorialController {
             if (result == NavBarGestureResult.HOME_GESTURE_COMPLETED) {
                 mTutorialFragment.closeTutorial();
             }
+        } else if (mTutorialType == LEFT_EDGE_BACK_NAVIGATION
+                || mTutorialType == RIGHT_EDGE_BACK_NAVIGATION) {
+            showFeedback(R.string.back_gesture_feedback_swipe_in_nav_bar);
         }
     }
 }
diff --git a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java
index 41db684d44..b3eb1c06f5 100644
--- a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java
@@ -18,14 +18,19 @@ package com.android.quickstep.interaction;
 import android.view.MotionEvent;
 import android.view.View;
 
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.R;
 import com.android.quickstep.interaction.TutorialController.TutorialType;
 
 /** Shows the Back gesture interactive tutorial. */
 public class BackGestureTutorialFragment extends TutorialFragment {
+    @Nullable
     @Override
-    Integer getHandAnimationResId() {
-        return R.drawable.back_gesture;
+    Integer getFeedbackVideoResId() {
+        return mTutorialType == TutorialType.RIGHT_EDGE_BACK_NAVIGATION
+                ? R.raw.tips_nav_back_right
+                : R.raw.tips_nav_back_left;
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java b/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java
index 8b6777b6ac..ebb4bfc304 100644
--- a/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java
+++ b/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java
@@ -145,6 +145,7 @@ public class GestureSandboxActivity extends FragmentActivity {
                         | View.SYSTEM_UI_FLAG_LAYOUT_STABLE
                         | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
                         | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                        | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
                         | View.SYSTEM_UI_FLAG_FULLSCREEN);
         getWindow().setNavigationBarColor(Color.TRANSPARENT);
     }
diff --git a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
index fbf3a0a958..d0f21c2d7f 100644
--- a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
@@ -20,7 +20,6 @@ import static com.android.quickstep.interaction.TutorialController.TutorialType.
 import android.annotation.TargetApi;
 import android.graphics.PointF;
 import android.os.Build;
-import android.view.View;
 
 import com.android.launcher3.R;
 import com.android.quickstep.interaction.EdgeBackGestureHandler.BackGestureResult;
@@ -61,11 +60,6 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll
         return null;
     }
 
-    @Override
-    void onActionButtonClicked(View button) {
-        mTutorialFragment.closeTutorial();
-    }
-
     @Override
     public void onBackGestureAttempted(BackGestureResult result) {
         switch (mTutorialType) {
@@ -90,17 +84,16 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll
 
     @Override
     public void onNavBarGestureAttempted(NavBarGestureResult result, PointF finalVelocity) {
+        if (mHideFeedbackEndAction != null) {
+            return;
+        }
         switch (mTutorialType) {
             case HOME_NAVIGATION:
                 switch (result) {
                     case HOME_GESTURE_COMPLETED: {
-                        animateFakeTaskViewHome(finalVelocity, () -> {
-                            if (mTutorialFragment.isTutorialComplete()) {
-                                mTutorialFragment.changeController(HOME_NAVIGATION_COMPLETE);
-                            } else {
-                                mTutorialFragment.continueTutorial();
-                            }
-                        });
+                        animateFakeTaskViewHome(finalVelocity, null);
+                        showFeedback(R.string.home_gesture_feedback_complete,
+                                mTutorialFragment::continueTutorial);
                         break;
                     }
                     case HOME_NOT_STARTED_TOO_FAR_FROM_EDGE:
@@ -108,12 +101,12 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll
                         showFeedback(R.string.home_gesture_feedback_swipe_too_far_from_edge);
                         break;
                     case OVERVIEW_GESTURE_COMPLETED:
-                        fadeOutFakeTaskView(true, () ->
+                        fadeOutFakeTaskView(true, true, () ->
                                 showFeedback(R.string.home_gesture_feedback_overview_detected));
                         break;
                     case HOME_OR_OVERVIEW_NOT_STARTED_WRONG_SWIPE_DIRECTION:
                     case HOME_OR_OVERVIEW_CANCELLED:
-                        fadeOutFakeTaskView(false, null);
+                        fadeOutFakeTaskView(false, true, null);
                         showFeedback(R.string.home_gesture_feedback_wrong_swipe_direction);
                         break;
                 }
diff --git a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialFragment.java
index 63595a5283..31e03510dc 100644
--- a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialFragment.java
@@ -15,14 +15,17 @@
  */
 package com.android.quickstep.interaction;
 
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.R;
 import com.android.quickstep.interaction.TutorialController.TutorialType;
 
 /** Shows the Home gesture interactive tutorial. */
 public class HomeGestureTutorialFragment extends TutorialFragment {
+    @Nullable
     @Override
-    Integer getHandAnimationResId() {
-        return R.drawable.home_gesture;
+    Integer getFeedbackVideoResId() {
+        return R.raw.tips_nav_home;
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
index 31f26d1a05..66e6a0d3fd 100644
--- a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
@@ -15,14 +15,21 @@
  */
 package com.android.quickstep.interaction;
 
+import static com.android.launcher3.anim.Interpolators.ACCEL;
 import static com.android.quickstep.interaction.TutorialController.TutorialType.OVERVIEW_NAVIGATION_COMPLETE;
 
+import android.animation.AnimatorSet;
 import android.annotation.TargetApi;
 import android.graphics.PointF;
 import android.os.Build;
 import android.view.View;
 
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.R;
+import com.android.launcher3.anim.PendingAnimation;
+import com.android.quickstep.AnimatedFloat;
+import com.android.quickstep.SwipeUpAnimationLogic;
 import com.android.quickstep.interaction.EdgeBackGestureHandler.BackGestureResult;
 import com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult;
 
@@ -62,9 +69,10 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont
         return null;
     }
 
+    @Nullable
     @Override
-    void onActionButtonClicked(View button) {
-        mTutorialFragment.closeTutorial();
+    public View getMockLauncherView() {
+        return null;
     }
 
     @Override
@@ -91,12 +99,17 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont
 
     @Override
     public void onNavBarGestureAttempted(NavBarGestureResult result, PointF finalVelocity) {
+        if (mHideFeedbackEndAction != null) {
+            return;
+        }
         switch (mTutorialType) {
             case OVERVIEW_NAVIGATION:
                 switch (result) {
                     case HOME_GESTURE_COMPLETED: {
-                        animateFakeTaskViewHome(finalVelocity, () ->
-                                showFeedback(R.string.overview_gesture_feedback_home_detected));
+                        animateFakeTaskViewHome(finalVelocity, () -> {
+                            resetFakeTaskView();
+                            showFeedback(R.string.overview_gesture_feedback_home_detected);
+                        });
                         break;
                     }
                     case HOME_NOT_STARTED_TOO_FAR_FROM_EDGE:
@@ -104,17 +117,19 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont
                         showFeedback(R.string.overview_gesture_feedback_swipe_too_far_from_edge);
                         break;
                     case OVERVIEW_GESTURE_COMPLETED:
-                        fadeOutFakeTaskView(true, () -> {
-                            if (mTutorialFragment.isTutorialComplete()) {
-                                mTutorialFragment.changeController(OVERVIEW_NAVIGATION_COMPLETE);
-                            } else {
-                                mTutorialFragment.continueTutorial();
-                            }
-                        });
+                        PendingAnimation anim = new PendingAnimation(300);
+                        anim.setFloat(mTaskViewSwipeUpAnimation
+                                .getCurrentShift(), AnimatedFloat.VALUE, 1, ACCEL);
+                        AnimatorSet animset = anim.buildAnim();
+                        animset.start();
+                        mRunningWindowAnim = SwipeUpAnimationLogic.RunningWindowAnim.wrap(animset);
+                        onMotionPaused(true /*arbitrary value*/);
+                        showFeedback(R.string.overview_gesture_feedback_complete,
+                                mTutorialFragment::continueTutorial);
                         break;
                     case HOME_OR_OVERVIEW_NOT_STARTED_WRONG_SWIPE_DIRECTION:
                     case HOME_OR_OVERVIEW_CANCELLED:
-                        fadeOutFakeTaskView(false, null);
+                        fadeOutFakeTaskView(false, true, null);
                         showFeedback(R.string.overview_gesture_feedback_wrong_swipe_direction);
                         break;
                 }
diff --git a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java
index 93200bb21d..c6213e3858 100644
--- a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java
@@ -15,14 +15,17 @@
  */
 package com.android.quickstep.interaction;
 
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.R;
 import com.android.quickstep.interaction.TutorialController.TutorialType;
 
 /** Shows the Overview gesture interactive tutorial. */
 public class OverviewGestureTutorialFragment extends TutorialFragment {
+    @Nullable
     @Override
-    Integer getHandAnimationResId() {
-        return R.drawable.overview_gesture;
+    Integer getFeedbackVideoResId() {
+        return R.raw.tips_nav_overview;
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java b/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java
index 4c1a595148..3a6d434875 100644
--- a/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java
@@ -16,7 +16,6 @@
 package com.android.quickstep.interaction;
 
 import android.graphics.PointF;
-import android.view.View;
 
 import androidx.annotation.Nullable;
 
@@ -49,11 +48,6 @@ public class SandboxModeTutorialController extends SwipeUpGestureTutorialControl
         return null;
     }
 
-    @Override
-    void onActionButtonClicked(View button) {
-        mTutorialFragment.closeTutorial();
-    }
-
     @Override
     public void onBackGestureAttempted(BackGestureResult result) {
         switch (result) {
@@ -87,7 +81,7 @@ public class SandboxModeTutorialController extends SwipeUpGestureTutorialControl
                 });
                 break;
             case OVERVIEW_GESTURE_COMPLETED:
-                fadeOutFakeTaskView(true, () -> {
+                fadeOutFakeTaskView(true, true, () -> {
                     showFeedback(R.string.sandbox_mode_overview_gesture_feedback_successful);
                 });
                 break;
diff --git a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
index 68c63bf611..8fc453d303 100644
--- a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
@@ -27,17 +27,15 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.annotation.TargetApi;
 import android.content.Context;
-import android.graphics.Insets;
 import android.graphics.Outline;
 import android.graphics.PointF;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.os.Build;
+import android.util.DisplayMetrics;
 import android.view.SurfaceControl;
 import android.view.View;
 import android.view.ViewOutlineProvider;
-import android.view.WindowInsets;
-import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -56,7 +54,6 @@ import com.android.quickstep.SwipeUpAnimationLogic;
 import com.android.quickstep.SwipeUpAnimationLogic.RunningWindowAnim;
 import com.android.quickstep.util.RectFSpringAnim;
 import com.android.quickstep.util.TransformParams;
-import com.android.systemui.shared.system.QuickStepContract;
 import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
 
 @TargetApi(Build.VERSION_CODES.R)
@@ -64,13 +61,37 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
 
     private static final int FAKE_PREVIOUS_TASK_MARGIN = Utilities.dpToPx(12);
 
-    private final ViewSwipeUpAnimation mTaskViewSwipeUpAnimation;
+    final ViewSwipeUpAnimation mTaskViewSwipeUpAnimation;
     private float mFakeTaskViewRadius;
     private Rect mFakeTaskViewRect = new Rect();
-    private RunningWindowAnim mRunningWindowAnim;
+    RunningWindowAnim mRunningWindowAnim;
     private boolean mShowTasks = false;
     private boolean mShowPreviousTasks = false;
 
+    private AnimatorListenerAdapter mResetTaskView = new AnimatorListenerAdapter() {
+        @Override
+        public void onAnimationEnd(Animator animation) {
+            mFakeLauncherView.setVisibility(View.INVISIBLE);
+            mFakeIconView.setVisibility(View.INVISIBLE);
+            if (mTutorialFragment.getActivity() != null) {
+                DisplayMetrics displayMetrics =
+                        mTutorialFragment.getResources().getDisplayMetrics();
+                int height = displayMetrics.heightPixels;
+                int width = displayMetrics.widthPixels;
+                mFakeTaskViewRect.set(0, 0, width, height);
+            }
+            mFakeTaskViewRadius = 0;
+            mFakeTaskView.invalidateOutline();
+            mFakeTaskView.setVisibility(View.VISIBLE);
+            mFakeTaskView.setAlpha(1);
+            mFakePreviousTaskView.setVisibility(View.INVISIBLE);
+            mFakePreviousTaskView.setAlpha(1);
+            mShowTasks = false;
+            mShowPreviousTasks = false;
+            mRunningWindowAnim = null;
+        }
+    };
+
     SwipeUpGestureTutorialController(TutorialFragment tutorialFragment, TutorialType tutorialType) {
         super(tutorialFragment, tutorialType);
         RecentsAnimationDeviceState deviceState = new RecentsAnimationDeviceState(mContext);
@@ -83,14 +104,13 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
         DeviceProfile dp = InvariantDeviceProfile.INSTANCE.get(mContext)
                 .getDeviceProfile(mContext)
                 .copy(mContext);
-        Insets insets = mContext.getSystemService(WindowManager.class)
-                .getCurrentWindowMetrics()
-                .getWindowInsets()
-                .getInsets(WindowInsets.Type.systemBars());
-        dp.updateInsets(new Rect(insets.left, insets.top, insets.right, insets.bottom));
         mTaskViewSwipeUpAnimation.initDp(dp);
 
-        mFakeTaskViewRadius = QuickStepContract.getWindowCornerRadius(mContext.getResources());
+        DisplayMetrics displayMetrics = mContext.getResources().getDisplayMetrics();
+        int height = displayMetrics.heightPixels;
+        int width = displayMetrics.widthPixels;
+        mFakeTaskViewRect.set(0, 0, width, height);
+        mFakeTaskViewRadius = 0;
 
         ViewOutlineProvider outlineProvider = new ViewOutlineProvider() {
             @Override
@@ -114,24 +134,11 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
     }
 
     /** Fades the task view, optionally after animating to a fake Overview. */
-    void fadeOutFakeTaskView(boolean toOverviewFirst, @Nullable Runnable onEndRunnable) {
-        hideFeedback();
-        hideHandCoachingAnimation();
+    void fadeOutFakeTaskView(boolean toOverviewFirst, boolean reset,
+                             @Nullable Runnable onEndRunnable) {
+        hideFeedback(true);
         cancelRunningAnimation();
         PendingAnimation anim = new PendingAnimation(300);
-        AnimatorListenerAdapter resetTaskView = new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(Animator animation, boolean isReverse) {
-                mFakeIconView.setVisibility(View.INVISIBLE);
-                mFakeTaskView.setVisibility(View.INVISIBLE);
-                mFakeTaskView.setAlpha(1);
-                mFakePreviousTaskView.setVisibility(View.INVISIBLE);
-                mFakePreviousTaskView.setAlpha(1);
-                mShowTasks = false;
-                mShowPreviousTasks = false;
-                mRunningWindowAnim = null;
-            }
-        };
         if (toOverviewFirst) {
             anim.setFloat(mTaskViewSwipeUpAnimation
                     .getCurrentShift(), AnimatedFloat.VALUE, 1, ACCEL);
@@ -139,9 +146,17 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
                 @Override
                 public void onAnimationEnd(Animator animation, boolean isReverse) {
                     PendingAnimation fadeAnim = new PendingAnimation(300);
-                    fadeAnim.setViewAlpha(mFakeTaskView, 0, ACCEL);
-                    fadeAnim.setViewAlpha(mFakePreviousTaskView, 0, ACCEL);
-                    fadeAnim.addListener(resetTaskView);
+                    if (reset) {
+                        fadeAnim.setFloat(mTaskViewSwipeUpAnimation
+                                .getCurrentShift(), AnimatedFloat.VALUE, 0, ACCEL);
+                        fadeAnim.addListener(mResetTaskView);
+                    } else {
+                        fadeAnim.setViewAlpha(mFakeTaskView, 0, ACCEL);
+                        fadeAnim.setViewAlpha(mFakePreviousTaskView, 0, ACCEL);
+                    }
+                    if (onEndRunnable != null) {
+                        fadeAnim.addListener(AnimationSuccessListener.forRunnable(onEndRunnable));
+                    }
                     AnimatorSet animset = fadeAnim.buildAnim();
                     animset.setStartDelay(100);
                     animset.start();
@@ -149,36 +164,62 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
                 }
             });
         } else {
-            anim.setViewAlpha(mFakeTaskView, 0, ACCEL);
-            anim.setViewAlpha(mFakePreviousTaskView, 0, ACCEL);
-            anim.setViewAlpha(mFakeIconView, 0, ACCEL);
-            anim.addListener(resetTaskView);
-        }
-        if (onEndRunnable != null) {
-            anim.addListener(AnimationSuccessListener.forRunnable(onEndRunnable));
+            if (reset) {
+                anim.setFloat(mTaskViewSwipeUpAnimation
+                        .getCurrentShift(), AnimatedFloat.VALUE, 0, ACCEL);
+                anim.addListener(mResetTaskView);
+            } else {
+                anim.setViewAlpha(mFakeTaskView, 0, ACCEL);
+                anim.setViewAlpha(mFakePreviousTaskView, 0, ACCEL);
+            }
+            if (onEndRunnable != null) {
+                anim.addListener(AnimationSuccessListener.forRunnable(onEndRunnable));
+            }
         }
         AnimatorSet animset = anim.buildAnim();
         animset.start();
         mRunningWindowAnim = RunningWindowAnim.wrap(animset);
     }
 
+    void resetFakeTaskView() {
+        PendingAnimation anim = new PendingAnimation(300);
+        anim.setFloat(mTaskViewSwipeUpAnimation
+                .getCurrentShift(), AnimatedFloat.VALUE, 0, ACCEL);
+        anim.setViewAlpha(mFakeTaskView, 1, ACCEL);
+        anim.addListener(mResetTaskView);
+        AnimatorSet animset = anim.buildAnim();
+        animset.start();
+        mRunningWindowAnim = RunningWindowAnim.wrap(animset);
+    }
+
     void animateFakeTaskViewHome(PointF finalVelocity, @Nullable Runnable onEndRunnable) {
-        hideFeedback();
-        hideHandCoachingAnimation();
+        hideFeedback(true);
         cancelRunningAnimation();
         mFakePreviousTaskView.setVisibility(View.INVISIBLE);
+        mFakeLauncherView.setVisibility(View.VISIBLE);
         mShowPreviousTasks = false;
         RectFSpringAnim rectAnim =
                 mTaskViewSwipeUpAnimation.handleSwipeUpToHome(finalVelocity);
         // After home animation finishes, fade out and run onEndRunnable.
-        rectAnim.addAnimatorListener(AnimationSuccessListener.forRunnable(
-                () -> fadeOutFakeTaskView(false, onEndRunnable)));
+        PendingAnimation fadeAnim = new PendingAnimation(300);
+        fadeAnim.setViewAlpha(mFakeIconView, 0, ACCEL);
+        if (onEndRunnable != null) {
+            fadeAnim.addListener(AnimationSuccessListener.forRunnable(onEndRunnable));
+        }
+        AnimatorSet animset = fadeAnim.buildAnim();
+        rectAnim.addAnimatorListener(AnimationSuccessListener.forRunnable(animset::start));
         mRunningWindowAnim = RunningWindowAnim.wrap(rectAnim);
     }
 
     @Override
     public void setNavBarGestureProgress(@Nullable Float displacement) {
-        if (displacement == null || mTutorialType == HOME_NAVIGATION_COMPLETE
+        if (mHideFeedbackEndAction != null) {
+            return;
+        }
+        if (displacement != null) {
+            hideFeedback(true);
+        }
+        if (mTutorialType == HOME_NAVIGATION_COMPLETE
                 || mTutorialType == OVERVIEW_NAVIGATION_COMPLETE) {
             mFakeTaskView.setVisibility(View.INVISIBLE);
             mFakePreviousTaskView.setVisibility(View.INVISIBLE);
@@ -188,7 +229,7 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
             if (mShowPreviousTasks) {
                 mFakePreviousTaskView.setVisibility(View.VISIBLE);
             }
-            if (mRunningWindowAnim == null) {
+            if (mRunningWindowAnim == null && displacement != null) {
                 mTaskViewSwipeUpAnimation.updateDisplacement(displacement);
             }
         }
@@ -196,6 +237,9 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
 
     @Override
     public void onMotionPaused(boolean unused) {
+        if (mHideFeedbackEndAction != null) {
+            return;
+        }
         if (mShowTasks) {
             if (!mShowPreviousTasks) {
                 mFakePreviousTaskView.setTranslationX(
@@ -253,9 +297,9 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
                 @NonNull
                 @Override
                 public RectF getWindowTargetRect() {
-                    int fakeHomeIconSizePx = mDp.allAppsIconSizePx;
-                    int fakeHomeIconLeft = (mDp.widthPx - fakeHomeIconSizePx) / 2;
-                    int fakeHomeIconTop = mDp.heightPx - (mDp.allAppsCellHeightPx * 3);
+                    int fakeHomeIconSizePx = Utilities.dpToPx(60);
+                    int fakeHomeIconLeft = mFakeLauncherView.getLeft();
+                    int fakeHomeIconTop = mDp.heightPx - Utilities.dpToPx(216);
                     return new RectF(fakeHomeIconLeft, fakeHomeIconTop,
                             fakeHomeIconLeft + fakeHomeIconSizePx,
                             fakeHomeIconTop + fakeHomeIconSizePx);
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
index 12d2efcb8c..cbab4f9aca 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
@@ -19,17 +19,21 @@ import android.content.Context;
 import android.graphics.drawable.RippleDrawable;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.VideoView;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
 
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.R;
+import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.views.ClipIconView;
 import com.android.quickstep.interaction.EdgeBackGestureHandler.BackGestureAttemptCallback;
 import com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureAttemptCallback;
@@ -37,8 +41,8 @@ import com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureAttem
 abstract class TutorialController implements BackGestureAttemptCallback,
         NavBarGestureAttemptCallback {
 
-    private static final int FEEDBACK_VISIBLE_MS = 3000;
-    private static final int FEEDBACK_ANIMATION_MS = 500;
+    private static final int FEEDBACK_VISIBLE_MS = 2500;
+    private static final int FEEDBACK_ANIMATION_MS = 250;
     private static final int RIPPLE_VISIBLE_MS = 300;
 
     final TutorialFragment mTutorialFragment;
@@ -48,18 +52,18 @@ abstract class TutorialController implements BackGestureAttemptCallback,
     final ImageButton mCloseButton;
     final TextView mTitleTextView;
     final TextView mSubtitleTextView;
-    final TextView mFeedbackView;
-    final View mLauncherView;
+    final ViewGroup mFeedbackView;
+    final VideoView mFeedbackVideoView;
+    final ImageView mFakeLauncherView;
     final ClipIconView mFakeIconView;
     final View mFakeTaskView;
     final View mFakePreviousTaskView;
     final View mRippleView;
     final RippleDrawable mRippleDrawable;
-    @Nullable final TutorialHandAnimation mHandCoachingAnimation;
-    final ImageView mHandCoachingView;
     final Button mActionTextButton;
     final Button mActionButton;
     private final Runnable mHideFeedbackRunnable;
+    Runnable mHideFeedbackEndAction;
 
     TutorialController(TutorialFragment tutorialFragment, TutorialType tutorialType) {
         mTutorialFragment = tutorialFragment;
@@ -72,34 +76,23 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         mTitleTextView = rootView.findViewById(R.id.gesture_tutorial_fragment_title_view);
         mSubtitleTextView = rootView.findViewById(R.id.gesture_tutorial_fragment_subtitle_view);
         mFeedbackView = rootView.findViewById(R.id.gesture_tutorial_fragment_feedback_view);
-        mLauncherView = getMockLauncherView();
+        mFeedbackVideoView = rootView.findViewById(R.id.gesture_tutorial_feedback_video);
+        mFakeLauncherView = rootView.findViewById(R.id.gesture_tutorial_fake_launcher_view);
         mFakeIconView = rootView.findViewById(R.id.gesture_tutorial_fake_icon_view);
         mFakeTaskView = rootView.findViewById(R.id.gesture_tutorial_fake_task_view);
         mFakePreviousTaskView =
                 rootView.findViewById(R.id.gesture_tutorial_fake_previous_task_view);
         mRippleView = rootView.findViewById(R.id.gesture_tutorial_ripple_view);
         mRippleDrawable = (RippleDrawable) mRippleView.getBackground();
-        mHandCoachingAnimation = tutorialFragment.getHandAnimation();
-        mHandCoachingView = rootView.findViewById(R.id.gesture_tutorial_fragment_hand_coaching);
-        mHandCoachingView.bringToFront();
         mActionTextButton =
                 rootView.findViewById(R.id.gesture_tutorial_fragment_action_text_button);
         mActionButton = rootView.findViewById(R.id.gesture_tutorial_fragment_action_button);
 
         mHideFeedbackRunnable =
-                () -> mFeedbackView.animate().alpha(0).setDuration(FEEDBACK_ANIMATION_MS)
-                        .withEndAction(this::showHandCoachingAnimation).start();
-
-        if (mLauncherView != null) {
-            rootView.addView(mLauncherView, 0);
-        }
-        if (mContext != null) {
-            rootView.setBackground(mContext.getDrawable(getMockWallpaperResId()));
-            mFakeTaskView.setBackground(mContext.getDrawable(getMockAppTaskThumbnailResId()));
-            mFakePreviousTaskView.setBackground(
-                    mContext.getDrawable(getMockPreviousAppTaskThumbnailResId()));
-            mFakeIconView.setBackground(mContext.getDrawable(getMockAppIconResId()));
-        }
+                () -> mFeedbackView.animate()
+                        .translationY(-mFeedbackView.getTop() - mFeedbackView.getHeight())
+                        .setDuration(FEEDBACK_ANIMATION_MS)
+                        .withEndAction(this::hideFeedbackEndAction).start();
     }
 
     void setTutorialType(TutorialType tutorialType) {
@@ -126,6 +119,11 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         return null;
     }
 
+    @DrawableRes
+    protected int getMockLauncherResId() {
+        return R.drawable.default_sandbox_mock_launcher;
+    }
+
     @DrawableRes
     protected int getMockAppTaskThumbnailResId() {
         return R.drawable.default_sandbox_app_task_thumbnail;
@@ -153,19 +151,76 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         return R.drawable.default_sandbox_wallpaper;
     }
 
-    void showFeedback(int resId) {
-        hideHandCoachingAnimation();
-        mFeedbackView.setText(resId);
-        mFeedbackView.animate().alpha(1).setDuration(FEEDBACK_ANIMATION_MS).start();
+    void fadeTaskViewAndRun(Runnable r) {
+        mFakeTaskView.animate().alpha(0).setListener(AnimationSuccessListener.forRunnable(r));
+    }
+
+    /**
+     * Show feedback reflecting a failed gesture attempt.
+     *
+     * @param subtitleResId Resource of the text to display.
+     **/
+    void showFeedback(int subtitleResId) {
+        showFeedback(subtitleResId, null);
+    }
+
+    /**
+     * Show feedback reflecting the result of a gesture attempt.
+     *
+     * @param successEndAction Non-null iff the gesture was successful; this is run after the
+     *                        feedback is shown (i.e. to go to the next step)
+     **/
+    void showFeedback(int subtitleResId, @Nullable Runnable successEndAction) {
+        if (mHideFeedbackEndAction != null) {
+            return;
+        }
+        int visibleDuration = FEEDBACK_VISIBLE_MS;
+        if (mTutorialFragment.getFeedbackVideoResId() != null) {
+            if (successEndAction == null) {
+                if (mFeedbackVideoView.isPlaying()) {
+                    mFeedbackVideoView.seekTo(1);
+                } else {
+                    mFeedbackVideoView.start();
+                }
+                mFeedbackVideoView.setVisibility(View.VISIBLE);
+                visibleDuration = mTutorialFragment.getFeedbackVideoDuration();
+            } else {
+                mTutorialFragment.releaseFeedbackVideoView();
+            }
+        }
+        TextView title = mFeedbackView.findViewById(R.id.gesture_tutorial_fragment_feedback_title);
+        title.setText(successEndAction == null
+                ? R.string.gesture_tutorial_try_again
+                : R.string.gesture_tutorial_nice);
+        TextView subtitle =
+                mFeedbackView.findViewById(R.id.gesture_tutorial_fragment_feedback_subtitle);
+        subtitle.setText(subtitleResId);
+        mHideFeedbackEndAction = successEndAction;
+        mFeedbackView.setTranslationY(-mFeedbackView.getHeight() - mFeedbackView.getTop());
+        mFeedbackView.setVisibility(View.VISIBLE);
+        mFeedbackView.animate()
+                .setDuration(FEEDBACK_ANIMATION_MS)
+                .translationY(0)
+                .start();
         mFeedbackView.removeCallbacks(mHideFeedbackRunnable);
-        mFeedbackView.postDelayed(mHideFeedbackRunnable, FEEDBACK_VISIBLE_MS);
+        mFeedbackView.postDelayed(mHideFeedbackRunnable, visibleDuration);
     }
 
-    void hideFeedback() {
-        mFeedbackView.setText(null);
+    void hideFeedback(boolean releaseFeedbackVideo) {
         mFeedbackView.removeCallbacks(mHideFeedbackRunnable);
+        mHideFeedbackEndAction = null;
         mFeedbackView.clearAnimation();
-        mFeedbackView.setAlpha(0);
+        mFeedbackView.setVisibility(View.INVISIBLE);
+        if (releaseFeedbackVideo) {
+            mTutorialFragment.releaseFeedbackVideoView();
+        }
+    }
+
+    void hideFeedbackEndAction() {
+        if (mHideFeedbackEndAction != null) {
+            mHideFeedbackEndAction.run();
+            mHideFeedbackEndAction = null;
+        }
     }
 
     void setRippleHotspot(float x, float y) {
@@ -183,38 +238,21 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         }, RIPPLE_VISIBLE_MS);
     }
 
-    void onActionButtonClicked(View button) {}
-
-    void onActionTextButtonClicked(View button) {}
-
-    void showHandCoachingAnimation() {
-        if (isComplete() || mHandCoachingAnimation == null) {
-            return;
-        }
-        mHandCoachingAnimation.startLoopedAnimation(mTutorialType);
+    void onActionButtonClicked(View button) {
+        mTutorialFragment.closeTutorial();
     }
 
-    void hideHandCoachingAnimation() {
-        if (mHandCoachingAnimation == null) {
-            return;
-        }
-        mHandCoachingAnimation.stop();
-        mHandCoachingView.setVisibility(View.INVISIBLE);
-    }
+    void onActionTextButtonClicked(View button) {}
 
     @CallSuper
     void transitToController() {
-        hideFeedback();
+        hideFeedback(false);
         updateTitles();
         updateActionButtons();
+        updateDrawables();
 
-        if (isComplete()) {
-            hideHandCoachingAnimation();
-        } else {
-            showHandCoachingAnimation();
-        }
-        if (mLauncherView != null) {
-            mLauncherView.setVisibility(isComplete() ? View.INVISIBLE : View.VISIBLE);
+        if (mFakeLauncherView != null) {
+            mFakeLauncherView.setVisibility(View.INVISIBLE);
         }
     }
 
@@ -253,6 +291,24 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         button.setOnClickListener(listener);
     }
 
+    private void updateDrawables() {
+        if (mContext != null) {
+            mTutorialFragment.getRootView().setBackground(AppCompatResources.getDrawable(
+                    mContext, getMockWallpaperResId()));
+            mTutorialFragment.updateFeedbackVideo();
+            mFakeLauncherView.setImageDrawable(AppCompatResources.getDrawable(
+                    mContext, getMockLauncherResId()));
+            mFakeTaskView.setBackground(AppCompatResources.getDrawable(
+                    mContext, getMockAppTaskThumbnailResId()));
+            mFakeTaskView.animate().alpha(1).setListener(AnimationSuccessListener.forRunnable(
+                    () -> mFakeTaskView.animate().cancel()));
+            mFakePreviousTaskView.setBackground(AppCompatResources.getDrawable(
+                    mContext, getMockPreviousAppTaskThumbnailResId()));
+            mFakeIconView.setBackground(AppCompatResources.getDrawable(
+                    mContext, getMockAppIconResId()));
+        }
+    }
+
     private boolean isComplete() {
         return mTutorialType == TutorialType.BACK_NAVIGATION_COMPLETE
                 || mTutorialType == TutorialType.HOME_NAVIGATION_COMPLETE
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
index 413387e1f5..6e30ad0e04 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
@@ -15,8 +15,10 @@
  */
 package com.android.quickstep.interaction;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.graphics.Insets;
+import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -25,6 +27,7 @@ import android.view.View;
 import android.view.View.OnTouchListener;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
+import android.widget.VideoView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -32,6 +35,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
 import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
 import com.android.quickstep.interaction.TutorialController.TutorialType;
 
 abstract class TutorialFragment extends Fragment implements OnTouchListener {
@@ -42,9 +46,10 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
     TutorialType mTutorialType;
     @Nullable TutorialController mTutorialController = null;
     RootSandboxLayout mRootView;
-    @Nullable TutorialHandAnimation mHandCoachingAnimation = null;
     EdgeBackGestureHandler mEdgeBackGestureHandler;
     NavBarGestureHandler mNavBarGestureHandler;
+    private VideoView mFeedbackVideoView;
+    private int mFeedbackVideoDuration;
 
     public static TutorialFragment newInstance(TutorialType tutorialType) {
         TutorialFragment fragment = getFragmentForTutorialType(tutorialType);
@@ -83,7 +88,7 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
         return null;
     }
 
-    @Nullable Integer getHandAnimationResId() {
+    @Nullable Integer getFeedbackVideoResId() {
         return null;
     }
 
@@ -120,27 +125,64 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
             return insets;
         });
         mRootView.setOnTouchListener(this);
-        Integer handAnimationResId = getHandAnimationResId();
-        if (handAnimationResId != null) {
-            mHandCoachingAnimation =
-                new TutorialHandAnimation(getContext(), mRootView, handAnimationResId);
-        }
+        mFeedbackVideoView = mRootView.findViewById(R.id.gesture_tutorial_feedback_video);
         return mRootView;
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
-        changeController(mTutorialType);
+    public void onStart() {
+        super.onStart();
+        initializeFeedbackVideoView();
     }
 
     @Override
-    public void onPause() {
-        super.onPause();
+    public void onStop() {
+        super.onStop();
+        releaseFeedbackVideoView();
+    }
 
-        if (mHandCoachingAnimation != null) {
-            mHandCoachingAnimation.stop();
+    void initializeFeedbackVideoView() {
+        if (!updateFeedbackVideo()) {
+            mFeedbackVideoView.setVisibility(View.INVISIBLE);
+            return;
+        } else {
+            mFeedbackVideoView.setVisibility(View.VISIBLE);
         }
+        int heightPixels = getResources().getDisplayMetrics().heightPixels;
+        int heightPixelsWithMargin = heightPixels + Utilities.dpToPx(80);
+        int widthPixels = getResources().getDisplayMetrics().widthPixels - Utilities.dpToPx(12);
+        mFeedbackVideoView.setScaleY((float) heightPixelsWithMargin / heightPixels);
+        mFeedbackVideoView.setScaleX((float) heightPixelsWithMargin / widthPixels);
+        mFeedbackVideoView.start();
+        mFeedbackVideoView.setOnPreparedListener(
+                mp -> mFeedbackVideoDuration = mFeedbackVideoView.getDuration());
+        mFeedbackVideoView.setOnCompletionListener(mp -> releaseFeedbackVideoView());
+    }
+
+    boolean updateFeedbackVideo() {
+        Integer feedbackVideoResId = getFeedbackVideoResId();
+        if (feedbackVideoResId == null || getContext() == null) {
+            return false;
+        }
+        Uri uri = Uri.parse("android.resource://" + getContext().getPackageName() + "/"
+                + feedbackVideoResId);
+        mFeedbackVideoView.setVideoURI(uri);
+        return true;
+    }
+
+    void releaseFeedbackVideoView() {
+        mFeedbackVideoView.stopPlayback();
+        mFeedbackVideoView.setVisibility(View.INVISIBLE);
+    }
+
+    int getFeedbackVideoDuration() {
+        return mFeedbackVideoDuration;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        changeController(mTutorialType);
     }
 
     @Override
@@ -167,10 +209,11 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
     void changeController(TutorialType tutorialType) {
         if (getControllerClass().isInstance(mTutorialController)) {
             mTutorialController.setTutorialType(tutorialType);
+            mTutorialController.fadeTaskViewAndRun(mTutorialController::transitToController);
         } else {
             mTutorialController = createController(tutorialType);
+            mTutorialController.transitToController();
         }
-        mTutorialController.transitToController();
         mEdgeBackGestureHandler.registerBackGestureAttemptCallback(mTutorialController);
         mNavBarGestureHandler.registerNavBarGestureAttemptCallback(mTutorialController);
         mTutorialType = tutorialType;
@@ -186,10 +229,6 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
         return mRootView;
     }
 
-    @Nullable TutorialHandAnimation getHandAnimation() {
-        return mHandCoachingAnimation;
-    }
-
     void continueTutorial() {
         if (!(getContext() instanceof GestureSandboxActivity)) {
             closeTutorial();
@@ -207,6 +246,7 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
     void closeTutorial() {
         FragmentActivity activity = getActivity();
         if (activity != null) {
+            activity.setResult(Activity.RESULT_OK);
             activity.finish();
         }
     }
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialHandAnimation.java b/quickstep/src/com/android/quickstep/interaction/TutorialHandAnimation.java
deleted file mode 100644
index c810e43426..0000000000
--- a/quickstep/src/com/android/quickstep/interaction/TutorialHandAnimation.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.quickstep.interaction;
-
-import android.content.Context;
-import android.graphics.drawable.Animatable2;
-import android.graphics.drawable.AnimatedVectorDrawable;
-import android.graphics.drawable.Drawable;
-import android.view.View;
-import android.widget.ImageView;
-
-import androidx.core.content.ContextCompat;
-
-import com.android.launcher3.R;
-import com.android.quickstep.interaction.TutorialController.TutorialType;
-
-import java.time.Duration;
-
-/** Hand coaching animation. */
-final class TutorialHandAnimation {
-
-    // A delay for waiting the Activity fully launches.
-    private static final Duration ANIMATION_START_DELAY = Duration.ofMillis(300L);
-
-    private final ImageView mHandCoachingView;
-    private final AnimatedVectorDrawable mGestureAnimation;
-
-    TutorialHandAnimation(Context context, View rootView, int resId) {
-        mHandCoachingView = rootView.findViewById(R.id.gesture_tutorial_fragment_hand_coaching);
-        mGestureAnimation = (AnimatedVectorDrawable) ContextCompat.getDrawable(context, resId);
-    }
-
-    /** [Re]starts animation for the given tutorial. */
-    void startLoopedAnimation(TutorialType tutorialType) {
-        mHandCoachingView.setVisibility(View.VISIBLE);
-        if (mGestureAnimation.isRunning()) {
-            stop();
-        }
-
-        mGestureAnimation.clearAnimationCallbacks();
-        mGestureAnimation.registerAnimationCallback(
-                new Animatable2.AnimationCallback() {
-                    @Override
-                    public void onAnimationEnd(Drawable drawable) {
-                        super.onAnimationEnd(drawable);
-                        mGestureAnimation.start();
-                    }
-                });
-        start(tutorialType);
-    }
-
-    private void start(TutorialType tutorialType) {
-        // Because the gesture animation has only the right side form.
-        // The left side form of the gesture animation is made from flipping the View.
-        float rotationY = tutorialType == TutorialType.LEFT_EDGE_BACK_NAVIGATION ? 180f : 0f;
-        mHandCoachingView.setRotationY(rotationY);
-        mHandCoachingView.setImageDrawable(mGestureAnimation);
-        mHandCoachingView.postDelayed(mGestureAnimation::start, ANIMATION_START_DELAY.toMillis());
-    }
-
-    void stop() {
-        mGestureAnimation.clearAnimationCallbacks();
-        mGestureAnimation.stop();
-    }
-}
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 0b30253327..2c096b44ad 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -37,7 +37,7 @@
 
     <color name="gesture_tutorial_ripple_color">#A0C2F9</color> <!-- Light Blue -->
     <color name="gesture_tutorial_fake_task_view_color">#6DA1FF</color> <!-- Light Blue -->
-    <color name="gesture_tutorial_fake_previous_task_view_color">#9CCC65</color> <!-- Light Green -->
+    <color name="gesture_tutorial_fake_previous_task_view_color">#3C4043</color> <!-- Gray -->
     <color name="gesture_tutorial_action_button_label_color">#FFFFFFFF</color>
     <color name="gesture_tutorial_primary_color">#1A73E8</color> <!-- Blue -->
 
diff --git a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
index 8d676c9fa3..e8695c90f9 100644
--- a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
+++ b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
@@ -276,7 +276,7 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
         launchBackTutorialPreference.setOnPreferenceClickListener(preference -> {
             startActivity(launchSandboxIntent.putExtra(
                     "tutorial_steps",
-                    new String[] {"RIGHT_EDGE_BACK_NAVIGATION"}));
+                    new String[] {"LEFT_EDGE_BACK_NAVIGATION"}));
             return true;
         });
         sandboxCategory.addPreference(launchBackTutorialPreference);
-- 
GitLab


From 9a14d08987a2cf32eb67ac1fd16a4edd9d6e7eda Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Fri, 16 Apr 2021 17:08:46 -0700
Subject: [PATCH 0907/1664] Redraw live tile when dismissing all tasks

Fixes: 185309909
Test: manual
Change-Id: Ibfa4e5eaddfff79cffc76b272be35f726cb2bc9a
---
 .../android/quickstep/views/RecentsView.java  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index c5deeded8a..027812f78e 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2024,6 +2024,16 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
 
         anim.add(ObjectAnimator.ofFloat(taskView, secondaryViewTranslate,
                 verticalFactor * secondaryTaskDimension).setDuration(duration), LINEAR, sp);
+
+        if (LIVE_TILE.get() && taskView.isRunningTask()) {
+            anim.addOnFrameCallback(() -> {
+                mLiveTileTaskViewSimulator.taskSecondaryTranslation.value =
+                        mOrientationHandler.getSecondaryValue(
+                                taskView.getTranslationX(),
+                                taskView.getTranslationY());
+                redrawLiveTile();
+            });
+        }
     }
 
     public PendingAnimation createTaskDismissAnimation(TaskView taskView, boolean animateTaskView,
@@ -2112,16 +2122,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             anim.addOnFrameCallback(this::updateCurveProperties);
         }
 
-        if (LIVE_TILE.get() && getRunningTaskView() == taskView) {
-            anim.addOnFrameCallback(() -> {
-                mLiveTileTaskViewSimulator.taskSecondaryTranslation.value =
-                        mOrientationHandler.getSecondaryValue(
-                                taskView.getTranslationX(),
-                                taskView.getTranslationY());
-                redrawLiveTile();
-            });
-        }
-
         // Add a tiny bit of translation Z, so that it draws on top of other views
         if (animateTaskView) {
             taskView.setTranslationZ(0.1f);
-- 
GitLab


From ef34790bc69273c6d689f5e98584738b8e61126c Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sat, 17 Apr 2021 22:15:09 -0700
Subject: [PATCH 0908/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Ie990000f9b8ff61c1cf39ac23e525dd119510ad0
---
 quickstep/res/values-af/strings.xml        |  3 +-
 quickstep/res/values-am/strings.xml        |  3 +-
 quickstep/res/values-ar/strings.xml        |  3 +-
 quickstep/res/values-as/strings.xml        | 98 ++++++++--------------
 quickstep/res/values-az/strings.xml        | 98 ++++++++--------------
 quickstep/res/values-b+sr+Latn/strings.xml |  3 +-
 quickstep/res/values-be/strings.xml        |  3 +-
 quickstep/res/values-bg/strings.xml        |  3 +-
 quickstep/res/values-bn/strings.xml        | 98 ++++++++--------------
 quickstep/res/values-bs/strings.xml        |  3 +-
 quickstep/res/values-ca/strings.xml        |  3 +-
 quickstep/res/values-cs/strings.xml        |  3 +-
 quickstep/res/values-da/strings.xml        |  3 +-
 quickstep/res/values-de/strings.xml        |  2 +-
 quickstep/res/values-el/strings.xml        |  3 +-
 quickstep/res/values-en-rAU/strings.xml    |  3 +-
 quickstep/res/values-en-rCA/strings.xml    |  3 +-
 quickstep/res/values-en-rGB/strings.xml    |  3 +-
 quickstep/res/values-en-rIN/strings.xml    |  3 +-
 quickstep/res/values-en-rXC/strings.xml    |  2 +-
 quickstep/res/values-es-rUS/strings.xml    |  3 +-
 quickstep/res/values-es/strings.xml        |  7 +-
 quickstep/res/values-et/strings.xml        |  3 +-
 quickstep/res/values-eu/strings.xml        | 11 +--
 quickstep/res/values-fa/strings.xml        |  3 +-
 quickstep/res/values-fi/strings.xml        |  3 +-
 quickstep/res/values-fr-rCA/strings.xml    |  3 +-
 quickstep/res/values-fr/strings.xml        | 98 ++++++++--------------
 quickstep/res/values-gl/strings.xml        |  3 +-
 quickstep/res/values-gu/strings.xml        | 98 ++++++++--------------
 quickstep/res/values-hi/strings.xml        | 98 ++++++++--------------
 quickstep/res/values-hr/strings.xml        |  3 +-
 quickstep/res/values-hu/strings.xml        |  3 +-
 quickstep/res/values-hy/strings.xml        |  3 +-
 quickstep/res/values-in/strings.xml        |  3 +-
 quickstep/res/values-is/strings.xml        |  3 +-
 quickstep/res/values-it/strings.xml        |  5 +-
 quickstep/res/values-iw/strings.xml        | 25 +++---
 quickstep/res/values-ja/strings.xml        |  3 +-
 quickstep/res/values-ka/strings.xml        |  3 +-
 quickstep/res/values-kk/strings.xml        | 98 ++++++++--------------
 quickstep/res/values-km/strings.xml        |  3 +-
 quickstep/res/values-kn/strings.xml        |  3 +-
 quickstep/res/values-ko/strings.xml        |  3 +-
 quickstep/res/values-ky/strings.xml        | 98 ++++++++--------------
 quickstep/res/values-lo/strings.xml        |  3 +-
 quickstep/res/values-lt/strings.xml        |  3 +-
 quickstep/res/values-lv/strings.xml        |  3 +-
 quickstep/res/values-mk/strings.xml        |  3 +-
 quickstep/res/values-ml/strings.xml        |  3 +-
 quickstep/res/values-mn/strings.xml        |  3 +-
 quickstep/res/values-mr/strings.xml        | 98 ++++++++--------------
 quickstep/res/values-ms/strings.xml        |  3 +-
 quickstep/res/values-my/strings.xml        |  3 +-
 quickstep/res/values-nb/strings.xml        |  3 +-
 quickstep/res/values-ne/strings.xml        |  2 +-
 quickstep/res/values-nl/strings.xml        |  3 +-
 quickstep/res/values-or/strings.xml        | 98 ++++++++--------------
 quickstep/res/values-pa/strings.xml        | 98 ++++++++--------------
 quickstep/res/values-pl/strings.xml        | 98 ++++++++--------------
 quickstep/res/values-pt-rPT/strings.xml    |  3 +-
 quickstep/res/values-pt/strings.xml        |  3 +-
 quickstep/res/values-ro/strings.xml        |  3 +-
 quickstep/res/values-ru/strings.xml        |  3 +-
 quickstep/res/values-si/strings.xml        |  3 +-
 quickstep/res/values-sk/strings.xml        |  3 +-
 quickstep/res/values-sl/strings.xml        |  3 +-
 quickstep/res/values-sq/strings.xml        |  3 +-
 quickstep/res/values-sr/strings.xml        |  3 +-
 quickstep/res/values-sv/strings.xml        |  3 +-
 quickstep/res/values-sw/strings.xml        |  3 +-
 quickstep/res/values-ta/strings.xml        |  3 +-
 quickstep/res/values-te/strings.xml        | 98 ++++++++--------------
 quickstep/res/values-th/strings.xml        |  3 +-
 quickstep/res/values-tl/strings.xml        |  3 +-
 quickstep/res/values-tr/strings.xml        |  3 +-
 quickstep/res/values-uk/strings.xml        |  3 +-
 quickstep/res/values-ur/strings.xml        | 98 ++++++++--------------
 quickstep/res/values-uz/strings.xml        |  3 +-
 quickstep/res/values-vi/strings.xml        |  3 +-
 quickstep/res/values-zh-rCN/strings.xml    | 98 ++++++++--------------
 quickstep/res/values-zh-rHK/strings.xml    |  3 +-
 quickstep/res/values-zh-rTW/strings.xml    |  3 +-
 quickstep/res/values-zu/strings.xml        |  3 +-
 84 files changed, 648 insertions(+), 1062 deletions(-)

diff --git a/quickstep/res/values-af/strings.xml b/quickstep/res/values-af/strings.xml
index e3da54fffc..6aed173c7d 100644
--- a/quickstep/res/values-af/strings.xml
+++ b/quickstep/res/values-af/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Skermkiekie"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Jou organisasie laat nie hierdie program toe nie"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Slaan navigasietutoriaal oor?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Jy kan dit later in die Wenke-program kry"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Kanselleer"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Slaan oor"</string>
 </resources>
diff --git a/quickstep/res/values-am/strings.xml b/quickstep/res/values-am/strings.xml
index aa58f464ec..dd4f76d9a9 100644
--- a/quickstep/res/values-am/strings.xml
+++ b/quickstep/res/values-am/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"ቅጽበታዊ ገጽ እይታ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ይህ ድርጊት በመተግበሪያው ወይም በእርስዎ ድርጅት አይፈቀድም"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"የአሰሳ አጋዥ ሥልጠናን ይዝለሉ?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"ይህንን በኋላ በጠቃሚ ምክሮች መተግበሪያ ውስጥ ማግኘት ይችላሉ"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"ይቅር"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"ዝለል"</string>
 </resources>
diff --git a/quickstep/res/values-ar/strings.xml b/quickstep/res/values-ar/strings.xml
index b55eb08b12..ee58f170a5 100644
--- a/quickstep/res/values-ar/strings.xml
+++ b/quickstep/res/values-ar/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"لقطة شاشة"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"لا يسمح التطبيق أو لا تسمح مؤسستك بهذا الإجراء."</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"هل تريد تخطي الدليل التوجيهي؟"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"يمكنك العثور على هذا الدليل التوجيهي لاحقًا في التطبيق \"نصائح\""</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"إلغاء"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"التخطي"</string>
 </resources>
diff --git a/quickstep/res/values-as/strings.xml b/quickstep/res/values-as/strings.xml
index acbbe16a97..be08f08dda 100644
--- a/quickstep/res/values-as/strings.xml
+++ b/quickstep/res/values-as/strings.xml
@@ -45,73 +45,41 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"এপৰ পৰামৰ্শসমূহ সক্ষম কৰা আছে"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"এপৰ পৰামৰ্শসমূহ অক্ষম কৰা আছে"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"পূৰ্বানুমান কৰা এপ্: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
-    <skip />
-    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"আপুনি বাওঁ প্ৰান্তৰৰ একেবাৰে সীমাৰ পৰা ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"আপুনি স্ক্ৰীনৰ বাওঁ প্ৰান্তৰৰ পৰা সোঁ প্ৰান্তৰৰ ফালে মধ্যভাগলৈকে ছোৱাইপ কৰি এৰি দিয়াটো নিশ্চিত কৰক।"</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"ইমানেই! এতিয়া বাওঁ প্ৰান্তৰৰ পৰা ছোৱাইপ কৰি চাওক।"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"আপুনি সোঁ প্ৰান্তৰৰ একেবাৰে সীমাৰ পৰা ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"আপুনি স্ক্ৰীনৰ সোঁ প্ৰান্তৰৰ পৰা মধ্যভাগলৈকে ছোৱাইপ কৰি এৰি দিয়াটো নিশ্চিত কৰক।"</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"আপুনি উভতি যাওক নিৰ্দেশটো সম্পূৰ্ণ কৰিলে। ইয়াৰ পাছত, গৃহ স্ক্ৰীনলৈ কেনেকৈ যাব সেয়া জানক।"</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"আপুনি স্ক্ৰীনৰ তলৰ অংশৰ বেছি ওচৰলৈ ছোৱাইপ নকৰাটো নিশ্চিত কৰক।"</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"উভতি যোৱাৰ নির্দেশটোৰ সংবেদনশীলতা সলনি কৰিবলৈ ছেটিঙলৈ যাওক"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"উভতি যাবলৈ ছোৱাইপ কৰক"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"অন্তিম স্ক্ৰীনখনলৈ উভতি যাবলৈ বাওঁ অথবা সোঁ প্ৰান্তৰৰ পৰা মাজলৈ ছোৱাইপ কৰক।"</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"আপুনি স্ক্ৰীনৰ তলৰ প্ৰান্তৰ পৰা ওপৰলৈ ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"আপুনি এৰি দিয়াৰ পূৰ্বে অলপো নোৰোৱাটো নিশ্চিত কৰক।"</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"আপুনি পোনকৈ ওপৰলৈ ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"আপুনি গৃহ স্ক্ৰীনলৈ যোৱাৰ নিৰ্দেশটো সম্পূৰ্ণ কৰিলে। ইয়াৰ পাছত, এপ্‌ কেনেকৈ সলনি কৰিব সেয়া জানক।"</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"গৃহ স্ক্ৰীনলৈ যাবলৈ ছোৱাইপ কৰক"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"আপোনাৰ স্ক্ৰীনৰ তলৰ অংশৰ পৰা ওপৰলৈ ছোৱাইপ কৰক। এই নিৰ্দেশটোৱে আপোনাক সদায় গৃহ স্ক্ৰীনলৈ লৈ যায়।"</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"আপুনি স্ক্ৰীনৰ তলৰ প্ৰান্তৰ পৰা ওপৰলৈ ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"এৰি দিয়াৰ পূৰ্বে ৱিণ্ডখন দীৰ্ঘ সময়ৰ বাবে ধৰি ৰাখিবলৈ চেষ্টা কৰক।"</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"আপুনি স্ক্ৰীনৰ ওপৰলৈ পোনকৈ ছোৱাইপ কৰি তাৰ পাছত ৰোৱাটো নিশ্চিত কৰক।"</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"আপুনি এপ্‌ সলনি কৰাৰ নিৰ্দেশটো সম্পূৰ্ণ কৰিলে। আপুনি নিজৰ ফ’নটো ব্যৱহাৰ কৰিবলৈ সাজু!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"এপ্‌ সলনি কৰিবলৈ ছোৱাইপ কৰক"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"আপোনাৰ স্ক্ৰীনৰ একেবাৰে তলৰ অংশৰ পৰা ওপৰলৈ ছোৱাইপ কৰি ধৰি ৰাখক আৰু তাৰ পাছত এৰি দিয়ক।"</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"সম্পূৰ্ণ সাজু"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"পৰৱৰ্তী"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"হ’ল"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ছেটিং"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"পুনৰ চেষ্টা কৰক"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"সুন্দৰ!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"টিউট’ৰিয়েল <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="action_share" msgid="2648470652637092375">"শ্বেয়াৰ কৰক"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"স্ক্ৰীনশ্বট"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"এপ্‌টোৱে অথবা আপোনাৰ প্ৰতিষ্ঠানে এই কাৰ্যটোৰ অনুমতি নিদিয়ে"</string>
-    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
-    <skip />
-    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"নেভিগেশ্বনৰ টিউট’ৰিয়েল এৰিব বিচাৰে নেকি?"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
     <skip />
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"বাতিল কৰক"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"এৰি যাওক"</string>
 </resources>
diff --git a/quickstep/res/values-az/strings.xml b/quickstep/res/values-az/strings.xml
index acde823d7a..2c15eb025a 100644
--- a/quickstep/res/values-az/strings.xml
+++ b/quickstep/res/values-az/strings.xml
@@ -45,73 +45,41 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Tətbiq təklifləri aktivdir"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Tətbiq təklifləri deaktivdir"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Proqnozlaşdırılan tətbiq: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
-    <skip />
-    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Ən sol tərəfdən sürüşdürdüyünüzə əmin olun."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Ekranın sol kənarından ortasına sürüşdürüb buraxın."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Bu qədər! İndi isə sağ kənardan sürüşdürün."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Ən sağ tərəfdən sürüşdürdüyünüzə əmin olun."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Ekranın sağ kənarından ortasına sürüşdürüb buraxın."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Geri getmə jestini tamamladınız. Sonra Əsas səhifəyə keçməyi öyrənin."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ekranın altına çox yaxın sürüşdürmədiyinizə əmin olun."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Geri qayıtma jestinin həssaslığını dəyişmək üçün Ayarlara keçin"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Geri qayıtmaq üçün sürüşdürün"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Sonuncu ekrana qayıtmaq üçün ekranın sol, yaxud sağ kənarından mərkəzinə doğru sürüşdürün."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Ekranın aşağı kənarından yuxarı sürüşdürdüyünüzə əmin olun."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Buraxmazdan əvvəl durdurmadığınıza əmin olun."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Birbaşa yuxarı sürüşdürdüyünüzə əmin olun."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Əsas səhifəyə keçmə jestini tamamladınız. Sonra tətbiqləri keçirməyi öyrənin."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Əsas səhifəyə keçmək üçün sürüşdürün"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Ekranın aşağısından yuxarısına sürüşdürün. Bu jest həmişə Əsas səhifəyə aparır."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Ekranın aşağı kənarından yuxarı sürüşdürdüyünüzə əmin olun."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Buraxmadan əvvəl pəncərəni daha uzun müddət saxlamağa çalışın."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Birbaşa yuxarı sürüşdürdüyünüzə, sonra durdurduğunuza əmin olun."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Tətbiqləri keçirmə jestini tamamladınız. Telefonunuzu istifadə etməyə hazırsınız!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Tətbiqi keçirmək üçün sürüşdürün"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Ekranın aşağısından yuxarı doğru sürüşdürüb saxlayın, sonra buraxın."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Tam hazır"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Sonra"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Oldu"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Ayarlar"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Yenə sınayın"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Əla!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Dərslik <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="action_share" msgid="2648470652637092375">"Paylaşın"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Ekran şəkli"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Bu əməliyyata tətbiq və ya təşkilatınız tərəfindən icazə verilmir"</string>
-    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
-    <skip />
-    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Naviqasiya dərsliyi ötürülsün?"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
     <skip />
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Ləğv edin"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Ötürün"</string>
 </resources>
diff --git a/quickstep/res/values-b+sr+Latn/strings.xml b/quickstep/res/values-b+sr+Latn/strings.xml
index 71e57f8cde..3d13a4db6e 100644
--- a/quickstep/res/values-b+sr+Latn/strings.xml
+++ b/quickstep/res/values-b+sr+Latn/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Snimak ekrana"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikacija ili organizacija ne dozvoljavaju ovu radnju"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Želite da preskočite vodič za kretanje?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Možete da pronađete ovo u apl. Saveti"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Otkaži"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Preskoči"</string>
 </resources>
diff --git a/quickstep/res/values-be/strings.xml b/quickstep/res/values-be/strings.xml
index e062b8d277..930a296016 100644
--- a/quickstep/res/values-be/strings.xml
+++ b/quickstep/res/values-be/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Здымак экрана"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Гэта дзеянне не дазволена праграмай ці вашай арганізацыяй"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Прапусціць дапаможнік па навігацыі?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Знайсці дапаможнік можна ў \"Парадах\""</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Скасаваць"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Прапусціць"</string>
 </resources>
diff --git a/quickstep/res/values-bg/strings.xml b/quickstep/res/values-bg/strings.xml
index ecc879a8bd..3e8deda6c2 100644
--- a/quickstep/res/values-bg/strings.xml
+++ b/quickstep/res/values-bg/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Екранна снимка"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Това действие не е разрешено от приложението или организацията ви"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Пропускане на урока за навигиране?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Урокът е налице в приложението за съвети"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Отказ"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Пропускане"</string>
 </resources>
diff --git a/quickstep/res/values-bn/strings.xml b/quickstep/res/values-bn/strings.xml
index 1d5fd2b559..df706f93b9 100644
--- a/quickstep/res/values-bn/strings.xml
+++ b/quickstep/res/values-bn/strings.xml
@@ -45,73 +45,41 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"অ্যাপ সাজেশন চালু করা আছে"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"অ্যাপ সাজেশন বন্ধ করা আছে"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"আপনার প্রয়োজন হতে পারে এমন অ্যাপ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
-    <skip />
-    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"একদম বাঁ প্রান্ত থেকে সোয়াইপ করছেন কিনা ভাল করে দেখে নিন।"</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"আপনি বাঁ প্রান্ত থেকে স্ক্রিনের মাঝখান পর্যন্ত সোয়াইপ করছেন ও পরে আঙুল তুলে নিন। এটির খেয়াল রাখুন।"</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"এটুকুই যথেষ্ট! এখন ডান প্রান্ত থেকে সোয়াইপের চেষ্টা করুন।"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"একদম ডান প্রান্ত থেকে সোয়াইপ করছেন কিনা ভাল করে দেখে নিন।"</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"আপনি ডান প্রান্ত থেকে স্ক্রিনের মাঝখান পর্যন্ত সোয়াইপ করছেন ও পরে আঙুল তুলে নিন। এটি খেয়াল রাখুন।"</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"আপনি ফিরে যাওয়ার জেসচার সম্পর্কে জেনেছেন। এরপর, হোম স্ক্রিনে কীভাবে যাবেন জেনে নিন।"</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"স্ক্রিনের নিচের প্রান্তের খুব কাছে পর্যন্ত যাতে সোয়াইপ না করেন সেটি ভাল করে দেখে নিন।"</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ফিরে যাওয়ার জেসচারের সেন্সিটিভিটি পরিবর্তন করতে, সেটিংসে যান"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"ফিরে যেতে সোয়াইপ করুন"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"শেষের স্ক্রিনে ফিরে যেতে, ডান বা বাঁ প্রান্ত থেকে স্ক্রিনের মাঝখান পর্যন্ত সোয়াইপ করুন।"</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"স্ক্রিনের নিচের প্রান্ত থেকে আপনি সোয়াইপ করেছেন কিনা ভাল করে দেখে নিন।"</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"আঙুল তুলে নেওয়ার আগে আপনি যাতে পজ না করেন সেটি ভাল করে দেখে নিন।"</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"আপনি উপরের দিকে সোজাসুজি সোয়াইপ করেছেন কিনা ভাল করে দেখে নিন।"</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"আপনি হোম স্ক্রিনে যাওয়ার জেসচার সম্পর্কে জেনেছেন। এরপর, একটি অ্যাপ থেকে অন্য অ্যাপে কীভাবে যাবেন জেনে নিন।"</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"হোম স্ক্রিনে যেতে সোয়াইপ করুন"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"স্ক্রিনের নিচের প্রান্ত থেকে উপরের দিকে সোয়াইপ করুন। এটি করলে, আপনি সবসময় হোম স্ক্রিনে যেতে পারবেন।"</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"স্ক্রিনের নিচের প্রান্ত থেকে আপনি সোয়াইপ করেছেন কিনা ভাল করে দেখে নিন।"</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"চেষ্টা করুন যাতে আঙুল সরিয়ে নেওয়ার আগে উইন্ডো কিছুক্ষণ প্রেস করে রাখা যায়।"</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"আপনি উপরের দিকে সোজাসুজি সোয়াইপ করেছেন কিনা ভাল করে দেখে নিয়ে তারপর পজ করুন।"</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"আপনি একটি অ্যাপ থেকে অন্য অ্যাপে যাওয়ার জেসচার সম্পর্কে জেনেছেন। আপনি এখন আপনার ফোন ব্যবহার করার জন্য প্রস্তুত!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"একটি অ্যাপ থেকে অন্য অ্যাপে যেতে সোয়াইপ করুন"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"স্ক্রিনের নিচ থেকে উপরের দিকে সোয়াইপ করে ধরে থাকুন, তারপর ছেড়ে দিন।"</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"সব প্রস্তুত"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"পরবর্তী"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"হয়ে গেছে"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"সেটিংস"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"আবার চেষ্টা করুন"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"সাবাস!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"টিউটোরিয়াল <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="action_share" msgid="2648470652637092375">"শেয়ার করুন"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"স্ক্রিনশট নিন"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"এই অ্যাপ বা আপনার প্রতিষ্ঠান এই অ্যাকশনটি পারফর্ম করার অনুমতি দেয়নি"</string>
-    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
-    <skip />
-    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"নেভিগেশন টিউটোরিয়াল এড়িয়ে যেতে চান?"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
     <skip />
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"বাতিল করুন"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"এড়িয়ে যান"</string>
 </resources>
diff --git a/quickstep/res/values-bs/strings.xml b/quickstep/res/values-bs/strings.xml
index 0e316feece..5a99a14581 100644
--- a/quickstep/res/values-bs/strings.xml
+++ b/quickstep/res/values-bs/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Snimak ekrana"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Ovu radnju ne dozvoljava aplikacija ili vaša organizacija"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Preskočiti vodič za navigiranje?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"To možete pronaći kasnije u Savjetima"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Otkaži"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Preskoči"</string>
 </resources>
diff --git a/quickstep/res/values-ca/strings.xml b/quickstep/res/values-ca/strings.xml
index a13aa4b340..f7006b018b 100644
--- a/quickstep/res/values-ca/strings.xml
+++ b/quickstep/res/values-ca/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Captura de pantalla"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"L\'aplicació o la teva organització no permeten aquesta acció"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Vols ometre el tutorial de navegació?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Pots trobar-ho més tard a l\'app Consells"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancel·la"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Omet"</string>
 </resources>
diff --git a/quickstep/res/values-cs/strings.xml b/quickstep/res/values-cs/strings.xml
index 8d5010f99b..23515ffd10 100644
--- a/quickstep/res/values-cs/strings.xml
+++ b/quickstep/res/values-cs/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Snímek obrazovky"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikace nebo organizace zakazuje tuto akci"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Přeskočit výukový program k navigaci?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Program později najdete v aplikaci Tipy"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Zrušit"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Přeskočit"</string>
 </resources>
diff --git a/quickstep/res/values-da/strings.xml b/quickstep/res/values-da/strings.xml
index d8774ac753..8d1166b302 100644
--- a/quickstep/res/values-da/strings.xml
+++ b/quickstep/res/values-da/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Appen eller din organisation tillader ikke denne handling"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Vil du springe selvstudiet for navigation over?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Du kan finde dette senere i appen Tips"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Annuller"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Spring over"</string>
 </resources>
diff --git a/quickstep/res/values-de/strings.xml b/quickstep/res/values-de/strings.xml
index c5ccfb6dfc..efee106a69 100644
--- a/quickstep/res/values-de/strings.xml
+++ b/quickstep/res/values-de/strings.xml
@@ -108,7 +108,7 @@
     <string name="blocked_by_policy" msgid="2071401072261365546">"Die App oder deine Organisation lässt diese Aktion nicht zu"</string>
     <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
     <skip />
-    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
     <skip />
     <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
     <skip />
diff --git a/quickstep/res/values-el/strings.xml b/quickstep/res/values-el/strings.xml
index 4580c2a83a..baf1b87a13 100644
--- a/quickstep/res/values-el/strings.xml
+++ b/quickstep/res/values-el/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Στιγμιότυπο οθόνης"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Αυτή η ενέργεια δεν επιτρέπεται από την εφαρμογή ή τον οργανισμό σας."</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Παράβλεψη οδηγού πλοήγησης;"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Βρείτε τον αργότερα στην εφαρ. Συμβουλές"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Ακύρωση"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Παράβλεψη"</string>
 </resources>
diff --git a/quickstep/res/values-en-rAU/strings.xml b/quickstep/res/values-en-rAU/strings.xml
index a99e36ce7d..79dfda0d41 100644
--- a/quickstep/res/values-en-rAU/strings.xml
+++ b/quickstep/res/values-en-rAU/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Skip navigation tutorial?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"You can find this later in the Tips app"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancel"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Skip"</string>
 </resources>
diff --git a/quickstep/res/values-en-rCA/strings.xml b/quickstep/res/values-en-rCA/strings.xml
index a99e36ce7d..79dfda0d41 100644
--- a/quickstep/res/values-en-rCA/strings.xml
+++ b/quickstep/res/values-en-rCA/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Skip navigation tutorial?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"You can find this later in the Tips app"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancel"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Skip"</string>
 </resources>
diff --git a/quickstep/res/values-en-rGB/strings.xml b/quickstep/res/values-en-rGB/strings.xml
index a99e36ce7d..79dfda0d41 100644
--- a/quickstep/res/values-en-rGB/strings.xml
+++ b/quickstep/res/values-en-rGB/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Skip navigation tutorial?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"You can find this later in the Tips app"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancel"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Skip"</string>
 </resources>
diff --git a/quickstep/res/values-en-rIN/strings.xml b/quickstep/res/values-en-rIN/strings.xml
index a99e36ce7d..79dfda0d41 100644
--- a/quickstep/res/values-en-rIN/strings.xml
+++ b/quickstep/res/values-en-rIN/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Skip navigation tutorial?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"You can find this later in the Tips app"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancel"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Skip"</string>
 </resources>
diff --git a/quickstep/res/values-en-rXC/strings.xml b/quickstep/res/values-en-rXC/strings.xml
index ab2e3cf3be..36df9d1523 100644
--- a/quickstep/res/values-en-rXC/strings.xml
+++ b/quickstep/res/values-en-rXC/strings.xml
@@ -78,7 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‎‏‏‎‏‎‏‎‏‏‏‎‏‎‏‎‏‎‏‎‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‎‎‏‏‏‏‎‎‎‏‎‏‎Screenshot‎‏‎‎‏‎"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‏‎‎‏‏‎‎‏‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎This action isn\'t allowed by the app or your organization‎‏‎‎‏‎"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‎‎‏‏‎‏‏‎‏‏‏‎‎‎‎‎‎‎‏‏‏‎‎‏‏‎‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‎‎‏‎‎‏‏‏‎‏‎‎Skip navigation tutorial?‎‏‎‎‏‎"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‎‏‏‎‏‎‎‎‏‏‎‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‎‏‏‎‎‏‎‎‏‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‎You can find this later in the Tips app‎‏‎‎‏‎"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‎‎‏‏‎‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎You can find this later in the ‎‏‎‎‏‏‎<xliff:g id="NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ app‎‏‎‎‏‎"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‏‎‎‎‎‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‎Cancel‎‏‎‎‏‎"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎‏‏‎‎‎‎‎‏‎‏‏‎‎‏‏‎‎‏‎‏‎‎‏‏‏‏‎‎‎‏‎‏‎‎‎‎‎‏‎‏‎‎‏‏‎‎‎‎Skip‎‏‎‎‏‎"</string>
 </resources>
diff --git a/quickstep/res/values-es-rUS/strings.xml b/quickstep/res/values-es-rUS/strings.xml
index b882d75310..a4cf4bd201 100644
--- a/quickstep/res/values-es-rUS/strings.xml
+++ b/quickstep/res/values-es-rUS/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Captura de pantalla"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"La app o tu organización no permiten realizar esta acción"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"¿Omitir el instructivo de navegación?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Encuéntralo luego en app de sugerencias"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancelar"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Omitir"</string>
 </resources>
diff --git a/quickstep/res/values-es/strings.xml b/quickstep/res/values-es/strings.xml
index 15e582ecec..4dd7f02d44 100644
--- a/quickstep/res/values-es/strings.xml
+++ b/quickstep/res/values-es/strings.xml
@@ -67,9 +67,9 @@
     <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Has completado el gesto para cambiar de aplicación. Ya puedes usar el teléfono."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Deslizar el dedo para cambiar de aplicación"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Desliza el dedo hacia arriba desde la parte inferior de la pantalla, mantenlo pulsado y levántalo."</string>
-    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Listo"</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Todo listo"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Siguiente"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Listo"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Hecho"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Ajustes"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Reintentar"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"¡Muy bien!"</string>
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Hacer captura"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"No puedes hacerlo porque la aplicación o tu organización no lo permiten"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"¿Saltar tutorial de navegación?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Tutorial disponible en Consejos para Pixel"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancelar"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Saltar"</string>
 </resources>
diff --git a/quickstep/res/values-et/strings.xml b/quickstep/res/values-et/strings.xml
index a40cd2b9e3..c0339b96f5 100644
--- a/quickstep/res/values-et/strings.xml
+++ b/quickstep/res/values-et/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Ekraanipilt"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Rakendus või teie organisatsioon on selle toimingu keelanud"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Kas jätta navigeerimise õpetused vahele?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Leiate selle hiljem rakendusest Nõuanded"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Tühista"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Jäta vahele"</string>
 </resources>
diff --git a/quickstep/res/values-eu/strings.xml b/quickstep/res/values-eu/strings.xml
index 1a09676eca..7671e778c2 100644
--- a/quickstep/res/values-eu/strings.xml
+++ b/quickstep/res/values-eu/strings.xml
@@ -47,14 +47,14 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Iragarritako aplikazioa: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Ziurtatu hatza ezkerreko ertzetik pasatzen duzula."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Ziurtatu hatza pantailaren ezkerreko ertzetik erdialdera pasatzen eta askatzen duzula."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Hori da. Orain, saiatu hatza eskuineko ertzetik pasatzen."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Hori da. Orain, pasatu hatza eskuineko ertzetik."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Ziurtatu hatza eskuineko ertzetik pasatzen duzula."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Ziurtatu hatza pantailaren eskuineko ertzetik erdialdera pasatzen eta askatzen duzula."</string>
     <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Ikasi duzu atzera egiteko keinua. Jarraian, ikasi hasierako pantailara joaten."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ziurtatu hatza ez duzula pantailaren behealdetik gertuegi pasatzen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Keinuaren sentikortasuna aldatzeko, joan ezarpenetara"</string>
     <string name="back_gesture_intro_title" msgid="19551256430224428">"Pasatu hatza atzera egiteko"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Aurreko pantailara itzultzeko, pasa hatza pantailaren ezkerreko edo eskuineko ertzetik erdialdera."</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Aurreko pantailara itzultzeko, pasatu hatza pantailaren ezkerreko edo eskuineko ertzetik erdialdera."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Ziurtatu hatza pantailaren beheko ertzetik gora pasatzen duzula."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Ziurtatu askatu aurretik ez duzula hatza gelditzen."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Ziurtatu hatza zuzen gora pasatzen duzula."</string>
@@ -62,11 +62,11 @@
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Pasatu hatza hasierako pantailara joateko"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Pasatu hatza pantailaren behealdetik gora. Keinu horrek hasierako pantailara eramango zaitu beti."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Ziurtatu hatza pantailaren beheko ertzetik gora pasatzen duzula."</string>
-    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Saiatu leihoa denbora gehiagoz mantentzen hatza altxatu aurretik."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Eduki sakatuta leihoa luzaroago hatza altxatu aurretik."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Ziurtatu hatza zuzen gora pasatzen duzula; ondoren, gelditu."</string>
     <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Ikasi duzu aplikazioa aldatzeko keinua. Prest zaude telefonoa erabiltzeko."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Pasatu hatza aplikazioa aldatzeko"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Pasatu hatza pantailaren behealdetik gora, eduki pantaila sakatuta, eta kendu hatza."</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Pasatu hatza pantailaren behealdetik gora, eduki pantaila sakatuta eta altxatu hatza."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Dena prest"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Hurrengoa"</string>
     <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Eginda"</string>
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Atera pantaila-argazki bat"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikazioak edo erakundeak ez du eman ekintza hori gauzatzeko baimena"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Nabigazio-tutoriala saltatu nahi duzu?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Tutorial hau Aholkuak aplikazioan aurki dezakezu geroago"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Utzi"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Saltatu"</string>
 </resources>
diff --git a/quickstep/res/values-fa/strings.xml b/quickstep/res/values-fa/strings.xml
index 8172c48f2e..60e31c5a6f 100644
--- a/quickstep/res/values-fa/strings.xml
+++ b/quickstep/res/values-fa/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"نماگرفت"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"برنامه یا سازمان شما اجازه نمی‌دهد این کنش انجام شود."</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"آموزش گام‌به‌گام پیمایش رد شود؟"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"می‌توانید آن را بعداً در برنامه «نکته‌ها» پیدا کنید"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"لغو"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"رد شدن"</string>
 </resources>
diff --git a/quickstep/res/values-fi/strings.xml b/quickstep/res/values-fi/strings.xml
index af1097319d..2f524b5d66 100644
--- a/quickstep/res/values-fi/strings.xml
+++ b/quickstep/res/values-fi/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Kuvakaappaus"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Sovellus tai organisaatio ei salli tätä toimintoa"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Ohitetaanko navigointiohje?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Löydät tämän Vinkit-sovelluksesta"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Peru"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Ohita"</string>
 </resources>
diff --git a/quickstep/res/values-fr-rCA/strings.xml b/quickstep/res/values-fr-rCA/strings.xml
index 105edf54fd..1277366e5f 100644
--- a/quickstep/res/values-fr-rCA/strings.xml
+++ b/quickstep/res/values-fr-rCA/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Capture d\'écran"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"L\'application ou votre organisation n\'autorise pas cette action"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Ignorer le tutoriel sur la navigation?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Vous trouverez le tutoriel dans l\'application Astuces"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Annuler"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Ignorer"</string>
 </resources>
diff --git a/quickstep/res/values-fr/strings.xml b/quickstep/res/values-fr/strings.xml
index 4fe04be3a0..5f9d6bb676 100644
--- a/quickstep/res/values-fr/strings.xml
+++ b/quickstep/res/values-fr/strings.xml
@@ -45,73 +45,41 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Suggestions d\'applications activées"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Les suggestions d\'applications sont désactivées"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Application prédite : <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
-    <skip />
-    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Veillez à balayer l\'écran depuis le bord gauche."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Veillez à bien balayer l\'écran depuis le bord gauche jusqu\'au centre avant de relever le doigt."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Et voilà ! Balayez maintenant l\'écran depuis le côté droit."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Veillez à balayer l\'écran depuis le bord droit."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Veillez à bien balayer l\'écran depuis le bord droit jusqu\'au centre avant de relever le doigt."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Vous avez appris le geste pour revenir en arrière. Apprenez ensuite à revenir à l\'écran d\'accueil."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Veillez à ne pas balayer l\'écran trop près du bas."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Modifiez la sensibilité du geste retour dans les paramètres"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Balayez l\'écran pour revenir en arrière"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Pour revenir à l\'écran précédent, balayez l\'écran depuis le bord droit ou gauche jusqu\'au centre."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Veillez à balayer l\'écran du bas vers le haut."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Veillez à ne pas marquer de pause dans votre geste avant de relever le doigt."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Veillez à balayer l\'écran vers le haut."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Vous avez appris le geste pour revenir à l\'écran d\'accueil. Apprenez ensuite à passer d\'une appli à l\'autre."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Balayer pour revenir à l\'écran d\'accueil"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Balayez l\'écran de bas en haut. Ce geste vous ramènera toujours à l\'écran d\'accueil."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Veillez à balayer l\'écran du bas vers le haut."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Essayez d\'appuyer plus longtemps sur la fenêtre avant de relever le doigt."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Veillez à balayer l\'écran vers le haut et à marquer une pause dans votre geste."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Vous avez appris le geste pour passer d\'une appli à l\'autre. Vous êtes prêt à utiliser votre téléphone."</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Balayer pour passer d\'une appli à l\'autre"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Balayez l\'écran du bas vers le haut, appuyez de manière prolongée, puis relevez le doigt."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Vous avez terminé"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Suivant"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"OK"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Paramètres"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Réessayez"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bravo !"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutoriel <xliff:g id="CURRENT">%1$d</xliff:g> sur <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="action_share" msgid="2648470652637092375">"Partager"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Capture d\'écran"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Cette action n\'est pas autorisée par l\'application ou par votre organisation"</string>
-    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
-    <skip />
-    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Ignorer le tutoriel de navigation ?"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
     <skip />
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Annuler"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Passer"</string>
 </resources>
diff --git a/quickstep/res/values-gl/strings.xml b/quickstep/res/values-gl/strings.xml
index e8457a7113..b158f311d8 100644
--- a/quickstep/res/values-gl/strings.xml
+++ b/quickstep/res/values-gl/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Facer captura"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"A aplicación ou a túa organización non permite realizar esta acción"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Queres omitir o titorial de navegación?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Atopa isto máis tarde na app Consellos"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancelar"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Omitir"</string>
 </resources>
diff --git a/quickstep/res/values-gu/strings.xml b/quickstep/res/values-gu/strings.xml
index e83cd1e89a..1ec27093c3 100644
--- a/quickstep/res/values-gu/strings.xml
+++ b/quickstep/res/values-gu/strings.xml
@@ -45,73 +45,41 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ઍપના સુઝાવો ચાલુ છે"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ઍપના સુઝાવો બંધ છે"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"પૂર્વાનુમાનિત ઍપ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
-    <skip />
-    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ખાતરી કરો કે તમે એકદમ દૂરની ડાબી કિનારીએથી સ્વાઇપ કરો છો."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ખાતરી કરો કે તમે ડાબી કિનારીએથી સ્ક્રીનના મધ્ય ભાગ સુધી સ્વાઇપ કરો છે અને આંગળી ઊંચકી લો છો."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"બસ થઈ ગયું! હવે જમણી કિનારીએથી સ્વાઇપ કરવાનો પ્રયાસ કરો."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ખાતરી કરો કે તમે એકદમ દૂરની જમણી કિનારીએથી સ્વાઇપ કરો છો."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ખાતરી કરો કે તમે જમણી કિનારીએથી સ્ક્રીનના મધ્ય ભાગ સુધી સ્વાઇપ કરો છે અને આંગળી ઊંચકી લો છો."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"તમે પાછા જવાનો સંકેત પૂર્ણ કર્યો છે. હવે પછી, હોમ સ્ક્રીન પર જવાની રીત વિશે જાણો."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ખાતરી કરો કે તમારાથી સ્ક્રીનની એકદમ નીચેની કિનારીની ખૂબ નજીક સુધી સ્વાઇપ ન થઈ જાય."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"પાછા જવાના સંકેતની સંવેદિતા બદલવા માટે, સેટિંગમાં જાઓ"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"પાછળ જવા માટે સ્વાઇપ કરો"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"છેલ્લી સ્ક્રીન પર પાછા જવા, ડાબી કે જમણી કિનારીએથી સ્ક્રીનના મધ્ય ભાગ સુધી સ્વાઇપ કરો."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ખાતરી કરો કે તમે સ્ક્રીનની નીચેની કિનારીએથી ઉપરની તરફ સ્વાઇપ કરો છો."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ખાતરી કરો કે તમે આંગળી ઊંચકી લેતા પહેલાં સ્વાઇપ કરવાનું થોભાવતા નથી."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ખાતરી કરો કે તમે સીધું ઉપરની તરફ સ્વાઇપ કરો છો."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"તમે હોમ સ્ક્રીન પર પાછા જવાનો સંકેત પૂર્ણ કર્યો છે. હવે પછી, ઍપ સ્વિચ કરવાની રીત વિશે જાણો."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"હોમ સ્ક્રીન પર જવા માટે સ્વાઇપ કરો"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"તમારી સ્ક્રીનના નીચેના ભાગથી ઉપરની તરફ સ્વાઇપ કરો. આ સંકેત તમને હંમેશાં હોમ સ્ક્રીન પર લઈ જાય છે."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ખાતરી કરો કે તમે સ્ક્રીનની નીચેની કિનારીએથી ઉપરની તરફ સ્વાઇપ કરો છો."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"તમારી આંગળી ઊંચકતા પહેલાં તેને વિન્ડો પર થોડી વધારે વાર માટે દબાવી રાખવાનો પ્રયાસ કરો."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"ખાતરી કરો કે તમે સીધું ઉપર સ્વાઇપ કરો છો, પછી થોભી જાઓ છો."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"તમે ઍપ સ્વિચ કરવાનો સંકેત પૂર્ણ કર્યો છે. તમે તમારા ફોનનો ઉપયોગ કરવા માટે તૈયાર છો!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ઍપ સ્વિચ કરવા સ્વાઇપ કરો"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"તમારી સ્ક્રીનના નીચેના ભાગથી ઉપરની તરફ સ્વાઇપ કરીને, થોડીવાર દબાવી રાખો, પછી છોડી દો."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"બધું સેટ થઈ ગયું"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"આગળ"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"થઈ ગયું"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"સેટિંગ"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ફરી પ્રયાસ કરો"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"સરસ!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"ટ્યૂટૉરિઅલ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="action_share" msgid="2648470652637092375">"શેર કરો"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"સ્ક્રીનશૉટ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ઍપ કે તમારી સંસ્થા દ્વારા આ ક્રિયા કરવાની મંજૂરી નથી"</string>
-    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
-    <skip />
-    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"નૅવિગેશન ટ્યૂટૉરિઅલ છોડી દઈએ?"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
     <skip />
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"રદ કરો"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"છોડો"</string>
 </resources>
diff --git a/quickstep/res/values-hi/strings.xml b/quickstep/res/values-hi/strings.xml
index dcee19a5c0..51b8c13e75 100644
--- a/quickstep/res/values-hi/strings.xml
+++ b/quickstep/res/values-hi/strings.xml
@@ -45,73 +45,41 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"सुझाए गए ऐप्लिकेशन की सुविधा चालू है"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"सुझाए गए ऐप्लिकेशन की सुविधा बंद है"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"सुझाया गया ऐप्लिकेशन: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
-    <skip />
-    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"देख लें कि आप स्क्रीन की बाईं तरफ़ के बिल्कुल किनारे से स्वाइप कर रहे हों."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"देख लें कि आप स्क्रीन के बाएं किनारे से बीचों-बीच तक स्वाइप कर रहे हों और फिर अपनी उंगली उठा लें."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"हो गया! अब, दाएं किनारे से स्वाइप करने की कोशिश करें."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"देख लें कि आप स्क्रीन की दाईं तरफ़ के बिल्कुल किनारे से स्वाइप कर रहे हों."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"देख लें कि आप स्क्रीन के दाएं किनारे से बीचों-बीच तक स्वाइप कर रहे हों और फिर अपनी उंगली उठा लें."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"आपने पीछे जाने के लिए इस्तेमाल होने वाले हाथ के जेस्चर (हाव-भाव) के बारे में जान लिया है. अब, होम स्क्रीन पर जाने का तरीका जानें."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"देखे लें कि आप स्क्रीन पर बिल्कुल नीचे तक स्वाइप न कर रहे हों."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"\'सेटिंग\' में जाकर, पीछे जाने के लिए इस्तेमाल होने वाले हाथ के जेस्चर (हाव-भाव) की संवेदनशीलता बदलें"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"पिछली स्क्रीन पर वापस जाने के लिए स्वाइप करें"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"पिछली स्क्रीन पर वापस जाने के लिए, स्क्रीन के बाएं या दाएं किनारे से बीचों-बीच तक स्वाइप करें."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"देख लें कि आप स्क्रीन के निचले किनारे से ऊपर की ओर स्वाइप कर रहे हों."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"देख लें कि आप स्क्रीन से अपनी उंगली उठाने से पहले, इसे कहीं न रोक रहे हों."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"देख लें कि आप ऊपर की ओर बिल्कुल सीधे स्वाइप कर रहे हों."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"आपने होम स्क्रीन पर जाने के लिए इस्तेमाल होने वाले हाथ के जेस्चर (हाव-भाव) के बारे में जान लिया है. अब, एक से दूसरे ऐप्लिकेशन पर जाने का तरीका जानें."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"होम स्क्रीन पर जाने के लिए स्वाइप करें"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"स्क्रीन पर नीचे से ऊपर की ओर स्वाइप करें. हाथ का यह जेस्चर आपको हमेशा होम स्क्रीन पर ले जाता है."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"देख लें कि आप स्क्रीन के निचले किनारे से ऊपर की ओर स्वाइप कर रहे हों."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"कोशिश करें कि स्क्रीन से उंगली उठाने से पहले, इसे कुछ देर स्क्रीन पर दबाकर रखें."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"देख लें कि आप स्क्रीन पर ऊपर की तरफ़, बिल्कुल सीधे स्वाइप कर रहे हों और फिर रुकें."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"आपने एक ऐप्लिकेशन से दूसरे पर जाने के लिए इस्तेमाल होने वाले हाथ के जेस्चर (हाव-भाव) के बारे में जान लिया है. आप अपना फ़ोन इस्तेमाल करने के लिए तैयार हैं!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"एक ऐप्लिकेशन से दूसरे पर जाने के लिए स्वाइप करें"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"अपनी स्क्रीन पर नीचे से ऊपर की तरफ़ स्वाइप करें, दबाकर रखें, फिर छोड़ दें."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"आप पूरी तरह तैयार हैं"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"आगे बढ़ें"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"हो गया"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"सेटिंग"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"फिर से कोशिश करें"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"बहुत बढ़िया!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"ट्यूटोरियल <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="action_share" msgid="2648470652637092375">"शेयर करें"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"स्क्रीनशॉट"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ऐप्लिकेशन या आपका संगठन इस कार्रवाई की अनुमति नहीं देता"</string>
-    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
-    <skip />
-    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"नेविगेशन ट्यूटोरियल छोड़ना चाहते हैं?"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
     <skip />
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"अभी नहीं"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"छोड़ें"</string>
 </resources>
diff --git a/quickstep/res/values-hr/strings.xml b/quickstep/res/values-hr/strings.xml
index 3f988725e2..4b19eab254 100644
--- a/quickstep/res/values-hr/strings.xml
+++ b/quickstep/res/values-hr/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Snimka zaslona"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikacija ili vaša organizacija ne dopuštaju ovu radnju"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Želite li preskočiti vodič za kretanje?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Možete ga pronaći i u aplikaciji Savjeti"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Odustani"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Preskoči"</string>
 </resources>
diff --git a/quickstep/res/values-hu/strings.xml b/quickstep/res/values-hu/strings.xml
index 37b3a8babb..215023a86f 100644
--- a/quickstep/res/values-hu/strings.xml
+++ b/quickstep/res/values-hu/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Képernyőkép"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Az alkalmazás vagy az Ön szervezete nem engedélyezi ezt a műveletet"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Kihagyja a navigáció bemutatóját?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Ezt később megtalálhatja a Tippek appban"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Mégse"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Kihagyás"</string>
 </resources>
diff --git a/quickstep/res/values-hy/strings.xml b/quickstep/res/values-hy/strings.xml
index 40b2690f26..c09d728955 100644
--- a/quickstep/res/values-hy/strings.xml
+++ b/quickstep/res/values-hy/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Սքրինշոթ անել"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Այս գործողությունն արգելված է հավելվածի կամ ձեր կազմակերպության կողմից"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Բաց թողնե՞լ նավիգացիայի ուղեցույցը"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Սա միշտ կգտնեք «Խորհուրդներ» հավելվածում"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Չեղարկել"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Բաց թողնել"</string>
 </resources>
diff --git a/quickstep/res/values-in/strings.xml b/quickstep/res/values-in/strings.xml
index a4631d08c4..f9cf9ebd01 100644
--- a/quickstep/res/values-in/strings.xml
+++ b/quickstep/res/values-in/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Tindakan ini tidak diizinkan oleh aplikasi atau organisasi Anda"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Lewati tutorial navigasi?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Anda dapat menemukan ini di apl Tips"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Batal"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Lewati"</string>
 </resources>
diff --git a/quickstep/res/values-is/strings.xml b/quickstep/res/values-is/strings.xml
index e2efb7ef35..4e8cce7d9d 100644
--- a/quickstep/res/values-is/strings.xml
+++ b/quickstep/res/values-is/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Skjámynd"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Forritið eða fyrirtækið leyfir ekki þessa aðgerð"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Sleppa flettileiðsögn?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Nálgastu þetta síðar í forritinu „Trikk“"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Hætta við"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Sleppa"</string>
 </resources>
diff --git a/quickstep/res/values-it/strings.xml b/quickstep/res/values-it/strings.xml
index 5663f741d1..a2877ac2f2 100644
--- a/quickstep/res/values-it/strings.xml
+++ b/quickstep/res/values-it/strings.xml
@@ -64,7 +64,7 @@
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Assicurati di scorrere verso l\'alto dal bordo inferiore dello schermo."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Prova a tenere premuta la finestra più a lungo prima di rilasciarla."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Assicurati di scorrere verso l\'alto senza fermarti, poi fai una pausa."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Hai completato il gesto Cambia app. Ora puoi usare il telefono."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Hai completato il gesto Cambia app. Ora è tutto pronto per usare il telefono."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Scorri per passare da un\'app all\'altra"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Scorri verso l\'alto dalla parte inferiore dello schermo, tieni premuto e rilascia."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Fatto"</string>
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Questa azione non è consentita dall\'app o dall\'organizzazione"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Saltare il tutorial di navigazione?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Quando vuoi è nell\'app Suggerimenti"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Annulla"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Salta"</string>
 </resources>
diff --git a/quickstep/res/values-iw/strings.xml b/quickstep/res/values-iw/strings.xml
index 0e1f47181c..0532081654 100644
--- a/quickstep/res/values-iw/strings.xml
+++ b/quickstep/res/values-iw/strings.xml
@@ -45,25 +45,25 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ההצעות לאפליקציות מופעלות"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ההצעות לאפליקציות מושבתות"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"האפליקציות החזויות: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"חשוב לוודא שמחליקים מהקצה הימני."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"חשוב לוודא שמחליקים מהקצה הימני למרכז המסך ואז משחררים."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"חשוב להקפיד להחליק מהקצה הימני."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"חשוב להקפיד להחליק מהקצה הימני למרכז המסך ואז לשחרר."</string>
     <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"זהו! עכשיו צריך לנסות להחליק מהקצה השמאלי."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"חשוב לוודא שמחליקים מהקצה השמאלי."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"חשוב לוודא שמחליקים מהקצה השמאלי למרכז המסך ואז משחררים."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"השלמת את תנועת החזרה. בשלב הבא לומדים איך לעבור למסך הבית."</string>
-    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"חשוב לוודא שלא מחליקים קרוב מדי לתחתית המסך."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"חשוב להקפיד להחליק מהקצה השמאלי."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"חשוב להקפיד להחליק מהקצה השמאלי למרכז המסך ואז לשחרר."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"השלמת את תנועת \'הקודם\'. בשלב הבא לומדים איך לעבור למסך הבית."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"חשוב להקפיד שלא להחליק קרוב מדי לתחתית המסך."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"כדי לשנות את מידת הרגישות של תנועת החזרה, יש לעבור להגדרות"</string>
     <string name="back_gesture_intro_title" msgid="19551256430224428">"יש להחליק כדי לחזור"</string>
     <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"כדי לחזור למסך הקודם, יש להחליק מהקצה השמאלי או הימני למרכז המסך."</string>
-    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"חשוב לוודא שמחליקים למעלה מהקצה התחתון של המסך."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"חשוב להקפיד להחליק למעלה מהקצה התחתון של המסך."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"חשוב לוודא שלא מחכים לפני שמשחררים."</string>
-    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"חשוב לוודא שמחליקים ישר למעלה."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"חשוב להקפיד להחליק ישר למעלה."</string>
     <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"השלמת את תנועת המעבר למסך הבית. בשלב הבא לומדים איך לעבור בין אפליקציות."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"יש להחליק כדי לעבור למסך הבית"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"החלקה למעלה מתחתית המסך תמיד תעביר אותך למסך הבית."</string>
-    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"חשוב לוודא שמחליקים למעלה מהקצה התחתון של המסך."</string>
-    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"יש לנסות להחזיק את החלון למשך זמן ארוך יותר לפני שמשחררים."</string>
-    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"חשוב לוודא שמחליקים ישר למעלה ואז מחכים."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"חשוב להקפיד להחליק למעלה מהקצה התחתון של המסך."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"יש לנסות להחזיק את החלון לזמן רב יותר לפני שמשחררים."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"חשוב להקפיד להחליק ישר למעלה ואז להמתין."</string>
     <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"השלמת את תנועת המעבר בין האפליקציות. הטלפון מוכן לשימוש!"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"יש להחליק כדי לעבור בין אפליקציות"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"יש להחליק למעלה מתחתית המסך, להחזיק ולאחר מכן לשחרר."</string>
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"צילום מסך"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"האפליקציה או הארגון שלך אינם מתירים את הפעולה הזאת"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"לדלג על המדריך לניווט?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"אפשר למצוא את המדריך באפליקציית הטיפים"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"ביטול"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"דילוג"</string>
 </resources>
diff --git a/quickstep/res/values-ja/strings.xml b/quickstep/res/values-ja/strings.xml
index adab4a9ade..87dbb950c8 100644
--- a/quickstep/res/values-ja/strings.xml
+++ b/quickstep/res/values-ja/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"スクリーンショット"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"この操作はアプリまたは組織で許可されていません"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"操作チュートリアルをスキップしますか？"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"これは後からガイドアプリで確認できます"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"キャンセル"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"スキップ"</string>
 </resources>
diff --git a/quickstep/res/values-ka/strings.xml b/quickstep/res/values-ka/strings.xml
index 01086d30ef..cdc70d6f88 100644
--- a/quickstep/res/values-ka/strings.xml
+++ b/quickstep/res/values-ka/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"ეკრანის ანაბეჭდი"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ეს მოქმედება არ არის დაშვებული აპის ან თქვენი ორგანიზაციის მიერ"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"გსურთ, გამოტოვოთ ნავიგაციის სახელმძღვანელო?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"ამის მოგვიანებით პოვნა „მინიშნების“ აპში შეგიძლიათ"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"გაუქმება"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"გამოტოვება"</string>
 </resources>
diff --git a/quickstep/res/values-kk/strings.xml b/quickstep/res/values-kk/strings.xml
index 4919d11e47..bd84c93af1 100644
--- a/quickstep/res/values-kk/strings.xml
+++ b/quickstep/res/values-kk/strings.xml
@@ -45,73 +45,41 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"\"Ұсынылған қолданбалар\" функциясы қосулы."</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"\"Ұсынылған қолданбалар\" функциясы өшірулі."</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Болжалды қолданба: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
-    <skip />
-    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Сол жақтағы ең шеткі нүктеден бастап сырғытыңыз."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Экранның сол жақ шетінен ортасына қарай сырғытыңыз да, жіберіңіз."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Дайын! Енді оң жақ шеттен сырғытып көріңіз."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Оң жақтағы ең шеткі нүктеден бастап сырғытыңыз."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Экранның оң жақ шетінен ортасына қарай сырғытыңыз да, жіберіңіз."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Артқа қайту қимылын аяқтадыңыз. Енді негізгі экранға өтуді үйреніңіз."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Саусағыңызбен сырғыту кезінде экранның төменгі жағына тым жақындамаңыз."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Артқа қайту қимылы сезгіштігін параметрлерден өзгертіңіз."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Артқа қайту үшін сырғытыңыз"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Соңғы ашылған экранға оралу үшін экранның сол немесе оң жақ шетінен ортасына қарай сырғытыңыз."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Экранның төменгі шетінен жоғары қарай сырғытыңыз."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Жіберер алдында кідіріс жасамаңыз."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Тігінен жоғары қарай сырғытыңыз."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Негізгі экранға қайту қимылын аяқтадыңыз. Енді қолданбаларды ауыстыруды үйреніңіз."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Негізгі экранға өту үшін сырғытыңыз"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Экранның төменгі жағынан жоғары қарай сырғытыңыз. Сонда негізгі экран ашылады."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Экранның төменгі шетінен жоғары қарай сырғытыңыз."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Жіберер алдында терезені ұзағырақ ұстап тұруға тырысыңыз."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Тігінен жоғары қарай сырғытыңыз да, кідіріңіз."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Қолданбаларды ауыстыру қимылын аяқтадыңыз. Телефоныңызды пайдалануға дайынсыз!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Қолданбаларды ауыстыру үшін сырғытыңыз"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Экранның төменгі жағынан жоғары қарай сырғытып, ұстап тұрыңыз да, жіберіңіз."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Бәрі дайын"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Келесі"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Дайын"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Параметрлер"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Қайталау"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Жақсы!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Оқулық: <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="action_share" msgid="2648470652637092375">"Бөлісу"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Скриншот"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Бұл әрекетке қолданба не ұйым рұқсат етпейді."</string>
-    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
-    <skip />
-    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Қимылдар оқулығын өткізіп жіберу керек пе?"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
     <skip />
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Бас тарту"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Өткізіп жіберу"</string>
 </resources>
diff --git a/quickstep/res/values-km/strings.xml b/quickstep/res/values-km/strings.xml
index 847c577dfb..d44ac6743d 100644
--- a/quickstep/res/values-km/strings.xml
+++ b/quickstep/res/values-km/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"រូបថតអេក្រង់"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"សកម្មភាពនេះ​មិនត្រូវបានអនុញ្ញាតដោយកម្មវិធី​ ឬ​ស្ថាប័ន​របស់អ្នកទេ"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"រំលង​មេរៀន​អំពី​ការរុករក​ឬ?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"អ្នកអាចស្វែងរកមេរៀននេះនៅពេលក្រោយក្នុងកម្មវិធី \"គន្លឹះ\""</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"បោះបង់"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"រំលង"</string>
 </resources>
diff --git a/quickstep/res/values-kn/strings.xml b/quickstep/res/values-kn/strings.xml
index 94efa31b3b..31182b6f4e 100644
--- a/quickstep/res/values-kn/strings.xml
+++ b/quickstep/res/values-kn/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"ಸ್ಕ್ರೀನ್‌ಶಾಟ್"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ಆ್ಯಪ್ ಅಥವಾ ನಿಮ್ಮ ಸಂಸ್ಥೆಯು ಈ ಕ್ರಿಯೆಯನ್ನು ಅನುಮತಿಸುವುದಿಲ್ಲ"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"ನ್ಯಾವಿಗೇಷನ್ ಟ್ಯುಟೋರಿಯಲ್ ಸ್ಕಿಪ್ ಮಾಡಿ?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Tips ಆ್ಯಪ್‌ನಲ್ಲಿ ಇದನ್ನು ನಂತರ ಕಾಣಬಹುದು"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"ರದ್ದುಮಾಡಿ"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"ಸ್ಕಿಪ್ ಮಾಡಿ"</string>
 </resources>
diff --git a/quickstep/res/values-ko/strings.xml b/quickstep/res/values-ko/strings.xml
index 3cb3a242ca..4138b0f5a0 100644
--- a/quickstep/res/values-ko/strings.xml
+++ b/quickstep/res/values-ko/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"스크린샷"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"이 작업은 앱 또는 조직에서 허용되지 않습니다."</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"이동 방법 튜토리얼을 건너뛰시겠습니까?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"이 내용은 팁 앱에서 다시 볼 수 있습니다"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"취소"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"건너뛰기"</string>
 </resources>
diff --git a/quickstep/res/values-ky/strings.xml b/quickstep/res/values-ky/strings.xml
index f84a5c3608..2ab089f117 100644
--- a/quickstep/res/values-ky/strings.xml
+++ b/quickstep/res/values-ky/strings.xml
@@ -45,73 +45,41 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Сунушталган колдонмолор функциясы иштетилди"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Сунушталган колдонмолор функциясы өчүрүлгөн"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Божомолдонгон колдонмо: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
-    <skip />
-    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Экранды эң четинен солдон оңго карай сүрүңүз."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Экранды сол жагынан ортосуна карай сүрүп, манжаңызды алыңыз."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Бүттү! Эми экранды оң жагынан сүрүп көрүңүз."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Экранды эң четинен оңдой солго карай сүрүңүз."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Экранды оң жагынан ортосуна карай сүрүп, манжаңызды алыңыз."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"\"Артка\" жаңсоосу боюнча үйрөткүчтү бүтүрдүңүз. Эми башкы бетке кантип өтүүнү үйрөнүп алыңыз."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Манжаңызды экрандын ылдый жагына өтө жакындатпай сүрүңүз."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"\"Артка\" жаң-нун сезгичтигин өзгөртүү үчүн Жөндөөлөргө өтүңүз"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Артка кайтуу үчүн сүрүңүз"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Акыркы экранга кайтуу үчүн экранды сол же оң жагынан ортосуна карай сүрүңүз."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Экранды ылдыйдан өйдө карай сүрүңүз."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Манжаңызды алганга чейин токтотпоңуз."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Экранды өйдө карай сүрүңүз."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"\"Башкы бетке өтүү\" жаңсоосу боюнча үйрөткүчтү бүтүрдүңүз. Эми колдонмолорду которуштуруу ыкмасын үйрөнүп алыңыз."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Башкы бетке өтүү үчүн сүрүп коюңуз"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Экранды ылдый жагынан өйдө карай сүрүңүз. Бул жаңсоо сизди ар дайым Башкы экранга алып барат."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Экранды ылдыйдан өйдө карай сүрүңүз."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Манжаңызды алуудан мурун экранда узагыраак кармаңыз."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Экранды өйдө карай сүрүп, токтоп туруңуз."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"\"Колдонмолорду которуштуруу\" жаңсоосу боюнча үйрөткүчтү бүтүрдүңүз. Телефонуңузду колдоно берсеңиз болот."</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Колдонмолорду которуштуруу үчүн сүрүңүз"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Экранды ылдыйдан өйдө карай сүрүп, бир аз коё бербей кармап туруңуз."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Дапдаяр!"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Кийинки"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Бүттү"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Жөндөөлөр"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Кайра аракет кылыңыз"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Сонун!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Үйрөткүч: <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="action_share" msgid="2648470652637092375">"Бөлүшүү"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Скриншот"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Бул аракетти аткарууга колдонмо же ишканаңыз тыюу салган"</string>
-    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
-    <skip />
-    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Жаңсап өтүү үйрөткүчүн өт-рүп жибер-би?"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
     <skip />
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Жокко чыгаруу"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Өтк-п жиберүү"</string>
 </resources>
diff --git a/quickstep/res/values-lo/strings.xml b/quickstep/res/values-lo/strings.xml
index 1b2e787de6..32937f637d 100644
--- a/quickstep/res/values-lo/strings.xml
+++ b/quickstep/res/values-lo/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"ຮູບໜ້າຈໍ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ແອັບ ຫຼື ອົງການຂອງທ່ານບໍ່ອະນຸຍາດໃຫ້ໃຊ້ຄຳສັ່ງນີ້"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"ຂ້າມການສອນການນຳໃຊ້ການນຳທາງບໍ?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"ທ່ານສາມາດຊອກສ່ວນນີ້ພາຍຫຼັງໃນແອັບເຄັດລັບ"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"ຍົກເລີກ"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"ຂ້າມ"</string>
 </resources>
diff --git a/quickstep/res/values-lt/strings.xml b/quickstep/res/values-lt/strings.xml
index 59f598805b..457db01962 100644
--- a/quickstep/res/values-lt/strings.xml
+++ b/quickstep/res/values-lt/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Ekrano kopija"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Jūsų organizacijoje arba naudojant šią programą neleidžiama atlikti šio veiksmo"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Praleisti naršymo mokymo programą?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Tai gal. rasti vėliau patar. programoje"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Atšaukti"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Praleisti"</string>
 </resources>
diff --git a/quickstep/res/values-lv/strings.xml b/quickstep/res/values-lv/strings.xml
index 4f0074e68a..2a117be1eb 100644
--- a/quickstep/res/values-lv/strings.xml
+++ b/quickstep/res/values-lv/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Veikt ekrānuzņēmumu"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Lietotne vai jūsu organizācija neatļauj veikt šo darbību."</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Vai izlaist navigācijas mācības?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Varēsiet tās atrast lietotnē Padomi"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Atcelt"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Izlaist"</string>
 </resources>
diff --git a/quickstep/res/values-mk/strings.xml b/quickstep/res/values-mk/strings.xml
index b1295acacb..120e63e066 100644
--- a/quickstep/res/values-mk/strings.xml
+++ b/quickstep/res/values-mk/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Слика од екранот"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Апликацијата или вашата организација не го дозволува дејствово"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Да се прескокне упатството за навигација?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Ова може да го најдете и во „Совети“"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Откажи"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Прескокни"</string>
 </resources>
diff --git a/quickstep/res/values-ml/strings.xml b/quickstep/res/values-ml/strings.xml
index 17ba6e1fd8..e8d7f4ca72 100644
--- a/quickstep/res/values-ml/strings.xml
+++ b/quickstep/res/values-ml/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"സ്ക്രീൻഷോട്ട്"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ഈ നടപടി എടുക്കുന്നത് ആപ്പോ നിങ്ങളുടെ സ്ഥാപനമോ അനുവദിക്കുന്നില്ല"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"നാവിഗേഷൻ ട്യൂട്ടോറിയൽ ഒഴിവാക്കണോ?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"നുറുങ്ങുകൾ ആപ്പിൽ ഇത് പിന്നീട് കാണാനാകും"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"റദ്ദാക്കുക"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"ഒഴിവാക്കുക"</string>
 </resources>
diff --git a/quickstep/res/values-mn/strings.xml b/quickstep/res/values-mn/strings.xml
index d9e9f16c99..86237e18aa 100644
--- a/quickstep/res/values-mn/strings.xml
+++ b/quickstep/res/values-mn/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Дэлгэцийн агшин дарах"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Энэ үйлдлийг апп эсвэл танай байгууллага зөвшөөрдөггүй"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Навигацын практик хичээлийг алгасах уу?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Та үүнийг дараа нь Tips аппаас олж болно"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Цуцлах"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Алгасах"</string>
 </resources>
diff --git a/quickstep/res/values-mr/strings.xml b/quickstep/res/values-mr/strings.xml
index 386365c71c..d31b03a694 100644
--- a/quickstep/res/values-mr/strings.xml
+++ b/quickstep/res/values-mr/strings.xml
@@ -45,73 +45,41 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"अ‍ॅप सूचना सुरू केल्या आहेत"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"अ‍ॅप सूचना बंद केल्या आहेत"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"पूर्वानुमान केलेले अ‍ॅप: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
-    <skip />
-    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"तुम्ही स्क्रीनच्या अगदी डाव्या कडेपासून स्‍वाइप करत आहात याची खात्री करा."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"तुम्ही स्क्रीनच्या डाव्या कडेपासून मध्यावर स्‍वाइप करून बोट उचलत आहात याची खात्री करा."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"पूर्ण झाले! आता उजव्या कोपऱ्यावरून स्वाइप करून पहा."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"तुम्ही स्क्रीनच्या अगदी उजव्या कडेपासून स्‍वाइप करत आहात याची खात्री करा."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"तुम्ही स्क्रीनच्या उजव्या कडेपासून मध्यावर स्‍वाइप करून बोट उचलत आहात याची खात्री करा."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"तुम्ही गो बॅक जेश्चर पूर्ण केले. आता, होम वर कसे जायचे ते जाणून घ्या."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"तुम्ही स्क्रीनच्या तळाच्या अगदी जवळून स्‍वाइप करत नाही याची खात्री करा."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"बॅक जेश्चरची संवेदनशीलता बदलण्यासाठी, सेटिंग्ज वर जा"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"परत जाण्यासाठी स्वाइप करा"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"मागील स्क्रीनवर परत जाण्यासाठी, स्क्रीनच्या डाव्या किंवा उजव्या कडेपासून मध्यावर स्‍वाइप करा."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"तुम्ही स्क्रीनच्या तळाच्या कडेपासून वर स्वाइप करत आहात याची खात्री करा."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"तुम्ही स्क्रीनवरून बोट उचलण्यापूर्वी ते थांबवत नाही याची खात्री करा."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"तुम्ही सरळ वर स्वाइप करत आहात याची खात्री करा."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"तुम्ही गो होम जेश्चर पूर्ण केले. आता, ॲप्स कशी स्विच करायची ते जाणून घ्या."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"होमवर जाण्यासाठी स्‍वाइप करा"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"तुमच्या स्क्रीनच्या तळाकडून वर स्वाइप करा. हे जेश्चर तुम्हाला नेहमी होम स्क्रीनवर घेऊन जाते."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"तुम्ही स्क्रीनच्या तळाच्या कडेपासून वर स्वाइप करत आहात याची खात्री करा."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"विंडोवरून बोट उचलण्यापूर्वी थोडा वेळ ते तेथेच धरून ठेवा."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"तुम्ही सरळ वर स्वाइप करून, त्यानंतर बोट थांबवत आहात याची खात्री करा."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"तुम्ही स्विच ॲप्स जेश्चर पूर्ण केले. तुम्ही तुमचा फोन वापरण्यासाठी तयार आहात!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"अ‍ॅप्स स्विच करण्यासाठी स्वाइप करा"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"तुमच्या स्क्रीनच्या तळाकडून वर स्वाइप करा, धरून ठेवा, त्यानंतर बोट उचला."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"सर्व तयार आहे"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"पुढील"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"पूर्ण झाले"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"सेटिंग्ज"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"पुन्हा प्रयत्न करा"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"छान!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"ट्युटोरियल <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="action_share" msgid="2648470652637092375">"शेअर करा"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"स्क्रीनशॉट"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"अ‍ॅप किंवा तुमच्या संस्थेद्वारे ही क्रिया करण्याची अनुमती नाही"</string>
-    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
-    <skip />
-    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"नेव्हिगेशन ट्युटोरियल वगळायचे आहे का?"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
     <skip />
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"रद्द करा"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"वगळा"</string>
 </resources>
diff --git a/quickstep/res/values-ms/strings.xml b/quickstep/res/values-ms/strings.xml
index 71154ee047..6ec7a81ea9 100644
--- a/quickstep/res/values-ms/strings.xml
+++ b/quickstep/res/values-ms/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Tangkapan skrin"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Tindakan ini tidak dibenarkan oleh apl atau organisasi anda"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Langkau tutorial navigasi?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Anda boleh mendapatkan tutorial ini kemudian dalam apl Petua"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Batal"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Langkau"</string>
 </resources>
diff --git a/quickstep/res/values-my/strings.xml b/quickstep/res/values-my/strings.xml
index 4dd45d0aac..d9c4cfbbd4 100644
--- a/quickstep/res/values-my/strings.xml
+++ b/quickstep/res/values-my/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"ဖန်သားပြင်ဓာတ်ပုံ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ဤလုပ်ဆောင်ချက်ကို အက်ပ် သို့မဟုတ် သင်၏အဖွဲ့အစည်းက ခွင့်မပြုပါ"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"လမ်းညွှန်ခြင်း ရှင်းလင်းပို့ချချက်ကို ကျော်မလား။"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"၎င်းကို နောက်မှ ‘အကြံပြုချက်များ အက်ပ်’ တွင် ရှာနိုင်သည်"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"မလုပ်တော့"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"ကျော်ရန်"</string>
 </resources>
diff --git a/quickstep/res/values-nb/strings.xml b/quickstep/res/values-nb/strings.xml
index c743e98e03..0b3117bfb8 100644
--- a/quickstep/res/values-nb/strings.xml
+++ b/quickstep/res/values-nb/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Skjermdump"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Appen eller organisasjonen din tillater ikke denne handlingen"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Vil du hoppe over navigeringsveiledning?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Du kan finne dette i Tips-appen senere"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Avbryt"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Hopp over"</string>
 </resources>
diff --git a/quickstep/res/values-ne/strings.xml b/quickstep/res/values-ne/strings.xml
index d9272a1f46..6d314226fd 100644
--- a/quickstep/res/values-ne/strings.xml
+++ b/quickstep/res/values-ne/strings.xml
@@ -108,7 +108,7 @@
     <string name="blocked_by_policy" msgid="2071401072261365546">"यो एप वा तपाईंको सङ्गठनले यो कारबाही गर्ने अनुमति दिँदैन"</string>
     <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
     <skip />
-    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
     <skip />
     <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
     <skip />
diff --git a/quickstep/res/values-nl/strings.xml b/quickstep/res/values-nl/strings.xml
index fd297d6318..ecf22eb484 100644
--- a/quickstep/res/values-nl/strings.xml
+++ b/quickstep/res/values-nl/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Deze actie wordt niet toegestaan door de app of je organisatie"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Navigatietutorial overslaan?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Je vindt dit later terug in de app Tips"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Annuleren"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Overslaan"</string>
 </resources>
diff --git a/quickstep/res/values-or/strings.xml b/quickstep/res/values-or/strings.xml
index eeb2475df5..08c22fc80a 100644
--- a/quickstep/res/values-or/strings.xml
+++ b/quickstep/res/values-or/strings.xml
@@ -45,73 +45,41 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ଆପ୍ ପରାମର୍ଶଗୁଡ଼ିକୁ ସକ୍ଷମ କରାଯାଇଛି"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ଆପ୍ ପରାମର୍ଶଗୁଡ଼ିକୁ ଅକ୍ଷମ କରାଯାଇଛି"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ପୂର୍ବାନୁମାନ କରାଯାଇଥିବା ଆପ୍: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
-    <skip />
-    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ଆପଣ ଦୂର-ବାମ ଧାରରୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ଆପଣ ସ୍କ୍ରିନର ବାମ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରି ଛାଡ଼ି ଦେଉଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"କେବଳ ଏତିକି! ବର୍ତ୍ତମାନ ଡାହାଣ ଧାରରୁ ସ୍ୱାଇପ୍ କରି ଦେଖନ୍ତୁ।"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ଆପଣ ଦୂର-ଡାହାଣ ଧାରରୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ଆପଣ ସ୍କ୍ରିନର ଡାହାଣ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରି ଛାଡ଼ି ଦେଉଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"ଆପଣ \'ପଛକୁ ଫେରନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି। ତା\'ପରେ, ମୂଳପୃଷ୍ଠାକୁ କିପରି ଯିବେ ଜାଣନ୍ତୁ।"</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ଆପଣ ସ୍କ୍ରିନର ତଳଭାଗର ଅତି ନିକଟରୁ ସ୍ୱାଇପ୍ କରୁନଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ପଛକୁ ଫେରିବା ଜେଶ୍ଚରର ସମ୍ବେଦନଶୀଳତା ବଦଳାଇବାକୁ ସେଟିଂସକୁ ଯାଆନ୍ତୁ"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"ପଛକୁ ଫେରିବା ପାଇଁ ସ୍ୱାଇପ୍ କରନ୍ତୁ"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"ପୂର୍ବବର୍ତ୍ତୀ ସ୍କ୍ରିନକୁ ଫେରିବା ପାଇଁ, ସ୍କ୍ରିନର ବାମ କିମ୍ବା ଡାହାଣ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ।"</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ଆପଣ ସ୍କ୍ରିନର ତଳ ଧାରରୁ ଉପରକୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ଆପଣ ଛାଡ଼ିବା ପୂର୍ବରୁ ବିରତ କରୁନଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ଆପଣ ସିଧା ଉପରକୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"ଆପଣ \'ମୂଳପୃଷ୍ଠାକୁ ଯାଆନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି। ତା\'ପରେ, ଆପଗୁଡ଼ିକୁ କିପରି ସ୍ୱିଚ୍ କରିବେ ଜାଣନ୍ତୁ।"</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"ମୂଳପୃଷ୍ଠାକୁ ଯିବା ପାଇଁ ସ୍ୱାଇପ୍ କରନ୍ତୁ"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"ଆପଣଙ୍କ ସ୍କ୍ରିନର ତଳୁ ଉପରକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ। ଏହି ଜେଶ୍ଚର୍ ସର୍ବଦା ଆପଣଙ୍କୁ ମୂଳସ୍କ୍ରିନକୁ ନେଇଥାଏ।"</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ଆପଣ ସ୍କ୍ରିନର ତଳ ଧାରରୁ ଉପରକୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"ୱିଣ୍ଡୋକୁ ରିଲିଜ୍ କରିବା ପୂର୍ବରୁ ଅଧିକ ସମୟ ଧରି ରଖିବାକୁ ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"ଆପଣ ସିଧା ଉପରକୁ ସ୍ୱାଇପ୍ କରି ତା\'ପରେ ବିରତ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"ଆପଣ \'ଆପଗୁଡ଼ିକୁ ସ୍ୱିଚ୍ କରନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି। ଆପଣ ଆପଣଙ୍କ ଫୋନ୍ ବ୍ୟବହାର କରିବାକୁ ପ୍ରସ୍ତୁତ ଅଛନ୍ତି!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ଆପଗୁଡ଼ିକୁ ସ୍ୱିଚ୍ କରିବା ପାଇଁ ସ୍ୱାଇପ୍ କରନ୍ତୁ"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ଆପଣଙ୍କ ସ୍କ୍ରିନର ତଳୁ ଉପରକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ, ଧରି ରଖନ୍ତୁ, ତା\'ପରେ ରିଲିଜ୍ କରନ୍ତୁ।"</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"ସବୁ ପ୍ରସ୍ତୁତ"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"ପରବର୍ତ୍ତୀ"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"ହୋଇଗଲା"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ସେଟିଂସ୍"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ବଢ଼ିଆ!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"ଟ୍ୟୁଟୋରିଆଲ୍ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="action_share" msgid="2648470652637092375">"ସେୟାର୍ କରନ୍ତୁ"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ସ୍କ୍ରିନସଟ୍"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ଆପ୍ କିମ୍ବା ଆପଣଙ୍କ ସଂସ୍ଥା ଦ୍ୱାରା ଏହି କାର୍ଯ୍ୟକୁ ଅନୁମତି ଦିଆଯାଇ ନାହିଁ"</string>
-    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
-    <skip />
-    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"ନାଭିଗେସନ୍ ଟ୍ୟୁଟୋରିଆଲକୁ ବାଦ୍ ଦେବେ?"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
     <skip />
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"ବାତିଲ୍ କରନ୍ତୁ"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"ବାଦ୍ ଦିଅନ୍ତୁ"</string>
 </resources>
diff --git a/quickstep/res/values-pa/strings.xml b/quickstep/res/values-pa/strings.xml
index 4b7fd3170b..d9fad16a56 100644
--- a/quickstep/res/values-pa/strings.xml
+++ b/quickstep/res/values-pa/strings.xml
@@ -45,73 +45,41 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ਐਪ ਸੁਝਾਵਾਂ ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਗਿਆ"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ਐਪ ਸੁਝਾਵਾਂ ਨੂੰ ਬੰਦ ਕੀਤਾ ਗਿਆ"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ਪੂਰਵ ਅਨੁਮਾਨਿਤ ਐਪ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
-    <skip />
-    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਦੂਰ-ਖੱਬੇ ਕਿਨਾਰੇ ਤੋਂ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਖੱਬੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰਦੇ ਹੋ ਅਤੇ ਛੱਡ ਦਿੰਦੇ ਹੋ।"</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"ਹੋ ਗਿਆ! ਹੁਣ ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਵਾਈਪ ਕਰਕੇ ਦੇੇਖੋ।"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਦੂਰ-ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰਦੇ ਹੋ ਅਤੇ ਛੱਡ ਦਿੰਦੇ ਹੋ।"</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"ਤੁਸੀਂ \'ਵਾਪਸ ਜਾਓ\' ਦਾ ਇਸ਼ਾਰਾ ਪੂਰਾ ਕੀਤਾ। ਅੱਗੇ, ਜਾਣੋ ਕਿ ਹੋਮ \'ਤੇ ਕਿਵੇਂ ਜਾਣਾ ਹੈ।"</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਲੇ ਹਿੱਸੇ ਦੇ ਬਹੁਤ ਨੇੜੇ ਸਵਾਈਪ ਨਾ ਕਰੋ।"</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ਪਿੱਛੇ ਜਾਣ ਦੇ ਸੰਕੇਤ ਦੀ ਸੰਵੇਦਨਸ਼ੀਲਤਾ ਬਦਲਣ ਲਈ, ਸੈਟਿੰਗਾਂ \'ਤੇ ਜਾਓ"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"ਪਿੱਛੇ ਜਾਣ ਲਈ ਸਵਾਈਪ ਕਰੋ"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"ਪਿਛਲੀ ਸਕ੍ਰੀਨ \'ਤੇ ਵਾਪਸ ਜਾਣ ਲਈ, ਖੱਬੇ ਜਾਂ ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰੋ।"</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਲੇ ਕਿਨਾਰੇ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ਪੱਕਾ ਕਰੋ ਕਿ ਸਕ੍ਰੀਨ ਨੂੰ ਛੱਡਣ ਤੋਂ ਪਹਿਲਾਂ ਰੁਕੋ ਨਾ।"</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਿੱਧੇ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"ਤੁਸੀਂ ਹੋਮ \'ਤੇ ਜਾਓ ਦਾ ਇਸ਼ਾਰਾ ਪੂਰਾ ਕੀਤਾ। ਅੱਗੇ, ਜਾਣੋ ਕਿ ਐਪਾਂ ਵਿਚਾਲੇ ਅਦਲਾ-ਬਦਲੀ ਕਿਵੇਂ ਕਰਨੀ ਹੈ।"</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"ਹੋਮ \'ਤੇ ਜਾਣ ਲਈ ਸਵਾਈਪ ਕਰੋ"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"ਆਪਣੀ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਾਂ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ। ਇਹ ਸੰਕੇਤ ਹਮੇਸ਼ਾਂ ਤੁਹਾਨੂੰ ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਲੈ ਜਾਂਦਾ ਹੈ।"</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਲੇ ਕਿਨਾਰੇ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"ਛੱਡਣ ਤੋਂ ਪਹਿਲਾਂ ਵਿੰਡੋ ਨੂੰ ਕੁਝ ਸਮੇਂ ਲਈ ਦਬਾ ਕੇ ਰੱਖੋ।"</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਿੱਧੇ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰਦੇ ਹੋ, ਫਿਰ ਰੋਕੋ।"</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"ਤੁਸੀਂ ਐਪਾਂ ਵਿਚਾਲੇ ਅਦਲਾ-ਬਦਲੀ ਦਾ ਇਸ਼ਾਰਾ ਪੂਰਾ ਕੀਤਾ। ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ ਤਿਆਰ ਹੋ!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ਐਪਾਂ ਵਿਚਾਲੇ ਅਦਲਾ-ਬਦਲੀ ਕਰਨ ਲਈ ਸਵਾਈਪ ਕਰੋ"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ਆਪਣੀ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਾਂ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰਕੇ ਦਬਾਈ ਰੱਖੋ, ਅਤੇ ਫਿਰ ਛੱਡੋ।"</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"ਪੂਰੀ ਤਰ੍ਹਾਂ ਤਿਆਰ"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"ਅੱਗੇ"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"ਹੋ ਗਿਆ"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ਸੈਟਿੰਗਾਂ"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ਵਧੀਆ!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"ਟਿਊਟੋਰੀਅਲ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="action_share" msgid="2648470652637092375">"ਸਾਂਝਾ ਕਰੋ"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ਸਕ੍ਰੀਨਸ਼ਾਟ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ਐਪ ਜਾਂ ਤੁਹਾਡੀ ਸੰਸਥਾ ਵੱਲੋਂ ਇਸ ਕਾਰਵਾਈ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ"</string>
-    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
-    <skip />
-    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"ਕੀ ਨੈਵੀਗੇਸ਼ਨ ਟਿਊਟੋਰੀਅਲ ਨੂੰ ਛੱਡਣਾ ਹੈ?"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
     <skip />
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"ਰੱਦ ਕਰੋ"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"ਛੱਡੋ"</string>
 </resources>
diff --git a/quickstep/res/values-pl/strings.xml b/quickstep/res/values-pl/strings.xml
index 017936f673..0df44efc39 100644
--- a/quickstep/res/values-pl/strings.xml
+++ b/quickstep/res/values-pl/strings.xml
@@ -45,73 +45,41 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Włączono sugestie aplikacji"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Sugestie aplikacji są wyłączone"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Przewidywana aplikacja: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
-    <skip />
-    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pamiętaj, aby przesuwać palcem od samej lewej krawędzi."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pamiętaj, aby przesuwać palcem od lewej krawędzi do środka ekranu, a potem podnieść palec."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Dobrze. Teraz przesuń palcem od prawej krawędzi."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pamiętaj, aby przesuwać palcem od samej prawej krawędzi."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pamiętaj, aby przesuwać palcem od prawej krawędzi do środka ekranu, a potem podnieść palec."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Gest przejścia wstecz został opanowany. Poćwicz teraz przechodzenie na ekran główny."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pamiętaj, aby nie przesuwać palcem zbyt blisko dolnej części ekranu."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Czułość gestu cofania możesz zmienić w Ustawieniach"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Przesuwanie palcem, aby przejść wstecz"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Aby wrócić do ostatniego ekranu, przesuń palcem od lewej lub prawej krawędzi do środka ekranu."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pamiętaj, aby przesuwać palcem od dolnej krawędzi ekranu."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pamiętaj, aby przed podniesieniem palca nie było przerwy."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pamiętaj, aby przesuwać palcem prosto do góry."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Gest przechodzenia na ekran główny został opanowany. Poćwicz teraz przełączanie aplikacji."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Przesuwanie palcem, aby przejść na ekran główny"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Przesuń palcem z dołu ekranu. Ten gest zawsze powoduje przejście na ekran główny."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Pamiętaj, aby przesuwać palcem od dolnej krawędzi ekranu."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Przytrzymaj okno dłużej, zanim podniesiesz palec."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Pamiętaj, aby przesuwać palcem prosto do góry, a potem przerwać ruch."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Gest przełączania aplikacji został opanowany. Możesz już używać telefonu."</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Przesuwanie palcem, aby przełączać aplikacje"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Przesuń palcem od dołu ekranu, przytrzymaj i puść."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Wszystko gotowe"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Dalej"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Gotowe"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Ustawienia"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Spróbuj ponownie"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Super!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Samouczek <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="action_share" msgid="2648470652637092375">"Udostępnij"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Zrzut ekranu"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Nie możesz wykonać tego działania, bo nie zezwala na to aplikacja lub Twoja organizacja"</string>
-    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
-    <skip />
-    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Pominąć samouczek nawigacji?"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
     <skip />
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Anuluj"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Pomiń"</string>
 </resources>
diff --git a/quickstep/res/values-pt-rPT/strings.xml b/quickstep/res/values-pt-rPT/strings.xml
index 13939bfc8a..390596c06f 100644
--- a/quickstep/res/values-pt-rPT/strings.xml
+++ b/quickstep/res/values-pt-rPT/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Fazer captura de ecrã"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Esta ação não é permitida pela app ou a sua entidade."</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Ignorar o tutorial de navegação?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Pode encontrar isto na app Dicas"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancelar"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Ignorar"</string>
 </resources>
diff --git a/quickstep/res/values-pt/strings.xml b/quickstep/res/values-pt/strings.xml
index 695b969cdc..1252e60de8 100644
--- a/quickstep/res/values-pt/strings.xml
+++ b/quickstep/res/values-pt/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Capturar tela"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Essa ação não é permitida pelo app ou pela organização"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Pular o tutorial de navegação?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Abra o tutorial mais tarde no app Dicas"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancelar"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Pular"</string>
 </resources>
diff --git a/quickstep/res/values-ro/strings.xml b/quickstep/res/values-ro/strings.xml
index e36b62abbc..556acb5a9f 100644
--- a/quickstep/res/values-ro/strings.xml
+++ b/quickstep/res/values-ro/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Captură de ecran"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Această acțiune nu este permisă de aplicație sau de organizația dvs."</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Omiteți tutorialul de navigare?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Îl puteți găsi mai târziu în Sfaturi"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Anulați"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Omiteți"</string>
 </resources>
diff --git a/quickstep/res/values-ru/strings.xml b/quickstep/res/values-ru/strings.xml
index 9745821bc5..3039a9a60b 100644
--- a/quickstep/res/values-ru/strings.xml
+++ b/quickstep/res/values-ru/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Скриншот"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Это действие заблокировано приложением или организацией."</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Пропустить руководство по жестам?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Его можно найти в приложении \"Советы\"."</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Отмена"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Пропустить"</string>
 </resources>
diff --git a/quickstep/res/values-si/strings.xml b/quickstep/res/values-si/strings.xml
index 501d488ea9..8ffb580a4e 100644
--- a/quickstep/res/values-si/strings.xml
+++ b/quickstep/res/values-si/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"තිර රුව"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"මෙම ක්‍රියාව යෙදුම හෝ ඔබේ සංවිධානය මගින් ඉඩ නොදේ"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"නිබන්ධනය සංචාලනය මඟ හරින්නද?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"ඔබට මෙය පසුව Tips යෙදුම තුළ සොයා ගත හැක"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"අවලංගු කරන්න"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"මඟ හරින්න"</string>
 </resources>
diff --git a/quickstep/res/values-sk/strings.xml b/quickstep/res/values-sk/strings.xml
index 6d3853388d..86d0a8e296 100644
--- a/quickstep/res/values-sk/strings.xml
+++ b/quickstep/res/values-sk/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Snímka obrazovky"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikácia alebo vaša organizácia túto akciu nepovoľuje"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Chcete preskočiť návod na navigáciu?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Tento návod nájdete v aplikácii Tipy"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Zrušiť"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Preskočiť"</string>
 </resources>
diff --git a/quickstep/res/values-sl/strings.xml b/quickstep/res/values-sl/strings.xml
index 96a0e0e391..0d1f015ef2 100644
--- a/quickstep/res/values-sl/strings.xml
+++ b/quickstep/res/values-sl/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Posnetek zaslona"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikacija ali vaša organizacija ne dovoljuje tega dejanja"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Želite preskočiti vadnico za krmarjenje?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"To pozneje najdete v aplikaciji Nasveti."</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Prekliči"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Preskoči"</string>
 </resources>
diff --git a/quickstep/res/values-sq/strings.xml b/quickstep/res/values-sq/strings.xml
index f129aca0f3..b50976fedc 100644
--- a/quickstep/res/values-sq/strings.xml
+++ b/quickstep/res/values-sq/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Pamja e ekranit"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Ky veprim nuk lejohet nga aplikacioni ose organizata jote"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Të kapërcehet udhëzuesi i navigimit?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Këtë mund ta gjesh më vonë tek aplikacioni \"Këshillat\""</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Anulo"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Kapërce"</string>
 </resources>
diff --git a/quickstep/res/values-sr/strings.xml b/quickstep/res/values-sr/strings.xml
index af30acb6e4..c940c15646 100644
--- a/quickstep/res/values-sr/strings.xml
+++ b/quickstep/res/values-sr/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Снимак екрана"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Апликација или организација не дозвољавају ову радњу"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Желите да прескочите водич за кретање?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Можете да пронађете ово у апл. Савети"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Откажи"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Прескочи"</string>
 </resources>
diff --git a/quickstep/res/values-sv/strings.xml b/quickstep/res/values-sv/strings.xml
index 0561dcc3e2..b72f10294e 100644
--- a/quickstep/res/values-sv/strings.xml
+++ b/quickstep/res/values-sv/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Skärmbild"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Appen eller organisationen tillåter inte den här åtgärden"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Vill du hoppa över självstudierna?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Du kan hitta det här igen i Tips-appen"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Avbryt"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Hoppa över"</string>
 </resources>
diff --git a/quickstep/res/values-sw/strings.xml b/quickstep/res/values-sw/strings.xml
index 37e0fc3542..0a6f75cec6 100644
--- a/quickstep/res/values-sw/strings.xml
+++ b/quickstep/res/values-sw/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Picha ya skrini"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Kitendo hiki hakiruhusiwi na programu au shirika lako"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Ungependa kuruka mafunzo ya usogezaji?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Utapata mafunzo haya baadaye katika programu ya Vidokezo"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Ghairi"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Ruka"</string>
 </resources>
diff --git a/quickstep/res/values-ta/strings.xml b/quickstep/res/values-ta/strings.xml
index 6232a4f37f..1f25cc930c 100644
--- a/quickstep/res/values-ta/strings.xml
+++ b/quickstep/res/values-ta/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"ஸ்கிரீன்ஷாட்"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ஆப்ஸோ உங்கள் நிறுவனமோ இந்த செயலை அனுமதிப்பதில்லை"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"வழிகாட்டுதல் பயிற்சியைத் தவிர்க்கவா?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Tips ஆப்ஸில் இதைப் பிறகு கண்டறியலாம்"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"ரத்துசெய்"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"தவிர்"</string>
 </resources>
diff --git a/quickstep/res/values-te/strings.xml b/quickstep/res/values-te/strings.xml
index 15ab20543e..d1e30a2b6f 100644
--- a/quickstep/res/values-te/strings.xml
+++ b/quickstep/res/values-te/strings.xml
@@ -45,73 +45,41 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"యాప్ సలహాలు ఎనేబుల్ చేయబడ్డాయి"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"యాప్ సూచ‌న‌లు డిజేబుల్‌ చేయబడ్డాయి"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"సూచించబడిన యాప్: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
-    <skip />
-    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"మీరు చాలా-ఎడమ అంచు నుండి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"మీరు ఎడమ అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేశారని నిర్ధారించుకోని, ఆపై మీ వేలిని ఎత్తండి."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"అంతే! ఇప్పుడు కుడి అంచు నుండి స్వైప్ చేయడానికి ట్రై చేయండి."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"మీరు చాలా-కుడి అంచు నుండి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"మీరు కుడి అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేశారని నిర్ధారించుకోని, ఆపై మీ వేలిని ఎత్తండి."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"మీరు తిరిగి వెళ్లే సంజ్ఞను పూర్తి చేశారు. తర్వాత, మొదటి ట్యాబ్‌కు ఎలా వెళ్లాలో తెలుసుకోండి."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"మీరు స్క్రీన్ దిగువకు చాలా దగ్గరగా స్వైప్ చేయలేదని నిర్ధారించుకోండి."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"వెనుక సంజ్ఞ సున్నితత్వం మార్చడానికి, సెట్టింగ్‌లకు వెళ్లండి"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"వెనుకకు వెళ్ళడం కోసం స్వైప్ చేయండి"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"మునుపటి స్క్రీన్‌కు తిరిగి వెళ్లడానికి, ఎడమ లేదా కుడి అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేయండి."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"మీరు స్క్రీన్ దిగువ అంచు నుండి పైకి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"బయలుదేరే ముందు మీరు పాజ్ చేయకుండా చూసుకోండి."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"మీరు నేరుగా పైకి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"మీరు మొదటి ట్యాబ్‌కు వెళ్లే సంజ్ఞను పూర్తి చేశారు. తర్వాత, యాప్‌ల మధ్య ఎలా మార్చాలో తెలుసుకోండి."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"వర్చువల్ హోమ్‌కి వెళ్లడానికి స్వైప్ చేయండి"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"మీ స్క్రీన్ కింది నుండి పైకి స్వైప్ చేయి. ఈ సంజ్ఞ ఎప్పుడూ మిమ్మల్ని మొదటి స్క్రీన్‌కు తీసుకెళ్తుంది."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"మీరు స్క్రీన్ దిగువ అంచు నుండి పైకి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"రిలీజ్ చేయడానికి ముందు విండోను ఎక్కువసేపు పట్టుకోడానికి ట్రై చేయండి."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"మీరు నేరుగా స్వైప్ చేశారని నిర్ధారించుకోండి, ఆపై పాజ్ చేయండి."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"మీరు \'యాప్‌ల మధ్య మార్పు\' సంజ్ఞను పూర్తి చేశారు. మీరు మీ ఫోన్‌ను ఉపయోగించడానికి సిద్ధంగా ఉన్నారు!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"యాప్‌ల మధ్య మార్చడం కోసం స్వైప్ చేయండి"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"మీ స్క్రీన్ కింది వైపు నుండి పైకి స్వైప్ చేసి, హోల్డ్ చేసి, తర్వాత రిలీజ్ చేయండి."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"అంతా సిద్ధంగా ఉంది"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"తర్వాత"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"పూర్తయింది"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"సెట్టింగ్‌లు"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"మళ్లీ ట్రై చేయండి"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"పనితీరు బాగుంది!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"ట్యుటోరియల్ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="action_share" msgid="2648470652637092375">"షేర్ చేయండి"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"స్క్రీన్‌షాట్"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ఈ చర్యను యాప్ గానీ, మీ సంస్థ గానీ అనుమతించవు"</string>
-    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
-    <skip />
-    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"నావిగేషన్ ట్యుటోరియల్‌ను స్కిప్ చేయాలా?"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
     <skip />
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"రద్దు చేయి"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"స్కిప్ చేయి"</string>
 </resources>
diff --git a/quickstep/res/values-th/strings.xml b/quickstep/res/values-th/strings.xml
index e483221bf2..8ca076f57e 100644
--- a/quickstep/res/values-th/strings.xml
+++ b/quickstep/res/values-th/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"ภาพหน้าจอ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"แอปหรือองค์กรของคุณไม่อนุญาตการดำเนินการนี้"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"ข้ามบทแนะนำการนำทางไหม"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"คุณดูบทแนะนำนี้ได้ภายหลังในแอป Tips"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"ยกเลิก"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"ข้าม"</string>
 </resources>
diff --git a/quickstep/res/values-tl/strings.xml b/quickstep/res/values-tl/strings.xml
index ff3b97b276..be9dc95338 100644
--- a/quickstep/res/values-tl/strings.xml
+++ b/quickstep/res/values-tl/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Hindi pinapayagan ng app o ng iyong organisasyon ang pagkilos na ito"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Laktawan ang tutorial sa pag-navigate?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Mahahanap mo ito sa Tips app"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Kanselahin"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Laktawan"</string>
 </resources>
diff --git a/quickstep/res/values-tr/strings.xml b/quickstep/res/values-tr/strings.xml
index 12df943ca6..7df01363a8 100644
--- a/quickstep/res/values-tr/strings.xml
+++ b/quickstep/res/values-tr/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Ekran görüntüsü"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Uygulamanız veya kuruluşunuz bu işleme izin vermiyor"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Gezinme eğitici içeriği atlansın mı?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Bunu İpucu uygulamasında bulabilirsiniz"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"İptal"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Atla"</string>
 </resources>
diff --git a/quickstep/res/values-uk/strings.xml b/quickstep/res/values-uk/strings.xml
index d00115bbd5..6c11d95179 100644
--- a/quickstep/res/values-uk/strings.xml
+++ b/quickstep/res/values-uk/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Знімок екрана"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Ця дія заборонена додатком або адміністратором організації"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Пропустити посібник із навігації?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Ви знайдете його в додатку Поради"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Скасувати"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Пропустити"</string>
 </resources>
diff --git a/quickstep/res/values-ur/strings.xml b/quickstep/res/values-ur/strings.xml
index 3298958a68..bfcc897127 100644
--- a/quickstep/res/values-ur/strings.xml
+++ b/quickstep/res/values-ur/strings.xml
@@ -45,73 +45,41 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ایپ کی تجاویز فعال ہیں"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ایپ کی تجاویز غیر فعال ہیں"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"پیشن گوئی کردہ ایپ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
-    <skip />
-    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"اس بات کو یقینی بنائیں کہ آپ بائیں کنارے سے دور سے سوائپ کریں۔"</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"یقینی طور پر بائیں کنارے سے اسکرین کے وسط تک سوائپ کریں اور پھر اپنی انگلی اٹھا لیں۔"</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"بس اتنا ہی! اب دائیں کنارے سے سوائپ کرنا شروع کریں۔"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"اس بات کو یقینی بنائیں کہ آپ دائیں کنارے سے دور سے سوائپ کریں۔"</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"یقینی طور پر دائیں کنارے سے اسکرین کے وسط تک سوائپ کریں اور پھر اپنی انگلی اٹھا لیں۔"</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"آپ نے واپس جائیں اشارے کو مکمل کر لیا۔ اس کے بعد آپ ہوم پر جانے کا طریقہ جانیں۔"</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"اس بات کو یقینی بنائیں کہ آپ اسکرین کے نچلے حصے سے زیادہ قریب سے سوائپ نہ کریں۔"</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"پچھلے اشارے کی حساسیت تبدیل کرنے کے لیے ترتیبات پر جائیں"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"واپس جانے کے لیے سوائپ کریں"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"پچھلی اسکرین پر واپس جانے کے لیے بائیں یا دائیں کنارے سے اسکرین کے وسط تک سوائپ کریں۔"</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"اس بات کو یقینی بنائیں کہ آپ اسکرین کے نچلے کنارے سے اوپر کی طرف سوائپ کریں۔"</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"اس بات کو یقینی بنائیں کہ آپ اپنی انگلی اوپر اٹھانے سے پہلے موقوف نہ کریں۔"</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"اس بات کو یقینی بنائیں کہ آپ سیدھا اوپر کی طرف سوائپ کریں۔"</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"آپ نے ہوم پر جانے کا اشارہ مکمل کر لیا۔ اس کے بعد ایپس سوئچ کرنے کا طریقہ جانیں۔"</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"ہوم پر جانے کے لیے سوائپ کریں"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"اپنی اسکرین کے نیچے سے اوپر کی طرف سوائپ کریں۔ یہ اشارہ آپ کو ہمیشہ ہوم اسکرین پر لے جاتا ہے۔"</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"اس بات کو یقینی بنائیں کہ آپ اسکرین کے نچلے کنارے سے اوپر کی طرف سوائپ کریں۔"</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"انگلی اٹھانے سے پہلے ونڈو کو زیادہ دیر تک پکڑنے کی کوشش کریں۔"</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"اس بات کو یقینی بنائیں کہ آپ سیدھا اوپر کی طرف سوائپ کریں، پھر موقوف کریں۔"</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"آپ نے ایپ کو سوئچ کرنے کا اشارہ مکمل کر لیا۔ آپ اپنا فون استعمال کرنے کے لیے تیار ہیں!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ایپس سوئچ کرنے کے لیے سوائپ کریں"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"اپنی اسکرین کے نچلے حصے سے اوپر کی طرف سوائپ کریں، پکڑ کر رکھیں، پھر چھوڑ دیں۔"</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"سب ہو گیا"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"آگے"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"ہو گیا"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ترتیبات"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"پھر کوشش کریں"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"عمدہ!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"ٹیوٹوریل <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="action_share" msgid="2648470652637092375">"اشتراک کریں"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"اسکرین شاٹ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ایپ یا آپ کی تنظیم کی جانب سے اس کارروائی کی اجازت نہیں ہے"</string>
-    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
-    <skip />
-    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"نیویگیشن کا ٹیوٹوریل نظر انداز کریں؟"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
     <skip />
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"منسوخ کریں"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"نظر انداز کریں"</string>
 </resources>
diff --git a/quickstep/res/values-uz/strings.xml b/quickstep/res/values-uz/strings.xml
index 3681aba233..577a4339ae 100644
--- a/quickstep/res/values-uz/strings.xml
+++ b/quickstep/res/values-uz/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Skrinshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Bu amal ilova yoki tashkilotingiz tomonidan taqiqlangan"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Navigatsiya darsi yopilsinmi?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Bu darslar Maslahatlar ilovasida chiqadi"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Bekor qilish"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Tashlab ketish"</string>
 </resources>
diff --git a/quickstep/res/values-vi/strings.xml b/quickstep/res/values-vi/strings.xml
index 82538a8334..215125c6a6 100644
--- a/quickstep/res/values-vi/strings.xml
+++ b/quickstep/res/values-vi/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Chụp ảnh màn hình"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Ứng dụng hoặc tổ chức của bạn không cho phép thực hiện hành động này"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Bỏ qua phần hướng dẫn thao tác?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Bạn có thể tìm phần này sau trong ứng dụng Mẹo"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Hủy"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Bỏ qua"</string>
 </resources>
diff --git a/quickstep/res/values-zh-rCN/strings.xml b/quickstep/res/values-zh-rCN/strings.xml
index 969d63393c..22d8393e32 100644
--- a/quickstep/res/values-zh-rCN/strings.xml
+++ b/quickstep/res/values-zh-rCN/strings.xml
@@ -45,73 +45,41 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"已启用应用建议"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"已停用应用建议"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"预测的应用：<xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
-    <skip />
-    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"请从最左侧边缘开始滑动。"</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"请从左侧边缘滑动到屏幕中间位置后再松开手指。"</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"大功告成！现在试着从右侧边缘开始滑动。"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"请从最右侧边缘开始滑动。"</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"请从右侧边缘滑动到屏幕中间位置后再松开手指。"</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"您完成了“返回”手势教程。接下来了解如何转到主屏幕。"</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"滑动时，手的位置不要太靠近屏幕底部。"</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"如要调节“返回”手势的灵敏度，请转到“设置”"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"滑动即可返回"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"如要返回上一个屏幕，请从左侧或右侧边缘滑动到屏幕中间位置。"</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"请从屏幕底部边缘向上滑动。"</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"在松开手指前请勿停下来。"</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"请向上滑动。"</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"您完成了“转到主屏幕”手势教程。接下来了解如何切换应用。"</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"滑动即可转到主屏幕"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"从屏幕底部向上滑动。这个手势会一律将您转到主屏幕。"</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"请从屏幕底部边缘向上滑动。"</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"请尝试按住窗口较长时间，然后再松开手指。"</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"请向上滑动，然后停住。"</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"您完成了“切换应用”手势教程。您现在可以使用手机了！"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"滑动即可切换应用"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"从屏幕底部向上滑动后按住，然后松开。"</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"大功告成"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"继续"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"完成"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"设置"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"重试"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"很好！"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"教程 <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="action_share" msgid="2648470652637092375">"分享"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"屏幕截图"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"该应用或您所在的单位不允许执行此操作"</string>
-    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
-    <skip />
-    <!-- no translation found for skip_tutorial_dialog_subtitle (894208145591033987) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"要跳过导航教程吗？"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
     <skip />
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"取消"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"跳过"</string>
 </resources>
diff --git a/quickstep/res/values-zh-rHK/strings.xml b/quickstep/res/values-zh-rHK/strings.xml
index 7284e898a5..b6efec28ef 100644
--- a/quickstep/res/values-zh-rHK/strings.xml
+++ b/quickstep/res/values-zh-rHK/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"螢幕截圖"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"應用程式或您的機構不允許此操作"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"要略過手勢操作教學課程嗎？"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"您之後可以在「提示」應用程式找到這些說明"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"取消"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"略過"</string>
 </resources>
diff --git a/quickstep/res/values-zh-rTW/strings.xml b/quickstep/res/values-zh-rTW/strings.xml
index adf0bb5e37..410e70a67d 100644
--- a/quickstep/res/values-zh-rTW/strings.xml
+++ b/quickstep/res/values-zh-rTW/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"擷取螢幕畫面"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"這個應用程式或貴機構不允許執行這個動作"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"要略過手勢操作教學課程嗎？"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"你之後可以在「提示」應用程式找到這些說明"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"取消"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"略過"</string>
 </resources>
diff --git a/quickstep/res/values-zu/strings.xml b/quickstep/res/values-zu/strings.xml
index 1651068186..4df1a45220 100644
--- a/quickstep/res/values-zu/strings.xml
+++ b/quickstep/res/values-zu/strings.xml
@@ -78,7 +78,8 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Isithombe-skrini"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Lesi senzo asivunyelwanga uhlelo lokusebenza noma inhlangano yakho"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Yeqa isifundo sokuzulazula?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="894208145591033987">"Lokhu ungakuthola kamuva ku-app Yamathiphu"</string>
+    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Khansela"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Yeqa"</string>
 </resources>
-- 
GitLab


From 2875c4daa23c42df500a83312eb04bf4ee623a2c Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sat, 17 Apr 2021 22:15:44 -0700
Subject: [PATCH 0909/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I244c0a7b406c4fe2629f682e9813c835be8c82ef
---
 res/values-ar/strings.xml     |  2 +-
 res/values-as/strings.xml     | 76 +++++++++++++--------------------
 res/values-az/strings.xml     | 76 +++++++++++++--------------------
 res/values-bn/strings.xml     | 76 +++++++++++++--------------------
 res/values-es/strings.xml     |  4 +-
 res/values-eu/strings.xml     | 14 +++---
 res/values-fr/strings.xml     | 76 +++++++++++++--------------------
 res/values-gu/strings.xml     | 76 +++++++++++++--------------------
 res/values-hi/strings.xml     | 78 ++++++++++++++--------------------
 res/values-it/strings.xml     |  4 +-
 res/values-iw/strings.xml     |  8 ++--
 res/values-kk/strings.xml     | 76 +++++++++++++--------------------
 res/values-ky/strings.xml     | 76 +++++++++++++--------------------
 res/values-mn/strings.xml     |  2 +-
 res/values-mr/strings.xml     | 76 +++++++++++++--------------------
 res/values-or/strings.xml     | 76 +++++++++++++--------------------
 res/values-pa/strings.xml     | 76 +++++++++++++--------------------
 res/values-pl/strings.xml     | 80 +++++++++++++++--------------------
 res/values-te/strings.xml     | 76 +++++++++++++--------------------
 res/values-ur/strings.xml     | 76 +++++++++++++--------------------
 res/values-zh-rCN/strings.xml | 76 +++++++++++++--------------------
 21 files changed, 472 insertions(+), 708 deletions(-)

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 04fb528a93..b5115e2d4a 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -136,7 +136,7 @@
     <string name="action_add_to_workspace" msgid="8902165848117513641">"الإضافة إلى شاشة الصفحة الرئيسية"</string>
     <string name="action_move_here" msgid="2170188780612570250">"نقل العنصر إلى هنا"</string>
     <string name="item_added_to_workspace" msgid="4211073925752213539">"تمت إضافة العنصر إلى الشاشة الرئيسية"</string>
-    <string name="item_removed" msgid="851119963877842327">"تم حذف العنصر"</string>
+    <string name="item_removed" msgid="851119963877842327">"تمّت إزالة العنصر."</string>
     <string name="undo" msgid="4151576204245173321">"تراجع"</string>
     <string name="action_move" msgid="4339390619886385032">"نقل العنصر"</string>
     <string name="move_to_empty_cell" msgid="2833711483015685619">"نقل إلى الصف <xliff:g id="NUMBER_0">%1$s</xliff:g> العمود <xliff:g id="NUMBER_1">%2$s</xliff:g>"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 3cfb1158ff..08605ef9de 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -26,47 +26,39 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"ডাউনল’ড কৰা এপটোক সুৰক্ষিত ম\'ডত অক্ষম কৰা হ’ল"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"ৱিজেটবোৰক সুৰক্ষিত ম\'ডত অক্ষম কৰা হ’ল"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"শ্বৰ্টকাট নাই"</string>
-    <!-- no translation found for home_screen (5629429142036709174) -->
-    <skip />
-    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
-    <skip />
-    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
-    <skip />
+    <string name="home_screen" msgid="5629429142036709174">"গৃহ স্ক্ৰীন"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"বিভাজিত স্ক্ৰীন"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"ৱিজেট স্থানান্তৰ কৰিবলৈ দুবাৰ টিপি ধৰি ৰাখক।"</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"কোনো ৱিজেট স্থানান্তৰ কৰিবলৈ দুবাৰ টিপি ধৰি ৰাখক অথবা কাষ্টম কাৰ্য ব্যৱহাৰ কৰক।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d বহল x %2$d ওখ"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"মেনুৱেলভাৱে ৰাখিবলৈ স্পৰ্শ কৰি থাকক"</string>
     <string name="place_automatically" msgid="8064208734425456485">"স্বয়ংক্ৰিয়ভাবে যোগ কৰক"</string>
-    <!-- no translation found for widgets_count (656794749266073027) -->
-    <!-- no translation found for shortcuts_count (8080294865447938455) -->
-    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
-    <skip />
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> টা ৱিজেট</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> টা ৱিজেট</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> টা শ্বৰ্টকাট</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> টা শ্বৰ্টকাট</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"ৱিজেটসমূহ"</string>
-    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
-    <skip />
-    <!-- no translation found for no_widgets_available (9140948620298620513) -->
-    <skip />
-    <!-- no translation found for no_search_results (6518732304311458580) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
-    <skip />
-    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
-    <skip />
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"সন্ধান"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"সন্ধান বাকচত থকা পাঠ মচক"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"কোনো ৱিজেট নাই"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"সন্ধানৰ কোনো ফলাফল নাই"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ব্যক্তিগত"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"কৰ্মস্থান"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"বাৰ্তালাপ"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"এপসমূহ সন্ধান কৰক"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"এপসমূহ ল’ড কৰি থকা হৈছে…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\"ৰ সৈতে মিলা কোনো এপ্ বিচাৰি পোৱা নগ\'ল"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"আৰু অধিক এপবোৰ সন্ধান কৰক"</string>
     <string name="label_application" msgid="8531721983832654978">"এপ্"</string>
     <string name="notifications_header" msgid="1404149926117359025">"জাননীসমূহ"</string>
-    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
-    <skip />
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"শ্বৰ্টকাট স্থানান্তৰ কৰিবলৈ দুবাৰ টিপি ধৰি ৰাখক।"</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"কোনো শ্বৰ্টকাট স্থানান্তৰ কৰিবলৈ দুবাৰ টিপি ধৰি ৰাখক অথবা কাষ্টম কাৰ্য ব্যৱহাৰ কৰক।"</string>
     <string name="out_of_space" msgid="4691004494942118364">"এই গৃহ স্ক্ৰীণত আৰু বেছি ঠাই নাই।"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"পছন্দৰ ট্ৰে\'ত আৰু বেছি ঠাই নাই"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"এপৰ সূচী"</string>
@@ -124,8 +116,7 @@
     <string name="abandoned_search" msgid="891119232568284442">"Search"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"এই এপটো ইনষ্টল কৰা হোৱা নাই"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"এই আইকনৰ এপটো ইনষ্টল কৰা হোৱা নাই। আপুনি এইটো আঁতৰাব পাৰে অথবা এপটো বিচাৰি মেনুৱেলভাৱে ইনষ্টল কৰিব পাৰে।"</string>
-    <!-- no translation found for app_installing_title (5864044122733792085) -->
-    <skip />
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> ইনষ্টল কৰি থকা হৈছে, <xliff:g id="PROGRESS">%2$s</xliff:g> সম্পূৰ্ণ হৈছে"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> ডাউনল’ড কৰি থকা হৈছে, <xliff:g id="PROGRESS">%2$s</xliff:g> সম্পূৰ্ণ হ’ল"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> ইনষ্টল হোৱালৈ অপেক্ষা কৰি থকা হৈছে"</string>
     <string name="widgets_list" msgid="796804551140113767">"ৱিজেটৰ তালিকা"</string>
@@ -165,20 +156,13 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"পৰৱৰ্তী"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"বুজি পালোঁ"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"কৰ্মস্থানৰ প্ৰ\'ফাইলটো পজ কৰা আছে"</string>
-    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
-    <skip />
-    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
-    <skip />
-    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
-    <skip />
-    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
-    <skip />
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"কৰ্মস্থানৰ এপ্‌সমূহে আপোনালৈ জাননী পঠিয়াব, আপোনাৰ বেটাৰী ব্যৱহাৰ কৰিব অথবা আপোনাৰ অৱস্থান এক্সেছ কৰিব নোৱাৰে"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"কৰ্মস্থানৰ প্ৰ’ফাইলটো পজ কৰা আছে। কৰ্মস্থানৰ এপ্‌সমূহে আপোনালৈ জাননী পঠিয়াব, আপোনাৰ বেটাৰী ব্যৱহাৰ কৰিব অথবা আপোনাৰ অৱস্থান এক্সেছ কৰিব নোৱাৰে"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"কর্মস্থানৰ এপ্‌সমূহ প্ৰতীকেৰে চিহ্নিত কৰা হয় আৰু সেইবোৰ আপোনাৰ আইটি প্ৰশাসকৰ বাবে দৃশ্যমান হয়"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"বুজি পালোঁ"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"কৰ্মস্থানৰ এপ্‌ পজ কৰক"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"অন কৰক"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"ফিল্টাৰ"</string>
     <string name="work_switch_tip" msgid="808075064383839144">"কর্মস্থানৰ এপ্‌সমূহ আৰু জাননীসমূহ পজ কৰক"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"বিফল: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 93936bee43..bc0717db34 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -26,47 +26,39 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Güvənli rejimdə icazə verilməyən tətbiq endirildi"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Vidcetlər Güvənli rejimdə deaktiv edilib"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Qısayol əlçatan deyil"</string>
-    <!-- no translation found for home_screen (5629429142036709174) -->
-    <skip />
-    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
-    <skip />
-    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
-    <skip />
+    <string name="home_screen" msgid="5629429142036709174">"Əsas səhifə"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Bölünmüş ekran"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Vidceti daşımaq üçün toxunub saxlayın."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Vidceti daşımaq üçün iki dəfə toxunub saxlayın və ya fərdi əməliyyatlardan istifadə edin."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%2$d hündürlük %1$d enində"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Manual olaraq yerləşdirmək üçün toxunaraq basıb saxlayın"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Avtomatik əlavə edin"</string>
-    <!-- no translation found for widgets_count (656794749266073027) -->
-    <!-- no translation found for shortcuts_count (8080294865447938455) -->
-    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
-    <skip />
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidcet</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> vidcet</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> qısayol</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> qısayol</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"Vidcet"</string>
-    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
-    <skip />
-    <!-- no translation found for no_widgets_available (9140948620298620513) -->
-    <skip />
-    <!-- no translation found for no_search_results (6518732304311458580) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
-    <skip />
-    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
-    <skip />
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Axtarış"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Axtarış qutusundan mətni silin"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Əlçatan vidcet yoxdur"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Axtarış nəticəsi yoxdur"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Şəxsi"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"İş"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Söhbətlər"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Tətbiqləri axtarın"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Tətbiqlər yüklənir…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"<xliff:g id="QUERY">%1$s</xliff:g> sorğusuna uyğun tətbiq tapılmadı"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Daha çox tətbiq üçün axtarış edin"</string>
     <string name="label_application" msgid="8531721983832654978">"Tətbiq"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Bildirişlər"</string>
-    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
-    <skip />
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Qısayolu daşımaq üçün toxunub saxlayın."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Qısayolu daşımaq üçün iki dəfə toxunub saxlayın və ya fərdi əməliyyatlardan istifadə edin."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Bu Əsas ekranda boş yer yoxdur."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Favoritlər-də yer yoxdur"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Tətbiq siyahısı"</string>
@@ -124,8 +116,7 @@
     <string name="abandoned_search" msgid="891119232568284442">"Axtarış"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Bu tətbiq quraşdırılmayıb"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Bu ikona üçün tətbiq quraşdırılmayıb. Onu silə bilərsiniz, və ya tətbiqi taparaq manual yol ilə quraşdıra bilərsiniz."</string>
-    <!-- no translation found for app_installing_title (5864044122733792085) -->
-    <skip />
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> quraşdırır, <xliff:g id="PROGRESS">%2$s</xliff:g> tamamlanıb"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> endirilir, <xliff:g id="PROGRESS">%2$s</xliff:g> tamamlandı"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> yüklənmək üçün gözləyir"</string>
     <string name="widgets_list" msgid="796804551140113767">"Vidcet siyahısı"</string>
@@ -165,20 +156,13 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"Növbəti"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Anladım"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"İş profilinə fasilə verilib"</string>
-    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
-    <skip />
-    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
-    <skip />
-    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
-    <skip />
-    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
-    <skip />
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"İş tətbiqləri sizə bildirişlər göndərə, batareyanızdan istifadə edə və ya məkanınıza daxil ola bilməz"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"İş profili durdurulub. İş tətbiqləri sizə bildirişlər göndərə, batareyanızdan istifadə edə və ya məkanınıza daxil ola bilməz"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"İş tətbiqləri nişanlanıb və İT administratorunuza görünür"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Anladım"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"İş tətbiqlərini durdurun"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Aktiv edin"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtr"</string>
     <string name="work_switch_tip" msgid="808075064383839144">"İş tətbiqlərinə və bildirişlərə fasilə verin"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Alınmadı: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index e61c820b00..4c45b29988 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -26,47 +26,39 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"ডাউনলোড করা অ্যাপ্লিকেশান নিরাপদ মোডে অক্ষম রয়েছে"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"সুরক্ষিত মোডে উইজেট নিষ্ক্রিয় থাকে"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"শর্টকাটগুলি অনুপলব্ধ"</string>
-    <!-- no translation found for home_screen (5629429142036709174) -->
-    <skip />
-    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
-    <skip />
-    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
-    <skip />
+    <string name="home_screen" msgid="5629429142036709174">"হোম"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"স্প্লিট স্ক্রিন"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"একটি উইজেট সরাতে টাচ করে ধরে রাখুন।"</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"একটি উইজেট সরাতে বা কাস্টম অ্যাকশন ব্যবহার করতে ডবল ট্যাপ করে ধরে রাখুন।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%2$d উচ্চতা অনুযায়ী %1$d প্রস্থ"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"নিজে যোগ করতে টাচ করে ধরে রাখুন"</string>
     <string name="place_automatically" msgid="8064208734425456485">"স্বয়ংক্রিয়ভাবে যোগ করুন"</string>
-    <!-- no translation found for widgets_count (656794749266073027) -->
-    <!-- no translation found for shortcuts_count (8080294865447938455) -->
-    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
-    <skip />
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g>টি উইজেট</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g>টি উইজেট</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g>টি শর্টকাট</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g>টি শর্টকাট</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"উইজেট"</string>
-    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
-    <skip />
-    <!-- no translation found for no_widgets_available (9140948620298620513) -->
-    <skip />
-    <!-- no translation found for no_search_results (6518732304311458580) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
-    <skip />
-    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
-    <skip />
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"সার্চ করুন"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"সার্চ বক্স থেকে টেক্সট মুছুন"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"কোনও উইজেট ফলাফল নেই"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"কোনও সার্চ ফলাফল নেই"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ব্যক্তিগত"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"অফিস"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"কথোপকথন"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"অ্যাপ খুঁজুন"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"অ্যাপ লোড হচ্ছে…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" এর সাথে মেলে এমন কোনো অ্যাপ পাওয়া যায়নি"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"আরও অ্যাপ্লিকেশানের জন্য খুঁজুন"</string>
     <string name="label_application" msgid="8531721983832654978">"অ্যাপ"</string>
     <string name="notifications_header" msgid="1404149926117359025">"বিজ্ঞপ্তি"</string>
-    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
-    <skip />
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"একটি শর্টকাট সরাতে টাচ করে ধরে রাখুন।"</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"একটি শর্টকাট সরাতে বা কাস্টম অ্যাকশন ব্যবহার করতে ডবল ট্যাপ করে ধরে রাখুন।"</string>
     <string name="out_of_space" msgid="4691004494942118364">"এই হোম স্ক্রীনে আর কোনো জায়গা নেই৷"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"পছন্দসই ট্রে-তে আর কোনো জায়গা নেই"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"অ্যাপ্লিকেশানগুলির তালিকা"</string>
@@ -124,8 +116,7 @@
     <string name="abandoned_search" msgid="891119232568284442">"সার্চ"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"এই অ্যাপ্লিকেশানটি ইন্সটল করা নাই"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"এই আইকনের অ্যাপ্লিকেশানটি ইন্সটল করা নাই। আপনি এটি সরাতে পারেন বা অ্যাপ্লিকেশানটি সার্চ করে এটি নিজে ইন্সটল করতে পারেন।"</string>
-    <!-- no translation found for app_installing_title (5864044122733792085) -->
-    <skip />
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> ইনস্টল করা হচ্ছে, <xliff:g id="PROGRESS">%2$s</xliff:g> সম্পূর্ণ হয়েছে"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> ডাউনলোড হচ্ছে <xliff:g id="PROGRESS">%2$s</xliff:g> সম্পন্ন হয়েছে"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> ইনস্টলের অপেক্ষায় রয়েছে"</string>
     <string name="widgets_list" msgid="796804551140113767">"উইজেটের তালিকা"</string>
@@ -165,20 +156,13 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"পরের"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"বুঝেছি"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"অফিস প্রোফাইল বন্ধ করা আছে"</string>
-    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
-    <skip />
-    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
-    <skip />
-    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
-    <skip />
-    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
-    <skip />
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"অফিসের অ্যাপ আপনাকে নোটিফিকেশন পাঠাতে পারবে না। এছাড়া, ব্যাটারি ব্যবহার করতে বা লোকেশন অ্যাক্সেস করতে পারবে না"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"অফিসের প্রোফাইল পজ করা আছে। অফিসের অ্যাপ আপনাকে নোটিফিকেশন পাঠাতে পারবে না। এছাড়া, ব্যাটারি ব্যবহার করতে বা লোকেশন অ্যাক্সেস করতে পারবে না"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"অফিসের অ্যাপে ব্যাজ যোগ করা হয়েছে এবং আপনার আইটি অ্যাডমিন সেটি দেখতে পাবেন"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"বুঝেছি"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"অফিসের অ্যাপ পজ করুন"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"চালু করুন"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"ফিল্টার"</string>
     <string name="work_switch_tip" msgid="808075064383839144">"অফিস অ্যাপ এবং বিজ্ঞপ্তি বন্ধ করুন"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"কাজটি করা যায়নি: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 98d970c0dd..3cd084bc8d 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -154,12 +154,12 @@
     <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Los datos personales están separados y ocultos de las aplicaciones de trabajo"</string>
     <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Tu administrador de TI puede ver tus aplicaciones y datos de trabajo"</string>
     <string name="work_profile_edu_next" msgid="8783418929296503629">"Siguiente"</string>
-    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Listo"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Entendido"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"El perfil de trabajo está en pausa"</string>
     <string name="work_apps_paused_body" msgid="4209084728264328628">"Las aplicaciones de trabajo no pueden enviarte notificaciones, consumir tu batería ni acceder a tu ubicación"</string>
     <string name="work_apps_paused_content_description" msgid="4473292417145736203">"El perfil de trabajo está en pausa. Las aplicaciones de trabajo no pueden enviarte notificaciones, consumir tu batería ni acceder a tu ubicación"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Las aplicaciones de trabajo tienen una insignia y tu administrador de TI las puede ver"</string>
-    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Listo"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Entendido"</string>
     <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pausar aplicaciones de trabajo"</string>
     <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Activar"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtro"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 6774f60ee1..a38c3d2669 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -27,9 +27,9 @@
     <string name="safemode_widget_error" msgid="4863470563535682004">"Widgetak desgaitu egin dira modu seguruan"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Lasterbideak ez daude erabilgarri"</string>
     <string name="home_screen" msgid="5629429142036709174">"Hasierako pantaila"</string>
-    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Pantaila zatitu"</string>
-    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Eduki sakatuta widgeta mugitzeko."</string>
-    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Sakatu birritan eta eduki sakatuta widgeta mugitzeko edo ekintza pertsonalizatuak erabiltzeko."</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Zatitu pantaila"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Eduki sakatuta widget bat mugitzeko."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Sakatu birritan eta eduki sakatuta widget bat mugitzeko edo ekintza pertsonalizatuak erabiltzeko."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d zabal eta %2$d luze"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Eduki sakatuta eskuz gehitzeko"</string>
@@ -57,8 +57,8 @@
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Bilatu aplikazio gehiago"</string>
     <string name="label_application" msgid="8531721983832654978">"Aplikazioa"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Jakinarazpenak"</string>
-    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Eduki sakatuta lasterbidea mugitzeko."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Sakatu birritan eta eduki sakatuta lasterbidea mugitzeko edo ekintza pertsonalizatuak erabiltzeko."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Eduki sakatuta lasterbide bat mugitzeko."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Sakatu birritan eta eduki sakatuta lasterbide bat mugitzeko edo ekintza pertsonalizatuak erabiltzeko."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Hasierako pantaila honetan ez dago toki gehiago."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Ez dago toki gehiago Gogokoak erretiluan"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Aplikazioen zerrenda"</string>
@@ -116,7 +116,7 @@
     <string name="abandoned_search" msgid="891119232568284442">"Bilatu"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Aplikazio hau ez dago instalatuta"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Ikono honen aplikazioa ez dago instalatuta. Ikonoa ken dezakezu, edo aplikazioa bilatu eta eskuz instalatu."</string>
-    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> aplikazioa instalatzen, <xliff:g id="PROGRESS">%2$s</xliff:g> osatuta"</string>
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> instalatzen, <xliff:g id="PROGRESS">%2$s</xliff:g> osatuta"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> deskargatzen, <xliff:g id="PROGRESS">%2$s</xliff:g> osatuta"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> instalatzeko zain"</string>
     <string name="widgets_list" msgid="796804551140113767">"Widget-zerrenda"</string>
@@ -157,7 +157,7 @@
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Ados"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"Laneko profila pausatuta dago"</string>
     <string name="work_apps_paused_body" msgid="4209084728264328628">"Laneko aplikazioek ezin dute jakinarazpenik bidali, bateria erabili edo kokapena atzitu"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Laneko profila pausatuta dago. Laneko aplikazioek ezin dute jakinarazpenik bidali, bateria erabili edo kokapena atzitu"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Laneko profila pausatuta dago. Laneko aplikazioek ezin dute jakinarazpenik bidali, bateria erabili edo kokapena atzitu."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Laneko aplikazioek bereizgarriak dituzte, eta IKT saileko administratzaileak ikus ditzake"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Ados"</string>
     <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pausatu laneko aplikazioak"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index ee41e87152..fe12e37e94 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -26,47 +26,39 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"L\'application téléchargée est désactivée en mode sécurisé."</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Les widgets sont désactivés en mode sécurisé."</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Raccourci non disponible"</string>
-    <!-- no translation found for home_screen (5629429142036709174) -->
-    <skip />
-    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
-    <skip />
-    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
-    <skip />
+    <string name="home_screen" msgid="5629429142036709174">"Accueil"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Écran partagé"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Appuyez de manière prolongée pour déplacer widget."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Appuyez deux fois et maintenez la pression pour déplacer widget ou utiliser actions personnalisées."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d x %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de largeur et %2$d de hauteur"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Appuyez de manière prolongée pour placer l\'élément manuellement."</string>
     <string name="place_automatically" msgid="8064208734425456485">"Ajouter automatiquement"</string>
-    <!-- no translation found for widgets_count (656794749266073027) -->
-    <!-- no translation found for shortcuts_count (8080294865447938455) -->
-    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
-    <skip />
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> raccourci</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> raccourcis</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
-    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
-    <skip />
-    <!-- no translation found for no_widgets_available (9140948620298620513) -->
-    <skip />
-    <!-- no translation found for no_search_results (6518732304311458580) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
-    <skip />
-    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
-    <skip />
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Rechercher"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Effacer le texte du champ de recherche"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Aucun widget disponible"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Aucun résultat de recherche"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Widgets personnels"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Widgets professionnels"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Conversations"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Rechercher dans les applications"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Chargement des applications…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Aucune application ne correspond à la requête \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Rechercher plus d\'applications"</string>
     <string name="label_application" msgid="8531721983832654978">"Application"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Notifications"</string>
-    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
-    <skip />
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Appuyez de manière prolongée pour déplacer raccourci."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Appuyez deux fois et maintenez la pression pour déplacer un raccourci ou utiliser les actions personnalisées."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Pas d\'espace libre sur cet écran d\'accueil."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Plus d\'espace disponible dans la zone de favoris."</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Liste d\'applications"</string>
@@ -124,8 +116,7 @@
     <string name="abandoned_search" msgid="891119232568284442">"Rechercher"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Cette application n\'est pas installée"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"L\'application correspondant à cette icône n\'est pas installée. Vous pouvez supprimer cette dernière, ou essayer de rechercher l\'application et de l\'installer manuellement."</string>
-    <!-- no translation found for app_installing_title (5864044122733792085) -->
-    <skip />
+    <string name="app_installing_title" msgid="5864044122733792085">"Installation de <xliff:g id="NAME">%1$s</xliff:g>… (<xliff:g id="PROGRESS">%2$s</xliff:g> terminés)"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> en cours de téléchargement, <xliff:g id="PROGRESS">%2$s</xliff:g> effectué(s)"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> en attente d\'installation"</string>
     <string name="widgets_list" msgid="796804551140113767">"Liste des widgets"</string>
@@ -165,20 +156,13 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"Suivant"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"Profil professionnel en pause"</string>
-    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
-    <skip />
-    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
-    <skip />
-    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
-    <skip />
-    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
-    <skip />
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Les applis professionnelles ne peuvent pas vous envoyer de notifications, utiliser votre batterie ni accéder à votre position"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Profil professionnel en pause. Les applis professionnelles ne peuvent pas vous envoyer de notifications, utiliser votre batterie ni accéder à votre position"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Les applis professionnelles sont identifiées par un badge et votre administrateur informatique peut les voir"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Mettre en pause les applis professionnelles"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Activer"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtre"</string>
     <string name="work_switch_tip" msgid="808075064383839144">"Mettre en pause vos applications et notifications professionnelles"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Échec : <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 4cf3dc9b34..c7f8042522 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -26,47 +26,39 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"સુરક્ષિત મોડમાં ડાઉનલોડ કરેલ ઍપ્લિકેશન અક્ષમ કરી"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"સુરક્ષિત મોડમાં વિજેટ્સ અક્ષમ કર્યા"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"શૉર્ટકટ ઉપલબ્ધ નથી"</string>
-    <!-- no translation found for home_screen (5629429142036709174) -->
-    <skip />
-    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
-    <skip />
-    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
-    <skip />
+    <string name="home_screen" msgid="5629429142036709174">"હોમ સ્ક્રીન"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"સ્ક્રીનને વિભાજિત કરો"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"વિજેટ ખસેડવા ટચ કરીને થોડી વાર દબાવી રાખો."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"વિજેટ ખસેડવા બે વાર ટૅપ કરીને દબાવી રાખો અથવા કસ્ટમ ક્રિયાઓનો ઉપયોગ કરો."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d પહોળાઈ X %2$d ઊંચાઈ"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"મેન્યુઅલી મૂકવા માટે ટચ કરી દબાવી રાખો"</string>
     <string name="place_automatically" msgid="8064208734425456485">"ઑટોમૅટિક રીતે ઉમેરો"</string>
-    <!-- no translation found for widgets_count (656794749266073027) -->
-    <!-- no translation found for shortcuts_count (8080294865447938455) -->
-    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
-    <skip />
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> વિજેટ</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> વિજેટ</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> શૉર્ટકટ</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> શૉર્ટકટ</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"વિજેટ્સ"</string>
-    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
-    <skip />
-    <!-- no translation found for no_widgets_available (9140948620298620513) -->
-    <skip />
-    <!-- no translation found for no_search_results (6518732304311458580) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
-    <skip />
-    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
-    <skip />
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"શોધ"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"શોધ બૉક્સમાંથી ટેક્સ્ટ સાફ કરો"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"કોઈ વિજેટ ઉપલબ્ધ નથી"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"કોઈ શોધ પરિણામો નથી"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"વ્યક્તિગત"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ઑફિસ"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"વાતચીતો"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"શોધ ઍપ્લિકેશનો"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ઍપ્લિકેશનો લોડ કરી રહ્યું છે…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\"થી મેળ ખાતી કોઈ ઍપ્લિકેશનો મળી નથી"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"વધુ ઍપ્લિકેશનો શોધો"</string>
     <string name="label_application" msgid="8531721983832654978">"ઍપ"</string>
     <string name="notifications_header" msgid="1404149926117359025">"નોટિફિકેશન"</string>
-    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
-    <skip />
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"શૉર્ટકટ ખસેડવા ટચ કરીને થોડી વાર દબાવી રાખો."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"શૉર્ટકટ ખસેડવા બે વાર ટૅપ કરીને દબાવી રાખો અથવા કસ્ટમ ક્રિયાઓનો ઉપયોગ કરો."</string>
     <string name="out_of_space" msgid="4691004494942118364">"આ હોમ સ્ક્રીન પર વધુ જગ્યા નથી."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"મનપસંદ ટ્રે પર વધુ જગ્યા નથી"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ઍપ્લિકેશનોની સૂચિ"</string>
@@ -124,8 +116,7 @@
     <string name="abandoned_search" msgid="891119232568284442">"શોધો"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"આ ઍપ્લિકેશન ઇન્સ્ટોલ થયેલ નથી"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"આ આયકન માટેની ઍપ્લિકેશન ઇન્સ્ટોલ થયેલ નથી. તમે તેને દૂર કરી શકો છો અથવા ઍપ્લિકેશન માટે શોધ કરી અને તેને મેન્યુઅલી ઇન્સ્ટોલ કરી શકો છો."</string>
-    <!-- no translation found for app_installing_title (5864044122733792085) -->
-    <skip />
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> ઇન્સ્ટૉલ કરી રહ્યાં છીએ, <xliff:g id="PROGRESS">%2$s</xliff:g> પૂર્ણ થયું"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> ડાઉનલોડ કરી રહ્યાં છે, <xliff:g id="PROGRESS">%2$s</xliff:g> પૂર્ણ"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g>, ઇન્સ્ટૉલ થવાની રાહ જોઈ રહ્યું છે"</string>
     <string name="widgets_list" msgid="796804551140113767">"વિજેટની સૂચિ"</string>
@@ -165,20 +156,13 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"આગળ"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"સમજાઈ ગયું"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"ઑફિસની પ્રોફાઇલ થોભાવી છે"</string>
-    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
-    <skip />
-    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
-    <skip />
-    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
-    <skip />
-    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
-    <skip />
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"ઑફિસ માટેની ઍપ તમને નોટિફિકેશન મોકલી શકતી નથી, તમારી બૅટરી વાપરી શકતી નથી કે તમારું સ્થાન ઍક્સેસ કરી શકતી નથી"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"ઑફિસની પ્રોફાઇલ થોભાવી છે. ઑફિસ માટેની ઍપ તમને નોટિફિકેશન મોકલી શકતી નથી, તમારી બૅટરી વાપરી શકતી નથી કે તમારું સ્થાન ઍક્સેસ કરી શકતી નથી"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"ઑફિસની ઍપને બૅજ આપેલા હોય છે અને તમારા IT વ્યવસ્થાપક તેમને જોઈ શકે છે"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"સમજાઈ ગયું"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"ઑફિસની ઍપ થોભાવો"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"ચાલુ કરો"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"ફિલ્ટર કરો"</string>
     <string name="work_switch_tip" msgid="808075064383839144">"ઑફિસ માટેની ઍપ અને નોટિફિકેશન થોભાવો"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"નિષ્ફળ: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index a10b42d923..1bdbbcb74e 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -26,47 +26,39 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"डाउनलोड किए गए ऐप्लिकेशन सुरक्षित मोड में अक्षम है"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"विजेट सुरक्षित मोड में अक्षम हैं"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"शॉर्टकट उपलब्ध नहीं है"</string>
-    <!-- no translation found for home_screen (5629429142036709174) -->
-    <skip />
-    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
-    <skip />
-    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
-    <skip />
+    <string name="home_screen" msgid="5629429142036709174">"होम स्क्रीन"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"स्प्लिट स्क्रीन"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"किसी विजेट को एक से दूसरी जगह ले जाने के लिए, उसे दबाकर रखें."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"किसी विजेट को एक से दूसरी जगह ले जाने के लिए, उस पर दो बार टैप करके दबाकर रखें या पसंद के मुताबिक कार्रवाइयां इस्तेमाल करें."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d चौड़ाई गुणा %2$d ऊंचाई"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"खुद जोड़ने के लिए दबाकर रखें"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"अपने आप जोड़ें"</string>
-    <!-- no translation found for widgets_count (656794749266073027) -->
-    <!-- no translation found for shortcuts_count (8080294865447938455) -->
-    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
-    <skip />
+    <string name="place_automatically" msgid="8064208734425456485">"अपने-आप जुड़ जाए"</string>
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> विजेट</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> विजेट</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> शॉर्टकट</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> शॉर्टकट</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"विजेट"</string>
-    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
-    <skip />
-    <!-- no translation found for no_widgets_available (9140948620298620513) -->
-    <skip />
-    <!-- no translation found for no_search_results (6518732304311458580) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
-    <skip />
-    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
-    <skip />
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"खोजें"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"खोज बॉक्स से टेक्स्ट हटाएं"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"कोई विजेट उपलब्ध नहीं है"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"खोज का कोई नतीजा नहीं मिला"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"निजी विजेट"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ऑफ़िस"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"बातचीत"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ऐप सर्च करें"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ऐप्लिकेशन लोड हो रहे हैं…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" से मिलता-जुलता कोई ऐप्लिकेशन नहीं मिला"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"और ऐप सर्च करें"</string>
     <string name="label_application" msgid="8531721983832654978">"ऐप्लिकेशन"</string>
     <string name="notifications_header" msgid="1404149926117359025">"सूचनाएं"</string>
-    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
-    <skip />
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"किसी शॉर्टकट को एक से दूसरी जगह ले जाने के लिए, उसे दबाकर रखें."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"किसी शॉर्टकट को एक से दूसरी जगह ले जाने के लिए, उस पर दो बार टैप करके दबाकर रखें या पसंद के मुताबिक कार्रवाइयां इस्तेमाल करें."</string>
     <string name="out_of_space" msgid="4691004494942118364">"इस होम स्‍क्रीन पर जगह नहीं बची है"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"पसंदीदा ट्रे में और जगह नहीं है"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ऐप्लिकेशन सूची"</string>
@@ -124,8 +116,7 @@
     <string name="abandoned_search" msgid="891119232568284442">"खोजें"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"यह ऐप्लिकेशन इंस्टॉल नहीं है"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"इस आइकॉन का ऐप इंस्टॉल नहीं है. आप उसे निकाल सकते हैं या ऐप को खोज कर उसे मैन्युअल रूप से इंस्टॉल कर सकते हैं."</string>
-    <!-- no translation found for app_installing_title (5864044122733792085) -->
-    <skip />
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> इंस्टॉल किया जा रहा है, <xliff:g id="PROGRESS">%2$s</xliff:g> पूरा हो गया"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> डाउनलोड हो रहा है, <xliff:g id="PROGRESS">%2$s</xliff:g> पूरी हुई"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> के इंस्टॉल होने की प्रतीक्षा की जा रही है"</string>
     <string name="widgets_list" msgid="796804551140113767">"विजेट की सूची"</string>
@@ -165,20 +156,13 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"आगे बढ़ें"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ठीक है"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"वर्क प्रोफ़ाइल रोक दी गई है"</string>
-    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
-    <skip />
-    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
-    <skip />
-    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
-    <skip />
-    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
-    <skip />
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन आपको सूचनाएं नहीं भेज सकते. साथ ही, आपकी बैटरी का इस्तेमाल या आपकी जगह की जानकारी को ऐक्सेस भी नहीं कर सकते"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन रोक दिए गए हैं. ऑफ़िस के काम से जुड़े ऐप्लिकेशन आपको सूचनाएं नहीं भेज सकते. साथ ही, आपकी बैटरी का इस्तेमाल या आपकी जगह की जानकारी को ऐक्सेस भी नहीं कर सकते"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन, बैज किए गए हैं और आईटी एडमिन को दिख रहे हैं"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"ठीक है"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन रोकें"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"चालू करें"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"फ़िल्टर"</string>
     <string name="work_switch_tip" msgid="808075064383839144">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन और सूचनाएं रोकें"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"पूरा नहीं हुआ: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 7b4cf02603..7857feff3e 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -156,8 +156,8 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"Avanti"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"Profilo di lavoro in pausa"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Le app di lavoro non possono inviarti notifiche, usare la tua batteria o accedere alla tua posizione"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Profilo di lavoro in pausa. Le app di lavoro non possono inviarti notifiche, usare la tua batteria o accedere alla tua posizione"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Le app di lavoro non possono inviarti notifiche, usare la batteria o accedere alla tua posizione"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Profilo di lavoro in pausa. Le app di lavoro non possono inviarti notifiche, usare la batteria o accedere alla tua posizione"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Le app di lavoro sono contrassegnate con un badge e sono visibili dal tuo amministratore IT"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
     <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Metti in pausa le app di lavoro"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 051982d130..9636353be6 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -28,8 +28,8 @@
     <string name="shortcut_not_available" msgid="2536503539825726397">"קיצור הדרך אינו זמין"</string>
     <string name="home_screen" msgid="5629429142036709174">"בית"</string>
     <string name="recent_task_option_split_screen" msgid="6690461455618725183">"מסך מפוצל"</string>
-    <string name="long_press_widget_to_add" msgid="3587712543577675817">"יש לגעת ולהחזיק כדי להעביר ווידג\'ט למקום אחר."</string>
-    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"יש ללחוץ פעמיים ולהמשיך את הלחיצה כדי להעביר ווידג\'ט למקום אחר או להשתמש בפעולות מותאמות אישית."</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"כדי להעביר ווידג\'ט למקום אחר יש לגעת ולא להרפות."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"כדי להעביר ווידג\'ט למקום אחר או להשתמש בפעולות מותאמות אישית, יש ללחוץ פעמיים ולא להרפות."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"‏רוחב %1$d על גובה %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"יש ללחוץ לחיצה ארוכה כדי להוסיף ידנית"</string>
@@ -61,8 +61,8 @@
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"חפש אפליקציות נוספות"</string>
     <string name="label_application" msgid="8531721983832654978">"אפליקציה"</string>
     <string name="notifications_header" msgid="1404149926117359025">"התראות"</string>
-    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"יש לגעת ולהחזיק כדי להעביר קיצור דרך למקום אחר."</string>
-    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"יש ללחוץ פעמיים ולהמשיך את הלחיצה כדי להעביר קיצור דרך למקום אחר או להשתמש בפעולות מותאמות אישית."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"כדי להעביר קיצור דרך למקום אחר יש לגעת ולא להרפות."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"כדי להעביר קיצור דרך למקום אחר או להשתמש בפעולות מותאמות אישית\' יש ללחוץ פעמיים ולא להרפות."</string>
     <string name="out_of_space" msgid="4691004494942118364">"אין עוד מקום במסך דף הבית הזה."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"אין עוד מקום במגש המועדפים"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"רשימת אפליקציות"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 071e08c81b..dff1311a2e 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -26,47 +26,39 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Жүктелген қолданба қауіпсіз режимде өшірілген"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Қауіпсіз режимде виджеттер өшіріледі"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Таңбаша қолжетімді емес"</string>
-    <!-- no translation found for home_screen (5629429142036709174) -->
-    <skip />
-    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
-    <skip />
-    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
-    <skip />
+    <string name="home_screen" msgid="5629429142036709174">"Негізгі экран"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Экранды бөлу"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Виджетті жылжыту үшін түртіп ұстап тұрыңыз."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Виджетті жылжыту үшін екі рет түртіңіз де, ұстап тұрыңыз немесе арнаулы әрекеттерді пайдаланыңыз."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Ені: %1$d, биіктігі: %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Қолмен қою үшін басып тұрыңыз"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Автоматты қосу"</string>
-    <!-- no translation found for widgets_count (656794749266073027) -->
-    <!-- no translation found for shortcuts_count (8080294865447938455) -->
-    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
-    <skip />
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виджет</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> виджет</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> таңбаша</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> таңбаша</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"Виджеттер"</string>
-    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
-    <skip />
-    <!-- no translation found for no_widgets_available (9140948620298620513) -->
-    <skip />
-    <!-- no translation found for no_search_results (6518732304311458580) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
-    <skip />
-    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
-    <skip />
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Іздеу"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Мәтінді іздеу өрісінен өшіру"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Қолжетімді виджет жоқ."</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Іздеу нәтижелері жоқ."</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Жеке виджеттер"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Жұмыс виджеттері"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Әңгімелер"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Қолданбаларды іздеу"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Қолданбалар жүктелуде…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" сұрауына сәйкес келетін қолданбалар жоқ"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Қосымша қолданбалар іздеу"</string>
     <string name="label_application" msgid="8531721983832654978">"Қолданба"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Хабарландырулар"</string>
-    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
-    <skip />
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Таңбашаны жылжыту үшін түртіп ұстап тұрыңыз."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Таңбашаны жылжыту үшін екі рет түртіңіз де, ұстап тұрыңыз немесе арнаулы әрекеттерді пайдаланыңыз."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Бұл Негізгі экранда орын қалмады."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Қалаулылар науасында орын қалмады"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Қолданбалар тізімі"</string>
@@ -124,8 +116,7 @@
     <string name="abandoned_search" msgid="891119232568284442">"Іздеу"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Бұл қолданба орнатылмаған"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Осы белгіше үшін қолданба орнатылмаған. Оны жоюға болады немесе қолданбаны іздеп, қолмен орнатуға болады."</string>
-    <!-- no translation found for app_installing_title (5864044122733792085) -->
-    <skip />
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> орнатылуда, <xliff:g id="PROGRESS">%2$s</xliff:g> аяқталды"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> жүктелуде, <xliff:g id="PROGRESS">%2$s</xliff:g> аяқталды"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> орнату күтілуде"</string>
     <string name="widgets_list" msgid="796804551140113767">"Виджеттер тізімі"</string>
@@ -165,20 +156,13 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"Келесі"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Түсінікті"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"Жұмыс профилі кідіртілді"</string>
-    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
-    <skip />
-    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
-    <skip />
-    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
-    <skip />
-    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
-    <skip />
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Жұмыс қолданбалары сізге хабарландырулар жібере алмайды, батареяңызды немесе локацияңызды пайдалана алмайды."</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Жұмыс профилі уақытша тоқтатылды. Жұмыс қолданбалары сізге хабарландырулар жібере алмайды, батареяңызды немесе локацияңызды пайдалана алмайды."</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Жұмыс қолданбаларының танымбелгілері бар және олар әкімшіңізге көрінеді."</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Түсінікті"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Жұмыс қолданбаларын тоқтата тұру"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Қосу"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Сүзгі"</string>
     <string name="work_switch_tip" msgid="808075064383839144">"Жұмыс қолданбалары мен хабарландыруларды кідірту"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Қате шықты: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 0c7b072f9a..7606ca10e2 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -26,47 +26,39 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Жүктөп алынган колдонмо Коопсуз режиминде иштен чыгарылды"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Виджеттер Коопсуз режимде өчүрүлгөн"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Кыска жол жок"</string>
-    <!-- no translation found for home_screen (5629429142036709174) -->
-    <skip />
-    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
-    <skip />
-    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
-    <skip />
+    <string name="home_screen" msgid="5629429142036709174">"Башкы экран"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Экранды бөлүү"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Виджетти жылдыруу үчүн коё бербей басып туруңуз."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Виджетти жылдыруу үчүн эки жолу таптап, кармап туруңуз же ыңгайлаштырылган аракеттерди колдонуңуз."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Туурасы: %1$d, бийиктиги: %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Кол менен кошуу үчүн кое бербей басып туруңуз"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Автоматтык түрдө кошуу"</string>
-    <!-- no translation found for widgets_count (656794749266073027) -->
-    <!-- no translation found for shortcuts_count (8080294865447938455) -->
-    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
-    <skip />
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виджет</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> виджет</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> ыкчам баскыч</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> ыкчам баскыч</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"Виджеттер"</string>
-    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
-    <skip />
-    <!-- no translation found for no_widgets_available (9140948620298620513) -->
-    <skip />
-    <!-- no translation found for no_search_results (6518732304311458580) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
-    <skip />
-    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
-    <skip />
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Издөө"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Текстти издөө кутучасынан тазалоо"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Виджет жок"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Издөө жыйынтыктары жок"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Жеке"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Жумуш"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Жазышуулар"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Колдонмолорду издөө"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Колдонмолор жүктөлүүдө…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" сурамына дал келген колдонмолор табылган жок"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Көбүрөөк колдонмолорду издөө"</string>
     <string name="label_application" msgid="8531721983832654978">"Колдонмо"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Билдирмелер"</string>
-    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
-    <skip />
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Ыкчам баскычты жылдыруу үчүн коё бербей басып туруңуз."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Ыкчам баскычты жылдыруу үчүн эки жолу таптап, кармап туруңуз же ыңгайлаштырылган аракеттерди колдонуңуз."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Бул Үй экранында бош орун жок."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Тандамалдар тайпасында орун калган жок"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Колдонмолор тизмеси"</string>
@@ -124,8 +116,7 @@
     <string name="abandoned_search" msgid="891119232568284442">"Издөө"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Бул колдонмо орнотулган эмес"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Бул сүрөтчөнүн колдонмосу орнотулган эмес. Аны алып салсаңыз же колдонмону издеп, кол менен орнотсоңуз болот."</string>
-    <!-- no translation found for app_installing_title (5864044122733792085) -->
-    <skip />
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> орнотулууда, <xliff:g id="PROGRESS">%2$s</xliff:g> аткарылды"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> жүктөлүп алынууда, <xliff:g id="PROGRESS">%2$s</xliff:g> аяктады"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> орнотулушу күтүлүүдө"</string>
     <string name="widgets_list" msgid="796804551140113767">"Виджеттердин тизмеси"</string>
@@ -165,20 +156,13 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"Кийинки"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Түшүндүм"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"Жумуш профили тындырылган"</string>
-    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
-    <skip />
-    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
-    <skip />
-    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
-    <skip />
-    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
-    <skip />
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Жумуш колдонмолору билдирмелерди жөнөтүп, түзмөгүңүздүн батареясын керектеп же кайда жүргөнүңүздү көрө албайт"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Жумуш профили тындырылган. Жумуш колдонмолору билдирмелерди жөнөтүп, түзмөгүңүздүн батареясын керектеп же кайда жүргөнүңүздү көрө албайт"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Жумуш колдонмолору белгиленип, аларды IT администраторлору көрөт"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Түшүндүм"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Жумуш колдонмолорун тындыруу"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Күйгүзүү"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Чыпкалоо"</string>
     <string name="work_switch_tip" msgid="808075064383839144">"Жумуш колдонмолорун жана билдирмелерди тындыруу"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Аткарылган жок: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 9cf4cb853b..b93c535742 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -124,7 +124,7 @@
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Нүүр дэлгэцэд нэмэх"</string>
     <string name="action_move_here" msgid="2170188780612570250">"Энд байршуулах"</string>
     <string name="item_added_to_workspace" msgid="4211073925752213539">"Нүүр дэлгэцэнд нэмсэн зүйл"</string>
-    <string name="item_removed" msgid="851119963877842327">"Арилгасан зүйл"</string>
+    <string name="item_removed" msgid="851119963877842327">"Зүйлийг устгалаа"</string>
     <string name="undo" msgid="4151576204245173321">"Болих"</string>
     <string name="action_move" msgid="4339390619886385032">"Зөөх"</string>
     <string name="move_to_empty_cell" msgid="2833711483015685619">"<xliff:g id="NUMBER_0">%1$s</xliff:g> мөр <xliff:g id="NUMBER_1">%2$s</xliff:g> баганад зөөх"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 82eb841b0b..8ae7bdfa0d 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -26,47 +26,39 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"डाउनलोड केलेला अ‍ॅप सुरक्षित मोड मध्‍ये अक्षम केला"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"विजेट सुरक्षित मोडमध्ये अक्षम झाले"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"शॉर्टकट उपलब्ध नाही"</string>
-    <!-- no translation found for home_screen (5629429142036709174) -->
-    <skip />
-    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
-    <skip />
-    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
-    <skip />
+    <string name="home_screen" msgid="5629429142036709174">"होम"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"स्प्लिट स्क्रीन"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"विजेट हलवण्यासाठी स्पर्श करा आणि धरून ठेवा."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"विजेट हलवण्यासाठी किंवा कस्टम कृती वापरण्यासाठी दोनदा टॅप करा आणि धरून ठेवा."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d रूंद बाय %2$d उंच"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"स्वतः ठेवण्यासाठी स्पर्श करा आणि धरून ठेवा"</string>
     <string name="place_automatically" msgid="8064208734425456485">"आपोआप जोडा"</string>
-    <!-- no translation found for widgets_count (656794749266073027) -->
-    <!-- no translation found for shortcuts_count (8080294865447938455) -->
-    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
-    <skip />
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> विजेट</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> विजेट</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> शॉर्टकट</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> शॉर्टकट</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"विजेट"</string>
-    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
-    <skip />
-    <!-- no translation found for no_widgets_available (9140948620298620513) -->
-    <skip />
-    <!-- no translation found for no_search_results (6518732304311458580) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
-    <skip />
-    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
-    <skip />
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"शोधा"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"सर्च बॉक्समधून मजकूर साफ करा"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"कोणतीही विजेट उपलब्ध नाहीत"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"कोणतेही शोध परिणाम नाहीत"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"वैयक्तिक"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ऑफिस"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"संभाषणे"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"अ‍ॅप्स शोधा"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"अ‍ॅप्स लोड करत आहे…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" शी जुळणारे कोणतेही अ‍ॅप्स आढळले नाहीत"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"अधिक अ‍ॅप्स शोधा"</string>
     <string name="label_application" msgid="8531721983832654978">"ॲप"</string>
     <string name="notifications_header" msgid="1404149926117359025">"सूचना"</string>
-    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
-    <skip />
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"शॉर्टकट हलवण्यासाठी स्पर्श करा आणि धरून ठेवा."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"शॉर्टकट हलवण्यासाठी किंवा कस्टम कृती वापरण्यासाठी दोनदा टॅप करा आणि धरून ठेवा."</string>
     <string name="out_of_space" msgid="4691004494942118364">"या मुख्य स्क्रीनवर आणखी जागा नाही."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"आवडीच्या ट्रे मध्ये आणखी जागा नाही"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"अ‍ॅप्स सूची"</string>
@@ -124,8 +116,7 @@
     <string name="abandoned_search" msgid="891119232568284442">"Search"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"हा अ‍ॅप इंस्टॉल केलेला नाही"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"या चिन्हासाठी अ‍ॅप इंस्टॉल केलेला नाही. तुम्ही ते काढू शकता किंवा अ‍ॅपचा शोध घेऊ शकता आणि त्यास व्यक्तिचलितपणे इंस्टॉल करू शकता."</string>
-    <!-- no translation found for app_installing_title (5864044122733792085) -->
-    <skip />
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> इंस्टॉल करत आहे, <xliff:g id="PROGRESS">%2$s</xliff:g> पूर्ण झाले"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> डाउनलोड होत आहे , <xliff:g id="PROGRESS">%2$s</xliff:g> पूर्ण झाले"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> इंस्टॉल करण्याची प्रतिक्षा करत आहे"</string>
     <string name="widgets_list" msgid="796804551140113767">"विजेट सूची"</string>
@@ -165,20 +156,13 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"पुढील"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"समजले"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"कार्य प्रोफाइल थांबवली आहे"</string>
-    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
-    <skip />
-    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
-    <skip />
-    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
-    <skip />
-    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
-    <skip />
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Work apps तुम्हाला सूचना पाठवू शकत नाहीत, तुमची बॅटरी वापरू शकत नाहीत किंवा तुमचे स्थान अ‍ॅक्सेस करू शकत नाहीत"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"कार्य प्रोफाइल थांबवली आहे. Work apps तुम्हाला सूचना पाठवू शकत नाहीत, तुमची बॅटरी वापरू शकत नाहीत किंवा तुमचे स्थान अ‍ॅक्सेस करू शकत नाहीत"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Work apps ही बॅज केलेली असून तुमच्या IT ॲडमिनला दृश्यमान आहेत"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"समजले"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Work apps थांबवा"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"सुरू करा"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"फिल्टर"</string>
     <string name="work_switch_tip" msgid="808075064383839144">"कार्य अ‍ॅप्स आणि सूचना थांबवा"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"हे करता आले नाही: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index d182ad4a7d..03519ba353 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -26,47 +26,39 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"ନିରାପଦ ମୋଡରେ ଡାଉନଲୋଡ୍‌ ହେଇଥିବା ଆପ୍‌ ଅକ୍ଷମ କରାଗଲା"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"ନିରାପଦ ମୋଡରେ ୱିଜେଟ୍‌ ଅକ୍ଷମ କରାଗଲା"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"ଶର୍ଟକଟ୍‌ ଉପଲବ୍ଧ ନାହିଁ"</string>
-    <!-- no translation found for home_screen (5629429142036709174) -->
-    <skip />
-    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
-    <skip />
-    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
-    <skip />
+    <string name="home_screen" msgid="5629429142036709174">"ମୂଳପୃଷ୍ଠା"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"ସ୍ପ୍ଲିଟ୍ ସ୍କ୍ରିନ୍"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"ଏକ ୱିଜେଟକୁ ମୁଭ୍ କରିବା ପାଇଁ ସ୍ପର୍ଶ କରି ଧରି ରଖନ୍ତୁ।"</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ଏକ ୱିଜେଟକୁ ମୁଭ୍ କରିବା ପାଇଁ ଦୁଇଥର-ଟାପ୍ କରି ଧରି ରଖନ୍ତୁ କିମ୍ବା କଷ୍ଟମ୍ କାର୍ଯ୍ୟଗୁଡ଼ିକୁ ବ୍ୟବହାର କରନ୍ତୁ।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ଓସାର ଓ %2$d ଉଚ୍ଚ"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"ମାନୁଆଲ୍‌ ଭାବରେ ରଖିବାକୁ ସ୍ପର୍ଶ କରନ୍ତୁ ଏବଂ ଧରି ରଖନ୍ତୁ"</string>
     <string name="place_automatically" msgid="8064208734425456485">"ସ୍ୱଚାଳିତ ଭାବେ ଯୋଗ କରନ୍ତୁ"</string>
-    <!-- no translation found for widgets_count (656794749266073027) -->
-    <!-- no translation found for shortcuts_count (8080294865447938455) -->
-    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
-    <skip />
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g>ଟି ୱିଜେଟ୍</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g>ଟି ୱିଜେଟ୍</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g>ଟି ସର୍ଟକଟ୍</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g>ଟି ସର୍ଟକଟ୍</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"ୱିଜେଟ୍‌"</string>
-    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
-    <skip />
-    <!-- no translation found for no_widgets_available (9140948620298620513) -->
-    <skip />
-    <!-- no translation found for no_search_results (6518732304311458580) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
-    <skip />
-    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
-    <skip />
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"ସନ୍ଧାନ କରନ୍ତୁ"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"ସନ୍ଧାନ ବାକ୍ସରୁ ଟେକ୍ସଟ୍ ଖାଲି କରନ୍ତୁ"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"କୌଣସି ୱିଜେଟ୍ ଉପଲବ୍ଧ ନାହିଁ"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"କୌଣସି ସନ୍ଧାନ ଫଳାଫଳ ନାହିଁ"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ବ୍ୟକ୍ତିଗତ"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ୱାର୍କ"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ଆପ୍‌ ଖୋଜନ୍ତୁ"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ଆପ୍‌ ଲୋଡ୍‌ ହେଉଛି..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" ସହିତ ମେଳ ହେଉଥିବା କୌଣସି ଆପ୍‌ ମିଳିଲା ନାହିଁ"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"ଅଧିକ ଆପ୍‌ ଖୋଜନ୍ତୁ"</string>
     <string name="label_application" msgid="8531721983832654978">"ଆପ୍"</string>
     <string name="notifications_header" msgid="1404149926117359025">"ବିଜ୍ଞପ୍ତି"</string>
-    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
-    <skip />
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"ଏକ ସର୍ଟକଟକୁ ମୁଭ୍ କରିବା ପାଇଁ ସ୍ପର୍ଶ କରି ଧରି ରଖନ୍ତୁ।"</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ଏକ ସର୍ଟକଟକୁ ମୁଭ୍ କରିବା ପାଇଁ ଦୁଇଥର-ଟାପ୍ କରି ଧରି ରଖନ୍ତୁ କିମ୍ବା କଷ୍ଟମ୍ କାର୍ଯ୍ୟଗୁଡ଼ିକୁ ବ୍ୟବହାର କରନ୍ତୁ।"</string>
     <string name="out_of_space" msgid="4691004494942118364">"ହୋମ୍‌ ସ୍କ୍ରୀନ ପାଇଁ ଆଉ କୋଠରୀ ନାହିଁ"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ମନପସନ୍ଦ ଟ୍ରେରେ ଆଉ କୋଠରୀ ନାହିଁ"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ଆପ୍‌ ତାଲିକା"</string>
@@ -124,8 +116,7 @@
     <string name="abandoned_search" msgid="891119232568284442">"Search"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"ଏହି ଆପ୍‌ ଇନଷ୍ଟଲ୍‌ ହୋଇନାହିଁ"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"ଏହି ଆଇକନ୍‌ ପାଇଁ ଆପ୍‌ ଇନଷ୍ଟଲ୍‌ ହୋଇନାହିଁ। ଏହାକୁ ଆପଣ ଆପ୍‌ ପାଇଁ ବାହାର କରିପାରିବେ କିମ୍ୱା ସର୍ଚ୍ଚ କରି ପାରିବେ ଏବଂ ଏହାକୁ ମାନୁଆଲ୍‌ ଭାବରେ ଇନଷ୍ଟଲ୍‌ କରିପାରିବେ।"</string>
-    <!-- no translation found for app_installing_title (5864044122733792085) -->
-    <skip />
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> ଇନଷ୍ଟଲ୍ କରାଯାଉଛି, <xliff:g id="PROGRESS">%2$s</xliff:g> ସମ୍ପୂର୍ଣ୍ଣ ହୋଇଛି"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> ଡାଉନଲୋଡ୍‌ ହେଉଛି, <xliff:g id="PROGRESS">%2$s</xliff:g> ସମ୍ପୂର୍ଣ୍ଣ"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> ଇନଷ୍ଟଲ୍‌ ହେବାକୁ ଅପେକ୍ଷା କରିଛି"</string>
     <string name="widgets_list" msgid="796804551140113767">"ୱିଜେଟ୍ ତାଲିକା"</string>
@@ -165,20 +156,13 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"ପରବର୍ତ୍ତୀ"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ବୁଝିଗଲି"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"ୱାର୍କ ପ୍ରୋଫାଇଲକୁ ବିରତ କରାଯାଇଛି"</string>
-    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
-    <skip />
-    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
-    <skip />
-    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
-    <skip />
-    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
-    <skip />
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"ୱାର୍କ ଆପଗୁଡ଼ିକ ଆପଣଙ୍କୁ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ପଠାଇପାରିବ ନାହିଁ, ଆପଣଙ୍କ ବ୍ୟାଟେରୀକୁ ବ୍ୟବହାର କରିପାରିବ ନାହିଁ କିମ୍ବା ଆପଣଙ୍କର ଲୋକେସନକୁ ଆକ୍ସେସ୍ କରିପାରିବ ନାହିଁ"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"ୱାର୍କ ପ୍ରୋଫାଇଲକୁ ବିରତ କରାଯାଇଛି। ୱାର୍କ ଆପଗୁଡ଼ିକ ଆପଣଙ୍କୁ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ପଠାଇପାରିବ ନାହିଁ, ଆପଣଙ୍କ ବ୍ୟାଟେରୀକୁ ବ୍ୟବହାର କରିପାରିବ ନାହିଁ କିମ୍ବା ଆପଣଙ୍କର ଲୋକେସନକୁ ଆକ୍ସେସ୍ କରିପାରିବ ନାହିଁ"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"ୱାର୍କ ଆପଗୁଡ଼ିକୁ ବ୍ୟାଜ୍ କରାଯାଇଛି ଏବଂ ଆପଣଙ୍କ IT ଆଡମିନଙ୍କୁ ଦେଖାଯାଉଛି"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"ବୁଝିଗଲି"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"ୱାର୍କ ଆପଗୁଡ଼ିକୁ ବିରତ କରନ୍ତୁ"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"ଚାଲୁ କରନ୍ତୁ"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"ଫିଲ୍ଟର୍"</string>
     <string name="work_switch_tip" msgid="808075064383839144">"କାର୍ଯ୍ୟସ୍ଥଳୀ ଆପ୍ ଏବଂ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ବିରତ କରନ୍ତୁ"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"ବିଫଳ ହୋଇଛି: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 7ae1d1ae63..4cfc924cb9 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -26,47 +26,39 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"ਡਾਊਨਲੋਡ ਕੀਤਾ ਐਪ ਸੁਰੱਖਿਅਤ ਮੋਡ ਵਿੱਚ ਅਸਮਰਥਿਤ"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"ਵਿਜੇਟ ਸੁਰੱਖਿਅਤ ਮੋਡ ਵਿੱਚ ਅਸਮਰਥਿਤ"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"ਸ਼ਾਰਟਕੱਟ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
-    <!-- no translation found for home_screen (5629429142036709174) -->
-    <skip />
-    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
-    <skip />
-    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
-    <skip />
+    <string name="home_screen" msgid="5629429142036709174">"ਮੁੱਖ ਪੰਨਾ"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"ਸਪਲਿਟ ਸਕ੍ਰੀਨ"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"ਕਿਸੇ ਵਿਜੇਟ ਨੂੰ ਲਿਜਾਉਣ ਲਈ ਸਪੱਰਸ਼ ਕਰਕੇ ਦਬਾਈ ਰੱਖੋ।"</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ਵਿਜੇਟ ਲਿਜਾਉਣ ਲਈ ਜਾਂ ਵਿਉਂਂਤੀਆਂ ਕਾਰਵਾਈਆਂ ਵਰਤਣ ਲਈ ਦੋ ਵਾਰ ਟੈਪ ਕਰਕੇ ਦਬਾ ਕੇ ਰੱਖੋ।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ਚੌੜਾਈ ਅਤੇ %2$d ਲੰਬਾਈ"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"ਹੱਥੀਂ ਰੱਖਣ ਲਈ ਸਪਰਸ਼ ਕਰਕੇ ਰੱਖੋ"</string>
     <string name="place_automatically" msgid="8064208734425456485">"ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸ਼ਾਮਲ ਕਰੋ"</string>
-    <!-- no translation found for widgets_count (656794749266073027) -->
-    <!-- no translation found for shortcuts_count (8080294865447938455) -->
-    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
-    <skip />
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ਵਿਜੇਟ</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ਵਿਜੇਟ</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> ਸ਼ਾਰਟਕੱਟ</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> ਸ਼ਾਰਟਕੱਟ</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"ਵਿਜੇਟ"</string>
-    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
-    <skip />
-    <!-- no translation found for no_widgets_available (9140948620298620513) -->
-    <skip />
-    <!-- no translation found for no_search_results (6518732304311458580) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
-    <skip />
-    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
-    <skip />
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"ਖੋਜੋ"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"ਖੋਜ ਬਾਕਸ ਤੋਂ ਸਪੱਸ਼ਟ ਲਿਖਤ"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"ਕੋਈ ਵਿਜੇਟ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"ਕੋਈ ਖੋਜ ਨਤੀਜਾ ਨਹੀਂ"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ਨਿੱਜੀ"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ਕਾਰਜ-ਸਥਾਨ"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"ਗੱਲਾਂਬਾਤਾਂ"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ਐਪਾਂ ਖੋਜੋ"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ਐਪਾਂ ਨੂੰ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" ਨਾਲ ਮੇਲ ਖਾਂਦੀਆਂ ਕੋਈ ਐਪਾਂ ਨਹੀਂ ਮਿਲੀਆਂ"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"ਹੋਰ ਐਪਾਂ ਖੋਜੋ"</string>
     <string name="label_application" msgid="8531721983832654978">"ਐਪ"</string>
     <string name="notifications_header" msgid="1404149926117359025">"ਸੂਚਨਾਵਾਂ"</string>
-    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
-    <skip />
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"ਕਿਸੇ ਸ਼ਾਰਟਕੱਟ ਨੂੰ ਲਿਜਾਉਣ ਲਈ ਸਪੱਰਸ਼ ਕਰਕੇ ਦਬਾਈ ਰੱਖੋ।"</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ਕਿਸੇ ਸ਼ਾਰਟਕੱਟ ਨੂੰ ਲਿਜਾਉਣ ਲਈ ਡਬਲ ਟੈਪ ਕਰਕੇ ਦਬਾਈ ਰੱਖੋ ਜਾਂ ਵਿਉਂਤੀਆਂ ਕਾਰਵਾਈਆਂ ਵਰਤੋ।"</string>
     <string name="out_of_space" msgid="4691004494942118364">"ਇਸ ਹੋਮ ਸਕ੍ਰੀਨ ਲਈ ਹੋਰ ਖਾਲੀ ਸਥਾਨ ਨਹੀਂ ਹੈ।"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ਮਨਪਸੰਦ ਟ੍ਰੇ ਵਿੱਚ ਹੋਰ ਖਾਲੀ ਸਥਾਨ ਨਹੀਂ।"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ਐਪ ਸੂਚੀ"</string>
@@ -124,8 +116,7 @@
     <string name="abandoned_search" msgid="891119232568284442">"ਖੋਜੋ"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"ਇਹ ਐਪ ਇੰਸਟੌਲ ਨਹੀਂ ਕੀਤਾ ਹੋਇਆ ਹੈ।"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"ਇਸ ਪ੍ਰਤੀਕ ਲਈ ਐਪ ਸਥਾਪਤ ਨਹੀਂ ਕੀਤਾ ਹੋਇਆ ਹੈ। ਤੁਸੀਂ ਇਸਨੂੰ ਹਟਾ ਸਕਦੇ ਹੋ ਜਾਂ ਐਪ ਖੋਜ ਸਕਦੇ ਹੋ ਅਤੇ ਇਸਨੂੰ ਮੈਨੂਅਲੀ ਸਥਾਪਤ ਕਰ ਸਕਦੇ ਹੋ।"</string>
-    <!-- no translation found for app_installing_title (5864044122733792085) -->
-    <skip />
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> ਨੂੰ ਸਥਾਪਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ, <xliff:g id="PROGRESS">%2$s</xliff:g> ਪੂਰਾ ਹੋਇਆ"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> ਡਾਉਨਲੋਡ ਹੋਰ ਰਿਹਾ ਹੈ, <xliff:g id="PROGRESS">%2$s</xliff:g> ਸੰਪੂਰਣ"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> ਸਥਾਪਤ ਕਰਨ ਦੀ ਉਡੀਕ ਕਰ ਰਿਹਾ ਹੈ"</string>
     <string name="widgets_list" msgid="796804551140113767">"ਵਿਜੇਟਾਂ ਦੀ ਸੂਚੀ"</string>
@@ -165,20 +156,13 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"ਅੱਗੇ"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ਸਮਝ ਲਿਆ"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਰੋਕਿਆ ਗਿਆ ਹੈ"</string>
-    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
-    <skip />
-    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
-    <skip />
-    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
-    <skip />
-    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
-    <skip />
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਤੁਹਾਨੂੰ ਸੂਚਨਾਵਾਂ ਨਹੀਂ ਭੇਜ ਸਕਦੀਆਂ, ਤੁਹਾਡੀ ਬੈਟਰੀ ਨਹੀਂ ਵਰਤ ਸਕਦੀਆਂ ਜਾਂ ਤੁਹਾਡੇ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਨਹੀਂ ਕਰ ਸਕਦੀਆਂ"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਰੋਕਿਆ ਗਿਆ ਹੈ। ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਤੁਹਾਨੂੰ ਸੂਚਨਾਵਾਂ ਨਹੀਂ ਭੇਜ ਸਕਦੀਆਂ, ਤੁਹਾਡੀ ਬੈਟਰੀ ਨਹੀਂ ਵਰਤ ਸਕਦੀਆਂ ਜਾਂ ਤੁਹਾਡੇ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਨਹੀਂ ਕਰ ਸਕਦੀਆਂ"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਨੂੰ ਬੈਜ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਅਤੇ ਇਹ ਤੁਹਾਡੇ ਆਈ.ਟੀ. ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਦਿਸਣਗੀਆਂ"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"ਸਮਝ ਲਿਆ"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"ਕੰਮ ਸੰਬੰਧੀ ਐਪ ਰੋਕੋ"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"ਚਾਲੂ ਕਰੋ"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"ਫਿਲਟਰ"</string>
     <string name="work_switch_tip" msgid="808075064383839144">"ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਅਤੇ ਸੂਚਨਾਵਾਂ ਨੂੰ ਰੋਕੋ"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"ਇਹ ਕਾਰਵਾਈ ਅਸਫਲ ਹੋਈ: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 43b1c6d2e4..06074e0b88 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -26,47 +26,43 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Pobrana aplikacja została wyłączona w trybie awaryjnym"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Widżety są wyłączone w trybie bezpiecznym"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Skrót nie jest dostępny"</string>
-    <!-- no translation found for home_screen (5629429142036709174) -->
-    <skip />
-    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
-    <skip />
-    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
-    <skip />
+    <string name="home_screen" msgid="5629429142036709174">"Ekran główny"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Podziel ekran"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Naciśnij i przytrzymaj, aby przenieść widżet."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Naciśnij dwukrotnie i przytrzymaj, aby przenieść widżet lub użyć działań niestandardowych."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Szerokość %1$d, wysokość %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Kliknij i przytrzymaj, by umieścić ręcznie"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Dodaj automatycznie"</string>
-    <!-- no translation found for widgets_count (656794749266073027) -->
-    <!-- no translation found for shortcuts_count (8080294865447938455) -->
-    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
-    <skip />
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widżety</item>
+      <item quantity="many"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widżetów</item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widżetu</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widżet</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="few"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> skróty</item>
+      <item quantity="many"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> skrótów</item>
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> skrótu</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> skrót</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"Widżety"</string>
-    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
-    <skip />
-    <!-- no translation found for no_widgets_available (9140948620298620513) -->
-    <skip />
-    <!-- no translation found for no_search_results (6518732304311458580) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
-    <skip />
-    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
-    <skip />
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Szukaj"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Wyczyść tekst w polu wyszukiwania"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Brak dostępnych widżetów"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Brak wyników wyszukiwania"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Osobiste"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Służbowe"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Rozmowy"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Wyszukaj aplikacje"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Ładuję aplikacje…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nie znaleziono aplikacji pasujących do zapytania „<xliff:g id="QUERY">%1$s</xliff:g>”"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Wyszukaj więcej aplikacji"</string>
     <string name="label_application" msgid="8531721983832654978">"Aplikacja"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Powiadomienia"</string>
-    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
-    <skip />
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Naciśnij i przytrzymaj, aby wybrać skrót."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Naciśnij dwukrotnie i przytrzymaj, aby przenieść skrót lub użyć działań niestandardowych."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Brak miejsca na tym ekranie głównym."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Brak miejsca w Ulubionych"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista aplikacji"</string>
@@ -126,8 +122,7 @@
     <string name="abandoned_search" msgid="891119232568284442">"Szukaj"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Ta aplikacja nie jest zainstalowana"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Aplikacja, której odpowiada ta ikona, nie jest zainstalowana. Możesz usunąć ikonę lub wyszukać aplikację i zainstalować ją ręcznie."</string>
-    <!-- no translation found for app_installing_title (5864044122733792085) -->
-    <skip />
+    <string name="app_installing_title" msgid="5864044122733792085">"Instaluję aplikację <xliff:g id="NAME">%1$s</xliff:g>, postęp: <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"Pobieranie elementu <xliff:g id="NAME">%1$s</xliff:g>, ukończono: <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> oczekuje na instalację"</string>
     <string name="widgets_list" msgid="796804551140113767">"Lista widgetów"</string>
@@ -167,20 +162,13 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"Dalej"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"Wstrzymano profil służbowy"</string>
-    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
-    <skip />
-    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
-    <skip />
-    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
-    <skip />
-    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
-    <skip />
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Aplikacje służbowe nie mogą wysyłać powiadomień, używać baterii ani uzyskiwać dostępu do Twojej lokalizacji"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Wstrzymano profil służbowy. Aplikacje służbowe nie mogą wysyłać powiadomień, używać baterii ani uzyskiwać dostępu do Twojej lokalizacji"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Aplikacje służbowe mają plakietki i są widoczne dla administratora IT"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Wstrzymaj aplikacje służbowe"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Włącz"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtruj"</string>
     <string name="work_switch_tip" msgid="808075064383839144">"Wstrzymaj aplikacje służbowe i powiadomienia"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Niepowodzenie: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 29be024f42..a3c7256b69 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -26,47 +26,39 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"డౌన్‌లోడ్ చేసిన యాప్ సురక్షిత మోడ్‌లో నిలిపివేయబడింది"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"సురక్షిత మోడ్‌లో విడ్జెట్‌లు నిలిపివేయబడ్డాయి"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"షార్ట్‌కట్ అందుబాటులో లేదు"</string>
-    <!-- no translation found for home_screen (5629429142036709174) -->
-    <skip />
-    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
-    <skip />
-    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
-    <skip />
+    <string name="home_screen" msgid="5629429142036709174">"మొదటి ట్యాబ్"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"స్క్రీన్‌ను విభజించు"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"విడ్జెట్‌ను తరలించడానికి తాకి &amp; నొక్కి ఉంచండి."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"విడ్జెట్‌ను తరలించడానికి లేదా అనుకూల చర్యలను ఉపయోగించడానికి రెండుసార్లు నొక్కండి &amp; హోల్డ్ చేయి."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d వెడల్పు X %2$d ఎత్తు"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"మాన్యువల్‌గా ఉంచడానికి నొక్కి, పట్టుకోండి"</string>
     <string name="place_automatically" msgid="8064208734425456485">"ఆటోమేటిక్‌గా జోడించు"</string>
-    <!-- no translation found for widgets_count (656794749266073027) -->
-    <!-- no translation found for shortcuts_count (8080294865447938455) -->
-    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
-    <skip />
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> విడ్జెట్‌లు</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> విడ్జెట్</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> షార్ట్‌కట్‌లు</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> షార్ట్‌కట్</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"విడ్జెట్‌లు"</string>
-    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
-    <skip />
-    <!-- no translation found for no_widgets_available (9140948620298620513) -->
-    <skip />
-    <!-- no translation found for no_search_results (6518732304311458580) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
-    <skip />
-    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
-    <skip />
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"సెర్చ్ చేయండి"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"సెర్చ్ బాక్స్ నుండి టెక్స్ట్‌ను క్లియర్ చేయి"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"విడ్జెట్‌లు అందుబాటులో లేవు"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"సెర్చ్ ఫలితాలు లేవు"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"వ్యక్తిగతం"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ఆఫీస్"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"సంభాషణలు"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"అప్లికేషన్‌లను శోధించండి"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"అప్లికేషన్‌లను లోడ్ చేస్తోంది…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\"కి సరిపోలే అప్లికేషన్‌లేవీ కనుగొనబడలేదు"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"మరిన్ని యాప్‌ల కోసం వెతుకు"</string>
     <string name="label_application" msgid="8531721983832654978">"యాప్"</string>
     <string name="notifications_header" msgid="1404149926117359025">"నోటిఫికేషన్‌లు"</string>
-    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
-    <skip />
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"షార్ట్‌కట్‌ను తరలించడానికి తాకి &amp; నొక్కి ఉంచు."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"షార్ట్‌కట్‌ను తరలించడానికి లేదా అనుకూల చర్యలను ఉపయోగించడానికి రెండుసార్లు నొక్కండి &amp; హోల్డ్ చేయండి."</string>
     <string name="out_of_space" msgid="4691004494942118364">"ఈ హోమ్ స్క్రీన్‌లో ఖాళీ లేదు."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ఇష్టమైనవి ట్రేలో ఖాళీ లేదు"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"అనువర్తనాల జాబితా"</string>
@@ -124,8 +116,7 @@
     <string name="abandoned_search" msgid="891119232568284442">"సెర్చ్"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"ఈ యాప్ ఇన్‌స్టాల్ చేయబడలేదు"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"ఈ చిహ్నం యొక్క యాప్ ఇన్‌స్టాల్ చేయబడలేదు. మీరు దీన్ని తీసివేయవచ్చు లేదా ఆ యాప్ కోసం శోధించి దాన్ని మాన్యువల్‌గా ఇన్‌స్టాల్ చేయవచ్చు."</string>
-    <!-- no translation found for app_installing_title (5864044122733792085) -->
-    <skip />
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g>‌ను ఇన్‌స్టాల్ చేయడం, <xliff:g id="PROGRESS">%2$s</xliff:g> పూర్తయింది"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> డౌన్‌లోడ్ అవుతోంది, <xliff:g id="PROGRESS">%2$s</xliff:g> పూర్తయింది"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> ఇన్‌స్టాల్ కావడానికి వేచి ఉంది"</string>
     <string name="widgets_list" msgid="796804551140113767">"విడ్జెట్‌ల జాబితా"</string>
@@ -165,20 +156,13 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"తర్వాత"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"అర్థమైంది"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"ఆఫీస్ ప్రొఫైల్ పాజ్ చేయబడింది"</string>
-    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
-    <skip />
-    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
-    <skip />
-    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
-    <skip />
-    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
-    <skip />
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"మీకు నోటిఫికేషన్‌లు పంపడం, మీ బ్యాటరీని ఉపయోగించడం, లేదా మీ లొకేషన్‌ను యాక్సెస్ చేయడం \'వర్క్ యాప్\'‌లకు సాధ్యపడదు"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"వర్క్ ప్రొఫైల్ పాజ్ చేయబడింది. మీకు నోటిఫికేషన్‌లు పంపడం, మీ బ్యాటరీని ఉపయోగించడం, లేదా మీ లొకేషన్‌ను యాక్సెస్ చేయడం \'వర్క్ యాప్\'‌లకు సాధ్యపడదు"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"వర్క్ యాప్‌లు బ్యాడ్జ్ చేయబడ్డాయి, మీ IT అడ్మిన్‌కి కనిపిస్తాయి"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"అర్థమైంది"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"వర్క్ యాప్‌లను పాజ్ చేయి"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"ఆన్ చేయి"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"ఫిల్టర్ చేయి"</string>
     <string name="work_switch_tip" msgid="808075064383839144">"ఆఫీస్ యాప్‌లు, నోటిఫికేషన్‌లను పాజ్ చేయండి"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"విఫలమైంది: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 150f31fa49..2ee66b0395 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -26,47 +26,39 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"ڈاؤن لوڈ کردہ ایپ کو محفوظ وضع میں غیر فعال کر دیا گیا"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"ویجیٹس کو محفوظ وضع میں غیر فعال کر دیا گیا"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"شارٹ کٹ دستیاب نہیں ہے"</string>
-    <!-- no translation found for home_screen (5629429142036709174) -->
-    <skip />
-    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
-    <skip />
-    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
-    <skip />
+    <string name="home_screen" msgid="5629429142036709174">"ہوم"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"اسپلٹ اسکرین"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"ویجیٹ منتقل کرنے کے لیے ٹچ کریں اور پکڑ کر رکھیں۔"</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ویجیٹ کو منتقل کرنے یا حسب ضرورت کارروائیاں استعمال کرنے کے لیے دوبار تھپتھپائیں اور پکڑ کر رکھیں۔"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"‏%1$d چوڑا اور ‎%2$d اونچا"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"‏دستی طور پر رکھنے کیلئے ‎ٹچ کر کے دبائے رکھیں"</string>
     <string name="place_automatically" msgid="8064208734425456485">"خود کار طور پر شامل کریں"</string>
-    <!-- no translation found for widgets_count (656794749266073027) -->
-    <!-- no translation found for shortcuts_count (8080294865447938455) -->
-    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
-    <skip />
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ویجیٹس</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> ویجیٹ</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> شارٹ کٹس</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> شارٹ کٹ</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>، <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"ویجیٹس"</string>
-    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
-    <skip />
-    <!-- no translation found for no_widgets_available (9140948620298620513) -->
-    <skip />
-    <!-- no translation found for no_search_results (6518732304311458580) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
-    <skip />
-    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
-    <skip />
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"تلاش کریں"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"تلاش کے خانے سے ٹیکسٹ صاف کریں"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"کوئی ویجیٹ دستیاب نہیں ہے"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"تلاش کا کوئی نتیجہ نہیں ہے"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ذاتی"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"دفتری ویجیٹس"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"گفتگوئیں"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ایپس تلاش کریں"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ایپس لوڈ کی جا رہی ہیں…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" سے مماثل کوئی ایپس نہیں ملیں"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"مزید ایپس تلاش کریں"</string>
     <string name="label_application" msgid="8531721983832654978">"ایپ"</string>
     <string name="notifications_header" msgid="1404149926117359025">"اطلاعات"</string>
-    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
-    <skip />
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"شارٹ کٹ منتقل کرنے کیلیے ٹچ کریں اور پکڑ کر رکھیں۔"</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"شارٹ کٹ کو منتقل کرنے یا حسب ضرورت کارروائیاں استعمال کرنے کے لیے دوبار تھپتھپائیں اور پکڑ کر رکھیں۔"</string>
     <string name="out_of_space" msgid="4691004494942118364">"اس ہوم اسکرین پر مزید کوئی گنجائش نہیں ہے۔"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"پسندیدہ ٹرے میں مزید کوئی گنجائش نہیں ہے"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ایپس کی فہرست"</string>
@@ -124,8 +116,7 @@
     <string name="abandoned_search" msgid="891119232568284442">"تلاش کریں"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"یہ ایپ انسٹال کردہ نہیں ہے"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"اس آئیکن کیلئے ایپ انسٹال کردہ نہیں ہے۔ آپ اسے ہٹا سکتے ہیں یا ایپ کو تلاش کر سکتے اور دستی طور پر اسے انسٹال کر سکتے ہیں۔"</string>
-    <!-- no translation found for app_installing_title (5864044122733792085) -->
-    <skip />
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> انسٹال کی جا رہی ہے، <xliff:g id="PROGRESS">%2$s</xliff:g> مکمل ہو گئی"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> ڈاؤن لوڈ ہو رہا ہے، <xliff:g id="PROGRESS">%2$s</xliff:g> مکمل ہو گیا"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> انسٹال ہونے کا انتظار کر رہی ہے"</string>
     <string name="widgets_list" msgid="796804551140113767">"ویجیٹس کی فہرست"</string>
@@ -165,20 +156,13 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"اگلا"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"سمجھ آ گئی"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"دفتری پروفائل روک دی گئی ہے"</string>
-    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
-    <skip />
-    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
-    <skip />
-    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
-    <skip />
-    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
-    <skip />
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"ورک ایپس آپ کو اطلاعات نہیں بھیج سکتیں، آپ کی بیٹری استعمال یا آپ کے مقام تک رسائی حاصل نہیں کر سکتی ہیں"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"دفتری پروفائل موقوف کر دی گئی ہے۔ ورک ایپس آپ کو اطلاعات نہیں بھیج سکتیں، آپ کی بیٹری استعمال یا آپ کے مقام تک رسائی حاصل نہیں کر سکتی ہیں"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"‏ورک ایپس پر بَیج لگایا ہے اور آپ کا IT منتظم انہیں دیکھ سکتا ہے"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"سمجھ آ گئی"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"ورک ایپس موقوف کریں"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"آن کریں"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"فلٹر"</string>
     <string name="work_switch_tip" msgid="808075064383839144">"ورک ایپس اور اطلاعات کو روکیں"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"ناکام ہو گيا: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ae7afcdc61..f9628b2b87 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -26,47 +26,39 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"安全模式下不允许使用下载的此应用"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"安全模式下不允许使用微件"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"无法使用快捷方式"</string>
-    <!-- no translation found for home_screen (5629429142036709174) -->
-    <skip />
-    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
-    <skip />
-    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
-    <skip />
+    <string name="home_screen" msgid="5629429142036709174">"主屏幕"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"分屏"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"轻触并按住微件即可移动该微件。"</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"点按两次并按住微件即可移动该微件或使用自定义操作。"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"宽 %1$d，高 %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"轻触并按住即可手动放置"</string>
     <string name="place_automatically" msgid="8064208734425456485">"自动添加"</string>
-    <!-- no translation found for widgets_count (656794749266073027) -->
-    <!-- no translation found for shortcuts_count (8080294865447938455) -->
-    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
-    <skip />
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> 个微件</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> 个微件</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> 个快捷方式</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> 个快捷方式</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>，<xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"微件"</string>
-    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
-    <skip />
-    <!-- no translation found for no_widgets_available (9140948620298620513) -->
-    <skip />
-    <!-- no translation found for no_search_results (6518732304311458580) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
-    <skip />
-    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
-    <skip />
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"搜索"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"清除搜索框中的文字"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"没有可用的微件"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"无搜索结果"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"个人"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"工作"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"对话"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"搜索应用"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"正在加载应用…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"未找到与“<xliff:g id="QUERY">%1$s</xliff:g>”相符的应用"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"搜索更多应用"</string>
     <string name="label_application" msgid="8531721983832654978">"应用"</string>
     <string name="notifications_header" msgid="1404149926117359025">"通知"</string>
-    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
-    <skip />
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"轻触并按住快捷方式即可移动该快捷方式。"</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"点按两次并按住快捷方式即可移动该快捷方式或使用自定义操作。"</string>
     <string name="out_of_space" msgid="4691004494942118364">"此主屏幕上已没有空间。"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"收藏栏已满"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"应用列表"</string>
@@ -124,8 +116,7 @@
     <string name="abandoned_search" msgid="891119232568284442">"搜索"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"未安装此应用"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"未安装此图标对应的应用。您可以移除此图标，也可以尝试搜索相应的应用并手动安装。"</string>
-    <!-- no translation found for app_installing_title (5864044122733792085) -->
-    <skip />
+    <string name="app_installing_title" msgid="5864044122733792085">"正在安装<xliff:g id="NAME">%1$s</xliff:g>，已完成 <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"正在下载<xliff:g id="NAME">%1$s</xliff:g>，已完成 <xliff:g id="PROGRESS">%2$s</xliff:g>"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g>正在等待安装"</string>
     <string name="widgets_list" msgid="796804551140113767">"微件列表"</string>
@@ -165,20 +156,13 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"继续"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"知道了"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"工作资料已被暂停"</string>
-    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
-    <skip />
-    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
-    <skip />
-    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
-    <skip />
-    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
-    <skip />
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"现在，工作应用无法向您发送通知、不能耗用电池电量，也无法获取您的位置信息"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"工作资料已暂停使用。现在，工作应用无法向您发送通知、不能耗用电池电量，也无法获取您的位置信息"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"工作应用带有标志，您的 IT 管理员可以看到工作应用"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"知道了"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"暂停工作应用"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"开启"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"过滤器"</string>
     <string name="work_switch_tip" msgid="808075064383839144">"暂停工作应用及其通知"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"失败：<xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
-- 
GitLab


From 27e0cd7ff5dc6ad2e08e0fd26929bdc08446c151 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Mon, 19 Apr 2021 03:45:07 +0000
Subject: [PATCH 0910/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I6d0f6f7f02381791f1e53504ec1a675cf1529ccf
---
 quickstep/res/values-en-rAU/strings.xml | 3 +--
 quickstep/res/values-en-rCA/strings.xml | 3 +--
 quickstep/res/values-en-rGB/strings.xml | 3 +--
 quickstep/res/values-en-rIN/strings.xml | 3 +--
 quickstep/res/values-hy/strings.xml     | 3 +--
 quickstep/res/values-km/strings.xml     | 3 +--
 quickstep/res/values-lo/strings.xml     | 3 +--
 quickstep/res/values-sw/strings.xml     | 3 +--
 quickstep/res/values-uz/strings.xml     | 3 +--
 9 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/quickstep/res/values-en-rAU/strings.xml b/quickstep/res/values-en-rAU/strings.xml
index 79dfda0d41..487d6ccd77 100644
--- a/quickstep/res/values-en-rAU/strings.xml
+++ b/quickstep/res/values-en-rAU/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Skip navigation tutorial?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"You can find this later in the <xliff:g id="NAME">%1$s</xliff:g> app"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancel"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Skip"</string>
 </resources>
diff --git a/quickstep/res/values-en-rCA/strings.xml b/quickstep/res/values-en-rCA/strings.xml
index 79dfda0d41..487d6ccd77 100644
--- a/quickstep/res/values-en-rCA/strings.xml
+++ b/quickstep/res/values-en-rCA/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Skip navigation tutorial?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"You can find this later in the <xliff:g id="NAME">%1$s</xliff:g> app"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancel"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Skip"</string>
 </resources>
diff --git a/quickstep/res/values-en-rGB/strings.xml b/quickstep/res/values-en-rGB/strings.xml
index 79dfda0d41..487d6ccd77 100644
--- a/quickstep/res/values-en-rGB/strings.xml
+++ b/quickstep/res/values-en-rGB/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Skip navigation tutorial?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"You can find this later in the <xliff:g id="NAME">%1$s</xliff:g> app"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancel"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Skip"</string>
 </resources>
diff --git a/quickstep/res/values-en-rIN/strings.xml b/quickstep/res/values-en-rIN/strings.xml
index 79dfda0d41..487d6ccd77 100644
--- a/quickstep/res/values-en-rIN/strings.xml
+++ b/quickstep/res/values-en-rIN/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Skip navigation tutorial?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"You can find this later in the <xliff:g id="NAME">%1$s</xliff:g> app"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancel"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Skip"</string>
 </resources>
diff --git a/quickstep/res/values-hy/strings.xml b/quickstep/res/values-hy/strings.xml
index c09d728955..3ff9d0d5c2 100644
--- a/quickstep/res/values-hy/strings.xml
+++ b/quickstep/res/values-hy/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Սքրինշոթ անել"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Այս գործողությունն արգելված է հավելվածի կամ ձեր կազմակերպության կողմից"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Բաց թողնե՞լ նավիգացիայի ուղեցույցը"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Հետագայում սա կարող եք գտնել «<xliff:g id="NAME">%1$s</xliff:g>» հավելվածում"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Չեղարկել"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Բաց թողնել"</string>
 </resources>
diff --git a/quickstep/res/values-km/strings.xml b/quickstep/res/values-km/strings.xml
index d44ac6743d..62858ba625 100644
--- a/quickstep/res/values-km/strings.xml
+++ b/quickstep/res/values-km/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"រូបថតអេក្រង់"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"សកម្មភាពនេះ​មិនត្រូវបានអនុញ្ញាតដោយកម្មវិធី​ ឬ​ស្ថាប័ន​របស់អ្នកទេ"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"រំលង​មេរៀន​អំពី​ការរុករក​ឬ?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"អ្នកអាចស្វែងរកមេរៀននេះនៅពេលក្រោយក្នុងកម្មវិធី <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"បោះបង់"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"រំលង"</string>
 </resources>
diff --git a/quickstep/res/values-lo/strings.xml b/quickstep/res/values-lo/strings.xml
index 32937f637d..e05b18e613 100644
--- a/quickstep/res/values-lo/strings.xml
+++ b/quickstep/res/values-lo/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"ຮູບໜ້າຈໍ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ແອັບ ຫຼື ອົງການຂອງທ່ານບໍ່ອະນຸຍາດໃຫ້ໃຊ້ຄຳສັ່ງນີ້"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"ຂ້າມການສອນການນຳໃຊ້ການນຳທາງບໍ?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"ທ່ານສາມາດຊອກສ່ວນນີ້ພາຍຫຼັງໄດ້ໃນແອັບ <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"ຍົກເລີກ"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"ຂ້າມ"</string>
 </resources>
diff --git a/quickstep/res/values-sw/strings.xml b/quickstep/res/values-sw/strings.xml
index 0a6f75cec6..b761caee7d 100644
--- a/quickstep/res/values-sw/strings.xml
+++ b/quickstep/res/values-sw/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Picha ya skrini"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Kitendo hiki hakiruhusiwi na programu au shirika lako"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Ungependa kuruka mafunzo ya usogezaji?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Utapata mafunzo haya baadaye katika programu ya <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Ghairi"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Ruka"</string>
 </resources>
diff --git a/quickstep/res/values-uz/strings.xml b/quickstep/res/values-uz/strings.xml
index 577a4339ae..7272eddf51 100644
--- a/quickstep/res/values-uz/strings.xml
+++ b/quickstep/res/values-uz/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Skrinshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Bu amal ilova yoki tashkilotingiz tomonidan taqiqlangan"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Navigatsiya darsi yopilsinmi?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Bu darslar <xliff:g id="NAME">%1$s</xliff:g> ilovasida chiqadi"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Bekor qilish"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Tashlab ketish"</string>
 </resources>
-- 
GitLab


From e01c1f5354cee7efcfbdac13da72bf79398ab3e4 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Mon, 19 Apr 2021 03:45:43 +0000
Subject: [PATCH 0911/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Idf2317e39764e840bd008282c629f8d863bc33a9
---
 res/values-fi/strings.xml | 2 +-
 res/values-pa/strings.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 2b1477c5bb..d7e3a5bcce 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -124,7 +124,7 @@
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Lisää aloitusnäytölle"</string>
     <string name="action_move_here" msgid="2170188780612570250">"Siirrä kohde tänne"</string>
     <string name="item_added_to_workspace" msgid="4211073925752213539">"Kohde lisättiin aloitusnäytölle."</string>
-    <string name="item_removed" msgid="851119963877842327">"Kohde poistettiin."</string>
+    <string name="item_removed" msgid="851119963877842327">"Kohde poistettiin"</string>
     <string name="undo" msgid="4151576204245173321">"Kumoa"</string>
     <string name="action_move" msgid="4339390619886385032">"Siirrä kohde"</string>
     <string name="move_to_empty_cell" msgid="2833711483015685619">"Siirrä rivin <xliff:g id="NUMBER_0">%1$s</xliff:g> sarakkeeseen <xliff:g id="NUMBER_1">%2$s</xliff:g>."</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 4cfc924cb9..f97f2556b5 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -124,7 +124,7 @@
     <string name="action_add_to_workspace" msgid="8902165848117513641">"ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="action_move_here" msgid="2170188780612570250">"ਆਈਟਮ ਨੂੰ ਇੱਥੇ ਮੂਵ ਕਰੋ"</string>
     <string name="item_added_to_workspace" msgid="4211073925752213539">"ਆਈਟਮ ਨੂੰ ਹੋਮ ਸਕ੍ਰੀਨ ਵਿੱਚ ਜੋੜਿਆ ਗਿਆ"</string>
-    <string name="item_removed" msgid="851119963877842327">"ਅਈਟਮ ਹਟਾਈ ਗਈ"</string>
+    <string name="item_removed" msgid="851119963877842327">"ਆਈਟਮ ਹਟਾਈ ਗਈ"</string>
     <string name="undo" msgid="4151576204245173321">"ਅਣਕੀਤਾ ਕਰੋ"</string>
     <string name="action_move" msgid="4339390619886385032">"ਆਈਟਮ ਨੂੰ ਮੂਵ ਕਰੋ"</string>
     <string name="move_to_empty_cell" msgid="2833711483015685619">"ਕਤਾਰ <xliff:g id="NUMBER_0">%1$s</xliff:g> ਕਾਲਮ <xliff:g id="NUMBER_1">%2$s</xliff:g> ਵਿੱਚ ਮੂਵ ਕਰੋ"</string>
-- 
GitLab


From 6acba271098712d64d3977569f0dc1349a231e58 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Wed, 14 Apr 2021 10:26:10 -0400
Subject: [PATCH 0912/1664] Default shell_starting_surface to true to match
 platform behavior.

Bug: 177264697
Test: manual, cold/warm app launches
Change-Id: I0b2f080ddc234f7b9f1432bb8cd80f85c176bc7a
---
 .../src/com/android/launcher3/QuickstepTransitionManager.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 009ca27603..b72cf394c5 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -110,7 +110,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
     private static final String TAG = "QuickstepTransition";
 
     private static final boolean ENABLE_SHELL_STARTING_SURFACE =
-            SystemProperties.getBoolean("persist.debug.shell_starting_surface", false);
+            SystemProperties.getBoolean("persist.debug.shell_starting_surface", true);
 
     /** Duration of status bar animations. */
     public static final int STATUS_BAR_TRANSITION_DURATION = 120;
-- 
GitLab


From 789aa86617c99f290ec2cc25cb3539b0f4feaedf Mon Sep 17 00:00:00 2001
From: Bill Lin <lbill@google.com>
Date: Mon, 19 Apr 2021 20:39:15 +0800
Subject: [PATCH 0913/1664] 2/ Resolve gesture one handed conflicts swipe up
 recents

When user trigger OHM, we should stop user going to both recents
and quick switch until user exit one handed mode.

The previous design is quite flickering due to below gestures
are in race condition:
1) One handed mode swipe up to exit
2) Swipe up to recents
3) Swipe horizontal to quick switch

Test: manual
Bug: 177978035
Change-Id: I10206ba9c263ead24a83a9ee0ffea2ea45eb819d
---
 .../src/com/android/quickstep/TouchInteractionService.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index e9d2eb4632..417b6166d4 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -506,7 +506,8 @@ public class TouchInteractionService extends Service implements PluginListener<O
             }
             mRotationTouchHelper.setOrientationTransformIfNeeded(event);
 
-            if (mRotationTouchHelper.isInSwipeUpTouchRegion(event)) {
+            if (!mDeviceState.isOneHandedModeActive()
+                    && mRotationTouchHelper.isInSwipeUpTouchRegion(event)) {
                 if (TestProtocol.sDebugTracing) {
                     Log.d(TestProtocol.NO_SWIPE_TO_HOME,
                             "TouchInteractionService.onInputEvent:isInSwipeUpTouchRegion");
@@ -535,8 +536,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
                             InputConsumer.NO_OP, mInputMonitorCompat,
                             mDeviceState,
                             event);
-                } else if (mDeviceState.canTriggerOneHandedAction(event)
-                    && !mDeviceState.isOneHandedModeActive()) {
+                } else if (mDeviceState.canTriggerOneHandedAction(event)) {
                     // Consume gesture event for triggering one handed feature.
                     mUncheckedConsumer = new OneHandedModeInputConsumer(this, mDeviceState,
                         InputConsumer.NO_OP, mInputMonitorCompat);
-- 
GitLab


From a999e22560d477edfe98e83c62e3af4b9fbe8461 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 19 Apr 2021 18:17:15 +0100
Subject: [PATCH 0914/1664] Apply color extraction when dragging

Bug: 185795141
Test: Drag the test color extraction widget and observe the change in
      the widget background.
Change-Id: I17203fcb0d7579b1570c68f22248966c3a561c64
---
 src/com/android/launcher3/CellLayout.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index fc09295d7b..bb83802d2a 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -1038,6 +1038,9 @@ public class CellLayout extends ViewGroup {
             mDragCellSpan[0] = spanX;
             mDragCellSpan[1] = spanY;
 
+            // Apply color extraction on a widget when dragging.
+            applyColorExtractionOnWidget(dragObject, mDragCell, spanX, spanY);
+
             final int oldIndex = mDragOutlineCurrent;
             mDragOutlineAnims[oldIndex].animateOut();
             mDragOutlineCurrent = (oldIndex + 1) % mDragOutlines.length;
@@ -1059,8 +1062,8 @@ public class CellLayout extends ViewGroup {
     }
 
     /** Applies the local color extraction to a dragging widget object. */
-    private void applyColorExtraction(DropTarget.DragObject dragObject, int[] targetCell, int spanX,
-            int spanY) {
+    private void applyColorExtractionOnWidget(DropTarget.DragObject dragObject, int[] targetCell,
+            int spanX, int spanY) {
         // Apply local extracted color if the DragView is an AppWidgetHostViewDrawable.
         Drawable drawable = dragObject.dragView.getDrawable();
         if (drawable instanceof AppWidgetHostViewDrawable) {
-- 
GitLab


From 3722bb56202f85c701e7533046d9b23c536e9148 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Mon, 19 Apr 2021 10:36:30 -0500
Subject: [PATCH 0915/1664] [Search][Keyboard] Update default allApps vertical
 transition inset

Bug: 184721373
Test: Manual
Change-Id: I96c930a05055caa6ae1789c9d82810c099a0d133
---
 res/values/dimens.xml                                           | 2 +-
 .../android/launcher3/allapps/AllAppsTransitionController.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index a06b42cf56..8a160bd103 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -84,7 +84,7 @@
     <dimen name="fastscroll_end_margin">-26dp</dimen>
 
     <!-- All Apps -->
-    <dimen name="all_apps_open_vertical_translate">96dp</dimen>
+    <dimen name="all_apps_open_vertical_translate">300dp</dimen>
     <dimen name="all_apps_search_bar_field_height">48dp</dimen>
     <dimen name="all_apps_search_bar_bottom_padding">30dp</dimen>
     <dimen name="all_apps_empty_search_message_top_offset">40dp</dimen>
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 0060b83673..c61c0d6d53 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -197,7 +197,7 @@ public class AllAppsTransitionController
     /**
      * Updates the total scroll range but does not update the UI.
      */
-    void setScrollRangeDelta(float delta) {
+    public void setScrollRangeDelta(float delta) {
         mScrollRangeDelta = delta;
         mShiftRange = mLauncher.getDeviceProfile().heightPx - mScrollRangeDelta;
     }
-- 
GitLab


From 25ebb2d3c1e77cf89244812bc654aeaba5587e28 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Mon, 19 Apr 2021 11:01:45 -0700
Subject: [PATCH 0916/1664] Disable strictmode leak detection

It doesn't work; the check was enabled by mistake.

Test: presubmit
Bug: 185786290
Change-Id: Ie049f1d6d7cef5acfa3ee29b5f9e9586fbeb24a5
---
 tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index e7e245f9aa..2a0f7bb6fd 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -115,7 +115,6 @@ public abstract class AbstractLauncherUiTest {
         if (TestHelpers.isInLauncherProcess()) {
             StrictMode.VmPolicy.Builder builder =
                     new StrictMode.VmPolicy.Builder()
-                            .detectActivityLeaks()
                             .penaltyLog()
                             .penaltyListener(Runnable::run, violation -> {
                                 if (sStrictmodeDetectedActivityLeak == null) {
-- 
GitLab


From 486ce88f1830bc54fe439de7251a3266b4fc0d51 Mon Sep 17 00:00:00 2001
From: Pinyao Ting <pinyaoting@google.com>
Date: Mon, 19 Apr 2021 11:17:42 -0700
Subject: [PATCH 0917/1664] Additional debug logging to triage shortcut related
 issue.

Bug: 185614138
Test: flash and verify logs shows up in bugreport
Change-Id: Ie7b45b5ffbd9ee2ed64f478647779e240f3255a7
---
 .../android/launcher3/model/LoaderTask.java   | 47 +++++++++++--------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index f6c7c0604a..79396b1fc9 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -109,6 +109,8 @@ import java.util.concurrent.CancellationException;
 public class LoaderTask implements Runnable {
     private static final String TAG = "LoaderTask";
 
+    private static final boolean DEBUG = true;
+
     protected final LauncherAppState mApp;
     private final AllAppsList mBgAllAppsList;
     protected final BgDataModel mBgDataModel;
@@ -190,7 +192,7 @@ public class LoaderTask implements Runnable {
         try (LauncherModel.LoaderTransaction transaction = mApp.getModel().beginLoader(this)) {
             List<ShortcutInfo> allShortcuts = new ArrayList<>();
             loadWorkspace(allShortcuts);
-            logger.addSplit("loadWorkspace");
+            logASplit(logger, "loadWorkspace");
 
             // Sanitize data re-syncs widgets/shortcuts based on the workspace loaded from db.
             // sanitizeData should not be invoked if the workspace is loaded from a db different
@@ -199,30 +201,30 @@ public class LoaderTask implements Runnable {
             if (mApp.getInvariantDeviceProfile().dbFile.equals(mDbName)) {
                 verifyNotStopped();
                 sanitizeData();
-                logger.addSplit("sanitizeData");
+                logASplit(logger, "sanitizeData");
             }
 
             verifyNotStopped();
             mResults.bindWorkspace();
-            logger.addSplit("bindWorkspace");
+            logASplit(logger, "bindWorkspace");
 
             mModelDelegate.workspaceLoadComplete();
             // Notify the installer packages of packages with active installs on the first screen.
             sendFirstScreenActiveInstallsBroadcast();
-            logger.addSplit("sendFirstScreenActiveInstallsBroadcast");
+            logASplit(logger, "sendFirstScreenActiveInstallsBroadcast");
 
             // Take a break
             waitForIdle();
-            logger.addSplit("step 1 complete");
+            logASplit(logger, "step 1 complete");
             verifyNotStopped();
 
             // second step
             List<LauncherActivityInfo> allActivityList = loadAllApps();
-            logger.addSplit("loadAllApps");
+            logASplit(logger, "loadAllApps");
 
             verifyNotStopped();
             mResults.bindAllApps();
-            logger.addSplit("bindAllApps");
+            logASplit(logger, "bindAllApps");
 
             verifyNotStopped();
             IconCacheUpdateHandler updateHandler = mIconCache.getUpdateHandler();
@@ -230,54 +232,54 @@ public class LoaderTask implements Runnable {
             updateHandler.updateIcons(allActivityList,
                     LauncherActivityCachingLogic.newInstance(mApp.getContext()),
                     mApp.getModel()::onPackageIconsUpdated);
-            logger.addSplit("update icon cache");
+            logASplit(logger, "update icon cache");
 
             if (FeatureFlags.ENABLE_DEEP_SHORTCUT_ICON_CACHE.get()) {
                 verifyNotStopped();
-                logger.addSplit("save shortcuts in icon cache");
+                logASplit(logger, "save shortcuts in icon cache");
                 updateHandler.updateIcons(allShortcuts, new ShortcutCachingLogic(),
                         mApp.getModel()::onPackageIconsUpdated);
             }
 
             // Take a break
             waitForIdle();
-            logger.addSplit("step 2 complete");
+            logASplit(logger, "step 2 complete");
             verifyNotStopped();
 
             // third step
             List<ShortcutInfo> allDeepShortcuts = loadDeepShortcuts();
-            logger.addSplit("loadDeepShortcuts");
+            logASplit(logger, "loadDeepShortcuts");
 
             verifyNotStopped();
             mResults.bindDeepShortcuts();
-            logger.addSplit("bindDeepShortcuts");
+            logASplit(logger, "bindDeepShortcuts");
 
             if (FeatureFlags.ENABLE_DEEP_SHORTCUT_ICON_CACHE.get()) {
                 verifyNotStopped();
-                logger.addSplit("save deep shortcuts in icon cache");
+                logASplit(logger, "save deep shortcuts in icon cache");
                 updateHandler.updateIcons(allDeepShortcuts,
                         new ShortcutCachingLogic(), (pkgs, user) -> { });
             }
 
             // Take a break
             waitForIdle();
-            logger.addSplit("step 3 complete");
+            logASplit(logger, "step 3 complete");
             verifyNotStopped();
 
             // fourth step
             List<ComponentWithLabelAndIcon> allWidgetsList =
                     mBgDataModel.widgetsModel.update(mApp, null);
-            logger.addSplit("load widgets");
+            logASplit(logger, "load widgets");
 
             verifyNotStopped();
             mResults.bindWidgets();
-            logger.addSplit("bindWidgets");
+            logASplit(logger, "bindWidgets");
             verifyNotStopped();
 
             updateHandler.updateIcons(allWidgetsList,
                     new ComponentWithIconCachingLogic(mApp.getContext(), true),
                     mApp.getModel()::onWidgetLabelsUpdated);
-            logger.addSplit("save widgets in icon cache");
+            logASplit(logger, "save widgets in icon cache");
 
             // fifth step
             if (FeatureFlags.FOLDER_NAME_SUGGEST.get()) {
@@ -286,13 +288,13 @@ public class LoaderTask implements Runnable {
 
             verifyNotStopped();
             updateHandler.finish();
-            logger.addSplit("finish icon update");
+            logASplit(logger, "finish icon update");
 
             mModelDelegate.modelLoadComplete();
             transaction.commit();
         } catch (CancellationException e) {
             // Loader stopped, ignore
-            logger.addSplit("Cancelled");
+            logASplit(logger, "Cancelled");
         } finally {
             logger.dumpToLog();
         }
@@ -977,4 +979,11 @@ public class LoaderTask implements Runnable {
         return (provider != null) && (provider.provider != null)
                 && (provider.provider.getPackageName() != null);
     }
+
+    private static void logASplit(final TimingLogger logger, final String label) {
+        logger.addSplit(label);
+        if (DEBUG) {
+            Log.d(TAG, label);
+        }
+    }
 }
-- 
GitLab


From 1869a9868c3eada84c460dfa21e4a160e6d83b9c Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Mon, 19 Apr 2021 20:02:17 +0100
Subject: [PATCH 0918/1664] On exit search in widget picker, make recommended
 widgets table visible only if recommended widgets are available.

This fixes missing scroll bar on exit search issue (b/183616305)

Bug: 183616305
Test: Manually tested
Change-Id: I3ced5fb2f833f3d34b7dfd376bb4b7c231bc28f6
---
 .../android/launcher3/widget/picker/WidgetsFullSheet.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 5d9a2e2f88..006d20e044 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -434,8 +434,11 @@ public class WidgetsFullSheet extends BaseWidgetSheet
 
     private void setViewVisibilityBasedOnSearch(boolean isInSearchMode) {
         mIsInSearchMode = isInSearchMode;
-        mSearchAndRecommendationViewHolder.mRecommendedWidgetsTable
-                .setVisibility(isInSearchMode ? GONE : VISIBLE);
+        if (isInSearchMode) {
+            mSearchAndRecommendationViewHolder.mRecommendedWidgetsTable.setVisibility(GONE);
+        } else {
+            onRecommendedWidgetsBound();
+        }
         if (mHasWorkProfile) {
             mViewPager.setVisibility(isInSearchMode ? GONE : VISIBLE);
             mTabsView.setVisibility(isInSearchMode ? GONE : VISIBLE);
-- 
GitLab


From fb552936fd10c04071134650a8e39fcdcf681ce1 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Fri, 12 Mar 2021 15:50:58 -0800
Subject: [PATCH 0919/1664] Complete gesture nav sandbox for for UXR.

- Removed All set screens altogether.
- Added "x" button to feedback view. This button now launches a dialog that allows the user to skip the tutorial.
- Added a progress tracker to the feedback view.
- Created a launch option to launch the back, home, then overview gesture tutorials in order.
- Added a button in the feedback view to progress through the tutorial.
- Updated tutorial animations to AnimatedVectorDrawables (with green accents).

Bug: 148542211

Test: manual
Change-Id: Icf3ec424141069895f97da74cd4ae881ff898d3f
---
 .../res/drawable/bg_sandbox_close_button.xml  |   5 +
 .../res/drawable/bg_sandbox_feedback.xml      |  30 +-
 quickstep/res/drawable/close_icon.xml         |  10 +
 ...ture_tutorial_action_button_background.xml |   2 +-
 .../drawable/gesture_tutorial_back_left.xml   | 559 ++++++++++++
 .../drawable/gesture_tutorial_back_right.xml  | 561 ++++++++++++
 ...ture_tutorial_cancel_button_background.xml |  21 +
 .../res/drawable/gesture_tutorial_home.xml    | 394 +++++++++
 .../drawable/gesture_tutorial_overview.xml    | 823 ++++++++++++++++++
 .../res/layout/gesture_tutorial_dialog.xml    |  74 ++
 .../res/layout/gesture_tutorial_fragment.xml  | 148 ++--
 quickstep/res/raw/tips_nav_back_left.mp4      | Bin 485479 -> 0 bytes
 quickstep/res/raw/tips_nav_back_right.mp4     | Bin 472301 -> 0 bytes
 quickstep/res/raw/tips_nav_home.mp4           | Bin 585968 -> 0 bytes
 quickstep/res/raw/tips_nav_overview.mp4       | Bin 991554 -> 0 bytes
 quickstep/res/values/strings.xml              |   2 +-
 quickstep/res/values/styles.xml               |  28 +
 .../AssistantGestureTutorialController.java   |  37 +-
 .../BackGestureTutorialController.java        |  53 +-
 .../BackGestureTutorialFragment.java          |   4 +-
 .../interaction/GestureSandboxActivity.java   |  33 +-
 .../HomeGestureTutorialController.java        |  30 +-
 .../HomeGestureTutorialFragment.java          |   2 +-
 .../OverviewGestureTutorialController.java    |  28 +-
 .../OverviewGestureTutorialFragment.java      |   2 +-
 .../SandboxModeTutorialController.java        |  20 -
 .../interaction/TutorialController.java       | 284 ++++--
 .../interaction/TutorialFragment.java         | 110 ++-
 res/values/colors.xml                         |   4 +-
 .../settings/DeveloperOptionsFragment.java    |  14 +
 30 files changed, 2899 insertions(+), 379 deletions(-)
 create mode 100644 quickstep/res/drawable/bg_sandbox_close_button.xml
 create mode 100644 quickstep/res/drawable/close_icon.xml
 create mode 100644 quickstep/res/drawable/gesture_tutorial_back_left.xml
 create mode 100644 quickstep/res/drawable/gesture_tutorial_back_right.xml
 create mode 100644 quickstep/res/drawable/gesture_tutorial_cancel_button_background.xml
 create mode 100644 quickstep/res/drawable/gesture_tutorial_home.xml
 create mode 100644 quickstep/res/drawable/gesture_tutorial_overview.xml
 create mode 100644 quickstep/res/layout/gesture_tutorial_dialog.xml
 delete mode 100644 quickstep/res/raw/tips_nav_back_left.mp4
 delete mode 100644 quickstep/res/raw/tips_nav_back_right.mp4
 delete mode 100644 quickstep/res/raw/tips_nav_home.mp4
 delete mode 100644 quickstep/res/raw/tips_nav_overview.mp4

diff --git a/quickstep/res/drawable/bg_sandbox_close_button.xml b/quickstep/res/drawable/bg_sandbox_close_button.xml
new file mode 100644
index 0000000000..2811071dd2
--- /dev/null
+++ b/quickstep/res/drawable/bg_sandbox_close_button.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#303030"/>
+</shape>
\ No newline at end of file
diff --git a/quickstep/res/drawable/bg_sandbox_feedback.xml b/quickstep/res/drawable/bg_sandbox_feedback.xml
index 1b3265dbd5..83a3deada8 100644
--- a/quickstep/res/drawable/bg_sandbox_feedback.xml
+++ b/quickstep/res/drawable/bg_sandbox_feedback.xml
@@ -1,10 +1,20 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="394dp"
-    android:height="172dp"
-    android:viewportWidth="394"
-    android:viewportHeight="172">
-  <path
-      android:pathData="M20,0L374,0A20,20 0,0 1,394 20L394,152A20,20 0,0 1,374 172L20,172A20,20 0,0 1,0 152L0,20A20,20 0,0 1,20 0z"
-      android:fillColor="?android:attr/colorBackgroundFloating"
-      android:fillAlpha="0.9"/>
-</vector>
+<!--
+    Copyright (C) 2021 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+  <corners android:radius="28dp"/>
+  <solid android:color="?android:attr/colorBackgroundFloating"/>
+</shape>
diff --git a/quickstep/res/drawable/close_icon.xml b/quickstep/res/drawable/close_icon.xml
new file mode 100644
index 0000000000..07f4336882
--- /dev/null
+++ b/quickstep/res/drawable/close_icon.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="#909090"
+      android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
diff --git a/quickstep/res/drawable/gesture_tutorial_action_button_background.xml b/quickstep/res/drawable/gesture_tutorial_action_button_background.xml
index 3f3b288e2d..6fc2b7657a 100644
--- a/quickstep/res/drawable/gesture_tutorial_action_button_background.xml
+++ b/quickstep/res/drawable/gesture_tutorial_action_button_background.xml
@@ -15,6 +15,6 @@
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="@dimen/default_dialog_corner_radius"/>
+    <corners android:radius="50dp"/>
     <solid android:color="@color/gesture_tutorial_primary_color"/>
 </shape>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_back_left.xml b/quickstep/res/drawable/gesture_tutorial_back_left.xml
new file mode 100644
index 0000000000..92ae2025fb
--- /dev/null
+++ b/quickstep/res/drawable/gesture_tutorial_back_left.xml
@@ -0,0 +1,559 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt">
+    <aapt:attr name="android:drawable">
+        <vector android:height="892dp" android:width="412dp" android:viewportHeight="892" android:viewportWidth="412">
+            <group android:name="_R_G">
+                <group android:name="_R_G_L_7_G" android:translateX="206" android:translateY="446">
+                    <path android:name="_R_G_L_7_G_D_0_P_0" android:fillColor="#f1f3f4" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c "/>
+                </group>
+                <group android:name="_R_G_L_6_G" android:pivotX="206" android:pivotY="446" android:scaleX="1" android:scaleY="1">
+                    <group android:name="_R_G_L_6_G_L_3_G" android:translateX="206" android:translateY="446" android:scaleX="1.2" android:scaleY="1.2">
+                        <path android:name="_R_G_L_6_G_L_3_G_D_0_P_0" android:fillColor="#f1f3f4" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c "/>
+                    </group>
+                    <group android:name="_R_G_L_6_G_L_2_G">
+                        <group android:name="_R_G_L_6_G_L_2_G_L_11_G" android:translateX="206" android:translateY="496.5">
+                            <path android:name="_R_G_L_6_G_L_2_G_L_11_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M235.5 -452.14 C235.5,-452.14 235.5,452.14 235.5,452.14 C235.5,452.14 -235.5,452.14 -235.5,452.14 C-235.5,452.14 -235.5,-452.14 -235.5,-452.14 C-235.5,-452.14 235.5,-452.14 235.5,-452.14c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_2_G_L_10_G" android:translateX="182.5" android:translateY="831">
+                            <path android:name="_R_G_L_6_G_L_2_G_L_10_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M158.5 -7 C158.5,-7 158.5,7 158.5,7 C158.5,9.21 156.71,11 154.5,11 C154.5,11 -154.5,11 -154.5,11 C-156.71,11 -158.5,9.21 -158.5,7 C-158.5,7 -158.5,-7 -158.5,-7 C-158.5,-9.21 -156.71,-11 -154.5,-11 C-154.5,-11 154.5,-11 154.5,-11 C156.71,-11 158.5,-9.21 158.5,-7c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_2_G_L_9_G" android:translateX="186" android:translateY="801">
+                            <path android:name="_R_G_L_6_G_L_2_G_L_9_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M162 -7 C162,-7 162,7 162,7 C162,9.21 160.21,11 158,11 C158,11 -158,11 -158,11 C-160.21,11 -162,9.21 -162,7 C-162,7 -162,-7 -162,-7 C-162,-9.21 -160.21,-11 -158,-11 C-158,-11 158,-11 158,-11 C160.21,-11 162,-9.21 162,-7c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_2_G_L_8_G" android:translateX="119" android:translateY="755">
+                            <path android:name="_R_G_L_6_G_L_2_G_L_8_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M95 -7 C95,-7 95,7 95,7 C95,9.21 93.21,11 91,11 C91,11 -91,11 -91,11 C-93.21,11 -95,9.21 -95,7 C-95,7 -95,-7 -95,-7 C-95,-9.21 -93.21,-11 -91,-11 C-91,-11 91,-11 91,-11 C93.21,-11 95,-9.21 95,-7c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_2_G_L_7_G" android:translateX="182.5" android:translateY="725">
+                            <path android:name="_R_G_L_6_G_L_2_G_L_7_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M158.5 -7 C158.5,-7 158.5,7 158.5,7 C158.5,9.21 156.71,11 154.5,11 C154.5,11 -154.5,11 -154.5,11 C-156.71,11 -158.5,9.21 -158.5,7 C-158.5,7 -158.5,-7 -158.5,-7 C-158.5,-9.21 -156.71,-11 -154.5,-11 C-154.5,-11 154.5,-11 154.5,-11 C156.71,-11 158.5,-9.21 158.5,-7c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_2_G_L_6_G" android:translateX="197.5" android:translateY="695">
+                            <path android:name="_R_G_L_6_G_L_2_G_L_6_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M173.5 -7 C173.5,-7 173.5,7 173.5,7 C173.5,9.21 171.71,11 169.5,11 C169.5,11 -169.5,11 -169.5,11 C-171.71,11 -173.5,9.21 -173.5,7 C-173.5,7 -173.5,-7 -173.5,-7 C-173.5,-9.21 -171.71,-11 -169.5,-11 C-169.5,-11 169.5,-11 169.5,-11 C171.71,-11 173.5,-9.21 173.5,-7c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_2_G_L_5_G" android:translateX="192" android:translateY="665">
+                            <path android:name="_R_G_L_6_G_L_2_G_L_5_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M168 -7 C168,-7 168,7 168,7 C168,9.21 166.21,11 164,11 C164,11 -164,11 -164,11 C-166.21,11 -168,9.21 -168,7 C-168,7 -168,-7 -168,-7 C-168,-9.21 -166.21,-11 -164,-11 C-164,-11 164,-11 164,-11 C166.21,-11 168,-9.21 168,-7c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_2_G_L_4_G" android:translateX="105.5" android:translateY="360">
+                            <path android:name="_R_G_L_6_G_L_2_G_L_4_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M23.5 -2 C23.5,-2 23.5,2 23.5,2 C23.5,4.21 21.71,6 19.5,6 C19.5,6 -19.5,6 -19.5,6 C-21.71,6 -23.5,4.21 -23.5,2 C-23.5,2 -23.5,-2 -23.5,-2 C-23.5,-4.21 -21.71,-6 -19.5,-6 C-19.5,-6 19.5,-6 19.5,-6 C21.71,-6 23.5,-4.21 23.5,-2c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_2_G_L_3_G" android:translateX="47.5" android:translateY="360">
+                            <path android:name="_R_G_L_6_G_L_2_G_L_3_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M23.5 -2 C23.5,-2 23.5,2 23.5,2 C23.5,4.21 21.71,6 19.5,6 C19.5,6 -19.5,6 -19.5,6 C-21.71,6 -23.5,4.21 -23.5,2 C-23.5,2 -23.5,-2 -23.5,-2 C-23.5,-4.21 -21.71,-6 -19.5,-6 C-19.5,-6 19.5,-6 19.5,-6 C21.71,-6 23.5,-4.21 23.5,-2c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_2_G_L_2_G" android:translateX="142.5" android:translateY="328">
+                            <path android:name="_R_G_L_6_G_L_2_G_L_2_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M118.5 -14 C118.5,-14 118.5,14 118.5,14 C118.5,16.21 116.71,18 114.5,18 C114.5,18 -114.5,18 -114.5,18 C-116.71,18 -118.5,16.21 -118.5,14 C-118.5,14 -118.5,-14 -118.5,-14 C-118.5,-16.21 -116.71,-18 -114.5,-18 C-114.5,-18 114.5,-18 114.5,-18 C116.71,-18 118.5,-16.21 118.5,-14c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_2_G_L_1_G" android:translateX="186" android:translateY="284">
+                            <path android:name="_R_G_L_6_G_L_2_G_L_1_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M162 -14 C162,-14 162,14 162,14 C162,16.21 160.21,18 158,18 C158,18 -158,18 -158,18 C-160.21,18 -162,16.21 -162,14 C-162,14 -162,-14 -162,-14 C-162,-16.21 -160.21,-18 -158,-18 C-158,-18 158,-18 158,-18 C160.21,-18 162,-16.21 162,-14c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_2_G_L_0_G" android:translateX="155" android:translateY="240">
+                            <path android:name="_R_G_L_6_G_L_2_G_L_0_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M131 -14 C131,-14 131,14 131,14 C131,16.21 129.21,18 127,18 C127,18 -127,18 -127,18 C-129.21,18 -131,16.21 -131,14 C-131,14 -131,-14 -131,-14 C-131,-16.21 -129.21,-18 -127,-18 C-127,-18 127,-18 127,-18 C129.21,-18 131,-16.21 131,-14c "/>
+                        </group>
+                    </group>
+                    <group android:name="_R_G_L_6_G_L_1_G" android:translateX="24" android:translateY="390">
+                        <group android:name="_R_G_L_6_G_L_1_G_L_7_G" android:translateX="182" android:translateY="120"/>
+                        <group android:name="_R_G_L_6_G_L_1_G_L_6_G" android:translateX="182" android:translateY="120">
+                            <path android:name="_R_G_L_6_G_L_1_G_L_6_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M182 -116 C182,-116 182,116 182,116 C182,118.21 180.21,120 178,120 C178,120 -178,120 -178,120 C-180.21,120 -182,118.21 -182,116 C-182,116 -182,-116 -182,-116 C-182,-118.21 -180.21,-120 -178,-120 C-178,-120 178,-120 178,-120 C180.21,-120 182,-118.21 182,-116c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_1_G_L_5_G" android:translateX="77.322" android:translateY="150.552">
+                            <path android:name="_R_G_L_6_G_L_1_G_L_5_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 20.61 C0,20.61 -10.39,8.69 -10.39,8.69  M0 -6.11 C0,-6.11 -6.78,-15.61 -6.78,-15.61  M0 33.64 C0,33.64 8.26,17.67 8.26,17.67  M0 7.58 C0,7.58 8.26,-7.73 8.26,-7.73  M0 71.19 C0,71.19 0,-18.04 0,-18.04  M-30.22 37.18 C-30.22,37.18 0,-71.19 0,-71.19 C0,-71.19 30.22,37.18 30.22,37.18 C30.22,37.18 -30.22,37.18 -30.22,37.18c "/>
+                            <path android:name="_R_G_L_6_G_L_1_G_L_5_G_D_1_P_0" android:strokeColor="#9adcb2" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M0 20.61 C0,20.61 -10.39,8.69 -10.39,8.69  M0 -6.11 C0,-6.11 -6.78,-15.61 -6.78,-15.61  M0 33.64 C0,33.64 8.26,17.67 8.26,17.67  M0 7.58 C0,7.58 8.26,-7.73 8.26,-7.73  M0 71.19 C0,71.19 0,-18.04 0,-18.04  M-30.22 37.18 C-30.22,37.18 0,-71.19 0,-71.19 C0,-71.19 30.22,37.18 30.22,37.18 C30.22,37.18 -30.22,37.18 -30.22,37.18c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_1_G_L_4_G" android:translateX="38.772" android:translateY="121.73">
+                            <path android:name="_R_G_L_6_G_L_1_G_L_4_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 28.82 C0,28.82 -14.52,12.18 -14.52,12.18  M0 -8.58 C0,-8.58 -9.51,-21.75 -9.51,-21.75  M0 47.01 C0,47.01 11.57,24.7 11.57,24.7  M0 10.64 C0,10.64 11.57,-10.78 11.57,-10.78  M0 99.42 C0,99.42 0,-25.21 0,-25.21  M-31.92 51.94 C-31.92,51.94 0,-99.42 0,-99.42 C0,-99.42 31.92,51.94 31.92,51.94 C31.92,51.94 -31.92,51.94 -31.92,51.94c "/>
+                            <path android:name="_R_G_L_6_G_L_1_G_L_4_G_D_1_P_0" android:strokeColor="#9adcb2" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M0 28.82 C0,28.82 -14.52,12.18 -14.52,12.18  M0 -8.58 C0,-8.58 -9.51,-21.75 -9.51,-21.75  M0 47.01 C0,47.01 11.57,24.7 11.57,24.7  M0 10.64 C0,10.64 11.57,-10.78 11.57,-10.78  M0 99.42 C0,99.42 0,-25.21 0,-25.21  M-31.92 51.94 C-31.92,51.94 0,-99.42 0,-99.42 C0,-99.42 31.92,51.94 31.92,51.94 C31.92,51.94 -31.92,51.94 -31.92,51.94c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_1_G_L_3_G" android:translateX="183" android:translateY="222">
+                            <path android:name="_R_G_L_6_G_L_1_G_L_3_G_D_0_P_0" android:fillColor="#000000" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M170 0 C170,0 -170,0 -170,0 "/>
+                            <path android:name="_R_G_L_6_G_L_1_G_L_3_G_D_1_P_0" android:strokeColor="#9aa0a6" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="4" android:strokeAlpha="1" android:pathData=" M170 0 C170,0 -170,0 -170,0 "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_1_G_L_2_G" android:translateX="265.619" android:translateY="162.331">
+                            <path android:name="_R_G_L_6_G_L_1_G_L_2_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M-34.05 50.06 C-34.05,50.06 -34.05,-49.25 -34.05,-49.25  M-34.05 -49.55 C-34.05,-49.55 17.54,50.06 17.54,50.06 C17.54,50.06 84.62,50.06 84.62,50.06 C84.62,50.06 32.65,-50.06 32.65,-50.06 C32.65,-50.06 -34.05,-50.06 -34.05,-50.06 C-34.05,-50.06 -84.62,50.06 -84.62,50.06 C-84.62,50.06 17.54,50.06 17.54,50.06 "/>
+                            <path android:name="_R_G_L_6_G_L_1_G_L_2_G_D_1_P_0" android:strokeColor="#a8cbfe" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M-34.05 50.06 C-34.05,50.06 -34.05,-49.25 -34.05,-49.25  M-34.05 -49.55 C-34.05,-49.55 17.54,50.06 17.54,50.06 C17.54,50.06 84.62,50.06 84.62,50.06 C84.62,50.06 32.65,-50.06 32.65,-50.06 C32.65,-50.06 -34.05,-50.06 -34.05,-50.06 C-34.05,-50.06 -84.62,50.06 -84.62,50.06 C-84.62,50.06 17.54,50.06 17.54,50.06 "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_1_G_L_1_G" android:translateX="319.271" android:translateY="37.945">
+                            <path android:name="_R_G_L_6_G_L_1_G_L_1_G_D_0_P_0" android:fillColor="#feefc3" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M13.42 2.99 C14.95,-4.17 9.93,-11.31 2.21,-12.96 C-0.9,-13.62 -3.97,-13.3 -6.64,-12.2 C-6.58,-12.19 -6.53,-12.18 -6.48,-12.17 C-1.03,-11.01 2.52,-5.97 1.44,-0.92 C0.36,4.13 -4.94,7.28 -10.4,6.12 C-11.6,5.86 -12.7,5.42 -13.69,4.83 C-11.9,8.78 -8.15,11.93 -3.34,12.96 C4.38,14.61 11.88,10.14 13.42,2.99c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_1_G_L_0_G" android:translateX="179.5" android:translateY="73.351">
+                            <path android:name="_R_G_L_6_G_L_1_G_L_0_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M51.08 -40.95 C51.08,-40.95 50.55,-42.54 50.55,-42.54 C50.55,-42.54 49.67,-41.13 49.67,-41.13 C49.67,-41.13 48.17,-41.21 48.17,-41.21 C48.17,-41.21 49.05,-39.8 49.05,-39.8 C49.05,-39.8 48.61,-38.22 48.61,-38.22 C48.61,-38.22 50.02,-38.74 50.02,-38.74 C50.02,-38.74 51.35,-37.69 51.35,-37.69 C51.35,-37.69 51.26,-39.45 51.26,-39.45 C51.26,-39.45 52.59,-40.42 52.59,-40.42 C52.59,-40.42 51.08,-40.95 51.08,-40.95c  M8.78 30.58 C8.78,30.58 8.25,28.99 8.25,28.99 C8.25,28.99 7.37,30.4 7.37,30.4 C7.37,30.4 5.87,30.31 5.87,30.31 C5.87,30.31 6.75,31.72 6.75,31.72 C6.75,31.72 6.31,33.31 6.31,33.31 C6.31,33.31 7.72,32.78 7.72,32.78 C7.72,32.78 9.05,33.84 9.05,33.84 C9.05,33.84 8.96,32.08 8.96,32.08 C8.96,32.08 10.29,31.11 10.29,31.11 C10.29,31.11 8.78,30.58 8.78,30.58c  M19.38 -61.67 C19.38,-61.67 18.94,-63.35 18.94,-63.35 C18.94,-63.35 17.97,-61.94 17.97,-61.94 C17.97,-61.94 16.47,-61.94 16.47,-61.94 C16.47,-61.94 17.35,-60.62 17.35,-60.62 C17.35,-60.62 16.91,-58.94 16.91,-58.94 C16.91,-58.94 18.41,-59.56 18.41,-59.56 C18.41,-59.56 19.65,-58.5 19.65,-58.5 C19.65,-58.5 19.56,-60.18 19.56,-60.18 C19.56,-60.18 20.88,-61.23 20.88,-61.23 C20.88,-61.23 19.38,-61.67 19.38,-61.67c  M-32.98 35.08 C-32.98,35.08 -33.51,33.4 -33.51,33.4 C-33.51,33.4 -34.4,34.81 -34.4,34.81 C-34.4,34.81 -35.9,34.81 -35.9,34.81 C-35.9,34.81 -35.01,36.22 -35.01,36.22 C-35.01,36.22 -35.45,37.81 -35.45,37.81 C-35.45,37.81 -34.04,37.28 -34.04,37.28 C-34.04,37.28 -32.72,38.25 -32.72,38.25 C-32.72,38.25 -32.81,36.58 -32.81,36.58 C-32.81,36.58 -31.48,35.6 -31.48,35.6 C-31.48,35.6 -32.98,35.08 -32.98,35.08c  M45.34 7.56 C45.34,7.56 44.81,5.97 44.81,5.97 C44.81,5.97 43.93,7.38 43.93,7.38 C43.93,7.38 42.34,7.3 42.34,7.3 C42.34,7.3 43.31,8.71 43.31,8.71 C43.31,8.71 42.87,10.29 42.87,10.29 C42.87,10.29 44.28,9.77 44.28,9.77 C44.28,9.77 45.52,10.82 45.52,10.82 C45.52,10.82 45.52,9.06 45.52,9.06 C45.52,9.06 46.76,8.09 46.76,8.09 C46.76,8.09 45.34,7.56 45.34,7.56c  M-9.59 -41.67 C-9.59,-41.67 -10.12,-43.35 -10.12,-43.35 C-10.12,-43.35 -11,-41.94 -11,-41.94 C-11,-41.94 -12.5,-41.94 -12.5,-41.94 C-12.5,-41.94 -11.62,-40.62 -11.62,-40.62 C-11.62,-40.62 -12.06,-38.94 -12.06,-38.94 C-12.06,-38.94 -10.65,-39.56 -10.65,-39.56 C-10.65,-39.56 -9.32,-38.5 -9.32,-38.5 C-9.32,-38.5 -9.41,-40.26 -9.41,-40.26 C-9.41,-40.26 -8.09,-41.23 -8.09,-41.23 C-8.09,-41.23 -9.59,-41.67 -9.59,-41.67c  M97.74 -23.97 C97.74,-23.97 97.03,-26.35 97.03,-26.35 C97.03,-26.35 95.8,-24.32 95.8,-24.32 C95.8,-24.32 93.5,-24.32 93.5,-24.32 C93.5,-24.32 94.91,-22.38 94.91,-22.38 C94.91,-22.38 94.21,-20 94.21,-20 C94.21,-20 96.33,-20.88 96.33,-20.88 C96.33,-20.88 98.09,-19.38 98.09,-19.38 C98.09,-19.38 98.09,-21.85 98.09,-21.85 C98.09,-21.85 99.86,-23.26 99.86,-23.26 C99.86,-23.26 97.74,-23.97 97.74,-23.97c  M167.29 43.28 C167.29,43.28 166.67,40.9 166.67,40.9 C166.67,40.9 165.35,42.93 165.35,42.93 C165.35,42.93 163.14,42.93 163.14,42.93 C163.14,42.93 164.47,44.87 164.47,44.87 C164.47,44.87 163.76,47.25 163.76,47.25 C163.76,47.25 165.88,46.37 165.88,46.37 C165.88,46.37 167.73,47.87 167.73,47.87 C167.73,47.87 167.65,45.4 167.65,45.4 C167.65,45.4 169.5,43.98 169.5,43.98 C169.5,43.98 167.29,43.28 167.29,43.28c  M-1.1 -1.79 C-1.1,-1.79 -1.72,-4.08 -1.72,-4.08 C-1.72,-4.08 -3.05,-2.14 -3.05,-2.14 C-3.05,-2.14 -5.25,-2.14 -5.25,-2.14 C-5.25,-2.14 -3.93,-0.11 -3.93,-0.11 C-3.93,-0.11 -4.64,2.18 -4.64,2.18 C-4.64,2.18 -2.52,1.38 -2.52,1.38 C-2.52,1.38 -0.66,2.8 -0.66,2.8 C-0.66,2.8 -0.75,0.41 -0.75,0.41 C-0.75,0.41 1.1,-1.08 1.1,-1.08 C1.1,-1.08 -1.1,-1.79 -1.1,-1.79c  M-60.89 -5.23 C-60.89,-5.23 -61.59,-7.61 -61.59,-7.61 C-61.59,-7.61 -62.83,-5.58 -62.83,-5.58 C-62.83,-5.58 -65.13,-5.58 -65.13,-5.58 C-65.13,-5.58 -63.71,-3.64 -63.71,-3.64 C-63.71,-3.64 -64.42,-1.26 -64.42,-1.26 C-64.42,-1.26 -62.39,-2.14 -62.39,-2.14 C-62.39,-2.14 -60.53,-0.64 -60.53,-0.64 C-60.53,-0.64 -60.62,-3.11 -60.62,-3.11 C-60.62,-3.11 -58.77,-4.52 -58.77,-4.52 C-58.77,-4.52 -60.89,-5.23 -60.89,-5.23c  M-165.26 -10.97 C-165.26,-10.97 -165.97,-13.35 -165.97,-13.35 C-165.97,-13.35 -167.29,-11.32 -167.29,-11.32 C-167.29,-11.32 -169.5,-11.32 -169.5,-11.32 C-169.5,-11.32 -168.18,-9.38 -168.18,-9.38 C-168.18,-9.38 -168.88,-7 -168.88,-7 C-168.88,-7 -166.76,-7.79 -166.76,-7.79 C-166.76,-7.79 -164.91,-6.38 -164.91,-6.38 C-164.91,-6.38 -165,-8.85 -165,-8.85 C-165,-8.85 -163.14,-10.26 -163.14,-10.26 C-163.14,-10.26 -165.26,-10.97 -165.26,-10.97c  M-51.26 -42.98 C-51.26,-42.98 -54.09,-45.01 -54.09,-45.01 C-54.09,-45.01 -53.91,-41.57 -53.91,-41.57 C-53.91,-41.57 -56.65,-39.54 -56.65,-39.54 C-56.65,-39.54 -53.38,-38.57 -53.38,-38.57 C-53.38,-38.57 -52.32,-35.3 -52.32,-35.3 C-52.32,-35.3 -50.38,-38.13 -50.38,-38.13 C-50.38,-38.13 -46.94,-38.22 -46.94,-38.22 C-46.94,-38.22 -49.05,-40.86 -49.05,-40.86 C-49.05,-40.86 -47.99,-44.21 -47.99,-44.21 C-47.99,-44.21 -51.26,-42.98 -51.26,-42.98c  M-92.06 -47.92 C-92.06,-47.92 -92.59,-49.59 -92.59,-49.59 C-92.59,-49.59 -93.47,-48.18 -93.47,-48.18 C-93.47,-48.18 -95.06,-48.18 -95.06,-48.18 C-95.06,-48.18 -94.09,-46.86 -94.09,-46.86 C-94.09,-46.86 -94.53,-45.18 -94.53,-45.18 C-94.53,-45.18 -93.12,-45.8 -93.12,-45.8 C-93.12,-45.8 -91.88,-44.74 -91.88,-44.74 C-91.88,-44.74 -91.88,-46.42 -91.88,-46.42 C-91.88,-46.42 -90.65,-47.47 -90.65,-47.47 C-90.65,-47.47 -92.06,-47.92 -92.06,-47.92c  M62.83 -13.34 C62.83,-13.34 62.39,-14.93 62.39,-14.93 C62.39,-14.93 61.5,-13.52 61.5,-13.52 C61.5,-13.52 59.91,-13.52 59.91,-13.52 C59.91,-13.52 60.89,-12.2 60.89,-12.2 C60.89,-12.2 60.36,-10.52 60.36,-10.52 C60.36,-10.52 61.86,-11.14 61.86,-11.14 C61.86,-11.14 63.09,-10.08 63.09,-10.08 C63.09,-10.08 63.09,-11.84 63.09,-11.84 C63.09,-11.84 64.33,-12.81 64.33,-12.81 C64.33,-12.81 62.83,-13.34 62.83,-13.34c  M-155.99 -40.95 C-155.99,-40.95 -156.43,-42.54 -156.43,-42.54 C-156.43,-42.54 -157.32,-41.13 -157.32,-41.13 C-157.32,-41.13 -158.91,-41.21 -158.91,-41.21 C-158.91,-41.21 -157.93,-39.8 -157.93,-39.8 C-157.93,-39.8 -158.46,-38.22 -158.46,-38.22 C-158.46,-38.22 -156.96,-38.74 -156.96,-38.74 C-156.96,-38.74 -155.73,-37.69 -155.73,-37.69 C-155.73,-37.69 -155.73,-39.45 -155.73,-39.45 C-155.73,-39.45 -154.49,-40.42 -154.49,-40.42 C-154.49,-40.42 -155.99,-40.95 -155.99,-40.95c  M141.24 26.52 C141.24,26.52 140.71,24.85 140.71,24.85 C140.71,24.85 139.83,26.26 139.83,26.26 C139.83,26.26 138.33,26.26 138.33,26.26 C138.33,26.26 139.21,27.67 139.21,27.67 C139.21,27.67 138.77,29.26 138.77,29.26 C138.77,29.26 140.18,28.73 140.18,28.73 C140.18,28.73 141.51,29.7 141.51,29.7 C141.51,29.7 141.42,28.02 141.42,28.02 C141.42,28.02 142.74,27.05 142.74,27.05 C142.74,27.05 141.24,26.52 141.24,26.52c  M111.4 -51.27 C111.4,-51.27 110.95,-52.94 110.95,-52.94 C110.95,-52.94 110.07,-51.53 110.07,-51.53 C110.07,-51.53 108.48,-51.53 108.48,-51.53 C108.48,-51.53 109.45,-50.21 109.45,-50.21 C109.45,-50.21 108.92,-48.53 108.92,-48.53 C108.92,-48.53 110.42,-49.15 110.42,-49.15 C110.42,-49.15 111.66,-48.09 111.66,-48.09 C111.66,-48.09 111.66,-49.86 111.66,-49.86 C111.66,-49.86 112.9,-50.83 112.9,-50.83 C112.9,-50.83 111.4,-51.27 111.4,-51.27c  M-66.59 53.33 C-66.59,53.33 -67.03,51.65 -67.03,51.65 C-67.03,51.65 -67.91,53.06 -67.91,53.06 C-67.91,53.06 -69.5,53.06 -69.5,53.06 C-69.5,53.06 -68.53,54.47 -68.53,54.47 C-68.53,54.47 -69.06,56.06 -69.06,56.06 C-69.06,56.06 -67.56,55.53 -67.56,55.53 C-67.56,55.53 -66.32,56.5 -66.32,56.5 C-66.32,56.5 -66.32,54.82 -66.32,54.82 C-66.32,54.82 -65.08,53.77 -65.08,53.77 C-65.08,53.77 -66.59,53.33 -66.59,53.33c  M-50.59 59.33 C-50.59,59.33 -51.12,57.65 -51.12,57.65 C-51.12,57.65 -52,59.06 -52,59.06 C-52,59.06 -53.5,59.06 -53.5,59.06 C-53.5,59.06 -52.62,60.38 -52.62,60.38 C-52.62,60.38 -53.06,62.06 -53.06,62.06 C-53.06,62.06 -51.65,61.53 -51.65,61.53 C-51.65,61.53 -50.32,62.5 -50.32,62.5 C-50.32,62.5 -50.41,60.82 -50.41,60.82 C-50.41,60.82 -49.08,59.77 -49.08,59.77 C-49.08,59.77 -50.59,59.33 -50.59,59.33c  M29.98 -16.08 C29.98,-16.08 29.27,-18.46 29.27,-18.46 C29.27,-18.46 27.95,-16.43 27.95,-16.43 C27.95,-16.43 25.74,-16.43 25.74,-16.43 C25.74,-16.43 27.06,-14.49 27.06,-14.49 C27.06,-14.49 26.36,-12.11 26.36,-12.11 C26.36,-12.11 28.48,-12.9 28.48,-12.9 C28.48,-12.9 30.33,-11.49 30.33,-11.49 C30.33,-11.49 30.24,-13.96 30.24,-13.96 C30.24,-13.96 32.1,-15.37 32.1,-15.37 C32.1,-15.37 29.98,-16.08 29.98,-16.08c  M81.28 55.98 C81.28,55.98 80.58,53.6 80.58,53.6 C80.58,53.6 79.25,55.63 79.25,55.63 C79.25,55.63 77.04,55.63 77.04,55.63 C77.04,55.63 78.37,57.57 78.37,57.57 C78.37,57.57 77.66,59.95 77.66,59.95 C77.66,59.95 79.78,59.07 79.78,59.07 C79.78,59.07 81.64,60.56 81.64,60.56 C81.64,60.56 81.55,58.1 81.55,58.1 C81.55,58.1 83.4,56.68 83.4,56.68 C83.4,56.68 81.28,55.98 81.28,55.98c  M-165.26 -10.97 C-165.26,-10.97 -165.97,-13.35 -165.97,-13.35 C-165.97,-13.35 -167.29,-11.32 -167.29,-11.32 C-167.29,-11.32 -169.5,-11.32 -169.5,-11.32 C-169.5,-11.32 -168.18,-9.38 -168.18,-9.38 C-168.18,-9.38 -168.88,-7 -168.88,-7 C-168.88,-7 -166.76,-7.79 -166.76,-7.79 C-166.76,-7.79 -164.91,-6.38 -164.91,-6.38 C-164.91,-6.38 -165,-8.85 -165,-8.85 C-165,-8.85 -163.14,-10.26 -163.14,-10.26 C-163.14,-10.26 -165.26,-10.97 -165.26,-10.97c  M-74.05 21.76 C-74.05,21.76 -74.66,19.47 -74.66,19.47 C-74.66,19.47 -75.99,21.49 -75.99,21.49 C-75.99,21.49 -78.2,21.41 -78.2,21.41 C-78.2,21.41 -76.87,23.43 -76.87,23.43 C-76.87,23.43 -77.58,25.73 -77.58,25.73 C-77.58,25.73 -75.46,24.93 -75.46,24.93 C-75.46,24.93 -73.6,26.43 -73.6,26.43 C-73.6,26.43 -73.69,23.96 -73.69,23.96 C-73.69,23.96 -71.84,22.46 -71.84,22.46 C-71.84,22.46 -74.05,21.76 -74.05,21.76c  M8.98 55.68 C8.98,55.68 6.15,53.65 6.15,53.65 C6.15,53.65 6.24,57.09 6.24,57.09 C6.24,57.09 3.5,59.12 3.5,59.12 C3.5,59.12 6.86,60.09 6.86,60.09 C6.86,60.09 7.92,63.35 7.92,63.35 C7.92,63.35 9.86,60.44 9.86,60.44 C9.86,60.44 13.3,60.44 13.3,60.44 C13.3,60.44 11.18,57.71 11.18,57.71 C11.18,57.71 12.15,54.44 12.15,54.44 C12.15,54.44 8.98,55.68 8.98,55.68c  M124.89 -2.41 C124.89,-2.41 122.06,-4.35 122.06,-4.35 C122.06,-4.35 122.24,-0.91 122.24,-0.91 C122.24,-0.91 119.5,1.12 119.5,1.12 C119.5,1.12 122.77,2 122.77,2 C122.77,2 123.83,5.26 123.83,5.26 C123.83,5.26 125.77,2.44 125.77,2.44 C125.77,2.44 129.21,2.44 129.21,2.44 C129.21,2.44 127.09,-0.29 127.09,-0.29 C127.09,-0.29 128.15,-3.56 128.15,-3.56 C128.15,-3.56 124.89,-2.41 124.89,-2.41c  M77.31 19.91 C77.31,19.91 74.57,17.88 74.57,17.88 C74.57,17.88 74.66,21.32 74.66,21.32 C74.66,21.32 71.92,23.35 71.92,23.35 C71.92,23.35 75.19,24.32 75.19,24.32 C75.19,24.32 76.34,27.58 76.34,27.58 C76.34,27.58 78.19,24.67 78.19,24.67 C78.19,24.67 81.64,24.67 81.64,24.67 C81.64,24.67 79.52,21.94 79.52,21.94 C79.52,21.94 80.58,18.67 80.58,18.67 C80.58,18.67 77.31,19.91 77.31,19.91c  M-28.11 7.68 C-28.11,7.68 -30.94,5.65 -30.94,5.65 C-30.94,5.65 -30.76,9.09 -30.76,9.09 C-30.76,9.09 -33.5,11.12 -33.5,11.12 C-33.5,11.12 -30.23,12.09 -30.23,12.09 C-30.23,12.09 -29.17,15.35 -29.17,15.35 C-29.17,15.35 -27.23,12.44 -27.23,12.44 C-27.23,12.44 -23.79,12.44 -23.79,12.44 C-23.79,12.44 -25.91,9.71 -25.91,9.71 C-25.91,9.71 -24.85,6.44 -24.85,6.44 C-24.85,6.44 -28.11,7.68 -28.11,7.68c  M-119.43 -20.22 C-119.43,-20.22 -122.26,-22.16 -122.26,-22.16 C-122.26,-22.16 -122.08,-18.72 -122.08,-18.72 C-122.08,-18.72 -124.82,-16.7 -124.82,-16.7 C-124.82,-16.7 -121.55,-15.81 -121.55,-15.81 C-121.55,-15.81 -120.49,-12.55 -120.49,-12.55 C-120.49,-12.55 -118.55,-15.37 -118.55,-15.37 C-118.55,-15.37 -115.11,-15.37 -115.11,-15.37 C-115.11,-15.37 -117.23,-18.11 -117.23,-18.11 C-117.23,-18.11 -116.17,-21.37 -116.17,-21.37 C-116.17,-21.37 -119.43,-20.22 -119.43,-20.22c "/>
+                        </group>
+                    </group>
+                    <group android:name="_R_G_L_6_G_L_0_G">
+                        <group android:name="_R_G_L_6_G_L_0_G_L_2_G" android:translateX="206" android:translateY="145">
+                            <path android:name="_R_G_L_6_G_L_0_G_L_2_G_D_0_P_0" android:fillColor="#e8eaed" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M230.57 -95.63 C230.57,-95.63 230.57,42.37 230.57,42.37 C230.57,43.47 229.56,44.37 228.33,44.37 C228.33,44.37 -228.33,44.37 -228.33,44.37 C-229.56,44.37 -230.57,43.47 -230.57,42.37 C-230.57,42.37 -230.57,-95.63 -230.57,-95.63 C-230.57,-96.73 -229.56,-97.63 -228.33,-97.63 C-228.33,-97.63 228.33,-97.63 228.33,-97.63 C229.56,-97.63 230.57,-96.73 230.57,-95.63c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_0_G_L_1_G" android:translateX="206" android:translateY="145">
+                            <path android:name="_R_G_L_6_G_L_0_G_L_1_G_D_0_P_0" android:fillColor="#80868b" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M109 -14 C109,-14 109,14 109,14 C109,15.1 108.1,16 107,16 C107,16 -107,16 -107,16 C-108.1,16 -109,15.1 -109,14 C-109,14 -109,-14 -109,-14 C-109,-15.1 -108.1,-16 -107,-16 C-107,-16 107,-16 107,-16 C108.1,-16 109,-15.1 109,-14c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_0_G_L_0_G" android:translateX="46" android:translateY="145">
+                            <path android:name="_R_G_L_6_G_L_0_G_L_0_G_D_0_P_0" android:fillColor="#80868b" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M22 -14 C22,-14 22,14 22,14 C22,18.42 18.42,22 14,22 C14,22 -14,22 -14,22 C-18.42,22 -22,18.42 -22,14 C-22,14 -22,-14 -22,-14 C-22,-18.42 -18.42,-22 -14,-22 C-14,-22 14,-22 14,-22 C18.42,-22 22,-18.42 22,-14c "/>
+                        </group>
+                    </group>
+                </group>
+                <group android:name="_R_G_L_5_G" android:scaleY="0">
+                    <group android:name="_R_G_L_5_G_L_11_G" android:translateX="206" android:translateY="446" android:scaleY="0">
+                        <path android:name="_R_G_L_5_G_L_11_G_D_0_P_0" android:fillColor="#f1f3f4" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c "/>
+                    </group>
+                    <group android:name="_R_G_L_5_G_L_10_G" android:translateX="148" android:translateY="441" android:scaleY="0">
+                        <path android:name="_R_G_L_5_G_L_10_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M48 -8 C48,-8 48,8 48,8 C48,10.21 46.21,12 44,12 C44,12 -44,12 -44,12 C-46.21,12 -48,10.21 -48,8 C-48,8 -48,-8 -48,-8 C-48,-10.21 -46.21,-12 -44,-12 C-44,-12 44,-12 44,-12 C46.21,-12 48,-10.21 48,-8c "/>
+                    </group>
+                    <group android:name="_R_G_L_5_G_L_9_G" android:translateX="264" android:translateY="441" android:scaleY="0">
+                        <path android:name="_R_G_L_5_G_L_9_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M48 -8 C48,-8 48,8 48,8 C48,10.21 46.21,12 44,12 C44,12 -44,12 -44,12 C-46.21,12 -48,10.21 -48,8 C-48,8 -48,-8 -48,-8 C-48,-10.21 -46.21,-12 -44,-12 C-44,-12 44,-12 44,-12 C46.21,-12 48,-10.21 48,-8c "/>
+                    </group>
+                    <group android:name="_R_G_L_5_G_L_8_G" android:translateX="206" android:translateY="380" android:scaleY="0">
+                        <path android:name="_R_G_L_5_G_L_8_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M176 0 C176,0 176,0 176,0 C176,14.9 163.9,27 149,27 C149,27 -149,27 -149,27 C-163.9,27 -176,14.9 -176,0 C-176,0 -176,0 -176,0 C-176,-14.9 -163.9,-27 -149,-27 C-149,-27 149,-27 149,-27 C163.9,-27 176,-14.9 176,0c "/>
+                        <path android:name="_R_G_L_5_G_L_8_G_D_1_P_0" android:strokeColor="#bdc1c6" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="4" android:strokeAlpha="1" android:pathData=" M176 0 C176,0 176,0 176,0 C176,14.9 163.9,27 149,27 C149,27 -149,27 -149,27 C-163.9,27 -176,14.9 -176,0 C-176,0 -176,0 -176,0 C-176,-14.9 -163.9,-27 -149,-27 C-149,-27 149,-27 149,-27 C163.9,-27 176,-14.9 176,0c "/>
+                    </group>
+                    <group android:name="_R_G_L_5_G_L_7_G" android:translateX="120" android:translateY="268" android:scaleY="0">
+                        <path android:name="_R_G_L_5_G_L_7_G_D_0_P_0" android:fillColor="#4285f4" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M26 0 C26,0 26,0 26,0 C26,14.35 14.35,26 0,26 C0,26 0,26 0,26 C-14.35,26 -26,14.35 -26,0 C-26,0 -26,0 -26,0 C-26,-14.35 -14.35,-26 0,-26 C0,-26 0,-26 0,-26 C14.35,-26 26,-14.35 26,0c "/>
+                    </group>
+                    <group android:name="_R_G_L_5_G_L_6_G" android:translateX="167" android:translateY="278" android:scaleY="0">
+                        <path android:name="_R_G_L_5_G_L_6_G_D_0_P_0" android:fillColor="#e94235" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M17 0 C17,0 17,0 17,0 C17,9.38 9.38,17 0,17 C0,17 0,17 0,17 C-9.38,17 -17,9.38 -17,0 C-17,0 -17,0 -17,0 C-17,-9.38 -9.38,-17 0,-17 C0,-17 0,-17 0,-17 C9.38,-17 17,-9.38 17,0c "/>
+                    </group>
+                    <group android:name="_R_G_L_5_G_L_5_G" android:translateX="205" android:translateY="278" android:scaleY="0">
+                        <path android:name="_R_G_L_5_G_L_5_G_D_0_P_0" android:fillColor="#fabb05" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M17 0 C17,0 17,0 17,0 C17,9.38 9.38,17 0,17 C0,17 0,17 0,17 C-9.38,17 -17,9.38 -17,0 C-17,0 -17,0 -17,0 C-17,-9.38 -9.38,-17 0,-17 C0,-17 0,-17 0,-17 C9.38,-17 17,-9.38 17,0c "/>
+                    </group>
+                    <group android:name="_R_G_L_5_G_L_4_G" android:translateX="243" android:translateY="286" android:scaleY="0">
+                        <path android:name="_R_G_L_5_G_L_4_G_D_0_P_0" android:fillColor="#4285f4" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M17 -8 C17,-8 17,8 17,8 C17,17.38 9.38,25 0,25 C0,25 0,25 0,25 C-9.38,25 -17,17.38 -17,8 C-17,8 -17,-8 -17,-8 C-17,-17.38 -9.38,-25 0,-25 C0,-25 0,-25 0,-25 C9.38,-25 17,-17.38 17,-8c "/>
+                    </group>
+                    <group android:name="_R_G_L_5_G_L_3_G" android:translateX="272" android:translateY="269" android:scaleY="0">
+                        <path android:name="_R_G_L_5_G_L_3_G_D_0_P_0" android:fillColor="#34a853" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M8 -17 C8,-17 8,17 8,17 C8,21.42 4.42,25 0,25 C0,25 0,25 0,25 C-4.42,25 -8,21.42 -8,17 C-8,17 -8,-17 -8,-17 C-8,-21.42 -4.42,-25 0,-25 C0,-25 0,-25 0,-25 C4.42,-25 8,-21.42 8,-17c "/>
+                    </group>
+                    <group android:name="_R_G_L_5_G_L_2_G" android:translateX="301" android:translateY="278" android:scaleY="0">
+                        <path android:name="_R_G_L_5_G_L_2_G_D_0_P_0" android:fillColor="#e94235" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M17 0 C17,0 17,0 17,0 C17,9.38 9.38,17 0,17 C0,17 0,17 0,17 C-9.38,17 -17,9.38 -17,0 C-17,0 -17,0 -17,0 C-17,-9.38 -9.38,-17 0,-17 C0,-17 0,-17 0,-17 C9.38,-17 17,-9.38 17,0c "/>
+                    </group>
+                    <group android:name="_R_G_L_5_G_L_1_G" android:translateX="42" android:translateY="140" android:scaleY="0">
+                        <path android:name="_R_G_L_5_G_L_1_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M12 -8 C12,-8 12,8 12,8 C12,10.21 10.21,12 8,12 C8,12 -8,12 -8,12 C-10.21,12 -12,10.21 -12,8 C-12,8 -12,-8 -12,-8 C-12,-10.21 -10.21,-12 -8,-12 C-8,-12 8,-12 8,-12 C10.21,-12 12,-10.21 12,-8c "/>
+                    </group>
+                    <group android:name="_R_G_L_5_G_L_0_G" android:translateX="92.5" android:translateY="140" android:scaleY="0">
+                        <path android:name="_R_G_L_5_G_L_0_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M28.5 -5 C28.5,-5 28.5,5 28.5,5 C28.5,7.21 26.71,9 24.5,9 C24.5,9 -24.5,9 -24.5,9 C-26.71,9 -28.5,7.21 -28.5,5 C-28.5,5 -28.5,-5 -28.5,-5 C-28.5,-7.21 -26.71,-9 -24.5,-9 C-24.5,-9 24.5,-9 24.5,-9 C26.71,-9 28.5,-7.21 28.5,-5c "/>
+                    </group>
+                </group>
+                <group android:name="_R_G_L_4_G" android:translateX="206" android:translateY="877">
+                    <path android:name="_R_G_L_4_G_D_0_P_0" android:fillColor="#373737" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M40 0 C40,0 40,0 40,0 C40,1.1 39.1,2 38,2 C38,2 -38,2 -38,2 C-39.1,2 -40,1.1 -40,0 C-40,0 -40,0 -40,0 C-40,-1.1 -39.1,-2 -38,-2 C-38,-2 38,-2 38,-2 C39.1,-2 40,-1.1 40,0c "/>
+                </group>
+                <group android:name="_R_G_L_3_G">
+                    <group android:name="_R_G_L_3_G_L_1_G" android:translateX="206" android:translateY="50.5">
+                        <path android:name="_R_G_L_3_G_L_1_G_D_0_P_0" android:fillColor="#202124" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -50.5 C206,-50.5 206,50.5 206,50.5 C206,50.5 -206,50.5 -206,50.5 C-206,50.5 -206,-50.5 -206,-50.5 C-206,-50.5 206,-50.5 206,-50.5c "/>
+                    </group>
+                    <group android:name="_R_G_L_3_G_L_0_G" android:translateX="206" android:translateY="66.5">
+                        <path android:name="_R_G_L_3_G_L_0_G_D_0_P_0" android:fillColor="#3c4043" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M190 0 C190,0 190,0 190,0 C190,10.21 181.71,18.5 171.5,18.5 C171.5,18.5 -171.5,18.5 -171.5,18.5 C-181.71,18.5 -190,10.21 -190,0 C-190,0 -190,0 -190,0 C-190,-10.21 -181.71,-18.5 -171.5,-18.5 C-171.5,-18.5 171.5,-18.5 171.5,-18.5 C181.71,-18.5 190,-10.21 190,0c "/>
+                    </group>
+                </group>
+                <group android:name="_R_G_L_2_G" android:translateX="28.25" android:translateY="462.5" android:scaleY="0">
+                    <group android:name="_R_G_L_2_G_D_0_P_0_G_0_T_0" android:translateX="-60" android:translateY="0">
+                        <path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="#000000" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M28.25 0 C28.25,31.2 2.95,56.5 -28.25,56.5 C-28.25,56.5 -28.25,-56.5 -28.25,-56.5 C2.95,-56.5 28.25,-31.2 28.25,0c "/>
+                    </group>
+                </group>
+                <group android:name="_R_G_L_1_G" android:translateX="-4.25" android:translateY="463" android:scaleX="0.5" android:scaleY="0" android:rotation="180">
+                    <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="#ffffff" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M3.87 -13.45 C3.07,-14.21 1.8,-14.18 1.04,-13.38 C0.28,-12.58 0.31,-11.31 1.11,-10.55 C1.11,-10.55 9.75,-2.32 9.75,-2.32 C9.75,-2.32 -14.75,-2.32 -14.75,-2.32 C-15.85,-2.32 -16.75,-1.43 -16.75,-0.32 C-16.75,0.78 -15.85,1.68 -14.75,1.68 C-14.75,1.68 9.94,1.68 9.94,1.68 C9.94,1.68 1.07,10.59 1.07,10.59 C0.29,11.37 0.29,12.64 1.08,13.42 C1.86,14.2 3.13,14.19 3.9,13.41 C3.9,13.41 16.17,1.09 16.17,1.09 C16.55,0.71 16.76,0.19 16.75,-0.35 C16.74,-0.89 16.52,-1.4 16.13,-1.77 C16.13,-1.77 3.87,-13.45 3.87,-13.45c "/>
+                </group>
+                <group android:name="_R_G_L_0_G" android:translateX="-130.003" android:translateY="399" android:scaleY="0">
+                    <group android:name="_R_G_L_0_G_L_2_G" android:translateX="295.995" android:translateY="63.997" android:scaleY="0">
+                        <path android:name="_R_G_L_0_G_L_2_G_D_0_P_0" android:fillColor="#baf29d" android:fillAlpha="0.3" android:fillType="nonZero" android:pathData=" M-166 64 C-130.65,64 -102,35.35 -102,0 C-102,-35.34 -130.65,-64 -166,-64 C-201.34,-64 -230,-35.34 -230,0 C-230,35.35 -201.34,64 -166,64c "/>
+                    </group>
+                    <group android:name="_R_G_L_0_G_L_1_G" android:translateX="192" android:translateY="63.997" android:rotation="90" android:scaleX="-1" android:scaleY="0">
+                        <path android:name="_R_G_L_0_G_L_1_G_D_0_P_0" android:fillColor="#baf29d" android:fillAlpha="0.3" android:fillType="nonZero" android:pathData=" M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c "/>
+                    </group>
+                    <group android:name="_R_G_L_0_G_L_0_G" android:translateX="295.995" android:translateY="63.997" android:scaleY="0">
+                        <group android:name="_R_G_L_0_G_L_0_G_D_0_P_0_G_0_T_0" android:translateX="-166" android:translateY="0">
+                            <path android:name="_R_G_L_0_G_L_0_G_D_0_P_0" android:fillColor="#baf29d" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 64 C35.35,64 64,35.35 64,0 C64,-35.34 35.35,-64 0,-64 C-35.34,-64 -64,-35.34 -64,0 C-64,35.35 -35.34,64 0,64c "/>
+                        </group>
+                    </group>
+                </group>
+            </group>
+            <group android:name="time_group"/>
+        </vector>
+    </aapt:attr>
+    <target android:name="_R_G_L_6_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_6_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2283" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_6_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_6_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2283" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_6_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_6_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2267" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_6_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleX" android:duration="2133" android:startOffset="0" android:valueFrom="1" android:valueTo="1" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleY" android:duration="2133" android:startOffset="0" android:valueFrom="1" android:valueTo="1" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleX" android:duration="283" android:startOffset="2133" android:valueFrom="1" android:valueTo="0.88012" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleY" android:duration="283" android:startOffset="2133" android:valueFrom="1" android:valueTo="0.88012" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_6_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_6_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2417" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_5_G_L_11_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2333" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_5_G_L_10_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2433" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_5_G_L_9_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2433" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_5_G_L_8_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_5_G_L_7_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2367" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_5_G_L_6_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2367" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_5_G_L_5_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2367" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_5_G_L_4_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2367" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_5_G_L_3_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2367" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_5_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2367" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_5_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2333" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_5_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2333" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_5_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2333" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_D_0_P_0_G_0_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="translateXY" android:duration="1133" android:startOffset="0" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -60,0C -50,0 -70,0 -60,0">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="translateXY" android:duration="667" android:startOffset="1133" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -60,0C -50,0 -10,0 0,0">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="translateXY" android:duration="333" android:startOffset="1800" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 0,0C 0,0 0,0 0,0">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0.333 0,0 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="translateXY" android:duration="333" android:startOffset="2133" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 0,0C -10,0 -50,0 -60,0">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1133" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2467" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="translateXY" android:duration="1133" android:startOffset="0" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -4.25,463C 0.75,463 -9.25,463 -4.25,463">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="translateXY" android:duration="583" android:startOffset="1133" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -4.25,463C 0.75,463 20.75,463 25.75,463">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="translateXY" android:duration="417" android:startOffset="1717" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 25.75,463C 25.75,463 25.75,463 25.75,463">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0.333 0.667,0.667 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="translateXY" android:duration="333" android:startOffset="2133" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 25.75,463C 25.75,463 -4.25,463 -4.25,463">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleX" android:duration="1300" android:startOffset="0" android:valueFrom="0.5" android:valueTo="0.5" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleY" android:duration="1300" android:startOffset="0" android:valueFrom="0.5" android:valueTo="0.5" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleX" android:duration="417" android:startOffset="1300" android:valueFrom="0.5" android:valueTo="1" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleY" android:duration="417" android:startOffset="1300" android:valueFrom="0.5" android:valueTo="1" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleX" android:duration="417" android:startOffset="1717" android:valueFrom="1" android:valueTo="1" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleY" android:duration="417" android:startOffset="1717" android:valueFrom="1" android:valueTo="1" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleX" android:duration="200" android:startOffset="2133" android:valueFrom="1" android:valueTo="0.5" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleY" android:duration="200" android:startOffset="2133" android:valueFrom="1" android:valueTo="0.5" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1300" android:valueFrom="0" android:valueTo="0.5" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2333" android:valueFrom="0.5" android:valueTo="0" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="867" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1033" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_1_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="pathData" android:duration="167" android:startOffset="867" android:valueFrom="M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c " android:valueTo="M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c " android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.508,0 0.487,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="pathData" android:duration="467" android:startOffset="1033" android:valueFrom="M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c " android:valueTo="M0 167.99 C35.35,167.99 64,139.34 64,104 C64,104 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,104 -64,104 C-64,139.34 -35.34,167.99 0,167.99c " android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.508,0 0.487,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1033" android:valueFrom="0" android:valueTo="-1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2267" android:valueFrom="-1" android:valueTo="0" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_0_G_D_0_P_0_G_0_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="translateXY" android:duration="167" android:startOffset="867" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -166,0C -138.333,0 -193.667,0 -166,0">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.508,0 0.487,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="translateXY" android:duration="467" android:startOffset="1033" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -166,0C -138.333,0 -27.667,0 0,0">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.508,0 0.487,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="867" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2267" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="867" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2267" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="translateX" android:duration="4017" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_back_right.xml b/quickstep/res/drawable/gesture_tutorial_back_right.xml
new file mode 100644
index 0000000000..77d9924524
--- /dev/null
+++ b/quickstep/res/drawable/gesture_tutorial_back_right.xml
@@ -0,0 +1,561 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt">
+    <aapt:attr name="android:drawable">
+        <vector android:height="892dp" android:width="412dp" android:viewportHeight="892" android:viewportWidth="412">
+            <group android:name="_R_G">
+                <group android:name="_R_G_L_7_G" android:translateX="206" android:translateY="446">
+                    <path android:name="_R_G_L_7_G_D_0_P_0" android:fillColor="#f1f3f4" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c "/>
+                </group>
+                <group android:name="_R_G_L_6_G" android:pivotX="206" android:pivotY="446" android:scaleX="1" android:scaleY="1">
+                    <group android:name="_R_G_L_6_G_L_3_G" android:translateX="206" android:translateY="446" android:scaleX="1.2" android:scaleY="1.2">
+                        <path android:name="_R_G_L_6_G_L_3_G_D_0_P_0" android:fillColor="#f1f3f4" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c "/>
+                    </group>
+                    <group android:name="_R_G_L_6_G_L_2_G">
+                        <group android:name="_R_G_L_6_G_L_2_G_L_11_G" android:translateX="206" android:translateY="496.5">
+                            <path android:name="_R_G_L_6_G_L_2_G_L_11_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M235.5 -452.14 C235.5,-452.14 235.5,452.14 235.5,452.14 C235.5,452.14 -235.5,452.14 -235.5,452.14 C-235.5,452.14 -235.5,-452.14 -235.5,-452.14 C-235.5,-452.14 235.5,-452.14 235.5,-452.14c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_2_G_L_10_G" android:translateX="182.5" android:translateY="831">
+                            <path android:name="_R_G_L_6_G_L_2_G_L_10_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M158.5 -7 C158.5,-7 158.5,7 158.5,7 C158.5,9.21 156.71,11 154.5,11 C154.5,11 -154.5,11 -154.5,11 C-156.71,11 -158.5,9.21 -158.5,7 C-158.5,7 -158.5,-7 -158.5,-7 C-158.5,-9.21 -156.71,-11 -154.5,-11 C-154.5,-11 154.5,-11 154.5,-11 C156.71,-11 158.5,-9.21 158.5,-7c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_2_G_L_9_G" android:translateX="186" android:translateY="801">
+                            <path android:name="_R_G_L_6_G_L_2_G_L_9_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M162 -7 C162,-7 162,7 162,7 C162,9.21 160.21,11 158,11 C158,11 -158,11 -158,11 C-160.21,11 -162,9.21 -162,7 C-162,7 -162,-7 -162,-7 C-162,-9.21 -160.21,-11 -158,-11 C-158,-11 158,-11 158,-11 C160.21,-11 162,-9.21 162,-7c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_2_G_L_8_G" android:translateX="119" android:translateY="755">
+                            <path android:name="_R_G_L_6_G_L_2_G_L_8_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M95 -7 C95,-7 95,7 95,7 C95,9.21 93.21,11 91,11 C91,11 -91,11 -91,11 C-93.21,11 -95,9.21 -95,7 C-95,7 -95,-7 -95,-7 C-95,-9.21 -93.21,-11 -91,-11 C-91,-11 91,-11 91,-11 C93.21,-11 95,-9.21 95,-7c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_2_G_L_7_G" android:translateX="182.5" android:translateY="725">
+                            <path android:name="_R_G_L_6_G_L_2_G_L_7_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M158.5 -7 C158.5,-7 158.5,7 158.5,7 C158.5,9.21 156.71,11 154.5,11 C154.5,11 -154.5,11 -154.5,11 C-156.71,11 -158.5,9.21 -158.5,7 C-158.5,7 -158.5,-7 -158.5,-7 C-158.5,-9.21 -156.71,-11 -154.5,-11 C-154.5,-11 154.5,-11 154.5,-11 C156.71,-11 158.5,-9.21 158.5,-7c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_2_G_L_6_G" android:translateX="197.5" android:translateY="695">
+                            <path android:name="_R_G_L_6_G_L_2_G_L_6_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M173.5 -7 C173.5,-7 173.5,7 173.5,7 C173.5,9.21 171.71,11 169.5,11 C169.5,11 -169.5,11 -169.5,11 C-171.71,11 -173.5,9.21 -173.5,7 C-173.5,7 -173.5,-7 -173.5,-7 C-173.5,-9.21 -171.71,-11 -169.5,-11 C-169.5,-11 169.5,-11 169.5,-11 C171.71,-11 173.5,-9.21 173.5,-7c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_2_G_L_5_G" android:translateX="192" android:translateY="665">
+                            <path android:name="_R_G_L_6_G_L_2_G_L_5_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M168 -7 C168,-7 168,7 168,7 C168,9.21 166.21,11 164,11 C164,11 -164,11 -164,11 C-166.21,11 -168,9.21 -168,7 C-168,7 -168,-7 -168,-7 C-168,-9.21 -166.21,-11 -164,-11 C-164,-11 164,-11 164,-11 C166.21,-11 168,-9.21 168,-7c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_2_G_L_4_G" android:translateX="105.5" android:translateY="360">
+                            <path android:name="_R_G_L_6_G_L_2_G_L_4_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M23.5 -2 C23.5,-2 23.5,2 23.5,2 C23.5,4.21 21.71,6 19.5,6 C19.5,6 -19.5,6 -19.5,6 C-21.71,6 -23.5,4.21 -23.5,2 C-23.5,2 -23.5,-2 -23.5,-2 C-23.5,-4.21 -21.71,-6 -19.5,-6 C-19.5,-6 19.5,-6 19.5,-6 C21.71,-6 23.5,-4.21 23.5,-2c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_2_G_L_3_G" android:translateX="47.5" android:translateY="360">
+                            <path android:name="_R_G_L_6_G_L_2_G_L_3_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M23.5 -2 C23.5,-2 23.5,2 23.5,2 C23.5,4.21 21.71,6 19.5,6 C19.5,6 -19.5,6 -19.5,6 C-21.71,6 -23.5,4.21 -23.5,2 C-23.5,2 -23.5,-2 -23.5,-2 C-23.5,-4.21 -21.71,-6 -19.5,-6 C-19.5,-6 19.5,-6 19.5,-6 C21.71,-6 23.5,-4.21 23.5,-2c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_2_G_L_2_G" android:translateX="142.5" android:translateY="328">
+                            <path android:name="_R_G_L_6_G_L_2_G_L_2_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M118.5 -14 C118.5,-14 118.5,14 118.5,14 C118.5,16.21 116.71,18 114.5,18 C114.5,18 -114.5,18 -114.5,18 C-116.71,18 -118.5,16.21 -118.5,14 C-118.5,14 -118.5,-14 -118.5,-14 C-118.5,-16.21 -116.71,-18 -114.5,-18 C-114.5,-18 114.5,-18 114.5,-18 C116.71,-18 118.5,-16.21 118.5,-14c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_2_G_L_1_G" android:translateX="186" android:translateY="284">
+                            <path android:name="_R_G_L_6_G_L_2_G_L_1_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M162 -14 C162,-14 162,14 162,14 C162,16.21 160.21,18 158,18 C158,18 -158,18 -158,18 C-160.21,18 -162,16.21 -162,14 C-162,14 -162,-14 -162,-14 C-162,-16.21 -160.21,-18 -158,-18 C-158,-18 158,-18 158,-18 C160.21,-18 162,-16.21 162,-14c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_2_G_L_0_G" android:translateX="155" android:translateY="240">
+                            <path android:name="_R_G_L_6_G_L_2_G_L_0_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M131 -14 C131,-14 131,14 131,14 C131,16.21 129.21,18 127,18 C127,18 -127,18 -127,18 C-129.21,18 -131,16.21 -131,14 C-131,14 -131,-14 -131,-14 C-131,-16.21 -129.21,-18 -127,-18 C-127,-18 127,-18 127,-18 C129.21,-18 131,-16.21 131,-14c "/>
+                        </group>
+                    </group>
+                    <group android:name="_R_G_L_6_G_L_1_G" android:translateX="24" android:translateY="390">
+                        <group android:name="_R_G_L_6_G_L_1_G_L_7_G" android:translateX="182" android:translateY="120"/>
+                        <group android:name="_R_G_L_6_G_L_1_G_L_6_G" android:translateX="182" android:translateY="120">
+                            <path android:name="_R_G_L_6_G_L_1_G_L_6_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M182 -116 C182,-116 182,116 182,116 C182,118.21 180.21,120 178,120 C178,120 -178,120 -178,120 C-180.21,120 -182,118.21 -182,116 C-182,116 -182,-116 -182,-116 C-182,-118.21 -180.21,-120 -178,-120 C-178,-120 178,-120 178,-120 C180.21,-120 182,-118.21 182,-116c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_1_G_L_5_G" android:translateX="77.322" android:translateY="150.552">
+                            <path android:name="_R_G_L_6_G_L_1_G_L_5_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 20.61 C0,20.61 -10.39,8.69 -10.39,8.69  M0 -6.11 C0,-6.11 -6.78,-15.61 -6.78,-15.61  M0 33.64 C0,33.64 8.26,17.67 8.26,17.67  M0 7.58 C0,7.58 8.26,-7.73 8.26,-7.73  M0 71.19 C0,71.19 0,-18.04 0,-18.04  M-30.22 37.18 C-30.22,37.18 0,-71.19 0,-71.19 C0,-71.19 30.22,37.18 30.22,37.18 C30.22,37.18 -30.22,37.18 -30.22,37.18c "/>
+                            <path android:name="_R_G_L_6_G_L_1_G_L_5_G_D_1_P_0" android:strokeColor="#9adcb2" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M0 20.61 C0,20.61 -10.39,8.69 -10.39,8.69  M0 -6.11 C0,-6.11 -6.78,-15.61 -6.78,-15.61  M0 33.64 C0,33.64 8.26,17.67 8.26,17.67  M0 7.58 C0,7.58 8.26,-7.73 8.26,-7.73  M0 71.19 C0,71.19 0,-18.04 0,-18.04  M-30.22 37.18 C-30.22,37.18 0,-71.19 0,-71.19 C0,-71.19 30.22,37.18 30.22,37.18 C30.22,37.18 -30.22,37.18 -30.22,37.18c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_1_G_L_4_G" android:translateX="38.772" android:translateY="121.73">
+                            <path android:name="_R_G_L_6_G_L_1_G_L_4_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 28.82 C0,28.82 -14.52,12.18 -14.52,12.18  M0 -8.58 C0,-8.58 -9.51,-21.75 -9.51,-21.75  M0 47.01 C0,47.01 11.57,24.7 11.57,24.7  M0 10.64 C0,10.64 11.57,-10.78 11.57,-10.78  M0 99.42 C0,99.42 0,-25.21 0,-25.21  M-31.92 51.94 C-31.92,51.94 0,-99.42 0,-99.42 C0,-99.42 31.92,51.94 31.92,51.94 C31.92,51.94 -31.92,51.94 -31.92,51.94c "/>
+                            <path android:name="_R_G_L_6_G_L_1_G_L_4_G_D_1_P_0" android:strokeColor="#9adcb2" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M0 28.82 C0,28.82 -14.52,12.18 -14.52,12.18  M0 -8.58 C0,-8.58 -9.51,-21.75 -9.51,-21.75  M0 47.01 C0,47.01 11.57,24.7 11.57,24.7  M0 10.64 C0,10.64 11.57,-10.78 11.57,-10.78  M0 99.42 C0,99.42 0,-25.21 0,-25.21  M-31.92 51.94 C-31.92,51.94 0,-99.42 0,-99.42 C0,-99.42 31.92,51.94 31.92,51.94 C31.92,51.94 -31.92,51.94 -31.92,51.94c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_1_G_L_3_G" android:translateX="183" android:translateY="222">
+                            <path android:name="_R_G_L_6_G_L_1_G_L_3_G_D_0_P_0" android:fillColor="#000000" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M170 0 C170,0 -170,0 -170,0 "/>
+                            <path android:name="_R_G_L_6_G_L_1_G_L_3_G_D_1_P_0" android:strokeColor="#9aa0a6" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="4" android:strokeAlpha="1" android:pathData=" M170 0 C170,0 -170,0 -170,0 "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_1_G_L_2_G" android:translateX="265.619" android:translateY="162.331">
+                            <path android:name="_R_G_L_6_G_L_1_G_L_2_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M-34.05 50.06 C-34.05,50.06 -34.05,-49.25 -34.05,-49.25  M-34.05 -49.55 C-34.05,-49.55 17.54,50.06 17.54,50.06 C17.54,50.06 84.62,50.06 84.62,50.06 C84.62,50.06 32.65,-50.06 32.65,-50.06 C32.65,-50.06 -34.05,-50.06 -34.05,-50.06 C-34.05,-50.06 -84.62,50.06 -84.62,50.06 C-84.62,50.06 17.54,50.06 17.54,50.06 "/>
+                            <path android:name="_R_G_L_6_G_L_1_G_L_2_G_D_1_P_0" android:strokeColor="#a8cbfe" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M-34.05 50.06 C-34.05,50.06 -34.05,-49.25 -34.05,-49.25  M-34.05 -49.55 C-34.05,-49.55 17.54,50.06 17.54,50.06 C17.54,50.06 84.62,50.06 84.62,50.06 C84.62,50.06 32.65,-50.06 32.65,-50.06 C32.65,-50.06 -34.05,-50.06 -34.05,-50.06 C-34.05,-50.06 -84.62,50.06 -84.62,50.06 C-84.62,50.06 17.54,50.06 17.54,50.06 "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_1_G_L_1_G" android:translateX="319.271" android:translateY="37.945">
+                            <path android:name="_R_G_L_6_G_L_1_G_L_1_G_D_0_P_0" android:fillColor="#feefc3" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M13.42 2.99 C14.95,-4.17 9.93,-11.31 2.21,-12.96 C-0.9,-13.62 -3.97,-13.3 -6.64,-12.2 C-6.58,-12.19 -6.53,-12.18 -6.48,-12.17 C-1.03,-11.01 2.52,-5.97 1.44,-0.92 C0.36,4.13 -4.94,7.28 -10.4,6.12 C-11.6,5.86 -12.7,5.42 -13.69,4.83 C-11.9,8.78 -8.15,11.93 -3.34,12.96 C4.38,14.61 11.88,10.14 13.42,2.99c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_1_G_L_0_G" android:translateX="179.5" android:translateY="73.351">
+                            <path android:name="_R_G_L_6_G_L_1_G_L_0_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M51.08 -40.95 C51.08,-40.95 50.55,-42.54 50.55,-42.54 C50.55,-42.54 49.67,-41.13 49.67,-41.13 C49.67,-41.13 48.17,-41.21 48.17,-41.21 C48.17,-41.21 49.05,-39.8 49.05,-39.8 C49.05,-39.8 48.61,-38.22 48.61,-38.22 C48.61,-38.22 50.02,-38.74 50.02,-38.74 C50.02,-38.74 51.35,-37.69 51.35,-37.69 C51.35,-37.69 51.26,-39.45 51.26,-39.45 C51.26,-39.45 52.59,-40.42 52.59,-40.42 C52.59,-40.42 51.08,-40.95 51.08,-40.95c  M8.78 30.58 C8.78,30.58 8.25,28.99 8.25,28.99 C8.25,28.99 7.37,30.4 7.37,30.4 C7.37,30.4 5.87,30.31 5.87,30.31 C5.87,30.31 6.75,31.72 6.75,31.72 C6.75,31.72 6.31,33.31 6.31,33.31 C6.31,33.31 7.72,32.78 7.72,32.78 C7.72,32.78 9.05,33.84 9.05,33.84 C9.05,33.84 8.96,32.08 8.96,32.08 C8.96,32.08 10.29,31.11 10.29,31.11 C10.29,31.11 8.78,30.58 8.78,30.58c  M19.38 -61.67 C19.38,-61.67 18.94,-63.35 18.94,-63.35 C18.94,-63.35 17.97,-61.94 17.97,-61.94 C17.97,-61.94 16.47,-61.94 16.47,-61.94 C16.47,-61.94 17.35,-60.62 17.35,-60.62 C17.35,-60.62 16.91,-58.94 16.91,-58.94 C16.91,-58.94 18.41,-59.56 18.41,-59.56 C18.41,-59.56 19.65,-58.5 19.65,-58.5 C19.65,-58.5 19.56,-60.18 19.56,-60.18 C19.56,-60.18 20.88,-61.23 20.88,-61.23 C20.88,-61.23 19.38,-61.67 19.38,-61.67c  M-32.98 35.08 C-32.98,35.08 -33.51,33.4 -33.51,33.4 C-33.51,33.4 -34.4,34.81 -34.4,34.81 C-34.4,34.81 -35.9,34.81 -35.9,34.81 C-35.9,34.81 -35.01,36.22 -35.01,36.22 C-35.01,36.22 -35.45,37.81 -35.45,37.81 C-35.45,37.81 -34.04,37.28 -34.04,37.28 C-34.04,37.28 -32.72,38.25 -32.72,38.25 C-32.72,38.25 -32.81,36.58 -32.81,36.58 C-32.81,36.58 -31.48,35.6 -31.48,35.6 C-31.48,35.6 -32.98,35.08 -32.98,35.08c  M45.34 7.56 C45.34,7.56 44.81,5.97 44.81,5.97 C44.81,5.97 43.93,7.38 43.93,7.38 C43.93,7.38 42.34,7.3 42.34,7.3 C42.34,7.3 43.31,8.71 43.31,8.71 C43.31,8.71 42.87,10.29 42.87,10.29 C42.87,10.29 44.28,9.77 44.28,9.77 C44.28,9.77 45.52,10.82 45.52,10.82 C45.52,10.82 45.52,9.06 45.52,9.06 C45.52,9.06 46.76,8.09 46.76,8.09 C46.76,8.09 45.34,7.56 45.34,7.56c  M-9.59 -41.67 C-9.59,-41.67 -10.12,-43.35 -10.12,-43.35 C-10.12,-43.35 -11,-41.94 -11,-41.94 C-11,-41.94 -12.5,-41.94 -12.5,-41.94 C-12.5,-41.94 -11.62,-40.62 -11.62,-40.62 C-11.62,-40.62 -12.06,-38.94 -12.06,-38.94 C-12.06,-38.94 -10.65,-39.56 -10.65,-39.56 C-10.65,-39.56 -9.32,-38.5 -9.32,-38.5 C-9.32,-38.5 -9.41,-40.26 -9.41,-40.26 C-9.41,-40.26 -8.09,-41.23 -8.09,-41.23 C-8.09,-41.23 -9.59,-41.67 -9.59,-41.67c  M97.74 -23.97 C97.74,-23.97 97.03,-26.35 97.03,-26.35 C97.03,-26.35 95.8,-24.32 95.8,-24.32 C95.8,-24.32 93.5,-24.32 93.5,-24.32 C93.5,-24.32 94.91,-22.38 94.91,-22.38 C94.91,-22.38 94.21,-20 94.21,-20 C94.21,-20 96.33,-20.88 96.33,-20.88 C96.33,-20.88 98.09,-19.38 98.09,-19.38 C98.09,-19.38 98.09,-21.85 98.09,-21.85 C98.09,-21.85 99.86,-23.26 99.86,-23.26 C99.86,-23.26 97.74,-23.97 97.74,-23.97c  M167.29 43.28 C167.29,43.28 166.67,40.9 166.67,40.9 C166.67,40.9 165.35,42.93 165.35,42.93 C165.35,42.93 163.14,42.93 163.14,42.93 C163.14,42.93 164.47,44.87 164.47,44.87 C164.47,44.87 163.76,47.25 163.76,47.25 C163.76,47.25 165.88,46.37 165.88,46.37 C165.88,46.37 167.73,47.87 167.73,47.87 C167.73,47.87 167.65,45.4 167.65,45.4 C167.65,45.4 169.5,43.98 169.5,43.98 C169.5,43.98 167.29,43.28 167.29,43.28c  M-1.1 -1.79 C-1.1,-1.79 -1.72,-4.08 -1.72,-4.08 C-1.72,-4.08 -3.05,-2.14 -3.05,-2.14 C-3.05,-2.14 -5.25,-2.14 -5.25,-2.14 C-5.25,-2.14 -3.93,-0.11 -3.93,-0.11 C-3.93,-0.11 -4.64,2.18 -4.64,2.18 C-4.64,2.18 -2.52,1.38 -2.52,1.38 C-2.52,1.38 -0.66,2.8 -0.66,2.8 C-0.66,2.8 -0.75,0.41 -0.75,0.41 C-0.75,0.41 1.1,-1.08 1.1,-1.08 C1.1,-1.08 -1.1,-1.79 -1.1,-1.79c  M-60.89 -5.23 C-60.89,-5.23 -61.59,-7.61 -61.59,-7.61 C-61.59,-7.61 -62.83,-5.58 -62.83,-5.58 C-62.83,-5.58 -65.13,-5.58 -65.13,-5.58 C-65.13,-5.58 -63.71,-3.64 -63.71,-3.64 C-63.71,-3.64 -64.42,-1.26 -64.42,-1.26 C-64.42,-1.26 -62.39,-2.14 -62.39,-2.14 C-62.39,-2.14 -60.53,-0.64 -60.53,-0.64 C-60.53,-0.64 -60.62,-3.11 -60.62,-3.11 C-60.62,-3.11 -58.77,-4.52 -58.77,-4.52 C-58.77,-4.52 -60.89,-5.23 -60.89,-5.23c  M-165.26 -10.97 C-165.26,-10.97 -165.97,-13.35 -165.97,-13.35 C-165.97,-13.35 -167.29,-11.32 -167.29,-11.32 C-167.29,-11.32 -169.5,-11.32 -169.5,-11.32 C-169.5,-11.32 -168.18,-9.38 -168.18,-9.38 C-168.18,-9.38 -168.88,-7 -168.88,-7 C-168.88,-7 -166.76,-7.79 -166.76,-7.79 C-166.76,-7.79 -164.91,-6.38 -164.91,-6.38 C-164.91,-6.38 -165,-8.85 -165,-8.85 C-165,-8.85 -163.14,-10.26 -163.14,-10.26 C-163.14,-10.26 -165.26,-10.97 -165.26,-10.97c  M-51.26 -42.98 C-51.26,-42.98 -54.09,-45.01 -54.09,-45.01 C-54.09,-45.01 -53.91,-41.57 -53.91,-41.57 C-53.91,-41.57 -56.65,-39.54 -56.65,-39.54 C-56.65,-39.54 -53.38,-38.57 -53.38,-38.57 C-53.38,-38.57 -52.32,-35.3 -52.32,-35.3 C-52.32,-35.3 -50.38,-38.13 -50.38,-38.13 C-50.38,-38.13 -46.94,-38.22 -46.94,-38.22 C-46.94,-38.22 -49.05,-40.86 -49.05,-40.86 C-49.05,-40.86 -47.99,-44.21 -47.99,-44.21 C-47.99,-44.21 -51.26,-42.98 -51.26,-42.98c  M-92.06 -47.92 C-92.06,-47.92 -92.59,-49.59 -92.59,-49.59 C-92.59,-49.59 -93.47,-48.18 -93.47,-48.18 C-93.47,-48.18 -95.06,-48.18 -95.06,-48.18 C-95.06,-48.18 -94.09,-46.86 -94.09,-46.86 C-94.09,-46.86 -94.53,-45.18 -94.53,-45.18 C-94.53,-45.18 -93.12,-45.8 -93.12,-45.8 C-93.12,-45.8 -91.88,-44.74 -91.88,-44.74 C-91.88,-44.74 -91.88,-46.42 -91.88,-46.42 C-91.88,-46.42 -90.65,-47.47 -90.65,-47.47 C-90.65,-47.47 -92.06,-47.92 -92.06,-47.92c  M62.83 -13.34 C62.83,-13.34 62.39,-14.93 62.39,-14.93 C62.39,-14.93 61.5,-13.52 61.5,-13.52 C61.5,-13.52 59.91,-13.52 59.91,-13.52 C59.91,-13.52 60.89,-12.2 60.89,-12.2 C60.89,-12.2 60.36,-10.52 60.36,-10.52 C60.36,-10.52 61.86,-11.14 61.86,-11.14 C61.86,-11.14 63.09,-10.08 63.09,-10.08 C63.09,-10.08 63.09,-11.84 63.09,-11.84 C63.09,-11.84 64.33,-12.81 64.33,-12.81 C64.33,-12.81 62.83,-13.34 62.83,-13.34c  M-155.99 -40.95 C-155.99,-40.95 -156.43,-42.54 -156.43,-42.54 C-156.43,-42.54 -157.32,-41.13 -157.32,-41.13 C-157.32,-41.13 -158.91,-41.21 -158.91,-41.21 C-158.91,-41.21 -157.93,-39.8 -157.93,-39.8 C-157.93,-39.8 -158.46,-38.22 -158.46,-38.22 C-158.46,-38.22 -156.96,-38.74 -156.96,-38.74 C-156.96,-38.74 -155.73,-37.69 -155.73,-37.69 C-155.73,-37.69 -155.73,-39.45 -155.73,-39.45 C-155.73,-39.45 -154.49,-40.42 -154.49,-40.42 C-154.49,-40.42 -155.99,-40.95 -155.99,-40.95c  M141.24 26.52 C141.24,26.52 140.71,24.85 140.71,24.85 C140.71,24.85 139.83,26.26 139.83,26.26 C139.83,26.26 138.33,26.26 138.33,26.26 C138.33,26.26 139.21,27.67 139.21,27.67 C139.21,27.67 138.77,29.26 138.77,29.26 C138.77,29.26 140.18,28.73 140.18,28.73 C140.18,28.73 141.51,29.7 141.51,29.7 C141.51,29.7 141.42,28.02 141.42,28.02 C141.42,28.02 142.74,27.05 142.74,27.05 C142.74,27.05 141.24,26.52 141.24,26.52c  M111.4 -51.27 C111.4,-51.27 110.95,-52.94 110.95,-52.94 C110.95,-52.94 110.07,-51.53 110.07,-51.53 C110.07,-51.53 108.48,-51.53 108.48,-51.53 C108.48,-51.53 109.45,-50.21 109.45,-50.21 C109.45,-50.21 108.92,-48.53 108.92,-48.53 C108.92,-48.53 110.42,-49.15 110.42,-49.15 C110.42,-49.15 111.66,-48.09 111.66,-48.09 C111.66,-48.09 111.66,-49.86 111.66,-49.86 C111.66,-49.86 112.9,-50.83 112.9,-50.83 C112.9,-50.83 111.4,-51.27 111.4,-51.27c  M-66.59 53.33 C-66.59,53.33 -67.03,51.65 -67.03,51.65 C-67.03,51.65 -67.91,53.06 -67.91,53.06 C-67.91,53.06 -69.5,53.06 -69.5,53.06 C-69.5,53.06 -68.53,54.47 -68.53,54.47 C-68.53,54.47 -69.06,56.06 -69.06,56.06 C-69.06,56.06 -67.56,55.53 -67.56,55.53 C-67.56,55.53 -66.32,56.5 -66.32,56.5 C-66.32,56.5 -66.32,54.82 -66.32,54.82 C-66.32,54.82 -65.08,53.77 -65.08,53.77 C-65.08,53.77 -66.59,53.33 -66.59,53.33c  M-50.59 59.33 C-50.59,59.33 -51.12,57.65 -51.12,57.65 C-51.12,57.65 -52,59.06 -52,59.06 C-52,59.06 -53.5,59.06 -53.5,59.06 C-53.5,59.06 -52.62,60.38 -52.62,60.38 C-52.62,60.38 -53.06,62.06 -53.06,62.06 C-53.06,62.06 -51.65,61.53 -51.65,61.53 C-51.65,61.53 -50.32,62.5 -50.32,62.5 C-50.32,62.5 -50.41,60.82 -50.41,60.82 C-50.41,60.82 -49.08,59.77 -49.08,59.77 C-49.08,59.77 -50.59,59.33 -50.59,59.33c  M29.98 -16.08 C29.98,-16.08 29.27,-18.46 29.27,-18.46 C29.27,-18.46 27.95,-16.43 27.95,-16.43 C27.95,-16.43 25.74,-16.43 25.74,-16.43 C25.74,-16.43 27.06,-14.49 27.06,-14.49 C27.06,-14.49 26.36,-12.11 26.36,-12.11 C26.36,-12.11 28.48,-12.9 28.48,-12.9 C28.48,-12.9 30.33,-11.49 30.33,-11.49 C30.33,-11.49 30.24,-13.96 30.24,-13.96 C30.24,-13.96 32.1,-15.37 32.1,-15.37 C32.1,-15.37 29.98,-16.08 29.98,-16.08c  M81.28 55.98 C81.28,55.98 80.58,53.6 80.58,53.6 C80.58,53.6 79.25,55.63 79.25,55.63 C79.25,55.63 77.04,55.63 77.04,55.63 C77.04,55.63 78.37,57.57 78.37,57.57 C78.37,57.57 77.66,59.95 77.66,59.95 C77.66,59.95 79.78,59.07 79.78,59.07 C79.78,59.07 81.64,60.56 81.64,60.56 C81.64,60.56 81.55,58.1 81.55,58.1 C81.55,58.1 83.4,56.68 83.4,56.68 C83.4,56.68 81.28,55.98 81.28,55.98c  M-165.26 -10.97 C-165.26,-10.97 -165.97,-13.35 -165.97,-13.35 C-165.97,-13.35 -167.29,-11.32 -167.29,-11.32 C-167.29,-11.32 -169.5,-11.32 -169.5,-11.32 C-169.5,-11.32 -168.18,-9.38 -168.18,-9.38 C-168.18,-9.38 -168.88,-7 -168.88,-7 C-168.88,-7 -166.76,-7.79 -166.76,-7.79 C-166.76,-7.79 -164.91,-6.38 -164.91,-6.38 C-164.91,-6.38 -165,-8.85 -165,-8.85 C-165,-8.85 -163.14,-10.26 -163.14,-10.26 C-163.14,-10.26 -165.26,-10.97 -165.26,-10.97c  M-74.05 21.76 C-74.05,21.76 -74.66,19.47 -74.66,19.47 C-74.66,19.47 -75.99,21.49 -75.99,21.49 C-75.99,21.49 -78.2,21.41 -78.2,21.41 C-78.2,21.41 -76.87,23.43 -76.87,23.43 C-76.87,23.43 -77.58,25.73 -77.58,25.73 C-77.58,25.73 -75.46,24.93 -75.46,24.93 C-75.46,24.93 -73.6,26.43 -73.6,26.43 C-73.6,26.43 -73.69,23.96 -73.69,23.96 C-73.69,23.96 -71.84,22.46 -71.84,22.46 C-71.84,22.46 -74.05,21.76 -74.05,21.76c  M8.98 55.68 C8.98,55.68 6.15,53.65 6.15,53.65 C6.15,53.65 6.24,57.09 6.24,57.09 C6.24,57.09 3.5,59.12 3.5,59.12 C3.5,59.12 6.86,60.09 6.86,60.09 C6.86,60.09 7.92,63.35 7.92,63.35 C7.92,63.35 9.86,60.44 9.86,60.44 C9.86,60.44 13.3,60.44 13.3,60.44 C13.3,60.44 11.18,57.71 11.18,57.71 C11.18,57.71 12.15,54.44 12.15,54.44 C12.15,54.44 8.98,55.68 8.98,55.68c  M124.89 -2.41 C124.89,-2.41 122.06,-4.35 122.06,-4.35 C122.06,-4.35 122.24,-0.91 122.24,-0.91 C122.24,-0.91 119.5,1.12 119.5,1.12 C119.5,1.12 122.77,2 122.77,2 C122.77,2 123.83,5.26 123.83,5.26 C123.83,5.26 125.77,2.44 125.77,2.44 C125.77,2.44 129.21,2.44 129.21,2.44 C129.21,2.44 127.09,-0.29 127.09,-0.29 C127.09,-0.29 128.15,-3.56 128.15,-3.56 C128.15,-3.56 124.89,-2.41 124.89,-2.41c  M77.31 19.91 C77.31,19.91 74.57,17.88 74.57,17.88 C74.57,17.88 74.66,21.32 74.66,21.32 C74.66,21.32 71.92,23.35 71.92,23.35 C71.92,23.35 75.19,24.32 75.19,24.32 C75.19,24.32 76.34,27.58 76.34,27.58 C76.34,27.58 78.19,24.67 78.19,24.67 C78.19,24.67 81.64,24.67 81.64,24.67 C81.64,24.67 79.52,21.94 79.52,21.94 C79.52,21.94 80.58,18.67 80.58,18.67 C80.58,18.67 77.31,19.91 77.31,19.91c  M-28.11 7.68 C-28.11,7.68 -30.94,5.65 -30.94,5.65 C-30.94,5.65 -30.76,9.09 -30.76,9.09 C-30.76,9.09 -33.5,11.12 -33.5,11.12 C-33.5,11.12 -30.23,12.09 -30.23,12.09 C-30.23,12.09 -29.17,15.35 -29.17,15.35 C-29.17,15.35 -27.23,12.44 -27.23,12.44 C-27.23,12.44 -23.79,12.44 -23.79,12.44 C-23.79,12.44 -25.91,9.71 -25.91,9.71 C-25.91,9.71 -24.85,6.44 -24.85,6.44 C-24.85,6.44 -28.11,7.68 -28.11,7.68c  M-119.43 -20.22 C-119.43,-20.22 -122.26,-22.16 -122.26,-22.16 C-122.26,-22.16 -122.08,-18.72 -122.08,-18.72 C-122.08,-18.72 -124.82,-16.7 -124.82,-16.7 C-124.82,-16.7 -121.55,-15.81 -121.55,-15.81 C-121.55,-15.81 -120.49,-12.55 -120.49,-12.55 C-120.49,-12.55 -118.55,-15.37 -118.55,-15.37 C-118.55,-15.37 -115.11,-15.37 -115.11,-15.37 C-115.11,-15.37 -117.23,-18.11 -117.23,-18.11 C-117.23,-18.11 -116.17,-21.37 -116.17,-21.37 C-116.17,-21.37 -119.43,-20.22 -119.43,-20.22c "/>
+                        </group>
+                    </group>
+                    <group android:name="_R_G_L_6_G_L_0_G">
+                        <group android:name="_R_G_L_6_G_L_0_G_L_2_G" android:translateX="206" android:translateY="145">
+                            <path android:name="_R_G_L_6_G_L_0_G_L_2_G_D_0_P_0" android:fillColor="#e8eaed" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M230.57 -95.63 C230.57,-95.63 230.57,42.37 230.57,42.37 C230.57,43.47 229.56,44.37 228.33,44.37 C228.33,44.37 -228.33,44.37 -228.33,44.37 C-229.56,44.37 -230.57,43.47 -230.57,42.37 C-230.57,42.37 -230.57,-95.63 -230.57,-95.63 C-230.57,-96.73 -229.56,-97.63 -228.33,-97.63 C-228.33,-97.63 228.33,-97.63 228.33,-97.63 C229.56,-97.63 230.57,-96.73 230.57,-95.63c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_0_G_L_1_G" android:translateX="206" android:translateY="145">
+                            <path android:name="_R_G_L_6_G_L_0_G_L_1_G_D_0_P_0" android:fillColor="#80868b" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M109 -14 C109,-14 109,14 109,14 C109,15.1 108.1,16 107,16 C107,16 -107,16 -107,16 C-108.1,16 -109,15.1 -109,14 C-109,14 -109,-14 -109,-14 C-109,-15.1 -108.1,-16 -107,-16 C-107,-16 107,-16 107,-16 C108.1,-16 109,-15.1 109,-14c "/>
+                        </group>
+                        <group android:name="_R_G_L_6_G_L_0_G_L_0_G" android:translateX="46" android:translateY="145">
+                            <path android:name="_R_G_L_6_G_L_0_G_L_0_G_D_0_P_0" android:fillColor="#80868b" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M22 -14 C22,-14 22,14 22,14 C22,18.42 18.42,22 14,22 C14,22 -14,22 -14,22 C-18.42,22 -22,18.42 -22,14 C-22,14 -22,-14 -22,-14 C-22,-18.42 -18.42,-22 -14,-22 C-14,-22 14,-22 14,-22 C18.42,-22 22,-18.42 22,-14c "/>
+                        </group>
+                    </group>
+                </group>
+                <group android:name="_R_G_L_5_G" android:scaleY="0">
+                    <group android:name="_R_G_L_5_G_L_11_G" android:translateX="206" android:translateY="446" android:scaleY="0">
+                        <path android:name="_R_G_L_5_G_L_11_G_D_0_P_0" android:fillColor="#f1f3f4" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c "/>
+                    </group>
+                    <group android:name="_R_G_L_5_G_L_10_G" android:translateX="148" android:translateY="441" android:scaleY="0">
+                        <path android:name="_R_G_L_5_G_L_10_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M48 -8 C48,-8 48,8 48,8 C48,10.21 46.21,12 44,12 C44,12 -44,12 -44,12 C-46.21,12 -48,10.21 -48,8 C-48,8 -48,-8 -48,-8 C-48,-10.21 -46.21,-12 -44,-12 C-44,-12 44,-12 44,-12 C46.21,-12 48,-10.21 48,-8c "/>
+                    </group>
+                    <group android:name="_R_G_L_5_G_L_9_G" android:translateX="264" android:translateY="441" android:scaleY="0">
+                        <path android:name="_R_G_L_5_G_L_9_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M48 -8 C48,-8 48,8 48,8 C48,10.21 46.21,12 44,12 C44,12 -44,12 -44,12 C-46.21,12 -48,10.21 -48,8 C-48,8 -48,-8 -48,-8 C-48,-10.21 -46.21,-12 -44,-12 C-44,-12 44,-12 44,-12 C46.21,-12 48,-10.21 48,-8c "/>
+                    </group>
+                    <group android:name="_R_G_L_5_G_L_8_G" android:translateX="206" android:translateY="380" android:scaleY="0">
+                        <path android:name="_R_G_L_5_G_L_8_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M176 0 C176,0 176,0 176,0 C176,14.9 163.9,27 149,27 C149,27 -149,27 -149,27 C-163.9,27 -176,14.9 -176,0 C-176,0 -176,0 -176,0 C-176,-14.9 -163.9,-27 -149,-27 C-149,-27 149,-27 149,-27 C163.9,-27 176,-14.9 176,0c "/>
+                        <path android:name="_R_G_L_5_G_L_8_G_D_1_P_0" android:strokeColor="#bdc1c6" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="4" android:strokeAlpha="1" android:pathData=" M176 0 C176,0 176,0 176,0 C176,14.9 163.9,27 149,27 C149,27 -149,27 -149,27 C-163.9,27 -176,14.9 -176,0 C-176,0 -176,0 -176,0 C-176,-14.9 -163.9,-27 -149,-27 C-149,-27 149,-27 149,-27 C163.9,-27 176,-14.9 176,0c "/>
+                    </group>
+                    <group android:name="_R_G_L_5_G_L_7_G" android:translateX="120" android:translateY="268" android:scaleY="0">
+                        <path android:name="_R_G_L_5_G_L_7_G_D_0_P_0" android:fillColor="#4285f4" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M26 0 C26,0 26,0 26,0 C26,14.35 14.35,26 0,26 C0,26 0,26 0,26 C-14.35,26 -26,14.35 -26,0 C-26,0 -26,0 -26,0 C-26,-14.35 -14.35,-26 0,-26 C0,-26 0,-26 0,-26 C14.35,-26 26,-14.35 26,0c "/>
+                    </group>
+                    <group android:name="_R_G_L_5_G_L_6_G" android:translateX="167" android:translateY="278" android:scaleY="0">
+                        <path android:name="_R_G_L_5_G_L_6_G_D_0_P_0" android:fillColor="#e94235" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M17 0 C17,0 17,0 17,0 C17,9.38 9.38,17 0,17 C0,17 0,17 0,17 C-9.38,17 -17,9.38 -17,0 C-17,0 -17,0 -17,0 C-17,-9.38 -9.38,-17 0,-17 C0,-17 0,-17 0,-17 C9.38,-17 17,-9.38 17,0c "/>
+                    </group>
+                    <group android:name="_R_G_L_5_G_L_5_G" android:translateX="205" android:translateY="278" android:scaleY="0">
+                        <path android:name="_R_G_L_5_G_L_5_G_D_0_P_0" android:fillColor="#fabb05" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M17 0 C17,0 17,0 17,0 C17,9.38 9.38,17 0,17 C0,17 0,17 0,17 C-9.38,17 -17,9.38 -17,0 C-17,0 -17,0 -17,0 C-17,-9.38 -9.38,-17 0,-17 C0,-17 0,-17 0,-17 C9.38,-17 17,-9.38 17,0c "/>
+                    </group>
+                    <group android:name="_R_G_L_5_G_L_4_G" android:translateX="243" android:translateY="286" android:scaleY="0">
+                        <path android:name="_R_G_L_5_G_L_4_G_D_0_P_0" android:fillColor="#4285f4" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M17 -8 C17,-8 17,8 17,8 C17,17.38 9.38,25 0,25 C0,25 0,25 0,25 C-9.38,25 -17,17.38 -17,8 C-17,8 -17,-8 -17,-8 C-17,-17.38 -9.38,-25 0,-25 C0,-25 0,-25 0,-25 C9.38,-25 17,-17.38 17,-8c "/>
+                    </group>
+                    <group android:name="_R_G_L_5_G_L_3_G" android:translateX="272" android:translateY="269" android:scaleY="0">
+                        <path android:name="_R_G_L_5_G_L_3_G_D_0_P_0" android:fillColor="#34a853" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M8 -17 C8,-17 8,17 8,17 C8,21.42 4.42,25 0,25 C0,25 0,25 0,25 C-4.42,25 -8,21.42 -8,17 C-8,17 -8,-17 -8,-17 C-8,-21.42 -4.42,-25 0,-25 C0,-25 0,-25 0,-25 C4.42,-25 8,-21.42 8,-17c "/>
+                    </group>
+                    <group android:name="_R_G_L_5_G_L_2_G" android:translateX="301" android:translateY="278" android:scaleY="0">
+                        <path android:name="_R_G_L_5_G_L_2_G_D_0_P_0" android:fillColor="#e94235" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M17 0 C17,0 17,0 17,0 C17,9.38 9.38,17 0,17 C0,17 0,17 0,17 C-9.38,17 -17,9.38 -17,0 C-17,0 -17,0 -17,0 C-17,-9.38 -9.38,-17 0,-17 C0,-17 0,-17 0,-17 C9.38,-17 17,-9.38 17,0c "/>
+                    </group>
+                    <group android:name="_R_G_L_5_G_L_1_G" android:translateX="42" android:translateY="140" android:scaleY="0">
+                        <path android:name="_R_G_L_5_G_L_1_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M12 -8 C12,-8 12,8 12,8 C12,10.21 10.21,12 8,12 C8,12 -8,12 -8,12 C-10.21,12 -12,10.21 -12,8 C-12,8 -12,-8 -12,-8 C-12,-10.21 -10.21,-12 -8,-12 C-8,-12 8,-12 8,-12 C10.21,-12 12,-10.21 12,-8c "/>
+                    </group>
+                    <group android:name="_R_G_L_5_G_L_0_G" android:translateX="92.5" android:translateY="140" android:scaleY="0">
+                        <path android:name="_R_G_L_5_G_L_0_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M28.5 -5 C28.5,-5 28.5,5 28.5,5 C28.5,7.21 26.71,9 24.5,9 C24.5,9 -24.5,9 -24.5,9 C-26.71,9 -28.5,7.21 -28.5,5 C-28.5,5 -28.5,-5 -28.5,-5 C-28.5,-7.21 -26.71,-9 -24.5,-9 C-24.5,-9 24.5,-9 24.5,-9 C26.71,-9 28.5,-7.21 28.5,-5c "/>
+                    </group>
+                </group>
+                <group android:name="_R_G_L_4_G" android:translateX="206" android:translateY="877">
+                    <path android:name="_R_G_L_4_G_D_0_P_0" android:fillColor="#373737" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M40 0 C40,0 40,0 40,0 C40,1.1 39.1,2 38,2 C38,2 -38,2 -38,2 C-39.1,2 -40,1.1 -40,0 C-40,0 -40,0 -40,0 C-40,-1.1 -39.1,-2 -38,-2 C-38,-2 38,-2 38,-2 C39.1,-2 40,-1.1 40,0c "/>
+                </group>
+                <group android:name="_R_G_L_3_G">
+                    <group android:name="_R_G_L_3_G_L_1_G" android:translateX="206" android:translateY="50.5">
+                        <path android:name="_R_G_L_3_G_L_1_G_D_0_P_0" android:fillColor="#202124" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -50.5 C206,-50.5 206,50.5 206,50.5 C206,50.5 -206,50.5 -206,50.5 C-206,50.5 -206,-50.5 -206,-50.5 C-206,-50.5 206,-50.5 206,-50.5c "/>
+                    </group>
+                    <group android:name="_R_G_L_3_G_L_0_G" android:translateX="206" android:translateY="66.5">
+                        <path android:name="_R_G_L_3_G_L_0_G_D_0_P_0" android:fillColor="#3c4043" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M190 0 C190,0 190,0 190,0 C190,10.21 181.71,18.5 171.5,18.5 C171.5,18.5 -171.5,18.5 -171.5,18.5 C-181.71,18.5 -190,10.21 -190,0 C-190,0 -190,0 -190,0 C-190,-10.21 -181.71,-18.5 -171.5,-18.5 C-171.5,-18.5 171.5,-18.5 171.5,-18.5 C181.71,-18.5 190,-10.21 190,0c "/>
+                    </group>
+                </group>
+                <group android:name="_R_G_L_2_G" android:translateX="382.824" android:translateY="462.5" android:scaleX="-1" android:scaleY="0">
+                    <group android:name="_R_G_L_2_G_D_0_P_0_G_0_T_0" android:translateX="-60" android:translateY="0">
+                        <path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="#000000" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M28.25 0 C28.25,31.2 2.95,56.5 -28.25,56.5 C-28.25,56.5 -28.25,-56.5 -28.25,-56.5 C2.95,-56.5 28.25,-31.2 28.25,0c "/>
+                    </group>
+                </group>
+                <group android:name="_R_G_L_1_G" android:translateX="414.087" android:translateY="463" android:scaleX="0.5" android:scaleY="0" android:rotation="180">
+                    <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="#ffffff" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M3.87 -13.45 C3.07,-14.21 1.8,-14.18 1.04,-13.38 C0.28,-12.58 0.31,-11.31 1.11,-10.55 C1.11,-10.55 9.75,-2.32 9.75,-2.32 C9.75,-2.32 -14.75,-2.32 -14.75,-2.32 C-15.85,-2.32 -16.75,-1.43 -16.75,-0.32 C-16.75,0.78 -15.85,1.68 -14.75,1.68 C-14.75,1.68 9.94,1.68 9.94,1.68 C9.94,1.68 1.07,10.59 1.07,10.59 C0.29,11.37 0.29,12.64 1.08,13.42 C1.86,14.2 3.13,14.19 3.9,13.41 C3.9,13.41 16.17,1.09 16.17,1.09 C16.55,0.71 16.76,0.19 16.75,-0.35 C16.74,-0.89 16.52,-1.4 16.13,-1.77 C16.13,-1.77 3.87,-13.45 3.87,-13.45c "/>
+                </group>
+                <group android:name="_R_G_L_0_G_N_1_T_0" android:translateX="206" android:translateY="446" android:scaleX="-1" android:scaleY="0">
+                    <group android:name="_R_G_L_0_G" android:translateX="-336.003" android:translateY="-48.003">
+                        <group android:name="_R_G_L_0_G_L_2_G" android:translateX="295.995" android:translateY="63.997" android:scaleY="0">
+                            <path android:name="_R_G_L_0_G_L_2_G_D_0_P_0" android:fillColor="#baf29d" android:fillAlpha="0.3" android:fillType="nonZero" android:pathData=" M-166 64 C-130.65,64 -102,35.35 -102,0 C-102,-35.34 -130.65,-64 -166,-64 C-201.34,-64 -230,-35.34 -230,0 C-230,35.35 -201.34,64 -166,64c "/>
+                        </group>
+                        <group android:name="_R_G_L_0_G_L_1_G" android:translateX="192" android:translateY="63.997" android:rotation="90" android:scaleX="-1" android:scaleY="0">
+                            <path android:name="_R_G_L_0_G_L_1_G_D_0_P_0" android:fillColor="#baf29d" android:fillAlpha="0.3" android:fillType="nonZero" android:pathData=" M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c "/>
+                        </group>
+                        <group android:name="_R_G_L_0_G_L_0_G" android:translateX="295.995" android:translateY="63.997" android:scaleY="0">
+                            <group android:name="_R_G_L_0_G_L_0_G_D_0_P_0_G_0_T_0" android:translateX="-166" android:translateY="0">
+                                <path android:name="_R_G_L_0_G_L_0_G_D_0_P_0" android:fillColor="#baf29d" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 64 C35.35,64 64,35.35 64,0 C64,-35.34 35.35,-64 0,-64 C-35.34,-64 -64,-35.34 -64,0 C-64,35.35 -35.34,64 0,64c "/>
+                            </group>
+                        </group>
+                    </group>
+                </group>
+            </group>
+            <group android:name="time_group"/>
+        </vector>
+    </aapt:attr>
+    <target android:name="_R_G_L_6_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_6_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2283" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_6_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_6_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2283" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_6_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_6_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2267" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_6_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleX" android:duration="2133" android:startOffset="0" android:valueFrom="1" android:valueTo="1" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleY" android:duration="2133" android:startOffset="0" android:valueFrom="1" android:valueTo="1" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleX" android:duration="283" android:startOffset="2133" android:valueFrom="1" android:valueTo="0.88012" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleY" android:duration="283" android:startOffset="2133" android:valueFrom="1" android:valueTo="0.88012" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_6_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_6_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2417" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_5_G_L_11_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2333" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_5_G_L_10_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2433" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_5_G_L_9_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2433" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_5_G_L_8_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_5_G_L_7_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2367" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_5_G_L_6_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2367" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_5_G_L_5_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2367" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_5_G_L_4_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2367" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_5_G_L_3_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2367" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_5_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2367" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_5_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2333" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_5_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2333" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_5_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2333" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_D_0_P_0_G_0_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="translateXY" android:duration="1133" android:startOffset="0" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -60,0C -50.167,0 -69.833,0 -60,0">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="translateXY" android:duration="667" android:startOffset="1133" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -60,0C -50.167,0 -10.833,0 -1,0">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="translateXY" android:duration="333" android:startOffset="1800" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -1,0C -1,0 -1,0 -1,0">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0.333 0,0 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="translateXY" android:duration="333" android:startOffset="2133" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -1,0C -10.833,0 -50.167,0 -60,0">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1133" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2467" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="translateXY" android:duration="1133" android:startOffset="0" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 414.087,463C 409.087,463 419.087,463 414.087,463">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="translateXY" android:duration="583" android:startOffset="1133" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 414.087,463C 409.087,463 389.087,463 384.087,463">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="translateXY" android:duration="417" android:startOffset="1717" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 384.087,463C 384.087,463 384.087,463 384.087,463">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0.333 0.667,0.667 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="translateXY" android:duration="333" android:startOffset="2133" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 384.087,463C 389.087,463 409.087,463 414.087,463">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleX" android:duration="1300" android:startOffset="0" android:valueFrom="0.5" android:valueTo="0.5" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleY" android:duration="1300" android:startOffset="0" android:valueFrom="0.5" android:valueTo="0.5" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleX" android:duration="417" android:startOffset="1300" android:valueFrom="0.5" android:valueTo="1" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleY" android:duration="417" android:startOffset="1300" android:valueFrom="0.5" android:valueTo="1" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleX" android:duration="417" android:startOffset="1717" android:valueFrom="1" android:valueTo="1" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleY" android:duration="417" android:startOffset="1717" android:valueFrom="1" android:valueTo="1" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleX" android:duration="200" android:startOffset="2133" android:valueFrom="1" android:valueTo="0.5" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleY" android:duration="200" android:startOffset="2133" android:valueFrom="1" android:valueTo="0.5" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1300" android:valueFrom="0" android:valueTo="0.5" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2333" android:valueFrom="0.5" android:valueTo="0" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="867" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1033" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_1_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="pathData" android:duration="167" android:startOffset="867" android:valueFrom="M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c " android:valueTo="M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c " android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.508,0 0.487,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="pathData" android:duration="467" android:startOffset="1033" android:valueFrom="M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c " android:valueTo="M0 167.99 C35.35,167.99 64,139.34 64,104 C64,104 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,104 -64,104 C-64,139.34 -35.34,167.99 0,167.99c " android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.508,0 0.487,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1033" android:valueFrom="0" android:valueTo="-1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2267" android:valueFrom="-1" android:valueTo="0" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_0_G_D_0_P_0_G_0_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="translateXY" android:duration="167" android:startOffset="867" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -166,0C -138.333,0 -193.667,0 -166,0">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.508,0 0.487,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="translateXY" android:duration="467" android:startOffset="1033" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -166,0C -138.333,0 -27.667,0 0,0">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.508,0 0.487,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="867" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2267" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_N_1_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="867" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_N_1_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2267" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="translateX" android:duration="4017" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_cancel_button_background.xml b/quickstep/res/drawable/gesture_tutorial_cancel_button_background.xml
new file mode 100644
index 0000000000..0a34af6475
--- /dev/null
+++ b/quickstep/res/drawable/gesture_tutorial_cancel_button_background.xml
@@ -0,0 +1,21 @@
+<!--
+    Copyright (C) 2021 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="50dp"/>
+    <solid android:color="@android:color/transparent"/>
+    <stroke android:width="1dp" android:color="@color/gesture_tutorial_primary_color"/>
+</shape>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_home.xml b/quickstep/res/drawable/gesture_tutorial_home.xml
new file mode 100644
index 0000000000..e77eb7401f
--- /dev/null
+++ b/quickstep/res/drawable/gesture_tutorial_home.xml
@@ -0,0 +1,394 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt">
+    <aapt:attr name="android:drawable">
+        <vector android:height="892dp" android:width="412dp" android:viewportHeight="892" android:viewportWidth="412">
+            <group android:name="_R_G">
+                <group android:name="_R_G_L_4_G" android:translateX="206" android:translateY="877">
+                    <path android:name="_R_G_L_4_G_D_0_P_0" android:fillColor="#373737" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M40 0 C40,0 40,0 40,0 C40,1.1 39.1,2 38,2 C38,2 -38,2 -38,2 C-39.1,2 -40,1.1 -40,0 C-40,0 -40,0 -40,0 C-40,-1.1 -39.1,-2 -38,-2 C-38,-2 38,-2 38,-2 C39.1,-2 40,-1.1 40,0c "/>
+                </group>
+                <group android:name="_R_G_L_3_G">
+                    <path android:name="_R_G_L_3_G_S" android:fillColor="#000000" android:pathData="M0,0 L412,0 L412,892 L0,892z"/>
+                </group>
+                <group android:name="_R_G_L_2_G" android:scaleY="0">
+                    <group android:name="_R_G_L_2_G_L_5_G" android:translateX="206" android:translateY="872" android:scaleY="0">
+                        <path android:name="_R_G_L_2_G_L_5_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M40 0 C40,0 40,0 40,0 C40,1.1 39.1,2 38,2 C38,2 -38,2 -38,2 C-39.1,2 -40,1.1 -40,0 C-40,0 -40,0 -40,0 C-40,-1.1 -39.1,-2 -38,-2 C-38,-2 38,-2 38,-2 C39.1,-2 40,-1.1 40,0c "/>
+                    </group>
+                    <group android:name="_R_G_L_2_G_L_4_G" android:translateX="206" android:translateY="776" android:scaleY="0">
+                        <path android:name="_R_G_L_2_G_L_4_G_D_0_P_0" android:fillColor="#3c4043" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M180 0 C180,0 180,0 180,0 C180,13.8 168.8,25 155,25 C155,25 -155,25 -155,25 C-168.8,25 -180,13.8 -180,0 C-180,0 -180,0 -180,0 C-180,-13.8 -168.8,-25 -155,-25 C-155,-25 155,-25 155,-25 C168.8,-25 180,-13.8 180,0c "/>
+                    </group>
+                    <group android:name="_R_G_L_2_G_L_3_G" android:translateX="56" android:translateY="673" android:scaleY="0">
+                        <path android:name="_R_G_L_2_G_L_3_G_D_0_P_0" android:fillColor="#8ab4f8" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 -30 C16.56,-30 30,-16.56 30,0 C30,16.56 16.56,30 0,30 C-16.56,30 -30,16.56 -30,0 C-30,-16.56 -16.56,-30 0,-30c "/>
+                    </group>
+                    <group android:name="_R_G_L_2_G_L_2_G" android:translateX="156" android:translateY="673" android:scaleY="0">
+                        <path android:name="_R_G_L_2_G_L_2_G_D_0_P_0" android:fillColor="#f28b82" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 -30 C16.56,-30 30,-16.56 30,0 C30,16.56 16.56,30 0,30 C-16.56,30 -30,16.56 -30,0 C-30,-16.56 -16.56,-30 0,-30c "/>
+                    </group>
+                    <group android:name="_R_G_L_2_G_L_1_G" android:translateX="256" android:translateY="673" android:scaleY="0">
+                        <path android:name="_R_G_L_2_G_L_1_G_D_0_P_0" android:fillColor="#fdd663" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 -30 C16.56,-30 30,-16.56 30,0 C30,16.56 16.56,30 0,30 C-16.56,30 -30,16.56 -30,0 C-30,-16.56 -16.56,-30 0,-30c "/>
+                    </group>
+                    <group android:name="_R_G_L_2_G_L_0_G" android:translateX="356" android:translateY="673" android:scaleY="0">
+                        <path android:name="_R_G_L_2_G_L_0_G_D_0_P_0" android:fillColor="#81c995" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 -30 C16.56,-30 30,-16.56 30,0 C30,16.56 16.56,30 0,30 C-16.56,30 -30,16.56 -30,0 C-30,-16.56 -16.56,-30 0,-30c "/>
+                    </group>
+                </group>
+                <group android:name="_R_G_L_1_G_N_1_T_0" android:translateX="206" android:translateY="446" android:scaleX="1" android:scaleY="1">
+                    <group android:name="_R_G_L_1_G" android:translateX="-206" android:translateY="-446">
+                        <group android:name="_R_G_L_1_G_L_4_G">
+                            <group android:name="_R_G_L_1_G_L_4_G_L_11_G" android:translateX="206" android:translateY="472.769" android:scaleX="0.87473" android:scaleY="0.98643">
+                                <path android:name="_R_G_L_1_G_L_4_G_L_11_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M235.5 -407 C235.5,-407 235.5,407 235.5,407 C235.5,416.93 227.43,425 217.5,425 C217.5,425 -217.5,425 -217.5,425 C-227.43,425 -235.5,416.93 -235.5,407 C-235.5,407 -235.5,-407 -235.5,-407 C-235.5,-416.93 -227.43,-425 -217.5,-425 C-217.5,-425 217.5,-425 217.5,-425 C227.43,-425 235.5,-416.93 235.5,-407c "/>
+                            </group>
+                            <group android:name="_R_G_L_1_G_L_4_G_L_10_G" android:translateX="182.5" android:translateY="831">
+                                <path android:name="_R_G_L_1_G_L_4_G_L_10_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M158.5 -7 C158.5,-7 158.5,7 158.5,7 C158.5,9.21 156.71,11 154.5,11 C154.5,11 -154.5,11 -154.5,11 C-156.71,11 -158.5,9.21 -158.5,7 C-158.5,7 -158.5,-7 -158.5,-7 C-158.5,-9.21 -156.71,-11 -154.5,-11 C-154.5,-11 154.5,-11 154.5,-11 C156.71,-11 158.5,-9.21 158.5,-7c "/>
+                            </group>
+                            <group android:name="_R_G_L_1_G_L_4_G_L_9_G" android:translateX="186" android:translateY="801">
+                                <path android:name="_R_G_L_1_G_L_4_G_L_9_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M162 -7 C162,-7 162,7 162,7 C162,9.21 160.21,11 158,11 C158,11 -158,11 -158,11 C-160.21,11 -162,9.21 -162,7 C-162,7 -162,-7 -162,-7 C-162,-9.21 -160.21,-11 -158,-11 C-158,-11 158,-11 158,-11 C160.21,-11 162,-9.21 162,-7c "/>
+                            </group>
+                            <group android:name="_R_G_L_1_G_L_4_G_L_8_G" android:translateX="119" android:translateY="755">
+                                <path android:name="_R_G_L_1_G_L_4_G_L_8_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M95 -7 C95,-7 95,7 95,7 C95,9.21 93.21,11 91,11 C91,11 -91,11 -91,11 C-93.21,11 -95,9.21 -95,7 C-95,7 -95,-7 -95,-7 C-95,-9.21 -93.21,-11 -91,-11 C-91,-11 91,-11 91,-11 C93.21,-11 95,-9.21 95,-7c "/>
+                            </group>
+                            <group android:name="_R_G_L_1_G_L_4_G_L_7_G" android:translateX="182.5" android:translateY="725">
+                                <path android:name="_R_G_L_1_G_L_4_G_L_7_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M158.5 -7 C158.5,-7 158.5,7 158.5,7 C158.5,9.21 156.71,11 154.5,11 C154.5,11 -154.5,11 -154.5,11 C-156.71,11 -158.5,9.21 -158.5,7 C-158.5,7 -158.5,-7 -158.5,-7 C-158.5,-9.21 -156.71,-11 -154.5,-11 C-154.5,-11 154.5,-11 154.5,-11 C156.71,-11 158.5,-9.21 158.5,-7c "/>
+                            </group>
+                            <group android:name="_R_G_L_1_G_L_4_G_L_6_G" android:translateX="197.5" android:translateY="695">
+                                <path android:name="_R_G_L_1_G_L_4_G_L_6_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M173.5 -7 C173.5,-7 173.5,7 173.5,7 C173.5,9.21 171.71,11 169.5,11 C169.5,11 -169.5,11 -169.5,11 C-171.71,11 -173.5,9.21 -173.5,7 C-173.5,7 -173.5,-7 -173.5,-7 C-173.5,-9.21 -171.71,-11 -169.5,-11 C-169.5,-11 169.5,-11 169.5,-11 C171.71,-11 173.5,-9.21 173.5,-7c "/>
+                            </group>
+                            <group android:name="_R_G_L_1_G_L_4_G_L_5_G" android:translateX="192" android:translateY="665">
+                                <path android:name="_R_G_L_1_G_L_4_G_L_5_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M168 -7 C168,-7 168,7 168,7 C168,9.21 166.21,11 164,11 C164,11 -164,11 -164,11 C-166.21,11 -168,9.21 -168,7 C-168,7 -168,-7 -168,-7 C-168,-9.21 -166.21,-11 -164,-11 C-164,-11 164,-11 164,-11 C166.21,-11 168,-9.21 168,-7c "/>
+                            </group>
+                            <group android:name="_R_G_L_1_G_L_4_G_L_4_G" android:translateX="105.5" android:translateY="360">
+                                <path android:name="_R_G_L_1_G_L_4_G_L_4_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M23.5 -2 C23.5,-2 23.5,2 23.5,2 C23.5,4.21 21.71,6 19.5,6 C19.5,6 -19.5,6 -19.5,6 C-21.71,6 -23.5,4.21 -23.5,2 C-23.5,2 -23.5,-2 -23.5,-2 C-23.5,-4.21 -21.71,-6 -19.5,-6 C-19.5,-6 19.5,-6 19.5,-6 C21.71,-6 23.5,-4.21 23.5,-2c "/>
+                            </group>
+                            <group android:name="_R_G_L_1_G_L_4_G_L_3_G" android:translateX="47.5" android:translateY="360">
+                                <path android:name="_R_G_L_1_G_L_4_G_L_3_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M23.5 -2 C23.5,-2 23.5,2 23.5,2 C23.5,4.21 21.71,6 19.5,6 C19.5,6 -19.5,6 -19.5,6 C-21.71,6 -23.5,4.21 -23.5,2 C-23.5,2 -23.5,-2 -23.5,-2 C-23.5,-4.21 -21.71,-6 -19.5,-6 C-19.5,-6 19.5,-6 19.5,-6 C21.71,-6 23.5,-4.21 23.5,-2c "/>
+                            </group>
+                            <group android:name="_R_G_L_1_G_L_4_G_L_2_G" android:translateX="142.5" android:translateY="328">
+                                <path android:name="_R_G_L_1_G_L_4_G_L_2_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M118.5 -14 C118.5,-14 118.5,14 118.5,14 C118.5,16.21 116.71,18 114.5,18 C114.5,18 -114.5,18 -114.5,18 C-116.71,18 -118.5,16.21 -118.5,14 C-118.5,14 -118.5,-14 -118.5,-14 C-118.5,-16.21 -116.71,-18 -114.5,-18 C-114.5,-18 114.5,-18 114.5,-18 C116.71,-18 118.5,-16.21 118.5,-14c "/>
+                            </group>
+                            <group android:name="_R_G_L_1_G_L_4_G_L_1_G" android:translateX="186" android:translateY="284">
+                                <path android:name="_R_G_L_1_G_L_4_G_L_1_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M162 -14 C162,-14 162,14 162,14 C162,16.21 160.21,18 158,18 C158,18 -158,18 -158,18 C-160.21,18 -162,16.21 -162,14 C-162,14 -162,-14 -162,-14 C-162,-16.21 -160.21,-18 -158,-18 C-158,-18 158,-18 158,-18 C160.21,-18 162,-16.21 162,-14c "/>
+                            </group>
+                            <group android:name="_R_G_L_1_G_L_4_G_L_0_G" android:translateX="155" android:translateY="240">
+                                <path android:name="_R_G_L_1_G_L_4_G_L_0_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M131 -14 C131,-14 131,14 131,14 C131,16.21 129.21,18 127,18 C127,18 -127,18 -127,18 C-129.21,18 -131,16.21 -131,14 C-131,14 -131,-14 -131,-14 C-131,-16.21 -129.21,-18 -127,-18 C-127,-18 127,-18 127,-18 C129.21,-18 131,-16.21 131,-14c "/>
+                            </group>
+                        </group>
+                        <group android:name="_R_G_L_1_G_L_3_G" android:translateX="24" android:translateY="390">
+                            <group android:name="_R_G_L_1_G_L_3_G_L_7_G" android:translateX="182" android:translateY="120"/>
+                            <group android:name="_R_G_L_1_G_L_3_G_L_6_G" android:translateX="182" android:translateY="120">
+                                <path android:name="_R_G_L_1_G_L_3_G_L_6_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M182 -116 C182,-116 182,116 182,116 C182,118.21 180.21,120 178,120 C178,120 -178,120 -178,120 C-180.21,120 -182,118.21 -182,116 C-182,116 -182,-116 -182,-116 C-182,-118.21 -180.21,-120 -178,-120 C-178,-120 178,-120 178,-120 C180.21,-120 182,-118.21 182,-116c "/>
+                            </group>
+                            <group android:name="_R_G_L_1_G_L_3_G_L_5_G" android:translateX="77.322" android:translateY="150.552">
+                                <path android:name="_R_G_L_1_G_L_3_G_L_5_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 20.61 C0,20.61 -10.39,8.69 -10.39,8.69  M0 -6.11 C0,-6.11 -6.78,-15.61 -6.78,-15.61  M0 33.64 C0,33.64 8.26,17.67 8.26,17.67  M0 7.58 C0,7.58 8.26,-7.73 8.26,-7.73  M0 71.19 C0,71.19 0,-18.04 0,-18.04  M-30.22 37.18 C-30.22,37.18 0,-71.19 0,-71.19 C0,-71.19 30.22,37.18 30.22,37.18 C30.22,37.18 -30.22,37.18 -30.22,37.18c "/>
+                                <path android:name="_R_G_L_1_G_L_3_G_L_5_G_D_1_P_0" android:strokeColor="#9adcb2" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M0 20.61 C0,20.61 -10.39,8.69 -10.39,8.69  M0 -6.11 C0,-6.11 -6.78,-15.61 -6.78,-15.61  M0 33.64 C0,33.64 8.26,17.67 8.26,17.67  M0 7.58 C0,7.58 8.26,-7.73 8.26,-7.73  M0 71.19 C0,71.19 0,-18.04 0,-18.04  M-30.22 37.18 C-30.22,37.18 0,-71.19 0,-71.19 C0,-71.19 30.22,37.18 30.22,37.18 C30.22,37.18 -30.22,37.18 -30.22,37.18c "/>
+                            </group>
+                            <group android:name="_R_G_L_1_G_L_3_G_L_4_G" android:translateX="38.772" android:translateY="121.73">
+                                <path android:name="_R_G_L_1_G_L_3_G_L_4_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 28.82 C0,28.82 -14.52,12.18 -14.52,12.18  M0 -8.58 C0,-8.58 -9.51,-21.75 -9.51,-21.75  M0 47.01 C0,47.01 11.57,24.7 11.57,24.7  M0 10.64 C0,10.64 11.57,-10.78 11.57,-10.78  M0 99.42 C0,99.42 0,-25.21 0,-25.21  M-31.92 51.94 C-31.92,51.94 0,-99.42 0,-99.42 C0,-99.42 31.92,51.94 31.92,51.94 C31.92,51.94 -31.92,51.94 -31.92,51.94c "/>
+                                <path android:name="_R_G_L_1_G_L_3_G_L_4_G_D_1_P_0" android:strokeColor="#9adcb2" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M0 28.82 C0,28.82 -14.52,12.18 -14.52,12.18  M0 -8.58 C0,-8.58 -9.51,-21.75 -9.51,-21.75  M0 47.01 C0,47.01 11.57,24.7 11.57,24.7  M0 10.64 C0,10.64 11.57,-10.78 11.57,-10.78  M0 99.42 C0,99.42 0,-25.21 0,-25.21  M-31.92 51.94 C-31.92,51.94 0,-99.42 0,-99.42 C0,-99.42 31.92,51.94 31.92,51.94 C31.92,51.94 -31.92,51.94 -31.92,51.94c "/>
+                            </group>
+                            <group android:name="_R_G_L_1_G_L_3_G_L_3_G" android:translateX="183" android:translateY="222">
+                                <path android:name="_R_G_L_1_G_L_3_G_L_3_G_D_0_P_0" android:fillColor="#000000" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M170 0 C170,0 -170,0 -170,0 "/>
+                                <path android:name="_R_G_L_1_G_L_3_G_L_3_G_D_1_P_0" android:strokeColor="#9aa0a6" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="4" android:strokeAlpha="1" android:pathData=" M170 0 C170,0 -170,0 -170,0 "/>
+                            </group>
+                            <group android:name="_R_G_L_1_G_L_3_G_L_2_G" android:translateX="265.619" android:translateY="162.331">
+                                <path android:name="_R_G_L_1_G_L_3_G_L_2_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M-34.05 50.06 C-34.05,50.06 -34.05,-49.25 -34.05,-49.25  M-34.05 -49.55 C-34.05,-49.55 17.54,50.06 17.54,50.06 C17.54,50.06 84.62,50.06 84.62,50.06 C84.62,50.06 32.65,-50.06 32.65,-50.06 C32.65,-50.06 -34.05,-50.06 -34.05,-50.06 C-34.05,-50.06 -84.62,50.06 -84.62,50.06 C-84.62,50.06 17.54,50.06 17.54,50.06 "/>
+                                <path android:name="_R_G_L_1_G_L_3_G_L_2_G_D_1_P_0" android:strokeColor="#a8cbfe" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M-34.05 50.06 C-34.05,50.06 -34.05,-49.25 -34.05,-49.25  M-34.05 -49.55 C-34.05,-49.55 17.54,50.06 17.54,50.06 C17.54,50.06 84.62,50.06 84.62,50.06 C84.62,50.06 32.65,-50.06 32.65,-50.06 C32.65,-50.06 -34.05,-50.06 -34.05,-50.06 C-34.05,-50.06 -84.62,50.06 -84.62,50.06 C-84.62,50.06 17.54,50.06 17.54,50.06 "/>
+                            </group>
+                            <group android:name="_R_G_L_1_G_L_3_G_L_1_G" android:translateX="319.271" android:translateY="37.945">
+                                <path android:name="_R_G_L_1_G_L_3_G_L_1_G_D_0_P_0" android:fillColor="#feefc3" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M13.42 2.99 C14.95,-4.17 9.93,-11.31 2.21,-12.96 C-0.9,-13.62 -3.97,-13.3 -6.64,-12.2 C-6.58,-12.19 -6.53,-12.18 -6.48,-12.17 C-1.03,-11.01 2.52,-5.97 1.44,-0.92 C0.36,4.13 -4.94,7.28 -10.4,6.12 C-11.6,5.86 -12.7,5.42 -13.69,4.83 C-11.9,8.78 -8.15,11.93 -3.34,12.96 C4.38,14.61 11.88,10.14 13.42,2.99c "/>
+                            </group>
+                            <group android:name="_R_G_L_1_G_L_3_G_L_0_G" android:translateX="179.5" android:translateY="73.351">
+                                <path android:name="_R_G_L_1_G_L_3_G_L_0_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M51.08 -40.95 C51.08,-40.95 50.55,-42.54 50.55,-42.54 C50.55,-42.54 49.67,-41.13 49.67,-41.13 C49.67,-41.13 48.17,-41.21 48.17,-41.21 C48.17,-41.21 49.05,-39.8 49.05,-39.8 C49.05,-39.8 48.61,-38.22 48.61,-38.22 C48.61,-38.22 50.02,-38.74 50.02,-38.74 C50.02,-38.74 51.35,-37.69 51.35,-37.69 C51.35,-37.69 51.26,-39.45 51.26,-39.45 C51.26,-39.45 52.59,-40.42 52.59,-40.42 C52.59,-40.42 51.08,-40.95 51.08,-40.95c  M8.78 30.58 C8.78,30.58 8.25,28.99 8.25,28.99 C8.25,28.99 7.37,30.4 7.37,30.4 C7.37,30.4 5.87,30.31 5.87,30.31 C5.87,30.31 6.75,31.72 6.75,31.72 C6.75,31.72 6.31,33.31 6.31,33.31 C6.31,33.31 7.72,32.78 7.72,32.78 C7.72,32.78 9.05,33.84 9.05,33.84 C9.05,33.84 8.96,32.08 8.96,32.08 C8.96,32.08 10.29,31.11 10.29,31.11 C10.29,31.11 8.78,30.58 8.78,30.58c  M19.38 -61.67 C19.38,-61.67 18.94,-63.35 18.94,-63.35 C18.94,-63.35 17.97,-61.94 17.97,-61.94 C17.97,-61.94 16.47,-61.94 16.47,-61.94 C16.47,-61.94 17.35,-60.62 17.35,-60.62 C17.35,-60.62 16.91,-58.94 16.91,-58.94 C16.91,-58.94 18.41,-59.56 18.41,-59.56 C18.41,-59.56 19.65,-58.5 19.65,-58.5 C19.65,-58.5 19.56,-60.18 19.56,-60.18 C19.56,-60.18 20.88,-61.23 20.88,-61.23 C20.88,-61.23 19.38,-61.67 19.38,-61.67c  M-32.98 35.08 C-32.98,35.08 -33.51,33.4 -33.51,33.4 C-33.51,33.4 -34.4,34.81 -34.4,34.81 C-34.4,34.81 -35.9,34.81 -35.9,34.81 C-35.9,34.81 -35.01,36.22 -35.01,36.22 C-35.01,36.22 -35.45,37.81 -35.45,37.81 C-35.45,37.81 -34.04,37.28 -34.04,37.28 C-34.04,37.28 -32.72,38.25 -32.72,38.25 C-32.72,38.25 -32.81,36.58 -32.81,36.58 C-32.81,36.58 -31.48,35.6 -31.48,35.6 C-31.48,35.6 -32.98,35.08 -32.98,35.08c  M45.34 7.56 C45.34,7.56 44.81,5.97 44.81,5.97 C44.81,5.97 43.93,7.38 43.93,7.38 C43.93,7.38 42.34,7.3 42.34,7.3 C42.34,7.3 43.31,8.71 43.31,8.71 C43.31,8.71 42.87,10.29 42.87,10.29 C42.87,10.29 44.28,9.77 44.28,9.77 C44.28,9.77 45.52,10.82 45.52,10.82 C45.52,10.82 45.52,9.06 45.52,9.06 C45.52,9.06 46.76,8.09 46.76,8.09 C46.76,8.09 45.34,7.56 45.34,7.56c  M-9.59 -41.67 C-9.59,-41.67 -10.12,-43.35 -10.12,-43.35 C-10.12,-43.35 -11,-41.94 -11,-41.94 C-11,-41.94 -12.5,-41.94 -12.5,-41.94 C-12.5,-41.94 -11.62,-40.62 -11.62,-40.62 C-11.62,-40.62 -12.06,-38.94 -12.06,-38.94 C-12.06,-38.94 -10.65,-39.56 -10.65,-39.56 C-10.65,-39.56 -9.32,-38.5 -9.32,-38.5 C-9.32,-38.5 -9.41,-40.26 -9.41,-40.26 C-9.41,-40.26 -8.09,-41.23 -8.09,-41.23 C-8.09,-41.23 -9.59,-41.67 -9.59,-41.67c  M97.74 -23.97 C97.74,-23.97 97.03,-26.35 97.03,-26.35 C97.03,-26.35 95.8,-24.32 95.8,-24.32 C95.8,-24.32 93.5,-24.32 93.5,-24.32 C93.5,-24.32 94.91,-22.38 94.91,-22.38 C94.91,-22.38 94.21,-20 94.21,-20 C94.21,-20 96.33,-20.88 96.33,-20.88 C96.33,-20.88 98.09,-19.38 98.09,-19.38 C98.09,-19.38 98.09,-21.85 98.09,-21.85 C98.09,-21.85 99.86,-23.26 99.86,-23.26 C99.86,-23.26 97.74,-23.97 97.74,-23.97c  M167.29 43.28 C167.29,43.28 166.67,40.9 166.67,40.9 C166.67,40.9 165.35,42.93 165.35,42.93 C165.35,42.93 163.14,42.93 163.14,42.93 C163.14,42.93 164.47,44.87 164.47,44.87 C164.47,44.87 163.76,47.25 163.76,47.25 C163.76,47.25 165.88,46.37 165.88,46.37 C165.88,46.37 167.73,47.87 167.73,47.87 C167.73,47.87 167.65,45.4 167.65,45.4 C167.65,45.4 169.5,43.98 169.5,43.98 C169.5,43.98 167.29,43.28 167.29,43.28c  M-1.1 -1.79 C-1.1,-1.79 -1.72,-4.08 -1.72,-4.08 C-1.72,-4.08 -3.05,-2.14 -3.05,-2.14 C-3.05,-2.14 -5.25,-2.14 -5.25,-2.14 C-5.25,-2.14 -3.93,-0.11 -3.93,-0.11 C-3.93,-0.11 -4.64,2.18 -4.64,2.18 C-4.64,2.18 -2.52,1.38 -2.52,1.38 C-2.52,1.38 -0.66,2.8 -0.66,2.8 C-0.66,2.8 -0.75,0.41 -0.75,0.41 C-0.75,0.41 1.1,-1.08 1.1,-1.08 C1.1,-1.08 -1.1,-1.79 -1.1,-1.79c  M-60.89 -5.23 C-60.89,-5.23 -61.59,-7.61 -61.59,-7.61 C-61.59,-7.61 -62.83,-5.58 -62.83,-5.58 C-62.83,-5.58 -65.13,-5.58 -65.13,-5.58 C-65.13,-5.58 -63.71,-3.64 -63.71,-3.64 C-63.71,-3.64 -64.42,-1.26 -64.42,-1.26 C-64.42,-1.26 -62.39,-2.14 -62.39,-2.14 C-62.39,-2.14 -60.53,-0.64 -60.53,-0.64 C-60.53,-0.64 -60.62,-3.11 -60.62,-3.11 C-60.62,-3.11 -58.77,-4.52 -58.77,-4.52 C-58.77,-4.52 -60.89,-5.23 -60.89,-5.23c  M-165.26 -10.97 C-165.26,-10.97 -165.97,-13.35 -165.97,-13.35 C-165.97,-13.35 -167.29,-11.32 -167.29,-11.32 C-167.29,-11.32 -169.5,-11.32 -169.5,-11.32 C-169.5,-11.32 -168.18,-9.38 -168.18,-9.38 C-168.18,-9.38 -168.88,-7 -168.88,-7 C-168.88,-7 -166.76,-7.79 -166.76,-7.79 C-166.76,-7.79 -164.91,-6.38 -164.91,-6.38 C-164.91,-6.38 -165,-8.85 -165,-8.85 C-165,-8.85 -163.14,-10.26 -163.14,-10.26 C-163.14,-10.26 -165.26,-10.97 -165.26,-10.97c  M-51.26 -42.98 C-51.26,-42.98 -54.09,-45.01 -54.09,-45.01 C-54.09,-45.01 -53.91,-41.57 -53.91,-41.57 C-53.91,-41.57 -56.65,-39.54 -56.65,-39.54 C-56.65,-39.54 -53.38,-38.57 -53.38,-38.57 C-53.38,-38.57 -52.32,-35.3 -52.32,-35.3 C-52.32,-35.3 -50.38,-38.13 -50.38,-38.13 C-50.38,-38.13 -46.94,-38.22 -46.94,-38.22 C-46.94,-38.22 -49.05,-40.86 -49.05,-40.86 C-49.05,-40.86 -47.99,-44.21 -47.99,-44.21 C-47.99,-44.21 -51.26,-42.98 -51.26,-42.98c  M-92.06 -47.92 C-92.06,-47.92 -92.59,-49.59 -92.59,-49.59 C-92.59,-49.59 -93.47,-48.18 -93.47,-48.18 C-93.47,-48.18 -95.06,-48.18 -95.06,-48.18 C-95.06,-48.18 -94.09,-46.86 -94.09,-46.86 C-94.09,-46.86 -94.53,-45.18 -94.53,-45.18 C-94.53,-45.18 -93.12,-45.8 -93.12,-45.8 C-93.12,-45.8 -91.88,-44.74 -91.88,-44.74 C-91.88,-44.74 -91.88,-46.42 -91.88,-46.42 C-91.88,-46.42 -90.65,-47.47 -90.65,-47.47 C-90.65,-47.47 -92.06,-47.92 -92.06,-47.92c  M62.83 -13.34 C62.83,-13.34 62.39,-14.93 62.39,-14.93 C62.39,-14.93 61.5,-13.52 61.5,-13.52 C61.5,-13.52 59.91,-13.52 59.91,-13.52 C59.91,-13.52 60.89,-12.2 60.89,-12.2 C60.89,-12.2 60.36,-10.52 60.36,-10.52 C60.36,-10.52 61.86,-11.14 61.86,-11.14 C61.86,-11.14 63.09,-10.08 63.09,-10.08 C63.09,-10.08 63.09,-11.84 63.09,-11.84 C63.09,-11.84 64.33,-12.81 64.33,-12.81 C64.33,-12.81 62.83,-13.34 62.83,-13.34c  M-155.99 -40.95 C-155.99,-40.95 -156.43,-42.54 -156.43,-42.54 C-156.43,-42.54 -157.32,-41.13 -157.32,-41.13 C-157.32,-41.13 -158.91,-41.21 -158.91,-41.21 C-158.91,-41.21 -157.93,-39.8 -157.93,-39.8 C-157.93,-39.8 -158.46,-38.22 -158.46,-38.22 C-158.46,-38.22 -156.96,-38.74 -156.96,-38.74 C-156.96,-38.74 -155.73,-37.69 -155.73,-37.69 C-155.73,-37.69 -155.73,-39.45 -155.73,-39.45 C-155.73,-39.45 -154.49,-40.42 -154.49,-40.42 C-154.49,-40.42 -155.99,-40.95 -155.99,-40.95c  M141.24 26.52 C141.24,26.52 140.71,24.85 140.71,24.85 C140.71,24.85 139.83,26.26 139.83,26.26 C139.83,26.26 138.33,26.26 138.33,26.26 C138.33,26.26 139.21,27.67 139.21,27.67 C139.21,27.67 138.77,29.26 138.77,29.26 C138.77,29.26 140.18,28.73 140.18,28.73 C140.18,28.73 141.51,29.7 141.51,29.7 C141.51,29.7 141.42,28.02 141.42,28.02 C141.42,28.02 142.74,27.05 142.74,27.05 C142.74,27.05 141.24,26.52 141.24,26.52c  M111.4 -51.27 C111.4,-51.27 110.95,-52.94 110.95,-52.94 C110.95,-52.94 110.07,-51.53 110.07,-51.53 C110.07,-51.53 108.48,-51.53 108.48,-51.53 C108.48,-51.53 109.45,-50.21 109.45,-50.21 C109.45,-50.21 108.92,-48.53 108.92,-48.53 C108.92,-48.53 110.42,-49.15 110.42,-49.15 C110.42,-49.15 111.66,-48.09 111.66,-48.09 C111.66,-48.09 111.66,-49.86 111.66,-49.86 C111.66,-49.86 112.9,-50.83 112.9,-50.83 C112.9,-50.83 111.4,-51.27 111.4,-51.27c  M-66.59 53.33 C-66.59,53.33 -67.03,51.65 -67.03,51.65 C-67.03,51.65 -67.91,53.06 -67.91,53.06 C-67.91,53.06 -69.5,53.06 -69.5,53.06 C-69.5,53.06 -68.53,54.47 -68.53,54.47 C-68.53,54.47 -69.06,56.06 -69.06,56.06 C-69.06,56.06 -67.56,55.53 -67.56,55.53 C-67.56,55.53 -66.32,56.5 -66.32,56.5 C-66.32,56.5 -66.32,54.82 -66.32,54.82 C-66.32,54.82 -65.08,53.77 -65.08,53.77 C-65.08,53.77 -66.59,53.33 -66.59,53.33c  M-50.59 59.33 C-50.59,59.33 -51.12,57.65 -51.12,57.65 C-51.12,57.65 -52,59.06 -52,59.06 C-52,59.06 -53.5,59.06 -53.5,59.06 C-53.5,59.06 -52.62,60.38 -52.62,60.38 C-52.62,60.38 -53.06,62.06 -53.06,62.06 C-53.06,62.06 -51.65,61.53 -51.65,61.53 C-51.65,61.53 -50.32,62.5 -50.32,62.5 C-50.32,62.5 -50.41,60.82 -50.41,60.82 C-50.41,60.82 -49.08,59.77 -49.08,59.77 C-49.08,59.77 -50.59,59.33 -50.59,59.33c  M29.98 -16.08 C29.98,-16.08 29.27,-18.46 29.27,-18.46 C29.27,-18.46 27.95,-16.43 27.95,-16.43 C27.95,-16.43 25.74,-16.43 25.74,-16.43 C25.74,-16.43 27.06,-14.49 27.06,-14.49 C27.06,-14.49 26.36,-12.11 26.36,-12.11 C26.36,-12.11 28.48,-12.9 28.48,-12.9 C28.48,-12.9 30.33,-11.49 30.33,-11.49 C30.33,-11.49 30.24,-13.96 30.24,-13.96 C30.24,-13.96 32.1,-15.37 32.1,-15.37 C32.1,-15.37 29.98,-16.08 29.98,-16.08c  M81.28 55.98 C81.28,55.98 80.58,53.6 80.58,53.6 C80.58,53.6 79.25,55.63 79.25,55.63 C79.25,55.63 77.04,55.63 77.04,55.63 C77.04,55.63 78.37,57.57 78.37,57.57 C78.37,57.57 77.66,59.95 77.66,59.95 C77.66,59.95 79.78,59.07 79.78,59.07 C79.78,59.07 81.64,60.56 81.64,60.56 C81.64,60.56 81.55,58.1 81.55,58.1 C81.55,58.1 83.4,56.68 83.4,56.68 C83.4,56.68 81.28,55.98 81.28,55.98c  M-165.26 -10.97 C-165.26,-10.97 -165.97,-13.35 -165.97,-13.35 C-165.97,-13.35 -167.29,-11.32 -167.29,-11.32 C-167.29,-11.32 -169.5,-11.32 -169.5,-11.32 C-169.5,-11.32 -168.18,-9.38 -168.18,-9.38 C-168.18,-9.38 -168.88,-7 -168.88,-7 C-168.88,-7 -166.76,-7.79 -166.76,-7.79 C-166.76,-7.79 -164.91,-6.38 -164.91,-6.38 C-164.91,-6.38 -165,-8.85 -165,-8.85 C-165,-8.85 -163.14,-10.26 -163.14,-10.26 C-163.14,-10.26 -165.26,-10.97 -165.26,-10.97c  M-74.05 21.76 C-74.05,21.76 -74.66,19.47 -74.66,19.47 C-74.66,19.47 -75.99,21.49 -75.99,21.49 C-75.99,21.49 -78.2,21.41 -78.2,21.41 C-78.2,21.41 -76.87,23.43 -76.87,23.43 C-76.87,23.43 -77.58,25.73 -77.58,25.73 C-77.58,25.73 -75.46,24.93 -75.46,24.93 C-75.46,24.93 -73.6,26.43 -73.6,26.43 C-73.6,26.43 -73.69,23.96 -73.69,23.96 C-73.69,23.96 -71.84,22.46 -71.84,22.46 C-71.84,22.46 -74.05,21.76 -74.05,21.76c  M8.98 55.68 C8.98,55.68 6.15,53.65 6.15,53.65 C6.15,53.65 6.24,57.09 6.24,57.09 C6.24,57.09 3.5,59.12 3.5,59.12 C3.5,59.12 6.86,60.09 6.86,60.09 C6.86,60.09 7.92,63.35 7.92,63.35 C7.92,63.35 9.86,60.44 9.86,60.44 C9.86,60.44 13.3,60.44 13.3,60.44 C13.3,60.44 11.18,57.71 11.18,57.71 C11.18,57.71 12.15,54.44 12.15,54.44 C12.15,54.44 8.98,55.68 8.98,55.68c  M124.89 -2.41 C124.89,-2.41 122.06,-4.35 122.06,-4.35 C122.06,-4.35 122.24,-0.91 122.24,-0.91 C122.24,-0.91 119.5,1.12 119.5,1.12 C119.5,1.12 122.77,2 122.77,2 C122.77,2 123.83,5.26 123.83,5.26 C123.83,5.26 125.77,2.44 125.77,2.44 C125.77,2.44 129.21,2.44 129.21,2.44 C129.21,2.44 127.09,-0.29 127.09,-0.29 C127.09,-0.29 128.15,-3.56 128.15,-3.56 C128.15,-3.56 124.89,-2.41 124.89,-2.41c  M77.31 19.91 C77.31,19.91 74.57,17.88 74.57,17.88 C74.57,17.88 74.66,21.32 74.66,21.32 C74.66,21.32 71.92,23.35 71.92,23.35 C71.92,23.35 75.19,24.32 75.19,24.32 C75.19,24.32 76.34,27.58 76.34,27.58 C76.34,27.58 78.19,24.67 78.19,24.67 C78.19,24.67 81.64,24.67 81.64,24.67 C81.64,24.67 79.52,21.94 79.52,21.94 C79.52,21.94 80.58,18.67 80.58,18.67 C80.58,18.67 77.31,19.91 77.31,19.91c  M-28.11 7.68 C-28.11,7.68 -30.94,5.65 -30.94,5.65 C-30.94,5.65 -30.76,9.09 -30.76,9.09 C-30.76,9.09 -33.5,11.12 -33.5,11.12 C-33.5,11.12 -30.23,12.09 -30.23,12.09 C-30.23,12.09 -29.17,15.35 -29.17,15.35 C-29.17,15.35 -27.23,12.44 -27.23,12.44 C-27.23,12.44 -23.79,12.44 -23.79,12.44 C-23.79,12.44 -25.91,9.71 -25.91,9.71 C-25.91,9.71 -24.85,6.44 -24.85,6.44 C-24.85,6.44 -28.11,7.68 -28.11,7.68c  M-119.43 -20.22 C-119.43,-20.22 -122.26,-22.16 -122.26,-22.16 C-122.26,-22.16 -122.08,-18.72 -122.08,-18.72 C-122.08,-18.72 -124.82,-16.7 -124.82,-16.7 C-124.82,-16.7 -121.55,-15.81 -121.55,-15.81 C-121.55,-15.81 -120.49,-12.55 -120.49,-12.55 C-120.49,-12.55 -118.55,-15.37 -118.55,-15.37 C-118.55,-15.37 -115.11,-15.37 -115.11,-15.37 C-115.11,-15.37 -117.23,-18.11 -117.23,-18.11 C-117.23,-18.11 -116.17,-21.37 -116.17,-21.37 C-116.17,-21.37 -119.43,-20.22 -119.43,-20.22c "/>
+                            </group>
+                        </group>
+                        <group android:name="_R_G_L_1_G_L_2_G">
+                            <group android:name="_R_G_L_1_G_L_2_G_L_2_G" android:translateX="206" android:translateY="145">
+                                <path android:name="_R_G_L_1_G_L_2_G_L_2_G_D_0_P_0" android:fillColor="#e8eaed" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -95.63 C206,-95.63 206,42.37 206,42.37 C206,43.47 205.1,44.37 204,44.37 C204,44.37 -204,44.37 -204,44.37 C-205.1,44.37 -206,43.47 -206,42.37 C-206,42.37 -206,-95.63 -206,-95.63 C-206,-96.73 -205.1,-97.63 -204,-97.63 C-204,-97.63 204,-97.63 204,-97.63 C205.1,-97.63 206,-96.73 206,-95.63c "/>
+                            </group>
+                            <group android:name="_R_G_L_1_G_L_2_G_L_1_G" android:translateX="206" android:translateY="145">
+                                <path android:name="_R_G_L_1_G_L_2_G_L_1_G_D_0_P_0" android:fillColor="#80868b" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M109 -14 C109,-14 109,14 109,14 C109,15.1 108.1,16 107,16 C107,16 -107,16 -107,16 C-108.1,16 -109,15.1 -109,14 C-109,14 -109,-14 -109,-14 C-109,-15.1 -108.1,-16 -107,-16 C-107,-16 107,-16 107,-16 C108.1,-16 109,-15.1 109,-14c "/>
+                            </group>
+                            <group android:name="_R_G_L_1_G_L_2_G_L_0_G" android:translateX="46" android:translateY="145">
+                                <path android:name="_R_G_L_1_G_L_2_G_L_0_G_D_0_P_0" android:fillColor="#80868b" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M22 -14 C22,-14 22,14 22,14 C22,18.42 18.42,22 14,22 C14,22 -14,22 -14,22 C-18.42,22 -22,18.42 -22,14 C-22,14 -22,-14 -22,-14 C-22,-18.42 -18.42,-22 -14,-22 C-14,-22 14,-22 14,-22 C18.42,-22 22,-18.42 22,-14c "/>
+                            </group>
+                        </group>
+                        <group android:name="_R_G_L_1_G_L_1_G" android:translateX="206" android:translateY="877">
+                            <path android:name="_R_G_L_1_G_L_1_G_D_0_P_0" android:fillColor="#373737" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M40 0 C40,0 40,0 40,0 C40,1.1 39.1,2 38,2 C38,2 -38,2 -38,2 C-39.1,2 -40,1.1 -40,0 C-40,0 -40,0 -40,0 C-40,-1.1 -39.1,-2 -38,-2 C-38,-2 38,-2 38,-2 C39.1,-2 40,-1.1 40,0c "/>
+                        </group>
+                        <group android:name="_R_G_L_1_G_L_0_G">
+                            <group android:name="_R_G_L_1_G_L_0_G_L_2_G" android:translateX="206" android:translateY="51">
+                                <path android:name="_R_G_L_1_G_L_0_G_L_2_G_D_0_P_0" android:fillColor="#202124" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -0.27 C206,-0.27 206,49.73 206,49.73 C206,49.73 -206,49.73 -206,49.73 C-206,49.73 -206,-0.27 -206,-0.27 C-206,-0.27 206,-0.27 206,-0.27c "/>
+                            </group>
+                            <group android:name="_R_G_L_1_G_L_0_G_L_1_G" android:translateX="206" android:translateY="50.5">
+                                <path android:name="_R_G_L_1_G_L_0_G_L_1_G_D_0_P_0" android:fillColor="#202124" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -32.5 C206,-32.5 206,32.5 206,32.5 C206,42.43 197.93,50.5 188,50.5 C188,50.5 -188,50.5 -188,50.5 C-197.93,50.5 -206,42.43 -206,32.5 C-206,32.5 -206,-32.5 -206,-32.5 C-206,-42.43 -197.93,-50.5 -188,-50.5 C-188,-50.5 188,-50.5 188,-50.5 C197.93,-50.5 206,-42.43 206,-32.5c "/>
+                            </group>
+                            <group android:name="_R_G_L_1_G_L_0_G_L_0_G" android:translateX="206" android:translateY="66.5">
+                                <path android:name="_R_G_L_1_G_L_0_G_L_0_G_D_0_P_0" android:fillColor="#3c4043" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M190 0 C190,0 190,0 190,0 C190,10.21 181.71,18.5 171.5,18.5 C171.5,18.5 -171.5,18.5 -171.5,18.5 C-181.71,18.5 -190,10.21 -190,0 C-190,0 -190,0 -190,0 C-190,-10.21 -181.71,-18.5 -171.5,-18.5 C-171.5,-18.5 171.5,-18.5 171.5,-18.5 C181.71,-18.5 190,-10.21 190,0c "/>
+                            </group>
+                        </group>
+                    </group>
+                </group>
+                <group android:name="_R_G_L_0_G" android:translateX="-30" android:translateY="658.997" android:pivotX="300" android:pivotY="64" android:rotation="-90" android:scaleY="0">
+                    <group android:name="_R_G_L_0_G_L_2_G" android:translateX="295.995" android:translateY="63.997" android:scaleY="0">
+                        <path android:name="_R_G_L_0_G_L_2_G_D_0_P_0" android:fillColor="#baf29d" android:fillAlpha="0.3" android:fillType="nonZero" android:pathData=" M-166 64 C-130.65,64 -102,35.35 -102,0 C-102,-35.34 -130.65,-64 -166,-64 C-201.34,-64 -230,-35.34 -230,0 C-230,35.35 -201.34,64 -166,64c "/>
+                    </group>
+                    <group android:name="_R_G_L_0_G_L_1_G" android:translateX="192" android:translateY="63.997" android:rotation="90" android:scaleX="-1" android:scaleY="0">
+                        <path android:name="_R_G_L_0_G_L_1_G_D_0_P_0" android:fillColor="#baf29d" android:fillAlpha="0.3" android:fillType="nonZero" android:pathData=" M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c "/>
+                    </group>
+                    <group android:name="_R_G_L_0_G_L_0_G" android:translateX="295.995" android:translateY="63.997" android:scaleY="0">
+                        <group android:name="_R_G_L_0_G_L_0_G_D_0_P_0_G_0_T_0" android:translateX="-166" android:translateY="0">
+                            <path android:name="_R_G_L_0_G_L_0_G_D_0_P_0" android:fillColor="#baf29d" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 64 C35.35,64 64,35.35 64,0 C64,-35.34 35.35,-64 0,-64 C-35.34,-64 -64,-35.34 -64,0 C-64,35.35 -35.34,64 0,64c "/>
+                        </group>
+                    </group>
+                </group>
+            </group>
+            <group android:name="time_group"/>
+        </vector>
+    </aapt:attr>
+    <target android:name="_R_G_L_2_G_L_5_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1917" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_4_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="translateXY" android:duration="50" android:startOffset="1917" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 206,776C 206,776 206,776 206,776">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.27,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="translateXY" android:duration="700" android:startOffset="1967" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 206,776C 206,776 206,797 206,797">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.27,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_4_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1967" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_3_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="translateXY" android:duration="700" android:startOffset="1917" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 56,673C 56,673 56,706 56,706">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.27,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_3_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1917" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="translateXY" android:duration="700" android:startOffset="1917" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 156,673C 156,673 156,706 156,706">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.27,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1917" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="translateXY" android:duration="700" android:startOffset="1917" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 256,673C 256,673 256,706 256,706">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.27,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1917" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="translateXY" android:duration="700" android:startOffset="1917" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 356,673C 356,673 356,706 356,706">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.27,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1917" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1917" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_N_1_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="translateXY" android:duration="1533" android:startOffset="0" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 206,446C 206,446 206,446 206,446">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.477,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="translateXY" android:duration="317" android:startOffset="1533" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 206,446C 206,446 206,354.603 206,354.603">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.477,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="translateXY" android:duration="300" android:startOffset="1850" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 206,354.603C 206,354.603 206,639 206,639">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.531,0.542 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_N_1_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleX" android:duration="1533" android:startOffset="0" android:valueFrom="1" android:valueTo="1" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,0.833 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleY" android:duration="1533" android:startOffset="0" android:valueFrom="1" android:valueTo="1" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,0.833 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleX" android:duration="617" android:startOffset="1533" android:valueFrom="1" android:valueTo="0.16" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,0.833 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleY" android:duration="617" android:startOffset="1533" android:valueFrom="1" android:valueTo="0.16" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,0.833 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="600" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1550" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_1_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="pathData" android:duration="217" android:startOffset="1317" android:valueFrom="M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c " android:valueTo="M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c " android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.508,0 0.487,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="pathData" android:duration="383" android:startOffset="1533" android:valueFrom="M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c " android:valueTo="M-0.01 363.74 C35.34,363.74 63.99,335.09 63.99,299.75 C63.99,299.75 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64.01,299.75 -64.01,299.75 C-64.01,335.09 -35.35,363.74 -0.01,363.74c " android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.508,0 0.487,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1550" android:valueFrom="0" android:valueTo="-1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2050" android:valueFrom="-1" android:valueTo="0" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_0_G_D_0_P_0_G_0_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="translateXY" android:duration="217" android:startOffset="1317" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -166,0C -105.667,0 -226.333,0 -166,0">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.508,0 0.487,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="translateXY" android:duration="383" android:startOffset="1533" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -166,0C -105.667,0 135.667,0 196,0">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.508,0 0.487,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="600" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2050" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1317" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2050" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="translateX" android:duration="4017" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+</animated-vector>
diff --git a/quickstep/res/drawable/gesture_tutorial_overview.xml b/quickstep/res/drawable/gesture_tutorial_overview.xml
new file mode 100644
index 0000000000..c4ca72f5a1
--- /dev/null
+++ b/quickstep/res/drawable/gesture_tutorial_overview.xml
@@ -0,0 +1,823 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt">
+    <aapt:attr name="android:drawable">
+        <vector android:height="892dp" android:width="412dp" android:viewportHeight="892" android:viewportWidth="412">
+            <group android:name="_R_G">
+                <group android:name="_R_G_L_7_G" android:translateX="206" android:translateY="446">
+                    <path android:name="_R_G_L_7_G_D_0_P_0" android:fillColor="#666666" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c "/>
+                </group>
+                <group android:name="_R_G_L_6_G">
+                    <path android:name="_R_G_L_6_G_S" android:fillColor="#000000" android:pathData="M0,0 L412,0 L412,892 L0,892z"/>
+                </group>
+                <group android:name="_R_G_L_5_G" android:translateX="206" android:translateY="877">
+                    <path android:name="_R_G_L_5_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M40 0 C40,0 40,0 40,0 C40,1.1 39.1,2 38,2 C38,2 -38,2 -38,2 C-39.1,2 -40,1.1 -40,0 C-40,0 -40,0 -40,0 C-40,-1.1 -39.1,-2 -38,-2 C-38,-2 38,-2 38,-2 C39.1,-2 40,-1.1 40,0c "/>
+                </group>
+                <group android:name="_R_G_L_4_G_N_7_T_0" android:translateX="206" android:translateY="446" android:scaleX="1" android:scaleY="1">
+                    <group android:name="_R_G_L_4_G" android:translateX="-206" android:translateY="-446">
+                        <group android:name="_R_G_L_4_G_L_4_G">
+                            <group android:name="_R_G_L_4_G_L_4_G_L_11_G" android:translateX="206" android:translateY="467">
+                                <path android:name="_R_G_L_4_G_L_4_G_L_11_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -407 C206,-407 206,407 206,407 C206,416.93 197.93,425 188,425 C188,425 -188,425 -188,425 C-197.93,425 -206,416.93 -206,407 C-206,407 -206,-407 -206,-407 C-206,-416.93 -197.93,-425 -188,-425 C-188,-425 188,-425 188,-425 C197.93,-425 206,-416.93 206,-407c "/>
+                            </group>
+                            <group android:name="_R_G_L_4_G_L_4_G_L_10_G" android:translateX="182.5" android:translateY="831">
+                                <path android:name="_R_G_L_4_G_L_4_G_L_10_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M158.5 -7 C158.5,-7 158.5,7 158.5,7 C158.5,9.21 156.71,11 154.5,11 C154.5,11 -154.5,11 -154.5,11 C-156.71,11 -158.5,9.21 -158.5,7 C-158.5,7 -158.5,-7 -158.5,-7 C-158.5,-9.21 -156.71,-11 -154.5,-11 C-154.5,-11 154.5,-11 154.5,-11 C156.71,-11 158.5,-9.21 158.5,-7c "/>
+                            </group>
+                            <group android:name="_R_G_L_4_G_L_4_G_L_9_G" android:translateX="186" android:translateY="801">
+                                <path android:name="_R_G_L_4_G_L_4_G_L_9_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M162 -7 C162,-7 162,7 162,7 C162,9.21 160.21,11 158,11 C158,11 -158,11 -158,11 C-160.21,11 -162,9.21 -162,7 C-162,7 -162,-7 -162,-7 C-162,-9.21 -160.21,-11 -158,-11 C-158,-11 158,-11 158,-11 C160.21,-11 162,-9.21 162,-7c "/>
+                            </group>
+                            <group android:name="_R_G_L_4_G_L_4_G_L_8_G" android:translateX="119" android:translateY="755">
+                                <path android:name="_R_G_L_4_G_L_4_G_L_8_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M95 -7 C95,-7 95,7 95,7 C95,9.21 93.21,11 91,11 C91,11 -91,11 -91,11 C-93.21,11 -95,9.21 -95,7 C-95,7 -95,-7 -95,-7 C-95,-9.21 -93.21,-11 -91,-11 C-91,-11 91,-11 91,-11 C93.21,-11 95,-9.21 95,-7c "/>
+                            </group>
+                            <group android:name="_R_G_L_4_G_L_4_G_L_7_G" android:translateX="182.5" android:translateY="725">
+                                <path android:name="_R_G_L_4_G_L_4_G_L_7_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M158.5 -7 C158.5,-7 158.5,7 158.5,7 C158.5,9.21 156.71,11 154.5,11 C154.5,11 -154.5,11 -154.5,11 C-156.71,11 -158.5,9.21 -158.5,7 C-158.5,7 -158.5,-7 -158.5,-7 C-158.5,-9.21 -156.71,-11 -154.5,-11 C-154.5,-11 154.5,-11 154.5,-11 C156.71,-11 158.5,-9.21 158.5,-7c "/>
+                            </group>
+                            <group android:name="_R_G_L_4_G_L_4_G_L_6_G" android:translateX="197.5" android:translateY="695">
+                                <path android:name="_R_G_L_4_G_L_4_G_L_6_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M173.5 -7 C173.5,-7 173.5,7 173.5,7 C173.5,9.21 171.71,11 169.5,11 C169.5,11 -169.5,11 -169.5,11 C-171.71,11 -173.5,9.21 -173.5,7 C-173.5,7 -173.5,-7 -173.5,-7 C-173.5,-9.21 -171.71,-11 -169.5,-11 C-169.5,-11 169.5,-11 169.5,-11 C171.71,-11 173.5,-9.21 173.5,-7c "/>
+                            </group>
+                            <group android:name="_R_G_L_4_G_L_4_G_L_5_G" android:translateX="192" android:translateY="665">
+                                <path android:name="_R_G_L_4_G_L_4_G_L_5_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M168 -7 C168,-7 168,7 168,7 C168,9.21 166.21,11 164,11 C164,11 -164,11 -164,11 C-166.21,11 -168,9.21 -168,7 C-168,7 -168,-7 -168,-7 C-168,-9.21 -166.21,-11 -164,-11 C-164,-11 164,-11 164,-11 C166.21,-11 168,-9.21 168,-7c "/>
+                            </group>
+                            <group android:name="_R_G_L_4_G_L_4_G_L_4_G" android:translateX="105.5" android:translateY="360">
+                                <path android:name="_R_G_L_4_G_L_4_G_L_4_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M23.5 -2 C23.5,-2 23.5,2 23.5,2 C23.5,4.21 21.71,6 19.5,6 C19.5,6 -19.5,6 -19.5,6 C-21.71,6 -23.5,4.21 -23.5,2 C-23.5,2 -23.5,-2 -23.5,-2 C-23.5,-4.21 -21.71,-6 -19.5,-6 C-19.5,-6 19.5,-6 19.5,-6 C21.71,-6 23.5,-4.21 23.5,-2c "/>
+                            </group>
+                            <group android:name="_R_G_L_4_G_L_4_G_L_3_G" android:translateX="47.5" android:translateY="360">
+                                <path android:name="_R_G_L_4_G_L_4_G_L_3_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M23.5 -2 C23.5,-2 23.5,2 23.5,2 C23.5,4.21 21.71,6 19.5,6 C19.5,6 -19.5,6 -19.5,6 C-21.71,6 -23.5,4.21 -23.5,2 C-23.5,2 -23.5,-2 -23.5,-2 C-23.5,-4.21 -21.71,-6 -19.5,-6 C-19.5,-6 19.5,-6 19.5,-6 C21.71,-6 23.5,-4.21 23.5,-2c "/>
+                            </group>
+                            <group android:name="_R_G_L_4_G_L_4_G_L_2_G" android:translateX="142.5" android:translateY="328">
+                                <path android:name="_R_G_L_4_G_L_4_G_L_2_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M118.5 -14 C118.5,-14 118.5,14 118.5,14 C118.5,16.21 116.71,18 114.5,18 C114.5,18 -114.5,18 -114.5,18 C-116.71,18 -118.5,16.21 -118.5,14 C-118.5,14 -118.5,-14 -118.5,-14 C-118.5,-16.21 -116.71,-18 -114.5,-18 C-114.5,-18 114.5,-18 114.5,-18 C116.71,-18 118.5,-16.21 118.5,-14c "/>
+                            </group>
+                            <group android:name="_R_G_L_4_G_L_4_G_L_1_G" android:translateX="186" android:translateY="284">
+                                <path android:name="_R_G_L_4_G_L_4_G_L_1_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M162 -14 C162,-14 162,14 162,14 C162,16.21 160.21,18 158,18 C158,18 -158,18 -158,18 C-160.21,18 -162,16.21 -162,14 C-162,14 -162,-14 -162,-14 C-162,-16.21 -160.21,-18 -158,-18 C-158,-18 158,-18 158,-18 C160.21,-18 162,-16.21 162,-14c "/>
+                            </group>
+                            <group android:name="_R_G_L_4_G_L_4_G_L_0_G" android:translateX="155" android:translateY="240">
+                                <path android:name="_R_G_L_4_G_L_4_G_L_0_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M131 -14 C131,-14 131,14 131,14 C131,16.21 129.21,18 127,18 C127,18 -127,18 -127,18 C-129.21,18 -131,16.21 -131,14 C-131,14 -131,-14 -131,-14 C-131,-16.21 -129.21,-18 -127,-18 C-127,-18 127,-18 127,-18 C129.21,-18 131,-16.21 131,-14c "/>
+                            </group>
+                        </group>
+                        <group android:name="_R_G_L_4_G_L_3_G" android:translateX="24" android:translateY="390">
+                            <group android:name="_R_G_L_4_G_L_3_G_L_7_G" android:translateX="182" android:translateY="120"/>
+                            <group android:name="_R_G_L_4_G_L_3_G_L_6_G" android:translateX="182" android:translateY="120">
+                                <path android:name="_R_G_L_4_G_L_3_G_L_6_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M182 -116 C182,-116 182,116 182,116 C182,118.21 180.21,120 178,120 C178,120 -178,120 -178,120 C-180.21,120 -182,118.21 -182,116 C-182,116 -182,-116 -182,-116 C-182,-118.21 -180.21,-120 -178,-120 C-178,-120 178,-120 178,-120 C180.21,-120 182,-118.21 182,-116c "/>
+                            </group>
+                            <group android:name="_R_G_L_4_G_L_3_G_L_5_G" android:translateX="77.322" android:translateY="150.552">
+                                <path android:name="_R_G_L_4_G_L_3_G_L_5_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 20.61 C0,20.61 -10.39,8.69 -10.39,8.69  M0 -6.11 C0,-6.11 -6.78,-15.61 -6.78,-15.61  M0 33.64 C0,33.64 8.26,17.67 8.26,17.67  M0 7.58 C0,7.58 8.26,-7.73 8.26,-7.73  M0 71.19 C0,71.19 0,-18.04 0,-18.04  M-30.22 37.18 C-30.22,37.18 0,-71.19 0,-71.19 C0,-71.19 30.22,37.18 30.22,37.18 C30.22,37.18 -30.22,37.18 -30.22,37.18c "/>
+                                <path android:name="_R_G_L_4_G_L_3_G_L_5_G_D_1_P_0" android:strokeColor="#9adcb2" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M0 20.61 C0,20.61 -10.39,8.69 -10.39,8.69  M0 -6.11 C0,-6.11 -6.78,-15.61 -6.78,-15.61  M0 33.64 C0,33.64 8.26,17.67 8.26,17.67  M0 7.58 C0,7.58 8.26,-7.73 8.26,-7.73  M0 71.19 C0,71.19 0,-18.04 0,-18.04  M-30.22 37.18 C-30.22,37.18 0,-71.19 0,-71.19 C0,-71.19 30.22,37.18 30.22,37.18 C30.22,37.18 -30.22,37.18 -30.22,37.18c "/>
+                            </group>
+                            <group android:name="_R_G_L_4_G_L_3_G_L_4_G" android:translateX="38.772" android:translateY="121.73">
+                                <path android:name="_R_G_L_4_G_L_3_G_L_4_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 28.82 C0,28.82 -14.52,12.18 -14.52,12.18  M0 -8.58 C0,-8.58 -9.51,-21.75 -9.51,-21.75  M0 47.01 C0,47.01 11.57,24.7 11.57,24.7  M0 10.64 C0,10.64 11.57,-10.78 11.57,-10.78  M0 99.42 C0,99.42 0,-25.21 0,-25.21  M-31.92 51.94 C-31.92,51.94 0,-99.42 0,-99.42 C0,-99.42 31.92,51.94 31.92,51.94 C31.92,51.94 -31.92,51.94 -31.92,51.94c "/>
+                                <path android:name="_R_G_L_4_G_L_3_G_L_4_G_D_1_P_0" android:strokeColor="#9adcb2" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M0 28.82 C0,28.82 -14.52,12.18 -14.52,12.18  M0 -8.58 C0,-8.58 -9.51,-21.75 -9.51,-21.75  M0 47.01 C0,47.01 11.57,24.7 11.57,24.7  M0 10.64 C0,10.64 11.57,-10.78 11.57,-10.78  M0 99.42 C0,99.42 0,-25.21 0,-25.21  M-31.92 51.94 C-31.92,51.94 0,-99.42 0,-99.42 C0,-99.42 31.92,51.94 31.92,51.94 C31.92,51.94 -31.92,51.94 -31.92,51.94c "/>
+                            </group>
+                            <group android:name="_R_G_L_4_G_L_3_G_L_3_G" android:translateX="183" android:translateY="222">
+                                <path android:name="_R_G_L_4_G_L_3_G_L_3_G_D_0_P_0" android:fillColor="#000000" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M170 0 C170,0 -170,0 -170,0 "/>
+                                <path android:name="_R_G_L_4_G_L_3_G_L_3_G_D_1_P_0" android:strokeColor="#9aa0a6" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="4" android:strokeAlpha="1" android:pathData=" M170 0 C170,0 -170,0 -170,0 "/>
+                            </group>
+                            <group android:name="_R_G_L_4_G_L_3_G_L_2_G" android:translateX="265.619" android:translateY="162.331">
+                                <path android:name="_R_G_L_4_G_L_3_G_L_2_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M-34.05 50.06 C-34.05,50.06 -34.05,-49.25 -34.05,-49.25  M-34.05 -49.55 C-34.05,-49.55 17.54,50.06 17.54,50.06 C17.54,50.06 84.62,50.06 84.62,50.06 C84.62,50.06 32.65,-50.06 32.65,-50.06 C32.65,-50.06 -34.05,-50.06 -34.05,-50.06 C-34.05,-50.06 -84.62,50.06 -84.62,50.06 C-84.62,50.06 17.54,50.06 17.54,50.06 "/>
+                                <path android:name="_R_G_L_4_G_L_3_G_L_2_G_D_1_P_0" android:strokeColor="#a8cbfe" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M-34.05 50.06 C-34.05,50.06 -34.05,-49.25 -34.05,-49.25  M-34.05 -49.55 C-34.05,-49.55 17.54,50.06 17.54,50.06 C17.54,50.06 84.62,50.06 84.62,50.06 C84.62,50.06 32.65,-50.06 32.65,-50.06 C32.65,-50.06 -34.05,-50.06 -34.05,-50.06 C-34.05,-50.06 -84.62,50.06 -84.62,50.06 C-84.62,50.06 17.54,50.06 17.54,50.06 "/>
+                            </group>
+                            <group android:name="_R_G_L_4_G_L_3_G_L_1_G" android:translateX="319.271" android:translateY="37.945">
+                                <path android:name="_R_G_L_4_G_L_3_G_L_1_G_D_0_P_0" android:fillColor="#feefc3" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M13.42 2.99 C14.95,-4.17 9.93,-11.31 2.21,-12.96 C-0.9,-13.62 -3.97,-13.3 -6.64,-12.2 C-6.58,-12.19 -6.53,-12.18 -6.48,-12.17 C-1.03,-11.01 2.52,-5.97 1.44,-0.92 C0.36,4.13 -4.94,7.28 -10.4,6.12 C-11.6,5.86 -12.7,5.42 -13.69,4.83 C-11.9,8.78 -8.15,11.93 -3.34,12.96 C4.38,14.61 11.88,10.14 13.42,2.99c "/>
+                            </group>
+                            <group android:name="_R_G_L_4_G_L_3_G_L_0_G" android:translateX="179.5" android:translateY="73.351">
+                                <path android:name="_R_G_L_4_G_L_3_G_L_0_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M51.08 -40.95 C51.08,-40.95 50.55,-42.54 50.55,-42.54 C50.55,-42.54 49.67,-41.13 49.67,-41.13 C49.67,-41.13 48.17,-41.21 48.17,-41.21 C48.17,-41.21 49.05,-39.8 49.05,-39.8 C49.05,-39.8 48.61,-38.22 48.61,-38.22 C48.61,-38.22 50.02,-38.74 50.02,-38.74 C50.02,-38.74 51.35,-37.69 51.35,-37.69 C51.35,-37.69 51.26,-39.45 51.26,-39.45 C51.26,-39.45 52.59,-40.42 52.59,-40.42 C52.59,-40.42 51.08,-40.95 51.08,-40.95c  M8.78 30.58 C8.78,30.58 8.25,28.99 8.25,28.99 C8.25,28.99 7.37,30.4 7.37,30.4 C7.37,30.4 5.87,30.31 5.87,30.31 C5.87,30.31 6.75,31.72 6.75,31.72 C6.75,31.72 6.31,33.31 6.31,33.31 C6.31,33.31 7.72,32.78 7.72,32.78 C7.72,32.78 9.05,33.84 9.05,33.84 C9.05,33.84 8.96,32.08 8.96,32.08 C8.96,32.08 10.29,31.11 10.29,31.11 C10.29,31.11 8.78,30.58 8.78,30.58c  M19.38 -61.67 C19.38,-61.67 18.94,-63.35 18.94,-63.35 C18.94,-63.35 17.97,-61.94 17.97,-61.94 C17.97,-61.94 16.47,-61.94 16.47,-61.94 C16.47,-61.94 17.35,-60.62 17.35,-60.62 C17.35,-60.62 16.91,-58.94 16.91,-58.94 C16.91,-58.94 18.41,-59.56 18.41,-59.56 C18.41,-59.56 19.65,-58.5 19.65,-58.5 C19.65,-58.5 19.56,-60.18 19.56,-60.18 C19.56,-60.18 20.88,-61.23 20.88,-61.23 C20.88,-61.23 19.38,-61.67 19.38,-61.67c  M-32.98 35.08 C-32.98,35.08 -33.51,33.4 -33.51,33.4 C-33.51,33.4 -34.4,34.81 -34.4,34.81 C-34.4,34.81 -35.9,34.81 -35.9,34.81 C-35.9,34.81 -35.01,36.22 -35.01,36.22 C-35.01,36.22 -35.45,37.81 -35.45,37.81 C-35.45,37.81 -34.04,37.28 -34.04,37.28 C-34.04,37.28 -32.72,38.25 -32.72,38.25 C-32.72,38.25 -32.81,36.58 -32.81,36.58 C-32.81,36.58 -31.48,35.6 -31.48,35.6 C-31.48,35.6 -32.98,35.08 -32.98,35.08c  M45.34 7.56 C45.34,7.56 44.81,5.97 44.81,5.97 C44.81,5.97 43.93,7.38 43.93,7.38 C43.93,7.38 42.34,7.3 42.34,7.3 C42.34,7.3 43.31,8.71 43.31,8.71 C43.31,8.71 42.87,10.29 42.87,10.29 C42.87,10.29 44.28,9.77 44.28,9.77 C44.28,9.77 45.52,10.82 45.52,10.82 C45.52,10.82 45.52,9.06 45.52,9.06 C45.52,9.06 46.76,8.09 46.76,8.09 C46.76,8.09 45.34,7.56 45.34,7.56c  M-9.59 -41.67 C-9.59,-41.67 -10.12,-43.35 -10.12,-43.35 C-10.12,-43.35 -11,-41.94 -11,-41.94 C-11,-41.94 -12.5,-41.94 -12.5,-41.94 C-12.5,-41.94 -11.62,-40.62 -11.62,-40.62 C-11.62,-40.62 -12.06,-38.94 -12.06,-38.94 C-12.06,-38.94 -10.65,-39.56 -10.65,-39.56 C-10.65,-39.56 -9.32,-38.5 -9.32,-38.5 C-9.32,-38.5 -9.41,-40.26 -9.41,-40.26 C-9.41,-40.26 -8.09,-41.23 -8.09,-41.23 C-8.09,-41.23 -9.59,-41.67 -9.59,-41.67c  M97.74 -23.97 C97.74,-23.97 97.03,-26.35 97.03,-26.35 C97.03,-26.35 95.8,-24.32 95.8,-24.32 C95.8,-24.32 93.5,-24.32 93.5,-24.32 C93.5,-24.32 94.91,-22.38 94.91,-22.38 C94.91,-22.38 94.21,-20 94.21,-20 C94.21,-20 96.33,-20.88 96.33,-20.88 C96.33,-20.88 98.09,-19.38 98.09,-19.38 C98.09,-19.38 98.09,-21.85 98.09,-21.85 C98.09,-21.85 99.86,-23.26 99.86,-23.26 C99.86,-23.26 97.74,-23.97 97.74,-23.97c  M167.29 43.28 C167.29,43.28 166.67,40.9 166.67,40.9 C166.67,40.9 165.35,42.93 165.35,42.93 C165.35,42.93 163.14,42.93 163.14,42.93 C163.14,42.93 164.47,44.87 164.47,44.87 C164.47,44.87 163.76,47.25 163.76,47.25 C163.76,47.25 165.88,46.37 165.88,46.37 C165.88,46.37 167.73,47.87 167.73,47.87 C167.73,47.87 167.65,45.4 167.65,45.4 C167.65,45.4 169.5,43.98 169.5,43.98 C169.5,43.98 167.29,43.28 167.29,43.28c  M-1.1 -1.79 C-1.1,-1.79 -1.72,-4.08 -1.72,-4.08 C-1.72,-4.08 -3.05,-2.14 -3.05,-2.14 C-3.05,-2.14 -5.25,-2.14 -5.25,-2.14 C-5.25,-2.14 -3.93,-0.11 -3.93,-0.11 C-3.93,-0.11 -4.64,2.18 -4.64,2.18 C-4.64,2.18 -2.52,1.38 -2.52,1.38 C-2.52,1.38 -0.66,2.8 -0.66,2.8 C-0.66,2.8 -0.75,0.41 -0.75,0.41 C-0.75,0.41 1.1,-1.08 1.1,-1.08 C1.1,-1.08 -1.1,-1.79 -1.1,-1.79c  M-60.89 -5.23 C-60.89,-5.23 -61.59,-7.61 -61.59,-7.61 C-61.59,-7.61 -62.83,-5.58 -62.83,-5.58 C-62.83,-5.58 -65.13,-5.58 -65.13,-5.58 C-65.13,-5.58 -63.71,-3.64 -63.71,-3.64 C-63.71,-3.64 -64.42,-1.26 -64.42,-1.26 C-64.42,-1.26 -62.39,-2.14 -62.39,-2.14 C-62.39,-2.14 -60.53,-0.64 -60.53,-0.64 C-60.53,-0.64 -60.62,-3.11 -60.62,-3.11 C-60.62,-3.11 -58.77,-4.52 -58.77,-4.52 C-58.77,-4.52 -60.89,-5.23 -60.89,-5.23c  M-165.26 -10.97 C-165.26,-10.97 -165.97,-13.35 -165.97,-13.35 C-165.97,-13.35 -167.29,-11.32 -167.29,-11.32 C-167.29,-11.32 -169.5,-11.32 -169.5,-11.32 C-169.5,-11.32 -168.18,-9.38 -168.18,-9.38 C-168.18,-9.38 -168.88,-7 -168.88,-7 C-168.88,-7 -166.76,-7.79 -166.76,-7.79 C-166.76,-7.79 -164.91,-6.38 -164.91,-6.38 C-164.91,-6.38 -165,-8.85 -165,-8.85 C-165,-8.85 -163.14,-10.26 -163.14,-10.26 C-163.14,-10.26 -165.26,-10.97 -165.26,-10.97c  M-51.26 -42.98 C-51.26,-42.98 -54.09,-45.01 -54.09,-45.01 C-54.09,-45.01 -53.91,-41.57 -53.91,-41.57 C-53.91,-41.57 -56.65,-39.54 -56.65,-39.54 C-56.65,-39.54 -53.38,-38.57 -53.38,-38.57 C-53.38,-38.57 -52.32,-35.3 -52.32,-35.3 C-52.32,-35.3 -50.38,-38.13 -50.38,-38.13 C-50.38,-38.13 -46.94,-38.22 -46.94,-38.22 C-46.94,-38.22 -49.05,-40.86 -49.05,-40.86 C-49.05,-40.86 -47.99,-44.21 -47.99,-44.21 C-47.99,-44.21 -51.26,-42.98 -51.26,-42.98c  M-92.06 -47.92 C-92.06,-47.92 -92.59,-49.59 -92.59,-49.59 C-92.59,-49.59 -93.47,-48.18 -93.47,-48.18 C-93.47,-48.18 -95.06,-48.18 -95.06,-48.18 C-95.06,-48.18 -94.09,-46.86 -94.09,-46.86 C-94.09,-46.86 -94.53,-45.18 -94.53,-45.18 C-94.53,-45.18 -93.12,-45.8 -93.12,-45.8 C-93.12,-45.8 -91.88,-44.74 -91.88,-44.74 C-91.88,-44.74 -91.88,-46.42 -91.88,-46.42 C-91.88,-46.42 -90.65,-47.47 -90.65,-47.47 C-90.65,-47.47 -92.06,-47.92 -92.06,-47.92c  M62.83 -13.34 C62.83,-13.34 62.39,-14.93 62.39,-14.93 C62.39,-14.93 61.5,-13.52 61.5,-13.52 C61.5,-13.52 59.91,-13.52 59.91,-13.52 C59.91,-13.52 60.89,-12.2 60.89,-12.2 C60.89,-12.2 60.36,-10.52 60.36,-10.52 C60.36,-10.52 61.86,-11.14 61.86,-11.14 C61.86,-11.14 63.09,-10.08 63.09,-10.08 C63.09,-10.08 63.09,-11.84 63.09,-11.84 C63.09,-11.84 64.33,-12.81 64.33,-12.81 C64.33,-12.81 62.83,-13.34 62.83,-13.34c  M-155.99 -40.95 C-155.99,-40.95 -156.43,-42.54 -156.43,-42.54 C-156.43,-42.54 -157.32,-41.13 -157.32,-41.13 C-157.32,-41.13 -158.91,-41.21 -158.91,-41.21 C-158.91,-41.21 -157.93,-39.8 -157.93,-39.8 C-157.93,-39.8 -158.46,-38.22 -158.46,-38.22 C-158.46,-38.22 -156.96,-38.74 -156.96,-38.74 C-156.96,-38.74 -155.73,-37.69 -155.73,-37.69 C-155.73,-37.69 -155.73,-39.45 -155.73,-39.45 C-155.73,-39.45 -154.49,-40.42 -154.49,-40.42 C-154.49,-40.42 -155.99,-40.95 -155.99,-40.95c  M141.24 26.52 C141.24,26.52 140.71,24.85 140.71,24.85 C140.71,24.85 139.83,26.26 139.83,26.26 C139.83,26.26 138.33,26.26 138.33,26.26 C138.33,26.26 139.21,27.67 139.21,27.67 C139.21,27.67 138.77,29.26 138.77,29.26 C138.77,29.26 140.18,28.73 140.18,28.73 C140.18,28.73 141.51,29.7 141.51,29.7 C141.51,29.7 141.42,28.02 141.42,28.02 C141.42,28.02 142.74,27.05 142.74,27.05 C142.74,27.05 141.24,26.52 141.24,26.52c  M111.4 -51.27 C111.4,-51.27 110.95,-52.94 110.95,-52.94 C110.95,-52.94 110.07,-51.53 110.07,-51.53 C110.07,-51.53 108.48,-51.53 108.48,-51.53 C108.48,-51.53 109.45,-50.21 109.45,-50.21 C109.45,-50.21 108.92,-48.53 108.92,-48.53 C108.92,-48.53 110.42,-49.15 110.42,-49.15 C110.42,-49.15 111.66,-48.09 111.66,-48.09 C111.66,-48.09 111.66,-49.86 111.66,-49.86 C111.66,-49.86 112.9,-50.83 112.9,-50.83 C112.9,-50.83 111.4,-51.27 111.4,-51.27c  M-66.59 53.33 C-66.59,53.33 -67.03,51.65 -67.03,51.65 C-67.03,51.65 -67.91,53.06 -67.91,53.06 C-67.91,53.06 -69.5,53.06 -69.5,53.06 C-69.5,53.06 -68.53,54.47 -68.53,54.47 C-68.53,54.47 -69.06,56.06 -69.06,56.06 C-69.06,56.06 -67.56,55.53 -67.56,55.53 C-67.56,55.53 -66.32,56.5 -66.32,56.5 C-66.32,56.5 -66.32,54.82 -66.32,54.82 C-66.32,54.82 -65.08,53.77 -65.08,53.77 C-65.08,53.77 -66.59,53.33 -66.59,53.33c  M-50.59 59.33 C-50.59,59.33 -51.12,57.65 -51.12,57.65 C-51.12,57.65 -52,59.06 -52,59.06 C-52,59.06 -53.5,59.06 -53.5,59.06 C-53.5,59.06 -52.62,60.38 -52.62,60.38 C-52.62,60.38 -53.06,62.06 -53.06,62.06 C-53.06,62.06 -51.65,61.53 -51.65,61.53 C-51.65,61.53 -50.32,62.5 -50.32,62.5 C-50.32,62.5 -50.41,60.82 -50.41,60.82 C-50.41,60.82 -49.08,59.77 -49.08,59.77 C-49.08,59.77 -50.59,59.33 -50.59,59.33c  M29.98 -16.08 C29.98,-16.08 29.27,-18.46 29.27,-18.46 C29.27,-18.46 27.95,-16.43 27.95,-16.43 C27.95,-16.43 25.74,-16.43 25.74,-16.43 C25.74,-16.43 27.06,-14.49 27.06,-14.49 C27.06,-14.49 26.36,-12.11 26.36,-12.11 C26.36,-12.11 28.48,-12.9 28.48,-12.9 C28.48,-12.9 30.33,-11.49 30.33,-11.49 C30.33,-11.49 30.24,-13.96 30.24,-13.96 C30.24,-13.96 32.1,-15.37 32.1,-15.37 C32.1,-15.37 29.98,-16.08 29.98,-16.08c  M81.28 55.98 C81.28,55.98 80.58,53.6 80.58,53.6 C80.58,53.6 79.25,55.63 79.25,55.63 C79.25,55.63 77.04,55.63 77.04,55.63 C77.04,55.63 78.37,57.57 78.37,57.57 C78.37,57.57 77.66,59.95 77.66,59.95 C77.66,59.95 79.78,59.07 79.78,59.07 C79.78,59.07 81.64,60.56 81.64,60.56 C81.64,60.56 81.55,58.1 81.55,58.1 C81.55,58.1 83.4,56.68 83.4,56.68 C83.4,56.68 81.28,55.98 81.28,55.98c  M-165.26 -10.97 C-165.26,-10.97 -165.97,-13.35 -165.97,-13.35 C-165.97,-13.35 -167.29,-11.32 -167.29,-11.32 C-167.29,-11.32 -169.5,-11.32 -169.5,-11.32 C-169.5,-11.32 -168.18,-9.38 -168.18,-9.38 C-168.18,-9.38 -168.88,-7 -168.88,-7 C-168.88,-7 -166.76,-7.79 -166.76,-7.79 C-166.76,-7.79 -164.91,-6.38 -164.91,-6.38 C-164.91,-6.38 -165,-8.85 -165,-8.85 C-165,-8.85 -163.14,-10.26 -163.14,-10.26 C-163.14,-10.26 -165.26,-10.97 -165.26,-10.97c  M-74.05 21.76 C-74.05,21.76 -74.66,19.47 -74.66,19.47 C-74.66,19.47 -75.99,21.49 -75.99,21.49 C-75.99,21.49 -78.2,21.41 -78.2,21.41 C-78.2,21.41 -76.87,23.43 -76.87,23.43 C-76.87,23.43 -77.58,25.73 -77.58,25.73 C-77.58,25.73 -75.46,24.93 -75.46,24.93 C-75.46,24.93 -73.6,26.43 -73.6,26.43 C-73.6,26.43 -73.69,23.96 -73.69,23.96 C-73.69,23.96 -71.84,22.46 -71.84,22.46 C-71.84,22.46 -74.05,21.76 -74.05,21.76c  M8.98 55.68 C8.98,55.68 6.15,53.65 6.15,53.65 C6.15,53.65 6.24,57.09 6.24,57.09 C6.24,57.09 3.5,59.12 3.5,59.12 C3.5,59.12 6.86,60.09 6.86,60.09 C6.86,60.09 7.92,63.35 7.92,63.35 C7.92,63.35 9.86,60.44 9.86,60.44 C9.86,60.44 13.3,60.44 13.3,60.44 C13.3,60.44 11.18,57.71 11.18,57.71 C11.18,57.71 12.15,54.44 12.15,54.44 C12.15,54.44 8.98,55.68 8.98,55.68c  M124.89 -2.41 C124.89,-2.41 122.06,-4.35 122.06,-4.35 C122.06,-4.35 122.24,-0.91 122.24,-0.91 C122.24,-0.91 119.5,1.12 119.5,1.12 C119.5,1.12 122.77,2 122.77,2 C122.77,2 123.83,5.26 123.83,5.26 C123.83,5.26 125.77,2.44 125.77,2.44 C125.77,2.44 129.21,2.44 129.21,2.44 C129.21,2.44 127.09,-0.29 127.09,-0.29 C127.09,-0.29 128.15,-3.56 128.15,-3.56 C128.15,-3.56 124.89,-2.41 124.89,-2.41c  M77.31 19.91 C77.31,19.91 74.57,17.88 74.57,17.88 C74.57,17.88 74.66,21.32 74.66,21.32 C74.66,21.32 71.92,23.35 71.92,23.35 C71.92,23.35 75.19,24.32 75.19,24.32 C75.19,24.32 76.34,27.58 76.34,27.58 C76.34,27.58 78.19,24.67 78.19,24.67 C78.19,24.67 81.64,24.67 81.64,24.67 C81.64,24.67 79.52,21.94 79.52,21.94 C79.52,21.94 80.58,18.67 80.58,18.67 C80.58,18.67 77.31,19.91 77.31,19.91c  M-28.11 7.68 C-28.11,7.68 -30.94,5.65 -30.94,5.65 C-30.94,5.65 -30.76,9.09 -30.76,9.09 C-30.76,9.09 -33.5,11.12 -33.5,11.12 C-33.5,11.12 -30.23,12.09 -30.23,12.09 C-30.23,12.09 -29.17,15.35 -29.17,15.35 C-29.17,15.35 -27.23,12.44 -27.23,12.44 C-27.23,12.44 -23.79,12.44 -23.79,12.44 C-23.79,12.44 -25.91,9.71 -25.91,9.71 C-25.91,9.71 -24.85,6.44 -24.85,6.44 C-24.85,6.44 -28.11,7.68 -28.11,7.68c  M-119.43 -20.22 C-119.43,-20.22 -122.26,-22.16 -122.26,-22.16 C-122.26,-22.16 -122.08,-18.72 -122.08,-18.72 C-122.08,-18.72 -124.82,-16.7 -124.82,-16.7 C-124.82,-16.7 -121.55,-15.81 -121.55,-15.81 C-121.55,-15.81 -120.49,-12.55 -120.49,-12.55 C-120.49,-12.55 -118.55,-15.37 -118.55,-15.37 C-118.55,-15.37 -115.11,-15.37 -115.11,-15.37 C-115.11,-15.37 -117.23,-18.11 -117.23,-18.11 C-117.23,-18.11 -116.17,-21.37 -116.17,-21.37 C-116.17,-21.37 -119.43,-20.22 -119.43,-20.22c "/>
+                            </group>
+                        </group>
+                        <group android:name="_R_G_L_4_G_L_2_G">
+                            <group android:name="_R_G_L_4_G_L_2_G_L_2_G" android:translateX="206" android:translateY="145">
+                                <path android:name="_R_G_L_4_G_L_2_G_L_2_G_D_0_P_0" android:fillColor="#e8eaed" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -95.63 C206,-95.63 206,42.37 206,42.37 C206,43.47 205.1,44.37 204,44.37 C204,44.37 -204,44.37 -204,44.37 C-205.1,44.37 -206,43.47 -206,42.37 C-206,42.37 -206,-95.63 -206,-95.63 C-206,-96.73 -205.1,-97.63 -204,-97.63 C-204,-97.63 204,-97.63 204,-97.63 C205.1,-97.63 206,-96.73 206,-95.63c "/>
+                            </group>
+                            <group android:name="_R_G_L_4_G_L_2_G_L_1_G" android:translateX="206" android:translateY="145">
+                                <path android:name="_R_G_L_4_G_L_2_G_L_1_G_D_0_P_0" android:fillColor="#80868b" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M109 -14 C109,-14 109,14 109,14 C109,15.1 108.1,16 107,16 C107,16 -107,16 -107,16 C-108.1,16 -109,15.1 -109,14 C-109,14 -109,-14 -109,-14 C-109,-15.1 -108.1,-16 -107,-16 C-107,-16 107,-16 107,-16 C108.1,-16 109,-15.1 109,-14c "/>
+                            </group>
+                            <group android:name="_R_G_L_4_G_L_2_G_L_0_G" android:translateX="46" android:translateY="145">
+                                <path android:name="_R_G_L_4_G_L_2_G_L_0_G_D_0_P_0" android:fillColor="#80868b" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M22 -14 C22,-14 22,14 22,14 C22,18.42 18.42,22 14,22 C14,22 -14,22 -14,22 C-18.42,22 -22,18.42 -22,14 C-22,14 -22,-14 -22,-14 C-22,-18.42 -18.42,-22 -14,-22 C-14,-22 14,-22 14,-22 C18.42,-22 22,-18.42 22,-14c "/>
+                            </group>
+                        </group>
+                        <group android:name="_R_G_L_4_G_L_1_G" android:translateX="206" android:translateY="877">
+                            <path android:name="_R_G_L_4_G_L_1_G_D_0_P_0" android:fillColor="#373737" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M40 0 C40,0 40,0 40,0 C40,1.1 39.1,2 38,2 C38,2 -38,2 -38,2 C-39.1,2 -40,1.1 -40,0 C-40,0 -40,0 -40,0 C-40,-1.1 -39.1,-2 -38,-2 C-38,-2 38,-2 38,-2 C39.1,-2 40,-1.1 40,0c "/>
+                        </group>
+                        <group android:name="_R_G_L_4_G_L_0_G">
+                            <group android:name="_R_G_L_4_G_L_0_G_L_2_G" android:translateX="206" android:translateY="50.5">
+                                <path android:name="_R_G_L_4_G_L_0_G_L_2_G_D_0_P_0" android:fillColor="#202124" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -29.67 C206,-29.67 206,50.33 206,50.33 C206,50.33 -206,50.33 -206,50.33 C-206,50.33 -206,-29.67 -206,-29.67 C-206,-29.67 206,-29.67 206,-29.67c "/>
+                            </group>
+                            <group android:name="_R_G_L_4_G_L_0_G_L_1_G" android:translateX="206" android:translateY="50.5">
+                                <path android:name="_R_G_L_4_G_L_0_G_L_1_G_D_0_P_0" android:fillColor="#202124" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -32.5 C206,-32.5 206,32.5 206,32.5 C206,42.43 197.93,50.5 188,50.5 C188,50.5 -188,50.5 -188,50.5 C-197.93,50.5 -206,42.43 -206,32.5 C-206,32.5 -206,-32.5 -206,-32.5 C-206,-42.43 -197.93,-50.5 -188,-50.5 C-188,-50.5 188,-50.5 188,-50.5 C197.93,-50.5 206,-42.43 206,-32.5c "/>
+                            </group>
+                            <group android:name="_R_G_L_4_G_L_0_G_L_0_G" android:translateX="206" android:translateY="66.5">
+                                <path android:name="_R_G_L_4_G_L_0_G_L_0_G_D_0_P_0" android:fillColor="#3c4043" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M190 0 C190,0 190,0 190,0 C190,10.21 181.71,18.5 171.5,18.5 C171.5,18.5 -171.5,18.5 -171.5,18.5 C-181.71,18.5 -190,10.21 -190,0 C-190,0 -190,0 -190,0 C-190,-10.21 -181.71,-18.5 -171.5,-18.5 C-171.5,-18.5 171.5,-18.5 171.5,-18.5 C181.71,-18.5 190,-10.21 190,0c "/>
+                            </group>
+                        </group>
+                    </group>
+                </group>
+                <group android:name="_R_G_L_3_G_N_3_T_0" android:translateX="206" android:translateY="395" android:scaleX="0.6" android:scaleY="0">
+                    <group android:name="_R_G_L_3_G" android:translateX="-206" android:translateY="-446">
+                        <group android:name="_R_G_L_3_G_L_4_G" android:scaleY="0">
+                            <group android:name="_R_G_L_3_G_L_4_G_L_11_G" android:translateX="206" android:translateY="467" android:scaleY="0">
+                                <path android:name="_R_G_L_3_G_L_4_G_L_11_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -407 C206,-407 206,407 206,407 C206,416.93 197.93,425 188,425 C188,425 -188,425 -188,425 C-197.93,425 -206,416.93 -206,407 C-206,407 -206,-407 -206,-407 C-206,-416.93 -197.93,-425 -188,-425 C-188,-425 188,-425 188,-425 C197.93,-425 206,-416.93 206,-407c "/>
+                            </group>
+                            <group android:name="_R_G_L_3_G_L_4_G_L_10_G" android:translateX="182.5" android:translateY="831" android:scaleY="0">
+                                <path android:name="_R_G_L_3_G_L_4_G_L_10_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M158.5 -7 C158.5,-7 158.5,7 158.5,7 C158.5,9.21 156.71,11 154.5,11 C154.5,11 -154.5,11 -154.5,11 C-156.71,11 -158.5,9.21 -158.5,7 C-158.5,7 -158.5,-7 -158.5,-7 C-158.5,-9.21 -156.71,-11 -154.5,-11 C-154.5,-11 154.5,-11 154.5,-11 C156.71,-11 158.5,-9.21 158.5,-7c "/>
+                            </group>
+                            <group android:name="_R_G_L_3_G_L_4_G_L_9_G" android:translateX="186" android:translateY="801" android:scaleY="0">
+                                <path android:name="_R_G_L_3_G_L_4_G_L_9_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M162 -7 C162,-7 162,7 162,7 C162,9.21 160.21,11 158,11 C158,11 -158,11 -158,11 C-160.21,11 -162,9.21 -162,7 C-162,7 -162,-7 -162,-7 C-162,-9.21 -160.21,-11 -158,-11 C-158,-11 158,-11 158,-11 C160.21,-11 162,-9.21 162,-7c "/>
+                            </group>
+                            <group android:name="_R_G_L_3_G_L_4_G_L_8_G" android:translateX="119" android:translateY="755" android:scaleY="0">
+                                <path android:name="_R_G_L_3_G_L_4_G_L_8_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M95 -7 C95,-7 95,7 95,7 C95,9.21 93.21,11 91,11 C91,11 -91,11 -91,11 C-93.21,11 -95,9.21 -95,7 C-95,7 -95,-7 -95,-7 C-95,-9.21 -93.21,-11 -91,-11 C-91,-11 91,-11 91,-11 C93.21,-11 95,-9.21 95,-7c "/>
+                            </group>
+                            <group android:name="_R_G_L_3_G_L_4_G_L_7_G" android:translateX="182.5" android:translateY="725" android:scaleY="0">
+                                <path android:name="_R_G_L_3_G_L_4_G_L_7_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M158.5 -7 C158.5,-7 158.5,7 158.5,7 C158.5,9.21 156.71,11 154.5,11 C154.5,11 -154.5,11 -154.5,11 C-156.71,11 -158.5,9.21 -158.5,7 C-158.5,7 -158.5,-7 -158.5,-7 C-158.5,-9.21 -156.71,-11 -154.5,-11 C-154.5,-11 154.5,-11 154.5,-11 C156.71,-11 158.5,-9.21 158.5,-7c "/>
+                            </group>
+                            <group android:name="_R_G_L_3_G_L_4_G_L_6_G" android:translateX="197.5" android:translateY="695" android:scaleY="0">
+                                <path android:name="_R_G_L_3_G_L_4_G_L_6_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M173.5 -7 C173.5,-7 173.5,7 173.5,7 C173.5,9.21 171.71,11 169.5,11 C169.5,11 -169.5,11 -169.5,11 C-171.71,11 -173.5,9.21 -173.5,7 C-173.5,7 -173.5,-7 -173.5,-7 C-173.5,-9.21 -171.71,-11 -169.5,-11 C-169.5,-11 169.5,-11 169.5,-11 C171.71,-11 173.5,-9.21 173.5,-7c "/>
+                            </group>
+                            <group android:name="_R_G_L_3_G_L_4_G_L_5_G" android:translateX="192" android:translateY="665" android:scaleY="0">
+                                <path android:name="_R_G_L_3_G_L_4_G_L_5_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M168 -7 C168,-7 168,7 168,7 C168,9.21 166.21,11 164,11 C164,11 -164,11 -164,11 C-166.21,11 -168,9.21 -168,7 C-168,7 -168,-7 -168,-7 C-168,-9.21 -166.21,-11 -164,-11 C-164,-11 164,-11 164,-11 C166.21,-11 168,-9.21 168,-7c "/>
+                            </group>
+                            <group android:name="_R_G_L_3_G_L_4_G_L_4_G" android:translateX="105.5" android:translateY="360" android:scaleY="0">
+                                <path android:name="_R_G_L_3_G_L_4_G_L_4_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M23.5 -2 C23.5,-2 23.5,2 23.5,2 C23.5,4.21 21.71,6 19.5,6 C19.5,6 -19.5,6 -19.5,6 C-21.71,6 -23.5,4.21 -23.5,2 C-23.5,2 -23.5,-2 -23.5,-2 C-23.5,-4.21 -21.71,-6 -19.5,-6 C-19.5,-6 19.5,-6 19.5,-6 C21.71,-6 23.5,-4.21 23.5,-2c "/>
+                            </group>
+                            <group android:name="_R_G_L_3_G_L_4_G_L_3_G" android:translateX="47.5" android:translateY="360" android:scaleY="0">
+                                <path android:name="_R_G_L_3_G_L_4_G_L_3_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M23.5 -2 C23.5,-2 23.5,2 23.5,2 C23.5,4.21 21.71,6 19.5,6 C19.5,6 -19.5,6 -19.5,6 C-21.71,6 -23.5,4.21 -23.5,2 C-23.5,2 -23.5,-2 -23.5,-2 C-23.5,-4.21 -21.71,-6 -19.5,-6 C-19.5,-6 19.5,-6 19.5,-6 C21.71,-6 23.5,-4.21 23.5,-2c "/>
+                            </group>
+                            <group android:name="_R_G_L_3_G_L_4_G_L_2_G" android:translateX="142.5" android:translateY="328" android:scaleY="0">
+                                <path android:name="_R_G_L_3_G_L_4_G_L_2_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M118.5 -14 C118.5,-14 118.5,14 118.5,14 C118.5,16.21 116.71,18 114.5,18 C114.5,18 -114.5,18 -114.5,18 C-116.71,18 -118.5,16.21 -118.5,14 C-118.5,14 -118.5,-14 -118.5,-14 C-118.5,-16.21 -116.71,-18 -114.5,-18 C-114.5,-18 114.5,-18 114.5,-18 C116.71,-18 118.5,-16.21 118.5,-14c "/>
+                            </group>
+                            <group android:name="_R_G_L_3_G_L_4_G_L_1_G" android:translateX="186" android:translateY="284" android:scaleY="0">
+                                <path android:name="_R_G_L_3_G_L_4_G_L_1_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M162 -14 C162,-14 162,14 162,14 C162,16.21 160.21,18 158,18 C158,18 -158,18 -158,18 C-160.21,18 -162,16.21 -162,14 C-162,14 -162,-14 -162,-14 C-162,-16.21 -160.21,-18 -158,-18 C-158,-18 158,-18 158,-18 C160.21,-18 162,-16.21 162,-14c "/>
+                            </group>
+                            <group android:name="_R_G_L_3_G_L_4_G_L_0_G" android:translateX="155" android:translateY="240" android:scaleY="0">
+                                <path android:name="_R_G_L_3_G_L_4_G_L_0_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M131 -14 C131,-14 131,14 131,14 C131,16.21 129.21,18 127,18 C127,18 -127,18 -127,18 C-129.21,18 -131,16.21 -131,14 C-131,14 -131,-14 -131,-14 C-131,-16.21 -129.21,-18 -127,-18 C-127,-18 127,-18 127,-18 C129.21,-18 131,-16.21 131,-14c "/>
+                            </group>
+                        </group>
+                        <group android:name="_R_G_L_3_G_L_3_G" android:translateX="24" android:translateY="390" android:scaleY="0">
+                            <group android:name="_R_G_L_3_G_L_3_G_L_7_G" android:translateX="182" android:translateY="120" android:scaleY="0"/>
+                            <group android:name="_R_G_L_3_G_L_3_G_L_6_G" android:translateX="182" android:translateY="120" android:scaleY="0">
+                                <path android:name="_R_G_L_3_G_L_3_G_L_6_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M182 -116 C182,-116 182,116 182,116 C182,118.21 180.21,120 178,120 C178,120 -178,120 -178,120 C-180.21,120 -182,118.21 -182,116 C-182,116 -182,-116 -182,-116 C-182,-118.21 -180.21,-120 -178,-120 C-178,-120 178,-120 178,-120 C180.21,-120 182,-118.21 182,-116c "/>
+                            </group>
+                            <group android:name="_R_G_L_3_G_L_3_G_L_5_G" android:translateX="77.322" android:translateY="150.552" android:scaleY="0">
+                                <path android:name="_R_G_L_3_G_L_3_G_L_5_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 20.61 C0,20.61 -10.39,8.69 -10.39,8.69  M0 -6.11 C0,-6.11 -6.78,-15.61 -6.78,-15.61  M0 33.64 C0,33.64 8.26,17.67 8.26,17.67  M0 7.58 C0,7.58 8.26,-7.73 8.26,-7.73  M0 71.19 C0,71.19 0,-18.04 0,-18.04  M-30.22 37.18 C-30.22,37.18 0,-71.19 0,-71.19 C0,-71.19 30.22,37.18 30.22,37.18 C30.22,37.18 -30.22,37.18 -30.22,37.18c "/>
+                                <path android:name="_R_G_L_3_G_L_3_G_L_5_G_D_1_P_0" android:strokeColor="#9adcb2" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M0 20.61 C0,20.61 -10.39,8.69 -10.39,8.69  M0 -6.11 C0,-6.11 -6.78,-15.61 -6.78,-15.61  M0 33.64 C0,33.64 8.26,17.67 8.26,17.67  M0 7.58 C0,7.58 8.26,-7.73 8.26,-7.73  M0 71.19 C0,71.19 0,-18.04 0,-18.04  M-30.22 37.18 C-30.22,37.18 0,-71.19 0,-71.19 C0,-71.19 30.22,37.18 30.22,37.18 C30.22,37.18 -30.22,37.18 -30.22,37.18c "/>
+                            </group>
+                            <group android:name="_R_G_L_3_G_L_3_G_L_4_G" android:translateX="38.772" android:translateY="121.73" android:scaleY="0">
+                                <path android:name="_R_G_L_3_G_L_3_G_L_4_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 28.82 C0,28.82 -14.52,12.18 -14.52,12.18  M0 -8.58 C0,-8.58 -9.51,-21.75 -9.51,-21.75  M0 47.01 C0,47.01 11.57,24.7 11.57,24.7  M0 10.64 C0,10.64 11.57,-10.78 11.57,-10.78  M0 99.42 C0,99.42 0,-25.21 0,-25.21  M-31.92 51.94 C-31.92,51.94 0,-99.42 0,-99.42 C0,-99.42 31.92,51.94 31.92,51.94 C31.92,51.94 -31.92,51.94 -31.92,51.94c "/>
+                                <path android:name="_R_G_L_3_G_L_3_G_L_4_G_D_1_P_0" android:strokeColor="#9adcb2" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M0 28.82 C0,28.82 -14.52,12.18 -14.52,12.18  M0 -8.58 C0,-8.58 -9.51,-21.75 -9.51,-21.75  M0 47.01 C0,47.01 11.57,24.7 11.57,24.7  M0 10.64 C0,10.64 11.57,-10.78 11.57,-10.78  M0 99.42 C0,99.42 0,-25.21 0,-25.21  M-31.92 51.94 C-31.92,51.94 0,-99.42 0,-99.42 C0,-99.42 31.92,51.94 31.92,51.94 C31.92,51.94 -31.92,51.94 -31.92,51.94c "/>
+                            </group>
+                            <group android:name="_R_G_L_3_G_L_3_G_L_3_G" android:translateX="183" android:translateY="222" android:scaleY="0">
+                                <path android:name="_R_G_L_3_G_L_3_G_L_3_G_D_0_P_0" android:fillColor="#000000" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M170 0 C170,0 -170,0 -170,0 "/>
+                                <path android:name="_R_G_L_3_G_L_3_G_L_3_G_D_1_P_0" android:strokeColor="#9aa0a6" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="4" android:strokeAlpha="1" android:pathData=" M170 0 C170,0 -170,0 -170,0 "/>
+                            </group>
+                            <group android:name="_R_G_L_3_G_L_3_G_L_2_G" android:translateX="265.619" android:translateY="162.331" android:scaleY="0">
+                                <path android:name="_R_G_L_3_G_L_3_G_L_2_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M-34.05 50.06 C-34.05,50.06 -34.05,-49.25 -34.05,-49.25  M-34.05 -49.55 C-34.05,-49.55 17.54,50.06 17.54,50.06 C17.54,50.06 84.62,50.06 84.62,50.06 C84.62,50.06 32.65,-50.06 32.65,-50.06 C32.65,-50.06 -34.05,-50.06 -34.05,-50.06 C-34.05,-50.06 -84.62,50.06 -84.62,50.06 C-84.62,50.06 17.54,50.06 17.54,50.06 "/>
+                                <path android:name="_R_G_L_3_G_L_3_G_L_2_G_D_1_P_0" android:strokeColor="#a8cbfe" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M-34.05 50.06 C-34.05,50.06 -34.05,-49.25 -34.05,-49.25  M-34.05 -49.55 C-34.05,-49.55 17.54,50.06 17.54,50.06 C17.54,50.06 84.62,50.06 84.62,50.06 C84.62,50.06 32.65,-50.06 32.65,-50.06 C32.65,-50.06 -34.05,-50.06 -34.05,-50.06 C-34.05,-50.06 -84.62,50.06 -84.62,50.06 C-84.62,50.06 17.54,50.06 17.54,50.06 "/>
+                            </group>
+                            <group android:name="_R_G_L_3_G_L_3_G_L_1_G" android:translateX="319.271" android:translateY="37.945" android:scaleY="0">
+                                <path android:name="_R_G_L_3_G_L_3_G_L_1_G_D_0_P_0" android:fillColor="#feefc3" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M13.42 2.99 C14.95,-4.17 9.93,-11.31 2.21,-12.96 C-0.9,-13.62 -3.97,-13.3 -6.64,-12.2 C-6.58,-12.19 -6.53,-12.18 -6.48,-12.17 C-1.03,-11.01 2.52,-5.97 1.44,-0.92 C0.36,4.13 -4.94,7.28 -10.4,6.12 C-11.6,5.86 -12.7,5.42 -13.69,4.83 C-11.9,8.78 -8.15,11.93 -3.34,12.96 C4.38,14.61 11.88,10.14 13.42,2.99c "/>
+                            </group>
+                            <group android:name="_R_G_L_3_G_L_3_G_L_0_G" android:translateX="179.5" android:translateY="73.351" android:scaleY="0">
+                                <path android:name="_R_G_L_3_G_L_3_G_L_0_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M51.08 -40.95 C51.08,-40.95 50.55,-42.54 50.55,-42.54 C50.55,-42.54 49.67,-41.13 49.67,-41.13 C49.67,-41.13 48.17,-41.21 48.17,-41.21 C48.17,-41.21 49.05,-39.8 49.05,-39.8 C49.05,-39.8 48.61,-38.22 48.61,-38.22 C48.61,-38.22 50.02,-38.74 50.02,-38.74 C50.02,-38.74 51.35,-37.69 51.35,-37.69 C51.35,-37.69 51.26,-39.45 51.26,-39.45 C51.26,-39.45 52.59,-40.42 52.59,-40.42 C52.59,-40.42 51.08,-40.95 51.08,-40.95c  M8.78 30.58 C8.78,30.58 8.25,28.99 8.25,28.99 C8.25,28.99 7.37,30.4 7.37,30.4 C7.37,30.4 5.87,30.31 5.87,30.31 C5.87,30.31 6.75,31.72 6.75,31.72 C6.75,31.72 6.31,33.31 6.31,33.31 C6.31,33.31 7.72,32.78 7.72,32.78 C7.72,32.78 9.05,33.84 9.05,33.84 C9.05,33.84 8.96,32.08 8.96,32.08 C8.96,32.08 10.29,31.11 10.29,31.11 C10.29,31.11 8.78,30.58 8.78,30.58c  M19.38 -61.67 C19.38,-61.67 18.94,-63.35 18.94,-63.35 C18.94,-63.35 17.97,-61.94 17.97,-61.94 C17.97,-61.94 16.47,-61.94 16.47,-61.94 C16.47,-61.94 17.35,-60.62 17.35,-60.62 C17.35,-60.62 16.91,-58.94 16.91,-58.94 C16.91,-58.94 18.41,-59.56 18.41,-59.56 C18.41,-59.56 19.65,-58.5 19.65,-58.5 C19.65,-58.5 19.56,-60.18 19.56,-60.18 C19.56,-60.18 20.88,-61.23 20.88,-61.23 C20.88,-61.23 19.38,-61.67 19.38,-61.67c  M-32.98 35.08 C-32.98,35.08 -33.51,33.4 -33.51,33.4 C-33.51,33.4 -34.4,34.81 -34.4,34.81 C-34.4,34.81 -35.9,34.81 -35.9,34.81 C-35.9,34.81 -35.01,36.22 -35.01,36.22 C-35.01,36.22 -35.45,37.81 -35.45,37.81 C-35.45,37.81 -34.04,37.28 -34.04,37.28 C-34.04,37.28 -32.72,38.25 -32.72,38.25 C-32.72,38.25 -32.81,36.58 -32.81,36.58 C-32.81,36.58 -31.48,35.6 -31.48,35.6 C-31.48,35.6 -32.98,35.08 -32.98,35.08c  M45.34 7.56 C45.34,7.56 44.81,5.97 44.81,5.97 C44.81,5.97 43.93,7.38 43.93,7.38 C43.93,7.38 42.34,7.3 42.34,7.3 C42.34,7.3 43.31,8.71 43.31,8.71 C43.31,8.71 42.87,10.29 42.87,10.29 C42.87,10.29 44.28,9.77 44.28,9.77 C44.28,9.77 45.52,10.82 45.52,10.82 C45.52,10.82 45.52,9.06 45.52,9.06 C45.52,9.06 46.76,8.09 46.76,8.09 C46.76,8.09 45.34,7.56 45.34,7.56c  M-9.59 -41.67 C-9.59,-41.67 -10.12,-43.35 -10.12,-43.35 C-10.12,-43.35 -11,-41.94 -11,-41.94 C-11,-41.94 -12.5,-41.94 -12.5,-41.94 C-12.5,-41.94 -11.62,-40.62 -11.62,-40.62 C-11.62,-40.62 -12.06,-38.94 -12.06,-38.94 C-12.06,-38.94 -10.65,-39.56 -10.65,-39.56 C-10.65,-39.56 -9.32,-38.5 -9.32,-38.5 C-9.32,-38.5 -9.41,-40.26 -9.41,-40.26 C-9.41,-40.26 -8.09,-41.23 -8.09,-41.23 C-8.09,-41.23 -9.59,-41.67 -9.59,-41.67c  M97.74 -23.97 C97.74,-23.97 97.03,-26.35 97.03,-26.35 C97.03,-26.35 95.8,-24.32 95.8,-24.32 C95.8,-24.32 93.5,-24.32 93.5,-24.32 C93.5,-24.32 94.91,-22.38 94.91,-22.38 C94.91,-22.38 94.21,-20 94.21,-20 C94.21,-20 96.33,-20.88 96.33,-20.88 C96.33,-20.88 98.09,-19.38 98.09,-19.38 C98.09,-19.38 98.09,-21.85 98.09,-21.85 C98.09,-21.85 99.86,-23.26 99.86,-23.26 C99.86,-23.26 97.74,-23.97 97.74,-23.97c  M167.29 43.28 C167.29,43.28 166.67,40.9 166.67,40.9 C166.67,40.9 165.35,42.93 165.35,42.93 C165.35,42.93 163.14,42.93 163.14,42.93 C163.14,42.93 164.47,44.87 164.47,44.87 C164.47,44.87 163.76,47.25 163.76,47.25 C163.76,47.25 165.88,46.37 165.88,46.37 C165.88,46.37 167.73,47.87 167.73,47.87 C167.73,47.87 167.65,45.4 167.65,45.4 C167.65,45.4 169.5,43.98 169.5,43.98 C169.5,43.98 167.29,43.28 167.29,43.28c  M-1.1 -1.79 C-1.1,-1.79 -1.72,-4.08 -1.72,-4.08 C-1.72,-4.08 -3.05,-2.14 -3.05,-2.14 C-3.05,-2.14 -5.25,-2.14 -5.25,-2.14 C-5.25,-2.14 -3.93,-0.11 -3.93,-0.11 C-3.93,-0.11 -4.64,2.18 -4.64,2.18 C-4.64,2.18 -2.52,1.38 -2.52,1.38 C-2.52,1.38 -0.66,2.8 -0.66,2.8 C-0.66,2.8 -0.75,0.41 -0.75,0.41 C-0.75,0.41 1.1,-1.08 1.1,-1.08 C1.1,-1.08 -1.1,-1.79 -1.1,-1.79c  M-60.89 -5.23 C-60.89,-5.23 -61.59,-7.61 -61.59,-7.61 C-61.59,-7.61 -62.83,-5.58 -62.83,-5.58 C-62.83,-5.58 -65.13,-5.58 -65.13,-5.58 C-65.13,-5.58 -63.71,-3.64 -63.71,-3.64 C-63.71,-3.64 -64.42,-1.26 -64.42,-1.26 C-64.42,-1.26 -62.39,-2.14 -62.39,-2.14 C-62.39,-2.14 -60.53,-0.64 -60.53,-0.64 C-60.53,-0.64 -60.62,-3.11 -60.62,-3.11 C-60.62,-3.11 -58.77,-4.52 -58.77,-4.52 C-58.77,-4.52 -60.89,-5.23 -60.89,-5.23c  M-165.26 -10.97 C-165.26,-10.97 -165.97,-13.35 -165.97,-13.35 C-165.97,-13.35 -167.29,-11.32 -167.29,-11.32 C-167.29,-11.32 -169.5,-11.32 -169.5,-11.32 C-169.5,-11.32 -168.18,-9.38 -168.18,-9.38 C-168.18,-9.38 -168.88,-7 -168.88,-7 C-168.88,-7 -166.76,-7.79 -166.76,-7.79 C-166.76,-7.79 -164.91,-6.38 -164.91,-6.38 C-164.91,-6.38 -165,-8.85 -165,-8.85 C-165,-8.85 -163.14,-10.26 -163.14,-10.26 C-163.14,-10.26 -165.26,-10.97 -165.26,-10.97c  M-51.26 -42.98 C-51.26,-42.98 -54.09,-45.01 -54.09,-45.01 C-54.09,-45.01 -53.91,-41.57 -53.91,-41.57 C-53.91,-41.57 -56.65,-39.54 -56.65,-39.54 C-56.65,-39.54 -53.38,-38.57 -53.38,-38.57 C-53.38,-38.57 -52.32,-35.3 -52.32,-35.3 C-52.32,-35.3 -50.38,-38.13 -50.38,-38.13 C-50.38,-38.13 -46.94,-38.22 -46.94,-38.22 C-46.94,-38.22 -49.05,-40.86 -49.05,-40.86 C-49.05,-40.86 -47.99,-44.21 -47.99,-44.21 C-47.99,-44.21 -51.26,-42.98 -51.26,-42.98c  M-92.06 -47.92 C-92.06,-47.92 -92.59,-49.59 -92.59,-49.59 C-92.59,-49.59 -93.47,-48.18 -93.47,-48.18 C-93.47,-48.18 -95.06,-48.18 -95.06,-48.18 C-95.06,-48.18 -94.09,-46.86 -94.09,-46.86 C-94.09,-46.86 -94.53,-45.18 -94.53,-45.18 C-94.53,-45.18 -93.12,-45.8 -93.12,-45.8 C-93.12,-45.8 -91.88,-44.74 -91.88,-44.74 C-91.88,-44.74 -91.88,-46.42 -91.88,-46.42 C-91.88,-46.42 -90.65,-47.47 -90.65,-47.47 C-90.65,-47.47 -92.06,-47.92 -92.06,-47.92c  M62.83 -13.34 C62.83,-13.34 62.39,-14.93 62.39,-14.93 C62.39,-14.93 61.5,-13.52 61.5,-13.52 C61.5,-13.52 59.91,-13.52 59.91,-13.52 C59.91,-13.52 60.89,-12.2 60.89,-12.2 C60.89,-12.2 60.36,-10.52 60.36,-10.52 C60.36,-10.52 61.86,-11.14 61.86,-11.14 C61.86,-11.14 63.09,-10.08 63.09,-10.08 C63.09,-10.08 63.09,-11.84 63.09,-11.84 C63.09,-11.84 64.33,-12.81 64.33,-12.81 C64.33,-12.81 62.83,-13.34 62.83,-13.34c  M-155.99 -40.95 C-155.99,-40.95 -156.43,-42.54 -156.43,-42.54 C-156.43,-42.54 -157.32,-41.13 -157.32,-41.13 C-157.32,-41.13 -158.91,-41.21 -158.91,-41.21 C-158.91,-41.21 -157.93,-39.8 -157.93,-39.8 C-157.93,-39.8 -158.46,-38.22 -158.46,-38.22 C-158.46,-38.22 -156.96,-38.74 -156.96,-38.74 C-156.96,-38.74 -155.73,-37.69 -155.73,-37.69 C-155.73,-37.69 -155.73,-39.45 -155.73,-39.45 C-155.73,-39.45 -154.49,-40.42 -154.49,-40.42 C-154.49,-40.42 -155.99,-40.95 -155.99,-40.95c  M141.24 26.52 C141.24,26.52 140.71,24.85 140.71,24.85 C140.71,24.85 139.83,26.26 139.83,26.26 C139.83,26.26 138.33,26.26 138.33,26.26 C138.33,26.26 139.21,27.67 139.21,27.67 C139.21,27.67 138.77,29.26 138.77,29.26 C138.77,29.26 140.18,28.73 140.18,28.73 C140.18,28.73 141.51,29.7 141.51,29.7 C141.51,29.7 141.42,28.02 141.42,28.02 C141.42,28.02 142.74,27.05 142.74,27.05 C142.74,27.05 141.24,26.52 141.24,26.52c  M111.4 -51.27 C111.4,-51.27 110.95,-52.94 110.95,-52.94 C110.95,-52.94 110.07,-51.53 110.07,-51.53 C110.07,-51.53 108.48,-51.53 108.48,-51.53 C108.48,-51.53 109.45,-50.21 109.45,-50.21 C109.45,-50.21 108.92,-48.53 108.92,-48.53 C108.92,-48.53 110.42,-49.15 110.42,-49.15 C110.42,-49.15 111.66,-48.09 111.66,-48.09 C111.66,-48.09 111.66,-49.86 111.66,-49.86 C111.66,-49.86 112.9,-50.83 112.9,-50.83 C112.9,-50.83 111.4,-51.27 111.4,-51.27c  M-66.59 53.33 C-66.59,53.33 -67.03,51.65 -67.03,51.65 C-67.03,51.65 -67.91,53.06 -67.91,53.06 C-67.91,53.06 -69.5,53.06 -69.5,53.06 C-69.5,53.06 -68.53,54.47 -68.53,54.47 C-68.53,54.47 -69.06,56.06 -69.06,56.06 C-69.06,56.06 -67.56,55.53 -67.56,55.53 C-67.56,55.53 -66.32,56.5 -66.32,56.5 C-66.32,56.5 -66.32,54.82 -66.32,54.82 C-66.32,54.82 -65.08,53.77 -65.08,53.77 C-65.08,53.77 -66.59,53.33 -66.59,53.33c  M-50.59 59.33 C-50.59,59.33 -51.12,57.65 -51.12,57.65 C-51.12,57.65 -52,59.06 -52,59.06 C-52,59.06 -53.5,59.06 -53.5,59.06 C-53.5,59.06 -52.62,60.38 -52.62,60.38 C-52.62,60.38 -53.06,62.06 -53.06,62.06 C-53.06,62.06 -51.65,61.53 -51.65,61.53 C-51.65,61.53 -50.32,62.5 -50.32,62.5 C-50.32,62.5 -50.41,60.82 -50.41,60.82 C-50.41,60.82 -49.08,59.77 -49.08,59.77 C-49.08,59.77 -50.59,59.33 -50.59,59.33c  M29.98 -16.08 C29.98,-16.08 29.27,-18.46 29.27,-18.46 C29.27,-18.46 27.95,-16.43 27.95,-16.43 C27.95,-16.43 25.74,-16.43 25.74,-16.43 C25.74,-16.43 27.06,-14.49 27.06,-14.49 C27.06,-14.49 26.36,-12.11 26.36,-12.11 C26.36,-12.11 28.48,-12.9 28.48,-12.9 C28.48,-12.9 30.33,-11.49 30.33,-11.49 C30.33,-11.49 30.24,-13.96 30.24,-13.96 C30.24,-13.96 32.1,-15.37 32.1,-15.37 C32.1,-15.37 29.98,-16.08 29.98,-16.08c  M81.28 55.98 C81.28,55.98 80.58,53.6 80.58,53.6 C80.58,53.6 79.25,55.63 79.25,55.63 C79.25,55.63 77.04,55.63 77.04,55.63 C77.04,55.63 78.37,57.57 78.37,57.57 C78.37,57.57 77.66,59.95 77.66,59.95 C77.66,59.95 79.78,59.07 79.78,59.07 C79.78,59.07 81.64,60.56 81.64,60.56 C81.64,60.56 81.55,58.1 81.55,58.1 C81.55,58.1 83.4,56.68 83.4,56.68 C83.4,56.68 81.28,55.98 81.28,55.98c  M-165.26 -10.97 C-165.26,-10.97 -165.97,-13.35 -165.97,-13.35 C-165.97,-13.35 -167.29,-11.32 -167.29,-11.32 C-167.29,-11.32 -169.5,-11.32 -169.5,-11.32 C-169.5,-11.32 -168.18,-9.38 -168.18,-9.38 C-168.18,-9.38 -168.88,-7 -168.88,-7 C-168.88,-7 -166.76,-7.79 -166.76,-7.79 C-166.76,-7.79 -164.91,-6.38 -164.91,-6.38 C-164.91,-6.38 -165,-8.85 -165,-8.85 C-165,-8.85 -163.14,-10.26 -163.14,-10.26 C-163.14,-10.26 -165.26,-10.97 -165.26,-10.97c  M-74.05 21.76 C-74.05,21.76 -74.66,19.47 -74.66,19.47 C-74.66,19.47 -75.99,21.49 -75.99,21.49 C-75.99,21.49 -78.2,21.41 -78.2,21.41 C-78.2,21.41 -76.87,23.43 -76.87,23.43 C-76.87,23.43 -77.58,25.73 -77.58,25.73 C-77.58,25.73 -75.46,24.93 -75.46,24.93 C-75.46,24.93 -73.6,26.43 -73.6,26.43 C-73.6,26.43 -73.69,23.96 -73.69,23.96 C-73.69,23.96 -71.84,22.46 -71.84,22.46 C-71.84,22.46 -74.05,21.76 -74.05,21.76c  M8.98 55.68 C8.98,55.68 6.15,53.65 6.15,53.65 C6.15,53.65 6.24,57.09 6.24,57.09 C6.24,57.09 3.5,59.12 3.5,59.12 C3.5,59.12 6.86,60.09 6.86,60.09 C6.86,60.09 7.92,63.35 7.92,63.35 C7.92,63.35 9.86,60.44 9.86,60.44 C9.86,60.44 13.3,60.44 13.3,60.44 C13.3,60.44 11.18,57.71 11.18,57.71 C11.18,57.71 12.15,54.44 12.15,54.44 C12.15,54.44 8.98,55.68 8.98,55.68c  M124.89 -2.41 C124.89,-2.41 122.06,-4.35 122.06,-4.35 C122.06,-4.35 122.24,-0.91 122.24,-0.91 C122.24,-0.91 119.5,1.12 119.5,1.12 C119.5,1.12 122.77,2 122.77,2 C122.77,2 123.83,5.26 123.83,5.26 C123.83,5.26 125.77,2.44 125.77,2.44 C125.77,2.44 129.21,2.44 129.21,2.44 C129.21,2.44 127.09,-0.29 127.09,-0.29 C127.09,-0.29 128.15,-3.56 128.15,-3.56 C128.15,-3.56 124.89,-2.41 124.89,-2.41c  M77.31 19.91 C77.31,19.91 74.57,17.88 74.57,17.88 C74.57,17.88 74.66,21.32 74.66,21.32 C74.66,21.32 71.92,23.35 71.92,23.35 C71.92,23.35 75.19,24.32 75.19,24.32 C75.19,24.32 76.34,27.58 76.34,27.58 C76.34,27.58 78.19,24.67 78.19,24.67 C78.19,24.67 81.64,24.67 81.64,24.67 C81.64,24.67 79.52,21.94 79.52,21.94 C79.52,21.94 80.58,18.67 80.58,18.67 C80.58,18.67 77.31,19.91 77.31,19.91c  M-28.11 7.68 C-28.11,7.68 -30.94,5.65 -30.94,5.65 C-30.94,5.65 -30.76,9.09 -30.76,9.09 C-30.76,9.09 -33.5,11.12 -33.5,11.12 C-33.5,11.12 -30.23,12.09 -30.23,12.09 C-30.23,12.09 -29.17,15.35 -29.17,15.35 C-29.17,15.35 -27.23,12.44 -27.23,12.44 C-27.23,12.44 -23.79,12.44 -23.79,12.44 C-23.79,12.44 -25.91,9.71 -25.91,9.71 C-25.91,9.71 -24.85,6.44 -24.85,6.44 C-24.85,6.44 -28.11,7.68 -28.11,7.68c  M-119.43 -20.22 C-119.43,-20.22 -122.26,-22.16 -122.26,-22.16 C-122.26,-22.16 -122.08,-18.72 -122.08,-18.72 C-122.08,-18.72 -124.82,-16.7 -124.82,-16.7 C-124.82,-16.7 -121.55,-15.81 -121.55,-15.81 C-121.55,-15.81 -120.49,-12.55 -120.49,-12.55 C-120.49,-12.55 -118.55,-15.37 -118.55,-15.37 C-118.55,-15.37 -115.11,-15.37 -115.11,-15.37 C-115.11,-15.37 -117.23,-18.11 -117.23,-18.11 C-117.23,-18.11 -116.17,-21.37 -116.17,-21.37 C-116.17,-21.37 -119.43,-20.22 -119.43,-20.22c "/>
+                            </group>
+                        </group>
+                        <group android:name="_R_G_L_3_G_L_2_G" android:scaleY="0">
+                            <group android:name="_R_G_L_3_G_L_2_G_L_2_G" android:translateX="206" android:translateY="145" android:scaleY="0">
+                                <path android:name="_R_G_L_3_G_L_2_G_L_2_G_D_0_P_0" android:fillColor="#e8eaed" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -95.63 C206,-95.63 206,42.37 206,42.37 C206,43.47 205.1,44.37 204,44.37 C204,44.37 -204,44.37 -204,44.37 C-205.1,44.37 -206,43.47 -206,42.37 C-206,42.37 -206,-95.63 -206,-95.63 C-206,-96.73 -205.1,-97.63 -204,-97.63 C-204,-97.63 204,-97.63 204,-97.63 C205.1,-97.63 206,-96.73 206,-95.63c "/>
+                            </group>
+                            <group android:name="_R_G_L_3_G_L_2_G_L_1_G" android:translateX="206" android:translateY="145" android:scaleY="0">
+                                <path android:name="_R_G_L_3_G_L_2_G_L_1_G_D_0_P_0" android:fillColor="#80868b" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M109 -14 C109,-14 109,14 109,14 C109,15.1 108.1,16 107,16 C107,16 -107,16 -107,16 C-108.1,16 -109,15.1 -109,14 C-109,14 -109,-14 -109,-14 C-109,-15.1 -108.1,-16 -107,-16 C-107,-16 107,-16 107,-16 C108.1,-16 109,-15.1 109,-14c "/>
+                            </group>
+                            <group android:name="_R_G_L_3_G_L_2_G_L_0_G" android:translateX="46" android:translateY="145" android:scaleY="0">
+                                <path android:name="_R_G_L_3_G_L_2_G_L_0_G_D_0_P_0" android:fillColor="#80868b" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M22 -14 C22,-14 22,14 22,14 C22,18.42 18.42,22 14,22 C14,22 -14,22 -14,22 C-18.42,22 -22,18.42 -22,14 C-22,14 -22,-14 -22,-14 C-22,-18.42 -18.42,-22 -14,-22 C-14,-22 14,-22 14,-22 C18.42,-22 22,-18.42 22,-14c "/>
+                            </group>
+                        </group>
+                        <group android:name="_R_G_L_3_G_L_1_G" android:translateX="206" android:translateY="877" android:scaleY="0">
+                            <path android:name="_R_G_L_3_G_L_1_G_D_0_P_0" android:fillColor="#373737" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M40 0 C40,0 40,0 40,0 C40,1.1 39.1,2 38,2 C38,2 -38,2 -38,2 C-39.1,2 -40,1.1 -40,0 C-40,0 -40,0 -40,0 C-40,-1.1 -39.1,-2 -38,-2 C-38,-2 38,-2 38,-2 C39.1,-2 40,-1.1 40,0c "/>
+                        </group>
+                        <group android:name="_R_G_L_3_G_L_0_G" android:scaleY="0">
+                            <group android:name="_R_G_L_3_G_L_0_G_L_2_G" android:translateX="206" android:translateY="50.5" android:scaleY="0">
+                                <path android:name="_R_G_L_3_G_L_0_G_L_2_G_D_0_P_0" android:fillColor="#202124" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -29.67 C206,-29.67 206,50.33 206,50.33 C206,50.33 -206,50.33 -206,50.33 C-206,50.33 -206,-29.67 -206,-29.67 C-206,-29.67 206,-29.67 206,-29.67c "/>
+                            </group>
+                            <group android:name="_R_G_L_3_G_L_0_G_L_1_G" android:translateX="206" android:translateY="50.5" android:scaleY="0">
+                                <path android:name="_R_G_L_3_G_L_0_G_L_1_G_D_0_P_0" android:fillColor="#202124" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -32.5 C206,-32.5 206,32.5 206,32.5 C206,42.43 197.93,50.5 188,50.5 C188,50.5 -188,50.5 -188,50.5 C-197.93,50.5 -206,42.43 -206,32.5 C-206,32.5 -206,-32.5 -206,-32.5 C-206,-42.43 -197.93,-50.5 -188,-50.5 C-188,-50.5 188,-50.5 188,-50.5 C197.93,-50.5 206,-42.43 206,-32.5c "/>
+                            </group>
+                            <group android:name="_R_G_L_3_G_L_0_G_L_0_G" android:translateX="206" android:translateY="66.5" android:scaleY="0">
+                                <path android:name="_R_G_L_3_G_L_0_G_L_0_G_D_0_P_0" android:fillColor="#3c4043" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M190 0 C190,0 190,0 190,0 C190,10.21 181.71,18.5 171.5,18.5 C171.5,18.5 -171.5,18.5 -171.5,18.5 C-181.71,18.5 -190,10.21 -190,0 C-190,0 -190,0 -190,0 C-190,-10.21 -181.71,-18.5 -171.5,-18.5 C-171.5,-18.5 171.5,-18.5 171.5,-18.5 C181.71,-18.5 190,-10.21 190,0c "/>
+                            </group>
+                        </group>
+                    </group>
+                </group>
+                <group android:name="_R_G_L_2_G_N_3_T_0" android:translateX="206" android:translateY="395" android:scaleX="0.6" android:scaleY="0">
+                    <group android:name="_R_G_L_2_G" android:translateY="-508.163" android:scaleX="0.68838" android:scaleY="0.68838">
+                        <path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="#9aa0a6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 25 C13.81,25 25,13.81 25,0 C25,-13.81 13.81,-25 0,-25 C-13.81,-25 -25,-13.81 -25,0 C-25,13.81 -13.81,25 0,25c "/>
+                    </group>
+                </group>
+                <group android:name="_R_G_L_1_G_N_3_T_0" android:translateX="206" android:translateY="395" android:scaleX="0.6" android:scaleY="0">
+                    <group android:name="_R_G_L_1_G" android:translateX="-556.176" android:translateY="-7.307" android:scaleX="1.39" android:scaleY="1.39">
+                        <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="#3c4043" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M136.82 -315.36 C136.82,-315.36 -137.18,-315.36 -137.18,-315.36 C-137.18,-315.36 -137.18,326.29 -137.18,326.29 C-137.18,326.29 136.82,326.29 136.82,326.29 C136.82,326.29 136.82,-315.36 136.82,-315.36c "/>
+                    </group>
+                </group>
+                <group android:name="_R_G_L_0_G" android:translateX="-30" android:translateY="658.997" android:pivotX="300" android:pivotY="64" android:rotation="-90" android:scaleY="0">
+                    <group android:name="_R_G_L_0_G_L_2_G" android:translateX="295.995" android:translateY="63.997" android:scaleY="0">
+                        <path android:name="_R_G_L_0_G_L_2_G_D_0_P_0" android:fillColor="#baf29d" android:fillAlpha="0.3" android:fillType="nonZero" android:pathData=" M-166 64 C-130.65,64 -102,35.35 -102,0 C-102,-35.34 -130.65,-64 -166,-64 C-201.34,-64 -230,-35.34 -230,0 C-230,35.35 -201.34,64 -166,64c "/>
+                    </group>
+                    <group android:name="_R_G_L_0_G_L_1_G" android:translateX="192" android:translateY="63.997" android:rotation="90" android:scaleX="-1" android:scaleY="0">
+                        <path android:name="_R_G_L_0_G_L_1_G_D_0_P_0" android:fillColor="#baf29d" android:fillAlpha="0.3" android:fillType="nonZero" android:pathData=" M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c "/>
+                    </group>
+                    <group android:name="_R_G_L_0_G_L_0_G" android:translateX="295.995" android:translateY="63.997" android:scaleY="0">
+                        <group android:name="_R_G_L_0_G_L_0_G_D_0_P_0_G_0_T_0" android:translateX="-166" android:translateY="0">
+                            <path android:name="_R_G_L_0_G_L_0_G_D_0_P_0" android:fillColor="#baf29d" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 64 C35.35,64 64,35.35 64,0 C64,-35.34 35.35,-64 0,-64 C-35.34,-64 -64,-35.34 -64,0 C-64,35.35 -35.34,64 0,64c "/>
+                        </group>
+                    </group>
+                </group>
+            </group>
+            <group android:name="time_group"/>
+        </vector>
+    </aapt:attr>
+    <target android:name="_R_G_L_4_G_N_7_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="translateXY" android:duration="1500" android:startOffset="0" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 206,446C 206,446 206,446 206,446">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="translateXY" android:duration="950" android:startOffset="1500" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 206,446C 206,446 206,395 206,395">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_N_7_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleX" android:duration="1500" android:startOffset="0" android:valueFrom="1" android:valueTo="1" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleY" android:duration="1500" android:startOffset="0" android:valueFrom="1" android:valueTo="1" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleX" android:duration="950" android:startOffset="1500" android:valueFrom="1" android:valueTo="0.6" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleY" android:duration="950" android:startOffset="1500" android:valueFrom="1" android:valueTo="0.6" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_N_7_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_N_7_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_4_G_L_11_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_4_G_L_10_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_4_G_L_9_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_4_G_L_8_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_4_G_L_7_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_4_G_L_6_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_4_G_L_5_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_4_G_L_4_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_4_G_L_3_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_4_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_4_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_4_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_4_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_3_G_L_7_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_3_G_L_6_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_3_G_L_5_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_3_G_L_4_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_3_G_L_3_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_3_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_3_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_3_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_3_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_2_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_2_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_2_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_N_3_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="translateXY" android:duration="3400" android:startOffset="0" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 206,395C 206,403.5 206,386.5 206,395">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="translateXY" android:duration="350" android:startOffset="3400" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 206,395C 206,403.5 206,437.5 206,446">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_N_3_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleX" android:duration="3400" android:startOffset="0" android:valueFrom="0.6" android:valueTo="0.6" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleY" android:duration="3400" android:startOffset="0" android:valueFrom="0.6" android:valueTo="0.6" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleX" android:duration="350" android:startOffset="3400" android:valueFrom="0.6" android:valueTo="0.72718" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleY" android:duration="350" android:startOffset="3400" android:valueFrom="0.6" android:valueTo="0.72718" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleX" android:duration="217" android:startOffset="3750" android:valueFrom="0.72718" android:valueTo="0.72" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.51,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleY" android:duration="217" android:startOffset="3750" android:valueFrom="0.72718" android:valueTo="0.72" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.51,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_N_3_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="0.6" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleX" android:duration="3883" android:startOffset="0" android:valueFrom="0.68838" android:valueTo="0.68838" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleY" android:duration="3883" android:startOffset="0" android:valueFrom="0.68838" android:valueTo="0.68838" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleX" android:duration="167" android:startOffset="3883" android:valueFrom="0.68838" android:valueTo="1.37677" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleY" android:duration="167" android:startOffset="3883" android:valueFrom="0.68838" android:valueTo="1.37677" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_N_3_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="translateXY" android:duration="3400" android:startOffset="0" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 206,395C 206,403.5 206,386.5 206,395">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="translateXY" android:duration="350" android:startOffset="3400" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 206,395C 206,403.5 206,437.5 206,446">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_N_3_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleX" android:duration="3400" android:startOffset="0" android:valueFrom="0.6" android:valueTo="0.6" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleY" android:duration="3400" android:startOffset="0" android:valueFrom="0.6" android:valueTo="0.6" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleX" android:duration="350" android:startOffset="3400" android:valueFrom="0.6" android:valueTo="0.72718" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleY" android:duration="350" android:startOffset="3400" android:valueFrom="0.6" android:valueTo="0.72718" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleX" android:duration="217" android:startOffset="3750" android:valueFrom="0.72718" android:valueTo="0.72" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.51,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleY" android:duration="217" android:startOffset="3750" android:valueFrom="0.72718" android:valueTo="0.72" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.51,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_N_3_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3883" android:valueFrom="0" android:valueTo="0.6" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="translateXY" android:duration="2667" android:startOffset="0" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -556.176,-7.307C -556.176,-7.307 -556.176,-7.307 -556.176,-7.307">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.272,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="translateXY" android:duration="250" android:startOffset="2667" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -556.176,-7.307C -556.176,-7.307 -421.176,-7.307 -421.176,-7.307">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.272,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="translateXY" android:duration="417" android:startOffset="2917" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -421.176,-7.307C -421.176,-7.307 -429.51,-7.307 -429.51,-7.307">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_N_3_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="translateXY" android:duration="3400" android:startOffset="0" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 206,395C 206,403.5 206,386.5 206,395">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="translateXY" android:duration="350" android:startOffset="3400" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 206,395C 206,403.5 206,437.5 206,446">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_N_3_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleX" android:duration="3400" android:startOffset="0" android:valueFrom="0.6" android:valueTo="0.6" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleY" android:duration="3400" android:startOffset="0" android:valueFrom="0.6" android:valueTo="0.6" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleX" android:duration="350" android:startOffset="3400" android:valueFrom="0.6" android:valueTo="0.72718" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleY" android:duration="350" android:startOffset="3400" android:valueFrom="0.6" android:valueTo="0.72718" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleX" android:duration="217" android:startOffset="3750" android:valueFrom="0.72718" android:valueTo="0.72" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.51,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleY" android:duration="217" android:startOffset="3750" android:valueFrom="0.72718" android:valueTo="0.72" android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.51,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_N_3_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2667" android:valueFrom="0" android:valueTo="0.6" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1233" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1400" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_1_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="pathData" android:duration="167" android:startOffset="1233" android:valueFrom="M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c " android:valueTo="M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c " android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="pathData" android:duration="1050" android:startOffset="1400" android:valueFrom="M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c " android:valueTo="M-0.01 229.99 C35.33,229.99 63.99,201.34 63.99,166 C63.99,166 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64.01,166 -64.01,166 C-64.01,201.34 -35.36,229.99 -0.01,229.99c " android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1400" android:valueFrom="0" android:valueTo="-1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3483" android:valueFrom="-1" android:valueTo="0" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_0_G_D_0_P_0_G_0_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="translateXY" android:duration="167" android:startOffset="1233" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -166,0C -128,0 -204,0 -166,0">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="translateXY" android:duration="1050" android:startOffset="1400" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -166,0C -128,0 24,0 62,0">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1233" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3483" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1233" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3483" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="translateX" android:duration="5133" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+</animated-vector>
diff --git a/quickstep/res/layout/gesture_tutorial_dialog.xml b/quickstep/res/layout/gesture_tutorial_dialog.xml
new file mode 100644
index 0000000000..59bf7b965c
--- /dev/null
+++ b/quickstep/res/layout/gesture_tutorial_dialog.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/bg_sandbox_feedback"
+    android:paddingTop="24dp"
+    android:paddingBottom="24dp"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp">
+
+    <TextView
+        android:id="@+id/gesture_tutorial_dialog_title"
+        style="@style/TextAppearance.GestureTutorial.Dialog.Title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="@string/skip_tutorial_dialog_title"
+
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+
+    <TextView
+        android:id="@+id/gesture_tutorial_dialog_subtitle"
+        style="@style/TextAppearance.GestureTutorial.Dialog.Subtitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="@string/skip_tutorial_dialog_subtitle"
+
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/gesture_tutorial_dialog_title"/>
+
+    <!-- android:stateListAnimator="@null" removes shadow and normal on click behavior (increase
+         of elevation and shadow) which is replaced by ripple effect in android:foreground -->
+    <Button
+        android:id="@+id/gesture_tutorial_dialog_cancel_button"
+        style="@style/TextAppearance.GestureTutorial.CancelButtonLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="46dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:background="@drawable/gesture_tutorial_cancel_button_background"
+        android:foreground="?android:attr/selectableItemBackgroundBorderless"
+        android:stateListAnimator="@null"
+        android:text="@string/gesture_tutorial_action_button_label_cancel"
+
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/gesture_tutorial_dialog_subtitle"/>
+
+    <Button
+        android:id="@+id/gesture_tutorial_dialog_confirm_button"
+        style="@style/TextAppearance.GestureTutorial.ButtonLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="46dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:background="@drawable/gesture_tutorial_action_button_background"
+        android:foreground="?android:attr/selectableItemBackgroundBorderless"
+        android:stateListAnimator="@null"
+        android:text="@string/gesture_tutorial_action_button_label_skip"
+
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/gesture_tutorial_dialog_subtitle"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/quickstep/res/layout/gesture_tutorial_fragment.xml b/quickstep/res/layout/gesture_tutorial_fragment.xml
index 16b2c56b17..700dd1f9f5 100644
--- a/quickstep/res/layout/gesture_tutorial_fragment.xml
+++ b/quickstep/res/layout/gesture_tutorial_fragment.xml
@@ -15,6 +15,7 @@
 -->
 <com.android.quickstep.interaction.RootSandboxLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipChildren="false">
@@ -53,112 +54,93 @@
         android:layout_height="match_parent"
         android:background="@drawable/gesture_tutorial_ripple"/>
 
-    <VideoView
+    <ImageView
         android:id="@+id/gesture_tutorial_feedback_video"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:layout_alignParentTop="true"
         android:layout_alignParentBottom="true"
         android:layout_alignParentStart="true"
-        android:layout_alignParentEnd="true"/>
-
-    <ImageButton
-        android:id="@+id/gesture_tutorial_fragment_close_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginStart="4dp"
-        android:layout_marginTop="30dp"
-        android:accessibilityTraversalAfter="@id/gesture_tutorial_fragment_titles_container"
-        android:background="@android:color/transparent"
-        android:contentDescription="@string/gesture_tutorial_close_button_content_description"
-        android:padding="18dp"
-        android:src="@drawable/gesture_tutorial_close_button"
-        android:tint="?android:attr/textColorPrimary"
+        android:layout_alignParentEnd="true"
+        android:scaleType="fitXY"
         android:visibility="gone"/>
 
-    <LinearLayout
-        android:id="@+id/gesture_tutorial_fragment_titles_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_marginTop="70dp"
-        android:focusable="true"
-        android:gravity="center_horizontal"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/gesture_tutorial_fragment_title_view"
-            style="@style/TextAppearance.GestureTutorial.Title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/gesture_tutorial_title_margin_start_end"
-            android:layout_marginEnd="@dimen/gesture_tutorial_title_margin_start_end"/>
-
-        <TextView
-            android:id="@+id/gesture_tutorial_fragment_subtitle_view"
-            style="@style/TextAppearance.GestureTutorial.Subtitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/gesture_tutorial_subtitle_margin_start_end"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="@dimen/gesture_tutorial_subtitle_margin_start_end"/>
-    </LinearLayout>
-
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/gesture_tutorial_fragment_feedback_view"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
         android:layout_marginStart="@dimen/gesture_tutorial_feedback_margin_start_end"
         android:layout_marginEnd="@dimen/gesture_tutorial_feedback_margin_start_end"
         android:layout_marginTop="24dp"
         android:padding="24dp"
-        android:gravity="center_vertical"
         android:background="@drawable/bg_sandbox_feedback">
 
+        <ImageButton
+            android:id="@+id/gesture_tutorial_fragment_close_button"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:src="@drawable/close_icon"
+            android:background="@drawable/bg_sandbox_close_button"
+            android:contentDescription="@string/gesture_tutorial_close_button_content_description"
+
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"/>
+
         <TextView
             android:id="@+id/gesture_tutorial_fragment_feedback_title"
             style="@style/TextAppearance.GestureTutorial.Feedback.Title"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="10dp"/>
+            android:layout_marginTop="16dp"
+
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/gesture_tutorial_fragment_close_button"/>
 
         <TextView
             android:id="@+id/gesture_tutorial_fragment_feedback_subtitle"
             style="@style/TextAppearance.GestureTutorial.Feedback.Subtitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/gesture_tutorial_fragment_feedback_title"/>
+
+        <TextView
+            android:id="@+id/gesture_tutorial_fragment_feedback_tutorial_step"
+            style="@style/TextAppearance.GestureTutorial.Feedback.Subtext"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/gesture_tutorial_fragment_action_button"
+            app:layout_constraintTop_toTopOf="@id/gesture_tutorial_fragment_action_button"
+            app:layout_constraintBottom_toBottomOf="@id/gesture_tutorial_fragment_action_button"/>
+
+        <!-- android:stateListAnimator="@null" removes shadow and normal on click behavior (increase
+             of elevation and shadow) which is replaced by ripple effect in android:foreground -->
+        <Button
+            android:id="@+id/gesture_tutorial_fragment_action_button"
+            style="@style/TextAppearance.GestureTutorial.ButtonLabel"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-    </LinearLayout>
-
-    <!-- android:stateListAnimator="@null" removes shadow and normal on click behavior (increase
-         of elevation and shadow) which is replaced by ripple effect in android:foreground -->
-    <Button
-        android:id="@+id/gesture_tutorial_fragment_action_button"
-        style="@style/TextAppearance.GestureTutorial.ButtonLabel"
-        android:layout_width="142dp"
-        android:layout_height="49dp"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginEnd="@dimen/gesture_tutorial_button_margin_start_end"
-        android:layout_marginBottom="48dp"
-        android:background="@drawable/gesture_tutorial_action_button_background"
-        android:foreground="?android:attr/selectableItemBackgroundBorderless"
-        android:stateListAnimator="@null"/>
-
-    <Button
-        android:id="@+id/gesture_tutorial_fragment_action_text_button"
-        style="@style/TextAppearance.GestureTutorial.TextButtonLabel"
-        android:layout_width="142dp"
-        android:layout_height="49dp"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginStart="@dimen/gesture_tutorial_button_margin_start_end"
-        android:layout_marginBottom="48dp"
-        android:background="@null"
-        android:foreground="?android:attr/selectableItemBackgroundBorderless"
-        android:stateListAnimator="@null"/>
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:background="@drawable/gesture_tutorial_action_button_background"
+            android:foreground="?android:attr/selectableItemBackgroundBorderless"
+            android:stateListAnimator="@null"
+            android:visibility="invisible"
+
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/gesture_tutorial_fragment_feedback_subtitle"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
 </com.android.quickstep.interaction.RootSandboxLayout>
\ No newline at end of file
diff --git a/quickstep/res/raw/tips_nav_back_left.mp4 b/quickstep/res/raw/tips_nav_back_left.mp4
deleted file mode 100644
index f40b3b7b727016de24d593989e6b667d17fc3da1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 485479
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
Zk0E?O>R-mAnjS!TRMP_-e;V1@`7eZTnxy~$

diff --git a/quickstep/res/raw/tips_nav_back_right.mp4 b/quickstep/res/raw/tips_nav_back_right.mp4
deleted file mode 100644
index 93841c792f6e7bbb5cd04366a3b00ee7c231d991..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 472301
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%0Du#CIQc*8-xHA??zbh;?nS4SS0jzCYkn4F`u%O
zu&XeJAyOZHqgS<y&VaYK*HAWwbxyQD=adY{XT?>96rZ8+{EB)*gkRQ|1rx~TX(2w0
z^NoY_n|<Z;R_?;U_qJGb`4-X)vu+qCB?+mX({u0pX(7;C*lz-+8n2xe&{iN6%8ovt
z?_D%y?ih&n5@O&JIzVEY$<}e7dG~|JvFC$xriih@k?QEH)h^^citTJlGF6{tCvp>j
zZ?Ma#uurL1c*Tm_7a*U79(F(bB%sDmv?T{_YYr&spfby)P+$uOXdGm{@QiSsYd3+4
zS0YlD$f*YPjep&DOnI7{a=&dEy3s0A@Ymbx6ZpZ%V(wR`)c@&GT%9PGV~Itoezz36
zp7{)$k|bGjA{x0V6CbTi*Zxf_^Pt<s&xkY=_`FFQ@P4D)!yW?SKGmWWlhF>g`zUOO
zAdPX%+crCKlS;?ohuH@FRQ-NoC}_<<8UHlO=l6z^7QP%gvrDo4Qw(eSSv;0!CZL|w
z@(>bZbfWQt#>kzkv#uBYJi>G+hF7xFAWeV}rdBiSdh*+&-nT+z+UE2TCHO}*bQ@AF
zLxhV@z$2TxXgsDr(K=y|(MAYYmuh17E_}VT;(X4wWrZvx4L?)JO{j3t_^tOw9iE){
zz8*~!A=C(lOCsS{y)|dQ%YkX_Yd^wx;dGr@h{;TTLB(e}zz5w8N2wj1QP}4BM#l!U
z4URoQjetSZ;suS!Bi~!cZuSNt`Xd69qMj6|8|m7U*yWw02^-iN>_Wy*KA4ERhN0{J
z3s>O=CFe4y$WKWnmcm@0i{J!mmyt+Uc!^Fz1^f0KHj>O|V!ux^ze?g#*F~WzI4gH|
zZSM&AC9Khi`{TIm(KsQPjBT9!2W+a(`v{+_?_1;;A2n@vr0QI6`^JwSwgIzU3nyP;
zUcz&qNM^#{cqKWfaH@%`BZ?0m0nOqF=!!ksQnfVpu?L?`P@fzj+y+tLeYKyo27TG+
z_RFMR@pgLx0dwouH(guRg3hdo;hL%QEfmOc8IA!j(kB~rH_pQy>yjT|(G{pUs2mhP
z<@&5~>0xWLXW(+k;~x4r)wA#3<=oc(Zhk)4>Yd}kc)|JTShSSIKx!jYK_c0#xrcm@
z%!ntzDqgCY-`>a#LD1zR<pW~x8%d*wQ<d}j6$FgXeyd&3(TM^+4RcmUUgx3wdE?>i
zaq3m04AQm3o~gi55k=-oZtkod@?d_*eOrI@=jQ_3z8!9B;A%}6FhlU1sva3G;9uUG
zQnoe($w%BHARxLarZmoQQ4L&3s7J~cV#JO50leo9b%`UYcvT;KL-OIjrd{qoLjbYv
zPH-$Ml2jxp<CBWTV-8cUks>uK_&uG?!{v1Yt{?E0M_DB{Btam!bbE`71F*{1kPu_E
z*HX}?=Jz){6P_9ic3_2<F!ttH!<2x}=BvMWNaEU6C<Umy`fRvqh7>RA+?tkcsUCI2
zHb?qY*90}95v|`p`v(TvtJN)@kITCKl4FTqCs#A9_g0O(RyTbOVT$}cAbgx!;-43{
z04xg^XHee<zdDDgzOy)XHvc_9W7N6l66<}dfi#l>X2sv6+d_g?HLRA9M?mbS3Cp5+
z@~XU`4cO8weZ+6()VfmNO(kGHDD1^1*WQgyrN`fKLV9QB0Jj&kN<iK_-=|@A)W{hD
z@8>>N>C9#=Sqs52J)1qVFZ|3lAZi@sM*rg1ns9fhe(6d{dASa2Z*1m4aj8qdxTYzr
z+vn38FI53yDs)vS?DD-$JVJ1u>}hpL`f}DMkuHGvPe43F$b9XSHNV8|k0ap<olX)S
zguQ2aa9Oh$4miZmU(0qtT~dDQ`f13u`7_iLu@?KTMB1fd%_(a#R-+|IK9=nd6|e<M
zO;u0hTyHk^pkTj#2p@D$z2N*N%)&%EL}(|10%lc(jnhWJR<F9+cBtSjw9*F1v!i~%
zR1fTofLsgnLKfySw|NT5dHGYw7r@H3P$=#<AqgWG7s`Y!uLt^5WX5T@nZp0z@<`kR
zkAT`DS@z`BTsJrGf6D2|-r_RPLrRrgqny_&z-sMeKuZkLscn)g;KN~ywHk_W`-GUW
zuiLGY9C_|8ya4)Fm2Jox;vE!VqW_N9st_N2D?%p5)J>aW5CHDH8u=sMf6cc{B^f20
zd%CKi221Mmm7i=S5ri9k6BT?JE65&V(gsb72P;8_x0}yfhh=CcJ8cDKs^ZpezU!G*
zz$yV-8?4}7+}D1{az?s#&XirZxtl1vlP2A4&8NPWebMDvP~@B<Md<hUxKj<0doo6i
zo|zNsMBH$=@S>oUh4<`bjQ}GWPP?ws!0)c7i&<of0U|j(u18gGt4ODdW%7ld_ppm)
z3fT*KPlfnAuBXkMTo}|}1IgesXrg5bIUGLAk0W2>3q~D-5nmIO&Sq}?{u<|z!{ky%
z_?l_;PIn#cYbNQSV;JJE3$p}lyiLBwPnq;~#l8-U7Sj&4s$W-#8$xmdMZzn=2y(CJ
zmuh797{C?)Q`0E*)WdddpSue0N{$Ioa%G2<NfU#y+S?iY1TidVZrm5ct#OFi@#y4}
zALAjYjjSXQQnGPCTiYVS-=k?B&&Ma^XCz3>BqMa<!1POE(+_0DTXAPX`G7CcnC<Sw
zJ4BLiGWR{^x07FfDolU2oYyYd{#|r=FE>^+aNLwWrAt^lBk^ZnSIUBpvM;SAqwe_;
zAf}AJ=nyAIKRqQ0hUr@O#Qq%Jl+5VTth;o{P04g!kn;6wS)C(K!oO6o&A~en=~7s)
z@=z@Uz66ezI1O<Qz~z5X$K&VL4j#oe>AHp3e>p`cq{xUB)%ePl<D<C6j1Kg26e@5n
zwiM^H6^#0)BFW1kqE#;~9w+oX<Tc44u>-1(do0YU*qz)Q;y6Z4r5I<Bo<9ii_CEW@
zx*lBC#BA|m<Tdg++usVA8gBdBe?Y{`s*@JK_QF1n!^a%|3JUDpbh?h!UC6P5J|)=C
zrF|y>YZ}uSusy^*Ng?;i2$bkEHJ@bV7^8i5CKA#tE7PWzc6u4$+<mNM+OG71RB3US
zuhy}bny_Cl#lpv)!;ym=u_Xf@$z79~;q6OUE-TLw&Wwztm_aRg!sH&;dEsy6k-KZm
zMXS+YwC?}8B+ztim1HR>7?r2^%y}GvyQ6}|7Z(tADHorgP63*jk3{#|IN(a$hpiDO
zzS-fKIU}#Pzk}ggSBXwaR07VVg8j3l56{MkT~LuF>Q)M`K!h)mywdxj7iE8NbEoKT
z!_g~IV<oa)U1Fu_g$MYxW2A=7$6va$b}bg`#-}Bc@NRm7-)~{i_uKK@=nz_-4nuQ?
zK6Q;fWk)4EtPF_<unA~Eq^|lt@Dy<)3|f-^RqC%JwZN-SbklX?Q*faDwp+i;G|Qc$
zYO?ktzPC)Q{`74OEWFcglL%eRC_G(}i_CVW)=td9YShE)_bV~u%EEOeu;9GPtPhKu
zxpO7fq<RUAJeHvlMZVlhk6k!3uy-h?=>Er<&yj0_v0c|(p|>xhd@k$I4c6T&6ZTGF
zvXkPb&DIxVtY`gOwp4kiiZ+ah)iT=VU*q`=ALgj4RhQ|2WO?po14>%0(nA!$Cml0p
z&iXKjBO>>@;LE%8#cKqQHr-$!qymKci#8qWlZf-G!&WT8dTwHrbvNIooYN@QO9~~8
z9^G|U&QJKx;<^Zd4<YxMJ-kKKT)y*?B)gS)xx`ZHZJ_!pQ(9kAV7OAqO}iJz>@XI_
z!OHzuMdz-n_tl`=BzXvcVqbXWE}NE3gA60+xPg@3IZS53VS`gjWE$p<z}!iCq%F`$
zf0xQ-atAJSq@;%yZS#hZV07xD%(!O+j4TMx^MLY)9CSS(u<C$)co!EqW|8-&!98Lh
zz3#!9f8rxxR2D&Rp5{fK4jQ@>C4>yn)vkP`ar*e$k;ye%vv-FWRPO6z+8DmCHodIF
zhJW*nFaeu$z;H&tF>urcVLlC#r;X5HkYE|+{04>TAB(9fvF!+<C9<;WbV#{Fs~;|e
z=M4YMtz6AcYNGjv&m!P439nIv188e@;WgnZ@349~J7n@$kFnhJpr#;~fJ}d?wFV@o
zJC!yZGVE(Vox0J<kc{ypZts+J;kor&Xpi8NGp7eRT)E|M;<1X0icUq#Y^6O9lGfrk
z89B#o5;n>Lh}y;zDWH)^5zT;E_?~1ymf_w37faPDN>=m0XeTNp4w$(4(Z`9UaNaNO
zrvuXqDFAm11Lkjhq9Cun0u>Vh<a_;+-atyD*QA`&&QGvKF|b-y<)sN!6zR=~=*3O9
z>q*!tG4*s$iLa0)B`_1v)rD$F5kc$voV)INb;2ly?qe*yX32;@3iZ3<P4=9wcfWE6
z`~l~=g^nM#<xXNgVGP3%aQX;?CTxqyq~G{DNNOdE6pd<TJy?kEpvWkQ0ick-5;<Y_
zlbDr2DYsT1=UG+iHVdb$A!Pn->pOW^p}uT;_Q|2F*1r}74JVp^+j>%d52$~eN8D4D
zf1ij1s`KyFV;E@p-^)w`lkFfUAJH82lO$0dckIeg$t<Nl<rJbeq{4Bs_p_514`vWr
z3LBQtzG)!GbNN(S*nn+N%n%5omZ4y8_`oOt@MtG@eqJ9@;T>KQV+=3X61yB-dJxgx
zEi)m@55k2JUmxl&m`Iq4WJVj%F`zvaw!}jgF!HrvgXRF2g9C~Gf4gFU{IDCkdh;iZ
zC4OkkoPF#6SBwJhsa>V{?~eEWp$9#l$!;s7hm(-PwC1%O?n&nd1{fM-vNw#ESqZ&Z
z^iKj-m$7IE;BPrpl`+tEDGHJ2kVJd}&$z*)U-t<VAlqRLqivR>Q~1NCmd;NAd)18K
zJ&;8$vog7#Ar;&cP{Ly~#9&N=e0}8|l+ltQ;vufP3)|m<ZStP(-2tuRDRr9$SEhmD
zFYfsU+KD`E!IPLeWg{uAxwbnSYYGkGnG-MicVCI1s3Z8O!L8Tdf2P=7dvZcE$mK>+
z@0hlFEUwP*v-~-JXF0&@Kx%ABz%Pa+Nx*!>q|sceZb?~8<XSdE_dh)7$5}|%ro5yJ
zDx<R<S%i?K@zhchj@cy6z_?vAAzUc^weE>81+~Jn^K_ZDZkN9gB5?^MH}QTwjgpXJ
z9SS~aO^hPc*2YcyRTI8y*|;&yh$JZ<K^9shpB>5rOU82pw!Qb-1^bv$8LMfIzJ^VT
zZ)4$6B+|1bC6%`uX$>EZbv4W5lHKoh=xu4<=NSZtm}Q~I2*V%SnY8g)W2l<(Jm_aZ
zxEn9kc{V4#+Of@51IVeWkQ}a*lQOG|c(|A1(>pbfh!M0dSEnvF$K$qt%j}corFQ)%
z+MbRlrf!s<Fl6Z<;a%s7Ey?@p1qP3GB~2n%K!hfvTQEk!?N{j~H};%>Uk8>hIq(}L
zIm1af`bS%AsT!cP*9g^=5CD90tJJDaE`9F$w{z0x@xZ`VsUwZ^*EG;@x@_6_i{&Ws
zus^9HQT---vr=>$Eppok7S9y2%(}MuBR?vU2c(Sn_oTs>fv5Yg2f4}2Gs=%Z@5~xb
zMf~$w_Hk#oy!EEQY?`8?1U3K)v;<;*<g<QBBRH0GN5WyP54C_`T#+ZjcLL5mM)WHX
z>a55Bp>ZUZ0fG}KNg$9;kL`1wQlB25KO5x?wTY7X=i20?R7T9dLBh7bPy`-+4o{lB
z3x5@iKos{7D1?OD9)dRvJkm^17!P*S8WSzT7p-G4*Tvf|Txd4o)DnYCVh-6KWG@6v
z_Zu`J>*-&`GQK^*ESWPy4Xe1n#Aow?ra#%ODX==;Wo@n;XGyXIznPQX=FyinbjBhQ
z70W`>Pih9d#`m>KxjQdkoiw0R`L45GZeuLc1wqKWDjtv#f=9bkpDWDxV}r5~QT&<;
zya_)S`H4ten#*b|5oIIC!|<+2^6Lvwuu|e3G+?3s-yU`9rF*k^fPl;c${~g-i+trw
z+M_smz*$YK?8z}kM<8!);pGx=m2EC3qTtb+c}ViGaQO)T`gX##gu>1onU(rC-(iY`
z0utWZoxWRJCqwQ#1o5l6bg?ZNMtkbkAEKllCe2<4cd(peXIW9z)5SV#`^g7sTGHr|
z+;t+F!KrtZ7!lUIXxFS$>o)l1cJpvmSpw&x=Znsmn{C6Yl2K1)Bypz#&hapaT*<e_
z@Nm8`4dLCGv%mGOwk+~U#rlie{74{@3g=iZwxHYMWo1mjS$1Vbmd99C)XIQCQAAfc
zB3Q|35a082h)7|Zgs1T6`F3`Hn?nN%1tJ=G84sP(l;OeNu7_hx+8V?@@tA0usem+y
z+3YTVNO*Hjs^w2~T`ej)xs4a7OjUp|*PCk7B@Hwls%+PY-TKsrabCw)+IwdYgY$E;
zIcEG|L;ip#MVUvT!i9&h`7_lz)y;=H61rEE?aTsi&${{yi>AQIzv_B|2>wWO-+|3>
zc-FekeNKU15eo#NqF($1S4`Cwv`3KgB_ygNvFIZ}goN(ty)Q$7m4F_11qdfZY(xI>
zXk5*)i)){pDmuS8Od%2sw(RE?#Nhc!kN;5#JlD|BL(Di<e?@g~rKA;A`DUD)vON%x
zaEQzxeJe`vlP~%Cp@p#XY1)qpF7?hH)V?}+Ik-S<D-o92*%Kty$6V?bwjJ-6vkj2%
zyzI&zE;yuPwPielr>Iuf%b}{w@Gfx~tiT+tX>Qij->bfAcNqw$Uwz<fu)rEa1k5)!
zNv3Tu1YMVb1G(!BBc-qjLS!84Nky_bv~ptfs_n=`+2W{(5PdhWZb}2c1D=s}Hlm7p
zQAM7%`#8bW_cDELpOhcjU=ItH;iP(x8#hS3+}xJZDRX?%&`#X*;_*A*v`82z(S{wr
zF(FSCJN~@Nb&W(&m#`Y%Q=ePMUy(LKF0GcfwZA`&6N|4Ieo*Hicfbuo&SSdwc>}nN
zl2zrw#qDTg8MR&+TMMzCFI2YyYINjPDl&6#i^2Rqd`!t#LwZSnSPsb0#^bGuJ!W!A
zNr#pM`r4%lDl~s(5^AK&Uc<^EHx(eKdsgiR1jVM2hB86!;M^&krt<n^W2Q6Za5tT$
z<x~wo4&~_PcWlK?Oxck#@(X)tP|G42;5C)G_qG4P7Z}=UEqXDw@tggHcPS?!)*AZE
zMf_<>I{6WJM3MDy(X$q*2tQ^<GD2E7!@?~Pbe>cPA>SYRuB2n2z`Q(y+|e`3E$}il
z+ekt+AiJ?@UUz%9=MQ62Ek*(2HUKhGQgTIEl6VR>vcI`Lg3Pjq87EF7Vi7bH%8(Q$
z#CaKC=s+^^_TJ3u#h8`FGXiFqgWZUnMcwe42syqZz}MnWiFMHh=xyuymH@VbjIyFR
z$O<yiVN(R#M_%amkgD}3uaGhXK4qx5FA;AN(AhPJA0~AuPZ*WNy4V<eVu6#Sj4LzN
z<I|dG;Tm(TkW3rFMT`Uvl#dJe@)`cV{#yY~K)`=D{~m#W8~}e+_zwlPu>Pa-&nEEO
zU!4A_$iI4jar%cQe{uSU99tOw=>A6s`13DK{~^bJHUHA|4^95k^ba}y7n<(>()16h
z{@wXY(?2x%OVdB(_}^T;kH0wmL#w|y{ZBdm;`9$q{+GpR_AgEUkm@f@|5J{?H2p)9
z|AnUczcl?rs=qY-PdWb5^bbw`H&^fJFHZl^>Mu_JQ;xql{X>)gWpTRvI<f0(_ey~L
zf8})9YVXQKvFTSQ<jMcn&J|ZFd#4l*H`Gq;WMVS2j7Du!Qvj-$oetSKB3_i2i-QlP
zs(4g+Lv08+<(O6|2fM$kLuJMo6P~c-(<DC-LB@g(!~*qQ{(-3^$xg09?V>nb?Ctk5
zKcS|eicm941(2SuscwOkhVsbXqj<m{?v5<<H+@jzQqkkUiHPZWHnX03K=J@>q`l1Q
zVr-*{nVFiM(%8_yzS!IA`BMys(O1)wcn1U6=>O>1K0?Xur%k&z=EI?#!;A6D=!SKl
zcZ-U=WZuu!t=PjGvMFw22XKBH-BCE5Db$$(9<0y(9=n(s8exUkm1g5q=xb?ze38^v
z{Z2nv6qD0D9sO|sv)#;^l&(6NXdR0aQr9Fzg<Eeus5{9CE2tBnC|OU^3V5H&9TL>h
zH#wIJ#HiivXc_G4ltREN^@@0d=}>rY$K<;PBbyzh`d%KYU5wH=M#ISJ5L;J(IF=wP
z4TYogK{hiIhCT}0^`}1I>{N9H5oOLdP$|VPhi<#9Mi{7~J)EIiZlWj%Qdre?E+^5M
zEB?wDqn07;4>TMcWj5ZO1X{jgMOiWBG>t0B1NlO3c)KxQG(Xohx#@BG&P0@Tj`%OU
zQOt{;#9x=;gC%H1SVnPwnB>2zW&2Rpj%q?Gz<NZY#?qKRZj_2IF4*2#ET*^MOSSE&
znAm$z?|r9fxaG?l86?u~xJ8fsP}1}4Lb$KW-F;?`;h73fBab@-xz-Xe&f5x05>(p3
z<nw7N1`ohYtK9u$SVTE~N=ctk_WTy_fVbTA8!7zOEv?HH>TGIZ<Jnuf+3*;oP7s5?
z4q3LmNa=ISZcl07kj?RkVBfGqv{yW7xKIq{CrLh?zK?AiFH{(LAMIp4PU;J!dU%u7
z+?j3fxdHxG38X}M-}!xd((k;jQ4Bo5J$`petpn3U$%X@ymU~(Rczj8Lav>(B={E{s
zBN1P6b^HunJQY;3;RXeKK0QOE!<%t~VCb?6X2Xyj7PeMM6%B)_aMLJZnkm#MawXv<
zju@6;bI*QkwO#e^<gD;*7B;Bfwh7(^kv{OscxeY-oT*MfY8f=xGqdbBGvG#px~qn-
zC#ZjgF8@^3{0K99F(DbW7yt1JJz%M(i&aIr{^8^vt7G$W41k)u&ed%VUGO~F3mCVd
z)94|To7w8AeR%Sa)rz4!AuwOY+L#{cOkT<eXI>J`uq{0{K|dA54~~zLT}4FufIl?f
z;tUtx`_`+!Y4C7bsh*PN^$?-rP-XAa99^i(y$`Q9AdMNTcFWy*gLOQ&d!;A^^b+u8
zDk6Z(A%N8X!&LkW#jiJLVGiHpiSyZ{bMt)psaQ81Y3$8$8s=CdN1Yt2{j0=Fj~4El
zudkh90xwbf8`q}XBZI;tgok(RvD61RXKj?7iES3v4kj7F;%*faQ_(uHzLLYbArmU|
z#@5Rd$%_VkNDp;Urjz4p0M5TYj{nOxfsGRHU;zjGpK<?+j&`O<9|KqeaB?39fh$tO
z6}Syk)n}D=GxG|sD<Bhi&%Bh5G&1TP;g4Uu7?De>iKE(k3hyHib^{AZ!Z;L@9;}tT
zl^l7n-{F~KgiA5|(E!1w%wY0N6(qNBXmOPIKTc{LI4ZIB#@JZ9W&kQ8`i|fdY)K6f
zw%`i&SSU)!7q4j82W!5i*SXA)NP5nWjo)yDM<(^b2KI60OwsBLI~pNZ%Y!cJ={Vpq
zpgznM(A~FM3xl5fdl$l-pIOFR%>bT^YeJQ)=`m0z+I_o9uw7d!j0r4QN74}t48o=P
z9Ob1H`3H<DSFMy%F9g7Vye^cJM<9oP1La)21lOKR{Zvq?AljfB0|sxi$@bL>$-%6>
zwWw1dB&Cw`ll>K#)9oxGNva=FNKfb;ny<EjtVg9r<EnSZkb|d3wkpuUM+3#e|73v)
zTaaL`!WMFp#+Ofwur@aUA<bj-lMq+t&QsHb3*V!c+>^+8&Vd*XN274#TCYydcg&Wa
zj%PFd@jI6-d{DpLVd7V=&g2iPi=X)r3VKO=E}j(ZN6(ZMe<ZUJitOTIK~tvDN~%u}
zV4R0KMSZFn=u_Os+n~=QfF4c@cD4|w)r8edJZPzLp$Wq|Ja8fRkl(UOO>s_Ou1}dP
zHtg7jD{rk&0%@S^JnCDT)Sxa}5-L-tAE`6&p4V3rg-G@)Jb2na<1uK@1drz9+f-N*
zKz{VQyO)_SVP*}k&;^ieYK#p@sm@4zUueFkOZPr?MOTqWEN3MfucUv3<Zlasab$oK
zf`Br$c^X^U!WimyR(ha*O`JKgvLFt@=(<ItLmFvT56+ik*Fa_;1RJY8axO9LZE>Qa
zUJ$Q>=23M)MG;@AOhiPVn3)B~sfE*6K0!w<FwbmniIc_#bNTadV79u-Na(-LR;>C%
z{QGy)W2p<=zG`FsNu9)uo4{d0p4AlZ#)0(O?J7EA2upm}`Sqnv0Z+tqY>T%#or8H`
zzfj*)*!uWk(m;)JH5*d8J5zEw7Hrm=(PMD39%S@q&t{W3WiLlHBk0|yrh4=m?e-*!
zWEwiu3)=V7@vczPos+Y;8eupwP0D;ZLioM3N$9uOpPbbKmsQa{tv+zi#`1fO>W!mj
zM+Uyl!7Z@Wa@I&4lMHwFn$8#)H{20VW8dZ?%*GIBhk5oJ+U1M;P!f@GRuqjYcj2Ik
zBGX)cW_R4ecOE`)|1e;IN0{O@2H#zoh>duIRoIsFv-$n&!=`xxqH-|Nv$yvf2iO!d
zC}r|6HPD6to6JTzGRL+0gb#P>kQrbs&r~*;>d7xI(3xp#b2%iQ@9<S^tp8Ujm)ZK#
zJ=0gY={TyeSG<f$XF5eSli2;SB<DmI0EfJUNlYM(Q^Aw5WYyaW@`^<2O7uDieKqx6
z+Xrq7V;*;LdA`dX=DoR+n)v|vG@0O0tsSW;FBa%{RFkdp<jJ&?M6V&#Pk8~Gvtp*N
zm=>F)v+oSli&LcsE*iM%_oT%G5R^(~{i5TZ)^AKYo)YOn$c|rTHRH>y2I&98tU|%b
zaNVm>GXj9+MHY5ngIF#1Ko4er{l1JZ2McwiQAh&CDmZS`mmBDdl82>X5sVvbO7Q|~
zA6mIp(~ow5DIITqSYGnp0Rn=ey(IcjRmjT;p;@h&OPV@iJ$rDxTUnIoy^4U0rG|Kg
z%tQL=bXyIN$dzV`+G}7~vx*S<hmqi4b{2g2D;kM~cn1eK|NqX;@}vwb<%0MKj*+H=
zetRz_t@ss@Olx@yRM=LJYX3<|-I;0A;k!V&keRpJGYffy`Fja@Pj-HoUdU!u%bFWT
z2t`buWD(5!#-Hw_kj3i&%+k&F=>tClbVtpv1&(VYL#CJh;2lI2;fCnObp{kx#`OW4
ze97-)qIP$70N5L{=~ZCI9ruLV>05N^pAC#-h+K<icGzc06wRy*T#QGc`1hg42pe6_
z3z;5`0=FPx?84<^!M2Q*!OFQ-DY=&i)i`urgn%hodNXmuA2Ic^N@sIzxaAqIraOo%
z3NDT7n+a+pcH>)9Sw_nr9|60xnbOg^Y-LEJBL`y71-Qd!9ETw+AoRDPWPwETOL#XP
zRFJPSyI0ZvS@PU9;y?BxVWxp9h^iMeB||*7fkyvW083eFb!v{Lu4UKT=3sia+zZEN
zs_2w@0C=XjT}qDX1_5}=@BLn&=y4>ZQZ4YDPGG|bzjco}=Y&3KixlM^ucc|`Zm7ts
zm!UPG-&QebypC&X*&&sNr#@2vC1bpZE$T)CDlnV_JqLWOx1pQgKY7lBrOVc?<=R#9
z6Cj5Ca9Go0V?_WVj}P}X;EJ_o97_3RDLvnyIU?9QGY`~F>7bOaQrW^)1allKYFT!5
za;I!OZ_Br8twWbtf)R<(o<+*(d)mhfT+OMSDSpQ{f7Dc_$kujN7}O4;47tXVTKSI0
z>ZA_=Q%ds~{7LURSsOLMd9`wWADC`%{>oUrySiyruMz3ocvP94oOzc&>WlpfwqGLo
zdm}@yi_s8E?~`uDA39DP53Sa|;(1XOIkZO&@-=N#*w}@`<@Ql3sNqU^&TH&p0+t2z
zy>ZH-f_*kLG;i09L`Y5)uYt_Z)DZ1p$~C;NlYn$}ILkRb_R*Kyvrdn0{q9M!#vl7b
z!M?zK(g$<J6hfvphKUfywSMu{C@QMa!W@|z^wpE{B~YH*3RmZ-=!Mcq$eK{w{tr&e
zuR+4Fl@cD*&(9wM($CN$96a}<^S+`?U4!5xqMVOfcnBw``bn&Z-+BRWDuEbG`iXk$
zPh%aW#E6)2cnICv{=Gz^+V(61_r9>;mZaVAtGon(WUz1)gAS5RV=vxPIA=1Q_)peL
zPw_-Lm(%pRGv9X>0>~3ct+nkQ2)i1ip0MTuq+IJAS!b{a=3L%IuVJ9F$N~bgT(`Qg
zNGpkV>MGuOzTsyD*wRz86to6r72mNtdzKo|8zJ9^S3IN@$;igh^h#eOSebnmJ5nRL
z5s~keDEUR@&oTjO9pBGSfv?hHzEjKmsE8RP!?T~1+pF<V%AH%<GsW%!f$Kiw5%j3K
z9rRA-5@H{eAUJ{TiS6kb5b(!~5bBvjrn-?@EX2`NLAx_0Q#8#N?h*MR#6P}0hj|l5
zD>ZS#ttuI#PTV*C{rRmL0}MP_O~t#4=bqO$-nl63YEF#eH8%?VChu-Qr{3+ePuAn|
zYW;Y~$Us>sw6*`7%x>SI#dwoa#?l`snY^6<eAsYl6;>>hpRt1ZW;Qnsp02KQedRc1
zGWR0Jm3hzr6M&JoCfM6<xSfUeguvd}VBjuattwTG$4t&dU+hK;kW1_K-1-I{SegI=
zP4J12{BoOS3(_wbqS-xRXxlqi^6i_vN2ZQyj(fK!VSA!SwXdgay{lVl?gLNo&^2>;
z?!ny;#2SB)_dS+-Ql?+7WTPO}Oiw&_`(nc1Ng_`Wd0~Xou#R+~3t@>2S@eb0C7dtM
z=ItB?-M?c$f;*->1flal^vx{FCJ*GqE-|>i9`K!Vga7*2Nb0^w1ch0-Y;r~J1XeK9
zEL)knpA?Vwuw}b};AOhno|9oRNh|8=tDv+Swq6@evczBMDQQgrocIU^P&J9G`(W}*
zas;G!%wi8?j(5`l<om$fLBTsC8aeF!)kgDntQu<w)s#3E_NQN6y0m28`)Bz{`3`3+
zzH`7K2*#!e4-}+c){z>)B2?rWDw^GN9o+xn)*JxO60gmT+#JefCuxgU=fmM58V-b4
zoYcn5J&LOVo+CTlX0HxAJDLo%%(g5<vqdj;CHbmn+2*YMX&twpNL~EL;-$$Q`V7-;
zlRRgLU|*JXeeeG5kitts5^_B}C0$FEU)+js?8skicP$TkKGRM_ugA+jDH?XRJYZo-
z6l#~LO7#spEhwq`(jmTy$bNoGln5cmO1^sqlo_`w&Cu$`y8V@)^SQTe)5JkmK@|{e
zk{~x76-RreL_l%Xo#FLXy$i++3{K>Q;?=7IjwR@TkfO~jrjl#lX<Dv+>792cf@In;
zx=*KMUG$+{%`huqu6ACZ{q*aBfj}IECS3L#KuF}|xpKE+1`-bl2$%u591_U<KbCYb
zSap2#CE4}L0S=CehTQH+_CAk#-h}JNVZBr!rYGu{T`8dLegD#U+`i5nsx>L|0fzDK
zow&o6ZhM>*8@;@A_abcc+*_Pysv;SeC6H?55S%HH8-QS9FN$Pmjk>ykDIp<H0X8yv
zl;?o>S3^Gow%RGIfj%(Qkp>Vyv;O;+MVAe=?@;mCpcEZtz@{g@QZv-iFX!pXZYj>_
zCQ^dLurH9G5MW_F-B6+@x<ppO2nb}Apn)ly5+1y-w0)*DImFbC@{##EhH#AwBFw+R
zhD%DE);~T&Cb>UsH{xcIk;;M-7eeg1r9d!Onoq9QC4zSiELD$`e8f8n0#&8&xc2oK
z5!RJf+*|tSl3qp0mHz9$<CmYoX!PZ$JQ45U0r&sk`5EYFe-4bM@q^^I5U`tZdI+7A
z!e}g_x_qm9{l$9Ab9}4W92)aP6+r1DJZ3Al-#~SQC{Z=k*<qX+dkP$_G$dSHv1LoW
z$Wp7O=9i^E-K@CMJe$5x3k27We-P7(Y4A|1ACDIgx$l4Eahq;LL8s%$YZ5O!xGK@J
z0<iPlNxCJ+7JzFE7v!0AFaR{Wzsu%uYg>Y^kyd-TDZ1JSg;9ov0ZNtURn(Y)am1IC
z_pcY=bMQ7ljD9Uy{_$>mL^p@(BPMjVV$7NPw1{3-7>Q0GzTB>$221V`m@7X~N!cx1
zkC~kRNqPCIC!ry+zSo0!{S}+g)=z)^658eL&QGM9aENZFOTg!lN#U-}yJf{BLgez;
z5LzZEd*;*Q7S|FXdz`o8P7lm+cc>Kny|{%{EJwW&=k<V$-iqa3p}5LHxlL8yf%vsy
z5&XC3ShNoW+BgSqDXsMi?B|4C1dNeQXtkZ&(?^D3GCSr(IDF2DvC1cV;3rJT#te`3
z%Ldeq1@fW;m;cCh%CCq&K8Jei(7~Uiy7G~*bz@JE45*o;cYgdm-lZAaB}q+Of6l&2
z%56Y4#8Z>M8e)d~PY;YxGC7WnZg42+?skTs<<<HnVulKu%bAnwue(C-HTc_mZMxY(
zai0L|RZs&P>MYWKm@WeH>MP&f!NiU)R|-CHi$y<8+MvI&bZo)2c6PR0#h#j1ZZKHb
zTVZ9lTywg2>(FGoG!}HmVr*#nk9lRjD`Z{GXVP_<2&4^M2dU_7ph<lSf~8bt1wkS9
z>Wb{t@lQfrUiI1mVHnijFYt8bLjvO(#s2Kj*3kN~BhOjIrcR5;WR~l$bz~lgUw(%*
zX&!EhtKzYh)cYJE<9ELJco}eASe<bz)KjJ#PKu#dx~~&OwgKOt76S@vutD{ez2j%Q
z)Ebs!MmH|3yjNiEFRk0QsPb86JHW`tS>0VgW3)!b+`NHCc~-dS^DE6*ppfe8{K7K^
z$x@!0T@mOw*+u+OwtkXx?~dPChI!v)EZGS04e7&DyY$FGv%t4cploENL}$}uIC;dD
zfO@ltWh^vpblr^H6V0rimrt$9ICZF=lJMB>&$XX!usO5-5sjd{IeIZxj*j_pF<cO-
z5g_JGY#>fR<~K=Rb2NvY<6Xt4$K|UK<EJ6TPHi1r?MDVbj7e)Pw~(-tZytVmJ3V+r
zoLrIJ4w=tTu-==3CgXQ^<J1ytt)=f$=2#0vL_keLJUw@r0f$`<`f#>YFb4bXQ+YQC
zW#GgdiY2#d@yj#T)>-t}maD+|*ET_3AYs0IHxo@aV{540QswxbCRWE{#lAz8&=n|R
z4}08uz#dAAi7@Wc1fNumN^MMCe_Z@H_hy>nEuPoTxJ4-6Wyhj#?of44!|g<W^Lui`
zEbqaTiE8+jxYR%;;qoGX`6og(cKyX4PCO(8Csljt1@hi<pD2HJg!0}BuP7e6wLX2V
zXsGK1$*3F6apheeER$cPpL!0=sLla+k-x3*@yUZYaV?i+?KJ6rZ6nK*JYr-f42lV2
zH%S4^p9C(BMN4+uva~V*7`j5<pr){m+Ivu0&#+=^b4M)a$HQ8+IBR4f;Yn>D7cK-n
z8ThE`NdYN)T_TwQ!Uj4G3^1}}PVc!)qkRbK4ECT_ucIS^hnC8Q<eED+ho16M@>ye>
z9)b@Eq_W|1Ic{K0y2Zx+s!^hhLy&5<$Ml;rB=w4D2ymE`_^wO=2Do-d-3c}%3;4h7
z<=;Dv6BFoG+#`^Gu;Qf!{Gj4d!G)T>vp;C}VU~+|I7Ui6oP`*nH9LG=N*!APWuKa<
zZ0;#M(F)KIh6;Go8<XYU+J%C)vB+9|HF98t%4F0^0yB>l{irOuGW{{)Iwo9faOsR^
ztYr*F6hkwROI<GduDx}UTgxyxc$2t~93~Tyu9`OuNt}*D4Cglj@0>8r+}krTEtI>L
z=lBh^m_mxW+`BRk)eE5ph%)zK?aWd?C!S?mt|F+rm%)}94mYGr6~Au)Pzu`>IE)oW
zkYXjk91D_YZ2a*H6hPvv(T;9<SXW<49q(Tk{StTO>oAgM4)L4YGj42>+qlzH8ZN<=
z6(@Bwt%eJ=+V|D<+L#~l4qxNiw3C8*o+@m%(o!x|+6M?8CD>IQ^<m+m4wzBgimi&F
zBwnK4N;3gY;?1^5Fw^=924AtNf}Q~7u8klg-{V`$f~-Y-izU(T`}-BdTTrHbEb=4a
z2J1x#&bO>`rp&J9{4BbmhY<X^<<+s&6QUT}GD6aRj^GazPCC&;+4{%2hy<9+O3N-P
z%67VHp^$-s{odSGwEY>~8v`ah5fv%cOC1uDw&OpSq)^f&=*470P>kL$&FvGf3T8v?
z{+f<B3Tzo~`!oT&qih2<`9N~iAJ+oYqKHSJSSSL*dx%j9^M$y4?U-AZ*DO`e##RJ?
z92tEdC0ka`O7z?XR)%43PFwb_00(*E-%W986XsyrQV6SiF@Bm&6<ci#NU`7zXeU+$
zF5CVh^X0i7vi<i9C|B^?TP5JH2DRQS5%mKcSNRj8waI$r7B}lQ6-m_^kZRixlZ2qI
zV(VPEMYnNBM=$q%g_aTDSu^|<6LdIbXN6&PXxUOWVe03vmE}84jX9VKILzjEMpLEV
z*+s*<k}x(6)y=D_#vFB=8&giONiHg-$#3hGbA$__c)WkGf)!{4sF%miWIf)C{Jy3Q
z*=#lh1&+{6maQ3TR_gKy<~S+RVPSrX|2aekI?LC$TM{*IIr#z-l(gU%CYpSC)5(gW
zppJMT=`60%LQI#Tq`DDzL0wg2MT?3d<Oi5lag<ea#Q;~&9i1U&pO4x#HN9y_R9oas
zrFR<qHp7bW$YSqT7M^1F1mkGEo}ElGXU8OQG6TE>h*qpf3+1(c4`Vj-DHj*QI_bVF
z3`hQUa=fu4y6GygBAYf+?N|JD|7Z5gSq!lIPiGNBwNK9BbFsGfr5geH)=9|UDRUi^
z+sepFyY+Vd_7%tPCbw`<mECGH<04Y#M8~Rz>}f#wMa?#Go$(CSq;-LX{k!HauNSm>
zycC=tl-wK4;k(Xi2r!;4Ux|lcw@1N8&!;787HQDJ7P97bS)G#Xz~~}esW`gM0vX7a
zg7I)$TGZYa3K$#;fdIXj{8{`rT8|@L6G*f24fV~@p!6VXCWc8G!colDW*3QrHc@oh
znm2`j|8nSnn}C4eUWs=IfOr1eoAVMs)_#bt#Kn$9gB}SlPg@^>I&QSnCehqv+dIh5
zQfnkF4sihjT8hyW+@j4ZwtMP+cS34}A>BQJ9|&jzneI&q0Jby{Vtfi;on~Cu(*B;l
zNc<@eUp4?g2>F2LQK~*+ZDcP5O73+W5QawEfLZj?eU&m`tiW&s!fJ}M@xy!@{O%2K
z|AKN0pF*)5Qx7?Ap{CsD&T~p7^L893^b7C;ctgGU@DBP3p$!NZ^iehN{1mMtXYLQw
zDy9z8AC_1v<FtaNtO3&Cra>24uQj^wY=4<CZONW}h#&)!M()dEJ#km|k?oXkz%jCs
zYG$j8g_2^@_|~hwUpq~p*p1f0e!-WlYxJQS8Wt1<s-{w9{z#tj3od-{b;WCP;ut*f
zG5B+f`s-$NM?)f%GMn3&npN;u(W|2+=-1lXF&{s%)>33(eB*TQKzT4IDIgrOy2U2Y
z>E~;>UT+zn+F`B&;^K-%Ldzw}e%^dP$D)d##n)C>cA8otVqJ->CYq`n`2!eU7Ouw^
z_2)-&6;OK24BZ`a0EO1gju30$l$&J-l(WF>?IVTE9WS8v8X1s}=A1Vfg$*)f`mXt0
z#F_WhdC$B$A)*cWan!2s7|emKP7@~;@eKC;WDu7*YS)1Q4pR$%s3fsze0bA&P4Ka*
zEXK&=W1#i=`bsA>@3ym_eQJ-C^h2c1HK9cmRyj3i@-2VHWwGj7k_(3Xn%pCY%&3Da
zJ^-*Zp<=IOiaIKvqC(>jos-Fv-VXz=_(4V6m{;I8@m4!zlD^S8SeZ1_t$rl^7#H;)
zzaKdAu#+B-Anc&)6L+KH5OVfIe)yolLF&V}gla6!Q7A_;iorBr6@mfdH`a4DbBjI<
zN2kdSpqAXy=acO4Ihm&b-der;(8U(ud#c;Zb$IV2wI~SSODR2cnM#m8S|EgVU3VjC
z`IE9yjtQ!>_9PEhWAP!u7+~mL=iORG4Pn7r0Rh+ggUu649g{IOGnm}62l>j8cOP|i
zd)7-q7rcd?t(nY;${!rtbeKa)1wE}X$@TkK>Q;U$qc1ThG!ffIk1B~pp33Nrip9#u
zLMIMHi(<=)|FlEi;OkpBs%7PzvRi6(U4+t1^`x=O13(>AhbOZO*XrgEBQkv0yTrVC
zGLQh7qn~XA2Z#4&aXNrE(r$v@rHa%=w7R1#*Y!$dLIoAH+TqRqY0rO=Q*W(~Q2ZFz
zFW_(^S@CBP3av~Vi}@i4R_({&52eDKm232>kpjqS26qEZTMGZY$=7BYno!><mSBSe
zqjKd`SvSm%?06>HYAa#W%EF=Vem0oA(;A-hr3PH`A4qJ@{nN}?;uVo~s_>}EQ_*a(
z0?`7`89~yW`z}>DDLf7el-G8$M<1`<4cj#hOjGyY&Is>#m9lptV-#B2%Fz9EX+WfP
z+!-#!YH|Y-Z}53OJu{BoWlX1;^W8T@A5juCo$S}7c%mOT`Z8=94;ocDNmy!^OW{F7
zd|*4M6+m<h-X$QmMpAEmunEd|EH~Tmg>VnPH6@_-=MQC#GBYo{aZT6D&!8_ur+2bt
zcj0?=Uw<w<$}9Se$GQ_MWvW0QD&~O%@d<n&fvA_3tjvLM_Hicwv0<_xcB_*jg`MPw
z{B&GUv^033;@1Kfl3gn}5F#hYL?%Qbbv6fTIFWGzpo4Bvf9~>H%S6arMv}28`>FO+
zHEF!a{XurmPCGyUZI~b<>~q(BO5o%4hHxp1f|U)caK}gVi=i<t&kf2Mc?Dl{!v885
z6YBHeA%NUZuq6T4!7Dl%<k?ITD~I6bV>r`i8MZ36@r|16P=A$}%657AV+eVm;zvi2
z&RyhD3Rp;9^90)FdAK7w1mU0tJLx8=UtUMRTC`nFJ-ovzQ3B!Ep)x;<>=5FFT*U7o
zO>aA8WQS97PvQ~51*qm^zdo4WI`9255E&*8BZQKa;=C^2D0X@(W0J&muaT>y`nQPe
z$Q#)OYB7{=Xx$~CFo*Qh%y#1OL~6FWY($Aam9|q7P>dS_8LxuWJBt%E<egt1I;Rhp
z9GseJFDd324tA<QYJYaXDZL1r!dJ4jTY-}s-CpT6>hdop$IR9UF00XkPs)gFbcdvR
znA!`PGYwZfzl=w?WqNMxBWbWx*M!t6^-p%09(1OTp_{i$DLC`p=VW|@8xG*JX00<p
zJ<Z+dPO0Cjc~Oq+5yXpO#pQ}JZC2+L?H!-BHw_o@Xyv(zKA~0X)E;y(xZ{Tg?j8g1
zs{Ifi*6y**JQ3+9v7)*Q<EPFUSSQq~q3W3IHZTo+)^G8P(H0ZR=FuEP;7>N-&B*xr
zl|GOJ)i|yERjQ0o+f?N=K_mQ6e1X%Q-q?XRiT|9?O}p-VV5mv<{FHYtf5Ul4yoXa5
zof=sUPlo$>%o*@a4mMgoV58F+W2k6@(Kf9GH?KF>LlO4c2P~|7dc6R=F>OQe0_Ni?
z=mRgEj~&R_80gb#E(Br_-SI7oJN-0Gw(Froe5OWq`OQ;nAT-Ds5{H=SjOwmL!31fH
z483_u>C3lXcwi02Xed{P%_TQ_7*;FTCzZY|KFY>32`BzGS<5d(nX#r$TzA>5gBCwk
zfzvWQsM=bQ*<t1aUu!1G4CM?P_&wV@SXplqUP8pzqtid>3dq_3*;g#^Nj`jT`;~sC
zP4uv(oU6(REdt`#3m;q_HIFr1BQ<ZfC{!OSdXx;;&KWk+ZwfN%`R^xN{Ol&g-S>sB
z1PKVXoMvYYrSL4->a*Fo2MtO)<d1TMpxG;ddI=9bF|Bxyp+*;BD+p%zAdsG1x9fKe
z6R7Y>5Kh-`sqQ!$^`7k|*j~ympP~7J+-;FMzH8Y*36CCQDeVnv_g^KP`VR}A?~^%f
zGo({u?3Mgm91QCY#_DcXvq!H;ZbmY8P=nkpdr~%LFBd5PVABdgFDTa2sEBO39Cje^
zS3ulApcC}mmXLdQx0b;+oT8+T|0p+Kv1;u`>Rj68BIfGM4vl_CS(wZS<`1%SW(uNI
z=~>Re#ad#)pvEzcaN_*2s5(k0gR(<x3HB2<#5C~(c+Q*&zF;Vn8wFGtOxq~a2A9~$
z=?&2AS6r^PKNzvOI6>f_(qeN<gAQDWKoeJg`-ynL45_e*xKoxQhHsu%r>@DP2Qd7B
zGodyq><`|9kg{wqeLPt|#3p;EqfIhp^?Tdb4pBekHs%CAXKL+(Lyx8byIr>glxLmO
z(pM1P;DT$!7sw6roX#3{{i~9q+3I`E5;XB^R+Uox(q;Gp9i9C784qD&3f-^1W`t&_
z2CtLFcIszTtX0;=>V?uZbVi1zo=s{(z((?vYKI*_wrRHX=l8p+d~a=$ACqq{{`$@W
z*l-oO6J&@|A$)$nn^?sxx_-zNa*o8Ml;)4&B{iIGMul?*SBc{rmnp>qc{}Zewkttr
zt|-4uTn$Q4WZ~39R72j+V+AN65UHNGeLdTjf-R6A0NLBOID$@%AnIR~vKVG#a9dKr
za^JLq@3|YVgk(0Vv~u%6_+CUwKlaOEls!%|^t>GLt&0>GYVW{Jm`Qi^*8|XrYO%Q%
z@F%BJI1(**6{-G-#{!SqM7wPu^X!^N$@!Y1rWJ>)RXoA@F-iT={WSxbMX%#NL%f)l
z%wF!U<*9~S=C2Wf&W=OfZ5B8ij18J%=MoXE@)a!0hAUu5X_j(rclTN32?DO4KEq;Q
z(m2Bp1V-D4Q<)-nzJ$O+4imnm$?nKSsrpp#?9>NW+XV0!+CPO|SE;us8+*-SD8NUD
zI0xcME<{a`^=8%j8`al8SfZO@jnu)Ch@=c7`kgZc;fI)(O^0j(=+hy5lJm(wv?Wgg
zn<<MTzT?z<GE2v)=QdYRF+Uwlx8obi@9sX(uszcsu5#_sac+8e+jV@B{KtVn>ujMF
zbEg<=lDCtzPZrcsKuHUAR7c{*aF23RwvPBcIO!avXMteh0wCvA62Zj<oXCw6J{Yx`
z*gKPcmT@7E_JIQqlLXV*kH?!7-t{%ab5k@H_%$9<^N0&mF|!8?6@T4FPWfjeH|UO?
zZXliDiK@WsSNu6ijuyQREv{D0Ax2xeUWQ>SA*zCbg0lP5!I84C+`fwCL|JR14IPZH
z1)&E8>h`OM?3M-ld{9PkK&7FFt)}Y1e4ny;(g_B#r>0alj!s>kAi(-8gGN>TEaHfA
z5_$Unv3E{EdPdK>|HihJv2A5+Gh^GfzOilF$QT*h%GfqC%2+40_dXXnr|N&bFY?~?
z?XT*2dv&j8b+>ggCIHzR8ViNW^{x*#j(77x{V@A<$wj@EAmj7ipW}x!xM=gZ;Z^*k
z&r-k7Io@PvI8z~M@ebU-ZC+;z((TTT8ODz}7(2*V0K8H-LO{#49zehOE}`mFk`%-y
z7~dVNBb&T-EFw+lqHWrR)qeb0lkA`vOAgh0+Z><TExE24dW3pqrL{4DkCYvl1UzR#
z*7{i;Rl2L{M&J1Ui&D4upF#OgN&EkN|DJaK1>~PW`7a#*!Js_xPfdTJ`mf-hn*L()
zPfdT}_)o8A{>{Ys3)O!I|K#)+lz(#i3&(#*P7nW*(_g6mEBL3TznJ_}(_c9LgPK<V
zsp&6N|J3yV<M^khznJ`|qu#&D=`U3O9sEm9e?j>tr@wIghvfA1FFE~%>c4`2YWj=G
zKQ;Y@<3FhB=%1SYLiJBg|38j@YWj=Ge>&=o0RW)HAmz{i*Z=kq@(P|kLWzApYy5V~
zW6f-?r3?C9!cFf`0dfFklYKdu=g%f}JOZMrHKD>oPR~qXuM+wkqk*@h<#O%c=<9Os
zrMu_EFrmkWLqlkO<RLj;EX`iUiEMZjc4!g3)W19bTvTJrrP6m@V1>VFa7F@EOB4LE
z*8$03sC{ap1=bD}9k8dJxEI%WzxufekXs#*^7)6zSD`WPj@~6RIK^B`3j1l8-v8Vz
zLp>P>?LHcej^5hz=u2)ki;@DOq90u2$|epgAy^FEcvNpyv!)O9%15zlU9}M)@cqON
zhLiQ7@(f~hs)_2A-a@eGAWSI1XSsx(!B2q)FdEG#j1!h+V$B9oiovEnr_I&1j4;^1
z`~@c5W}~anAr&MJzl6Q{hgu){<NYtUB3s#vAzNWQY29_G9ok*Q$`F&|;Wu!thz8Dr
z!3Ro{z82tjG0YShfS!2lq31-$iXUOt4HAJ@dV3N9AQ+HW)$tS|s8eFTXch`_?Pl%c
zQ?fE8GPdj0>@!0TGgl+>72(@0o1o!Hww!p+Ap@zgonZ^G?oj1P%hEIhA#VOE5QxRP
zBsw@7sh%kOCfM{HP|NW=WSQ2+cb{|K68e5J&ezF~D$1+@h!WWWPcZZ+sKuMm>FMp%
z$;@!90{l%n#+D)MD@*HQp}Ajti&+St!ZvS3*5CkX%j0r`lbDnS_I7*ABc!t#4Zo<$
zUU;ej00epB9U@S`|5jHf_#a=ha=Gsom-fM|4BNrX^XWQlt}i;e_ZMndGxkE@;B(ia
zbgovw?4znfsXulf=GJnAxb~+8kfatZ-??2w1xL|d;MM$t5Zhagb2ylyU-pL*@wx<j
z6;d|7@}Ya#+KW72kL=-;!lC_k4fj+u!uC>et$P9VMUBN$&N2MA*reKWkL3X%e;nzq
zFY#Gak>>`jxL)7)!B5R#2=+i|Zme&r;2NQzbkn}KN4w@7{poL=s#JXX-t-1Y>^A;G
zWIu1Erif!rvh0Xomi7#Y*!VhnD&?AWCi2iIVb&x3w<IgNuEmM;x8e6=Y-TR9wccL<
z^Kd1@dB2@-Gl4y96*H3GTRVP7I=GL@Kd80n->b7sWs1S6Zwko?7%n%sPGsMjO;dd@
ziGZKF|GZk2>p`k?RR&}5eI%PD*p1IEo93it8}9X94B-Zy$F&5z^u-Uq@6<@i8_e6%
zGc2eZyyQ5;C55Yh#t7~>)RASjfTN9j#Bxbk;$u*AuJun>1L1+^&Y5$$675nxIV7rL
zk;H9=``TD!XX9ikC|}xXtjS6l`#!?pp0Y6`craD=GR&6Hx-vEgfTGfnFl!JRk)VOI
zQPGl<#Kno2oBXb@i@b0ch&c;#dYN{dKcE%wLp8Wy{E(96w_9kHluU06()k>2PyrY8
zJqCN6u=(Ma&&KfHgW1st!Fjygcq@L+bNOYA_zNsXn=3Fe6@jS0K0fX=?I2zx;}aBY
zYh?2-ZylX?he9D7SW%dD4`JDxl8&53m0&oF&wC~0$oPB~Vo6@CmV8J*L1hW-V|8HA
zG<pGxkm0(tCzGa^aTUuukq(#hJS3`+lhHU<z^2Nq>t#O}>A^xxvEVZ8(`3a0up~xu
zo#8w9y=TvqCqbUaeaVzGm+dNX$jp79&Kxk0m^z(chZT~foY!323sbWV0!Jc>&WI}B
zbmq?d238<--ni_Rty#AnKGMOHlGSo8n(LwzvUy(cn#2hXzS?IZ$c*!op^n-KUu`pS
z+EgTyLXEGCp`7WUFBiUDaktZqYvGVPW@Cjfd&mvOLpNQ}4I(dgc4Heuohl~b=t^oB
z=Cc?S8mTMFyn|!fDaqi&%RKgUPa{<Gz7K)>7abSlBvh8$#d{eNvU{Oi-h0xvh|S=8
z=z~xpo}S30nbI=I0*t(hYp}%6oKLvEy`jkQ(Dwt1BRLw~1%0=@yz=VH)FPyB{2{G|
zzA6RG9(UW*PRh-?lxJG0nfH314o)}h?JAB}m43n9-@qxZ3svOANE~p!3&nMN&~sJW
z<SamWLYrj1a<*U_aaD&^i(@k8T4nz+iG4IoL-U4gCo{*uE;-m<QhiyqSCE60?Z#uc
z{FFYUC4<T9Aiu(1Oz`f}c%Eu{`vPA90wpZ7`9+2fg&0w$(u6Aq8w^JCZtT}f2>zFp
zt%!k`-U`2R-*!bd12mcFq6eWFU`@*q`<j=X<2RZvlJ$f4@$s1@{NXiQn#A^xneX1P
z&cmr+&YF!LG9Icu`{Wi-XV@J>PoO22;IW5%{5q6xt2WEjlyALQY;-qQ_%}qF&DDJ&
zsk`}Wyz^R11Csq`@QzlwEtHR%IV#CC_F$|Dj^C5_=Im6k568d5>A>)li1SpYEn0MF
zMIHSDt7`vI&7qaP(z>P}=V3qeLk3DMKJRu*!0H<&VbX+-b9pf@Irur>G3@ov)Alat
zAXk0CdAZB2;9-C7_yM*x=C>_}nZk$W*#yvw)JJOqW-Hq@*x@M05QPpU?$L&np+ORk
zBy#bZ8P}AXsRywIg^cB9T&VUguQ0bYcdTmfu!@!=A6Y<;{}@AUxUhbPE4Ldbo4%x%
zg$@aoHx<<#(U^eQ@c{yJmES;Tux%2XLE;n43cNlKGTZ#3oy&r<MBGV&H;ISXic2iI
z9@^fqoWdUmwcWUyKY#;brs;5{=dvqeI42X)ht{DghK5pkSC{oIopDH@%I~F-Y-l9T
z!dX$?q2Pt2H1`zQ@5LZPP`5+uql29H?J$tPBIJClDcKUAxLG9=Hh(HCZo{5hJ{zHs
zW<5SlE4alGG5}e{zm05nDzc7@{9Hzvev#S6vbPALQC7^G;&%)qiKdTdz<c;}T8GG%
ztpDa&^k+3#h)^8^cGW@o?P>e`;BCIkXu^jdc8PI08RL(%M14+Ei*cO+bL=$ZI<3-b
z1i+;FLo=Z_7&SVs?zPSFUXDC#$pEqCl7z2H?ubp|M)6mM4%StGxPhRpd^G!#Hes$Y
z@$7_5r!QK?huR@Le{-9{eJI_FiEr)*+!t-*aD%3&E~|zbj3FAgD5vR+ED_UVb3vyu
zwxwk!Oq4Cu%>IQi$LEAQog0GE8Dd6hH#T9FO3T&4bkq;(rNxq~SrD?UjUdrp`R@HU
z$MRIDa8)QqBIvn6l&K@)48yj$=cP!>`7WXR?)uGOHDx+G5qkI5H;pWAfwF4tNbbyA
z@XH`+Cf2B9$>sdrp{X+K^(R8K*Ea8=J-Y*Nl1nt23Pn%-QPMGBYVH@f*0adIBZ>Q2
z9-SS!J{Ph|T%&6!NX;_H&F9zmB?aJC&4(R}4FOGodbFKHac5$EwE#yz7a=1N+shXo
zZ{K`<uXV3&I+8B0ReN>axh;<S8_8G=)tE_gBu$)S=fVhA7b>l^w%-loYfE&>oeXc+
zM)GS5i0rBWM2YHl$XJ+#+q2Ni)^XuND?J52A_EHRn$Qj?V(=(8U=vLj{d0oVZ^5|z
ztTdI>#2+>!ASaTE-#cRK*!(-UARE81w~$l&n^+<2Ef{c9&HFXB>DJeD@Y#&tkw+w6
zEN=ub<$GSS@x+D~n-ikcB7<n9n2C@r)Pf7g)7Gv&e3ie*JeGqcWr)2OUk%F5lm2$j
z+%KW}Or4>RxQy|!Y(4f9Pi2K}V`OD?0b!-8EI>Z{v7^p|kanrk5^1}Ocq=OxjREGR
zZ4~z9W^s{hNdPnsw7NaH7}o$Q6%^_8Og1<Tq;x81RU6FBB@TGUzadrzk8=Tp`(h={
zpD$San~=vVx&l)|FGbBFS46<MpBpKKBI!}xfwQyX?s;YbN1v<fAm0JEOpaDK^Rlx(
z(OuA!M!%Jyc=$AlAB@s5&;gJbU3iX&#Ad64#5WkD!9SaCfPB*7y*ng?|3;J=2W=wp
zsL*L0_65C)9`%}PV)_<>Dp&wbhqJINistJe`N+yqU(c($BJIiM5v~h7P<i0&20j?|
zRZ%Axlm4~o$o@qE$J>rHJsRdK>GRKc-DKsamkPHcz8(q`uWc0^0Ho$-_(%Kzi>-#X
zEQV#m>SbNquw%t)(ew4=AP>VdT;akn_H}DM;uAAJSERIG8uZ;3tlEO1w1I|Ae$0Lu
zcVJO`!M%#}TnhbN9wKYPG;Xdq+N%<w_CeA$Gc2@kcnl5=Ml=N>BCaUD5qf3p5vo*%
z9v>Y*I(^BAIR9F*I1L(BI4pqj2=nOZ<%il%Is+9Hy!mb;vH)DM;{a0&`e$T3*zMCm
z<W%I`a<TEQ)ZLuhFC~YN4P3?auAck&(sih(nMkt)2hJ27*Bf10+9*U5>th^5$JDn9
z_^DPa&~a;bkc9o)Nm;}GC{EGD4SJ$%4x#P^<{0XDMK#yeo><s2a}sumHc~MaClsxY
z^BIjtYL6_5Koz}Ok-55uxF6O-SUe5-x3IF)gs{YWop?HRz&5+uvc&380zY;7FHDWw
z<m4G^#LS0p&Ad{Lht_x^_Kc2phMkh$V*+*L-k@|E*G5dof!)zbj3XVeo9HQ0hI)ll
zEFR?G9yZxCq1??QS<|!&j?G`;SgbvVz}dG)p|x}TrGhf-(nR1gHwjQQfvPgj&T$MN
z`sG<#5rM8CD|1uflZYMAU$_OmEc7=MZ0EfaybCZANexG!Voi(GPz63(^q&a!+jhUT
zv(lXwzrK(MN-9o}J=h+Ha5iEPHQ$eExUfHYk_?{H_LYE=ZT!+|^Z=u)j+T46s`XAw
zO}Q;uCPzEGIm%DQaWsoo(c>a~A~e7$p-U)NWQPld?)!00%K)MTE(e!Kgq$9Ji@Rrs
zqMik%Fp5uG>&_8%$&oeq>)g>7ocMD)$!H{&*w98vRK>qSWxlP(oF()H>z;ydN$S04
zx5_H6?()rv|G=5@cq!!lk{$=QEz~@?k3lEZ<l?T_dbR~L6075eMW+QKG2J~qCcuQQ
zpmnEF-ma7QG8+JW7PSzCfcCY>I_){27?UC`A7GI<zh`f`EOyswuiJqDvhO(HNU#II
zeAoqmN8I~^OD6#kgEIjdladgYI)I$1e9ZgOd&0_0fk~L@DI3u#;u2Br(?4Z5>7TOO
z-}ir>?ipE=Hh+-=Q4k^qNCY%WeNqJC@}fK(WrGhCd9X`KBQwjWPeHWD`(gq?2qew@
z61N)(D{c#&K~TL|9tM8H!vdfKyE5W_7L*WjQ#sUy(ytt?p(lkPIoU5=$@JBsj)Ej3
zEE%)8-Xb=MfAb4#C@aVa#FVfCbFUD~JGMg?RgC8x6}Zhu3NXiy82Y-slIknRyznJ2
z3{}3<*NCdVdZT3fGq#n=A>S4TXkgxDmT~k%uK~5qa*=!Bo5%WQXm>@74zww)D^z?6
zFa?1gi3EKpV%^emjVl*E*od>PsVocTYe=M){f%L?E(zAvSi;0JJ@X>3e~Ab%inz7E
zrEKMoxiy^2=nb)&SCI~Uwf`!Zl0fvjEE7t1h`lNc27&*=(79TP`wg;M{x;gp?uU^N
zvL~K9-s|U9KDq&y7Zs+|8M+TxA*{#qFKJGHc_>>;1k$3Np?p0OL`MkS8WYTyh&!;P
zqY40Ig5|MjBc*CaB({WZg1R-OJcu1@o=g*h5Wg_?#V_-wFd;6`j$z-#`(nw=_n5MP
zHze`FwQWgv1STpo@@J@EQWp?+DqRS{1iq9M4iJfR)1yR7$xJ*>B%=V9a23~fvE7cZ
z_PD|HS4*=p++x~%tyD4rl|^@lRsG9zWov@6=27oCVf=#Y2L<T?1!_)TxoPYRew*oh
zVD<|C-?0|ll~lpV0n1Fi{r~_XE%6QsDAE7o!kg-w0u<bo$s0(*7%|D<Z3-isuQCqE
zaabF(qzZG5N{~;ha+)-T+5$J*tPm0J(Y?bVHJJ26r!>p<%fJH+JS0G}=9cBBZph5j
z`deTU|IQZrhI4+F4?V{9g|{YEvxH3kE|kE9YZWoA9G8IVF$WU|#y2SR6PM`|&L5%v
z?a4(LIK81D%|77D!nZIJLZ7Mhd0c$~^I}-r`Ys2_dT8YGQ;PYSO`NToD(RuUMo!1K
zos8$bcpOi`=u{CjuS~+ZGt;ptmb<`Um*?mX@A#JVNc<+Jk1#?ej&;LP3y7>3{!4D^
zVRLOPAdZF>!;XB3z@NR}nDhZWDZQ<YV^)xzJJD8k{Vdh(Gm+~ozPE$CH`(ByOAEv(
z5@kECBCcv=J&!nn80q}r4Ag@od$#2VPMv20Pu>SY?7SSVhal<!-%4t4Qm%DEo$A>@
zkffLuii0P$zA!#;CwQ8!ss|R8&CUF7$W24RdAg`iNZ$zqQ>4;T(4LXr+mPJ}GJz<+
zOVb0WKiWuimOWap)z4YiCR+!!qI~k(6!DJ{oVEvWVSdr!AjDFha8VlvFGIo#j5}j`
zA$Vbo67P;P^Ct?$fVH^A)ayl3dFJhf&hI&<(V6+>TkZM@q(ITSZT4e8w&W0-f=D;!
ze7Id@W$Fh3i|A!8BmYTJP`J|2^@=YBsc`FhuJ%iyJ%!u1G^$PA=+wrN66a|$Q`Irm
z$n{<k)ruyEnHgDzc1)V}x19o4Md$oCyF3yIwSFimgy2->4-Lr}5j19}{jX;-vQHd*
z;CQj{gw|T;R?+n!IH+#Bq5M4~Q3`b^@Ih}o4n$bT3Hqc!anbVK(AA{0_}QrY0Cycw
z+`)n<LnqT+{2k>Mf??Cv(+t%3z665LY}=k9-EFi>3O%O0Vz>J)ZZnFAg^P!xGjnD6
zB-O7EyEdxg09W|{kxnx~LRktNn3iyDvASZ{46<RM#|LrL8#02Ny2N&haVS`ujPt<{
z^$c7L!Ul7MG9@p$V`v(NZk)bVvQZLO6x%^(kxTy-`$4Z?9~BRje`bjs6-!8-AsoL!
z_)YS8XPMYCNFCXoy47Qy!k_6`yrDH{6a9(+bTWV>^<a&B^c{xyiYVyl7t(*(0<T*7
z_^nu1Z#_tG8Bq3XPM%$9Q`&*<O06FnLkQ%vA<?k<g_i48;R?qR`03}LR#j^y^9V`J
z_}qotVQh6j&w4;+buHCCI+KD|M|<N9*~0!QrmdQh`rA-n!b&~#h|I>4Y>;x`JSQuE
zEn8`p=1no9s2DAo8usksWy^$+n@Onr8DHU|c^gX()vAL_V`?R2=6eH;Ub+9aEsuF(
zKmG8{)%OCDoe_h9xP+?uDngiJdQ~LvD9(J#f#y~%t5GD8Ji{Uc^XBb>=-Gkd1-kZ0
zvz)neXUwT_Fiw75iPGA$uW6AdW>KcGOkJlISEeq0LF68emQY7OI=>_Ldd&JBCJa~B
zS7u=+gsW7~x{luK)0L6z<FhD?YAi_13F4~{-(&HLJCo0}c1gN4)8ROK8H5qE`4}>B
zK!oUB6zdN3;VhVT6ss94=0Ta}2s{uq^yD6|%!rNS&$sIVw?Ev~E%#GVq||l^Y&hXy
z_p&$mJ@Z9qMi*Ids?g9LliA0^IBhU)Ah~p#NGR1j;sh%S$qc=cmDslHNzi)6!1w?O
z{S&yx1|GDJA70%BW<sTR<Gl+rKz?Xna*o(*jf2bLrFuQ{ARg%B&Tlk1V13dJNtK?6
z0TA=VyqH~Zl7w=Ru!YxCOw(7R346)oE4*i`teybN&aN9Z+F87{%uER^aaK$JDeQjQ
zgaU_6-V}<(T6B2x8_*wCMl|fs>&`ObIFQm94p_iOVSy|+O_YlWQn-ARB$yRKUNGR+
zE~`coasa<Qi1nz~$F}Jj&NQAam~v4Qi(NfmH=DmB=Uk!sM?B=Bkt4glEXmIZ?FAJP
z8(j{iqBt61^>IuT2XMIgsoW1<tRGtwqh(OAUs<%)lGRq{hm|%gB}#-5c$jH>o~fa5
zaUs)iC`?=9VYf}-Lb1(&zSV*sdgD!PgV5$a5W8trbG2w&Hpe^PAi1+|h9xw$FD8R5
z)wmuCMN6-Ou)|(79h<ogSaSiMz*Ap+e?sr^(g9P?Zcf)um5e-6^9)W<zYC-MDWDAa
zCjiH`Ma<5zOKstu?%WaQ3y2y@<_}#XmV~eXNCG&b0sJINGHl__3m$c<9MCK$)S{);
zF>bNePgnNUbH~wm8qwVi4Wrt`qA}r=Ct5`Bs|oA&*fi4W7)iwoy<c(W4YxrCp@Jdo
zrNqN%j<$8<KFDgUTvn1zf&KZHfZyf-O&}M?rW(6Xf7hb06t?&xyFSW7Vh5B!n&Gxd
zFRBvFvQ)szDtda4`_9LHvUk8u`JoZ55lSn}{opzwZ~W|4FN*eHq#i=r?h}$;0e5_1
zdc!6nr=Ffb;7Mvor2e3pT#;|+jWu7N)7C5<SS+T!5eebcPRAexrWYgWeJ^`#x;?5S
zWz{Qb_zHOsmduG|H_LuED>7pfF6F{9bKeR+FkP)(oVRxam*F!;WS)M7cH2yw7LS_3
z5oFrD(q)aOTZGT5g+QB#heVp|D7%6MyqI+{7DxK$qo+Z`({S!$(L;LMcN6lZ$0cdr
zAn&#}9X85%%6j-&9qdcwnC4HAo4jW0=UeRY(=$HNMQ-jj$mPMdk)2S5_9S5o;Vx@n
zVOh$X_ViDjZa`0|`<}bWiuc~3)%Dj+#x<HpyKt91jyYlP;y^>%wk8e~LY7o07NPoI
z^n#}w2JxNLw!AY5q4pyw+zO-6-^D_36SH^m%ZJl>;iFKthUo~NtCi8JgfkeRO4xZ-
z$%2_y_WDk764a}&aVvOvUjd;Z4m+HB$II$=Vp?7EXUyFbE`pSBWSbQBec-K7tb4dx
z{_XocQ4hy~*5N#-g3u{O=4<vND*AGIKUcu`(S0}Aev4s=x=c^=<3rf>$LyS<xvoi<
z7nBLU@P56@BY*fgcsB;|3|iBRfl54lOCe(hm`eug7eSo8i%(<~f9L<anV`3XkHJv_
zcut>-{h7DJhY*P!N_<sDymJF-zIwLCj#G^mL~dNhJXww~+iW_DjJXYaGyt4O+>M;J
zbnF7|S4FhgeY=qY`Is>0YYnea;zY}yiM`}aPnCyG8@!C}WT5P>oiuJQ7dFW<O{zwS
zA^Q=H8yoDrI}FC-<-Ip1xp0&^?s!I0Pxq5XE?W`c9?kBXZ1Gg6>lXU6F}x!DH2eFS
z{w%k|h`L-uA`oO>ZP0?0HNtTT(I@9g+2q-`2l2yW<=JM0>X|wP=T65aw&AS-%h{+`
zj{4-l2pl!aU7>d;FuGsKX_CnNPH47fEh|<%?Qo~RJh%?5>9AwEP27FY-|VYSs}!q+
z!)^fDlu;YQ9<TIVxSf{66=kqfwL4nSFKp<l{^yR|c1f82X~26!K2VKcxoTH_z_kYR
z+9v@9XEEQGXaymRMk~CT#gnyD1`7N1J;RCa*3|S{(Xsx7C|;fd=oA)gcfvm4S3O<v
znLxAn_fJ1uPs027^xeXH0ilDAXPfU_$IjjXqZ_PrWC$hiMhhjONrECOqO-^>GSw;4
zY>T|Q7#B*vIM=uUfUwaX9ibh!!S}J~(x|agCGSAdsV=Jhin#MQ`@@a89#`+MjT=fv
z4k%gL7|SQPI%ua?)<#A)*aOTZ9!;a2vZ3G1xS+eNh3%F^inlKQgI8`<$A02b0#~%b
z1Qb5WyFvJEK6mRkK*%EH5K|tk2xqY+oe<Q3xqf21r7m5B7o6`!?4MX5jkFn+FDAE1
zklL4$SD|Ne%b|Dhm2(7CVkl9%;MvM8CgohYuCJ{|XP^638;ABPBq(^`dxy0Mxua6#
zJp_y=AW?Nf<&HAzm;;-Vs)tT<xavB;+spahk2T;pIKal|IlK7oTH+`ne`DjX@*Jsk
z)_}0T_%WXeicWli^NN3HtZVxX2Vim(4a8PYBEy@lWCNb4HfjYA6?$uGYrVtcRl^V&
zB_(PvR>eQa8xQpTwAc`NR$3^J8b}G6-oZk?b-99gc(BKeZfMFnUCo7C*s=xxbhk9M
z96f7PUXYAlKH9#cIIM}2iB&kihVo!%!%d%2<O_waVtQ<?nb~%~=Wyn%)eZD*Yi)6%
zPH6P~wc-yLcDv^F$FFV-g?0E%^;32*O9Q%MRtA?D$C3s84vE)V;7#hY=P7gs_==f5
z?%Zw0=}GrW(__m=9$-LDcC4B9Lnf#hio{RuR4h8Y;FC=RQzVR!B`!>oe?;p@=g}03
z1u7S5;Y!^5L(Xe<%hdc@O$anSh2nWXvZ)_gv;;PK@($doBaqq$q&nbZX+@M~<XuUc
zDFXfoMs7UI+`nPZu6q<X0u33mSX=e^XtKRh&>g9;VxJ5p(rLp3#v?_*J$6;EZJP)^
zYcJ*qr+7AWA$z7r3=Ivow#wxfX$9;0^Jq9Z2h7~&H>a?tvC}4LYDw2DB2tfk07xjD
zZQI=3qc{o3HF!s}m=f%!w=NtJIJ<u@AVOIXpcc#pSgi2}zYO;OW?=#CXb<@4sEq6+
z8c^weoEDvN{`s_>P9Bc`XCO3a2uL{$Amp#E0vPG@+M*b#xD2AbX%W$%=3Sr0$wSd;
zhm~aNyTT2#<p6RgGWnXoOJ&MKTuZr%t_|2`4^p6_oy2huo9Hs=I9+I8m?*=^FF3xc
z7gKVdz7y41i*O8td<U268m0^!Jsr?_lP%P;9_VB{_7^xxoDt+0KE~(_M!s@WRxF{G
zE*|n#N4=3zWvXYQtU#5XbPi~d^rt%<NPb?`JRjL3@K&)pBg_?L+EpaTUiyLFU{1tu
zVVsez>JKJwBwv<@Y_1!xVZ<BIJ|ou<q%EhnaPCG`reJ)8B|CoDChNVKI3fgnSD2$`
zhcAlSqpppbDFbZCnnFI3S!f28kjbuoU1KP~$_jTnE`{uZ@qN+&M=W$oH;59zHffy(
z5vFj+BZb|E^nkV3ZXW9pxV3{**H8+mIS*6D)`)F%ui@$Shuu__naG*=F8BtelXTu2
z``BI;0EsRU7;3kr$isEhub|8cg4s4u3s}w8V)Cn5u@I}IocBU_#G}WB;2Q<*Yeo{|
z^4~cTM4-=1B3a8}-Dd^<u%;wZ9`MPx1IwQxjZfEYA!s=L#kCUTFnBngzg$ngR`#MN
zTxFij9ww6f-f4rcp>+Dl6WQ5uZrr7#*>9^!TWyEY9Qz|-dLk_9>`Ap+<E|56PXf+Z
zi}&d2Z2$nUo*be~@G>{S3IYHIAH%p<&HeyBXZ1^=d=SX_7t9lgL{9K9(7qNxG~ot?
zX`(*e&nErPZRFoo^bQu=9(w8CiCR&bm`?gY<fnD{-%{+wve_23AJ3h2wI`OUzusR{
zDew)BC9NLcznhRq!B=?PNCm_6{!jO!>84Q({7>J)mw1N^RPcXm-vZ>PbeAo~;(^in
zgA{UBr5DZ}?bmnLz}ZdygH(+&hR_h!b;>Aq#sMAc94Rut_4UBFK*b9&JM%&lITC^U
zuv>CYlSW*ICUnY^m$07i0-Ny~wr{&~V=FIbH=dD^w5LqxyzaT(q^Z)faUf@CjKMa=
zy_Q`3@0Kb%0nQ}b`%)jAwJfXoDze=I;hu#7H{t>^gV=JL)H4Q#%T}2dTjq7WIhGb1
z`;^Gg2oHWAT$DNH(;PW@={`HazSJoDl;4y~fhgg$M#dpIG6%)XxcEyJYUDjMnZ-z_
z_IF=Pzv|<qh3l2m<O82uR9M&Mdzn*T>u8fl($h$o$~XKO!m@Bj<+Z#+CHz424Cj}&
z8nS8tfs_uakK`j;)1;PhGOh065a8}q94{)|DE9lBRgl6G)fVQq)tFdUKS&Ob&FEF$
zs)a=|+}r8K=@xrF##B6_gopGaRcc%hy(t;#1jrl2Ab+aEG{S+l+I(YT$CG5D?&Kv>
zHe+BrX1?~uRhV4&-F%&b>8IvrS9Hd#`lcyfRmvA0X3K<ADf?&#g1^R(PVBSA*@cVN
zoNWM)bB-vsM5j&PAGa}}HGMW&1;v#LMUvYb3YwT}A%<vpt*XJQ{E_bqi#1(IOPZ2N
zwFk-|A{UDtpqIaTjmOX*g69}o^sqX#VM}i_QY{!-D!ArQjtY=$r?Q#n4clU^x3j`_
z3cR{V_?q>n4yG5~TdCVuKu-{2cke0|s?DTkJ0rgO*<|3#B>UQkf?StE5fP;ZLS?a>
zS(@DsB4m*E0pdsqfmSlf9%=crmE_Yo=p&gx_`&k4i_3t9r#vBY7Ke>dz!g{N^-o9T
zB!t|v(O?7Zpal=D!Do4c(&(|pZ}?=SL8$J9MI#}h)<5ZOU-2|L)XyOv^*$m3o0X2z
zD{8Gs6TmawB42&z8LoaM0CVjPWnYA|AWg5xC;$eGOumxnE?I)zCHTnsxhxk6Q1Cic
z2pCua+#Rm%EGgyRjbK8pz&0GcZ5aF&#-yI^40}Q8R#4T*e_6!u?4d)A=y<%l+2fQi
zDRhzhOt9f+++`@YuGr`-`qTHjILIN{2O&fpwGK2uGrtH_L2dY}-QcARL|(_bfE7lg
zJNz2z?9^I!ttVBn#oB{oiBc-Di0+I>G!?Qqzd%d0jyt|TvGTqgE(%e87nBq<W#bK>
zs1jN}7q(7*%quH>jkl@2yB*^SoMg<O-e;2H>U~6s(@SiA$E`rIa?Pu~86OR8>6+WZ
zxe{l;HzSM0H!Nv-U!B+dT`b}8UQGKo$94Qo25kF=t}_$BUXjD(sUTC?oqyo{mdWYx
zyC#}Z08?zBa;r5m!sG$O(ZXqM@=#2~Q!^6Ekrt}0!8@kr?Rl|-n7iNgdq|X1Z5r%^
zIG-(SoGvxV7nGfGZomO|SO=pWM2pn^6E<h0-1h+VH$MOIH^WYY(z=O37J`v3bH@@Q
za!}d*%bobsW3xw*J|`)dAK!Tq&}FVK4kt6azVMZ-6Z*^%Py`H^+(Qhd*(@8t?dy^$
z<Hd#_A+}mR_oI`wncDKCbUj@jac7s8xDc2sX0=H`GG6&VM1E>2@pfQwDy_r2j~prv
z1k#;Sr|Fn4vyqUW{RnWTjJpnc-ki>+g;x1t^mJ#c#RZAPvf`W>>)J2NIWJFoq%3m&
zR9R2*fPMe-wSD4cc42atw?-&>tP!>^Ye>hYVvY=l(cNn2`trtmiuy(VhMxRcehUqQ
zd8U$fiE0qdbKGJ_^1i75P+rBjZ`+pKb(AH$@duQ;&*j3ROTAoIUl^xjR_q|sl<|x+
zY9a_C3iYm#Vkjsd_$xtp@=ERer0mv%gPUiLPU}lz12a#R-M%M(Pao3MbyU-5d<l+`
zSV@#w_{~^d2OdxT377giTM{SJAOmY!PdTG>8#qSKOLlL30yNic=rp%DO?*OV-<m#y
z@{9`LBfwrZ&jA)#h;(0WcGCZPOwYI;)!UsMK<M$gda#~6fQ6PWJT+fyfx5V)+5Hs_
zf=Qd$71$?S@YU~fMNTL#&f0;m6Wc~MK<zE2xabsP=a}Zh_8Op4ruiW&ST`YPckTZ9
zAy5CgW-ty~PWlLkbk3)!B~i-P%p#Z%XN!$jt|#^>u(+I?`1VsxsbscrHLNwP9e}9e
zZ{HzUuNGZ72yvCe++wvkOeRqppT+g@=6$Z~gpRbiIAtct7P}<m#wt)OCQS(P-8Om0
zxq?LHmW-8{9Tm;}5tK$N4CMC?kzmAFsbJP-Sz1<Ab$ofV!f|B&BbO)cR8`B9+LEn0
zaZT-?J{a*vt!1@Th2V)ZBa6*3id21f+Oxi0y>|$Bw;dL?M(g$UcC4jj^*4V!b;QE!
z^{7v=99<g3#iY%KdUOUNBL)8P6~fKoee#Zy*Y!&$&LjIT4WvKjqH;#6)134`@~R_T
z{5diw9WyoMkk8cth!{WG^iF%hyR#4r_4*kDT}hRxuR*3j1b48|hG~$>-P^&lz}8?M
z?9`@|K=PU~Zlbn2zWvz<b6e<w2x%!aaV@;<v@G4DW4Y84;RF!yYL{>CaR25oL8OsG
zcc5W;i6$$DDFNo>ka{|rQx?jep)Bn%TUjO&I@dI-XA_wcDjUtU!$V>xis+5;Dv|tt
zz0{*>i-67Ren9TD+^fR{*%Tbv;B)kn5e}(Ea{RL=FmX{pi89a=L1FiOeMi*j&-$ev
z6T<;o4vcq*K~ND?8BiH`njD%33^5ANUkbEWEF$+UVxZ_aWyPVOmlFZ2@rKT}WGg)!
zneflSlwp!@2W0JFl73}91S90DTSm*K=h_v-^$fz3Ki(tbmfV+x(fq#losH?1n28$L
z1Vdzr%=mXn+0$!KeyGZ1Gw*%zfeF^6S|Y>Xu2%n*epG{=_+?@1B`C_b1M%&9YWl1e
z2?abM_7Q}vO_q3Yzsx&(eHF2#14dyU1LLH`Pa2M+E3$FyuM{MRmU~f-=T#UM{h`zy
zs3{68O_%%G+y~z9+x?inv3pa)Xo=i~Wk+APkIt(aQ|wJG&fAK>UBTErDpKjvwgyWu
z?7k*1!FauLzqHKY)WAX8i_+M;SL1DG_RbSAi&$ou^$jOZ$6X(5_%$LB#Fks`m-U(7
z=i!P`$2uF(=F^N66^9^ctzU%<sE1@WGmq^n`upMEZRXIjDc)z<;=;r)JCIVqYzZJK
zF07lE#MUBRMEvOb(V8nxKls&U<KXT|$-6n4*K7Uc1th7K4$|AGg#GY3!K1EXvf#@A
zF=4^mjuVe?)0vfoVcr4biRu{CGYIG-{<Xg1nAS>O*I`rkH>TH#f-}*6*iq=Tfbr`r
z-b9Qi8+AeAA3hl>ZK0DL#^S|ht}*cVNi*x)M_vY&+rdqs4zHVz5tsEG19v%&(G=L1
zcYC6ftv)>(0K1x%-Os5r(Lhr8hx!Z|eTOM)Z!rf{4A4!{<#br;3St3oLVZw><)j+P
z_0w1U_*|DCoql~l7Emmw)Y8{W_k$)885Q(OX9ulo09iww5(C`lVU`aGY`nem&ihch
z8@wk}nucqab`;W5NWbjxt%%e4%9NBD{}<`mCJc!69hc6?@b@j^cf+<y25nc*>)$ZH
z;iM6(l3$YC4z@$(7t2DtQ+C~}Ec0D^u%fSTz2I0qrSs~v(6Kl}LQaFt&Nqydr1=!F
zx_fZcD<c+y3ewz%0f=_{+|9BVW2fHXpgx=z+Ds84k(e>|xeYRMBNQNCufQMkqz?PB
zL7gf^0ryj#kp#?SotjuX&+ls#m>sI*Wf&=RLh_0;hTo~MI%M}`r%su9P<RZ0P}0*6
zh7Tw%iypFd@=Ih<(`zXrz{=TiP#3X@JzE`-STB5GHP^m6a_Uj$l}IdtetD!9=gE;K
z7s&cUD1tXKsv$fK`50T=ki1gFm*0tzSNw}g@qS2wgdcoK`EEwXEM8Dp;<7DVX2v0;
zNeeNSGKE-iwH*l$S0L0)(EA0k<Kb9vXq@(w0$)yd@8aGOR;e8(Dt`<^RQ>t8-Ct*k
zW}>mt`<W~ztdcoSCG(=Z-Oy!1puf=^*(pC7t+r5c1841qei8cWfUTx1@g}8T=?&#n
z@z~m8tv&!XP_;G&v)-i|Dwck3MVr@~4j#xbFw~{`idCdf4CV{FrN3X9M3Fu}m69K~
zSEZ*2Omu<k`GrBG?t_jUaP8C;mss(wd+gT2<;UQ);k!ttm1#j;cKOZ-!+8IeO$o|K
zzIg1vj=TA@*Fh9fU-0?{IeYpz9mJzRL=mmp3OVumiQ}f8+>F~DTOa<U+m*@l>+kc(
z-xr&LdYcOny>qiCN+3$4MsftXZH5-2{0R+WLauY%!6ei2F`cghUeCLqWAQ&wV%HZW
zM&<E7m@DFu6UcECs&TDNzcz@V7ZHK5;7Hj+#7o3V4CEaU9SZcwBRlyJ)1Fd76LCt{
zRuyRSWp|INkkzn7``IVRg1_HEfdcdK)_6oF{mp(mIbC|-yFb4XN`0p)oIn~{?6W8}
zRm%^8k~*Xx>3JT&f2+2lvkp1mn{^^sn>F&9EXS<Bg8h~WtsYBjRMBd&zrBM%@Zuj5
zq}a4aXYT@v{!9v>+<FtwP-~Rz*pm;sV5$vje7}UbZcd1BD+i_El$cm8_hGi1q!sM&
zn5j?H%mqk3ka=OCGKaOtWj+Y_`i*vbfV<i;fudai0A8z10Ht*Yz_xcU_y`_A*l`6?
zFa%H_uam;vi`&=vrx*p*`qK&VkNK+;0;0gbZ`W(HT?k>yF3u(O8{)nevjyq`+stg;
z21+@cG+S1wlloirpud-wkKAwYk#>&}MmteT7p3{IpC{Q}b?*W(X;G=DcfDS)(pGAr
zfryDAr0T~SB1CX|qhj@PAlD)%Tr=$Y?tbSUW%%Uu=Q%v-C8Qi3R4qV{c&auaq3jpq
z8nVFVz-S)A&@Ya&yGCc)1JB9#@Di&cy&F-QuJ5qKl(|?E^yym3XFrcdD}8-8FM+Xg
z(1jR8!e3Cup;0y*8(*IGy7W~c0inWzba8jHQdZU~Fo-{ge#+M72V+Qpn+3tJ=)^65
z=Js=*zFRO>gBHlnRDOSw2h2wmJNPVpSf_Ju%zdR(pVlLQDI{2HjROAc2Ky{9gC50L
z27g$F!8mN8A$(UTg9R#1HrhjAOOXJx{8=&C+?#OHNTqulF1BOV6TS&IP-4-R7@yEI
zS`R+&kNo~9<kZKc?wFb6G3Z3~ctk9VQy0f6#8KdoUfjs!qB(b-gg8*i7~&M-glpW}
zW08_mPy3nz$_rsSuF{w8$vfbS+gySNnLF;iBv;ZM%*A9obyKCF(S&}(Bl`T*BIiEL
zPlAbbPwg`AEe<~pP+kW>?`LL6?~dAe4iC3G^PU7~aZKwu6q)KdW;#hES$X*IRQ@2B
z{3gIg^RyTAvFwGWt)^nj8xLV**$Hz)N7IQ=Dyleks37vQ39sz|3L(=v+j+n)nJ$OB
z1Nv7%Vw$=cnzsdT9;zQ+a1@Q{=vy!3|Fvewuwp9WG64Wc;KVx=pa%bo+Zzy~rOiDF
zuBOhJL$-((-#>y8_=#q0%kjN!<jodB%$e9ks_**2*CDHkodwPIZ#hGIFY{q`f5X4N
zWwU<0+!|vfcn;o_|Mk)KNmP{PT51B#4m)=n?r}ZCtfMJvels2VT{74L?Q_Yt3+S!Y
zo0beBVh?ibeWZTa17%{{z8x4(#g~dACN8O%h5Bk^<=v{q@z~%Yuxs)*GDJIJS7WOY
zyx6~ifdj}x1F^>9ZgUxlhhPOSs>y-XguQ>x+6x&wGzSH^U$mZmgAL4Wi-Vk(x}T?W
z$)jn2?B7HA;GZ}Y6Ik(IBP0q`IAz$aXtP~@G!F`2(75<&)a`oS#F{az_zq;HO;I2S
z+FUK_cv+Df7yLfYAEi!9K_e>+d7LX1vl`Sh(5h@q<#9<IC743$-}8hVn2J12%GdSD
z!|@%7rr4{5hnWpiT@vO9Bk4KoMzp!7^DQDscs3-Kg?#-Pqu}~$j+zEXy*J6`E|{pr
zown~w3Q-$a2Hf3hrBF(x4e+)mD~w<%ZyAwB8kH(ulnvDeIfU^FdgICtG@Fl18wt<<
z2BVPpW;jyS;ma|FgApEf=`*UcoLPdbbF@X%*%=A)nRY6CS6Phw+>4I?dvJV-m#Mzw
z_gtf66ZD6IRb`z^FgFO5?&pa3uF>xYZ+!DE4oJt1pIS9u@$Em4ov2G*b+c8Us36sH
z!neOz%)a7IL{02Po9dSqxrMs!Fw<~zd{NIHEscEwcTKN)HffVV5UhuTgs5;u5ZISw
zv8zr@%_gpjTT_%GD%fbO%0|x|RRMoE_l4J!^^_iegqJ>KB)k?TPdr#zA~HF+h60i}
z)eP~`0$*!|wDjVkO64Zlkx!(c{nQQ*nd_$xRwFw&hB7Mr<{xM|D2lMwKNpy@AJ_LO
z#0juiZ6f8#jAB_UlsBfqv2+FvacbPE{Mgi{C^V(fqIcwt-A1;{rLQi}%mI)$QGXl)
zjzP21R<$@(fkH{I>I5e8-z=6&uuk`R*<l)N(^MhWT~B1)ZRp&zue=Qn%eT5Qa$2gg
zrw!Z#3HDM5-0%%^)xd;`47&0`vWCYAJ;L&DU}Z^4+iL9l`xo}2Vr<3gH{N8l9Glnf
zw2^(nro`fL$+92wsm}|XAc3seVPO$a>9nyYTx6o63Y95&1>&`BY53_qqNSxg*{9eH
zYQ=HhYCx1`b|{UDZm!Pb{fR9O-&~jz-ZuIhnTLxq(-mS9zF++hKokZ3t1X5R%N)Bq
zqLQX2n+?UbYY+QqV}DuvTH)Nzk17@Hwm5C<jth-2f7J>;0iy+JAMq0TYqMLxY-dp7
zCd-P~=|Ykh4p#bWfm&+%h90N^iqf!K<P4dNI-djj86vOCDl26L`g={UQS)*E-fEKb
zYYgiOLixi<3lbV#3>-TuA<5zoKF6a6lSn@m3vLPOq53CUgw5rU_DGFo2V*BRX1h0R
zxxx_F^C4&hpi-3=)n}j%LM?6T+qmKtV_rPNZL_eo4_I*V&$vsl?S=CvBMpA|7~x&}
z<}7tL59$4}_M!4P^N}~J0|TKCIKNOV-5%_Y^&l69LD>mJ&ii#ngNL1`Tz8%_I5~FQ
zkzEPKo_cI*{&DnSe{+~_4EfiWA@)O8fjfIdY5t;VR9xjb8xsOT?Z|KL&<R#Jc<B4#
z;&X3uB4G_FQmALJJip7*>Fm|s>WL0FE}FYshDL`?)75k%)CKU!lWAlkONj2~Lkw%~
z;WZs_QDCadP`)Bo9;=;viyJ{Dryo8-Q@lPpi8Wk2Ulu4C05jo>_b!Pn>5^zr5^{m_
zCJIZg(-g<YvNMC#YWm?K9M<3tGsvR-nY-)6%MrPXus=<#0Nxmp-`d<g3|`hvVc-4D
zxU&Aw9Pr%7CnpL?Ka)d0Har2tk)CW)T+Ez?9j2ctM5eS}mw7TBpl=a|$03YCK*2rQ
z5YcY7uh{rO2J@}nT?SB_J0Oiw;`#0*^|WKptb5<*FCf`@h1{}pf_{`;;>+vv1z_CE
z^zj+TAcE9QMFKq$PS>_@)1vIGk?tp-WK)dkAb1jfUuW*8HPS$V&Gt#{O^MBB8<nLk
z7$RkZ9h%whT=*5hvI;#e_Rki8fm;EJExFV#c-UuxRT*~F`4_%0NJ*HFQvm%Ia3E%Y
zd5(S6b?MG(;d97&VJ*QX>=pTUpE5N^YoTD+iSkNF%0A+xE)JCV<#?muf!(qE_rxa+
z)QSVB7~q~{WPwPs=_Z2{L2(mE*$E{^rC*R2*A{gP+-5AJLg&4}|6~O7iG<oy-s~>h
zKkJ|ofd_5O`+U7)pI}}F<gvl&w;UFOX8qrExy%W-pT@cB$=g$`I$Yyb!X*5trAuzr
zDRK$_RDGLL?R7weZt%5vW+jml%5y`GnSr{)4-0U8Ql=-(cVlhX3TpC3-o*naa_W{f
zvlcoQd#KRwa;8>&V2E}F^V784QK|W4Z7+`nJ1(g>C~HcYp7XK?s%jLRAuCy%4Yv=2
ztL+3^Q`nY28m8qDGgBdLweNrt$Q(C@5u^o(_d#N;UH+v2ER5ErB^jm9*qXwL@Ogzv
zR9#S{#UM*-@7R}*xS%wl)U;IZ<z4y{jCB=P{6bqnRtn7hNivDOJvgRHSld}quh|W@
z0skDIzInziSJ`f8@p2LEc61WFZ>t;)4|Go9^8)c(OpqeRT(*;sLh$%Iac?!Fn3;)v
zqvzA!BT!sTfk_C)8b2FFiJ${eQxT%a?5hM9)hXNQ3OH>x_<1*1D9nYM$wq{EQj~q1
z&!UVn;*Yi+P*ie8-dJ-0nLX1x6~Dkzp{9|oSF0aP5E9AwV%=VZl@63kgqs=i-q$d5
zX-J}P0KLO*>thkT+vI3_Fpw2-%(yZ?clpPENcO~yezdW`E^Y)qD*3;i^g1TYdWmDF
z&*S+`$3i9e7OeLnc-h@rg{FEaSX=xyy2*Av{<XiM@@wnJq&z_r`9k3;iJuUj=Y%$h
z12}%yJ+Q$GYxW}+>;@I#l`HLNip-|kCh`W0=^+$s;UVA&f*q_RIRCf)?`!x+%9D|*
zo`@~J^P$Ia!>=-(9!kN%sGE0pwfpphHnw^clqwLpKpi*0`@F2e%AsaGx{yrgxUroX
zeO|FBe4Geg+KfJo1P*wdl5O^ji;r#1#JbeIxo%@$^G9!Rwku+=0}x+{5&c_4)c_u}
zP{NC+;M}8N_*a=PFtp&@Jaxi|VmnqtXn5#7U0vv&Z!S_;qPWn~K|7;wMCiLlqNRJ~
zVfuQRFO@f@znD)vJvqP9S5kk0P2y9o6Y{xz*}_*omLi8~^qISt_<VUeQJ$Bo>vW0l
zoj&!srxdw0{$pZdf_!lT_kL2m^7Q!(F*1AdM<eRdjmj8Ax<lN->f~y_PtQ_~-rYI`
z^<{xW>rUzn^^E{{ko1>KZaDTKqpWNb7$<5&QYs$||FlHTM-EC$#ZezW?z}hg_RE}|
zJ?0;xmN!}9Ds0-~qiHngg>?hyqN`7v`UVxSMcLB(v@c+Y^^U3nDgDH{&GiX;Gm`Di
z%7t$na5fHHOca1$Tx?6>Rt+hw4>*yN85e~L+eLO;+TZ)evm1taO9-}40;`K%1(z;p
zqK}kEzs4VS%!rW@k3y-;`E&aMs7U;$_DhUI?e0Z19Y3Hp8Cs1EJc9*#@0a3&bK{@x
z+CVSxE1Yg~9nA2(doD_67siBzrj++*G7&atlP_r9HK#jI6wB?FFOGl~X~2;cnJLd1
z5RNfX6y+K(LF-$d#doVE^I@omgshN>KTBzZTR)R>T+1sA?&F8rb@@0!M+g)U;ci!c
zOb(RG9v|>-n6L~fYb$&83_NH-u@MD|0LffzDgaP)f^3KReX5@#tvfw|8BsX^(Q<h6
z<`Vny@X9*h>Q=`AZs?SzO3WVWRJA7vAhazA-{1s)C$0`*IY$ZysauO1h2n)pc#BIG
zNNn@=CEQnHHD~jjSnZF*)qRbN8i=B4o##M3*r>o`oH!BWFXnqjeQp<=)vRrDs&E#(
z*@V@5c49`MU*ID~!#ZdjIVj~ABTo>Vtu*0Y_@*Nvn?ITT6Yp+!eJu#+m*FI+G0CYc
zP#*1?{J_6_0s$Pv?1I*v&hU&oAHR_8-10Lg`&MOVNb1y{$)Z&CN;%^g6H-+azC&(w
z%hX^QUmORN#g13E3<H@G)=%<b4WwQXP}kY~BS4(V%=g8|J4?f}iM9k%_&a-^UrXAG
zszu?kcbXE4w+ZB}W=S<Y%Ryp1bTzYr#2U!y103)pZ)+!%KfekOa_!Hx2QzEibOmn7
zo%aGI&a4;rnB4f{$Kz#LYZ-`7Ab+@BJ-Vf;Rr~q;tP7Uk{IU2VcljzsV8>s5fumAa
zEw<_|h>|Q_#5B%^6JKYOEL9m0pjzxhJQ?G%V`J+gj7d$y-il_N>^r<sF{Yav55V=F
zh~9z!RIP#j$r^$4*-jc4OrUh4HhV1^x?OvFh|M~gdDb3%!GuRUAwjgnSvi`@HQ*wY
z0)e<$Rw;A`Jz=jc2Bwi;R3~GAKs0(wVtC`N%*Tm#OGYywaLb!Ptz|hjQkYlZ&*{<v
z*5};^Oy@_*{I04<bTROxP#zAL&jp8)t-u-M0pmrr#d)%L(vEJ0B}duUDA7_))lT?M
zuh*PK-ZcH{K@*^=(<!VcM7ib${hTtB9-^!lGr~#Bfz_z%Zthte=m|Ujk}<Vvv+~0|
zSupIQ<yDVSZp|EAWOsk%C7UI3AbQThyVK$w`@=DsmI@!IAFcKo^6hQ~UfVbxtL6l>
z%J7l7GMK9E03S23tTF%pwD;CQS$<u^_C+_+-JObbw<3ao(kTc?Nq2V%NSAb%fONNj
zlypc4N(#~-CGc|V{meJ#<L~47ZpZoN@%3c*XU|-J9kY(L*WPPg`wFm8w7Pg2uTj0R
zPt|>klNo}o-M^J4an<U<VdhyGY-uQg|H$lE>y9A9sv+MA`#i7}YPWg;hE+fm-7Fgt
z35h`VQG((t_LaNYW-%XreD!OkBT)Iskl6or%W_{9=fk=+;S0;YSar=QpA?!iBVB$}
z`BVBPS9$ntNnc6hs0)<9aYe(@cj*=P8JU^WYZe7e`8RRhL=9zn$MAD1m6Z}H`I!B7
z-ay~je=t}$+pxwmGiKtkrca`(WsOR;nmj>rUe3dMC>Vc}47CoMLuu`~JRwcKbQt;3
z>nGbmgeJH&yX-TGTCF)VE$e#(H>!lUE>CARiZJ*i2U%zw^ZQ`0E@82ns>?9k(PvLt
zH<<8|B6!q;`vq&sXx>r1@oIY@a>nb=fH)ITyHFqc8YRBZWad`brPgBVEGM->sJ7A*
zJ!TI4A%Db=sW!RTE^O*t@V#l0J1T-+DSVYWXl{{l{14|7*YKzLlS}IfS!F*V4cmNr
zdMBHJjmt51-$imjf}+o8T%!=(+;r><Ma_O02Hm1*JOn*amMdD|&JGij<{*)%=ZcsN
z%-C+LiNsyRz){4^uDkJ^x~?Pl=N-=8xnDL(;`?hX3|8t^td8LI8$1|0Ye&LBcU0;w
zMeyWT*d|eXrk}0`Dd<x--?OY|mKKK?iI$O)J?IwBrF@82$_szkWpiHbva+F3QJ(+r
z>ka4|dO<htUEOYIQ7$k*d;KrI-Dt|?$!nYQUJz)=)u`lPPCO;c&AS?6c)(4wZBE&_
zXH{VFBD3;M>=5JUQ|D%*r2@zSimgloWWoh1{l2j0D-jP!xnMzXr(u=cBe9W1`{vJ=
z+IoF&cJ+w}57o&RViMwnY#h*Z;NBx#jKS24NjcRaI`6m@6embV+HfpioSXErwKh<d
zehg+yBT~>wu3o#Dxq-dGq{p!9aN;)*6omJF!CJp=xz`cPiDc@+jR8qlL6-r6td?RK
zqo;xSRFS=>je5pWCjYJX8%b=7yqo^b@afe>JoK@eP(dgW>GJH2nQ+A^2AnCRo(9%4
z&5oou2U|srAxbprkCa?ANVXKz=UYn@Nh?O<Zk>^r&l-=16)h|1hq}hM-FA>B_9#`M
z#N}Gx{XE|Z8*%ygW_Q7OrsECdWE4s_o-VX4cRSS!$MZ$%=ws%&muS_z3<b^MD_bv9
zE+^~^v^yOiP1~52+jO01YfY<Gc6_RI!&9CL(HiTEq!t-CW*pZKLq>k~noiF~{p<|t
z)tkNb#KGS3SWPx%XlY^OPz|}tSZSim`H8_(T}iYDcdN|W;dnZYUTWWtD>$qAT6}zR
za64^VNnVweCdRUm;N|Fc6cL>g>cw#oXK&Vqgj^^Nyz5uOT^IZ>uWbmL&`Wq^&sROY
zo;Q^2pc6l<=TO;!?ZzQAT;W>^Sp3G9IzXVO3-zMM0?t)JGF6pk*kuK0CS>8Rq7_p~
z=UyVwzdA)GwiCG&0jdNVB(JF9H>azt`94~RiVs<0dm~8iM<75!7js2=X;KZFDter7
z&hzCkNU9q<SQ2O;o6J9CwX<}@48{7&<6)3p-kDJ-)acTxw+dhCNZGsOzG!P-PH!Si
zk;|{jLF|LZ*+QGxZ7^in?*1}>%d1|aCB}F^=RM!cfGjO3;gNVWa?3q)J<4~ArAe&a
z+a#*7GR|}YNpv3l>Ds~_>JL~u1PCr>tDGk0$?1n(_3h-IG+sbf8J;xHy{)ny*nUjh
z{`SO}U?kL(-N;O-z>u>ZyLP7)UxG`>|F)#mwmxE2<=u$Y+fv_D@iQzrOFUM}DL$~z
zK6g)e{Cp(r(y(Et`$?|ftl(LH>kF>R1uVP9Za#&NdPNp;bqrZz)Ee5m%p4a*w#|N6
zQ1~|0dgrWGSLr1S7UmwhwTz5yU%*j!7v979P;RD1jkYCuoZ)d1--e|Dhk_!a@q9^m
zh?~tK;e7$V^zPMH`Dp%+9Lh4K2VKx^-Vs1Yp`hTmdXh$=9($=>XefJ%0Qrh)Jm=>*
zyTA5crl+ETA!GvaWzrF4qij8_wYDmUrCzyiun(68Rh2w^eV7PlJX7Agl37dwydL2P
ziHmw(b#xytDGFCOH$}r-LLyt%wkm~=$|WX}+KS?$0x<HU3CB$hkID+sKTdW~@VPAu
zRp`}`bxBw&`JL*n6zA0MDc^X@Cvq<~m`kFAUrC1_UH~O=4xJz`7eQS7>DLkQcH5Fy
zy`B$EZ{K4<CNyNyp1*e@@*ye%?rG|iki_RQJ5_fcM>#rhAbTWynk~1h)x2@l2=<A2
zADZE6QG;K2AYOoAQ?~RK_Uu_2<-HX5zDq?GD@tCHdB;V2@0ba3s|&9HfquPPVI0*o
zLvcf0mi@$70gi4(t9g0{rl*a<cf5-@HhYk$rTr*cE!T2}yQp$k+&)X7)gGGi$ykVS
z9~S9gjZDs)N(dp|iKaG?KE{X%eTJEX?j-d{O!XbK4!<+g_RgvZ?dKc!1Rkmg2c3&}
z5?2gsx!q1b>{8>w7CU?A4Be3HI~oPk4Sfses{#AFZ0dZN33<t!`<`kQO2fx-%iRg}
z+XI@(PvuonBM)8?zM0N@G}R=T%O3pn;WK!vqI6*_#H-&Q^o!LEPLik>?fa<kp1Z^^
z39H8$Qu4HJ#O8ic@a$WpguKyosTHHAvAEn1hbP3t(_lT}DQ5IOo%syI9IGF+oMNQ9
zY(XOYr<K<v-rqB%Oe7y8L?4iCw^t?G=bzm$^S!6`UiFas{IOikgtT&daKDEF{-U>*
zn<E*V8k>S%y06ELH~X-a3c0Hm$Ki|&ca>uUUm}cB+|i&h5Brqx7%#Os))UV7-aS8x
z(ei;VjiYQ*JZDSgy<s)CN3~vqWb92vNw=b&i$aHNJosWj<m@%ot8~!$E>&CfT!e{Y
zn-I>7PW9zWo^##&N@3<aHf3X7`EWE*t(a1D5l=6fEpP2dd=Y9Iq^=G5p`p+hyj<$H
z=|s-@4dG+i(Ax^fb_q!=FE6$~)Z2$}*L_*7a-!`_`(TC|FO@Psu;8h_=G$zrhOkd5
zJs$8SH~JBBy@jxw4Q30w-|CIRig!Gul;|$LQLr?Ml2jt~oFD9s3eK9*iabXp;LHd|
zp7PLZ`E9puo6LAvII<Ax?T;%~9v(eMF3@NHtjps)<UJYu;Spn?XQo^9ts3l10!B7*
z9BE95LgC24NZK^aDn`0a*6Z8EZykbEc*Vk=-G?q0V=XQfW0X%-u6B<OjC|oJ5pTPj
zpBmQcrgT@CQ8bP&Ee&2E+)o0dtE9az?!)WX5J4P|$QN}{Ee?wzbW<5>=+ZGsee|WB
zol}$FLe6#5Ka<o5M6us$)U<E5m|vUN7(9x29OHcUjCAwW0}4u}s2;NJg*)dZ-?j)d
zpqlQo`h8m&?NoG<7_H6Nx%qynj{|COk9<{i;V#}Ql#4X$aa@mY>3BHMgL*xZkSK;m
zrL3Jk?o|t=LT1vdd^r{)PdGghpoU{mi~c!zi=0`CyXsM(SjdNx5V#Li0g6etY1!Si
z^*r(=o#=ueY9{b|V;Z1`o^)u@?6(A$S5nn)PtPx%hy**J+{RHCGq<{$AuN5=YtXfJ
zN>Jk#Zzx88Ul~c8KJvpG56<<SFC+BW8oZJ?d}*kcCdr@UlNz1;;ObOVRAsh&dBeq=
zqVL$eD6PvAkG<cUC;3#0kAUb|6L<ZWVHTH-rCQtvyi@e&HZ_Zbh3l-zFw>8`Vys9)
zwft{)@$6n~N)Z+44~B*N2Pc=`UrM1MY$PvH3eVs6T?<QNSEe%-Z8koyrOPDHzEk$3
zDhDcyyW4AiBP&-0(z{mHoxxL$_zLv`ml84coTSBy+<ou%@|;TQn{tQ><=K~ypLaQx
zH=h=K!t=c!6aT4MVGL(=W!5umE&oKbR{lPPI=$2Ug0ra)Gn^=kJxg|H^Z-3Ve333s
zuGaB;TzaV<CnRk%ertP;3pQup2U%<D)|&VH@CZk&rJft$YCA1AHg7K06&XC@`Iep9
zy>7_(7;%G$qy0H73j>PZ>}-@G96y7OVQj!ck(-+Jr!OdCdF5q?H=x_=Gqrv99K#ji
zmSO|xk2Yf{B<uVfE=B};2m76hgBf)=0+yUf1t{qb6~e6V@NnuiyerAG4l~(saF}H8
zlD~~<_$2XhP*WvwB8xcjEe&)++v#v^WPylfC1({3M-gNsGBy7abAIcShlvl=%CtJ1
zaFM6`PPnc0ob@b}V;L_Ch&!GHniEWZ`sB*YVh}Sz`E4mQKfNhUZ_Hw0=$-cqJmtD_
z?decDAEiUlQ8MvthstvCBWai?x^m@lD)*De)@kZzv*hnHOoj6szOcReu05<uWBkW-
z@f4B<rfD16=+o>7(dnKX$u~o`rsBd10dFHi`Mh#v?;LlsGr$I&J6hhlB!_(%Q;$*m
zEh`+En#S0UKb&!66n9NykTzD6J;eh(yBLXForPxjeTy`o3+*x@g7~QRVoOhkQ<Otc
zt;bjZEYS#snJCk|PPQFk;O&#p;?pCTo6;MCMA7P~^0h2ZYHJ?FW}{!HWA{p?^pV=L
ztrO4)7=`d{38du5I~wKAvoyPPh7EF21DHvoH?Z2XI%-5y<~ua1+eQ*q*zn0CYTxvH
zWwyYT6_qFB^Uc`H`jqg6g#Y%d8_bn=I3Mk57EMglzbinCUUZFict!0x!R(@Sv(i{%
zMdG1|H7YuR)oRx$X@)VBui)C8&3z%2HSr|j8p#`>2z-q*t&KMh0+;q{7{e4B6a{P;
zw^`@Ok`kF|S{XDCV05hlBUM%thmB-THd1J{HRfXqX4_NyFh=Jcp=>rgu@H;d(r#v&
zgf%VQde~4Dr>P}#t5uwLfSu8O;1h{}y<141pGE*_b{psN`n()69ui_CPb2f%mN+XK
z@$H*-7*)OxnAKZKG1G2{2$;HZ54J{(P(fhd&+^{*HfWMV=aFu9TFEuYdr~dPThGb-
za+Ce2#f~G3)ac%2*KtAb@#RfR-w;c8s;87z{Mcjj`Cs08apJj931^~+%|T`xMN1kj
z?N{*8k_yjmycp}7e)lLoI6IsC0X0sfl?XY_K=mNzJ*d38#}=i}-Gf`H$>+b$$_>j}
zSEj<RM?$N51(&~I6l2yY?|k|Qg{cWKyQPLofwp1tODdEI{%z4O)ndL=%UptX0+Kuk
zm`JKvh0<SlZ>6#tWv72!Zi4USSlO2<*!i|gAErnbEYC#L<|j49_}0)ZBDP*rBekc+
ztS=eC2_08pGZB3?@qPShLxMbRw!Ik@AzI*_Iq7UPbqVZXzMUwM9u+E)l<a)0lnLS6
zx@O4>-bM4RP?bV7LXa2gs}XwXaiM{RJ?UY=)1pvnmST*Uks?N(5{`F>FACC>jN9m2
ztzI8E9OJ4Z&9$e>5T)x9;9I%}U2;DNxm=e|Mclm5c?EG5*k|@0=Qy~_I`l0OB@+Jt
z74|ijlBZ?UTip%Q<VSKDYL&{oN%63?9um9J5dYTUa>7L~Eh@zoiG{&=Dl&Znn})Lq
zfq^amL}!Jgoq7B&j*plPIjC<Kd*A!3qCPE*fhtfDYhg@wy6-1+zHhi}CgFx>cgsKz
z11gp#<dK>x|7nZ&=QmUx7Mj{E?e~}{#NO*s$(^Ev<BVI-ny-D!P&Rw=u2DJ%YVp#X
z{!QY9Uhil3jXWoZ>bP_ai0c~HgD2BB+pI;kO=i<E8q+I8`tP*EqdY0Q-Pg|ZuC9{=
zIlET+vXb!WYdD8vQE1y*2&|E{7e#76)OdL-T{j{uL2)O8$T1G*0{DV0<flLIJ!k+D
z@C91{j%(h727jvnK<dW=v<UzOv<ZOY8k;_WdlLZF_XTJZfC*?50LOK&tM7n10a$@L
z{fq<D3Bcr<&FLJp34jW;>1Q0EO#mj>*whZ%1V9Da^fM07CIFM`O1%+KCjcu@r=M|v
zIsuqmvpHQ{eSb6RYO>HP1vpuFzj4n}c3(-~FHPdp$J@?FP5oHXbtgkouLz7RahoWu
zpsOs46q{GyS#4denGLt(b}sp_+>tC0E{O|ax^;i=^suL|GE$v0tGv8EP_uA=&u%9A
zGm146?u+7C)^};0Hy-5*Fw9ga>1@JM=L+&DtQ;{uNz3vMZ0h2-BOw+`asBYEHlk!Y
zAC5CaT_;&ABM6=LR!}~jV3*IHuSYiR^ue<rri9=#LE-=jHe3m740=t(dQoH2Q|%0W
z4x!m<dwk-00S;pCMC<!d5C^YT-9p*-&nF~ZZl&yCi8e<k9o_x<5h_XcgJkY0^o~SE
zYpL8yskDGALZ<A6)kBJ16p|SDS`<NDE~DK7)VoIMi0Oy?X#E;H-P!dHNvdPrs|X?J
zQ$E>=CMGmB_}?N1N$-gp=*_OF*~HSbpl*0OGk2EL;)VH~D=!|PGs8F}Rn+Cjs?=IN
zt^Qp1`Iu(@m7H1~EuD7l@yFKekee)%g|H`226J{T$lFO9zBMBZo*fLm+B;L%OEMZ@
zR&VZ@A!q4$CqaxqpruIsyjLPrTq}hjx9QR4ltT~)^jFt*DjOnge__Rb<U1N-5%-5V
zjx4x1A`peoZ(4W`K_IlpirX|-Q-?6BDkMB?5VF(-FHs1^@RvmlDDvWCzKu5hc8ck4
zsAn(?lq}9<p%dQUZcmdt=igord->iE2ThCrMoR_yWjx!rav5r$<{SayxtaUc?S!lH
zi;f|Svrq>nBDdbWLJ=3}p3*f<*{H~9e`%}WPSZ}(LdDhhToMNUR_;rO84_z+c^!4V
z6M@0~+4w?9hH+Wxw*$`B2SxKPMON*@o8E$bUjLqqgm0n_k5#yO*6J1I0uyxl|KiEW
zTz`MImE|G{_D)r{A48F{{~n5@aee7Y>?wKmm5y_5Q)dK$!i_*07nljI6tr>yy}MAX
zZ>mdhjhRr(mc(42OjaZ$jp{G3&fp|WVB5dpX4EH3J}rCT_IR=3#Deat!GU;4{6HJU
zW4mOMcpS15V{E53E5|`;gwdlZdUk{;Me9rDCmUWCTY-(Nx6y3g6DKEpbxiYM#eL`b
zjilN}-2EOwr{)*v*j0ramkFg`Bxz8gnF#ujNylX=^J}`N-v(;ECM8jEdI`&uxHT<t
zwv{M}j9a>+H4y$#tB2@Pm;LU2A(L6XX>@sx1Uxn84HP~^kNnAG3M;jQCD%K&%Th90
zp@~~4C7iP*?M&&bRyk6(V@qbS5vrka6b`v0eVm&Pow-<K?28GnZ>DNXt@@hHC=ca*
zrYw2cCN5hBwfo^l>)~M=7V6P%2vvIG>akeiIjMn{>+L1VhwJT(pSiROisJ5zKP8={
zef)-TRX&5bwnaE&JRz#vd}twr_OV)I@7XPkBJqA6-^vStr<9+!SM)b;FNZC+*SGt9
z$~O+Td_8AfY9F4J7lu>a8YDevIE4AtS?5Cbow6757M5RTF}6xY-*X8xN1w=?wv^6$
zhUGnH`g2B4lMmu?(LVHQcu8Z)J;koT5vW}h8D$`#PDHcD%o;*svVCL_p*1{9(zEQ%
z6H(7obs~rn{W#|Ft}AEP9kDykJMTVy{)lGn*FTXQP$odIfM{!`FHM&DiUh_>?4fQY
z(zlwY`ghH^_$xxTFP9g|6&}{0`Bjjw4hEYZZRLkTct&o|4R{MV@(51T#o0N`oXQY)
z=ANA!7Y#+<<W;95Dw!-jJb0+#HrO#oaIS3nVAF5yWdYRPL<38YaqqyQ(u9xM^px)#
z6M6jxJE~u;9&cN{tt8HCN5-F|a8Li7)^zy|lQ0u@$~y}-*Z3rBVRRf8QmOvdb}o}&
zp;ALj2K`(4r)=i73S)CA;rB>^J)@XKg5z=}T7g>jx1z0FDDOi2C*I2h4q<DrY{QLY
zLs=2Gk{@@j!<y<TysA>G6j1Vl+t=k@I{%bg;$N6CU;)=x<Z>jer|Vg_yBLQqPT200
z`#i<yrMos?hS|a%R#>dp;^I2p_-jXKc4AFDr;ND4cz^p<&s;C{Hb*kz$wT~olunON
zNFOmwZEvPF5OYrWw)Lv$^$QCPNlUOW5K7jgO&3VeJlc;Dbkes(dOIF>2bp)*G{0T^
zMr7ASCRGfAu0uvZg^n**7bim{OK8#N?I?oMydY!q(a+&W107HMEWBZPF~kOhXb<aF
zG2>uTGhj2{vgIxxOl8DNe-4>&<5Wkw883T2@P)GX?!8E9jRxzOJ&_sH$2p{|Vn>?h
zC#AJwsQ1WAx-{^(B{<q&JpA;AI=fAO<DJv%L!t=&UKtI;{%;H=4_h1y7G>5YYZk(9
zKcU`}O}cv8F%Y9M#|;x#Q;*=}#<@ovr>Dll%?|g=-My!Y&Za~jydTKldKIaoz+;=Y
z<g{rasxf_HqRUsi`6A_5tN$WG@dX^KNDyIf(RzgYFvc1ZANAYt^e;^?R6D}WiaEt|
z`$OH{#ml-Jyyfb}Jm!}7v)TrVU9ip)<&l$h*zQ$?>E}Kc4zi=OiOz<&k`LUb5~?ai
zOu*fruj;qSFr7s$Q`hFm?jwu;26y%I7!So>$-Gm8?B7AIdMU#|pwrB*7Wo7^{P-oq
z)iYGnCJ>yWWI~LSwA86Q#KM3F&^2F1D@Af&-cjtDiu`JAaq55(CIQdSxe!36+3&%&
zmvrpiOEtEc^m<6?+vcN(&Sg9a$cABWeJVy1RPDCDG8wP&8^wy}amK#&BaO^Hg?W&T
za2VoPub7Oizmr6S$}y}h;xeCaHAAW4hwma=t~{D}jvBMZA!%RrJeCq)#GKJ;Qz&rA
zclkYk&$MIvDqG6KgZgvCJ4>kwf=2xNPQ>k*0d^vpaYW$`nOeDM?y%>}-1hmt8irGW
z_1b+yaBoW)P7d`yzR^uFIgIvG9NWB9b*SDQCXAtgT=J-}HS)}QW#5E3YZf0C;6a^V
zAC+y+e`G0hC%Sfoq*Z6K(b_husG%miyThCcnt7n=S$t`l%`?*3v)Y`3yr`gQ(#Kxw
zONK>7BNyR*TCAe-!L!a6wK1})XcPvDqRPiD-cQ9onCnXq!ah;@vTcS4S7juv{&r2U
z&8I!2Wbu%|z$zX2i%G(bM18yF4h$J~FPV3NLiqb_H;}yB7hw9VZ$8^XXGE;(Yzp0}
zFm+=ZccNLhlf`16wRLaEt?XIozNkA`e!fR8`|_4Ws!h8`&AOz^a$8*iT!8=Q(m6k?
z+s#adyky*V6&W1vY!aU?OOkx`<|-3miaYiTv(VzTgZ4Y5SM5o1<!i7CC@@O=Y&6$Z
z><sj@ci>RT6CgBNadj#BT|K=C@Dng)T^UtNukA8Jtme!1U#SK{c7y1}B<E`4{80GV
z{Z$&@t*$wA95807z2Q<@R&2NYR_M$r!(C{^OvhI-6*p2UhH1{uUL|O$x6&6QKBeBP
zp<qBn1iSDw=(A*)945OVOj{G%qdlqZie)X`!p0FYR5`5I4vG8oPWUcdp4GimA5TwT
z6MHX^qo7YdV?Pr*g~MxYU#0Ofp(T8AE_w=QCTAyuftH51bt;xM@iB?ceCW1^e>uFG
zC2K`V;hysP!_zm!8jj=X0X~Pe&rgf&<eFT`QAVkCbRCHA9~x*+rM^Bf+RwM@p{TWf
zXeQ8!jcw#?Klf37(m#9>jlOxuM@PyH2f_Y%KMd9M$D^hrRdwfJ!f&a`HX*^pDBXDI
zp9Du-gWh%;U2LMl6N<{o$a_=_aq1pgAv%lkeMG5jx_xLU&vzg?S^Bbn(<(8A_HLKr
znmAhu55Z7MiD9@RS-><5>ya6@>H4c$G`xss>>D=&OvV`!s?<iq;IwdWV%lnQ^Ot;^
z5oGivN?35mx?4I|s`ynZB`4C&{Ox46{K{mb+QvPWv5tj8T@PgiMMr2A(d0WJ3u16c
z&Wl-Ma)l-w{v^_bsJAxO^?i(QxU^h6rJYbxKI9+MSRQ^7wx@1y$SyM-O;!qt`{sQ_
zBRjd@MZ?J@b&fZLl$oo!mMWb^-+ZxBwjPdkZjT+t>+CpGB<|JDxHV7P*wb3?Npf7>
z(xZWao5_~KFn$mrquBM>Z2QrU?|z8c>{QASR?*xuyjr=(+@bg%tdz4H=_=g}ok;!t
zxrtKgdk2-E@1Sr-a4GG6fLV;>F5(J36}~vp=W^4NX*u<pyjkQpO<~hW-aE&$g!706
zSz4Votax99NejkKi^k2QUsmThDj2t7@ByBcoN~2D2VO_rO$ol)&oij~I*0+Tkjw<^
zFO#NQGxwZPx{UXv=FiEVw4UJ*e8n^lSYp7ukXh0W!>q*HB(B46OM*y^=Svv~CAvV<
zXSv8j#FaW41)6;eG^y(d@Ms^CcB*Dm-RMT-AXCuYwJyZjvl$x}KT?p{v95~1G$KYT
z!G8i3h-5O-dmGX1JW<IkVG3hsGLn(4=;GM)h1^XAre&K4OYhUf#P|psl)g=!(ma>D
zjC@aTfXSPfrqjIXx_d--|AAkwhR?znV@Dddxj33FrD6A^gQ~~U<GPz3BgVZVTh*3b
z$qZ8dZG~BD2(gQAYIiQgKk6dZPKY2qbERTBzW>3aE%L?vR-$2-L3EzcrcHu-C-h=+
zmf|HGdH2T}sdR}**H6?n*-KsW%miHIL!)op|BSNjlTQDYg{{<0e6;+5D}Fvh9ivLB
z>sr4ABAp&}^g&*CL1CJ|>4LQ)o(t9`7WbD0qq=H+z7F{Ii?{fW83HVn%yCuQxN??P
zGbM^Wiiy-8EsS4T$HH(nbX3u0nFv`|$QA~+yEH%9W5A=VVe{M&EAilJv*^oINLP4f
z`9)krA;dkUa!%X`LghtfJun?HiZ4V}9QCRgwYYQ?wd}FO37fr7ja=9}WUD}ww1|6l
zJSHyPiIp>34-Kt~208}GRhB<0U$z^yg`_Rt3frb=Wd5+XX390DD{cobjOW_!mx>n$
zX|(g<*1=Xat)}Zpf_*D&a7m{-<^Jr`!F=t@hR$M5+{4*hNW<IqQKP~ap3X}wwAF|&
z?yoLWOJce$;Oy3z&S=i&7+JTxlwD|)<PL|^E5OHu8tR;FbqfA4qs$UPcD%Shr`*qu
z+3RC7SUr|L?6aA_zD<_-E>q%5rWEcZoi6F7xyJ%hmX0n<gXLLfe(y88bRG(={Tf$u
z@i)`6?q7}s$@%anWd;%QZk<hqvm~<HLsZ#pYVGDlS<5{*X;+v#pGWjP525PE=9&-Y
zORY=bHa*`@QG$70Tv1;wG3Q*)EBobw$o3?z4qtjApTsGR$N<~1uj{OWNn}3<H}Wnb
z6D9*U%c6*btpcL%+9#3joeXSG$-|iD<s9dTqa<Z)=5d`TIexRjNrCFs`WRH@!<bTv
zjhxzjC%d<Hn$05Jl-;Pv0=;|TJ#DKI8$UB}QPMYm{o0aMwtFAhE!bAQ+#~sElsR5a
zmrCD_+&TIoL#?{CyvsfEH8?JevJ&t5!BJ`-SP875k`$)weOyHtsN~*{PV66v;wl}*
zR*!Q>OCMNx2$Fr_BaBYt3#aZXvv?oC<^4)D_3Ept+%IQWmUoW2+$I{}<ED`i&9Y5J
zZDYI`CFfsqn?c|Ea_8_OP^8p70a}m=PLg=PXQA%`16~eVaCApTWEFMASl*~sgZGJ=
zyhO2m5>I@grW-^(MFB!_n+n3F$pAU@p+Kbj4CzXS;Bk=5QQui;h2FaQe&#AvJ_;n~
zzu%(F79EJb%FXXa6803v!WJ~DP#oL$AE@(M6>Kx&gpUua<lsV(JbQE88k(cE9GRr=
zoiQ{SmQS7$`L%zLsGt6*)5Px!jp>KyhP(l3#D%wHWIkr?4sWG9i&ok^tLiLP_KQA~
z<Z@6<^bfxKC3h}LZo9-Odj(Ht$l~g;MEd7Vda6AzmALfKkxmAZNn4CvOV~rJvd`h(
zid?qLv=;E(*5KN7#~(MZ7!|2+?7-RII+ZO7qdmOkd_JVwj#*jcR=K25e03Oyfr4m~
z9$O2N#M1QaUYIrTGkOSFLdu_w_$mlJ5VlZ`^22-k6(cTPr~2Cj<IT*|T0Y7WBX3b5
z9-9l5?A2(NDc*rS0$n0L>%_~PFXA&po41Fc?9TP3XwowFr6EwgOHVGQRF9k7>z?(-
zK(fdZ*PvvF=+LmsjG42w@0twf`yb7@u{yiE_j4P0Im?eh9@XRxSbunMD(+$Ms!evc
z{fK1?;VacA-Zu)%U6MUetw|%XHTir!Ta%bOoL#}MD9@&L6;3~!zRBu&5y?WY?kqzj
z>dhKpiBSFK3BNyf`vWqu1Zm7E<_MwzxVq#`y?b@LZx47@Uw+Xt+L6@EBhvZz-2|*I
zsW&wQ0((TczyjU+zxisyU7on!@PE9TaKrzHtBL%()H@p#*5|<}7Eit+U)mNtnQ?W@
zSD1*H-`oy)=~nSjMHRsw>!F#3WVorgkeke%z~Yqy$Z>q~i?u$6bh7tpr_U2ZR`U2_
zW<C(6wAG#Qa8h#4yvrzmkuT&hC;Q~3{jHpgi&p*67rf=9@GM$pH7-;Y=n)X)D6x1s
zrnf!8BOe524exULcgQfuy+*Zx(RpGd9Tj1h<z+e{mzpH|F0aha8UGzZpAo@AHP*#e
zu3~f_j8osfp=w!lLzOG5RrozVSOpu%6MmMf_tsEqR9ACC?d)VZHHme$OllFd(cJRQ
z2@}!0AEOlwbX~kwZiRUDtc7F0xxFor(PPJt4z(I$MvZPpb=1rqx|XEnGZ{=5=z{z~
zE)DbWC<G5;bQ2Z3*8>ho-$2h+Zr@)r93R@%4=So5hddAi|AyhZa4^OG<A%15#&?|U
zIC;%P=?T^ew09QAJsP4uUs5${S1f2aimF&YZzrI(Hx{VI_Z1O-``$EMU&+{gF0Hu?
zMzd?QAX-1ol(I1MhIHgXH<wuAjf(sb>efn<yKyU}@_Ev&V-*^a*w2fe8x;#JQNw>^
z=ty`Z<jszKOKKtfC1dAD@wzYxTnzXJj98`^$aa^7A8rjYJ`aTL8q7w;s=^iwl!srl
zp}K22(rkkWZ-1;a?5eC~CFN_NwiO)mxC**8TDtTuKH9Spy|0&f&XIRWg>r=9SDq@8
z5q=V&-u}YkoE<aAr;Q_hT>3!GOPHvK!;+hdct_c+Xf0@OC59^R7>ikclFfd6f1Z7Q
zO7yj-z~f{)`(rKro8FU=X2_-eq@2&X5%8QGmx8zO(pZ}GIg~?f0*rX)nAsdErZzuJ
zVWBh)^O1fy#i7<A?7yQdhao!o^vJ_gs_c=UjjV3zw4vE$@D~L6=WonjT1}$gWiKPA
zx)HslsMfS*s;BxUh2(?+^43345FQc>kGIaX>U;RmGG1K1#o(4PVJs;eMaobohW<yx
z797%aw2S*UPI-d-ax}ioI`cklW%iDfX?@n9E`=Z@sx>YME4w!qRLDfjA+Hv+P?wVb
zj<;g3lH*Rx+;;PMu55|^;IM*Na=x*IrgA;@3l5v9QP;ilnBE)`y<C<mO$%#IBbAnC
zkLIbzq?#WPlQ2;g>zNgn?iYP~nq#V+G8CV{&-#TFR%>Y@N<M}y$+A#o10^x#K)R<H
zi;0?S&j-hXQ-HbPE)v&N!?K@?ni0JCdwbWL+idr!%D32eW_MtN_G<djxuI}REVSz7
zAQE_eD1`3{=RZ&_JCe9Xx-m_4v%lb#PaDu+VGdBUzK<jnXu4I*W|yKc290eIs3qw6
zDQ10Y(5HQt$6?02r9-=`H;NmU5E)Y8Y6bCzf<VPS^g@c%fF!cEqQ6asMjiJ`J;Pb0
z&A!^@#IANZuj2n~my1+6F*znlAeW8J@F7+{S0HoexwYN2R?y#R-!{zBv*W9sV$4q`
z8PDF`|Aw%oS5#;#`<pM7l5@gEow`P@G69X6^^2EEu3QkS;h~~OY(f{RcLmYc{a@*I
zTQ0Tiq;2ZF`wGS8y;d&{dB8s7D8c(&ql5IVD9k2R+Q73G974$&A&(M@;RM4FzLo*U
zOCQfxH^?gvggN~SgV_a$=`O-3lo|qL%q0q4tjqTz#e(D+T7OEkT$fyR&D>V!v+3s~
z3usG4<0y0lZyxZS^_9@fJ^!4s)0dd%&Rh<WZ=#pCqQH4LD`|WzDE30$)YFs40s%p5
zgjA=P*1t*?4yH{<^xxYD)Z~5hC#_cvm-mzlH=!5)*X|$f=pW;XQHPxhZ5ld=TQPJ(
zwLcdumyJ0-8@uO8?6KZ*(@9<tp-pf`P6S0>G-5VkdS%;k^>G%mIEjmY%IeGj(Z(pL
z4AB4%g@?w>axGhcICS4L2Hp2okM=)LV6dgU?#vZdW6)tK-_CvdH764S#aw3;>iw-B
z<0L;i=fbC^=O%`6l~yI>g7#pH?FN;SW=ZG64HZ7FNrRi#Lc{!a)V9S)5Cm6#zZaxc
z5K~dC<o77Jn~JAU<FP5PvzgBvPj#)3HX|(K&^7Sx@un3+Jem8N9$&rAk<@P)`{9|!
zfQJc>4=T^VT{WZ_Jp$eBvuW6lW&t81cZ^XJfg=arI0j{r)wh<<lXEK{RUkr-A53iI
zZnKOBJZlZSc>fMvAl1l<fQf$1!@7S&9m)Td-w9i?Br2_gOd|b~-lCxH>sk4%T`K+|
zQnvV$R<`Is`dAUu7`6z`8d$|>GLcUDM{nCWm`{S;VPKQ{7o=YxWd|W%y?DpXSYi4;
zjma&FxLL#lrS;vLf*0RN`s2KpbHeDe)zH_Zl1KKFdP#+-P`csop;+6&Oy5~wZ4x;f
zU-mMU%yipdxFq7C*}0|m-~*hFUagm}5O;YnQa36UQ@kkTqo{q~q0~3wuPRbptJ;Uh
z$Azf28y-g*d6}+-30>g?m_j<eITf#>IzKm=g(9dv4oFl`>B_2QB7$wF_1Asv@~z}+
zQ>%Oe6mz96gr%|>Lcx0vVj8pt9Y8C}aF-L7A=ArUB#Np0D@1$YD!3tQQ2D5ks{bfM
zz|rfF-b_fdx!E6B$1o4|y8D^6G$-kY@||b)77<6z)pumo4ihI|z7JOCDOIfWe}7>z
zs8Pa-Lz`u&(VYL$+*f0meQEFgK1_WPW{jZ01{5~uj_=*0jpnmdhIUe?uv-as4ifwm
za#BZ8jd98kVFqj`rXo$({8Dalt}mb4ma%HJvn{un^BM~*BGsaY*h>!kB6LEM4XJ}%
z%;R~^rXnAF^*0#|aeDe+B10Qt%dw|lWy5321vVJS|8*jZsfs&@lM(s`B?QnO?oEz|
zrwQ|!Uw*Y+6OX$TLgPV_h;GWqEbt@6R?NQF3dK4>W|jsA-&2%p+F_6JWz=!wRN9p-
z4`QV>zfSJw9Qp0k;`q(o0S&^Cy|>KH1KX0CqR`^`U&;9NpqS2_K9EXxh|S;lx<f;&
zFv4Y>h`kcRAr*5e-R_}$i@m%=?x`8|aWWPMx$yy}!w$rSHJ*}Xk$xVr*uZCO#xNo(
z2<jL?I)apet4g%YoU66~iuj@n&Mi|k`ADyQC&1G&^BV@&Fe8%rJl*tUURuD)B;`zJ
zo+yv#t5%rxb%L<<ave)JD}KvS!B8D3THn{itq|AnR>(cu2uLkrE6h_LQQEtxFk(0m
z*Dfo<$69c6T1WKG$lDB8asKiu&b^xcqd13>ANfRzdcogVM-0E^9N@SbzIbp<SZ;%K
znSST3piUl<v~PY*vmI3QLepZaDn1F<?oQdT-m?#S4eS}L>@EGw@dHusG~YdEq{&*n
zG<RFR`H`Wv%zK%=jO~uszxNpWz19PktH>;-TwsTx_`feQH8zM$8V*^-Z)vf5Jv5BF
zJmWi{l<{N=Nb)nGF?npp#xC9I!>l6;CGg73&M9_t`<YKiG*81}FSO}+?}^X5nRA);
zz%Sb#VouAU&9YA*1ZoWawkx7&!siX|Q{X<~u3cJO%An&5Wuoqt^@s-@-8e|5Uw*Uz
zDN0LzKY)4wL&>HAUnLyDh|b}wN22{C)2ZSlrYkkw)gTeVy9bkOJhPdpp-mCAz-8h_
zqDxem4Vm|$z$Us66>>_!CnJbj{}84q&bul>bp4PbURYGl;`Ji8U676vIMQ?_)PMT}
zzYGEZ0**8Ra9lIe^cJ)Ufa?1Kv<bijv<ZOYx_R4mP$vK@P^X`9fI0z~T(dcWZ&CnA
z{aApT695Wm69C6GHm!hr69Cos1!xn131|}l$91LNDX0^G6{yqCI6$2MOs?6S!0-J6
zNc~uVn-c&EXcGX(H8#zFdlLZF_XTJZfC*?50LOKu-qO`4J)rW@Af5kV2lJ@bgI|O>
zfwt{~$0-sMH<u5)qXw2LKkahJT!_~s(T-{~Mc-|Mkg#_dR1<0_iA3E)Y~9gbFNcC;
z^x~raHA?!ge^cDN-l?lDWdY>^CyeOd+@+)r$4_Of5h^W2m;JCkRUEBSqS}w=Fu$&Y
zBVy#bhtkbrxTlW+X>XHcPGg6d9Bt87+u;YPW}P>jv+!zt4dUqSrbVWn6&bNgi<PmJ
z9Mhsn_3|Ug5yQ8HAY$0r7v%Ck=B=%AVA0^1Aw|qshYE~)Oxo0uqBaqK58A_i2=!{X
z*L+V9UQ<pqVSR!4Z~|W2#0Q65^zd`Kt+&<v1TT7Gt7A6kdW5UdFNpJ1xOffxO1NMU
zyml>HK1xI{OPy>!7*bg-F~ci_t0<{H-4L}LRfkyIyH^FNxf`f<3{Rl?n0SmqmgwJs
z0(l)xdSmA*QgSF4xM6hv=14Jnb$r#&o`?S4&mLI#AN$!Rr2nt|?Ac*1d?fmGN_a+v
zJ2S1&u%x6WbH`?@_;@9qAwv`h)zT3#;VjKOhLQx(&7BIURV@&+vTS&cq1J>ICj!p9
z@LU}}u!8>z5}U5q_g^m1k$kPs=$R0(@Vbf;SEzh+$oQ{B$^V#CWD+U=pPZ6M^1xVB
z<G&IL%v+00mDV3|!h7{4+m?$eCNEec=R2$FharW;gkd;Hoq_rBGo6U5<>u;Cs&ky5
zmeP}y%Bi#cY$1^GP*sr+%xT%?M~&aCG0KstKdzy*dDTD<G{<;B89x!dbrkr1;MR<q
zx=X?+<;4TEyf(CUghLX?T;*O<T?<hdTIW@-037Br{H&A4?U*(_xtqJt9Qs7Fafb77
z`)8L2Cs=!EF?185uc3Z*v`*~*``iO{DB4v<5w!Y|QF>wir;I}X@;}NbRW|>XQFv4S
zol%I(Gf|-)KgoyJnD^qE8i65P)0MRqL?xnzA^O+`O-A8zFvO>?M*F}D8{Jh~VOjQL
z)Q@a}?lt!-aq@ez2|rBw-y9{saXRK7vdQf2e`k|-Ccl_X#*_Xlo7{jb|4Nknu52O*
z)A~2Z$^ZZL$$ywlWNf0qli^i9{cnHZ$q)bpJQ)ITTyxK|1=<8a^?d=_1YiQ%1i*2P
zP4l2l092q&KjQ#x0x-Gm)^Zfo3BU@}>1Q0EP5>s?Y)*TiO#oD&O+VuRZ2~a4#-<a{
zCIBkXrk`<uHUXGiSL*eGIssULI{l0T)Cs`kn#~EEo&u2iu>f!N08l`i064C(>FT+^
ze@(;O@Y?*9&gAduUkk%5{LOvIKW7>S19JE)QS!U`*P^hHzd26+oM{*guk&Atli!m~
z#9=A^<|z4dreQFl;C>}aepfb;gcbdp<K$16hWSyOV0xqdN}T+jY;qS?_iv7pKcO}O
zZ&v`t{`UoV9t1D}&w~IQ*IibEZ{z?_{aAoH0ib|70dQP%y#ikS14w~3{R0lrCIFOc
zYyy8T89)lO=^t=_HUXeqSL%UJP61GXI{gC<P$vMCYc{7I@E!ty>iYsbI02Y|HUV&4
zV-t7{0U-5b0onwB0@?(?ab2l54Q@^VR^Jz(P5>sLP5>O&Y)+r9K6v#w3>FmbuQVoq
zR|ESVtk>V%n*4LdVX(YOe<e<SPXqftZ2I3EC4bI13^o+)uSCi3$|ka~t$%Zz{5j(=
z*xsza5+}bWo5;Z~{LNAFCyc}Vs7-L7xPB!{epfb8fP?(aaq=hBCg6z>Q0{+UfG0u#
z6YxX`z;Vrq5d6k8fYgr#XcGVmXcGX(b=Q^P*c1R2sM9~-0CfUDxn^^k082dps_zSM
za{@2{Z35u9#->ZqCIBkXrk`<uHUXGiSL$tpIssULI{l0T)Cs`kn$779v<ZL;wCQIY
zpiKZK*VqKU(F-8;V*wtV08l`i064BI^$xB+dG*#5j<?XSv?hN~1N#vi#oyeR{By=(
zaG~z}N|gMr2DTEM=-(VCf6h1zuJ?mqiId-xO;q4?|K=$9bH-utpp<_lN`6;1QG@gP
zo8#n97>D^$o8WnC|4N+vo@}B4m;N_L$)8Z0fY&R4YXAEJJP-nyfCoYVj%%)0&Ow_1
zs6d;3#sS&{U~-L3-JneXRG>{i;{a^}FuCrs@&l+7fEB3I&p1Gx08FmgoQ^@80H{El
ze#QaX1YmNFP2kKFfYgr#cntx70@?(?ab2kg>I6Uq>hupdK%D?kuGyU4gQXq-)%OLs
zIRTh}HUV&4W7E>r2d|!*!iO^amA>Tf>R)TYwf@bW$v<Zr2H)HKSK{RN^sjZ`7XIca
z`E#aW2%zkLB}#r*HqnKL{LOLl=S;&8c)R~focx|_@&umZZ;p~bVH)N~Z9)j;|0_}Q
zyRwM^yy)K?Cx1e10-gu~<^J~tcp?Na0Z)Vg9N={&0LTBl0CfT|0(Ao5xaNZ86Sz46
zP<>y3HUXG`HUV&4W78C9695%x)6Y0Sn*dC%EA^H@odB#roqomv>I7hN&E~WP+5|ua
z+VnFH&?W$rYi#NRZ33VIZTcApXcK_Rb){a%)hDkW$076%`;}(O?`gR`h1dO?TPc4|
z1D^;g_E)0hceUJ%;l2LmIQerL_(a|*zY-_EC!3hUr~l1S^5-=0iJ@|SB}#r*HhBi$
z`ZvePpU}YnQJWBZ7yn9}{GM!L0l)A!N6DX1n}7#GK(+sU0d~>=Ouz#n0LL}gD+i!W
z092q&KjQ#x0x-G8rXJ8H04mU?pK*XT0hnBOSqa|#15o`~fTbP)3aAqR$2FT1_&5%L
z6ll{w-~ep`K)J>yaG)1J3bg4TaDX-epj=n#t%D~g0ITl{u+#%E0d)f4xMp)|2W<kN
z0&V&k2WS(3$u&03Tz&BBaU2q;s$c0#{;vMD6$0dM?o9qU(=a67O}`Q+zo&m~gFx{&
zN6DWv4MPgm`72TKyRwNLg6Q8ICx6Z~45|0Puf)mk$tDg6x_@(&{0Y-AKWY;)sPSKk
zlHZa|qA3@g5Uj*JFACxyR02%~%Er4W^y{k!c7-=qG~?N#^^q(XHyV`eVLVS~(gth8
z?k_+fRWIgYHO^LEY`3r4K4$g_#*Wg{4no-!BeRx;C~&C|1hPTyyOc;CN!`U06V(ks
zU1+TM{2;J*?osoLpa@Y|!*y5D6~>w;Fq!)loZN3=*R|}B=pLF`mZZ4h4~ks&%yM*c
zcX5yHc%d@Qxg94w4e3;jo^#Yr?Ar~023rFA27S@FtaO~b&G4dv*}h|z*Sv+?KQH~B
zMZdYNW6kEKU3-MotEi$6(8Ify$)okE$hadC2dZ1s^A<*B;}iq<8Ihjb<Z~1d!U`IE
zi)xfozVKz!Y{f<-h#_nDa>apH9MwGK6Ps@lrVhqBANPqM1giSVJqEAQ1!M7+{Jwld
zD#})u$7C|_@ieb|TRT?aZs}PQH+HYrZDzsjkqc}JhLveE2dj<2rDq;@<|`Pj({w(4
zLtR)w+*bP7326T!FJ*2Dw1PnBy=iYOItpuEHX$zxHjf}iw;kHX5q^b}nt>PK`43Rs
ze_w#NDF7zm`452Oy35HmP$vK@P^X`9fI0z~TyvcQ4oLw>{aApT695Wm69C6GHi54V
z07!v0{R0lrCIFP{O1%-V)B~{kz5q8T025Fr0FG-mrxVa704mU?pK*XT0hnB46Zk{s
z08&2|;NAp)0@?(?ab2l52yRXQR^Jz(P5>sLP5>O&Y);^JwE(1kEI^w8P(YgiIIgh?
We32JG3bg4TaDX-epj=n#ef~eFN#`d3

diff --git a/quickstep/res/raw/tips_nav_home.mp4 b/quickstep/res/raw/tips_nav_home.mp4
deleted file mode 100644
index ce33df2876c9231b9e0379418c2beb3216f305be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 585968
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%0DhMLO*vnMeoO>~NvU*}BM``Q7fXNl|B|*3{=dVM
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%0D+JzFU=gA_sN;tZKrGB
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
X`vIx{7D$^OKtbB{0LQ;pSoi)Pw+ssq

diff --git a/quickstep/res/raw/tips_nav_overview.mp4 b/quickstep/res/raw/tips_nav_overview.mp4
deleted file mode 100644
index 17f4b80af81355d6918068824aee325124fcfe7f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 991554
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%0Akz6*6@QHSw-gV`!Ol
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%0Am+
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%0D6i0edXA-Ize311vyvOdnmG|&
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%0DyaxJC07f0Hu|
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
Pv>pf431C8`IW_(Vlh5dv

diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml
index eeb9e9912f..a0f1638c8a 100644
--- a/quickstep/res/values/strings.xml
+++ b/quickstep/res/values/strings.xml
@@ -126,7 +126,7 @@
 
     <!-- Feedback shown during interactive parts of Overview gesture tutorial when the gesture is started too far from the edge. [CHAR LIMIT=100] -->
     <string name="overview_gesture_feedback_swipe_too_far_from_edge">Make sure you swipe up from the bottom edge of the screen.</string>
-    <!-- Feedback shown during interactive parts of Overview gesture tutorial when the Home gesture is detected. [CHAR LIMIT=100] -->
+    <!-- Feedback shown during interactive parts of Overview gesture tutorial when the Home gesture is detected. The window refers to the current app's window during the gesture. [CHAR LIMIT=100] -->
     <string name="overview_gesture_feedback_home_detected">Try holding the window for longer before releasing.</string>
     <!-- Feedback shown during interactive parts of Overview gesture tutorial when the gesture is horizontal instead of vertical. [CHAR LIMIT=100] -->
     <string name="overview_gesture_feedback_wrong_swipe_direction">Make sure you swipe straight up, then pause.</string>
diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml
index 387d4ecb59..82a91a76f5 100644
--- a/quickstep/res/values/styles.xml
+++ b/quickstep/res/values/styles.xml
@@ -57,6 +57,14 @@
         <item name="android:lineHeight">42sp</item>
     </style>
 
+    <style name="TextAppearance.GestureTutorial.Dialog.Title"
+        parent="TextAppearance.GestureTutorial.Feedback.Title">
+        <item name="android:gravity">center_horizontal</item>
+        <item name="android:fontFamily">google-sans</item>
+        <item name="android:lineHeight">32sp</item>
+        <item name="android:textSize">24sp</item>
+    </style>
+
     <style name="TextAppearance.GestureTutorial.Feedback.Subtitle"
         parent="TextAppearance.GestureTutorial">
         <item name="android:gravity">start</item>
@@ -67,6 +75,21 @@
         <item name="android:lineHeight">24sp</item>
     </style>
 
+    <style name="TextAppearance.GestureTutorial.Dialog.Subtitle"
+        parent="TextAppearance.GestureTutorial.Feedback.Subtitle">
+        <item name="android:gravity">center_horizontal</item>
+        <item name="android:fontFamily">google-sans-text</item>
+        <item name="android:letterSpacing">0.025</item>
+        <item name="android:lineHeight">20sp</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="TextAppearance.GestureTutorial.Feedback.Subtext"
+        parent="TextAppearance.GestureTutorial.Feedback.Subtitle">
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">#909090</item>
+    </style>
+
     <style name="TextAppearance.GestureTutorial.ButtonLabel"
         parent="TextAppearance.GestureTutorial.CallToAction">
         <item name="android:gravity">center</item>
@@ -76,6 +99,11 @@
         <item name="android:textAllCaps">false</item>
     </style>
 
+    <style name="TextAppearance.GestureTutorial.CancelButtonLabel"
+        parent="TextAppearance.GestureTutorial.ButtonLabel">
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+    </style>
+
     <style name="TextAppearance.GestureTutorial.TextButtonLabel"
         parent="TextAppearance.GestureTutorial.ButtonLabel">
         <item name="android:textColor">@color/gesture_tutorial_primary_color</item>
diff --git a/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialController.java
index 7c293c330d..957f776ae4 100644
--- a/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/AssistantGestureTutorialController.java
@@ -31,33 +31,6 @@ final class AssistantGestureTutorialController extends TutorialController {
         super(fragment, tutorialType);
     }
 
-    @Override
-    Integer getTitleStringId() {
-        switch (mTutorialType) {
-            case ASSISTANT:
-                return R.string.assistant_gesture_tutorial_playground_title;
-            case ASSISTANT_COMPLETE:
-                return R.string.gesture_tutorial_confirm_title;
-        }
-        return null;
-    }
-
-    @Override
-    Integer getSubtitleStringId() {
-        if (mTutorialType == TutorialType.ASSISTANT) {
-            return R.string.assistant_gesture_tutorial_playground_subtitle;
-        }
-        return null;
-    }
-
-    @Override
-    Integer getActionButtonStringId() {
-        if (mTutorialType == ASSISTANT_COMPLETE) {
-            return R.string.gesture_tutorial_action_button_label_done;
-        }
-        return null;
-    }
-
     @Override
     public void onBackGestureAttempted(BackGestureResult result) {
         switch (mTutorialType) {
@@ -96,14 +69,8 @@ final class AssistantGestureTutorialController extends TutorialController {
                         break;
                     case ASSISTANT_COMPLETED:
                         hideFeedback(true);
-                        showRippleEffect(
-                                () -> {
-                                    if (mTutorialFragment.isTutorialComplete()) {
-                                        mTutorialFragment.changeController(ASSISTANT_COMPLETE);
-                                    } else {
-                                        mTutorialFragment.continueTutorial();
-                                    }
-                                });
+                        showRippleEffect(null);
+                        showFeedback(R.string.assistant_gesture_tutorial_playground_subtitle);
                         break;
                     case ASSISTANT_NOT_STARTED_BAD_ANGLE:
                         showFeedback(R.string.assistant_gesture_feedback_swipe_not_diagonal);
diff --git a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
index 300ca7d77e..c396eec50e 100644
--- a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
@@ -36,55 +36,21 @@ final class BackGestureTutorialController extends TutorialController {
         super(fragment, tutorialType);
     }
 
-    @Override
-    Integer getTitleStringId() {
-        switch (mTutorialType) {
-            case RIGHT_EDGE_BACK_NAVIGATION:
-            case LEFT_EDGE_BACK_NAVIGATION:
-                return R.string.back_gesture_intro_title;
-            case BACK_NAVIGATION_COMPLETE:
-                return R.string.gesture_tutorial_confirm_title;
-        }
-        return null;
-    }
-
-    @Override
-    Integer getSubtitleStringId() {
-        switch (mTutorialType) {
-            case RIGHT_EDGE_BACK_NAVIGATION:
-            case LEFT_EDGE_BACK_NAVIGATION:
-                return R.string.back_gesture_intro_subtitle;
-            case BACK_NAVIGATION_COMPLETE:
-                return R.string.back_gesture_tutorial_confirm_subtitle;
-        }
-        return null;
-    }
-
-    @Override
-    Integer getActionButtonStringId() {
-        if (mTutorialType == BACK_NAVIGATION_COMPLETE) {
-            return R.string.gesture_tutorial_action_button_label_done;
-        }
-        return null;
-    }
-
-    @Override
-    Integer getActionTextButtonStringId() {
-        if (mTutorialType == BACK_NAVIGATION_COMPLETE) {
-            return R.string.gesture_tutorial_action_button_label_settings;
-        }
+    @Nullable
+    public View getMockLauncherView() {
         return null;
     }
 
     @Override
-    void onActionTextButtonClicked(View button) {
-        mTutorialFragment.startSystemNavigationSetting();
+    public Integer getIntroductionTitle() {
+        return mTutorialType == LEFT_EDGE_BACK_NAVIGATION
+                ? R.string.back_gesture_intro_title : null;
     }
 
-    @Nullable
     @Override
-    public View getMockLauncherView() {
-        return null;
+    public Integer getIntroductionSubtitle() {
+        return mTutorialType == LEFT_EDGE_BACK_NAVIGATION
+                ? R.string.back_gesture_intro_subtitle : null;
     }
 
     @Override
@@ -112,8 +78,7 @@ final class BackGestureTutorialController extends TutorialController {
                 mFakeTaskView.setBackground(AppCompatResources.getDrawable(mContext,
                         R.drawable.sandbox_fake_google_search));
                 showRippleEffect(null);
-                showFeedback(R.string.back_gesture_feedback_complete,
-                        mTutorialFragment::continueTutorial);
+                showFeedback(R.string.back_gesture_feedback_complete, true);
                 break;
             case BACK_CANCELLED_FROM_RIGHT:
                 showFeedback(R.string.back_gesture_feedback_cancelled_right_edge);
diff --git a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java
index b3eb1c06f5..71d00f03a2 100644
--- a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java
@@ -29,8 +29,8 @@ public class BackGestureTutorialFragment extends TutorialFragment {
     @Override
     Integer getFeedbackVideoResId() {
         return mTutorialType == TutorialType.RIGHT_EDGE_BACK_NAVIGATION
-                ? R.raw.tips_nav_back_right
-                : R.raw.tips_nav_back_left;
+                ? R.drawable.gesture_tutorial_back_right
+                : R.drawable.gesture_tutorial_back_left;
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java b/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java
index ebb4bfc304..c3b342babc 100644
--- a/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java
+++ b/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java
@@ -41,8 +41,12 @@ public class GestureSandboxActivity extends FragmentActivity {
     private static final String KEY_TUTORIAL_STEPS = "tutorial_steps";
 
     private Deque<TutorialType> mTutorialSteps;
+    private TutorialType mCurrentTutorialStep;
     private TutorialFragment mFragment;
 
+    private int mCurrentStep;
+    private int mNumSteps;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -51,7 +55,10 @@ public class GestureSandboxActivity extends FragmentActivity {
 
         Bundle args = savedInstanceState == null ? getIntent().getExtras() : savedInstanceState;
         mTutorialSteps = getTutorialSteps(args);
-        mFragment = TutorialFragment.newInstance(mTutorialSteps.pop());
+        mCurrentStep = 1;
+        mNumSteps = mTutorialSteps.size();
+        mCurrentTutorialStep = mTutorialSteps.pop();
+        mFragment = TutorialFragment.newInstance(mCurrentTutorialStep);
         getSupportFragmentManager().beginTransaction()
                 .add(R.id.gesture_tutorial_fragment_container, mFragment)
                 .commit();
@@ -89,6 +96,21 @@ public class GestureSandboxActivity extends FragmentActivity {
         return mTutorialSteps.isEmpty();
     }
 
+    public int getCurrentStep() {
+        return mCurrentStep;
+    }
+
+    public int getNumSteps() {
+        return mNumSteps;
+    }
+
+    /**
+     * Closes the tutorial and this activity.
+     */
+    public void closeTutorial() {
+        mFragment.closeTutorial();
+    }
+
     /**
      * Replaces the current TutorialFragment, continuing to the next tutorial step if there is one.
      *
@@ -99,17 +121,20 @@ public class GestureSandboxActivity extends FragmentActivity {
             mFragment.closeTutorial();
             return;
         }
-        mFragment = TutorialFragment.newInstance(mTutorialSteps.pop());
+        mCurrentTutorialStep = mTutorialSteps.pop();
+        mFragment = TutorialFragment.newInstance(mCurrentTutorialStep);
         getSupportFragmentManager().beginTransaction()
             .replace(R.id.gesture_tutorial_fragment_container, mFragment)
             .runOnCommit(() -> mFragment.onAttachedToWindow())
             .commit();
+        mCurrentStep++;
     }
 
     private String[] getTutorialStepNames() {
-        String[] tutorialStepNames = new String[mTutorialSteps.size()];
+        String[] tutorialStepNames = new String[mTutorialSteps.size() + 1];
 
-        int i = 0;
+        int i = 1;
+        tutorialStepNames[0] = mCurrentTutorialStep.name();
         for (TutorialType tutorialStep : mTutorialSteps) {
             tutorialStepNames[i++] = tutorialStep.name();
         }
diff --git a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
index d0f21c2d7f..2e580af18f 100644
--- a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
@@ -15,8 +15,6 @@
  */
 package com.android.quickstep.interaction;
 
-import static com.android.quickstep.interaction.TutorialController.TutorialType.HOME_NAVIGATION_COMPLETE;
-
 import android.annotation.TargetApi;
 import android.graphics.PointF;
 import android.os.Build;
@@ -34,30 +32,13 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll
     }
 
     @Override
-    Integer getTitleStringId() {
-        switch (mTutorialType) {
-            case HOME_NAVIGATION:
-                return R.string.home_gesture_intro_title;
-            case HOME_NAVIGATION_COMPLETE:
-                return R.string.gesture_tutorial_confirm_title;
-        }
-        return null;
-    }
-
-    @Override
-    Integer getSubtitleStringId() {
-        if (mTutorialType == TutorialType.HOME_NAVIGATION) {
-            return R.string.home_gesture_intro_subtitle;
-        }
-        return null;
+    public Integer getIntroductionTitle() {
+        return R.string.home_gesture_intro_title;
     }
 
     @Override
-    Integer getActionButtonStringId() {
-        if (mTutorialType == HOME_NAVIGATION_COMPLETE) {
-            return R.string.gesture_tutorial_action_button_label_done;
-        }
-        return null;
+    public Integer getIntroductionSubtitle() {
+        return R.string.home_gesture_intro_subtitle;
     }
 
     @Override
@@ -92,8 +73,9 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll
                 switch (result) {
                     case HOME_GESTURE_COMPLETED: {
                         animateFakeTaskViewHome(finalVelocity, null);
+                        showActionButton();
                         showFeedback(R.string.home_gesture_feedback_complete,
-                                mTutorialFragment::continueTutorial);
+                                true);
                         break;
                     }
                     case HOME_NOT_STARTED_TOO_FAR_FROM_EDGE:
diff --git a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialFragment.java
index 31e03510dc..ebddc6934b 100644
--- a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialFragment.java
@@ -25,7 +25,7 @@ public class HomeGestureTutorialFragment extends TutorialFragment {
     @Nullable
     @Override
     Integer getFeedbackVideoResId() {
-        return R.raw.tips_nav_home;
+        return R.drawable.gesture_tutorial_home;
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
index 66e6a0d3fd..3c59ed3007 100644
--- a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
@@ -43,30 +43,13 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont
     }
 
     @Override
-    Integer getTitleStringId() {
-        switch (mTutorialType) {
-            case OVERVIEW_NAVIGATION:
-                return R.string.overview_gesture_intro_title;
-            case OVERVIEW_NAVIGATION_COMPLETE:
-                return R.string.gesture_tutorial_confirm_title;
-        }
-        return null;
-    }
-
-    @Override
-    Integer getSubtitleStringId() {
-        if (mTutorialType == TutorialType.OVERVIEW_NAVIGATION) {
-            return R.string.overview_gesture_intro_subtitle;
-        }
-        return null;
+    public Integer getIntroductionTitle() {
+        return R.string.overview_gesture_intro_title;
     }
 
     @Override
-    Integer getActionButtonStringId() {
-        if (mTutorialType == OVERVIEW_NAVIGATION_COMPLETE) {
-            return R.string.gesture_tutorial_action_button_label_done;
-        }
-        return null;
+    public Integer getIntroductionSubtitle() {
+        return R.string.overview_gesture_intro_subtitle;
     }
 
     @Nullable
@@ -124,8 +107,7 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont
                         animset.start();
                         mRunningWindowAnim = SwipeUpAnimationLogic.RunningWindowAnim.wrap(animset);
                         onMotionPaused(true /*arbitrary value*/);
-                        showFeedback(R.string.overview_gesture_feedback_complete,
-                                mTutorialFragment::continueTutorial);
+                        showFeedback(R.string.overview_gesture_feedback_complete, true);
                         break;
                     case HOME_OR_OVERVIEW_NOT_STARTED_WRONG_SWIPE_DIRECTION:
                     case HOME_OR_OVERVIEW_CANCELLED:
diff --git a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java
index c6213e3858..86344ab292 100644
--- a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java
@@ -25,7 +25,7 @@ public class OverviewGestureTutorialFragment extends TutorialFragment {
     @Nullable
     @Override
     Integer getFeedbackVideoResId() {
-        return R.raw.tips_nav_overview;
+        return R.drawable.gesture_tutorial_overview;
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java b/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java
index 3a6d434875..4e4b81af69 100644
--- a/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java
@@ -17,8 +17,6 @@ package com.android.quickstep.interaction;
 
 import android.graphics.PointF;
 
-import androidx.annotation.Nullable;
-
 import com.android.launcher3.R;
 import com.android.quickstep.interaction.EdgeBackGestureHandler.BackGestureResult;
 import com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureResult;
@@ -30,24 +28,6 @@ public class SandboxModeTutorialController extends SwipeUpGestureTutorialControl
         super(fragment, tutorialType);
     }
 
-    @Nullable
-    @Override
-    Integer getTitleStringId() {
-        return R.string.sandbox_mode_title;
-    }
-
-    @Nullable
-    @Override
-    Integer getSubtitleStringId() {
-        return R.string.sandbox_mode_subtitle;
-    }
-
-    @Nullable
-    @Override
-    Integer getActionButtonStringId() {
-        return null;
-    }
-
     @Override
     public void onBackGestureAttempted(BackGestureResult result) {
         switch (result) {
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
index cbab4f9aca..6f82f8596b 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
@@ -16,19 +16,25 @@
 package com.android.quickstep.interaction;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
+import android.graphics.drawable.Animatable2;
+import android.graphics.drawable.AnimatedVectorDrawable;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
 import android.graphics.drawable.RippleDrawable;
+import android.util.Log;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
-import android.widget.VideoView;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.content.res.AppCompatResources;
 
 import com.android.launcher3.InvariantDeviceProfile;
@@ -41,6 +47,11 @@ import com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureAttem
 abstract class TutorialController implements BackGestureAttemptCallback,
         NavBarGestureAttemptCallback {
 
+    private static final String TAG = "TutorialController";
+
+    private static final String PIXEL_TIPS_APP_PACKAGE_NAME = "com.google.android.apps.tips";
+    private static final CharSequence DEFAULT_PIXEL_TIPS_APP_NAME = "Pixel Tips";
+
     private static final int FEEDBACK_VISIBLE_MS = 2500;
     private static final int FEEDBACK_ANIMATION_MS = 250;
     private static final int RIPPLE_VISIBLE_MS = 300;
@@ -50,20 +61,19 @@ abstract class TutorialController implements BackGestureAttemptCallback,
     final Context mContext;
 
     final ImageButton mCloseButton;
-    final TextView mTitleTextView;
-    final TextView mSubtitleTextView;
     final ViewGroup mFeedbackView;
-    final VideoView mFeedbackVideoView;
+    final ImageView mFeedbackVideoView;
     final ImageView mFakeLauncherView;
     final ClipIconView mFakeIconView;
     final View mFakeTaskView;
     final View mFakePreviousTaskView;
     final View mRippleView;
     final RippleDrawable mRippleDrawable;
-    final Button mActionTextButton;
     final Button mActionButton;
+    final TextView mTutorialStepView;
     private final Runnable mHideFeedbackRunnable;
     Runnable mHideFeedbackEndAction;
+    private final AlertDialog mSkipTutorialDialog;
 
     TutorialController(TutorialFragment tutorialFragment, TutorialType tutorialType) {
         mTutorialFragment = tutorialFragment;
@@ -72,9 +82,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
 
         RootSandboxLayout rootView = tutorialFragment.getRootView();
         mCloseButton = rootView.findViewById(R.id.gesture_tutorial_fragment_close_button);
-        mCloseButton.setOnClickListener(button -> mTutorialFragment.closeTutorial());
-        mTitleTextView = rootView.findViewById(R.id.gesture_tutorial_fragment_title_view);
-        mSubtitleTextView = rootView.findViewById(R.id.gesture_tutorial_fragment_subtitle_view);
+        mCloseButton.setOnClickListener(button -> showSkipTutorialDialog());
         mFeedbackView = rootView.findViewById(R.id.gesture_tutorial_fragment_feedback_view);
         mFeedbackVideoView = rootView.findViewById(R.id.gesture_tutorial_feedback_video);
         mFakeLauncherView = rootView.findViewById(R.id.gesture_tutorial_fake_launcher_view);
@@ -84,9 +92,10 @@ abstract class TutorialController implements BackGestureAttemptCallback,
                 rootView.findViewById(R.id.gesture_tutorial_fake_previous_task_view);
         mRippleView = rootView.findViewById(R.id.gesture_tutorial_ripple_view);
         mRippleDrawable = (RippleDrawable) mRippleView.getBackground();
-        mActionTextButton =
-                rootView.findViewById(R.id.gesture_tutorial_fragment_action_text_button);
         mActionButton = rootView.findViewById(R.id.gesture_tutorial_fragment_action_button);
+        mTutorialStepView =
+                rootView.findViewById(R.id.gesture_tutorial_fragment_feedback_tutorial_step);
+        mSkipTutorialDialog = createSkipTutorialDialog();
 
         mHideFeedbackRunnable =
                 () -> mFeedbackView.animate()
@@ -95,28 +104,14 @@ abstract class TutorialController implements BackGestureAttemptCallback,
                         .withEndAction(this::hideFeedbackEndAction).start();
     }
 
-    void setTutorialType(TutorialType tutorialType) {
-        mTutorialType = tutorialType;
-    }
-
-    @Nullable
-    Integer getTitleStringId() {
-        return null;
-    }
-
-    @Nullable
-    Integer getSubtitleStringId() {
-        return null;
-    }
-
-    @Nullable
-    Integer getActionButtonStringId() {
-        return null;
+    private void showSkipTutorialDialog() {
+        if (mSkipTutorialDialog != null) {
+            mSkipTutorialDialog.show();
+        }
     }
 
-    @Nullable
-    Integer getActionTextButtonStringId() {
-        return null;
+    void setTutorialType(TutorialType tutorialType) {
+        mTutorialType = tutorialType;
     }
 
     @DrawableRes
@@ -155,13 +150,39 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         mFakeTaskView.animate().alpha(0).setListener(AnimationSuccessListener.forRunnable(r));
     }
 
+    @StringRes
+    public Integer getIntroductionTitle() {
+        return null;
+    }
+
+    @StringRes
+    public Integer getIntroductionSubtitle() {
+        return null;
+    }
+
     /**
      * Show feedback reflecting a failed gesture attempt.
      *
      * @param subtitleResId Resource of the text to display.
      **/
     void showFeedback(int subtitleResId) {
-        showFeedback(subtitleResId, null);
+        showFeedback(subtitleResId, false);
+    }
+
+    /**
+     * Show feedback reflecting a failed gesture attempt.
+     *
+     * @param showActionButton Whether the tutorial feedback's action button should be shown.
+     **/
+    void showFeedback(int subtitleResId, boolean showActionButton) {
+        showFeedback(subtitleResId, showActionButton ? () -> {} : null, showActionButton);
+    }
+
+    /**
+     * Show feedback reflecting a failed gesture attempt.
+     **/
+    void showFeedback(int subtitleResId, @Nullable Runnable successEndAction) {
+        showFeedback(subtitleResId, successEndAction, false);
     }
 
     /**
@@ -170,32 +191,73 @@ abstract class TutorialController implements BackGestureAttemptCallback,
      * @param successEndAction Non-null iff the gesture was successful; this is run after the
      *                        feedback is shown (i.e. to go to the next step)
      **/
-    void showFeedback(int subtitleResId, @Nullable Runnable successEndAction) {
+    void showFeedback(
+            int subtitleResId, @Nullable Runnable successEndAction, boolean showActionButton) {
+        showFeedback(
+                successEndAction == null
+                        ? R.string.gesture_tutorial_try_again
+                        : R.string.gesture_tutorial_nice,
+                subtitleResId,
+                successEndAction,
+                showActionButton);
+    }
+    void showFeedback(
+            int titleResId,
+            int subtitleResId,
+            @Nullable Runnable successEndAction,
+            boolean showActionButton) {
         if (mHideFeedbackEndAction != null) {
             return;
         }
-        int visibleDuration = FEEDBACK_VISIBLE_MS;
-        if (mTutorialFragment.getFeedbackVideoResId() != null) {
+        TextView title = mFeedbackView.findViewById(R.id.gesture_tutorial_fragment_feedback_title);
+        title.setText(titleResId);
+        TextView subtitle =
+                mFeedbackView.findViewById(R.id.gesture_tutorial_fragment_feedback_subtitle);
+        subtitle.setText(subtitleResId);
+        if (showActionButton) {
+            showActionButton();
+        }
+        mHideFeedbackEndAction = successEndAction;
+
+        AnimatedVectorDrawable tutorialAnimation = mTutorialFragment.getTutorialAnimation();
+        if (tutorialAnimation != null) {
             if (successEndAction == null) {
-                if (mFeedbackVideoView.isPlaying()) {
-                    mFeedbackVideoView.seekTo(1);
-                } else {
-                    mFeedbackVideoView.start();
+                if (tutorialAnimation.isRunning()) {
+                    tutorialAnimation.reset();
                 }
+                tutorialAnimation.registerAnimationCallback(new Animatable2.AnimationCallback() {
+
+                    @Override
+                    public void onAnimationStart(Drawable drawable) {
+                        super.onAnimationStart(drawable);
+
+                        mFeedbackView.setTranslationY(
+                                -mFeedbackView.getHeight() - mFeedbackView.getTop());
+                        mFeedbackView.setVisibility(View.VISIBLE);
+                        mFeedbackView.animate()
+                                .setDuration(FEEDBACK_ANIMATION_MS)
+                                .translationY(0)
+                                .start();
+                    }
+
+                    @Override
+                    public void onAnimationEnd(Drawable drawable) {
+                        super.onAnimationEnd(drawable);
+
+                        mFeedbackView.removeCallbacks(mHideFeedbackRunnable);
+                        mFeedbackView.post(mHideFeedbackRunnable);
+
+                        tutorialAnimation.unregisterAnimationCallback(this);
+                    }
+                });
+
+                tutorialAnimation.start();
                 mFeedbackVideoView.setVisibility(View.VISIBLE);
-                visibleDuration = mTutorialFragment.getFeedbackVideoDuration();
+                return;
             } else {
                 mTutorialFragment.releaseFeedbackVideoView();
             }
         }
-        TextView title = mFeedbackView.findViewById(R.id.gesture_tutorial_fragment_feedback_title);
-        title.setText(successEndAction == null
-                ? R.string.gesture_tutorial_try_again
-                : R.string.gesture_tutorial_nice);
-        TextView subtitle =
-                mFeedbackView.findViewById(R.id.gesture_tutorial_fragment_feedback_subtitle);
-        subtitle.setText(subtitleResId);
-        mHideFeedbackEndAction = successEndAction;
         mFeedbackView.setTranslationY(-mFeedbackView.getHeight() - mFeedbackView.getTop());
         mFeedbackView.setVisibility(View.VISIBLE);
         mFeedbackView.animate()
@@ -203,7 +265,9 @@ abstract class TutorialController implements BackGestureAttemptCallback,
                 .translationY(0)
                 .start();
         mFeedbackView.removeCallbacks(mHideFeedbackRunnable);
-        mFeedbackView.postDelayed(mHideFeedbackRunnable, visibleDuration);
+        if (!showActionButton) {
+            mFeedbackView.postDelayed(mHideFeedbackRunnable, FEEDBACK_VISIBLE_MS);
+        }
     }
 
     void hideFeedback(boolean releaseFeedbackVideo) {
@@ -239,16 +303,14 @@ abstract class TutorialController implements BackGestureAttemptCallback,
     }
 
     void onActionButtonClicked(View button) {
-        mTutorialFragment.closeTutorial();
+        mTutorialFragment.continueTutorial();
     }
 
-    void onActionTextButtonClicked(View button) {}
-
     @CallSuper
     void transitToController() {
         hideFeedback(false);
-        updateTitles();
-        updateActionButtons();
+        hideActionButton();
+        updateSubtext();
         updateDrawables();
 
         if (mFakeLauncherView != null) {
@@ -256,39 +318,33 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         }
     }
 
-    private void updateTitles() {
-        updateTitleView(mTitleTextView, getTitleStringId(),
-                R.style.TextAppearance_GestureTutorial_Title);
-        updateTitleView(mSubtitleTextView, getSubtitleStringId(),
-                R.style.TextAppearance_GestureTutorial_Subtitle);
+    void hideActionButton() {
+        // Invisible to maintain the layout.
+        mActionButton.setVisibility(View.INVISIBLE);
+        mActionButton.setOnClickListener(null);
     }
 
-    private void updateTitleView(TextView textView, @Nullable Integer stringId, int styleId) {
-        if (stringId == null) {
-            textView.setVisibility(View.GONE);
-            return;
-        }
-
-        textView.setVisibility(View.VISIBLE);
-        textView.setText(stringId);
-        textView.setTextAppearance(styleId);
-    }
+    void showActionButton() {
+        int stringResId = -1;
 
-    private void updateActionButtons() {
-        updateButton(mActionButton, getActionButtonStringId(), this::onActionButtonClicked);
-        updateButton(
-                mActionTextButton, getActionTextButtonStringId(), this::onActionTextButtonClicked);
-    }
+        if (mContext instanceof GestureSandboxActivity) {
+            GestureSandboxActivity sandboxActivity = (GestureSandboxActivity) mContext;
 
-    private void updateButton(Button button, @Nullable Integer stringId, OnClickListener listener) {
-        if (stringId == null) {
-            button.setVisibility(View.INVISIBLE);
-            return;
+            stringResId = sandboxActivity.isTutorialComplete()
+                    ? R.string.gesture_tutorial_action_button_label_done
+                    : R.string.gesture_tutorial_action_button_label_next;
         }
 
-        button.setVisibility(View.VISIBLE);
-        button.setText(stringId);
-        button.setOnClickListener(listener);
+        mActionButton.setText(stringResId == -1 ? null : mContext.getString(stringResId));
+        mActionButton.setVisibility(View.VISIBLE);
+        mActionButton.setOnClickListener(this::onActionButtonClicked);
+    }
+
+    private void updateSubtext() {
+        mTutorialStepView.setText(mContext.getString(
+                R.string.gesture_tutorial_step,
+                mTutorialFragment.getCurrentStep(),
+                mTutorialFragment.getNumSteps()));
     }
 
     private void updateDrawables() {
@@ -309,11 +365,67 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         }
     }
 
-    private boolean isComplete() {
-        return mTutorialType == TutorialType.BACK_NAVIGATION_COMPLETE
-                || mTutorialType == TutorialType.HOME_NAVIGATION_COMPLETE
-                || mTutorialType == TutorialType.OVERVIEW_NAVIGATION_COMPLETE
-                || mTutorialType == TutorialType.ASSISTANT_COMPLETE;
+    private AlertDialog createSkipTutorialDialog() {
+        if (mContext instanceof GestureSandboxActivity) {
+            GestureSandboxActivity sandboxActivity = (GestureSandboxActivity) mContext;
+            View contentView = View.inflate(
+                    sandboxActivity, R.layout.gesture_tutorial_dialog, null);
+            AlertDialog tutorialDialog = new AlertDialog
+                    .Builder(sandboxActivity, R.style.Theme_AppCompat_Dialog_Alert)
+                    .setView(contentView)
+                    .create();
+
+            PackageManager packageManager = mContext.getPackageManager();
+            CharSequence tipsAppName = DEFAULT_PIXEL_TIPS_APP_NAME;
+
+            try {
+                tipsAppName = packageManager.getApplicationLabel(
+                        packageManager.getApplicationInfo(
+                                PIXEL_TIPS_APP_PACKAGE_NAME, PackageManager.GET_META_DATA));
+            } catch (PackageManager.NameNotFoundException e) {
+                Log.e(TAG,
+                        "Could not find app label for package name: "
+                                + PIXEL_TIPS_APP_PACKAGE_NAME
+                                + ". Defaulting to 'Pixel Tips.'",
+                        e);
+            }
+
+            TextView subtitleTextView = (TextView) contentView.findViewById(
+                    R.id.gesture_tutorial_dialog_subtitle);
+            if (subtitleTextView != null) {
+                subtitleTextView.setText(
+                        mContext.getString(R.string.skip_tutorial_dialog_subtitle, tipsAppName));
+            } else {
+                Log.w(TAG, "No subtitle view in the skip tutorial dialog to update.");
+            }
+
+            Button cancelButton = (Button) contentView.findViewById(
+                    R.id.gesture_tutorial_dialog_cancel_button);
+            if (cancelButton != null) {
+                cancelButton.setOnClickListener(
+                        v -> tutorialDialog.dismiss());
+            } else {
+                Log.w(TAG, "No cancel button in the skip tutorial dialog to update.");
+            }
+
+            Button confirmButton = contentView.findViewById(
+                    R.id.gesture_tutorial_dialog_confirm_button);
+            if (confirmButton != null) {
+                confirmButton.setOnClickListener(v -> {
+                    sandboxActivity.closeTutorial();
+                    tutorialDialog.dismiss();
+                });
+            } else {
+                Log.w(TAG, "No confirm button in the skip tutorial dialog to update.");
+            }
+
+            tutorialDialog.getWindow().setBackgroundDrawable(
+                    new ColorDrawable(sandboxActivity.getColor(android.R.color.transparent)));
+
+            return tutorialDialog;
+        }
+
+        return null;
     }
 
     /** Denotes the type of the tutorial. */
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
index 6e30ad0e04..b6663b8b81 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
@@ -16,9 +16,12 @@
 package com.android.quickstep.interaction;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.Insets;
-import android.net.Uri;
+import android.graphics.drawable.Animatable2;
+import android.graphics.drawable.AnimatedVectorDrawable;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -27,7 +30,7 @@ import android.view.View;
 import android.view.View.OnTouchListener;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
-import android.widget.VideoView;
+import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -35,7 +38,6 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
 import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
 import com.android.quickstep.interaction.TutorialController.TutorialType;
 
 abstract class TutorialFragment extends Fragment implements OnTouchListener {
@@ -48,8 +50,10 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
     RootSandboxLayout mRootView;
     EdgeBackGestureHandler mEdgeBackGestureHandler;
     NavBarGestureHandler mNavBarGestureHandler;
-    private VideoView mFeedbackVideoView;
-    private int mFeedbackVideoDuration;
+    private ImageView mFeedbackVideoView;
+
+    @Nullable private AnimatedVectorDrawable mTutorialAnimation = null;
+    private boolean mIntroductionShown = false;
 
     public static TutorialFragment newInstance(TutorialType tutorialType) {
         TutorialFragment fragment = getFragmentForTutorialType(tutorialType);
@@ -92,6 +96,11 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
         return null;
     }
 
+    @Nullable
+    AnimatedVectorDrawable getTutorialAnimation() {
+        return mTutorialAnimation;
+    }
+
     abstract TutorialController createController(TutorialType type);
 
     abstract Class<? extends TutorialController> getControllerClass();
@@ -129,12 +138,6 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
         return mRootView;
     }
 
-    @Override
-    public void onStart() {
-        super.onStart();
-        initializeFeedbackVideoView();
-    }
-
     @Override
     public void onStop() {
         super.onStop();
@@ -143,20 +146,18 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
 
     void initializeFeedbackVideoView() {
         if (!updateFeedbackVideo()) {
-            mFeedbackVideoView.setVisibility(View.INVISIBLE);
             return;
-        } else {
-            mFeedbackVideoView.setVisibility(View.VISIBLE);
         }
-        int heightPixels = getResources().getDisplayMetrics().heightPixels;
-        int heightPixelsWithMargin = heightPixels + Utilities.dpToPx(80);
-        int widthPixels = getResources().getDisplayMetrics().widthPixels - Utilities.dpToPx(12);
-        mFeedbackVideoView.setScaleY((float) heightPixelsWithMargin / heightPixels);
-        mFeedbackVideoView.setScaleX((float) heightPixelsWithMargin / widthPixels);
-        mFeedbackVideoView.start();
-        mFeedbackVideoView.setOnPreparedListener(
-                mp -> mFeedbackVideoDuration = mFeedbackVideoView.getDuration());
-        mFeedbackVideoView.setOnCompletionListener(mp -> releaseFeedbackVideoView());
+
+        if (!mIntroductionShown && mTutorialController != null) {
+            Integer introTileStringResId = mTutorialController.getIntroductionTitle();
+            Integer introSubtitleResId = mTutorialController.getIntroductionSubtitle();
+            if (introTileStringResId != null && introSubtitleResId != null) {
+                mTutorialController.showFeedback(introTileStringResId,
+                        introSubtitleResId, null, false);
+                mIntroductionShown = true;
+            }
+        }
     }
 
     boolean updateFeedbackVideo() {
@@ -164,19 +165,37 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
         if (feedbackVideoResId == null || getContext() == null) {
             return false;
         }
-        Uri uri = Uri.parse("android.resource://" + getContext().getPackageName() + "/"
-                + feedbackVideoResId);
-        mFeedbackVideoView.setVideoURI(uri);
+        mTutorialAnimation = (AnimatedVectorDrawable) getContext().getDrawable(feedbackVideoResId);
+
+        if (mTutorialAnimation != null) {
+            mTutorialAnimation.registerAnimationCallback(new Animatable2.AnimationCallback() {
+
+                @Override
+                public void onAnimationStart(Drawable drawable) {
+                    super.onAnimationStart(drawable);
+
+                    mFeedbackVideoView.setVisibility(View.VISIBLE);
+                }
+
+                @Override
+                public void onAnimationEnd(Drawable drawable) {
+                    super.onAnimationEnd(drawable);
+
+                    releaseFeedbackVideoView();
+                }
+            });
+        }
+        mFeedbackVideoView.setImageDrawable(mTutorialAnimation);
+
         return true;
     }
 
     void releaseFeedbackVideoView() {
-        mFeedbackVideoView.stopPlayback();
-        mFeedbackVideoView.setVisibility(View.INVISIBLE);
-    }
+        if (mTutorialAnimation != null && mTutorialAnimation.isRunning()) {
+            mTutorialAnimation.stop();
+        }
 
-    int getFeedbackVideoDuration() {
-        return mFeedbackVideoDuration;
+        mFeedbackVideoView.setVisibility(View.GONE);
     }
 
     @Override
@@ -217,6 +236,7 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
         mEdgeBackGestureHandler.registerBackGestureAttemptCallback(mTutorialController);
         mNavBarGestureHandler.registerNavBarGestureAttemptCallback(mTutorialController);
         mTutorialType = tutorialType;
+        initializeFeedbackVideoView();
     }
 
     @Override
@@ -230,11 +250,7 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
     }
 
     void continueTutorial() {
-        if (!(getContext() instanceof GestureSandboxActivity)) {
-            closeTutorial();
-            return;
-        }
-        GestureSandboxActivity gestureSandboxActivity = (GestureSandboxActivity) getContext();
+        GestureSandboxActivity gestureSandboxActivity = getGestureSandboxActivity();
 
         if (gestureSandboxActivity == null) {
             closeTutorial();
@@ -255,12 +271,22 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
         startActivity(new Intent("com.android.settings.GESTURE_NAVIGATION_SETTINGS"));
     }
 
-    boolean isTutorialComplete() {
-        if (!(getContext() instanceof GestureSandboxActivity)) {
-            return true;
-        }
-        GestureSandboxActivity gestureSandboxActivity = (GestureSandboxActivity) getContext();
+    int getCurrentStep() {
+        GestureSandboxActivity gestureSandboxActivity = getGestureSandboxActivity();
+
+        return gestureSandboxActivity == null ? -1 : gestureSandboxActivity.getCurrentStep();
+    }
+
+    int getNumSteps() {
+        GestureSandboxActivity gestureSandboxActivity = getGestureSandboxActivity();
+
+        return gestureSandboxActivity == null ? -1 : gestureSandboxActivity.getNumSteps();
+    }
+
+    @Nullable
+    private GestureSandboxActivity getGestureSandboxActivity() {
+        Context context = getContext();
 
-        return gestureSandboxActivity == null || gestureSandboxActivity.isTutorialComplete();
+        return context instanceof GestureSandboxActivity ? (GestureSandboxActivity) context : null;
     }
 }
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 2c096b44ad..7d48adfc6c 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -38,8 +38,8 @@
     <color name="gesture_tutorial_ripple_color">#A0C2F9</color> <!-- Light Blue -->
     <color name="gesture_tutorial_fake_task_view_color">#6DA1FF</color> <!-- Light Blue -->
     <color name="gesture_tutorial_fake_previous_task_view_color">#3C4043</color> <!-- Gray -->
-    <color name="gesture_tutorial_action_button_label_color">#FFFFFFFF</color>
-    <color name="gesture_tutorial_primary_color">#1A73E8</color> <!-- Blue -->
+    <color name="gesture_tutorial_action_button_label_color">#FF000000</color>
+    <color name="gesture_tutorial_primary_color">#B7F29F</color> <!-- Light Green -->
 
     <color name="popup_color_primary_light">#FFF</color>
     <color name="popup_color_secondary_light">#F1F3F4</color>
diff --git a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
index e8695c90f9..217453fb63 100644
--- a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
+++ b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
@@ -269,6 +269,20 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
         }
         PreferenceCategory sandboxCategory = newCategory("Gesture Navigation Sandbox");
         sandboxCategory.setSummary("Learn and practice navigation gestures");
+        Preference launchOnboardingTutorialPreference = new Preference(context);
+        launchOnboardingTutorialPreference.setKey("launchOnboardingTutorial");
+        launchOnboardingTutorialPreference.setTitle("Launch Onboarding Tutorial");
+        launchOnboardingTutorialPreference.setSummary("Learn the basic navigation gestures.");
+        launchOnboardingTutorialPreference.setOnPreferenceClickListener(preference -> {
+            startActivity(launchSandboxIntent.putExtra(
+                    "tutorial_steps",
+                    new String[] {
+                            "LEFT_EDGE_BACK_NAVIGATION",
+                            "HOME_NAVIGATION",
+                            "OVERVIEW_NAVIGATION"}));
+            return true;
+        });
+        sandboxCategory.addPreference(launchOnboardingTutorialPreference);
         Preference launchBackTutorialPreference = new Preference(context);
         launchBackTutorialPreference.setKey("launchBackTutorial");
         launchBackTutorialPreference.setTitle("Launch Back Tutorial");
-- 
GitLab


From 769a14ef34e60b6fd6f7cedf0ac9f2094859a27b Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 19 Apr 2021 22:06:38 +0100
Subject: [PATCH 0920/1664] Use availableHeightPx to calculate the max height
 for recommended widgets

heightPx doesn't take device orientation and system taskbar into account.

Bug: 185508758
Test: Open widgets tray, observe recommended widgets. Rotate the screen
      and observe recommended widgets.
Change-Id: I96f1817f96ba643e54e1d2599225254489091d03
---
 .../android/launcher3/widget/picker/WidgetsFullSheet.java    | 4 ++--
 .../widget/picker/WidgetsRecommendationTableLayout.java      | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 70127c5354..15957ec70e 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -467,8 +467,8 @@ public class WidgetsFullSheet extends BaseWidgetSheet
                 Log.d(TAG, "Header view height is 0 when inflating recommended widgets");
             }
             float maxTableHeight =
-                    (mLauncher.getDeviceProfile().heightPx - mTabsHeight - getHeaderViewHeight())
-                            * RECOMMENDATION_TABLE_HEIGHT_RATIO;
+                    (mLauncher.getDeviceProfile().availableHeightPx - mTabsHeight
+                            - getHeaderViewHeight()) * RECOMMENDATION_TABLE_HEIGHT_RATIO;
             List<ArrayList<WidgetItem>> recommendedWidgetsInTable =
                     WidgetsTableUtils.groupWidgetItemsIntoTable(recommendedWidgets,
                             mMaxSpansPerRow);
diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
index 1bfffc29fc..824b5806f4 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
@@ -42,7 +42,6 @@ public final class WidgetsRecommendationTableLayout extends TableLayout {
     private static final String TAG = "WidgetsRecommendationTableLayout";
     private static final float DOWN_SCALE_RATIO = 0.9f;
     private static final float MAX_DOWN_SCALE_RATIO = 0.5f;
-    private final DeviceProfile mDeviceProfile;
     private final float mWidgetCellTextViewsHeight;
 
     private float mRecommendationTableMaxHeight = Float.MAX_VALUE;
@@ -56,7 +55,6 @@ public final class WidgetsRecommendationTableLayout extends TableLayout {
 
     public WidgetsRecommendationTableLayout(Context context, AttributeSet attrs) {
         super(context, attrs);
-        mDeviceProfile = Launcher.getLauncher(context).getDeviceProfile();
         // There are 1 row for title, 1 row for dimension and 2 rows for description.
         mWidgetCellTextViewsHeight = 4 * getResources().getDimension(R.dimen.widget_cell_font_size);
     }
@@ -143,11 +141,12 @@ public final class WidgetsRecommendationTableLayout extends TableLayout {
         }
         // A naive estimation of the widgets recommendation table height without inflation.
         float totalHeight = 0;
+        DeviceProfile deviceProfile = Launcher.getLauncher(getContext()).getDeviceProfile();
         for (int i = 0; i < recommendedWidgetsInTable.size(); i++) {
             List<WidgetItem> widgetItems = recommendedWidgetsInTable.get(i);
             float rowHeight = 0;
             for (int j = 0; j < widgetItems.size(); j++) {
-                float previewHeight = widgetItems.get(j).spanY * mDeviceProfile.allAppsCellHeightPx
+                float previewHeight = widgetItems.get(j).spanY * deviceProfile.allAppsCellHeightPx
                         * previewScale;
                 rowHeight = Math.max(rowHeight, previewHeight + mWidgetCellTextViewsHeight);
             }
-- 
GitLab


From 250f568cb2aa719ae25feaa1e5b349ac372df9a1 Mon Sep 17 00:00:00 2001
From: Vadim Tryshev <vadimt@google.com>
Date: Mon, 19 Apr 2021 21:31:51 +0000
Subject: [PATCH 0921/1664] Revert "Default shell_starting_surface to true to
 match platform behavior."

This reverts commit 6acba271098712d64d3977569f0dc1349a231e58.

Reason for revert: https://b.corp.google.com/issues/185818929#comment4

Change-Id: I30875c1f81808b92f529bd11c916fea05b93fd4d
---
 .../src/com/android/launcher3/QuickstepTransitionManager.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index b72cf394c5..009ca27603 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -110,7 +110,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
     private static final String TAG = "QuickstepTransition";
 
     private static final boolean ENABLE_SHELL_STARTING_SURFACE =
-            SystemProperties.getBoolean("persist.debug.shell_starting_surface", true);
+            SystemProperties.getBoolean("persist.debug.shell_starting_surface", false);
 
     /** Duration of status bar animations. */
     public static final int STATUS_BAR_TRANSITION_DURATION = 120;
-- 
GitLab


From e36664d54147eb20db946ac4eb522c23a535e7bd Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 16 Apr 2021 14:47:33 -0700
Subject: [PATCH 0922/1664] Turn DragView into a FrameLayout

Bug: 183609936
Test: drag-n-drop icons, folders, widgets, shortcuts
Change-Id: I030b36cd59ac6d0ced3263baca13108825ab2296
---
 .../android/launcher3/ButtonDropTarget.java   |   1 -
 src/com/android/launcher3/Workspace.java      |   4 +-
 .../dragndrop/BaseItemDragListener.java       |   7 +-
 .../android/launcher3/dragndrop/DragView.java | 430 +++++++-----------
 .../launcher3/util/FlingAnimation.java        |   3 -
 5 files changed, 165 insertions(+), 280 deletions(-)

diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
index 4740079f9d..7926862bd2 100644
--- a/src/com/android/launcher3/ButtonDropTarget.java
+++ b/src/com/android/launcher3/ButtonDropTarget.java
@@ -183,7 +183,6 @@ public abstract class ButtonDropTarget extends TextView
         hideTooltip();
 
         if (!d.dragComplete) {
-            d.dragView.setColor(0);
             d.dragView.setAlpha(1f);
         } else {
             d.dragView.setAlpha(DRAG_VIEW_HOVER_OVER_OPACITY);
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index c9e575d4a4..1931c29754 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1571,7 +1571,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
                 scale * iconScale,
                 scale,
                 dragOptions);
-        dv.setIntrinsicIconScaleFactor(dragOptions.intrinsicIconScaleFactor);
         return dv;
     }
 
@@ -2723,8 +2722,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
                 info.itemType == LauncherSettings.Favorites.ITEM_TYPE_CUSTOM_APPWIDGET;
         if ((animationType == ANIMATE_INTO_POSITION_AND_RESIZE || external) && finalView != null) {
             Drawable crossFadeDrawable = createWidgetDrawable(info, finalView);
-            dragView.setCrossFadeDrawable(crossFadeDrawable);
-            dragView.crossFade((int) (duration * 0.8f));
+            dragView.crossFadeContent(crossFadeDrawable, (int) (duration * 0.8f));
         } else if (isWidget && external) {
             scaleXY[0] = scaleXY[1] = Math.min(scaleXY[0],  scaleXY[1]);
         }
diff --git a/src/com/android/launcher3/dragndrop/BaseItemDragListener.java b/src/com/android/launcher3/dragndrop/BaseItemDragListener.java
index 707fd06519..981e3a65a4 100644
--- a/src/com/android/launcher3/dragndrop/BaseItemDragListener.java
+++ b/src/com/android/launcher3/dragndrop/BaseItemDragListener.java
@@ -34,7 +34,6 @@ import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.DragSource;
 import com.android.launcher3.DropTarget.DragObject;
 import com.android.launcher3.Launcher;
-import com.android.launcher3.R;
 import com.android.launcher3.util.ActivityTracker.SchedulerCallback;
 import com.android.launcher3.widget.PendingItemDragHelper;
 
@@ -143,15 +142,13 @@ public abstract class BaseItemDragListener implements View.OnDragListener, DragS
         // the dragLayer alpha to 0 to have a nice fade-in animation. But that will prevent the
         // dragView from being visible. Instead just skip the fade-in animation here.
         mLauncher.getDragLayer().setAlpha(1);
-
-        dragObject.dragView.setColor(
-                mLauncher.getResources().getColor(R.color.delete_target_hover_tint));
+        dragObject.dragView.setAlpha(.5f);
     }
 
     @Override
     public void onPreDragEnd(DragObject dragObject, boolean dragStarted) {
         if (dragStarted) {
-            dragObject.dragView.setColor(0);
+            dragObject.dragView.setAlpha(1f);
         }
     }
 
diff --git a/src/com/android/launcher3/dragndrop/DragView.java b/src/com/android/launcher3/dragndrop/DragView.java
index 0f26ff4d90..346359954e 100644
--- a/src/com/android/launcher3/dragndrop/DragView.java
+++ b/src/com/android/launcher3/dragndrop/DragView.java
@@ -16,19 +16,22 @@
 
 package com.android.launcher3.dragndrop;
 
+import static android.view.View.MeasureSpec.EXACTLY;
+import static android.view.View.MeasureSpec.makeMeasureSpec;
+
+import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA;
 import static com.android.launcher3.Utilities.getBadge;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
-import android.animation.FloatArrayEvaluator;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.animation.ValueAnimator.AnimatorUpdateListener;
 import android.annotation.TargetApi;
+import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
-import android.graphics.ColorMatrix;
-import android.graphics.ColorMatrixColorFilter;
-import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.Point;
 import android.graphics.Rect;
@@ -39,6 +42,8 @@ import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
 
 import androidx.dynamicanimation.animation.FloatPropertyCompat;
 import androidx.dynamicanimation.animation.SpringAnimation;
@@ -55,22 +60,18 @@ import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.statemanager.StateManager.StateListener;
-import com.android.launcher3.util.Themes;
 import com.android.launcher3.util.Thunk;
+import com.android.launcher3.views.BaseDragLayer;
 
-import java.util.Arrays;
-
-public class DragView extends View implements StateListener<LauncherState> {
-    private static final ColorMatrix sTempMatrix1 = new ColorMatrix();
-    private static final ColorMatrix sTempMatrix2 = new ColorMatrix();
+/** A custom view for rendering an icon, folder, shortcut or widget during drag-n-drop. */
+public class DragView extends FrameLayout implements StateListener<LauncherState> {
 
-    public static final int COLOR_CHANGE_DURATION = 120;
     public static final int VIEW_ZOOM_DURATION = 150;
 
-    private boolean mShouldDraw = true;
-    private Drawable mDrawable;
-    private Drawable mCrossFadeDrawable;
-    @Thunk Paint mPaint;
+    private final View mContent;
+    private final int mWidth;
+    private final int mHeight;
+
     private final int mBlurSizeOutline;
     private final int mRegistrationX;
     private final int mRegistrationY;
@@ -85,16 +86,8 @@ public class DragView extends View implements StateListener<LauncherState> {
     @Thunk final DragController mDragController;
     final FirstFrameAnimatorHelper mFirstFrameAnimatorHelper;
     private boolean mHasDrawn = false;
-    @Thunk float mCrossFadeProgress = 0f;
-    private boolean mAnimationCancelled = false;
 
-    ValueAnimator mAnim;
-    // The intrinsic icon scale factor is the scale factor for a drag icon over the workspace
-    // size.  This is ignored for non-icons.
-    private float mIntrinsicIconScale = 1f;
-
-    @Thunk float[] mCurrentFilter;
-    private ValueAnimator mFilterAnimator;
+    final ValueAnimator mAnim;
 
     private int mLastTouchX;
     private int mLastTouchY;
@@ -106,7 +99,14 @@ public class DragView extends View implements StateListener<LauncherState> {
     private SpringFloatValue mTranslateX, mTranslateY;
     private Path mScaledMaskPath;
     private Drawable mBadge;
-    private ColorMatrixColorFilter mBaseFilter;
+
+    public DragView(Launcher launcher, Drawable drawable, int registrationX,
+            int registrationY, final float initialScale, final float scaleOnDrop,
+            final float finalScaleDps) {
+        this(launcher, getViewFromDrawable(launcher, drawable),
+                drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(),
+                registrationX, registrationY, initialScale, scaleOnDrop, finalScaleDps);
+    }
 
     /**
      * Construct the drag view.
@@ -114,11 +114,16 @@ public class DragView extends View implements StateListener<LauncherState> {
      * The registration point is the point inside our view that the touch events should
      * be centered upon.
      * @param launcher The Launcher instance
-     * @param drawable The view that we're dragging around.  We scale it up when we draw it.
+     * @param content the view content that is attached to the drag view.
+     * @param width the width of the dragView
+     * @param height the height of the dragView
+     * @param initialScale The view that we're dragging around.  We scale it up when we draw it.
      * @param registrationX The x coordinate of the registration point.
      * @param registrationY The y coordinate of the registration point.
+     * @param scaleOnDrop the scale used in the drop animation.
+     * @param finalScaleDps the scale used in the zoom out animation when the drag view is shown.
      */
-    public DragView(Launcher launcher, Drawable drawable, int registrationX,
+    public DragView(Launcher launcher, View content, int width, int height, int registrationX,
             int registrationY, final float initialScale, final float scaleOnDrop,
             final float finalScaleDps) {
         super(launcher);
@@ -127,8 +132,12 @@ public class DragView extends View implements StateListener<LauncherState> {
         mDragController = launcher.getDragController();
         mFirstFrameAnimatorHelper = new FirstFrameAnimatorHelper(this);
 
-        final float scale = (drawable.getIntrinsicWidth() + finalScaleDps)
-                / drawable.getIntrinsicWidth();
+        mContent = content;
+        mWidth = width;
+        mHeight = height;
+        addView(content, new LayoutParams(width, height));
+
+        final float scale = (width + finalScaleDps) / width;
 
         // Set the initial scale to avoid any jumps
         setScaleX(initialScale);
@@ -146,9 +155,7 @@ public class DragView extends View implements StateListener<LauncherState> {
             }
         });
 
-        mDrawable = drawable;
-        setDragRegion(new Rect(0, 0, drawable.getIntrinsicWidth(),
-                drawable.getIntrinsicHeight()));
+        setDragRegion(new Rect(0, 0, width, height));
 
         // The point in our scaled bitmap that the touch events are located
         mRegistrationX = registrationX;
@@ -158,12 +165,11 @@ public class DragView extends View implements StateListener<LauncherState> {
         mScaleOnDrop = scaleOnDrop;
 
         // Force a measure, because Workspace uses getMeasuredHeight() before the layout pass
-        int ms = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
-        measure(ms, ms);
-        mPaint = new Paint(Paint.FILTER_BITMAP_FLAG);
+        measure(makeMeasureSpec(width, EXACTLY), makeMeasureSpec(height, EXACTLY));
 
         mBlurSizeOutline = getResources().getDimensionPixelSize(R.dimen.blur_size_medium_outline);
         setElevation(getResources().getDimension(R.dimen.drag_elevation));
+        setWillNotDraw(false);
     }
 
     @Override
@@ -190,145 +196,105 @@ public class DragView extends View implements StateListener<LauncherState> {
      */
     @TargetApi(Build.VERSION_CODES.O)
     public void setItemInfo(final ItemInfo info) {
-        if (info.itemType != LauncherSettings.Favorites.ITEM_TYPE_APPLICATION &&
-                info.itemType != LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT &&
-                info.itemType != LauncherSettings.Favorites.ITEM_TYPE_FOLDER) {
+        if (info.itemType != LauncherSettings.Favorites.ITEM_TYPE_APPLICATION
+                && info.itemType != LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT
+                && info.itemType != LauncherSettings.Favorites.ITEM_TYPE_FOLDER) {
             return;
         }
         // Load the adaptive icon on a background thread and add the view in ui thread.
-        MODEL_EXECUTOR.getHandler().postAtFrontOfQueue(new Runnable() {
-            @Override
-            public void run() {
-                Object[] outObj = new Object[1];
-                int w = mDrawable.getIntrinsicWidth();
-                int h = mDrawable.getIntrinsicHeight();
-                Drawable dr = Utilities.getFullDrawable(mLauncher, info, w, h, outObj);
-
-                if (dr instanceof AdaptiveIconDrawable) {
-                    int blurMargin = (int) mLauncher.getResources()
-                            .getDimension(R.dimen.blur_size_medium_outline) / 2;
-
-                    Rect bounds = new Rect(0, 0, w, h);
-                    bounds.inset(blurMargin, blurMargin);
-                    // Badge is applied after icon normalization so the bounds for badge should not
-                    // be scaled down due to icon normalization.
-                    Rect badgeBounds = new Rect(bounds);
-                    mBadge = getBadge(mLauncher, info, outObj[0]);
-                    mBadge.setBounds(badgeBounds);
-
-                    // Do not draw the background in case of folder as its translucent
-                    mShouldDraw = !(dr instanceof FolderAdaptiveIcon);
-
-                    try (LauncherIcons li = LauncherIcons.obtain(mLauncher)) {
-                        Drawable nDr; // drawable to be normalized
-                        if (mShouldDraw) {
-                            nDr = dr;
-                        } else {
-                            // Since we just want the scale, avoid heavy drawing operations
-                            nDr = new AdaptiveIconDrawable(new ColorDrawable(Color.BLACK), null);
-                        }
-                        Utilities.scaleRectAboutCenter(bounds,
-                                li.getNormalizer().getScale(nDr, null, null, null));
-                    }
-                    AdaptiveIconDrawable adaptiveIcon = (AdaptiveIconDrawable) dr;
-
-                    // Shrink very tiny bit so that the clip path is smaller than the original bitmap
-                    // that has anti aliased edges and shadows.
-                    Rect shrunkBounds = new Rect(bounds);
-                    Utilities.scaleRectAboutCenter(shrunkBounds, 0.98f);
-                    adaptiveIcon.setBounds(shrunkBounds);
-                    final Path mask = adaptiveIcon.getIconMask();
-
-                    mTranslateX = new SpringFloatValue(DragView.this,
-                            w * AdaptiveIconDrawable.getExtraInsetFraction());
-                    mTranslateY = new SpringFloatValue(DragView.this,
-                            h * AdaptiveIconDrawable.getExtraInsetFraction());
-
-                    bounds.inset(
-                            (int) (-bounds.width() * AdaptiveIconDrawable.getExtraInsetFraction()),
-                            (int) (-bounds.height() * AdaptiveIconDrawable.getExtraInsetFraction())
-                    );
-                    mBgSpringDrawable = adaptiveIcon.getBackground();
-                    if (mBgSpringDrawable == null) {
-                        mBgSpringDrawable = new ColorDrawable(Color.TRANSPARENT);
+        MODEL_EXECUTOR.getHandler().postAtFrontOfQueue(() -> {
+            Object[] outObj = new Object[1];
+            int w = mWidth;
+            int h = mHeight;
+            Drawable dr = Utilities.getFullDrawable(mLauncher, info, w, h, outObj);
+
+            if (dr instanceof AdaptiveIconDrawable) {
+                int blurMargin = (int) mLauncher.getResources()
+                        .getDimension(R.dimen.blur_size_medium_outline) / 2;
+
+                Rect bounds = new Rect(0, 0, w, h);
+                bounds.inset(blurMargin, blurMargin);
+                // Badge is applied after icon normalization so the bounds for badge should not
+                // be scaled down due to icon normalization.
+                Rect badgeBounds = new Rect(bounds);
+                mBadge = getBadge(mLauncher, info, outObj[0]);
+                mBadge.setBounds(badgeBounds);
+
+                // Do not draw the background in case of folder as its translucent
+                final boolean shouldDrawBackground = !(dr instanceof FolderAdaptiveIcon);
+
+                try (LauncherIcons li = LauncherIcons.obtain(mLauncher)) {
+                    Drawable nDr; // drawable to be normalized
+                    if (shouldDrawBackground) {
+                        nDr = dr;
+                    } else {
+                        // Since we just want the scale, avoid heavy drawing operations
+                        nDr = new AdaptiveIconDrawable(new ColorDrawable(Color.BLACK), null);
                     }
-                    mBgSpringDrawable.setBounds(bounds);
-                    mFgSpringDrawable = adaptiveIcon.getForeground();
-                    if (mFgSpringDrawable == null) {
-                        mFgSpringDrawable = new ColorDrawable(Color.TRANSPARENT);
-                    }
-                    mFgSpringDrawable.setBounds(bounds);
-
-                    new Handler(Looper.getMainLooper()).post(new Runnable() {
-                        @Override
-                        public void run() {
-                            // Assign the variable on the UI thread to avoid race conditions.
-                            mScaledMaskPath = mask;
-
-                            if (info.isDisabled()) {
-                                FastBitmapDrawable d = new FastBitmapDrawable((Bitmap) null);
-                                d.setIsDisabled(true);
-                                mBaseFilter = (ColorMatrixColorFilter) d.getColorFilter();
-                            }
-                            updateColorFilter();
-                        }
-                    });
+                    Utilities.scaleRectAboutCenter(bounds,
+                            li.getNormalizer().getScale(nDr, null, null, null));
                 }
-            }});
-    }
-
-    @TargetApi(Build.VERSION_CODES.O)
-    private void updateColorFilter() {
-        if (mCurrentFilter == null) {
-            mPaint.setColorFilter(null);
-
-            if (mScaledMaskPath != null) {
-                mBgSpringDrawable.setColorFilter(mBaseFilter);
-                mFgSpringDrawable.setColorFilter(mBaseFilter);
-                mBadge.setColorFilter(mBaseFilter);
-            }
-        } else {
-            ColorMatrixColorFilter currentFilter = new ColorMatrixColorFilter(mCurrentFilter);
-            mPaint.setColorFilter(currentFilter);
-
-            if (mScaledMaskPath != null) {
-                if (mBaseFilter != null) {
-                    mBaseFilter.getColorMatrix(sTempMatrix1);
-                    sTempMatrix2.set(mCurrentFilter);
-                    sTempMatrix1.postConcat(sTempMatrix2);
-
-                    currentFilter = new ColorMatrixColorFilter(sTempMatrix1);
+                AdaptiveIconDrawable adaptiveIcon = (AdaptiveIconDrawable) dr;
+
+                // Shrink very tiny bit so that the clip path is smaller than the original bitmap
+                // that has anti aliased edges and shadows.
+                Rect shrunkBounds = new Rect(bounds);
+                Utilities.scaleRectAboutCenter(shrunkBounds, 0.98f);
+                adaptiveIcon.setBounds(shrunkBounds);
+                final Path mask = adaptiveIcon.getIconMask();
+
+                mTranslateX = new SpringFloatValue(DragView.this,
+                        w * AdaptiveIconDrawable.getExtraInsetFraction());
+                mTranslateY = new SpringFloatValue(DragView.this,
+                        h * AdaptiveIconDrawable.getExtraInsetFraction());
+
+                bounds.inset(
+                        (int) (-bounds.width() * AdaptiveIconDrawable.getExtraInsetFraction()),
+                        (int) (-bounds.height() * AdaptiveIconDrawable.getExtraInsetFraction())
+                );
+                mBgSpringDrawable = adaptiveIcon.getBackground();
+                if (mBgSpringDrawable == null) {
+                    mBgSpringDrawable = new ColorDrawable(Color.TRANSPARENT);
                 }
-
-                mBgSpringDrawable.setColorFilter(currentFilter);
-                mFgSpringDrawable.setColorFilter(currentFilter);
-                mBadge.setColorFilter(currentFilter);
+                mBgSpringDrawable.setBounds(bounds);
+                mFgSpringDrawable = adaptiveIcon.getForeground();
+                if (mFgSpringDrawable == null) {
+                    mFgSpringDrawable = new ColorDrawable(Color.TRANSPARENT);
+                }
+                mFgSpringDrawable.setBounds(bounds);
+
+                new Handler(Looper.getMainLooper()).post(() -> {
+                    // Assign the variable on the UI thread to avoid race conditions.
+                    mScaledMaskPath = mask;
+                    // Avoid relayout as we do not care about children affecting layout
+                    removeAllViewsInLayout();
+
+                    if (info.isDisabled()) {
+                        FastBitmapDrawable d = new FastBitmapDrawable((Bitmap) null);
+                        d.setIsDisabled(true);
+                        mBgSpringDrawable.setColorFilter(d.getColorFilter());
+                        mFgSpringDrawable.setColorFilter(d.getColorFilter());
+                        mBadge.setColorFilter(d.getColorFilter());
+                    }
+                    invalidate();
+                });
             }
-        }
-
-        invalidate();
+        });
     }
 
+    // TODO(b/183609936): This is only for LauncherAppWidgetHostView that is rendered in a drawable.
+    // Once LauncherAppWidgetHostView is directly rendered in this view, removes this method.
     @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        setMeasuredDimension(mDrawable.getIntrinsicWidth(), mDrawable.getIntrinsicHeight());
-    }
-
-    /** Sets the scale of the view over the normal workspace icon size. */
-    public void setIntrinsicIconScaleFactor(float scale) {
-        mIntrinsicIconScale = scale;
-    }
-
-    public float getIntrinsicIconScaleFactor() {
-        return mIntrinsicIconScale;
-    }
-
-    public int getDragRegionLeft() {
-        return mDragRegion.left;
+    public void invalidate() {
+        super.invalidate();
+        if (mContent instanceof ImageView) {
+            mContent.invalidate();
+        }
     }
 
-    public int getDragRegionTop() {
-        return mDragRegion.top;
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(makeMeasureSpec(mWidth, EXACTLY), makeMeasureSpec(mHeight, EXACTLY));
     }
 
     public int getDragRegionWidth() {
@@ -356,40 +322,11 @@ public class DragView extends View implements StateListener<LauncherState> {
     }
 
     @Override
-    protected void onDraw(Canvas canvas) {
-        mHasDrawn = true;
-
-        if (mShouldDraw) {
-            // Always draw the bitmap to mask anti aliasing due to clipPath
-            boolean crossFade = mCrossFadeProgress > 0 && mCrossFadeDrawable != null;
-            if (crossFade) {
-                int alpha = crossFade ? (int) (255 * (1 - mCrossFadeProgress)) : 255;
-                mPaint.setAlpha(alpha);
-            }
-            mDrawable.setColorFilter(mPaint.getColorFilter());
-            mDrawable.setAlpha(mPaint.getAlpha());
-            mDrawable.setBounds(
-                    new Rect(0, 0, mDrawable.getIntrinsicWidth(),
-                            mDrawable.getIntrinsicHeight()));
-            mDrawable.draw(canvas);
-            if (crossFade) {
-                mPaint.setAlpha((int) (255 * mCrossFadeProgress));
-                final int saveCount = canvas.save();
-                float sX = ((float) mDrawable.getIntrinsicWidth())
-                        / mCrossFadeDrawable.getIntrinsicWidth();
-                float sY = ((float) mDrawable.getIntrinsicHeight())
-                        / mCrossFadeDrawable.getIntrinsicHeight();
-                canvas.scale(sX, sY);
-                mCrossFadeDrawable.setColorFilter(mPaint.getColorFilter());
-                mCrossFadeDrawable.setAlpha(mPaint.getAlpha());
-                mDrawable.setBounds(
-                        new Rect(0, 0, mDrawable.getIntrinsicWidth(),
-                                mDrawable.getIntrinsicHeight()));
-                mCrossFadeDrawable.draw(canvas);
-                canvas.restoreToCount(saveCount);
-            }
-        }
+    public void draw(Canvas canvas) {
+        super.draw(canvas);
 
+        // Draw after the content
+        mHasDrawn = true;
         if (mScaledMaskPath != null) {
             int cnt = canvas.save();
             canvas.clipPath(mScaledMaskPath);
@@ -401,74 +338,27 @@ public class DragView extends View implements StateListener<LauncherState> {
         }
     }
 
-    public void setCrossFadeDrawable(Drawable crossFadeDrawable) {
-        mCrossFadeDrawable = crossFadeDrawable;
-    }
-
-    public void crossFade(int duration) {
-        ValueAnimator va = ValueAnimator.ofFloat(0f, 1f);
-        va.setDuration(duration);
-        va.setInterpolator(Interpolators.DEACCEL_1_5);
-        va.addUpdateListener(a -> {
-            mCrossFadeProgress = a.getAnimatedFraction();
-            invalidate();
-        });
-        va.start();
-    }
-
-    public void setColor(int color) {
-        if (mPaint == null) {
-            mPaint = new Paint(Paint.FILTER_BITMAP_FLAG);
-        }
-        if (color != 0) {
-            ColorMatrix m1 = new ColorMatrix();
-            m1.setSaturation(0);
-
-            ColorMatrix m2 = new ColorMatrix();
-            Themes.setColorScaleOnMatrix(color, m2);
-            m1.postConcat(m2);
-
-            animateFilterTo(m1.getArray());
-        } else {
-            if (mCurrentFilter == null) {
-                updateColorFilter();
-            } else {
-                animateFilterTo(new ColorMatrix().getArray());
-            }
-        }
-    }
-
-    private void animateFilterTo(float[] targetFilter) {
-        float[] oldFilter = mCurrentFilter == null ? new ColorMatrix().getArray() : mCurrentFilter;
-        mCurrentFilter = Arrays.copyOf(oldFilter, oldFilter.length);
-
-        if (mFilterAnimator != null) {
-            mFilterAnimator.cancel();
+    public void crossFadeContent(Drawable crossFadeDrawable, int duration) {
+        if (mContent.getParent() == null) {
+            // If the content is already removed, ignore
+            return;
         }
-        mFilterAnimator = ValueAnimator.ofObject(new FloatArrayEvaluator(mCurrentFilter),
-                oldFilter, targetFilter);
-        mFilterAnimator.setDuration(COLOR_CHANGE_DURATION);
-        mFilterAnimator.addUpdateListener(new AnimatorUpdateListener() {
+        View newContent = getViewFromDrawable(getContext(), crossFadeDrawable);
+        newContent.measure(makeMeasureSpec(mWidth, EXACTLY), makeMeasureSpec(mHeight, EXACTLY));
+        newContent.layout(0, 0, mWidth, mHeight);
+        addViewInLayout(newContent, 0, new LayoutParams(mWidth, mHeight));
 
-            @Override
-            public void onAnimationUpdate(ValueAnimator animation) {
-                updateColorFilter();
-            }
-        });
-        mFilterAnimator.start();
+        AnimatorSet anim = new AnimatorSet();
+        anim.play(ObjectAnimator.ofFloat(newContent, VIEW_ALPHA, 0, 1));
+        anim.play(ObjectAnimator.ofFloat(mContent, VIEW_ALPHA, 0));
+        anim.setDuration(duration).setInterpolator(Interpolators.DEACCEL_1_5);
+        anim.start();
     }
 
     public boolean hasDrawn() {
         return mHasDrawn;
     }
 
-    @Override
-    public void setAlpha(float alpha) {
-        super.setAlpha(alpha);
-        mPaint.setAlpha((int) (255 * alpha));
-        invalidate();
-    }
-
     /**
      * Create a window containing this view and show it.
      *
@@ -479,22 +369,15 @@ public class DragView extends View implements StateListener<LauncherState> {
         mDragLayer.addView(this);
 
         // Start the pick-up animation
-        DragLayer.LayoutParams lp = new DragLayer.LayoutParams(0, 0);
-        lp.width = mDrawable.getIntrinsicWidth();
-        lp.height = mDrawable.getIntrinsicHeight();
+        BaseDragLayer.LayoutParams lp = new BaseDragLayer.LayoutParams(mWidth, mHeight);
         lp.customPosition = true;
         setLayoutParams(lp);
         move(touchX, touchY);
         // Post the animation to skip other expensive work happening on the first frame
-        post(new Runnable() {
-            public void run() {
-                mAnim.start();
-            }
-        });
+        post(mAnim::start);
     }
 
     public void cancelAnimation() {
-        mAnimationCancelled = true;
         if (mAnim != null && mAnim.isRunning()) {
             mAnim.cancel();
         }
@@ -561,9 +444,14 @@ public class DragView extends View implements StateListener<LauncherState> {
         return mInitialScale;
     }
 
+    @Override
+    public boolean hasOverlappingRendering() {
+        return false;
+    }
+
     /** Returns the current {@link Drawable} that is rendered in this view. */
     public Drawable getDrawable() {
-        return mDrawable;
+        return mContent instanceof ImageView ? ((ImageView) mContent).getDrawable() : null;
     }
 
     private static class SpringFloatValue {
@@ -583,9 +471,9 @@ public class DragView extends View implements StateListener<LauncherState> {
                 };
 
         // Following three values are fine tuned with motion ux designer
-        private final static int STIFFNESS = 4000;
-        private final static float DAMPENING_RATIO = 1f;
-        private final static int PARALLAX_MAX_IN_DP = 8;
+        private static final int STIFFNESS = 4000;
+        private static final float DAMPENING_RATIO = 1f;
+        private static final int PARALLAX_MAX_IN_DP = 8;
 
         private final View mView;
         private final SpringAnimation mSpring;
@@ -607,4 +495,10 @@ public class DragView extends View implements StateListener<LauncherState> {
             mSpring.animateToFinalPosition(Utilities.boundToRange(value, -mDelta, mDelta));
         }
     }
+
+    private static View getViewFromDrawable(Context context, Drawable drawable) {
+        ImageView iv = new ImageView(context);
+        iv.setImageDrawable(drawable);
+        return iv;
+    }
 }
diff --git a/src/com/android/launcher3/util/FlingAnimation.java b/src/com/android/launcher3/util/FlingAnimation.java
index 9d0ad22e9a..c9aa51c0de 100644
--- a/src/com/android/launcher3/util/FlingAnimation.java
+++ b/src/com/android/launcher3/util/FlingAnimation.java
@@ -70,9 +70,6 @@ public class FlingAnimation implements AnimatorUpdateListener, Runnable {
 
         mAnimationTimeFraction = ((float) mDuration) / (mDuration + DRAG_END_DELAY);
 
-        // Don't highlight the icon as it's animating
-        mDragObject.dragView.setColor(0);
-
         final int duration = mDuration + DRAG_END_DELAY;
         final long startTime = AnimationUtils.currentAnimationTimeMillis();
 
-- 
GitLab


From 3242720ce7659fb316b8f1f9f3876ddaa8c0fd65 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 19 Apr 2021 18:12:12 +0100
Subject: [PATCH 0923/1664] Inflate LauncherAppWidgetHostView directly in
 DragView

Also removes AppWidgetHostViewDrawable

Bug: 183609936
Test: drag-n-drop icons, folders, widgets, shortcuts

Change-Id: I26d8b05b9f9171037f2459fa2389e7e02c8ca6dc
---
 src/com/android/launcher3/CellLayout.java     |   9 +-
 src/com/android/launcher3/Workspace.java      |  75 +++++++++----
 .../dragndrop/AppWidgetHostViewDrawable.java  |  88 ---------------
 .../launcher3/dragndrop/DragController.java   | 101 +++++++++++++++---
 .../android/launcher3/dragndrop/DragView.java |  61 ++++++++++-
 .../graphics/DragPreviewProvider.java         |  33 +++++-
 .../widget/PendingItemDragHelper.java         |  33 ++++--
 .../AppWidgetHostViewDragListener.java        |   8 +-
 8 files changed, 257 insertions(+), 151 deletions(-)
 delete mode 100644 src/com/android/launcher3/dragndrop/AppWidgetHostViewDrawable.java

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index fc09295d7b..82a28cf446 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -61,7 +61,6 @@ import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.accessibility.DragAndDropAccessibilityDelegate;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.config.FeatureFlags;
-import com.android.launcher3.dragndrop.AppWidgetHostViewDrawable;
 import com.android.launcher3.folder.PreviewBackground;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.util.CellAndSpan;
@@ -70,6 +69,7 @@ import com.android.launcher3.util.ParcelableSparseArray;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.util.Thunk;
 import com.android.launcher3.views.ActivityContext;
+import com.android.launcher3.widget.LauncherAppWidgetHostView;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -1062,15 +1062,14 @@ public class CellLayout extends ViewGroup {
     private void applyColorExtraction(DropTarget.DragObject dragObject, int[] targetCell, int spanX,
             int spanY) {
         // Apply local extracted color if the DragView is an AppWidgetHostViewDrawable.
-        Drawable drawable = dragObject.dragView.getDrawable();
-        if (drawable instanceof AppWidgetHostViewDrawable) {
+        View view = dragObject.dragView.getContentView();
+        if (view instanceof LauncherAppWidgetHostView) {
             Workspace workspace =
                     Launcher.getLauncher(dragObject.dragView.getContext()).getWorkspace();
             int screenId = workspace.getIdForScreen(this);
             int pageId = workspace.getPageIndexForScreenId(screenId);
-            AppWidgetHostViewDrawable hostViewDrawable = ((AppWidgetHostViewDrawable) drawable);
             cellToRect(targetCell[0], targetCell[1], spanX, spanY, mTempRect);
-            hostViewDrawable.getAppWidgetHostView().handleDrag(mTempRect, pageId);
+            ((LauncherAppWidgetHostView) view).handleDrag(mTempRect, pageId);
         }
     }
 
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 1931c29754..10091a18b8 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -69,7 +69,6 @@ import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.dot.FolderDotInfo;
-import com.android.launcher3.dragndrop.AppWidgetHostViewDrawable;
 import com.android.launcher3.dragndrop.DragController;
 import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.dragndrop.DragOptions;
@@ -414,7 +413,9 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         }
 
         if (mDragInfo != null && mDragInfo.cell != null) {
-            CellLayout layout = (CellLayout) mDragInfo.cell.getParent().getParent();
+            CellLayout layout = (CellLayout) (mDragInfo.cell instanceof LauncherAppWidgetHostView
+                    ? dragObject.dragView.getContentViewParent().getParent()
+                    : mDragInfo.cell.getParent().getParent());
             layout.markCellsAsUnoccupiedForView(mDragInfo.cell);
         }
 
@@ -1527,10 +1528,19 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
             draggableView = (DraggableView) child;
         }
 
+        final View contentView = previewProvider.getContentView();
+        final float scale;
         // The draggable drawable follows the touch point around on the screen
-        final Drawable drawable = previewProvider.createDrawable();
+        final Drawable drawable;
+        if (contentView == null) {
+            drawable = previewProvider.createDrawable();
+            scale = previewProvider.getScaleAndPosition(drawable, mTempXY);
+        } else {
+            drawable = null;
+            scale = previewProvider.getScaleAndPosition(contentView, mTempXY);
+        }
+
         int halfPadding = previewProvider.previewPadding / 2;
-        float scale = previewProvider.getScaleAndPosition(drawable, mTempXY);
         int dragLayerX = mTempXY[0];
         int dragLayerY = mTempXY[1];
 
@@ -1556,21 +1566,37 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
             }
         }
 
-        if (drawable instanceof AppWidgetHostViewDrawable) {
-            mDragController.addDragListener(new AppWidgetHostViewDragListener(mLauncher));
+        final DragView dv;
+        if (contentView instanceof View) {
+            if (contentView instanceof LauncherAppWidgetHostView) {
+                mDragController.addDragListener(new AppWidgetHostViewDragListener(mLauncher));
+            }
+            dv = mDragController.startDrag(
+                    contentView,
+                    draggableView,
+                    dragLayerX,
+                    dragLayerY,
+                    source,
+                    dragObject,
+                    dragVisualizeOffset,
+                    dragRect,
+                    scale * iconScale,
+                    scale,
+                    dragOptions);
+        } else {
+            dv = mDragController.startDrag(
+                    drawable,
+                    draggableView,
+                    dragLayerX,
+                    dragLayerY,
+                    source,
+                    dragObject,
+                    dragVisualizeOffset,
+                    dragRect,
+                    scale * iconScale,
+                    scale,
+                    dragOptions);
         }
-        DragView dv = mDragController.startDrag(
-                drawable,
-                draggableView,
-                dragLayerX,
-                dragLayerY,
-                source,
-                dragObject,
-                dragVisualizeOffset,
-                dragRect,
-                scale * iconScale,
-                scale,
-                dragOptions);
         return dv;
     }
 
@@ -1900,6 +1926,8 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
                         CellLayout parentCell = getParentCellLayoutForView(cell);
                         if (parentCell != null) {
                             parentCell.removeView(cell);
+                        } else if (mDragInfo.cell instanceof LauncherAppWidgetHostView) {
+                            d.dragView.detachContentView(/* reattachToPreviousParent= */ false);
                         } else if (FeatureFlags.IS_STUDIO_BUILD) {
                             throw new NullPointerException("mDragInfo.cell has null parent");
                         }
@@ -1938,6 +1966,9 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
                     if (!returnToOriginalCellToPreventShuffling) {
                         onNoCellFound(dropTargetLayout);
                     }
+                    if (mDragInfo.cell instanceof LauncherAppWidgetHostView) {
+                        d.dragView.detachContentView(/* reattachToPreviousParent= */ true);
+                    }
 
                     // If we can't find a drop location, we return the item to its original position
                     CellLayout.LayoutParams lp = (CellLayout.LayoutParams) cell.getLayoutParams();
@@ -2636,10 +2667,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
     }
 
     private Drawable createWidgetDrawable(ItemInfo widgetInfo, View layout) {
-        if (layout instanceof LauncherAppWidgetHostView) {
-            return new AppWidgetHostViewDrawable((LauncherAppWidgetHostView) layout);
-        }
-
         int[] unScaledSize = estimateItemSize(widgetInfo);
         int visibility = layout.getVisibility();
         layout.setVisibility(VISIBLE);
@@ -2720,7 +2747,9 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
 
         boolean isWidget = info.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET ||
                 info.itemType == LauncherSettings.Favorites.ITEM_TYPE_CUSTOM_APPWIDGET;
-        if ((animationType == ANIMATE_INTO_POSITION_AND_RESIZE || external) && finalView != null) {
+        if ((animationType == ANIMATE_INTO_POSITION_AND_RESIZE || external)
+                && finalView != null
+                && dragView.getContentView() != finalView) {
             Drawable crossFadeDrawable = createWidgetDrawable(info, finalView);
             dragView.crossFadeContent(crossFadeDrawable, (int) (duration * 0.8f));
         } else if (isWidget && external) {
diff --git a/src/com/android/launcher3/dragndrop/AppWidgetHostViewDrawable.java b/src/com/android/launcher3/dragndrop/AppWidgetHostViewDrawable.java
deleted file mode 100644
index 2135f5dff9..0000000000
--- a/src/com/android/launcher3/dragndrop/AppWidgetHostViewDrawable.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.dragndrop;
-
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.Paint;
-import android.graphics.PixelFormat;
-import android.graphics.drawable.Drawable;
-
-import com.android.launcher3.widget.LauncherAppWidgetHostView;
-
-/**
- * A drawable which renders {@link LauncherAppWidgetHostView} to a canvas.
- *
- * TODO(b/183609936) Stop using that class and remove it.
- */
-public final class AppWidgetHostViewDrawable extends Drawable {
-
-    private final LauncherAppWidgetHostView mAppWidgetHostView;
-    private Paint mPaint = new Paint();
-
-    public AppWidgetHostViewDrawable(LauncherAppWidgetHostView appWidgetHostView) {
-        mAppWidgetHostView = appWidgetHostView;
-    }
-
-    @Override
-    public void draw(Canvas canvas) {
-        int saveCount = canvas.saveLayer(0, 0, getIntrinsicWidth(), getIntrinsicHeight(), mPaint);
-        mAppWidgetHostView.draw(canvas);
-        canvas.restoreToCount(saveCount);
-    }
-
-    @Override
-    public int getIntrinsicWidth() {
-        return mAppWidgetHostView.getMeasuredWidth();
-    }
-
-    @Override
-    public int getIntrinsicHeight() {
-        return mAppWidgetHostView.getMeasuredHeight();
-    }
-
-    @Override
-    public int getOpacity() {
-        // This is up to app widget provider. We don't know if the host view will cover anything
-        // behind the drawable.
-        return PixelFormat.UNKNOWN;
-    }
-
-    @Override
-    public void setAlpha(int alpha) {
-        mPaint.setAlpha(alpha);
-    }
-
-    @Override
-    public int getAlpha() {
-        return mPaint.getAlpha();
-    }
-
-    @Override
-    public void setColorFilter(ColorFilter colorFilter) {
-        mPaint.setColorFilter(colorFilter);
-    }
-
-    @Override
-    public ColorFilter getColorFilter() {
-        return mPaint.getColorFilter();
-    }
-
-    /** Returns the {@link LauncherAppWidgetHostView}. */
-    public LauncherAppWidgetHostView getAppWidgetHostView() {
-        return mAppWidgetHostView;
-    }
-}
diff --git a/src/com/android/launcher3/dragndrop/DragController.java b/src/com/android/launcher3/dragndrop/DragController.java
index b7a70cb654..d7f6cdb8bb 100644
--- a/src/com/android/launcher3/dragndrop/DragController.java
+++ b/src/com/android/launcher3/dragndrop/DragController.java
@@ -34,6 +34,8 @@ import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.DragSource;
 import com.android.launcher3.DropTarget;
@@ -125,20 +127,23 @@ public class DragController implements DragDriver.EventListener, TouchController
 
     /**
      * Starts a drag.
-     * When the drag is started, the UI automatically goes into spring loaded mode. On a successful
-     * drop, it is the responsibility of the {@link DropTarget} to exit out of the spring loaded
-     * mode. If the drop was cancelled for some reason, the UI will automatically exit out of this mode.
+     *
+     * <p>When the drag is started, the UI automatically goes into spring loaded mode. On a
+     * successful drop, it is the responsibility of the {@link DropTarget} to exit out of the spring
+     * loaded mode. If the drop was cancelled for some reason, the UI will automatically exit out of
+     * this mode.
      *
      * @param drawable The drawable to be displayed in the drag view.  It will be re-scaled to the
-     *          enlarged size.
-     * @param originalView The source view (ie. icon, widget etc.) that is being dragged
-     *          and which the DragView represents
+     *                 enlarged size.
+     * @param originalView The source view (ie. icon, widget etc.) that is being dragged and which
+     *                     the DragView represents
      * @param dragLayerX The x position in the DragLayer of the left-top of the bitmap.
      * @param dragLayerY The y position in the DragLayer of the left-top of the bitmap.
      * @param source An object representing where the drag originated
      * @param dragInfo The data associated with the object that is being dragged
      * @param dragRegion Coordinates within the bitmap b for the position of item being dragged.
-     *          Makes dragging feel more precise, e.g. you can clip out a transparent border
+     *                   Makes dragging feel more precise, e.g. you can clip out a transparent
+     *                   border
      */
     public DragView startDrag(
             Drawable drawable,
@@ -152,6 +157,61 @@ public class DragController implements DragDriver.EventListener, TouchController
             float initialDragViewScale,
             float dragViewScaleOnDrop,
             DragOptions options) {
+        return startDrag(drawable, /* view= */ null, originalView, dragLayerX, dragLayerY,
+                source, dragInfo, dragOffset, dragRegion, initialDragViewScale, dragViewScaleOnDrop,
+                options);
+    }
+
+    /**
+     * Starts a drag.
+     *
+     * <p>When the drag is started, the UI automatically goes into spring loaded mode. On a
+     * successful drop, it is the responsibility of the {@link DropTarget} to exit out of the spring
+     * loaded mode. If the drop was cancelled for some reason, the UI will automatically exit out of
+     * this mode.
+     *
+     * @param view The view to be displayed in the drag view.  It will be re-scaled to the
+     *             enlarged size.
+     * @param originalView The source view (ie. icon, widget etc.) that is being dragged and which
+     *                     the DragView represents
+     * @param dragLayerX The x position in the DragLayer of the left-top of the bitmap.
+     * @param dragLayerY The y position in the DragLayer of the left-top of the bitmap.
+     * @param source An object representing where the drag originated
+     * @param dragInfo The data associated with the object that is being dragged
+     * @param dragRegion Coordinates within the bitmap b for the position of item being dragged.
+     *                   Makes dragging feel more precise, e.g. you can clip out a transparent
+     *                   border
+     */
+    public DragView startDrag(
+            View view,
+            DraggableView originalView,
+            int dragLayerX,
+            int dragLayerY,
+            DragSource source,
+            ItemInfo dragInfo,
+            Point dragOffset,
+            Rect dragRegion,
+            float initialDragViewScale,
+            float dragViewScaleOnDrop,
+            DragOptions options) {
+        return startDrag(/* drawable= */ null, view, originalView, dragLayerX, dragLayerY,
+                source, dragInfo, dragOffset, dragRegion, initialDragViewScale, dragViewScaleOnDrop,
+                options);
+    }
+
+    private DragView startDrag(
+            @Nullable Drawable drawable,
+            @Nullable View view,
+            DraggableView originalView,
+            int dragLayerX,
+            int dragLayerY,
+            DragSource source,
+            ItemInfo dragInfo,
+            Point dragOffset,
+            Rect dragRegion,
+            float initialDragViewScale,
+            float dragViewScaleOnDrop,
+            DragOptions options) {
         if (PROFILE_DRAWING_DURING_DRAG) {
             android.os.Debug.startMethodTracing("Launcher");
         }
@@ -182,14 +242,25 @@ public class DragController implements DragDriver.EventListener, TouchController
         final Resources res = mLauncher.getResources();
         final float scaleDps = mIsInPreDrag
                 ? res.getDimensionPixelSize(R.dimen.pre_drag_view_scale) : 0f;
-        final DragView dragView = mDragObject.dragView = new DragView(
-                mLauncher,
-                drawable,
-                registrationX,
-                registrationY,
-                initialDragViewScale,
-                dragViewScaleOnDrop,
-                scaleDps);
+        final DragView dragView = mDragObject.dragView = drawable != null
+                ? new DragView(
+                    mLauncher,
+                    drawable,
+                    registrationX,
+                    registrationY,
+                    initialDragViewScale,
+                    dragViewScaleOnDrop,
+                    scaleDps)
+                : new DragView(
+                    mLauncher,
+                    view,
+                    view.getMeasuredWidth(),
+                    view.getMeasuredHeight(),
+                    registrationX,
+                    registrationY,
+                    initialDragViewScale,
+                    dragViewScaleOnDrop,
+                    scaleDps);
         dragView.setItemInfo(dragInfo);
         mDragObject.dragComplete = false;
 
diff --git a/src/com/android/launcher3/dragndrop/DragView.java b/src/com/android/launcher3/dragndrop/DragView.java
index 346359954e..68a8af238e 100644
--- a/src/com/android/launcher3/dragndrop/DragView.java
+++ b/src/com/android/launcher3/dragndrop/DragView.java
@@ -42,9 +42,11 @@ import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
+import androidx.annotation.Nullable;
 import androidx.dynamicanimation.animation.FloatPropertyCompat;
 import androidx.dynamicanimation.animation.SpringAnimation;
 import androidx.dynamicanimation.animation.SpringForce;
@@ -69,6 +71,10 @@ public class DragView extends FrameLayout implements StateListener<LauncherState
     public static final int VIEW_ZOOM_DURATION = 150;
 
     private final View mContent;
+    // The following are only used for rendering mContent directly during drag-n-drop.
+    @Nullable private ViewGroup.LayoutParams mContentViewLayoutParams;
+    @Nullable private ViewGroup mContentViewParent;
+    private int mContentViewInParentViewIndex = -1;
     private final int mWidth;
     private final int mHeight;
 
@@ -135,6 +141,13 @@ public class DragView extends FrameLayout implements StateListener<LauncherState
         mContent = content;
         mWidth = width;
         mHeight = height;
+        mContentViewLayoutParams = mContent.getLayoutParams();
+        if (mContent.getParent() instanceof ViewGroup) {
+            mContentViewParent = (ViewGroup) mContent.getParent();
+            mContentViewInParentViewIndex = mContentViewParent.indexOfChild(mContent);
+            mContentViewParent.removeView(mContent);
+        }
+
         addView(content, new LayoutParams(width, height));
 
         final float scale = (width + finalScaleDps) / width;
@@ -372,6 +385,12 @@ public class DragView extends FrameLayout implements StateListener<LauncherState
         BaseDragLayer.LayoutParams lp = new BaseDragLayer.LayoutParams(mWidth, mHeight);
         lp.customPosition = true;
         setLayoutParams(lp);
+
+        if (mContent != null) {
+            // At the drag start, the source view visibility is set to invisible.
+            mContent.setVisibility(VISIBLE);
+        }
+
         move(touchX, touchY);
         // Post the animation to skip other expensive work happening on the first frame
         post(mAnim::start);
@@ -430,6 +449,33 @@ public class DragView extends FrameLayout implements StateListener<LauncherState
         setTranslationY(mLastTouchY - mRegistrationY + mAnimatedShiftY);
     }
 
+
+    /**
+     * Detaches {@link #mContent}, if previously attached, from this view.
+     *
+     * <p>In the case of no change in the drop position, sets {@code reattachToPreviousParent} to
+     * {@code true} to attach the {@link #mContent} back to its previous parent.
+     */
+    public void detachContentView(boolean reattachToPreviousParent) {
+        if (mContent != null && mContentViewParent != null && mContentViewInParentViewIndex >= 0) {
+            removeView(mContent);
+            mContent.setLayoutParams(mContentViewLayoutParams);
+            if (reattachToPreviousParent) {
+                mContentViewParent.addView(mContent, mContentViewInParentViewIndex);
+            }
+            mContentViewParent = null;
+            mContentViewInParentViewIndex = -1;
+        }
+    }
+
+    /**
+     * Removes this view from the {@link DragLayer}.
+     *
+     * <p>If the drag content is a {@link #mContent}, this call doesn't reattach the
+     * {@link #mContent} back to its previous parent. To reattach to previous parent, the caller
+     * should call {@link #detachContentView} with {@code reattachToPreviousParent} sets to true
+     * before this call.
+     */
     public void remove() {
         if (getParent() != null) {
             mDragLayer.removeView(DragView.this);
@@ -449,9 +495,18 @@ public class DragView extends FrameLayout implements StateListener<LauncherState
         return false;
     }
 
-    /** Returns the current {@link Drawable} that is rendered in this view. */
-    public Drawable getDrawable() {
-        return mContent instanceof ImageView ? ((ImageView) mContent).getDrawable() : null;
+    /** Returns the current content view that is rendered in the drag view. */
+    public View getContentView() {
+        return mContent;
+    }
+
+    /**
+     * Returns the previous {@link ViewGroup} parent of the {@link #mContent} before the drag
+     * content is attached to this view.
+     */
+    @Nullable
+    public ViewGroup getContentViewParent() {
+        return mContentViewParent;
     }
 
     private static class SpringFloatValue {
diff --git a/src/com/android/launcher3/graphics/DragPreviewProvider.java b/src/com/android/launcher3/graphics/DragPreviewProvider.java
index 0e61b98649..a549750dae 100644
--- a/src/com/android/launcher3/graphics/DragPreviewProvider.java
+++ b/src/com/android/launcher3/graphics/DragPreviewProvider.java
@@ -29,11 +29,12 @@ import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.view.View;
 
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.config.FeatureFlags;
-import com.android.launcher3.dragndrop.AppWidgetHostViewDrawable;
 import com.android.launcher3.dragndrop.DraggableView;
 import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.icons.FastBitmapDrawable;
@@ -95,7 +96,7 @@ public class DragPreviewProvider {
      */
     public Drawable createDrawable() {
         if (mView instanceof LauncherAppWidgetHostView) {
-            return new AppWidgetHostViewDrawable((LauncherAppWidgetHostView) mView);
+            return null;
         }
 
         int width = 0;
@@ -116,6 +117,18 @@ public class DragPreviewProvider {
                         height + blurSizeOutline, (c) -> drawDragView(c, scale)));
     }
 
+    /**
+     * Returns the content view if the content should be rendered directly in
+     * {@link com.android.launcher3.dragndrop.DragView}. Otherwise, returns null.
+     */
+    @Nullable
+    public View getContentView() {
+        if (mView instanceof LauncherAppWidgetHostView) {
+            return mView;
+        }
+        return null;
+    }
+
     public final void generateDragOutline(Bitmap preview) {
         if (FeatureFlags.IS_STUDIO_BUILD && mOutlineGeneratorCallback != null) {
             throw new RuntimeException("Drag outline generated twice");
@@ -152,6 +165,22 @@ public class DragPreviewProvider {
         return scale;
     }
 
+    /** Returns the scale and position of a given view for drag-n-drop. */
+    public float getScaleAndPosition(View view, int[] outPos) {
+        float scale = Launcher.getLauncher(mView.getContext())
+                .getDragLayer().getLocationInDragLayer(mView, outPos);
+        if (mView instanceof LauncherAppWidgetHostView) {
+            // App widgets are technically scaled, but are drawn at their expected size -- so the
+            // app widget scale should not affect the scale of the preview.
+            scale /= ((LauncherAppWidgetHostView) mView).getScaleToFit();
+        }
+
+        outPos[0] = Math.round(outPos[0]
+                - (view.getWidth() - scale * mView.getWidth() * mView.getScaleX()) / 2);
+        outPos[1] = Math.round(outPos[1] - (1 - scale) * view.getHeight() / 2 - previewPadding / 2);
+        return scale;
+    }
+
     protected Bitmap convertPreviewToAlphaBitmap(Bitmap preview) {
         return preview.copy(Bitmap.Config.ALPHA_8, true);
     }
diff --git a/src/com/android/launcher3/widget/PendingItemDragHelper.java b/src/com/android/launcher3/widget/PendingItemDragHelper.java
index e78d517b09..df368cd3e5 100644
--- a/src/com/android/launcher3/widget/PendingItemDragHelper.java
+++ b/src/com/android/launcher3/widget/PendingItemDragHelper.java
@@ -33,7 +33,6 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.PendingAddItemInfo;
 import com.android.launcher3.R;
-import com.android.launcher3.dragndrop.AppWidgetHostViewDrawable;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.dragndrop.DraggableView;
 import com.android.launcher3.graphics.DragPreviewProvider;
@@ -93,6 +92,8 @@ public class PendingItemDragHelper extends DragPreviewProvider {
         LauncherAppState app = LauncherAppState.getInstance(launcher);
 
         Drawable preview = null;
+        final int previewWidth;
+        final int previewHeight;
         final float scale;
         final Point dragOffset;
         final Rect dragRegion;
@@ -114,12 +115,11 @@ public class PendingItemDragHelper extends DragPreviewProvider {
                                 createWidgetInfo.info, maxWidth, previewSizeBeforeScale));
             }
             if (mAppWidgetHostViewPreview != null) {
-                preview = new AppWidgetHostViewDrawable(mAppWidgetHostViewPreview);
                 previewSizeBeforeScale[0] = mAppWidgetHostViewPreview.getMeasuredWidth();
                 launcher.getDragController()
                         .addDragListener(new AppWidgetHostViewDragListener(launcher));
             }
-            if (preview == null) {
+            if (preview == null && mAppWidgetHostViewPreview == null) {
                 Drawable p = new FastBitmapDrawable(
                         app.getWidgetCache().generateWidgetPreview(launcher,
                                 createWidgetInfo.info, maxWidth, null,
@@ -140,7 +140,14 @@ public class PendingItemDragHelper extends DragPreviewProvider {
                 previewBounds.left += padding;
                 previewBounds.right -= padding;
             }
-            scale = previewBounds.width() / (float) preview.getIntrinsicWidth();
+            if (mAppWidgetHostViewPreview != null) {
+                previewWidth = mAppWidgetHostViewPreview.getMeasuredWidth();
+                previewHeight = mAppWidgetHostViewPreview.getMeasuredHeight();
+            } else {
+                previewWidth = preview.getIntrinsicWidth();
+                previewHeight = preview.getIntrinsicHeight();
+            }
+            scale = previewBounds.width() / (float) previewWidth;
             launcher.getDragController().addDragListener(new WidgetHostViewLoader(launcher, mView));
 
             dragOffset = null;
@@ -152,8 +159,10 @@ public class PendingItemDragHelper extends DragPreviewProvider {
             LauncherIcons li = LauncherIcons.obtain(launcher);
             preview = new FastBitmapDrawable(
                     li.createScaledBitmapWithoutShadow(icon, 0));
+            previewWidth = preview.getIntrinsicWidth();
+            previewHeight = preview.getIntrinsicHeight();
             li.recycle();
-            scale = ((float) launcher.getDeviceProfile().iconSizePx) / preview.getIntrinsicWidth();
+            scale = ((float) launcher.getDeviceProfile().iconSizePx) / previewWidth;
 
             dragOffset = new Point(previewPadding / 2, previewPadding / 2);
 
@@ -181,13 +190,19 @@ public class PendingItemDragHelper extends DragPreviewProvider {
         launcher.getWorkspace().prepareDragWithProvider(this);
 
         int dragLayerX = screenPos.x + previewBounds.left
-                + (int) ((scale * preview.getIntrinsicWidth() - preview.getIntrinsicWidth()) / 2);
+                + (int) ((scale * previewWidth - previewWidth) / 2);
         int dragLayerY = screenPos.y + previewBounds.top
-                + (int) ((scale * preview.getIntrinsicHeight() - preview.getIntrinsicHeight()) / 2);
+                + (int) ((scale * previewHeight - previewHeight) / 2);
 
         // Start the drag
-        launcher.getDragController().startDrag(preview, draggableView, dragLayerX, dragLayerY,
-                source, mAddInfo, dragOffset, dragRegion, scale, scale, options);
+        if (mAppWidgetHostViewPreview != null) {
+            launcher.getDragController().startDrag(mAppWidgetHostViewPreview, draggableView,
+                    dragLayerX, dragLayerY, source, mAddInfo, dragOffset, dragRegion, scale, scale,
+                    options);
+        } else {
+            launcher.getDragController().startDrag(preview, draggableView, dragLayerX, dragLayerY,
+                    source, mAddInfo, dragOffset, dragRegion, scale, scale, options);
+        }
     }
 
     @Override
diff --git a/src/com/android/launcher3/widget/dragndrop/AppWidgetHostViewDragListener.java b/src/com/android/launcher3/widget/dragndrop/AppWidgetHostViewDragListener.java
index 66bb363dde..4a60983624 100644
--- a/src/com/android/launcher3/widget/dragndrop/AppWidgetHostViewDragListener.java
+++ b/src/com/android/launcher3/widget/dragndrop/AppWidgetHostViewDragListener.java
@@ -17,7 +17,6 @@ package com.android.launcher3.widget.dragndrop;
 
 import com.android.launcher3.DropTarget;
 import com.android.launcher3.Launcher;
-import com.android.launcher3.dragndrop.AppWidgetHostViewDrawable;
 import com.android.launcher3.dragndrop.DragController;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.widget.LauncherAppWidgetHostView;
@@ -26,7 +25,6 @@ import com.android.launcher3.widget.LauncherAppWidgetHostView;
 public final class AppWidgetHostViewDragListener implements DragController.DragListener {
     private final Launcher mLauncher;
     private DropTarget.DragObject mDragObject;
-    private AppWidgetHostViewDrawable mAppWidgetHostViewDrawable;
     private LauncherAppWidgetHostView mAppWidgetHostView;
 
     public AppWidgetHostViewDragListener(Launcher launcher) {
@@ -35,11 +33,9 @@ public final class AppWidgetHostViewDragListener implements DragController.DragL
 
     @Override
     public void onDragStart(DropTarget.DragObject dragObject, DragOptions unused) {
-        if (dragObject.dragView.getDrawable() instanceof AppWidgetHostViewDrawable) {
+        if (dragObject.dragView.getContentView() instanceof LauncherAppWidgetHostView) {
             mDragObject = dragObject;
-            mAppWidgetHostViewDrawable =
-                    (AppWidgetHostViewDrawable) mDragObject.dragView.getDrawable();
-            mAppWidgetHostView = mAppWidgetHostViewDrawable.getAppWidgetHostView();
+            mAppWidgetHostView = (LauncherAppWidgetHostView) dragObject.dragView.getContentView();
             mAppWidgetHostView.startDrag(this);
         } else {
             mLauncher.getDragController().removeDragListener(this);
-- 
GitLab


From 5a85912b92478edb46392f0fa773716f0f2f5f7a Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Mon, 19 Apr 2021 17:23:11 -0700
Subject: [PATCH 0924/1664] Adds a flag for Smartspace feedback.

Test: Manual
Change-Id: I96dd8dad8bd2ab136960d0bebeac67b8bc00b583
---
 src/com/android/launcher3/config/FeatureFlags.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 6331ef2862..06166289b0 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -168,7 +168,11 @@ public final class FeatureFlags {
     public static final BooleanFlag ENABLE_SMARTSPACE_ENHANCED = new DeviceFlag(
             "ENABLE_SMARTSPACE_ENHANCED", false,
             "Replace Smartspace with the enhanced version. "
-              + "Ignored if ENABLE_SMARTSPACE_UNIVERSAL is enabled.");
+                    + "Ignored if ENABLE_SMARTSPACE_UNIVERSAL is enabled.");
+
+    public static final BooleanFlag ENABLE_SMARTSPACE_FEEDBACK = new DeviceFlag(
+            "ENABLE_SMARTSPACE_FEEDBACK", true,
+            "Adds a menu option to send feedback for Enhanced Smartspace.");
 
     public static final BooleanFlag ALWAYS_USE_HARDWARE_OPTIMIZATION_FOR_FOLDER_ANIMATIONS =
             getDebugFlag(
-- 
GitLab


From 8559ae324c3509a9594f1c94db66a0138d0f3e3a Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 16 Apr 2021 11:59:07 -0700
Subject: [PATCH 0925/1664] Update TwoButtonNavbarTouchController logs

- Fix wrong bug number
- Log when we intercept and reinit to a state rather than in
  getTargetState() which is used to determine possible swipe
  directions too (which makes the logs confusing)

Test: run TaplTestsQuickstep#testOverviewActions
Bug: 177316094
Change-Id: Ibe5db6317c16c429c9c46bf237d3f8adc1458037
---
 .../TwoButtonNavbarTouchController.java       | 27 ++++++++++++++-----
 .../launcher3/testing/TestProtocol.java       |  2 +-
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java
index c4263290f7..b0d0b1528c 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java
@@ -98,23 +98,35 @@ public class TwoButtonNavbarTouchController extends AbstractStateChangeTouchCont
         return mLauncher.isInState(NORMAL);
     }
 
+    @Override
+    public boolean onControllerInterceptTouchEvent(MotionEvent ev) {
+        boolean intercept = super.onControllerInterceptTouchEvent(ev);
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.TWO_BUTTON_NORMAL_NOT_OVERVIEW,
+                    "2 button touch controller intercept touch? " + intercept);
+        }
+        return intercept;
+    }
+
     @Override
     protected LauncherState getTargetState(LauncherState fromState, boolean isDragTowardPositive) {
-        final LauncherState targetState;
         if (mIsTransposed) {
             boolean draggingFromNav =
                     mLauncher.getDeviceProfile().isSeascape() == isDragTowardPositive;
-            targetState = draggingFromNav ? HINT_STATE_TWO_BUTTON : NORMAL;
+            return draggingFromNav ? HINT_STATE_TWO_BUTTON : NORMAL;
         } else {
             LauncherState startState = mStartState != null ? mStartState : fromState;
-            targetState = isDragTowardPositive ^ (startState == OVERVIEW)
-                    ? HINT_STATE_TWO_BUTTON : NORMAL;
+            return isDragTowardPositive ^ (startState == OVERVIEW) ? HINT_STATE_TWO_BUTTON : NORMAL;
         }
+    }
+
+    @Override
+    protected void onReinitToState(LauncherState newToState) {
+        super.onReinitToState(newToState);
 
         if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.TWO_BUTTON_NORMAL_NOT_OVERVIEW, "Target state: " + targetState);
+            Log.d(TestProtocol.TWO_BUTTON_NORMAL_NOT_OVERVIEW, "onReinitToState: " + newToState);
         }
-        return targetState;
     }
 
     @Override
@@ -163,6 +175,9 @@ public class TwoButtonNavbarTouchController extends AbstractStateChangeTouchCont
     @Override
     protected void onSwipeInteractionCompleted(LauncherState targetState) {
         super.onSwipeInteractionCompleted(targetState);
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.TWO_BUTTON_NORMAL_NOT_OVERVIEW, "Reached state: " + targetState);
+        }
         if (!mIsTransposed) {
             mContinuousTouchCount++;
         }
diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java
index 60dd0f353d..d747a06313 100644
--- a/src/com/android/launcher3/testing/TestProtocol.java
+++ b/src/com/android/launcher3/testing/TestProtocol.java
@@ -114,5 +114,5 @@ public final class TestProtocol {
     public static final String WORK_PROFILE_REMOVED = "b/159671700";
     public static final String TIS_NO_EVENTS = "b/180915942";
     public static final String GET_RECENTS_FAILED = "b/177472267";
-    public static final String TWO_BUTTON_NORMAL_NOT_OVERVIEW = "b/13714484";
+    public static final String TWO_BUTTON_NORMAL_NOT_OVERVIEW = "b/177316094";
 }
-- 
GitLab


From 12acb4559edb1d421cafd52129e4af2e998b89d2 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Mon, 19 Apr 2021 18:50:25 -0700
Subject: [PATCH 0926/1664] Partial cleanup after b/143488140

Apparently, failures in constructor don't have screenshots.

Test: presubmit
Bug: 177318681
Change-Id: I8d354658c01fd2f06fb559b0fe5506d0058688b4
---
 .../tests/src/com/android/quickstep/FallbackRecentsTest.java  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
index 713fd074be..88f1850072 100644
--- a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
+++ b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
@@ -139,10 +139,6 @@ public class FallbackRecentsTest {
                     TestCommandReceiver.GET_SYSTEM_HEALTH_MESSAGE, startTime.toString()).
                     getString("result"));
         }
-        // b/143488140
-        mDevice.pressHome();
-        mDevice.waitForIdle();
-        startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR));
     }
 
     // b/143488140
-- 
GitLab


From c839676fa017bfc5f85d1ca13ade8a2a2643c344 Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Tue, 20 Apr 2021 09:39:52 +0100
Subject: [PATCH 0927/1664] Hide scroll bar if recycler view has no items.

Bug: 185873180
Test: Manually tested
Change-Id: Id0b21b264417aff19cfdcb46228bb497310ccc1b
---
 src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java b/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
index b016b4f32c..d9861be473 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
@@ -116,6 +116,7 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
     public void onUpdateScrollbar(int dy) {
         // Skip early if widgets are not bound.
         if (isModelNotReady()) {
+            mScrollbar.setThumbOffsetY(-1);
             return;
         }
 
-- 
GitLab


From e485941c106550dbecc004b865bdb8d967faa470 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Tue, 20 Apr 2021 12:18:48 +0100
Subject: [PATCH 0928/1664] Check null for actinosView in
 resetPaddingFromTaskSize

Bug: 185805100
Fixes: 185805100
Test: manual
Change-Id: I03cc5820d77c16873acf3d9600c544d90b515a29
---
 .../android/quickstep/views/RecentsView.java  | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 0eb23920f8..291eef2259 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1165,24 +1165,26 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         updateTaskSize();
 
         // Update ActionsView position
-        FrameLayout.LayoutParams layoutParams =
-                (FrameLayout.LayoutParams) mActionsView.getLayoutParams();
-        if (dp.isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get()) {
-            layoutParams.gravity = Gravity.BOTTOM;
-            layoutParams.bottomMargin =
-                    dp.heightPx - mInsets.bottom - mLastComputedGridSize.bottom;
-            layoutParams.leftMargin = mLastComputedTaskSize.left;
-            layoutParams.rightMargin = dp.widthPx - mLastComputedTaskSize.right;
-            // When in modal state, remove bottom margin to avoid covering content.
-            mActionsView.setModalTransformY(layoutParams.bottomMargin);
-        } else {
-            layoutParams.gravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM;
-            layoutParams.bottomMargin = 0;
-            layoutParams.leftMargin = 0;
-            layoutParams.rightMargin = 0;
-            mActionsView.setModalTransformY(0);
+        if (mActionsView != null) {
+            FrameLayout.LayoutParams layoutParams =
+                    (FrameLayout.LayoutParams) mActionsView.getLayoutParams();
+            if (dp.isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get()) {
+                layoutParams.gravity = Gravity.BOTTOM;
+                layoutParams.bottomMargin =
+                        dp.heightPx - mInsets.bottom - mLastComputedGridSize.bottom;
+                layoutParams.leftMargin = mLastComputedTaskSize.left;
+                layoutParams.rightMargin = dp.widthPx - mLastComputedTaskSize.right;
+                // When in modal state, remove bottom margin to avoid covering content.
+                mActionsView.setModalTransformY(layoutParams.bottomMargin);
+            } else {
+                layoutParams.gravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM;
+                layoutParams.bottomMargin = 0;
+                layoutParams.leftMargin = 0;
+                layoutParams.rightMargin = 0;
+                mActionsView.setModalTransformY(0);
+            }
+            mActionsView.setLayoutParams(layoutParams);
         }
-        mActionsView.setLayoutParams(layoutParams);
     }
 
     /**
-- 
GitLab


From ca6f2475f17db37d72f721ea0d750eaca3daf154 Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pbdr@google.com>
Date: Tue, 20 Apr 2021 14:59:22 +0100
Subject: [PATCH 0929/1664] Correct landscape mode color extraction rectangle

I had inverted the width and height of the screen,

Bug: 185887938
Test: Manual
Change-Id: I03889bf5e3f257414b90e992583307d61a960fe6
---
 src/com/android/launcher3/widget/LauncherAppWidgetHostView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
index 0d53f207f8..f77c740032 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
@@ -339,7 +339,7 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         // The layout depends on the orientation.
         if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
             int parentViewWidth = parentView == null ? 0 : parentView.getWidth();
-            xOffset = screenHeight - mWorkspace.getPaddingRight() - parentViewWidth;
+            xOffset = screenWidth - mWorkspace.getPaddingRight() - parentViewWidth;
         } else {
             int parentViewPaddingLeft = parentView == null ? 0 : parentView.getPaddingLeft();
             xOffset = mWorkspace.getPaddingLeft() + parentViewPaddingLeft;
-- 
GitLab


From db77bfade21d17a2fed857c40c6faba4ef6187fa Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Tue, 20 Apr 2021 15:55:35 +0000
Subject: [PATCH 0930/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I6e94505a2803c2bd43cb4204944b72987dbb81d2
---
 quickstep/res/values-af/strings.xml        |  3 +-
 quickstep/res/values-am/strings.xml        |  3 +-
 quickstep/res/values-ar/strings.xml        |  3 +-
 quickstep/res/values-as/strings.xml        |  3 +-
 quickstep/res/values-az/strings.xml        |  3 +-
 quickstep/res/values-b+sr+Latn/strings.xml |  3 +-
 quickstep/res/values-be/strings.xml        |  3 +-
 quickstep/res/values-bg/strings.xml        |  3 +-
 quickstep/res/values-bn/strings.xml        |  3 +-
 quickstep/res/values-bs/strings.xml        |  3 +-
 quickstep/res/values-ca/strings.xml        |  3 +-
 quickstep/res/values-cs/strings.xml        |  5 +-
 quickstep/res/values-da/strings.xml        |  3 +-
 quickstep/res/values-de/strings.xml        | 99 ++++++++--------------
 quickstep/res/values-el/strings.xml        |  3 +-
 quickstep/res/values-es-rUS/strings.xml    |  3 +-
 quickstep/res/values-es/strings.xml        |  3 +-
 quickstep/res/values-et/strings.xml        |  3 +-
 quickstep/res/values-eu/strings.xml        |  3 +-
 quickstep/res/values-fa/strings.xml        |  3 +-
 quickstep/res/values-fi/strings.xml        |  3 +-
 quickstep/res/values-fr-rCA/strings.xml    |  3 +-
 quickstep/res/values-fr/strings.xml        |  3 +-
 quickstep/res/values-gl/strings.xml        |  3 +-
 quickstep/res/values-hi/strings.xml        |  3 +-
 quickstep/res/values-hr/strings.xml        |  3 +-
 quickstep/res/values-hu/strings.xml        |  3 +-
 quickstep/res/values-in/strings.xml        |  3 +-
 quickstep/res/values-is/strings.xml        |  3 +-
 quickstep/res/values-it/strings.xml        |  5 +-
 quickstep/res/values-iw/strings.xml        |  3 +-
 quickstep/res/values-ja/strings.xml        |  3 +-
 quickstep/res/values-ka/strings.xml        |  3 +-
 quickstep/res/values-kk/strings.xml        |  3 +-
 quickstep/res/values-ko/strings.xml        |  3 +-
 quickstep/res/values-ky/strings.xml        |  3 +-
 quickstep/res/values-lt/strings.xml        |  3 +-
 quickstep/res/values-lv/strings.xml        |  3 +-
 quickstep/res/values-mk/strings.xml        |  3 +-
 quickstep/res/values-ml/strings.xml        |  3 +-
 quickstep/res/values-mn/strings.xml        |  3 +-
 quickstep/res/values-ms/strings.xml        |  3 +-
 quickstep/res/values-my/strings.xml        |  3 +-
 quickstep/res/values-nb/strings.xml        |  3 +-
 quickstep/res/values-nl/strings.xml        |  3 +-
 quickstep/res/values-pa/strings.xml        |  3 +-
 quickstep/res/values-pl/strings.xml        |  3 +-
 quickstep/res/values-pt-rPT/strings.xml    |  3 +-
 quickstep/res/values-pt/strings.xml        |  3 +-
 quickstep/res/values-ro/strings.xml        |  3 +-
 quickstep/res/values-ru/strings.xml        |  3 +-
 quickstep/res/values-si/strings.xml        |  3 +-
 quickstep/res/values-sk/strings.xml        |  3 +-
 quickstep/res/values-sl/strings.xml        |  3 +-
 quickstep/res/values-sq/strings.xml        |  3 +-
 quickstep/res/values-sr/strings.xml        |  3 +-
 quickstep/res/values-sv/strings.xml        |  3 +-
 quickstep/res/values-ta/strings.xml        |  3 +-
 quickstep/res/values-th/strings.xml        |  3 +-
 quickstep/res/values-tl/strings.xml        |  3 +-
 quickstep/res/values-tr/strings.xml        |  3 +-
 quickstep/res/values-uk/strings.xml        |  3 +-
 quickstep/res/values-vi/strings.xml        |  3 +-
 quickstep/res/values-zh-rCN/strings.xml    |  3 +-
 quickstep/res/values-zh-rHK/strings.xml    |  3 +-
 quickstep/res/values-zh-rTW/strings.xml    |  3 +-
 quickstep/res/values-zu/strings.xml        |  3 +-
 67 files changed, 101 insertions(+), 200 deletions(-)

diff --git a/quickstep/res/values-af/strings.xml b/quickstep/res/values-af/strings.xml
index 6aed173c7d..815ba042b2 100644
--- a/quickstep/res/values-af/strings.xml
+++ b/quickstep/res/values-af/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Skermkiekie"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Jou organisasie laat nie hierdie program toe nie"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Slaan navigasietutoriaal oor?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Jy kan dit later in die <xliff:g id="NAME">%1$s</xliff:g>-program kry"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Kanselleer"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Slaan oor"</string>
 </resources>
diff --git a/quickstep/res/values-am/strings.xml b/quickstep/res/values-am/strings.xml
index dd4f76d9a9..5a3df9d9bb 100644
--- a/quickstep/res/values-am/strings.xml
+++ b/quickstep/res/values-am/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"ቅጽበታዊ ገጽ እይታ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ይህ ድርጊት በመተግበሪያው ወይም በእርስዎ ድርጅት አይፈቀድም"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"የአሰሳ አጋዥ ሥልጠናን ይዝለሉ?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"ይህን በኋላ በ<xliff:g id="NAME">%1$s</xliff:g> መተግበሪያው ውስጥ ማግኘት ይችላሉ"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"ይቅር"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"ዝለል"</string>
 </resources>
diff --git a/quickstep/res/values-ar/strings.xml b/quickstep/res/values-ar/strings.xml
index ee58f170a5..8205f89444 100644
--- a/quickstep/res/values-ar/strings.xml
+++ b/quickstep/res/values-ar/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"لقطة شاشة"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"لا يسمح التطبيق أو لا تسمح مؤسستك بهذا الإجراء."</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"هل تريد تخطي الدليل التوجيهي؟"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"يمكنك العثور على هذا الدليل التوجيهي لاحقًا في التطبيق <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"إلغاء"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"التخطي"</string>
 </resources>
diff --git a/quickstep/res/values-as/strings.xml b/quickstep/res/values-as/strings.xml
index be08f08dda..c1a746fdf1 100644
--- a/quickstep/res/values-as/strings.xml
+++ b/quickstep/res/values-as/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"স্ক্ৰীনশ্বট"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"এপ্‌টোৱে অথবা আপোনাৰ প্ৰতিষ্ঠানে এই কাৰ্যটোৰ অনুমতি নিদিয়ে"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"নেভিগেশ্বনৰ টিউট’ৰিয়েল এৰিব বিচাৰে নেকি?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"আপুনি এয়া পাছত <xliff:g id="NAME">%1$s</xliff:g> এপ্‌টোত বিচাৰিব পাৰিব"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"বাতিল কৰক"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"এৰি যাওক"</string>
 </resources>
diff --git a/quickstep/res/values-az/strings.xml b/quickstep/res/values-az/strings.xml
index 2c15eb025a..bd88392075 100644
--- a/quickstep/res/values-az/strings.xml
+++ b/quickstep/res/values-az/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Ekran şəkli"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Bu əməliyyata tətbiq və ya təşkilatınız tərəfindən icazə verilmir"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Naviqasiya dərsliyi ötürülsün?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Bunu sonra <xliff:g id="NAME">%1$s</xliff:g> tətbiqində tapa bilərsiniz"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Ləğv edin"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Ötürün"</string>
 </resources>
diff --git a/quickstep/res/values-b+sr+Latn/strings.xml b/quickstep/res/values-b+sr+Latn/strings.xml
index 3d13a4db6e..21295fc31a 100644
--- a/quickstep/res/values-b+sr+Latn/strings.xml
+++ b/quickstep/res/values-b+sr+Latn/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Snimak ekrana"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikacija ili organizacija ne dozvoljavaju ovu radnju"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Želite da preskočite vodič za kretanje?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Možete da pronađete ovo kasnije u aplikaciji <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Otkaži"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Preskoči"</string>
 </resources>
diff --git a/quickstep/res/values-be/strings.xml b/quickstep/res/values-be/strings.xml
index 930a296016..d31468c2fd 100644
--- a/quickstep/res/values-be/strings.xml
+++ b/quickstep/res/values-be/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Здымак экрана"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Гэта дзеянне не дазволена праграмай ці вашай арганізацыяй"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Прапусціць дапаможнік па навігацыі?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Знайсці дапаможнік можна ў праграме \"<xliff:g id="NAME">%1$s</xliff:g>\""</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Скасаваць"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Прапусціць"</string>
 </resources>
diff --git a/quickstep/res/values-bg/strings.xml b/quickstep/res/values-bg/strings.xml
index 3e8deda6c2..d2554d5809 100644
--- a/quickstep/res/values-bg/strings.xml
+++ b/quickstep/res/values-bg/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Екранна снимка"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Това действие не е разрешено от приложението или организацията ви"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Пропускане на урока за навигиране?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Урокът е налице в приложението <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Отказ"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Пропускане"</string>
 </resources>
diff --git a/quickstep/res/values-bn/strings.xml b/quickstep/res/values-bn/strings.xml
index df706f93b9..48d26905c0 100644
--- a/quickstep/res/values-bn/strings.xml
+++ b/quickstep/res/values-bn/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"স্ক্রিনশট নিন"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"এই অ্যাপ বা আপনার প্রতিষ্ঠান এই অ্যাকশনটি পারফর্ম করার অনুমতি দেয়নি"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"নেভিগেশন টিউটোরিয়াল এড়িয়ে যেতে চান?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"আপনি <xliff:g id="NAME">%1$s</xliff:g> অ্যাপে পরে এটি খুঁজে পাবেন"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"বাতিল করুন"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"এড়িয়ে যান"</string>
 </resources>
diff --git a/quickstep/res/values-bs/strings.xml b/quickstep/res/values-bs/strings.xml
index 5a99a14581..18494a9c19 100644
--- a/quickstep/res/values-bs/strings.xml
+++ b/quickstep/res/values-bs/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Snimak ekrana"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Ovu radnju ne dozvoljava aplikacija ili vaša organizacija"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Preskočiti vodič za navigiranje?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"To možete pronaći kasnije u aplikaciji <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Otkaži"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Preskoči"</string>
 </resources>
diff --git a/quickstep/res/values-ca/strings.xml b/quickstep/res/values-ca/strings.xml
index f7006b018b..7c417effa0 100644
--- a/quickstep/res/values-ca/strings.xml
+++ b/quickstep/res/values-ca/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Captura de pantalla"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"L\'aplicació o la teva organització no permeten aquesta acció"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Vols ometre el tutorial de navegació?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Pots trobar-ho més tard a l\'aplicació <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancel·la"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Omet"</string>
 </resources>
diff --git a/quickstep/res/values-cs/strings.xml b/quickstep/res/values-cs/strings.xml
index 23515ffd10..9d1b94e9cd 100644
--- a/quickstep/res/values-cs/strings.xml
+++ b/quickstep/res/values-cs/strings.xml
@@ -30,7 +30,7 @@
     <string name="time_left_for_app" msgid="3111996412933644358">"dnes zbývá: <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="title_app_suggestions" msgid="4185902664111965088">"Návrhy aplikací"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Všechny aplikace"</string>
-    <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Vaše předpovídané aplikace"</string>
+    <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Návrhy aplikací pro vás"</string>
     <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Nechte si ve spodním řádku na ploše zobrazovat návrhy aplikací"</string>
     <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Nechte si na řádku oblíbených na ploše zobrazovat návrhy aplikací"</string>
     <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Mějte nejpoužívanější aplikace k dispozici přímo na ploše. Návrhy se budou měnit v závislosti na sledech činností. Aplikace ve spodním řádku se přesunou na vaši plochu."</string>
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Snímek obrazovky"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikace nebo organizace zakazuje tuto akci"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Přeskočit výukový program k navigaci?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Program později najdete v aplikaci <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Zrušit"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Přeskočit"</string>
 </resources>
diff --git a/quickstep/res/values-da/strings.xml b/quickstep/res/values-da/strings.xml
index 8d1166b302..42098dc036 100644
--- a/quickstep/res/values-da/strings.xml
+++ b/quickstep/res/values-da/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Appen eller din organisation tillader ikke denne handling"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Vil du springe selvstudiet for navigation over?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Du kan finde dette senere i appen <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Annuller"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Spring over"</string>
 </resources>
diff --git a/quickstep/res/values-de/strings.xml b/quickstep/res/values-de/strings.xml
index efee106a69..e7d9523c14 100644
--- a/quickstep/res/values-de/strings.xml
+++ b/quickstep/res/values-de/strings.xml
@@ -45,73 +45,40 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Funktion \"App-Vorschläge\" aktiviert"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Funktion \"App-Vorschläge\" deaktiviert"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Vorgeschlagene App: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
-    <skip />
-    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Wische vom äußersten linken Bildschirmrand."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Wische vom linken Bildschirmrand zur Bildschirmmitte und lass los."</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Gut gemacht. Versuch es jetzt mal vom rechten Rand aus."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Wische vom äußersten rechten Bildschirmrand."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Wische vom rechten Bildschirmrand zur Bildschirmmitte und lass los."</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Du hast die „Zurück“-Touch-Geste abgeschlossen. Nun lernst du, wie du zum Startbildschirm gelangst."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Wische nicht zu nah am unteren Bildschirmrand."</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Du kannst die Empfindlichkeit von „Zurück“ in den Einstellungen ändern"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Zum Zurückgehen wischen"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Wenn du zum letzten Bildschirm zurückgehen möchtest, wische vom linken oder rechten Rand zur Mitte."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Wische vom unteren Bildschirmrand nach oben."</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Achte darauf, nicht innezuhalten, bevor du loslässt."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Wische gerade nach oben."</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Du hast die „Startbildschirm“-Touch-Geste abgeschlossen. Als Nächstes lernst du, wie du zwischen Apps wechseln kannst."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Zum Startbildschirm gehen"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Wenn du zum Startbildschirm gehen möchtest, wische einfach vom unteren Bildschirmrand nach oben."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Wische vom unteren Bildschirmrand nach oben."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Versuche, das Fenster länger festzuhalten, bevor du es loslässt."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Wische gerade nach oben und halte dann inne."</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Du hast die „Apps wechseln“-Touch-Geste abgeschlossen. Nun bist du bereit, dein Smartphone zu verwenden!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Zwischen Apps wechseln"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Wische auf dem Bildschirm von unten nach oben, halte ihn gedrückt und lass ihn dann los."</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Fertig"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Weiter"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Fertig"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Einstellungen"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Wiederholen"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Sehr gut!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Anleitung <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="action_share" msgid="2648470652637092375">"Teilen"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Die App oder deine Organisation lässt diese Aktion nicht zu"</string>
-    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
-    <skip />
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
-    <skip />
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Navigationstutorial überspringen?"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Das findest du später in der <xliff:g id="NAME">%1$s</xliff:g> App"</string>
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Abbrechen"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Überspringen"</string>
 </resources>
diff --git a/quickstep/res/values-el/strings.xml b/quickstep/res/values-el/strings.xml
index baf1b87a13..21c29844f5 100644
--- a/quickstep/res/values-el/strings.xml
+++ b/quickstep/res/values-el/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Στιγμιότυπο οθόνης"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Αυτή η ενέργεια δεν επιτρέπεται από την εφαρμογή ή τον οργανισμό σας."</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Παράβλεψη οδηγού πλοήγησης;"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Βρείτε τον αργότερα στην εφαρμογή <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Ακύρωση"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Παράβλεψη"</string>
 </resources>
diff --git a/quickstep/res/values-es-rUS/strings.xml b/quickstep/res/values-es-rUS/strings.xml
index a4cf4bd201..478d1cdb1e 100644
--- a/quickstep/res/values-es-rUS/strings.xml
+++ b/quickstep/res/values-es-rUS/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Captura de pantalla"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"La app o tu organización no permiten realizar esta acción"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"¿Omitir el instructivo de navegación?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Puedes encontrarlo en la app de <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancelar"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Omitir"</string>
 </resources>
diff --git a/quickstep/res/values-es/strings.xml b/quickstep/res/values-es/strings.xml
index 4dd7f02d44..454bea7784 100644
--- a/quickstep/res/values-es/strings.xml
+++ b/quickstep/res/values-es/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Hacer captura"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"No puedes hacerlo porque la aplicación o tu organización no lo permiten"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"¿Saltar tutorial de navegación?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Puedes consultarlo en otro momento en la aplicación <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancelar"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Saltar"</string>
 </resources>
diff --git a/quickstep/res/values-et/strings.xml b/quickstep/res/values-et/strings.xml
index c0339b96f5..b7299345ab 100644
--- a/quickstep/res/values-et/strings.xml
+++ b/quickstep/res/values-et/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Ekraanipilt"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Rakendus või teie organisatsioon on selle toimingu keelanud"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Kas jätta navigeerimise õpetused vahele?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Leiate selle hiljem rakendusest <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Tühista"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Jäta vahele"</string>
 </resources>
diff --git a/quickstep/res/values-eu/strings.xml b/quickstep/res/values-eu/strings.xml
index 7671e778c2..f6d3f235c4 100644
--- a/quickstep/res/values-eu/strings.xml
+++ b/quickstep/res/values-eu/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Atera pantaila-argazki bat"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikazioak edo erakundeak ez du eman ekintza hori gauzatzeko baimena"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Nabigazio-tutoriala saltatu nahi duzu?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Tutorial hau <xliff:g id="NAME">%1$s</xliff:g> aplikazioan aurki dezakezu geroago"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Utzi"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Saltatu"</string>
 </resources>
diff --git a/quickstep/res/values-fa/strings.xml b/quickstep/res/values-fa/strings.xml
index 60e31c5a6f..8ca0f95ec9 100644
--- a/quickstep/res/values-fa/strings.xml
+++ b/quickstep/res/values-fa/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"نماگرفت"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"برنامه یا سازمان شما اجازه نمی‌دهد این کنش انجام شود."</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"آموزش گام‌به‌گام پیمایش رد شود؟"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"می‌توانید آن را بعداً در برنامه <xliff:g id="NAME">%1$s</xliff:g> پیدا کنید"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"لغو"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"رد شدن"</string>
 </resources>
diff --git a/quickstep/res/values-fi/strings.xml b/quickstep/res/values-fi/strings.xml
index 2f524b5d66..9ce7e6b4f2 100644
--- a/quickstep/res/values-fi/strings.xml
+++ b/quickstep/res/values-fi/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Kuvakaappaus"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Sovellus tai organisaatio ei salli tätä toimintoa"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Ohitetaanko navigointiohje?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Löydät tämän myöhemmin sovelluksesta: <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Peru"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Ohita"</string>
 </resources>
diff --git a/quickstep/res/values-fr-rCA/strings.xml b/quickstep/res/values-fr-rCA/strings.xml
index 1277366e5f..da738495c7 100644
--- a/quickstep/res/values-fr-rCA/strings.xml
+++ b/quickstep/res/values-fr-rCA/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Capture d\'écran"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"L\'application ou votre organisation n\'autorise pas cette action"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Ignorer le tutoriel sur la navigation?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Vous trouverez le tutoriel dans l\'application <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Annuler"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Ignorer"</string>
 </resources>
diff --git a/quickstep/res/values-fr/strings.xml b/quickstep/res/values-fr/strings.xml
index 5f9d6bb676..b6abea7bc9 100644
--- a/quickstep/res/values-fr/strings.xml
+++ b/quickstep/res/values-fr/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Capture d\'écran"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Cette action n\'est pas autorisée par l\'application ou par votre organisation"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Ignorer le tutoriel de navigation ?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Vous le retrouverez dans l\'appli <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Annuler"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Passer"</string>
 </resources>
diff --git a/quickstep/res/values-gl/strings.xml b/quickstep/res/values-gl/strings.xml
index b158f311d8..846f68a4c5 100644
--- a/quickstep/res/values-gl/strings.xml
+++ b/quickstep/res/values-gl/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Facer captura"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"A aplicación ou a túa organización non permite realizar esta acción"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Queres omitir o titorial de navegación?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Podes atopar isto máis tarde na aplicación <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancelar"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Omitir"</string>
 </resources>
diff --git a/quickstep/res/values-hi/strings.xml b/quickstep/res/values-hi/strings.xml
index 51b8c13e75..a7711fe10c 100644
--- a/quickstep/res/values-hi/strings.xml
+++ b/quickstep/res/values-hi/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"स्क्रीनशॉट"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ऐप्लिकेशन या आपका संगठन इस कार्रवाई की अनुमति नहीं देता"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"नेविगेशन ट्यूटोरियल छोड़ना चाहते हैं?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"आप बाद में, <xliff:g id="NAME">%1$s</xliff:g> ऐप्लिकेशन पर इसे देख सकते हैं"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"अभी नहीं"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"छोड़ें"</string>
 </resources>
diff --git a/quickstep/res/values-hr/strings.xml b/quickstep/res/values-hr/strings.xml
index 4b19eab254..d5e4b9dd93 100644
--- a/quickstep/res/values-hr/strings.xml
+++ b/quickstep/res/values-hr/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Snimka zaslona"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikacija ili vaša organizacija ne dopuštaju ovu radnju"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Želite li preskočiti vodič za kretanje?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Kasnije ga možete pronaći u aplikaciji <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Odustani"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Preskoči"</string>
 </resources>
diff --git a/quickstep/res/values-hu/strings.xml b/quickstep/res/values-hu/strings.xml
index 215023a86f..386ef3ee3f 100644
--- a/quickstep/res/values-hu/strings.xml
+++ b/quickstep/res/values-hu/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Képernyőkép"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Az alkalmazás vagy az Ön szervezete nem engedélyezi ezt a műveletet"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Kihagyja a navigáció bemutatóját?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Ezt később megtalálhatja a(z) <xliff:g id="NAME">%1$s</xliff:g> alkalmazásban"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Mégse"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Kihagyás"</string>
 </resources>
diff --git a/quickstep/res/values-in/strings.xml b/quickstep/res/values-in/strings.xml
index f9cf9ebd01..941bdb7dd0 100644
--- a/quickstep/res/values-in/strings.xml
+++ b/quickstep/res/values-in/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Tindakan ini tidak diizinkan oleh aplikasi atau organisasi Anda"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Lewati tutorial navigasi?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Anda dapat menemukan tutorial ini di lain waktu di aplikasi <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Batal"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Lewati"</string>
 </resources>
diff --git a/quickstep/res/values-is/strings.xml b/quickstep/res/values-is/strings.xml
index 4e8cce7d9d..6042b47e45 100644
--- a/quickstep/res/values-is/strings.xml
+++ b/quickstep/res/values-is/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Skjámynd"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Forritið eða fyrirtækið leyfir ekki þessa aðgerð"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Sleppa flettileiðsögn?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Þú getur fundið þetta síðar í forritinu <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Hætta við"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Sleppa"</string>
 </resources>
diff --git a/quickstep/res/values-it/strings.xml b/quickstep/res/values-it/strings.xml
index a2877ac2f2..6c81d1720e 100644
--- a/quickstep/res/values-it/strings.xml
+++ b/quickstep/res/values-it/strings.xml
@@ -30,7 +30,7 @@
     <string name="time_left_for_app" msgid="3111996412933644358">"Rimanente oggi: <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="title_app_suggestions" msgid="4185902664111965088">"App suggerite"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Tutte le app"</string>
-    <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Le app previste"</string>
+    <string name="all_apps_prediction_tip" msgid="2672336544844936186">"App previste per te"</string>
     <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Visualizza app suggerite nella riga inferiore della schermata Home"</string>
     <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Visualizza app suggerite nella riga dei Preferiti della schermata Home"</string>
     <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Accedi facilmente alle app più utilizzate direttamente dalla schermata Home. I suggerimenti varieranno in base alle tue routine. Le app nella riga inferiore verranno spostate più in alto sulla schermata Home."</string>
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Questa azione non è consentita dall\'app o dall\'organizzazione"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Saltare il tutorial di navigazione?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Puoi trovarlo in un secondo momento nell\'app <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Annulla"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Salta"</string>
 </resources>
diff --git a/quickstep/res/values-iw/strings.xml b/quickstep/res/values-iw/strings.xml
index 0532081654..b77faeb4fa 100644
--- a/quickstep/res/values-iw/strings.xml
+++ b/quickstep/res/values-iw/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"צילום מסך"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"האפליקציה או הארגון שלך אינם מתירים את הפעולה הזאת"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"לדלג על המדריך לניווט?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"ניתן למצוא את המדריך מאוחר יותר באפליקציה <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"ביטול"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"דילוג"</string>
 </resources>
diff --git a/quickstep/res/values-ja/strings.xml b/quickstep/res/values-ja/strings.xml
index 87dbb950c8..1cbdf7331c 100644
--- a/quickstep/res/values-ja/strings.xml
+++ b/quickstep/res/values-ja/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"スクリーンショット"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"この操作はアプリまたは組織で許可されていません"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"操作チュートリアルをスキップしますか？"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"これは後から <xliff:g id="NAME">%1$s</xliff:g> アプリで確認できます"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"キャンセル"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"スキップ"</string>
 </resources>
diff --git a/quickstep/res/values-ka/strings.xml b/quickstep/res/values-ka/strings.xml
index cdc70d6f88..5dd818d9ac 100644
--- a/quickstep/res/values-ka/strings.xml
+++ b/quickstep/res/values-ka/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"ეკრანის ანაბეჭდი"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ეს მოქმედება არ არის დაშვებული აპის ან თქვენი ორგანიზაციის მიერ"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"გსურთ, გამოტოვოთ ნავიგაციის სახელმძღვანელო?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"ამის მოგვიანებით პოვნა <xliff:g id="NAME">%1$s</xliff:g> აპში შეგიძლიათ"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"გაუქმება"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"გამოტოვება"</string>
 </resources>
diff --git a/quickstep/res/values-kk/strings.xml b/quickstep/res/values-kk/strings.xml
index bd84c93af1..554d10dc82 100644
--- a/quickstep/res/values-kk/strings.xml
+++ b/quickstep/res/values-kk/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Скриншот"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Бұл әрекетке қолданба не ұйым рұқсат етпейді."</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Қимылдар оқулығын өткізіп жіберу керек пе?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Мұны кейін <xliff:g id="NAME">%1$s</xliff:g> қолданбасынан таба аласыз."</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Бас тарту"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Өткізіп жіберу"</string>
 </resources>
diff --git a/quickstep/res/values-ko/strings.xml b/quickstep/res/values-ko/strings.xml
index 4138b0f5a0..fbbddd6699 100644
--- a/quickstep/res/values-ko/strings.xml
+++ b/quickstep/res/values-ko/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"스크린샷"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"이 작업은 앱 또는 조직에서 허용되지 않습니다."</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"이동 방법 튜토리얼을 건너뛰시겠습니까?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"이 튜토리얼은 <xliff:g id="NAME">%1$s</xliff:g> 앱에서 다시 볼 수 있습니다"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"취소"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"건너뛰기"</string>
 </resources>
diff --git a/quickstep/res/values-ky/strings.xml b/quickstep/res/values-ky/strings.xml
index 2ab089f117..bd50eed506 100644
--- a/quickstep/res/values-ky/strings.xml
+++ b/quickstep/res/values-ky/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Скриншот"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Бул аракетти аткарууга колдонмо же ишканаңыз тыюу салган"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Жаңсап өтүү үйрөткүчүн өт-рүп жибер-би?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Аны кийин <xliff:g id="NAME">%1$s</xliff:g> колдонмосунан табасыз"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Жокко чыгаруу"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Өтк-п жиберүү"</string>
 </resources>
diff --git a/quickstep/res/values-lt/strings.xml b/quickstep/res/values-lt/strings.xml
index 457db01962..2f1db5038a 100644
--- a/quickstep/res/values-lt/strings.xml
+++ b/quickstep/res/values-lt/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Ekrano kopija"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Jūsų organizacijoje arba naudojant šią programą neleidžiama atlikti šio veiksmo"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Praleisti naršymo mokymo programą?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Tai galėsite rasti vėliau programoje „<xliff:g id="NAME">%1$s</xliff:g>“"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Atšaukti"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Praleisti"</string>
 </resources>
diff --git a/quickstep/res/values-lv/strings.xml b/quickstep/res/values-lv/strings.xml
index 2a117be1eb..ce941bc3d9 100644
--- a/quickstep/res/values-lv/strings.xml
+++ b/quickstep/res/values-lv/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Veikt ekrānuzņēmumu"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Lietotne vai jūsu organizācija neatļauj veikt šo darbību."</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Vai izlaist navigācijas mācības?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Varēsiet to vēlāk atrast lietotnē <xliff:g id="NAME">%1$s</xliff:g>."</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Atcelt"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Izlaist"</string>
 </resources>
diff --git a/quickstep/res/values-mk/strings.xml b/quickstep/res/values-mk/strings.xml
index 120e63e066..f9fd8b3d06 100644
--- a/quickstep/res/values-mk/strings.xml
+++ b/quickstep/res/values-mk/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Слика од екранот"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Апликацијата или вашата организација не го дозволува дејствово"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Да се прескокне упатството за навигација?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Ова може да го најдете подоцна во апликацијата <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Откажи"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Прескокни"</string>
 </resources>
diff --git a/quickstep/res/values-ml/strings.xml b/quickstep/res/values-ml/strings.xml
index e8d7f4ca72..fc6bc82d01 100644
--- a/quickstep/res/values-ml/strings.xml
+++ b/quickstep/res/values-ml/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"സ്ക്രീൻഷോട്ട്"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ഈ നടപടി എടുക്കുന്നത് ആപ്പോ നിങ്ങളുടെ സ്ഥാപനമോ അനുവദിക്കുന്നില്ല"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"നാവിഗേഷൻ ട്യൂട്ടോറിയൽ ഒഴിവാക്കണോ?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"<xliff:g id="NAME">%1$s</xliff:g> ആപ്പിൽ നിങ്ങൾക്ക് ഇത് പിന്നീട് കാണാനാകും"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"റദ്ദാക്കുക"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"ഒഴിവാക്കുക"</string>
 </resources>
diff --git a/quickstep/res/values-mn/strings.xml b/quickstep/res/values-mn/strings.xml
index 86237e18aa..48513eb928 100644
--- a/quickstep/res/values-mn/strings.xml
+++ b/quickstep/res/values-mn/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Дэлгэцийн агшин дарах"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Энэ үйлдлийг апп эсвэл танай байгууллага зөвшөөрдөггүй"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Навигацын практик хичээлийг алгасах уу?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Та үүнийг дараа нь <xliff:g id="NAME">%1$s</xliff:g> аппаас олох боломжтой"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Цуцлах"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Алгасах"</string>
 </resources>
diff --git a/quickstep/res/values-ms/strings.xml b/quickstep/res/values-ms/strings.xml
index 6ec7a81ea9..74b9d086e8 100644
--- a/quickstep/res/values-ms/strings.xml
+++ b/quickstep/res/values-ms/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Tangkapan skrin"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Tindakan ini tidak dibenarkan oleh apl atau organisasi anda"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Langkau tutorial navigasi?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Anda boleh mendapatkan tutorial ini kemudian dalam apl <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Batal"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Langkau"</string>
 </resources>
diff --git a/quickstep/res/values-my/strings.xml b/quickstep/res/values-my/strings.xml
index d9c4cfbbd4..919ad6efa7 100644
--- a/quickstep/res/values-my/strings.xml
+++ b/quickstep/res/values-my/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"ဖန်သားပြင်ဓာတ်ပုံ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ဤလုပ်ဆောင်ချက်ကို အက်ပ် သို့မဟုတ် သင်၏အဖွဲ့အစည်းက ခွင့်မပြုပါ"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"လမ်းညွှန်ခြင်း ရှင်းလင်းပို့ချချက်ကို ကျော်မလား။"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"၎င်းကို နောက်မှ <xliff:g id="NAME">%1$s</xliff:g> အက်ပ်တွင် ရှာနိုင်သည်"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"မလုပ်တော့"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"ကျော်ရန်"</string>
 </resources>
diff --git a/quickstep/res/values-nb/strings.xml b/quickstep/res/values-nb/strings.xml
index 0b3117bfb8..6e7e4a3cf7 100644
--- a/quickstep/res/values-nb/strings.xml
+++ b/quickstep/res/values-nb/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Skjermdump"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Appen eller organisasjonen din tillater ikke denne handlingen"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Vil du hoppe over navigeringsveiledning?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Du kan finne dette i <xliff:g id="NAME">%1$s</xliff:g>-appen senere"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Avbryt"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Hopp over"</string>
 </resources>
diff --git a/quickstep/res/values-nl/strings.xml b/quickstep/res/values-nl/strings.xml
index ecf22eb484..be9329f000 100644
--- a/quickstep/res/values-nl/strings.xml
+++ b/quickstep/res/values-nl/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Deze actie wordt niet toegestaan door de app of je organisatie"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Navigatietutorial overslaan?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Je vindt dit later terug in de app <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Annuleren"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Overslaan"</string>
 </resources>
diff --git a/quickstep/res/values-pa/strings.xml b/quickstep/res/values-pa/strings.xml
index d9fad16a56..227c060230 100644
--- a/quickstep/res/values-pa/strings.xml
+++ b/quickstep/res/values-pa/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"ਸਕ੍ਰੀਨਸ਼ਾਟ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ਐਪ ਜਾਂ ਤੁਹਾਡੀ ਸੰਸਥਾ ਵੱਲੋਂ ਇਸ ਕਾਰਵਾਈ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"ਕੀ ਨੈਵੀਗੇਸ਼ਨ ਟਿਊਟੋਰੀਅਲ ਨੂੰ ਛੱਡਣਾ ਹੈ?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"ਤੁਸੀਂ ਇਸਨੂੰ ਬਾਅਦ ਵਿੱਚ <xliff:g id="NAME">%1$s</xliff:g> ਐਪ ਵਿੱਚ ਲੱਭ ਸਕਦੇ ਹੋ"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"ਰੱਦ ਕਰੋ"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"ਛੱਡੋ"</string>
 </resources>
diff --git a/quickstep/res/values-pl/strings.xml b/quickstep/res/values-pl/strings.xml
index 0df44efc39..61d9b9377a 100644
--- a/quickstep/res/values-pl/strings.xml
+++ b/quickstep/res/values-pl/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Zrzut ekranu"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Nie możesz wykonać tego działania, bo nie zezwala na to aplikacja lub Twoja organizacja"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Pominąć samouczek nawigacji?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Znajdziesz to później w aplikacji <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Anuluj"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Pomiń"</string>
 </resources>
diff --git a/quickstep/res/values-pt-rPT/strings.xml b/quickstep/res/values-pt-rPT/strings.xml
index 390596c06f..bbc4ce8811 100644
--- a/quickstep/res/values-pt-rPT/strings.xml
+++ b/quickstep/res/values-pt-rPT/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Fazer captura de ecrã"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Esta ação não é permitida pela app ou a sua entidade."</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Ignorar o tutorial de navegação?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Pode encontrar isto mais tarde na app <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancelar"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Ignorar"</string>
 </resources>
diff --git a/quickstep/res/values-pt/strings.xml b/quickstep/res/values-pt/strings.xml
index 1252e60de8..f533bbcbc3 100644
--- a/quickstep/res/values-pt/strings.xml
+++ b/quickstep/res/values-pt/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Capturar tela"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Essa ação não é permitida pelo app ou pela organização"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Pular o tutorial de navegação?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Veja o tutorial mais tarde no app <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancelar"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Pular"</string>
 </resources>
diff --git a/quickstep/res/values-ro/strings.xml b/quickstep/res/values-ro/strings.xml
index 556acb5a9f..37d2935683 100644
--- a/quickstep/res/values-ro/strings.xml
+++ b/quickstep/res/values-ro/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Captură de ecran"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Această acțiune nu este permisă de aplicație sau de organizația dvs."</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Omiteți tutorialul de navigare?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Îl puteți găsi mai târziu în aplicația <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Anulați"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Omiteți"</string>
 </resources>
diff --git a/quickstep/res/values-ru/strings.xml b/quickstep/res/values-ru/strings.xml
index 3039a9a60b..8d4c40a210 100644
--- a/quickstep/res/values-ru/strings.xml
+++ b/quickstep/res/values-ru/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Скриншот"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Это действие заблокировано приложением или организацией."</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Пропустить руководство по жестам?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Его можно найти в приложении \"<xliff:g id="NAME">%1$s</xliff:g>\"."</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Отмена"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Пропустить"</string>
 </resources>
diff --git a/quickstep/res/values-si/strings.xml b/quickstep/res/values-si/strings.xml
index 8ffb580a4e..d526e139ee 100644
--- a/quickstep/res/values-si/strings.xml
+++ b/quickstep/res/values-si/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"තිර රුව"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"මෙම ක්‍රියාව යෙදුම හෝ ඔබේ සංවිධානය මගින් ඉඩ නොදේ"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"නිබන්ධනය සංචාලනය මඟ හරින්නද?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"ඔබට මෙය පසුව <xliff:g id="NAME">%1$s</xliff:g> යෙදුම තුළ සොයා ගත හැකිය"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"අවලංගු කරන්න"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"මඟ හරින්න"</string>
 </resources>
diff --git a/quickstep/res/values-sk/strings.xml b/quickstep/res/values-sk/strings.xml
index 86d0a8e296..24a4ac974f 100644
--- a/quickstep/res/values-sk/strings.xml
+++ b/quickstep/res/values-sk/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Snímka obrazovky"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikácia alebo vaša organizácia túto akciu nepovoľuje"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Chcete preskočiť návod na navigáciu?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Tento návod nájdete v aplikácii <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Zrušiť"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Preskočiť"</string>
 </resources>
diff --git a/quickstep/res/values-sl/strings.xml b/quickstep/res/values-sl/strings.xml
index 0d1f015ef2..fdc8a6a4b4 100644
--- a/quickstep/res/values-sl/strings.xml
+++ b/quickstep/res/values-sl/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Posnetek zaslona"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikacija ali vaša organizacija ne dovoljuje tega dejanja"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Želite preskočiti vadnico za krmarjenje?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"To lahko pozneje najdete v aplikaciji <xliff:g id="NAME">%1$s</xliff:g>."</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Prekliči"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Preskoči"</string>
 </resources>
diff --git a/quickstep/res/values-sq/strings.xml b/quickstep/res/values-sq/strings.xml
index b50976fedc..36e0afc371 100644
--- a/quickstep/res/values-sq/strings.xml
+++ b/quickstep/res/values-sq/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Pamja e ekranit"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Ky veprim nuk lejohet nga aplikacioni ose organizata jote"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Të kapërcehet udhëzuesi i navigimit?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Këtë mund ta gjesh më vonë tek aplikacioni <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Anulo"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Kapërce"</string>
 </resources>
diff --git a/quickstep/res/values-sr/strings.xml b/quickstep/res/values-sr/strings.xml
index c940c15646..8a462f982d 100644
--- a/quickstep/res/values-sr/strings.xml
+++ b/quickstep/res/values-sr/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Снимак екрана"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Апликација или организација не дозвољавају ову радњу"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Желите да прескочите водич за кретање?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Можете да пронађете ово касније у апликацији <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Откажи"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Прескочи"</string>
 </resources>
diff --git a/quickstep/res/values-sv/strings.xml b/quickstep/res/values-sv/strings.xml
index b72f10294e..bf6985030c 100644
--- a/quickstep/res/values-sv/strings.xml
+++ b/quickstep/res/values-sv/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Skärmbild"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Appen eller organisationen tillåter inte den här åtgärden"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Vill du hoppa över självstudierna?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Du kan hitta det här igen i <xliff:g id="NAME">%1$s</xliff:g>-appen"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Avbryt"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Hoppa över"</string>
 </resources>
diff --git a/quickstep/res/values-ta/strings.xml b/quickstep/res/values-ta/strings.xml
index 1f25cc930c..089c95de7b 100644
--- a/quickstep/res/values-ta/strings.xml
+++ b/quickstep/res/values-ta/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"ஸ்கிரீன்ஷாட்"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ஆப்ஸோ உங்கள் நிறுவனமோ இந்த செயலை அனுமதிப்பதில்லை"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"வழிகாட்டுதல் பயிற்சியைத் தவிர்க்கவா?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"<xliff:g id="NAME">%1$s</xliff:g> ஆப்ஸில் பிறகு இதைக் கண்டறியலாம்"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"ரத்துசெய்"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"தவிர்"</string>
 </resources>
diff --git a/quickstep/res/values-th/strings.xml b/quickstep/res/values-th/strings.xml
index 8ca076f57e..d7061089f2 100644
--- a/quickstep/res/values-th/strings.xml
+++ b/quickstep/res/values-th/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"ภาพหน้าจอ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"แอปหรือองค์กรของคุณไม่อนุญาตการดำเนินการนี้"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"ข้ามบทแนะนำการนำทางไหม"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"คุณดูบทแนะนำนี้ได้ภายหลังในแอป <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"ยกเลิก"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"ข้าม"</string>
 </resources>
diff --git a/quickstep/res/values-tl/strings.xml b/quickstep/res/values-tl/strings.xml
index be9dc95338..5056481ccf 100644
--- a/quickstep/res/values-tl/strings.xml
+++ b/quickstep/res/values-tl/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Hindi pinapayagan ng app o ng iyong organisasyon ang pagkilos na ito"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Laktawan ang tutorial sa pag-navigate?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Makikita mo ito sa <xliff:g id="NAME">%1$s</xliff:g> app sa ibang pagkakataon"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Kanselahin"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Laktawan"</string>
 </resources>
diff --git a/quickstep/res/values-tr/strings.xml b/quickstep/res/values-tr/strings.xml
index 7df01363a8..a22247b2de 100644
--- a/quickstep/res/values-tr/strings.xml
+++ b/quickstep/res/values-tr/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Ekran görüntüsü"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Uygulamanız veya kuruluşunuz bu işleme izin vermiyor"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Gezinme eğitici içeriği atlansın mı?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Bunu daha sonra <xliff:g id="NAME">%1$s</xliff:g> uygulamasında bulabilirsiniz"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"İptal"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Atla"</string>
 </resources>
diff --git a/quickstep/res/values-uk/strings.xml b/quickstep/res/values-uk/strings.xml
index 6c11d95179..c63cec4c0a 100644
--- a/quickstep/res/values-uk/strings.xml
+++ b/quickstep/res/values-uk/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Знімок екрана"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Ця дія заборонена додатком або адміністратором організації"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Пропустити посібник із навігації?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Ви знайдете його пізніше в додатку <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Скасувати"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Пропустити"</string>
 </resources>
diff --git a/quickstep/res/values-vi/strings.xml b/quickstep/res/values-vi/strings.xml
index 215125c6a6..fc3ef3ffff 100644
--- a/quickstep/res/values-vi/strings.xml
+++ b/quickstep/res/values-vi/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Chụp ảnh màn hình"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Ứng dụng hoặc tổ chức của bạn không cho phép thực hiện hành động này"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Bỏ qua phần hướng dẫn thao tác?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Bạn có thể tìm lại phần hướng dẫn này trong ứng dụng <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Hủy"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Bỏ qua"</string>
 </resources>
diff --git a/quickstep/res/values-zh-rCN/strings.xml b/quickstep/res/values-zh-rCN/strings.xml
index 22d8393e32..9d39100128 100644
--- a/quickstep/res/values-zh-rCN/strings.xml
+++ b/quickstep/res/values-zh-rCN/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"屏幕截图"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"该应用或您所在的单位不允许执行此操作"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"要跳过导航教程吗？"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"您之后可以在“<xliff:g id="NAME">%1$s</xliff:g>”应用中找到此教程"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"取消"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"跳过"</string>
 </resources>
diff --git a/quickstep/res/values-zh-rHK/strings.xml b/quickstep/res/values-zh-rHK/strings.xml
index b6efec28ef..5522a67f05 100644
--- a/quickstep/res/values-zh-rHK/strings.xml
+++ b/quickstep/res/values-zh-rHK/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"螢幕截圖"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"應用程式或您的機構不允許此操作"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"要略過手勢操作教學課程嗎？"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"您之後可以在「<xliff:g id="NAME">%1$s</xliff:g>」應用程式找到這些說明"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"取消"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"略過"</string>
 </resources>
diff --git a/quickstep/res/values-zh-rTW/strings.xml b/quickstep/res/values-zh-rTW/strings.xml
index 410e70a67d..20af2b4f88 100644
--- a/quickstep/res/values-zh-rTW/strings.xml
+++ b/quickstep/res/values-zh-rTW/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"擷取螢幕畫面"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"這個應用程式或貴機構不允許執行這個動作"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"要略過手勢操作教學課程嗎？"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"你之後可以在「<xliff:g id="NAME">%1$s</xliff:g>」應用程式找到這些說明"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"取消"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"略過"</string>
 </resources>
diff --git a/quickstep/res/values-zu/strings.xml b/quickstep/res/values-zu/strings.xml
index 4df1a45220..a118f1d773 100644
--- a/quickstep/res/values-zu/strings.xml
+++ b/quickstep/res/values-zu/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Isithombe-skrini"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Lesi senzo asivunyelwanga uhlelo lokusebenza noma inhlangano yakho"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Yeqa isifundo sokuzulazula?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Lokhu ungakuthola kamuva ku-app ye-<xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Khansela"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Yeqa"</string>
 </resources>
-- 
GitLab


From 5a3b0497c8037868345b0b80ef17915d8b6f746e Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Tue, 20 Apr 2021 15:56:18 +0000
Subject: [PATCH 0931/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Ifdb448fe337ff8ebb0ec85928563e18d09603bb5
---
 res/values-cs/strings.xml |  2 +-
 res/values-de/strings.xml | 78 ++++++++++++++++-----------------------
 res/values-es/strings.xml |  2 +-
 res/values-fr/strings.xml |  4 +-
 res/values-hi/strings.xml |  2 +-
 res/values-hr/strings.xml |  2 +-
 res/values-it/strings.xml |  4 +-
 res/values-iw/strings.xml | 58 ++++++++++++++---------------
 res/values-ky/strings.xml |  6 +--
 res/values-mr/strings.xml |  2 +-
 res/values-my/strings.xml |  8 ++--
 11 files changed, 76 insertions(+), 92 deletions(-)

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index a742f2f44d..a7f99087a2 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -116,7 +116,7 @@
     <string name="title_change_settings" msgid="1376365968844349552">"Změnit nastavení"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Zobrazovat puntíky s oznámením"</string>
     <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Přidat na plochu ikony aplikací"</string>
-    <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Pro nové aplikace"</string>
+    <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"U nových aplikací"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Neznámé"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Odstranit"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Hledat"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 63e5192067..77ddc86a8d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -26,47 +26,39 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Heruntergeladene App im abgesicherten Modus deaktiviert"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"Widgets im abgesicherten Modus deaktiviert"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Verknüpfung nicht verfügbar"</string>
-    <!-- no translation found for home_screen (5629429142036709174) -->
-    <skip />
-    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
-    <skip />
-    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
-    <skip />
+    <string name="home_screen" msgid="5629429142036709174">"Startbildschirm"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Splitscreen"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Tippen und halten, um ein Widget zu bewegen."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Doppeltippen und halten, um ein Widget zu bewegen oder benutzerdefinierte Aktionen zu nutzen."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d breit und %2$d hoch"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Zum manuellen Hinzufügen gedrückt halten"</string>
     <string name="place_automatically" msgid="8064208734425456485">"Automatisch hinzufügen"</string>
-    <!-- no translation found for widgets_count (656794749266073027) -->
-    <!-- no translation found for shortcuts_count (8080294865447938455) -->
-    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
-    <skip />
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> Widgets</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> Widget</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> Verknüpfungen</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> Verknüpfung</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
-    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
-    <skip />
-    <!-- no translation found for no_widgets_available (9140948620298620513) -->
-    <skip />
-    <!-- no translation found for no_search_results (6518732304311458580) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
-    <skip />
-    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
-    <skip />
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Suche"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Text aus dem Suchfeld löschen"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"Keine Widgets verfügbar"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"Keine Suchergebnisse"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Privat"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Geschäftlich"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Unterhaltungen"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Apps finden"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Apps werden geladen…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Keine Apps für \"<xliff:g id="QUERY">%1$s</xliff:g>\" gefunden"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Weitere Apps suchen"</string>
     <string name="label_application" msgid="8531721983832654978">"App"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Benachrichtigungen"</string>
-    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
-    <skip />
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Tippen und halten, um eine Verknüpfung zu bewegen."</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Doppeltippen und halten, um eine Verknüpfung zu bewegen oder benutzerdefinierte Aktionen zu nutzen."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Auf diesem Startbildschirm ist kein Platz mehr vorhanden."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Ablage \"Favoriten\" ist voll."</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Liste der Apps"</string>
@@ -108,7 +100,7 @@
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Designs und Hintergründe"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Startbildschirm-Einstellungen"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Von deinem Administrator deaktiviert"</string>
-    <string name="allow_rotation_title" msgid="7728578836261442095">"Drehung des Startbildschirms zulassen"</string>
+    <string name="allow_rotation_title" msgid="7728578836261442095">"Drehen des Startbildschirms zulassen"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"Beim Drehen des Smartphones"</string>
     <string name="notification_dots_title" msgid="9062440428204120317">"App-Benachrichtigungspunkte"</string>
     <string name="notification_dots_desc_on" msgid="1679848116452218908">"An"</string>
@@ -124,8 +116,7 @@
     <string name="abandoned_search" msgid="891119232568284442">"Suchen"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"Diese App ist nicht installiert"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Die App für dieses Symbol ist nicht installiert. Du kannst das Symbol entfernen oder die App lokalisieren und dann manuell installieren."</string>
-    <!-- no translation found for app_installing_title (5864044122733792085) -->
-    <skip />
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> wird installiert, <xliff:g id="PROGRESS">%2$s</xliff:g> abgeschlossen"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> wird heruntergeladen, <xliff:g id="PROGRESS">%2$s</xliff:g> abgeschlossen"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"Warten auf Installation von <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"Widgetliste"</string>
@@ -165,20 +156,13 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"Weiter"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"Arbeitsprofil pausiert"</string>
-    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
-    <skip />
-    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
-    <skip />
-    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
-    <skip />
-    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
-    <skip />
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Geschäftliche Apps können dir keine Benachrichtigungen senden, deinen Akku nicht nutzen und nicht auf deinen Standort zugreifen"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Das Arbeitsprofil ist pausiert. Geschäftliche Apps können dir keine Benachrichtigungen senden, deinen Akku nicht nutzen und nicht auf deinen Standort zugreifen."</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Geschäftliche Apps sind gekennzeichnet und für deinen IT-Administrator sichtbar"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Geschäftliche Apps pausieren"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Aktivieren"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filter"</string>
     <string name="work_switch_tip" msgid="808075064383839144">"Geschäftliche Apps und Benachrichtigungen pausieren"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Fehler: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 3cd084bc8d..8b9ab0cb5c 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -110,7 +110,7 @@
     <string name="title_change_settings" msgid="1376365968844349552">"Cambiar ajustes"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Mostrar puntos de notificación"</string>
     <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Añadir aplicaciones a la pantalla de inicio"</string>
-    <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Para aplicaciones nuevas"</string>
+    <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Añade el icono de una aplicación nueva instalada a la pantalla de inicio"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Desconocido"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Quitar"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Buscar"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index fe12e37e94..f336031a31 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -20,7 +20,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="work_folder_name" msgid="3753320833950115786">"Travail"</string>
+    <string name="work_folder_name" msgid="3753320833950115786">"Pro"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"L\'application n\'est pas installée."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Application indisponible"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"L\'application téléchargée est désactivée en mode sécurisé."</string>
@@ -98,7 +98,7 @@
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Dossier : <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> éléments ou plus"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fonds d\'écran"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Styles et fonds d\'écran"</string>
-    <string name="settings_button_text" msgid="8873672322605444408">"Paramètres d\'accueil"</string>
+    <string name="settings_button_text" msgid="8873672322605444408">"Paramètres de l\'accueil"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Désactivé par votre administrateur"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Autoriser la rotation de l\'écran d\'accueil"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"Lorsque vous faites pivoter le téléphone"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 1bdbbcb74e..478d87ea35 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -124,7 +124,7 @@
     <string name="action_add_to_workspace" msgid="8902165848117513641">"होम स्‍क्रीन में जोड़ें"</string>
     <string name="action_move_here" msgid="2170188780612570250">"आइटम यहां ले जाएं"</string>
     <string name="item_added_to_workspace" msgid="4211073925752213539">"होम स्क्रीन में आइटम जोड़ा गया"</string>
-    <string name="item_removed" msgid="851119963877842327">"आइटम निकाला गया"</string>
+    <string name="item_removed" msgid="851119963877842327">"आइटम हटाया गया"</string>
     <string name="undo" msgid="4151576204245173321">"पहले जैसा करें"</string>
     <string name="action_move" msgid="4339390619886385032">"आइटम ले जाएं"</string>
     <string name="move_to_empty_cell" msgid="2833711483015685619">"पंक्ति <xliff:g id="NUMBER_0">%1$s</xliff:g> स्तंभ <xliff:g id="NUMBER_1">%2$s</xliff:g> पर ले जाएं"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 7589ea87bb..8ebc33ff47 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -68,7 +68,7 @@
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Popis radnih aplikacija"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Ukloni"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Deinstaliraj"</string>
-    <string name="app_info_drop_target_label" msgid="692894985365717661">"Info o aplikaciji"</string>
+    <string name="app_info_drop_target_label" msgid="692894985365717661">"Podaci o aplikaciji"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Instaliraj"</string>
     <string name="dismiss_prediction_label" msgid="3357562989568808658">"Ne predlaži aplikaciju"</string>
     <string name="pin_prediction" msgid="4196423321649756498">"Prikvači predviđenu apl."</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 7857feff3e..9e135763ae 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -98,7 +98,7 @@
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Cartella: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> o più elementi"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Sfondi"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stili e sfondi"</string>
-    <string name="settings_button_text" msgid="8873672322605444408">"Impostazioni Home"</string>
+    <string name="settings_button_text" msgid="8873672322605444408">"Impostazioni schermata Home"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Disattivata dall\'amministratore"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Consenti rotazione della schermata Home"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"Con il telefono ruotato"</string>
@@ -109,7 +109,7 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Per mostrare gli indicatori di notifica, attiva le notifiche per l\'app <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Modifica impostazioni"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Mostra indicatori di notifica"</string>
-    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Aggiungi icone app a schermata Home"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Aggiungi icone delle app alla schermata Home"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Per le nuove app"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Sconosciuto"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Rimuovi"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 9636353be6..639aa86c3a 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -56,9 +56,9 @@
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"עבודה"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"שיחות"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"חיפוש אפליקציות"</string>
-    <string name="all_apps_loading_message" msgid="5813968043155271636">"טוען אפליקציות…"</string>
+    <string name="all_apps_loading_message" msgid="5813968043155271636">"טעינת אפליקציות מתבצעת…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"לא נמצאו אפליקציות התואמות ל-\"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
-    <string name="all_apps_search_market_message" msgid="1366263386197059176">"חפש אפליקציות נוספות"</string>
+    <string name="all_apps_search_market_message" msgid="1366263386197059176">"חיפוש אפליקציות נוספות"</string>
     <string name="label_application" msgid="8531721983832654978">"אפליקציה"</string>
     <string name="notifications_header" msgid="1404149926117359025">"התראות"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"כדי להעביר קיצור דרך למקום אחר יש לגעת ולא להרפות."</string>
@@ -68,17 +68,17 @@
     <string name="all_apps_button_label" msgid="8130441508702294465">"רשימת אפליקציות"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"רשימת אפליקציות אישיות"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"רשימת אפליקציות עבודה"</string>
-    <string name="remove_drop_target_label" msgid="7812859488053230776">"הסר"</string>
+    <string name="remove_drop_target_label" msgid="7812859488053230776">"הסרה"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"להסרת התקנה"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"פרטי אפליקציה"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"התקנה"</string>
     <string name="dismiss_prediction_label" msgid="3357562989568808658">"בלי להציע את האפליקציה"</string>
     <string name="pin_prediction" msgid="4196423321649756498">"הצמדת החיזוי"</string>
-    <string name="permlab_install_shortcut" msgid="5632423390354674437">"התקן קיצורי דרך"</string>
+    <string name="permlab_install_shortcut" msgid="5632423390354674437">"התקנת קיצורי דרך"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"מאפשר לאפליקציה להוסיף קיצורי דרך ללא התערבות המשתמש."</string>
-    <string name="permlab_read_settings" msgid="1941457408239617576">"קרא הגדרות וקיצורי דרך של דף הבית"</string>
+    <string name="permlab_read_settings" msgid="1941457408239617576">"קריאת הגדרות וקיצורי דרך של דף הבית"</string>
     <string name="permdesc_read_settings" msgid="5833423719057558387">"מאפשר לאפליקציה לקרוא את ההגדרות וקיצורי הדרך בדף הבית."</string>
-    <string name="permlab_write_settings" msgid="3574213698004620587">"כתוב הגדרות וקיצורי דרך של דף הבית"</string>
+    <string name="permlab_write_settings" msgid="3574213698004620587">"כתיבת הגדרות וקיצורי דרך של דף הבית"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"מאפשר לאפליקציה לשנות את ההגדרות וקיצורי הדרך בדף הבית."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> אינו רשאי להתקשר"</string>
     <string name="gadget_error_text" msgid="6081085226050792095">"בעיה בטעינת ווידג\'ט"</string>
@@ -95,59 +95,59 @@
     <string name="default_scroll_format" msgid="7475544710230993317">"‏דף %1$d מתוך %2$d"</string>
     <string name="workspace_scroll_format" msgid="8458889198184077399">"‏מסך דף הבית %1$d מתוך %2$d"</string>
     <string name="workspace_new_page" msgid="257366611030256142">"מסך דף הבית חדש"</string>
-    <string name="folder_opened" msgid="94695026776264709">"תיקיה פתוחה, <xliff:g id="WIDTH">%1$d</xliff:g> על <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
-    <string name="folder_tap_to_close" msgid="4625795376335528256">"הקש כדי לסגור את התיקייה"</string>
-    <string name="folder_tap_to_rename" msgid="4017685068016979677">"הקש כדי לשמור שינוי שם"</string>
-    <string name="folder_closed" msgid="4100806530910930934">"התיקיה נסגרה"</string>
-    <string name="folder_renamed" msgid="1794088362165669656">"שם התיקיה שונה ל-<xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="folder_opened" msgid="94695026776264709">"תיקייה פתוחה, <xliff:g id="WIDTH">%1$d</xliff:g> על <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
+    <string name="folder_tap_to_close" msgid="4625795376335528256">"יש להקיש כדי לסגור את התיקייה"</string>
+    <string name="folder_tap_to_rename" msgid="4017685068016979677">"יש להקיש כדי לשמור שינוי שם"</string>
+    <string name="folder_closed" msgid="4100806530910930934">"התיקייה נסגרה"</string>
+    <string name="folder_renamed" msgid="1794088362165669656">"שם התיקייה שונה ל-<xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="folder_name_format_exact" msgid="8626242716117004803">"תיקייה: <xliff:g id="NAME">%1$s</xliff:g>, מספר הפריטים: <xliff:g id="SIZE">%2$d</xliff:g>"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"תיקייה: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> פריטים או יותר"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"טפטים"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"סגנונות וטפטים"</string>
-    <string name="settings_button_text" msgid="8873672322605444408">"הגדרות דף הבית"</string>
+    <string name="settings_button_text" msgid="8873672322605444408">"הגדרות של מסך הבית"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"הושבת על ידי מנהל המערכת שלך"</string>
-    <string name="allow_rotation_title" msgid="7728578836261442095">"אפשרות סיבוב של מסך דף הבית"</string>
+    <string name="allow_rotation_title" msgid="7728578836261442095">"סיבוב של מסך הבית"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"כאשר הטלפון מסובב"</string>
     <string name="notification_dots_title" msgid="9062440428204120317">"סימני ההתראות"</string>
     <string name="notification_dots_desc_on" msgid="1679848116452218908">"מופעל"</string>
     <string name="notification_dots_desc_off" msgid="1760796511504341095">"כבוי"</string>
     <string name="title_missing_notification_access" msgid="7503287056163941064">"נדרשת גישה להתראות"</string>
     <string name="msg_missing_notification_access" msgid="281113995110910548">"כדי להציג את סימני ההתראות,יש להפעיל התראות מהאפליקציה <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="title_change_settings" msgid="1376365968844349552">"שנה את ההגדרות"</string>
+    <string name="title_change_settings" msgid="1376365968844349552">"שינוי ההגדרות"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"הצגת סימני ההתראות"</string>
     <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"הוספת סמלי אפליקציות למסך הבית"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"לאפליקציות חדשות"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"לא ידוע"</string>
-    <string name="abandoned_clean_this" msgid="7610119707847920412">"הסר"</string>
+    <string name="abandoned_clean_this" msgid="7610119707847920412">"הסרה"</string>
     <string name="abandoned_search" msgid="891119232568284442">"חיפוש"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"אפליקציה זו אינה מותקנת"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"האפליקציה של סמל זה אינה מותקנת. ניתן להסיר אותו, או לחפש את האפליקציה ולהתקין אותה ידנית."</string>
     <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> בתהליך התקנה, <xliff:g id="PROGRESS">%2$s</xliff:g> הושלמו"</string>
-    <string name="app_downloading_title" msgid="8336702962104482644">"מוריד את <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="PROGRESS">%2$s</xliff:g> הושלמו"</string>
+    <string name="app_downloading_title" msgid="8336702962104482644">"הורדת <xliff:g id="NAME">%1$s</xliff:g> מתבצעת, <xliff:g id="PROGRESS">%2$s</xliff:g> הושלמו"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"מחכה להתקנה של <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="widgets_list" msgid="796804551140113767">"רשימת ווידג\'טים"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"רשימת הווידג\'טים נסגרה"</string>
     <string name="action_add_to_workspace" msgid="8902165848117513641">"הוספה למסך דף הבית"</string>
-    <string name="action_move_here" msgid="2170188780612570250">"העבר את הפריט לכאן"</string>
+    <string name="action_move_here" msgid="2170188780612570250">"העברת הפריט לכאן"</string>
     <string name="item_added_to_workspace" msgid="4211073925752213539">"הפריט הועבר אל מסך דף הבית"</string>
     <string name="item_removed" msgid="851119963877842327">"הפריט הוסר"</string>
     <string name="undo" msgid="4151576204245173321">"ביטול"</string>
-    <string name="action_move" msgid="4339390619886385032">"העבר את הפריט"</string>
-    <string name="move_to_empty_cell" msgid="2833711483015685619">"העבר אל שורה <xliff:g id="NUMBER_0">%1$s</xliff:g> עמודה <xliff:g id="NUMBER_1">%2$s</xliff:g>"</string>
-    <string name="move_to_position" msgid="6750008980455459790">"העבר אל מיקום <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="move_to_hotseat_position" msgid="6295412897075147808">"העבר אל מיקום <xliff:g id="NUMBER">%1$s</xliff:g> במועדפים"</string>
+    <string name="action_move" msgid="4339390619886385032">"העברת הפריט"</string>
+    <string name="move_to_empty_cell" msgid="2833711483015685619">"העברה אל שורה <xliff:g id="NUMBER_0">%1$s</xliff:g> עמודה <xliff:g id="NUMBER_1">%2$s</xliff:g>"</string>
+    <string name="move_to_position" msgid="6750008980455459790">"העברה אל מיקום <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <string name="move_to_hotseat_position" msgid="6295412897075147808">"העברה אל מיקום <xliff:g id="NUMBER">%1$s</xliff:g> במועדפים"</string>
     <string name="item_moved" msgid="4606538322571412879">"הפריט הועבר"</string>
-    <string name="add_to_folder" msgid="9040534766770853243">"הוסף לתיקייה: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="add_to_folder_with_app" msgid="4534929978967147231">"העבר אל התיקייה עם <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="add_to_folder" msgid="9040534766770853243">"הוספה לתיקייה: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="add_to_folder_with_app" msgid="4534929978967147231">"הוספה לתיקייה עם <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="added_to_folder" msgid="4793259502305558003">"הפריט נוסף לתיקייה"</string>
-    <string name="create_folder_with" msgid="4050141361160214248">"צור תיקייה עם: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="create_folder_with" msgid="4050141361160214248">"יצירת תיקייה עם: <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="folder_created" msgid="6409794597405184510">"התיקייה נוצרה"</string>
     <string name="action_move_to_workspace" msgid="1603837886334246317">"העבר אל מסך דף הבית"</string>
-    <string name="action_resize" msgid="1802976324781771067">"שנה גודל"</string>
-    <string name="action_increase_width" msgid="8773715375078513326">"הגדל רוחב"</string>
-    <string name="action_increase_height" msgid="459390020612501122">"הגדל גובה"</string>
-    <string name="action_decrease_width" msgid="1374549771083094654">"הקטן רוחב"</string>
-    <string name="action_decrease_height" msgid="282377193880900022">"הקטן גובה"</string>
+    <string name="action_resize" msgid="1802976324781771067">"שינוי גודל"</string>
+    <string name="action_increase_width" msgid="8773715375078513326">"הגדלת רוחב"</string>
+    <string name="action_increase_height" msgid="459390020612501122">"הגדלת גובה"</string>
+    <string name="action_decrease_width" msgid="1374549771083094654">"הקטנת רוחב"</string>
+    <string name="action_decrease_height" msgid="282377193880900022">"הקטנת גובה"</string>
     <string name="widget_resized" msgid="9130327887929620">"גודל הווידג\'ט שונה - רוחב <xliff:g id="NUMBER_0">%1$s</xliff:g> גובה <xliff:g id="NUMBER_1">%2$s</xliff:g>"</string>
     <string name="action_deep_shortcut" msgid="2864038805849372848">"קיצורי דרך"</string>
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"קיצורי דרך והתראות"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 7606ca10e2..50c36d58c9 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -50,7 +50,7 @@
     <string name="no_search_results" msgid="6518732304311458580">"Издөө жыйынтыктары жок"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Жеке"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Жумуш"</string>
-    <string name="widget_category_conversations" msgid="8894438636213590446">"Жазышуулар"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"Сүйлөшүүлөр"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Колдонмолорду издөө"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Колдонмолор жүктөлүүдө…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" сурамына дал келген колдонмолор табылган жок"</string>
@@ -100,8 +100,8 @@
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Стилдер жана тушкагаздар"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Башкы бет жөндөөлөрү"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Администраторуңуз өчүрүп койгон"</string>
-    <string name="allow_rotation_title" msgid="7728578836261442095">"Башкы экранды айлантууга уруксат берүү"</string>
-    <string name="allow_rotation_desc" msgid="8662546029078692509">"Телефон айланганда"</string>
+    <string name="allow_rotation_title" msgid="7728578836261442095">"Башкы экранды бурууга уруксат берүү"</string>
+    <string name="allow_rotation_desc" msgid="8662546029078692509">"Телефон бурулганда"</string>
     <string name="notification_dots_title" msgid="9062440428204120317">"Билдирмелер белгилери"</string>
     <string name="notification_dots_desc_on" msgid="1679848116452218908">"Күйүк"</string>
     <string name="notification_dots_desc_off" msgid="1760796511504341095">"Өчүк"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 8ae7bdfa0d..7fc330eb61 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -110,7 +110,7 @@
     <string name="title_change_settings" msgid="1376365968844349552">"सेटिंग्ज बदला"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"सूचना बिंदू दाखवा"</string>
     <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"होम स्क्रीनवर ॲप आयकन जोडा"</string>
-    <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"नवीन ॲप्ससाठी"</string>
+    <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"नवीन अ‍ॅप्ससाठी"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"अज्ञात"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"काढा"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Search"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index c7960a663a..b42960204b 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -103,13 +103,13 @@
     <string name="allow_rotation_title" msgid="7728578836261442095">"ပင်မစာမျက်နှာလှည့်ခြင်းကို ခွင့်ပြုပါ"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"ဖုန်းကိုလှည့်ထားစဉ်"</string>
     <string name="notification_dots_title" msgid="9062440428204120317">"သတိပေးချက် အစက်များ"</string>
-    <string name="notification_dots_desc_on" msgid="1679848116452218908">"ဖွင့်ထားသည်"</string>
-    <string name="notification_dots_desc_off" msgid="1760796511504341095">"ပိတ်ထားသည်"</string>
+    <string name="notification_dots_desc_on" msgid="1679848116452218908">"ဖွင့်"</string>
+    <string name="notification_dots_desc_off" msgid="1760796511504341095">"ပိတ်"</string>
     <string name="title_missing_notification_access" msgid="7503287056163941064">"အကြောင်းကြားချက် အသုံးပြုခွင့် လိုအပ်သည်"</string>
     <string name="msg_missing_notification_access" msgid="281113995110910548">"အကြောင်းကြားချက် အစက်များကို ပြသရန် <xliff:g id="NAME">%1$s</xliff:g> အတွက် အက်ပ်အကြောင်းကြားချက်များကို ဖွင့်ပါ"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"ဆက်တင်များ ပြောင်းရန်"</string>
-    <string name="notification_dots_service_title" msgid="4284221181793592871">"သတိပေးချက် အစက်များ ပြရန်"</string>
-    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"\'ပင်မစာမျက်နှာ\' တွင် အက်ပ်သင်္ကေတထည့်ရန်"</string>
+    <string name="notification_dots_service_title" msgid="4284221181793592871">"အကြောင်းကြားချက် အစက်များ ပြရန်"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"ပင်မစာမျက်နှာတွင် အက်ပ်သင်္ကေတထည့်ရန်"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"အက်ပ်အသစ်များအတွက်"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"မသိ"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"ဖယ်ရှားရန်"</string>
-- 
GitLab


From 006cdeb6410768e1c79c3bab1e96680588c6e520 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Tue, 20 Apr 2021 10:23:31 -0700
Subject: [PATCH 0932/1664] Add a feature flag for smartspace dismiss option.

Test: manual
bug: 184179894
Change-Id: I568f7809f9a2407cf470d82c32a05956fcaaf807
---
 src/com/android/launcher3/config/FeatureFlags.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 6331ef2862..aa9cc17965 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -170,6 +170,10 @@ public final class FeatureFlags {
             "Replace Smartspace with the enhanced version. "
               + "Ignored if ENABLE_SMARTSPACE_UNIVERSAL is enabled.");
 
+    public static final BooleanFlag ENABLE_SMARTSPACE_DISMISS = new DeviceFlag(
+            "ENABLE_SMARTSPACE_DISMISS", false,
+            "Adds a menu option to dismiss the current Enhanced Smartspace card.");
+
     public static final BooleanFlag ALWAYS_USE_HARDWARE_OPTIMIZATION_FOR_FOLDER_ANIMATIONS =
             getDebugFlag(
             "ALWAYS_USE_HARDWARE_OPTIMIZATION_FOR_FOLDER_ANIMATIONS", false,
-- 
GitLab


From 0dfce759a9972e8ac72ebd13e30afd75a6f91913 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 20 Apr 2021 11:33:29 -0700
Subject: [PATCH 0933/1664] Reset activity reference after invalidation

Bug: 185909226
Test: Presubmit
Change-Id: Id0a6a1c5301c66a515cefcab58b77495081c6190
---
 quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 75992342aa..dbb8272621 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -65,6 +65,7 @@ import android.graphics.Matrix;
 import android.graphics.PointF;
 import android.graphics.Rect;
 import android.os.Build;
+import android.os.Handler;
 import android.os.SystemClock;
 import android.view.MotionEvent;
 import android.view.View;
@@ -135,6 +136,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     protected final BaseActivityInterface<S, T> mActivityInterface;
     protected final InputConsumerProxy mInputConsumerProxy;
     protected final ActivityInitListener mActivityInitListener;
+    private final Handler mHandler = new Handler();
     // Callbacks to be made once the recents animation starts
     private final ArrayList<Runnable> mRecentsAnimationStartCallbacks = new ArrayList<>();
     protected RecentsAnimationController mRecentsAnimationController;
@@ -1357,6 +1359,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         mActivityInitListener.unregister();
         ActivityManagerWrapper.getInstance().unregisterTaskStackListener(mActivityRestartListener);
         mTaskSnapshot = null;
+        mHandler.post(() -> {
+            // Defer clearing the activity since invalidation can happen over multiple callbacks
+            mActivity = null;
+        });
     }
 
     private void invalidateHandlerWithLauncher() {
-- 
GitLab


From 8e64bba9cf5079dadc677d876958afc2f4aea706 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 20 Apr 2021 13:26:26 -0700
Subject: [PATCH 0934/1664] Add some logging for transposed mode in landscape

Bug: 185820525
Test: Presubmit
Change-Id: Id4cf605fd5c3277273025ac1a73f25add0608412
---
 .../src/com/android/quickstep/TaplTestsQuickstep.java  |  4 ++++
 src/com/android/launcher3/DeviceProfile.java           | 10 ++++++++++
 src/com/android/launcher3/InvariantDeviceProfile.java  |  9 +++++++++
 src/com/android/launcher3/Launcher.java                |  4 +++-
 src/com/android/launcher3/testing/TestProtocol.java    |  1 +
 .../android/launcher3/ui/PortraitLandscapeRunner.java  |  5 +++++
 6 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
index 0fe5432ceb..a700e16d64 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import android.content.Intent;
+import android.util.Log;
 
 import androidx.test.filters.LargeTest;
 import androidx.test.runner.AndroidJUnit4;
@@ -36,6 +37,7 @@ import com.android.launcher3.tapl.LauncherInstrumentation.NavigationModel;
 import com.android.launcher3.tapl.Overview;
 import com.android.launcher3.tapl.OverviewActions;
 import com.android.launcher3.tapl.OverviewTask;
+import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.ui.TaplTestsLauncher3;
 import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch;
 import com.android.quickstep.views.RecentsView;
@@ -187,10 +189,12 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
     @NavigationModeSwitch
     @PortraitLandscape
     public void testSwitchToOverview() throws Exception {
+        Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "testSwitchToOverview");
         assertNotNull("Workspace.switchToOverview() returned null",
                 mLauncher.pressHome().switchToOverview());
         assertTrue("Launcher internal state didn't switch to Overview",
                 isInState(() -> LauncherState.OVERVIEW));
+        Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "testSwitchToOverview finished");
     }
 
     @Test
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 985a445f81..dae4f3b8dd 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -25,6 +25,7 @@ import android.content.res.Resources;
 import android.graphics.Point;
 import android.graphics.PointF;
 import android.graphics.Rect;
+import android.util.Log;
 import android.view.Surface;
 import android.view.WindowInsets;
 import android.view.WindowManager;
@@ -35,6 +36,7 @@ import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.graphics.IconShape;
 import com.android.launcher3.icons.DotRenderer;
 import com.android.launcher3.icons.IconNormalizer;
+import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.DisplayController.Info;
 import com.android.launcher3.util.WindowBounds;
@@ -973,6 +975,10 @@ public class DeviceProfile {
             mInfo = info;
             mTransposeLayoutWithOrientation = context.getResources()
                     .getBoolean(R.bool.hotseat_transpose_layout_with_orientation);
+            if (TestProtocol.sDebugTracing) {
+                Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED,
+                        "transposeLayout=" + mTransposeLayoutWithOrientation);
+            }
         }
 
         public Builder setSizeRange(Point minSize, Point maxSize) {
@@ -985,6 +991,10 @@ public class DeviceProfile {
             mWidth = width;
             mHeight = height;
             mIsLandscape = mWidth > mHeight;
+            if (TestProtocol.sDebugTracing) {
+                Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED,
+                        "isLandscape=" + mIsLandscape + " w=" + mWidth + " h=" + mHeight);
+            }
             return this;
         }
 
diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index f19877793b..a863e6b55c 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -48,6 +48,7 @@ import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.launcher3.graphics.IconShape;
+import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.ConfigMonitor;
 import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.DisplayController.Info;
@@ -338,6 +339,10 @@ public class InvariantDeviceProfile {
         DeviceProfile.Builder builder = new DeviceProfile.Builder(context, this, displayInfo)
                 .setSizeRange(new Point(displayInfo.smallestSize),
                         new Point(displayInfo.largestSize));
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED,
+                    "largeSide=" + largeSide + " smallSide=" + smallSide);
+        }
 
         landscapeProfile = builder.setSize(largeSide, smallSide).build();
         portraitProfile = builder.setSize(smallSide, largeSide).build();
@@ -571,6 +576,10 @@ public class InvariantDeviceProfile {
     }
 
     public DeviceProfile getDeviceProfile(Context context) {
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "getDeviceProfile: orientation="
+                    + context.getResources().getConfiguration().orientation, new Throwable());
+        }
         return context.getResources().getConfiguration().orientation
                 == Configuration.ORIENTATION_LANDSCAPE ? landscapeProfile : portraitProfile;
     }
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 3236f5d542..30dd5481d2 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -566,7 +566,9 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     }
 
     private void onIdpChanged(InvariantDeviceProfile idp) {
-
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "onIdpChanged", new Throwable());
+        }
         initDeviceProfile(idp);
         dispatchDeviceProfileChanged();
         reapplyUi();
diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java
index 18f1df18cb..3296ea51f6 100644
--- a/src/com/android/launcher3/testing/TestProtocol.java
+++ b/src/com/android/launcher3/testing/TestProtocol.java
@@ -109,6 +109,7 @@ public final class TestProtocol {
     public static final String REQUEST_MOCK_SENSOR_ROTATION = "mock-sensor-rotation";
 
     public static final String PERMANENT_DIAG_TAG = "TaplTarget";
+    public static final String LAUNCHER_NOT_TRANSPOSED = "b/185820525";
     public static final String NO_SWIPE_TO_HOME = "b/158017601";
     public static final String WORK_PROFILE_REMOVED = "b/159671700";
     public static final String TIS_NO_EVENTS = "b/180915942";
diff --git a/tests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java b/tests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java
index 266f0aeb1d..6c68daa8c1 100644
--- a/tests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java
+++ b/tests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java
@@ -4,6 +4,7 @@ import android.util.Log;
 import android.view.Surface;
 
 import com.android.launcher3.tapl.TestHelpers;
+import com.android.launcher3.testing.TestProtocol;
 
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
@@ -54,19 +55,23 @@ class PortraitLandscapeRunner implements TestRule {
             }
 
             private void evaluateInPortrait() throws Throwable {
+                Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "evaluateInPortrait");
                 mTest.mDevice.setOrientationNatural();
                 mTest.mLauncher.setExpectedRotation(Surface.ROTATION_0);
                 AbstractLauncherUiTest.checkDetectedLeaks(mTest.mLauncher);
                 base.evaluate();
                 mTest.getDevice().pressHome();
+                Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "evaluateInPortrait finished");
             }
 
             private void evaluateInLandscape() throws Throwable {
+                Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "evaluateInLandscape");
                 mTest.mDevice.setOrientationLeft();
                 mTest.mLauncher.setExpectedRotation(Surface.ROTATION_90);
                 AbstractLauncherUiTest.checkDetectedLeaks(mTest.mLauncher);
                 base.evaluate();
                 mTest.getDevice().pressHome();
+                Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "evaluateInLandscape finished");
             }
         };
     }
-- 
GitLab


From 8c8d99f966f8b62b6299c881cf0576f8d6f3bea3 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Tue, 20 Apr 2021 22:00:05 +0100
Subject: [PATCH 0935/1664] Fix flaky widget tapl tests

Potential issues:
1. Widgets floating tips view is being shown
2. Header visible height is too small to be considered as a scroll
   gesture

Test: Run AddConfigWidgetTest, AddWidgetTest, BindWidgetTest &
      RequestPinItemTest
Bug: 185733371
Change-Id: Ic3e9188724dd920349ce8d8e8d98392b94b40642
---
 .../launcher3/widget/picker/WidgetsFullSheet.java        | 4 +++-
 tests/tapl/com/android/launcher3/tapl/Widgets.java       | 9 +++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 5543256897..5be9a955d9 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -50,6 +50,7 @@ import com.android.launcher3.Insettable;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.compat.AccessibilityManagerCompat;
 import com.android.launcher3.model.WidgetItem;
@@ -649,7 +650,8 @@ public class WidgetsFullSheet extends BaseWidgetSheet
     }
 
     private boolean hasSeenEducationTip() {
-        return mLauncher.getSharedPrefs().getBoolean(WIDGETS_EDUCATION_TIP_SEEN, false);
+        return mLauncher.getSharedPrefs().getBoolean(WIDGETS_EDUCATION_TIP_SEEN, false)
+                || Utilities.IS_RUNNING_IN_TEST_HARNESS;
     }
 
     /** A holder class for holding adapters & their corresponding recycler view. */
diff --git a/tests/tapl/com/android/launcher3/tapl/Widgets.java b/tests/tapl/com/android/launcher3/tapl/Widgets.java
index a3f9ade054..51e331de42 100644
--- a/tests/tapl/com/android/launcher3/tapl/Widgets.java
+++ b/tests/tapl/com/android/launcher3/tapl/Widgets.java
@@ -169,12 +169,16 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
                 "widgets_table");
 
         boolean hasHeaderExpanded = false;
+        int scrollDistance = 0;
         for (int i = 0; i < SCROLL_ATTEMPTS; i++) {
             UiObject2 fullWidgetsPicker = verifyActiveContainer();
 
             UiObject2 header = mLauncher.waitForObjectInContainer(fullWidgetsPicker,
                     headerSelector);
-            int headerHeight = header.getVisibleBounds().height();
+            // If a header is barely visible in the bottom edge of the screen, its height could be
+            // too small for a scroll gesture. Since all header should have roughly the same height,
+            // let's pick the max height we have seen so far.
+            scrollDistance = Math.max(scrollDistance, header.getVisibleBounds().height());
 
             // Look for a header that has the test app name.
             UiObject2 headerTitle = mLauncher.findObjectInContainer(fullWidgetsPicker,
@@ -196,7 +200,8 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
                     return widgetsContainer;
                 }
             }
-            mLauncher.scrollDownByDistance(fullWidgetsPicker, headerHeight);
+            log("Finding test widget package - scroll with distance: " + scrollDistance);
+            mLauncher.scrollDownByDistance(fullWidgetsPicker, scrollDistance);
         }
 
         return null;
-- 
GitLab


From 0c504d047f78953db81fad7c5847f1c7fa16b371 Mon Sep 17 00:00:00 2001
From: Evan Rosky <erosky@google.com>
Date: Tue, 20 Apr 2021 15:17:54 -0700
Subject: [PATCH 0936/1664] Update API usage for mergable transitions

Bug: 183994113
Test: N/A, just added parameter
Change-Id: Iabe2dabebd8e3dc929d1851ac1adbce5b3a64ad7
---
 .../android/quickstep/util/SplitSelectStateController.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
index 9576eac809..c1c8c1bb55 100644
--- a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
+++ b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
@@ -23,6 +23,7 @@ import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITIO
 import android.animation.AnimatorSet;
 import android.app.ActivityOptions;
 import android.os.Handler;
+import android.os.IBinder;
 import android.os.Looper;
 import android.util.Pair;
 import android.view.SurfaceControl;
@@ -133,8 +134,8 @@ public class SplitSelectStateController {
         }
 
         @Override
-        public void startAnimation(TransitionInfo info, SurfaceControl.Transaction t,
-                Runnable finishCallback) {
+        public void startAnimation(IBinder transition, TransitionInfo info,
+                SurfaceControl.Transaction t, Runnable finishCallback) {
             TaskViewUtils.composeRecentsSplitLaunchAnimator(mInitialTaskView, mTaskView,
                     info, t, finishCallback);
             // After successful launch, call resetState
-- 
GitLab


From 0bba6a79fcad8cbe46b8cd625c9d6cc56279e27e Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 20 Apr 2021 15:41:51 -0700
Subject: [PATCH 0937/1664] Reduce some logging from previous CL

Bug: 185820525
Test: Presubmit
Change-Id: I38a1da163eedf5f07bd507674ecb8661e8649d23
---
 src/com/android/launcher3/InvariantDeviceProfile.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index a863e6b55c..27e2995a28 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -578,7 +578,7 @@ public class InvariantDeviceProfile {
     public DeviceProfile getDeviceProfile(Context context) {
         if (TestProtocol.sDebugTracing) {
             Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "getDeviceProfile: orientation="
-                    + context.getResources().getConfiguration().orientation, new Throwable());
+                    + context.getResources().getConfiguration().orientation);
         }
         return context.getResources().getConfiguration().orientation
                 == Configuration.ORIENTATION_LANDSCAPE ? landscapeProfile : portraitProfile;
-- 
GitLab


From e1ce26e70cf522d7da046a9635d6d3a7e2a73056 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Thu, 15 Apr 2021 18:16:41 -0700
Subject: [PATCH 0938/1664] Fix weird task launch animation

Sometimes a weird task launch animation can be observed where the task is animated to fullscreen before animated again from center to the left side of the screen. This is caused by stateManager.moveToRestState() call that internally animates FULLSCREEN_PROGRESS to 0 based on its launcher state (normal). The implementation right now finishes the recents animation after this call, instead of before. We should finish the recents animation first before doing the recents view clean up work.

Fixes: 184878444
Test: manual
Change-Id: Ib24fcf5ecb12e1a1357441427daface2778e1008
---
 .../com/android/quickstep/TaskViewUtils.java  | 14 ++++----
 .../android/quickstep/views/RecentsView.java  | 33 +++++--------------
 .../com/android/quickstep/views/TaskView.java |  8 +++--
 3 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java
index cbb2a66214..1db587285e 100644
--- a/quickstep/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java
@@ -500,23 +500,25 @@ public final class TaskViewUtils {
             windowAnimEndListener = new AnimatorListenerAdapter() {
                 @Override
                 public void onAnimationEnd(Animator animation) {
-                    recentsView.post(() -> {
-                        stateManager.moveToRestState();
-                        stateManager.reapplyState();
+                    recentsView.finishRecentsAnimation(false /* toRecents */, () -> {
+                        recentsView.post(() -> {
+                            stateManager.moveToRestState();
+                            stateManager.reapplyState();
+                        });
                     });
                 }
             };
         } else {
             AnimatorPlaybackController controller =
-                    stateManager.createAnimationToNewWorkspace(NORMAL,
-                            RECENTS_LAUNCH_DURATION);
+                    stateManager.createAnimationToNewWorkspace(NORMAL, RECENTS_LAUNCH_DURATION);
             controller.dispatchOnStart();
             childStateAnimation = controller.getTarget();
             launcherAnim = controller.getAnimationPlayer().setDuration(RECENTS_LAUNCH_DURATION);
             windowAnimEndListener = new AnimatorListenerAdapter() {
                 @Override
                 public void onAnimationEnd(Animator animation) {
-                    stateManager.goToState(NORMAL, false);
+                    recentsView.finishRecentsAnimation(false /* toRecents */,
+                            () -> stateManager.goToState(NORMAL, false));
                 }
             };
         }
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 4918036abc..150ae02cf0 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -137,7 +137,6 @@ import com.android.quickstep.TaskOverlayFactory;
 import com.android.quickstep.TaskThumbnailCache;
 import com.android.quickstep.TaskViewUtils;
 import com.android.quickstep.ViewUtils;
-import com.android.quickstep.util.ActiveGestureLog;
 import com.android.quickstep.util.LayoutUtils;
 import com.android.quickstep.util.MultiValueUpdateListener;
 import com.android.quickstep.util.RecentsOrientedState;
@@ -760,6 +759,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 }
             });
             anim.play(appAnimator);
+            anim.addListener(new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationEnd(Animator animation) {
+                    finishRecentsAnimation(true /* toRecents */, null);
+                }
+            });
         } else {
             TaskViewUtils.composeRecentsLaunchAnimator(
                     anim, taskView, apps,
@@ -768,30 +773,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                     mActivity.getStateManager(), this,
                     getDepthController());
         }
-        anim.addListener(new AnimatorListenerAdapter(){
-
-            @Override
-            public void onAnimationEnd(Animator animator) {
-                cleanUp(false);
-            }
-
-            @Override
-            public void onAnimationCancel(Animator animator) {
-                cleanUp(true);
-            }
-
-            private void cleanUp(boolean canceled) {
-                if (mRecentsAnimationController != null) {
-                    finishRecentsAnimation(false /* toRecents */, null /* onFinishComplete */);
-                    if (canceled) {
-                        mRecentsAnimationController = null;
-                    } else {
-                        mSizeStrategy.onLaunchTaskSuccess();
-                    }
-                    ActiveGestureLog.INSTANCE.addLog("finishRecentsAnimation", false);
-                }
-            }
-        });
         anim.start();
     }
 
@@ -1441,6 +1422,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
 
         mRecentsAnimationController = null;
         mLiveTileParams.setTargetSet(null);
+        mLiveTileTaskViewSimulator.setDrawsBelowRecents(true);
 
         unloadVisibleTaskData(TaskView.FLAG_UPDATE_ALL);
         setCurrentPage(0);
@@ -3078,6 +3060,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         }
 
         mRecentsAnimationController.finish(toRecents, () -> {
+            mRecentsAnimationController = null;
             if (onFinishComplete != null) {
                 onFinishComplete.run();
             }
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 8f22622058..2bb14d2a0b 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -484,7 +484,6 @@ public class TaskView extends FrameLayout implements Reusable {
             mIsClickableAsLiveTile = false;
             RecentsView recentsView = getRecentsView();
             RemoteAnimationTargets targets = recentsView.getLiveTileParams().getTargetSet();
-            recentsView.getLiveTileTaskViewSimulator().setDrawsBelowRecents(false);
 
             AnimatorSet anim = new AnimatorSet();
             TaskViewUtils.composeRecentsLaunchAnimator(
@@ -493,10 +492,13 @@ public class TaskView extends FrameLayout implements Reusable {
                     mActivity.getStateManager(), recentsView,
                     recentsView.getDepthController());
             anim.addListener(new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationStart(Animator animator) {
+                    recentsView.getLiveTileTaskViewSimulator().setDrawsBelowRecents(false);
+                }
+
                 @Override
                 public void onAnimationEnd(Animator animator) {
-                    recentsView.getLiveTileTaskViewSimulator().setDrawsBelowRecents(true);
-                    recentsView.finishRecentsAnimation(false, null);
                     mIsClickableAsLiveTile = true;
                 }
             });
-- 
GitLab


From 2e3b7c6e97526f9b4ec392dfd7f6a433a3ee7300 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 16 Apr 2021 13:06:16 -0700
Subject: [PATCH 0939/1664] Redraw live tile in updatePageOffsets()

Also finish recents controller in RecentsView#reset() if it hasn't
been already.

Test: in 2 button mode, swipe up from overview when a live tile is
running, ensure it moves offscreen with its TaskView; after swiping
from overview to home, tap nav bar to ensure controller was finished
Fixes: 185588376

Change-Id: Ibfdea9fcfb69dbc20c51474198c7cc2f9281c705
---
 .../src/com/android/quickstep/views/RecentsView.java      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 150ae02cf0..d9f398d5d0 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1420,7 +1420,9 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         mTaskListChangeId = -1;
         mFocusedTaskId = -1;
 
-        mRecentsAnimationController = null;
+        if (mRecentsAnimationController != null) {
+            finishRecentsAnimation(true /* toRecents */, null);
+        }
         mLiveTileParams.setTargetSet(null);
         mLiveTileTaskViewSimulator.setDrawsBelowRecents(true);
 
@@ -2517,6 +2519,10 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                     ? ((TaskView) child).getPrimaryTaskOffsetTranslationProperty()
                     : mOrientationHandler.getPrimaryViewTranslate();
             translationProperty.set(child, totalTranslation);
+            if (LIVE_TILE.get() && mEnableDrawingLiveTile && i == getRunningTaskIndex()) {
+                mLiveTileTaskViewSimulator.taskPrimaryTranslation.value = totalTranslation;
+                redrawLiveTile();
+            }
         }
         updateCurveProperties();
     }
-- 
GitLab


From dc0f3978e7e1541a57da609260c42528da260b81 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 20 Apr 2021 18:18:51 -0700
Subject: [PATCH 0940/1664] Logging config changes as well

Reduce some logging from previous CL

Bug: 185820525
Test: Presubmit
Change-Id: I69baed7b819b529db30a65cb39a80fb310d76243
---
 src/com/android/launcher3/InvariantDeviceProfile.java | 3 +++
 src/com/android/launcher3/Launcher.java               | 9 +++++++--
 src/com/android/launcher3/util/ConfigMonitor.java     | 9 +++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index 27e2995a28..61023be019 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -394,6 +394,9 @@ public class InvariantDeviceProfile {
     }
 
     private void onConfigChanged(Context context) {
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "IDP.onConfigChanged");
+        }
         // Config changes, what shall we do?
         InvariantDeviceProfile oldProfile = new InvariantDeviceProfile(this);
 
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 30dd5481d2..a54c791aff 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -551,11 +551,16 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         int diff = newConfig.diff(mOldConfig);
-
         if ((diff & (CONFIG_ORIENTATION | CONFIG_SCREEN_SIZE)) != 0) {
             onIdpChanged(mDeviceProfile.inv);
         }
 
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "onConfigurationChanged: diff=" + diff);
+            Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "newConfig=" + newConfig);
+            Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "oldConfig=" + mOldConfig);
+        }
+
         mOldConfig.setTo(newConfig);
         super.onConfigurationChanged(newConfig);
     }
@@ -567,7 +572,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
     private void onIdpChanged(InvariantDeviceProfile idp) {
         if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "onIdpChanged", new Throwable());
+            Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "onIdpChanged");
         }
         initDeviceProfile(idp);
         dispatchDeviceProfileChanged();
diff --git a/src/com/android/launcher3/util/ConfigMonitor.java b/src/com/android/launcher3/util/ConfigMonitor.java
index b3b69f6ab3..f7023e8f44 100644
--- a/src/com/android/launcher3/util/ConfigMonitor.java
+++ b/src/com/android/launcher3/util/ConfigMonitor.java
@@ -26,6 +26,7 @@ import android.content.res.Configuration;
 import android.graphics.Point;
 import android.util.Log;
 
+import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.DisplayController.DisplayInfoChangeListener;
 import com.android.launcher3.util.DisplayController.Info;
 
@@ -72,6 +73,10 @@ public class ConfigMonitor extends BroadcastReceiver implements DisplayInfoChang
 
         // Listen for configuration change
         mContext.registerReceiver(this, new IntentFilter(Intent.ACTION_CONFIGURATION_CHANGED));
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "ConfigMonitor.register: this="
+                    + System.identityHashCode(this) + " callback=" + callback.getClass().getName());
+        }
     }
 
     @Override
@@ -113,6 +118,10 @@ public class ConfigMonitor extends BroadcastReceiver implements DisplayInfoChang
     }
 
     public void unregister() {
+        if (TestProtocol.sDebugTracing) {
+            Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "ConfigMonitor.unregister: this="
+                    + System.identityHashCode(this));
+        }
         try {
             mContext.unregisterReceiver(this);
             DisplayController.getDefaultDisplay(mContext).removeChangeListener(this);
-- 
GitLab


From 4c6722ede5f27db09703df5023e0b3205a8f37ff Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Tue, 20 Apr 2021 19:38:46 -0700
Subject: [PATCH 0941/1664] Better diags when Launcher is manipulated on the
 locked phone

Test: presubmit
Bug: 185395995
Change-Id: I9a7e0bda47851ce186adc15838f9ace9a2c8195a
---
 .../tapl/com/android/launcher3/tapl/LauncherInstrumentation.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index cf935f382a..ebad15449d 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -636,6 +636,7 @@ public final class LauncherInstrumentation {
             }
             SystemClock.sleep(100);
         }
+        checkForAnomaly();
         fail("Launcher didn't initialize");
     }
 
-- 
GitLab


From 7a668168da9962b6a9f408e6f2f7465da1c492ca Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 20 Apr 2021 21:05:05 -0700
Subject: [PATCH 0942/1664] Add null check when resetting animation

- resetStateForAnimationCancel() can be called before launcher is present

Bug: 185945504
Test: Manual
Change-Id: I19525b12e8b179103b6081a8aa554dbe2ebc5ba5
---
 quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 75992342aa..1a732f0955 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1389,7 +1389,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         mActivityInterface.onTransitionCancelled(wasVisible);
 
         // Leave the pending invisible flag, as it may be used by wallpaper open animation.
-        mActivity.clearForceInvisibleFlag(INVISIBLE_BY_STATE_HANDLER);
+        if (mActivity != null) {
+            mActivity.clearForceInvisibleFlag(INVISIBLE_BY_STATE_HANDLER);
+        }
     }
 
     protected void switchToScreenshot() {
-- 
GitLab


From 4fc242847436a83b2faaa5fecc0f07d6031780b7 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Wed, 21 Apr 2021 00:30:54 -0700
Subject: [PATCH 0943/1664] Change spring effect on All Apps

Bug: 185942188
Test: Manual

Change-Id: Ic460d85e19074b7f2b2adf714b211591f0d23a08
---
 .../android/launcher3/allapps/AllAppsContainerView.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 41865ce5e2..40f7ab167c 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -75,8 +75,9 @@ import com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip.OnActivePag
 public class AllAppsContainerView extends SpringRelativeLayout implements DragSource,
         Insettable, OnDeviceProfileChangeListener, OnActivePageChangedListener {
 
-    private static final float FLING_VELOCITY_MULTIPLIER = 1000 * .2f;
-    // Starts the springs after at least 55% of the animation has passed.
+    private static final float FLING_VELOCITY_MULTIPLIER = 1800f;
+
+    // Starts the springs after at least 25% of the animation has passed.
     private static final float FLING_ANIMATION_THRESHOLD = 0.25f;
 
     protected final BaseDraggingActivity mLauncher;
@@ -610,7 +611,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
             public void onAnimationUpdate(ValueAnimator valueAnimator) {
                 if (shouldSpring
                         && valueAnimator.getAnimatedFraction() >= FLING_ANIMATION_THRESHOLD) {
-                    absorbSwipeUpVelocity(Math.abs(
+                    absorbSwipeUpVelocity(-Math.abs(
                             Math.round(velocity * FLING_VELOCITY_MULTIPLIER)));
                     shouldSpring = false;
                 }
-- 
GitLab


From 814728047beeb1f5dac4cbdfb2e9ee2f10922420 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 21 Apr 2021 08:49:29 +0000
Subject: [PATCH 0944/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I0c52edf741c9da39c882bc317258e63942ba0fd2
---
 quickstep/res/values-or/strings.xml     | 3 +--
 quickstep/res/values-pt-rPT/strings.xml | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/quickstep/res/values-or/strings.xml b/quickstep/res/values-or/strings.xml
index 08c22fc80a..8c3697296f 100644
--- a/quickstep/res/values-or/strings.xml
+++ b/quickstep/res/values-or/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"ସ୍କ୍ରିନସଟ୍"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ଆପ୍ କିମ୍ବା ଆପଣଙ୍କ ସଂସ୍ଥା ଦ୍ୱାରା ଏହି କାର୍ଯ୍ୟକୁ ଅନୁମତି ଦିଆଯାଇ ନାହିଁ"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"ନାଭିଗେସନ୍ ଟ୍ୟୁଟୋରିଆଲକୁ ବାଦ୍ ଦେବେ?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"ଆପଣ ପରେ ଏହାକୁ <xliff:g id="NAME">%1$s</xliff:g> ଆପରେ ପାଇପାରିବେ"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"ବାତିଲ୍ କରନ୍ତୁ"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"ବାଦ୍ ଦିଅନ୍ତୁ"</string>
 </resources>
diff --git a/quickstep/res/values-pt-rPT/strings.xml b/quickstep/res/values-pt-rPT/strings.xml
index bbc4ce8811..0feead77b1 100644
--- a/quickstep/res/values-pt-rPT/strings.xml
+++ b/quickstep/res/values-pt-rPT/strings.xml
@@ -30,7 +30,7 @@
     <string name="time_left_for_app" msgid="3111996412933644358">"Resta(m) <xliff:g id="TIME">%1$s</xliff:g> hoje."</string>
     <string name="title_app_suggestions" msgid="4185902664111965088">"Sugestões de apps"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Todas as apps"</string>
-    <string name="all_apps_prediction_tip" msgid="2672336544844936186">"As suas aplicações previstas"</string>
+    <string name="all_apps_prediction_tip" msgid="2672336544844936186">"As suas apps previstas"</string>
     <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Obtenha sugestões de apps na última fila do ecrã principal"</string>
     <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Obtenha sugestões de apps na fila dos favoritos do ecrã principal"</string>
     <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Aceda facilmente às suas apps mais utilizadas, diretamente no ecrã principal. As sugestões mudam em função das suas rotinas. As apps na última fila passam para o ecrã principal."</string>
-- 
GitLab


From 8954828d68eb39c502c03a884ff70298217cf005 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 21 Apr 2021 08:50:07 +0000
Subject: [PATCH 0945/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I2f16395279d44a14cc82e54188978bfb8a1a9be7
---
 res/values-ca/strings.xml     | 2 +-
 res/values-km/strings.xml     | 2 +-
 res/values-ne/strings.xml     | 2 +-
 res/values-pt-rPT/strings.xml | 4 ++--
 res/values-pt/strings.xml     | 2 +-
 res/values-vi/strings.xml     | 4 ++--
 res/values-zh-rTW/strings.xml | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index ac7c84b8f1..c49dce5219 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -109,7 +109,7 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Per veure els punts de notificació, activa les notificacions de l\'aplicació <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Canvia la configuració"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Mostra els punts de notificació"</string>
-    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Afegeix icones a la pantalla d\'inici"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Afegeix icones d\'aplicacions a la pantalla d\'inici"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Per a les aplicacions noves"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Desconegut"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Suprimeix"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index bc70a3d580..f460512a7f 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -124,7 +124,7 @@
     <string name="action_add_to_workspace" msgid="8902165848117513641">"បញ្ចូលទៅអេក្រង់ដើម"</string>
     <string name="action_move_here" msgid="2170188780612570250">"ផ្លាស់ធាតុមកទីនេះ"</string>
     <string name="item_added_to_workspace" msgid="4211073925752213539">"ធាតុដែលត្រូវបានបន្ថែមទៅអេក្រង់ដើម"</string>
-    <string name="item_removed" msgid="851119963877842327">"ធាតុដែលបានដកចេញ"</string>
+    <string name="item_removed" msgid="851119963877842327">"បានដកធាតុចេញ"</string>
     <string name="undo" msgid="4151576204245173321">"ត្រឡប់វិញ"</string>
     <string name="action_move" msgid="4339390619886385032">"ផ្លាស់ទីធាតុ"</string>
     <string name="move_to_empty_cell" msgid="2833711483015685619">"ផ្លាស់ទីទៅជួរដេកទី <xliff:g id="NUMBER_0">%1$s</xliff:g> ជួរឈរទី <xliff:g id="NUMBER_1">%2$s</xliff:g>"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 6f2afc23e0..9c348e37f4 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -108,7 +108,7 @@
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"शैली तथा वालपेपरहरू"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"गृहपृष्ठका सेटिङहरू"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"तपाईँको प्रशासकद्वारा असक्षम गरिएको"</string>
-    <string name="allow_rotation_title" msgid="7728578836261442095">"गृह स्क्रिनलाई घुम्ने अनुमति दिनुहोस्"</string>
+    <string name="allow_rotation_title" msgid="7728578836261442095">"गृह स्क्रिनलाई रोटेट हुन दिइयोस्"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"फोनलाई घुमाइँदा"</string>
     <string name="notification_dots_title" msgid="9062440428204120317">"सूचनाको प्रतीक जनाउने थोप्लाहरू"</string>
     <string name="notification_dots_desc_on" msgid="1679848116452218908">"सक्रिय"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 243f665b8e..fa2a50e8bc 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -97,7 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Pasta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> itens"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Pasta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ou mais itens"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Imagens de fundo"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Estilos e imagens de fundo"</string>
+    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Estilos e fundo"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Definições de início"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Desativada pelo gestor"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Permitir rotação do ecrã principal"</string>
@@ -110,7 +110,7 @@
     <string name="title_change_settings" msgid="1376365968844349552">"Alterar definições"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Mostrar pontos de notificação"</string>
     <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Adic. ícones de apps ao ecrã principal"</string>
-    <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Para novas aplicações"</string>
+    <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Para novas apps"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Desconhecido"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Remover"</string>
     <string name="abandoned_search" msgid="891119232568284442">"Pesquisar"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 22a041de3c..165a0133ec 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -98,7 +98,7 @@
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Pasta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ou mais itens"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Planos de fundo"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Estilos e planos de fundo"</string>
-    <string name="settings_button_text" msgid="8873672322605444408">"Config. tela inicial"</string>
+    <string name="settings_button_text" msgid="8873672322605444408">"Configurações da tela inicial"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Desativado pelo administrador"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Permitir rotação da tela inicial"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"Quando o smartphone for girado"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index f7bef37440..318d453b95 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -108,7 +108,7 @@
     <string name="title_missing_notification_access" msgid="7503287056163941064">"Cần quyền truy cập thông báo"</string>
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Để hiển thị Dấu chấm thông báo, hãy bật thông báo ứng dụng cho <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Thay đổi cài đặt"</string>
-    <string name="notification_dots_service_title" msgid="4284221181793592871">"Hiển thị dấu chấm thông báo"</string>
+    <string name="notification_dots_service_title" msgid="4284221181793592871">"Hiện dấu chấm thông báo"</string>
     <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Thêm biểu tượng ứng dụng vào Màn hình chính"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Cho ứng dụng mới"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Không xác định"</string>
@@ -125,7 +125,7 @@
     <string name="action_move_here" msgid="2170188780612570250">"Di chuyển mục vào đây"</string>
     <string name="item_added_to_workspace" msgid="4211073925752213539">"Đã thêm mục vào màn hình chính"</string>
     <string name="item_removed" msgid="851119963877842327">"Đã xóa mục"</string>
-    <string name="undo" msgid="4151576204245173321">"Hoàn tác"</string>
+    <string name="undo" msgid="4151576204245173321">"Hủy"</string>
     <string name="action_move" msgid="4339390619886385032">"Di chuyển mục"</string>
     <string name="move_to_empty_cell" msgid="2833711483015685619">"Di chuyển đến hàng <xliff:g id="NUMBER_0">%1$s</xliff:g> cột <xliff:g id="NUMBER_1">%2$s</xliff:g>"</string>
     <string name="move_to_position" msgid="6750008980455459790">"Di chuyển tới vị trí <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index fd0ff0ecef..c6f933cdac 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -109,7 +109,7 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"如要顯示通知圓點，請開啟「<xliff:g id="NAME">%1$s</xliff:g>」的應用程式通知功能"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"變更設定"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"顯示通知圓點"</string>
-    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"將應用程式圖示新增到主畫面"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"將應用程式圖示加到主畫面"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"適用於新安裝的應用程式"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"不明"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"移除"</string>
-- 
GitLab


From 260e98385e122afcbaa2e58a1299142e58ced89f Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 21 Apr 2021 14:43:30 +0100
Subject: [PATCH 0946/1664] Use cellHeightPx to estimate recommended widgets'
 height

Test: Set grid to 2x2 and open the widgets picker in portrait. Able to
      scroll the recycler view.
Bug: 185915917
Change-Id: I02bb11a999fb1816de6e2410810c4ae6c1da137f
---
 .../widget/picker/WidgetsRecommendationTableLayout.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
index 824b5806f4..1aefe41f7b 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
@@ -146,7 +146,7 @@ public final class WidgetsRecommendationTableLayout extends TableLayout {
             List<WidgetItem> widgetItems = recommendedWidgetsInTable.get(i);
             float rowHeight = 0;
             for (int j = 0; j < widgetItems.size(); j++) {
-                float previewHeight = widgetItems.get(j).spanY * deviceProfile.allAppsCellHeightPx
+                float previewHeight = widgetItems.get(j).spanY * deviceProfile.cellHeightPx
                         * previewScale;
                 rowHeight = Math.max(rowHeight, previewHeight + mWidgetCellTextViewsHeight);
             }
-- 
GitLab


From 80732f89e74419d7f812d1e356f800cf93e93eac Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Wed, 21 Apr 2021 15:21:30 +0100
Subject: [PATCH 0947/1664] Fix some widget picker recommended widgets bugs.

- Bind recommended widgets only when not in search mode. (b/183503774)
- Bind recommended widgets in onAttachedToWindow, Recommended widgets
are available in PopupDataProvider at this point. (b/185461866)

Bug: 183503774
Bug: 185461866
Test: tested manually
Change-Id: If24e5b2b3e69a695821b5f7d9f42ff4c89ae62fc
---
 src/com/android/launcher3/widget/picker/WidgetsFullSheet.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 5be9a955d9..240958bc36 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -279,6 +279,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         super.onAttachedToWindow();
         mLauncher.getAppWidgetHost().addProviderChangeListener(this);
         notifyWidgetProvidersChanged();
+        onRecommendedWidgetsBound();
     }
 
     @Override
@@ -416,6 +417,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
 
     @Override
     public void exitSearchMode() {
+        if (!mIsInSearchMode) return;
         onSearchResults(new ArrayList<>());
         setViewVisibilityBasedOnSearch(/*isInSearchMode=*/ false);
         if (mHasWorkProfile) {
@@ -464,7 +466,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
                 mLauncher.getPopupDataProvider().getRecommendedWidgets();
         WidgetsRecommendationTableLayout table =
                 mSearchAndRecommendationViewHolder.mRecommendedWidgetsTable;
-        if (recommendedWidgets.size() > 0) {
+        if (!mIsInSearchMode && recommendedWidgets.size() > 0) {
             // TODO(b/185508758): Revert the following log after debugging.
             if (getHeaderViewHeight() == 0) {
                 Log.d(TAG, "Header view height is 0 when inflating recommended widgets");
-- 
GitLab


From e973d6f31fa6cba834ce4de4c323efb4756cdf37 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Tue, 20 Apr 2021 23:00:01 +0100
Subject: [PATCH 0948/1664] Render RemoteViews in LauncherAppWidgetHostView

Test: Pin a conversation widget from a notification. RemoteViews are
      rendered with the default size. Drag-n-drop from the pin widget
      dialog works fine.
Bug: 185934141

Change-Id: Idb76cce2807e55e7b42e2e044712519857beb202
---
 .../launcher3/dragndrop/AddItemActivity.java  | 29 ++++--
 .../launcher3/widget/BaseWidgetSheet.java     |  2 +-
 .../widget/PendingItemDragHelper.java         | 26 +++--
 .../android/launcher3/widget/WidgetCell.java  | 99 ++++++-------------
 4 files changed, 71 insertions(+), 85 deletions(-)

diff --git a/src/com/android/launcher3/dragndrop/AddItemActivity.java b/src/com/android/launcher3/dragndrop/AddItemActivity.java
index fc635a91db..d5a04a647d 100644
--- a/src/com/android/launcher3/dragndrop/AddItemActivity.java
+++ b/src/com/android/launcher3/dragndrop/AddItemActivity.java
@@ -59,6 +59,7 @@ import com.android.launcher3.pm.PinRequestHelper;
 import com.android.launcher3.views.BaseDragLayer;
 import com.android.launcher3.widget.LauncherAppWidgetHost;
 import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
+import com.android.launcher3.widget.NavigableAppWidgetHostView;
 import com.android.launcher3.widget.PendingAddShortcutInfo;
 import com.android.launcher3.widget.PendingAddWidgetInfo;
 import com.android.launcher3.widget.WidgetCell;
@@ -147,20 +148,31 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
     public boolean onLongClick(View view) {
         // Find the position of the preview relative to the touch location.
         WidgetImageView img = mWidgetCell.getWidgetView();
+        NavigableAppWidgetHostView appWidgetHostView = mWidgetCell.getAppWidgetHostViewPreview();
 
         // If the ImageView doesn't have a drawable yet, the widget preview hasn't been loaded and
         // we abort the drag.
-        if (img.getDrawable() == null) {
+        if (img.getDrawable() == null && appWidgetHostView == null) {
             return false;
         }
 
-        Rect bounds = img.getBitmapBounds();
-        bounds.offset(img.getLeft() - (int) mLastTouchPos.x, img.getTop() - (int) mLastTouchPos.y);
-
+        final Rect bounds;
         // Start home and pass the draw request params
-        PinItemDragListener listener = new PinItemDragListener(mRequest, bounds,
-                img.getDrawable().getIntrinsicWidth(), img.getWidth());
-
+        final PinItemDragListener listener;
+        if (appWidgetHostView != null) {
+            bounds = new Rect();
+            appWidgetHostView.getSourceVisualDragBounds(bounds);
+            bounds.offset(appWidgetHostView.getLeft() - (int) mLastTouchPos.x,
+                    appWidgetHostView.getTop() - (int) mLastTouchPos.y);
+            listener = new PinItemDragListener(mRequest, bounds,
+                    appWidgetHostView.getMeasuredWidth(), appWidgetHostView.getMeasuredWidth());
+        } else {
+            bounds = img.getBitmapBounds();
+            bounds.offset(img.getLeft() - (int) mLastTouchPos.x,
+                    img.getTop() - (int) mLastTouchPos.y);
+            listener = new PinItemDragListener(mRequest, bounds,
+                    img.getDrawable().getIntrinsicWidth(), img.getWidth());
+        }
 
         // Start a system drag and drop. We use a transparent bitmap as preview for system drag
         // as the preview is handled internally by launcher.
@@ -214,7 +226,7 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
             // Cannot add widget
             return false;
         }
-        mWidgetCell.setPreview(PinItemDragListener.getPreview(mRequest));
+        mWidgetCell.setRemoteViewsPreview(PinItemDragListener.getPreview(mRequest));
 
         mAppWidgetManager = new WidgetManagerHelper(this);
         mAppWidgetHost = new LauncherAppWidgetHost(this);
@@ -238,6 +250,7 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
 
             @Override
             protected void onPostExecute(WidgetItem item) {
+                mWidgetCell.setPreviewSize(item.spanX, item.spanY);
                 mWidgetCell.applyFromCellItem(item, mApp.getWidgetCache());
                 mWidgetCell.ensurePreview();
             }
diff --git a/src/com/android/launcher3/widget/BaseWidgetSheet.java b/src/com/android/launcher3/widget/BaseWidgetSheet.java
index 95b887c4c6..415f48d30f 100644
--- a/src/com/android/launcher3/widget/BaseWidgetSheet.java
+++ b/src/com/android/launcher3/widget/BaseWidgetSheet.java
@@ -114,7 +114,7 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView
         }
 
         PendingItemDragHelper dragHelper = new PendingItemDragHelper(v);
-        dragHelper.setRemoteViewsPreview(v.getPreview());
+        dragHelper.setRemoteViewsPreview(v.getRemoteViewsPreview());
         dragHelper.setAppWidgetHostViewPreview(v.getAppWidgetHostViewPreview());
 
         if (image.getDrawable() != null) {
diff --git a/src/com/android/launcher3/widget/PendingItemDragHelper.java b/src/com/android/launcher3/widget/PendingItemDragHelper.java
index df368cd3e5..cea4de7b37 100644
--- a/src/com/android/launcher3/widget/PendingItemDragHelper.java
+++ b/src/com/android/launcher3/widget/PendingItemDragHelper.java
@@ -23,6 +23,7 @@ import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.view.View;
+import android.view.View.MeasureSpec;
 import android.widget.RemoteViews;
 
 import androidx.annotation.Nullable;
@@ -53,7 +54,7 @@ public class PendingItemDragHelper extends DragPreviewProvider {
     private int[] mEstimatedCellSize;
 
     @Nullable private RemoteViews mRemoteViewsPreview;
-    @Nullable private LauncherAppWidgetHostView mAppWidgetHostViewPreview;
+    @Nullable private NavigableAppWidgetHostView mAppWidgetHostViewPreview;
     private final float mEnforcedRoundedCornersForWidget;
 
     public PendingItemDragHelper(View view) {
@@ -71,9 +72,9 @@ public class PendingItemDragHelper extends DragPreviewProvider {
         mRemoteViewsPreview = remoteViewsPreview;
     }
 
-    /** Sets a {@link LauncherAppWidgetHostView} which shows a preview layout of an app widget. */
+    /** Sets a {@link NavigableAppWidgetHostView} which shows a preview layout of an app widget. */
     public void setAppWidgetHostViewPreview(
-            @Nullable LauncherAppWidgetHostView appWidgetHostViewPreview) {
+            @Nullable NavigableAppWidgetHostView appWidgetHostViewPreview) {
         mAppWidgetHostViewPreview = appWidgetHostViewPreview;
     }
 
@@ -110,9 +111,22 @@ public class PendingItemDragHelper extends DragPreviewProvider {
             int[] previewSizeBeforeScale = new int[1];
 
             if (mRemoteViewsPreview != null) {
-                preview = new FastBitmapDrawable(
-                        WidgetCell.generateFromRemoteViews(launcher, mRemoteViewsPreview,
-                                createWidgetInfo.info, maxWidth, previewSizeBeforeScale));
+                mAppWidgetHostViewPreview = new LauncherAppWidgetHostView(launcher);
+                mAppWidgetHostViewPreview.setAppWidget(/* appWidgetId= */ -1,
+                        ((PendingAddWidgetInfo) mAddInfo).info);
+                DeviceProfile deviceProfile = launcher.getDeviceProfile();
+                Rect padding = new Rect();
+                mAppWidgetHostViewPreview.getWidgetInset(deviceProfile, padding);
+                mAppWidgetHostViewPreview.setPadding(padding.left, padding.top, padding.right,
+                        padding.bottom);
+                mAppWidgetHostViewPreview.updateAppWidget(/* remoteViews= */ mRemoteViewsPreview);
+                int width =
+                        deviceProfile.cellWidthPx * mAddInfo.spanX + padding.left + padding.right;
+                int height =
+                        deviceProfile.cellHeightPx * mAddInfo.spanY + padding.top + padding.bottom;
+                mAppWidgetHostViewPreview.measure(
+                        MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+                        MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY));
             }
             if (mAppWidgetHostViewPreview != null) {
                 previewSizeBeforeScale[0] = mAppWidgetHostViewPreview.getMeasuredWidth();
diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index c08160bbef..3fcd3f7b03 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -46,7 +46,6 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.R;
 import com.android.launcher3.WidgetPreviewLoader;
 import com.android.launcher3.icons.BaseIconFactory;
-import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.icons.RoundDrawableWrapper;
 import com.android.launcher3.model.WidgetItem;
@@ -100,8 +99,8 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     private final CheckLongPressHelper mLongPressHelper;
     private final float mEnforcedCornerRadius;
 
-    private RemoteViews mPreview;
-    private LauncherAppWidgetHostView mAppWidgetHostViewPreview;
+    private RemoteViews mRemoteViewsPreview;
+    private NavigableAppWidgetHostView mAppWidgetHostViewPreview;
 
     public WidgetCell(Context context) {
         this(context, null);
@@ -143,12 +142,13 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
         mWidgetDescription = findViewById(R.id.widget_description);
     }
 
-    public void setPreview(RemoteViews view) {
-        mPreview = view;
+    public void setRemoteViewsPreview(RemoteViews view) {
+        mRemoteViewsPreview = view;
     }
 
-    public RemoteViews getPreview() {
-        return mPreview;
+    @Nullable
+    public RemoteViews getRemoteViewsPreview() {
+        return mRemoteViewsPreview;
     }
 
     /**
@@ -172,7 +172,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
             mActiveRequest.cancel();
             mActiveRequest = null;
         }
-        mPreview = null;
+        mRemoteViewsPreview = null;
         if (mAppWidgetHostViewPreview != null) {
             mWidgetImageContainer.removeView(mAppWidgetHostViewPreview);
         }
@@ -180,7 +180,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     }
 
     public void applyFromCellItem(WidgetItem item, WidgetPreviewLoader loader) {
-        applyPreviewLayout(item);
+        applyPreviewOnAppWidgetHostView(item);
 
         mItem = item;
         mWidgetName.setText(mItem.label);
@@ -206,9 +206,26 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
         }
     }
 
-    private void applyPreviewLayout(WidgetItem item) {
+
+    private void applyPreviewOnAppWidgetHostView(WidgetItem item) {
+        if (mRemoteViewsPreview != null) {
+            mAppWidgetHostViewPreview = new NavigableAppWidgetHostView(getContext()) {
+                @Override
+                protected boolean shouldAllowDirectClick() {
+                    return false;
+                }
+            };
+            mAppWidgetHostViewPreview.setAppWidget(/* appWidgetId= */ -1, item.widgetInfo);
+            Rect padding = new Rect();
+            mAppWidgetHostViewPreview.getWidgetInset(mActivity.getDeviceProfile(), padding);
+            mAppWidgetHostViewPreview.setPadding(padding.left, padding.top, padding.right,
+                    padding.bottom);
+            mAppWidgetHostViewPreview.updateAppWidget(/* remoteViews= */ mRemoteViewsPreview);
+            return;
+        }
+
         if (ATLEAST_S
-                && mPreview == null
+                && mRemoteViewsPreview == null
                 && item.widgetInfo != null
                 && item.widgetInfo.previewLayout != Resources.ID_NULL) {
             mAppWidgetHostViewPreview = new LauncherAppWidgetHostView(getContext());
@@ -234,7 +251,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     }
 
     @Nullable
-    public LauncherAppWidgetHostView getAppWidgetHostViewPreview() {
+    public NavigableAppWidgetHostView getAppWidgetHostViewPreview() {
         return mAppWidgetHostViewPreview;
     }
 
@@ -303,15 +320,6 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     }
 
     public void ensurePreview() {
-        if (mPreview != null && mActiveRequest == null) {
-            Bitmap preview = generateFromRemoteViews(
-                    mActivity, mPreview, mItem.widgetInfo, mPresetPreviewSize, new int[1]);
-            if (preview != null) {
-                applyPreview(new FastBitmapDrawable(preview));
-                return;
-            }
-        }
-
         if (mAppWidgetHostViewPreview != null) {
             setContainerSize(mPreviewWidth, mPreviewHeight);
             FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
@@ -385,53 +393,4 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
         super.onInitializeAccessibilityNodeInfo(info);
         info.removeAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_CLICK);
     }
-
-    /**
-     * Generates a bitmap by inflating {@param views}.
-     * @see com.android.launcher3.WidgetPreviewLoader#generateWidgetPreview
-     *
-     * TODO: Consider moving this to the background thread.
-     */
-    public static Bitmap generateFromRemoteViews(BaseActivity activity, RemoteViews views,
-            LauncherAppWidgetProviderInfo info, int previewSize, int[] preScaledWidthOut) {
-        try {
-            return generateFromView(activity, views.apply(activity, new FrameLayout(activity)),
-                    info, previewSize, preScaledWidthOut);
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    private static Bitmap generateFromView(BaseActivity activity, View v,
-            LauncherAppWidgetProviderInfo info, int previewSize, int[] preScaledWidthOut) {
-
-        DeviceProfile dp = activity.getDeviceProfile();
-        int viewWidth = dp.cellWidthPx * info.spanX;
-        int viewHeight = dp.cellHeightPx * info.spanY;
-
-        v.measure(MeasureSpec.makeMeasureSpec(viewWidth, MeasureSpec.EXACTLY),
-                MeasureSpec.makeMeasureSpec(viewHeight, MeasureSpec.EXACTLY));
-
-        viewWidth = v.getMeasuredWidth();
-        viewHeight = v.getMeasuredHeight();
-        v.layout(0, 0, viewWidth, viewHeight);
-
-        preScaledWidthOut[0] = viewWidth;
-        final int bitmapWidth, bitmapHeight;
-        final float scale;
-        if (viewWidth > previewSize) {
-            scale = ((float) previewSize) / viewWidth;
-            bitmapWidth = previewSize;
-            bitmapHeight = (int) (viewHeight * scale);
-        } else {
-            scale = 1;
-            bitmapWidth = viewWidth;
-            bitmapHeight = viewHeight;
-        }
-
-        return BitmapRenderer.createSoftwareBitmap(bitmapWidth, bitmapHeight, c -> {
-            c.scale(scale, scale);
-            v.draw(c);
-        });
-    }
 }
-- 
GitLab


From 9d5ee199528b7b74640c2c6e03914f3e515b089f Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Tue, 20 Apr 2021 23:07:31 -0700
Subject: [PATCH 0949/1664] Finish recents animation upon home rotation

Fixes: 184054813
Test: manual
Change-Id: Iba819ad1d7ea72aedd15b98d9a9a48c384d5fe1e
---
 .../src/com/android/quickstep/views/RecentsView.java     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 150ae02cf0..e4fa1aa831 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2340,6 +2340,15 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     @Override
     protected void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
+        if (LIVE_TILE.get() && mRunningTaskId != -1) {
+            switchToScreenshot(
+                    () -> finishRecentsAnimation(true, this::onConfigurationChangedInternal));
+        } else {
+            onConfigurationChangedInternal();
+        }
+    }
+
+    private void onConfigurationChangedInternal() {
         final int rotation = mActivity.getDisplay().getRotation();
         if (mOrientationState.setRecentsRotation(rotation)) {
             updateOrientationHandler();
-- 
GitLab


From aea7a32b2e0e78fd7c108d98348e148cc3ebde60 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 21 Apr 2021 14:16:35 -0700
Subject: [PATCH 0950/1664] Add some logging to track launcher service and
 gesture monitor lifecycle

Bug: 182478748
Test: Just logging
Change-Id: If556dcbb84e3863cdb31a3374ce0ad1cefe875fd
---
 .../android/quickstep/TouchInteractionService.java    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index e9d2eb4632..f3fe0b49a4 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -149,6 +149,8 @@ public class TouchInteractionService extends Service implements PluginListener<O
 
         @BinderThread
         public void onInitialize(Bundle bundle) {
+            Log.d(TAG + " b/182478748", "TouchInteractionService.onInitialize: user="
+                    + getUserId());
             ISystemUiProxy proxy = ISystemUiProxy.Stub.asInterface(
                     bundle.getBinder(KEY_EXTRA_SYSUI_PROXY));
             IPip pip = IPip.Stub.asInterface(bundle.getBinder(KEY_EXTRA_SHELL_PIP));
@@ -310,6 +312,8 @@ public class TouchInteractionService extends Service implements PluginListener<O
     }
 
     private void disposeEventHandlers() {
+        Log.d(TAG + " b/182478748", "TouchInteractionService.disposeEventHandlers: user="
+                + getUserId());
         if (mInputEventReceiver != null) {
             mInputEventReceiver.dispose();
             mInputEventReceiver = null;
@@ -321,6 +325,8 @@ public class TouchInteractionService extends Service implements PluginListener<O
     }
 
     private void initInputMonitor() {
+        Log.d(TAG + " b/182478748", "TouchInteractionService.initInputMonitor: user="
+                + getUserId());
         disposeEventHandlers();
 
         if (TestProtocol.sDebugTracing) {
@@ -329,9 +335,11 @@ public class TouchInteractionService extends Service implements PluginListener<O
         }
 
         if (mDeviceState.isButtonNavMode()) {
+            Log.d(TAG + " b/182478748", "isButtonNav: user=" + getUserId());
             return;
         }
 
+        Log.d(TAG + " b/182478748", "create swipe-up input monitor: user=" + getUserId());
         mInputMonitorCompat = new InputMonitorCompat("swipe-up", mDeviceState.getDisplayId());
         mInputEventReceiver = mInputMonitorCompat.getInputReceiver(Looper.getMainLooper(),
                 mMainChoreographer, this::onInputEvent);
@@ -448,6 +456,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
 
     @Override
     public void onDestroy() {
+        Log.d(TAG, "Touch service destroyed: user=" + getUserId());
         sIsInitialized = false;
         if (mDeviceState.isUserUnlocked()) {
             mInputConsumer.unregisterInputConsumer();
@@ -469,7 +478,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
 
     @Override
     public IBinder onBind(Intent intent) {
-        Log.d(TAG, "Touch service connected");
+        Log.d(TAG, "Touch service connected: user=" + getUserId());
         return mMyBinder;
     }
 
-- 
GitLab


From 5620c75c015975103d07a8987913ae39b8d26661 Mon Sep 17 00:00:00 2001
From: Shan Huang <shanh@google.com>
Date: Fri, 16 Apr 2021 21:33:39 +0800
Subject: [PATCH 0951/1664] Updated launcher text shadow values.

Also update the way we compute shadow alpha so that it combines both text
alpha and shadow color alpha.

Test: Manually checked text appearances in launcher.
Bug: 185890335

Change-Id: I720a97bbaf21de86a5c446529109ce5b9ac5f6f7
---
 res/values/attrs.xml                          |  3 +-
 res/values/styles.xml                         |  9 +++--
 .../views/DoubleShadowBubbleTextView.java     | 39 +++++++++++++------
 3 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index dbb40d591c..1beb8dd69d 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -79,7 +79,8 @@
         <attr name="ambientShadowBlur" format="dimension" />
         <attr name="keyShadowColor" format="color" />
         <attr name="keyShadowBlur" format="dimension" />
-        <attr name="keyShadowOffset" format="dimension" />
+        <attr name="keyShadowOffsetX" format="dimension" />
+        <attr name="keyShadowOffsetY" format="dimension" />
     </declare-styleable>
 
     <!-- PagedView specific attributes. These attributes are used to customize
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 37b7e2d14f..426644553b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -42,8 +42,8 @@
         <item name="isWorkspaceDarkText">false</item>
         <item name="workspaceTextColor">@color/workspace_text_color_light</item>
         <item name="workspaceShadowColor">#B0000000</item>
-        <item name="workspaceAmbientShadowColor">#33000000</item>
-        <item name="workspaceKeyShadowColor">#44000000</item>
+        <item name="workspaceAmbientShadowColor">#00000000</item>
+        <item name="workspaceKeyShadowColor">#89000000</item>
         <item name="workspaceStatusBarScrim">@drawable/workspace_bg</item>
         <item name="widgetsTheme">@style/WidgetContainerTheme</item>
         <item name="folderDotColor">?android:attr/colorPrimary</item>
@@ -243,8 +243,9 @@
         <item name="ambientShadowColor">?attr/workspaceAmbientShadowColor</item>
         <item name="ambientShadowBlur">2.5dp</item>
         <item name="keyShadowColor">?attr/workspaceKeyShadowColor</item>
-        <item name="keyShadowBlur">1dp</item>
-        <item name="keyShadowOffset">.5dp</item>
+        <item name="keyShadowBlur">.5dp</item>
+        <item name="keyShadowOffsetX">.5dp</item>
+        <item name="keyShadowOffsetY">.5dp</item>
     </style>
 
     <!-- Theme for the popup container -->
diff --git a/src/com/android/launcher3/views/DoubleShadowBubbleTextView.java b/src/com/android/launcher3/views/DoubleShadowBubbleTextView.java
index d89e7f81de..a309e6e95e 100644
--- a/src/com/android/launcher3/views/DoubleShadowBubbleTextView.java
+++ b/src/com/android/launcher3/views/DoubleShadowBubbleTextView.java
@@ -60,7 +60,7 @@ public class DoubleShadowBubbleTextView extends BubbleTextView {
 
         // We enhance the shadow by drawing the shadow twice
         getPaint().setShadowLayer(mShadowInfo.ambientShadowBlur, 0, 0,
-                setColorAlphaBound(mShadowInfo.ambientShadowColor, alpha));
+                getTextShadowColor(mShadowInfo.ambientShadowColor, alpha));
 
         drawWithoutDot(canvas);
         canvas.save();
@@ -68,8 +68,11 @@ public class DoubleShadowBubbleTextView extends BubbleTextView {
                 getScrollX() + getWidth(),
                 getScrollY() + getHeight());
 
-        getPaint().setShadowLayer(mShadowInfo.keyShadowBlur, 0.0f, mShadowInfo.keyShadowOffset,
-                setColorAlphaBound(mShadowInfo.keyShadowColor, alpha));
+        getPaint().setShadowLayer(
+                mShadowInfo.keyShadowBlur,
+                mShadowInfo.keyShadowOffsetX,
+                mShadowInfo.keyShadowOffsetY,
+                getTextShadowColor(mShadowInfo.keyShadowColor, alpha));
         drawWithoutDot(canvas);
         canvas.restore();
 
@@ -81,7 +84,8 @@ public class DoubleShadowBubbleTextView extends BubbleTextView {
         public final int ambientShadowColor;
 
         public final float keyShadowBlur;
-        public final float keyShadowOffset;
+        public final float keyShadowOffsetX;
+        public final float keyShadowOffsetY;
         public final int keyShadowColor;
 
         public ShadowInfo(Context c, AttributeSet attrs, int defStyle) {
@@ -89,11 +93,13 @@ public class DoubleShadowBubbleTextView extends BubbleTextView {
             TypedArray a = c.obtainStyledAttributes(
                     attrs, R.styleable.ShadowInfo, defStyle, 0);
 
-            ambientShadowBlur = a.getDimension(R.styleable.ShadowInfo_ambientShadowBlur, 0);
+            ambientShadowBlur = a.getDimensionPixelSize(
+                    R.styleable.ShadowInfo_ambientShadowBlur, 0);
             ambientShadowColor = a.getColor(R.styleable.ShadowInfo_ambientShadowColor, 0);
 
-            keyShadowBlur = a.getDimension(R.styleable.ShadowInfo_keyShadowBlur, 0);
-            keyShadowOffset = a.getDimension(R.styleable.ShadowInfo_keyShadowOffset, 0);
+            keyShadowBlur = a.getDimensionPixelSize(R.styleable.ShadowInfo_keyShadowBlur, 0);
+            keyShadowOffsetX = a.getDimensionPixelSize(R.styleable.ShadowInfo_keyShadowOffsetX, 0);
+            keyShadowOffsetY = a.getDimensionPixelSize(R.styleable.ShadowInfo_keyShadowOffsetY, 0);
             keyShadowColor = a.getColor(R.styleable.ShadowInfo_keyShadowColor, 0);
             a.recycle();
         }
@@ -105,17 +111,26 @@ public class DoubleShadowBubbleTextView extends BubbleTextView {
             if (textAlpha == 0 || (keyShadowAlpha == 0 && ambientShadowAlpha == 0)) {
                 textView.getPaint().clearShadowLayer();
                 return true;
-            } else if (ambientShadowAlpha > 0) {
+            } else if (ambientShadowAlpha > 0 && keyShadowAlpha == 0) {
                 textView.getPaint().setShadowLayer(ambientShadowBlur, 0, 0,
-                        setColorAlphaBound(ambientShadowColor, textAlpha));
+                        getTextShadowColor(ambientShadowColor, textAlpha));
                 return true;
-            } else if (keyShadowAlpha > 0) {
-                textView.getPaint().setShadowLayer(keyShadowBlur, 0.0f, keyShadowOffset,
-                        setColorAlphaBound(keyShadowColor, textAlpha));
+            } else if (keyShadowAlpha > 0 && ambientShadowAlpha == 0) {
+                textView.getPaint().setShadowLayer(
+                        keyShadowBlur,
+                        keyShadowOffsetX,
+                        keyShadowOffsetY,
+                        getTextShadowColor(keyShadowColor, textAlpha));
                 return true;
             } else {
                 return false;
             }
         }
     }
+
+    // Multiplies the alpha of shadowColor by textAlpha.
+    private static int getTextShadowColor(int shadowColor, int textAlpha) {
+        return setColorAlphaBound(shadowColor,
+                Math.round(Color.alpha(shadowColor) * textAlpha / 255f));
+    }
 }
-- 
GitLab


From 35c7b19fa8938c222411d40dad9723f683d1d29f Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 20 Apr 2021 16:51:10 -0700
Subject: [PATCH 0952/1664] Using WindowContext for listening to configuration
 changes

Pre-S: Continue to use config-changed broadcast for configuration changes
and display-changed event for rotation changes
S+: Use WindowContext#componentCallbacks for config and rotation changes, and
continue to use display listener for frame-rate changes

Bug: 179308296
Test: Manual and presubmit
Change-Id: I533e69068b5fa6c052a02759ef309dd075ee6a4b
---
 .../OrientationTouchTransformerTest.java      |  30 +-
 .../quickstep/util/TaskViewSimulatorTest.java |   2 +-
 .../launcher3/BaseQuickstepLauncher.java      |   2 +-
 ...ButtonNavbarToOverviewTouchController.java |   2 +-
 .../RecentsAnimationDeviceState.java          |  31 +-
 .../quickstep/RotationTouchHelper.java        |  32 +-
 .../com/android/quickstep/TaskViewUtils.java  |   4 +-
 .../FallbackNavBarTouchController.java        |   2 +-
 .../DeviceLockedInputConsumer.java            |   2 +-
 .../OneHandedModeInputConsumer.java           |   5 +-
 .../quickstep/util/SplitScreenBounds.java     |   2 +-
 .../launcher3/BaseDraggingActivity.java       |   7 +-
 src/com/android/launcher3/DeviceProfile.java  |  57 +--
 .../launcher3/InvariantDeviceProfile.java     |  32 +-
 src/com/android/launcher3/Partner.java        |   2 +-
 src/com/android/launcher3/Utilities.java      |   4 +-
 .../android/launcher3/util/ConfigMonitor.java | 132 -------
 .../launcher3/util/DisplayController.java     | 326 ++++++++----------
 .../launcher3/views/FloatingSurfaceView.java  |   2 +-
 19 files changed, 263 insertions(+), 413 deletions(-)
 delete mode 100644 src/com/android/launcher3/util/ConfigMonitor.java

diff --git a/quickstep/robolectric_tests/src/com/android/quickstep/OrientationTouchTransformerTest.java b/quickstep/robolectric_tests/src/com/android/quickstep/OrientationTouchTransformerTest.java
index e771962ba6..2b1b57c450 100644
--- a/quickstep/robolectric_tests/src/com/android/quickstep/OrientationTouchTransformerTest.java
+++ b/quickstep/robolectric_tests/src/com/android/quickstep/OrientationTouchTransformerTest.java
@@ -17,17 +17,26 @@
 
 package com.android.quickstep;
 
+import static android.view.Display.DEFAULT_DISPLAY;
+
 import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
+import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Point;
+import android.hardware.display.DisplayManager;
 import android.util.DisplayMetrics;
+import android.view.Display;
 import android.view.MotionEvent;
 import android.view.Surface;
 
@@ -35,11 +44,11 @@ import com.android.launcher3.ResourceUtils;
 import com.android.launcher3.util.DisplayController;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
 
 @RunWith(RobolectricTestRunner.class)
 public class OrientationTouchTransformerTest {
@@ -284,11 +293,26 @@ public class OrientationTouchTransformerTest {
     }
 
     private DisplayController.Info createDisplayInfo(ScreenSize screenSize, int rotation) {
+        Context context = RuntimeEnvironment.application;
+        Display display = spy(context.getSystemService(DisplayManager.class)
+                .getDisplay(DEFAULT_DISPLAY));
+
         Point p = new Point(screenSize.mWidth, screenSize.mHeight);
         if (rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270) {
-            p = new Point(screenSize.mHeight, screenSize.mWidth);
+            p.set(screenSize.mHeight, screenSize.mWidth);
         }
-        return new DisplayController.Info(0, rotation, 0, p, p, p, null);
+
+        doReturn(rotation).when(display).getRotation();
+        doAnswer(i -> {
+            ((Point) i.getArgument(0)).set(p.x, p.y);
+            return null;
+        }).when(display).getRealSize(any(Point.class));
+        doAnswer(i -> {
+            ((Point) i.getArgument(0)).set(p.x, p.y);
+            ((Point) i.getArgument(1)).set(p.x, p.y);
+            return null;
+        }).when(display).getCurrentSizeRange(any(Point.class), any(Point.class));
+        return new DisplayController.Info(context, display);
     }
 
     private float generateTouchRegionHeight(ScreenSize screenSize, int rotation) {
diff --git a/quickstep/robolectric_tests/src/com/android/quickstep/util/TaskViewSimulatorTest.java b/quickstep/robolectric_tests/src/com/android/quickstep/util/TaskViewSimulatorTest.java
index 88079aee73..fd93d98bed 100644
--- a/quickstep/robolectric_tests/src/com/android/quickstep/util/TaskViewSimulatorTest.java
+++ b/quickstep/robolectric_tests/src/com/android/quickstep/util/TaskViewSimulatorTest.java
@@ -147,7 +147,7 @@ public class TaskViewSimulatorTest {
                     LauncherActivityInterface.INSTANCE);
             tvs.setDp(mDeviceProfile);
 
-            int launcherRotation = DisplayController.getDefaultDisplay(mContext).getInfo().rotation;
+            int launcherRotation = DisplayController.INSTANCE.get(mContext).getInfo().rotation;
             if (mAppRotation < 0) {
                 mAppRotation = launcherRotation;
             }
diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 0524b213b2..fb9765c633 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -19,7 +19,7 @@ import static com.android.launcher3.AbstractFloatingView.TYPE_ALL;
 import static com.android.launcher3.AbstractFloatingView.TYPE_HIDE_BACK_BUTTON;
 import static com.android.launcher3.LauncherState.FLAG_HIDE_BACK_BUTTON;
 import static com.android.launcher3.LauncherState.NORMAL;
-import static com.android.launcher3.util.DisplayController.DisplayHolder.CHANGE_SIZE;
+import static com.android.launcher3.util.DisplayController.CHANGE_SIZE;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY;
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
index 74a253eb3a..694998c476 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -267,7 +267,7 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
     }
 
     private float dpiFromPx(float pixels) {
-        return Utilities.dpiFromPx(pixels, mLauncher.getResources().getDisplayMetrics());
+        return Utilities.dpiFromPx(pixels, mLauncher.getResources().getDisplayMetrics().densityDpi);
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index 23e35f6307..6cf12a3865 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -17,8 +17,8 @@ package com.android.quickstep;
 
 import static android.content.Intent.ACTION_USER_UNLOCKED;
 
-import static com.android.launcher3.util.DisplayController.DisplayHolder.CHANGE_ALL;
-import static com.android.launcher3.util.DisplayController.DisplayHolder.CHANGE_FRAME_DELAY;
+import static com.android.launcher3.util.DisplayController.CHANGE_ALL;
+import static com.android.launcher3.util.DisplayController.CHANGE_FRAME_DELAY;
 import static com.android.launcher3.util.SettingsCache.ONE_HANDED_ENABLED;
 import static com.android.launcher3.util.SettingsCache.ONE_HANDED_SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED;
 import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
@@ -62,7 +62,6 @@ import androidx.annotation.BinderThread;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.util.DisplayController;
-import com.android.launcher3.util.DisplayController.DisplayHolder;
 import com.android.launcher3.util.DisplayController.DisplayInfoChangeListener;
 import com.android.launcher3.util.DisplayController.Info;
 import com.android.launcher3.util.SettingsCache;
@@ -91,7 +90,7 @@ public class RecentsAnimationDeviceState implements
 
     private final Context mContext;
     private final SysUINavigationMode mSysUiNavMode;
-    private final DisplayHolder mDisplayHolder;
+    private final DisplayController mDisplayController;
     private final int mDisplayId;
     private final RotationTouchHelper mRotationTouchHelper;
 
@@ -128,17 +127,13 @@ public class RecentsAnimationDeviceState implements
     private boolean mIsUserSetupComplete;
 
     public RecentsAnimationDeviceState(Context context) {
-        this(context, DisplayController.getDefaultDisplay(context));
-    }
-
-    public RecentsAnimationDeviceState(Context context, DisplayHolder displayHolder) {
         mContext = context;
-        mDisplayHolder = displayHolder;
+        mDisplayController = DisplayController.INSTANCE.get(context);
         mSysUiNavMode = SysUINavigationMode.INSTANCE.get(context);
-        mDisplayId = mDisplayHolder.getInfo().id;
+        mDisplayId = mDisplayController.getInfo().id;
         mIsOneHandedModeSupported = SystemProperties.getBoolean(SUPPORT_ONE_HANDED_MODE, false);
-        runOnDestroy(() -> mDisplayHolder.removeChangeListener(this));
-        mRotationTouchHelper = new RotationTouchHelper(context, mDisplayHolder);
+        runOnDestroy(() -> mDisplayController.removeChangeListener(this));
+        mRotationTouchHelper = new RotationTouchHelper(context, mDisplayController);
         runOnDestroy(mRotationTouchHelper::destroy);
 
         // Register for user unlocked if necessary
@@ -244,9 +239,9 @@ public class RecentsAnimationDeviceState implements
 
     @Override
     public void onNavigationModeChanged(SysUINavigationMode.Mode newMode) {
-        mDisplayHolder.removeChangeListener(this);
-        mDisplayHolder.addChangeListener(this);
-        onDisplayInfoChanged(mDisplayHolder.getInfo(), CHANGE_ALL);
+        mDisplayController.removeChangeListener(this);
+        mDisplayController.addChangeListener(this);
+        onDisplayInfoChanged(mDisplayController.getInfo(), CHANGE_ALL);
 
         if (newMode == NO_BUTTON) {
             mExclusionListener.register();
@@ -254,7 +249,7 @@ public class RecentsAnimationDeviceState implements
             mExclusionListener.unregister();
         }
 
-        mNavBarPosition = new NavBarPosition(newMode, mDisplayHolder.getInfo());
+        mNavBarPosition = new NavBarPosition(newMode, mDisplayController.getInfo());
         mMode = newMode;
     }
 
@@ -556,11 +551,11 @@ public class RecentsAnimationDeviceState implements
         }
 
         if (mIsOneHandedModeEnabled || mIsSwipeToNotificationEnabled) {
-            final Info displayInfo = mDisplayHolder.getInfo();
+            final Info displayInfo = mDisplayController.getInfo();
             return (mRotationTouchHelper.touchInOneHandedModeRegion(ev)
                 && displayInfo.rotation != Surface.ROTATION_90
                 && displayInfo.rotation != Surface.ROTATION_270
-                && displayInfo.metrics.densityDpi < DisplayMetrics.DENSITY_600);
+                && displayInfo.densityDpi < DisplayMetrics.DENSITY_600);
         }
         return false;
     }
diff --git a/quickstep/src/com/android/quickstep/RotationTouchHelper.java b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
index 2cf32122cf..d4ad1760ef 100644
--- a/quickstep/src/com/android/quickstep/RotationTouchHelper.java
+++ b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
@@ -17,8 +17,8 @@ package com.android.quickstep;
 
 import static android.view.Surface.ROTATION_0;
 
-import static com.android.launcher3.util.DisplayController.DisplayHolder.CHANGE_ALL;
-import static com.android.launcher3.util.DisplayController.DisplayHolder.CHANGE_FRAME_DELAY;
+import static com.android.launcher3.util.DisplayController.CHANGE_ALL;
+import static com.android.launcher3.util.DisplayController.CHANGE_FRAME_DELAY;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.quickstep.SysUINavigationMode.Mode.THREE_BUTTONS;
 
@@ -28,7 +28,7 @@ import android.view.MotionEvent;
 import android.view.OrientationEventListener;
 
 import com.android.launcher3.testing.TestProtocol;
-import com.android.launcher3.util.DisplayController.DisplayHolder;
+import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.DisplayController.DisplayInfoChangeListener;
 import com.android.launcher3.util.DisplayController.Info;
 import com.android.quickstep.util.RecentsOrientedState;
@@ -44,7 +44,7 @@ public class RotationTouchHelper implements
         DisplayInfoChangeListener {
 
     private final OrientationTouchTransformer mOrientationTouchTransformer;
-    private final DisplayHolder mDisplayHolder;
+    private final DisplayController mDisplayController;
     private final SysUINavigationMode mSysUiNavMode;
     private final int mDisplayId;
     private int mDisplayRotation;
@@ -121,12 +121,12 @@ public class RotationTouchHelper implements
 
     private final Context mContext;
 
-    public RotationTouchHelper(Context context, DisplayHolder displayHolder) {
+    public RotationTouchHelper(Context context, DisplayController displayController) {
         mContext = context;
-        mDisplayHolder = displayHolder;
+        mDisplayController = displayController;
         Resources resources = mContext.getResources();
         mSysUiNavMode = SysUINavigationMode.INSTANCE.get(context);
-        mDisplayId = mDisplayHolder.getInfo().id;
+        mDisplayId = mDisplayController.getInfo().id;
 
         mOrientationTouchTransformer = new OrientationTouchTransformer(resources, mMode,
                 () -> QuickStepContract.getWindowCornerRadius(resources));
@@ -201,7 +201,7 @@ public class RotationTouchHelper implements
             return;
         }
 
-        mOrientationTouchTransformer.createOrAddTouchRegion(mDisplayHolder.getInfo());
+        mOrientationTouchTransformer.createOrAddTouchRegion(mDisplayController.getInfo());
     }
 
     /**
@@ -223,11 +223,11 @@ public class RotationTouchHelper implements
 
     @Override
     public void onNavigationModeChanged(SysUINavigationMode.Mode newMode) {
-        mDisplayHolder.removeChangeListener(this);
-        mDisplayHolder.addChangeListener(this);
-        onDisplayInfoChanged(mDisplayHolder.getInfo(), CHANGE_ALL);
+        mDisplayController.removeChangeListener(this);
+        mDisplayController.addChangeListener(this);
+        onDisplayInfoChanged(mDisplayController.getInfo(), CHANGE_ALL);
 
-        mOrientationTouchTransformer.setNavigationMode(newMode, mDisplayHolder.getInfo(),
+        mOrientationTouchTransformer.setNavigationMode(newMode, mDisplayController.getInfo(),
             mContext.getResources());
         if (!mMode.hasGestures && newMode.hasGestures) {
             setupOrientationSwipeHandler();
@@ -276,8 +276,8 @@ public class RotationTouchHelper implements
      * Sets the gestural height.
      */
     void setGesturalHeight(int newGesturalHeight) {
-        mOrientationTouchTransformer.setGesturalHeight(newGesturalHeight, mDisplayHolder.getInfo(),
-            mContext.getResources());
+        mOrientationTouchTransformer.setGesturalHeight(
+                newGesturalHeight, mDisplayController.getInfo(), mContext.getResources());
     }
 
     /**
@@ -293,7 +293,7 @@ public class RotationTouchHelper implements
     }
 
     private void enableMultipleRegions(boolean enable) {
-        mOrientationTouchTransformer.enableMultipleRegions(enable, mDisplayHolder.getInfo());
+        mOrientationTouchTransformer.enableMultipleRegions(enable, mDisplayController.getInfo());
         notifySysuiOfCurrentRotation(mOrientationTouchTransformer.getQuickStepStartingRotation());
         if (enable && !mInOverview && !TestProtocol.sDisableSensorRotation) {
             // Clear any previous state from sensor manager
@@ -356,7 +356,7 @@ public class RotationTouchHelper implements
      * notifies system UI of the primary rotation the user is interacting with
      */
     private void toggleSecondaryNavBarsForRotation() {
-        mOrientationTouchTransformer.setSingleActiveRegion(mDisplayHolder.getInfo());
+        mOrientationTouchTransformer.setSingleActiveRegion(mDisplayController.getInfo());
         notifySysuiOfCurrentRotation(mOrientationTouchTransformer.getCurrentActiveRotation());
     }
 
diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java
index 1db587285e..a59ba5136d 100644
--- a/quickstep/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java
@@ -209,7 +209,7 @@ public final class TaskViewUtils {
 
             // RecentsView never updates the display rotation until swipe-up so the value may
             // be stale. Use the display value instead.
-            int displayRotation = DisplayController.getDefaultDisplay(context).getInfo().rotation;
+            int displayRotation = DisplayController.INSTANCE.get(context).getInfo().rotation;
             tsv.getOrientationState().update(displayRotation, displayRotation);
 
             tsv.setPreview(targets.apps[targets.apps.length - 1]);
@@ -437,7 +437,7 @@ public final class TaskViewUtils {
 
             // RecentsView never updates the display rotation until swipe-up so the value may
             // be stale. Use the display value instead.
-            int displayRotation = DisplayController.getDefaultDisplay(recentsView.getContext())
+            int displayRotation = DisplayController.INSTANCE.get(recentsView.getContext())
                     .getInfo().rotation;
             tvs.getOrientationState().update(displayRotation, displayRotation);
 
diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackNavBarTouchController.java b/quickstep/src/com/android/quickstep/fallback/FallbackNavBarTouchController.java
index a4a7bd3ae9..9d9ef94169 100644
--- a/quickstep/src/com/android/quickstep/fallback/FallbackNavBarTouchController.java
+++ b/quickstep/src/com/android/quickstep/fallback/FallbackNavBarTouchController.java
@@ -43,7 +43,7 @@ public class FallbackNavBarTouchController implements TouchController,
         SysUINavigationMode.Mode sysUINavigationMode = SysUINavigationMode.getMode(mActivity);
         if (sysUINavigationMode == SysUINavigationMode.Mode.NO_BUTTON) {
             NavBarPosition navBarPosition = new NavBarPosition(sysUINavigationMode,
-                    DisplayController.getDefaultDisplay(mActivity).getInfo());
+                    DisplayController.INSTANCE.get(mActivity).getInfo());
             mTriggerSwipeUpTracker = new TriggerSwipeUpTouchTracker(mActivity,
                     true /* disableHorizontalSwipe */, navBarPosition,
                     null /* onInterceptTouch */, this);
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
index 85ecab15a1..9c647946ea 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
@@ -116,7 +116,7 @@ public class DeviceLockedInputConsumer implements InputConsumer,
                 R.dimen.device_locked_y_offset);
 
         // Do not use DeviceProfile as the user data might be locked
-        mDisplaySize = DisplayController.getDefaultDisplay(context).getInfo().realSize;
+        mDisplaySize = DisplayController.INSTANCE.get(context).getInfo().realSize;
 
         // Init states
         mStateCallback = new MultiStateCallback(STATE_NAMES);
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
index cd69cf1366..d82d43d7f8 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
@@ -44,12 +44,10 @@ import com.android.systemui.shared.system.InputMonitorCompat;
  */
 public class OneHandedModeInputConsumer extends DelegateInputConsumer {
 
-    private static final String TAG = "OneHandedModeInputConsumer";
     private static final int ANGLE_MAX = 150;
     private static final int ANGLE_MIN = 30;
 
     private final Context mContext;
-    private final DisplayController.DisplayHolder mDisplayHolder;
     private final Point mDisplaySize;
     private final RecentsAnimationDeviceState mDeviceState;
 
@@ -68,12 +66,11 @@ public class OneHandedModeInputConsumer extends DelegateInputConsumer {
             InputConsumer delegate, InputMonitorCompat inputMonitor) {
         super(delegate, inputMonitor);
         mContext = context;
-        mDisplayHolder = DisplayController.getDefaultDisplay(mContext);
         mDeviceState = deviceState;
         mDragDistThreshold = context.getResources().getDimensionPixelSize(
                 R.dimen.gestures_onehanded_drag_threshold);
         mSquaredSlop = Utilities.squaredTouchSlop(context);
-        mDisplaySize = mDisplayHolder.getInfo().realSize;
+        mDisplaySize = DisplayController.INSTANCE.get(mContext).getInfo().realSize;
         mNavBarSize = ResourceUtils.getNavbarSize(NAVBAR_BOTTOM_GESTURE_SIZE,
                 mContext.getResources());
     }
diff --git a/quickstep/src/com/android/quickstep/util/SplitScreenBounds.java b/quickstep/src/com/android/quickstep/util/SplitScreenBounds.java
index 176478f1dc..88cc650276 100644
--- a/quickstep/src/com/android/quickstep/util/SplitScreenBounds.java
+++ b/quickstep/src/com/android/quickstep/util/SplitScreenBounds.java
@@ -77,7 +77,7 @@ public class SplitScreenBounds {
 
         WindowBounds bounds = new WindowBounds(wm.getBounds(),
                 new Rect(insets.left, insets.top, insets.right, insets.bottom));
-        int rotation = DisplayController.getDefaultDisplay(context).getInfo().rotation;
+        int rotation = DisplayController.INSTANCE.get(context).getInfo().rotation;
         int halfDividerSize = context.getResources()
                 .getDimensionPixelSize(R.dimen.multi_window_task_divider_size) / 2;
 
diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java
index 5ba03edcb4..e9412d9aa8 100644
--- a/src/com/android/launcher3/BaseDraggingActivity.java
+++ b/src/com/android/launcher3/BaseDraggingActivity.java
@@ -17,7 +17,7 @@
 package com.android.launcher3;
 
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_APP_LAUNCH_TAP;
-import static com.android.launcher3.util.DisplayController.DisplayHolder.CHANGE_ROTATION;
+import static com.android.launcher3.util.DisplayController.CHANGE_ROTATION;
 
 import android.app.ActivityOptions;
 import android.content.ActivityNotFoundException;
@@ -28,7 +28,6 @@ import android.graphics.Insets;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.os.Binder;
 import android.os.Bundle;
 import android.os.Process;
 import android.os.StrictMode;
@@ -92,7 +91,7 @@ public abstract class BaseDraggingActivity extends BaseActivity
 
         mIsSafeModeEnabled = TraceHelper.allowIpcs("isSafeMode",
                 () -> getPackageManager().isSafeMode());
-        DisplayController.getDefaultDisplay(this).addChangeListener(this);
+        DisplayController.INSTANCE.get(this).addChangeListener(this);
 
         // Update theme
         WallpaperColorInfo.INSTANCE.get(this).addOnChangeListener(this);
@@ -279,7 +278,7 @@ public abstract class BaseDraggingActivity extends BaseActivity
     protected void onDestroy() {
         super.onDestroy();
         WallpaperColorInfo.INSTANCE.get(this).removeOnChangeListener(this);
-        DisplayController.getDefaultDisplay(this).removeChangeListener(this);
+        DisplayController.INSTANCE.get(this).removeChangeListener(this);
     }
 
     public void runOnceOnStart(Runnable action) {
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index dae4f3b8dd..a6fc0f34c0 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -16,15 +16,20 @@
 
 package com.android.launcher3;
 
+import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION;
+
 import static com.android.launcher3.ResourceUtils.pxFromDp;
 import static com.android.launcher3.Utilities.dpiFromPx;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Point;
 import android.graphics.PointF;
 import android.graphics.Rect;
+import android.hardware.display.DisplayManager;
+import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Surface;
 import android.view.WindowInsets;
@@ -43,6 +48,7 @@ import com.android.launcher3.util.WindowBounds;
 
 import java.io.PrintWriter;
 
+@SuppressLint("NewApi")
 public class DeviceProfile {
 
     private static final float TABLET_MIN_DPS = 600;
@@ -51,6 +57,7 @@ public class DeviceProfile {
 
     public final InvariantDeviceProfile inv;
     private final Info mInfo;
+    private final DisplayMetrics mMetrics;
 
     // Device properties
     public final boolean isTablet;
@@ -214,7 +221,8 @@ public class DeviceProfile {
         mInfo = info;
 
         // Constants from resources
-        float swDPs = dpiFromPx(Math.min(info.smallestSize.x, info.smallestSize.y), info.metrics);
+        float swDPs = dpiFromPx(Math.min(info.smallestSize.x, info.smallestSize.y),
+                info.densityDpi);
         boolean allowRotation = context.getResources().getBoolean(R.bool.allow_rotation);
         // Tablet UI is built with assumption that simulated landscape is disabled.
         isTablet = allowRotation && swDPs >= TABLET_MIN_DPS;
@@ -227,6 +235,7 @@ public class DeviceProfile {
         context = getContext(context, info, isVerticalBarLayout()
                 ? Configuration.ORIENTATION_LANDSCAPE
                 : Configuration.ORIENTATION_PORTRAIT);
+        mMetrics = context.getResources().getDisplayMetrics();
         final Resources res = context.getResources();
 
         isTaskbarPresent = isTablet && FeatureFlags.ENABLE_TASKBAR.get();
@@ -234,11 +243,13 @@ public class DeviceProfile {
             // Taskbar will be added later, but provides bottom insets that we should subtract
             // from availableHeightPx.
             taskbarSize = res.getDimensionPixelSize(R.dimen.taskbar_size);
-            WindowInsets windowInsets = DisplayController.INSTANCE.get(context).getHolder(mInfo.id)
-                    .getDisplayContext().getSystemService(WindowManager.class)
+            WindowInsets windowInsets =
+                    context.createWindowContext(
+                            context.getSystemService(DisplayManager.class).getDisplay(mInfo.id),
+                            TYPE_APPLICATION, null)
+                    .getSystemService(WindowManager.class)
                     .getCurrentWindowMetrics().getWindowInsets();
-            nonOverlappingTaskbarInset =
-                    taskbarSize - windowInsets.getSystemWindowInsetBottom();
+            nonOverlappingTaskbarInset = taskbarSize - windowInsets.getSystemWindowInsetBottom();
             if (nonOverlappingTaskbarInset > 0) {
                 nonFinalAvailableHeightPx -= nonOverlappingTaskbarInset;
             }
@@ -261,7 +272,7 @@ public class DeviceProfile {
                 res.getDimensionPixelSize(R.dimen.folder_content_padding_left_right);
         folderContentPaddingTop = res.getDimensionPixelSize(R.dimen.folder_content_padding_top);
 
-        setCellLayoutBorderSpacing(pxFromDp(inv.borderSpacing, mInfo.metrics, 1f));
+        setCellLayoutBorderSpacing(pxFromDp(inv.borderSpacing, mMetrics, 1f));
         cellLayoutBorderSpacingOriginalPx = cellLayoutBorderSpacingPx;
         folderCellLayoutBorderSpacingPx = cellLayoutBorderSpacingPx;
 
@@ -308,7 +319,7 @@ public class DeviceProfile {
         hotseatBarSidePaddingStartPx = isVerticalBarLayout() ? workspacePageIndicatorHeight : 0;
         int hotseatExtraVerticalSize =
                 res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_extra_vertical_size);
-        hotseatBarSizePx = pxFromDp(inv.iconSize, mInfo.metrics, 1f)
+        hotseatBarSizePx = pxFromDp(inv.iconSize, mMetrics, 1f)
                 + (isVerticalBarLayout()
                 ? (hotseatBarSidePaddingStartPx + hotseatBarSidePaddingEndPx)
                 : (hotseatBarTopPaddingPx + hotseatBarBottomPaddingPx
@@ -511,16 +522,16 @@ public class DeviceProfile {
         // Workspace
         final boolean isVerticalLayout = isVerticalBarLayout();
         float invIconSizeDp = isLandscape ? inv.landscapeIconSize : inv.iconSize;
-        iconSizePx = Math.max(1, pxFromDp(invIconSizeDp, mInfo.metrics, scale));
+        iconSizePx = Math.max(1, pxFromDp(invIconSizeDp, mMetrics, scale));
         float invIconTextSizeSp = isLandscape ? inv.landscapeIconTextSize : inv.iconTextSize;
-        iconTextSizePx = (int) (Utilities.pxFromSp(invIconTextSizeSp, mInfo.metrics) * scale);
+        iconTextSizePx = (int) (Utilities.pxFromSp(invIconTextSizeSp, mMetrics) * scale);
         iconDrawablePaddingPx = (int) (iconDrawablePaddingOriginalPx * scale);
 
         setCellLayoutBorderSpacing((int) (cellLayoutBorderSpacingOriginalPx * scale));
 
         if (isScalableGrid) {
-            cellWidthPx = pxFromDp(inv.minCellWidth, mInfo.metrics, scale);
-            cellHeightPx = pxFromDp(inv.minCellHeight, mInfo.metrics, scale);
+            cellWidthPx = pxFromDp(inv.minCellWidth, mMetrics, scale);
+            cellHeightPx = pxFromDp(inv.minCellHeight, mMetrics, scale);
             int cellContentHeight = iconSizePx + iconDrawablePaddingPx
                     + Utilities.calculateTextHeight(iconTextSizePx);
             cellYPaddingPx = Math.max(0, cellHeightPx - cellContentHeight) / 2;
@@ -542,8 +553,8 @@ public class DeviceProfile {
 
         // All apps
         if (allAppsHasDifferentNumColumns()) {
-            allAppsIconSizePx = pxFromDp(inv.allAppsIconSize, mInfo.metrics);
-            allAppsIconTextSizePx = Utilities.pxFromSp(inv.allAppsIconTextSize, mInfo.metrics);
+            allAppsIconSizePx = pxFromDp(inv.allAppsIconSize, mMetrics);
+            allAppsIconTextSizePx = Utilities.pxFromSp(inv.allAppsIconTextSize, mMetrics);
             allAppsIconDrawablePaddingPx = iconDrawablePaddingOriginalPx;
             autoResizeAllAppsCells();
         } else {
@@ -613,8 +624,8 @@ public class DeviceProfile {
 
     private void updateFolderCellSize(float scale, Resources res) {
         float invIconSizeDp = isVerticalBarLayout() ? inv.landscapeIconSize : inv.iconSize;
-        folderChildIconSizePx = Math.max(1, pxFromDp(invIconSizeDp, mInfo.metrics, scale));
-        folderChildTextSizePx = pxFromDp(inv.iconTextSize, mInfo.metrics, scale);
+        folderChildIconSizePx = Math.max(1, pxFromDp(invIconSizeDp, mMetrics, scale));
+        folderChildTextSizePx = pxFromDp(inv.iconTextSize, mMetrics, scale);
         folderLabelTextSizePx = (int) (folderChildTextSizePx * folderLabelTextScale);
 
         int textHeight = Utilities.calculateTextHeight(folderChildTextSizePx);
@@ -801,14 +812,8 @@ public class DeviceProfile {
      */
     public boolean updateIsSeascape(Context context) {
         if (isVerticalBarLayout()) {
-            // Check an up-to-date info.
-            DisplayController.Info displayInfo = DisplayController.getDefaultDisplay(context)
-                    .createInfoForContext(context);
-            if (displayInfo == null) {
-                return false;
-            }
-
-            boolean isSeascape = displayInfo.rotation == Surface.ROTATION_270;
+            boolean isSeascape = DisplayController.INSTANCE.get(context)
+                    .getInfo().rotation == Surface.ROTATION_270;
             if (mIsSeascape != isSeascape) {
                 mIsSeascape = isSeascape;
                 return true;
@@ -840,12 +845,12 @@ public class DeviceProfile {
     }
 
     private String pxToDpStr(String name, float value) {
-        return "\t" + name + ": " + value + "px (" + dpiFromPx(value, mInfo.metrics) + "dp)";
+        return "\t" + name + ": " + value + "px (" + dpiFromPx(value, mMetrics.densityDpi) + "dp)";
     }
 
     public void dump(String prefix, PrintWriter writer) {
         writer.println(prefix + "DeviceProfile:");
-        writer.println(prefix + "\t1 dp = " + mInfo.metrics.density + " px");
+        writer.println(prefix + "\t1 dp = " + mMetrics.density + " px");
 
         writer.println(prefix + "\tisTablet:" + isTablet);
         writer.println(prefix + "\tisLargeTablet:" + isLargeTablet);
@@ -938,7 +943,7 @@ public class DeviceProfile {
     private static Context getContext(Context c, Info info, int orientation) {
         Configuration config = new Configuration(c.getResources().getConfiguration());
         config.orientation = orientation;
-        config.densityDpi = info.metrics.densityDpi;
+        config.densityDpi = info.densityDpi;
         return c.createConfigurationContext(config);
     }
 
diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index 61023be019..3c85564125 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -20,6 +20,8 @@ import static com.android.launcher3.Utilities.getDevicePrefs;
 import static com.android.launcher3.Utilities.getPointString;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_FOUR_COLUMNS;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_TWO_PANEL_HOME;
+import static com.android.launcher3.util.DisplayController.CHANGE_DENSITY;
+import static com.android.launcher3.util.DisplayController.CHANGE_SIZE;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.PackageManagerHelper.getPackageFilter;
 
@@ -49,7 +51,6 @@ import androidx.annotation.VisibleForTesting;
 
 import com.android.launcher3.graphics.IconShape;
 import com.android.launcher3.testing.TestProtocol;
-import com.android.launcher3.util.ConfigMonitor;
 import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.DisplayController.Info;
 import com.android.launcher3.util.IntArray;
@@ -156,7 +157,6 @@ public class InvariantDeviceProfile {
     public Rect defaultWidgetPadding;
 
     private final ArrayList<OnIDPChangeListener> mChangeListeners = new ArrayList<>();
-    private ConfigMonitor mConfigMonitor;
     private OverlayMonitor mOverlayMonitor;
 
     @VisibleForTesting
@@ -203,7 +203,12 @@ public class InvariantDeviceProfile {
                 .putString(KEY_MIGRATION_SRC_WORKSPACE_SIZE, getPointString(numColumns, numRows))
                 .apply();
 
-        mConfigMonitor = new ConfigMonitor(context, this::onConfigChanged);
+        DisplayController.INSTANCE.get(context).addChangeListener(
+                (info, flags) -> {
+                    if ((flags & (CHANGE_SIZE | CHANGE_DENSITY)) != 0) {
+                        onConfigChanged(context);
+                    }
+                });
         mOverlayMonitor = new OverlayMonitor(context);
     }
 
@@ -227,7 +232,7 @@ public class InvariantDeviceProfile {
 
         // Get the display info based on default display and interpolate it to existing display
         DisplayOption defaultDisplayOption = invDistWeightedInterpolate(
-                DisplayController.getDefaultDisplay(context).getInfo(),
+                DisplayController.INSTANCE.get(context).getInfo(),
                 getPredefinedDeviceProfiles(context, gridName));
 
         Info myInfo = new Info(context, display);
@@ -276,7 +281,7 @@ public class InvariantDeviceProfile {
     }
 
     private String initGrid(Context context, String gridName) {
-        Info displayInfo = DisplayController.getDefaultDisplay(context).getInfo();
+        Info displayInfo = DisplayController.INSTANCE.get(context).getInfo();
         ArrayList<DisplayOption> allOptions = getPredefinedDeviceProfiles(context, gridName);
 
         DisplayOption displayOption = invDistWeightedInterpolate(displayInfo, allOptions);
@@ -286,6 +291,7 @@ public class InvariantDeviceProfile {
 
     private void initGrid(
             Context context, Info displayInfo, DisplayOption displayOption) {
+        DisplayMetrics metrics = context.getResources().getDisplayMetrics();
         GridOption closestProfile = displayOption.grid;
         numRows = closestProfile.numRows;
         numColumns = closestProfile.numColumns;
@@ -303,7 +309,7 @@ public class InvariantDeviceProfile {
         iconSize = displayOption.iconSize;
         iconShapePath = getIconShapePath(context);
         landscapeIconSize = displayOption.landscapeIconSize;
-        iconBitmapSize = ResourceUtils.pxFromDp(iconSize, displayInfo.metrics);
+        iconBitmapSize = ResourceUtils.pxFromDp(iconSize, metrics);
         iconTextSize = displayOption.iconTextSize;
         landscapeIconTextSize = displayOption.landscapeIconTextSize;
         fillResIconDpi = getLauncherIconDensity(iconBitmapSize);
@@ -328,7 +334,7 @@ public class InvariantDeviceProfile {
 
         // If the partner customization apk contains any grid overrides, apply them
         // Supported overrides: numRows, numColumns, iconSize
-        applyPartnerDeviceProfileOverrides(context, displayInfo.metrics);
+        applyPartnerDeviceProfileOverrides(context, metrics);
 
         Point realSize = new Point(displayInfo.realSize);
         // The real size never changes. smallSide and largeSide will remain the
@@ -425,10 +431,6 @@ public class InvariantDeviceProfile {
     }
 
     private void apply(Context context, int changeFlags) {
-        // Create a new config monitor
-        mConfigMonitor.unregister();
-        mConfigMonitor = new ConfigMonitor(context, this::onConfigChanged);
-
         for (OnIDPChangeListener listener : mChangeListeners) {
             listener.onIdpChanged(changeFlags, this);
         }
@@ -530,10 +532,10 @@ public class InvariantDeviceProfile {
         Point largestSize = new Point(displayInfo.largestSize);
 
         // This guarantees that width < height
-        float width = Utilities.dpiFromPx(Math.min(smallestSize.x, smallestSize.y),
-                displayInfo.metrics);
-        float height = Utilities.dpiFromPx(Math.min(largestSize.x, largestSize.y),
-                displayInfo.metrics);
+        float width = Utilities.dpiFromPx((float) Math.min(smallestSize.x, smallestSize.y),
+                displayInfo.densityDpi);
+        float height = Utilities.dpiFromPx((float) Math.min(largestSize.x, largestSize.y),
+                displayInfo.densityDpi);
 
         // Sort the profiles based on the closeness to the device size
         Collections.sort(points, (a, b) ->
diff --git a/src/com/android/launcher3/Partner.java b/src/com/android/launcher3/Partner.java
index d79f62d470..0bdb37c076 100644
--- a/src/com/android/launcher3/Partner.java
+++ b/src/com/android/launcher3/Partner.java
@@ -129,7 +129,7 @@ public class Partner {
                     "dimen", getPackageName());
             if (resId > 0) {
                 int px = getResources().getDimensionPixelSize(resId);
-                iconSize = Utilities.dpiFromPx(px, dm);
+                iconSize = Utilities.dpiFromPx((float) px, dm.densityDpi);
             }
         } catch (Resources.NotFoundException ex) {
             Log.e(TAG, "Invalid Partner grid resource!", ex);
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 6f12ec784f..3312915fd3 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -404,8 +404,8 @@ public final class Utilities {
         return res.getConfiguration().getLayoutDirection() == View.LAYOUT_DIRECTION_RTL;
     }
 
-    public static float dpiFromPx(float size, DisplayMetrics metrics) {
-        float densityRatio = (float) metrics.densityDpi / DisplayMetrics.DENSITY_DEFAULT;
+    public static float dpiFromPx(float size, int densityDpi) {
+        float densityRatio = (float) densityDpi / DisplayMetrics.DENSITY_DEFAULT;
         return (size / densityRatio);
     }
 
diff --git a/src/com/android/launcher3/util/ConfigMonitor.java b/src/com/android/launcher3/util/ConfigMonitor.java
deleted file mode 100644
index f7023e8f44..0000000000
--- a/src/com/android/launcher3/util/ConfigMonitor.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package com.android.launcher3.util;
-
-/**
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.res.Configuration;
-import android.graphics.Point;
-import android.util.Log;
-
-import com.android.launcher3.testing.TestProtocol;
-import com.android.launcher3.util.DisplayController.DisplayInfoChangeListener;
-import com.android.launcher3.util.DisplayController.Info;
-
-import java.util.function.Consumer;
-
-/**
- * {@link BroadcastReceiver} which watches configuration changes and
- * notifies the callback in case changes which affect the device profile occur.
- */
-public class ConfigMonitor extends BroadcastReceiver implements DisplayInfoChangeListener {
-
-    private static final String TAG = "ConfigMonitor";
-
-    private final Point mTmpPoint1 = new Point();
-    private final Point mTmpPoint2 = new Point();
-
-    private final Context mContext;
-    private final float mFontScale;
-    private final int mDensity;
-
-    private final int mDisplayId;
-    private final Point mRealSize;
-    private final Point mSmallestSize, mLargestSize;
-
-    private Consumer<Context> mCallback;
-
-    public ConfigMonitor(Context context, Consumer<Context> callback) {
-        mContext = context;
-
-        Configuration config = context.getResources().getConfiguration();
-        mFontScale = config.fontScale;
-        mDensity = config.densityDpi;
-
-        DisplayController.DisplayHolder display = DisplayController.getDefaultDisplay(context);
-        display.addChangeListener(this);
-        Info displayInfo = display.getInfo();
-        mDisplayId = displayInfo.id;
-
-        mRealSize = new Point(displayInfo.realSize);
-        mSmallestSize = new Point(displayInfo.smallestSize);
-        mLargestSize = new Point(displayInfo.largestSize);
-
-        mCallback = callback;
-
-        // Listen for configuration change
-        mContext.registerReceiver(this, new IntentFilter(Intent.ACTION_CONFIGURATION_CHANGED));
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "ConfigMonitor.register: this="
-                    + System.identityHashCode(this) + " callback=" + callback.getClass().getName());
-        }
-    }
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        Configuration config = context.getResources().getConfiguration();
-        if (mFontScale != config.fontScale || mDensity != config.densityDpi) {
-            Log.d(TAG, "Configuration changed.");
-            notifyChange();
-        }
-    }
-
-    @Override
-    public void onDisplayInfoChanged(Info info, int flags) {
-        if (info.id != mDisplayId) {
-            return;
-        }
-        mTmpPoint1.set(info.realSize.x, info.realSize.y);
-        if (!mRealSize.equals(mTmpPoint1) && !mRealSize.equals(mTmpPoint1.y, mTmpPoint1.x)) {
-            Log.d(TAG, String.format("Display size changed from %s to %s", mRealSize, mTmpPoint1));
-            notifyChange();
-            return;
-        }
-
-        mTmpPoint1.set(info.smallestSize.x, info.smallestSize.y);
-        mTmpPoint2.set(info.largestSize.x, info.largestSize.y);
-        if (!mSmallestSize.equals(mTmpPoint1) || !mLargestSize.equals(mTmpPoint2)) {
-            Log.d(TAG, String.format("Available size changed from [%s, %s] to [%s, %s]",
-                    mSmallestSize, mLargestSize, mTmpPoint1, mTmpPoint2));
-            notifyChange();
-        }
-    }
-
-    private synchronized void notifyChange() {
-        if (mCallback != null) {
-            Consumer<Context> callback = mCallback;
-            mCallback = null;
-            MAIN_EXECUTOR.execute(() -> callback.accept(mContext));
-        }
-    }
-
-    public void unregister() {
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "ConfigMonitor.unregister: this="
-                    + System.identityHashCode(this));
-        }
-        try {
-            mContext.unregisterReceiver(this);
-            DisplayController.getDefaultDisplay(mContext).removeChangeListener(this);
-        } catch (Exception e) {
-            Log.e(TAG, "Failed to unregister config monitor", e);
-        }
-    }
-}
diff --git a/src/com/android/launcher3/util/DisplayController.java b/src/com/android/launcher3/util/DisplayController.java
index d0e8bb1b39..07c89b9b43 100644
--- a/src/com/android/launcher3/util/DisplayController.java
+++ b/src/com/android/launcher3/util/DisplayController.java
@@ -16,21 +16,28 @@
 package com.android.launcher3.util;
 
 import static android.view.Display.DEFAULT_DISPLAY;
+import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION;
 
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
+import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
+import android.content.ComponentCallbacks;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Configuration;
 import android.graphics.Point;
 import android.hardware.display.DisplayManager;
 import android.hardware.display.DisplayManager.DisplayListener;
-import android.util.DisplayMetrics;
+import android.os.Build;
 import android.util.Log;
-import android.util.SparseArray;
 import android.view.Display;
 
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
+import androidx.annotation.AnyThread;
+import androidx.annotation.UiThread;
+import androidx.annotation.WorkerThread;
 
 import com.android.launcher3.Utilities;
 
@@ -39,104 +46,78 @@ import java.util.ArrayList;
 /**
  * Utility class to cache properties of default display to avoid a system RPC on every call.
  */
-public class DisplayController implements DisplayListener {
+@SuppressLint("NewApi")
+public class DisplayController implements DisplayListener, ComponentCallbacks {
 
     private static final String TAG = "DisplayController";
 
     public static final MainThreadInitializedObject<DisplayController> INSTANCE =
             new MainThreadInitializedObject<>(DisplayController::new);
 
-    private final SparseArray<DisplayHolder> mOtherDisplays = new SparseArray<>(0);
-    // We store the default display separately, to avoid null checks for primary use case.
-    private final DisplayHolder mDefaultDisplay;
+    public static final int CHANGE_SIZE = 1 << 0;
+    public static final int CHANGE_ROTATION = 1 << 1;
+    public static final int CHANGE_FRAME_DELAY = 1 << 2;
+    public static final int CHANGE_DENSITY = 1 << 3;
 
-    private final ArrayList<DisplayListChangeListener> mListListeners = new ArrayList<>();
+    public static final int CHANGE_ALL = CHANGE_SIZE | CHANGE_ROTATION
+            | CHANGE_FRAME_DELAY | CHANGE_DENSITY;
 
-    private DisplayController(Context context) {
-        mDefaultDisplay = DisplayHolder.create(context, DEFAULT_DISPLAY);
+    private final Context mContext;
+    private final DisplayManager mDM;
 
-        DisplayManager dm = context.getSystemService(DisplayManager.class);
-        dm.registerDisplayListener(this, UI_HELPER_EXECUTOR.getHandler());
-    }
+    // Null for SDK < S
+    private final Context mWindowContext;
 
-    @Override
-    public final void onDisplayAdded(int displayId) {
-        DisplayHolder holder = DisplayHolder.create(mDefaultDisplay.mDisplayContext, displayId);
-        if (holder == null) {
-            // Display is already removed by the time we dot this.
-            return;
-        }
-        synchronized (mOtherDisplays) {
-            mOtherDisplays.put(displayId, holder);
-        }
-        MAIN_EXECUTOR.execute(() -> mListListeners.forEach(l-> l.onDisplayAdded(holder)));
-    }
+    private final ArrayList<DisplayInfoChangeListener> mListeners = new ArrayList<>();
+    private Info mInfo;
 
-    @Override
-    public final void onDisplayRemoved(int displayId) {
-        synchronized (mOtherDisplays) {
-            mOtherDisplays.remove(displayId);
-        }
-        MAIN_EXECUTOR.execute(() -> mListListeners.forEach(l-> l.onDisplayRemoved(displayId)));
-    }
+    private DisplayController(Context context) {
+        mContext = context;
+        mDM = context.getSystemService(DisplayManager.class);
 
-    /**
-     * Returns the holder corresponding to the given display
-     */
-    public DisplayHolder getHolder(int displayId) {
-        if (displayId == mDefaultDisplay.mId) {
-            return mDefaultDisplay;
+        Display display = mDM.getDisplay(DEFAULT_DISPLAY);
+        if (Utilities.ATLEAST_S) {
+            mWindowContext = mContext.createWindowContext(display, TYPE_APPLICATION, null);
+            mWindowContext.registerComponentCallbacks(this);
         } else {
-            synchronized (mOtherDisplays) {
-                return mOtherDisplays.get(displayId);
-            }
+            mWindowContext = null;
+            SimpleBroadcastReceiver configChangeReceiver =
+                    new SimpleBroadcastReceiver(this::onConfigChanged);
+            mContext.registerReceiver(configChangeReceiver,
+                    new IntentFilter(Intent.ACTION_CONFIGURATION_CHANGED));
         }
-    }
 
-    /**
-     * Adds a listener for display list changes
-     */
-    public void addListChangeListener(DisplayListChangeListener listener) {
-        mListListeners.add(listener);
+        mInfo = createInfo(display);
+        mDM.registerDisplayListener(this, UI_HELPER_EXECUTOR.getHandler());
     }
 
-    /**
-     * Removes a previously added display list change listener
-     */
-    public void removeListChangeListener(DisplayListChangeListener listener) {
-        mListListeners.remove(listener);
-    }
+    @Override
+    public final void onDisplayAdded(int displayId) { }
 
+    @Override
+    public final void onDisplayRemoved(int displayId) { }
+
+    @WorkerThread
     @Override
     public final void onDisplayChanged(int displayId) {
-        DisplayHolder holder = getHolder(displayId);
-        if (holder != null) {
-            holder.handleOnChange();
+        if (displayId != DEFAULT_DISPLAY) {
+            return;
         }
+        Display display = mDM.getDisplay(DEFAULT_DISPLAY);
+        if (display == null) {
+            return;
+        }
+        if (Utilities.ATLEAST_S) {
+            // Only check for refresh rate. Everything else comes from component callbacks
+            if (getSingleFrameMs(display) == mInfo.singleFrameMs) {
+                return;
+            }
+        }
+        handleInfoChange(display);
     }
 
     public static int getSingleFrameMs(Context context) {
-        return getDefaultDisplay(context).getInfo().singleFrameMs;
-    }
-
-    public static DisplayHolder getDefaultDisplay(Context context) {
-        return INSTANCE.get(context).mDefaultDisplay;
-    }
-
-    /**
-     * A listener to receiving addition or removal of new displays
-     */
-    public interface DisplayListChangeListener {
-
-        /**
-         * Called when a new display is added
-         */
-        void onDisplayAdded(DisplayHolder holder);
-
-        /**
-         * Called when a previously added display is removed
-         */
-        void onDisplayRemoved(int displayId);
+        return INSTANCE.get(context).getInfo().singleFrameMs;
     }
 
     /**
@@ -147,147 +128,121 @@ public class DisplayController implements DisplayListener {
         void onDisplayInfoChanged(Info info, int flags);
     }
 
-    public static class DisplayHolder {
+    /**
+     * Only used for pre-S
+     */
+    private void onConfigChanged(Intent intent) {
+        Configuration config = mContext.getResources().getConfiguration();
+        if (config.fontScale != config.fontScale || mInfo.densityDpi != config.densityDpi) {
+            Log.d(TAG, "Configuration changed, notifying listeners");
+            Display display = mDM.getDisplay(DEFAULT_DISPLAY);
+            if (display != null) {
+                handleInfoChange(display);
+            }
+        }
+    }
 
-        public static final int CHANGE_SIZE = 1 << 0;
-        public static final int CHANGE_ROTATION = 1 << 1;
-        public static final int CHANGE_FRAME_DELAY = 1 << 2;
+    @UiThread
+    @Override
+    @TargetApi(Build.VERSION_CODES.S)
+    public final void onConfigurationChanged(Configuration config) {
+        Display display = mWindowContext.getDisplay();
+        if (config.densityDpi != mInfo.densityDpi
+                || config.fontScale != mInfo.fontScale
+                || display.getRotation() != mInfo.rotation
+                || !mInfo.mScreenSizeDp.equals(
+                        Math.min(config.screenHeightDp, config.screenWidthDp),
+                        Math.max(config.screenHeightDp, config.screenWidthDp))) {
+            handleInfoChange(display);
+        }
+    }
 
-        public static final int CHANGE_ALL = CHANGE_SIZE | CHANGE_ROTATION | CHANGE_FRAME_DELAY;
+    @Override
+    public final void onLowMemory() { }
 
-        final Context mDisplayContext;
-        final int mId;
-        private final ArrayList<DisplayInfoChangeListener> mListeners = new ArrayList<>();
-        private DisplayController.Info mInfo;
+    public void addChangeListener(DisplayInfoChangeListener listener) {
+        mListeners.add(listener);
+    }
 
-        private DisplayHolder(Context displayContext) {
-            mDisplayContext = displayContext;
-            // Note that the Display object must be obtained from DisplayManager which is
-            // associated to the display context, so the Display is isolated from Activity and
-            // Application to provide the actual state of device that excludes the additional
-            // adjustment and override.
-            mInfo = new DisplayController.Info(mDisplayContext);
-            mId = mInfo.id;
-        }
+    public void removeChangeListener(DisplayInfoChangeListener listener) {
+        mListeners.remove(listener);
+    }
 
-        public void addChangeListener(DisplayInfoChangeListener listener) {
-            mListeners.add(listener);
-        }
+    public Info getInfo() {
+        return mInfo;
+    }
 
-        public void removeChangeListener(DisplayInfoChangeListener listener) {
-            mListeners.remove(listener);
-        }
+    private Info createInfo(Display display) {
+        return new Info(mContext.createDisplayContext(display), display);
+    }
 
-        public DisplayController.Info getInfo() {
-            return mInfo;
+    @AnyThread
+    private void handleInfoChange(Display display) {
+        Info oldInfo = mInfo;
+        Info newInfo = createInfo(display);
+        int change = 0;
+        if (newInfo.hasDifferentSize(oldInfo)) {
+            change |= CHANGE_SIZE;
         }
-
-        /** Creates and up-to-date DisplayController.Info for the given context. */
-        @Nullable
-        public Info createInfoForContext(Context context) {
-            Display display = Utilities.ATLEAST_R ? context.getDisplay() : null;
-            if (display == null) {
-                display = context.getSystemService(DisplayManager.class).getDisplay(mId);
-            }
-            if (display == null) {
-                return null;
-            }
-            // Refresh the Context the prevent stale DisplayMetrics.
-            Context displayContext = context.getApplicationContext().createDisplayContext(display);
-            return new Info(displayContext, display);
+        if (newInfo.rotation != oldInfo.rotation) {
+            change |= CHANGE_ROTATION;
         }
-
-        public Context getDisplayContext() {
-            return mDisplayContext;
+        if (newInfo.singleFrameMs != oldInfo.singleFrameMs) {
+            change |= CHANGE_FRAME_DELAY;
         }
-
-        protected void handleOnChange() {
-            Info oldInfo = mInfo;
-            Info newInfo = createInfoForContext(mDisplayContext);
-            if (newInfo == null) {
-                return;
-            }
-
-            int change = 0;
-            if (newInfo.hasDifferentSize(oldInfo)) {
-                change |= CHANGE_SIZE;
-            }
-            if (newInfo.rotation != oldInfo.rotation) {
-                change |= CHANGE_ROTATION;
-            }
-            if (newInfo.singleFrameMs != oldInfo.singleFrameMs) {
-                change |= CHANGE_FRAME_DELAY;
-            }
-
-            if (change != 0) {
-                mInfo = newInfo;
-                final int flags = change;
-                MAIN_EXECUTOR.execute(() -> notifyChange(flags));
-            }
+        if (newInfo.densityDpi != oldInfo.densityDpi || newInfo.fontScale != oldInfo.fontScale) {
+            change |= CHANGE_DENSITY;
         }
 
-        private void notifyChange(int flags) {
-            for (int i = mListeners.size() - 1; i >= 0; i--) {
-                mListeners.get(i).onDisplayInfoChanged(mInfo, flags);
-            }
+        if (change != 0) {
+            mInfo = newInfo;
+            final int flags = change;
+            MAIN_EXECUTOR.execute(() -> notifyChange(flags));
         }
+    }
 
-        private static DisplayHolder create(Context context, int id) {
-            DisplayManager dm = context.getSystemService(DisplayManager.class);
-            Display display = dm.getDisplay(id);
-            if (display == null) {
-                return null;
-            }
-            // Use application context to create display context so that it can have its own
-            // Resources.
-            Context displayContext = context.getApplicationContext().createDisplayContext(display);
-            return new DisplayHolder(displayContext);
+    private void notifyChange(int flags) {
+        for (int i = mListeners.size() - 1; i >= 0; i--) {
+            mListeners.get(i).onDisplayInfoChanged(mInfo, flags);
         }
     }
 
     public static class Info {
 
         public final int id;
-        public final int rotation;
         public final int singleFrameMs;
 
+        // Configuration properties
+        public final int rotation;
+        public final float fontScale;
+        public final int densityDpi;
+
+        private final Point mScreenSizeDp;
+
         public final Point realSize;
         public final Point smallestSize;
         public final Point largestSize;
 
-        public final DisplayMetrics metrics;
-
-        @VisibleForTesting
-        public Info(int id, int rotation, int singleFrameMs, Point realSize, Point smallestSize,
-                Point largestSize, DisplayMetrics metrics) {
-            this.id = id;
-            this.rotation = rotation;
-            this.singleFrameMs = singleFrameMs;
-            this.realSize = realSize;
-            this.smallestSize = smallestSize;
-            this.largestSize = largestSize;
-            this.metrics = metrics;
-        }
-
-        private Info(Context context) {
-            this(context, context.getSystemService(DisplayManager.class)
-                    .getDisplay(DEFAULT_DISPLAY));
-        }
-
         public Info(Context context, Display display) {
             id = display.getDisplayId();
+
             rotation = display.getRotation();
 
-            float refreshRate = display.getRefreshRate();
-            singleFrameMs = refreshRate > 0 ? (int) (1000 / refreshRate) : 16;
+            Configuration config = context.getResources().getConfiguration();
+            fontScale = config.fontScale;
+            densityDpi = config.densityDpi;
+            mScreenSizeDp = new Point(
+                    Math.min(config.screenHeightDp, config.screenWidthDp),
+                    Math.max(config.screenHeightDp, config.screenWidthDp));
+
+            singleFrameMs = getSingleFrameMs(display);
 
             realSize = new Point();
             smallestSize = new Point();
             largestSize = new Point();
+
             display.getRealSize(realSize);
             display.getCurrentSizeRange(smallestSize, largestSize);
-
-            metrics = context.getResources().getDisplayMetrics();
         }
 
         private boolean hasDifferentSize(Info info) {
@@ -307,4 +262,9 @@ public class DisplayController implements DisplayListener {
             return false;
         }
     }
+
+    private static int getSingleFrameMs(Display display) {
+        float refreshRate = display.getRefreshRate();
+        return refreshRate > 0 ? (int) (1000 / refreshRate) : 16;
+    }
 }
diff --git a/src/com/android/launcher3/views/FloatingSurfaceView.java b/src/com/android/launcher3/views/FloatingSurfaceView.java
index 011f6de8e2..f13484f131 100644
--- a/src/com/android/launcher3/views/FloatingSurfaceView.java
+++ b/src/com/android/launcher3/views/FloatingSurfaceView.java
@@ -97,7 +97,7 @@ public class FloatingSurfaceView extends AbstractFloatingView implements
 
         // Remove after some time, to avoid flickering
         Executors.MAIN_EXECUTOR.getHandler().postDelayed(mRemoveViewRunnable,
-                DisplayController.getDefaultDisplay(mLauncher).getInfo().singleFrameMs);
+                DisplayController.INSTANCE.get(mLauncher).getInfo().singleFrameMs);
     }
 
     private void removeViewFromParent() {
-- 
GitLab


From b3b8059bfb9eb25b5c72106efbb4d8c5d6bcfcac Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Wed, 21 Apr 2021 21:46:35 +0100
Subject: [PATCH 0953/1664] Only return true in getPageScrolls if it actually
 changes

- This fixes unwanted setCurrentPage in PagedView.onLayout which is based on whether getPageScrolls return true, which cause RecentsView to scroll unnecessarily

Fixes: 186092823
Test: Manual
Change-Id: Ifa5d3b2918cc1876ac15834ce72b88ffc377f114
---
 .../src/com/android/quickstep/views/RecentsView.java   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index e4fa1aa831..a6c934bad3 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -3141,8 +3141,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     @Override
     protected boolean getPageScrolls(int[] outPageScrolls, boolean layoutChildren,
             ComputePageScrollsLogic scrollLogic) {
-        boolean pageScrollChanged = super.getPageScrolls(outPageScrolls, layoutChildren,
-                scrollLogic);
+        int[] newPageScrolls = new int[outPageScrolls.length];
+        super.getPageScrolls(newPageScrolls, layoutChildren, scrollLogic);
         boolean showAsFullscreen = showAsFullscreen();
         boolean showAsGrid = showAsGrid();
 
@@ -3154,6 +3154,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             mClearAllButton.setScrollOffsetPrimary(mIsRtl ? clearAllWidthDiff : -clearAllWidthDiff);
         }
 
+        boolean pageScrollChanged = false;
         final int childCount = getChildCount();
         for (int i = 0; i < childCount; i++) {
             View child = getChildAt(i);
@@ -3165,9 +3166,10 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                         showAsGrid);
             }
 
-            if (scrollDiff != 0) {
-                outPageScrolls[i] += scrollDiff;
+            final int pageScroll = newPageScrolls[i] + (int) scrollDiff;
+            if (outPageScrolls[i] != pageScroll) {
                 pageScrollChanged = true;
+                outPageScrolls[i] = pageScroll;
             }
         }
         return pageScrollChanged;
-- 
GitLab


From 582314e8e8ec25405a65396892d00bf67f24eb1f Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Thu, 22 Apr 2021 13:22:32 +0100
Subject: [PATCH 0954/1664] Only update entries if there is a change in expand
 / collapse state

Test: In all widgets tray, switch to work profile. Expands an app.
      Switch to personal tab and then switch back to work tab.
      The previously expanded app is collapsed with correct arrow.
Bug: 184199207
Change-Id: Iac601a04412cb8c5f163483c5dd79da35f1fd05c
---
 .../android/launcher3/widget/picker/WidgetsListAdapter.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
index d9c9d4d71b..0504e74695 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
@@ -186,8 +186,10 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
      * Resets any expanded widget header.
      */
     public void resetExpandedHeader() {
-        mWidgetsContentVisiblePackageUserKey = null;
-        updateVisibleEntries();
+        if (mWidgetsContentVisiblePackageUserKey != null) {
+            mWidgetsContentVisiblePackageUserKey = null;
+            updateVisibleEntries();
+        }
     }
 
     @Override
-- 
GitLab


From cf93ef6cc9b647924cd468e1f6c2df7fad9cd74f Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Thu, 22 Apr 2021 17:44:22 +0100
Subject: [PATCH 0955/1664] Fix cast exception when dropping widgets to a drop
 target

When inflating a widget directly in the DragView, I've overridden
the layout param to FrameLayout.LayoutParam. Before drag complete,
we should restore the previous layout param.

Test: Drag a widget to a drop target. No crash is observed.
Bug: 186111130
Change-Id: Ifd33d57a886496ab31d4e741870b0ae18ca9ce4e
---
 src/com/android/launcher3/ButtonDropTarget.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
index 7926862bd2..a26217ce1c 100644
--- a/src/com/android/launcher3/ButtonDropTarget.java
+++ b/src/com/android/launcher3/ButtonDropTarget.java
@@ -240,6 +240,7 @@ public abstract class ButtonDropTarget extends TextView
 
         final Rect to = getIconRect(d);
         final float scale = (float) to.width() / from.width();
+        d.dragView.detachContentView(/* reattachToPreviousParent= */ true);
         mDropTargetBar.deferOnDragEnd();
 
         Runnable onAnimationEndRunnable = () -> {
-- 
GitLab


From 716affdba632865b520d5b53fbb5db0f7b44feb7 Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Thu, 22 Apr 2021 11:13:18 -0700
Subject: [PATCH 0956/1664] Comply with the IRecentsAnimationController change

Bug: 184789412
Bug: 185509920
Test: m -j
Change-Id: I11c7e4988d958ddaa63d9750ec65ee27030322c0
---
 .../com/android/quickstep/AbsSwipeUpHandler.java    |  3 +--
 .../quickstep/RecentsAnimationController.java       | 13 +++++--------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 75992342aa..12f9a9646d 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1497,9 +1497,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
             SystemUiProxy.INSTANCE.get(mContext).stopSwipePipToHome(
                     mSwipePipToHomeAnimator.getComponentName(),
                     mSwipePipToHomeAnimator.getDestinationBounds());
-            mRecentsAnimationController.setFinishTaskBounds(
+            mRecentsAnimationController.setFinishTaskTransaction(
                     mSwipePipToHomeAnimator.getTaskId(),
-                    mSwipePipToHomeAnimator.getDestinationBounds(),
                     mSwipePipToHomeAnimator.getFinishTransaction());
             mIsSwipingPipToHome = false;
         }
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationController.java b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
index 82e8a9304c..456073596a 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationController.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
@@ -19,7 +19,6 @@ import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.THREAD_POOL_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
-import android.graphics.Rect;
 import android.window.PictureInPictureSurfaceTransaction;
 
 import androidx.annotation.NonNull;
@@ -145,18 +144,16 @@ public class RecentsAnimationController {
     }
 
     /**
-     * Sets the final bounds on a Task. This is used by Launcher to notify the system that
-     * animating Activity to PiP has completed and the associated task surface should be updated
-     * accordingly. This should be called before `finish`
+     * Sets the final surface transaction on a Task. This is used by Launcher to notify the system
+     * that animating Activity to PiP has completed and the associated task surface should be
+     * updated accordingly. This should be called before `finish`
      * @param taskId for which the leash should be updated
-     * @param destinationBounds bounds of the final PiP window
      * @param finishTransaction leash operations for the final transform.
      */
-    public void setFinishTaskBounds(int taskId, Rect destinationBounds,
+    public void setFinishTaskTransaction(int taskId,
             PictureInPictureSurfaceTransaction finishTransaction) {
         UI_HELPER_EXECUTOR.execute(
-                () -> mController.setFinishTaskBounds(taskId, destinationBounds,
-                        finishTransaction));
+                () -> mController.setFinishTaskTransaction(taskId, finishTransaction));
     }
 
     /**
-- 
GitLab


From 94a3642099bf77819024df87ceb74d91436d877f Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Mon, 19 Apr 2021 17:02:23 -0700
Subject: [PATCH 0957/1664] Add logging for adding pending icons to the
 workspace.

Added more logging to help track down b/168788486

Bug: 168788486

Test: manual
Change-Id: I309ad3abbedaeb538c97dd4929bedf6407fdfcf1
---
 .../launcher3/SessionCommitReceiver.java      |  2 +-
 .../model/AddWorkspaceItemsTask.java          | 18 +++++++-
 .../launcher3/model/ItemInstallQueue.java     | 13 ++++--
 .../launcher3/pm/InstallSessionHelper.java    | 43 +++++++++++++++----
 src/com/android/launcher3/util/IOUtils.java   |  8 ++++
 5 files changed, 71 insertions(+), 13 deletions(-)

diff --git a/src/com/android/launcher3/SessionCommitReceiver.java b/src/com/android/launcher3/SessionCommitReceiver.java
index 50361040f7..fe58da913a 100644
--- a/src/com/android/launcher3/SessionCommitReceiver.java
+++ b/src/com/android/launcher3/SessionCommitReceiver.java
@@ -71,7 +71,7 @@ public class SessionCommitReceiver extends BroadcastReceiver {
             return;
         }
 
-        Log.i(LOG,
+        Log.d(LOG,
                 "Adding package name to install queue. Package name: " + info.getAppPackageName()
                         + ", has app icon: " + (info.getAppIcon() != null)
                         + ", has app label: " + !TextUtils.isEmpty(info.getAppLabel()));
diff --git a/src/com/android/launcher3/model/AddWorkspaceItemsTask.java b/src/com/android/launcher3/model/AddWorkspaceItemsTask.java
index fd51ba8d5b..29287d97c7 100644
--- a/src/com/android/launcher3/model/AddWorkspaceItemsTask.java
+++ b/src/com/android/launcher3/model/AddWorkspaceItemsTask.java
@@ -32,11 +32,13 @@ import com.android.launcher3.model.BgDataModel.Callbacks;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pm.InstallSessionHelper;
 import com.android.launcher3.pm.PackageInstallInfo;
 import com.android.launcher3.util.GridOccupancy;
+import com.android.launcher3.util.IOUtils;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.PackageManagerHelper;
 
@@ -126,6 +128,12 @@ public class AddWorkspaceItemsTask extends BaseModelUpdateTask {
                     }
                     SessionInfo sessionInfo = packageInstaller.getActiveSessionInfo(item.user,
                             packageName);
+
+                    if (!packageInstaller.verifySessionInfo(sessionInfo)) {
+                        Log.d(LOG, "Item info failed session info verification: "
+                                + workspaceInfo);
+                    }
+
                     List<LauncherActivityInfo> activities = launcherApps
                             .getActivityList(packageName, item.user);
                     boolean hasActivity = activities != null && !activities.isEmpty();
@@ -171,7 +179,15 @@ public class AddWorkspaceItemsTask extends BaseModelUpdateTask {
                 // Save the WorkspaceItemInfo for binding in the workspace
                 addedItemsFinal.add(itemInfo);
 
-                Log.i(LOG, "Adding item info to workspace: " + itemInfo);
+                // log bitmap and label
+                Log.d(LOG, "Adding item info to workspace: " + itemInfo);
+                if (itemInfo instanceof ItemInfoWithIcon) {
+                    ItemInfoWithIcon infoWithIcon = (ItemInfoWithIcon) itemInfo;
+
+                    Log.d(LOG, "Item info icon base 64 string: "
+                            + infoWithIcon.bitmap.icon == null
+                            ? "null" : IOUtils.toBase64String(infoWithIcon.bitmap.icon));
+                }
             }
         }
 
diff --git a/src/com/android/launcher3/model/ItemInstallQueue.java b/src/com/android/launcher3/model/ItemInstallQueue.java
index 836d804445..22cb46b4a5 100644
--- a/src/com/android/launcher3/model/ItemInstallQueue.java
+++ b/src/com/android/launcher3/model/ItemInstallQueue.java
@@ -130,6 +130,7 @@ public class ItemInstallQueue {
 
         // Add the items and clear queue
         if (!installQueue.isEmpty()) {
+            // add log
             launcher.getModel().addAndBindAddedWorkspaceItems(installQueue);
         }
         mItems.clear();
@@ -184,14 +185,20 @@ public class ItemInstallQueue {
     }
 
     private void queuePendingShortcutInfo(PendingInstallShortcutInfo info) {
+        final Exception stackTrace = new Exception();
+
         // Queue the item up for adding if launcher has not loaded properly yet
         MODEL_EXECUTOR.post(() -> {
             Pair<ItemInfo, Object> itemInfo = info.getItemInfo(mContext);
             if (itemInfo == null) {
-                Log.i(LOG, "Adding PendingInstallShortcutInfo with no attached info to queue.");
+                Log.d(LOG,
+                        "Adding PendingInstallShortcutInfo with no attached info to queue.",
+                        stackTrace);
             } else {
-                Log.i(LOG, "Adding PendingInstallShortcutInfo to queue. Attached info: "
-                        + itemInfo.first);
+                Log.d(LOG,
+                        "Adding PendingInstallShortcutInfo to queue. Attached info: "
+                                + itemInfo.first,
+                        stackTrace);
             }
 
             addToQueue(info);
diff --git a/src/com/android/launcher3/pm/InstallSessionHelper.java b/src/com/android/launcher3/pm/InstallSessionHelper.java
index 72f1c58905..88db4303bb 100644
--- a/src/com/android/launcher3/pm/InstallSessionHelper.java
+++ b/src/com/android/launcher3/pm/InstallSessionHelper.java
@@ -25,6 +25,7 @@ import android.content.pm.LauncherApps;
 import android.content.pm.PackageInstaller;
 import android.content.pm.PackageInstaller.SessionInfo;
 import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
 import android.os.Build;
 import android.os.Process;
 import android.os.UserHandle;
@@ -40,6 +41,7 @@ import com.android.launcher3.SessionCommitReceiver;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.ItemInstallQueue;
+import com.android.launcher3.util.IOUtils;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.IntSet;
 import com.android.launcher3.util.MainThreadInitializedObject;
@@ -215,14 +217,8 @@ public class InstallSessionHelper {
     void tryQueuePromiseAppIcon(PackageInstaller.SessionInfo sessionInfo) {
         if (FeatureFlags.PROMISE_APPS_NEW_INSTALLS.get()
                 && SessionCommitReceiver.isEnabled(mAppContext)
-                && verify(sessionInfo) != null
-                && sessionInfo.getInstallReason() == PackageManager.INSTALL_REASON_USER
-                && sessionInfo.getAppIcon() != null
-                && !TextUtils.isEmpty(sessionInfo.getAppLabel())
-                && !promiseIconAddedForId(sessionInfo.getSessionId())
-                && !new PackageManagerHelper(mAppContext).isAppInstalled(
-                        sessionInfo.getAppPackageName(), getUserHandle(sessionInfo))) {
-            Log.i(LOG, "Adding package name to install queue: "
+                && verifySessionInfo(sessionInfo)) {
+            Log.d(LOG, "Adding package name to install queue: "
                     + sessionInfo.getAppPackageName());
 
             ItemInstallQueue.INSTANCE.get(mAppContext)
@@ -233,6 +229,37 @@ public class InstallSessionHelper {
         }
     }
 
+    public boolean verifySessionInfo(PackageInstaller.SessionInfo sessionInfo) {
+        boolean validSessionInfo = verify(sessionInfo) != null
+                && sessionInfo.getInstallReason() == PackageManager.INSTALL_REASON_USER
+                && sessionInfo.getAppIcon() != null
+                && !TextUtils.isEmpty(sessionInfo.getAppLabel())
+                && !promiseIconAddedForId(sessionInfo.getSessionId())
+                && !new PackageManagerHelper(mAppContext).isAppInstalled(
+                        sessionInfo.getAppPackageName(), getUserHandle(sessionInfo));
+
+        if (sessionInfo != null) {
+            Bitmap appIcon = sessionInfo.getAppIcon();
+
+            Log.d(LOG, String.format(
+                    "Verifying session info. Valid: %b, Session verified: %b, Install reason valid:"
+                            + " %b, App icon: %s, App label: %s, Promise icon added: %b, "
+                            + "App installed: %b.",
+                    validSessionInfo,
+                    verify(sessionInfo) != null,
+                    sessionInfo.getInstallReason() == PackageManager.INSTALL_REASON_USER,
+                    appIcon == null ? "null" : IOUtils.toBase64String(appIcon),
+                    sessionInfo.getAppLabel(),
+                    promiseIconAddedForId(sessionInfo.getSessionId()),
+                    new PackageManagerHelper(mAppContext).isAppInstalled(
+                            sessionInfo.getAppPackageName(), getUserHandle(sessionInfo))));
+        } else {
+            Log.d(LOG, "Verifying session info failed: session info null.");
+        }
+
+        return validSessionInfo;
+    }
+
     public InstallSessionTracker registerInstallTracker(InstallSessionTracker.Callback callback) {
         InstallSessionTracker tracker = new InstallSessionTracker(this, callback);
 
diff --git a/src/com/android/launcher3/util/IOUtils.java b/src/com/android/launcher3/util/IOUtils.java
index 1cec0ecc10..d7fa9050f2 100644
--- a/src/com/android/launcher3/util/IOUtils.java
+++ b/src/com/android/launcher3/util/IOUtils.java
@@ -16,7 +16,9 @@
 
 package com.android.launcher3.util;
 
+import android.graphics.Bitmap;
 import android.os.FileUtils;
+import android.util.Base64;
 import android.util.Log;
 
 import com.android.launcher3.Utilities;
@@ -50,6 +52,12 @@ public class IOUtils {
         return out.toByteArray();
     }
 
+    public static String toBase64String(Bitmap bitmap) {
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        bitmap.compress(Bitmap.CompressFormat.PNG, 100, outputStream);
+        return Base64.encodeToString(outputStream.toByteArray(), Base64.DEFAULT);
+    }
+
     public static long copy(InputStream from, OutputStream to) throws IOException {
         if (Utilities.ATLEAST_Q) {
             return FileUtils.copy(from, to);
-- 
GitLab


From c9ad2dd6c7f6e61bf86bb539abcd3d9a3fff8063 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Tue, 13 Apr 2021 09:34:29 -0400
Subject: [PATCH 0958/1664] Add new app close implementation.

- We remove the fling completely
- We set damping to 1 for x/y springs so there is no
  bounciness, and updated the stiffness and bounds to tighten
  up the path to the final location.
- During the animation, we translate all launcher content
  down
- When the x/y springs, and rect animator all finish,
  we use a spring to bounce the launcher content back up

- Added AppCloseConfig so that the entire animation can
  be defined in one location, with getter methods so that
  all the involved parties of the animation can access the
  current value.
- The animations are all defined linearly, and then
  interpolated over using a 3 point curve.

Building behind feature flag as we tune the values.

Bug: 173107751
Test: manual, visual
Change-Id: I83ad0fa2c4234cf30004240d43e191354595adc8
---
 .../launcher3/QuickstepTransitionManager.java |   2 +-
 .../android/quickstep/AbsSwipeUpHandler.java  |   2 +-
 .../quickstep/FallbackSwipeHandler.java       |   5 +-
 .../quickstep/LauncherSwipeHandlerV2.java     | 127 +++++-
 .../quickstep/SwipeUpAnimationLogic.java      |  34 +-
 .../SwipeUpGestureTutorialController.java     |   6 +-
 .../quickstep/util/AppCloseConfig.java        |  57 +++
 .../quickstep/util/RectFSpringAnim.java       |   5 +-
 .../quickstep/util/RectFSpringAnim2.java      | 390 ++++++++++++++++++
 .../util/StaggeredWorkspaceAnim.java          |   4 +
 res/values/config.xml                         |  94 +++--
 src/com/android/launcher3/Workspace.java      |  12 +
 .../WorkspaceStateTransitionAnimation.java    |  14 +-
 .../android/launcher3/anim/Interpolators.java |   1 -
 .../launcher3/config/FeatureFlags.java        |   3 +
 .../android/launcher3/views/ClipIconView.java |  24 +-
 .../launcher3/views/FloatingIconView.java     |  29 +-
 17 files changed, 726 insertions(+), 83 deletions(-)
 create mode 100644 quickstep/src/com/android/quickstep/util/AppCloseConfig.java
 create mode 100644 quickstep/src/com/android/quickstep/util/RectFSpringAnim2.java

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 009ca27603..827eb7d0bb 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -693,7 +693,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                             matrix.postTranslate(windowTransX0, windowTransY0);
                         }
 
-                        floatingView.update(floatingIconBounds, mIconAlpha.value, percent, 0f,
+                        floatingView.update(mIconAlpha.value, 255, floatingIconBounds, percent, 0f,
                                 mWindowRadius.value * scale, true /* isOpening */);
                         builder.withMatrix(matrix)
                                 .withWindowCrop(crop)
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index dbb8272621..7e5b39cd52 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1252,7 +1252,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
             HomeAnimationFactory homeAnimationFactory) {
         RectFSpringAnim anim =
                 super.createWindowAnimationToHome(startProgress, homeAnimationFactory);
-        anim.addOnUpdateListener((r, p) -> {
+        anim.addOnUpdateListener((v, r, p) -> {
             updateSysUiFlags(Math.max(p, mCurrentShift.value));
         });
         anim.addAnimatorListener(new AnimationSuccessListener() {
diff --git a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
index ec1cc4a648..f5698f7542 100644
--- a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
+++ b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
@@ -48,6 +48,7 @@ import android.view.SurfaceControl;
 import android.view.SurfaceControl.Transaction;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Utilities;
@@ -56,6 +57,7 @@ import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.anim.SpringAnimationBuilder;
 import com.android.quickstep.fallback.FallbackRecentsView;
 import com.android.quickstep.fallback.RecentsState;
+import com.android.quickstep.util.AppCloseConfig;
 import com.android.quickstep.util.RectFSpringAnim;
 import com.android.quickstep.util.TransformParams;
 import com.android.quickstep.util.TransformParams.BuilderProxy;
@@ -298,7 +300,8 @@ public class FallbackSwipeHandler extends
         }
 
         @Override
-        public void update(RectF currentRect, float progress, float radius) {
+        public void update(@Nullable AppCloseConfig config, RectF currentRect, float progress,
+                 float radius) {
             if (mSurfaceControl != null) {
                 currentRect.roundOut(mTempRect);
                 Transaction t = new Transaction();
diff --git a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
index 311ac83c00..5ecd385f13 100644
--- a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
+++ b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
@@ -15,26 +15,45 @@
  */
 package com.android.quickstep;
 
+import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
+import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y;
 import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.Utilities.dpToPx;
+import static com.android.launcher3.Utilities.mapToRange;
+import static com.android.launcher3.anim.Interpolators.LINEAR;
+import static com.android.launcher3.config.FeatureFlags.PROTOTYPE_APP_CLOSE;
 import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION;
+import static com.android.launcher3.views.FloatingIconView.getFloatingIconView;
 
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
+import android.animation.ValueAnimator;
 import android.content.Context;
 import android.graphics.RectF;
 import android.os.UserHandle;
 import android.view.View;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.android.launcher3.BaseQuickstepLauncher;
+import com.android.launcher3.Hotseat;
 import com.android.launcher3.LauncherState;
+import com.android.launcher3.R;
+import com.android.launcher3.Workspace;
 import com.android.launcher3.anim.AnimatorPlaybackController;
+import com.android.launcher3.anim.SpringAnimationBuilder;
+import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.states.StateAnimationConfig;
+import com.android.launcher3.util.DynamicResource;
 import com.android.launcher3.views.FloatingIconView;
+import com.android.quickstep.util.AppCloseConfig;
 import com.android.quickstep.util.RectFSpringAnim;
 import com.android.quickstep.util.StaggeredWorkspaceAnim;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
+import com.android.systemui.plugins.ResourceProvider;
 import com.android.systemui.shared.system.InputConsumerController;
 
 /**
@@ -66,24 +85,41 @@ public class LauncherSwipeHandlerV2 extends
             } else {
                 workspaceView = null;
             }
-            final RectF iconLocation = new RectF();
             boolean canUseWorkspaceView =
                     workspaceView != null && workspaceView.isAttachedToWindow();
-            FloatingIconView floatingIconView = canUseWorkspaceView
-                    ? FloatingIconView.getFloatingIconView(mActivity, workspaceView,
-                    true /* hideOriginal */, iconLocation, false /* isOpening */)
-                    : null;
 
             mActivity.getRootView().setForceHideBackArrow(true);
             mActivity.setHintUserWillBeActive();
 
             if (canUseWorkspaceView) {
+                final ResourceProvider rp = DynamicResource.provider(mActivity);
+                final float transY = dpToPx(rp.getFloat(R.dimen.swipe_up_trans_y_dp));
+                float dpPerSecond = dpToPx(rp.getFloat(R.dimen.swipe_up_trans_y_dp_per_s));
+                final float launcherAlphaMax =
+                        rp.getFloat(R.dimen.swipe_up_launcher_alpha_max_progress);
+
+                RectF iconLocation = new RectF();
+                FloatingIconView floatingIconView = getFloatingIconView(mActivity, workspaceView,
+                        true /* hideOriginal */, iconLocation, false /* isOpening */);
+
                 // We want the window alpha to be 0 once this threshold is met, so that the
                 // FolderIconView can be seen morphing into the icon shape.
                 float windowAlphaThreshold = 1f - SHAPE_PROGRESS_DURATION;
                 homeAnimFactory = new LauncherHomeAnimationFactory() {
+
+                    // There is a delay in loading the icon, so we need to keep the window
+                    // opaque until it is ready.
+                    private boolean mIsFloatingIconReady = false;
+
+                    private @Nullable ValueAnimator mBounceBackAnimator;
+
                     @Override
                     public RectF getWindowTargetRect() {
+                        if (PROTOTYPE_APP_CLOSE.get()) {
+                            // We want the target rect to be at this offset position, so that all
+                            // launcher content can spring back upwards.
+                            floatingIconView.setPositionOffsetY(transY);
+                        }
                         return iconLocation;
                     }
 
@@ -92,17 +128,92 @@ public class LauncherSwipeHandlerV2 extends
                         anim.addAnimatorListener(floatingIconView);
                         floatingIconView.setOnTargetChangeListener(anim::onTargetPositionChanged);
                         floatingIconView.setFastFinishRunnable(anim::end);
+                        if (PROTOTYPE_APP_CLOSE.get()) {
+                            mBounceBackAnimator = bounceBackToRestingPosition();
+                            // Use a spring to put drag layer translation back to 0.
+                            anim.addAnimatorListener(new AnimatorListenerAdapter() {
+                                @Override
+                                public void onAnimationEnd(Animator animation) {
+                                    floatingIconView.setPositionOffsetY(0);
+                                    mBounceBackAnimator.start();
+                                }
+                            });
+
+                            Workspace workspace = mActivity.getWorkspace();
+                            workspace.setPivotToScaleWithSelf(mActivity.getHotseat());
+                        }
+                    }
+
+                    private ValueAnimator bounceBackToRestingPosition() {
+                        DragLayer dl = mActivity.getDragLayer();
+                        Workspace workspace = mActivity.getWorkspace();
+                        Hotseat hotseat = mActivity.getHotseat();
+
+                        final float startValue = transY;
+                        final float endValue = 0;
+                        // Ensures the velocity is always aligned with the direction.
+                        float pixelPerSecond = Math.abs(dpPerSecond)
+                                * Math.signum(endValue - transY);
+
+                        ValueAnimator springTransY = new SpringAnimationBuilder(dl.getContext())
+                                .setStiffness(rp.getFloat(R.dimen.swipe_up_trans_y_stiffness))
+                                .setDampingRatio(rp.getFloat(R.dimen.swipe_up_trans_y_damping))
+                                .setMinimumVisibleChange(1f)
+                                .setStartValue(startValue)
+                                .setEndValue(endValue)
+                                .setStartVelocity(pixelPerSecond)
+                                .build(dl, VIEW_TRANSLATE_Y);
+                        springTransY.addListener(new AnimatorListenerAdapter() {
+                            @Override
+                            public void onAnimationEnd(Animator animation) {
+                                dl.setTranslationY(0f);
+                                dl.setAlpha(1f);
+                                SCALE_PROPERTY.set(workspace, 1f);
+                                SCALE_PROPERTY.set(hotseat, 1f);
+                            }
+                        });
+                        return springTransY;
+                    }
+
+                    @Override
+                    public boolean keepWindowOpaque() {
+                        if (mIsFloatingIconReady || floatingIconView.isVisibleToUser()) {
+                            mIsFloatingIconReady = true;
+                            return false;
+                        }
+                        return true;
                     }
 
                     @Override
-                    public void update(RectF currentRect, float progress, float radius) {
-                        floatingIconView.update(currentRect, 1f, progress, windowAlphaThreshold,
-                                radius, false);
+                    public void update(@Nullable AppCloseConfig config, RectF currentRect,
+                            float progress, float radius) {
+                        int fgAlpha = 255;
+                        if (config != null && PROTOTYPE_APP_CLOSE.get()) {
+                            DragLayer dl = mActivity.getDragLayer();
+                            float translationY = config.getWorkspaceTransY();
+                            dl.setTranslationY(translationY);
+
+                            float alpha = mapToRange(progress, 0, launcherAlphaMax, 0, 1f, LINEAR);
+                            dl.setAlpha(Math.min(alpha, 1f));
+
+                            float scale = Math.min(1f, config.getWorkspaceScale());
+                            SCALE_PROPERTY.set(mActivity.getWorkspace(), scale);
+                            SCALE_PROPERTY.set(mActivity.getHotseat(), scale);
+                            SCALE_PROPERTY.set(mActivity.getAppsView(), scale);
+
+                            progress = config.getInterpolatedProgress();
+                            fgAlpha = config.getFgAlpha();
+                        }
+                        floatingIconView.update(1f, fgAlpha, currentRect, progress,
+                                windowAlphaThreshold, radius, false);
                     }
 
                     @Override
                     public void onCancel() {
                         floatingIconView.fastFinish();
+                        if (mBounceBackAnimator != null) {
+                            mBounceBackAnimator.cancel();
+                        }
                     }
                 };
             } else {
diff --git a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
index a8c09dc8fa..0f34a72ad4 100644
--- a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
+++ b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
@@ -17,6 +17,7 @@ package com.android.quickstep;
 
 import static com.android.launcher3.anim.Interpolators.ACCEL_1_5;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
+import static com.android.launcher3.config.FeatureFlags.PROTOTYPE_APP_CLOSE;
 
 import android.animation.Animator;
 import android.content.Context;
@@ -26,6 +27,7 @@ import android.graphics.Rect;
 import android.graphics.RectF;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 
 import com.android.launcher3.DeviceProfile;
@@ -35,7 +37,9 @@ import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
+import com.android.quickstep.util.AppCloseConfig;
 import com.android.quickstep.util.RectFSpringAnim;
+import com.android.quickstep.util.RectFSpringAnim2;
 import com.android.quickstep.util.TaskViewSimulator;
 import com.android.quickstep.util.TransformParams;
 import com.android.quickstep.util.TransformParams.BuilderProxy;
@@ -149,7 +153,10 @@ public abstract class SwipeUpAnimationLogic {
 
         public void setAnimation(RectFSpringAnim anim) { }
 
-        public void update(RectF currentRect, float progress, float radius) { }
+        public boolean keepWindowOpaque() { return false; }
+
+        public void update(@Nullable AppCloseConfig config, RectF currentRect, float progress,
+                float radius) { }
 
         public void onCancel() { }
 
@@ -199,7 +206,14 @@ public abstract class SwipeUpAnimationLogic {
         homeToWindowPositionMap.invert(windowToHomePositionMap);
         windowToHomePositionMap.mapRect(startRect);
 
-        RectFSpringAnim anim = new RectFSpringAnim(startRect, targetRect, mContext);
+        RectFSpringAnim anim;
+        if (PROTOTYPE_APP_CLOSE.get()) {
+            anim = new RectFSpringAnim2(startRect, targetRect, mContext,
+                    mTaskViewSimulator.getCurrentCornerRadius(),
+                    cropRectF.width() / 2f);
+        } else {
+            anim = new RectFSpringAnim(startRect, targetRect, mContext);
+        }
         homeAnimationFactory.setAnimation(anim);
 
         SpringAnimationRunner runner = new SpringAnimationRunner(
@@ -259,18 +273,26 @@ public abstract class SwipeUpAnimationLogic {
         }
 
         @Override
-        public void onUpdate(RectF currentRect, float progress) {
+        public void onUpdate(@Nullable AppCloseConfig config, RectF currentRect, float progress) {
             mHomeAnim.setPlayFraction(progress);
             mHomeToWindowPositionMap.mapRect(mWindowCurrentRect, currentRect);
 
             mMatrix.setRectToRect(mCropRectF, mWindowCurrentRect, ScaleToFit.FILL);
             float cornerRadius = Utilities.mapRange(progress, mStartRadius, mEndRadius);
+            float alpha = getWindowAlpha(progress);
+            if (config != null && PROTOTYPE_APP_CLOSE.get()) {
+                alpha = config.getWindowAlpha();
+                cornerRadius = config.getCornerRadius();
+            }
+            if (mAnimationFactory.keepWindowOpaque()) {
+                alpha = 1f;
+            }
             mTransformParams
-                    .setTargetAlpha(getWindowAlpha(progress))
+                    .setTargetAlpha(alpha)
                     .setCornerRadius(cornerRadius);
-
             mTransformParams.applySurfaceParams(mTransformParams.createSurfaceParams(this));
-            mAnimationFactory.update(currentRect, progress, mMatrix.mapRadius(cornerRadius));
+            mAnimationFactory.update(config, currentRect, progress,
+                    mMatrix.mapRadius(cornerRadius));
         }
 
         @Override
diff --git a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
index 8fc453d303..1aa64fae1c 100644
--- a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
@@ -52,6 +52,7 @@ import com.android.quickstep.OverviewComponentObserver;
 import com.android.quickstep.RecentsAnimationDeviceState;
 import com.android.quickstep.SwipeUpAnimationLogic;
 import com.android.quickstep.SwipeUpAnimationLogic.RunningWindowAnim;
+import com.android.quickstep.util.AppCloseConfig;
 import com.android.quickstep.util.RectFSpringAnim;
 import com.android.quickstep.util.TransformParams;
 import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
@@ -306,11 +307,12 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
                 }
 
                 @Override
-                public void update(RectF rect, float progress, float radius) {
+                public void update(@Nullable AppCloseConfig config, RectF rect, float progress,
+                        float radius) {
                     mFakeIconView.setVisibility(View.VISIBLE);
                     mFakeIconView.update(rect, progress,
                             1f - SHAPE_PROGRESS_DURATION /* shapeProgressStart */,
-                            radius,
+                            radius, 255,
                             false, /* isOpening */
                             mFakeIconView, mDp,
                             false /* isVerticalBarLayout */);
diff --git a/quickstep/src/com/android/quickstep/util/AppCloseConfig.java b/quickstep/src/com/android/quickstep/util/AppCloseConfig.java
new file mode 100644
index 0000000000..bec33797a3
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/util/AppCloseConfig.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.quickstep.util;
+
+import android.annotation.FloatRange;
+import android.annotation.IntRange;
+
+/*
+ * Adds getter methods to {@link MultiValueUpdateListener} specific to app close animation,
+ * so that the entire animation can be defined in one place.
+ */
+public abstract class AppCloseConfig extends MultiValueUpdateListener {
+
+    /**
+     * Returns the translation y of the workspace contents.
+     */
+    public abstract float getWorkspaceTransY();
+
+    /*
+     * Returns the scale of the workspace contents.
+     */
+    public abstract float getWorkspaceScale();
+
+    /*
+     * Returns the alpha of the window.
+     */
+    public abstract @FloatRange(from = 0, to = 1) float getWindowAlpha();
+
+    /*
+     * Returns the alpha of the foreground layer of an adaptive icon.
+     */
+    public abstract @IntRange(from = 0, to = 255) int getFgAlpha();
+
+    /*
+     * Returns the corner radius of the window and icon.
+     */
+    public abstract float getCornerRadius();
+
+    /*
+     * Returns the interpolated progress of the animation.
+     */
+    public abstract float getInterpolatedProgress();
+
+}
diff --git a/quickstep/src/com/android/quickstep/util/RectFSpringAnim.java b/quickstep/src/com/android/quickstep/util/RectFSpringAnim.java
index e5d2c53d60..02ec68a8d9 100644
--- a/quickstep/src/com/android/quickstep/util/RectFSpringAnim.java
+++ b/quickstep/src/com/android/quickstep/util/RectFSpringAnim.java
@@ -20,6 +20,7 @@ import android.content.Context;
 import android.graphics.PointF;
 import android.graphics.RectF;
 
+import androidx.annotation.Nullable;
 import androidx.dynamicanimation.animation.DynamicAnimation.OnAnimationEndListener;
 import androidx.dynamicanimation.animation.FloatPropertyCompat;
 import androidx.dynamicanimation.animation.SpringAnimation;
@@ -241,7 +242,7 @@ public class RectFSpringAnim extends ReleaseCheck {
                         mCurrentCenterX + currentWidth / 2, mCurrentY + currentHeight);
             }
             for (OnUpdateListener onUpdateListener : mOnUpdateListeners) {
-                onUpdateListener.onUpdate(mCurrentRect, mCurrentScaleProgress);
+                onUpdateListener.onUpdate(null, mCurrentRect, mCurrentScaleProgress);
             }
         }
     }
@@ -266,7 +267,7 @@ public class RectFSpringAnim extends ReleaseCheck {
     }
 
     public interface OnUpdateListener {
-        void onUpdate(RectF currentRect, float progress);
+        void onUpdate(@Nullable AppCloseConfig values, RectF currentRect, float progress);
 
         default void onCancel() { }
     }
diff --git a/quickstep/src/com/android/quickstep/util/RectFSpringAnim2.java b/quickstep/src/com/android/quickstep/util/RectFSpringAnim2.java
new file mode 100644
index 0000000000..95d56aaca4
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/util/RectFSpringAnim2.java
@@ -0,0 +1,390 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.quickstep.util;
+
+import static com.android.launcher3.Utilities.dpToPx;
+import static com.android.launcher3.anim.Interpolators.LINEAR;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.ObjectAnimator;
+import android.animation.ValueAnimator;
+import android.content.Context;
+import android.graphics.PointF;
+import android.graphics.RectF;
+import android.util.PathParser;
+import android.util.Property;
+import android.view.animation.Interpolator;
+
+import androidx.core.view.animation.PathInterpolatorCompat;
+import androidx.dynamicanimation.animation.FloatPropertyCompat;
+import androidx.dynamicanimation.animation.SpringAnimation;
+import androidx.dynamicanimation.animation.SpringForce;
+
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.InvariantDeviceProfile;
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.util.DynamicResource;
+import com.android.systemui.plugins.ResourceProvider;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * Applies spring forces to animate from a starting rect to a target rect,
+ * while providing update callbacks to the caller.
+ */
+public class RectFSpringAnim2 extends RectFSpringAnim {
+
+    private static final FloatPropertyCompat<RectFSpringAnim2> RECT_CENTER_X =
+            new FloatPropertyCompat<RectFSpringAnim2>("rectCenterXSpring") {
+                @Override
+                public float getValue(RectFSpringAnim2 anim) {
+                    return anim.mCurrentCenterX;
+                }
+
+                @Override
+                public void setValue(RectFSpringAnim2 anim, float currentCenterX) {
+                    anim.mCurrentCenterX = currentCenterX;
+                    anim.onUpdate();
+                }
+            };
+
+    private static final FloatPropertyCompat<RectFSpringAnim2> RECT_Y =
+            new FloatPropertyCompat<RectFSpringAnim2>("rectYSpring") {
+                @Override
+                public float getValue(RectFSpringAnim2 anim) {
+                    return anim.mCurrentY;
+                }
+
+                @Override
+                public void setValue(RectFSpringAnim2 anim, float y) {
+                    anim.mCurrentY = y;
+                    anim.onUpdate();
+                }
+            };
+
+    private static final Property<RectFSpringAnim2, Float> PROGRESS =
+            new Property<RectFSpringAnim2, Float>(Float.class, "rectFProgress") {
+                @Override
+                public Float get(RectFSpringAnim2 rectFSpringAnim) {
+                    return rectFSpringAnim.mProgress;
+                }
+
+                @Override
+                public void set(RectFSpringAnim2 rectFSpringAnim, Float progress) {
+                    rectFSpringAnim.mProgress = progress;
+                    rectFSpringAnim.onUpdate();
+                }
+            };
+
+    private final RectF mStartRect;
+    private final RectF mTargetRect;
+    private final RectF mCurrentRect = new RectF();
+    private final List<OnUpdateListener> mOnUpdateListeners = new ArrayList<>();
+    private final List<Animator.AnimatorListener> mAnimatorListeners = new ArrayList<>();
+
+    private float mCurrentCenterX;
+    private float mCurrentY;
+
+    private float mTargetX;
+    private float mTargetY;
+
+    // If true, tracking the bottom of the rects, else tracking the top.
+    private final boolean mTrackingBottomY;
+    private float mProgress;
+    private SpringAnimation mRectXAnim;
+    private SpringAnimation mRectYAnim;
+    private ValueAnimator mRectScaleAnim;
+    private boolean mAnimsStarted;
+    private boolean mRectXAnimEnded;
+    private boolean mRectYAnimEnded;
+    private boolean mRectScaleAnimEnded;
+
+    private final float mXDamping;
+    private final float mXStiffness;
+
+    private final float mYDamping;
+    private float mYStiffness;
+
+    private long mDuration;
+
+    private final Interpolator mCloseInterpolator;
+
+    private AppCloseConfig mValues;
+    final float mStartRadius;
+    final float mEndRadius;
+
+    final float mHomeTransYEnd;
+    final float mScaleStart;
+
+    public RectFSpringAnim2(RectF startRect, RectF targetRect, Context context, float startRadius,
+            float endRadius) {
+        super(startRect, targetRect, context);
+        mStartRect = startRect;
+        mTargetRect = targetRect;
+
+        mTrackingBottomY = startRect.bottom < targetRect.bottom;
+        mCurrentY = mTrackingBottomY ? mStartRect.bottom : mStartRect.top;
+        mCurrentCenterX = mStartRect.centerX();
+
+        mTargetY = mTrackingBottomY ? mTargetRect.bottom : mTargetRect.top;
+        mTargetX = mTargetRect.centerX();
+
+        ResourceProvider rp = DynamicResource.provider(context);
+        mXDamping = rp.getFloat(R.dimen.swipe_up_rect_2_x_damping_ratio);
+        mXStiffness = rp.getFloat(R.dimen.swipe_up_rect_2_x_stiffness);
+
+        mYDamping = rp.getFloat(R.dimen.swipe_up_rect_2_y_damping_ratio);
+        mYStiffness = rp.getFloat(R.dimen.swipe_up_rect_2_y_stiffness);
+        mDuration = Math.round(rp.getFloat(R.dimen.swipe_up_duration));
+
+        mHomeTransYEnd = dpToPx(rp.getFloat(R.dimen.swipe_up_trans_y_dp));
+        mScaleStart = rp.getFloat(R.dimen.swipe_up_scale_start);
+
+
+        if (!mTrackingBottomY) {
+            mYStiffness *= rp.getFloat(R.dimen.swipe_up_rect_2_y_stiffness_low_swipe_multiplier);
+            mDuration *= rp.getFloat(R.dimen.swipe_up_low_swipe_duration_multiplier);
+        }
+
+        mCloseInterpolator = getAppCloseInterpolator(context);
+
+        // End on a "round-enough" radius so that the shape reveal doesn't have to do too much
+        // rounding at the end of the animation.
+        mStartRadius = startRadius;
+        mEndRadius = endRadius;
+
+        setCanRelease(true);
+    }
+
+    public void onTargetPositionChanged() {
+        if (mRectXAnim != null && mTargetX != mTargetRect.centerX()) {
+            mTargetX = mTargetRect.centerX();
+            mRectXAnim.animateToFinalPosition(mTargetX);
+        }
+
+        if (mRectYAnim != null) {
+            if (mTrackingBottomY && mTargetY != mTargetRect.bottom) {
+                mTargetY = mTargetRect.bottom;
+                mRectYAnim.animateToFinalPosition(mTargetY);
+            } else if (!mTrackingBottomY && mTargetY != mTargetRect.top) {
+                mTargetY = mTargetRect.top;
+                mRectYAnim.animateToFinalPosition(mTargetY);
+            }
+        }
+    }
+
+    public void addOnUpdateListener(OnUpdateListener onUpdateListener) {
+        mOnUpdateListeners.add(onUpdateListener);
+    }
+
+    public void addAnimatorListener(Animator.AnimatorListener animatorListener) {
+        mAnimatorListeners.add(animatorListener);
+    }
+
+    /**
+     * Starts the fling/spring animation.
+     * @param context The activity context.
+     * @param velocityPxPerMs Velocity of swipe in px/ms.
+     */
+    public void start(Context context, PointF velocityPxPerMs) {
+        DeviceProfile dp = InvariantDeviceProfile.INSTANCE.get(context).getDeviceProfile(context);
+
+        mRectXAnim = new SpringAnimation(this, RECT_CENTER_X)
+                .setStartValue(mCurrentCenterX)
+                .setMinValue(Math.min(0, mCurrentCenterX))
+                .setMaxValue(Math.max(dp.widthPx, mCurrentCenterX))
+                .setStartVelocity(velocityPxPerMs.x * 1000)
+                .setSpring(new SpringForce(mTargetX)
+                        .setStiffness(mXStiffness)
+                        .setDampingRatio(mXDamping));
+        mRectXAnim.addEndListener(((animation, canceled, centerX, velocityX) -> {
+            mRectXAnimEnded = true;
+            maybeOnEnd();
+        }));
+
+        mRectYAnim = new SpringAnimation(this, RECT_Y)
+                .setStartValue(mCurrentY)
+                .setMinValue(Math.min(0, mCurrentY))
+                .setMaxValue(Math.max(dp.heightPx, mCurrentY))
+                .setStartVelocity(velocityPxPerMs.y * 1000)
+                .setSpring(new SpringForce(mTargetY)
+                        .setStiffness(mYStiffness)
+                        .setDampingRatio(mYDamping));
+        mRectYAnim.addEndListener(((animation, canceled, centerY, velocityY) -> {
+            mRectYAnimEnded = true;
+            maybeOnEnd();
+        }));
+
+        mRectScaleAnim = ObjectAnimator.ofFloat(this, PROGRESS, 0, 1f)
+                .setDuration(mDuration);
+        mRectScaleAnim.setInterpolator(mCloseInterpolator);
+        mRectScaleAnim.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                mRectScaleAnimEnded = true;
+                maybeOnEnd();
+            }
+        });
+
+        mValues = buildConfig();
+        mRectScaleAnim.addUpdateListener(mValues);
+
+        setCanRelease(false);
+        mAnimsStarted = true;
+
+        mRectXAnim.start();
+        mRectYAnim.start();
+        mRectScaleAnim.start();
+        for (Animator.AnimatorListener animatorListener : mAnimatorListeners) {
+            animatorListener.onAnimationStart(null);
+        }
+    }
+
+    private AppCloseConfig buildConfig() {
+        return new AppCloseConfig() {
+            FloatProp mHomeTransY = new FloatProp(0, mHomeTransYEnd, 0, mDuration, LINEAR);
+            FloatProp mHomeScale = new FloatProp(mScaleStart, 1f, 0, mDuration, LINEAR);
+            FloatProp mWindowFadeOut = new FloatProp(1f, 0f, 0, 116, LINEAR);
+            // There should be a slight overlap b/w window fading out and fg fading in.
+            // (fg startDelay < window fade out duration)
+            FloatProp mFgFadeIn = new FloatProp(0, 255f, 100, mDuration - 100, LINEAR);
+            FloatProp mRadius = new FloatProp(mStartRadius, mEndRadius, 0, mDuration, LINEAR);
+            FloatProp mThreePointInterpolation = new FloatProp(0, 1, 0, mDuration, LINEAR);
+
+            @Override
+            public float getWorkspaceTransY() {
+                return mHomeTransY.value;
+            }
+
+            @Override
+            public float getWorkspaceScale() {
+                return mHomeScale.value;
+            }
+
+            @Override
+            public float getWindowAlpha() {
+                return mWindowFadeOut.value;
+            }
+
+            @Override
+            public int getFgAlpha() {
+                return (int) mFgFadeIn.value;
+            }
+
+            @Override
+            public float getCornerRadius() {
+                return mRadius.value;
+            }
+
+            @Override
+            public float getInterpolatedProgress() {
+                return mThreePointInterpolation.value;
+            }
+
+            @Override
+            public void onUpdate(float percent) {}
+        };
+    }
+
+    public void end() {
+        if (mAnimsStarted) {
+            if (mRectXAnim.canSkipToEnd()) {
+                mRectXAnim.skipToEnd();
+            }
+            if (mRectYAnim.canSkipToEnd()) {
+                mRectYAnim.skipToEnd();
+            }
+            mRectScaleAnim.end();
+        }
+        mRectXAnimEnded = true;
+        mRectYAnimEnded = true;
+        mRectScaleAnimEnded = true;
+        maybeOnEnd();
+    }
+
+    private boolean isEnded() {
+        return mRectXAnimEnded && mRectYAnimEnded && mRectScaleAnimEnded;
+    }
+
+    private void onUpdate() {
+        if (isEnded()) {
+            // Prevent further updates from being called. This can happen between callbacks for
+            // ending the x/y/scale animations.
+            return;
+        }
+
+        if (!mOnUpdateListeners.isEmpty()) {
+            float rectProgress = mProgress;
+            float currentWidth = Utilities.mapRange(rectProgress, mStartRect.width(),
+                    mTargetRect.width());
+            float currentHeight = Utilities.mapRange(rectProgress, mStartRect.height(),
+                    mTargetRect.height());
+            if (mTrackingBottomY) {
+                mCurrentRect.set(mCurrentCenterX - currentWidth / 2, mCurrentY - currentHeight,
+                        mCurrentCenterX + currentWidth / 2, mCurrentY);
+            } else {
+                mCurrentRect.set(mCurrentCenterX - currentWidth / 2, mCurrentY,
+                        mCurrentCenterX + currentWidth / 2, mCurrentY + currentHeight);
+            }
+
+            float currentPlayTime = mRectScaleAnimEnded ? mRectScaleAnim.getDuration()
+                    : mRectScaleAnim.getCurrentPlayTime();
+            float linearProgress = Math.min(1f, currentPlayTime / mRectScaleAnim.getDuration());
+            for (OnUpdateListener onUpdateListener : mOnUpdateListeners) {
+                onUpdateListener.onUpdate(mValues, mCurrentRect, linearProgress);
+            }
+        }
+    }
+
+    private void maybeOnEnd() {
+        if (mAnimsStarted && isEnded()) {
+            mAnimsStarted = false;
+            setCanRelease(true);
+            for (Animator.AnimatorListener animatorListener : mAnimatorListeners) {
+                animatorListener.onAnimationEnd(null);
+            }
+        }
+    }
+
+    public void cancel() {
+        if (mAnimsStarted) {
+            for (OnUpdateListener onUpdateListener : mOnUpdateListeners) {
+                onUpdateListener.onCancel();
+            }
+        }
+        end();
+    }
+
+    private Interpolator getAppCloseInterpolator(Context context) {
+        ResourceProvider rp = DynamicResource.provider(context);
+        String path = String.format("M 0,0 C %f, %f, %f, %f, %f, %f C %f, %f, %f, %f, 1, 1",
+                rp.getFloat(R.dimen.c1_a),
+                rp.getFloat(R.dimen.c1_b),
+                rp.getFloat(R.dimen.c1_c),
+                rp.getFloat(R.dimen.c1_d),
+                rp.getFloat(R.dimen.mp_x),
+                rp.getFloat(R.dimen.mp_y),
+                rp.getFloat(R.dimen.c2_a),
+                rp.getFloat(R.dimen.c2_b),
+                rp.getFloat(R.dimen.c2_c),
+                rp.getFloat(R.dimen.c2_d));
+        return PathInterpolatorCompat.create(PathParser.createPathFromPathData(path));
+    }
+}
diff --git a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
index 1df459ef8c..de6c4f5e1c 100644
--- a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
+++ b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
@@ -20,6 +20,7 @@ import static com.android.launcher3.LauncherState.BACKGROUND_APP;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
+import static com.android.launcher3.config.FeatureFlags.PROTOTYPE_APP_CLOSE;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_DEPTH_CONTROLLER;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_SCRIM;
@@ -220,6 +221,9 @@ public class StaggeredWorkspaceAnim {
      * @param totalRows Total number of rows.
      */
     private void addStaggeredAnimationForView(View v, int row, int totalRows) {
+        if (PROTOTYPE_APP_CLOSE.get()) {
+            return;
+        }
         // Invert the rows, because we stagger starting from the bottom of the screen.
         int invertedRow = totalRows - row;
         // Add 1 to the inverted row so that the bottom most row has a start delay.
diff --git a/res/values/config.xml b/res/values/config.xml
index db9881161b..b75af7f9e4 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -134,8 +134,45 @@
     <item name="swipe_up_rect_scale_stiffness" type="dimen" format="float">200</item>
 
     <item name="swipe_up_rect_xy_fling_friction" type="dimen" format="float">1.5</item>
+
+    <item name="swipe_up_scale_start"  type="dimen" format="float">0.98</item>
+    <item name="swipe_up_duration"  type="dimen" format="float">500</item>
+
+    <item name="swipe_up_trans_y_dp"  type="dimen" format="float">3</item>
+    <item name="swipe_up_trans_y_dp_per_s" type="dimen" format="float">3</item>
+
+    <item name="swipe_up_trans_y_damping" type="dimen" format="float">0.4</item>
+    <item name="swipe_up_trans_y_stiffness" type="dimen" format="float">200</item>
+
     <item name="swipe_up_rect_xy_damping_ratio" type="dimen" format="float">0.8</item>
-    <item name="swipe_up_rect_xy_stiffness" type="dimen" format="float">200</item>
+    <item name="swipe_up_rect_xy_stiffness" type="dimen" format="float">100</item>
+
+
+    <item name="swipe_up_rect_2_x_damping_ratio" type="dimen" format="float">1</item>
+    <item name="swipe_up_rect_2_x_stiffness" type="dimen" format="float">350</item>
+
+    <item name="swipe_up_rect_2_y_damping_ratio" type="dimen" format="float">1</item>
+    <item name="swipe_up_rect_2_y_stiffness" type="dimen" format="float">700</item>
+
+    <item name="swipe_up_rect_2_y_stiffness_low_swipe_multiplier" type="dimen" format="float">1</item>
+    <item name="swipe_up_low_swipe_duration_multiplier"  type="dimen" format="float">1</item>
+
+    <item name="swipe_up_launcher_alpha_max_progress" type="dimen" format="float">0.85</item>
+
+
+    <item name="c1_a" type="dimen" format="float">0.05</item>
+    <item name="c1_b" type="dimen" format="float">0</item>
+    <item name="c1_c" type="dimen" format="float">0.133333</item>
+    <item name="c1_d" type="dimen" format="float">0.06</item>
+
+    <item name="mp_x" type="dimen" format="float">0.166666</item>
+    <item name="mp_y" type="dimen" format="float">.4</item>
+
+    <item name="c2_a" type="dimen" format="float">0.208333</item>
+    <item name="c2_b" type="dimen" format="float">.82</item>
+    <item name="c2_c" type="dimen" format="float">.25</item>
+    <item name="c2_d" type="dimen" format="float">1</item>
+
 
     <item name="staggered_damping_ratio" type="dimen" format="float">0.7</item>
     <item name="staggered_stiffness" type="dimen" format="float">150</item>
@@ -151,35 +188,32 @@
     <dimen name="swipe_up_max_workspace_trans_y">-60dp</dimen>
 
     <array name="dynamic_resources">
-        <item>@dimen/all_apps_spring_damping_ratio</item>
-        <item>@dimen/all_apps_spring_stiffness</item>
-
-        <item>@dimen/dismiss_task_trans_y_damping_ratio</item>
-        <item>@dimen/dismiss_task_trans_y_stiffness</item>
-
-        <item>@dimen/dismiss_task_trans_x_damping_ratio</item>
-        <item>@dimen/dismiss_task_trans_x_stiffness</item>
-
-        <item>@dimen/horizontal_spring_damping_ratio</item>
-        <item>@dimen/horizontal_spring_stiffness</item>
-
-        <item>@dimen/swipe_up_rect_scale_damping_ratio</item>
-        <item>@dimen/swipe_up_rect_scale_stiffness</item>
-
-        <item>@dimen/swipe_up_rect_xy_fling_friction</item>
-        <item>@dimen/swipe_up_rect_xy_damping_ratio</item>
-        <item>@dimen/swipe_up_rect_xy_stiffness</item>
-
-        <item>@dimen/staggered_damping_ratio</item>
-        <item>@dimen/staggered_stiffness</item>
-        <item>@dimen/unlock_staggered_velocity_dp_per_s</item>
-
-        <item>@dimen/swipe_up_fling_min_visible_change</item>
-        <item>@dimen/swipe_up_y_overshoot</item>
-
-        <item>@dimen/hint_scale_damping_ratio</item>
-        <item>@dimen/hint_scale_stiffness</item>
-        <item>@dimen/hint_scale_velocity_dp_per_s</item>
+        <item>@dimen/swipe_up_duration</item>
+        <item>@dimen/swipe_up_scale_start</item>
+        <item>@dimen/swipe_up_trans_y_dp</item>
+        <item>@dimen/swipe_up_trans_y_dp_per_s</item>
+        <item>@dimen/swipe_up_trans_y_damping</item>
+        <item>@dimen/swipe_up_trans_y_stiffness</item>
+        <item>@dimen/swipe_up_rect_2_x_damping_ratio</item>
+        <item>@dimen/swipe_up_rect_2_x_stiffness</item>
+        <item>@dimen/swipe_up_rect_2_y_damping_ratio</item>
+        <item>@dimen/swipe_up_rect_2_y_stiffness</item>
+        <item>@dimen/swipe_up_launcher_alpha_max_progress</item>
+        <item>@dimen/swipe_up_rect_2_y_stiffness_low_swipe_multiplier</item>
+        <item>@dimen/swipe_up_low_swipe_duration_multiplier</item>
+
+        <item>@dimen/c1_a</item>
+        <item>@dimen/c1_b</item>
+        <item>@dimen/c1_c</item>
+        <item>@dimen/c1_d</item>
+
+        <item>@dimen/mp_x</item>
+        <item>@dimen/mp_y</item>
+
+        <item>@dimen/c2_a</item>
+        <item>@dimen/c2_b</item>
+        <item>@dimen/c2_c</item>
+        <item>@dimen/c2_d</item>
     </array>
 
     <string-array name="live_wallpapers_remove_sysui_scrims">
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 10091a18b8..5d941a71de 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -3323,6 +3323,18 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         }
     }
 
+    /**
+     * Set the given view's pivot point to match the workspace's, so that it scales together. Since
+     * both this view and workspace can move, transform the point manually instead of using
+     * dragLayer.getDescendantCoordRelativeToSelf and related methods.
+     */
+    public void setPivotToScaleWithSelf(View sibling) {
+        sibling.setPivotY(getPivotY() + getTop()
+                - sibling.getTop() - sibling.getTranslationY());
+        sibling.setPivotX(getPivotX() + getLeft()
+                - sibling.getLeft() - sibling.getTranslationX());
+    }
+
     @Override
     public int getExpectedHeight() {
         return getMeasuredHeight() <= 0 || !mIsLayoutValid
diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
index f4986f4417..ed854dcd0e 100644
--- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
+++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
@@ -119,7 +119,7 @@ public class WorkspaceStateTransitionAnimation {
             propertySetter.setFloat(mWorkspace, SCALE_PROPERTY, mNewScale, scaleInterpolator);
         }
 
-        setPivotToScaleWithWorkspace(hotseat);
+        mWorkspace.setPivotToScaleWithSelf(hotseat);
         float hotseatScale = hotseatScaleAndTranslation.scale;
         if (shouldSpring) {
             PendingAnimation pa = (PendingAnimation) propertySetter;
@@ -156,18 +156,6 @@ public class WorkspaceStateTransitionAnimation {
         }
     }
 
-    /**
-     * Set the given view's pivot point to match the workspace's, so that it scales together. Since
-     * both this view and workspace can move, transform the point manually instead of using
-     * dragLayer.getDescendantCoordRelativeToSelf and related methods.
-     */
-    private void setPivotToScaleWithWorkspace(View sibling) {
-        sibling.setPivotY(mWorkspace.getPivotY() + mWorkspace.getTop()
-                - sibling.getTop() - sibling.getTranslationY());
-        sibling.setPivotX(mWorkspace.getPivotX() + mWorkspace.getLeft()
-                - sibling.getLeft() - sibling.getTranslationX());
-    }
-
     public void setScrim(PropertySetter propertySetter, LauncherState state,
             StateAnimationConfig config) {
         Scrim workspaceDragScrim = mLauncher.getDragLayer().getWorkspaceDragScrim();
diff --git a/src/com/android/launcher3/anim/Interpolators.java b/src/com/android/launcher3/anim/Interpolators.java
index 7a389374dc..11e831ee4c 100644
--- a/src/com/android/launcher3/anim/Interpolators.java
+++ b/src/com/android/launcher3/anim/Interpolators.java
@@ -27,7 +27,6 @@ import android.view.animation.PathInterpolator;
 
 import com.android.launcher3.Utilities;
 
-
 /**
  * Common interpolators used in Launcher
  */
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 44e31389ae..272dfc2cf0 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -233,6 +233,9 @@ public final class FeatureFlags {
     public static final BooleanFlag NOTIFY_CRASHES = getDebugFlag("NOTIFY_CRASHES", false,
             "Sends a notification whenever launcher encounters an uncaught exception.");
 
+    public static final BooleanFlag PROTOTYPE_APP_CLOSE = getDebugFlag(
+            "PROTOTYPE_APP_CLOSE", false, "Enables new app close");
+
     public static void initialize(Context context) {
         synchronized (sDebugFlags) {
             for (DebugFlag flag : sDebugFlags) {
diff --git a/src/com/android/launcher3/views/ClipIconView.java b/src/com/android/launcher3/views/ClipIconView.java
index 4e82336b09..a66b3f942e 100644
--- a/src/com/android/launcher3/views/ClipIconView.java
+++ b/src/com/android/launcher3/views/ClipIconView.java
@@ -15,10 +15,13 @@
  */
 package com.android.launcher3.views;
 
+import static com.android.launcher3.Utilities.boundToRange;
 import static com.android.launcher3.Utilities.mapToRange;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION;
 
+import static java.lang.Math.max;
+
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ValueAnimator;
@@ -143,10 +146,9 @@ public class ClipIconView extends View implements ClipPathView {
     /**
      * Update the icon UI to match the provided parameters during an animation frame
      */
-    public void update(RectF rect, float progress, float shapeProgressStart,
-            float cornerRadius, boolean isOpening, View container,
-            DeviceProfile dp, boolean isVerticalBarLayout) {
-
+    public void update(RectF rect, float progress, float shapeProgressStart, float cornerRadius,
+            int fgIconAlpha, boolean isOpening, View container, DeviceProfile dp,
+            boolean isVerticalBarLayout) {
         MarginLayoutParams lp = (MarginLayoutParams) container.getLayoutParams();
 
         float dX = mIsRtl
@@ -166,7 +168,7 @@ public class ClipIconView extends View implements ClipPathView {
             return;
         }
 
-        update(rect, progress, shapeProgressStart, cornerRadius, isOpening, scale,
+        update(rect, progress, shapeProgressStart, cornerRadius, fgIconAlpha, isOpening, scale,
                 minSize, lp, isVerticalBarLayout, dp);
 
         container.setPivotX(0);
@@ -178,8 +180,8 @@ public class ClipIconView extends View implements ClipPathView {
     }
 
     private void update(RectF rect, float progress, float shapeProgressStart, float cornerRadius,
-            boolean isOpening, float scale, float minSize, MarginLayoutParams parentLp,
-            boolean isVerticalBarLayout, DeviceProfile dp) {
+            int fgIconAlpha, boolean isOpening, float scale, float minSize,
+            MarginLayoutParams parentLp, boolean isVerticalBarLayout, DeviceProfile dp) {
         float dX = mIsRtl
                 ? rect.left - (dp.widthPx - parentLp.getMarginStart() - parentLp.width)
                 : rect.left - parentLp.getMarginStart();
@@ -187,9 +189,9 @@ public class ClipIconView extends View implements ClipPathView {
 
         // shapeRevealProgress = 1 when progress = shapeProgressStart + SHAPE_PROGRESS_DURATION
         float toMax = isOpening ? 1 / SHAPE_PROGRESS_DURATION : 1f;
-        float shapeRevealProgress = Utilities.boundToRange(mapToRange(
-                Math.max(shapeProgressStart, progress), shapeProgressStart, 1f, 0, toMax,
-                LINEAR), 0, 1);
+
+        float shapeRevealProgress = boundToRange(mapToRange(max(shapeProgressStart, progress),
+                shapeProgressStart, 1f, 0, toMax, LINEAR), 0, 1);
 
         if (isVerticalBarLayout) {
             mOutline.right = (int) (rect.width() / scale);
@@ -231,6 +233,8 @@ public class ClipIconView extends View implements ClipPathView {
                 sTmpRect.offset(diffX, diffY);
                 mForeground.setBounds(sTmpRect);
             } else {
+                mForeground.setAlpha(fgIconAlpha);
+
                 // Spring the foreground relative to the icon's movement within the DragLayer.
                 int diffX = (int) (dX / dp.availableWidthPx * FG_TRANS_X_FACTOR);
                 int diffY = (int) (dY / dp.availableHeightPx * FG_TRANS_Y_FACTOR);
diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java
index 96268cefb2..d49320b073 100644
--- a/src/com/android/launcher3/views/FloatingIconView.java
+++ b/src/com/android/launcher3/views/FloatingIconView.java
@@ -100,6 +100,8 @@ public class FloatingIconView extends FrameLayout implements
     private ListenerView mListenerView;
     private Runnable mFastFinishRunnable;
 
+    private float mIconOffsetY;
+
     public FloatingIconView(Context context) {
         this(context, null);
     }
@@ -136,16 +138,18 @@ public class FloatingIconView extends FrameLayout implements
 
     /**
      * Positions this view to match the size and location of {@param rect}.
-     * @param alpha The alpha to set this view.
+     * @param alpha The alpha[0, 1] of the entire floating view.
+     * @param fgIconAlpha The alpha[0-255] of the foreground layer of the icon (if applicable).
      * @param progress A value from [0, 1] that represents the animation progress.
      * @param shapeProgressStart The progress value at which to start the shape reveal.
      * @param cornerRadius The corner radius of {@param rect}.
+     * @param isOpening True if view is used for app open animation, false for app close animation.
      */
-    public void update(RectF rect, float alpha, float progress, float shapeProgressStart,
-            float cornerRadius, boolean isOpening) {
+    public void update(float alpha, int fgIconAlpha, RectF rect, float progress,
+            float shapeProgressStart, float cornerRadius, boolean isOpening) {
         setAlpha(alpha);
-        mClipIconView.update(rect, progress, shapeProgressStart, cornerRadius, isOpening,
-                this, mLauncher.getDeviceProfile(), mIsVerticalBarLayout);
+        mClipIconView.update(rect, progress, shapeProgressStart, cornerRadius, fgIconAlpha,
+                isOpening, this, mLauncher.getDeviceProfile(), mIsVerticalBarLayout);
     }
 
     @Override
@@ -478,11 +482,19 @@ public class FloatingIconView extends FrameLayout implements
     @Override
     public void onAnimationRepeat(Animator animator) {}
 
+    /**
+     * Offsets and updates the position of this view by {@param y}.
+     */
+    public void setPositionOffsetY(float y) {
+        mIconOffsetY = y;
+        onGlobalLayout();
+    }
+
     @Override
     public void onGlobalLayout() {
-        if (mOriginalIcon.isAttachedToWindow() && mPositionOut != null) {
-            getLocationBoundsForView(mLauncher, mOriginalIcon, mIsOpening,
-                    sTmpRectF);
+        if (mOriginalIcon != null && mOriginalIcon.isAttachedToWindow() && mPositionOut != null) {
+            getLocationBoundsForView(mLauncher, mOriginalIcon, mIsOpening, sTmpRectF);
+            sTmpRectF.offset(0, mIconOffsetY);
             if (!sTmpRectF.equals(mPositionOut)) {
                 updatePosition(sTmpRectF, (InsettableFrameLayout.LayoutParams) getLayoutParams());
                 if (mOnTargetChangeRunnable != null) {
@@ -617,6 +629,7 @@ public class FloatingIconView extends FrameLayout implements
         mClipIconView.recycle();
         mBtvDrawable.setBackground(null);
         mFastFinishRunnable = null;
+        mIconOffsetY = 0;
     }
 
     private static class IconLoadResult {
-- 
GitLab


From 2df75d388f569883bf3eb06e6f08176b75c0b32a Mon Sep 17 00:00:00 2001
From: Evan Rosky <erosky@google.com>
Date: Thu, 22 Apr 2021 16:17:36 -0700
Subject: [PATCH 0959/1664] Fix surface release race when using Shell
 Transitions

Shell Transitions operates on the leashes both before and
after the animation in order to adapt shell transit to the
legacy transit impls in launcher.

This means we can't release the surfaces before the finish
callback. Since the finish callback provides a convenient place
to release the surfaces anyways, we can effectively disable
the release here.

Bug: 186158221
Test: enable shell transit, physically rotate to landscape,
      launch messages and then close it (back-gesture) repeatedly
      and observe that launcher doesn't crash.
Change-Id: I5197cf448917eb7b326e808887f4adace232209c
---
 .../src/com/android/quickstep/RemoteAnimationTargets.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/RemoteAnimationTargets.java b/quickstep/src/com/android/quickstep/RemoteAnimationTargets.java
index a1af77d382..edc3ab22f3 100644
--- a/quickstep/src/com/android/quickstep/RemoteAnimationTargets.java
+++ b/quickstep/src/com/android/quickstep/RemoteAnimationTargets.java
@@ -17,6 +17,8 @@ package com.android.quickstep;
 
 import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR;
 
+import static com.android.quickstep.TaskAnimationManager.ENABLE_SHELL_TRANSITIONS;
+
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
 import java.util.ArrayList;
@@ -97,6 +99,10 @@ public class RemoteAnimationTargets {
     }
 
     public void release() {
+        if (ENABLE_SHELL_TRANSITIONS) {
+            mReleaseChecks.clear();
+            return;
+        }
         if (mReleased) {
             return;
         }
-- 
GitLab


From c39db7321fc7def06c6ace7d3928663c8df1a535 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Sat, 3 Apr 2021 01:20:21 -0700
Subject: [PATCH 0960/1664] New spring overscroll in pagedView

> Using EdgeEffect in PagedView for overscroll
> Keeping RecentsView overscroll similar to S, by created a custom EdgeEffect

Bug: 183966408
Test: Manual
Change-Id: Ia547cf14ea315468b12a4ff5f389ac2d2beceafa
---
 .../android/quickstep/AbsSwipeUpHandler.java  |  16 +-
 .../android/quickstep/views/RecentsView.java  | 158 +++-
 .../android/quickstep/views/TaskMenuView.java |  16 +-
 src/com/android/launcher3/PagedView.java      | 403 ++++----
 src/com/android/launcher3/Workspace.java      |  86 +-
 .../launcher3/folder/FolderPagedView.java     |   4 +-
 .../touch/LandscapePagedViewHandler.java      |  30 +-
 .../touch/PagedOrientationHandler.java        |  19 +-
 .../touch/PortraitPagedViewHandler.java       |  30 +-
 .../touch/SeascapePagedViewHandler.java       |   6 +-
 .../launcher3/util/EdgeEffectCompat.java      |  46 +
 .../android/launcher3/util/OverScroller.java  | 867 ------------------
 .../launcher3/util/OverlayEdgeEffect.java     |  83 ++
 .../launcher3/util/TranslateEdgeEffect.java   |  50 +
 14 files changed, 540 insertions(+), 1274 deletions(-)
 create mode 100644 src/com/android/launcher3/util/EdgeEffectCompat.java
 delete mode 100644 src/com/android/launcher3/util/OverScroller.java
 create mode 100644 src/com/android/launcher3/util/OverlayEdgeEffect.java
 create mode 100644 src/com/android/launcher3/util/TranslateEdgeEffect.java

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index dbb8272621..6a8865a8da 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -71,6 +71,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnApplyWindowInsetsListener;
 import android.view.ViewTreeObserver.OnDrawListener;
+import android.view.ViewTreeObserver.OnScrollChangedListener;
 import android.view.WindowInsets;
 import android.view.animation.Interpolator;
 import android.widget.Toast;
@@ -139,6 +140,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     private final Handler mHandler = new Handler();
     // Callbacks to be made once the recents animation starts
     private final ArrayList<Runnable> mRecentsAnimationStartCallbacks = new ArrayList<>();
+    private final OnScrollChangedListener mOnRecentsScrollListener = this::onRecentsViewScroll;
+
     protected RecentsAnimationController mRecentsAnimationController;
     protected RecentsAnimationTargets mRecentsAnimationTargets;
     protected T mActivity;
@@ -1368,6 +1371,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     private void invalidateHandlerWithLauncher() {
         endLauncherTransitionController();
 
+        mRecentsView.removeOnScrollChangedListener(mOnRecentsScrollListener);
         mRecentsView.onGestureAnimationEnd();
         resetLauncherListeners();
     }
@@ -1560,17 +1564,19 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                     mRecentsAnimationTargets.addReleaseCheck(applier));
         });
 
-        mRecentsView.setOnScrollChangeListener((v, scrollX, scrollY, oldScrollX, oldScrollY) -> {
-            if (moveWindowWithRecentsScroll()) {
-                updateFinalShift();
-            }
-        });
+        mRecentsView.addOnScrollChangedListener(mOnRecentsScrollListener);
         runOnRecentsAnimationStart(() ->
                 mRecentsView.setRecentsAnimationTargets(mRecentsAnimationController,
                         mRecentsAnimationTargets));
         mRecentsViewScrollLinked = true;
     }
 
+    private void onRecentsViewScroll() {
+        if (moveWindowWithRecentsScroll()) {
+            updateFinalShift();
+        }
+    }
+
     protected void startNewTask(Consumer<Boolean> resultCallback) {
         // Launch the task user scrolled to (mRecentsView.getNextPage()).
         if (!mCanceled) {
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 6ed490d6d9..079401205c 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -42,6 +42,7 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_DISMISS_SWIPE_UP;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_SWIPE_DOWN;
 import static com.android.launcher3.statehandlers.DepthController.DEPTH;
+import static com.android.launcher3.touch.PagedOrientationHandler.CANVAS_TRANSLATE;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW;
@@ -88,11 +89,13 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewDebug;
 import android.view.ViewGroup;
+import android.view.ViewTreeObserver.OnScrollChangedListener;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.animation.Interpolator;
 import android.widget.FrameLayout;
 import android.widget.ListView;
+import android.widget.OverScroller;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
@@ -116,14 +119,15 @@ import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.BaseState;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.testing.TestProtocol;
+import com.android.launcher3.touch.OverScroll;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.util.DynamicResource;
 import com.android.launcher3.util.IntSet;
 import com.android.launcher3.util.MultiValueAlpha;
-import com.android.launcher3.util.OverScroller;
 import com.android.launcher3.util.ResourceBasedOverride.Overrides;
 import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
 import com.android.launcher3.util.Themes;
+import com.android.launcher3.util.TranslateEdgeEffect;
 import com.android.launcher3.util.ViewPool;
 import com.android.quickstep.AnimatedFloat;
 import com.android.quickstep.BaseActivityInterface;
@@ -157,6 +161,7 @@ import com.android.systemui.shared.system.TaskStackChangeListeners;
 import com.android.wm.shell.pip.IPipAnimationListener;
 
 import java.util.ArrayList;
+import java.util.List;
 import java.util.function.Consumer;
 
 /**
@@ -296,6 +301,9 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 }
             };
 
+    // OverScroll constants
+    private static final int OVERSCROLL_PAGE_SNAP_ANIMATION_DURATION = 270;
+
     protected final RecentsOrientedState mOrientationState;
     protected final BaseActivityInterface<STATE_TYPE, ACTIVITY_TYPE> mSizeStrategy;
     protected RecentsAnimationController mRecentsAnimationController;
@@ -314,6 +322,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     protected final Rect mTempRect = new Rect();
     protected final RectF mTempRectF = new RectF();
     private final PointF mTempPointF = new PointF();
+    private final float[] mTempFloat = new float[1];
+    private final List<OnScrollChangedListener> mScrollListeners = new ArrayList<>();
     private float mFullscreenScale;
 
     private static final int DISMISS_TASK_DURATION = 300;
@@ -360,6 +370,9 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
 
     IntSet mTopIdSet = new IntSet();
 
+    private int mOverScrollShift = 0;
+
+
     /**
      * TODO: Call reloadIdNeeded in onTaskStackChanged.
      */
@@ -583,6 +596,72 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         return mIsRtl;
     }
 
+    @Override
+    protected void initEdgeEffect() {
+        mEdgeGlowLeft = new TranslateEdgeEffect(getContext());
+        mEdgeGlowRight = new TranslateEdgeEffect(getContext());
+    }
+
+    @Override
+    protected void drawEdgeEffect(Canvas canvas) {
+        // Do not draw edge effect
+    }
+
+    @Override
+    protected void dispatchDraw(Canvas canvas) {
+        // Draw overscroll
+        if (mAllowOverScroll && (!mEdgeGlowRight.isFinished() || !mEdgeGlowLeft.isFinished())) {
+            final int restoreCount = canvas.save();
+            final int width = getWidth();
+            final int height = getHeight();
+            int primarySize = mOrientationHandler.getPrimaryValue(width, height);
+            int secondarySize = mOrientationHandler.getSecondaryValue(width, height);
+
+            float effectiveShift = 0;
+            if (!mEdgeGlowLeft.isFinished()) {
+                mEdgeGlowLeft.setSize(secondarySize, primarySize);
+                if (((TranslateEdgeEffect) mEdgeGlowLeft).getTranslationShift(mTempFloat)) {
+                    effectiveShift = mTempFloat[0];
+                    postInvalidateOnAnimation();
+                }
+            }
+            if (!mEdgeGlowRight.isFinished()) {
+                mEdgeGlowRight.setSize(secondarySize, primarySize);
+                if (((TranslateEdgeEffect) mEdgeGlowRight).getTranslationShift(mTempFloat)) {
+                    effectiveShift -= mTempFloat[0];
+                    postInvalidateOnAnimation();
+                }
+            }
+
+            int scroll = OverScroll.dampedScroll(effectiveShift * primarySize, primarySize);
+            mOrientationHandler.set(canvas, CANVAS_TRANSLATE, scroll);
+
+            if (mOverScrollShift != scroll) {
+                mOverScrollShift = scroll;
+                dispatchScrollChanged();
+            }
+
+            super.dispatchDraw(canvas);
+            canvas.restoreToCount(restoreCount);
+        } else {
+            if (mOverScrollShift != 0) {
+                mOverScrollShift = 0;
+                dispatchScrollChanged();
+            }
+            super.dispatchDraw(canvas);
+        }
+        if (LIVE_TILE.get() && mEnableDrawingLiveTile && mLiveTileParams.getTargetSet() != null) {
+            redrawLiveTile();
+        }
+    }
+
+    /**
+     * Returns the view shift due to overscroll
+     */
+    public int getOverScrollShift() {
+        return mOverScrollShift;
+    }
+
     @Override
     public Task onTaskThumbnailChanged(int taskId, ThumbnailData thumbnailData) {
         if (mHandleTaskStackChanges) {
@@ -936,8 +1015,30 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     }
 
     @Override
-    protected boolean snapToPageInFreeScroll() {
-        return !showAsGrid();
+    protected void onNotSnappingToPageInFreeScroll() {
+        int finalPos = mScroller.getFinalX();
+        if (!showAsGrid() && finalPos > mMinScroll && finalPos < mMaxScroll) {
+            int firstPageScroll = getScrollForPage(!mIsRtl ? 0 : getPageCount() - 1);
+            int lastPageScroll = getScrollForPage(!mIsRtl ? getPageCount() - 1 : 0);
+
+            // If scrolling ends in the half of the added space that is closer to
+            // the end, settle to the end. Otherwise snap to the nearest page.
+            // If flinging past one of the ends, don't change the velocity as it
+            // will get stopped at the end anyway.
+            int pageSnapped = finalPos < (firstPageScroll + mMinScroll) / 2
+                    ? mMinScroll
+                    : finalPos > (lastPageScroll + mMaxScroll) / 2
+                            ? mMaxScroll
+                            : getScrollForPage(mNextPage);
+
+            mScroller.setFinalX(pageSnapped);
+            // Ensure the scroll/snap doesn't happen too fast;
+            int extraScrollDuration = OVERSCROLL_PAGE_SNAP_ANIMATION_DURATION
+                    - mScroller.getDuration();
+            if (extraScrollDuration > 0) {
+                mScroller.extendDuration(extraScrollDuration);
+            }
+        }
     }
 
     @Override
@@ -1267,12 +1368,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
 
         // Update the high res thumbnail loader state
         mModel.getThumbnailCache().getHighResLoadingState().setFlingingFast(isFlingingFast);
-
-        mLiveTileTaskViewSimulator.setScroll(getScrollOffset());
-        if (LIVE_TILE.get() && mEnableDrawingLiveTile
-                && mLiveTileParams.getTargetSet() != null) {
-            redrawLiveTile();
-        }
         return scrolling;
     }
 
@@ -1571,7 +1666,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             updateOrientationHandler();
         }
 
-        setOnScrollChangeListener(null);
         setEnableFreeScroll(true);
         setEnableDrawingLiveTile(true);
         if (!LIVE_TILE.get()) {
@@ -3207,13 +3301,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         return mClearAllButton;
     }
 
-    @Override
-    protected boolean onOverscroll(int amount) {
-        // overscroll should only be accepted on -1 direction (for clear all button)
-        if ((amount > 0 && !mIsRtl) || (amount < 0 && mIsRtl)) return false;
-        return super.onOverscroll(amount);
-    }
-
     /**
      * @return How many pixels the running task is offset on the currently laid out dominant axis.
      */
@@ -3228,14 +3315,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         if (pageIndex == -1) {
             return 0;
         }
-        // Unbound the scroll (due to overscroll) if the adjacent tasks are offset away from it.
-        // This allows the page to move freely, given there's no visual indication why it shouldn't.
-        int boundedScroll = mOrientationHandler.getPrimaryScroll(this);
-        int unboundedScroll = getUnboundedScroll();
-        float unboundedProgress = mAdjacentPageOffset;
-        int scroll = Math.round(unboundedScroll * unboundedProgress
-                + boundedScroll * (1 - unboundedProgress));
-        return getScrollForPage(pageIndex) - scroll;
+        return getScrollForPage(pageIndex) - mOrientationHandler.getPrimaryScroll(this)
+                + getOverScrollShift();
     }
 
     /**
@@ -3421,6 +3502,33 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         void onEmptyMessageUpdated(boolean isEmpty);
     }
 
+    /**
+     * Adds a listener for scroll changes
+     */
+    public void addOnScrollChangedListener(OnScrollChangedListener listener) {
+        mScrollListeners.add(listener);
+    }
+
+    /**
+     * Removes a previously added scroll change listener
+     */
+    public void removeOnScrollChangedListener(OnScrollChangedListener listener) {
+        mScrollListeners.remove(listener);
+    }
+
+    @Override
+    protected void onScrollChanged(int l, int t, int oldl, int oldt) {
+        super.onScrollChanged(l, t, oldl, oldt);
+        dispatchScrollChanged();
+    }
+
+    private void dispatchScrollChanged() {
+        mLiveTileTaskViewSimulator.setScroll(getScrollOffset());
+        for (int i = mScrollListeners.size() - 1; i >= 0; i--) {
+            mScrollListeners.get(i).onScrollChanged();
+        }
+    }
+
     private static class PinnedStackAnimationListener<T extends BaseActivity> extends
             IPipAnimationListener.Stub {
         private T mActivity;
diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
index 658d71daf9..f55cdaca46 100644
--- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
@@ -121,7 +121,7 @@ public class TaskMenuView extends AbstractFloatingView implements OnScrollChange
         };
     }
 
-    private void setPosition(float x, float y) {
+    private void setPosition(float x, float y, int overscrollShift) {
         PagedOrientationHandler pagedOrientationHandler = mTaskView.getPagedOrientationHandler();
         int taskTopMargin = mActivity.getDeviceProfile().overviewTaskThumbnailTopMarginPx;
         float adjustedY = y + taskTopMargin;
@@ -136,8 +136,9 @@ public class TaskMenuView extends AbstractFloatingView implements OnScrollChange
             setPivotY(0);
         }
         setRotation(pagedOrientationHandler.getDegreesRotated());
-        setX(pagedOrientationHandler.getTaskMenuX(x, mTaskView.getThumbnail()));
-        setY(pagedOrientationHandler.getTaskMenuY(adjustedY, mTaskView.getThumbnail()));
+        setX(pagedOrientationHandler.getTaskMenuX(x, mTaskView.getThumbnail(), overscrollShift));
+        setY(pagedOrientationHandler.getTaskMenuY(
+                adjustedY, mTaskView.getThumbnail(), overscrollShift));
     }
 
     public void onRotationChanged() {
@@ -169,14 +170,15 @@ public class TaskMenuView extends AbstractFloatingView implements OnScrollChange
             return false;
         }
         post(this::animateOpen);
-        mActivity.getRootView().getViewTreeObserver().addOnScrollChangedListener(this);
+        ((RecentsView) mActivity.getOverviewPanel()).addOnScrollChangedListener(this);
         return true;
     }
 
     @Override
     public void onScrollChanged() {
         RecentsView rv = mTaskView.getRecentsView();
-        setPosition(mTaskView.getX() - rv.getScrollX(), mTaskView.getY() - rv.getScrollY());
+        setPosition(mTaskView.getX() - rv.getScrollX(), mTaskView.getY() - rv.getScrollY(),
+                rv.getOverScrollShift());
     }
 
     /** @return true if successfully able to populate task view menu, false otherwise */
@@ -236,7 +238,7 @@ public class TaskMenuView extends AbstractFloatingView implements OnScrollChange
             .mOrientationState.isRecentsActivityRotationAllowed();
         mOptionLayout.setOrientation(orientationHandler
                 .getTaskMenuLayoutOrientation(canActivityRotate, mOptionLayout));
-        setPosition(sTempRect.left - insets.left, sTempRect.top - insets.top);
+        setPosition(sTempRect.left - insets.left, sTempRect.top - insets.top, 0);
     }
 
     private void animateOpen() {
@@ -282,7 +284,7 @@ public class TaskMenuView extends AbstractFloatingView implements OnScrollChange
     private void closeComplete() {
         mIsOpen = false;
         mActivity.getDragLayer().removeView(this);
-        mActivity.getRootView().getViewTreeObserver().removeOnScrollChangedListener(this);
+        ((RecentsView) mActivity.getOverviewPanel()).removeOnScrollChangedListener(this);
     }
 
     private RoundedRectRevealOutlineProvider createOpenCloseOutlineProvider() {
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 7496703f88..c9cc3721a8 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -16,16 +16,14 @@
 
 package com.android.launcher3;
 
+import static com.android.launcher3.anim.Interpolators.SCROLL;
 import static com.android.launcher3.compat.AccessibilityManagerCompat.isAccessibilityEnabled;
 import static com.android.launcher3.compat.AccessibilityManagerCompat.isObservedEventType;
-import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;
 import static com.android.launcher3.touch.OverScroll.OVERSCROLL_DAMP_FACTOR;
-import static com.android.launcher3.touch.PagedOrientationHandler.CANVAS_TRANSLATE;
 import static com.android.launcher3.touch.PagedOrientationHandler.VIEW_SCROLL_BY;
 import static com.android.launcher3.touch.PagedOrientationHandler.VIEW_SCROLL_TO;
 
 import android.animation.LayoutTransition;
-import android.animation.TimeInterpolator;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -46,19 +44,17 @@ import android.view.ViewGroup;
 import android.view.ViewParent;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityNodeInfo;
-import android.view.animation.Interpolator;
+import android.widget.OverScroller;
 import android.widget.ScrollView;
 
 import androidx.annotation.Nullable;
 
-import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.compat.AccessibilityManagerCompat;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.pageindicators.PageIndicator;
-import com.android.launcher3.touch.OverScroll;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.touch.PagedOrientationHandler.ChildBounds;
-import com.android.launcher3.util.OverScroller;
+import com.android.launcher3.util.EdgeEffectCompat;
 import com.android.launcher3.util.Thunk;
 import com.android.launcher3.views.ActivityContext;
 
@@ -80,9 +76,6 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
 
     public static final int PAGE_SNAP_ANIMATION_DURATION = 750;
 
-    // OverScroll constants
-    private final static int OVERSCROLL_PAGE_SNAP_ANIMATION_DURATION = 270;
-
     private static final float RETURN_TO_ORIGINAL_PAGE_THRESHOLD = 0.33f;
     // The page is moved more than halfway, automatically move to the next page on touch up.
     private static final float SIGNIFICANT_MOVE_THRESHOLD = 0.4f;
@@ -113,7 +106,6 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
     protected int mMaxScroll;
     protected int mMinScroll;
     protected OverScroller mScroller;
-    private Interpolator mDefaultInterpolator;
     private VelocityTracker mVelocityTracker;
     protected int mPageSpacing = 0;
 
@@ -144,12 +136,6 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
     protected boolean mIsPageInTransition = false;
     private Runnable mOnPageTransitionEndCallback;
 
-    protected float mSpringOverScroll;
-
-    protected boolean mWasInOverscroll = false;
-
-    protected int mUnboundedScroll;
-
     // Page Indicator
     @Thunk int mPageIndicatorViewId;
     protected T mPageIndicator;
@@ -162,6 +148,9 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
 
     private int[] mTmpIntPair = new int[2];
 
+    protected EdgeEffectCompat mEdgeGlowLeft;
+    protected EdgeEffectCompat mEdgeGlowRight;
+
     public PagedView(Context context) {
         this(context, null);
     }
@@ -181,8 +170,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         setHapticFeedbackEnabled(false);
         mIsRtl = Utilities.isRtl(getResources());
 
-        mScroller = new OverScroller(context);
-        setDefaultInterpolator(Interpolators.SCROLL);
+        mScroller = new OverScroller(context, SCROLL);
         mCurrentPage = 0;
 
         final ViewConfiguration configuration = ViewConfiguration.get(context);
@@ -196,12 +184,14 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         mMinFlingVelocity = (int) (MIN_FLING_VELOCITY * density);
         mMinSnapVelocity = (int) (MIN_SNAP_VELOCITY * density);
 
+        initEdgeEffect();
         setDefaultFocusHighlightEnabled(false);
+        setWillNotDraw(false);
     }
 
-    protected void setDefaultInterpolator(Interpolator interpolator) {
-        mDefaultInterpolator = interpolator;
-        mScroller.setInterpolator(mDefaultInterpolator);
+    protected void initEdgeEffect() {
+        mEdgeGlowLeft = new EdgeEffectCompat(getContext());
+        mEdgeGlowRight = new EdgeEffectCompat(getContext());
     }
 
     public void initParentViews(View parent) {
@@ -256,7 +246,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
             newPosition = getScrollForPage(mCurrentPage);
         }
         mOrientationHandler.set(this, VIEW_SCROLL_TO, newPosition);
-        mOrientationHandler.scrollerStartScroll(mScroller, newPosition);
+        mScroller.startScroll(mScroller.getCurrX(), 0, newPosition - mScroller.getCurrX(), 0);
         forceFinishScroller(true);
     }
 
@@ -420,7 +410,6 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
      * to provide custom behavior during animation.
      */
     protected void onPageEndTransition() {
-        mWasInOverscroll = false;
         AccessibilityManagerCompat.sendScrollFinishedEventToTest(getContext());
         AccessibilityManagerCompat.sendCustomAccessibilityEvent(getPageAt(mCurrentPage),
                 AccessibilityEvent.TYPE_VIEW_FOCUSED, null);
@@ -442,56 +431,12 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         }
     }
 
-    protected int getUnboundedScroll() {
-        return mUnboundedScroll;
-    }
-
-    @Override
-    public void scrollBy(int x, int y) {
-        mOrientationHandler.delegateScrollBy(this, getUnboundedScroll(), x, y);
-    }
-
     @Override
     public void scrollTo(int x, int y) {
-        int primaryScroll = mOrientationHandler.getPrimaryValue(x, y);
-        int secondaryScroll = mOrientationHandler.getSecondaryValue(x, y);
-        mUnboundedScroll = primaryScroll;
-
-        boolean isBeforeFirstPage = mIsRtl ?
-            (primaryScroll > mMaxScroll) : (primaryScroll < mMinScroll);
-        boolean isAfterLastPage = mIsRtl ?
-            (primaryScroll < mMinScroll) : (primaryScroll > mMaxScroll);
-        if (!isBeforeFirstPage && !isAfterLastPage) {
-            mSpringOverScroll = 0;
-        }
-
-        if (isBeforeFirstPage) {
-            mOrientationHandler.delegateScrollTo(this,
-                secondaryScroll, mIsRtl ? mMaxScroll : mMinScroll);
-            if (mAllowOverScroll) {
-                mWasInOverscroll = true;
-                overScroll(primaryScroll - (mIsRtl ? mMaxScroll : mMinScroll));
-            }
-        } else if (isAfterLastPage) {
-            mOrientationHandler.delegateScrollTo(this,
-                secondaryScroll, mIsRtl ? mMinScroll : mMaxScroll);
-            if (mAllowOverScroll) {
-                mWasInOverscroll = true;
-                overScroll(primaryScroll - (mIsRtl ? mMinScroll : mMaxScroll));
-            }
-        } else {
-            if (mWasInOverscroll) {
-                overScroll(0);
-                mWasInOverscroll = false;
-            }
-            super.scrollTo(x, y);
-        }
-    }
-
-    /**
-     * Helper for {@link PagedOrientationHandler} to be able to call parent's scrollTo method
-     */
-    public void superScrollTo(int x, int y) {
+        x = Utilities.boundToRange(x,
+                mOrientationHandler.getPrimaryValue(mMinScroll, 0), mMaxScroll);
+        y = Utilities.boundToRange(y,
+                mOrientationHandler.getPrimaryValue(0, mMinScroll), mMaxScroll);
         super.scrollTo(x, y);
     }
 
@@ -524,12 +469,22 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
     protected boolean computeScrollHelper(boolean shouldInvalidate) {
         if (mScroller.computeScrollOffset()) {
             // Don't bother scrolling if the page does not need to be moved
-            int currentScroll = mOrientationHandler.getPrimaryScroll(this);
-            if (mUnboundedScroll != mScroller.getCurrPos()
-                || currentScroll != mScroller.getCurrPos()) {
-                mOrientationHandler.set(this, VIEW_SCROLL_TO, mScroller.getCurrPos());
+            int oldPos = mOrientationHandler.getPrimaryScroll(this);
+            int newPos = mScroller.getCurrX();
+            if (oldPos != newPos) {
+                mOrientationHandler.set(this, VIEW_SCROLL_TO, mScroller.getCurrX());
             }
             if (shouldInvalidate) {
+                if (mAllowOverScroll) {
+                    if (newPos < mMinScroll && oldPos >= mMinScroll) {
+                        mEdgeGlowLeft.onAbsorb((int) mScroller.getCurrVelocity());
+                        mScroller.abortAnimation();
+                    } else if (newPos > mMaxScroll && oldPos <= mMaxScroll) {
+                        mEdgeGlowRight.onAbsorb((int) mScroller.getCurrVelocity());
+                        mScroller.abortAnimation();
+                    }
+                }
+
                 invalidate();
             }
             return true;
@@ -982,9 +937,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
                 mTotalMotion = 0;
                 mAllowEasyFling = false;
                 mActivePointerId = ev.getPointerId(0);
-
-                updateIsBeingDraggedOnTouchDown();
-
+                updateIsBeingDraggedOnTouchDown(ev);
                 break;
             }
 
@@ -1009,9 +962,9 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
     /**
      * If being flinged and user touches the screen, initiate drag; otherwise don't.
      */
-    private void updateIsBeingDraggedOnTouchDown() {
+    private void updateIsBeingDraggedOnTouchDown(MotionEvent ev) {
         // mScroller.isFinished should be false when being flinged.
-        final int xDist = Math.abs(mScroller.getFinalPos() - mScroller.getCurrPos());
+        final int xDist = Math.abs(mScroller.getFinalX() - mScroller.getCurrX());
         final boolean finishedScrolling = (mScroller.isFinished() || xDist < mPageSlop / 3);
 
         if (finishedScrolling) {
@@ -1020,9 +973,20 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
                 setCurrentPage(getNextPage());
                 pageEndTransition();
             }
+            mIsBeingDragged = !mEdgeGlowLeft.isFinished() || !mEdgeGlowRight.isFinished();
         } else {
             mIsBeingDragged = true;
         }
+
+        // Catch the edge effect if it is active.
+        float displacement = mOrientationHandler.getSecondaryValue(ev.getX(), ev.getY())
+                / mOrientationHandler.getSecondaryValue(getWidth(), getHeight());
+        if (!mEdgeGlowLeft.isFinished()) {
+            mEdgeGlowLeft.onPullDistance(0f, 1f - displacement);
+        }
+        if (!mEdgeGlowRight.isFinished()) {
+            mEdgeGlowRight.onPullDistance(0f, displacement);
+        }
     }
 
     public boolean isHandlingTouch() {
@@ -1053,7 +1017,6 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
             mTotalMotion += Math.abs(mLastMotion - primaryDirection);
             mLastMotion = primaryDirection;
             mLastMotionRemainder = 0;
-            onScrollInteractionBegin();
             pageBeginTransition();
             // Stop listening for things like pinches.
             requestDisallowInterceptTouchEvent(true);
@@ -1114,69 +1077,6 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         }
     }
 
-    @Override
-    protected void dispatchDraw(Canvas canvas) {
-        if (mScroller.isSpringing() && mSpringOverScroll != 0) {
-            int saveCount = canvas.save();
-            mOrientationHandler.set(canvas, CANVAS_TRANSLATE, -mSpringOverScroll);
-            super.dispatchDraw(canvas);
-
-            canvas.restoreToCount(saveCount);
-        } else {
-            super.dispatchDraw(canvas);
-        }
-    }
-
-    /**
-     * Returns the amount of overscroll caused by the spring in {@link OverScroller}.
-     */
-    private int getSpringOverScroll(int amount) {
-        if (mScroller.isSpringing()) {
-            return amount < 0
-                    ? mScroller.getCurrPos() - mMinScroll
-                    : Math.max(0, mScroller.getCurrPos() - mMaxScroll);
-        } else {
-            return 0;
-        }
-    }
-
-    protected void dampedOverScroll(int amount) {
-        if (amount == 0) {
-            return;
-        }
-
-        int size = mOrientationHandler.getMeasuredSize(this);
-        int overScrollAmount = OverScroll.dampedScroll(amount, size);
-        if (mScroller.isSpringing()) {
-            mSpringOverScroll = getSpringOverScroll(amount);
-            invalidate();
-            return;
-        }
-
-        int primaryScroll = mOrientationHandler.getPrimaryScroll(this);
-        int boundedScroll = Utilities.boundToRange(primaryScroll, mMinScroll, mMaxScroll);
-        mOrientationHandler.delegateScrollTo(this, boundedScroll + overScrollAmount);
-        invalidate();
-    }
-
-    protected void overScroll(int amount) {
-        if (mScroller.isSpringing()) {
-            mSpringOverScroll = getSpringOverScroll(amount);
-            invalidate();
-            return;
-        }
-
-        if (amount == 0) return;
-
-        if (mFreeScroll && !mScroller.isFinished()) {
-            int scrollAmount = amount < 0 ? mMinScroll + amount : mMaxScroll + amount;
-            mOrientationHandler.delegateScrollTo(this, scrollAmount);
-        } else {
-            dampedOverScroll(amount);
-        }
-    }
-
-
     public void setEnableFreeScroll(boolean freeScroll) {
         if (mFreeScroll == freeScroll) {
             return;
@@ -1209,7 +1109,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
 
         switch (action & MotionEvent.ACTION_MASK) {
         case MotionEvent.ACTION_DOWN:
-            updateIsBeingDraggedOnTouchDown();
+            updateIsBeingDraggedOnTouchDown(ev);
 
             /*
              * If being flinged and user touches, stop the fling. isFinished
@@ -1228,7 +1128,6 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
             mAllowEasyFling = false;
             mActivePointerId = ev.getPointerId(0);
             if (mIsBeingDragged) {
-                onScrollInteractionBegin();
                 pageBeginTransition();
             }
             break;
@@ -1245,19 +1144,62 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
                 final int pointerIndex = ev.findPointerIndex(mActivePointerId);
 
                 if (pointerIndex == -1) return true;
+                float oldScroll = mOrientationHandler.getPrimaryScroll(this);
+                float dx = ev.getX(pointerIndex);
+                float dy = ev.getY(pointerIndex);
 
-                float direction = mOrientationHandler.getPrimaryDirection(ev, pointerIndex);
+                float direction = mOrientationHandler.getPrimaryValue(dx, dy);
                 float delta = mLastMotion + mLastMotionRemainder - direction;
+
+                int width = getWidth();
+                int height = getHeight();
+                int size = mOrientationHandler.getPrimaryValue(width, height);
+
+                final float displacement = mOrientationHandler.getSecondaryValue(dx, dy)
+                        / mOrientationHandler.getSecondaryValue(width, height);
                 mTotalMotion += Math.abs(delta);
 
+                if (mAllowOverScroll) {
+                    float consumed = 0;
+                    if (delta < 0 && mEdgeGlowRight.getDistance() != 0f) {
+                        consumed = size * mEdgeGlowRight.onPullDistance(delta / size, displacement);
+                    } else if (delta > 0 && mEdgeGlowLeft.getDistance() != 0f) {
+                        consumed = -size * mEdgeGlowLeft.onPullDistance(
+                                -delta / size, 1 - displacement);
+                    }
+                    delta -= consumed;
+                }
+
                 // Only scroll and update mLastMotionX if we have moved some discrete amount.  We
                 // keep the remainder because we are actually testing if we've moved from the last
                 // scrolled position (which is discrete).
-                if (Math.abs(delta) >= 1.0f) {
-                    mLastMotion = direction;
-                    mLastMotionRemainder = delta - (int) delta;
+                mLastMotion = direction;
+                int movedDelta = (int) delta;
+                mLastMotionRemainder = delta - movedDelta;
+
+                if (delta != 0) {
+                    mOrientationHandler.set(this, VIEW_SCROLL_BY, movedDelta);
+
+                    if (mAllowOverScroll) {
+                        final float pulledToX = oldScroll + delta;
+
+                        if (pulledToX < mMinScroll) {
+                            mEdgeGlowLeft.onPullDistance(-delta / size, 1.f - displacement);
+                            if (!mEdgeGlowRight.isFinished()) {
+                                mEdgeGlowRight.onRelease();
+                            }
+                        } else if (pulledToX > mMaxScroll) {
+                            mEdgeGlowRight.onPullDistance(delta / size, displacement);
+                            if (!mEdgeGlowLeft.isFinished()) {
+                                mEdgeGlowLeft.onRelease();
+                            }
+                        }
+
+                        if (!mEdgeGlowLeft.isFinished() || !mEdgeGlowRight.isFinished()) {
+                            postInvalidateOnAnimation();
+                        }
+                    }
 
-                    mOrientationHandler.set(this, VIEW_SCROLL_BY, (int) delta);
                 } else {
                     awakenScrollBars();
                 }
@@ -1335,45 +1277,24 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
 
                     if (((initialScroll >= maxScroll) && (isVelocityLeft || !isFling)) ||
                         ((initialScroll <= minScroll) && (!isVelocityLeft || !isFling))) {
-                        mScroller.springBack(initialScroll, minScroll, maxScroll);
+                        mScroller.springBack(initialScroll, 0, minScroll, maxScroll, 0, 0);
                         mNextPage = getDestinationPage();
                     } else {
-                        mScroller.setInterpolator(mDefaultInterpolator);
-                        mScroller.fling(initialScroll, -velocity,
-                            minScroll, maxScroll,
-                            Math.round(getWidth() * 0.5f * OVERSCROLL_DAMP_FACTOR));
+                        int velocity1 = -velocity;
+                        // Continue a scroll or fling in progress
+                        mScroller.fling(initialScroll, 0, velocity1, 0, minScroll, maxScroll, 0, 0,
+                                Math.round(getWidth() * 0.5f * OVERSCROLL_DAMP_FACTOR), 0);
 
-                        int finalPos = mScroller.getFinalPos();
+                        int finalPos = mScroller.getFinalX();
                         mNextPage = getDestinationPage(finalPos);
-
-                        int firstPageScroll = getScrollForPage(!mIsRtl ? 0 : getPageCount() - 1);
-                        int lastPageScroll = getScrollForPage(!mIsRtl ? getPageCount() - 1 : 0);
-                        if (snapToPageInFreeScroll() && finalPos > minScroll
-                                && finalPos < maxScroll) {
-                            // If scrolling ends in the half of the added space that is closer to
-                            // the end, settle to the end. Otherwise snap to the nearest page.
-                            // If flinging past one of the ends, don't change the velocity as it
-                            // will get stopped at the end anyway.
-                            int pageSnapped = finalPos < (firstPageScroll + minScroll) / 2
-                                ? minScroll
-                                : finalPos > (lastPageScroll + maxScroll) / 2
-                                    ? maxScroll
-                                    : getScrollForPage(mNextPage);
-
-                            mScroller.setFinalPos(pageSnapped);
-                            // Ensure the scroll/snap doesn't happen too fast;
-                            int extraScrollDuration = OVERSCROLL_PAGE_SNAP_ANIMATION_DURATION
-                                - mScroller.getDuration();
-                            if (extraScrollDuration > 0) {
-                                mScroller.extendDuration(extraScrollDuration);
-                            }
-                        }
+                        onNotSnappingToPageInFreeScroll();
                     }
                     invalidate();
                 }
-                onScrollInteractionEnd();
             }
 
+            mEdgeGlowLeft.onRelease();
+            mEdgeGlowRight.onRelease();
             // End any intermediate reordering states
             resetTouchState();
             break;
@@ -1381,8 +1302,9 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         case MotionEvent.ACTION_CANCEL:
             if (mIsBeingDragged) {
                 snapToDestination();
-                onScrollInteractionEnd();
             }
+            mEdgeGlowLeft.onRelease();
+            mEdgeGlowRight.onRelease();
             resetTouchState();
             break;
 
@@ -1395,9 +1317,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         return true;
     }
 
-    protected boolean snapToPageInFreeScroll() {
-        return true;
-    }
+    protected void onNotSnappingToPageInFreeScroll() { }
 
     protected boolean shouldFlingForVelocity(int velocity) {
         float threshold = mAllowEasyFling ? mEasyFlingThresholdVelocity : mFlingThresholdVelocity;
@@ -1410,15 +1330,6 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         mActivePointerId = INVALID_POINTER;
     }
 
-    /**
-     * Triggered by scrolling via touch
-     */
-    protected void onScrollInteractionBegin() {
-    }
-
-    protected void onScrollInteractionEnd() {
-    }
-
     @Override
     public boolean onGenericMotionEvent(MotionEvent event) {
         if ((event.getSource() & InputDevice.SOURCE_CLASS_POINTER) != 0) {
@@ -1554,19 +1465,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
     }
 
     protected void snapToDestination() {
-        snapToPage(getDestinationPage(), getPageSnapDuration());
-    }
-
-    protected boolean isInOverScroll() {
-        int scroll = mOrientationHandler.getPrimaryScroll(this);
-        return scroll > mMaxScroll || scroll < mMinScroll;
-    }
-
-    protected int getPageSnapDuration() {
-        if (isInOverScroll()) {
-            return OVERSCROLL_PAGE_SNAP_ANIMATION_DURATION;
-        }
-        return PAGE_SNAP_ANIMATION_DURATION;
+        snapToPage(getDestinationPage(), PAGE_SNAP_ANIMATION_DURATION);
     }
 
     // We want the duration of the page snap animation to be influenced by the distance that
@@ -1584,7 +1483,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         int halfScreenSize = mOrientationHandler.getMeasuredSize(this) / 2;
 
         final int newLoc = getScrollForPage(whichPage);
-        int delta = newLoc - getUnboundedScroll();
+        int delta = newLoc - mOrientationHandler.getPrimaryScroll(this);
         int duration = 0;
 
         if (Math.abs(velocity) < mMinFlingVelocity) {
@@ -1609,12 +1508,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         // interpolator at zero, ie. 5. We use 4 to make it a little slower.
         duration = 4 * Math.round(1000 * Math.abs(distance / velocity));
 
-        if (QUICKSTEP_SPRINGS.get() && mCurrentPage != whichPage) {
-            return snapToPage(whichPage, delta, duration, false, null,
-                    velocity * Math.signum(delta), true);
-        } else {
-            return snapToPage(whichPage, delta, duration);
-        }
+        return snapToPage(whichPage, delta, duration);
     }
 
     public boolean snapToPage(int whichPage) {
@@ -1622,32 +1516,26 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
     }
 
     public boolean snapToPageImmediately(int whichPage) {
-        return snapToPage(whichPage, PAGE_SNAP_ANIMATION_DURATION, true, null);
+        return snapToPage(whichPage, PAGE_SNAP_ANIMATION_DURATION, true);
     }
 
     public boolean snapToPage(int whichPage, int duration) {
-        return snapToPage(whichPage, duration, false, null);
-    }
-
-    public boolean snapToPage(int whichPage, int duration, TimeInterpolator interpolator) {
-        return snapToPage(whichPage, duration, false, interpolator);
+        return snapToPage(whichPage, duration, false);
     }
 
-    protected boolean snapToPage(int whichPage, int duration, boolean immediate,
-            TimeInterpolator interpolator) {
+    protected boolean snapToPage(int whichPage, int duration, boolean immediate) {
         whichPage = validateNewPage(whichPage);
 
         int newLoc = getScrollForPage(whichPage);
-        final int delta = newLoc - getUnboundedScroll();
-        return snapToPage(whichPage, delta, duration, immediate, interpolator, 0, false);
+        final int delta = newLoc - mOrientationHandler.getPrimaryScroll(this);
+        return snapToPage(whichPage, delta, duration, immediate);
     }
 
     protected boolean snapToPage(int whichPage, int delta, int duration) {
-        return snapToPage(whichPage, delta, duration, false, null, 0, false);
+        return snapToPage(whichPage, delta, duration, false);
     }
 
-    protected boolean snapToPage(int whichPage, int delta, int duration, boolean immediate,
-            TimeInterpolator interpolator, float velocity, boolean spring) {
+    protected boolean snapToPage(int whichPage, int delta, int duration, boolean immediate) {
         if (mFirstLayout) {
             setCurrentPage(whichPage);
             return false;
@@ -1677,18 +1565,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
             abortScrollerAnimation(false);
         }
 
-        if (interpolator != null) {
-            mScroller.setInterpolator(interpolator);
-        } else {
-            mScroller.setInterpolator(mDefaultInterpolator);
-        }
-
-        if (spring && QUICKSTEP_SPRINGS.get()) {
-            mScroller.startScrollSpring(getUnboundedScroll(), delta, duration, velocity);
-        } else {
-            mScroller.startScroll(getUnboundedScroll(), delta, duration);
-        }
-
+        mScroller.startScroll(mOrientationHandler.getPrimaryScroll(this), 0, delta, 0, duration);
         updatePageIndicator();
 
         // Trigger a compute() to finish switching pages if necessary
@@ -1706,7 +1583,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
             snapToPage(getNextPage() - 1);
             return true;
         }
-        return onOverscroll(-getMeasuredWidth());
+        return mAllowOverScroll;
     }
 
     public boolean scrollRight() {
@@ -1714,15 +1591,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
             snapToPage(getNextPage() + 1);
             return true;
         }
-        return onOverscroll(getMeasuredWidth());
-    }
-
-    protected boolean onOverscroll(int amount) {
-        if (!mAllowOverScroll) return false;
-        onScrollInteractionBegin();
-        overScroll(amount);
-        onScrollInteractionEnd();
-        return true;
+        return mAllowOverScroll;
     }
 
     @Override
@@ -1866,4 +1735,38 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         mTmpIntPair[1] = rightChild;
         return mTmpIntPair;
     }
+
+    @Override
+    public void draw(Canvas canvas) {
+        super.draw(canvas);
+        drawEdgeEffect(canvas);
+    }
+
+    protected void drawEdgeEffect(Canvas canvas) {
+        if (mAllowOverScroll && (!mEdgeGlowRight.isFinished() || !mEdgeGlowLeft.isFinished())) {
+            final int width = getWidth();
+            final int height = getHeight();
+            if (!mEdgeGlowLeft.isFinished()) {
+                final int restoreCount = canvas.save();
+                canvas.rotate(-90);
+                canvas.translate(-height, Math.min(mMinScroll, getScrollX()));
+                mEdgeGlowLeft.setSize(height, width);
+                if (mEdgeGlowLeft.draw(canvas)) {
+                    postInvalidateOnAnimation();
+                }
+                canvas.restoreToCount(restoreCount);
+            }
+            if (!mEdgeGlowRight.isFinished()) {
+                final int restoreCount = canvas.save();
+                canvas.rotate(90, width, 0);
+                canvas.translate(width, -(Math.max(mMaxScroll, getScrollX())));
+
+                mEdgeGlowRight.setSize(height, width);
+                if (mEdgeGlowRight.draw(canvas)) {
+                    postInvalidateOnAnimation();
+                }
+                canvas.restoreToCount(restoreCount);
+            }
+        }
+    }
 }
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 10091a18b8..147b3e4639 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -24,7 +24,6 @@ import static com.android.launcher3.LauncherState.FLAG_WORKSPACE_ICONS_CAN_BE_DR
 import static com.android.launcher3.LauncherState.FLAG_WORKSPACE_INACCESSIBLE;
 import static com.android.launcher3.LauncherState.HINT_STATE;
 import static com.android.launcher3.LauncherState.NORMAL;
-import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.SPRING_LOADED;
 import static com.android.launcher3.config.FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM;
 import static com.android.launcher3.dragndrop.DragLayer.ALPHA_INDEX_OVERLAY;
@@ -96,10 +95,12 @@ import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.touch.WorkspaceTouchListener;
+import com.android.launcher3.util.EdgeEffectCompat;
 import com.android.launcher3.util.Executors;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.IntSparseArrayMap;
 import com.android.launcher3.util.ItemInfoMatcher;
+import com.android.launcher3.util.OverlayEdgeEffect;
 import com.android.launcher3.util.PackageUserKey;
 import com.android.launcher3.util.Thunk;
 import com.android.launcher3.util.WallpaperOffsetInterpolator;
@@ -245,10 +246,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
     private float mTransitionProgress;
 
     // State related to Launcher Overlay
-    LauncherOverlay mLauncherOverlay;
-    boolean mScrollInteractionBegan;
-    boolean mStartedSendingScrollEvents;
-    float mLastOverlayScroll = 0;
+    private OverlayEdgeEffect mOverlayEdgeEffect;
     boolean mOverlayShown = false;
     private Runnable mOnOverlayHiddenCallback;
 
@@ -945,47 +943,25 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         }
     }
 
-    protected void onScrollInteractionBegin() {
-        super.onScrollInteractionBegin();
-        mScrollInteractionBegan = true;
-    }
-
-    protected void onScrollInteractionEnd() {
-        super.onScrollInteractionEnd();
-        mScrollInteractionBegan = false;
-        if (mStartedSendingScrollEvents) {
-            mStartedSendingScrollEvents = false;
-            mLauncherOverlay.onScrollInteractionEnd();
-        }
-    }
-
     public void setLauncherOverlay(LauncherOverlay overlay) {
-        mLauncherOverlay = overlay;
-        // A new overlay has been set. Reset event tracking
-        mStartedSendingScrollEvents = false;
+        mOverlayEdgeEffect = overlay == null ? null : new OverlayEdgeEffect(getContext(), overlay);
+        EdgeEffectCompat newEffect = overlay == null
+                ? new EdgeEffectCompat(getContext()) : mOverlayEdgeEffect;
+        if (mIsRtl) {
+            mEdgeGlowRight = newEffect;
+        } else {
+            mEdgeGlowLeft = newEffect;
+        }
         onOverlayScrollChanged(0);
     }
 
     public boolean hasOverlay() {
-        return mLauncherOverlay != null;
-    }
-
-    private boolean isScrollingOverlay() {
-        return mLauncherOverlay != null &&
-                ((mIsRtl && getUnboundedScroll() > mMaxScroll)
-                        || (!mIsRtl && getUnboundedScroll() < mMinScroll));
+        return mOverlayEdgeEffect != null;
     }
 
     @Override
     protected void snapToDestination() {
-        // If we're overscrolling the overlay, we make sure to immediately reset the PagedView
-        // to it's baseline position instead of letting the overscroll settle. The overlay handles
-        // it's own settling, and every gesture to the overlay should be self-contained and start
-        // from 0, so we zero it out here.
-        if (isScrollingOverlay()) {
-            // We reset mWasInOverscroll so that PagedView doesn't zero out the overscroll
-            // interaction when we call snapToPageImmediately.
-            mWasInOverscroll = false;
+        if (mOverlayEdgeEffect != null && !mOverlayEdgeEffect.isFinished()) {
             snapToPageImmediately(0);
         } else {
             super.snapToDestination();
@@ -1017,38 +993,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         }
     }
 
-    @Override
-    protected void overScroll(int amount) {
-        boolean shouldScrollOverlay = mLauncherOverlay != null && !mScroller.isSpringing() &&
-                ((amount <= 0 && !mIsRtl) || (amount >= 0 && mIsRtl));
-
-        boolean shouldZeroOverlay = mLauncherOverlay != null && mLastOverlayScroll != 0 &&
-                ((amount >= 0 && !mIsRtl) || (amount <= 0 && mIsRtl));
-
-        if (shouldScrollOverlay) {
-            if (!mStartedSendingScrollEvents && mScrollInteractionBegan) {
-                mStartedSendingScrollEvents = true;
-                mLauncherOverlay.onScrollInteractionBegin();
-            }
-
-            mLastOverlayScroll = Math.abs(((float) amount) / getMeasuredWidth());
-            mLauncherOverlay.onScrollChange(mLastOverlayScroll, mIsRtl);
-        } else {
-            dampedOverScroll(amount);
-        }
-
-        if (shouldZeroOverlay) {
-            mLauncherOverlay.onScrollChange(0, mIsRtl);
-        }
-    }
-
-    @Override
-    protected boolean onOverscroll(int amount) {
-        // Enforce overscroll on -1 direction
-        if ((amount > 0 && !mIsRtl) || (amount < 0 && mIsRtl)) return false;
-        return super.onOverscroll(amount);
-    }
-
     @Override
     protected boolean shouldFlingForVelocity(int velocityX) {
         // When the overlay is moving, the fling or settle transition is controlled by the overlay.
@@ -1377,10 +1321,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         mOutlineProvider = outlineProvider;
     }
 
-    public void snapToPageFromOverView(int whichPage) {
-        snapToPage(whichPage, OVERVIEW.getTransitionDuration(mLauncher), Interpolators.ZOOM_IN);
-    }
-
     private void onStartStateTransition(LauncherState state) {
         mIsSwitchingState = true;
         mTransitionProgress = 0;
diff --git a/src/com/android/launcher3/folder/FolderPagedView.java b/src/com/android/launcher3/folder/FolderPagedView.java
index c1f4643f63..a4e8be6974 100644
--- a/src/com/android/launcher3/folder/FolderPagedView.java
+++ b/src/com/android/launcher3/folder/FolderPagedView.java
@@ -42,7 +42,6 @@ import com.android.launcher3.R;
 import com.android.launcher3.ShortcutAndWidgetContainer;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.Workspace.ItemOperator;
-import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.keyboard.ViewGroupFocusHelper;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
@@ -433,8 +432,7 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> {
         int scroll = getScrollForPage(getNextPage()) + hint;
         int delta = scroll - getScrollX();
         if (delta != 0) {
-            mScroller.setInterpolator(Interpolators.DEACCEL);
-            mScroller.startScroll(getScrollX(), delta, Folder.SCROLL_HINT_DURATION);
+            mScroller.startScroll(getScrollX(), 0, delta, 0, Folder.SCROLL_HINT_DURATION);
             invalidate();
         }
     }
diff --git a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
index 18e27a4ba5..2254ab3cea 100644
--- a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
+++ b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
@@ -38,10 +38,8 @@ import android.view.accessibility.AccessibilityEvent;
 import android.widget.LinearLayout;
 
 import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.PagedView;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.util.OverScroller;
 import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
 
 import java.util.Collections;
@@ -60,18 +58,23 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
     }
 
     @Override
-    public void delegateScrollTo(PagedView pagedView, int secondaryScroll, int minMaxScroll) {
-        pagedView.superScrollTo(secondaryScroll, minMaxScroll);
+    public int getPrimaryValue(int x, int y) {
+        return y;
     }
 
     @Override
-    public void delegateScrollBy(PagedView pagedView, int unboundedScroll, int x, int y) {
-        pagedView.scrollTo(pagedView.getScrollX() + x, unboundedScroll + y);
+    public int getSecondaryValue(int x, int y) {
+        return x;
     }
 
     @Override
-    public void scrollerStartScroll(OverScroller scroller, int newPosition) {
-        scroller.startScroll(scroller.getCurrPos(), newPosition - scroller.getCurrPos());
+    public float getPrimaryValue(float x, float y) {
+        return y;
+    }
+
+    @Override
+    public float getSecondaryValue(float x, float y) {
+        return x;
     }
 
     @Override
@@ -86,11 +89,6 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
         velocity.set(-oldY, oldX);
     }
 
-    @Override
-    public void delegateScrollTo(PagedView pagedView, int primaryScroll) {
-        pagedView.superScrollTo(pagedView.getScrollX(), primaryScroll);
-    }
-
     @Override
     public <T> void set(T target, Int2DAction<T> action, int param) {
         action.call(target, 0, param);
@@ -241,13 +239,13 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
     }
 
     @Override
-    public float getTaskMenuX(float x, View thumbnailView) {
+    public float getTaskMenuX(float x, View thumbnailView, int overScroll) {
         return thumbnailView.getMeasuredWidth() + x;
     }
 
     @Override
-    public float getTaskMenuY(float y, View thumbnailView) {
-        return y;
+    public float getTaskMenuY(float y, View thumbnailView, int overScroll) {
+        return y + overScroll;
     }
 
     @Override
diff --git a/src/com/android/launcher3/touch/PagedOrientationHandler.java b/src/com/android/launcher3/touch/PagedOrientationHandler.java
index 560df86379..c9149ff6b7 100644
--- a/src/com/android/launcher3/touch/PagedOrientationHandler.java
+++ b/src/com/android/launcher3/touch/PagedOrientationHandler.java
@@ -30,8 +30,6 @@ import android.view.accessibility.AccessibilityEvent;
 import android.widget.LinearLayout;
 
 import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.PagedView;
-import com.android.launcher3.util.OverScroller;
 import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
 import com.android.launcher3.util.SplitConfigurationOptions.StagePosition;
 
@@ -89,16 +87,19 @@ public interface PagedOrientationHandler {
     boolean getRecentsRtlSetting(Resources resources);
     float getDegreesRotated();
     int getRotation();
+
     <T> T getPrimaryValue(T x, T y);
     <T> T getSecondaryValue(T x, T y);
-    void delegateScrollTo(PagedView pagedView, int secondaryScroll, int primaryScroll);
-    /** Uses {@params pagedView}.getScroll[X|Y]() method for the secondary amount*/
-    void delegateScrollTo(PagedView pagedView, int primaryScroll);
-    void delegateScrollBy(PagedView pagedView, int unboundedScroll, int x, int y);
-    void scrollerStartScroll(OverScroller scroller, int newPosition);
+
+    int getPrimaryValue(int x, int y);
+    int getSecondaryValue(int x, int y);
+
+    float  getPrimaryValue(float x, float y);
+    float getSecondaryValue(float x, float y);
+
     boolean isLayoutNaturalToLauncher();
-    float getTaskMenuX(float x, View thumbnailView);
-    float getTaskMenuY(float y, View thumbnailView);
+    float getTaskMenuX(float x, View thumbnailView, int overScroll);
+    float getTaskMenuY(float y, View thumbnailView, int overScroll);
     int getTaskMenuWidth(View view);
     int getTaskMenuLayoutOrientation(boolean canRecentsActivityRotate, LinearLayout taskMenuLayout);
     void setLayoutParamsForTaskMenuOptionItem(LinearLayout.LayoutParams lp);
diff --git a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
index 86508c4ee2..b2cc31bcd0 100644
--- a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
+++ b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
@@ -36,10 +36,8 @@ import android.view.accessibility.AccessibilityEvent;
 import android.widget.LinearLayout;
 
 import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.PagedView;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.util.OverScroller;
 import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
 
 import java.util.ArrayList;
@@ -58,18 +56,23 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
     }
 
     @Override
-    public void delegateScrollTo(PagedView pagedView, int secondaryScroll, int primaryScroll) {
-        pagedView.superScrollTo(primaryScroll, secondaryScroll);
+    public int getPrimaryValue(int x, int y) {
+        return x;
     }
 
     @Override
-    public void delegateScrollBy(PagedView pagedView, int unboundedScroll, int x, int y) {
-        pagedView.scrollTo(unboundedScroll + x, pagedView.getScrollY() + y);
+    public int getSecondaryValue(int x, int y) {
+        return y;
     }
 
     @Override
-    public void scrollerStartScroll(OverScroller scroller, int newPosition) {
-        scroller.startScroll(newPosition - scroller.getCurrPos(), scroller.getCurrPos());
+    public float getPrimaryValue(float x, float y) {
+        return x;
+    }
+
+    @Override
+    public float getSecondaryValue(float x, float y) {
+        return y;
     }
 
     @Override
@@ -82,11 +85,6 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
         //no-op
     }
 
-    @Override
-    public void delegateScrollTo(PagedView pagedView, int primaryScroll) {
-        pagedView.superScrollTo(primaryScroll, pagedView.getScrollY());
-    }
-
     @Override
     public <T> void set(T target, Int2DAction<T> action, int param) {
         action.call(target, param, 0);
@@ -240,12 +238,12 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
     }
 
     @Override
-    public float getTaskMenuX(float x, View thumbnailView) {
-        return x;
+    public float getTaskMenuX(float x, View thumbnailView, int overScroll) {
+        return x + overScroll;
     }
 
     @Override
-    public float getTaskMenuY(float y, View thumbnailView) {
+    public float getTaskMenuY(float y, View thumbnailView, int overScroll) {
         return y;
     }
 
diff --git a/src/com/android/launcher3/touch/SeascapePagedViewHandler.java b/src/com/android/launcher3/touch/SeascapePagedViewHandler.java
index bd6e31be02..893a274e9e 100644
--- a/src/com/android/launcher3/touch/SeascapePagedViewHandler.java
+++ b/src/com/android/launcher3/touch/SeascapePagedViewHandler.java
@@ -79,13 +79,13 @@ public class SeascapePagedViewHandler extends LandscapePagedViewHandler {
     }
 
     @Override
-    public float getTaskMenuX(float x, View thumbnailView) {
+    public float getTaskMenuX(float x, View thumbnailView, int overScroll) {
         return x;
     }
 
     @Override
-    public float getTaskMenuY(float y, View thumbnailView) {
-        return y + thumbnailView.getMeasuredHeight();
+    public float getTaskMenuY(float y, View thumbnailView, int overScroll) {
+        return y + thumbnailView.getMeasuredHeight() + overScroll;
     }
 
     @Override
diff --git a/src/com/android/launcher3/util/EdgeEffectCompat.java b/src/com/android/launcher3/util/EdgeEffectCompat.java
new file mode 100644
index 0000000000..491582b87f
--- /dev/null
+++ b/src/com/android/launcher3/util/EdgeEffectCompat.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.util;
+
+import android.content.Context;
+import android.widget.EdgeEffect;
+
+import com.android.launcher3.Utilities;
+
+/**
+ * Extension of {@link EdgeEffect} to allow backwards compatibility
+ */
+public class EdgeEffectCompat extends EdgeEffect {
+
+    public EdgeEffectCompat(Context context) {
+        super(context);
+    }
+
+    @Override
+    public float getDistance() {
+        return Utilities.ATLEAST_S ? super.getDistance() : 0;
+    }
+
+    @Override
+    public float onPullDistance(float deltaDistance, float displacement) {
+        if (Utilities.ATLEAST_S) {
+            return super.onPullDistance(deltaDistance, displacement);
+        } else {
+            onPull(deltaDistance, displacement);
+            return deltaDistance;
+        }
+    }
+}
diff --git a/src/com/android/launcher3/util/OverScroller.java b/src/com/android/launcher3/util/OverScroller.java
deleted file mode 100644
index 87e698626d..0000000000
--- a/src/com/android/launcher3/util/OverScroller.java
+++ /dev/null
@@ -1,867 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.util;
-
-import static com.android.launcher3.anim.Interpolators.SCROLL;
-
-import android.animation.TimeInterpolator;
-import android.content.Context;
-import android.hardware.SensorManager;
-import android.util.Log;
-import android.view.ViewConfiguration;
-import android.view.animation.AnimationUtils;
-import android.view.animation.Interpolator;
-
-import androidx.dynamicanimation.animation.FloatPropertyCompat;
-import androidx.dynamicanimation.animation.SpringAnimation;
-import androidx.dynamicanimation.animation.SpringForce;
-
-import com.android.launcher3.R;
-import com.android.systemui.plugins.ResourceProvider;
-
-/**
- * Based on {@link android.widget.OverScroller} supporting only 1-d scrolling and with more
- * customization options.
- */
-public class OverScroller {
-    private int mMode;
-
-    private final SplineOverScroller mScroller;
-
-    private TimeInterpolator mInterpolator;
-
-    private final boolean mFlywheel;
-
-    private static final int DEFAULT_DURATION = 250;
-    private static final int SCROLL_MODE = 0;
-    private static final int FLING_MODE = 1;
-
-    /**
-     * Creates an OverScroller with a viscous fluid scroll interpolator and flywheel.
-     * @param context
-     */
-    public OverScroller(Context context) {
-        this(context, null);
-    }
-
-    /**
-     * Creates an OverScroller with flywheel enabled.
-     * @param context The context of this application.
-     * @param interpolator The scroll interpolator. If null, a default (viscous) interpolator will
-     * be used.
-     */
-    public OverScroller(Context context, Interpolator interpolator) {
-        this(context, interpolator, true);
-    }
-
-    /**
-     * Creates an OverScroller.
-     * @param context The context of this application.
-     * @param interpolator The scroll interpolator. If null, a default (viscous) interpolator will
-     * be used.
-     * @param flywheel If true, successive fling motions will keep on increasing scroll speed.
-     */
-    public OverScroller(Context context, Interpolator interpolator, boolean flywheel) {
-        if (interpolator == null) {
-            mInterpolator = SCROLL;
-        } else {
-            mInterpolator = interpolator;
-        }
-        mFlywheel = flywheel;
-        mScroller = new SplineOverScroller(context);
-    }
-
-    public void setInterpolator(TimeInterpolator interpolator) {
-        if (interpolator == null) {
-            mInterpolator = SCROLL;
-        } else {
-            mInterpolator = interpolator;
-        }
-    }
-
-    /**
-     * The amount of friction applied to flings. The default value
-     * is {@link ViewConfiguration#getScrollFriction}.
-     *
-     * @param friction A scalar dimension-less value representing the coefficient of
-     *         friction.
-     */
-    public final void setFriction(float friction) {
-        mScroller.setFriction(friction);
-    }
-
-    /**
-     *
-     * Returns whether the scroller has finished scrolling.
-     *
-     * @return True if the scroller has finished scrolling, false otherwise.
-     */
-    public final boolean isFinished() {
-        return mScroller.mFinished;
-    }
-
-    /**
-     * Force the finished field to a particular value. Contrary to
-     * {@link #abortAnimation()}, forcing the animation to finished
-     * does NOT cause the scroller to move to the final x and y
-     * position.
-     *
-     * @param finished The new finished value.
-     */
-    public final void forceFinished(boolean finished) {
-        mScroller.mFinished = finished;
-    }
-
-    /**
-     * Returns the current offset in the scroll.
-     *
-     * @return The new offset as an absolute distance from the origin.
-     */
-    public final int getCurrPos() {
-        return mScroller.mCurrentPosition;
-    }
-
-    /**
-     * Returns the absolute value of the current velocity.
-     *
-     * @return The original velocity less the deceleration, norm of the X and Y velocity vector.
-     */
-    public float getCurrVelocity() {
-        return mScroller.mCurrVelocity;
-    }
-
-    /**
-     * Returns the start offset in the scroll.
-     *
-     * @return The start offset as an absolute distance from the origin.
-     */
-    public final int getStartPos() {
-        return mScroller.mStart;
-    }
-
-    /**
-     * Returns where the scroll will end. Valid only for "fling" scrolls.
-     *
-     * @return The final offset as an absolute distance from the origin.
-     */
-    public final int getFinalPos() {
-        return mScroller.mFinal;
-    }
-
-    /**
-     * Returns how long the scroll event will take, in milliseconds.
-     *
-     * Note that if mScroller.mState == SPRING, this duration is ignored, so can only
-     * serve as an estimate for how long the spring-controlled scroll will take.
-     *
-     * @return The duration of the scroll in milliseconds.
-     */
-    public final int getDuration() {
-        return mScroller.mDuration;
-    }
-
-    /**
-     * Extend the scroll animation. This allows a running animation to scroll
-     * further and longer, when used with {@link #setFinalPos(int)}.
-     *
-     * @param extend Additional time to scroll in milliseconds.
-     * @see #setFinalPos(int)
-     */
-    public void extendDuration(int extend) {
-        mScroller.extendDuration(extend);
-    }
-
-    /**
-     * Sets the final position for this scroller.
-     *
-     * @param newPos The new offset as an absolute distance from the origin.
-     * @see #extendDuration(int)
-     */
-    public void setFinalPos(int newPos) {
-        mScroller.setFinalPosition(newPos);
-    }
-
-    /**
-     * Call this when you want to know the new location. If it returns true, the
-     * animation is not yet finished.
-     */
-    public boolean computeScrollOffset() {
-        if (isFinished()) {
-            return false;
-        }
-
-        switch (mMode) {
-            case SCROLL_MODE:
-                if (isSpringing()) {
-                    return true;
-                }
-                long time = AnimationUtils.currentAnimationTimeMillis();
-                // Any scroller can be used for time, since they were started
-                // together in scroll mode. We use X here.
-                final long elapsedTime = time - mScroller.mStartTime;
-
-                final int duration = mScroller.mDuration;
-                if (elapsedTime < duration) {
-                    final float q = mInterpolator.getInterpolation(elapsedTime / (float) duration);
-                    mScroller.updateScroll(q);
-                } else {
-                    abortAnimation();
-                }
-                break;
-
-            case FLING_MODE:
-                if (!mScroller.mFinished) {
-                    if (!mScroller.update()) {
-                        if (!mScroller.continueWhenFinished()) {
-                            mScroller.finish();
-                        }
-                    }
-                }
-
-                break;
-        }
-
-        return true;
-    }
-
-    /**
-     * Start scrolling by providing a starting point and the distance to travel.
-     * The scroll will use the default value of 250 milliseconds for the
-     * duration.
-     *
-     * @param start Starting horizontal scroll offset in pixels. Positive
-     *        numbers will scroll the content to the left.
-     * @param delta Distance to travel. Positive numbers will scroll the
-     *        content to the left.
-     */
-    public void startScroll(int start, int delta) {
-        startScroll(start, delta, DEFAULT_DURATION);
-    }
-
-    /**
-     * Start scrolling by providing a starting point and the distance to travel.
-     *
-     * @param start Starting scroll offset in pixels. Positive
-     *        numbers will scroll the content to the left.
-     * @param delta Distance to travel. Positive numbers will scroll the
-     *        content to the left.
-     * @param duration Duration of the scroll in milliseconds.
-     */
-    public void startScroll(int start, int delta, int duration) {
-        mMode = SCROLL_MODE;
-        mScroller.startScroll(start, delta, duration);
-    }
-
-    /**
-     * Start scrolling using a spring by providing a starting point and the distance to travel.
-     *
-     * @param start Starting scroll offset in pixels. Positive
-     *        numbers will scroll the content to the left.
-     * @param delta Distance to travel. Positive numbers will scroll the
-     *        content to the left.
-     * @param duration Duration of the scroll in milliseconds.
-     * @param velocity The starting velocity for the spring in px per ms.
-     */
-    public void startScrollSpring(int start, int delta, int duration, float velocity) {
-        mMode = SCROLL_MODE;
-        mScroller.mState = mScroller.SPRING;
-        mScroller.startScroll(start, delta, duration, velocity);
-    }
-
-    /**
-     * Call this when you want to 'spring back' into a valid coordinate range.
-     *
-     * @param start Starting X coordinate
-     * @param min Minimum valid X value
-     * @param max Maximum valid X value
-     * @return true if a springback was initiated, false if startX and startY were
-     *          already within the valid range.
-     */
-    public boolean springBack(int start, int min, int max) {
-        mMode = FLING_MODE;
-        return mScroller.springback(start, min, max);
-    }
-
-    public void fling(int start, int velocity, int min, int max) {
-        fling(start, velocity, min, max, 0);
-    }
-
-    /**
-     * Start scrolling based on a fling gesture. The distance traveled will
-     * depend on the initial velocity of the fling.
-     *  @param start Starting point of the scroll (X)
-     * @param velocity Initial velocity of the fling (X) measured in pixels per
-     *            second.
-     * @param min Minimum X value. The scroller will not scroll past this point
- *            unless overX > 0. If overfling is allowed, it will use minX as
- *            a springback boundary.
-     * @param max Maximum X value. The scroller will not scroll past this point
-*            unless overX > 0. If overfling is allowed, it will use maxX as
-*            a springback boundary.
-     * @param over Overfling range. If > 0, horizontal overfling in either
-*            direction will be possible.
-     */
-    public void fling(int start, int velocity, int min, int max, int over) {
-        // Continue a scroll or fling in progress
-        if (mFlywheel && !isFinished()) {
-            float oldVelocityX = mScroller.mCurrVelocity;
-            if (Math.signum(velocity) == Math.signum(oldVelocityX)) {
-                velocity += oldVelocityX;
-            }
-        }
-
-        mMode = FLING_MODE;
-        mScroller.fling(start, velocity, min, max, over);
-    }
-
-    /**
-     * Notify the scroller that we've reached a horizontal boundary.
-     * Normally the information to handle this will already be known
-     * when the animation is started, such as in a call to one of the
-     * fling functions. However there are cases where this cannot be known
-     * in advance. This function will transition the current motion and
-     * animate from startX to finalX as appropriate.
-     *  @param start Starting/current X position
-     * @param finalPos Desired final X position
-     * @param over Magnitude of overscroll allowed. This should be the maximum
-     */
-    public void notifyEdgeReached(int start, int finalPos, int over) {
-        mScroller.notifyEdgeReached(start, finalPos, over);
-    }
-
-    /**
-     * Returns whether the current Scroller is currently returning to a valid position.
-     * Valid bounds were provided by the
-     * {@link #fling(int, int, int, int, int)} method.
-     *
-     * One should check this value before calling
-     * {@link #startScroll(int, int)} as the interpolation currently in progress
-     * to restore a valid position will then be stopped. The caller has to take into account
-     * the fact that the started scroll will start from an overscrolled position.
-     *
-     * @return true when the current position is overscrolled and in the process of
-     *         interpolating back to a valid value.
-     */
-    public boolean isOverScrolled() {
-        return (!mScroller.mFinished && mScroller.mState != SplineOverScroller.SPLINE);
-    }
-
-    /**
-     * Stops the animation. Contrary to {@link #forceFinished(boolean)},
-     * aborting the animating causes the scroller to move to the final x and y
-     * positions.
-     *
-     * @see #forceFinished(boolean)
-     */
-    public void abortAnimation() {
-        mScroller.finish();
-    }
-
-    /**
-     * Returns the time elapsed since the beginning of the scrolling.
-     *
-     * @return The elapsed time in milliseconds.
-     *
-     * @hide
-     */
-    public int timePassed() {
-        final long time = AnimationUtils.currentAnimationTimeMillis();
-        return (int) (time - mScroller.mStartTime);
-    }
-
-    public boolean isSpringing() {
-        return mScroller.mState == SplineOverScroller.SPRING && !isFinished();
-    }
-
-    static class SplineOverScroller {
-        // Initial position
-        private int mStart;
-
-        // Current position
-        private int mCurrentPosition;
-
-        // Final position
-        private int mFinal;
-
-        // Initial velocity
-        private int mVelocity;
-
-        // Current velocity
-        private float mCurrVelocity;
-
-        // Constant current deceleration
-        private float mDeceleration;
-
-        // Animation starting time, in system milliseconds
-        private long mStartTime;
-
-        // Animation duration, in milliseconds
-        private int mDuration;
-
-        // Duration to complete spline component of animation
-        private int mSplineDuration;
-
-        // Distance to travel along spline animation
-        private int mSplineDistance;
-
-        // Whether the animation is currently in progress
-        private boolean mFinished;
-
-        // The allowed overshot distance before boundary is reached.
-        private int mOver;
-
-        // Fling friction
-        private float mFlingFriction = ViewConfiguration.getScrollFriction();
-
-        // Current state of the animation.
-        private int mState = SPLINE;
-
-        private Context mContext;
-        private SpringAnimation mSpring;
-
-        // Constant gravity value, used in the deceleration phase.
-        private static final float GRAVITY = 2000.0f;
-
-        // A context-specific coefficient adjusted to physical values.
-        private float mPhysicalCoeff;
-
-        private static float DECELERATION_RATE = (float) (Math.log(0.78) / Math.log(0.9));
-        private static final float INFLEXION = 0.35f; // Tension lines cross at (INFLEXION, 1)
-        private static final float START_TENSION = 0.5f;
-        private static final float END_TENSION = 1.0f;
-        private static final float P1 = START_TENSION * INFLEXION;
-        private static final float P2 = 1.0f - END_TENSION * (1.0f - INFLEXION);
-
-        private static final int NB_SAMPLES = 100;
-        private static final float[] SPLINE_POSITION = new float[NB_SAMPLES + 1];
-        private static final float[] SPLINE_TIME = new float[NB_SAMPLES + 1];
-
-        private static final int SPLINE = 0;
-        private static final int CUBIC = 1;
-        private static final int BALLISTIC = 2;
-        private static final int SPRING = 3;
-
-        private static final FloatPropertyCompat<SplineOverScroller> SPRING_PROPERTY =
-                new FloatPropertyCompat<SplineOverScroller>("splineOverScrollerSpring") {
-                    @Override
-                    public float getValue(SplineOverScroller scroller) {
-                        return scroller.mCurrentPosition;
-                    }
-
-                    @Override
-                    public void setValue(SplineOverScroller scroller, float value) {
-                        scroller.mCurrentPosition = (int) value;
-                    }
-                };
-
-        static {
-            float x_min = 0.0f;
-            float y_min = 0.0f;
-            for (int i = 0; i < NB_SAMPLES; i++) {
-                final float alpha = (float) i / NB_SAMPLES;
-
-                float x_max = 1.0f;
-                float x, tx, coef;
-                while (true) {
-                    x = x_min + (x_max - x_min) / 2.0f;
-                    coef = 3.0f * x * (1.0f - x);
-                    tx = coef * ((1.0f - x) * P1 + x * P2) + x * x * x;
-                    if (Math.abs(tx - alpha) < 1E-5) break;
-                    if (tx > alpha) x_max = x;
-                    else x_min = x;
-                }
-                SPLINE_POSITION[i] = coef * ((1.0f - x) * START_TENSION + x) + x * x * x;
-
-                float y_max = 1.0f;
-                float y, dy;
-                while (true) {
-                    y = y_min + (y_max - y_min) / 2.0f;
-                    coef = 3.0f * y * (1.0f - y);
-                    dy = coef * ((1.0f - y) * START_TENSION + y) + y * y * y;
-                    if (Math.abs(dy - alpha) < 1E-5) break;
-                    if (dy > alpha) y_max = y;
-                    else y_min = y;
-                }
-                SPLINE_TIME[i] = coef * ((1.0f - y) * P1 + y * P2) + y * y * y;
-            }
-            SPLINE_POSITION[NB_SAMPLES] = SPLINE_TIME[NB_SAMPLES] = 1.0f;
-        }
-
-        void setFriction(float friction) {
-            mFlingFriction = friction;
-        }
-
-        SplineOverScroller(Context context) {
-            mContext = context;
-            mFinished = true;
-            final float ppi = context.getResources().getDisplayMetrics().density * 160.0f;
-            mPhysicalCoeff = SensorManager.GRAVITY_EARTH // g (m/s^2)
-                    * 39.37f // inch/meter
-                    * ppi
-                    * 0.84f; // look and feel tuning
-        }
-
-        void updateScroll(float q) {
-            if (mState == SPRING) {
-                return;
-            }
-            mCurrentPosition = mStart + Math.round(q * (mFinal - mStart));
-        }
-
-        /*
-         * Get a signed deceleration that will reduce the velocity.
-         */
-        static private float getDeceleration(int velocity) {
-            return velocity > 0 ? -GRAVITY : GRAVITY;
-        }
-
-        /*
-         * Modifies mDuration to the duration it takes to get from start to newFinal using the
-         * spline interpolation. The previous duration was needed to get to oldFinal.
-         */
-        private void adjustDuration(int start, int oldFinal, int newFinal) {
-            final int oldDistance = oldFinal - start;
-            final int newDistance = newFinal - start;
-            final float x = Math.abs((float) newDistance / oldDistance);
-            final int index = (int) (NB_SAMPLES * x);
-            if (index < NB_SAMPLES) {
-                final float x_inf = (float) index / NB_SAMPLES;
-                final float x_sup = (float) (index + 1) / NB_SAMPLES;
-                final float t_inf = SPLINE_TIME[index];
-                final float t_sup = SPLINE_TIME[index + 1];
-                final float timeCoef = t_inf + (x - x_inf) / (x_sup - x_inf) * (t_sup - t_inf);
-                mDuration *= timeCoef;
-            }
-        }
-
-        void startScroll(int start, int distance, int duration) {
-            startScroll(start, distance, duration, 0);
-        }
-
-        void startScroll(int start, int distance, int duration, float velocity) {
-            mFinished = false;
-
-            mCurrentPosition = mStart = start;
-            mFinal = start + distance;
-
-            mStartTime = AnimationUtils.currentAnimationTimeMillis();
-            mDuration = duration;
-
-            if (mSpring != null) {
-                mSpring.cancel();
-            }
-
-            if (mState == SPRING) {
-                mSpring = new SpringAnimation(this, SPRING_PROPERTY);
-
-                ResourceProvider rp = DynamicResource.provider(mContext);
-                float stiffness = rp.getFloat(R.dimen.horizontal_spring_stiffness);
-                float damping = rp.getFloat(R.dimen.horizontal_spring_damping_ratio);
-                mSpring.setSpring(new SpringForce(mFinal)
-                        .setStiffness(stiffness)
-                        .setDampingRatio(damping));
-                mSpring.setStartVelocity(velocity);
-                mSpring.animateToFinalPosition(mFinal);
-                mSpring.addEndListener((animation, canceled, value, velocity1) -> {
-                    mSpring = null;
-                    finish();
-                    mState = SPLINE;
-                });
-            }
-            // Unused
-            mDeceleration = 0.0f;
-            mVelocity = 0;
-        }
-
-        void finish() {
-            if (mSpring != null && mSpring.isRunning()) mSpring.cancel();
-
-            mCurrentPosition = mFinal;
-            // Not reset since WebView relies on this value for fast fling.
-            // TODO: restore when WebView uses the fast fling implemented in this class.
-            // mCurrVelocity = 0.0f;
-            mFinished = true;
-        }
-
-        void setFinalPosition(int position) {
-            mFinal = position;
-            if (mState == SPRING && mSpring != null) {
-                mSpring.animateToFinalPosition(mFinal);
-            }
-            mSplineDistance = mFinal - mStart;
-            mFinished = false;
-        }
-
-        void extendDuration(int extend) {
-            final long time = AnimationUtils.currentAnimationTimeMillis();
-            final int elapsedTime = (int) (time - mStartTime);
-            mDuration  = mSplineDuration = elapsedTime + extend;
-            mFinished = false;
-        }
-
-        boolean springback(int start, int min, int max) {
-            mFinished = true;
-
-            mCurrentPosition = mStart = mFinal = start;
-            mVelocity = 0;
-
-            mStartTime = AnimationUtils.currentAnimationTimeMillis();
-            mDuration = 0;
-
-            if (start < min) {
-                startSpringback(start, min, 0);
-            } else if (start > max) {
-                startSpringback(start, max, 0);
-            }
-
-            return !mFinished;
-        }
-
-        private void startSpringback(int start, int end, int velocity) {
-            // mStartTime has been set
-            mFinished = false;
-            mState = CUBIC;
-            mCurrentPosition = mStart = start;
-            mFinal = end;
-            final int delta = start - end;
-            mDeceleration = getDeceleration(delta);
-            // TODO take velocity into account
-            mVelocity = -delta; // only sign is used
-            mOver = Math.abs(delta);
-            mDuration = (int) (1000.0 * Math.sqrt(-2.0 * delta / mDeceleration));
-        }
-
-        void fling(int start, int velocity, int min, int max, int over) {
-            mOver = over;
-            mFinished = false;
-            mCurrVelocity = mVelocity = velocity;
-            mDuration = mSplineDuration = 0;
-            mStartTime = AnimationUtils.currentAnimationTimeMillis();
-            mCurrentPosition = mStart = start;
-
-            if (start > max || start < min) {
-                startAfterEdge(start, min, max, velocity);
-                return;
-            }
-
-            mState = SPLINE;
-            double totalDistance = 0.0;
-
-            if (velocity != 0) {
-                mDuration = mSplineDuration = getSplineFlingDuration(velocity);
-                totalDistance = getSplineFlingDistance(velocity);
-            }
-
-            mSplineDistance = (int) (totalDistance * Math.signum(velocity));
-            mFinal = start + mSplineDistance;
-
-            // Clamp to a valid final position
-            if (mFinal < min) {
-                adjustDuration(mStart, mFinal, min);
-                mFinal = min;
-            }
-
-            if (mFinal > max) {
-                adjustDuration(mStart, mFinal, max);
-                mFinal = max;
-            }
-        }
-
-        private double getSplineDeceleration(int velocity) {
-            return Math.log(INFLEXION * Math.abs(velocity) / (mFlingFriction * mPhysicalCoeff));
-        }
-
-        private double getSplineFlingDistance(int velocity) {
-            final double l = getSplineDeceleration(velocity);
-            final double decelMinusOne = DECELERATION_RATE - 1.0;
-            return mFlingFriction * mPhysicalCoeff * Math.exp(DECELERATION_RATE / decelMinusOne * l);
-        }
-
-        /* Returns the duration, expressed in milliseconds */
-        private int getSplineFlingDuration(int velocity) {
-            final double l = getSplineDeceleration(velocity);
-            final double decelMinusOne = DECELERATION_RATE - 1.0;
-            return (int) (1000.0 * Math.exp(l / decelMinusOne));
-        }
-
-        private void fitOnBounceCurve(int start, int end, int velocity) {
-            // Simulate a bounce that started from edge
-            final float durationToApex = - velocity / mDeceleration;
-            // The float cast below is necessary to avoid integer overflow.
-            final float velocitySquared = (float) velocity * velocity;
-            final float distanceToApex = velocitySquared / 2.0f / Math.abs(mDeceleration);
-            final float distanceToEdge = Math.abs(end - start);
-            final float totalDuration = (float) Math.sqrt(
-                    2.0 * (distanceToApex + distanceToEdge) / Math.abs(mDeceleration));
-            mStartTime -= (int) (1000.0f * (totalDuration - durationToApex));
-            mCurrentPosition = mStart = end;
-            mVelocity = (int) (- mDeceleration * totalDuration);
-        }
-
-        private void startBounceAfterEdge(int start, int end, int velocity) {
-            mDeceleration = getDeceleration(velocity == 0 ? start - end : velocity);
-            fitOnBounceCurve(start, end, velocity);
-            onEdgeReached();
-        }
-
-        private void startAfterEdge(int start, int min, int max, int velocity) {
-            if (start > min && start < max) {
-                Log.e("OverScroller", "startAfterEdge called from a valid position");
-                mFinished = true;
-                return;
-            }
-            final boolean positive = start > max;
-            final int edge = positive ? max : min;
-            final int overDistance = start - edge;
-            boolean keepIncreasing = overDistance * velocity >= 0;
-            if (keepIncreasing) {
-                // Will result in a bounce or a to_boundary depending on velocity.
-                startBounceAfterEdge(start, edge, velocity);
-            } else {
-                final double totalDistance = getSplineFlingDistance(velocity);
-                if (totalDistance > Math.abs(overDistance)) {
-                    fling(start, velocity, positive ? min : start, positive ? start : max, mOver);
-                } else {
-                    startSpringback(start, edge, velocity);
-                }
-            }
-        }
-
-        void notifyEdgeReached(int start, int end, int over) {
-            // mState is used to detect successive notifications
-            if (mState == SPLINE) {
-                mOver = over;
-                mStartTime = AnimationUtils.currentAnimationTimeMillis();
-                // We were in fling/scroll mode before: current velocity is such that distance to
-                // edge is increasing. This ensures that startAfterEdge will not start a new fling.
-                startAfterEdge(start, end, end, (int) mCurrVelocity);
-            }
-        }
-
-        private void onEdgeReached() {
-            // mStart, mVelocity and mStartTime were adjusted to their values when edge was reached.
-            // The float cast below is necessary to avoid integer overflow.
-            final float velocitySquared = (float) mVelocity * mVelocity;
-            float distance = velocitySquared / (2.0f * Math.abs(mDeceleration));
-            final float sign = Math.signum(mVelocity);
-
-            if (distance > mOver) {
-                // Default deceleration is not sufficient to slow us down before boundary
-                mDeceleration = - sign * velocitySquared / (2.0f * mOver);
-                distance = mOver;
-            }
-
-            mOver = (int) distance;
-            mState = BALLISTIC;
-            mFinal = mStart + (int) (mVelocity > 0 ? distance : -distance);
-            mDuration = - (int) (1000.0f * mVelocity / mDeceleration);
-        }
-
-        boolean continueWhenFinished() {
-            switch (mState) {
-                case SPLINE:
-                    // Duration from start to null velocity
-                    if (mDuration < mSplineDuration) {
-                        // If the animation was clamped, we reached the edge
-                        mCurrentPosition = mStart = mFinal;
-                        // TODO Better compute speed when edge was reached
-                        mVelocity = (int) mCurrVelocity;
-                        mDeceleration = getDeceleration(mVelocity);
-                        mStartTime += mDuration;
-                        onEdgeReached();
-                    } else {
-                        // Normal stop, no need to continue
-                        return false;
-                    }
-                    break;
-                case BALLISTIC:
-                    mStartTime += mDuration;
-                    startSpringback(mFinal, mStart, 0);
-                    break;
-                case CUBIC:
-                    return false;
-            }
-
-            update();
-            return true;
-        }
-
-        /*
-         * Update the current position and velocity for current time. Returns
-         * true if update has been done and false if animation duration has been
-         * reached.
-         */
-        boolean update() {
-            if (mState == SPRING) {
-                return mFinished;
-            }
-
-            final long time = AnimationUtils.currentAnimationTimeMillis();
-            final long currentTime = time - mStartTime;
-
-            if (currentTime == 0) {
-                // Skip work but report that we're still going if we have a nonzero duration.
-                return mDuration > 0;
-            }
-            if (currentTime > mDuration) {
-                return false;
-            }
-
-            double distance = 0.0;
-            switch (mState) {
-                case SPLINE: {
-                    final float t = (float) currentTime / mSplineDuration;
-                    final int index = (int) (NB_SAMPLES * t);
-                    float distanceCoef = 1.f;
-                    float velocityCoef = 0.f;
-                    if (index < NB_SAMPLES) {
-                        final float t_inf = (float) index / NB_SAMPLES;
-                        final float t_sup = (float) (index + 1) / NB_SAMPLES;
-                        final float d_inf = SPLINE_POSITION[index];
-                        final float d_sup = SPLINE_POSITION[index + 1];
-                        velocityCoef = (d_sup - d_inf) / (t_sup - t_inf);
-                        distanceCoef = d_inf + (t - t_inf) * velocityCoef;
-                    }
-
-                    distance = distanceCoef * mSplineDistance;
-                    mCurrVelocity = velocityCoef * mSplineDistance / mSplineDuration * 1000.0f;
-                    break;
-                }
-
-                case BALLISTIC: {
-                    final float t = currentTime / 1000.0f;
-                    mCurrVelocity = mVelocity + mDeceleration * t;
-                    distance = mVelocity * t + mDeceleration * t * t / 2.0f;
-                    break;
-                }
-
-                case CUBIC: {
-                    final float t = (float) (currentTime) / mDuration;
-                    final float t2 = t * t;
-                    final float sign = Math.signum(mVelocity);
-                    distance = sign * mOver * (3.0f * t2 - 2.0f * t * t2);
-                    mCurrVelocity = sign * mOver * 6.0f * (- t + t2);
-                    break;
-                }
-            }
-
-            mCurrentPosition = mStart + (int) Math.round(distance);
-
-            return true;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/com/android/launcher3/util/OverlayEdgeEffect.java b/src/com/android/launcher3/util/OverlayEdgeEffect.java
new file mode 100644
index 0000000000..8d455c6afe
--- /dev/null
+++ b/src/com/android/launcher3/util/OverlayEdgeEffect.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.util;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.widget.EdgeEffect;
+
+import com.android.launcher3.Utilities;
+import com.android.systemui.plugins.shared.LauncherOverlayManager.LauncherOverlay;
+
+/**
+ * Extension of {@link EdgeEffect} which shows the Launcher overlay
+ */
+public class OverlayEdgeEffect extends EdgeEffectCompat {
+
+    private final LauncherOverlay mOverlay;
+    private final boolean mIsRtl;
+
+    private float mDistance;
+    private boolean mIsScrolling;
+
+    public OverlayEdgeEffect(Context context, LauncherOverlay overlay) {
+        super(context);
+        mOverlay = overlay;
+        mIsRtl = Utilities.isRtl(context.getResources());
+
+    }
+
+    @Override
+    public float getDistance() {
+        return mDistance;
+    }
+
+    public float onPullDistance(float deltaDistance, float displacement) {
+        mDistance = Math.max(0f, deltaDistance + mDistance);
+        if (!mIsScrolling) {
+            mOverlay.onScrollInteractionBegin();
+            mIsScrolling = true;
+        }
+        mOverlay.onScrollChange(mDistance, mIsRtl);
+        return mDistance > 0 ? deltaDistance : 0;
+    }
+
+    @Override
+    public void onAbsorb(int velocity) { }
+
+    @Override
+    public boolean isFinished() {
+        return mDistance <= 0;
+    }
+
+    @Override
+    public void onRelease() {
+        if (mIsScrolling) {
+            mDistance = 0;
+            mOverlay.onScrollInteractionEnd();
+            mIsScrolling = false;
+        }
+    }
+
+    @Override
+    public boolean draw(Canvas canvas) {
+        return false;
+    }
+
+    public void finish() {
+        mDistance = 0;
+    }
+}
diff --git a/src/com/android/launcher3/util/TranslateEdgeEffect.java b/src/com/android/launcher3/util/TranslateEdgeEffect.java
new file mode 100644
index 0000000000..8fdc8df347
--- /dev/null
+++ b/src/com/android/launcher3/util/TranslateEdgeEffect.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.util;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.RenderNode;
+import android.widget.EdgeEffect;
+
+/**
+ * Extension of {@link EdgeEffect} which translates the content instead of the default
+ * platform implementation
+ */
+@SuppressWarnings("NewApi")
+public class TranslateEdgeEffect extends EdgeEffectCompat {
+
+    private final RenderNode mNode;
+
+    public TranslateEdgeEffect(Context context) {
+        super(context);
+        mNode = new RenderNode("TranslateEdgeEffect");
+    }
+
+    @Override
+    public boolean draw(Canvas canvas) {
+        return false;
+    }
+
+    public boolean getTranslationShift(float[] out) {
+        Canvas c = mNode.beginRecording(1, 1);
+        boolean result = super.draw(c);
+        mNode.endRecording();
+
+        out[0] = getDistance();
+        return result;
+    }
+}
-- 
GitLab


From c2668b889ffe3f520922174d87fe5f22e2d8153a Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Thu, 22 Apr 2021 23:38:17 +0000
Subject: [PATCH 0961/1664] Revert "Redraw live tile in updatePageOffsets()"

This reverts commit 2e3b7c6e97526f9b4ec392dfd7f6a433a3ee7300.

Reason for revert: regression, see b/186163921

Bug: 186163921
Change-Id: Ida9a225e0880babc3bb08da4fa6f559031c728f7
Test: manual with YT in gesture navigation mode
---
 .../src/com/android/quickstep/views/RecentsView.java      | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index d9f398d5d0..150ae02cf0 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1420,9 +1420,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         mTaskListChangeId = -1;
         mFocusedTaskId = -1;
 
-        if (mRecentsAnimationController != null) {
-            finishRecentsAnimation(true /* toRecents */, null);
-        }
+        mRecentsAnimationController = null;
         mLiveTileParams.setTargetSet(null);
         mLiveTileTaskViewSimulator.setDrawsBelowRecents(true);
 
@@ -2519,10 +2517,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                     ? ((TaskView) child).getPrimaryTaskOffsetTranslationProperty()
                     : mOrientationHandler.getPrimaryViewTranslate();
             translationProperty.set(child, totalTranslation);
-            if (LIVE_TILE.get() && mEnableDrawingLiveTile && i == getRunningTaskIndex()) {
-                mLiveTileTaskViewSimulator.taskPrimaryTranslation.value = totalTranslation;
-                redrawLiveTile();
-            }
         }
         updateCurveProperties();
     }
-- 
GitLab


From 2b093941e196215ba960d4d6152334ea65e5ffff Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 9 Apr 2021 14:00:25 -0700
Subject: [PATCH 0962/1664] Add support for swiping back to the shortcut that
 launched the activity

Bug: 129067201
Test: Open a shortcut on the workspace, go home

Change-Id: If5d3c3e8e93f09af50aa4994094657347890ef45
Signed-off-by: Winson Chung <winsonc@google.com>
---
 .../launcher3/BaseQuickstepLauncher.java      | 31 ++++++++++-
 .../android/quickstep/AbsSwipeUpHandler.java  |  7 ++-
 .../quickstep/FallbackSwipeHandler.java       |  5 +-
 .../quickstep/LauncherSwipeHandlerV2.java     | 51 ++++++++++++++-----
 .../android/quickstep/RecentsActivity.java    |  7 ++-
 .../com/android/quickstep/views/TaskView.java |  2 +-
 .../launcher3/BaseDraggingActivity.java       |  4 +-
 src/com/android/launcher3/Workspace.java      | 39 +++++++++-----
 .../launcher3/touch/ItemClickHandler.java     |  2 +-
 .../launcher3/util/ActivityTracker.java       |  5 +-
 .../android/launcher3/util/ObjectWrapper.java |  7 +++
 .../launcher3/views/FloatingSurfaceView.java  |  2 +-
 12 files changed, 123 insertions(+), 39 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index fb9765c633..caf52e3542 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -26,10 +26,13 @@ import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SY
 
 import android.animation.AnimatorSet;
 import android.animation.ValueAnimator;
+import android.app.ActivityOptions;
 import android.content.Intent;
 import android.content.IntentSender;
+import android.os.Binder;
 import android.os.Bundle;
 import android.os.CancellationSignal;
+import android.os.IBinder;
 import android.view.View;
 
 import androidx.annotation.Nullable;
@@ -37,6 +40,8 @@ import androidx.annotation.Nullable;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.model.WellbeingModel;
+import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.popup.SystemShortcut;
 import com.android.launcher3.proxy.ProxyActivityStarter;
 import com.android.launcher3.proxy.StartActivityParams;
@@ -50,6 +55,7 @@ import com.android.launcher3.taskbar.TaskbarView;
 import com.android.launcher3.uioverrides.RecentsViewStateController;
 import com.android.launcher3.util.ActivityOptionsWrapper;
 import com.android.launcher3.util.DisplayController;
+import com.android.launcher3.util.ObjectWrapper;
 import com.android.launcher3.util.UiThreadHelper;
 import com.android.quickstep.RecentsModel;
 import com.android.quickstep.SysUINavigationMode;
@@ -67,6 +73,7 @@ import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Stream;
 
@@ -418,18 +425,38 @@ public abstract class BaseQuickstepLauncher extends Launcher
     }
 
     @Override
-    public ActivityOptionsWrapper getActivityLaunchOptions(View v) {
+    public ActivityOptionsWrapper getActivityLaunchOptions(View v, @Nullable ItemInfo item) {
         ActivityOptionsWrapper activityOptions =
                 mAppTransitionManager.hasControlRemoteAppTransitionPermission()
                         ? mAppTransitionManager.getActivityLaunchOptions(this, v)
-                        : super.getActivityLaunchOptions(v);
+                        : super.getActivityLaunchOptions(v, item);
         if (mLastTouchUpTime > 0) {
             ActivityOptionsCompat.setLauncherSourceInfo(
                     activityOptions.options, mLastTouchUpTime);
         }
+        addLaunchCookie(item, activityOptions.options);
         return activityOptions;
     }
 
+    /**
+     * Adds a new launch cookie for the activity launch of the given {@param info} if supported.
+     */
+    public void addLaunchCookie(ItemInfo info, ActivityOptions opts) {
+        if (info == null) {
+            return;
+        }
+        switch (info.itemType) {
+            case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION:
+            case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT:
+            case LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT:
+                // Fall through and continue if it's an app or shortcut
+                break;
+            default:
+                return;
+        }
+        opts.setLaunchCookie(ObjectWrapper.wrap(new Integer(info.id)));
+    }
+
     public void setHintUserWillBeActive() {
         addActivityFlags(ACTIVITY_STATE_USER_WILL_BE_ACTIVE);
     }
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 1b59c4966e..80b9cf3db7 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -66,6 +66,7 @@ import android.graphics.PointF;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.Handler;
+import android.os.IBinder;
 import android.os.SystemClock;
 import android.view.MotionEvent;
 import android.view.View;
@@ -1043,7 +1044,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                 interpolator, target, velocityPxPerMs));
     }
 
-    protected abstract HomeAnimationFactory createHomeAnimationFactory(long duration);
+    protected abstract HomeAnimationFactory createHomeAnimationFactory(
+            ArrayList<IBinder> launchCookies, long duration);
 
     private final TaskStackChangeListener mActivityRestartListener = new TaskStackChangeListener() {
         @Override
@@ -1084,7 +1086,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
             final RemoteAnimationTargetCompat runningTaskTarget = mRecentsAnimationTargets != null
                     ? mRecentsAnimationTargets.findTask(mGestureState.getRunningTaskId())
                     : null;
-            HomeAnimationFactory homeAnimFactory = createHomeAnimationFactory(duration);
+            HomeAnimationFactory homeAnimFactory = createHomeAnimationFactory(
+                    runningTaskTarget.taskInfo.launchCookies, duration);
             mIsSwipingPipToHome = homeAnimFactory.supportSwipePipToHome()
                     && runningTaskTarget != null
                     && runningTaskTarget.taskInfo.pictureInPictureParams != null
diff --git a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
index f5698f7542..9846ee78e3 100644
--- a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
+++ b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
@@ -38,6 +38,7 @@ import android.graphics.RectF;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.IBinder;
 import android.os.Looper;
 import android.os.Message;
 import android.os.Messenger;
@@ -68,6 +69,7 @@ import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
 
 import java.lang.ref.WeakReference;
+import java.util.ArrayList;
 import java.util.UUID;
 import java.util.function.Consumer;
 
@@ -126,7 +128,8 @@ public class FallbackSwipeHandler extends
     }
 
     @Override
-    protected HomeAnimationFactory createHomeAnimationFactory(long duration) {
+    protected HomeAnimationFactory createHomeAnimationFactory(ArrayList<IBinder> launchCookies,
+            long duration) {
         mActiveAnimationFactory = new FallbackHomeAnimationFactory(duration);
         ActivityOptions options = ActivityOptions.makeCustomAnimation(mContext, 0, 0);
         Intent intent = new Intent(mGestureState.getHomeIntent());
diff --git a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
index 5ecd385f13..dd35d68dcf 100644
--- a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
+++ b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
@@ -31,6 +31,7 @@ import android.animation.AnimatorSet;
 import android.animation.ValueAnimator;
 import android.content.Context;
 import android.graphics.RectF;
+import android.os.IBinder;
 import android.os.UserHandle;
 import android.view.View;
 
@@ -47,6 +48,7 @@ import com.android.launcher3.anim.SpringAnimationBuilder;
 import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.util.DynamicResource;
+import com.android.launcher3.util.ObjectWrapper;
 import com.android.launcher3.views.FloatingIconView;
 import com.android.quickstep.util.AppCloseConfig;
 import com.android.quickstep.util.RectFSpringAnim;
@@ -56,6 +58,8 @@ import com.android.quickstep.views.TaskView;
 import com.android.systemui.plugins.ResourceProvider;
 import com.android.systemui.shared.system.InputConsumerController;
 
+import java.util.ArrayList;
+
 /**
  * Temporary class to allow easier refactoring
  */
@@ -71,20 +75,12 @@ public class LauncherSwipeHandlerV2 extends
 
 
     @Override
-    protected HomeAnimationFactory createHomeAnimationFactory(long duration) {
+    protected HomeAnimationFactory createHomeAnimationFactory(ArrayList<IBinder> launchCookies,
+            long duration) {
         HomeAnimationFactory homeAnimFactory;
         if (mActivity != null) {
-            final TaskView runningTaskView = mRecentsView.getRunningTaskView();
-            final View workspaceView;
-            if (runningTaskView != null
-                    && !mIsSwipingPipToHome
-                    && runningTaskView.getTask().key.getComponent() != null) {
-                workspaceView = mActivity.getWorkspace().getFirstMatchForAppClose(
-                        runningTaskView.getTask().key.getComponent().getPackageName(),
-                        UserHandle.of(runningTaskView.getTask().key.userId));
-            } else {
-                workspaceView = null;
-            }
+            final View workspaceView = findWorkspaceView(launchCookies,
+                    mRecentsView.getRunningTaskView());
             boolean canUseWorkspaceView =
                     workspaceView != null && workspaceView.isAttachedToWindow();
 
@@ -232,6 +228,37 @@ public class LauncherSwipeHandlerV2 extends
         return homeAnimFactory;
     }
 
+    /**
+     * Returns the associated view on the workspace matching one of the launch cookies, or the app
+     * associated with the running task.
+     */
+    @Nullable
+    private View findWorkspaceView(ArrayList<IBinder> launchCookies, TaskView runningTaskView) {
+        if (mIsSwipingPipToHome) {
+            // Disable if swiping to PIP
+            return null;
+        }
+        if (runningTaskView == null || runningTaskView.getTask() == null
+                || runningTaskView.getTask().key.getComponent() == null) {
+            // Disable if it's an invalid task
+            return null;
+        }
+
+        // Find the associated item info for the launch cookie (if available)
+        int launchCookieItemId = -1;
+        for (IBinder cookie : launchCookies) {
+            Integer itemId = ObjectWrapper.unwrap(cookie);
+            if (itemId != null) {
+                launchCookieItemId = itemId;
+                break;
+            }
+        }
+
+        return mActivity.getWorkspace().getFirstMatchForAppClose(launchCookieItemId,
+                runningTaskView.getTask().key.getComponent().getPackageName(),
+                UserHandle.of(runningTaskView.getTask().key.userId));
+    }
+
     @Override
     protected void finishRecentsControllerToHome(Runnable callback) {
         mRecentsAnimationController.finish(
diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index 7c453e7e9d..ec224ed450 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -37,6 +37,8 @@ import android.os.Handler;
 import android.os.Looper;
 import android.view.View;
 
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile;
@@ -48,6 +50,7 @@ import com.android.launcher3.WrappedLauncherAnimationRunner;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.compat.AccessibilityManagerCompat;
+import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
@@ -177,9 +180,9 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
     }
 
     @Override
-    public ActivityOptionsWrapper getActivityLaunchOptions(final View v) {
+    public ActivityOptionsWrapper getActivityLaunchOptions(final View v, @Nullable ItemInfo item) {
         if (!(v instanceof TaskView)) {
-            return super.getActivityLaunchOptions(v);
+            return super.getActivityLaunchOptions(v, item);
         }
 
         final TaskView taskView = (TaskView) v;
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 2bb14d2a0b..35acdd188a 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -523,7 +523,7 @@ public class TaskView extends FrameLayout implements Reusable {
         if (mTask != null) {
             TestLogging.recordEvent(
                     TestProtocol.SEQUENCE_MAIN, "startActivityFromRecentsAsync", mTask);
-            ActivityOptionsWrapper opts =  mActivity.getActivityLaunchOptions(this);
+            ActivityOptionsWrapper opts =  mActivity.getActivityLaunchOptions(this, null);
             if (ActivityManagerWrapper.getInstance()
                     .startActivityFromRecents(mTask.key, opts.options)) {
                 return opts.onEndCallback;
diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java
index e9412d9aa8..cc9f594257 100644
--- a/src/com/android/launcher3/BaseDraggingActivity.java
+++ b/src/com/android/launcher3/BaseDraggingActivity.java
@@ -165,7 +165,7 @@ public abstract class BaseDraggingActivity extends BaseActivity
     }
 
     @NonNull
-    public ActivityOptionsWrapper getActivityLaunchOptions(View v) {
+    public ActivityOptionsWrapper getActivityLaunchOptions(View v, @Nullable ItemInfo item) {
         int left = 0, top = 0;
         int width = v.getMeasuredWidth(), height = v.getMeasuredHeight();
         if (v instanceof BubbleTextView) {
@@ -192,7 +192,7 @@ public abstract class BaseDraggingActivity extends BaseActivity
             return false;
         }
 
-        Bundle optsBundle = (v != null) ? getActivityLaunchOptions(v).toBundle() : null;
+        Bundle optsBundle = (v != null) ? getActivityLaunchOptions(v, item).toBundle() : null;
         UserHandle user = item == null ? null : item.user;
 
         // Prepare intent
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 5d941a71de..5e37c7ac2e 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2999,20 +2999,30 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
      * Similar to {@link #getFirstMatch} but optimized to finding a suitable view for the app close
      * animation.
      *
+     * @param preferredItemId The id of the preferred item to match to if it exists.
      * @param packageName The package name of the app to match.
      * @param user The user of the app to match.
      */
-    public View getFirstMatchForAppClose(String packageName, UserHandle user) {
-        List<CellLayout> cellLayouts = new ArrayList<>(getPanelCount() + 1);
-        cellLayouts.add(getHotseat());
-        getVisiblePages().forEach(page -> cellLayouts.add((CellLayout) page));
-
-        final Workspace.ItemOperator packageAndUser = (ItemInfo info, View view) -> info != null
-                && info.getTargetComponent() != null
-                && TextUtils.equals(info.getTargetComponent().getPackageName(), packageName)
-                && info.user.equals(user);
+    public View getFirstMatchForAppClose(int preferredItemId, String packageName, UserHandle user) {
+        final Workspace.ItemOperator preferredItem = (ItemInfo info, View view) ->
+                info != null && info.id == preferredItemId;
+        final Workspace.ItemOperator preferredItemInFolder = (info, view) -> {
+            if (info instanceof FolderInfo) {
+                FolderInfo folderInfo = (FolderInfo) info;
+                for (WorkspaceItemInfo shortcutInfo : folderInfo.contents) {
+                    if (preferredItem.evaluate(shortcutInfo, view)) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        };
         final Workspace.ItemOperator packageAndUserAndApp = (ItemInfo info, View view) ->
-                packageAndUser.evaluate(info, view) && info.itemType == ITEM_TYPE_APPLICATION;
+                info != null
+                        && info.getTargetComponent() != null
+                        && TextUtils.equals(info.getTargetComponent().getPackageName(), packageName)
+                        && info.user.equals(user)
+                        && info.itemType == ITEM_TYPE_APPLICATION;
         final Workspace.ItemOperator packageAndUserAndAppInFolder = (info, view) -> {
             if (info instanceof FolderInfo) {
                 FolderInfo folderInfo = (FolderInfo) info;
@@ -3025,13 +3035,18 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
             return false;
         };
 
+        List<CellLayout> cellLayouts = new ArrayList<>(getPanelCount() + 1);
+        cellLayouts.add(getHotseat());
+        getVisiblePages().forEach(page -> cellLayouts.add((CellLayout) page));
+
         // Order: App icons, app in folder. Items in hotseat get returned first.
         if (ADAPTIVE_ICON_WINDOW_ANIM.get()) {
-            return getFirstMatch(cellLayouts, packageAndUserAndApp, packageAndUserAndAppInFolder);
+            return getFirstMatch(cellLayouts, preferredItem, preferredItemInFolder,
+                    packageAndUserAndApp, packageAndUserAndAppInFolder);
         } else {
             // Do not use Folder as a criteria, since it'll cause a crash when trying to draw
             // FolderAdaptiveIcon as the background.
-            return getFirstMatch(cellLayouts, packageAndUserAndApp);
+            return getFirstMatch(cellLayouts, preferredItem, packageAndUserAndApp);
         }
     }
 
diff --git a/src/com/android/launcher3/touch/ItemClickHandler.java b/src/com/android/launcher3/touch/ItemClickHandler.java
index 2e54904267..ce7dc07d6d 100644
--- a/src/com/android/launcher3/touch/ItemClickHandler.java
+++ b/src/com/android/launcher3/touch/ItemClickHandler.java
@@ -180,7 +180,7 @@ public class ItemClickHandler {
                 LauncherApps launcherApps = launcher.getSystemService(LauncherApps.class);
                 try {
                     launcherApps.startPackageInstallerSessionDetailsActivity(sessionInfo, null,
-                            launcher.getActivityLaunchOptions(v).toBundle());
+                            launcher.getActivityLaunchOptions(v, item).toBundle());
                     return;
                 } catch (Exception e) {
                     Log.e(TAG, "Unable to launch market intent for package=" + packageName, e);
diff --git a/src/com/android/launcher3/util/ActivityTracker.java b/src/com/android/launcher3/util/ActivityTracker.java
index 59266b4daa..b5b9c2f43a 100644
--- a/src/com/android/launcher3/util/ActivityTracker.java
+++ b/src/com/android/launcher3/util/ActivityTracker.java
@@ -75,9 +75,8 @@ public final class ActivityTracker<T extends BaseActivity> {
     private boolean handleIntent(T activity, Intent intent, boolean alreadyOnHome) {
         if (intent != null && intent.getExtras() != null) {
             IBinder stateBinder = intent.getExtras().getBinder(EXTRA_SCHEDULER_CALLBACK);
-            if (stateBinder instanceof ObjectWrapper) {
-                SchedulerCallback<T> handler =
-                        ((ObjectWrapper<SchedulerCallback>) stateBinder).get();
+            SchedulerCallback<T> handler = ObjectWrapper.unwrap(stateBinder);
+            if (handler != null) {
                 if (!handler.init(activity, alreadyOnHome)) {
                     intent.getExtras().remove(EXTRA_SCHEDULER_CALLBACK);
                 }
diff --git a/src/com/android/launcher3/util/ObjectWrapper.java b/src/com/android/launcher3/util/ObjectWrapper.java
index e5b4707074..a7158219c3 100644
--- a/src/com/android/launcher3/util/ObjectWrapper.java
+++ b/src/com/android/launcher3/util/ObjectWrapper.java
@@ -42,4 +42,11 @@ public class ObjectWrapper<T> extends Binder {
     public static IBinder wrap(Object obj) {
         return new ObjectWrapper<>(obj);
     }
+
+    public static <T> T unwrap(IBinder binder) {
+        if (binder instanceof ObjectWrapper) {
+            return ((ObjectWrapper<T>) binder).get();
+        }
+        return null;
+    }
 }
diff --git a/src/com/android/launcher3/views/FloatingSurfaceView.java b/src/com/android/launcher3/views/FloatingSurfaceView.java
index f13484f131..e2e3be7976 100644
--- a/src/com/android/launcher3/views/FloatingSurfaceView.java
+++ b/src/com/android/launcher3/views/FloatingSurfaceView.java
@@ -158,7 +158,7 @@ public class FloatingSurfaceView extends AbstractFloatingView implements
         if (mContract == null) {
             return;
         }
-        View icon = mLauncher.getWorkspace().getFirstMatchForAppClose(
+        View icon = mLauncher.getWorkspace().getFirstMatchForAppClose(-1,
                 mContract.componentName.getPackageName(), mContract.user);
 
         boolean iconChanged = mIcon != icon;
-- 
GitLab


From 74b9ae5787c20c981dbb355d2a1e8bd73f6250c0 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Thu, 22 Apr 2021 19:07:22 -0700
Subject: [PATCH 0963/1664] Null mRecentsAnimationController in the end

Fixes: 186141367
Test: manual
Change-Id: Iccc96ef6ffebcb0b7a7953d2423dfdb738823431
---
 quickstep/src/com/android/quickstep/views/RecentsView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index e4fa1aa831..36ba93b0cf 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -3069,7 +3069,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         }
 
         mRecentsAnimationController.finish(toRecents, () -> {
-            mRecentsAnimationController = null;
             if (onFinishComplete != null) {
                 onFinishComplete.run();
             }
@@ -3079,6 +3078,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             // typical example of this is (1) user swipes up from app to Overview (2) user
             // taps on QSB (3) user goes back to Overview and launch the most recent task.
             setCurrentTask(-1);
+            mRecentsAnimationController = null;
         });
     }
 
-- 
GitLab


From 8c383f97e4537c24affd0cd01631047509da2908 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Thu, 22 Apr 2021 22:46:38 -0500
Subject: [PATCH 0964/1664] [Search][Motion] Separate AllApps scrim and content
 interpolation

video: https://drive.google.com/file/d/18jTh8Lc8hf-c1GBGaWERHo4QIvAHBA8J/view?usp=sharing&resourcekey=0-RDJgw-ecOW3nnF6_tWkgCg
Bug: 183001675
Test: visual
Change-Id: Idb177fd3e31ac41f57379ac45b80e7246c0dd156
---
 src/com/android/launcher3/Launcher.java       |  2 +-
 .../WorkspaceStateTransitionAnimation.java    |  5 ---
 .../allapps/AllAppsTransitionController.java  | 12 +++++--
 .../android/launcher3/views/ScrimView.java    | 32 ++++++++++++++++---
 4 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index a54c791aff..36d3625299 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1197,7 +1197,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
         // Setup the drag controller (drop targets have to be added in reverse order in priority)
         mDropTargetBar.setup(mDragController);
-        mAllAppsController.setupViews(mAppsView);
+        mAllAppsController.setupViews(mAppsView, mScrimView);
     }
 
     /**
diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
index ed854dcd0e..41962a4104 100644
--- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
+++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
@@ -36,7 +36,6 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_SCA
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_TRANSLATE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_SCALE;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_SCRIM_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_TRANSLATE;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_SCRIM;
 
@@ -165,10 +164,6 @@ public class WorkspaceStateTransitionAnimation {
         SysUiScrim sysUiScrim = mLauncher.getDragLayer().getSysUiScrim();
         propertySetter.setFloat(sysUiScrim, SYSUI_PROGRESS,
                 state.hasFlag(FLAG_HAS_SYS_UI_SCRIM) ? 1 : 0, LINEAR);
-
-        propertySetter.setViewAlpha(mLauncher.getScrimView(),
-                state.getWorkspaceScrimAlpha(mLauncher),
-                config.getInterpolator(ANIM_WORKSPACE_SCRIM_FADE, LINEAR));
     }
 
     public void applyChildState(LauncherState state, CellLayout cl, int childIndex) {
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index c61c0d6d53..5c1bffb2d1 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -43,6 +43,7 @@ import com.android.launcher3.anim.PropertySetter;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
 import com.android.launcher3.states.StateAnimationConfig;
+import com.android.launcher3.views.ScrimView;
 
 /**
  * Handles AllApps view transition.
@@ -70,10 +71,11 @@ public class AllAppsTransitionController
                     controller.setProgress(progress);
                 }
             };
+    private final Launcher mLauncher;
 
     private AllAppsContainerView mAppsView;
+    private ScrimView mScrimView;
 
-    private final Launcher mLauncher;
     private boolean mIsVerticalLayout;
 
     // Animation in this class is controlled by a single variable {@link mProgress}.
@@ -121,6 +123,8 @@ public class AllAppsTransitionController
      */
     public void setProgress(float progress) {
         mProgress = progress;
+        //Note: Take inverted progress so progress=0 maps to a transparent scrim
+        mScrimView.setProgress(1 - progress);
         mAppsView.setTranslationY(mProgress * mShiftRange);
     }
 
@@ -185,8 +189,12 @@ public class AllAppsTransitionController
         return AnimationSuccessListener.forRunnable(this::onProgressAnimationEnd);
     }
 
-    public void setupViews(AllAppsContainerView appsView) {
+    /**
+     * Setup views
+     */
+    public void setupViews(AllAppsContainerView appsView, ScrimView scrimView) {
         mAppsView = appsView;
+        mScrimView = scrimView;
         if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && Utilities.ATLEAST_R) {
             mLauncher.getSystemUiController().updateUiState(UI_STATE_ALLAPPS,
                     View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
diff --git a/src/com/android/launcher3/views/ScrimView.java b/src/com/android/launcher3/views/ScrimView.java
index c9424de152..9b809ae486 100644
--- a/src/com/android/launcher3/views/ScrimView.java
+++ b/src/com/android/launcher3/views/ScrimView.java
@@ -15,18 +15,21 @@
  */
 package com.android.launcher3.views;
 
+import static com.android.launcher3.anim.Interpolators.ACCEL;
 import static com.android.launcher3.util.SystemUiController.UI_STATE_SCRIM_VIEW;
 
 import android.content.Context;
 import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.view.View;
+import android.view.animation.Interpolator;
 
 import androidx.core.graphics.ColorUtils;
 
 import com.android.launcher3.Insettable;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
+import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.util.SystemUiController;
 import com.android.launcher3.util.Themes;
 
@@ -36,9 +39,22 @@ import com.android.launcher3.util.Themes;
 public class ScrimView extends View implements Insettable {
     private static final float STATUS_BAR_COLOR_FORCE_UPDATE_THRESHOLD = 0.9f;
 
+
+    private static final float TINT_DECAY_MULTIPLIER = .5f;
+
+    //min progress for scrim to become visible
+    private static final float SCRIM_VISIBLE_THRESHOLD = .1f;
+    //max progress where scrim alpha animates.
+    private static final float SCRIM_SOLID_THRESHOLD = .5f;
+    private final Interpolator mScrimInterpolator = Interpolators.clampToProgress(ACCEL,
+            SCRIM_VISIBLE_THRESHOLD,
+            SCRIM_SOLID_THRESHOLD);
+
     private final boolean mIsScrimDark;
     private SystemUiController mSystemUiController;
 
+    private float mProgress;
+
     public ScrimView(Context context, AttributeSet attrs) {
         super(context, attrs);
         mIsScrimDark = ColorUtils.calculateLuminance(
@@ -47,17 +63,23 @@ public class ScrimView extends View implements Insettable {
     }
 
     @Override
-    public void setInsets(Rect insets) { }
+    public void setInsets(Rect insets) {
+    }
 
     @Override
     public boolean hasOverlappingRendering() {
         return false;
     }
 
-    @Override
-    protected boolean onSetAlpha(int alpha) {
-        updateSysUiColors();
-        return super.onSetAlpha(alpha);
+    /**
+     * Set progress of scrim animation.
+     * Note: progress should range from 0 for transparent to 1 for solid
+     */
+    public void setProgress(float progress) {
+        if (mProgress != progress) {
+            mProgress = progress;
+            setAlpha(mScrimInterpolator.getInterpolation(progress));
+        }
     }
 
     @Override
-- 
GitLab


From 0e16272049e78db59433c07d7a72a4a917592b0a Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Tue, 20 Apr 2021 13:01:29 -0700
Subject: [PATCH 0965/1664] Place split selection placeholder view based on
 option selected

* Add first split app's choosen icon inside the view

TODO: Update animation of where selected app goes.

Bug: 181704764
Test: Tested tablet + phone, real and fake landscape
Change-Id: Ia3c635b056f2ac3812a0df001bbbb38bde26f6af
---
 .../RecentsViewStateController.java           |  2 +-
 .../util/SplitSelectStateController.java      | 27 +++++++++++++++++++
 .../android/quickstep/views/RecentsView.java  |  8 +++++-
 .../quickstep/views/SplitPlaceholderView.java | 17 ++++++++++--
 .../touch/PortraitPagedViewHandler.java       | 26 ++++++++++++------
 5 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
index 9097c8b4c2..0652d48c11 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
@@ -113,7 +113,7 @@ public final class RecentsViewStateController extends
                         ANIM_OVERVIEW_ACTIONS_FADE, LINEAR));
 
         float splitPlaceholderAlpha = state.areElementsVisible(mLauncher, SPLIT_PLACHOLDER_VIEW) ?
-                0.7f : 0;
+                0.85f : 0;
         propertySetter.setFloat(mRecentsView.getSplitPlaceholder(), ALPHA_FLOAT,
                 splitPlaceholderAlpha, LINEAR);
     }
diff --git a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
index c1c8c1bb55..01d51f82cb 100644
--- a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
+++ b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
@@ -16,16 +16,20 @@
 
 package com.android.quickstep.util;
 
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT;
 import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT;
 
 import android.animation.AnimatorSet;
 import android.app.ActivityOptions;
+import android.content.res.Resources;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
 import android.util.Pair;
+import android.view.Gravity;
 import android.view.SurfaceControl;
 import android.window.TransitionInfo;
 
@@ -33,7 +37,10 @@ import androidx.annotation.Nullable;
 
 import com.android.launcher3.BaseActivity;
 import com.android.launcher3.BaseQuickstepLauncher;
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.InsettableFrameLayout;
 import com.android.launcher3.LauncherAnimationRunner;
+import com.android.launcher3.R;
 import com.android.launcher3.WrappedAnimationRunnerImpl;
 import com.android.launcher3.WrappedLauncherAnimationRunner;
 import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
@@ -115,6 +122,26 @@ public class SplitSelectStateController {
         resetState();
     }
 
+    /**
+     * @return {@link InsettableFrameLayout.LayoutParams} to correctly position the
+     * split placeholder view
+     */
+    public InsettableFrameLayout.LayoutParams getLayoutParamsForActivePosition(Resources resources,
+            DeviceProfile deviceProfile) {
+        InsettableFrameLayout.LayoutParams params =
+                new InsettableFrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT);
+        boolean topLeftPosition = mInitialPosition.mStagePosition == STAGE_POSITION_TOP_OR_LEFT;
+        if (deviceProfile.isLandscape) {
+            params.width = (int) resources.getDimension(R.dimen.split_placeholder_size);
+            params.gravity = topLeftPosition ? Gravity.START : Gravity.END;
+        } else {
+            params.height = (int) resources.getDimension(R.dimen.split_placeholder_size);
+            params.gravity = Gravity.TOP;
+        }
+
+        return params;
+    }
+
     @Nullable
     public SplitPositionOption getActiveSplitPositionOption() {
         return mInitialPosition;
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index db651a8eab..e0d2702fd4 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -145,6 +145,7 @@ import com.android.quickstep.util.LayoutUtils;
 import com.android.quickstep.util.MultiValueUpdateListener;
 import com.android.quickstep.util.RecentsOrientedState;
 import com.android.quickstep.util.SplitScreenBounds;
+import com.android.quickstep.util.SplitSelectStateController;
 import com.android.quickstep.util.SurfaceTransactionApplier;
 import com.android.quickstep.util.TaskViewSimulator;
 import com.android.quickstep.util.TransformParams;
@@ -2753,9 +2754,14 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
 
     public void initiateSplitSelect(TaskView taskView, SplitPositionOption splitPositionOption) {
         mSplitHiddenTaskView = taskView;
-        mSplitPlaceholderView.getSplitController().setInitialTaskSelect(taskView,
+        SplitSelectStateController splitController = mSplitPlaceholderView.getSplitController();
+        splitController.setInitialTaskSelect(taskView,
                 splitPositionOption);
         mSplitHiddenTaskViewIndex = indexOfChild(taskView);
+        mSplitPlaceholderView.setLayoutParams(
+                splitController.getLayoutParamsForActivePosition(getResources(),
+                        mActivity.getDeviceProfile()));
+        mSplitPlaceholderView.setIcon(taskView.getIconView());
     }
 
     public PendingAnimation createSplitSelectInitAnimation() {
diff --git a/quickstep/src/com/android/quickstep/views/SplitPlaceholderView.java b/quickstep/src/com/android/quickstep/views/SplitPlaceholderView.java
index fb9be814f1..bb8bc11e4a 100644
--- a/quickstep/src/com/android/quickstep/views/SplitPlaceholderView.java
+++ b/quickstep/src/com/android/quickstep/views/SplitPlaceholderView.java
@@ -19,11 +19,12 @@ package com.android.quickstep.views;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.util.FloatProperty;
-import android.view.View;
+import android.view.Gravity;
+import android.widget.FrameLayout;
 
 import com.android.quickstep.util.SplitSelectStateController;
 
-public class SplitPlaceholderView extends View {
+public class SplitPlaceholderView extends FrameLayout {
 
     public static final FloatProperty<SplitPlaceholderView> ALPHA_FLOAT =
             new FloatProperty<SplitPlaceholderView>("SplitViewAlpha") {
@@ -40,6 +41,7 @@ public class SplitPlaceholderView extends View {
             };
 
     private SplitSelectStateController mSplitController;
+    private IconView mIcon;
 
     public SplitPlaceholderView(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -52,4 +54,15 @@ public class SplitPlaceholderView extends View {
     public SplitSelectStateController getSplitController() {
         return mSplitController;
     }
+
+    public void setIcon(IconView icon) {
+        if (mIcon == null) {
+            mIcon = new IconView(getContext());
+            addView(mIcon);
+        }
+        mIcon.setDrawable(icon.getDrawable());
+        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(icon.getLayoutParams());
+        params.gravity = Gravity.CENTER;
+        mIcon.setLayoutParams(params);
+    }
 }
diff --git a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
index b2cc31bcd0..31586e7428 100644
--- a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
+++ b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
@@ -311,21 +311,31 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
     @Override
     public List<SplitPositionOption> getSplitPositionOptions(DeviceProfile dp) {
         List<SplitPositionOption> options = new ArrayList<>(1);
+        // Add both left and right options if we're in tablet mode
         // TODO: Add in correct icons
-        if (dp.isSeascape()) { // or seascape
-            // Add left/right options
+        if (dp.isTablet && dp.isLandscape) {
             options.add(new SplitPositionOption(
                     R.drawable.ic_split_screen, R.string.split_screen_position_right,
-                    STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN));
-        } else if (dp.isLandscape) {
+                    STAGE_POSITION_BOTTOM_OR_RIGHT, STAGE_TYPE_MAIN));
             options.add(new SplitPositionOption(
                     R.drawable.ic_split_screen, R.string.split_screen_position_left,
                     STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN));
         } else {
-            // Only add top option
-            options.add(new SplitPositionOption(
-                    R.drawable.ic_split_screen, R.string.split_screen_position_top,
-                    STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN));
+            if (dp.isSeascape()) {
+                // Add left/right options
+                options.add(new SplitPositionOption(
+                        R.drawable.ic_split_screen, R.string.split_screen_position_right,
+                        STAGE_POSITION_BOTTOM_OR_RIGHT, STAGE_TYPE_MAIN));
+            } else if (dp.isLandscape) {
+                options.add(new SplitPositionOption(
+                        R.drawable.ic_split_screen, R.string.split_screen_position_left,
+                        STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN));
+            } else {
+                // Only add top option
+                options.add(new SplitPositionOption(
+                        R.drawable.ic_split_screen, R.string.split_screen_position_top,
+                        STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN));
+            }
         }
         return options;
     }
-- 
GitLab


From 357d710e5248ba303e16f362846169bf96fa6d0c Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Fri, 23 Apr 2021 08:48:35 +0000
Subject: [PATCH 0966/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I03ce29c8d64096e013a7e296df973f83c076f353
---
 quickstep/res/values-as/strings.xml     | 2 +-
 quickstep/res/values-gl/strings.xml     | 2 +-
 quickstep/res/values-gu/strings.xml     | 3 +--
 quickstep/res/values-kn/strings.xml     | 5 ++---
 quickstep/res/values-mr/strings.xml     | 3 +--
 quickstep/res/values-ne/strings.xml     | 5 ++---
 quickstep/res/values-te/strings.xml     | 3 +--
 quickstep/res/values-ur/strings.xml     | 3 +--
 quickstep/res/values-zh-rCN/strings.xml | 2 +-
 quickstep/res/values-zu/strings.xml     | 2 +-
 10 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/quickstep/res/values-as/strings.xml b/quickstep/res/values-as/strings.xml
index c1a746fdf1..9b22c62e93 100644
--- a/quickstep/res/values-as/strings.xml
+++ b/quickstep/res/values-as/strings.xml
@@ -30,7 +30,7 @@
     <string name="time_left_for_app" msgid="3111996412933644358">"আজি <xliff:g id="TIME">%1$s</xliff:g> বাকী আছ"</string>
     <string name="title_app_suggestions" msgid="4185902664111965088">"এপ চাজেশ্বন"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"সকলো এপ্"</string>
-    <string name="all_apps_prediction_tip" msgid="2672336544844936186">"আপোনাৰ অনুমানিক এপ্"</string>
+    <string name="all_apps_prediction_tip" msgid="2672336544844936186">"আপোনাৰ প্ৰয়োজন হ\'ব পৰা এপ্"</string>
     <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"আপোনাৰ গৃহ স্ক্ৰীনৰ একেবাৰে তলৰ শাৰীটোত এপৰ পৰামর্শসমূহ পাওক"</string>
     <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"আপোনাৰ গৃহ স্ক্ৰীনৰ প্ৰিয় সমলৰ শাৰীটোত এপৰ পৰামর্শসমূহ পাওক"</string>
     <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"আপোনাৰ সকলোতকৈ বেছিকৈ ব্যৱহৃত এপ্‌সমূহ গৃহ স্ক্ৰীনতে সহজে এক্সেছ কৰক। আপোনাৰ ৰুটিনসমূহৰ ভিত্তিত পৰামর্শসমূহ সলনি হ\'ব। একেবাৰে তলৰ শাৰীটোত থকা এপ্‌সমূহ ওপৰৰ আপোনাৰ গৃহ স্ক্ৰীনলৈ যাব।"</string>
diff --git a/quickstep/res/values-gl/strings.xml b/quickstep/res/values-gl/strings.xml
index 846f68a4c5..9310d71f7d 100644
--- a/quickstep/res/values-gl/strings.xml
+++ b/quickstep/res/values-gl/strings.xml
@@ -30,7 +30,7 @@
     <string name="time_left_for_app" msgid="3111996412933644358">"Tempo restante hoxe <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="title_app_suggestions" msgid="4185902664111965088">"Suxestións de aplicacións"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Todas as aplicacións"</string>
-    <string name="all_apps_prediction_tip" msgid="2672336544844936186">"As túas aplicacións preditas"</string>
+    <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Previsión das túas aplicacións"</string>
     <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Recibe suxestións de aplicacións na fila inferior da pantalla de inicio"</string>
     <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Recibe suxestións de aplicacións na fila de Favoritos da pantalla de inicio"</string>
     <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Accede facilmente desde a pantalla de inicio ás aplicacións que máis usas. As suxestións irán cambiando en función das túas rutinas. As aplicacións da fila inferior pasarán á pantalla de inicio."</string>
diff --git a/quickstep/res/values-gu/strings.xml b/quickstep/res/values-gu/strings.xml
index 1ec27093c3..496d33b79a 100644
--- a/quickstep/res/values-gu/strings.xml
+++ b/quickstep/res/values-gu/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"સ્ક્રીનશૉટ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ઍપ કે તમારી સંસ્થા દ્વારા આ ક્રિયા કરવાની મંજૂરી નથી"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"નૅવિગેશન ટ્યૂટૉરિઅલ છોડી દઈએ?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"તમે આને પછીથી <xliff:g id="NAME">%1$s</xliff:g> ઍપમાં જોઈ શકો છો"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"રદ કરો"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"છોડો"</string>
 </resources>
diff --git a/quickstep/res/values-kn/strings.xml b/quickstep/res/values-kn/strings.xml
index 31182b6f4e..8fdba693bf 100644
--- a/quickstep/res/values-kn/strings.xml
+++ b/quickstep/res/values-kn/strings.xml
@@ -30,7 +30,7 @@
     <string name="time_left_for_app" msgid="3111996412933644358">"ಇಂದು <xliff:g id="TIME">%1$s</xliff:g> ಸಮಯ ಉಳಿದಿದೆ"</string>
     <string name="title_app_suggestions" msgid="4185902664111965088">"ಆ್ಯಪ್ ಸಲಹೆಗಳು"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"ಎಲ್ಲಾ ಆ್ಯಪ್‌ಗಳು"</string>
-    <string name="all_apps_prediction_tip" msgid="2672336544844936186">"ನಿಮ್ಮ ಸಂಭವನೀಯ ಆ್ಯಪ್‌ಗಳು"</string>
+    <string name="all_apps_prediction_tip" msgid="2672336544844936186">"ನಿಮ್ಮ ಮುನ್ಸೂಚಿತ ಆ್ಯಪ್‌ಗಳು"</string>
     <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"ನಿಮ್ಮ ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಭಾಗದ ಸಾಲಿನಲ್ಲಿ ಆ್ಯಪ್ ಸಲಹೆಗಳನ್ನು ಪಡೆಯಿರಿ"</string>
     <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"ನಿಮ್ಮ ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನ ಮೆಚ್ಚಿನವುಗಳ ಸಾಲಿನಲ್ಲಿ ಆ್ಯಪ್ ಸಲಹೆಗಳನ್ನು ಪಡೆಯಿರಿ"</string>
     <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿಯೇ ನೀವು ಹೆಚ್ಚು ಬಳಸಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ಸುಲಭವಾಗಿ ಪ್ರವೇಶಿಸಿ. ನಿಮ್ಮ ದಿನಚರಿಯನ್ನು ಆಧರಿಸಿ ಸಲಹೆಗಳು ಬದಲಾಗುತ್ತವೆ. ಕೆಳಭಾಗದ ಸಾಲಿನಲ್ಲಿನ ಆ್ಯಪ್‌ಗಳು ನಿಮ್ಮ ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ ಚಲಿಸುತ್ತವೆ."</string>
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"ಸ್ಕ್ರೀನ್‌ಶಾಟ್"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ಆ್ಯಪ್ ಅಥವಾ ನಿಮ್ಮ ಸಂಸ್ಥೆಯು ಈ ಕ್ರಿಯೆಯನ್ನು ಅನುಮತಿಸುವುದಿಲ್ಲ"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"ನ್ಯಾವಿಗೇಷನ್ ಟ್ಯುಟೋರಿಯಲ್ ಸ್ಕಿಪ್ ಮಾಡಿ?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"<xliff:g id="NAME">%1$s</xliff:g> ಆ್ಯಪ್‌ನಲ್ಲಿ ಇದನ್ನು ನಂತರ ಕಾಣಬಹುದು"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"ರದ್ದುಮಾಡಿ"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"ಸ್ಕಿಪ್ ಮಾಡಿ"</string>
 </resources>
diff --git a/quickstep/res/values-mr/strings.xml b/quickstep/res/values-mr/strings.xml
index d31b03a694..c576cf139d 100644
--- a/quickstep/res/values-mr/strings.xml
+++ b/quickstep/res/values-mr/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"स्क्रीनशॉट"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"अ‍ॅप किंवा तुमच्या संस्थेद्वारे ही क्रिया करण्याची अनुमती नाही"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"नेव्हिगेशन ट्युटोरियल वगळायचे आहे का?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"तुम्हाला हे नंतर <xliff:g id="NAME">%1$s</xliff:g> ॲपमध्ये मिळेल"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"रद्द करा"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"वगळा"</string>
 </resources>
diff --git a/quickstep/res/values-ne/strings.xml b/quickstep/res/values-ne/strings.xml
index 6d314226fd..99ad8143e9 100644
--- a/quickstep/res/values-ne/strings.xml
+++ b/quickstep/res/values-ne/strings.xml
@@ -30,7 +30,7 @@
     <string name="time_left_for_app" msgid="3111996412933644358">"आज: <xliff:g id="TIME">%1$s</xliff:g> बाँकी"</string>
     <string name="title_app_suggestions" msgid="4185902664111965088">"एपसम्बन्धी सुझावहरू"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"सबै एपहरू"</string>
-    <string name="all_apps_prediction_tip" msgid="2672336544844936186">"तपाईंका पूर्वानुमानित एपहरू"</string>
+    <string name="all_apps_prediction_tip" msgid="2672336544844936186">"तपाईंलाई चाहिने एपहरू"</string>
     <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"तपाईंको गृह स्क्रिनको पुछारको पङ्क्तिमा सिफारिस गरिएका एपहरू प्राप्त गर्नुहोस्"</string>
     <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"आफ्नो होम स्क्रिनको मन पर्ने नामक पङ्क्तिमा सिफारिस गरिएका एपहरू प्राप्त गर्नुहोस्"</string>
     <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"गृह स्क्रिनबाटै आफूले सबैभन्दा बढी प्रयोग गर्ने एप सजिलै चलाउनुहोस्। सिफारिस गरिने एपहरूको क्रम तपाईंले एप प्रयोग गर्ने समयतालिकाअनुसार बदलिने छ। फेदको पङ्क्तिमा रहेका एपहरू तपाईंको गृह स्क्रिनको सिरानमा सर्ने छन्।"</string>
@@ -108,8 +108,7 @@
     <string name="blocked_by_policy" msgid="2071401072261365546">"यो एप वा तपाईंको सङ्गठनले यो कारबाही गर्ने अनुमति दिँदैन"</string>
     <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
     <skip />
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"तपाईं पछि <xliff:g id="NAME">%1$s</xliff:g> एपमा गई यो ट्युटोरियल भेट्टाउन सक्नुहुन्छ"</string>
     <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
     <skip />
     <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
diff --git a/quickstep/res/values-te/strings.xml b/quickstep/res/values-te/strings.xml
index d1e30a2b6f..c73c83ebb5 100644
--- a/quickstep/res/values-te/strings.xml
+++ b/quickstep/res/values-te/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"స్క్రీన్‌షాట్"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ఈ చర్యను యాప్ గానీ, మీ సంస్థ గానీ అనుమతించవు"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"నావిగేషన్ ట్యుటోరియల్‌ను స్కిప్ చేయాలా?"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"<xliff:g id="NAME">%1$s</xliff:g> యాప్‌లో మీరు తర్వాత కనుగొనవచ్చు"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"రద్దు చేయి"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"స్కిప్ చేయి"</string>
 </resources>
diff --git a/quickstep/res/values-ur/strings.xml b/quickstep/res/values-ur/strings.xml
index bfcc897127..5ce95ad7c1 100644
--- a/quickstep/res/values-ur/strings.xml
+++ b/quickstep/res/values-ur/strings.xml
@@ -78,8 +78,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"اسکرین شاٹ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ایپ یا آپ کی تنظیم کی جانب سے اس کارروائی کی اجازت نہیں ہے"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"نیویگیشن کا ٹیوٹوریل نظر انداز کریں؟"</string>
-    <!-- no translation found for skip_tutorial_dialog_subtitle (544063326241955662) -->
-    <skip />
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"آپ اسے بعد میں <xliff:g id="NAME">%1$s</xliff:g> ایپ میں تلاش کر سکتے ہیں"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"منسوخ کریں"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"نظر انداز کریں"</string>
 </resources>
diff --git a/quickstep/res/values-zh-rCN/strings.xml b/quickstep/res/values-zh-rCN/strings.xml
index 9d39100128..fe5e553d98 100644
--- a/quickstep/res/values-zh-rCN/strings.xml
+++ b/quickstep/res/values-zh-rCN/strings.xml
@@ -30,7 +30,7 @@
     <string name="time_left_for_app" msgid="3111996412933644358">"今天还可使用 <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="title_app_suggestions" msgid="4185902664111965088">"应用建议"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"所有应用"</string>
-    <string name="all_apps_prediction_tip" msgid="2672336544844936186">"您的预测应用"</string>
+    <string name="all_apps_prediction_tip" msgid="2672336544844936186">"您可能想要使用的应用"</string>
     <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"在主屏幕底部获取应用建议"</string>
     <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"在主屏幕的收藏行获取应用建议"</string>
     <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"直接在主屏幕上轻松访问您最常用的应用。系统会根据您的日常安排提供不同的建议。最下面一排中的应用会向上移动到主屏幕中。"</string>
diff --git a/quickstep/res/values-zu/strings.xml b/quickstep/res/values-zu/strings.xml
index a118f1d773..2ffaecf9c5 100644
--- a/quickstep/res/values-zu/strings.xml
+++ b/quickstep/res/values-zu/strings.xml
@@ -30,7 +30,7 @@
     <string name="time_left_for_app" msgid="3111996412933644358">"<xliff:g id="TIME">%1$s</xliff:g> esele namhlanje"</string>
     <string name="title_app_suggestions" msgid="4185902664111965088">"Iziphakamiso zohlelo lokusebenza"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Zonke izinhlelo zokusebenza"</string>
-    <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Izinhlelo zakho zokusebenza eziqagelwe"</string>
+    <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Ama-app akho aqagelwe"</string>
     <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Thola iziphakamiso ze-app emgqeni ongezansi wesikrini sakho sasekhaya"</string>
     <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Thola iziphakamiso zohlelo lokusebenza kumugqa wezintandokazi Zesikrini sakho sasekhaya"</string>
     <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Finyelela kalula izinhlelo zakho zokusebenza ezisetshenziswa kakhulu khona kusikrini sasekhaya. Iziphakamiso zizoshintsha ngokususelwe kwimijikelezo yakho. Izinhlelo zokusebenza ezisemgqeni ongezansi zizoya phezulu kusikrini sakho sasekhaya."</string>
-- 
GitLab


From 22a8c92361b361f0e9a9f8f9dbb65705b09b9db5 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Fri, 23 Apr 2021 08:49:13 +0000
Subject: [PATCH 0967/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I0753ecdead89494ec98b72e7fb3a6a46a848291b
---
 res/values-as/strings.xml | 4 ++--
 res/values-be/strings.xml | 2 +-
 res/values-eu/strings.xml | 2 +-
 res/values-fi/strings.xml | 2 +-
 res/values-gl/strings.xml | 4 ++--
 res/values-is/strings.xml | 2 +-
 res/values-lo/strings.xml | 2 +-
 res/values-mk/strings.xml | 2 +-
 res/values-or/strings.xml | 2 +-
 res/values-sl/strings.xml | 2 +-
 res/values-sq/strings.xml | 2 +-
 res/values-te/strings.xml | 2 +-
 12 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 08605ef9de..31ac27fb0b 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -97,8 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"ফ’ল্ডাৰ: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> টা বস্তু"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ফ’ল্ডাৰ: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> টা অথবা তাতকৈ অধিক বস্তু"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"ৱালপেপাৰসমূহ"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"ষ্টাইল &amp; ৱালপেপাৰ"</string>
-    <string name="settings_button_text" msgid="8873672322605444408">"গৃহ ছেটিংসমূহ"</string>
+    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"শৈলী আৰু ৱালপেপাৰ"</string>
+    <string name="settings_button_text" msgid="8873672322605444408">"গৃহ ছেটিং"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"আপোনাৰ প্ৰশাসকে অক্ষম কৰি ৰাখিছে"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"গৃহ স্ক্ৰীণ ঘূৰোৱাৰ অনুমতি দিয়ক"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"ফ\'নটো যেতিয়া ঘূৰোৱা হয়"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 20821d3320..c2d9946f36 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -115,7 +115,7 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Каб паказваліся значкі апавяшчэнняў, уключыце апавяшчэнні праграм для <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Змяніць налады"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Паказваць значкі апавяшчэнняў"</string>
-    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Дадаць значкі праграм на Галоўны экран"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Дадаваць значкі праграм на Галоўны экран"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Для новых праграм"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Невядома"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Выдаліць"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index a38c3d2669..a485a14291 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -66,7 +66,7 @@
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Laneko aplikazioen zerrenda"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Kendu"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Desinstalatu"</string>
-    <string name="app_info_drop_target_label" msgid="692894985365717661">"Aplikazioaren datuak"</string>
+    <string name="app_info_drop_target_label" msgid="692894985365717661">"Aplikazioaren informazioa"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Instalatu"</string>
     <string name="dismiss_prediction_label" msgid="3357562989568808658">"Ez iradoki aplikazioa"</string>
     <string name="pin_prediction" msgid="4196423321649756498">"Ainguratu iragarpena"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index d7e3a5bcce..34ed9e0c37 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -103,7 +103,7 @@
     <string name="allow_rotation_title" msgid="7728578836261442095">"Salli aloitusnäytön kiertäminen"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"Kun puhelinta kierretään"</string>
     <string name="notification_dots_title" msgid="9062440428204120317">"Pistemerkit"</string>
-    <string name="notification_dots_desc_on" msgid="1679848116452218908">"Käytössä"</string>
+    <string name="notification_dots_desc_on" msgid="1679848116452218908">"Päällä"</string>
     <string name="notification_dots_desc_off" msgid="1760796511504341095">"Ei päällä"</string>
     <string name="title_missing_notification_access" msgid="7503287056163941064">"Ilmoituksien käyttöoikeus tarvitaan"</string>
     <string name="msg_missing_notification_access" msgid="281113995110910548">"<xliff:g id="NAME">%1$s</xliff:g> tarvitsee ilmoitusten käyttöoikeuden, jotta pistemerkkejä voidaan näyttää."</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 7d65a14957..382f6ff87c 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -27,7 +27,7 @@
     <string name="safemode_widget_error" msgid="4863470563535682004">"Os widgets están desactivados no modo seguro"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"O atallo non está dispoñible"</string>
     <string name="home_screen" msgid="5629429142036709174">"Inicio"</string>
-    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Dividir pantalla"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Pantalla dividida"</string>
     <string name="long_press_widget_to_add" msgid="3587712543577675817">"Mantén premido un widget para movelo."</string>
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Toca dúas veces un widget e manteno premido para movelo ou utiliza accións personalizadas."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
@@ -108,7 +108,7 @@
     <string name="title_missing_notification_access" msgid="7503287056163941064">"Necesítase acceso ás notificacións"</string>
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Para que se mostren os puntos de notificacións, activa as notificacións da aplicación <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Cambiar configuración"</string>
-    <string name="notification_dots_service_title" msgid="4284221181793592871">"Mostrar puntos de notificacións"</string>
+    <string name="notification_dots_service_title" msgid="4284221181793592871">"Mostra puntos de notificacións"</string>
     <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Engadir iconas de aplicacións á pantalla de inicio"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Para novas aplicacións"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Descoñecido"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 2397e92c62..104b4ac5df 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -100,7 +100,7 @@
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stílar og veggfóður"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Heimastillingar"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Gert óvirkt af kerfisstjóra"</string>
-    <string name="allow_rotation_title" msgid="7728578836261442095">"Leyfa snúning fyrir heimaskjá"</string>
+    <string name="allow_rotation_title" msgid="7728578836261442095">"Leyfa snúning á heimaskjá"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"Þegar símanum er snúið"</string>
     <string name="notification_dots_title" msgid="9062440428204120317">"Tilkynningapunktar"</string>
     <string name="notification_dots_desc_on" msgid="1679848116452218908">"Kveikt"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 967a22e085..3ce2c20998 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -98,7 +98,7 @@
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ໂຟນເດີ: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ຫຼື ລາຍການເພີ່ມເຕີມ"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"ພາບພື້ນຫຼັງ"</string>
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"ຮູບແບບ ແລະ ຮູບພື້ນຫຼັງ"</string>
-    <string name="settings_button_text" msgid="8873672322605444408">"ການຕັ້ງຄ່າ Home"</string>
+    <string name="settings_button_text" msgid="8873672322605444408">"ການຕັ້ງຄ່າໜ້າຫຼັກ"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"ຖືກປິດການນຳໃຊ້ໂດຍຜູ້ເບິ່ງແຍງລະບົບຂອງທ່ານ"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"ອະນຸຍາດໃຫ້ໝຸນໜ້າຈໍຢູ່ໜ້າຫຼັກໄດ້"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"ເມື່ອໝຸນໂທລະສັບ"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 247144df98..ce79bde1f5 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -109,7 +109,7 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"За да се прикажуваат „Точки за известување“, вклучете ги известувањата за апликацијата <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Промени ги поставките"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Прикажувај точки за известување"</string>
-    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Додавај икони за апликации на почетен екран"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Додавај икони за апликации на почетниот екран"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"За нови апликации"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Непознато"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Отстрани"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 03519ba353..8505c8e5c0 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -27,7 +27,7 @@
     <string name="safemode_widget_error" msgid="4863470563535682004">"ନିରାପଦ ମୋଡରେ ୱିଜେଟ୍‌ ଅକ୍ଷମ କରାଗଲା"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"ଶର୍ଟକଟ୍‌ ଉପଲବ୍ଧ ନାହିଁ"</string>
     <string name="home_screen" msgid="5629429142036709174">"ମୂଳପୃଷ୍ଠା"</string>
-    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"ସ୍ପ୍ଲିଟ୍ ସ୍କ୍ରିନ୍"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"ସ୍କ୍ରିନ‌କୁ ସ୍ପ୍ଲିଟ୍ କରନ୍ତୁ"</string>
     <string name="long_press_widget_to_add" msgid="3587712543577675817">"ଏକ ୱିଜେଟକୁ ମୁଭ୍ କରିବା ପାଇଁ ସ୍ପର୍ଶ କରି ଧରି ରଖନ୍ତୁ।"</string>
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ଏକ ୱିଜେଟକୁ ମୁଭ୍ କରିବା ପାଇଁ ଦୁଇଥର-ଟାପ୍ କରି ଧରି ରଖନ୍ତୁ କିମ୍ବା କଷ୍ଟମ୍ କାର୍ଯ୍ୟଗୁଡ଼ିକୁ ବ୍ୟବହାର କରନ୍ତୁ।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 5879f91f3f..9e60efbbf0 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -106,7 +106,7 @@
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Slogi in ozadja"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Domače nastavitve"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Onemogočil skrbnik."</string>
-    <string name="allow_rotation_title" msgid="7728578836261442095">"Omogočanje sukanja začetnega zaslona"</string>
+    <string name="allow_rotation_title" msgid="7728578836261442095">"Omogoči sukanje začetnega zaslona"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"Ko se telefon zasuka"</string>
     <string name="notification_dots_title" msgid="9062440428204120317">"Obvestilne pike"</string>
     <string name="notification_dots_desc_on" msgid="1679848116452218908">"Vklopljeno"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index f2c16b4667..1ed8070f89 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -100,7 +100,7 @@
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stilet dhe imazhet e sfondit"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Cilësimet e ekranit bazë"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Çaktivizuar nga administratori"</string>
-    <string name="allow_rotation_title" msgid="7728578836261442095">"Lejo rrotullimin e ekranit kryesor"</string>
+    <string name="allow_rotation_title" msgid="7728578836261442095">"Lejo rrotullimin e ekranit bazë"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"Kur telefoni rrotullohet"</string>
     <string name="notification_dots_title" msgid="9062440428204120317">"Pikat e njoftimeve"</string>
     <string name="notification_dots_desc_on" msgid="1679848116452218908">"Aktiv"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index a3c7256b69..344f455e39 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -100,7 +100,7 @@
     <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"స్ట‌యిల్స్‌ &amp; వాల్‌పేపర్‌లు"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"హోమ్ సెట్టింగ్‌లు"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"మీ నిర్వాహకులు నిలిపివేసారు"</string>
-    <string name="allow_rotation_title" msgid="7728578836261442095">"హోమ్ స్క్రీన్ భ్రమణాన్ని అనుమతించండి"</string>
+    <string name="allow_rotation_title" msgid="7728578836261442095">"హోమ్ స్క్రీన్ రొటేషన్‌ను అనుమతించండి"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"ఫోన్‌‌ను తిప్పినప్పుడు"</string>
     <string name="notification_dots_title" msgid="9062440428204120317">"నోటిఫికేషన్ డాట్‌లు"</string>
     <string name="notification_dots_desc_on" msgid="1679848116452218908">"ఆన్"</string>
-- 
GitLab


From 5ee8b330dc78a942e6e8e290ee790e5995945486 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Fri, 23 Apr 2021 12:45:44 +0100
Subject: [PATCH 0968/1664] Fix recommended widget table height calculation

Include the widget preview padding in the height calculation

Test: Run AddWidgetTest
Bug: 186138174
Change-Id: Iebb7ebb6ba1c6fc527ba94440bc16f84f63017b4
---
 .../widget/picker/WidgetsRecommendationTableLayout.java      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
index 1aefe41f7b..18f1be3c90 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
@@ -43,6 +43,7 @@ public final class WidgetsRecommendationTableLayout extends TableLayout {
     private static final float DOWN_SCALE_RATIO = 0.9f;
     private static final float MAX_DOWN_SCALE_RATIO = 0.5f;
     private final float mWidgetCellTextViewsHeight;
+    private final float mWidgetPreviewPadding;
 
     private float mRecommendationTableMaxHeight = Float.MAX_VALUE;
     @Nullable private OnLongClickListener mWidgetCellOnLongClickListener;
@@ -57,6 +58,8 @@ public final class WidgetsRecommendationTableLayout extends TableLayout {
         super(context, attrs);
         // There are 1 row for title, 1 row for dimension and 2 rows for description.
         mWidgetCellTextViewsHeight = 4 * getResources().getDimension(R.dimen.widget_cell_font_size);
+        mWidgetPreviewPadding = 2 * getResources()
+                .getDimensionPixelSize(R.dimen.widget_preview_shortcut_padding);
     }
 
     /** Sets a {@link android.view.View.OnLongClickListener} for all widget cells in this table. */
@@ -147,7 +150,7 @@ public final class WidgetsRecommendationTableLayout extends TableLayout {
             float rowHeight = 0;
             for (int j = 0; j < widgetItems.size(); j++) {
                 float previewHeight = widgetItems.get(j).spanY * deviceProfile.cellHeightPx
-                        * previewScale;
+                        * previewScale + mWidgetPreviewPadding;
                 rowHeight = Math.max(rowHeight, previewHeight + mWidgetCellTextViewsHeight);
             }
             totalHeight += rowHeight;
-- 
GitLab


From c986767124d7f4a6b2b27408a1d1856cc9dcb71c Mon Sep 17 00:00:00 2001
From: Cyrus Boadway <boadway@google.com>
Date: Tue, 20 Apr 2021 14:32:00 +0000
Subject: [PATCH 0969/1664] Add a mechanism to temporarily defer App Widget
 updates

Provides a mechanism to temporarily block app widget updates to a
particular app widget for a limited time.

Bug: 169042867
Test: manual
Change-Id: I35bf9cb4bfe99b2f371ae8fc3db09e6fcc773752
---
 .../widget/LauncherAppWidgetHostView.java     | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
index f77c740032..620604a4d1 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
@@ -72,6 +72,8 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
 
     // Maintains a list of widget ids which are supposed to be auto advanced.
     private static final SparseBooleanArray sAutoAdvanceWidgetIds = new SparseBooleanArray();
+    // Maximum duration for which updates can be deferred.
+    private static final long UPDATE_LOCK_TIMEOUT_MILLIS = 1000;
 
     protected final LayoutInflater mInflater;
 
@@ -110,6 +112,9 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
             }
         }
     };
+    private final Object mUpdateLock = new Object();
+    private long mDeferUpdatesUntilMillis = 0;
+    private RemoteViews mMostRecentRemoteViews;
 
     public LauncherAppWidgetHostView(Context context) {
         super(context);
@@ -165,6 +170,11 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
 
     @Override
     public void updateAppWidget(RemoteViews remoteViews) {
+        synchronized (mUpdateLock) {
+            mMostRecentRemoteViews = remoteViews;
+            if (SystemClock.uptimeMillis() < mDeferUpdatesUntilMillis) return;
+        }
+
         super.updateAppWidget(remoteViews);
 
         // The provider info or the views might have changed.
@@ -198,6 +208,34 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         return false;
     }
 
+    /**
+     * Begin deferring the application of any {@link RemoteViews} updates made through
+     * {@link #updateAppWidget(RemoteViews)} until {@link #endDeferringUpdates()} has been called or
+     * the next {@link #updateAppWidget(RemoteViews)} call after {@link #UPDATE_LOCK_TIMEOUT_MILLIS}
+     * have elapsed.
+     */
+    public void beginDeferringUpdates() {
+        synchronized (mUpdateLock) {
+            mDeferUpdatesUntilMillis = SystemClock.uptimeMillis() + UPDATE_LOCK_TIMEOUT_MILLIS;
+        }
+    }
+
+    /**
+     * Stop deferring the application of {@link RemoteViews} updates made through
+     * {@link #updateAppWidget(RemoteViews)} and apply the most recently received update.
+     */
+    public void endDeferringUpdates() {
+        RemoteViews remoteViews;
+        synchronized (mUpdateLock) {
+            mDeferUpdatesUntilMillis = 0;
+            remoteViews = mMostRecentRemoteViews;
+            mMostRecentRemoteViews = null;
+        }
+        if (remoteViews != null) {
+            updateAppWidget(remoteViews);
+        }
+    }
+
     public boolean onInterceptTouchEvent(MotionEvent ev) {
         if (ev.getAction() == MotionEvent.ACTION_DOWN) {
             DragLayer dragLayer = mLauncher.getDragLayer();
-- 
GitLab


From 283a0eeddc7ac995f873870dd0538c778f5824a7 Mon Sep 17 00:00:00 2001
From: Pat Manning <patmanning@google.com>
Date: Wed, 31 Mar 2021 21:10:31 +0000
Subject: [PATCH 0970/1664] Animate overview grid task dismissal when shifting
 tasks.

- Animate tasks from previous dismissal translations to current translations
with staggered durations.

Test: manual
Bug: 182579190
Fix: 182579190
Change-Id: Ie0759b9896f6eb70bed1fc99961937dd314a4694
---
 .../android/quickstep/views/RecentsView.java  | 116 +++++++++++++++---
 1 file changed, 96 insertions(+), 20 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 790c6551cf..7012e87457 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -328,6 +328,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     private float mFullscreenScale;
 
     private static final int DISMISS_TASK_DURATION = 300;
+    private static final int DISMISS_TASK_TRANSLATION_DURATION = 200;
+    private static final int ADDITIONAL_DISMISS_TASK_TRANSLATION_DURATION = 75;
     private static final int ADDITION_TASK_DURATION = 200;
     // The threshold at which we update the SystemUI flags when animating from the task into the app
     public static final float UPDATE_SYSUI_FLAGS_THRESHOLD = 0.85f;
@@ -365,15 +367,13 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     protected float mTaskViewsPrimaryTranslation = 0;
     // Progress from 0 to 1 where 0 is a carousel and 1 is a 2 row grid.
     private float mGridProgress = 0;
+    private final IntSet mTopRowIdSet = new IntSet();
 
     // The GestureEndTarget that is still in progress.
     protected GestureState.GestureEndTarget mCurrentGestureEndTarget;
 
-    IntSet mTopIdSet = new IntSet();
-
     private int mOverScrollShift = 0;
 
-
     /**
      * TODO: Call reloadIdNeeded in onTaskStackChanged.
      */
@@ -1299,7 +1299,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         }
         mClearAllButton.setFullscreenTranslationPrimary(accumulatedTranslationX);
 
-        updateGridProperties(/*isTaskDismissal=*/false);
+        updateGridProperties();
     }
 
     public void getTaskSize(Rect outRect) {
@@ -1652,7 +1652,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             // When switching to tasks in quick switch, ensures the snapped page's scroll maintain
             // invariant between quick switch and overview grid, to ensure a smooth animation
             // transition.
-            updateGridProperties(/*isTaskDismissal=*/false);
+            updateGridProperties();
         }
     }
 
@@ -1825,13 +1825,26 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         }
     }
 
+    /** Updates TaskView and ClearAllButtion scaling and translation required to turn into grid
+     * layout.
+     * This method is used when no task dismissal has occurred.
+     */
+    private void updateGridProperties() {
+        updateGridProperties(null, -1);
+    }
+
     /**
      * Updates TaskView and ClearAllButton scaling and translation required to turn into grid
      * layout.
      * This method only calculates the potential position and depends on {@link #setGridProgress} to
-     * apply the actual scaling and translation.
+     * apply the actual scaling and translation. This adds task translation animations in the case
+     * of task dismissals: e.g. when dismissedTask is not null.
+     *
+     * @param dismissedTask the TaskView dismissed, possibly null
+     * @param dismissedIndex the index at which the dismissedTask was prior to dismissal, if no
+     *                       dismissal occurred, this is unused
      */
-    private void updateGridProperties(boolean isTaskDismissal) {
+    private void updateGridProperties(TaskView dismissedTask, int dismissedIndex) {
         int taskCount = getTaskViewCount();
         if (taskCount == 0) {
             return;
@@ -1858,8 +1871,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         int snappedPage = getNextPage();
         TaskView snappedTaskView = getTaskViewAtByAbsoluteIndex(snappedPage);
 
+        boolean isTaskDismissal = dismissedTask != null;
+        float dismissedTaskWidth =
+                isTaskDismissal ? dismissedTask.getLayoutParams().width + mPageSpacing : 0;
+
         if (!isTaskDismissal) {
-            mTopIdSet.clear();
+            mTopRowIdSet.clear();
         }
         for (int i = 0; i < taskCount; i++) {
             TaskView taskView = getTaskViewAt(i);
@@ -1894,13 +1911,14 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                     // calculate the distance focused task need to shift.
                     focusedTaskShift += mIsRtl ? taskWidthAndSpacing : -taskWidthAndSpacing;
                 }
-                boolean isTopRow = isTaskDismissal ? mTopIdSet.contains(taskView.getTask().key.id)
+                int taskId = taskView.getTask().key.id;
+                boolean isTopRow = isTaskDismissal ? mTopRowIdSet.contains(taskId)
                         : topRowWidth <= bottomRowWidth;
                 if (isTopRow) {
                     gridTranslations[i] += topAccumulatedTranslationX;
                     topRowWidth += taskWidthAndSpacing;
                     topSet.add(i);
-                    mTopIdSet.add(taskView.getTask().key.id);
+                    mTopRowIdSet.add(taskId);
 
                     taskView.setGridTranslationY(taskGridVerticalDiff);
 
@@ -1954,17 +1972,55 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             snappedTaskGridTranslationX = gridTranslations[snappedPage - mTaskViewStartIndex];
         }
 
-
+        // Animate task dismissTranslationX for tasks with index >= dismissed index and in the
+        // same row as the dismissed index, or if the dismissed task was the focused task. Offset
+        // successive task dismissal durations for a staggered effect.
+        ArrayList<Animator> gridTranslationAnimators = new ArrayList<>();
+        boolean isFocusedTaskDismissed =
+                isTaskDismissal && dismissedTask.getTask().key.id == mFocusedTaskId;
         for (int i = 0; i < taskCount; i++) {
             TaskView taskView = getTaskViewAt(i);
+            if (isFocusedTaskDismissed || (i >= dismissedIndex && isSameGridRow(dismissedTask,
+                    taskView))) {
+                Animator taskDismissAnimator = ObjectAnimator.ofFloat(taskView,
+                        taskView.getPrimaryDismissTranslationProperty(),
+                        mIsRtl ? -dismissedTaskWidth : dismissedTaskWidth, 0f);
+                int additionalTranslationDuration =
+                        i >= dismissedIndex ? (ADDITIONAL_DISMISS_TASK_TRANSLATION_DURATION * (
+                                (i - dismissedIndex) / 2)) : 0;
+                taskDismissAnimator.setDuration(
+                        DISMISS_TASK_TRANSLATION_DURATION + additionalTranslationDuration);
+                gridTranslationAnimators.add(taskDismissAnimator);
+            }
             taskView.setGridTranslationX(gridTranslations[i] - snappedTaskGridTranslationX);
             taskView.setNonFullscreenTranslationX(snappedTaskFullscreenScrollAdjustment);
         }
+        AnimatorSet gridTranslationAnimatorSet = new AnimatorSet();
+        gridTranslationAnimatorSet.playTogether(gridTranslationAnimators);
+        gridTranslationAnimatorSet.addListener(new AnimatorListenerAdapter() {
+            @Override
+            // Allow the actions view to display again once in focus mode
+            public void onAnimationEnd(Animator animation) {
+                super.onAnimationEnd(animation);
+                if (getFocusedTaskView() == null) {
+                    mActionsView.getScrollAlpha().setValue(1);
+                }
+            }
 
-        // Use the accumulated translation of the longer row.
-        float clearAllAccumulatedTranslation = mIsRtl ? Math.max(topAccumulatedTranslationX,
-                bottomAccumulatedTranslationX) : Math.min(topAccumulatedTranslationX,
-                bottomAccumulatedTranslationX);
+            @Override
+            // Hide the actions view if not in focus mode
+            public void onAnimationStart(Animator animation) {
+                super.onAnimationStart(animation);
+                if (getFocusedTaskView() == null) {
+                    mActionsView.getScrollAlpha().setValue(0);
+                }
+            }
+        });
+        gridTranslationAnimatorSet.start();
+
+        // Use the accumulated translation of the row containing the last task.
+        float clearAllAccumulatedTranslation = topSet.contains(taskCount - 1)
+                ? topAccumulatedTranslationX : bottomAccumulatedTranslationX;
 
         // If the last task is on the shorter row, ClearAllButton will embed into the shorter row
         // which is not what we want. Compensate the width difference of the 2 rows in that case.
@@ -1982,13 +2038,14 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 mIsRtl ? -shorterRowCompensation : shorterRowCompensation;
 
         // If the total width is shorter than one grid's width, move ClearAllButton further away
-        // accordingly.
+        // accordingly. Update longRowWidth if ClearAllButton has been moved.
         float clearAllShortTotalCompensation = 0;
         int longRowWidth = Math.max(topRowWidth, bottomRowWidth);
         if (longRowWidth < mLastComputedGridSize.width()) {
             float shortTotalCompensation = mLastComputedGridSize.width() - longRowWidth;
             clearAllShortTotalCompensation =
                     mIsRtl ? -shortTotalCompensation : shortTotalCompensation;
+            longRowWidth = mLastComputedGridSize.width();
         }
 
         float clearAllTotalTranslationX =
@@ -2021,6 +2078,19 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         setGridProgress(mGridProgress);
     }
 
+    private boolean isSameGridRow(TaskView taskView1, TaskView taskView2) {
+        if (taskView1 == null || taskView2 == null) {
+            return false;
+        }
+        int taskId1 = taskView1.getTask().key.id;
+        int taskId2 = taskView2.getTask().key.id;
+        if (taskId1 == mFocusedTaskId || taskId2 == mFocusedTaskId) {
+            return false;
+        }
+        return (mTopRowIdSet.contains(taskId1) && mTopRowIdSet.contains(taskId2)) || (
+                !mTopRowIdSet.contains(taskId1) && !mTopRowIdSet.contains(taskId2));
+    }
+
     /**
      * Moves TaskView and ClearAllButton between carousel and 2 row grid.
      *
@@ -2231,8 +2301,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                     }
 
                     int pageToSnapTo = mCurrentPage;
-                    if (draggedIndex < pageToSnapTo ||
-                            pageToSnapTo == (getTaskViewCount() - 1)) {
+                    // Snap to start if focused task was dismissed, as after quick switch it could
+                    // be at any page but the focused task always displays at the start.
+                    if (taskView.getTask().key.id == mFocusedTaskId) {
+                        pageToSnapTo = mTaskViewStartIndex;
+                    } else if (draggedIndex < pageToSnapTo || pageToSnapTo == (getTaskViewCount()
+                            - 1)) {
                         pageToSnapTo -= 1;
                     }
                     removeViewInLayout(taskView);
@@ -2243,7 +2317,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                     } else {
                         snapToPageImmediately(pageToSnapTo);
                         // Grid got messed up, reapply.
-                        updateGridProperties(/*isTaskDismissal=*/true);
+                        updateGridProperties(taskView, draggedIndex - mTaskViewStartIndex);
                         if (showAsGrid() && getFocusedTaskView() == null) {
                             animateActionsViewOut();
                         }
@@ -2252,7 +2326,9 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                     // immediately available.
                     onLayout(false /*  changed */, getLeft(), getTop(), getRight(), getBottom());
                 }
-                resetTaskVisuals();
+                if (!showAsGrid()) {
+                    resetTaskVisuals();
+                }
                 onDismissAnimationEnds();
                 mPendingAnimation = null;
             }
-- 
GitLab


From af4ca9058727b539fa1f8fcb0fb6e3db6451ff0a Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 16 Apr 2021 13:06:16 -0700
Subject: [PATCH 0971/1664] Redraw live tile in updatePageOffsets()

Also finish recents controller in RecentsView#reset() if it hasn't
been already.

Test: in 2 button mode, swipe up from overview when a live tile is
running, ensure it moves offscreen with its TaskView; after swiping
from overview to home, tap nav bar to ensure controller was finished
Test2: in 0 button mode, open Maps, start directions, swipe up to
home and ensure PiP starts

Fixes: 185588376
Change-Id: I03c18b14b4f55f1f09ce3bc442de23c94aa170bf
---
 .../com/android/quickstep/views/RecentsView.java    | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index d39c58b9d9..5761dfbb06 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1516,7 +1516,14 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         mTaskListChangeId = -1;
         mFocusedTaskId = -1;
 
-        mRecentsAnimationController = null;
+        if (mRecentsAnimationController != null) {
+            if (LIVE_TILE.get() && mEnableDrawingLiveTile) {
+                // We are still drawing the live tile, finish it now to clean up.
+                finishRecentsAnimation(true /* toRecents */, null);
+            } else {
+                mRecentsAnimationController = null;
+            }
+        }
         mLiveTileParams.setTargetSet(null);
         mLiveTileTaskViewSimulator.setDrawsBelowRecents(true);
 
@@ -2621,6 +2628,10 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                     ? ((TaskView) child).getPrimaryTaskOffsetTranslationProperty()
                     : mOrientationHandler.getPrimaryViewTranslate();
             translationProperty.set(child, totalTranslation);
+            if (LIVE_TILE.get() && mEnableDrawingLiveTile && i == getRunningTaskIndex()) {
+                mLiveTileTaskViewSimulator.taskPrimaryTranslation.value = totalTranslation;
+                redrawLiveTile();
+            }
         }
         updateCurveProperties();
     }
-- 
GitLab


From ad4120494661eaaef3ab16eaf58bda03b706d3b7 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 23 Apr 2021 10:48:17 -0700
Subject: [PATCH 0972/1664] Manage ref to transition manager from binder object

Bug: 186121207
Test: Presubmit
Change-Id: I14735708f1368e2b008e1e8d44273d569219e5df
---
 .../launcher3/QuickstepTransitionManager.java | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 827eb7d0bb..fe413af708 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -172,6 +172,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
     private final float mClosingWindowTransY;
     private final float mMaxShadowRadius;
 
+    private final StartingWindowListener mStartingWindowListener = new StartingWindowListener();
+
     private DeviceProfile mDeviceProfile;
 
     private RemoteAnimationProvider mRemoteAnimationProvider;
@@ -221,13 +223,9 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                 }
             };
 
+            mStartingWindowListener.setTransitionManager(this);
             SystemUiProxy.INSTANCE.get(mLauncher).setStartingWindowListener(
-                    new IStartingWindowListener.Stub() {
-                        @Override
-                        public void onTaskLaunching(int taskId, int supportedType) {
-                            mTypeForTaskId.put(taskId, supportedType);
-                        }
-                    });
+                    mStartingWindowListener);
         }
     }
 
@@ -819,6 +817,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
     public void onActivityDestroyed() {
         unregisterRemoteAnimations();
         unregisterRemoteTransitions();
+        mStartingWindowListener.setTransitionManager(null);
         SystemUiProxy.INSTANCE.getNoCreate().setStartingWindowListener(null);
     }
 
@@ -1240,4 +1239,17 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
             cropCenterYEnd = windowTargetBounds.centerY();
         }
     }
+
+    private static class StartingWindowListener extends IStartingWindowListener.Stub {
+        private QuickstepTransitionManager mTransitionManager;
+
+        public void setTransitionManager(QuickstepTransitionManager transitionManager) {
+            mTransitionManager = transitionManager;
+        }
+
+        @Override
+        public void onTaskLaunching(int taskId, int supportedType) {
+            mTransitionManager.mTypeForTaskId.put(taskId, supportedType);
+        }
+    }
 }
-- 
GitLab


From fd6d942220499bb218a99d1dd9cb85b870de706d Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Thu, 22 Apr 2021 19:10:21 +0100
Subject: [PATCH 0973/1664] Pass WindowContext to DisplayInfoChangeListener

- WindowContext (or updated DisplayContext for Pre-S) contains updated Resources to be used for the listener

Fixes: 181215299
Fixes: 176656141
Test: Swap between large/small screen, large sreen UI is seen
Test: Swap between font size, launcher icon text is updated
Test: Start secondary home
Test: Repeat the above tests with Utilities.ATLEAST_S hardcoded to false
Change-Id: Ib33025ac0276c84fe2b3213e9946721e5988e3da
---
 .../launcher3/BaseQuickstepLauncher.java      | 10 ++++----
 .../RecentsAnimationDeviceState.java          |  4 ++--
 .../quickstep/RotationTouchHelper.java        |  4 ++--
 .../launcher3/BaseDraggingActivity.java       |  3 ++-
 .../launcher3/InvariantDeviceProfile.java     |  6 ++---
 .../launcher3/util/DisplayController.java     | 23 ++++++++++++-------
 6 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index caf52e3542..7aae38c7f1 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -27,12 +27,11 @@ import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SY
 import android.animation.AnimatorSet;
 import android.animation.ValueAnimator;
 import android.app.ActivityOptions;
+import android.content.Context;
 import android.content.Intent;
 import android.content.IntentSender;
-import android.os.Binder;
 import android.os.Bundle;
 import android.os.CancellationSignal;
-import android.os.IBinder;
 import android.view.View;
 
 import androidx.annotation.Nullable;
@@ -41,7 +40,6 @@ import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.model.WellbeingModel;
 import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.popup.SystemShortcut;
 import com.android.launcher3.proxy.ProxyActivityStarter;
 import com.android.launcher3.proxy.StartActivityParams;
@@ -73,7 +71,6 @@ import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Stream;
 
@@ -240,8 +237,9 @@ public abstract class BaseQuickstepLauncher extends Launcher
     }
 
     @Override
-    public void onDisplayInfoChanged(DisplayController.Info info, int flags) {
-        super.onDisplayInfoChanged(info, flags);
+    public void onDisplayInfoChanged(Context context, DisplayController.Info info,
+            int flags) {
+        super.onDisplayInfoChanged(context, info, flags);
         if ((flags & CHANGE_SIZE) != 0) {
             addTaskbarIfNecessary();
         }
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index 6cf12a3865..b4f13307a4 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -241,7 +241,7 @@ public class RecentsAnimationDeviceState implements
     public void onNavigationModeChanged(SysUINavigationMode.Mode newMode) {
         mDisplayController.removeChangeListener(this);
         mDisplayController.addChangeListener(this);
-        onDisplayInfoChanged(mDisplayController.getInfo(), CHANGE_ALL);
+        onDisplayInfoChanged(mContext, mDisplayController.getInfo(), CHANGE_ALL);
 
         if (newMode == NO_BUTTON) {
             mExclusionListener.register();
@@ -254,7 +254,7 @@ public class RecentsAnimationDeviceState implements
     }
 
     @Override
-    public void onDisplayInfoChanged(Info info, int flags) {
+    public void onDisplayInfoChanged(Context context, Info info, int flags) {
         if (info.id != getDisplayId() || flags == CHANGE_FRAME_DELAY) {
             // ignore displays that aren't running launcher and frame refresh rate changes
             return;
diff --git a/quickstep/src/com/android/quickstep/RotationTouchHelper.java b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
index d4ad1760ef..f4688a1dc1 100644
--- a/quickstep/src/com/android/quickstep/RotationTouchHelper.java
+++ b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
@@ -225,7 +225,7 @@ public class RotationTouchHelper implements
     public void onNavigationModeChanged(SysUINavigationMode.Mode newMode) {
         mDisplayController.removeChangeListener(this);
         mDisplayController.addChangeListener(this);
-        onDisplayInfoChanged(mDisplayController.getInfo(), CHANGE_ALL);
+        onDisplayInfoChanged(mContext, mDisplayController.getInfo(), CHANGE_ALL);
 
         mOrientationTouchTransformer.setNavigationMode(newMode, mDisplayController.getInfo(),
             mContext.getResources());
@@ -243,7 +243,7 @@ public class RotationTouchHelper implements
     }
 
     @Override
-    public void onDisplayInfoChanged(Info info, int flags) {
+    public void onDisplayInfoChanged(Context context, Info info, int flags) {
         if (info.id != mDisplayId|| flags == CHANGE_FRAME_DELAY) {
             // ignore displays that aren't running launcher and frame refresh rate changes
             return;
diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java
index cc9f594257..4c5f9f247f 100644
--- a/src/com/android/launcher3/BaseDraggingActivity.java
+++ b/src/com/android/launcher3/BaseDraggingActivity.java
@@ -21,6 +21,7 @@ import static com.android.launcher3.util.DisplayController.CHANGE_ROTATION;
 
 import android.app.ActivityOptions;
 import android.content.ActivityNotFoundException;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.LauncherApps;
 import android.content.res.Configuration;
@@ -296,7 +297,7 @@ public abstract class BaseDraggingActivity extends BaseActivity
     }
 
     @Override
-    public void onDisplayInfoChanged(Info info, int flags) {
+    public void onDisplayInfoChanged(Context context, Info info, int flags) {
         if ((flags & CHANGE_ROTATION) != 0 && mDeviceProfile.updateIsSeascape(this)) {
             reapplyUi();
         }
diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index 11dc0c4736..1332e14af0 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -203,9 +203,9 @@ public class InvariantDeviceProfile {
                 .apply();
 
         DisplayController.INSTANCE.get(context).addChangeListener(
-                (info, flags) -> {
+                (displayContext, info, flags) -> {
                     if ((flags & (CHANGE_SIZE | CHANGE_DENSITY)) != 0) {
-                        onConfigChanged(context);
+                        onConfigChanged(displayContext);
                     }
                 });
         mOverlayMonitor = new OverlayMonitor(context);
@@ -226,7 +226,7 @@ public class InvariantDeviceProfile {
      */
     public InvariantDeviceProfile(Context context, Display display) {
         // Ensure that the main device profile is initialized
-        InvariantDeviceProfile originalProfile = INSTANCE.get(context);
+        INSTANCE.get(context);
         String gridName = getCurrentGridName(context);
 
         // Get the display info based on default display and interpolate it to existing display
diff --git a/src/com/android/launcher3/util/DisplayController.java b/src/com/android/launcher3/util/DisplayController.java
index 07c89b9b43..75c089e754 100644
--- a/src/com/android/launcher3/util/DisplayController.java
+++ b/src/com/android/launcher3/util/DisplayController.java
@@ -87,7 +87,7 @@ public class DisplayController implements DisplayListener, ComponentCallbacks {
                     new IntentFilter(Intent.ACTION_CONFIGURATION_CHANGED));
         }
 
-        mInfo = createInfo(display);
+        mInfo = new Info(getContext(display), display);
         mDM.registerDisplayListener(this, UI_HELPER_EXECUTOR.getHandler());
     }
 
@@ -125,7 +125,13 @@ public class DisplayController implements DisplayListener, ComponentCallbacks {
      */
     public interface DisplayInfoChangeListener {
 
-        void onDisplayInfoChanged(Info info, int flags);
+        /**
+         * Invoked when display info has changed.
+         * @param context updated context associated with the display.
+         * @param info updated display information.
+         * @param flags bitmask indicating type of change.
+         */
+        void onDisplayInfoChanged(Context context, Info info, int flags);
     }
 
     /**
@@ -172,14 +178,15 @@ public class DisplayController implements DisplayListener, ComponentCallbacks {
         return mInfo;
     }
 
-    private Info createInfo(Display display) {
-        return new Info(mContext.createDisplayContext(display), display);
+    private Context getContext(Display display) {
+        return Utilities.ATLEAST_S ? mWindowContext : mContext.createDisplayContext(display);
     }
 
     @AnyThread
     private void handleInfoChange(Display display) {
         Info oldInfo = mInfo;
-        Info newInfo = createInfo(display);
+        Context context = getContext(display);
+        Info newInfo = new Info(context, display);
         int change = 0;
         if (newInfo.hasDifferentSize(oldInfo)) {
             change |= CHANGE_SIZE;
@@ -197,13 +204,13 @@ public class DisplayController implements DisplayListener, ComponentCallbacks {
         if (change != 0) {
             mInfo = newInfo;
             final int flags = change;
-            MAIN_EXECUTOR.execute(() -> notifyChange(flags));
+            MAIN_EXECUTOR.execute(() -> notifyChange(context, flags));
         }
     }
 
-    private void notifyChange(int flags) {
+    private void notifyChange(Context context, int flags) {
         for (int i = mListeners.size() - 1; i >= 0; i--) {
-            mListeners.get(i).onDisplayInfoChanged(mInfo, flags);
+            mListeners.get(i).onDisplayInfoChanged(context, mInfo, flags);
         }
     }
 
-- 
GitLab


From d4dd48acc94243230df6f94495569d4d973d3242 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 23 Apr 2021 11:55:34 -0700
Subject: [PATCH 0974/1664] Add null check to NavigationModeFeatureFlag

Test: none
Fixes: 185790043
Change-Id: I591c18df0394e7ab4286687fffe8713a4507373e
---
 .../com/android/quickstep/util/NavigationModeFeatureFlag.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/util/NavigationModeFeatureFlag.java b/quickstep/src/com/android/quickstep/util/NavigationModeFeatureFlag.java
index 351adf4265..c527be3e2a 100644
--- a/quickstep/src/com/android/quickstep/util/NavigationModeFeatureFlag.java
+++ b/quickstep/src/com/android/quickstep/util/NavigationModeFeatureFlag.java
@@ -46,7 +46,8 @@ public class NavigationModeFeatureFlag implements
     }
 
     public boolean get() {
-        return mBasePredicate.get() && mSupported && mObserver.isHomeAndOverviewSame();
+        return mBasePredicate.get() && mSupported && mObserver != null
+                && mObserver.isHomeAndOverviewSame();
     }
 
     public void initialize(Context context) {
-- 
GitLab


From ebffb3cacfdb8a6920442a66538f88747df5d8cc Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Fri, 9 Apr 2021 12:04:29 -0400
Subject: [PATCH 0975/1664] Switch RecentsView to use regular animator update
 listener.

- No dependency on MultiValueUpdateListener.
Bug: 186253351
Test: manual, verify animation looks normal

Change-Id: Ia83da412ef802eaaf1b3b61b2d6be78799b08b0d
---
 .../android/quickstep/views/RecentsView.java  | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 3c171fed8c..b445f4f7dc 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -137,7 +137,6 @@ import com.android.quickstep.TaskViewUtils;
 import com.android.quickstep.ViewUtils;
 import com.android.quickstep.util.ActiveGestureLog;
 import com.android.quickstep.util.LayoutUtils;
-import com.android.quickstep.util.MultiValueUpdateListener;
 import com.android.quickstep.util.RecentsOrientedState;
 import com.android.quickstep.util.SplitScreenBounds;
 import com.android.quickstep.util.SurfaceTransactionApplier;
@@ -752,18 +751,16 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             ValueAnimator appAnimator = ValueAnimator.ofFloat(0, 1);
             appAnimator.setDuration(RECENTS_LAUNCH_DURATION);
             appAnimator.setInterpolator(ACCEL_DEACCEL);
-            appAnimator.addUpdateListener(new MultiValueUpdateListener() {
-                @Override
-                public void onUpdate(float percent) {
-                    SurfaceParams.Builder builder = new SurfaceParams.Builder(
-                            apps[apps.length - 1].leash);
-                    Matrix matrix = new Matrix();
-                    matrix.postScale(percent, percent);
-                    matrix.postTranslate(mActivity.getDeviceProfile().widthPx * (1 - percent) / 2,
-                            mActivity.getDeviceProfile().heightPx * (1 - percent) / 2);
-                    builder.withAlpha(percent).withMatrix(matrix);
-                    surfaceApplier.scheduleApply(builder.build());
-                }
+            appAnimator.addUpdateListener(valueAnimator -> {
+                float percent = valueAnimator.getAnimatedFraction();
+                SurfaceParams.Builder builder = new SurfaceParams.Builder(
+                        apps[apps.length - 1].leash);
+                Matrix matrix = new Matrix();
+                matrix.postScale(percent, percent);
+                matrix.postTranslate(mActivity.getDeviceProfile().widthPx * (1 - percent) / 2,
+                        mActivity.getDeviceProfile().heightPx * (1 - percent) / 2);
+                builder.withAlpha(percent).withMatrix(matrix);
+                surfaceApplier.scheduleApply(builder.build());
             });
             anim.play(appAnimator);
         } else {
-- 
GitLab


From 0fdd43ab0dbd72da2ab19cf6fffdc0ac94572604 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 23 Apr 2021 23:53:16 +0000
Subject: [PATCH 0976/1664] Revert "Revert "Default shell_starting_surface to
 true to match platform behavior.""

This reverts commit 250f568cb2aa719ae25feaa1e5b349ac372df9a1.

Reason for revert: b/186121207 should be fixed

Change-Id: Ia374d9ad251134979999d794331e3b375d183996
---
 .../src/com/android/launcher3/QuickstepTransitionManager.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 009ca27603..b72cf394c5 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -110,7 +110,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
     private static final String TAG = "QuickstepTransition";
 
     private static final boolean ENABLE_SHELL_STARTING_SURFACE =
-            SystemProperties.getBoolean("persist.debug.shell_starting_surface", false);
+            SystemProperties.getBoolean("persist.debug.shell_starting_surface", true);
 
     /** Duration of status bar animations. */
     public static final int STATUS_BAR_TRANSITION_DURATION = 120;
-- 
GitLab


From 0f8787db8038301608e39418a7b15610dbcac425 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Sat, 24 Apr 2021 19:28:20 +0000
Subject: [PATCH 0977/1664] Revert "Finish recents animation upon home
 rotation"

This reverts commit 9d5ee199528b7b74640c2c6e03914f3e515b089f.

Reason for revert: Broke a tapl test

Change-Id: Iafc513ca64f751d09c8606c072b29c589f030ad6
---
 .../src/com/android/quickstep/views/RecentsView.java     | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index e4fa1aa831..150ae02cf0 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2340,15 +2340,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     @Override
     protected void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
-        if (LIVE_TILE.get() && mRunningTaskId != -1) {
-            switchToScreenshot(
-                    () -> finishRecentsAnimation(true, this::onConfigurationChangedInternal));
-        } else {
-            onConfigurationChangedInternal();
-        }
-    }
-
-    private void onConfigurationChangedInternal() {
         final int rotation = mActivity.getDisplay().getRotation();
         if (mOrientationState.setRecentsRotation(rotation)) {
             updateOrientationHandler();
-- 
GitLab


From d7b6a429cd3d1eea3e1b6f6f9a9edf2cba10597b Mon Sep 17 00:00:00 2001
From: Bill Lin <lbill@google.com>
Date: Mon, 26 Apr 2021 13:00:00 +0000
Subject: [PATCH 0978/1664] Revert "2/ Resolve gesture one handed conflicts
 swipe up recents"

This reverts commit 789aa86617c99f290ec2cc25cb3539b0f4feaedf.

Reason for revert: for clarify b/186197537

Change-Id: Ia921d073c2ad4e427c5436370313c2095f2adea8
---
 .../src/com/android/quickstep/TouchInteractionService.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 417b6166d4..e9d2eb4632 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -506,8 +506,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
             }
             mRotationTouchHelper.setOrientationTransformIfNeeded(event);
 
-            if (!mDeviceState.isOneHandedModeActive()
-                    && mRotationTouchHelper.isInSwipeUpTouchRegion(event)) {
+            if (mRotationTouchHelper.isInSwipeUpTouchRegion(event)) {
                 if (TestProtocol.sDebugTracing) {
                     Log.d(TestProtocol.NO_SWIPE_TO_HOME,
                             "TouchInteractionService.onInputEvent:isInSwipeUpTouchRegion");
@@ -536,7 +535,8 @@ public class TouchInteractionService extends Service implements PluginListener<O
                             InputConsumer.NO_OP, mInputMonitorCompat,
                             mDeviceState,
                             event);
-                } else if (mDeviceState.canTriggerOneHandedAction(event)) {
+                } else if (mDeviceState.canTriggerOneHandedAction(event)
+                    && !mDeviceState.isOneHandedModeActive()) {
                     // Consume gesture event for triggering one handed feature.
                     mUncheckedConsumer = new OneHandedModeInputConsumer(this, mDeviceState,
                         InputConsumer.NO_OP, mInputMonitorCompat);
-- 
GitLab


From b7f5ab04ad51a0461204f1124a3599cb8dc98804 Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Thu, 15 Apr 2021 18:17:17 +0100
Subject: [PATCH 0979/1664] Fix few UI bugs in widget picker.

- Update colors for widget picker (b/184236316)
- Adjust padding according to mocks (b/184236316)
- Make sure view holders refresh corners in search mode. (b/185099541)
- Fix search bar shadow being cropped (b/183602001)

Bug: 184236316
Bug: 185099541
Bug: 183602001
Test: Manually tested
Change-Id: Ifa33e090cdf31c95db9c1145e623ef55c42dd52e
---
 .../widgets_picker_surface.xml                | 23 ++++++++++++++++++
 res/color-v31/widgets_picker_surface.xml      | 23 ++++++++++++++++++
 res/color/widgets_picker_surface.xml          | 23 ++++++++++++++++++
 res/drawable/widgets_list_bottom_ripple.xml   |  2 +-
 res/drawable/widgets_list_middle_ripple.xml   |  2 +-
 .../widgets_list_single_item_ripple.xml       |  2 +-
 res/drawable/widgets_list_top_ripple.xml      |  2 +-
 .../widgets_recommendation_background.xml     | 24 +++++++++++++++++++
 res/layout/widgets_full_sheet.xml             |  2 +-
 ..._full_sheet_search_and_recommendations.xml |  7 ++++--
 res/layout/widgets_list_row_header.xml        |  2 +-
 res/layout/widgets_table_container.xml        |  2 +-
 .../widget/picker/WidgetsDiffReporter.java    |  4 ++--
 13 files changed, 107 insertions(+), 11 deletions(-)
 create mode 100644 res/color-night-v31/widgets_picker_surface.xml
 create mode 100644 res/color-v31/widgets_picker_surface.xml
 create mode 100644 res/color/widgets_picker_surface.xml
 create mode 100644 res/drawable/widgets_recommendation_background.xml

diff --git a/res/color-night-v31/widgets_picker_surface.xml b/res/color-night-v31/widgets_picker_surface.xml
new file mode 100644
index 0000000000..fbc9e43828
--- /dev/null
+++ b/res/color-night-v31/widgets_picker_surface.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2021, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@android:color/system_neutral1_800" />
+</selector>
diff --git a/res/color-v31/widgets_picker_surface.xml b/res/color-v31/widgets_picker_surface.xml
new file mode 100644
index 0000000000..30f3032541
--- /dev/null
+++ b/res/color-v31/widgets_picker_surface.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2021, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@android:color/system_neutral1_500" android:lStar="98"/>
+</selector>
diff --git a/res/color/widgets_picker_surface.xml b/res/color/widgets_picker_surface.xml
new file mode 100644
index 0000000000..61501108f0
--- /dev/null
+++ b/res/color/widgets_picker_surface.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2021, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?android:attr/colorBackgroundFloating" />
+</selector>
diff --git a/res/drawable/widgets_list_bottom_ripple.xml b/res/drawable/widgets_list_bottom_ripple.xml
index 3a26091f14..72262d4d7c 100644
--- a/res/drawable/widgets_list_bottom_ripple.xml
+++ b/res/drawable/widgets_list_bottom_ripple.xml
@@ -30,7 +30,7 @@
     </item>
     <item android:id="@android:id/background">
         <shape android:shape="rectangle">
-            <solid android:color="?android:attr/colorBackground" />
+            <solid android:color="@color/widgets_picker_surface" />
             <corners
                 android:topLeftRadius="@dimen/widget_list_content_corner_radius"
                 android:topRightRadius="@dimen/widget_list_content_corner_radius"
diff --git a/res/drawable/widgets_list_middle_ripple.xml b/res/drawable/widgets_list_middle_ripple.xml
index da025d79bb..1136beafd2 100644
--- a/res/drawable/widgets_list_middle_ripple.xml
+++ b/res/drawable/widgets_list_middle_ripple.xml
@@ -31,7 +31,7 @@
 
     <item android:id="@android:id/background">
         <shape android:shape="rectangle">
-            <solid android:color="?android:attr/colorBackground" />
+            <solid android:color="@color/widgets_picker_surface" />
             <corners
                 android:topLeftRadius="@dimen/widget_list_content_corner_radius"
                 android:topRightRadius="@dimen/widget_list_content_corner_radius"
diff --git a/res/drawable/widgets_list_single_item_ripple.xml b/res/drawable/widgets_list_single_item_ripple.xml
index b8b6f42523..a82918e790 100644
--- a/res/drawable/widgets_list_single_item_ripple.xml
+++ b/res/drawable/widgets_list_single_item_ripple.xml
@@ -30,7 +30,7 @@
     </item>
     <item android:id="@android:id/background">
         <shape android:shape="rectangle">
-            <solid android:color="?android:attr/colorBackground" />
+            <solid android:color="@color/widgets_picker_surface" />
             <corners
                 android:topLeftRadius="@dimen/widget_list_top_bottom_corner_radius"
                 android:topRightRadius="@dimen/widget_list_top_bottom_corner_radius"
diff --git a/res/drawable/widgets_list_top_ripple.xml b/res/drawable/widgets_list_top_ripple.xml
index 6efc3e1789..4ad185c648 100644
--- a/res/drawable/widgets_list_top_ripple.xml
+++ b/res/drawable/widgets_list_top_ripple.xml
@@ -31,7 +31,7 @@
 
     <item android:id="@android:id/background">
         <shape android:shape="rectangle">
-            <solid android:color="?android:attr/colorBackground" />
+            <solid android:color="@color/widgets_picker_surface" />
             <corners
                 android:topLeftRadius="@dimen/widget_list_top_bottom_corner_radius"
                 android:topRightRadius="@dimen/widget_list_top_bottom_corner_radius"
diff --git a/res/drawable/widgets_recommendation_background.xml b/res/drawable/widgets_recommendation_background.xml
new file mode 100644
index 0000000000..b59de2778b
--- /dev/null
+++ b/res/drawable/widgets_recommendation_background.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2021, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<shape android:shape="rectangle"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/widgets_picker_surface" />
+    <corners android:radius="@dimen/widget_list_top_bottom_corner_radius"/>
+</shape>
\ No newline at end of file
diff --git a/res/layout/widgets_full_sheet.xml b/res/layout/widgets_full_sheet.xml
index 172284b4df..a01aa2c581 100644
--- a/res/layout/widgets_full_sheet.xml
+++ b/res/layout/widgets_full_sheet.xml
@@ -25,7 +25,7 @@
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?android:attr/colorBackgroundFloating"
+        android:background="?android:attr/colorBackground"
         android:elevation="4dp">
 
         <TextView
diff --git a/res/layout/widgets_full_sheet_search_and_recommendations.xml b/res/layout/widgets_full_sheet_search_and_recommendations.xml
index e5df175d3d..e322c6ca87 100644
--- a/res/layout/widgets_full_sheet_search_and_recommendations.xml
+++ b/res/layout/widgets_full_sheet_search_and_recommendations.xml
@@ -20,7 +20,8 @@
     android:layout_height="wrap_content"
     android:paddingHorizontal="16dp"
     android:layout_marginBottom="16dp"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:clipToPadding="false">
     <View
         android:id="@+id/collapse_handle"
         android:layout_width="48dp"
@@ -44,6 +45,8 @@
         android:id="@+id/recommended_widget_table"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@drawable/widgets_recommendation_background"
+        android:paddingVertical="8dp"
         android:layout_marginTop="16dp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 </LinearLayout>
diff --git a/res/layout/widgets_list_row_header.xml b/res/layout/widgets_list_row_header.xml
index 8259c16612..f4b413097b 100644
--- a/res/layout/widgets_list_row_header.xml
+++ b/res/layout/widgets_list_row_header.xml
@@ -19,7 +19,7 @@
     android:id="@+id/widgets_list_header"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="8dp"
+    android:layout_marginHorizontal="16dp"
     android:background="@drawable/widgets_list_middle_ripple"
     android:layout_marginBottom="@dimen/widget_list_entry_bottom_margin"
     android:paddingVertical="@dimen/widget_list_header_view_vertical_padding"
diff --git a/res/layout/widgets_table_container.xml b/res/layout/widgets_table_container.xml
index 0b5f0b9d6c..e63483ddd8 100644
--- a/res/layout/widgets_table_container.xml
+++ b/res/layout/widgets_table_container.xml
@@ -18,6 +18,6 @@
     android:id="@+id/widgets_table"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="8dp"
+    android:layout_marginHorizontal="16dp"
     android:background="@drawable/widgets_list_middle_ripple"
     android:layout_marginBottom="@dimen/widget_list_entry_bottom_margin"/>
diff --git a/src/com/android/launcher3/widget/picker/WidgetsDiffReporter.java b/src/com/android/launcher3/widget/picker/WidgetsDiffReporter.java
index 2366609b3f..42896ba350 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsDiffReporter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsDiffReporter.java
@@ -181,8 +181,8 @@ public class WidgetsDiffReporter {
         }
         if (newRow instanceof WidgetsListSearchHeaderEntry
                 && curRow instanceof WidgetsListSearchHeaderEntry) {
-            return ((WidgetsListSearchHeaderEntry) newRow).hasEntryUpdated()
-                    || !curRow.equals(newRow);
+            // Always refresh search header entries to reset rounded corners in their view holder.
+            return true;
         }
         return false;
     }
-- 
GitLab


From d8cc458867b1cf8004c8877fde8594a407e4694f Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Mon, 26 Apr 2021 14:42:44 -0400
Subject: [PATCH 0980/1664] Remove reliance on surface to update depth

- Also no longer resets depth on surface change, as depth is independent
  from blur.

This fixes the bug where depth is not accurately reflected.

Bug: 185680609
Bug: 185189176
Test: launch app and swipe home multiple times
      launch app and back gesture to home

Change-Id: I5e2f4ce08b8bf84b7356fbd080ae732875c5e04e
---
 .../launcher3/statehandlers/DepthController.java     | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
index 249ef3a3b0..59d0afa47f 100644
--- a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
+++ b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
@@ -158,11 +158,7 @@ public class DepthController implements StateHandler<LauncherState>,
      * Sets the specified app target surface to apply the blur to.
      */
     public void setSurfaceToApp(RemoteAnimationTargetCompat target) {
-        if (target != null) {
-            setSurface(target.leash);
-        } else {
-            setActivityStarted(mLauncher.isStarted());
-        }
+        setSurface(target == null ? null : target.leash);
     }
 
     private void setSurface(SurfaceControlCompat surface) {
@@ -170,9 +166,6 @@ public class DepthController implements StateHandler<LauncherState>,
             mSurface = surface;
             if (surface != null) {
                 setDepth(mDepth);
-            } else {
-                // If there is no surface, then reset the ratio
-                setDepth(0f);
             }
         }
     }
@@ -192,8 +185,7 @@ public class DepthController implements StateHandler<LauncherState>,
     @Override
     public void setStateWithAnimation(LauncherState toState, StateAnimationConfig config,
             PendingAnimation animation) {
-        if (mSurface == null
-                || config.hasAnimationFlag(SKIP_DEPTH_CONTROLLER)
+        if (config.hasAnimationFlag(SKIP_DEPTH_CONTROLLER)
                 || mIgnoreStateChangesDuringMultiWindowAnimation) {
             return;
         }
-- 
GitLab


From 32ca4c34768dfbaab92ae103b9078aa83fd36c34 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Mon, 26 Apr 2021 19:16:09 +0000
Subject: [PATCH 0981/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: If093427db67d1d6809f0ba59aac1a18ccddaf8f1
---
 res/values-ru/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 2e17d443aa..24aabc52c0 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -130,7 +130,7 @@
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Добавить на главный экран"</string>
     <string name="action_move_here" msgid="2170188780612570250">"Переместить элемент сюда"</string>
     <string name="item_added_to_workspace" msgid="4211073925752213539">"Элемент добавлен на главный экран"</string>
-    <string name="item_removed" msgid="851119963877842327">"Элемент удален"</string>
+    <string name="item_removed" msgid="851119963877842327">"Элемент удален."</string>
     <string name="undo" msgid="4151576204245173321">"Отменить"</string>
     <string name="action_move" msgid="4339390619886385032">"Переместить элемент"</string>
     <string name="move_to_empty_cell" msgid="2833711483015685619">"Переместить в ячейку <xliff:g id="NUMBER_0">%1$s</xliff:g> <xliff:g id="NUMBER_1">%2$s</xliff:g>"</string>
-- 
GitLab


From f2efcb53d0835db77f2f5d1716b4754ffb6d9cdc Mon Sep 17 00:00:00 2001
From: Becky Qiu <xuqiu@google.com>
Date: Mon, 26 Apr 2021 13:28:21 -0700
Subject: [PATCH 0982/1664] [Overview Sharing] Enable overview sharing for
 Droidfood.

Bug: 169772466
Test: no test needed.
Change-Id: Id717f1e81699488c4eb88e8ec2b3b634e28a8661
---
 src/com/android/launcher3/config/FeatureFlags.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 7d5ed60019..bad87043ef 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -151,7 +151,7 @@ public final class FeatureFlags {
             "ENABLE_OVERVIEW_SHARE", false, "Show Share button in Overview Actions");
 
     public static final BooleanFlag ENABLE_OVERVIEW_SHARING_TO_PEOPLE = getDebugFlag(
-            "ENABLE_OVERVIEW_SHARING_TO_PEOPLE", false,
+            "ENABLE_OVERVIEW_SHARING_TO_PEOPLE", true,
             "Show indicators for content on Overview to share with top people. ");
 
     public static final BooleanFlag ENABLE_OVERVIEW_CONTENT_PUSH = getDebugFlag(
-- 
GitLab


From c7d7410178d6339732bacd05d9393a4ce6add632 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 26 Apr 2021 22:18:35 +0100
Subject: [PATCH 0983/1664] Include recommended widgets table vertical padding
 in the height estimation

Test: run AddWidgetTest, AddConfigWidgetTest
Bug: 186450511
Change-Id: If306b569058edb3edb3c741199e9c0d96a88f412
---
 res/layout/widgets_full_sheet_search_and_recommendations.xml | 2 +-
 res/values/dimens.xml                                        | 1 +
 .../widget/picker/WidgetsRecommendationTableLayout.java      | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/res/layout/widgets_full_sheet_search_and_recommendations.xml b/res/layout/widgets_full_sheet_search_and_recommendations.xml
index e322c6ca87..bfce01d148 100644
--- a/res/layout/widgets_full_sheet_search_and_recommendations.xml
+++ b/res/layout/widgets_full_sheet_search_and_recommendations.xml
@@ -46,7 +46,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/widgets_recommendation_background"
-        android:paddingVertical="8dp"
+        android:paddingVertical="@dimen/recommended_widgets_table_vertical_padding"
         android:layout_marginTop="16dp"
         android:visibility="gone"/>
 </LinearLayout>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 8a160bd103..600a550700 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -118,6 +118,7 @@
     <dimen name="widget_cell_horizontal_padding">16dp</dimen>
     <dimen name="widget_cell_font_size">14sp</dimen>
 
+    <dimen name="recommended_widgets_table_vertical_padding">8dp</dimen>
 
     <dimen name="widget_list_top_bottom_corner_radius">28dp</dimen>
     <dimen name="widget_list_content_corner_radius">4dp</dimen>
diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
index 18f1be3c90..2d3f1a0188 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
@@ -42,6 +42,7 @@ public final class WidgetsRecommendationTableLayout extends TableLayout {
     private static final String TAG = "WidgetsRecommendationTableLayout";
     private static final float DOWN_SCALE_RATIO = 0.9f;
     private static final float MAX_DOWN_SCALE_RATIO = 0.5f;
+    private final float mWidgetsRecommendationTableVerticalPadding;
     private final float mWidgetCellTextViewsHeight;
     private final float mWidgetPreviewPadding;
 
@@ -57,6 +58,8 @@ public final class WidgetsRecommendationTableLayout extends TableLayout {
     public WidgetsRecommendationTableLayout(Context context, AttributeSet attrs) {
         super(context, attrs);
         // There are 1 row for title, 1 row for dimension and 2 rows for description.
+        mWidgetsRecommendationTableVerticalPadding = 2 * getResources()
+                .getDimensionPixelSize(R.dimen.widget_cell_vertical_padding);
         mWidgetCellTextViewsHeight = 4 * getResources().getDimension(R.dimen.widget_cell_font_size);
         mWidgetPreviewPadding = 2 * getResources()
                 .getDimensionPixelSize(R.dimen.widget_preview_shortcut_padding);
@@ -143,7 +146,7 @@ public final class WidgetsRecommendationTableLayout extends TableLayout {
             return new RecommendationTableData(List.of(), previewScale);
         }
         // A naive estimation of the widgets recommendation table height without inflation.
-        float totalHeight = 0;
+        float totalHeight = mWidgetsRecommendationTableVerticalPadding;
         DeviceProfile deviceProfile = Launcher.getLauncher(getContext()).getDeviceProfile();
         for (int i = 0; i < recommendedWidgetsInTable.size(); i++) {
             List<WidgetItem> widgetItems = recommendedWidgetsInTable.get(i);
-- 
GitLab


From a3c8662a56c0c5a2f9cc5393028b79e908011580 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Mon, 26 Apr 2021 17:35:28 -0400
Subject: [PATCH 0984/1664] Use separate color for popup when on top of another
 surface (folder/all apps).

This ensures the two surfaces contrast.

Bug: 175329686
Test: long press on item in folder
Change-Id: Ic2ac9c433ce219452024071388fa0cfb51487fb6
---
 res/values-v31/colors.xml                     |  2 ++
 res/values/attrs.xml                          |  1 +
 res/values/colors.xml                         |  2 ++
 res/values/styles.xml                         |  2 ++
 .../android/launcher3/popup/ArrowPopup.java   | 29 +++++++++++++------
 .../popup/PopupContainerWithArrow.java        |  7 +++--
 6 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/res/values-v31/colors.xml b/res/values-v31/colors.xml
index 24aac10a26..87afd6bc52 100644
--- a/res/values-v31/colors.xml
+++ b/res/values-v31/colors.xml
@@ -17,9 +17,11 @@
 */
 -->
 <resources>
+    <color name="popup_color_neutral_light">@android:color/system_neutral1_0</color>
     <color name="popup_color_primary_light">@android:color/system_neutral1_50</color>
     <color name="popup_color_secondary_light">@android:color/system_neutral2_100</color>
     <color name="popup_color_tertiary_light">@android:color/system_neutral2_300</color>
+    <color name="popup_color_neutral_dark">@android:color/system_neutral1_1000</color>
     <color name="popup_color_primary_dark">@android:color/system_neutral1_800</color>
     <color name="popup_color_secondary_dark">@android:color/system_neutral1_900</color>
     <color name="popup_color_tertiary_dark">@android:color/system_neutral2_700</color>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index dbb40d591c..7fe53d5ae7 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -22,6 +22,7 @@
     <attr name="allAppsInterimScrimAlpha" format="integer" />
     <attr name="allAppsNavBarScrimColor" format="color" />
     <attr name="allAppsTheme" format="reference" />
+    <attr name="popupColorNeutral" format="color" />
     <attr name="popupColorPrimary" format="color" />
     <attr name="popupColorSecondary" format="color" />
     <attr name="popupColorTertiary" format="color" />
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 7d48adfc6c..8a2cada827 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -41,9 +41,11 @@
     <color name="gesture_tutorial_action_button_label_color">#FF000000</color>
     <color name="gesture_tutorial_primary_color">#B7F29F</color> <!-- Light Green -->
 
+    <color name="popup_color_neutral_light">#FFF</color>
     <color name="popup_color_primary_light">#FFF</color>
     <color name="popup_color_secondary_light">#F1F3F4</color>
     <color name="popup_color_tertiary_light">#E0E0E0</color> <!-- Gray 300 -->
+    <color name="popup_color_neutral_dark">#3C4043</color> <!-- Gray 800 -->
     <color name="popup_color_primary_dark">#3C4043</color> <!-- Gray 800 -->
     <color name="popup_color_secondary_dark">#202124</color>
     <color name="popup_color_tertiary_dark">#757575</color> <!-- Gray 600 -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 37b7e2d14f..bae1485a93 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -35,6 +35,7 @@
         <item name="allAppsInterimScrimAlpha">46</item>
         <item name="allAppsNavBarScrimColor">#66FFFFFF</item>
         <item name="allAppsTheme">@style/AllAppsTheme</item>
+        <item name="popupColorNeutral">@color/popup_color_neutral_light</item>
         <item name="popupColorPrimary">@color/popup_color_primary_light</item>
         <item name="popupColorSecondary">@color/popup_color_secondary_light</item>
         <item name="popupColorTertiary">@color/popup_color_tertiary_light</item>
@@ -99,6 +100,7 @@
         <item name="allAppsInterimScrimAlpha">102</item>
         <item name="allAppsNavBarScrimColor">#80000000</item>
         <item name="allAppsTheme">@style/AllAppsTheme.Dark</item>
+        <item name="popupColorNeutral">@color/popup_color_neutral_dark</item>
         <item name="popupColorPrimary">@color/popup_color_primary_dark</item>
         <item name="popupColorSecondary">@color/popup_color_secondary_dark</item>
         <item name="popupColorTertiary">@color/popup_color_tertiary_dark</item>
diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java
index 373653829b..c19dfe9300 100644
--- a/src/com/android/launcher3/popup/ArrowPopup.java
+++ b/src/com/android/launcher3/popup/ArrowPopup.java
@@ -16,6 +16,7 @@
 
 package com.android.launcher3.popup;
 
+import static com.android.launcher3.AbstractFloatingView.getTopOpenViewWithType;
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.popup.PopupPopulator.MAX_SHORTCUTS;
 
@@ -48,12 +49,14 @@ import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.InsettableFrameLayout;
 import com.android.launcher3.LauncherAnimUtils;
+import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.RevealOutlineAnimation;
 import com.android.launcher3.anim.RoundedRectRevealOutlineProvider;
 import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.shortcuts.DeepShortcutView;
+import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.BaseDragLayer;
 
@@ -65,7 +68,8 @@ import java.util.Collections;
  *
  * @param <T> The activity on with the popup shows
  */
-public abstract class ArrowPopup<T extends BaseDraggingActivity> extends AbstractFloatingView {
+public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
+        extends AbstractFloatingView {
 
     // +1 for system shortcut view
     private static final int MAX_NUM_CHILDREN = MAX_SHORTCUTS + 1;
@@ -139,14 +143,21 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac
         mRoundedBottom.setCornerRadii(new float[] { smallerRadius, smallerRadius, smallerRadius,
                 smallerRadius, mOutlineRadius, mOutlineRadius, mOutlineRadius, mOutlineRadius});
 
-        int primaryColor = Themes.getAttrColor(context, R.attr.popupColorPrimary);
-        int secondaryColor = Themes.getAttrColor(context, R.attr.popupColorSecondary);
-        ArgbEvaluator argb = new ArgbEvaluator();
-        mColors = new int[MAX_NUM_CHILDREN];
-        // Interpolate between the two colors, exclusive.
-        float step = 1f / (MAX_NUM_CHILDREN + 1);
-        for (int i = 0; i < mColors.length; ++i) {
-            mColors[i] = (int) argb.evaluate((i + 1) * step, primaryColor, secondaryColor);
+        boolean isAboveAnotherSurface = getTopOpenViewWithType(mLauncher, TYPE_FOLDER) != null
+                || mLauncher.getStateManager().getState() == LauncherState.ALL_APPS;
+        if (isAboveAnotherSurface) {
+            mColors = new int[] { Themes.getAttrColor(context, R.attr.popupColorNeutral) };
+        } else {
+            int primaryColor = Themes.getAttrColor(context, R.attr.popupColorPrimary);
+            int secondaryColor = Themes.getAttrColor(context, R.attr.popupColorSecondary);
+            ArgbEvaluator argb = new ArgbEvaluator();
+            mColors = new int[MAX_NUM_CHILDREN];
+            // Interpolate between the two colors, exclusive.
+            float step = 1f / (MAX_NUM_CHILDREN + 1);
+            for (int i = 0; i < mColors.length; ++i) {
+                mColors[i] =
+                        (int) argb.evaluate((i + 1) * step, primaryColor, secondaryColor);
+            }
         }
     }
 
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index c282ae8287..1659e6d9cf 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -46,6 +46,7 @@ import com.android.launcher3.DragSource;
 import com.android.launcher3.DropTarget;
 import com.android.launcher3.DropTarget.DragObject;
 import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
 import com.android.launcher3.accessibility.ShortcutMenuAccessibilityDelegate;
@@ -60,10 +61,10 @@ import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.notification.NotificationInfo;
 import com.android.launcher3.notification.NotificationItemView;
 import com.android.launcher3.notification.NotificationKeyData;
-import com.android.launcher3.notification.NotificationMainView;
 import com.android.launcher3.popup.PopupDataProvider.PopupDataChangeListener;
 import com.android.launcher3.shortcuts.DeepShortcutView;
 import com.android.launcher3.shortcuts.ShortcutDragPreviewProvider;
+import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.touch.ItemLongClickListener;
 import com.android.launcher3.util.PackageUserKey;
 import com.android.launcher3.util.ShortcutUtil;
@@ -81,8 +82,8 @@ import java.util.stream.Collectors;
  *
  * @param <T> The activity on with the popup shows
  */
-public class PopupContainerWithArrow<T extends BaseDraggingActivity> extends ArrowPopup<T>
-        implements DragSource, DragController.DragListener {
+public class PopupContainerWithArrow<T extends StatefulActivity<LauncherState>>
+        extends ArrowPopup<T> implements DragSource, DragController.DragListener {
 
     private final List<DeepShortcutView> mShortcuts = new ArrayList<>();
     private final PointF mInterceptTouchDown = new PointF();
-- 
GitLab


From 3f6c3e134fb4887a660e71c10d6c09cd48d354c8 Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Mon, 26 Apr 2021 15:15:18 -0700
Subject: [PATCH 0985/1664] Initialize RotationTouchHelper with
 RecentsAnimationDeviceState ctor

Added logs to debug why multiple instances of RotationTouchHelper
are being created to begin with.
Ran labtest on CF, passes.

Fixes: 177316094
Change-Id: Ibb980980c61965f456a84a9d85a72ec4ec6e0b19
---
 .../OrientationTouchTransformer.java          | 38 ++++++++++---
 .../RecentsAnimationDeviceState.java          | 20 ++++++-
 .../quickstep/RotationTouchHelper.java        | 56 +++++++++++++++----
 .../quickstep/TouchInteractionService.java    |  4 +-
 4 files changed, 95 insertions(+), 23 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
index 2a6e478461..c47300cd5f 100644
--- a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
+++ b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
@@ -92,7 +92,7 @@ class OrientationTouchTransformer {
     };
 
     private static final String TAG = "OrientationTouchTransformer";
-    private static final boolean DEBUG = false;
+    private static final boolean DEBUG = true;
 
     private static final int QUICKSTEP_ROTATION_UNINITIALIZED = -1;
 
@@ -163,6 +163,10 @@ class OrientationTouchTransformer {
 
     void setNavigationMode(SysUINavigationMode.Mode newMode, Info info,
             Resources newRes) {
+        if (DEBUG) {
+            Log.d(TestProtocol.NO_SWIPE_TO_HOME, "setNavigationMode new: " + newMode
+                    + " oldMode: " + mMode + " " + this);
+        }
         if (mMode == newMode) {
             return;
         }
@@ -254,10 +258,18 @@ class OrientationTouchTransformer {
 
         mCurrentDisplay = new CurrentDisplay(region.realSize, region.rotation);
         OrientationRectF regionToKeep = mSwipeTouchRegions.get(mCurrentDisplay);
+        if (DEBUG) {
+            Log.d(TestProtocol.NO_SWIPE_TO_HOME, "cached region: " + regionToKeep
+                    + " mCurrentDisplay: " + mCurrentDisplay + " " + this);
+        }
         if (regionToKeep == null) {
             regionToKeep = createRegionForDisplay(region);
         }
         mSwipeTouchRegions.clear();
+        if (DEBUG) {
+            Log.d(TestProtocol.NO_SWIPE_TO_HOME, "adding region: " + regionToKeep
+                    + " mCurrentDisplay: " + mCurrentDisplay + " " + this);
+        }
         mSwipeTouchRegions.put(mCurrentDisplay, regionToKeep);
         updateAssistantRegions(regionToKeep);
     }
@@ -273,7 +285,8 @@ class OrientationTouchTransformer {
 
     private OrientationRectF createRegionForDisplay(Info display) {
         if (DEBUG) {
-            Log.d(TAG, "creating rotation region for: " + mCurrentDisplay.rotation);
+            Log.d(TAG, "creating rotation region for: " + mCurrentDisplay.rotation
+            + " with mode: " + mMode + " displayRotation: " + display.rotation);
         }
 
         Point size = display.realSize;
@@ -287,14 +300,19 @@ class OrientationTouchTransformer {
         } else {
             mAssistantLeftRegion.setEmpty();
             mAssistantRightRegion.setEmpty();
+            int navbarSize = getNavbarSize(ResourceUtils.NAVBAR_LANDSCAPE_LEFT_RIGHT_SIZE);
+            if (DEBUG) {
+                Log.d(TestProtocol.NO_SWIPE_TO_HOME, "else case mode: " + mMode
+                        + " getNavbarSize: " + navbarSize + " rotation: " + rotation + " " + this);
+            }
             switch (rotation) {
                 case Surface.ROTATION_90:
                     orientationRectF.left = orientationRectF.right
-                            - getNavbarSize(ResourceUtils.NAVBAR_LANDSCAPE_LEFT_RIGHT_SIZE);
+                            - navbarSize;
                     break;
                 case Surface.ROTATION_270:
                     orientationRectF.right = orientationRectF.left
-                            + getNavbarSize(ResourceUtils.NAVBAR_LANDSCAPE_LEFT_RIGHT_SIZE);
+                            + navbarSize;
                     break;
                 default:
                     orientationRectF.top = orientationRectF.bottom - touchHeight;
@@ -339,7 +357,7 @@ class OrientationTouchTransformer {
     boolean touchInValidSwipeRegions(float x, float y) {
         if (TestProtocol.sDebugTracing) {
             Log.d(TestProtocol.NO_SWIPE_TO_HOME, "touchInValidSwipeRegions " + x + "," + y + " in "
-                    + mLastRectTouched);
+                    + mLastRectTouched + " this: " + this);
         }
         if (mLastRectTouched != null) {
             return mLastRectTouched.contains(x, y);
@@ -462,7 +480,8 @@ class OrientationTouchTransformer {
                 if (DEBUG) {
                     Log.d(TAG, "Transforming rotation due to forceTransform, "
                             + "mCurrentRotation: " + mCurrentDisplay.rotation
-                            + "mRotation: " + mRotation);
+                            + "mRotation: " + mRotation
+                            + " this: " + this);
                 }
                 event.transform(mTmpMatrix);
                 return true;
@@ -473,9 +492,10 @@ class OrientationTouchTransformer {
 
             if (DEBUG) {
                 Log.d(TAG, "original: " + event.getX() + ", " + event.getY()
-                                + " new: " + mTmpPoint[0] + ", " + mTmpPoint[1]
-                                + " rect: " + this + " forceTransform: " + forceTransform
-                                + " contains: " + contains(mTmpPoint[0], mTmpPoint[1]));
+                        + " new: " + mTmpPoint[0] + ", " + mTmpPoint[1]
+                        + " rect: " + this + " forceTransform: " + forceTransform
+                        + " contains: " + contains(mTmpPoint[0], mTmpPoint[1])
+                        + " this: " + this);
             }
 
             if (contains(mTmpPoint[0], mTmpPoint[1])) {
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index b4f13307a4..ef09957c9d 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -54,6 +54,7 @@ import android.os.UserManager;
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
+import android.util.Log;
 import android.view.MotionEvent;
 import android.view.Surface;
 
@@ -61,6 +62,7 @@ import androidx.annotation.BinderThread;
 
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.DisplayController.DisplayInfoChangeListener;
 import com.android.launcher3.util.DisplayController.Info;
@@ -127,14 +129,27 @@ public class RecentsAnimationDeviceState implements
     private boolean mIsUserSetupComplete;
 
     public RecentsAnimationDeviceState(Context context) {
+        this(context, false);
+    }
+
+    /**
+     * @param isInstanceForTouches {@code true} if this is the persistent instance being used for
+     *                                   gesture touch handling
+     */
+    public RecentsAnimationDeviceState(Context context, boolean isInstanceForTouches) {
         mContext = context;
         mDisplayController = DisplayController.INSTANCE.get(context);
         mSysUiNavMode = SysUINavigationMode.INSTANCE.get(context);
         mDisplayId = mDisplayController.getInfo().id;
         mIsOneHandedModeSupported = SystemProperties.getBoolean(SUPPORT_ONE_HANDED_MODE, false);
         runOnDestroy(() -> mDisplayController.removeChangeListener(this));
-        mRotationTouchHelper = new RotationTouchHelper(context, mDisplayController);
-        runOnDestroy(mRotationTouchHelper::destroy);
+        mRotationTouchHelper = RotationTouchHelper.INSTANCE.get(context);
+        if (isInstanceForTouches) {
+            // rotationTouchHelper doesn't get initialized after being destroyed, so only destroy
+            // if primary TouchInteractionService instance needs to be destroyed.
+            mRotationTouchHelper.init();
+            runOnDestroy(mRotationTouchHelper::destroy);
+        }
 
         // Register for user unlocked if necessary
         mIsUserUnlocked = context.getSystemService(UserManager.class)
@@ -214,6 +229,7 @@ public class RecentsAnimationDeviceState implements
      * Cleans up all the registered listeners and receivers.
      */
     public void destroy() {
+        Log.d(TestProtocol.NO_SWIPE_TO_HOME, "destroying RADS", new Throwable());
         for (Runnable r : mOnDestroyActions) {
             r.run();
         }
diff --git a/quickstep/src/com/android/quickstep/RotationTouchHelper.java b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
index f4688a1dc1..fd0de4212f 100644
--- a/quickstep/src/com/android/quickstep/RotationTouchHelper.java
+++ b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
@@ -24,6 +24,7 @@ import static com.android.quickstep.SysUINavigationMode.Mode.THREE_BUTTONS;
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.util.Log;
 import android.view.MotionEvent;
 import android.view.OrientationEventListener;
 
@@ -31,6 +32,7 @@ import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.DisplayController.DisplayInfoChangeListener;
 import com.android.launcher3.util.DisplayController.Info;
+import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.quickstep.util.RecentsOrientedState;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.QuickStepContract;
@@ -43,10 +45,13 @@ public class RotationTouchHelper implements
         SysUINavigationMode.NavigationModeChangeListener,
         DisplayInfoChangeListener {
 
-    private final OrientationTouchTransformer mOrientationTouchTransformer;
-    private final DisplayController mDisplayController;
-    private final SysUINavigationMode mSysUiNavMode;
-    private final int mDisplayId;
+    public static final MainThreadInitializedObject<RotationTouchHelper> INSTANCE =
+            new MainThreadInitializedObject<>(RotationTouchHelper::new);
+
+    private OrientationTouchTransformer mOrientationTouchTransformer;
+    private DisplayController mDisplayController;
+    private SysUINavigationMode mSysUiNavMode;
+    private int mDisplayId;
     private int mDisplayRotation;
 
     private final ArrayList<Runnable> mOnDestroyActions = new ArrayList<>();
@@ -117,25 +122,46 @@ public class RotationTouchHelper implements
      */
     private boolean mInOverview;
     private boolean mTaskListFrozen;
-
-
     private final Context mContext;
 
-    public RotationTouchHelper(Context context, DisplayController displayController) {
+    /**
+     * Keeps track of whether destroy has been called for this instance. Mainly used for TAPL tests
+     * where multiple instances of RotationTouchHelper are being created. b/177316094
+     */
+    private boolean mNeedsInit = true;
+
+    private RotationTouchHelper(Context context) {
         mContext = context;
-        mDisplayController = displayController;
+        Log.d(TestProtocol.NO_SWIPE_TO_HOME, "RotationTouchHelper ctor init? " + mNeedsInit
+                + " " + this);
+        if (mNeedsInit) {
+            init();
+        }
+    }
+
+    public void init() {
+        if (!mNeedsInit) {
+            Log.d(TestProtocol.NO_SWIPE_TO_HOME, "Did not need init? " + " " + this);
+            return;
+        }
+        Log.d(TestProtocol.NO_SWIPE_TO_HOME, "RotationTouchHelper init() " + this,
+                new Throwable());
+        mDisplayController = DisplayController.INSTANCE.get(mContext);
         Resources resources = mContext.getResources();
-        mSysUiNavMode = SysUINavigationMode.INSTANCE.get(context);
+        mSysUiNavMode = SysUINavigationMode.INSTANCE.get(mContext);
         mDisplayId = mDisplayController.getInfo().id;
 
         mOrientationTouchTransformer = new OrientationTouchTransformer(resources, mMode,
                 () -> QuickStepContract.getWindowCornerRadius(resources));
 
         // Register for navigation mode changes
-        onNavigationModeChanged(mSysUiNavMode.addModeChangeListener(this));
+        SysUINavigationMode.Mode newMode = mSysUiNavMode.addModeChangeListener(this);
+        Log.d(TestProtocol.NO_SWIPE_TO_HOME, "AddedModeChangeListener: " + this +
+                " currentMode: " + newMode);
+        onNavigationModeChanged(newMode);
         runOnDestroy(() -> mSysUiNavMode.removeModeChangeListener(this));
 
-        mOrientationListener = new OrientationEventListener(context) {
+        mOrientationListener = new OrientationEventListener(mContext) {
             @Override
             public void onOrientationChanged(int degrees) {
                 int newRotation = RecentsOrientedState.getRotationForUserDegreesRotated(degrees,
@@ -154,6 +180,7 @@ public class RotationTouchHelper implements
                 }
             }
         };
+        mNeedsInit = false;
     }
 
     private void setupOrientationSwipeHandler() {
@@ -176,9 +203,11 @@ public class RotationTouchHelper implements
      * Cleans up all the registered listeners and receivers.
      */
     public void destroy() {
+        Log.d(TestProtocol.NO_SWIPE_TO_HOME, "destroying " + this);
         for (Runnable r : mOnDestroyActions) {
             r.run();
         }
+        mNeedsInit = true;
     }
 
     public boolean isTaskListFrozen() {
@@ -223,6 +252,7 @@ public class RotationTouchHelper implements
 
     @Override
     public void onNavigationModeChanged(SysUINavigationMode.Mode newMode) {
+        Log.d(TestProtocol.NO_SWIPE_TO_HOME, "nav mode changed: " + newMode);
         mDisplayController.removeChangeListener(this);
         mDisplayController.addChangeListener(this);
         onDisplayInfoChanged(mContext, mDisplayController.getInfo(), CHANGE_ALL);
@@ -374,4 +404,8 @@ public class RotationTouchHelper implements
         pw.println("  displayRotation=" + getDisplayRotation());
         mOrientationTouchTransformer.dump(pw);
     }
+
+    public OrientationTouchTransformer getOrientationTouchTransformer() {
+        return mOrientationTouchTransformer;
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 18c0b7a1ef..4fc97702ed 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -300,7 +300,9 @@ public class TouchInteractionService extends Service implements PluginListener<O
         // Everything else should be initialized in onUserUnlocked() below.
         mMainChoreographer = Choreographer.getInstance();
         mAM = ActivityManagerWrapper.getInstance();
-        mDeviceState = new RecentsAnimationDeviceState(this);
+        mDeviceState = new RecentsAnimationDeviceState(this, true);
+            Log.d(TestProtocol.NO_SWIPE_TO_HOME, "RADS OTT instance: " +
+                    mDeviceState.getRotationTouchHelper().getOrientationTouchTransformer());
         mRotationTouchHelper = mDeviceState.getRotationTouchHelper();
         mDeviceState.addNavigationModeChangedCallback(this::onNavigationModeChanged);
         mDeviceState.addOneHandedModeChangedCallback(this::onOneHandedModeOverlayChanged);
-- 
GitLab


From 72ec557ee7400b874ea056e3facd5da73a0c9921 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Mon, 26 Apr 2021 18:40:03 -0400
Subject: [PATCH 0986/1664] Remove shadow on folder icon.

Bug: 175329686
Test: manual, verify no shadow on folder icon background
Change-Id: I8ec9ac55ca4fd48155f017376c5bcd6043771d2a
---
 .../launcher3/folder/PreviewBackground.java   | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/com/android/launcher3/folder/PreviewBackground.java b/src/com/android/launcher3/folder/PreviewBackground.java
index 767fffe35b..5ddf84f99f 100644
--- a/src/com/android/launcher3/folder/PreviewBackground.java
+++ b/src/com/android/launcher3/folder/PreviewBackground.java
@@ -50,6 +50,8 @@ import com.android.launcher3.views.ActivityContext;
  */
 public class PreviewBackground extends CellLayout.DelegatedCellDrawing {
 
+    private static final boolean DRAW_SHADOW = false;
+
     private static final int CONSUMPTION_ANIMATION_DURATION = 100;
 
     private final PorterDuffXfermode mShadowPorterDuffXfermode
@@ -163,13 +165,15 @@ public class PreviewBackground extends CellLayout.DelegatedCellDrawing {
         // Stroke width is 1dp
         mStrokeWidth = context.getResources().getDisplayMetrics().density;
 
-        float radius = getScaledRadius();
-        float shadowRadius = radius + mStrokeWidth;
-        int shadowColor = Color.argb(SHADOW_OPACITY, 0, 0, 0);
-        mShadowShader = new RadialGradient(0, 0, 1,
-                new int[] {shadowColor, Color.TRANSPARENT},
-                new float[] {radius / shadowRadius, 1},
-                Shader.TileMode.CLAMP);
+        if (DRAW_SHADOW) {
+            float radius = getScaledRadius();
+            float shadowRadius = radius + mStrokeWidth;
+            int shadowColor = Color.argb(SHADOW_OPACITY, 0, 0, 0);
+            mShadowShader = new RadialGradient(0, 0, 1,
+                    new int[]{shadowColor, Color.TRANSPARENT},
+                    new float[]{radius / shadowRadius, 1},
+                    Shader.TileMode.CLAMP);
+        }
 
         invalidate();
     }
@@ -239,6 +243,9 @@ public class PreviewBackground extends CellLayout.DelegatedCellDrawing {
     }
 
     public void drawShadow(Canvas canvas) {
+        if (!DRAW_SHADOW) {
+            return;
+        }
         if (mShadowShader == null) {
             return;
         }
@@ -277,6 +284,9 @@ public class PreviewBackground extends CellLayout.DelegatedCellDrawing {
     }
 
     public void fadeInBackgroundShadow() {
+        if (!DRAW_SHADOW) {
+            return;
+        }
         if (mShadowAnimator != null) {
             mShadowAnimator.cancel();
         }
-- 
GitLab


From 079003b44d582bd1962061edcac02f58e711da30 Mon Sep 17 00:00:00 2001
From: Zak Cohen <zakcohen@google.com>
Date: Mon, 26 Apr 2021 23:59:07 +0000
Subject: [PATCH 0987/1664] Revert "[Search][Motion] Separate AllApps scrim and
 content interpolation"

This reverts commit 8c383f97e4537c24affd0cd01631047509da2908.

Reason for revert: ScrimView is used in multiple places, Overview is broken by this change.

Change-Id: Ie395e2d94feaca4c9365bb5da68e9dc219990e03
---
 src/com/android/launcher3/Launcher.java       |  2 +-
 .../WorkspaceStateTransitionAnimation.java    |  5 +++
 .../allapps/AllAppsTransitionController.java  | 12 ++-----
 .../android/launcher3/views/ScrimView.java    | 32 +++----------------
 4 files changed, 13 insertions(+), 38 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 36d3625299..a54c791aff 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1197,7 +1197,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
         // Setup the drag controller (drop targets have to be added in reverse order in priority)
         mDropTargetBar.setup(mDragController);
-        mAllAppsController.setupViews(mAppsView, mScrimView);
+        mAllAppsController.setupViews(mAppsView);
     }
 
     /**
diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
index 41962a4104..ed854dcd0e 100644
--- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
+++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
@@ -36,6 +36,7 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_SCA
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_TRANSLATE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_SCALE;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_SCRIM_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_TRANSLATE;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_SCRIM;
 
@@ -164,6 +165,10 @@ public class WorkspaceStateTransitionAnimation {
         SysUiScrim sysUiScrim = mLauncher.getDragLayer().getSysUiScrim();
         propertySetter.setFloat(sysUiScrim, SYSUI_PROGRESS,
                 state.hasFlag(FLAG_HAS_SYS_UI_SCRIM) ? 1 : 0, LINEAR);
+
+        propertySetter.setViewAlpha(mLauncher.getScrimView(),
+                state.getWorkspaceScrimAlpha(mLauncher),
+                config.getInterpolator(ANIM_WORKSPACE_SCRIM_FADE, LINEAR));
     }
 
     public void applyChildState(LauncherState state, CellLayout cl, int childIndex) {
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 5c1bffb2d1..c61c0d6d53 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -43,7 +43,6 @@ import com.android.launcher3.anim.PropertySetter;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
 import com.android.launcher3.states.StateAnimationConfig;
-import com.android.launcher3.views.ScrimView;
 
 /**
  * Handles AllApps view transition.
@@ -71,11 +70,10 @@ public class AllAppsTransitionController
                     controller.setProgress(progress);
                 }
             };
-    private final Launcher mLauncher;
 
     private AllAppsContainerView mAppsView;
-    private ScrimView mScrimView;
 
+    private final Launcher mLauncher;
     private boolean mIsVerticalLayout;
 
     // Animation in this class is controlled by a single variable {@link mProgress}.
@@ -123,8 +121,6 @@ public class AllAppsTransitionController
      */
     public void setProgress(float progress) {
         mProgress = progress;
-        //Note: Take inverted progress so progress=0 maps to a transparent scrim
-        mScrimView.setProgress(1 - progress);
         mAppsView.setTranslationY(mProgress * mShiftRange);
     }
 
@@ -189,12 +185,8 @@ public class AllAppsTransitionController
         return AnimationSuccessListener.forRunnable(this::onProgressAnimationEnd);
     }
 
-    /**
-     * Setup views
-     */
-    public void setupViews(AllAppsContainerView appsView, ScrimView scrimView) {
+    public void setupViews(AllAppsContainerView appsView) {
         mAppsView = appsView;
-        mScrimView = scrimView;
         if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && Utilities.ATLEAST_R) {
             mLauncher.getSystemUiController().updateUiState(UI_STATE_ALLAPPS,
                     View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
diff --git a/src/com/android/launcher3/views/ScrimView.java b/src/com/android/launcher3/views/ScrimView.java
index 9b809ae486..c9424de152 100644
--- a/src/com/android/launcher3/views/ScrimView.java
+++ b/src/com/android/launcher3/views/ScrimView.java
@@ -15,21 +15,18 @@
  */
 package com.android.launcher3.views;
 
-import static com.android.launcher3.anim.Interpolators.ACCEL;
 import static com.android.launcher3.util.SystemUiController.UI_STATE_SCRIM_VIEW;
 
 import android.content.Context;
 import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.view.View;
-import android.view.animation.Interpolator;
 
 import androidx.core.graphics.ColorUtils;
 
 import com.android.launcher3.Insettable;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
-import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.util.SystemUiController;
 import com.android.launcher3.util.Themes;
 
@@ -39,22 +36,9 @@ import com.android.launcher3.util.Themes;
 public class ScrimView extends View implements Insettable {
     private static final float STATUS_BAR_COLOR_FORCE_UPDATE_THRESHOLD = 0.9f;
 
-
-    private static final float TINT_DECAY_MULTIPLIER = .5f;
-
-    //min progress for scrim to become visible
-    private static final float SCRIM_VISIBLE_THRESHOLD = .1f;
-    //max progress where scrim alpha animates.
-    private static final float SCRIM_SOLID_THRESHOLD = .5f;
-    private final Interpolator mScrimInterpolator = Interpolators.clampToProgress(ACCEL,
-            SCRIM_VISIBLE_THRESHOLD,
-            SCRIM_SOLID_THRESHOLD);
-
     private final boolean mIsScrimDark;
     private SystemUiController mSystemUiController;
 
-    private float mProgress;
-
     public ScrimView(Context context, AttributeSet attrs) {
         super(context, attrs);
         mIsScrimDark = ColorUtils.calculateLuminance(
@@ -63,23 +47,17 @@ public class ScrimView extends View implements Insettable {
     }
 
     @Override
-    public void setInsets(Rect insets) {
-    }
+    public void setInsets(Rect insets) { }
 
     @Override
     public boolean hasOverlappingRendering() {
         return false;
     }
 
-    /**
-     * Set progress of scrim animation.
-     * Note: progress should range from 0 for transparent to 1 for solid
-     */
-    public void setProgress(float progress) {
-        if (mProgress != progress) {
-            mProgress = progress;
-            setAlpha(mScrimInterpolator.getInterpolation(progress));
-        }
+    @Override
+    protected boolean onSetAlpha(int alpha) {
+        updateSysUiColors();
+        return super.onSetAlpha(alpha);
     }
 
     @Override
-- 
GitLab


From 61110601f6008cc45afe4a548532c88457c2f02f Mon Sep 17 00:00:00 2001
From: Cyrus Boadway <boadway@google.com>
Date: Wed, 21 Apr 2021 16:39:09 +0000
Subject: [PATCH 0988/1664] Animate App Widget activity launch from Quickstep
 launchers

Following the general pattern on icon launch animations, define a
'floating widget view' to represent the appearance of the app widget
through the launch animation.

The floating widget view separates the foreground and background
components of the LauncherAppWidgetHostView, which can be positioned
and animated separately.

The background (or placeholder if no background can be identified)
moves and grows from its original position and size to the launched
app's position and size.

The widget's foreground scales and moves to match, fading out to be
replaced with the app window.

Bug: 169042867
Test: manual
Change-Id: I65d2b1bc80275f9df460790720e13d1650093347
---
 .../launcher3/QuickstepTransitionManager.java | 144 +++++++++-
 .../views/FloatingWidgetBackgroundView.java   | 191 +++++++++++++
 .../quickstep/views/FloatingWidgetView.java   | 250 ++++++++++++++++++
 res/layout/floating_widget_view.xml           |  20 ++
 4 files changed, 601 insertions(+), 4 deletions(-)
 create mode 100644 quickstep/src/com/android/quickstep/views/FloatingWidgetBackgroundView.java
 create mode 100644 quickstep/src/com/android/quickstep/views/FloatingWidgetView.java
 create mode 100644 res/layout/floating_widget_view.xml

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 827eb7d0bb..b38e48d48d 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -79,6 +79,7 @@ import com.android.launcher3.util.MultiValueAlpha;
 import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;
 import com.android.launcher3.util.RunnableList;
 import com.android.launcher3.views.FloatingIconView;
+import com.android.launcher3.widget.LauncherAppWidgetHostView;
 import com.android.quickstep.RemoteAnimationTargets;
 import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.TaskViewUtils;
@@ -86,6 +87,7 @@ import com.android.quickstep.util.MultiValueUpdateListener;
 import com.android.quickstep.util.RemoteAnimationProvider;
 import com.android.quickstep.util.StaggeredWorkspaceAnim;
 import com.android.quickstep.util.SurfaceTransactionApplier;
+import com.android.quickstep.views.FloatingWidgetView;
 import com.android.quickstep.views.RecentsView;
 import com.android.systemui.shared.system.ActivityCompat;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
@@ -160,6 +162,9 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
 
     private static final int MAX_NUM_TASKS = 5;
 
+    // Cross-fade duration between App Widget and App
+    private static final int WIDGET_CROSSFADE_DURATION_MILLIS = 125;
+
     protected final BaseQuickstepLauncher mLauncher;
 
     private final DragLayer mDragLayer;
@@ -351,6 +356,29 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
         }
     }
 
+    private void composeWidgetLaunchAnimator(
+            @NonNull AnimatorSet anim,
+            @NonNull LauncherAppWidgetHostView v,
+            @NonNull RemoteAnimationTargetCompat[] appTargets,
+            @NonNull RemoteAnimationTargetCompat[] wallpaperTargets,
+            @NonNull RemoteAnimationTargetCompat[] nonAppTargets) {
+        mLauncher.getStateManager().setCurrentAnimation(anim);
+
+        Rect windowTargetBounds = getWindowTargetBounds(appTargets, getRotationChange(appTargets));
+        anim.play(getOpeningWindowAnimatorsForWidget(v, appTargets, wallpaperTargets, nonAppTargets,
+                windowTargetBounds, areAllTargetsTranslucent(appTargets)));
+
+        anim.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+                mLauncher.addOnResumeCallback(() ->
+                        ObjectAnimator.ofFloat(mLauncher.getDepthController(), DEPTH,
+                                mLauncher.getStateManager().getState().getDepth(
+                                        mLauncher)).start());
+            }
+        });
+    }
+
     /**
      * Return the window bounds of the opening target.
      * In multiwindow mode, we need to get the final size of the opening app window target to help
@@ -744,6 +772,112 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
             }
         });
 
+        animatorSet.playTogether(appAnimator, getBackgroundAnimator(appTargets));
+        return animatorSet;
+    }
+
+    private Animator getOpeningWindowAnimatorsForWidget(LauncherAppWidgetHostView v,
+            RemoteAnimationTargetCompat[] appTargets,
+            RemoteAnimationTargetCompat[] wallpaperTargets,
+            RemoteAnimationTargetCompat[] nonAppTargets, Rect windowTargetBounds,
+            boolean appTargetsAreTranslucent) {
+        final RectF widgetBackgroundBounds = new RectF();
+        final Rect appWindowCrop = new Rect();
+        final Matrix matrix = new Matrix();
+
+        final float finalWindowRadius = mDeviceProfile.isMultiWindowMode
+                ? 0 : getWindowCornerRadius(mLauncher.getResources());
+        final FloatingWidgetView floatingView = FloatingWidgetView.getFloatingWidgetView(mLauncher,
+                v, widgetBackgroundBounds, windowTargetBounds, finalWindowRadius);
+        final float initialWindowRadius = supportsRoundedCornersOnWindows(mLauncher.getResources())
+                ? floatingView.getInitialCornerRadius() : 0;
+
+        RemoteAnimationTargets openingTargets = new RemoteAnimationTargets(appTargets,
+                wallpaperTargets, nonAppTargets, MODE_OPENING);
+        SurfaceTransactionApplier surfaceApplier = new SurfaceTransactionApplier(floatingView);
+        openingTargets.addReleaseCheck(surfaceApplier);
+
+        AnimatorSet animatorSet = new AnimatorSet();
+        ValueAnimator appAnimator = ValueAnimator.ofFloat(0, 1);
+        appAnimator.setDuration(APP_LAUNCH_DURATION);
+        appAnimator.setInterpolator(LINEAR);
+        appAnimator.addListener(floatingView);
+        appAnimator.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                openingTargets.release();
+            }
+        });
+        floatingView.setFastFinishRunnable(animatorSet::end);
+
+        appAnimator.addUpdateListener(new MultiValueUpdateListener() {
+            float mAppWindowScale = 1;
+            final FloatProp mWidgetForegroundAlpha = new FloatProp(1 /* start */,
+                    0 /* end */, 0 /* delay */,
+                    WIDGET_CROSSFADE_DURATION_MILLIS / 2 /* duration */, LINEAR);
+            final FloatProp mWidgetFallbackBackgroundAlpha = new FloatProp(0 /* start */,
+                    1 /* end */, 0 /* delay */, 75 /* duration */, LINEAR);
+            final FloatProp mPreviewAlpha = new FloatProp(0 /* start */, 1 /* end */,
+                    WIDGET_CROSSFADE_DURATION_MILLIS / 2 /* delay */,
+                    WIDGET_CROSSFADE_DURATION_MILLIS / 2 /* duration */, LINEAR);
+            final FloatProp mWindowRadius = new FloatProp(initialWindowRadius, finalWindowRadius,
+                    0 /* start */, RADIUS_DURATION, LINEAR);
+            final FloatProp mCornerRadiusProgress = new FloatProp(0, 1, 0, RADIUS_DURATION, LINEAR);
+
+            // Window & widget background positioning bounds
+            final FloatProp mDx = new FloatProp(widgetBackgroundBounds.centerX(),
+                    windowTargetBounds.centerX(), 0 /* delay */, APP_LAUNCH_CURVED_DURATION,
+                    EXAGGERATED_EASE);
+            final FloatProp mDy = new FloatProp(widgetBackgroundBounds.centerY(),
+                    windowTargetBounds.centerY(), 0 /* delay */, APP_LAUNCH_DURATION,
+                    EXAGGERATED_EASE);
+            final FloatProp mWidth = new FloatProp(widgetBackgroundBounds.width(),
+                    windowTargetBounds.width(), 0 /* delay */, APP_LAUNCH_DURATION,
+                    EXAGGERATED_EASE);
+            final FloatProp mHeight = new FloatProp(widgetBackgroundBounds.height(),
+                    windowTargetBounds.height(), 0 /* delay */, APP_LAUNCH_DURATION,
+                    EXAGGERATED_EASE);
+
+            @Override
+            public void onUpdate(float percent) {
+                widgetBackgroundBounds.set(mDx.value - mWidth.value / 2f,
+                        mDy.value - mHeight.value / 2f, mDx.value + mWidth.value / 2f,
+                        mDy.value + mHeight.value / 2f);
+                // Set app window scaling factor to match widget background width
+                mAppWindowScale = widgetBackgroundBounds.width() / windowTargetBounds.width();
+                // Crop scaled app window to match widget
+                appWindowCrop.set(0 /* left */, 0 /* top */,
+                        Math.round(windowTargetBounds.width()) /* right */,
+                        Math.round(widgetBackgroundBounds.height() / mAppWindowScale) /* bottom */);
+                matrix.setTranslate(widgetBackgroundBounds.left, widgetBackgroundBounds.top);
+                matrix.postScale(mAppWindowScale, mAppWindowScale, widgetBackgroundBounds.left,
+                        widgetBackgroundBounds.top);
+
+                SurfaceParams[] params = new SurfaceParams[appTargets.length];
+                float floatingViewAlpha = appTargetsAreTranslucent ? 1 - mPreviewAlpha.value : 1;
+                for (int i = appTargets.length - 1; i >= 0; i--) {
+                    RemoteAnimationTargetCompat target = appTargets[i];
+                    SurfaceParams.Builder builder = new SurfaceParams.Builder(target.leash);
+                    if (target.mode == MODE_OPENING) {
+                        floatingView.update(widgetBackgroundBounds, floatingViewAlpha,
+                                mWidgetForegroundAlpha.value, mWidgetFallbackBackgroundAlpha.value,
+                                mCornerRadiusProgress.value);
+                        builder.withMatrix(matrix)
+                                .withWindowCrop(appWindowCrop)
+                                .withAlpha(mPreviewAlpha.value)
+                                .withCornerRadius(mWindowRadius.value / mAppWindowScale);
+                    }
+                    params[i] = builder.build();
+                }
+                surfaceApplier.scheduleApply(params);
+            }
+        });
+
+        animatorSet.playTogether(appAnimator, getBackgroundAnimator(appTargets));
+        return animatorSet;
+    }
+
+    private ObjectAnimator getBackgroundAnimator(RemoteAnimationTargetCompat[] appTargets) {
         // When launching an app from overview that doesn't map to a task, we still want to just
         // blur the wallpaper instead of the launcher surface as well
         boolean allowBlurringLauncher = mLauncher.getStateManager().getState() != OVERVIEW;
@@ -761,9 +895,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                 }
             });
         }
-
-        animatorSet.playTogether(appAnimator, backgroundRadiusAnim);
-        return animatorSet;
+        return backgroundRadiusAnim;
     }
 
     /**
@@ -1126,9 +1258,13 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
             boolean launcherClosing =
                     launcherIsATargetWithMode(appTargets, MODE_CLOSING);
 
+            final boolean launchingFromWidget = mV instanceof LauncherAppWidgetHostView;
             final boolean launchingFromRecents = isLaunchingFromRecents(mV, appTargets);
             final boolean launchingFromTaskbar = mLauncher.isViewInTaskbar(mV);
-            if (launchingFromRecents) {
+            if (launchingFromWidget) {
+                composeWidgetLaunchAnimator(anim, (LauncherAppWidgetHostView) mV, appTargets,
+                        wallpaperTargets, nonAppTargets);
+            } else if (launchingFromRecents) {
                 composeRecentsLaunchAnimator(anim, mV, appTargets, wallpaperTargets, nonAppTargets,
                         launcherClosing);
             } else if (launchingFromTaskbar) {
diff --git a/quickstep/src/com/android/quickstep/views/FloatingWidgetBackgroundView.java b/quickstep/src/com/android/quickstep/views/FloatingWidgetBackgroundView.java
new file mode 100644
index 0000000000..f74aa55cbd
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/views/FloatingWidgetBackgroundView.java
@@ -0,0 +1,191 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.quickstep.views;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.graphics.Outline;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.GradientDrawable;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewOutlineProvider;
+import android.widget.RemoteViews.RemoteViewOutlineProvider;
+
+import com.android.launcher3.util.Themes;
+import com.android.launcher3.widget.LauncherAppWidgetHostView;
+import com.android.launcher3.widget.RoundedCornerEnforcement;
+
+import java.util.stream.IntStream;
+
+/**
+ * Mimics the appearance of the background view of a {@link LauncherAppWidgetHostView} through a
+ * an App Widget activity launch animation.
+ */
+@TargetApi(Build.VERSION_CODES.S)
+final class FloatingWidgetBackgroundView extends View {
+    private final ColorDrawable mFallbackDrawable = new ColorDrawable();
+    private final DrawableProperties mForegroundProperties = new DrawableProperties();
+    private final DrawableProperties mBackgroundProperties = new DrawableProperties();
+
+    private Drawable mOriginalForeground;
+    private Drawable mOriginalBackground;
+    private float mFinalRadius;
+    private float mInitialOutlineRadius;
+    private float mOutlineRadius;
+    private boolean mIsUsingFallback;
+    private View mSourceView;
+
+    FloatingWidgetBackgroundView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        setOutlineProvider(new ViewOutlineProvider() {
+            @Override
+            public void getOutline(View view, Outline outline) {
+                outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(), mOutlineRadius);
+            }
+        });
+        setClipToOutline(true);
+    }
+
+    void init(LauncherAppWidgetHostView hostView, View backgroundView, float finalRadius) {
+        mFinalRadius = finalRadius;
+        mSourceView = backgroundView;
+        mInitialOutlineRadius = getOutlineRadius(hostView, backgroundView);
+        mIsUsingFallback = false;
+        if (isSupportedDrawable(backgroundView.getForeground())) {
+            mOriginalForeground = backgroundView.getForeground();
+            mForegroundProperties.init(
+                    mOriginalForeground.getConstantState().newDrawable().mutate());
+            setForeground(mForegroundProperties.mDrawable);
+            mSourceView.setForeground(null);
+        }
+        if (isSupportedDrawable(backgroundView.getBackground())) {
+            mOriginalBackground = backgroundView.getBackground();
+            mBackgroundProperties.init(
+                    mOriginalBackground.getConstantState().newDrawable().mutate());
+            setBackground(mBackgroundProperties.mDrawable);
+            mSourceView.setBackground(null);
+        } else if (mOriginalForeground == null) {
+            mFallbackDrawable.setColor(Themes.getColorBackground(backgroundView.getContext()));
+            setBackground(mFallbackDrawable);
+            mIsUsingFallback = true;
+        }
+    }
+
+    /** Update the animated properties of the drawables. */
+    void update(float cornerRadiusProgress, float fallbackAlpha) {
+        if (isUninitialized()) return;
+        mOutlineRadius = mInitialOutlineRadius + (mFinalRadius - mInitialOutlineRadius)
+                * cornerRadiusProgress;
+        mForegroundProperties.updateDrawable(mFinalRadius, cornerRadiusProgress);
+        mBackgroundProperties.updateDrawable(mFinalRadius, cornerRadiusProgress);
+        setAlpha(mIsUsingFallback ? fallbackAlpha : 1f);
+    }
+
+    /** Restores the drawables to the source view. */
+    void finish() {
+        if (isUninitialized()) return;
+        mSourceView.setForeground(mOriginalForeground);
+        mSourceView.setBackground(mOriginalBackground);
+    }
+
+    void recycle() {
+        mSourceView = null;
+        mOriginalForeground = null;
+        mOriginalBackground = null;
+        mOutlineRadius = 0;
+        mFinalRadius = 0;
+        setForeground(null);
+        setBackground(null);
+    }
+
+    /** Get the largest of drawable corner radii or background view outline radius. */
+    float getMaximumRadius() {
+        if (isUninitialized()) return 0;
+        return Math.max(mInitialOutlineRadius, Math.max(getMaxRadius(mOriginalForeground),
+                getMaxRadius(mOriginalBackground)));
+    }
+
+    private boolean isUninitialized() {
+        return mSourceView == null;
+    }
+
+    /** Returns the maximum corner radius of {@param drawable}. */
+    private static float getMaxRadius(Drawable drawable) {
+        if (!(drawable instanceof GradientDrawable)) return 0;
+        float[] cornerRadii = ((GradientDrawable) drawable).getCornerRadii();
+        float cornerRadius = ((GradientDrawable) drawable).getCornerRadius();
+        double radiiMax = cornerRadii == null ? 0 : IntStream.range(0, cornerRadii.length)
+                .mapToDouble(i -> cornerRadii[i]).max().orElse(0);
+        return Math.max(cornerRadius, (float) radiiMax);
+    }
+
+    /** Returns whether the given drawable type is supported. */
+    private static boolean isSupportedDrawable(Drawable drawable) {
+        return drawable instanceof ColorDrawable || (drawable instanceof GradientDrawable
+                && ((GradientDrawable) drawable).getShape() == GradientDrawable.RECTANGLE);
+    }
+
+    /** Corner radius from source view's outline, or enforced view. */
+    private static float getOutlineRadius(LauncherAppWidgetHostView hostView, View v) {
+        if (RoundedCornerEnforcement.isRoundedCornerEnabled()
+                && hostView.hasEnforcedCornerRadius()) {
+            return hostView.getEnforcedCornerRadius();
+        } else if (v.getOutlineProvider() instanceof RemoteViewOutlineProvider
+                && v.getClipToOutline()) {
+            return ((RemoteViewOutlineProvider) v.getOutlineProvider()).getRadius();
+        }
+        return 0;
+    }
+
+    /** Stores and modifies a drawable's properties through an animation. */
+    private static class DrawableProperties {
+        private Drawable mDrawable;
+        private float mOriginalRadius;
+        private float[] mOriginalRadii;
+        private final float[] mTmpRadii = new float[8];
+
+        /** Store a drawable's animated properties. */
+        void init(Drawable drawable) {
+            mDrawable = drawable;
+            if (!(drawable instanceof GradientDrawable)) return;
+            mOriginalRadius = ((GradientDrawable) drawable).getCornerRadius();
+            mOriginalRadii = ((GradientDrawable) drawable).getCornerRadii();
+        }
+
+        /**
+         * Update the drawable for the given animation state.
+         *
+         * @param finalRadius the radius of each corner when {@param progress} is 1
+         * @param progress    the linear progress of the corner radius from its original value to
+         *                    {@param finalRadius}
+         */
+        void updateDrawable(float finalRadius, float progress) {
+            if (!(mDrawable instanceof GradientDrawable)) return;
+            GradientDrawable d = (GradientDrawable) mDrawable;
+            if (mOriginalRadii != null) {
+                for (int i = 0; i < mOriginalRadii.length; i++) {
+                    mTmpRadii[i] = mOriginalRadii[i] + (finalRadius - mOriginalRadii[i]) * progress;
+                }
+                d.setCornerRadii(mTmpRadii);
+            } else {
+                d.setCornerRadius(mOriginalRadius + (finalRadius - mOriginalRadius) * progress);
+            }
+        }
+    }
+}
diff --git a/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java b/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java
new file mode 100644
index 0000000000..d23884c9ef
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java
@@ -0,0 +1,250 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.quickstep.views;
+
+import android.animation.Animator;
+import android.animation.Animator.AnimatorListener;
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.graphics.Matrix;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.view.GhostView;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.dragndrop.DragLayer;
+import com.android.launcher3.views.ListenerView;
+import com.android.launcher3.widget.LauncherAppWidgetHostView;
+import com.android.launcher3.widget.RoundedCornerEnforcement;
+
+/** A view that mimics an App Widget through a launch animation. */
+@TargetApi(Build.VERSION_CODES.S)
+public class FloatingWidgetView extends FrameLayout implements AnimatorListener {
+    private static final Matrix sTmpMatrix = new Matrix();
+
+    private final Launcher mLauncher;
+    private final ListenerView mListenerView;
+    private final FloatingWidgetBackgroundView mBackgroundView;
+    private final RectF mBackgroundOffset = new RectF();
+
+    private LauncherAppWidgetHostView mAppWidgetView;
+    private View mAppWidgetBackgroundView;
+    private RectF mBackgroundPosition;
+    private GhostView mForegroundOverlayView;
+
+    private Runnable mEndRunnable;
+    private Runnable mFastFinishRunnable;
+
+    public FloatingWidgetView(Context context) {
+        this(context, null);
+    }
+
+    public FloatingWidgetView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public FloatingWidgetView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mLauncher = Launcher.getLauncher(context);
+        mListenerView = new ListenerView(context, attrs);
+        mBackgroundView = new FloatingWidgetBackgroundView(context, attrs, defStyleAttr);
+        addView(mBackgroundView);
+        setWillNotDraw(false);
+    }
+
+    @Override
+    public void onAnimationEnd(Animator animator) {
+        Runnable endRunnable = mEndRunnable;
+        mEndRunnable = null;
+        if (endRunnable != null) {
+            endRunnable.run();
+        }
+    }
+
+    @Override
+    public void onAnimationStart(Animator animator) {
+    }
+
+    @Override
+    public void onAnimationCancel(Animator animator) {
+    }
+
+    @Override
+    public void onAnimationRepeat(Animator animator) {
+    }
+
+    /** Sets a runnable that is called after a call to {@link #fastFinish()}. */
+    public void setFastFinishRunnable(Runnable runnable) {
+        mFastFinishRunnable = runnable;
+    }
+
+    /** Callback at the end or early exit of the animation. */
+    public void fastFinish() {
+        if (isUninitialized()) return;
+        Runnable fastFinishRunnable = mFastFinishRunnable;
+        if (fastFinishRunnable != null) {
+            fastFinishRunnable.run();
+        }
+        Runnable endRunnable = mEndRunnable;
+        mEndRunnable = null;
+        if (endRunnable != null) {
+            endRunnable.run();
+        }
+    }
+
+    private void init(DragLayer dragLayer, LauncherAppWidgetHostView originalView,
+            RectF widgetBackgroundPosition, Rect windowTargetBounds, float windowCornerRadius) {
+        mAppWidgetView = originalView;
+        mAppWidgetView.beginDeferringUpdates();
+        mBackgroundPosition = widgetBackgroundPosition;
+        mEndRunnable = () -> finish(dragLayer);
+
+        mAppWidgetBackgroundView = RoundedCornerEnforcement.findBackground(mAppWidgetView);
+        if (mAppWidgetBackgroundView == null) {
+            mAppWidgetBackgroundView = mAppWidgetView;
+        }
+
+        getRelativePosition(mAppWidgetBackgroundView, dragLayer, mBackgroundPosition);
+        getRelativePosition(mAppWidgetBackgroundView, mAppWidgetView, mBackgroundOffset);
+        mBackgroundView.init(mAppWidgetView, mAppWidgetBackgroundView, windowCornerRadius);
+        // Layout call before GhostView creation so that the overlaid view isn't clipped
+        layout(0, 0, windowTargetBounds.width(), windowTargetBounds.height());
+        mForegroundOverlayView = GhostView.addGhost(mAppWidgetView, this);
+        positionViews();
+
+        mListenerView.setListener(this::fastFinish);
+        dragLayer.addView(mListenerView);
+    }
+
+    /**
+     * Updates the position and opacity of the floating widget's components.
+     *
+     * @param backgroundPosition      the new position of the widget's background relative to the
+     *                                {@link FloatingWidgetView}'s parent
+     * @param floatingWidgetAlpha     the overall opacity of the {@link FloatingWidgetView}
+     * @param foregroundAlpha         the opacity of the foreground layer
+     * @param fallbackBackgroundAlpha the opacity of the fallback background used when the App
+     *                                Widget doesn't have a background
+     * @param cornerRadiusProgress    progress of the corner radius animation, where 0 is the
+     *                                original radius and 1 is the window radius
+     */
+    public void update(RectF backgroundPosition, float floatingWidgetAlpha, float foregroundAlpha,
+            float fallbackBackgroundAlpha, float cornerRadiusProgress) {
+        if (isUninitialized()) return;
+        setAlpha(floatingWidgetAlpha);
+        mBackgroundView.update(cornerRadiusProgress, fallbackBackgroundAlpha);
+        mAppWidgetView.setAlpha(foregroundAlpha);
+        mBackgroundPosition = backgroundPosition;
+        positionViews();
+    }
+
+    /** Sets the layout parameters of the floating view and its background view child. */
+    private void positionViews() {
+        LayoutParams layoutParams = (LayoutParams) getLayoutParams();
+        layoutParams.setMargins(0, 0, 0, 0);
+        setLayoutParams(layoutParams);
+
+        // FloatingWidgetView layout is forced LTR
+        mBackgroundView.setTranslationX(mBackgroundPosition.left);
+        mBackgroundView.setTranslationY(mBackgroundPosition.top);
+        LayoutParams backgroundParams = (LayoutParams) mBackgroundView.getLayoutParams();
+        backgroundParams.leftMargin = 0;
+        backgroundParams.topMargin = 0;
+        backgroundParams.width = (int) mBackgroundPosition.width();
+        backgroundParams.height = (int) mBackgroundPosition.height();
+        mBackgroundView.setLayoutParams(backgroundParams);
+
+        sTmpMatrix.reset();
+        float foregroundScale = mBackgroundPosition.width() / mAppWidgetBackgroundView.getWidth();
+        sTmpMatrix.setTranslate(-mBackgroundOffset.left - mAppWidgetView.getLeft(),
+                -mBackgroundOffset.top - mAppWidgetView.getTop());
+        sTmpMatrix.postScale(foregroundScale, foregroundScale);
+        sTmpMatrix.postTranslate(mBackgroundPosition.left, mBackgroundPosition.top);
+        mForegroundOverlayView.setMatrix(sTmpMatrix);
+    }
+
+    private void finish(DragLayer dragLayer) {
+        mAppWidgetView.setAlpha(1f);
+        GhostView.removeGhost(mAppWidgetView);
+        ((ViewGroup) dragLayer.getParent()).removeView(this);
+        dragLayer.removeView(mListenerView);
+        mBackgroundView.finish();
+        mAppWidgetView.endDeferringUpdates();
+        recycle();
+        mLauncher.getViewCache().recycleView(R.layout.floating_widget_view, this);
+    }
+
+    public float getInitialCornerRadius() {
+        return mBackgroundView.getMaximumRadius();
+    }
+
+    private boolean isUninitialized() {
+        return mForegroundOverlayView == null;
+    }
+
+    private void recycle() {
+        mEndRunnable = null;
+        mFastFinishRunnable = null;
+        mBackgroundPosition = null;
+        mListenerView.setListener(null);
+        mAppWidgetView = null;
+        mForegroundOverlayView = null;
+        mAppWidgetBackgroundView = null;
+        mBackgroundView.recycle();
+    }
+
+    /**
+     * Configures and returns a an instance of {@link FloatingWidgetView} matching the appearance of
+     * {@param originalView}.
+     *
+     * @param widgetBackgroundPosition a {@link RectF} that will be updated with the widget's
+     *                                 background bounds
+     * @param windowTargetBounds       the bounds of the window when launched
+     * @param windowCornerRadius       the corner radius of the window
+     */
+    public static FloatingWidgetView getFloatingWidgetView(Launcher launcher,
+            LauncherAppWidgetHostView originalView, RectF widgetBackgroundPosition,
+            Rect windowTargetBounds, float windowCornerRadius) {
+        final DragLayer dragLayer = launcher.getDragLayer();
+        ViewGroup parent = (ViewGroup) dragLayer.getParent();
+        FloatingWidgetView floatingView =
+                launcher.getViewCache().getView(R.layout.floating_widget_view, launcher, parent);
+        floatingView.recycle();
+
+        floatingView.init(dragLayer, originalView, widgetBackgroundPosition, windowTargetBounds,
+                windowCornerRadius);
+        parent.addView(floatingView);
+        return floatingView;
+    }
+
+    private static void getRelativePosition(View descendant, View ancestor, RectF position) {
+        float[] points = new float[]{0, 0, descendant.getWidth(), descendant.getHeight()};
+        Utilities.getDescendantCoordRelativeToAncestor(descendant, ancestor, points,
+                false /* includeRootScroll */);
+        position.set(
+                Math.min(points[0], points[2]),
+                Math.min(points[1], points[3]),
+                Math.max(points[0], points[2]),
+                Math.max(points[1], points[3]));
+    }
+}
diff --git a/res/layout/floating_widget_view.xml b/res/layout/floating_widget_view.xml
new file mode 100644
index 0000000000..eea7a9220c
--- /dev/null
+++ b/res/layout/floating_widget_view.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.quickstep.views.FloatingWidgetView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layoutDirection="ltr" />
-- 
GitLab


From da0e0e3c1c5d80dd9d9e2f8f504ef037345d279d Mon Sep 17 00:00:00 2001
From: Andras Kloczl <andraskloczl@google.com>
Date: Tue, 27 Apr 2021 11:19:26 +0200
Subject: [PATCH 0989/1664] Add animation for all visible pages on home screen.

When an app is opened from the home screen there's a
slight animation that was only playing on the current
page and not on all the visible pages.

Test: manual
Bug: 174464691
Change-Id: Ia32cbf6d6277882a0c33063e78acdf1ccc4a5acc
---
 .../launcher3/QuickstepTransitionManager.java | 35 +++++++++----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 5b1b59b601..c93b23fe73 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -100,7 +100,9 @@ import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.
 import com.android.systemui.shared.system.WindowManagerWrapper;
 import com.android.wm.shell.startingsurface.IStartingWindowListener;
 
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.List;
 
 /**
  * Manages the opening and closing app transitions from Launcher
@@ -457,32 +459,29 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
             alpha.setInterpolator(LINEAR);
             launcherAnimator.play(alpha);
 
+            List<View> viewsToAnimate = new ArrayList<>();
+
             Workspace workspace = mLauncher.getWorkspace();
-            View currentPage = ((CellLayout) workspace.getChildAt(workspace.getCurrentPage()))
-                    .getShortcutsAndWidgets();
-            View hotseat = mLauncher.getHotseat();
-            View qsb = mLauncher.findViewById(R.id.search_container_all_apps);
+            workspace.getVisiblePages().forEach(
+                    view -> viewsToAnimate.add(((CellLayout) view).getShortcutsAndWidgets()));
 
-            currentPage.setLayerType(View.LAYER_TYPE_HARDWARE, null);
-            hotseat.setLayerType(View.LAYER_TYPE_HARDWARE, null);
-            qsb.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+            viewsToAnimate.add(mLauncher.getHotseat());
+            // Add QSB
+            viewsToAnimate.add(mLauncher.findViewById(R.id.search_container_all_apps));
 
-            launcherAnimator.play(ObjectAnimator.ofFloat(currentPage, View.TRANSLATION_Y, trans));
-            launcherAnimator.play(ObjectAnimator.ofFloat(hotseat, View.TRANSLATION_Y, trans));
-            launcherAnimator.play(ObjectAnimator.ofFloat(qsb, View.TRANSLATION_Y, trans));
+            viewsToAnimate.forEach(view -> {
+                view.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+                launcherAnimator.play(ObjectAnimator.ofFloat(view, View.TRANSLATION_Y, trans));
+            });
 
             // Pause page indicator animations as they lead to layer trashing.
             mLauncher.getWorkspace().getPageIndicator().pauseAnimations();
 
             endListener = () -> {
-                currentPage.setTranslationY(0);
-                hotseat.setTranslationY(0);
-                qsb.setTranslationY(0);
-
-                currentPage.setLayerType(View.LAYER_TYPE_NONE, null);
-                hotseat.setLayerType(View.LAYER_TYPE_NONE, null);
-                qsb.setLayerType(View.LAYER_TYPE_NONE, null);
-
+                viewsToAnimate.forEach(view -> {
+                    view.setTranslationY(0);
+                    view.setLayerType(View.LAYER_TYPE_NONE, null);
+                });
                 mDragLayerAlpha.setValue(1f);
                 mLauncher.getWorkspace().getPageIndicator().skipAnimationsToEnd();
             };
-- 
GitLab


From bb1e047dd8c7fe6c765eca8e4d838145b64a2cc7 Mon Sep 17 00:00:00 2001
From: Bill Lin <lbill@google.com>
Date: Tue, 27 Apr 2021 10:13:29 +0000
Subject: [PATCH 0990/1664] Revert "Revert "2/ Resolve gesture one handed
 conflicts swipe up..."

Revert "Revert "1/ Add onStartTransition() callback for SYSUI_ST..."

Revert submission 14315426-revert_fix_ohm_exit_flicker

Reason for revert: The root cause of b/186197537 is ag/14296935
I should safe to re-landing the 2 CLs

Reverted Changes:
Ifd17094f0:Revert "1/ Add onStartTransition() callback for SY...
Ia921d073c:Revert "2/ Resolve gesture one handed conflicts sw...

Change-Id: If2164819e96919ca8c0c184639b3cbff0f91caf5
---
 .../src/com/android/quickstep/TouchInteractionService.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index e9d2eb4632..417b6166d4 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -506,7 +506,8 @@ public class TouchInteractionService extends Service implements PluginListener<O
             }
             mRotationTouchHelper.setOrientationTransformIfNeeded(event);
 
-            if (mRotationTouchHelper.isInSwipeUpTouchRegion(event)) {
+            if (!mDeviceState.isOneHandedModeActive()
+                    && mRotationTouchHelper.isInSwipeUpTouchRegion(event)) {
                 if (TestProtocol.sDebugTracing) {
                     Log.d(TestProtocol.NO_SWIPE_TO_HOME,
                             "TouchInteractionService.onInputEvent:isInSwipeUpTouchRegion");
@@ -535,8 +536,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
                             InputConsumer.NO_OP, mInputMonitorCompat,
                             mDeviceState,
                             event);
-                } else if (mDeviceState.canTriggerOneHandedAction(event)
-                    && !mDeviceState.isOneHandedModeActive()) {
+                } else if (mDeviceState.canTriggerOneHandedAction(event)) {
                     // Consume gesture event for triggering one handed feature.
                     mUncheckedConsumer = new OneHandedModeInputConsumer(this, mDeviceState,
                         InputConsumer.NO_OP, mInputMonitorCompat);
-- 
GitLab


From 9e6b8d6715996604109bda1c3839a49662c784ae Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Tue, 27 Apr 2021 12:32:55 +0100
Subject: [PATCH 0991/1664] Only show ActionsView when GestureEndTarget is
 RECENTS

- Also, only animate ActionsView out if it's visible

Fixes: 186507807
Test: Restart launcher, swipe up from home, ActionsView is not shown
Change-Id: I7a83b39cea5176efd40552e3a2dd2257d9e2db4c
---
 .../android/quickstep/views/RecentsView.java  | 25 +++----------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 41076f3bba..2a3b86eb77 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1677,7 +1677,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         setRunningTaskHidden(false);
         animateUpRunningTaskIconScale();
 
-        if (!showAsGrid() || getFocusedTaskView() != null) {
+        if (mCurrentGestureEndTarget == GestureState.GestureEndTarget.RECENTS
+                && (!showAsGrid() || getFocusedTaskView() != null)) {
             animateActionsViewIn();
         }
 
@@ -2001,25 +2002,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         }
         AnimatorSet gridTranslationAnimatorSet = new AnimatorSet();
         gridTranslationAnimatorSet.playTogether(gridTranslationAnimators);
-        gridTranslationAnimatorSet.addListener(new AnimatorListenerAdapter() {
-            @Override
-            // Allow the actions view to display again once in focus mode
-            public void onAnimationEnd(Animator animation) {
-                super.onAnimationEnd(animation);
-                if (getFocusedTaskView() == null) {
-                    mActionsView.getScrollAlpha().setValue(1);
-                }
-            }
-
-            @Override
-            // Hide the actions view if not in focus mode
-            public void onAnimationStart(Animator animation) {
-                super.onAnimationStart(animation);
-                if (getFocusedTaskView() == null) {
-                    mActionsView.getScrollAlpha().setValue(0);
-                }
-            }
-        });
         gridTranslationAnimatorSet.start();
 
         // Use the accumulated translation of the row containing the last task.
@@ -2322,7 +2304,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                         snapToPageImmediately(pageToSnapTo);
                         // Grid got messed up, reapply.
                         updateGridProperties(taskView, draggedIndex - mTaskViewStartIndex);
-                        if (showAsGrid() && getFocusedTaskView() == null) {
+                        if (showAsGrid() && getFocusedTaskView() == null
+                                && mActionsView.getVisibilityAlpha().getValue() == 1) {
                             animateActionsViewOut();
                         }
                     }
-- 
GitLab


From fd68f757c8525d6e589e387ed9b46d69c00b6e95 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 26 Apr 2021 21:58:30 +0100
Subject: [PATCH 0992/1664] Add a11y action for expand / collapse items in
 WidgetsFullSheet

Test: Enable talkback. When focusing on a collapsed item, it announces
      Collapsed "App Name" "n widgets/shortcuts". Action available. Use
      tap with 3 fingers to view. 3 fingers tap > Action > Expand.
      Widgets are expanded.
      When focusing on an expanded item, it announces
      Expanded "App Name" "n widgets/shortcuts". Action available. Use
      tap with 3 fingers to view. 3 fingers tap > Action > Collapse.
      Widgets are collapsed.
Bug: 183120145
Change-Id: Ibbb6025b929c141aa9e2fd2c72dce314e8be837e
---
 res/layout/widgets_list_row_header.xml        |  1 +
 .../widget/picker/WidgetsListHeader.java      | 33 ++++++++++++++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/res/layout/widgets_list_row_header.xml b/res/layout/widgets_list_row_header.xml
index 8259c16612..cec32eabb0 100644
--- a/res/layout/widgets_list_row_header.xml
+++ b/res/layout/widgets_list_row_header.xml
@@ -35,6 +35,7 @@
         tools:src="@drawable/ic_corp"/>
 
     <LinearLayout
+        android:id="@+id/app_container"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListHeader.java b/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
index 8794a4a7e7..ccf3187770 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
@@ -19,7 +19,10 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
+import android.os.Bundle;
 import android.util.AttributeSet;
+import android.view.View;
+import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -94,6 +97,32 @@ public final class WidgetsListHeader extends LinearLayout implements ItemInfoUpd
         mTitle = findViewById(R.id.app_title);
         mSubtitle = findViewById(R.id.app_subtitle);
         mExpandToggle = findViewById(R.id.toggle);
+        findViewById(R.id.app_container).setAccessibilityDelegate(new AccessibilityDelegate() {
+
+            @Override
+            public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) {
+                if (mIsExpanded) {
+                    info.removeAction(AccessibilityNodeInfo.ACTION_EXPAND);
+                    info.addAction(AccessibilityNodeInfo.ACTION_COLLAPSE);
+                } else {
+                    info.removeAction(AccessibilityNodeInfo.ACTION_COLLAPSE);
+                    info.addAction(AccessibilityNodeInfo.ACTION_EXPAND);
+                }
+                super.onInitializeAccessibilityNodeInfo(host, info);
+            }
+
+            @Override
+            public boolean performAccessibilityAction(View host, int action, Bundle args) {
+                switch (action) {
+                    case AccessibilityNodeInfo.ACTION_EXPAND:
+                    case AccessibilityNodeInfo.ACTION_COLLAPSE:
+                        callOnClick();
+                        return true;
+                    default:
+                        return super.performAccessibilityAction(host, action, args);
+                }
+            }
+        });
     }
 
     /**
@@ -106,7 +135,9 @@ public final class WidgetsListHeader extends LinearLayout implements ItemInfoUpd
         // Use the entire touch area of this view to expand / collapse an app widgets section.
         setOnClickListener(view -> {
             setExpanded(!mIsExpanded);
-            onExpandChangeListener.onExpansionChange(mIsExpanded);
+            if (onExpandChangeListener != null) {
+                onExpandChangeListener.onExpansionChange(mIsExpanded);
+            }
         });
     }
 
-- 
GitLab


From 8ac1a576f237923b57d62a84c761945f000b81ff Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Tue, 27 Apr 2021 15:11:55 +0100
Subject: [PATCH 0993/1664] Apply TaskView's (non)fullscreenTranslation
 correctly in emulated landscape

PS4: Change approach to return a FloatProperty instead, as getPagedOrientationHandler() can throw NPE when called without a parent, as applyTranslationX/Y is called in onRecycle

Fixes: 186432016
Test: In small screen without home screen rotation, TaskView stay in position when rotating and icon is in displayed correct position after rotation. In quick switch, Task window also fill the screen.
Test: In large screen when dragging up from last task in quick switch, TaskView stays on screen when being dragged up
Change-Id: I54247e81066913e5cc072cf72543d780ff55ccaf
---
 .../android/quickstep/views/RecentsView.java  |  15 ++-
 .../com/android/quickstep/views/TaskView.java | 102 ++++++++++++++++--
 2 files changed, 102 insertions(+), 15 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 2a3b86eb77..51090dfbce 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1277,23 +1277,20 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         }
 
         float accumulatedTranslationX = 0;
-        float[] fullscreenTranslations = new float[taskCount];
         for (int i = 0; i < taskCount; i++) {
             TaskView taskView = getTaskViewAt(i);
             taskView.updateTaskSize();
-            fullscreenTranslations[i] += accumulatedTranslationX;
+            taskView.getPrimaryFullscreenTranslationProperty().set(taskView,
+                    accumulatedTranslationX);
+            taskView.getSecondaryFullscreenTranslationProperty().set(taskView, 0f);
             // Compensate space caused by TaskView scaling.
             float widthDiff =
                     taskView.getLayoutParams().width * (1 - taskView.getFullscreenScale());
             // Compensate page spacing widening caused by RecentsView scaling.
             widthDiff += mPageSpacing * (1 - 1 / mFullscreenScale);
-            float fullscreenTranslationX = mIsRtl ? widthDiff : -widthDiff;
-            accumulatedTranslationX += fullscreenTranslationX;
+            accumulatedTranslationX += mIsRtl ? widthDiff : -widthDiff;
         }
 
-        for (int i = 0; i < taskCount; i++) {
-            getTaskViewAt(i).setFullscreenTranslationX(fullscreenTranslations[i]);
-        }
         mClearAllButton.setFullscreenTranslationPrimary(accumulatedTranslationX);
 
         updateGridProperties();
@@ -1998,7 +1995,9 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 gridTranslationAnimators.add(taskDismissAnimator);
             }
             taskView.setGridTranslationX(gridTranslations[i] - snappedTaskGridTranslationX);
-            taskView.setNonFullscreenTranslationX(snappedTaskFullscreenScrollAdjustment);
+            taskView.getPrimaryNonFullscreenTranslationProperty().set(taskView,
+                    snappedTaskFullscreenScrollAdjustment);
+            taskView.getSecondaryNonFullscreenTranslationProperty().set(taskView, 0f);
         }
         AnimatorSet gridTranslationAnimatorSet = new AnimatorSet();
         gridTranslationAnimatorSet.playTogether(gridTranslationAnimators);
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 35acdd188a..ef9eefc351 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -250,6 +250,58 @@ public class TaskView extends FrameLayout implements Reusable {
                 }
             };
 
+    private static final FloatProperty<TaskView> FULLSCREEN_TRANSLATION_X =
+            new FloatProperty<TaskView>("fullscreenTranslationX") {
+                @Override
+                public void setValue(TaskView taskView, float v) {
+                    taskView.setFullscreenTranslationX(v);
+                }
+
+                @Override
+                public Float get(TaskView taskView) {
+                    return taskView.mFullscreenTranslationX;
+                }
+            };
+
+    private static final FloatProperty<TaskView> FULLSCREEN_TRANSLATION_Y =
+            new FloatProperty<TaskView>("fullscreenTranslationY") {
+                @Override
+                public void setValue(TaskView taskView, float v) {
+                    taskView.setFullscreenTranslationY(v);
+                }
+
+                @Override
+                public Float get(TaskView taskView) {
+                    return taskView.mFullscreenTranslationY;
+                }
+            };
+
+    private static final FloatProperty<TaskView> NON_FULLSCREEN_TRANSLATION_X =
+            new FloatProperty<TaskView>("nonFullscreenTranslationX") {
+                @Override
+                public void setValue(TaskView taskView, float v) {
+                    taskView.setNonFullscreenTranslationX(v);
+                }
+
+                @Override
+                public Float get(TaskView taskView) {
+                    return taskView.mNonFullscreenTranslationX;
+                }
+            };
+
+    private static final FloatProperty<TaskView> NON_FULLSCREEN_TRANSLATION_Y =
+            new FloatProperty<TaskView>("nonFullscreenTranslationY") {
+                @Override
+                public void setValue(TaskView taskView, float v) {
+                    taskView.setNonFullscreenTranslationY(v);
+                }
+
+                @Override
+                public Float get(TaskView taskView) {
+                    return taskView.mNonFullscreenTranslationY;
+                }
+            };
+
     private static final FloatProperty<TaskView> COLOR_TINT =
             new FloatProperty<TaskView>("colorTint") {
                 @Override
@@ -284,9 +336,11 @@ public class TaskView extends FrameLayout implements Reusable {
     private float mTaskResistanceTranslationY;
     // The following translation variables should only be used in the same orientation as Launcher.
     private float mFullscreenTranslationX;
+    private float mFullscreenTranslationY;
     // Applied as a complement to fullscreenTranslation, for adjusting the carousel overview, or the
     // in transition carousel before forming the grid on tablets.
     private float mNonFullscreenTranslationX;
+    private float mNonFullscreenTranslationY;
     private float mBoxTranslationY;
     // The following grid translations scales with mGridProgress.
     private float mGridTranslationX;
@@ -786,8 +840,9 @@ public class TaskView extends FrameLayout implements Reusable {
 
     @Override
     public void onRecycle() {
-        mFullscreenTranslationX = mNonFullscreenTranslationX =
-                mGridTranslationX = mGridTranslationY = mBoxTranslationY = 0f;
+        mFullscreenTranslationX = mFullscreenTranslationY = mNonFullscreenTranslationX =
+                mNonFullscreenTranslationY = mGridTranslationX = mGridTranslationY =
+                        mBoxTranslationY = 0f;
         resetViewTransforms();
         // Clear any references to the thumbnail (it will be re-read either from the cache or the
         // system on next bind)
@@ -929,16 +984,26 @@ public class TaskView extends FrameLayout implements Reusable {
         applyTranslationY();
     }
 
-    public void setFullscreenTranslationX(float fullscreenTranslationX) {
+    private void setFullscreenTranslationX(float fullscreenTranslationX) {
         mFullscreenTranslationX = fullscreenTranslationX;
         applyTranslationX();
     }
 
-    public void setNonFullscreenTranslationX(float nonFullscreenTranslationX) {
+    private void setFullscreenTranslationY(float fullscreenTranslationY) {
+        mFullscreenTranslationY = fullscreenTranslationY;
+        applyTranslationY();
+    }
+
+    private void setNonFullscreenTranslationX(float nonFullscreenTranslationX) {
         mNonFullscreenTranslationX = nonFullscreenTranslationX;
         applyTranslationX();
     }
 
+    private void setNonFullscreenTranslationY(float nonFullscreenTranslationY) {
+        mNonFullscreenTranslationY = nonFullscreenTranslationY;
+        applyTranslationY();
+    }
+
     public void setGridTranslationX(float gridTranslationX) {
         mGridTranslationX = gridTranslationX;
         applyTranslationX();
@@ -960,9 +1025,9 @@ public class TaskView extends FrameLayout implements Reusable {
     public float getScrollAdjustment(boolean fullscreenEnabled, boolean gridEnabled) {
         float scrollAdjustment = 0;
         if (fullscreenEnabled) {
-            scrollAdjustment += mFullscreenTranslationX;
+            scrollAdjustment += getPrimaryFullscreenTranslationProperty().get(this);
         } else {
-            scrollAdjustment += mNonFullscreenTranslationX;
+            scrollAdjustment += getPrimaryNonFullscreenTranslationProperty().get(this);
         }
         if (gridEnabled) {
             scrollAdjustment += mGridTranslationX;
@@ -1012,7 +1077,10 @@ public class TaskView extends FrameLayout implements Reusable {
      * change according to a temporary state (e.g. task offset).
      */
     public float getPersistentTranslationY() {
-        return getGridTrans(mGridTranslationY) + mBoxTranslationY;
+        return mBoxTranslationY
+                + getFullscreenTrans(mFullscreenTranslationY)
+                + getNonFullscreenTrans(mNonFullscreenTranslationY)
+                + getGridTrans(mGridTranslationY);
     }
 
     public FloatProperty<TaskView> getPrimaryDismissTranslationProperty() {
@@ -1035,6 +1103,26 @@ public class TaskView extends FrameLayout implements Reusable {
                 TASK_RESISTANCE_TRANSLATION_X, TASK_RESISTANCE_TRANSLATION_Y);
     }
 
+    public FloatProperty<TaskView> getPrimaryFullscreenTranslationProperty() {
+        return getPagedOrientationHandler().getPrimaryValue(
+                FULLSCREEN_TRANSLATION_X, FULLSCREEN_TRANSLATION_Y);
+    }
+
+    public FloatProperty<TaskView> getSecondaryFullscreenTranslationProperty() {
+        return getPagedOrientationHandler().getSecondaryValue(
+                FULLSCREEN_TRANSLATION_X, FULLSCREEN_TRANSLATION_Y);
+    }
+
+    public FloatProperty<TaskView> getPrimaryNonFullscreenTranslationProperty() {
+        return getPagedOrientationHandler().getPrimaryValue(
+                NON_FULLSCREEN_TRANSLATION_X, NON_FULLSCREEN_TRANSLATION_Y);
+    }
+
+    public FloatProperty<TaskView> getSecondaryNonFullscreenTranslationProperty() {
+        return getPagedOrientationHandler().getSecondaryValue(
+                NON_FULLSCREEN_TRANSLATION_X, NON_FULLSCREEN_TRANSLATION_Y);
+    }
+
     @Override
     public boolean hasOverlappingRendering() {
         // TODO: Clip-out the icon region from the thumbnail, since they are overlapping.
-- 
GitLab


From fc90688b43d4c543122da2ffc8d5ff16efd81008 Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Tue, 27 Apr 2021 11:29:17 -0700
Subject: [PATCH 0994/1664] [LSC] Add LOCAL_LICENSE_KINDS to
 packages/apps/Launcher3

Added SPDX-license-identifier-Apache-2.0 to:
  Android.mk

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I069f0fcd0652dcfd3e9c539e1f9bcb4c9225a10b
---
 Android.mk | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Android.mk b/Android.mk
index 54a80b7454..c222f24afa 100644
--- a/Android.mk
+++ b/Android.mk
@@ -47,6 +47,9 @@ LOCAL_FULL_LIBS_MANIFEST_FILES := \
 
 LOCAL_MANIFEST_FILE := go/AndroidManifest.xml
 LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.*
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
 include $(BUILD_PACKAGE)
 
 #
@@ -116,6 +119,9 @@ LOCAL_FULL_LIBS_MANIFEST_FILES := \
 LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml
 LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.*
 
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
 include $(BUILD_PACKAGE)
 
 
@@ -164,6 +170,9 @@ LOCAL_FULL_LIBS_MANIFEST_FILES := \
 
 LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml
 LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.*
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
 include $(BUILD_PACKAGE)
 
 
-- 
GitLab


From 4d35ac30201620fe2a1c558e9c659a16de7051e9 Mon Sep 17 00:00:00 2001
From: Zak Cohen <zakcohen@google.com>
Date: Fri, 23 Apr 2021 16:28:12 -0700
Subject: [PATCH 0995/1664] Allow Workspace Scrim to be colored per state

Make it possible to set the color of workspace scrim to a different color
per state. Motivated by making Overview Scrim and All Apps scrims different
colors.

Bug: 186253733
Test: Local build and flash
Change-Id: Id7c38ce3c9173308eedfcb7592ececa7bd6bf220
---
 .../uioverrides/states/AllAppsState.java      |  6 +++--
 .../uioverrides/states/OverviewState.java     |  5 ++--
 ...ButtonNavbarToOverviewTouchController.java | 10 ++++----
 .../NoButtonQuickSwitchTouchController.java   |  5 ++--
 res/color-v31/overview_scrim.xml              | 18 ++++++++++++++
 res/color-v31/overview_scrim_dark.xml         | 18 ++++++++++++++
 res/color/overview_scrim.xml                  | 18 ++++++++++++++
 res/color/overview_scrim_dark.xml             | 18 ++++++++++++++
 res/layout/launcher.xml                       |  3 +--
 res/values/attrs.xml                          |  1 +
 res/values/styles.xml                         |  2 ++
 .../android/launcher3/LauncherAnimUtils.java  | 18 ++++++++++++++
 src/com/android/launcher3/LauncherState.java  |  9 +++++--
 .../WorkspaceStateTransitionAnimation.java    |  5 ++--
 .../launcher3/anim/PendingAnimation.java      | 13 ++++++++++
 .../launcher3/anim/PropertySetter.java        |  9 +++++++
 .../android/launcher3/states/HintState.java   |  9 +++++--
 .../android/launcher3/views/ScrimView.java    | 24 ++++++++++++++-----
 .../uioverrides/states/AllAppsState.java      |  5 ++--
 .../uioverrides/states/OverviewState.java     |  8 +++++++
 20 files changed, 176 insertions(+), 28 deletions(-)
 create mode 100644 res/color-v31/overview_scrim.xml
 create mode 100644 res/color-v31/overview_scrim_dark.xml
 create mode 100644 res/color/overview_scrim.xml
 create mode 100644 res/color/overview_scrim_dark.xml

diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
index 4e03971517..a81bdd52ca 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
@@ -22,7 +22,9 @@ import android.content.Context;
 
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
+import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsContainerView;
+import com.android.launcher3.util.Themes;
 
 /**
  * Definition for AllApps state
@@ -92,7 +94,7 @@ public class AllAppsState extends LauncherState {
     }
 
     @Override
-    public float getWorkspaceScrimAlpha(Launcher launcher) {
-        return 1;
+    public int getWorkspaceScrimColor(Launcher launcher) {
+        return Themes.getAttrColor(launcher, R.attr.allAppsScrimColor);
     }
 }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
index 30c07b050f..135c47865b 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -29,6 +29,7 @@ import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.Workspace;
 import com.android.launcher3.config.FeatureFlags;
+import com.android.launcher3.util.Themes;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.util.LayoutUtils;
 import com.android.quickstep.views.RecentsView;
@@ -108,8 +109,8 @@ public class OverviewState extends LauncherState {
     }
 
     @Override
-    public float getWorkspaceScrimAlpha(Launcher launcher) {
-        return 1f;
+    public int getWorkspaceScrimColor(Launcher launcher) {
+        return Themes.getAttrColor(launcher, R.attr.overviewScrimColor);
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
index 694998c476..2d95ce2b98 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -16,7 +16,7 @@
 
 package com.android.launcher3.uioverrides.touchcontrollers;
 
-import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA;
+import static com.android.launcher3.LauncherAnimUtils.VIEW_BACKGROUND_COLOR;
 import static com.android.launcher3.LauncherAnimUtils.newCancelListener;
 import static com.android.launcher3.LauncherState.ALL_APPS;
 import static com.android.launcher3.LauncherState.HINT_STATE;
@@ -127,11 +127,11 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
         }
 
         if (mFromState == NORMAL && mToState == HINT_STATE) {
-            mNormalToHintOverviewScrimAnimator = ObjectAnimator.ofFloat(
+            mNormalToHintOverviewScrimAnimator = ObjectAnimator.ofArgb(
                     mLauncher.getScrimView(),
-                    VIEW_ALPHA,
-                    mFromState.getWorkspaceScrimAlpha(mLauncher),
-                    mToState.getWorkspaceScrimAlpha(mLauncher));
+                    VIEW_BACKGROUND_COLOR,
+                    mFromState.getWorkspaceScrimColor(mLauncher),
+                    mToState.getWorkspaceScrimColor(mLauncher));
         }
         mStartedOverview = false;
         mReachedOverview = false;
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
index 77b0804dd5..12de4a67f1 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
@@ -15,7 +15,6 @@
  */
 package com.android.launcher3.uioverrides.touchcontrollers;
 
-import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA;
 import static com.android.launcher3.LauncherAnimUtils.newCancelListener;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
@@ -232,8 +231,8 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
         //   - OverviewScrim
         PendingAnimation xAnim = new PendingAnimation((long) (mXRange * 2));
         xAnim.setFloat(mRecentsView, ADJACENT_PAGE_OFFSET, scaleAndOffset[1], LINEAR);
-        xAnim.setFloat(mLauncher.getScrimView(), VIEW_ALPHA,
-                toState.getWorkspaceScrimAlpha(mLauncher), LINEAR);
+        xAnim.setViewBackgroundColor(mLauncher.getScrimView(),
+                toState.getWorkspaceScrimColor(mLauncher), LINEAR);
         mXOverviewAnim = xAnim.createPlaybackController();
         mXOverviewAnim.dispatchOnStart();
 
diff --git a/res/color-v31/overview_scrim.xml b/res/color-v31/overview_scrim.xml
new file mode 100644
index 0000000000..80799957ff
--- /dev/null
+++ b/res/color-v31/overview_scrim.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:color="@android:color/system_neutral2_500" android:lStar="87" />
+</selector>
diff --git a/res/color-v31/overview_scrim_dark.xml b/res/color-v31/overview_scrim_dark.xml
new file mode 100644
index 0000000000..b8ed7747e0
--- /dev/null
+++ b/res/color-v31/overview_scrim_dark.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:color="@android:color/system_neutral1_800" />
+</selector>
diff --git a/res/color/overview_scrim.xml b/res/color/overview_scrim.xml
new file mode 100644
index 0000000000..48cf5763a1
--- /dev/null
+++ b/res/color/overview_scrim.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:color="#30000000" />
+</selector>
diff --git a/res/color/overview_scrim_dark.xml b/res/color/overview_scrim_dark.xml
new file mode 100644
index 0000000000..48cf5763a1
--- /dev/null
+++ b/res/color/overview_scrim_dark.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:color="#30000000" />
+</selector>
diff --git a/res/layout/launcher.xml b/res/layout/launcher.xml
index f34e68588b..039d8d30fd 100644
--- a/res/layout/launcher.xml
+++ b/res/layout/launcher.xml
@@ -66,8 +66,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:id="@+id/scrim_view"
-            android:background="?attr/allAppsScrimColor"
-            android:alpha="0" />
+            android:background="@android:color/transparent" />
 
         <include
             android:id="@+id/apps_view"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 7fe53d5ae7..df42828cf9 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -36,6 +36,7 @@
     <attr name="widgetsTheme" format="reference" />
     <attr name="iconOnlyShortcutColor" format="color" />
     <attr name="eduHalfSheetBGColor" format="color" />
+    <attr name="overviewScrimColor" format="color" />
 
     <attr name="folderDotColor" format="color" />
     <attr name="folderFillColor" format="color" />
diff --git a/res/values/styles.xml b/res/values/styles.xml
index bae1485a93..beeae4b59c 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -58,6 +58,7 @@
         <item name="eduHalfSheetBGColor">?android:attr/colorAccent</item>
         <item name="disabledIconAlpha">.54</item>
         <item name="gridColor">?android:attr/colorAccent</item>
+        <item name="overviewScrimColor">@color/overview_scrim</item>
 
         <item name="android:windowTranslucentStatus">false</item>
         <item name="android:windowTranslucentNavigation">false</item>
@@ -115,6 +116,7 @@
         <item name="iconOnlyShortcutColor">#B3FFFFFF</item>
         <item name="workProfileOverlayTextColor">@android:color/white</item>
         <item name="eduHalfSheetBGColor">#DD000000</item>
+        <item name="overviewScrimColor">@color/overview_scrim_dark</item>
     </style>
 
     <style name="LauncherTheme.Dark.DarkMainColor" parent="@style/LauncherTheme.Dark">
diff --git a/src/com/android/launcher3/LauncherAnimUtils.java b/src/com/android/launcher3/LauncherAnimUtils.java
index 803f8d2c3d..b56c0127ff 100644
--- a/src/com/android/launcher3/LauncherAnimUtils.java
+++ b/src/com/android/launcher3/LauncherAnimUtils.java
@@ -19,6 +19,8 @@ package com.android.launcher3;
 import android.animation.Animator;
 import android.animation.Animator.AnimatorListener;
 import android.animation.AnimatorListenerAdapter;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.util.FloatProperty;
 import android.util.IntProperty;
@@ -135,6 +137,22 @@ public class LauncherAnimUtils {
                         }
                     };
 
+    public static final IntProperty<View> VIEW_BACKGROUND_COLOR =
+            new IntProperty<View>("backgroundColor") {
+                @Override
+                public void setValue(View view, int color) {
+                    view.setBackgroundColor(color);
+                }
+
+                @Override
+                public Integer get(View view) {
+                    if (!(view.getBackground() instanceof ColorDrawable)) {
+                        return Color.TRANSPARENT;
+                    }
+                    return ((ColorDrawable) view.getBackground()).getColor();
+                }
+            };
+
     /**
      * Utility method to create an {@link AnimatorListener} which executes a callback on animation
      * cancel.
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java
index 58df9c8f64..4c11725719 100644
--- a/src/com/android/launcher3/LauncherState.java
+++ b/src/com/android/launcher3/LauncherState.java
@@ -30,6 +30,7 @@ import static com.android.launcher3.testing.TestProtocol.QUICK_SWITCH_STATE_ORDI
 import static com.android.launcher3.testing.TestProtocol.SPRING_LOADED_STATE_ORDINAL;
 
 import android.content.Context;
+import android.graphics.Color;
 import android.view.animation.Interpolator;
 
 import com.android.launcher3.statemanager.BaseState;
@@ -217,8 +218,12 @@ public abstract class LauncherState implements BaseState<LauncherState> {
         return 0;
     }
 
-    public float getWorkspaceScrimAlpha(Launcher launcher) {
-        return 0;
+    /**
+     * What color should the workspace scrim be in when at rest in this state.
+     * Return {@link Color#TRANSPARENT} for no scrim.
+     */
+    public int getWorkspaceScrimColor(Launcher launcher) {
+        return Color.TRANSPARENT;
     }
 
     /**
diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
index ed854dcd0e..b35d702773 100644
--- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
+++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
@@ -166,8 +166,9 @@ public class WorkspaceStateTransitionAnimation {
         propertySetter.setFloat(sysUiScrim, SYSUI_PROGRESS,
                 state.hasFlag(FLAG_HAS_SYS_UI_SCRIM) ? 1 : 0, LINEAR);
 
-        propertySetter.setViewAlpha(mLauncher.getScrimView(),
-                state.getWorkspaceScrimAlpha(mLauncher),
+
+        propertySetter.setViewBackgroundColor(mLauncher.getScrimView(),
+                state.getWorkspaceScrimColor(mLauncher),
                 config.getInterpolator(ANIM_WORKSPACE_SCRIM_FADE, LINEAR));
     }
 
diff --git a/src/com/android/launcher3/anim/PendingAnimation.java b/src/com/android/launcher3/anim/PendingAnimation.java
index 9068331dbe..8057475fb4 100644
--- a/src/com/android/launcher3/anim/PendingAnimation.java
+++ b/src/com/android/launcher3/anim/PendingAnimation.java
@@ -16,6 +16,7 @@
 package com.android.launcher3.anim;
 
 import static com.android.launcher3.LauncherAnimUtils.SUCCESS_TRANSITION_PROGRESS;
+import static com.android.launcher3.LauncherAnimUtils.VIEW_BACKGROUND_COLOR;
 import static com.android.launcher3.anim.AnimatorPlaybackController.addAnimationHoldersRecur;
 
 import android.animation.Animator;
@@ -25,6 +26,7 @@ import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.TimeInterpolator;
 import android.animation.ValueAnimator;
+import android.graphics.drawable.ColorDrawable;
 import android.util.FloatProperty;
 import android.util.IntProperty;
 import android.view.View;
@@ -84,6 +86,17 @@ public class PendingAnimation implements PropertySetter {
         add(anim);
     }
 
+    @Override
+    public void setViewBackgroundColor(View view, int color, TimeInterpolator interpolator) {
+        if (view == null || (view.getBackground() instanceof ColorDrawable
+                && ((ColorDrawable) view.getBackground()).getColor() == color)) {
+            return;
+        }
+        ObjectAnimator anim = ObjectAnimator.ofArgb(view, VIEW_BACKGROUND_COLOR, color);
+        anim.setInterpolator(interpolator);
+        add(anim);
+    }
+
     @Override
     public <T> void setFloat(T target, FloatProperty<T> property, float value,
             TimeInterpolator interpolator) {
diff --git a/src/com/android/launcher3/anim/PropertySetter.java b/src/com/android/launcher3/anim/PropertySetter.java
index 2ce620bbe1..729523feb2 100644
--- a/src/com/android/launcher3/anim/PropertySetter.java
+++ b/src/com/android/launcher3/anim/PropertySetter.java
@@ -40,6 +40,15 @@ public interface PropertySetter {
         }
     }
 
+    /**
+     * Sets the background color of the provided view using the provided interpolator.
+     */
+    default void setViewBackgroundColor(View view, int color, TimeInterpolator interpolator) {
+        if (view != null) {
+            view.setBackgroundColor(color);
+        }
+    }
+
     /**
      * Updates the float property of the target using the provided interpolator
      */
diff --git a/src/com/android/launcher3/states/HintState.java b/src/com/android/launcher3/states/HintState.java
index 22c9d5ba44..8b520165ce 100644
--- a/src/com/android/launcher3/states/HintState.java
+++ b/src/com/android/launcher3/states/HintState.java
@@ -19,8 +19,12 @@ import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
 
 import android.content.Context;
 
+import androidx.core.graphics.ColorUtils;
+
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
+import com.android.launcher3.R;
+import com.android.launcher3.util.Themes;
 
 /**
  * Scale down workspace/hotseat to hint at going to either overview (on pause) or first home screen.
@@ -49,8 +53,9 @@ public class HintState extends LauncherState {
     }
 
     @Override
-    public float getWorkspaceScrimAlpha(Launcher launcher) {
-        return 0.4f;
+    public int getWorkspaceScrimColor(Launcher launcher) {
+        return ColorUtils.setAlphaComponent(
+                Themes.getAttrColor(launcher, R.attr.overviewScrimColor), 100);
     }
 
     @Override
diff --git a/src/com/android/launcher3/views/ScrimView.java b/src/com/android/launcher3/views/ScrimView.java
index c9424de152..722f57837a 100644
--- a/src/com/android/launcher3/views/ScrimView.java
+++ b/src/com/android/launcher3/views/ScrimView.java
@@ -19,6 +19,7 @@ import static com.android.launcher3.util.SystemUiController.UI_STATE_SCRIM_VIEW;
 
 import android.content.Context;
 import android.graphics.Rect;
+import android.graphics.drawable.ColorDrawable;
 import android.util.AttributeSet;
 import android.view.View;
 
@@ -26,9 +27,7 @@ import androidx.core.graphics.ColorUtils;
 
 import com.android.launcher3.Insettable;
 import com.android.launcher3.Launcher;
-import com.android.launcher3.R;
 import com.android.launcher3.util.SystemUiController;
-import com.android.launcher3.util.Themes;
 
 /**
  * Simple scrim which draws a flat color
@@ -36,13 +35,10 @@ import com.android.launcher3.util.Themes;
 public class ScrimView extends View implements Insettable {
     private static final float STATUS_BAR_COLOR_FORCE_UPDATE_THRESHOLD = 0.9f;
 
-    private final boolean mIsScrimDark;
     private SystemUiController mSystemUiController;
 
     public ScrimView(Context context, AttributeSet attrs) {
         super(context, attrs);
-        mIsScrimDark = ColorUtils.calculateLuminance(
-                Themes.getAttrColor(context, R.attr.allAppsScrimColor)) < 0.5f;
         setFocusable(false);
     }
 
@@ -60,6 +56,12 @@ public class ScrimView extends View implements Insettable {
         return super.onSetAlpha(alpha);
     }
 
+    @Override
+    public void setBackgroundColor(int color) {
+        updateSysUiColors();
+        super.setBackgroundColor(color);
+    }
+
     @Override
     protected void onVisibilityChanged(View changedView, int visibility) {
         super.onVisibilityChanged(changedView, visibility);
@@ -72,7 +74,7 @@ public class ScrimView extends View implements Insettable {
         boolean forceChange =
                 getVisibility() == VISIBLE && getAlpha() > STATUS_BAR_COLOR_FORCE_UPDATE_THRESHOLD;
         if (forceChange) {
-            getSystemUiController().updateUiState(UI_STATE_SCRIM_VIEW, !mIsScrimDark);
+            getSystemUiController().updateUiState(UI_STATE_SCRIM_VIEW, !isScrimDark());
         } else {
             getSystemUiController().updateUiState(UI_STATE_SCRIM_VIEW, 0);
         }
@@ -84,4 +86,14 @@ public class ScrimView extends View implements Insettable {
         }
         return mSystemUiController;
     }
+
+    private boolean isScrimDark() {
+        if (!(getBackground() instanceof ColorDrawable)) {
+            throw new IllegalStateException(
+                    "ScrimView must have a ColorDrawable background, this one has: "
+                            + getBackground());
+        }
+        return ColorUtils.calculateLuminance(
+                ((ColorDrawable) getBackground()).getColor()) < 0.5f;
+    }
 }
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java b/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java
index 53748b7ee9..978c321cb4 100644
--- a/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java
+++ b/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java
@@ -23,6 +23,7 @@ import android.content.Context;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
+import com.android.launcher3.util.Themes;
 
 /**
  * Definition for AllApps state
@@ -76,7 +77,7 @@ public class AllAppsState extends LauncherState {
     }
 
     @Override
-    public float getWorkspaceScrimAlpha(Launcher launcher) {
-        return 1;
+    public int getWorkspaceScrimColor(Launcher launcher) {
+        return Themes.getAttrColor(launcher, R.attr.allAppsScrimColor);
     }
 }
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java b/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java
index e85e505f35..d1543175f4 100644
--- a/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -19,7 +19,10 @@ import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERV
 
 import android.content.Context;
 
+import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
+import com.android.launcher3.R;
+import com.android.launcher3.util.Themes;
 
 /**
  * Definition for overview state
@@ -56,4 +59,9 @@ public class OverviewState extends LauncherState {
     public static OverviewState newSplitSelectState(int id) {
         return new OverviewState(id);
     }
+
+    @Override
+    public int getWorkspaceScrimColor(Launcher launcher) {
+        return Themes.getAttrColor(launcher, R.attr.overviewScrimColor);
+    }
 }
-- 
GitLab


From 6fe7df3fa8aa1fcfb7764ded9ea329aae31c3142 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Tue, 27 Apr 2021 18:26:29 +0100
Subject: [PATCH 0996/1664] Fix WidgetsBottomSheet inset bug after orientation
 change

Reset the inset upon orientation change

Test: Open bottom widgets picker. Rotate the screen from portrait
      to landscape and then back to portrait. Observe the correct
      inset is set.
Bug: 183601302
Change-Id: I88432a49b2601df843fe33911fd7acdde66d06c4
---
 .../android/launcher3/widget/WidgetsBottomSheet.java  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/com/android/launcher3/widget/WidgetsBottomSheet.java b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
index 155a285e84..f18b63e403 100644
--- a/src/com/android/launcher3/widget/WidgetsBottomSheet.java
+++ b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
@@ -20,6 +20,7 @@ import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 
 import android.animation.PropertyValuesHolder;
 import android.content.Context;
+import android.content.res.Configuration;
 import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.util.IntProperty;
@@ -71,6 +72,7 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
     private Rect mInsets;
     private final int mMaxTableHeight;
     private int mMaxHorizontalSpan = 4;
+    private Configuration mCurrentConfiguration;
 
     public WidgetsBottomSheet(Context context, AttributeSet attrs) {
         this(context, attrs, 0);
@@ -85,6 +87,7 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
         // Set the max table height to 2 / 3 of the grid height so that the bottom picker won't
         // take over the entire view vertically.
         mMaxTableHeight = deviceProfile.inv.numRows * 2 / 3  * deviceProfile.cellHeightPx;
+        mCurrentConfiguration = new Configuration(getResources().getConfiguration());
     }
 
     @Override
@@ -211,6 +214,14 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
         setPadding(leftInset, getPaddingTop(), rightInset, bottomInset);
     }
 
+    @Override
+    protected void onConfigurationChanged(Configuration newConfig) {
+        if (mCurrentConfiguration.orientation != newConfig.orientation) {
+            mInsets.setEmpty();
+        }
+        mCurrentConfiguration.updateFrom(newConfig);
+    }
+
     @Override
     protected Pair<View, String> getAccessibilityTarget() {
         return Pair.create(findViewById(R.id.title),  getContext().getString(
-- 
GitLab


From df84326662bde2329757ada9fa624be652def9d2 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 27 Apr 2021 14:33:04 -0700
Subject: [PATCH 0997/1664] Add some logging for the app icon in overview

Bug: 186444448
Test: Presubmit
Change-Id: Iaa5aef39a461b8e37ec9f4e85d7a0d21233bf40f
---
 .../com/android/quickstep/TaskAnimationManager.java  |  1 +
 .../src/com/android/quickstep/views/RecentsView.java | 12 ++++++------
 .../src/com/android/quickstep/views/TaskView.java    |  3 +++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/TaskAnimationManager.java b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
index b6dad2d385..c87cd171be 100644
--- a/quickstep/src/com/android/quickstep/TaskAnimationManager.java
+++ b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
@@ -86,6 +86,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
     @UiThread
     public RecentsAnimationCallbacks startRecentsAnimation(GestureState gestureState,
             Intent intent, RecentsAnimationCallbacks.RecentsAnimationListener listener) {
+        Log.d("b/186444448", "startRecentsAnimation");
         // Notify if recents animation is still running
         if (mController != null) {
             String msg = "New recents animation started before old animation completed";
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 51090dfbce..596f74688d 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1597,8 +1597,9 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
      * {@link #onGestureAnimationStart} and {@link #onGestureAnimationEnd()}.
      */
     public void onSwipeUpAnimationSuccess() {
+        Log.d("b/186444448", "onSwipeUpAnimationSuccess");
         if (getRunningTaskView() != null) {
-            animateUpRunningTaskIconScale(0f);
+            animateUpRunningTaskIconScale();
         }
         setSwipeDownShouldLaunchApp(true);
     }
@@ -1661,6 +1662,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
      * Called when a gesture from an app has finished, and the animation to the target has ended.
      */
     public void onGestureAnimationEnd() {
+        Log.d("b/186444448", "onGestureEnd");
         mGestureActive = false;
         if (mOrientationState.setGestureActive(false)) {
             updateOrientationHandler();
@@ -1815,15 +1817,13 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     }
 
     public void animateUpRunningTaskIconScale() {
-        animateUpRunningTaskIconScale(0);
-    }
-
-    public void animateUpRunningTaskIconScale(float startProgress) {
         mRunningTaskIconScaledDown = false;
         TaskView firstTask = getRunningTaskView();
+        Log.d("b/186444448", "animateUpRunningTaskIconScale: firstTask="
+                + (firstTask != null ? "t:" + firstTask.getTask() : null));
         if (firstTask != null) {
+            firstTask.setIconScaleAnimStartProgress(0f);
             firstTask.animateIconScaleAndDimIntoView();
-            firstTask.setIconScaleAnimStartProgress(startProgress);
         }
     }
 
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index ef9eefc351..3349b74f05 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -794,6 +794,8 @@ public class TaskView extends FrameLayout implements Reusable {
     }
 
     public void animateIconScaleAndDimIntoView() {
+        Log.d("b/186444448", "animateIconScaleAndDimIntoView: startProgress="
+                + mIconScaleAnimStartProgress);
         if (mIconAndDimAnimator != null) {
             mIconAndDimAnimator.cancel();
         }
@@ -803,6 +805,7 @@ public class TaskView extends FrameLayout implements Reusable {
         mIconAndDimAnimator.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationEnd(Animator animation) {
+                Log.d("b/186444448", "animateIconScaleAndDimIntoView: end");
                 mIconAndDimAnimator = null;
             }
         });
-- 
GitLab


From 4ed0fb5074599c3b48770518e2da79c11e7f8d1d Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Mon, 26 Apr 2021 09:52:47 -0700
Subject: [PATCH 0998/1664] Removing dependency on wallpaper colors and using
 theme resources

Bug: 184676715
Test: Manual
Change-Id: Ie9a9a784c4a8a8cd484bfd8ea463deedcd4deed6
---
 AndroidManifest-common.xml                    |   6 -
 quickstep/AndroidManifest.xml                 |   3 -
 .../uioverrides/WallpaperColorInfo.java       | 117 ---
 .../quickstep/fallback/RecentsDragLayer.java  |  11 -
 .../util/StaggeredWorkspaceAnim.java          |   2 +-
 res/values-v31/colors.xml                     |   3 +
 res/values/attrs.xml                          |   1 -
 res/values/colors.xml                         |   2 +
 res/values/config.xml                         |   3 -
 res/values/styles.xml                         |   4 -
 .../launcher3/BaseDraggingActivity.java       |  20 +-
 .../android/launcher3/LauncherRootView.java   |  17 +-
 src/com/android/launcher3/Workspace.java      |   3 -
 .../WorkspaceStateTransitionAnimation.java    |   2 +-
 .../launcher3/dragndrop/DragLayer.java        |  26 -
 src/com/android/launcher3/graphics/Scrim.java |  44 +-
 .../launcher3/graphics/SysUiScrim.java        |  51 +-
 .../WorkspacePageIndicator.java               |   4 +-
 .../launcher3/states/SpringLoadedState.java   |   2 +-
 .../AbstractStateChangeTouchController.java   |   2 +-
 src/com/android/launcher3/util/Themes.java    |  41 +-
 .../launcher3/views/BaseDragLayer.java        |  56 --
 .../launcher3/widget/BaseWidgetSheet.java     |   4 +-
 .../uioverrides/WallpaperColorInfo.java       | 128 ---
 .../dynamicui/ColorExtractionAlgorithm.java   | 795 ------------------
 .../dynamicui/WallpaperColorsCompat.java      |  55 --
 .../dynamicui/WallpaperManagerCompat.java     |  61 --
 .../dynamicui/WallpaperManagerCompatVL.java   | 271 ------
 .../WallpaperManagerCompatVOMR1.java          |  85 --
 29 files changed, 82 insertions(+), 1737 deletions(-)
 delete mode 100644 quickstep/src/com/android/launcher3/uioverrides/WallpaperColorInfo.java
 delete mode 100644 src_ui_overrides/com/android/launcher3/uioverrides/WallpaperColorInfo.java
 delete mode 100644 src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/ColorExtractionAlgorithm.java
 delete mode 100644 src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperColorsCompat.java
 delete mode 100644 src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompat.java
 delete mode 100644 src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVL.java
 delete mode 100644 src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVOMR1.java

diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index 4e72260e9c..87a08afc24 100644
--- a/AndroidManifest-common.xml
+++ b/AndroidManifest-common.xml
@@ -93,12 +93,6 @@
             </intent-filter>
         </receiver>
 
-        <service
-            android:name="com.android.launcher3.uioverrides.dynamicui.WallpaperManagerCompatVL$ColorExtractionService"
-            android:exported="false"
-            android:process=":wallpaper_chooser"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
-
         <service
             android:name="com.android.launcher3.notification.NotificationListener"
             android:label="@string/notification_dots_service_title"
diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml
index 5e5cf73148..842abc399f 100644
--- a/quickstep/AndroidManifest.xml
+++ b/quickstep/AndroidManifest.xml
@@ -97,9 +97,6 @@
                  android:resource="@xml/overview_file_provider_paths"/>
         </provider>
 
-        <service android:name="com.android.launcher3.uioverrides.dynamicui.WallpaperManagerCompatVL$ColorExtractionService"
-             tools:node="remove"/>
-
         <activity android:name="com.android.launcher3.proxy.ProxyActivityStarter"
              android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"
              android:launchMode="singleTask"
diff --git a/quickstep/src/com/android/launcher3/uioverrides/WallpaperColorInfo.java b/quickstep/src/com/android/launcher3/uioverrides/WallpaperColorInfo.java
deleted file mode 100644
index 1417995057..0000000000
--- a/quickstep/src/com/android/launcher3/uioverrides/WallpaperColorInfo.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.uioverrides;
-
-import static android.app.WallpaperManager.FLAG_SYSTEM;
-
-import android.annotation.TargetApi;
-import android.app.WallpaperColors;
-import android.app.WallpaperManager;
-import android.app.WallpaperManager.OnColorsChangedListener;
-import android.content.Context;
-import android.os.Build;
-import android.os.Handler;
-import android.os.Looper;
-
-import com.android.launcher3.util.MainThreadInitializedObject;
-import com.android.systemui.shared.system.TonalCompat;
-import com.android.systemui.shared.system.TonalCompat.ExtractionInfo;
-
-import java.util.ArrayList;
-
-@TargetApi(Build.VERSION_CODES.P)
-public class WallpaperColorInfo implements OnColorsChangedListener {
-
-    private static final int MAIN_COLOR_LIGHT = 0xffdadce0;
-    private static final int MAIN_COLOR_DARK = 0xff202124;
-    private static final int MAIN_COLOR_REGULAR = 0xff000000;
-
-    public static final MainThreadInitializedObject<WallpaperColorInfo> INSTANCE =
-            new MainThreadInitializedObject<>(WallpaperColorInfo::new);
-
-    private final ArrayList<OnChangeListener> mListeners = new ArrayList<>();
-    private final WallpaperManager mWallpaperManager;
-    private final TonalCompat mTonalCompat;
-
-    private ExtractionInfo mExtractionInfo;
-
-    private OnChangeListener[] mTempListeners = new OnChangeListener[0];
-
-    private WallpaperColorInfo(Context context) {
-        mWallpaperManager = context.getSystemService(WallpaperManager.class);
-        mTonalCompat = new TonalCompat(context);
-
-        mWallpaperManager.addOnColorsChangedListener(this, new Handler(Looper.getMainLooper()));
-        update(mWallpaperManager.getWallpaperColors(FLAG_SYSTEM));
-    }
-
-    public int getMainColor() {
-        return mExtractionInfo.mainColor;
-    }
-
-    public int getSecondaryColor() {
-        return mExtractionInfo.secondaryColor;
-    }
-
-    public boolean isDark() {
-        return mExtractionInfo.supportsDarkTheme;
-    }
-
-    public boolean supportsDarkText() {
-        return mExtractionInfo.supportsDarkText;
-    }
-
-    public boolean isMainColorDark() {
-        return mExtractionInfo.mainColor == MAIN_COLOR_DARK;
-    }
-
-    @Override
-    public void onColorsChanged(WallpaperColors colors, int which) {
-        if ((which & FLAG_SYSTEM) != 0) {
-            update(colors);
-            notifyChange();
-        }
-    }
-
-    private void update(WallpaperColors wallpaperColors) {
-        mExtractionInfo = mTonalCompat.extractDarkColors(wallpaperColors);
-    }
-
-    public void addOnChangeListener(OnChangeListener listener) {
-        mListeners.add(listener);
-    }
-
-    public void removeOnChangeListener(OnChangeListener listener) {
-        mListeners.remove(listener);
-    }
-
-    private void notifyChange() {
-        // Create a new array to avoid concurrent modification when the activity destroys itself.
-        mTempListeners = mListeners.toArray(mTempListeners);
-        for (int i = mTempListeners.length - 1; i >= 0; --i) {
-            final OnChangeListener listener = mTempListeners[i];
-            if (listener != null) {
-                listener.onExtractedColorsChanged(this);
-                mTempListeners[i] = null;
-            }
-        }
-    }
-
-    public interface OnChangeListener {
-        void onExtractedColorsChanged(WallpaperColorInfo wallpaperColorInfo);
-    }
-}
diff --git a/quickstep/src/com/android/quickstep/fallback/RecentsDragLayer.java b/quickstep/src/com/android/quickstep/fallback/RecentsDragLayer.java
index a00015a233..29c3dc81da 100644
--- a/quickstep/src/com/android/quickstep/fallback/RecentsDragLayer.java
+++ b/quickstep/src/com/android/quickstep/fallback/RecentsDragLayer.java
@@ -16,11 +16,8 @@
 package com.android.quickstep.fallback;
 
 import android.content.Context;
-import android.graphics.Rect;
 import android.util.AttributeSet;
 
-import com.android.launcher3.R;
-import com.android.launcher3.util.Themes;
 import com.android.launcher3.util.TouchController;
 import com.android.launcher3.views.BaseDragLayer;
 import com.android.quickstep.RecentsActivity;
@@ -41,12 +38,4 @@ public class RecentsDragLayer extends BaseDragLayer<RecentsActivity> {
                 new FallbackNavBarTouchController(mActivity),
         };
     }
-
-    @Override
-    public void setInsets(Rect insets) {
-        super.setInsets(insets);
-        setBackground(insets.top == 0  || !mAllowSysuiScrims
-                ? null
-                : Themes.getAttrDrawable(getContext(), R.attr.workspaceStatusBarScrim));
-    }
 }
diff --git a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
index de6c4f5e1c..ab951385b3 100644
--- a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
+++ b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
@@ -140,7 +140,7 @@ public class StaggeredWorkspaceAnim {
 
         addDepthAnimationForState(launcher, NORMAL, DURATION_MS);
 
-        mAnimators.play(launcher.getDragLayer().getSysUiScrim().createSysuiMultiplierAnim(0f, 1f)
+        mAnimators.play(launcher.getRootView().getSysUiScrim().createSysuiMultiplierAnim(0f, 1f)
                 .setDuration(DURATION_MS));
         mAnimators.addListener(new AnimatorListenerAdapter() {
             @Override
diff --git a/res/values-v31/colors.xml b/res/values-v31/colors.xml
index 87afd6bc52..7f27bf8ca5 100644
--- a/res/values-v31/colors.xml
+++ b/res/values-v31/colors.xml
@@ -32,4 +32,7 @@
     <color name="text_color_primary_dark">@android:color/system_neutral1_50</color>
     <color name="text_color_secondary_dark">@android:color/system_neutral2_200</color>
     <color name="text_color_tertiary_dark">@android:color/system_neutral2_400</color>
+
+    <color name="wallpaper_popup_scrim">@android:color/system_neutral1_900</color>
+
 </resources>
\ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 7fe53d5ae7..09dd95cd92 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -19,7 +19,6 @@
 
     <!-- Attributes used for launcher theme -->
     <attr name="allAppsScrimColor" format="color" />
-    <attr name="allAppsInterimScrimAlpha" format="integer" />
     <attr name="allAppsNavBarScrimColor" format="color" />
     <attr name="allAppsTheme" format="reference" />
     <attr name="popupColorNeutral" format="color" />
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 8a2cada827..83d2deb0b1 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -57,4 +57,6 @@
     <color name="text_color_secondary_dark">#FFFFFFFF</color>
     <color name="text_color_tertiary_dark">#CCFFFFFF</color>
 
+    <color name="wallpaper_popup_scrim">?android:attr/colorAccent</color>
+
 </resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index b75af7f9e4..f8a517d1d0 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -216,9 +216,6 @@
         <item>@dimen/c2_d</item>
     </array>
 
-    <string-array name="live_wallpapers_remove_sysui_scrims">
-    </string-array>
-
     <string-array name="filtered_components" ></string-array>
 
     <!-- Name of the class used to generate colors from the wallpaper colors. Must be implementing the LauncherAppWidgetHostView.ColorGenerator interface. -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index bae1485a93..5b379668b5 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -32,7 +32,6 @@
     <style name="LauncherTheme" parent="@style/BaseLauncherTheme">
         <item name="android:textColorSecondary">#DE000000</item>
         <item name="allAppsScrimColor">?android:attr/colorBackgroundFloating</item>
-        <item name="allAppsInterimScrimAlpha">46</item>
         <item name="allAppsNavBarScrimColor">#66FFFFFF</item>
         <item name="allAppsTheme">@style/AllAppsTheme</item>
         <item name="popupColorNeutral">@color/popup_color_neutral_light</item>
@@ -77,7 +76,6 @@
 
     <style name="LauncherTheme.DarkText" parent="@style/LauncherTheme">
         <item name="workspaceTextColor">@color/workspace_text_color_dark</item>
-        <item name="allAppsInterimScrimAlpha">128</item>
         <item name="workspaceShadowColor">@android:color/transparent</item>
         <item name="workspaceAmbientShadowColor">@android:color/transparent</item>
         <item name="workspaceKeyShadowColor">@android:color/transparent</item>
@@ -97,7 +95,6 @@
         <item name="android:colorControlHighlight">#A0FFFFFF</item>
         <item name="android:colorPrimary">#FF212121</item>
         <item name="allAppsScrimColor">?android:attr/colorBackgroundFloating</item>
-        <item name="allAppsInterimScrimAlpha">102</item>
         <item name="allAppsNavBarScrimColor">#80000000</item>
         <item name="allAppsTheme">@style/AllAppsTheme.Dark</item>
         <item name="popupColorNeutral">@color/popup_color_neutral_dark</item>
@@ -125,7 +122,6 @@
 
     <style name="LauncherTheme.Dark.DarkText" parent="@style/LauncherTheme.Dark">
         <item name="android:colorControlHighlight">#75212121</item>
-        <item name="allAppsInterimScrimAlpha">25</item>
         <item name="folderFillColor">#CDFFFFFF</item>
         <item name="folderTextColor">?attr/workspaceTextColor</item>
         <item name="workspaceTextColor">@color/workspace_text_color_dark</item>
diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java
index 4c5f9f247f..2c76e52c61 100644
--- a/src/com/android/launcher3/BaseDraggingActivity.java
+++ b/src/com/android/launcher3/BaseDraggingActivity.java
@@ -18,8 +18,12 @@ package com.android.launcher3;
 
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_APP_LAUNCH_TAP;
 import static com.android.launcher3.util.DisplayController.CHANGE_ROTATION;
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 
 import android.app.ActivityOptions;
+import android.app.WallpaperColors;
+import android.app.WallpaperManager;
+import android.app.WallpaperManager.OnColorsChangedListener;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
@@ -54,7 +58,6 @@ import com.android.launcher3.logging.InstanceIdSequence;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.touch.ItemClickHandler;
-import com.android.launcher3.uioverrides.WallpaperColorInfo;
 import com.android.launcher3.util.ActivityOptionsWrapper;
 import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.DisplayController.DisplayInfoChangeListener;
@@ -68,8 +71,9 @@ import com.android.launcher3.util.WindowBounds;
 /**
  * Extension of BaseActivity allowing support for drag-n-drop
  */
+@SuppressWarnings("NewApi")
 public abstract class BaseDraggingActivity extends BaseActivity
-        implements WallpaperColorInfo.OnChangeListener, DisplayInfoChangeListener {
+        implements OnColorsChangedListener, DisplayInfoChangeListener {
 
     private static final String TAG = "BaseDraggingActivity";
 
@@ -89,13 +93,15 @@ public abstract class BaseDraggingActivity extends BaseActivity
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-
         mIsSafeModeEnabled = TraceHelper.allowIpcs("isSafeMode",
                 () -> getPackageManager().isSafeMode());
         DisplayController.INSTANCE.get(this).addChangeListener(this);
 
         // Update theme
-        WallpaperColorInfo.INSTANCE.get(this).addOnChangeListener(this);
+        if (Utilities.ATLEAST_P) {
+            getSystemService(WallpaperManager.class)
+                    .addOnColorsChangedListener(this, MAIN_EXECUTOR.getHandler());
+        }
         int themeRes = Themes.getActivityThemeRes(this);
         if (themeRes != mThemeRes) {
             mThemeRes = themeRes;
@@ -114,7 +120,7 @@ public abstract class BaseDraggingActivity extends BaseActivity
     }
 
     @Override
-    public void onExtractedColorsChanged(WallpaperColorInfo wallpaperColorInfo) {
+    public void onColorsChanged(WallpaperColors wallpaperColors, int which) {
         updateTheme();
     }
 
@@ -278,7 +284,9 @@ public abstract class BaseDraggingActivity extends BaseActivity
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        WallpaperColorInfo.INSTANCE.get(this).removeOnChangeListener(this);
+        if (Utilities.ATLEAST_P) {
+            getSystemService(WallpaperManager.class).removeOnColorsChangedListener(this);
+        }
         DisplayController.INSTANCE.get(this).removeChangeListener(this);
     }
 
diff --git a/src/com/android/launcher3/LauncherRootView.java b/src/com/android/launcher3/LauncherRootView.java
index 83ddf641b7..f26cfe872e 100644
--- a/src/com/android/launcher3/LauncherRootView.java
+++ b/src/com/android/launcher3/LauncherRootView.java
@@ -33,11 +33,12 @@ public class LauncherRootView extends InsettableFrameLayout {
     @ViewDebug.ExportedProperty(category = "launcher")
     private boolean mForceHideBackArrow;
 
-    private SysUiScrim mSysUiScrim;
+    private final SysUiScrim mSysUiScrim;
 
     public LauncherRootView(Context context, AttributeSet attrs) {
         super(context, attrs);
         mActivity = StatefulActivity.fromContext(context);
+        mSysUiScrim = new SysUiScrim(this);
     }
 
     private void handleSystemWindowInsets(Rect insets) {
@@ -72,6 +73,7 @@ public class LauncherRootView extends InsettableFrameLayout {
         // modifying child layout params.
         if (!insets.equals(mInsets)) {
             super.setInsets(insets);
+            mSysUiScrim.onInsetsChanged(insets);
         }
     }
 
@@ -100,15 +102,9 @@ public class LauncherRootView extends InsettableFrameLayout {
         }
     }
 
-    public void setSysUiScrim(SysUiScrim scrim) {
-        mSysUiScrim = scrim;
-    }
-
     @Override
     protected void dispatchDraw(Canvas canvas) {
-        if (mSysUiScrim != null) {
-            mSysUiScrim.draw(canvas);
-        }
+        mSysUiScrim.draw(canvas);
         super.dispatchDraw(canvas);
     }
 
@@ -117,6 +113,7 @@ public class LauncherRootView extends InsettableFrameLayout {
         super.onLayout(changed, l, t, r, b);
         SYSTEM_GESTURE_EXCLUSION_RECT.get(0).set(l, t, r, b);
         setDisallowBackGesture(mDisallowBackGesture);
+        mSysUiScrim.setSize(r - l, b - t);
     }
 
     @TargetApi(Build.VERSION_CODES.Q)
@@ -136,6 +133,10 @@ public class LauncherRootView extends InsettableFrameLayout {
                 : Collections.emptyList());
     }
 
+    public SysUiScrim getSysUiScrim() {
+        return mSysUiScrim;
+    }
+
     public interface WindowStateListener {
 
         void onWindowFocusChanged(boolean hasFocus);
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 0c3a356d87..05d6e045a6 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2066,9 +2066,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         if (mDragOverlappingLayout != null) {
             mDragOverlappingLayout.setIsDragOverlapping(true);
         }
-        // Invalidating the scrim will also force this CellLayout
-        // to be invalidated so that it is highlighted if necessary.
-        mLauncher.getDragLayer().getWorkspaceDragScrim().invalidate();
     }
 
     public CellLayout getCurrentDragOverlappingLayout() {
diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
index ed854dcd0e..6fa81426c1 100644
--- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
+++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
@@ -162,7 +162,7 @@ public class WorkspaceStateTransitionAnimation {
         propertySetter.setFloat(workspaceDragScrim, SCRIM_PROGRESS,
                 state.getWorkspaceBackgroundAlpha(mLauncher), LINEAR);
 
-        SysUiScrim sysUiScrim = mLauncher.getDragLayer().getSysUiScrim();
+        SysUiScrim sysUiScrim = mLauncher.getRootView().getSysUiScrim();
         propertySetter.setFloat(sysUiScrim, SYSUI_PROGRESS,
                 state.hasFlag(FLAG_HAS_SYS_UI_SCRIM) ? 1 : 0, LINEAR);
 
diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java
index 274e033555..c2f609c6a7 100644
--- a/src/com/android/launcher3/dragndrop/DragLayer.java
+++ b/src/com/android/launcher3/dragndrop/DragLayer.java
@@ -41,13 +41,11 @@ import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.CellLayout;
 import com.android.launcher3.DropTargetBar;
 import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherRootView;
 import com.android.launcher3.R;
 import com.android.launcher3.ShortcutAndWidgetContainer;
 import com.android.launcher3.Workspace;
 import com.android.launcher3.folder.Folder;
 import com.android.launcher3.graphics.Scrim;
-import com.android.launcher3.graphics.SysUiScrim;
 import com.android.launcher3.keyboard.ViewGroupFocusHelper;
 import com.android.launcher3.util.Thunk;
 import com.android.launcher3.views.BaseDragLayer;
@@ -84,8 +82,6 @@ public class DragLayer extends BaseDragLayer<Launcher> {
     // Related to adjacent page hints
     private final ViewGroupFocusHelper mFocusIndicatorHelper;
     private Scrim mWorkspaceDragScrim;
-    private SysUiScrim mSysUiScrim;
-    private LauncherRootView mRootView;
 
     /**
      * Used to create a new DragLayer from XML.
@@ -107,12 +103,6 @@ public class DragLayer extends BaseDragLayer<Launcher> {
         mDragController = dragController;
         recreateControllers();
         mWorkspaceDragScrim = new Scrim(this);
-
-        // We delegate drawing of the workspace scrim to LauncherRootView (one level up), so as
-        // to avoid artifacts when translating the entire drag layer in the -1 transition.
-        mRootView = (LauncherRootView) getParent();
-        mSysUiScrim = new SysUiScrim(mRootView);
-        mRootView.setSysUiScrim(mSysUiScrim);
     }
 
     @Override
@@ -526,23 +516,7 @@ public class DragLayer extends BaseDragLayer<Launcher> {
         super.dispatchDraw(canvas);
     }
 
-    @Override
-    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-        super.onSizeChanged(w, h, oldw, oldh);
-        mSysUiScrim.setSize(w, h);
-    }
-
-    @Override
-    public void setInsets(Rect insets) {
-        super.setInsets(insets);
-        mSysUiScrim.onInsetsChanged(insets, mAllowSysuiScrims);
-    }
-
     public Scrim getWorkspaceDragScrim() {
         return mWorkspaceDragScrim;
     }
-
-    public SysUiScrim getSysUiScrim() {
-        return mSysUiScrim;
-    }
 }
diff --git a/src/com/android/launcher3/graphics/Scrim.java b/src/com/android/launcher3/graphics/Scrim.java
index a151cba47d..a77e0587c0 100644
--- a/src/com/android/launcher3/graphics/Scrim.java
+++ b/src/com/android/launcher3/graphics/Scrim.java
@@ -22,14 +22,12 @@ import android.graphics.Canvas;
 import android.util.FloatProperty;
 import android.view.View;
 
-import com.android.launcher3.Launcher;
-import com.android.launcher3.uioverrides.WallpaperColorInfo;
+import com.android.launcher3.R;
 
 /**
  * Contains general scrim properties such as wallpaper-extracted color that subclasses can use.
  */
-public class Scrim implements View.OnAttachStateChangeListener,
-        WallpaperColorInfo.OnChangeListener {
+public class Scrim {
 
     public static final FloatProperty<Scrim> SCRIM_PROGRESS =
             new FloatProperty<Scrim>("scrimProgress") {
@@ -44,8 +42,6 @@ public class Scrim implements View.OnAttachStateChangeListener,
                 }
             };
 
-    protected final Launcher mLauncher;
-    protected final WallpaperColorInfo mWallpaperColorInfo;
     protected final View mRoot;
 
     protected float mScrimProgress;
@@ -54,48 +50,18 @@ public class Scrim implements View.OnAttachStateChangeListener,
 
     public Scrim(View view) {
         mRoot = view;
-        mLauncher = Launcher.getLauncher(view.getContext());
-        mWallpaperColorInfo = WallpaperColorInfo.INSTANCE.get(mLauncher);
-
-        view.addOnAttachStateChangeListener(this);
+        mScrimColor = mRoot.getContext().getColor(R.color.wallpaper_popup_scrim);
     }
 
     public void draw(Canvas canvas) {
-        canvas.drawColor(setColorAlphaBound(mScrimColor, getScrimAlpha()));
-    }
-
-    protected int getScrimAlpha() {
-        return mScrimAlpha;
+        canvas.drawColor(setColorAlphaBound(mScrimColor, mScrimAlpha));
     }
 
     private void setScrimProgress(float progress) {
         if (mScrimProgress != progress) {
             mScrimProgress = progress;
             mScrimAlpha = Math.round(255 * mScrimProgress);
-            invalidate();
-        }
-    }
-
-    @Override
-    public void onViewAttachedToWindow(View view) {
-        mWallpaperColorInfo.addOnChangeListener(this);
-        onExtractedColorsChanged(mWallpaperColorInfo);
-    }
-
-    @Override
-    public void onViewDetachedFromWindow(View view) {
-        mWallpaperColorInfo.removeOnChangeListener(this);
-    }
-
-    @Override
-    public void onExtractedColorsChanged(WallpaperColorInfo wallpaperColorInfo) {
-        mScrimColor = wallpaperColorInfo.getMainColor();
-        if (mScrimAlpha > 0) {
-            invalidate();
+            mRoot.invalidate();
         }
     }
-
-    public void invalidate() {
-        mRoot.invalidate();
-    }
 }
diff --git a/src/com/android/launcher3/graphics/SysUiScrim.java b/src/com/android/launcher3/graphics/SysUiScrim.java
index d9c648b37e..c09dac8e7d 100644
--- a/src/com/android/launcher3/graphics/SysUiScrim.java
+++ b/src/com/android/launcher3/graphics/SysUiScrim.java
@@ -41,18 +41,16 @@ import android.util.FloatProperty;
 import android.view.View;
 import android.view.WindowInsets;
 
-import androidx.core.graphics.ColorUtils;
-
+import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.R;
 import com.android.launcher3.ResourceUtils;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.uioverrides.WallpaperColorInfo;
 import com.android.launcher3.util.Themes;
 
 /**
  * View scrim which draws behind hotseat and workspace
  */
-public class SysUiScrim extends Scrim {
+public class SysUiScrim implements View.OnAttachStateChangeListener {
 
     public static final FloatProperty<SysUiScrim> SYSUI_PROGRESS =
             new FloatProperty<SysUiScrim>("sysUiProgress") {
@@ -83,7 +81,6 @@ public class SysUiScrim extends Scrim {
 
     /**
      * Receiver used to get a signal that the user unlocked their device.
-     * @see KEYGUARD_ANIMATION For proper signal.
      */
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
@@ -99,7 +96,6 @@ public class SysUiScrim extends Scrim {
         }
     };
 
-    private static final int DARK_SCRIM_COLOR = 0x55000000;
     private static final int MAX_HOTSEAT_SCRIM_ALPHA = 100;
     private static final int ALPHA_MASK_HEIGHT_DP = 500;
     private static final int ALPHA_MASK_BITMAP_DP = 200;
@@ -112,6 +108,8 @@ public class SysUiScrim extends Scrim {
     private final Bitmap mBottomMask;
     private final int mMaskHeight;
 
+    private final View mRoot;
+    private final BaseDraggingActivity mActivity;
     private final Drawable mTopScrim;
 
     private float mSysUiProgress = 1;
@@ -121,14 +119,15 @@ public class SysUiScrim extends Scrim {
     private float mSysUiAnimMultiplier = 1;
 
     public SysUiScrim(View view) {
-        super(view);
+        mRoot = view;
+        mActivity = BaseDraggingActivity.fromContext(view.getContext());
         mMaskHeight = ResourceUtils.pxFromDp(ALPHA_MASK_BITMAP_DP,
                 view.getResources().getDisplayMetrics());
         mTopScrim = Themes.getAttrDrawable(view.getContext(), R.attr.workspaceStatusBarScrim);
         mBottomMask = mTopScrim == null ? null : createDitheredAlphaMask();
         mHideSysUiScrim = mTopScrim == null;
 
-        onExtractedColorsChanged(mWallpaperColorInfo);
+        view.addOnAttachStateChangeListener(this);
     }
 
     /**
@@ -147,7 +146,7 @@ public class SysUiScrim extends Scrim {
 
                 ObjectAnimator oa = createSysuiMultiplierAnim(1);
                 oa.setDuration(600);
-                oa.setStartDelay(mLauncher.getWindow().getTransitionBackgroundFadeDuration());
+                oa.setStartDelay(mActivity.getWindow().getTransitionBackgroundFadeDuration());
                 oa.start();
                 mAnimateScrimOnNextDraw = false;
             }
@@ -173,20 +172,17 @@ public class SysUiScrim extends Scrim {
     /**
      * Determines whether to draw the top and/or bottom scrim based on new insets.
      */
-    public void onInsetsChanged(Rect insets, boolean allowSysuiScrims) {
-        mDrawTopScrim = allowSysuiScrims
-                && mTopScrim != null
-                && insets.top > 0;
-        mDrawBottomScrim = allowSysuiScrims
-                && mBottomMask != null
-                && !mLauncher.getDeviceProfile().isVerticalBarLayout()
+    public void onInsetsChanged(Rect insets) {
+        mDrawTopScrim = mTopScrim != null && insets.top > 0;
+        mDrawBottomScrim = mBottomMask != null
+                && !mActivity.getDeviceProfile().isVerticalBarLayout()
                 && hasBottomNavButtons();
     }
 
     private boolean hasBottomNavButtons() {
-        if (Utilities.ATLEAST_Q && mLauncher.getRootView() != null
-                && mLauncher.getRootView().getRootWindowInsets() != null) {
-            WindowInsets windowInsets = mLauncher.getRootView().getRootWindowInsets();
+        if (Utilities.ATLEAST_Q && mActivity.getRootView() != null
+                && mActivity.getRootView().getRootWindowInsets() != null) {
+            WindowInsets windowInsets = mActivity.getRootView().getRootWindowInsets();
             return windowInsets.getTappableElementInsets().bottom > 0;
         }
         return true;
@@ -194,8 +190,6 @@ public class SysUiScrim extends Scrim {
 
     @Override
     public void onViewAttachedToWindow(View view) {
-        super.onViewAttachedToWindow(view);
-
         if (!KEYGUARD_ANIMATION.get() && mTopScrim != null) {
             IntentFilter filter = new IntentFilter(ACTION_SCREEN_OFF);
             filter.addAction(ACTION_USER_PRESENT); // When the device wakes up + keyguard is gone
@@ -205,22 +199,11 @@ public class SysUiScrim extends Scrim {
 
     @Override
     public void onViewDetachedFromWindow(View view) {
-        super.onViewDetachedFromWindow(view);
         if (!KEYGUARD_ANIMATION.get() && mTopScrim != null) {
             mRoot.getContext().unregisterReceiver(mReceiver);
         }
     }
 
-    @Override
-    public void onExtractedColorsChanged(WallpaperColorInfo wallpaperColorInfo) {
-        // for super light wallpaper it needs to be darken for contrast to workspace
-        // for dark wallpapers the text is white so darkening works as well
-        mBottomMaskPaint.setColor(ColorUtils.compositeColors(DARK_SCRIM_COLOR,
-                wallpaperColorInfo.getMainColor()));
-        reapplySysUiAlpha();
-        super.onExtractedColorsChanged(wallpaperColorInfo);
-    }
-
     /**
      * Set the width and height of the view being scrimmed
      * @param w
@@ -243,7 +226,7 @@ public class SysUiScrim extends Scrim {
     private void reapplySysUiAlpha() {
         reapplySysUiAlphaNoInvalidate();
         if (!mHideSysUiScrim) {
-            invalidate();
+            mRoot.invalidate();
         }
     }
 
@@ -256,7 +239,7 @@ public class SysUiScrim extends Scrim {
     }
 
     private Bitmap createDitheredAlphaMask() {
-        DisplayMetrics dm = mLauncher.getResources().getDisplayMetrics();
+        DisplayMetrics dm = mActivity.getResources().getDisplayMetrics();
         int width = ResourceUtils.pxFromDp(ALPHA_MASK_WIDTH_DP, dm);
         int gradientHeight = ResourceUtils.pxFromDp(ALPHA_MASK_HEIGHT_DP, dm);
         Bitmap dst = Bitmap.createBitmap(width, mMaskHeight, Bitmap.Config.ALPHA_8);
diff --git a/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java b/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java
index a7cd10d628..f73d782685 100644
--- a/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java
+++ b/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java
@@ -24,7 +24,7 @@ import com.android.launcher3.Insettable;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.uioverrides.WallpaperColorInfo;
+import com.android.launcher3.util.Themes;
 
 /**
  * A PageIndicator that briefly shows a fraction of a line when moving between pages
@@ -123,7 +123,7 @@ public class WorkspacePageIndicator extends View implements Insettable, PageIndi
         mLauncher = Launcher.getLauncher(context);
         mLineHeight = res.getDimensionPixelSize(R.dimen.workspace_page_indicator_line_height);
 
-        boolean darkText = WallpaperColorInfo.INSTANCE.get(context).supportsDarkText();
+        boolean darkText = Themes.getAttrBoolean(mLauncher, R.attr.isWorkspaceDarkText);
         mActiveAlpha = darkText ? BLACK_ALPHA : WHITE_ALPHA;
         mLinePaint.setColor(darkText ? Color.BLACK : Color.WHITE);
     }
diff --git a/src/com/android/launcher3/states/SpringLoadedState.java b/src/com/android/launcher3/states/SpringLoadedState.java
index 39bcdc5cd8..8db1dbe69d 100644
--- a/src/com/android/launcher3/states/SpringLoadedState.java
+++ b/src/com/android/launcher3/states/SpringLoadedState.java
@@ -89,7 +89,7 @@ public class SpringLoadedState extends LauncherState {
 
     @Override
     public float getWorkspaceBackgroundAlpha(Launcher launcher) {
-        return 0.3f;
+        return 0.2f;
     }
 
     @Override
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index a4372930be..d092f11ae5 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -352,7 +352,7 @@ public abstract class AbstractStateChangeTouchController
             // case the user started interacting with it before the animation finished.
             mLauncher.getStateManager().goToState(targetState, false /* animated */);
         }
-        mLauncher.getDragLayer().getSysUiScrim().createSysuiMultiplierAnim(
+        mLauncher.getRootView().getSysUiScrim().createSysuiMultiplierAnim(
                 1f).setDuration(0).start();
     }
 
diff --git a/src/com/android/launcher3/util/Themes.java b/src/com/android/launcher3/util/Themes.java
index e8a0635b2a..11b856e266 100644
--- a/src/com/android/launcher3/util/Themes.java
+++ b/src/com/android/launcher3/util/Themes.java
@@ -16,6 +16,10 @@
 
 package com.android.launcher3.util;
 
+import static android.app.WallpaperColors.HINT_SUPPORTS_DARK_TEXT;
+import static android.app.WallpaperColors.HINT_SUPPORTS_DARK_THEME;
+
+import android.app.WallpaperManager;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.TypedArray;
@@ -29,35 +33,40 @@ import android.util.TypedValue;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.icons.GraphicsUtils;
-import com.android.launcher3.uioverrides.WallpaperColorInfo;
 
 /**
  * Various utility methods associated with theming.
  */
+@SuppressWarnings("NewApi")
 public class Themes {
 
     public static int getActivityThemeRes(Context context) {
-        WallpaperColorInfo wallpaperColorInfo = WallpaperColorInfo.INSTANCE.get(context);
-        boolean darkTheme;
-        if (Utilities.ATLEAST_Q) {
-            Configuration configuration = context.getResources().getConfiguration();
-            int nightMode = configuration.uiMode & Configuration.UI_MODE_NIGHT_MASK;
-            darkTheme = nightMode == Configuration.UI_MODE_NIGHT_YES;
-        } else {
-            darkTheme = wallpaperColorInfo.isDark();
-        }
+        int colorHints = Utilities.ATLEAST_P ? context.getSystemService(WallpaperManager.class)
+                .getWallpaperColors(WallpaperManager.FLAG_SYSTEM).getColorHints()
+                : 0;
+        return getActivityThemeRes(context, colorHints);
+    }
+
+    public static int getActivityThemeRes(Context context, int wallpaperColorHints) {
+        Configuration configuration = context.getResources().getConfiguration();
+        int nightMode = configuration.uiMode & Configuration.UI_MODE_NIGHT_MASK;
+        boolean darkTheme = nightMode == Configuration.UI_MODE_NIGHT_YES;
+
+        boolean supportsDarkText = Utilities.ATLEAST_S
+                && (wallpaperColorHints & HINT_SUPPORTS_DARK_TEXT) != 0;
+        boolean isMainColorDark = Utilities.ATLEAST_S
+                && (wallpaperColorHints & HINT_SUPPORTS_DARK_THEME) != 0;
 
         if (darkTheme) {
-            return wallpaperColorInfo.supportsDarkText() ?
-                    R.style.AppTheme_Dark_DarkText : wallpaperColorInfo.isMainColorDark() ?
-                            R.style.AppTheme_Dark_DarkMainColor : R.style.AppTheme_Dark;
+            return supportsDarkText ? R.style.AppTheme_Dark_DarkText
+                    : isMainColorDark ? R.style.AppTheme_Dark_DarkMainColor : R.style.AppTheme_Dark;
         } else {
-            return wallpaperColorInfo.supportsDarkText() ?
-                    R.style.AppTheme_DarkText : wallpaperColorInfo.isMainColorDark() ?
-                            R.style.AppTheme_DarkMainColor : R.style.AppTheme;
+            return supportsDarkText ? R.style.AppTheme_DarkText
+                    : isMainColorDark ? R.style.AppTheme_DarkMainColor : R.style.AppTheme;
         }
     }
 
+
     public static String getDefaultBodyFont(Context context) {
         TypedArray ta = context.obtainStyledAttributes(android.R.style.TextAppearance_DeviceDefault,
                 new int[]{android.R.attr.fontFamily});
diff --git a/src/com/android/launcher3/views/BaseDragLayer.java b/src/com/android/launcher3/views/BaseDragLayer.java
index 1939d15776..01c0b562e1 100644
--- a/src/com/android/launcher3/views/BaseDragLayer.java
+++ b/src/com/android/launcher3/views/BaseDragLayer.java
@@ -23,11 +23,8 @@ import static android.view.MotionEvent.ACTION_UP;
 import static com.android.launcher3.util.DisplayController.getSingleFrameMs;
 
 import android.annotation.TargetApi;
-import android.app.WallpaperInfo;
 import android.app.WallpaperManager;
-import android.content.ComponentName;
 import android.content.Context;
-import android.content.Intent;
 import android.graphics.Insets;
 import android.graphics.Rect;
 import android.graphics.RectF;
@@ -42,15 +39,11 @@ import android.view.WindowInsets;
 import android.view.accessibility.AccessibilityEvent;
 import android.widget.FrameLayout;
 
-import androidx.annotation.Nullable;
-
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.InsettableFrameLayout;
-import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.util.MultiValueAlpha;
 import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;
-import com.android.launcher3.util.SimpleBroadcastReceiver;
 import com.android.launcher3.util.TouchController;
 
 import java.io.PrintWriter;
@@ -117,9 +110,6 @@ public abstract class BaseDragLayer<T extends Context & ActivityContext>
     protected final T mActivity;
     private final MultiValueAlpha mMultiValueAlpha;
     private final WallpaperManager mWallpaperManager;
-    private final SimpleBroadcastReceiver mWallpaperChangeReceiver =
-            new SimpleBroadcastReceiver(this::onWallpaperChanged);
-    private final String[] mWallpapersWithoutSysuiScrims;
 
     // All the touch controllers for the view
     protected TouchController[] mControllers;
@@ -130,15 +120,11 @@ public abstract class BaseDragLayer<T extends Context & ActivityContext>
 
     private TouchCompleteListener mTouchCompleteListener;
 
-    protected boolean mAllowSysuiScrims = true;
-
     public BaseDragLayer(Context context, AttributeSet attrs, int alphaChannelCount) {
         super(context, attrs);
         mActivity = (T) ActivityContext.lookupContext(context);
         mMultiValueAlpha = new MultiValueAlpha(this, alphaChannelCount);
         mWallpaperManager = context.getSystemService(WallpaperManager.class);
-        mWallpapersWithoutSysuiScrims = getResources().getStringArray(
-                R.array.live_wallpapers_remove_sysui_scrims);
     }
 
     /**
@@ -562,46 +548,4 @@ public abstract class BaseDragLayer<T extends Context & ActivityContext>
         }
         return super.dispatchApplyWindowInsets(insets);
     }
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        mWallpaperChangeReceiver.register(mActivity, Intent.ACTION_WALLPAPER_CHANGED);
-        onWallpaperChanged(null);
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        mActivity.unregisterReceiver(mWallpaperChangeReceiver);
-    }
-
-    private void onWallpaperChanged(Intent unusedBroadcastIntent) {
-        WallpaperInfo newWallpaperInfo = mWallpaperManager.getWallpaperInfo();
-        boolean oldAllowSysuiScrims = mAllowSysuiScrims;
-        mAllowSysuiScrims = computeAllowSysuiScrims(newWallpaperInfo);
-        if (mAllowSysuiScrims != oldAllowSysuiScrims) {
-            // Reapply insets so scrim can be removed or re-added if necessary.
-            setInsets(mInsets);
-        }
-    }
-
-    /**
-     * Determines whether we can scrim the status bar and nav bar for the given wallpaper by
-     * checking against a list of live wallpapers that we don't show the scrims on.
-     */
-    private boolean computeAllowSysuiScrims(@Nullable WallpaperInfo newWallpaperInfo) {
-        if (newWallpaperInfo == null) {
-            // Static wallpapers need scrim unless determined otherwise by wallpaperColors.
-            return true;
-        }
-        ComponentName newWallpaper = newWallpaperInfo.getComponent();
-        for (String wallpaperWithoutScrim : mWallpapersWithoutSysuiScrims) {
-            if (newWallpaper.equals(ComponentName.unflattenFromString(wallpaperWithoutScrim))) {
-                // New wallpaper does not need a scrim.
-                return false;
-            }
-        }
-        return true;
-    }
 }
diff --git a/src/com/android/launcher3/widget/BaseWidgetSheet.java b/src/com/android/launcher3/widget/BaseWidgetSheet.java
index 415f48d30f..a7ecb078c2 100644
--- a/src/com/android/launcher3/widget/BaseWidgetSheet.java
+++ b/src/com/android/launcher3/widget/BaseWidgetSheet.java
@@ -35,7 +35,6 @@ import com.android.launcher3.popup.PopupDataProvider;
 import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.ItemLongClickListener;
-import com.android.launcher3.uioverrides.WallpaperColorInfo;
 import com.android.launcher3.util.SystemUiController;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.AbstractSlideInView;
@@ -56,9 +55,8 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView
     }
 
     protected int getScrimColor(Context context) {
-        WallpaperColorInfo colors = WallpaperColorInfo.INSTANCE.get(context);
         int alpha = context.getResources().getInteger(R.integer.extracted_color_gradient_alpha);
-        return setColorAlphaBound(colors.getSecondaryColor(), alpha);
+        return setColorAlphaBound(context.getColor(R.color.wallpaper_popup_scrim), alpha);
     }
 
     @Override
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/WallpaperColorInfo.java b/src_ui_overrides/com/android/launcher3/uioverrides/WallpaperColorInfo.java
deleted file mode 100644
index b3aa3656eb..0000000000
--- a/src_ui_overrides/com/android/launcher3/uioverrides/WallpaperColorInfo.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.uioverrides;
-
-import static android.app.WallpaperManager.FLAG_SYSTEM;
-
-import android.content.Context;
-import android.graphics.Color;
-import android.util.Pair;
-
-import com.android.launcher3.uioverrides.dynamicui.ColorExtractionAlgorithm;
-import com.android.launcher3.uioverrides.dynamicui.WallpaperColorsCompat;
-import com.android.launcher3.uioverrides.dynamicui.WallpaperManagerCompat;
-import com.android.launcher3.util.MainThreadInitializedObject;
-
-import java.util.ArrayList;
-
-public class WallpaperColorInfo implements WallpaperManagerCompat.OnColorsChangedListenerCompat {
-
-    private static final int MAIN_COLOR_LIGHT = 0xffdadce0;
-    private static final int MAIN_COLOR_DARK = 0xff202124;
-    private static final int MAIN_COLOR_REGULAR = 0xff000000;
-
-    private static final int FALLBACK_COLOR = Color.WHITE;
-
-    public static final MainThreadInitializedObject<WallpaperColorInfo> INSTANCE =
-            new MainThreadInitializedObject<>(WallpaperColorInfo::new);
-
-    private final ArrayList<OnChangeListener> mListeners = new ArrayList<>();
-    private final WallpaperManagerCompat mWallpaperManager;
-    private final ColorExtractionAlgorithm mExtractionType;
-    private int mMainColor;
-    private int mSecondaryColor;
-    private boolean mIsDark;
-    private boolean mSupportsDarkText;
-
-    private OnChangeListener[] mTempListeners;
-
-    private WallpaperColorInfo(Context context) {
-        mWallpaperManager = WallpaperManagerCompat.getInstance(context);
-        mWallpaperManager.addOnColorsChangedListener(this);
-        mExtractionType = new ColorExtractionAlgorithm();
-        update(mWallpaperManager.getWallpaperColors(FLAG_SYSTEM));
-    }
-
-    public int getMainColor() {
-        return mMainColor;
-    }
-
-    public int getSecondaryColor() {
-        return mSecondaryColor;
-    }
-
-    public boolean isDark() {
-        return mIsDark;
-    }
-
-    public boolean supportsDarkText() {
-        return mSupportsDarkText;
-    }
-
-    public boolean isMainColorDark() {
-        return mMainColor == MAIN_COLOR_DARK;
-    }
-
-    @Override
-    public void onColorsChanged(WallpaperColorsCompat colors, int which) {
-        if ((which & FLAG_SYSTEM) != 0) {
-            update(colors);
-            notifyChange();
-        }
-    }
-
-    private void update(WallpaperColorsCompat wallpaperColors) {
-        Pair<Integer, Integer> colors = mExtractionType.extractInto(wallpaperColors);
-        if (colors != null) {
-            mMainColor = colors.first;
-            mSecondaryColor = colors.second;
-        } else {
-            mMainColor = FALLBACK_COLOR;
-            mSecondaryColor = FALLBACK_COLOR;
-        }
-        mSupportsDarkText = wallpaperColors != null
-                ? (wallpaperColors.getColorHints()
-                & WallpaperColorsCompat.HINT_SUPPORTS_DARK_TEXT) > 0 : false;
-        mIsDark = wallpaperColors != null
-                ? (wallpaperColors.getColorHints()
-                & WallpaperColorsCompat.HINT_SUPPORTS_DARK_THEME) > 0 : false;
-    }
-
-    public void addOnChangeListener(OnChangeListener listener) {
-        mListeners.add(listener);
-    }
-
-    public void removeOnChangeListener(OnChangeListener listener) {
-        mListeners.remove(listener);
-    }
-
-    private void notifyChange() {
-        OnChangeListener[] copy =
-                mTempListeners != null && mTempListeners.length == mListeners.size() ?
-                        mTempListeners : new OnChangeListener[mListeners.size()];
-
-        // Create a new array to avoid concurrent modification when the activity destroys itself.
-        mTempListeners = mListeners.toArray(copy);
-        for (OnChangeListener listener : mTempListeners) {
-            listener.onExtractedColorsChanged(this);
-        }
-    }
-
-    public interface OnChangeListener {
-        void onExtractedColorsChanged(WallpaperColorInfo wallpaperColorInfo);
-    }
-}
\ No newline at end of file
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/ColorExtractionAlgorithm.java b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/ColorExtractionAlgorithm.java
deleted file mode 100644
index 780a0f0372..0000000000
--- a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/ColorExtractionAlgorithm.java
+++ /dev/null
@@ -1,795 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.uioverrides.dynamicui;
-
-import android.graphics.Color;
-import android.util.Log;
-import android.util.Pair;
-import android.util.Range;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.graphics.ColorUtils;
-
-import com.android.launcher3.Utilities;
-
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * Implementation of tonal color extraction
- **/
-public class ColorExtractionAlgorithm {
-
-    private static final String TAG = "Tonal";
-
-    // Used for tonal palette fitting
-    private static final float FIT_WEIGHT_H = 1.0f;
-    private static final float FIT_WEIGHT_S = 1.0f;
-    private static final float FIT_WEIGHT_L = 10.0f;
-
-    public static final int MAIN_COLOR_LIGHT = 0xffb0b0b0;
-    public static final int SECONDARY_COLOR_LIGHT = 0xff9e9e9e;
-    public static final int MAIN_COLOR_DARK = 0xff212121;
-    public static final int SECONDARY_COLOR_DARK = 0xff000000;
-
-    // Temporary variable to avoid allocations
-    private float[] mTmpHSL = new float[3];
-
-    public Pair<Integer, Integer> extractInto(WallpaperColorsCompat inWallpaperColors) {
-        if (inWallpaperColors == null) {
-            return applyFallback(inWallpaperColors);
-        }
-
-        final List<Integer> mainColors = getMainColors(inWallpaperColors);
-        final int mainColorsSize = mainColors.size();
-        final boolean supportsDarkText = (inWallpaperColors.getColorHints() &
-                WallpaperColorsCompat.HINT_SUPPORTS_DARK_TEXT) != 0;
-
-        if (mainColorsSize == 0) {
-            return applyFallback(inWallpaperColors);
-        }
-        // Tonal is not really a sort, it takes a color from the extracted
-        // palette and finds a best fit amongst a collection of pre-defined
-        // palettes. The best fit is tweaked to be closer to the source color
-        // and replaces the original palette
-
-        // Get the most preeminent, non-disallowed color.
-        Integer bestColor = 0;
-        final float[] hsl = new float[3];
-        for (int i = 0; i < mainColorsSize; i++) {
-            final int colorValue = mainColors.get(i);
-            ColorUtils.RGBToHSL(Color.red(colorValue), Color.green(colorValue),
-                    Color.blue(colorValue), hsl);
-
-            // Stop when we find a color that meets our criteria
-            if (!isDisallowed(hsl)) {
-                bestColor = colorValue;
-                break;
-            }
-        }
-
-        // Fail if not found
-        if (bestColor == null) {
-            return applyFallback(inWallpaperColors);
-        }
-
-        int colorValue = bestColor;
-        ColorUtils.RGBToHSL(Color.red(colorValue), Color.green(colorValue), Color.blue(colorValue),
-                hsl);
-
-        // The Android HSL definition requires the hue to go from 0 to 360 but
-        // the Material Tonal Palette defines hues from 0 to 1.
-        hsl[0] /= 360f;
-
-        // Find the palette that contains the closest color
-        TonalPalette palette = findTonalPalette(hsl[0], hsl[1]);
-        if (palette == null) {
-            Log.w(TAG, "Could not find a tonal palette!");
-            return applyFallback(inWallpaperColors);
-        }
-
-        // Figure out what's the main color index in the optimal palette
-        int fitIndex = bestFit(palette, hsl[0], hsl[1], hsl[2]);
-        if (fitIndex == -1) {
-            Log.w(TAG, "Could not find best fit!");
-            return applyFallback(inWallpaperColors);
-        }
-
-        // Generate the 10 colors palette by offsetting each one of them
-        float[] h = fit(palette.h, hsl[0], fitIndex,
-                Float.NEGATIVE_INFINITY, Float.POSITIVE_INFINITY);
-        float[] s = fit(palette.s, hsl[1], fitIndex, 0.0f, 1.0f);
-        float[] l = fit(palette.l, hsl[2], fitIndex, 0.0f, 1.0f);
-
-        int primaryIndex = fitIndex;
-        int mainColor = getColorInt(primaryIndex, h, s, l);
-
-        // We might want use the fallback in case the extracted color is brighter than our
-        // light fallback or darker than our dark fallback.
-        ColorUtils.colorToHSL(mainColor, mTmpHSL);
-        final float mainLuminosity = mTmpHSL[2];
-        ColorUtils.colorToHSL(MAIN_COLOR_LIGHT, mTmpHSL);
-        final float lightLuminosity = mTmpHSL[2];
-        if (mainLuminosity > lightLuminosity) {
-            return applyFallback(inWallpaperColors);
-        }
-        ColorUtils.colorToHSL(MAIN_COLOR_DARK, mTmpHSL);
-        final float darkLuminosity = mTmpHSL[2];
-        if (mainLuminosity < darkLuminosity) {
-            return applyFallback(inWallpaperColors);
-        }
-
-        // Dark colors:
-        // Stops at 4th color, only lighter if dark text is supported
-        if (supportsDarkText) {
-            primaryIndex = h.length - 1;
-        } else if (fitIndex < 2) {
-            primaryIndex = 0;
-        } else {
-            primaryIndex = Math.min(fitIndex, 3);
-        }
-        int secondaryIndex = primaryIndex + (primaryIndex >= 2 ? -2 : 2);
-        int secondaryColor = getColorInt(secondaryIndex, h, s, l);
-
-        return new Pair<>(mainColor, secondaryColor);
-    }
-
-    public static Pair<Integer, Integer> applyFallback(WallpaperColorsCompat inWallpaperColors) {
-        boolean light = inWallpaperColors != null
-                && (inWallpaperColors.getColorHints()
-                    & WallpaperColorsCompat.HINT_SUPPORTS_DARK_TEXT)!= 0;
-        int innerColor = light ? MAIN_COLOR_LIGHT : MAIN_COLOR_DARK;
-        int outerColor = light ? SECONDARY_COLOR_LIGHT : SECONDARY_COLOR_DARK;
-        return new Pair<>(innerColor, outerColor);
-    }
-
-    private int getColorInt(int fitIndex, float[] h, float[] s, float[] l) {
-        mTmpHSL[0] = fract(h[fitIndex]) * 360.0f;
-        mTmpHSL[1] = s[fitIndex];
-        mTmpHSL[2] = l[fitIndex];
-        return ColorUtils.HSLToColor(mTmpHSL);
-    }
-
-    /**
-     * Checks if a given color exists in the disallowed_colors list.
-     * @param hsl float array with 3 components (H 0..360, S 0..1 and L 0..1)
-     * @return true if color should be avoided
-     */
-    private boolean isDisallowed(float[] hsl) {
-        for (ColorRange badRange: DISALLOWED_COLORS) {
-            if (badRange.containsColor(hsl[0], hsl[1], hsl[2])) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Offsets all colors by a delta, clamping values that go beyond what's
-     * supported on the color space.
-     * @param data what you want to fit
-     * @param v how big should be the offset
-     * @param index which index to calculate the delta against
-     * @param min minimum accepted value (clamp)
-     * @param max maximum accepted value (clamp)
-     * @return new shifted palette
-     */
-    private static float[] fit(float[] data, float v, int index, float min, float max) {
-        float[] fitData = new float[data.length];
-        float delta = v - data[index];
-
-        for (int i = 0; i < data.length; i++) {
-            fitData[i] = Utilities.boundToRange(data[i] + delta, min, max);
-        }
-
-        return fitData;
-    }
-
-    /**
-     * Finds the closest color in a palette, given another HSL color
-     *
-     * @param palette where to search
-     * @param h hue
-     * @param s saturation
-     * @param l lightness
-     * @return closest index or -1 if palette is empty.
-     */
-    private static int bestFit(@NonNull TonalPalette palette, float h, float s, float l) {
-        int minErrorIndex = -1;
-        float minError = Float.POSITIVE_INFINITY;
-
-        for (int i = 0; i < palette.h.length; i++) {
-            float error =
-                    FIT_WEIGHT_H * Math.abs(h - palette.h[i])
-                            + FIT_WEIGHT_S * Math.abs(s - palette.s[i])
-                            + FIT_WEIGHT_L * Math.abs(l - palette.l[i]);
-            if (error < minError) {
-                minError = error;
-                minErrorIndex = i;
-            }
-        }
-
-        return minErrorIndex;
-    }
-
-    @Nullable
-    private static TonalPalette findTonalPalette(float h, float s) {
-        // Fallback to a grey palette if the color is too desaturated.
-        // This avoids hue shifts.
-        if (s < 0.05f) {
-            return GREY_PALETTE;
-        }
-
-        TonalPalette best = null;
-        float error = Float.POSITIVE_INFINITY;
-
-        for (int i = 0; i < TONAL_PALETTES.length; i++) {
-            final TonalPalette candidate = TONAL_PALETTES[i];
-
-            if (h >= candidate.minHue && h <= candidate.maxHue) {
-                best = candidate;
-                break;
-            }
-
-            if (candidate.maxHue > 1.0f && h >= 0.0f && h <= fract(candidate.maxHue)) {
-                best = candidate;
-                break;
-            }
-
-            if (candidate.minHue < 0.0f && h >= fract(candidate.minHue) && h <= 1.0f) {
-                best = candidate;
-                break;
-            }
-
-            if (h <= candidate.minHue && candidate.minHue - h < error) {
-                best = candidate;
-                error = candidate.minHue - h;
-            } else if (h >= candidate.maxHue && h - candidate.maxHue < error) {
-                best = candidate;
-                error = h - candidate.maxHue;
-            } else if (candidate.maxHue > 1.0f && h >= fract(candidate.maxHue)
-                    && h - fract(candidate.maxHue) < error) {
-                best = candidate;
-                error = h - fract(candidate.maxHue);
-            } else if (candidate.minHue < 0.0f && h <= fract(candidate.minHue)
-                    && fract(candidate.minHue) - h < error) {
-                best = candidate;
-                error = fract(candidate.minHue) - h;
-            }
-        }
-
-        return best;
-    }
-
-    private static float fract(float v) {
-        return v - (float) Math.floor(v);
-    }
-
-    static class TonalPalette {
-        final float[] h;
-        final float[] s;
-        final float[] l;
-        final float minHue;
-        final float maxHue;
-
-        TonalPalette(float[] h, float[] s, float[] l) {
-            if (h.length != s.length || s.length != l.length) {
-                throw new IllegalArgumentException("All arrays should have the same size. h: "
-                        + Arrays.toString(h) + " s: " + Arrays.toString(s) + " l: "
-                        + Arrays.toString(l));
-            }
-
-            this.h = h;
-            this.s = s;
-            this.l = l;
-
-            float minHue = Float.POSITIVE_INFINITY;
-            float maxHue = Float.NEGATIVE_INFINITY;
-
-            for (float v : h) {
-                minHue = Math.min(v, minHue);
-                maxHue = Math.max(v, maxHue);
-            }
-
-            this.minHue = minHue;
-            this.maxHue = maxHue;
-        }
-    }
-
-    // Data definition of Material Design tonal palettes
-    // When the sort type is set to TONAL, these palettes are used to find
-    // a best fit. Each palette is defined as 22 HSL colors
-    private static final TonalPalette[] TONAL_PALETTES = {
-            new TonalPalette(
-                    new float[] {1f, 1f, 0.991f, 0.991f, 0.9833333333333333f, 0f, 0f, 0f,
-                            0.01134380453752181f, 0.015625000000000003f, 0.024193548387096798f,
-                            0.027397260273972573f, 0.017543859649122865f},
-                    new float[] {1f, 1f, 1f, 1f, 1f, 1f, 1f, 0.8434782608695652f, 1f, 1f, 1f, 1f,
-                            1f},
-                    new float[] {0.04f, 0.09f, 0.14f, 0.2f, 0.27450980392156865f,
-                            0.34901960784313724f, 0.4235294117647059f, 0.5490196078431373f,
-                            0.6254901960784314f, 0.6862745098039216f, 0.7568627450980392f,
-                            0.8568627450980393f, 0.9254901960784314f}
-            ),
-            new TonalPalette(
-                    new float[] {0.638f, 0.638f, 0.6385767790262171f, 0.6301169590643275f,
-                            0.6223958333333334f, 0.6151079136690647f, 0.6065400843881856f,
-                            0.5986964618249534f, 0.5910746812386157f, 0.5833333333333334f,
-                            0.5748031496062993f, 0.5582010582010583f},
-                    new float[] {1f, 1f, 1f, 1f, 0.9014084507042253f, 0.8128654970760234f,
-                            0.7979797979797981f, 0.7816593886462883f, 0.778723404255319f, 1f, 1f,
-                            1f},
-                    new float[] {0.05f, 0.12f, 0.17450980392156862f, 0.2235294117647059f,
-                            0.2784313725490196f, 0.3352941176470588f, 0.388235294117647f,
-                            0.44901960784313727f, 0.5392156862745098f, 0.6509803921568628f,
-                            0.7509803921568627f, 0.8764705882352941f}
-            ),
-            new TonalPalette(
-                    new float[] {0.563f, 0.569f, 0.5666f, 0.5669934640522876f, 0.5748031496062993f,
-                            0.5595238095238095f, 0.5473118279569893f, 0.5393258426966292f,
-                            0.5315955766192734f, 0.524031007751938f, 0.5154711673699016f,
-                            0.508080808080808f, 0.5f},
-                    new float[] {1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 0.8847736625514403f, 1f, 1f,
-                            1f},
-                    new float[] {0.07f, 0.12f, 0.16f, 0.2f, 0.24901960784313726f,
-                            0.27450980392156865f, 0.30392156862745096f, 0.34901960784313724f,
-                            0.4137254901960784f, 0.47647058823529415f, 0.5352941176470588f,
-                            0.6764705882352942f, 0.8f}
-            ),
-            new TonalPalette(
-                    new float[] {0.508f, 0.511f, 0.508f, 0.508f, 0.5082304526748972f,
-                            0.5069444444444444f, 0.5f, 0.5f, 0.5f, 0.48724954462659376f,
-                            0.4800347222222222f, 0.4755134281200632f, 0.4724409448818897f,
-                            0.4671052631578947f},
-                    new float[] {1f, 1f, 1f, 1f, 1f, 0.8888888888888887f, 0.9242424242424242f, 1f,
-                            1f, 0.8133333333333332f, 0.7868852459016393f, 1f, 1f, 1f},
-                    new float[] {0.04f, 0.06f, 0.08f, 0.12f, 0.1588235294117647f,
-                            0.21176470588235297f, 0.25882352941176473f, 0.3f, 0.34901960784313724f,
-                            0.44117647058823534f, 0.5215686274509804f, 0.5862745098039216f,
-                            0.7509803921568627f, 0.8509803921568627f}
-            ),
-            new TonalPalette(
-                    new float[] {0.333f, 0.333f, 0.333f, 0.3333333333333333f, 0.3333333333333333f,
-                            0.34006734006734f, 0.34006734006734f, 0.34006734006734f,
-                            0.34259259259259256f, 0.3475783475783476f, 0.34767025089605735f,
-                            0.3467741935483871f, 0.3703703703703704f},
-                    new float[] {0.70f, 0.72f, 0.69f, 0.6703296703296703f, 0.728813559322034f,
-                            0.5657142857142856f, 0.5076923076923077f, 0.3944223107569721f,
-                            0.6206896551724138f, 0.8931297709923666f, 1f, 1f, 1f},
-                    new float[] {0.05f, 0.08f, 0.14f, 0.1784313725490196f, 0.23137254901960785f,
-                            0.3431372549019608f, 0.38235294117647056f, 0.49215686274509807f,
-                            0.6588235294117647f, 0.7431372549019608f, 0.8176470588235294f,
-                            0.8784313725490196f, 0.9294117647058824f}
-            ),
-            new TonalPalette(
-                    new float[] {0.161f, 0.163f, 0.163f, 0.162280701754386f, 0.15032679738562088f,
-                            0.15879265091863518f, 0.16236559139784948f, 0.17443868739205526f,
-                            0.17824074074074076f, 0.18674698795180725f, 0.18692449355432778f,
-                            0.1946778711484594f, 0.18604651162790695f},
-                    new float[] {1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f},
-                    new float[] {0.05f, 0.08f, 0.11f, 0.14901960784313725f, 0.2f,
-                            0.24901960784313726f, 0.30392156862745096f, 0.3784313725490196f,
-                            0.4235294117647059f, 0.48823529411764705f, 0.6450980392156863f,
-                            0.7666666666666666f, 0.8313725490196078f}
-            ),
-            new TonalPalette(
-                    new float[] {0.108f, 0.105f, 0.105f, 0.105f, 0.10619469026548674f,
-                            0.11924686192468618f, 0.13046448087431692f, 0.14248366013071895f,
-                            0.1506024096385542f, 0.16220238095238093f, 0.16666666666666666f,
-                            0.16666666666666666f, 0.162280701754386f, 0.15686274509803924f},
-                    new float[] {1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f},
-                    new float[] {0.17f, 0.22f, 0.28f, 0.35f, 0.44313725490196076f,
-                            0.46862745098039216f, 0.47843137254901963f, 0.5f, 0.5117647058823529f,
-                            0.5607843137254902f, 0.6509803921568628f, 0.7509803921568627f,
-                            0.8509803921568627f, 0.9f}
-            ),
-            new TonalPalette(
-                    new float[] {0.036f, 0.036f, 0.036f, 0.036f, 0.03561253561253561f,
-                            0.05098039215686275f, 0.07516339869281045f, 0.09477124183006536f,
-                            0.1150326797385621f, 0.134640522875817f, 0.14640522875816991f,
-                            0.1582397003745319f, 0.15773809523809523f, 0.15359477124183002f},
-                    new float[] {1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f},
-                    new float[] {0.19f, 0.26f, 0.34f, 0.39f, 0.4588235294117647f, 0.5f, 0.5f, 0.5f,
-                            0.5f, 0.5f, 0.5f, 0.6509803921568628f, 0.7803921568627451f, 0.9f}
-            ),
-            new TonalPalette(
-                    new float[] {0.955f, 0.961f, 0.958f, 0.9596491228070175f, 0.9593837535014005f,
-                            0.9514767932489452f, 0.943859649122807f, 0.9396825396825397f,
-                            0.9395424836601307f, 0.9393939393939394f, 0.9362745098039216f,
-                            0.9754098360655739f, 0.9824561403508771f},
-                    new float[] {0.87f, 0.85f, 0.85f, 0.84070796460177f, 0.8206896551724138f,
-                            0.7979797979797981f, 0.7661290322580644f, 0.9051724137931036f,
-                            1f, 1f, 1f, 1f, 1f},
-                    new float[] {0.06f, 0.11f, 0.16f, 0.22156862745098038f, 0.2843137254901961f,
-                            0.388235294117647f, 0.48627450980392156f, 0.5450980392156863f,
-                            0.6f, 0.6764705882352942f, 0.8f, 0.8803921568627451f,
-                            0.9254901960784314f}
-            ),
-            new TonalPalette(
-                    new float[] {0.866f, 0.855f, 0.841025641025641f, 0.8333333333333334f,
-                            0.8285256410256411f, 0.821522309711286f, 0.8083333333333333f,
-                            0.8046594982078853f, 0.8005822416302766f, 0.7842377260981912f,
-                            0.7771084337349398f, 0.7747747747747749f},
-                    new float[] {1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f,
-                            0.737142857142857f, 0.6434108527131781f, 0.46835443037974644f},
-                    new float[] {0.05f, 0.08f, 0.12745098039215685f, 0.15490196078431373f,
-                            0.20392156862745098f, 0.24901960784313726f, 0.3137254901960784f,
-                            0.36470588235294116f, 0.44901960784313727f, 0.6568627450980392f,
-                            0.7470588235294118f, 0.8450980392156863f}
-            ),
-            new TonalPalette(
-                    new float[] {0.925f, 0.93f, 0.938f, 0.947f, 0.955952380952381f,
-                            0.9681069958847737f, 0.9760479041916167f, 0.9873563218390804f, 0f, 0f,
-                            0.009057971014492771f, 0.026748971193415648f,
-                            0.041666666666666616f, 0.05303030303030304f},
-                    new float[] {1f, 1f, 1f, 1f, 1f, 0.8350515463917526f, 0.6929460580912863f,
-                            0.6387665198237885f, 0.6914893617021276f, 0.7583892617449666f,
-                            0.8070175438596495f, 0.9310344827586209f, 1f, 1f},
-                    new float[] {0.10f, 0.13f, 0.17f, 0.2f, 0.27450980392156865f,
-                            0.3803921568627451f, 0.4725490196078432f, 0.5549019607843138f,
-                            0.6313725490196078f, 0.707843137254902f, 0.7764705882352941f,
-                            0.8294117647058823f, 0.9058823529411765f, 0.9568627450980391f}
-            ),
-            new TonalPalette(
-                    new float[] {0.733f, 0.736f, 0.744f, 0.7514619883040936f, 0.7679738562091503f,
-                            0.7802083333333333f, 0.7844311377245509f, 0.796875f,
-                            0.8165618448637316f, 0.8487179487179487f, 0.8582375478927203f,
-                            0.8562091503267975f, 0.8666666666666667f},
-                    new float[] {1f, 1f, 1f, 1f, 1f, 0.8163265306122449f, 0.6653386454183268f,
-                            0.7547169811320753f, 0.929824561403509f, 0.9558823529411766f,
-                            0.9560439560439562f, 1f, 1f},
-                    new float[] {0.07f, 0.12f, 0.17f, 0.2235294117647059f, 0.3f,
-                            0.38431372549019605f, 0.492156862745098f, 0.5843137254901961f,
-                            0.6647058823529411f, 0.7333333333333334f, 0.8215686274509804f, 0.9f,
-                            0.9411764705882353f}
-            ),
-            new TonalPalette(
-                    new float[] {0.6666666666666666f, 0.6666666666666666f, 0.6666666666666666f,
-                            0.6666666666666666f, 0.6666666666666666f, 0.6666666666666666f,
-                            0.6666666666666666f, 0.6666666666666666f, 0.6666666666666666f,
-                            0.6666666666666666f, 0.6666666666666666f},
-                    new float[] {0.25f, 0.24590163934426232f, 0.17880794701986752f,
-                            0.14606741573033713f, 0.13761467889908252f, 0.14893617021276592f,
-                            0.16756756756756758f, 0.20312500000000017f, 0.26086956521739135f,
-                            0.29999999999999966f, 0.5000000000000004f},
-                    new float[] {0.18f, 0.2392156862745098f, 0.296078431372549f,
-                            0.34901960784313724f, 0.4274509803921569f, 0.5392156862745098f,
-                            0.6372549019607843f, 0.7490196078431373f, 0.8196078431372549f,
-                            0.8823529411764706f, 0.9372549019607843f}
-            ),
-            new TonalPalette(
-                    new float[] {0.938f, 0.944f, 0.952f, 0.961f, 0.9678571428571429f,
-                            0.9944812362030905f, 0f, 0f,
-                            0.0047348484848484815f, 0.00316455696202532f, 0f,
-                            0.9980392156862745f, 0.9814814814814816f, 0.9722222222222221f},
-                    new float[] {1f, 1f, 1f, 1f, 1f, 0.7023255813953488f, 0.6638655462184874f,
-                            0.6521739130434782f, 0.7719298245614035f, 0.8315789473684211f,
-                            0.6867469879518071f, 0.7264957264957265f, 0.8181818181818182f,
-                            0.8181818181818189f},
-                    new float[] {0.08f, 0.13f, 0.18f, 0.23f, 0.27450980392156865f,
-                            0.4215686274509804f,
-                            0.4666666666666667f, 0.503921568627451f, 0.5529411764705883f,
-                            0.6274509803921569f, 0.6745098039215687f, 0.7705882352941176f,
-                            0.892156862745098f, 0.9568627450980391f}
-            ),
-            new TonalPalette(
-                    new float[] {0.88f, 0.888f, 0.897f, 0.9052287581699346f, 0.9112021857923498f,
-                            0.9270152505446624f, 0.9343137254901961f, 0.9391534391534391f,
-                            0.9437984496124031f, 0.943661971830986f, 0.9438943894389439f,
-                            0.9426229508196722f, 0.9444444444444444f},
-                    new float[] {1f, 1f, 1f, 1f, 0.8133333333333332f, 0.7927461139896375f,
-                            0.7798165137614679f, 0.7777777777777779f, 0.8190476190476191f,
-                            0.8255813953488372f, 0.8211382113821142f, 0.8133333333333336f,
-                            0.8000000000000006f},
-                    new float[] {0.08f, 0.12f, 0.16f, 0.2f, 0.29411764705882354f,
-                            0.3784313725490196f, 0.42745098039215684f, 0.4764705882352941f,
-                            0.5882352941176471f, 0.6627450980392157f, 0.7588235294117647f,
-                            0.8529411764705882f, 0.9411764705882353f}
-            ),
-            new TonalPalette(
-                    new float[] {0.669f, 0.680f, 0.6884057971014492f, 0.6974789915966387f,
-                            0.7079889807162534f, 0.7154471544715447f, 0.7217741935483872f,
-                            0.7274143302180687f, 0.7272727272727273f, 0.7258064516129031f,
-                            0.7252252252252251f, 0.7333333333333333f},
-                    new float[] {0.81f, 0.81f, 0.8214285714285715f, 0.6878612716763006f,
-                            0.6080402010050251f, 0.5774647887323943f, 0.5391304347826086f,
-                            0.46724890829694316f, 0.4680851063829788f, 0.462686567164179f,
-                            0.45679012345678977f, 0.4545454545454551f},
-                    new float[] {0.12f, 0.16f, 0.2196078431372549f, 0.33921568627450976f,
-                            0.39019607843137255f, 0.4176470588235294f, 0.45098039215686275f,
-                            0.5509803921568628f, 0.6313725490196078f, 0.7372549019607844f,
-                            0.8411764705882353f, 0.9352941176470588f}
-            ),
-            new TonalPalette(
-                    new float[] {0.6470588235294118f, 0.6516666666666667f, 0.6464174454828661f,
-                            0.6441441441441442f, 0.6432748538011696f, 0.6416666666666667f,
-                            0.6402439024390243f, 0.6412429378531074f, 0.6435185185185186f,
-                            0.6428571428571429f},
-                    new float[] {0.8095238095238095f, 0.6578947368421053f, 0.5721925133689839f,
-                            0.5362318840579711f, 0.5f, 0.4424778761061947f, 0.44086021505376327f,
-                            0.44360902255639095f, 0.4499999999999997f, 0.4375000000000006f},
-                    new float[] {0.16470588235294117f, 0.2980392156862745f, 0.36666666666666664f,
-                            0.40588235294117647f, 0.44705882352941173f,
-                            0.5568627450980392f, 0.6352941176470588f, 0.7392156862745098f,
-                            0.8431372549019608f, 0.9372549019607843f}
-            ),
-            new TonalPalette(
-                    new float[] {0.469f, 0.46732026143790845f, 0.4718614718614719f,
-                            0.4793650793650794f, 0.48071625344352614f, 0.4829683698296837f,
-                            0.484375f, 0.4841269841269842f, 0.48444444444444457f,
-                            0.48518518518518516f, 0.4907407407407408f},
-                    new float[] {1f, 1f, 1f, 1f, 1f, 1f, 0.6274509803921569f, 0.41832669322709176f,
-                            0.41899441340782106f, 0.4128440366972478f, 0.4090909090909088f},
-                    new float[] {0.07f, 0.1f, 0.15098039215686274f, 0.20588235294117646f,
-                            0.2372549019607843f, 0.26862745098039215f, 0.4f, 0.5078431372549019f,
-                            0.6490196078431372f, 0.7862745098039216f, 0.9137254901960784f}
-            ),
-            new TonalPalette(
-                    new float[] {0.542f, 0.5444444444444444f, 0.5555555555555556f,
-                            0.5555555555555556f, 0.553763440860215f, 0.5526315789473684f,
-                            0.5555555555555556f, 0.5555555555555555f, 0.5555555555555556f,
-                            0.5512820512820514f, 0.5666666666666667f},
-                    new float[] {0.25f, 0.24590163934426232f, 0.19148936170212766f,
-                            0.1791044776119403f, 0.18343195266272191f, 0.18446601941747576f,
-                            0.1538461538461539f, 0.15625000000000003f, 0.15328467153284678f,
-                            0.15662650602409653f, 0.151515151515151f},
-                    new float[] {0.05f, 0.1196078431372549f, 0.1843137254901961f,
-                            0.2627450980392157f,
-                            0.33137254901960783f, 0.403921568627451f, 0.5411764705882354f,
-                            0.6235294117647059f, 0.7313725490196079f, 0.8372549019607843f,
-                            0.9352941176470588f}
-            ),
-            new TonalPalette(
-                    new float[] {0.022222222222222223f, 0.02469135802469136f, 0.031249999999999997f,
-                            0.03947368421052631f, 0.04166666666666668f,
-                            0.043650793650793655f, 0.04411764705882352f, 0.04166666666666652f,
-                            0.04444444444444459f, 0.05555555555555529f},
-                    new float[] {0.33333333333333337f, 0.2783505154639175f, 0.2580645161290323f,
-                            0.25675675675675674f, 0.2528735632183908f, 0.17500000000000002f,
-                            0.15315315315315312f, 0.15189873417721522f,
-                            0.15789473684210534f, 0.15789473684210542f},
-                    new float[] {0.08823529411764705f, 0.19019607843137254f, 0.2431372549019608f,
-                            0.2901960784313725f, 0.3411764705882353f, 0.47058823529411764f,
-                            0.5647058823529412f, 0.6901960784313725f, 0.8137254901960784f,
-                            0.9254901960784314f}
-            ),
-            new TonalPalette(
-                    new float[] {0.027f, 0.03f, 0.038f, 0.044f, 0.050884955752212385f,
-                            0.07254901960784313f, 0.0934640522875817f,
-                            0.10457516339869281f, 0.11699346405228758f,
-                            0.1255813953488372f, 0.1268939393939394f, 0.12533333333333332f,
-                            0.12500000000000003f, 0.12777777777777777f},
-                    new float[] {1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f},
-                    new float[] {0.25f, 0.3f, 0.35f, 0.4f, 0.44313725490196076f, 0.5f, 0.5f, 0.5f,
-                            0.5f, 0.5784313725490196f,
-                            0.6549019607843137f, 0.7549019607843137f, 0.8509803921568627f,
-                            0.9411764705882353f}
-            )
-    };
-
-    private static final TonalPalette GREY_PALETTE = new TonalPalette(
-            new float[]{0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f},
-            new float[]{0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f},
-            new float[]{0.08f, 0.11f, 0.14901960784313725f, 0.2f, 0.2980392156862745f, 0.4f,
-                    0.4980392156862745f, 0.6196078431372549f, 0.7176470588235294f,
-                    0.8196078431372549f, 0.9176470588235294f, 0.9490196078431372f}
-    );
-
-    @SuppressWarnings("WeakerAccess")
-    static final ColorRange[] DISALLOWED_COLORS = new ColorRange[] {
-
-            // Red
-            new ColorRange(
-                    new Range<>(0f, 20f) /* H */,
-                    new Range<>(0.7f, 1f) /* S */,
-                    new Range<>(0.21f, 0.79f)) /* L */,
-            new ColorRange(
-                    new Range<>(0f, 20f),
-                    new Range<>(0.3f, 0.7f),
-                    new Range<>(0.355f, 0.653f)),
-
-            // Red Orange
-            new ColorRange(
-                    new Range<>(20f, 40f),
-                    new Range<>(0.7f, 1f),
-                    new Range<>(0.28f, 0.643f)),
-            new ColorRange(
-                    new Range<>(20f, 40f),
-                    new Range<>(0.3f, 0.7f),
-                    new Range<>(0.414f, 0.561f)),
-            new ColorRange(
-                    new Range<>(20f, 40f),
-                    new Range<>(0f, 3f),
-                    new Range<>(0.343f, 0.584f)),
-
-            // Orange
-            new ColorRange(
-                    new Range<>(40f, 60f),
-                    new Range<>(0.7f, 1f),
-                    new Range<>(0.173f, 0.349f)),
-            new ColorRange(
-                    new Range<>(40f, 60f),
-                    new Range<>(0.3f, 0.7f),
-                    new Range<>(0.233f, 0.427f)),
-            new ColorRange(
-                    new Range<>(40f, 60f),
-                    new Range<>(0f, 0.3f),
-                    new Range<>(0.231f, 0.484f)),
-
-            // Yellow 60
-            new ColorRange(
-                    new Range<>(60f, 80f),
-                    new Range<>(0.7f, 1f),
-                    new Range<>(0.488f, 0.737f)),
-            new ColorRange(
-                    new Range<>(60f, 80f),
-                    new Range<>(0.3f, 0.7f),
-                    new Range<>(0.673f, 0.837f)),
-
-            // Yellow Green 80
-            new ColorRange(
-                    new Range<>(80f, 100f),
-                    new Range<>(0.7f, 1f),
-                    new Range<>(0.469f, 0.61f)),
-
-            // Yellow green 100
-            new ColorRange(
-                    new Range<>(100f, 120f),
-                    new Range<>(0.7f, 1f),
-                    new Range<>(0.388f, 0.612f)),
-            new ColorRange(
-                    new Range<>(100f, 120f),
-                    new Range<>(0.3f, 0.7f),
-                    new Range<>(0.424f, 0.541f)),
-
-            // Green
-            new ColorRange(
-                    new Range<>(120f, 140f),
-                    new Range<>(0.7f, 1f),
-                    new Range<>(0.375f, 0.52f)),
-            new ColorRange(
-                    new Range<>(120f, 140f),
-                    new Range<>(0.3f, 0.7f),
-                    new Range<>(0.435f, 0.524f)),
-
-            // Green Blue 140
-            new ColorRange(
-                    new Range<>(140f, 160f),
-                    new Range<>(0.7f, 1f),
-                    new Range<>(0.496f, 0.641f)),
-
-            // Seafoam
-            new ColorRange(
-                    new Range<>(160f, 180f),
-                    new Range<>(0.7f, 1f),
-                    new Range<>(0.496f, 0.567f)),
-
-            // Cyan
-            new ColorRange(
-                    new Range<>(180f, 200f),
-                    new Range<>(0.7f, 1f),
-                    new Range<>(0.52f, 0.729f)),
-
-            // Blue
-            new ColorRange(
-                    new Range<>(220f, 240f),
-                    new Range<>(0.7f, 1f),
-                    new Range<>(0.396f, 0.571f)),
-            new ColorRange(
-                    new Range<>(220f, 240f),
-                    new Range<>(0.3f, 0.7f),
-                    new Range<>(0.425f, 0.551f)),
-
-            // Blue Purple 240
-            new ColorRange(
-                    new Range<>(240f, 260f),
-                    new Range<>(0.7f, 1f),
-                    new Range<>(0.418f, 0.639f)),
-            new ColorRange(
-                    new Range<>(220f, 240f),
-                    new Range<>(0.3f, 0.7f),
-                    new Range<>(0.441f, 0.576f)),
-
-            // Blue Purple 260
-            new ColorRange(
-                    new Range<>(260f, 280f),
-                    new Range<>(0.3f, 1f), // Bigger range
-                    new Range<>(0.461f, 0.553f)),
-
-            // Fuchsia
-            new ColorRange(
-                    new Range<>(300f, 320f),
-                    new Range<>(0.7f, 1f),
-                    new Range<>(0.484f, 0.588f)),
-            new ColorRange(
-                    new Range<>(300f, 320f),
-                    new Range<>(0.3f, 0.7f),
-                    new Range<>(0.48f, 0.592f)),
-
-            // Pink
-            new ColorRange(
-                    new Range<>(320f, 340f),
-                    new Range<>(0.7f, 1f),
-                    new Range<>(0.466f, 0.629f)),
-
-            // Soft red
-            new ColorRange(
-                    new Range<>(340f, 360f),
-                    new Range<>(0.7f, 1f),
-                    new Range<>(0.437f, 0.596f))
-    };
-
-    /**
-     * Representation of an HSL color range.
-     * <ul>
-     * <li>hsl[0] is Hue [0 .. 360)</li>
-     * <li>hsl[1] is Saturation [0...1]</li>
-     * <li>hsl[2] is Lightness [0...1]</li>
-     * </ul>
-     */
-    static class ColorRange {
-        private Range<Float> mHue;
-        private Range<Float> mSaturation;
-        private Range<Float> mLightness;
-
-        ColorRange(Range<Float> hue, Range<Float> saturation, Range<Float> lightness) {
-            mHue = hue;
-            mSaturation = saturation;
-            mLightness = lightness;
-        }
-
-        boolean containsColor(float h, float s, float l) {
-            if (!mHue.contains(h)) {
-                return false;
-            } else if (!mSaturation.contains(s)) {
-                return false;
-            } else if (!mLightness.contains(l)) {
-                return false;
-            }
-            return true;
-        }
-
-        float[] getCenter() {
-            return new float[] {
-                    mHue.getLower() + (mHue.getUpper() - mHue.getLower()) / 2f,
-                    mSaturation.getLower() + (mSaturation.getUpper() - mSaturation.getLower()) / 2f,
-                    mLightness.getLower() + (mLightness.getUpper() - mLightness.getLower()) / 2f
-            };
-        }
-
-        @Override
-        public String toString() {
-            return String.format("H: %s, S: %s, L %s", mHue, mSaturation, mLightness);
-        }
-    }
-
-    private static List<Integer> getMainColors(WallpaperColorsCompat wallpaperColors) {
-        LinkedList<Integer> colors = new LinkedList<>();
-        if (wallpaperColors.getPrimaryColor() != 0) {
-            colors.add(wallpaperColors.getPrimaryColor());
-        }
-        if (wallpaperColors.getSecondaryColor() != 0) {
-            colors.add(wallpaperColors.getSecondaryColor());
-        }
-        if (wallpaperColors.getTertiaryColor() != 0) {
-            colors.add(wallpaperColors.getTertiaryColor());
-        }
-        return colors;
-    }
-}
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperColorsCompat.java b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperColorsCompat.java
deleted file mode 100644
index d984a840d6..0000000000
--- a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperColorsCompat.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.uioverrides.dynamicui;
-
-/**
- * A compatibility layer around platform implementation of WallpaperColors
- */
-public class WallpaperColorsCompat {
-
-    public static final int HINT_SUPPORTS_DARK_TEXT = 0x1;
-    public static final int HINT_SUPPORTS_DARK_THEME = 0x2;
-
-    private final int mPrimaryColor;
-    private final int mSecondaryColor;
-    private final int mTertiaryColor;
-    private final int mColorHints;
-
-    public WallpaperColorsCompat(int primaryColor, int secondaryColor, int tertiaryColor,
-            int colorHints) {
-        mPrimaryColor = primaryColor;
-        mSecondaryColor = secondaryColor;
-        mTertiaryColor = tertiaryColor;
-        mColorHints = colorHints;
-    }
-
-    public int getPrimaryColor() {
-        return mPrimaryColor;
-    }
-
-    public int getSecondaryColor() {
-        return mSecondaryColor;
-    }
-
-    public int getTertiaryColor() {
-        return mTertiaryColor;
-    }
-
-    public int getColorHints() {
-        return mColorHints;
-    }
-
-}
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompat.java b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompat.java
deleted file mode 100644
index 9dbe47cb66..0000000000
--- a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompat.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.uioverrides.dynamicui;
-
-import android.content.Context;
-import android.os.Build;
-
-import androidx.annotation.Nullable;
-
-public abstract class WallpaperManagerCompat {
-
-    private static final Object sInstanceLock = new Object();
-    private static WallpaperManagerCompat sInstance;
-
-    public static WallpaperManagerCompat getInstance(Context context) {
-        synchronized (sInstanceLock) {
-            if (sInstance == null) {
-                context = context.getApplicationContext();
-
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
-                    try {
-                        sInstance = new WallpaperManagerCompatVOMR1(context);
-                    } catch (Throwable e) {
-                        // The wallpaper APIs do not yet exist
-                    }
-                }
-                if (sInstance == null) {
-                    sInstance = new WallpaperManagerCompatVL(context);
-                }
-            }
-            return sInstance;
-        }
-    }
-
-
-    public abstract @Nullable WallpaperColorsCompat getWallpaperColors(int which);
-
-    public abstract void addOnColorsChangedListener(OnColorsChangedListenerCompat listener);
-
-    /**
-     * Interface definition for a callback to be invoked when colors change on a wallpaper.
-     */
-    public interface OnColorsChangedListenerCompat {
-
-        void onColorsChanged(WallpaperColorsCompat colors, int which);
-    }
-}
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVL.java b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVL.java
deleted file mode 100644
index 500fdc3608..0000000000
--- a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVL.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.uioverrides.dynamicui;
-
-import static android.app.WallpaperManager.FLAG_SYSTEM;
-
-import static com.android.launcher3.Utilities.getDevicePrefs;
-
-import android.app.WallpaperInfo;
-import android.app.WallpaperManager;
-import android.app.job.JobInfo;
-import android.app.job.JobParameters;
-import android.app.job.JobScheduler;
-import android.app.job.JobService;
-import android.content.BroadcastReceiver;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.PackageManager;
-import android.content.pm.PermissionInfo;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.BitmapRegionDecoder;
-import android.graphics.Canvas;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.ParcelFileDescriptor;
-import android.util.Log;
-import android.util.Pair;
-
-import com.android.launcher3.icons.ColorExtractor;
-
-import java.io.IOException;
-import java.util.ArrayList;
-
-import androidx.annotation.Nullable;
-
-public class WallpaperManagerCompatVL extends WallpaperManagerCompat {
-
-    private static final String TAG = "WMCompatVL";
-
-    private static final String VERSION_PREFIX = "1,";
-    private static final String KEY_COLORS = "wallpaper_parsed_colors";
-    private static final String ACTION_EXTRACTION_COMPLETE =
-            "com.android.launcher3.uioverrides.dynamicui.WallpaperManagerCompatVL.EXTRACTION_COMPLETE";
-
-    public static final int WALLPAPER_COMPAT_JOB_ID = 1;
-
-    private final ArrayList<OnColorsChangedListenerCompat> mListeners = new ArrayList<>();
-
-    private final Context mContext;
-    private WallpaperColorsCompat mColorsCompat;
-
-    WallpaperManagerCompatVL(Context context) {
-        mContext = context;
-
-        String colors = getDevicePrefs(mContext).getString(KEY_COLORS, "");
-        int wallpaperId = -1;
-        if (colors.startsWith(VERSION_PREFIX)) {
-            Pair<Integer, WallpaperColorsCompat> storedValue = parseValue(colors);
-            wallpaperId = storedValue.first;
-            mColorsCompat = storedValue.second;
-        }
-
-        if (wallpaperId == -1 || wallpaperId != getWallpaperId(context)) {
-            reloadColors();
-        }
-        context.registerReceiver(new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                reloadColors();
-            }
-        }, new IntentFilter(Intent.ACTION_WALLPAPER_CHANGED));
-
-        // Register a receiver for results
-        String permission = null;
-        // Find a permission which only we can use.
-        try {
-            for (PermissionInfo info : context.getPackageManager().getPackageInfo(
-                    context.getPackageName(),
-                    PackageManager.GET_PERMISSIONS).permissions) {
-                if ((info.protectionLevel & PermissionInfo.PROTECTION_SIGNATURE) != 0) {
-                    permission = info.name;
-                }
-            }
-        } catch (PackageManager.NameNotFoundException e) {
-            // Something went wrong. ignore
-            Log.d(TAG, "Unable to get permission info", e);
-        }
-        mContext.registerReceiver(new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                handleResult(intent.getStringExtra(KEY_COLORS));
-            }
-        }, new IntentFilter(ACTION_EXTRACTION_COMPLETE), permission, new Handler());
-    }
-
-    @Nullable
-    @Override
-    public WallpaperColorsCompat getWallpaperColors(int which) {
-        return which == FLAG_SYSTEM ? mColorsCompat : null;
-    }
-
-    @Override
-    public void addOnColorsChangedListener(OnColorsChangedListenerCompat listener) {
-        mListeners.add(listener);
-    }
-
-    private void reloadColors() {
-        JobInfo job = new JobInfo.Builder(WALLPAPER_COMPAT_JOB_ID,
-                new ComponentName(mContext, ColorExtractionService.class))
-                .setMinimumLatency(0).build();
-        ((JobScheduler) mContext.getSystemService(Context.JOB_SCHEDULER_SERVICE)).schedule(job);
-    }
-
-    private void handleResult(String result) {
-        getDevicePrefs(mContext).edit().putString(KEY_COLORS, result).apply();
-        mColorsCompat = parseValue(result).second;
-        for (OnColorsChangedListenerCompat listener : mListeners) {
-            listener.onColorsChanged(mColorsCompat, FLAG_SYSTEM);
-        }
-    }
-
-    private static final int getWallpaperId(Context context) {
-        return context.getSystemService(WallpaperManager.class).getWallpaperId(FLAG_SYSTEM);
-    }
-
-    /**
-     * Parses the stored value and returns the wallpaper id and wallpaper colors.
-     */
-    private static Pair<Integer, WallpaperColorsCompat> parseValue(String value) {
-        String[] parts = value.split(",");
-        Integer wallpaperId = Integer.parseInt(parts[1]);
-        if (parts.length == 2) {
-            // There is no wallpaper color info present, eg when live wallpaper has no preview.
-            return Pair.create(wallpaperId, null);
-        }
-
-        int primary = parts.length > 2 ? Integer.parseInt(parts[2]) : 0;
-        int secondary = parts.length > 3 ? Integer.parseInt(parts[3]) : 0;
-        int tertiary = parts.length > 4 ? Integer.parseInt(parts[4]) : 0;
-
-        return Pair.create(wallpaperId, new WallpaperColorsCompat(primary, secondary, tertiary,
-                0 /* hints */));
-    }
-
-    /**
-     * Intent service to handle color extraction
-     */
-    public static class ColorExtractionService extends JobService implements Runnable {
-        private static final int MAX_WALLPAPER_EXTRACTION_AREA = 112 * 112;
-
-        private HandlerThread mWorkerThread;
-        private Handler mWorkerHandler;
-        private ColorExtractor mColorExtractor;
-
-        @Override
-        public void onCreate() {
-            super.onCreate();
-            mWorkerThread = new HandlerThread("ColorExtractionService");
-            mWorkerThread.start();
-            mWorkerHandler = new Handler(mWorkerThread.getLooper());
-            mColorExtractor = new ColorExtractor();
-        }
-
-        @Override
-        public void onDestroy() {
-            super.onDestroy();
-            mWorkerThread.quit();
-        }
-
-        @Override
-        public boolean onStartJob(final JobParameters jobParameters) {
-            mWorkerHandler.post(this);
-            return true;
-        }
-
-        @Override
-        public boolean onStopJob(JobParameters jobParameters) {
-            mWorkerHandler.removeCallbacksAndMessages(null);
-            return true;
-        }
-
-        /**
-         * Extracts the wallpaper colors and sends the result back through the receiver.
-         */
-        @Override
-        public void run() {
-            int wallpaperId = getWallpaperId(this);
-
-            Bitmap bitmap = null;
-            Drawable drawable = null;
-
-            WallpaperManager wm = WallpaperManager.getInstance(this);
-            WallpaperInfo info = wm.getWallpaperInfo();
-            if (info != null) {
-                // For live wallpaper, extract colors from thumbnail
-                drawable = info.loadThumbnail(getPackageManager());
-            } else {
-                try (ParcelFileDescriptor fd = wm.getWallpaperFile(FLAG_SYSTEM)) {
-                    BitmapRegionDecoder decoder = BitmapRegionDecoder
-                            .newInstance(fd.getFileDescriptor(), false);
-
-                    int requestedArea = decoder.getWidth() * decoder.getHeight();
-                    BitmapFactory.Options options = new BitmapFactory.Options();
-
-                    if (requestedArea > MAX_WALLPAPER_EXTRACTION_AREA) {
-                        double areaRatio =
-                                (double) requestedArea / MAX_WALLPAPER_EXTRACTION_AREA;
-                        double nearestPowOf2 =
-                                Math.floor(Math.log(areaRatio) / (2 * Math.log(2)));
-                        options.inSampleSize = (int) Math.pow(2, nearestPowOf2);
-                    }
-                    Rect region = new Rect(0, 0, decoder.getWidth(), decoder.getHeight());
-                    bitmap = decoder.decodeRegion(region, options);
-                    decoder.recycle();
-                } catch (IOException | NullPointerException e) {
-                    Log.e(TAG, "Fetching partial bitmap failed, trying old method", e);
-                }
-                if (bitmap == null) {
-                    drawable = wm.getDrawable();
-                }
-            }
-
-            if (drawable != null) {
-                // Calculate how big the bitmap needs to be.
-                // This avoids unnecessary processing and allocation inside Palette.
-                final int requestedArea = drawable.getIntrinsicWidth() *
-                        drawable.getIntrinsicHeight();
-                double scale = 1;
-                if (requestedArea > MAX_WALLPAPER_EXTRACTION_AREA) {
-                    scale = Math.sqrt(MAX_WALLPAPER_EXTRACTION_AREA / (double) requestedArea);
-                }
-                bitmap = Bitmap.createBitmap((int) (drawable.getIntrinsicWidth() * scale),
-                        (int) (drawable.getIntrinsicHeight() * scale), Bitmap.Config.ARGB_8888);
-                final Canvas bmpCanvas = new Canvas(bitmap);
-                drawable.setBounds(0, 0, bitmap.getWidth(), bitmap.getHeight());
-                drawable.draw(bmpCanvas);
-            }
-
-            String value = VERSION_PREFIX + wallpaperId;
-
-            if (bitmap != null) {
-                int color = mColorExtractor.findDominantColorByHue(bitmap,
-                        MAX_WALLPAPER_EXTRACTION_AREA);
-                value += "," + color;
-            }
-
-            // Send the result
-            sendBroadcast(new Intent(ACTION_EXTRACTION_COMPLETE)
-                    .setPackage(getPackageName())
-                    .putExtra(KEY_COLORS, value));
-        }
-    }
-}
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVOMR1.java b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVOMR1.java
deleted file mode 100644
index f34497deba..0000000000
--- a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVOMR1.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.uioverrides.dynamicui;
-
-import android.annotation.TargetApi;
-import android.app.WallpaperColors;
-import android.app.WallpaperManager;
-import android.app.WallpaperManager.OnColorsChangedListener;
-import android.content.Context;
-import android.graphics.Color;
-import android.util.Log;
-
-import java.lang.reflect.Method;
-
-import androidx.annotation.Nullable;
-
-@TargetApi(27)
-public class WallpaperManagerCompatVOMR1 extends WallpaperManagerCompat {
-
-    private static final String TAG = "WMCompatVOMR1";
-
-    private final WallpaperManager mWm;
-    private Method mWCColorHintsMethod;
-
-    WallpaperManagerCompatVOMR1(Context context) throws Throwable {
-        mWm = context.getSystemService(WallpaperManager.class);
-        String className = WallpaperColors.class.getName();
-        try {
-            mWCColorHintsMethod = WallpaperColors.class.getDeclaredMethod("getColorHints");
-        } catch (Exception exc) {
-            Log.e(TAG, "getColorHints not available", exc);
-        }
-    }
-
-    @Nullable
-    @Override
-    public WallpaperColorsCompat getWallpaperColors(int which) {
-        return convertColorsObject(mWm.getWallpaperColors(which));
-    }
-
-    @Override
-    public void addOnColorsChangedListener(final OnColorsChangedListenerCompat listener) {
-        OnColorsChangedListener onChangeListener = new OnColorsChangedListener() {
-            @Override
-            public void onColorsChanged(WallpaperColors colors, int which) {
-                listener.onColorsChanged(convertColorsObject(colors), which);
-            }
-        };
-        mWm.addOnColorsChangedListener(onChangeListener, null);
-    }
-
-    private WallpaperColorsCompat convertColorsObject(WallpaperColors colors) {
-        if (colors == null) {
-            return null;
-        }
-        Color primary = colors.getPrimaryColor();
-        Color secondary = colors.getSecondaryColor();
-        Color tertiary = colors.getTertiaryColor();
-        int primaryVal = primary != null ? primary.toArgb() : 0;
-        int secondaryVal = secondary != null ? secondary.toArgb() : 0;
-        int tertiaryVal = tertiary != null ? tertiary.toArgb() : 0;
-        int colorHints = 0;
-        try {
-            if (mWCColorHintsMethod != null) {
-                colorHints = (Integer) mWCColorHintsMethod.invoke(colors);
-            }
-        } catch (Exception exc) {
-            Log.e(TAG, "error calling color hints", exc);
-        }
-        return new WallpaperColorsCompat(primaryVal, secondaryVal, tertiaryVal, colorHints);
-    }
-}
-- 
GitLab


From 2eea3227881176134090a253b850dfa9f902c107 Mon Sep 17 00:00:00 2001
From: Becky Qiu <xuqiu@google.com>
Date: Tue, 27 Apr 2021 23:50:02 +0000
Subject: [PATCH 0999/1664] Revert "[Overview Sharing] Enable overview sharing
 for Droidfood."

This reverts commit f2efcb53d0835db77f2f5d1716b4754ffb6d9cdc.

Reason for revert: might break presubmit because of memory leak. see b/186579113

Change-Id: I7dfb303b7c4d0c9a8914f05f04b955e9f53c62c8
---
 src/com/android/launcher3/config/FeatureFlags.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index bad87043ef..7d5ed60019 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -151,7 +151,7 @@ public final class FeatureFlags {
             "ENABLE_OVERVIEW_SHARE", false, "Show Share button in Overview Actions");
 
     public static final BooleanFlag ENABLE_OVERVIEW_SHARING_TO_PEOPLE = getDebugFlag(
-            "ENABLE_OVERVIEW_SHARING_TO_PEOPLE", true,
+            "ENABLE_OVERVIEW_SHARING_TO_PEOPLE", false,
             "Show indicators for content on Overview to share with top people. ");
 
     public static final BooleanFlag ENABLE_OVERVIEW_CONTENT_PUSH = getDebugFlag(
-- 
GitLab


From e953739fd0efa5308acd2e792eb793abee2642cf Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 27 Apr 2021 17:30:11 -0700
Subject: [PATCH 1000/1664] Don't setEnableDrawingLiveTile(true) unless end
 target is RECENTS

This addresses the case where the gesture ends before an end
target is calculated. Also technically live tile is only
supported in RECENTS anyway.

Test: Open calculator, tap the nav region, ensure we don't go home
(Same for 2 button mode, but tap outside of deferred region)

Fixes: 186197537
Change-Id: I05e288ae952f8c8ea0fa72d8c6e6aa2b6dbb0b1e
---
 quickstep/src/com/android/quickstep/views/RecentsView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 5761dfbb06..72364fd8dc 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1673,7 +1673,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         }
 
         setEnableFreeScroll(true);
-        setEnableDrawingLiveTile(true);
+        setEnableDrawingLiveTile(mCurrentGestureEndTarget == GestureState.GestureEndTarget.RECENTS);
         if (!LIVE_TILE.get()) {
             setRunningTaskViewShowScreenshot(true);
         }
-- 
GitLab


From b4821887754869484f8ae7bea85b5ab0803d75f9 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 23 Apr 2021 14:26:45 -0700
Subject: [PATCH 1001/1664] Some overview scrim and status bar color
 adjustments

- Replace UI_STATE_OVERVIEW with UI_STATE_FULLSCREEN_TASK. Overview no
  longer needs it's own status bar treatment as it's handled by
  ScrimView already. So remove instances of UI_STATE_OVERVIEW and
  replace some with UI_STATE_FULLSCREEN_TASK if a TaskView is behind
  the status bar.
- Add ScrimView to fallback recents activity.
- Remove scrim from Background state, don't fade it in until the
  gesture ends to RECENTS.

Test: watch scrim and status bar colors during the following
- Swipe up to home (no scrim, status bar matches task at first but
  then wallpaper once task isn't overlapping status bar)
- Swipe up to overview (no scrim until let go to overview, status
  bar matches task at first, then wallpaper after not overlapping,
  then scrim once it's 90% opacity)
- Quick switch from home (scrim fades in, status bar matches once
  it reaches 90% opacity)
- Quick switch from app (no scrim, status bar matches center task)
- Repeat above for 3P launcher and 2 button mode

Fixes: 185681676
Fixes: 185286870
Change-Id: I9e5c292cc734e714169b9cc8268e8dad4e868aca
---
 .../res/layout/fallback_recents_activity.xml  |  6 +++++
 .../states/BackgroundAppState.java            |  6 +++++
 .../uioverrides/states/QuickSwitchState.java  |  7 +++++
 .../QuickSwitchTouchController.java           |  7 +++--
 .../android/quickstep/AbsSwipeUpHandler.java  |  7 +++--
 .../quickstep/BaseActivityInterface.java      | 27 +++++++++++++++++--
 .../quickstep/FallbackActivityInterface.java  |  5 ++++
 .../quickstep/LauncherActivityInterface.java  | 19 +++++++++++--
 .../android/quickstep/RecentsActivity.java    | 10 ++++++-
 .../FallbackRecentsStateController.java       |  4 +++
 .../quickstep/fallback/RecentsState.java      | 16 +++++++++--
 .../android/quickstep/views/RecentsView.java  | 26 +++---------------
 src/com/android/launcher3/BaseActivity.java   | 11 +++++---
 src/com/android/launcher3/Launcher.java       |  1 +
 .../launcher3/util/SystemUiController.java    |  2 +-
 .../android/launcher3/views/ScrimView.java    |  4 +--
 16 files changed, 114 insertions(+), 44 deletions(-)

diff --git a/quickstep/res/layout/fallback_recents_activity.xml b/quickstep/res/layout/fallback_recents_activity.xml
index 55400a7b24..a43296f602 100644
--- a/quickstep/res/layout/fallback_recents_activity.xml
+++ b/quickstep/res/layout/fallback_recents_activity.xml
@@ -33,6 +33,12 @@
         android:layout_height="match_parent"
         android:clipChildren="false">
 
+        <com.android.launcher3.views.ScrimView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/scrim_view"
+            android:background="@android:color/transparent" />
+
         <com.android.quickstep.fallback.FallbackRecentsView
             android:id="@id/overview_panel"
             android:layout_width="match_parent"
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
index aa770d289a..77c261154b 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
@@ -18,6 +18,7 @@ package com.android.launcher3.uioverrides.states;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
 
 import android.content.Context;
+import android.graphics.Color;
 
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.DeviceProfile;
@@ -86,6 +87,11 @@ public class BackgroundAppState extends OverviewState {
         return 1f;
     }
 
+    @Override
+    public int getWorkspaceScrimColor(Launcher launcher) {
+        return Color.TRANSPARENT;
+    }
+
     public static float[] getOverviewScaleAndOffsetForBackgroundState(
             BaseDraggingActivity activity) {
         return new float[] {
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java
index 53afd211a9..d36e76b89b 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java
@@ -18,6 +18,8 @@ package com.android.launcher3.uioverrides.states;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
 
 import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+import com.android.launcher3.util.Themes;
 
 /**
  * State to indicate we are about to launch a recent task. Note that this state is only used when
@@ -38,6 +40,11 @@ public class QuickSwitchState extends BackgroundAppState {
         return new ScaleAndTranslation(0.9f, 0, translationY);
     }
 
+    @Override
+    public int getWorkspaceScrimColor(Launcher launcher) {
+        return Themes.getAttrColor(launcher, R.attr.overviewScrimColor);
+    }
+
     @Override
     public float getVerticalProgress(Launcher launcher) {
         // Don't move all apps shelf while quick-switching (just let it fade).
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
index 94a7442193..3953e4245d 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
@@ -29,7 +29,7 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TR
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_VERTICAL_PROGRESS;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_TRANSLATE;
-import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW;
+import static com.android.launcher3.util.SystemUiController.UI_STATE_FULLSCREEN_TASK;
 import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
@@ -143,10 +143,9 @@ public class QuickSwitchTouchController extends AbstractStateChangeTouchControll
             if (tv != null) {
                 sysuiFlags = tv.getThumbnail().getSysUiStatusNavFlags();
             }
-            mLauncher.getSystemUiController().updateUiState(UI_STATE_OVERVIEW, sysuiFlags);
+            mLauncher.getSystemUiController().updateUiState(UI_STATE_FULLSCREEN_TASK, sysuiFlags);
         } else {
-            mLauncher.getSystemUiController().updateUiState(
-                    UI_STATE_OVERVIEW, mOverviewPanel.hasLightBackground());
+            mLauncher.getSystemUiController().updateUiState(UI_STATE_FULLSCREEN_TASK, 0);
         }
     }
 
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 53f1fd0809..9c79c32200 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -34,7 +34,7 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH
 import static com.android.launcher3.util.DisplayController.getSingleFrameMs;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
-import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW;
+import static com.android.launcher3.util.SystemUiController.UI_STATE_FULLSCREEN_TASK;
 import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;
 import static com.android.quickstep.GestureState.GestureEndTarget.HOME;
 import static com.android.quickstep.GestureState.GestureEndTarget.LAST_TASK;
@@ -664,11 +664,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
             mRecentsAnimationController.setSplitScreenMinimized(swipeUpThresholdPassed);
 
             if (swipeUpThresholdPassed) {
-                mActivity.getSystemUiController().updateUiState(
-                        UI_STATE_OVERVIEW, mRecentsView.hasLightBackground());
+                mActivity.getSystemUiController().updateUiState(UI_STATE_FULLSCREEN_TASK, 0);
             } else {
                 mActivity.getSystemUiController().updateUiState(
-                        UI_STATE_OVERVIEW, centermostTaskFlags);
+                        UI_STATE_FULLSCREEN_TASK, centermostTaskFlags);
             }
         }
     }
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index 147297af23..7aa81d4819 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -15,10 +15,12 @@
  */
 package com.android.quickstep;
 
+import static com.android.launcher3.LauncherAnimUtils.VIEW_BACKGROUND_COLOR;
 import static com.android.launcher3.anim.Interpolators.ACCEL_2;
 import static com.android.launcher3.anim.Interpolators.INSTANT;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.quickstep.AbsSwipeUpHandler.RECENTS_ATTACH_DURATION;
+import static com.android.quickstep.GestureState.GestureEndTarget.RECENTS;
 import static com.android.quickstep.SysUINavigationMode.getMode;
 import static com.android.quickstep.util.RecentsAtomicAnimationFactory.INDEX_RECENTS_FADE_ANIM;
 import static com.android.quickstep.util.RecentsAtomicAnimationFactory.INDEX_RECENTS_TRANSLATE_X_ANIM;
@@ -28,9 +30,11 @@ import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
 import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION;
 
 import android.animation.Animator;
+import android.animation.ObjectAnimator;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.Resources;
+import android.graphics.Color;
 import android.graphics.PointF;
 import android.graphics.Rect;
 import android.os.Build;
@@ -51,6 +55,7 @@ import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.taskbar.TaskbarController;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.util.WindowBounds;
+import com.android.launcher3.views.ScrimView;
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.util.ActivityInitListener;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
@@ -344,14 +349,32 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
     }
 
     /**
-     * Called when the gesture ends and the animation starts towards the given target. No-op by
-     * default, but subclasses can override to add an additional animation with the same duration.
+     * Called when the gesture ends and the animation starts towards the given target. Used to add
+     * an optional additional animation with the same duration.
      */
     public @Nullable Animator getParallelAnimationToLauncher(
             GestureState.GestureEndTarget endTarget, long duration) {
+        if (endTarget == RECENTS) {
+            ACTIVITY_TYPE activity = getCreatedActivity();
+            if (activity == null) {
+                return null;
+            }
+            STATE_TYPE state = stateFromGestureEndTarget(endTarget);
+            ScrimView scrimView = activity.getScrimView();
+            ObjectAnimator anim = ObjectAnimator.ofArgb(scrimView, VIEW_BACKGROUND_COLOR,
+                    getOverviewScrimColorForState(activity, state));
+            anim.setDuration(duration);
+            return anim;
+        }
         return null;
     }
 
+    /**
+     * Returns the color of the scrim behind overview when at rest in this state.
+     * Return {@link Color#TRANSPARENT} for no scrim.
+     */
+    protected abstract int getOverviewScrimColorForState(ACTIVITY_TYPE activity, STATE_TYPE state);
+
     /**
      * See {@link com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags}
      * @param systemUiStateFlags The latest SystemUiStateFlags
diff --git a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
index 8168e88e57..9fa65d93ff 100644
--- a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
@@ -196,4 +196,9 @@ public final class FallbackActivityInterface extends
         recentsView.setLayoutRotation(rotationTouchHelper.getCurrentActiveRotation(),
                 rotationTouchHelper.getDisplayRotation());
     }
+
+    @Override
+    protected int getOverviewScrimColorForState(RecentsActivity activity, RecentsState state) {
+        return state.getScrimColor(activity);
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
index 878f5c9e4c..dffee7fda8 100644
--- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
@@ -23,6 +23,7 @@ import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING;
 
 import android.animation.Animator;
+import android.animation.AnimatorSet;
 import android.content.Context;
 import android.graphics.Rect;
 import android.view.MotionEvent;
@@ -271,11 +272,25 @@ public final class LauncherActivityInterface extends
     public @Nullable Animator getParallelAnimationToLauncher(GestureEndTarget endTarget,
             long duration) {
         TaskbarController taskbarController = getTaskbarController();
+        Animator superAnimator = super.getParallelAnimationToLauncher(endTarget, duration);
         if (taskbarController == null) {
-            return null;
+            return superAnimator;
         }
         LauncherState toState = stateFromGestureEndTarget(endTarget);
-        return taskbarController.createAnimToLauncher(toState, duration);
+        Animator taskbarAnimator = taskbarController.createAnimToLauncher(toState, duration);
+        if (superAnimator == null) {
+            return taskbarAnimator;
+        } else {
+            AnimatorSet animatorSet = new AnimatorSet();
+            animatorSet.playTogether(superAnimator, taskbarAnimator);
+            return animatorSet;
+        }
+    }
+
+    @Override
+    protected int getOverviewScrimColorForState(BaseQuickstepLauncher launcher,
+            LauncherState state) {
+        return state.getWorkspaceScrimColor(launcher);
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index ec224ed450..3b92779553 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -59,7 +59,9 @@ import com.android.launcher3.util.ActivityOptionsWrapper;
 import com.android.launcher3.util.ActivityTracker;
 import com.android.launcher3.util.RunnableList;
 import com.android.launcher3.util.SystemUiController;
+import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.BaseDragLayer;
+import com.android.launcher3.views.ScrimView;
 import com.android.quickstep.fallback.FallbackRecentsStateController;
 import com.android.quickstep.fallback.FallbackRecentsView;
 import com.android.quickstep.fallback.RecentsDragLayer;
@@ -89,6 +91,7 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
     private Handler mUiHandler = new Handler(Looper.getMainLooper());
 
     private RecentsDragLayer mDragLayer;
+    private ScrimView mScrimView;
     private FallbackRecentsView mFallbackRecentsView;
     private OverviewActionsView mActionsView;
 
@@ -106,6 +109,7 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
         inflateRootView(R.layout.fallback_recents_activity);
         setContentView(getRootView());
         mDragLayer = findViewById(R.id.drag_layer);
+        mScrimView = findViewById(R.id.scrim_view);
         mFallbackRecentsView = findViewById(R.id.overview_panel);
         mActionsView = findViewById(R.id.overview_actions_view);
 
@@ -164,6 +168,10 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
         return mDragLayer;
     }
 
+    public ScrimView getScrimView() {
+        return mScrimView;
+    }
+
     @Override
     public <T extends View> T getOverviewPanel() {
         return (T) mFallbackRecentsView;
@@ -269,7 +277,7 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
         setupViews();
 
         getSystemUiController().updateUiState(SystemUiController.UI_STATE_BASE_WINDOW,
-                mFallbackRecentsView.hasLightBackground());
+                Themes.getAttrBoolean(this, R.attr.isWorkspaceDarkText));
         ACTIVITY_TRACKER.handleCreate(this);
     }
 
diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
index 8962ec93c8..7067dbcc0d 100644
--- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
+++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
@@ -20,6 +20,7 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_MO
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_SCRIM_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
 import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET;
 import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS;
@@ -95,5 +96,8 @@ public class FallbackRecentsStateController implements StateHandler<RecentsState
         setter.setFloat(mRecentsView, FULLSCREEN_PROGRESS, state.isFullScreen() ? 1 : 0, LINEAR);
         setter.setFloat(mRecentsView, RECENTS_GRID_PROGRESS,
                 state.displayOverviewTasksAsGrid(mActivity.getDeviceProfile()) ? 1f : 0f, LINEAR);
+
+        setter.setViewBackgroundColor(mActivity.getScrimView(), state.getScrimColor(mActivity),
+                config.getInterpolator(ANIM_WORKSPACE_SCRIM_FADE, LINEAR));
     }
 }
diff --git a/quickstep/src/com/android/quickstep/fallback/RecentsState.java b/quickstep/src/com/android/quickstep/fallback/RecentsState.java
index bbe279e2f1..b3d6cfa3fd 100644
--- a/quickstep/src/com/android/quickstep/fallback/RecentsState.java
+++ b/quickstep/src/com/android/quickstep/fallback/RecentsState.java
@@ -19,10 +19,13 @@ import static com.android.launcher3.uioverrides.states.BackgroundAppState.getOve
 import static com.android.launcher3.uioverrides.states.OverviewModalTaskState.getOverviewScaleAndOffsetForModalState;
 
 import android.content.Context;
+import android.graphics.Color;
 
 import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.R;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.statemanager.BaseState;
+import com.android.launcher3.util.Themes;
 import com.android.quickstep.RecentsActivity;
 
 /**
@@ -35,12 +38,13 @@ public class RecentsState implements BaseState<RecentsState> {
     private static final int FLAG_FULL_SCREEN = BaseState.getFlag(2);
     private static final int FLAG_OVERVIEW_ACTIONS = BaseState.getFlag(3);
     private static final int FLAG_SHOW_AS_GRID = BaseState.getFlag(4);
+    private static final int FLAG_SCRIM = BaseState.getFlag(5);
 
     public static final RecentsState DEFAULT = new RecentsState(0,
-            FLAG_CLEAR_ALL_BUTTON | FLAG_OVERVIEW_ACTIONS | FLAG_SHOW_AS_GRID);
+            FLAG_CLEAR_ALL_BUTTON | FLAG_OVERVIEW_ACTIONS | FLAG_SHOW_AS_GRID | FLAG_SCRIM);
     public static final RecentsState MODAL_TASK = new ModalState(1,
             FLAG_DISABLE_RESTORE | FLAG_CLEAR_ALL_BUTTON | FLAG_OVERVIEW_ACTIONS | FLAG_MODAL
-                    | FLAG_SHOW_AS_GRID);
+                    | FLAG_SHOW_AS_GRID | FLAG_SCRIM);
     public static final RecentsState BACKGROUND_APP = new BackgroundAppState(2,
             FLAG_DISABLE_RESTORE | FLAG_NON_INTERACTIVE | FLAG_FULL_SCREEN);
     public static final RecentsState HOME = new RecentsState(3, 0);
@@ -103,6 +107,14 @@ public class RecentsState implements BaseState<RecentsState> {
         return hasFlag(FLAG_OVERVIEW_ACTIONS);
     }
 
+    /**
+     * For this state, what color scrim should be drawn behind overview.
+     */
+    public int getScrimColor(RecentsActivity activity) {
+        return hasFlag(FLAG_SCRIM) ? Themes.getAttrColor(activity, R.attr.overviewScrimColor)
+                : Color.TRANSPARENT;
+    }
+
     public float[] getOverviewScaleAndOffset(RecentsActivity activity) {
         return new float[] { NO_SCALE, NO_OFFSET };
     }
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 596f74688d..79dc6a9543 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -45,7 +45,7 @@ import static com.android.launcher3.statehandlers.DepthController.DEPTH;
 import static com.android.launcher3.touch.PagedOrientationHandler.CANVAS_TRANSLATE;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
-import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW;
+import static com.android.launcher3.util.SystemUiController.UI_STATE_FULLSCREEN_TASK;
 import static com.android.quickstep.TaskUtils.checkCurrentOrManagedUserId;
 import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NON_ZERO_ROTATION;
@@ -450,7 +450,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
 
     private boolean mRunningTaskIconScaledDown = false;
 
-    private final boolean mHasLightBackground;
     private boolean mOverviewStateEnabled;
     private boolean mHandleTaskStackChanges;
     private boolean mSwipeDownShouldLaunchApp;
@@ -584,8 +583,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         mLiveTileTaskViewSimulator.recentsViewScale.value = 1;
         mLiveTileTaskViewSimulator.setOrientationState(mOrientationState);
         mLiveTileTaskViewSimulator.setDrawsBelowRecents(true);
-
-        mHasLightBackground = Themes.getAttrBoolean(mActivity, android.R.attr.isLightTheme);
     }
 
     public OverScroller getScroller() {
@@ -908,13 +905,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 cancelSplitSelect(false);
             }
         }
-
-        if (enabled) {
-            mActivity.getSystemUiController().updateUiState(
-                    UI_STATE_OVERVIEW, hasLightBackground());
-        } else {
-            mActivity.getSystemUiController().updateUiState(UI_STATE_OVERVIEW, 0);
-        }
     }
 
     /**
@@ -1523,7 +1513,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
 
         unloadVisibleTaskData(TaskView.FLAG_UPDATE_ALL);
         setCurrentPage(0);
-        mActivity.getSystemUiController().updateUiState(UI_STATE_OVERVIEW, 0);
         LayoutUtils.setViewEnabled(mActionsView, true);
         if (mOrientationState.setGestureActive(false)) {
             updateOrientationHandler();
@@ -2801,14 +2790,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         }
     }
 
-    /**
-     * True if the background scrim of the recents view is light colored and the foreground elements
-     * should use dark colors.
-     */
-    public boolean hasLightBackground() {
-        return mHasLightBackground;
-    }
-
     public void initiateSplitSelect(TaskView taskView, SplitPositionOption splitPositionOption) {
         mSplitHiddenTaskView = taskView;
         SplitSelectStateController splitController = mSplitPlaceholderView.getSplitController();
@@ -3059,10 +3040,9 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             // tasks' flags
             if (animator.getAnimatedFraction() > UPDATE_SYSUI_FLAGS_THRESHOLD) {
                 mActivity.getSystemUiController().updateUiState(
-                        UI_STATE_OVERVIEW, targetSysUiFlags);
+                        UI_STATE_FULLSCREEN_TASK, targetSysUiFlags);
             } else {
-                mActivity.getSystemUiController().updateUiState(
-                        UI_STATE_OVERVIEW, hasLightBackground());
+                mActivity.getSystemUiController().updateUiState(UI_STATE_FULLSCREEN_TASK, 0);
             }
 
             // Passing the threshold from taskview to fullscreen app will vibrate
diff --git a/src/com/android/launcher3/BaseActivity.java b/src/com/android/launcher3/BaseActivity.java
index f77f7e8454..f64ce5c753 100644
--- a/src/com/android/launcher3/BaseActivity.java
+++ b/src/com/android/launcher3/BaseActivity.java
@@ -17,7 +17,7 @@
 package com.android.launcher3;
 
 import static com.android.launcher3.model.WidgetsModel.GO_DISABLE_WIDGETS;
-import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW;
+import static com.android.launcher3.util.SystemUiController.UI_STATE_FULLSCREEN_TASK;
 
 import static java.lang.annotation.RetentionPolicy.SOURCE;
 
@@ -39,6 +39,7 @@ import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.util.SystemUiController;
 import com.android.launcher3.util.ViewCache;
 import com.android.launcher3.views.ActivityContext;
+import com.android.launcher3.views.ScrimView;
 
 import java.io.PrintWriter;
 import java.lang.annotation.Retention;
@@ -157,6 +158,10 @@ public abstract class BaseActivity extends Activity implements ActivityContext {
         return mSystemUiController;
     }
 
+    public ScrimView getScrimView() {
+        return null;
+    }
+
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
@@ -197,7 +202,7 @@ public abstract class BaseActivity extends Activity implements ActivityContext {
 
         // Reset the overridden sysui flags used for the task-swipe launch animation, this is a
         // catch all for if we do not get resumed (and therefore not paused below)
-        getSystemUiController().updateUiState(UI_STATE_OVERVIEW, 0);
+        getSystemUiController().updateUiState(UI_STATE_FULLSCREEN_TASK, 0);
     }
 
     @Override
@@ -209,7 +214,7 @@ public abstract class BaseActivity extends Activity implements ActivityContext {
         // here instead of at the end of the animation because the start of the new activity does
         // not happen immediately, which would cause us to reset to launcher's sysui flags and then
         // back to the new app (causing a flash)
-        getSystemUiController().updateUiState(UI_STATE_OVERVIEW, 0);
+        getSystemUiController().updateUiState(UI_STATE_FULLSCREEN_TASK, 0);
     }
 
     @Override
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index a54c791aff..f640118552 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1426,6 +1426,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         return mDropTargetBar;
     }
 
+    @Override
     public ScrimView getScrimView() {
         return mScrimView;
     }
diff --git a/src/com/android/launcher3/util/SystemUiController.java b/src/com/android/launcher3/util/SystemUiController.java
index 50166c3888..630df7e46b 100644
--- a/src/com/android/launcher3/util/SystemUiController.java
+++ b/src/com/android/launcher3/util/SystemUiController.java
@@ -30,7 +30,7 @@ public class SystemUiController {
     public static final int UI_STATE_BASE_WINDOW = 0;
     public static final int UI_STATE_SCRIM_VIEW = 1;
     public static final int UI_STATE_WIDGET_BOTTOM_SHEET = 2;
-    public static final int UI_STATE_OVERVIEW = 3;
+    public static final int UI_STATE_FULLSCREEN_TASK = 3;
     public static final int UI_STATE_ALLAPPS = 4;
 
     public static final int FLAG_LIGHT_NAV = 1 << 0;
diff --git a/src/com/android/launcher3/views/ScrimView.java b/src/com/android/launcher3/views/ScrimView.java
index 722f57837a..5387a3ed17 100644
--- a/src/com/android/launcher3/views/ScrimView.java
+++ b/src/com/android/launcher3/views/ScrimView.java
@@ -25,8 +25,8 @@ import android.view.View;
 
 import androidx.core.graphics.ColorUtils;
 
+import com.android.launcher3.BaseActivity;
 import com.android.launcher3.Insettable;
-import com.android.launcher3.Launcher;
 import com.android.launcher3.util.SystemUiController;
 
 /**
@@ -82,7 +82,7 @@ public class ScrimView extends View implements Insettable {
 
     private SystemUiController getSystemUiController() {
         if (mSystemUiController == null) {
-            mSystemUiController = Launcher.getLauncher(getContext()).getSystemUiController();
+            mSystemUiController = BaseActivity.fromContext(getContext()).getSystemUiController();
         }
         return mSystemUiController;
     }
-- 
GitLab


From 4df3b232250781dc8d1d206d74bc0e854da5fafe Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 26 Apr 2021 15:26:38 -0700
Subject: [PATCH 1002/1664] Invalidate when switching to new consumer

- When switching to a new consumer, also invalidate the handler to
  clean up references held by that handler
- Also make sure that we calculate the task index used for logging
  prior to starting the task view since the handler can be invalidated
  between starting the activity and the callback happening

Bug: 185909226
Test: Presubmit
Change-Id: I20e06b5a6b31a5e242c6fc840bf4f215797eb12c
---
 .../android/quickstep/AbsSwipeUpHandler.java  | 58 ++++++++++++-------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 53f1fd0809..35cb73536f 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -150,6 +150,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     protected Runnable mGestureEndCallback;
     protected MultiStateCallback mStateCallback;
     protected boolean mCanceled;
+    // One time flag set when onConsumerAboutToBeSwitched() is called, indicating that certain
+    // shared animations should not be canceled when this handler is invalidated
+    private boolean mConsumerIsSwitching;
     private boolean mRecentsViewScrollLinked = false;
 
     private static int getFlagForIndex(int index, String name) {
@@ -1003,7 +1006,14 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         animateToProgress(startShift, endShift, duration, interpolator, endTarget, velocity);
     }
 
-    private void doLogGesture(GestureEndTarget endTarget, @Nullable TaskView targetTask) {
+    private int getLogGestureTaskIndex(@Nullable TaskView targetTask) {
+        return mRecentsView == null || targetTask == null
+                ? LOG_NO_OP_PAGE_INDEX
+                : mRecentsView.indexOfChild(targetTask);
+    }
+
+    private void doLogGesture(GestureEndTarget endTarget, @Nullable TaskView targetTask,
+            int pageIndex) {
         StatsLogManager.EventEnum event;
         switch (endTarget) {
             case HOME:
@@ -1032,9 +1042,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
             // We probably never received an animation controller, skip logging.
             return;
         }
-        int pageIndex = endTarget == LAST_TASK
-                ? LOG_NO_OP_PAGE_INDEX
-                : mRecentsView.getNextPage();
         // TODO: set correct container using the pageIndex
         logger.log(event);
     }
@@ -1279,18 +1286,18 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     }
 
     public void onConsumerAboutToBeSwitched() {
+        mConsumerIsSwitching = true;
         if (mActivity != null) {
             // In the off chance that the gesture ends before Launcher is started, we should clear
             // the callback here so that it doesn't update with the wrong state
             mActivity.clearRunOnceOnStartCallback();
-            resetLauncherListeners();
         }
         if (mGestureState.getEndTarget() != null && !mGestureState.isRunningAnimationToLauncher()) {
             cancelCurrentAnimation();
         } else {
             mStateCallback.setStateOnUiThread(STATE_FINISH_WITH_NO_END);
-            reset();
         }
+        reset();
     }
 
     public boolean isCanceled() {
@@ -1301,13 +1308,14 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     private void resumeLastTask() {
         mRecentsAnimationController.finish(false /* toRecents */, null);
         ActiveGestureLog.INSTANCE.addLog("finishRecentsAnimation", false);
-        doLogGesture(LAST_TASK, null);
+        doLogGesture(LAST_TASK, null, getLogGestureTaskIndex(null));
         reset();
     }
 
     @UiThread
     private void startNewTask() {
         TaskView taskToLaunch = mRecentsView == null ? null : mRecentsView.getNextPageTaskView();
+        int taskPageIndex = getLogGestureTaskIndex(taskToLaunch);
         startNewTask(success -> {
             if (!success) {
                 reset();
@@ -1316,7 +1324,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                 endLauncherTransitionController();
                 updateSysUiFlags(1 /* windowProgress == overview */);
             }
-            doLogGesture(NEW_TASK, taskToLaunch);
+            doLogGesture(NEW_TASK, taskToLaunch, taskPageIndex);
         });
     }
 
@@ -1350,32 +1358,38 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     }
 
     private void invalidateHandler() {
-        if (!LIVE_TILE.get() || !mActivityInterface.isInLiveTileMode()
-                || mGestureState.getEndTarget() != RECENTS) {
-            mInputConsumerProxy.destroy();
-            mTaskAnimationManager.setLiveTileCleanUpHandler(null);
-        }
-        mInputConsumerProxy.unregisterCallback();
-        endRunningWindowAnim(false /* cancel */);
+        if (!mConsumerIsSwitching) {
+            if (!LIVE_TILE.get() || !mActivityInterface.isInLiveTileMode()
+                    || mGestureState.getEndTarget() != RECENTS) {
+                mInputConsumerProxy.destroy();
+                mTaskAnimationManager.setLiveTileCleanUpHandler(null);
+            }
+            endRunningWindowAnim(false /* cancel */);
 
-        if (mGestureEndCallback != null) {
-            mGestureEndCallback.run();
+            if (mGestureEndCallback != null) {
+                mGestureEndCallback.run();
+            }
         }
 
+        mInputConsumerProxy.unregisterCallback();
         mActivityInitListener.unregister();
         ActivityManagerWrapper.getInstance().unregisterTaskStackListener(mActivityRestartListener);
         mTaskSnapshot = null;
         mHandler.post(() -> {
             // Defer clearing the activity since invalidation can happen over multiple callbacks
+            // ie. invalidateHandlerWithLauncher()
             mActivity = null;
+            mRecentsView = null;
         });
     }
 
     private void invalidateHandlerWithLauncher() {
-        endLauncherTransitionController();
+        if (!mConsumerIsSwitching) {
+            endLauncherTransitionController();
+            mRecentsView.onGestureAnimationEnd();
+        }
 
         mRecentsView.removeOnScrollChangedListener(mOnRecentsScrollListener);
-        mRecentsView.onGestureAnimationEnd();
         resetLauncherListeners();
     }
 
@@ -1500,7 +1514,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                     () -> mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED));
         }
         ActiveGestureLog.INSTANCE.addLog("finishRecentsAnimation", true);
-        doLogGesture(HOME, mRecentsView == null ? null : mRecentsView.getCurrentPageTaskView());
+        TaskView taskToLaunch = mRecentsView == null ? null : mRecentsView.getCurrentPageTaskView();
+        doLogGesture(HOME, taskToLaunch, getLogGestureTaskIndex(taskToLaunch));
     }
 
     /**
@@ -1531,7 +1546,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         }
 
         SystemUiProxy.INSTANCE.get(mContext).onOverviewShown(false, TAG);
-        doLogGesture(RECENTS, mRecentsView.getCurrentPageTaskView());
+        TaskView taskToLaunch = mRecentsView.getCurrentPageTaskView();
+        doLogGesture(RECENTS, taskToLaunch, getLogGestureTaskIndex(taskToLaunch));
         reset();
     }
 
-- 
GitLab


From fb45e57ac1b9c177e41a2162b265242b5c74a917 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 27 Apr 2021 21:15:18 -0700
Subject: [PATCH 1003/1664] Prevent multiple calls to finish on the recents
 controller

Bug: 186246362
Test: Verify from logs that we don't finish the controller
      multiple times
Change-Id: I8d40a756216133b8a278a28b822cf75c6e2a3046
---
 .../quickstep/RecentsAnimationController.java   | 17 ++++++++++++++---
 .../android/launcher3/util/RunnableList.java    |  3 +++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationController.java b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
index 456073596a..78da311971 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationController.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
@@ -25,6 +25,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.UiThread;
 
 import com.android.launcher3.util.Preconditions;
+import com.android.launcher3.util.RunnableList;
 import com.android.systemui.shared.recents.model.ThumbnailData;
 import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
 import com.android.systemui.shared.system.RecentsAnimationControllerCompat;
@@ -43,6 +44,8 @@ public class RecentsAnimationController {
 
     private boolean mUseLauncherSysBarFlags = false;
     private boolean mSplitScreenMinimized = false;
+    private boolean mFinishRequested = false;
+    private RunnableList mPendingFinishCallbacks = new RunnableList();
 
     public RecentsAnimationController(RecentsAnimationControllerCompat controller,
             boolean allowMinimizeSplitScreen,
@@ -132,14 +135,22 @@ public class RecentsAnimationController {
 
     @UiThread
     public void finishController(boolean toRecents, Runnable callback, boolean sendUserLeaveHint) {
+        if (mFinishRequested) {
+            // If finishing, add to pending finish callbacks, otherwise, if finished, adding to the
+            // destroyed RunnableList will just trigger the callback to be called immediately
+            mPendingFinishCallbacks.add(callback);
+            return;
+        }
+
+        // Finish not yet requested
+        mFinishRequested = true;
         mOnFinishedListener.accept(this);
+        mPendingFinishCallbacks.add(callback);
         UI_HELPER_EXECUTOR.execute(() -> {
             mController.finish(toRecents, sendUserLeaveHint);
             InteractionJankMonitorWrapper.end(InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH);
             InteractionJankMonitorWrapper.end(InteractionJankMonitorWrapper.CUJ_APP_CLOSE_TO_HOME);
-            if (callback != null) {
-                MAIN_EXECUTOR.execute(callback);
-            }
+            MAIN_EXECUTOR.execute(mPendingFinishCallbacks::executeAllAndDestroy);
         });
     }
 
diff --git a/src/com/android/launcher3/util/RunnableList.java b/src/com/android/launcher3/util/RunnableList.java
index 55add14479..644537bce1 100644
--- a/src/com/android/launcher3/util/RunnableList.java
+++ b/src/com/android/launcher3/util/RunnableList.java
@@ -29,6 +29,9 @@ public class RunnableList {
      * Ads a runnable to this list
      */
     public void add(Runnable runnable) {
+        if (runnable == null) {
+            return;
+        }
         if (mDestroyed) {
             runnable.run();
             return;
-- 
GitLab


From 813856ab806b1997d5c487fe6082e03fc337f706 Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pbdr@google.com>
Date: Tue, 27 Apr 2021 22:23:12 +0100
Subject: [PATCH 1004/1664] Correct the preview generation for App Widgets.

If the App Widget provider doesn't define a preview, we generate one. We
needed to update it to include the correct corner radius and remove the
shadow (as Material Next doesn't use shadows).

Fix: 184610987
Test: Manually using Youtube Music
Change-Id: Id6b88821ab1b406f1c40d94f6c50e133eb7fa808
---
 .../android/launcher3/WidgetPreviewLoader.java   | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java
index f43452cd65..75d25d7aa3 100644
--- a/src/com/android/launcher3/WidgetPreviewLoader.java
+++ b/src/com/android/launcher3/WidgetPreviewLoader.java
@@ -457,10 +457,24 @@ public class WidgetPreviewLoader {
             drawable.setBounds(x, 0, x + previewWidth, previewHeight);
             drawable.draw(c);
         } else {
-            RectF boxRect = drawBoxWithShadow(c, previewWidth, previewHeight);
+            RectF boxRect;
 
             // Draw horizontal and vertical lines to represent individual columns.
             final Paint p = new Paint(Paint.ANTI_ALIAS_FLAG);
+
+            if (Utilities.ATLEAST_S) {
+                boxRect = new RectF(/* left= */ 0, /* top= */ 0, /* right= */
+                        previewWidth, /* bottom= */ previewHeight);
+
+                p.setStyle(Paint.Style.FILL);
+                p.setColor(Color.WHITE);
+                float roundedCorner = mContext.getResources().getDimension(
+                        android.R.dimen.system_app_widget_background_radius);
+                c.drawRoundRect(boxRect, roundedCorner, roundedCorner, p);
+            } else {
+                boxRect = drawBoxWithShadow(c, previewWidth, previewHeight);
+            }
+
             p.setStyle(Paint.Style.STROKE);
             p.setStrokeWidth(mContext.getResources()
                     .getDimension(R.dimen.widget_preview_cell_divider_width));
-- 
GitLab


From 9f531ee6c468c7971ac06476503f65fa4e174080 Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Fri, 23 Apr 2021 16:30:11 +0100
Subject: [PATCH 1005/1664] Always check for availability of widgets before
 changing visibility of recycler view and no widgets view.

Bug: 186117900
Test: Tested manually
Change-Id: I57ac95fee935a54ce70f5793f0b0686b549cbf9e
---
 .../widget/picker/WidgetsFullSheet.java       | 56 ++++++++++---------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 240958bc36..8f5d4dc6ef 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -221,7 +221,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         WidgetsRecyclerView currentRecyclerView =
                 mAdapters.get(currentActivePage).mWidgetsRecyclerView;
 
-        updateNoWidgetsView(currentAdapterHolder);
+        updateRecyclerViewVisibility(currentAdapterHolder);
         attachScrollbarToRecyclerView(currentRecyclerView);
         resetExpandedHeaders();
     }
@@ -232,22 +232,17 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         reset();
     }
 
-    private void updateNoWidgetsView(AdapterHolder adapterHolder) {
+    private void updateRecyclerViewVisibility(AdapterHolder adapterHolder) {
         boolean isWidgetAvailable = adapterHolder.mWidgetsListAdapter.getItemCount() > 0;
         adapterHolder.mWidgetsRecyclerView.setVisibility(isWidgetAvailable ? VISIBLE : GONE);
 
-        // Always resets the text in case this is updated by search.
-        mNoWidgetsView.setText(R.string.no_widgets_available);
+        mNoWidgetsView.setText(
+                adapterHolder.mAdapterType == AdapterHolder.SEARCH
+                        ? R.string.no_search_results
+                        : R.string.no_widgets_available);
         mNoWidgetsView.setVisibility(isWidgetAvailable ? GONE : VISIBLE);
     }
 
-    private void updateNoSearchResultsView(boolean isVisible) {
-        mNoWidgetsView.setVisibility(isVisible ? VISIBLE : GONE);
-        if (isVisible) {
-            mNoWidgetsView.setText(R.string.no_search_results);
-        }
-    }
-
     private void reset() {
         mAdapters.get(AdapterHolder.PRIMARY).mWidgetsRecyclerView.scrollToTop();
         if (mHasWorkProfile) {
@@ -394,16 +389,22 @@ public class WidgetsFullSheet extends BaseWidgetSheet
 
     @Override
     public void onWidgetsBound() {
+        if (mIsInSearchMode) {
+            return;
+        }
         List<WidgetsListBaseEntry> allWidgets = mLauncher.getPopupDataProvider().getAllWidgets();
 
         AdapterHolder primaryUserAdapterHolder = mAdapters.get(AdapterHolder.PRIMARY);
         primaryUserAdapterHolder.mWidgetsListAdapter.setWidgets(allWidgets);
-        updateNoWidgetsView(primaryUserAdapterHolder);
 
         if (mHasWorkProfile) {
+            mViewPager.setVisibility(VISIBLE);
+            mTabsView.setVisibility(VISIBLE);
             AdapterHolder workUserAdapterHolder = mAdapters.get(AdapterHolder.WORK);
             workUserAdapterHolder.mWidgetsListAdapter.setWidgets(allWidgets);
             onActivePageChanged(mViewPager.getCurrentPage());
+        } else {
+            updateRecyclerViewVisibility(primaryUserAdapterHolder);
         }
     }
 
@@ -431,8 +432,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
     @Override
     public void onSearchResults(List<WidgetsListBaseEntry> entries) {
         mAdapters.get(AdapterHolder.SEARCH).mWidgetsListAdapter.setWidgetsOnSearch(entries);
-        updateNoSearchResultsView(
-                mAdapters.get(AdapterHolder.SEARCH).mWidgetsListAdapter.getItemCount() == 0);
+        updateRecyclerViewVisibility(mAdapters.get(AdapterHolder.SEARCH));
         mAdapters.get(AdapterHolder.SEARCH).mWidgetsRecyclerView.scrollToTop();
     }
 
@@ -440,19 +440,22 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         mIsInSearchMode = isInSearchMode;
         if (isInSearchMode) {
             mSearchAndRecommendationViewHolder.mRecommendedWidgetsTable.setVisibility(GONE);
+            if (mHasWorkProfile) {
+                mViewPager.setVisibility(GONE);
+                mTabsView.setVisibility(GONE);
+            } else {
+                mAdapters.get(AdapterHolder.PRIMARY).mWidgetsRecyclerView.setVisibility(GONE);
+            }
+            updateRecyclerViewVisibility(mAdapters.get(AdapterHolder.SEARCH));
+            // Hide no search results view to prevent it from flashing on enter search.
+            mNoWidgetsView.setVisibility(GONE);
         } else {
+            mAdapters.get(AdapterHolder.SEARCH).mWidgetsRecyclerView.setVisibility(GONE);
+            // Visibility of recommended widgets, recycler views and headers are handled in methods
+            // below.
             onRecommendedWidgetsBound();
+            onWidgetsBound();
         }
-        if (mHasWorkProfile) {
-            mViewPager.setVisibility(isInSearchMode ? GONE : VISIBLE);
-            mTabsView.setVisibility(isInSearchMode ? GONE : VISIBLE);
-        } else {
-            mAdapters.get(AdapterHolder.PRIMARY).mWidgetsRecyclerView
-                    .setVisibility(isInSearchMode ? GONE : VISIBLE);
-        }
-        mAdapters.get(AdapterHolder.SEARCH).mWidgetsRecyclerView
-                .setVisibility(mIsInSearchMode ? VISIBLE : GONE);
-        mNoWidgetsView.setVisibility(GONE);
     }
 
     private void resetExpandedHeaders() {
@@ -462,11 +465,14 @@ public class WidgetsFullSheet extends BaseWidgetSheet
 
     @Override
     public void onRecommendedWidgetsBound() {
+        if (mIsInSearchMode) {
+            return;
+        }
         List<WidgetItem> recommendedWidgets =
                 mLauncher.getPopupDataProvider().getRecommendedWidgets();
         WidgetsRecommendationTableLayout table =
                 mSearchAndRecommendationViewHolder.mRecommendedWidgetsTable;
-        if (!mIsInSearchMode && recommendedWidgets.size() > 0) {
+        if (recommendedWidgets.size() > 0) {
             // TODO(b/185508758): Revert the following log after debugging.
             if (getHeaderViewHeight() == 0) {
                 Log.d(TAG, "Header view height is 0 when inflating recommended widgets");
-- 
GitLab


From 1987a42d3c08459fa8355344d0493b57ffa4684f Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Thu, 22 Apr 2021 19:25:11 -0700
Subject: [PATCH 1006/1664] [AA+] Add SearchResult type to ItemInfo attributes.

Bug: 186169419
Test: Manual
Change-Id: I9ea707e135eda163dfb3f12f48f4f0c37e6c044e
---
 protos/launcher_atom.proto                       | 16 ++++++++++++++++
 .../android/launcher3/model/data/ItemInfo.java   |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/protos/launcher_atom.proto b/protos/launcher_atom.proto
index fe81b4cbeb..fb47b0aad6 100644
--- a/protos/launcher_atom.proto
+++ b/protos/launcher_atom.proto
@@ -125,6 +125,22 @@ enum Attribute {
   // Folder's label is empty(i.e., title == "").
   // Not eligible for auto-labeling.
   EMPTY_LABEL = 12;
+
+  ALL_APPS_SEARCH_RESULT_APPLICATION = 13;
+  ALL_APPS_SEARCH_RESULT_SHORTCUT = 14;
+  ALL_APPS_SEARCH_RESULT_PEOPLE = 15;
+  ALL_APPS_SEARCH_RESULT_ACTION = 16;
+  ALL_APPS_SEARCH_RESULT_SETTING = 17;
+  ALL_APPS_SEARCH_RESULT_SCREENSHOT = 18;
+  ALL_APPS_SEARCH_RESULT_SLICE = 19;
+  ALL_APPS_SEARCH_RESULT_WIDGETS = 20;
+  ALL_APPS_SEARCH_RESULT_PLAY = 21;
+  ALL_APPS_SEARCH_RESULT_SUGGEST = 22;
+  ALL_APPS_SEARCH_RESULT_ASSISTANT = 23;
+  ALL_APPS_SEARCH_RESULT_CHROMETAB = 24;
+  ALL_APPS_SEARCH_RESULT_NAVVYSITE = 25;
+  ALL_APPS_SEARCH_RESULT_TIPS = 26;
+  ALL_APPS_SEARCH_RESULT_PEOPLE_TILE = 27;
 }
 
 // Main app icons
diff --git a/src/com/android/launcher3/model/data/ItemInfo.java b/src/com/android/launcher3/model/data/ItemInfo.java
index 05fd77d720..e388965e91 100644
--- a/src/com/android/launcher3/model/data/ItemInfo.java
+++ b/src/com/android/launcher3/model/data/ItemInfo.java
@@ -366,7 +366,7 @@ public class ItemInfo {
         return itemBuilder.build();
     }
 
-    LauncherAtom.ItemInfo.Builder getDefaultItemInfoBuilder() {
+    protected LauncherAtom.ItemInfo.Builder getDefaultItemInfoBuilder() {
         LauncherAtom.ItemInfo.Builder itemBuilder = LauncherAtom.ItemInfo.newBuilder();
         itemBuilder.setIsWork(user != Process.myUserHandle());
         return itemBuilder;
-- 
GitLab


From 84298b3998ee8028ce169437dc8bb47e62e77dc7 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 28 Apr 2021 18:35:06 +0100
Subject: [PATCH 1007/1664] Add a flag to enable custom local filter for
 recommended widgets

Test: Run WidgetsPredictionUpdateTaskTest
Bug: 186648032
Change-Id: I2bd5e2c81f971e0a40a4b05c8cab2a7adb171f96
---
 .../WidgetsPredicationUpdateTaskTest.java     | 38 +++++++++++++
 .../model/WidgetsPredictionUpdateTask.java    | 55 +++++++++++++------
 .../launcher3/uioverrides/DeviceFlag.java     |  6 ++
 .../launcher3/shadows/ShadowDeviceFlag.java   | 19 +++++++
 .../launcher3/config/FeatureFlags.java        |  4 ++
 5 files changed, 104 insertions(+), 18 deletions(-)

diff --git a/quickstep/robolectric_tests/src/com/android/launcher3/model/WidgetsPredicationUpdateTaskTest.java b/quickstep/robolectric_tests/src/com/android/launcher3/model/WidgetsPredicationUpdateTaskTest.java
index 70a143ee6f..7c97b93b03 100644
--- a/quickstep/robolectric_tests/src/com/android/launcher3/model/WidgetsPredicationUpdateTaskTest.java
+++ b/quickstep/robolectric_tests/src/com/android/launcher3/model/WidgetsPredicationUpdateTaskTest.java
@@ -36,6 +36,7 @@ import android.os.UserHandle;
 
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.icons.ComponentWithLabel;
 import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.model.BgDataModel.FixedContainerItems;
@@ -44,6 +45,7 @@ import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.launcher3.shadows.ShadowDeviceFlag;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.ItemInfoMatcher;
@@ -60,6 +62,7 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadow.api.Shadow;
 import org.robolectric.shadows.ShadowAppWidgetManager;
 import org.robolectric.shadows.ShadowPackageManager;
 import org.robolectric.util.ReflectionHelpers;
@@ -174,6 +177,41 @@ public final class WidgetsPredicationUpdateTaskTest {
         assertWidgetInfo(recommendedWidgets.get(2).info, mApp1Provider1);
     }
 
+    @Test
+    public void widgetsRecommendationRan_localFilterDisabled_shouldReturnWidgetsInPredicationOrder()
+            throws Exception {
+        ShadowDeviceFlag shadowDeviceFlag = Shadow.extract(
+                FeatureFlags.ENABLE_LOCAL_RECOMMENDED_WIDGETS_FILTER);
+        shadowDeviceFlag.setValue(false);
+
+        // WHEN newPredicationTask is executed with 5 predicated widgets.
+        AppTarget widget1 = new AppTarget(new AppTargetId("app1"), "app1", "provider1",
+                mUserHandle);
+        AppTarget widget2 = new AppTarget(new AppTargetId("app1"), "app1", "provider2",
+                mUserHandle);
+        // Not installed app
+        AppTarget widget3 = new AppTarget(new AppTargetId("app2"), "app3", "provider1",
+                mUserHandle);
+        // Not installed widget
+        AppTarget widget4 = new AppTarget(new AppTargetId("app4"), "app4", "provider3",
+                mUserHandle);
+        AppTarget widget5 = new AppTarget(new AppTargetId("app5"), "app5", "provider1",
+                mUserHandle);
+        mModelHelper.executeTaskForTest(
+                newWidgetsPredicationTask(List.of(widget5, widget3, widget2, widget4, widget1)))
+                .forEach(Runnable::run);
+
+        // THEN only 3 widgets are returned because the launcher only filters out non-exist widgets.
+        List<PendingAddWidgetInfo> recommendedWidgets = mCallback.mRecommendedWidgets.items
+                .stream()
+                .map(itemInfo -> (PendingAddWidgetInfo) itemInfo)
+                .collect(Collectors.toList());
+        assertThat(recommendedWidgets).hasSize(3);
+        assertWidgetInfo(recommendedWidgets.get(0).info, mApp5Provider1);
+        assertWidgetInfo(recommendedWidgets.get(1).info, mApp1Provider2);
+        assertWidgetInfo(recommendedWidgets.get(2).info, mApp1Provider1);
+    }
+
     private void assertWidgetInfo(
             LauncherAppWidgetProviderInfo actual, AppWidgetProviderInfo expected) {
         assertThat(actual.provider).isEqualTo(expected.provider);
diff --git a/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java b/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java
index a29ac1a7de..22a8c9b1d0 100644
--- a/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java
+++ b/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java
@@ -16,16 +16,17 @@
 package com.android.launcher3.model;
 
 import android.app.prediction.AppTarget;
+import android.content.ComponentName;
+import android.text.TextUtils;
 
 import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.BgDataModel.FixedContainerItems;
 import com.android.launcher3.model.QuickstepModelDelegate.PredictorState;
-import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.PackageUserKey;
 import com.android.launcher3.widget.PendingAddWidgetInfo;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -56,25 +57,43 @@ public final class WidgetsPredictionUpdateTask extends BaseModelUpdateTask {
         Map<PackageUserKey, List<WidgetItem>> allWidgets =
                 dataModel.widgetsModel.getAllWidgetsWithoutShortcuts();
 
-        ArrayList<ItemInfo> recommendedWidgetsInDescendingOrder = new ArrayList<>();
-        for (AppTarget app : mTargets) {
-            PackageUserKey packageUserKey = new PackageUserKey(app.getPackageName(), app.getUser());
-            if (allWidgets.containsKey(packageUserKey)) {
-                List<WidgetItem> notAddedWidgets = allWidgets.get(packageUserKey).stream()
-                        .filter(item ->
-                                !widgetsInWorkspace.contains(
-                                        new ComponentKey(item.componentName, item.user)))
-                        .collect(Collectors.toList());
-                if (notAddedWidgets.size() > 0) {
-                    // Even an apps have more than one widgets, we only include one widget.
-                    recommendedWidgetsInDescendingOrder.add(
-                            new PendingAddWidgetInfo(notAddedWidgets.get(0).widgetInfo));
+        FixedContainerItems fixedContainerItems = mPredictorState.items;
+        fixedContainerItems.items.clear();
+
+        if (FeatureFlags.ENABLE_LOCAL_RECOMMENDED_WIDGETS_FILTER.get()) {
+            for (AppTarget app : mTargets) {
+                PackageUserKey packageUserKey = new PackageUserKey(app.getPackageName(),
+                        app.getUser());
+                if (allWidgets.containsKey(packageUserKey)) {
+                    List<WidgetItem> notAddedWidgets = allWidgets.get(packageUserKey).stream()
+                            .filter(item ->
+                                    !widgetsInWorkspace.contains(
+                                            new ComponentKey(item.componentName, item.user)))
+                            .collect(Collectors.toList());
+                    if (notAddedWidgets.size() > 0) {
+                        // Even an apps have more than one widgets, we only include one widget.
+                        fixedContainerItems.items.add(
+                                new PendingAddWidgetInfo(notAddedWidgets.get(0).widgetInfo));
+                    }
+                }
+            }
+        } else {
+            Map<ComponentKey, WidgetItem> widgetItems =
+                    allWidgets.values().stream().flatMap(List::stream)
+                            .collect(Collectors.toMap(widget -> (ComponentKey) widget,
+                                    widget -> widget));
+            for (AppTarget app : mTargets) {
+                if (TextUtils.isEmpty(app.getClassName())) {
+                    continue;
+                }
+                ComponentKey targetWidget = new ComponentKey(
+                        new ComponentName(app.getPackageName(), app.getClassName()), app.getUser());
+                if (widgetItems.containsKey(targetWidget)) {
+                    fixedContainerItems.items.add(
+                            new PendingAddWidgetInfo(widgetItems.get(targetWidget).widgetInfo));
                 }
             }
         }
-        FixedContainerItems fixedContainerItems = mPredictorState.items;
-        fixedContainerItems.items.clear();
-        fixedContainerItems.items.addAll(recommendedWidgetsInDescendingOrder);
         bindExtraContainerItems(fixedContainerItems);
 
         // Don't store widgets prediction to disk because it is not used frequently.
diff --git a/quickstep/src/com/android/launcher3/uioverrides/DeviceFlag.java b/quickstep/src/com/android/launcher3/uioverrides/DeviceFlag.java
index bb1f6fcc00..c115bbb9fb 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/DeviceFlag.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/DeviceFlag.java
@@ -68,6 +68,12 @@ public class DeviceFlag extends DebugFlag {
         mListeners.remove(r);
     }
 
+    @Override
+    public boolean get() {
+        // Override this method in order to let Robolectric ShadowDeviceFlag to stub it.
+        return super.get();
+    }
+
     private void registerDeviceConfigChangedListener(Context context) {
         DeviceConfig.addOnPropertiesChangedListener(
                 NAMESPACE_LAUNCHER,
diff --git a/robolectric_tests/src/com/android/launcher3/shadows/ShadowDeviceFlag.java b/robolectric_tests/src/com/android/launcher3/shadows/ShadowDeviceFlag.java
index 344f53206f..b58e4b7074 100644
--- a/robolectric_tests/src/com/android/launcher3/shadows/ShadowDeviceFlag.java
+++ b/robolectric_tests/src/com/android/launcher3/shadows/ShadowDeviceFlag.java
@@ -18,11 +18,15 @@ package com.android.launcher3.shadows;
 
 import android.content.Context;
 
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.uioverrides.DeviceFlag;
 import com.android.launcher3.util.LooperExecutor;
 
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
+import org.robolectric.annotation.RealObject;
+import org.robolectric.shadow.api.Shadow;
 
 /**
  * Shadow for {@link LooperExecutor} to provide reset functionality for static executors.
@@ -30,6 +34,9 @@ import org.robolectric.annotation.Implements;
 @Implements(value = DeviceFlag.class, isInAndroidSdk = false)
 public class ShadowDeviceFlag {
 
+    @RealObject private DeviceFlag mRealObject;
+    @Nullable private Boolean mValue;
+
     /**
      * Mock change listener as it uses internal system classes not available to robolectric
      */
@@ -40,4 +47,16 @@ public class ShadowDeviceFlag {
     protected static boolean getDeviceValue(String key, boolean defaultValue) {
         return defaultValue;
     }
+
+    @Implementation
+    public boolean get() {
+        if (mValue != null) {
+            return mValue;
+        }
+        return Shadow.directlyOn(mRealObject, DeviceFlag.class, "get");
+    }
+
+    public void setValue(boolean value) {
+        mValue = new Boolean(value);
+    }
 }
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 7d5ed60019..a1abf68e57 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -226,6 +226,10 @@ public final class FeatureFlags {
     public static final BooleanFlag ENABLE_ENFORCED_ROUNDED_CORNERS = new DeviceFlag(
             "ENABLE_ENFORCED_ROUNDED_CORNERS", true, "Enforce rounded corners on all App Widgets");
 
+    public static final BooleanFlag ENABLE_LOCAL_RECOMMENDED_WIDGETS_FILTER = new DeviceFlag(
+            "ENABLE_LOCAL_RECOMMENDED_WIDGETS_FILTER", true,
+            "Enables a local filter for recommended widgets.");
+
     public static final BooleanFlag NOTIFY_CRASHES = getDebugFlag("NOTIFY_CRASHES", false,
             "Sends a notification whenever launcher encounters an uncaught exception.");
 
-- 
GitLab


From 3417c1d22bef68f6242756e5cb574295de3f8e88 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 28 Apr 2021 19:27:40 +0100
Subject: [PATCH 1008/1664] Remove debugging logs from the full widgets picker

Test: None
Bug: 185508758
Change-Id: I2958118abc9d4f3778aaf6c3e3df01b0712354dc
---
 .../android/launcher3/widget/picker/WidgetsFullSheet.java    | 5 -----
 .../widget/picker/WidgetsRecommendationTableLayout.java      | 3 ---
 2 files changed, 8 deletions(-)

diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 8f5d4dc6ef..b4d48562be 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -28,7 +28,6 @@ import android.graphics.Rect;
 import android.os.Process;
 import android.os.UserHandle;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.util.Pair;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
@@ -473,10 +472,6 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         WidgetsRecommendationTableLayout table =
                 mSearchAndRecommendationViewHolder.mRecommendedWidgetsTable;
         if (recommendedWidgets.size() > 0) {
-            // TODO(b/185508758): Revert the following log after debugging.
-            if (getHeaderViewHeight() == 0) {
-                Log.d(TAG, "Header view height is 0 when inflating recommended widgets");
-            }
             float maxTableHeight =
                     (mLauncher.getDeviceProfile().availableHeightPx - mTabsHeight
                             - getHeaderViewHeight()) * RECOMMENDATION_TABLE_HEIGHT_RATIO;
diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
index 2d3f1a0188..62ef4ff64e 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
@@ -93,9 +93,6 @@ public final class WidgetsRecommendationTableLayout extends TableLayout {
         mRecommendationTableMaxHeight = recommendationTableMaxHeight;
         RecommendationTableData data = fitRecommendedWidgetsToTableSpace(/* previewScale= */ 1f,
                 recommendedWidgets);
-        // TODO(b/185508758): Revert the following logs after debugging.
-        Log.d(TAG, "Recommended widgets section max height: " + recommendationTableMaxHeight);
-        Log.d(TAG, "Recommended widget down scale: " + data.mPreviewScale);
         bindData(data);
     }
 
-- 
GitLab


From 4cc0dbb5529ecca7fbcca911a6a6f9f347ecb653 Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Tue, 27 Apr 2021 17:32:25 -0700
Subject: [PATCH 1009/1664] Change TaskIconMenu to lay out vertically

Still lays out horizontally when in phone
landscape.
TODO(b/186583656), need to center view.
Also have all layout be dynamic instead of having
some cases be in XML and some in code.

Bug: 181704764
Test: Task menu visible with all options in
portrait/landscape tablet
portrait phone
fake/real landscape phone

Change-Id: I3632eeb174f3e4baf2c9d69d51c1815c3c512e59
---
 quickstep/res/layout/task_menu.xml            | 12 ++++----
 .../res/layout/task_view_menu_option.xml      | 12 +++-----
 quickstep/res/values-land/dimens.xml          |  2 --
 quickstep/res/values-land/styles.xml          | 28 -------------------
 quickstep/res/values/dimens.xml               |  2 +-
 quickstep/res/values/styles.xml               | 10 -------
 .../android/quickstep/views/TaskMenuView.java | 12 ++++----
 src/com/android/launcher3/Utilities.java      | 11 ++++++++
 .../touch/LandscapePagedViewHandler.java      | 11 ++++++--
 .../touch/PagedOrientationHandler.java        |  5 ++--
 .../touch/PortraitPagedViewHandler.java       | 28 ++++++++++++++++---
 11 files changed, 62 insertions(+), 71 deletions(-)
 delete mode 100644 quickstep/res/values-land/styles.xml

diff --git a/quickstep/res/layout/task_menu.xml b/quickstep/res/layout/task_menu.xml
index 3916ff9a1a..a219bca805 100644
--- a/quickstep/res/layout/task_menu.xml
+++ b/quickstep/res/layout/task_menu.xml
@@ -16,7 +16,7 @@
 -->
 <com.android.quickstep.views.TaskMenuView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:animateLayoutChanges="true"
     android:background="@drawable/task_menu_bg"
@@ -35,12 +35,10 @@
 
     <LinearLayout
         android:id="@+id/menu_option_layout"
-        style="@style/TaskMenu"
-        android:divider="@drawable/all_apps_divider"
-        android:showDividers="beginning"
-        android:paddingStart="@dimen/task_card_menu_horizontal_padding"
-        android:paddingEnd="@dimen/task_card_menu_horizontal_padding"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:divider="@drawable/all_apps_divider"
+        android:showDividers="beginning" />
 
 </com.android.quickstep.views.TaskMenuView>
\ No newline at end of file
diff --git a/quickstep/res/layout/task_view_menu_option.xml b/quickstep/res/layout/task_view_menu_option.xml
index 102ae9bc23..a7d6e89d8d 100644
--- a/quickstep/res/layout/task_view_menu_option.xml
+++ b/quickstep/res/layout/task_view_menu_option.xml
@@ -16,9 +16,8 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/TaskMenu.Option"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_gravity="center"
     android:orientation="vertical"
     android:paddingTop="@dimen/task_card_menu_option_vertical_padding"
     android:paddingBottom="@dimen/task_card_menu_option_vertical_padding"
@@ -29,22 +28,19 @@
       android:id="@+id/icon"
       android:layout_width="@dimen/system_shortcut_icon_size"
       android:layout_height="@dimen/system_shortcut_icon_size"
-      android:layout_marginTop="@dimen/system_shortcut_header_icon_padding"
-      android:layout_marginBottom="@dimen/deep_shortcut_drawable_padding"
+      android:layout_marginStart="@dimen/task_menu_option_start_margin"
       android:layout_gravity="center_horizontal"
       android:backgroundTint="?android:attr/textColorTertiary"/>
 
     <TextView
         style="@style/BaseIcon"
         android:id="@+id/text"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/popup_padding_end"
+        android:layout_marginStart="@dimen/task_menu_option_start_margin"
         android:textSize="12sp"
         android:textColor="?android:attr/textColorPrimary"
         android:fontFamily="sans-serif"
-        android:gravity="center_horizontal"
-        android:layout_gravity="center_horizontal"
         android:focusable="false" />
 
 </LinearLayout>
diff --git a/quickstep/res/values-land/dimens.xml b/quickstep/res/values-land/dimens.xml
index 7cb01f6261..668aea2c9e 100644
--- a/quickstep/res/values-land/dimens.xml
+++ b/quickstep/res/values-land/dimens.xml
@@ -15,7 +15,5 @@
      limitations under the License.
 -->
 <resources>
-    <dimen name="task_card_menu_horizontal_padding">24dp</dimen>
-
     <dimen name="overview_task_margin">8dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/quickstep/res/values-land/styles.xml b/quickstep/res/values-land/styles.xml
deleted file mode 100644
index 0824b4f555..0000000000
--- a/quickstep/res/values-land/styles.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <!-- Task Menu layout styles. -->
-    <style name="TaskMenu">
-        <item name="android:orientation">horizontal</item>
-    </style>
-
-    <!-- Task Menu Option layout styles. -->
-    <style name="TaskMenu.Option">
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_weight">1</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 99be50295d..9c0a083084 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -67,7 +67,7 @@
          in various configurations -->
     <dimen name="task_card_menu_option_vertical_padding">8dp</dimen>
     <dimen name="task_card_menu_shadow_height">3dp</dimen>
-    <dimen name="task_card_menu_horizontal_padding">0dp</dimen>
+    <dimen name="task_menu_option_start_margin">12dp</dimen>
     <!-- Copied from framework resource:
        docked_stack_divider_thickness - 2 * docked_stack_divider_insets -->
     <dimen name="multi_window_task_divider_size">10dp</dimen>
diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml
index 82a91a76f5..7c7d20a20a 100644
--- a/quickstep/res/values/styles.xml
+++ b/quickstep/res/values/styles.xml
@@ -15,16 +15,6 @@
      limitations under the License.
 -->
 <resources>
-    <!-- Task Menu layout styles. -->
-    <style name="TaskMenu">
-        <item name="android:orientation">vertical</item>
-    </style>
-
-    <!-- Task Menu Option layout styles. -->
-    <style name="TaskMenu.Option">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-    </style>
 
     <style name="TextAppearance.GestureTutorial"
         parent="android:TextAppearance.Material.Body1" />
diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
index f55cdaca46..32cd367be5 100644
--- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
@@ -201,12 +201,13 @@ public class TaskMenuView extends AbstractFloatingView implements OnScrollChange
     }
 
     private void addMenuOption(SystemShortcut menuOption) {
-        ViewGroup menuOptionView = (ViewGroup) mActivity.getLayoutInflater().inflate(
+        LinearLayout menuOptionView = (LinearLayout) mActivity.getLayoutInflater().inflate(
                 R.layout.task_view_menu_option, this, false);
         menuOption.setIconAndLabelFor(
                 menuOptionView.findViewById(R.id.icon), menuOptionView.findViewById(R.id.text));
         LayoutParams lp = (LayoutParams) menuOptionView.getLayoutParams();
-        mTaskView.getPagedOrientationHandler().setLayoutParamsForTaskMenuOptionItem(lp);
+        mTaskView.getPagedOrientationHandler().setLayoutParamsForTaskMenuOptionItem(lp,
+                menuOptionView, mActivity.getDeviceProfile());
         menuOptionView.setEnabled(menuOption.isEnabled());
         menuOptionView.setAlpha(menuOption.isEnabled() ? 1 : 0.5f);
         menuOptionView.setOnClickListener(view -> {
@@ -228,16 +229,15 @@ public class TaskMenuView extends AbstractFloatingView implements OnScrollChange
         mActivity.getDragLayer().getDescendantRectRelativeToSelf(taskView, sTempRect);
         Rect insets = mActivity.getDragLayer().getInsets();
         BaseDragLayer.LayoutParams params = (BaseDragLayer.LayoutParams) getLayoutParams();
+        // TODO(b/186583656) Move the entire menu to the center/make smaller than thumbnail width
         params.width = orientationHandler.getTaskMenuWidth(taskView.getThumbnail());
         // Gravity set to Left instead of Start as sTempRect.left measures Left distance not Start
         params.gravity = Gravity.LEFT;
         setLayoutParams(params);
         setScaleX(taskView.getScaleX());
         setScaleY(taskView.getScaleY());
-        boolean canActivityRotate = taskView.getRecentsView()
-            .mOrientationState.isRecentsActivityRotationAllowed();
-        mOptionLayout.setOrientation(orientationHandler
-                .getTaskMenuLayoutOrientation(canActivityRotate, mOptionLayout));
+        orientationHandler.setTaskMenuLayoutOrientation(
+                mActivity.getDeviceProfile(), mOptionLayout);
         setPosition(sTempRect.left - insets.left, sTempRect.top - insets.top, 0);
     }
 
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 3312915fd3..a799b4a33a 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -65,6 +65,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
 import android.view.animation.Interpolator;
+import android.widget.LinearLayout;
 
 import androidx.core.graphics.ColorUtils;
 import androidx.core.os.BuildCompat;
@@ -752,6 +753,16 @@ public final class Utilities {
                 ColorUtils.blendARGB(0, color, tintAmount));
     }
 
+    /**
+     * Sets start margin on the provided {@param view} to be {@param margin}.
+     * Assumes {@param view} is a child of {@link LinearLayout}
+     */
+    public static void setStartMarginForView(View view, int margin) {
+        LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) view.getLayoutParams();
+        lp.setMarginStart(margin);
+        view.setLayoutParams(lp);
+    }
+
     private static class FixedSizeEmptyDrawable extends ColorDrawable {
 
         private final int mSize;
diff --git a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
index 2254ab3cea..2fd5efc3f6 100644
--- a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
+++ b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
@@ -254,16 +254,21 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
     }
 
     @Override
-    public int getTaskMenuLayoutOrientation(boolean canRecentsActivityRotate,
+    public void setTaskMenuLayoutOrientation(DeviceProfile deviceProfile,
         LinearLayout taskMenuLayout) {
-        return LinearLayout.HORIZONTAL;
+        taskMenuLayout.setOrientation(LinearLayout.HORIZONTAL);
     }
 
     @Override
-    public void setLayoutParamsForTaskMenuOptionItem(LinearLayout.LayoutParams lp) {
+    public void setLayoutParamsForTaskMenuOptionItem(LinearLayout.LayoutParams lp,
+            LinearLayout viewGroup, DeviceProfile deviceProfile) {
+        // Phone fake landscape
+        viewGroup.setOrientation(LinearLayout.VERTICAL);
         lp.width = 0;
         lp.height = WRAP_CONTENT;
         lp.weight = 1;
+        Utilities.setStartMarginForView(viewGroup.findViewById(R.id.text), 0);
+        Utilities.setStartMarginForView(viewGroup.findViewById(R.id.icon), 0);
     }
 
     /* ---------- The following are only used by TaskViewTouchHandler. ---------- */
diff --git a/src/com/android/launcher3/touch/PagedOrientationHandler.java b/src/com/android/launcher3/touch/PagedOrientationHandler.java
index c9149ff6b7..6c2f17ee34 100644
--- a/src/com/android/launcher3/touch/PagedOrientationHandler.java
+++ b/src/com/android/launcher3/touch/PagedOrientationHandler.java
@@ -101,8 +101,9 @@ public interface PagedOrientationHandler {
     float getTaskMenuX(float x, View thumbnailView, int overScroll);
     float getTaskMenuY(float y, View thumbnailView, int overScroll);
     int getTaskMenuWidth(View view);
-    int getTaskMenuLayoutOrientation(boolean canRecentsActivityRotate, LinearLayout taskMenuLayout);
-    void setLayoutParamsForTaskMenuOptionItem(LinearLayout.LayoutParams lp);
+    void setTaskMenuLayoutOrientation(DeviceProfile deviceProfile, LinearLayout taskMenuLayout);
+    void setLayoutParamsForTaskMenuOptionItem(LinearLayout.LayoutParams lp,
+            LinearLayout viewGroup, DeviceProfile deviceProfile);
     int getDistanceToBottomOfRect(DeviceProfile dp, Rect rect);
     List<SplitPositionOption> getSplitPositionOptions(DeviceProfile dp);
     FloatProperty getSplitSelectTaskOffset(FloatProperty primary, FloatProperty secondary,
diff --git a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
index 31586e7428..f6a6448602 100644
--- a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
+++ b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
@@ -253,14 +253,34 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
     }
 
     @Override
-    public int getTaskMenuLayoutOrientation(boolean canRecentsActivityRotate,
+    public void setTaskMenuLayoutOrientation(DeviceProfile deviceProfile,
         LinearLayout taskMenuLayout) {
-        return canRecentsActivityRotate ? taskMenuLayout.getOrientation() : LinearLayout.VERTICAL;
+        if (deviceProfile.isLandscape && !deviceProfile.isTablet) {
+            // Phone landscape
+            taskMenuLayout.setOrientation(LinearLayout.HORIZONTAL);
+        } else {
+            // Phone Portrait, LargeScreen Landscape/Portrait
+            taskMenuLayout.setOrientation(LinearLayout.VERTICAL);
+        }
     }
 
     @Override
-    public void setLayoutParamsForTaskMenuOptionItem(LinearLayout.LayoutParams lp) {
-        // no-op, defaults are fine
+    public void setLayoutParamsForTaskMenuOptionItem(LinearLayout.LayoutParams lp,
+            LinearLayout viewGroup, DeviceProfile deviceProfile) {
+        if (deviceProfile.isLandscape && !deviceProfile.isTablet) {
+            // Phone landscape
+            viewGroup.setOrientation(LinearLayout.VERTICAL);
+            lp.width = 0;
+            lp.weight = 1;
+            Utilities.setStartMarginForView(viewGroup.findViewById(R.id.text), 0);
+            Utilities.setStartMarginForView(viewGroup.findViewById(R.id.icon), 0);
+        } else {
+            // Phone Portrait, LargeScreen Landscape/Portrait
+            viewGroup.setOrientation(LinearLayout.HORIZONTAL);
+            lp.width = LinearLayout.LayoutParams.WRAP_CONTENT;
+        }
+
+        lp.height = LinearLayout.LayoutParams.WRAP_CONTENT;
     }
 
     /* ---------- The following are only used by TaskViewTouchHandler. ---------- */
-- 
GitLab


From a6cec336ff6b586fa37867c0b4e17269f01cf043 Mon Sep 17 00:00:00 2001
From: Becky Qiu <xuqiu@google.com>
Date: Wed, 28 Apr 2021 15:20:49 -0700
Subject: [PATCH 1010/1664] [Overview Sharing] Turn on the feature flag for
 overview sharing.

Bug: 186670923
Test: manual
Change-Id: I57514cde11dc3315c8671c286a6963d29cf346e1
---
 src/com/android/launcher3/config/FeatureFlags.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 7d5ed60019..bad87043ef 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -151,7 +151,7 @@ public final class FeatureFlags {
             "ENABLE_OVERVIEW_SHARE", false, "Show Share button in Overview Actions");
 
     public static final BooleanFlag ENABLE_OVERVIEW_SHARING_TO_PEOPLE = getDebugFlag(
-            "ENABLE_OVERVIEW_SHARING_TO_PEOPLE", false,
+            "ENABLE_OVERVIEW_SHARING_TO_PEOPLE", true,
             "Show indicators for content on Overview to share with top people. ");
 
     public static final BooleanFlag ENABLE_OVERVIEW_CONTENT_PUSH = getDebugFlag(
-- 
GitLab


From 7350b0f47e507f1caa056a89707f05b28a401500 Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Wed, 28 Apr 2021 17:27:17 -0700
Subject: [PATCH 1011/1664] Logging ItemInfo.attribute field for
 LauncherUiChanged atom.

Unlike LaucherStaticLayout, LauncherUiChanged atom does not have origin field to write into statsd. This workaround solution will pack attribute value into target_id field and provides backward compatibility too.

Bug: 186169419
Test: Manual
Change-Id: Ib5344fad08accdd0aac827700c3842b7f102b7dc
---
 .../android/quickstep/logging/StatsLogCompatManager.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
index 66c24c8bae..3b26108aab 100644
--- a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
+++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
@@ -84,6 +84,7 @@ public class StatsLogCompatManager extends StatsLogManager {
     private static final int FOLDER_HIERARCHY_OFFSET = 100;
     private static final int SEARCH_RESULT_HIERARCHY_OFFSET = 200;
     private static final int EXTENDED_CONTAINERS_HIERARCHY_OFFSET = 300;
+    private static final int ATTRIBUTE_MULTIPLIER = 100;
 
     public static final CopyOnWriteArrayList<StatsLogConsumer> LOGS_CONSUMER =
             new CopyOnWriteArrayList<>();
@@ -112,7 +113,8 @@ public class StatsLogCompatManager extends StatsLogManager {
         }
         SysUiStatsLog.write(SysUiStatsLog.LAUNCHER_SNAPSHOT,
                 LAUNCHER_WORKSPACE_SNAPSHOT.getId() /* event_id */,
-                info.getItemCase().getNumber() /* target_id */,
+                info.getAttribute().getNumber() * ATTRIBUTE_MULTIPLIER
+                        + info.getItemCase().getNumber()  /* target_id */,
                 instanceId.getId() /* instance_id */,
                 0 /* uid */,
                 getPackageName(info) /* package_name */,
@@ -329,7 +331,8 @@ public class StatsLogCompatManager extends StatsLogManager {
                     null /* launcher extensions, deprecated */,
                     false /* quickstep_enabled, deprecated */,
                     event.getId() /* event_id */,
-                    atomInfo.getItemCase().getNumber() /* target_id */,
+                    atomInfo.getAttribute().getNumber() * ATTRIBUTE_MULTIPLIER
+                            + atomInfo.getItemCase().getNumber() /* target_id */,
                     instanceId.getId() /* instance_id TODO */,
                     0 /* uid TODO */,
                     getPackageName(atomInfo) /* package_name */,
-- 
GitLab


From c5919749ea7a54191a343f9c465bc714c661f916 Mon Sep 17 00:00:00 2001
From: Jon Spivack <spivack@google.com>
Date: Wed, 28 Apr 2021 11:43:34 -0700
Subject: [PATCH 1012/1664] Check screen context permissions for NIU Actions

This checks for the ASSIST_STRUCTURE_ENABLED and ASSIST_SCREENSHOT_ENABLED permissions before sending NIU Actions Intents. If either permission is absent, the screenshot is not sent, and an error code is added to the Intent.

Bug: 182010359
Test: Manual (toggled permissions and clicked NIU Actions buttons on Wembley device)
Test: m -j RunLauncherGoGoogleRoboTests
Change-Id: Icf0db739f5010862cc2bac496f5410665625f3be
---
 .../quickstep/TaskOverlayFactoryGo.java       | 45 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
index 350e0d1d97..79e50ef35b 100644
--- a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
+++ b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
@@ -21,14 +21,18 @@ import static com.android.quickstep.views.OverviewActionsView.DISABLED_ROTATED;
 
 import android.annotation.SuppressLint;
 import android.app.assist.AssistContent;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Matrix;
+import android.net.Uri;
 import android.os.SystemClock;
+import android.provider.Settings;
 import android.text.TextUtils;
 
 import androidx.annotation.VisibleForTesting;
 
+import com.android.launcher3.BuildConfig;
 import com.android.launcher3.R;
 import com.android.quickstep.util.AssistContentRequester;
 import com.android.quickstep.views.OverviewActionsView;
@@ -45,7 +49,12 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
     public static final String ACTION_SEARCH = "com.android.quickstep.ACTION_SEARCH";
     public static final String ELAPSED_NANOS = "niu_actions_elapsed_realtime_nanos";
     public static final String ACTIONS_URL = "niu_actions_app_url";
+    public static final String ACTIONS_ERROR_CODE = "niu_actions_app_error_code";
+    public static final int ERROR_PERMISSIONS = 1;
     private static final String TAG = "TaskOverlayFactoryGo";
+    private static final String URI_AUTHORITY =
+            BuildConfig.APPLICATION_ID + ".overview.fileprovider";
+    private static final String FAKE_FILEPATH = "shared_images/null.png";
 
     // Empty constructor required for ResourceBasedOverride
     public TaskOverlayFactoryGo(Context context) {}
@@ -64,6 +73,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
     public static final class TaskOverlayGo<T extends OverviewActionsView> extends TaskOverlay {
         private String mNIUPackageName;
         private String mWebUrl;
+        private boolean mAssistPermissionsEnabled;
 
         private TaskOverlayGo(TaskThumbnailView taskThumbnailView) {
             super(taskThumbnailView);
@@ -87,6 +97,11 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
             boolean isAllowedByPolicy = mThumbnailView.isRealSnapshot();
             getActionsView().setCallbacks(new OverlayUICallbacksGoImpl(isAllowedByPolicy, task));
 
+            checkPermissions();
+            if (!mAssistPermissionsEnabled) {
+                return;
+            }
+
             int taskId = task.key.id;
             AssistContentRequester contentRequester =
                     new AssistContentRequester(mApplicationContext);
@@ -112,7 +127,22 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
         @VisibleForTesting
         public void sendNIUIntent(String actionType) {
             Intent intent = createNIUIntent(actionType);
-            mImageApi.shareAsDataWithExplicitIntent(/* crop */ null, intent);
+            // Only add and send the image if the appropriate permissions are held
+            if (mAssistPermissionsEnabled) {
+                mImageApi.shareAsDataWithExplicitIntent(/* crop */ null, intent);
+            } else {
+                intent.putExtra(ACTIONS_ERROR_CODE, ERROR_PERMISSIONS);
+                // The Intent recipient expects an image URI, and omitting one or using a
+                // completely invalid URI will cause the Intent parsing to crash.
+                // So we construct a URI for a nonexistent image.
+                Uri uri = new Uri.Builder()
+                        .scheme(ContentResolver.SCHEME_CONTENT)
+                        .authority(URI_AUTHORITY)
+                        .path(FAKE_FILEPATH)
+                        .build();
+                intent.setData(uri);
+                mApplicationContext.startActivity(intent);
+            }
         }
 
         private Intent createNIUIntent(String actionType) {
@@ -129,6 +159,19 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
             return intent;
         }
 
+        /**
+         * Checks whether the Assistant has screen context permissions
+         */
+        @VisibleForTesting
+        public void checkPermissions() {
+            ContentResolver contentResolver = mApplicationContext.getContentResolver();
+            boolean structureEnabled = Settings.Secure.getInt(contentResolver,
+                    Settings.Secure.ASSIST_STRUCTURE_ENABLED, 0) != 0;
+            boolean screenshotEnabled = Settings.Secure.getInt(contentResolver,
+                    Settings.Secure.ASSIST_SCREENSHOT_ENABLED, 0) != 0;
+            mAssistPermissionsEnabled = structureEnabled && screenshotEnabled;
+        }
+
         protected class OverlayUICallbacksGoImpl extends OverlayUICallbacksImpl
                 implements OverlayUICallbacksGo {
             public OverlayUICallbacksGoImpl(boolean isAllowedByPolicy, Task task) {
-- 
GitLab


From 3c192b3f7224bbb569ed31474efc3d70037d8512 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 28 Apr 2021 21:13:46 -0700
Subject: [PATCH 1013/1664] Fix a couple issues with tracking launch cookies

- Fix NPE when there is no running task
- Fix issue where we were defaulting to a prediction icon when
  there was no launch cookie
- Don't use a launch cookie when we are launching from a non-workspace
  item, just fallback to the package name matching in that case

Fixes: 186653036
Fixes: 186593373
Test: Swipe up from various apps launched from predictions, also
      launch an app from all apps and swipe up and ensure it
      doesn't match a prediction
Change-Id: Ie8f5da010c140a5056045ac268d082c80271ab68
---
 .../android/launcher3/BaseQuickstepLauncher.java    | 13 +++++++++++++
 .../com/android/quickstep/AbsSwipeUpHandler.java    |  6 ++++--
 .../android/quickstep/LauncherSwipeHandlerV2.java   |  5 +++--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 7aae38c7f1..910e473401 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -443,6 +443,19 @@ public abstract class BaseQuickstepLauncher extends Launcher
         if (info == null) {
             return;
         }
+        switch (info.container) {
+            case LauncherSettings.Favorites.CONTAINER_DESKTOP:
+            case LauncherSettings.Favorites.CONTAINER_HOTSEAT:
+                // Fall through and continue it's on the workspace (we don't support swiping back
+                // to other containers like all apps or the hotseat predictions (which can change)
+                break;
+            default:
+                if (info.container >= 0) {
+                    // Also allow swiping to folders
+                    break;
+                }
+                return;
+        }
         switch (info.itemType) {
             case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION:
             case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT:
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 61803aa13b..883b02933e 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1095,8 +1095,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
             final RemoteAnimationTargetCompat runningTaskTarget = mRecentsAnimationTargets != null
                     ? mRecentsAnimationTargets.findTask(mGestureState.getRunningTaskId())
                     : null;
-            HomeAnimationFactory homeAnimFactory = createHomeAnimationFactory(
-                    runningTaskTarget.taskInfo.launchCookies, duration);
+            final ArrayList<IBinder> cookies = runningTaskTarget != null
+                    ? runningTaskTarget.taskInfo.launchCookies
+                    : new ArrayList<>();
+            HomeAnimationFactory homeAnimFactory = createHomeAnimationFactory(cookies, duration);
             mIsSwipingPipToHome = homeAnimFactory.supportSwipePipToHome()
                     && runningTaskTarget != null
                     && runningTaskTarget.taskInfo.pictureInPictureParams != null
diff --git a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
index dd35d68dcf..2ea34d7f93 100644
--- a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
+++ b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
@@ -244,8 +244,9 @@ public class LauncherSwipeHandlerV2 extends
             return null;
         }
 
-        // Find the associated item info for the launch cookie (if available)
-        int launchCookieItemId = -1;
+        // Find the associated item info for the launch cookie (if available), note that predicted
+        // apps actually have an id of -1, so use another default id here
+        int launchCookieItemId = -2;
         for (IBinder cookie : launchCookies) {
             Integer itemId = ObjectWrapper.unwrap(cookie);
             if (itemId != null) {
-- 
GitLab


From a3a6f51b12b30591301efce0211c51bb47a8deaa Mon Sep 17 00:00:00 2001
From: Yogisha Dixit <ydixit@google.com>
Date: Wed, 28 Apr 2021 13:45:37 +0100
Subject: [PATCH 1014/1664] Update drop target styling based for BC.

Spec: https://docs.google.com/presentation/d/1UxdDh8EFhPbdRWRwzjbpgL-j02ew4Ew3eG3XBCeoYdo/edit#slide=id.vXfwHn8

Demo: https://drive.google.com/file/d/1ZIa3Dgo85vdVkfPm7aGJDyctZQR_c8Xx/view?usp=sharing

Test: manual
Bug: 184713740
Change-Id: I17dbbf1f7bbc40939cfc0fedb506a35f39ecc2e3
---
 res/drawable/drop_target_frame.xml            | 22 +++++++++++++++++++
 res/drawable/drop_target_frame_hover.xml      | 21 ++++++++++++++++++
 res/drawable/ic_block_no_shadow.xml           |  8 +++----
 res/drawable/ic_remove_no_shadow.xml          |  4 ++--
 res/drawable/ic_uninstall_no_shadow.xml       |  8 +++----
 res/values/dimens.xml                         |  2 +-
 res/values/styles.xml                         |  7 ++----
 .../android/launcher3/ButtonDropTarget.java   |  9 ++++++++
 .../android/launcher3/DeleteDropTarget.java   |  2 +-
 .../launcher3/SecondaryDropTarget.java        |  6 ++---
 10 files changed, 69 insertions(+), 20 deletions(-)
 create mode 100644 res/drawable/drop_target_frame.xml
 create mode 100644 res/drawable/drop_target_frame_hover.xml

diff --git a/res/drawable/drop_target_frame.xml b/res/drawable/drop_target_frame.xml
new file mode 100644
index 0000000000..fa6dafd4fc
--- /dev/null
+++ b/res/drawable/drop_target_frame.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@android:color/transparent" />
+    <corners android:radius="28dp" />
+    <stroke android:width="2dp" android:color="?android:attr/colorAccent" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/drop_target_frame_hover.xml b/res/drawable/drop_target_frame_hover.xml
new file mode 100644
index 0000000000..7d0e919331
--- /dev/null
+++ b/res/drawable/drop_target_frame_hover.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="?android:attr/colorAccent" />
+    <corners android:radius="28dp" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/ic_block_no_shadow.xml b/res/drawable/ic_block_no_shadow.xml
index edeb4c63ec..be9aa07b38 100644
--- a/res/drawable/ic_block_no_shadow.xml
+++ b/res/drawable/ic_block_no_shadow.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportHeight="20.0"
+    android:viewportWidth="20.0"
     android:tint="?android:attr/textColorPrimary">
     <path
         android:fillColor="@android:color/white"
diff --git a/res/drawable/ic_remove_no_shadow.xml b/res/drawable/ic_remove_no_shadow.xml
index 2c706dbb30..10f1e43a13 100644
--- a/res/drawable/ic_remove_no_shadow.xml
+++ b/res/drawable/ic_remove_no_shadow.xml
@@ -14,8 +14,8 @@
      limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="20dp"
+    android:height="20dp"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0"
     android:tint="?android:attr/textColorPrimary">
diff --git a/res/drawable/ic_uninstall_no_shadow.xml b/res/drawable/ic_uninstall_no_shadow.xml
index 6aff102a2d..14cecacbea 100644
--- a/res/drawable/ic_uninstall_no_shadow.xml
+++ b/res/drawable/ic_uninstall_no_shadow.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
+        android:width="20dp"
+        android:height="20dp"
+        android:viewportWidth="20.0"
+        android:viewportHeight="20.0"
         android:tint="?android:attr/textColorPrimary" >
     <path
         android:fillColor="@android:color/white"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 600a550700..dd14eaa0ff 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -158,7 +158,7 @@
 <!-- Dragging -->
     <!-- Drag padding to add to the bottom of drop targets -->
     <dimen name="drop_target_drag_padding">14dp</dimen>
-    <dimen name="drop_target_text_size">14sp</dimen>
+    <dimen name="drop_target_text_size">20sp</dimen>
     <dimen name="drop_target_shadow_elevation">2dp</dimen>
 
     <!-- the distance an icon must be dragged before button drop targets accept it -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5ae4e3ffe0..97a576011a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -258,14 +258,11 @@
         <item name="android:drawablePadding">7.5dp</item>
         <item name="android:paddingLeft">16dp</item>
         <item name="android:paddingRight">16dp</item>
-        <item name="android:textColor">?attr/workspaceTextColor</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:textSize">@dimen/drop_target_text_size</item>
         <item name="android:singleLine">true</item>
         <item name="android:ellipsize">end</item>
-        <item name="android:shadowColor">?attr/workspaceShadowColor</item>
-        <item name="android:shadowDx">0.0</item>
-        <item name="android:shadowDy">1.0</item>
-        <item name="android:shadowRadius">4.0</item>
+        <item name="android:background">@drawable/drop_target_frame</item>
     </style>
 
     <style name="DropTargetButton" parent="DropTargetButtonBase" />
diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
index a26217ce1c..00317f7010 100644
--- a/src/com/android/launcher3/ButtonDropTarget.java
+++ b/src/com/android/launcher3/ButtonDropTarget.java
@@ -36,6 +36,8 @@ import android.view.accessibility.AccessibilityEvent;
 import android.widget.PopupWindow;
 import android.widget.TextView;
 
+import androidx.appcompat.content.res.AppCompatResources;
+
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.dragndrop.DragController;
 import com.android.launcher3.dragndrop.DragLayer;
@@ -142,6 +144,11 @@ public abstract class ButtonDropTarget extends TextView
         }
     }
 
+    private void setBackgroundDrawable(int resId) {
+        Drawable bd = AppCompatResources.getDrawable(getContext(), resId);
+        setBackground(bd);
+    }
+
     @Override
     public final void onDragEnter(DragObject d) {
         if (!mAccessibleDrag && !mTextVisible) {
@@ -167,6 +174,7 @@ public abstract class ButtonDropTarget extends TextView
         }
 
         d.dragView.setAlpha(DRAG_VIEW_HOVER_OVER_OPACITY);
+        setBackgroundDrawable(R.drawable.drop_target_frame_hover);
         if (d.stateAnnouncer != null) {
             d.stateAnnouncer.cancel();
         }
@@ -184,6 +192,7 @@ public abstract class ButtonDropTarget extends TextView
 
         if (!d.dragComplete) {
             d.dragView.setAlpha(1f);
+            setBackgroundDrawable(R.drawable.drop_target_frame);
         } else {
             d.dragView.setAlpha(DRAG_VIEW_HOVER_OVER_OPACITY);
         }
diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java
index e46aad2bcf..80ec19281a 100644
--- a/src/com/android/launcher3/DeleteDropTarget.java
+++ b/src/com/android/launcher3/DeleteDropTarget.java
@@ -53,7 +53,7 @@ public class DeleteDropTarget extends ButtonDropTarget {
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
-        setDrawable(R.drawable.ic_remove_shadow);
+        setDrawable(R.drawable.ic_remove_no_shadow);
     }
 
     @Override
diff --git a/src/com/android/launcher3/SecondaryDropTarget.java b/src/com/android/launcher3/SecondaryDropTarget.java
index 858b72eb18..05cef386df 100644
--- a/src/com/android/launcher3/SecondaryDropTarget.java
+++ b/src/com/android/launcher3/SecondaryDropTarget.java
@@ -108,13 +108,13 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList
         mCurrentAccessibilityAction = action;
 
         if (action == UNINSTALL) {
-            setDrawable(R.drawable.ic_uninstall_shadow);
+            setDrawable(R.drawable.ic_uninstall_no_shadow);
             updateText(R.string.uninstall_drop_target_label);
         } else if (action == DISMISS_PREDICTION) {
-            setDrawable(R.drawable.ic_block_shadow);
+            setDrawable(R.drawable.ic_block_no_shadow);
             updateText(R.string.dismiss_prediction_label);
         } else if (action == RECONFIGURE) {
-            setDrawable(R.drawable.ic_setup_shadow);
+            setDrawable(R.drawable.ic_setting);
             updateText(R.string.gadget_setup_text);
         }
     }
-- 
GitLab


From 1777a1be4fe3554ee2bb135c2667b373eaa3dab8 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 28 Apr 2021 19:35:22 +0100
Subject: [PATCH 1015/1664] Use widget picker color surface for
 WidgetsBottomSheet

Test: Launch widgets bottom sheet, search popup to confirm the expected
      background color is applied.
Bug: 183601302
Change-Id: I300a364605e00a0d8046a907a40f4cb797ec161e
---
 ...ct_primary.xml => widgets_bottom_sheet_background.xml} | 8 ++++----
 res/layout/widgets_bottom_sheet.xml                       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename res/drawable/{top_round_rect_primary.xml => widgets_bottom_sheet_background.xml} (85%)

diff --git a/res/drawable/top_round_rect_primary.xml b/res/drawable/widgets_bottom_sheet_background.xml
similarity index 85%
rename from res/drawable/top_round_rect_primary.xml
rename to res/drawable/widgets_bottom_sheet_background.xml
index 1caaa026f0..faa414c506 100644
--- a/res/drawable/top_round_rect_primary.xml
+++ b/res/drawable/widgets_bottom_sheet_background.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2018 The Android Open Source Project
+     Copyright (C) 2021 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -15,12 +15,12 @@
      limitations under the License.
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-    <solid android:color="?android:attr/colorPrimary" />
+    android:shape="rectangle">
+    <solid android:color="@color/widgets_picker_surface" />
     <corners
         android:topLeftRadius="@dimen/bg_round_rect_radius"
         android:topRightRadius="@dimen/bg_round_rect_radius"
         android:bottomLeftRadius="0dp"
         android:bottomRightRadius="0dp"
         />
-</shape>
+</shape>
\ No newline at end of file
diff --git a/res/layout/widgets_bottom_sheet.xml b/res/layout/widgets_bottom_sheet.xml
index 8002d1ddc7..08635c6e60 100644
--- a/res/layout/widgets_bottom_sheet.xml
+++ b/res/layout/widgets_bottom_sheet.xml
@@ -20,7 +20,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingTop="16dp"
-    android:background="@drawable/top_round_rect_primary"
+    android:background="@drawable/widgets_bottom_sheet_background"
     android:elevation="@dimen/deep_shortcuts_elevation"
     android:layout_gravity="bottom"
     android:theme="?attr/widgetsTheme">
-- 
GitLab


From 1140f84b6f3610dce81624bd2e646dbdacbfb487 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Thu, 29 Apr 2021 17:44:14 +0100
Subject: [PATCH 1016/1664] Replace conversations widget app icon

Test: Open full widgets picker and observe the expected icon for
      the conversations category.
Bug: 184878454
Change-Id: I580b0148d39c8dd004113c8f966135b22165a329
---
 .../ic_conversations_widget_category.xml      | 46 +++++++++++++++++++
 .../widget/picker/WidgetsListHeader.java      | 10 +++-
 2 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 res/drawable/ic_conversations_widget_category.xml

diff --git a/res/drawable/ic_conversations_widget_category.xml b/res/drawable/ic_conversations_widget_category.xml
new file mode 100644
index 0000000000..7b13b239ac
--- /dev/null
+++ b/res/drawable/ic_conversations_widget_category.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="M24,24m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"
+      android:fillColor="#81C995"/>
+  <path
+      android:pathData="M27,34C23.134,34 20,30.866 20,27C20,23.134 23.134,20 27,20C30.866,20 34,23.134 34,27C34,28.4872 33.5362,29.8662 32.7453,31"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#3C4043"/>
+  <path
+      android:pathData="M35,33l-8,0l-0,2l8,0z"
+      android:fillColor="#3C4043"/>
+  <path
+      android:pathData="M21,21m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0"
+      android:fillColor="#81C995"/>
+  <path
+      android:pathData="M16,25h5v2h-5z"
+      android:fillColor="#81C995"/>
+  <path
+      android:pathData="M21,28C24.866,28 28,24.866 28,21C28,17.134 24.866,14 21,14C17.134,14 14,17.134 14,21C14,22.4872 14.4638,23.8662 15.2547,25"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#ffffff"/>
+  <path
+      android:pathData="M13,27h8v2h-8z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListHeader.java b/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
index ccf3187770..41aa4378f0 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
@@ -35,7 +35,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
-import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.icons.IconCache.ItemInfoUpdateReceiver;
 import com.android.launcher3.icons.PlaceHolderIconDrawable;
 import com.android.launcher3.icons.cache.HandlerRunnable;
@@ -174,7 +173,14 @@ public final class WidgetsListHeader extends LinearLayout implements ItemInfoUpd
     }
 
     private void setIcon(PackageItemInfo info) {
-        FastBitmapDrawable icon = info.newIcon(getContext());
+        Drawable icon;
+        switch (info.category) {
+            case PackageItemInfo.CONVERSATIONS:
+                icon = getContext().getDrawable(R.drawable.ic_conversations_widget_category);
+                break;
+            default:
+                icon = info.newIcon(getContext());
+        }
         applyDrawables(icon);
         mIconDrawable = icon;
         if (mIconDrawable != null) {
-- 
GitLab


From 290679571e3ba3f01d0bf6691ca70114dd5cb14f Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Mon, 26 Apr 2021 16:03:25 -0700
Subject: [PATCH 1017/1664] [LSC] Add LOCAL_LICENSE_KINDS to
 packages/apps/Launcher3

Added SPDX-license-identifier-Apache-2.0 to:
  Android.mk

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I68b3eb245ece3476ed1e5a6e08537efb438e5641
Merged-in: Ib2fe11ca0c8937b49323dfb4759a0a8770a5cfa6
Merged-in: I069f0fcd0652dcfd3e9c539e1f9bcb4c9225a10b
---
 Android.mk | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Android.mk b/Android.mk
index 2c595505ff..aff12c5e5f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -91,6 +91,9 @@ LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest-common.xml
 
 LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.*
 
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
 include $(BUILD_PACKAGE)
 
 #
@@ -124,6 +127,9 @@ LOCAL_FULL_LIBS_MANIFEST_FILES := \
 
 LOCAL_MANIFEST_FILE := go/AndroidManifest.xml
 LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.*
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
 include $(BUILD_PACKAGE)
 
 #
@@ -200,6 +206,9 @@ LOCAL_FULL_LIBS_MANIFEST_FILES := \
 LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml
 LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.*
 
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
 include $(BUILD_PACKAGE)
 
 
@@ -250,6 +259,9 @@ LOCAL_FULL_LIBS_MANIFEST_FILES := \
 
 LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml
 LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.*
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
 include $(BUILD_PACKAGE)
 
 
-- 
GitLab


From fdcf8103e00592a40866d005590f646cf875a4e4 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Thu, 29 Apr 2021 19:00:17 +0000
Subject: [PATCH 1018/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Ide1f0bfcb4a3a28bcdbc2d0ec830f77de864546f
---
 quickstep/res/values-ne/strings.xml | 96 ++++++++++-------------------
 1 file changed, 32 insertions(+), 64 deletions(-)

diff --git a/quickstep/res/values-ne/strings.xml b/quickstep/res/values-ne/strings.xml
index 99ad8143e9..f3b1151ef6 100644
--- a/quickstep/res/values-ne/strings.xml
+++ b/quickstep/res/values-ne/strings.xml
@@ -45,72 +45,40 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"सिफारिस गरिएका एपहरू देखाउने सुविधा सक्षम पारिएका छन्"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"सिफारिस गरिएका एपहरू देखाउने सुविधा असक्षम पारिएको छ"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"पूर्वानुमान गरिएको एप: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_left_edge (340972404868601012) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_left_edge (6671316150388702530) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_left_edge (3220478647881674266) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_right_edge (4306700023773832353) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled_right_edge (4951916546256902552) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete (7261221999760772210) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_swipe_in_nav_bar (1148198467090405643) -->
-    <skip />
-    <!-- no translation found for back_gesture_tutorial_confirm_subtitle (5181305411668713250) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_title (19551256430224428) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (7912576483031802797) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_swipe_too_far_from_edge (1446774096007065298) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_overview_detected (1557523944897393013) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_wrong_swipe_direction (6993979358080825438) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete (2324789183070815517) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_title (836590312858441830) -->
-    <skip />
-    <!-- no translation found for home_gesture_intro_subtitle (2632238748497975326) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_swipe_too_far_from_edge (3032757898111577225) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_home_detected (1411130969354020489) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_wrong_swipe_direction (6725820500906747925) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete (5477014491632199169) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_title (2902054412868489378) -->
-    <skip />
-    <!-- no translation found for overview_gesture_intro_subtitle (1579517193845186042) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_confirm_title (6201516182040074092) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_next (2556263116424738762) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_done (671834508127014231) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_settings (2923621047916486604) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_try_again (65962545858556697) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_nice (2936275692616928280) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_step (1279786122817620968) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"स्क्रिनको सबैभन्दा बायाँ किनाराबाट स्वाइप गर्नुहोस्।"</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"स्क्रिनको बायाँ किनाराबाट मध्य भागसम्म स्वाइप गर्नुहोस् अनि औँला उठाउनुहोस्।"</string>
+    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"यत्ति हो! अब दायाँ किनाराबाट स्वाइप गरी हेर्नुहोस्।"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"स्क्रिनको सबैभन्दा दायाँ किनाराबाट स्वाइप गर्नुहोस्।"</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"स्क्रिनको दायाँ किनाराबाट मध्य भागसम्म स्वाइप गर्नुहोस् अनि औँला उठाउनुहोस्।"</string>
+    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"तपाईंले \'पछाडि जानुहोस्\' नामक इसारा प्रयोग गर्ने तरिका सिक्नुभयो। अब होम स्क्रिनमा जाने तरिका सिक्नुहोस्।"</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"स्क्रिनको फेदको धेरै नजिकसम्म स्वाइप नगर्नुहोस्।"</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"\'पछाडि\' नामक इसाराको संवेदनशीलता बदल्न सेटिङमा जानुहोस्"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"पछाडि जान स्वाइप गर्नुहोस्"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"यसअघिको स्क्रिनमा फर्कन स्क्रिनको बायाँ वा दायाँ किनाराबाट मध्य भागसम्म स्वाइप गर्नुहोस्।"</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"स्क्रिनको फेदबाट माथितिर स्वाइप गर्नुहोस्।"</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"औँला उठाउनुअघि नरोकिनुहोस्।"</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"सीधै माथितिर स्वाइप गर्नुहोस्।"</string>
+    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"तपाईंले \'होम स्क्रिनमा जानुहोस्\' नामक इसारा प्रयोग गर्ने तरिका सिक्नुभयो। अब एउटा एपबाट अर्को एपमा जाने तरिका सिक्नुहोस्।"</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"होम स्क्रिनमा जान स्वाइप गर्नुहोस्"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"स्क्रिनको फेदबाट माथितिर स्वाइप गर्नुहोस्। यो इसारा प्रयोग गर्दा सधैँ होम स्क्रिन खुल्छ।"</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"स्क्रिनको फेदबाट माथितिर स्वाइप गर्नुहोस्।"</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"स्क्रिनबाट औँला उठाउनुअघि एपको विन्डोमा केही बेर छोइराख्नुहोस्।"</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"सीधै माथितिर स्वाइप गर्नुहोस् अनि रोकिनुहोस्।"</string>
+    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"तपाईंले \'एउटा एपबाट अर्को एपमा जानुहोस्\' नामक इसारा प्रयोग गर्ने तरिका सिक्नुभयो। तपाईं अब आफ्नो फोन चलाउन सक्नुहुन्छ!"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"एउटा एपबाट अर्को एपमा जान स्वाइप गर्नुहोस्"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"स्क्रिनको फेदबाट माथितिर स्वाइप गर्नुहोस्, छोइराख्नुहोस् अनि औँला उठाउनुहोस्।"</string>
+    <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"सबै तयार छ"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"अर्को"</string>
+    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"सम्पन्न भयो"</string>
+    <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"सेटिङ"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"फेरि प्रयास गर्नुहोस्"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"राम्रो!"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"ट्युटोरियल <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="action_share" msgid="2648470652637092375">"सेयर गर्नुहोस्"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"स्क्रिनसट"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"यो एप वा तपाईंको सङ्गठनले यो कारबाही गर्ने अनुमति दिँदैन"</string>
-    <!-- no translation found for skip_tutorial_dialog_title (2725643161260038458) -->
-    <skip />
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"नेभिगेसन ट्युटोरियल स्किप गर्ने हो?"</string>
     <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"तपाईं पछि <xliff:g id="NAME">%1$s</xliff:g> एपमा गई यो ट्युटोरियल भेट्टाउन सक्नुहुन्छ"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label_cancel (3809842569351264108) -->
-    <skip />
-    <!-- no translation found for gesture_tutorial_action_button_label_skip (394452764989751960) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"रद्द गर्नुहोस्"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"स्किप गर्नु…"</string>
 </resources>
-- 
GitLab


From a7e17232a0890f8da156a6d87076011f5593b5c5 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Thu, 29 Apr 2021 19:00:55 +0000
Subject: [PATCH 1019/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I9097c2e5797ad0b1b256e3e731dc0aa917aa4513
---
 res/values-ne/strings.xml | 76 ++++++++++++++++-----------------------
 res/values-pt/strings.xml |  2 +-
 2 files changed, 31 insertions(+), 47 deletions(-)

diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 9c348e37f4..30588fef73 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -26,47 +26,39 @@
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"सुरक्षित मोडमा डाउनलोड गरेको एप अक्षम गरिएको छ"</string>
     <string name="safemode_widget_error" msgid="4863470563535682004">"सुरक्षित मोडमा विगेटहरू अक्षम गरियो"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"सर्टकट उपलब्ध छैन"</string>
-    <!-- no translation found for home_screen (5629429142036709174) -->
-    <skip />
-    <!-- no translation found for recent_task_option_split_screen (6690461455618725183) -->
-    <skip />
-    <!-- no translation found for long_press_widget_to_add (3587712543577675817) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add (2733588281439571974) -->
-    <skip />
+    <string name="home_screen" msgid="5629429142036709174">"होम"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"स्प्लिट स्क्रिन"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"कुनै विजेट सार्न डबल ट्याप गरेर छोइराख्नुहोस्।"</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"कुनै विजेट सार्न वा आफ्नो रोजाइका कारबाही प्रयोग गर्न डबल ट्याप गरेर छोइराख्नुहोस्।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d चौडाइ गुणा %2$d उचाइ"</string>
     <string name="add_item_request_drag_hint" msgid="5899764264480397019">"थप्न टच एण्ड होल्ड गर्नुहोस्"</string>
     <string name="place_automatically" msgid="8064208734425456485">"स्वतः थप्नुहोस्"</string>
-    <!-- no translation found for widgets_count (656794749266073027) -->
-    <!-- no translation found for shortcuts_count (8080294865447938455) -->
-    <!-- no translation found for widgets_and_shortcuts_count (7209136747878365116) -->
-    <skip />
+    <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> वटा विजेट</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> वटा विजेट</item>
+    </plurals>
+    <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
+      <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> वटा सर्टकट</item>
+      <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> वटा सर्टकट</item>
+    </plurals>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"विजेटहरू"</string>
-    <!-- no translation found for widgets_full_sheet_search_bar_hint (8484659090860596457) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_cancel_button_description (5766167035728653605) -->
-    <skip />
-    <!-- no translation found for no_widgets_available (9140948620298620513) -->
-    <skip />
-    <!-- no translation found for no_search_results (6518732304311458580) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_personal_tab (2743540105607120182) -->
-    <skip />
-    <!-- no translation found for widgets_full_sheet_work_tab (3767150027110633765) -->
-    <skip />
-    <!-- no translation found for widget_category_conversations (8894438636213590446) -->
-    <skip />
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"खोज्नुहोस्"</string>
+    <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"खोज बाकसमा भएको पाठ हटाउनुहोस्"</string>
+    <string name="no_widgets_available" msgid="9140948620298620513">"कुनै पनि विजेट उपलब्ध छैन"</string>
+    <string name="no_search_results" msgid="6518732304311458580">"कुनै पनि खोज परिणाम भेटिएन"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"व्यक्तिगत"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"कामसम्बन्धी"</string>
+    <string name="widget_category_conversations" msgid="8894438636213590446">"वार्तालापहरू"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"खोजसम्बन्धी एपहरू"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"एपहरू लोड गर्दै…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" सँग मिल्दो कुनै एप भेटिएन"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"थप एपहरू खोज्नुहोस्"</string>
     <string name="label_application" msgid="8531721983832654978">"एप"</string>
     <string name="notifications_header" msgid="1404149926117359025">"सूचनाहरू"</string>
-    <!-- no translation found for long_press_shortcut_to_add (5405328730817637737) -->
-    <skip />
-    <!-- no translation found for long_accessible_way_to_add_shortcut (2199537273817090740) -->
-    <skip />
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"कुनै सर्टकट सार्न डबल ट्याप गरेर छोइराख्नुहोस्।"</string>
+    <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"कुनै सर्टकट सार्न वा आफ्नो रोजाइका कारबाही प्रयोग गर्न डबल ट्याप गरेर छोइराख्नुहोस्।"</string>
     <string name="out_of_space" msgid="4691004494942118364">"यो गृह स्क्रिनमा कुनै थप ठाउँ छैन।"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"मन पर्ने ट्रे अब कुनै ठाँउ छैन"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"एपको सूची"</string>
@@ -124,8 +116,7 @@
     <string name="abandoned_search" msgid="891119232568284442">"खोजी गर्नुहोस्"</string>
     <string name="abandoned_promises_title" msgid="7096178467971716750">"यो एप स्थापित छैन"</string>
     <string name="abandoned_promise_explanation" msgid="3990027586878167529">"यो प्रतिमाका लागि एपलाई स्थापना गरिएको छैन। तपाईं यसलाई हटाउन, वा एप खोजी र स्वयं यो स्थापित गर्न सक्नुहुन्छ।"</string>
-    <!-- no translation found for app_installing_title (5864044122733792085) -->
-    <skip />
+    <string name="app_installing_title" msgid="5864044122733792085">"<xliff:g id="NAME">%1$s</xliff:g> इन्स्टल गरिँदै छ, <xliff:g id="PROGRESS">%2$s</xliff:g> पूरा भयो"</string>
     <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> डाउनलोड गर्दै, <xliff:g id="PROGRESS">%2$s</xliff:g> सम्पन्‍न"</string>
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> स्थापना गर्न प्रतीक्षा गर्दै"</string>
     <string name="widgets_list" msgid="796804551140113767">"विजेटहरूको सूची"</string>
@@ -165,20 +156,13 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"अर्को"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"बुझेँ"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"कार्यालयको प्रोफाइल अस्थायी रूपमा रोक्का गरिएको छ"</string>
-    <!-- no translation found for work_apps_paused_body (4209084728264328628) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_content_description (4473292417145736203) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_banner (8872412121608402058) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_edu_accept (6377476824357318532) -->
-    <skip />
-    <!-- no translation found for work_apps_pause_btn_text (4669288269140620646) -->
-    <skip />
-    <!-- no translation found for work_apps_enable_btn_text (82111102541971856) -->
-    <skip />
-    <!-- no translation found for developer_options_filter_hint (5896817443635989056) -->
-    <skip />
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"कामसम्बन्धी एपहरूले तपाईंलाई सूचना पठाउन, तपाईंको डिभाइसको ब्याट्री प्रयोग गर्न वा तपाईंको स्थान हेर्न सक्दैनन्"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"कामसम्बन्धी प्रोफाइल अस्थायी रूपमा रोक्का गरिएको छ। कामसम्बन्धी एपहरूले तपाईंलाई सूचना पठाउन, तपाईंको डिभाइसको ब्याट्री प्रयोग गर्न वा तपाईंको स्थान हेर्न सक्दैनन्"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"कामसम्बन्धी एपमा ब्याज अङ्कित हुन्छ र तपाईंका IT एड्मिन ती एप हेर्न सक्नुहुन्छ"</string>
+    <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"बुझेँ"</string>
+    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"कामसम्बन्धी एपहरू अस्थायी रूपमा रोक्का गर्नुहोस्"</string>
+    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"अन गर्नुहोस्"</string>
+    <string name="developer_options_filter_hint" msgid="5896817443635989056">"फिल्टर"</string>
     <string name="work_switch_tip" msgid="808075064383839144">"कामसम्बन्धी एप र सूचनाहरू अस्थायी रूपमा रोक्का गर्नुहोस्"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"कार्य पूरा गर्न सकिएन: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 165a0133ec..faa5d921ec 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -51,7 +51,7 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Pessoal"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Trabalho"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversas"</string>
-    <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Apps de pesquisa"</string>
+    <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Pesquisar apps"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Carregando apps…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nenhum app encontrado que corresponda a \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Pesquisar mais apps"</string>
-- 
GitLab


From 05b59c080fe78236bfab817a8fbd2f383bc1d8fd Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 29 Apr 2021 13:55:40 -0700
Subject: [PATCH 1020/1664] Calling pageTransisionEnd only after edgeEffect
 finishes

Bug: 186605795
Test: Presubmit
Change-Id: I2b46d0b0a47c68038f300e71ab89bd7e5a5e3895
---
 src/com/android/launcher3/PagedView.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index c9cc3721a8..f7de3cac71 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -388,7 +388,8 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
     }
 
     protected void pageEndTransition() {
-        if (mIsPageInTransition) {
+        if (mIsPageInTransition && !mIsBeingDragged && mScroller.isFinished()
+                && mEdgeGlowLeft.isFinished() && mEdgeGlowRight.isFinished()) {
             mIsPageInTransition = false;
             onPageEndTransition();
         }
@@ -1740,6 +1741,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
     public void draw(Canvas canvas) {
         super.draw(canvas);
         drawEdgeEffect(canvas);
+        pageEndTransition();
     }
 
     protected void drawEdgeEffect(Canvas canvas) {
-- 
GitLab


From 284b6ed6a799b8a8e66de9197e72b661db0d414a Mon Sep 17 00:00:00 2001
From: Zak Cohen <zakcohen@google.com>
Date: Thu, 29 Apr 2021 14:20:19 -0700
Subject: [PATCH 1021/1664] Arrow popup - adjust margin to account for RTL and
 LTR.

Bug: 185887218
Test: Local in ltr and rtl
Change-Id: I50d1e9dbc64dc02f31661d91a6c9a90e4383c5c7
---
 src/com/android/launcher3/views/ArrowTipView.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/launcher3/views/ArrowTipView.java b/src/com/android/launcher3/views/ArrowTipView.java
index 89ff8216c9..97c43ef846 100644
--- a/src/com/android/launcher3/views/ArrowTipView.java
+++ b/src/com/android/launcher3/views/ArrowTipView.java
@@ -148,6 +148,10 @@ public class ArrowTipView extends AbstractFloatingView {
         LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) findViewById(
                 R.id.arrow).getLayoutParams();
         lp.gravity = gravity;
+
+        if (parent.getLayoutDirection() == LAYOUT_DIRECTION_RTL) {
+            arrowMarginStart = parent.getMeasuredWidth() - arrowMarginStart;
+        }
         if (gravity == Gravity.END) {
             lp.setMarginEnd(parent.getMeasuredWidth() - arrowMarginStart);
         } else if (gravity == Gravity.START) {
-- 
GitLab


From 0c4d278ed2f4602c3ae20e63145eade1b6fc0ba0 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Thu, 29 Apr 2021 15:56:13 -0700
Subject: [PATCH 1022/1664] Don't fade out active page outline during
 drag-and-drop

=> Keep page backgrounds stable and only slightly modify the alpha + add stroke for active page
=> Don't shrink cell outlines to be too small (issue in hotseat on some devices)
=> Reduce cell radius to 22dp

Bug: 185163323
Test: manual

Change-Id: Ic17999f5672a3355dceeb25af923f02e960389d9
---
 res/color/cell_layout_bg_color_active.xml   |  2 +-
 res/color/cell_layout_bg_color_inactive.xml |  2 +-
 res/values/config.xml                       |  2 +-
 res/values/dimens.xml                       |  2 +-
 src/com/android/launcher3/CellLayout.java   | 25 ++++++++++++---------
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/res/color/cell_layout_bg_color_active.xml b/res/color/cell_layout_bg_color_active.xml
index e826489944..d1a3d7c48f 100644
--- a/res/color/cell_layout_bg_color_active.xml
+++ b/res/color/cell_layout_bg_color_active.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:alpha="0.4"
+    <item android:alpha="0.3"
       android:color="?android:attr/colorAccent"/>
 </selector>
diff --git a/res/color/cell_layout_bg_color_inactive.xml b/res/color/cell_layout_bg_color_inactive.xml
index d60a27a120..0632100dfc 100644
--- a/res/color/cell_layout_bg_color_inactive.xml
+++ b/res/color/cell_layout_bg_color_inactive.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:alpha="0.3"
+    <item android:alpha="0.25"
         android:color="?android:attr/colorAccent"/>
 </selector>
\ No newline at end of file
diff --git a/res/values/config.xml b/res/values/config.xml
index f8a517d1d0..1e7837353f 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -35,7 +35,7 @@
     <!-- Workspace -->
     <!-- The duration (in ms) of the fade animation on the object outlines, used when
          we are dragging objects around on the home screen. -->
-    <integer name="config_dragOutlineFadeTime">900</integer>
+    <integer name="config_dragOutlineFadeTime">500</integer>
 
     <!-- The alpha value at which to show the most recent drop visualization outline. -->
     <integer name="config_dragOutlineMaxAlpha">255</integer>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 600a550700..0a6cce943c 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -293,7 +293,7 @@
     <dimen name="overview_task_margin">0dp</dimen>
 
 <!-- Workspace grid visualization parameters -->
-    <dimen name="grid_visualization_rounding_radius">28dp</dimen>
+    <dimen name="grid_visualization_rounding_radius">22dp</dimen>
     <dimen name="grid_visualization_cell_spacing">6dp</dimen>
 
 </resources>
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index c3816ccf0c..2f755e11e0 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -502,7 +502,7 @@ public class CellLayout extends ViewGroup {
     }
 
     private void updateBgAlpha() {
-        mBackground.setAlpha((int) (mSpringLoadedProgress * mScrollProgress * 255));
+        mBackground.setAlpha((int) (mSpringLoadedProgress * 255));
     }
 
     /**
@@ -525,9 +525,12 @@ public class CellLayout extends ViewGroup {
     }
 
     protected void visualizeGrid(Canvas canvas) {
-        mVisualizeGridRect.set(mGridVisualizationPadding, mGridVisualizationPadding,
-                mCellWidth - mGridVisualizationPadding,
-                mCellHeight - mGridVisualizationPadding);
+        DeviceProfile dp = mActivity.getDeviceProfile();
+        int paddingX = (int) Math.min((mCellWidth - dp.iconSizePx) / 2, mGridVisualizationPadding);
+        int paddingY = (int) Math.min((mCellHeight - dp.iconSizePx) / 2, mGridVisualizationPadding);
+        mVisualizeGridRect.set(paddingX, paddingY,
+                mCellWidth - paddingX,
+                mCellHeight - paddingY);
 
         mVisualizeGridPaint.setStrokeWidth(8);
         int paintAlpha = (int) (120 * mGridAlpha);
@@ -537,9 +540,9 @@ public class CellLayout extends ViewGroup {
             for (int i = 0; i < mCountX; i++) {
                 for (int j = 0; j < mCountY; j++) {
                     int transX = i * mCellWidth + (i * mBorderSpacing) + getPaddingLeft()
-                            + mGridVisualizationPadding;
+                            + paddingX;
                     int transY = j * mCellHeight + (j * mBorderSpacing) + getPaddingTop()
-                            + mGridVisualizationPadding;
+                            + paddingY;
 
                     mVisualizeGridRect.offsetTo(transX, transY);
                     mVisualizeGridPaint.setStyle(Paint.Style.FILL);
@@ -560,14 +563,14 @@ public class CellLayout extends ViewGroup {
                 int spanX = mDragOutlines[i].cellHSpan;
                 int spanY = mDragOutlines[i].cellVSpan;
 
-                mVisualizeGridRect.set(mGridVisualizationPadding, mGridVisualizationPadding,
-                        mCellWidth * spanX - mGridVisualizationPadding,
-                        mCellHeight * spanY - mGridVisualizationPadding);
+                mVisualizeGridRect.set(paddingX, paddingY,
+                        mCellWidth * spanX - paddingX,
+                        mCellHeight * spanY - paddingY);
 
                 int transX = x * mCellWidth + (x * mBorderSpacing)
-                        + getPaddingLeft() + mGridVisualizationPadding;
+                        + getPaddingLeft() + paddingX;
                 int transY = y * mCellHeight + (y * mBorderSpacing)
-                        + getPaddingTop() + mGridVisualizationPadding;
+                        + getPaddingTop() + paddingY;
 
                 mVisualizeGridRect.offsetTo(transX, transY);
 
-- 
GitLab


From cf38c65dc4b5e202582cdaea80ceefb8adc9fea6 Mon Sep 17 00:00:00 2001
From: Zak Cohen <zakcohen@google.com>
Date: Thu, 29 Apr 2021 16:15:03 -0700
Subject: [PATCH 1023/1664] Fade overview actions on transition to Home.

Bug: 184696445
Fixes: 184696445
Test: Local build and flash
Change-Id: I950a08b1528ba983157615f99c21f06de220d414
---
 .../src/com/android/quickstep/util/OverviewToHomeAnim.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java b/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
index 1128dac82e..42be9bbe13 100644
--- a/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
+++ b/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
@@ -20,7 +20,7 @@ import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.anim.Interpolators.DEACCEL;
 import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 import static com.android.launcher3.anim.Interpolators.FINAL_FRAME;
-import static com.android.launcher3.anim.Interpolators.INSTANT;
+import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.Interpolators.clampToProgress;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_ACTIONS_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE;
@@ -109,7 +109,7 @@ public class OverviewToHomeAnim {
                 ? clampToProgress(FAST_OUT_SLOW_IN, 0, 0.75f) : FINAL_FRAME);
         config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, FINAL_FRAME);
         config.setInterpolator(ANIM_OVERVIEW_SCALE, FINAL_FRAME);
-        config.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, INSTANT);
+        config.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, LINEAR);
         if (!isLayoutNaturalToLauncher) {
             config.setInterpolator(ANIM_OVERVIEW_FADE, DEACCEL);
         }
-- 
GitLab


From d2e91bace47b65cb2869795ed43329296713c985 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 29 Apr 2021 16:23:58 -0700
Subject: [PATCH 1024/1664] Take screenshot on ui helper thread in live tile

- Unify the live tile/non-live tile flow for taking a screenshot
  and post it to the ui helper thread

Bug: 186455799
Test: Test to verify that snapshots are still updated correctly
Change-Id: I26759419adf89c73602589da531bbc494b5c29e3
---
 .../android/quickstep/AbsSwipeUpHandler.java  | 34 ++++++++-----------
 .../android/quickstep/views/RecentsView.java  |  5 ---
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 53f1fd0809..a20de10279 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1408,23 +1408,17 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     }
 
     protected void switchToScreenshot() {
-        final int runningTaskId = mGestureState.getRunningTaskId();
-        if (LIVE_TILE.get()) {
-            if (mRecentsAnimationController != null) {
-                mRecentsAnimationController.getController().setWillFinishToHome(true);
-                // Update the screenshot of the task
-                if (mTaskSnapshot == null) {
-                    mTaskSnapshot = mRecentsAnimationController.screenshotTask(runningTaskId);
-                }
-                mRecentsView.updateThumbnail(runningTaskId, mTaskSnapshot, false /* refreshNow */);
-            }
-            mStateCallback.setStateOnUiThread(STATE_SCREENSHOT_CAPTURED);
-        } else if (!hasTargets()) {
+        if (!hasTargets()) {
             // If there are no targets, then we don't need to capture anything
             mStateCallback.setStateOnUiThread(STATE_SCREENSHOT_CAPTURED);
         } else {
+            final int runningTaskId = mGestureState.getRunningTaskId();
+            final boolean refreshView = !LIVE_TILE.get() /* refreshView */;
             boolean finishTransitionPosted = false;
             if (mRecentsAnimationController != null) {
+                if (LIVE_TILE.get()) {
+                    mRecentsAnimationController.getController().setWillFinishToHome(true);
+                }
                 // Update the screenshot of the task
                 if (mTaskSnapshot == null) {
                     UI_HELPER_EXECUTOR.execute(() -> {
@@ -1433,14 +1427,14 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                                 mRecentsAnimationController.screenshotTask(runningTaskId);
                         MAIN_EXECUTOR.execute(() -> {
                             mTaskSnapshot = taskSnapshot;
-                            if (!updateThumbnail(runningTaskId)) {
+                            if (!updateThumbnail(runningTaskId, refreshView)) {
                                 setScreenshotCapturedState();
                             }
                         });
                     });
                     return;
                 }
-                finishTransitionPosted = updateThumbnail(runningTaskId);
+                finishTransitionPosted = updateThumbnail(runningTaskId, refreshView);
             }
             if (!finishTransitionPosted) {
                 setScreenshotCapturedState();
@@ -1449,17 +1443,17 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     }
 
     // Returns whether finish transition was posted.
-    private boolean updateThumbnail(int runningTaskId) {
+    private boolean updateThumbnail(int runningTaskId, boolean refreshView) {
         boolean finishTransitionPosted = false;
         final TaskView taskView;
-        if (mGestureState.getEndTarget() == HOME) {
-            // Capture the screenshot before finishing the transition to home to ensure it's
-            // taken in the correct orientation, but no need to update the thumbnail.
+        if (mGestureState.getEndTarget() == HOME || mGestureState.getEndTarget() == NEW_TASK) {
+            // Capture the screenshot before finishing the transition to home or quickswitching to
+            // ensure it's taken in the correct orientation, but no need to update the thumbnail.
             taskView = null;
         } else {
-            taskView = mRecentsView.updateThumbnail(runningTaskId, mTaskSnapshot);
+            taskView = mRecentsView.updateThumbnail(runningTaskId, mTaskSnapshot, refreshView);
         }
-        if (taskView != null && !mCanceled) {
+        if (taskView != null && refreshView && !mCanceled) {
             // Defer finishing the animation until the next launcher frame with the
             // new thumbnail
             finishTransitionPosted = ViewUtils.postFrameDrawn(taskView,
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 596f74688d..f6749d5b19 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -702,11 +702,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         return taskView;
     }
 
-    /** See {@link #updateThumbnail(int, ThumbnailData, boolean)} */
-    public TaskView updateThumbnail(int taskId, ThumbnailData thumbnailData) {
-        return updateThumbnail(taskId, thumbnailData, true /* refreshNow */);
-    }
-
     @Override
     protected void onWindowVisibilityChanged(int visibility) {
         super.onWindowVisibilityChanged(visibility);
-- 
GitLab


From 2b5124ec41d9f97879aca642045774e758d0d933 Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Wed, 28 Apr 2021 18:16:04 +0100
Subject: [PATCH 1025/1664] Fix some bugs in widget pickers.

- Update color of Educational tip view contents. Background colorAccentSecondary
in NexusLauncher above S, colorAccent otherwise (b/185834169)
- Update widget picker search bar color and its text font and color. (b/186423026)
- Update button padding and text in pin widget picker. (b/182994384, b/183601584)

Bug: 185834169
Bug: 186423026
Bug: 182994384
Bug: 183601584
Test: Manually tested
Change-Id: I36cd3ed2285677d0c164db8f57f6c90a5f247982
---
 res/color/arrow_tip_view_bg.xml               | 23 +++++++++++++++++++
 res/color/arrow_tip_view_content.xml          | 23 +++++++++++++++++++
 .../arrow_toast_rounded_background.xml        |  2 +-
 res/drawable/bg_widgets_searchbox.xml         |  2 +-
 res/layout/add_item_confirmation_activity.xml |  4 +++-
 res/layout/arrow_toast.xml                    |  5 ++--
 res/layout/widgets_search_bar.xml             |  2 +-
 res/values/strings.xml                        |  4 ++--
 .../android/launcher3/views/ArrowTipView.java |  6 +----
 .../launcher3/tapl/AddToHomeScreenPrompt.java |  2 +-
 10 files changed, 59 insertions(+), 14 deletions(-)
 create mode 100644 res/color/arrow_tip_view_bg.xml
 create mode 100644 res/color/arrow_tip_view_content.xml

diff --git a/res/color/arrow_tip_view_bg.xml b/res/color/arrow_tip_view_bg.xml
new file mode 100644
index 0000000000..91eed508b1
--- /dev/null
+++ b/res/color/arrow_tip_view_bg.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2021, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?android:attr/colorAccent" />
+</selector>
diff --git a/res/color/arrow_tip_view_content.xml b/res/color/arrow_tip_view_content.xml
new file mode 100644
index 0000000000..87c733e7ad
--- /dev/null
+++ b/res/color/arrow_tip_view_content.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2021, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@android:color/white" />
+</selector>
diff --git a/res/drawable/arrow_toast_rounded_background.xml b/res/drawable/arrow_toast_rounded_background.xml
index 52cc6fcb62..f3f2158186 100644
--- a/res/drawable/arrow_toast_rounded_background.xml
+++ b/res/drawable/arrow_toast_rounded_background.xml
@@ -14,6 +14,6 @@
     limitations under the License.
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="?android:attr/colorAccent" />
+    <solid android:color="@color/arrow_tip_view_bg" />
     <corners android:radius="8dp" />
 </shape>
diff --git a/res/drawable/bg_widgets_searchbox.xml b/res/drawable/bg_widgets_searchbox.xml
index 2a50a51fae..3230ac86b2 100644
--- a/res/drawable/bg_widgets_searchbox.xml
+++ b/res/drawable/bg_widgets_searchbox.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="?android:attr/textColorPrimaryInverse" />
+    <solid android:color="@color/widgets_picker_surface" />
     <corners android:radius="24dp" />
 </shape>
\ No newline at end of file
diff --git a/res/layout/add_item_confirmation_activity.xml b/res/layout/add_item_confirmation_activity.xml
index d5e7333614..3f45746c5f 100644
--- a/res/layout/add_item_confirmation_activity.xml
+++ b/res/layout/add_item_confirmation_activity.xml
@@ -53,6 +53,7 @@
             style="@style/Widget.DeviceDefault.Button.Rounded.Colored"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:paddingHorizontal="16dp"
             android:onClick="onCancelClick"
             android:text="@android:string/cancel" />
 
@@ -64,7 +65,8 @@
             style="@style/Widget.DeviceDefault.Button.Rounded.Colored"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:paddingHorizontal="16dp"
             android:onClick="onPlaceAutomaticallyClick"
-            android:text="@string/place_automatically" />
+            android:text="@string/add_to_home_screen" />
     </LinearLayout>
 </LinearLayout>
diff --git a/res/layout/arrow_toast.xml b/res/layout/arrow_toast.xml
index 0ec9981220..ae60e1bf06 100644
--- a/res/layout/arrow_toast.xml
+++ b/res/layout/arrow_toast.xml
@@ -16,6 +16,7 @@
 
 <merge
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="wrap_content"
     android:layout_width="wrap_content">
 
@@ -38,7 +39,7 @@
             android:paddingBottom="5dp"
             android:gravity="center"
             android:layout_gravity="center_vertical"
-            android:textColor="@android:color/white"
+            android:textColor="@color/arrow_tip_view_content"
             android:textSize="16sp"/>
         <ImageView
             android:id="@+id/dismiss"
@@ -50,7 +51,7 @@
             android:layout_marginEnd="2dp"
             android:alpha="0.7"
             android:src="@drawable/ic_remove_no_shadow"
-            android:tint="@android:color/white"
+            android:tint="@color/arrow_tip_view_content"
             android:background="?android:attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/accessibility_close"/>
     </LinearLayout>
diff --git a/res/layout/widgets_search_bar.xml b/res/layout/widgets_search_bar.xml
index c3dd19e0bb..103f296a47 100644
--- a/res/layout/widgets_search_bar.xml
+++ b/res/layout/widgets_search_bar.xml
@@ -24,7 +24,7 @@
         android:layout_weight="1"
         android:inputType="text"
         android:imeOptions="actionSearch"
-        android:textColor="?android:attr/textColorSecondary"
+        android:textColor="?android:attr/textColorPrimary"
         android:textColorHint="?android:attr/textColorTertiary"/>
 
     <ImageButton
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0f937fac16..680e51a1bb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -57,8 +57,8 @@
     <string name="widget_accessible_dims_format">%1$d wide by %2$d high</string>
     <!-- Message to tell the user to press and hold a widget/icon to add it  -->
     <string name="add_item_request_drag_hint">Touch &amp; hold to place manually</string>
-    <!-- Button label to automatically add icon on home screen [CHAR_LIMIT=50] -->
-    <string name="place_automatically">Add automatically</string>
+    <!-- Button label to automatically add a widget to home screen [CHAR_LIMIT=50] -->
+    <string name="add_to_home_screen">Add to Home screen</string>
     <!-- Label for showing the number of widgets an app has in the full widgets picker.
          [CHAR_LIMIT=25] -->
     <plurals name="widgets_count">
diff --git a/src/com/android/launcher3/views/ArrowTipView.java b/src/com/android/launcher3/views/ArrowTipView.java
index 89ff8216c9..ddb0fce4a9 100644
--- a/src/com/android/launcher3/views/ArrowTipView.java
+++ b/src/com/android/launcher3/views/ArrowTipView.java
@@ -22,7 +22,6 @@ import android.graphics.Paint;
 import android.graphics.drawable.ShapeDrawable;
 import android.os.Handler;
 import android.util.Log;
-import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
@@ -108,10 +107,7 @@ public class ArrowTipView extends AbstractFloatingView {
         ShapeDrawable arrowDrawable = new ShapeDrawable(TriangleShape.create(
                 arrowLp.width, arrowLp.height, false));
         Paint arrowPaint = arrowDrawable.getPaint();
-        TypedValue typedValue = new TypedValue();
-        context.getTheme()
-                .resolveAttribute(android.R.attr.colorAccent, typedValue, true);
-        arrowPaint.setColor(ContextCompat.getColor(getContext(), typedValue.resourceId));
+        arrowPaint.setColor(ContextCompat.getColor(getContext(),  R.color.arrow_tip_view_bg));
         // The corner path effect won't be reflected in the shadow, but shouldn't be noticeable.
         arrowPaint.setPathEffect(new CornerPathEffect(
                 context.getResources().getDimension(R.dimen.arrow_toast_corner_radius)));
diff --git a/tests/tapl/com/android/launcher3/tapl/AddToHomeScreenPrompt.java b/tests/tapl/com/android/launcher3/tapl/AddToHomeScreenPrompt.java
index e1fde3ba8b..0582bc9557 100644
--- a/tests/tapl/com/android/launcher3/tapl/AddToHomeScreenPrompt.java
+++ b/tests/tapl/com/android/launcher3/tapl/AddToHomeScreenPrompt.java
@@ -28,7 +28,7 @@ import java.util.regex.Pattern;
 
 public class AddToHomeScreenPrompt {
     private static final Pattern ADD_AUTOMATICALLY =
-            Pattern.compile("^Add automatically$", CASE_INSENSITIVE);
+            Pattern.compile("^Add to Home screen$", CASE_INSENSITIVE);
     private final LauncherInstrumentation mLauncher;
     private final UiObject2 mWidgetCell;
 
-- 
GitLab


From 3bdfc3cd2d77715164fada62fdf27a57369646f5 Mon Sep 17 00:00:00 2001
From: Cyrus Boadway <boadway@google.com>
Date: Thu, 29 Apr 2021 11:35:04 +0000
Subject: [PATCH 1026/1664] Create return-to-home app widget animation

If an app has been most recently launched from an app widget, when
swiped away, the app animates to the widget's position.

This is done by attributing the app launch to the widget through
the ActivityOptions's launch cookies, and using a FloatingWidgetView
throughout the animation.

Bug: 169042867
Test: manual
Change-Id: I24c2623b5b3407504a4768b076849c47f73cbae0
---
 .../launcher3/BaseQuickstepLauncher.java      |   3 +-
 .../launcher3/QuickstepTransitionManager.java |   5 +-
 .../QuickstepInteractionHandler.java          |   5 +
 .../quickstep/LauncherSwipeHandlerV2.java     | 331 ++++++++++--------
 .../quickstep/SwipeUpAnimationLogic.java      |  12 +-
 .../quickstep/views/FloatingWidgetView.java   |  14 +-
 6 files changed, 219 insertions(+), 151 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 7aae38c7f1..9dbe9c225a 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -447,7 +447,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
             case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION:
             case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT:
             case LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT:
-                // Fall through and continue if it's an app or shortcut
+            case LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET:
+                // Fall through and continue if it's an app, shortcut, or widget
                 break;
             default:
                 return;
diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 1a464b14b2..6b190ed4b4 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -60,6 +60,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.SystemProperties;
 import android.util.Pair;
+import android.util.Size;
 import android.view.View;
 import android.view.animation.Interpolator;
 import android.view.animation.PathInterpolator;
@@ -781,7 +782,9 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
         final float finalWindowRadius = mDeviceProfile.isMultiWindowMode
                 ? 0 : getWindowCornerRadius(mLauncher.getResources());
         final FloatingWidgetView floatingView = FloatingWidgetView.getFloatingWidgetView(mLauncher,
-                v, widgetBackgroundBounds, windowTargetBounds, finalWindowRadius);
+                v, widgetBackgroundBounds,
+                new Size(windowTargetBounds.width(), windowTargetBounds.height()),
+                finalWindowRadius);
         final float initialWindowRadius = supportsRoundedCornersOnWindows(mLauncher.getResources())
                 ? floatingView.getInitialCornerRadius() : 0;
 
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
index 66e4f4c61c..5c19ab8bf4 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
@@ -23,6 +23,7 @@ import android.util.Pair;
 import android.view.View;
 import android.widget.RemoteViews;
 
+import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.util.ActivityOptionsWrapper;
 import com.android.launcher3.widget.LauncherAppWidgetHostView;
 
@@ -49,6 +50,10 @@ class QuickstepInteractionHandler implements RemoteViews.InteractionHandler {
         Pair<Intent, ActivityOptions> options = remoteResponse.getLaunchOptions(hostView);
         ActivityOptionsWrapper activityOptions = mLauncher.getAppTransitionManager()
                 .getActivityLaunchOptions(mLauncher, hostView);
+        Object itemInfo = hostView.getTag();
+        if (itemInfo instanceof ItemInfo) {
+            mLauncher.addLaunchCookie((ItemInfo) itemInfo, activityOptions.options);
+        }
         options = Pair.create(options.first, activityOptions.options);
         return RemoteViews.startPendingIntent(hostView, pendingIntent, options);
     }
diff --git a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
index dd35d68dcf..99c5baf37d 100644
--- a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
+++ b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
@@ -30,9 +30,11 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ValueAnimator;
 import android.content.Context;
+import android.graphics.Rect;
 import android.graphics.RectF;
 import android.os.IBinder;
 import android.os.UserHandle;
+import android.util.Size;
 import android.view.View;
 
 import androidx.annotation.NonNull;
@@ -50,9 +52,11 @@ import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.util.DynamicResource;
 import com.android.launcher3.util.ObjectWrapper;
 import com.android.launcher3.views.FloatingIconView;
+import com.android.launcher3.widget.LauncherAppWidgetHostView;
 import com.android.quickstep.util.AppCloseConfig;
 import com.android.quickstep.util.RectFSpringAnim;
 import com.android.quickstep.util.StaggeredWorkspaceAnim;
+import com.android.quickstep.views.FloatingWidgetView;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
 import com.android.systemui.plugins.ResourceProvider;
@@ -77,155 +81,206 @@ public class LauncherSwipeHandlerV2 extends
     @Override
     protected HomeAnimationFactory createHomeAnimationFactory(ArrayList<IBinder> launchCookies,
             long duration) {
-        HomeAnimationFactory homeAnimFactory;
-        if (mActivity != null) {
-            final View workspaceView = findWorkspaceView(launchCookies,
-                    mRecentsView.getRunningTaskView());
-            boolean canUseWorkspaceView =
-                    workspaceView != null && workspaceView.isAttachedToWindow();
-
-            mActivity.getRootView().setForceHideBackArrow(true);
-            mActivity.setHintUserWillBeActive();
-
-            if (canUseWorkspaceView) {
-                final ResourceProvider rp = DynamicResource.provider(mActivity);
-                final float transY = dpToPx(rp.getFloat(R.dimen.swipe_up_trans_y_dp));
-                float dpPerSecond = dpToPx(rp.getFloat(R.dimen.swipe_up_trans_y_dp_per_s));
-                final float launcherAlphaMax =
-                        rp.getFloat(R.dimen.swipe_up_launcher_alpha_max_progress);
-
-                RectF iconLocation = new RectF();
-                FloatingIconView floatingIconView = getFloatingIconView(mActivity, workspaceView,
-                        true /* hideOriginal */, iconLocation, false /* isOpening */);
-
-                // We want the window alpha to be 0 once this threshold is met, so that the
-                // FolderIconView can be seen morphing into the icon shape.
-                float windowAlphaThreshold = 1f - SHAPE_PROGRESS_DURATION;
-                homeAnimFactory = new LauncherHomeAnimationFactory() {
-
-                    // There is a delay in loading the icon, so we need to keep the window
-                    // opaque until it is ready.
-                    private boolean mIsFloatingIconReady = false;
-
-                    private @Nullable ValueAnimator mBounceBackAnimator;
+        if (mActivity == null) {
+            mStateCallback.addChangeListener(STATE_LAUNCHER_PRESENT | STATE_HANDLER_INVALIDATED,
+                    isPresent -> mRecentsView.startHome());
+            return new HomeAnimationFactory() {
+                @Override
+                public AnimatorPlaybackController createActivityAnimationToHome() {
+                    return AnimatorPlaybackController.wrap(new AnimatorSet(), duration);
+                }
+            };
+        }
 
-                    @Override
-                    public RectF getWindowTargetRect() {
-                        if (PROTOTYPE_APP_CLOSE.get()) {
-                            // We want the target rect to be at this offset position, so that all
-                            // launcher content can spring back upwards.
-                            floatingIconView.setPositionOffsetY(transY);
-                        }
-                        return iconLocation;
-                    }
+        final View workspaceView = findWorkspaceView(launchCookies,
+                mRecentsView.getRunningTaskView());
+        boolean canUseWorkspaceView = workspaceView != null && workspaceView.isAttachedToWindow();
 
-                    @Override
-                    public void setAnimation(RectFSpringAnim anim) {
-                        anim.addAnimatorListener(floatingIconView);
-                        floatingIconView.setOnTargetChangeListener(anim::onTargetPositionChanged);
-                        floatingIconView.setFastFinishRunnable(anim::end);
-                        if (PROTOTYPE_APP_CLOSE.get()) {
-                            mBounceBackAnimator = bounceBackToRestingPosition();
-                            // Use a spring to put drag layer translation back to 0.
-                            anim.addAnimatorListener(new AnimatorListenerAdapter() {
-                                @Override
-                                public void onAnimationEnd(Animator animation) {
-                                    floatingIconView.setPositionOffsetY(0);
-                                    mBounceBackAnimator.start();
-                                }
-                            });
-
-                            Workspace workspace = mActivity.getWorkspace();
-                            workspace.setPivotToScaleWithSelf(mActivity.getHotseat());
-                        }
-                    }
+        mActivity.getRootView().setForceHideBackArrow(true);
+        mActivity.setHintUserWillBeActive();
 
-                    private ValueAnimator bounceBackToRestingPosition() {
-                        DragLayer dl = mActivity.getDragLayer();
-                        Workspace workspace = mActivity.getWorkspace();
-                        Hotseat hotseat = mActivity.getHotseat();
-
-                        final float startValue = transY;
-                        final float endValue = 0;
-                        // Ensures the velocity is always aligned with the direction.
-                        float pixelPerSecond = Math.abs(dpPerSecond)
-                                * Math.signum(endValue - transY);
-
-                        ValueAnimator springTransY = new SpringAnimationBuilder(dl.getContext())
-                                .setStiffness(rp.getFloat(R.dimen.swipe_up_trans_y_stiffness))
-                                .setDampingRatio(rp.getFloat(R.dimen.swipe_up_trans_y_damping))
-                                .setMinimumVisibleChange(1f)
-                                .setStartValue(startValue)
-                                .setEndValue(endValue)
-                                .setStartVelocity(pixelPerSecond)
-                                .build(dl, VIEW_TRANSLATE_Y);
-                        springTransY.addListener(new AnimatorListenerAdapter() {
-                            @Override
-                            public void onAnimationEnd(Animator animation) {
-                                dl.setTranslationY(0f);
-                                dl.setAlpha(1f);
-                                SCALE_PROPERTY.set(workspace, 1f);
-                                SCALE_PROPERTY.set(hotseat, 1f);
-                            }
-                        });
-                        return springTransY;
-                    }
+        if (!canUseWorkspaceView) {
+            return new LauncherHomeAnimationFactory();
+        }
+        if (workspaceView instanceof LauncherAppWidgetHostView) {
+            return createWidgetHomeAnimationFactory((LauncherAppWidgetHostView) workspaceView);
+        }
+        return createIconHomeAnimationFactory(workspaceView);
+    }
 
-                    @Override
-                    public boolean keepWindowOpaque() {
-                        if (mIsFloatingIconReady || floatingIconView.isVisibleToUser()) {
-                            mIsFloatingIconReady = true;
-                            return false;
-                        }
-                        return true;
-                    }
+    private HomeAnimationFactory createIconHomeAnimationFactory(View workspaceView) {
+        final ResourceProvider rp = DynamicResource.provider(mActivity);
+        final float transY = dpToPx(rp.getFloat(R.dimen.swipe_up_trans_y_dp));
+        float dpPerSecond = dpToPx(rp.getFloat(R.dimen.swipe_up_trans_y_dp_per_s));
+        final float launcherAlphaMax =
+                rp.getFloat(R.dimen.swipe_up_launcher_alpha_max_progress);
+
+        RectF iconLocation = new RectF();
+        FloatingIconView floatingIconView = getFloatingIconView(mActivity, workspaceView,
+                true /* hideOriginal */, iconLocation, false /* isOpening */);
+
+        // We want the window alpha to be 0 once this threshold is met, so that the
+        // FolderIconView can be seen morphing into the icon shape.
+        float windowAlphaThreshold = 1f - SHAPE_PROGRESS_DURATION;
+        return new LauncherHomeAnimationFactory() {
+
+            // There is a delay in loading the icon, so we need to keep the window
+            // opaque until it is ready.
+            private boolean mIsFloatingIconReady = false;
+
+            private @Nullable ValueAnimator mBounceBackAnimator;
+
+            @Override
+            public RectF getWindowTargetRect() {
+                if (PROTOTYPE_APP_CLOSE.get()) {
+                    // We want the target rect to be at this offset position, so that all
+                    // launcher content can spring back upwards.
+                    floatingIconView.setPositionOffsetY(transY);
+                }
+                return iconLocation;
+            }
 
-                    @Override
-                    public void update(@Nullable AppCloseConfig config, RectF currentRect,
-                            float progress, float radius) {
-                        int fgAlpha = 255;
-                        if (config != null && PROTOTYPE_APP_CLOSE.get()) {
-                            DragLayer dl = mActivity.getDragLayer();
-                            float translationY = config.getWorkspaceTransY();
-                            dl.setTranslationY(translationY);
-
-                            float alpha = mapToRange(progress, 0, launcherAlphaMax, 0, 1f, LINEAR);
-                            dl.setAlpha(Math.min(alpha, 1f));
-
-                            float scale = Math.min(1f, config.getWorkspaceScale());
-                            SCALE_PROPERTY.set(mActivity.getWorkspace(), scale);
-                            SCALE_PROPERTY.set(mActivity.getHotseat(), scale);
-                            SCALE_PROPERTY.set(mActivity.getAppsView(), scale);
-
-                            progress = config.getInterpolatedProgress();
-                            fgAlpha = config.getFgAlpha();
+            @Override
+            public void setAnimation(RectFSpringAnim anim) {
+                anim.addAnimatorListener(floatingIconView);
+                floatingIconView.setOnTargetChangeListener(anim::onTargetPositionChanged);
+                floatingIconView.setFastFinishRunnable(anim::end);
+                if (PROTOTYPE_APP_CLOSE.get()) {
+                    mBounceBackAnimator = bounceBackToRestingPosition();
+                    // Use a spring to put drag layer translation back to 0.
+                    anim.addAnimatorListener(new AnimatorListenerAdapter() {
+                        @Override
+                        public void onAnimationEnd(Animator animation) {
+                            floatingIconView.setPositionOffsetY(0);
+                            mBounceBackAnimator.start();
                         }
-                        floatingIconView.update(1f, fgAlpha, currentRect, progress,
-                                windowAlphaThreshold, radius, false);
-                    }
+                    });
 
+                    Workspace workspace = mActivity.getWorkspace();
+                    workspace.setPivotToScaleWithSelf(mActivity.getHotseat());
+                }
+            }
+
+            private ValueAnimator bounceBackToRestingPosition() {
+                DragLayer dl = mActivity.getDragLayer();
+                Workspace workspace = mActivity.getWorkspace();
+                Hotseat hotseat = mActivity.getHotseat();
+
+                final float startValue = transY;
+                final float endValue = 0;
+                // Ensures the velocity is always aligned with the direction.
+                float pixelPerSecond = Math.abs(dpPerSecond) * Math.signum(endValue - transY);
+
+                ValueAnimator springTransY = new SpringAnimationBuilder(dl.getContext())
+                        .setStiffness(rp.getFloat(R.dimen.swipe_up_trans_y_stiffness))
+                        .setDampingRatio(rp.getFloat(R.dimen.swipe_up_trans_y_damping))
+                        .setMinimumVisibleChange(1f)
+                        .setStartValue(startValue)
+                        .setEndValue(endValue)
+                        .setStartVelocity(pixelPerSecond)
+                        .build(dl, VIEW_TRANSLATE_Y);
+                springTransY.addListener(new AnimatorListenerAdapter() {
                     @Override
-                    public void onCancel() {
-                        floatingIconView.fastFinish();
-                        if (mBounceBackAnimator != null) {
-                            mBounceBackAnimator.cancel();
-                        }
+                    public void onAnimationEnd(Animator animation) {
+                        dl.setTranslationY(0f);
+                        dl.setAlpha(1f);
+                        SCALE_PROPERTY.set(workspace, 1f);
+                        SCALE_PROPERTY.set(hotseat, 1f);
                     }
-                };
-            } else {
-                homeAnimFactory = new LauncherHomeAnimationFactory();
+                });
+                return springTransY;
             }
-        } else {
-            homeAnimFactory = new HomeAnimationFactory() {
-                @Override
-                public AnimatorPlaybackController createActivityAnimationToHome() {
-                    return AnimatorPlaybackController.wrap(new AnimatorSet(), duration);
+
+            @Override
+            public boolean keepWindowOpaque() {
+                if (mIsFloatingIconReady || floatingIconView.isVisibleToUser()) {
+                    mIsFloatingIconReady = true;
+                    return false;
                 }
-            };
-            mStateCallback.addChangeListener(STATE_LAUNCHER_PRESENT | STATE_HANDLER_INVALIDATED,
-                    isPresent -> mRecentsView.startHome());
-        }
-        return homeAnimFactory;
+                return true;
+            }
+
+            @Override
+            public void update(@Nullable AppCloseConfig config, RectF currentRect,
+                    float progress, float radius) {
+                int fgAlpha = 255;
+                if (config != null && PROTOTYPE_APP_CLOSE.get()) {
+                    DragLayer dl = mActivity.getDragLayer();
+                    float translationY = config.getWorkspaceTransY();
+                    dl.setTranslationY(translationY);
+
+                    float alpha = mapToRange(progress, 0, launcherAlphaMax, 0, 1f, LINEAR);
+                    dl.setAlpha(Math.min(alpha, 1f));
+
+                    float scale = Math.min(1f, config.getWorkspaceScale());
+                    SCALE_PROPERTY.set(mActivity.getWorkspace(), scale);
+                    SCALE_PROPERTY.set(mActivity.getHotseat(), scale);
+                    SCALE_PROPERTY.set(mActivity.getAppsView(), scale);
+
+                    progress = config.getInterpolatedProgress();
+                    fgAlpha = config.getFgAlpha();
+                }
+                floatingIconView.update(1f, fgAlpha, currentRect, progress,
+                        windowAlphaThreshold, radius, false);
+            }
+
+            @Override
+            public void onCancel() {
+                floatingIconView.fastFinish();
+                if (mBounceBackAnimator != null) {
+                    mBounceBackAnimator.cancel();
+                }
+            }
+        };
+    }
+
+    private HomeAnimationFactory createWidgetHomeAnimationFactory(
+            LauncherAppWidgetHostView hostView) {
+
+        RectF backgroundLocation = new RectF();
+        Rect crop = new Rect();
+        mTaskViewSimulator.getCurrentCropRect().roundOut(crop);
+        Size windowSize = new Size(crop.width(), crop.height());
+        FloatingWidgetView floatingWidgetView = FloatingWidgetView.getFloatingWidgetView(mActivity,
+                hostView, backgroundLocation, windowSize,
+                mTaskViewSimulator.getCurrentCornerRadius());
+
+        return new LauncherHomeAnimationFactory() {
+
+            @Override
+            public RectF getWindowTargetRect() {
+                return backgroundLocation;
+            }
+
+            @Override
+            public float getEndRadius(RectF cropRectF) {
+                return floatingWidgetView.getInitialCornerRadius();
+            }
+
+            @Override
+            public void setAnimation(RectFSpringAnim anim) {
+                anim.addAnimatorListener(floatingWidgetView);
+                floatingWidgetView.setFastFinishRunnable(anim::end);
+            }
+
+            @Override
+            public boolean keepWindowOpaque() {
+                return false;
+            }
+
+            @Override
+            public void update(@Nullable AppCloseConfig config, RectF currentRect,
+                    float progress, float radius) {
+                floatingWidgetView.update(currentRect, 1 /* floatingWidgetAlpha */,
+                        config != null ? config.getFgAlpha() : 1f /* foregroundAlpha */,
+                        0 /* fallbackBackgroundAlpha */, 1 - progress);
+            }
+
+            @Override
+            public void onCancel() {
+                floatingWidgetView.fastFinish();
+            }
+        };
     }
 
     /**
diff --git a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
index 0f34a72ad4..29a00d16b0 100644
--- a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
+++ b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
@@ -145,6 +145,11 @@ public abstract class SwipeUpAnimationLogic {
                     targetX + halfIconSize, targetY + halfIconSize);
         }
 
+        /** Returns the corner radius of the window at the end of the animation. */
+        public float getEndRadius(RectF cropRectF) {
+            return cropRectF.width() / 2f;
+        }
+
         public abstract @NonNull AnimatorPlaybackController createActivityAnimationToHome();
 
         public void playAtomicAnimation(float velocity) {
@@ -197,8 +202,7 @@ public abstract class SwipeUpAnimationLogic {
         final RectF targetRect = homeAnimationFactory.getWindowTargetRect();
 
         Matrix homeToWindowPositionMap = new Matrix();
-        final RectF startRect = updateProgressForStartRect(
-                homeToWindowPositionMap, startProgress);
+        final RectF startRect = updateProgressForStartRect(homeToWindowPositionMap, startProgress);
         RectF cropRectF = new RectF(mTaskViewSimulator.getCurrentCropRect());
 
         // Move the startRect to Launcher space as floatingIconView runs in Launcher
@@ -210,7 +214,7 @@ public abstract class SwipeUpAnimationLogic {
         if (PROTOTYPE_APP_CLOSE.get()) {
             anim = new RectFSpringAnim2(startRect, targetRect, mContext,
                     mTaskViewSimulator.getCurrentCornerRadius(),
-                    cropRectF.width() / 2f);
+                    homeAnimationFactory.getEndRadius(cropRectF));
         } else {
             anim = new RectFSpringAnim(startRect, targetRect, mContext);
         }
@@ -269,7 +273,7 @@ public abstract class SwipeUpAnimationLogic {
             // End on a "round-enough" radius so that the shape reveal doesn't have to do too much
             // rounding at the end of the animation.
             mStartRadius = mTaskViewSimulator.getCurrentCornerRadius();
-            mEndRadius = cropRectF.width() / 2f;
+            mEndRadius = factory.getEndRadius(cropRectF);
         }
 
         @Override
diff --git a/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java b/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java
index d23884c9ef..8499902f23 100644
--- a/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java
+++ b/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java
@@ -20,10 +20,10 @@ import android.animation.Animator.AnimatorListener;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.Matrix;
-import android.graphics.Rect;
 import android.graphics.RectF;
 import android.os.Build;
 import android.util.AttributeSet;
+import android.util.Size;
 import android.view.GhostView;
 import android.view.View;
 import android.view.ViewGroup;
@@ -113,7 +113,7 @@ public class FloatingWidgetView extends FrameLayout implements AnimatorListener
     }
 
     private void init(DragLayer dragLayer, LauncherAppWidgetHostView originalView,
-            RectF widgetBackgroundPosition, Rect windowTargetBounds, float windowCornerRadius) {
+            RectF widgetBackgroundPosition, Size windowSize, float windowCornerRadius) {
         mAppWidgetView = originalView;
         mAppWidgetView.beginDeferringUpdates();
         mBackgroundPosition = widgetBackgroundPosition;
@@ -128,7 +128,7 @@ public class FloatingWidgetView extends FrameLayout implements AnimatorListener
         getRelativePosition(mAppWidgetBackgroundView, mAppWidgetView, mBackgroundOffset);
         mBackgroundView.init(mAppWidgetView, mAppWidgetBackgroundView, windowCornerRadius);
         // Layout call before GhostView creation so that the overlaid view isn't clipped
-        layout(0, 0, windowTargetBounds.width(), windowTargetBounds.height());
+        layout(0, 0, windowSize.getWidth(), windowSize.getHeight());
         mForegroundOverlayView = GhostView.addGhost(mAppWidgetView, this);
         positionViews();
 
@@ -219,19 +219,19 @@ public class FloatingWidgetView extends FrameLayout implements AnimatorListener
      *
      * @param widgetBackgroundPosition a {@link RectF} that will be updated with the widget's
      *                                 background bounds
-     * @param windowTargetBounds       the bounds of the window when launched
+     * @param windowSize               the size of the window when launched
      * @param windowCornerRadius       the corner radius of the window
      */
     public static FloatingWidgetView getFloatingWidgetView(Launcher launcher,
             LauncherAppWidgetHostView originalView, RectF widgetBackgroundPosition,
-            Rect windowTargetBounds, float windowCornerRadius) {
+            Size windowSize, float windowCornerRadius) {
         final DragLayer dragLayer = launcher.getDragLayer();
         ViewGroup parent = (ViewGroup) dragLayer.getParent();
         FloatingWidgetView floatingView =
                 launcher.getViewCache().getView(R.layout.floating_widget_view, launcher, parent);
         floatingView.recycle();
 
-        floatingView.init(dragLayer, originalView, widgetBackgroundPosition, windowTargetBounds,
+        floatingView.init(dragLayer, originalView, widgetBackgroundPosition, windowSize,
                 windowCornerRadius);
         parent.addView(floatingView);
         return floatingView;
@@ -240,7 +240,7 @@ public class FloatingWidgetView extends FrameLayout implements AnimatorListener
     private static void getRelativePosition(View descendant, View ancestor, RectF position) {
         float[] points = new float[]{0, 0, descendant.getWidth(), descendant.getHeight()};
         Utilities.getDescendantCoordRelativeToAncestor(descendant, ancestor, points,
-                false /* includeRootScroll */);
+                false /* includeRootScroll */, true /* ignoreTransform */);
         position.set(
                 Math.min(points[0], points[2]),
                 Math.min(points[1], points[3]),
-- 
GitLab


From c16c2813059bcf5550e771a98429342a0cb6b698 Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Fri, 30 Apr 2021 10:23:26 +0100
Subject: [PATCH 1027/1664] Fix few A11y/ UI bugs for widget pickers

- Add a subtext in pin widget dialog informing users how to add widget
manually. This is not important for accessibility, as drag and drop is through an
action item for visually impaired users.
- Update search bar text hint color so that it passes accessibility test.

Bug: 182994384
Bug: 182993604
Test: Manually Tested using accessibility scanner app and talkback
Change-Id: I5a49d0bc3e5973b76c41b2a178af509e96a3cdd7
---
 res/layout/add_item_confirmation_activity.xml | 9 +++++++++
 res/layout/widgets_search_bar.xml             | 2 +-
 res/values/strings.xml                        | 5 +++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/res/layout/add_item_confirmation_activity.xml b/res/layout/add_item_confirmation_activity.xml
index 3f45746c5f..7c2f25b831 100644
--- a/res/layout/add_item_confirmation_activity.xml
+++ b/res/layout/add_item_confirmation_activity.xml
@@ -36,6 +36,15 @@
         android:singleLine="true"
         android:maxLines="1" />
 
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:paddingVertical="8dp"
+        android:text="@string/add_item_request_drag_hint"
+        android:textSize="14sp"
+        android:importantForAccessibility="no"/>
+
     <include layout="@layout/widget_cell"
         android:id="@+id/widget_cell"
         android:layout_width="match_parent"
diff --git a/res/layout/widgets_search_bar.xml b/res/layout/widgets_search_bar.xml
index 103f296a47..9a304eb96a 100644
--- a/res/layout/widgets_search_bar.xml
+++ b/res/layout/widgets_search_bar.xml
@@ -25,7 +25,7 @@
         android:inputType="text"
         android:imeOptions="actionSearch"
         android:textColor="?android:attr/textColorPrimary"
-        android:textColorHint="?android:attr/textColorTertiary"/>
+        android:textColorHint="?android:attr/textColorSecondary"/>
 
     <ImageButton
         android:id="@+id/widgets_search_cancel_button"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 680e51a1bb..d6936ab69d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -55,8 +55,9 @@
     <string name="widget_dims_format">%1$d \u00d7 %2$d</string>
     <!-- Accessibility spoken message format for the dimensions of a widget in the drawer -->
     <string name="widget_accessible_dims_format">%1$d wide by %2$d high</string>
-    <!-- Message to tell the user to press and hold a widget/icon to add it  -->
-    <string name="add_item_request_drag_hint">Touch &amp; hold to place manually</string>
+    <!-- Message to tell the user to press and hold a widget/icon to add it to the home screen.
+         [CHAR LIMIT=NONE]  -->
+    <string name="add_item_request_drag_hint">Touch &amp; hold the widget to move it around the Home screen</string>
     <!-- Button label to automatically add a widget to home screen [CHAR_LIMIT=50] -->
     <string name="add_to_home_screen">Add to Home screen</string>
     <!-- Label for showing the number of widgets an app has in the full widgets picker.
-- 
GitLab


From 0e092292fb96b8446994d4ea65b272ef1322ca85 Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pbdr@google.com>
Date: Fri, 30 Apr 2021 14:30:37 +0100
Subject: [PATCH 1028/1664] Correct "cropping" of widget picker's search bar

To corrent, I added 1dp of bottom margin. Not doing this, the framework
ignores the dropped shadow due to the elevation when some text is
entered in the box, leading to the observed cropping.

Fix: 186722040
Test: Manually
Change-Id: I746a8f014197552416ed9c40e9736baf22794c5f
---
 res/layout/widgets_search_bar.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/layout/widgets_search_bar.xml b/res/layout/widgets_search_bar.xml
index c3dd19e0bb..11acd40f96 100644
--- a/res/layout/widgets_search_bar.xml
+++ b/res/layout/widgets_search_bar.xml
@@ -6,6 +6,7 @@
     android:layout_height="wrap_content"
     android:orientation="horizontal"
     android:layout_marginTop="16dp"
+    android:layout_marginBottom="1dp"
     android:background="@drawable/bg_widgets_searchbox"
     android:elevation="2dp">
 
-- 
GitLab


From b745a2a9fdb47c656817de8233746f0015ad34b1 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 30 Apr 2021 13:38:22 -0700
Subject: [PATCH 1029/1664] Fixing transition end not getting called if
 pagedView is not drawing

Bug: 186822776
Test: Manual
Change-Id: I60e9028d17f39a4ad95f9aa79f8b4be695b4ae65
---
 src/com/android/launcher3/PagedView.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index f7de3cac71..fb216987c9 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -389,12 +389,18 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
 
     protected void pageEndTransition() {
         if (mIsPageInTransition && !mIsBeingDragged && mScroller.isFinished()
-                && mEdgeGlowLeft.isFinished() && mEdgeGlowRight.isFinished()) {
+                && (!isShown() || (mEdgeGlowLeft.isFinished() && mEdgeGlowRight.isFinished()))) {
             mIsPageInTransition = false;
             onPageEndTransition();
         }
     }
 
+    @Override
+    public void onVisibilityAggregated(boolean isVisible) {
+        pageEndTransition();
+        super.onVisibilityAggregated(isVisible);
+    }
+
     protected boolean isPageInTransition() {
         return mIsPageInTransition;
     }
-- 
GitLab


From 908e3d1312693682642a3093c11df13a9c1583d0 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 30 Apr 2021 14:18:08 -0700
Subject: [PATCH 1030/1664] Fixing nullPointer exception when wallpaper colors
 is null

Bug: 186722571
Test: Presubmit
Change-Id: Iee0d15d460de47cc20395cf9f3d92784aef6268e
---
 src/com/android/launcher3/util/Themes.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/util/Themes.java b/src/com/android/launcher3/util/Themes.java
index 11b856e266..99942aa56d 100644
--- a/src/com/android/launcher3/util/Themes.java
+++ b/src/com/android/launcher3/util/Themes.java
@@ -19,6 +19,7 @@ package com.android.launcher3.util;
 import static android.app.WallpaperColors.HINT_SUPPORTS_DARK_TEXT;
 import static android.app.WallpaperColors.HINT_SUPPORTS_DARK_THEME;
 
+import android.app.WallpaperColors;
 import android.app.WallpaperManager;
 import android.content.Context;
 import android.content.res.Configuration;
@@ -41,9 +42,14 @@ import com.android.launcher3.icons.GraphicsUtils;
 public class Themes {
 
     public static int getActivityThemeRes(Context context) {
-        int colorHints = Utilities.ATLEAST_P ? context.getSystemService(WallpaperManager.class)
-                .getWallpaperColors(WallpaperManager.FLAG_SYSTEM).getColorHints()
-                : 0;
+        final int colorHints;
+        if (Utilities.ATLEAST_P) {
+            WallpaperColors colors = context.getSystemService(WallpaperManager.class)
+                    .getWallpaperColors(WallpaperManager.FLAG_SYSTEM);
+            colorHints = colors == null ? 0 : colors.getColorHints();
+        } else {
+            colorHints = 0;
+        }
         return getActivityThemeRes(context, colorHints);
     }
 
-- 
GitLab


From 242c805f8269d65391f257deb062969910f791b6 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Fri, 30 Apr 2021 15:16:52 -0700
Subject: [PATCH 1031/1664] Use color extraction for arrow popup.

- Updated logic to accept any view that is a a child of draglayer
  (from being workspace dependent)
- Move color extraction logic from widget class to utility class.
- Initial CL, future CL will interpolate between colors
  and expand color extraction to other abstract floating views.

Bug: 175329686
Test: long press on colorful wallpaper and test colors are extracted
      test in multiwindow mode
Change-Id: I18a6bb5013de4eea7e9b45810401f5b9b3cd7302
---
 src/com/android/launcher3/CellLayout.java     |  11 +-
 src/com/android/launcher3/Utilities.java      |  50 ++++++++
 .../graphics/PreloadIconDrawable.java         |   6 +-
 .../android/launcher3/popup/ArrowPopup.java   | 105 ++++++++++++++++-
 .../launcher3/util/ColorExtractionUtils.java  | 110 ++++++++++++++++++
 src/com/android/launcher3/util/Themes.java    |   7 +-
 .../launcher3/views/FloatingIconView.java     |  11 +-
 .../widget/LauncherAppWidgetHostView.java     |  80 ++++---------
 .../launcher3/widget/LocalColorExtractor.java |   5 +-
 9 files changed, 299 insertions(+), 86 deletions(-)
 create mode 100644 src/com/android/launcher3/util/ColorExtractionUtils.java

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index c3816ccf0c..a037675029 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -18,6 +18,7 @@ package com.android.launcher3;
 
 import static android.animation.ValueAnimator.areAnimatorsEnabled;
 
+import static com.android.launcher3.Utilities.getBoundsForViewInDragLayer;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_1_5;
 
 import android.animation.Animator;
@@ -193,6 +194,7 @@ public class CellLayout extends ViewGroup {
     private static final int INVALID_DIRECTION = -100;
 
     private final Rect mTempRect = new Rect();
+    private final RectF mTempRectF = new RectF();
 
     private static final Paint sPaint = new Paint();
 
@@ -1067,11 +1069,16 @@ public class CellLayout extends ViewGroup {
         // Apply local extracted color if the DragView is an AppWidgetHostViewDrawable.
         View view = dragObject.dragView.getContentView();
         if (view instanceof LauncherAppWidgetHostView) {
-            Workspace workspace =
-                    Launcher.getLauncher(dragObject.dragView.getContext()).getWorkspace();
+            Launcher launcher = Launcher.getLauncher(dragObject.dragView.getContext());
+            Workspace workspace = launcher.getWorkspace();
             int screenId = workspace.getIdForScreen(this);
             int pageId = workspace.getPageIndexForScreenId(screenId);
             cellToRect(targetCell[0], targetCell[1], spanX, spanY, mTempRect);
+
+            // Now get the rect in drag layer coordinates.
+            getBoundsForViewInDragLayer(launcher.getDragLayer(), workspace, mTempRect, false,
+                    mTempRectF);
+            Utilities.setRect(mTempRectF, mTempRect);
             ((LauncherAppWidgetHostView) view).handleDrag(mTempRect, pageId);
         }
     }
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index a799b4a33a..073a46c0e0 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -33,6 +33,7 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ShortcutInfo;
+import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.database.ContentObserver;
 import android.graphics.Bitmap;
@@ -84,6 +85,7 @@ import com.android.launcher3.shortcuts.ShortcutKey;
 import com.android.launcher3.shortcuts.ShortcutRequest;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.PackageManagerHelper;
+import com.android.launcher3.views.BaseDragLayer;
 import com.android.launcher3.widget.PendingAddShortcutInfo;
 
 import java.lang.reflect.Method;
@@ -104,6 +106,8 @@ public final class Utilities {
     private static final Pattern sTrimPattern =
             Pattern.compile("^[\\s|\\p{javaSpaceChar}]*(.*)[\\s|\\p{javaSpaceChar}]*$");
 
+    private static final float[] sTmpFloatArray = new float[4];
+
     private static final int[] sLoc0 = new int[2];
     private static final int[] sLoc1 = new int[2];
     private static final Matrix sMatrix = new Matrix();
@@ -133,6 +137,15 @@ public final class Utilities {
             Build.TYPE.toLowerCase(Locale.ROOT).contains("debug") ||
             Build.TYPE.toLowerCase(Locale.ROOT).equals("eng");
 
+    /**
+     * Returns true if theme is dark.
+     */
+    public static boolean isDarkTheme(Context context) {
+        Configuration configuration = context.getResources().getConfiguration();
+        int nightMode = configuration.uiMode & Configuration.UI_MODE_NIGHT_MASK;
+        return nightMode == Configuration.UI_MODE_NIGHT_YES;
+    }
+
     public static boolean isDevelopersOptionsEnabled(Context context) {
         return Settings.Global.getInt(context.getApplicationContext().getContentResolver(),
                         Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0;
@@ -218,6 +231,33 @@ public final class Utilities {
         return scale;
     }
 
+    /**
+     * Returns bounds for a child view of DragLayer, in drag layer coordinates.
+     *
+     * see {@link com.android.launcher3.dragndrop.DragLayer}.
+     *
+     * @param viewBounds Bounds of the view wanted in drag layer coordinates, relative to the view
+     *                   itself. eg. (0, 0, view.getWidth, view.getHeight)
+     * @param ignoreTransform If true, view transform is ignored
+     * @param outRect The out rect where we return the bounds of {@param view} in drag layer coords.
+     */
+    public static void getBoundsForViewInDragLayer(BaseDragLayer dragLayer, View view,
+            Rect viewBounds, boolean ignoreTransform, RectF outRect) {
+        float[] points = sTmpFloatArray;
+        points[0] = viewBounds.left;
+        points[1] = viewBounds.top;
+        points[2] = viewBounds.right;
+        points[3] = viewBounds.bottom;
+
+        Utilities.getDescendantCoordRelativeToAncestor(view, dragLayer, points,
+                false, ignoreTransform);
+        outRect.set(
+                Math.min(points[0], points[2]),
+                Math.min(points[1], points[3]),
+                Math.max(points[0], points[2]),
+                Math.max(points[1], points[3]));
+    }
+
     /**
      * Inverse of {@link #getDescendantCoordRelativeToAncestor(View, View, float[], boolean)}.
      */
@@ -273,6 +313,16 @@ public final class Utilities {
         return new int[] {sLoc1[0] - sLoc0[0], sLoc1[1] - sLoc0[1]};
     }
 
+    /**
+     * Helper method to set rectOut with rectFSrc.
+     */
+    public static void setRect(RectF rectFSrc, Rect rectOut) {
+        rectOut.left = (int) rectFSrc.left;
+        rectOut.top = (int) rectFSrc.top;
+        rectOut.right = (int) rectFSrc.right;
+        rectOut.bottom = (int) rectFSrc.bottom;
+    }
+
     public static void scaleRectFAboutCenter(RectF r, float scale) {
         if (scale != 1.0f) {
             float cx = r.centerX();
diff --git a/src/com/android/launcher3/graphics/PreloadIconDrawable.java b/src/com/android/launcher3/graphics/PreloadIconDrawable.java
index 13ae866efb..e45b8f7918 100644
--- a/src/com/android/launcher3/graphics/PreloadIconDrawable.java
+++ b/src/com/android/launcher3/graphics/PreloadIconDrawable.java
@@ -21,7 +21,6 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.content.Context;
-import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Matrix;
@@ -34,6 +33,7 @@ import android.util.Property;
 import android.util.SparseArray;
 import android.view.ContextThemeWrapper;
 
+import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.icons.GraphicsUtils;
@@ -119,9 +119,7 @@ public class PreloadIconDrawable extends FastBitmapDrawable {
                 info,
                 IconPalette.getPreloadProgressColor(context, info.bitmap.color),
                 getPreloadColors(context),
-            (context.getResources().getConfiguration().uiMode
-                    & Configuration.UI_MODE_NIGHT_MASK
-                    & Configuration.UI_MODE_NIGHT_YES) != 0) /* isDarkMode */;
+                Utilities.isDarkTheme(context));
     }
 
     public PreloadIconDrawable(
diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java
index c19dfe9300..48c5d0a854 100644
--- a/src/com/android/launcher3/popup/ArrowPopup.java
+++ b/src/com/android/launcher3/popup/ArrowPopup.java
@@ -16,9 +16,9 @@
 
 package com.android.launcher3.popup;
 
-import static com.android.launcher3.AbstractFloatingView.getTopOpenViewWithType;
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.popup.PopupPopulator.MAX_SHORTCUTS;
+import static com.android.launcher3.util.ColorExtractionUtils.getColorExtractionRect;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -31,6 +31,7 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Outline;
 import android.graphics.Rect;
+import android.graphics.RectF;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
@@ -41,17 +42,21 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
+import android.view.ViewTreeObserver;
 import android.widget.FrameLayout;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.InsettableFrameLayout;
+import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAnimUtils;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.Workspace;
 import com.android.launcher3.anim.RevealOutlineAnimation;
 import com.android.launcher3.anim.RoundedRectRevealOutlineProvider;
 import com.android.launcher3.dragndrop.DragLayer;
@@ -59,9 +64,11 @@ import com.android.launcher3.shortcuts.DeepShortcutView;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.BaseDragLayer;
+import com.android.launcher3.widget.LocalColorExtractor;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 
 /**
  * A container for shortcuts to deep links and notifications associated with an app.
@@ -73,6 +80,9 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
 
     // +1 for system shortcut view
     private static final int MAX_NUM_CHILDREN = MAX_SHORTCUTS + 1;
+    // Index used to get background color when using local wallpaper color extraction,
+    private static final int LIGHT_COLOR_EXTRACTION_INDEX = android.R.color.system_accent2_50;
+    private static final int DARK_COLOR_EXTRACTION_INDEX = android.R.color.system_accent2_800;
 
     private final Rect mTempRect = new Rect();
 
@@ -104,8 +114,14 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
 
     private Runnable mOnCloseCallback = () -> { };
 
+    // The rect string of the view that the arrow is attached to, in screen reference frame.
+    private String mArrowColorRectString;
     private int mArrowColor;
     private final int[] mColors;
+    private final HashMap<String, View> mViewForRect = new HashMap<>();
+
+    private final int mColorExtractionIndex;
+    @Nullable private LocalColorExtractor mColorExtractor;
 
     public ArrowPopup(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
@@ -113,7 +129,9 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
         mOutlineRadius = Themes.getDialogCornerRadius(context);
         mLauncher = BaseDraggingActivity.fromContext(context);
         mIsRtl = Utilities.isRtl(getResources());
-
+        mColorExtractionIndex = Utilities.isDarkTheme(context)
+                ? DARK_COLOR_EXTRACTION_INDEX
+                : LIGHT_COLOR_EXTRACTION_INDEX;
         setClipToOutline(true);
         setOutlineProvider(new ViewOutlineProvider() {
             @Override
@@ -158,6 +176,10 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
                 mColors[i] =
                         (int) argb.evaluate((i + 1) * step, primaryColor, secondaryColor);
             }
+
+            if (Utilities.ATLEAST_S) {
+                setupColorExtraction();
+            }
         }
     }
 
@@ -342,6 +364,15 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
             // so we centered it instead. In that case we don't want to showDefaultOptions the arrow.
             mArrow.setVisibility(INVISIBLE);
         } else {
+            updateArrowColor();
+        }
+
+        mArrow.setPivotX(mArrowWidth / 2.0f);
+        mArrow.setPivotY(mIsAboveIcon ? mArrowHeight : 0);
+    }
+
+    private void updateArrowColor() {
+        if (!Gravity.isVertical(mGravity)) {
             mArrow.setBackground(new RoundedArrowDrawable(
                     mArrowWidth, mArrowHeight, mArrowPointRadius,
                     mOutlineRadius, getMeasuredWidth(), getMeasuredHeight(),
@@ -350,9 +381,6 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
                     mArrowColor));
             mArrow.setElevation(getElevation());
         }
-
-        mArrow.setPivotX(mArrowWidth / 2.0f);
-        mArrow.setPivotY(mIsAboveIcon ? mArrowHeight : 0);
     }
 
     /**
@@ -671,6 +699,11 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
         getPopupContainer().removeView(this);
         getPopupContainer().removeView(mArrow);
         mOnCloseCallback.run();
+        mArrowColorRectString = null;
+        mViewForRect.clear();
+        if (mColorExtractor != null) {
+            mColorExtractor.removeLocations();
+        }
     }
 
     /**
@@ -680,6 +713,68 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
         mOnCloseCallback = callback;
     }
 
+    private void setupColorExtraction() {
+        Workspace workspace = mLauncher.findViewById(R.id.workspace);
+        if (workspace == null) {
+            return;
+        }
+
+        mColorExtractor = LocalColorExtractor.newInstance(mLauncher);
+        mColorExtractor.setListener((rect, extractedColors) -> {
+            String rectString = rect.toShortString();
+            View v = mViewForRect.get(rectString);
+            if (v != null) {
+                int newColor = extractedColors.get(mColorExtractionIndex);
+                setChildColor(v, newColor);
+                if (rectString.equals(mArrowColorRectString)) {
+                    mArrowColor = newColor;
+                    updateArrowColor();
+                }
+            }
+        });
+
+        getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
+            @Override
+            public boolean onPreDraw() {
+                getViewTreeObserver().removeOnPreDrawListener(this);
+
+                ArrayList<RectF> locations = new ArrayList<>();
+                Rect r = new Rect();
+
+                int count = getChildCount();
+                int numVisibleChild = 0;
+                for (int i = 0; i < count; i++) {
+                    View view = getChildAt(i);
+                    if (view.getVisibility() == VISIBLE) {
+                        RectF rf = new RectF();
+                        getColorExtractionRect(Launcher.getLauncher(getContext()),
+                                workspace.getCurrentPage(), view, rf);
+                        if (rf.isEmpty()) {
+                            numVisibleChild++;
+                            continue;
+                        }
+
+                        locations.add(rf);
+                        String rectString = rf.toShortString();
+                        mViewForRect.put(rectString, view);
+
+                        // Arrow color matches the first child or the last child.
+                        if (!mIsAboveIcon && numVisibleChild == 0) {
+                            mArrowColorRectString = rectString;
+                        } else if (mIsAboveIcon) {
+                            mArrowColorRectString = rectString;
+                        }
+
+                        numVisibleChild++;
+                    }
+                }
+
+                mColorExtractor.addLocation(locations);
+                return false;
+            }
+        });
+    }
+
     protected BaseDragLayer getPopupContainer() {
         return mLauncher.getDragLayer();
     }
diff --git a/src/com/android/launcher3/util/ColorExtractionUtils.java b/src/com/android/launcher3/util/ColorExtractionUtils.java
new file mode 100644
index 0000000000..b377ded44a
--- /dev/null
+++ b/src/com/android/launcher3/util/ColorExtractionUtils.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.util;
+
+import android.content.res.Resources;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.view.View;
+
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.Utilities;
+
+/**
+ * Utility class used to map launcher views to wallpaper rect.
+ */
+public class ColorExtractionUtils {
+
+    public static final String TAG = "ColorExtractionUtils";
+
+    private static final Rect sTempRect = new Rect();
+    private static final RectF sTempRectF = new RectF();
+
+    /**
+     * Takes a view and returns its rect that can be used by the wallpaper local color extractor.
+     *
+     * @param launcher Launcher class class.
+     * @param pageId The page the workspace item is on.
+     * @param v The view.
+     * @param colorExtractionRectOut The location rect, but converted to a format expected by the
+     *                               wallpaper local color extractor.
+     */
+    public static void getColorExtractionRect(Launcher launcher, int pageId, View v,
+            RectF colorExtractionRectOut) {
+        Rect viewRect = sTempRect;
+        viewRect.set(0, 0, v.getWidth(), v.getHeight());
+        Utilities.getBoundsForViewInDragLayer(launcher.getDragLayer(), v, viewRect, false,
+                sTempRectF);
+        Utilities.setRect(sTempRectF, viewRect);
+        getColorExtractionRect(launcher, pageId, viewRect, colorExtractionRectOut);
+    }
+
+    /**
+     * Takes a rect in drag layer coordinates and returns the rect that can be used by the wallpaper
+     * local color extractor.
+     *
+     * @param launcher Launcher class.
+     * @param pageId The page the workspace item is on.
+     * @param rectInDragLayer The relevant bounds of the view in drag layer coordinates.
+     * @param colorExtractionRectOut The location rect, but converted to a format expected by the
+     *                               wallpaper local color extractor.
+     */
+    public static void getColorExtractionRect(Launcher launcher, int pageId, Rect rectInDragLayer,
+            RectF colorExtractionRectOut) {
+        // If the view hasn't been measured and laid out, we cannot do this.
+        if (rectInDragLayer.isEmpty()) {
+            colorExtractionRectOut.setEmpty();
+            return;
+        }
+
+        Resources res = launcher.getResources();
+        DeviceProfile dp = launcher.getDeviceProfile().inv.getDeviceProfile(launcher);
+        float screenWidth = dp.widthPx;
+        float screenHeight = dp.heightPx;
+        int numScreens = launcher.getWorkspace().getNumPagesForWallpaperParallax();
+        pageId = Utilities.isRtl(res) ? numScreens - pageId - 1 : pageId;
+        float relativeScreenWidth = 1f / numScreens;
+
+        int[] dragLayerBounds = new int[2];
+        launcher.getDragLayer().getLocationOnScreen(dragLayerBounds);
+        // Translate from drag layer coordinates to screen coordinates.
+        int screenLeft = rectInDragLayer.left + dragLayerBounds[0];
+        int screenTop = rectInDragLayer.top + dragLayerBounds[1];
+        int screenRight = rectInDragLayer.right + dragLayerBounds[0];
+        int screenBottom = rectInDragLayer.bottom + dragLayerBounds[1];
+
+        // This is the position of the view relative to the wallpaper, as expected by the
+        // local color extraction of the WallpaperManager.
+        // The coordinate system is such that, on the horizontal axis, each screen has a
+        // distinct range on the [0,1] segment. So if there are 3 screens, they will have the
+        // ranges [0, 1/3], [1/3, 2/3] and [2/3, 1]. The position on the subrange should be
+        // the position of the view relative to the screen. For the vertical axis, this is
+        // simply the location of the view relative to the screen.
+        // Translate from drag layer coordinates to screen coordinates
+        colorExtractionRectOut.left = (screenLeft / screenWidth + pageId) * relativeScreenWidth;
+        colorExtractionRectOut.right = (screenRight / screenWidth + pageId) * relativeScreenWidth;
+        colorExtractionRectOut.top = screenTop / screenHeight;
+        colorExtractionRectOut.bottom = screenBottom / screenHeight;
+
+        if (colorExtractionRectOut.left < 0
+                || colorExtractionRectOut.right > 1
+                || colorExtractionRectOut.top < 0
+                || colorExtractionRectOut.bottom > 1) {
+            colorExtractionRectOut.setEmpty();
+        }
+    }
+}
diff --git a/src/com/android/launcher3/util/Themes.java b/src/com/android/launcher3/util/Themes.java
index 11b856e266..898ac255d5 100644
--- a/src/com/android/launcher3/util/Themes.java
+++ b/src/com/android/launcher3/util/Themes.java
@@ -21,7 +21,6 @@ import static android.app.WallpaperColors.HINT_SUPPORTS_DARK_THEME;
 
 import android.app.WallpaperManager;
 import android.content.Context;
-import android.content.res.Configuration;
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.ColorMatrix;
@@ -48,16 +47,12 @@ public class Themes {
     }
 
     public static int getActivityThemeRes(Context context, int wallpaperColorHints) {
-        Configuration configuration = context.getResources().getConfiguration();
-        int nightMode = configuration.uiMode & Configuration.UI_MODE_NIGHT_MASK;
-        boolean darkTheme = nightMode == Configuration.UI_MODE_NIGHT_YES;
-
         boolean supportsDarkText = Utilities.ATLEAST_S
                 && (wallpaperColorHints & HINT_SUPPORTS_DARK_TEXT) != 0;
         boolean isMainColorDark = Utilities.ATLEAST_S
                 && (wallpaperColorHints & HINT_SUPPORTS_DARK_THEME) != 0;
 
-        if (darkTheme) {
+        if (Utilities.isDarkTheme(context)) {
             return supportsDarkText ? R.style.AppTheme_Dark_DarkText
                     : isMainColorDark ? R.style.AppTheme_Dark_DarkMainColor : R.style.AppTheme_Dark;
         } else {
diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java
index d49320b073..1ddd1ba89f 100644
--- a/src/com/android/launcher3/views/FloatingIconView.java
+++ b/src/com/android/launcher3/views/FloatingIconView.java
@@ -233,15 +233,8 @@ public class FloatingIconView extends FrameLayout implements
             outViewBounds.set(0, 0, v.getWidth(), v.getHeight());
         }
 
-        float[] points = new float[] {outViewBounds.left, outViewBounds.top, outViewBounds.right,
-                outViewBounds.bottom};
-        Utilities.getDescendantCoordRelativeToAncestor(v, launcher.getDragLayer(), points,
-                false, ignoreTransform);
-        outRect.set(
-                Math.min(points[0], points[2]),
-                Math.min(points[1], points[3]),
-                Math.max(points[0], points[2]),
-                Math.max(points[1], points[3]));
+        Utilities.getBoundsForViewInDragLayer(launcher.getDragLayer(), v, outViewBounds,
+                ignoreTransform, outRect);
     }
 
     /**
diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
index 620604a4d1..697c4531c2 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
@@ -16,6 +16,10 @@
 
 package com.android.launcher3.widget;
 
+import static com.android.launcher3.Utilities.getBoundsForViewInDragLayer;
+import static com.android.launcher3.Utilities.setRect;
+import static com.android.launcher3.util.ColorExtractionUtils.getColorExtractionRect;
+
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
 import android.content.res.Configuration;
@@ -25,7 +29,6 @@ import android.graphics.Rect;
 import android.graphics.RectF;
 import android.os.Handler;
 import android.os.SystemClock;
-import android.util.Log;
 import android.util.SparseBooleanArray;
 import android.util.SparseIntArray;
 import android.view.LayoutInflater;
@@ -95,11 +98,11 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
     private RectF mLastLocationRegistered = null;
     @Nullable private AppWidgetHostViewDragListener mDragListener;
 
-    // Used to store the widget size during onLayout.
+    // Used to store the widget sizes in drag layer coordinates.
     private final Rect mCurrentWidgetSize = new Rect();
     private final Rect mWidgetSizeAtDrag = new Rect();
+
     private final RectF mTempRectF = new RectF();
-    private final boolean mIsRtl;
     private final Rect mEnforcedRectangle = new Rect();
     private final float mEnforcedCornerRadius;
     private final ViewOutlineProvider mCornerRadiusEnforcementOutline = new ViewOutlineProvider() {
@@ -129,7 +132,6 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         if (Utilities.ATLEAST_Q && Themes.getAttrBoolean(mLauncher, R.attr.isWorkspaceDarkText)) {
             setOnLightBackground(true);
         }
-        mIsRtl = Utilities.isRtl(context.getResources());
         mColorExtractor = LocalColorExtractor.newInstance(getContext());
         mColorExtractor.setListener(this);
 
@@ -319,13 +321,12 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         mIsScrollable = checkScrollableRecursively(this);
 
         if (!mIsInDragMode && getTag() instanceof LauncherAppWidgetInfo) {
-            mCurrentWidgetSize.left = left;
-            mCurrentWidgetSize.top = top;
-            mCurrentWidgetSize.right = right;
-            mCurrentWidgetSize.bottom = bottom;
             LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) getTag();
-            int pageId = mWorkspace.getPageIndexForScreenId(info.screenId);
-            updateColorExtraction(mCurrentWidgetSize, pageId);
+            getBoundsForViewInDragLayer(mLauncher.getDragLayer(), this, mCurrentWidgetSize, true,
+                    mTempRectF);
+            setRect(mTempRectF, mCurrentWidgetSize);
+            updateColorExtraction(mCurrentWidgetSize,
+                    mWorkspace.getPageIndexForScreenId(info.screenId));
         }
 
         enforceRoundedCorners();
@@ -338,8 +339,8 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
     }
 
     /** Handles a drag event occurred on a workspace page, {@code pageId}. */
-    public void handleDrag(Rect rect, int pageId) {
-        mWidgetSizeAtDrag.set(rect);
+    public void handleDrag(Rect rectInDragLayer, int pageId) {
+        mWidgetSizeAtDrag.set(rectInDragLayer);
         updateColorExtraction(mWidgetSizeAtDrag, pageId);
     }
 
@@ -351,53 +352,14 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         requestLayout();
     }
 
-    private void updateColorExtraction(Rect widgetLocation, int pageId) {
-        // If the widget hasn't been measured and laid out, we cannot do this.
-        if (widgetLocation.isEmpty()) {
-            return;
-        }
-        int screenWidth = mLauncher.getDeviceProfile().widthPx;
-        int screenHeight = mLauncher.getDeviceProfile().heightPx;
-        int numScreens = mWorkspace.getNumPagesForWallpaperParallax();
-        pageId = mIsRtl ? numScreens - pageId - 1 : pageId;
-        float relativeScreenWidth = 1f / numScreens;
-        float absoluteTop = widgetLocation.top;
-        float absoluteBottom = widgetLocation.bottom;
-        View v = this;
-        while (v.getParent() instanceof View) {
-            v = (View) v.getParent();
-            if (v.getId() != R.id.launcher) {
-                break;
-            }
-            absoluteBottom += v.getTop();
-            absoluteTop += v.getTop();
-        }
-        float xOffset = 0;
-        View parentView = (View) getParent();
-        // The layout depends on the orientation.
-        if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
-            int parentViewWidth = parentView == null ? 0 : parentView.getWidth();
-            xOffset = screenWidth - mWorkspace.getPaddingRight() - parentViewWidth;
-        } else {
-            int parentViewPaddingLeft = parentView == null ? 0 : parentView.getPaddingLeft();
-            xOffset = mWorkspace.getPaddingLeft() + parentViewPaddingLeft;
-        }
-        // This is the position of the widget relative to the wallpaper, as expected by the
-        // local color extraction of the WallpaperManager.
-        // The coordinate system is such that, on the horizontal axis, each screen has a
-        // distinct range on the [0,1] segment. So if there are 3 screens, they will have the
-        // ranges [0, 1/3], [1/3, 2/3] and [2/3, 1]. The position on the subrange should be
-        // the position of the widget relative to the screen. For the vertical axis, this is
-        // simply the location of the widget relative to the screen.
-        mTempRectF.left = ((widgetLocation.left + xOffset) / screenWidth + pageId)
-                * relativeScreenWidth;
-        mTempRectF.right = ((widgetLocation.right + xOffset) / screenWidth + pageId)
-                * relativeScreenWidth;
-        mTempRectF.top = absoluteTop / screenHeight;
-        mTempRectF.bottom = absoluteBottom / screenHeight;
-        if (mTempRectF.left < 0 || mTempRectF.right > 1 || mTempRectF.top < 0
-                || mTempRectF.bottom > 1) {
-            Log.e(LOG_TAG, "   Error, invalid relative position");
+    /**
+     * @param rectInDragLayer Rect of widget in drag layer coordinates.
+     * @param pageId The workspace page the widget is on.
+     */
+    private void updateColorExtraction(Rect rectInDragLayer, int pageId) {
+        getColorExtractionRect(mLauncher, pageId, rectInDragLayer, mTempRectF);
+
+        if (mTempRectF.isEmpty()) {
             return;
         }
         if (!mTempRectF.equals(mLastLocationRegistered)) {
diff --git a/src/com/android/launcher3/widget/LocalColorExtractor.java b/src/com/android/launcher3/widget/LocalColorExtractor.java
index 097158b072..2121bc288b 100644
--- a/src/com/android/launcher3/widget/LocalColorExtractor.java
+++ b/src/com/android/launcher3/widget/LocalColorExtractor.java
@@ -43,7 +43,10 @@ public class LocalColorExtractor implements ResourceBasedOverride {
         void onColorsChanged(RectF rect, SparseIntArray extractedColors);
     }
 
-    static LocalColorExtractor newInstance(Context context) {
+    /**
+     * Returns a new instance of the LocalColorExtractor.
+     */
+    public static LocalColorExtractor newInstance(Context context) {
         return Overrides.getObject(LocalColorExtractor.class, context.getApplicationContext(),
                 R.string.local_colors_extraction_class);
     }
-- 
GitLab


From bdf64e79bd86b8c1b15fb5db9cd7ea1da0ae395b Mon Sep 17 00:00:00 2001
From: Jon Spivack <spivack@google.com>
Date: Thu, 29 Apr 2021 19:08:03 -0700
Subject: [PATCH 1032/1664] Add app package names to NIU Actions Intents

This adds the package name of the currently suspended app to the NIU Actions Intents, for logging purposes.

Bug: 186388671
Test: Manual (printed out the Intent extras while trying various apps)
Test: m -j RunLauncherGoGoogleRoboTests
Change-Id: I8180347675c8940c960e4aa4c47dec508207c780
---
 .../src/com/android/quickstep/TaskOverlayFactoryGo.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
index 79e50ef35b..67e9d898e5 100644
--- a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
+++ b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
@@ -49,6 +49,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
     public static final String ACTION_SEARCH = "com.android.quickstep.ACTION_SEARCH";
     public static final String ELAPSED_NANOS = "niu_actions_elapsed_realtime_nanos";
     public static final String ACTIONS_URL = "niu_actions_app_url";
+    public static final String ACTIONS_APP_PACKAGE = "niu_actions_app_package";
     public static final String ACTIONS_ERROR_CODE = "niu_actions_app_error_code";
     public static final int ERROR_PERMISSIONS = 1;
     private static final String TAG = "TaskOverlayFactoryGo";
@@ -72,6 +73,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
      */
     public static final class TaskOverlayGo<T extends OverviewActionsView> extends TaskOverlay {
         private String mNIUPackageName;
+        private String mTaskPackageName;
         private String mWebUrl;
         private boolean mAssistPermissionsEnabled;
 
@@ -87,7 +89,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
                 boolean rotated) {
             getActionsView().updateDisabledFlags(DISABLED_NO_THUMBNAIL, thumbnail == null);
             mNIUPackageName =
-                    mApplicationContext.getResources().getString(R.string.niu_actions_package);
+                    mApplicationContext.getString(R.string.niu_actions_package);
 
             if (thumbnail == null || TextUtils.isEmpty(mNIUPackageName)) {
                 return;
@@ -96,6 +98,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
             getActionsView().updateDisabledFlags(DISABLED_ROTATED, rotated);
             boolean isAllowedByPolicy = mThumbnailView.isRealSnapshot();
             getActionsView().setCallbacks(new OverlayUICallbacksGoImpl(isAllowedByPolicy, task));
+            mTaskPackageName = task.key.getPackageName();
 
             checkPermissions();
             if (!mAssistPermissionsEnabled) {
@@ -150,6 +153,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
                     .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
                     .addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
                     .setPackage(mNIUPackageName)
+                    .putExtra(ACTIONS_APP_PACKAGE, mTaskPackageName)
                     .putExtra(ELAPSED_NANOS, SystemClock.elapsedRealtimeNanos());
 
             if (mWebUrl != null) {
-- 
GitLab


From e25ee1ed98621babc0807c2f2813d03c3b10761e Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Mon, 26 Apr 2021 21:25:31 -0700
Subject: [PATCH 1033/1664] Check IME visibility check before calling
 IMM.hide()

Bug: 183062683
Bug: 185558351

Test: manual
Change-Id: Ib3bee0f895cc03c6faeb662d078d013ac4d6e406
---
 src/com/android/launcher3/ExtendedEditText.java |  2 +-
 .../android/launcher3/util/UiThreadHelper.java  | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/ExtendedEditText.java b/src/com/android/launcher3/ExtendedEditText.java
index c79dabe8cf..4312939321 100644
--- a/src/com/android/launcher3/ExtendedEditText.java
+++ b/src/com/android/launcher3/ExtendedEditText.java
@@ -99,7 +99,7 @@ public class ExtendedEditText extends EditText {
     }
 
     public void hideKeyboard() {
-        UiThreadHelper.hideKeyboardAsync(getContext(), getWindowToken());
+        UiThreadHelper.hideKeyboardAsync(Launcher.getLauncher(getContext()), getWindowToken());
     }
 
     private boolean showSoftInput() {
diff --git a/src/com/android/launcher3/util/UiThreadHelper.java b/src/com/android/launcher3/util/UiThreadHelper.java
index 0498052575..be14e01f0d 100644
--- a/src/com/android/launcher3/util/UiThreadHelper.java
+++ b/src/com/android/launcher3/util/UiThreadHelper.java
@@ -17,13 +17,18 @@ package com.android.launcher3.util;
 
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
+import android.view.WindowInsets;
 import android.view.inputmethod.InputMethodManager;
 
+import com.android.launcher3.Launcher;
+import com.android.launcher3.Utilities;
+
 /**
  * Utility class for offloading some class from UI thread
  */
@@ -37,8 +42,16 @@ public class UiThreadHelper {
     private static final int MSG_SET_ORIENTATION = 2;
     private static final int MSG_RUN_COMMAND = 3;
 
-    public static void hideKeyboardAsync(Context context, IBinder token) {
-        Message.obtain(HANDLER.get(context), MSG_HIDE_KEYBOARD, token).sendToTarget();
+    @SuppressLint("NewApi")
+    public static void hideKeyboardAsync(Launcher launcher, IBinder token) {
+        if (Utilities.ATLEAST_R) {
+            WindowInsets rootInsets = launcher.getRootView().getRootWindowInsets();
+            boolean isImeShown = rootInsets != null && rootInsets.isVisible(
+                    WindowInsets.Type.ime());
+            if (!isImeShown) return;
+        }
+
+        Message.obtain(HANDLER.get(launcher), MSG_HIDE_KEYBOARD, token).sendToTarget();
     }
 
     public static void setOrientationAsync(Activity activity, int orientation) {
-- 
GitLab


From b3609ce5906a5f1dc0cdc4f8d9d60994ca6de00b Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sat, 1 May 2021 19:57:46 +0000
Subject: [PATCH 1034/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Ia1732615c64fdae549156761932647f4dd14b4ba
---
 res/values-af/strings.xml        | 6 ++++--
 res/values-am/strings.xml        | 6 ++++--
 res/values-ar/strings.xml        | 6 ++++--
 res/values-as/strings.xml        | 6 ++++--
 res/values-az/strings.xml        | 6 ++++--
 res/values-b+sr+Latn/strings.xml | 6 ++++--
 res/values-be/strings.xml        | 6 ++++--
 res/values-bg/strings.xml        | 6 ++++--
 res/values-bn/strings.xml        | 6 ++++--
 res/values-bs/strings.xml        | 6 ++++--
 res/values-ca/strings.xml        | 6 ++++--
 res/values-cs/strings.xml        | 6 ++++--
 res/values-da/strings.xml        | 6 ++++--
 res/values-de/strings.xml        | 6 ++++--
 res/values-el/strings.xml        | 6 ++++--
 res/values-en-rAU/strings.xml    | 4 ++--
 res/values-en-rCA/strings.xml    | 4 ++--
 res/values-en-rGB/strings.xml    | 4 ++--
 res/values-en-rIN/strings.xml    | 4 ++--
 res/values-en-rXC/strings.xml    | 4 ++--
 res/values-es-rUS/strings.xml    | 6 ++++--
 res/values-es/strings.xml        | 6 ++++--
 res/values-et/strings.xml        | 6 ++++--
 res/values-eu/strings.xml        | 6 ++++--
 res/values-fa/strings.xml        | 6 ++++--
 res/values-fi/strings.xml        | 6 ++++--
 res/values-fr-rCA/strings.xml    | 6 ++++--
 res/values-fr/strings.xml        | 6 ++++--
 res/values-gl/strings.xml        | 6 ++++--
 res/values-gu/strings.xml        | 6 ++++--
 res/values-hi/strings.xml        | 6 ++++--
 res/values-hr/strings.xml        | 6 ++++--
 res/values-hu/strings.xml        | 6 ++++--
 res/values-hy/strings.xml        | 6 ++++--
 res/values-in/strings.xml        | 6 ++++--
 res/values-is/strings.xml        | 6 ++++--
 res/values-it/strings.xml        | 6 ++++--
 res/values-iw/strings.xml        | 6 ++++--
 res/values-ja/strings.xml        | 6 ++++--
 res/values-ka/strings.xml        | 6 ++++--
 res/values-kk/strings.xml        | 6 ++++--
 res/values-km/strings.xml        | 6 ++++--
 res/values-kn/strings.xml        | 6 ++++--
 res/values-ko/strings.xml        | 6 ++++--
 res/values-ky/strings.xml        | 6 ++++--
 res/values-lo/strings.xml        | 4 ++--
 res/values-lt/strings.xml        | 6 ++++--
 res/values-lv/strings.xml        | 6 ++++--
 res/values-mk/strings.xml        | 6 ++++--
 res/values-ml/strings.xml        | 6 ++++--
 res/values-mn/strings.xml        | 6 ++++--
 res/values-mr/strings.xml        | 6 ++++--
 res/values-ms/strings.xml        | 6 ++++--
 res/values-my/strings.xml        | 6 ++++--
 res/values-nb/strings.xml        | 6 ++++--
 res/values-ne/strings.xml        | 6 ++++--
 res/values-nl/strings.xml        | 6 ++++--
 res/values-or/strings.xml        | 6 ++++--
 res/values-pa/strings.xml        | 6 ++++--
 res/values-pl/strings.xml        | 6 ++++--
 res/values-pt-rPT/strings.xml    | 6 ++++--
 res/values-pt/strings.xml        | 6 ++++--
 res/values-ro/strings.xml        | 6 ++++--
 res/values-ru/strings.xml        | 6 ++++--
 res/values-si/strings.xml        | 6 ++++--
 res/values-sk/strings.xml        | 6 ++++--
 res/values-sl/strings.xml        | 6 ++++--
 res/values-sq/strings.xml        | 6 ++++--
 res/values-sr/strings.xml        | 6 ++++--
 res/values-sv/strings.xml        | 6 ++++--
 res/values-sw/strings.xml        | 6 ++++--
 res/values-ta/strings.xml        | 6 ++++--
 res/values-te/strings.xml        | 6 ++++--
 res/values-th/strings.xml        | 6 ++++--
 res/values-tl/strings.xml        | 6 ++++--
 res/values-tr/strings.xml        | 6 ++++--
 res/values-uk/strings.xml        | 6 ++++--
 res/values-ur/strings.xml        | 6 ++++--
 res/values-uz/strings.xml        | 6 ++++--
 res/values-vi/strings.xml        | 6 ++++--
 res/values-zh-rCN/strings.xml    | 6 ++++--
 res/values-zh-rHK/strings.xml    | 6 ++++--
 res/values-zh-rTW/strings.xml    | 6 ++++--
 res/values-zu/strings.xml        | 6 ++++--
 84 files changed, 324 insertions(+), 168 deletions(-)

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 6894e3cead..e516468a51 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dubbeltik en hou om \'n legstuk te skuif of gebruik gepasmaakte handelinge."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d breed by %2$d hoog"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Raak en hou om self te plaas"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Voeg outomaties by"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> legstukke</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> legstuk</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 8097ba1b59..5241acd0e1 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ምግብርን ለማንቀሳቀስ ወይም ብጁ እርምጃዎችን ለመጠቀም ሁለቴ መታ ያድርጉ እና ይያዙ።"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ስፋት በ%2$d ከፍታ"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"ራስዎ ለማስቀመጥ ነክተው ይያዙት"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"በራስ-ሰር አክል"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ንዑስ ፕሮግራሞች</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ንዑስ ፕሮግራሞች</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index b5115e2d4a..669aa91ac2 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"انقر مرتين مع تثبيت إصبعك لنقل أداة أو استخدام الإجراءات المخصّصة."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"‏العرض %1$d الطول %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"انقر مع الاستمرار لإضافة العنصر يدويًا"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"الإضافة تلقائيًا"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="zero"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> أداة</item>
       <item quantity="two">أداتان (<xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g>)</item>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 31ac27fb0b..931b3ab2e4 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"কোনো ৱিজেট স্থানান্তৰ কৰিবলৈ দুবাৰ টিপি ধৰি ৰাখক অথবা কাষ্টম কাৰ্য ব্যৱহাৰ কৰক।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d বহল x %2$d ওখ"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"মেনুৱেলভাৱে ৰাখিবলৈ স্পৰ্শ কৰি থাকক"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"স্বয়ংক্ৰিয়ভাবে যোগ কৰক"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> টা ৱিজেট</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> টা ৱিজেট</item>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index bc0717db34..8b525f29b5 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Vidceti daşımaq üçün iki dəfə toxunub saxlayın və ya fərdi əməliyyatlardan istifadə edin."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%2$d hündürlük %1$d enində"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Manual olaraq yerləşdirmək üçün toxunaraq basıb saxlayın"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Avtomatik əlavə edin"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidcet</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> vidcet</item>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index ed08ca2d4b..d4f013a5e0 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvaput dodirnite i zadržite da biste pomerali vidžet ili koristite prilagođene radnje."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d×%2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"širina od %1$d i visina od %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Dodirnite i zadržite da biste postavili ručno"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Automatski dodaj"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidžet</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidžeta</item>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index c2d9946f36..cf02d485c8 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Дакраніцеся двойчы і ўтрымлівайце, каб перамясціць віджэт або выкарыстоўваць спецыяльныя дзеянні."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Шырына: %1$d, вышыня: %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Каб размясціць уручную, дакраніцеся і ўтрымлівайце"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Дадаць аўтаматычна"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> віджэт</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> віджэты</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 390a8f851a..b3c5ca4028 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Докоснете двукратно и задръжте за преместване на приспособление или използвайте персонал. действия."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Ширина %1$d и височина %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Докоснете и задръжте, за да поставите ръчно"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Автоматично добавяне"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> приспособления</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> приспособление</item>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 4c45b29988..283ac705c8 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"একটি উইজেট সরাতে বা কাস্টম অ্যাকশন ব্যবহার করতে ডবল ট্যাপ করে ধরে রাখুন।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%2$d উচ্চতা অনুযায়ী %1$d প্রস্থ"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"নিজে যোগ করতে টাচ করে ধরে রাখুন"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"স্বয়ংক্রিয়ভাবে যোগ করুন"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g>টি উইজেট</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g>টি উইজেট</item>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index ae46d5bb06..fcd6f3faed 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvaput dodirnite i zadržite da pomjerite vidžet ili da koristite prilagođene radnje."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Širina %1$d, visina %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Dodirnite i držite da postavite ručno"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Dodaj automatski"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidžet</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidžeta</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index c49dce5219..d54670b4ac 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Fes doble toc i mantén premut per moure un widget o per utilitzar accions personalitzades."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d d\'amplada per %2$d d\'alçada"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Mantén-lo premut per afegir-lo manualment"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Afegeix automàticament"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index a7f99087a2..a9ea5878b3 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvojitým klepnutím a podržením přesunete widget, případně použijte vlastní akce."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"šířka %1$d, výška %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Chcete-li položku umístit ručně, klepněte na ni a podržte ji"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Přidat automaticky"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgety</item>
       <item quantity="many"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgetu</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index c6496fac3d..e5dacac7da 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Tryk to gange, og hold en widget nede for at flytte den eller bruge tilpassede handlinger."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d i bredden og %2$d i højden"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Tryk og hold for at placere manuelt"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Tilføj automatisk"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 77ddc86a8d..31b9b2003e 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Doppeltippen und halten, um ein Widget zu bewegen oder benutzerdefinierte Aktionen zu nutzen."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d breit und %2$d hoch"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Zum manuellen Hinzufügen gedrückt halten"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Automatisch hinzufügen"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> Widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> Widget</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index c81b96adbb..a9deedb951 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Πατήστε δύο φορές παρατεταμένα για μετακίνηση γραφικού στοιχείου ή χρήση προσαρμοσμένων ενεργειών."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Πλάτος %1$d επί ύψος %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Αγγίξτε παρατεταμένα για μη αυτόματη τοποθέτηση"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Αυτόματη προσθήκη"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> γραφικά στοιχεία</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> γραφικό στοιχείο</item>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index f26f28496b..d6b929628e 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -32,8 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Double-tap &amp; hold to move a widget or use custom actions."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d wide by %2$d high"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Touch and hold to place manually"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Add automatically"</string>
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Touch &amp; hold the widget to move it around the home screen"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Add to home screen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index f26f28496b..d6b929628e 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -32,8 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Double-tap &amp; hold to move a widget or use custom actions."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d wide by %2$d high"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Touch and hold to place manually"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Add automatically"</string>
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Touch &amp; hold the widget to move it around the home screen"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Add to home screen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index f26f28496b..d6b929628e 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -32,8 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Double-tap &amp; hold to move a widget or use custom actions."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d wide by %2$d high"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Touch and hold to place manually"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Add automatically"</string>
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Touch &amp; hold the widget to move it around the home screen"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Add to home screen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index f26f28496b..d6b929628e 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -32,8 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Double-tap &amp; hold to move a widget or use custom actions."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d wide by %2$d high"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Touch and hold to place manually"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Add automatically"</string>
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Touch &amp; hold the widget to move it around the home screen"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Add to home screen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index b700502622..9fff023fdb 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -32,8 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‎‏‏‏‏‎‎‎‎‏‏‎‏‎‏‏‎‎‎‎‎‎‏‎‏‎‎‎‎‎‎‎‎‎‏‏‎‎Double-tap &amp; hold to move a widget or use custom actions.‎‏‎‎‏‎"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‎‎‏‎‎‎‎‎‏‎‎‎‏‎‏‏‏‏‏‎%1$d × %2$d‎‏‎‎‏‎"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‎‏‎‎‎‏‏‎‏‎‎‎‎‏‏‎‎‎‏‎‎‎‏‏‏‎‎‎‎‏‏‏‎‎‏‎‎‏‎‎‏‏‎‎‎‎‎‏‏‏‏‎‎%1$d wide by %2$d high‎‏‎‎‏‎"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‎‎‎‎‎‎‏‎‏‏‎‎‎‏‎‏‎‏‏‏‎‎‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‏‎Touch &amp; hold to place manually‎‏‎‎‏‎"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎Add automatically‎‏‎‎‏‎"</string>
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‎‎‎‎‏‎‎‎‏‏‎‎‎‏‎‏‎‎‏‏‏‎‏‎Touch &amp; hold the widget to move it around the Home screen‎‏‎‎‏‎"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‏‎‏‏‎‏‏‎‎‎‎‏‏‎‏‎‏‏‎‎‏‎‏‎‎‏‎‏‎‏‎‎‏‏‏‎‏‏‏‎‎‎‏‏‎‎‏‎‎‎Add to Home screen‎‏‎‎‏‎"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‏‏‏‎‏‎‏‏‎‎‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‏‎‎‎‎‏‎‏‏‎‎‎‏‎‎‏‎‏‎‏‏‏‎‎‎‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g>‎‏‎‎‏‏‏‎ widgets‎‏‎‎‏‎</item>
       <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‏‏‏‎‏‎‏‏‎‎‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‏‎‎‎‎‏‎‏‏‎‎‎‏‎‎‏‎‏‎‏‏‏‎‎‎‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g>‎‏‎‎‏‏‏‎ widget‎‏‎‎‏‎</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index acd4a4fe3a..0330795e8c 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Presiona dos veces y mantén presionado para mover un widget o usar acciones personalizadas."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de ancho por %2$d de alto"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Mantén presionado para ubicarlo manualmente"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Agregar automáticamente"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 8b9ab0cb5c..888436fa2b 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Toca dos veces y mantén pulsado un widget para moverlo o usar acciones personalizadas."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de ancho por %2$d de alto"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Mantenlo pulsado para añadirlo manualmente"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Añadir automáticamente"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other">Widgets: <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
       <item quantity="one">Widget: <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g></item>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 08714ad143..15b6177adf 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Vidina teisaldamiseks või kohandatud toimingute kasutamiseks topeltpuudutage ja hoidke all."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d lai ja %2$d kõrge"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Puudutage pikalt, et käsitsi asetada"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Lisa automaatselt"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidinat</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> vidin</item>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index a485a14291..53090527d8 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Sakatu birritan eta eduki sakatuta widget bat mugitzeko edo ekintza pertsonalizatuak erabiltzeko."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d zabal eta %2$d luze"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Eduki sakatuta eskuz gehitzeko"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Gehitu automatikoki"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 0b3e7b0bee..b0c300c76d 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"برای جابه‌جا کردن ابزارک یا استفاده از کنش‌های سفارشی، دوضربه بزنید و نگه دارید."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"‏%1$d عرض در %2$d طول"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"آن را لمس کنید و بکشید تا به‌صورت دستی اضافه شود"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"افزودن خودکار"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ابزارک</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ابزارک</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 34ed9e0c37..47466cfeba 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Kaksoisnapauta ja paina pitkään, niin voit siirtää widgetiä tai käyttää muokattuja toimintoja."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Leveys: %1$d, korkeus: %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Sijoita manuaalisesti koskettamalla pitkään"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Lisää automaattisesti"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgetiä</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 34fcb367f4..f50d837c2b 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Touchez 2x un widget et maintenez le doigt dessus pour le déplacer ou utiliser des actions personnalisées."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de largeur sur %2$d de hauteur"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Maintenez le doigt sur l\'élément pour le placer manuellement"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Ajouter automatiquement"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f336031a31..f51c3d9e00 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Appuyez deux fois et maintenez la pression pour déplacer widget ou utiliser actions personnalisées."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d x %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de largeur et %2$d de hauteur"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Appuyez de manière prolongée pour placer l\'élément manuellement."</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Ajouter automatiquement"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 382f6ff87c..c3e3596ee5 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Toca dúas veces un widget e manteno premido para movelo ou utiliza accións personalizadas."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de largo por %2$d de alto"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Mantén premido o elemento para colocalo manualmente"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Engadir automaticamente"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index c7f8042522..0882d648d5 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"વિજેટ ખસેડવા બે વાર ટૅપ કરીને દબાવી રાખો અથવા કસ્ટમ ક્રિયાઓનો ઉપયોગ કરો."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d પહોળાઈ X %2$d ઊંચાઈ"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"મેન્યુઅલી મૂકવા માટે ટચ કરી દબાવી રાખો"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"ઑટોમૅટિક રીતે ઉમેરો"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> વિજેટ</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> વિજેટ</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 478d87ea35..61776d6f64 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"किसी विजेट को एक से दूसरी जगह ले जाने के लिए, उस पर दो बार टैप करके दबाकर रखें या पसंद के मुताबिक कार्रवाइयां इस्तेमाल करें."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d चौड़ाई गुणा %2$d ऊंचाई"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"खुद जोड़ने के लिए दबाकर रखें"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"अपने-आप जुड़ जाए"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> विजेट</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> विजेट</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 8ebc33ff47..171f5d07e6 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvaput dodirnite i zadržite pritisak da biste premjestili widget ili upotrijebite prilagođene radnje"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d širine i %2$d visine"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Dodirnite i zadržite stavku da biste je postavili ručno"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Dodaj automatski"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgeta</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index d0aea228bb..bbb24e9d00 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Modul áthelyezéséhez koppintson duplán, tartsa nyomva az ujját, vagy használjon egyéni műveleteket."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d széles és %2$d magas"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Tartsd lenyomva a manuális hozzáadáshoz"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Automatikus hozzáadás"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> modul</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> modul</item>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index fbbcf1c5b7..ff8b895786 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Կրկնակի հպեք և պահեք՝ վիջեթ տեղափոխելու համար, կամ օգտվեք հատուկ գործողություններից։"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Լայնությունը՝ %1$d, բարձրությունը՝ %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Հպեք և պահեք՝ ձեռքով տեղադրելու համար"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Ավելացնել ավտոմատ կերպով"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> վիջեթ</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> վիջեթ</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 7bc91c2a77..c1889ff367 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Ketuk dua kali &amp; tahan untuk memindahkan widget atau gunakan tindakan khusus."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"lebar %1$d x tinggi %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Sentuh lama untuk menempatkan secara manual"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Tambahkan otomatis"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 104b4ac5df..1dce7c7396 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Ýttu tvisvar og haltu fingri á græju til að færa hana eða notaðu sérsniðnar aðgerðir."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d á breidd og %2$d á hæð"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Haltu inni til að staðsetja handvirkt"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Bæta sjálfkrafa við"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> græja</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> græjur</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 9e135763ae..3d1cb5bc86 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Tocca due volte e tieni premuto per spostare un widget o per usare le azioni personalizzate."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d di larghezza per %2$d di altezza"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Tieni premuto per posizionare l\'elemento manualmente"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Aggiungi automaticamente"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 639aa86c3a..4cf0eb2218 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"כדי להעביר ווידג\'ט למקום אחר או להשתמש בפעולות מותאמות אישית, יש ללחוץ פעמיים ולא להרפות."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"‏רוחב %1$d על גובה %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"יש ללחוץ לחיצה ארוכה כדי להוסיף ידנית"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"הוספה אוטומטית"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="two"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ווידג\'טים</item>
       <item quantity="many"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ווידג\'טים</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index dc92748bbf..77efbadfe3 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ウィジェットをダブルタップして長押ししながら移動するか、カスタム操作を使用してください。"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$dx%2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"幅 %1$d、高さ %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"長押しすると、手動で追加できます"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"自動的に追加"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> 件のウィジェット</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> 件のウィジェット</item>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 7a0ec8d98c..e3be57fe60 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ორმაგი შეხებით აირჩიეთ და გეჭიროთ ვიჯეტის გადასაადგილებლად ან მორგებული მოქმედებების გამოსაყენებლად."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"სიგრძე: %1$d, სიგანე: %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"ხანგრძლივად შეეხეთ ხელით განსათავსებლად"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"ავტომატურად დამატება"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ვიჯეტი</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> ვიჯეტი</item>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index dff1311a2e..392dc8bfd4 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Виджетті жылжыту үшін екі рет түртіңіз де, ұстап тұрыңыз немесе арнаулы әрекеттерді пайдаланыңыз."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Ені: %1$d, биіктігі: %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Қолмен қою үшін басып тұрыңыз"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Автоматты қосу"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виджет</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> виджет</item>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index f460512a7f..dd04c01b5f 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ចុចពីរដង រួចសង្កត់ឱ្យជាប់ ដើម្បីផ្លាស់ទី​ធាតុក្រាហ្វិក ឬប្រើ​សកម្មភាព​តាមបំណង​។"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"ទទឺង %1$d គុណនឹងកម្ពស់ %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"ចុច​ឲ្យជាប់​ដើម្បី​បញ្ចូលវា​ដោយផ្ទាល់"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"បញ្ចូល​ដោយ​ស្វ័យ​ប្រវត្តិ"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other">ធាតុ​ក្រាហ្វិក <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
       <item quantity="one">ធាតុ​ក្រាហ្វិក <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g></item>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index b12c631e36..73e2255b52 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ವಿಜೆಟ್ ಸರಿಸಲು ಅಥವಾ ಕಸ್ಟಮ್ ಕ್ರಿಯೆಗಳನ್ನು ಬಳಸಲು ಡಬಲ್-ಟ್ಯಾಪ್ ಮಾಡಿ ಮತ್ತು ಹಿಡಿದುಕೊಳ್ಳಿ."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ಅಗಲ ಮತ್ತು %2$d ಎತ್ತರ"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"ಹಸ್ತಚಾಲಿತವಾಗಿ ಸೇರಿಸಲು ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಹೋಲ್ಡ್ ಮಾಡಿ"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸೇರಿಸಿ"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ವಿಜೆಟ್‌ಗಳು</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ವಿಜೆಟ್‌ಗಳು</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 81285ca32f..7e24dc3b47 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"두 번 탭한 다음 길게 터치하여 위젯을 이동하거나 맞춤 작업을 사용하세요."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d×%2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"너비 %1$d, 높이 %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"길게 터치하여 직접 추가하세요."</string>
-    <string name="place_automatically" msgid="8064208734425456485">"자동으로 추가"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other">위젯 <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g>개</item>
       <item quantity="one">위젯 <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g>개</item>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 50c36d58c9..a4f54bf376 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Виджетти жылдыруу үчүн эки жолу таптап, кармап туруңуз же ыңгайлаштырылган аракеттерди колдонуңуз."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Туурасы: %1$d, бийиктиги: %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Кол менен кошуу үчүн кое бербей басып туруңуз"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Автоматтык түрдө кошуу"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виджет</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> виджет</item>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 3ce2c20998..a7c2f68124 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -32,8 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ແຕະສອງເທື່ອຄ້າງໄວ້ເພື່ອຍ້າຍວິດເຈັດ ຫຼື ໃຊ້ຄຳສັ່ງກຳນົດເອງ."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"ກວ້າງ %1$d ຄູນສູງ %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"ແຕະຄ້າງໄວ້ເພື່ອວາງດ້ວຍຕົນເອງ"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"ເພີ່ມໂດຍອັດຕະໂນມັດ"</string>
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ແຕະວິດເຈັດຄ້າງໄວ້ເພື່ອຍ້າຍມັນໄປມາຢູ່ໂຮມສະກຣີນ"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"ເພີ່ມໄປໃສ່ໂຮມສະກຣີນ"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ວິດເຈັດ</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> ວິດເຈັດ</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index c75afbcd4e..43055a523a 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dukart palieskite ir palaikykite, kad perkeltumėte valdiklį ar naudotumėte tinkintus veiksmus."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d plotis ir %2$d aukštis"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Palieskite ir palaikykite, kad padėtumėte patys"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Pridėti automatiškai"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> valdiklis</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> valdikliai</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index dc2117f024..8bcf250186 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Lai pārvietotu logrīku, uz tā veiciet dubultskārienu un turiet. Varat arī veikt pielāgotas darbības."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d plats un %2$d augsts"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Pieskarieties un turiet, lai manuāli pievienotu"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Pievienot automātiski"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="zero"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> logrīku</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> logrīks</item>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index ce79bde1f5..c4349e66e3 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Допрете двапати и задржете за да преместите виџет или користете приспособени дејства."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d широк на %2$d висок"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Допрете и задржете за рачно поставување"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Додај автоматски"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виџет</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виџети</item>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 3ab0b3532d..c0cb36ba0e 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"വിജറ്റ് നീക്കാൻ ഡബിൾ ടാപ്പ് ചെയ്യൂ, ഹോൾഡ് ചെയ്യൂ അല്ലെങ്കിൽ ഇഷ്‌ടാനുസൃത പ്രവർത്തനങ്ങൾ ഉപയോഗിക്കൂ."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d വീതിയും %2$d ഉയരവും"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"നേരിട്ട് സ്ഥാപിക്കുന്നതിന് സ്‌പർശിച്ചുപിടിക്കുക"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"സ്വയമേവ ചേർക്കുക"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> വിജറ്റുകൾ</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> വിജറ്റ്</item>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index b93c535742..b512dc23ab 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Жижиг хэрэгслийг зөөх эсвэл захиалгат үйлдлийг ашиглахын тулд хоёр товшоод, удаан дарна уу."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d өргөн %2$d өндөр"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Гараар байршуулахын тулд дараад хүлээнэ үү"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Автоматаар нэмэх"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> жижиг хэрэгсэл</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> жижиг хэрэгсэл</item>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 7fc330eb61..7bf6c6c7ad 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"विजेट हलवण्यासाठी किंवा कस्टम कृती वापरण्यासाठी दोनदा टॅप करा आणि धरून ठेवा."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d रूंद बाय %2$d उंच"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"स्वतः ठेवण्यासाठी स्पर्श करा आणि धरून ठेवा"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"आपोआप जोडा"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> विजेट</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> विजेट</item>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index e54c6fe628..91f2a4d667 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Ketik dua kali &amp; tahan untuk menggerakkan widget atau menggunakan tindakan tersuai."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Lebar %1$d kali tinggi %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Sentuh &amp; tahan untuk meletakkan widget/ikon secara manual"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Tambahkan secara automatik"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index b42960204b..f042629bef 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ဝိဂျက်ကို ရွှေ့ရန် (သို့) စိတ်ကြိုက်လုပ်ဆောင်ချက်များကို သုံးရန် နှစ်ချက်တို့ပြီး ဖိထားပါ။"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"အလျား %1$d နှင့် အမြင့် %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"ကိုယ်တိုင်ထည့်ရန် ထိထားပါ"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"အလိုအလျောက် ထည့်ရန်"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other">ဝိဂျက် <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ခု</item>
       <item quantity="one">ဝိဂျက် <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> ခု</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 8245608e54..540d7266a3 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dobbelttrykk og hold inne for å flytte en modul eller bruke tilpassede handlinger."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d bredde x %2$d høyde"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Trykk og hold for å plassere manuelt"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Legg til automatisk"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> moduler</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> modul</item>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 30588fef73..0cdeae007f 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"कुनै विजेट सार्न वा आफ्नो रोजाइका कारबाही प्रयोग गर्न डबल ट्याप गरेर छोइराख्नुहोस्।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d चौडाइ गुणा %2$d उचाइ"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"थप्न टच एण्ड होल्ड गर्नुहोस्"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"स्वतः थप्नुहोस्"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> वटा विजेट</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> वटा विजेट</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 5af9252425..d4478b71f0 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dubbeltik en houd vast om een widget te verplaatsen of aangepaste acties te gebruiken."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d breed en %2$d hoog"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Tik en houd vast om handmatig te plaatsen"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Automatisch toevoegen"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 8505c8e5c0..3595f333a8 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ଏକ ୱିଜେଟକୁ ମୁଭ୍ କରିବା ପାଇଁ ଦୁଇଥର-ଟାପ୍ କରି ଧରି ରଖନ୍ତୁ କିମ୍ବା କଷ୍ଟମ୍ କାର୍ଯ୍ୟଗୁଡ଼ିକୁ ବ୍ୟବହାର କରନ୍ତୁ।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ଓସାର ଓ %2$d ଉଚ୍ଚ"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"ମାନୁଆଲ୍‌ ଭାବରେ ରଖିବାକୁ ସ୍ପର୍ଶ କରନ୍ତୁ ଏବଂ ଧରି ରଖନ୍ତୁ"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"ସ୍ୱଚାଳିତ ଭାବେ ଯୋଗ କରନ୍ତୁ"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g>ଟି ୱିଜେଟ୍</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g>ଟି ୱିଜେଟ୍</item>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index f97f2556b5..355e303cd5 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ਵਿਜੇਟ ਲਿਜਾਉਣ ਲਈ ਜਾਂ ਵਿਉਂਂਤੀਆਂ ਕਾਰਵਾਈਆਂ ਵਰਤਣ ਲਈ ਦੋ ਵਾਰ ਟੈਪ ਕਰਕੇ ਦਬਾ ਕੇ ਰੱਖੋ।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ਚੌੜਾਈ ਅਤੇ %2$d ਲੰਬਾਈ"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"ਹੱਥੀਂ ਰੱਖਣ ਲਈ ਸਪਰਸ਼ ਕਰਕੇ ਰੱਖੋ"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ਵਿਜੇਟ</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ਵਿਜੇਟ</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 06074e0b88..306a9a0fb9 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Naciśnij dwukrotnie i przytrzymaj, aby przenieść widżet lub użyć działań niestandardowych."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Szerokość %1$d, wysokość %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Kliknij i przytrzymaj, by umieścić ręcznie"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Dodaj automatycznie"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widżety</item>
       <item quantity="many"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widżetów</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index fa2a50e8bc..a1049315e2 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Toque duas vezes sem soltar para mover um widget ou utilizar ações personalizadas."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de largura por %2$d de altura"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Toque sem soltar para colocar manualmente"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Adicionar automaticamente"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index faa5d921ec..35d1e5d3a7 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Toque duas vezes e mantenha a tela pressionada para mover um widget ou usar ações personalizadas."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de largura por %2$d de altura"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Toque e mantenha pressionado para mover manualmente"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Adicionar automaticamente"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 20b335375b..f614b18468 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Atingeți de două ori și țineți apăsat pentru a muta un widget sau folosiți acțiuni personalizate."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d lățime și %2$d înălțime"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Atingeți lung pentru a plasa manual"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Adăugați automat"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgeturi</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> de widgeturi</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 24aabc52c0..3336b0bd13 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Чтобы использовать специальные действия или перенести виджет, нажмите на него дважды и удерживайте."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d x %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Ширина %1$d, высота %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Нажмите и удерживайте, чтобы добавить вручную."</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Добавить автоматически"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виджет</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виджета</item>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 22baa2acec..fa3287d7fd 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"විජට් එකක් ගෙන යාමට හෝ අභිරුචි ක්‍රියා භාවිත කිරීමට දෙවරක් තට්ටු කර අල්ලා ගෙන සිටින්න."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"පළල %1$d උස %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"අතින් ස්ථානගත කිරීමට ස්පර්ශ කර අල්ලාගෙන සිටින්න"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"ස්වයංක්‍රියව එක් කරන්න"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one">විජට් <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
       <item quantity="other">විජට් <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 1bcf5285dd..bd90155468 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvojitým klepnutím a pridržaním presuňte miniaplikáciu alebo použite vlastné akcie."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"šírka %1$d, výška %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Ak chcete položku umiestniť ručne, pridržte ju"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Pridať automaticky"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> miniaplikácie</item>
       <item quantity="many"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 9e60efbbf0..df1db7e604 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvakrat se dotaknite pripomočka in ga pridržite, da ga premaknete, ali pa uporabite dejanja po meri."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Širina %1$d, višina %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Dotaknite se elementa in ga pridržite, da ga ročno dodate"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Samodejno dodaj"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> pripomoček</item>
       <item quantity="two"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> pripomočka</item>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 1ed8070f89..4d97676952 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Trokit dy herë dhe mbaje shtypur një miniapliikacion për ta zhvendosur atë ose për të përdorur veprimet e personalizuara."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d i gjerë me %2$d i lartë"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Prek dhe mbaj të shtypur për të vendosur në mënyrë manuale"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Shto automatikisht"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> miniaplikacione</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> miniaplikacion</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 4809087252..4103b0084d 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Двапут додирните и задржите да бисте померали виџет или користите прилагођене радње."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d×%2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"ширина од %1$d и висина од %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Додирните и задржите да бисте поставили ручно"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Аутоматски додај"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виџет</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виџета</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index aad4e4ec6a..fb3e8c1f08 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Tryck snabbt två gånger och håll kvar för att flytta en widget eller använda anpassade åtgärder."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d bred gånger %2$d hög"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Placera manuellt genom att trycka länge"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Lägg till automatiskt"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgetar</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 3ff05e1b32..6caadaa368 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Gusa mara mbili na ushikilie ili usogeze wijeti au utumie vitendo maalum."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Upana wa %1$d na kimo cha %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Gusa na ushikilie ili uweke mwenyewe"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Ongeza kiotomatiki"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other">Wijeti <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
       <item quantity="one">Wijeti <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g></item>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 9d565aa7a4..a2bc2c57d5 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"விட்ஜெட்டை நகர்த்த இருமுறை தட்டிப் பிடிக்கவும் அல்லது பிரத்தியேகச் செயல்களைப் பயன்படுத்தவும்."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d அகலத்திற்கு %2$d உயரம்"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"நீங்களே சேர்க்க, தொட்டுப் பிடித்திருக்கவும்"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"தானாகவே சேர்"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> விட்ஜெட்டுகள்</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> விட்ஜெட்</item>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 344f455e39..478bd025cf 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"విడ్జెట్‌ను తరలించడానికి లేదా అనుకూల చర్యలను ఉపయోగించడానికి రెండుసార్లు నొక్కండి &amp; హోల్డ్ చేయి."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d వెడల్పు X %2$d ఎత్తు"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"మాన్యువల్‌గా ఉంచడానికి నొక్కి, పట్టుకోండి"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"ఆటోమేటిక్‌గా జోడించు"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> విడ్జెట్‌లు</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> విడ్జెట్</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index ea6a7c2aae..1b79b9cbca 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"แตะสองครั้งค้างไว้เพื่อย้ายวิดเจ็ตหรือใช้การดำเนินการที่กำหนดเอง"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"กว้าง %1$d x สูง %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"แตะค้างไว้เพื่อวางด้วยตัวเอง"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"เพิ่มโดยอัตโนมัติ"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other">วิดเจ็ต <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> รายการ</item>
       <item quantity="one">วิดเจ็ต <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> รายการ</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index f112ec9a59..58e8c8ae0b 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"I-double tap at pindutin nang matagal para ilipat ang widget o gumamit ng mga custom na pagkilos."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ang lapad at %2$d ang taas"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Pindutin nang matagal para manual na ilagay"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Awtomatikong idagdag"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> na widget</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 993653890f..bc6ad4466e 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Widget\'ı taşımak veya özel işlemleri kullanmak için iki kez dokunup basılı tutun."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"genişlik: %1$d, yükseklik: %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Manuel olarak yerleştirmek için dokunun ve basılı tutun"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Otomatik olarak ekle"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 87ae581c8e..fdba5e615b 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Двічі натисніть і втримуйте віджет, щоб перемістити його або виконати інші дії."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Ширина – %1$d, висота – %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Натисніть і утримуйте, щоб додати вручну"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Додати автоматично"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> віджет</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> віджети</item>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 2ee66b0395..8cc578c060 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ویجیٹ کو منتقل کرنے یا حسب ضرورت کارروائیاں استعمال کرنے کے لیے دوبار تھپتھپائیں اور پکڑ کر رکھیں۔"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"‏%1$d چوڑا اور ‎%2$d اونچا"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"‏دستی طور پر رکھنے کیلئے ‎ٹچ کر کے دبائے رکھیں"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"خود کار طور پر شامل کریں"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ویجیٹس</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> ویجیٹ</item>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index d31aea9474..1ab449dd3f 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Ikki marta bosib va bosib turgan holatda vidjetni tanlang yoki maxsus amaldan foydalaning."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Eni %1$d, bo‘yi %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Joylash uchun bosib turing"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Avtomatik chiqarish"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ta vidjet</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> ta vidjet</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 318d453b95..acb101b7d4 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Nhấn đúp và giữ để di chuyển một tiện ích hoặc sử dụng các thao tác tùy chỉnh."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Rộng %1$d x cao %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Chạm và giữ để thêm theo cách thủ công"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Tự động thêm"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> tiện ích</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> tiện ích</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index f9628b2b87..d79f181222 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"点按两次并按住微件即可移动该微件或使用自定义操作。"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"宽 %1$d，高 %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"轻触并按住即可手动放置"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"自动添加"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> 个微件</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> 个微件</item>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 8929aa8482..5b06896707 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"㩒兩下之後㩒住，就可以郁小工具或者用自訂操作。"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d 闊，%2$d 高"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"按住即可手動新增"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"自動新增"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> 個小工具</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> 個小工具</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index c6f933cdac..9566a8cf5c 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"輕觸兩下並按住即可移動小工具或使用自訂操作。"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"寬度為 %1$d，高度為 %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"按住圖示即可手動新增"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"自動新增"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> 項小工具</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> 項小工具</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 8296853504..0da9ed7631 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -32,8 +32,10 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Thepha kabili uphinde ubambe ukuze uhambise iwijethi noma usebenzise izindlela ezingokwezifiso."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ububanzi ngokungu-%2$d ukuya phezulu"</string>
-    <string name="add_item_request_drag_hint" msgid="5899764264480397019">"Thinta futhi ubambe ukuze ubeke ngokwenza"</string>
-    <string name="place_automatically" msgid="8064208734425456485">"Engeza ngokuzenzakalelayo"</string>
+    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
+    <skip />
+    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one">Amawijethi angu-<xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
       <item quantity="other">Amawijethi angu-<xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
-- 
GitLab


From 20d00faf727a15d03db4fe6f24f330bc28dfaf19 Mon Sep 17 00:00:00 2001
From: Zak Cohen <zakcohen@google.com>
Date: Fri, 30 Apr 2021 14:43:52 -0700
Subject: [PATCH 1035/1664] Overview - fade task icon instead of scaling it per
 new ux

Bug: 186256286
Test: Local build and run on p5
Change-Id: I318b62ddbf9cb475736d2844489a7ed2d9a8a409
---
 quickstep/src/com/android/quickstep/views/TaskView.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 3349b74f05..45bcdc314b 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -777,8 +777,7 @@ public class TaskView extends FrameLayout implements Reusable {
         float upperClamp = invert ? 1 : iconScalePercentage;
         float scale = Interpolators.clampToProgress(FAST_OUT_SLOW_IN, lowerClamp, upperClamp)
                 .getInterpolation(progress);
-        mIconView.setScaleX(scale);
-        mIconView.setScaleY(scale);
+        mIconView.setAlpha(scale);
         if (mContextualChipWrapper != null && mContextualChipWrapper != null) {
             mContextualChipWrapper.setAlpha(scale);
             mContextualChipWrapper.setScaleX(Math.min(scale, comp(mModalness)));
-- 
GitLab


From e72dd4a859f726fcd2c6a25574608b293e7418a2 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Sun, 2 May 2021 23:20:55 -0700
Subject: [PATCH 1036/1664] Call windowInsetController.hide method when hiding
 keyboard

Bug: 186608200
Test: manual
Change-Id: I9a819aec217a91e8b6de58d074dbdb134dacaeb8
---
 src/com/android/launcher3/util/UiThreadHelper.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/util/UiThreadHelper.java b/src/com/android/launcher3/util/UiThreadHelper.java
index be14e01f0d..f5e1234a28 100644
--- a/src/com/android/launcher3/util/UiThreadHelper.java
+++ b/src/com/android/launcher3/util/UiThreadHelper.java
@@ -48,7 +48,13 @@ public class UiThreadHelper {
             WindowInsets rootInsets = launcher.getRootView().getRootWindowInsets();
             boolean isImeShown = rootInsets != null && rootInsets.isVisible(
                     WindowInsets.Type.ime());
-            if (!isImeShown) return;
+            if (isImeShown) {
+                // this call is already asynchronous
+                launcher.getAppsView().getWindowInsetsController().hide(
+                        WindowInsets.Type.ime()
+                );
+            }
+            return;
         }
 
         Message.obtain(HANDLER.get(launcher), MSG_HIDE_KEYBOARD, token).sendToTarget();
-- 
GitLab


From 5f0f1abae2ac33a4205d35569f1187cc7ce2af58 Mon Sep 17 00:00:00 2001
From: yangbill <yangbill@google.com>
Date: Mon, 3 May 2021 15:01:51 +0800
Subject: [PATCH 1037/1664] Add workaround for testing Launcher3Tests

Correct test config path and adding LOCAL_COMPATIBILITY_SUPPORT_FILES.

Bug: 183540376
Test: atest Launcher3Tests
Change-Id: Ifd2a863cc1af838d78ed023a4405e3d2c450b62b
---
 tests/Android.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/Android.mk b/tests/Android.mk
index 883a69e411..19b9656e37 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -76,6 +76,10 @@ LOCAL_PACKAGE_NAME := Launcher3Tests
 
 LOCAL_INSTRUMENTATION_FOR := Launcher3
 
+LOCAL_TEST_CONFIG := Launcher3Tests.xml
+
+LOCAL_COMPATIBILITY_SUPPORT_FILES := $(call intermediates-dir-for,APPS,Launcher3)/package.apk:Launcher3.apk
+
 LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
 LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE
-- 
GitLab


From db9b483c02472319be5aae9ebdfa397e7e58605c Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Mon, 3 May 2021 10:53:27 -0500
Subject: [PATCH 1038/1664] [WorkProfile] Update work/personal tab to pills

Bug: 186857875
Test: Manual
Screenshot: https://screenshot.googleplex.com/89jD32tHqNkBUWb
Change-Id: Ia4bb91372896d8a53017e3eadbe985878ce7f0ec
---
 res/color/all_apps_tab_text.xml               |  2 +-
 res/drawable/all_apps_tabs_background.xml     | 21 +++++++++++++++++++
 res/layout/all_apps_personal_work_tabs.xml    |  3 ++-
 res/layout/all_apps_tabs.xml                  |  2 +-
 res/layout/secondary_launcher.xml             |  2 +-
 res/layout/widgets_personal_work_tabs.xml     |  2 +-
 res/values/dimens.xml                         |  3 ++-
 .../widget/picker/WidgetsFullSheet.java       |  2 +-
 .../PersonalWorkSlidingTabStrip.java          | 16 +++++++++-----
 9 files changed, 41 insertions(+), 12 deletions(-)
 create mode 100644 res/drawable/all_apps_tabs_background.xml

diff --git a/res/color/all_apps_tab_text.xml b/res/color/all_apps_tab_text.xml
index f0c6310ad3..0c9acf95af 100644
--- a/res/color/all_apps_tab_text.xml
+++ b/res/color/all_apps_tab_text.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?android:attr/colorAccent" android:state_selected="true"/>
+    <item android:color="@android:color/white" android:state_selected="true"/>
     <item android:color="?android:attr/textColorTertiary"/>
 </selector>
\ No newline at end of file
diff --git a/res/drawable/all_apps_tabs_background.xml b/res/drawable/all_apps_tabs_background.xml
new file mode 100644
index 0000000000..ca2beec244
--- /dev/null
+++ b/res/drawable/all_apps_tabs_background.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+     Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<shape android:shape="rectangle"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+    <solid android:color="?androidprv:attr/colorSurfaceVariant" />
+    <corners android:radius="@dimen/all_apps_header_pill_corner_radius" />
+</shape>
\ No newline at end of file
diff --git a/res/layout/all_apps_personal_work_tabs.xml b/res/layout/all_apps_personal_work_tabs.xml
index 5fb5bcbea0..cefd0ab72c 100644
--- a/res/layout/all_apps_personal_work_tabs.xml
+++ b/res/layout/all_apps_personal_work_tabs.xml
@@ -19,7 +19,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/tabs"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/all_apps_header_tab_height"
+    android:layout_height="@dimen/all_apps_header_pill_height"
+    android:background="@drawable/all_apps_tabs_background"
     android:layout_marginLeft="@dimen/all_apps_tabs_side_padding"
     android:layout_marginRight="@dimen/all_apps_tabs_side_padding"
     android:orientation="horizontal"
diff --git a/res/layout/all_apps_tabs.xml b/res/layout/all_apps_tabs.xml
index 2accd2d21f..de4a69d6cc 100644
--- a/res/layout/all_apps_tabs.xml
+++ b/res/layout/all_apps_tabs.xml
@@ -22,7 +22,7 @@
     android:layout_height="match_parent"
     android:layout_below="@id/search_container_all_apps"
     android:layout_gravity="center_horizontal|top"
-    android:layout_marginTop="@dimen/all_apps_header_tab_height"
+    android:layout_marginTop="@dimen/all_apps_header_pill_height"
     android:clipChildren="true"
     android:clipToPadding="false"
     android:descendantFocusability="afterDescendants"
diff --git a/res/layout/secondary_launcher.xml b/res/layout/secondary_launcher.xml
index e3c60ecb5f..94fcdb9727 100644
--- a/res/layout/secondary_launcher.xml
+++ b/res/layout/secondary_launcher.xml
@@ -70,7 +70,7 @@
             <com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip
                 android:id="@+id/tabs"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/all_apps_header_tab_height"
+                android:layout_height="@dimen/all_apps_header_pill_height"
                 android:layout_marginLeft="@dimen/all_apps_tabs_side_padding"
                 android:layout_marginRight="@dimen/all_apps_tabs_side_padding"
                 android:orientation="horizontal"
diff --git a/res/layout/widgets_personal_work_tabs.xml b/res/layout/widgets_personal_work_tabs.xml
index 3d3ae6acb5..3402415e84 100644
--- a/res/layout/widgets_personal_work_tabs.xml
+++ b/res/layout/widgets_personal_work_tabs.xml
@@ -19,7 +19,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/tabs"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/all_apps_header_tab_height"
+    android:layout_height="@dimen/all_apps_header_pill_height"
     android:layout_marginLeft="@dimen/all_apps_tabs_side_padding"
     android:layout_marginRight="@dimen/all_apps_tabs_side_padding"
     android:orientation="horizontal"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index dd14eaa0ff..b9670919ba 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -91,7 +91,8 @@
     <dimen name="all_apps_empty_search_bg_top_offset">144dp</dimen>
     <dimen name="all_apps_background_canvas_width">700dp</dimen>
     <dimen name="all_apps_background_canvas_height">475dp</dimen>
-    <dimen name="all_apps_header_tab_height">50dp</dimen>
+    <dimen name="all_apps_header_pill_height">50dp</dimen>
+    <dimen name="all_apps_header_pill_corner_radius">50dp</dimen>
     <dimen name="all_apps_tabs_indicator_height">2dp</dimen>
     <dimen name="all_apps_header_top_padding">36dp</dimen>
     <dimen name="all_apps_work_profile_tab_footer_top_padding">16dp</dimen>
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index b4d48562be..7156953f14 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -146,7 +146,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         mAdapters.put(AdapterHolder.SEARCH, new AdapterHolder(AdapterHolder.SEARCH));
         mTabsHeight = mHasWorkProfile
                 ? getContext().getResources()
-                        .getDimensionPixelSize(R.dimen.all_apps_header_tab_height)
+                        .getDimensionPixelSize(R.dimen.all_apps_header_pill_height)
                 : 0;
         mWidgetCellHorizontalPadding = 2 * getResources().getDimensionPixelOffset(
                 R.dimen.widget_cell_horizontal_padding);
diff --git a/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java b/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
index 3a3028f8d9..b5db8f441a 100644
--- a/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
+++ b/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
@@ -39,6 +39,8 @@ public class PersonalWorkSlidingTabStrip extends LinearLayout implements PageInd
     private final Paint mDividerPaint;
 
     private int mSelectedIndicatorHeight;
+    private final int mSelectedIndicatorRadius;
+
     private int mIndicatorLeft = -1;
     private int mIndicatorRight = -1;
     private float mScrollOffset;
@@ -54,7 +56,10 @@ public class PersonalWorkSlidingTabStrip extends LinearLayout implements PageInd
         setWillNotDraw(false);
 
         mSelectedIndicatorHeight =
-                getResources().getDimensionPixelSize(R.dimen.all_apps_tabs_indicator_height);
+                getResources().getDimensionPixelSize(R.dimen.all_apps_header_pill_height);
+
+        mSelectedIndicatorRadius = getResources().getDimensionPixelSize(
+                R.dimen.all_apps_header_pill_corner_radius);
 
         mSelectedIndicatorPaint = new Paint();
         mSelectedIndicatorPaint.setColor(
@@ -118,9 +123,9 @@ public class PersonalWorkSlidingTabStrip extends LinearLayout implements PageInd
         super.onDraw(canvas);
 
         float y = getHeight() - mDividerPaint.getStrokeWidth();
-        canvas.drawLine(getPaddingLeft(), y, getWidth() - getPaddingRight(), y, mDividerPaint);
-        canvas.drawRect(mIndicatorLeft, getHeight() - mSelectedIndicatorHeight,
-                mIndicatorRight, getHeight(), mSelectedIndicatorPaint);
+        canvas.drawRoundRect(mIndicatorLeft, getHeight() - mSelectedIndicatorHeight,
+                mIndicatorRight, getHeight(), mSelectedIndicatorRadius, mSelectedIndicatorRadius,
+                mSelectedIndicatorPaint);
     }
 
     @Override
@@ -144,7 +149,8 @@ public class PersonalWorkSlidingTabStrip extends LinearLayout implements PageInd
     }
 
     @Override
-    public void setMarkersCount(int numMarkers) { }
+    public void setMarkersCount(int numMarkers) {
+    }
 
     @Override
     public boolean hasOverlappingRendering() {
-- 
GitLab


From ef7b4d5dae976c1c6f4dbf5e43d6ab020361aa3a Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Sun, 2 May 2021 07:14:46 +0000
Subject: [PATCH 1039/1664] Revert "Revert "Finish recents animation upon home
 rotation""

This reverts commit 0f8787db8038301608e39418a7b15610dbcac425.

Reason for revert: Revert and fix the broken tapl test

Fixes: 184054813
Change-Id: Ib647e11bfa0a2dc79a5a815be56452bb07e04ddf
---
 .../src/com/android/quickstep/views/RecentsView.java  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index e5ce9509c8..1a0a1a4357 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2486,6 +2486,15 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     @Override
     protected void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
+        if (LIVE_TILE.get() && mRunningTaskId != -1) {
+            switchToScreenshot(
+                    () -> finishRecentsAnimation(true, this::onConfigurationChangedInternal));
+        } else {
+            onConfigurationChangedInternal();
+        }
+    }
+
+    private void onConfigurationChangedInternal() {
         final int rotation = mActivity.getDisplay().getRotation();
         if (mOrientationState.setRecentsRotation(rotation)) {
             updateOrientationHandler();
@@ -3438,7 +3447,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
      * capturing the snapshot at the same time.
      */
     public void switchToScreenshot(Runnable onFinishRunnable) {
-        switchToScreenshot(mRunningTaskId == -1 ? null
+        switchToScreenshot(mRecentsAnimationController == null || mRunningTaskId == -1 ? null
                 : mRecentsAnimationController.screenshotTask(mRunningTaskId), onFinishRunnable);
     }
 
-- 
GitLab


From 17fda29bf35bc4f21ede07319ffe26c88fea1b81 Mon Sep 17 00:00:00 2001
From: Vadim Tryshev <vadimt@google.com>
Date: Mon, 3 May 2021 16:42:11 +0000
Subject: [PATCH 1040/1664] Revert "Use color extraction for arrow popup."

This reverts commit 242c805f8269d65391f257deb062969910f791b6.

Reason for revert: Introduces a leak. I haven't seen a bug for it yet, but this CL is the only in the culprit list; the leak can block multiple teams presubmits, and the leak is via ArrowPopup. Enough evidence.
https://fusion2.corp.google.com/invocations/4b50db71-d598-4e52-9076-e91d42b65014/targets

Change-Id: I1700a9eea8705983598aee43c0a63e67c1d9cf71
Bug: 187075409
---
 src/com/android/launcher3/CellLayout.java     |  11 +-
 src/com/android/launcher3/Utilities.java      |  50 --------
 .../graphics/PreloadIconDrawable.java         |   6 +-
 .../android/launcher3/popup/ArrowPopup.java   | 105 +----------------
 .../launcher3/util/ColorExtractionUtils.java  | 110 ------------------
 src/com/android/launcher3/util/Themes.java    |   7 +-
 .../launcher3/views/FloatingIconView.java     |  11 +-
 .../widget/LauncherAppWidgetHostView.java     |  80 +++++++++----
 .../launcher3/widget/LocalColorExtractor.java |   5 +-
 9 files changed, 86 insertions(+), 299 deletions(-)
 delete mode 100644 src/com/android/launcher3/util/ColorExtractionUtils.java

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index a037675029..c3816ccf0c 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -18,7 +18,6 @@ package com.android.launcher3;
 
 import static android.animation.ValueAnimator.areAnimatorsEnabled;
 
-import static com.android.launcher3.Utilities.getBoundsForViewInDragLayer;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_1_5;
 
 import android.animation.Animator;
@@ -194,7 +193,6 @@ public class CellLayout extends ViewGroup {
     private static final int INVALID_DIRECTION = -100;
 
     private final Rect mTempRect = new Rect();
-    private final RectF mTempRectF = new RectF();
 
     private static final Paint sPaint = new Paint();
 
@@ -1069,16 +1067,11 @@ public class CellLayout extends ViewGroup {
         // Apply local extracted color if the DragView is an AppWidgetHostViewDrawable.
         View view = dragObject.dragView.getContentView();
         if (view instanceof LauncherAppWidgetHostView) {
-            Launcher launcher = Launcher.getLauncher(dragObject.dragView.getContext());
-            Workspace workspace = launcher.getWorkspace();
+            Workspace workspace =
+                    Launcher.getLauncher(dragObject.dragView.getContext()).getWorkspace();
             int screenId = workspace.getIdForScreen(this);
             int pageId = workspace.getPageIndexForScreenId(screenId);
             cellToRect(targetCell[0], targetCell[1], spanX, spanY, mTempRect);
-
-            // Now get the rect in drag layer coordinates.
-            getBoundsForViewInDragLayer(launcher.getDragLayer(), workspace, mTempRect, false,
-                    mTempRectF);
-            Utilities.setRect(mTempRectF, mTempRect);
             ((LauncherAppWidgetHostView) view).handleDrag(mTempRect, pageId);
         }
     }
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 073a46c0e0..a799b4a33a 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -33,7 +33,6 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ShortcutInfo;
-import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.database.ContentObserver;
 import android.graphics.Bitmap;
@@ -85,7 +84,6 @@ import com.android.launcher3.shortcuts.ShortcutKey;
 import com.android.launcher3.shortcuts.ShortcutRequest;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.PackageManagerHelper;
-import com.android.launcher3.views.BaseDragLayer;
 import com.android.launcher3.widget.PendingAddShortcutInfo;
 
 import java.lang.reflect.Method;
@@ -106,8 +104,6 @@ public final class Utilities {
     private static final Pattern sTrimPattern =
             Pattern.compile("^[\\s|\\p{javaSpaceChar}]*(.*)[\\s|\\p{javaSpaceChar}]*$");
 
-    private static final float[] sTmpFloatArray = new float[4];
-
     private static final int[] sLoc0 = new int[2];
     private static final int[] sLoc1 = new int[2];
     private static final Matrix sMatrix = new Matrix();
@@ -137,15 +133,6 @@ public final class Utilities {
             Build.TYPE.toLowerCase(Locale.ROOT).contains("debug") ||
             Build.TYPE.toLowerCase(Locale.ROOT).equals("eng");
 
-    /**
-     * Returns true if theme is dark.
-     */
-    public static boolean isDarkTheme(Context context) {
-        Configuration configuration = context.getResources().getConfiguration();
-        int nightMode = configuration.uiMode & Configuration.UI_MODE_NIGHT_MASK;
-        return nightMode == Configuration.UI_MODE_NIGHT_YES;
-    }
-
     public static boolean isDevelopersOptionsEnabled(Context context) {
         return Settings.Global.getInt(context.getApplicationContext().getContentResolver(),
                         Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0;
@@ -231,33 +218,6 @@ public final class Utilities {
         return scale;
     }
 
-    /**
-     * Returns bounds for a child view of DragLayer, in drag layer coordinates.
-     *
-     * see {@link com.android.launcher3.dragndrop.DragLayer}.
-     *
-     * @param viewBounds Bounds of the view wanted in drag layer coordinates, relative to the view
-     *                   itself. eg. (0, 0, view.getWidth, view.getHeight)
-     * @param ignoreTransform If true, view transform is ignored
-     * @param outRect The out rect where we return the bounds of {@param view} in drag layer coords.
-     */
-    public static void getBoundsForViewInDragLayer(BaseDragLayer dragLayer, View view,
-            Rect viewBounds, boolean ignoreTransform, RectF outRect) {
-        float[] points = sTmpFloatArray;
-        points[0] = viewBounds.left;
-        points[1] = viewBounds.top;
-        points[2] = viewBounds.right;
-        points[3] = viewBounds.bottom;
-
-        Utilities.getDescendantCoordRelativeToAncestor(view, dragLayer, points,
-                false, ignoreTransform);
-        outRect.set(
-                Math.min(points[0], points[2]),
-                Math.min(points[1], points[3]),
-                Math.max(points[0], points[2]),
-                Math.max(points[1], points[3]));
-    }
-
     /**
      * Inverse of {@link #getDescendantCoordRelativeToAncestor(View, View, float[], boolean)}.
      */
@@ -313,16 +273,6 @@ public final class Utilities {
         return new int[] {sLoc1[0] - sLoc0[0], sLoc1[1] - sLoc0[1]};
     }
 
-    /**
-     * Helper method to set rectOut with rectFSrc.
-     */
-    public static void setRect(RectF rectFSrc, Rect rectOut) {
-        rectOut.left = (int) rectFSrc.left;
-        rectOut.top = (int) rectFSrc.top;
-        rectOut.right = (int) rectFSrc.right;
-        rectOut.bottom = (int) rectFSrc.bottom;
-    }
-
     public static void scaleRectFAboutCenter(RectF r, float scale) {
         if (scale != 1.0f) {
             float cx = r.centerX();
diff --git a/src/com/android/launcher3/graphics/PreloadIconDrawable.java b/src/com/android/launcher3/graphics/PreloadIconDrawable.java
index e45b8f7918..13ae866efb 100644
--- a/src/com/android/launcher3/graphics/PreloadIconDrawable.java
+++ b/src/com/android/launcher3/graphics/PreloadIconDrawable.java
@@ -21,6 +21,7 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.content.Context;
+import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Matrix;
@@ -33,7 +34,6 @@ import android.util.Property;
 import android.util.SparseArray;
 import android.view.ContextThemeWrapper;
 
-import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.icons.GraphicsUtils;
@@ -119,7 +119,9 @@ public class PreloadIconDrawable extends FastBitmapDrawable {
                 info,
                 IconPalette.getPreloadProgressColor(context, info.bitmap.color),
                 getPreloadColors(context),
-                Utilities.isDarkTheme(context));
+            (context.getResources().getConfiguration().uiMode
+                    & Configuration.UI_MODE_NIGHT_MASK
+                    & Configuration.UI_MODE_NIGHT_YES) != 0) /* isDarkMode */;
     }
 
     public PreloadIconDrawable(
diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java
index 48c5d0a854..c19dfe9300 100644
--- a/src/com/android/launcher3/popup/ArrowPopup.java
+++ b/src/com/android/launcher3/popup/ArrowPopup.java
@@ -16,9 +16,9 @@
 
 package com.android.launcher3.popup;
 
+import static com.android.launcher3.AbstractFloatingView.getTopOpenViewWithType;
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.popup.PopupPopulator.MAX_SHORTCUTS;
-import static com.android.launcher3.util.ColorExtractionUtils.getColorExtractionRect;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -31,7 +31,6 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Outline;
 import android.graphics.Rect;
-import android.graphics.RectF;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
@@ -42,21 +41,17 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
-import android.view.ViewTreeObserver;
 import android.widget.FrameLayout;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.InsettableFrameLayout;
-import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAnimUtils;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.Workspace;
 import com.android.launcher3.anim.RevealOutlineAnimation;
 import com.android.launcher3.anim.RoundedRectRevealOutlineProvider;
 import com.android.launcher3.dragndrop.DragLayer;
@@ -64,11 +59,9 @@ import com.android.launcher3.shortcuts.DeepShortcutView;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.BaseDragLayer;
-import com.android.launcher3.widget.LocalColorExtractor;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 
 /**
  * A container for shortcuts to deep links and notifications associated with an app.
@@ -80,9 +73,6 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
 
     // +1 for system shortcut view
     private static final int MAX_NUM_CHILDREN = MAX_SHORTCUTS + 1;
-    // Index used to get background color when using local wallpaper color extraction,
-    private static final int LIGHT_COLOR_EXTRACTION_INDEX = android.R.color.system_accent2_50;
-    private static final int DARK_COLOR_EXTRACTION_INDEX = android.R.color.system_accent2_800;
 
     private final Rect mTempRect = new Rect();
 
@@ -114,14 +104,8 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
 
     private Runnable mOnCloseCallback = () -> { };
 
-    // The rect string of the view that the arrow is attached to, in screen reference frame.
-    private String mArrowColorRectString;
     private int mArrowColor;
     private final int[] mColors;
-    private final HashMap<String, View> mViewForRect = new HashMap<>();
-
-    private final int mColorExtractionIndex;
-    @Nullable private LocalColorExtractor mColorExtractor;
 
     public ArrowPopup(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
@@ -129,9 +113,7 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
         mOutlineRadius = Themes.getDialogCornerRadius(context);
         mLauncher = BaseDraggingActivity.fromContext(context);
         mIsRtl = Utilities.isRtl(getResources());
-        mColorExtractionIndex = Utilities.isDarkTheme(context)
-                ? DARK_COLOR_EXTRACTION_INDEX
-                : LIGHT_COLOR_EXTRACTION_INDEX;
+
         setClipToOutline(true);
         setOutlineProvider(new ViewOutlineProvider() {
             @Override
@@ -176,10 +158,6 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
                 mColors[i] =
                         (int) argb.evaluate((i + 1) * step, primaryColor, secondaryColor);
             }
-
-            if (Utilities.ATLEAST_S) {
-                setupColorExtraction();
-            }
         }
     }
 
@@ -364,15 +342,6 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
             // so we centered it instead. In that case we don't want to showDefaultOptions the arrow.
             mArrow.setVisibility(INVISIBLE);
         } else {
-            updateArrowColor();
-        }
-
-        mArrow.setPivotX(mArrowWidth / 2.0f);
-        mArrow.setPivotY(mIsAboveIcon ? mArrowHeight : 0);
-    }
-
-    private void updateArrowColor() {
-        if (!Gravity.isVertical(mGravity)) {
             mArrow.setBackground(new RoundedArrowDrawable(
                     mArrowWidth, mArrowHeight, mArrowPointRadius,
                     mOutlineRadius, getMeasuredWidth(), getMeasuredHeight(),
@@ -381,6 +350,9 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
                     mArrowColor));
             mArrow.setElevation(getElevation());
         }
+
+        mArrow.setPivotX(mArrowWidth / 2.0f);
+        mArrow.setPivotY(mIsAboveIcon ? mArrowHeight : 0);
     }
 
     /**
@@ -699,11 +671,6 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
         getPopupContainer().removeView(this);
         getPopupContainer().removeView(mArrow);
         mOnCloseCallback.run();
-        mArrowColorRectString = null;
-        mViewForRect.clear();
-        if (mColorExtractor != null) {
-            mColorExtractor.removeLocations();
-        }
     }
 
     /**
@@ -713,68 +680,6 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
         mOnCloseCallback = callback;
     }
 
-    private void setupColorExtraction() {
-        Workspace workspace = mLauncher.findViewById(R.id.workspace);
-        if (workspace == null) {
-            return;
-        }
-
-        mColorExtractor = LocalColorExtractor.newInstance(mLauncher);
-        mColorExtractor.setListener((rect, extractedColors) -> {
-            String rectString = rect.toShortString();
-            View v = mViewForRect.get(rectString);
-            if (v != null) {
-                int newColor = extractedColors.get(mColorExtractionIndex);
-                setChildColor(v, newColor);
-                if (rectString.equals(mArrowColorRectString)) {
-                    mArrowColor = newColor;
-                    updateArrowColor();
-                }
-            }
-        });
-
-        getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
-            @Override
-            public boolean onPreDraw() {
-                getViewTreeObserver().removeOnPreDrawListener(this);
-
-                ArrayList<RectF> locations = new ArrayList<>();
-                Rect r = new Rect();
-
-                int count = getChildCount();
-                int numVisibleChild = 0;
-                for (int i = 0; i < count; i++) {
-                    View view = getChildAt(i);
-                    if (view.getVisibility() == VISIBLE) {
-                        RectF rf = new RectF();
-                        getColorExtractionRect(Launcher.getLauncher(getContext()),
-                                workspace.getCurrentPage(), view, rf);
-                        if (rf.isEmpty()) {
-                            numVisibleChild++;
-                            continue;
-                        }
-
-                        locations.add(rf);
-                        String rectString = rf.toShortString();
-                        mViewForRect.put(rectString, view);
-
-                        // Arrow color matches the first child or the last child.
-                        if (!mIsAboveIcon && numVisibleChild == 0) {
-                            mArrowColorRectString = rectString;
-                        } else if (mIsAboveIcon) {
-                            mArrowColorRectString = rectString;
-                        }
-
-                        numVisibleChild++;
-                    }
-                }
-
-                mColorExtractor.addLocation(locations);
-                return false;
-            }
-        });
-    }
-
     protected BaseDragLayer getPopupContainer() {
         return mLauncher.getDragLayer();
     }
diff --git a/src/com/android/launcher3/util/ColorExtractionUtils.java b/src/com/android/launcher3/util/ColorExtractionUtils.java
deleted file mode 100644
index b377ded44a..0000000000
--- a/src/com/android/launcher3/util/ColorExtractionUtils.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.util;
-
-import android.content.res.Resources;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.view.View;
-
-import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.Launcher;
-import com.android.launcher3.Utilities;
-
-/**
- * Utility class used to map launcher views to wallpaper rect.
- */
-public class ColorExtractionUtils {
-
-    public static final String TAG = "ColorExtractionUtils";
-
-    private static final Rect sTempRect = new Rect();
-    private static final RectF sTempRectF = new RectF();
-
-    /**
-     * Takes a view and returns its rect that can be used by the wallpaper local color extractor.
-     *
-     * @param launcher Launcher class class.
-     * @param pageId The page the workspace item is on.
-     * @param v The view.
-     * @param colorExtractionRectOut The location rect, but converted to a format expected by the
-     *                               wallpaper local color extractor.
-     */
-    public static void getColorExtractionRect(Launcher launcher, int pageId, View v,
-            RectF colorExtractionRectOut) {
-        Rect viewRect = sTempRect;
-        viewRect.set(0, 0, v.getWidth(), v.getHeight());
-        Utilities.getBoundsForViewInDragLayer(launcher.getDragLayer(), v, viewRect, false,
-                sTempRectF);
-        Utilities.setRect(sTempRectF, viewRect);
-        getColorExtractionRect(launcher, pageId, viewRect, colorExtractionRectOut);
-    }
-
-    /**
-     * Takes a rect in drag layer coordinates and returns the rect that can be used by the wallpaper
-     * local color extractor.
-     *
-     * @param launcher Launcher class.
-     * @param pageId The page the workspace item is on.
-     * @param rectInDragLayer The relevant bounds of the view in drag layer coordinates.
-     * @param colorExtractionRectOut The location rect, but converted to a format expected by the
-     *                               wallpaper local color extractor.
-     */
-    public static void getColorExtractionRect(Launcher launcher, int pageId, Rect rectInDragLayer,
-            RectF colorExtractionRectOut) {
-        // If the view hasn't been measured and laid out, we cannot do this.
-        if (rectInDragLayer.isEmpty()) {
-            colorExtractionRectOut.setEmpty();
-            return;
-        }
-
-        Resources res = launcher.getResources();
-        DeviceProfile dp = launcher.getDeviceProfile().inv.getDeviceProfile(launcher);
-        float screenWidth = dp.widthPx;
-        float screenHeight = dp.heightPx;
-        int numScreens = launcher.getWorkspace().getNumPagesForWallpaperParallax();
-        pageId = Utilities.isRtl(res) ? numScreens - pageId - 1 : pageId;
-        float relativeScreenWidth = 1f / numScreens;
-
-        int[] dragLayerBounds = new int[2];
-        launcher.getDragLayer().getLocationOnScreen(dragLayerBounds);
-        // Translate from drag layer coordinates to screen coordinates.
-        int screenLeft = rectInDragLayer.left + dragLayerBounds[0];
-        int screenTop = rectInDragLayer.top + dragLayerBounds[1];
-        int screenRight = rectInDragLayer.right + dragLayerBounds[0];
-        int screenBottom = rectInDragLayer.bottom + dragLayerBounds[1];
-
-        // This is the position of the view relative to the wallpaper, as expected by the
-        // local color extraction of the WallpaperManager.
-        // The coordinate system is such that, on the horizontal axis, each screen has a
-        // distinct range on the [0,1] segment. So if there are 3 screens, they will have the
-        // ranges [0, 1/3], [1/3, 2/3] and [2/3, 1]. The position on the subrange should be
-        // the position of the view relative to the screen. For the vertical axis, this is
-        // simply the location of the view relative to the screen.
-        // Translate from drag layer coordinates to screen coordinates
-        colorExtractionRectOut.left = (screenLeft / screenWidth + pageId) * relativeScreenWidth;
-        colorExtractionRectOut.right = (screenRight / screenWidth + pageId) * relativeScreenWidth;
-        colorExtractionRectOut.top = screenTop / screenHeight;
-        colorExtractionRectOut.bottom = screenBottom / screenHeight;
-
-        if (colorExtractionRectOut.left < 0
-                || colorExtractionRectOut.right > 1
-                || colorExtractionRectOut.top < 0
-                || colorExtractionRectOut.bottom > 1) {
-            colorExtractionRectOut.setEmpty();
-        }
-    }
-}
diff --git a/src/com/android/launcher3/util/Themes.java b/src/com/android/launcher3/util/Themes.java
index 898ac255d5..11b856e266 100644
--- a/src/com/android/launcher3/util/Themes.java
+++ b/src/com/android/launcher3/util/Themes.java
@@ -21,6 +21,7 @@ import static android.app.WallpaperColors.HINT_SUPPORTS_DARK_THEME;
 
 import android.app.WallpaperManager;
 import android.content.Context;
+import android.content.res.Configuration;
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.ColorMatrix;
@@ -47,12 +48,16 @@ public class Themes {
     }
 
     public static int getActivityThemeRes(Context context, int wallpaperColorHints) {
+        Configuration configuration = context.getResources().getConfiguration();
+        int nightMode = configuration.uiMode & Configuration.UI_MODE_NIGHT_MASK;
+        boolean darkTheme = nightMode == Configuration.UI_MODE_NIGHT_YES;
+
         boolean supportsDarkText = Utilities.ATLEAST_S
                 && (wallpaperColorHints & HINT_SUPPORTS_DARK_TEXT) != 0;
         boolean isMainColorDark = Utilities.ATLEAST_S
                 && (wallpaperColorHints & HINT_SUPPORTS_DARK_THEME) != 0;
 
-        if (Utilities.isDarkTheme(context)) {
+        if (darkTheme) {
             return supportsDarkText ? R.style.AppTheme_Dark_DarkText
                     : isMainColorDark ? R.style.AppTheme_Dark_DarkMainColor : R.style.AppTheme_Dark;
         } else {
diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java
index 1ddd1ba89f..d49320b073 100644
--- a/src/com/android/launcher3/views/FloatingIconView.java
+++ b/src/com/android/launcher3/views/FloatingIconView.java
@@ -233,8 +233,15 @@ public class FloatingIconView extends FrameLayout implements
             outViewBounds.set(0, 0, v.getWidth(), v.getHeight());
         }
 
-        Utilities.getBoundsForViewInDragLayer(launcher.getDragLayer(), v, outViewBounds,
-                ignoreTransform, outRect);
+        float[] points = new float[] {outViewBounds.left, outViewBounds.top, outViewBounds.right,
+                outViewBounds.bottom};
+        Utilities.getDescendantCoordRelativeToAncestor(v, launcher.getDragLayer(), points,
+                false, ignoreTransform);
+        outRect.set(
+                Math.min(points[0], points[2]),
+                Math.min(points[1], points[3]),
+                Math.max(points[0], points[2]),
+                Math.max(points[1], points[3]));
     }
 
     /**
diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
index 697c4531c2..620604a4d1 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
@@ -16,10 +16,6 @@
 
 package com.android.launcher3.widget;
 
-import static com.android.launcher3.Utilities.getBoundsForViewInDragLayer;
-import static com.android.launcher3.Utilities.setRect;
-import static com.android.launcher3.util.ColorExtractionUtils.getColorExtractionRect;
-
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
 import android.content.res.Configuration;
@@ -29,6 +25,7 @@ import android.graphics.Rect;
 import android.graphics.RectF;
 import android.os.Handler;
 import android.os.SystemClock;
+import android.util.Log;
 import android.util.SparseBooleanArray;
 import android.util.SparseIntArray;
 import android.view.LayoutInflater;
@@ -98,11 +95,11 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
     private RectF mLastLocationRegistered = null;
     @Nullable private AppWidgetHostViewDragListener mDragListener;
 
-    // Used to store the widget sizes in drag layer coordinates.
+    // Used to store the widget size during onLayout.
     private final Rect mCurrentWidgetSize = new Rect();
     private final Rect mWidgetSizeAtDrag = new Rect();
-
     private final RectF mTempRectF = new RectF();
+    private final boolean mIsRtl;
     private final Rect mEnforcedRectangle = new Rect();
     private final float mEnforcedCornerRadius;
     private final ViewOutlineProvider mCornerRadiusEnforcementOutline = new ViewOutlineProvider() {
@@ -132,6 +129,7 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         if (Utilities.ATLEAST_Q && Themes.getAttrBoolean(mLauncher, R.attr.isWorkspaceDarkText)) {
             setOnLightBackground(true);
         }
+        mIsRtl = Utilities.isRtl(context.getResources());
         mColorExtractor = LocalColorExtractor.newInstance(getContext());
         mColorExtractor.setListener(this);
 
@@ -321,12 +319,13 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         mIsScrollable = checkScrollableRecursively(this);
 
         if (!mIsInDragMode && getTag() instanceof LauncherAppWidgetInfo) {
+            mCurrentWidgetSize.left = left;
+            mCurrentWidgetSize.top = top;
+            mCurrentWidgetSize.right = right;
+            mCurrentWidgetSize.bottom = bottom;
             LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) getTag();
-            getBoundsForViewInDragLayer(mLauncher.getDragLayer(), this, mCurrentWidgetSize, true,
-                    mTempRectF);
-            setRect(mTempRectF, mCurrentWidgetSize);
-            updateColorExtraction(mCurrentWidgetSize,
-                    mWorkspace.getPageIndexForScreenId(info.screenId));
+            int pageId = mWorkspace.getPageIndexForScreenId(info.screenId);
+            updateColorExtraction(mCurrentWidgetSize, pageId);
         }
 
         enforceRoundedCorners();
@@ -339,8 +338,8 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
     }
 
     /** Handles a drag event occurred on a workspace page, {@code pageId}. */
-    public void handleDrag(Rect rectInDragLayer, int pageId) {
-        mWidgetSizeAtDrag.set(rectInDragLayer);
+    public void handleDrag(Rect rect, int pageId) {
+        mWidgetSizeAtDrag.set(rect);
         updateColorExtraction(mWidgetSizeAtDrag, pageId);
     }
 
@@ -352,14 +351,53 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         requestLayout();
     }
 
-    /**
-     * @param rectInDragLayer Rect of widget in drag layer coordinates.
-     * @param pageId The workspace page the widget is on.
-     */
-    private void updateColorExtraction(Rect rectInDragLayer, int pageId) {
-        getColorExtractionRect(mLauncher, pageId, rectInDragLayer, mTempRectF);
-
-        if (mTempRectF.isEmpty()) {
+    private void updateColorExtraction(Rect widgetLocation, int pageId) {
+        // If the widget hasn't been measured and laid out, we cannot do this.
+        if (widgetLocation.isEmpty()) {
+            return;
+        }
+        int screenWidth = mLauncher.getDeviceProfile().widthPx;
+        int screenHeight = mLauncher.getDeviceProfile().heightPx;
+        int numScreens = mWorkspace.getNumPagesForWallpaperParallax();
+        pageId = mIsRtl ? numScreens - pageId - 1 : pageId;
+        float relativeScreenWidth = 1f / numScreens;
+        float absoluteTop = widgetLocation.top;
+        float absoluteBottom = widgetLocation.bottom;
+        View v = this;
+        while (v.getParent() instanceof View) {
+            v = (View) v.getParent();
+            if (v.getId() != R.id.launcher) {
+                break;
+            }
+            absoluteBottom += v.getTop();
+            absoluteTop += v.getTop();
+        }
+        float xOffset = 0;
+        View parentView = (View) getParent();
+        // The layout depends on the orientation.
+        if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
+            int parentViewWidth = parentView == null ? 0 : parentView.getWidth();
+            xOffset = screenWidth - mWorkspace.getPaddingRight() - parentViewWidth;
+        } else {
+            int parentViewPaddingLeft = parentView == null ? 0 : parentView.getPaddingLeft();
+            xOffset = mWorkspace.getPaddingLeft() + parentViewPaddingLeft;
+        }
+        // This is the position of the widget relative to the wallpaper, as expected by the
+        // local color extraction of the WallpaperManager.
+        // The coordinate system is such that, on the horizontal axis, each screen has a
+        // distinct range on the [0,1] segment. So if there are 3 screens, they will have the
+        // ranges [0, 1/3], [1/3, 2/3] and [2/3, 1]. The position on the subrange should be
+        // the position of the widget relative to the screen. For the vertical axis, this is
+        // simply the location of the widget relative to the screen.
+        mTempRectF.left = ((widgetLocation.left + xOffset) / screenWidth + pageId)
+                * relativeScreenWidth;
+        mTempRectF.right = ((widgetLocation.right + xOffset) / screenWidth + pageId)
+                * relativeScreenWidth;
+        mTempRectF.top = absoluteTop / screenHeight;
+        mTempRectF.bottom = absoluteBottom / screenHeight;
+        if (mTempRectF.left < 0 || mTempRectF.right > 1 || mTempRectF.top < 0
+                || mTempRectF.bottom > 1) {
+            Log.e(LOG_TAG, "   Error, invalid relative position");
             return;
         }
         if (!mTempRectF.equals(mLastLocationRegistered)) {
diff --git a/src/com/android/launcher3/widget/LocalColorExtractor.java b/src/com/android/launcher3/widget/LocalColorExtractor.java
index 2121bc288b..097158b072 100644
--- a/src/com/android/launcher3/widget/LocalColorExtractor.java
+++ b/src/com/android/launcher3/widget/LocalColorExtractor.java
@@ -43,10 +43,7 @@ public class LocalColorExtractor implements ResourceBasedOverride {
         void onColorsChanged(RectF rect, SparseIntArray extractedColors);
     }
 
-    /**
-     * Returns a new instance of the LocalColorExtractor.
-     */
-    public static LocalColorExtractor newInstance(Context context) {
+    static LocalColorExtractor newInstance(Context context) {
         return Overrides.getObject(LocalColorExtractor.class, context.getApplicationContext(),
                 R.string.local_colors_extraction_class);
     }
-- 
GitLab


From daa3b8b9a30803e1f217a8e41418e40c000c86a4 Mon Sep 17 00:00:00 2001
From: Zak Cohen <zakcohen@google.com>
Date: Mon, 3 May 2021 13:55:59 -0700
Subject: [PATCH 1041/1664] AssistContentRequester-weaken references to system
 callback

The callback objects used to call into system server can
outlive the parent requester object. This can cause leaked
activities (on rotation for example). Use a weaker collection
of callback objects that aren't tied to the lifecycle of
the callback.

Bug: 186670923
Test: Ran TAPL tests to check for leaked activities
Change-Id: I33f556ad55b823652b06410d264f1473d3003320
---
 .../util/AssistContentRequester.java          | 41 +++++++++++++++----
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/util/AssistContentRequester.java b/quickstep/src/com/android/quickstep/util/AssistContentRequester.java
index 3730284ee8..71c6382323 100644
--- a/quickstep/src/com/android/quickstep/util/AssistContentRequester.java
+++ b/quickstep/src/com/android/quickstep/util/AssistContentRequester.java
@@ -28,6 +28,10 @@ import android.util.Log;
 
 import com.android.launcher3.util.Executors;
 
+import java.lang.ref.WeakReference;
+import java.util.Collections;
+import java.util.Map;
+import java.util.WeakHashMap;
 import java.util.concurrent.Executor;
 
 /**
@@ -51,6 +55,10 @@ public class AssistContentRequester {
     private final String mPackageName;
     private final Executor mCallbackExecutor;
 
+    // If system loses the callback, our internal cache of original callback will also get cleared.
+    private final Map<Object, Callback> mPendingCallbacks =
+            Collections.synchronizedMap(new WeakHashMap<>());
+
     public AssistContentRequester(Context context) {
         mActivityTaskManager = ActivityTaskManager.getService();
         mPackageName = context.getApplicationContext().getPackageName();
@@ -66,20 +74,28 @@ public class AssistContentRequester {
     public void requestAssistContent(int taskId, Callback callback) {
         try {
             mActivityTaskManager.requestAssistDataForTask(
-                    new AssistDataReceiver(callback, mCallbackExecutor), taskId, mPackageName);
+                    new AssistDataReceiver(callback, this), taskId, mPackageName);
         } catch (RemoteException e) {
             Log.e(TAG, "Requesting assist content failed for task: " + taskId, e);
         }
     }
 
+    private void executeOnMainExecutor(Runnable callback) {
+        mCallbackExecutor.execute(callback);
+    }
+
     private static final class AssistDataReceiver extends IAssistDataReceiver.Stub {
 
-        private final Executor mExecutor;
-        private final Callback mCallback;
+        // The AssistDataReceiver binder callback object is passed to a system server, that may
+        // keep hold of it for longer than the lifetime of the AssistContentRequester object,
+        // potentially causing a memory leak. In the callback passed to the system server, only
+        // keep a weak reference to the parent object and lookup its callback if it still exists.
+        private final WeakReference<AssistContentRequester> mParentRef;
+        private final Object mCallbackKey = new Object();
 
-        AssistDataReceiver(Callback callback, Executor callbackExecutor) {
-            mCallback = callback;
-            mExecutor = callbackExecutor;
+        AssistDataReceiver(Callback callback, AssistContentRequester parent) {
+            parent.mPendingCallbacks.put(mCallbackKey, callback);
+            mParentRef = new WeakReference<>(parent);
         }
 
         @Override
@@ -94,7 +110,18 @@ public class AssistContentRequester {
                 return;
             }
 
-            mExecutor.execute(() -> mCallback.onAssistContentAvailable(content));
+            AssistContentRequester requester = mParentRef.get();
+            if (requester != null) {
+                Callback callback = requester.mPendingCallbacks.get(mCallbackKey);
+                if (callback != null) {
+                    requester.executeOnMainExecutor(
+                            () -> callback.onAssistContentAvailable(content));
+                } else {
+                    Log.d(TAG, "Callback received after calling UI was disposed of");
+                }
+            } else {
+                Log.d(TAG, "Callback received after Requester was collected");
+            }
         }
 
         @Override
-- 
GitLab


From 19ff728b921cecb77493f996d023cae6509601f5 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 22 Apr 2021 10:12:54 -0700
Subject: [PATCH 1042/1664] Adding support for determining split layout for
 launcher.

> Simulating the windo wmanager API to get available device
  profiles until final API
> When a device has multiple internal displays, and with both
  tablet and phone possibilities, it uses a split workspace layout

Bug: 186160341
Bug: 175782275
Test: Manual
Change-Id: Ieff2329acac7cdd6b9abe6f96cd459cd45bd0efe
---
 .../launcher3/BaseQuickstepLauncher.java      |   4 +-
 .../appprediction/PredictionRowView.java      |   5 +-
 .../model/QuickstepModelDelegate.java         |   6 +-
 .../launcher3/uioverrides/ApiWrapper.java     |  10 +
 .../OrientationTouchTransformer.java          |   6 +-
 .../RecentsAnimationDeviceState.java          |  12 +-
 .../quickstep/RotationTouchHelper.java        |   6 +-
 .../DeviceLockedInputConsumer.java            |   2 +-
 .../OneHandedModeInputConsumer.java           |   2 +-
 .../quickstep/util/RecentsOrientedState.java  |  28 ++-
 .../quickstep/util/SplitScreenBounds.java     |   7 +-
 res/values-sw600dp/config.xml                 |   3 -
 res/values/attrs.xml                          |  26 +-
 res/values/config.xml                         |   3 -
 .../launcher3/ui/LauncherUIScrollTest.java    |   2 +-
 .../LauncherAppWidgetProviderInfoTest.java    |   9 +-
 .../launcher3/AppWidgetResizeFrame.java       | 121 ++++-----
 src/com/android/launcher3/DeviceProfile.java  | 159 +++++-------
 src/com/android/launcher3/Hotseat.java        |   6 +-
 .../launcher3/InvariantDeviceProfile.java     | 234 ++++++++++--------
 src/com/android/launcher3/Launcher.java       |   4 +-
 src/com/android/launcher3/Workspace.java      |   2 +-
 .../allapps/AllAppsContainerView.java         |   2 +-
 .../launcher3/allapps/AllAppsGridAdapter.java |   2 +-
 .../launcher3/dragndrop/AddItemActivity.java  |   3 +-
 .../graphics/GridCustomizationsProvider.java  |   5 +-
 .../graphics/LauncherPreviewRenderer.java     |   2 +-
 .../launcher3/qsb/QsbContainerView.java       |  23 +-
 .../SecondaryDisplayLauncher.java             |   4 +-
 .../secondarydisplay/SecondaryDragLayer.java  |   7 +-
 .../launcher3/util/DisplayController.java     | 148 ++++++++---
 .../android/launcher3/util/WindowBounds.java  |  43 ++++
 .../launcher3/util/WindowManagerCompat.java   | 107 ++++++++
 .../widget/DeferredAppWidgetHostView.java     |   2 +-
 .../widget/LauncherAppWidgetProviderInfo.java |  20 +-
 .../widget/PendingAddWidgetInfo.java          |   6 +
 .../widget/WidgetHostViewLoader.java          |  34 +--
 .../launcher3/uioverrides/ApiWrapper.java     |  10 +
 .../android/launcher3/common/WidgetUtils.java |   3 +-
 39 files changed, 623 insertions(+), 455 deletions(-)
 create mode 100644 src/com/android/launcher3/util/WindowManagerCompat.java

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index c6c6c01542..cd22196686 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -19,7 +19,7 @@ import static com.android.launcher3.AbstractFloatingView.TYPE_ALL;
 import static com.android.launcher3.AbstractFloatingView.TYPE_HIDE_BACK_BUTTON;
 import static com.android.launcher3.LauncherState.FLAG_HIDE_BACK_BUTTON;
 import static com.android.launcher3.LauncherState.NORMAL;
-import static com.android.launcher3.util.DisplayController.CHANGE_SIZE;
+import static com.android.launcher3.util.DisplayController.CHANGE_ACTIVE_SCREEN;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY;
@@ -240,7 +240,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
     public void onDisplayInfoChanged(Context context, DisplayController.Info info,
             int flags) {
         super.onDisplayInfoChanged(context, info, flags);
-        if ((flags & CHANGE_SIZE) != 0) {
+        if ((flags & CHANGE_ACTIVE_SCREEN) != 0) {
             addTaskbarIfNecessary();
         }
     }
diff --git a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
index cc3ccea4d0..6d5975f5fa 100644
--- a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
+++ b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
@@ -33,7 +33,6 @@ import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
 import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.FloatingHeaderRow;
 import com.android.launcher3.allapps.FloatingHeaderView;
@@ -80,9 +79,9 @@ public class PredictionRowView extends LinearLayout implements
         setOrientation(LinearLayout.HORIZONTAL);
 
         mFocusHelper = new SimpleFocusIndicatorHelper(this);
-        mNumPredictedAppsPerRow = LauncherAppState.getIDP(context).numAllAppsColumns;
         mLauncher = Launcher.getLauncher(context);
         mLauncher.addOnDeviceProfileChangeListener(this);
+        mNumPredictedAppsPerRow = mLauncher.getDeviceProfile().numShownAllAppsColumns;
         updateVisibility();
     }
 
@@ -174,7 +173,7 @@ public class PredictionRowView extends LinearLayout implements
 
     @Override
     public void onDeviceProfileChanged(DeviceProfile dp) {
-        mNumPredictedAppsPerRow = dp.inv.numAllAppsColumns;
+        mNumPredictedAppsPerRow = dp.numShownAllAppsColumns;
         removeAllViews();
         applyPredictionApps();
     }
diff --git a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
index 8c6887250e..b0c13f99c0 100644
--- a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
+++ b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
@@ -104,8 +104,8 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
         // TODO: Implement caching and preloading
         super.loadItems(ums, pinnedShortcuts);
 
-        WorkspaceItemFactory allAppsFactory =
-                new WorkspaceItemFactory(mApp, ums, pinnedShortcuts, mIDP.numAllAppsColumns);
+        WorkspaceItemFactory allAppsFactory = new WorkspaceItemFactory(
+                mApp, ums, pinnedShortcuts, mIDP.numDatabaseAllAppsColumns);
         mAllAppsState.items.setItems(
                 mAllAppsState.storage.read(mApp.getContext(), allAppsFactory, ums.allUsers::get));
         mDataModel.extraItems.put(CONTAINER_PREDICTION, mAllAppsState.items);
@@ -204,7 +204,7 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
         registerPredictor(mAllAppsState, apm.createAppPredictionSession(
                 new AppPredictionContext.Builder(context)
                         .setUiSurface("home")
-                        .setPredictedTargetCount(mIDP.numAllAppsColumns)
+                        .setPredictedTargetCount(mIDP.numDatabaseAllAppsColumns)
                         .build()));
 
         // TODO: get bundle
diff --git a/quickstep/src/com/android/launcher3/uioverrides/ApiWrapper.java b/quickstep/src/com/android/launcher3/uioverrides/ApiWrapper.java
index 1e03b05b5e..76a5782d11 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/ApiWrapper.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/ApiWrapper.java
@@ -18,13 +18,23 @@ package com.android.launcher3.uioverrides;
 
 import android.app.Person;
 import android.content.pm.ShortcutInfo;
+import android.view.Display;
 
 import com.android.launcher3.Utilities;
 
 public class ApiWrapper {
 
+    public static final boolean TASKBAR_DRAWN_IN_PROCESS = true;
+
     public static Person[] getPersons(ShortcutInfo si) {
         Person[] persons = si.getPersons();
         return persons == null ? Utilities.EMPTY_PERSON_ARRAY : persons;
     }
+
+    /**
+     * Returns true if the display is an internal displays
+     */
+    public static boolean isInternalDisplay(Display display) {
+        return display.getType() == Display.TYPE_INTERNAL;
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
index c47300cd5f..62b821c41d 100644
--- a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
+++ b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
@@ -191,7 +191,7 @@ class OrientationTouchTransformer {
      * @see #enableMultipleRegions(boolean, Info)
      */
     void createOrAddTouchRegion(Info info) {
-        mCurrentDisplay = new CurrentDisplay(info.realSize, info.rotation);
+        mCurrentDisplay = new CurrentDisplay(info.currentSize, info.rotation);
 
         if (mQuickStepStartingRotation > QUICKSTEP_ROTATION_UNINITIALIZED
                 && mCurrentDisplay.rotation == mQuickStepStartingRotation) {
@@ -256,7 +256,7 @@ class OrientationTouchTransformer {
             Log.d(TAG, "clearing all regions except rotation: " + mCurrentDisplay.rotation);
         }
 
-        mCurrentDisplay = new CurrentDisplay(region.realSize, region.rotation);
+        mCurrentDisplay = new CurrentDisplay(region.currentSize, region.rotation);
         OrientationRectF regionToKeep = mSwipeTouchRegions.get(mCurrentDisplay);
         if (DEBUG) {
             Log.d(TestProtocol.NO_SWIPE_TO_HOME, "cached region: " + regionToKeep
@@ -289,7 +289,7 @@ class OrientationTouchTransformer {
             + " with mode: " + mMode + " displayRotation: " + display.rotation);
         }
 
-        Point size = display.realSize;
+        Point size = display.currentSize;
         int rotation = display.rotation;
         int touchHeight = mNavBarGesturalHeight;
         OrientationRectF orientationRectF =
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index ef09957c9d..e271203d18 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -18,7 +18,7 @@ package com.android.quickstep;
 import static android.content.Intent.ACTION_USER_UNLOCKED;
 
 import static com.android.launcher3.util.DisplayController.CHANGE_ALL;
-import static com.android.launcher3.util.DisplayController.CHANGE_FRAME_DELAY;
+import static com.android.launcher3.util.DisplayController.CHANGE_ROTATION;
 import static com.android.launcher3.util.SettingsCache.ONE_HANDED_ENABLED;
 import static com.android.launcher3.util.SettingsCache.ONE_HANDED_SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED;
 import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
@@ -271,15 +271,9 @@ public class RecentsAnimationDeviceState implements
 
     @Override
     public void onDisplayInfoChanged(Context context, Info info, int flags) {
-        if (info.id != getDisplayId() || flags == CHANGE_FRAME_DELAY) {
-            // ignore displays that aren't running launcher and frame refresh rate changes
-            return;
+        if ((flags & CHANGE_ROTATION) != 0) {
+            mNavBarPosition = new NavBarPosition(mMode, info);
         }
-
-        if (!mMode.hasGestures) {
-            return;
-        }
-        mNavBarPosition = new NavBarPosition(mMode, info);
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/RotationTouchHelper.java b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
index fd0de4212f..76298624d3 100644
--- a/quickstep/src/com/android/quickstep/RotationTouchHelper.java
+++ b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
@@ -17,8 +17,9 @@ package com.android.quickstep;
 
 import static android.view.Surface.ROTATION_0;
 
+import static com.android.launcher3.util.DisplayController.CHANGE_ACTIVE_SCREEN;
 import static com.android.launcher3.util.DisplayController.CHANGE_ALL;
-import static com.android.launcher3.util.DisplayController.CHANGE_FRAME_DELAY;
+import static com.android.launcher3.util.DisplayController.CHANGE_ROTATION;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.quickstep.SysUINavigationMode.Mode.THREE_BUTTONS;
 
@@ -274,8 +275,7 @@ public class RotationTouchHelper implements
 
     @Override
     public void onDisplayInfoChanged(Context context, Info info, int flags) {
-        if (info.id != mDisplayId|| flags == CHANGE_FRAME_DELAY) {
-            // ignore displays that aren't running launcher and frame refresh rate changes
+        if ((flags & (CHANGE_ROTATION | CHANGE_ACTIVE_SCREEN)) == 0) {
             return;
         }
 
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
index 9c647946ea..fcc0217499 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
@@ -116,7 +116,7 @@ public class DeviceLockedInputConsumer implements InputConsumer,
                 R.dimen.device_locked_y_offset);
 
         // Do not use DeviceProfile as the user data might be locked
-        mDisplaySize = DisplayController.INSTANCE.get(context).getInfo().realSize;
+        mDisplaySize = DisplayController.INSTANCE.get(context).getInfo().currentSize;
 
         // Init states
         mStateCallback = new MultiStateCallback(STATE_NAMES);
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
index d82d43d7f8..8d9c524a57 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
@@ -70,7 +70,7 @@ public class OneHandedModeInputConsumer extends DelegateInputConsumer {
         mDragDistThreshold = context.getResources().getDimensionPixelSize(
                 R.dimen.gestures_onehanded_drag_threshold);
         mSquaredSlop = Utilities.squaredTouchSlop(context);
-        mDisplaySize = DisplayController.INSTANCE.get(mContext).getInfo().realSize;
+        mDisplaySize = DisplayController.INSTANCE.get(mContext).getInfo().currentSize;
         mNavBarSize = ResourceUtils.getNavbarSize(NAVBAR_BOTTOM_GESTURE_SIZE,
                 mContext.getResources());
     }
diff --git a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
index 188efadd45..d164c8ce3e 100644
--- a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
+++ b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
@@ -33,6 +33,7 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.graphics.Matrix;
+import android.graphics.Point;
 import android.graphics.PointF;
 import android.graphics.Rect;
 import android.util.Log;
@@ -49,6 +50,7 @@ import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.PagedOrientationHandler;
+import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.SettingsCache;
 import com.android.launcher3.util.WindowBounds;
 import com.android.quickstep.BaseActivityInterface;
@@ -561,11 +563,27 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
      */
     public DeviceProfile getLauncherDeviceProfile() {
         InvariantDeviceProfile idp = InvariantDeviceProfile.INSTANCE.get(mContext);
-        // TODO also check the natural orientation is landscape or portrait
-        return  (mRecentsActivityRotation == ROTATION_90
-                || mRecentsActivityRotation == ROTATION_270)
-                ? idp.landscapeProfile
-                : idp.portraitProfile;
+        Point currentSize = DisplayController.INSTANCE.get(mContext).getInfo().currentSize;
+
+        int width, height;
+        if ((mRecentsActivityRotation == ROTATION_90 || mRecentsActivityRotation == ROTATION_270)) {
+            width = Math.max(currentSize.x, currentSize.y);
+            height = Math.min(currentSize.x, currentSize.y);
+        } else {
+            width = Math.min(currentSize.x, currentSize.y);
+            height = Math.max(currentSize.x, currentSize.y);
+        }
+
+        DeviceProfile bestMatch = idp.supportedProfiles.get(0);
+        float minDiff = Float.MAX_VALUE;
+        for (DeviceProfile profile : idp.supportedProfiles) {
+            float diff = Math.abs(profile.widthPx - width) + Math.abs(profile.heightPx - height);
+            if (diff < minDiff) {
+                minDiff = diff;
+                bestMatch = profile;
+            }
+        }
+        return bestMatch;
     }
 
     private static String nameAndAddress(Object obj) {
diff --git a/quickstep/src/com/android/quickstep/util/SplitScreenBounds.java b/quickstep/src/com/android/quickstep/util/SplitScreenBounds.java
index 88cc650276..483a1c652a 100644
--- a/quickstep/src/com/android/quickstep/util/SplitScreenBounds.java
+++ b/quickstep/src/com/android/quickstep/util/SplitScreenBounds.java
@@ -20,10 +20,7 @@ import static android.view.Surface.ROTATION_180;
 
 import android.annotation.TargetApi;
 import android.content.Context;
-import android.graphics.Insets;
-import android.graphics.Rect;
 import android.os.Build;
-import android.view.WindowInsets.Type;
 import android.view.WindowManager;
 import android.view.WindowMetrics;
 
@@ -73,10 +70,8 @@ public class SplitScreenBounds {
      */
     private static WindowBounds createDefaultWindowBounds(Context context) {
         WindowMetrics wm = context.getSystemService(WindowManager.class).getMaximumWindowMetrics();
-        Insets insets = wm.getWindowInsets().getInsets(Type.systemBars());
+        WindowBounds bounds = WindowBounds.fromWindowMetrics(wm);
 
-        WindowBounds bounds = new WindowBounds(wm.getBounds(),
-                new Rect(insets.left, insets.top, insets.right, insets.bottom));
         int rotation = DisplayController.INSTANCE.get(context).getInfo().rotation;
         int halfDividerSize = context.getResources()
                 .getDimensionPixelSize(R.dimen.multi_window_task_divider_size) / 2;
diff --git a/res/values-sw600dp/config.xml b/res/values-sw600dp/config.xml
index d50115b20d..09bdaafc1d 100644
--- a/res/values-sw600dp/config.xml
+++ b/res/values-sw600dp/config.xml
@@ -1,6 +1,3 @@
 <resources>
     <bool name="allow_rotation">true</bool>
-
-    <!-- Hotseat -->
-    <bool name="hotseat_transpose_layout_with_orientation">false</bool>
 </resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 93d88c2e94..a81802d87a 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -127,17 +127,24 @@
         <!-- numFolderRows & numFolderColumns defaults to numRows & numColumns, if not specified -->
         <attr name="numFolderRows" format="integer" />
         <attr name="numFolderColumns" format="integer" />
+        <!-- numAllAppsColumns defaults to numColumns, if not specified -->
+        <attr name="numAllAppsColumns" format="integer" />
+        <!-- Number of columns to use when extending the all-apps size,
+         defaults to 2 * numAllAppsColumns -->
+        <attr name="numExtendedAllAppsColumns" format="integer" />
+
         <!-- numHotseatIcons defaults to numColumns, if not specified -->
         <attr name="numHotseatIcons" format="integer" />
+        <!-- Number of icons to use when extending the hotseat size,
+         defaults to 2 * numHotseatIcons -->
+        <attr name="numExtendedHotseatIcons" format="integer" />
+
         <attr name="dbFile" format="string" />
         <attr name="defaultLayoutId" format="reference" />
         <attr name="demoModeLayoutId" format="reference" />
         <attr name="isScalable" format="boolean" />
         <attr name="devicePaddingId" format="reference" />
 
-        <!-- whether the grid option is shown to the user -->
-        <attr name="visible" format="boolean" />
-
     </declare-styleable>
 
     <declare-styleable name="DevicePadding">
@@ -167,8 +174,12 @@
         <attr name="iconTextSize" format="float" />
         <!-- landscapeIconTextSize defaults to iconTextSize, if not specified -->
         <attr name="landscapeIconTextSize" format="float" />
-        <!-- If true, this display option is used to determine the default grid -->
-        <attr name="canBeDefault" format="boolean" />
+
+        <!-- If set, this display option is used to determine the default grid -->
+        <attr name="canBeDefault" format="boolean|integer" >
+            <!-- The profile can be default on split display devices -->
+            <flag name="split_display" value="0x2" />
+        </attr>
 
         <!-- The following values are only enabled if grid is supported. -->
         <!-- allAppsIconSize defaults to iconSize, if not specified -->
@@ -176,11 +187,6 @@
         <!-- allAppsIconTextSize defaults to iconTextSize, if not specified -->
         <attr name="allAppsIconTextSize" format="float" />
 
-        <!-- numAllAppsColumns defaults to GridDisplayOption.numColumns, if not specified -->
-        <attr name="numAllAppsColumns" format="integer" />
-
-        <!-- numShownHotseatIcons defaults to GridDisplayOption.numHotseatIcons, if not specified -->
-        <attr name="numShownHotseatIcons" format="integer" />
     </declare-styleable>
 
     <declare-styleable name="CellLayout">
diff --git a/res/values/config.xml b/res/values/config.xml
index 1e7837353f..9ad12245be 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -55,9 +55,6 @@
     <!-- The duration of the caret animation -->
     <integer name="config_caretAnimationDuration">200</integer>
 
-    <!-- Hotseat -->
-    <bool name="hotseat_transpose_layout_with_orientation">true</bool>
-
     <!-- Various classes overriden by projects/build flavors. -->
     <string name="folder_name_provider_class" translatable="false"></string>
     <string name="stats_log_manager_class" translatable="false"></string>
diff --git a/robolectric_tests/src/com/android/launcher3/ui/LauncherUIScrollTest.java b/robolectric_tests/src/com/android/launcher3/ui/LauncherUIScrollTest.java
index 4d151f1948..ea755484c1 100644
--- a/robolectric_tests/src/com/android/launcher3/ui/LauncherUIScrollTest.java
+++ b/robolectric_tests/src/com/android/launcher3/ui/LauncherUIScrollTest.java
@@ -161,7 +161,7 @@ public class LauncherUIScrollTest {
 
     private static MotionEvent createScrollEvent(int scroll) {
         DeviceProfile dp = InvariantDeviceProfile.INSTANCE
-                .get(RuntimeEnvironment.application).portraitProfile;
+                .get(RuntimeEnvironment.application).supportedProfiles.get(0);
 
         final PointerProperties[] pointerProperties = new PointerProperties[1];
         pointerProperties[0] = new PointerProperties();
diff --git a/robolectric_tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java b/robolectric_tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java
index 92f77f2bbd..d97701148b 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java
@@ -17,6 +17,9 @@ package com.android.launcher3.widget;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+
 import android.content.Context;
 import android.graphics.Point;
 
@@ -109,10 +112,14 @@ public final class LauncherAppWidgetProviderInfoTest {
 
     private InvariantDeviceProfile createIDP() {
         DeviceProfile profile = Mockito.mock(DeviceProfile.class);
+        doAnswer(i -> {
+            ((Point) i.getArgument(0)).set(CELL_SIZE, CELL_SIZE);
+            return null;
+        }).when(profile).getCellSize(any(Point.class));
         Mockito.when(profile.getCellSize()).thenReturn(new Point(CELL_SIZE, CELL_SIZE));
 
         InvariantDeviceProfile idp = new InvariantDeviceProfile();
-        idp.landscapeProfile = idp.portraitProfile = profile;
+        idp.supportedProfiles.add(profile);
         return idp;
     }
 
diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java
index 5d41bb5c3e..20b4631dec 100644
--- a/src/com/android/launcher3/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher3/AppWidgetResizeFrame.java
@@ -1,5 +1,7 @@
 package com.android.launcher3;
 
+import static android.appwidget.AppWidgetHostView.getDefaultPaddingForWidget;
+
 import static com.android.launcher3.LauncherAnimUtils.LAYOUT_HEIGHT;
 import static com.android.launcher3.LauncherAnimUtils.LAYOUT_WIDTH;
 import static com.android.launcher3.Utilities.ATLEAST_S;
@@ -10,7 +12,9 @@ import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.PropertyValuesHolder;
 import android.appwidget.AppWidgetHostView;
+import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProviderInfo;
+import android.content.ComponentName;
 import android.content.Context;
 import android.graphics.Point;
 import android.graphics.Rect;
@@ -25,16 +29,14 @@ import android.view.View;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 
-import androidx.annotation.Nullable;
-
 import com.android.launcher3.accessibility.DragViewStateAnnouncer;
 import com.android.launcher3.dragndrop.DragLayer;
-import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.launcher3.widget.LauncherAppWidgetHostView;
 import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class AppWidgetResizeFrame extends AbstractFloatingView implements View.OnKeyListener {
     private static final int SNAP_DURATION = 150;
@@ -43,22 +45,6 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
 
     private static final Rect sTmpRect = new Rect();
 
-    // Represents the cell size on the grid in the two orientations.
-    public static final MainThreadInitializedObject<Point[]> CELL_SIZE =
-            new MainThreadInitializedObject<>(c -> {
-                InvariantDeviceProfile inv = LauncherAppState.getIDP(c);
-                return new Point[] {inv.landscapeProfile.getCellSize(),
-                        inv.portraitProfile.getCellSize()};
-            });
-
-    // Represents the border spacing size on the grid in the two orientations.
-    public static final MainThreadInitializedObject<int[]> BORDER_SPACING_SIZE =
-            new MainThreadInitializedObject<>(c -> {
-                InvariantDeviceProfile inv = LauncherAppState.getIDP(c);
-                return new int[] {inv.landscapeProfile.cellLayoutBorderSpacingPx,
-                        inv.portraitProfile.cellLayoutBorderSpacingPx};
-            });
-
     private static final int HANDLE_COUNT = 4;
     private static final int INDEX_LEFT = 0;
     private static final int INDEX_TOP = 1;
@@ -202,7 +188,7 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
         mMaxHSpan = info.maxSpanX;
         mMaxVSpan = info.maxSpanY;
 
-        mWidgetPadding = AppWidgetHostView.getDefaultPaddingForWidget(getContext(),
+        mWidgetPadding = getDefaultPaddingForWidget(getContext(),
                 widgetView.getAppWidgetInfo().provider, null);
 
         if (mResizeMode == AppWidgetProviderInfo.RESIZE_HORIZONTAL) {
@@ -392,81 +378,82 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
         mWidgetView.requestLayout();
     }
 
-    public static void updateWidgetSizeRanges(AppWidgetHostView widgetView, Launcher launcher,
-                                              int spanX, int spanY) {
-        List<SizeF> sizes = getWidgetSizes(launcher, spanX, spanY);
+    public static void updateWidgetSizeRanges(
+            AppWidgetHostView widgetView, Context context, int spanX, int spanY) {
+        List<SizeF> sizes = getWidgetSizes(context, spanX, spanY);
         if (ATLEAST_S) {
             widgetView.updateAppWidgetSize(new Bundle(), sizes);
         } else {
-            Rect bounds = getMinMaxSizes(sizes, null /* outRect */);
+            Rect bounds = getMinMaxSizes(sizes);
             widgetView.updateAppWidgetSize(new Bundle(), bounds.left, bounds.top, bounds.right,
                     bounds.bottom);
         }
     }
 
-    private static SizeF getWidgetSize(Context context, Point cellSize, int spanX, int spanY,
-            int borderSpacing) {
-        final float density = context.getResources().getDisplayMetrics().density;
-        final float hBorderSpacing = (spanX - 1) * borderSpacing;
-        final float vBorderSpacing = (spanY - 1) * borderSpacing;
-
-        return new SizeF(((spanX * cellSize.x) + hBorderSpacing) / density,
-                ((spanY * cellSize.y) + vBorderSpacing) / density);
-    }
-
     /** Returns the list of sizes for a widget of given span, in dp. */
     public static ArrayList<SizeF> getWidgetSizes(Context context, int spanX, int spanY) {
-        final Point[] cellSize = CELL_SIZE.get(context);
-        final int[] borderSpacing = BORDER_SPACING_SIZE.get(context);
-
-        SizeF landSize = getWidgetSize(context, cellSize[0], spanX, spanY, borderSpacing[0]);
-        SizeF portSize = getWidgetSize(context, cellSize[1], spanX, spanY, borderSpacing[1]);
-
         ArrayList<SizeF> sizes = new ArrayList<>(2);
-        sizes.add(landSize);
-        sizes.add(portSize);
+        final float density = context.getResources().getDisplayMetrics().density;
+        Point cellSize = new Point();
+
+        for (DeviceProfile profile : LauncherAppState.getIDP(context).supportedProfiles) {
+            final float hBorderSpacing = (spanX - 1) * profile.cellLayoutBorderSpacingPx;
+            final float vBorderSpacing = (spanY - 1) * profile.cellLayoutBorderSpacingPx;
+            profile.getCellSize(cellSize);
+            sizes.add(new SizeF(
+                    ((spanX * cellSize.x) + hBorderSpacing) / density,
+                    ((spanY * cellSize.y) + vBorderSpacing) / density));
+        }
         return sizes;
     }
 
+    /**
+     * Returns the bundle to be used as the default options for a widget with provided size
+     */
+    public static Bundle getWidgetSizeOptions(
+            Context context, ComponentName provider, int spanX, int spanY) {
+        ArrayList<SizeF> sizes = getWidgetSizes(context, spanX, spanY);
+        Rect padding = getDefaultPaddingForWidget(context, provider, null);
+        float density = context.getResources().getDisplayMetrics().density;
+        float xPaddingDips = (padding.left + padding.right) / density;
+        float yPaddingDips = (padding.top + padding.bottom) / density;
+
+        ArrayList<SizeF> paddedSizes = sizes.stream()
+                .map(size -> new SizeF(
+                        Math.max(0.f, size.getWidth() - xPaddingDips),
+                        Math.max(0.f, size.getHeight() - yPaddingDips)))
+                .collect(Collectors.toCollection(ArrayList::new));
+
+        Rect rect = AppWidgetResizeFrame.getMinMaxSizes(paddedSizes);
+        Bundle options = new Bundle();
+        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH, rect.left);
+        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT, rect.top);
+        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH, rect.right);
+        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT, rect.bottom);
+        options.putParcelableArrayList(AppWidgetManager.OPTION_APPWIDGET_SIZES, paddedSizes);
+        return options;
+    }
+
     /**
      * Returns the min and max widths and heights given a list of sizes, in dp.
      *
      * @param sizes List of sizes to get the min/max from.
-     * @param outRect Rectangle in which the result can be stored, to avoid extra allocations. If
-     *               null, a new rectangle will be allocated.
      * @return A rectangle with the left (resp. top) is used for the min width (resp. height) and
      * the right (resp. bottom) for the max. The returned rectangle is set with 0s if the list is
      * empty.
      */
-    public static Rect getMinMaxSizes(List<SizeF> sizes, @Nullable Rect outRect) {
-        if (outRect == null) {
-            outRect = new Rect();
-        }
+    private static Rect getMinMaxSizes(List<SizeF> sizes) {
         if (sizes.isEmpty()) {
-            outRect.set(0, 0, 0, 0);
+            return new Rect();
         } else {
             SizeF first = sizes.get(0);
-            outRect.set((int) first.getWidth(), (int) first.getHeight(), (int) first.getWidth(),
-                    (int) first.getHeight());
+            Rect result = new Rect((int) first.getWidth(), (int) first.getHeight(),
+                    (int) first.getWidth(), (int) first.getHeight());
             for (int i = 1; i < sizes.size(); i++) {
-                outRect.union((int) sizes.get(i).getWidth(), (int) sizes.get(i).getHeight());
+                result.union((int) sizes.get(i).getWidth(), (int) sizes.get(i).getHeight());
             }
+            return result;
         }
-        return outRect;
-    }
-
-    /**
-     * Returns the range of sizes a widget may be displayed, given its span.
-     *
-     * @param context Context in which the View is rendered.
-     * @param spanX Width of the widget, in cells.
-     * @param spanY Height of the widget, in cells.
-     * @param outRect Rectangle in which the result can be stored, to avoid extra allocations. If
-     *               null, a new rectangle will be allocated.
-     */
-    public static Rect getWidgetSizeRanges(Context context, int spanX, int spanY,
-            @Nullable Rect outRect) {
-        return getMinMaxSizes(getWidgetSizes(context, spanX, spanY), outRect);
     }
 
     @Override
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index fd9793625e..d5860dc57d 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -31,7 +31,6 @@ import android.graphics.PointF;
 import android.graphics.Rect;
 import android.hardware.display.DisplayManager;
 import android.util.DisplayMetrics;
-import android.util.Log;
 import android.view.Surface;
 import android.view.WindowInsets;
 import android.view.WindowManager;
@@ -42,7 +41,6 @@ import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.icons.DotRenderer;
 import com.android.launcher3.icons.GraphicsUtils;
 import com.android.launcher3.icons.IconNormalizer;
-import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.DisplayController.Info;
 import com.android.launcher3.util.WindowBounds;
@@ -52,9 +50,6 @@ import java.io.PrintWriter;
 @SuppressLint("NewApi")
 public class DeviceProfile {
 
-    private static final float TABLET_MIN_DPS = 600;
-    private static final float LARGE_TABLET_MIN_DPS = 720;
-
     private static final int DEFAULT_DOT_SIZE = 100;
 
     public final InvariantDeviceProfile inv;
@@ -63,9 +58,9 @@ public class DeviceProfile {
 
     // Device properties
     public final boolean isTablet;
-    public final boolean isLargeTablet;
     public final boolean isPhone;
     public final boolean transposeLayoutWithOrientation;
+    public final boolean isTwoPanels;
 
     // Device properties in current orientation
     public final boolean isLandscape;
@@ -164,6 +159,7 @@ public class DeviceProfile {
     public int allAppsCellWidthPx;
     public int allAppsIconSizePx;
     public int allAppsIconDrawablePaddingPx;
+    public final int numShownAllAppsColumns;
     public float allAppsIconTextSizePx;
 
     // Overview
@@ -194,42 +190,30 @@ public class DeviceProfile {
     // How much of the bottom inset is due to Taskbar rather than other system elements.
     public int nonOverlappingTaskbarInset;
 
-    DeviceProfile(Context context, InvariantDeviceProfile inv, Info info,
-            Point minSize, Point maxSize, int width, int height, boolean isLandscape,
+    DeviceProfile(Context context, InvariantDeviceProfile inv, Info info, WindowBounds windowBounds,
             boolean isMultiWindowMode, boolean transposeLayoutWithOrientation,
-            Point windowPosition) {
+            boolean useTwoPanels) {
 
         this.inv = inv;
-        this.isLandscape = isLandscape;
+        this.isLandscape = windowBounds.isLandscape();
         this.isMultiWindowMode = isMultiWindowMode;
         this.transposeLayoutWithOrientation = transposeLayoutWithOrientation;
-        windowX = windowPosition.x;
-        windowY = windowPosition.y;
+        windowX = windowBounds.bounds.left;
+        windowY = windowBounds.bounds.top;
 
         isScalableGrid = inv.isScalable && !isVerticalBarLayout() && !isMultiWindowMode;
 
         // Determine sizes.
-        widthPx = width;
-        heightPx = height;
-        int nonFinalAvailableHeightPx;
-        if (isLandscape) {
-            availableWidthPx = maxSize.x;
-            nonFinalAvailableHeightPx = minSize.y;
-        } else {
-            availableWidthPx = minSize.x;
-            nonFinalAvailableHeightPx = maxSize.y;
-        }
+        widthPx = windowBounds.bounds.width();
+        heightPx = windowBounds.bounds.height();
+        availableWidthPx = windowBounds.availableSize.x;
+        int nonFinalAvailableHeightPx = windowBounds.availableSize.y;
 
         mInfo = info;
+        isTablet = info.isTablet(windowBounds);
+        isPhone = !isTablet;
+        isTwoPanels = isTablet && useTwoPanels;
 
-        // Constants from resources
-        float swDPs = dpiFromPx(Math.min(info.smallestSize.x, info.smallestSize.y),
-                info.densityDpi);
-        boolean allowRotation = context.getResources().getBoolean(R.bool.allow_rotation);
-        // Tablet UI is built with assumption that simulated landscape is disabled.
-        isTablet = allowRotation && swDPs >= TABLET_MIN_DPS;
-        isLargeTablet = isTablet && swDPs >= LARGE_TABLET_MIN_DPS;
-        isPhone = !isTablet && !isLargeTablet;
         aspectRatio = ((float) Math.max(widthPx, heightPx)) / Math.min(widthPx, heightPx);
         boolean isTallDevice = Float.compare(aspectRatio, TALL_DEVICE_ASPECT_RATIO_THRESHOLD) >= 0;
 
@@ -284,7 +268,7 @@ public class DeviceProfile {
                 ? 0
                 : res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_layout_padding);
 
-        if (FeatureFlags.ENABLE_TWO_PANEL_HOME.get() && isTablet) {
+        if (isTwoPanels) {
             cellLayoutPaddingLeftRightPx =
                     res.getDimensionPixelSize(R.dimen.two_panel_home_side_padding);
             cellLayoutBottomPaddingPx = 0;
@@ -309,7 +293,10 @@ public class DeviceProfile {
 
         workspaceCellPaddingXPx = res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_padding_x);
 
-        numShownHotseatIcons = inv.numShownHotseatIcons;
+        numShownHotseatIcons =
+                isTwoPanels ? inv.numDatabaseHotseatIcons : inv.numShownHotseatIcons;
+        numShownAllAppsColumns =
+                isTwoPanels ? inv.numDatabaseAllAppsColumns : inv.numAllAppsColumns;
         hotseatBarTopPaddingPx =
                 res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_top_padding);
         hotseatBarBottomPaddingPx = (isTallDevice ? 0
@@ -393,11 +380,12 @@ public class DeviceProfile {
     }
 
     public Builder toBuilder(Context context) {
-        Point size = new Point(availableWidthPx, availableHeightPx);
+        WindowBounds bounds =
+                new WindowBounds(widthPx, heightPx, availableWidthPx, availableHeightPx);
+        bounds.bounds.offsetTo(windowX, windowY);
         return new Builder(context, inv, mInfo)
-                .setSizeRange(size, size)
-                .setSize(widthPx, heightPx)
-                .setWindowPosition(windowX, windowY)
+                .setWindowBounds(bounds)
+                .setUseTwoPanels(isTwoPanels)
                 .setMultiWindowMode(isMultiWindowMode);
     }
 
@@ -409,15 +397,8 @@ public class DeviceProfile {
      * TODO: Move this to the builder as part of setMultiWindowMode
      */
     public DeviceProfile getMultiWindowProfile(Context context, WindowBounds windowBounds) {
-        // We take the minimum sizes of this profile and it's multi-window variant to ensure that
-        // the system decor is always excluded.
-        Point mwSize = new Point(Math.min(availableWidthPx, windowBounds.availableSize.x),
-                Math.min(availableHeightPx, windowBounds.availableSize.y));
-
         DeviceProfile profile = toBuilder(context)
-                .setSizeRange(mwSize, mwSize)
-                .setSize(windowBounds.bounds.width(), windowBounds.bounds.height())
-                .setWindowPosition(windowBounds.bounds.left, windowBounds.bounds.top)
+                .setWindowBounds(windowBounds)
                 .setMultiWindowMode(true)
                 .build();
 
@@ -433,14 +414,6 @@ public class DeviceProfile {
         return profile;
     }
 
-    /**
-     * Inverse of {@link #getMultiWindowProfile(Context, WindowBounds)}
-     * @return device profile corresponding to the current orientation in non multi-window mode.
-     */
-    public DeviceProfile getFullScreenProfile() {
-        return isLandscape ? inv.landscapeProfile : inv.portraitProfile;
-    }
-
     /**
      * Checks if there is enough space for labels on the workspace.
      * If there is not, labels on the Workspace are hidden.
@@ -553,7 +526,7 @@ public class DeviceProfile {
         }
 
         // All apps
-        if (allAppsHasDifferentNumColumns()) {
+        if (numShownAllAppsColumns != inv.numColumns) {
             allAppsIconSizePx = pxFromDp(inv.allAppsIconSize, mMetrics);
             allAppsIconTextSizePx = Utilities.pxFromSp(inv.allAppsIconTextSize, mMetrics);
             allAppsIconDrawablePaddingPx = iconDrawablePaddingOriginalPx;
@@ -667,18 +640,20 @@ public class DeviceProfile {
     }
 
     public Point getCellSize() {
-        return getCellSize(inv.numColumns, inv.numRows);
+        return getCellSize(null);
     }
 
-    private Point getCellSize(int numColumns, int numRows) {
-        Point result = new Point();
+    public Point getCellSize(Point result) {
+        if (result == null) {
+            result = new Point();
+        }
         // Since we are only concerned with the overall padding, layout direction does
         // not matter.
         Point padding = getTotalWorkspacePadding();
         result.x = calculateCellWidth(availableWidthPx - padding.x
-                - cellLayoutPaddingLeftRightPx * 2, cellLayoutBorderSpacingPx, numColumns);
+                - cellLayoutPaddingLeftRightPx * 2, cellLayoutBorderSpacingPx, inv.numColumns);
         result.y = calculateCellHeight(availableHeightPx - padding.y
-                - cellLayoutBottomPaddingPx, cellLayoutBorderSpacingPx, numRows);
+                - cellLayoutBottomPaddingPx, cellLayoutBorderSpacingPx, inv.numRows);
         return result;
     }
 
@@ -723,7 +698,7 @@ public class DeviceProfile {
                 padding.set(availablePaddingX / 2, edgeMarginPx + availablePaddingY / 2,
                         availablePaddingX / 2, paddingBottom + availablePaddingY / 2);
 
-                if (FeatureFlags.ENABLE_TWO_PANEL_HOME.get()) {
+                if (isTwoPanels) {
                     padding.set(0, padding.top, 0, padding.bottom);
                 }
             } else {
@@ -751,7 +726,7 @@ public class DeviceProfile {
             // for this, we pad the left and right of the hotseat with half of the difference of a
             // workspace cell vs a hotseat cell.
             float workspaceCellWidth = (float) widthPx / inv.numColumns;
-            float hotseatCellWidth = (float) widthPx / inv.numShownHotseatIcons;
+            float hotseatCellWidth = (float) widthPx / numShownHotseatIcons;
             int hotseatAdjustment = Math.round((workspaceCellWidth - hotseatCellWidth) / 2);
             mHotseatPadding.set(
                     hotseatAdjustment + workspacePadding.left + cellLayoutPaddingLeftRightPx
@@ -801,13 +776,6 @@ public class DeviceProfile {
         return isLandscape && transposeLayoutWithOrientation;
     }
 
-    /**
-     * Returns true when the number of workspace columns and all apps columns differs.
-     */
-    private boolean allAppsHasDifferentNumColumns() {
-        return inv.numAllAppsColumns != inv.numColumns;
-    }
-
     /**
      * Updates orientation information and returns true if it has changed from the previous value.
      */
@@ -828,7 +796,7 @@ public class DeviceProfile {
     }
 
     public boolean shouldFadeAdjacentWorkspaceScreens() {
-        return isVerticalBarLayout() || isLargeTablet;
+        return isVerticalBarLayout();
     }
 
     public int getCellHeight(@ContainerType int containerType) {
@@ -854,13 +822,13 @@ public class DeviceProfile {
         writer.println(prefix + "\t1 dp = " + mMetrics.density + " px");
 
         writer.println(prefix + "\tisTablet:" + isTablet);
-        writer.println(prefix + "\tisLargeTablet:" + isLargeTablet);
         writer.println(prefix + "\tisPhone:" + isPhone);
         writer.println(prefix + "\ttransposeLayoutWithOrientation:"
                 + transposeLayoutWithOrientation);
 
         writer.println(prefix + "\tisLandscape:" + isLandscape);
         writer.println(prefix + "\tisMultiWindowMode:" + isMultiWindowMode);
+        writer.println(prefix + "\tisTwoPanels:" + isTwoPanels);
 
         writer.println(prefix + pxToDpStr("windowX", windowX));
         writer.println(prefix + pxToDpStr("windowY", windowY));
@@ -907,6 +875,7 @@ public class DeviceProfile {
         writer.println(prefix + pxToDpStr("allAppsIconDrawablePaddingPx",
                 allAppsIconDrawablePaddingPx));
         writer.println(prefix + pxToDpStr("allAppsCellHeightPx", allAppsCellHeightPx));
+        writer.println(prefix + "\tnumShownAllAppsColumns: " + numShownAllAppsColumns);
 
         writer.println(prefix + pxToDpStr("hotseatBarSizePx", hotseatBarSizePx));
         writer.println(prefix + pxToDpStr("hotseatCellHeightPx", hotseatCellHeightPx));
@@ -916,6 +885,7 @@ public class DeviceProfile {
                 hotseatBarSidePaddingStartPx));
         writer.println(prefix + pxToDpStr("hotseatBarSidePaddingEndPx",
                 hotseatBarSidePaddingEndPx));
+        writer.println(prefix + "\tnumShownHotseatIcons: " + numShownHotseatIcons);
 
         writer.println(prefix + "\tisTaskbarPresent:" + isTaskbarPresent);
 
@@ -967,53 +937,31 @@ public class DeviceProfile {
         private InvariantDeviceProfile mInv;
         private Info mInfo;
 
-        private final Point mWindowPosition = new Point();
-        private Point mMinSize, mMaxSize;
-        private int mWidth, mHeight;
+        private WindowBounds mWindowBounds;
+        private boolean mUseTwoPanels;
 
-        private boolean mIsLandscape;
         private boolean mIsMultiWindowMode = false;
-        private boolean mTransposeLayoutWithOrientation;
+        private Boolean mTransposeLayoutWithOrientation;
 
         public Builder(Context context, InvariantDeviceProfile inv, Info info) {
             mContext = context;
             mInv = inv;
             mInfo = info;
-            mTransposeLayoutWithOrientation = context.getResources()
-                    .getBoolean(R.bool.hotseat_transpose_layout_with_orientation);
-            if (TestProtocol.sDebugTracing) {
-                Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED,
-                        "transposeLayout=" + mTransposeLayoutWithOrientation);
-            }
         }
 
-        public Builder setSizeRange(Point minSize, Point maxSize) {
-            mMinSize = minSize;
-            mMaxSize = maxSize;
+        public Builder setMultiWindowMode(boolean isMultiWindowMode) {
+            mIsMultiWindowMode = isMultiWindowMode;
             return this;
         }
 
-        public Builder setSize(int width, int height) {
-            mWidth = width;
-            mHeight = height;
-            mIsLandscape = mWidth > mHeight;
-            if (TestProtocol.sDebugTracing) {
-                Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED,
-                        "isLandscape=" + mIsLandscape + " w=" + mWidth + " h=" + mHeight);
-            }
+        public Builder setUseTwoPanels(boolean useTwoPanels) {
+            mUseTwoPanels = useTwoPanels;
             return this;
         }
 
-        public Builder setMultiWindowMode(boolean isMultiWindowMode) {
-            mIsMultiWindowMode = isMultiWindowMode;
-            return this;
-        }
 
-        /**
-         * Sets the window position if not full-screen
-         */
-        public Builder setWindowPosition(int x, int y) {
-            mWindowPosition.set(x, y);
+        public Builder setWindowBounds(WindowBounds bounds) {
+            mWindowBounds = bounds;
             return this;
         }
 
@@ -1023,9 +971,14 @@ public class DeviceProfile {
         }
 
         public DeviceProfile build() {
-            return new DeviceProfile(mContext, mInv, mInfo, mMinSize, mMaxSize,
-                    mWidth, mHeight, mIsLandscape, mIsMultiWindowMode,
-                    mTransposeLayoutWithOrientation, mWindowPosition);
+            if (mWindowBounds == null) {
+                throw new IllegalArgumentException("Window bounds not set");
+            }
+            if (mTransposeLayoutWithOrientation == null) {
+                mTransposeLayoutWithOrientation = !mInfo.isTablet(mWindowBounds);
+            }
+            return new DeviceProfile(mContext, mInv, mInfo, mWindowBounds,
+                    mIsMultiWindowMode, mTransposeLayoutWithOrientation, mUseTwoPanels);
         }
     }
 
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index 8496fd5d9c..b2a9e75e50 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -90,11 +90,11 @@ public class Hotseat extends CellLayout implements Insettable {
     public void resetLayout(boolean hasVerticalHotseat) {
         removeAllViewsInLayout();
         mHasVerticalHotseat = hasVerticalHotseat;
-        InvariantDeviceProfile idp = mActivity.getDeviceProfile().inv;
+        DeviceProfile dp = mActivity.getDeviceProfile();
         if (hasVerticalHotseat) {
-            setGridSize(1, idp.numShownHotseatIcons);
+            setGridSize(1, dp.numShownHotseatIcons);
         } else {
-            setGridSize(idp.numShownHotseatIcons, 1);
+            setGridSize(dp.numShownHotseatIcons, 1);
         }
     }
 
diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index 1332e14af0..b263d3830e 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -16,11 +16,12 @@
 
 package com.android.launcher3;
 
+import static com.android.launcher3.Utilities.dpiFromPx;
 import static com.android.launcher3.Utilities.getDevicePrefs;
 import static com.android.launcher3.Utilities.getPointString;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_TWO_PANEL_HOME;
 import static com.android.launcher3.util.DisplayController.CHANGE_DENSITY;
-import static com.android.launcher3.util.DisplayController.CHANGE_SIZE;
+import static com.android.launcher3.util.DisplayController.CHANGE_SUPPORTED_BOUNDS;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.PackageManagerHelper.getPackageFilter;
 
@@ -55,6 +56,7 @@ import com.android.launcher3.util.DisplayController.Info;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.launcher3.util.Themes;
+import com.android.launcher3.util.WindowBounds;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -62,6 +64,7 @@ import org.xmlpull.v1.XmlPullParserException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 
 public class InvariantDeviceProfile {
 
@@ -73,6 +76,9 @@ public class InvariantDeviceProfile {
     public static final String KEY_MIGRATION_SRC_WORKSPACE_SIZE = "migration_src_workspace_size";
     public static final String KEY_MIGRATION_SRC_HOTSEAT_COUNT = "migration_src_hotseat_count";
 
+    private static final int DEFAULT_TRUE = -1;
+    private static final int DEFAULT_SPLIT_DISPLAY = 2;
+
     private static final String KEY_IDP_GRID_NAME = "idp_grid_name";
 
     private static final float ICON_SIZE_DEFINED_IN_APP_DP = 48;
@@ -136,6 +142,7 @@ public class InvariantDeviceProfile {
      * Number of columns in the all apps list.
      */
     public int numAllAppsColumns;
+    public int numDatabaseAllAppsColumns;
 
     /**
      * Do not query directly. see {@link DeviceProfile#isScalableGrid}.
@@ -147,8 +154,7 @@ public class InvariantDeviceProfile {
     public int defaultLayoutId;
     int demoModeLayoutId;
 
-    public DeviceProfile landscapeProfile;
-    public DeviceProfile portraitProfile;
+    public final List<DeviceProfile> supportedProfiles = new ArrayList<>();
 
     @Nullable public DevicePaddings devicePaddings;
 
@@ -175,6 +181,7 @@ public class InvariantDeviceProfile {
         numShownHotseatIcons = p.numShownHotseatIcons;
         numDatabaseHotseatIcons = p.numDatabaseHotseatIcons;
         numAllAppsColumns = p.numAllAppsColumns;
+        numDatabaseAllAppsColumns = p.numDatabaseAllAppsColumns;
         isScalable = p.isScalable;
         devicePaddingId = p.devicePaddingId;
         minCellHeight = p.minCellHeight;
@@ -204,7 +211,7 @@ public class InvariantDeviceProfile {
 
         DisplayController.INSTANCE.get(context).addChangeListener(
                 (displayContext, info, flags) -> {
-                    if ((flags & (CHANGE_SIZE | CHANGE_DENSITY)) != 0) {
+                    if ((flags & (CHANGE_DENSITY | CHANGE_SUPPORTED_BOUNDS)) != 0) {
                         onConfigChanged(displayContext);
                     }
                 });
@@ -232,35 +239,29 @@ public class InvariantDeviceProfile {
         // Get the display info based on default display and interpolate it to existing display
         DisplayOption defaultDisplayOption = invDistWeightedInterpolate(
                 DisplayController.INSTANCE.get(context).getInfo(),
-                getPredefinedDeviceProfiles(context, gridName));
+                getPredefinedDeviceProfiles(context, gridName, false), false);
 
         Info myInfo = new Info(context, display);
         DisplayOption myDisplayOption = invDistWeightedInterpolate(
-                myInfo, getPredefinedDeviceProfiles(context, gridName));
+                myInfo, getPredefinedDeviceProfiles(context, gridName, false), false);
 
         DisplayOption result = new DisplayOption(defaultDisplayOption.grid)
                 .add(myDisplayOption);
         result.iconSize = defaultDisplayOption.iconSize;
         result.landscapeIconSize = defaultDisplayOption.landscapeIconSize;
-        result.numShownHotseatIcons = myDisplayOption.numShownHotseatIcons;
         if (defaultDisplayOption.allAppsIconSize < myDisplayOption.allAppsIconSize) {
             result.allAppsIconSize = defaultDisplayOption.allAppsIconSize;
-            result.numAllAppsColumns = defaultDisplayOption.numAllAppsColumns;
         } else {
             result.allAppsIconSize = myDisplayOption.allAppsIconSize;
-            result.numAllAppsColumns = myDisplayOption.numAllAppsColumns;
         }
         result.minCellHeight = defaultDisplayOption.minCellHeight;
         result.minCellWidth = defaultDisplayOption.minCellWidth;
         result.borderSpacing = defaultDisplayOption.borderSpacing;
 
-        initGrid(context, myInfo, result);
+        initGrid(context, myInfo, result, false);
     }
 
     public static String getCurrentGridName(Context context) {
-        if (ENABLE_TWO_PANEL_HOME.get()) {
-            return ENABLE_TWO_PANEL_HOME.key;
-        }
         return Utilities.isGridOptionsEnabled(context)
                 ? Utilities.getPrefs(context).getString(KEY_IDP_GRID_NAME, null) : null;
     }
@@ -278,20 +279,33 @@ public class InvariantDeviceProfile {
 
     private String initGrid(Context context, String gridName) {
         Info displayInfo = DisplayController.INSTANCE.get(context).getInfo();
-        ArrayList<DisplayOption> allOptions = getPredefinedDeviceProfiles(context, gridName);
+        // Determine if we have split display
+
+        boolean isTablet = false, isPhone = false;
+        for (WindowBounds bounds : displayInfo.supportedBounds) {
+            if (displayInfo.isTablet(bounds)) {
+                isTablet = true;
+            } else {
+                isPhone = true;
+            }
+        }
+        boolean isSplitDisplay = isPhone && isTablet && ENABLE_TWO_PANEL_HOME.get();
 
-        DisplayOption displayOption = invDistWeightedInterpolate(displayInfo, allOptions);
-        initGrid(context, displayInfo, displayOption);
+        ArrayList<DisplayOption> allOptions =
+                getPredefinedDeviceProfiles(context, gridName, isSplitDisplay);
+        DisplayOption displayOption =
+                invDistWeightedInterpolate(displayInfo, allOptions, isSplitDisplay);
+        initGrid(context, displayInfo, displayOption, isSplitDisplay);
         return displayOption.grid.name;
     }
 
     private void initGrid(
-            Context context, Info displayInfo, DisplayOption displayOption) {
+            Context context, Info displayInfo, DisplayOption displayOption,
+            boolean isSplitDisplay) {
         DisplayMetrics metrics = context.getResources().getDisplayMetrics();
         GridOption closestProfile = displayOption.grid;
         numRows = closestProfile.numRows;
         numColumns = closestProfile.numColumns;
-        numDatabaseHotseatIcons = closestProfile.numDatabaseHotseatIcons;
         dbFile = closestProfile.dbFile;
         defaultLayoutId = closestProfile.defaultLayoutId;
         demoModeLayoutId = closestProfile.demoModeLayoutId;
@@ -313,8 +327,14 @@ public class InvariantDeviceProfile {
         minCellHeight = displayOption.minCellHeight;
         minCellWidth = displayOption.minCellWidth;
         borderSpacing = displayOption.borderSpacing;
-        numShownHotseatIcons = Math.round(displayOption.numShownHotseatIcons);
-        numAllAppsColumns = Math.round(displayOption.numAllAppsColumns);
+
+        numShownHotseatIcons = closestProfile.numHotseatIcons;
+        numDatabaseHotseatIcons = isSplitDisplay
+                ? closestProfile.numDatabaseHotseatIcons : closestProfile.numHotseatIcons;
+
+        numAllAppsColumns = closestProfile.numAllAppsColumns;
+        numDatabaseAllAppsColumns = isSplitDisplay
+                ? closestProfile.numDatabaseAllAppsColumns : closestProfile.numAllAppsColumns;
 
         if (Utilities.isGridOptionsEnabled(context)) {
             allAppsIconSize = displayOption.allAppsIconSize;
@@ -332,31 +352,26 @@ public class InvariantDeviceProfile {
         // Supported overrides: numRows, numColumns, iconSize
         applyPartnerDeviceProfileOverrides(context, metrics);
 
-        Point realSize = new Point(displayInfo.realSize);
-        // The real size never changes. smallSide and largeSide will remain the
-        // same in any orientation.
-        int smallSide = Math.min(realSize.x, realSize.y);
-        int largeSide = Math.max(realSize.x, realSize.y);
+        supportedProfiles.clear();
+        defaultWallpaperSize = new Point(displayInfo.currentSize);
+        for (WindowBounds bounds : displayInfo.supportedBounds) {
+            supportedProfiles.add(new DeviceProfile.Builder(context, this, displayInfo)
+                    .setUseTwoPanels(isSplitDisplay)
+                    .setWindowBounds(bounds).build());
 
-        DeviceProfile.Builder builder = new DeviceProfile.Builder(context, this, displayInfo)
-                .setSizeRange(new Point(displayInfo.smallestSize),
-                        new Point(displayInfo.largestSize));
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED,
-                    "largeSide=" + largeSide + " smallSide=" + smallSide);
-        }
+            // Wallpaper size should be the maximum of the all possible sizes Launcher expects
+            int displayWidth = bounds.bounds.width();
+            int displayHeight = bounds.bounds.height();
+            defaultWallpaperSize.y = Math.max(defaultWallpaperSize.y, displayHeight);
 
-        landscapeProfile = builder.setSize(largeSide, smallSide).build();
-        portraitProfile = builder.setSize(smallSide, largeSide).build();
-
-        // We need to ensure that there is enough extra space in the wallpaper
-        // for the intended parallax effects
-        if (context.getResources().getConfiguration().smallestScreenWidthDp >= 720) {
-            defaultWallpaperSize = new Point(
-                    (int) (largeSide * wallpaperTravelToScreenWidthRatio(largeSide, smallSide)),
-                    largeSide);
-        } else {
-            defaultWallpaperSize = new Point(Math.max(smallSide * 2, largeSide), largeSide);
+            // We need to ensure that there is enough extra space in the wallpaper
+            // for the intended parallax effects
+            float parallaxFactor =
+                    dpiFromPx(Math.min(displayWidth, displayHeight), displayInfo.densityDpi) < 720
+                            ? 2
+                            : wallpaperTravelToScreenWidthRatio(displayWidth, displayHeight);
+            defaultWallpaperSize.x =
+                    Math.max(defaultWallpaperSize.x, Math.round(parallaxFactor * displayWidth));
         }
 
         ComponentName cn = new ComponentName(context.getPackageName(), getClass().getName());
@@ -385,7 +400,7 @@ public class InvariantDeviceProfile {
         } else if (!savedIconMaskPath.equals(getIconShapePath(context))) {
             getDevicePrefs(context).edit().putString(KEY_ICON_PATH_REF, getIconShapePath(context))
                     .apply();
-            apply(context, CHANGE_FLAG_ICON_PARAMS);
+            apply(CHANGE_FLAG_ICON_PARAMS);
         }
     }
 
@@ -423,16 +438,17 @@ public class InvariantDeviceProfile {
             IconShape.init(context);
         }
 
-        apply(context, changeFlags);
+        apply(changeFlags);
     }
 
-    private void apply(Context context, int changeFlags) {
+    private void apply(int changeFlags) {
         for (OnIDPChangeListener listener : mChangeListeners) {
             listener.onIdpChanged(changeFlags, this);
         }
     }
 
-    static ArrayList<DisplayOption> getPredefinedDeviceProfiles(Context context, String gridName) {
+    private static ArrayList<DisplayOption> getPredefinedDeviceProfiles(
+            Context context, String gridName, boolean isSplitDisplay) {
         ArrayList<DisplayOption> profiles = new ArrayList<>();
         try (XmlResourceParser parser = context.getResources().getXml(R.xml.device_profiles)) {
             final int depth = parser.getDepth();
@@ -449,8 +465,9 @@ public class InvariantDeviceProfile {
                             && type != XmlPullParser.END_DOCUMENT) {
                         if ((type == XmlPullParser.START_TAG) && "display-option".equals(
                                 parser.getName())) {
-                            profiles.add(new DisplayOption(
-                                    gridOption, context, Xml.asAttributeSet(parser)));
+                            profiles.add(new DisplayOption(gridOption, context,
+                                    Xml.asAttributeSet(parser),
+                                    isSplitDisplay ? DEFAULT_SPLIT_DISPLAY : DEFAULT_TRUE));
                         }
                     }
                 }
@@ -521,17 +538,29 @@ public class InvariantDeviceProfile {
         return (float) Math.hypot(x1 - x0, y1 - y0);
     }
 
-    @VisibleForTesting
-    static DisplayOption invDistWeightedInterpolate(
-            Info displayInfo, ArrayList<DisplayOption> points) {
-        Point smallestSize = new Point(displayInfo.smallestSize);
-        Point largestSize = new Point(displayInfo.largestSize);
+    private static DisplayOption invDistWeightedInterpolate(
+            Info displayInfo, ArrayList<DisplayOption> points, boolean isSplitDisplay) {
+        int minWidthPx = Integer.MAX_VALUE;
+        int minHeightPx = Integer.MAX_VALUE;
+        for (WindowBounds bounds : displayInfo.supportedBounds) {
+            boolean isTablet = displayInfo.isTablet(bounds);
+            if (isTablet && isSplitDisplay) {
+                // For split displays, take half width per page
+                minWidthPx = Math.min(minWidthPx, bounds.availableSize.x / 2);
+                minHeightPx = Math.min(minHeightPx, bounds.availableSize.y);
+
+            } else if (!isTablet && bounds.isLandscape()) {
+                // We will use transposed layout in this case
+                minWidthPx = Math.min(minWidthPx, bounds.availableSize.y);
+                minHeightPx = Math.min(minHeightPx, bounds.availableSize.x);
+            } else {
+                minWidthPx = Math.min(minWidthPx, bounds.availableSize.x);
+                minHeightPx = Math.min(minHeightPx, bounds.availableSize.y);
+            }
+        }
 
-        // This guarantees that width < height
-        float width = Utilities.dpiFromPx((float) Math.min(smallestSize.x, smallestSize.y),
-                displayInfo.densityDpi);
-        float height = Utilities.dpiFromPx((float) Math.min(largestSize.x, largestSize.y),
-                displayInfo.densityDpi);
+        float width = dpiFromPx(minWidthPx, displayInfo.densityDpi);
+        float height = dpiFromPx(minHeightPx, displayInfo.densityDpi);
 
         // Sort the profiles based on the closeness to the device size
         Collections.sort(points, (a, b) ->
@@ -556,33 +585,30 @@ public class InvariantDeviceProfile {
         return out.multiply(1.0f / weights);
     }
 
-    @VisibleForTesting
-    static DisplayOption invDistWeightedInterpolate(float width, float height,
-            ArrayList<DisplayOption> points) {
-        float weights = 0;
-
-        DisplayOption p = points.get(0);
-        if (dist(width, height, p.minWidthDps, p.minHeightDps) == 0) {
-            return p;
-        }
+    public DeviceProfile getDeviceProfile(Context context) {
+        Resources res = context.getResources();
+        Configuration config = context.getResources().getConfiguration();
 
-        DisplayOption out = new DisplayOption();
-        for (int i = 0; i < points.size() && i < KNEARESTNEIGHBOR; ++i) {
-            p = points.get(i);
-            float w = weight(width, height, p.minWidthDps, p.minHeightDps, WEIGHT_POWER);
-            weights += w;
-            out.add(new DisplayOption().add(p).multiply(w));
-        }
-        return out.multiply(1.0f / weights);
-    }
+        float availableWidth = config.screenWidthDp * res.getDisplayMetrics().density;
+        float availableHeight = config.screenHeightDp * res.getDisplayMetrics().density;
 
-    public DeviceProfile getDeviceProfile(Context context) {
         if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "getDeviceProfile: orientation="
-                    + context.getResources().getConfiguration().orientation);
+            Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED,
+                    "getDeviceProfile: orientation=" + config.orientation
+                            + " size=" + availableWidth + "x" + availableHeight);
+        }
+        DeviceProfile bestMatch = supportedProfiles.get(0);
+        float minDiff = Float.MAX_VALUE;
+
+        for (DeviceProfile profile : supportedProfiles) {
+            float diff = Math.abs(profile.availableWidthPx - availableWidth)
+                    + Math.abs(profile.availableHeightPx - availableHeight);
+            if (diff < minDiff) {
+                minDiff = diff;
+                bestMatch = profile;
+            }
         }
-        return context.getResources().getConfiguration().orientation
-                == Configuration.ORIENTATION_LANDSCAPE ? landscapeProfile : portraitProfile;
+        return bestMatch;
     }
 
     private static float weight(float x0, float y0, float x1, float y1, float pow) {
@@ -639,6 +665,9 @@ public class InvariantDeviceProfile {
         private final int numFolderRows;
         private final int numFolderColumns;
 
+        private final int numAllAppsColumns;
+        private final int numDatabaseAllAppsColumns;
+        private final int numHotseatIcons;
         private final int numDatabaseHotseatIcons;
 
         private final String dbFile;
@@ -649,8 +678,6 @@ public class InvariantDeviceProfile {
         private final boolean isScalable;
         private final int devicePaddingId;
 
-        public final boolean visible;
-
         private final SparseArray<TypedValue> extraAttrs;
 
         public GridOption(Context context, AttributeSet attrs) {
@@ -665,8 +692,17 @@ public class InvariantDeviceProfile {
                     R.styleable.GridDisplayOption_defaultLayoutId, 0);
             demoModeLayoutId = a.getResourceId(
                     R.styleable.GridDisplayOption_demoModeLayoutId, defaultLayoutId);
-            numDatabaseHotseatIcons = a.getInt(
+
+            numAllAppsColumns = a.getInt(
+                    R.styleable.GridDisplayOption_numAllAppsColumns, numColumns);
+            numDatabaseAllAppsColumns = a.getInt(
+                    R.styleable.GridDisplayOption_numExtendedAllAppsColumns, 2 * numAllAppsColumns);
+
+            numHotseatIcons = a.getInt(
                     R.styleable.GridDisplayOption_numHotseatIcons, numColumns);
+            numDatabaseHotseatIcons = a.getInt(
+                    R.styleable.GridDisplayOption_numExtendedHotseatIcons, 2 * numHotseatIcons);
+
             numFolderRows = a.getInt(
                     R.styleable.GridDisplayOption_numFolderRows, numRows);
             numFolderColumns = a.getInt(
@@ -677,24 +713,21 @@ public class InvariantDeviceProfile {
             devicePaddingId = a.getResourceId(
                     R.styleable.GridDisplayOption_devicePaddingId, 0);
 
-            visible = a.getBoolean(R.styleable.GridDisplayOption_visible, true);
-
             a.recycle();
-
             extraAttrs = Themes.createValueMap(context, attrs,
                     IntArray.wrap(R.styleable.GridDisplayOption));
         }
     }
 
-    private static final class DisplayOption {
-        private final GridOption grid;
+    @VisibleForTesting
+    static final class DisplayOption {
+
+        public final GridOption grid;
 
         private final float minWidthDps;
         private final float minHeightDps;
         private final boolean canBeDefault;
 
-        private float numShownHotseatIcons;
-        private float numAllAppsColumns;
         private float minCellHeight;
         private float minCellWidth;
         private float borderSpacing;
@@ -706,7 +739,7 @@ public class InvariantDeviceProfile {
         private float allAppsIconSize;
         private float allAppsIconTextSize;
 
-        DisplayOption(GridOption grid, Context context, AttributeSet attrs) {
+        DisplayOption(GridOption grid, Context context, AttributeSet attrs, int defaultFlagValue) {
             this.grid = grid;
 
             TypedArray a = context.obtainStyledAttributes(
@@ -714,12 +747,9 @@ public class InvariantDeviceProfile {
 
             minWidthDps = a.getFloat(R.styleable.ProfileDisplayOption_minWidthDps, 0);
             minHeightDps = a.getFloat(R.styleable.ProfileDisplayOption_minHeightDps, 0);
-            canBeDefault = a.getBoolean(
-                    R.styleable.ProfileDisplayOption_canBeDefault, false);
-            numShownHotseatIcons = a.getInt(R.styleable.ProfileDisplayOption_numShownHotseatIcons,
-                    grid.numDatabaseHotseatIcons);
-            numAllAppsColumns = a.getInt(R.styleable.ProfileDisplayOption_numAllAppsColumns,
-                    grid.numColumns);
+
+            canBeDefault = a.getInt(R.styleable.ProfileDisplayOption_canBeDefault, 0)
+                    == defaultFlagValue;
 
             minCellHeight = a.getFloat(R.styleable.ProfileDisplayOption_minCellHeightDps, 0);
             minCellWidth = a.getFloat(R.styleable.ProfileDisplayOption_minCellWidthDps, 0);
@@ -748,16 +778,12 @@ public class InvariantDeviceProfile {
             minWidthDps = 0;
             minHeightDps = 0;
             canBeDefault = false;
-            numShownHotseatIcons = 0;
-            numAllAppsColumns = 0;
             minCellHeight = 0;
             minCellWidth = 0;
             borderSpacing = 0;
         }
 
         private DisplayOption multiply(float w) {
-            numShownHotseatIcons *= w;
-            numAllAppsColumns *= w;
             iconSize *= w;
             landscapeIconSize *= w;
             allAppsIconSize *= w;
@@ -771,8 +797,6 @@ public class InvariantDeviceProfile {
         }
 
         private DisplayOption add(DisplayOption p) {
-            numShownHotseatIcons += p.numShownHotseatIcons;
-            numAllAppsColumns += p.numAllAppsColumns;
             iconSize += p.iconSize;
             landscapeIconSize += p.landscapeIconSize;
             allAppsIconSize += p.allAppsIconSize;
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index f640118552..09c7b7aff0 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -189,7 +189,6 @@ import com.android.launcher3.widget.PendingAddShortcutInfo;
 import com.android.launcher3.widget.PendingAddWidgetInfo;
 import com.android.launcher3.widget.PendingAppWidgetHostView;
 import com.android.launcher3.widget.WidgetAddFlowHandler;
-import com.android.launcher3.widget.WidgetHostViewLoader;
 import com.android.launcher3.widget.WidgetManagerHelper;
 import com.android.launcher3.widget.custom.CustomWidgetManager;
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
@@ -2332,8 +2331,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
                         pendingInfo.spanY = item.spanY;
                         pendingInfo.minSpanX = item.minSpanX;
                         pendingInfo.minSpanY = item.minSpanY;
-                        Bundle options = WidgetHostViewLoader.getDefaultOptionsForWidget(this,
-                                pendingInfo);
+                        Bundle options = pendingInfo.getDefaultSizeOptions(this);
 
                         boolean isDirectConfig =
                                 item.hasRestoreFlag(LauncherAppWidgetInfo.FLAG_DIRECT_CONFIG);
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 05d6e045a6..7c5f99e07b 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -456,7 +456,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
     }
 
     private boolean isTwoPanelEnabled() {
-        return mLauncher.mDeviceProfile.isTablet && FeatureFlags.ENABLE_TWO_PANEL_HOME.get();
+        return mLauncher.mDeviceProfile.isTwoPanels;
     }
 
     @Override
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 40f7ab167c..119a91ffba 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -157,7 +157,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
     @Override
     public void onDeviceProfileChanged(DeviceProfile dp) {
         for (AdapterHolder holder : mAH) {
-            holder.adapter.setAppsPerRow(dp.inv.numAllAppsColumns);
+            holder.adapter.setAppsPerRow(dp.numShownAllAppsColumns);
             if (holder.recyclerView != null) {
                 // Remove all views and clear the pool, while keeping the data same. After this
                 // call, all the viewHolders will be recreated.
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index 5b4c4c5c36..70588ea317 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -283,7 +283,7 @@ public class AllAppsGridAdapter extends
         mOnIconClickListener = launcher.getItemOnClickListener();
 
         mSearchAdapterProvider = searchAdapterProvider;
-        setAppsPerRow(mLauncher.getDeviceProfile().inv.numAllAppsColumns);
+        setAppsPerRow(mLauncher.getDeviceProfile().numShownAllAppsColumns);
     }
 
     public void setAppsPerRow(int appsPerRow) {
diff --git a/src/com/android/launcher3/dragndrop/AddItemActivity.java b/src/com/android/launcher3/dragndrop/AddItemActivity.java
index d5a04a647d..5ba36f21e3 100644
--- a/src/com/android/launcher3/dragndrop/AddItemActivity.java
+++ b/src/com/android/launcher3/dragndrop/AddItemActivity.java
@@ -64,7 +64,6 @@ import com.android.launcher3.widget.PendingAddShortcutInfo;
 import com.android.launcher3.widget.PendingAddWidgetInfo;
 import com.android.launcher3.widget.WidgetCell;
 import com.android.launcher3.widget.WidgetCellPreview;
-import com.android.launcher3.widget.WidgetHostViewLoader;
 import com.android.launcher3.widget.WidgetImageView;
 import com.android.launcher3.widget.WidgetManagerHelper;
 
@@ -234,7 +233,7 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
         PendingAddWidgetInfo pendingInfo = new PendingAddWidgetInfo(widgetInfo);
         pendingInfo.spanX = Math.min(mIdp.numColumns, widgetInfo.spanX);
         pendingInfo.spanY = Math.min(mIdp.numRows, widgetInfo.spanY);
-        mWidgetOptions = WidgetHostViewLoader.getDefaultOptionsForWidget(this, pendingInfo);
+        mWidgetOptions = pendingInfo.getDefaultSizeOptions(this);
         mWidgetCell.getWidgetView().setTag(pendingInfo);
 
         applyWidgetItemAsync(() -> new WidgetItem(widgetInfo, mIdp, mApp.getIconCache()));
diff --git a/src/com/android/launcher3/graphics/GridCustomizationsProvider.java b/src/com/android/launcher3/graphics/GridCustomizationsProvider.java
index 911f8c3cde..cb42e7aa05 100644
--- a/src/com/android/launcher3/graphics/GridCustomizationsProvider.java
+++ b/src/com/android/launcher3/graphics/GridCustomizationsProvider.java
@@ -90,10 +90,7 @@ public class GridCustomizationsProvider extends ContentProvider {
                     parser.getDepth() > depth) && type != XmlPullParser.END_DOCUMENT) {
                 if ((type == XmlPullParser.START_TAG)
                         && GridOption.TAG_NAME.equals(parser.getName())) {
-                    GridOption option = new GridOption(getContext(), Xml.asAttributeSet(parser));
-                    if (option.visible) {
-                        result.add(option);
-                    }
+                    result.add(new GridOption(getContext(), Xml.asAttributeSet(parser)));
                 }
             }
         } catch (IOException | XmlPullParserException e) {
diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index 31764c57f5..6a8ac64571 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -224,7 +224,7 @@ public class LauncherPreviewRenderer extends ContextThemeWrapper
         mUiHandler = new Handler(Looper.getMainLooper());
         mContext = context;
         mIdp = idp;
-        mDp = idp.portraitProfile.copy(context);
+        mDp = idp.getDeviceProfile(context).copy(context);
         mMigrated = migrated;
 
         // TODO: get correct insets once display cutout API is available.
diff --git a/src/com/android/launcher3/qsb/QsbContainerView.java b/src/com/android/launcher3/qsb/QsbContainerView.java
index a191df4b38..22c3f58574 100644
--- a/src/com/android/launcher3/qsb/QsbContainerView.java
+++ b/src/com/android/launcher3/qsb/QsbContainerView.java
@@ -20,7 +20,7 @@ import static android.appwidget.AppWidgetManager.ACTION_APPWIDGET_BIND;
 import static android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID;
 import static android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_PROVIDER;
 
-import static com.android.launcher3.Utilities.ATLEAST_S;
+import static com.android.launcher3.AppWidgetResizeFrame.getWidgetSizeOptions;
 
 import android.app.Activity;
 import android.app.Fragment;
@@ -32,11 +32,9 @@ import android.appwidget.AppWidgetProviderInfo;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Rect;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.util.AttributeSet;
-import android.util.SizeF;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -45,7 +43,6 @@ import android.widget.FrameLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.android.launcher3.AppWidgetResizeFrame;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
@@ -53,8 +50,6 @@ import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.graphics.FragmentWithPreview;
 
-import java.util.ArrayList;
-
 /**
  * A frame layout which contains a QSB. This internally uses fragment to bind the view, which
  * allows it to contain the logic for {@link Fragment#startActivityForResult(Intent, int)}.
@@ -163,7 +158,7 @@ public class QsbContainerView extends FrameLayout {
 
         protected String mKeyWidgetId = "qsb_widget_id";
         private QsbWidgetHost mQsbWidgetHost;
-        private AppWidgetProviderInfo mWidgetInfo;
+        protected AppWidgetProviderInfo mWidgetInfo;
         private QsbWidgetHostView mQsb;
 
         // We need to store the orientation here, due to a bug (b/64916689) that results in widgets
@@ -297,19 +292,7 @@ public class QsbContainerView extends FrameLayout {
 
         protected Bundle createBindOptions() {
             InvariantDeviceProfile idp = LauncherAppState.getIDP(getContext());
-
-            Bundle opts = new Bundle();
-            ArrayList<SizeF> sizes = AppWidgetResizeFrame
-                    .getWidgetSizes(getContext(), idp.numColumns, 1);
-            Rect size = AppWidgetResizeFrame.getMinMaxSizes(sizes, null /* outRect */);
-            opts.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH, size.left);
-            opts.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT, size.top);
-            opts.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH, size.right);
-            opts.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT, size.bottom);
-            if (ATLEAST_S) {
-                opts.putParcelableArrayList(AppWidgetManager.OPTION_APPWIDGET_SIZES, sizes);
-            }
-            return opts;
+            return getWidgetSizeOptions(getContext(), mWidgetInfo.provider, idp.numColumns, 1);
         }
 
         protected View getDefaultView(ViewGroup container, boolean showSetupIcon) {
diff --git a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
index f5e74b7168..5999091786 100644
--- a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
+++ b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
@@ -87,8 +87,8 @@ public class SecondaryDisplayLauncher extends BaseDraggingActivity
         if (mDragLayer != null) {
             return;
         }
-        InvariantDeviceProfile currentDisplayIdp =
-                new InvariantDeviceProfile(this, getWindow().getDecorView().getDisplay());
+        InvariantDeviceProfile currentDisplayIdp = new InvariantDeviceProfile(
+                this, getWindow().getDecorView().getDisplay());
 
         // Disable transpose layout and use multi-window mode so that the icons are scaled properly
         mDeviceProfile = currentDisplayIdp.getDeviceProfile(this)
diff --git a/src/com/android/launcher3/secondarydisplay/SecondaryDragLayer.java b/src/com/android/launcher3/secondarydisplay/SecondaryDragLayer.java
index 40630d3c2e..f78f6dd40c 100644
--- a/src/com/android/launcher3/secondarydisplay/SecondaryDragLayer.java
+++ b/src/com/android/launcher3/secondarydisplay/SecondaryDragLayer.java
@@ -29,7 +29,6 @@ import android.widget.GridView;
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.model.data.ItemInfo;
@@ -109,8 +108,6 @@ public class SecondaryDragLayer extends BaseDragLayer<SecondaryDisplayLauncher>
         setMeasuredDimension(width, height);
 
         DeviceProfile grid = mActivity.getDeviceProfile();
-        InvariantDeviceProfile idp = grid.inv;
-
         int count = getChildCount();
         for (int i = 0; i < count; i++) {
             final View child = getChildAt(i);
@@ -118,10 +115,10 @@ public class SecondaryDragLayer extends BaseDragLayer<SecondaryDisplayLauncher>
                 int padding = 2 * (grid.desiredWorkspaceLeftRightMarginPx
                         + grid.cellLayoutPaddingLeftRightPx);
 
-                int maxWidth = grid.allAppsCellWidthPx * idp.numAllAppsColumns + padding;
+                int maxWidth = grid.allAppsCellWidthPx * grid.numShownAllAppsColumns + padding;
                 int appsWidth = Math.min(width, maxWidth);
 
-                int maxHeight = grid.allAppsCellHeightPx * idp.numAllAppsColumns + padding;
+                int maxHeight = grid.allAppsCellHeightPx * grid.numShownAllAppsColumns + padding;
                 int appsHeight = Math.min(height, maxHeight);
 
                 mAppsView.measure(
diff --git a/src/com/android/launcher3/util/DisplayController.java b/src/com/android/launcher3/util/DisplayController.java
index 75c089e754..b7512077a9 100644
--- a/src/com/android/launcher3/util/DisplayController.java
+++ b/src/com/android/launcher3/util/DisplayController.java
@@ -18,8 +18,10 @@ package com.android.launcher3.util;
 import static android.view.Display.DEFAULT_DISPLAY;
 import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION;
 
+import static com.android.launcher3.Utilities.dpiFromPx;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+import static com.android.launcher3.util.WindowManagerCompat.MIN_TABLET_WIDTH;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
@@ -32,16 +34,22 @@ import android.graphics.Point;
 import android.hardware.display.DisplayManager;
 import android.hardware.display.DisplayManager.DisplayListener;
 import android.os.Build;
+import android.util.ArraySet;
 import android.util.Log;
 import android.view.Display;
+import android.view.WindowMetrics;
 
 import androidx.annotation.AnyThread;
 import androidx.annotation.UiThread;
 import androidx.annotation.WorkerThread;
 
 import com.android.launcher3.Utilities;
+import com.android.launcher3.uioverrides.ApiWrapper;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Objects;
+import java.util.Set;
 
 /**
  * Utility class to cache properties of default display to avoid a system RPC on every call.
@@ -54,13 +62,14 @@ public class DisplayController implements DisplayListener, ComponentCallbacks {
     public static final MainThreadInitializedObject<DisplayController> INSTANCE =
             new MainThreadInitializedObject<>(DisplayController::new);
 
-    public static final int CHANGE_SIZE = 1 << 0;
+    public static final int CHANGE_ACTIVE_SCREEN = 1 << 0;
     public static final int CHANGE_ROTATION = 1 << 1;
     public static final int CHANGE_FRAME_DELAY = 1 << 2;
     public static final int CHANGE_DENSITY = 1 << 3;
+    public static final int CHANGE_SUPPORTED_BOUNDS = 1 << 4;
 
-    public static final int CHANGE_ALL = CHANGE_SIZE | CHANGE_ROTATION
-            | CHANGE_FRAME_DELAY | CHANGE_DENSITY;
+    public static final int CHANGE_ALL = CHANGE_ACTIVE_SCREEN | CHANGE_ROTATION
+            | CHANGE_FRAME_DELAY | CHANGE_DENSITY | CHANGE_SUPPORTED_BOUNDS;
 
     private final Context mContext;
     private final DisplayManager mDM;
@@ -87,7 +96,22 @@ public class DisplayController implements DisplayListener, ComponentCallbacks {
                     new IntentFilter(Intent.ACTION_CONFIGURATION_CHANGED));
         }
 
-        mInfo = new Info(getContext(display), display);
+        // Create a single holder for all internal displays. External display holders created
+        // lazily.
+        Set<PortraitSize> extraInternalDisplays = new ArraySet<>();
+        for (Display d : mDM.getDisplays()) {
+            if (ApiWrapper.isInternalDisplay(display) && d.getDisplayId() != DEFAULT_DISPLAY) {
+                Point size = new Point();
+                d.getRealSize(size);
+                extraInternalDisplays.add(new PortraitSize(size.x, size.y));
+            }
+        }
+
+        if (extraInternalDisplays.isEmpty() || !Utilities.ATLEAST_S) {
+            mInfo = new Info(createDisplayInfoContext(display), display, Collections.emptySet());
+        } else {
+            mInfo = new Info(mWindowContext, display, extraInternalDisplays);
+        }
         mDM.registerDisplayListener(this, UI_HELPER_EXECUTOR.getHandler());
     }
 
@@ -139,7 +163,7 @@ public class DisplayController implements DisplayListener, ComponentCallbacks {
      */
     private void onConfigChanged(Intent intent) {
         Configuration config = mContext.getResources().getConfiguration();
-        if (config.fontScale != config.fontScale || mInfo.densityDpi != config.densityDpi) {
+        if (mInfo.fontScale != config.fontScale || mInfo.densityDpi != config.densityDpi) {
             Log.d(TAG, "Configuration changed, notifying listeners");
             Display display = mDM.getDisplay(DEFAULT_DISPLAY);
             if (display != null) {
@@ -157,8 +181,7 @@ public class DisplayController implements DisplayListener, ComponentCallbacks {
                 || config.fontScale != mInfo.fontScale
                 || display.getRotation() != mInfo.rotation
                 || !mInfo.mScreenSizeDp.equals(
-                        Math.min(config.screenHeightDp, config.screenWidthDp),
-                        Math.max(config.screenHeightDp, config.screenWidthDp))) {
+                        new PortraitSize(config.screenHeightDp, config.screenWidthDp))) {
             handleInfoChange(display);
         }
     }
@@ -178,18 +201,23 @@ public class DisplayController implements DisplayListener, ComponentCallbacks {
         return mInfo;
     }
 
-    private Context getContext(Display display) {
-        return Utilities.ATLEAST_S ? mWindowContext : mContext.createDisplayContext(display);
+    private Context createDisplayInfoContext(Display display) {
+        return Utilities.ATLEAST_S
+                ? mContext.createWindowContext(display, TYPE_APPLICATION, null)
+                : mContext.createDisplayContext(display);
     }
 
     @AnyThread
     private void handleInfoChange(Display display) {
         Info oldInfo = mInfo;
-        Context context = getContext(display);
-        Info newInfo = new Info(context, display);
+        Set<PortraitSize> extraDisplaysSizes = oldInfo.mAllSizes.size() > 1
+                ? oldInfo.mAllSizes : Collections.emptySet();
+
+        Context displayContext = createDisplayInfoContext(display);
+        Info newInfo = new Info(displayContext, display, extraDisplaysSizes);
         int change = 0;
-        if (newInfo.hasDifferentSize(oldInfo)) {
-            change |= CHANGE_SIZE;
+        if (!newInfo.mScreenSizeDp.equals(oldInfo.mScreenSizeDp)) {
+            change |= CHANGE_ACTIVE_SCREEN;
         }
         if (newInfo.rotation != oldInfo.rotation) {
             change |= CHANGE_ROTATION;
@@ -200,11 +228,14 @@ public class DisplayController implements DisplayListener, ComponentCallbacks {
         if (newInfo.densityDpi != oldInfo.densityDpi || newInfo.fontScale != oldInfo.fontScale) {
             change |= CHANGE_DENSITY;
         }
+        if (!newInfo.supportedBounds.equals(oldInfo.supportedBounds)) {
+            change |= CHANGE_SUPPORTED_BOUNDS;
+        }
 
         if (change != 0) {
             mInfo = newInfo;
             final int flags = change;
-            MAIN_EXECUTOR.execute(() -> notifyChange(context, flags));
+            MAIN_EXECUTOR.execute(() -> notifyChange(displayContext, flags));
         }
     }
 
@@ -224,13 +255,18 @@ public class DisplayController implements DisplayListener, ComponentCallbacks {
         public final float fontScale;
         public final int densityDpi;
 
-        private final Point mScreenSizeDp;
+        private final PortraitSize mScreenSizeDp;
+        private final Set<PortraitSize> mAllSizes;
+
+        public final Point currentSize;
 
-        public final Point realSize;
-        public final Point smallestSize;
-        public final Point largestSize;
+        public final Set<WindowBounds> supportedBounds = new ArraySet<>();
 
         public Info(Context context, Display display) {
+            this(context, display, Collections.emptySet());
+        }
+
+        private Info(Context context, Display display, Set<PortraitSize> extraDisplaysSizes) {
             id = display.getDisplayId();
 
             rotation = display.getRotation();
@@ -238,35 +274,67 @@ public class DisplayController implements DisplayListener, ComponentCallbacks {
             Configuration config = context.getResources().getConfiguration();
             fontScale = config.fontScale;
             densityDpi = config.densityDpi;
-            mScreenSizeDp = new Point(
-                    Math.min(config.screenHeightDp, config.screenWidthDp),
-                    Math.max(config.screenHeightDp, config.screenWidthDp));
+            mScreenSizeDp = new PortraitSize(config.screenHeightDp, config.screenWidthDp);
 
             singleFrameMs = getSingleFrameMs(display);
+            currentSize = new Point();
+
+            display.getRealSize(currentSize);
+
+            if (extraDisplaysSizes.isEmpty() || !Utilities.ATLEAST_S) {
+                Point smallestSize = new Point();
+                Point largestSize = new Point();
+                display.getCurrentSizeRange(smallestSize, largestSize);
+
+                int portraitWidth = Math.min(currentSize.x, currentSize.y);
+                int portraitHeight = Math.max(currentSize.x, currentSize.y);
+
+                supportedBounds.add(new WindowBounds(portraitWidth, portraitHeight,
+                        smallestSize.x, largestSize.y));
+                supportedBounds.add(new WindowBounds(portraitHeight, portraitWidth,
+                        largestSize.x, smallestSize.y));
+                mAllSizes = Collections.singleton(new PortraitSize(currentSize.x, currentSize.y));
+            } else {
+                mAllSizes = new ArraySet<>(extraDisplaysSizes);
+                mAllSizes.add(new PortraitSize(currentSize.x, currentSize.y));
+                Set<WindowMetrics> metrics = WindowManagerCompat.getDisplayProfiles(
+                        context, mAllSizes, densityDpi,
+                        ApiWrapper.TASKBAR_DRAWN_IN_PROCESS);
+                metrics.forEach(wm -> supportedBounds.add(WindowBounds.fromWindowMetrics(wm)));
+            }
+        }
 
-            realSize = new Point();
-            smallestSize = new Point();
-            largestSize = new Point();
-
-            display.getRealSize(realSize);
-            display.getCurrentSizeRange(smallestSize, largestSize);
+        /**
+         * Returns true if the bounds represent a tablet
+         */
+        public boolean isTablet(WindowBounds bounds) {
+            return dpiFromPx(Math.min(bounds.bounds.width(), bounds.bounds.height()),
+                    densityDpi) >= MIN_TABLET_WIDTH;
         }
+    }
 
-        private boolean hasDifferentSize(Info info) {
-            if (!realSize.equals(info.realSize)
-                    && !realSize.equals(info.realSize.y, info.realSize.x)) {
-                Log.d(TAG, String.format("Display size changed from %s to %s",
-                        info.realSize, realSize));
-                return true;
-            }
+    /**
+     * Utility class to hold a size information in an orientation independent way
+     */
+    public static class PortraitSize {
+        public final int width, height;
 
-            if (!smallestSize.equals(info.smallestSize) || !largestSize.equals(info.largestSize)) {
-                Log.d(TAG, String.format("Available size changed from [%s, %s] to [%s, %s]",
-                        smallestSize, largestSize, info.smallestSize, info.largestSize));
-                return true;
-            }
+        public PortraitSize(int w, int h) {
+            width = Math.min(w, h);
+            height = Math.max(w, h);
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            PortraitSize that = (PortraitSize) o;
+            return width == that.width && height == that.height;
+        }
 
-            return false;
+        @Override
+        public int hashCode() {
+            return Objects.hash(width, height);
         }
     }
 
diff --git a/src/com/android/launcher3/util/WindowBounds.java b/src/com/android/launcher3/util/WindowBounds.java
index 3c2fb62c16..c92770e8fd 100644
--- a/src/com/android/launcher3/util/WindowBounds.java
+++ b/src/com/android/launcher3/util/WindowBounds.java
@@ -15,11 +15,16 @@
  */
 package com.android.launcher3.util;
 
+import android.graphics.Insets;
 import android.graphics.Point;
 import android.graphics.Rect;
+import android.view.WindowInsets.Type;
+import android.view.WindowMetrics;
 
 import androidx.annotation.Nullable;
 
+import java.util.Objects;
+
 /**
  * Utility class to hold information about window position and layout
  */
@@ -36,6 +41,18 @@ public class WindowBounds {
                 bounds.height() - insets.top - insets.bottom);
     }
 
+    public WindowBounds(int width, int height, int availableWidth, int availableHeight) {
+        this.bounds = new Rect(0, 0, width, height);
+        this.availableSize = new Point(availableWidth, availableHeight);
+        // We don't care about insets in this case
+        this.insets = new Rect(0, 0, width - availableWidth, height - availableHeight);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(bounds, insets);
+    }
+
     @Override
     public boolean equals(@Nullable Object obj) {
         if (!(obj instanceof WindowBounds)) {
@@ -44,4 +61,30 @@ public class WindowBounds {
         WindowBounds other = (WindowBounds) obj;
         return other.bounds.equals(bounds) && other.insets.equals(insets);
     }
+
+    @Override
+    public String toString() {
+        return "WindowBounds{"
+                + "bounds=" + bounds
+                + ", insets=" + insets
+                + ", availableSize=" + availableSize
+                + '}';
+    }
+
+    /**
+     * Returns true if the device is in landscape orientation
+     */
+    public final boolean isLandscape() {
+        return availableSize.x > availableSize.y;
+    }
+
+    /**
+     * Returns the bounds corresponding to the provided WindowMetrics
+     */
+    @SuppressWarnings("NewApi")
+    public static WindowBounds fromWindowMetrics(WindowMetrics wm) {
+        Insets insets = wm.getWindowInsets().getInsets(Type.systemBars());
+        return new WindowBounds(wm.getBounds(),
+                new Rect(insets.left, insets.top, insets.right, insets.bottom));
+    }
 }
diff --git a/src/com/android/launcher3/util/WindowManagerCompat.java b/src/com/android/launcher3/util/WindowManagerCompat.java
new file mode 100644
index 0000000000..38a63de592
--- /dev/null
+++ b/src/com/android/launcher3/util/WindowManagerCompat.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.util;
+
+import static com.android.launcher3.ResourceUtils.INVALID_RESOURCE_HANDLE;
+import static com.android.launcher3.Utilities.dpiFromPx;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.graphics.Insets;
+import android.graphics.Rect;
+import android.os.Build;
+import android.view.WindowInsets;
+import android.view.WindowInsets.Type;
+import android.view.WindowManager;
+import android.view.WindowMetrics;
+
+import com.android.launcher3.R;
+import com.android.launcher3.ResourceUtils;
+import com.android.launcher3.util.DisplayController.PortraitSize;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Utility class to simulate window manager APIs until proper APIs are available
+ */
+@TargetApi(Build.VERSION_CODES.S)
+public class WindowManagerCompat {
+
+    public static final int MIN_TABLET_WIDTH = 600;
+
+    /**
+     * Returns a set of supported render sizes for a set of internal displays.
+     * This is a temporary workaround which assumes only nav-bar insets change across displays
+     * @param consumeTaskBar if true, it assumes that task bar is part of the app window
+     *                       and ignores any insets because of task bar.
+     */
+    public static Set<WindowMetrics> getDisplayProfiles(
+            Context windowContext, Collection<PortraitSize> allDisplaySizes,
+            int densityDpi, boolean consumeTaskBar) {
+        WindowInsets metrics = windowContext.getSystemService(WindowManager.class)
+                .getMaximumWindowMetrics().getWindowInsets();
+        boolean hasNavbar = ResourceUtils.getIntegerByName(
+                "config_navBarInteractionMode",
+                windowContext.getResources(),
+                INVALID_RESOURCE_HANDLE) != 0;
+
+        WindowInsets.Builder insetsBuilder = new WindowInsets.Builder(metrics);
+
+        Set<WindowMetrics> result = new HashSet<>();
+        for (PortraitSize size : allDisplaySizes) {
+            int swDP = (int) dpiFromPx(size.width, densityDpi);
+            boolean isTablet = swDP >= MIN_TABLET_WIDTH;
+
+            final Insets portraitNav, landscapeNav;
+            if (isTablet && !consumeTaskBar) {
+                portraitNav = landscapeNav = Insets.of(0, 0, 0, windowContext.getResources()
+                        .getDimensionPixelSize(R.dimen.taskbar_size));
+            } else if (hasNavbar) {
+                portraitNav = Insets.of(0, 0, 0,
+                        getSystemResource(windowContext, "navigation_bar_height", swDP));
+                landscapeNav = isTablet
+                        ? Insets.of(0, 0, 0, getSystemResource(windowContext,
+                                "navigation_bar_height_landscape", swDP))
+                        : Insets.of(0, 0, getSystemResource(windowContext,
+                                "navigation_bar_width", swDP), 0);
+            } else {
+                portraitNav = landscapeNav = Insets.of(0, 0, 0, 0);
+            }
+
+            result.add(new WindowMetrics(
+                    new Rect(0, 0, size.width, size.height),
+                    insetsBuilder.setInsets(Type.navigationBars(), portraitNav).build()));
+            result.add(new WindowMetrics(
+                    new Rect(0, 0, size.height, size.width),
+                    insetsBuilder.setInsets(Type.navigationBars(), landscapeNav).build()));
+        }
+        return result;
+    }
+
+    private static int getSystemResource(Context context, String key, int swDp) {
+        int resourceId = context.getResources().getIdentifier(key, "dimen", "android");
+        if (resourceId > 0) {
+            Configuration conf = new Configuration();
+            conf.smallestScreenWidthDp = swDp;
+            return context.createConfigurationContext(conf)
+                    .getResources().getDimensionPixelSize(resourceId);
+        }
+        return 0;
+    }
+}
diff --git a/src/com/android/launcher3/widget/DeferredAppWidgetHostView.java b/src/com/android/launcher3/widget/DeferredAppWidgetHostView.java
index 3a24c3d21a..149ac57bfb 100644
--- a/src/com/android/launcher3/widget/DeferredAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/DeferredAppWidgetHostView.java
@@ -44,7 +44,7 @@ public class DeferredAppWidgetHostView extends LauncherAppWidgetHostView {
         mPaint = new TextPaint();
         mPaint.setColor(Color.WHITE);
         mPaint.setTextSize(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_PX,
-                mLauncher.getDeviceProfile().getFullScreenProfile().iconTextSizePx,
+                mLauncher.getDeviceProfile().iconTextSizePx,
                 getResources().getDisplayMetrics()));
         setBackgroundResource(R.drawable.bg_deferred_app_widget);
     }
diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java b/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
index ad61495de8..de511cd00b 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
@@ -13,6 +13,7 @@ import android.graphics.drawable.Drawable;
 import android.os.Parcel;
 import android.os.UserHandle;
 
+import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.Utilities;
@@ -66,20 +67,25 @@ public class LauncherAppWidgetProviderInfo extends AppWidgetProviderInfo
     }
 
     public void initSpans(Context context, InvariantDeviceProfile idp) {
-        Point landCellSize = idp.landscapeProfile.getCellSize();
-        Point portCellSize = idp.portraitProfile.getCellSize();
-
         // Always assume we're working with the smallest span to make sure we
         // reserve enough space in both orientations.
-        float smallestCellWidth = Math.min(landCellSize.x, portCellSize.x);
-        float smallestCellHeight = Math.min(landCellSize.y, portCellSize.y);
+        float smallestCellWidth = Float.MAX_VALUE;
+        float smallestCellHeight = Float.MAX_VALUE;
+
+        Point cellSize = new Point();
+        boolean isWidgetPadded = false;
+        for (DeviceProfile dp : idp.supportedProfiles) {
+            dp.getCellSize(cellSize);
+            smallestCellWidth = Math.min(smallestCellWidth, cellSize.x);
+            smallestCellHeight = Math.min(smallestCellHeight, cellSize.y);
+            isWidgetPadded = isWidgetPadded || !dp.shouldInsetWidgets();
+        }
 
         // We want to account for the extra amount of padding that we are adding to the widget
         // to ensure that it gets the full amount of space that it has requested.
         // If grids supports insetting widgets, we do not account for widget padding.
         Rect widgetPadding = new Rect();
-        if (!idp.landscapeProfile.shouldInsetWidgets()
-                || !idp.portraitProfile.shouldInsetWidgets()) {
+        if (isWidgetPadded) {
             AppWidgetHostView.getDefaultPaddingForWidget(context, provider, widgetPadding);
         }
 
diff --git a/src/com/android/launcher3/widget/PendingAddWidgetInfo.java b/src/com/android/launcher3/widget/PendingAddWidgetInfo.java
index ee0b84e815..3377abbb7b 100644
--- a/src/com/android/launcher3/widget/PendingAddWidgetInfo.java
+++ b/src/com/android/launcher3/widget/PendingAddWidgetInfo.java
@@ -15,9 +15,11 @@
  */
 package com.android.launcher3.widget;
 
+import static com.android.launcher3.AppWidgetResizeFrame.getWidgetSizeOptions;
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_TRAY;
 
 import android.appwidget.AppWidgetHostView;
+import android.content.Context;
 import android.os.Bundle;
 
 import com.android.launcher3.LauncherSettings;
@@ -57,4 +59,8 @@ public class PendingAddWidgetInfo extends PendingAddItemInfo {
     public WidgetAddFlowHandler getHandler() {
         return new WidgetAddFlowHandler(info);
     }
+
+    public Bundle getDefaultSizeOptions(Context context) {
+        return getWidgetSizeOptions(context, componentName, spanX, spanY);
+    }
 }
diff --git a/src/com/android/launcher3/widget/WidgetHostViewLoader.java b/src/com/android/launcher3/widget/WidgetHostViewLoader.java
index 12e0d43bd1..46141e0bc3 100644
--- a/src/com/android/launcher3/widget/WidgetHostViewLoader.java
+++ b/src/com/android/launcher3/widget/WidgetHostViewLoader.java
@@ -1,16 +1,12 @@
 package com.android.launcher3.widget;
 
 import android.appwidget.AppWidgetHostView;
-import android.appwidget.AppWidgetManager;
 import android.content.Context;
-import android.graphics.Rect;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
-import android.util.SizeF;
 import android.view.View;
 
-import com.android.launcher3.AppWidgetResizeFrame;
 import com.android.launcher3.DropTarget;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.dragndrop.DragController;
@@ -18,9 +14,6 @@ import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.util.Thunk;
 
-import java.util.ArrayList;
-import java.util.stream.Collectors;
-
 public class WidgetHostViewLoader implements DragController.DragListener {
     private static final String TAG = "WidgetHostViewLoader";
     private static final boolean LOGD = false;
@@ -90,7 +83,7 @@ public class WidgetHostViewLoader implements DragController.DragListener {
         if (pInfo.isCustomWidget()) {
             return false;
         }
-        final Bundle options = getDefaultOptionsForWidget(mLauncher, mInfo);
+        final Bundle options = mInfo.getDefaultSizeOptions(mLauncher);
 
         // If there is a configuration activity, do not follow thru bound and inflate.
         if (mInfo.getHandler().needsConfigure()) {
@@ -154,29 +147,4 @@ public class WidgetHostViewLoader implements DragController.DragListener {
         return true;
     }
 
-    public static Bundle getDefaultOptionsForWidget(Context context, PendingAddWidgetInfo info) {
-        ArrayList<SizeF> sizes = AppWidgetResizeFrame
-                .getWidgetSizes(context, info.spanX, info.spanY);
-
-        Rect padding = AppWidgetHostView.getDefaultPaddingForWidget(context,
-                info.componentName, null);
-        float density = context.getResources().getDisplayMetrics().density;
-        float xPaddingDips = (padding.left + padding.right) / density;
-        float yPaddingDips = (padding.top + padding.bottom) / density;
-
-        ArrayList<SizeF> paddedSizes = sizes.stream().map(
-                size -> new SizeF(Math.max(0.f, size.getWidth() - xPaddingDips),
-                        Math.max(0.f, size.getHeight() - yPaddingDips))).collect(
-                Collectors.toCollection(ArrayList::new));
-
-        Rect rect = AppWidgetResizeFrame.getMinMaxSizes(paddedSizes, null /* outRect */);
-
-        Bundle options = new Bundle();
-        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH, rect.left);
-        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT, rect.top);
-        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH, rect.right);
-        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT, rect.bottom);
-        options.putParcelableArrayList(AppWidgetManager.OPTION_APPWIDGET_SIZES, paddedSizes);
-        return options;
-    }
 }
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/ApiWrapper.java b/src_ui_overrides/com/android/launcher3/uioverrides/ApiWrapper.java
index 6fd147a055..4407fe1149 100644
--- a/src_ui_overrides/com/android/launcher3/uioverrides/ApiWrapper.java
+++ b/src_ui_overrides/com/android/launcher3/uioverrides/ApiWrapper.java
@@ -18,12 +18,22 @@ package com.android.launcher3.uioverrides;
 
 import android.app.Person;
 import android.content.pm.ShortcutInfo;
+import android.view.Display;
 
 import com.android.launcher3.Utilities;
 
 public class ApiWrapper {
 
+    public static final boolean TASKBAR_DRAWN_IN_PROCESS = false;
+
     public static Person[] getPersons(ShortcutInfo si) {
         return Utilities.EMPTY_PERSON_ARRAY;
     }
+
+    /**
+     * Returns true if the display is an internal displays
+     */
+    public static boolean isInternalDisplay(Display display) {
+        return display.getDisplayId() == Display.DEFAULT_DISPLAY;
+    }
 }
diff --git a/tests/src_common/com/android/launcher3/common/WidgetUtils.java b/tests/src_common/com/android/launcher3/common/WidgetUtils.java
index ffad93fffc..5e17e0a5a7 100644
--- a/tests/src_common/com/android/launcher3/common/WidgetUtils.java
+++ b/tests/src_common/com/android/launcher3/common/WidgetUtils.java
@@ -16,7 +16,6 @@
 package com.android.launcher3.common;
 
 import static com.android.launcher3.WorkspaceLayoutManager.FIRST_SCREEN_ID;
-import static com.android.launcher3.widget.WidgetHostViewLoader.getDefaultOptionsForWidget;
 
 import android.appwidget.AppWidgetHost;
 import android.content.ContentResolver;
@@ -62,7 +61,7 @@ public class WidgetUtils {
             pendingInfo.spanY = item.spanY;
             pendingInfo.minSpanX = item.minSpanX;
             pendingInfo.minSpanY = item.minSpanY;
-            Bundle options = getDefaultOptionsForWidget(targetContext, pendingInfo);
+            Bundle options = pendingInfo.getDefaultSizeOptions(targetContext);
 
             AppWidgetHost host = new LauncherAppWidgetHost(targetContext);
             int widgetId = host.allocateAppWidgetId();
-- 
GitLab


From 8fbf5cd2638ad0409b5d0b6f22485a482180dbc2 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Mon, 3 May 2021 15:58:43 -0700
Subject: [PATCH 1043/1664] Set swipe_up_rect_xy_stiffness back to 200 for
 existing app close anim.

Bug: 173107751
Test: manual
Change-Id: Ic878a2f788c35bffe97d83cb364d3878638272a1
---
 res/values/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values/config.xml b/res/values/config.xml
index f8a517d1d0..522eeb6fb6 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -145,7 +145,7 @@
     <item name="swipe_up_trans_y_stiffness" type="dimen" format="float">200</item>
 
     <item name="swipe_up_rect_xy_damping_ratio" type="dimen" format="float">0.8</item>
-    <item name="swipe_up_rect_xy_stiffness" type="dimen" format="float">100</item>
+    <item name="swipe_up_rect_xy_stiffness" type="dimen" format="float">200</item>
 
 
     <item name="swipe_up_rect_2_x_damping_ratio" type="dimen" format="float">1</item>
-- 
GitLab


From 9b505e3148cc8e496fe3f1edcc2400e3f8925a60 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 3 May 2021 16:46:16 -0700
Subject: [PATCH 1044/1664] Check for memory leaks after tests in
 FallbackRecentsTest

Test: e.g. goToOverviewFromApp()
Bug: 185806101
Change-Id: I6e618e850740afa69989f652321d4075d3cda13d
---
 .../src/com/android/quickstep/FallbackRecentsTest.java     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
index 88f1850072..f93d87c8c3 100644
--- a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
+++ b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
@@ -61,6 +61,7 @@ import com.android.launcher3.util.Wait;
 import com.android.launcher3.util.rule.FailureWatcher;
 import com.android.quickstep.views.RecentsView;
 
+import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.RuleChain;
@@ -141,6 +142,12 @@ public class FallbackRecentsTest {
         }
     }
 
+    @After
+    public void verifyLauncherState() {
+        // Limits UI tests affecting tests running after them.
+        AbstractQuickStepTest.checkDetectedLeaks(mLauncher);
+    }
+
     // b/143488140
     //@NavigationModeSwitch
     @Test
-- 
GitLab


From fed2a01fe4e40391bf10c7afe37c197b20e0af60 Mon Sep 17 00:00:00 2001
From: Zak Cohen <zakcohen@google.com>
Date: Mon, 3 May 2021 16:47:35 -0700
Subject: [PATCH 1045/1664] Fade out empty Overview message.

When Overview is empty, fade out its contents on transitions.


Bug: 185447800
Test: Local build and test on P5
Change-Id: I9a0cd649f2f7353e4a7af21a93fb18be36f616a8
---
 .../states/QuickstepAtomicAnimationFactory.java | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
index ba6192314e..3ac78663f7 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
@@ -77,6 +77,7 @@ public class QuickstepAtomicAnimationFactory extends
     @Override
     public void prepareForAtomicAnimation(LauncherState fromState, LauncherState toState,
             StateAnimationConfig config) {
+        RecentsView overview = mActivity.getOverviewPanel();
         if (toState == NORMAL && fromState == OVERVIEW) {
             config.setInterpolator(ANIM_WORKSPACE_SCALE, DEACCEL);
             config.setInterpolator(ANIM_WORKSPACE_FADE, ACCEL);
@@ -85,7 +86,12 @@ public class QuickstepAtomicAnimationFactory extends
             config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, ACCEL_DEACCEL);
 
             if (SysUINavigationMode.getMode(mActivity) == NO_BUTTON) {
-                config.setInterpolator(ANIM_OVERVIEW_FADE, FINAL_FRAME);
+                // Scrolling in tasks, so make visible straight away
+                if (overview.getTaskViewCount() > 0) {
+                    config.setInterpolator(ANIM_OVERVIEW_FADE, FINAL_FRAME);
+                } else {
+                    config.setInterpolator(ANIM_OVERVIEW_FADE, DEACCEL_1_7);
+                }
             } else {
                 config.setInterpolator(ANIM_OVERVIEW_FADE, DEACCEL_1_7);
             }
@@ -122,13 +128,18 @@ public class QuickstepAtomicAnimationFactory extends
                 config.setInterpolator(ANIM_WORKSPACE_SCALE,
                         fromState == NORMAL ? ACCEL : OVERSHOOT_1_2);
                 config.setInterpolator(ANIM_WORKSPACE_TRANSLATE, ACCEL);
-                config.setInterpolator(ANIM_OVERVIEW_FADE, INSTANT);
+
+                // Scrolling in tasks, so show straight away
+                if (overview.getTaskViewCount() > 0) {
+                    config.setInterpolator(ANIM_OVERVIEW_FADE, INSTANT);
+                } else {
+                    config.setInterpolator(ANIM_OVERVIEW_FADE, OVERSHOOT_1_2);
+                }
             } else {
                 config.setInterpolator(ANIM_WORKSPACE_SCALE, OVERSHOOT_1_2);
                 config.setInterpolator(ANIM_OVERVIEW_FADE, OVERSHOOT_1_2);
 
                 // Scale up the recents, if it is not coming from the side
-                RecentsView overview = mActivity.getOverviewPanel();
                 if (overview.getVisibility() != VISIBLE || overview.getContentAlpha() == 0) {
                     RECENTS_SCALE_PROPERTY.set(overview, RECENTS_PREPARE_SCALE);
                 }
-- 
GitLab


From e9ce95bed84c51330bde3706d992b3b1ca594109 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Mon, 3 May 2021 19:04:21 -0700
Subject: [PATCH 1046/1664] Temporary wait to check that waiting after swiping
 from context menu is a way to the real fix.

Test: presubmit
Bug: 187080582
Change-Id: Ief09857c267e8786bb6f67203db26b47f27060ea
---
 .../tapl/com/android/launcher3/tapl/LauncherInstrumentation.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index ebad15449d..e5b93b1890 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -695,6 +695,7 @@ public final class LauncherInstrumentation {
                         waitUntilLauncherObjectGone(CONTEXT_MENU_RES_ID);
                         // Swiping up can temporarily bring Nexus Launcher if the current
                         // Launcher is a Launcher3 one. Wait for the current launcher to reappear.
+                        SystemClock.sleep(5000); // b/187080582
                         waitForLauncherObject(getAnyObjectSelector());
                     }
                 }
-- 
GitLab


From 9ab43772ab9fe3b567ae085851a56bb2b9caad8c Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 23 Apr 2021 11:40:58 -0700
Subject: [PATCH 1047/1664] Adding support for using themed icons on workspace

Bug: 183641907
Test: Manual

Change-Id: Ieda7e73b3ae4dfe3009e3f23754aff5f8826a967
---
 .../BackGestureTutorialController.java        |   7 -
 .../OverviewGestureTutorialController.java    |  10 -
 .../interaction/SandboxLauncherRenderer.java  |  44 -----
 .../interaction/TutorialController.java       |   8 -
 src/com/android/launcher3/BubbleTextView.java |   3 +-
 src/com/android/launcher3/Utilities.java      |  16 +-
 .../launcher3/config/FeatureFlags.java        |   4 +-
 .../launcher3/dragndrop/DragController.java   |   8 +-
 .../android/launcher3/dragndrop/DragView.java |  18 +-
 .../launcher3/folder/PreviewItemManager.java  |   2 +-
 .../graphics/LauncherPreviewRenderer.java     | 182 ++++++++----------
 .../graphics/PreviewSurfaceRenderer.java      |  26 ++-
 .../android/launcher3/icons/IconCache.java    |  18 +-
 .../icons/LauncherActivityCachingLogic.java   |   5 +-
 .../model/data/ItemInfoWithIcon.java          |  12 +-
 .../launcher3/widget/LocalColorExtractor.java |  11 +-
 16 files changed, 164 insertions(+), 210 deletions(-)
 delete mode 100644 quickstep/src/com/android/quickstep/interaction/SandboxLauncherRenderer.java

diff --git a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
index c396eec50e..14c3a92f49 100644
--- a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
@@ -20,9 +20,7 @@ import static com.android.quickstep.interaction.TutorialController.TutorialType.
 import static com.android.quickstep.interaction.TutorialController.TutorialType.RIGHT_EDGE_BACK_NAVIGATION;
 
 import android.graphics.PointF;
-import android.view.View;
 
-import androidx.annotation.Nullable;
 import androidx.appcompat.content.res.AppCompatResources;
 
 import com.android.launcher3.R;
@@ -36,11 +34,6 @@ final class BackGestureTutorialController extends TutorialController {
         super(fragment, tutorialType);
     }
 
-    @Nullable
-    public View getMockLauncherView() {
-        return null;
-    }
-
     @Override
     public Integer getIntroductionTitle() {
         return mTutorialType == LEFT_EDGE_BACK_NAVIGATION
diff --git a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
index 3c59ed3007..06610e6ad6 100644
--- a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
@@ -16,15 +16,11 @@
 package com.android.quickstep.interaction;
 
 import static com.android.launcher3.anim.Interpolators.ACCEL;
-import static com.android.quickstep.interaction.TutorialController.TutorialType.OVERVIEW_NAVIGATION_COMPLETE;
 
 import android.animation.AnimatorSet;
 import android.annotation.TargetApi;
 import android.graphics.PointF;
 import android.os.Build;
-import android.view.View;
-
-import androidx.annotation.Nullable;
 
 import com.android.launcher3.R;
 import com.android.launcher3.anim.PendingAnimation;
@@ -52,12 +48,6 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont
         return R.string.overview_gesture_intro_subtitle;
     }
 
-    @Nullable
-    @Override
-    public View getMockLauncherView() {
-        return null;
-    }
-
     @Override
     public void onBackGestureAttempted(BackGestureResult result) {
         switch (mTutorialType) {
diff --git a/quickstep/src/com/android/quickstep/interaction/SandboxLauncherRenderer.java b/quickstep/src/com/android/quickstep/interaction/SandboxLauncherRenderer.java
deleted file mode 100644
index 80ffe6609e..0000000000
--- a/quickstep/src/com/android/quickstep/interaction/SandboxLauncherRenderer.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.quickstep.interaction;
-
-import android.content.Context;
-import android.view.View;
-
-import com.android.launcher3.InvariantDeviceProfile;
-import com.android.launcher3.graphics.LauncherPreviewRenderer;
-
-/** Renders a fake Launcher for use in the Sandbox. */
-class SandboxLauncherRenderer extends LauncherPreviewRenderer {
-    SandboxLauncherRenderer(Context context, InvariantDeviceProfile idp, boolean migrated) {
-        super(context, idp, migrated);
-    }
-
-    @Override
-    public boolean shouldShowRealLauncherPreview() {
-        return false;
-    }
-
-    @Override
-    public boolean shouldShowQsb() {
-        return false;
-    }
-
-    @Override
-    public View.OnLongClickListener getWorkspaceChildOnLongClickListener() {
-        return null;
-    }
-}
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
index 6f82f8596b..55972adcbe 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
@@ -37,7 +37,6 @@ import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.content.res.AppCompatResources;
 
-import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.R;
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.views.ClipIconView;
@@ -129,13 +128,6 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         return R.drawable.default_sandbox_app_previous_task_thumbnail;
     }
 
-    @Nullable
-    public View getMockLauncherView() {
-        InvariantDeviceProfile dp = InvariantDeviceProfile.INSTANCE.get(mContext);
-
-        return new SandboxLauncherRenderer(mContext, dp, true).getRenderedView();
-    }
-
     @DrawableRes
     public int getMockAppIconResId() {
         return R.drawable.default_sandbox_app_icon;
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 2ace796ca0..3d044d68ce 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -317,7 +317,8 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
 
     @UiThread
     protected void applyIconAndLabel(ItemInfoWithIcon info) {
-        FastBitmapDrawable iconDrawable = info.newIcon(getContext());
+        boolean useTheme = mDisplay == DISPLAY_WORKSPACE || mDisplay == DISPLAY_FOLDER;
+        FastBitmapDrawable iconDrawable = info.newIcon(getContext(), useTheme);
         mDotParams.color = IconPalette.getMutedColor(info.bitmap.color, 0.54f);
 
         setIcon(iconDrawable);
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index a799b4a33a..be5463ec2c 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -74,9 +74,9 @@ import com.android.launcher3.dragndrop.FolderAdaptiveIcon;
 import com.android.launcher3.graphics.GridCustomizationsProvider;
 import com.android.launcher3.graphics.TintedDrawableSpan;
 import com.android.launcher3.icons.FastBitmapDrawable;
-import com.android.launcher3.icons.IconProvider;
 import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.icons.ShortcutCachingLogic;
+import com.android.launcher3.icons.ThemedIconDrawable.ThemedAdaptiveIcon;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.pm.ShortcutConfigActivityInfo;
@@ -596,13 +596,23 @@ public final class Utilities {
      */
     public static Drawable getFullDrawable(Launcher launcher, ItemInfo info, int width, int height,
             Object[] outObj) {
+        Drawable icon = loadFullDrawableWithoutTheme(launcher, info, width, height, outObj);
+        if (icon instanceof ThemedAdaptiveIcon) {
+            icon = ((ThemedAdaptiveIcon) icon).getThemedDrawable(launcher);
+        }
+        return icon;
+    }
+
+    private static Drawable loadFullDrawableWithoutTheme(Launcher launcher, ItemInfo info,
+            int width, int height, Object[] outObj) {
         LauncherAppState appState = LauncherAppState.getInstance(launcher);
         if (info.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION) {
             LauncherActivityInfo activityInfo = launcher.getSystemService(LauncherApps.class)
                     .resolveActivity(info.getIntent(), info.user);
             outObj[0] = activityInfo;
-            return activityInfo == null ? null : new IconProvider(launcher).getIcon(
-                    activityInfo, launcher.getDeviceProfile().inv.fillResIconDpi);
+            return activityInfo == null ? null : LauncherAppState.getInstance(launcher)
+                    .getIconCache().getIconProvider().getIcon(
+                            activityInfo, launcher.getDeviceProfile().inv.fillResIconDpi);
         } else if (info.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT) {
             if (info instanceof PendingAddShortcutInfo) {
                 ShortcutConfigActivityInfo activityInfo =
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index bad87043ef..88476dee22 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -137,8 +137,8 @@ public final class FeatureFlags {
     public static final BooleanFlag MULTI_DB_GRID_MIRATION_ALGO = getDebugFlag(
             "MULTI_DB_GRID_MIRATION_ALGO", true, "Use the multi-db grid migration algorithm");
 
-    public static final BooleanFlag ENABLE_LAUNCHER_PREVIEW_IN_GRID_PICKER = getDebugFlag(
-            "ENABLE_LAUNCHER_PREVIEW_IN_GRID_PICKER", true, "Show launcher preview in grid picker");
+    public static final BooleanFlag ENABLE_THEMED_ICONS = getDebugFlag(
+            "ENABLE_THEMED_ICONS", false, "Enable themed icons on workspace");
 
     // Keep as DeviceFlag for remote disable in emergency.
     public static final BooleanFlag ENABLE_OVERVIEW_SELECTIONS = new DeviceFlag(
diff --git a/src/com/android/launcher3/dragndrop/DragController.java b/src/com/android/launcher3/dragndrop/DragController.java
index d7f6cdb8bb..575b8fdd99 100644
--- a/src/com/android/launcher3/dragndrop/DragController.java
+++ b/src/com/android/launcher3/dragndrop/DragController.java
@@ -22,7 +22,6 @@ import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.Utilities.ATLEAST_Q;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 
-import android.animation.ValueAnimator;
 import android.content.ComponentName;
 import android.content.res.Resources;
 import android.graphics.Point;
@@ -307,17 +306,12 @@ public class DragController implements DragDriver.EventListener, TouchController
             mOptions.preDragCondition.onPreDragEnd(mDragObject, true /* dragStarted*/);
         }
         mIsInPreDrag = false;
+        mDragObject.dragView.onDragStart();
         for (DragListener listener : new ArrayList<>(mListeners)) {
             listener.onDragStart(mDragObject, mOptions);
         }
     }
 
-    public void addFirstFrameAnimationHelper(ValueAnimator anim) {
-        if (mDragObject != null && mDragObject.dragView != null) {
-            mDragObject.dragView.mFirstFrameAnimatorHelper.addTo(anim);
-        }
-    }
-
     public Optional<InstanceId> getLogInstanceId() {
         return Optional.ofNullable(mDragObject)
                 .map(dragObject -> dragObject.logInstanceId);
diff --git a/src/com/android/launcher3/dragndrop/DragView.java b/src/com/android/launcher3/dragndrop/DragView.java
index 68a8af238e..30ee9ecddd 100644
--- a/src/com/android/launcher3/dragndrop/DragView.java
+++ b/src/com/android/launcher3/dragndrop/DragView.java
@@ -51,7 +51,6 @@ import androidx.dynamicanimation.animation.FloatPropertyCompat;
 import androidx.dynamicanimation.animation.SpringAnimation;
 import androidx.dynamicanimation.animation.SpringForce;
 
-import com.android.launcher3.FirstFrameAnimatorHelper;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.LauncherState;
@@ -62,6 +61,7 @@ import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.statemanager.StateManager.StateListener;
+import com.android.launcher3.util.RunnableList;
 import com.android.launcher3.util.Thunk;
 import com.android.launcher3.views.BaseDragLayer;
 
@@ -85,12 +85,13 @@ public class DragView extends FrameLayout implements StateListener<LauncherState
     private final float mScaleOnDrop;
     private final int[] mTempLoc = new int[2];
 
+    private final RunnableList mOnDragStartCallback = new RunnableList();
+
     private Point mDragVisualizeOffset = null;
     private Rect mDragRegion = null;
     private final Launcher mLauncher;
     private final DragLayer mDragLayer;
     @Thunk final DragController mDragController;
-    final FirstFrameAnimatorHelper mFirstFrameAnimatorHelper;
     private boolean mHasDrawn = false;
 
     final ValueAnimator mAnim;
@@ -136,7 +137,6 @@ public class DragView extends FrameLayout implements StateListener<LauncherState
         mLauncher = launcher;
         mDragLayer = launcher.getDragLayer();
         mDragController = launcher.getDragController();
-        mFirstFrameAnimatorHelper = new FirstFrameAnimatorHelper(this);
 
         mContent = content;
         mWidth = width;
@@ -276,7 +276,8 @@ public class DragView extends FrameLayout implements StateListener<LauncherState
                 }
                 mFgSpringDrawable.setBounds(bounds);
 
-                new Handler(Looper.getMainLooper()).post(() -> {
+                new Handler(Looper.getMainLooper()).post(() -> mOnDragStartCallback.add(() -> {
+                    // TODO: Consider fade-in animation
                     // Assign the variable on the UI thread to avoid race conditions.
                     mScaledMaskPath = mask;
                     // Avoid relayout as we do not care about children affecting layout
@@ -290,11 +291,18 @@ public class DragView extends FrameLayout implements StateListener<LauncherState
                         mBadge.setColorFilter(d.getColorFilter());
                     }
                     invalidate();
-                });
+                }));
             }
         });
     }
 
+    /**
+     * Called when pre-drag finishes for an icon
+     */
+    public void onDragStart() {
+        mOnDragStartCallback.executeAllAndDestroy();
+    }
+
     // TODO(b/183609936): This is only for LauncherAppWidgetHostView that is rendered in a drawable.
     // Once LauncherAppWidgetHostView is directly rendered in this view, removes this method.
     @Override
diff --git a/src/com/android/launcher3/folder/PreviewItemManager.java b/src/com/android/launcher3/folder/PreviewItemManager.java
index 8244f01e92..6adef01514 100644
--- a/src/com/android/launcher3/folder/PreviewItemManager.java
+++ b/src/com/android/launcher3/folder/PreviewItemManager.java
@@ -400,7 +400,7 @@ public class PreviewItemManager {
             drawable.setLevel(item.getProgressLevel());
             p.drawable = drawable;
         } else {
-            p.drawable = item.newIcon(mContext);
+            p.drawable = item.newIcon(mContext, true);
         }
         p.drawable.setBounds(0, 0, mIconSize, mIconSize);
         p.item = item;
diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index 31764c57f5..acfeeacd0e 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -20,7 +20,6 @@ import static android.view.View.MeasureSpec.makeMeasureSpec;
 import static android.view.View.VISIBLE;
 
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION;
-import static com.android.launcher3.config.FeatureFlags.ENABLE_LAUNCHER_PREVIEW_IN_GRID_PICKER;
 import static com.android.launcher3.model.ModelUtils.filterCurrentWorkspaceItems;
 import static com.android.launcher3.model.ModelUtils.getMissingHotseatRanks;
 import static com.android.launcher3.model.ModelUtils.sortWorkspaceItemsSpatially;
@@ -118,7 +117,7 @@ import java.util.concurrent.TimeoutException;
  *   4) Measure and draw the view on a canvas
  */
 @TargetApi(Build.VERSION_CODES.O)
-public class LauncherPreviewRenderer extends ContextThemeWrapper
+public class LauncherPreviewRenderer extends ContextWrapper
         implements ActivityContext, WorkspaceLayoutManager, LayoutInflater.Factory2 {
 
     private static final String TAG = "LauncherPreviewRenderer";
@@ -220,7 +219,7 @@ public class LauncherPreviewRenderer extends ContextThemeWrapper
     private final CellLayout mWorkspace;
 
     public LauncherPreviewRenderer(Context context, InvariantDeviceProfile idp, boolean migrated) {
-        super(context, R.style.AppTheme);
+        super(context);
         mUiHandler = new Handler(Looper.getMainLooper());
         mContext = context;
         mIdp = idp;
@@ -271,14 +270,6 @@ public class LauncherPreviewRenderer extends ContextThemeWrapper
         return mRootView;
     }
 
-    public boolean shouldShowRealLauncherPreview() {
-        return ENABLE_LAUNCHER_PREVIEW_IN_GRID_PICKER.get();
-    }
-
-    public boolean shouldShowQsb() {
-        return FeatureFlags.QSB_ON_FIRST_SCREEN;
-    }
-
     @Override
     public View onCreateView(View parent, String name, Context context, AttributeSet attrs) {
         if ("TextClock".equals(name)) {
@@ -402,107 +393,88 @@ public class LauncherPreviewRenderer extends ContextThemeWrapper
     }
 
     private void populate() {
-        if (shouldShowRealLauncherPreview()) {
-            WorkspaceFetcher fetcher;
-            PreviewContext previewContext = null;
-            if (mMigrated) {
-                previewContext = new PreviewContext(mContext, mIdp);
-                LauncherAppState appForPreview = new LauncherAppState(
-                        previewContext, null /* iconCacheFileName */);
-                fetcher = new WorkspaceItemsInfoFromPreviewFetcher(appForPreview);
-                MODEL_EXECUTOR.execute(fetcher);
-            } else {
-                fetcher = new WorkspaceItemsInfoFetcher();
-                LauncherAppState.getInstance(mContext).getModel().enqueueModelUpdateTask(
-                        (LauncherModel.ModelUpdateTask) fetcher);
-            }
-            WorkspaceResult workspaceResult = fetcher.get();
-            if (previewContext != null) {
-                previewContext.onDestroy();
-            }
+        WorkspaceFetcher fetcher;
+        PreviewContext previewContext = null;
+        if (mMigrated) {
+            previewContext = new PreviewContext(mContext, mIdp);
+            LauncherAppState appForPreview = new LauncherAppState(
+                    previewContext, null /* iconCacheFileName */);
+            fetcher = new WorkspaceItemsInfoFromPreviewFetcher(appForPreview);
+            MODEL_EXECUTOR.execute(fetcher);
+        } else {
+            fetcher = new WorkspaceItemsInfoFetcher();
+            LauncherAppState.getInstance(mContext).getModel().enqueueModelUpdateTask(
+                    (LauncherModel.ModelUpdateTask) fetcher);
+        }
+        WorkspaceResult workspaceResult = fetcher.get();
+        if (previewContext != null) {
+            previewContext.onDestroy();
+        }
 
-            if (workspaceResult == null) {
-                return;
-            }
+        if (workspaceResult == null) {
+            return;
+        }
 
-            // Separate the items that are on the current screen, and the other remaining items.
-            ArrayList<ItemInfo> currentWorkspaceItems = new ArrayList<>();
-            ArrayList<ItemInfo> otherWorkspaceItems = new ArrayList<>();
-            ArrayList<LauncherAppWidgetInfo> currentAppWidgets = new ArrayList<>();
-            ArrayList<LauncherAppWidgetInfo> otherAppWidgets = new ArrayList<>();
-            filterCurrentWorkspaceItems(0 /* currentScreenId */,
-                    workspaceResult.mWorkspaceItems, currentWorkspaceItems,
-                    otherWorkspaceItems);
-            filterCurrentWorkspaceItems(0 /* currentScreenId */, workspaceResult.mAppWidgets,
-                    currentAppWidgets, otherAppWidgets);
-            sortWorkspaceItemsSpatially(mIdp, currentWorkspaceItems);
-            for (ItemInfo itemInfo : currentWorkspaceItems) {
-                switch (itemInfo.itemType) {
-                    case Favorites.ITEM_TYPE_APPLICATION:
-                    case Favorites.ITEM_TYPE_SHORTCUT:
-                    case Favorites.ITEM_TYPE_DEEP_SHORTCUT:
-                        inflateAndAddIcon((WorkspaceItemInfo) itemInfo);
-                        break;
-                    case Favorites.ITEM_TYPE_FOLDER:
-                        inflateAndAddFolder((FolderInfo) itemInfo);
-                        break;
-                    default:
-                        break;
-                }
-            }
-            for (ItemInfo itemInfo : currentAppWidgets) {
-                switch (itemInfo.itemType) {
-                    case Favorites.ITEM_TYPE_APPWIDGET:
-                    case Favorites.ITEM_TYPE_CUSTOM_APPWIDGET:
-                        if (mMigrated) {
-                            inflateAndAddWidgets((LauncherAppWidgetInfo) itemInfo,
-                                    workspaceResult.mWidgetProvidersMap);
-                        } else {
-                            inflateAndAddWidgets((LauncherAppWidgetInfo) itemInfo,
-                                    workspaceResult.mWidgetsModel);
-                        }
-                        break;
-                    default:
-                        break;
-                }
-            }
-            IntArray ranks = getMissingHotseatRanks(currentWorkspaceItems,
-                    mDp.numShownHotseatIcons);
-            List<ItemInfo> predictions = workspaceResult.mHotseatPredictions == null
-                    ? Collections.emptyList() : workspaceResult.mHotseatPredictions.items;
-            int count = Math.min(ranks.size(), predictions.size());
-            for (int i = 0; i < count; i++) {
-                int rank = ranks.get(i);
-                WorkspaceItemInfo itemInfo =
-                        new WorkspaceItemInfo((WorkspaceItemInfo) predictions.get(i));
-                itemInfo.container = CONTAINER_HOTSEAT_PREDICTION;
-                itemInfo.rank = rank;
-                itemInfo.cellX = mHotseat.getCellXFromOrder(rank);
-                itemInfo.cellY = mHotseat.getCellYFromOrder(rank);
-                itemInfo.screenId = rank;
-                inflateAndAddPredictedIcon(itemInfo);
-            }
-        } else {
-            // Add hotseat icons
-            for (int i = 0; i < mDp.numShownHotseatIcons; i++) {
-                WorkspaceItemInfo info = new WorkspaceItemInfo(mWorkspaceItemInfo);
-                info.container = Favorites.CONTAINER_HOTSEAT;
-                info.screenId = i;
-                inflateAndAddIcon(info);
+        // Separate the items that are on the current screen, and the other remaining items.
+        ArrayList<ItemInfo> currentWorkspaceItems = new ArrayList<>();
+        ArrayList<ItemInfo> otherWorkspaceItems = new ArrayList<>();
+        ArrayList<LauncherAppWidgetInfo> currentAppWidgets = new ArrayList<>();
+        ArrayList<LauncherAppWidgetInfo> otherAppWidgets = new ArrayList<>();
+        filterCurrentWorkspaceItems(0 /* currentScreenId */,
+                workspaceResult.mWorkspaceItems, currentWorkspaceItems,
+                otherWorkspaceItems);
+        filterCurrentWorkspaceItems(0 /* currentScreenId */, workspaceResult.mAppWidgets,
+                currentAppWidgets, otherAppWidgets);
+        sortWorkspaceItemsSpatially(mIdp, currentWorkspaceItems);
+        for (ItemInfo itemInfo : currentWorkspaceItems) {
+            switch (itemInfo.itemType) {
+                case Favorites.ITEM_TYPE_APPLICATION:
+                case Favorites.ITEM_TYPE_SHORTCUT:
+                case Favorites.ITEM_TYPE_DEEP_SHORTCUT:
+                    inflateAndAddIcon((WorkspaceItemInfo) itemInfo);
+                    break;
+                case Favorites.ITEM_TYPE_FOLDER:
+                    inflateAndAddFolder((FolderInfo) itemInfo);
+                    break;
+                default:
+                    break;
             }
-            // Add workspace icons
-            for (int i = 0; i < mIdp.numColumns; i++) {
-                WorkspaceItemInfo info = new WorkspaceItemInfo(mWorkspaceItemInfo);
-                info.container = Favorites.CONTAINER_DESKTOP;
-                info.screenId = 0;
-                info.cellX = i;
-                info.cellY = mIdp.numRows - 1;
-                inflateAndAddIcon(info);
+        }
+        for (ItemInfo itemInfo : currentAppWidgets) {
+            switch (itemInfo.itemType) {
+                case Favorites.ITEM_TYPE_APPWIDGET:
+                case Favorites.ITEM_TYPE_CUSTOM_APPWIDGET:
+                    if (mMigrated) {
+                        inflateAndAddWidgets((LauncherAppWidgetInfo) itemInfo,
+                                workspaceResult.mWidgetProvidersMap);
+                    } else {
+                        inflateAndAddWidgets((LauncherAppWidgetInfo) itemInfo,
+                                workspaceResult.mWidgetsModel);
+                    }
+                    break;
+                default:
+                    break;
             }
         }
+        IntArray ranks = getMissingHotseatRanks(currentWorkspaceItems,
+                mDp.numShownHotseatIcons);
+        List<ItemInfo> predictions = workspaceResult.mHotseatPredictions == null
+                ? Collections.emptyList() : workspaceResult.mHotseatPredictions.items;
+        int count = Math.min(ranks.size(), predictions.size());
+        for (int i = 0; i < count; i++) {
+            int rank = ranks.get(i);
+            WorkspaceItemInfo itemInfo =
+                    new WorkspaceItemInfo((WorkspaceItemInfo) predictions.get(i));
+            itemInfo.container = CONTAINER_HOTSEAT_PREDICTION;
+            itemInfo.rank = rank;
+            itemInfo.cellX = mHotseat.getCellXFromOrder(rank);
+            itemInfo.cellY = mHotseat.getCellYFromOrder(rank);
+            itemInfo.screenId = rank;
+            inflateAndAddPredictedIcon(itemInfo);
+        }
 
         // Add first page QSB
-        if (shouldShowQsb()) {
+        if (FeatureFlags.QSB_ON_FIRST_SCREEN) {
             View qsb = mHomeElementInflater.inflate(
                     R.layout.search_container_workspace, mWorkspace, false);
             CellLayout.LayoutParams lp =
diff --git a/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java b/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java
index fdc3a947a3..6193570e1f 100644
--- a/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java
+++ b/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java
@@ -20,6 +20,7 @@ import static com.android.launcher3.config.FeatureFlags.MULTI_DB_GRID_MIRATION_A
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
+import android.app.WallpaperColors;
 import android.content.Context;
 import android.hardware.display.DisplayManager;
 import android.os.Bundle;
@@ -28,18 +29,23 @@ import android.os.IBinder;
 import android.os.Looper;
 import android.os.Message;
 import android.os.Messenger;
+import android.view.ContextThemeWrapper;
 import android.view.Display;
 import android.view.SurfaceControlViewHost;
 import android.view.View;
 import android.view.animation.AccelerateDecelerateInterpolator;
 
 import com.android.launcher3.InvariantDeviceProfile;
+import com.android.launcher3.R;
 import com.android.launcher3.model.GridSizeMigrationTask;
 import com.android.launcher3.model.GridSizeMigrationTaskV2;
+import com.android.launcher3.util.Themes;
+import com.android.launcher3.widget.LocalColorExtractor;
 
 import java.util.concurrent.TimeUnit;
 
 /** Render preview using surface view. */
+@SuppressWarnings("NewApi")
 public class PreviewSurfaceRenderer implements IBinder.DeathRecipient {
 
     private static final int FADE_IN_ANIMATION_DURATION = 200;
@@ -50,6 +56,7 @@ public class PreviewSurfaceRenderer implements IBinder.DeathRecipient {
     private static final String KEY_DISPLAY_ID = "display_id";
     private static final String KEY_SURFACE_PACKAGE = "surface_package";
     private static final String KEY_CALLBACK = "callback";
+    private static final String KEY_COLORS = "wallpaper_colors";
 
     private final Context mContext;
     private final InvariantDeviceProfile mIdp;
@@ -57,6 +64,7 @@ public class PreviewSurfaceRenderer implements IBinder.DeathRecipient {
     private final int mWidth;
     private final int mHeight;
     private final Display mDisplay;
+    private final WallpaperColors mWallpaperColors;
 
     private SurfaceControlViewHost mSurfaceControlViewHost;
 
@@ -68,6 +76,8 @@ public class PreviewSurfaceRenderer implements IBinder.DeathRecipient {
         if (gridName == null) {
             gridName = InvariantDeviceProfile.getCurrentGridName(context);
         }
+        mWallpaperColors = bundle.getParcelable(KEY_COLORS);
+
         mIdp = new InvariantDeviceProfile(context, gridName);
 
         mHostToken = bundle.getBinder(KEY_HOST_TOKEN);
@@ -100,6 +110,19 @@ public class PreviewSurfaceRenderer implements IBinder.DeathRecipient {
         MODEL_EXECUTOR.post(() -> {
             final boolean success = doGridMigrationIfNecessary();
 
+            final Context inflationContext;
+            if (mWallpaperColors != null) {
+                // Workaround to create a themed context
+                Context context = mContext.createDisplayContext(mDisplay);
+                LocalColorExtractor.newInstance(mContext)
+                        .applyColorsOverride(context, mWallpaperColors);
+
+                inflationContext = new ContextThemeWrapper(context,
+                        Themes.getActivityThemeRes(context, mWallpaperColors.getColorHints()));
+            } else {
+                inflationContext = new ContextThemeWrapper(mContext,  R.style.AppTheme);
+            }
+
             MAIN_EXECUTOR.post(() -> {
                 // If mSurfaceControlViewHost is null due to any reason (e.g. binder died,
                 // happening when user leaves the preview screen before preview rendering finishes),
@@ -109,7 +132,8 @@ public class PreviewSurfaceRenderer implements IBinder.DeathRecipient {
                     return;
                 }
 
-                View view = new LauncherPreviewRenderer(mContext, mIdp, success).getRenderedView();
+                View view = new LauncherPreviewRenderer(inflationContext, mIdp, success)
+                        .getRenderedView();
                 // This aspect scales the view to fit in the surface and centers it
                 final float scale = Math.min(mWidth / (float) view.getMeasuredWidth(),
                         mHeight / (float) view.getMeasuredHeight());
diff --git a/src/com/android/launcher3/icons/IconCache.java b/src/com/android/launcher3/icons/IconCache.java
index a2c0f5cdf4..bc93a1e3d9 100644
--- a/src/com/android/launcher3/icons/IconCache.java
+++ b/src/com/android/launcher3/icons/IconCache.java
@@ -52,7 +52,6 @@ import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pm.UserCache;
 import com.android.launcher3.shortcuts.ShortcutKey;
-import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.InstantAppResolver;
 import com.android.launcher3.util.PackageUserKey;
 import com.android.launcher3.util.Preconditions;
@@ -94,7 +93,7 @@ public class IconCache extends BaseIconCache {
         mLauncherApps = mContext.getSystemService(LauncherApps.class);
         mUserManager = UserCache.INSTANCE.get(mContext);
         mInstantAppResolver = InstantAppResolver.newInstance(mContext);
-        mIconProvider = new IconProvider(context);
+        mIconProvider = new IconProvider(context, true /* supportsIconTheme */);
     }
 
     @Override
@@ -107,8 +106,12 @@ public class IconCache extends BaseIconCache {
         return mInstantAppResolver.isInstantApp(info);
     }
 
+    public IconProvider getIconProvider() {
+        return mIconProvider;
+    }
+
     @Override
-    protected BaseIconFactory getIconFactory() {
+    public BaseIconFactory getIconFactory() {
         return LauncherIcons.obtain(mContext);
     }
 
@@ -333,15 +336,6 @@ public class IconCache extends BaseIconCache {
                 + ",flags_asi:" + FeatureFlags.APP_SEARCH_IMPROVEMENTS.get();
     }
 
-    @Override
-    protected boolean getEntryFromDB(ComponentKey cacheKey, CacheEntry entry, boolean lowRes) {
-        if (mIconProvider.isClockIcon(cacheKey)) {
-            // For clock icon, we always load the dynamic icon
-            return false;
-        }
-        return super.getEntryFromDB(cacheKey, entry, lowRes);
-    }
-
     /**
      * Interface for receiving itemInfo with high-res icon.
      */
diff --git a/src/com/android/launcher3/icons/LauncherActivityCachingLogic.java b/src/com/android/launcher3/icons/LauncherActivityCachingLogic.java
index 93de35a88a..8fc397738e 100644
--- a/src/com/android/launcher3/icons/LauncherActivityCachingLogic.java
+++ b/src/com/android/launcher3/icons/LauncherActivityCachingLogic.java
@@ -20,6 +20,7 @@ import android.content.Context;
 import android.content.pm.LauncherActivityInfo;
 import android.os.UserHandle;
 
+import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.icons.cache.CachingLogic;
 import com.android.launcher3.util.ResourceBasedOverride;
@@ -56,8 +57,8 @@ public class LauncherActivityCachingLogic
     @Override
     public BitmapInfo loadIcon(Context context, LauncherActivityInfo object) {
         try (LauncherIcons li = LauncherIcons.obtain(context)) {
-            return li.createBadgedIconBitmap(new IconProvider(context)
-                            .getIcon(object, li.mFillResIconDpi),
+            return li.createBadgedIconBitmap(LauncherAppState.getInstance(context)
+                            .getIconCache().getIconProvider().getIcon(object, li.mFillResIconDpi),
                     object.getUser(), object.getApplicationInfo().targetSdkVersion);
         }
     }
diff --git a/src/com/android/launcher3/model/data/ItemInfoWithIcon.java b/src/com/android/launcher3/model/data/ItemInfoWithIcon.java
index 76b2ab0e85..0754c293b6 100644
--- a/src/com/android/launcher3/model/data/ItemInfoWithIcon.java
+++ b/src/com/android/launcher3/model/data/ItemInfoWithIcon.java
@@ -16,6 +16,8 @@
 
 package com.android.launcher3.model.data;
 
+import static com.android.launcher3.config.FeatureFlags.ENABLE_THEMED_ICONS;
+
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -223,7 +225,15 @@ public abstract class ItemInfoWithIcon extends ItemInfo {
      * Returns a FastBitmapDrawable with the icon.
      */
     public FastBitmapDrawable newIcon(Context context) {
-        FastBitmapDrawable drawable = bitmap.newIcon(context);
+        return newIcon(context, false);
+    }
+
+    /**
+     * Returns a FastBitmapDrawable with the icon and context theme applied
+     */
+    public FastBitmapDrawable newIcon(Context context, boolean applyTheme) {
+        FastBitmapDrawable drawable = applyTheme && ENABLE_THEMED_ICONS.get()
+                ? bitmap.newThemedIcon(context) : bitmap.newIcon(context);
         drawable.setIsDisabled(isDisabled());
         return drawable;
     }
diff --git a/src/com/android/launcher3/widget/LocalColorExtractor.java b/src/com/android/launcher3/widget/LocalColorExtractor.java
index 097158b072..be4faea68f 100644
--- a/src/com/android/launcher3/widget/LocalColorExtractor.java
+++ b/src/com/android/launcher3/widget/LocalColorExtractor.java
@@ -16,6 +16,7 @@
 
 package com.android.launcher3.widget;
 
+import android.app.WallpaperColors;
 import android.appwidget.AppWidgetHostView;
 import android.content.Context;
 import android.graphics.RectF;
@@ -43,7 +44,10 @@ public class LocalColorExtractor implements ResourceBasedOverride {
         void onColorsChanged(RectF rect, SparseIntArray extractedColors);
     }
 
-    static LocalColorExtractor newInstance(Context context) {
+    /**
+     * Creates a new instance of LocalColorExtractor
+     */
+    public static LocalColorExtractor newInstance(Context context) {
         return Overrides.getObject(LocalColorExtractor.class, context.getApplicationContext(),
                 R.string.local_colors_extraction_class);
     }
@@ -62,4 +66,9 @@ public class LocalColorExtractor implements ResourceBasedOverride {
     public void removeLocations() {
         // no-op
     }
+
+    /**
+     * Updates the base context to contain the colors override
+     */
+    public void applyColorsOverride(Context base, WallpaperColors colors) { }
 }
-- 
GitLab


From 7e6e1693efb64d57a9ae4e62d398a6d0b6da7d9e Mon Sep 17 00:00:00 2001
From: Santiago Etchebehere <santie@google.com>
Date: Mon, 3 May 2021 20:12:50 -0700
Subject: [PATCH 1048/1664] Update the label of Wallpapers button

Use the updated name

Bug: 179129352
Test: manual
Change-Id: Ia4878ce924b7d7f3ba1d8d661c8ac00c7310ee20
---
 res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index d6936ab69d..eae32b79f5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -221,7 +221,7 @@
     <!-- Text for wallpaper change button [CHAR LIMIT=30]-->
     <string name="wallpaper_button_text">Wallpapers</string>
     <!-- Text for wallpaper change button [CHAR LIMIT=30]-->
-    <string name="styles_wallpaper_button_text">Styles &amp; wallpapers</string>
+    <string name="styles_wallpaper_button_text">Wallpaper &amp; style</string>
     <!-- Text for settings button [CHAR LIMIT=30]-->
     <string name="settings_button_text">Home settings</string>
     <!-- Message shown when a feature is disabled by the administrator -->
-- 
GitLab


From 154b1c928b9e6417fce55ec08f3fd2f4e2105e39 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 3 May 2021 20:58:21 -0700
Subject: [PATCH 1049/1664] Cleanup/consolidate normal<->all apps interpolators

We no longer need to have a different behavior for no button mode,
so make PortraitStatesTouchController the source of truth

Also remove unused ANIM_ALL_APPS_HEADER_FADE & RECENTS_FADE_THRESHOLD

Test: manually in 0 button and 3 button modes
Bug: 183001675
Bug: 175137718
Change-Id: If0bc2a6d6d3bf1649fad45226a4e6055f30e4880
---
 ...ButtonNavbarToOverviewTouchController.java | 45 -------------------
 .../PortraitStatesTouchController.java        |  6 ---
 .../states/StateAnimationConfig.java          | 10 ++---
 3 files changed, 4 insertions(+), 57 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
index 2d95ce2b98..729e2cb5c6 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -18,20 +18,11 @@ package com.android.launcher3.uioverrides.touchcontrollers;
 
 import static com.android.launcher3.LauncherAnimUtils.VIEW_BACKGROUND_COLOR;
 import static com.android.launcher3.LauncherAnimUtils.newCancelListener;
-import static com.android.launcher3.LauncherState.ALL_APPS;
 import static com.android.launcher3.LauncherState.HINT_STATE;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.Utilities.EDGE_NAV_BAR;
-import static com.android.launcher3.anim.Interpolators.ACCEL;
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
-import static com.android.launcher3.anim.Interpolators.DEACCEL;
-import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_HEADER_FADE;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_FADE;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_SCALE;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_TRANSLATE;
 import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
 
@@ -45,7 +36,6 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimatorPlaybackController;
-import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.util.VibratorWrapper;
 import com.android.quickstep.SystemUiProxy;
@@ -269,39 +259,4 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
     private float dpiFromPx(float pixels) {
         return Utilities.dpiFromPx(pixels, mLauncher.getResources().getDisplayMetrics().densityDpi);
     }
-
-    @Override
-    protected StateAnimationConfig getConfigForStates(
-            LauncherState fromState, LauncherState toState) {
-        if (fromState == NORMAL && toState == ALL_APPS) {
-            StateAnimationConfig builder = new StateAnimationConfig();
-            builder.setInterpolator(ANIM_ALL_APPS_HEADER_FADE, Interpolators.clampToProgress(
-                    ACCEL,
-                    0,
-                    ALL_APPS_CONTENT_FADE_MAX_CLAMPING_THRESHOLD));
-            builder.setInterpolator(ANIM_ALL_APPS_FADE, Interpolators.clampToProgress(
-                    ACCEL,
-                    ALL_APPS_CONTENT_FADE_MIN_CLAMPING_THRESHOLD,
-                    ALL_APPS_CONTENT_FADE_MAX_CLAMPING_THRESHOLD));
-
-            // Get workspace out of the way quickly, to prepare for potential pause.
-            builder.setInterpolator(ANIM_WORKSPACE_SCALE, DEACCEL_3);
-            builder.setInterpolator(ANIM_WORKSPACE_TRANSLATE, DEACCEL_3);
-            builder.setInterpolator(ANIM_WORKSPACE_FADE, DEACCEL_3);
-            return builder;
-        } else if (fromState == ALL_APPS && toState == NORMAL) {
-            StateAnimationConfig builder = new StateAnimationConfig();
-
-            builder.setInterpolator(ANIM_ALL_APPS_FADE, Interpolators.clampToProgress(
-                    DEACCEL,
-                    1 - ALL_APPS_CONTENT_FADE_MAX_CLAMPING_THRESHOLD,
-                    1 - ALL_APPS_CONTENT_FADE_MIN_CLAMPING_THRESHOLD));
-            builder.setInterpolator(ANIM_ALL_APPS_HEADER_FADE, Interpolators.clampToProgress(
-                    DEACCEL,
-                    1 - ALL_APPS_CONTENT_FADE_MAX_CLAMPING_THRESHOLD,
-                    1));
-            return builder;
-        }
-        return super.getConfigForStates(fromState, toState);
-    }
 }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
index b8f9452f36..adb025209c 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
@@ -58,12 +58,6 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
      */
     protected static final float ALL_APPS_CONTENT_FADE_MIN_CLAMPING_THRESHOLD = 0.4f;
 
-
-    /**
-     * The progress at which recents will begin fading out when swiping up from overview.
-     */
-    private static final float RECENTS_FADE_THRESHOLD = 0.88f;
-
     private final PortraitOverviewStateTouchHelper mOverviewPortraitStateTouchHelper;
 
     public PortraitStatesTouchController(Launcher l) {
diff --git a/src/com/android/launcher3/states/StateAnimationConfig.java b/src/com/android/launcher3/states/StateAnimationConfig.java
index 2f26b4f70f..abd3b9604b 100644
--- a/src/com/android/launcher3/states/StateAnimationConfig.java
+++ b/src/com/android/launcher3/states/StateAnimationConfig.java
@@ -59,7 +59,6 @@ public class StateAnimationConfig {
             ANIM_OVERVIEW_FADE,
             ANIM_ALL_APPS_FADE,
             ANIM_WORKSPACE_SCRIM_FADE,
-            ANIM_ALL_APPS_HEADER_FADE,
             ANIM_OVERVIEW_MODAL,
             ANIM_DEPTH,
             ANIM_OVERVIEW_ACTIONS_FADE,
@@ -78,12 +77,11 @@ public class StateAnimationConfig {
     public static final int ANIM_OVERVIEW_FADE = 9;
     public static final int ANIM_ALL_APPS_FADE = 10;
     public static final int ANIM_WORKSPACE_SCRIM_FADE = 11;
-    public static final int ANIM_ALL_APPS_HEADER_FADE = 12; // e.g. predictions
-    public static final int ANIM_OVERVIEW_MODAL = 13;
-    public static final int ANIM_DEPTH = 14;
-    public static final int ANIM_OVERVIEW_ACTIONS_FADE = 15;
+    public static final int ANIM_OVERVIEW_MODAL = 12;
+    public static final int ANIM_DEPTH = 13;
+    public static final int ANIM_OVERVIEW_ACTIONS_FADE = 14;
 
-    private static final int ANIM_TYPES_COUNT = 16;
+    private static final int ANIM_TYPES_COUNT = 15;
 
     protected final Interpolator[] mInterpolators = new Interpolator[ANIM_TYPES_COUNT];
 
-- 
GitLab


From 3ab273da0c14f2777f77dab31696fbb2dbe8a97a Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Mon, 3 May 2021 08:12:24 -0500
Subject: [PATCH 1050/1664] [Search][Motion] Modify interpolator for AllApps
 background scrim

Also rename ANIM_WORKSPACE_SCRIM_FADE to ANIM_SCRIM_FADE since
the scrim is shared between states now.

Bug: 183001675
Test: Manual in 3 button and 0 button modes
Change-Id: Ice83b54480bdf74155e8593c421b68d7186cf78a
---
 .../PortraitStatesTouchController.java        | 25 ++++++++++++++++---
 .../FallbackRecentsStateController.java       |  4 +--
 .../WorkspaceStateTransitionAnimation.java    |  5 ++--
 .../states/StateAnimationConfig.java          |  4 +--
 4 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
index adb025209c..3c83d25b71 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
@@ -24,6 +24,7 @@ import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.anim.Interpolators.ACCEL;
 import static com.android.launcher3.anim.Interpolators.DEACCEL;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_SCRIM_FADE;
 
 import android.view.MotionEvent;
 
@@ -56,7 +57,17 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
     /**
      * Minimum clamping progress for fading in all apps content
      */
-    protected static final float ALL_APPS_CONTENT_FADE_MIN_CLAMPING_THRESHOLD = 0.4f;
+    protected static final float ALL_APPS_CONTENT_FADE_MIN_CLAMPING_THRESHOLD = 0.5f;
+
+    /**
+     * Minimum clamping progress for fading in all apps scrim
+     */
+    protected static final float ALL_APPS_SCRIM_VISIBLE_THRESHOLD = .1f;
+
+    /**
+     * Maximum clamping progress for opaque all apps scrim
+     */
+    protected static final float ALL_APPS_SCRIM_OPAQUE_THRESHOLD = .5f;
 
     private final PortraitOverviewStateTouchHelper mOverviewPortraitStateTouchHelper;
 
@@ -116,14 +127,22 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
     private StateAnimationConfig getNormalToAllAppsAnimation() {
         StateAnimationConfig builder = new StateAnimationConfig();
         builder.setInterpolator(ANIM_ALL_APPS_FADE, Interpolators.clampToProgress(ACCEL,
-                0, ALL_APPS_CONTENT_FADE_MAX_CLAMPING_THRESHOLD));
+                ALL_APPS_CONTENT_FADE_MIN_CLAMPING_THRESHOLD,
+                ALL_APPS_CONTENT_FADE_MAX_CLAMPING_THRESHOLD));
+        builder.setInterpolator(ANIM_SCRIM_FADE, Interpolators.clampToProgress(ACCEL,
+                ALL_APPS_SCRIM_VISIBLE_THRESHOLD,
+                ALL_APPS_SCRIM_OPAQUE_THRESHOLD));
         return builder;
     }
 
     private StateAnimationConfig getAllAppsToNormalAnimation() {
         StateAnimationConfig builder = new StateAnimationConfig();
         builder.setInterpolator(ANIM_ALL_APPS_FADE, Interpolators.clampToProgress(DEACCEL,
-                1 - ALL_APPS_CONTENT_FADE_MAX_CLAMPING_THRESHOLD, 1));
+                1 - ALL_APPS_CONTENT_FADE_MAX_CLAMPING_THRESHOLD,
+                1 - ALL_APPS_CONTENT_FADE_MIN_CLAMPING_THRESHOLD));
+        builder.setInterpolator(ANIM_SCRIM_FADE, Interpolators.clampToProgress(DEACCEL,
+                1 - ALL_APPS_SCRIM_OPAQUE_THRESHOLD,
+                1 - ALL_APPS_SCRIM_VISIBLE_THRESHOLD));
         return builder;
     }
 
diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
index 7067dbcc0d..e4d148cb76 100644
--- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
+++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
@@ -20,7 +20,7 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_MO
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_SCRIM_FADE;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_SCRIM_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
 import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET;
 import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS;
@@ -98,6 +98,6 @@ public class FallbackRecentsStateController implements StateHandler<RecentsState
                 state.displayOverviewTasksAsGrid(mActivity.getDeviceProfile()) ? 1f : 0f, LINEAR);
 
         setter.setViewBackgroundColor(mActivity.getScrimView(), state.getScrimColor(mActivity),
-                config.getInterpolator(ANIM_WORKSPACE_SCRIM_FADE, LINEAR));
+                config.getInterpolator(ANIM_SCRIM_FADE, LINEAR));
     }
 }
diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
index aa99d5240a..c771e3e8d6 100644
--- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
+++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
@@ -34,9 +34,9 @@ import static com.android.launcher3.graphics.Scrim.SCRIM_PROGRESS;
 import static com.android.launcher3.graphics.SysUiScrim.SYSUI_PROGRESS;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_TRANSLATE;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_SCRIM_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_SCALE;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_SCRIM_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_TRANSLATE;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_SCRIM;
 
@@ -166,10 +166,9 @@ public class WorkspaceStateTransitionAnimation {
         propertySetter.setFloat(sysUiScrim, SYSUI_PROGRESS,
                 state.hasFlag(FLAG_HAS_SYS_UI_SCRIM) ? 1 : 0, LINEAR);
 
-
         propertySetter.setViewBackgroundColor(mLauncher.getScrimView(),
                 state.getWorkspaceScrimColor(mLauncher),
-                config.getInterpolator(ANIM_WORKSPACE_SCRIM_FADE, LINEAR));
+                config.getInterpolator(ANIM_SCRIM_FADE, LINEAR));
     }
 
     public void applyChildState(LauncherState state, CellLayout cl, int childIndex) {
diff --git a/src/com/android/launcher3/states/StateAnimationConfig.java b/src/com/android/launcher3/states/StateAnimationConfig.java
index abd3b9604b..bd6f7d3a74 100644
--- a/src/com/android/launcher3/states/StateAnimationConfig.java
+++ b/src/com/android/launcher3/states/StateAnimationConfig.java
@@ -58,7 +58,7 @@ public class StateAnimationConfig {
             ANIM_OVERVIEW_TRANSLATE_Y,
             ANIM_OVERVIEW_FADE,
             ANIM_ALL_APPS_FADE,
-            ANIM_WORKSPACE_SCRIM_FADE,
+            ANIM_SCRIM_FADE,
             ANIM_OVERVIEW_MODAL,
             ANIM_DEPTH,
             ANIM_OVERVIEW_ACTIONS_FADE,
@@ -76,7 +76,7 @@ public class StateAnimationConfig {
     public static final int ANIM_OVERVIEW_TRANSLATE_Y = 8;
     public static final int ANIM_OVERVIEW_FADE = 9;
     public static final int ANIM_ALL_APPS_FADE = 10;
-    public static final int ANIM_WORKSPACE_SCRIM_FADE = 11;
+    public static final int ANIM_SCRIM_FADE = 11;
     public static final int ANIM_OVERVIEW_MODAL = 12;
     public static final int ANIM_DEPTH = 13;
     public static final int ANIM_OVERVIEW_ACTIONS_FADE = 14;
-- 
GitLab


From 7fbc9619333d7f6727a70f7151e42ea035427554 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 3 May 2021 22:26:52 -0700
Subject: [PATCH 1051/1664] Allow binder calls from creating recents orientated
 state for now

- Should probably remove if possible since this is on a hot path

Bug: 187074722
Test: Presubmit
Change-Id: I104e1175acba7b90cd9824b905ffe68089beed9e
---
 .../src/com/android/quickstep/util/TaskViewSimulator.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index e63f8bbea8..f578ad1741 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -36,6 +36,7 @@ import androidx.annotation.NonNull;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.PendingAnimation;
+import com.android.launcher3.util.TraceHelper;
 import com.android.quickstep.AnimatedFloat;
 import com.android.quickstep.BaseActivityInterface;
 import com.android.quickstep.views.TaskThumbnailView.PreviewPositionHelper;
@@ -95,7 +96,9 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
         mContext = context;
         mSizeStrategy = sizeStrategy;
 
-        mOrientationState = new RecentsOrientedState(context, sizeStrategy, i -> { });
+        // TODO(b/187074722): Don't create this per-TaskViewSimulator
+        mOrientationState = TraceHelper.allowIpcs("",
+                () -> new RecentsOrientedState(context, sizeStrategy, i -> { }));
         mOrientationState.setGestureActive(true);
         mCurrentFullscreenParams = new FullscreenDrawParams(context);
         mOrientationStateId = mOrientationState.getStateId();
-- 
GitLab


From 9f8530948b4b573d31bc9cd98bdae34c750cc4cc Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Tue, 4 May 2021 11:16:51 +0000
Subject: [PATCH 1052/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Ia5ca69da14eee63aa7d18caeb1a57d1556ab737a
---
 res/values-af/strings.xml        | 6 ++----
 res/values-am/strings.xml        | 6 ++----
 res/values-ar/strings.xml        | 6 ++----
 res/values-as/strings.xml        | 6 ++----
 res/values-az/strings.xml        | 6 ++----
 res/values-b+sr+Latn/strings.xml | 6 ++----
 res/values-be/strings.xml        | 6 ++----
 res/values-bg/strings.xml        | 6 ++----
 res/values-bs/strings.xml        | 6 ++----
 res/values-ca/strings.xml        | 6 ++----
 res/values-cs/strings.xml        | 6 ++----
 res/values-da/strings.xml        | 6 ++----
 res/values-el/strings.xml        | 6 ++----
 res/values-es-rUS/strings.xml    | 6 ++----
 res/values-es/strings.xml        | 6 ++----
 res/values-et/strings.xml        | 6 ++----
 res/values-eu/strings.xml        | 6 ++----
 res/values-fa/strings.xml        | 6 ++----
 res/values-fi/strings.xml        | 6 ++----
 res/values-fr-rCA/strings.xml    | 6 ++----
 res/values-fr/strings.xml        | 6 ++----
 res/values-gl/strings.xml        | 6 ++----
 res/values-hi/strings.xml        | 6 ++----
 res/values-hr/strings.xml        | 6 ++----
 res/values-hu/strings.xml        | 6 ++----
 res/values-in/strings.xml        | 6 ++----
 res/values-is/strings.xml        | 6 ++----
 res/values-it/strings.xml        | 6 ++----
 res/values-iw/strings.xml        | 6 ++----
 res/values-ja/strings.xml        | 6 ++----
 res/values-ka/strings.xml        | 6 ++----
 res/values-kk/strings.xml        | 6 ++----
 res/values-km/strings.xml        | 6 ++----
 res/values-ko/strings.xml        | 6 ++----
 res/values-ky/strings.xml        | 6 ++----
 res/values-lt/strings.xml        | 6 ++----
 res/values-lv/strings.xml        | 6 ++----
 res/values-mn/strings.xml        | 6 ++----
 res/values-ms/strings.xml        | 6 ++----
 res/values-my/strings.xml        | 6 ++----
 res/values-nb/strings.xml        | 6 ++----
 res/values-nl/strings.xml        | 6 ++----
 res/values-or/strings.xml        | 6 ++----
 res/values-pl/strings.xml        | 6 ++----
 res/values-pt-rPT/strings.xml    | 6 ++----
 res/values-pt/strings.xml        | 6 ++----
 res/values-ro/strings.xml        | 6 ++----
 res/values-ru/strings.xml        | 6 ++----
 res/values-si/strings.xml        | 6 ++----
 res/values-sk/strings.xml        | 6 ++----
 res/values-sl/strings.xml        | 6 ++----
 res/values-sq/strings.xml        | 6 ++----
 res/values-sr/strings.xml        | 6 ++----
 res/values-sv/strings.xml        | 6 ++----
 res/values-sw/strings.xml        | 6 ++----
 res/values-ta/strings.xml        | 6 ++----
 res/values-th/strings.xml        | 6 ++----
 res/values-tl/strings.xml        | 6 ++----
 res/values-tr/strings.xml        | 6 ++----
 res/values-uk/strings.xml        | 6 ++----
 res/values-uz/strings.xml        | 6 ++----
 res/values-vi/strings.xml        | 6 ++----
 res/values-zh-rHK/strings.xml    | 6 ++----
 res/values-zh-rTW/strings.xml    | 6 ++----
 res/values-zu/strings.xml        | 6 ++----
 65 files changed, 130 insertions(+), 260 deletions(-)

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index e516468a51..c6d372af8d 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dubbeltik en hou om \'n legstuk te skuif of gebruik gepasmaakte handelinge."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d breed by %2$d hoog"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Raak en hou die legstuk om dit op die Tuisskerm rond te beweeg"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Voeg by Tuisskerm"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> legstukke</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> legstuk</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 5241acd0e1..7123a8bb2a 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ምግብርን ለማንቀሳቀስ ወይም ብጁ እርምጃዎችን ለመጠቀም ሁለቴ መታ ያድርጉ እና ይያዙ።"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ስፋት በ%2$d ከፍታ"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"በመነሻ ገጽ አካባቢ ላይ ለማንቀሳቀስ ነክተው ይያዙት"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"ወደ መነሻ ገጽ አክል"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ንዑስ ፕሮግራሞች</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ንዑስ ፕሮግራሞች</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 669aa91ac2..c6ab52a9e6 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"انقر مرتين مع تثبيت إصبعك لنقل أداة أو استخدام الإجراءات المخصّصة."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"‏العرض %1$d الطول %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"يمكنك النقر على الأداة مع الاستمرار لتحريكها على الشاشة الرئيسية."</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"إضافة إلى الشاشة الرئيسية"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="zero"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> أداة</item>
       <item quantity="two">أداتان (<xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g>)</item>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 931b3ab2e4..5e80e652b4 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"কোনো ৱিজেট স্থানান্তৰ কৰিবলৈ দুবাৰ টিপি ধৰি ৰাখক অথবা কাষ্টম কাৰ্য ব্যৱহাৰ কৰক।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d বহল x %2$d ওখ"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ৱিজেটটো গৃহ স্ক্ৰীনৰ আশে-পাশে নিবলৈ সেইটোত স্পৰ্শ কৰি ধৰি ৰাখক"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"গৃহ স্ক্ৰীনত যোগ কৰক"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> টা ৱিজেট</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> টা ৱিজেট</item>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 8b525f29b5..17f600c887 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Vidceti daşımaq üçün iki dəfə toxunub saxlayın və ya fərdi əməliyyatlardan istifadə edin."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%2$d hündürlük %1$d enində"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Əsas ekranda hərəkət etdirmək üçün vidcetə toxunub saxlayın"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Əsas ekrana əlavə edin"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidcet</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> vidcet</item>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index d4f013a5e0..dc04fedda3 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvaput dodirnite i zadržite da biste pomerali vidžet ili koristite prilagođene radnje."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d×%2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"širina od %1$d i visina od %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Dodirnite i zadržite vidžet da biste ga pomerali po početnom ekranu"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Dodaj na početni ekran"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidžet</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidžeta</item>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index cf02d485c8..9bb2c00f74 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Дакраніцеся двойчы і ўтрымлівайце, каб перамясціць віджэт або выкарыстоўваць спецыяльныя дзеянні."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Шырына: %1$d, вышыня: %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Утрымліваючы віджэт націснутым, перамяшчайце яго па Галоўным экране"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Дадаць на Галоўны экран"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> віджэт</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> віджэты</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index b3c5ca4028..0d398ee657 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Докоснете двукратно и задръжте за преместване на приспособление или използвайте персонал. действия."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Ширина %1$d и височина %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Докоснете приспособлението и го задръжте, за да го местите на началния екран"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Добавяне към началния екран"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> приспособления</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> приспособление</item>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index fcd6f3faed..50aff809c4 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvaput dodirnite i zadržite da pomjerite vidžet ili da koristite prilagođene radnje."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Širina %1$d, visina %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Dodirnite i držite vidžet da ga pomjerate po Početnom ekranu"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Dodaj na početni ekran"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidžet</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidžeta</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index d54670b4ac..9ea5fc71ce 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Fes doble toc i mantén premut per moure un widget o per utilitzar accions personalitzades."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d d\'amplada per %2$d d\'alçada"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Mantén premut el widget per moure\'l per la pantalla d\'inici"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Afegeix a la pantalla d\'inici"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index a9ea5878b3..9ae37cc096 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvojitým klepnutím a podržením přesunete widget, případně použijte vlastní akce."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"šířka %1$d, výška %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Pokud widgetem chcete pohybovat po ploše, dotkněte se ho a podržte ho"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Přidat na plochu"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgety</item>
       <item quantity="many"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgetu</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index e5dacac7da..3b4e07b752 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Tryk to gange, og hold en widget nede for at flytte den eller bruge tilpassede handlinger."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d i bredden og %2$d i højden"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Hold widgetten nede for at flytte den rundt på startskærmen"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Føj til startskærm"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index a9deedb951..1d93bfcb52 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Πατήστε δύο φορές παρατεταμένα για μετακίνηση γραφικού στοιχείου ή χρήση προσαρμοσμένων ενεργειών."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Πλάτος %1$d επί ύψος %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Αγγίξτε παρατεταμένα το γραφικό στοιχείο για να το μετακινήσετε στην Αρχική οθόνη"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Προσθήκη στην Αρχική οθόνη"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> γραφικά στοιχεία</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> γραφικό στοιχείο</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 0330795e8c..79d33fd597 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Presiona dos veces y mantén presionado para mover un widget o usar acciones personalizadas."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de ancho por %2$d de alto"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Mantén presionado el widget para moverlo por la pantalla principal"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Agregar a pantalla principal"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 888436fa2b..1bc4c603b4 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Toca dos veces y mantén pulsado un widget para moverlo o usar acciones personalizadas."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de ancho por %2$d de alto"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Mantén pulsado el widget para moverlo por la pantalla de inicio"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Añadir a la pantalla de inicio"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other">Widgets: <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
       <item quantity="one">Widget: <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g></item>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 15b6177adf..916aafc9ca 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Vidina teisaldamiseks või kohandatud toimingute kasutamiseks topeltpuudutage ja hoidke all."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d lai ja %2$d kõrge"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Vidina avakuval liigutamiseks puudutage vidinat ja hoidke all"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Lisa avakuvale"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidinat</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> vidin</item>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 53090527d8..901d3cbe18 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Sakatu birritan eta eduki sakatuta widget bat mugitzeko edo ekintza pertsonalizatuak erabiltzeko."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d zabal eta %2$d luze"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Eduki sakatuta widgeta hasierako pantailan zehar mugitzeko"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Gehitu hasierako pantailan"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index b0c300c76d..194ea0df7a 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"برای جابه‌جا کردن ابزارک یا استفاده از کنش‌های سفارشی، دوضربه بزنید و نگه دارید."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"‏%1$d عرض در %2$d طول"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ابزارک را لمس و کنید و نگه دارید تا آن را در صفحه اصلی حرکت دهید"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"افزودن به صفحه اصلی"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ابزارک</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ابزارک</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 47466cfeba..6cffafc48c 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Kaksoisnapauta ja paina pitkään, niin voit siirtää widgetiä tai käyttää muokattuja toimintoja."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Leveys: %1$d, korkeus: %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Voit siirtää widgetiä aloitusnäytöllä koskettamalla sitä pitkään"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Lisää aloitusnäytölle"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgetiä</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index f50d837c2b..3ebd61a218 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Touchez 2x un widget et maintenez le doigt dessus pour le déplacer ou utiliser des actions personnalisées."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de largeur sur %2$d de hauteur"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Maintenez le doigt sur le widget pour le déplacer sur l\'écran d\'accueil"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Ajouter à l\'écran d\'accueil"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f51c3d9e00..bb56bac166 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Appuyez deux fois et maintenez la pression pour déplacer widget ou utiliser actions personnalisées."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d x %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de largeur et %2$d de hauteur"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Appuyez de manière prolongée sur le widget pour le déplacer sur l\'écran d\'accueil"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Ajouter à l\'écran d\'accueil"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index c3e3596ee5..d3f3f0b017 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Toca dúas veces un widget e manteno premido para movelo ou utiliza accións personalizadas."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de largo por %2$d de alto"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Mantén premido o widget para movelo pola pantalla de inicio"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Engadir á pantalla de inicio"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 61776d6f64..9a3c56ce85 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"किसी विजेट को एक से दूसरी जगह ले जाने के लिए, उस पर दो बार टैप करके दबाकर रखें या पसंद के मुताबिक कार्रवाइयां इस्तेमाल करें."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d चौड़ाई गुणा %2$d ऊंचाई"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"होम स्क्रीन पर यहां-वहां ले जाने के लिए विजेट को दबाकर रखें"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"होम स्क्रीन पर जोड़ें"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> विजेट</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> विजेट</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 171f5d07e6..d1cb5bfd2d 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvaput dodirnite i zadržite pritisak da biste premjestili widget ili upotrijebite prilagođene radnje"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d širine i %2$d visine"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Dodirnite i zadržite widget da biste ga pomicali po početnom zaslonu"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Dodaj na početni zaslon"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgeta</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index bbb24e9d00..9e2c358f99 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Modul áthelyezéséhez koppintson duplán, tartsa nyomva az ujját, vagy használjon egyéni műveleteket."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d széles és %2$d magas"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Tartsa lenyomva a modult a kezdőképernyőn való mozgatáshoz"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Hozzáadás a kezdőképernyőhöz"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> modul</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> modul</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index c1889ff367..d42e4f9d53 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Ketuk dua kali &amp; tahan untuk memindahkan widget atau gunakan tindakan khusus."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"lebar %1$d x tinggi %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Sentuh lama widget untuk memindahkannya di sekitar Layar utama"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Tambahkan ke Layar utama"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 1dce7c7396..30e73b4cf3 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Ýttu tvisvar og haltu fingri á græju til að færa hana eða notaðu sérsniðnar aðgerðir."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d á breidd og %2$d á hæð"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Haltu fingri á græjunni til að hreyfa hana um heimaskjáinn"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Bæta á heimaskjá"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> græja</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> græjur</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 3d1cb5bc86..1d420a9006 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Tocca due volte e tieni premuto per spostare un widget o per usare le azioni personalizzate."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d di larghezza per %2$d di altezza"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Tocca e tieni premuto il widget per spostarlo nella schermata Home"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Aggiungi a schermata Home"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 4cf0eb2218..7cd53fa481 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"כדי להעביר ווידג\'ט למקום אחר או להשתמש בפעולות מותאמות אישית, יש ללחוץ פעמיים ולא להרפות."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"‏רוחב %1$d על גובה %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"יש ללחוץ לחיצה ארוכה על הווידג\'ט כדי להזיז אותו ברחבי מסך הבית"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"הוספה למסך הבית"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="two"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ווידג\'טים</item>
       <item quantity="many"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ווידג\'טים</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 77efbadfe3..c1136a42de 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ウィジェットをダブルタップして長押ししながら移動するか、カスタム操作を使用してください。"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$dx%2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"幅 %1$d、高さ %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ウィジェットを押し続けた状態で、ホーム画面上に移動させます。"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"ホーム画面に追加"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> 件のウィジェット</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> 件のウィジェット</item>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index e3be57fe60..c70179592a 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ორმაგი შეხებით აირჩიეთ და გეჭიროთ ვიჯეტის გადასაადგილებლად ან მორგებული მოქმედებების გამოსაყენებლად."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"სიგრძე: %1$d, სიგანე: %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ხანგრძლივად შეეხეთ ვიჯეტს მთავარ ეკრანზე მის გადასაადგილებლად"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"მთავარ ეკრანზე დამატება"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ვიჯეტი</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> ვიჯეტი</item>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 392dc8bfd4..8f92db0332 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Виджетті жылжыту үшін екі рет түртіңіз де, ұстап тұрыңыз немесе арнаулы әрекеттерді пайдаланыңыз."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Ені: %1$d, биіктігі: %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Негізгі экран бойымен қозғалту үшін виджетті басып, ұстап тұрыңыз."</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Негізгі экранға қосу"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виджет</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> виджет</item>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index dd04c01b5f..8a82bdaec7 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ចុចពីរដង រួចសង្កត់ឱ្យជាប់ ដើម្បីផ្លាស់ទី​ធាតុក្រាហ្វិក ឬប្រើ​សកម្មភាព​តាមបំណង​។"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"ទទឺង %1$d គុណនឹងកម្ពស់ %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ចុចធាតុក្រាហ្វិក​ឱ្យជាប់ ដើម្បីផ្លាស់ទីវា​ជុំវិញអេក្រង់ដើម"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"បញ្ចូល​ទៅអេក្រង់ដើម"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other">ធាតុ​ក្រាហ្វិក <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
       <item quantity="one">ធាតុ​ក្រាហ្វិក <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g></item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 7e24dc3b47..b98ee5c0e5 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"두 번 탭한 다음 길게 터치하여 위젯을 이동하거나 맞춤 작업을 사용하세요."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d×%2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"너비 %1$d, 높이 %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"홈 화면에서 위젯을 이동하려면 길게 터치하세요."</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"홈 화면에 추가"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other">위젯 <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g>개</item>
       <item quantity="one">위젯 <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g>개</item>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index a4f54bf376..62fb75c4fc 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Виджетти жылдыруу үчүн эки жолу таптап, кармап туруңуз же ыңгайлаштырылган аракеттерди колдонуңуз."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Туурасы: %1$d, бийиктиги: %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Башкы экранга жылдыруу үчүн виджетти коё бербей басып туруңуз"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Башкы экранга кошуу"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виджет</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> виджет</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 43055a523a..0677e88ffa 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dukart palieskite ir palaikykite, kad perkeltumėte valdiklį ar naudotumėte tinkintus veiksmus."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d plotis ir %2$d aukštis"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Paliesdami ir palaikydami valdiklį galite judėti pagrindiniame ekrane"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Pridėti prie pagrindinio ekrano"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> valdiklis</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> valdikliai</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 8bcf250186..6310375f8a 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Lai pārvietotu logrīku, uz tā veiciet dubultskārienu un turiet. Varat arī veikt pielāgotas darbības."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d plats un %2$d augsts"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Pieskarieties logrīkam un turiet to, lai to pārvietotu pa sākuma ekrānu."</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Pievienot sākuma ekrānam"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="zero"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> logrīku</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> logrīks</item>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index b512dc23ab..3e99d6767e 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Жижиг хэрэгслийг зөөх эсвэл захиалгат үйлдлийг ашиглахын тулд хоёр товшоод, удаан дарна уу."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d өргөн %2$d өндөр"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Жижиг хэрэгслийг Үндсэн нүүрний эргэн тойронд зөөхийн тулд түүнд хүрээд, удаан дарна уу"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Үндсэн нүүрэнд нэмэх"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> жижиг хэрэгсэл</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> жижиг хэрэгсэл</item>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 91f2a4d667..9401040f70 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Ketik dua kali &amp; tahan untuk menggerakkan widget atau menggunakan tindakan tersuai."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Lebar %1$d kali tinggi %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Sentuh &amp; tahan widget untuk menggerakkan widget di sekitar Skrin utama"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Tambah pada Skrin utama"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index f042629bef..4dcd6c12fc 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ဝိဂျက်ကို ရွှေ့ရန် (သို့) စိတ်ကြိုက်လုပ်ဆောင်ချက်များကို သုံးရန် နှစ်ချက်တို့ပြီး ဖိထားပါ။"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"အလျား %1$d နှင့် အမြင့် %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ပင်မစာမျက်နှာအနီးတွင် ဝိဂျက်ကိုရွှေ့ရန် ၎င်းကို တို့ထိ၍ဖိထားပါ"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"ပင်မစာမျက်နှာသို့ ထည့်ရန်"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other">ဝိဂျက် <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ခု</item>
       <item quantity="one">ဝိဂျက် <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> ခု</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 540d7266a3..ad5affb2c2 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dobbelttrykk og hold inne for å flytte en modul eller bruke tilpassede handlinger."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d bredde x %2$d høyde"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Trykk og hold på modulen for å bevege den rundt på startskjermen"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Legg til på startskjermen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> moduler</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> modul</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index d4478b71f0..cc16a89835 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dubbeltik en houd vast om een widget te verplaatsen of aangepaste acties te gebruiken."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d breed en %2$d hoog"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Houd de widget ingedrukt om deze te verplaatsen op het startscherm"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Toevoegen aan startscherm"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 3595f333a8..7f3495a122 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ଏକ ୱିଜେଟକୁ ମୁଭ୍ କରିବା ପାଇଁ ଦୁଇଥର-ଟାପ୍ କରି ଧରି ରଖନ୍ତୁ କିମ୍ବା କଷ୍ଟମ୍ କାର୍ଯ୍ୟଗୁଡ଼ିକୁ ବ୍ୟବହାର କରନ୍ତୁ।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ଓସାର ଓ %2$d ଉଚ୍ଚ"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ମୂଳସ୍କ୍ରିନର ଆଖପାଖରେ ୱିଜେଟକୁ ମୁଭ୍ କରିବା ପାଇଁ ଏହାକୁ ସ୍ପର୍ଶ କରି ଧରି ରଖନ୍ତୁ"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"ମୂଳସ୍କ୍ରିନରେ ଯୋଗ କରନ୍ତୁ"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g>ଟି ୱିଜେଟ୍</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g>ଟି ୱିଜେଟ୍</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 306a9a0fb9..ceb804668c 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Naciśnij dwukrotnie i przytrzymaj, aby przenieść widżet lub użyć działań niestandardowych."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Szerokość %1$d, wysokość %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Kliknij i przytrzymaj widżet, by poruszać nim po ekranie głównym."</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Dodaj do ekranu głównego"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widżety</item>
       <item quantity="many"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widżetów</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index a1049315e2..e40accfeae 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Toque duas vezes sem soltar para mover um widget ou utilizar ações personalizadas."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de largura por %2$d de altura"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Toque sem soltar no widget para o mover à volta do ecrã principal"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Adicionar ao ecrã principal"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 35d1e5d3a7..8b18329f6a 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Toque duas vezes e mantenha a tela pressionada para mover um widget ou usar ações personalizadas."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de largura por %2$d de altura"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Toque no widget e mantenha-o pressionado para movê-lo pela tela inicial"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Adicionar à tela inicial"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index f614b18468..a71f999cee 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Atingeți de două ori și țineți apăsat pentru a muta un widget sau folosiți acțiuni personalizate."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d lățime și %2$d înălțime"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Atingeți lung widgetul pentru a-l muta pe ecranul de pornire"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Adăugați pe ecranul de pornire"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgeturi</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> de widgeturi</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 3336b0bd13..0c1acbc658 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Чтобы использовать специальные действия или перенести виджет, нажмите на него дважды и удерживайте."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d x %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Ширина %1$d, высота %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Нажмите на виджет и удерживайте его, чтобы переместить в нужное место на главном экране."</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Добавить на главный экран"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виджет</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виджета</item>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index fa3287d7fd..6b2716853e 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"විජට් එකක් ගෙන යාමට හෝ අභිරුචි ක්‍රියා භාවිත කිරීමට දෙවරක් තට්ටු කර අල්ලා ගෙන සිටින්න."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"පළල %1$d උස %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"එය මුල් පිටු තිරය වටා ගෙන යාමට විජට් එක ස්පර්ශ කර අල්ලා ගන්න"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"මුල් පිටු තිරය වෙත එක් කරන්න"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one">විජට් <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
       <item quantity="other">විජට් <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index bd90155468..7ea59d64b2 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvojitým klepnutím a pridržaním presuňte miniaplikáciu alebo použite vlastné akcie."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"šírka %1$d, výška %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Po pridržaní môžete miniaplikáciu môžete posúvať po ploche"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Pridať na plochu"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> miniaplikácie</item>
       <item quantity="many"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index df1db7e604..f74bdcc534 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvakrat se dotaknite pripomočka in ga pridržite, da ga premaknete, ali pa uporabite dejanja po meri."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Širina %1$d, višina %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Pridržite pripomoček, če ga želite premikati po začetnem zaslonu."</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Dodaj na začetni zaslon"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> pripomoček</item>
       <item quantity="two"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> pripomočka</item>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 4d97676952..9a53936f56 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Trokit dy herë dhe mbaje shtypur një miniapliikacion për ta zhvendosur atë ose për të përdorur veprimet e personalizuara."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d i gjerë me %2$d i lartë"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Prek dhe mbaj miniaplikacionin për ta lëvizur nëpër \"Ekranin bazë\""</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Shto në \"Ekranin bazë\""</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> miniaplikacione</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> miniaplikacion</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 4103b0084d..4f67b23815 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Двапут додирните и задржите да бисте померали виџет или користите прилагођене радње."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d×%2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"ширина од %1$d и висина од %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Додирните и задржите виџет да бисте га померали по почетном екрану"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Додај на почетни екран"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виџет</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виџета</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index fb3e8c1f08..91b9b8866d 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Tryck snabbt två gånger och håll kvar för att flytta en widget eller använda anpassade åtgärder."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d bred gånger %2$d hög"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Tryck länge på widgeten om du vill flytta den på startskärmen"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Lägg till på startskärmen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgetar</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 6caadaa368..6227239529 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Gusa mara mbili na ushikilie ili usogeze wijeti au utumie vitendo maalum."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Upana wa %1$d na kimo cha %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Gusa na ushikilie wijeti ili uisogeze kwenye Skrini ya kwanza"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Weka kwenye Skrini ya kwanza"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other">Wijeti <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
       <item quantity="one">Wijeti <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g></item>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index a2bc2c57d5..cae7e249dc 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"விட்ஜெட்டை நகர்த்த இருமுறை தட்டிப் பிடிக்கவும் அல்லது பிரத்தியேகச் செயல்களைப் பயன்படுத்தவும்."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d அகலத்திற்கு %2$d உயரம்"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"முகப்புத் திரைக்கு விட்ஜெட்டை நகர்த்த அதைத் தொட்டுப் பிடிக்கவும்"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"முகப்புத் திரையில் சேர்"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> விட்ஜெட்டுகள்</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> விட்ஜெட்</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 1b79b9cbca..4f98cd2ad9 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"แตะสองครั้งค้างไว้เพื่อย้ายวิดเจ็ตหรือใช้การดำเนินการที่กำหนดเอง"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"กว้าง %1$d x สูง %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"แตะวิดเจ็ตค้างไว้เพื่อย้ายไปรอบๆ หน้าจอหลัก"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"เพิ่มลงในหน้าจอหลัก"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other">วิดเจ็ต <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> รายการ</item>
       <item quantity="one">วิดเจ็ต <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> รายการ</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 58e8c8ae0b..a3504fe07e 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"I-double tap at pindutin nang matagal para ilipat ang widget o gumamit ng mga custom na pagkilos."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ang lapad at %2$d ang taas"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Pindutin nang matagal ang widget para ilipat-lipat ito sa Home screen"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Idagdag sa Home screen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> na widget</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index bc6ad4466e..8029aeb302 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Widget\'ı taşımak veya özel işlemleri kullanmak için iki kez dokunup basılı tutun."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"genişlik: %1$d, yükseklik: %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Ana ekranda taşımak için widget\'a dokunup basılı tutun"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Ana ekrana ekle"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index fdba5e615b..5e179aa82b 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Двічі натисніть і втримуйте віджет, щоб перемістити його або виконати інші дії."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Ширина – %1$d, висота – %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Натисніть і втримуйте віджет, щоб переміщувати його головним екраном"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Додати на головний екран"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> віджет</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> віджети</item>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 1ab449dd3f..9c8f7ed460 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Ikki marta bosib va bosib turgan holatda vidjetni tanlang yoki maxsus amaldan foydalaning."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Eni %1$d, bo‘yi %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Bosh ekranda surish uchun vidjet ustiga bosib turing"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Bosh ekranga chiqarish"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ta vidjet</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> ta vidjet</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index acb101b7d4..a026dbc0ff 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Nhấn đúp và giữ để di chuyển một tiện ích hoặc sử dụng các thao tác tùy chỉnh."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Rộng %1$d x cao %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Chạm và giữ để di chuyển tiện ích xung quanh Màn hình chính"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Thêm vào Màn hình chính"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> tiện ích</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> tiện ích</item>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 5b06896707..d32611d575 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"㩒兩下之後㩒住，就可以郁小工具或者用自訂操作。"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d 闊，%2$d 高"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"按住小工具即可將其移至主畫面上任何位置"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"新增至主畫面"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> 個小工具</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> 個小工具</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 9566a8cf5c..58e8f19a07 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"輕觸兩下並按住即可移動小工具或使用自訂操作。"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"寬度為 %1$d，高度為 %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"按住小工具即可將小工具移到主畫面的任一位置"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"新增到主畫面"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> 項小工具</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> 項小工具</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 0da9ed7631..3892f6b10c 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Thepha kabili uphinde ubambe ukuze uhambise iwijethi noma usebenzise izindlela ezingokwezifiso."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ububanzi ngokungu-%2$d ukuya phezulu"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Thinta uphinde ubambe iwijethi ukuyihambisa Kusikrini sasekhaya"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Engeza kusikrini sasekhaya"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one">Amawijethi angu-<xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
       <item quantity="other">Amawijethi angu-<xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
-- 
GitLab


From 90f587f350809b37518c2c0602ed6675328a78d2 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Tue, 4 May 2021 12:51:23 +0100
Subject: [PATCH 1053/1664] Maintain TaskView's scroll invariant when swiping
 down

Fixes: 186881810
Test: Swipe down from task other than running task, snaps in proper position in fullscreen
Change-Id: If1a667246804ebff8432b295a0bb22d17feb5c31
---
 .../src/com/android/quickstep/views/RecentsView.java      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 53f880fbb3..5c6554273a 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1636,8 +1636,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         if (endTarget == GestureState.GestureEndTarget.NEW_TASK
                 || endTarget == GestureState.GestureEndTarget.LAST_TASK) {
             // When switching to tasks in quick switch, ensures the snapped page's scroll maintain
-            // invariant between quick switch and overview grid, to ensure a smooth animation
-            // transition.
+            // invariant between quick switch and overview, to ensure a smooth animation transition.
             updateGridProperties();
         }
     }
@@ -3036,6 +3035,11 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             return new PendingAnimation(duration);
         }
 
+        // When swiping down from overview to tasks, ensures the snapped page's scroll maintain
+        // invariant between quick switch and overview, to ensure a smooth animation transition.
+        updateGridProperties();
+        updateScrollSynchronously();
+
         int targetSysUiFlags = tv.getThumbnail().getSysUiStatusNavFlags();
         final boolean[] passedOverviewThreshold = new boolean[] {false};
         ValueAnimator progressAnim = ValueAnimator.ofFloat(0, 1);
-- 
GitLab


From 197c9094837ceef95e9588bd0c8e130b6c46ed9d Mon Sep 17 00:00:00 2001
From: Cyrus Boadway <boadway@google.com>
Date: Tue, 4 May 2021 12:00:08 +0000
Subject: [PATCH 1054/1664] Change flag type to control Quickstep widget app
 launch

Previously we'd relied on a SystemProperties to control which
InteractionHandler was used by Quickstep for widget app launches.

This switches to a more conventional FeatureFlag.

Bug: 169042867
Test: manual
Change-Id: I7abf815c6e204daf996ac0a81b1a354c4e3d5cda
---
 .../android/launcher3/uioverrides/QuickstepLauncher.java   | 7 ++-----
 src/com/android/launcher3/config/FeatureFlags.java         | 4 ++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index f09d9e087e..d07cc35ecc 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -26,6 +26,7 @@ import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.OVERVIEW_MODAL_TASK;
 import static com.android.launcher3.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_WIDGET_APP_START;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_APP_LAUNCH_TAP;
 import static com.android.launcher3.testing.TestProtocol.HINT_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.HINT_STATE_TWO_BUTTON_ORDINAL;
@@ -36,7 +37,6 @@ import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SY
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
-import android.os.SystemProperties;
 import android.view.HapticFeedbackConstants;
 import android.view.View;
 
@@ -90,9 +90,6 @@ import java.util.stream.Stream;
 
 public class QuickstepLauncher extends BaseQuickstepLauncher {
 
-    private static final boolean ENABLE_APP_WIDGET_LAUNCH_ANIMATION =
-            SystemProperties.getBoolean("persist.debug.quickstep_app_widget_launch", false);
-
     public static final boolean GO_LOW_RAM_RECENTS_ENABLED = false;
     /**
      * Reusable command for applying the shelf height on the background thread.
@@ -327,7 +324,7 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
 
     protected LauncherAppWidgetHost createAppWidgetHost() {
         LauncherAppWidgetHost appWidgetHost = super.createAppWidgetHost();
-        if (ENABLE_APP_WIDGET_LAUNCH_ANIMATION) {
+        if (ENABLE_QUICKSTEP_WIDGET_APP_START.get()) {
             appWidgetHost.setInteractionHandler(new QuickstepInteractionHandler(this));
         }
         return appWidgetHost;
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 7d5ed60019..1981a9c361 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -87,6 +87,10 @@ public final class FeatureFlags {
     public static final BooleanFlag ENABLE_QUICKSTEP_LIVE_TILE = getDebugFlag(
             "ENABLE_QUICKSTEP_LIVE_TILE", true, "Enable live tile in Quickstep overview");
 
+    public static final BooleanFlag ENABLE_QUICKSTEP_WIDGET_APP_START = getDebugFlag(
+            "ENABLE_QUICKSTEP_WIDGET_APP_START", false,
+            "Enable Quickstep animation when launching activities from an app widget");
+
     // Keep as DeviceFlag to allow remote disable in emergency.
     public static final BooleanFlag ENABLE_SUGGESTED_ACTIONS_OVERVIEW = new DeviceFlag(
             "ENABLE_SUGGESTED_ACTIONS_OVERVIEW", true, "Show chip hints on the overview screen");
-- 
GitLab


From 21930da9a2bfad861449347567f2fc6b5d4cc71d Mon Sep 17 00:00:00 2001
From: Jonathan Miranda <jonmiranda@google.com>
Date: Mon, 3 May 2021 18:44:13 +0000
Subject: [PATCH 1055/1664] Revert "Revert "Use color extraction for arrow
 popup.""

This reverts commit 17fda29bf35bc4f21ede07319ffe26c88fea1b81.

Reason for revert: Fixing the memory leak

Leak was detected in caused launcher tapl tests to fail.
For instructions on how to debug leaks, see go/launcher-testing.
Using AS memory profiler, the color extractor class is holding
onto a reference to launcher that has already been destroyed.
The fix is to set the listener to null when view is closed.

Bug: 175329686
Test: run profiler in AS, open and close popups, and verify no leaks

Change-Id: I2d4a87f0481cbc88f3587dce91278e85ca113545
---
 src/com/android/launcher3/CellLayout.java     |  11 +-
 src/com/android/launcher3/Utilities.java      |  50 ++++++++
 .../graphics/PreloadIconDrawable.java         |   6 +-
 .../android/launcher3/popup/ArrowPopup.java   | 106 ++++++++++++++++-
 .../launcher3/util/ColorExtractionUtils.java  | 110 ++++++++++++++++++
 src/com/android/launcher3/util/Themes.java    |   7 +-
 .../launcher3/views/FloatingIconView.java     |  11 +-
 .../widget/LauncherAppWidgetHostView.java     |  80 ++++---------
 8 files changed, 296 insertions(+), 85 deletions(-)
 create mode 100644 src/com/android/launcher3/util/ColorExtractionUtils.java

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 2f755e11e0..af625a51be 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -18,6 +18,7 @@ package com.android.launcher3;
 
 import static android.animation.ValueAnimator.areAnimatorsEnabled;
 
+import static com.android.launcher3.Utilities.getBoundsForViewInDragLayer;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_1_5;
 
 import android.animation.Animator;
@@ -193,6 +194,7 @@ public class CellLayout extends ViewGroup {
     private static final int INVALID_DIRECTION = -100;
 
     private final Rect mTempRect = new Rect();
+    private final RectF mTempRectF = new RectF();
 
     private static final Paint sPaint = new Paint();
 
@@ -1070,11 +1072,16 @@ public class CellLayout extends ViewGroup {
         // Apply local extracted color if the DragView is an AppWidgetHostViewDrawable.
         View view = dragObject.dragView.getContentView();
         if (view instanceof LauncherAppWidgetHostView) {
-            Workspace workspace =
-                    Launcher.getLauncher(dragObject.dragView.getContext()).getWorkspace();
+            Launcher launcher = Launcher.getLauncher(dragObject.dragView.getContext());
+            Workspace workspace = launcher.getWorkspace();
             int screenId = workspace.getIdForScreen(this);
             int pageId = workspace.getPageIndexForScreenId(screenId);
             cellToRect(targetCell[0], targetCell[1], spanX, spanY, mTempRect);
+
+            // Now get the rect in drag layer coordinates.
+            getBoundsForViewInDragLayer(launcher.getDragLayer(), workspace, mTempRect, false,
+                    mTempRectF);
+            Utilities.setRect(mTempRectF, mTempRect);
             ((LauncherAppWidgetHostView) view).handleDrag(mTempRect, pageId);
         }
     }
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index be5463ec2c..bff3cabe22 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -33,6 +33,7 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ShortcutInfo;
+import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.database.ContentObserver;
 import android.graphics.Bitmap;
@@ -84,6 +85,7 @@ import com.android.launcher3.shortcuts.ShortcutKey;
 import com.android.launcher3.shortcuts.ShortcutRequest;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.PackageManagerHelper;
+import com.android.launcher3.views.BaseDragLayer;
 import com.android.launcher3.widget.PendingAddShortcutInfo;
 
 import java.lang.reflect.Method;
@@ -104,6 +106,8 @@ public final class Utilities {
     private static final Pattern sTrimPattern =
             Pattern.compile("^[\\s|\\p{javaSpaceChar}]*(.*)[\\s|\\p{javaSpaceChar}]*$");
 
+    private static final float[] sTmpFloatArray = new float[4];
+
     private static final int[] sLoc0 = new int[2];
     private static final int[] sLoc1 = new int[2];
     private static final Matrix sMatrix = new Matrix();
@@ -133,6 +137,15 @@ public final class Utilities {
             Build.TYPE.toLowerCase(Locale.ROOT).contains("debug") ||
             Build.TYPE.toLowerCase(Locale.ROOT).equals("eng");
 
+    /**
+     * Returns true if theme is dark.
+     */
+    public static boolean isDarkTheme(Context context) {
+        Configuration configuration = context.getResources().getConfiguration();
+        int nightMode = configuration.uiMode & Configuration.UI_MODE_NIGHT_MASK;
+        return nightMode == Configuration.UI_MODE_NIGHT_YES;
+    }
+
     public static boolean isDevelopersOptionsEnabled(Context context) {
         return Settings.Global.getInt(context.getApplicationContext().getContentResolver(),
                         Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0;
@@ -218,6 +231,33 @@ public final class Utilities {
         return scale;
     }
 
+    /**
+     * Returns bounds for a child view of DragLayer, in drag layer coordinates.
+     *
+     * see {@link com.android.launcher3.dragndrop.DragLayer}.
+     *
+     * @param viewBounds Bounds of the view wanted in drag layer coordinates, relative to the view
+     *                   itself. eg. (0, 0, view.getWidth, view.getHeight)
+     * @param ignoreTransform If true, view transform is ignored
+     * @param outRect The out rect where we return the bounds of {@param view} in drag layer coords.
+     */
+    public static void getBoundsForViewInDragLayer(BaseDragLayer dragLayer, View view,
+            Rect viewBounds, boolean ignoreTransform, RectF outRect) {
+        float[] points = sTmpFloatArray;
+        points[0] = viewBounds.left;
+        points[1] = viewBounds.top;
+        points[2] = viewBounds.right;
+        points[3] = viewBounds.bottom;
+
+        Utilities.getDescendantCoordRelativeToAncestor(view, dragLayer, points,
+                false, ignoreTransform);
+        outRect.set(
+                Math.min(points[0], points[2]),
+                Math.min(points[1], points[3]),
+                Math.max(points[0], points[2]),
+                Math.max(points[1], points[3]));
+    }
+
     /**
      * Inverse of {@link #getDescendantCoordRelativeToAncestor(View, View, float[], boolean)}.
      */
@@ -273,6 +313,16 @@ public final class Utilities {
         return new int[] {sLoc1[0] - sLoc0[0], sLoc1[1] - sLoc0[1]};
     }
 
+    /**
+     * Helper method to set rectOut with rectFSrc.
+     */
+    public static void setRect(RectF rectFSrc, Rect rectOut) {
+        rectOut.left = (int) rectFSrc.left;
+        rectOut.top = (int) rectFSrc.top;
+        rectOut.right = (int) rectFSrc.right;
+        rectOut.bottom = (int) rectFSrc.bottom;
+    }
+
     public static void scaleRectFAboutCenter(RectF r, float scale) {
         if (scale != 1.0f) {
             float cx = r.centerX();
diff --git a/src/com/android/launcher3/graphics/PreloadIconDrawable.java b/src/com/android/launcher3/graphics/PreloadIconDrawable.java
index 13ae866efb..e45b8f7918 100644
--- a/src/com/android/launcher3/graphics/PreloadIconDrawable.java
+++ b/src/com/android/launcher3/graphics/PreloadIconDrawable.java
@@ -21,7 +21,6 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.content.Context;
-import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Matrix;
@@ -34,6 +33,7 @@ import android.util.Property;
 import android.util.SparseArray;
 import android.view.ContextThemeWrapper;
 
+import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.icons.GraphicsUtils;
@@ -119,9 +119,7 @@ public class PreloadIconDrawable extends FastBitmapDrawable {
                 info,
                 IconPalette.getPreloadProgressColor(context, info.bitmap.color),
                 getPreloadColors(context),
-            (context.getResources().getConfiguration().uiMode
-                    & Configuration.UI_MODE_NIGHT_MASK
-                    & Configuration.UI_MODE_NIGHT_YES) != 0) /* isDarkMode */;
+                Utilities.isDarkTheme(context));
     }
 
     public PreloadIconDrawable(
diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java
index c19dfe9300..5684c5a1cc 100644
--- a/src/com/android/launcher3/popup/ArrowPopup.java
+++ b/src/com/android/launcher3/popup/ArrowPopup.java
@@ -16,9 +16,9 @@
 
 package com.android.launcher3.popup;
 
-import static com.android.launcher3.AbstractFloatingView.getTopOpenViewWithType;
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.popup.PopupPopulator.MAX_SHORTCUTS;
+import static com.android.launcher3.util.ColorExtractionUtils.getColorExtractionRect;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -31,6 +31,7 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Outline;
 import android.graphics.Rect;
+import android.graphics.RectF;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
@@ -41,17 +42,21 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
+import android.view.ViewTreeObserver;
 import android.widget.FrameLayout;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.InsettableFrameLayout;
+import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAnimUtils;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.Workspace;
 import com.android.launcher3.anim.RevealOutlineAnimation;
 import com.android.launcher3.anim.RoundedRectRevealOutlineProvider;
 import com.android.launcher3.dragndrop.DragLayer;
@@ -59,9 +64,11 @@ import com.android.launcher3.shortcuts.DeepShortcutView;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.BaseDragLayer;
+import com.android.launcher3.widget.LocalColorExtractor;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 
 /**
  * A container for shortcuts to deep links and notifications associated with an app.
@@ -73,6 +80,9 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
 
     // +1 for system shortcut view
     private static final int MAX_NUM_CHILDREN = MAX_SHORTCUTS + 1;
+    // Index used to get background color when using local wallpaper color extraction,
+    private static final int LIGHT_COLOR_EXTRACTION_INDEX = android.R.color.system_accent2_50;
+    private static final int DARK_COLOR_EXTRACTION_INDEX = android.R.color.system_accent2_800;
 
     private final Rect mTempRect = new Rect();
 
@@ -104,8 +114,14 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
 
     private Runnable mOnCloseCallback = () -> { };
 
+    // The rect string of the view that the arrow is attached to, in screen reference frame.
+    private String mArrowColorRectString;
     private int mArrowColor;
     private final int[] mColors;
+    private final HashMap<String, View> mViewForRect = new HashMap<>();
+
+    private final int mColorExtractionIndex;
+    @Nullable private LocalColorExtractor mColorExtractor;
 
     public ArrowPopup(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
@@ -113,7 +129,9 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
         mOutlineRadius = Themes.getDialogCornerRadius(context);
         mLauncher = BaseDraggingActivity.fromContext(context);
         mIsRtl = Utilities.isRtl(getResources());
-
+        mColorExtractionIndex = Utilities.isDarkTheme(context)
+                ? DARK_COLOR_EXTRACTION_INDEX
+                : LIGHT_COLOR_EXTRACTION_INDEX;
         setClipToOutline(true);
         setOutlineProvider(new ViewOutlineProvider() {
             @Override
@@ -158,6 +176,10 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
                 mColors[i] =
                         (int) argb.evaluate((i + 1) * step, primaryColor, secondaryColor);
             }
+
+            if (Utilities.ATLEAST_S) {
+                setupColorExtraction();
+            }
         }
     }
 
@@ -342,6 +364,15 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
             // so we centered it instead. In that case we don't want to showDefaultOptions the arrow.
             mArrow.setVisibility(INVISIBLE);
         } else {
+            updateArrowColor();
+        }
+
+        mArrow.setPivotX(mArrowWidth / 2.0f);
+        mArrow.setPivotY(mIsAboveIcon ? mArrowHeight : 0);
+    }
+
+    private void updateArrowColor() {
+        if (!Gravity.isVertical(mGravity)) {
             mArrow.setBackground(new RoundedArrowDrawable(
                     mArrowWidth, mArrowHeight, mArrowPointRadius,
                     mOutlineRadius, getMeasuredWidth(), getMeasuredHeight(),
@@ -350,9 +381,6 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
                     mArrowColor));
             mArrow.setElevation(getElevation());
         }
-
-        mArrow.setPivotX(mArrowWidth / 2.0f);
-        mArrow.setPivotY(mIsAboveIcon ? mArrowHeight : 0);
     }
 
     /**
@@ -671,6 +699,12 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
         getPopupContainer().removeView(this);
         getPopupContainer().removeView(mArrow);
         mOnCloseCallback.run();
+        mArrowColorRectString = null;
+        mViewForRect.clear();
+        if (mColorExtractor != null) {
+            mColorExtractor.removeLocations();
+            mColorExtractor.setListener(null);
+        }
     }
 
     /**
@@ -680,6 +714,68 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
         mOnCloseCallback = callback;
     }
 
+    private void setupColorExtraction() {
+        Workspace workspace = mLauncher.findViewById(R.id.workspace);
+        if (workspace == null) {
+            return;
+        }
+
+        mColorExtractor = LocalColorExtractor.newInstance(mLauncher);
+        mColorExtractor.setListener((rect, extractedColors) -> {
+            String rectString = rect.toShortString();
+            View v = mViewForRect.get(rectString);
+            if (v != null) {
+                int newColor = extractedColors.get(mColorExtractionIndex);
+                setChildColor(v, newColor);
+                if (rectString.equals(mArrowColorRectString)) {
+                    mArrowColor = newColor;
+                    updateArrowColor();
+                }
+            }
+        });
+
+        getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
+            @Override
+            public boolean onPreDraw() {
+                getViewTreeObserver().removeOnPreDrawListener(this);
+
+                ArrayList<RectF> locations = new ArrayList<>();
+                Rect r = new Rect();
+
+                int count = getChildCount();
+                int numVisibleChild = 0;
+                for (int i = 0; i < count; i++) {
+                    View view = getChildAt(i);
+                    if (view.getVisibility() == VISIBLE) {
+                        RectF rf = new RectF();
+                        getColorExtractionRect(Launcher.getLauncher(getContext()),
+                                workspace.getCurrentPage(), view, rf);
+                        if (rf.isEmpty()) {
+                            numVisibleChild++;
+                            continue;
+                        }
+
+                        locations.add(rf);
+                        String rectString = rf.toShortString();
+                        mViewForRect.put(rectString, view);
+
+                        // Arrow color matches the first child or the last child.
+                        if (!mIsAboveIcon && numVisibleChild == 0) {
+                            mArrowColorRectString = rectString;
+                        } else if (mIsAboveIcon) {
+                            mArrowColorRectString = rectString;
+                        }
+
+                        numVisibleChild++;
+                    }
+                }
+
+                mColorExtractor.addLocation(locations);
+                return false;
+            }
+        });
+    }
+
     protected BaseDragLayer getPopupContainer() {
         return mLauncher.getDragLayer();
     }
diff --git a/src/com/android/launcher3/util/ColorExtractionUtils.java b/src/com/android/launcher3/util/ColorExtractionUtils.java
new file mode 100644
index 0000000000..b377ded44a
--- /dev/null
+++ b/src/com/android/launcher3/util/ColorExtractionUtils.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.util;
+
+import android.content.res.Resources;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.view.View;
+
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.Utilities;
+
+/**
+ * Utility class used to map launcher views to wallpaper rect.
+ */
+public class ColorExtractionUtils {
+
+    public static final String TAG = "ColorExtractionUtils";
+
+    private static final Rect sTempRect = new Rect();
+    private static final RectF sTempRectF = new RectF();
+
+    /**
+     * Takes a view and returns its rect that can be used by the wallpaper local color extractor.
+     *
+     * @param launcher Launcher class class.
+     * @param pageId The page the workspace item is on.
+     * @param v The view.
+     * @param colorExtractionRectOut The location rect, but converted to a format expected by the
+     *                               wallpaper local color extractor.
+     */
+    public static void getColorExtractionRect(Launcher launcher, int pageId, View v,
+            RectF colorExtractionRectOut) {
+        Rect viewRect = sTempRect;
+        viewRect.set(0, 0, v.getWidth(), v.getHeight());
+        Utilities.getBoundsForViewInDragLayer(launcher.getDragLayer(), v, viewRect, false,
+                sTempRectF);
+        Utilities.setRect(sTempRectF, viewRect);
+        getColorExtractionRect(launcher, pageId, viewRect, colorExtractionRectOut);
+    }
+
+    /**
+     * Takes a rect in drag layer coordinates and returns the rect that can be used by the wallpaper
+     * local color extractor.
+     *
+     * @param launcher Launcher class.
+     * @param pageId The page the workspace item is on.
+     * @param rectInDragLayer The relevant bounds of the view in drag layer coordinates.
+     * @param colorExtractionRectOut The location rect, but converted to a format expected by the
+     *                               wallpaper local color extractor.
+     */
+    public static void getColorExtractionRect(Launcher launcher, int pageId, Rect rectInDragLayer,
+            RectF colorExtractionRectOut) {
+        // If the view hasn't been measured and laid out, we cannot do this.
+        if (rectInDragLayer.isEmpty()) {
+            colorExtractionRectOut.setEmpty();
+            return;
+        }
+
+        Resources res = launcher.getResources();
+        DeviceProfile dp = launcher.getDeviceProfile().inv.getDeviceProfile(launcher);
+        float screenWidth = dp.widthPx;
+        float screenHeight = dp.heightPx;
+        int numScreens = launcher.getWorkspace().getNumPagesForWallpaperParallax();
+        pageId = Utilities.isRtl(res) ? numScreens - pageId - 1 : pageId;
+        float relativeScreenWidth = 1f / numScreens;
+
+        int[] dragLayerBounds = new int[2];
+        launcher.getDragLayer().getLocationOnScreen(dragLayerBounds);
+        // Translate from drag layer coordinates to screen coordinates.
+        int screenLeft = rectInDragLayer.left + dragLayerBounds[0];
+        int screenTop = rectInDragLayer.top + dragLayerBounds[1];
+        int screenRight = rectInDragLayer.right + dragLayerBounds[0];
+        int screenBottom = rectInDragLayer.bottom + dragLayerBounds[1];
+
+        // This is the position of the view relative to the wallpaper, as expected by the
+        // local color extraction of the WallpaperManager.
+        // The coordinate system is such that, on the horizontal axis, each screen has a
+        // distinct range on the [0,1] segment. So if there are 3 screens, they will have the
+        // ranges [0, 1/3], [1/3, 2/3] and [2/3, 1]. The position on the subrange should be
+        // the position of the view relative to the screen. For the vertical axis, this is
+        // simply the location of the view relative to the screen.
+        // Translate from drag layer coordinates to screen coordinates
+        colorExtractionRectOut.left = (screenLeft / screenWidth + pageId) * relativeScreenWidth;
+        colorExtractionRectOut.right = (screenRight / screenWidth + pageId) * relativeScreenWidth;
+        colorExtractionRectOut.top = screenTop / screenHeight;
+        colorExtractionRectOut.bottom = screenBottom / screenHeight;
+
+        if (colorExtractionRectOut.left < 0
+                || colorExtractionRectOut.right > 1
+                || colorExtractionRectOut.top < 0
+                || colorExtractionRectOut.bottom > 1) {
+            colorExtractionRectOut.setEmpty();
+        }
+    }
+}
diff --git a/src/com/android/launcher3/util/Themes.java b/src/com/android/launcher3/util/Themes.java
index 99942aa56d..06cac08aec 100644
--- a/src/com/android/launcher3/util/Themes.java
+++ b/src/com/android/launcher3/util/Themes.java
@@ -22,7 +22,6 @@ import static android.app.WallpaperColors.HINT_SUPPORTS_DARK_THEME;
 import android.app.WallpaperColors;
 import android.app.WallpaperManager;
 import android.content.Context;
-import android.content.res.Configuration;
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.ColorMatrix;
@@ -54,16 +53,12 @@ public class Themes {
     }
 
     public static int getActivityThemeRes(Context context, int wallpaperColorHints) {
-        Configuration configuration = context.getResources().getConfiguration();
-        int nightMode = configuration.uiMode & Configuration.UI_MODE_NIGHT_MASK;
-        boolean darkTheme = nightMode == Configuration.UI_MODE_NIGHT_YES;
-
         boolean supportsDarkText = Utilities.ATLEAST_S
                 && (wallpaperColorHints & HINT_SUPPORTS_DARK_TEXT) != 0;
         boolean isMainColorDark = Utilities.ATLEAST_S
                 && (wallpaperColorHints & HINT_SUPPORTS_DARK_THEME) != 0;
 
-        if (darkTheme) {
+        if (Utilities.isDarkTheme(context)) {
             return supportsDarkText ? R.style.AppTheme_Dark_DarkText
                     : isMainColorDark ? R.style.AppTheme_Dark_DarkMainColor : R.style.AppTheme_Dark;
         } else {
diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java
index d49320b073..1ddd1ba89f 100644
--- a/src/com/android/launcher3/views/FloatingIconView.java
+++ b/src/com/android/launcher3/views/FloatingIconView.java
@@ -233,15 +233,8 @@ public class FloatingIconView extends FrameLayout implements
             outViewBounds.set(0, 0, v.getWidth(), v.getHeight());
         }
 
-        float[] points = new float[] {outViewBounds.left, outViewBounds.top, outViewBounds.right,
-                outViewBounds.bottom};
-        Utilities.getDescendantCoordRelativeToAncestor(v, launcher.getDragLayer(), points,
-                false, ignoreTransform);
-        outRect.set(
-                Math.min(points[0], points[2]),
-                Math.min(points[1], points[3]),
-                Math.max(points[0], points[2]),
-                Math.max(points[1], points[3]));
+        Utilities.getBoundsForViewInDragLayer(launcher.getDragLayer(), v, outViewBounds,
+                ignoreTransform, outRect);
     }
 
     /**
diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
index 620604a4d1..697c4531c2 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
@@ -16,6 +16,10 @@
 
 package com.android.launcher3.widget;
 
+import static com.android.launcher3.Utilities.getBoundsForViewInDragLayer;
+import static com.android.launcher3.Utilities.setRect;
+import static com.android.launcher3.util.ColorExtractionUtils.getColorExtractionRect;
+
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
 import android.content.res.Configuration;
@@ -25,7 +29,6 @@ import android.graphics.Rect;
 import android.graphics.RectF;
 import android.os.Handler;
 import android.os.SystemClock;
-import android.util.Log;
 import android.util.SparseBooleanArray;
 import android.util.SparseIntArray;
 import android.view.LayoutInflater;
@@ -95,11 +98,11 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
     private RectF mLastLocationRegistered = null;
     @Nullable private AppWidgetHostViewDragListener mDragListener;
 
-    // Used to store the widget size during onLayout.
+    // Used to store the widget sizes in drag layer coordinates.
     private final Rect mCurrentWidgetSize = new Rect();
     private final Rect mWidgetSizeAtDrag = new Rect();
+
     private final RectF mTempRectF = new RectF();
-    private final boolean mIsRtl;
     private final Rect mEnforcedRectangle = new Rect();
     private final float mEnforcedCornerRadius;
     private final ViewOutlineProvider mCornerRadiusEnforcementOutline = new ViewOutlineProvider() {
@@ -129,7 +132,6 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         if (Utilities.ATLEAST_Q && Themes.getAttrBoolean(mLauncher, R.attr.isWorkspaceDarkText)) {
             setOnLightBackground(true);
         }
-        mIsRtl = Utilities.isRtl(context.getResources());
         mColorExtractor = LocalColorExtractor.newInstance(getContext());
         mColorExtractor.setListener(this);
 
@@ -319,13 +321,12 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         mIsScrollable = checkScrollableRecursively(this);
 
         if (!mIsInDragMode && getTag() instanceof LauncherAppWidgetInfo) {
-            mCurrentWidgetSize.left = left;
-            mCurrentWidgetSize.top = top;
-            mCurrentWidgetSize.right = right;
-            mCurrentWidgetSize.bottom = bottom;
             LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) getTag();
-            int pageId = mWorkspace.getPageIndexForScreenId(info.screenId);
-            updateColorExtraction(mCurrentWidgetSize, pageId);
+            getBoundsForViewInDragLayer(mLauncher.getDragLayer(), this, mCurrentWidgetSize, true,
+                    mTempRectF);
+            setRect(mTempRectF, mCurrentWidgetSize);
+            updateColorExtraction(mCurrentWidgetSize,
+                    mWorkspace.getPageIndexForScreenId(info.screenId));
         }
 
         enforceRoundedCorners();
@@ -338,8 +339,8 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
     }
 
     /** Handles a drag event occurred on a workspace page, {@code pageId}. */
-    public void handleDrag(Rect rect, int pageId) {
-        mWidgetSizeAtDrag.set(rect);
+    public void handleDrag(Rect rectInDragLayer, int pageId) {
+        mWidgetSizeAtDrag.set(rectInDragLayer);
         updateColorExtraction(mWidgetSizeAtDrag, pageId);
     }
 
@@ -351,53 +352,14 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         requestLayout();
     }
 
-    private void updateColorExtraction(Rect widgetLocation, int pageId) {
-        // If the widget hasn't been measured and laid out, we cannot do this.
-        if (widgetLocation.isEmpty()) {
-            return;
-        }
-        int screenWidth = mLauncher.getDeviceProfile().widthPx;
-        int screenHeight = mLauncher.getDeviceProfile().heightPx;
-        int numScreens = mWorkspace.getNumPagesForWallpaperParallax();
-        pageId = mIsRtl ? numScreens - pageId - 1 : pageId;
-        float relativeScreenWidth = 1f / numScreens;
-        float absoluteTop = widgetLocation.top;
-        float absoluteBottom = widgetLocation.bottom;
-        View v = this;
-        while (v.getParent() instanceof View) {
-            v = (View) v.getParent();
-            if (v.getId() != R.id.launcher) {
-                break;
-            }
-            absoluteBottom += v.getTop();
-            absoluteTop += v.getTop();
-        }
-        float xOffset = 0;
-        View parentView = (View) getParent();
-        // The layout depends on the orientation.
-        if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
-            int parentViewWidth = parentView == null ? 0 : parentView.getWidth();
-            xOffset = screenWidth - mWorkspace.getPaddingRight() - parentViewWidth;
-        } else {
-            int parentViewPaddingLeft = parentView == null ? 0 : parentView.getPaddingLeft();
-            xOffset = mWorkspace.getPaddingLeft() + parentViewPaddingLeft;
-        }
-        // This is the position of the widget relative to the wallpaper, as expected by the
-        // local color extraction of the WallpaperManager.
-        // The coordinate system is such that, on the horizontal axis, each screen has a
-        // distinct range on the [0,1] segment. So if there are 3 screens, they will have the
-        // ranges [0, 1/3], [1/3, 2/3] and [2/3, 1]. The position on the subrange should be
-        // the position of the widget relative to the screen. For the vertical axis, this is
-        // simply the location of the widget relative to the screen.
-        mTempRectF.left = ((widgetLocation.left + xOffset) / screenWidth + pageId)
-                * relativeScreenWidth;
-        mTempRectF.right = ((widgetLocation.right + xOffset) / screenWidth + pageId)
-                * relativeScreenWidth;
-        mTempRectF.top = absoluteTop / screenHeight;
-        mTempRectF.bottom = absoluteBottom / screenHeight;
-        if (mTempRectF.left < 0 || mTempRectF.right > 1 || mTempRectF.top < 0
-                || mTempRectF.bottom > 1) {
-            Log.e(LOG_TAG, "   Error, invalid relative position");
+    /**
+     * @param rectInDragLayer Rect of widget in drag layer coordinates.
+     * @param pageId The workspace page the widget is on.
+     */
+    private void updateColorExtraction(Rect rectInDragLayer, int pageId) {
+        getColorExtractionRect(mLauncher, pageId, rectInDragLayer, mTempRectF);
+
+        if (mTempRectF.isEmpty()) {
             return;
         }
         if (!mTempRectF.equals(mLastLocationRegistered)) {
-- 
GitLab


From 88b7f6a0d57e0643a6ce2f3534c184ca56b0c30b Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Mon, 3 May 2021 16:49:53 -0700
Subject: [PATCH 1056/1664] Move color extraction utils to extractor class so
 each instance can have its own set of temp variables.

- Pass in float[] param to not create new obj in each frame
  for dragging widget case.

Bug: 175329686
Bug: 187019711
Test: manual, verify
Change-Id: I4350fb7e66a80c73def5659fb41abc14d357e667
---
 src/com/android/launcher3/CellLayout.java     |   3 +-
 src/com/android/launcher3/Utilities.java      |   4 +-
 .../android/launcher3/popup/ArrowPopup.java   |   3 +-
 .../launcher3/util/ColorExtractionUtils.java  | 110 ------------------
 .../launcher3/views/FloatingIconView.java     |   2 +-
 .../widget/LauncherAppWidgetHostView.java     |   6 +-
 .../launcher3/widget/LocalColorExtractor.java |  32 +++++
 7 files changed, 41 insertions(+), 119 deletions(-)
 delete mode 100644 src/com/android/launcher3/util/ColorExtractionUtils.java

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index af625a51be..1df9df6763 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -195,6 +195,7 @@ public class CellLayout extends ViewGroup {
 
     private final Rect mTempRect = new Rect();
     private final RectF mTempRectF = new RectF();
+    private final float[] mTmpFloatArray = new float[4];
 
     private static final Paint sPaint = new Paint();
 
@@ -1080,7 +1081,7 @@ public class CellLayout extends ViewGroup {
 
             // Now get the rect in drag layer coordinates.
             getBoundsForViewInDragLayer(launcher.getDragLayer(), workspace, mTempRect, false,
-                    mTempRectF);
+                    mTmpFloatArray, mTempRectF);
             Utilities.setRect(mTempRectF, mTempRect);
             ((LauncherAppWidgetHostView) view).handleDrag(mTempRect, pageId);
         }
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index bff3cabe22..972a6e84f5 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -242,8 +242,8 @@ public final class Utilities {
      * @param outRect The out rect where we return the bounds of {@param view} in drag layer coords.
      */
     public static void getBoundsForViewInDragLayer(BaseDragLayer dragLayer, View view,
-            Rect viewBounds, boolean ignoreTransform, RectF outRect) {
-        float[] points = sTmpFloatArray;
+            Rect viewBounds, boolean ignoreTransform, float[] recycle, RectF outRect) {
+        float[] points = recycle == null ? new float[4] : recycle;
         points[0] = viewBounds.left;
         points[1] = viewBounds.top;
         points[2] = viewBounds.right;
diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java
index 5684c5a1cc..c63d69dfd3 100644
--- a/src/com/android/launcher3/popup/ArrowPopup.java
+++ b/src/com/android/launcher3/popup/ArrowPopup.java
@@ -18,7 +18,6 @@ package com.android.launcher3.popup;
 
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.popup.PopupPopulator.MAX_SHORTCUTS;
-import static com.android.launcher3.util.ColorExtractionUtils.getColorExtractionRect;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -748,7 +747,7 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
                     View view = getChildAt(i);
                     if (view.getVisibility() == VISIBLE) {
                         RectF rf = new RectF();
-                        getColorExtractionRect(Launcher.getLauncher(getContext()),
+                        mColorExtractor.getExtractedRectForView(Launcher.getLauncher(getContext()),
                                 workspace.getCurrentPage(), view, rf);
                         if (rf.isEmpty()) {
                             numVisibleChild++;
diff --git a/src/com/android/launcher3/util/ColorExtractionUtils.java b/src/com/android/launcher3/util/ColorExtractionUtils.java
deleted file mode 100644
index b377ded44a..0000000000
--- a/src/com/android/launcher3/util/ColorExtractionUtils.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.util;
-
-import android.content.res.Resources;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.view.View;
-
-import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.Launcher;
-import com.android.launcher3.Utilities;
-
-/**
- * Utility class used to map launcher views to wallpaper rect.
- */
-public class ColorExtractionUtils {
-
-    public static final String TAG = "ColorExtractionUtils";
-
-    private static final Rect sTempRect = new Rect();
-    private static final RectF sTempRectF = new RectF();
-
-    /**
-     * Takes a view and returns its rect that can be used by the wallpaper local color extractor.
-     *
-     * @param launcher Launcher class class.
-     * @param pageId The page the workspace item is on.
-     * @param v The view.
-     * @param colorExtractionRectOut The location rect, but converted to a format expected by the
-     *                               wallpaper local color extractor.
-     */
-    public static void getColorExtractionRect(Launcher launcher, int pageId, View v,
-            RectF colorExtractionRectOut) {
-        Rect viewRect = sTempRect;
-        viewRect.set(0, 0, v.getWidth(), v.getHeight());
-        Utilities.getBoundsForViewInDragLayer(launcher.getDragLayer(), v, viewRect, false,
-                sTempRectF);
-        Utilities.setRect(sTempRectF, viewRect);
-        getColorExtractionRect(launcher, pageId, viewRect, colorExtractionRectOut);
-    }
-
-    /**
-     * Takes a rect in drag layer coordinates and returns the rect that can be used by the wallpaper
-     * local color extractor.
-     *
-     * @param launcher Launcher class.
-     * @param pageId The page the workspace item is on.
-     * @param rectInDragLayer The relevant bounds of the view in drag layer coordinates.
-     * @param colorExtractionRectOut The location rect, but converted to a format expected by the
-     *                               wallpaper local color extractor.
-     */
-    public static void getColorExtractionRect(Launcher launcher, int pageId, Rect rectInDragLayer,
-            RectF colorExtractionRectOut) {
-        // If the view hasn't been measured and laid out, we cannot do this.
-        if (rectInDragLayer.isEmpty()) {
-            colorExtractionRectOut.setEmpty();
-            return;
-        }
-
-        Resources res = launcher.getResources();
-        DeviceProfile dp = launcher.getDeviceProfile().inv.getDeviceProfile(launcher);
-        float screenWidth = dp.widthPx;
-        float screenHeight = dp.heightPx;
-        int numScreens = launcher.getWorkspace().getNumPagesForWallpaperParallax();
-        pageId = Utilities.isRtl(res) ? numScreens - pageId - 1 : pageId;
-        float relativeScreenWidth = 1f / numScreens;
-
-        int[] dragLayerBounds = new int[2];
-        launcher.getDragLayer().getLocationOnScreen(dragLayerBounds);
-        // Translate from drag layer coordinates to screen coordinates.
-        int screenLeft = rectInDragLayer.left + dragLayerBounds[0];
-        int screenTop = rectInDragLayer.top + dragLayerBounds[1];
-        int screenRight = rectInDragLayer.right + dragLayerBounds[0];
-        int screenBottom = rectInDragLayer.bottom + dragLayerBounds[1];
-
-        // This is the position of the view relative to the wallpaper, as expected by the
-        // local color extraction of the WallpaperManager.
-        // The coordinate system is such that, on the horizontal axis, each screen has a
-        // distinct range on the [0,1] segment. So if there are 3 screens, they will have the
-        // ranges [0, 1/3], [1/3, 2/3] and [2/3, 1]. The position on the subrange should be
-        // the position of the view relative to the screen. For the vertical axis, this is
-        // simply the location of the view relative to the screen.
-        // Translate from drag layer coordinates to screen coordinates
-        colorExtractionRectOut.left = (screenLeft / screenWidth + pageId) * relativeScreenWidth;
-        colorExtractionRectOut.right = (screenRight / screenWidth + pageId) * relativeScreenWidth;
-        colorExtractionRectOut.top = screenTop / screenHeight;
-        colorExtractionRectOut.bottom = screenBottom / screenHeight;
-
-        if (colorExtractionRectOut.left < 0
-                || colorExtractionRectOut.right > 1
-                || colorExtractionRectOut.top < 0
-                || colorExtractionRectOut.bottom > 1) {
-            colorExtractionRectOut.setEmpty();
-        }
-    }
-}
diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java
index 1ddd1ba89f..81581fa80a 100644
--- a/src/com/android/launcher3/views/FloatingIconView.java
+++ b/src/com/android/launcher3/views/FloatingIconView.java
@@ -234,7 +234,7 @@ public class FloatingIconView extends FrameLayout implements
         }
 
         Utilities.getBoundsForViewInDragLayer(launcher.getDragLayer(), v, outViewBounds,
-                ignoreTransform, outRect);
+                ignoreTransform, null /** recycle */, outRect);
     }
 
     /**
diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
index 697c4531c2..5deecd4c8a 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
@@ -18,7 +18,6 @@ package com.android.launcher3.widget;
 
 import static com.android.launcher3.Utilities.getBoundsForViewInDragLayer;
 import static com.android.launcher3.Utilities.setRect;
-import static com.android.launcher3.util.ColorExtractionUtils.getColorExtractionRect;
 
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
@@ -102,6 +101,7 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
     private final Rect mCurrentWidgetSize = new Rect();
     private final Rect mWidgetSizeAtDrag = new Rect();
 
+    private final float[] mTmpFloatArray = new float[4];
     private final RectF mTempRectF = new RectF();
     private final Rect mEnforcedRectangle = new Rect();
     private final float mEnforcedCornerRadius;
@@ -323,7 +323,7 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         if (!mIsInDragMode && getTag() instanceof LauncherAppWidgetInfo) {
             LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) getTag();
             getBoundsForViewInDragLayer(mLauncher.getDragLayer(), this, mCurrentWidgetSize, true,
-                    mTempRectF);
+                    mTmpFloatArray, mTempRectF);
             setRect(mTempRectF, mCurrentWidgetSize);
             updateColorExtraction(mCurrentWidgetSize,
                     mWorkspace.getPageIndexForScreenId(info.screenId));
@@ -357,7 +357,7 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
      * @param pageId The workspace page the widget is on.
      */
     private void updateColorExtraction(Rect rectInDragLayer, int pageId) {
-        getColorExtractionRect(mLauncher, pageId, rectInDragLayer, mTempRectF);
+        mColorExtractor.getExtractedRectForViewRect(mLauncher, pageId, rectInDragLayer, mTempRectF);
 
         if (mTempRectF.isEmpty()) {
             return;
diff --git a/src/com/android/launcher3/widget/LocalColorExtractor.java b/src/com/android/launcher3/widget/LocalColorExtractor.java
index be4faea68f..8ae6b2e435 100644
--- a/src/com/android/launcher3/widget/LocalColorExtractor.java
+++ b/src/com/android/launcher3/widget/LocalColorExtractor.java
@@ -19,11 +19,14 @@ package com.android.launcher3.widget;
 import android.app.WallpaperColors;
 import android.appwidget.AppWidgetHostView;
 import android.content.Context;
+import android.graphics.Rect;
 import android.graphics.RectF;
 import android.util.SparseIntArray;
+import android.view.View;
 
 import androidx.annotation.Nullable;
 
+import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.util.ResourceBasedOverride;
 
@@ -71,4 +74,33 @@ public class LocalColorExtractor implements ResourceBasedOverride {
      * Updates the base context to contain the colors override
      */
     public void applyColorsOverride(Context base, WallpaperColors colors) { }
+
+    /**
+     * Takes a view and returns its rect that can be used by the wallpaper local color extractor.
+     *
+     * @param launcher Launcher class class.
+     * @param pageId The page the workspace item is on.
+     * @param v The view.
+     * @param colorExtractionRectOut The location rect, but converted to a format expected by the
+     *                               wallpaper local color extractor.
+     */
+    public void getExtractedRectForView(Launcher launcher, int pageId, View v,
+            RectF colorExtractionRectOut) {
+        // no-op
+    }
+
+    /**
+     * Takes a rect in drag layer coordinates and returns the rect that can be used by the wallpaper
+     * local color extractor.
+     *
+     * @param launcher Launcher class.
+     * @param pageId The page the workspace item is on.
+     * @param rectInDragLayer The relevant bounds of the view in drag layer coordinates.
+     * @param colorExtractionRectOut The location rect, but converted to a format expected by the
+     *                               wallpaper local color extractor.
+     */
+    public void getExtractedRectForViewRect(Launcher launcher, int pageId, Rect rectInDragLayer,
+            RectF colorExtractionRectOut) {
+        // no-op
+    }
 }
-- 
GitLab


From 79d76b5041e0ac328e5c7d94f7ee326b630729f2 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 28 Apr 2021 23:16:22 +0100
Subject: [PATCH 1057/1664] Fix LayoutParams cast exception in drag-n-drop

Test: Pick up a widget from home screen. Then drop it and immediately
      pick it up again before the resize frame is dismissed. No crash
      is observed.
Bug: 186663184
Change-Id: Ia40676fbbf5d6dc2e2043aa7acd6ae00f1fa4179
---
 .../launcher3/AppWidgetResizeFrame.java       | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java
index 5d41bb5c3e..401b58b2d5 100644
--- a/src/com/android/launcher3/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher3/AppWidgetResizeFrame.java
@@ -71,6 +71,22 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
 
     private final View[] mDragHandles = new View[HANDLE_COUNT];
     private final List<Rect> mSystemGestureExclusionRects = new ArrayList<>(HANDLE_COUNT);
+    private final OnAttachStateChangeListener mWidgetViewAttachStateChangeListener =
+            new OnAttachStateChangeListener() {
+                @Override
+                public void onViewAttachedToWindow(View view) {
+                    // Do nothing
+                }
+
+                @Override
+                public void onViewDetachedFromWindow(View view) {
+                    // When the app widget view is detached, we should close the resize frame.
+                    // An example is when the dragging starts, the widget view is detached from
+                    // CellLayout and then reattached to DragLayout.
+                    close(false);
+                }
+            };
+
 
     private LauncherAppWidgetHostView mWidgetView;
     private CellLayout mCellLayout;
@@ -191,7 +207,11 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
     private void setupForWidget(LauncherAppWidgetHostView widgetView, CellLayout cellLayout,
             DragLayer dragLayer) {
         mCellLayout = cellLayout;
+        if (mWidgetView != null) {
+            mWidgetView.removeOnAttachStateChangeListener(mWidgetViewAttachStateChangeListener);
+        }
         mWidgetView = widgetView;
+        mWidgetView.addOnAttachStateChangeListener(mWidgetViewAttachStateChangeListener);
         LauncherAppWidgetProviderInfo info = (LauncherAppWidgetProviderInfo)
                 widgetView.getAppWidgetInfo();
         mResizeMode = info.resizeMode;
@@ -641,6 +661,9 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
     @Override
     protected void handleClose(boolean animate) {
         mDragLayer.removeView(this);
+        if (mWidgetView != null) {
+            mWidgetView.removeOnAttachStateChangeListener(mWidgetViewAttachStateChangeListener);
+        }
     }
 
     @Override
-- 
GitLab


From 04b8ac607ebbc4d9d6dee23179001f03a1162833 Mon Sep 17 00:00:00 2001
From: Cyrus Boadway <boadway@google.com>
Date: Tue, 4 May 2021 18:32:05 +0000
Subject: [PATCH 1058/1664] Add NEW_TASK flag to Quickstep App Widget activity
 start

Include the NEW_TASK flag to activity starts launched from Quickstep
hosted App Widgets.

This is consistent with the default non-Quickstep generated
ActivityOptions from RemoteViews::getLaunchOptions.

Bug: 169042867
Test: manual
Change-Id: Iba370731f4126d92a11a4e348e74888b533d4d8b
---
 .../launcher3/uioverrides/QuickstepInteractionHandler.java       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
index 5c19ab8bf4..a54f963100 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
@@ -50,6 +50,7 @@ class QuickstepInteractionHandler implements RemoteViews.InteractionHandler {
         Pair<Intent, ActivityOptions> options = remoteResponse.getLaunchOptions(hostView);
         ActivityOptionsWrapper activityOptions = mLauncher.getAppTransitionManager()
                 .getActivityLaunchOptions(mLauncher, hostView);
+        activityOptions.options.setPendingIntentLaunchFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         Object itemInfo = hostView.getTag();
         if (itemInfo instanceof ItemInfo) {
             mLauncher.addLaunchCookie((ItemInfo) itemInfo, activityOptions.options);
-- 
GitLab


From 04fb7ee44c54a5f9b8de42dbde33fb2e4a532f49 Mon Sep 17 00:00:00 2001
From: Evan Rosky <erosky@google.com>
Date: Tue, 4 May 2021 11:52:26 -0700
Subject: [PATCH 1059/1664] Fix a bug in TouchInteractionService for
 fixed-display input rotation

DisplayManager display size seems to be pre-rotation, so adjust
logic in TouchInteractionService to account for that.

Bug: 179274888
Test: atest Launcher3Tests:com.android.launcher3.ui.TaplTestsLauncher3
Change-Id: Ie89d7b7d74c8bece8a2c109a0b350bc190356bf2
---
 .../src/com/android/quickstep/TouchInteractionService.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 4fc97702ed..338a6efd82 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -496,6 +496,13 @@ public class TouchInteractionService extends Service implements PluginListener<O
             Point sz = new Point();
             display.getRealSize(sz);
             if (rotation != Surface.ROTATION_0) {
+                if ((rotation % 2) != 0) {
+                    // via display-manager, the display size is unrotated, so "rotate" its size
+                    // to match the rotation we are transforming the event into.
+                    final int tmpX = sz.x;
+                    sz.x = sz.y;
+                    sz.y = tmpX;
+                }
                 event.transform(InputChannelCompat.createRotationMatrix(rotation, sz.x, sz.y));
             }
         }
-- 
GitLab


From 7167c3f3c962f328b477736e089f167263fe5298 Mon Sep 17 00:00:00 2001
From: zakcohen <zakcohen@google.com>
Date: Tue, 4 May 2021 13:56:34 -0700
Subject: [PATCH 1060/1664] Make overview color tinting work properly.

Bug: 179922117
Test: Local
Change-Id: I0b6620be8184bab836ed91d087739df57817eb37
---
 quickstep/src/com/android/quickstep/views/TaskView.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 45bcdc314b..08f5879301 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -1417,9 +1417,10 @@ public class TaskView extends FrameLayout implements Reusable {
     }
 
     private void setColorTint(float amount) {
-        mSnapshotView.setDimAlpha(amount);
-        mIconView.setIconColorTint(mTintingColor, amount);
-        mDigitalWellBeingToast.setBannerColorTint(mTintingColor, amount);
+        mTintAmount = amount;
+        mSnapshotView.setDimAlpha(mTintAmount);
+        mIconView.setIconColorTint(mTintingColor, mTintAmount);
+        mDigitalWellBeingToast.setBannerColorTint(mTintingColor, mTintAmount);
     }
 
     private float getColorTint() {
-- 
GitLab


From 06df8fe4d85b09c616a9e20e71a456bc8e888b73 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Tue, 4 May 2021 21:16:46 +0000
Subject: [PATCH 1061/1664] Revert "Revert "Revert "Finish recents animation
 upon home rotation"""

This reverts commit ef7b4d5dae976c1c6f4dbf5e43d6ab020361aa3a.

Reason for revert: Possibly broke a test
Bug: 187112839

Change-Id: I16ac2a155af9a0ae2ea60f55c52e0b3bf4307089
---
 .../src/com/android/quickstep/views/RecentsView.java  | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 1a0a1a4357..e5ce9509c8 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2486,15 +2486,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     @Override
     protected void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
-        if (LIVE_TILE.get() && mRunningTaskId != -1) {
-            switchToScreenshot(
-                    () -> finishRecentsAnimation(true, this::onConfigurationChangedInternal));
-        } else {
-            onConfigurationChangedInternal();
-        }
-    }
-
-    private void onConfigurationChangedInternal() {
         final int rotation = mActivity.getDisplay().getRotation();
         if (mOrientationState.setRecentsRotation(rotation)) {
             updateOrientationHandler();
@@ -3447,7 +3438,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
      * capturing the snapshot at the same time.
      */
     public void switchToScreenshot(Runnable onFinishRunnable) {
-        switchToScreenshot(mRecentsAnimationController == null || mRunningTaskId == -1 ? null
+        switchToScreenshot(mRunningTaskId == -1 ? null
                 : mRecentsAnimationController.screenshotTask(mRunningTaskId), onFinishRunnable);
     }
 
-- 
GitLab


From 96d4ec4544204b8f27dd96bd043cd13927ecb4aa Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Tue, 4 May 2021 09:08:09 -0700
Subject: [PATCH 1062/1664] All apps motion tuning [1/n]

- reverse spring direction to enable overshoot
- change master interpolators for swipe / fling

Test: manual
Bug: 183001675
Bug: 186121789
Change-Id: I5869d84daab99594cc2a261cb8f5d28e0293afe1
---
 .../launcher3/allapps/AllAppsContainerView.java    |  4 ++--
 .../allapps/AllAppsTransitionController.java       | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 40f7ab167c..1d31caf745 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -75,7 +75,7 @@ import com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip.OnActivePag
 public class AllAppsContainerView extends SpringRelativeLayout implements DragSource,
         Insettable, OnDeviceProfileChangeListener, OnActivePageChangedListener {
 
-    private static final float FLING_VELOCITY_MULTIPLIER = 1800f;
+    private static final float FLING_VELOCITY_MULTIPLIER = 1000f;
 
     // Starts the springs after at least 25% of the animation has passed.
     private static final float FLING_ANIMATION_THRESHOLD = 0.25f;
@@ -611,7 +611,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
             public void onAnimationUpdate(ValueAnimator valueAnimator) {
                 if (shouldSpring
                         && valueAnimator.getAnimatedFraction() >= FLING_ANIMATION_THRESHOLD) {
-                    absorbSwipeUpVelocity(-Math.abs(
+                    absorbSwipeUpVelocity(Math.abs(
                             Math.round(velocity * FLING_VELOCITY_MULTIPLIER)));
                     shouldSpring = false;
                 }
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index c61c0d6d53..c4c7891d58 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -15,13 +15,15 @@
  */
 package com.android.launcher3.allapps;
 
+import static com.android.launcher3.LauncherState.ALL_APPS;
 import static com.android.launcher3.LauncherState.ALL_APPS_CONTENT;
-import static com.android.launcher3.LauncherState.OVERVIEW;
-import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
+import static com.android.launcher3.anim.Interpolators.ACCEL_0_75;
+import static com.android.launcher3.anim.Interpolators.ACCEL_2;
+import static com.android.launcher3.anim.Interpolators.DEACCEL;
+import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_VERTICAL_PROGRESS;
 import static com.android.launcher3.util.SystemUiController.UI_STATE_ALLAPPS;
 
@@ -154,9 +156,9 @@ public class AllAppsTransitionController
             return;
         }
 
-        Interpolator interpolator = config.userControlled ? LINEAR : toState == OVERVIEW
-                ? config.getInterpolator(ANIM_OVERVIEW_SCALE, FAST_OUT_SLOW_IN)
-                : FAST_OUT_SLOW_IN;
+        Interpolator interpolator = toState.equals(ALL_APPS)
+                ? (config.userControlled ? ACCEL_2 : ACCEL_0_75) :
+                        (config.userControlled ? DEACCEL_2 : DEACCEL);
 
         Animator anim = createSpringAnimation(mProgress, targetProgress);
         anim.setInterpolator(config.getInterpolator(ANIM_VERTICAL_PROGRESS, interpolator));
-- 
GitLab


From 474c616e981c60bcfc05114b4823b9176178240d Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Mon, 3 May 2021 18:26:44 -0700
Subject: [PATCH 1063/1664] Adds AllSetActivity in Launcher.

Mostly copied from its location in Tips.

Some exceptions:
 - Accent color (used for the icon at the top and link text)
   is derived from intent extras to match the rest of SUW.
   If needed, we could also pass other colors this way;
   currently they just use default light/dark mode colors.
 - Currently there is no animation in the middle. Not sure
   if one is expected, but we can add it later if so.

Bug: 184722307
Test: Manually passing arbitrary colors via adb:
adb shell am start -a com.android.quickstep.action.GESTURE_ONBOARDING_ALL_SET --ei accent_color_dark_mode -2134901760 --ei accent_color_light_mode 2147418112

Change-Id: I1fb8b20b88b7485d28f06afd2b421999ad847266
---
 quickstep/AndroidManifest.xml                 |  32 +++-
 quickstep/res/drawable/ic_all_set.xml         |  24 +++
 quickstep/res/layout/activity_allset.xml      |  80 ++++++++++
 quickstep/res/values/attrs.xml                |  22 +++
 quickstep/res/values/dimens.xml               |   7 +
 quickstep/res/values/strings.xml              |   9 ++
 quickstep/res/values/styles.xml               |   7 +-
 .../quickstep/interaction/AllSetActivity.java | 133 ++++++++++++++++
 .../quickstep/interaction/AnnotationSpan.java | 143 ++++++++++++++++++
 9 files changed, 452 insertions(+), 5 deletions(-)
 create mode 100644 quickstep/res/drawable/ic_all_set.xml
 create mode 100644 quickstep/res/layout/activity_allset.xml
 create mode 100644 quickstep/res/values/attrs.xml
 create mode 100644 quickstep/src/com/android/quickstep/interaction/AllSetActivity.java
 create mode 100644 quickstep/src/com/android/quickstep/interaction/AnnotationSpan.java

diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml
index 842abc399f..7ab09c5ce9 100644
--- a/quickstep/AndroidManifest.xml
+++ b/quickstep/AndroidManifest.xml
@@ -103,16 +103,40 @@
              android:clearTaskOnLaunch="true"
              android:exported="false"/>
 
+        <!--
+        Activity for gesture nav onboarding.
+        It's protected by android.permission.REBOOT to ensure that only system apps can start it
+        (setup wizard already has this permission)
+        -->
         <activity android:name="com.android.quickstep.interaction.GestureSandboxActivity"
-             android:autoRemoveFromRecents="true"
-             android:excludeFromRecents="true"
-             android:screenOrientation="portrait"
-             android:exported="true">
+            android:autoRemoveFromRecents="true"
+            android:excludeFromRecents="true"
+            android:screenOrientation="portrait"
+            android:permission="android.permission.REBOOT"
+            android:exported="true">
             <intent-filter>
                 <action android:name="com.android.quickstep.action.GESTURE_SANDBOX"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
+
+        <!--
+        Activity following gesture nav onboarding.
+        It's protected by android.permission.REBOOT to ensure that only system apps can start it
+        (setup wizard already has this permission)
+        -->
+        <activity android:name="com.android.quickstep.interaction.AllSetActivity"
+            android:autoRemoveFromRecents="true"
+            android:excludeFromRecents="true"
+            android:screenOrientation="portrait"
+            android:permission="android.permission.REBOOT"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.android.quickstep.action.GESTURE_ONBOARDING_ALL_SET"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
         <activity
             android:name=".hybridhotseat.HotseatEduActivity"
             android:theme="@android:style/Theme.NoDisplay"
diff --git a/quickstep/res/drawable/ic_all_set.xml b/quickstep/res/drawable/ic_all_set.xml
new file mode 100644
index 0000000000..a6852aa78e
--- /dev/null
+++ b/quickstep/res/drawable/ic_all_set.xml
@@ -0,0 +1,24 @@
+<!--
+     Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="42dp"
+    android:height="40dp"
+    android:viewportWidth="42"
+    android:viewportHeight="40">
+    <path
+        android:pathData="M38,14H25.38L27.28,4.86L27.34,4.22C27.34,3.4 27,2.64 26.46,2.1L24.34,0C24.34,0 10.16,13.7 10,14H0V40H32C33.66,40 35.08,39 35.68,37.56L41.72,23.46C41.9,23 42,22.52 42,22V18C42,15.8 40.2,14 38,14ZM10,36H4V18H10V36ZM38,22L32,36H14V16L22.68,7.32L20,18H38V22Z"
+        android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/quickstep/res/layout/activity_allset.xml b/quickstep/res/layout/activity_allset.xml
new file mode 100644
index 0000000000..a6a17e5ebc
--- /dev/null
+++ b/quickstep/res/layout/activity_allset.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingStart="@dimen/allset_page_margin_horizontal"
+    android:paddingEnd="@dimen/allset_page_margin_horizontal"
+    android:layoutDirection="locale"
+    android:textDirection="locale"
+    android:background="?android:attr/colorBackground">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_gravity="start"
+        android:gravity="start"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/allset_title_icon_margin_top"
+            android:src="@drawable/ic_all_set"/>
+
+        <TextView
+            android:id="@+id/title"
+            style="@style/TextAppearance.GestureTutorial.Feedback.Title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/allset_title_margin_top"
+            android:gravity="start"
+            android:text="@string/allset_title"/>
+
+        <TextView
+            android:id="@+id/subtitle"
+            style="@style/TextAppearance.GestureTutorial.Feedback.Subtitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/allset_subtitle_margin_top"
+            android:gravity="start"
+            android:text="@string/allset_description"/>
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/navigation_settings"
+        style="@style/TextAppearance.GestureTutorial.Feedback.Subtitle"
+        android:textSize="14sp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/hint"
+        android:gravity="center_horizontal"
+        android:layout_marginBottom="72dp"/>
+
+    <TextView
+        android:id="@id/hint"
+        style="@style/TextAppearance.GestureTutorial.Feedback.Subtitle"
+        android:textSize="14sp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/allset_hint_margin_bottom"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:text="@string/allset_hint"/>
+</RelativeLayout>
diff --git a/quickstep/res/values/attrs.xml b/quickstep/res/values/attrs.xml
new file mode 100644
index 0000000000..336fb572d5
--- /dev/null
+++ b/quickstep/res/values/attrs.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <declare-styleable name="AllSetLinkSpan">
+        <attr name="android:textSize"/>
+        <attr name="android:fontFamily"/>
+    </declare-styleable>
+</resources>
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 9c0a083084..4f9b3ebe59 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -99,6 +99,13 @@
     <dimen name="gesture_tutorial_feedback_margin_start_end">24dp</dimen>
     <dimen name="gesture_tutorial_button_margin_start_end">18dp</dimen>
 
+    <!-- All Set page -->
+    <dimen name="allset_page_margin_horizontal">40dp</dimen>
+    <dimen name="allset_title_margin_top">28dp</dimen>
+    <dimen name="allset_title_icon_margin_top">80dp</dimen>
+    <dimen name="allset_hint_margin_bottom">52dp</dimen>
+    <dimen name="allset_subtitle_margin_top">24dp</dimen>
+
     <!-- All Apps Education tutorial -->
     <dimen name="swipe_edu_padding">8dp</dimen>
     <dimen name="swipe_edu_circle_size">64dp</dimen>
diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml
index a0f1638c8a..7ada496c40 100644
--- a/quickstep/res/values/strings.xml
+++ b/quickstep/res/values/strings.xml
@@ -177,6 +177,15 @@
     <!-- Feedback subtext displaying the current step and the total number of steps for the tutorial. [CHAR LIMIT=30] -->
     <string name="gesture_tutorial_step">Tutorial <xliff:g id="current">%1$d</xliff:g>/<xliff:g id="total">%2$d</xliff:g></string>
 
+    <!-- Title of "All Set" page [CHAR LIMIT=NONE] -->
+    <string name="allset_title">All set!</string>
+    <!-- Hint string at the bottom of "All Set" page [CHAR LIMIT=NONE] -->
+    <string name="allset_hint">Swipe up to go home</string>
+    <!-- Description of "All Set" page [CHAR LIMIT=NONE] -->
+    <string name="allset_description">You\u2019re ready to start using your phone</string>
+    <!-- String linking to navigation settings on "All Set" page [CHAR LIMIT=NONE] -->
+    <string name="allset_navigation_settings"><annotation id="link">Navigation settings for accessibility</annotation></string>
+
     <!-- ******* Overview ******* -->
     <!-- Label for a button that causes the current overview app to be shared. [CHAR_LIMIT=40] -->
     <string name="action_share">Share</string>
diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml
index 7c7d20a20a..0a8ecb8bde 100644
--- a/quickstep/res/values/styles.xml
+++ b/quickstep/res/values/styles.xml
@@ -59,7 +59,7 @@
         parent="TextAppearance.GestureTutorial">
         <item name="android:gravity">start</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:fontFamily">google-sans</item>
+        <item name="android:fontFamily">google-sans-text</item>
         <item name="android:letterSpacing">0.03</item>
         <item name="android:textSize">18sp</item>
         <item name="android:lineHeight">24sp</item>
@@ -99,6 +99,11 @@
         <item name="android:textColor">@color/gesture_tutorial_primary_color</item>
     </style>
 
+    <style name="TextAppearance.GestureTutorial.LinkText"
+        parent="TextAppearance.GestureTutorial.Feedback.Subtitle">
+        <item name="android:textSize">14sp</item>
+    </style>
+
     <!--
       Can be applied to views to color things like ripples and list highlights the workspace text
       color.
diff --git a/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java b/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java
new file mode 100644
index 0000000000..76f43c95cd
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.quickstep.interaction;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.content.res.TypedArray;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.text.TextPaint;
+import android.text.method.LinkMovementMethod;
+import android.util.Log;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.R;
+
+import java.net.URISyntaxException;
+
+/**
+ * A page shows after SUW flow to hint users to swipe up from the bottom of the screen to go home
+ * for the gestural system navigation.
+ */
+public class AllSetActivity extends Activity {
+
+    private static final String LOG_TAG = "AllSetActivity";
+    private static final String URI_SYSTEM_NAVIGATION_SETTING =
+            "#Intent;action=com.android.settings.SEARCH_RESULT_TRAMPOLINE;S.:settings:fragment_args_key=gesture_system_navigation_input_summary;S.:settings:show_fragment=com.android.settings.gestures.SystemNavigationGestureSettings;end";
+    private static final String EXTRA_ACCENT_COLOR_DARK_MODE = "accent_color_dark_mode";
+    private static final String EXTRA_ACCENT_COLOR_LIGHT_MODE = "accent_color_light_mode";
+
+    private int mAccentColor;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_allset);
+        setTitle(R.string.allset_title);
+
+        final int mode =
+                getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+        mAccentColor = getIntent().getIntExtra(
+                mode == Configuration.UI_MODE_NIGHT_YES
+                        ? EXTRA_ACCENT_COLOR_DARK_MODE : EXTRA_ACCENT_COLOR_LIGHT_MODE,
+                /* defValue= */ Color.BLACK);
+
+        ((ImageView) findViewById(R.id.icon)).getDrawable().mutate().setTint(mAccentColor);
+
+        TextView navigationSettings = findViewById(R.id.navigation_settings);
+        navigationSettings.setMovementMethod(LinkMovementMethod.getInstance());
+        AnnotationSpan.LinkInfo linkInfo = new AnnotationSpan.LinkInfo(
+                AnnotationSpan.LinkInfo.DEFAULT_ANNOTATION,
+                new AllSetLinkSpan(
+                        /* context= */ this,
+                        view -> {
+                            try {
+                                startActivityForResult(
+                                        Intent.parseUri(URI_SYSTEM_NAVIGATION_SETTING, 0), 0);
+                            } catch (URISyntaxException e) {
+                                Log.e(LOG_TAG, "Failed to parse system nav settings intent", e);
+                            }
+                            finish();
+                        }));
+        navigationSettings.setText(
+                AnnotationSpan.linkify(getText(R.string.allset_navigation_settings), linkInfo));
+    }
+
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        super.onWindowFocusChanged(hasFocus);
+        if (hasFocus) {
+            hideSystemUI();
+        }
+    }
+
+    private void hideSystemUI() {
+        getWindow().getDecorView().setSystemUiVisibility(
+                View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                        | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                        | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                        | View.SYSTEM_UI_FLAG_FULLSCREEN);
+        getWindow().setNavigationBarColor(Color.TRANSPARENT);
+    }
+
+    private final class AllSetLinkSpan extends AnnotationSpan {
+
+        private final String mFontFamily;
+        private final int mTextSize;
+
+        AllSetLinkSpan(Context context, View.OnClickListener listener) {
+            super(listener);
+            TypedArray typedArray =
+                    context.obtainStyledAttributes(R.style.TextAppearance_GestureTutorial_LinkText,
+                            R.styleable.AllSetLinkSpan);
+            mFontFamily = typedArray.getString(R.styleable.AllSetLinkSpan_android_fontFamily);
+            mTextSize =
+                    typedArray.getDimensionPixelSize(
+                            R.styleable.AllSetLinkSpan_android_textSize, /* defValue= */ -1);
+            typedArray.recycle();
+        }
+
+        @Override
+        public void updateDrawState(TextPaint ds) {
+            super.updateDrawState(ds);
+            ds.setColor(mAccentColor);
+            ds.setTypeface(Typeface.create(mFontFamily, Typeface.NORMAL));
+            ds.setUnderlineText(false);
+            if (mTextSize != -1) {
+                ds.setTextSize(mTextSize);
+            }
+        }
+    }
+
+}
diff --git a/quickstep/src/com/android/quickstep/interaction/AnnotationSpan.java b/quickstep/src/com/android/quickstep/interaction/AnnotationSpan.java
new file mode 100644
index 0000000000..fea5078e56
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/interaction/AnnotationSpan.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.quickstep.interaction;
+
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.text.Annotation;
+import android.text.SpannableString;
+import android.text.SpannableStringBuilder;
+import android.text.style.URLSpan;
+import android.util.Log;
+import android.view.View;
+
+import java.util.Arrays;
+import java.util.Comparator;
+
+/**
+ * This class is used to add {@link View.OnClickListener} for the text been wrapped by
+ * annotation.
+ *
+ * Copied from packages/apps/Settings/src/com/android/settings/utils/AnnotationSpan.java.
+ */
+public class AnnotationSpan extends URLSpan {
+
+    private final View.OnClickListener mClickListener;
+
+    AnnotationSpan(View.OnClickListener lsn) {
+        super((String) null);
+        mClickListener = lsn;
+    }
+
+    @Override
+    public void onClick(View widget) {
+        if (mClickListener != null) {
+            mClickListener.onClick(widget);
+        }
+    }
+
+    public static CharSequence linkify(CharSequence rawText, LinkInfo... linkInfos) {
+        SpannableString msg = new SpannableString(rawText);
+        Annotation[] spans = msg.getSpans(0, msg.length(), Annotation.class);
+        SpannableStringBuilder builder = new SpannableStringBuilder(msg);
+        for (Annotation annotation : spans) {
+            final String key = annotation.getValue();
+            int start = msg.getSpanStart(annotation);
+            int end = msg.getSpanEnd(annotation);
+            AnnotationSpan link = null;
+            for (LinkInfo linkInfo : linkInfos) {
+                if (linkInfo.mAnnotation.equals(key)) {
+                    link = linkInfo.mCustomizedSpan != null ? linkInfo.mCustomizedSpan
+                            : new AnnotationSpan(linkInfo.mClickListener);
+                    break;
+                }
+            }
+            if (link != null) {
+                builder.setSpan(link, start, end, msg.getSpanFlags(link));
+            }
+        }
+        return builder;
+    }
+
+    /**
+     * get the text part without having text for link part
+     */
+    public static CharSequence textWithoutLink(CharSequence encodedText) {
+        SpannableString msg = new SpannableString(encodedText);
+        Annotation[] spans = msg.getSpans(0, msg.length(), Annotation.class);
+        if (spans == null) {
+            return encodedText;
+        }
+        Arrays.sort(spans, Comparator.comparingInt(span -> -msg.getSpanStart(span)));
+        StringBuilder msgWithoutLink = new StringBuilder(msg.toString());
+        for (Annotation span : spans) {
+            msgWithoutLink.delete(msg.getSpanStart(span), msg.getSpanEnd(span));
+        }
+        return msgWithoutLink.toString();
+    }
+
+    /** Data class to store the annotation and the click action. */
+    public static class LinkInfo {
+        public static final String DEFAULT_ANNOTATION = "link";
+        private static final String TAG = "AnnotationSpan.LinkInfo";
+        private final String mAnnotation;
+        private final Boolean mActionable;
+        private final View.OnClickListener mClickListener;
+        private final AnnotationSpan mCustomizedSpan;
+
+        public LinkInfo(String annotation, View.OnClickListener listener) {
+            mAnnotation = annotation;
+            mClickListener = listener;
+            mActionable = true; // assume actionable
+            mCustomizedSpan = null;
+        }
+
+        public LinkInfo(String annotation, AnnotationSpan customizedSpan) {
+            mAnnotation = annotation;
+            mClickListener = null;
+            mActionable = customizedSpan != null;
+            mCustomizedSpan = customizedSpan;
+        }
+
+        public LinkInfo(Context context, String annotation, Intent intent) {
+            mAnnotation = annotation;
+            mCustomizedSpan = null;
+            if (intent != null) {
+                mActionable = context.getPackageManager().resolveActivity(intent, 0) != null;
+            } else {
+                mActionable = false;
+            }
+            if (mActionable) {
+                mClickListener =
+                        view -> {
+                            try {
+                                context.startActivity(intent);
+                            } catch (ActivityNotFoundException e) {
+                                Log.w(TAG, "Activity was not found for intent, " + intent);
+                            }
+                        };
+            } else {
+                mClickListener = null;
+            }
+        }
+
+        public boolean isActionable() {
+            return mActionable;
+        }
+    }
+}
-- 
GitLab


From 1419d40f388d85855ac4860a8aacb7190d3c4406 Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Tue, 4 May 2021 19:36:05 -0700
Subject: [PATCH 1064/1664] Set menu item to MATCH_PARENT for tap target

Fixes: 186922491
Test: portrait/landscape real and fake
Change-Id: If0247cf75b41374a489331d991a0c273aaf3efee
---
 src/com/android/launcher3/touch/PortraitPagedViewHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
index f6a6448602..9358c49d0f 100644
--- a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
+++ b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
@@ -277,7 +277,7 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
         } else {
             // Phone Portrait, LargeScreen Landscape/Portrait
             viewGroup.setOrientation(LinearLayout.HORIZONTAL);
-            lp.width = LinearLayout.LayoutParams.WRAP_CONTENT;
+            lp.width = LinearLayout.LayoutParams.MATCH_PARENT;
         }
 
         lp.height = LinearLayout.LayoutParams.WRAP_CONTENT;
-- 
GitLab


From 7497a874ee2c293791eb9f86b4217c41b2594abb Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Mon, 3 May 2021 00:54:31 -0700
Subject: [PATCH 1065/1664] Support live tile for 3rd party launchers

Fixes: 183725555
Test: tapl and manually install launcher3 with quickstep

Change-Id: Id7727c8d87db61de992e6341939c322da9ff5204
---
 .../quickstep/FallbackActivityInterface.java  |  4 +++-
 .../android/quickstep/RecentsActivity.java    | 22 +++++++++++++++++++
 .../quickstep/fallback/RecentsState.java      | 13 +++++++++--
 .../fallback/RecentsTaskController.java       |  5 ++++-
 .../util/NavigationModeFeatureFlag.java       | 10 +--------
 .../android/quickstep/views/RecentsView.java  |  3 ++-
 .../com/android/quickstep/views/TaskView.java |  1 +
 7 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
index 9fa65d93ff..3c81d1bb8a 100644
--- a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
@@ -163,7 +163,9 @@ public final class FallbackActivityInterface extends
 
     @Override
     public boolean isInLiveTileMode() {
-        return false;
+        RecentsActivity activity = getCreatedActivity();
+        return activity != null && activity.getStateManager().getState() == DEFAULT &&
+                activity.isStarted();
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index 3b92779553..eee02b9b46 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -25,6 +25,7 @@ import static com.android.launcher3.Utilities.createHomeIntent;
 import static com.android.launcher3.testing.TestProtocol.OVERVIEW_STATE_ORDINAL;
 import static com.android.quickstep.TaskUtils.taskIsATargetWithMode;
 import static com.android.quickstep.TaskViewUtils.createRecentsWindowAnimator;
+import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_CLOSING;
 
 import android.animation.Animator;
@@ -69,6 +70,7 @@ import com.android.quickstep.fallback.RecentsState;
 import com.android.quickstep.util.RecentsAtomicAnimationFactory;
 import com.android.quickstep.util.SplitSelectStateController;
 import com.android.quickstep.views.OverviewActionsView;
+import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.SplitPlaceholderView;
 import com.android.quickstep.views.TaskView;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
@@ -291,6 +293,16 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
         super.onConfigurationChanged(newConfig);
     }
 
+    @Override
+    public void onStateSetEnd(RecentsState state) {
+        super.onStateSetEnd(state);
+
+        if (state == RecentsState.DEFAULT) {
+            AccessibilityManagerCompat.sendStateEventToTest(getBaseContext(),
+                    OVERVIEW_STATE_ORDINAL);
+        }
+    }
+
     /**
      * Initialize/update the device profile.
      */
@@ -329,6 +341,16 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
     }
 
     public void startHome() {
+        if (LIVE_TILE.get()) {
+            RecentsView recentsView = getOverviewPanel();
+            recentsView.switchToScreenshot(() -> recentsView.finishRecentsAnimation(true,
+                    this::startHomeInternal));
+        } else {
+            startHomeInternal();
+        }
+    }
+
+    private void startHomeInternal() {
         startActivity(createHomeIntent());
     }
 
diff --git a/quickstep/src/com/android/quickstep/fallback/RecentsState.java b/quickstep/src/com/android/quickstep/fallback/RecentsState.java
index b3d6cfa3fd..96c0e48731 100644
--- a/quickstep/src/com/android/quickstep/fallback/RecentsState.java
+++ b/quickstep/src/com/android/quickstep/fallback/RecentsState.java
@@ -39,12 +39,14 @@ public class RecentsState implements BaseState<RecentsState> {
     private static final int FLAG_OVERVIEW_ACTIONS = BaseState.getFlag(3);
     private static final int FLAG_SHOW_AS_GRID = BaseState.getFlag(4);
     private static final int FLAG_SCRIM = BaseState.getFlag(5);
+    private static final int FLAG_LIVE_TILE = BaseState.getFlag(6);
 
     public static final RecentsState DEFAULT = new RecentsState(0,
-            FLAG_CLEAR_ALL_BUTTON | FLAG_OVERVIEW_ACTIONS | FLAG_SHOW_AS_GRID | FLAG_SCRIM);
+            FLAG_CLEAR_ALL_BUTTON | FLAG_OVERVIEW_ACTIONS | FLAG_SHOW_AS_GRID | FLAG_SCRIM
+                    | FLAG_LIVE_TILE);
     public static final RecentsState MODAL_TASK = new ModalState(1,
             FLAG_DISABLE_RESTORE | FLAG_CLEAR_ALL_BUTTON | FLAG_OVERVIEW_ACTIONS | FLAG_MODAL
-                    | FLAG_SHOW_AS_GRID | FLAG_SCRIM);
+                    | FLAG_SHOW_AS_GRID | FLAG_SCRIM | FLAG_LIVE_TILE);
     public static final RecentsState BACKGROUND_APP = new BackgroundAppState(2,
             FLAG_DISABLE_RESTORE | FLAG_NON_INTERACTIVE | FLAG_FULL_SCREEN);
     public static final RecentsState HOME = new RecentsState(3, 0);
@@ -107,6 +109,13 @@ public class RecentsState implements BaseState<RecentsState> {
         return hasFlag(FLAG_OVERVIEW_ACTIONS);
     }
 
+    /**
+     * For this state, whether live tile should be shown.
+     */
+    public boolean hasLiveTile() {
+        return hasFlag(FLAG_LIVE_TILE);
+    }
+
     /**
      * For this state, what color scrim should be drawn behind overview.
      */
diff --git a/quickstep/src/com/android/quickstep/fallback/RecentsTaskController.java b/quickstep/src/com/android/quickstep/fallback/RecentsTaskController.java
index d7458d2ad9..273d1f6768 100644
--- a/quickstep/src/com/android/quickstep/fallback/RecentsTaskController.java
+++ b/quickstep/src/com/android/quickstep/fallback/RecentsTaskController.java
@@ -15,6 +15,8 @@
  */
 package com.android.quickstep.fallback;
 
+import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
+
 import com.android.launcher3.uioverrides.touchcontrollers.TaskViewTouchController;
 import com.android.quickstep.RecentsActivity;
 
@@ -26,7 +28,8 @@ public class RecentsTaskController extends TaskViewTouchController<RecentsActivi
 
     @Override
     protected boolean isRecentsInteractive() {
-        return mActivity.hasWindowFocus();
+        return mActivity.hasWindowFocus() || (LIVE_TILE.get()
+                && mActivity.getStateManager().getState().hasLiveTile());
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/util/NavigationModeFeatureFlag.java b/quickstep/src/com/android/quickstep/util/NavigationModeFeatureFlag.java
index c527be3e2a..60c7add38f 100644
--- a/quickstep/src/com/android/quickstep/util/NavigationModeFeatureFlag.java
+++ b/quickstep/src/com/android/quickstep/util/NavigationModeFeatureFlag.java
@@ -20,8 +20,6 @@ import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TI
 
 import android.content.Context;
 
-import com.android.quickstep.OverviewComponentObserver;
-import com.android.quickstep.RecentsAnimationDeviceState;
 import com.android.quickstep.SysUINavigationMode;
 
 import java.util.function.Predicate;
@@ -37,7 +35,6 @@ public class NavigationModeFeatureFlag implements
     private final Supplier<Boolean> mBasePredicate;
     private final Predicate<SysUINavigationMode.Mode> mModePredicate;
     private boolean mSupported;
-    private OverviewComponentObserver mObserver;
 
     private NavigationModeFeatureFlag(Supplier<Boolean> basePredicate,
             Predicate<SysUINavigationMode.Mode> modePredicate) {
@@ -46,17 +43,12 @@ public class NavigationModeFeatureFlag implements
     }
 
     public boolean get() {
-        return mBasePredicate.get() && mSupported && mObserver != null
-                && mObserver.isHomeAndOverviewSame();
+        return mBasePredicate.get() && mSupported;
     }
 
     public void initialize(Context context) {
         onNavigationModeChanged(SysUINavigationMode.INSTANCE.get(context).getMode());
         SysUINavigationMode.INSTANCE.get(context).addModeChangeListener(this);
-
-        // Temporary solution to disable live tile for the fallback launcher
-        RecentsAnimationDeviceState rads = new RecentsAnimationDeviceState(context);
-        mObserver = new OverviewComponentObserver(context, rads);
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 53f880fbb3..fecf5b84ef 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2249,7 +2249,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         mPendingAnimation.addEndListener(new Consumer<Boolean>() {
             @Override
             public void accept(Boolean success) {
-                if (LIVE_TILE.get() && taskView.isRunningTask() && success) {
+                if (LIVE_TILE.get() && mEnableDrawingLiveTile && taskView.isRunningTask()
+                        && success) {
                     finishRecentsAnimation(true /* toHome */, () -> onEnd(success));
                 } else {
                     onEnd(success);
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 45bcdc314b..57d4a9da28 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -553,6 +553,7 @@ public class TaskView extends FrameLayout implements Reusable {
 
                 @Override
                 public void onAnimationEnd(Animator animator) {
+                    recentsView.getLiveTileTaskViewSimulator().setDrawsBelowRecents(true);
                     mIsClickableAsLiveTile = true;
                 }
             });
-- 
GitLab


From 90097d873d2cdbe083ae2647af070346c9c0a8c0 Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Tue, 4 May 2021 22:02:16 -0700
Subject: [PATCH 1066/1664] Fixes NPE in AbsSwipeUpHandler.

Fixes: 187243410
Test: Manual (not sure of exact repro steps, but I was hitting it
before installing - though reinstall itself may have fixed it).

Change-Id: I7510a675da9d2c1a484da8e00ca856f19445025c
---
 quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 61803aa13b..70557ded31 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1705,7 +1705,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         // No need to apply any transform if there is ongoing swipe-pip-to-home animator since
         // that animator handles the leash solely.
         if (mRecentsAnimationTargets != null && !mIsSwipingPipToHome) {
-            if (mRecentsViewScrollLinked) {
+            if (mRecentsViewScrollLinked && mRecentsView != null) {
                 mTaskViewSimulator.setScroll(mRecentsView.getScrollOffset());
             }
             mTaskViewSimulator.apply(mTransformParams);
-- 
GitLab


From ae4e31d3ae3400acc088e4ade46c46dbddfbb981 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 4 May 2021 22:02:38 -0700
Subject: [PATCH 1067/1664] Fix a couple of issues with quick switch from home
 to empty recents

- Add SKIP_SCRIM for mNonOverviewAnim, as the scrim  is already
  handled by mXOverviewAnim (this prevents some flickering).
- If RecentsView is empty, fade it in. This is less jarring than
  the "No recent items" appearing immediately without animation,
  and ensures it fades out seamlessly if you return home instead.

Test: Quick switch from home with no tasks and 1 task
Bug: 174228745
Change-Id: I57edc0cea4d1dfa40f87f7ccc5aa3d6b8929a1ff
---
 .../NoButtonQuickSwitchTouchController.java               | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
index 12de4a67f1..8278a5a660 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
@@ -36,11 +36,13 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_F
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_ALL_ANIMATIONS;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
+import static com.android.launcher3.states.StateAnimationConfig.SKIP_SCRIM;
 import static com.android.launcher3.touch.BothAxesSwipeDetector.DIRECTION_RIGHT;
 import static com.android.launcher3.touch.BothAxesSwipeDetector.DIRECTION_UP;
 import static com.android.launcher3.util.DisplayController.getSingleFrameMs;
 import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;
 import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET;
+import static com.android.quickstep.views.RecentsView.CONTENT_ALPHA;
 import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS;
 import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
 import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION;
@@ -207,7 +209,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
     /** Create state animation to control non-overview components. */
     private void updateNonOverviewAnim(LauncherState toState, StateAnimationConfig config) {
         config.duration = (long) (Math.max(mXRange, mYRange) * 2);
-        config.animFlags |= SKIP_OVERVIEW;
+        config.animFlags |= SKIP_OVERVIEW | SKIP_SCRIM;
         mNonOverviewAnim = mLauncher.getStateManager()
                 .createAnimationToNewWorkspace(toState, config);
         mNonOverviewAnim.getTarget().addListener(mClearStateOnCancelListener);
@@ -229,10 +231,14 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
         // As we drag right, animate the following properties:
         //   - RecentsView translationX
         //   - OverviewScrim
+        //   - RecentsView fade (if it's empty)
         PendingAnimation xAnim = new PendingAnimation((long) (mXRange * 2));
         xAnim.setFloat(mRecentsView, ADJACENT_PAGE_OFFSET, scaleAndOffset[1], LINEAR);
         xAnim.setViewBackgroundColor(mLauncher.getScrimView(),
                 toState.getWorkspaceScrimColor(mLauncher), LINEAR);
+        if (mRecentsView.getTaskViewCount() == 0) {
+            xAnim.addFloat(mRecentsView, CONTENT_ALPHA, 0f, 1f, LINEAR);
+        }
         mXOverviewAnim = xAnim.createPlaybackController();
         mXOverviewAnim.dispatchOnStart();
 
-- 
GitLab


From 67edf1654c2d5b4cba800065f75d6ac39ed8c53c Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Tue, 4 May 2021 22:29:33 -0700
Subject: [PATCH 1068/1664] Don't crash on dialer app target search results

Bug: 186412929
Test: manual
Change-Id: Ic1ab6e212d36ca1f711f51d047e4d62106bf0680
---
 .../android/launcher3/model/data/SearchActionItemInfo.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/com/android/launcher3/model/data/SearchActionItemInfo.java b/src/com/android/launcher3/model/data/SearchActionItemInfo.java
index b3057d5bd2..0eea92c691 100644
--- a/src/com/android/launcher3/model/data/SearchActionItemInfo.java
+++ b/src/com/android/launcher3/model/data/SearchActionItemInfo.java
@@ -94,6 +94,11 @@ public class SearchActionItemInfo extends ItemInfoWithIcon {
                     "SearchActionItemInfo can only have either an Intent or a PendingIntent");
         }
         mIntent = intent;
+        // bandage fix for just one week
+        if (intent != null && "com.android.server.telecom".equals(intent.getPackage())) {
+            intent.setAction(Intent.ACTION_DIAL);
+            intent.setPackage(null);
+        }
     }
 
     public PendingIntent getPendingIntent() {
-- 
GitLab


From e41034034f078583b9fffb4aeb776d93ae130b8a Mon Sep 17 00:00:00 2001
From: Cyrus Boadway <boadway@google.com>
Date: Wed, 5 May 2021 14:16:31 +0000
Subject: [PATCH 1069/1664] Fix FloatingWidgetView post-animation fallback
 background handling

The background drawables should only be restored to the original view if
the values are non-null. The original view may have had a background drawable
be a drawable, just not one that's elligible for animation. In that
case the local reference is null. We should not restore that.

Bug: 169042867
Test: manual
Change-Id: I54eaac5632e3f4f25daee2c36d7609e8b2ffedaf
---
 .../android/quickstep/views/FloatingWidgetBackgroundView.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/FloatingWidgetBackgroundView.java b/quickstep/src/com/android/quickstep/views/FloatingWidgetBackgroundView.java
index f74aa55cbd..9ea2369836 100644
--- a/quickstep/src/com/android/quickstep/views/FloatingWidgetBackgroundView.java
+++ b/quickstep/src/com/android/quickstep/views/FloatingWidgetBackgroundView.java
@@ -100,8 +100,8 @@ final class FloatingWidgetBackgroundView extends View {
     /** Restores the drawables to the source view. */
     void finish() {
         if (isUninitialized()) return;
-        mSourceView.setForeground(mOriginalForeground);
-        mSourceView.setBackground(mOriginalBackground);
+        if (mOriginalForeground != null) mSourceView.setForeground(mOriginalForeground);
+        if (mOriginalBackground != null) mSourceView.setBackground(mOriginalBackground);
     }
 
     void recycle() {
-- 
GitLab


From ac05cb134339a32c8ebf6f57412f0aac7481cc4f Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 5 May 2021 15:37:00 +0100
Subject: [PATCH 1070/1664] Fix class cast exception in a11y service for widget
 resize action

Test: Enable talkback. Then navigate to a widget. Trigger talkback
      menu > actions > move. Able to move a widget without crash.
Bug: 186999201
Change-Id: Ic6a66fefd643443e3d5a8839e6f2fe10c946dab2
---
 .../accessibility/LauncherAccessibilityDelegate.java      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
index a5852ba828..dbdfb2b663 100644
--- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
+++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
@@ -32,6 +32,7 @@ import com.android.launcher3.R;
 import com.android.launcher3.Workspace;
 import com.android.launcher3.dragndrop.DragController.DragListener;
 import com.android.launcher3.dragndrop.DragOptions;
+import com.android.launcher3.dragndrop.DragView;
 import com.android.launcher3.folder.Folder;
 import com.android.launcher3.keyboard.KeyboardDragAndDropView;
 import com.android.launcher3.model.data.AppInfo;
@@ -290,7 +291,12 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
             return actions;
         }
 
-        CellLayout layout = (CellLayout) host.getParent().getParent();
+        CellLayout layout;
+        if (host.getParent() instanceof DragView) {
+            layout = (CellLayout) ((DragView) host.getParent()).getContentViewParent().getParent();
+        } else {
+            layout = (CellLayout) host.getParent().getParent();
+        }
         if ((providerInfo.resizeMode & AppWidgetProviderInfo.RESIZE_HORIZONTAL) != 0) {
             if (layout.isRegionVacant(info.cellX + info.spanX, info.cellY, 1, info.spanY) ||
                     layout.isRegionVacant(info.cellX - 1, info.cellY, 1, info.spanY)) {
-- 
GitLab


From 91d26f0b5e65978ff03c0a0f87e4930e12eedd24 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 30 Apr 2021 10:36:36 -0700
Subject: [PATCH 1071/1664] Some 3P launcher transition fixes

Bug: 182494821
Test: Manual
Change-Id: Ia003b50493dce24a439fc735c990ee470975f68f
---
 .../android/quickstep/AbsSwipeUpHandler.java  | 14 ++++----
 .../android/quickstep/RecentsActivity.java    | 34 ++++++++++++++++++-
 .../fallback/FallbackRecentsView.java         | 16 ++++++---
 .../quickstep/fallback/RecentsState.java      | 12 +++++++
 .../android/quickstep/views/RecentsView.java  | 13 +++++--
 5 files changed, 74 insertions(+), 15 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index ecaac94565..54adde29ae 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -47,7 +47,6 @@ import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;
 import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 import static com.android.quickstep.util.SwipePipToHomeAnimator.FRACTION_END;
 import static com.android.quickstep.util.SwipePipToHomeAnimator.FRACTION_START;
-import static com.android.quickstep.views.RecentsView.RECENTS_GRID_PROGRESS;
 import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME;
@@ -55,7 +54,6 @@ import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.ACT
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.annotation.TargetApi;
 import android.app.ActivityManager;
@@ -464,8 +462,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                     mDeviceState.getRotationTouchHelper()
                             .onEndTargetCalculated(mGestureState.getEndTarget(),
                                     mActivityInterface);
-
-                    mRecentsView.onGestureEndTargetCalculated(mGestureState.getEndTarget());
                 });
 
         notifyGestureStartedAsync();
@@ -1133,6 +1129,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
             }
             homeAnimFactory.playAtomicAnimation(velocityPxPerMs.y);
             mLauncherTransitionController = null;
+
+            if (mRecentsView != null) {
+                mRecentsView.onPrepareGestureEndAnimation(null, mGestureState.getEndTarget());
+            }
         } else {
             AnimatorSet animatorSet = new AnimatorSet();
             ValueAnimator windowAnim = mCurrentShift.animateToValue(start, end);
@@ -1171,9 +1171,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                 }
             });
             animatorSet.play(windowAnim);
-            S state = mActivityInterface.stateFromGestureEndTarget(mGestureState.getEndTarget());
-            if (mRecentsView != null && state.displayOverviewTasksAsGrid(mDp)) {
-                animatorSet.play(ObjectAnimator.ofFloat(mRecentsView, RECENTS_GRID_PROGRESS, 1));
+            if (mRecentsView != null) {
+                mRecentsView.onPrepareGestureEndAnimation(
+                        animatorSet, mGestureState.getEndTarget());
             }
             animatorSet.setDuration(duration).setInterpolator(interpolator);
             animatorSet.start();
diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index eee02b9b46..0e9e3ad029 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -22,11 +22,13 @@ import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DU
 import static com.android.launcher3.QuickstepTransitionManager.STATUS_BAR_TRANSITION_DURATION;
 import static com.android.launcher3.QuickstepTransitionManager.STATUS_BAR_TRANSITION_PRE_DELAY;
 import static com.android.launcher3.Utilities.createHomeIntent;
+import static com.android.launcher3.graphics.SysUiScrim.SYSUI_PROGRESS;
 import static com.android.launcher3.testing.TestProtocol.OVERVIEW_STATE_ORDINAL;
 import static com.android.quickstep.TaskUtils.taskIsATargetWithMode;
 import static com.android.quickstep.TaskViewUtils.createRecentsWindowAnimator;
 import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_CLOSING;
+import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_OPENING;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -36,6 +38,7 @@ import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.view.SurfaceControl.Transaction;
 import android.view.View;
 
 import androidx.annotation.Nullable;
@@ -48,6 +51,7 @@ import com.android.launcher3.LauncherAnimationRunner.AnimationResult;
 import com.android.launcher3.R;
 import com.android.launcher3.WrappedAnimationRunnerImpl;
 import com.android.launcher3.WrappedLauncherAnimationRunner;
+import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.compat.AccessibilityManagerCompat;
@@ -92,6 +96,8 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
 
     private Handler mUiHandler = new Handler(Looper.getMainLooper());
 
+    private static final long HOME_APPEAR_DURATION = 250;
+
     private RecentsDragLayer mDragLayer;
     private ScrimView mScrimView;
     private FallbackRecentsView mFallbackRecentsView;
@@ -114,6 +120,7 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
         mScrimView = findViewById(R.id.scrim_view);
         mFallbackRecentsView = findViewById(R.id.overview_panel);
         mActionsView = findViewById(R.id.overview_actions_view);
+        SYSUI_PROGRESS.set(getRootView().getSysUiScrim(), 0f);
 
         SplitPlaceholderView splitPlaceholderView = findViewById(R.id.split_placeholder);
         splitPlaceholderView.init(
@@ -351,7 +358,32 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
     }
 
     private void startHomeInternal() {
-        startActivity(createHomeIntent());
+        WrappedLauncherAnimationRunner runner = new WrappedLauncherAnimationRunner(
+                getMainThreadHandler(), this::onCreateAnimationToHome, true);
+        RemoteAnimationAdapterCompat adapterCompat =
+                new RemoteAnimationAdapterCompat(runner, HOME_APPEAR_DURATION, 0);
+        startActivity(createHomeIntent(),
+                ActivityOptionsCompat.makeRemoteAnimation(adapterCompat).toBundle());
+    }
+
+    private void onCreateAnimationToHome(
+            int transit, RemoteAnimationTargetCompat[] appTargets,
+            RemoteAnimationTargetCompat[] wallpaperTargets,
+            RemoteAnimationTargetCompat[] nonAppTargets, AnimationResult result) {
+        AnimatorPlaybackController controller = getStateManager()
+                .createAnimationToNewWorkspace(RecentsState.BG_LAUNCHER, HOME_APPEAR_DURATION);
+        controller.dispatchOnStart();
+
+        RemoteAnimationTargets targets = new RemoteAnimationTargets(
+                appTargets, wallpaperTargets, nonAppTargets, MODE_OPENING);
+        for (RemoteAnimationTargetCompat app : targets.apps) {
+            new Transaction().setAlpha(app.leash.getSurfaceControl(), 1).apply();
+        }
+        AnimatorSet anim = new AnimatorSet();
+        anim.play(controller.getAnimationPlayer());
+        anim.setDuration(HOME_APPEAR_DURATION);
+        result.setAnimation(anim, this,
+                () -> getStateManager().goToState(RecentsState.HOME, false));
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
index 4d4b6e1467..1bb8e96aa9 100644
--- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
+++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
@@ -20,6 +20,7 @@ import static com.android.quickstep.fallback.RecentsState.DEFAULT;
 import static com.android.quickstep.fallback.RecentsState.HOME;
 import static com.android.quickstep.fallback.RecentsState.MODAL_TASK;
 
+import android.animation.AnimatorSet;
 import android.annotation.TargetApi;
 import android.app.ActivityManager.RunningTaskInfo;
 import android.content.Context;
@@ -27,6 +28,9 @@ import android.os.Build;
 import android.util.AttributeSet;
 import android.util.Log;
 
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.statemanager.StateManager.StateListener;
 import com.android.launcher3.testing.TestProtocol;
@@ -67,7 +71,6 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity, RecentsSta
     @Override
     public void startHome() {
         mActivity.startHome();
-        mActivity.getStateManager().goToState(RecentsState.HOME);
     }
 
     /**
@@ -86,14 +89,17 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity, RecentsSta
      * to the center.
      */
     @Override
-    public void onGestureEndTargetCalculated(GestureState.GestureEndTarget endTarget) {
-        super.onGestureEndTargetCalculated(endTarget);
-        if (mHomeTaskInfo != null && endTarget == RECENTS) {
+    public void onPrepareGestureEndAnimation(
+            @Nullable AnimatorSet animatorSet, GestureState.GestureEndTarget endTarget) {
+        super.onPrepareGestureEndAnimation(animatorSet, endTarget);
+        if (mHomeTaskInfo != null && endTarget == RECENTS && animatorSet != null) {
             TaskView tv = getTaskView(mHomeTaskInfo.taskId);
             if (tv != null) {
                 PendingAnimation pa = createTaskDismissAnimation(tv, true, false, 150);
                 pa.addEndListener(e -> setCurrentTask(-1));
-                runDismissAnimation(pa);
+                AnimatorPlaybackController controller = pa.createPlaybackController();
+                controller.dispatchOnStart();
+                animatorSet.play(controller.getAnimationPlayer());
             }
         }
     }
diff --git a/quickstep/src/com/android/quickstep/fallback/RecentsState.java b/quickstep/src/com/android/quickstep/fallback/RecentsState.java
index 96c0e48731..b6cfdce65a 100644
--- a/quickstep/src/com/android/quickstep/fallback/RecentsState.java
+++ b/quickstep/src/com/android/quickstep/fallback/RecentsState.java
@@ -50,6 +50,7 @@ public class RecentsState implements BaseState<RecentsState> {
     public static final RecentsState BACKGROUND_APP = new BackgroundAppState(2,
             FLAG_DISABLE_RESTORE | FLAG_NON_INTERACTIVE | FLAG_FULL_SCREEN);
     public static final RecentsState HOME = new RecentsState(3, 0);
+    public static final RecentsState BG_LAUNCHER = new LauncherState(4, 0);
 
     public final int ordinal;
     private final int mFlags;
@@ -161,4 +162,15 @@ public class RecentsState implements BaseState<RecentsState> {
             return getOverviewScaleAndOffsetForBackgroundState(activity);
         }
     }
+
+    private static class LauncherState extends RecentsState {
+        LauncherState(int id, int flags) {
+            super(id, flags);
+        }
+
+        @Override
+        public float[] getOverviewScaleAndOffset(RecentsActivity activity) {
+            return new float[] { NO_SCALE, 1 };
+        }
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 3c59441c66..9797afd32b 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1631,7 +1631,16 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     /**
      * Called when a gesture from an app has finished, and an end target has been determined.
      */
-    public void onGestureEndTargetCalculated(GestureState.GestureEndTarget endTarget) {
+    public void onPrepareGestureEndAnimation(
+            @Nullable AnimatorSet animatorSet, GestureState.GestureEndTarget endTarget) {
+        if (mSizeStrategy.stateFromGestureEndTarget(endTarget)
+                .displayOverviewTasksAsGrid(mActivity.getDeviceProfile())) {
+            if (animatorSet == null) {
+                setGridProgress(1);
+            } else {
+                animatorSet.play(ObjectAnimator.ofFloat(this, RECENTS_GRID_PROGRESS, 1));
+            }
+        }
         mCurrentGestureEndTarget = endTarget;
         if (endTarget == GestureState.GestureEndTarget.NEW_TASK
                 || endTarget == GestureState.GestureEndTarget.LAST_TASK) {
@@ -2348,7 +2357,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         return true;
     }
 
-    protected void runDismissAnimation(PendingAnimation pendingAnim) {
+    private void runDismissAnimation(PendingAnimation pendingAnim) {
         AnimatorPlaybackController controller = pendingAnim.createPlaybackController();
         controller.dispatchOnStart();
         controller.getAnimationPlayer().setInterpolator(FAST_OUT_SLOW_IN);
-- 
GitLab


From f5c9900686d280669bc16c0bd81c7cc4c7b3094d Mon Sep 17 00:00:00 2001
From: Cyrus Boadway <boadway@google.com>
Date: Wed, 5 May 2021 13:21:54 +0000
Subject: [PATCH 1072/1664] Add OnGlobalLayout listener to WidgetFloatingView

This mirrors the FloatingIconView implementation.

Bug: 169042867
Test: manual
Change-Id: Ic5531dd847af66b9b17f6806dc7fc04c00c42f06
---
 .../quickstep/LauncherSwipeHandlerV2.java     |  1 +
 .../quickstep/views/FloatingWidgetView.java   | 32 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
index 9398277032..46cd8a2cf9 100644
--- a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
+++ b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
@@ -260,6 +260,7 @@ public class LauncherSwipeHandlerV2 extends
             @Override
             public void setAnimation(RectFSpringAnim anim) {
                 anim.addAnimatorListener(floatingWidgetView);
+                floatingWidgetView.setOnTargetChangeListener(anim::onTargetPositionChanged);
                 floatingWidgetView.setFastFinishRunnable(anim::end);
             }
 
diff --git a/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java b/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java
index 8499902f23..ed54f1007e 100644
--- a/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java
+++ b/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java
@@ -27,6 +27,7 @@ import android.util.Size;
 import android.view.GhostView;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewTreeObserver.OnGlobalLayoutListener;
 import android.widget.FrameLayout;
 
 import com.android.launcher3.Launcher;
@@ -39,7 +40,8 @@ import com.android.launcher3.widget.RoundedCornerEnforcement;
 
 /** A view that mimics an App Widget through a launch animation. */
 @TargetApi(Build.VERSION_CODES.S)
-public class FloatingWidgetView extends FrameLayout implements AnimatorListener {
+public class FloatingWidgetView extends FrameLayout implements AnimatorListener,
+        OnGlobalLayoutListener {
     private static final Matrix sTmpMatrix = new Matrix();
 
     private final Launcher mLauncher;
@@ -54,6 +56,7 @@ public class FloatingWidgetView extends FrameLayout implements AnimatorListener
 
     private Runnable mEndRunnable;
     private Runnable mFastFinishRunnable;
+    private Runnable mOnTargetChangeRunnable;
 
     public FloatingWidgetView(Context context) {
         this(context, null);
@@ -93,6 +96,32 @@ public class FloatingWidgetView extends FrameLayout implements AnimatorListener
     public void onAnimationRepeat(Animator animator) {
     }
 
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        getViewTreeObserver().addOnGlobalLayoutListener(this);
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        getViewTreeObserver().removeOnGlobalLayoutListener(this);
+        super.onDetachedFromWindow();
+    }
+
+    @Override
+    public void onGlobalLayout() {
+        if (isUninitialized()) return;
+        positionViews();
+        if (mOnTargetChangeRunnable != null) {
+            mOnTargetChangeRunnable.run();
+        }
+    }
+
+    /** Sets a runnable that is called on global layout change. */
+    public void setOnTargetChangeListener(Runnable onTargetChangeListener) {
+        mOnTargetChangeRunnable = onTargetChangeListener;
+    }
+
     /** Sets a runnable that is called after a call to {@link #fastFinish()}. */
     public void setFastFinishRunnable(Runnable runnable) {
         mFastFinishRunnable = runnable;
@@ -205,6 +234,7 @@ public class FloatingWidgetView extends FrameLayout implements AnimatorListener
     private void recycle() {
         mEndRunnable = null;
         mFastFinishRunnable = null;
+        mOnTargetChangeRunnable = null;
         mBackgroundPosition = null;
         mListenerView.setListener(null);
         mAppWidgetView = null;
-- 
GitLab


From aee533986902f48853d00e9fee7cf2e5c33749ab Mon Sep 17 00:00:00 2001
From: Cyrus Boadway <boadway@google.com>
Date: Wed, 5 May 2021 13:56:39 +0000
Subject: [PATCH 1073/1664] Enable Quickstep widget launch and return
 animations

Turn on new widget animations by default.

Bug: 169042867
Test: manual
Change-Id: Ie35660c798731f5e3d341c8135adb8e2a7683eed
---
 src/com/android/launcher3/config/FeatureFlags.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 3b88a0b2af..a093e047d2 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -88,7 +88,7 @@ public final class FeatureFlags {
             "ENABLE_QUICKSTEP_LIVE_TILE", true, "Enable live tile in Quickstep overview");
 
     public static final BooleanFlag ENABLE_QUICKSTEP_WIDGET_APP_START = getDebugFlag(
-            "ENABLE_QUICKSTEP_WIDGET_APP_START", false,
+            "ENABLE_QUICKSTEP_WIDGET_APP_START", true,
             "Enable Quickstep animation when launching activities from an app widget");
 
     // Keep as DeviceFlag to allow remote disable in emergency.
-- 
GitLab


From 2dbdddb4bad483d2eb98b5582861c6b8a7817800 Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Thu, 29 Apr 2021 18:37:48 -0700
Subject: [PATCH 1074/1664] Add funtional animation for SplitSelect from Grid.

Long ways to go to final UI - TODO(b/186800707)
Add comments to grid layout code,
no functional changes at all.

Bug: 181705607
Test: Enter split screen from overview task menu
in grid and carousel. Able to select all items
and enter split.

Change-Id: Ib62f1b286acf0781ec47862fa31b670e6ff1892a
---
 quickstep/res/layout/overview_panel.xml       |  13 +-
 .../BaseRecentsViewStateController.java       |  10 +-
 .../util/SplitSelectStateController.java      |  11 +-
 .../quickstep/views/LauncherRecentsView.java  |   4 +-
 .../android/quickstep/views/RecentsView.java  | 193 ++++++++++++------
 .../com/android/quickstep/views/TaskView.java |  58 +++++-
 .../touch/LandscapePagedViewHandler.java      |  13 ++
 .../touch/PagedOrientationHandler.java        |  11 +
 .../touch/PortraitPagedViewHandler.java       |  19 ++
 9 files changed, 256 insertions(+), 76 deletions(-)

diff --git a/quickstep/res/layout/overview_panel.xml b/quickstep/res/layout/overview_panel.xml
index d7bcd9e932..f303f31199 100644
--- a/quickstep/res/layout/overview_panel.xml
+++ b/quickstep/res/layout/overview_panel.xml
@@ -15,12 +15,6 @@
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <com.android.quickstep.views.SplitPlaceholderView
-        android:id="@+id/split_placeholder"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/split_placeholder_size"
-        android:background="@android:color/darker_gray"
-        android:visibility="gone" />
 
     <com.android.quickstep.views.LauncherRecentsView
         android:id="@+id/overview_panel"
@@ -31,6 +25,13 @@
         android:clipToPadding="false"
         android:visibility="invisible" />
 
+    <com.android.quickstep.views.SplitPlaceholderView
+        android:id="@+id/split_placeholder"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/split_placeholder_size"
+        android:background="@android:color/darker_gray"
+        android:visibility="gone" />
+
     <include
         android:id="@+id/overview_actions_view"
         layout="@layout/overview_actions_container" />
diff --git a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
index 01616d45ec..b3374f33b9 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
@@ -22,12 +22,12 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FA
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_MODAL;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
 import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET;
 import static com.android.quickstep.views.RecentsView.RECENTS_GRID_PROGRESS;
 import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
-import static com.android.quickstep.views.RecentsView.TASK_PRIMARY_TRANSLATION;
+import static com.android.quickstep.views.RecentsView.TASK_PRIMARY_SPLIT_TRANSLATION;
+import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_SPLIT_TRANSLATION;
 import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION;
 
 import android.util.FloatProperty;
@@ -97,10 +97,10 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView>
         PagedOrientationHandler orientationHandler =
                 ((RecentsView) mLauncher.getOverviewPanel()).getPagedOrientationHandler();
         FloatProperty taskViewsFloat = orientationHandler.getSplitSelectTaskOffset(
-                TASK_PRIMARY_TRANSLATION, TASK_SECONDARY_TRANSLATION, mLauncher.getDeviceProfile());
+                TASK_PRIMARY_SPLIT_TRANSLATION, TASK_SECONDARY_SPLIT_TRANSLATION,
+                mLauncher.getDeviceProfile());
         setter.setFloat(mRecentsView, taskViewsFloat,
-                toState.getOverviewSecondaryTranslation(mLauncher),
-                config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, LINEAR));
+                toState.getOverviewSecondaryTranslation(mLauncher), LINEAR);
 
         setter.setFloat(mRecentsView, getContentAlphaProperty(), toState.overviewUi ? 1 : 0,
                 config.getInterpolator(ANIM_OVERVIEW_FADE, AGGRESSIVE_EASE_IN_OUT));
diff --git a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
index 01d51f82cb..3d33e57a36 100644
--- a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
+++ b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
@@ -25,6 +25,7 @@ import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITIO
 import android.animation.AnimatorSet;
 import android.app.ActivityOptions;
 import android.content.res.Resources;
+import android.graphics.Rect;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
@@ -64,6 +65,7 @@ public class SplitSelectStateController {
     private final SystemUiProxy mSystemUiProxy;
     private TaskView mInitialTaskView;
     private SplitPositionOption mInitialPosition;
+    private Rect mInitialBounds;
     private final Handler mHandler;
 
     public SplitSelectStateController(Handler handler, SystemUiProxy systemUiProxy) {
@@ -74,9 +76,11 @@ public class SplitSelectStateController {
     /**
      * To be called after first task selected
      */
-    public void setInitialTaskSelect(TaskView taskView, SplitPositionOption positionOption) {
+    public void setInitialTaskSelect(TaskView taskView, SplitPositionOption positionOption,
+            Rect initialBounds) {
         mInitialTaskView = taskView;
         mInitialPosition = positionOption;
+        mInitialBounds = initialBounds;
     }
 
     /**
@@ -220,9 +224,14 @@ public class SplitSelectStateController {
     public void resetState() {
         mInitialTaskView = null;
         mInitialPosition = null;
+        mInitialBounds = null;
     }
 
     public boolean isSplitSelectActive() {
         return mInitialTaskView != null;
     }
+
+    public Rect getInitialBounds() {
+        return mInitialBounds;
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
index f5a8ff8170..2c5f66170b 100644
--- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
@@ -245,8 +245,8 @@ public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher, Laun
         if (mActivity.isInState(OVERVIEW_SPLIT_SELECT)) {
             // We want to keep the tasks translations in this temporary state
             // after resetting the rest above
-            setTaskViewsResistanceTranslation(mTaskViewsSecondaryTranslation);
-            setTaskViewsPrimaryTranslation(mTaskViewsPrimaryTranslation);
+            setTaskViewsPrimarySplitTranslation(mTaskViewsPrimarySplitTranslation);
+            setTaskViewsSecondarySplitTranslation(mTaskViewsSecondarySplitTranslation);
         }
     }
 
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 53f880fbb3..206f71b1df 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -254,16 +254,29 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
      * more specific, we'd want to create a similar FloatProperty just for a TaskView's
      * offsetX/Y property
      */
-    public static final FloatProperty<RecentsView> TASK_PRIMARY_TRANSLATION =
-            new FloatProperty<RecentsView>("taskPrimaryTranslation") {
+    public static final FloatProperty<RecentsView> TASK_PRIMARY_SPLIT_TRANSLATION =
+            new FloatProperty<RecentsView>("taskPrimarySplitTranslation") {
                 @Override
                 public void setValue(RecentsView recentsView, float v) {
-                    recentsView.setTaskViewsPrimaryTranslation(v);
+                    recentsView.setTaskViewsPrimarySplitTranslation(v);
                 }
 
                 @Override
                 public Float get(RecentsView recentsView) {
-                    return recentsView.mTaskViewsPrimaryTranslation;
+                    return recentsView.mTaskViewsPrimarySplitTranslation;
+                }
+            };
+
+    public static final FloatProperty<RecentsView> TASK_SECONDARY_SPLIT_TRANSLATION =
+            new FloatProperty<RecentsView>("taskSecondarySplitTranslation") {
+                @Override
+                public void setValue(RecentsView recentsView, float v) {
+                    recentsView.setTaskViewsSecondarySplitTranslation(v);
+                }
+
+                @Override
+                public Float get(RecentsView recentsView) {
+                    return recentsView.mTaskViewsSecondarySplitTranslation;
                 }
             };
 
@@ -279,7 +292,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                     view.mLiveTileTaskViewSimulator.recentsViewScale.value = scale;
                     view.updatePageOffsets();
                     view.setTaskViewsResistanceTranslation(view.mTaskViewsSecondaryTranslation);
-                    view.setTaskViewsPrimaryTranslation(view.mTaskViewsPrimaryTranslation);
                 }
 
                 @Override
@@ -363,7 +375,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
 
     private float mAdjacentPageOffset = 0;
     protected float mTaskViewsSecondaryTranslation = 0;
-    protected float mTaskViewsPrimaryTranslation = 0;
+    protected float mTaskViewsPrimarySplitTranslation = 0;
+    protected float mTaskViewsSecondarySplitTranslation = 0;
     // Progress from 0 to 1 where 0 is a carousel and 1 is a 2 row grid.
     private float mGridProgress = 0;
     private final IntSet mTopRowIdSet = new IntSet();
@@ -1839,15 +1852,28 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         final int boxLength = Math.max(mLastComputedGridTaskSize.width(),
                 mLastComputedGridTaskSize.height());
         int taskTopMargin = mActivity.getDeviceProfile().overviewTaskThumbnailTopMarginPx;
-        float heightOffset = (boxLength + taskTopMargin) + mRowSpacing;
-        float taskGridVerticalDiff = mLastComputedGridTaskSize.top - mLastComputedTaskSize.top;
+
+        /*
+         * taskGridVerticalDiff is used to position the top of a task in the top row of the grid
+         * heightOffset is the vertical space one grid task takes + space between top and
+         *   bottom row
+         * Summed together they provide the top position for bottom row of grid tasks
+         */
+        final float taskGridVerticalDiff =
+                mLastComputedGridTaskSize.top - mLastComputedTaskSize.top;
+        final float heightOffset = (boxLength + taskTopMargin) + mRowSpacing;
 
         int topRowWidth = 0;
         int bottomRowWidth = 0;
         float topAccumulatedTranslationX = 0;
         float bottomAccumulatedTranslationX = 0;
+
+        // Contains whether the child index is in top or bottom of grid (for non-focused task)
+        // Different from mTopRowIdSet, which contains the taskId of what task is in top row
         IntSet topSet = new IntSet();
         IntSet bottomSet = new IntSet();
+
+        // Horizontal grid translation for each task
         float[] gridTranslations = new float[taskCount];
 
         int focusedTaskIndex = Integer.MAX_VALUE;
@@ -1901,7 +1927,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 boolean isTopRow = isTaskDismissal ? mTopRowIdSet.contains(taskId)
                         : topRowWidth <= bottomRowWidth;
                 if (isTopRow) {
-                    gridTranslations[i] += topAccumulatedTranslationX;
                     topRowWidth += taskWidthAndSpacing;
                     topSet.add(i);
                     mTopRowIdSet.add(taskId);
@@ -1917,11 +1942,10 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                         widthOffset += getTaskViewAt(j).getLayoutParams().width + mPageSpacing;
                     }
 
-                    float gridTranslationX = mIsRtl ? widthOffset : -widthOffset;
-                    gridTranslations[i] += gridTranslationX;
-                    topAccumulatedTranslationX += gridTranslationX;
+                    float currentTaskTranslationX = mIsRtl ? widthOffset : -widthOffset;
+                    gridTranslations[i] += topAccumulatedTranslationX + currentTaskTranslationX;
+                    topAccumulatedTranslationX += currentTaskTranslationX;
                 } else {
-                    gridTranslations[i] += bottomAccumulatedTranslationX;
                     bottomRowWidth += taskWidthAndSpacing;
                     bottomSet.add(i);
 
@@ -1937,9 +1961,9 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                         widthOffset += getTaskViewAt(j).getLayoutParams().width + mPageSpacing;
                     }
 
-                    float gridTranslationX = mIsRtl ? widthOffset : -widthOffset;
-                    gridTranslations[i] += gridTranslationX;
-                    bottomAccumulatedTranslationX += gridTranslationX;
+                    float currentTaskTranslationX = mIsRtl ? widthOffset : -widthOffset;
+                    gridTranslations[i] += bottomAccumulatedTranslationX + currentTaskTranslationX;
+                    bottomAccumulatedTranslationX += currentTaskTranslationX;
                 }
                 if (taskView == snappedTaskView) {
                     snappedTaskRowWidth = isTopRow ? topRowWidth : bottomRowWidth;
@@ -2130,18 +2154,43 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         // Use setFloat instead of setViewAlpha as we want to keep the view visible even when it's
         // alpha is set to 0 so that it can be recycled in the view pool properly
         anim.setFloat(taskView, VIEW_ALPHA, 0, ACCEL_2);
-        FloatProperty<TaskView> secondaryViewTranslate =
-                taskView.getSecondaryDissmissTranslationProperty();
-        int secondaryTaskDimension = mOrientationHandler.getSecondaryDimension(taskView);
-        int verticalFactor = mOrientationHandler.getSecondaryTranslationDirectionFactor();
+        SplitSelectStateController splitController = mSplitPlaceholderView.getSplitController();
 
         ResourceProvider rp = DynamicResource.provider(mActivity);
         SpringProperty sp = new SpringProperty(SpringProperty.FLAG_CAN_SPRING_ON_START)
                 .setDampingRatio(rp.getFloat(R.dimen.dismiss_task_trans_y_damping_ratio))
                 .setStiffness(rp.getFloat(R.dimen.dismiss_task_trans_y_stiffness));
+        FloatProperty<TaskView> dismissingTaskViewTranslate =
+                taskView.getSecondaryDissmissTranslationProperty();;
+        // TODO(b/186800707) translate entire grid size distance
+        int translateDistance = mOrientationHandler.getSecondaryDimension(taskView);
+        int positiveNegativeFactor = mOrientationHandler.getSecondaryTranslationDirectionFactor();
+        if (splitController.isSplitSelectActive()) {
+            // Have the task translate towards whatever side was just pinned
+            int dir = mOrientationHandler.getSplitTaskViewDismissDirection(splitController
+                    .getActiveSplitPositionOption(), mActivity.getDeviceProfile());
+            switch (dir) {
+                case PagedOrientationHandler.SPLIT_TRANSLATE_SECONDARY_NEGATIVE:
+                    dismissingTaskViewTranslate = taskView
+                            .getSecondaryDissmissTranslationProperty();
+                    positiveNegativeFactor = -1;
+                    break;
 
-        anim.add(ObjectAnimator.ofFloat(taskView, secondaryViewTranslate,
-                verticalFactor * secondaryTaskDimension).setDuration(duration), LINEAR, sp);
+                case PagedOrientationHandler.SPLIT_TRANSLATE_PRIMARY_POSITIVE:
+                    dismissingTaskViewTranslate = taskView.getPrimaryDismissTranslationProperty();
+                    positiveNegativeFactor = 1;
+                    break;
+
+                case PagedOrientationHandler.SPLIT_TRANSLATE_PRIMARY_NEGATIVE:
+                    dismissingTaskViewTranslate = taskView.getPrimaryDismissTranslationProperty();
+                    positiveNegativeFactor = -1;
+                    break;
+                default:
+                    throw new IllegalStateException("Invalid split task translation: " + dir);
+            }
+        }
+        anim.add(ObjectAnimator.ofFloat(taskView, dismissingTaskViewTranslate,
+                positiveNegativeFactor * translateDistance).setDuration(duration), LINEAR, sp);
 
         if (LIVE_TILE.get() && taskView.isRunningTask()) {
             anim.addOnFrameCallback(() -> {
@@ -2206,18 +2255,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                     }
                 }
 
-                // Additional offset for fake landscape, if the pinning happens to the right or
-                // left, we need to scroll all the tasks away from the direction of the splaceholder
-                // view
-                if (isSplitSelectionActive()) {
-                    int splitPosition = getSplitPlaceholder().getSplitController()
-                            .getActiveSplitPositionOption().mStagePosition;
-                    int direction = mOrientationHandler
-                            .getSplitTranslationDirectionFactor(splitPosition);
-                    int splitOffset = mOrientationHandler.getSplitAnimationTranslation(
-                            mSplitPlaceholderView.getHeight(), mActivity.getDeviceProfile());
-                    offset += direction * splitOffset;
-                }
                 int scrollDiff = newScroll[i] - oldScroll[i] + offset;
                 if (scrollDiff != 0) {
                     FloatProperty translationProperty = child instanceof TaskView
@@ -2768,13 +2805,20 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         mLiveTileTaskViewSimulator.recentsViewSecondaryTranslation.value = translation;
     }
 
-    protected void setTaskViewsPrimaryTranslation(float translation) {
-        mTaskViewsPrimaryTranslation = translation;
+    protected void setTaskViewsPrimarySplitTranslation(float translation) {
+        mTaskViewsPrimarySplitTranslation = translation;
         for (int i = 0; i < getTaskViewCount(); i++) {
             TaskView task = getTaskViewAt(i);
-            task.getPrimaryDismissTranslationProperty().set(task, translation / getScaleY());
+            task.getPrimarySplitTranslationProperty().set(task, translation);
+        }
+    }
+
+    protected void setTaskViewsSecondarySplitTranslation(float translation) {
+        mTaskViewsSecondarySplitTranslation = translation;
+        for (int i = 0; i < getTaskViewCount(); i++) {
+            TaskView task = getTaskViewAt(i);
+            task.getSecondarySplitTranslationProperty().set(task, translation);
         }
-        mLiveTileTaskViewSimulator.recentsViewPrimaryTranslation.value = translation;
     }
 
     /**
@@ -2797,8 +2841,9 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     public void initiateSplitSelect(TaskView taskView, SplitPositionOption splitPositionOption) {
         mSplitHiddenTaskView = taskView;
         SplitSelectStateController splitController = mSplitPlaceholderView.getSplitController();
-        splitController.setInitialTaskSelect(taskView,
-                splitPositionOption);
+        Rect initialBounds = new Rect(taskView.getLeft(), taskView.getTop(), taskView.getRight(),
+                taskView.getBottom());
+        splitController.setInitialTaskSelect(taskView, splitPositionOption, initialBounds);
         mSplitHiddenTaskViewIndex = indexOfChild(taskView);
         mSplitPlaceholderView.setLayoutParams(
                 splitController.getLayoutParamsForActivePosition(getResources(),
@@ -2818,7 +2863,10 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     }
 
     public PendingAnimation cancelSplitSelect(boolean animate) {
-        mSplitPlaceholderView.getSplitController().resetState();
+        SplitSelectStateController splitController = mSplitPlaceholderView.getSplitController();
+        SplitPositionOption splitOption = splitController.getActiveSplitPositionOption();
+        Rect initialBounds = splitController.getInitialBounds();
+        splitController.resetState();
         int duration = mActivity.getStateManager().getState().getTransitionDuration(getContext());
         PendingAnimation pendingAnim = new PendingAnimation(duration);
         if (!animate) {
@@ -2833,8 +2881,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         getPageScrolls(oldScroll, false,
                 view -> view.getVisibility() != GONE && view != mSplitHiddenTaskView);
 
-        // x is correct, y is before tasks move up
-        int[] locationOnScreen = mSplitHiddenTaskView.getLocationOnScreen();
         int[] newScroll = new int[getChildCount()];
         getPageScrolls(newScroll, false, SIMPLE_SCROLL_LOGIC);
 
@@ -2842,20 +2888,42 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         for (int i = mSplitHiddenTaskViewIndex; i >= 0; i--) {
             View child = getChildAt(i);
             if (child == mSplitHiddenTaskView) {
-
-                int left = newScroll[i] + getPaddingStart();
-                int topMargin = mActivity.getDeviceProfile().overviewTaskThumbnailTopMarginPx;
-                int top = -mSplitHiddenTaskView.getHeight() - locationOnScreen[1];
-                mSplitHiddenTaskView.layout(left, top,
-                        left + mSplitHiddenTaskView.getWidth(),
-                        top + mSplitHiddenTaskView.getHeight());
-                pendingAnim.add(ObjectAnimator.ofFloat(mSplitHiddenTaskView, TRANSLATION_Y,
-                        -top + mSplitPlaceholderView.getHeight() - topMargin));
+                TaskView taskView = (TaskView) child;
+
+                int dir = mOrientationHandler.getSplitTaskViewDismissDirection(splitOption,
+                        mActivity.getDeviceProfile());
+                FloatProperty<TaskView> dismissingTaskViewTranslate;
+                Rect hiddenBounds = new Rect(taskView.getLeft(), taskView.getTop(),
+                        taskView.getRight(), taskView.getBottom());
+                int distanceDelta = 0;
+                if (dir == PagedOrientationHandler.SPLIT_TRANSLATE_SECONDARY_NEGATIVE) {
+                    dismissingTaskViewTranslate = taskView
+                            .getSecondaryDissmissTranslationProperty();
+                    distanceDelta = initialBounds.top - hiddenBounds.top;
+                    taskView.layout(initialBounds.left, hiddenBounds.top, initialBounds.right,
+                            hiddenBounds.bottom);
+                } else {
+                    dismissingTaskViewTranslate = taskView
+                            .getPrimaryDismissTranslationProperty();
+                    distanceDelta = initialBounds.left - hiddenBounds.left;
+                    taskView.layout(hiddenBounds.left, initialBounds.top, hiddenBounds.right,
+                            initialBounds.bottom);
+                    if (dir == PagedOrientationHandler.SPLIT_TRANSLATE_PRIMARY_POSITIVE) {
+                        distanceDelta *= -1;
+                    }
+                }
+                pendingAnim.add(ObjectAnimator.ofFloat(mSplitHiddenTaskView,
+                        dismissingTaskViewTranslate,
+                        distanceDelta));
                 pendingAnim.add(ObjectAnimator.ofFloat(mSplitHiddenTaskView, ALPHA, 1));
             } else {
                 // If insertion is on last index (furthest from clear all), we directly add the view
                 // else we translate all views to the right of insertion index further right,
                 // ignore views to left
+                if (showAsGrid()) {
+                    // TODO(b/186800707) handle more elegantly for grid
+                    continue;
+                }
                 int scrollDiff = newScroll[i] - oldScroll[i];
                 if (scrollDiff != 0) {
                     FloatProperty translationProperty = child instanceof TaskView
@@ -2881,6 +2949,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         pendingAnim.addListener(new AnimationSuccessListener() {
             @Override
             public void onAnimationSuccess(Animator animator) {
+                // TODO(b/186800707) Figure out how to undo for grid view
+                //  Need to handle cases where dismissed task is
+                //  * Top Row
+                //  * Bottom Row
+                //  * Focused Task
+                updateGridProperties();
                 resetFromSplitSelectionState();
             }
         });
@@ -2890,13 +2964,16 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
 
     private void resetFromSplitSelectionState() {
         mSplitHiddenTaskView.setTranslationY(0);
-        int pageToSnapTo = mCurrentPage;
-        if (mSplitHiddenTaskViewIndex <= pageToSnapTo) {
-            pageToSnapTo += 1;
-        } else {
-            pageToSnapTo = mSplitHiddenTaskViewIndex;
+        if (!showAsGrid()) {
+            // TODO(b/186800707)
+            int pageToSnapTo = mCurrentPage;
+            if (mSplitHiddenTaskViewIndex <= pageToSnapTo) {
+                pageToSnapTo += 1;
+            } else {
+                pageToSnapTo = mSplitHiddenTaskViewIndex;
+            }
+            snapToPageImmediately(pageToSnapTo);
         }
-        snapToPageImmediately(pageToSnapTo);
         onLayout(false /*  changed */, getLeft(), getTop(), getRight(), getBottom());
         resetTaskVisuals();
         mSplitHiddenTaskView = null;
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 45bcdc314b..079d24b6bb 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -172,6 +172,32 @@ public class TaskView extends FrameLayout implements Reusable {
                 }
             };
 
+    private static final FloatProperty<TaskView> SPLIT_SELECT_TRANSLATION_X =
+            new FloatProperty<TaskView>("splitSelectTranslationX") {
+                @Override
+                public void setValue(TaskView taskView, float v) {
+                    taskView.setSplitSelectTranslationX(v);
+                }
+
+                @Override
+                public Float get(TaskView taskView) {
+                    return taskView.mSplitSelectTranslationX;
+                }
+            };
+
+    private static final FloatProperty<TaskView> SPLIT_SELECT_TRANSLATION_Y =
+            new FloatProperty<TaskView>("splitSelectTranslationY") {
+                @Override
+                public void setValue(TaskView taskView, float v) {
+                    taskView.setSplitSelectTranslationY(v);
+                }
+
+                @Override
+                public Float get(TaskView taskView) {
+                    return taskView.mSplitSelectTranslationY;
+                }
+            };
+
     private static final FloatProperty<TaskView> DISMISS_TRANSLATION_X =
             new FloatProperty<TaskView>("dismissTranslationX") {
                 @Override
@@ -345,6 +371,9 @@ public class TaskView extends FrameLayout implements Reusable {
     // The following grid translations scales with mGridProgress.
     private float mGridTranslationX;
     private float mGridTranslationY;
+    // Used when in SplitScreenSelectState
+    private float mSplitSelectTranslationY;
+    private float mSplitSelectTranslationX;
 
     private ObjectAnimator mIconAndDimAnimator;
     private float mIconScaleAnimStartProgress = 0;
@@ -825,8 +854,10 @@ public class TaskView extends FrameLayout implements Reusable {
     protected void resetViewTransforms() {
         // fullscreenTranslation and accumulatedTranslation should not be reset, as
         // resetViewTransforms is called during Quickswitch scrolling.
-        mDismissTranslationX = mTaskOffsetTranslationX = mTaskResistanceTranslationX = 0f;
-        mDismissTranslationY = mTaskOffsetTranslationY = mTaskResistanceTranslationY = 0f;
+        mDismissTranslationX = mTaskOffsetTranslationX = mTaskResistanceTranslationX =
+                mSplitSelectTranslationX = 0f;
+        mDismissTranslationY = mTaskOffsetTranslationY = mTaskResistanceTranslationY =
+                mSplitSelectTranslationY = 0f;
         applyTranslationX();
         applyTranslationY();
         setTranslationZ(0);
@@ -956,6 +987,15 @@ public class TaskView extends FrameLayout implements Reusable {
         setScaleY(scale);
     }
 
+    private void setSplitSelectTranslationX(float x) {
+        mSplitSelectTranslationX = x;
+        applyTranslationX();
+    }
+
+    private void setSplitSelectTranslationY(float y) {
+        mSplitSelectTranslationY = y;
+        applyTranslationY();
+    }
     private void setDismissTranslationX(float x) {
         mDismissTranslationX = x;
         applyTranslationX();
@@ -1056,12 +1096,12 @@ public class TaskView extends FrameLayout implements Reusable {
 
     private void applyTranslationX() {
         setTranslationX(mDismissTranslationX + mTaskOffsetTranslationX + mTaskResistanceTranslationX
-                + getPersistentTranslationX());
+                + mSplitSelectTranslationX + getPersistentTranslationX());
     }
 
     private void applyTranslationY() {
         setTranslationY(mDismissTranslationY + mTaskOffsetTranslationY + mTaskResistanceTranslationY
-                + getPersistentTranslationY());
+                + mSplitSelectTranslationY + getPersistentTranslationY());
     }
 
     /**
@@ -1085,6 +1125,16 @@ public class TaskView extends FrameLayout implements Reusable {
                 + getGridTrans(mGridTranslationY);
     }
 
+    public FloatProperty<TaskView> getPrimarySplitTranslationProperty() {
+        return getPagedOrientationHandler().getPrimaryValue(
+                SPLIT_SELECT_TRANSLATION_X, SPLIT_SELECT_TRANSLATION_Y);
+    }
+
+    public FloatProperty<TaskView> getSecondarySplitTranslationProperty() {
+        return getPagedOrientationHandler().getSecondaryValue(
+                SPLIT_SELECT_TRANSLATION_X, SPLIT_SELECT_TRANSLATION_Y);
+    }
+
     public FloatProperty<TaskView> getPrimaryDismissTranslationProperty() {
         return getPagedOrientationHandler().getPrimaryValue(
                 DISMISS_TRANSLATION_X, DISMISS_TRANSLATION_Y);
diff --git a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
index 2fd5efc3f6..44e55e102c 100644
--- a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
+++ b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
@@ -159,6 +159,19 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
         return VIEW_TRANSLATE_X;
     }
 
+    @Override
+    public int getSplitTaskViewDismissDirection(SplitPositionOption splitPosition,
+            DeviceProfile dp) {
+        // Don't use device profile here because we know we're in fake landscape, only split option
+        // available is top/left
+        if (splitPosition.mStagePosition == STAGE_POSITION_TOP_OR_LEFT) {
+            // Top (visually left) side
+            return SPLIT_TRANSLATE_PRIMARY_NEGATIVE;
+        }
+        throw new IllegalStateException("Invalid split stage position: " +
+                splitPosition.mStagePosition);
+    }
+
     @Override
     public int getPrimaryScroll(View view) {
         return view.getScrollY();
diff --git a/src/com/android/launcher3/touch/PagedOrientationHandler.java b/src/com/android/launcher3/touch/PagedOrientationHandler.java
index 6c2f17ee34..d8e5a485fd 100644
--- a/src/com/android/launcher3/touch/PagedOrientationHandler.java
+++ b/src/com/android/launcher3/touch/PagedOrientationHandler.java
@@ -42,6 +42,10 @@ import java.util.List;
  */
 public interface PagedOrientationHandler {
 
+    int SPLIT_TRANSLATE_PRIMARY_POSITIVE = 0;
+    int SPLIT_TRANSLATE_PRIMARY_NEGATIVE = 1;
+    int SPLIT_TRANSLATE_SECONDARY_NEGATIVE = 2;
+
     PagedOrientationHandler PORTRAIT = new PortraitPagedViewHandler();
     PagedOrientationHandler LANDSCAPE = new LandscapePagedViewHandler();
     PagedOrientationHandler SEASCAPE = new SeascapePagedViewHandler();
@@ -71,6 +75,13 @@ public interface PagedOrientationHandler {
     int getSecondaryDimension(View view);
     FloatProperty<View> getPrimaryViewTranslate();
     FloatProperty<View> getSecondaryViewTranslate();
+
+    /**
+     * @param splitPosition The position where the view to be split will go
+     * @return {@link #SPLIT_TRANSLATE_*} constants to indicate which direction the
+     * dismissal should happen
+     */
+    int getSplitTaskViewDismissDirection(SplitPositionOption splitPosition, DeviceProfile dp);
     int getPrimaryScroll(View view);
     float getPrimaryScale(View view);
     int getChildStart(View view);
diff --git a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
index f6a6448602..01897d727d 100644
--- a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
+++ b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
@@ -155,6 +155,25 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
         return VIEW_TRANSLATE_Y;
     }
 
+    @Override
+    public int getSplitTaskViewDismissDirection(SplitPositionOption splitPosition,
+            DeviceProfile dp) {
+        if (splitPosition.mStagePosition == STAGE_POSITION_TOP_OR_LEFT) {
+            if (dp.isLandscape) {
+                // Left side
+                return SPLIT_TRANSLATE_PRIMARY_NEGATIVE;
+            } else {
+                // Top side
+                return SPLIT_TRANSLATE_SECONDARY_NEGATIVE;
+            }
+        } else if (splitPosition.mStagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT) {
+            // We don't have a bottom option, so should be right
+            return SPLIT_TRANSLATE_PRIMARY_POSITIVE;
+        }
+        throw new IllegalStateException("Invalid split stage position: " +
+                splitPosition.mStagePosition);
+    }
+
     @Override
     public int getPrimaryScroll(View view) {
         return view.getScrollX();
-- 
GitLab


From 2955fa8f5cb33d369cb5c39089bf11aceff0b9b3 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Wed, 5 May 2021 11:20:20 -0700
Subject: [PATCH 1075/1664] Add method to check if popup supports color
 extraction.

Bug: 187058092
Test: manual
Change-Id: I795cd3bfd04a7ab9b4730a2e7d7618830faae37e
---
 src/com/android/launcher3/popup/ArrowPopup.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java
index c63d69dfd3..e95c539738 100644
--- a/src/com/android/launcher3/popup/ArrowPopup.java
+++ b/src/com/android/launcher3/popup/ArrowPopup.java
@@ -176,7 +176,7 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
                         (int) argb.evaluate((i + 1) * step, primaryColor, secondaryColor);
             }
 
-            if (Utilities.ATLEAST_S) {
+            if (supportsColorExtraction()) {
                 setupColorExtraction();
             }
         }
@@ -706,6 +706,13 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
         }
     }
 
+    /**
+     * Returns whether color extraction is supported.
+     */
+    public boolean supportsColorExtraction() {
+        return Utilities.ATLEAST_S;
+    }
+
     /**
      * Callback to be called when the popup is closed
      */
-- 
GitLab


From 16fd85629dca9b96bcb6e3e51c7dd64c923b02f3 Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Thu, 25 Mar 2021 12:31:23 -0700
Subject: [PATCH 1076/1664] Initial commit of 3 button work

Home, Back and Recents basic functionality working

Fixes: 180046394
Change-Id: Ifc5c767e35e88183500d14d14736eb40df436369
---
 quickstep/res/drawable/ic_sysbar_back.xml     |  28 +++++
 quickstep/res/drawable/ic_sysbar_home.xml     |  27 +++++
 quickstep/res/drawable/ic_sysbar_recent.xml   |  27 +++++
 .../taskbar_icon_click_feedback_roundrect.xml |  26 +++++
 quickstep/res/values/colors.xml               |   1 +
 .../launcher3/taskbar/TaskbarController.java  |  28 ++++-
 .../taskbar/TaskbarNavButtonController.java   |  89 +++++++++++++++
 .../launcher3/taskbar/TaskbarView.java        | 105 ++++++++++++++++--
 .../quickstep/SysUINavigationMode.java        |   4 +-
 .../quickstep/TouchInteractionService.java    |  14 +++
 10 files changed, 339 insertions(+), 10 deletions(-)
 create mode 100644 quickstep/res/drawable/ic_sysbar_back.xml
 create mode 100644 quickstep/res/drawable/ic_sysbar_home.xml
 create mode 100644 quickstep/res/drawable/ic_sysbar_recent.xml
 create mode 100644 quickstep/res/drawable/taskbar_icon_click_feedback_roundrect.xml
 create mode 100644 quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java

diff --git a/quickstep/res/drawable/ic_sysbar_back.xml b/quickstep/res/drawable/ic_sysbar_back.xml
new file mode 100644
index 0000000000..1eea6774b1
--- /dev/null
+++ b/quickstep/res/drawable/ic_sysbar_back.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:autoMirrored="true"
+    android:viewportWidth="28"
+    android:viewportHeight="28">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M6.49,14.86c-0.66-0.39-0.66-1.34,0-1.73l6.02-3.53l5.89-3.46C19.11,5.73,20,6.26,20,7.1V14v6.9 c0,0.84-0.89,1.37-1.6,0.95l-5.89-3.46L6.49,14.86z" />
+</vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/ic_sysbar_home.xml b/quickstep/res/drawable/ic_sysbar_home.xml
new file mode 100644
index 0000000000..b4b397b59c
--- /dev/null
+++ b/quickstep/res/drawable/ic_sysbar_home.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="28"
+    android:viewportHeight="28">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M 14 7 C 17.8659932488 7 21 10.1340067512 21 14 C 21 17.8659932488 17.8659932488 21 14 21 C 10.1340067512 21 7 17.8659932488 7 14 C 7 10.1340067512 10.1340067512 7 14 7 Z" />
+</vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/ic_sysbar_recent.xml b/quickstep/res/drawable/ic_sysbar_recent.xml
new file mode 100644
index 0000000000..f8c4778a2b
--- /dev/null
+++ b/quickstep/res/drawable/ic_sysbar_recent.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="28"
+    android:viewportHeight="28">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19.9,21.5H8.1c-0.88,0-1.6-0.72-1.6-1.6V8.1c0-0.88,0.72-1.6,1.6-1.6h11.8c0.88,0,1.6,0.72,1.6,1.6v11.8 C21.5,20.78,20.78,21.5,19.9,21.5z" />
+</vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/taskbar_icon_click_feedback_roundrect.xml b/quickstep/res/drawable/taskbar_icon_click_feedback_roundrect.xml
new file mode 100644
index 0000000000..d6160def0f
--- /dev/null
+++ b/quickstep/res/drawable/taskbar_icon_click_feedback_roundrect.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/taskbar_icon_selection_ripple">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/white" />
+            <corners android:radius="8dp" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/quickstep/res/values/colors.xml b/quickstep/res/values/colors.xml
index 3bc8ddc0a8..167c7c3d0f 100644
--- a/quickstep/res/values/colors.xml
+++ b/quickstep/res/values/colors.xml
@@ -27,4 +27,5 @@
 
     <!-- Taskbar -->
     <color name="taskbar_background">#101010</color>
+    <color name="taskbar_icon_selection_ripple">#E0E0E0</color>
 </resources>
\ No newline at end of file
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index c93de00f4f..cf6cfb34e8 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -48,9 +48,12 @@ import com.android.launcher3.folder.FolderIcon;
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.states.StateAnimationConfig;
+import com.android.launcher3.taskbar.TaskbarNavButtonController.TaskbarButton;
 import com.android.launcher3.touch.ItemClickHandler;
 import com.android.launcher3.views.ActivityContext;
 import com.android.quickstep.AnimatedFloat;
+import com.android.quickstep.SysUINavigationMode;
+import com.android.quickstep.TaskAnimationManager;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.WindowManagerWrapper;
@@ -73,9 +76,13 @@ public class TaskbarController {
     private final TaskbarAnimationController mTaskbarAnimationController;
     private final TaskbarHotseatController mHotseatController;
     private final TaskbarDragController mDragController;
+    private final TaskbarNavButtonController mNavButtonController;
 
     // Initialized in init().
     private WindowManager.LayoutParams mWindowLayoutParams;
+    private SysUINavigationMode.Mode mNavMode = SysUINavigationMode.Mode.NO_BUTTON;
+    private final SysUINavigationMode.NavigationModeChangeListener mNavigationModeChangeListener =
+            this::onNavModeChanged;
 
     private @Nullable Animator mAnimator;
     private boolean mIsAnimatingToLauncher;
@@ -89,6 +96,7 @@ public class TaskbarController {
         mTaskbarViewInApp.construct(createTaskbarViewCallbacks());
         mTaskbarViewOnHome = taskbarViewOnHome;
         mTaskbarViewOnHome.construct(createTaskbarViewCallbacks());
+        mNavButtonController = new TaskbarNavButtonController(launcher);
         mWindowManager = mLauncher.getWindowManager();
         mTaskbarSize = new Point(MATCH_PARENT, mLauncher.getDeviceProfile().taskbarSize);
         mTaskbarStateHandler = mLauncher.getTaskbarStateHandler();
@@ -212,6 +220,11 @@ public class TaskbarController {
                     alignRealHotseatWithTaskbar();
                 }
             }
+
+            @Override
+            public void onNavigationButtonClick(@TaskbarButton int buttonType) {
+                mNavButtonController.onButtonClick(buttonType);
+            }
         };
     }
 
@@ -228,8 +241,10 @@ public class TaskbarController {
      * Initializes the Taskbar, including adding it to the screen.
      */
     public void init() {
-        mTaskbarViewInApp.init(mHotseatController.getNumHotseatIcons());
-        mTaskbarViewOnHome.init(mHotseatController.getNumHotseatIcons());
+        mNavMode = SysUINavigationMode.INSTANCE.get(mLauncher)
+                .addModeChangeListener(mNavigationModeChangeListener);
+        mTaskbarViewInApp.init(mHotseatController.getNumHotseatIcons(), mNavMode);
+        mTaskbarViewOnHome.init(mHotseatController.getNumHotseatIcons(), mNavMode);
         mTaskbarContainerView.init(mTaskbarViewInApp);
         addToWindowManager();
         mTaskbarStateHandler.setTaskbarCallbacks(createTaskbarStateHandlerCallbacks());
@@ -278,6 +293,8 @@ public class TaskbarController {
         mHotseatController.cleanup();
 
         setWhichTaskbarViewIsVisible(null);
+        SysUINavigationMode.INSTANCE.get(mLauncher)
+                .removeModeChangeListener(mNavigationModeChangeListener);
     }
 
     private void removeFromWindowManager() {
@@ -315,6 +332,12 @@ public class TaskbarController {
         mWindowManager.addView(mTaskbarContainerView, mWindowLayoutParams);
     }
 
+    private void onNavModeChanged(SysUINavigationMode.Mode newMode) {
+        mNavMode = newMode;
+        cleanup();
+        init();
+    }
+
     /**
      * Should be called from onResume() and onPause(), and animates the Taskbar accordingly.
      */
@@ -507,6 +530,7 @@ public class TaskbarController {
         /** Returns how much to scale non-icon elements such as spacing and dividers. */
         float getNonIconScale(TaskbarView taskbarView);
         void onItemPositionsChanged(TaskbarView taskbarView);
+        void onNavigationButtonClick(@TaskbarButton int buttonType);
     }
 
     /**
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java
new file mode 100644
index 0000000000..cf8ff381b1
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.taskbar;
+
+import android.content.Context;
+import android.content.Intent;
+
+import androidx.annotation.IntDef;
+
+import com.android.quickstep.OverviewCommandHelper;
+import com.android.quickstep.SystemUiProxy;
+import com.android.quickstep.TouchInteractionService;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Controller for 3 button mode in the taskbar.
+ * Handles all the functionality of the various buttons, making/routing the right calls into
+ * launcher or sysui/system.
+ *
+ * TODO: Create callbacks to hook into UI layer since state will change for more context buttons/
+ *       assistant invocation.
+ */
+public class TaskbarNavButtonController {
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef(value = {
+            BUTTON_BACK,
+            BUTTON_HOME,
+            BUTTON_RECENTS
+    })
+
+    public @interface TaskbarButton {}
+
+    static final int BUTTON_BACK = 1;
+    static final int BUTTON_HOME = BUTTON_BACK << 1;
+    static final int BUTTON_RECENTS = BUTTON_HOME << 1;
+
+
+    private final Context mContext;
+
+    public TaskbarNavButtonController(Context context) {
+        mContext = context;
+    }
+
+    public void onButtonClick(@TaskbarButton int buttonType) {
+        switch (buttonType) {
+            case BUTTON_BACK:
+                executeBack();
+                break;
+            case BUTTON_HOME:
+                navigateHome();
+                break;
+            case BUTTON_RECENTS:
+                navigateToOverview();;
+                break;
+        }
+    }
+
+    private void navigateHome() {
+        mContext.startActivity(new Intent(Intent.ACTION_MAIN)
+                .addCategory(Intent.CATEGORY_HOME)
+                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+    }
+
+    private void navigateToOverview() {
+        TouchInteractionService.getInstance().getOverviewCommandHelper()
+                .addCommand(OverviewCommandHelper.TYPE_SHOW);
+    }
+
+    private void executeBack() {
+        SystemUiProxy.INSTANCE.getNoCreate().onBackPressed();
+    }
+
+}
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
index 60a7add7fd..5be25b9bbb 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
@@ -15,6 +15,13 @@
  */
 package com.android.launcher3.taskbar;
 
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
+
+import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_BACK;
+import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_HOME;
+import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_RECENTS;
+
 import android.animation.Animator;
 import android.animation.AnimatorSet;
 import android.animation.LayoutTransition;
@@ -24,11 +31,14 @@ import android.content.res.Resources;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.RectF;
+import android.os.SystemProperties;
 import android.util.AttributeSet;
 import android.view.DragEvent;
+import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 
 import androidx.annotation.LayoutRes;
@@ -45,12 +55,17 @@ import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.views.ActivityContext;
+import com.android.quickstep.SysUINavigationMode;
 
 /**
  * Hosts the Taskbar content such as Hotseat and Recent Apps. Drawn on top of other apps.
  */
 public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconParent, Insettable {
 
+
+    private static final boolean ENABLE_THREE_BUTTON_TASKBAR =
+            SystemProperties.getBoolean("persist.debug.taskbar_three_button", false);
+
     private final int mIconTouchSize;
     private final boolean mIsRtl;
     private final int mTouchSlop;
@@ -69,6 +84,8 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
     private int mHotseatStartIndex;
     private int mHotseatEndIndex;
 
+    private LinearLayout mButtonRegion;
+
     // Delegate touches to the closest view if within mIconTouchSize.
     private boolean mDelegateTargeted;
     private View mDelegateView;
@@ -77,6 +94,8 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
     // Only non-null when the corresponding Folder is open.
     private @Nullable FolderIcon mLeaveBehindFolderIcon;
 
+    private int mNavButtonStartIndex;
+
     public TaskbarView(@NonNull Context context) {
         this(context, null);
     }
@@ -107,8 +126,18 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
         mItemMarginLeftRight = Math.round(mItemMarginLeftRight * mNonIconScale);
     }
 
-    protected void init(int numHotseatIcons) {
-        mHotseatStartIndex = 0;
+    protected void init(int numHotseatIcons, SysUINavigationMode.Mode newMode) {
+        // TODO: check if buttons on left
+        if (newMode == SysUINavigationMode.Mode.THREE_BUTTONS && ENABLE_THREE_BUTTON_TASKBAR) {
+            // 3 button
+            mNavButtonStartIndex = 0;
+            createNavButtons();
+        } else {
+            mNavButtonStartIndex = -1;
+            removeNavButtons();
+        }
+
+        mHotseatStartIndex = mNavButtonStartIndex + 1;
         mHotseatEndIndex = mHotseatStartIndex + numHotseatIcons - 1;
         updateHotseatItems(new ItemInfo[numHotseatIcons]);
 
@@ -185,11 +214,11 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
             if (hotseatView == null || hotseatView.getSourceLayoutResId() != expectedLayoutResId
                     || needsReinflate) {
                 removeView(hotseatView);
-                ActivityContext activityContext = ActivityContext.lookupContext(getContext());
+                ActivityContext activityContext = getActivityContext();
                 if (isFolder) {
                     FolderInfo folderInfo = (FolderInfo) hotseatItemInfo;
                     FolderIcon folderIcon = FolderIcon.inflateFolderAndIcon(expectedLayoutResId,
-                            ActivityContext.lookupContext(getContext()), this, folderInfo);
+                            getActivityContext(), this, folderInfo);
                     folderIcon.setTextVisible(false);
                     hotseatView = folderIcon;
                 } else {
@@ -335,12 +364,71 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
         return findDelegateView(xInOurCoordinates, yInOurCoorindates) != null;
     }
 
+    private void removeNavButtons() {
+        if (mButtonRegion != null) {
+            mButtonRegion.removeAllViews();
+            removeView(mButtonRegion);
+        } // else We've never been in 3 button. Woah Scoob!
+    }
+
+    /**
+     * Add back/home/recents buttons into a single ViewGroup that will be inserted at
+     * {@param navButtonStartIndex}
+     */
+    private void createNavButtons() {
+        ActivityContext context = getActivityContext();
+        if (mButtonRegion == null) {
+            mButtonRegion = new LinearLayout(getContext());
+        } else {
+            mButtonRegion.removeAllViews();
+        }
+        mButtonRegion.setVisibility(VISIBLE);
+        LayoutParams regionParams = new LayoutParams(WRAP_CONTENT, MATCH_PARENT);
+        regionParams.gravity = Gravity.START; // check left/right preference
+        regionParams.setMargins(mItemMarginLeftRight, 0, mItemMarginLeftRight, 0);
+
+        LinearLayout.LayoutParams buttonParams = new LinearLayout.LayoutParams(
+                context.getDeviceProfile().iconSizePx,
+                context.getDeviceProfile().iconSizePx
+        );
+        buttonParams.gravity = Gravity.CENTER;
+
+        // Back button
+        ImageView backButton = new ImageView(getContext());
+        backButton.setImageResource(R.drawable.ic_sysbar_back);
+        backButton.setBackgroundResource(R.drawable.taskbar_icon_click_feedback_roundrect);
+        backButton.setPadding(mItemMarginLeftRight, 0, mItemMarginLeftRight, 0);
+        backButton.setOnClickListener(view -> mControllerCallbacks.onNavigationButtonClick(
+                BUTTON_BACK));
+        mButtonRegion.addView(backButton, buttonParams);
+
+        // Home button
+        ImageView homeButton = new ImageView(getContext());
+        homeButton.setImageResource(R.drawable.ic_sysbar_home);
+        homeButton.setBackgroundResource(R.drawable.taskbar_icon_click_feedback_roundrect);
+        homeButton.setPadding(mItemMarginLeftRight, 0, mItemMarginLeftRight, 0);
+        homeButton.setOnClickListener(view -> mControllerCallbacks.onNavigationButtonClick(
+                BUTTON_HOME));
+        mButtonRegion.addView(homeButton, buttonParams);
+
+        // Recents button
+        ImageView recentsButton = new ImageView(getContext());
+        recentsButton.setImageResource(R.drawable.ic_sysbar_recent);
+        recentsButton.setBackgroundResource(R.drawable.taskbar_icon_click_feedback_roundrect);
+        recentsButton.setPadding(mItemMarginLeftRight, 0, mItemMarginLeftRight, 0);
+        recentsButton.setOnClickListener(view -> mControllerCallbacks.onNavigationButtonClick(
+                BUTTON_RECENTS));
+        mButtonRegion.addView(recentsButton, buttonParams);
+
+        addView(mButtonRegion, mNavButtonStartIndex);
+    }
+
     @Override
     public boolean onDragEvent(DragEvent event) {
         switch (event.getAction()) {
             case DragEvent.ACTION_DRAG_STARTED:
                 mIsDraggingItem = true;
-                AbstractFloatingView.closeAllOpenViews(ActivityContext.lookupContext(getContext()));
+                AbstractFloatingView.closeAllOpenViews(getActivityContext());
                 return true;
             case DragEvent.ACTION_DRAG_ENDED:
                 mIsDraggingItem = false;
@@ -407,12 +495,15 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
     }
 
     private View inflate(@LayoutRes int layoutResId) {
-        return ActivityContext.lookupContext(getContext()).getLayoutInflater()
-                .inflate(layoutResId, this, false);
+        return getActivityContext().getLayoutInflater().inflate(layoutResId, this, false);
     }
 
     @Override
     public void setInsets(Rect insets) {
         // Ignore, we just implement Insettable to draw behind system insets.
     }
+
+    private <T extends Context & ActivityContext> T getActivityContext() {
+        return ActivityContext.lookupContext(getContext());
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/SysUINavigationMode.java b/quickstep/src/com/android/quickstep/SysUINavigationMode.java
index efec037b92..74f4bea2a8 100644
--- a/quickstep/src/com/android/quickstep/SysUINavigationMode.java
+++ b/quickstep/src/com/android/quickstep/SysUINavigationMode.java
@@ -34,6 +34,7 @@ import com.android.launcher3.util.MainThreadInitializedObject;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * Observer for the resource config that specifies the navigation bar mode.
@@ -75,7 +76,8 @@ public class SysUINavigationMode {
     private int mNavBarGesturalHeight;
     private int mNavBarLargerGesturalHeight;
 
-    private final List<NavigationModeChangeListener> mChangeListeners = new ArrayList<>();
+    private final List<NavigationModeChangeListener> mChangeListeners =
+            new CopyOnWriteArrayList<>();
     private final List<OneHandedModeChangeListener> mOneHandedOverlayChangeListeners =
             new ArrayList<>();
 
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 4fc97702ed..afda3b9486 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -259,6 +259,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
     };
 
     private static boolean sConnected = false;
+    private static TouchInteractionService sInstance;
     private static boolean sIsInitialized = false;
     private RotationTouchHelper mRotationTouchHelper;
 
@@ -266,6 +267,11 @@ public class TouchInteractionService extends Service implements PluginListener<O
         return sConnected;
     }
 
+    @Nullable
+    public static TouchInteractionService getInstance() {
+        return sInstance;
+    }
+
     public static boolean isInitialized() {
         return sIsInitialized;
     }
@@ -293,6 +299,10 @@ public class TouchInteractionService extends Service implements PluginListener<O
 
     private DisplayManager mDisplayManager;
 
+    public TouchInteractionService() {
+        sInstance = this;
+    }
+
     @Override
     public void onCreate() {
         super.onCreate();
@@ -389,6 +399,10 @@ public class TouchInteractionService extends Service implements PluginListener<O
         onOverviewTargetChange(mOverviewComponentObserver.isHomeAndOverviewSame());
     }
 
+    public OverviewCommandHelper getOverviewCommandHelper() {
+        return mOverviewCommandHelper;
+    }
+
     private void resetHomeBounceSeenOnQuickstepEnabledFirstTime() {
         if (!mDeviceState.isUserUnlocked() || mDeviceState.isButtonNavMode()) {
             // Skip if not yet unlocked (can't read user shared prefs) or if the current navigation
-- 
GitLab


From 673faf59ee21faa4cb4af6d26b214fcb0820ea5d Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Fri, 16 Apr 2021 12:50:22 -0700
Subject: [PATCH 1077/1664] Add IME switcher/hide button bar when IME showing

Bug: 180046394
Change-Id: Ic2bd919ab3d27e0a430b081c771ea8dc5827be81
---
 quickstep/res/drawable/ic_ime_switcher.xml    | 25 +++++
 quickstep/res/layout/taskbar.xml              |  6 ++
 .../launcher3/BaseQuickstepLauncher.java      | 34 +++++++
 .../launcher3/taskbar/ButtonProvider.java     | 76 +++++++++++++++
 .../android/launcher3/taskbar/ImeBarView.java | 92 +++++++++++++++++++
 .../taskbar/TaskbarAnimationController.java   | 12 ++-
 .../launcher3/taskbar/TaskbarController.java  | 78 +++++++++++++---
 .../taskbar/TaskbarNavButtonController.java   | 13 ++-
 .../launcher3/taskbar/TaskbarView.java        | 46 +++++-----
 .../quickstep/TouchInteractionService.java    | 41 ++++++++-
 10 files changed, 383 insertions(+), 40 deletions(-)
 create mode 100644 quickstep/res/drawable/ic_ime_switcher.xml
 create mode 100644 quickstep/src/com/android/launcher3/taskbar/ButtonProvider.java
 create mode 100644 quickstep/src/com/android/launcher3/taskbar/ImeBarView.java

diff --git a/quickstep/res/drawable/ic_ime_switcher.xml b/quickstep/res/drawable/ic_ime_switcher.xml
new file mode 100644
index 0000000000..a86d3904c7
--- /dev/null
+++ b/quickstep/res/drawable/ic_ime_switcher.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (C) 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M19,7h2v2h-2V7zM15,7h2v2h-2V7zM3,7h2v2H3V7zM7,7h2v2H7V7zM11,7h2v2h-2V7zM19,11h2v2h-2V11zM15,11h2v2h-2V11zM3,11h2v2H3V11zM7,11h2v2H7V11zM11,11h2v2h-2V11zM7,15h10v2H7V15z"
+        android:fillColor="@android:color/white" />
+</vector>
diff --git a/quickstep/res/layout/taskbar.xml b/quickstep/res/layout/taskbar.xml
index 732222ade8..240fe556da 100644
--- a/quickstep/res/layout/taskbar.xml
+++ b/quickstep/res/layout/taskbar.xml
@@ -26,4 +26,10 @@
         android:layout_height="wrap_content"
         android:gravity="center"/>
 
+    <com.android.launcher3.taskbar.ImeBarView
+        android:id="@+id/ime_bar_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"/>
+
 </com.android.launcher3.taskbar.TaskbarContainerView>
\ No newline at end of file
diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index c6c6c01542..fb26e76994 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -30,8 +30,11 @@ import android.app.ActivityOptions;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentSender;
+import android.content.ComponentName;
+import android.content.ServiceConnection;
 import android.os.Bundle;
 import android.os.CancellationSignal;
+import android.os.IBinder;
 import android.view.View;
 
 import androidx.annotation.Nullable;
@@ -61,6 +64,7 @@ import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;
 import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.TaskUtils;
+import com.android.quickstep.TouchInteractionService;
 import com.android.quickstep.util.RemoteAnimationProvider;
 import com.android.quickstep.util.RemoteFadeOutAnimationListener;
 import com.android.quickstep.util.SplitSelectStateController;
@@ -82,6 +86,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
 
     private DepthController mDepthController = new DepthController(this);
     private QuickstepTransitionManager mAppTransitionManager;
+    private ServiceConnection mTisBinderConnection;
+    protected TouchInteractionService.TISBinder mTisBinder;
 
     /**
      * Reusable command for applying the back button alpha on the background thread.
@@ -103,6 +109,24 @@ public abstract class BaseQuickstepLauncher extends Launcher
         super.onCreate(savedInstanceState);
         SysUINavigationMode.INSTANCE.get(this).addModeChangeListener(this);
         addMultiWindowModeChangedListener(mDepthController);
+        setupTouchInteractionServiceBinder();
+    }
+
+    private void setupTouchInteractionServiceBinder() {
+        Intent intent = new Intent(this, TouchInteractionService.class);
+        mTisBinderConnection = new ServiceConnection() {
+            @Override
+            public void onServiceConnected(ComponentName componentName, IBinder binder) {
+                mTisBinder = ((TouchInteractionService.TISBinder) binder);
+                mTisBinder.setTaskbarOverviewProxyDelegate(mTaskbarController);
+            }
+
+            @Override
+            public void onServiceDisconnected(ComponentName componentName) {
+                mTisBinder = null;
+            }
+        };
+        bindService(intent, mTisBinderConnection, 0);
     }
 
     @Override
@@ -113,6 +137,10 @@ public abstract class BaseQuickstepLauncher extends Launcher
         if (mTaskbarController != null) {
             mTaskbarController.cleanup();
             mTaskbarController = null;
+            if (mTisBinder != null) {
+                mTisBinder.setTaskbarOverviewProxyDelegate(null);
+                unbindService(mTisBinderConnection);
+            }
         }
 
         super.onDestroy();
@@ -248,6 +276,9 @@ public abstract class BaseQuickstepLauncher extends Launcher
     private void addTaskbarIfNecessary() {
         if (mTaskbarController != null) {
             mTaskbarController.cleanup();
+            if (mTisBinder != null) {
+                mTisBinder.setTaskbarOverviewProxyDelegate(null);
+            }
             mTaskbarController = null;
         }
         if (mDeviceProfile.isTaskbarPresent) {
@@ -256,6 +287,9 @@ public abstract class BaseQuickstepLauncher extends Launcher
             mTaskbarController = new TaskbarController(this,
                     taskbarActivityContext.getTaskbarContainerView(), taskbarViewOnHome);
             mTaskbarController.init();
+            if (mTisBinder != null) {
+                mTisBinder.setTaskbarOverviewProxyDelegate(mTaskbarController);
+            }
         }
     }
 
diff --git a/quickstep/src/com/android/launcher3/taskbar/ButtonProvider.java b/quickstep/src/com/android/launcher3/taskbar/ButtonProvider.java
new file mode 100644
index 0000000000..0d4130d1bc
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/taskbar/ButtonProvider.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.taskbar;
+
+import android.annotation.DrawableRes;
+import android.content.Context;
+import android.view.View;
+import android.widget.ImageView;
+
+import com.android.launcher3.R;
+
+/**
+ * Creates Buttons for Taskbar for 3 button nav.
+ * Can add animations and state management for buttons in this class as things progress.
+ */
+public class ButtonProvider {
+
+    private int mMarginLeftRight;
+    private final Context mContext;
+
+    public ButtonProvider(Context context) {
+        mContext = context;
+    }
+
+    public void setMarginLeftRight(int margin) {
+        mMarginLeftRight = margin;
+    }
+
+    public View getBack() {
+        // Back button
+        return getButtonForDrawable(R.drawable.ic_sysbar_back);
+    }
+
+    public View getDown() {
+        // Ime down button
+        return getButtonForDrawable(R.drawable.ic_sysbar_back);
+    }
+
+    public View getHome() {
+        // Home button
+        return getButtonForDrawable(R.drawable.ic_sysbar_home);
+    }
+
+    public View getRecents() {
+        // Recents button
+        return getButtonForDrawable(R.drawable.ic_sysbar_recent);
+    }
+
+    public View getImeSwitcher() {
+        // IME Switcher Button
+        return getButtonForDrawable(R.drawable.ic_ime_switcher);
+    }
+
+    private View getButtonForDrawable(@DrawableRes int drawableId) {
+        ImageView buttonView = new ImageView(mContext);
+        buttonView.setImageResource(drawableId);
+        buttonView.setBackgroundResource(R.drawable.taskbar_icon_click_feedback_roundrect);
+        buttonView.setPadding(mMarginLeftRight, 0, mMarginLeftRight, 0);
+        return buttonView;
+    }
+
+}
diff --git a/quickstep/src/com/android/launcher3/taskbar/ImeBarView.java b/quickstep/src/com/android/launcher3/taskbar/ImeBarView.java
new file mode 100644
index 0000000000..bb3669beed
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/taskbar/ImeBarView.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.taskbar;
+
+import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_BACK;
+import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_IME_SWITCH;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.RelativeLayout;
+
+import com.android.launcher3.views.ActivityContext;
+
+public class ImeBarView extends RelativeLayout {
+
+    private ButtonProvider mButtonProvider;
+    private TaskbarController.TaskbarViewCallbacks mControllerCallbacks;
+    private View mImeView;
+
+    public ImeBarView(Context context) {
+        this(context, null);
+    }
+
+    public ImeBarView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public ImeBarView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public void construct(ButtonProvider buttonProvider) {
+        mButtonProvider = buttonProvider;
+    }
+
+    public void init(TaskbarController.TaskbarViewCallbacks taskbarCallbacks) {
+        mControllerCallbacks = taskbarCallbacks;
+        ActivityContext context = getActivityContext();
+        RelativeLayout.LayoutParams imeParams = new RelativeLayout.LayoutParams(
+                context.getDeviceProfile().iconSizePx,
+                context.getDeviceProfile().iconSizePx
+        );
+        RelativeLayout.LayoutParams downParams = new RelativeLayout.LayoutParams(imeParams);
+
+        imeParams.addRule(ALIGN_PARENT_END);
+        imeParams.setMarginEnd(context.getDeviceProfile().iconSizePx);
+        downParams.setMarginStart(context.getDeviceProfile().iconSizePx);
+        downParams.addRule(ALIGN_PARENT_START);
+
+        // Down Arrow
+        View downView = mButtonProvider.getDown();
+        downView.setOnClickListener(view -> mControllerCallbacks.onNavigationButtonClick(
+                BUTTON_BACK));
+        downView.setLayoutParams(downParams);
+        downView.setRotation(-90);
+        addView(downView);
+
+        // IME switcher button
+        mImeView = mButtonProvider.getImeSwitcher();
+        mImeView.setOnClickListener(view -> mControllerCallbacks.onNavigationButtonClick(
+                BUTTON_IME_SWITCH));
+        mImeView.setLayoutParams(imeParams);
+        addView(mImeView);
+    }
+
+    public void cleanup() {
+        removeAllViews();
+    }
+
+    public void setImeSwitcherVisibility(boolean show) {
+        mImeView.setVisibility(show ? VISIBLE : GONE);
+    }
+
+    private <T extends Context & ActivityContext> T getActivityContext() {
+        return ActivityContext.lookupContext(getContext());
+    }
+}
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java
index 46e4506f1f..29f6935f8a 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java
@@ -44,7 +44,7 @@ public class TaskbarAnimationController {
     private final AnimatedFloat mTaskbarVisibilityAlphaForLauncherState = new AnimatedFloat(
             this::updateVisibilityAlpha);
     private final AnimatedFloat mTaskbarVisibilityAlphaForIme = new AnimatedFloat(
-            this::updateVisibilityAlpha);
+            this::updateVisibilityAlphaForIme);
 
     // Scale.
     private final AnimatedFloat mTaskbarScaleForLauncherState = new AnimatedFloat(
@@ -110,16 +110,22 @@ public class TaskbarAnimationController {
         // We use mTaskbarBackgroundAlpha as a proxy for whether Launcher is resumed/paused, the
         // assumption being that Taskbar should always be visible regardless of the current
         // LauncherState if Launcher is paused.
+        float alphaDueToIme = mTaskbarVisibilityAlphaForIme.value;
         float alphaDueToLauncher = Math.max(mTaskbarBackgroundAlpha.value,
                 mTaskbarVisibilityAlphaForLauncherState.value);
-        float alphaDueToOther = mTaskbarVisibilityAlphaForIme.value;
-        float taskbarAlpha = alphaDueToLauncher * alphaDueToOther;
+        float taskbarAlpha = alphaDueToLauncher * alphaDueToIme;
         mTaskbarCallbacks.updateTaskbarVisibilityAlpha(taskbarAlpha);
 
         // Make the nav bar invisible if taskbar is visible.
         setNavBarButtonAlpha(1f - taskbarAlpha);
     }
 
+    private void updateVisibilityAlphaForIme() {
+        updateVisibilityAlpha();
+        float taskbarAlphaDueToIme = mTaskbarVisibilityAlphaForIme.value;
+        mTaskbarCallbacks.updateImeBarVisibilityAlpha(1f - taskbarAlphaDueToIme);
+    }
+
     private void updateScale() {
         // We use mTaskbarBackgroundAlpha as a proxy for whether Launcher is resumed/paused, the
         // assumption being that Taskbar should always be at scale 1f regardless of the current
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index cf6cfb34e8..6084e10d85 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -15,6 +15,9 @@
  */
 package com.android.launcher3.taskbar;
 
+import static android.view.View.GONE;
+import static android.view.View.INVISIBLE;
+import static android.view.View.VISIBLE;
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
 import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
@@ -28,6 +31,7 @@ import android.app.ActivityOptions;
 import android.graphics.PixelFormat;
 import android.graphics.Point;
 import android.graphics.Rect;
+import android.inputmethodservice.InputMethodService;
 import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
@@ -53,7 +57,7 @@ import com.android.launcher3.touch.ItemClickHandler;
 import com.android.launcher3.views.ActivityContext;
 import com.android.quickstep.AnimatedFloat;
 import com.android.quickstep.SysUINavigationMode;
-import com.android.quickstep.TaskAnimationManager;
+import com.android.quickstep.TouchInteractionService.TaskbarOverviewProxyDelegate;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.WindowManagerWrapper;
@@ -61,13 +65,15 @@ import com.android.systemui.shared.system.WindowManagerWrapper;
 /**
  * Interfaces with Launcher/WindowManager/SystemUI to determine what to show in TaskbarView.
  */
-public class TaskbarController {
+public class TaskbarController implements TaskbarOverviewProxyDelegate {
 
     private static final String WINDOW_TITLE = "Taskbar";
 
     private final TaskbarContainerView mTaskbarContainerView;
     private final TaskbarView mTaskbarViewInApp;
     private final TaskbarView mTaskbarViewOnHome;
+    private final ImeBarView mImeBarView;
+
     private final BaseQuickstepLauncher mLauncher;
     private final WindowManager mWindowManager;
     // Layout width and height of the Taskbar in the default state.
@@ -92,10 +98,13 @@ public class TaskbarController {
         mLauncher = launcher;
         mTaskbarContainerView = taskbarContainerView;
         mTaskbarContainerView.construct(createTaskbarContainerViewCallbacks());
+        ButtonProvider buttonProvider = new ButtonProvider(launcher);
         mTaskbarViewInApp = mTaskbarContainerView.findViewById(R.id.taskbar_view);
-        mTaskbarViewInApp.construct(createTaskbarViewCallbacks());
+        mTaskbarViewInApp.construct(createTaskbarViewCallbacks(), buttonProvider);
         mTaskbarViewOnHome = taskbarViewOnHome;
-        mTaskbarViewOnHome.construct(createTaskbarViewCallbacks());
+        mTaskbarViewOnHome.construct(createTaskbarViewCallbacks(), buttonProvider);
+        mImeBarView = mTaskbarContainerView.findViewById(R.id.ime_bar_view);
+        mImeBarView.construct(buttonProvider);
         mNavButtonController = new TaskbarNavButtonController(launcher);
         mWindowManager = mLauncher.getWindowManager();
         mTaskbarSize = new Point(MATCH_PARENT, mLauncher.getDeviceProfile().taskbarSize);
@@ -116,10 +125,20 @@ public class TaskbarController {
 
             @Override
             public void updateTaskbarVisibilityAlpha(float alpha) {
-                mTaskbarContainerView.setAlpha(alpha);
+                mTaskbarViewInApp.setAlpha(alpha);
                 mTaskbarViewOnHome.setAlpha(alpha);
             }
 
+            @Override
+            public void updateImeBarVisibilityAlpha(float alpha) {
+                if (mNavMode != SysUINavigationMode.Mode.THREE_BUTTONS) {
+                    // TODO Remove sysui IME bar for gesture nav as well
+                    return;
+                }
+                mImeBarView.setAlpha(alpha);
+                mImeBarView.setVisibility(alpha == 0 ? GONE : VISIBLE);
+            }
+
             @Override
             public void updateTaskbarScale(float scale) {
                 mTaskbarViewInApp.setScaleX(scale);
@@ -144,16 +163,21 @@ public class TaskbarController {
         return new TaskbarContainerViewCallbacks() {
             @Override
             public void onViewRemoved() {
-                if (mTaskbarContainerView.getChildCount() == 1) {
-                    // Only TaskbarView remains.
-                    setTaskbarWindowFullscreen(false);
+                // Ensure no other children present (like Folders, etc)
+                for (int i = 0; i < mTaskbarContainerView.getChildCount(); i++) {
+                    View v = mTaskbarContainerView.getChildAt(i);
+                    if (!((v instanceof TaskbarView) || (v instanceof ImeBarView))){
+                        return;
+                    }
                 }
+                setTaskbarWindowFullscreen(false);
             }
 
             @Override
             public boolean isTaskbarTouchable() {
                 return mTaskbarContainerView.getAlpha() > AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD
-                        && mTaskbarViewInApp.getVisibility() == View.VISIBLE
+                        && (mTaskbarViewInApp.getVisibility() == VISIBLE
+                            || mImeBarView.getVisibility() == VISIBLE)
                         && !mIsAnimatingToLauncher;
             }
         };
@@ -206,7 +230,7 @@ public class TaskbarController {
                 // space so that the others line up with the home screen hotseat.
                 boolean isOnHomeScreen = taskbarView == mTaskbarViewOnHome
                         || mLauncher.hasBeenResumed() || mIsAnimatingToLauncher;
-                return isOnHomeScreen ? View.INVISIBLE : View.GONE;
+                return isOnHomeScreen ? INVISIBLE : GONE;
             }
 
             @Override
@@ -246,6 +270,7 @@ public class TaskbarController {
         mTaskbarViewInApp.init(mHotseatController.getNumHotseatIcons(), mNavMode);
         mTaskbarViewOnHome.init(mHotseatController.getNumHotseatIcons(), mNavMode);
         mTaskbarContainerView.init(mTaskbarViewInApp);
+        mImeBarView.init(createTaskbarViewCallbacks());
         addToWindowManager();
         mTaskbarStateHandler.setTaskbarCallbacks(createTaskbarStateHandlerCallbacks());
         mTaskbarAnimationController.init();
@@ -287,6 +312,7 @@ public class TaskbarController {
         mTaskbarViewInApp.cleanup();
         mTaskbarViewOnHome.cleanup();
         mTaskbarContainerView.cleanup();
+        mImeBarView.cleanup();
         removeFromWindowManager();
         mTaskbarStateHandler.setTaskbarCallbacks(null);
         mTaskbarAnimationController.cleanup();
@@ -410,6 +436,28 @@ public class TaskbarController {
      */
     public void setIsImeVisible(boolean isImeVisible) {
         mTaskbarAnimationController.animateToVisibilityForIme(isImeVisible ? 0 : 1);
+        blockTaskbarTouchesForIme(isImeVisible);
+    }
+
+    /**
+     * When in 3 button nav, the above doesn't get called since we prevent sysui nav bar from
+     * instantiating at all, which is what's responsible for sending sysui state flags over.
+     *
+     * @param vis IME visibility flag
+     * @param backDisposition Used to determine back button behavior for software keyboard
+     *                        See BACK_DISPOSITION_* constants in {@link InputMethodService}
+     */
+    public void updateImeStatus(int displayId, int vis, int backDisposition,
+            boolean showImeSwitcher) {
+        if (displayId != mTaskbarContainerView.getContext().getDisplayId() ||
+                mNavMode != SysUINavigationMode.Mode.THREE_BUTTONS) {
+            return;
+        }
+
+        boolean imeVisible = (vis & InputMethodService.IME_VISIBLE) != 0;
+        mTaskbarAnimationController.animateToVisibilityForIme(imeVisible ? 0 : 1);
+        mImeBarView.setImeSwitcherVisibility(showImeSwitcher);
+        blockTaskbarTouchesForIme(imeVisible);
     }
 
     /**
@@ -459,12 +507,17 @@ public class TaskbarController {
 
     private void setWhichTaskbarViewIsVisible(@Nullable TaskbarView visibleTaskbar) {
         mTaskbarViewInApp.setVisibility(visibleTaskbar == mTaskbarViewInApp
-                ? View.VISIBLE : View.INVISIBLE);
+                ? VISIBLE : INVISIBLE);
         mTaskbarViewOnHome.setVisibility(visibleTaskbar == mTaskbarViewOnHome
-                ? View.VISIBLE : View.INVISIBLE);
+                ? VISIBLE : INVISIBLE);
         mLauncher.getHotseat().setIconsAlpha(visibleTaskbar != mTaskbarViewInApp ? 1f : 0f);
     }
 
+    private void blockTaskbarTouchesForIme(boolean block) {
+        mTaskbarViewOnHome.setTouchesEnabled(!block);
+        mTaskbarViewInApp.setTouchesEnabled(!block);
+    }
+
     /**
      * Returns the ratio of the taskbar icon size on home vs in an app.
      */
@@ -508,6 +561,7 @@ public class TaskbarController {
     protected interface TaskbarAnimationControllerCallbacks {
         void updateTaskbarBackgroundAlpha(float alpha);
         void updateTaskbarVisibilityAlpha(float alpha);
+        void updateImeBarVisibilityAlpha(float alpha);
         void updateTaskbarScale(float scale);
         void updateTaskbarTranslationY(float translationY);
     }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java
index cf8ff381b1..54e1610cd1 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java
@@ -18,6 +18,7 @@ package com.android.launcher3.taskbar;
 
 import android.content.Context;
 import android.content.Intent;
+import android.view.inputmethod.InputMethodManager;
 
 import androidx.annotation.IntDef;
 
@@ -41,7 +42,8 @@ public class TaskbarNavButtonController {
     @IntDef(value = {
             BUTTON_BACK,
             BUTTON_HOME,
-            BUTTON_RECENTS
+            BUTTON_RECENTS,
+            BUTTON_IME_SWITCH
     })
 
     public @interface TaskbarButton {}
@@ -49,6 +51,7 @@ public class TaskbarNavButtonController {
     static final int BUTTON_BACK = 1;
     static final int BUTTON_HOME = BUTTON_BACK << 1;
     static final int BUTTON_RECENTS = BUTTON_HOME << 1;
+    static final int BUTTON_IME_SWITCH = BUTTON_RECENTS << 1;
 
 
     private final Context mContext;
@@ -68,6 +71,9 @@ public class TaskbarNavButtonController {
             case BUTTON_RECENTS:
                 navigateToOverview();;
                 break;
+            case BUTTON_IME_SWITCH:
+                showIMESwitcher();
+                break;
         }
     }
 
@@ -86,4 +92,9 @@ public class TaskbarNavButtonController {
         SystemUiProxy.INSTANCE.getNoCreate().onBackPressed();
     }
 
+    private void showIMESwitcher() {
+        mContext.getSystemService(InputMethodManager.class).showInputMethodPickerFromSystem(
+                true /* showAuxiliarySubtypes */, mContext.getDisplayId());
+    }
+
 }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
index 5be25b9bbb..9e8013e63e 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
@@ -15,9 +15,6 @@
  */
 package com.android.launcher3.taskbar;
 
-import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
-import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
-
 import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_BACK;
 import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_HOME;
 import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_RECENTS;
@@ -38,7 +35,6 @@ import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 
 import androidx.annotation.LayoutRes;
@@ -83,18 +79,21 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
     private LayoutTransition mLayoutTransition;
     private int mHotseatStartIndex;
     private int mHotseatEndIndex;
-
     private LinearLayout mButtonRegion;
 
     // Delegate touches to the closest view if within mIconTouchSize.
     private boolean mDelegateTargeted;
     private View mDelegateView;
+    // Prevents dispatching touches to children if true
+    private boolean mTouchEnabled = true;
 
     private boolean mIsDraggingItem;
     // Only non-null when the corresponding Folder is open.
     private @Nullable FolderIcon mLeaveBehindFolderIcon;
 
     private int mNavButtonStartIndex;
+    /** Provider of buttons added to taskbar in 3 button nav */
+    private ButtonProvider mButtonProvider;
 
     public TaskbarView(@NonNull Context context) {
         this(context, null);
@@ -119,11 +118,14 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
         mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
     }
 
-    protected void construct(TaskbarController.TaskbarViewCallbacks taskbarViewCallbacks) {
+    protected void construct(TaskbarController.TaskbarViewCallbacks taskbarViewCallbacks,
+            ButtonProvider buttonProvider) {
         mControllerCallbacks = taskbarViewCallbacks;
         mNonIconScale = mControllerCallbacks.getNonIconScale(this);
         mItemMarginLeftRight = getResources().getDimensionPixelSize(R.dimen.taskbar_icon_spacing);
         mItemMarginLeftRight = Math.round(mItemMarginLeftRight * mNonIconScale);
+        mButtonProvider = buttonProvider;
+        mButtonProvider.setMarginLeftRight(mItemMarginLeftRight);
     }
 
     protected void init(int numHotseatIcons, SysUINavigationMode.Mode newMode) {
@@ -272,12 +274,24 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
         }
     }
 
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        if (!mTouchEnabled) {
+            return true;
+        }
+        return super.dispatchTouchEvent(ev);
+    }
+
     @Override
     public boolean onTouchEvent(MotionEvent event) {
         boolean handled = delegateTouchIfNecessary(event);
         return super.onTouchEvent(event) || handled;
     }
 
+    public void setTouchesEnabled(boolean touchEnabled) {
+        this.mTouchEnabled = touchEnabled;
+    }
+
     /**
      * User touched the Taskbar background. Determine whether the touch is close enough to a view
      * that we should forward the touches to it.
@@ -383,9 +397,6 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
             mButtonRegion.removeAllViews();
         }
         mButtonRegion.setVisibility(VISIBLE);
-        LayoutParams regionParams = new LayoutParams(WRAP_CONTENT, MATCH_PARENT);
-        regionParams.gravity = Gravity.START; // check left/right preference
-        regionParams.setMargins(mItemMarginLeftRight, 0, mItemMarginLeftRight, 0);
 
         LinearLayout.LayoutParams buttonParams = new LinearLayout.LayoutParams(
                 context.getDeviceProfile().iconSizePx,
@@ -393,29 +404,18 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
         );
         buttonParams.gravity = Gravity.CENTER;
 
-        // Back button
-        ImageView backButton = new ImageView(getContext());
-        backButton.setImageResource(R.drawable.ic_sysbar_back);
-        backButton.setBackgroundResource(R.drawable.taskbar_icon_click_feedback_roundrect);
-        backButton.setPadding(mItemMarginLeftRight, 0, mItemMarginLeftRight, 0);
+        View backButton = mButtonProvider.getBack();
         backButton.setOnClickListener(view -> mControllerCallbacks.onNavigationButtonClick(
                 BUTTON_BACK));
         mButtonRegion.addView(backButton, buttonParams);
 
         // Home button
-        ImageView homeButton = new ImageView(getContext());
-        homeButton.setImageResource(R.drawable.ic_sysbar_home);
-        homeButton.setBackgroundResource(R.drawable.taskbar_icon_click_feedback_roundrect);
-        homeButton.setPadding(mItemMarginLeftRight, 0, mItemMarginLeftRight, 0);
+        View homeButton = mButtonProvider.getHome();
         homeButton.setOnClickListener(view -> mControllerCallbacks.onNavigationButtonClick(
                 BUTTON_HOME));
         mButtonRegion.addView(homeButton, buttonParams);
 
-        // Recents button
-        ImageView recentsButton = new ImageView(getContext());
-        recentsButton.setImageResource(R.drawable.ic_sysbar_recent);
-        recentsButton.setBackgroundResource(R.drawable.taskbar_icon_click_feedback_roundrect);
-        recentsButton.setPadding(mItemMarginLeftRight, 0, mItemMarginLeftRight, 0);
+        View recentsButton = mButtonProvider.getRecents();
         recentsButton.setOnClickListener(view -> mControllerCallbacks.onNavigationButtonClick(
                 BUTTON_RECENTS));
         mButtonRegion.addView(recentsButton, buttonParams);
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index afda3b9486..47defaa599 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -52,6 +52,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.Looper;
+import android.os.RemoteException;
 import android.os.SystemClock;
 import android.os.SystemProperties;
 import android.util.Log;
@@ -145,7 +146,22 @@ public class TouchInteractionService extends Service implements PluginListener<O
     @Nullable
     private OverscrollPlugin mOverscrollPlugin;
 
-    private final IBinder mMyBinder = new IOverviewProxy.Stub() {
+    /**
+     * Extension of OverviewProxy aidl interface without needing to modify the actual interface.
+     * This is for methods that need only need local access and not intended to make IPC calls.
+     */
+    public abstract static class TISBinder extends IOverviewProxy.Stub {
+        public abstract void setTaskbarOverviewProxyDelegate(
+                @Nullable TaskbarOverviewProxyDelegate i);
+    }
+
+
+    private final TISBinder mMyBinder = new TISBinder() {
+
+        public void setTaskbarOverviewProxyDelegate(
+                @Nullable TaskbarOverviewProxyDelegate delegate) {
+            mTaskbarOverviewProxyDelegate = delegate;
+        }
 
         @BinderThread
         public void onInitialize(Bundle bundle) {
@@ -252,16 +268,39 @@ public class TouchInteractionService extends Service implements PluginListener<O
             MAIN_EXECUTOR.execute(() -> mDeviceState.setDeferredGestureRegion(region));
         }
 
+        @Override
         public void onSplitScreenSecondaryBoundsChanged(Rect bounds, Rect insets)  {
             WindowBounds wb = new WindowBounds(bounds, insets);
             MAIN_EXECUTOR.execute(() -> SplitScreenBounds.INSTANCE.setSecondaryWindowBounds(wb));
         }
+
+        @Override
+        public void onImeWindowStatusChanged(int displayId, IBinder token, int vis,
+                int backDisposition, boolean showImeSwitcher) throws RemoteException {
+            if (mTaskbarOverviewProxyDelegate == null) {
+                return;
+            }
+            MAIN_EXECUTOR.execute(() -> {
+                if (mTaskbarOverviewProxyDelegate == null) {
+                    return;
+                }
+                mTaskbarOverviewProxyDelegate
+                        .updateImeStatus(displayId, vis, backDisposition, showImeSwitcher);
+            });
+        }
     };
 
+    public interface TaskbarOverviewProxyDelegate {
+        void updateImeStatus(int displayId, int vis, int backDisposition,
+                boolean showImeSwitcher);
+    }
+
     private static boolean sConnected = false;
     private static TouchInteractionService sInstance;
     private static boolean sIsInitialized = false;
     private RotationTouchHelper mRotationTouchHelper;
+    @Nullable
+    private TaskbarOverviewProxyDelegate mTaskbarOverviewProxyDelegate;
 
     public static boolean isConnected() {
         return sConnected;
-- 
GitLab


From edfec2fc0b299bb5a0882157022a729461e48e4f Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 5 May 2021 17:41:10 +0100
Subject: [PATCH 1078/1664] Fix scrolling issue in the full widgets picker

Before this change, the widgets recommendation table handles all the
touch events. The table doesn't distinguish a touch event from a scroll
event. This change forwards the motion event to the active recycler view.
If the recycler view doesn't handle the event, it will then forward the
event back to the view hierarchy.

Test: Open the full widgets picker, then start scrolling on the
      recommended widgets UI. The full widgets picker scrolls perfectly.
      Drag-n-drop a recommended widget
Bug: 186567644
Change-Id: I89d473179796c516d2394332dd75f8e9a1d8b388
---
 ..._full_sheet_search_and_recommendations.xml |  4 +-
 ...rchAndRecommendationsScrollController.java | 45 ++++++++++++++
 .../picker/SearchAndRecommendationsView.java  | 62 +++++++++++++++++++
 .../widget/picker/WidgetsFullSheet.java       |  5 +-
 4 files changed, 112 insertions(+), 4 deletions(-)
 create mode 100644 src/com/android/launcher3/widget/picker/SearchAndRecommendationsView.java

diff --git a/res/layout/widgets_full_sheet_search_and_recommendations.xml b/res/layout/widgets_full_sheet_search_and_recommendations.xml
index bfce01d148..ce7a682376 100644
--- a/res/layout/widgets_full_sheet_search_and_recommendations.xml
+++ b/res/layout/widgets_full_sheet_search_and_recommendations.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<LinearLayout
+<com.android.launcher3.widget.picker.SearchAndRecommendationsView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/search_and_recommendations_container"
     android:layout_width="match_parent"
@@ -49,4 +49,4 @@
         android:paddingVertical="@dimen/recommended_widgets_table_vertical_padding"
         android:layout_marginTop="16dp"
         android:visibility="gone"/>
-</LinearLayout>
+</com.android.launcher3.widget.picker.SearchAndRecommendationsView>
diff --git a/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java b/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java
index 7f840776b2..d09cb8a52d 100644
--- a/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java
+++ b/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java
@@ -15,6 +15,8 @@
  */
 package com.android.launcher3.widget.picker;
 
+import android.graphics.Point;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup.MarginLayoutParams;
 import android.widget.RelativeLayout;
@@ -33,9 +35,11 @@ final class SearchAndRecommendationsScrollController implements
         RecyclerViewFastScroller.OnFastScrollChangeListener {
     private final boolean mHasWorkProfile;
     private final SearchAndRecommendationViewHolder mViewHolder;
+    private final View mSearchAndRecommendationViewParent;
     private final WidgetsRecyclerView mPrimaryRecyclerView;
     private final WidgetsRecyclerView mSearchRecyclerView;
     private final int mTabsHeight;
+    private final Point mTempOffset = new Point();
 
     // The following are only non null if mHasWorkProfile is true.
     @Nullable private final WidgetsRecyclerView mWorkRecyclerView;
@@ -62,6 +66,8 @@ final class SearchAndRecommendationsScrollController implements
      */
     private int mCollapsibleHeightForTabs = 0;
 
+    private boolean mShouldForwardToRecyclerView = false;
+
     SearchAndRecommendationsScrollController(
             boolean hasWorkProfile,
             int tabsHeight,
@@ -73,6 +79,8 @@ final class SearchAndRecommendationsScrollController implements
             @Nullable PersonalWorkPagedView primaryWorkViewPager) {
         mHasWorkProfile = hasWorkProfile;
         mViewHolder = viewHolder;
+        mViewHolder.mContainer.setSearchAndRecommendationScrollController(this);
+        mSearchAndRecommendationViewParent = (View) mViewHolder.mContainer.getParent();
         mPrimaryRecyclerView = primaryRecyclerView;
         mCurrentRecyclerView = mPrimaryRecyclerView;
         mWorkRecyclerView = workRecyclerView;
@@ -245,6 +253,43 @@ final class SearchAndRecommendationsScrollController implements
         }
     }
 
+    /**
+     * Returns {@code true} if a touch event should be intercepted by this controller.
+     */
+    public boolean onInterceptTouchEvent(MotionEvent event) {
+        calculateMotionEventOffset(mTempOffset);
+        event.offsetLocation(mTempOffset.x, mTempOffset.y);
+        try {
+            mShouldForwardToRecyclerView = mCurrentRecyclerView.onInterceptTouchEvent(event);
+            return mShouldForwardToRecyclerView;
+        } finally {
+            event.offsetLocation(-mTempOffset.x, -mTempOffset.y);
+        }
+    }
+
+    /**
+     * Returns {@code true} if this controller has intercepted and consumed a touch event.
+     */
+    public boolean onTouchEvent(MotionEvent event) {
+        if (mShouldForwardToRecyclerView) {
+            calculateMotionEventOffset(mTempOffset);
+            event.offsetLocation(mTempOffset.x, mTempOffset.y);
+            try {
+                return mCurrentRecyclerView.onTouchEvent(event);
+            } finally {
+                event.offsetLocation(-mTempOffset.x, -mTempOffset.y);
+            }
+        }
+        return false;
+    }
+
+    private void calculateMotionEventOffset(Point p) {
+        p.x = mViewHolder.mContainer.getLeft() - mCurrentRecyclerView.getLeft()
+                - mSearchAndRecommendationViewParent.getLeft();
+        p.y = mViewHolder.mContainer.getTop() - mCurrentRecyclerView.getTop()
+                - mSearchAndRecommendationViewParent.getTop();
+    }
+
     /** private the height, in pixel, + the vertical margins of a given view. */
     private static int measureHeightWithVerticalMargins(View view) {
         if (view.getVisibility() != View.VISIBLE) {
diff --git a/src/com/android/launcher3/widget/picker/SearchAndRecommendationsView.java b/src/com/android/launcher3/widget/picker/SearchAndRecommendationsView.java
new file mode 100644
index 0000000000..0d7d2b5e78
--- /dev/null
+++ b/src/com/android/launcher3/widget/picker/SearchAndRecommendationsView.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget.picker;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.widget.LinearLayout;
+
+/**
+ * A {@link LinearLayout} container for holding search and widgets recommendation.
+ *
+ * <p>This class intercepts touch events and dispatch them to the right view.
+ */
+public class SearchAndRecommendationsView extends LinearLayout {
+    private SearchAndRecommendationsScrollController mController;
+
+    public SearchAndRecommendationsView(Context context) {
+        this(context, /* attrs= */ null);
+    }
+
+    public SearchAndRecommendationsView(Context context, AttributeSet attrs) {
+        this(context, attrs, /* defStyleAttr= */ 0);
+    }
+
+    public SearchAndRecommendationsView(Context context, AttributeSet attrs, int defStyleAttr) {
+        this(context, attrs, defStyleAttr, /* defStyleRes= */ 0);
+    }
+
+    public SearchAndRecommendationsView(Context context, AttributeSet attrs, int defStyleAttr,
+            int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public void setSearchAndRecommendationScrollController(
+            SearchAndRecommendationsScrollController controller) {
+        mController = controller;
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent event) {
+        return mController.onInterceptTouchEvent(event) || super.onInterceptTouchEvent(event);
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        return mController.onTouchEvent(event) || super.onTouchEvent(event);
+    }
+}
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index b4d48562be..b1c5ffcbab 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -709,13 +709,14 @@ public class WidgetsFullSheet extends BaseWidgetSheet
     }
 
     final class SearchAndRecommendationViewHolder {
-        final ViewGroup mContainer;
+        final SearchAndRecommendationsView mContainer;
         final View mCollapseHandle;
         final WidgetsSearchBar mSearchBar;
         final TextView mHeaderTitle;
         final WidgetsRecommendationTableLayout mRecommendedWidgetsTable;
 
-        SearchAndRecommendationViewHolder(ViewGroup searchAndRecommendationContainer) {
+        SearchAndRecommendationViewHolder(
+                SearchAndRecommendationsView searchAndRecommendationContainer) {
             mContainer = searchAndRecommendationContainer;
             mCollapseHandle = mContainer.findViewById(R.id.collapse_handle);
             mSearchBar = mContainer.findViewById(R.id.widgets_search_bar);
-- 
GitLab


From 95e62812b2f17ccee77fb0e956b0bffde65409fc Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 5 May 2021 12:10:04 -0700
Subject: [PATCH 1079/1664] Some cleanup for handler invalidation

- Cancel reapplyWindowTransformAnim when STATE_HANDLER_INVALIDATED
- Set mActivity and mRecentsView = null in
  invalidateHandlerWithLauncher() instead of posting from
  invalidateHandler()
- Just in case, ignore onActivityInit() if we're already invalidated

Test: Tap repeatedly in nav region in an app, no crash
Fixes: 186983662
Change-Id: I3c005099b46ebb7c9203bcfcceedf48679dd1965
---
 .../android/quickstep/AbsSwipeUpHandler.java   | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index ecaac94565..fafee39b02 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -340,6 +340,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     }
 
     protected boolean onActivityInit(Boolean alreadyOnHome) {
+        if (mStateCallback.hasStates(STATE_HANDLER_INVALIDATED)) {
+            return false;
+        }
+
         T createdActivity = mActivityInterface.getCreatedActivity();
         if (createdActivity != null) {
             initTransitionEndpoints(createdActivity.getDeviceProfile());
@@ -571,6 +575,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                 }
             });
             reapplyWindowTransformAnim.setDuration(RECENTS_ATTACH_DURATION).start();
+            mStateCallback.runOnceAtState(STATE_HANDLER_INVALIDATED,
+                    reapplyWindowTransformAnim::cancel);
         } else {
             applyWindowTransform();
         }
@@ -1376,12 +1382,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         mActivityInitListener.unregister();
         ActivityManagerWrapper.getInstance().unregisterTaskStackListener(mActivityRestartListener);
         mTaskSnapshot = null;
-        mHandler.post(() -> {
-            // Defer clearing the activity since invalidation can happen over multiple callbacks
-            // ie. invalidateHandlerWithLauncher()
-            mActivity = null;
-            mRecentsView = null;
-        });
     }
 
     private void invalidateHandlerWithLauncher() {
@@ -1392,6 +1392,12 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
 
         mRecentsView.removeOnScrollChangedListener(mOnRecentsScrollListener);
         resetLauncherListeners();
+
+        mHandler.post(() -> {
+            // Defer clearing the activity since invalidation can happen over multiple callbacks.
+            mActivity = null;
+            mRecentsView = null;
+        });
     }
 
     private void endLauncherTransitionController() {
-- 
GitLab


From 4f78df9300d626cced11b8308f71eec8f79c61c0 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 5 May 2021 16:55:07 -0700
Subject: [PATCH 1080/1664] Explicitly set mAllowGoingDown = false when only up
 is allowed

Test: swipe up and down on a task, then scroll to clear all and
try it again; should go up but not down in the second case
Fixes: 187349538

Change-Id: I0879bafb3b5bb3c5ced8a502c98bfba7a3ce8a51
---
 .../uioverrides/touchcontrollers/TaskViewTouchController.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
index c2e5cdabf2..70b3870a6c 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
@@ -167,6 +167,7 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
                                 mAllowGoingDown = true;
                                 directionsToDetectScroll = DIRECTION_BOTH;
                             } else {
+                                mAllowGoingDown = false;
                                 directionsToDetectScroll = upDirection;
                             }
                         }
-- 
GitLab


From 7ee3651a1972178e2e3811d3672cdfcfdd5005fb Mon Sep 17 00:00:00 2001
From: Evan Rosky <erosky@google.com>
Date: Wed, 5 May 2021 17:01:45 -0700
Subject: [PATCH 1081/1664] Launch overview as transient

This way it won't cause the top running activity to pause until
the transition completes

Bug: 183993884
Test: enable shell_transitions, launch an app, go to overview,
      observe dumpsys and see that app remains RESUMED
Change-Id: I4311ade2e47062129874ae92bc7f5bea81bf2439
---
 quickstep/src/com/android/quickstep/TaskAnimationManager.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/TaskAnimationManager.java b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
index c87cd171be..9d79d252f1 100644
--- a/quickstep/src/com/android/quickstep/TaskAnimationManager.java
+++ b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
@@ -159,7 +159,8 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
         if (ENABLE_SHELL_TRANSITIONS) {
             RemoteTransitionCompat transition = new RemoteTransitionCompat(mCallbacks,
                     mController != null ? mController.getController() : null);
-            Bundle options = ActivityOptionsCompat.makeRemoteTransition(transition).toBundle();
+            Bundle options = ActivityOptionsCompat.makeRemoteTransition(transition)
+                    .setTransientLaunch().toBundle();
             mCtx.startActivity(intent, options);
         } else {
             UI_HELPER_EXECUTOR.execute(() -> ActivityManagerWrapper.getInstance()
-- 
GitLab


From bb3460c01fb529fd6010fece7197ed03c3b0fcdc Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 28 Apr 2021 15:17:54 -0700
Subject: [PATCH 1082/1664] Align home/back button from overview with tap
 outside

Set all interpolators in QuickstepAtomicAnimationFactory instead of
overriding some in OverviewToHomeAnim. This also means we can just
use a normal state transition instead of OverviewToHomeAnim when
tapping outside recents (i.e. startHome()).

Test: in all three gesture modes, the same animation is played
whether tapping outside recents, pressing home, or pressing back
Bug: 185411781

Change-Id: Ibe8734e8bd7041943eb76cac30d7cac26a90c73e
---
 .../QuickstepAtomicAnimationFactory.java      | 23 +++++++-----
 .../quickstep/util/OverviewToHomeAnim.java    | 36 +------------------
 .../quickstep/views/LauncherRecentsView.java  | 12 +------
 3 files changed, 16 insertions(+), 55 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
index 3ac78663f7..fd7a67ad79 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
@@ -27,12 +27,15 @@ import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.anim.Interpolators.DEACCEL;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_1_7;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
+import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 import static com.android.launcher3.anim.Interpolators.FINAL_FRAME;
 import static com.android.launcher3.anim.Interpolators.INSTANT;
+import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
 import static com.android.launcher3.anim.Interpolators.clampToProgress;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_DEPTH;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_ACTIONS_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X;
@@ -82,17 +85,19 @@ public class QuickstepAtomicAnimationFactory extends
             config.setInterpolator(ANIM_WORKSPACE_SCALE, DEACCEL);
             config.setInterpolator(ANIM_WORKSPACE_FADE, ACCEL);
             config.setInterpolator(ANIM_ALL_APPS_FADE, ACCEL);
-            config.setInterpolator(ANIM_OVERVIEW_SCALE, clampToProgress(ACCEL, 0, 0.9f));
-            config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, ACCEL_DEACCEL);
+            config.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, LINEAR);
 
-            if (SysUINavigationMode.getMode(mActivity) == NO_BUTTON) {
-                // Scrolling in tasks, so make visible straight away
-                if (overview.getTaskViewCount() > 0) {
-                    config.setInterpolator(ANIM_OVERVIEW_FADE, FINAL_FRAME);
-                } else {
-                    config.setInterpolator(ANIM_OVERVIEW_FADE, DEACCEL_1_7);
-                }
+            if (SysUINavigationMode.getMode(mActivity).hasGestures
+                    && overview.getTaskViewCount() > 0) {
+                // Overview is going offscreen, so keep it at its current scale and opacity.
+                config.setInterpolator(ANIM_OVERVIEW_SCALE, FINAL_FRAME);
+                config.setInterpolator(ANIM_OVERVIEW_FADE, FINAL_FRAME);
+                config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X,
+                        clampToProgress(FAST_OUT_SLOW_IN, 0, 0.75f));
+                config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, FINAL_FRAME);
             } else {
+                config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, ACCEL_DEACCEL);
+                config.setInterpolator(ANIM_OVERVIEW_SCALE, clampToProgress(ACCEL, 0, 0.9f));
                 config.setInterpolator(ANIM_OVERVIEW_FADE, DEACCEL_1_7);
             }
 
diff --git a/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java b/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
index 42be9bbe13..b427e5fb2c 100644
--- a/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
+++ b/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
@@ -17,21 +17,10 @@ package com.android.quickstep.util;
 
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
-import static com.android.launcher3.anim.Interpolators.DEACCEL;
-import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
-import static com.android.launcher3.anim.Interpolators.FINAL_FRAME;
-import static com.android.launcher3.anim.Interpolators.LINEAR;
-import static com.android.launcher3.anim.Interpolators.clampToProgress;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_ACTIONS_FADE;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
 import android.util.Log;
-import android.view.animation.Interpolator;
 
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
@@ -101,18 +90,8 @@ public class OverviewToHomeAnim {
                 numPagesToScroll * PER_PAGE_SCROLL_DURATION);
         int duration = Math.max(scrollDuration, startState.getTransitionDuration(mLauncher));
 
-        StateAnimationConfig config = new UseFirstInterpolatorStateAnimConfig();
+        StateAnimationConfig config = new StateAnimationConfig();
         config.duration = duration;
-        boolean isLayoutNaturalToLauncher = recentsView.getPagedOrientationHandler()
-                .isLayoutNaturalToLauncher();
-        config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, isLayoutNaturalToLauncher
-                ? clampToProgress(FAST_OUT_SLOW_IN, 0, 0.75f) : FINAL_FRAME);
-        config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, FINAL_FRAME);
-        config.setInterpolator(ANIM_OVERVIEW_SCALE, FINAL_FRAME);
-        config.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, LINEAR);
-        if (!isLayoutNaturalToLauncher) {
-            config.setInterpolator(ANIM_OVERVIEW_FADE, DEACCEL);
-        }
         AnimatorSet stateAnim = stateManager.createAtomicAnimation(
                 startState, NORMAL, config);
         stateAnim.addListener(new AnimationSuccessListener() {
@@ -133,17 +112,4 @@ public class OverviewToHomeAnim {
             mOnReachedHome.run();
         }
     }
-
-    /**
-     * Wrapper around StateAnimationConfig that doesn't allow interpolators to be set if they are
-     * already set. This ensures they aren't overridden before being used.
-     */
-    private static class UseFirstInterpolatorStateAnimConfig extends StateAnimationConfig {
-        @Override
-        public void setInterpolator(int animId, Interpolator interpolator) {
-            if (mInterpolators[animId] == null || interpolator == null) {
-                super.setInterpolator(animId, interpolator);
-            }
-        }
-    }
 }
diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
index 2c5f66170b..65956d578f 100644
--- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
@@ -21,7 +21,6 @@ import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.OVERVIEW_MODAL_TASK;
 import static com.android.launcher3.LauncherState.OVERVIEW_SPLIT_SELECT;
 import static com.android.launcher3.LauncherState.SPRING_LOADED;
-import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -39,7 +38,6 @@ import com.android.launcher3.statemanager.StateManager.StateListener;
 import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
 import com.android.launcher3.util.SplitConfigurationOptions;
 import com.android.quickstep.LauncherActivityInterface;
-import com.android.quickstep.util.OverviewToHomeAnim;
 import com.android.systemui.plugins.PluginListener;
 import com.android.systemui.plugins.RecentsExtraCard;
 
@@ -90,15 +88,7 @@ public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher, Laun
 
     @Override
     public void startHome() {
-        Runnable onReachedHome = () -> mActivity.getStateManager().goToState(NORMAL, false);
-        OverviewToHomeAnim overviewToHomeAnim = new OverviewToHomeAnim(mActivity, onReachedHome);
-        if (LIVE_TILE.get()) {
-            switchToScreenshot(null,
-                    () -> finishRecentsAnimation(true /* toRecents */,
-                            () -> overviewToHomeAnim.animateWithVelocity(0)));
-        } else {
-            overviewToHomeAnim.animateWithVelocity(0);
-        }
+        mActivity.getStateManager().goToState(NORMAL);
     }
 
     @Override
-- 
GitLab


From e8b22d5e60d2527e073e6d20af014f2b4afccacb Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 14 Apr 2021 13:50:04 -0700
Subject: [PATCH 1083/1664] When overview appears from motion pause, come up
 from bottom

- Add vertical offset calculations to RecentsView (in addition to
  the existing horizontal offset which has been renamed accordingly).
- LauncherState#getOverviewScaleAndOffset() now supports both
  horizontal and vertical offsets and is specified such that overview
  appears and disappears from the bottom of the screen rather than the
  side.
- Quick switch still uses horizontal offset to come from the side.
- No longer need to scroll to page 0 when translating offscreen.
- Update interpolators for overview to home transition.
- Align 2 button mode transition with 0 button mode.

Test: Visually checking all of these. As appropriate, repeat in 0, 2, 3
button modes, landscape/portrait/fake landscape, and 3P launcher
- Quick switch from home
- Home to overview
- Overview to home (swipe up)
- Overview to home (tap outside)
- Overview to home (back invocation)
- Quick switch from app
- Swipe up and hold from app
- Dismiss an app
- Empty recents
- Split select state to home
- Modal state to home

Bug: 185411781
Change-Id: Ic59b877ccc0050afd7cd478778e9eeb60e2e47f7
---
 .../launcher3/BaseQuickstepLauncher.java      |   3 +-
 .../BaseRecentsViewStateController.java       |  11 +-
 .../uioverrides/states/AllAppsState.java      |   5 -
 .../states/BackgroundAppState.java            |   2 +-
 .../states/OverviewModalTaskState.java        |   2 +-
 .../uioverrides/states/OverviewState.java     |   8 +-
 .../QuickstepAtomicAnimationFactory.java      |  62 +++++----
 .../NoButtonQuickSwitchTouchController.java   |   8 +-
 .../QuickSwitchTouchController.java           |  11 ++
 .../quickstep/BaseActivityInterface.java      |  14 +--
 .../FallbackRecentsStateController.java       |   7 +-
 .../quickstep/fallback/RecentsState.java      |   4 +-
 .../quickstep/util/OverviewToHomeAnim.java    |  20 +--
 .../util/RecentsAtomicAnimationFactory.java   |  12 +-
 .../android/quickstep/views/RecentsView.java  | 118 ++++++++++++++----
 .../com/android/quickstep/views/TaskView.java |   5 +
 src/com/android/launcher3/Launcher.java       |   2 +-
 src/com/android/launcher3/LauncherState.java  |   4 +-
 18 files changed, 196 insertions(+), 102 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index cd22196686..63c1fce328 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -19,6 +19,7 @@ import static com.android.launcher3.AbstractFloatingView.TYPE_ALL;
 import static com.android.launcher3.AbstractFloatingView.TYPE_HIDE_BACK_BUTTON;
 import static com.android.launcher3.LauncherState.FLAG_HIDE_BACK_BUTTON;
 import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.LauncherState.NO_OFFSET;
 import static com.android.launcher3.util.DisplayController.CHANGE_ACTIVE_SCREEN;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
@@ -343,7 +344,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
     @Override
     public float[] getNormalOverviewScaleAndOffset() {
         return SysUINavigationMode.getMode(this).hasGestures
-                ? new float[] {1, 1} : new float[] {1.1f, 0};
+                ? new float[] {1, NO_OFFSET, 1} : new float[] {1.1f, NO_OFFSET, NO_OFFSET};
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
index b3374f33b9..e508690113 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
@@ -22,8 +22,10 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FA
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_MODAL;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
-import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET;
+import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_HORIZONTAL_OFFSET;
+import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_VERTICAL_OFFSET;
 import static com.android.quickstep.views.RecentsView.RECENTS_GRID_PROGRESS;
 import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
 import static com.android.quickstep.views.RecentsView.TASK_PRIMARY_SPLIT_TRANSLATION;
@@ -62,7 +64,8 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView>
     public void setState(@NonNull LauncherState state) {
         float[] scaleAndOffset = state.getOverviewScaleAndOffset(mLauncher);
         RECENTS_SCALE_PROPERTY.set(mRecentsView, scaleAndOffset[0]);
-        ADJACENT_PAGE_OFFSET.set(mRecentsView, scaleAndOffset[1]);
+        ADJACENT_PAGE_HORIZONTAL_OFFSET.set(mRecentsView, scaleAndOffset[1]);
+        ADJACENT_PAGE_VERTICAL_OFFSET.set(mRecentsView, scaleAndOffset[2]);
         TASK_SECONDARY_TRANSLATION.set(mRecentsView, 0f);
 
         getContentAlphaProperty().set(mRecentsView, state.overviewUi ? 1f : 0);
@@ -92,8 +95,10 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView>
         float[] scaleAndOffset = toState.getOverviewScaleAndOffset(mLauncher);
         setter.setFloat(mRecentsView, RECENTS_SCALE_PROPERTY, scaleAndOffset[0],
                 config.getInterpolator(ANIM_OVERVIEW_SCALE, LINEAR));
-        setter.setFloat(mRecentsView, ADJACENT_PAGE_OFFSET, scaleAndOffset[1],
+        setter.setFloat(mRecentsView, ADJACENT_PAGE_HORIZONTAL_OFFSET, scaleAndOffset[1],
                 config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_X, LINEAR));
+        setter.setFloat(mRecentsView, ADJACENT_PAGE_VERTICAL_OFFSET, scaleAndOffset[2],
+                config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, LINEAR));
         PagedOrientationHandler orientationHandler =
                 ((RecentsView) mLauncher.getOverviewPanel()).getPagedOrientationHandler();
         FloatProperty taskViewsFloat = orientationHandler.getSplitSelectTaskOffset(
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
index a81bdd52ca..d822c8cf82 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
@@ -83,11 +83,6 @@ public class AllAppsState extends LauncherState {
         return ALL_APPS_CONTENT;
     }
 
-    @Override
-    public float[] getOverviewScaleAndOffset(Launcher launcher) {
-        return new float[] {0.9f, 1};
-    }
-
     @Override
     public LauncherState getHistoryForState(LauncherState previousState) {
         return previousState == OVERVIEW ? OVERVIEW : NORMAL;
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
index 77c261154b..06ffae449e 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
@@ -96,6 +96,6 @@ public class BackgroundAppState extends OverviewState {
             BaseDraggingActivity activity) {
         return new float[] {
                 ((RecentsView) activity.getOverviewPanel()).getMaxScaleForFullScreen(),
-                NO_OFFSET};
+                NO_OFFSET, NO_OFFSET};
     }
 }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java
index 6f084a1f97..1fc288f7cf 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java
@@ -78,6 +78,6 @@ public class OverviewModalTaskState extends OverviewState {
         float scale = Math.min((float) modalTaskSize.height() / taskSize.y,
                 (float) modalTaskSize.width() / taskSize.x);
 
-        return new float[] {scale, NO_OFFSET};
+        return new float[] {scale, NO_OFFSET, NO_OFFSET};
     }
 }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
index 135c47865b..c9cfad3d3f 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -17,7 +17,6 @@ package com.android.launcher3.uioverrides.states;
 
 import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW;
-import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
 
 import android.content.Context;
 import android.graphics.Rect;
@@ -60,9 +59,8 @@ public class OverviewState extends LauncherState {
 
     @Override
     public int getTransitionDuration(Context context) {
-        // In no-button mode, overview comes in all the way from the left, so give it more time.
-        boolean isNoButtonMode = SysUINavigationMode.INSTANCE.get(context).getMode() == NO_BUTTON;
-        return isNoButtonMode ? 380 : 250;
+        // In gesture modes, overview comes in all the way from the bottom, so give it more time.
+        return SysUINavigationMode.INSTANCE.get(context).getMode().hasGestures ? 380 : 250;
     }
 
     @Override
@@ -80,7 +78,7 @@ public class OverviewState extends LauncherState {
 
     @Override
     public float[] getOverviewScaleAndOffset(Launcher launcher) {
-        return new float[] {NO_SCALE, NO_OFFSET};
+        return new float[] {NO_SCALE, NO_OFFSET, NO_OFFSET};
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
index fd7a67ad79..adc6b18fed 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
@@ -23,11 +23,10 @@ import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.WorkspaceStateTransitionAnimation.getSpringScaleAnimator;
 import static com.android.launcher3.anim.Interpolators.ACCEL;
-import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
+import static com.android.launcher3.anim.Interpolators.AGGRESSIVE_EASE_IN_OUT;
 import static com.android.launcher3.anim.Interpolators.DEACCEL;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_1_7;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
-import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 import static com.android.launcher3.anim.Interpolators.FINAL_FRAME;
 import static com.android.launcher3.anim.Interpolators.INSTANT;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
@@ -40,20 +39,18 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FA
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_SCRIM_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_SCALE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_TRANSLATE;
-import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
 import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
 
 import android.animation.ValueAnimator;
-import android.view.View;
 
 import com.android.launcher3.CellLayout;
 import com.android.launcher3.Hotseat;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.Workspace;
-import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.uioverrides.QuickstepLauncher;
 import com.android.quickstep.SysUINavigationMode;
@@ -68,6 +65,12 @@ public class QuickstepAtomicAnimationFactory extends
 
     // Scale recents takes before animating in
     private static final float RECENTS_PREPARE_SCALE = 1.33f;
+    // Scale workspace takes before animating in
+    private static final float WORKSPACE_PREPARE_SCALE_GESTURES = 0.97f;
+    private static final float WORKSPACE_PREPARE_SCALE_BUTTONS = 0.92f;
+    // When the overview to home transition reaches this percentage, immediately hide overview and
+    // start animating away the scrim and animating in workspace.
+    private static final float OVERVIEW_TO_HOME_HARD_HAND_OFF = 0.4f;
 
     // Due to use of physics, duration may differ between devices so we need to calculate and
     // cache the value.
@@ -82,23 +85,31 @@ public class QuickstepAtomicAnimationFactory extends
             StateAnimationConfig config) {
         RecentsView overview = mActivity.getOverviewPanel();
         if (toState == NORMAL && fromState == OVERVIEW) {
-            config.setInterpolator(ANIM_WORKSPACE_SCALE, DEACCEL);
-            config.setInterpolator(ANIM_WORKSPACE_FADE, ACCEL);
-            config.setInterpolator(ANIM_ALL_APPS_FADE, ACCEL);
-            config.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, LINEAR);
-
+            final float workspacePrepareScale;
             if (SysUINavigationMode.getMode(mActivity).hasGestures
                     && overview.getTaskViewCount() > 0) {
+                workspacePrepareScale = WORKSPACE_PREPARE_SCALE_GESTURES;
                 // Overview is going offscreen, so keep it at its current scale and opacity.
                 config.setInterpolator(ANIM_OVERVIEW_SCALE, FINAL_FRAME);
-                config.setInterpolator(ANIM_OVERVIEW_FADE, FINAL_FRAME);
-                config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X,
-                        clampToProgress(FAST_OUT_SLOW_IN, 0, 0.75f));
-                config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, FINAL_FRAME);
+                config.setInterpolator(ANIM_OVERVIEW_FADE, clampToProgress(
+                        FINAL_FRAME, 0f, OVERVIEW_TO_HOME_HARD_HAND_OFF));
+                config.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, clampToProgress(
+                        DEACCEL, 0f, OVERVIEW_TO_HOME_HARD_HAND_OFF));
+                config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, AGGRESSIVE_EASE_IN_OUT);
+                config.setInterpolator(ANIM_SCRIM_FADE, clampToProgress(
+                        DEACCEL, OVERVIEW_TO_HOME_HARD_HAND_OFF, 1f));
+                config.setInterpolator(ANIM_WORKSPACE_SCALE, clampToProgress(
+                        DEACCEL, OVERVIEW_TO_HOME_HARD_HAND_OFF, 1f));
+                config.setInterpolator(ANIM_WORKSPACE_FADE, clampToProgress(
+                        INSTANT, OVERVIEW_TO_HOME_HARD_HAND_OFF, 1f));
             } else {
-                config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, ACCEL_DEACCEL);
+                workspacePrepareScale = WORKSPACE_PREPARE_SCALE_BUTTONS;
                 config.setInterpolator(ANIM_OVERVIEW_SCALE, clampToProgress(ACCEL, 0, 0.9f));
                 config.setInterpolator(ANIM_OVERVIEW_FADE, DEACCEL_1_7);
+                config.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, LINEAR);
+                config.setInterpolator(ANIM_SCRIM_FADE, LINEAR);
+                config.setInterpolator(ANIM_WORKSPACE_SCALE, DEACCEL);
+                config.setInterpolator(ANIM_WORKSPACE_FADE, ACCEL);
             }
 
             Workspace workspace = mActivity.getWorkspace();
@@ -111,25 +122,18 @@ public class QuickstepAtomicAnimationFactory extends
                         && currentChild.getShortcutsAndWidgets().getAlpha() > 0;
             }
             if (!isWorkspaceVisible) {
-                workspace.setScaleX(0.92f);
-                workspace.setScaleY(0.92f);
+                workspace.setScaleX(workspacePrepareScale);
+                workspace.setScaleY(workspacePrepareScale);
             }
             Hotseat hotseat = mActivity.getHotseat();
             boolean isHotseatVisible = hotseat.getVisibility() == VISIBLE && hotseat.getAlpha() > 0;
             if (!isHotseatVisible) {
-                hotseat.setScaleX(0.92f);
-                hotseat.setScaleY(0.92f);
-                AllAppsContainerView qsbContainer = mActivity.getAppsView();
-                View qsb = qsbContainer.getSearchView();
-                boolean qsbVisible = qsb.getVisibility() == VISIBLE && qsb.getAlpha() > 0;
-                if (!qsbVisible) {
-                    qsbContainer.setScaleX(0.92f);
-                    qsbContainer.setScaleY(0.92f);
-                }
+                hotseat.setScaleX(workspacePrepareScale);
+                hotseat.setScaleY(workspacePrepareScale);
             }
         } else if ((fromState == NORMAL || fromState == HINT_STATE
                 || fromState == HINT_STATE_TWO_BUTTON) && toState == OVERVIEW) {
-            if (SysUINavigationMode.getMode(mActivity) == NO_BUTTON) {
+            if (SysUINavigationMode.getMode(mActivity).hasGestures) {
                 config.setInterpolator(ANIM_WORKSPACE_SCALE,
                         fromState == NORMAL ? ACCEL : OVERSHOOT_1_2);
                 config.setInterpolator(ANIM_WORKSPACE_TRANSLATE, ACCEL);
@@ -153,6 +157,10 @@ public class QuickstepAtomicAnimationFactory extends
             config.setInterpolator(ANIM_ALL_APPS_FADE, OVERSHOOT_1_2);
             config.setInterpolator(ANIM_OVERVIEW_SCALE, OVERSHOOT_1_2);
             config.setInterpolator(ANIM_DEPTH, OVERSHOOT_1_2);
+            config.setInterpolator(ANIM_SCRIM_FADE, t -> {
+                // Animate at the same rate until reaching progress 1, and skip the overshoot.
+                return Math.min(1, OVERSHOOT_1_2.getInterpolation(t));
+            });
             config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, OVERSHOOT_1_2);
             config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, OVERSHOOT_1_2);
         } else if (fromState == HINT_STATE && toState == NORMAL) {
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
index 8278a5a660..0f64abca61 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
@@ -41,7 +41,8 @@ import static com.android.launcher3.touch.BothAxesSwipeDetector.DIRECTION_RIGHT;
 import static com.android.launcher3.touch.BothAxesSwipeDetector.DIRECTION_UP;
 import static com.android.launcher3.util.DisplayController.getSingleFrameMs;
 import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;
-import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET;
+import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_HORIZONTAL_OFFSET;
+import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_VERTICAL_OFFSET;
 import static com.android.quickstep.views.RecentsView.CONTENT_ALPHA;
 import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS;
 import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
@@ -221,7 +222,8 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
 
         // Set RecentView's initial properties.
         RECENTS_SCALE_PROPERTY.set(mRecentsView, fromState.getOverviewScaleAndOffset(mLauncher)[0]);
-        ADJACENT_PAGE_OFFSET.set(mRecentsView, 1f);
+        ADJACENT_PAGE_HORIZONTAL_OFFSET.set(mRecentsView, 1f);
+        ADJACENT_PAGE_VERTICAL_OFFSET.set(mRecentsView, 0f);
         mRecentsView.setContentAlpha(1);
         mRecentsView.setFullscreenProgress(fromState.getOverviewFullscreenProgress());
         mLauncher.getActionsView().getVisibilityAlpha().setValue(
@@ -233,7 +235,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
         //   - OverviewScrim
         //   - RecentsView fade (if it's empty)
         PendingAnimation xAnim = new PendingAnimation((long) (mXRange * 2));
-        xAnim.setFloat(mRecentsView, ADJACENT_PAGE_OFFSET, scaleAndOffset[1], LINEAR);
+        xAnim.setFloat(mRecentsView, ADJACENT_PAGE_HORIZONTAL_OFFSET, scaleAndOffset[1], LINEAR);
         xAnim.setViewBackgroundColor(mLauncher.getScrimView(),
                 toState.getWorkspaceScrimColor(mLauncher), LINEAR);
         if (mRecentsView.getTaskViewCount() == 0) {
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
index 3953e4245d..5891d5f16a 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
@@ -30,6 +30,9 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_VERTICAL_PR
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_TRANSLATE;
 import static com.android.launcher3.util.SystemUiController.UI_STATE_FULLSCREEN_TASK;
+import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_HORIZONTAL_OFFSET;
+import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_VERTICAL_OFFSET;
+import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
 import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
@@ -105,6 +108,14 @@ public class QuickSwitchTouchController extends AbstractStateChangeTouchControll
         StateAnimationConfig config = new StateAnimationConfig();
         setupInterpolators(config);
         config.duration = (long) (getShiftRange() * 2);
+
+        // Set RecentView's initial properties for coming in from the side.
+        RECENTS_SCALE_PROPERTY.set(mOverviewPanel,
+                QUICK_SWITCH.getOverviewScaleAndOffset(mLauncher)[0] * 0.85f);
+        ADJACENT_PAGE_HORIZONTAL_OFFSET.set(mOverviewPanel, 1f);
+        ADJACENT_PAGE_VERTICAL_OFFSET.set(mOverviewPanel, 0f);
+        mOverviewPanel.setContentAlpha(1);
+
         mCurrentAnimation = mLauncher.getStateManager()
                 .createAnimationToNewWorkspace(mToState, config);
         mCurrentAnimation.getTarget().addListener(mClearStateOnCancelListener);
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index 7aa81d4819..b60b1be24b 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -23,8 +23,8 @@ import static com.android.quickstep.AbsSwipeUpHandler.RECENTS_ATTACH_DURATION;
 import static com.android.quickstep.GestureState.GestureEndTarget.RECENTS;
 import static com.android.quickstep.SysUINavigationMode.getMode;
 import static com.android.quickstep.util.RecentsAtomicAnimationFactory.INDEX_RECENTS_FADE_ANIM;
-import static com.android.quickstep.util.RecentsAtomicAnimationFactory.INDEX_RECENTS_TRANSLATE_X_ANIM;
-import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET;
+import static com.android.quickstep.util.RecentsAtomicAnimationFactory.INDEX_RECENTS_TRANSLATE_Y_ANIM;
+import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_VERTICAL_OFFSET;
 import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS;
 import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
 import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION;
@@ -469,17 +469,17 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
             float fromTranslation = attached ? 1 : 0;
             float toTranslation = attached ? 0 : 1;
             mActivity.getStateManager()
-                    .cancelStateElementAnimation(INDEX_RECENTS_TRANSLATE_X_ANIM);
+                    .cancelStateElementAnimation(INDEX_RECENTS_TRANSLATE_Y_ANIM);
             if (!recentsView.isShown() && animate) {
-                ADJACENT_PAGE_OFFSET.set(recentsView, fromTranslation);
+                ADJACENT_PAGE_VERTICAL_OFFSET.set(recentsView, fromTranslation);
             } else {
-                fromTranslation = ADJACENT_PAGE_OFFSET.get(recentsView);
+                fromTranslation = ADJACENT_PAGE_VERTICAL_OFFSET.get(recentsView);
             }
             if (!animate) {
-                ADJACENT_PAGE_OFFSET.set(recentsView, toTranslation);
+                ADJACENT_PAGE_VERTICAL_OFFSET.set(recentsView, toTranslation);
             } else {
                 mActivity.getStateManager().createStateElementAnimation(
-                        INDEX_RECENTS_TRANSLATE_X_ANIM,
+                        INDEX_RECENTS_TRANSLATE_Y_ANIM,
                         fromTranslation, toTranslation).start();
             }
 
diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
index e4d148cb76..4d776bafca 100644
--- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
+++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
@@ -22,7 +22,8 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TR
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_SCRIM_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
-import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET;
+import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_HORIZONTAL_OFFSET;
+import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_VERTICAL_OFFSET;
 import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS;
 import static com.android.quickstep.views.RecentsView.RECENTS_GRID_PROGRESS;
 import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
@@ -86,8 +87,10 @@ public class FallbackRecentsStateController implements StateHandler<RecentsState
         float[] scaleAndOffset = state.getOverviewScaleAndOffset(mActivity);
         setter.setFloat(mRecentsView, RECENTS_SCALE_PROPERTY, scaleAndOffset[0],
                 config.getInterpolator(ANIM_OVERVIEW_SCALE, LINEAR));
-        setter.setFloat(mRecentsView, ADJACENT_PAGE_OFFSET, scaleAndOffset[1],
+        setter.setFloat(mRecentsView, ADJACENT_PAGE_HORIZONTAL_OFFSET, scaleAndOffset[1],
                 config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_X, LINEAR));
+        setter.setFloat(mRecentsView, ADJACENT_PAGE_VERTICAL_OFFSET, scaleAndOffset[2],
+                config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, LINEAR));
         setter.setFloat(mRecentsView, TASK_SECONDARY_TRANSLATION, 0f,
                 config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, LINEAR));
 
diff --git a/quickstep/src/com/android/quickstep/fallback/RecentsState.java b/quickstep/src/com/android/quickstep/fallback/RecentsState.java
index b6cfdce65a..532f2190ce 100644
--- a/quickstep/src/com/android/quickstep/fallback/RecentsState.java
+++ b/quickstep/src/com/android/quickstep/fallback/RecentsState.java
@@ -126,7 +126,7 @@ public class RecentsState implements BaseState<RecentsState> {
     }
 
     public float[] getOverviewScaleAndOffset(RecentsActivity activity) {
-        return new float[] { NO_SCALE, NO_OFFSET };
+        return new float[] { NO_SCALE, NO_OFFSET, NO_OFFSET };
     }
 
     /**
@@ -170,7 +170,7 @@ public class RecentsState implements BaseState<RecentsState> {
 
         @Override
         public float[] getOverviewScaleAndOffset(RecentsActivity activity) {
-            return new float[] { NO_SCALE, 1 };
+            return new float[] { NO_SCALE, NO_OFFSET, 1 };
         }
     }
 }
diff --git a/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java b/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
index b427e5fb2c..10b7662ad9 100644
--- a/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
+++ b/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
@@ -27,23 +27,16 @@ import com.android.launcher3.LauncherState;
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.states.StateAnimationConfig;
-import com.android.quickstep.views.RecentsView;
 
 /**
  * Runs an animation from overview to home. Currently, this animation is just a wrapper around the
- * normal state transition, in order to keep RecentsView at the same scale and translationY that
- * it started out at as it translates offscreen. It also scrolls RecentsView to page 0 and may play
- * a {@link StaggeredWorkspaceAnim} if we're starting from an upward fling.
+ * normal state transition and may play a {@link StaggeredWorkspaceAnim} if we're starting from an
+ * upward fling.
  */
 public class OverviewToHomeAnim {
 
     private static final String TAG = "OverviewToHomeAnim";
 
-    // Constants to specify how to scroll RecentsView to the default page if it's not already there.
-    private static final int DEFAULT_PAGE = 0;
-    private static final int PER_PAGE_SCROLL_DURATION = 150;
-    private static final int MAX_PAGE_SCROLL_DURATION = 750;
-
     private final Launcher mLauncher;
     private final Runnable mOnReachedHome;
 
@@ -84,14 +77,8 @@ public class OverviewToHomeAnim {
             mIsHomeStaggeredAnimFinished = true;
         }
 
-        RecentsView recentsView = mLauncher.getOverviewPanel();
-        int numPagesToScroll = recentsView.getNextPage() - DEFAULT_PAGE;
-        int scrollDuration = Math.min(MAX_PAGE_SCROLL_DURATION,
-                numPagesToScroll * PER_PAGE_SCROLL_DURATION);
-        int duration = Math.max(scrollDuration, startState.getTransitionDuration(mLauncher));
-
         StateAnimationConfig config = new StateAnimationConfig();
-        config.duration = duration;
+        config.duration = startState.getTransitionDuration(mLauncher);
         AnimatorSet stateAnim = stateManager.createAtomicAnimation(
                 startState, NORMAL, config);
         stateAnim.addListener(new AnimationSuccessListener() {
@@ -104,7 +91,6 @@ public class OverviewToHomeAnim {
         anim.play(stateAnim);
         stateManager.setCurrentAnimation(anim, NORMAL);
         anim.start();
-        recentsView.snapToPage(DEFAULT_PAGE, duration);
     }
 
     private void maybeOverviewToHomeAnimComplete() {
diff --git a/quickstep/src/com/android/quickstep/util/RecentsAtomicAnimationFactory.java b/quickstep/src/com/android/quickstep/util/RecentsAtomicAnimationFactory.java
index ba70bf70a4..c1ca060a60 100644
--- a/quickstep/src/com/android/quickstep/util/RecentsAtomicAnimationFactory.java
+++ b/quickstep/src/com/android/quickstep/util/RecentsAtomicAnimationFactory.java
@@ -15,11 +15,13 @@
  */
 package com.android.quickstep.util;
 
-import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET;
+import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_VERTICAL_OFFSET;
 
 import android.animation.Animator;
 import android.animation.ObjectAnimator;
 
+import androidx.dynamicanimation.animation.DynamicAnimation;
+
 import com.android.launcher3.anim.SpringAnimationBuilder;
 import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory;
 import com.android.launcher3.statemanager.StatefulActivity;
@@ -29,7 +31,7 @@ public class RecentsAtomicAnimationFactory<ACTIVITY_TYPE extends StatefulActivit
         extends AtomicAnimationFactory<STATE_TYPE> {
 
     public static final int INDEX_RECENTS_FADE_ANIM = AtomicAnimationFactory.NEXT_INDEX + 0;
-    public static final int INDEX_RECENTS_TRANSLATE_X_ANIM = AtomicAnimationFactory.NEXT_INDEX + 1;
+    public static final int INDEX_RECENTS_TRANSLATE_Y_ANIM = AtomicAnimationFactory.NEXT_INDEX + 1;
 
     private static final int MY_ANIM_COUNT = 2;
 
@@ -46,14 +48,14 @@ public class RecentsAtomicAnimationFactory<ACTIVITY_TYPE extends StatefulActivit
             case INDEX_RECENTS_FADE_ANIM:
                 return ObjectAnimator.ofFloat(mActivity.getOverviewPanel(),
                         RecentsView.CONTENT_ALPHA, values);
-            case INDEX_RECENTS_TRANSLATE_X_ANIM: {
+            case INDEX_RECENTS_TRANSLATE_Y_ANIM: {
                 RecentsView rv = mActivity.getOverviewPanel();
                 return new SpringAnimationBuilder(mActivity)
-                        .setMinimumVisibleChange(1f / rv.getPageOffsetScale())
+                        .setMinimumVisibleChange(DynamicAnimation.MIN_VISIBLE_CHANGE_SCALE)
                         .setDampingRatio(0.8f)
                         .setStiffness(250)
                         .setValues(values)
-                        .build(rv, ADJACENT_PAGE_OFFSET);
+                        .build(rv, ADJACENT_PAGE_VERTICAL_OFFSET);
             }
             default:
                 return super.createStateElementAnimation(index, values);
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 63981b1522..d2d3bc39d5 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -213,19 +213,35 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 }
             };
 
-    public static final FloatProperty<RecentsView> ADJACENT_PAGE_OFFSET =
-            new FloatProperty<RecentsView>("adjacentPageOffset") {
+    public static final FloatProperty<RecentsView> ADJACENT_PAGE_HORIZONTAL_OFFSET =
+            new FloatProperty<RecentsView>("adjacentPageHorizontalOffset") {
                 @Override
                 public void setValue(RecentsView recentsView, float v) {
-                    if (recentsView.mAdjacentPageOffset != v) {
-                        recentsView.mAdjacentPageOffset = v;
+                    if (recentsView.mAdjacentPageHorizontalOffset != v) {
+                        recentsView.mAdjacentPageHorizontalOffset = v;
                         recentsView.updatePageOffsets();
                     }
                 }
 
                 @Override
                 public Float get(RecentsView recentsView) {
-                    return recentsView.mAdjacentPageOffset;
+                    return recentsView.mAdjacentPageHorizontalOffset;
+                }
+            };
+
+    public static final FloatProperty<RecentsView> ADJACENT_PAGE_VERTICAL_OFFSET =
+            new FloatProperty<RecentsView>("adjacentPageVerticalOffset") {
+                @Override
+                public void setValue(RecentsView recentsView, float v) {
+                    if (recentsView.mAdjacentPageVerticalOffset != v) {
+                        recentsView.mAdjacentPageVerticalOffset = v;
+                        recentsView.updateVerticalPageOffsets();
+                    }
+                }
+
+                @Override
+                public Float get(RecentsView recentsView) {
+                    return recentsView.mAdjacentPageVerticalOffset;
                 }
             };
 
@@ -240,6 +256,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 @Override
                 public void setValue(RecentsView recentsView, float v) {
                     recentsView.setTaskViewsResistanceTranslation(v);
+                    recentsView.mLastComputedTaskBottomPushOutDistance = null;
+                    recentsView.updateVerticalPageOffsets();
                 }
 
                 @Override
@@ -289,9 +307,11 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                     view.setScaleY(scale);
                     view.mLastComputedTaskStartPushOutDistance = null;
                     view.mLastComputedTaskEndPushOutDistance = null;
+                    view.mLastComputedTaskBottomPushOutDistance = null;
                     view.mLiveTileTaskViewSimulator.recentsViewScale.value = scale;
-                    view.updatePageOffsets();
                     view.setTaskViewsResistanceTranslation(view.mTaskViewsSecondaryTranslation);
+                    view.updatePageOffsets();
+                    view.updateVerticalPageOffsets();
                 }
 
                 @Override
@@ -330,6 +350,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     // How much a task that is directly offscreen will be pushed out due to RecentsView scale/pivot.
     protected Float mLastComputedTaskStartPushOutDistance = null;
     protected Float mLastComputedTaskEndPushOutDistance = null;
+    protected Float mLastComputedTaskBottomPushOutDistance = null;
     protected boolean mEnableDrawingLiveTile = false;
     protected final Rect mTempRect = new Rect();
     protected final RectF mTempRectF = new RectF();
@@ -373,7 +394,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     private boolean mOverviewGridEnabled;
     private boolean mOverviewFullscreenEnabled;
 
-    private float mAdjacentPageOffset = 0;
+    private float mAdjacentPageHorizontalOffset = 0;
+    private float mAdjacentPageVerticalOffset = 0;
     protected float mTaskViewsSecondaryTranslation = 0;
     protected float mTaskViewsPrimarySplitTranslation = 0;
     protected float mTaskViewsSecondarySplitTranslation = 0;
@@ -1188,6 +1210,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         // Update the set of visible task's data
         loadVisibleTaskData(TaskView.FLAG_UPDATE_ALL);
         setTaskModalness(0);
+        updateVerticalPageOffsets();
     }
 
     public void setFullscreenProgress(float fullscreenProgress) {
@@ -2643,13 +2666,15 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         setTaskModalness(mTaskModalness);
         mLastComputedTaskStartPushOutDistance = null;
         mLastComputedTaskEndPushOutDistance = null;
+        mLastComputedTaskBottomPushOutDistance = null;
         updatePageOffsets();
+        updateVerticalPageOffsets();
         setImportantForAccessibility(isModal() ? IMPORTANT_FOR_ACCESSIBILITY_NO
                 : IMPORTANT_FOR_ACCESSIBILITY_AUTO);
     }
 
     private void updatePageOffsets() {
-        float offset = mAdjacentPageOffset;
+        float offset = mAdjacentPageHorizontalOffset;
         float modalOffset = ACCEL_0_75.getInterpolation(mTaskModalness);
         int count = getChildCount();
 
@@ -2660,10 +2685,10 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
 
         float midpointOffsetSize = 0;
         float leftOffsetSize = midpoint - 1 >= 0
-                ? -getOffsetSize(midpoint - 1, midpoint, offset)
+                ? -getHorizontalOffsetSize(midpoint - 1, midpoint, offset)
                 : 0;
         float rightOffsetSize = midpoint + 1 < count
-                ? getOffsetSize(midpoint + 1, midpoint, offset)
+                ? getHorizontalOffsetSize(midpoint + 1, midpoint, offset)
                 : 0;
 
         boolean showAsGrid = showAsGrid();
@@ -2677,14 +2702,14 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             // calculation is the task directly next to the focus task in the grid.
             int referenceIndex = modalMidpoint == 0 ? 1 : 0;
             gridOffsetSize = referenceIndex < count
-                    ? getOffsetSize(referenceIndex, modalMidpoint, modalOffset)
+                    ? getHorizontalOffsetSize(referenceIndex, modalMidpoint, modalOffset)
                     : 0;
         } else {
             modalLeftOffsetSize = modalMidpoint - 1 >= 0
-                    ? getOffsetSize(modalMidpoint - 1, modalMidpoint, modalOffset)
+                    ? getHorizontalOffsetSize(modalMidpoint - 1, modalMidpoint, modalOffset)
                     : 0;
             modalRightOffsetSize = modalMidpoint + 1 < count
-                    ? getOffsetSize(modalMidpoint + 1, modalMidpoint, modalOffset)
+                    ? getHorizontalOffsetSize(modalMidpoint + 1, modalMidpoint, modalOffset)
                     : 0;
         }
 
@@ -2735,7 +2760,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
      * translating away from the given midpoint.
      * @param offsetProgress From 0 to 1 where 0 means no offset and 1 means offset offscreen.
      */
-    private float getOffsetSize(int childIndex, int midpointIndex, float offsetProgress) {
+    private float getHorizontalOffsetSize(int childIndex, int midpointIndex, float offsetProgress) {
         if (offsetProgress == 0) {
             // Don't bother calculating everything below if we won't offset anyway.
             return 0;
@@ -2797,6 +2822,64 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         return distanceToOffscreen * offsetProgress;
     }
 
+    private void updateVerticalPageOffsets() {
+        float offset = mAdjacentPageVerticalOffset;
+        int count = getTaskViewCount();
+
+        TaskView runningTask = mRunningTaskId == -1 || !mRunningTaskTileHidden
+                ? null : getTaskView(mRunningTaskId);
+        int midpoint = runningTask == null ? -1 : indexOfChild(runningTask);
+
+        float offsetSize = getVerticalOffsetSize(offset);
+        float midpointOffsetSize = 0;
+
+        for (int i = 0; i < count; i++) {
+            float translation = i == midpoint
+                    ? midpointOffsetSize
+                    : offsetSize;
+            int directionFactor = mOrientationHandler.getSecondaryTranslationDirectionFactor() * -1;
+            translation *= directionFactor;
+            TaskView child = getTaskViewAt(i);
+            FloatProperty translationProperty = child.getSecondaryTaskOffsetTranslationProperty();
+            translationProperty.set(child, translation);
+            if (LIVE_TILE.get() && mEnableDrawingLiveTile && i == getRunningTaskIndex()) {
+                mLiveTileTaskViewSimulator.taskSecondaryTranslation.value = translation;
+                redrawLiveTile();
+            }
+        }
+    }
+
+    /**
+     * Computes the distance to offset the given child such that it is completely offscreen when
+     * translating away from its position in overview.
+     * @param offsetProgress From 0 to 1 where 0 means no offset and 1 means offset offscreen.
+     */
+    private float getVerticalOffsetSize(float offsetProgress) {
+        if (offsetProgress == 0) {
+            // Don't bother calculating everything below if we won't offset anyway.
+            return 0;
+        }
+        // First, find the distance to offscreen from the normal (centered) task position.
+        mTempRectF.set(mLastComputedTaskSize);
+        RectF taskPosition = mTempRectF;
+        float desiredTop = getHeight();
+        float distanceToOffscreen = desiredTop - taskPosition.top;
+        // Next, we need to account for the resistance translation if any (e.g. long swipe up).
+        float translationY = mTaskViewsSecondaryTranslation;
+        distanceToOffscreen -= translationY;
+        // Finally, we need to account for RecentsView scale, because it moves tasks based on its
+        // pivot. To do this, we move the task position to where it would be offscreen at scale = 1
+        // (computed above), then we apply the scale via getMatrix() to determine how much that
+        // moves the task from its desired position, and adjust the computed distance accordingly.
+        if (mLastComputedTaskBottomPushOutDistance == null) {
+            taskPosition.offsetTo(0, desiredTop + translationY);
+            getMatrix().mapRect(taskPosition);
+            mLastComputedTaskBottomPushOutDistance = (taskPosition.top - desiredTop) / getScaleY();
+        }
+        distanceToOffscreen -= mLastComputedTaskBottomPushOutDistance;
+        return distanceToOffscreen * offsetProgress;
+    }
+
     protected void setTaskViewsResistanceTranslation(float translation) {
         mTaskViewsSecondaryTranslation = translation;
         for (int i = 0; i < getTaskViewCount(); i++) {
@@ -2822,13 +2905,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         }
     }
 
-    /**
-     * TODO: Do not assume motion across X axis for adjacent page
-     */
-    public float getPageOffsetScale() {
-        return Math.max(getWidth(), 1);
-    }
-
     /**
      * Resets the visuals when exit modal state.
      */
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 14779331b2..6f3aade68b 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -1151,6 +1151,11 @@ public class TaskView extends FrameLayout implements Reusable {
                 TASK_OFFSET_TRANSLATION_X, TASK_OFFSET_TRANSLATION_Y);
     }
 
+    public FloatProperty<TaskView> getSecondaryTaskOffsetTranslationProperty() {
+        return getPagedOrientationHandler().getSecondaryValue(
+                TASK_OFFSET_TRANSLATION_X, TASK_OFFSET_TRANSLATION_Y);
+    }
+
     public FloatProperty<TaskView> getTaskResistanceTranslationProperty() {
         return getPagedOrientationHandler().getSecondaryValue(
                 TASK_RESISTANCE_TRANSLATION_X, TASK_RESISTANCE_TRANSLATION_Y);
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 09c7b7aff0..bcc3e1ff69 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2780,7 +2780,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
      * @see LauncherState#getOverviewScaleAndOffset(Launcher)
      */
     public float[] getNormalOverviewScaleAndOffset() {
-        return new float[] {NO_SCALE, NO_OFFSET};
+        return new float[] {NO_SCALE, NO_OFFSET, NO_OFFSET};
     }
 
     /**
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java
index 4c11725719..9d50edd234 100644
--- a/src/com/android/launcher3/LauncherState.java
+++ b/src/com/android/launcher3/LauncherState.java
@@ -172,10 +172,12 @@ public abstract class LauncherState implements BaseState<LauncherState> {
     }
 
     /**
-     * Returns an array of two elements.
+     * Returns an array of three elements.
      * The first specifies the scale for the overview
      * The second is the factor ([0, 1], 0 => center-screen; 1 => offscreen) by which overview
      * should be shifted horizontally.
+     * The third is the factor ([0, 1], 0 => center-screen; 1 => offscreen) by which overview
+     * should be shifted vertically.
      */
     public float[] getOverviewScaleAndOffset(Launcher launcher) {
         return launcher.getNormalOverviewScaleAndOffset();
-- 
GitLab


From 48d6dc7708624740691238877368706ac9b12012 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 26 Apr 2021 15:17:04 -0700
Subject: [PATCH 1084/1664] Fix running task damped by overscroll when other
 tasks are offscreen

Test: Swipe up and to the left from an app, ensure the running task
scrolls freely until the adjacent task comes in from offscreen
Bug: 185411781

Change-Id: I9749124a6b6f014b55e3430d1764766a232eb9dd
---
 .../android/quickstep/views/RecentsView.java  | 58 ++++++++++++-------
 1 file changed, 36 insertions(+), 22 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index d2d3bc39d5..23f720041b 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -644,28 +644,9 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         // Draw overscroll
         if (mAllowOverScroll && (!mEdgeGlowRight.isFinished() || !mEdgeGlowLeft.isFinished())) {
             final int restoreCount = canvas.save();
-            final int width = getWidth();
-            final int height = getHeight();
-            int primarySize = mOrientationHandler.getPrimaryValue(width, height);
-            int secondarySize = mOrientationHandler.getSecondaryValue(width, height);
-
-            float effectiveShift = 0;
-            if (!mEdgeGlowLeft.isFinished()) {
-                mEdgeGlowLeft.setSize(secondarySize, primarySize);
-                if (((TranslateEdgeEffect) mEdgeGlowLeft).getTranslationShift(mTempFloat)) {
-                    effectiveShift = mTempFloat[0];
-                    postInvalidateOnAnimation();
-                }
-            }
-            if (!mEdgeGlowRight.isFinished()) {
-                mEdgeGlowRight.setSize(secondarySize, primarySize);
-                if (((TranslateEdgeEffect) mEdgeGlowRight).getTranslationShift(mTempFloat)) {
-                    effectiveShift -= mTempFloat[0];
-                    postInvalidateOnAnimation();
-                }
-            }
 
-            int scroll = OverScroll.dampedScroll(effectiveShift * primarySize, primarySize);
+            int primarySize = mOrientationHandler.getPrimaryValue(getWidth(), getHeight());
+            int scroll = OverScroll.dampedScroll(getUndampedOverScrollShift(), primarySize);
             mOrientationHandler.set(canvas, CANVAS_TRANSLATE, scroll);
 
             if (mOverScrollShift != scroll) {
@@ -687,6 +668,31 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         }
     }
 
+    private float getUndampedOverScrollShift() {
+        final int width = getWidth();
+        final int height = getHeight();
+        int primarySize = mOrientationHandler.getPrimaryValue(width, height);
+        int secondarySize = mOrientationHandler.getSecondaryValue(width, height);
+
+        float effectiveShift = 0;
+        if (!mEdgeGlowLeft.isFinished()) {
+            mEdgeGlowLeft.setSize(secondarySize, primarySize);
+            if (((TranslateEdgeEffect) mEdgeGlowLeft).getTranslationShift(mTempFloat)) {
+                effectiveShift = mTempFloat[0];
+                postInvalidateOnAnimation();
+            }
+        }
+        if (!mEdgeGlowRight.isFinished()) {
+            mEdgeGlowRight.setSize(secondarySize, primarySize);
+            if (((TranslateEdgeEffect) mEdgeGlowRight).getTranslationShift(mTempFloat)) {
+                effectiveShift -= mTempFloat[0];
+                postInvalidateOnAnimation();
+            }
+        }
+
+        return effectiveShift * primarySize;
+    }
+
     /**
      * Returns the view shift due to overscroll
      */
@@ -3512,8 +3518,16 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         if (pageIndex == -1) {
             return 0;
         }
+
+        int overScrollShift = getOverScrollShift();
+        if (mAdjacentPageVerticalOffset > 0) {
+            // Don't dampen the scroll (due to overscroll) if the adjacent tasks are offscreen, so
+            // that the page can move freely given there's no visual indication why it shouldn't.
+            overScrollShift = (int) Utilities.mapRange(mAdjacentPageVerticalOffset, overScrollShift,
+                    getUndampedOverScrollShift());
+        }
         return getScrollForPage(pageIndex) - mOrientationHandler.getPrimaryScroll(this)
-                + getOverScrollShift();
+                + overScrollShift;
     }
 
     /**
-- 
GitLab


From b47172bc4ecbebd27c010dba68fe72ef54fc8bac Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Mon, 3 May 2021 19:59:51 -0700
Subject: [PATCH 1085/1664] Linking various settings that control icon cache to
 icon state

Also separating icon provider for recents from Launcher as it used a fixed size

Bug: 183641907
Test: Verified on device
Change-Id: I6ea3caa0066d1483bfb8a81f0e8aaa472c813afe
---
 .../model/QuickstepModelDelegate.java         |   9 +-
 .../com/android/quickstep/RecentsModel.java   |  24 ++--
 .../com/android/quickstep/TaskIconCache.java  |  59 +++++++--
 .../android/quickstep/views/RecentsView.java  |  16 +--
 .../launcher3/InvariantDeviceProfile.java     |  86 +------------
 src/com/android/launcher3/Launcher.java       |   6 +-
 .../android/launcher3/LauncherAppState.java   | 121 ++++++++++--------
 src/com/android/launcher3/Utilities.java      |   2 +-
 .../android/launcher3/icons/IconCache.java    |  11 +-
 .../icons/LauncherActivityCachingLogic.java   |   2 +-
 .../model/data/ItemInfoWithIcon.java          |   4 +-
 11 files changed, 146 insertions(+), 194 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
index b0c13f99c0..a9c2a5e51d 100644
--- a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
+++ b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
@@ -18,7 +18,6 @@ package com.android.launcher3.model;
 import static android.text.format.DateUtils.DAY_IN_MILLIS;
 import static android.text.format.DateUtils.formatElapsedTime;
 
-import static com.android.launcher3.InvariantDeviceProfile.CHANGE_FLAG_GRID;
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION;
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_PREDICTION;
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_PREDICTION;
@@ -252,11 +251,9 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange
     }
 
     @Override
-    public void onIdpChanged(int changeFlags, InvariantDeviceProfile profile) {
-        if ((changeFlags & CHANGE_FLAG_GRID) != 0) {
-            // Reinitialize everything
-            Executors.MODEL_EXECUTOR.execute(this::recreatePredictors);
-        }
+    public void onIdpChanged(InvariantDeviceProfile profile) {
+        // Reinitialize everything
+        Executors.MODEL_EXECUTOR.execute(this::recreatePredictors);
     }
 
     private void onAppTargetEvent(AppTargetEvent event, int client) {
diff --git a/quickstep/src/com/android/quickstep/RecentsModel.java b/quickstep/src/com/android/quickstep/RecentsModel.java
index c786167241..2eb9dd84eb 100644
--- a/quickstep/src/com/android/quickstep/RecentsModel.java
+++ b/quickstep/src/com/android/quickstep/RecentsModel.java
@@ -31,6 +31,7 @@ import android.os.UserHandle;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.launcher3.icons.IconProvider;
+import com.android.launcher3.icons.IconProvider.IconChangeListener;
 import com.android.launcher3.util.Executors.SimpleThreadFactory;
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.systemui.shared.recents.model.Task;
@@ -49,7 +50,7 @@ import java.util.function.Consumer;
  * Singleton class to load and manage recents model.
  */
 @TargetApi(Build.VERSION_CODES.O)
-public class RecentsModel extends TaskStackChangeListener {
+public class RecentsModel extends TaskStackChangeListener implements IconChangeListener {
 
     // We do not need any synchronization for this variable as its only written on UI thread.
     public static final MainThreadInitializedObject<RecentsModel> INSTANCE =
@@ -69,12 +70,13 @@ public class RecentsModel extends TaskStackChangeListener {
         mContext = context;
         mTaskList = new RecentTasksList(MAIN_EXECUTOR,
                 new KeyguardManagerCompat(context), ActivityManagerWrapper.getInstance());
-        mIconCache = new TaskIconCache(context, RECENTS_MODEL_EXECUTOR);
+
+        IconProvider iconProvider = new IconProvider(context);
+        mIconCache = new TaskIconCache(context, RECENTS_MODEL_EXECUTOR, iconProvider);
         mThumbnailCache = new TaskThumbnailCache(context, RECENTS_MODEL_EXECUTOR);
 
         ActivityManagerWrapper.getInstance().registerTaskStackListener(this);
-        IconProvider.registerIconChangeListener(context,
-                this::onPackageIconChanged, MAIN_EXECUTOR.getHandler());
+        iconProvider.registerIconChangeListener(this, MAIN_EXECUTOR.getHandler());
     }
 
     public TaskIconCache getIconCache() {
@@ -183,17 +185,23 @@ public class RecentsModel extends TaskStackChangeListener {
         if (level == ComponentCallbacks2.TRIM_MEMORY_RUNNING_CRITICAL) {
             // Clear everything once we reach a low-mem situation
             mThumbnailCache.clear();
-            mIconCache.clear();
+            mIconCache.clearCache();
         }
     }
 
-    private void onPackageIconChanged(String pkg, UserHandle user) {
-        mIconCache.invalidateCacheEntries(pkg, user);
+    @Override
+    public void onAppIconChanged(String packageName, UserHandle user) {
+        mIconCache.invalidateCacheEntries(packageName, user);
         for (int i = mThumbnailChangeListeners.size() - 1; i >= 0; i--) {
-            mThumbnailChangeListeners.get(i).onTaskIconChanged(pkg, user);
+            mThumbnailChangeListeners.get(i).onTaskIconChanged(packageName, user);
         }
     }
 
+    @Override
+    public void onSystemIconStateChanged(String iconState) {
+        mIconCache.clearCache();
+    }
+
     /**
      * Adds a listener for visuals changes
      */
diff --git a/quickstep/src/com/android/quickstep/TaskIconCache.java b/quickstep/src/com/android/quickstep/TaskIconCache.java
index ba1c413909..fa61fffbc6 100644
--- a/quickstep/src/com/android/quickstep/TaskIconCache.java
+++ b/quickstep/src/com/android/quickstep/TaskIconCache.java
@@ -16,6 +16,7 @@
 package com.android.quickstep;
 
 import static com.android.launcher3.uioverrides.QuickstepLauncher.GO_LOW_RAM_RECENTS_ENABLED;
+import static com.android.launcher3.util.DisplayController.CHANGE_DENSITY;
 
 import android.app.ActivityManager.TaskDescription;
 import android.content.Context;
@@ -35,9 +36,12 @@ import androidx.annotation.WorkerThread;
 
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.icons.BaseIconFactory;
 import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.IconProvider;
-import com.android.launcher3.icons.LauncherIcons;
+import com.android.launcher3.util.DisplayController;
+import com.android.launcher3.util.DisplayController.DisplayInfoChangeListener;
+import com.android.launcher3.util.DisplayController.Info;
 import com.android.launcher3.util.Preconditions;
 import com.android.quickstep.util.CancellableTask;
 import com.android.quickstep.util.TaskKeyLruCache;
@@ -52,7 +56,7 @@ import java.util.function.Consumer;
 /**
  * Manages the caching of task icons and related data.
  */
-public class TaskIconCache {
+public class TaskIconCache implements DisplayInfoChangeListener {
 
     private final Executor mBgExecutor;
     private final AccessibilityManager mAccessibilityManager;
@@ -62,15 +66,27 @@ public class TaskIconCache {
     private final SparseArray<BitmapInfo> mDefaultIcons = new SparseArray<>();
     private final IconProvider mIconProvider;
 
-    public TaskIconCache(Context context, Executor bgExecutor) {
+    private BaseIconFactory mIconFactory;
+
+    public TaskIconCache(Context context, Executor bgExecutor, IconProvider iconProvider) {
         mContext = context;
         mBgExecutor = bgExecutor;
         mAccessibilityManager = context.getSystemService(AccessibilityManager.class);
+        mIconProvider = iconProvider;
 
         Resources res = context.getResources();
         int cacheSize = res.getInteger(R.integer.recentsIconCacheSize);
+
         mIconCache = new TaskKeyLruCache<>(cacheSize);
-        mIconProvider = new IconProvider(context);
+
+        DisplayController.INSTANCE.get(mContext).addChangeListener(this);
+    }
+
+    @Override
+    public void onDisplayInfoChanged(Context context, Info info, int flags) {
+        if ((flags & CHANGE_DENSITY) != 0) {
+            clearCache();
+        }
     }
 
     /**
@@ -104,8 +120,11 @@ public class TaskIconCache {
         return request;
     }
 
-    public void clear() {
-        mIconCache.evictAll();
+    /**
+     * Clears the icon cache
+     */
+    public void clearCache() {
+        mBgExecutor.execute(this::resetFactory);
     }
 
     void onTaskRemoved(TaskKey taskKey) {
@@ -193,8 +212,8 @@ public class TaskIconCache {
         synchronized (mDefaultIcons) {
             BitmapInfo info = mDefaultIcons.get(userId);
             if (info == null) {
-                try (LauncherIcons la = LauncherIcons.obtain(mContext)) {
-                    info = la.makeDefaultIcon(UserHandle.of(userId));
+                try (BaseIconFactory bif = getIconFactory()) {
+                    info = bif.makeDefaultIcon(UserHandle.of(userId));
                 }
                 mDefaultIcons.put(userId, info);
             }
@@ -205,16 +224,32 @@ public class TaskIconCache {
     @WorkerThread
     private BitmapInfo getBitmapInfo(Drawable drawable, int userId,
             int primaryColor, boolean isInstantApp) {
-        try (LauncherIcons la = LauncherIcons.obtain(mContext)) {
-            la.disableColorExtraction();
-            la.setWrapperBackgroundColor(primaryColor);
+        try (BaseIconFactory bif = getIconFactory()) {
+            bif.disableColorExtraction();
+            bif.setWrapperBackgroundColor(primaryColor);
 
             // User version code O, so that the icon is always wrapped in an adaptive icon container
-            return la.createBadgedIconBitmap(drawable, UserHandle.of(userId),
+            return bif.createBadgedIconBitmap(drawable, UserHandle.of(userId),
                     Build.VERSION_CODES.O, isInstantApp);
         }
     }
 
+    @WorkerThread
+    private BaseIconFactory getIconFactory() {
+        if (mIconFactory == null) {
+            mIconFactory = new BaseIconFactory(mContext,
+                    DisplayController.INSTANCE.get(mContext).getInfo().densityDpi,
+                    mContext.getResources().getDimensionPixelSize(R.dimen.taskbar_icon_size));
+        }
+        return mIconFactory;
+    }
+
+    @WorkerThread
+    private void resetFactory() {
+        mIconFactory = null;
+        mIconCache.evictAll();
+    }
+
     private static class TaskCacheEntry {
         public Drawable icon;
         public String contentDescription = "";
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 3c59441c66..841f63b3c1 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -23,7 +23,6 @@ import static android.view.View.MeasureSpec.makeMeasureSpec;
 import static com.android.launcher3.AbstractFloatingView.TYPE_TASK_MENU;
 import static com.android.launcher3.AbstractFloatingView.getTopOpenViewWithType;
 import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS;
-import static com.android.launcher3.InvariantDeviceProfile.CHANGE_FLAG_ICON_PARAMS;
 import static com.android.launcher3.LauncherAnimUtils.SUCCESS_TRANSITION_PROGRESS;
 import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA;
 import static com.android.launcher3.LauncherState.BACKGROUND_APP;
@@ -171,8 +170,7 @@ import java.util.function.Consumer;
 public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_TYPE>,
         STATE_TYPE extends BaseState<STATE_TYPE>> extends PagedView implements Insettable,
         TaskThumbnailCache.HighResLoadingState.HighResLoadingStateChangedCallback,
-        InvariantDeviceProfile.OnIDPChangeListener, TaskVisualsChangeListener,
-        SplitScreenBounds.OnChangeListener {
+        TaskVisualsChangeListener, SplitScreenBounds.OnChangeListener {
 
     public static final FloatProperty<RecentsView> CONTENT_ALPHA =
             new FloatProperty<RecentsView>("contentAlpha") {
@@ -705,16 +703,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         updateTaskStackListenerState();
     }
 
-    @Override
-    public void onIdpChanged(int changeFlags, InvariantDeviceProfile idp) {
-        if ((changeFlags & CHANGE_FLAG_ICON_PARAMS) == 0) {
-            return;
-        }
-        mModel.getIconCache().clear();
-        unloadVisibleTaskData(TaskView.FLAG_UPDATE_ICON);
-        loadVisibleTaskData(TaskView.FLAG_UPDATE_ICON);
-    }
-
     public void init(OverviewActionsView actionsView, SplitPlaceholderView splitPlaceholderView) {
         mActionsView = actionsView;
         mActionsView.updateHiddenFlags(HIDDEN_NO_TASKS, getTaskViewCount() == 0);
@@ -739,7 +727,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         mSyncTransactionApplier = new SurfaceTransactionApplier(this);
         mLiveTileParams.setSyncTransactionApplier(mSyncTransactionApplier);
         RecentsModel.INSTANCE.get(getContext()).addThumbnailChangeListener(this);
-        mIdp.addOnChangeListener(this);
         mIPipAnimationListener.setActivity(mActivity);
         SystemUiProxy.INSTANCE.get(getContext()).setPinnedStackAnimationListener(
                 mIPipAnimationListener);
@@ -758,7 +745,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         mSyncTransactionApplier = null;
         mLiveTileParams.setSyncTransactionApplier(null);
         RecentsModel.INSTANCE.get(getContext()).removeThumbnailChangeListener(this);
-        mIdp.removeOnChangeListener(this);
         SystemUiProxy.INSTANCE.get(getContext()).setPinnedStackAnimationListener(null);
         SplitScreenBounds.INSTANCE.removeOnChangeListener(this);
         mIPipAnimationListener.setActivity(null);
diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index b263d3830e..7836fa384b 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -17,20 +17,16 @@
 package com.android.launcher3;
 
 import static com.android.launcher3.Utilities.dpiFromPx;
-import static com.android.launcher3.Utilities.getDevicePrefs;
 import static com.android.launcher3.Utilities.getPointString;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_TWO_PANEL_HOME;
 import static com.android.launcher3.util.DisplayController.CHANGE_DENSITY;
 import static com.android.launcher3.util.DisplayController.CHANGE_SUPPORTED_BOUNDS;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-import static com.android.launcher3.util.PackageManagerHelper.getPackageFilter;
 
 import android.annotation.TargetApi;
 import android.appwidget.AppWidgetHostView;
-import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
-import android.content.Intent;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
@@ -49,7 +45,6 @@ import android.view.Display;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
-import com.android.launcher3.graphics.IconShape;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.DisplayController.Info;
@@ -83,11 +78,6 @@ public class InvariantDeviceProfile {
 
     private static final float ICON_SIZE_DEFINED_IN_APP_DP = 48;
 
-    public static final int CHANGE_FLAG_GRID = 1 << 0;
-    public static final int CHANGE_FLAG_ICON_PARAMS = 1 << 1;
-
-    public static final String KEY_ICON_PATH_REF = "pref_icon_shape_path";
-
     // Constants that affects the interpolation curve between statically defined device profile
     // buckets.
     private static final float KNEARESTNEIGHBOR = 3;
@@ -96,9 +86,6 @@ public class InvariantDeviceProfile {
     // used to offset float not being able to express extremely small weights in extreme cases.
     private static final float WEIGHT_EFFICIENT = 100000f;
 
-    private static final int CONFIG_ICON_MASK_RES_ID = Resources.getSystem().getIdentifier(
-            "config_icon_mask", "string", "android");
-
     /**
      * Number of icons per row and column in the workspace.
      */
@@ -111,7 +98,6 @@ public class InvariantDeviceProfile {
     public int numFolderRows;
     public int numFolderColumns;
     public float iconSize;
-    public String iconShapePath;
     public float landscapeIconSize;
     public float landscapeIconTextSize;
     public int iconBitmapSize;
@@ -162,7 +148,6 @@ public class InvariantDeviceProfile {
     public Rect defaultWidgetPadding;
 
     private final ArrayList<OnIDPChangeListener> mChangeListeners = new ArrayList<>();
-    private OverlayMonitor mOverlayMonitor;
 
     @VisibleForTesting
     public InvariantDeviceProfile() {}
@@ -173,7 +158,6 @@ public class InvariantDeviceProfile {
         numFolderRows = p.numFolderRows;
         numFolderColumns = p.numFolderColumns;
         iconSize = p.iconSize;
-        iconShapePath = p.iconShapePath;
         landscapeIconSize = p.landscapeIconSize;
         iconBitmapSize = p.iconBitmapSize;
         iconTextSize = p.iconTextSize;
@@ -193,7 +177,6 @@ public class InvariantDeviceProfile {
         defaultLayoutId = p.defaultLayoutId;
         demoModeLayoutId = p.demoModeLayoutId;
         mExtraAttrs = p.mExtraAttrs;
-        mOverlayMonitor = p.mOverlayMonitor;
         devicePaddings = p.devicePaddings;
     }
 
@@ -215,7 +198,6 @@ public class InvariantDeviceProfile {
                         onConfigChanged(displayContext);
                     }
                 });
-        mOverlayMonitor = new OverlayMonitor(context);
     }
 
     /**
@@ -266,17 +248,6 @@ public class InvariantDeviceProfile {
                 ? Utilities.getPrefs(context).getString(KEY_IDP_GRID_NAME, null) : null;
     }
 
-    /**
-     * Retrieve system defined or RRO overriden icon shape.
-     */
-    private static String getIconShapePath(Context context) {
-        if (CONFIG_ICON_MASK_RES_ID == 0) {
-            Log.e(TAG, "Icon mask res identifier failed to retrieve.");
-            return "";
-        }
-        return context.getResources().getString(CONFIG_ICON_MASK_RES_ID);
-    }
-
     private String initGrid(Context context, String gridName) {
         Info displayInfo = DisplayController.INSTANCE.get(context).getInfo();
         // Determine if we have split display
@@ -317,7 +288,6 @@ public class InvariantDeviceProfile {
         mExtraAttrs = closestProfile.extraAttrs;
 
         iconSize = displayOption.iconSize;
-        iconShapePath = getIconShapePath(context);
         landscapeIconSize = displayOption.landscapeIconSize;
         iconBitmapSize = ResourceUtils.pxFromDp(iconSize, metrics);
         iconTextSize = displayOption.iconTextSize;
@@ -391,18 +361,6 @@ public class InvariantDeviceProfile {
         mChangeListeners.remove(listener);
     }
 
-    public void verifyConfigChangedInBackground(final Context context) {
-        String savedIconMaskPath = getDevicePrefs(context).getString(KEY_ICON_PATH_REF, "");
-        // Good place to check if grid size changed in themepicker when launcher was dead.
-        if (savedIconMaskPath.isEmpty()) {
-            getDevicePrefs(context).edit().putString(KEY_ICON_PATH_REF, getIconShapePath(context))
-                    .apply();
-        } else if (!savedIconMaskPath.equals(getIconShapePath(context))) {
-            getDevicePrefs(context).edit().putString(KEY_ICON_PATH_REF, getIconShapePath(context))
-                    .apply();
-            apply(CHANGE_FLAG_ICON_PARAMS);
-        }
-    }
 
     public void setCurrentGrid(Context context, String gridName) {
         Context appContext = context.getApplicationContext();
@@ -414,36 +372,13 @@ public class InvariantDeviceProfile {
         if (TestProtocol.sDebugTracing) {
             Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "IDP.onConfigChanged");
         }
-        // Config changes, what shall we do?
-        InvariantDeviceProfile oldProfile = new InvariantDeviceProfile(this);
 
         // Re-init grid
         String gridName = getCurrentGridName(context);
         initGrid(context, gridName);
 
-        int changeFlags = 0;
-        if (numRows != oldProfile.numRows ||
-                numColumns != oldProfile.numColumns ||
-                numFolderColumns != oldProfile.numFolderColumns ||
-                numFolderRows != oldProfile.numFolderRows ||
-                numDatabaseHotseatIcons != oldProfile.numDatabaseHotseatIcons) {
-            changeFlags |= CHANGE_FLAG_GRID;
-        }
-
-        if (iconSize != oldProfile.iconSize || iconBitmapSize != oldProfile.iconBitmapSize ||
-                !iconShapePath.equals(oldProfile.iconShapePath)) {
-            changeFlags |= CHANGE_FLAG_ICON_PARAMS;
-        }
-        if (!iconShapePath.equals(oldProfile.iconShapePath)) {
-            IconShape.init(context);
-        }
-
-        apply(changeFlags);
-    }
-
-    private void apply(int changeFlags) {
         for (OnIDPChangeListener listener : mChangeListeners) {
-            listener.onIdpChanged(changeFlags, this);
+            listener.onIdpChanged(this);
         }
     }
 
@@ -650,7 +585,10 @@ public class InvariantDeviceProfile {
 
     public interface OnIDPChangeListener {
 
-        void onIdpChanged(int changeFlags, InvariantDeviceProfile profile);
+        /**
+         * Called when the device provide changes
+         */
+        void onIdpChanged(InvariantDeviceProfile profile);
     }
 
 
@@ -809,18 +747,4 @@ public class InvariantDeviceProfile {
             return this;
         }
     }
-
-    private class OverlayMonitor extends BroadcastReceiver {
-
-        private final String ACTION_OVERLAY_CHANGED = "android.intent.action.OVERLAY_CHANGED";
-
-        OverlayMonitor(Context context) {
-            context.registerReceiver(this, getPackageFilter("android", ACTION_OVERLAY_CHANGED));
-        }
-
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            onConfigChanged(context);
-        }
-    }
 }
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 09c7b7aff0..067e58a96e 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -565,11 +565,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     }
 
     @Override
-    public void onIdpChanged(int changeFlags, InvariantDeviceProfile idp) {
-        onIdpChanged(idp);
-    }
-
-    private void onIdpChanged(InvariantDeviceProfile idp) {
+    public void onIdpChanged(InvariantDeviceProfile idp) {
         if (TestProtocol.sDebugTracing) {
             Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "onIdpChanged");
         }
diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index 11585f9f23..834b5a7e8c 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -16,7 +16,8 @@
 
 package com.android.launcher3;
 
-import static com.android.launcher3.InvariantDeviceProfile.CHANGE_FLAG_ICON_PARAMS;
+import static com.android.launcher3.Utilities.getDevicePrefs;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_THEMED_ICONS;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 import static com.android.launcher3.util.SettingsCache.NOTIFICATION_BADGING_URI;
 
@@ -24,12 +25,13 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.LauncherApps;
-import android.os.Handler;
+import android.os.UserHandle;
 import android.util.Log;
 
 import androidx.annotation.Nullable;
 
 import com.android.launcher3.config.FeatureFlags;
+import com.android.launcher3.graphics.IconShape;
 import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.icons.IconProvider;
 import com.android.launcher3.icons.LauncherIcons;
@@ -39,6 +41,7 @@ import com.android.launcher3.pm.InstallSessionTracker;
 import com.android.launcher3.pm.UserCache;
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.launcher3.util.Preconditions;
+import com.android.launcher3.util.RunnableList;
 import com.android.launcher3.util.SafeCloseable;
 import com.android.launcher3.util.SettingsCache;
 import com.android.launcher3.util.SimpleBroadcastReceiver;
@@ -47,6 +50,7 @@ import com.android.launcher3.widget.custom.CustomWidgetManager;
 public class LauncherAppState {
 
     public static final String ACTION_FORCE_ROLOAD = "force-reload-launcher";
+    private static final String KEY_ICON_STATE = "pref_icon_shape_path";
 
     // We do not need any synchronization for this variable as its only written on UI thread.
     public static final MainThreadInitializedObject<LauncherAppState> INSTANCE =
@@ -54,16 +58,11 @@ public class LauncherAppState {
 
     private final Context mContext;
     private final LauncherModel mModel;
+    private final IconProvider mIconProvider;
     private final IconCache mIconCache;
     private final WidgetPreviewLoader mWidgetCache;
     private final InvariantDeviceProfile mInvariantDeviceProfile;
-    private SettingsCache.OnChangeListener mNotificationSettingsChangedListener;
-
-    private SettingsCache mSettingsCache;
-    private InstallSessionTracker mInstallSessionTracker;
-    private SimpleBroadcastReceiver mModelChangeReceiver;
-    private SafeCloseable mCalendarChangeTracker;
-    private SafeCloseable mUserChangeListener;
+    private final RunnableList mOnTerminateCallback = new RunnableList();
 
     public static LauncherAppState getInstance(final Context context) {
         return INSTANCE.get(context);
@@ -80,40 +79,47 @@ public class LauncherAppState {
     public LauncherAppState(Context context) {
         this(context, LauncherFiles.APP_ICONS_DB);
 
-        mModelChangeReceiver = new SimpleBroadcastReceiver(mModel::onBroadcastIntent);
+        mInvariantDeviceProfile.addOnChangeListener(idp -> refreshAndReloadLauncher());
 
         mContext.getSystemService(LauncherApps.class).registerCallback(mModel);
-        mModelChangeReceiver.register(mContext, Intent.ACTION_LOCALE_CHANGED,
+
+        SimpleBroadcastReceiver modelChangeReceiver =
+                new SimpleBroadcastReceiver(mModel::onBroadcastIntent);
+        modelChangeReceiver.register(mContext, Intent.ACTION_LOCALE_CHANGED,
                 Intent.ACTION_MANAGED_PROFILE_AVAILABLE,
                 Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE,
                 Intent.ACTION_MANAGED_PROFILE_UNLOCKED);
         if (FeatureFlags.IS_STUDIO_BUILD) {
-            mModelChangeReceiver.register(mContext, ACTION_FORCE_ROLOAD);
+            modelChangeReceiver.register(mContext, ACTION_FORCE_ROLOAD);
         }
-
-        mCalendarChangeTracker = IconProvider.registerIconChangeListener(mContext,
-                mModel::onAppIconChanged, MODEL_EXECUTOR.getHandler());
+        mOnTerminateCallback.add(() -> mContext.unregisterReceiver(modelChangeReceiver));
 
         // TODO: remove listener on terminate
         FeatureFlags.APP_SEARCH_IMPROVEMENTS.addChangeListener(context, mModel::forceReload);
         CustomWidgetManager.INSTANCE.get(mContext)
                 .setWidgetRefreshCallback(mModel::refreshAndBindWidgetsAndShortcuts);
 
-        mUserChangeListener = UserCache.INSTANCE.get(mContext)
+        SafeCloseable userChangeListener = UserCache.INSTANCE.get(mContext)
                 .addUserChangeListener(mModel::forceReload);
+        mOnTerminateCallback.add(userChangeListener::close);
 
-        mInvariantDeviceProfile.addOnChangeListener(this::onIdpChanged);
-        new Handler().post( () -> mInvariantDeviceProfile.verifyConfigChangedInBackground(context));
+        IconObserver observer = new IconObserver();
+        SafeCloseable iconChangeTracker = mIconProvider.registerIconChangeListener(
+                observer, MODEL_EXECUTOR.getHandler());
+        mOnTerminateCallback.add(iconChangeTracker::close);
+        MODEL_EXECUTOR.execute(observer::verifyIconChanged);
 
-        mInstallSessionTracker = InstallSessionHelper.INSTANCE.get(context)
-                .registerInstallTracker(mModel);
+        InstallSessionTracker installSessionTracker =
+                InstallSessionHelper.INSTANCE.get(context).registerInstallTracker(mModel);
+        mOnTerminateCallback.add(installSessionTracker::unregister);
 
         // Register an observer to rebind the notification listener when dots are re-enabled.
-        mSettingsCache = SettingsCache.INSTANCE.get(mContext);
-        mNotificationSettingsChangedListener = this::onNotificationSettingsChanged;
-        mSettingsCache.register(NOTIFICATION_BADGING_URI,
-                mNotificationSettingsChangedListener);
-        onNotificationSettingsChanged(mSettingsCache.getValue(NOTIFICATION_BADGING_URI));
+        SettingsCache settingsCache = SettingsCache.INSTANCE.get(mContext);
+        SettingsCache.OnChangeListener notificationLister = this::onNotificationSettingsChanged;
+        settingsCache.register(NOTIFICATION_BADGING_URI, notificationLister);
+        onNotificationSettingsChanged(settingsCache.getValue(NOTIFICATION_BADGING_URI));
+        mOnTerminateCallback.add(() ->
+                settingsCache.unregister(NOTIFICATION_BADGING_URI, notificationLister));
     }
 
     public LauncherAppState(Context context, @Nullable String iconCacheFileName) {
@@ -122,30 +128,25 @@ public class LauncherAppState {
         mContext = context;
 
         mInvariantDeviceProfile = InvariantDeviceProfile.INSTANCE.get(context);
-
-        mIconCache = new IconCache(mContext, mInvariantDeviceProfile, iconCacheFileName);
+        mIconProvider =  new IconProvider(context, ENABLE_THEMED_ICONS.get());
+        mIconCache = new IconCache(mContext, mInvariantDeviceProfile,
+                iconCacheFileName, mIconProvider);
         mWidgetCache = new WidgetPreviewLoader(mContext, mIconCache);
         mModel = new LauncherModel(context, this, mIconCache, new AppFilter(mContext));
     }
 
-    protected void onNotificationSettingsChanged(boolean areNotificationDotsEnabled) {
+    private void onNotificationSettingsChanged(boolean areNotificationDotsEnabled) {
         if (areNotificationDotsEnabled) {
             NotificationListener.requestRebind(new ComponentName(
                     mContext, NotificationListener.class));
         }
     }
 
-    private void onIdpChanged(int changeFlags, InvariantDeviceProfile idp) {
-        if (changeFlags == 0) {
-            return;
-        }
-
-        if ((changeFlags & CHANGE_FLAG_ICON_PARAMS) != 0) {
-            LauncherIcons.clearPool();
-            mIconCache.updateIconParams(idp.fillResIconDpi, idp.iconBitmapSize);
-            mWidgetCache.refresh();
-        }
-
+    private void refreshAndReloadLauncher() {
+        LauncherIcons.clearPool();
+        mIconCache.updateIconParams(
+                mInvariantDeviceProfile.fillResIconDpi, mInvariantDeviceProfile.iconBitmapSize);
+        mWidgetCache.refresh();
         mModel.forceReload();
     }
 
@@ -154,25 +155,13 @@ public class LauncherAppState {
      */
     public void onTerminate() {
         mModel.destroy();
-        if (mModelChangeReceiver != null) {
-            mContext.unregisterReceiver(mModelChangeReceiver);
-        }
         mContext.getSystemService(LauncherApps.class).unregisterCallback(mModel);
-        if (mInstallSessionTracker != null) {
-            mInstallSessionTracker.unregister();
-        }
-        if (mCalendarChangeTracker != null) {
-            mCalendarChangeTracker.close();
-        }
-        if (mUserChangeListener != null) {
-            mUserChangeListener.close();
-        }
         CustomWidgetManager.INSTANCE.get(mContext).setWidgetRefreshCallback(null);
+        mOnTerminateCallback.executeAllAndDestroy();
+    }
 
-        if (mSettingsCache != null) {
-            mSettingsCache.unregister(NOTIFICATION_BADGING_URI,
-                    mNotificationSettingsChangedListener);
-        }
+    public IconProvider getIconProvider() {
+        return mIconProvider;
     }
 
     public IconCache getIconCache() {
@@ -197,4 +186,26 @@ public class LauncherAppState {
     public static InvariantDeviceProfile getIDP(Context context) {
         return InvariantDeviceProfile.INSTANCE.get(context);
     }
+
+    private class IconObserver implements IconProvider.IconChangeListener {
+
+        @Override
+        public void onAppIconChanged(String packageName, UserHandle user) {
+            mModel.onAppIconChanged(packageName, user);
+        }
+
+        @Override
+        public void onSystemIconStateChanged(String iconState) {
+            IconShape.init(mContext);
+            refreshAndReloadLauncher();
+            getDevicePrefs(mContext).edit().putString(KEY_ICON_STATE, iconState).apply();
+        }
+
+        void verifyIconChanged() {
+            String iconState = mIconProvider.getSystemIconState();
+            if (!iconState.equals(getDevicePrefs(mContext).getString(KEY_ICON_STATE, ""))) {
+                onSystemIconStateChanged(iconState);
+            }
+        }
+    }
 }
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 972a6e84f5..7c0036250b 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -661,7 +661,7 @@ public final class Utilities {
                     .resolveActivity(info.getIntent(), info.user);
             outObj[0] = activityInfo;
             return activityInfo == null ? null : LauncherAppState.getInstance(launcher)
-                    .getIconCache().getIconProvider().getIcon(
+                    .getIconProvider().getIcon(
                             activityInfo, launcher.getDeviceProfile().inv.fillResIconDpi);
         } else if (info.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT) {
             if (info instanceof PendingAddShortcutInfo) {
diff --git a/src/com/android/launcher3/icons/IconCache.java b/src/com/android/launcher3/icons/IconCache.java
index bc93a1e3d9..297325a0ee 100644
--- a/src/com/android/launcher3/icons/IconCache.java
+++ b/src/com/android/launcher3/icons/IconCache.java
@@ -81,10 +81,11 @@ public class IconCache extends BaseIconCache {
     private int mPendingIconRequestCount = 0;
 
     public IconCache(Context context, InvariantDeviceProfile idp) {
-        this(context, idp, LauncherFiles.APP_ICONS_DB);
+        this(context, idp, LauncherFiles.APP_ICONS_DB, new IconProvider(context));
     }
 
-    public IconCache(Context context, InvariantDeviceProfile idp, String dbFileName) {
+    public IconCache(Context context, InvariantDeviceProfile idp, String dbFileName,
+            IconProvider iconProvider) {
         super(context, dbFileName, MODEL_EXECUTOR.getLooper(),
                 idp.fillResIconDpi, idp.iconBitmapSize, true /* inMemoryCache */);
         mComponentWithLabelCachingLogic = new ComponentCachingLogic(context, false);
@@ -93,7 +94,7 @@ public class IconCache extends BaseIconCache {
         mLauncherApps = mContext.getSystemService(LauncherApps.class);
         mUserManager = UserCache.INSTANCE.get(mContext);
         mInstantAppResolver = InstantAppResolver.newInstance(mContext);
-        mIconProvider = new IconProvider(context, true /* supportsIconTheme */);
+        mIconProvider = iconProvider;
     }
 
     @Override
@@ -106,10 +107,6 @@ public class IconCache extends BaseIconCache {
         return mInstantAppResolver.isInstantApp(info);
     }
 
-    public IconProvider getIconProvider() {
-        return mIconProvider;
-    }
-
     @Override
     public BaseIconFactory getIconFactory() {
         return LauncherIcons.obtain(mContext);
diff --git a/src/com/android/launcher3/icons/LauncherActivityCachingLogic.java b/src/com/android/launcher3/icons/LauncherActivityCachingLogic.java
index 8fc397738e..e820ac474a 100644
--- a/src/com/android/launcher3/icons/LauncherActivityCachingLogic.java
+++ b/src/com/android/launcher3/icons/LauncherActivityCachingLogic.java
@@ -58,7 +58,7 @@ public class LauncherActivityCachingLogic
     public BitmapInfo loadIcon(Context context, LauncherActivityInfo object) {
         try (LauncherIcons li = LauncherIcons.obtain(context)) {
             return li.createBadgedIconBitmap(LauncherAppState.getInstance(context)
-                            .getIconCache().getIconProvider().getIcon(object, li.mFillResIconDpi),
+                            .getIconProvider().getIcon(object, li.mFillResIconDpi),
                     object.getUser(), object.getApplicationInfo().targetSdkVersion);
         }
     }
diff --git a/src/com/android/launcher3/model/data/ItemInfoWithIcon.java b/src/com/android/launcher3/model/data/ItemInfoWithIcon.java
index 0754c293b6..6813b972ab 100644
--- a/src/com/android/launcher3/model/data/ItemInfoWithIcon.java
+++ b/src/com/android/launcher3/model/data/ItemInfoWithIcon.java
@@ -16,8 +16,6 @@
 
 package com.android.launcher3.model.data;
 
-import static com.android.launcher3.config.FeatureFlags.ENABLE_THEMED_ICONS;
-
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -232,7 +230,7 @@ public abstract class ItemInfoWithIcon extends ItemInfo {
      * Returns a FastBitmapDrawable with the icon and context theme applied
      */
     public FastBitmapDrawable newIcon(Context context, boolean applyTheme) {
-        FastBitmapDrawable drawable = applyTheme && ENABLE_THEMED_ICONS.get()
+        FastBitmapDrawable drawable = applyTheme
                 ? bitmap.newThemedIcon(context) : bitmap.newIcon(context);
         drawable.setIsDisabled(isDisabled());
         return drawable;
-- 
GitLab


From 18caa92dbabbaf605ec56bc9609ccb8d2ab1d2ed Mon Sep 17 00:00:00 2001
From: Shan Huang <shanh@google.com>
Date: Thu, 6 May 2021 15:09:15 +0800
Subject: [PATCH 1086/1664] Add a background scrim to launcher for text
 protection.

This is a temporary approach to dim the wallpaper. Flip on ENABLE_WALLPAPER_SCRIM to enable the scrim.

In the long term we'll dim the wallpaper layer directly.

Test: Manual
Bug: 185890335
Change-Id: Ia88597bbcba6ae1536015d1b2a35260cab4a4453
---
 res/values/colors.xml                         |  1 +
 res/xml/dynamic_resources.xml                 |  4 ++--
 .../launcher3/config/FeatureFlags.java        |  4 ++++
 .../launcher3/graphics/SysUiScrim.java        | 21 ++++++++++++++++++-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/res/values/colors.xml b/res/values/colors.xml
index 83d2deb0b1..56a0e6bd9b 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -58,5 +58,6 @@
     <color name="text_color_tertiary_dark">#CCFFFFFF</color>
 
     <color name="wallpaper_popup_scrim">?android:attr/colorAccent</color>
+    <color name="wallpaper_scrim_color">#0D878787</color>
 
 </resources>
diff --git a/res/xml/dynamic_resources.xml b/res/xml/dynamic_resources.xml
index f5d262868c..3a3e239b50 100644
--- a/res/xml/dynamic_resources.xml
+++ b/res/xml/dynamic_resources.xml
@@ -4,6 +4,6 @@
     <entry id="@color/delete_target_hover_tint" />
     <entry id="@color/delete_target_hover_tint" />
     <entry id="@color/delete_target_hover_tint" />
+    <entry id="@color/wallpaper_scrim_color" />
 
-
-</DynamicResources>
\ No newline at end of file
+</DynamicResources>
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 3b88a0b2af..ba5101b8d6 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -240,6 +240,10 @@ public final class FeatureFlags {
     public static final BooleanFlag PROTOTYPE_APP_CLOSE = getDebugFlag(
             "PROTOTYPE_APP_CLOSE", false, "Enables new app close");
 
+    public static final BooleanFlag ENABLE_WALLPAPER_SCRIM = getDebugFlag(
+            "ENABLE_WALLPAPER_SCRIM", false,
+            "Enables scrim over wallpaper for text protection.");
+
     public static void initialize(Context context) {
         synchronized (sDebugFlags) {
             for (DebugFlag flag : sDebugFlags) {
diff --git a/src/com/android/launcher3/graphics/SysUiScrim.java b/src/com/android/launcher3/graphics/SysUiScrim.java
index c09dac8e7d..f0766c50c7 100644
--- a/src/com/android/launcher3/graphics/SysUiScrim.java
+++ b/src/com/android/launcher3/graphics/SysUiScrim.java
@@ -45,7 +45,10 @@ import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.R;
 import com.android.launcher3.ResourceUtils;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.config.FeatureFlags;
+import com.android.launcher3.util.DynamicResource;
 import com.android.launcher3.util.Themes;
+import com.android.systemui.plugins.ResourceProvider;
 
 /**
  * View scrim which draws behind hotseat and workspace
@@ -101,8 +104,10 @@ public class SysUiScrim implements View.OnAttachStateChangeListener {
     private static final int ALPHA_MASK_BITMAP_DP = 200;
     private static final int ALPHA_MASK_WIDTH_DP = 2;
 
-    private boolean mDrawTopScrim, mDrawBottomScrim;
+    private boolean mDrawTopScrim, mDrawBottomScrim, mDrawWallpaperScrim;
 
+    private final RectF mWallpaperScrimRect = new RectF();
+    private final Paint mWallpaperScrimPaint = new Paint();
     private final RectF mFinalMaskRect = new RectF();
     private final Paint mBottomMaskPaint = new Paint(Paint.FILTER_BITMAP_FLAG);
     private final Bitmap mBottomMask;
@@ -117,6 +122,7 @@ public class SysUiScrim implements View.OnAttachStateChangeListener {
 
     private boolean mAnimateScrimOnNextDraw = false;
     private float mSysUiAnimMultiplier = 1;
+    private int mWallpaperScrimMaxAlpha;
 
     public SysUiScrim(View view) {
         mRoot = view;
@@ -127,6 +133,14 @@ public class SysUiScrim implements View.OnAttachStateChangeListener {
         mBottomMask = mTopScrim == null ? null : createDitheredAlphaMask();
         mHideSysUiScrim = mTopScrim == null;
 
+        mDrawWallpaperScrim = FeatureFlags.ENABLE_WALLPAPER_SCRIM.get()
+                && !Themes.getAttrBoolean(view.getContext(), R.attr.isMainColorDark)
+                && !Themes.getAttrBoolean(view.getContext(), R.attr.isWorkspaceDarkText);
+        ResourceProvider rp = DynamicResource.provider(view.getContext());
+        int wallpaperScrimColor = rp.getColor(R.color.wallpaper_scrim_color);
+        mWallpaperScrimMaxAlpha = Color.alpha(wallpaperScrimColor);
+        mWallpaperScrimPaint.setColor(wallpaperScrimColor);
+
         view.addOnAttachStateChangeListener(this);
     }
 
@@ -151,6 +165,9 @@ public class SysUiScrim implements View.OnAttachStateChangeListener {
                 mAnimateScrimOnNextDraw = false;
             }
 
+            if (mDrawWallpaperScrim) {
+                canvas.drawRect(mWallpaperScrimRect, mWallpaperScrimPaint);
+            }
             if (mDrawTopScrim) {
                 mTopScrim.draw(canvas);
             }
@@ -214,6 +231,7 @@ public class SysUiScrim implements View.OnAttachStateChangeListener {
             mTopScrim.setBounds(0, 0, w, h);
             mFinalMaskRect.set(0, h - mMaskHeight, w, h);
         }
+        mWallpaperScrimRect.set(0, 0, w, h);
     }
 
     private void setSysUiProgress(float progress) {
@@ -236,6 +254,7 @@ public class SysUiScrim implements View.OnAttachStateChangeListener {
         if (mTopScrim != null) {
             mTopScrim.setAlpha(Math.round(255 * factor));
         }
+        mWallpaperScrimPaint.setAlpha(Math.round(mWallpaperScrimMaxAlpha * factor));
     }
 
     private Bitmap createDitheredAlphaMask() {
-- 
GitLab


From c08253f3dfe0e7eeb3d4f23c84d3520e2911c2a1 Mon Sep 17 00:00:00 2001
From: ryanlwlin <ryanlwlin@google.com>
Date: Mon, 3 May 2021 19:43:38 +0800
Subject: [PATCH 1087/1664] Do not detect system gesture with new system ui
 state flag

If the device is in 2-button or gesturl navgiation mode,
touch events will be cancelled in the nav bar area. It leads
to that users couldn't drag the window magnification via
draghandle.

To fix it, we add a new system ui state flag to stop detecting
system gesture if it is set to true. This flag should be set only
when the window magnification is overlapped with the nav bar from
windowinsets.

Bug: 179648683
Test: manually test
Change-Id: I978a4b7d631e4115b293d341a89baee151c2881a
---
 .../src/com/android/quickstep/RecentsAnimationDeviceState.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index e271203d18..42b58c7ab5 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -31,6 +31,7 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BUBBLES_EXPANDED;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_GLOBAL_ACTIONS_SHOWING;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_HOME_DISABLED;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_MAGNIFICATION_OVERLAP;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NAV_BAR_HIDDEN;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_ONE_HANDED_ACTIVE;
@@ -405,6 +406,7 @@ public class RecentsAnimationDeviceState implements
         return canStartWithNavHidden
                 && (mSystemUiStateFlags & SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED) == 0
                 && (mSystemUiStateFlags & SYSUI_STATE_QUICK_SETTINGS_EXPANDED) == 0
+                && (mSystemUiStateFlags & SYSUI_STATE_MAGNIFICATION_OVERLAP) == 0
                 && ((mSystemUiStateFlags & SYSUI_STATE_HOME_DISABLED) == 0
                         || (mSystemUiStateFlags & SYSUI_STATE_OVERVIEW_DISABLED) == 0);
     }
-- 
GitLab


From c8bd480bd57ff7ffc39e71a80c5940f4e5a64acb Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Thu, 6 May 2021 17:28:55 +0100
Subject: [PATCH 1088/1664] Make focus task a bit bigger

Bug: 175939487
Test: manual
Change-Id: I0e4a13e02331ab9f4a8b1634197d7bf268edac68
---
 quickstep/res/values/dimens.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 4f9b3ebe59..c45947205f 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -36,7 +36,7 @@
     <dimen name="overview_grid_bottom_margin">90dp</dimen>
     <dimen name="overview_grid_side_margin">54dp</dimen>
     <dimen name="overview_grid_row_spacing">42dp</dimen>
-    <dimen name="overview_grid_focus_vertical_margin">130dp</dimen>
+    <dimen name="overview_grid_focus_vertical_margin">90dp</dimen>
     <dimen name="split_placeholder_size">110dp</dimen>
 
     <dimen name="recents_page_spacing">16dp</dimen>
-- 
GitLab


From 57347bd6b76525496c7e1c37d8112a9515fc7673 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Thu, 6 May 2021 17:39:49 +0100
Subject: [PATCH 1089/1664] Only show collapse handle when the bottom widgets
 picker is scrollable

Test: Go to contact bottom widgets picker. No collapse handle is
      shown because the content isn't scrollable. Go to Google calendar
      bottom widget picker. Collapse handle is hown because the content
      is scrollable.
Bug: 185134663
Change-Id: Ic6109c055a072aa1cf3521f829833fd5f4cece0f
---
 res/layout/widgets_bottom_sheet_content.xml              | 2 ++
 src/com/android/launcher3/widget/WidgetsBottomSheet.java | 1 +
 2 files changed, 3 insertions(+)

diff --git a/res/layout/widgets_bottom_sheet_content.xml b/res/layout/widgets_bottom_sheet_content.xml
index a9d523ae57..85c64888ea 100644
--- a/res/layout/widgets_bottom_sheet_content.xml
+++ b/res/layout/widgets_bottom_sheet_content.xml
@@ -15,10 +15,12 @@
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
     <View
+        android:id="@+id/collapse_handle"
         android:layout_width="48dp"
         android:layout_height="2dp"
         android:layout_gravity="center_horizontal"
         android:layout_marginBottom="16dp"
+        android:visibility="gone"
         android:background="?android:attr/textColorSecondary"/>
     <TextView
         style="@style/TextHeadline"
diff --git a/src/com/android/launcher3/widget/WidgetsBottomSheet.java b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
index f18b63e403..995ac47e41 100644
--- a/src/com/android/launcher3/widget/WidgetsBottomSheet.java
+++ b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
@@ -118,6 +118,7 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
             ViewGroup.LayoutParams layoutParams = widgetsTableScrollView.getLayoutParams();
             layoutParams.height = mMaxTableHeight;
             widgetsTableScrollView.setLayoutParams(layoutParams);
+            findViewById(R.id.collapse_handle).setVisibility(VISIBLE);
         }
     }
 
-- 
GitLab


From e9b2bf514b3003831348c0864f35218c47a7c8ee Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Thu, 6 May 2021 19:31:31 +0100
Subject: [PATCH 1090/1664] Use mWindowContext instead of re-creating to avoid
 stale Resource

- ag/14286682 changed to re-create window context in onConfigChange, which regressed the stale Resource problem, changed back to use mWindowContext instead
- Removed unnecessary extraInternalDisplays empty check, as empty / before S is already handled inside Display Info CTOR

Test: Change display size between default and large, taskbar is enabled/disabled correctly
Bug: 181215299
Change-Id: I7397d2dc1a1ce8e132e706e9de592558df6a18e7
---
 .../android/launcher3/util/DisplayController.java | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/com/android/launcher3/util/DisplayController.java b/src/com/android/launcher3/util/DisplayController.java
index b7512077a9..e2c0a32bb0 100644
--- a/src/com/android/launcher3/util/DisplayController.java
+++ b/src/com/android/launcher3/util/DisplayController.java
@@ -106,12 +106,7 @@ public class DisplayController implements DisplayListener, ComponentCallbacks {
                 extraInternalDisplays.add(new PortraitSize(size.x, size.y));
             }
         }
-
-        if (extraInternalDisplays.isEmpty() || !Utilities.ATLEAST_S) {
-            mInfo = new Info(createDisplayInfoContext(display), display, Collections.emptySet());
-        } else {
-            mInfo = new Info(mWindowContext, display, extraInternalDisplays);
-        }
+        mInfo = new Info(getDisplayInfoContext(display), display, extraInternalDisplays);
         mDM.registerDisplayListener(this, UI_HELPER_EXECUTOR.getHandler());
     }
 
@@ -201,10 +196,8 @@ public class DisplayController implements DisplayListener, ComponentCallbacks {
         return mInfo;
     }
 
-    private Context createDisplayInfoContext(Display display) {
-        return Utilities.ATLEAST_S
-                ? mContext.createWindowContext(display, TYPE_APPLICATION, null)
-                : mContext.createDisplayContext(display);
+    private Context getDisplayInfoContext(Display display) {
+        return Utilities.ATLEAST_S ? mWindowContext : mContext.createDisplayContext(display);
     }
 
     @AnyThread
@@ -213,7 +206,7 @@ public class DisplayController implements DisplayListener, ComponentCallbacks {
         Set<PortraitSize> extraDisplaysSizes = oldInfo.mAllSizes.size() > 1
                 ? oldInfo.mAllSizes : Collections.emptySet();
 
-        Context displayContext = createDisplayInfoContext(display);
+        Context displayContext = getDisplayInfoContext(display);
         Info newInfo = new Info(displayContext, display, extraDisplaysSizes);
         int change = 0;
         if (!newInfo.mScreenSizeDp.equals(oldInfo.mScreenSizeDp)) {
-- 
GitLab


From 344b200710acd603dfed0dd5279fb767881ada73 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Tue, 4 May 2021 11:40:05 -0700
Subject: [PATCH 1091/1664] Updated launcher logging.

Updated logging to help track down b/168788486

Bug: 168788486
Test: manual
Change-Id: I064f0eb70f0281fb09083b95c321857d17e31a7d
---
 src/com/android/launcher3/SessionCommitReceiver.java      | 4 ++--
 .../android/launcher3/model/AddWorkspaceItemsTask.java    | 8 ++++----
 src/com/android/launcher3/model/ItemInstallQueue.java     | 5 +++--
 src/com/android/launcher3/pm/InstallSessionHelper.java    | 8 ++++----
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/com/android/launcher3/SessionCommitReceiver.java b/src/com/android/launcher3/SessionCommitReceiver.java
index fe58da913a..558538c48a 100644
--- a/src/com/android/launcher3/SessionCommitReceiver.java
+++ b/src/com/android/launcher3/SessionCommitReceiver.java
@@ -24,10 +24,10 @@ import android.content.pm.PackageInstaller.SessionInfo;
 import android.content.pm.PackageManager;
 import android.os.UserHandle;
 import android.text.TextUtils;
-import android.util.Log;
 
 import androidx.annotation.WorkerThread;
 
+import com.android.launcher3.logging.FileLog;
 import com.android.launcher3.model.ItemInstallQueue;
 import com.android.launcher3.pm.InstallSessionHelper;
 import com.android.launcher3.util.Executors;
@@ -71,7 +71,7 @@ public class SessionCommitReceiver extends BroadcastReceiver {
             return;
         }
 
-        Log.d(LOG,
+        FileLog.d(LOG,
                 "Adding package name to install queue. Package name: " + info.getAppPackageName()
                         + ", has app icon: " + (info.getAppIcon() != null)
                         + ", has app label: " + !TextUtils.isEmpty(info.getAppLabel()));
diff --git a/src/com/android/launcher3/model/AddWorkspaceItemsTask.java b/src/com/android/launcher3/model/AddWorkspaceItemsTask.java
index 29287d97c7..3be2c3af40 100644
--- a/src/com/android/launcher3/model/AddWorkspaceItemsTask.java
+++ b/src/com/android/launcher3/model/AddWorkspaceItemsTask.java
@@ -20,7 +20,6 @@ import android.content.pm.LauncherActivityInfo;
 import android.content.pm.LauncherApps;
 import android.content.pm.PackageInstaller.SessionInfo;
 import android.os.UserHandle;
-import android.util.Log;
 import android.util.LongSparseArray;
 import android.util.Pair;
 
@@ -28,6 +27,7 @@ import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherModel.CallbackTask;
 import com.android.launcher3.LauncherSettings;
+import com.android.launcher3.logging.FileLog;
 import com.android.launcher3.model.BgDataModel.Callbacks;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.FolderInfo;
@@ -130,7 +130,7 @@ public class AddWorkspaceItemsTask extends BaseModelUpdateTask {
                             packageName);
 
                     if (!packageInstaller.verifySessionInfo(sessionInfo)) {
-                        Log.d(LOG, "Item info failed session info verification: "
+                        FileLog.d(LOG, "Item info failed session info verification: "
                                 + workspaceInfo);
                     }
 
@@ -180,11 +180,11 @@ public class AddWorkspaceItemsTask extends BaseModelUpdateTask {
                 addedItemsFinal.add(itemInfo);
 
                 // log bitmap and label
-                Log.d(LOG, "Adding item info to workspace: " + itemInfo);
+                FileLog.d(LOG, "Adding item info to workspace: " + itemInfo);
                 if (itemInfo instanceof ItemInfoWithIcon) {
                     ItemInfoWithIcon infoWithIcon = (ItemInfoWithIcon) itemInfo;
 
-                    Log.d(LOG, "Item info icon base 64 string: "
+                    FileLog.d(LOG, "Item info icon base 64 string: "
                             + infoWithIcon.bitmap.icon == null
                             ? "null" : IOUtils.toBase64String(infoWithIcon.bitmap.icon));
                 }
diff --git a/src/com/android/launcher3/model/ItemInstallQueue.java b/src/com/android/launcher3/model/ItemInstallQueue.java
index 22cb46b4a5..217f523e14 100644
--- a/src/com/android/launcher3/model/ItemInstallQueue.java
+++ b/src/com/android/launcher3/model/ItemInstallQueue.java
@@ -43,6 +43,7 @@ import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherSettings.Favorites;
+import com.android.launcher3.logging.FileLog;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
@@ -191,11 +192,11 @@ public class ItemInstallQueue {
         MODEL_EXECUTOR.post(() -> {
             Pair<ItemInfo, Object> itemInfo = info.getItemInfo(mContext);
             if (itemInfo == null) {
-                Log.d(LOG,
+                FileLog.d(LOG,
                         "Adding PendingInstallShortcutInfo with no attached info to queue.",
                         stackTrace);
             } else {
-                Log.d(LOG,
+                FileLog.d(LOG,
                         "Adding PendingInstallShortcutInfo to queue. Attached info: "
                                 + itemInfo.first,
                         stackTrace);
diff --git a/src/com/android/launcher3/pm/InstallSessionHelper.java b/src/com/android/launcher3/pm/InstallSessionHelper.java
index 88db4303bb..52554900ea 100644
--- a/src/com/android/launcher3/pm/InstallSessionHelper.java
+++ b/src/com/android/launcher3/pm/InstallSessionHelper.java
@@ -30,7 +30,6 @@ import android.os.Build;
 import android.os.Process;
 import android.os.UserHandle;
 import android.text.TextUtils;
-import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
@@ -40,6 +39,7 @@ import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.SessionCommitReceiver;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
+import com.android.launcher3.logging.FileLog;
 import com.android.launcher3.model.ItemInstallQueue;
 import com.android.launcher3.util.IOUtils;
 import com.android.launcher3.util.IntArray;
@@ -218,7 +218,7 @@ public class InstallSessionHelper {
         if (FeatureFlags.PROMISE_APPS_NEW_INSTALLS.get()
                 && SessionCommitReceiver.isEnabled(mAppContext)
                 && verifySessionInfo(sessionInfo)) {
-            Log.d(LOG, "Adding package name to install queue: "
+            FileLog.d(LOG, "Adding package name to install queue: "
                     + sessionInfo.getAppPackageName());
 
             ItemInstallQueue.INSTANCE.get(mAppContext)
@@ -241,7 +241,7 @@ public class InstallSessionHelper {
         if (sessionInfo != null) {
             Bitmap appIcon = sessionInfo.getAppIcon();
 
-            Log.d(LOG, String.format(
+            FileLog.d(LOG, String.format(
                     "Verifying session info. Valid: %b, Session verified: %b, Install reason valid:"
                             + " %b, App icon: %s, App label: %s, Promise icon added: %b, "
                             + "App installed: %b.",
@@ -254,7 +254,7 @@ public class InstallSessionHelper {
                     new PackageManagerHelper(mAppContext).isAppInstalled(
                             sessionInfo.getAppPackageName(), getUserHandle(sessionInfo))));
         } else {
-            Log.d(LOG, "Verifying session info failed: session info null.");
+            FileLog.d(LOG, "Verifying session info failed: session info null.");
         }
 
         return validSessionInfo;
-- 
GitLab


From 9d1514b4f217c40b607b1ddfd0723e79d4e7d1f2 Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Wed, 28 Apr 2021 18:03:04 -0700
Subject: [PATCH 1092/1664] Get PiP round corner radius from WMShell

Fixed also the issue that when
SystemUiProxy#setPinnedStackAnimationListener is called,
SystemUiProxy#mPiP may not have been initialized, defer the set/register
action in SystemUiProxy#setProxy if applicable.

Video: http://recall/-/aaaaaabFQoRHlzixHdtY/dmUy8qBEMxHShFcFKB3cT3
Bug: 171721389
Test: make sure autoEnterPip has round corner support, see video
Change-Id: I38866bbc77bc2fa94f0197bb90c02e786198443e
---
 .../android/quickstep/AbsSwipeUpHandler.java  |  1 +
 .../com/android/quickstep/SystemUiProxy.java  | 26 +++++++++++++++++++
 .../util/SwipePipToHomeAnimator.java          |  4 ++-
 .../android/quickstep/views/RecentsView.java  | 24 ++++++++++++++---
 4 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index fe1090878a..25be30fc4b 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1211,6 +1211,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                 TaskInfoCompat.getWindowConfigurationBounds(taskInfo),
                 startBounds,
                 destinationBounds,
+                mRecentsView.getPipCornerRadius(),
                 mRecentsView);
         // We would assume home and app window always in the same rotation While homeRotation
         // is not ROTATION_0 (which implies the rotation is turned on in launcher settings).
diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index f6018d1c2f..39d8888c72 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -68,6 +68,12 @@ public class SystemUiProxy implements ISystemUiProxy,
         MAIN_EXECUTOR.execute(() -> clearProxy());
     };
 
+    // Save the listeners passed into the proxy since when set/register these listeners,
+    // setProxy may not have been called, eg. OverviewProxyService is not connected yet.
+    private IPipAnimationListener mPendingPipAnimationListener;
+    private ISplitScreenListener mPendingSplitScreenListener;
+    private IStartingWindowListener mPendingStartingWindowListener;
+
     // Used to dedupe calls to SystemUI
     private int mLastShelfHeight;
     private boolean mLastShelfVisible;
@@ -116,6 +122,19 @@ public class SystemUiProxy implements ISystemUiProxy,
         mShellTransitions = shellTransitions;
         mStartingWindow = startingWindow;
         linkToDeath();
+        // re-attach the listeners once missing due to setProxy has not been initialized yet.
+        if (mPendingPipAnimationListener != null && mPip != null) {
+            setPinnedStackAnimationListener(mPendingPipAnimationListener);
+            mPendingPipAnimationListener = null;
+        }
+        if (mPendingSplitScreenListener != null && mSplitScreen != null) {
+            registerSplitScreenListener(mPendingSplitScreenListener);
+            mPendingSplitScreenListener = null;
+        }
+        if (mPendingStartingWindowListener != null && mStartingWindow != null) {
+            setStartingWindowListener(mPendingStartingWindowListener);
+            mPendingStartingWindowListener = null;
+        }
     }
 
     public void clearProxy() {
@@ -390,6 +409,8 @@ public class SystemUiProxy implements ISystemUiProxy,
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call setPinnedStackAnimationListener", e);
             }
+        } else {
+            mPendingPipAnimationListener = listener;
         }
     }
 
@@ -427,6 +448,8 @@ public class SystemUiProxy implements ISystemUiProxy,
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call registerSplitScreenListener");
             }
+        } else {
+            mPendingSplitScreenListener = listener;
         }
     }
 
@@ -438,6 +461,7 @@ public class SystemUiProxy implements ISystemUiProxy,
                 Log.w(TAG, "Failed call unregisterSplitScreenListener");
             }
         }
+        mPendingSplitScreenListener = null;
     }
 
     public void setSideStageVisibility(boolean visible) {
@@ -590,6 +614,8 @@ public class SystemUiProxy implements ISystemUiProxy,
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call setStartingWindowListener", e);
             }
+        } else {
+            mPendingStartingWindowListener = listener;
         }
     }
 }
diff --git a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
index a1240e0f42..b5570a7445 100644
--- a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
+++ b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
@@ -89,6 +89,7 @@ public class SwipePipToHomeAnimator extends ValueAnimator {
      *                    different from the appBounds if user has swiped a certain distance and
      *                    Launcher has performed transform on the leash.
      * @param destinationBounds Bounds of the destination this animator ends to
+     * @param cornerRadius Corner radius in pixel value for PiP window
      */
     public SwipePipToHomeAnimator(int taskId,
             @NonNull ComponentName componentName,
@@ -97,6 +98,7 @@ public class SwipePipToHomeAnimator extends ValueAnimator {
             @NonNull Rect appBounds,
             @NonNull Rect startBounds,
             @NonNull Rect destinationBounds,
+            int cornerRadius,
             @NonNull View view) {
         mTaskId = taskId;
         mComponentName = componentName;
@@ -106,7 +108,7 @@ public class SwipePipToHomeAnimator extends ValueAnimator {
         mDestinationBounds.set(destinationBounds);
         mDestinationBoundsTransformed.set(mDestinationBounds);
         mDestinationBoundsAnimation.set(mDestinationBounds);
-        mSurfaceTransactionHelper = new PipSurfaceTransactionHelper();
+        mSurfaceTransactionHelper = new PipSurfaceTransactionHelper(cornerRadius);
 
         if (sourceRectHint == null) {
             mSourceHintRectInsets = null;
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index a04b886bd4..2633ce65a5 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -469,6 +469,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
 
     private final PinnedStackAnimationListener mIPipAnimationListener =
             new PinnedStackAnimationListener();
+    private int mPipCornerRadius;
 
     // Used to keep track of the last requested task list id, so that we do not request to load the
     // tasks again if we have already requested it and the task list has not changed
@@ -768,7 +769,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         mSyncTransactionApplier = new SurfaceTransactionApplier(this);
         mLiveTileParams.setSyncTransactionApplier(mSyncTransactionApplier);
         RecentsModel.INSTANCE.get(getContext()).addThumbnailChangeListener(this);
-        mIPipAnimationListener.setActivity(mActivity);
+        mIPipAnimationListener.setActivityAndRecentsView(mActivity, this);
         SystemUiProxy.INSTANCE.get(getContext()).setPinnedStackAnimationListener(
                 mIPipAnimationListener);
         mOrientationState.initListeners();
@@ -788,7 +789,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         RecentsModel.INSTANCE.get(getContext()).removeThumbnailChangeListener(this);
         SystemUiProxy.INSTANCE.get(getContext()).setPinnedStackAnimationListener(null);
         SplitScreenBounds.INSTANCE.removeOnChangeListener(this);
-        mIPipAnimationListener.setActivity(null);
+        mIPipAnimationListener.setActivityAndRecentsView(null, null);
         mOrientationState.destroyListeners();
         mTaskOverlayFactory.removeListeners();
     }
@@ -3717,6 +3718,14 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         mScrollListeners.remove(listener);
     }
 
+    /**
+     * @return Corner radius in pixel value for PiP window, which is updated via
+     *         {@link #mIPipAnimationListener}
+     */
+    public int getPipCornerRadius() {
+        return mPipCornerRadius;
+    }
+
     @Override
     protected void onScrollChanged(int l, int t, int oldl, int oldt) {
         super.onScrollChanged(l, t, oldl, oldt);
@@ -3733,9 +3742,11 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     private static class PinnedStackAnimationListener<T extends BaseActivity> extends
             IPipAnimationListener.Stub {
         private T mActivity;
+        private RecentsView mRecentsView;
 
-        public void setActivity(T activity) {
+        public void setActivityAndRecentsView(T activity, RecentsView recentsView) {
             mActivity = activity;
+            mRecentsView = recentsView;
         }
 
         @Override
@@ -3748,5 +3759,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 }
             });
         }
+
+        @Override
+        public void onPipCornerRadiusChanged(int cornerRadius) {
+            if (mRecentsView != null) {
+                mRecentsView.mPipCornerRadius = cornerRadius;
+            }
+        }
     }
 }
-- 
GitLab


From a1b7851b5312c74c3c0a719a313424e44bddeb8d Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Thu, 6 May 2021 21:55:51 +0000
Subject: [PATCH 1093/1664] Revert "Don't crash on dialer app target search
 results"

This reverts commit 67edf1654c2d5b4cba800065f75d6ac39ed8c53c.

Reason for revert: this was temporary launcher side fix until aiai
proper fix was made and dropped to the system image.

Bug: 186412929
Change-Id: Idd3abe3fe2104c316aeff16e11d8110dfee7e0d1
---
 .../android/launcher3/model/data/SearchActionItemInfo.java   | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/com/android/launcher3/model/data/SearchActionItemInfo.java b/src/com/android/launcher3/model/data/SearchActionItemInfo.java
index 0eea92c691..b3057d5bd2 100644
--- a/src/com/android/launcher3/model/data/SearchActionItemInfo.java
+++ b/src/com/android/launcher3/model/data/SearchActionItemInfo.java
@@ -94,11 +94,6 @@ public class SearchActionItemInfo extends ItemInfoWithIcon {
                     "SearchActionItemInfo can only have either an Intent or a PendingIntent");
         }
         mIntent = intent;
-        // bandage fix for just one week
-        if (intent != null && "com.android.server.telecom".equals(intent.getPackage())) {
-            intent.setAction(Intent.ACTION_DIAL);
-            intent.setPackage(null);
-        }
     }
 
     public PendingIntent getPendingIntent() {
-- 
GitLab


From e675a8e6b47c4a99f455a3fc28bff38d7ccb7147 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 5 May 2021 23:00:03 +0100
Subject: [PATCH 1094/1664] Fix full widgets picker fast scroll offset issue

Even though there is no change in fast scroller offset, the recycler view
scroll Y may still be updated. Let's also notify a scroll change if
the recycler view scroll has changed when updating the fast scroller thumb
offset.

Test: In the full widgets picker, scroll up and down with the fast
      scroller. Then, scroll up and down in the recycler view. The top
      section is scrolled together with the recycler view smoothly.
Bug: 183721076
Change-Id: I009fc7e27c8a20505a60502405ebbf695b5a37f2
---
 .../views/RecyclerViewFastScroller.java       | 23 +++++++++++++------
 ...rchAndRecommendationsScrollController.java |  2 +-
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/com/android/launcher3/views/RecyclerViewFastScroller.java b/src/com/android/launcher3/views/RecyclerViewFastScroller.java
index ae34257214..9d0913ad25 100644
--- a/src/com/android/launcher3/views/RecyclerViewFastScroller.java
+++ b/src/com/android/launcher3/views/RecyclerViewFastScroller.java
@@ -106,6 +106,7 @@ public class RecyclerViewFastScroller extends View {
     // prevent jumping, this offset is applied as the user scrolls.
     protected int mTouchOffsetY;
     protected int mThumbOffsetY;
+    protected int mRvOffsetY;
 
     // Fast scroller popup
     private TextView mPopupView;
@@ -186,14 +187,18 @@ public class RecyclerViewFastScroller extends View {
 
     public void setThumbOffsetY(int y) {
         if (mThumbOffsetY == y) {
+            int rvCurrentOffsetY = mRv.getCurrentScrollY();
+            if (mRvOffsetY != rvCurrentOffsetY) {
+                mRvOffsetY = mRv.getCurrentScrollY();
+                notifyScrollChanged();
+            }
             return;
         }
         updatePopupY(y);
         mThumbOffsetY = y;
         invalidate();
-        if (mOnFastScrollChangeListener != null) {
-            mOnFastScrollChangeListener.onThumbOffsetYChanged(mThumbOffsetY);
-        }
+        mRvOffsetY = mRv.getCurrentScrollY();
+        notifyScrollChanged();
     }
 
     public int getThumbOffsetY() {
@@ -422,13 +427,17 @@ public class RecyclerViewFastScroller extends View {
         mOnFastScrollChangeListener = onFastScrollChangeListener;
     }
 
+    private void notifyScrollChanged() {
+        if (mOnFastScrollChangeListener != null) {
+            mOnFastScrollChangeListener.onScrollChanged();
+        }
+    }
+
     /**
      * A callback that is invoked when there is a scroll change in {@link RecyclerViewFastScroller}.
      */
     public interface OnFastScrollChangeListener {
-        /**
-         * Called when the thumb offset vertical position, in pixels, has changed to {@code y}.
-         */
-        void onThumbOffsetYChanged(int y);
+        /** Called when the recycler view scroll has changed. */
+        void onScrollChanged();
     }
 }
diff --git a/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java b/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java
index d09cb8a52d..2ca0d96eec 100644
--- a/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java
+++ b/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java
@@ -221,7 +221,7 @@ final class SearchAndRecommendationsScrollController implements
      * views (e.g. recycler views, tabs) upon scrolling.
      */
     @Override
-    public void onThumbOffsetYChanged(int unused) {
+    public void onScrollChanged() {
         // Always use the recycler view offset because fast scroller offset has a different scale.
         int recyclerViewYOffset = mCurrentRecyclerView.getCurrentScrollY();
         if (recyclerViewYOffset < 0) return;
-- 
GitLab


From a608df0c81c28a664a4dd03bbe04d54ec7859f5e Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Thu, 6 May 2021 11:55:17 -0700
Subject: [PATCH 1095/1664] Support entering PiP from live tile

When finish the recents animation, send user leave hint if live tile is
currently on. Note that we force the PiP window fades in in this case.

Video: http://recall/-/aaaaaabFQoRHlzixHdtY/bLoRpbgcyZBt1UiQPZEXcF
Bug: 187421300
Test: manual, see video
Change-Id: I07bc307c5eb895cd23b764af92e39ff7e6f8e805
---
 .../src/com/android/quickstep/views/RecentsView.java     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index a04b886bd4..59588325fd 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -3359,6 +3359,13 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             return;
         }
 
+        final boolean sendUserLeaveHint = toRecents && LIVE_TILE.get();
+        if (sendUserLeaveHint) {
+            // Notify the SysUI to use fade-in animation when entering PiP from live tile.
+            final SystemUiProxy systemUiProxy = SystemUiProxy.INSTANCE.get(getContext());
+            systemUiProxy.notifySwipeToHomeFinished();
+            systemUiProxy.setShelfHeight(true, mActivity.getDeviceProfile().hotseatBarSizePx);
+        }
         mRecentsAnimationController.finish(toRecents, () -> {
             if (onFinishComplete != null) {
                 onFinishComplete.run();
@@ -3370,7 +3377,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             // taps on QSB (3) user goes back to Overview and launch the most recent task.
             setCurrentTask(-1);
             mRecentsAnimationController = null;
-        });
+        }, sendUserLeaveHint);
     }
 
     public void setDisallowScrollToClearAll(boolean disallowScrollToClearAll) {
-- 
GitLab


From adc109cabecf2111626ffdb134b0a2f05e5ef527 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Thu, 6 May 2021 16:36:31 -0700
Subject: [PATCH 1096/1664] Null check RecentsView before calling
 launchSideTaskInLiveTileMode

Test: N/A
Fixes: 185066406
Change-Id: Ic85bbe02b93c7cc652543138d3ea79f7892c7268
---
 .../quickstep/TaskAnimationManager.java        | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/TaskAnimationManager.java b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
index c87cd171be..44a3e95744 100644
--- a/quickstep/src/com/android/quickstep/TaskAnimationManager.java
+++ b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
@@ -61,9 +61,11 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
             if (LIVE_TILE.get() && activityInterface.isInLiveTileMode()
                     && activityInterface.getCreatedActivity() != null) {
                 RecentsView recentsView = activityInterface.getCreatedActivity().getOverviewPanel();
-                recentsView.launchSideTaskInLiveTileModeForRestartedApp(task.taskId);
-                ActivityManagerWrapper.getInstance().unregisterTaskStackListener(
-                        mLiveTileRestartListener);
+                if (recentsView != null) {
+                    recentsView.launchSideTaskInLiveTileModeForRestartedApp(task.taskId);
+                    ActivityManagerWrapper.getInstance().unregisterTaskStackListener(
+                            mLiveTileRestartListener);
+                }
             }
         }
     };
@@ -135,10 +137,12 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
                         && activityInterface.getCreatedActivity() != null) {
                     RecentsView recentsView =
                             activityInterface.getCreatedActivity().getOverviewPanel();
-                    RemoteAnimationTargetCompat[] apps = new RemoteAnimationTargetCompat[1];
-                    apps[0] = appearedTaskTarget;
-                    recentsView.launchSideTaskInLiveTileMode(appearedTaskTarget.taskId, apps);
-                    return;
+                    if (recentsView != null) {
+                        RemoteAnimationTargetCompat[] apps = new RemoteAnimationTargetCompat[1];
+                        apps[0] = appearedTaskTarget;
+                        recentsView.launchSideTaskInLiveTileMode(appearedTaskTarget.taskId, apps);
+                        return;
+                    }
                 }
                 if (mController != null) {
                     if (mLastAppearedTaskTarget == null
-- 
GitLab


From 5da72b5be8be62accab75adc284051f6445d5c43 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 6 May 2021 15:08:44 -0700
Subject: [PATCH 1097/1664] Handle volume key events while in overview

- Normally this gets dispatched to an app's phone window to notify
  the media session manager, but because the recents input consumer
  routes to the launcher window bypassing phone window, the event
  never gets processed.

Fixes: 185520916
Test: Open overview from an app, ensure volume dialog still shows
Change-Id: I8784a6211e56f320b8b9d688fa0568c583652725
---
 .../inputconsumers/OverviewInputConsumer.java       | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
index fa9e0ec1ab..4af63386e0 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
@@ -18,6 +18,8 @@ package com.android.quickstep.inputconsumers;
 import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
 
+import android.media.AudioManager;
+import android.media.session.MediaSessionManager;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 
@@ -101,6 +103,17 @@ public class OverviewInputConsumer<S extends BaseState<S>, T extends StatefulAct
     @Override
     public void onKeyEvent(KeyEvent ev) {
         if (LIVE_TILE.get()) {
+            switch (ev.getKeyCode()) {
+                case KeyEvent.KEYCODE_VOLUME_DOWN:
+                case KeyEvent.KEYCODE_VOLUME_UP:
+                case KeyEvent.KEYCODE_VOLUME_MUTE:
+                    MediaSessionManager mgr = mActivity.getSystemService(MediaSessionManager.class);
+                    mgr.dispatchVolumeKeyEventAsSystemService(ev,
+                            AudioManager.USE_DEFAULT_STREAM_TYPE);
+                    break;
+                default:
+                    break;
+            }
             mActivity.dispatchKeyEvent(ev);
         }
     }
-- 
GitLab


From e4d07f960b894d7e2281cb0e08267425b3c17e0d Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Thu, 6 May 2021 18:29:33 -0700
Subject: [PATCH 1098/1664] Fix launcher ripple opacity

colorControlHighlight has a might higher opacity on the launcher theme.
themes_material.xml defines it with 10% opacity instead, for both light
and dark themes.

Test: manual
Bug: 187465854
Change-Id: I9abb44aec1fe40db500c9ebdadd5877d1246331b
---
 res/values/styles.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 97a576011a..b270b94f37 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -93,7 +93,7 @@
         <item name="android:textColorSecondary">@color/text_color_secondary_dark</item>
         <item name="android:textColorTertiary">@color/text_color_tertiary_dark</item>
         <item name="android:textColorHint">#A0FFFFFF</item>
-        <item name="android:colorControlHighlight">#A0FFFFFF</item>
+        <item name="android:colorControlHighlight">#19FFFFFF</item>
         <item name="android:colorPrimary">#FF212121</item>
         <item name="allAppsScrimColor">?android:attr/colorBackgroundFloating</item>
         <item name="allAppsNavBarScrimColor">#80000000</item>
@@ -123,7 +123,7 @@
     </style>
 
     <style name="LauncherTheme.Dark.DarkText" parent="@style/LauncherTheme.Dark">
-        <item name="android:colorControlHighlight">#75212121</item>
+        <item name="android:colorControlHighlight">#19212121</item>
         <item name="folderFillColor">#CDFFFFFF</item>
         <item name="folderTextColor">?attr/workspaceTextColor</item>
         <item name="workspaceTextColor">@color/workspace_text_color_dark</item>
@@ -274,12 +274,12 @@
 
     <style name="AllAppsEmptySearchBackground">
         <item name="android:colorPrimary">#E0E0E0</item>
-        <item name="android:colorControlHighlight">#BDBDBD</item>
+        <item name="android:colorControlHighlight">#19BDBDBD</item>
         <item name="android:colorForeground">@color/all_apps_bg_hand_fill</item>
     </style>
     <style name="AllAppsEmptySearchBackground.Dark">
         <item name="android:colorPrimary">#9AA0A6</item>
-        <item name="android:colorControlHighlight">#DFE1E5</item>
+        <item name="android:colorControlHighlight">#19DFE1E5</item>
         <item name="android:colorForeground">@color/all_apps_bg_hand_fill_dark</item>
     </style>
 
-- 
GitLab


From 095e7562a4e342c0f11d43520cfc1c059b09c489 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Thu, 6 May 2021 13:55:27 +0100
Subject: [PATCH 1099/1664] Fix UI overlapping and void space in the full
 widgets picker

The issue is caused by not updating the header container after widgets
recycler view items changed due to item click.

Test: Expand / collapse items in the full widgets picker. No UI
      overlapping or void space is observed.
Bug: 186121915
Change-Id: I6a12bbdcca921d66c6d62601bb59cea66a33640b
---
 ...rchAndRecommendationsScrollController.java | 29 +++++++---
 .../widget/picker/WidgetsRecyclerView.java    | 54 +++++++++++++------
 2 files changed, 62 insertions(+), 21 deletions(-)

diff --git a/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java b/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java
index 2ca0d96eec..317fd03afe 100644
--- a/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java
+++ b/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java
@@ -48,6 +48,8 @@ final class SearchAndRecommendationsScrollController implements
 
     private WidgetsRecyclerView mCurrentRecyclerView;
 
+    private OnContentChangeListener mOnContentChangeListener = () -> applyVerticalTransition();
+
     /**
      * The vertical distance, in pixels, until the search is pinned at the top of the screen when
      * the user scrolls down the recycler view.
@@ -82,19 +84,21 @@ final class SearchAndRecommendationsScrollController implements
         mViewHolder.mContainer.setSearchAndRecommendationScrollController(this);
         mSearchAndRecommendationViewParent = (View) mViewHolder.mContainer.getParent();
         mPrimaryRecyclerView = primaryRecyclerView;
-        mCurrentRecyclerView = mPrimaryRecyclerView;
         mWorkRecyclerView = workRecyclerView;
         mSearchRecyclerView = searchRecyclerView;
         mPrimaryWorkTabsView = personalWorkTabsView;
         mPrimaryWorkViewPager = primaryWorkViewPager;
-        mCurrentRecyclerView = mPrimaryRecyclerView;
         mTabsHeight = tabsHeight;
+        setCurrentRecyclerView(mPrimaryRecyclerView);
     }
 
     /** Sets the current active {@link WidgetsRecyclerView}. */
     public void setCurrentRecyclerView(WidgetsRecyclerView currentRecyclerView) {
+        if (mCurrentRecyclerView != null) {
+            mCurrentRecyclerView.setOnContentChangeListener(null);
+        }
         mCurrentRecyclerView = currentRecyclerView;
-        mCurrentRecyclerView = currentRecyclerView;
+        mCurrentRecyclerView.setOnContentChangeListener(mOnContentChangeListener);
         mViewHolder.mHeaderTitle.setTranslationY(0);
         mViewHolder.mRecommendedWidgetsTable.setTranslationY(0);
         mViewHolder.mSearchBar.setTranslationY(0);
@@ -216,12 +220,16 @@ final class SearchAndRecommendationsScrollController implements
         return hasMarginOrPaddingUpdated;
     }
 
+    @Override
+    public void onScrollChanged() {
+        applyVerticalTransition();
+    }
+
     /**
      * Changes the displacement of collapsible views (e.g. title & widget recommendations) and fixed
-     * views (e.g. recycler views, tabs) upon scrolling.
+     * views (e.g. recycler views, tabs) upon scrolling / content changes in the recycler view.
      */
-    @Override
-    public void onScrollChanged() {
+    private void applyVerticalTransition() {
         // Always use the recycler view offset because fast scroller offset has a different scale.
         int recyclerViewYOffset = mCurrentRecyclerView.getCurrentScrollY();
         if (recyclerViewYOffset < 0) return;
@@ -299,4 +307,13 @@ final class SearchAndRecommendationsScrollController implements
         return view.getMeasuredHeight() + marginLayoutParams.bottomMargin
                 + marginLayoutParams.topMargin;
     }
+
+    /**
+     * A listener to be notified when there is a content change in the recycler view that may affect
+     * the relative position of the search and recommendation container.
+     */
+    public interface OnContentChangeListener {
+        /** Notifies a content change in the recycler view. */
+        void onContentChanged();
+    }
 }
diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java b/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
index eb821d4eab..e981906774 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
@@ -23,6 +23,8 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.widget.TableLayout;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.OnItemTouchListener;
@@ -35,6 +37,7 @@ import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 import com.android.launcher3.widget.model.WidgetsListContentEntry;
 import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
 import com.android.launcher3.widget.model.WidgetsListSearchHeaderEntry;
+import com.android.launcher3.widget.picker.SearchAndRecommendationsScrollController.OnContentChangeListener;
 
 /**
  * The widgets recycler view.
@@ -50,6 +53,7 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
     private boolean mTouchDownOnScroller;
     private HeaderViewDimensionsProvider mHeaderViewDimensionsProvider;
     private int mLastVisibleWidgetContentTableHeight = 0;
+    @Nullable private OnContentChangeListener mOnContentChangeListener;
 
     public WidgetsRecyclerView(Context context) {
         this(context, null);
@@ -86,6 +90,22 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
         mAdapter = (WidgetsListAdapter) adapter;
     }
 
+    @Override
+    public void onChildAttachedToWindow(@NonNull View child) {
+        super.onChildAttachedToWindow(child);
+        if (mOnContentChangeListener != null) {
+            mOnContentChangeListener.onContentChanged();
+        }
+    }
+
+    @Override
+    public void onChildDetachedFromWindow(@NonNull View child) {
+        super.onChildDetachedFromWindow(child);
+        if (mOnContentChangeListener != null) {
+            mOnContentChangeListener.onContentChanged();
+        }
+    }
+
     /**
      * Maps the touch (from 0..1) to the adapter position that should be visible.
      */
@@ -207,6 +227,25 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
         mHeaderViewDimensionsProvider = headerViewDimensionsProvider;
     }
 
+    @Override
+    public void scrollToTop() {
+        if (mScrollbar != null) {
+            mScrollbar.reattachThumbToScroll();
+        }
+
+        if (getLayoutManager() instanceof LinearLayoutManager) {
+            if (getCurrentScrollY() == 0) {
+                // We are at the top, so don't scrollToPosition (would cause unnecessary relayout).
+                return;
+            }
+        }
+        scrollToPosition(0);
+    }
+
+    public void setOnContentChangeListener(@Nullable OnContentChangeListener listener) {
+        mOnContentChangeListener = listener;
+    }
+
     /**
      * Returns the sum of the height, in pixels, of this list adapter's items from index 0 until
      * {@code untilIndex}.
@@ -244,19 +283,4 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
          */
         int getHeaderViewHeight();
     }
-
-    @Override
-    public void scrollToTop() {
-        if (mScrollbar != null) {
-            mScrollbar.reattachThumbToScroll();
-        }
-
-        if (getLayoutManager() instanceof LinearLayoutManager) {
-            if (getCurrentScrollY() == 0) {
-                // We are at the top, so don't scrollToPosition (would cause unnecessary relayout).
-                return;
-            }
-        }
-        scrollToPosition(0);
-    }
 }
-- 
GitLab


From 1c5ddff010dd22a549ed2f1dae84e0ae96cffd27 Mon Sep 17 00:00:00 2001
From: Cyrus Boadway <boadway@google.com>
Date: Fri, 7 May 2021 09:23:45 +0000
Subject: [PATCH 1100/1664] Remove widget launch CUJ from jank monitoring

The widget launch animation should not be measured with the icon launch
animations. No widget launch CUJ yet exists, so no jank monitoring
should be applied to widget app launches.

Bug: 169042867
Test: manual
Change-Id: I2a525c42cca8dd17c4a96bde7f11b14cfe87cabc
---
 .../android/launcher3/QuickstepTransitionManager.java    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 36764a1519..14382d6f09 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -1260,21 +1260,20 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
             if (launchingFromWidget) {
                 composeWidgetLaunchAnimator(anim, (LauncherAppWidgetHostView) mV, appTargets,
                         wallpaperTargets, nonAppTargets);
+                // TODO(b/169042867): jank monitoring instrumentation
             } else if (launchingFromRecents) {
                 composeRecentsLaunchAnimator(anim, mV, appTargets, wallpaperTargets, nonAppTargets,
                         launcherClosing);
+                addCujInstrumentation(
+                        anim, InteractionJankMonitorWrapper.CUJ_APP_LAUNCH_FROM_RECENTS);
             } else if (launchingFromTaskbar) {
                 // TODO
             } else {
                 composeIconLaunchAnimator(anim, mV, appTargets, wallpaperTargets, nonAppTargets,
                         launcherClosing);
+                addCujInstrumentation(anim, InteractionJankMonitorWrapper.CUJ_APP_LAUNCH_FROM_ICON);
             }
 
-            addCujInstrumentation(anim,
-                    launchingFromRecents
-                            ? InteractionJankMonitorWrapper.CUJ_APP_LAUNCH_FROM_RECENTS
-                            : InteractionJankMonitorWrapper.CUJ_APP_LAUNCH_FROM_ICON);
-
             if (launcherClosing) {
                 anim.addListener(mForceInvisibleListener);
             }
-- 
GitLab


From e2ea1f3f33aa8b0972f18b66e99e7e866ca3e658 Mon Sep 17 00:00:00 2001
From: Cyrus Boadway <boadway@google.com>
Date: Fri, 7 May 2021 13:29:11 +0000
Subject: [PATCH 1101/1664] Add interaction jank monitoring for widget app
 launch CUJ

Instrument the widget app launch animation with interaction jank monitoring.

Bug: 169042867
Test: presubmit
Change-Id: Icc9c7cceee7950272fa5d58e0a2f18efc022ce69
---
 .../src/com/android/launcher3/QuickstepTransitionManager.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 14382d6f09..306784029b 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -1260,7 +1260,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
             if (launchingFromWidget) {
                 composeWidgetLaunchAnimator(anim, (LauncherAppWidgetHostView) mV, appTargets,
                         wallpaperTargets, nonAppTargets);
-                // TODO(b/169042867): jank monitoring instrumentation
+                addCujInstrumentation(
+                        anim, InteractionJankMonitorWrapper.CUJ_APP_LAUNCH_FROM_WIDGET);
             } else if (launchingFromRecents) {
                 composeRecentsLaunchAnimator(anim, mV, appTargets, wallpaperTargets, nonAppTargets,
                         launcherClosing);
-- 
GitLab


From 31d41e4ead5e80e7a923ff6cfa7b7a57237fb764 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Fri, 7 May 2021 14:43:12 +0000
Subject: [PATCH 1102/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I3b40206f9edbf432abf3a2555c1c9cf18ff1885c
---
 quickstep/res/values-af/strings.xml        | 8 ++++++++
 quickstep/res/values-am/strings.xml        | 8 ++++++++
 quickstep/res/values-ar/strings.xml        | 8 ++++++++
 quickstep/res/values-as/strings.xml        | 8 ++++++++
 quickstep/res/values-az/strings.xml        | 8 ++++++++
 quickstep/res/values-b+sr+Latn/strings.xml | 8 ++++++++
 quickstep/res/values-be/strings.xml        | 8 ++++++++
 quickstep/res/values-bg/strings.xml        | 8 ++++++++
 quickstep/res/values-bn/strings.xml        | 8 ++++++++
 quickstep/res/values-bs/strings.xml        | 8 ++++++++
 quickstep/res/values-ca/strings.xml        | 8 ++++++++
 quickstep/res/values-cs/strings.xml        | 8 ++++++++
 quickstep/res/values-da/strings.xml        | 8 ++++++++
 quickstep/res/values-de/strings.xml        | 8 ++++++++
 quickstep/res/values-el/strings.xml        | 8 ++++++++
 quickstep/res/values-en-rAU/strings.xml    | 8 ++++++++
 quickstep/res/values-en-rCA/strings.xml    | 8 ++++++++
 quickstep/res/values-en-rGB/strings.xml    | 8 ++++++++
 quickstep/res/values-en-rIN/strings.xml    | 8 ++++++++
 quickstep/res/values-en-rXC/strings.xml    | 4 ++++
 quickstep/res/values-es-rUS/strings.xml    | 8 ++++++++
 quickstep/res/values-es/strings.xml        | 8 ++++++++
 quickstep/res/values-et/strings.xml        | 8 ++++++++
 quickstep/res/values-eu/strings.xml        | 8 ++++++++
 quickstep/res/values-fa/strings.xml        | 8 ++++++++
 quickstep/res/values-fi/strings.xml        | 8 ++++++++
 quickstep/res/values-fr-rCA/strings.xml    | 8 ++++++++
 quickstep/res/values-fr/strings.xml        | 8 ++++++++
 quickstep/res/values-gl/strings.xml        | 8 ++++++++
 quickstep/res/values-gu/strings.xml        | 8 ++++++++
 quickstep/res/values-hi/strings.xml        | 8 ++++++++
 quickstep/res/values-hr/strings.xml        | 8 ++++++++
 quickstep/res/values-hu/strings.xml        | 8 ++++++++
 quickstep/res/values-hy/strings.xml        | 8 ++++++++
 quickstep/res/values-in/strings.xml        | 8 ++++++++
 quickstep/res/values-is/strings.xml        | 8 ++++++++
 quickstep/res/values-it/strings.xml        | 8 ++++++++
 quickstep/res/values-iw/strings.xml        | 8 ++++++++
 quickstep/res/values-ja/strings.xml        | 8 ++++++++
 quickstep/res/values-ka/strings.xml        | 8 ++++++++
 quickstep/res/values-kk/strings.xml        | 8 ++++++++
 quickstep/res/values-km/strings.xml        | 8 ++++++++
 quickstep/res/values-kn/strings.xml        | 8 ++++++++
 quickstep/res/values-ko/strings.xml        | 8 ++++++++
 quickstep/res/values-ky/strings.xml        | 8 ++++++++
 quickstep/res/values-lo/strings.xml        | 8 ++++++++
 quickstep/res/values-lt/strings.xml        | 8 ++++++++
 quickstep/res/values-lv/strings.xml        | 8 ++++++++
 quickstep/res/values-mk/strings.xml        | 8 ++++++++
 quickstep/res/values-ml/strings.xml        | 8 ++++++++
 quickstep/res/values-mn/strings.xml        | 8 ++++++++
 quickstep/res/values-mr/strings.xml        | 8 ++++++++
 quickstep/res/values-ms/strings.xml        | 8 ++++++++
 quickstep/res/values-my/strings.xml        | 8 ++++++++
 quickstep/res/values-nb/strings.xml        | 8 ++++++++
 quickstep/res/values-ne/strings.xml        | 8 ++++++++
 quickstep/res/values-nl/strings.xml        | 8 ++++++++
 quickstep/res/values-or/strings.xml        | 8 ++++++++
 quickstep/res/values-pa/strings.xml        | 8 ++++++++
 quickstep/res/values-pl/strings.xml        | 8 ++++++++
 quickstep/res/values-pt-rPT/strings.xml    | 8 ++++++++
 quickstep/res/values-pt/strings.xml        | 8 ++++++++
 quickstep/res/values-ro/strings.xml        | 8 ++++++++
 quickstep/res/values-ru/strings.xml        | 8 ++++++++
 quickstep/res/values-si/strings.xml        | 8 ++++++++
 quickstep/res/values-sk/strings.xml        | 8 ++++++++
 quickstep/res/values-sl/strings.xml        | 8 ++++++++
 quickstep/res/values-sq/strings.xml        | 8 ++++++++
 quickstep/res/values-sr/strings.xml        | 8 ++++++++
 quickstep/res/values-sv/strings.xml        | 8 ++++++++
 quickstep/res/values-sw/strings.xml        | 8 ++++++++
 quickstep/res/values-ta/strings.xml        | 8 ++++++++
 quickstep/res/values-te/strings.xml        | 8 ++++++++
 quickstep/res/values-th/strings.xml        | 8 ++++++++
 quickstep/res/values-tl/strings.xml        | 8 ++++++++
 quickstep/res/values-tr/strings.xml        | 8 ++++++++
 quickstep/res/values-uk/strings.xml        | 8 ++++++++
 quickstep/res/values-ur/strings.xml        | 8 ++++++++
 quickstep/res/values-uz/strings.xml        | 8 ++++++++
 quickstep/res/values-vi/strings.xml        | 8 ++++++++
 quickstep/res/values-zh-rCN/strings.xml    | 8 ++++++++
 quickstep/res/values-zh-rHK/strings.xml    | 8 ++++++++
 quickstep/res/values-zh-rTW/strings.xml    | 8 ++++++++
 quickstep/res/values-zu/strings.xml        | 8 ++++++++
 84 files changed, 668 insertions(+)

diff --git a/quickstep/res/values-af/strings.xml b/quickstep/res/values-af/strings.xml
index 815ba042b2..046b3a0696 100644
--- a/quickstep/res/values-af/strings.xml
+++ b/quickstep/res/values-af/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Probeer weer"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Mooi so!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutoriaal <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Deel"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Skermkiekie"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Jou organisasie laat nie hierdie program toe nie"</string>
diff --git a/quickstep/res/values-am/strings.xml b/quickstep/res/values-am/strings.xml
index 5a3df9d9bb..c74819e69d 100644
--- a/quickstep/res/values-am/strings.xml
+++ b/quickstep/res/values-am/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"እንደገና ሞክር"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ጥሩ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"አጋዥ ሥልጠና <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"አጋራ"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ቅጽበታዊ ገጽ እይታ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ይህ ድርጊት በመተግበሪያው ወይም በእርስዎ ድርጅት አይፈቀድም"</string>
diff --git a/quickstep/res/values-ar/strings.xml b/quickstep/res/values-ar/strings.xml
index 8205f89444..cf4407e88c 100644
--- a/quickstep/res/values-ar/strings.xml
+++ b/quickstep/res/values-ar/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"إعادة المحاولة"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"أحسنت"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"الدليل التوجيهي <xliff:g id="CURRENT">%1$d</xliff:g> من إجمالي <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"مشاركة"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"لقطة شاشة"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"لا يسمح التطبيق أو لا تسمح مؤسستك بهذا الإجراء."</string>
diff --git a/quickstep/res/values-as/strings.xml b/quickstep/res/values-as/strings.xml
index 9b22c62e93..8c11cddf57 100644
--- a/quickstep/res/values-as/strings.xml
+++ b/quickstep/res/values-as/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"পুনৰ চেষ্টা কৰক"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"সুন্দৰ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"টিউট’ৰিয়েল <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"শ্বেয়াৰ কৰক"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"স্ক্ৰীনশ্বট"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"এপ্‌টোৱে অথবা আপোনাৰ প্ৰতিষ্ঠানে এই কাৰ্যটোৰ অনুমতি নিদিয়ে"</string>
diff --git a/quickstep/res/values-az/strings.xml b/quickstep/res/values-az/strings.xml
index bd88392075..0d8e5b9d62 100644
--- a/quickstep/res/values-az/strings.xml
+++ b/quickstep/res/values-az/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Yenə sınayın"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Əla!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Dərslik <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Paylaşın"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Ekran şəkli"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Bu əməliyyata tətbiq və ya təşkilatınız tərəfindən icazə verilmir"</string>
diff --git a/quickstep/res/values-b+sr+Latn/strings.xml b/quickstep/res/values-b+sr+Latn/strings.xml
index 21295fc31a..8f3a5555a4 100644
--- a/quickstep/res/values-b+sr+Latn/strings.xml
+++ b/quickstep/res/values-b+sr+Latn/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Probajte ponovo"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Svaka čast!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Vodič <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Deli"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Snimak ekrana"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikacija ili organizacija ne dozvoljavaju ovu radnju"</string>
diff --git a/quickstep/res/values-be/strings.xml b/quickstep/res/values-be/strings.xml
index d31468c2fd..0473b5fd3b 100644
--- a/quickstep/res/values-be/strings.xml
+++ b/quickstep/res/values-be/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Паўтарыць спробу"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Выдатна!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Дапаможнік <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Абагуліць"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Здымак экрана"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Гэта дзеянне не дазволена праграмай ці вашай арганізацыяй"</string>
diff --git a/quickstep/res/values-bg/strings.xml b/quickstep/res/values-bg/strings.xml
index d2554d5809..f7845e3d68 100644
--- a/quickstep/res/values-bg/strings.xml
+++ b/quickstep/res/values-bg/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Опитайте отново"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Чудесно!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Урок <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Споделяне"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Екранна снимка"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Това действие не е разрешено от приложението или организацията ви"</string>
diff --git a/quickstep/res/values-bn/strings.xml b/quickstep/res/values-bn/strings.xml
index 48d26905c0..c99f9b0a59 100644
--- a/quickstep/res/values-bn/strings.xml
+++ b/quickstep/res/values-bn/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"আবার চেষ্টা করুন"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"সাবাস!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"টিউটোরিয়াল <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"শেয়ার করুন"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"স্ক্রিনশট নিন"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"এই অ্যাপ বা আপনার প্রতিষ্ঠান এই অ্যাকশনটি পারফর্ম করার অনুমতি দেয়নি"</string>
diff --git a/quickstep/res/values-bs/strings.xml b/quickstep/res/values-bs/strings.xml
index 18494a9c19..15979c174f 100644
--- a/quickstep/res/values-bs/strings.xml
+++ b/quickstep/res/values-bs/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Pokušaj ponovo"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Lijepo!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Vodič <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Dijeli"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Snimak ekrana"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Ovu radnju ne dozvoljava aplikacija ili vaša organizacija"</string>
diff --git a/quickstep/res/values-ca/strings.xml b/quickstep/res/values-ca/strings.xml
index 7c417effa0..795f2e4e89 100644
--- a/quickstep/res/values-ca/strings.xml
+++ b/quickstep/res/values-ca/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Torna-ho a provar"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Molt bé!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Comparteix"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Captura de pantalla"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"L\'aplicació o la teva organització no permeten aquesta acció"</string>
diff --git a/quickstep/res/values-cs/strings.xml b/quickstep/res/values-cs/strings.xml
index 9d1b94e9cd..b2e222f897 100644
--- a/quickstep/res/values-cs/strings.xml
+++ b/quickstep/res/values-cs/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Zkusit znovu"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Skvělé!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Výukový program <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Sdílet"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Snímek obrazovky"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikace nebo organizace zakazuje tuto akci"</string>
diff --git a/quickstep/res/values-da/strings.xml b/quickstep/res/values-da/strings.xml
index 42098dc036..048ced16ea 100644
--- a/quickstep/res/values-da/strings.xml
+++ b/quickstep/res/values-da/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Prøv igen"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Sådan!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Selvstudie <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Del"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Appen eller din organisation tillader ikke denne handling"</string>
diff --git a/quickstep/res/values-de/strings.xml b/quickstep/res/values-de/strings.xml
index e7d9523c14..3e6345875a 100644
--- a/quickstep/res/values-de/strings.xml
+++ b/quickstep/res/values-de/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Wiederholen"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Sehr gut!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Anleitung <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Teilen"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Die App oder deine Organisation lässt diese Aktion nicht zu"</string>
diff --git a/quickstep/res/values-el/strings.xml b/quickstep/res/values-el/strings.xml
index 21c29844f5..0eb9098e40 100644
--- a/quickstep/res/values-el/strings.xml
+++ b/quickstep/res/values-el/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Δοκιμάστε ξανά"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Ωραία!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Οδηγός <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Κοινοποίηση"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Στιγμιότυπο οθόνης"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Αυτή η ενέργεια δεν επιτρέπεται από την εφαρμογή ή τον οργανισμό σας."</string>
diff --git a/quickstep/res/values-en-rAU/strings.xml b/quickstep/res/values-en-rAU/strings.xml
index 487d6ccd77..1040a0361b 100644
--- a/quickstep/res/values-en-rAU/strings.xml
+++ b/quickstep/res/values-en-rAU/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Try again"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Nice!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Share"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
diff --git a/quickstep/res/values-en-rCA/strings.xml b/quickstep/res/values-en-rCA/strings.xml
index 487d6ccd77..1040a0361b 100644
--- a/quickstep/res/values-en-rCA/strings.xml
+++ b/quickstep/res/values-en-rCA/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Try again"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Nice!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Share"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
diff --git a/quickstep/res/values-en-rGB/strings.xml b/quickstep/res/values-en-rGB/strings.xml
index 487d6ccd77..1040a0361b 100644
--- a/quickstep/res/values-en-rGB/strings.xml
+++ b/quickstep/res/values-en-rGB/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Try again"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Nice!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Share"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
diff --git a/quickstep/res/values-en-rIN/strings.xml b/quickstep/res/values-en-rIN/strings.xml
index 487d6ccd77..1040a0361b 100644
--- a/quickstep/res/values-en-rIN/strings.xml
+++ b/quickstep/res/values-en-rIN/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Try again"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Nice!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Share"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
diff --git a/quickstep/res/values-en-rXC/strings.xml b/quickstep/res/values-en-rXC/strings.xml
index 36df9d1523..4d10fd59f8 100644
--- a/quickstep/res/values-en-rXC/strings.xml
+++ b/quickstep/res/values-en-rXC/strings.xml
@@ -74,6 +74,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‎‎‏‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‎‎‏‏‎‎‏‏‎‎‎‏‏‎‎‏‎Try again‎‏‎‎‏‎"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‏‏‎‎‎‎Nice!‎‏‎‎‏‎"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‎‎‏‎‏‎‏‏‎‏‏‎‏‎‏‏‎‎‏‎‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‎‏‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎Tutorial ‎‏‎‎‏‏‎<xliff:g id="CURRENT">%1$d</xliff:g>‎‏‎‎‏‏‏‎/‎‏‎‎‏‏‎<xliff:g id="TOTAL">%2$d</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="allset_title" msgid="5021126669778966707">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‏‏‏‎‏‎‏‎‎‎‎‎‎‎‎‏‏‎‏‎‎‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎‎‏‏‎All set!‎‏‎‎‏‎"</string>
+    <string name="allset_hint" msgid="459504134589971527">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‎‎‏‏‎‏‏‎‏‎‏‏‎‎‎‎‏‏‏‎‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‏‎Swipe up to go home‎‏‎‎‏‎"</string>
+    <string name="allset_description" msgid="6350320429953234580">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‏‏‏‎‏‎‏‎‎‎‏‎‎‏‎‏‏‎‏‏‎‏‎‎‏‎‏‎‎‎You’re ready to start using your phone‎‏‎‎‏‎"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‏‏‎‎‎‎‏‏‏‎‏‎‏‎‎‎‏‏‎‏‏‎‎‎‎‏‏‏‏‎‏‎‎‏‏‎‎‎‏‎‎‎‎‏‏‏‏‎‏‏‏‏‎‎‏‎‎‏‏‎"<annotation id="link">"‎‏‎‎‏‏‏‎Navigation settings for accessibility‎‏‎‎‏‏‎"</annotation>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="action_share" msgid="2648470652637092375">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‎‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‎‎‎‏‎‏‏‏‎Share‎‏‎‎‏‎"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‎‏‏‎‏‎‏‎‏‏‏‎‏‎‏‎‏‎‏‎‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‎‎‏‏‏‏‎‎‎‏‎‏‎Screenshot‎‏‎‎‏‎"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‏‎‎‏‏‎‎‏‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎This action isn\'t allowed by the app or your organization‎‏‎‎‏‎"</string>
diff --git a/quickstep/res/values-es-rUS/strings.xml b/quickstep/res/values-es-rUS/strings.xml
index 478d1cdb1e..2cb0429d8b 100644
--- a/quickstep/res/values-es-rUS/strings.xml
+++ b/quickstep/res/values-es-rUS/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Reintentar"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"¡Genial!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Instructivo <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Compartir"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Captura de pantalla"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"La app o tu organización no permiten realizar esta acción"</string>
diff --git a/quickstep/res/values-es/strings.xml b/quickstep/res/values-es/strings.xml
index 454bea7784..46bd267290 100644
--- a/quickstep/res/values-es/strings.xml
+++ b/quickstep/res/values-es/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Reintentar"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"¡Muy bien!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Compartir"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Hacer captura"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"No puedes hacerlo porque la aplicación o tu organización no lo permiten"</string>
diff --git a/quickstep/res/values-et/strings.xml b/quickstep/res/values-et/strings.xml
index b7299345ab..b059585f25 100644
--- a/quickstep/res/values-et/strings.xml
+++ b/quickstep/res/values-et/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Proovige uuesti"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Tubli töö!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Õpetus <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Jaga"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Ekraanipilt"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Rakendus või teie organisatsioon on selle toimingu keelanud"</string>
diff --git a/quickstep/res/values-eu/strings.xml b/quickstep/res/values-eu/strings.xml
index f6d3f235c4..10232a4dd1 100644
--- a/quickstep/res/values-eu/strings.xml
+++ b/quickstep/res/values-eu/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Saiatu berriro"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Ederki!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutoriala: <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Partekatu"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Atera pantaila-argazki bat"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikazioak edo erakundeak ez du eman ekintza hori gauzatzeko baimena"</string>
diff --git a/quickstep/res/values-fa/strings.xml b/quickstep/res/values-fa/strings.xml
index 8ca0f95ec9..f0bdc4f91c 100644
--- a/quickstep/res/values-fa/strings.xml
+++ b/quickstep/res/values-fa/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"امتحان مجدد"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"عالی!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"آموزش گام‌به‌گام <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"هم‌رسانی"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"نماگرفت"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"برنامه یا سازمان شما اجازه نمی‌دهد این کنش انجام شود."</string>
diff --git a/quickstep/res/values-fi/strings.xml b/quickstep/res/values-fi/strings.xml
index 9ce7e6b4f2..d75d7a3164 100644
--- a/quickstep/res/values-fi/strings.xml
+++ b/quickstep/res/values-fi/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Yritä uudelleen"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Hienoa!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Ohje <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Jaa"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Kuvakaappaus"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Sovellus tai organisaatio ei salli tätä toimintoa"</string>
diff --git a/quickstep/res/values-fr-rCA/strings.xml b/quickstep/res/values-fr-rCA/strings.xml
index da738495c7..59ef61ad6b 100644
--- a/quickstep/res/values-fr-rCA/strings.xml
+++ b/quickstep/res/values-fr-rCA/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Réessayer"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bien!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Étape <xliff:g id="CURRENT">%1$d</xliff:g> sur <xliff:g id="TOTAL">%2$d</xliff:g> du tutoriel"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Partager"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Capture d\'écran"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"L\'application ou votre organisation n\'autorise pas cette action"</string>
diff --git a/quickstep/res/values-fr/strings.xml b/quickstep/res/values-fr/strings.xml
index b6abea7bc9..394b7cdbc6 100644
--- a/quickstep/res/values-fr/strings.xml
+++ b/quickstep/res/values-fr/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Réessayez"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bravo !"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutoriel <xliff:g id="CURRENT">%1$d</xliff:g> sur <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Partager"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Capture d\'écran"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Cette action n\'est pas autorisée par l\'application ou par votre organisation"</string>
diff --git a/quickstep/res/values-gl/strings.xml b/quickstep/res/values-gl/strings.xml
index 9310d71f7d..f7e3058fbf 100644
--- a/quickstep/res/values-gl/strings.xml
+++ b/quickstep/res/values-gl/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Téntao de novo"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Excelente!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Titorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Compartir"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Facer captura"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"A aplicación ou a túa organización non permite realizar esta acción"</string>
diff --git a/quickstep/res/values-gu/strings.xml b/quickstep/res/values-gu/strings.xml
index 496d33b79a..62aa28e3cb 100644
--- a/quickstep/res/values-gu/strings.xml
+++ b/quickstep/res/values-gu/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ફરી પ્રયાસ કરો"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"સરસ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ટ્યૂટૉરિઅલ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"શેર કરો"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"સ્ક્રીનશૉટ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ઍપ કે તમારી સંસ્થા દ્વારા આ ક્રિયા કરવાની મંજૂરી નથી"</string>
diff --git a/quickstep/res/values-hi/strings.xml b/quickstep/res/values-hi/strings.xml
index a7711fe10c..a39faf01d8 100644
--- a/quickstep/res/values-hi/strings.xml
+++ b/quickstep/res/values-hi/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"फिर से कोशिश करें"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"बहुत बढ़िया!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ट्यूटोरियल <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"शेयर करें"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"स्क्रीनशॉट"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ऐप्लिकेशन या आपका संगठन इस कार्रवाई की अनुमति नहीं देता"</string>
diff --git a/quickstep/res/values-hr/strings.xml b/quickstep/res/values-hr/strings.xml
index d5e4b9dd93..e3e62bd74e 100644
--- a/quickstep/res/values-hr/strings.xml
+++ b/quickstep/res/values-hr/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Pokušajte ponovo"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Odlično!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Vodič <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Podijeli"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Snimka zaslona"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikacija ili vaša organizacija ne dopuštaju ovu radnju"</string>
diff --git a/quickstep/res/values-hu/strings.xml b/quickstep/res/values-hu/strings.xml
index 386ef3ee3f..49c0c1b9f6 100644
--- a/quickstep/res/values-hu/strings.xml
+++ b/quickstep/res/values-hu/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Újra"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Remek!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Útmutató (<xliff:g id="TOTAL">%2$d</xliff:g>/<xliff:g id="CURRENT">%1$d</xliff:g>.)"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Megosztás"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Képernyőkép"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Az alkalmazás vagy az Ön szervezete nem engedélyezi ezt a műveletet"</string>
diff --git a/quickstep/res/values-hy/strings.xml b/quickstep/res/values-hy/strings.xml
index 3ff9d0d5c2..9b25392f92 100644
--- a/quickstep/res/values-hy/strings.xml
+++ b/quickstep/res/values-hy/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Նորից փորձեք"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Գերազանց է"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Ուղեցույց <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Կիսվել"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Սքրինշոթ անել"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Այս գործողությունն արգելված է հավելվածի կամ ձեր կազմակերպության կողմից"</string>
diff --git a/quickstep/res/values-in/strings.xml b/quickstep/res/values-in/strings.xml
index 941bdb7dd0..dc105b5ef8 100644
--- a/quickstep/res/values-in/strings.xml
+++ b/quickstep/res/values-in/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Coba lagi"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bagus!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Bagikan"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Tindakan ini tidak diizinkan oleh aplikasi atau organisasi Anda"</string>
diff --git a/quickstep/res/values-is/strings.xml b/quickstep/res/values-is/strings.xml
index 6042b47e45..eb5fc951d8 100644
--- a/quickstep/res/values-is/strings.xml
+++ b/quickstep/res/values-is/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Reyna aftur"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Flott!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Leiðsögn <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Deila"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Skjámynd"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Forritið eða fyrirtækið leyfir ekki þessa aðgerð"</string>
diff --git a/quickstep/res/values-it/strings.xml b/quickstep/res/values-it/strings.xml
index 6c81d1720e..a17c188c40 100644
--- a/quickstep/res/values-it/strings.xml
+++ b/quickstep/res/values-it/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Riprova"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bene!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Condividi"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Questa azione non è consentita dall\'app o dall\'organizzazione"</string>
diff --git a/quickstep/res/values-iw/strings.xml b/quickstep/res/values-iw/strings.xml
index b77faeb4fa..da2e79ab7a 100644
--- a/quickstep/res/values-iw/strings.xml
+++ b/quickstep/res/values-iw/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"אפשר לנסות שוב"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"איזה יופי!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"מדריך <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"שיתוף"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"צילום מסך"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"האפליקציה או הארגון שלך אינם מתירים את הפעולה הזאת"</string>
diff --git a/quickstep/res/values-ja/strings.xml b/quickstep/res/values-ja/strings.xml
index 1cbdf7331c..960b839710 100644
--- a/quickstep/res/values-ja/strings.xml
+++ b/quickstep/res/values-ja/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"再試行"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"成功"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"チュートリアル <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"共有"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"スクリーンショット"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"この操作はアプリまたは組織で許可されていません"</string>
diff --git a/quickstep/res/values-ka/strings.xml b/quickstep/res/values-ka/strings.xml
index 5dd818d9ac..8b3b95c046 100644
--- a/quickstep/res/values-ka/strings.xml
+++ b/quickstep/res/values-ka/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ხელახლა ცდა"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"მშვენიერია!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"სახელმძღვანელო <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"გაზიარება"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ეკრანის ანაბეჭდი"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ეს მოქმედება არ არის დაშვებული აპის ან თქვენი ორგანიზაციის მიერ"</string>
diff --git a/quickstep/res/values-kk/strings.xml b/quickstep/res/values-kk/strings.xml
index 554d10dc82..45618e0b04 100644
--- a/quickstep/res/values-kk/strings.xml
+++ b/quickstep/res/values-kk/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Қайталау"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Жақсы!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Оқулық: <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Бөлісу"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Скриншот"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Бұл әрекетке қолданба не ұйым рұқсат етпейді."</string>
diff --git a/quickstep/res/values-km/strings.xml b/quickstep/res/values-km/strings.xml
index 62858ba625..9e12034179 100644
--- a/quickstep/res/values-km/strings.xml
+++ b/quickstep/res/values-km/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ព្យាយាមម្ដងទៀត"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ល្អ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"មេរៀនទី <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"ចែករំលែក"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"រូបថតអេក្រង់"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"សកម្មភាពនេះ​មិនត្រូវបានអនុញ្ញាតដោយកម្មវិធី​ ឬ​ស្ថាប័ន​របស់អ្នកទេ"</string>
diff --git a/quickstep/res/values-kn/strings.xml b/quickstep/res/values-kn/strings.xml
index 8fdba693bf..1c5f893797 100644
--- a/quickstep/res/values-kn/strings.xml
+++ b/quickstep/res/values-kn/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ಪುನಃ ಪ್ರಯತ್ನಿಸಿ"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ಚೆನ್ನಾಗಿದೆ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ಟ್ಯುಟೋರಿಯಲ್ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"ಹಂಚಿಕೊಳ್ಳಿ"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ಸ್ಕ್ರೀನ್‌ಶಾಟ್"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ಆ್ಯಪ್ ಅಥವಾ ನಿಮ್ಮ ಸಂಸ್ಥೆಯು ಈ ಕ್ರಿಯೆಯನ್ನು ಅನುಮತಿಸುವುದಿಲ್ಲ"</string>
diff --git a/quickstep/res/values-ko/strings.xml b/quickstep/res/values-ko/strings.xml
index fbbddd6699..63f2d96a42 100644
--- a/quickstep/res/values-ko/strings.xml
+++ b/quickstep/res/values-ko/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"다시 시도"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"잘하셨습니다"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"튜토리얼 <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"공유"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"스크린샷"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"이 작업은 앱 또는 조직에서 허용되지 않습니다."</string>
diff --git a/quickstep/res/values-ky/strings.xml b/quickstep/res/values-ky/strings.xml
index bd50eed506..5d2d7e0ce5 100644
--- a/quickstep/res/values-ky/strings.xml
+++ b/quickstep/res/values-ky/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Кайра аракет кылыңыз"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Сонун!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Үйрөткүч: <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Бөлүшүү"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Скриншот"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Бул аракетти аткарууга колдонмо же ишканаңыз тыюу салган"</string>
diff --git a/quickstep/res/values-lo/strings.xml b/quickstep/res/values-lo/strings.xml
index e05b18e613..ee09438662 100644
--- a/quickstep/res/values-lo/strings.xml
+++ b/quickstep/res/values-lo/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ລອງໃໝ່"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ດີ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ການສອນການນຳໃຊ້ທີ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"ແບ່ງປັນ"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ຮູບໜ້າຈໍ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ແອັບ ຫຼື ອົງການຂອງທ່ານບໍ່ອະນຸຍາດໃຫ້ໃຊ້ຄຳສັ່ງນີ້"</string>
diff --git a/quickstep/res/values-lt/strings.xml b/quickstep/res/values-lt/strings.xml
index 2f1db5038a..d2f217fda1 100644
--- a/quickstep/res/values-lt/strings.xml
+++ b/quickstep/res/values-lt/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Bandykite dar kartą"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Šaunu!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Mokymo programa: <xliff:g id="CURRENT">%1$d</xliff:g> iš <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Bendrinti"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Ekrano kopija"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Jūsų organizacijoje arba naudojant šią programą neleidžiama atlikti šio veiksmo"</string>
diff --git a/quickstep/res/values-lv/strings.xml b/quickstep/res/values-lv/strings.xml
index ce941bc3d9..702e97a683 100644
--- a/quickstep/res/values-lv/strings.xml
+++ b/quickstep/res/values-lv/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Mēģināt vēlreiz"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Lieliski!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"<xliff:g id="CURRENT">%1$d</xliff:g>. mācību darbība no <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Kopīgot"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Veikt ekrānuzņēmumu"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Lietotne vai jūsu organizācija neatļauj veikt šo darbību."</string>
diff --git a/quickstep/res/values-mk/strings.xml b/quickstep/res/values-mk/strings.xml
index f9fd8b3d06..2da1cec87f 100644
--- a/quickstep/res/values-mk/strings.xml
+++ b/quickstep/res/values-mk/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Обиди се пак"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Одлично!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Упатство <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Сподели"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Слика од екранот"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Апликацијата или вашата организација не го дозволува дејствово"</string>
diff --git a/quickstep/res/values-ml/strings.xml b/quickstep/res/values-ml/strings.xml
index fc6bc82d01..ebd804aa6e 100644
--- a/quickstep/res/values-ml/strings.xml
+++ b/quickstep/res/values-ml/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"വീണ്ടും ശ്രമിക്കുക"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"കൊള്ളാം!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ട്യൂട്ടോറിയൽ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"പങ്കിടുക"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"സ്ക്രീൻഷോട്ട്"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ഈ നടപടി എടുക്കുന്നത് ആപ്പോ നിങ്ങളുടെ സ്ഥാപനമോ അനുവദിക്കുന്നില്ല"</string>
diff --git a/quickstep/res/values-mn/strings.xml b/quickstep/res/values-mn/strings.xml
index 48513eb928..f7fb0f81b9 100644
--- a/quickstep/res/values-mn/strings.xml
+++ b/quickstep/res/values-mn/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Дахин оролдох"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Янзтай!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"<xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g> практик хичээл"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Хуваалцах"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Дэлгэцийн агшин дарах"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Энэ үйлдлийг апп эсвэл танай байгууллага зөвшөөрдөггүй"</string>
diff --git a/quickstep/res/values-mr/strings.xml b/quickstep/res/values-mr/strings.xml
index c576cf139d..bac7f7867e 100644
--- a/quickstep/res/values-mr/strings.xml
+++ b/quickstep/res/values-mr/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"पुन्हा प्रयत्न करा"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"छान!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ट्युटोरियल <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"शेअर करा"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"स्क्रीनशॉट"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"अ‍ॅप किंवा तुमच्या संस्थेद्वारे ही क्रिया करण्याची अनुमती नाही"</string>
diff --git a/quickstep/res/values-ms/strings.xml b/quickstep/res/values-ms/strings.xml
index 74b9d086e8..1f53ad4f2f 100644
--- a/quickstep/res/values-ms/strings.xml
+++ b/quickstep/res/values-ms/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Cuba lagi"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bagus!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Kongsi"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Tangkapan skrin"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Tindakan ini tidak dibenarkan oleh apl atau organisasi anda"</string>
diff --git a/quickstep/res/values-my/strings.xml b/quickstep/res/values-my/strings.xml
index 919ad6efa7..d61f8008d0 100644
--- a/quickstep/res/values-my/strings.xml
+++ b/quickstep/res/values-my/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ထပ်စမ်းကြည့်ရန်"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ကောင်းသည်။"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ရှင်းလင်းပို့ချချက် <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"မျှဝေရန်"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ဖန်သားပြင်ဓာတ်ပုံ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ဤလုပ်ဆောင်ချက်ကို အက်ပ် သို့မဟုတ် သင်၏အဖွဲ့အစည်းက ခွင့်မပြုပါ"</string>
diff --git a/quickstep/res/values-nb/strings.xml b/quickstep/res/values-nb/strings.xml
index 6e7e4a3cf7..e725ebefb9 100644
--- a/quickstep/res/values-nb/strings.xml
+++ b/quickstep/res/values-nb/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Prøv igjen"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bra!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Veiledning <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Del"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Skjermdump"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Appen eller organisasjonen din tillater ikke denne handlingen"</string>
diff --git a/quickstep/res/values-ne/strings.xml b/quickstep/res/values-ne/strings.xml
index f3b1151ef6..369649ae34 100644
--- a/quickstep/res/values-ne/strings.xml
+++ b/quickstep/res/values-ne/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"फेरि प्रयास गर्नुहोस्"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"राम्रो!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ट्युटोरियल <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"सेयर गर्नुहोस्"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"स्क्रिनसट"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"यो एप वा तपाईंको सङ्गठनले यो कारबाही गर्ने अनुमति दिँदैन"</string>
diff --git a/quickstep/res/values-nl/strings.xml b/quickstep/res/values-nl/strings.xml
index be9329f000..49daf19d90 100644
--- a/quickstep/res/values-nl/strings.xml
+++ b/quickstep/res/values-nl/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Opnieuw"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Dat gaat lekker."</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Delen"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Deze actie wordt niet toegestaan door de app of je organisatie"</string>
diff --git a/quickstep/res/values-or/strings.xml b/quickstep/res/values-or/strings.xml
index 8c3697296f..9cbbd351ef 100644
--- a/quickstep/res/values-or/strings.xml
+++ b/quickstep/res/values-or/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ବଢ଼ିଆ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ଟ୍ୟୁଟୋରିଆଲ୍ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"ସେୟାର୍ କରନ୍ତୁ"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ସ୍କ୍ରିନସଟ୍"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ଆପ୍ କିମ୍ବା ଆପଣଙ୍କ ସଂସ୍ଥା ଦ୍ୱାରା ଏହି କାର୍ଯ୍ୟକୁ ଅନୁମତି ଦିଆଯାଇ ନାହିଁ"</string>
diff --git a/quickstep/res/values-pa/strings.xml b/quickstep/res/values-pa/strings.xml
index 227c060230..56b66c7f5f 100644
--- a/quickstep/res/values-pa/strings.xml
+++ b/quickstep/res/values-pa/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ਵਧੀਆ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ਟਿਊਟੋਰੀਅਲ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"ਸਾਂਝਾ ਕਰੋ"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ਸਕ੍ਰੀਨਸ਼ਾਟ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ਐਪ ਜਾਂ ਤੁਹਾਡੀ ਸੰਸਥਾ ਵੱਲੋਂ ਇਸ ਕਾਰਵਾਈ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ"</string>
diff --git a/quickstep/res/values-pl/strings.xml b/quickstep/res/values-pl/strings.xml
index 61d9b9377a..1b5a81ddc5 100644
--- a/quickstep/res/values-pl/strings.xml
+++ b/quickstep/res/values-pl/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Spróbuj ponownie"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Super!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Samouczek <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Udostępnij"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Zrzut ekranu"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Nie możesz wykonać tego działania, bo nie zezwala na to aplikacja lub Twoja organizacja"</string>
diff --git a/quickstep/res/values-pt-rPT/strings.xml b/quickstep/res/values-pt-rPT/strings.xml
index 0feead77b1..5fd560ab83 100644
--- a/quickstep/res/values-pt-rPT/strings.xml
+++ b/quickstep/res/values-pt-rPT/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Tente novamente"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Boa!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Partilhar"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Fazer captura de ecrã"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Esta ação não é permitida pela app ou a sua entidade."</string>
diff --git a/quickstep/res/values-pt/strings.xml b/quickstep/res/values-pt/strings.xml
index f533bbcbc3..c254986d77 100644
--- a/quickstep/res/values-pt/strings.xml
+++ b/quickstep/res/values-pt/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Tentar novamente"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Muito bem!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Compartilhar"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Capturar tela"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Essa ação não é permitida pelo app ou pela organização"</string>
diff --git a/quickstep/res/values-ro/strings.xml b/quickstep/res/values-ro/strings.xml
index 37d2935683..ae781fec7f 100644
--- a/quickstep/res/values-ro/strings.xml
+++ b/quickstep/res/values-ro/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Reîncercați"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bravo!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorialul <xliff:g id="CURRENT">%1$d</xliff:g> / <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Distribuiți"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Captură de ecran"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Această acțiune nu este permisă de aplicație sau de organizația dvs."</string>
diff --git a/quickstep/res/values-ru/strings.xml b/quickstep/res/values-ru/strings.xml
index 8d4c40a210..608ebd43da 100644
--- a/quickstep/res/values-ru/strings.xml
+++ b/quickstep/res/values-ru/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Повторите попытку"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Поздравляем!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Руководство (шаг <xliff:g id="CURRENT">%1$d</xliff:g> из <xliff:g id="TOTAL">%2$d</xliff:g>)"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Поделиться"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Скриншот"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Это действие заблокировано приложением или организацией."</string>
diff --git a/quickstep/res/values-si/strings.xml b/quickstep/res/values-si/strings.xml
index d526e139ee..64cf9cc956 100644
--- a/quickstep/res/values-si/strings.xml
+++ b/quickstep/res/values-si/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"නැවත උත්සාහ කරන්න"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"කදිමයි!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"නිබන්ධනය <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"බෙදා ගන්න"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"තිර රුව"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"මෙම ක්‍රියාව යෙදුම හෝ ඔබේ සංවිධානය මගින් ඉඩ නොදේ"</string>
diff --git a/quickstep/res/values-sk/strings.xml b/quickstep/res/values-sk/strings.xml
index 24a4ac974f..810b909be2 100644
--- a/quickstep/res/values-sk/strings.xml
+++ b/quickstep/res/values-sk/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Skúste to znova"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Výborne!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Návod <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Zdieľať"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Snímka obrazovky"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikácia alebo vaša organizácia túto akciu nepovoľuje"</string>
diff --git a/quickstep/res/values-sl/strings.xml b/quickstep/res/values-sl/strings.xml
index fdc8a6a4b4..55a0fbad41 100644
--- a/quickstep/res/values-sl/strings.xml
+++ b/quickstep/res/values-sl/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Poskusite znova"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Odlično!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Vadnica <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Deli"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Posnetek zaslona"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikacija ali vaša organizacija ne dovoljuje tega dejanja"</string>
diff --git a/quickstep/res/values-sq/strings.xml b/quickstep/res/values-sq/strings.xml
index 36e0afc371..73d983baab 100644
--- a/quickstep/res/values-sq/strings.xml
+++ b/quickstep/res/values-sq/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Provo përsëri"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bukur!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Udhëzuesi <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Ndaj"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Pamja e ekranit"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Ky veprim nuk lejohet nga aplikacioni ose organizata jote"</string>
diff --git a/quickstep/res/values-sr/strings.xml b/quickstep/res/values-sr/strings.xml
index 8a462f982d..900950f1bf 100644
--- a/quickstep/res/values-sr/strings.xml
+++ b/quickstep/res/values-sr/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Пробајте поново"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Свака част!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Водич <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Дели"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Снимак екрана"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Апликација или организација не дозвољавају ову радњу"</string>
diff --git a/quickstep/res/values-sv/strings.xml b/quickstep/res/values-sv/strings.xml
index bf6985030c..ce256db563 100644
--- a/quickstep/res/values-sv/strings.xml
+++ b/quickstep/res/values-sv/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Försök igen"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bra!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Självstudie <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Dela"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Skärmbild"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Appen eller organisationen tillåter inte den här åtgärden"</string>
diff --git a/quickstep/res/values-sw/strings.xml b/quickstep/res/values-sw/strings.xml
index b761caee7d..92b7839a76 100644
--- a/quickstep/res/values-sw/strings.xml
+++ b/quickstep/res/values-sw/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Jaribu tena"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Safi!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Mafunzo ya <xliff:g id="CURRENT">%1$d</xliff:g> kati ya <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Shiriki"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Picha ya skrini"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Kitendo hiki hakiruhusiwi na programu au shirika lako"</string>
diff --git a/quickstep/res/values-ta/strings.xml b/quickstep/res/values-ta/strings.xml
index 089c95de7b..cd8e3a3b4e 100644
--- a/quickstep/res/values-ta/strings.xml
+++ b/quickstep/res/values-ta/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"மீண்டும் முயல்க"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"அருமை!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"பயிற்சி <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"பகிர்"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ஸ்கிரீன்ஷாட்"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ஆப்ஸோ உங்கள் நிறுவனமோ இந்த செயலை அனுமதிப்பதில்லை"</string>
diff --git a/quickstep/res/values-te/strings.xml b/quickstep/res/values-te/strings.xml
index c73c83ebb5..5e8230c4e4 100644
--- a/quickstep/res/values-te/strings.xml
+++ b/quickstep/res/values-te/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"మళ్లీ ట్రై చేయండి"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"పనితీరు బాగుంది!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ట్యుటోరియల్ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"షేర్ చేయండి"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"స్క్రీన్‌షాట్"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ఈ చర్యను యాప్ గానీ, మీ సంస్థ గానీ అనుమతించవు"</string>
diff --git a/quickstep/res/values-th/strings.xml b/quickstep/res/values-th/strings.xml
index d7061089f2..ec7c652c78 100644
--- a/quickstep/res/values-th/strings.xml
+++ b/quickstep/res/values-th/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ลองอีกครั้ง"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ดีมาก"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"บทแนะนำ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"แชร์"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ภาพหน้าจอ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"แอปหรือองค์กรของคุณไม่อนุญาตการดำเนินการนี้"</string>
diff --git a/quickstep/res/values-tl/strings.xml b/quickstep/res/values-tl/strings.xml
index 5056481ccf..f973042f10 100644
--- a/quickstep/res/values-tl/strings.xml
+++ b/quickstep/res/values-tl/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Subukan ulit"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Magaling!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Ibahagi"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Hindi pinapayagan ng app o ng iyong organisasyon ang pagkilos na ito"</string>
diff --git a/quickstep/res/values-tr/strings.xml b/quickstep/res/values-tr/strings.xml
index a22247b2de..dc89f44fef 100644
--- a/quickstep/res/values-tr/strings.xml
+++ b/quickstep/res/values-tr/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Tekrar deneyin"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Güzel!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Eğitici <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Paylaş"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Ekran görüntüsü"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Uygulamanız veya kuruluşunuz bu işleme izin vermiyor"</string>
diff --git a/quickstep/res/values-uk/strings.xml b/quickstep/res/values-uk/strings.xml
index c63cec4c0a..926c1fb852 100644
--- a/quickstep/res/values-uk/strings.xml
+++ b/quickstep/res/values-uk/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Спробуйте ще"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Чудово!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Навчальний посібник <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Поділитися"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Знімок екрана"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Ця дія заборонена додатком або адміністратором організації"</string>
diff --git a/quickstep/res/values-ur/strings.xml b/quickstep/res/values-ur/strings.xml
index 5ce95ad7c1..a04e090179 100644
--- a/quickstep/res/values-ur/strings.xml
+++ b/quickstep/res/values-ur/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"پھر کوشش کریں"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"عمدہ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ٹیوٹوریل <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"اشتراک کریں"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"اسکرین شاٹ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ایپ یا آپ کی تنظیم کی جانب سے اس کارروائی کی اجازت نہیں ہے"</string>
diff --git a/quickstep/res/values-uz/strings.xml b/quickstep/res/values-uz/strings.xml
index 7272eddf51..4ddcae846e 100644
--- a/quickstep/res/values-uz/strings.xml
+++ b/quickstep/res/values-uz/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Qayta urinish"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Yaxshi!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Darslik: <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Ulashish"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Skrinshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Bu amal ilova yoki tashkilotingiz tomonidan taqiqlangan"</string>
diff --git a/quickstep/res/values-vi/strings.xml b/quickstep/res/values-vi/strings.xml
index fc3ef3ffff..3034ce7a89 100644
--- a/quickstep/res/values-vi/strings.xml
+++ b/quickstep/res/values-vi/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Thử lại"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Tuyệt vời!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Hướng dẫn <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Chia sẻ"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Chụp ảnh màn hình"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Ứng dụng hoặc tổ chức của bạn không cho phép thực hiện hành động này"</string>
diff --git a/quickstep/res/values-zh-rCN/strings.xml b/quickstep/res/values-zh-rCN/strings.xml
index fe5e553d98..e60e2a8c13 100644
--- a/quickstep/res/values-zh-rCN/strings.xml
+++ b/quickstep/res/values-zh-rCN/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"重试"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"很好！"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"教程 <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"分享"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"屏幕截图"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"该应用或您所在的单位不允许执行此操作"</string>
diff --git a/quickstep/res/values-zh-rHK/strings.xml b/quickstep/res/values-zh-rHK/strings.xml
index 5522a67f05..b54682027c 100644
--- a/quickstep/res/values-zh-rHK/strings.xml
+++ b/quickstep/res/values-zh-rHK/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"再試一次"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"很好！"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"教學課程 <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"分享"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"螢幕截圖"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"應用程式或您的機構不允許此操作"</string>
diff --git a/quickstep/res/values-zh-rTW/strings.xml b/quickstep/res/values-zh-rTW/strings.xml
index 20af2b4f88..8146ec3114 100644
--- a/quickstep/res/values-zh-rTW/strings.xml
+++ b/quickstep/res/values-zh-rTW/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"重試"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"很好！"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"教學課程 <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"分享"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"擷取螢幕畫面"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"這個應用程式或貴機構不允許執行這個動作"</string>
diff --git a/quickstep/res/values-zu/strings.xml b/quickstep/res/values-zu/strings.xml
index 2ffaecf9c5..a17165091d 100644
--- a/quickstep/res/values-zu/strings.xml
+++ b/quickstep/res/values-zu/strings.xml
@@ -74,6 +74,14 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Zama futhi"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Kuhle!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Okokufundisa <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <!-- no translation found for allset_title (5021126669778966707) -->
+    <skip />
+    <!-- no translation found for allset_hint (459504134589971527) -->
+    <skip />
+    <!-- no translation found for allset_description (6350320429953234580) -->
+    <skip />
+    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Yabelana"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Isithombe-skrini"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Lesi senzo asivunyelwanga uhlelo lokusebenza noma inhlangano yakho"</string>
-- 
GitLab


From 2ca3f98921e22df80fccf45b5b20fac7b2af9d36 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Fri, 7 May 2021 14:43:37 +0000
Subject: [PATCH 1103/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I432d4ee0276275401879ce050f9600e2319ef883
---
 go/quickstep/res/values-en-rXC/strings.xml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 go/quickstep/res/values-en-rXC/strings.xml

diff --git a/go/quickstep/res/values-en-rXC/strings.xml b/go/quickstep/res/values-en-rXC/strings.xml
new file mode 100644
index 0000000000..614f69afe2
--- /dev/null
+++ b/go/quickstep/res/values-en-rXC/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‏‏‎‏‎‎‎Share App‎‏‎‎‏‎"</string>
+    <string name="action_listen" msgid="2370304050784689486">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‎‎‏‎‏‎‎‎‎‎‎‏‎‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‏‎‏‏‏‎‏‎‏‎‎‏‏‏‎‎Listen‎‏‎‎‏‎"</string>
+    <string name="action_translate" msgid="8028378961867277746">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‎‏‎‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‎‎‏‎‏‎‎‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎‎‏‎‎Translate‎‏‎‎‏‎"</string>
+    <string name="action_search" msgid="6269564710943755464">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‏‎‎‎‏‏‎‎‏‏‎‎‏‎‎‎‎Lens‎‏‎‎‏‎"</string>
+</resources>
-- 
GitLab


From 3cf8cace5bdbb6a73836b6a27fae085967936bc0 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Fri, 7 May 2021 14:44:16 +0000
Subject: [PATCH 1104/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I290c44f7134dc44c6ef200215d32c8c8a893e501
---
 res/values-af/strings.xml        | 3 ++-
 res/values-am/strings.xml        | 3 ++-
 res/values-ar/strings.xml        | 3 ++-
 res/values-as/strings.xml        | 3 ++-
 res/values-az/strings.xml        | 3 ++-
 res/values-b+sr+Latn/strings.xml | 3 ++-
 res/values-be/strings.xml        | 3 ++-
 res/values-bg/strings.xml        | 3 ++-
 res/values-bn/strings.xml        | 9 ++++-----
 res/values-bs/strings.xml        | 3 ++-
 res/values-ca/strings.xml        | 3 ++-
 res/values-cs/strings.xml        | 3 ++-
 res/values-da/strings.xml        | 3 ++-
 res/values-de/strings.xml        | 9 ++++-----
 res/values-el/strings.xml        | 3 ++-
 res/values-en-rAU/strings.xml    | 3 ++-
 res/values-en-rCA/strings.xml    | 3 ++-
 res/values-en-rGB/strings.xml    | 3 ++-
 res/values-en-rIN/strings.xml    | 3 ++-
 res/values-en-rXC/strings.xml    | 2 +-
 res/values-es-rUS/strings.xml    | 3 ++-
 res/values-es/strings.xml        | 3 ++-
 res/values-et/strings.xml        | 5 +++--
 res/values-eu/strings.xml        | 3 ++-
 res/values-fa/strings.xml        | 5 +++--
 res/values-fi/strings.xml        | 3 ++-
 res/values-fr-rCA/strings.xml    | 3 ++-
 res/values-fr/strings.xml        | 3 ++-
 res/values-gl/strings.xml        | 3 ++-
 res/values-gu/strings.xml        | 9 ++++-----
 res/values-hi/strings.xml        | 3 ++-
 res/values-hr/strings.xml        | 3 ++-
 res/values-hu/strings.xml        | 3 ++-
 res/values-hy/strings.xml        | 9 ++++-----
 res/values-in/strings.xml        | 3 ++-
 res/values-is/strings.xml        | 3 ++-
 res/values-it/strings.xml        | 3 ++-
 res/values-iw/strings.xml        | 3 ++-
 res/values-ja/strings.xml        | 5 +++--
 res/values-ka/strings.xml        | 3 ++-
 res/values-kk/strings.xml        | 3 ++-
 res/values-km/strings.xml        | 3 ++-
 res/values-kn/strings.xml        | 9 ++++-----
 res/values-ko/strings.xml        | 3 ++-
 res/values-ky/strings.xml        | 3 ++-
 res/values-lo/strings.xml        | 3 ++-
 res/values-lt/strings.xml        | 3 ++-
 res/values-lv/strings.xml        | 3 ++-
 res/values-mk/strings.xml        | 9 ++++-----
 res/values-ml/strings.xml        | 9 ++++-----
 res/values-mn/strings.xml        | 3 ++-
 res/values-mr/strings.xml        | 9 ++++-----
 res/values-ms/strings.xml        | 3 ++-
 res/values-my/strings.xml        | 3 ++-
 res/values-nb/strings.xml        | 3 ++-
 res/values-ne/strings.xml        | 9 ++++-----
 res/values-nl/strings.xml        | 3 ++-
 res/values-or/strings.xml        | 3 ++-
 res/values-pa/strings.xml        | 9 ++++-----
 res/values-pl/strings.xml        | 3 ++-
 res/values-pt-rPT/strings.xml    | 3 ++-
 res/values-pt/strings.xml        | 3 ++-
 res/values-ro/strings.xml        | 3 ++-
 res/values-ru/strings.xml        | 3 ++-
 res/values-si/strings.xml        | 3 ++-
 res/values-sk/strings.xml        | 3 ++-
 res/values-sl/strings.xml        | 3 ++-
 res/values-sq/strings.xml        | 5 +++--
 res/values-sr/strings.xml        | 3 ++-
 res/values-sv/strings.xml        | 3 ++-
 res/values-sw/strings.xml        | 3 ++-
 res/values-ta/strings.xml        | 3 ++-
 res/values-te/strings.xml        | 9 ++++-----
 res/values-th/strings.xml        | 3 ++-
 res/values-tl/strings.xml        | 3 ++-
 res/values-tr/strings.xml        | 3 ++-
 res/values-uk/strings.xml        | 3 ++-
 res/values-ur/strings.xml        | 9 ++++-----
 res/values-uz/strings.xml        | 3 ++-
 res/values-vi/strings.xml        | 3 ++-
 res/values-zh-rCN/strings.xml    | 9 ++++-----
 res/values-zh-rHK/strings.xml    | 3 ++-
 res/values-zh-rTW/strings.xml    | 3 ++-
 res/values-zu/strings.xml        | 3 ++-
 84 files changed, 197 insertions(+), 140 deletions(-)

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index c6d372af8d..77f01185be 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Vouer: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> items"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Vouer: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> of meer items"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Muurpapiere"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Style en muurpapiere"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Tuis-instellings"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Gedeaktiveer deur jou administrateur"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Laat toe dat tuisskerm gedraai word"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 7123a8bb2a..af30fa5994 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"አቃፊ፦ <xliff:g id="NAME">%1$s</xliff:g>፣ <xliff:g id="SIZE">%2$d</xliff:g> ንጥሎች"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"አቃፊ፦ <xliff:g id="NAME">%1$s</xliff:g>፣ <xliff:g id="SIZE">%2$d</xliff:g> ወይም ተጨማሪ ንጥሎች"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"የግድግዳ ወረቀቶች"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"ቅጦች እና ልጣፎች"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"የመነሻ ቅንብሮች"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"በእርስዎ አስተዳዳሪ የተሰናከለ"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"የመነሻ ማያ ገጽ ማሽከርከርን ይፍቀዱ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index c6ab52a9e6..92295db899 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -109,7 +109,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"المجلد: <xliff:g id="NAME">%1$s</xliff:g>، <xliff:g id="SIZE">%2$d</xliff:g> عنصر"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"المجلد: <xliff:g id="NAME">%1$s</xliff:g>، <xliff:g id="SIZE">%2$d</xliff:g> عنصر أو أكثر"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"الخلفيات"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"الأنماط والخلفيات"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"إعدادات الشاشة الرئيسية"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"أوقف المشرف هذه الميزة"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"السماح بتدوير الشاشة الرئيسية"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 5e80e652b4..8e5558553f 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"ফ’ল্ডাৰ: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> টা বস্তু"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ফ’ল্ডাৰ: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> টা অথবা তাতকৈ অধিক বস্তু"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"ৱালপেপাৰসমূহ"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"শৈলী আৰু ৱালপেপাৰ"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"গৃহ ছেটিং"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"আপোনাৰ প্ৰশাসকে অক্ষম কৰি ৰাখিছে"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"গৃহ স্ক্ৰীণ ঘূৰোৱাৰ অনুমতি দিয়ক"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 17f600c887..62581b82d1 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Qovluq: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> element"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Qovluq: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> və ya daha çox element"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Divar kağızları"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Üslub və divar kağızları"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Home ayarları"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Admininiz tərəfindən deaktiv edilib"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Əsas ekranın firlanmağına icazə verin"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index dc04fedda3..ce69fd94dc 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -100,7 +100,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> stavke"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ili više stavki"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Pozadine"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stilovi i pozadine"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Podešavanja početnog ekrana"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Administrator je onemogućio"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Dozvoli rotaciju početnog ekrana"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 9bb2c00f74..2efdad405c 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -103,7 +103,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Папка: <xliff:g id="NAME">%1$s</xliff:g>, элементы: <xliff:g id="SIZE">%2$d</xliff:g>"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Папка: <xliff:g id="NAME">%1$s</xliff:g>, элементы: <xliff:g id="SIZE">%2$d</xliff:g> ці больш"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Шпалеры"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Стылі і шпалеры"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Налады галоўнага экрана"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Адключаная адміністратарам"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Дазволіць паварот галоўнага экрана"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 0d398ee657..9484a75206 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Папка: „<xliff:g id="NAME">%1$s</xliff:g>“ – <xliff:g id="SIZE">%2$d</xliff:g> елемента"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Папка: „<xliff:g id="NAME">%1$s</xliff:g>“ – <xliff:g id="SIZE">%2$d</xliff:g> или повече елементи"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Тапети"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Стилове и тапети"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Настройки за началния екран"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Деактивирано от администратора ви"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Разрешаване на завъртането на началния екран"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 283ac705c8..95b0b8df27 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"একটি উইজেট সরাতে বা কাস্টম অ্যাকশন ব্যবহার করতে ডবল ট্যাপ করে ধরে রাখুন।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%2$d উচ্চতা অনুযায়ী %1$d প্রস্থ"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"হোম স্ক্রিনের যেকোনও জায়গায় উইজেটটি নিয়ে যেতে, টাচ করে ধরে থাকুন"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"হোম স্ক্রিনে যোগ করুন"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g>টি উইজেট</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g>টি উইজেট</item>
@@ -99,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"ফোল্ডার: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g>টি আইটেম"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ফোল্ডার: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g>টি বা তার বেশি আইটেম"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"ওয়ালপেপারগুলি"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"স্টাইল এবং ওয়ালপেপার"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"হোম সেটিংস"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"আপনার প্রশাসক দ্বারা অক্ষম করা হয়েছে"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"হোম স্ক্রিন ঘোরানোর অনুমতি দিন"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 50aff809c4..f79b99c826 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -100,7 +100,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, br. stavki: <xliff:g id="SIZE">%2$d</xliff:g>"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ili više stavki"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Pozadinske slike"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stilovi i pozadinske slike"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Postavke početnog ekrana"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Onemogućio vaš administrator"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Dozvoli rotiranje početnog ekrana"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 9ea5fc71ce..ecfaebe8b7 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Carpeta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elements"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Carpeta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> o més elements"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fons de pantalla"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Estils i fons de pantalla"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Config. pantalla d\'inici"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Desactivada per l\'administrador"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Permet la rotació de la pantalla d\'inici"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 9ae37cc096..4cfadc190e 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -103,7 +103,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Složka: <xliff:g id="NAME">%1$s</xliff:g>, počet položek: <xliff:g id="SIZE">%2$d</xliff:g>"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Složka: <xliff:g id="NAME">%1$s</xliff:g>, počet položek: <xliff:g id="SIZE">%2$d</xliff:g> nebo více"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Tapety"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Styly a tapety"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Nastavení plochy"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Zakázáno administrátorem"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Povolit otáčení plochy"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 3b4e07b752..4030f1ff38 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Mappe: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elementer"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Mappe: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> eller flere elementer"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Baggrunde"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Layout og baggrunde"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Indstillinger for startskærm"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Deaktiveret af din administrator"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Tillad rotation af startskærmen"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 31b9b2003e..f040310611 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Doppeltippen und halten, um ein Widget zu bewegen oder benutzerdefinierte Aktionen zu nutzen."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d breit und %2$d hoch"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Wenn du das Widget auf dem Startbildschirm verschieben möchtest, halte es gedrückt"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Zum Startbildschirm hinzufügen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> Widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> Widget</item>
@@ -99,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Ordner: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> Elemente"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Ordner: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> oder mehr Elemente"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Hintergründe"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Designs und Hintergründe"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Startbildschirm-Einstellungen"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Von deinem Administrator deaktiviert"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Drehen des Startbildschirms zulassen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 1d93bfcb52..8d00829ae6 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Φάκελος: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> στοιχεία"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Φάκελος: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ή περισσότερα στοιχεία"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Ταπετσαρίες"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Στιλ και ταπετσαρίες"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Ρυθμίσεις Αρχ. Οθ."</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Απενεργοποιήθηκε από τον διαχειριστή σας"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Να επιτρέπεται η περιστροφή της αρχικής οθόνης"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index d6b929628e..8dd37bc059 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> items"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> or more items"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Wallpapers"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Styles &amp; wallpapers"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Home settings"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Disabled by your admin"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Allow Home screen rotation"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index d6b929628e..8dd37bc059 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> items"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> or more items"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Wallpapers"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Styles &amp; wallpapers"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Home settings"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Disabled by your admin"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Allow Home screen rotation"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index d6b929628e..8dd37bc059 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> items"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> or more items"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Wallpapers"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Styles &amp; wallpapers"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Home settings"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Disabled by your admin"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Allow Home screen rotation"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index d6b929628e..8dd37bc059 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> items"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> or more items"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Wallpapers"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Styles &amp; wallpapers"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Home settings"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Disabled by your admin"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Allow Home screen rotation"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 9fff023fdb..b82f0c95f2 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -97,7 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‏‎‎‎‏‏‏‎‎‏‎‎‎‎‎‎‎‏‏‎Folder: ‎‏‎‎‏‏‎<xliff:g id="NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎, ‎‏‎‎‏‏‎<xliff:g id="SIZE">%2$d</xliff:g>‎‏‎‎‏‏‏‎ items‎‏‎‎‏‎"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‏‏‏‏‎‎‏‎‏‏‎‏‎‎‏‎‏‏‏‎‏‎‎‏‎‎‏‎‎‏‏‎‏‏‎‎‏‎‎‏‏‏‏‏‏‏‏‎Folder: ‎‏‎‎‏‏‎<xliff:g id="NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎, ‎‏‎‎‏‏‎<xliff:g id="SIZE">%2$d</xliff:g>‎‏‎‎‏‏‏‎ or more items‎‏‎‎‏‎"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‎‏‎‏‎‏‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‏‎‏‏‎‎‏‏‎‏‏‏‏‎‏‏‎Wallpapers‎‏‎‎‏‎"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‎‎‏‎‏‎‎‎‏‎‎‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‏‎‎‎‏‏‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎Styles &amp; wallpapers‎‏‎‎‏‎"</string>
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‏‎‎‎‎‎‏‎‏‏‎‏‎‎‎‏‎‎‏‏‏‎‏‏‎‎‏‎‎‎‎‎‏‎‎‏‎‏‎‏‎‎‏‏‏‎‏‎‎Wallpaper &amp; style‎‏‎‎‏‎"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‏‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‏‎‎‎‎‏‏‏‎‎‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎‎‎Home settings‎‏‎‎‏‎"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‏‎‎‎‏‎‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‎‎‎‎‎‎‎‏‏‏‏‎‏‏‎‏‏‏‎‏‎Disabled by your admin‎‏‎‎‏‎"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‎‎‏‎‏‏‎‏‏‎‏‏‎‎‎‎‎‎‎‏‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎Allow Home screen rotation‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 79d33fd597..d50613611a 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Carpeta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elementos"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Carpeta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> o más elementos"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fondos de pantalla"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Estilos y fondos de pantalla"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Configuración de pantalla principal"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"El administrador inhabilitó esta función"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Permitir la rotación de la pantalla principal"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 1bc4c603b4..d34ff3262f 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Carpeta: <xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="SIZE">%2$d</xliff:g> elementos)"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Carpeta: <xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="SIZE">%2$d</xliff:g> o más elementos)"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fondos de pantalla"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Estilos y fondos de pantalla"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Ajustes de la pantalla de inicio"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Inhabilitado por el administrador"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Permitir rotación de la pantalla de inicio"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 916aafc9ca..06cac349d3 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -32,7 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Vidina teisaldamiseks või kohandatud toimingute kasutamiseks topeltpuudutage ja hoidke all."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d lai ja %2$d kõrge"</string>
-    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Vidina avakuval liigutamiseks puudutage vidinat ja hoidke all"</string>
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Vidina teisaldamiseks avakuval puudutage vidinat ja hoidke seda all"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Lisa avakuvale"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidinat</item>
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Kaust: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> üksust"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Kaust: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> või rohkem üksust"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Taustapildid"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stiilid ja taustapildid"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Avakuva seaded"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Keelas administraator"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Luba avakuva pööramine"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 901d3cbe18..ad61cb6cf4 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"<xliff:g id="NAME">%1$s</xliff:g> karpeta (<xliff:g id="SIZE">%2$d</xliff:g> elementu)"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"<xliff:g id="NAME">%1$s</xliff:g> karpeta (<xliff:g id="SIZE">%2$d</xliff:g> elementu edo gehiago)"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Horma-paperak"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Estiloak eta horma-paperak"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Hasierako pantailaren ezarpenak"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Administratzaileak desgaitu du"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Eman hasierako pantaila biratzeko baimena"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 194ea0df7a..066d54f5a9 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -32,7 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"برای جابه‌جا کردن ابزارک یا استفاده از کنش‌های سفارشی، دوضربه بزنید و نگه دارید."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"‏%1$d عرض در %2$d طول"</string>
-    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ابزارک را لمس و کنید و نگه دارید تا آن را در صفحه اصلی حرکت دهید"</string>
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ابزارک را لمس کنید و نگه دارید تا آن را در صفحه اصلی حرکت دهید"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"افزودن به صفحه اصلی"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ابزارک</item>
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"پوشه: <xliff:g id="NAME">%1$s</xliff:g>، <xliff:g id="SIZE">%2$d</xliff:g> مورد"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"پوشه: <xliff:g id="NAME">%1$s</xliff:g>، <xliff:g id="SIZE">%2$d</xliff:g> مورد یا بیشتر"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"کاغذدیواری‌ها"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"سبک و کاغذدیواری"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"تنظیمات صفحه اصلی"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"توسط سرپرست سیستم غیرفعال شده است"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"قابل‌چرخش بودن صفحه اصلی"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 6cffafc48c..1e1b1e395b 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Kansio: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> kohdetta"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Kansio: <xliff:g id="NAME">%1$s</xliff:g>, ainakin <xliff:g id="SIZE">%2$d</xliff:g> kohdetta"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Taustakuvat"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Tyylit ja taustakuvat"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Aloitusnäyttö"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Järjestelmänvalvoja on poistanut toiminnon käytöstä."</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Salli aloitusnäytön kiertäminen"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 3ebd61a218..1867a5dd5f 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Dossier : <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> élément(s)"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Dossier : <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> éléments ou plus"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fonds d\'écran"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Styles et fonds d\'écran"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Paramètres d\'accueil"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Cette fonction est désactivée par votre administrateur"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Autoriser la rotation de l\'écran d\'accueil"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index bb56bac166..d8b666b3b4 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Dossier : <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> éléments"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Dossier : <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> éléments ou plus"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fonds d\'écran"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Styles et fonds d\'écran"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Paramètres de l\'accueil"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Désactivé par votre administrateur"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Autoriser la rotation de l\'écran d\'accueil"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index d3f3f0b017..3609b17ed0 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Cartafol: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elementos"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Cartafol: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elementos ou máis"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fondos de pantalla"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Estilos/fondos de pantalla"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Axustes de Inicio"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Función desactivada polo administrador"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Permitir xirar a pantalla de inicio"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 0882d648d5..55eceee4d8 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"વિજેટ ખસેડવા બે વાર ટૅપ કરીને દબાવી રાખો અથવા કસ્ટમ ક્રિયાઓનો ઉપયોગ કરો."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d પહોળાઈ X %2$d ઊંચાઈ"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"વિજેટને હોમ સ્ક્રીનની આજુબાજુ ખસેડવા માટે, તેને ટચ કરીને થોડીવાર દબાવી રાખો"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"હોમ સ્ક્રીન પર ઉમેરો"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> વિજેટ</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> વિજેટ</item>
@@ -99,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"ફોલ્ડર: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> આઇટમ"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ફોલ્ડર: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> કે વધુ આઇટમ"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"વૉલપેપર"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"શૈલીઓ અને વૉલપેપર"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"હોમ સેટિંગ"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"તમારા વ્યવસ્થાપક દ્વારા અક્ષમ કરેલ"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"હોમ સ્ક્રીનને ફેરવવાની મંજૂરી આપો"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 9a3c56ce85..4c17b168fc 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"फ़ोल्डर: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> आइटम"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"फ़ोल्डर: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> या इससे ज़्यादा आइटम"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"वॉलपेपर"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"स्टाइल और वॉलपेपर"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"होम पेज की सेटिंग"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"आपके एडमिन ने बंद किया हुआ है"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"होमस्क्रीन घुमाने की अनुमति दें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index d1cb5bfd2d..a165fd7daa 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -100,7 +100,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Mapa: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> stavke"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Mapa: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ili više stavki"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Pozadine"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stilovi i pozadine"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Postavke početnog zaslona"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Onemogućio administrator"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Dopusti zakretanje početnog zaslona"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 9e2c358f99..c89b55b127 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Mappa: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elem"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Mappa: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> vagy több elem"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Háttérképek"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stílusok és háttérképek"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Kezdőképernyő beállításai"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"A rendszergazda letiltotta"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"A kezdőképernyő elforgatásának engedélyezése"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index ff8b895786..522aa6542b 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Կրկնակի հպեք և պահեք՝ վիջեթ տեղափոխելու համար, կամ օգտվեք հատուկ գործողություններից։"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Լայնությունը՝ %1$d, բարձրությունը՝ %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Հպեք վիջեթին և պահեք՝ հիմնական էկրանին տեղափոխելու համար"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Ավելացնել հիմնական էկրանին"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> վիջեթ</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> վիջեթ</item>
@@ -99,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Պանակ՝ <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> տարր"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Պանակ՝ <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> կամ ավելի տարրեր"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Պաստառներ"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Ոճեր և պաստառներ"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Գլխավոր էջի կարգավորումներ"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Անջատվել է ձեր ադմինիստրատորի կողմից"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Թույլ տալ հիմնական էկրանի պտտումը"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index d42e4f9d53..e7a2ee6356 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> item"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> item atau lebih"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Wallpaper"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Gaya &amp; wallpaper"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Setelan layar utama"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Dinonaktifkan oleh admin"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Izinkan Layar utama diputar"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 30e73b4cf3..5dcdb520f3 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Mappa: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> atriði"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Mappa: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> eða fleiri atriði"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Veggfóður"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stílar og veggfóður"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Heimastillingar"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Gert óvirkt af kerfisstjóra"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Leyfa snúning á heimaskjá"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 1d420a9006..c527a2ecec 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Cartella: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elementi"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Cartella: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> o più elementi"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Sfondi"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stili e sfondi"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Impostazioni schermata Home"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Disattivata dall\'amministratore"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Consenti rotazione della schermata Home"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 7cd53fa481..12647388ac 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -103,7 +103,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"תיקייה: <xliff:g id="NAME">%1$s</xliff:g>, מספר הפריטים: <xliff:g id="SIZE">%2$d</xliff:g>"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"תיקייה: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> פריטים או יותר"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"טפטים"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"סגנונות וטפטים"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"הגדרות של מסך הבית"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"הושבת על ידי מנהל המערכת שלך"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"סיבוב של מסך הבית"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index c1136a42de..af588b86ba 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -32,7 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ウィジェットをダブルタップして長押ししながら移動するか、カスタム操作を使用してください。"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$dx%2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"幅 %1$d、高さ %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ウィジェットを押し続けた状態で、ホーム画面上に移動させます。"</string>
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ウィジェットを押し続けると、ホーム画面上に移動できます。"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ホーム画面に追加"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> 件のウィジェット</item>
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"フォルダ: <xliff:g id="NAME">%1$s</xliff:g>、<xliff:g id="SIZE">%2$d</xliff:g> 件のアイテム"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"フォルダ: <xliff:g id="NAME">%1$s</xliff:g>、<xliff:g id="SIZE">%2$d</xliff:g> 件以上のアイテム"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"壁紙"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"スタイルと壁紙"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"ホームの設定"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"管理者により無効にされています"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"ホーム画面の回転を許可"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index c70179592a..03e0bbb62e 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"საქაღალდე: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ერთეული"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"საქაღალდე: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ან მეტი ერთეული"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"ფონები"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"სტილები და ფონები"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"მთავარი გვერდის პარამეტრები"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"გათიშულია თქვენი ადმინისტრატორის მიერ"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"მთავარი ეკრანის შეტრიალების დაშვება"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 8f92db0332..f0a8f807b7 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Қалта: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> элемент бар"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Қалта: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> не одан көп элемент бар"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Тұсқағаздар"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Стильдер мен тұсқағаздар"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Негізгі экран параметрлері"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Әкімші өшірді"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Негізгі экранның бұрылуына рұқсат ету"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 8a82bdaec7..e0332b93fa 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"ថត៖ <xliff:g id="NAME">%1$s</xliff:g>, ធាតុ <xliff:g id="SIZE">%2$d</xliff:g>"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ថត៖ <xliff:g id="NAME">%1$s</xliff:g>, ធាតុ <xliff:g id="SIZE">%2$d</xliff:g> ឬច្រើនជាងនេះ"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"ផ្ទាំង​រូបភាព"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"រចនាប័ទ្ម និង​ផ្ទាំង​រូបភាព"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"ការកំណត់​ទំព័រដើម"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"បានបិទដំណើរការដោយអ្នកគ្រប់គ្រងរបស់អ្នក"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"អនុញ្ញាតការបងិ្វលអេក្រង់ដើម"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 73e2255b52..b4f4706eb0 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ವಿಜೆಟ್ ಸರಿಸಲು ಅಥವಾ ಕಸ್ಟಮ್ ಕ್ರಿಯೆಗಳನ್ನು ಬಳಸಲು ಡಬಲ್-ಟ್ಯಾಪ್ ಮಾಡಿ ಮತ್ತು ಹಿಡಿದುಕೊಳ್ಳಿ."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ಅಗಲ ಮತ್ತು %2$d ಎತ್ತರ"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ಮುಖಪುಟದ ಪರದೆ ಸುತ್ತ ವಿಜೆಟ್ ಅನ್ನು ಸರಿಸಲು, ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಒತ್ತಿ ಹಿಡಿದುಕೊಳ್ಳಿ"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"ಮುಖಪುಟಕ್ಕೆ ಸೇರಿಸಿ"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ವಿಜೆಟ್‌ಗಳು</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ವಿಜೆಟ್‌ಗಳು</item>
@@ -99,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"ಫೋಲ್ಡರ್: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ಐಟಂಗಳು"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ಫೋಲ್ಡರ್: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ಅಥವಾ ಹೆಚ್ಚಿನ ಐಟಂಗಳು"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"ವಾಲ್‌ಪೇಪರ್‌ಗಳು"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"ಶೈಲಿಗಳು &amp; ವಾಲ್‌ಪೇಪರ್‌ಗಳು"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"ಮುಖಪುಟ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದ್ದಾರೆ"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"ಮುಖಪುಟ ತಿರುಗುವಿಕೆಯನ್ನು ಅನುಮತಿಸಿ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index b98ee5c0e5..a240ac3f66 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"폴더: <xliff:g id="NAME">%1$s</xliff:g>, 항목 <xliff:g id="SIZE">%2$d</xliff:g>개"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"폴더: <xliff:g id="NAME">%1$s</xliff:g>, 항목 <xliff:g id="SIZE">%2$d</xliff:g>개 이상"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"배경화면"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"스타일 및 배경화면"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"홈 설정"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"관리자가 사용 중지함"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"홈 화면 회전 허용"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 62fb75c4fc..f848940e59 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"<xliff:g id="NAME">%1$s</xliff:g> папкасындагы объекттер: <xliff:g id="SIZE">%2$d</xliff:g>"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"<xliff:g id="NAME">%1$s</xliff:g> папкасындагы объекттер: <xliff:g id="SIZE">%2$d</xliff:g> же андан көбүрөөк"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Тушкагаздар"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Стилдер жана тушкагаздар"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Башкы бет жөндөөлөрү"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Администраторуңуз өчүрүп койгон"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Башкы экранды бурууга уруксат берүү"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index a7c2f68124..1f3f6b7f71 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"ໂຟນເດີ: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ລາຍການ"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ໂຟນເດີ: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ຫຼື ລາຍການເພີ່ມເຕີມ"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"ພາບພື້ນຫຼັງ"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"ຮູບແບບ ແລະ ຮູບພື້ນຫຼັງ"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"ການຕັ້ງຄ່າໜ້າຫຼັກ"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"ຖືກປິດການນຳໃຊ້ໂດຍຜູ້ເບິ່ງແຍງລະບົບຂອງທ່ານ"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"ອະນຸຍາດໃຫ້ໝຸນໜ້າຈໍຢູ່ໜ້າຫຼັກໄດ້"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 0677e88ffa..2d76f92017 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -103,7 +103,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Aplankas: „<xliff:g id="NAME">%1$s</xliff:g>“, elementų: <xliff:g id="SIZE">%2$d</xliff:g>"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Aplankas: „<xliff:g id="NAME">%1$s</xliff:g>“, elementų: <xliff:g id="SIZE">%2$d</xliff:g> ar daugiau"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Ekrano fonai"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stiliai ir ekrano fonai"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"„Home“ nustatymai"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Išjungė administratorius"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Leisti pasukti pagrindinį ekraną"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 6310375f8a..ada97fb30c 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -100,7 +100,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Mape <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> vienumi"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Mape <xliff:g id="NAME">%1$s</xliff:g>, vienumu skaits mapē: vismaz <xliff:g id="SIZE">%2$d</xliff:g>"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fona tapetes"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stili un fona tapetes"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Sākumlapas iestatījumi"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Atspējojis administrators"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Atļaut sākuma ekrāna pagriešanu"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index c4349e66e3..128b87ded8 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Допрете двапати и задржете за да преместите виџет или користете приспособени дејства."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d широк на %2$d висок"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Допрете го и задржете го виџетот за да го движите наоколу на почетниот екран"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Додај на почетниот екран"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виџет</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виџети</item>
@@ -99,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Папка: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ставки"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Папка: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> или повеќе ставки"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Тапети"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Стилови и тапети"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Поставки за почетен екран"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Оневозможено од администраторот"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Дозволи ротација на почетниот екран"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index c0cb36ba0e..b64bb99b26 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"വിജറ്റ് നീക്കാൻ ഡബിൾ ടാപ്പ് ചെയ്യൂ, ഹോൾഡ് ചെയ്യൂ അല്ലെങ്കിൽ ഇഷ്‌ടാനുസൃത പ്രവർത്തനങ്ങൾ ഉപയോഗിക്കൂ."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d വീതിയും %2$d ഉയരവും"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ഹോം സ്‌ക്രീനിന് ചുറ്റും വിജറ്റ് നീക്കാൻ അതിൽ സ്‌പർശിച്ച് പിടിക്കുക"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"ഹോം സ്‌ക്രീനിലേക്ക് ചേർക്കുക"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> വിജറ്റുകൾ</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> വിജറ്റ്</item>
@@ -99,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"ഫോൾഡർ: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ഇനങ്ങൾ"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ഫോൾഡർ: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> അല്ലെങ്കിൽ അതിലധികം ഇനങ്ങൾ"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"വാൾപേപ്പർ"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"സ്‌റ്റൈലുകളും വാൾപേപ്പറുകളും"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"ഹോം ക്രമീകരണം"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"അഡ്മിൻ പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നു"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"ഹോം സ്ക്രീൻ തിരിക്കൽ അനുവദിക്കുക"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 3e99d6767e..4d9acc217d 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Фолдер: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> зүйл"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Фолдер: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> эсвэл үүнээс олон зүйл"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Дэлгэцийн зураг"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Загвар ба дэлгэцийн зураг"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Нүүр хуудасны тохиргоо"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Таны админ идэвхгүй болгосон"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Нүүр дэлгэцийг эргүүлэхийг зөвшөөрөх"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 7bf6c6c7ad..01c132ffe0 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"विजेट हलवण्यासाठी किंवा कस्टम कृती वापरण्यासाठी दोनदा टॅप करा आणि धरून ठेवा."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d रूंद बाय %2$d उंच"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"होम स्क्रीनवर ते हलवण्यासाठी विजेटला स्पर्श करा आणि धरून ठेवा"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"होम स्‍क्रीनवर जोडा"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> विजेट</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> विजेट</item>
@@ -99,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"फोल्डर: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> आयटम"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"फोल्डर: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> किंवा त्याहून अधिक आयटम"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"वॉलपेपर"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"शैली आणि वॉलपेपर"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"होम सेटिंग्‍ज"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"आपल्या प्रशासकाने अक्षम केले"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"मुख्य स्क्रीन फिरविण्‍यास अनुमती द्या"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 9401040f70..5893ceb8fc 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> item"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> atau lebih banyak item"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Kertas dinding"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Gaya &amp; kertas dinding"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Tetapan laman utama"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Dilumpuhkan oleh pentadbir anda"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Benarkan putaran Skrin Utama"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 4dcd6c12fc..063f791d83 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"ဖိုင်တွဲ - <xliff:g id="NAME">%1$s</xliff:g>၊ <xliff:g id="SIZE">%2$d</xliff:g> ဖိုင်များ"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ဖိုင်တွဲ - <xliff:g id="NAME">%1$s</xliff:g>၊ <xliff:g id="SIZE">%2$d</xliff:g> သို့မဟုတ် နောက်ထပ်ဖိုင်များ"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"နောက်ခံများ"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"ပုံစံနှင့် နောက်ခံပုံများ"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"ပင်မဆက်တင်များ"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"သင့်စီမံခန့်ခွဲသူက ပိတ်လိုက်ပါသည်"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"ပင်မစာမျက်နှာလှည့်ခြင်းကို ခွင့်ပြုပါ"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index ad5affb2c2..52ff8782b6 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Mappe: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elementer"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Mappe: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> eller flere elementer"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Bakgrunner"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stiler og bakgrunner"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Startsideinnstillinger"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Administratoren har slått av funksjonen"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Tillat rotasjon av startskjermen"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 0cdeae007f..cecc3ab019 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"कुनै विजेट सार्न वा आफ्नो रोजाइका कारबाही प्रयोग गर्न डबल ट्याप गरेर छोइराख्नुहोस्।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d चौडाइ गुणा %2$d उचाइ"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"विजेटलाई होम स्क्रिनमा यताउता सार्न त्यसमा टच एन्ड होल्ड गर्नुहोस्"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"होम स्क्रिनमा हाल्नुहोस्"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> वटा विजेट</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> वटा विजेट</item>
@@ -99,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"फोल्डर: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> वस्तुहरू"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"फोल्डर: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> वा सोभन्दा बढी वस्तुहरू"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"वालपेपरहरु"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"शैली तथा वालपेपरहरू"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"गृहपृष्ठका सेटिङहरू"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"तपाईँको प्रशासकद्वारा असक्षम गरिएको"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"गृह स्क्रिनलाई रोटेट हुन दिइयोस्"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index cc16a89835..bfbd011297 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Map: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> items"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Map: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> of meer items"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Achtergrond"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stijl en achtergrond"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Instellingen start"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Uitgezet door je beheerder"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Draaien van startscherm toestaan"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 7f3495a122..ffbc6901df 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"ଫୋଲ୍ଡର୍: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ଆଇଟମଗୁଡ଼ିକ"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ଫୋଲ୍ଡର୍: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> କିମ୍ବା ଅଧିକ ଆଇଟମ୍"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"ୱାଲପେପର୍‌"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"ଷ୍ଟାଇଲ୍ ଏବଂ ୱାଲ୍‍‍ପେପର୍"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"ହୋମ୍‌ ସେଟିଂସ୍"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"ଆପଣଙ୍କ ଆଡମିନଙ୍କ ଦ୍ୱାରା ଅକ୍ଷମ କରାଯାଇଛି"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"ହୋମ୍‌ ସ୍କ୍ରିନ୍ ବୁଲାଇବାକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 355e303cd5..869d8542fe 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ਵਿਜੇਟ ਲਿਜਾਉਣ ਲਈ ਜਾਂ ਵਿਉਂਂਤੀਆਂ ਕਾਰਵਾਈਆਂ ਵਰਤਣ ਲਈ ਦੋ ਵਾਰ ਟੈਪ ਕਰਕੇ ਦਬਾ ਕੇ ਰੱਖੋ।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ਚੌੜਾਈ ਅਤੇ %2$d ਲੰਬਾਈ"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ਵਿਜੇਟ ਨੂੰ ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਇੱਧਰ-ਉੱਧਰ ਲਿਜਾਉਣ ਲਈ ਸਪਰਸ਼ ਕਰਕੇ ਦਬਾਈ ਰੱਖੋ"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ਵਿਜੇਟ</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ਵਿਜੇਟ</item>
@@ -99,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"ਫੋਲਡਰ: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ਆਈਟਮਾਂ"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ਫੋਲਡਰ: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ਜਾਂ ਹੋਰ ਆਈਟਮਾਂ"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"ਵਾਲਪੇਪਰ"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"ਸ਼ੈਲੀਆਂ ਅਤੇ ਵਾਲਪੇਪਰ"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"ਹੋਮ ਸੈਟਿੰਗਾਂ"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"ਤੁਹਾਡੇ ਪ੍ਰਸ਼ਾਸਕ ਦੁਆਰਾ ਅਯੋਗ ਬਣਾਈ ਗਈ"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"ਹੋਮ ਸਕ੍ਰੀਨ ਨੂੰ ਘੁਮਾਉਣ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ceb804668c..bfa7973299 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -103,7 +103,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elementy"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, liczba elementów: <xliff:g id="SIZE">%2$d</xliff:g> lub więcej"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Tapety"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Style i tapety"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Ustawienia ekranu głównego"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Funkcja wyłączona przez administratora"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Zezwalaj na obrót ekranu głównego"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index e40accfeae..283529dfdc 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Pasta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> itens"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Pasta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ou mais itens"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Imagens de fundo"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Estilos e fundo"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Definições de início"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Desativada pelo gestor"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Permitir rotação do ecrã principal"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 8b18329f6a..f7f7aa1a98 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Pasta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> itens"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Pasta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ou mais itens"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Planos de fundo"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Estilos e planos de fundo"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Configurações da tela inicial"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Desativado pelo administrador"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Permitir rotação da tela inicial"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index a71f999cee..4faa6e12b9 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -100,7 +100,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Dosar: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elemente"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Dosar: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> sau mai multe elemente"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Imagini de fundal"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stiluri și imagini de fundal"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Setări ecran de pornire"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Dezactivată de administrator"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Permite rotirea ecranului de pornire"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 0c1acbc658..6b1cc6b887 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -103,7 +103,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Папка \"<xliff:g id="NAME">%1$s</xliff:g>\" (объектов: <xliff:g id="SIZE">%2$d</xliff:g>)"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Папка \"<xliff:g id="NAME">%1$s</xliff:g>\" (объектов: <xliff:g id="SIZE">%2$d</xliff:g> или больше)"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Обои"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Стили и обои"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Главный экран"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Функция отключена администратором"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Разрешить поворачивать главный экран"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 6b2716853e..4826639925 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"ෆෝල්ඩරය: <xliff:g id="NAME">%1$s</xliff:g>, අයිතම <xliff:g id="SIZE">%2$d</xliff:g>"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ෆෝල්ඩර: <xliff:g id="NAME">%1$s</xliff:g>, අයිතම <xliff:g id="SIZE">%2$d</xliff:g>ක් හෝ වැඩි ගණනක්"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"වෝල්පේපර"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"විලාස සහ වෝල්පේපර"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"නිවසේ සැකසීම්"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"ඔබගේ පරිපාලක විසින් අබල කරන ලදී"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"මුල් පිටු තිරය කරකැවීමට ඉඩ දෙන්න"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 7ea59d64b2..6c4810ee38 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -103,7 +103,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Priečinok: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> položky"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Priečinok: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> alebo viac položiek"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Tapety"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Štýly a tapety"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Nastavenia plochy"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Zakázané vaším správcom"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Povoliť otáčanie plochy"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index f74bdcc534..40e202f43a 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -103,7 +103,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Mapa: <xliff:g id="NAME">%1$s</xliff:g>, št. elementov: <xliff:g id="SIZE">%2$d</xliff:g>"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Mapa: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ali več elementov"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Ozadja"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Slogi in ozadja"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Domače nastavitve"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Onemogočil skrbnik."</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Omogoči sukanje začetnega zaslona"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 9a53936f56..68ffed68f7 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -32,7 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Trokit dy herë dhe mbaje shtypur një miniapliikacion për ta zhvendosur atë ose për të përdorur veprimet e personalizuara."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d i gjerë me %2$d i lartë"</string>
-    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Prek dhe mbaj miniaplikacionin për ta lëvizur nëpër \"Ekranin bazë\""</string>
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Prek dhe mbaj të shtypur miniaplikacionin për ta lëvizur nëpër \"Ekranin bazë\""</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Shto në \"Ekranin bazë\""</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> miniaplikacione</item>
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Dosja: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> artikuj"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Dosja: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ose më shumë artikuj"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Imazhet e sfondit"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stilet dhe imazhet e sfondit"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Cilësimet e ekranit bazë"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Çaktivizuar nga administratori"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Lejo rrotullimin e ekranit bazë"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 4f67b23815..bd90dadc0a 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -100,7 +100,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Фолдер: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ставке"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Фолдер: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> или више ставки"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Позадине"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Стилови и позадине"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Подешавања почетног екрана"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Администратор је онемогућио"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Дозволи ротацију почетног екрана"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 91b9b8866d..cbbd497621 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Mapp: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> objekt"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Mapp: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> eller fler objekt"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Bakgrunder"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Format och bakgrunder"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Startinställningar"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Inaktiverat av administratören"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Tillåt rotering av startskärmen"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 6227239529..353d74a2b9 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Folda: <xliff:g id="NAME">%1$s</xliff:g>, vipengee <xliff:g id="SIZE">%2$d</xliff:g>"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folda: <xliff:g id="NAME">%1$s</xliff:g>, vipengee <xliff:g id="SIZE">%2$d</xliff:g> au zaidi"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Mandhari"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Mitindo na mandhari"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Mipangilio ya mwanzo"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Imezimwa na msimamizi wako"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Ruhusu kuzungusha skrini ya Kwanza"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index cae7e249dc..2badf1073e 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"கோப்புறை: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> கோப்புகள்"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"கோப்புறை: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> அல்லது அதற்கு அதிகமான கோப்புகள்"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"வால்பேப்பர்கள்"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"ஸ்டைல்கள் &amp; வால்பேப்பர்கள்"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"முகப்பு அமைப்புகள்"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"உங்கள் நிர்வாகி முடக்கியுள்ளார்"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"முகப்புத் திரை சுழற்சியை அனுமதி"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 478bd025cf..6b4094d32c 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"విడ్జెట్‌ను తరలించడానికి లేదా అనుకూల చర్యలను ఉపయోగించడానికి రెండుసార్లు నొక్కండి &amp; హోల్డ్ చేయి."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d వెడల్పు X %2$d ఎత్తు"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"విడ్జెట్‌ను మొదటి స్క్రీన్ చుట్టూ తిప్పడానికి దాన్ని తాకి, &amp; నొక్కి ఉంచండి"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"మొదటి స్క్రీన్‌కు జోడించు"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> విడ్జెట్‌లు</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> విడ్జెట్</item>
@@ -99,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"ఫోల్డర్: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ఐటెమ్‌లు"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ఫోల్డర్: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> లేదా అంతకంటే ఎక్కువ ఐటెమ్‌లు"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"వాల్‌పేపర్‌లు"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"స్ట‌యిల్స్‌ &amp; వాల్‌పేపర్‌లు"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"హోమ్ సెట్టింగ్‌లు"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"మీ నిర్వాహకులు నిలిపివేసారు"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"హోమ్ స్క్రీన్ రొటేషన్‌ను అనుమతించండి"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 4f98cd2ad9..905d5a175c 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"โฟลเดอร์: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> รายการ"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"โฟลเดอร์: <xliff:g id="NAME">%1$s</xliff:g>, อย่างน้อย <xliff:g id="SIZE">%2$d</xliff:g> รายการ"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"วอลเปเปอร์"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"รูปแบบและวอลเปเปอร์"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"การตั้งค่าหน้าแรก"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"ปิดใช้โดยผู้ดูแลระบบ"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"อนุญาตให้หมุนหน้าจอหลัก"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index a3504fe07e..a3dc55ddf8 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> (na) item"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> o higit pang item"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Mga Wallpaper"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Mga istilo at wallpaper"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Mga setting ng Home"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Na-disable ng iyong admin"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Payagan ang pag-rotate ng Home screen"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 8029aeb302..94b557431f 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Klasör: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> öğe"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Klasör: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> veya daha fazla öğe"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Duvar Kağıtları"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Stiller ve duvar kağıtları"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Ana ekran ayarları"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Yöneticiniz tarafından devre dışı bırakıldı"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Ana ekranı döndürmeye izin ver"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 5e179aa82b..371a583989 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -103,7 +103,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Папка \"<xliff:g id="NAME">%1$s</xliff:g>\", елементів: <xliff:g id="SIZE">%2$d</xliff:g>"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Папка \"<xliff:g id="NAME">%1$s</xliff:g>\", елементів: <xliff:g id="SIZE">%2$d</xliff:g> або більше"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Фонові малюнки"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Стиль і фон"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Налаштування головного екрана"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Вимкнув адміністратор"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Дозволити обертання головного екрана"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 8cc578c060..890bc68fe3 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ویجیٹ کو منتقل کرنے یا حسب ضرورت کارروائیاں استعمال کرنے کے لیے دوبار تھپتھپائیں اور پکڑ کر رکھیں۔"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"‏%1$d چوڑا اور ‎%2$d اونچا"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ویجیٹ کو ہوم اسکرین کے چاروں طرف منتقل کرنے کیلئے اسے ٹچ کریں اور دبائے رکھیں"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"ہوم اسکرین میں شامل کریں"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ویجیٹس</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> ویجیٹ</item>
@@ -99,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"فولڈر: <xliff:g id="NAME">%1$s</xliff:g>، <xliff:g id="SIZE">%2$d</xliff:g> آئٹمز"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"فولڈر: <xliff:g id="NAME">%1$s</xliff:g>، <xliff:g id="SIZE">%2$d</xliff:g> یا مزید آئٹمز"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"وال پیپرز"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"طرزیں اور وال پیپر"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"ہوم ترتیبات"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"آپ کے منتظم کی طرف سے غیر فعال کر دیا گیا"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"ہوم اسکرین گھمانے کی اجازت دیں"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 9c8f7ed460..52b06ac913 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Jild: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> fayllar"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Jild: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> va undan ortiq fayllar"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fon rasmlari"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Mavzu va fon rasmlari"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Bosh ekran sozlamalari"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Administrator tomonidan o‘chirilgan"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Bosh ekranni burishga ruxsat"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index a026dbc0ff..495b4e4028 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Thư mục: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> mục"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Thư mục: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> mục trở lên"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Hình nền"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Kiểu và hình nền"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Cài đặt màn hình chính"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Bị tắt bởi quản trị viên của bạn"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Cho phép xoay Màn hình chính"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index d79f181222..86685b5ce1 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -32,10 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"点按两次并按住微件即可移动该微件或使用自定义操作。"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"宽 %1$d，高 %2$d"</string>
-    <!-- no translation found for add_item_request_drag_hint (5653291305078645405) -->
-    <skip />
-    <!-- no translation found for add_to_home_screen (8631549138215492708) -->
-    <skip />
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"轻触并按住该微件即可将其在主屏幕上四处移动"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"添加到主屏幕"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> 个微件</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> 个微件</item>
@@ -99,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"文件夹：<xliff:g id="NAME">%1$s</xliff:g>，<xliff:g id="SIZE">%2$d</xliff:g> 个项目"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"文件夹：<xliff:g id="NAME">%1$s</xliff:g>，<xliff:g id="SIZE">%2$d</xliff:g> 个或更多项目"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"壁纸"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"样式和壁纸"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"主屏幕设置"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"已被您的管理员停用"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"允许旋转主屏幕"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index d32611d575..9334b8ea94 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"資料夾：<xliff:g id="NAME">%1$s</xliff:g>，<xliff:g id="SIZE">%2$d</xliff:g> 個項目"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"資料夾：<xliff:g id="NAME">%1$s</xliff:g>，<xliff:g id="SIZE">%2$d</xliff:g> 個或以上的項目"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"桌布"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"樣式和桌布"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"主畫面設定"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"已由您的管理員停用"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"允許主畫面旋轉"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 58e8f19a07..da1743f24c 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"資料夾：<xliff:g id="NAME">%1$s</xliff:g>，<xliff:g id="SIZE">%2$d</xliff:g> 個項目"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"資料夾：<xliff:g id="NAME">%1$s</xliff:g>，<xliff:g id="SIZE">%2$d</xliff:g> 個以上的項目"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"桌布"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"樣式和桌布"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"主畫面設定"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"已由你的管理員停用"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"允許旋轉主畫面"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 3892f6b10c..d29e15dfdb 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -97,7 +97,8 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Ifolda: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> izinto"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Ifolda: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> noma izinto eziningi"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Izithombe zangemuva"</string>
-    <string name="styles_wallpaper_button_text" msgid="4342122323125579619">"Izitayela nezithombe zangemuva"</string>
+    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
+    <skip />
     <string name="settings_button_text" msgid="8873672322605444408">"Izilungiselelo zasekhaya"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Kukhutshazwe umlawuli wakho"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Vumela ukuphendukiswa kwesikrini sasekhaya"</string>
-- 
GitLab


From acebd1f69adbb577cd2ad2adc8123875bdce6ed8 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Thu, 6 May 2021 10:02:03 -0500
Subject: [PATCH 1105/1664] [Search][Motion] Introduce header protection in
 AllApps

ScrimView exposes ScrimDrawingController that allow FloatingHeaderView to observe AllApps scroll progress and draw header protection on Scrim. In addition, search box independently adopts header protection background to ensure proper clipping behavior.

Test: local
preview: https://drive.google.com/file/d/1_E577AAJ0LBg0zrKJQSEJK9GQnrtx7uv/view?usp=sharing&resourcekey=0-MTxjlB3xWyJ3qPvr4qMdig
Bug: 184946772
Change-Id: I64c0f4f50d26c475d31542148a15c7c145588d3f
---
 res/values/dimens.xml                         |  3 +-
 src/com/android/launcher3/Launcher.java       |  2 +-
 .../allapps/AllAppsContainerView.java         | 71 ++++++++++++++++++-
 .../allapps/AllAppsRecyclerView.java          | 11 ++-
 .../allapps/AllAppsTransitionController.java  | 15 +++-
 .../android/launcher3/views/ScrimView.java    | 34 ++++++++-
 6 files changed, 127 insertions(+), 9 deletions(-)

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index fe0b11bb3f..0adafaf7fb 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -92,7 +92,8 @@
     <dimen name="all_apps_background_canvas_width">700dp</dimen>
     <dimen name="all_apps_background_canvas_height">475dp</dimen>
     <dimen name="all_apps_header_pill_height">50dp</dimen>
-    <dimen name="all_apps_header_pill_corner_radius">50dp</dimen>
+    <dimen name="all_apps_header_pill_corner_radius">48dp</dimen>
+    <dimen name="all_apps_header_tab_height">48dp</dimen>
     <dimen name="all_apps_tabs_indicator_height">2dp</dimen>
     <dimen name="all_apps_header_top_padding">36dp</dimen>
     <dimen name="all_apps_work_profile_tab_footer_top_padding">16dp</dimen>
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index deb114765c..5896f5a4de 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1192,7 +1192,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
         // Setup the drag controller (drop targets have to be added in reverse order in priority)
         mDropTargetBar.setup(mDragController);
-        mAllAppsController.setupViews(mAppsView);
+        mAllAppsController.setupViews(mScrimView, mAppsView);
     }
 
     /**
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index b11b63ed69..47236b6994 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -26,6 +26,7 @@ import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Canvas;
+import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Point;
 import android.graphics.Rect;
@@ -44,6 +45,7 @@ import android.view.WindowInsets;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
+import androidx.core.graphics.ColorUtils;
 import androidx.core.os.BuildCompat;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -66,6 +68,7 @@ import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.ItemInfoMatcher;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.RecyclerViewFastScroller;
+import com.android.launcher3.views.ScrimView;
 import com.android.launcher3.views.SpringRelativeLayout;
 import com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip.OnActivePageChangedListener;
 
@@ -73,13 +76,16 @@ import com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip.OnActivePag
  * The all apps view container.
  */
 public class AllAppsContainerView extends SpringRelativeLayout implements DragSource,
-        Insettable, OnDeviceProfileChangeListener, OnActivePageChangedListener {
+        Insettable, OnDeviceProfileChangeListener, OnActivePageChangedListener,
+        ScrimView.ScrimDrawingController {
 
     private static final float FLING_VELOCITY_MULTIPLIER = 1000f;
 
     // Starts the springs after at least 25% of the animation has passed.
     private static final float FLING_ANIMATION_THRESHOLD = 0.25f;
 
+    private final Paint mHeaderPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+
     protected final BaseDraggingActivity mLauncher;
     protected final AdapterHolder[] mAH;
     private final ItemInfoMatcher mPersonalMatcher = ItemInfoMatcher.ofUser(Process.myUserHandle());
@@ -93,7 +99,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
     private View mSearchContainer;
     private AllAppsPagedView mViewPager;
 
-    private FloatingHeaderView mHeader;
+    protected FloatingHeaderView mHeader;
     private WorkModeSwitch mWorkModeSwitch;
 
 
@@ -107,7 +113,14 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
 
     private Rect mInsets = new Rect();
 
-    SearchAdapterProvider mSearchAdapterProvider;
+    private SearchAdapterProvider mSearchAdapterProvider;
+    private final int mHeaderTopPadding;
+    private final int mScrimColor;
+    private final int mHeaderProtectionColor;
+    private final float mHeaderThreshold;
+    private ScrimView mScrimView;
+    private int mHeaderColor;
+
 
     public AllAppsContainerView(Context context) {
         this(context, null);
@@ -121,8 +134,19 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         super(context, attrs, defStyleAttr);
 
         mLauncher = BaseDraggingActivity.fromContext(context);
+
+        mScrimColor = Themes.getAttrColor(context, R.attr.allAppsScrimColor);
+        mHeaderThreshold = getResources().getDimensionPixelSize(
+                R.dimen.dynamic_grid_cell_border_spacing);
+        mHeaderTopPadding = context.getResources()
+                .getDimensionPixelSize(R.dimen.all_apps_header_top_padding);
+        int accentColor = Themes.getColorAccent(getContext());
+        mHeaderProtectionColor = ColorUtils.blendARGB(mScrimColor, accentColor, .3f);
+
         mLauncher.addOnDeviceProfileChangeListener(this);
 
+
+
         mSearchAdapterProvider = mLauncher.createSearchAdapterProvider(this);
         mSearchQueryBuilder = new SpannableStringBuilder();
         Selection.setSelection(mSearchQueryBuilder, 0);
@@ -300,6 +324,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         }
         // Reset the search bar and base recycler view after transitioning home
         mSearchUiManager.resetSearch();
+        updateHeaderScroll(0);
     }
 
     @Override
@@ -625,6 +650,26 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         outRect.offset(0, (int) getTranslationY());
     }
 
+    @Override
+    public void setTranslationY(float translationY) {
+        super.setTranslationY(translationY);
+        invalidateHeader();
+    }
+
+    public void setScrimView(ScrimView scrimView) {
+        mScrimView = scrimView;
+    }
+
+    @Override
+    public void drawOnScrim(Canvas canvas) {
+        mHeaderPaint.setColor(mHeaderColor);
+        mHeaderPaint.setAlpha((int) (getAlpha() * Color.alpha(mHeaderColor)));
+        if (mHeaderPaint.getColor() != mScrimColor && mHeaderPaint.getColor() != 0) {
+            canvas.drawRect(0, 0, getWidth(), mHeaderTopPadding + getTranslationY(),
+                    mHeaderPaint);
+        }
+    }
+
     public class AdapterHolder {
         public static final int MAIN = 0;
         public static final int WORK = 1;
@@ -725,4 +770,24 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
             return mOverlay;
         }
     }
+
+
+    protected void updateHeaderScroll(int scrolledOffset) {
+        float prog = Math.max(0, Math.min(1, (float) scrolledOffset / mHeaderThreshold));
+        int headerColor = ColorUtils.setAlphaComponent(mHeaderProtectionColor, (int) (prog * 255));
+        if (headerColor != mHeaderColor) {
+            mHeaderColor = headerColor;
+            getSearchView().setBackgroundColor(mHeaderColor);
+            invalidateHeader();
+        }
+    }
+
+    /**
+     * redraws header protection
+     */
+    public void invalidateHeader() {
+        if (mScrimView != null) {
+            mScrimView.invalidate();
+        }
+    }
 }
diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
index b1c764c1d1..197d74c401 100644
--- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
@@ -38,6 +38,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.BaseRecyclerView;
 import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.logging.StatsLogManager;
@@ -52,6 +53,7 @@ import java.util.List;
 public class AllAppsRecyclerView extends BaseRecyclerView {
     private static final String TAG = "AllAppsContainerView";
     private static final boolean DEBUG = false;
+    private final Launcher mLauncher;
 
     private AlphabeticalAppsList mApps;
     private final int mNumAppsPerRow;
@@ -87,6 +89,7 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
                 R.dimen.all_apps_empty_search_bg_top_offset);
         mNumAppsPerRow = LauncherAppState.getIDP(context).numColumns;
         mFastScrollHelper = new AllAppsFastScrollHelper(this);
+        mLauncher = Launcher.getLauncher(context);
     }
 
     /**
@@ -199,6 +202,12 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
         }
     }
 
+    @Override
+    public void onScrolled(int dx, int dy) {
+        super.onScrolled(dx, dy);
+        mLauncher.getAppsView().updateHeaderScroll(getCurrentScrollY());
+    }
+
     @Override
     public boolean onInterceptTouchEvent(MotionEvent e) {
         boolean result = super.onInterceptTouchEvent(e);
@@ -410,7 +419,7 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
 
     /**
      * Returns the available scroll height:
-     *   AvailableScrollHeight = Total height of the all items - last page height
+     * AvailableScrollHeight = Total height of the all items - last page height
      */
     @Override
     protected int getAvailableScrollHeight() {
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index c4c7891d58..90f2d7cde5 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -45,6 +45,7 @@ import com.android.launcher3.anim.PropertySetter;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
 import com.android.launcher3.states.StateAnimationConfig;
+import com.android.launcher3.views.ScrimView;
 
 /**
  * Handles AllApps view transition.
@@ -88,6 +89,7 @@ public class AllAppsTransitionController
     private float mProgress;        // [0, 1], mShiftRange * mProgress = shiftCurrent
 
     private float mScrollRangeDelta = 0;
+    private ScrimView mScrimView;
 
     public AllAppsTransitionController(Launcher l) {
         mLauncher = l;
@@ -158,7 +160,7 @@ public class AllAppsTransitionController
 
         Interpolator interpolator = toState.equals(ALL_APPS)
                 ? (config.userControlled ? ACCEL_2 : ACCEL_0_75) :
-                        (config.userControlled ? DEACCEL_2 : DEACCEL);
+                (config.userControlled ? DEACCEL_2 : DEACCEL);
 
         Animator anim = createSpringAnimation(mProgress, targetProgress);
         anim.setInterpolator(config.getInterpolator(ANIM_VERTICAL_PROGRESS, interpolator));
@@ -181,19 +183,28 @@ public class AllAppsTransitionController
 
         Interpolator allAppsFade = config.getInterpolator(ANIM_ALL_APPS_FADE, LINEAR);
         setter.setViewAlpha(mAppsView, hasAllAppsContent ? 1 : 0, allAppsFade);
+
+        boolean shouldProtectHeader =
+                ALL_APPS == state || mLauncher.getStateManager().getState() == ALL_APPS;
+        mScrimView.setDrawingController(shouldProtectHeader ? mAppsView : null);
     }
 
     public AnimatorListenerAdapter getProgressAnimatorListener() {
         return AnimationSuccessListener.forRunnable(this::onProgressAnimationEnd);
     }
 
-    public void setupViews(AllAppsContainerView appsView) {
+    /**
+     * see Launcher#setupViews
+     */
+    public void setupViews(ScrimView scrimView, AllAppsContainerView appsView) {
+        mScrimView = scrimView;
         mAppsView = appsView;
         if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && Utilities.ATLEAST_R) {
             mLauncher.getSystemUiController().updateUiState(UI_STATE_ALLAPPS,
                     View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
                             | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
         }
+        mAppsView.setScrimView(scrimView);
     }
 
     /**
diff --git a/src/com/android/launcher3/views/ScrimView.java b/src/com/android/launcher3/views/ScrimView.java
index 5387a3ed17..0ba94ab240 100644
--- a/src/com/android/launcher3/views/ScrimView.java
+++ b/src/com/android/launcher3/views/ScrimView.java
@@ -18,6 +18,7 @@ package com.android.launcher3.views;
 import static com.android.launcher3.util.SystemUiController.UI_STATE_SCRIM_VIEW;
 
 import android.content.Context;
+import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
 import android.util.AttributeSet;
@@ -37,13 +38,16 @@ public class ScrimView extends View implements Insettable {
 
     private SystemUiController mSystemUiController;
 
+    private ScrimDrawingController mDrawingController;
+
     public ScrimView(Context context, AttributeSet attrs) {
         super(context, attrs);
         setFocusable(false);
     }
 
     @Override
-    public void setInsets(Rect insets) { }
+    public void setInsets(Rect insets) {
+    }
 
     @Override
     public boolean hasOverlappingRendering() {
@@ -62,6 +66,14 @@ public class ScrimView extends View implements Insettable {
         super.setBackgroundColor(color);
     }
 
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        if (mDrawingController != null) {
+            mDrawingController.drawOnScrim(canvas);
+        }
+    }
+
     @Override
     protected void onVisibilityChanged(View changedView, int visibility) {
         super.onVisibilityChanged(changedView, visibility);
@@ -96,4 +108,24 @@ public class ScrimView extends View implements Insettable {
         return ColorUtils.calculateLuminance(
                 ((ColorDrawable) getBackground()).getColor()) < 0.5f;
     }
+
+    /**
+     * Sets drawing controller. Invalidates ScrimView if drawerController has changed.
+     */
+    public void setDrawingController(ScrimDrawingController drawingController) {
+        if (mDrawingController != drawingController) {
+            mDrawingController = drawingController;
+            invalidate();
+        }
+    }
+
+    /**
+     * A Utility interface allowing for other surfaces to draw on ScrimView
+     */
+    public interface ScrimDrawingController {
+        /**
+         * Called inside ScrimView#OnDraw
+         */
+        void drawOnScrim(Canvas canvas);
+    }
 }
-- 
GitLab


From f4f0c4d82a993b73b0afe90bdfb1d14026625401 Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Wed, 5 May 2021 10:28:05 -0700
Subject: [PATCH 1106/1664] Prevent thumbnails from shifting if placeholder
 view doesn't overlap

Always shift thumbnails when in phone mode.

Bug: 181705607
Test: Placeholder view didn't shift when no thumbnails underneath
it in portrait.

Change-Id: Ib2f066fdf17134b3f5bbd9b465b87868e9ce7583
---
 .../BaseRecentsViewStateController.java       |  2 +-
 .../states/SplitScreenSelectState.java        |  7 +++-
 .../android/quickstep/views/RecentsView.java  | 42 +++++++++++++++++++
 src/com/android/launcher3/LauncherState.java  |  6 +--
 4 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
index e508690113..2eb19ec146 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
@@ -105,7 +105,7 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView>
                 TASK_PRIMARY_SPLIT_TRANSLATION, TASK_SECONDARY_SPLIT_TRANSLATION,
                 mLauncher.getDeviceProfile());
         setter.setFloat(mRecentsView, taskViewsFloat,
-                toState.getOverviewSecondaryTranslation(mLauncher), LINEAR);
+                toState.getSplitSelectTranslation(mLauncher), LINEAR);
 
         setter.setFloat(mRecentsView, getContentAlphaProperty(), toState.overviewUi ? 1 : 0,
                 config.getInterpolator(ANIM_OVERVIEW_FADE, AGGRESSIVE_EASE_IN_OUT));
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/SplitScreenSelectState.java b/quickstep/src/com/android/launcher3/uioverrides/states/SplitScreenSelectState.java
index 722d74a55a..6968494b0f 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/SplitScreenSelectState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/SplitScreenSelectState.java
@@ -41,11 +41,14 @@ public class SplitScreenSelectState extends OverviewState {
     }
 
     @Override
-    public float getOverviewSecondaryTranslation(Launcher launcher) {
+    public float getSplitSelectTranslation(Launcher launcher) {
         RecentsView recentsView = launcher.getOverviewPanel();
-        PagedOrientationHandler orientationHandler = recentsView.getPagedOrientationHandler();
         int splitPosition = recentsView.getSplitPlaceholder().getSplitController()
                 .getActiveSplitPositionOption().mStagePosition;
+        if (!recentsView.shouldShiftThumbnailsForSplitSelect(splitPosition)) {
+            return 0f;
+        }
+        PagedOrientationHandler orientationHandler = recentsView.getPagedOrientationHandler();
         int direction = orientationHandler.getSplitTranslationDirectionFactor(splitPosition);
         return launcher.getResources().getDimension(R.dimen.split_placeholder_size) * direction;
     }
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index a04b886bd4..cf94d680e2 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -124,6 +124,7 @@ import com.android.launcher3.util.DynamicResource;
 import com.android.launcher3.util.IntSet;
 import com.android.launcher3.util.MultiValueAlpha;
 import com.android.launcher3.util.ResourceBasedOverride.Overrides;
+import com.android.launcher3.util.SplitConfigurationOptions;
 import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.util.TranslateEdgeEffect;
@@ -2367,6 +2368,47 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         return anim;
     }
 
+    /**
+     * @return {@code true} if one of the task thumbnails would intersect/overlap with the
+     *         {@link #mSplitPlaceholderView}
+     */
+    public boolean shouldShiftThumbnailsForSplitSelect(@SplitConfigurationOptions.StagePosition
+            int stagePosition) {
+        if (!mActivity.getDeviceProfile().isTablet) {
+            // Never enough space on phones
+            return true;
+        } else if (!mActivity.getDeviceProfile().isLandscape) {
+            return false;
+        }
+
+        Rect splitBounds = new Rect();
+        float placeholderSize = getResources().getDimension(R.dimen.split_placeholder_size);
+        // This acts as a best approximation on where the splitplaceholder view would be,
+        // doesn't need to be exact necessarily. This also doesn't need to take translations
+        // into account since placeholder view is not translated
+        if (stagePosition == SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT) {
+            splitBounds.set((int) (getWidth() - placeholderSize), 0, getWidth(), getHeight());
+        } else {
+            splitBounds.set(0, 0, (int) (placeholderSize), getHeight());
+        }
+        Rect taskBounds = new Rect();
+        int taskCount = getTaskViewCount();
+        for (int i = 0; i < taskCount; i++) {
+            TaskView taskView = getTaskViewAt(i);
+            if (taskView == mSplitHiddenTaskView && taskView != getFocusedTaskView()) {
+                // Case where the hidden task view would have overlapped w/ placeholder,
+                // but because it's going to hide we don't care
+                // TODO (b/187312247) edge case for thumbnails that are off screen but scroll on
+                continue;
+            }
+            taskView.getBoundsOnScreen(taskBounds);
+            if (Rect.intersects(taskBounds, splitBounds)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     protected void onDismissAnimationEnds() {
     }
 
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java
index 9d50edd234..8432f4be29 100644
--- a/src/com/android/launcher3/LauncherState.java
+++ b/src/com/android/launcher3/LauncherState.java
@@ -237,10 +237,10 @@ public abstract class LauncherState implements BaseState<LauncherState> {
     }
 
     /**
-     * For this state, how much additional vertical translation there should be for each of the
-     * child TaskViews.
+     * For this state, how much additional translation there should be for each of the
+     * child TaskViews. Note that the translation can be its primary or secondary dimension.
      */
-    public float getOverviewSecondaryTranslation(Launcher launcher) {
+    public float getSplitSelectTranslation(Launcher launcher) {
         return 0;
     }
 
-- 
GitLab


From 85961fa44bc253aee80e9a114b5bcfdc447e7356 Mon Sep 17 00:00:00 2001
From: zakcohen <zakcohen@google.com>
Date: Fri, 7 May 2021 14:10:44 -0700
Subject: [PATCH 1107/1664] Make foreground scrim darker on Recents View.

Make the foreground scrim darker, not just scrimming to the target color.
Waiting for real token for the scrim color.
Moves the COLOR_TINT property from TaskView to RecentsView to make
coordinating the animation simpler.

Bug: 187320416
Test: Local
Change-Id: I300f98f78e33476ee604d4dd61b485326356eb5b
---
 .../android/quickstep/views/RecentsView.java  | 62 ++++++++++++++++++-
 .../quickstep/views/TaskThumbnailView.java    |  3 +-
 .../com/android/quickstep/views/TaskView.java | 45 ++------------
 3 files changed, 68 insertions(+), 42 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 59588325fd..7bd0195391 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -63,7 +63,9 @@ import android.annotation.TargetApi;
 import android.app.ActivityManager.RunningTaskInfo;
 import android.content.Context;
 import android.content.res.Configuration;
+import android.graphics.BlendMode;
 import android.graphics.Canvas;
+import android.graphics.Color;
 import android.graphics.Matrix;
 import android.graphics.Point;
 import android.graphics.PointF;
@@ -98,6 +100,7 @@ import android.widget.OverScroller;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
+import androidx.core.graphics.ColorUtils;
 
 import com.android.launcher3.BaseActivity;
 import com.android.launcher3.BaseActivity.MultiWindowModeChangedListener;
@@ -243,6 +246,24 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 }
             };
 
+    /**
+     * Can be used to tint the color of the RecentsView to simulate a scrim that can views
+     * excluded from. Really should be a proper scrim.
+     * TODO(b/187528071): Remove this and replace with a real scrim.
+     */
+    private static final FloatProperty<RecentsView> COLOR_TINT =
+            new FloatProperty<RecentsView>("colorTint") {
+                @Override
+                public void setValue(RecentsView recentsView, float v) {
+                    recentsView.setColorTint(v);
+                }
+
+                @Override
+                public Float get(RecentsView recentsView) {
+                    return recentsView.getColorTint();
+                }
+            };
+
     /**
      * Even though {@link TaskView} has distinct offsetTranslationX/Y and resistance property, they
      * are currently both used to apply secondary translation. Should their use cases change to be
@@ -404,6 +425,10 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     // The GestureEndTarget that is still in progress.
     protected GestureState.GestureEndTarget mCurrentGestureEndTarget;
 
+    // TODO(b/187528071): Remove these and replace with a real scrim.
+    private float mColorTint;
+    private final int mTintingColor;
+
     private int mOverScrollShift = 0;
 
     /**
@@ -616,6 +641,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         mLiveTileTaskViewSimulator.recentsViewScale.value = 1;
         mLiveTileTaskViewSimulator.setOrientationState(mOrientationState);
         mLiveTileTaskViewSimulator.setDrawsBelowRecents(true);
+
+        mTintingColor = getForegroundScrimDimColor(context);
     }
 
     public OverScroller getScroller() {
@@ -1203,6 +1230,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         loadVisibleTaskData(TaskView.FLAG_UPDATE_ALL);
         setTaskModalness(0);
         updateVerticalPageOffsets();
+        setColorTint(0);
     }
 
     public void setFullscreenProgress(float fullscreenProgress) {
@@ -3678,11 +3706,36 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
      * tasks to be dimmed while other elements in the recents view are left alone.
      */
     public void showForegroundScrim(boolean show) {
+        ObjectAnimator anim = ObjectAnimator.ofFloat(this, COLOR_TINT, show ? 0.5f : 0f);
+        anim.setAutoCancel(true);
+        anim.start();
+    }
+
+    /** Tint the RecentsView and TaskViews in to simulate a scrim. */
+    // TODO(b/187528071): Replace this tinting with a scrim on top of RecentsView
+    private void setColorTint(float tintAmount) {
+        mColorTint = tintAmount;
+
         for (int i = 0; i < getTaskViewCount(); i++) {
-            getTaskViewAt(i).showColorTint(show);
+            getTaskViewAt(i).setColorTint(mColorTint, mTintingColor);
+        }
+
+        Drawable scrimBg = mActivity.getScrimView().getBackground();
+        if (scrimBg != null) {
+            if (tintAmount == 0f) {
+                scrimBg.setTintList(null);
+            } else {
+                scrimBg.setTintBlendMode(BlendMode.SRC_OVER);
+                scrimBg.setTint(
+                        ColorUtils.setAlphaComponent(mTintingColor, (int) (255 * tintAmount)));
+            }
         }
     }
 
+    private float getColorTint() {
+        return mColorTint;
+    }
+
     private boolean showAsGrid() {
         return mOverviewGridEnabled || (mCurrentGestureEndTarget != null
                 && mSizeStrategy.stateFromGestureEndTarget(
@@ -3756,4 +3809,11 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             });
         }
     }
+
+    /** Get the color used for foreground scrimming the RecentsView for sharing. */
+    public static int getForegroundScrimDimColor(Context context) {
+        int baseColor = Themes.getAttrColor(context, R.attr.overviewScrimColor);
+        // The Black blending is temporary until we have the proper color token.
+        return ColorUtils.blendARGB(Color.BLACK, baseColor, 0.25f);
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
index 685f725707..5b8d4ce471 100644
--- a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
@@ -53,7 +53,6 @@ import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.launcher3.util.SystemUiController;
-import com.android.launcher3.util.Themes;
 import com.android.quickstep.TaskOverlayFactory.TaskOverlay;
 import com.android.quickstep.views.TaskView.FullscreenDrawParams;
 import com.android.systemui.plugins.OverviewScreenshotActions;
@@ -121,7 +120,7 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
         // Initialize with placeholder value. It is overridden later by TaskView
         mFullscreenParams = TEMP_PARAMS.get(context);
 
-        mDimColor = Themes.getColorBackgroundFloating(context);
+        mDimColor = RecentsView.getForegroundScrimDimColor(context);
         mDimmingPaintAfterClearing.setColor(mDimColor);
     }
 
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 6f3aade68b..a791474396 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -88,7 +88,6 @@ import com.android.launcher3.util.ActivityOptionsWrapper;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.RunnableList;
 import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
-import com.android.launcher3.util.Themes;
 import com.android.launcher3.util.TransformingTouchDelegate;
 import com.android.launcher3.util.ViewPool.Reusable;
 import com.android.quickstep.RecentsModel;
@@ -328,19 +327,6 @@ public class TaskView extends FrameLayout implements Reusable {
                 }
             };
 
-    private static final FloatProperty<TaskView> COLOR_TINT =
-            new FloatProperty<TaskView>("colorTint") {
-                @Override
-                public void setValue(TaskView taskView, float v) {
-                    taskView.setColorTint(v);
-                }
-
-                @Override
-                public Float get(TaskView taskView) {
-                    return taskView.getColorTint();
-                }
-            };
-
     private final TaskOutlineProvider mOutlineProvider;
 
     private Task mTask;
@@ -393,11 +379,6 @@ public class TaskView extends FrameLayout implements Reusable {
     private final float[] mIconCenterCoords = new float[2];
     private final float[] mChipCenterCoords = new float[2];
 
-    // Colored tint for the task view and all its supplementary views (like the task icon and well
-    // being banner.
-    private final int mTintingColor;
-    private float mTintAmount;
-
     private boolean mIsClickableAsLiveTile = true;
 
     public TaskView(Context context) {
@@ -419,8 +400,6 @@ public class TaskView extends FrameLayout implements Reusable {
         mOutlineProvider = new TaskOutlineProvider(getContext(), mCurrentFullscreenParams,
                 mActivity.getDeviceProfile().overviewTaskThumbnailTopMarginPx);
         setOutlineProvider(mOutlineProvider);
-
-        mTintingColor = Themes.getColorBackgroundFloating(context);
     }
 
     /**
@@ -864,7 +843,7 @@ public class TaskView extends FrameLayout implements Reusable {
         setTranslationZ(0);
         setAlpha(mStableAlpha);
         setIconScaleAndDim(1);
-        setColorTint(0);
+        setColorTint(0, 0);
     }
 
     public void setStableAlpha(float parentAlpha) {
@@ -1472,25 +1451,13 @@ public class TaskView extends FrameLayout implements Reusable {
         getRecentsView().initiateSplitSelect(this, splitPositionOption);
     }
 
-    private void setColorTint(float amount) {
-        mTintAmount = amount;
-        mSnapshotView.setDimAlpha(mTintAmount);
-        mIconView.setIconColorTint(mTintingColor, mTintAmount);
-        mDigitalWellBeingToast.setBannerColorTint(mTintingColor, mTintAmount);
-    }
-
-    private float getColorTint() {
-        return mTintAmount;
-    }
-
     /**
-     * Show the task view with a color tint (animates value).
+     * Set a color tint on the snapshot and supporting views.
      */
-    public void showColorTint(boolean enable) {
-        ObjectAnimator tintAnimator = ObjectAnimator.ofFloat(
-                this, COLOR_TINT, enable ? MAX_PAGE_SCRIM_ALPHA : 0);
-        tintAnimator.setAutoCancel(true);
-        tintAnimator.start();
+    public void setColorTint(float amount, int tintColor) {
+        mSnapshotView.setDimAlpha(amount);
+        mIconView.setIconColorTint(tintColor, amount);
+        mDigitalWellBeingToast.setBannerColorTint(tintColor, amount);
     }
 
     /**
-- 
GitLab


From c86eb1abf49e5ced12f6b2ad3606d9b80e571234 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 7 May 2021 16:05:51 -0700
Subject: [PATCH 1108/1664] Ignoring invalid deep shortcuts during load

Bug: 182728800
Test: Manual
Change-Id: I880c2c8898f7a968024bf7b95e763f4293ee19a0
---
 src/com/android/launcher3/model/LoaderCursor.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/com/android/launcher3/model/LoaderCursor.java b/src/com/android/launcher3/model/LoaderCursor.java
index 897b02ede2..7e3bceee1d 100644
--- a/src/com/android/launcher3/model/LoaderCursor.java
+++ b/src/com/android/launcher3/model/LoaderCursor.java
@@ -52,6 +52,7 @@ import com.android.launcher3.logging.FileLog;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.launcher3.shortcuts.ShortcutKey;
 import com.android.launcher3.util.ContentWriter;
 import com.android.launcher3.util.GridOccupancy;
 import com.android.launcher3.util.IntArray;
@@ -394,6 +395,11 @@ public class LoaderCursor extends CursorWrapper {
      * otherwise marks it for deletion.
      */
     public void checkAndAddItem(ItemInfo info, BgDataModel dataModel) {
+        if (info.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT) {
+            // Ensure that it is a valid intent. An exception here will
+            // cause the item loading to get skipped
+            ShortcutKey.fromItemInfo(info);
+        }
         if (checkItemPlacement(info)) {
             dataModel.addItem(mContext, info, false);
         } else {
-- 
GitLab


From 0b6fa71deb6b346e0e6ddbde1acc754f9bb48311 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Wed, 5 May 2021 15:36:27 -0700
Subject: [PATCH 1109/1664] Add local wallpaper color extraction to folder
 backgrounds.

- Starts listening to local wallpaper colors as soon as folder
  is positioned.
- The folder open animation already has a background color
  animator.
- For simplicity, folder open animation always starts
  first, and then we cancel its background color animator,
  and start a new animator to the extracted color.
- setAutoCancel would be handy here, but it does not work, will
  track in a separate bug.
- Since folders are reused, we clear our the color extractor on
  folder close.

Bug: 175329686
Test: multiple folders on rainbow background
      open each folder, ensure bg animates to proper color
Change-Id: Ie0f2c0632fa2361f7710ba247d74f882620dec16
---
 .../launcher3/AbstractFloatingView.java       |  10 ++
 src/com/android/launcher3/folder/Folder.java  | 109 ++++++++++++++++--
 .../folder/FolderAnimationManager.java        |  28 +++--
 .../android/launcher3/popup/ArrowPopup.java   |   7 --
 .../launcher3/widget/LocalColorExtractor.java |  14 +++
 5 files changed, 145 insertions(+), 23 deletions(-)

diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java
index 95cdbdd147..32b2c9a755 100644
--- a/src/com/android/launcher3/AbstractFloatingView.java
+++ b/src/com/android/launcher3/AbstractFloatingView.java
@@ -39,6 +39,7 @@ import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.util.TouchController;
 import com.android.launcher3.views.ActivityContext;
 import com.android.launcher3.views.BaseDragLayer;
+import com.android.launcher3.widget.LocalColorExtractor;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -108,12 +109,21 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
 
     protected boolean mIsOpen;
 
+    // Index used to get background color when using local wallpaper color extraction.
+    protected int mColorExtractionIndex;
+
     public AbstractFloatingView(Context context, AttributeSet attrs) {
         super(context, attrs);
+        init(context);
     }
 
     public AbstractFloatingView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
+        init(context);
+    }
+
+    private void init(Context context) {
+        mColorExtractionIndex = LocalColorExtractor.getColorIndex(context);
     }
 
     /**
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index cf1cb45440..92d891f774 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -31,6 +31,7 @@ import static com.android.launcher3.util.DisplayController.getSingleFrameMs;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
 import android.appwidget.AppWidgetHostView;
 import android.content.Context;
@@ -38,6 +39,8 @@ import android.graphics.Canvas;
 import android.graphics.Insets;
 import android.graphics.Path;
 import android.graphics.Rect;
+import android.graphics.RectF;
+import android.graphics.drawable.GradientDrawable;
 import android.os.Build;
 import android.text.InputType;
 import android.text.Selection;
@@ -45,6 +48,7 @@ import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.Pair;
+import android.util.SparseIntArray;
 import android.util.TypedValue;
 import android.view.FocusFinder;
 import android.view.KeyEvent;
@@ -96,13 +100,16 @@ import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pageindicators.PageIndicatorDots;
 import com.android.launcher3.util.Executors;
+import com.android.launcher3.util.Themes;
 import com.android.launcher3.util.Thunk;
 import com.android.launcher3.views.ActivityContext;
 import com.android.launcher3.views.BaseDragLayer;
 import com.android.launcher3.views.ClipPathView;
+import com.android.launcher3.widget.LocalColorExtractor;
 import com.android.launcher3.widget.PendingAddShortcutInfo;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -152,6 +159,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
     private static final float ICON_OVERSCROLL_WIDTH_FACTOR = 0.45f;
 
     private static final int FOLDER_NAME_ANIMATION_DURATION = 633;
+    private static final int FOLDER_COLOR_ANIMATION_DURATION = 150;
 
     private static final int REORDER_DELAY = 250;
     private static final int ON_EXIT_CLOSE_DELAY = 400;
@@ -224,6 +232,19 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
 
     @Nullable private FolderWindowInsetsAnimationCallback mFolderWindowInsetsAnimationCallback;
 
+    // Wallpaper local color extraction
+    @Nullable private LocalColorExtractor mColorExtractor;
+    @Nullable private LocalColorExtractor.Listener mColorListener;
+    private final Rect mTempRect = new Rect();
+    private final RectF mTempRectF = new RectF();
+
+    // For simplicity, we start the color change only after the open animation has started.
+    private Runnable mColorChangeRunnable;
+    private Animator mColorChangeAnimator;
+    // The background color animator used in the folder open animation. We keep a reference to this,
+    // so that we can cancel it when starting mColorChangeAnimator.
+    private ObjectAnimator mOpenAnimationColorChangeAnimator;
+
     /**
      * Used to inflate the Workspace from XML.
      *
@@ -241,7 +262,6 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         // name is complete, we have something to focus on, thus hiding the cursor and giving
         // reliable behavior when clicking the text field (since it will always gain focus on click).
         setFocusableInTouchMode(true);
-
     }
 
     @Override
@@ -276,6 +296,45 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
 
             setWindowInsetsAnimationCallback(mFolderWindowInsetsAnimationCallback);
         }
+
+        if (Utilities.ATLEAST_S) {
+            mColorExtractor = LocalColorExtractor.newInstance(mLauncher);
+            mColorListener = (RectF rect, SparseIntArray extractedColors) -> {
+                mColorChangeRunnable = () -> {
+                    mColorChangeRunnable = null;
+                    int duration = FOLDER_COLOR_ANIMATION_DURATION;
+
+                    // Cancel the open animation color change animator.
+                    ObjectAnimator existingAnim = mOpenAnimationColorChangeAnimator;
+                    if (existingAnim != null && existingAnim.isRunning()) {
+                        duration = (int) Math.max(FOLDER_COLOR_ANIMATION_DURATION,
+                                existingAnim.getDuration() * (1f - existingAnim.getDuration()));
+                        existingAnim.cancel();
+                        mOpenAnimationColorChangeAnimator = null;
+                    }
+
+                    // Start a new animator to the extracted color.
+                    int newColor = extractedColors.get(mColorExtractionIndex);
+                    GradientDrawable bg = (GradientDrawable) getBackground();
+                    mColorChangeAnimator = ObjectAnimator.ofArgb(bg, "color",
+                            bg.getColor().getDefaultColor(), newColor).setDuration(duration);
+                    mColorChangeAnimator.addListener(new AnimatorListenerAdapter() {
+                        @Override
+                        public void onAnimationEnd(Animator animation) {
+                            mColorChangeAnimator = null;
+                        }
+                    });
+                    mColorChangeAnimator.start();
+                };
+
+                // If the folder open animation has started, we can start the color change now.
+                // Otherwise we wait for it to start.
+                if (mOpenAnimationColorChangeAnimator != null
+                        && mOpenAnimationColorChangeAnimator.isStarted()) {
+                    post(mColorChangeRunnable);
+                }
+            };
+        }
     }
 
     public boolean onLongClick(View v) {
@@ -652,15 +711,18 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         // dropping. One resulting issue is that replaceFolderWithFinalItem() can be called twice.
         mDeleteFolderOnDropCompleted = false;
 
-        if (mCurrentAnimator != null && mCurrentAnimator.isRunning()) {
-            mCurrentAnimator.cancel();
-        }
-        AnimatorSet anim = new FolderAnimationManager(this, true /* isOpening */).getAnimator();
+        cancelRunningAnimations();
+        FolderAnimationManager fam = new FolderAnimationManager(this, true /* isOpening */);
+        AnimatorSet anim = fam.getAnimator();
+        mOpenAnimationColorChangeAnimator = fam.getBgColorAnimator();
         anim.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationStart(Animator animation) {
                 mFolderIcon.setIconVisible(false);
                 mFolderIcon.drawLeaveBehindIfExists();
+                if (mColorChangeRunnable != null) {
+                    mColorChangeRunnable.run();
+                }
             }
             @Override
             public void onAnimationEnd(Animator animation) {
@@ -752,6 +814,15 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
                 AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
     }
 
+    private void cancelRunningAnimations() {
+        if (mCurrentAnimator != null && mCurrentAnimator.isRunning()) {
+            mCurrentAnimator.cancel();
+        }
+        if (mColorChangeAnimator != null && mColorChangeAnimator.isRunning()) {
+            mColorChangeAnimator.cancel();
+        }
+    }
+
     private void animateClosed() {
         if (mIsAnimatingClosed) {
             return;
@@ -760,9 +831,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         mContent.completePendingPageChanges();
         mContent.snapToPageImmediately(mContent.getDestinationPage());
 
-        if (mCurrentAnimator != null && mCurrentAnimator.isRunning()) {
-            mCurrentAnimator.cancel();
-        }
+        cancelRunningAnimations();
         AnimatorSet a = new FolderAnimationManager(this, false /* isOpening */).getAnimator();
         a.addListener(new AnimatorListenerAdapter() {
             @Override
@@ -837,6 +906,19 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         clearDragInfo();
         mState = STATE_SMALL;
         mContent.setCurrentPage(0);
+
+        mOpenAnimationColorChangeAnimator = null;
+        mColorChangeRunnable = null;
+        if (mColorChangeAnimator != null) {
+            mColorChangeAnimator.cancel();
+            mColorChangeAnimator = null;
+        }
+        if (mColorExtractor != null) {
+            mColorExtractor.removeLocations();
+            mColorExtractor.setListener(null);
+        }
+        GradientDrawable bg = (GradientDrawable) getBackground();
+        bg.setColor(Themes.getAttrColor(getContext(), R.attr.folderFillColor));
     }
 
     @Override
@@ -1104,6 +1186,17 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         lp.height = height;
         lp.x = left;
         lp.y = top;
+
+        if (mColorExtractor != null) {
+            mColorExtractor.removeLocations();
+            mColorExtractor.setListener(mColorListener);
+            mTempRect.set(lp.x, lp.y, lp.x + lp.width, lp.y + lp.height);
+            mColorExtractor.getExtractedRectForViewRect(mLauncher,
+                    mLauncher.getWorkspace().getCurrentPage(), mTempRect, mTempRectF);
+            if (!mTempRectF.isEmpty()) {
+                mColorExtractor.addLocation(Arrays.asList(mTempRectF));
+            }
+        }
     }
 
     protected int getContentAreaHeight() {
diff --git a/src/com/android/launcher3/folder/FolderAnimationManager.java b/src/com/android/launcher3/folder/FolderAnimationManager.java
index ee6ea99e77..af8be8d2f9 100644
--- a/src/com/android/launcher3/folder/FolderAnimationManager.java
+++ b/src/com/android/launcher3/folder/FolderAnimationManager.java
@@ -35,8 +35,6 @@ import android.util.Property;
 import android.view.View;
 import android.view.animation.AnimationUtils;
 
-import androidx.core.graphics.ColorUtils;
-
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.CellLayout;
 import com.android.launcher3.R;
@@ -80,6 +78,8 @@ public class FolderAnimationManager {
     private final PreviewItemDrawingParams mTmpParams = new PreviewItemDrawingParams(0, 0, 0, 0);
     private final FolderGridOrganizer mPreviewVerifier;
 
+    private ObjectAnimator mBgColorAnimator;
+
     public FolderAnimationManager(Folder folder, boolean isOpening) {
         mFolder = folder;
         mContent = folder.mContent;
@@ -105,6 +105,12 @@ public class FolderAnimationManager {
                 R.interpolator.large_folder_preview_item_close_interpolator);
     }
 
+    /**
+     * Returns the animator that changes the background color.
+     */
+    public ObjectAnimator getBgColorAnimator() {
+        return mBgColorAnimator;
+    }
 
     /**
      * Prepares the Folder for animating between open / closed states.
@@ -162,10 +168,15 @@ public class FolderAnimationManager {
         final float yDistance = initialY - lp.y;
 
         // Set up the Folder background.
-        final int finalColor = ColorUtils.setAlphaComponent(
-                Themes.getAttrColor(mContext, R.attr.folderFillColor), 255);
-        final int initialColor = setColorAlphaBound(
-                finalColor, mPreviewBackground.getBackgroundAlpha());
+        int previewBackgroundColor = Themes.getAttrColor(mContext, R.attr.folderFillColor);
+        final int finalColor;
+        if (mIsOpening) {
+            finalColor = Themes.getAttrColor(mContext, R.attr.popupColorPrimary);
+        } else {
+            finalColor = mFolderBackground.getColor().getDefaultColor();
+        }
+        final int initialColor = setColorAlphaBound(previewBackgroundColor,
+                mPreviewBackground.getBackgroundAlpha());
         mFolderBackground.mutate();
         mFolderBackground.setColor(mIsOpening ? initialColor : finalColor);
 
@@ -193,11 +204,12 @@ public class FolderAnimationManager {
             play(a, anim);
         }
 
+        mBgColorAnimator = getAnimator(mFolderBackground, "color", initialColor, finalColor);
+        play(a, mBgColorAnimator);
         play(a, getAnimator(mFolder, View.TRANSLATION_X, xDistance, 0f));
         play(a, getAnimator(mFolder, View.TRANSLATION_Y, yDistance, 0f));
         play(a, getAnimator(mFolder.mContent, SCALE_PROPERTY, initialScale, finalScale));
         play(a, getAnimator(mFolder.mFooter, SCALE_PROPERTY, initialScale, finalScale));
-        play(a, getAnimator(mFolderBackground, "color", initialColor, finalColor));
         play(a, mFolderIcon.mFolderName.createTextAlphaAnimator(!mIsOpening));
         play(a, getShape().createRevealAnimator(
                 mFolder, startRect, endRect, finalRadius, !mIsOpening));
@@ -409,7 +421,7 @@ public class FolderAnimationManager {
                 : ObjectAnimator.ofFloat(view, property, v2, v1);
     }
 
-    private Animator getAnimator(GradientDrawable drawable, String property, int v1, int v2) {
+    private ObjectAnimator getAnimator(GradientDrawable drawable, String property, int v1, int v2) {
         return mIsOpening
                 ? ObjectAnimator.ofArgb(drawable, property, v1, v2)
                 : ObjectAnimator.ofArgb(drawable, property, v2, v1);
diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java
index c63d69dfd3..33d8be034b 100644
--- a/src/com/android/launcher3/popup/ArrowPopup.java
+++ b/src/com/android/launcher3/popup/ArrowPopup.java
@@ -79,9 +79,6 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
 
     // +1 for system shortcut view
     private static final int MAX_NUM_CHILDREN = MAX_SHORTCUTS + 1;
-    // Index used to get background color when using local wallpaper color extraction,
-    private static final int LIGHT_COLOR_EXTRACTION_INDEX = android.R.color.system_accent2_50;
-    private static final int DARK_COLOR_EXTRACTION_INDEX = android.R.color.system_accent2_800;
 
     private final Rect mTempRect = new Rect();
 
@@ -119,7 +116,6 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
     private final int[] mColors;
     private final HashMap<String, View> mViewForRect = new HashMap<>();
 
-    private final int mColorExtractionIndex;
     @Nullable private LocalColorExtractor mColorExtractor;
 
     public ArrowPopup(Context context, AttributeSet attrs, int defStyleAttr) {
@@ -128,9 +124,6 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
         mOutlineRadius = Themes.getDialogCornerRadius(context);
         mLauncher = BaseDraggingActivity.fromContext(context);
         mIsRtl = Utilities.isRtl(getResources());
-        mColorExtractionIndex = Utilities.isDarkTheme(context)
-                ? DARK_COLOR_EXTRACTION_INDEX
-                : LIGHT_COLOR_EXTRACTION_INDEX;
         setClipToOutline(true);
         setOutlineProvider(new ViewOutlineProvider() {
             @Override
diff --git a/src/com/android/launcher3/widget/LocalColorExtractor.java b/src/com/android/launcher3/widget/LocalColorExtractor.java
index 8ae6b2e435..a66024aafc 100644
--- a/src/com/android/launcher3/widget/LocalColorExtractor.java
+++ b/src/com/android/launcher3/widget/LocalColorExtractor.java
@@ -28,6 +28,7 @@ import androidx.annotation.Nullable;
 
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.util.ResourceBasedOverride;
 
 import java.util.List;
@@ -35,6 +36,10 @@ import java.util.List;
 /** Extracts the colors we need from the wallpaper at given locations. */
 public class LocalColorExtractor implements ResourceBasedOverride {
 
+    // Index used to get background color when using local wallpaper color extraction,
+    private static final int LIGHT_COLOR_EXTRACTION_INDEX = android.R.color.system_accent2_50;
+    private static final int DARK_COLOR_EXTRACTION_INDEX = android.R.color.system_accent2_800;
+
     /** Listener for color changes on a screen location. */
     public interface Listener {
         /**
@@ -103,4 +108,13 @@ public class LocalColorExtractor implements ResourceBasedOverride {
             RectF colorExtractionRectOut) {
         // no-op
     }
+
+    /**
+     * Returns an index used to query the color of interest from the list of extracted colors.
+     */
+    public static int getColorIndex(Context context) {
+        return Utilities.isDarkTheme(context)
+                ? DARK_COLOR_EXTRACTION_INDEX
+                : LIGHT_COLOR_EXTRACTION_INDEX;
+    }
 }
-- 
GitLab


From ce0c857e453cf743091ad6f8c4143cf68cfbbdd2 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 7 May 2021 16:16:24 -0700
Subject: [PATCH 1110/1664] Avoid rebind if data didn't change

Bug: 187531176
Test: Manual
Change-Id: I94ab7ecfbed0cb8f0fbae995b4e2ff9c9cdaa808
---
 src/com/android/launcher3/allapps/AlphabeticalAppsList.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
index 6957850730..88d95faea7 100644
--- a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
+++ b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
@@ -30,6 +30,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.TreeMap;
 
 /**
@@ -181,11 +182,10 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
      * Sets results list for search
      */
     public boolean setSearchResults(ArrayList<AdapterItem> results) {
-        if (results == null || mSearchResults != results) {
-            boolean same = mSearchResults != null && mSearchResults.equals(results);
+        if (!Objects.equals(results, mSearchResults)) {
             mSearchResults = results;
             updateAdapterItems();
-            return !same;
+            return true;
         }
         return false;
     }
-- 
GitLab


From 94e43bd7d86b0b739a5cd8844087535cdbfc56d9 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Fri, 30 Apr 2021 17:19:59 -0700
Subject: [PATCH 1111/1664] New motion for ArrowPopup open/close.

Bug: 175329686
Test: long press on apps where container opens above & below
      and where container is aligned left & right

Change-Id: I09bbf57b6e19cc6f022b9a96fb48d8c4ae080813
---
 res/values/config.xml                         |   5 -
 .../android/launcher3/anim/Interpolators.java |   3 +
 .../android/launcher3/popup/ArrowPopup.java   | 170 ++++++++----------
 3 files changed, 76 insertions(+), 102 deletions(-)

diff --git a/res/values/config.xml b/res/values/config.xml
index 9ad12245be..2e5ecbabe4 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -77,11 +77,6 @@
     <!-- Menu id for feature flags -->
     <item type="id" name="menu_apply_flags" />
 
-    <!-- Popup items -->
-    <integer name="config_popupOpenCloseDuration">150</integer>
-    <integer name="config_popupArrowOpenCloseDuration">40</integer>
-    <integer name="config_removeNotificationViewDuration">300</integer>
-
     <!-- Default packages -->
     <string name="wallpaper_picker_package" translatable="false"></string>
     <string name="local_colors_extraction_class" translatable="false"></string>
diff --git a/src/com/android/launcher3/anim/Interpolators.java b/src/com/android/launcher3/anim/Interpolators.java
index 11e831ee4c..9d73bba5dd 100644
--- a/src/com/android/launcher3/anim/Interpolators.java
+++ b/src/com/android/launcher3/anim/Interpolators.java
@@ -53,6 +53,9 @@ public class Interpolators {
     public static final Interpolator AGGRESSIVE_EASE = new PathInterpolator(0.2f, 0f, 0f, 1f);
     public static final Interpolator AGGRESSIVE_EASE_IN_OUT = new PathInterpolator(0.6f,0, 0.4f, 1);
 
+    public static final Interpolator DECELERATED_EASE = new PathInterpolator(0, 0, .2f, 1f);
+    public static final Interpolator ACCELERATED_EASE = new PathInterpolator(0.4f, 0, 1f, 1f);
+
     public static final Interpolator EXAGGERATED_EASE;
 
     public static final Interpolator INSTANT = t -> 1;
diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java
index c63d69dfd3..115f718148 100644
--- a/src/com/android/launcher3/popup/ArrowPopup.java
+++ b/src/com/android/launcher3/popup/ArrowPopup.java
@@ -16,7 +16,9 @@
 
 package com.android.launcher3.popup;
 
-import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
+import static com.android.launcher3.anim.Interpolators.ACCELERATED_EASE;
+import static com.android.launcher3.anim.Interpolators.DECELERATED_EASE;
+import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.popup.PopupPopulator.MAX_SHORTCUTS;
 
 import android.animation.Animator;
@@ -24,7 +26,6 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ArgbEvaluator;
 import android.animation.ObjectAnimator;
-import android.animation.TimeInterpolator;
 import android.animation.ValueAnimator;
 import android.content.Context;
 import android.content.res.Resources;
@@ -42,6 +43,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
 import android.view.ViewTreeObserver;
+import android.view.animation.Interpolator;
 import android.widget.FrameLayout;
 
 import androidx.annotation.NonNull;
@@ -51,13 +53,10 @@ import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.InsettableFrameLayout;
 import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherAnimUtils;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.Workspace;
-import com.android.launcher3.anim.RevealOutlineAnimation;
-import com.android.launcher3.anim.RoundedRectRevealOutlineProvider;
 import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.shortcuts.DeepShortcutView;
 import com.android.launcher3.statemanager.StatefulActivity;
@@ -77,6 +76,19 @@ import java.util.HashMap;
 public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
         extends AbstractFloatingView {
 
+    // Duration values (ms) for popup open and close animations.
+    private static final int OPEN_DURATION = 276;
+    private static final int OPEN_FADE_START_DELAY = 0;
+    private static final int OPEN_FADE_DURATION = 38;
+    private static final int OPEN_CHILD_FADE_START_DELAY = 38;
+    private static final int OPEN_CHILD_FADE_DURATION = 76;
+
+    private static final int CLOSE_DURATION = 200;
+    private static final int CLOSE_FADE_START_DELAY = 140;
+    private static final int CLOSE_FADE_DURATION = 50;
+    private static final int CLOSE_CHILD_FADE_START_DELAY = 0;
+    private static final int CLOSE_CHILD_FADE_DURATION = 140;
+
     // +1 for system shortcut view
     private static final int MAX_NUM_CHILDREN = MAX_SHORTCUTS + 1;
     // Index used to get background color when using local wallpaper color extraction,
@@ -103,10 +115,8 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
     protected boolean mIsAboveIcon;
     private int mGravity;
 
-    protected Animator mOpenCloseAnimator;
+    protected AnimatorSet mOpenCloseAnimator;
     protected boolean mDeferContainerRemoval;
-    private final Rect mStartRect = new Rect();
-    private final Rect mEndRect = new Rect();
 
     private final GradientDrawable mRoundedTop;
     private final GradientDrawable mRoundedBottom;
@@ -557,48 +567,13 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
         return getChildCount() > 0 ? getChildAt(0) : this;
     }
 
-    private int getArrowDuration() {
-        return shouldAddArrow()
-                ? getResources().getInteger(R.integer.config_popupArrowOpenCloseDuration)
-                : 0;
-    }
-
     private void animateOpen() {
         setVisibility(View.VISIBLE);
 
-        final AnimatorSet openAnim = new AnimatorSet();
-        final Resources res = getResources();
-        final long revealDuration = (long) res.getInteger(R.integer.config_popupOpenCloseDuration);
-        final long arrowDuration = getArrowDuration();
-        final TimeInterpolator revealInterpolator = ACCEL_DEACCEL;
-
-        // Rectangular reveal.
-        mEndRect.set(0, 0, getMeasuredWidth(), getMeasuredHeight());
-        final ValueAnimator revealAnim = createOpenCloseOutlineProvider()
-                .createRevealAnimator(this, false);
-        revealAnim.setDuration(revealDuration);
-        revealAnim.setInterpolator(revealInterpolator);
-        // Clip the popup to the initial outline while the notification dot and arrow animate.
-        revealAnim.start();
-        revealAnim.pause();
-
-        ValueAnimator fadeIn = ValueAnimator.ofFloat(0, 1);
-        fadeIn.setDuration(revealDuration + arrowDuration);
-        fadeIn.setInterpolator(revealInterpolator);
-        fadeIn.addUpdateListener(anim -> {
-            float alpha = (float) anim.getAnimatedValue();
-            mArrow.setAlpha(alpha);
-            setAlpha(revealAnim.isStarted() ? alpha : 0);
-        });
-        openAnim.play(fadeIn);
-
-        // Animate the arrow.
-        mArrow.setScaleX(0);
-        mArrow.setScaleY(0);
-        Animator arrowScale = ObjectAnimator.ofFloat(mArrow, LauncherAnimUtils.SCALE_PROPERTY, 1)
-                .setDuration(arrowDuration);
-
-        openAnim.addListener(new AnimatorListenerAdapter() {
+        mOpenCloseAnimator = getOpenCloseAnimator(true, OPEN_DURATION, OPEN_FADE_START_DELAY,
+                OPEN_FADE_DURATION, OPEN_CHILD_FADE_START_DELAY, OPEN_CHILD_FADE_DURATION,
+                DECELERATED_EASE);
+        mOpenCloseAnimator.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationEnd(Animator animation) {
                 setAlpha(1f);
@@ -606,56 +581,68 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
                 mOpenCloseAnimator = null;
             }
         });
+        mOpenCloseAnimator.start();
+    }
+
+    private AnimatorSet getOpenCloseAnimator(boolean isOpening, int totalDuration,
+            int fadeStartDelay, int fadeDuration, int childFadeStartDelay,
+            int childFadeDuration, Interpolator interpolator) {
+        final AnimatorSet openAnim = new AnimatorSet();
+        float[] alphaValues = isOpening ? new float[] {0, 1} : new float[] {1, 0};
+        float[] scaleValues = isOpening ? new float[] {0.5f, 1} : new float[] {1, 0.5f};
+
+        ValueAnimator fade = ValueAnimator.ofFloat(alphaValues);
+        fade.setStartDelay(fadeStartDelay);
+        fade.setDuration(fadeDuration);
+        fade.setInterpolator(LINEAR);
+        fade.addUpdateListener(anim -> {
+            float alpha = (float) anim.getAnimatedValue();
+            mArrow.setAlpha(alpha);
+            setAlpha(alpha);
+        });
+        openAnim.play(fade);
+
+        setPivotX(mIsLeftAligned ? 0 : getMeasuredWidth());
+        setPivotY(mIsAboveIcon ? getMeasuredHeight() : 0);
+        Animator scale = ObjectAnimator.ofFloat(this, View.SCALE_Y, scaleValues);
+        scale.setDuration(totalDuration);
+        scale.setInterpolator(interpolator);
+        openAnim.play(scale);
+
+        for (int i = getChildCount() - 1; i >= 0; --i) {
+            View view = getChildAt(i);
+            if (view.getVisibility() == VISIBLE && view instanceof ViewGroup) {
+                for (int j = ((ViewGroup) view).getChildCount() - 1; j >= 0; --j) {
+                    View childView = ((ViewGroup) view).getChildAt(j);
 
-        mOpenCloseAnimator = openAnim;
-        openAnim.playSequentially(arrowScale, revealAnim);
-        openAnim.start();
+                    childView.setAlpha(alphaValues[0]);
+                    ValueAnimator childFade = ObjectAnimator.ofFloat(childView, ALPHA, alphaValues);
+                    childFade.setStartDelay(childFadeStartDelay);
+                    childFade.setDuration(childFadeDuration);
+                    childFade.setInterpolator(LINEAR);
+
+                    openAnim.play(childFade);
+                }
+            }
+        }
+        return openAnim;
     }
 
+
     protected void animateClose() {
         if (!mIsOpen) {
             return;
         }
-        if (getOutlineProvider() instanceof RevealOutlineAnimation) {
-            ((RevealOutlineAnimation) getOutlineProvider()).getOutline(mEndRect);
-        } else {
-            mEndRect.set(0, 0, getMeasuredWidth(), getMeasuredHeight());
-        }
         if (mOpenCloseAnimator != null) {
             mOpenCloseAnimator.cancel();
         }
         mIsOpen = false;
 
-
-        final AnimatorSet closeAnim = new AnimatorSet();
-        final Resources res = getResources();
-        final TimeInterpolator revealInterpolator = ACCEL_DEACCEL;
-        final long revealDuration = res.getInteger(R.integer.config_popupOpenCloseDuration);
-        final long arrowDuration = getArrowDuration();
-
-        // Hide the arrow
-        Animator scaleArrow = ObjectAnimator.ofFloat(mArrow, LauncherAnimUtils.SCALE_PROPERTY, 0)
-                .setDuration(arrowDuration);
-
-        // Rectangular reveal (reversed).
-        final ValueAnimator revealAnim = createOpenCloseOutlineProvider()
-                .createRevealAnimator(this, true);
-        revealAnim.setDuration(revealDuration);
-        revealAnim.setInterpolator(revealInterpolator);
-        closeAnim.playSequentially(revealAnim, scaleArrow);
-
-        ValueAnimator fadeOut = ValueAnimator.ofFloat(getAlpha(), 0);
-        fadeOut.setDuration(revealDuration + arrowDuration);
-        fadeOut.setInterpolator(revealInterpolator);
-        fadeOut.addUpdateListener(anim -> {
-            float alpha = (float) anim.getAnimatedValue();
-            mArrow.setAlpha(alpha);
-            setAlpha(scaleArrow.isStarted() ? 0 : alpha);
-        });
-        closeAnim.play(fadeOut);
-
-        onCreateCloseAnimation(closeAnim);
-        closeAnim.addListener(new AnimatorListenerAdapter() {
+        mOpenCloseAnimator = getOpenCloseAnimator(false, CLOSE_DURATION, CLOSE_FADE_START_DELAY,
+                CLOSE_FADE_DURATION, CLOSE_CHILD_FADE_START_DELAY, CLOSE_CHILD_FADE_DURATION,
+                ACCELERATED_EASE);
+        onCreateCloseAnimation(mOpenCloseAnimator);
+        mOpenCloseAnimator.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationEnd(Animator animation) {
                 mOpenCloseAnimator = null;
@@ -666,8 +653,7 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
                 }
             }
         });
-        mOpenCloseAnimator = closeAnim;
-        closeAnim.start();
+        mOpenCloseAnimator.start();
     }
 
     /**
@@ -675,16 +661,6 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
      */
     protected void onCreateCloseAnimation(AnimatorSet anim) { }
 
-    private RoundedRectRevealOutlineProvider createOpenCloseOutlineProvider() {
-        int arrowLeft = getArrowLeft();
-        int arrowCenterY = mIsAboveIcon ? getMeasuredHeight() : 0;
-
-        mStartRect.set(arrowLeft, arrowCenterY, arrowLeft + mArrowWidth, arrowCenterY);
-
-        return new RoundedRectRevealOutlineProvider(
-                mArrowPointRadius, mOutlineRadius, mStartRect, mEndRect);
-    }
-
     /**
      * Closes the popup without animation.
      */
-- 
GitLab


From 35226124e3d83c56e47bff93e228b23fe12d32fc Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 7 May 2021 16:34:43 -0700
Subject: [PATCH 1112/1664] Removing some unused logs

Fixes: 185820525
Fixes: 177316094
Fixes: 158017601
Fixes: 180915942
Change-Id: I8ce5bde08e1728d3209762c5f061245386408825
---
 .../TwoButtonNavbarTouchController.java       | 20 ------------
 .../OrientationTouchTransformer.java          | 31 +++----------------
 .../android/quickstep/RecentTasksList.java    | 16 ----------
 .../RecentsAnimationDeviceState.java          |  1 -
 .../quickstep/RotationTouchHelper.java        |  9 ------
 .../quickstep/TouchInteractionService.java    | 28 -----------------
 .../fallback/FallbackRecentsView.java         |  4 ---
 .../android/quickstep/views/RecentsView.java  | 17 ----------
 .../quickstep/FallbackRecentsTest.java        |  8 ++---
 .../android/quickstep/TaplTestsQuickstep.java |  2 --
 .../launcher3/InvariantDeviceProfile.java     |  9 ------
 src/com/android/launcher3/Launcher.java       |  9 ------
 .../launcher3/testing/TestProtocol.java       |  6 +---
 .../launcher3/ui/PortraitLandscapeRunner.java |  4 ---
 14 files changed, 8 insertions(+), 156 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java
index b0d0b1528c..e2747dfcbb 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java
@@ -78,18 +78,9 @@ public class TwoButtonNavbarTouchController extends AbstractStateChangeTouchCont
             return true;
         }
         if (AbstractFloatingView.getTopOpenView(mLauncher) != null) {
-            if (TestProtocol.sDebugTracing) {
-                Log.d(TestProtocol.TWO_BUTTON_NORMAL_NOT_OVERVIEW,
-                        "Didn't intercept touch due to top view: "
-                                + AbstractFloatingView.getTopOpenView(mLauncher));
-            }
             return false;
         }
         if ((ev.getEdgeFlags() & EDGE_NAV_BAR) == 0) {
-            if (TestProtocol.sDebugTracing) {
-                Log.d(TestProtocol.TWO_BUTTON_NORMAL_NOT_OVERVIEW,
-                        "Didn't intercept touch because event wasn't from nav bar");
-            }
             return false;
         }
         if (!mIsTransposed && mLauncher.isInState(OVERVIEW)) {
@@ -101,10 +92,6 @@ public class TwoButtonNavbarTouchController extends AbstractStateChangeTouchCont
     @Override
     public boolean onControllerInterceptTouchEvent(MotionEvent ev) {
         boolean intercept = super.onControllerInterceptTouchEvent(ev);
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.TWO_BUTTON_NORMAL_NOT_OVERVIEW,
-                    "2 button touch controller intercept touch? " + intercept);
-        }
         return intercept;
     }
 
@@ -123,10 +110,6 @@ public class TwoButtonNavbarTouchController extends AbstractStateChangeTouchCont
     @Override
     protected void onReinitToState(LauncherState newToState) {
         super.onReinitToState(newToState);
-
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.TWO_BUTTON_NORMAL_NOT_OVERVIEW, "onReinitToState: " + newToState);
-        }
     }
 
     @Override
@@ -175,9 +158,6 @@ public class TwoButtonNavbarTouchController extends AbstractStateChangeTouchCont
     @Override
     protected void onSwipeInteractionCompleted(LauncherState targetState) {
         super.onSwipeInteractionCompleted(targetState);
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.TWO_BUTTON_NORMAL_NOT_OVERVIEW, "Reached state: " + targetState);
-        }
         if (!mIsTransposed) {
             mContinuousTouchCount++;
         }
diff --git a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
index 62b821c41d..35a851ab65 100644
--- a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
+++ b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
@@ -35,7 +35,6 @@ import android.view.Surface;
 
 import com.android.launcher3.R;
 import com.android.launcher3.ResourceUtils;
-import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.util.DisplayController.Info;
 
 import java.io.PrintWriter;
@@ -92,7 +91,7 @@ class OrientationTouchTransformer {
     };
 
     private static final String TAG = "OrientationTouchTransformer";
-    private static final boolean DEBUG = true;
+    private static final boolean DEBUG = false;
 
     private static final int QUICKSTEP_ROTATION_UNINITIALIZED = -1;
 
@@ -161,11 +160,9 @@ class OrientationTouchTransformer {
         resetSwipeRegions(info);
     }
 
-    void setNavigationMode(SysUINavigationMode.Mode newMode, Info info,
-            Resources newRes) {
+    void setNavigationMode(SysUINavigationMode.Mode newMode, Info info, Resources newRes) {
         if (DEBUG) {
-            Log.d(TestProtocol.NO_SWIPE_TO_HOME, "setNavigationMode new: " + newMode
-                    + " oldMode: " + mMode + " " + this);
+            Log.d(TAG, "setNavigationMode new: " + newMode + " oldMode: " + mMode + " " + this);
         }
         if (mMode == newMode) {
             return;
@@ -258,18 +255,10 @@ class OrientationTouchTransformer {
 
         mCurrentDisplay = new CurrentDisplay(region.currentSize, region.rotation);
         OrientationRectF regionToKeep = mSwipeTouchRegions.get(mCurrentDisplay);
-        if (DEBUG) {
-            Log.d(TestProtocol.NO_SWIPE_TO_HOME, "cached region: " + regionToKeep
-                    + " mCurrentDisplay: " + mCurrentDisplay + " " + this);
-        }
         if (regionToKeep == null) {
             regionToKeep = createRegionForDisplay(region);
         }
         mSwipeTouchRegions.clear();
-        if (DEBUG) {
-            Log.d(TestProtocol.NO_SWIPE_TO_HOME, "adding region: " + regionToKeep
-                    + " mCurrentDisplay: " + mCurrentDisplay + " " + this);
-        }
         mSwipeTouchRegions.put(mCurrentDisplay, regionToKeep);
         updateAssistantRegions(regionToKeep);
     }
@@ -301,10 +290,6 @@ class OrientationTouchTransformer {
             mAssistantLeftRegion.setEmpty();
             mAssistantRightRegion.setEmpty();
             int navbarSize = getNavbarSize(ResourceUtils.NAVBAR_LANDSCAPE_LEFT_RIGHT_SIZE);
-            if (DEBUG) {
-                Log.d(TestProtocol.NO_SWIPE_TO_HOME, "else case mode: " + mMode
-                        + " getNavbarSize: " + navbarSize + " rotation: " + rotation + " " + this);
-            }
             switch (rotation) {
                 case Surface.ROTATION_90:
                     orientationRectF.left = orientationRectF.right
@@ -355,8 +340,8 @@ class OrientationTouchTransformer {
     }
 
     boolean touchInValidSwipeRegions(float x, float y) {
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.NO_SWIPE_TO_HOME, "touchInValidSwipeRegions " + x + "," + y + " in "
+        if (DEBUG) {
+            Log.d(TAG, "touchInValidSwipeRegions " + x + "," + y + " in "
                     + mLastRectTouched + " this: " + this);
         }
         if (mLastRectTouched != null) {
@@ -399,16 +384,10 @@ class OrientationTouchTransformer {
                 }
 
                 for (OrientationRectF rect : mSwipeTouchRegions.values()) {
-                    if (TestProtocol.sDebugTracing) {
-                        Log.d(TestProtocol.NO_SWIPE_TO_HOME, "transform:DOWN, rect=" + rect);
-                    }
                     if (rect == null) {
                         continue;
                     }
                     if (rect.applyTransform(event, false)) {
-                        if (TestProtocol.sDebugTracing) {
-                            Log.d(TestProtocol.NO_SWIPE_TO_HOME, "setting mLastRectTouched");
-                        }
                         mLastRectTouched = rect;
                         mActiveTouchRotation = rect.mRotation;
                         if (mEnableMultipleRegions
diff --git a/quickstep/src/com/android/quickstep/RecentTasksList.java b/quickstep/src/com/android/quickstep/RecentTasksList.java
index 2f1538bf5a..3302da0f77 100644
--- a/quickstep/src/com/android/quickstep/RecentTasksList.java
+++ b/quickstep/src/com/android/quickstep/RecentTasksList.java
@@ -93,10 +93,6 @@ public class RecentTasksList extends TaskStackChangeListener {
      * @return The change id of the current task list
      */
     public synchronized int getTasks(boolean loadKeysOnly, Consumer<ArrayList<Task>> callback) {
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.GET_RECENTS_FAILED, "getTasks: keysOnly=" + loadKeysOnly
-                    + " callback=" + callback);
-        }
         final int requestLoadId = mChangeId;
         if (mResultsUi.isValidForRequest(requestLoadId, loadKeysOnly)) {
             // The list is up to date, send the callback on the next frame,
@@ -105,9 +101,6 @@ public class RecentTasksList extends TaskStackChangeListener {
                 // Copy synchronously as the changeId might change by next frame
                 ArrayList<Task> result = copyOf(mResultsUi);
                 mMainThreadExecutor.post(() -> {
-                    if (TestProtocol.sDebugTracing) {
-                        Log.d(TestProtocol.GET_RECENTS_FAILED, "getTasks: no new tasks");
-                    }
                     callback.accept(result);
                 });
             }
@@ -118,24 +111,15 @@ public class RecentTasksList extends TaskStackChangeListener {
         // Kick off task loading in the background
         mLoadingTasksInBackground = true;
         UI_HELPER_EXECUTOR.execute(() -> {
-            if (TestProtocol.sDebugTracing) {
-                Log.d(TestProtocol.GET_RECENTS_FAILED, "getTasks: loading in bg start");
-            }
             if (!mResultsBg.isValidForRequest(requestLoadId, loadKeysOnly)) {
                 mResultsBg = loadTasksInBackground(Integer.MAX_VALUE, requestLoadId, loadKeysOnly);
             }
-            if (TestProtocol.sDebugTracing) {
-                Log.d(TestProtocol.GET_RECENTS_FAILED, "getTasks: loading in bg end");
-            }
             TaskLoadResult loadResult = mResultsBg;
             mMainThreadExecutor.execute(() -> {
                 mLoadingTasksInBackground = false;
                 mResultsUi = loadResult;
                 if (callback != null) {
                     ArrayList<Task> result = copyOf(mResultsUi);
-                    if (TestProtocol.sDebugTracing) {
-                        Log.d(TestProtocol.GET_RECENTS_FAILED, "getTasks: callback w/ bg results");
-                    }
                     callback.accept(result);
                 }
             });
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index e271203d18..110b3563ac 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -229,7 +229,6 @@ public class RecentsAnimationDeviceState implements
      * Cleans up all the registered listeners and receivers.
      */
     public void destroy() {
-        Log.d(TestProtocol.NO_SWIPE_TO_HOME, "destroying RADS", new Throwable());
         for (Runnable r : mOnDestroyActions) {
             r.run();
         }
diff --git a/quickstep/src/com/android/quickstep/RotationTouchHelper.java b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
index 76298624d3..070d725890 100644
--- a/quickstep/src/com/android/quickstep/RotationTouchHelper.java
+++ b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
@@ -133,8 +133,6 @@ public class RotationTouchHelper implements
 
     private RotationTouchHelper(Context context) {
         mContext = context;
-        Log.d(TestProtocol.NO_SWIPE_TO_HOME, "RotationTouchHelper ctor init? " + mNeedsInit
-                + " " + this);
         if (mNeedsInit) {
             init();
         }
@@ -142,11 +140,8 @@ public class RotationTouchHelper implements
 
     public void init() {
         if (!mNeedsInit) {
-            Log.d(TestProtocol.NO_SWIPE_TO_HOME, "Did not need init? " + " " + this);
             return;
         }
-        Log.d(TestProtocol.NO_SWIPE_TO_HOME, "RotationTouchHelper init() " + this,
-                new Throwable());
         mDisplayController = DisplayController.INSTANCE.get(mContext);
         Resources resources = mContext.getResources();
         mSysUiNavMode = SysUINavigationMode.INSTANCE.get(mContext);
@@ -157,8 +152,6 @@ public class RotationTouchHelper implements
 
         // Register for navigation mode changes
         SysUINavigationMode.Mode newMode = mSysUiNavMode.addModeChangeListener(this);
-        Log.d(TestProtocol.NO_SWIPE_TO_HOME, "AddedModeChangeListener: " + this +
-                " currentMode: " + newMode);
         onNavigationModeChanged(newMode);
         runOnDestroy(() -> mSysUiNavMode.removeModeChangeListener(this));
 
@@ -204,7 +197,6 @@ public class RotationTouchHelper implements
      * Cleans up all the registered listeners and receivers.
      */
     public void destroy() {
-        Log.d(TestProtocol.NO_SWIPE_TO_HOME, "destroying " + this);
         for (Runnable r : mOnDestroyActions) {
             r.run();
         }
@@ -253,7 +245,6 @@ public class RotationTouchHelper implements
 
     @Override
     public void onNavigationModeChanged(SysUINavigationMode.Mode newMode) {
-        Log.d(TestProtocol.NO_SWIPE_TO_HOME, "nav mode changed: " + newMode);
         mDisplayController.removeChangeListener(this);
         mDisplayController.addChangeListener(this);
         onDisplayInfoChanged(mContext, mDisplayController.getInfo(), CHANGE_ALL);
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 5fe0fc72a2..027dd1cf8d 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -165,8 +165,6 @@ public class TouchInteractionService extends Service implements PluginListener<O
 
         @BinderThread
         public void onInitialize(Bundle bundle) {
-            Log.d(TAG + " b/182478748", "TouchInteractionService.onInitialize: user="
-                    + getUserId());
             ISystemUiProxy proxy = ISystemUiProxy.Stub.asInterface(
                     bundle.getBinder(KEY_EXTRA_SYSUI_PROXY));
             IPip pip = IPip.Stub.asInterface(bundle.getBinder(KEY_EXTRA_SHELL_PIP));
@@ -350,8 +348,6 @@ public class TouchInteractionService extends Service implements PluginListener<O
         mMainChoreographer = Choreographer.getInstance();
         mAM = ActivityManagerWrapper.getInstance();
         mDeviceState = new RecentsAnimationDeviceState(this, true);
-            Log.d(TestProtocol.NO_SWIPE_TO_HOME, "RADS OTT instance: " +
-                    mDeviceState.getRotationTouchHelper().getOrientationTouchTransformer());
         mRotationTouchHelper = mDeviceState.getRotationTouchHelper();
         mDeviceState.addNavigationModeChangedCallback(this::onNavigationModeChanged);
         mDeviceState.addOneHandedModeChangedCallback(this::onOneHandedModeOverlayChanged);
@@ -363,8 +359,6 @@ public class TouchInteractionService extends Service implements PluginListener<O
     }
 
     private void disposeEventHandlers() {
-        Log.d(TAG + " b/182478748", "TouchInteractionService.disposeEventHandlers: user="
-                + getUserId());
         if (mInputEventReceiver != null) {
             mInputEventReceiver.dispose();
             mInputEventReceiver = null;
@@ -376,21 +370,12 @@ public class TouchInteractionService extends Service implements PluginListener<O
     }
 
     private void initInputMonitor() {
-        Log.d(TAG + " b/182478748", "TouchInteractionService.initInputMonitor: user="
-                + getUserId());
         disposeEventHandlers();
 
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.TIS_NO_EVENTS, "initInputMonitor: isButtonMode? "
-                    + mDeviceState.isButtonNavMode());
-        }
-
         if (mDeviceState.isButtonNavMode()) {
-            Log.d(TAG + " b/182478748", "isButtonNav: user=" + getUserId());
             return;
         }
 
-        Log.d(TAG + " b/182478748", "create swipe-up input monitor: user=" + getUserId());
         mInputMonitorCompat = new InputMonitorCompat("swipe-up", mDeviceState.getDisplayId());
         mInputEventReceiver = mInputMonitorCompat.getInputReceiver(Looper.getMainLooper(),
                 mMainChoreographer, this::onInputEvent);
@@ -572,17 +557,10 @@ public class TouchInteractionService extends Service implements PluginListener<O
 
         final int action = event.getAction();
         if (action == ACTION_DOWN) {
-            if (TestProtocol.sDebugTracing) {
-                Log.d(TestProtocol.NO_SWIPE_TO_HOME, "TouchInteractionService.onInputEvent:DOWN");
-            }
             mRotationTouchHelper.setOrientationTransformIfNeeded(event);
 
             if (!mDeviceState.isOneHandedModeActive()
                     && mRotationTouchHelper.isInSwipeUpTouchRegion(event)) {
-                if (TestProtocol.sDebugTracing) {
-                    Log.d(TestProtocol.NO_SWIPE_TO_HOME,
-                            "TouchInteractionService.onInputEvent:isInSwipeUpTouchRegion");
-                }
                 // Clone the previous gesture state since onConsumerAboutToBeSwitched might trigger
                 // onConsumerInactive and wipe the previous gesture state
                 GestureState prevGestureState = new GestureState(mGestureState);
@@ -678,9 +656,6 @@ public class TouchInteractionService extends Service implements PluginListener<O
 
     private InputConsumer newConsumer(GestureState previousGestureState,
             GestureState newGestureState, MotionEvent event) {
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.NO_SWIPE_TO_HOME, "newConsumer");
-        }
         boolean canStartSystemGesture = mDeviceState.canStartSystemGesture();
 
         if (!mDeviceState.isUserUnlocked()) {
@@ -692,9 +667,6 @@ public class TouchInteractionService extends Service implements PluginListener<O
                 return mResetGestureInputConsumer;
             }
         }
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.NO_SWIPE_TO_HOME, "newConsumer:user is unlocked");
-        }
 
         // When there is an existing recents animation running, bypass systemState check as this is
         // a followup gesture and the first gesture started in a valid system state.
diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
index 1bb8e96aa9..ac3fb2731d 100644
--- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
+++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
@@ -140,10 +140,6 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity, RecentsSta
         // as well. This tile is never shown as we have setCurrentTaskHidden, but allows use to
         // track the index of the next task appropriately, as if we are switching on any other app.
         if (mHomeTaskInfo != null && mHomeTaskInfo.taskId == mRunningTaskId && !tasks.isEmpty()) {
-            if (TestProtocol.sDebugTracing) {
-                Log.d(TestProtocol.GET_RECENTS_FAILED,
-                        "FallbackRecentsView.applyLoadPlan: running task is home");
-            }
             // Check if the task list has running task
             boolean found = false;
             for (Task t : tasks) {
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 59588325fd..904207678d 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1060,12 +1060,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     }
 
     protected void applyLoadPlan(ArrayList<Task> tasks) {
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.GET_RECENTS_FAILED, "applyLoadPlan: taskCount=" + tasks.size());
-            for (Task t : tasks) {
-                Log.d(TestProtocol.GET_RECENTS_FAILED, "\t" + t);
-            }
-        }
         if (mPendingAnimation != null) {
             mPendingAnimation.addEndListener(success -> applyLoadPlan(tasks));
             return;
@@ -1127,11 +1121,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         resetTaskVisuals();
         onTaskStackUpdated();
         updateEnabledOverlays();
-
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.GET_RECENTS_FAILED, "applyLoadPlan: taskViewCount="
-                    + getTaskViewCount());
-        }
     }
 
     private boolean isModal() {
@@ -1152,12 +1141,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     }
 
     public int getTaskViewCount() {
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.GET_RECENTS_FAILED, "getTaskViewCount:"
-                    + " numChildren=" + getChildCount()
-                    + " start=" + mTaskViewStartIndex
-                    + " clearAll=" + indexOfChild(mClearAllButton));
-        }
         int taskViewCount = getChildCount() - mTaskViewStartIndex;
         if (indexOfChild(mClearAllButton) != -1) {
             taskViewCount--;
diff --git a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
index f93d87c8c3..b6b7f500de 100644
--- a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
+++ b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
@@ -178,13 +178,13 @@ public class FallbackRecentsTest {
     protected <T> T getFromRecents(Function<RecentsActivity, T> f) {
         if (!TestHelpers.isInLauncherProcess()) return null;
         if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.GET_RECENTS_FAILED, "getFromRecents");
+            Log.d(TestProtocol.FALLBACK_ACTIVITY_NO_SET, "getFromRecents");
         }
         Object[] result = new Object[1];
         Wait.atMost("Failed to get from recents", () -> MAIN_EXECUTOR.submit(() -> {
             RecentsActivity activity = RecentsActivity.ACTIVITY_TRACKER.getCreatedActivity();
             if (TestProtocol.sDebugTracing) {
-                Log.d(TestProtocol.GET_RECENTS_FAILED, "activity=" + activity);
+                Log.d(TestProtocol.FALLBACK_ACTIVITY_NO_SET, "activity=" + activity);
             }
             if (activity == null) {
                 return false;
@@ -212,10 +212,6 @@ public class FallbackRecentsTest {
 
         BaseOverview overview = mLauncher.getBackground().switchToOverview();
         executeOnRecents(recents -> {
-            if (TestProtocol.sDebugTracing) {
-                Log.d(TestProtocol.GET_RECENTS_FAILED, "isLoading=" +
-                        recents.<RecentsView>getOverviewPanel().isLoadingTasks());
-            }
             assertTrue("Don't have at least 3 tasks", getTaskCount(recents) >= 3);
         });
 
diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
index a700e16d64..a5038a1fb0 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
@@ -189,12 +189,10 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
     @NavigationModeSwitch
     @PortraitLandscape
     public void testSwitchToOverview() throws Exception {
-        Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "testSwitchToOverview");
         assertNotNull("Workspace.switchToOverview() returned null",
                 mLauncher.pressHome().switchToOverview());
         assertTrue("Launcher internal state didn't switch to Overview",
                 isInState(() -> LauncherState.OVERVIEW));
-        Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "testSwitchToOverview finished");
     }
 
     @Test
diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index 7836fa384b..318dde1ecc 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -369,10 +369,6 @@ public class InvariantDeviceProfile {
     }
 
     private void onConfigChanged(Context context) {
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "IDP.onConfigChanged");
-        }
-
         // Re-init grid
         String gridName = getCurrentGridName(context);
         initGrid(context, gridName);
@@ -527,11 +523,6 @@ public class InvariantDeviceProfile {
         float availableWidth = config.screenWidthDp * res.getDisplayMetrics().density;
         float availableHeight = config.screenHeightDp * res.getDisplayMetrics().density;
 
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED,
-                    "getDeviceProfile: orientation=" + config.orientation
-                            + " size=" + availableWidth + "x" + availableHeight);
-        }
         DeviceProfile bestMatch = supportedProfiles.get(0);
         float minDiff = Float.MAX_VALUE;
 
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 5896f5a4de..92d1b11ded 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -554,21 +554,12 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
             onIdpChanged(mDeviceProfile.inv);
         }
 
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "onConfigurationChanged: diff=" + diff);
-            Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "newConfig=" + newConfig);
-            Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "oldConfig=" + mOldConfig);
-        }
-
         mOldConfig.setTo(newConfig);
         super.onConfigurationChanged(newConfig);
     }
 
     @Override
     public void onIdpChanged(InvariantDeviceProfile idp) {
-        if (TestProtocol.sDebugTracing) {
-            Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "onIdpChanged");
-        }
         initDeviceProfile(idp);
         dispatchDeviceProfileChanged();
         reapplyUi();
diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java
index 3296ea51f6..4012e89a9a 100644
--- a/src/com/android/launcher3/testing/TestProtocol.java
+++ b/src/com/android/launcher3/testing/TestProtocol.java
@@ -109,10 +109,6 @@ public final class TestProtocol {
     public static final String REQUEST_MOCK_SENSOR_ROTATION = "mock-sensor-rotation";
 
     public static final String PERMANENT_DIAG_TAG = "TaplTarget";
-    public static final String LAUNCHER_NOT_TRANSPOSED = "b/185820525";
-    public static final String NO_SWIPE_TO_HOME = "b/158017601";
     public static final String WORK_PROFILE_REMOVED = "b/159671700";
-    public static final String TIS_NO_EVENTS = "b/180915942";
-    public static final String GET_RECENTS_FAILED = "b/177472267";
-    public static final String TWO_BUTTON_NORMAL_NOT_OVERVIEW = "b/177316094";
+    public static final String FALLBACK_ACTIVITY_NO_SET = "b/181019015";
 }
diff --git a/tests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java b/tests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java
index 6c68daa8c1..8f2d5283ee 100644
--- a/tests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java
+++ b/tests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java
@@ -55,23 +55,19 @@ class PortraitLandscapeRunner implements TestRule {
             }
 
             private void evaluateInPortrait() throws Throwable {
-                Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "evaluateInPortrait");
                 mTest.mDevice.setOrientationNatural();
                 mTest.mLauncher.setExpectedRotation(Surface.ROTATION_0);
                 AbstractLauncherUiTest.checkDetectedLeaks(mTest.mLauncher);
                 base.evaluate();
                 mTest.getDevice().pressHome();
-                Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "evaluateInPortrait finished");
             }
 
             private void evaluateInLandscape() throws Throwable {
-                Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "evaluateInLandscape");
                 mTest.mDevice.setOrientationLeft();
                 mTest.mLauncher.setExpectedRotation(Surface.ROTATION_90);
                 AbstractLauncherUiTest.checkDetectedLeaks(mTest.mLauncher);
                 base.evaluate();
                 mTest.getDevice().pressHome();
-                Log.d(TestProtocol.LAUNCHER_NOT_TRANSPOSED, "evaluateInLandscape finished");
             }
         };
     }
-- 
GitLab


From 1ac7b8352134c264ad8a385714c596608d4b1725 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sun, 9 May 2021 10:49:37 -0700
Subject: [PATCH 1113/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I7dd72869281cae2bb6d5c40899856fec566a7670
---
 quickstep/res/values-en-rAU/strings.xml | 12 ++++--------
 quickstep/res/values-en-rCA/strings.xml | 12 ++++--------
 quickstep/res/values-en-rGB/strings.xml | 12 ++++--------
 quickstep/res/values-en-rIN/strings.xml | 12 ++++--------
 quickstep/res/values-uz/strings.xml     | 12 ++++--------
 5 files changed, 20 insertions(+), 40 deletions(-)

diff --git a/quickstep/res/values-en-rAU/strings.xml b/quickstep/res/values-en-rAU/strings.xml
index 1040a0361b..5aae288631 100644
--- a/quickstep/res/values-en-rAU/strings.xml
+++ b/quickstep/res/values-en-rAU/strings.xml
@@ -74,14 +74,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Try again"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Nice!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Ready!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Swipe up to go home"</string>
+    <string name="allset_description" msgid="6350320429953234580">"You’re ready to start using your phone"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Navigation settings for accessibility"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Share"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
diff --git a/quickstep/res/values-en-rCA/strings.xml b/quickstep/res/values-en-rCA/strings.xml
index 1040a0361b..5aae288631 100644
--- a/quickstep/res/values-en-rCA/strings.xml
+++ b/quickstep/res/values-en-rCA/strings.xml
@@ -74,14 +74,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Try again"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Nice!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Ready!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Swipe up to go home"</string>
+    <string name="allset_description" msgid="6350320429953234580">"You’re ready to start using your phone"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Navigation settings for accessibility"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Share"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
diff --git a/quickstep/res/values-en-rGB/strings.xml b/quickstep/res/values-en-rGB/strings.xml
index 1040a0361b..5aae288631 100644
--- a/quickstep/res/values-en-rGB/strings.xml
+++ b/quickstep/res/values-en-rGB/strings.xml
@@ -74,14 +74,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Try again"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Nice!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Ready!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Swipe up to go home"</string>
+    <string name="allset_description" msgid="6350320429953234580">"You’re ready to start using your phone"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Navigation settings for accessibility"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Share"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
diff --git a/quickstep/res/values-en-rIN/strings.xml b/quickstep/res/values-en-rIN/strings.xml
index 1040a0361b..5aae288631 100644
--- a/quickstep/res/values-en-rIN/strings.xml
+++ b/quickstep/res/values-en-rIN/strings.xml
@@ -74,14 +74,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Try again"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Nice!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Ready!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Swipe up to go home"</string>
+    <string name="allset_description" msgid="6350320429953234580">"You’re ready to start using your phone"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Navigation settings for accessibility"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Share"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
diff --git a/quickstep/res/values-uz/strings.xml b/quickstep/res/values-uz/strings.xml
index 4ddcae846e..8ca3898234 100644
--- a/quickstep/res/values-uz/strings.xml
+++ b/quickstep/res/values-uz/strings.xml
@@ -74,14 +74,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Qayta urinish"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Yaxshi!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Darslik: <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Hammasi tayyor!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Boshiga qaytish uchun tepaga suring"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Telefoningiz xizmatga tayyor"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Maxsus imkoniyatlar uchun navigatsiya sozlamalari"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Ulashish"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Skrinshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Bu amal ilova yoki tashkilotingiz tomonidan taqiqlangan"</string>
-- 
GitLab


From 14980fe0dddaf36521e2f3b8ffb0fd1ee3d0ec93 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sun, 9 May 2021 10:50:07 -0700
Subject: [PATCH 1114/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I67cae1b3cc2fd0e16750dd31f762b9d480792595
---
 go/quickstep/res/values-en-rAU/strings.xml | 8 ++++++++
 go/quickstep/res/values-en-rCA/strings.xml | 8 ++++++++
 go/quickstep/res/values-en-rGB/strings.xml | 8 ++++++++
 go/quickstep/res/values-en-rIN/strings.xml | 8 ++++++++
 go/quickstep/res/values-uz/strings.xml     | 8 ++++++++
 5 files changed, 40 insertions(+)
 create mode 100644 go/quickstep/res/values-en-rAU/strings.xml
 create mode 100644 go/quickstep/res/values-en-rCA/strings.xml
 create mode 100644 go/quickstep/res/values-en-rGB/strings.xml
 create mode 100644 go/quickstep/res/values-en-rIN/strings.xml
 create mode 100644 go/quickstep/res/values-uz/strings.xml

diff --git a/go/quickstep/res/values-en-rAU/strings.xml b/go/quickstep/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000000..3a609b6729
--- /dev/null
+++ b/go/quickstep/res/values-en-rAU/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Share app"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Listen"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-en-rCA/strings.xml b/go/quickstep/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000000..3a609b6729
--- /dev/null
+++ b/go/quickstep/res/values-en-rCA/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Share app"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Listen"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-en-rGB/strings.xml b/go/quickstep/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000000..3a609b6729
--- /dev/null
+++ b/go/quickstep/res/values-en-rGB/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Share app"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Listen"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-en-rIN/strings.xml b/go/quickstep/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000000..3a609b6729
--- /dev/null
+++ b/go/quickstep/res/values-en-rIN/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Share app"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Listen"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-uz/strings.xml b/go/quickstep/res/values-uz/strings.xml
new file mode 100644
index 0000000000..4e375c7e71
--- /dev/null
+++ b/go/quickstep/res/values-uz/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Ilovani ulashish"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Tinglash"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Tarjimon"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
-- 
GitLab


From 8fa997f2b037e16614b89b773f1fc08f4baa624b Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sun, 9 May 2021 10:50:52 -0700
Subject: [PATCH 1115/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I0c77f5561818d4516e821e7f11d01178e8272df1
---
 res/values-en-rAU/strings.xml | 3 +--
 res/values-en-rCA/strings.xml | 3 +--
 res/values-en-rGB/strings.xml | 3 +--
 res/values-en-rIN/strings.xml | 3 +--
 res/values-uz/strings.xml     | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 8dd37bc059..5af3e7dcea 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> items"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> or more items"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Wallpapers"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Wallpaper &amp; style"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Home settings"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Disabled by your admin"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Allow Home screen rotation"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 8dd37bc059..5af3e7dcea 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> items"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> or more items"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Wallpapers"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Wallpaper &amp; style"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Home settings"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Disabled by your admin"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Allow Home screen rotation"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 8dd37bc059..5af3e7dcea 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> items"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> or more items"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Wallpapers"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Wallpaper &amp; style"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Home settings"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Disabled by your admin"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Allow Home screen rotation"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 8dd37bc059..5af3e7dcea 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> items"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> or more items"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Wallpapers"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Wallpaper &amp; style"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Home settings"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Disabled by your admin"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Allow Home screen rotation"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 52b06ac913..7f0ced4fb8 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Jild: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> fayllar"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Jild: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> va undan ortiq fayllar"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fon rasmlari"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Fon rasmi va stili"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Bosh ekran sozlamalari"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Administrator tomonidan o‘chirilgan"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Bosh ekranni burishga ruxsat"</string>
-- 
GitLab


From a7066cb6ff99fe037eab8294878f564fd6106bed Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Mon, 10 May 2021 15:48:36 +0100
Subject: [PATCH 1116/1664] Use same interpolator for fullscreen scale and
 translation

Fixes: 187690450
Test: Swipe up from quick switch, tasks should not overlap
Change-Id: Ib2596d982974b7a1a9acbb02026e8d920e7fea25
---
 quickstep/src/com/android/quickstep/views/TaskView.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 6f3aade68b..4a07748644 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -32,7 +32,6 @@ import static com.android.launcher3.LauncherState.OVERVIEW_SPLIT_SELECT;
 import static com.android.launcher3.Utilities.comp;
 import static com.android.launcher3.Utilities.getDescendantCoordRelativeToAncestor;
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
-import static com.android.launcher3.anim.Interpolators.EXAGGERATED_EASE;
 import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_ICON_TAP_OR_LONGPRESS;
@@ -65,6 +64,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
 import android.view.accessibility.AccessibilityNodeInfo;
+import android.view.animation.Interpolator;
 import android.widget.FrameLayout;
 import android.widget.Toast;
 
@@ -147,6 +147,9 @@ public class TaskView extends FrameLayout implements Reusable {
 
     public static final long SCALE_ICON_DURATION = 120;
     private static final long DIM_ANIM_DURATION = 700;
+
+    private static final Interpolator FULLSCREEN_INTERPOLATOR = ACCEL_DEACCEL;
+
     /**
      * This technically can be a vanilla {@link TouchDelegate} class, however that class requires
      * setting the touch bounds at construction, so we'd repeatedly be created many instances
@@ -982,7 +985,7 @@ public class TaskView extends FrameLayout implements Reusable {
 
     private void applyScale() {
         float scale = 1;
-        float fullScreenProgress = EXAGGERATED_EASE.getInterpolation(mFullscreenProgress);
+        float fullScreenProgress = FULLSCREEN_INTERPOLATOR.getInterpolation(mFullscreenProgress);
         scale *= Utilities.mapRange(fullScreenProgress, 1f, mFullscreenScale);
         setScaleX(scale);
         setScaleY(scale);
@@ -1425,7 +1428,7 @@ public class TaskView extends FrameLayout implements Reusable {
     }
 
     private float getFullscreenTrans(float endTranslation) {
-        float progress = ACCEL_DEACCEL.getInterpolation(mFullscreenProgress);
+        float progress = FULLSCREEN_INTERPOLATOR.getInterpolation(mFullscreenProgress);
         return Utilities.mapRange(progress, 0, endTranslation);
     }
 
-- 
GitLab


From f20a4bd9a93e7d827b8c3db858e4dc1fa9b9d56c Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Mon, 19 Apr 2021 21:37:08 -0700
Subject: [PATCH 1117/1664] Finish the recents animation when the phone goes to
 sleep

Fixes: 169988381
Test: manual
Change-Id: I62527ef46009a1417e67637c512b3a2fc005bcd6
---
 .../launcher3/BaseQuickstepLauncher.java      | 10 ++++++++++
 src/com/android/launcher3/Launcher.java       | 20 +++++++++++--------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 2aac877804..6966fb65dd 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -23,6 +23,7 @@ import static com.android.launcher3.LauncherState.NO_OFFSET;
 import static com.android.launcher3.util.DisplayController.CHANGE_ACTIVE_SCREEN;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
+import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY;
 
 import android.animation.AnimatorSet;
@@ -189,6 +190,15 @@ public abstract class BaseQuickstepLauncher extends Launcher
                 () -> ActivityManagerWrapper.getInstance().invalidateHomeTaskSnapshot(this));
     }
 
+    @Override
+    protected void onScreenOff() {
+        super.onScreenOff();
+        if (LIVE_TILE.get()) {
+            RecentsView recentsView = getOverviewPanel();
+            recentsView.finishRecentsAnimation(true /* toRecents */, null);
+        }
+    }
+
     @Override
     public void startIntentSenderForResult(IntentSender intent, int requestCode,
             Intent fillInIntent, int flagsMask, int flagsValues, int extraFlags, Bundle options) {
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 5896f5a4de..e5190fd834 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1346,14 +1346,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
     private final BroadcastReceiver mScreenOffReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            // Reset AllApps to its initial state only if we are not in the middle of
-            // processing a multi-step drop
-            if (mPendingRequestArgs == null) {
-                if (!isInState(NORMAL)) {
-                    onUiChangedWhileSleeping();
-                }
-                mStateManager.goToState(NORMAL);
-            }
+            onScreenOff();
         }
     };
 
@@ -1923,6 +1916,17 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         }
     }
 
+    protected void onScreenOff() {
+        // Reset AllApps to its initial state only if we are not in the middle of
+        // processing a multi-step drop
+        if (mPendingRequestArgs == null) {
+            if (!isInState(NORMAL)) {
+                onUiChangedWhileSleeping();
+            }
+            mStateManager.goToState(NORMAL);
+        }
+    }
+
     @TargetApi(Build.VERSION_CODES.M)
     @Override
     protected boolean onErrorStartingShortcut(Intent intent, ItemInfo info) {
-- 
GitLab


From a02eddc144f255f0d3ea954f21a4c55cfe941c04 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Thu, 29 Apr 2021 00:36:06 +0100
Subject: [PATCH 1118/1664] Handle config changes in Launcher

- This is practically a revert to http://ag/c/13687966/5 and refactored to use DisplayController.DisplayInfoChangeListener
- Make Launcher handle size and density change so transition is less janky when screen size changes
- Added fix in RecentsView to update state and TaskView when display profile changes
- Removed 720dp specific resoureces
- Removed unused widget_section_indent
- Removed unnecessary all_apps_background_canvas 600dp override that is not needed in AllApps+
- Moved remaining dp specific into DeviceProfile
- Simplified allowRotation logic to use single variable in DeviceProfile to determine if allow rotation is enabled by default

Fixes: 180803696
Test: manual
Change-Id: Iea0a7d1a0e14dc3613152dd3b3887450a2e1fc2f
---
 AndroidManifest.xml                           |  2 +-
 go/AndroidManifest-launcher.xml               |  2 +-
 quickstep/AndroidManifest-launcher.xml        |  2 +-
 quickstep/AndroidManifest.xml                 |  2 +-
 .../res/xml/indexable_launcher_prefs.xml      |  2 +-
 .../quickstep/util/RecentsOrientedState.java  | 52 ++++++++++----
 .../quickstep/util/TaskViewSimulator.java     |  1 +
 .../android/quickstep/views/RecentsView.java  | 65 +++++++++++-------
 res/values-sw600dp/config.xml                 |  3 -
 res/values-sw600dp/dimens.xml                 |  9 +--
 res/values-sw720dp/config.xml                 |  6 --
 res/values-sw720dp/dimens.xml                 | 28 --------
 res/values-sw720dp/styles.xml                 | 29 --------
 res/values/config.xml                         |  1 -
 res/values/dimens.xml                         |  1 -
 res/xml/launcher_preferences.xml              |  2 +-
 .../android/launcher3/ButtonDropTarget.java   |  4 +-
 src/com/android/launcher3/DeviceProfile.java  | 23 ++++++-
 src/com/android/launcher3/DropTargetBar.java  |  2 +
 .../dragndrop/FlingToDeleteHelper.java        |  9 ++-
 .../launcher3/settings/SettingsActivity.java  |  9 ++-
 .../launcher3/states/RotationHelper.java      | 68 +++++++++++--------
 .../WidgetsListTableViewHolderBinder.java     |  7 --
 tests/AndroidManifest-common.xml              |  2 +-
 24 files changed, 160 insertions(+), 171 deletions(-)
 delete mode 100644 res/values-sw600dp/config.xml
 delete mode 100644 res/values-sw720dp/config.xml
 delete mode 100644 res/values-sw720dp/dimens.xml
 delete mode 100644 res/values-sw720dp/styles.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1fad72db77..8066816e89 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -49,7 +49,7 @@
             android:stateNotNeeded="true"
             android:windowSoftInputMode="adjustPan"
             android:screenOrientation="unspecified"
-            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout"
+            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize|density"
             android:resizeableActivity="true"
             android:resumeWhilePausing="true"
             android:taskAffinity=""
diff --git a/go/AndroidManifest-launcher.xml b/go/AndroidManifest-launcher.xml
index d2575b6c68..6a8f715bb2 100644
--- a/go/AndroidManifest-launcher.xml
+++ b/go/AndroidManifest-launcher.xml
@@ -49,7 +49,7 @@
             android:stateNotNeeded="true"
             android:windowSoftInputMode="adjustPan"
             android:screenOrientation="unspecified"
-            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|uiMode"
+            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize|density|uiMode"
             android:resizeableActivity="true"
             android:resumeWhilePausing="true"
             android:taskAffinity=""
diff --git a/quickstep/AndroidManifest-launcher.xml b/quickstep/AndroidManifest-launcher.xml
index 7fe9b08f28..6808222258 100644
--- a/quickstep/AndroidManifest-launcher.xml
+++ b/quickstep/AndroidManifest-launcher.xml
@@ -49,7 +49,7 @@
             android:stateNotNeeded="true"
             android:windowSoftInputMode="adjustPan"
             android:screenOrientation="unspecified"
-            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout"
+            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize|density"
             android:resizeableActivity="true"
             android:resumeWhilePausing="true"
             android:taskAffinity=""
diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml
index 7ab09c5ce9..bf9059f1c4 100644
--- a/quickstep/AndroidManifest.xml
+++ b/quickstep/AndroidManifest.xml
@@ -71,7 +71,7 @@
              android:stateNotNeeded="true"
              android:theme="@style/LauncherTheme"
              android:screenOrientation="unspecified"
-             android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout"
+             android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize|density"
              android:resizeableActivity="true"
              android:resumeWhilePausing="true"
              android:taskAffinity=""/>
diff --git a/quickstep/res/xml/indexable_launcher_prefs.xml b/quickstep/res/xml/indexable_launcher_prefs.xml
index c7e864fe00..b4740e5b51 100644
--- a/quickstep/res/xml/indexable_launcher_prefs.xml
+++ b/quickstep/res/xml/indexable_launcher_prefs.xml
@@ -26,7 +26,7 @@
         android:key="pref_allowRotation"
         android:title="@string/allow_rotation_title"
         android:summary="@string/allow_rotation_desc"
-        android:defaultValue="@bool/allow_rotation"
+        android:defaultValue="false"
         android:persistent="true" />
 
 </PreferenceScreen>
diff --git a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
index d164c8ce3e..e983f461ee 100644
--- a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
+++ b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
@@ -16,7 +16,6 @@
 
 package com.android.quickstep.util;
 
-import static android.util.DisplayMetrics.DENSITY_DEVICE_STABLE;
 import static android.view.OrientationEventListener.ORIENTATION_UNKNOWN;
 import static android.view.Surface.ROTATION_0;
 import static android.view.Surface.ROTATION_180;
@@ -31,7 +30,6 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.content.res.Resources;
 import android.graphics.Matrix;
 import android.graphics.Point;
 import android.graphics.PointF;
@@ -46,7 +44,6 @@ import androidx.annotation.NonNull;
 
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile;
-import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.PagedOrientationHandler;
@@ -67,7 +64,8 @@ import java.util.function.IntConsumer;
  * This class has initial default state assuming the device and foreground app have
  * no ({@link Surface#ROTATION_0} rotation.
  */
-public final class RecentsOrientedState implements SharedPreferences.OnSharedPreferenceChangeListener {
+public final class RecentsOrientedState implements
+        SharedPreferences.OnSharedPreferenceChangeListener {
 
     private static final String TAG = "RecentsOrientedState";
     private static final boolean DEBUG = false;
@@ -125,6 +123,7 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
 
     private int mFlags;
     private int mPreviousRotation = ROTATION_0;
+    private boolean mListenersInitialized = false;
 
     // Combined int which encodes the full state.
     private int mStateId = 0;
@@ -152,18 +151,31 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
         mFlags = sizeStrategy.rotationSupportedByActivity
                 ? FLAG_MULTIPLE_ORIENTATION_SUPPORTED_BY_ACTIVITY : 0;
 
-        Resources res = context.getResources();
-        int originalSmallestWidth = res.getConfiguration().smallestScreenWidthDp
-                * res.getDisplayMetrics().densityDpi / DENSITY_DEVICE_STABLE;
-        if (originalSmallestWidth < 600 && !mContext.getResources().getBoolean(
-                R.bool.allow_rotation)) {
-            mFlags |= FLAG_MULTIPLE_ORIENTATION_SUPPORTED_BY_DENSITY;
-        }
         mFlags |= FLAG_SWIPE_UP_NOT_RUNNING;
         mSettingsCache = SettingsCache.INSTANCE.get(mContext);
         initFlags();
     }
 
+    /**
+     * Sets the device profile for the current state.
+     */
+    public void setDeviceProfile(DeviceProfile deviceProfile) {
+        boolean oldMultipleOrientationsSupported = isMultipleOrientationSupportedByDevice();
+        setFlag(FLAG_MULTIPLE_ORIENTATION_SUPPORTED_BY_DENSITY, !deviceProfile.allowRotation);
+        if (mListenersInitialized) {
+            boolean newMultipleOrientationsSupported = isMultipleOrientationSupportedByDevice();
+            // If isMultipleOrientationSupportedByDevice is changed, init or destroy listeners
+            // accordingly.
+            if (newMultipleOrientationsSupported != oldMultipleOrientationsSupported) {
+                if (newMultipleOrientationsSupported) {
+                    initMultipleOrientationListeners();
+                } else {
+                    destroyMultipleOrientationListeners();
+                }
+            }
+        }
+    }
+
     /**
      * Sets the rotation for the recents activity, which could affect the appearance of task view.
      * @see #update(int, int)
@@ -287,14 +299,24 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
         updateHomeRotationSetting();
     }
 
+    private void initMultipleOrientationListeners() {
+        mSharedPrefs.registerOnSharedPreferenceChangeListener(this);
+        mSettingsCache.register(ROTATION_SETTING_URI, mRotationChangeListener);
+    }
+
+    private void destroyMultipleOrientationListeners() {
+        mSharedPrefs.unregisterOnSharedPreferenceChangeListener(this);
+        mSettingsCache.unregister(ROTATION_SETTING_URI, mRotationChangeListener);
+    }
+
     /**
      * Initializes any system values and registers corresponding change listeners. It must be
      * paired with {@link #destroyListeners()} call
      */
     public void initListeners() {
+        mListenersInitialized = true;
         if (isMultipleOrientationSupportedByDevice()) {
-            mSharedPrefs.registerOnSharedPreferenceChangeListener(this);
-            mSettingsCache.register(ROTATION_SETTING_URI, mRotationChangeListener);
+            initMultipleOrientationListeners();
         }
         initFlags();
     }
@@ -303,9 +325,9 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
      * Unregisters any previously registered listeners.
      */
     public void destroyListeners() {
+        mListenersInitialized = false;
         if (isMultipleOrientationSupportedByDevice()) {
-            mSharedPrefs.unregisterOnSharedPreferenceChangeListener(this);
-            mSettingsCache.unregister(ROTATION_SETTING_URI, mRotationChangeListener);
+            destroyMultipleOrientationListeners();
         }
         setRotationWatcherEnabled(false);
     }
diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index f578ad1741..b15bbf3ed2 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -112,6 +112,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
     public void setDp(DeviceProfile dp) {
         mDp = dp;
         mLayoutValid = false;
+        mOrientationState.setDeviceProfile(dp);
     }
 
     /**
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 59588325fd..dcef7cf935 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1232,13 +1232,51 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     @Override
     public void setInsets(Rect insets) {
         mInsets.set(insets);
-        resetPaddingFromTaskSize();
+
+        // Update DeviceProfile dependant state.
         DeviceProfile dp = mActivity.getDeviceProfile();
+        setOverviewGridEnabled(
+                mActivity.getStateManager().getState().displayOverviewTasksAsGrid(dp));
+
+        // Propagate DeviceProfile change event.
         mLiveTileTaskViewSimulator.setDp(dp);
         mActionsView.setDp(dp);
+        mOrientationState.setDeviceProfile(dp);
+
+        // Update RecentsView adn TaskView's DeviceProfile dependent layout.
+        updateOrientationHandler();
     }
 
-    private void resetPaddingFromTaskSize() {
+    private void updateOrientationHandler() {
+        // Handle orientation changes.
+        mOrientationHandler = mOrientationState.getOrientationHandler();
+        mIsRtl = mOrientationHandler.getRecentsRtlSetting(getResources());
+        setLayoutDirection(mIsRtl
+                ? View.LAYOUT_DIRECTION_RTL
+                : View.LAYOUT_DIRECTION_LTR);
+        mClearAllButton.setLayoutDirection(mIsRtl
+                ? View.LAYOUT_DIRECTION_LTR
+                : View.LAYOUT_DIRECTION_RTL);
+        mClearAllButton.setRotation(mOrientationHandler.getDegreesRotated());
+        mActivity.getDragLayer().recreateControllers();
+        boolean isInLandscape = mOrientationState.getTouchRotation() != ROTATION_0
+                || mOrientationState.getRecentsActivityRotation() != ROTATION_0;
+        mActionsView.updateHiddenFlags(HIDDEN_NON_ZERO_ROTATION,
+                !mOrientationState.canRecentsActivityRotate() && isInLandscape);
+
+        // Update TaskView's DeviceProfile dependent layout.
+        updateChildTaskOrientations();
+
+        // Recalculate DeviceProfile dependent layout.
+        updateSizeAndPadding();
+
+        requestLayout();
+        // Reapply the current page to update page scrolls.
+        setCurrentPage(mCurrentPage);
+    }
+
+    // Update task size and padding that are dependent on DeviceProfile and insets.
+    private void updateSizeAndPadding() {
         DeviceProfile dp = mActivity.getDeviceProfile();
         getTaskSize(mTempRect);
         mTaskWidth = mTempRect.width();
@@ -2554,28 +2592,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         }
     }
 
-    private void updateOrientationHandler() {
-        mOrientationHandler = mOrientationState.getOrientationHandler();
-        mIsRtl = mOrientationHandler.getRecentsRtlSetting(getResources());
-        setLayoutDirection(mIsRtl
-                ? View.LAYOUT_DIRECTION_RTL
-                : View.LAYOUT_DIRECTION_LTR);
-        mClearAllButton.setLayoutDirection(mIsRtl
-                ? View.LAYOUT_DIRECTION_LTR
-                : View.LAYOUT_DIRECTION_RTL);
-        mClearAllButton.setRotation(mOrientationHandler.getDegreesRotated());
-        mActivity.getDragLayer().recreateControllers();
-        boolean isInLandscape = mOrientationState.getTouchRotation() != ROTATION_0
-                || mOrientationState.getRecentsActivityRotation() != ROTATION_0;
-        mActionsView.updateHiddenFlags(HIDDEN_NON_ZERO_ROTATION,
-                !mOrientationState.canRecentsActivityRotate() && isInLandscape);
-        updateChildTaskOrientations();
-        resetPaddingFromTaskSize();
-        requestLayout();
-        // Reapply the current page to update page scrolls.
-        setCurrentPage(mCurrentPage);
-    }
-
     public RecentsOrientedState getPagedViewOrientedState() {
         return mOrientationState;
     }
@@ -3656,7 +3672,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     public void onSecondaryWindowBoundsChanged() {
         // Invalidate the task view size
         setInsets(mInsets);
-        requestLayout();
     }
 
     /**
diff --git a/res/values-sw600dp/config.xml b/res/values-sw600dp/config.xml
deleted file mode 100644
index 09bdaafc1d..0000000000
--- a/res/values-sw600dp/config.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <bool name="allow_rotation">true</bool>
-</resources>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index ead666cf7a..47a88f2263 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -3,7 +3,7 @@
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
+     You may obtain a copy of the License at`
 
           http://www.apache.org/licenses/LICENSE-2.0
 
@@ -15,13 +15,6 @@
 -->
 
 <resources>
-<!-- All Apps -->
-    <dimen name="all_apps_background_canvas_width">850dp</dimen>
-    <dimen name="all_apps_background_canvas_height">525dp</dimen>
-
-<!-- Widget tray -->
-    <dimen name="widget_section_indent">56dp</dimen>
-
 <!-- DragController -->
     <dimen name="drag_flingToDeleteMinVelocity">-1000dp</dimen>
 </resources>
diff --git a/res/values-sw720dp/config.xml b/res/values-sw720dp/config.xml
deleted file mode 100644
index 33fc553a84..0000000000
--- a/res/values-sw720dp/config.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resources>
-
-<!-- All Apps & Widgets -->
-    <!-- Out of 100, the percent to shrink the workspace during spring loaded mode. -->
-    <integer name="config_workspaceSpringLoadShrinkPercentage">90</integer>
-</resources>
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
deleted file mode 100644
index 691219af63..0000000000
--- a/res/values-sw720dp/dimens.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <!-- All Apps -->
-    <dimen name="all_apps_empty_search_message_top_offset">64dp</dimen>
-    <dimen name="all_apps_empty_search_bg_top_offset">180dp</dimen>
-
-    <!-- Fast scroll -->
-    <dimen name="fastscroll_popup_width">75dp</dimen>
-    <dimen name="fastscroll_popup_height">62dp</dimen>
-    <dimen name="fastscroll_popup_padding">13dp</dimen>
-    <dimen name="fastscroll_popup_text_size">32dp</dimen>
-
-</resources>
diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml
deleted file mode 100644
index c1e6ecace7..0000000000
--- a/res/values-sw720dp/styles.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-* Copyright (C) 2008 The Android Open Source Project
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
--->
-
-<resources>
-    <!-- Workspace -->
-    <style name="DropTargetButton" parent="DropTargetButtonBase">
-        <item name="android:paddingLeft">60dp</item>
-        <item name="android:paddingRight">60dp</item>
-        <item name="android:shadowDx">0.0</item>
-        <item name="android:shadowDy">0.0</item>
-        <item name="android:shadowRadius">2.0</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/res/values/config.xml b/res/values/config.xml
index 9ad12245be..7623623934 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -1,7 +1,6 @@
 <resources>
     <!-- Miscellaneous -->
     <bool name="config_largeHeap">false</bool>
-    <bool name="allow_rotation">false</bool>
 
     <integer name="extracted_color_gradient_alpha">153</integer>
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index fe0b11bb3f..2d7757e7ac 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -137,7 +137,6 @@
     <dimen name="widget_section_icon_size">40dp</dimen>
     <dimen name="widget_section_vertical_padding">8dp</dimen>
     <dimen name="widget_section_horizontal_padding">16dp</dimen>
-    <dimen name="widget_section_indent">0dp</dimen>
 
     <dimen name="widget_row_padding">8dp</dimen>
     <dimen name="widget_row_divider">2dp</dimen>
diff --git a/res/xml/launcher_preferences.xml b/res/xml/launcher_preferences.xml
index 8195cc1997..90de4987f5 100644
--- a/res/xml/launcher_preferences.xml
+++ b/res/xml/launcher_preferences.xml
@@ -45,7 +45,7 @@
         android:key="pref_allowRotation"
         android:title="@string/allow_rotation_title"
         android:summary="@string/allow_rotation_desc"
-        android:defaultValue="@bool/allow_rotation"
+        android:defaultValue="false"
         android:persistent="true"
         launcher:logIdOn="615"
         launcher:logIdOff="616" />
diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
index 00317f7010..af77bf882a 100644
--- a/src/com/android/launcher3/ButtonDropTarget.java
+++ b/src/com/android/launcher3/ButtonDropTarget.java
@@ -74,7 +74,6 @@ public abstract class ButtonDropTarget extends TextView
 
     protected final Launcher mLauncher;
 
-    private int mBottomDragPadding;
     protected DropTargetBar mDropTargetBar;
 
     /** Whether this drop target is active for the current drag */
@@ -103,7 +102,6 @@ public abstract class ButtonDropTarget extends TextView
         mLauncher = Launcher.getLauncher(context);
 
         Resources resources = getResources();
-        mBottomDragPadding = resources.getDimensionPixelSize(R.dimen.drop_target_drag_padding);
         mDragDistanceThreshold = resources.getDimensionPixelSize(R.dimen.drag_distanceThreshold);
     }
 
@@ -276,7 +274,7 @@ public abstract class ButtonDropTarget extends TextView
     @Override
     public void getHitRectRelativeToDragLayer(android.graphics.Rect outRect) {
         super.getHitRect(outRect);
-        outRect.bottom += mBottomDragPadding;
+        outRect.bottom += mLauncher.getDeviceProfile().dropTargetDragPaddingPx;
 
         sTempCords[0] = sTempCords[1] = 0;
         mLauncher.getDragLayer().getDescendantCoordRelativeToSelf(this, sTempCords);
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index d5860dc57d..e5ad24341b 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -16,10 +16,12 @@
 
 package com.android.launcher3;
 
+import static android.util.DisplayMetrics.DENSITY_DEVICE_STABLE;
 import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION;
 
 import static com.android.launcher3.ResourceUtils.pxFromDp;
 import static com.android.launcher3.Utilities.dpiFromPx;
+import static com.android.launcher3.util.WindowManagerCompat.MIN_TABLET_WIDTH;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -61,6 +63,7 @@ public class DeviceProfile {
     public final boolean isPhone;
     public final boolean transposeLayoutWithOrientation;
     public final boolean isTwoPanels;
+    public final boolean allowRotation;
 
     // Device properties in current orientation
     public final boolean isLandscape;
@@ -172,6 +175,8 @@ public class DeviceProfile {
 
     // Drop Target
     public int dropTargetBarSizePx;
+    public int dropTargetDragPaddingPx;
+    public int dropTargetTextSizePx;
 
     // Insets
     private final Rect mInsets = new Rect();
@@ -190,6 +195,9 @@ public class DeviceProfile {
     // How much of the bottom inset is due to Taskbar rather than other system elements.
     public int nonOverlappingTaskbarInset;
 
+    // DragController
+    public int flingToDeleteThresholdVelocity;
+
     DeviceProfile(Context context, InvariantDeviceProfile inv, Info info, WindowBounds windowBounds,
             boolean isMultiWindowMode, boolean transposeLayoutWithOrientation,
             boolean useTwoPanels) {
@@ -210,7 +218,12 @@ public class DeviceProfile {
         int nonFinalAvailableHeightPx = windowBounds.availableSize.y;
 
         mInfo = info;
-        isTablet = info.isTablet(windowBounds);
+        // If the device's pixel density was scaled (usually via settings for A11y), use the
+        // original dimensions to determine if rotation is allowed of not.
+        float originalSmallestWidth = dpiFromPx(Math.min(widthPx, heightPx), DENSITY_DEVICE_STABLE);
+        allowRotation = originalSmallestWidth >= MIN_TABLET_WIDTH;
+        // Tablet UI does not support emulated landscape.
+        isTablet = allowRotation && info.isTablet(windowBounds);
         isPhone = !isTablet;
         isTwoPanels = isTablet && useTwoPanels;
 
@@ -287,7 +300,11 @@ public class DeviceProfile {
 
         iconDrawablePaddingOriginalPx =
                 res.getDimensionPixelSize(R.dimen.dynamic_grid_icon_drawable_padding);
+
         dropTargetBarSizePx = res.getDimensionPixelSize(R.dimen.dynamic_grid_drop_target_size);
+        dropTargetDragPaddingPx = res.getDimensionPixelSize(R.dimen.drop_target_drag_padding);
+        dropTargetTextSizePx = res.getDimensionPixelSize(R.dimen.drop_target_text_size);
+
         workspaceSpringLoadedBottomSpace =
                 res.getDimensionPixelSize(R.dimen.dynamic_grid_min_spring_loaded_space);
 
@@ -354,6 +371,9 @@ public class DeviceProfile {
         }
         updateWorkspacePadding();
 
+        flingToDeleteThresholdVelocity = res.getDimensionPixelSize(
+                R.dimen.drag_flingToDeleteMinVelocity);
+
         // This is done last, after iconSizePx is calculated above.
         Path dotPath = GraphicsUtils.getShapePath(DEFAULT_DOT_SIZE);
         mDotRendererWorkSpace = new DotRenderer(iconSizePx, dotPath, DEFAULT_DOT_SIZE);
@@ -821,6 +841,7 @@ public class DeviceProfile {
         writer.println(prefix + "DeviceProfile:");
         writer.println(prefix + "\t1 dp = " + mMetrics.density + " px");
 
+        writer.println(prefix + "\tallowRotation:" + allowRotation);
         writer.println(prefix + "\tisTablet:" + isTablet);
         writer.println(prefix + "\tisPhone:" + isPhone);
         writer.println(prefix + "\ttransposeLayoutWithOrientation:"
diff --git a/src/com/android/launcher3/DropTargetBar.java b/src/com/android/launcher3/DropTargetBar.java
index c7684939db..4a1b08460b 100644
--- a/src/com/android/launcher3/DropTargetBar.java
+++ b/src/com/android/launcher3/DropTargetBar.java
@@ -25,6 +25,7 @@ import android.animation.TimeInterpolator;
 import android.content.Context;
 import android.graphics.Rect;
 import android.util.AttributeSet;
+import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewDebug;
@@ -114,6 +115,7 @@ public class DropTargetBar extends FrameLayout
         }
         setLayoutParams(lp);
         for (ButtonDropTarget button : mDropTargets) {
+            button.setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.dropTargetTextSizePx);
             button.setToolTipLocation(tooltipLocation);
         }
     }
diff --git a/src/com/android/launcher3/dragndrop/FlingToDeleteHelper.java b/src/com/android/launcher3/dragndrop/FlingToDeleteHelper.java
index 0a1aba12b5..336fced41f 100644
--- a/src/com/android/launcher3/dragndrop/FlingToDeleteHelper.java
+++ b/src/com/android/launcher3/dragndrop/FlingToDeleteHelper.java
@@ -22,6 +22,7 @@ import android.view.VelocityTracker;
 import android.view.ViewConfiguration;
 
 import com.android.launcher3.ButtonDropTarget;
+import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.DropTarget;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
@@ -35,15 +36,12 @@ public class FlingToDeleteHelper {
     private static final float MAX_FLING_DEGREES = 35f;
 
     private final Launcher mLauncher;
-    private final int mFlingToDeleteThresholdVelocity;
 
     private ButtonDropTarget mDropTarget;
     private VelocityTracker mVelocityTracker;
 
     public FlingToDeleteHelper(Launcher launcher) {
         mLauncher = launcher;
-        mFlingToDeleteThresholdVelocity = launcher.getResources()
-                .getDimensionPixelSize(R.dimen.drag_flingToDeleteMinVelocity);
     }
 
     public void recordMotionEvent(MotionEvent ev) {
@@ -91,12 +89,13 @@ public class FlingToDeleteHelper {
         mVelocityTracker.computeCurrentVelocity(1000, config.getScaledMaximumFlingVelocity());
         PointF vel = new PointF(mVelocityTracker.getXVelocity(), mVelocityTracker.getYVelocity());
         float theta = MAX_FLING_DEGREES + 1;
-        if (mVelocityTracker.getYVelocity() < mFlingToDeleteThresholdVelocity) {
+        DeviceProfile deviceProfile = mLauncher.getDeviceProfile();
+        if (mVelocityTracker.getYVelocity() < deviceProfile.flingToDeleteThresholdVelocity) {
             // Do a quick dot product test to ensure that we are flinging upwards
             PointF upVec = new PointF(0f, -1f);
             theta = getAngleBetweenVectors(vel, upVec);
         } else if (mLauncher.getDeviceProfile().isVerticalBarLayout() &&
-                mVelocityTracker.getXVelocity() < mFlingToDeleteThresholdVelocity) {
+                mVelocityTracker.getXVelocity() < deviceProfile.flingToDeleteThresholdVelocity) {
             // Remove icon is on left side instead of top, so check if we are flinging to the left.
             PointF leftVec = new PointF(-1f, 0f);
             theta = getAngleBetweenVectors(vel, leftVec);
diff --git a/src/com/android/launcher3/settings/SettingsActivity.java b/src/com/android/launcher3/settings/SettingsActivity.java
index 216510beb1..883ff75e37 100644
--- a/src/com/android/launcher3/settings/SettingsActivity.java
+++ b/src/com/android/launcher3/settings/SettingsActivity.java
@@ -19,7 +19,6 @@ package com.android.launcher3.settings;
 import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ACCESSIBILITY_FOCUS;
 
 import static com.android.launcher3.states.RotationHelper.ALLOW_ROTATION_PREFERENCE_KEY;
-import static com.android.launcher3.states.RotationHelper.getAllowRotationDefaultValue;
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
@@ -38,6 +37,8 @@ import androidx.preference.PreferenceGroup.PreferencePositionCallback;
 import androidx.preference.PreferenceScreen;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherFiles;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
@@ -169,12 +170,14 @@ public class SettingsActivity extends FragmentActivity
                     return !WidgetsModel.GO_DISABLE_NOTIFICATION_DOTS;
 
                 case ALLOW_ROTATION_PREFERENCE_KEY:
-                    if (getResources().getBoolean(R.bool.allow_rotation)) {
+                    DeviceProfile deviceProfile = InvariantDeviceProfile.INSTANCE.get(
+                            getContext()).getDeviceProfile(getContext());
+                    if (deviceProfile.allowRotation) {
                         // Launcher supports rotation by default. No need to show this setting.
                         return false;
                     }
                     // Initialize the UI once
-                    preference.setDefaultValue(getAllowRotationDefaultValue());
+                    preference.setDefaultValue(false);
                     return true;
 
                 case FLAGS_PREFERENCE_KEY:
diff --git a/src/com/android/launcher3/states/RotationHelper.java b/src/com/android/launcher3/states/RotationHelper.java
index 2da06e939e..5832711f11 100644
--- a/src/com/android/launcher3/states/RotationHelper.java
+++ b/src/com/android/launcher3/states/RotationHelper.java
@@ -18,43 +18,34 @@ package com.android.launcher3.states;
 import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LOCKED;
 import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_NOSENSOR;
 import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
-import static android.util.DisplayMetrics.DENSITY_DEVICE_STABLE;
 
-import android.app.Activity;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
-import android.content.res.Resources;
 
-import com.android.launcher3.R;
+import com.android.launcher3.BaseActivity;
+import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.util.UiThreadHelper;
 
 /**
  * Utility class to manage launcher rotation
  */
-public class RotationHelper implements OnSharedPreferenceChangeListener {
+public class RotationHelper implements OnSharedPreferenceChangeListener,
+        DeviceProfile.OnDeviceProfileChangeListener {
 
     private static final String TAG = "RotationHelper";
 
     public static final String ALLOW_ROTATION_PREFERENCE_KEY = "pref_allowRotation";
 
-    public static boolean getAllowRotationDefaultValue() {
-        // If the device's pixel density was scaled (usually via settings for A11y), use the
-        // original dimensions to determine if rotation is allowed of not.
-        Resources res = Resources.getSystem();
-        int originalSmallestWidth = res.getConfiguration().smallestScreenWidthDp
-                * res.getDisplayMetrics().densityDpi / DENSITY_DEVICE_STABLE;
-        return originalSmallestWidth >= 600;
-    }
-
     public static final int REQUEST_NONE = 0;
     public static final int REQUEST_ROTATE = 1;
     public static final int REQUEST_LOCK = 2;
 
-    private Activity mActivity;
-    private final SharedPreferences mSharedPrefs;
+    private BaseActivity mActivity;
+    private SharedPreferences mSharedPrefs = null;
 
     private boolean mIgnoreAutoRotateSettings;
+    private boolean mForceAllowRotationForTesting;
     private boolean mHomeRotationEnabled;
 
     /**
@@ -79,18 +70,25 @@ public class RotationHelper implements OnSharedPreferenceChangeListener {
     // Initialize mLastActivityFlags to a value not used by SCREEN_ORIENTATION flags
     private int mLastActivityFlags = -999;
 
-    public RotationHelper(Activity activity) {
+    public RotationHelper(BaseActivity activity) {
         mActivity = activity;
+    }
 
+    private void setIgnoreAutoRotateSettings(boolean ignoreAutoRotateSettings) {
         // On large devices we do not handle auto-rotate differently.
-        mIgnoreAutoRotateSettings = mActivity.getResources().getBoolean(R.bool.allow_rotation);
+        mIgnoreAutoRotateSettings = ignoreAutoRotateSettings;
         if (!mIgnoreAutoRotateSettings) {
-            mSharedPrefs = Utilities.getPrefs(mActivity);
-            mSharedPrefs.registerOnSharedPreferenceChangeListener(this);
+            if (mSharedPrefs == null) {
+                mSharedPrefs = Utilities.getPrefs(mActivity);
+                mSharedPrefs.registerOnSharedPreferenceChangeListener(this);
+            }
             mHomeRotationEnabled = mSharedPrefs.getBoolean(ALLOW_ROTATION_PREFERENCE_KEY,
-                    getAllowRotationDefaultValue());
+                    mActivity.getDeviceProfile().allowRotation);
         } else {
-            mSharedPrefs = null;
+            if (mSharedPrefs != null) {
+                mSharedPrefs.unregisterOnSharedPreferenceChangeListener(this);
+                mSharedPrefs = null;
+            }
         }
     }
 
@@ -99,12 +97,21 @@ public class RotationHelper implements OnSharedPreferenceChangeListener {
         if (mDestroyed) return;
         boolean wasRotationEnabled = mHomeRotationEnabled;
         mHomeRotationEnabled = mSharedPrefs.getBoolean(ALLOW_ROTATION_PREFERENCE_KEY,
-                getAllowRotationDefaultValue());
+                mActivity.getDeviceProfile().allowRotation);
         if (mHomeRotationEnabled != wasRotationEnabled) {
             notifyChange();
         }
     }
 
+    @Override
+    public void onDeviceProfileChanged(DeviceProfile dp) {
+        boolean ignoreAutoRotateSettings = dp.allowRotation;
+        if (mIgnoreAutoRotateSettings != ignoreAutoRotateSettings) {
+            setIgnoreAutoRotateSettings(ignoreAutoRotateSettings);
+            notifyChange();
+        }
+    }
+
     public void setStateHandlerRequest(int request) {
         if (mStateHandlerRequest != request) {
             mStateHandlerRequest = request;
@@ -128,14 +135,15 @@ public class RotationHelper implements OnSharedPreferenceChangeListener {
 
     // Used by tests only.
     public void forceAllowRotationForTesting(boolean allowRotation) {
-        mIgnoreAutoRotateSettings =
-                allowRotation || mActivity.getResources().getBoolean(R.bool.allow_rotation);
+        mForceAllowRotationForTesting = allowRotation;
         notifyChange();
     }
 
     public void initialize() {
         if (!mInitialized) {
             mInitialized = true;
+            setIgnoreAutoRotateSettings(mActivity.getDeviceProfile().allowRotation);
+            mActivity.addOnDeviceProfileChangeListener(this);
             notifyChange();
         }
     }
@@ -143,6 +151,7 @@ public class RotationHelper implements OnSharedPreferenceChangeListener {
     public void destroy() {
         if (!mDestroyed) {
             mDestroyed = true;
+            mActivity.removeOnDeviceProfileChangeListener(this);
             mActivity = null;
             if (mSharedPrefs != null) {
                 mSharedPrefs.unregisterOnSharedPreferenceChangeListener(this);
@@ -165,7 +174,7 @@ public class RotationHelper implements OnSharedPreferenceChangeListener {
         } else if (mCurrentStateRequest == REQUEST_LOCK) {
             activityFlags = SCREEN_ORIENTATION_LOCKED;
         } else if (mIgnoreAutoRotateSettings || mCurrentStateRequest == REQUEST_ROTATE
-                || mHomeRotationEnabled) {
+                || mHomeRotationEnabled || mForceAllowRotationForTesting) {
             activityFlags = SCREEN_ORIENTATION_UNSPECIFIED;
         } else {
             // If auto rotation is off, allow rotation on the activity, in case the user is using
@@ -191,9 +200,10 @@ public class RotationHelper implements OnSharedPreferenceChangeListener {
 
     @Override
     public String toString() {
-        return String.format("[mStateHandlerRequest=%d, mCurrentStateRequest=%d,"
-                + " mLastActivityFlags=%d, mIgnoreAutoRotateSettings=%b, mHomeRotationEnabled=%b]",
+        return String.format("[mStateHandlerRequest=%d, mCurrentStateRequest=%d, "
+                        + "mLastActivityFlags=%d, mIgnoreAutoRotateSettings=%b, "
+                        + "mHomeRotationEnabled=%b, mForceAllowRotationForTesting=%b]",
                 mStateHandlerRequest, mCurrentStateRequest, mLastActivityFlags,
-                mIgnoreAutoRotateSettings, mHomeRotationEnabled);
+                mIgnoreAutoRotateSettings, mHomeRotationEnabled, mForceAllowRotationForTesting);
     }
 }
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java b/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
index 1524ab34e8..c3eda13c3f 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
@@ -47,7 +47,6 @@ public final class WidgetsListTableViewHolderBinder
 
     private int mMaxSpansPerRow = 4;
     private final LayoutInflater mLayoutInflater;
-    private final int mIndent;
     private final OnClickListener mIconClickListener;
     private final OnLongClickListener mIconLongClickListener;
     private final WidgetPreviewLoader mWidgetPreviewLoader;
@@ -62,7 +61,6 @@ public final class WidgetsListTableViewHolderBinder
             WidgetPreviewLoader widgetPreviewLoader,
             WidgetsListAdapter listAdapter) {
         mLayoutInflater = layoutInflater;
-        mIndent = context.getResources().getDimensionPixelSize(R.dimen.widget_section_indent);
         mIconClickListener = iconClickListener;
         mIconLongClickListener = iconLongClickListener;
         mWidgetPreviewLoader = widgetPreviewLoader;
@@ -90,11 +88,6 @@ public final class WidgetsListTableViewHolderBinder
 
         ViewGroup container = (ViewGroup) mLayoutInflater.inflate(
                 R.layout.widgets_table_container, parent, false);
-
-        // if the end padding is 0, then container view (horizontal scroll view) doesn't respect
-        // the end of the linear layout width + the start padding and doesn't allow scrolling.
-        container.findViewById(R.id.widgets_table).setPaddingRelative(mIndent, 0, 1, 0);
-
         return new WidgetsRowViewHolder(container);
     }
 
diff --git a/tests/AndroidManifest-common.xml b/tests/AndroidManifest-common.xml
index 7f6c8f8a87..918ec4af1a 100644
--- a/tests/AndroidManifest-common.xml
+++ b/tests/AndroidManifest-common.xml
@@ -109,7 +109,7 @@
         <activity
             android:name="com.android.launcher3.testcomponent.TestLauncherActivity"
             android:clearTaskOnLaunch="true"
-            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout"
+            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize|density"
             android:enabled="false"
             android:label="Test launcher"
             android:launchMode="singleTask"
-- 
GitLab


From b09a41d86c98ac7505981d64cba078cf4f2fd4dd Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 6 May 2021 20:56:47 -0700
Subject: [PATCH 1119/1664] Use testapi to trigger gc in system and sysui

- Do this prior to gc'ing launcher to ensure that temporary binder
  refs on the system side a released

Bug: 186268407
Test: Presubmit

Change-Id: I7878e1042b07ded5491af6153cff9b0772c557db
---
 .../com/android/launcher3/tapl/LauncherInstrumentation.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index e5b93b1890..02ea82eea9 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -1349,6 +1349,8 @@ public final class LauncherInstrumentation {
     }
 
     public int getTotalPssKb() {
+        // GC the system & sysui first before gc'ing launcher
+        logShellCommand("cmd statusbar run-gc");
         return getTestInfo(TestProtocol.REQUEST_TOTAL_PSS_KB).
                 getInt(TestProtocol.TEST_INFO_RESPONSE_FIELD);
     }
-- 
GitLab


From 05d883452f210b1b469d87b5c7f5e86d7fbd733f Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Thu, 6 May 2021 14:49:28 -0700
Subject: [PATCH 1120/1664] Enable smartspace card dismissals

Test: none
Bug: 184179894
Change-Id: I2529dc1ef8574f2eb6cec8d6b9de47bdf20a7ed2
---
 src/com/android/launcher3/config/FeatureFlags.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 6b42d98e57..7ef43ed4be 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -174,12 +174,12 @@ public final class FeatureFlags {
             "Replace Smartspace with the enhanced version. "
                     + "Ignored if ENABLE_SMARTSPACE_UNIVERSAL is enabled.");
 
-    public static final BooleanFlag ENABLE_SMARTSPACE_FEEDBACK = new DeviceFlag(
+    public static final BooleanFlag ENABLE_SMARTSPACE_FEEDBACK = getDebugFlag(
             "ENABLE_SMARTSPACE_FEEDBACK", true,
             "Adds a menu option to send feedback for Enhanced Smartspace.");
 
-    public static final BooleanFlag ENABLE_SMARTSPACE_DISMISS = new DeviceFlag(
-            "ENABLE_SMARTSPACE_DISMISS", false,
+    public static final BooleanFlag ENABLE_SMARTSPACE_DISMISS = getDebugFlag(
+            "ENABLE_SMARTSPACE_DISMISS", true,
             "Adds a menu option to dismiss the current Enhanced Smartspace card.");
 
     public static final BooleanFlag ALWAYS_USE_HARDWARE_OPTIMIZATION_FOR_FOLDER_ANIMATIONS =
-- 
GitLab


From 68706ebe5abec756caaa6a7cb225beeaa26f9b13 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Thu, 29 Apr 2021 15:24:54 -0700
Subject: [PATCH 1121/1664] Focus on newly-added workspace items for
 accessibility.

Fixes: 177972980
Test: manual
Change-Id: Ic31a940aba7bd08eb9d4236d9c963006a18c9f4d
---
 src/com/android/launcher3/Launcher.java       | 34 ++++++++++++++++++-
 .../LauncherAccessibilityDelegate.java        |  5 ++-
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 5896f5a4de..75eaeb2c0e 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2159,12 +2159,29 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
      */
     @Override
     public void bindItems(final List<ItemInfo> items, final boolean forceAnimateIcons) {
+        bindItems(items, forceAnimateIcons, /* focusFirstItemForAccessibility= */ false);
+    }
+
+
+    /**
+     * Bind the items start-end from the list.
+     *
+     * Implementation of the method from LauncherModel.Callbacks.
+     *
+     * @param focusFirstItemForAccessibility true iff the first item to be added to the workspace
+     *                                       should be focused for accessibility.
+     */
+    public void bindItems(
+            final List<ItemInfo> items,
+            final boolean forceAnimateIcons,
+            final boolean focusFirstItemForAccessibility) {
         // Get the list of added items and intersect them with the set of items here
         final Collection<Animator> bounceAnims = new ArrayList<>();
         final boolean animateIcons = forceAnimateIcons && canRunNewAppsAnimation();
         Workspace workspace = mWorkspace;
         int newItemsScreenId = -1;
         int end = items.size();
+        View newView = null;
         for (int i = 0; i < end; i++) {
             final ItemInfo item = items.get(i);
 
@@ -2229,12 +2246,25 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
                 bounceAnims.add(createNewAppBounceAnimation(view, i));
                 newItemsScreenId = item.screenId;
             }
+
+            if (newView == null) {
+                newView = view;
+            }
         }
 
-        // Animate to the correct page
+        View viewToFocus = newView;
+        // Animate to the correct pager
         if (animateIcons && newItemsScreenId > -1) {
             AnimatorSet anim = new AnimatorSet();
             anim.playTogether(bounceAnims);
+            if (focusFirstItemForAccessibility && viewToFocus != null) {
+                anim.addListener(new AnimatorListenerAdapter() {
+                    @Override
+                    public void onAnimationEnd(Animator animation) {
+                        viewToFocus.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);
+                    }
+                });
+            }
 
             int currentScreenId = mWorkspace.getScreenIdForPageIndex(mWorkspace.getNextPage());
             final int newScreenIndex = mWorkspace.getPageIndexForScreenId(newItemsScreenId);
@@ -2257,6 +2287,8 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
             } else {
                 mWorkspace.postDelayed(startBounceAnimRunnable, NEW_APPS_ANIMATION_DELAY);
             }
+        } else if (focusFirstItemForAccessibility && viewToFocus != null) {
+            viewToFocus.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);
         }
         workspace.requestLayout();
     }
diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
index dbdfb2b663..c580d47994 100644
--- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
+++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
@@ -230,7 +230,10 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
                                 Favorites.CONTAINER_DESKTOP,
                                 screenId, coordinates[0], coordinates[1]);
 
-                        mLauncher.bindItems(Collections.singletonList(info), true);
+                        mLauncher.bindItems(
+                                Collections.singletonList(info),
+                                /* forceAnimateIcons= */ true,
+                                /* focusFirstItemForAccessibility= */ true);
                         announceConfirmation(R.string.item_added_to_workspace);
                     } else if (item instanceof PendingAddItemInfo) {
                         PendingAddItemInfo info = (PendingAddItemInfo) item;
-- 
GitLab


From 09aa748b7dbd59f0fb2daaae6492ca3df815e711 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Mon, 10 May 2021 13:40:04 -0700
Subject: [PATCH 1122/1664] Check if mRecentsAnimationController is null before
 switching to screenshot

Fixes: 187738762
Test: N/A
Change-Id: I3e24a6136a4ed6ff0b0ab810310aaf9dd9dbbb7b
---
 quickstep/src/com/android/quickstep/views/RecentsView.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 59588325fd..b1df87cb72 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -3607,6 +3607,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
      * capturing the snapshot at the same time.
      */
     public void switchToScreenshot(Runnable onFinishRunnable) {
+        if (mRecentsAnimationController == null) {
+            if (onFinishRunnable != null) {
+                onFinishRunnable.run();
+            }
+            return;
+        }
         switchToScreenshot(mRunningTaskId == -1 ? null
                 : mRecentsAnimationController.screenshotTask(mRunningTaskId), onFinishRunnable);
     }
-- 
GitLab


From 5996937798bf745a83cd608d31fcea171fb360a2 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 6 May 2021 12:11:44 -0700
Subject: [PATCH 1123/1664] Removing Launcher dependency from Folders

This allows opening/closing folders without a Launcher context

Bug: 187353581
Test: Manual
Change-Id: Id73a40445a23004eb554f0422d286aa0ff6b3c41
---
 .../launcher3/QuickstepTransitionManager.java |   2 +-
 .../taskbar/TaskbarActivityContext.java       |  41 ++++
 .../util/StaggeredWorkspaceAnim.java          |   3 +-
 src/com/android/launcher3/BaseActivity.java   |   1 +
 .../android/launcher3/ExtendedEditText.java   |   6 +-
 src/com/android/launcher3/Launcher.java       |   3 +-
 src/com/android/launcher3/PagedView.java      |  12 +-
 src/com/android/launcher3/Workspace.java      |   2 +-
 .../launcher3/dragndrop/DragController.java   | 172 +++----------
 .../dragndrop/LauncherDragController.java     | 185 ++++++++++++++
 src/com/android/launcher3/folder/Folder.java  | 126 +++-------
 .../android/launcher3/folder/FolderIcon.java  |   5 +-
 .../launcher3/folder/FolderPagedView.java     |   4 +-
 .../launcher3/folder/LauncherDelegate.java    | 225 ++++++++++++++++++
 .../launcher3/util/UiThreadHelper.java        |  15 +-
 .../launcher3/views/ActivityContext.java      |  13 +
 16 files changed, 559 insertions(+), 256 deletions(-)
 create mode 100644 src/com/android/launcher3/dragndrop/LauncherDragController.java
 create mode 100644 src/com/android/launcher3/folder/LauncherDelegate.java

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 14382d6f09..1b54211beb 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -491,7 +491,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
             List<View> viewsToAnimate = new ArrayList<>();
 
             Workspace workspace = mLauncher.getWorkspace();
-            workspace.getVisiblePages().forEach(
+            workspace.forEachVisiblePage(
                     view -> viewsToAnimate.add(((CellLayout) view).getShortcutsAndWidgets()));
 
             viewsToAnimate.add(mLauncher.getHotseat());
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
index 5513c1658c..3af51d575d 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
@@ -16,12 +16,24 @@
 package com.android.launcher3.taskbar;
 
 import android.content.ContextWrapper;
+import android.graphics.Point;
 import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
 import android.view.LayoutInflater;
+import android.view.View;
+
+import androidx.annotation.Nullable;
 
 import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.DragSource;
+import com.android.launcher3.DropTarget;
 import com.android.launcher3.R;
+import com.android.launcher3.dragndrop.DragController;
+import com.android.launcher3.dragndrop.DragOptions;
+import com.android.launcher3.dragndrop.DragView;
+import com.android.launcher3.dragndrop.DraggableView;
+import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.views.ActivityContext;
 import com.android.launcher3.views.BaseDragLayer;
 
@@ -35,6 +47,7 @@ public class TaskbarActivityContext extends ContextWrapper implements ActivityCo
     private final DeviceProfile mDeviceProfile;
     private final LayoutInflater mLayoutInflater;
     private final TaskbarContainerView mTaskbarContainerView;
+    private final MyDragController mDragController;
 
     public TaskbarActivityContext(BaseQuickstepLauncher launcher) {
         super(launcher);
@@ -47,6 +60,7 @@ public class TaskbarActivityContext extends ContextWrapper implements ActivityCo
 
         mTaskbarContainerView = (TaskbarContainerView) mLayoutInflater
                 .inflate(R.layout.taskbar, null, false);
+        mDragController = new MyDragController(this);
     }
 
     public TaskbarContainerView getTaskbarContainerView() {
@@ -72,4 +86,31 @@ public class TaskbarActivityContext extends ContextWrapper implements ActivityCo
     public Rect getFolderBoundingBox() {
         return mTaskbarContainerView.getFolderBoundingBox();
     }
+
+    @Override
+    public DragController getDragController() {
+        return mDragController;
+    }
+
+    private static class MyDragController extends DragController<TaskbarActivityContext> {
+        MyDragController(TaskbarActivityContext activity) {
+            super(activity);
+        }
+
+        @Override
+        protected DragView startDrag(@Nullable Drawable drawable, @Nullable View view,
+                DraggableView originalView, int dragLayerX, int dragLayerY, DragSource source,
+                ItemInfo dragInfo, Point dragOffset, Rect dragRegion, float initialDragViewScale,
+                float dragViewScaleOnDrop, DragOptions options) {
+            return null;
+        }
+
+        @Override
+        protected void exitDrag() { }
+
+        @Override
+        protected DropTarget getDefaultDropTarget(int[] dropCoordinates) {
+            return null;
+        }
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
index ab951385b3..0ea1fcac76 100644
--- a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
+++ b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
@@ -89,8 +89,7 @@ public class StaggeredWorkspaceAnim {
         int totalRows = grid.inv.numRows + (grid.isVerticalBarLayout() ? 0 : 2);
 
         // Add animation for all the visible workspace pages
-        workspace.getVisiblePages()
-                .forEach(page -> addAnimationForPage((CellLayout) page, totalRows));
+        workspace.forEachVisiblePage(page -> addAnimationForPage((CellLayout) page, totalRows));
 
         boolean workspaceClipChildren = workspace.getClipChildren();
         boolean workspaceClipToPadding = workspace.getClipToPadding();
diff --git a/src/com/android/launcher3/BaseActivity.java b/src/com/android/launcher3/BaseActivity.java
index f64ce5c753..9778b61854 100644
--- a/src/com/android/launcher3/BaseActivity.java
+++ b/src/com/android/launcher3/BaseActivity.java
@@ -132,6 +132,7 @@ public abstract class BaseActivity extends Activity implements ActivityContext {
 
     private final ViewCache mViewCache = new ViewCache();
 
+    @Override
     public ViewCache getViewCache() {
         return mViewCache;
     }
diff --git a/src/com/android/launcher3/ExtendedEditText.java b/src/com/android/launcher3/ExtendedEditText.java
index 4312939321..20c69380cc 100644
--- a/src/com/android/launcher3/ExtendedEditText.java
+++ b/src/com/android/launcher3/ExtendedEditText.java
@@ -15,6 +15,8 @@
  */
 package com.android.launcher3;
 
+import static com.android.launcher3.util.UiThreadHelper.hideKeyboardAsync;
+
 import android.content.Context;
 import android.text.TextUtils;
 import android.util.AttributeSet;
@@ -25,7 +27,7 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 
 import com.android.launcher3.config.FeatureFlags;
-import com.android.launcher3.util.UiThreadHelper;
+import com.android.launcher3.views.ActivityContext;
 
 
 /**
@@ -99,7 +101,7 @@ public class ExtendedEditText extends EditText {
     }
 
     public void hideKeyboard() {
-        UiThreadHelper.hideKeyboardAsync(Launcher.getLauncher(getContext()), getWindowToken());
+        hideKeyboardAsync(ActivityContext.lookupContext(getContext()), getWindowToken());
     }
 
     private boolean showSoftInput() {
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 92d1b11ded..ece0eb4e38 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -124,6 +124,7 @@ import com.android.launcher3.dragndrop.DragController;
 import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.dragndrop.DragView;
+import com.android.launcher3.dragndrop.LauncherDragController;
 import com.android.launcher3.folder.FolderGridOrganizer;
 import com.android.launcher3.folder.FolderIcon;
 import com.android.launcher3.icons.BitmapRenderer;
@@ -428,7 +429,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         mIconCache = app.getIconCache();
         mAccessibilityDelegate = createAccessibilityDelegate();
 
-        mDragController = new DragController(this);
+        mDragController = new LauncherDragController(this);
         mAllAppsController = new AllAppsTransitionController(this);
         mStateManager = new StateManager<>(this, NORMAL);
 
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index fb216987c9..52a6cef497 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -59,7 +59,7 @@ import com.android.launcher3.util.Thunk;
 import com.android.launcher3.views.ActivityContext;
 
 import java.util.ArrayList;
-import java.util.List;
+import java.util.function.Consumer;
 
 /**
  * An abstraction of the original Workspace which supports browsing through a
@@ -295,18 +295,16 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
     }
 
     /**
-     * Returns the currently visible pages.
+     * Executes the callback against each visible page
      */
-    public Iterable<View> getVisiblePages() {
+    public void forEachVisiblePage(Consumer<View> callback) {
         int panelCount = getPanelCount();
-        List<View> visiblePages = new ArrayList<>(panelCount);
         for (int i = mCurrentPage; i < mCurrentPage + panelCount; i++) {
             View page = getPageAt(i);
             if (page != null) {
-                visiblePages.add(page);
+                callback.accept(page);
             }
         }
-        return visiblePages;
     }
 
     /**
@@ -1034,7 +1032,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         // Try canceling the long press. It could also have been scheduled
         // by a distant descendant, so use the mAllowLongPress flag to block
         // everything
-        getVisiblePages().forEach(View::cancelLongPress);
+        forEachVisiblePage(View::cancelLongPress);
     }
 
     protected float getScrollProgress(int screenCenter, View v, int page) {
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 7c5f99e07b..f846d14ff9 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2974,7 +2974,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
 
         List<CellLayout> cellLayouts = new ArrayList<>(getPanelCount() + 1);
         cellLayouts.add(getHotseat());
-        getVisiblePages().forEach(page -> cellLayouts.add((CellLayout) page));
+        forEachVisiblePage(page -> cellLayouts.add((CellLayout) page));
 
         // Order: App icons, app in folder. Items in hotseat get returned first.
         if (ADAPTIVE_ICON_WINDOW_ANIM.get()) {
diff --git a/src/com/android/launcher3/dragndrop/DragController.java b/src/com/android/launcher3/dragndrop/DragController.java
index 575b8fdd99..5731db4cbb 100644
--- a/src/com/android/launcher3/dragndrop/DragController.java
+++ b/src/com/android/launcher3/dragndrop/DragController.java
@@ -16,45 +16,37 @@
 
 package com.android.launcher3.dragndrop;
 
-import static com.android.launcher3.AbstractFloatingView.TYPE_DISCOVERY_BOUNCE;
-import static com.android.launcher3.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY;
-import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.Utilities.ATLEAST_Q;
-import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 
 import android.content.ComponentName;
-import android.content.res.Resources;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.view.DragEvent;
-import android.view.HapticFeedbackConstants;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 
 import androidx.annotation.Nullable;
 
-import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.DragSource;
 import com.android.launcher3.DropTarget;
-import com.android.launcher3.Launcher;
-import com.android.launcher3.R;
-import com.android.launcher3.accessibility.DragViewStateAnnouncer;
 import com.android.launcher3.logging.InstanceId;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.util.ItemInfoMatcher;
 import com.android.launcher3.util.TouchController;
+import com.android.launcher3.views.ActivityContext;
 
 import java.util.ArrayList;
 import java.util.Optional;
 
 /**
  * Class for initiating a drag within a view or across multiple views.
+ * @param <T>
  */
-public class DragController implements DragDriver.EventListener, TouchController {
-    private static final boolean PROFILE_DRAWING_DURING_DRAG = false;
+public abstract class DragController<T extends ActivityContext>
+        implements DragDriver.EventListener, TouchController {
 
     /**
      * When a drag is started from a deep press, you need to drag this much farther than normal to
@@ -62,8 +54,7 @@ public class DragController implements DragDriver.EventListener, TouchController
      */
     private static final int DEEP_PRESS_DISTANCE_FACTOR = 3;
 
-    private final Launcher mLauncher;
-    private final FlingToDeleteHelper mFlingToDeleteHelper;
+    protected final T mActivity;
 
     // temporaries to avoid gc thrash
     private final Rect mRectTemp = new Rect();
@@ -73,30 +64,30 @@ public class DragController implements DragDriver.EventListener, TouchController
      * Drag driver for the current drag/drop operation, or null if there is no active DND operation.
      * It's null during accessible drag operations.
      */
-    private DragDriver mDragDriver = null;
+    protected DragDriver mDragDriver = null;
 
     /** Options controlling the drag behavior. */
-    private DragOptions mOptions;
+    protected DragOptions mOptions;
 
     /** Coordinate for motion down event */
-    private final Point mMotionDown = new Point();
+    protected final Point mMotionDown = new Point();
     /** Coordinate for last touch event **/
-    private final Point mLastTouch = new Point();
+    protected final Point mLastTouch = new Point();
 
     private final Point mTmpPoint = new Point();
 
-    private DropTarget.DragObject mDragObject;
+    protected DropTarget.DragObject mDragObject;
 
     /** Who can receive drop events */
     private final ArrayList<DropTarget> mDropTargets = new ArrayList<>();
     private final ArrayList<DragListener> mListeners = new ArrayList<>();
 
-    private DropTarget mLastDropTarget;
+    protected DropTarget mLastDropTarget;
 
     private int mLastTouchClassification;
-    private int mDistanceSinceScroll = 0;
+    protected int mDistanceSinceScroll = 0;
 
-    private boolean mIsInPreDrag;
+    protected boolean mIsInPreDrag;
 
     /**
      * Interface to receive notifications when a drag starts or stops
@@ -119,9 +110,8 @@ public class DragController implements DragDriver.EventListener, TouchController
     /**
      * Used to create a new DragLayer from XML.
      */
-    public DragController(Launcher launcher) {
-        mLauncher = launcher;
-        mFlingToDeleteHelper = new FlingToDeleteHelper(launcher);
+    public DragController(T activity) {
+        mActivity = activity;
     }
 
     /**
@@ -198,7 +188,7 @@ public class DragController implements DragDriver.EventListener, TouchController
                 options);
     }
 
-    private DragView startDrag(
+    protected abstract DragView startDrag(
             @Nullable Drawable drawable,
             @Nullable View view,
             DraggableView originalView,
@@ -210,98 +200,9 @@ public class DragController implements DragDriver.EventListener, TouchController
             Rect dragRegion,
             float initialDragViewScale,
             float dragViewScaleOnDrop,
-            DragOptions options) {
-        if (PROFILE_DRAWING_DURING_DRAG) {
-            android.os.Debug.startMethodTracing("Launcher");
-        }
-
-        mLauncher.hideKeyboard();
-        AbstractFloatingView.closeOpenViews(mLauncher, false, TYPE_DISCOVERY_BOUNCE);
-
-        mOptions = options;
-        if (mOptions.simulatedDndStartPoint != null) {
-            mLastTouch.x = mMotionDown.x = mOptions.simulatedDndStartPoint.x;
-            mLastTouch.y = mMotionDown.y = mOptions.simulatedDndStartPoint.y;
-        }
-
-        final int registrationX = mMotionDown.x - dragLayerX;
-        final int registrationY = mMotionDown.y - dragLayerY;
-
-        final int dragRegionLeft = dragRegion == null ? 0 : dragRegion.left;
-        final int dragRegionTop = dragRegion == null ? 0 : dragRegion.top;
-
-        mLastDropTarget = null;
-
-        mDragObject = new DropTarget.DragObject(mLauncher.getApplicationContext());
-        mDragObject.originalView = originalView;
-
-        mIsInPreDrag = mOptions.preDragCondition != null
-                && !mOptions.preDragCondition.shouldStartDrag(0);
-
-        final Resources res = mLauncher.getResources();
-        final float scaleDps = mIsInPreDrag
-                ? res.getDimensionPixelSize(R.dimen.pre_drag_view_scale) : 0f;
-        final DragView dragView = mDragObject.dragView = drawable != null
-                ? new DragView(
-                    mLauncher,
-                    drawable,
-                    registrationX,
-                    registrationY,
-                    initialDragViewScale,
-                    dragViewScaleOnDrop,
-                    scaleDps)
-                : new DragView(
-                    mLauncher,
-                    view,
-                    view.getMeasuredWidth(),
-                    view.getMeasuredHeight(),
-                    registrationX,
-                    registrationY,
-                    initialDragViewScale,
-                    dragViewScaleOnDrop,
-                    scaleDps);
-        dragView.setItemInfo(dragInfo);
-        mDragObject.dragComplete = false;
-
-        mDragObject.xOffset = mMotionDown.x - (dragLayerX + dragRegionLeft);
-        mDragObject.yOffset = mMotionDown.y - (dragLayerY + dragRegionTop);
-
-        mDragDriver = DragDriver.create(this, mOptions, mFlingToDeleteHelper::recordMotionEvent);
-        if (!mOptions.isAccessibleDrag) {
-            mDragObject.stateAnnouncer = DragViewStateAnnouncer.createFor(dragView);
-        }
+            DragOptions options);
 
-        mDragObject.dragSource = source;
-        mDragObject.dragInfo = dragInfo;
-        mDragObject.originalDragInfo = mDragObject.dragInfo.makeShallowCopy();
-
-        if (dragOffset != null) {
-            dragView.setDragVisualizeOffset(new Point(dragOffset));
-        }
-        if (dragRegion != null) {
-            dragView.setDragRegion(new Rect(dragRegion));
-        }
-
-        mLauncher.getDragLayer().performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
-        dragView.show(mLastTouch.x, mLastTouch.y);
-        mDistanceSinceScroll = 0;
-
-        if (!mIsInPreDrag) {
-            callOnDragStart();
-        } else if (mOptions.preDragCondition != null) {
-            mOptions.preDragCondition.onPreDragStart(mDragObject);
-        }
-
-        handleMoveEvent(mLastTouch.x, mLastTouch.y);
-
-        if (!mLauncher.isTouchInProgress() && options.simulatedDndStartPoint == null) {
-            // If it is an internal drag and the touch is already complete, cancel immediately
-            MAIN_EXECUTOR.submit(this::cancelDrag);
-        }
-        return dragView;
-    }
-
-    private void callOnDragStart() {
+    protected void callOnDragStart() {
         if (mOptions.preDragCondition != null) {
             mOptions.preDragCondition.onPreDragEnd(mDragObject, true /* dragStarted*/);
         }
@@ -357,13 +258,15 @@ public class DragController implements DragDriver.EventListener, TouchController
         if (!accepted) {
             // If it was not accepted, cleanup the state. If it was accepted, it is the
             // responsibility of the drop target to cleanup the state.
-            mLauncher.getStateManager().goToState(NORMAL, SPRING_LOADED_EXIT_DELAY);
+            exitDrag();
             mDragObject.deferDragViewCleanupPostAnimation = false;
         }
 
         mDragObject.dragSource.onDropCompleted(dropTarget, mDragObject, accepted);
     }
 
+    protected abstract void exitDrag();
+
     public void onAppsRemoved(ItemInfoMatcher matcher) {
         // Cancel the current drag if we are removing an app that we are dragging
         if (mDragObject != null) {
@@ -377,7 +280,7 @@ public class DragController implements DragDriver.EventListener, TouchController
         }
     }
 
-    private void endDrag() {
+    protected void endDrag() {
         if (isDragging()) {
             mDragDriver = null;
             boolean isDeferred = false;
@@ -396,8 +299,6 @@ public class DragController implements DragDriver.EventListener, TouchController
                 callOnDragEnd();
             }
         }
-
-        mFlingToDeleteHelper.releaseVelocityTracker();
     }
 
     public void animateDragViewToOriginalPosition(final Runnable onComplete,
@@ -443,7 +344,7 @@ public class DragController implements DragDriver.EventListener, TouchController
      * Clamps the position to the drag layer bounds.
      */
     private Point getClampedDragLayerPos(float x, float y) {
-        mLauncher.getDragLayer().getLocalVisibleRect(mRectTemp);
+        mActivity.getDragLayer().getLocalVisibleRect(mRectTemp);
         mTmpPoint.x = (int) Math.max(mRectTemp.left, Math.min(x, mRectTemp.right - 1));
         mTmpPoint.y = (int) Math.max(mRectTemp.top, Math.min(y, mRectTemp.bottom - 1));
         return mTmpPoint;
@@ -465,19 +366,16 @@ public class DragController implements DragDriver.EventListener, TouchController
 
     @Override
     public void onDriverDragEnd(float x, float y) {
-        DropTarget dropTarget;
-        Runnable flingAnimation = mFlingToDeleteHelper.getFlingAnimation(mDragObject, mOptions);
-        if (flingAnimation != null) {
-            dropTarget = mFlingToDeleteHelper.getDropTarget();
-        } else {
-            dropTarget = findDropTarget((int) x, (int) y, mCoordinatesTemp);
+        if (!endWithFlingAnimation()) {
+            drop(findDropTarget((int) x, (int) y, mCoordinatesTemp), null);
         }
-
-        drop(dropTarget, flingAnimation);
-
         endDrag();
     }
 
+    protected boolean endWithFlingAnimation() {
+        return false;
+    }
+
     @Override
     public void onDriverDragCancel() {
         cancelDrag();
@@ -520,7 +418,7 @@ public class DragController implements DragDriver.EventListener, TouchController
         return mDragDriver != null && mDragDriver.onDragEvent(event);
     }
 
-    private void handleMoveEvent(int x, int y) {
+    protected void handleMoveEvent(int x, int y) {
         mDragObject.dragView.move(x, y);
 
         // Drop on someone?
@@ -592,7 +490,7 @@ public class DragController implements DragDriver.EventListener, TouchController
         endDrag();
     }
 
-    private void drop(DropTarget dropTarget, Runnable flingAnimation) {
+    protected void drop(DropTarget dropTarget, Runnable flingAnimation) {
         final int[] coordinates = mCoordinatesTemp;
         mDragObject.x = coordinates[0];
         mDragObject.y = coordinates[1];
@@ -649,7 +547,7 @@ public class DragController implements DragDriver.EventListener, TouchController
             if (r.contains(x, y)) {
                 dropCoordinates[0] = x;
                 dropCoordinates[1] = y;
-                mLauncher.getDragLayer().mapCoordInSelfToDescendant((View) target, dropCoordinates);
+                mActivity.getDragLayer().mapCoordInSelfToDescendant((View) target, dropCoordinates);
                 return target;
             }
         }
@@ -657,11 +555,11 @@ public class DragController implements DragDriver.EventListener, TouchController
         // cell layout to drop to in the existing drag/drop logic.
         dropCoordinates[0] = x;
         dropCoordinates[1] = y;
-        mLauncher.getDragLayer().mapCoordInSelfToDescendant(mLauncher.getWorkspace(),
-                dropCoordinates);
-        return mLauncher.getWorkspace();
+        return getDefaultDropTarget(dropCoordinates);
     }
 
+    protected abstract DropTarget getDefaultDropTarget(int[] dropCoordinates);
+
     /**
      * Sets the drag listener which will be notified when a drag starts or ends.
      */
diff --git a/src/com/android/launcher3/dragndrop/LauncherDragController.java b/src/com/android/launcher3/dragndrop/LauncherDragController.java
new file mode 100644
index 0000000000..a98d70ce71
--- /dev/null
+++ b/src/com/android/launcher3/dragndrop/LauncherDragController.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.dragndrop;
+
+import static com.android.launcher3.AbstractFloatingView.TYPE_DISCOVERY_BOUNCE;
+import static com.android.launcher3.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY;
+import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+
+import android.content.res.Resources;
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.view.HapticFeedbackConstants;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.AbstractFloatingView;
+import com.android.launcher3.DragSource;
+import com.android.launcher3.DropTarget;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+import com.android.launcher3.accessibility.DragViewStateAnnouncer;
+import com.android.launcher3.model.data.ItemInfo;
+
+/**
+ * Drag controller for Launcher activity
+ */
+public class LauncherDragController extends DragController<Launcher> {
+
+    private static final boolean PROFILE_DRAWING_DURING_DRAG = false;
+
+    private final FlingToDeleteHelper mFlingToDeleteHelper;
+
+    public LauncherDragController(Launcher launcher) {
+        super(launcher);
+        mFlingToDeleteHelper = new FlingToDeleteHelper(launcher);
+    }
+
+    @Override
+    protected DragView startDrag(
+            @Nullable Drawable drawable,
+            @Nullable View view,
+            DraggableView originalView,
+            int dragLayerX,
+            int dragLayerY,
+            DragSource source,
+            ItemInfo dragInfo,
+            Point dragOffset,
+            Rect dragRegion,
+            float initialDragViewScale,
+            float dragViewScaleOnDrop,
+            DragOptions options) {
+        if (PROFILE_DRAWING_DURING_DRAG) {
+            android.os.Debug.startMethodTracing("Launcher");
+        }
+
+        mActivity.hideKeyboard();
+        AbstractFloatingView.closeOpenViews(mActivity, false, TYPE_DISCOVERY_BOUNCE);
+
+        mOptions = options;
+        if (mOptions.simulatedDndStartPoint != null) {
+            mLastTouch.x = mMotionDown.x = mOptions.simulatedDndStartPoint.x;
+            mLastTouch.y = mMotionDown.y = mOptions.simulatedDndStartPoint.y;
+        }
+
+        final int registrationX = mMotionDown.x - dragLayerX;
+        final int registrationY = mMotionDown.y - dragLayerY;
+
+        final int dragRegionLeft = dragRegion == null ? 0 : dragRegion.left;
+        final int dragRegionTop = dragRegion == null ? 0 : dragRegion.top;
+
+        mLastDropTarget = null;
+
+        mDragObject = new DropTarget.DragObject(mActivity.getApplicationContext());
+        mDragObject.originalView = originalView;
+
+        mIsInPreDrag = mOptions.preDragCondition != null
+                && !mOptions.preDragCondition.shouldStartDrag(0);
+
+        final Resources res = mActivity.getResources();
+        final float scaleDps = mIsInPreDrag
+                ? res.getDimensionPixelSize(R.dimen.pre_drag_view_scale) : 0f;
+        final DragView dragView = mDragObject.dragView = drawable != null
+                ? new DragView(
+                mActivity,
+                drawable,
+                registrationX,
+                registrationY,
+                initialDragViewScale,
+                dragViewScaleOnDrop,
+                scaleDps)
+                : new DragView(
+                        mActivity,
+                        view,
+                        view.getMeasuredWidth(),
+                        view.getMeasuredHeight(),
+                        registrationX,
+                        registrationY,
+                        initialDragViewScale,
+                        dragViewScaleOnDrop,
+                        scaleDps);
+        dragView.setItemInfo(dragInfo);
+        mDragObject.dragComplete = false;
+
+        mDragObject.xOffset = mMotionDown.x - (dragLayerX + dragRegionLeft);
+        mDragObject.yOffset = mMotionDown.y - (dragLayerY + dragRegionTop);
+
+        mDragDriver = DragDriver.create(this, mOptions, mFlingToDeleteHelper::recordMotionEvent);
+        if (!mOptions.isAccessibleDrag) {
+            mDragObject.stateAnnouncer = DragViewStateAnnouncer.createFor(dragView);
+        }
+
+        mDragObject.dragSource = source;
+        mDragObject.dragInfo = dragInfo;
+        mDragObject.originalDragInfo = mDragObject.dragInfo.makeShallowCopy();
+
+        if (dragOffset != null) {
+            dragView.setDragVisualizeOffset(new Point(dragOffset));
+        }
+        if (dragRegion != null) {
+            dragView.setDragRegion(new Rect(dragRegion));
+        }
+
+        mActivity.getDragLayer().performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
+        dragView.show(mLastTouch.x, mLastTouch.y);
+        mDistanceSinceScroll = 0;
+
+        if (!mIsInPreDrag) {
+            callOnDragStart();
+        } else if (mOptions.preDragCondition != null) {
+            mOptions.preDragCondition.onPreDragStart(mDragObject);
+        }
+
+        handleMoveEvent(mLastTouch.x, mLastTouch.y);
+
+        if (!mActivity.isTouchInProgress() && options.simulatedDndStartPoint == null) {
+            // If it is an internal drag and the touch is already complete, cancel immediately
+            MAIN_EXECUTOR.submit(this::cancelDrag);
+        }
+        return dragView;
+    }
+
+    @Override
+    protected void exitDrag() {
+        mActivity.getStateManager().goToState(NORMAL, SPRING_LOADED_EXIT_DELAY);
+    }
+
+    @Override
+    protected boolean endWithFlingAnimation() {
+        Runnable flingAnimation = mFlingToDeleteHelper.getFlingAnimation(mDragObject, mOptions);
+        if (flingAnimation != null) {
+            drop(mFlingToDeleteHelper.getDropTarget(), flingAnimation);
+            return true;
+        }
+        return super.endWithFlingAnimation();
+    }
+
+    @Override
+    protected void endDrag() {
+        super.endDrag();
+        mFlingToDeleteHelper.releaseVelocityTracker();
+    }
+
+    @Override
+    protected DropTarget getDefaultDropTarget(int[] dropCoordinates) {
+        mActivity.getDragLayer().mapCoordInSelfToDescendant(mActivity.getWorkspace(),
+                dropCoordinates);
+        return mActivity.getWorkspace();
+    }
+}
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index 92d891f774..22d1b1c48a 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -23,7 +23,6 @@ import static com.android.launcher3.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent;
 import static com.android.launcher3.config.FeatureFlags.ALWAYS_USE_HARDWARE_OPTIMIZATION_FOR_FOLDER_ANIMATIONS;
-import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_FOLDER_CONVERTED_TO_ICON;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_FOLDER_LABEL_UPDATED;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ITEM_DROP_COMPLETED;
 import static com.android.launcher3.util.DisplayController.getSingleFrameMs;
@@ -109,7 +108,6 @@ import com.android.launcher3.widget.LocalColorExtractor;
 import com.android.launcher3.widget.PendingAddShortcutInfo;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -177,8 +175,9 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
     private boolean mIsAnimatingClosed = false;
 
     // Folder can be displayed in Launcher's activity or a separate window (e.g. Taskbar).
-    // Anything specific to Launcher should use mLauncher, otherwise should use mActivityContext.
-    protected final Launcher mLauncher;
+    // Anything specific to Launcher should use mLauncherDelegate, otherwise should
+    // use mActivityContext.
+    protected final LauncherDelegate mLauncherDelegate;
     protected final ActivityContext mActivityContext;
 
     protected DragController mDragController;
@@ -235,8 +234,6 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
     // Wallpaper local color extraction
     @Nullable private LocalColorExtractor mColorExtractor;
     @Nullable private LocalColorExtractor.Listener mColorListener;
-    private final Rect mTempRect = new Rect();
-    private final RectF mTempRectF = new RectF();
 
     // For simplicity, we start the color change only after the open animation has started.
     private Runnable mColorChangeRunnable;
@@ -255,8 +252,9 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         super(context, attrs);
         setAlwaysDrawnWithCacheEnabled(false);
 
-        mLauncher = Launcher.getLauncher(context);
         mActivityContext = ActivityContext.lookupContext(context);
+        mLauncherDelegate = LauncherDelegate.from(mActivityContext);
+
         mStatsLogManager = StatsLogManager.newInstance(context);
         // We need this view to be focusable in touch mode so that when text editing of the folder
         // name is complete, we have something to focus on, thus hiding the cursor and giving
@@ -267,7 +265,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
-        final DeviceProfile dp = mLauncher.getDeviceProfile();
+        final DeviceProfile dp = mActivityContext.getDeviceProfile();
         final int paddingLeftRight = dp.folderContentPaddingLeftRight;
 
         mContent = findViewById(R.id.folder_content);
@@ -298,7 +296,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         }
 
         if (Utilities.ATLEAST_S) {
-            mColorExtractor = LocalColorExtractor.newInstance(mLauncher);
+            mColorExtractor = LocalColorExtractor.newInstance(getContext());
             mColorListener = (RectF rect, SparseIntArray extractedColors) -> {
                 mColorChangeRunnable = () -> {
                     mColorChangeRunnable = null;
@@ -339,7 +337,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
 
     public boolean onLongClick(View v) {
         // Return if global dragging is not enabled
-        if (!mLauncher.isDraggingEnabled()) return true;
+        if (!mLauncherDelegate.isDraggingEnabled()) return true;
         return startDrag(v, new DragOptions());
     }
 
@@ -365,7 +363,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
                         });
             }
 
-            mLauncher.getWorkspace().beginDragShared(v, this, options);
+            mLauncherDelegate.beginDragShared(v, this, options);
         }
         return true;
     }
@@ -421,7 +419,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         if (DEBUG) {
             Log.d(TAG, "onBackKey newTitle=" + newTitle);
         }
-        mInfo.setTitle(newTitle, mLauncher.getModelWriter());
+        mInfo.setTitle(newTitle, mLauncherDelegate.getModelWriter());
         mFolderIcon.onTitleChanged(newTitle);
 
         if (TextUtils.isEmpty(mInfo.title)) {
@@ -486,6 +484,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
 
     public void setFolderIcon(FolderIcon icon) {
         mFolderIcon = icon;
+        mLauncherDelegate.init(this, icon);
     }
 
     @Override
@@ -592,8 +591,8 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
     }
 
     private void startAnimation(final AnimatorSet a) {
-        mLauncher.getWorkspace().getVisiblePages()
-                .forEach(visiblePage -> addAnimatorListenerForPage(a, (CellLayout) visiblePage));
+        mLauncherDelegate.forEachVisibleWorkspacePage(
+                visiblePage -> addAnimatorListenerForPage(a, (CellLayout) visiblePage));
 
         a.addListener(new AnimatorListenerAdapter() {
             @Override
@@ -754,12 +753,12 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
                     mFolderName.animate().setDuration(FOLDER_NAME_ANIMATION_DURATION)
                         .translationX(0)
                         .setInterpolator(AnimationUtils.loadInterpolator(
-                                mLauncher, android.R.interpolator.fast_out_slow_in));
+                                getContext(), android.R.interpolator.fast_out_slow_in));
                     mPageIndicator.playEntryAnimation();
 
                     if (updateAnimationFlag) {
                         mInfo.setOption(FolderInfo.FLAG_MULTI_PAGE_ANIMATION, true,
-                                mLauncher.getModelWriter());
+                                mLauncherDelegate.getModelWriter());
                     }
                 }
             });
@@ -1115,7 +1114,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         if (getItemCount() <= mContent.itemsPerPage()) {
             // Show the animation, next time something is added to the folder.
             mInfo.setOption(FolderInfo.FLAG_MULTI_PAGE_ANIMATION, false,
-                    mLauncher.getModelWriter());
+                    mLauncherDelegate.getModelWriter());
         }
     }
 
@@ -1133,7 +1132,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         }
 
         if (!items.isEmpty()) {
-            mLauncher.getModelWriter().moveItemsInDatabase(items, mInfo.id, 0);
+            mLauncherDelegate.getModelWriter().moveItemsInDatabase(items, mInfo.id, 0);
         }
         if (FeatureFlags.FOLDER_NAME_SUGGEST.get() && !isBind
                 && total > 1 /* no need to update if there's one icon */) {
@@ -1190,12 +1189,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         if (mColorExtractor != null) {
             mColorExtractor.removeLocations();
             mColorExtractor.setListener(mColorListener);
-            mTempRect.set(lp.x, lp.y, lp.x + lp.width, lp.y + lp.height);
-            mColorExtractor.getExtractedRectForViewRect(mLauncher,
-                    mLauncher.getWorkspace().getCurrentPage(), mTempRect, mTempRectF);
-            if (!mTempRectF.isEmpty()) {
-                mColorExtractor.addLocation(Arrays.asList(mTempRectF));
-            }
+            mLauncherDelegate.addRectForColorExtraction(lp, mColorExtractor);
         }
     }
 
@@ -1236,7 +1230,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
 
         if (mContent.getChildCount() > 0) {
             int cellIconGap = (mContent.getPageAt(0).getCellWidth()
-                    - mLauncher.getDeviceProfile().iconSizePx) / 2;
+                    - mActivityContext.getDeviceProfile().iconSizePx) / 2;
             mFooter.setPadding(mContent.getPaddingLeft() + cellIconGap,
                     mFooter.getPaddingTop(),
                     mContent.getPaddingRight() + cellIconGap,
@@ -1266,56 +1260,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
     }
 
     @Thunk void replaceFolderWithFinalItem() {
-        // Add the last remaining child to the workspace in place of the folder
-        Runnable onCompleteRunnable = new Runnable() {
-            @Override
-            public void run() {
-                int itemCount = getItemCount();
-                if (itemCount <= 1) {
-                    View newIcon = null;
-                    WorkspaceItemInfo finalItem = null;
-
-                    if (itemCount == 1) {
-                        // Move the item from the folder to the workspace, in the position of the
-                        // folder
-                        CellLayout cellLayout = mLauncher.getCellLayout(mInfo.container,
-                                mInfo.screenId);
-                        finalItem =  mInfo.contents.remove(0);
-                        newIcon = mLauncher.createShortcut(cellLayout, finalItem);
-                        mLauncher.getModelWriter().addOrMoveItemInDatabase(finalItem,
-                                mInfo.container, mInfo.screenId, mInfo.cellX, mInfo.cellY);
-                    }
-
-                    // Remove the folder
-                    mLauncher.removeItem(mFolderIcon, mInfo, true /* deleteFromDb */);
-                    if (mFolderIcon instanceof DropTarget) {
-                        mDragController.removeDropTarget((DropTarget) mFolderIcon);
-                    }
-
-                    if (newIcon != null) {
-                        // We add the child after removing the folder to prevent both from existing
-                        // at the same time in the CellLayout.  We need to add the new item with
-                        // addInScreenFromBind() to ensure that hotseat items are placed correctly.
-                        mLauncher.getWorkspace().addInScreenFromBind(newIcon, mInfo);
-
-                        // Focus the newly created child
-                        newIcon.requestFocus();
-                    }
-                    if (finalItem != null) {
-                        StatsLogger logger = mStatsLogManager.logger().withItemInfo(finalItem);
-                        mDragController.getLogInstanceId().map(logger::withInstanceId)
-                                .orElse(logger)
-                                .log(LAUNCHER_FOLDER_CONVERTED_TO_ICON);
-                    }
-                }
-            }
-        };
-        View finalChild = mContent.getLastItem();
-        if (finalChild != null) {
-            mFolderIcon.performDestroyAnimation(onCompleteRunnable);
-        } else {
-            onCompleteRunnable.run();
-        }
+        mLauncherDelegate.replaceFolderWithFinalItem(this);
         mDestroyed = true;
     }
 
@@ -1374,6 +1319,10 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
             mScrollPauseAlarm.cancelAlarm();
         }
         mContent.completePendingPageChanges();
+        Launcher launcher = mLauncherDelegate.getLauncher();
+        if (launcher == null) {
+            return;
+        }
 
         PendingAddShortcutInfo pasi = d.dragInfo instanceof PendingAddShortcutInfo
                 ? (PendingAddShortcutInfo) d.dragInfo : null;
@@ -1383,7 +1332,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
             pasi.container = mInfo.id;
             pasi.rank = mEmptyCellRank;
 
-            mLauncher.addPendingItem(pasi, pasi.container, pasi.screenId, null, pasi.spanX,
+            launcher.addPendingItem(pasi, pasi.container, pasi.screenId, null, pasi.spanX,
                     pasi.spanY);
             d.deferDragViewCleanupPostAnimation = false;
             mRearrangeOnClose = true;
@@ -1405,7 +1354,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
 
                 // Actually move the item in the database if it was an external drag. Call this
                 // before creating the view, so that WorkspaceItemInfo is updated appropriately.
-                mLauncher.getModelWriter().addOrMoveItemInDatabase(
+                mLauncherDelegate.getModelWriter().addOrMoveItemInDatabase(
                         si, mInfo.id, 0, si.cellX, si.cellY);
                 mIsExternalDrag = false;
             } else {
@@ -1420,7 +1369,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
                 float scaleY = getScaleY();
                 setScaleX(1.0f);
                 setScaleY(1.0f);
-                mLauncher.getDragLayer().animateViewIntoPosition(d.dragView, currentDragView, null);
+                launcher.getDragLayer().animateViewIntoPosition(d.dragView, currentDragView, null);
                 setScaleX(scaleX);
                 setScaleY(scaleY);
             } else {
@@ -1448,10 +1397,11 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
 
         if (mContent.getPageCount() > 1) {
             // The animation has already been shown while opening the folder.
-            mInfo.setOption(FolderInfo.FLAG_MULTI_PAGE_ANIMATION, true, mLauncher.getModelWriter());
+            mInfo.setOption(FolderInfo.FLAG_MULTI_PAGE_ANIMATION, true,
+                    mLauncherDelegate.getModelWriter());
         }
 
-        mLauncher.getStateManager().goToState(NORMAL, SPRING_LOADED_EXIT_DELAY);
+        launcher.getStateManager().goToState(NORMAL, SPRING_LOADED_EXIT_DELAY);
         if (d.stateAnnouncer != null) {
             d.stateAnnouncer.completeAction(R.string.item_moved);
         }
@@ -1480,7 +1430,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         FolderGridOrganizer verifier = new FolderGridOrganizer(
                 mActivityContext.getDeviceProfile().inv).setFolderInfo(mInfo);
         verifier.updateRankAndPos(item, rank);
-        mLauncher.getModelWriter().addOrMoveItemInDatabase(item, mInfo.id, 0, item.cellX,
+        mLauncherDelegate.getModelWriter().addOrMoveItemInDatabase(item, mInfo.id, 0, item.cellX,
                 item.cellY);
         updateItemLocationsInDatabaseBatch(false);
 
@@ -1713,17 +1663,9 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
                     return true;
                 }
                 return false;
-            } else if (!dl.isEventOverView(this, ev)) {
-                if (mLauncher.getAccessibilityDelegate().isInAccessibleDrag()) {
-                    // Do not close the container if in drag and drop.
-                    if (!dl.isEventOverView(mLauncher.getDropTargetBar(), ev)) {
-                        return true;
-                    }
-                } else {
-                    // TODO: add ww log if need to gather tap outside to close folder
-                    close(true);
-                    return true;
-                }
+            } else if (!dl.isEventOverView(this, ev)
+                    && mLauncherDelegate.interceptOutsideTouch(ev, dl, this)) {
+                return true;
             }
         }
         return false;
diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java
index 6b02021ed3..279c4457d3 100644
--- a/src/com/android/launcher3/folder/FolderIcon.java
+++ b/src/com/android/launcher3/folder/FolderIcon.java
@@ -169,14 +169,11 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
     public static <T extends Context & ActivityContext> FolderIcon inflateFolderAndIcon(int resId,
             T activityContext, ViewGroup group, FolderInfo folderInfo) {
         Folder folder = Folder.fromXml(activityContext);
-        folder.setDragController(folder.mLauncher.getDragController());
 
         FolderIcon icon = inflateIcon(resId, activityContext, group, folderInfo);
         folder.setFolderIcon(icon);
         folder.bind(folderInfo);
         icon.setFolder(folder);
-
-        icon.setOnFocusChangeListener(folder.mLauncher.getFocusHandler());
         icon.mBackground.paddingY = icon.isInHotseat()
                 ? 0 : activityContext.getDeviceProfile().cellYPaddingPx;
         return icon;
@@ -467,7 +464,7 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
         CharSequence newTitle = nameInfos.getLabels()[0];
         FromState fromState = mInfo.getFromLabelState();
 
-        mInfo.setTitle(newTitle, mFolder.mLauncher.getModelWriter());
+        mInfo.setTitle(newTitle, mFolder.mLauncherDelegate.getModelWriter());
         onTitleChanged(mInfo.title);
         mFolder.mFolderName.setText(mInfo.title);
 
diff --git a/src/com/android/launcher3/folder/FolderPagedView.java b/src/com/android/launcher3/folder/FolderPagedView.java
index a4e8be6974..7fc3740106 100644
--- a/src/com/android/launcher3/folder/FolderPagedView.java
+++ b/src/com/android/launcher3/folder/FolderPagedView.java
@@ -31,7 +31,6 @@ import android.view.View;
 import android.view.ViewDebug;
 
 import com.android.launcher3.AbstractFloatingView;
-import com.android.launcher3.BaseActivity;
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.CellLayout;
 import com.android.launcher3.DeviceProfile;
@@ -49,6 +48,7 @@ import com.android.launcher3.pageindicators.PageIndicatorDots;
 import com.android.launcher3.touch.ItemClickHandler;
 import com.android.launcher3.util.Thunk;
 import com.android.launcher3.util.ViewCache;
+import com.android.launcher3.views.ActivityContext;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -102,7 +102,7 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> {
         setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_YES);
 
         mFocusIndicatorHelper = new ViewGroupFocusHelper(this);
-        mViewCache = BaseActivity.fromContext(context).getViewCache();
+        mViewCache = ActivityContext.lookupContext(context).getViewCache();
     }
 
     public void setFolder(Folder folder) {
diff --git a/src/com/android/launcher3/folder/LauncherDelegate.java b/src/com/android/launcher3/folder/LauncherDelegate.java
new file mode 100644
index 0000000000..f7d8e8c0d1
--- /dev/null
+++ b/src/com/android/launcher3/folder/LauncherDelegate.java
@@ -0,0 +1,225 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.folder;
+
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_FOLDER_CONVERTED_TO_ICON;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.view.MotionEvent;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.CellLayout;
+import com.android.launcher3.DragSource;
+import com.android.launcher3.DropTarget;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.dragndrop.DragOptions;
+import com.android.launcher3.logging.InstanceId;
+import com.android.launcher3.logging.StatsLogManager.StatsLogger;
+import com.android.launcher3.model.ModelWriter;
+import com.android.launcher3.model.data.FolderInfo;
+import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.launcher3.views.ActivityContext;
+import com.android.launcher3.views.BaseDragLayer;
+import com.android.launcher3.views.BaseDragLayer.LayoutParams;
+import com.android.launcher3.widget.LocalColorExtractor;
+
+import java.util.Arrays;
+import java.util.Optional;
+import java.util.function.Consumer;
+
+/**
+ * Wrapper around Launcher methods to allow folders in non-launcher context
+ */
+public class LauncherDelegate {
+
+    private final Launcher mLauncher;
+    private final Rect mTempRect = new Rect();
+    private final RectF mTempRectF = new RectF();
+
+    private LauncherDelegate(Launcher launcher) {
+        mLauncher = launcher;
+    }
+
+    void init(Folder folder, FolderIcon icon) {
+        folder.setDragController(mLauncher.getDragController());
+        icon.setOnFocusChangeListener(mLauncher.getFocusHandler());
+    }
+
+    boolean isDraggingEnabled() {
+        return mLauncher.isDraggingEnabled();
+    }
+
+    void beginDragShared(View child, DragSource source, DragOptions options) {
+        mLauncher.getWorkspace().beginDragShared(child, source, options);
+    }
+
+    ModelWriter getModelWriter() {
+        return mLauncher.getModelWriter();
+    }
+
+    void forEachVisibleWorkspacePage(Consumer<View> callback) {
+        mLauncher.getWorkspace().forEachVisiblePage(callback);
+    }
+
+    @Nullable
+    Launcher getLauncher() {
+        return mLauncher;
+    }
+
+    void addRectForColorExtraction(BaseDragLayer.LayoutParams lp, LocalColorExtractor target) {
+        mTempRect.set(lp.x, lp.y, lp.x + lp.width, lp.y + lp.height);
+        target.getExtractedRectForViewRect(mLauncher,
+                mLauncher.getWorkspace().getCurrentPage(), mTempRect, mTempRectF);
+        if (!mTempRectF.isEmpty()) {
+            target.addLocation(Arrays.asList(mTempRectF));
+        }
+    }
+
+    void replaceFolderWithFinalItem(Folder folder) {
+        // Add the last remaining child to the workspace in place of the folder
+        Runnable onCompleteRunnable = new Runnable() {
+            @Override
+            public void run() {
+                int itemCount = folder.getItemCount();
+                FolderInfo info = folder.mInfo;
+                if (itemCount <= 1) {
+                    View newIcon = null;
+                    WorkspaceItemInfo finalItem = null;
+
+                    if (itemCount == 1) {
+                        // Move the item from the folder to the workspace, in the position of the
+                        // folder
+                        CellLayout cellLayout = mLauncher.getCellLayout(info.container,
+                                info.screenId);
+                        finalItem =  info.contents.remove(0);
+                        newIcon = mLauncher.createShortcut(cellLayout, finalItem);
+                        mLauncher.getModelWriter().addOrMoveItemInDatabase(finalItem,
+                                info.container, info.screenId, info.cellX, info.cellY);
+                    }
+
+                    // Remove the folder
+                    mLauncher.removeItem(folder.mFolderIcon, info, true /* deleteFromDb */);
+                    if (folder.mFolderIcon instanceof DropTarget) {
+                        folder.mDragController.removeDropTarget((DropTarget) folder.mFolderIcon);
+                    }
+
+                    if (newIcon != null) {
+                        // We add the child after removing the folder to prevent both from existing
+                        // at the same time in the CellLayout.  We need to add the new item with
+                        // addInScreenFromBind() to ensure that hotseat items are placed correctly.
+                        mLauncher.getWorkspace().addInScreenFromBind(newIcon, info);
+
+                        // Focus the newly created child
+                        newIcon.requestFocus();
+                    }
+                    if (finalItem != null) {
+                        StatsLogger logger = mLauncher.getStatsLogManager().logger()
+                                .withItemInfo(finalItem);
+                        ((Optional<InstanceId>) folder.mDragController.getLogInstanceId())
+                                .map(logger::withInstanceId)
+                                .orElse(logger)
+                                .log(LAUNCHER_FOLDER_CONVERTED_TO_ICON);
+                    }
+                }
+            }
+        };
+        View finalChild = folder.mContent.getLastItem();
+        if (finalChild != null) {
+            folder.mFolderIcon.performDestroyAnimation(onCompleteRunnable);
+        } else {
+            onCompleteRunnable.run();
+        }
+    }
+
+
+    boolean interceptOutsideTouch(MotionEvent ev, BaseDragLayer dl, Folder folder) {
+        if (mLauncher.getAccessibilityDelegate().isInAccessibleDrag()) {
+            // Do not close the container if in drag and drop.
+            if (!dl.isEventOverView(mLauncher.getDropTargetBar(), ev)) {
+                return true;
+            }
+        } else {
+            // TODO: add ww log if need to gather tap outside to close folder
+            folder.close(true);
+            return true;
+        }
+        return false;
+    }
+
+    private static class FallbackDelegate extends LauncherDelegate {
+
+        private final ActivityContext mContext;
+        private ModelWriter mWriter;
+
+        FallbackDelegate(ActivityContext context) {
+            super(null);
+            mContext = context;
+        }
+
+        @Override
+        void init(Folder folder, FolderIcon icon) {
+            folder.setDragController(mContext.getDragController());
+        }
+
+        @Override
+        boolean isDraggingEnabled() {
+            return false;
+        }
+
+        @Override
+        void beginDragShared(View child, DragSource source, DragOptions options) { }
+
+        @Override
+        ModelWriter getModelWriter() {
+            if (mWriter == null) {
+                mWriter = LauncherAppState.getInstance((Context) mContext).getModel()
+                        .getWriter(false, false);
+            }
+            return mWriter;
+        }
+
+        @Override
+        void forEachVisibleWorkspacePage(Consumer<View> callback) { }
+
+        @Override
+        Launcher getLauncher() {
+            return null;
+        }
+
+        @Override
+        void replaceFolderWithFinalItem(Folder folder) { }
+
+        @Override
+        boolean interceptOutsideTouch(MotionEvent ev, BaseDragLayer dl, Folder folder) {
+            folder.close(true);
+            return true;
+        }
+
+        @Override
+        void addRectForColorExtraction(LayoutParams lp, LocalColorExtractor target) { }
+    }
+
+    static LauncherDelegate from(ActivityContext context) {
+        return context instanceof Launcher
+                ? new LauncherDelegate((Launcher) context)
+                : new FallbackDelegate(context);
+    }
+}
diff --git a/src/com/android/launcher3/util/UiThreadHelper.java b/src/com/android/launcher3/util/UiThreadHelper.java
index f5e1234a28..523f3d6d13 100644
--- a/src/com/android/launcher3/util/UiThreadHelper.java
+++ b/src/com/android/launcher3/util/UiThreadHelper.java
@@ -23,11 +23,12 @@ import android.content.Context;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
+import android.view.View;
 import android.view.WindowInsets;
 import android.view.inputmethod.InputMethodManager;
 
-import com.android.launcher3.Launcher;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.views.ActivityContext;
 
 /**
  * Utility class for offloading some class from UI thread
@@ -43,21 +44,21 @@ public class UiThreadHelper {
     private static final int MSG_RUN_COMMAND = 3;
 
     @SuppressLint("NewApi")
-    public static void hideKeyboardAsync(Launcher launcher, IBinder token) {
+    public static void hideKeyboardAsync(ActivityContext activityContext, IBinder token) {
+        View root = activityContext.getDragLayer();
         if (Utilities.ATLEAST_R) {
-            WindowInsets rootInsets = launcher.getRootView().getRootWindowInsets();
+            WindowInsets rootInsets = root.getRootWindowInsets();
             boolean isImeShown = rootInsets != null && rootInsets.isVisible(
                     WindowInsets.Type.ime());
             if (isImeShown) {
                 // this call is already asynchronous
-                launcher.getAppsView().getWindowInsetsController().hide(
-                        WindowInsets.Type.ime()
-                );
+                root.getWindowInsetsController().hide(WindowInsets.Type.ime());
             }
             return;
         }
 
-        Message.obtain(HANDLER.get(launcher), MSG_HIDE_KEYBOARD, token).sendToTarget();
+        Message.obtain(HANDLER.get(root.getContext()),
+                MSG_HIDE_KEYBOARD, token).sendToTarget();
     }
 
     public static void setOrientationAsync(Activity activity, int orientation) {
diff --git a/src/com/android/launcher3/views/ActivityContext.java b/src/com/android/launcher3/views/ActivityContext.java
index 71aa4ac445..646b66942c 100644
--- a/src/com/android/launcher3/views/ActivityContext.java
+++ b/src/com/android/launcher3/views/ActivityContext.java
@@ -23,7 +23,9 @@ import android.view.View.AccessibilityDelegate;
 
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.dot.DotInfo;
+import com.android.launcher3.dragndrop.DragController;
 import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.util.ViewCache;
 
 /**
  * An interface to be used along with a context for various activities in Launcher. This allows a
@@ -86,6 +88,17 @@ public interface ActivityContext {
 
     DeviceProfile getDeviceProfile();
 
+    default ViewCache getViewCache() {
+        return new ViewCache();
+    }
+
+    /**
+     * Controller for supporting item drag-and-drop
+     */
+    default <T extends DragController> T getDragController() {
+        return null;
+    }
+
     /**
      * Returns the ActivityContext associated with the given Context.
      */
-- 
GitLab


From eefc2e1de1854ed20928176410adf180b8c0bda1 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Fri, 7 May 2021 14:30:26 -0700
Subject: [PATCH 1124/1664] Diagnosing only system health problems happened
 during the test

Test: presubmit
Bug: 187761685
Change-Id: I3feba12e2228fe6dda3b0d65d904b0b839da2108
---
 .../quickstep/FallbackRecentsTest.java        | 16 +++++++++---
 .../launcher3/ui/AbstractLauncherUiTest.java  | 17 +++++++-----
 .../tapl/LauncherInstrumentation.java         | 26 +++++++++++++------
 3 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
index f93d87c8c3..1fa21bd395 100644
--- a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
+++ b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
@@ -62,6 +62,7 @@ import com.android.launcher3.util.rule.FailureWatcher;
 import com.android.quickstep.views.RecentsView;
 
 import org.junit.After;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.RuleChain;
@@ -142,10 +143,19 @@ public class FallbackRecentsTest {
         }
     }
 
+    @Before
+    public void setUp() {
+        mLauncher.onTestStart();
+    }
+
     @After
-    public void verifyLauncherState() {
-        // Limits UI tests affecting tests running after them.
-        AbstractQuickStepTest.checkDetectedLeaks(mLauncher);
+    public void tearDown() {
+        try {
+            // Limits UI tests affecting tests running after them.
+            AbstractQuickStepTest.checkDetectedLeaks(mLauncher);
+        } finally {
+            mLauncher.onTestFinish();
+        }
     }
 
     // b/143488140
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index 2a0f7bb6fd..8936f39e88 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -249,6 +249,7 @@ public abstract class AbstractLauncherUiTest {
 
     @Before
     public void setUp() throws Exception {
+        mLauncher.onTestStart();
         Assert.assertTrue("Keyguard is visible, which is likely caused by a crash in SysUI",
                 TestHelpers.wait(
                         Until.gone(By.res(SYSTEMUI_PACKAGE, "keyguard_status_view")), 60000));
@@ -288,13 +289,17 @@ public abstract class AbstractLauncherUiTest {
 
     @After
     public void verifyLauncherState() {
-        // Limits UI tests affecting tests running after them.
-        mLauncher.waitForLauncherInitialized();
-        if (mLauncherPid != 0) {
-            assertEquals("Launcher crashed, pid mismatch:",
-                    mLauncherPid, mLauncher.getPid().intValue());
+        try {
+            // Limits UI tests affecting tests running after them.
+            mLauncher.waitForLauncherInitialized();
+            if (mLauncherPid != 0) {
+                assertEquals("Launcher crashed, pid mismatch:",
+                        mLauncherPid, mLauncher.getPid().intValue());
+            }
+            checkDetectedLeaks(mLauncher);
+        } finally {
+            mLauncher.onTestFinish();
         }
-        checkDetectedLeaks(mLauncher);
     }
 
     protected void clearLauncherData() {
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index e5b93b1890..3dff01ee56 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -95,7 +95,6 @@ public final class LauncherInstrumentation {
     private static final String TAG = "Tapl";
     private static final int ZERO_BUTTON_STEPS_FROM_BACKGROUND_TO_HOME = 20;
     private static final int GESTURE_STEP_MS = 16;
-    private static long START_TIME = System.currentTimeMillis();
 
     private static final Pattern EVENT_TOUCH_DOWN = getTouchEventPattern("ACTION_DOWN");
     private static final Pattern EVENT_TOUCH_UP = getTouchEventPattern("ACTION_UP");
@@ -107,6 +106,7 @@ public final class LauncherInstrumentation {
     static final Pattern EVENT_TOUCH_UP_TIS = getTouchEventPatternTIS("ACTION_UP");
     private final String mLauncherPackage;
     private final boolean mIsLauncher3;
+    private long mTestStartTime = -1;
 
     // Types for launcher containers that the user is interacting with. "Background" is a
     // pseudo-container corresponding to inactive launcher covered by another app.
@@ -422,6 +422,14 @@ public final class LauncherInstrumentation {
         mOnSettledStateAction = onSettledStateAction;
     }
 
+    public void onTestStart() {
+        mTestStartTime = System.currentTimeMillis();
+    }
+
+    public void onTestFinish() {
+        mTestStartTime = -1;
+    }
+
     private String formatSystemHealthMessage(String message) {
         final String testPackage = getContext().getPackageName();
 
@@ -430,14 +438,16 @@ public final class LauncherInstrumentation {
         mInstrumentation.getUiAutomation().grantRuntimePermission(
                 testPackage, "android.permission.PACKAGE_USAGE_STATS");
 
-        final String systemHealth = mSystemHealthSupplier != null
-                ? mSystemHealthSupplier.apply(START_TIME)
-                : TestHelpers.getSystemHealthMessage(getContext(), START_TIME);
+        if (mTestStartTime > 0) {
+            final String systemHealth = mSystemHealthSupplier != null
+                    ? mSystemHealthSupplier.apply(mTestStartTime)
+                    : TestHelpers.getSystemHealthMessage(getContext(), mTestStartTime);
 
-        if (systemHealth != null) {
-            return message
-                    + ",\nperhaps linked to system health problems:\n<<<<<<<<<<<<<<<<<<\n"
-                    + systemHealth + "\n>>>>>>>>>>>>>>>>>>";
+            if (systemHealth != null) {
+                return message
+                        + ",\nperhaps linked to system health problems:\n<<<<<<<<<<<<<<<<<<\n"
+                        + systemHealth + "\n>>>>>>>>>>>>>>>>>>";
+            }
         }
 
         return message;
-- 
GitLab


From a6cb751715c0c69a92ddfece6f082ffb4f365d5e Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Mon, 10 May 2021 17:50:41 -0700
Subject: [PATCH 1125/1664] Improving TAPL error messages

Test: forrest
Bug: 187761685
Change-Id: I822f3f28e7153028fb5746e037066153478ec86d
---
 .../launcher3/tapl/LauncherInstrumentation.java      | 12 ++++++------
 .../com/android/launcher3/tapl/LogEventChecker.java  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 3dff01ee56..fdbae54271 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -445,11 +445,10 @@ public final class LauncherInstrumentation {
 
             if (systemHealth != null) {
                 return message
-                        + ",\nperhaps linked to system health problems:\n<<<<<<<<<<<<<<<<<<\n"
+                        + ";\nPerhaps linked to system health problems:\n<<<<<<<<<<<<<<<<<<\n"
                         + systemHealth + "\n>>>>>>>>>>>>>>>>>>";
             }
         }
-
         return message;
     }
 
@@ -460,7 +459,7 @@ public final class LauncherInstrumentation {
             if (checkEvents) {
                 final String eventMismatch = eventChecker.verify(0, false);
                 if (eventMismatch != null) {
-                    message = message + ", having produced " + eventMismatch;
+                    message = message + ";\n" + eventMismatch;
                 }
             } else {
                 eventChecker.finishNoWait();
@@ -497,12 +496,13 @@ public final class LauncherInstrumentation {
     private void fail(String message) {
         checkForAnomaly();
         Assert.fail(formatSystemHealthMessage(formatErrorWithEvents(
-                "http://go/tapl : " + getContextDescription() + message
-                        + " (visible state: " + getVisibleStateMessage() + ")", true)));
+                "http://go/tapl test failure:\nOverview: " + getContextDescription()
+                        + " - visible state is " + getVisibleStateMessage()
+                        + ";\nDetails: " + message, true)));
     }
 
     private String getContextDescription() {
-        return mDiagnosticContext.isEmpty() ? "" : String.join(", ", mDiagnosticContext) + "; ";
+        return mDiagnosticContext.isEmpty() ? "" : String.join(", ", mDiagnosticContext);
     }
 
     void assertTrue(String message, boolean condition) {
diff --git a/tests/tapl/com/android/launcher3/tapl/LogEventChecker.java b/tests/tapl/com/android/launcher3/tapl/LogEventChecker.java
index ab6465c572..a809e2e30c 100644
--- a/tests/tapl/com/android/launcher3/tapl/LogEventChecker.java
+++ b/tests/tapl/com/android/launcher3/tapl/LogEventChecker.java
@@ -115,7 +115,7 @@ public class LogEventChecker {
             }
         }
 
-        return hasMismatches ? "mismatching events: " + sb.toString() : null;
+        return hasMismatches ? "Mismatching events: " + sb.toString() : null;
     }
 
     // If the list of actual events matches the list of expected events, returns -1, otherwise
-- 
GitLab


From 6a7094d43af37cfb1d173309e73f9196cccb61f0 Mon Sep 17 00:00:00 2001
From: Jon Spivack <spivack@google.com>
Date: Mon, 10 May 2021 18:22:52 -0700
Subject: [PATCH 1126/1664] Rework NIU Actions buttons UI

The shapes, colors, icons, and layout of the NIU Actions buttons have been updated to match the latest UI specs. The icons also no longer overlap with the layout above them, which solves a picking issue.

Bug: 186004471
Bug: 187460625
Test: Manual (tried on Wembley and Pixel 3A)
Change-Id: Ie7a0ca0c21805fc0f126053ec791fd2460710d33
---
 go/quickstep/res/drawable/ic_listen.xml       | 22 ++---
 go/quickstep/res/drawable/ic_search.xml       | 28 +++---
 go/quickstep/res/drawable/ic_translate.xml    | 22 ++---
 .../res/drawable/round_rect_button.xml        | 20 ++++
 .../res/layout/overview_actions_container.xml | 96 ++++++++++---------
 go/quickstep/res/values/colors.xml            | 21 ++++
 go/quickstep/res/values/dimens.xml            | 26 +++++
 go/quickstep/res/values/styles.xml            | 33 +++++--
 8 files changed, 174 insertions(+), 94 deletions(-)
 create mode 100644 go/quickstep/res/drawable/round_rect_button.xml
 create mode 100644 go/quickstep/res/values/colors.xml
 create mode 100644 go/quickstep/res/values/dimens.xml

diff --git a/go/quickstep/res/drawable/ic_listen.xml b/go/quickstep/res/drawable/ic_listen.xml
index a8e6c9382a..16bb59789b 100644
--- a/go/quickstep/res/drawable/ic_listen.xml
+++ b/go/quickstep/res/drawable/ic_listen.xml
@@ -13,20 +13,12 @@
      limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28dp"
-    android:height="28dp"
-    android:viewportWidth="28"
-    android:viewportHeight="28">
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
+        android:tint="?attr/colorControlNormal">
   <path
-      android:pathData="M10.5,15.17c2.58,0 4.67,-2.09 4.67,-4.67s-2.09,-4.67 -4.67,-4.67c-2.58,0 -4.67,2.09 -4.67,4.67S7.92,15.17 10.5,15.17zM10.5,8.17c1.28,0 2.33,1.05 2.33,2.33s-1.05,2.33 -2.33,2.33c-1.28,0 -2.33,-1.05 -2.33,-2.33S9.22,8.17 10.5,8.17z"
-      android:fillColor="#4285F4"/>
-  <path
-      android:pathData="M10.5,17.5c-3.11,0 -9.33,1.56 -9.33,4.67v2.33h18.67v-2.33C19.83,19.06 13.62,17.5 10.5,17.5zM3.5,22.17c0.26,-0.84 3.86,-2.33 7,-2.33c3.15,0 6.77,1.5 7,2.33H3.5z"
-      android:fillColor="#4285F4"/>
-  <path
-      android:pathData="M25.67,10.5c0,0.36 -0.02,0.71 -0.05,1.05c-0.01,0.15 -0.03,0.29 -0.05,0.43c-0.02,0.18 -0.05,0.36 -0.08,0.54c-0.04,0.2 -0.07,0.39 -0.12,0.58c-0.01,0.06 -0.03,0.11 -0.04,0.17c-0.59,2.34 -1.81,4.01 -2.52,4.82c-0.09,0.1 -0.18,0.2 -0.28,0.3c-0.17,0.18 -0.27,0.27 -0.27,0.27l-1.65,-1.63c1.34,-1.33 2.27,-3.07 2.6,-5.01c0.01,-0.08 0.02,-0.16 0.04,-0.24c0.06,-0.42 0.1,-0.85 0.1,-1.29c0,-0.44 -0.04,-0.88 -0.1,-1.3c-0.01,-0.06 -0.02,-0.13 -0.03,-0.19c-0.32,-1.95 -1.25,-3.7 -2.6,-5.04l1.65,-1.63c0,0 0.11,0.1 0.27,0.27c0.09,0.1 0.19,0.2 0.28,0.3c0.71,0.82 1.93,2.48 2.52,4.82c0.01,0.06 0.03,0.11 0.04,0.17c0.04,0.19 0.08,0.38 0.12,0.58c0.03,0.18 0.06,0.36 0.08,0.54c0.02,0.14 0.04,0.28 0.05,0.43C25.65,9.79 25.67,10.14 25.67,10.5z"
-      android:fillColor="#EA4335"/>
-  <path
-      android:pathData="M20.61,8.4C20.85,9.06 21,9.76 21,10.5s-0.15,1.44 -0.39,2.1c-0.28,0.77 -0.71,1.46 -1.25,2.05l-1.66,-1.64c0.56,-0.63 0.91,-1.44 0.95,-2.34c0,-0.06 0.02,-0.11 0.02,-0.17s-0.01,-0.11 -0.02,-0.17c-0.04,-0.9 -0.39,-1.71 -0.95,-2.34l1.66,-1.64C19.9,6.94 20.32,7.63 20.61,8.4z"
-      android:fillColor="#FBBC04"/>
+      android:fillColor="@android:color/white"
+      android:pathData="M15.08,7.05c0.84,1.18 0.84,2.71 0,3.89l1.68,1.69c2.02,-2.02 2.02,-5.07 0,-7.27l-1.68,1.69zM20.07,2l-1.63,1.63c2.77,3.02 2.77,7.56 0,10.74L20.07,16c3.9,-3.89 3.91,-9.95 0,-14zM9,13c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM9,7c1.1,0 2,0.9 2,2s-0.9,2 -2,2 -2,-0.9 -2,-2 0.9,-2 2,-2zM9,14c-2.67,0 -8,1.34 -8,4v3h16v-3c0,-2.66 -5.33,-4 -8,-4zM15,19L3,19v-0.99C3.2,17.29 6.3,16 9,16s5.8,1.29 6,2v1z"/>
 </vector>
diff --git a/go/quickstep/res/drawable/ic_search.xml b/go/quickstep/res/drawable/ic_search.xml
index 4307330414..ce290d9901 100644
--- a/go/quickstep/res/drawable/ic_search.xml
+++ b/go/quickstep/res/drawable/ic_search.xml
@@ -13,20 +13,24 @@
      limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28dp"
-    android:height="28dp"
-    android:viewportWidth="28"
-    android:viewportHeight="28">
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
+        android:tint="?attr/colorControlNormal">
   <path
-      android:pathData="M24.5,22.75l-6.84,-6.84c1,-1.35 1.59,-3.02 1.59,-4.83h-2.33c0,3.22 -2.62,5.83 -5.83,5.83v2.33c1.81,0 3.47,-0.6 4.83,-1.59l6.84,6.84L24.5,22.75z"
-      android:fillColor="#4285F4"/>
+      android:fillColor="@android:color/white"
+      android:pathData="M16,3h-2v2h2c1.65,0 3,1.35 3,3v2h2V8C21,5.24 18.76,3 16,3z"/>
   <path
-      android:pathData="M11.08,2.92v2.33c3.22,0 5.83,2.62 5.83,5.83h2.33C19.25,6.57 15.59,2.92 11.08,2.92z"
-      android:fillColor="#34A853"/>
+      android:fillColor="@android:color/white"
+      android:pathData="M5,16v-2H3v2c0,2.76 2.24,5 5,5h2v-2H8C6.35,19 5,17.65 5,16z"/>
   <path
-      android:pathData="M5.25,11.08H2.92c0,4.51 3.66,8.17 8.17,8.17v-2.33C7.87,16.92 5.25,14.3 5.25,11.08z"
-      android:fillColor="#EA4335"/>
+      android:fillColor="@android:color/white"
+      android:pathData="M12,8.5c-1.93,0 -3.5,1.57 -3.5,3.5s1.57,3.5 3.5,3.5s3.5,-1.57 3.5,-3.5S13.93,8.5 12,8.5z"/>
   <path
-      android:pathData="M2.92,11.08h2.33c0,-3.22 2.62,-5.83 5.83,-5.83V2.92C6.57,2.92 2.92,6.57 2.92,11.08z"
-      android:fillColor="#FBBC04"/>
+      android:fillColor="@android:color/white"
+      android:pathData="M18,18m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M5,8c0,-1.65 1.35,-3 3,-3h2V3H8C5.24,3 3,5.24 3,8v2h2V8z"/>
 </vector>
diff --git a/go/quickstep/res/drawable/ic_translate.xml b/go/quickstep/res/drawable/ic_translate.xml
index 1247807fcd..e3df56fdb8 100644
--- a/go/quickstep/res/drawable/ic_translate.xml
+++ b/go/quickstep/res/drawable/ic_translate.xml
@@ -13,20 +13,12 @@
      limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28dp"
-    android:height="28dp"
-    android:viewportWidth="28"
-    android:viewportHeight="28">
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
+        android:tint="?attr/colorControlNormal">
   <path
-      android:pathData="M12.28,15.19l-0.07,-0.05c-0.61,-0.49 -1.15,-1.05 -1.65,-1.63c-1.05,-1.22 -1.88,-2.63 -2.39,-4.17H5.83c0.54,2.17 1.58,4.16 3.01,5.85l-5.93,5.23l1.75,1.75l5.91,-5.26c0.05,0.04 0.1,0.09 0.15,0.13l3.42,2.79l1.02,-2.33L12.28,15.19z"
-      android:fillColor="#FBBC04"/>
-  <path
-      android:pathData="M21.58,11.67h-2.33l-5.25,14h2.33l1.31,-3.5h5.54l1.32,3.5h2.33L21.58,11.67zM18.53,19.83l1.89,-5.05l1.89,5.05H18.53z"
-      android:fillColor="#4285F4"/>
-  <path
-      android:pathData="M11.67,2.33l-2.34,0l0,2.34l-8.16,0l0,2.33l10.5,0l0,-2.33z"
-      android:fillColor="#EA4335"/>
-  <path
-      android:pathData="M11.67,4.67V7H14c-0.61,2.42 -1.79,4.65 -3.44,6.5c0.5,0.59 1.04,1.15 1.65,1.63l0.07,0.05c2.03,-2.32 3.44,-5.14 4.05,-8.19h3.5V4.67H11.67z"
-      android:fillColor="#34A853"/>
+      android:fillColor="@android:color/white"
+      android:pathData="M12.87,15.07l-2.54,-2.51 0.03,-0.03c1.74,-1.94 2.98,-4.17 3.71,-6.53L17,6L17,4h-7L10,2L8,2v2L1,4v1.99h11.17C11.5,7.92 10.44,9.75 9,11.35 8.07,10.32 7.3,9.19 6.69,8h-2c0.73,1.63 1.73,3.17 2.98,4.56l-5.09,5.02L4,19l5,-5 3.11,3.11 0.76,-2.04zM18.5,10h-2L12,22h2l1.12,-3h4.75L21,22h2l-4.5,-12zM15.88,17l1.62,-4.33L19.12,17h-3.24z"/>
 </vector>
diff --git a/go/quickstep/res/drawable/round_rect_button.xml b/go/quickstep/res/drawable/round_rect_button.xml
new file mode 100644
index 0000000000..b276686a41
--- /dev/null
+++ b/go/quickstep/res/drawable/round_rect_button.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <corners android:radius="@dimen/go_button_corner_radius" />
+</shape>
diff --git a/go/quickstep/res/layout/overview_actions_container.xml b/go/quickstep/res/layout/overview_actions_container.xml
index 4aa77744aa..6a331ea235 100644
--- a/go/quickstep/res/layout/overview_actions_container.xml
+++ b/go/quickstep/res/layout/overview_actions_container.xml
@@ -25,7 +25,7 @@
         android:id="@+id/action_buttons"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
+        android:layout_gravity="top|center_horizontal"
         android:orientation="horizontal">
 
         <Space
@@ -33,62 +33,75 @@
             android:layout_height="1dp"
             android:layout_weight="1" />
 
-        <Button
-            android:id="@+id/action_translate"
-            style="@style/GoOverviewActionButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawableTop="@drawable/ic_translate"
-            android:drawablePadding="1dp"
-            android:text="@string/action_translate"
-            android:theme="@style/ThemeControlHighlightWorkspaceColor" />
+        <LinearLayout
+            style="@style/GoOverviewActionButtonContainer">
+            <ImageButton
+                android:id="@+id/action_translate"
+                style="@style/GoOverviewActionButton"
+                android:src="@drawable/ic_translate"
+                android:contentDescription="@string/action_translate" />
+            <TextView
+                style="@style/GoOverviewActionButtonCaption"
+                android:text="@string/action_translate" />
+        </LinearLayout>
 
         <Space
             android:layout_width="0dp"
             android:layout_height="1dp"
             android:layout_weight="1" />
 
-        <Button
-            android:id="@+id/action_listen"
-            style="@style/GoOverviewActionButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawableTop="@drawable/ic_listen"
-            android:drawablePadding="1dp"
-            android:text="@string/action_listen"
-            android:theme="@style/ThemeControlHighlightWorkspaceColor" />
+        <LinearLayout
+            style="@style/GoOverviewActionButtonContainer">
+            <ImageButton
+                android:id="@+id/action_listen"
+                style="@style/GoOverviewActionButton"
+                android:src="@drawable/ic_listen"
+                android:contentDescription="@string/action_listen"
+                android:background="@drawable/round_rect_button" />
+            <TextView
+                style="@style/GoOverviewActionButtonCaption"
+                android:text="@string/action_listen" />
+        </LinearLayout>
 
         <Space
             android:layout_width="0dp"
             android:layout_height="1dp"
             android:layout_weight="1" />
 
-        <Button
-            android:id="@+id/action_screenshot"
-            style="@style/GoOverviewActionButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawableTop="@drawable/ic_screenshot"
-            android:drawablePadding="1dp"
-            android:text="@string/action_screenshot"
-            android:theme="@style/ThemeControlHighlightWorkspaceColor" />
+        <LinearLayout
+            style="@style/GoOverviewActionButtonContainer">
+            <ImageButton
+                android:id="@+id/action_screenshot"
+                style="@style/GoOverviewActionButton"
+                android:src="@drawable/ic_screenshot"
+                android:contentDescription="@string/action_screenshot"
+                android:background="@drawable/round_rect_button" />
+            <TextView
+                style="@style/GoOverviewActionButtonCaption"
+                android:text="@string/action_screenshot" />
+        </LinearLayout>
 
         <Space
             android:layout_width="0dp"
             android:layout_height="1dp"
             android:layout_weight="1" />
 
-        <Button
-            android:id="@+id/action_search"
-            style="@style/GoOverviewActionButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawableTop="@drawable/ic_search"
-            android:drawablePadding="1dp"
-            android:text="@string/action_search"
-            android:theme="@style/ThemeControlHighlightWorkspaceColor"
-            android:visibility="gone" />
+        <!-- Will be enabled in a future version. -->
+        <LinearLayout
+            style="@style/GoOverviewActionButtonContainer"
+            android:visibility="gone" >
+            <ImageButton
+                android:id="@+id/action_search"
+                style="@style/GoOverviewActionButton"
+                android:src="@drawable/ic_search"
+                android:contentDescription="@string/action_search"
+                android:background="@drawable/round_rect_button" />
+            <TextView
+                style="@style/GoOverviewActionButtonCaption"
+                android:text="@string/action_search" />
+        </LinearLayout>
 
+        <!-- Unused. Included only for compatibility with parent class. -->
         <Button
             android:id="@+id/action_share"
             style="@style/GoOverviewActionButton"
@@ -98,13 +111,6 @@
             android:text="@string/action_share"
             android:theme="@style/ThemeControlHighlightWorkspaceColor"
             android:visibility="gone" />
-
-        <Space
-            android:id="@+id/oav_three_button_space"
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_weight="1"
-            android:visibility="gone" />
     </LinearLayout>
 
 </com.android.quickstep.views.GoOverviewActionsView>
\ No newline at end of file
diff --git a/go/quickstep/res/values/colors.xml b/go/quickstep/res/values/colors.xml
new file mode 100644
index 0000000000..9383770318
--- /dev/null
+++ b/go/quickstep/res/values/colors.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <!-- Overview -->
+    <color name="go_overview_button_icon_color">#3C4043</color>
+    <color name="go_overview_button_color">#70FFFFFF</color>
+</resources>
diff --git a/go/quickstep/res/values/dimens.xml b/go/quickstep/res/values/dimens.xml
new file mode 100644
index 0000000000..cb260b55d1
--- /dev/null
+++ b/go/quickstep/res/values/dimens.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <dimen name="go_button_corner_radius">20dp</dimen>
+
+    <!-- Overview -->
+    <dimen name="go_overview_button_width">60dp</dimen>
+    <dimen name="go_overview_button_height">60dp</dimen>
+    <dimen name="go_overview_button_container_width">80dp</dimen>
+    <dimen name="go_overview_button_caption_margin">8dp</dimen>
+</resources>
diff --git a/go/quickstep/res/values/styles.xml b/go/quickstep/res/values/styles.xml
index 927c49aa05..df49ecd4d3 100644
--- a/go/quickstep/res/values/styles.xml
+++ b/go/quickstep/res/values/styles.xml
@@ -15,12 +15,31 @@
      limitations under the License.
 -->
 <resources>
-    <style name="GoOverviewActionButton"
-        parent="@android:style/Widget.DeviceDefault.Button">
-        <item name="android:textColor">@color/overview_button</item>
-        <item name="android:drawableTint">@color/overview_button</item>
-        <item name="android:tint">?android:attr/textColorPrimary</item>
-        <item name="android:drawablePadding">8dp</item>
-        <item name="android:textAllCaps">false</item>
+    <style name="GoOverviewActionButton">
+        <item name="android:tint">@color/go_overview_button_icon_color</item>
+        <item name="android:backgroundTint">@color/go_overview_button_color</item>
+        <item name="android:background">@drawable/round_rect_button</item>
+        <item name="android:layout_width">@dimen/go_overview_button_width</item>
+        <item name="android:layout_height">@dimen/go_overview_button_height</item>
+        <item name="android:layout_gravity">center_horizontal</item>
+    </style>
+
+    <style name="GoOverviewActionButtonCaption">
+        <item name="android:fontFamily">roboto-medium</item>
+        <item name="android:textSize">14dp</item>
+        <item name="android:textColor">@color/go_overview_button_icon_color</item>
+        <item name="android:lineHeight">20dp</item>
+        <item name="android:textAlignment">center</item>
+        <item name="android:importantForAccessibility">no</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">@dimen/go_overview_button_caption_margin</item>
+        <item name="android:layout_gravity">center_horizontal</item>
+    </style>
+
+    <style name="GoOverviewActionButtonContainer">
+        <item name="android:layout_width">@dimen/go_overview_button_container_width</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:orientation">vertical</item>
     </style>
 </resources>
\ No newline at end of file
-- 
GitLab


From 108367c948b6f558562219dc94304000b91918b2 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Tue, 11 May 2021 04:18:58 +0000
Subject: [PATCH 1127/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Ie96b140705ddb74ae0fdfe16dec8fc123dd73997
---
 quickstep/res/values-af/strings.xml     | 12 ++++--------
 quickstep/res/values-da/strings.xml     | 12 ++++--------
 quickstep/res/values-es-rUS/strings.xml | 12 ++++--------
 quickstep/res/values-fa/strings.xml     | 12 ++++--------
 quickstep/res/values-kn/strings.xml     | 12 ++++--------
 quickstep/res/values-ms/strings.xml     | 12 ++++--------
 quickstep/res/values-nl/strings.xml     | 12 ++++--------
 quickstep/res/values-pl/strings.xml     | 12 ++++--------
 quickstep/res/values-pt/strings.xml     | 12 ++++--------
 quickstep/res/values-sk/strings.xml     | 12 ++++--------
 quickstep/res/values-zu/strings.xml     | 12 ++++--------
 11 files changed, 44 insertions(+), 88 deletions(-)

diff --git a/quickstep/res/values-af/strings.xml b/quickstep/res/values-af/strings.xml
index 046b3a0696..0a82e04fb0 100644
--- a/quickstep/res/values-af/strings.xml
+++ b/quickstep/res/values-af/strings.xml
@@ -74,14 +74,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Probeer weer"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Mooi so!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutoriaal <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Gereed!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Swiep op om na die tuisskerm toe te gaan"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Jy is gereed om jou foon te begin gebruik"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Navigasie-instellings vir toeganklikheid"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Deel"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Skermkiekie"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Jou organisasie laat nie hierdie program toe nie"</string>
diff --git a/quickstep/res/values-da/strings.xml b/quickstep/res/values-da/strings.xml
index 048ced16ea..f4519b89c0 100644
--- a/quickstep/res/values-da/strings.xml
+++ b/quickstep/res/values-da/strings.xml
@@ -74,14 +74,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Prøv igen"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Sådan!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Selvstudie <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Alt er parat!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Stryg opad for at gå til startsiden"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Du er klar til at bruge din telefon"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Navigationsindstillinger for hjælpefunktioner"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Del"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Appen eller din organisation tillader ikke denne handling"</string>
diff --git a/quickstep/res/values-es-rUS/strings.xml b/quickstep/res/values-es-rUS/strings.xml
index 2cb0429d8b..10f4479351 100644
--- a/quickstep/res/values-es-rUS/strings.xml
+++ b/quickstep/res/values-es-rUS/strings.xml
@@ -74,14 +74,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Reintentar"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"¡Genial!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Instructivo <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Todo listo"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Desliza el dedo hacia arriba para ir a la página principal"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Ya puedes empezar a usar tu teléfono"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Configuración de la navegación para accesibilidad"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Compartir"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Captura de pantalla"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"La app o tu organización no permiten realizar esta acción"</string>
diff --git a/quickstep/res/values-fa/strings.xml b/quickstep/res/values-fa/strings.xml
index f0bdc4f91c..bd8f3b8888 100644
--- a/quickstep/res/values-fa/strings.xml
+++ b/quickstep/res/values-fa/strings.xml
@@ -74,14 +74,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"امتحان مجدد"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"عالی!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"آموزش گام‌به‌گام <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"همه چیز آماده است!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"برای رفتن به صفحه اصلی، تند به‌بالا بکشید"</string>
+    <string name="allset_description" msgid="6350320429953234580">"آماده‌اید از تلفنتان استفاده کنید"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"تنظیمات پیمایش برای دسترس‌پذیری"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"هم‌رسانی"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"نماگرفت"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"برنامه یا سازمان شما اجازه نمی‌دهد این کنش انجام شود."</string>
diff --git a/quickstep/res/values-kn/strings.xml b/quickstep/res/values-kn/strings.xml
index 1c5f893797..3cf37b4504 100644
--- a/quickstep/res/values-kn/strings.xml
+++ b/quickstep/res/values-kn/strings.xml
@@ -74,14 +74,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ಪುನಃ ಪ್ರಯತ್ನಿಸಿ"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ಚೆನ್ನಾಗಿದೆ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ಟ್ಯುಟೋರಿಯಲ್ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"ಎಲ್ಲವೂ ಸಿದ್ಧವಾಗಿದೆ!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"ಮುಖಪುಟಕ್ಕೆ ಹೋಗಲು ಮೇಲೆ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
+    <string name="allset_description" msgid="6350320429953234580">"ನಿಮ್ಮ ಫೋನ್ ಬಳಸುವುದನ್ನು ಪ್ರಾರಂಭಿಸಲು ನೀವು ಸಿದ್ದರಾಗಿರುವಿರಿ"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"ಅಕ್ಸೆಸಿಬಿಲಿಟಿಗಾಗಿ ನ್ಯಾವಿಗೇಶನ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"ಹಂಚಿಕೊಳ್ಳಿ"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ಸ್ಕ್ರೀನ್‌ಶಾಟ್"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ಆ್ಯಪ್ ಅಥವಾ ನಿಮ್ಮ ಸಂಸ್ಥೆಯು ಈ ಕ್ರಿಯೆಯನ್ನು ಅನುಮತಿಸುವುದಿಲ್ಲ"</string>
diff --git a/quickstep/res/values-ms/strings.xml b/quickstep/res/values-ms/strings.xml
index 1f53ad4f2f..d80e6b31ff 100644
--- a/quickstep/res/values-ms/strings.xml
+++ b/quickstep/res/values-ms/strings.xml
@@ -74,14 +74,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Cuba lagi"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bagus!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Siap!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Leret ke atas untuk mencapai laman utama"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Anda sudah sedia untuk mula menggunakan telefon anda"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Tetapan navigasi untuk kebolehaksesan"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Kongsi"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Tangkapan skrin"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Tindakan ini tidak dibenarkan oleh apl atau organisasi anda"</string>
diff --git a/quickstep/res/values-nl/strings.xml b/quickstep/res/values-nl/strings.xml
index 49daf19d90..ebf84858a1 100644
--- a/quickstep/res/values-nl/strings.xml
+++ b/quickstep/res/values-nl/strings.xml
@@ -74,14 +74,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Opnieuw"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Dat gaat lekker."</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Klaar!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Swipe omhoog om naar het startscherm te gaan"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Je bent klaar om je telefoon te gebruiken"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Navigatie-instellingen voor toegankelijkheid"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Delen"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Deze actie wordt niet toegestaan door de app of je organisatie"</string>
diff --git a/quickstep/res/values-pl/strings.xml b/quickstep/res/values-pl/strings.xml
index 1b5a81ddc5..e01dc081a7 100644
--- a/quickstep/res/values-pl/strings.xml
+++ b/quickstep/res/values-pl/strings.xml
@@ -74,14 +74,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Spróbuj ponownie"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Super!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Samouczek <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Wszystko gotowe"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Aby przejść na stronę główną, przesuń w górę"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Teraz możesz zacząć używać telefonu"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Ustawienia nawigacji na potrzeby ułatwień dostępu"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Udostępnij"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Zrzut ekranu"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Nie możesz wykonać tego działania, bo nie zezwala na to aplikacja lub Twoja organizacja"</string>
diff --git a/quickstep/res/values-pt/strings.xml b/quickstep/res/values-pt/strings.xml
index c254986d77..704afb6988 100644
--- a/quickstep/res/values-pt/strings.xml
+++ b/quickstep/res/values-pt/strings.xml
@@ -74,14 +74,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Tentar novamente"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Muito bem!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Tudo pronto!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Deslize para cima para acessar a tela inicial"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Você já pode começar a usar seu smartphone"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Configurações de navegação para acessibilidade"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Compartilhar"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Capturar tela"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Essa ação não é permitida pelo app ou pela organização"</string>
diff --git a/quickstep/res/values-sk/strings.xml b/quickstep/res/values-sk/strings.xml
index 810b909be2..56f0616e6f 100644
--- a/quickstep/res/values-sk/strings.xml
+++ b/quickstep/res/values-sk/strings.xml
@@ -74,14 +74,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Skúste to znova"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Výborne!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Návod <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Hotovo"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Potiahnutím nahor prejdete na plochu"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Telefón môžete začať používať"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Nastavenia navigácie pre dostupnosť"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Zdieľať"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Snímka obrazovky"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikácia alebo vaša organizácia túto akciu nepovoľuje"</string>
diff --git a/quickstep/res/values-zu/strings.xml b/quickstep/res/values-zu/strings.xml
index a17165091d..7f61e7d03a 100644
--- a/quickstep/res/values-zu/strings.xml
+++ b/quickstep/res/values-zu/strings.xml
@@ -74,14 +74,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Zama futhi"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Kuhle!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Okokufundisa <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Konke kusethiwe!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Swayiphela phezulu ukuze uye ekhaya"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Usulungele ukuqala ukusebenzisa ifoni yakho"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Amasethingi wokufinyelela ukuzulazula"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Yabelana"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Isithombe-skrini"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Lesi senzo asivunyelwanga uhlelo lokusebenza noma inhlangano yakho"</string>
-- 
GitLab


From c28b75b8eb32d606b6a7d51de23187d40efd4311 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Tue, 11 May 2021 04:19:24 +0000
Subject: [PATCH 1128/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I384f2a0b04475aed1587f685e6046b14ffaa9240
---
 go/quickstep/res/values-af/strings.xml     | 8 ++++++++
 go/quickstep/res/values-da/strings.xml     | 8 ++++++++
 go/quickstep/res/values-es-rUS/strings.xml | 8 ++++++++
 go/quickstep/res/values-fa/strings.xml     | 8 ++++++++
 go/quickstep/res/values-kn/strings.xml     | 8 ++++++++
 go/quickstep/res/values-ms/strings.xml     | 8 ++++++++
 go/quickstep/res/values-nl/strings.xml     | 8 ++++++++
 go/quickstep/res/values-pl/strings.xml     | 8 ++++++++
 go/quickstep/res/values-pt/strings.xml     | 8 ++++++++
 go/quickstep/res/values-sk/strings.xml     | 8 ++++++++
 go/quickstep/res/values-zu/strings.xml     | 8 ++++++++
 11 files changed, 88 insertions(+)
 create mode 100644 go/quickstep/res/values-af/strings.xml
 create mode 100644 go/quickstep/res/values-da/strings.xml
 create mode 100644 go/quickstep/res/values-es-rUS/strings.xml
 create mode 100644 go/quickstep/res/values-fa/strings.xml
 create mode 100644 go/quickstep/res/values-kn/strings.xml
 create mode 100644 go/quickstep/res/values-ms/strings.xml
 create mode 100644 go/quickstep/res/values-nl/strings.xml
 create mode 100644 go/quickstep/res/values-pl/strings.xml
 create mode 100644 go/quickstep/res/values-pt/strings.xml
 create mode 100644 go/quickstep/res/values-sk/strings.xml
 create mode 100644 go/quickstep/res/values-zu/strings.xml

diff --git a/go/quickstep/res/values-af/strings.xml b/go/quickstep/res/values-af/strings.xml
new file mode 100644
index 0000000000..8570531635
--- /dev/null
+++ b/go/quickstep/res/values-af/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Deel program"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Luister"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Vertaal"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-da/strings.xml b/go/quickstep/res/values-da/strings.xml
new file mode 100644
index 0000000000..46648ce686
--- /dev/null
+++ b/go/quickstep/res/values-da/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Del app"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Lyt"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Oversæt"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-es-rUS/strings.xml b/go/quickstep/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000000..e6946d7eee
--- /dev/null
+++ b/go/quickstep/res/values-es-rUS/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Compartir app"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Escuchar"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Traducir"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-fa/strings.xml b/go/quickstep/res/values-fa/strings.xml
new file mode 100644
index 0000000000..491b32fb11
--- /dev/null
+++ b/go/quickstep/res/values-fa/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"هم‌رسانی برنامه"</string>
+    <string name="action_listen" msgid="2370304050784689486">"گوش دادن"</string>
+    <string name="action_translate" msgid="8028378961867277746">"ترجمه"</string>
+    <string name="action_search" msgid="6269564710943755464">"لنز"</string>
+</resources>
diff --git a/go/quickstep/res/values-kn/strings.xml b/go/quickstep/res/values-kn/strings.xml
new file mode 100644
index 0000000000..1083e84525
--- /dev/null
+++ b/go/quickstep/res/values-kn/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"ಆ್ಯಪ್ ಹಂಚಿಕೊಳ್ಳಿ"</string>
+    <string name="action_listen" msgid="2370304050784689486">"ಆಲಿಸಿ"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-ms/strings.xml b/go/quickstep/res/values-ms/strings.xml
new file mode 100644
index 0000000000..39698e80db
--- /dev/null
+++ b/go/quickstep/res/values-ms/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Kongsi Apl"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Dengar"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Terjemah"</string>
+    <string name="action_search" msgid="6269564710943755464">"Kanta"</string>
+</resources>
diff --git a/go/quickstep/res/values-nl/strings.xml b/go/quickstep/res/values-nl/strings.xml
new file mode 100644
index 0000000000..ff5f16bc26
--- /dev/null
+++ b/go/quickstep/res/values-nl/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"App delen"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Luisteren"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Vertalen"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-pl/strings.xml b/go/quickstep/res/values-pl/strings.xml
new file mode 100644
index 0000000000..a9696a6c1d
--- /dev/null
+++ b/go/quickstep/res/values-pl/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Udostępnij aplikację"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Posłuchaj"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Przetłumacz"</string>
+    <string name="action_search" msgid="6269564710943755464">"Obiektyw"</string>
+</resources>
diff --git a/go/quickstep/res/values-pt/strings.xml b/go/quickstep/res/values-pt/strings.xml
new file mode 100644
index 0000000000..6be221900d
--- /dev/null
+++ b/go/quickstep/res/values-pt/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Compartilhar app"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Ouvir"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Traduzir"</string>
+    <string name="action_search" msgid="6269564710943755464">"Google Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-sk/strings.xml b/go/quickstep/res/values-sk/strings.xml
new file mode 100644
index 0000000000..f14249220a
--- /dev/null
+++ b/go/quickstep/res/values-sk/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Zdieľať aplikáciu"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Počúvať"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Preložiť"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-zu/strings.xml b/go/quickstep/res/values-zu/strings.xml
new file mode 100644
index 0000000000..6dd94cb1ac
--- /dev/null
+++ b/go/quickstep/res/values-zu/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Yabelana nge-App"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Lalela"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Humusha"</string>
+    <string name="action_search" msgid="6269564710943755464">"Ilensi"</string>
+</resources>
-- 
GitLab


From e2000a24afcb336f2c299dab214c0e775acc7b01 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Tue, 11 May 2021 04:20:00 +0000
Subject: [PATCH 1129/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I29a8c938b4d0b96cbb04bdd1623381018c02e3ee
---
 res/values-af/strings.xml     | 3 +--
 res/values-da/strings.xml     | 3 +--
 res/values-es-rUS/strings.xml | 3 +--
 res/values-fa/strings.xml     | 3 +--
 res/values-kn/strings.xml     | 3 +--
 res/values-ms/strings.xml     | 3 +--
 res/values-nl/strings.xml     | 3 +--
 res/values-pl/strings.xml     | 3 +--
 res/values-pt/strings.xml     | 3 +--
 res/values-sk/strings.xml     | 3 +--
 res/values-zu/strings.xml     | 3 +--
 11 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 77f01185be..b3b0d2bb6e 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Vouer: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> items"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Vouer: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> of meer items"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Muurpapiere"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Muurpapier en styl"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Tuis-instellings"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Gedeaktiveer deur jou administrateur"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Laat toe dat tuisskerm gedraai word"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 4030f1ff38..502d5eb970 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Mappe: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elementer"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Mappe: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> eller flere elementer"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Baggrunde"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Baggrund og stil"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Indstillinger for startskærm"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Deaktiveret af din administrator"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Tillad rotation af startskærmen"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index d50613611a..56f31bf23b 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Carpeta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elementos"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Carpeta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> o más elementos"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fondos de pantalla"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Fondo de pantalla y estilo"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Configuración de pantalla principal"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"El administrador inhabilitó esta función"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Permitir la rotación de la pantalla principal"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 066d54f5a9..f1ae4d50cd 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"پوشه: <xliff:g id="NAME">%1$s</xliff:g>، <xliff:g id="SIZE">%2$d</xliff:g> مورد"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"پوشه: <xliff:g id="NAME">%1$s</xliff:g>، <xliff:g id="SIZE">%2$d</xliff:g> مورد یا بیشتر"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"کاغذدیواری‌ها"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"کاغذدیواری و سبک"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"تنظیمات صفحه اصلی"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"توسط سرپرست سیستم غیرفعال شده است"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"قابل‌چرخش بودن صفحه اصلی"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index b4f4706eb0..27f045e3ff 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"ಫೋಲ್ಡರ್: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ಐಟಂಗಳು"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ಫೋಲ್ಡರ್: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ಅಥವಾ ಹೆಚ್ಚಿನ ಐಟಂಗಳು"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"ವಾಲ್‌ಪೇಪರ್‌ಗಳು"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"ವಾಲ್‌ಪೇಪರ್ ಮತ್ತು ಶೈಲಿ"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"ಮುಖಪುಟ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದ್ದಾರೆ"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"ಮುಖಪುಟ ತಿರುಗುವಿಕೆಯನ್ನು ಅನುಮತಿಸಿ"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 5893ceb8fc..9465be5b02 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> item"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> atau lebih banyak item"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Kertas dinding"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Kertas dinding &amp; gaya"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Tetapan laman utama"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Dilumpuhkan oleh pentadbir anda"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Benarkan putaran Skrin Utama"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index bfbd011297..58d1d98787 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Map: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> items"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Map: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> of meer items"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Achtergrond"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Achtergrond en stijl"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Instellingen start"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Uitgezet door je beheerder"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Draaien van startscherm toestaan"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index bfa7973299..acce00a01d 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -103,8 +103,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elementy"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, liczba elementów: <xliff:g id="SIZE">%2$d</xliff:g> lub więcej"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Tapety"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Tapeta i styl"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Ustawienia ekranu głównego"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Funkcja wyłączona przez administratora"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Zezwalaj na obrót ekranu głównego"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index f7f7aa1a98..fd793d4aa0 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Pasta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> itens"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Pasta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ou mais itens"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Planos de fundo"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Plano de fundo e estilo"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Configurações da tela inicial"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Desativado pelo administrador"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Permitir rotação da tela inicial"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 6c4810ee38..e23e7a9b5a 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -103,8 +103,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Priečinok: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> položky"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Priečinok: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> alebo viac položiek"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Tapety"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Tapeta a štýl"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Nastavenia plochy"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Zakázané vaším správcom"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Povoliť otáčanie plochy"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index d29e15dfdb..dbdcf1729a 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Ifolda: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> izinto"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Ifolda: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> noma izinto eziningi"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Izithombe zangemuva"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Isithombe sangemuva nesitayela"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Izilungiselelo zasekhaya"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Kukhutshazwe umlawuli wakho"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Vumela ukuphendukiswa kwesikrini sasekhaya"</string>
-- 
GitLab


From 359d1aedae16065bdb4ac3d8617404ba899ce3c6 Mon Sep 17 00:00:00 2001
From: Andras Kloczl <andraskloczl@google.com>
Date: Tue, 4 May 2021 22:25:27 +0200
Subject: [PATCH 1130/1664] Fix launcher navigation issue when using a
 controller

When navigating in Launcher home using a controller,
the mCurrentPage variable isn't updated properly which
results in out of order navigation.

Test: manual
Before: http://shortn/_c8A8mKiplN
After: http://shortn/_ctxIaweqZY
Bug: 187205980
Change-Id: I9ff4019b608e999749c4d0835cc3ceb35be93a3f
---
 src/com/android/launcher3/PagedView.java | 27 ++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index fb216987c9..8607fd5e75 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -835,18 +835,25 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
             return;
         }
 
+        // Add the current page's views as focusable and the next possible page's too. If the
+        // last focus change action was left then the left neighbour's views will be added, and
+        // if it was right then the right neighbour's views will be added.
+        // Unfortunately mCurrentPage can be outdated if there were multiple control actions in a
+        // short period of time, but mNextPage is up to date because it is always updated by
+        // method snapToPage.
+        int nextPage = getNextPage();
         // XXX-RTL: This will be fixed in a future CL
-        if (mCurrentPage >= 0 && mCurrentPage < getPageCount()) {
-            getPageAt(mCurrentPage).addFocusables(views, direction, focusableMode);
+        if (nextPage >= 0 && nextPage < getPageCount()) {
+            getPageAt(nextPage).addFocusables(views, direction, focusableMode);
         }
         if (direction == View.FOCUS_LEFT) {
-            if (mCurrentPage > 0) {
-                int nextPage = validateNewPage(mCurrentPage - 1);
+            if (nextPage > 0) {
+                nextPage = validateNewPage(nextPage - 1);
                 getPageAt(nextPage).addFocusables(views, direction, focusableMode);
             }
         } else if (direction == View.FOCUS_RIGHT) {
-            if (mCurrentPage < getPageCount() - 1) {
-                int nextPage = validateNewPage(mCurrentPage + 1);
+            if (nextPage < getPageCount() - 1) {
+                nextPage = validateNewPage(nextPage + 1);
                 getPageAt(nextPage).addFocusables(views, direction, focusableMode);
             }
         }
@@ -1416,6 +1423,14 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
     @Override
     public void requestChildFocus(View child, View focused) {
         super.requestChildFocus(child, focused);
+
+        // In case the device is controlled by a controller, mCurrentPage isn't updated properly
+        // which results in incorrect navigation
+        int nextPage = getNextPage();
+        if (nextPage != mCurrentPage) {
+            setCurrentPage(nextPage);
+        }
+
         int page = indexToPage(indexOfChild(child));
         if (page >= 0 && page != getCurrentPage() && !isInTouchMode()) {
             snapToPage(page);
-- 
GitLab


From f444db50aab5618bd0d6b00c26d5e943c035bdde Mon Sep 17 00:00:00 2001
From: Shan Huang <shanh@google.com>
Date: Tue, 11 May 2021 13:52:48 +0800
Subject: [PATCH 1131/1664] Update smartspace and workspace text color always
 use black or white.

This change updates the color of texts in launcher workspace as well as smartspace.

Bug: 185890335
Test: Visual inspection after setting different wallpapers for LS and
homescreen.

Change-Id: I77b870b8f7068103d687d39da01989b93d642b3b
---
 res/values-v31/colors.xml | 6 +++---
 res/values/colors.xml     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/res/values-v31/colors.xml b/res/values-v31/colors.xml
index 7f27bf8ca5..6c2d6aad69 100644
--- a/res/values-v31/colors.xml
+++ b/res/values-v31/colors.xml
@@ -26,8 +26,8 @@
     <color name="popup_color_secondary_dark">@android:color/system_neutral1_900</color>
     <color name="popup_color_tertiary_dark">@android:color/system_neutral2_700</color>
 
-    <color name="workspace_text_color_light">@android:color/system_neutral1_50</color>
-    <color name="workspace_text_color_dark">@android:color/system_neutral1_900</color>
+    <color name="workspace_text_color_light">@android:color/system_neutral1_0</color>
+    <color name="workspace_text_color_dark">@android:color/system_neutral1_1000</color>
 
     <color name="text_color_primary_dark">@android:color/system_neutral1_50</color>
     <color name="text_color_secondary_dark">@android:color/system_neutral2_200</color>
@@ -35,4 +35,4 @@
 
     <color name="wallpaper_popup_scrim">@android:color/system_neutral1_900</color>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 83d2deb0b1..24e68c85f7 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -51,7 +51,7 @@
     <color name="popup_color_tertiary_dark">#757575</color> <!-- Gray 600 -->
 
     <color name="workspace_text_color_light">#FFF</color>
-    <color name="workspace_text_color_dark">#FF212121</color>
+    <color name="workspace_text_color_dark">#FF000000</color>
 
     <color name="text_color_primary_dark">#FFFFFFFF</color>
     <color name="text_color_secondary_dark">#FFFFFFFF</color>
-- 
GitLab


From 4cbe517801f0a723267fb006a470a3f2fccbce0c Mon Sep 17 00:00:00 2001
From: Shan Huang <shanh@google.com>
Date: Tue, 11 May 2021 22:28:49 +0800
Subject: [PATCH 1132/1664] Update workspace text shadow according to new
 specs.

Test: Manual
Bug: 185890335, 187796297

Change-Id: Iba455544cdba86ddab7f1cfcc6c30c074e55ab84
---
 res/values/styles.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/values/styles.xml b/res/values/styles.xml
index b270b94f37..dd72114495 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -42,7 +42,7 @@
         <item name="isWorkspaceDarkText">false</item>
         <item name="workspaceTextColor">@color/workspace_text_color_light</item>
         <item name="workspaceShadowColor">#B0000000</item>
-        <item name="workspaceAmbientShadowColor">#00000000</item>
+        <item name="workspaceAmbientShadowColor">#40000000</item>
         <item name="workspaceKeyShadowColor">#89000000</item>
         <item name="workspaceStatusBarScrim">@drawable/workspace_bg</item>
         <item name="widgetsTheme">@style/WidgetContainerTheme</item>
@@ -241,7 +241,7 @@
         <item name="android:shadowRadius">2.0</item>
         <item name="android:shadowColor">?attr/workspaceShadowColor</item>
         <item name="ambientShadowColor">?attr/workspaceAmbientShadowColor</item>
-        <item name="ambientShadowBlur">2.5dp</item>
+        <item name="ambientShadowBlur">1.5dp</item>
         <item name="keyShadowColor">?attr/workspaceKeyShadowColor</item>
         <item name="keyShadowBlur">.5dp</item>
         <item name="keyShadowOffsetX">.5dp</item>
-- 
GitLab


From 042249ff59e3442a361e89b50b032050eb7081f4 Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Tue, 11 May 2021 17:26:30 +0100
Subject: [PATCH 1133/1664] Update colors in pin widget dialog, to be similar
 to widget bottom sheet.

Bug: 187374499
Test: Visually tested. Also tested using accessibility scanner.
Change-Id: I3be84dc394d312d03b97fe66b7e8214c4d8bef71
---
 res/drawable/add_item_dialog_background.xml   | 2 +-
 res/layout/add_item_confirmation_activity.xml | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/res/drawable/add_item_dialog_background.xml b/res/drawable/add_item_dialog_background.xml
index 04bde8f5a7..16a0767801 100644
--- a/res/drawable/add_item_dialog_background.xml
+++ b/res/drawable/add_item_dialog_background.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle" >
-    <solid android:color="?android:attr/colorBackground" />
+    <solid android:color="@color/widgets_picker_surface" />
     <corners
         android:topLeftRadius="?android:attr/dialogCornerRadius"
         android:topRightRadius="?android:attr/dialogCornerRadius" />
diff --git a/res/layout/add_item_confirmation_activity.xml b/res/layout/add_item_confirmation_activity.xml
index 7c2f25b831..00d148f2dc 100644
--- a/res/layout/add_item_confirmation_activity.xml
+++ b/res/layout/add_item_confirmation_activity.xml
@@ -21,6 +21,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="24dp"
+    android:theme="?attr/widgetsTheme"
     android:orientation="vertical">
 
     <TextView
@@ -43,6 +44,8 @@
         android:paddingVertical="8dp"
         android:text="@string/add_item_request_drag_hint"
         android:textSize="14sp"
+        android:textColor="?android:attr/textColorSecondary"
+        android:alpha="0.7"
         android:importantForAccessibility="no"/>
 
     <include layout="@layout/widget_cell"
-- 
GitLab


From ff67905f891bd221a35046c1d43b0e6499e818ea Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 10 May 2021 22:28:15 -0700
Subject: [PATCH 1134/1664] Revert "Invalidate when switching to new consumer"

This reverts commit 4df3b232250781dc8d1d206d74bc0e854da5fafe
and Id0a6a1c5301c66a515cefcab58b77495081c6190, as we have another
change to try and address the original issue.

Bug: 185909226
Change-Id: Ic2c08833e066090a43b989f2f470de298174e84d
---
 .../android/quickstep/AbsSwipeUpHandler.java  | 64 ++++++-------------
 1 file changed, 21 insertions(+), 43 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 25be30fc4b..d04bfe95e2 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -63,7 +63,6 @@ import android.graphics.Matrix;
 import android.graphics.PointF;
 import android.graphics.Rect;
 import android.os.Build;
-import android.os.Handler;
 import android.os.IBinder;
 import android.os.SystemClock;
 import android.view.MotionEvent;
@@ -136,7 +135,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     protected final BaseActivityInterface<S, T> mActivityInterface;
     protected final InputConsumerProxy mInputConsumerProxy;
     protected final ActivityInitListener mActivityInitListener;
-    private final Handler mHandler = new Handler();
     // Callbacks to be made once the recents animation starts
     private final ArrayList<Runnable> mRecentsAnimationStartCallbacks = new ArrayList<>();
     private final OnScrollChangedListener mOnRecentsScrollListener = this::onRecentsViewScroll;
@@ -148,9 +146,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     protected Runnable mGestureEndCallback;
     protected MultiStateCallback mStateCallback;
     protected boolean mCanceled;
-    // One time flag set when onConsumerAboutToBeSwitched() is called, indicating that certain
-    // shared animations should not be canceled when this handler is invalidated
-    private boolean mConsumerIsSwitching;
     private boolean mRecentsViewScrollLinked = false;
 
     private static int getFlagForIndex(int index, String name) {
@@ -1007,14 +1002,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         animateToProgress(startShift, endShift, duration, interpolator, endTarget, velocity);
     }
 
-    private int getLogGestureTaskIndex(@Nullable TaskView targetTask) {
-        return mRecentsView == null || targetTask == null
-                ? LOG_NO_OP_PAGE_INDEX
-                : mRecentsView.indexOfChild(targetTask);
-    }
-
-    private void doLogGesture(GestureEndTarget endTarget, @Nullable TaskView targetTask,
-            int pageIndex) {
+    private void doLogGesture(GestureEndTarget endTarget, @Nullable TaskView targetTask) {
         StatsLogManager.EventEnum event;
         switch (endTarget) {
             case HOME:
@@ -1043,6 +1031,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
             // We probably never received an animation controller, skip logging.
             return;
         }
+        int pageIndex = endTarget == LAST_TASK
+                ? LOG_NO_OP_PAGE_INDEX
+                : mRecentsView.getNextPage();
         // TODO: set correct container using the pageIndex
         logger.log(event);
     }
@@ -1294,18 +1285,18 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     }
 
     public void onConsumerAboutToBeSwitched() {
-        mConsumerIsSwitching = true;
         if (mActivity != null) {
             // In the off chance that the gesture ends before Launcher is started, we should clear
             // the callback here so that it doesn't update with the wrong state
             mActivity.clearRunOnceOnStartCallback();
+            resetLauncherListeners();
         }
         if (mGestureState.getEndTarget() != null && !mGestureState.isRunningAnimationToLauncher()) {
             cancelCurrentAnimation();
         } else {
             mStateCallback.setStateOnUiThread(STATE_FINISH_WITH_NO_END);
+            reset();
         }
-        reset();
     }
 
     public boolean isCanceled() {
@@ -1316,14 +1307,13 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     private void resumeLastTask() {
         mRecentsAnimationController.finish(false /* toRecents */, null);
         ActiveGestureLog.INSTANCE.addLog("finishRecentsAnimation", false);
-        doLogGesture(LAST_TASK, null, getLogGestureTaskIndex(null));
+        doLogGesture(LAST_TASK, null);
         reset();
     }
 
     @UiThread
     private void startNewTask() {
         TaskView taskToLaunch = mRecentsView == null ? null : mRecentsView.getNextPageTaskView();
-        int taskPageIndex = getLogGestureTaskIndex(taskToLaunch);
         startNewTask(success -> {
             if (!success) {
                 reset();
@@ -1332,7 +1322,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                 endLauncherTransitionController();
                 updateSysUiFlags(1 /* windowProgress == overview */);
             }
-            doLogGesture(NEW_TASK, taskToLaunch, taskPageIndex);
+            doLogGesture(NEW_TASK, taskToLaunch);
         });
     }
 
@@ -1366,39 +1356,29 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     }
 
     private void invalidateHandler() {
-        if (!mConsumerIsSwitching) {
-            if (!LIVE_TILE.get() || !mActivityInterface.isInLiveTileMode()
-                    || mGestureState.getEndTarget() != RECENTS) {
-                mInputConsumerProxy.destroy();
-                mTaskAnimationManager.setLiveTileCleanUpHandler(null);
-            }
-            endRunningWindowAnim(false /* cancel */);
+        if (!LIVE_TILE.get() || !mActivityInterface.isInLiveTileMode()
+                || mGestureState.getEndTarget() != RECENTS) {
+            mInputConsumerProxy.destroy();
+            mTaskAnimationManager.setLiveTileCleanUpHandler(null);
+        }
+        mInputConsumerProxy.unregisterCallback();
+        endRunningWindowAnim(false /* cancel */);
 
-            if (mGestureEndCallback != null) {
-                mGestureEndCallback.run();
-            }
+        if (mGestureEndCallback != null) {
+            mGestureEndCallback.run();
         }
 
-        mInputConsumerProxy.unregisterCallback();
         mActivityInitListener.unregister();
         ActivityManagerWrapper.getInstance().unregisterTaskStackListener(mActivityRestartListener);
         mTaskSnapshot = null;
     }
 
     private void invalidateHandlerWithLauncher() {
-        if (!mConsumerIsSwitching) {
-            endLauncherTransitionController();
-            mRecentsView.onGestureAnimationEnd();
-        }
+        endLauncherTransitionController();
 
         mRecentsView.removeOnScrollChangedListener(mOnRecentsScrollListener);
+        mRecentsView.onGestureAnimationEnd();
         resetLauncherListeners();
-
-        mHandler.post(() -> {
-            // Defer clearing the activity since invalidation can happen over multiple callbacks.
-            mActivity = null;
-            mRecentsView = null;
-        });
     }
 
     private void endLauncherTransitionController() {
@@ -1516,8 +1496,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                     () -> mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED));
         }
         ActiveGestureLog.INSTANCE.addLog("finishRecentsAnimation", true);
-        TaskView taskToLaunch = mRecentsView == null ? null : mRecentsView.getCurrentPageTaskView();
-        doLogGesture(HOME, taskToLaunch, getLogGestureTaskIndex(taskToLaunch));
+        doLogGesture(HOME, mRecentsView == null ? null : mRecentsView.getCurrentPageTaskView());
     }
 
     /**
@@ -1548,8 +1527,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         }
 
         SystemUiProxy.INSTANCE.get(mContext).onOverviewShown(false, TAG);
-        TaskView taskToLaunch = mRecentsView.getCurrentPageTaskView();
-        doLogGesture(RECENTS, taskToLaunch, getLogGestureTaskIndex(taskToLaunch));
+        doLogGesture(RECENTS, mRecentsView.getCurrentPageTaskView());
         reset();
     }
 
-- 
GitLab


From 8542541b2b715b79185b1a06669de172a033c3d4 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 10 May 2021 16:24:14 -0700
Subject: [PATCH 1135/1664] End scroller if it has already reached the final
 position

- The system overscroller seems to take a long time to settle even
  after the final position has been reached, so if that has already
  happened and there is no edge effect, then just end the scroller.
- Remove unused code related to SmoothPageView

Bug: 184983443
Test: Quickswitch and ensure we finish the recents animation after it settles
Change-Id: I9fa72ddd6b6e0d38b6f622c776a2ac5f5b055760
---
 src/com/android/launcher3/PagedView.java      | 37 ++++++++++---------
 src/com/android/launcher3/Workspace.java      |  4 --
 .../touch/PagedOrientationHandler.java        |  2 +-
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index fb216987c9..a70936abb2 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -461,11 +461,6 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         }
     }
 
-    // we moved this functionality to a helper function so SmoothPagedView can reuse it
-    protected boolean computeScrollHelper() {
-        return computeScrollHelper(true);
-    }
-
     protected void announcePageForAccessibility() {
         if (isAccessibilityEnabled(getContext())) {
             // Notify the user when the page changes
@@ -473,7 +468,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         }
     }
 
-    protected boolean computeScrollHelper(boolean shouldInvalidate) {
+    protected boolean computeScrollHelper() {
         if (mScroller.computeScrollOffset()) {
             // Don't bother scrolling if the page does not need to be moved
             int oldPos = mOrientationHandler.getPrimaryScroll(this);
@@ -481,23 +476,29 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
             if (oldPos != newPos) {
                 mOrientationHandler.set(this, VIEW_SCROLL_TO, mScroller.getCurrX());
             }
-            if (shouldInvalidate) {
-                if (mAllowOverScroll) {
-                    if (newPos < mMinScroll && oldPos >= mMinScroll) {
-                        mEdgeGlowLeft.onAbsorb((int) mScroller.getCurrVelocity());
-                        mScroller.abortAnimation();
-                    } else if (newPos > mMaxScroll && oldPos <= mMaxScroll) {
-                        mEdgeGlowRight.onAbsorb((int) mScroller.getCurrVelocity());
-                        mScroller.abortAnimation();
-                    }
+
+            if (mAllowOverScroll) {
+                if (newPos < mMinScroll && oldPos >= mMinScroll) {
+                    mEdgeGlowLeft.onAbsorb((int) mScroller.getCurrVelocity());
+                    mScroller.abortAnimation();
+                } else if (newPos > mMaxScroll && oldPos <= mMaxScroll) {
+                    mEdgeGlowRight.onAbsorb((int) mScroller.getCurrVelocity());
+                    mScroller.abortAnimation();
                 }
+            }
 
-                invalidate();
+            // If the scroller has scrolled to the final position and there is no edge effect, then
+            // finish the scroller to skip waiting for additional settling
+            int finalPos = mOrientationHandler.getPrimaryValue(mScroller.getFinalX(),
+                    mScroller.getFinalY());
+            if (newPos == finalPos && mEdgeGlowLeft.isFinished() && mEdgeGlowRight.isFinished()) {
+                mScroller.abortAnimation();
             }
+
+            invalidate();
             return true;
-        } else if (mNextPage != INVALID_PAGE && shouldInvalidate) {
+        } else if (mNextPage != INVALID_PAGE) {
             sendScrollAccessibilityEvent();
-
             int prevPage = mCurrentPage;
             mCurrentPage = validateNewPage(mNextPage);
             mNextPage = INVALID_PAGE;
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 7c5f99e07b..3bdf28c9d3 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1163,10 +1163,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         mWallpaperOffset.syncWithScroll();
     }
 
-    public void computeScrollWithoutInvalidation() {
-        computeScrollHelper(false);
-    }
-
     @Override
     public void announceForAccessibility(CharSequence text) {
         // Don't announce if apps is on top of us.
diff --git a/src/com/android/launcher3/touch/PagedOrientationHandler.java b/src/com/android/launcher3/touch/PagedOrientationHandler.java
index d8e5a485fd..6811438c6a 100644
--- a/src/com/android/launcher3/touch/PagedOrientationHandler.java
+++ b/src/com/android/launcher3/touch/PagedOrientationHandler.java
@@ -105,7 +105,7 @@ public interface PagedOrientationHandler {
     int getPrimaryValue(int x, int y);
     int getSecondaryValue(int x, int y);
 
-    float  getPrimaryValue(float x, float y);
+    float getPrimaryValue(float x, float y);
     float getSecondaryValue(float x, float y);
 
     boolean isLayoutNaturalToLauncher();
-- 
GitLab


From be0bb572da93fe1dd3574f9fa31e8ac585989aa5 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Tue, 11 May 2021 13:18:19 -0700
Subject: [PATCH 1136/1664] Do not pip when ending live tile in Overview

Test: manual
Fixes: 187855255
Change-Id: Iadf808d41692c7dd37de28388b689f01bf045ea9
---
 .../src/com/android/quickstep/TaskOverlayFactory.java      | 3 ++-
 quickstep/src/com/android/quickstep/views/RecentsView.java | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
index 1ad5f2c60b..c1c85de413 100644
--- a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
@@ -190,7 +190,8 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
             if (LIVE_TILE.get()) {
                 RecentsView recentsView = mThumbnailView.getTaskView().getRecentsView();
                 recentsView.switchToScreenshot(
-                        () -> recentsView.finishRecentsAnimation(true /* toRecents */, callback));
+                        () -> recentsView.finishRecentsAnimation(true /* toRecents */,
+                                false /* shouldPip */, callback));
             } else {
                 callback.run();
             }
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 3eba9eb724..c268217ef3 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -3353,6 +3353,11 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     }
 
     public void finishRecentsAnimation(boolean toRecents, Runnable onFinishComplete) {
+        finishRecentsAnimation(toRecents, true /* shouldPip */, onFinishComplete);
+    }
+
+    public void finishRecentsAnimation(boolean toRecents, boolean shouldPip,
+            Runnable onFinishComplete) {
         if (!toRecents && LIVE_TILE.get()) {
             // Reset the minimized state since we force-toggled the minimized state when entering
             // overview, but never actually finished the recents animation.  This is a catch all for
@@ -3370,7 +3375,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             return;
         }
 
-        final boolean sendUserLeaveHint = toRecents && LIVE_TILE.get();
+        final boolean sendUserLeaveHint = toRecents && shouldPip;
         if (sendUserLeaveHint) {
             // Notify the SysUI to use fade-in animation when entering PiP from live tile.
             final SystemUiProxy systemUiProxy = SystemUiProxy.INSTANCE.get(getContext());
-- 
GitLab


From 222a59e79a9e1c2c08972d5634d94444f15f3027 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Thu, 6 May 2021 23:15:42 -0700
Subject: [PATCH 1137/1664] Implement overshoot and squish motion in all apps
 open

Bug: 187475924
Bug: 183062683
Test: manual

Change-Id: I33b6c647c45ff467c6d49cf3796f92ca366ab3f1
---
 res/values/dimens.xml                         |  2 +-
 src/com/android/launcher3/Launcher.java       |  7 +---
 .../allapps/AllAppsContainerView.java         | 42 ++++++++++++++++---
 .../allapps/AllAppsTransitionController.java  | 10 ++---
 .../AbstractStateChangeTouchController.java   | 25 ++++++++---
 .../launcher3/views/SpringRelativeLayout.java | 10 +++++
 6 files changed, 73 insertions(+), 23 deletions(-)

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 3267a5d246..65c4c806f3 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -84,7 +84,7 @@
     <dimen name="fastscroll_end_margin">-26dp</dimen>
 
     <!-- All Apps -->
-    <dimen name="all_apps_open_vertical_translate">300dp</dimen>
+    <dimen name="all_apps_open_vertical_translate">320dp</dimen>
     <dimen name="all_apps_search_bar_field_height">48dp</dimen>
     <dimen name="all_apps_search_bar_bottom_padding">30dp</dimen>
     <dimen name="all_apps_empty_search_message_top_offset">40dp</dimen>
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 5ecdca6dfc..7b67807697 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -905,7 +905,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         } else {
             mOverlayManager.onActivityStopped(this);
         }
-
+        hideKeyboard();
         logStopAndResume(false /* isResume */);
         mAppWidgetHost.setActivityStarted(false);
         NotificationListener.removeNotificationsChangedListener();
@@ -1459,7 +1459,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
                 && AbstractFloatingView.getTopOpenView(this) == null;
         boolean isActionMain = Intent.ACTION_MAIN.equals(intent.getAction());
         boolean internalStateHandled = ACTIVITY_TRACKER.handleNewIntent(this, intent);
-
+        hideKeyboard();
         if (isActionMain) {
             if (!internalStateHandled) {
                 // In all these cases, only animate if we're already on home
@@ -1481,9 +1481,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
                 }
             }
 
-            // Handle HOME_INTENT
-            hideKeyboard();
-
             if (mLauncherCallbacks != null) {
                 mLauncherCallbacks.onHomeIntent(internalStateHandled);
             }
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 47236b6994..d9c8c96f40 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -45,6 +45,7 @@ import android.view.WindowInsets;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
+import androidx.annotation.VisibleForTesting;
 import androidx.core.graphics.ColorUtils;
 import androidx.core.os.BuildCompat;
 import androidx.recyclerview.widget.DefaultItemAnimator;
@@ -79,10 +80,11 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         Insettable, OnDeviceProfileChangeListener, OnActivePageChangedListener,
         ScrimView.ScrimDrawingController {
 
-    private static final float FLING_VELOCITY_MULTIPLIER = 1000f;
+    public static final float PULL_MULTIPLIER = .02f;
+    public static final float FLING_VELOCITY_MULTIPLIER = 2000f;
 
     // Starts the springs after at least 25% of the animation has passed.
-    private static final float FLING_ANIMATION_THRESHOLD = 0.25f;
+    public static final float FLING_ANIMATION_THRESHOLD = 0.25f;
 
     private final Paint mHeaderPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
 
@@ -100,6 +102,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
     private AllAppsPagedView mViewPager;
 
     protected FloatingHeaderView mHeader;
+    private float mHeaderTop;
     private WorkModeSwitch mWorkModeSwitch;
 
 
@@ -530,7 +533,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         return view.getGlobalVisibleRect(new Rect());
     }
 
-    // Used by tests only
+    @VisibleForTesting
     public boolean isPersonalTabVisible() {
         return isDescendantViewVisible(R.id.tab_personal);
     }
@@ -582,6 +585,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
             mAH[i].padding.top = padding;
             mAH[i].applyPadding();
         }
+        mHeaderTop = mHeader.getTop();
     }
 
     public void setLastSearchQuery(String query) {
@@ -636,14 +640,42 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
             public void onAnimationUpdate(ValueAnimator valueAnimator) {
                 if (shouldSpring
                         && valueAnimator.getAnimatedFraction() >= FLING_ANIMATION_THRESHOLD) {
-                    absorbSwipeUpVelocity(Math.abs(
-                            Math.round(velocity * FLING_VELOCITY_MULTIPLIER)));
+                    absorbSwipeUpVelocity(Math.max(100, Math.abs(
+                            Math.round(velocity * FLING_VELOCITY_MULTIPLIER))));
+                    // calculate the velocity of using the not user controlled interpolator
+                    // of when the container reach the end.
                     shouldSpring = false;
                 }
             }
         });
     }
 
+    public void onPull(float deltaDistance, float displacement) {
+        absorbPullDeltaDistance(PULL_MULTIPLIER * deltaDistance,
+                PULL_MULTIPLIER * displacement);
+        // ideally, this should be done using EdgeEffect.onPush to create squish effect.
+        // However, until such method is available, launcher to simulate the onPush method.
+        mHeader.setTranslationY(-.5f * mHeaderTop * deltaDistance);
+        getRecyclerViewContainer().setTranslationY(-mHeaderTop * deltaDistance);
+    }
+
+    public void onRelease() {
+        ValueAnimator anim1 = ValueAnimator.ofFloat(1f, 0f);
+        final float floatingHeaderHeight = getFloatingHeaderView().getTranslationY();
+        final float recyclerViewHeight = getRecyclerViewContainer().getTranslationY();
+        anim1.setDuration(200);
+        anim1.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            @Override
+            public void onAnimationUpdate(ValueAnimator valueAnimator) {
+                getFloatingHeaderView().setTranslationY(
+                        ((float) valueAnimator.getAnimatedValue()) * floatingHeaderHeight);
+                getRecyclerViewContainer().setTranslationY(
+                        ((float) valueAnimator.getAnimatedValue()) * recyclerViewHeight);
+            }
+        });
+        anim1.start();
+        super.onRelease();
+    }
     @Override
     public void getDrawingRect(Rect outRect) {
         super.getDrawingRect(outRect);
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 90f2d7cde5..75f3149736 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -17,10 +17,7 @@ package com.android.launcher3.allapps;
 
 import static com.android.launcher3.LauncherState.ALL_APPS;
 import static com.android.launcher3.LauncherState.ALL_APPS_CONTENT;
-import static com.android.launcher3.anim.Interpolators.ACCEL_0_75;
-import static com.android.launcher3.anim.Interpolators.ACCEL_2;
-import static com.android.launcher3.anim.Interpolators.DEACCEL;
-import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
+import static com.android.launcher3.anim.Interpolators.DEACCEL_1_7;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE;
@@ -158,9 +155,8 @@ public class AllAppsTransitionController
             return;
         }
 
-        Interpolator interpolator = toState.equals(ALL_APPS)
-                ? (config.userControlled ? ACCEL_2 : ACCEL_0_75) :
-                (config.userControlled ? DEACCEL_2 : DEACCEL);
+        // need to decide depending on the release velocity
+        Interpolator interpolator = (config.userControlled ? LINEAR : DEACCEL_1_7);
 
         Animator anim = createSpringAnimation(mProgress, targetProgress);
         anim.setInterpolator(config.getInterpolator(ANIM_VERTICAL_PROGRESS, interpolator));
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index d092f11ae5..a086635d57 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -56,9 +56,8 @@ public abstract class AbstractStateChangeTouchController
 
     protected final AnimatorListener mClearStateOnCancelListener =
             newCancelListener(this::clearState);
+    private final FlingBlockCheck mFlingBlockCheck = new FlingBlockCheck();
 
-    private boolean mNoIntercept;
-    private boolean mIsLogContainerSet;
     protected int mStartContainerType;
 
     protected LauncherState mStartState;
@@ -67,12 +66,14 @@ public abstract class AbstractStateChangeTouchController
     protected AnimatorPlaybackController mCurrentAnimation;
     protected boolean mGoingBetweenStates = true;
 
+    private boolean mNoIntercept;
+    private boolean mIsLogContainerSet;
     private float mStartProgress;
     // Ratio of transition process [0, 1] to drag displacement (px)
     private float mProgressMultiplier;
     private float mDisplacementShift;
     private boolean mCanBlockFling;
-    private final FlingBlockCheck mFlingBlockCheck = new FlingBlockCheck();
+    private boolean mAllAppsOvershootStarted;
 
     public AbstractStateChangeTouchController(Launcher l, SingleAxisSwipeDetector.Direction dir) {
         mLauncher = l;
@@ -216,8 +217,15 @@ public abstract class AbstractStateChangeTouchController
                     mFlingBlockCheck.blockFling();
                 }
             }
+            if (mToState == LauncherState.ALL_APPS && !UNSTABLE_SPRINGS.get()) {
+                mAllAppsOvershootStarted = true;
+                // 1f, value when all apps container hit the top
+                mLauncher.getAppsView().onPull(progress - 1f, progress - 1f);
+            }
+
         } else {
             mFlingBlockCheck.onEvent();
+
         }
 
         return true;
@@ -325,8 +333,15 @@ public abstract class AbstractStateChangeTouchController
         anim.setFloatValues(startProgress, endProgress);
         updateSwipeCompleteAnimation(anim, duration, targetState, velocity, fling);
         mCurrentAnimation.dispatchOnStart();
-        if (fling && targetState == LauncherState.ALL_APPS && !UNSTABLE_SPRINGS.get()) {
-            mLauncher.getAppsView().addSpringFromFlingUpdateListener(anim, velocity);
+        if (targetState == LauncherState.ALL_APPS && !UNSTABLE_SPRINGS.get()) {
+            if (mAllAppsOvershootStarted) {
+
+                mLauncher.getAppsView().onRelease();
+                mAllAppsOvershootStarted = false;
+
+            } else {
+                mLauncher.getAppsView().addSpringFromFlingUpdateListener(anim, velocity);
+            }
         }
         anim.start();
     }
diff --git a/src/com/android/launcher3/views/SpringRelativeLayout.java b/src/com/android/launcher3/views/SpringRelativeLayout.java
index 9701389f91..8342d3e9d2 100644
--- a/src/com/android/launcher3/views/SpringRelativeLayout.java
+++ b/src/com/android/launcher3/views/SpringRelativeLayout.java
@@ -32,6 +32,7 @@ import com.android.launcher3.Utilities;
  */
 public class SpringRelativeLayout extends RelativeLayout {
 
+    // fixed edge at the time force is applied
     private final EdgeEffect mEdgeGlowTop;
     private final EdgeEffect mEdgeGlowBottom;
 
@@ -87,6 +88,15 @@ public class SpringRelativeLayout extends RelativeLayout {
         invalidate();
     }
 
+    protected void absorbPullDeltaDistance(float deltaDistance, float displacement) {
+        mEdgeGlowBottom.onPull(deltaDistance, displacement);
+        invalidate();
+    }
+
+    protected void onRelease() {
+        mEdgeGlowBottom.onRelease();
+    }
+
     public EdgeEffectFactory createEdgeEffectFactory() {
         return new ProxyEdgeEffectFactory();
     }
-- 
GitLab


From a75f5768901647e0dc1d78a2a95dca88c54601c6 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 11 May 2021 13:18:49 -0700
Subject: [PATCH 1138/1664] Exposing AnimatorListeners in StateManager to
 receive both success and failure callback

Updating various callers to use onSuccess or onEnd appropriately

Test: Manual
Bug: 185554764
Change-Id: I357dd1fdbe111e7a30d4c8dee520fbd7d9956b7d
---
 .../HotseatPredictionController.java          |  9 +-
 .../RecentsViewStateController.java           |  4 +-
 .../NavBarToHomeTouchController.java          |  7 +-
 ...ButtonNavbarToOverviewTouchController.java |  5 +-
 .../NoButtonQuickSwitchTouchController.java   |  3 +-
 .../quickstep/LauncherActivityInterface.java  |  4 +-
 .../SwipeUpGestureTutorialController.java     | 10 +-
 .../interaction/TutorialController.java       |  8 +-
 .../android/quickstep/views/RecentsView.java  |  4 +-
 src/com/android/launcher3/Workspace.java      |  5 +-
 .../LauncherAccessibilityDelegate.java        | 43 ++++----
 .../ShortcutMenuAccessibilityDelegate.java    | 22 ++---
 .../allapps/AllAppsTransitionController.java  |  8 +-
 .../anim/AnimationSuccessListener.java        | 20 ----
 .../launcher3/anim/AnimatorListeners.java     | 98 +++++++++++++++++++
 .../launcher3/anim/PendingAnimation.java      | 30 +-----
 .../launcher3/statemanager/StateManager.java  | 39 ++++----
 17 files changed, 184 insertions(+), 135 deletions(-)
 create mode 100644 src/com/android/launcher3/anim/AnimatorListeners.java

diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
index 67ed5fb5e5..5dcf84c249 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
@@ -17,6 +17,7 @@ package com.android.launcher3.hybridhotseat;
 
 import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
 import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback;
 import static com.android.launcher3.hybridhotseat.HotseatEduController.getSettingsIntent;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOTSEAT_PREDICTION_PINNED;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOTSEAT_RANKED;
@@ -150,7 +151,7 @@ public class HotseatPredictionController implements DragController.DragListener,
      * Shows appropriate hotseat education based on prediction enabled and migration states.
      */
     public void showEdu() {
-        mLauncher.getStateManager().goToState(NORMAL, true, () -> {
+        mLauncher.getStateManager().goToState(NORMAL, true, forSuccessCallback(() -> {
             if (mPredictedItems.isEmpty()) {
                 // launcher has empty predictions set
                 Snackbar.show(mLauncher, R.string.hotsaet_tip_prediction_disabled,
@@ -165,7 +166,7 @@ public class HotseatPredictionController implements DragController.DragListener,
                         .collect(Collectors.toList()));
                 eduController.showEdu();
             }
-        });
+        }));
     }
 
     /**
@@ -255,8 +256,8 @@ public class HotseatPredictionController implements DragController.DragListener,
             }
         }
         if (animate) {
-            animationSet.addListener(AnimationSuccessListener
-                    .forRunnable(this::removeOutlineDrawings));
+            animationSet.addListener(
+                    forSuccessCallback(this::removeOutlineDrawings));
             animationSet.start();
         } else {
             removeOutlineDrawings();
diff --git a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
index 0652d48c11..996d36aadc 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
@@ -35,7 +35,7 @@ import androidx.annotation.NonNull;
 
 import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.LauncherState;
-import com.android.launcher3.anim.AnimationSuccessListener;
+import com.android.launcher3.anim.AnimatorListeners;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.anim.PropertySetter;
 import com.android.launcher3.states.StateAnimationConfig;
@@ -78,7 +78,7 @@ public final class RecentsViewStateController extends
             mRecentsView.updateEmptyMessage();
         } else {
             builder.addListener(
-                    AnimationSuccessListener.forRunnable(mRecentsView::resetTaskVisuals));
+                    AnimatorListeners.forSuccessCallback(mRecentsView::resetTaskVisuals));
         }
 
         // Create or dismiss split screen select animations
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
index b8caf81f14..19d1b32a1b 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
@@ -22,6 +22,7 @@ import static com.android.launcher3.LauncherAnimUtils.newCancelListener;
 import static com.android.launcher3.LauncherState.ALL_APPS;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS;
+import static com.android.launcher3.anim.AnimatorListeners.forEndCallback;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_ALL_APPS_EDU;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE;
@@ -38,7 +39,7 @@ import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.allapps.AllAppsTransitionController;
-import com.android.launcher3.anim.AnimationSuccessListener;
+import com.android.launcher3.anim.AnimatorListeners;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.anim.PendingAnimation;
@@ -199,7 +200,7 @@ public class NavBarToHomeTouchController implements TouchController,
                         .animateWithVelocity(velocity);
             } else {
                 mLauncher.getStateManager().goToState(mEndState, true,
-                        () -> onSwipeInteractionCompleted(mEndState));
+                        forEndCallback(() -> onSwipeInteractionCompleted(mEndState)));
             }
             if (mStartState != mEndState) {
                 logHomeGesture();
@@ -214,7 +215,7 @@ public class NavBarToHomeTouchController implements TouchController,
             // Quickly return to the state we came from (we didn't move far).
             ValueAnimator anim = mCurrentAnimation.getAnimationPlayer();
             anim.setFloatValues(progress, 0);
-            anim.addListener(AnimationSuccessListener.forRunnable(
+            anim.addListener(AnimatorListeners.forSuccessCallback(
                     () -> onSwipeInteractionCompleted(mStartState)));
             anim.setDuration(80).start();
         }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
index 729e2cb5c6..eb62110065 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -22,6 +22,7 @@ import static com.android.launcher3.LauncherState.HINT_STATE;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.Utilities.EDGE_NAV_BAR;
+import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback;
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
@@ -172,13 +173,13 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
         }
         mNormalToHintOverviewScrimAnimator = null;
         mCurrentAnimation.getTarget().addListener(newCancelListener(() ->
-                mLauncher.getStateManager().goToState(OVERVIEW, true, () -> {
+                mLauncher.getStateManager().goToState(OVERVIEW, true, forSuccessCallback(() -> {
                     mOverviewResistYAnim = AnimatorControllerWithResistance
                             .createRecentsResistanceFromOverviewAnim(mLauncher, null)
                             .createPlaybackController();
                     mReachedOverview = true;
                     maybeSwipeInteractionToOverviewComplete();
-                })));
+                }))));
 
         mCurrentAnimation.getTarget().removeListener(mClearStateOnCancelListener);
         mCurrentAnimation.dispatchOnCancel();
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
index 0f64abca61..62687c5f35 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
@@ -21,6 +21,7 @@ import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.OVERVIEW_ACTIONS;
 import static com.android.launcher3.LauncherState.QUICK_SWITCH;
 import static com.android.launcher3.anim.AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD;
+import static com.android.launcher3.anim.AnimatorListeners.forEndCallback;
 import static com.android.launcher3.anim.Interpolators.ACCEL_0_75;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
@@ -418,7 +419,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
                         targetState.ordinal > mStartState.ordinal
                                 ? LAUNCHER_UNKNOWN_SWIPEUP
                                 : LAUNCHER_UNKNOWN_SWIPEDOWN));
-        mLauncher.getStateManager().goToState(targetState, false, this::clearState);
+        mLauncher.getStateManager().goToState(targetState, false, forEndCallback(this::clearState));
     }
 
     private void cancelAnimations() {
diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
index dffee7fda8..c43d3c9653 100644
--- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
@@ -19,6 +19,7 @@ import static com.android.launcher3.LauncherState.BACKGROUND_APP;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.QUICK_SWITCH;
+import static com.android.launcher3.anim.AnimatorListeners.forEndCallback;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING;
 
@@ -192,7 +193,8 @@ public final class LauncherActivityInterface extends
 
         closeOverlay();
         launcher.getStateManager().goToState(OVERVIEW,
-                launcher.getStateManager().shouldAnimateStateChange(), onCompleteCallback);
+                launcher.getStateManager().shouldAnimateStateChange(),
+                onCompleteCallback == null ? null : forEndCallback(onCompleteCallback));
         return true;
     }
 
diff --git a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
index 1aa64fae1c..66e04008f6 100644
--- a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
@@ -43,7 +43,7 @@ import androidx.annotation.Nullable;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.anim.AnimationSuccessListener;
+import com.android.launcher3.anim.AnimatorListeners;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.quickstep.AnimatedFloat;
@@ -156,7 +156,7 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
                         fadeAnim.setViewAlpha(mFakePreviousTaskView, 0, ACCEL);
                     }
                     if (onEndRunnable != null) {
-                        fadeAnim.addListener(AnimationSuccessListener.forRunnable(onEndRunnable));
+                        fadeAnim.addListener(AnimatorListeners.forSuccessCallback(onEndRunnable));
                     }
                     AnimatorSet animset = fadeAnim.buildAnim();
                     animset.setStartDelay(100);
@@ -174,7 +174,7 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
                 anim.setViewAlpha(mFakePreviousTaskView, 0, ACCEL);
             }
             if (onEndRunnable != null) {
-                anim.addListener(AnimationSuccessListener.forRunnable(onEndRunnable));
+                anim.addListener(AnimatorListeners.forSuccessCallback(onEndRunnable));
             }
         }
         AnimatorSet animset = anim.buildAnim();
@@ -205,10 +205,10 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
         PendingAnimation fadeAnim = new PendingAnimation(300);
         fadeAnim.setViewAlpha(mFakeIconView, 0, ACCEL);
         if (onEndRunnable != null) {
-            fadeAnim.addListener(AnimationSuccessListener.forRunnable(onEndRunnable));
+            fadeAnim.addListener(AnimatorListeners.forSuccessCallback(onEndRunnable));
         }
         AnimatorSet animset = fadeAnim.buildAnim();
-        rectAnim.addAnimatorListener(AnimationSuccessListener.forRunnable(animset::start));
+        rectAnim.addAnimatorListener(AnimatorListeners.forSuccessCallback(animset::start));
         mRunningWindowAnim = RunningWindowAnim.wrap(rectAnim);
     }
 
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
index 55972adcbe..1128a7ca24 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
@@ -38,7 +38,7 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.content.res.AppCompatResources;
 
 import com.android.launcher3.R;
-import com.android.launcher3.anim.AnimationSuccessListener;
+import com.android.launcher3.anim.AnimatorListeners;
 import com.android.launcher3.views.ClipIconView;
 import com.android.quickstep.interaction.EdgeBackGestureHandler.BackGestureAttemptCallback;
 import com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureAttemptCallback;
@@ -139,7 +139,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
     }
 
     void fadeTaskViewAndRun(Runnable r) {
-        mFakeTaskView.animate().alpha(0).setListener(AnimationSuccessListener.forRunnable(r));
+        mFakeTaskView.animate().alpha(0).setListener(AnimatorListeners.forSuccessCallback(r));
     }
 
     @StringRes
@@ -348,8 +348,8 @@ abstract class TutorialController implements BackGestureAttemptCallback,
                     mContext, getMockLauncherResId()));
             mFakeTaskView.setBackground(AppCompatResources.getDrawable(
                     mContext, getMockAppTaskThumbnailResId()));
-            mFakeTaskView.animate().alpha(1).setListener(AnimationSuccessListener.forRunnable(
-                    () -> mFakeTaskView.animate().cancel()));
+            mFakeTaskView.animate().alpha(1).setListener(
+                    AnimatorListeners.forSuccessCallback(() -> mFakeTaskView.animate().cancel()));
             mFakePreviousTaskView.setBackground(AppCompatResources.getDrawable(
                     mContext, getMockPreviousAppTaskThumbnailResId()));
             mFakeIconView.setBackground(AppCompatResources.getDrawable(
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 5a58a827b5..49fc2dd1ae 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -111,6 +111,7 @@ import com.android.launcher3.PagedView;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimationSuccessListener;
+import com.android.launcher3.anim.AnimatorListeners;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.anim.SpringProperty;
@@ -120,7 +121,6 @@ import com.android.launcher3.icons.cache.HandlerRunnable;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.BaseState;
 import com.android.launcher3.statemanager.StatefulActivity;
-import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.OverScroll;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.util.DynamicResource;
@@ -1672,7 +1672,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             return;
         }
         AnimatorSet pa = setRecentsChangedOrientation(true);
-        pa.addListener(AnimationSuccessListener.forRunnable(() -> {
+        pa.addListener(AnimatorListeners.forSuccessCallback(() -> {
             setLayoutRotation(newRotation, mOrientationState.getDisplayRotation());
             mActivity.getDragLayer().recreateControllers();
             updateChildTaskOrientations();
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index f846d14ff9..81d4fcfd5d 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -25,6 +25,7 @@ import static com.android.launcher3.LauncherState.FLAG_WORKSPACE_INACCESSIBLE;
 import static com.android.launcher3.LauncherState.HINT_STATE;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.SPRING_LOADED;
+import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback;
 import static com.android.launcher3.config.FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM;
 import static com.android.launcher3.dragndrop.DragLayer.ALPHA_INDEX_OVERLAY;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
@@ -1950,8 +1951,8 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
             }
             parent.onDropChild(cell);
 
-            mLauncher.getStateManager().goToState(
-                    NORMAL, SPRING_LOADED_EXIT_DELAY, onCompleteRunnable);
+            mLauncher.getStateManager().goToState(NORMAL, SPRING_LOADED_EXIT_DELAY,
+                    onCompleteRunnable == null ? null : forSuccessCallback(onCompleteRunnable));
             mStatsLogManager.logger().withItemInfo(d.dragInfo).withInstanceId(d.logInstanceId)
                     .log(LauncherEvent.LAUNCHER_ITEM_DROP_COMPLETED);
         }
diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
index c580d47994..2b36f19226 100644
--- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
+++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
@@ -3,6 +3,7 @@ package com.android.launcher3.accessibility;
 import static android.view.accessibility.AccessibilityNodeInfo.ACTION_LONG_CLICK;
 
 import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.IGNORE;
 
 import android.appwidget.AppWidgetProviderInfo;
@@ -220,30 +221,26 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
         } else if (action == ADD_TO_WORKSPACE) {
             final int[] coordinates = new int[2];
             final int screenId = findSpaceOnWorkspace(item, coordinates);
-            mLauncher.getStateManager().goToState(NORMAL, true, new Runnable() {
-
-                @Override
-                public void run() {
-                    if (item instanceof AppInfo) {
-                        WorkspaceItemInfo info = ((AppInfo) item).makeWorkspaceItem();
-                        mLauncher.getModelWriter().addItemToDatabase(info,
-                                Favorites.CONTAINER_DESKTOP,
-                                screenId, coordinates[0], coordinates[1]);
-
-                        mLauncher.bindItems(
-                                Collections.singletonList(info),
-                                /* forceAnimateIcons= */ true,
-                                /* focusFirstItemForAccessibility= */ true);
-                        announceConfirmation(R.string.item_added_to_workspace);
-                    } else if (item instanceof PendingAddItemInfo) {
-                        PendingAddItemInfo info = (PendingAddItemInfo) item;
-                        Workspace workspace = mLauncher.getWorkspace();
-                        workspace.snapToPage(workspace.getPageIndexForScreenId(screenId));
-                        mLauncher.addPendingItem(info, Favorites.CONTAINER_DESKTOP,
-                                screenId, coordinates, info.spanX, info.spanY);
-                    }
+            mLauncher.getStateManager().goToState(NORMAL, true, forSuccessCallback(() -> {
+                if (item instanceof AppInfo) {
+                    WorkspaceItemInfo info = ((AppInfo) item).makeWorkspaceItem();
+                    mLauncher.getModelWriter().addItemToDatabase(info,
+                            Favorites.CONTAINER_DESKTOP,
+                            screenId, coordinates[0], coordinates[1]);
+
+                    mLauncher.bindItems(
+                            Collections.singletonList(info),
+                            /* forceAnimateIcons= */ true,
+                            /* focusFirstItemForAccessibility= */ true);
+                    announceConfirmation(R.string.item_added_to_workspace);
+                } else if (item instanceof PendingAddItemInfo) {
+                    PendingAddItemInfo info = (PendingAddItemInfo) item;
+                    Workspace workspace = mLauncher.getWorkspace();
+                    workspace.snapToPage(workspace.getPageIndexForScreenId(screenId));
+                    mLauncher.addPendingItem(info, Favorites.CONTAINER_DESKTOP,
+                            screenId, coordinates, info.spanX, info.spanY);
                 }
-            });
+            }));
             return true;
         } else if (action == MOVE_TO_WORKSPACE) {
             Folder folder = Folder.getOpen(mLauncher);
diff --git a/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java
index 1733e5dd41..f96afa856b 100644
--- a/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java
+++ b/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java
@@ -17,6 +17,7 @@
 package com.android.launcher3.accessibility;
 
 import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback;
 
 import android.view.KeyEvent;
 import android.view.View;
@@ -67,19 +68,14 @@ public class ShortcutMenuAccessibilityDelegate extends LauncherAccessibilityDele
             final WorkspaceItemInfo info = ((DeepShortcutView) host.getParent()).getFinalInfo();
             final int[] coordinates = new int[2];
             final int screenId = findSpaceOnWorkspace(item, coordinates);
-            Runnable onComplete = new Runnable() {
-                @Override
-                public void run() {
-                    mLauncher.getModelWriter().addItemToDatabase(info,
-                            LauncherSettings.Favorites.CONTAINER_DESKTOP,
-                            screenId, coordinates[0], coordinates[1]);
-                    mLauncher.bindItems(Collections.singletonList(info), true);
-                    AbstractFloatingView.closeAllOpenViews(mLauncher);
-                    announceConfirmation(R.string.item_added_to_workspace);
-                }
-            };
-
-            mLauncher.getStateManager().goToState(NORMAL, true, onComplete);
+            mLauncher.getStateManager().goToState(NORMAL, true, forSuccessCallback(() -> {
+                mLauncher.getModelWriter().addItemToDatabase(info,
+                        LauncherSettings.Favorites.CONTAINER_DESKTOP,
+                        screenId, coordinates[0], coordinates[1]);
+                mLauncher.bindItems(Collections.singletonList(info), true);
+                AbstractFloatingView.closeAllOpenViews(mLauncher);
+                announceConfirmation(R.string.item_added_to_workspace);
+            }));
             return true;
         } else if (action == DISMISS_NOTIFICATION) {
             if (!(host instanceof NotificationMainView)) {
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 90f2d7cde5..2cfbdf9d59 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -28,7 +28,7 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_VERTICAL_PR
 import static com.android.launcher3.util.SystemUiController.UI_STATE_ALLAPPS;
 
 import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
+import android.animation.Animator.AnimatorListener;
 import android.animation.ObjectAnimator;
 import android.util.FloatProperty;
 import android.view.View;
@@ -39,7 +39,7 @@ import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.anim.AnimationSuccessListener;
+import com.android.launcher3.anim.AnimatorListeners;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.anim.PropertySetter;
 import com.android.launcher3.config.FeatureFlags;
@@ -189,8 +189,8 @@ public class AllAppsTransitionController
         mScrimView.setDrawingController(shouldProtectHeader ? mAppsView : null);
     }
 
-    public AnimatorListenerAdapter getProgressAnimatorListener() {
-        return AnimationSuccessListener.forRunnable(this::onProgressAnimationEnd);
+    public AnimatorListener getProgressAnimatorListener() {
+        return AnimatorListeners.forSuccessCallback(this::onProgressAnimationEnd);
     }
 
     /**
diff --git a/src/com/android/launcher3/anim/AnimationSuccessListener.java b/src/com/android/launcher3/anim/AnimationSuccessListener.java
index 9905e81638..a312070e58 100644
--- a/src/com/android/launcher3/anim/AnimationSuccessListener.java
+++ b/src/com/android/launcher3/anim/AnimationSuccessListener.java
@@ -40,24 +40,4 @@ public abstract class AnimationSuccessListener extends AnimatorListenerAdapter {
 
     public abstract void onAnimationSuccess(Animator animator);
 
-    /**
-     * Returns an AnimationSuccessListener which runs the provided action on success
-     */
-    public static AnimationSuccessListener forRunnable(Runnable r) {
-        return new RunnableSuccessListener(r);
-    }
-
-    private static class RunnableSuccessListener extends AnimationSuccessListener {
-
-        private final Runnable mRunnable;
-
-        private RunnableSuccessListener(Runnable r) {
-            mRunnable = r;
-        }
-
-        @Override
-        public void onAnimationSuccess(Animator animator) {
-            mRunnable.run();
-        }
-    }
 }
diff --git a/src/com/android/launcher3/anim/AnimatorListeners.java b/src/com/android/launcher3/anim/AnimatorListeners.java
new file mode 100644
index 0000000000..379970049a
--- /dev/null
+++ b/src/com/android/launcher3/anim/AnimatorListeners.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.anim;
+
+import static com.android.launcher3.LauncherAnimUtils.SUCCESS_TRANSITION_PROGRESS;
+
+import android.animation.Animator;
+import android.animation.Animator.AnimatorListener;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.ValueAnimator;
+
+import java.util.function.Consumer;
+
+/**
+ * Utility class for creating common {@link AnimatorListener}
+ */
+public class AnimatorListeners {
+
+    /**
+     * Returns an AnimatorListener which executes the callback on successful animation completion
+     */
+    public static AnimatorListener forSuccessCallback(Runnable callback) {
+        return new RunnableSuccessListener(callback);
+    }
+
+    /**
+     * Returns an AnimatorListener which executes the callback on animation completion,
+     * with the boolean representing success
+     */
+    public static AnimatorListener forEndCallback(Consumer<Boolean> callback) {
+        return new EndStateCallbackWrapper(callback);
+    }
+
+    /**
+     * Returns an AnimatorListener which executes the callback on animation completion
+     */
+    public static AnimatorListener forEndCallback(Runnable callback) {
+        return new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation, boolean isReverse) {
+                callback.run();
+            }
+        };
+    }
+
+    private static class EndStateCallbackWrapper extends AnimatorListenerAdapter {
+
+        private final Consumer<Boolean> mListener;
+        private boolean mListenerCalled = false;
+
+        EndStateCallbackWrapper(Consumer<Boolean> listener) {
+            mListener = listener;
+        }
+
+        @Override
+        public void onAnimationCancel(Animator animation) {
+            if (!mListenerCalled) {
+                mListenerCalled = true;
+                mListener.accept(false);
+            }
+        }
+
+        @Override
+        public void onAnimationEnd(Animator animation) {
+            if (!mListenerCalled) {
+                ValueAnimator anim = (ValueAnimator) animation;
+                mListener.accept(anim.getAnimatedFraction() > SUCCESS_TRANSITION_PROGRESS);
+            }
+        }
+    }
+
+    private static class RunnableSuccessListener extends AnimationSuccessListener {
+
+        private final Runnable mRunnable;
+
+        private RunnableSuccessListener(Runnable r) {
+            mRunnable = r;
+        }
+
+        @Override
+        public void onAnimationSuccess(Animator animator) {
+            mRunnable.run();
+        }
+    }
+}
diff --git a/src/com/android/launcher3/anim/PendingAnimation.java b/src/com/android/launcher3/anim/PendingAnimation.java
index 8057475fb4..01f7de66ce 100644
--- a/src/com/android/launcher3/anim/PendingAnimation.java
+++ b/src/com/android/launcher3/anim/PendingAnimation.java
@@ -15,13 +15,11 @@
  */
 package com.android.launcher3.anim;
 
-import static com.android.launcher3.LauncherAnimUtils.SUCCESS_TRANSITION_PROGRESS;
 import static com.android.launcher3.LauncherAnimUtils.VIEW_BACKGROUND_COLOR;
 import static com.android.launcher3.anim.AnimatorPlaybackController.addAnimationHoldersRecur;
 
 import android.animation.Animator;
 import android.animation.Animator.AnimatorListener;
-import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.TimeInterpolator;
@@ -182,32 +180,6 @@ public class PendingAnimation implements PropertySetter {
         if (mProgressAnimator == null) {
             mProgressAnimator = ValueAnimator.ofFloat(0, 1);
         }
-        mProgressAnimator.addListener(new EndStateCallbackWrapper(listener));
-    }
-
-    private static class EndStateCallbackWrapper extends AnimatorListenerAdapter {
-
-        private final Consumer<Boolean> mListener;
-        private boolean mCalled = false;
-
-        EndStateCallbackWrapper(Consumer<Boolean> listener) {
-            mListener = listener;
-        }
-
-        @Override
-        public void onAnimationCancel(Animator animation) {
-            if (!mCalled) {
-                mCalled = true;
-                mListener.accept(false);
-            }
-        }
-
-        @Override
-        public void onAnimationEnd(Animator animation) {
-            if (!mCalled) {
-                ValueAnimator anim = (ValueAnimator) animation;
-                mListener.accept(anim.getAnimatedFraction() > SUCCESS_TRANSITION_PROGRESS);
-            }
-        }
+        mProgressAnimator.addListener(AnimatorListeners.forEndCallback(listener));
     }
 }
diff --git a/src/com/android/launcher3/statemanager/StateManager.java b/src/com/android/launcher3/statemanager/StateManager.java
index 14ef2dc652..03b68535bc 100644
--- a/src/com/android/launcher3/statemanager/StateManager.java
+++ b/src/com/android/launcher3/statemanager/StateManager.java
@@ -129,14 +129,14 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
     }
 
     /**
-     * @see #goToState(STATE_TYPE, boolean, Runnable)
+     * @see #goToState(STATE_TYPE, boolean, AnimatorListener)
      */
     public void goToState(STATE_TYPE state) {
         goToState(state, shouldAnimateStateChange());
     }
 
     /**
-     * @see #goToState(STATE_TYPE, boolean, Runnable)
+     * @see #goToState(STATE_TYPE, boolean, AnimatorListener)
      */
     public void goToState(STATE_TYPE state, boolean animated) {
         goToState(state, animated, 0, null);
@@ -149,15 +149,15 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
      *                true otherwise
      * @paras onCompleteRunnable any action to perform at the end of the transition, of null.
      */
-    public void goToState(STATE_TYPE state, boolean animated, Runnable onCompleteRunnable) {
-        goToState(state, animated, 0, onCompleteRunnable);
+    public void goToState(STATE_TYPE state, boolean animated, AnimatorListener listener) {
+        goToState(state, animated, 0, listener);
     }
 
     /**
      * Changes the Launcher state to the provided state after the given delay.
      */
-    public void goToState(STATE_TYPE state, long delay, Runnable onCompleteRunnable) {
-        goToState(state, true, delay, onCompleteRunnable);
+    public void goToState(STATE_TYPE state, long delay, AnimatorListener listener) {
+        goToState(state, true, delay, listener);
     }
 
     /**
@@ -187,21 +187,20 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
         }
     }
 
-    private void goToState(STATE_TYPE state, boolean animated, long delay,
-            final Runnable onCompleteRunnable) {
+    private void goToState(
+            STATE_TYPE state, boolean animated, long delay, AnimatorListener listener) {
         animated &= areAnimatorsEnabled();
         if (mActivity.isInState(state)) {
             if (mConfig.currentAnimation == null) {
                 // Run any queued runnable
-                if (onCompleteRunnable != null) {
-                    onCompleteRunnable.run();
+                if (listener != null) {
+                    listener.onAnimationEnd(null);
                 }
                 return;
             } else if (!mConfig.userControlled && animated && mConfig.targetState == state) {
                 // We are running the same animation as requested
-                if (onCompleteRunnable != null) {
-                    mConfig.currentAnimation.addListener(
-                            AnimationSuccessListener.forRunnable(onCompleteRunnable));
+                if (listener != null) {
+                    mConfig.currentAnimation.addListener(listener);
                 }
                 return;
             }
@@ -221,8 +220,8 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
             onStateTransitionEnd(state);
 
             // Run any queued runnable
-            if (onCompleteRunnable != null) {
-                onCompleteRunnable.run();
+            if (listener != null) {
+                listener.onAnimationEnd(null);
             }
             return;
         }
@@ -233,16 +232,16 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
             int startChangeId = mConfig.changeId;
             mUiHandler.postDelayed(() -> {
                 if (mConfig.changeId == startChangeId) {
-                    goToStateAnimated(state, fromState, onCompleteRunnable);
+                    goToStateAnimated(state, fromState, listener);
                 }
             }, delay);
         } else {
-            goToStateAnimated(state, fromState, onCompleteRunnable);
+            goToStateAnimated(state, fromState, listener);
         }
     }
 
     private void goToStateAnimated(STATE_TYPE state, STATE_TYPE fromState,
-            Runnable onCompleteRunnable) {
+            AnimatorListener listener) {
         // Since state mBaseState can be reached from multiple states, just assume that the
         // transition plays in reverse and use the same duration as previous state.
         mConfig.duration = state == mBaseState
@@ -250,8 +249,8 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
                 : state.getTransitionDuration(mActivity);
         prepareForAtomicAnimation(fromState, state, mConfig);
         AnimatorSet animation = createAnimationToNewWorkspaceInternal(state).buildAnim();
-        if (onCompleteRunnable != null) {
-            animation.addListener(AnimationSuccessListener.forRunnable(onCompleteRunnable));
+        if (listener != null) {
+            animation.addListener(listener);
         }
         mUiHandler.post(new StartAnimRunnable(animation));
     }
-- 
GitLab


From 5ee7c13c60954881ca4d760abf73a2ed2935023e Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Tue, 11 May 2021 13:52:36 -0700
Subject: [PATCH 1139/1664] hide keyboard onStop and onNewIntent

Bug: 183062683
Test: manual

Change-Id: I4c69c8ff87d827552e6b77424ce4b17edfb22966
---
 src/com/android/launcher3/Launcher.java | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 5ecdca6dfc..7b67807697 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -905,7 +905,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         } else {
             mOverlayManager.onActivityStopped(this);
         }
-
+        hideKeyboard();
         logStopAndResume(false /* isResume */);
         mAppWidgetHost.setActivityStarted(false);
         NotificationListener.removeNotificationsChangedListener();
@@ -1459,7 +1459,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
                 && AbstractFloatingView.getTopOpenView(this) == null;
         boolean isActionMain = Intent.ACTION_MAIN.equals(intent.getAction());
         boolean internalStateHandled = ACTIVITY_TRACKER.handleNewIntent(this, intent);
-
+        hideKeyboard();
         if (isActionMain) {
             if (!internalStateHandled) {
                 // In all these cases, only animate if we're already on home
@@ -1481,9 +1481,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
                 }
             }
 
-            // Handle HOME_INTENT
-            hideKeyboard();
-
             if (mLauncherCallbacks != null) {
                 mLauncherCallbacks.onHomeIntent(internalStateHandled);
             }
-- 
GitLab


From af3aed0c4ad7b43020d62317796f6237a9700f29 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Thu, 6 May 2021 18:28:45 -0700
Subject: [PATCH 1140/1664] Use SP for folder text size.

Bug: 156141463
Test: change font size, verify folder text size changes
Change-Id: I7e479d76c9f16c5b42cabfbae63494ef98b6dc27
---
 src/com/android/launcher3/DeviceProfile.java | 7 ++++---
 src/com/android/launcher3/Utilities.java     | 9 +++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index e5ad24341b..812667371d 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -21,6 +21,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION;
 
 import static com.android.launcher3.ResourceUtils.pxFromDp;
 import static com.android.launcher3.Utilities.dpiFromPx;
+import static com.android.launcher3.Utilities.pxFromSp;
 import static com.android.launcher3.util.WindowManagerCompat.MIN_TABLET_WIDTH;
 
 import android.annotation.SuppressLint;
@@ -518,7 +519,7 @@ public class DeviceProfile {
         float invIconSizeDp = isLandscape ? inv.landscapeIconSize : inv.iconSize;
         iconSizePx = Math.max(1, pxFromDp(invIconSizeDp, mMetrics, scale));
         float invIconTextSizeSp = isLandscape ? inv.landscapeIconTextSize : inv.iconTextSize;
-        iconTextSizePx = (int) (Utilities.pxFromSp(invIconTextSizeSp, mMetrics) * scale);
+        iconTextSizePx = (int) (pxFromSp(invIconTextSizeSp, mMetrics) * scale);
         iconDrawablePaddingPx = (int) (iconDrawablePaddingOriginalPx * scale);
 
         setCellLayoutBorderSpacing((int) (cellLayoutBorderSpacingOriginalPx * scale));
@@ -548,7 +549,7 @@ public class DeviceProfile {
         // All apps
         if (numShownAllAppsColumns != inv.numColumns) {
             allAppsIconSizePx = pxFromDp(inv.allAppsIconSize, mMetrics);
-            allAppsIconTextSizePx = Utilities.pxFromSp(inv.allAppsIconTextSize, mMetrics);
+            allAppsIconTextSizePx = pxFromSp(inv.allAppsIconTextSize, mMetrics);
             allAppsIconDrawablePaddingPx = iconDrawablePaddingOriginalPx;
             autoResizeAllAppsCells();
         } else {
@@ -619,7 +620,7 @@ public class DeviceProfile {
     private void updateFolderCellSize(float scale, Resources res) {
         float invIconSizeDp = isVerticalBarLayout() ? inv.landscapeIconSize : inv.iconSize;
         folderChildIconSizePx = Math.max(1, pxFromDp(invIconSizeDp, mMetrics, scale));
-        folderChildTextSizePx = pxFromDp(inv.iconTextSize, mMetrics, scale);
+        folderChildTextSizePx = pxFromSp(inv.iconTextSize, mMetrics, scale);
         folderLabelTextSizePx = (int) (folderChildTextSizePx * folderLabelTextScale);
 
         int textHeight = Utilities.calculateTextHeight(folderChildTextSizePx);
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 7c0036250b..7ae729aa0c 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -465,9 +465,14 @@ public final class Utilities {
         return (int) (dp * Resources.getSystem().getDisplayMetrics().density);
     }
 
+
     public static int pxFromSp(float size, DisplayMetrics metrics) {
-        return (int) Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP,
-                size, metrics));
+        return pxFromSp(size, metrics, 1f);
+    }
+
+    public static int pxFromSp(float size, DisplayMetrics metrics, float scale) {
+        return Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP,
+                size, metrics) * scale);
     }
 
     public static String createDbSelectionQuery(String columnName, IntArray values) {
-- 
GitLab


From 6fc623d0b9fc18cc61a2b69389313eb63b229106 Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Tue, 11 May 2021 16:30:54 -0700
Subject: [PATCH 1141/1664] Skip setShelfHeight if Launcher is not started

Video: http://recall/-/aaaaaabFQoRHlzixHdtY/gIqsb2WlagwQ8ly3q3RHI0
Bug: 184797356
Test: atest WMShellFlickerTests:PipShelfHeightTest
Test: manual, see video
Change-Id: Ia02b2da110b05341dfbf92b9d8d7fca4bbf6bdb3
---
 .../uioverrides/QuickstepLauncher.java        | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index d07cc35ecc..45bb521336 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -200,14 +200,18 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
      */
     private void onStateOrResumeChanging(boolean inTransition) {
         LauncherState state = getStateManager().getState();
-        DeviceProfile profile = getDeviceProfile();
-        boolean willUserBeActive = (getActivityFlags() & ACTIVITY_STATE_USER_WILL_BE_ACTIVE) != 0;
-        boolean visible = (state == NORMAL || state == OVERVIEW)
-                && (willUserBeActive || isUserActive())
-                && !profile.isVerticalBarLayout()
-                && profile.isPhone && !profile.isLandscape;
-        UiThreadHelper.runAsyncCommand(this, SET_SHELF_HEIGHT, visible ? 1 : 0,
-                profile.hotseatBarSizePx);
+        boolean started = ((getActivityFlags() & ACTIVITY_STATE_STARTED)) != 0;
+        if (started) {
+            DeviceProfile profile = getDeviceProfile();
+            boolean willUserBeActive =
+                    (getActivityFlags() & ACTIVITY_STATE_USER_WILL_BE_ACTIVE) != 0;
+            boolean visible = (state == NORMAL || state == OVERVIEW)
+                    && (willUserBeActive || isUserActive())
+                    && !profile.isVerticalBarLayout()
+                    && profile.isPhone && !profile.isLandscape;
+            UiThreadHelper.runAsyncCommand(this, SET_SHELF_HEIGHT, visible ? 1 : 0,
+                    profile.hotseatBarSizePx);
+        }
         if (state == NORMAL && !inTransition) {
             ((RecentsView) getOverviewPanel()).setSwipeDownShouldLaunchApp(false);
         }
-- 
GitLab


From 38588dc23a68543d5f83f6253c402199bab0f134 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Wed, 5 May 2021 10:03:21 -0700
Subject: [PATCH 1142/1664] Finish the recents animation upon home rotation

Fixes: 184054813
Test: manual
Change-Id: I32eba85563b83ee9738696c526a1546008cd3a5d
---
 .../src/com/android/quickstep/views/RecentsView.java   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index dfe0c4347a..b5e34558d5 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2592,6 +2592,16 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     @Override
     protected void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
+        if (LIVE_TILE.get()) {
+            switchToScreenshot(
+                    () -> finishRecentsAnimation(true /* toRecents */,
+                            this::onConfigurationChangedInternal));
+        } else {
+            onConfigurationChangedInternal();
+        }
+    }
+
+    private void onConfigurationChangedInternal() {
         final int rotation = mActivity.getDisplay().getRotation();
         if (mOrientationState.setRecentsRotation(rotation)) {
             updateOrientationHandler();
-- 
GitLab


From 7bbd03160fa070f253bd5fde97d6d51e30c4f3f1 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Tue, 11 May 2021 17:01:13 -0700
Subject: [PATCH 1143/1664] Fix contrast issue with folder background and text
 colors.

Bug: 187797251
Test: dark wallpaper, light wallpaper, toggle dark theme on both
Change-Id: I57ddfc91878d68735d5ae5ec5ab78222fda101ca
---
 res/values-v29/styles.xml                            |  1 +
 res/values-v30/styles.xml                            |  1 +
 res/values/attrs.xml                                 |  1 +
 res/values/styles.xml                                |  7 +++++++
 src/com/android/launcher3/folder/Folder.java         |  2 ++
 .../launcher3/folder/FolderAnimationManager.java     |  8 ++++----
 .../launcher3/widget/LocalColorExtractor.java        | 12 +++++++++---
 7 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/res/values-v29/styles.xml b/res/values-v29/styles.xml
index 75905949a5..8254d483fc 100644
--- a/res/values-v29/styles.xml
+++ b/res/values-v29/styles.xml
@@ -27,6 +27,7 @@
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowShowWallpaper">true</item>
         <item name="folderTextColor">?attr/workspaceTextColor</item>
+        <item name="isFolderDarkText">?attr/isWorkspaceDarkText</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
         <item name="android:enforceStatusBarContrast">false</item>
         <item name="android:enforceNavigationBarContrast">false</item>
diff --git a/res/values-v30/styles.xml b/res/values-v30/styles.xml
index 71740a92c5..a144363e12 100644
--- a/res/values-v30/styles.xml
+++ b/res/values-v30/styles.xml
@@ -27,6 +27,7 @@
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowShowWallpaper">true</item>
         <item name="folderTextColor">?attr/workspaceTextColor</item>
+        <item name="isFolderDarkText">?attr/isWorkspaceDarkText</item>
         <item name="android:windowLayoutInDisplayCutoutMode">always</item>
         <item name="android:enforceStatusBarContrast">false</item>
         <item name="android:enforceNavigationBarContrast">false</item>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index a81802d87a..1f8a022b73 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -43,6 +43,7 @@
     <attr name="folderIconBorderColor" format="color" />
     <attr name="folderTextColor" format="color" />
     <attr name="folderHintColor" format="color" />
+    <attr name="isFolderDarkText" format="boolean" />
     <attr name="workProfileOverlayTextColor" format="color" />
     <attr name="gridColor" format="color" />
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index dd72114495..0bca00ebf3 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -27,6 +27,7 @@
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowShowWallpaper">true</item>
         <item name="folderTextColor">?attr/workspaceTextColor</item>
+        <item name="isFolderDarkText">?attr/isWorkspaceDarkText</item>
     </style>
 
     <style name="LauncherTheme" parent="@style/BaseLauncherTheme">
@@ -50,6 +51,7 @@
         <item name="folderFillColor">?android:attr/colorBackground</item>
         <item name="folderIconBorderColor">?android:attr/colorPrimary</item>
         <item name="folderTextColor">?android:attr/textColorPrimary</item>
+        <item name="isFolderDarkText">true</item>
         <item name="folderHintColor">#89616161</item>
         <item name="loadingIconColor">#CCFFFFFF</item>
         <item name="iconOnlyShortcutColor">?android:attr/textColorSecondary</item>
@@ -71,6 +73,7 @@
     <style name="LauncherTheme.DarkMainColor" parent="@style/LauncherTheme">
         <item name="folderFillColor">#FF3C4043</item> <!-- 100% GM2 800 -->
         <item name="folderTextColor">?attr/workspaceTextColor</item>
+        <item name="isFolderDarkText">?attr/isWorkspaceDarkText</item>
         <item name="disabledIconAlpha">.254</item>
 
     </style>
@@ -86,6 +89,7 @@
         <item name="folderFillColor">#CDFFFFFF</item>
         <item name="folderIconBorderColor">#FF80868B</item>
         <item name="folderTextColor">?attr/workspaceTextColor</item>
+        <item name="isFolderDarkText">true</item>
     </style>
 
     <style name="LauncherTheme.Dark" parent="@style/LauncherTheme">
@@ -107,6 +111,7 @@
         <item name="folderFillColor">?android:attr/colorBackground</item>
         <item name="folderIconBorderColor">?android:attr/colorPrimary</item>
         <item name="folderTextColor">?android:attr/textColorPrimary</item>
+        <item name="isFolderDarkText">false</item>
         <item name="folderHintColor">#89CCCCCC</item>
         <item name="isMainColorDark">true</item>
         <item name="loadingIconColor">#99FFFFFF</item>
@@ -119,6 +124,7 @@
     <style name="LauncherTheme.Dark.DarkMainColor" parent="@style/LauncherTheme.Dark">
         <item name="folderFillColor">#FF3C4043</item> <!-- 100% GM2 800 -->
         <item name="folderTextColor">@android:color/white</item>
+        <item name="isFolderDarkText">false</item>
         <item name="disabledIconAlpha">.54</item>
     </style>
 
@@ -126,6 +132,7 @@
         <item name="android:colorControlHighlight">#19212121</item>
         <item name="folderFillColor">#CDFFFFFF</item>
         <item name="folderTextColor">?attr/workspaceTextColor</item>
+        <item name="isFolderDarkText">?attr/isWorkspaceDarkText</item>
         <item name="workspaceTextColor">@color/workspace_text_color_dark</item>
         <item name="workspaceShadowColor">@android:color/transparent</item>
         <item name="workspaceAmbientShadowColor">@android:color/transparent</item>
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index 22d1b1c48a..f5a8ef6f1d 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -296,6 +296,8 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         }
 
         if (Utilities.ATLEAST_S) {
+            mColorExtractionIndex = LocalColorExtractor.getColorIndex(
+                    !Themes.getAttrBoolean(getContext(), R.attr.isFolderDarkText));
             mColorExtractor = LocalColorExtractor.newInstance(getContext());
             mColorListener = (RectF rect, SparseIntArray extractedColors) -> {
                 mColorChangeRunnable = () -> {
diff --git a/src/com/android/launcher3/folder/FolderAnimationManager.java b/src/com/android/launcher3/folder/FolderAnimationManager.java
index af8be8d2f9..7fbfb8934e 100644
--- a/src/com/android/launcher3/folder/FolderAnimationManager.java
+++ b/src/com/android/launcher3/folder/FolderAnimationManager.java
@@ -168,15 +168,15 @@ public class FolderAnimationManager {
         final float yDistance = initialY - lp.y;
 
         // Set up the Folder background.
-        int previewBackgroundColor = Themes.getAttrColor(mContext, R.attr.folderFillColor);
         final int finalColor;
+        int folderFillColor = Themes.getAttrColor(mContext, R.attr.folderFillColor);
         if (mIsOpening) {
-            finalColor = Themes.getAttrColor(mContext, R.attr.popupColorPrimary);
+            finalColor = folderFillColor;
         } else {
             finalColor = mFolderBackground.getColor().getDefaultColor();
         }
-        final int initialColor = setColorAlphaBound(previewBackgroundColor,
-                mPreviewBackground.getBackgroundAlpha());
+        final int initialColor = setColorAlphaBound(
+                folderFillColor, mPreviewBackground.getBackgroundAlpha());
         mFolderBackground.mutate();
         mFolderBackground.setColor(mIsOpening ? initialColor : finalColor);
 
diff --git a/src/com/android/launcher3/widget/LocalColorExtractor.java b/src/com/android/launcher3/widget/LocalColorExtractor.java
index a66024aafc..e479b7d049 100644
--- a/src/com/android/launcher3/widget/LocalColorExtractor.java
+++ b/src/com/android/launcher3/widget/LocalColorExtractor.java
@@ -113,8 +113,14 @@ public class LocalColorExtractor implements ResourceBasedOverride {
      * Returns an index used to query the color of interest from the list of extracted colors.
      */
     public static int getColorIndex(Context context) {
-        return Utilities.isDarkTheme(context)
-                ? DARK_COLOR_EXTRACTION_INDEX
-                : LIGHT_COLOR_EXTRACTION_INDEX;
+        return getColorIndex(Utilities.isDarkTheme(context));
+    }
+
+    /**
+     * Returns an index used to query the color of interest from the list of extracted colors.
+     * @param getDarkIndex True when dark index is wanted, False when light index is wanted.
+     */
+    public static int getColorIndex(boolean getDarkIndex) {
+        return getDarkIndex ? DARK_COLOR_EXTRACTION_INDEX : LIGHT_COLOR_EXTRACTION_INDEX;
     }
 }
-- 
GitLab


From 35c5477d5c706a55fa5761a7c3509c1b202bfcfa Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Fri, 7 May 2021 15:29:54 -0700
Subject: [PATCH 1144/1664] Remove color extraction from popup arrow, add
 shadows.

Bug: 175329686
Bug: 187014675
Test: manual

Change-Id: I84a3f23b7a9ceef004a2b1b66e5f8a10585bd113
---
 .../deep_shortcuts_text_placeholder.xml       |   2 +-
 res/drawable/ic_deepshortcut_placeholder.xml  |   4 +-
 res/drawable/single_item_secondary.xml        |  20 --
 res/layout/deep_shortcut.xml                  |   1 +
 res/layout/longpress_options_menu.xml         |   1 -
 res/layout/popup_container.xml                |   2 +-
 res/layout/system_shortcut.xml                |   1 +
 res/layout/system_shortcut_icons.xml          |   3 +-
 res/values-v31/colors.xml                     |   3 +-
 res/values/attrs.xml                          |   1 -
 res/values/colors.xml                         |   1 -
 res/values/dimens.xml                         |   3 +-
 res/values/styles.xml                         |   2 -
 .../notification/NotificationItemView.java    |   4 -
 .../android/launcher3/popup/ArrowPopup.java   | 177 ++----------------
 .../popup/PopupContainerWithArrow.java        |   8 -
 16 files changed, 25 insertions(+), 208 deletions(-)
 delete mode 100644 res/drawable/single_item_secondary.xml

diff --git a/res/drawable/deep_shortcuts_text_placeholder.xml b/res/drawable/deep_shortcuts_text_placeholder.xml
index 99da50fdca..5820d6b79f 100644
--- a/res/drawable/deep_shortcuts_text_placeholder.xml
+++ b/res/drawable/deep_shortcuts_text_placeholder.xml
@@ -15,7 +15,7 @@
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
-    <solid android:color="?attr/popupColorSecondary" />
+    <solid android:color="?attr/popupColorPrimary" />
     <corners android:radius="8dp" />
     <size android:height="16dp" />
 </shape>
diff --git a/res/drawable/ic_deepshortcut_placeholder.xml b/res/drawable/ic_deepshortcut_placeholder.xml
index 3fa85065bd..16e7cf3a58 100644
--- a/res/drawable/ic_deepshortcut_placeholder.xml
+++ b/res/drawable/ic_deepshortcut_placeholder.xml
@@ -15,6 +15,6 @@
      limitations under the License.
 -->
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="?attr/popupColorSecondary"/>
-    <foreground android:drawable="?attr/popupColorSecondary"/>
+    <background android:drawable="?attr/popupColorPrimary"/>
+    <foreground android:drawable="?attr/popupColorPrimary"/>
 </adaptive-icon>
diff --git a/res/drawable/single_item_secondary.xml b/res/drawable/single_item_secondary.xml
deleted file mode 100644
index 4edc4813aa..0000000000
--- a/res/drawable/single_item_secondary.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="?attr/popupColorSecondary"/>
-    <corners android:radius="@dimen/popup_single_item_radius" />
-</shape>
\ No newline at end of file
diff --git a/res/layout/deep_shortcut.xml b/res/layout/deep_shortcut.xml
index 0d11b50ab3..b175d1703f 100644
--- a/res/layout/deep_shortcut.xml
+++ b/res/layout/deep_shortcut.xml
@@ -19,6 +19,7 @@
     xmlns:launcher="http://schemas.android.com/apk/res-auto"
     android:layout_width="@dimen/bg_popup_item_width"
     android:layout_height="@dimen/bg_popup_item_height"
+    android:elevation="@dimen/deep_shortcuts_elevation"
     android:background="@drawable/middle_item_primary"
     android:theme="@style/PopupItem" >
 
diff --git a/res/layout/longpress_options_menu.xml b/res/layout/longpress_options_menu.xml
index 3898365b1c..d2f7a660d9 100644
--- a/res/layout/longpress_options_menu.xml
+++ b/res/layout/longpress_options_menu.xml
@@ -20,6 +20,5 @@
     android:layout_height="wrap_content"
     android:clipToPadding="false"
     android:clipChildren="false"
-    android:elevation="@dimen/deep_shortcuts_elevation"
     android:importantForAccessibility="yes"
     android:orientation="vertical" />
diff --git a/res/layout/popup_container.xml b/res/layout/popup_container.xml
index 04822fd7a2..7c78e441f2 100644
--- a/res/layout/popup_container.xml
+++ b/res/layout/popup_container.xml
@@ -21,7 +21,6 @@
     android:layout_height="wrap_content"
     android:clipToPadding="false"
     android:clipChildren="false"
-    android:elevation="@dimen/deep_shortcuts_elevation"
     android:orientation="vertical">
     <LinearLayout
         android:id="@+id/notification_container"
@@ -29,5 +28,6 @@
         android:layout_height="wrap_content"
         android:visibility="gone"
         android:background="?attr/popupColorPrimary"
+        android:elevation="@dimen/deep_shortcuts_elevation"
         android:orientation="vertical"/>
 </com.android.launcher3.popup.PopupContainerWithArrow>
\ No newline at end of file
diff --git a/res/layout/system_shortcut.xml b/res/layout/system_shortcut.xml
index 9f45f30216..6337faeadb 100644
--- a/res/layout/system_shortcut.xml
+++ b/res/layout/system_shortcut.xml
@@ -19,6 +19,7 @@
     xmlns:launcher="http://schemas.android.com/apk/res-auto"
     android:layout_width="@dimen/bg_popup_item_width"
     android:layout_height="@dimen/bg_popup_item_height"
+    android:elevation="@dimen/deep_shortcuts_elevation"
     android:background="@drawable/middle_item_primary"
     android:theme="@style/PopupItem" >
 
diff --git a/res/layout/system_shortcut_icons.xml b/res/layout/system_shortcut_icons.xml
index f9922488fb..775a45f47b 100644
--- a/res/layout/system_shortcut_icons.xml
+++ b/res/layout/system_shortcut_icons.xml
@@ -21,7 +21,8 @@
     android:layout_height="@dimen/system_shortcut_header_height"
     android:orientation="horizontal"
     android:gravity="end|center_vertical"
-    android:background="@drawable/single_item_secondary"
+    android:background="@drawable/single_item_primary"
+    android:elevation="@dimen/deep_shortcuts_elevation"
     android:clipToPadding="true">
 
     <Space android:layout_width="0dp"
diff --git a/res/values-v31/colors.xml b/res/values-v31/colors.xml
index 7f27bf8ca5..059fec2efb 100644
--- a/res/values-v31/colors.xml
+++ b/res/values-v31/colors.xml
@@ -17,8 +17,7 @@
 */
 -->
 <resources>
-    <color name="popup_color_neutral_light">@android:color/system_neutral1_0</color>
-    <color name="popup_color_primary_light">@android:color/system_neutral1_50</color>
+    <color name="popup_color_primary_light">@android:color/system_neutral1_0</color>
     <color name="popup_color_secondary_light">@android:color/system_neutral2_100</color>
     <color name="popup_color_tertiary_light">@android:color/system_neutral2_300</color>
     <color name="popup_color_neutral_dark">@android:color/system_neutral1_1000</color>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index a81802d87a..ad46d0f7bb 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -21,7 +21,6 @@
     <attr name="allAppsScrimColor" format="color" />
     <attr name="allAppsNavBarScrimColor" format="color" />
     <attr name="allAppsTheme" format="reference" />
-    <attr name="popupColorNeutral" format="color" />
     <attr name="popupColorPrimary" format="color" />
     <attr name="popupColorSecondary" format="color" />
     <attr name="popupColorTertiary" format="color" />
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 56a0e6bd9b..7345be4510 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -41,7 +41,6 @@
     <color name="gesture_tutorial_action_button_label_color">#FF000000</color>
     <color name="gesture_tutorial_primary_color">#B7F29F</color> <!-- Light Green -->
 
-    <color name="popup_color_neutral_light">#FFF</color>
     <color name="popup_color_primary_light">#FFF</color>
     <color name="popup_color_secondary_light">#F1F3F4</color>
     <color name="popup_color_tertiary_light">#E0E0E0</color> <!-- Gray 300 -->
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 3267a5d246..1fbf8a486c 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -202,7 +202,8 @@
     <dimen name="pending_widget_elevation">2dp</dimen>
 
 <!-- Deep shortcuts -->
-    <dimen name="deep_shortcuts_elevation">0dp</dimen>
+    <dimen name="deep_shortcuts_elevation">2dp</dimen>
+    <dimen name="bg_popup_padding">2dp</dimen>
     <dimen name="bg_popup_item_width">216dp</dimen>
     <dimen name="bg_popup_item_height">56dp</dimen>
     <dimen name="pre_drag_view_scale">6dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index dd72114495..ab415b1eee 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -34,7 +34,6 @@
         <item name="allAppsScrimColor">?android:attr/colorBackgroundFloating</item>
         <item name="allAppsNavBarScrimColor">#66FFFFFF</item>
         <item name="allAppsTheme">@style/AllAppsTheme</item>
-        <item name="popupColorNeutral">@color/popup_color_neutral_light</item>
         <item name="popupColorPrimary">@color/popup_color_primary_light</item>
         <item name="popupColorSecondary">@color/popup_color_secondary_light</item>
         <item name="popupColorTertiary">@color/popup_color_tertiary_light</item>
@@ -98,7 +97,6 @@
         <item name="allAppsScrimColor">?android:attr/colorBackgroundFloating</item>
         <item name="allAppsNavBarScrimColor">#80000000</item>
         <item name="allAppsTheme">@style/AllAppsTheme.Dark</item>
-        <item name="popupColorNeutral">@color/popup_color_neutral_dark</item>
         <item name="popupColorPrimary">@color/popup_color_primary_dark</item>
         <item name="popupColorSecondary">@color/popup_color_secondary_dark</item>
         <item name="popupColorTertiary">@color/popup_color_tertiary_dark</item>
diff --git a/src/com/android/launcher3/notification/NotificationItemView.java b/src/com/android/launcher3/notification/NotificationItemView.java
index e954480ca5..d44d158010 100644
--- a/src/com/android/launcher3/notification/NotificationItemView.java
+++ b/src/com/android/launcher3/notification/NotificationItemView.java
@@ -92,10 +92,6 @@ public class NotificationItemView {
         });
     }
 
-    public void updateBackgroundColor(int color) {
-        mMainView.updateBackgroundColor(color);
-    }
-
     public void addGutter() {
         if (mGutter == null) {
             mGutter = mPopupContainer.inflateAndAdd(R.layout.notification_gutter, mRootView);
diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java
index 73ac8f2ab5..8dea14a8c0 100644
--- a/src/com/android/launcher3/popup/ArrowPopup.java
+++ b/src/com/android/launcher3/popup/ArrowPopup.java
@@ -19,21 +19,15 @@ package com.android.launcher3.popup;
 import static com.android.launcher3.anim.Interpolators.ACCELERATED_EASE;
 import static com.android.launcher3.anim.Interpolators.DECELERATED_EASE;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
-import static com.android.launcher3.popup.PopupPopulator.MAX_SHORTCUTS;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
-import android.animation.ArgbEvaluator;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.content.Context;
 import android.content.res.Resources;
-import android.graphics.Outline;
 import android.graphics.Rect;
-import android.graphics.RectF;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
 import android.util.AttributeSet;
 import android.util.Pair;
@@ -41,32 +35,25 @@ import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewOutlineProvider;
-import android.view.ViewTreeObserver;
 import android.view.animation.Interpolator;
 import android.widget.FrameLayout;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.InsettableFrameLayout;
-import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.Workspace;
 import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.shortcuts.DeepShortcutView;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.BaseDragLayer;
-import com.android.launcher3.widget.LocalColorExtractor;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 
 /**
  * A container for shortcuts to deep links and notifications associated with an app.
@@ -89,9 +76,6 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
     private static final int CLOSE_CHILD_FADE_START_DELAY = 0;
     private static final int CLOSE_CHILD_FADE_DURATION = 140;
 
-    // +1 for system shortcut view
-    private static final int MAX_NUM_CHILDREN = MAX_SHORTCUTS + 1;
-
     private final Rect mTempRect = new Rect();
 
     protected final LayoutInflater mInflater;
@@ -120,13 +104,8 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
 
     private Runnable mOnCloseCallback = () -> { };
 
-    // The rect string of the view that the arrow is attached to, in screen reference frame.
-    private String mArrowColorRectString;
-    private int mArrowColor;
-    private final int[] mColors;
-    private final HashMap<String, View> mViewForRect = new HashMap<>();
-
-    @Nullable private LocalColorExtractor mColorExtractor;
+    private final float mElevation;
+    private final int mBackgroundColor;
 
     public ArrowPopup(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
@@ -134,13 +113,9 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
         mOutlineRadius = Themes.getDialogCornerRadius(context);
         mLauncher = BaseDraggingActivity.fromContext(context);
         mIsRtl = Utilities.isRtl(getResources());
-        setClipToOutline(true);
-        setOutlineProvider(new ViewOutlineProvider() {
-            @Override
-            public void getOutline(View view, Outline outline) {
-                outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(), mOutlineRadius);
-            }
-        });
+
+        mBackgroundColor = Themes.getAttrColor(context, R.attr.popupColorPrimary);
+        mElevation = getResources().getDimension(R.dimen.deep_shortcuts_elevation);
 
         // Initialize arrow view
         final Resources resources = getResources();
@@ -156,33 +131,14 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
 
         int smallerRadius = resources.getDimensionPixelSize(R.dimen.popup_smaller_radius);
         mRoundedTop = new GradientDrawable();
+        mRoundedTop.setColor(mBackgroundColor);
         mRoundedTop.setCornerRadii(new float[] { mOutlineRadius, mOutlineRadius, mOutlineRadius,
                 mOutlineRadius, smallerRadius, smallerRadius, smallerRadius, smallerRadius});
 
         mRoundedBottom = new GradientDrawable();
+        mRoundedBottom.setColor(mBackgroundColor);
         mRoundedBottom.setCornerRadii(new float[] { smallerRadius, smallerRadius, smallerRadius,
                 smallerRadius, mOutlineRadius, mOutlineRadius, mOutlineRadius, mOutlineRadius});
-
-        boolean isAboveAnotherSurface = getTopOpenViewWithType(mLauncher, TYPE_FOLDER) != null
-                || mLauncher.getStateManager().getState() == LauncherState.ALL_APPS;
-        if (isAboveAnotherSurface) {
-            mColors = new int[] { Themes.getAttrColor(context, R.attr.popupColorNeutral) };
-        } else {
-            int primaryColor = Themes.getAttrColor(context, R.attr.popupColorPrimary);
-            int secondaryColor = Themes.getAttrColor(context, R.attr.popupColorSecondary);
-            ArgbEvaluator argb = new ArgbEvaluator();
-            mColors = new int[MAX_NUM_CHILDREN];
-            // Interpolate between the two colors, exclusive.
-            float step = 1f / (MAX_NUM_CHILDREN + 1);
-            for (int i = 0; i < mColors.length; ++i) {
-                mColors[i] =
-                        (int) argb.evaluate((i + 1) * step, primaryColor, secondaryColor);
-            }
-
-            if (supportsColorExtraction()) {
-                setupColorExtraction();
-            }
-        }
     }
 
     public ArrowPopup(Context context, AttributeSet attrs) {
@@ -240,7 +196,6 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
 
         int numVisibleShortcut = 0;
         View lastView = null;
-        int numVisibleChild = 0;
         for (int i = 0; i < count; i++) {
             View view = getChildAt(i);
             boolean isShortcut = view instanceof DeepShortcutView;
@@ -267,35 +222,11 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
                         numVisibleShortcut++;
                     }
                 }
-
-                int color = mColors[numVisibleChild % mColors.length];
-                setChildColor(view, color);
-
-                // Arrow color matches the first child or the last child.
-                if (!mIsAboveIcon && numVisibleChild == 0) {
-                    mArrowColor = color;
-                } else if (mIsAboveIcon) {
-                    mArrowColor = color;
-                }
-
-                numVisibleChild++;
             }
         }
         measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
     }
 
-    /**
-     * Sets the background color of the child.
-     */
-    protected void setChildColor(View view, int color) {
-        Drawable bg = view.getBackground();
-        if (bg instanceof GradientDrawable) {
-            ((GradientDrawable) bg.mutate()).setColor(color);
-        } else if (bg instanceof ColorDrawable) {
-            ((ColorDrawable) bg.mutate()).setColor(color);
-        }
-    }
-
     /**
      * Shows the popup at the desired location, optionally reversing the children.
      * @param viewsToFlip number of views from the top to to flip in case of reverse order
@@ -366,23 +297,18 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
             // so we centered it instead. In that case we don't want to showDefaultOptions the arrow.
             mArrow.setVisibility(INVISIBLE);
         } else {
-            updateArrowColor();
-        }
-
-        mArrow.setPivotX(mArrowWidth / 2.0f);
-        mArrow.setPivotY(mIsAboveIcon ? mArrowHeight : 0);
-    }
-
-    private void updateArrowColor() {
-        if (!Gravity.isVertical(mGravity)) {
             mArrow.setBackground(new RoundedArrowDrawable(
                     mArrowWidth, mArrowHeight, mArrowPointRadius,
                     mOutlineRadius, getMeasuredWidth(), getMeasuredHeight(),
                     mArrowOffsetHorizontal, -mArrowOffsetVertical,
                     !mIsAboveIcon, mIsLeftAligned,
-                    mArrowColor));
-            mArrow.setElevation(getElevation());
+                    mBackgroundColor));
+            // TODO: Remove elevation when arrow is above as it casts a shadow on the container
+            mArrow.setElevation(mIsAboveIcon ? mElevation : 0);
         }
+
+        mArrow.setPivotX(mArrowWidth / 2.0f);
+        mArrow.setPivotY(mIsAboveIcon ? mArrowHeight : 0);
     }
 
     /**
@@ -434,7 +360,7 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
         }
         int childMargins = (numVisibleChildren - 1) * mMargin;
         int height = getMeasuredHeight() + extraVerticalSpace + childMargins;
-        int width = getMeasuredWidth();
+        int width = getMeasuredWidth() + getPaddingLeft() + getPaddingRight();
 
         getTargetObjectLocation(mTempRect);
         InsettableFrameLayout dragLayer = getPopupContainer();
@@ -667,19 +593,6 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
         getPopupContainer().removeView(this);
         getPopupContainer().removeView(mArrow);
         mOnCloseCallback.run();
-        mArrowColorRectString = null;
-        mViewForRect.clear();
-        if (mColorExtractor != null) {
-            mColorExtractor.removeLocations();
-            mColorExtractor.setListener(null);
-        }
-    }
-
-    /**
-     * Returns whether color extraction is supported.
-     */
-    public boolean supportsColorExtraction() {
-        return Utilities.ATLEAST_S;
     }
 
     /**
@@ -689,68 +602,6 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
         mOnCloseCallback = callback;
     }
 
-    private void setupColorExtraction() {
-        Workspace workspace = mLauncher.findViewById(R.id.workspace);
-        if (workspace == null) {
-            return;
-        }
-
-        mColorExtractor = LocalColorExtractor.newInstance(mLauncher);
-        mColorExtractor.setListener((rect, extractedColors) -> {
-            String rectString = rect.toShortString();
-            View v = mViewForRect.get(rectString);
-            if (v != null) {
-                int newColor = extractedColors.get(mColorExtractionIndex);
-                setChildColor(v, newColor);
-                if (rectString.equals(mArrowColorRectString)) {
-                    mArrowColor = newColor;
-                    updateArrowColor();
-                }
-            }
-        });
-
-        getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
-            @Override
-            public boolean onPreDraw() {
-                getViewTreeObserver().removeOnPreDrawListener(this);
-
-                ArrayList<RectF> locations = new ArrayList<>();
-                Rect r = new Rect();
-
-                int count = getChildCount();
-                int numVisibleChild = 0;
-                for (int i = 0; i < count; i++) {
-                    View view = getChildAt(i);
-                    if (view.getVisibility() == VISIBLE) {
-                        RectF rf = new RectF();
-                        mColorExtractor.getExtractedRectForView(Launcher.getLauncher(getContext()),
-                                workspace.getCurrentPage(), view, rf);
-                        if (rf.isEmpty()) {
-                            numVisibleChild++;
-                            continue;
-                        }
-
-                        locations.add(rf);
-                        String rectString = rf.toShortString();
-                        mViewForRect.put(rectString, view);
-
-                        // Arrow color matches the first child or the last child.
-                        if (!mIsAboveIcon && numVisibleChild == 0) {
-                            mArrowColorRectString = rectString;
-                        } else if (mIsAboveIcon) {
-                            mArrowColorRectString = rectString;
-                        }
-
-                        numVisibleChild++;
-                    }
-                }
-
-                mColorExtractor.addLocation(locations);
-                return false;
-            }
-        });
-    }
-
     protected BaseDragLayer getPopupContainer() {
         return mLauncher.getDragLayer();
     }
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index 1659e6d9cf..b115678562 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -172,14 +172,6 @@ public class PopupContainerWithArrow<T extends StatefulActivity<LauncherState>>
         return false;
     }
 
-    @Override
-    protected void setChildColor(View v, int color) {
-        super.setChildColor(v, color);
-        if (v.getId() == R.id.notification_container && mNotificationItemView != null) {
-            mNotificationItemView.updateBackgroundColor(color);
-        }
-    }
-
     /**
      * Returns true if we can show the container.
      */
-- 
GitLab


From e3af6c6513d3f4fb086d92d09e39535c08637f22 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Wed, 28 Apr 2021 12:11:11 -0700
Subject: [PATCH 1145/1664] Update gesture navigation tutorial.

- Updated gesture navigation feedback videos.
- Added feedback motion loop videos.
- Updated strings.
- Added alternate strings for when the user launches tutorial steps from the Tips app.

Test: manual
bug: 169687177
Change-Id: I87d475e1510a25ffefea14dbd0b224a063e7cad8
---
 .../drawable/gesture_tutorial_back_left.xml   |  559 ------
 .../drawable/gesture_tutorial_back_right.xml  |  561 ------
 .../res/drawable/gesture_tutorial_home.xml    |  394 ----
 .../gesture_tutorial_loop_back_left.xml       |   96 +
 .../gesture_tutorial_loop_back_right.xml      |   96 +
 .../gesture_tutorial_loop_bottom_edge.xml     |   38 +
 ...sture_tutorial_loop_gesture_back_right.xml |   57 +
 .../gesture_tutorial_loop_gesture_home.xml    |   57 +
 ...esture_tutorial_loop_gesture_left_edge.xml |   57 +
 ...gesture_tutorial_loop_gesture_overview.xml |   57 +
 .../drawable/gesture_tutorial_loop_home.xml   |    1 +
 .../gesture_tutorial_loop_left_edge.xml       |   38 +
 .../gesture_tutorial_loop_overview.xml        |    1 +
 .../gesture_tutorial_loop_right_edge.xml      |   38 +
 .../gesture_tutorial_motion_back_left.xml     | 1412 ++++++++++++++
 .../gesture_tutorial_motion_back_right.xml    | 1413 ++++++++++++++
 .../drawable/gesture_tutorial_motion_home.xml | 1254 +++++++++++++
 .../gesture_tutorial_motion_overview.xml      | 1623 +++++++++++++++++
 .../drawable/gesture_tutorial_overview.xml    |  823 ---------
 quickstep/res/drawable/mock_conversation.xml  |  212 +++
 .../res/drawable/mock_conversations_list.xml  |  361 ++++
 quickstep/res/drawable/mock_webpage.xml       |  251 +++
 .../drawable/sandbox_fake_google_search.xml   |   79 -
 .../res/layout/gesture_tutorial_fragment.xml  |   11 +
 quickstep/res/values/strings.xml              |   26 +-
 .../BackGestureTutorialController.java        |   22 +-
 .../BackGestureTutorialFragment.java          |   12 +-
 .../HomeGestureTutorialController.java        |   12 +-
 .../HomeGestureTutorialFragment.java          |    8 +-
 .../OverviewGestureTutorialController.java    |   11 +-
 .../OverviewGestureTutorialFragment.java      |    8 +-
 .../interaction/TutorialController.java       |   17 +-
 .../interaction/TutorialFragment.java         |   45 +-
 .../settings/DeveloperOptionsFragment.java    |    2 +-
 34 files changed, 7210 insertions(+), 2442 deletions(-)
 delete mode 100644 quickstep/res/drawable/gesture_tutorial_back_left.xml
 delete mode 100644 quickstep/res/drawable/gesture_tutorial_back_right.xml
 delete mode 100644 quickstep/res/drawable/gesture_tutorial_home.xml
 create mode 100644 quickstep/res/drawable/gesture_tutorial_loop_back_left.xml
 create mode 100644 quickstep/res/drawable/gesture_tutorial_loop_back_right.xml
 create mode 100644 quickstep/res/drawable/gesture_tutorial_loop_bottom_edge.xml
 create mode 100644 quickstep/res/drawable/gesture_tutorial_loop_gesture_back_right.xml
 create mode 100644 quickstep/res/drawable/gesture_tutorial_loop_gesture_home.xml
 create mode 100644 quickstep/res/drawable/gesture_tutorial_loop_gesture_left_edge.xml
 create mode 100644 quickstep/res/drawable/gesture_tutorial_loop_gesture_overview.xml
 create mode 100644 quickstep/res/drawable/gesture_tutorial_loop_home.xml
 create mode 100644 quickstep/res/drawable/gesture_tutorial_loop_left_edge.xml
 create mode 100644 quickstep/res/drawable/gesture_tutorial_loop_overview.xml
 create mode 100644 quickstep/res/drawable/gesture_tutorial_loop_right_edge.xml
 create mode 100644 quickstep/res/drawable/gesture_tutorial_motion_back_left.xml
 create mode 100644 quickstep/res/drawable/gesture_tutorial_motion_back_right.xml
 create mode 100644 quickstep/res/drawable/gesture_tutorial_motion_home.xml
 create mode 100644 quickstep/res/drawable/gesture_tutorial_motion_overview.xml
 delete mode 100644 quickstep/res/drawable/gesture_tutorial_overview.xml
 create mode 100644 quickstep/res/drawable/mock_conversation.xml
 create mode 100644 quickstep/res/drawable/mock_conversations_list.xml
 create mode 100644 quickstep/res/drawable/mock_webpage.xml
 delete mode 100644 quickstep/res/drawable/sandbox_fake_google_search.xml

diff --git a/quickstep/res/drawable/gesture_tutorial_back_left.xml b/quickstep/res/drawable/gesture_tutorial_back_left.xml
deleted file mode 100644
index 92ae2025fb..0000000000
--- a/quickstep/res/drawable/gesture_tutorial_back_left.xml
+++ /dev/null
@@ -1,559 +0,0 @@
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt">
-    <aapt:attr name="android:drawable">
-        <vector android:height="892dp" android:width="412dp" android:viewportHeight="892" android:viewportWidth="412">
-            <group android:name="_R_G">
-                <group android:name="_R_G_L_7_G" android:translateX="206" android:translateY="446">
-                    <path android:name="_R_G_L_7_G_D_0_P_0" android:fillColor="#f1f3f4" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c "/>
-                </group>
-                <group android:name="_R_G_L_6_G" android:pivotX="206" android:pivotY="446" android:scaleX="1" android:scaleY="1">
-                    <group android:name="_R_G_L_6_G_L_3_G" android:translateX="206" android:translateY="446" android:scaleX="1.2" android:scaleY="1.2">
-                        <path android:name="_R_G_L_6_G_L_3_G_D_0_P_0" android:fillColor="#f1f3f4" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c "/>
-                    </group>
-                    <group android:name="_R_G_L_6_G_L_2_G">
-                        <group android:name="_R_G_L_6_G_L_2_G_L_11_G" android:translateX="206" android:translateY="496.5">
-                            <path android:name="_R_G_L_6_G_L_2_G_L_11_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M235.5 -452.14 C235.5,-452.14 235.5,452.14 235.5,452.14 C235.5,452.14 -235.5,452.14 -235.5,452.14 C-235.5,452.14 -235.5,-452.14 -235.5,-452.14 C-235.5,-452.14 235.5,-452.14 235.5,-452.14c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_2_G_L_10_G" android:translateX="182.5" android:translateY="831">
-                            <path android:name="_R_G_L_6_G_L_2_G_L_10_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M158.5 -7 C158.5,-7 158.5,7 158.5,7 C158.5,9.21 156.71,11 154.5,11 C154.5,11 -154.5,11 -154.5,11 C-156.71,11 -158.5,9.21 -158.5,7 C-158.5,7 -158.5,-7 -158.5,-7 C-158.5,-9.21 -156.71,-11 -154.5,-11 C-154.5,-11 154.5,-11 154.5,-11 C156.71,-11 158.5,-9.21 158.5,-7c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_2_G_L_9_G" android:translateX="186" android:translateY="801">
-                            <path android:name="_R_G_L_6_G_L_2_G_L_9_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M162 -7 C162,-7 162,7 162,7 C162,9.21 160.21,11 158,11 C158,11 -158,11 -158,11 C-160.21,11 -162,9.21 -162,7 C-162,7 -162,-7 -162,-7 C-162,-9.21 -160.21,-11 -158,-11 C-158,-11 158,-11 158,-11 C160.21,-11 162,-9.21 162,-7c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_2_G_L_8_G" android:translateX="119" android:translateY="755">
-                            <path android:name="_R_G_L_6_G_L_2_G_L_8_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M95 -7 C95,-7 95,7 95,7 C95,9.21 93.21,11 91,11 C91,11 -91,11 -91,11 C-93.21,11 -95,9.21 -95,7 C-95,7 -95,-7 -95,-7 C-95,-9.21 -93.21,-11 -91,-11 C-91,-11 91,-11 91,-11 C93.21,-11 95,-9.21 95,-7c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_2_G_L_7_G" android:translateX="182.5" android:translateY="725">
-                            <path android:name="_R_G_L_6_G_L_2_G_L_7_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M158.5 -7 C158.5,-7 158.5,7 158.5,7 C158.5,9.21 156.71,11 154.5,11 C154.5,11 -154.5,11 -154.5,11 C-156.71,11 -158.5,9.21 -158.5,7 C-158.5,7 -158.5,-7 -158.5,-7 C-158.5,-9.21 -156.71,-11 -154.5,-11 C-154.5,-11 154.5,-11 154.5,-11 C156.71,-11 158.5,-9.21 158.5,-7c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_2_G_L_6_G" android:translateX="197.5" android:translateY="695">
-                            <path android:name="_R_G_L_6_G_L_2_G_L_6_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M173.5 -7 C173.5,-7 173.5,7 173.5,7 C173.5,9.21 171.71,11 169.5,11 C169.5,11 -169.5,11 -169.5,11 C-171.71,11 -173.5,9.21 -173.5,7 C-173.5,7 -173.5,-7 -173.5,-7 C-173.5,-9.21 -171.71,-11 -169.5,-11 C-169.5,-11 169.5,-11 169.5,-11 C171.71,-11 173.5,-9.21 173.5,-7c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_2_G_L_5_G" android:translateX="192" android:translateY="665">
-                            <path android:name="_R_G_L_6_G_L_2_G_L_5_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M168 -7 C168,-7 168,7 168,7 C168,9.21 166.21,11 164,11 C164,11 -164,11 -164,11 C-166.21,11 -168,9.21 -168,7 C-168,7 -168,-7 -168,-7 C-168,-9.21 -166.21,-11 -164,-11 C-164,-11 164,-11 164,-11 C166.21,-11 168,-9.21 168,-7c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_2_G_L_4_G" android:translateX="105.5" android:translateY="360">
-                            <path android:name="_R_G_L_6_G_L_2_G_L_4_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M23.5 -2 C23.5,-2 23.5,2 23.5,2 C23.5,4.21 21.71,6 19.5,6 C19.5,6 -19.5,6 -19.5,6 C-21.71,6 -23.5,4.21 -23.5,2 C-23.5,2 -23.5,-2 -23.5,-2 C-23.5,-4.21 -21.71,-6 -19.5,-6 C-19.5,-6 19.5,-6 19.5,-6 C21.71,-6 23.5,-4.21 23.5,-2c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_2_G_L_3_G" android:translateX="47.5" android:translateY="360">
-                            <path android:name="_R_G_L_6_G_L_2_G_L_3_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M23.5 -2 C23.5,-2 23.5,2 23.5,2 C23.5,4.21 21.71,6 19.5,6 C19.5,6 -19.5,6 -19.5,6 C-21.71,6 -23.5,4.21 -23.5,2 C-23.5,2 -23.5,-2 -23.5,-2 C-23.5,-4.21 -21.71,-6 -19.5,-6 C-19.5,-6 19.5,-6 19.5,-6 C21.71,-6 23.5,-4.21 23.5,-2c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_2_G_L_2_G" android:translateX="142.5" android:translateY="328">
-                            <path android:name="_R_G_L_6_G_L_2_G_L_2_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M118.5 -14 C118.5,-14 118.5,14 118.5,14 C118.5,16.21 116.71,18 114.5,18 C114.5,18 -114.5,18 -114.5,18 C-116.71,18 -118.5,16.21 -118.5,14 C-118.5,14 -118.5,-14 -118.5,-14 C-118.5,-16.21 -116.71,-18 -114.5,-18 C-114.5,-18 114.5,-18 114.5,-18 C116.71,-18 118.5,-16.21 118.5,-14c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_2_G_L_1_G" android:translateX="186" android:translateY="284">
-                            <path android:name="_R_G_L_6_G_L_2_G_L_1_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M162 -14 C162,-14 162,14 162,14 C162,16.21 160.21,18 158,18 C158,18 -158,18 -158,18 C-160.21,18 -162,16.21 -162,14 C-162,14 -162,-14 -162,-14 C-162,-16.21 -160.21,-18 -158,-18 C-158,-18 158,-18 158,-18 C160.21,-18 162,-16.21 162,-14c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_2_G_L_0_G" android:translateX="155" android:translateY="240">
-                            <path android:name="_R_G_L_6_G_L_2_G_L_0_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M131 -14 C131,-14 131,14 131,14 C131,16.21 129.21,18 127,18 C127,18 -127,18 -127,18 C-129.21,18 -131,16.21 -131,14 C-131,14 -131,-14 -131,-14 C-131,-16.21 -129.21,-18 -127,-18 C-127,-18 127,-18 127,-18 C129.21,-18 131,-16.21 131,-14c "/>
-                        </group>
-                    </group>
-                    <group android:name="_R_G_L_6_G_L_1_G" android:translateX="24" android:translateY="390">
-                        <group android:name="_R_G_L_6_G_L_1_G_L_7_G" android:translateX="182" android:translateY="120"/>
-                        <group android:name="_R_G_L_6_G_L_1_G_L_6_G" android:translateX="182" android:translateY="120">
-                            <path android:name="_R_G_L_6_G_L_1_G_L_6_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M182 -116 C182,-116 182,116 182,116 C182,118.21 180.21,120 178,120 C178,120 -178,120 -178,120 C-180.21,120 -182,118.21 -182,116 C-182,116 -182,-116 -182,-116 C-182,-118.21 -180.21,-120 -178,-120 C-178,-120 178,-120 178,-120 C180.21,-120 182,-118.21 182,-116c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_1_G_L_5_G" android:translateX="77.322" android:translateY="150.552">
-                            <path android:name="_R_G_L_6_G_L_1_G_L_5_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 20.61 C0,20.61 -10.39,8.69 -10.39,8.69  M0 -6.11 C0,-6.11 -6.78,-15.61 -6.78,-15.61  M0 33.64 C0,33.64 8.26,17.67 8.26,17.67  M0 7.58 C0,7.58 8.26,-7.73 8.26,-7.73  M0 71.19 C0,71.19 0,-18.04 0,-18.04  M-30.22 37.18 C-30.22,37.18 0,-71.19 0,-71.19 C0,-71.19 30.22,37.18 30.22,37.18 C30.22,37.18 -30.22,37.18 -30.22,37.18c "/>
-                            <path android:name="_R_G_L_6_G_L_1_G_L_5_G_D_1_P_0" android:strokeColor="#9adcb2" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M0 20.61 C0,20.61 -10.39,8.69 -10.39,8.69  M0 -6.11 C0,-6.11 -6.78,-15.61 -6.78,-15.61  M0 33.64 C0,33.64 8.26,17.67 8.26,17.67  M0 7.58 C0,7.58 8.26,-7.73 8.26,-7.73  M0 71.19 C0,71.19 0,-18.04 0,-18.04  M-30.22 37.18 C-30.22,37.18 0,-71.19 0,-71.19 C0,-71.19 30.22,37.18 30.22,37.18 C30.22,37.18 -30.22,37.18 -30.22,37.18c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_1_G_L_4_G" android:translateX="38.772" android:translateY="121.73">
-                            <path android:name="_R_G_L_6_G_L_1_G_L_4_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 28.82 C0,28.82 -14.52,12.18 -14.52,12.18  M0 -8.58 C0,-8.58 -9.51,-21.75 -9.51,-21.75  M0 47.01 C0,47.01 11.57,24.7 11.57,24.7  M0 10.64 C0,10.64 11.57,-10.78 11.57,-10.78  M0 99.42 C0,99.42 0,-25.21 0,-25.21  M-31.92 51.94 C-31.92,51.94 0,-99.42 0,-99.42 C0,-99.42 31.92,51.94 31.92,51.94 C31.92,51.94 -31.92,51.94 -31.92,51.94c "/>
-                            <path android:name="_R_G_L_6_G_L_1_G_L_4_G_D_1_P_0" android:strokeColor="#9adcb2" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M0 28.82 C0,28.82 -14.52,12.18 -14.52,12.18  M0 -8.58 C0,-8.58 -9.51,-21.75 -9.51,-21.75  M0 47.01 C0,47.01 11.57,24.7 11.57,24.7  M0 10.64 C0,10.64 11.57,-10.78 11.57,-10.78  M0 99.42 C0,99.42 0,-25.21 0,-25.21  M-31.92 51.94 C-31.92,51.94 0,-99.42 0,-99.42 C0,-99.42 31.92,51.94 31.92,51.94 C31.92,51.94 -31.92,51.94 -31.92,51.94c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_1_G_L_3_G" android:translateX="183" android:translateY="222">
-                            <path android:name="_R_G_L_6_G_L_1_G_L_3_G_D_0_P_0" android:fillColor="#000000" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M170 0 C170,0 -170,0 -170,0 "/>
-                            <path android:name="_R_G_L_6_G_L_1_G_L_3_G_D_1_P_0" android:strokeColor="#9aa0a6" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="4" android:strokeAlpha="1" android:pathData=" M170 0 C170,0 -170,0 -170,0 "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_1_G_L_2_G" android:translateX="265.619" android:translateY="162.331">
-                            <path android:name="_R_G_L_6_G_L_1_G_L_2_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M-34.05 50.06 C-34.05,50.06 -34.05,-49.25 -34.05,-49.25  M-34.05 -49.55 C-34.05,-49.55 17.54,50.06 17.54,50.06 C17.54,50.06 84.62,50.06 84.62,50.06 C84.62,50.06 32.65,-50.06 32.65,-50.06 C32.65,-50.06 -34.05,-50.06 -34.05,-50.06 C-34.05,-50.06 -84.62,50.06 -84.62,50.06 C-84.62,50.06 17.54,50.06 17.54,50.06 "/>
-                            <path android:name="_R_G_L_6_G_L_1_G_L_2_G_D_1_P_0" android:strokeColor="#a8cbfe" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M-34.05 50.06 C-34.05,50.06 -34.05,-49.25 -34.05,-49.25  M-34.05 -49.55 C-34.05,-49.55 17.54,50.06 17.54,50.06 C17.54,50.06 84.62,50.06 84.62,50.06 C84.62,50.06 32.65,-50.06 32.65,-50.06 C32.65,-50.06 -34.05,-50.06 -34.05,-50.06 C-34.05,-50.06 -84.62,50.06 -84.62,50.06 C-84.62,50.06 17.54,50.06 17.54,50.06 "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_1_G_L_1_G" android:translateX="319.271" android:translateY="37.945">
-                            <path android:name="_R_G_L_6_G_L_1_G_L_1_G_D_0_P_0" android:fillColor="#feefc3" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M13.42 2.99 C14.95,-4.17 9.93,-11.31 2.21,-12.96 C-0.9,-13.62 -3.97,-13.3 -6.64,-12.2 C-6.58,-12.19 -6.53,-12.18 -6.48,-12.17 C-1.03,-11.01 2.52,-5.97 1.44,-0.92 C0.36,4.13 -4.94,7.28 -10.4,6.12 C-11.6,5.86 -12.7,5.42 -13.69,4.83 C-11.9,8.78 -8.15,11.93 -3.34,12.96 C4.38,14.61 11.88,10.14 13.42,2.99c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_1_G_L_0_G" android:translateX="179.5" android:translateY="73.351">
-                            <path android:name="_R_G_L_6_G_L_1_G_L_0_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M51.08 -40.95 C51.08,-40.95 50.55,-42.54 50.55,-42.54 C50.55,-42.54 49.67,-41.13 49.67,-41.13 C49.67,-41.13 48.17,-41.21 48.17,-41.21 C48.17,-41.21 49.05,-39.8 49.05,-39.8 C49.05,-39.8 48.61,-38.22 48.61,-38.22 C48.61,-38.22 50.02,-38.74 50.02,-38.74 C50.02,-38.74 51.35,-37.69 51.35,-37.69 C51.35,-37.69 51.26,-39.45 51.26,-39.45 C51.26,-39.45 52.59,-40.42 52.59,-40.42 C52.59,-40.42 51.08,-40.95 51.08,-40.95c  M8.78 30.58 C8.78,30.58 8.25,28.99 8.25,28.99 C8.25,28.99 7.37,30.4 7.37,30.4 C7.37,30.4 5.87,30.31 5.87,30.31 C5.87,30.31 6.75,31.72 6.75,31.72 C6.75,31.72 6.31,33.31 6.31,33.31 C6.31,33.31 7.72,32.78 7.72,32.78 C7.72,32.78 9.05,33.84 9.05,33.84 C9.05,33.84 8.96,32.08 8.96,32.08 C8.96,32.08 10.29,31.11 10.29,31.11 C10.29,31.11 8.78,30.58 8.78,30.58c  M19.38 -61.67 C19.38,-61.67 18.94,-63.35 18.94,-63.35 C18.94,-63.35 17.97,-61.94 17.97,-61.94 C17.97,-61.94 16.47,-61.94 16.47,-61.94 C16.47,-61.94 17.35,-60.62 17.35,-60.62 C17.35,-60.62 16.91,-58.94 16.91,-58.94 C16.91,-58.94 18.41,-59.56 18.41,-59.56 C18.41,-59.56 19.65,-58.5 19.65,-58.5 C19.65,-58.5 19.56,-60.18 19.56,-60.18 C19.56,-60.18 20.88,-61.23 20.88,-61.23 C20.88,-61.23 19.38,-61.67 19.38,-61.67c  M-32.98 35.08 C-32.98,35.08 -33.51,33.4 -33.51,33.4 C-33.51,33.4 -34.4,34.81 -34.4,34.81 C-34.4,34.81 -35.9,34.81 -35.9,34.81 C-35.9,34.81 -35.01,36.22 -35.01,36.22 C-35.01,36.22 -35.45,37.81 -35.45,37.81 C-35.45,37.81 -34.04,37.28 -34.04,37.28 C-34.04,37.28 -32.72,38.25 -32.72,38.25 C-32.72,38.25 -32.81,36.58 -32.81,36.58 C-32.81,36.58 -31.48,35.6 -31.48,35.6 C-31.48,35.6 -32.98,35.08 -32.98,35.08c  M45.34 7.56 C45.34,7.56 44.81,5.97 44.81,5.97 C44.81,5.97 43.93,7.38 43.93,7.38 C43.93,7.38 42.34,7.3 42.34,7.3 C42.34,7.3 43.31,8.71 43.31,8.71 C43.31,8.71 42.87,10.29 42.87,10.29 C42.87,10.29 44.28,9.77 44.28,9.77 C44.28,9.77 45.52,10.82 45.52,10.82 C45.52,10.82 45.52,9.06 45.52,9.06 C45.52,9.06 46.76,8.09 46.76,8.09 C46.76,8.09 45.34,7.56 45.34,7.56c  M-9.59 -41.67 C-9.59,-41.67 -10.12,-43.35 -10.12,-43.35 C-10.12,-43.35 -11,-41.94 -11,-41.94 C-11,-41.94 -12.5,-41.94 -12.5,-41.94 C-12.5,-41.94 -11.62,-40.62 -11.62,-40.62 C-11.62,-40.62 -12.06,-38.94 -12.06,-38.94 C-12.06,-38.94 -10.65,-39.56 -10.65,-39.56 C-10.65,-39.56 -9.32,-38.5 -9.32,-38.5 C-9.32,-38.5 -9.41,-40.26 -9.41,-40.26 C-9.41,-40.26 -8.09,-41.23 -8.09,-41.23 C-8.09,-41.23 -9.59,-41.67 -9.59,-41.67c  M97.74 -23.97 C97.74,-23.97 97.03,-26.35 97.03,-26.35 C97.03,-26.35 95.8,-24.32 95.8,-24.32 C95.8,-24.32 93.5,-24.32 93.5,-24.32 C93.5,-24.32 94.91,-22.38 94.91,-22.38 C94.91,-22.38 94.21,-20 94.21,-20 C94.21,-20 96.33,-20.88 96.33,-20.88 C96.33,-20.88 98.09,-19.38 98.09,-19.38 C98.09,-19.38 98.09,-21.85 98.09,-21.85 C98.09,-21.85 99.86,-23.26 99.86,-23.26 C99.86,-23.26 97.74,-23.97 97.74,-23.97c  M167.29 43.28 C167.29,43.28 166.67,40.9 166.67,40.9 C166.67,40.9 165.35,42.93 165.35,42.93 C165.35,42.93 163.14,42.93 163.14,42.93 C163.14,42.93 164.47,44.87 164.47,44.87 C164.47,44.87 163.76,47.25 163.76,47.25 C163.76,47.25 165.88,46.37 165.88,46.37 C165.88,46.37 167.73,47.87 167.73,47.87 C167.73,47.87 167.65,45.4 167.65,45.4 C167.65,45.4 169.5,43.98 169.5,43.98 C169.5,43.98 167.29,43.28 167.29,43.28c  M-1.1 -1.79 C-1.1,-1.79 -1.72,-4.08 -1.72,-4.08 C-1.72,-4.08 -3.05,-2.14 -3.05,-2.14 C-3.05,-2.14 -5.25,-2.14 -5.25,-2.14 C-5.25,-2.14 -3.93,-0.11 -3.93,-0.11 C-3.93,-0.11 -4.64,2.18 -4.64,2.18 C-4.64,2.18 -2.52,1.38 -2.52,1.38 C-2.52,1.38 -0.66,2.8 -0.66,2.8 C-0.66,2.8 -0.75,0.41 -0.75,0.41 C-0.75,0.41 1.1,-1.08 1.1,-1.08 C1.1,-1.08 -1.1,-1.79 -1.1,-1.79c  M-60.89 -5.23 C-60.89,-5.23 -61.59,-7.61 -61.59,-7.61 C-61.59,-7.61 -62.83,-5.58 -62.83,-5.58 C-62.83,-5.58 -65.13,-5.58 -65.13,-5.58 C-65.13,-5.58 -63.71,-3.64 -63.71,-3.64 C-63.71,-3.64 -64.42,-1.26 -64.42,-1.26 C-64.42,-1.26 -62.39,-2.14 -62.39,-2.14 C-62.39,-2.14 -60.53,-0.64 -60.53,-0.64 C-60.53,-0.64 -60.62,-3.11 -60.62,-3.11 C-60.62,-3.11 -58.77,-4.52 -58.77,-4.52 C-58.77,-4.52 -60.89,-5.23 -60.89,-5.23c  M-165.26 -10.97 C-165.26,-10.97 -165.97,-13.35 -165.97,-13.35 C-165.97,-13.35 -167.29,-11.32 -167.29,-11.32 C-167.29,-11.32 -169.5,-11.32 -169.5,-11.32 C-169.5,-11.32 -168.18,-9.38 -168.18,-9.38 C-168.18,-9.38 -168.88,-7 -168.88,-7 C-168.88,-7 -166.76,-7.79 -166.76,-7.79 C-166.76,-7.79 -164.91,-6.38 -164.91,-6.38 C-164.91,-6.38 -165,-8.85 -165,-8.85 C-165,-8.85 -163.14,-10.26 -163.14,-10.26 C-163.14,-10.26 -165.26,-10.97 -165.26,-10.97c  M-51.26 -42.98 C-51.26,-42.98 -54.09,-45.01 -54.09,-45.01 C-54.09,-45.01 -53.91,-41.57 -53.91,-41.57 C-53.91,-41.57 -56.65,-39.54 -56.65,-39.54 C-56.65,-39.54 -53.38,-38.57 -53.38,-38.57 C-53.38,-38.57 -52.32,-35.3 -52.32,-35.3 C-52.32,-35.3 -50.38,-38.13 -50.38,-38.13 C-50.38,-38.13 -46.94,-38.22 -46.94,-38.22 C-46.94,-38.22 -49.05,-40.86 -49.05,-40.86 C-49.05,-40.86 -47.99,-44.21 -47.99,-44.21 C-47.99,-44.21 -51.26,-42.98 -51.26,-42.98c  M-92.06 -47.92 C-92.06,-47.92 -92.59,-49.59 -92.59,-49.59 C-92.59,-49.59 -93.47,-48.18 -93.47,-48.18 C-93.47,-48.18 -95.06,-48.18 -95.06,-48.18 C-95.06,-48.18 -94.09,-46.86 -94.09,-46.86 C-94.09,-46.86 -94.53,-45.18 -94.53,-45.18 C-94.53,-45.18 -93.12,-45.8 -93.12,-45.8 C-93.12,-45.8 -91.88,-44.74 -91.88,-44.74 C-91.88,-44.74 -91.88,-46.42 -91.88,-46.42 C-91.88,-46.42 -90.65,-47.47 -90.65,-47.47 C-90.65,-47.47 -92.06,-47.92 -92.06,-47.92c  M62.83 -13.34 C62.83,-13.34 62.39,-14.93 62.39,-14.93 C62.39,-14.93 61.5,-13.52 61.5,-13.52 C61.5,-13.52 59.91,-13.52 59.91,-13.52 C59.91,-13.52 60.89,-12.2 60.89,-12.2 C60.89,-12.2 60.36,-10.52 60.36,-10.52 C60.36,-10.52 61.86,-11.14 61.86,-11.14 C61.86,-11.14 63.09,-10.08 63.09,-10.08 C63.09,-10.08 63.09,-11.84 63.09,-11.84 C63.09,-11.84 64.33,-12.81 64.33,-12.81 C64.33,-12.81 62.83,-13.34 62.83,-13.34c  M-155.99 -40.95 C-155.99,-40.95 -156.43,-42.54 -156.43,-42.54 C-156.43,-42.54 -157.32,-41.13 -157.32,-41.13 C-157.32,-41.13 -158.91,-41.21 -158.91,-41.21 C-158.91,-41.21 -157.93,-39.8 -157.93,-39.8 C-157.93,-39.8 -158.46,-38.22 -158.46,-38.22 C-158.46,-38.22 -156.96,-38.74 -156.96,-38.74 C-156.96,-38.74 -155.73,-37.69 -155.73,-37.69 C-155.73,-37.69 -155.73,-39.45 -155.73,-39.45 C-155.73,-39.45 -154.49,-40.42 -154.49,-40.42 C-154.49,-40.42 -155.99,-40.95 -155.99,-40.95c  M141.24 26.52 C141.24,26.52 140.71,24.85 140.71,24.85 C140.71,24.85 139.83,26.26 139.83,26.26 C139.83,26.26 138.33,26.26 138.33,26.26 C138.33,26.26 139.21,27.67 139.21,27.67 C139.21,27.67 138.77,29.26 138.77,29.26 C138.77,29.26 140.18,28.73 140.18,28.73 C140.18,28.73 141.51,29.7 141.51,29.7 C141.51,29.7 141.42,28.02 141.42,28.02 C141.42,28.02 142.74,27.05 142.74,27.05 C142.74,27.05 141.24,26.52 141.24,26.52c  M111.4 -51.27 C111.4,-51.27 110.95,-52.94 110.95,-52.94 C110.95,-52.94 110.07,-51.53 110.07,-51.53 C110.07,-51.53 108.48,-51.53 108.48,-51.53 C108.48,-51.53 109.45,-50.21 109.45,-50.21 C109.45,-50.21 108.92,-48.53 108.92,-48.53 C108.92,-48.53 110.42,-49.15 110.42,-49.15 C110.42,-49.15 111.66,-48.09 111.66,-48.09 C111.66,-48.09 111.66,-49.86 111.66,-49.86 C111.66,-49.86 112.9,-50.83 112.9,-50.83 C112.9,-50.83 111.4,-51.27 111.4,-51.27c  M-66.59 53.33 C-66.59,53.33 -67.03,51.65 -67.03,51.65 C-67.03,51.65 -67.91,53.06 -67.91,53.06 C-67.91,53.06 -69.5,53.06 -69.5,53.06 C-69.5,53.06 -68.53,54.47 -68.53,54.47 C-68.53,54.47 -69.06,56.06 -69.06,56.06 C-69.06,56.06 -67.56,55.53 -67.56,55.53 C-67.56,55.53 -66.32,56.5 -66.32,56.5 C-66.32,56.5 -66.32,54.82 -66.32,54.82 C-66.32,54.82 -65.08,53.77 -65.08,53.77 C-65.08,53.77 -66.59,53.33 -66.59,53.33c  M-50.59 59.33 C-50.59,59.33 -51.12,57.65 -51.12,57.65 C-51.12,57.65 -52,59.06 -52,59.06 C-52,59.06 -53.5,59.06 -53.5,59.06 C-53.5,59.06 -52.62,60.38 -52.62,60.38 C-52.62,60.38 -53.06,62.06 -53.06,62.06 C-53.06,62.06 -51.65,61.53 -51.65,61.53 C-51.65,61.53 -50.32,62.5 -50.32,62.5 C-50.32,62.5 -50.41,60.82 -50.41,60.82 C-50.41,60.82 -49.08,59.77 -49.08,59.77 C-49.08,59.77 -50.59,59.33 -50.59,59.33c  M29.98 -16.08 C29.98,-16.08 29.27,-18.46 29.27,-18.46 C29.27,-18.46 27.95,-16.43 27.95,-16.43 C27.95,-16.43 25.74,-16.43 25.74,-16.43 C25.74,-16.43 27.06,-14.49 27.06,-14.49 C27.06,-14.49 26.36,-12.11 26.36,-12.11 C26.36,-12.11 28.48,-12.9 28.48,-12.9 C28.48,-12.9 30.33,-11.49 30.33,-11.49 C30.33,-11.49 30.24,-13.96 30.24,-13.96 C30.24,-13.96 32.1,-15.37 32.1,-15.37 C32.1,-15.37 29.98,-16.08 29.98,-16.08c  M81.28 55.98 C81.28,55.98 80.58,53.6 80.58,53.6 C80.58,53.6 79.25,55.63 79.25,55.63 C79.25,55.63 77.04,55.63 77.04,55.63 C77.04,55.63 78.37,57.57 78.37,57.57 C78.37,57.57 77.66,59.95 77.66,59.95 C77.66,59.95 79.78,59.07 79.78,59.07 C79.78,59.07 81.64,60.56 81.64,60.56 C81.64,60.56 81.55,58.1 81.55,58.1 C81.55,58.1 83.4,56.68 83.4,56.68 C83.4,56.68 81.28,55.98 81.28,55.98c  M-165.26 -10.97 C-165.26,-10.97 -165.97,-13.35 -165.97,-13.35 C-165.97,-13.35 -167.29,-11.32 -167.29,-11.32 C-167.29,-11.32 -169.5,-11.32 -169.5,-11.32 C-169.5,-11.32 -168.18,-9.38 -168.18,-9.38 C-168.18,-9.38 -168.88,-7 -168.88,-7 C-168.88,-7 -166.76,-7.79 -166.76,-7.79 C-166.76,-7.79 -164.91,-6.38 -164.91,-6.38 C-164.91,-6.38 -165,-8.85 -165,-8.85 C-165,-8.85 -163.14,-10.26 -163.14,-10.26 C-163.14,-10.26 -165.26,-10.97 -165.26,-10.97c  M-74.05 21.76 C-74.05,21.76 -74.66,19.47 -74.66,19.47 C-74.66,19.47 -75.99,21.49 -75.99,21.49 C-75.99,21.49 -78.2,21.41 -78.2,21.41 C-78.2,21.41 -76.87,23.43 -76.87,23.43 C-76.87,23.43 -77.58,25.73 -77.58,25.73 C-77.58,25.73 -75.46,24.93 -75.46,24.93 C-75.46,24.93 -73.6,26.43 -73.6,26.43 C-73.6,26.43 -73.69,23.96 -73.69,23.96 C-73.69,23.96 -71.84,22.46 -71.84,22.46 C-71.84,22.46 -74.05,21.76 -74.05,21.76c  M8.98 55.68 C8.98,55.68 6.15,53.65 6.15,53.65 C6.15,53.65 6.24,57.09 6.24,57.09 C6.24,57.09 3.5,59.12 3.5,59.12 C3.5,59.12 6.86,60.09 6.86,60.09 C6.86,60.09 7.92,63.35 7.92,63.35 C7.92,63.35 9.86,60.44 9.86,60.44 C9.86,60.44 13.3,60.44 13.3,60.44 C13.3,60.44 11.18,57.71 11.18,57.71 C11.18,57.71 12.15,54.44 12.15,54.44 C12.15,54.44 8.98,55.68 8.98,55.68c  M124.89 -2.41 C124.89,-2.41 122.06,-4.35 122.06,-4.35 C122.06,-4.35 122.24,-0.91 122.24,-0.91 C122.24,-0.91 119.5,1.12 119.5,1.12 C119.5,1.12 122.77,2 122.77,2 C122.77,2 123.83,5.26 123.83,5.26 C123.83,5.26 125.77,2.44 125.77,2.44 C125.77,2.44 129.21,2.44 129.21,2.44 C129.21,2.44 127.09,-0.29 127.09,-0.29 C127.09,-0.29 128.15,-3.56 128.15,-3.56 C128.15,-3.56 124.89,-2.41 124.89,-2.41c  M77.31 19.91 C77.31,19.91 74.57,17.88 74.57,17.88 C74.57,17.88 74.66,21.32 74.66,21.32 C74.66,21.32 71.92,23.35 71.92,23.35 C71.92,23.35 75.19,24.32 75.19,24.32 C75.19,24.32 76.34,27.58 76.34,27.58 C76.34,27.58 78.19,24.67 78.19,24.67 C78.19,24.67 81.64,24.67 81.64,24.67 C81.64,24.67 79.52,21.94 79.52,21.94 C79.52,21.94 80.58,18.67 80.58,18.67 C80.58,18.67 77.31,19.91 77.31,19.91c  M-28.11 7.68 C-28.11,7.68 -30.94,5.65 -30.94,5.65 C-30.94,5.65 -30.76,9.09 -30.76,9.09 C-30.76,9.09 -33.5,11.12 -33.5,11.12 C-33.5,11.12 -30.23,12.09 -30.23,12.09 C-30.23,12.09 -29.17,15.35 -29.17,15.35 C-29.17,15.35 -27.23,12.44 -27.23,12.44 C-27.23,12.44 -23.79,12.44 -23.79,12.44 C-23.79,12.44 -25.91,9.71 -25.91,9.71 C-25.91,9.71 -24.85,6.44 -24.85,6.44 C-24.85,6.44 -28.11,7.68 -28.11,7.68c  M-119.43 -20.22 C-119.43,-20.22 -122.26,-22.16 -122.26,-22.16 C-122.26,-22.16 -122.08,-18.72 -122.08,-18.72 C-122.08,-18.72 -124.82,-16.7 -124.82,-16.7 C-124.82,-16.7 -121.55,-15.81 -121.55,-15.81 C-121.55,-15.81 -120.49,-12.55 -120.49,-12.55 C-120.49,-12.55 -118.55,-15.37 -118.55,-15.37 C-118.55,-15.37 -115.11,-15.37 -115.11,-15.37 C-115.11,-15.37 -117.23,-18.11 -117.23,-18.11 C-117.23,-18.11 -116.17,-21.37 -116.17,-21.37 C-116.17,-21.37 -119.43,-20.22 -119.43,-20.22c "/>
-                        </group>
-                    </group>
-                    <group android:name="_R_G_L_6_G_L_0_G">
-                        <group android:name="_R_G_L_6_G_L_0_G_L_2_G" android:translateX="206" android:translateY="145">
-                            <path android:name="_R_G_L_6_G_L_0_G_L_2_G_D_0_P_0" android:fillColor="#e8eaed" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M230.57 -95.63 C230.57,-95.63 230.57,42.37 230.57,42.37 C230.57,43.47 229.56,44.37 228.33,44.37 C228.33,44.37 -228.33,44.37 -228.33,44.37 C-229.56,44.37 -230.57,43.47 -230.57,42.37 C-230.57,42.37 -230.57,-95.63 -230.57,-95.63 C-230.57,-96.73 -229.56,-97.63 -228.33,-97.63 C-228.33,-97.63 228.33,-97.63 228.33,-97.63 C229.56,-97.63 230.57,-96.73 230.57,-95.63c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_0_G_L_1_G" android:translateX="206" android:translateY="145">
-                            <path android:name="_R_G_L_6_G_L_0_G_L_1_G_D_0_P_0" android:fillColor="#80868b" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M109 -14 C109,-14 109,14 109,14 C109,15.1 108.1,16 107,16 C107,16 -107,16 -107,16 C-108.1,16 -109,15.1 -109,14 C-109,14 -109,-14 -109,-14 C-109,-15.1 -108.1,-16 -107,-16 C-107,-16 107,-16 107,-16 C108.1,-16 109,-15.1 109,-14c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_0_G_L_0_G" android:translateX="46" android:translateY="145">
-                            <path android:name="_R_G_L_6_G_L_0_G_L_0_G_D_0_P_0" android:fillColor="#80868b" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M22 -14 C22,-14 22,14 22,14 C22,18.42 18.42,22 14,22 C14,22 -14,22 -14,22 C-18.42,22 -22,18.42 -22,14 C-22,14 -22,-14 -22,-14 C-22,-18.42 -18.42,-22 -14,-22 C-14,-22 14,-22 14,-22 C18.42,-22 22,-18.42 22,-14c "/>
-                        </group>
-                    </group>
-                </group>
-                <group android:name="_R_G_L_5_G" android:scaleY="0">
-                    <group android:name="_R_G_L_5_G_L_11_G" android:translateX="206" android:translateY="446" android:scaleY="0">
-                        <path android:name="_R_G_L_5_G_L_11_G_D_0_P_0" android:fillColor="#f1f3f4" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c "/>
-                    </group>
-                    <group android:name="_R_G_L_5_G_L_10_G" android:translateX="148" android:translateY="441" android:scaleY="0">
-                        <path android:name="_R_G_L_5_G_L_10_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M48 -8 C48,-8 48,8 48,8 C48,10.21 46.21,12 44,12 C44,12 -44,12 -44,12 C-46.21,12 -48,10.21 -48,8 C-48,8 -48,-8 -48,-8 C-48,-10.21 -46.21,-12 -44,-12 C-44,-12 44,-12 44,-12 C46.21,-12 48,-10.21 48,-8c "/>
-                    </group>
-                    <group android:name="_R_G_L_5_G_L_9_G" android:translateX="264" android:translateY="441" android:scaleY="0">
-                        <path android:name="_R_G_L_5_G_L_9_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M48 -8 C48,-8 48,8 48,8 C48,10.21 46.21,12 44,12 C44,12 -44,12 -44,12 C-46.21,12 -48,10.21 -48,8 C-48,8 -48,-8 -48,-8 C-48,-10.21 -46.21,-12 -44,-12 C-44,-12 44,-12 44,-12 C46.21,-12 48,-10.21 48,-8c "/>
-                    </group>
-                    <group android:name="_R_G_L_5_G_L_8_G" android:translateX="206" android:translateY="380" android:scaleY="0">
-                        <path android:name="_R_G_L_5_G_L_8_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M176 0 C176,0 176,0 176,0 C176,14.9 163.9,27 149,27 C149,27 -149,27 -149,27 C-163.9,27 -176,14.9 -176,0 C-176,0 -176,0 -176,0 C-176,-14.9 -163.9,-27 -149,-27 C-149,-27 149,-27 149,-27 C163.9,-27 176,-14.9 176,0c "/>
-                        <path android:name="_R_G_L_5_G_L_8_G_D_1_P_0" android:strokeColor="#bdc1c6" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="4" android:strokeAlpha="1" android:pathData=" M176 0 C176,0 176,0 176,0 C176,14.9 163.9,27 149,27 C149,27 -149,27 -149,27 C-163.9,27 -176,14.9 -176,0 C-176,0 -176,0 -176,0 C-176,-14.9 -163.9,-27 -149,-27 C-149,-27 149,-27 149,-27 C163.9,-27 176,-14.9 176,0c "/>
-                    </group>
-                    <group android:name="_R_G_L_5_G_L_7_G" android:translateX="120" android:translateY="268" android:scaleY="0">
-                        <path android:name="_R_G_L_5_G_L_7_G_D_0_P_0" android:fillColor="#4285f4" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M26 0 C26,0 26,0 26,0 C26,14.35 14.35,26 0,26 C0,26 0,26 0,26 C-14.35,26 -26,14.35 -26,0 C-26,0 -26,0 -26,0 C-26,-14.35 -14.35,-26 0,-26 C0,-26 0,-26 0,-26 C14.35,-26 26,-14.35 26,0c "/>
-                    </group>
-                    <group android:name="_R_G_L_5_G_L_6_G" android:translateX="167" android:translateY="278" android:scaleY="0">
-                        <path android:name="_R_G_L_5_G_L_6_G_D_0_P_0" android:fillColor="#e94235" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M17 0 C17,0 17,0 17,0 C17,9.38 9.38,17 0,17 C0,17 0,17 0,17 C-9.38,17 -17,9.38 -17,0 C-17,0 -17,0 -17,0 C-17,-9.38 -9.38,-17 0,-17 C0,-17 0,-17 0,-17 C9.38,-17 17,-9.38 17,0c "/>
-                    </group>
-                    <group android:name="_R_G_L_5_G_L_5_G" android:translateX="205" android:translateY="278" android:scaleY="0">
-                        <path android:name="_R_G_L_5_G_L_5_G_D_0_P_0" android:fillColor="#fabb05" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M17 0 C17,0 17,0 17,0 C17,9.38 9.38,17 0,17 C0,17 0,17 0,17 C-9.38,17 -17,9.38 -17,0 C-17,0 -17,0 -17,0 C-17,-9.38 -9.38,-17 0,-17 C0,-17 0,-17 0,-17 C9.38,-17 17,-9.38 17,0c "/>
-                    </group>
-                    <group android:name="_R_G_L_5_G_L_4_G" android:translateX="243" android:translateY="286" android:scaleY="0">
-                        <path android:name="_R_G_L_5_G_L_4_G_D_0_P_0" android:fillColor="#4285f4" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M17 -8 C17,-8 17,8 17,8 C17,17.38 9.38,25 0,25 C0,25 0,25 0,25 C-9.38,25 -17,17.38 -17,8 C-17,8 -17,-8 -17,-8 C-17,-17.38 -9.38,-25 0,-25 C0,-25 0,-25 0,-25 C9.38,-25 17,-17.38 17,-8c "/>
-                    </group>
-                    <group android:name="_R_G_L_5_G_L_3_G" android:translateX="272" android:translateY="269" android:scaleY="0">
-                        <path android:name="_R_G_L_5_G_L_3_G_D_0_P_0" android:fillColor="#34a853" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M8 -17 C8,-17 8,17 8,17 C8,21.42 4.42,25 0,25 C0,25 0,25 0,25 C-4.42,25 -8,21.42 -8,17 C-8,17 -8,-17 -8,-17 C-8,-21.42 -4.42,-25 0,-25 C0,-25 0,-25 0,-25 C4.42,-25 8,-21.42 8,-17c "/>
-                    </group>
-                    <group android:name="_R_G_L_5_G_L_2_G" android:translateX="301" android:translateY="278" android:scaleY="0">
-                        <path android:name="_R_G_L_5_G_L_2_G_D_0_P_0" android:fillColor="#e94235" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M17 0 C17,0 17,0 17,0 C17,9.38 9.38,17 0,17 C0,17 0,17 0,17 C-9.38,17 -17,9.38 -17,0 C-17,0 -17,0 -17,0 C-17,-9.38 -9.38,-17 0,-17 C0,-17 0,-17 0,-17 C9.38,-17 17,-9.38 17,0c "/>
-                    </group>
-                    <group android:name="_R_G_L_5_G_L_1_G" android:translateX="42" android:translateY="140" android:scaleY="0">
-                        <path android:name="_R_G_L_5_G_L_1_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M12 -8 C12,-8 12,8 12,8 C12,10.21 10.21,12 8,12 C8,12 -8,12 -8,12 C-10.21,12 -12,10.21 -12,8 C-12,8 -12,-8 -12,-8 C-12,-10.21 -10.21,-12 -8,-12 C-8,-12 8,-12 8,-12 C10.21,-12 12,-10.21 12,-8c "/>
-                    </group>
-                    <group android:name="_R_G_L_5_G_L_0_G" android:translateX="92.5" android:translateY="140" android:scaleY="0">
-                        <path android:name="_R_G_L_5_G_L_0_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M28.5 -5 C28.5,-5 28.5,5 28.5,5 C28.5,7.21 26.71,9 24.5,9 C24.5,9 -24.5,9 -24.5,9 C-26.71,9 -28.5,7.21 -28.5,5 C-28.5,5 -28.5,-5 -28.5,-5 C-28.5,-7.21 -26.71,-9 -24.5,-9 C-24.5,-9 24.5,-9 24.5,-9 C26.71,-9 28.5,-7.21 28.5,-5c "/>
-                    </group>
-                </group>
-                <group android:name="_R_G_L_4_G" android:translateX="206" android:translateY="877">
-                    <path android:name="_R_G_L_4_G_D_0_P_0" android:fillColor="#373737" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M40 0 C40,0 40,0 40,0 C40,1.1 39.1,2 38,2 C38,2 -38,2 -38,2 C-39.1,2 -40,1.1 -40,0 C-40,0 -40,0 -40,0 C-40,-1.1 -39.1,-2 -38,-2 C-38,-2 38,-2 38,-2 C39.1,-2 40,-1.1 40,0c "/>
-                </group>
-                <group android:name="_R_G_L_3_G">
-                    <group android:name="_R_G_L_3_G_L_1_G" android:translateX="206" android:translateY="50.5">
-                        <path android:name="_R_G_L_3_G_L_1_G_D_0_P_0" android:fillColor="#202124" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -50.5 C206,-50.5 206,50.5 206,50.5 C206,50.5 -206,50.5 -206,50.5 C-206,50.5 -206,-50.5 -206,-50.5 C-206,-50.5 206,-50.5 206,-50.5c "/>
-                    </group>
-                    <group android:name="_R_G_L_3_G_L_0_G" android:translateX="206" android:translateY="66.5">
-                        <path android:name="_R_G_L_3_G_L_0_G_D_0_P_0" android:fillColor="#3c4043" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M190 0 C190,0 190,0 190,0 C190,10.21 181.71,18.5 171.5,18.5 C171.5,18.5 -171.5,18.5 -171.5,18.5 C-181.71,18.5 -190,10.21 -190,0 C-190,0 -190,0 -190,0 C-190,-10.21 -181.71,-18.5 -171.5,-18.5 C-171.5,-18.5 171.5,-18.5 171.5,-18.5 C181.71,-18.5 190,-10.21 190,0c "/>
-                    </group>
-                </group>
-                <group android:name="_R_G_L_2_G" android:translateX="28.25" android:translateY="462.5" android:scaleY="0">
-                    <group android:name="_R_G_L_2_G_D_0_P_0_G_0_T_0" android:translateX="-60" android:translateY="0">
-                        <path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="#000000" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M28.25 0 C28.25,31.2 2.95,56.5 -28.25,56.5 C-28.25,56.5 -28.25,-56.5 -28.25,-56.5 C2.95,-56.5 28.25,-31.2 28.25,0c "/>
-                    </group>
-                </group>
-                <group android:name="_R_G_L_1_G" android:translateX="-4.25" android:translateY="463" android:scaleX="0.5" android:scaleY="0" android:rotation="180">
-                    <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="#ffffff" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M3.87 -13.45 C3.07,-14.21 1.8,-14.18 1.04,-13.38 C0.28,-12.58 0.31,-11.31 1.11,-10.55 C1.11,-10.55 9.75,-2.32 9.75,-2.32 C9.75,-2.32 -14.75,-2.32 -14.75,-2.32 C-15.85,-2.32 -16.75,-1.43 -16.75,-0.32 C-16.75,0.78 -15.85,1.68 -14.75,1.68 C-14.75,1.68 9.94,1.68 9.94,1.68 C9.94,1.68 1.07,10.59 1.07,10.59 C0.29,11.37 0.29,12.64 1.08,13.42 C1.86,14.2 3.13,14.19 3.9,13.41 C3.9,13.41 16.17,1.09 16.17,1.09 C16.55,0.71 16.76,0.19 16.75,-0.35 C16.74,-0.89 16.52,-1.4 16.13,-1.77 C16.13,-1.77 3.87,-13.45 3.87,-13.45c "/>
-                </group>
-                <group android:name="_R_G_L_0_G" android:translateX="-130.003" android:translateY="399" android:scaleY="0">
-                    <group android:name="_R_G_L_0_G_L_2_G" android:translateX="295.995" android:translateY="63.997" android:scaleY="0">
-                        <path android:name="_R_G_L_0_G_L_2_G_D_0_P_0" android:fillColor="#baf29d" android:fillAlpha="0.3" android:fillType="nonZero" android:pathData=" M-166 64 C-130.65,64 -102,35.35 -102,0 C-102,-35.34 -130.65,-64 -166,-64 C-201.34,-64 -230,-35.34 -230,0 C-230,35.35 -201.34,64 -166,64c "/>
-                    </group>
-                    <group android:name="_R_G_L_0_G_L_1_G" android:translateX="192" android:translateY="63.997" android:rotation="90" android:scaleX="-1" android:scaleY="0">
-                        <path android:name="_R_G_L_0_G_L_1_G_D_0_P_0" android:fillColor="#baf29d" android:fillAlpha="0.3" android:fillType="nonZero" android:pathData=" M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c "/>
-                    </group>
-                    <group android:name="_R_G_L_0_G_L_0_G" android:translateX="295.995" android:translateY="63.997" android:scaleY="0">
-                        <group android:name="_R_G_L_0_G_L_0_G_D_0_P_0_G_0_T_0" android:translateX="-166" android:translateY="0">
-                            <path android:name="_R_G_L_0_G_L_0_G_D_0_P_0" android:fillColor="#baf29d" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 64 C35.35,64 64,35.35 64,0 C64,-35.34 35.35,-64 0,-64 C-35.34,-64 -64,-35.34 -64,0 C-64,35.35 -35.34,64 0,64c "/>
-                        </group>
-                    </group>
-                </group>
-            </group>
-            <group android:name="time_group"/>
-        </vector>
-    </aapt:attr>
-    <target android:name="_R_G_L_6_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_6_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2283" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_6_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_6_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2283" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_6_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_6_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2267" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_6_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleX" android:duration="2133" android:startOffset="0" android:valueFrom="1" android:valueTo="1" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="2133" android:startOffset="0" android:valueFrom="1" android:valueTo="1" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="283" android:startOffset="2133" android:valueFrom="1" android:valueTo="0.88012" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="283" android:startOffset="2133" android:valueFrom="1" android:valueTo="0.88012" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_6_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_6_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2417" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_5_G_L_11_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2333" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_5_G_L_10_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2433" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_5_G_L_9_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2433" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_5_G_L_8_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_5_G_L_7_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2367" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_5_G_L_6_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2367" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_5_G_L_5_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2367" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_5_G_L_4_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2367" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_5_G_L_3_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2367" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_5_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2367" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_5_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2333" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_5_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2333" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_5_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2333" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_D_0_P_0_G_0_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="translateXY" android:duration="1133" android:startOffset="0" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -60,0C -50,0 -70,0 -60,0">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="667" android:startOffset="1133" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -60,0C -50,0 -10,0 0,0">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="333" android:startOffset="1800" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 0,0C 0,0 0,0 0,0">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0.333 0,0 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="333" android:startOffset="2133" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 0,0C -10,0 -50,0 -60,0">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1133" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2467" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="translateXY" android:duration="1133" android:startOffset="0" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -4.25,463C 0.75,463 -9.25,463 -4.25,463">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="583" android:startOffset="1133" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -4.25,463C 0.75,463 20.75,463 25.75,463">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="417" android:startOffset="1717" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 25.75,463C 25.75,463 25.75,463 25.75,463">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0.333 0.667,0.667 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="333" android:startOffset="2133" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 25.75,463C 25.75,463 -4.25,463 -4.25,463">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleX" android:duration="1300" android:startOffset="0" android:valueFrom="0.5" android:valueTo="0.5" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="1300" android:startOffset="0" android:valueFrom="0.5" android:valueTo="0.5" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="417" android:startOffset="1300" android:valueFrom="0.5" android:valueTo="1" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="417" android:startOffset="1300" android:valueFrom="0.5" android:valueTo="1" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="417" android:startOffset="1717" android:valueFrom="1" android:valueTo="1" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="417" android:startOffset="1717" android:valueFrom="1" android:valueTo="1" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="200" android:startOffset="2133" android:valueFrom="1" android:valueTo="0.5" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="200" android:startOffset="2133" android:valueFrom="1" android:valueTo="0.5" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1300" android:valueFrom="0" android:valueTo="0.5" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2333" android:valueFrom="0.5" android:valueTo="0" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="867" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1033" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_1_G_D_0_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="pathData" android:duration="167" android:startOffset="867" android:valueFrom="M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c " android:valueTo="M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c " android:valueType="pathType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.508,0 0.487,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="pathData" android:duration="467" android:startOffset="1033" android:valueFrom="M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c " android:valueTo="M0 167.99 C35.35,167.99 64,139.34 64,104 C64,104 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,104 -64,104 C-64,139.34 -35.34,167.99 0,167.99c " android:valueType="pathType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.508,0 0.487,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1033" android:valueFrom="0" android:valueTo="-1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2267" android:valueFrom="-1" android:valueTo="0" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_0_G_D_0_P_0_G_0_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="translateXY" android:duration="167" android:startOffset="867" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -166,0C -138.333,0 -193.667,0 -166,0">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.508,0 0.487,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="467" android:startOffset="1033" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -166,0C -138.333,0 -27.667,0 0,0">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.508,0 0.487,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="867" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2267" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="867" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2267" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="time_group">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="translateX" android:duration="4017" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_back_right.xml b/quickstep/res/drawable/gesture_tutorial_back_right.xml
deleted file mode 100644
index 77d9924524..0000000000
--- a/quickstep/res/drawable/gesture_tutorial_back_right.xml
+++ /dev/null
@@ -1,561 +0,0 @@
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt">
-    <aapt:attr name="android:drawable">
-        <vector android:height="892dp" android:width="412dp" android:viewportHeight="892" android:viewportWidth="412">
-            <group android:name="_R_G">
-                <group android:name="_R_G_L_7_G" android:translateX="206" android:translateY="446">
-                    <path android:name="_R_G_L_7_G_D_0_P_0" android:fillColor="#f1f3f4" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c "/>
-                </group>
-                <group android:name="_R_G_L_6_G" android:pivotX="206" android:pivotY="446" android:scaleX="1" android:scaleY="1">
-                    <group android:name="_R_G_L_6_G_L_3_G" android:translateX="206" android:translateY="446" android:scaleX="1.2" android:scaleY="1.2">
-                        <path android:name="_R_G_L_6_G_L_3_G_D_0_P_0" android:fillColor="#f1f3f4" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c "/>
-                    </group>
-                    <group android:name="_R_G_L_6_G_L_2_G">
-                        <group android:name="_R_G_L_6_G_L_2_G_L_11_G" android:translateX="206" android:translateY="496.5">
-                            <path android:name="_R_G_L_6_G_L_2_G_L_11_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M235.5 -452.14 C235.5,-452.14 235.5,452.14 235.5,452.14 C235.5,452.14 -235.5,452.14 -235.5,452.14 C-235.5,452.14 -235.5,-452.14 -235.5,-452.14 C-235.5,-452.14 235.5,-452.14 235.5,-452.14c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_2_G_L_10_G" android:translateX="182.5" android:translateY="831">
-                            <path android:name="_R_G_L_6_G_L_2_G_L_10_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M158.5 -7 C158.5,-7 158.5,7 158.5,7 C158.5,9.21 156.71,11 154.5,11 C154.5,11 -154.5,11 -154.5,11 C-156.71,11 -158.5,9.21 -158.5,7 C-158.5,7 -158.5,-7 -158.5,-7 C-158.5,-9.21 -156.71,-11 -154.5,-11 C-154.5,-11 154.5,-11 154.5,-11 C156.71,-11 158.5,-9.21 158.5,-7c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_2_G_L_9_G" android:translateX="186" android:translateY="801">
-                            <path android:name="_R_G_L_6_G_L_2_G_L_9_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M162 -7 C162,-7 162,7 162,7 C162,9.21 160.21,11 158,11 C158,11 -158,11 -158,11 C-160.21,11 -162,9.21 -162,7 C-162,7 -162,-7 -162,-7 C-162,-9.21 -160.21,-11 -158,-11 C-158,-11 158,-11 158,-11 C160.21,-11 162,-9.21 162,-7c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_2_G_L_8_G" android:translateX="119" android:translateY="755">
-                            <path android:name="_R_G_L_6_G_L_2_G_L_8_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M95 -7 C95,-7 95,7 95,7 C95,9.21 93.21,11 91,11 C91,11 -91,11 -91,11 C-93.21,11 -95,9.21 -95,7 C-95,7 -95,-7 -95,-7 C-95,-9.21 -93.21,-11 -91,-11 C-91,-11 91,-11 91,-11 C93.21,-11 95,-9.21 95,-7c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_2_G_L_7_G" android:translateX="182.5" android:translateY="725">
-                            <path android:name="_R_G_L_6_G_L_2_G_L_7_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M158.5 -7 C158.5,-7 158.5,7 158.5,7 C158.5,9.21 156.71,11 154.5,11 C154.5,11 -154.5,11 -154.5,11 C-156.71,11 -158.5,9.21 -158.5,7 C-158.5,7 -158.5,-7 -158.5,-7 C-158.5,-9.21 -156.71,-11 -154.5,-11 C-154.5,-11 154.5,-11 154.5,-11 C156.71,-11 158.5,-9.21 158.5,-7c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_2_G_L_6_G" android:translateX="197.5" android:translateY="695">
-                            <path android:name="_R_G_L_6_G_L_2_G_L_6_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M173.5 -7 C173.5,-7 173.5,7 173.5,7 C173.5,9.21 171.71,11 169.5,11 C169.5,11 -169.5,11 -169.5,11 C-171.71,11 -173.5,9.21 -173.5,7 C-173.5,7 -173.5,-7 -173.5,-7 C-173.5,-9.21 -171.71,-11 -169.5,-11 C-169.5,-11 169.5,-11 169.5,-11 C171.71,-11 173.5,-9.21 173.5,-7c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_2_G_L_5_G" android:translateX="192" android:translateY="665">
-                            <path android:name="_R_G_L_6_G_L_2_G_L_5_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M168 -7 C168,-7 168,7 168,7 C168,9.21 166.21,11 164,11 C164,11 -164,11 -164,11 C-166.21,11 -168,9.21 -168,7 C-168,7 -168,-7 -168,-7 C-168,-9.21 -166.21,-11 -164,-11 C-164,-11 164,-11 164,-11 C166.21,-11 168,-9.21 168,-7c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_2_G_L_4_G" android:translateX="105.5" android:translateY="360">
-                            <path android:name="_R_G_L_6_G_L_2_G_L_4_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M23.5 -2 C23.5,-2 23.5,2 23.5,2 C23.5,4.21 21.71,6 19.5,6 C19.5,6 -19.5,6 -19.5,6 C-21.71,6 -23.5,4.21 -23.5,2 C-23.5,2 -23.5,-2 -23.5,-2 C-23.5,-4.21 -21.71,-6 -19.5,-6 C-19.5,-6 19.5,-6 19.5,-6 C21.71,-6 23.5,-4.21 23.5,-2c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_2_G_L_3_G" android:translateX="47.5" android:translateY="360">
-                            <path android:name="_R_G_L_6_G_L_2_G_L_3_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M23.5 -2 C23.5,-2 23.5,2 23.5,2 C23.5,4.21 21.71,6 19.5,6 C19.5,6 -19.5,6 -19.5,6 C-21.71,6 -23.5,4.21 -23.5,2 C-23.5,2 -23.5,-2 -23.5,-2 C-23.5,-4.21 -21.71,-6 -19.5,-6 C-19.5,-6 19.5,-6 19.5,-6 C21.71,-6 23.5,-4.21 23.5,-2c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_2_G_L_2_G" android:translateX="142.5" android:translateY="328">
-                            <path android:name="_R_G_L_6_G_L_2_G_L_2_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M118.5 -14 C118.5,-14 118.5,14 118.5,14 C118.5,16.21 116.71,18 114.5,18 C114.5,18 -114.5,18 -114.5,18 C-116.71,18 -118.5,16.21 -118.5,14 C-118.5,14 -118.5,-14 -118.5,-14 C-118.5,-16.21 -116.71,-18 -114.5,-18 C-114.5,-18 114.5,-18 114.5,-18 C116.71,-18 118.5,-16.21 118.5,-14c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_2_G_L_1_G" android:translateX="186" android:translateY="284">
-                            <path android:name="_R_G_L_6_G_L_2_G_L_1_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M162 -14 C162,-14 162,14 162,14 C162,16.21 160.21,18 158,18 C158,18 -158,18 -158,18 C-160.21,18 -162,16.21 -162,14 C-162,14 -162,-14 -162,-14 C-162,-16.21 -160.21,-18 -158,-18 C-158,-18 158,-18 158,-18 C160.21,-18 162,-16.21 162,-14c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_2_G_L_0_G" android:translateX="155" android:translateY="240">
-                            <path android:name="_R_G_L_6_G_L_2_G_L_0_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M131 -14 C131,-14 131,14 131,14 C131,16.21 129.21,18 127,18 C127,18 -127,18 -127,18 C-129.21,18 -131,16.21 -131,14 C-131,14 -131,-14 -131,-14 C-131,-16.21 -129.21,-18 -127,-18 C-127,-18 127,-18 127,-18 C129.21,-18 131,-16.21 131,-14c "/>
-                        </group>
-                    </group>
-                    <group android:name="_R_G_L_6_G_L_1_G" android:translateX="24" android:translateY="390">
-                        <group android:name="_R_G_L_6_G_L_1_G_L_7_G" android:translateX="182" android:translateY="120"/>
-                        <group android:name="_R_G_L_6_G_L_1_G_L_6_G" android:translateX="182" android:translateY="120">
-                            <path android:name="_R_G_L_6_G_L_1_G_L_6_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M182 -116 C182,-116 182,116 182,116 C182,118.21 180.21,120 178,120 C178,120 -178,120 -178,120 C-180.21,120 -182,118.21 -182,116 C-182,116 -182,-116 -182,-116 C-182,-118.21 -180.21,-120 -178,-120 C-178,-120 178,-120 178,-120 C180.21,-120 182,-118.21 182,-116c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_1_G_L_5_G" android:translateX="77.322" android:translateY="150.552">
-                            <path android:name="_R_G_L_6_G_L_1_G_L_5_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 20.61 C0,20.61 -10.39,8.69 -10.39,8.69  M0 -6.11 C0,-6.11 -6.78,-15.61 -6.78,-15.61  M0 33.64 C0,33.64 8.26,17.67 8.26,17.67  M0 7.58 C0,7.58 8.26,-7.73 8.26,-7.73  M0 71.19 C0,71.19 0,-18.04 0,-18.04  M-30.22 37.18 C-30.22,37.18 0,-71.19 0,-71.19 C0,-71.19 30.22,37.18 30.22,37.18 C30.22,37.18 -30.22,37.18 -30.22,37.18c "/>
-                            <path android:name="_R_G_L_6_G_L_1_G_L_5_G_D_1_P_0" android:strokeColor="#9adcb2" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M0 20.61 C0,20.61 -10.39,8.69 -10.39,8.69  M0 -6.11 C0,-6.11 -6.78,-15.61 -6.78,-15.61  M0 33.64 C0,33.64 8.26,17.67 8.26,17.67  M0 7.58 C0,7.58 8.26,-7.73 8.26,-7.73  M0 71.19 C0,71.19 0,-18.04 0,-18.04  M-30.22 37.18 C-30.22,37.18 0,-71.19 0,-71.19 C0,-71.19 30.22,37.18 30.22,37.18 C30.22,37.18 -30.22,37.18 -30.22,37.18c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_1_G_L_4_G" android:translateX="38.772" android:translateY="121.73">
-                            <path android:name="_R_G_L_6_G_L_1_G_L_4_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 28.82 C0,28.82 -14.52,12.18 -14.52,12.18  M0 -8.58 C0,-8.58 -9.51,-21.75 -9.51,-21.75  M0 47.01 C0,47.01 11.57,24.7 11.57,24.7  M0 10.64 C0,10.64 11.57,-10.78 11.57,-10.78  M0 99.42 C0,99.42 0,-25.21 0,-25.21  M-31.92 51.94 C-31.92,51.94 0,-99.42 0,-99.42 C0,-99.42 31.92,51.94 31.92,51.94 C31.92,51.94 -31.92,51.94 -31.92,51.94c "/>
-                            <path android:name="_R_G_L_6_G_L_1_G_L_4_G_D_1_P_0" android:strokeColor="#9adcb2" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M0 28.82 C0,28.82 -14.52,12.18 -14.52,12.18  M0 -8.58 C0,-8.58 -9.51,-21.75 -9.51,-21.75  M0 47.01 C0,47.01 11.57,24.7 11.57,24.7  M0 10.64 C0,10.64 11.57,-10.78 11.57,-10.78  M0 99.42 C0,99.42 0,-25.21 0,-25.21  M-31.92 51.94 C-31.92,51.94 0,-99.42 0,-99.42 C0,-99.42 31.92,51.94 31.92,51.94 C31.92,51.94 -31.92,51.94 -31.92,51.94c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_1_G_L_3_G" android:translateX="183" android:translateY="222">
-                            <path android:name="_R_G_L_6_G_L_1_G_L_3_G_D_0_P_0" android:fillColor="#000000" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M170 0 C170,0 -170,0 -170,0 "/>
-                            <path android:name="_R_G_L_6_G_L_1_G_L_3_G_D_1_P_0" android:strokeColor="#9aa0a6" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="4" android:strokeAlpha="1" android:pathData=" M170 0 C170,0 -170,0 -170,0 "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_1_G_L_2_G" android:translateX="265.619" android:translateY="162.331">
-                            <path android:name="_R_G_L_6_G_L_1_G_L_2_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M-34.05 50.06 C-34.05,50.06 -34.05,-49.25 -34.05,-49.25  M-34.05 -49.55 C-34.05,-49.55 17.54,50.06 17.54,50.06 C17.54,50.06 84.62,50.06 84.62,50.06 C84.62,50.06 32.65,-50.06 32.65,-50.06 C32.65,-50.06 -34.05,-50.06 -34.05,-50.06 C-34.05,-50.06 -84.62,50.06 -84.62,50.06 C-84.62,50.06 17.54,50.06 17.54,50.06 "/>
-                            <path android:name="_R_G_L_6_G_L_1_G_L_2_G_D_1_P_0" android:strokeColor="#a8cbfe" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M-34.05 50.06 C-34.05,50.06 -34.05,-49.25 -34.05,-49.25  M-34.05 -49.55 C-34.05,-49.55 17.54,50.06 17.54,50.06 C17.54,50.06 84.62,50.06 84.62,50.06 C84.62,50.06 32.65,-50.06 32.65,-50.06 C32.65,-50.06 -34.05,-50.06 -34.05,-50.06 C-34.05,-50.06 -84.62,50.06 -84.62,50.06 C-84.62,50.06 17.54,50.06 17.54,50.06 "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_1_G_L_1_G" android:translateX="319.271" android:translateY="37.945">
-                            <path android:name="_R_G_L_6_G_L_1_G_L_1_G_D_0_P_0" android:fillColor="#feefc3" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M13.42 2.99 C14.95,-4.17 9.93,-11.31 2.21,-12.96 C-0.9,-13.62 -3.97,-13.3 -6.64,-12.2 C-6.58,-12.19 -6.53,-12.18 -6.48,-12.17 C-1.03,-11.01 2.52,-5.97 1.44,-0.92 C0.36,4.13 -4.94,7.28 -10.4,6.12 C-11.6,5.86 -12.7,5.42 -13.69,4.83 C-11.9,8.78 -8.15,11.93 -3.34,12.96 C4.38,14.61 11.88,10.14 13.42,2.99c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_1_G_L_0_G" android:translateX="179.5" android:translateY="73.351">
-                            <path android:name="_R_G_L_6_G_L_1_G_L_0_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M51.08 -40.95 C51.08,-40.95 50.55,-42.54 50.55,-42.54 C50.55,-42.54 49.67,-41.13 49.67,-41.13 C49.67,-41.13 48.17,-41.21 48.17,-41.21 C48.17,-41.21 49.05,-39.8 49.05,-39.8 C49.05,-39.8 48.61,-38.22 48.61,-38.22 C48.61,-38.22 50.02,-38.74 50.02,-38.74 C50.02,-38.74 51.35,-37.69 51.35,-37.69 C51.35,-37.69 51.26,-39.45 51.26,-39.45 C51.26,-39.45 52.59,-40.42 52.59,-40.42 C52.59,-40.42 51.08,-40.95 51.08,-40.95c  M8.78 30.58 C8.78,30.58 8.25,28.99 8.25,28.99 C8.25,28.99 7.37,30.4 7.37,30.4 C7.37,30.4 5.87,30.31 5.87,30.31 C5.87,30.31 6.75,31.72 6.75,31.72 C6.75,31.72 6.31,33.31 6.31,33.31 C6.31,33.31 7.72,32.78 7.72,32.78 C7.72,32.78 9.05,33.84 9.05,33.84 C9.05,33.84 8.96,32.08 8.96,32.08 C8.96,32.08 10.29,31.11 10.29,31.11 C10.29,31.11 8.78,30.58 8.78,30.58c  M19.38 -61.67 C19.38,-61.67 18.94,-63.35 18.94,-63.35 C18.94,-63.35 17.97,-61.94 17.97,-61.94 C17.97,-61.94 16.47,-61.94 16.47,-61.94 C16.47,-61.94 17.35,-60.62 17.35,-60.62 C17.35,-60.62 16.91,-58.94 16.91,-58.94 C16.91,-58.94 18.41,-59.56 18.41,-59.56 C18.41,-59.56 19.65,-58.5 19.65,-58.5 C19.65,-58.5 19.56,-60.18 19.56,-60.18 C19.56,-60.18 20.88,-61.23 20.88,-61.23 C20.88,-61.23 19.38,-61.67 19.38,-61.67c  M-32.98 35.08 C-32.98,35.08 -33.51,33.4 -33.51,33.4 C-33.51,33.4 -34.4,34.81 -34.4,34.81 C-34.4,34.81 -35.9,34.81 -35.9,34.81 C-35.9,34.81 -35.01,36.22 -35.01,36.22 C-35.01,36.22 -35.45,37.81 -35.45,37.81 C-35.45,37.81 -34.04,37.28 -34.04,37.28 C-34.04,37.28 -32.72,38.25 -32.72,38.25 C-32.72,38.25 -32.81,36.58 -32.81,36.58 C-32.81,36.58 -31.48,35.6 -31.48,35.6 C-31.48,35.6 -32.98,35.08 -32.98,35.08c  M45.34 7.56 C45.34,7.56 44.81,5.97 44.81,5.97 C44.81,5.97 43.93,7.38 43.93,7.38 C43.93,7.38 42.34,7.3 42.34,7.3 C42.34,7.3 43.31,8.71 43.31,8.71 C43.31,8.71 42.87,10.29 42.87,10.29 C42.87,10.29 44.28,9.77 44.28,9.77 C44.28,9.77 45.52,10.82 45.52,10.82 C45.52,10.82 45.52,9.06 45.52,9.06 C45.52,9.06 46.76,8.09 46.76,8.09 C46.76,8.09 45.34,7.56 45.34,7.56c  M-9.59 -41.67 C-9.59,-41.67 -10.12,-43.35 -10.12,-43.35 C-10.12,-43.35 -11,-41.94 -11,-41.94 C-11,-41.94 -12.5,-41.94 -12.5,-41.94 C-12.5,-41.94 -11.62,-40.62 -11.62,-40.62 C-11.62,-40.62 -12.06,-38.94 -12.06,-38.94 C-12.06,-38.94 -10.65,-39.56 -10.65,-39.56 C-10.65,-39.56 -9.32,-38.5 -9.32,-38.5 C-9.32,-38.5 -9.41,-40.26 -9.41,-40.26 C-9.41,-40.26 -8.09,-41.23 -8.09,-41.23 C-8.09,-41.23 -9.59,-41.67 -9.59,-41.67c  M97.74 -23.97 C97.74,-23.97 97.03,-26.35 97.03,-26.35 C97.03,-26.35 95.8,-24.32 95.8,-24.32 C95.8,-24.32 93.5,-24.32 93.5,-24.32 C93.5,-24.32 94.91,-22.38 94.91,-22.38 C94.91,-22.38 94.21,-20 94.21,-20 C94.21,-20 96.33,-20.88 96.33,-20.88 C96.33,-20.88 98.09,-19.38 98.09,-19.38 C98.09,-19.38 98.09,-21.85 98.09,-21.85 C98.09,-21.85 99.86,-23.26 99.86,-23.26 C99.86,-23.26 97.74,-23.97 97.74,-23.97c  M167.29 43.28 C167.29,43.28 166.67,40.9 166.67,40.9 C166.67,40.9 165.35,42.93 165.35,42.93 C165.35,42.93 163.14,42.93 163.14,42.93 C163.14,42.93 164.47,44.87 164.47,44.87 C164.47,44.87 163.76,47.25 163.76,47.25 C163.76,47.25 165.88,46.37 165.88,46.37 C165.88,46.37 167.73,47.87 167.73,47.87 C167.73,47.87 167.65,45.4 167.65,45.4 C167.65,45.4 169.5,43.98 169.5,43.98 C169.5,43.98 167.29,43.28 167.29,43.28c  M-1.1 -1.79 C-1.1,-1.79 -1.72,-4.08 -1.72,-4.08 C-1.72,-4.08 -3.05,-2.14 -3.05,-2.14 C-3.05,-2.14 -5.25,-2.14 -5.25,-2.14 C-5.25,-2.14 -3.93,-0.11 -3.93,-0.11 C-3.93,-0.11 -4.64,2.18 -4.64,2.18 C-4.64,2.18 -2.52,1.38 -2.52,1.38 C-2.52,1.38 -0.66,2.8 -0.66,2.8 C-0.66,2.8 -0.75,0.41 -0.75,0.41 C-0.75,0.41 1.1,-1.08 1.1,-1.08 C1.1,-1.08 -1.1,-1.79 -1.1,-1.79c  M-60.89 -5.23 C-60.89,-5.23 -61.59,-7.61 -61.59,-7.61 C-61.59,-7.61 -62.83,-5.58 -62.83,-5.58 C-62.83,-5.58 -65.13,-5.58 -65.13,-5.58 C-65.13,-5.58 -63.71,-3.64 -63.71,-3.64 C-63.71,-3.64 -64.42,-1.26 -64.42,-1.26 C-64.42,-1.26 -62.39,-2.14 -62.39,-2.14 C-62.39,-2.14 -60.53,-0.64 -60.53,-0.64 C-60.53,-0.64 -60.62,-3.11 -60.62,-3.11 C-60.62,-3.11 -58.77,-4.52 -58.77,-4.52 C-58.77,-4.52 -60.89,-5.23 -60.89,-5.23c  M-165.26 -10.97 C-165.26,-10.97 -165.97,-13.35 -165.97,-13.35 C-165.97,-13.35 -167.29,-11.32 -167.29,-11.32 C-167.29,-11.32 -169.5,-11.32 -169.5,-11.32 C-169.5,-11.32 -168.18,-9.38 -168.18,-9.38 C-168.18,-9.38 -168.88,-7 -168.88,-7 C-168.88,-7 -166.76,-7.79 -166.76,-7.79 C-166.76,-7.79 -164.91,-6.38 -164.91,-6.38 C-164.91,-6.38 -165,-8.85 -165,-8.85 C-165,-8.85 -163.14,-10.26 -163.14,-10.26 C-163.14,-10.26 -165.26,-10.97 -165.26,-10.97c  M-51.26 -42.98 C-51.26,-42.98 -54.09,-45.01 -54.09,-45.01 C-54.09,-45.01 -53.91,-41.57 -53.91,-41.57 C-53.91,-41.57 -56.65,-39.54 -56.65,-39.54 C-56.65,-39.54 -53.38,-38.57 -53.38,-38.57 C-53.38,-38.57 -52.32,-35.3 -52.32,-35.3 C-52.32,-35.3 -50.38,-38.13 -50.38,-38.13 C-50.38,-38.13 -46.94,-38.22 -46.94,-38.22 C-46.94,-38.22 -49.05,-40.86 -49.05,-40.86 C-49.05,-40.86 -47.99,-44.21 -47.99,-44.21 C-47.99,-44.21 -51.26,-42.98 -51.26,-42.98c  M-92.06 -47.92 C-92.06,-47.92 -92.59,-49.59 -92.59,-49.59 C-92.59,-49.59 -93.47,-48.18 -93.47,-48.18 C-93.47,-48.18 -95.06,-48.18 -95.06,-48.18 C-95.06,-48.18 -94.09,-46.86 -94.09,-46.86 C-94.09,-46.86 -94.53,-45.18 -94.53,-45.18 C-94.53,-45.18 -93.12,-45.8 -93.12,-45.8 C-93.12,-45.8 -91.88,-44.74 -91.88,-44.74 C-91.88,-44.74 -91.88,-46.42 -91.88,-46.42 C-91.88,-46.42 -90.65,-47.47 -90.65,-47.47 C-90.65,-47.47 -92.06,-47.92 -92.06,-47.92c  M62.83 -13.34 C62.83,-13.34 62.39,-14.93 62.39,-14.93 C62.39,-14.93 61.5,-13.52 61.5,-13.52 C61.5,-13.52 59.91,-13.52 59.91,-13.52 C59.91,-13.52 60.89,-12.2 60.89,-12.2 C60.89,-12.2 60.36,-10.52 60.36,-10.52 C60.36,-10.52 61.86,-11.14 61.86,-11.14 C61.86,-11.14 63.09,-10.08 63.09,-10.08 C63.09,-10.08 63.09,-11.84 63.09,-11.84 C63.09,-11.84 64.33,-12.81 64.33,-12.81 C64.33,-12.81 62.83,-13.34 62.83,-13.34c  M-155.99 -40.95 C-155.99,-40.95 -156.43,-42.54 -156.43,-42.54 C-156.43,-42.54 -157.32,-41.13 -157.32,-41.13 C-157.32,-41.13 -158.91,-41.21 -158.91,-41.21 C-158.91,-41.21 -157.93,-39.8 -157.93,-39.8 C-157.93,-39.8 -158.46,-38.22 -158.46,-38.22 C-158.46,-38.22 -156.96,-38.74 -156.96,-38.74 C-156.96,-38.74 -155.73,-37.69 -155.73,-37.69 C-155.73,-37.69 -155.73,-39.45 -155.73,-39.45 C-155.73,-39.45 -154.49,-40.42 -154.49,-40.42 C-154.49,-40.42 -155.99,-40.95 -155.99,-40.95c  M141.24 26.52 C141.24,26.52 140.71,24.85 140.71,24.85 C140.71,24.85 139.83,26.26 139.83,26.26 C139.83,26.26 138.33,26.26 138.33,26.26 C138.33,26.26 139.21,27.67 139.21,27.67 C139.21,27.67 138.77,29.26 138.77,29.26 C138.77,29.26 140.18,28.73 140.18,28.73 C140.18,28.73 141.51,29.7 141.51,29.7 C141.51,29.7 141.42,28.02 141.42,28.02 C141.42,28.02 142.74,27.05 142.74,27.05 C142.74,27.05 141.24,26.52 141.24,26.52c  M111.4 -51.27 C111.4,-51.27 110.95,-52.94 110.95,-52.94 C110.95,-52.94 110.07,-51.53 110.07,-51.53 C110.07,-51.53 108.48,-51.53 108.48,-51.53 C108.48,-51.53 109.45,-50.21 109.45,-50.21 C109.45,-50.21 108.92,-48.53 108.92,-48.53 C108.92,-48.53 110.42,-49.15 110.42,-49.15 C110.42,-49.15 111.66,-48.09 111.66,-48.09 C111.66,-48.09 111.66,-49.86 111.66,-49.86 C111.66,-49.86 112.9,-50.83 112.9,-50.83 C112.9,-50.83 111.4,-51.27 111.4,-51.27c  M-66.59 53.33 C-66.59,53.33 -67.03,51.65 -67.03,51.65 C-67.03,51.65 -67.91,53.06 -67.91,53.06 C-67.91,53.06 -69.5,53.06 -69.5,53.06 C-69.5,53.06 -68.53,54.47 -68.53,54.47 C-68.53,54.47 -69.06,56.06 -69.06,56.06 C-69.06,56.06 -67.56,55.53 -67.56,55.53 C-67.56,55.53 -66.32,56.5 -66.32,56.5 C-66.32,56.5 -66.32,54.82 -66.32,54.82 C-66.32,54.82 -65.08,53.77 -65.08,53.77 C-65.08,53.77 -66.59,53.33 -66.59,53.33c  M-50.59 59.33 C-50.59,59.33 -51.12,57.65 -51.12,57.65 C-51.12,57.65 -52,59.06 -52,59.06 C-52,59.06 -53.5,59.06 -53.5,59.06 C-53.5,59.06 -52.62,60.38 -52.62,60.38 C-52.62,60.38 -53.06,62.06 -53.06,62.06 C-53.06,62.06 -51.65,61.53 -51.65,61.53 C-51.65,61.53 -50.32,62.5 -50.32,62.5 C-50.32,62.5 -50.41,60.82 -50.41,60.82 C-50.41,60.82 -49.08,59.77 -49.08,59.77 C-49.08,59.77 -50.59,59.33 -50.59,59.33c  M29.98 -16.08 C29.98,-16.08 29.27,-18.46 29.27,-18.46 C29.27,-18.46 27.95,-16.43 27.95,-16.43 C27.95,-16.43 25.74,-16.43 25.74,-16.43 C25.74,-16.43 27.06,-14.49 27.06,-14.49 C27.06,-14.49 26.36,-12.11 26.36,-12.11 C26.36,-12.11 28.48,-12.9 28.48,-12.9 C28.48,-12.9 30.33,-11.49 30.33,-11.49 C30.33,-11.49 30.24,-13.96 30.24,-13.96 C30.24,-13.96 32.1,-15.37 32.1,-15.37 C32.1,-15.37 29.98,-16.08 29.98,-16.08c  M81.28 55.98 C81.28,55.98 80.58,53.6 80.58,53.6 C80.58,53.6 79.25,55.63 79.25,55.63 C79.25,55.63 77.04,55.63 77.04,55.63 C77.04,55.63 78.37,57.57 78.37,57.57 C78.37,57.57 77.66,59.95 77.66,59.95 C77.66,59.95 79.78,59.07 79.78,59.07 C79.78,59.07 81.64,60.56 81.64,60.56 C81.64,60.56 81.55,58.1 81.55,58.1 C81.55,58.1 83.4,56.68 83.4,56.68 C83.4,56.68 81.28,55.98 81.28,55.98c  M-165.26 -10.97 C-165.26,-10.97 -165.97,-13.35 -165.97,-13.35 C-165.97,-13.35 -167.29,-11.32 -167.29,-11.32 C-167.29,-11.32 -169.5,-11.32 -169.5,-11.32 C-169.5,-11.32 -168.18,-9.38 -168.18,-9.38 C-168.18,-9.38 -168.88,-7 -168.88,-7 C-168.88,-7 -166.76,-7.79 -166.76,-7.79 C-166.76,-7.79 -164.91,-6.38 -164.91,-6.38 C-164.91,-6.38 -165,-8.85 -165,-8.85 C-165,-8.85 -163.14,-10.26 -163.14,-10.26 C-163.14,-10.26 -165.26,-10.97 -165.26,-10.97c  M-74.05 21.76 C-74.05,21.76 -74.66,19.47 -74.66,19.47 C-74.66,19.47 -75.99,21.49 -75.99,21.49 C-75.99,21.49 -78.2,21.41 -78.2,21.41 C-78.2,21.41 -76.87,23.43 -76.87,23.43 C-76.87,23.43 -77.58,25.73 -77.58,25.73 C-77.58,25.73 -75.46,24.93 -75.46,24.93 C-75.46,24.93 -73.6,26.43 -73.6,26.43 C-73.6,26.43 -73.69,23.96 -73.69,23.96 C-73.69,23.96 -71.84,22.46 -71.84,22.46 C-71.84,22.46 -74.05,21.76 -74.05,21.76c  M8.98 55.68 C8.98,55.68 6.15,53.65 6.15,53.65 C6.15,53.65 6.24,57.09 6.24,57.09 C6.24,57.09 3.5,59.12 3.5,59.12 C3.5,59.12 6.86,60.09 6.86,60.09 C6.86,60.09 7.92,63.35 7.92,63.35 C7.92,63.35 9.86,60.44 9.86,60.44 C9.86,60.44 13.3,60.44 13.3,60.44 C13.3,60.44 11.18,57.71 11.18,57.71 C11.18,57.71 12.15,54.44 12.15,54.44 C12.15,54.44 8.98,55.68 8.98,55.68c  M124.89 -2.41 C124.89,-2.41 122.06,-4.35 122.06,-4.35 C122.06,-4.35 122.24,-0.91 122.24,-0.91 C122.24,-0.91 119.5,1.12 119.5,1.12 C119.5,1.12 122.77,2 122.77,2 C122.77,2 123.83,5.26 123.83,5.26 C123.83,5.26 125.77,2.44 125.77,2.44 C125.77,2.44 129.21,2.44 129.21,2.44 C129.21,2.44 127.09,-0.29 127.09,-0.29 C127.09,-0.29 128.15,-3.56 128.15,-3.56 C128.15,-3.56 124.89,-2.41 124.89,-2.41c  M77.31 19.91 C77.31,19.91 74.57,17.88 74.57,17.88 C74.57,17.88 74.66,21.32 74.66,21.32 C74.66,21.32 71.92,23.35 71.92,23.35 C71.92,23.35 75.19,24.32 75.19,24.32 C75.19,24.32 76.34,27.58 76.34,27.58 C76.34,27.58 78.19,24.67 78.19,24.67 C78.19,24.67 81.64,24.67 81.64,24.67 C81.64,24.67 79.52,21.94 79.52,21.94 C79.52,21.94 80.58,18.67 80.58,18.67 C80.58,18.67 77.31,19.91 77.31,19.91c  M-28.11 7.68 C-28.11,7.68 -30.94,5.65 -30.94,5.65 C-30.94,5.65 -30.76,9.09 -30.76,9.09 C-30.76,9.09 -33.5,11.12 -33.5,11.12 C-33.5,11.12 -30.23,12.09 -30.23,12.09 C-30.23,12.09 -29.17,15.35 -29.17,15.35 C-29.17,15.35 -27.23,12.44 -27.23,12.44 C-27.23,12.44 -23.79,12.44 -23.79,12.44 C-23.79,12.44 -25.91,9.71 -25.91,9.71 C-25.91,9.71 -24.85,6.44 -24.85,6.44 C-24.85,6.44 -28.11,7.68 -28.11,7.68c  M-119.43 -20.22 C-119.43,-20.22 -122.26,-22.16 -122.26,-22.16 C-122.26,-22.16 -122.08,-18.72 -122.08,-18.72 C-122.08,-18.72 -124.82,-16.7 -124.82,-16.7 C-124.82,-16.7 -121.55,-15.81 -121.55,-15.81 C-121.55,-15.81 -120.49,-12.55 -120.49,-12.55 C-120.49,-12.55 -118.55,-15.37 -118.55,-15.37 C-118.55,-15.37 -115.11,-15.37 -115.11,-15.37 C-115.11,-15.37 -117.23,-18.11 -117.23,-18.11 C-117.23,-18.11 -116.17,-21.37 -116.17,-21.37 C-116.17,-21.37 -119.43,-20.22 -119.43,-20.22c "/>
-                        </group>
-                    </group>
-                    <group android:name="_R_G_L_6_G_L_0_G">
-                        <group android:name="_R_G_L_6_G_L_0_G_L_2_G" android:translateX="206" android:translateY="145">
-                            <path android:name="_R_G_L_6_G_L_0_G_L_2_G_D_0_P_0" android:fillColor="#e8eaed" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M230.57 -95.63 C230.57,-95.63 230.57,42.37 230.57,42.37 C230.57,43.47 229.56,44.37 228.33,44.37 C228.33,44.37 -228.33,44.37 -228.33,44.37 C-229.56,44.37 -230.57,43.47 -230.57,42.37 C-230.57,42.37 -230.57,-95.63 -230.57,-95.63 C-230.57,-96.73 -229.56,-97.63 -228.33,-97.63 C-228.33,-97.63 228.33,-97.63 228.33,-97.63 C229.56,-97.63 230.57,-96.73 230.57,-95.63c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_0_G_L_1_G" android:translateX="206" android:translateY="145">
-                            <path android:name="_R_G_L_6_G_L_0_G_L_1_G_D_0_P_0" android:fillColor="#80868b" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M109 -14 C109,-14 109,14 109,14 C109,15.1 108.1,16 107,16 C107,16 -107,16 -107,16 C-108.1,16 -109,15.1 -109,14 C-109,14 -109,-14 -109,-14 C-109,-15.1 -108.1,-16 -107,-16 C-107,-16 107,-16 107,-16 C108.1,-16 109,-15.1 109,-14c "/>
-                        </group>
-                        <group android:name="_R_G_L_6_G_L_0_G_L_0_G" android:translateX="46" android:translateY="145">
-                            <path android:name="_R_G_L_6_G_L_0_G_L_0_G_D_0_P_0" android:fillColor="#80868b" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M22 -14 C22,-14 22,14 22,14 C22,18.42 18.42,22 14,22 C14,22 -14,22 -14,22 C-18.42,22 -22,18.42 -22,14 C-22,14 -22,-14 -22,-14 C-22,-18.42 -18.42,-22 -14,-22 C-14,-22 14,-22 14,-22 C18.42,-22 22,-18.42 22,-14c "/>
-                        </group>
-                    </group>
-                </group>
-                <group android:name="_R_G_L_5_G" android:scaleY="0">
-                    <group android:name="_R_G_L_5_G_L_11_G" android:translateX="206" android:translateY="446" android:scaleY="0">
-                        <path android:name="_R_G_L_5_G_L_11_G_D_0_P_0" android:fillColor="#f1f3f4" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c "/>
-                    </group>
-                    <group android:name="_R_G_L_5_G_L_10_G" android:translateX="148" android:translateY="441" android:scaleY="0">
-                        <path android:name="_R_G_L_5_G_L_10_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M48 -8 C48,-8 48,8 48,8 C48,10.21 46.21,12 44,12 C44,12 -44,12 -44,12 C-46.21,12 -48,10.21 -48,8 C-48,8 -48,-8 -48,-8 C-48,-10.21 -46.21,-12 -44,-12 C-44,-12 44,-12 44,-12 C46.21,-12 48,-10.21 48,-8c "/>
-                    </group>
-                    <group android:name="_R_G_L_5_G_L_9_G" android:translateX="264" android:translateY="441" android:scaleY="0">
-                        <path android:name="_R_G_L_5_G_L_9_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M48 -8 C48,-8 48,8 48,8 C48,10.21 46.21,12 44,12 C44,12 -44,12 -44,12 C-46.21,12 -48,10.21 -48,8 C-48,8 -48,-8 -48,-8 C-48,-10.21 -46.21,-12 -44,-12 C-44,-12 44,-12 44,-12 C46.21,-12 48,-10.21 48,-8c "/>
-                    </group>
-                    <group android:name="_R_G_L_5_G_L_8_G" android:translateX="206" android:translateY="380" android:scaleY="0">
-                        <path android:name="_R_G_L_5_G_L_8_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M176 0 C176,0 176,0 176,0 C176,14.9 163.9,27 149,27 C149,27 -149,27 -149,27 C-163.9,27 -176,14.9 -176,0 C-176,0 -176,0 -176,0 C-176,-14.9 -163.9,-27 -149,-27 C-149,-27 149,-27 149,-27 C163.9,-27 176,-14.9 176,0c "/>
-                        <path android:name="_R_G_L_5_G_L_8_G_D_1_P_0" android:strokeColor="#bdc1c6" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="4" android:strokeAlpha="1" android:pathData=" M176 0 C176,0 176,0 176,0 C176,14.9 163.9,27 149,27 C149,27 -149,27 -149,27 C-163.9,27 -176,14.9 -176,0 C-176,0 -176,0 -176,0 C-176,-14.9 -163.9,-27 -149,-27 C-149,-27 149,-27 149,-27 C163.9,-27 176,-14.9 176,0c "/>
-                    </group>
-                    <group android:name="_R_G_L_5_G_L_7_G" android:translateX="120" android:translateY="268" android:scaleY="0">
-                        <path android:name="_R_G_L_5_G_L_7_G_D_0_P_0" android:fillColor="#4285f4" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M26 0 C26,0 26,0 26,0 C26,14.35 14.35,26 0,26 C0,26 0,26 0,26 C-14.35,26 -26,14.35 -26,0 C-26,0 -26,0 -26,0 C-26,-14.35 -14.35,-26 0,-26 C0,-26 0,-26 0,-26 C14.35,-26 26,-14.35 26,0c "/>
-                    </group>
-                    <group android:name="_R_G_L_5_G_L_6_G" android:translateX="167" android:translateY="278" android:scaleY="0">
-                        <path android:name="_R_G_L_5_G_L_6_G_D_0_P_0" android:fillColor="#e94235" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M17 0 C17,0 17,0 17,0 C17,9.38 9.38,17 0,17 C0,17 0,17 0,17 C-9.38,17 -17,9.38 -17,0 C-17,0 -17,0 -17,0 C-17,-9.38 -9.38,-17 0,-17 C0,-17 0,-17 0,-17 C9.38,-17 17,-9.38 17,0c "/>
-                    </group>
-                    <group android:name="_R_G_L_5_G_L_5_G" android:translateX="205" android:translateY="278" android:scaleY="0">
-                        <path android:name="_R_G_L_5_G_L_5_G_D_0_P_0" android:fillColor="#fabb05" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M17 0 C17,0 17,0 17,0 C17,9.38 9.38,17 0,17 C0,17 0,17 0,17 C-9.38,17 -17,9.38 -17,0 C-17,0 -17,0 -17,0 C-17,-9.38 -9.38,-17 0,-17 C0,-17 0,-17 0,-17 C9.38,-17 17,-9.38 17,0c "/>
-                    </group>
-                    <group android:name="_R_G_L_5_G_L_4_G" android:translateX="243" android:translateY="286" android:scaleY="0">
-                        <path android:name="_R_G_L_5_G_L_4_G_D_0_P_0" android:fillColor="#4285f4" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M17 -8 C17,-8 17,8 17,8 C17,17.38 9.38,25 0,25 C0,25 0,25 0,25 C-9.38,25 -17,17.38 -17,8 C-17,8 -17,-8 -17,-8 C-17,-17.38 -9.38,-25 0,-25 C0,-25 0,-25 0,-25 C9.38,-25 17,-17.38 17,-8c "/>
-                    </group>
-                    <group android:name="_R_G_L_5_G_L_3_G" android:translateX="272" android:translateY="269" android:scaleY="0">
-                        <path android:name="_R_G_L_5_G_L_3_G_D_0_P_0" android:fillColor="#34a853" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M8 -17 C8,-17 8,17 8,17 C8,21.42 4.42,25 0,25 C0,25 0,25 0,25 C-4.42,25 -8,21.42 -8,17 C-8,17 -8,-17 -8,-17 C-8,-21.42 -4.42,-25 0,-25 C0,-25 0,-25 0,-25 C4.42,-25 8,-21.42 8,-17c "/>
-                    </group>
-                    <group android:name="_R_G_L_5_G_L_2_G" android:translateX="301" android:translateY="278" android:scaleY="0">
-                        <path android:name="_R_G_L_5_G_L_2_G_D_0_P_0" android:fillColor="#e94235" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M17 0 C17,0 17,0 17,0 C17,9.38 9.38,17 0,17 C0,17 0,17 0,17 C-9.38,17 -17,9.38 -17,0 C-17,0 -17,0 -17,0 C-17,-9.38 -9.38,-17 0,-17 C0,-17 0,-17 0,-17 C9.38,-17 17,-9.38 17,0c "/>
-                    </group>
-                    <group android:name="_R_G_L_5_G_L_1_G" android:translateX="42" android:translateY="140" android:scaleY="0">
-                        <path android:name="_R_G_L_5_G_L_1_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M12 -8 C12,-8 12,8 12,8 C12,10.21 10.21,12 8,12 C8,12 -8,12 -8,12 C-10.21,12 -12,10.21 -12,8 C-12,8 -12,-8 -12,-8 C-12,-10.21 -10.21,-12 -8,-12 C-8,-12 8,-12 8,-12 C10.21,-12 12,-10.21 12,-8c "/>
-                    </group>
-                    <group android:name="_R_G_L_5_G_L_0_G" android:translateX="92.5" android:translateY="140" android:scaleY="0">
-                        <path android:name="_R_G_L_5_G_L_0_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M28.5 -5 C28.5,-5 28.5,5 28.5,5 C28.5,7.21 26.71,9 24.5,9 C24.5,9 -24.5,9 -24.5,9 C-26.71,9 -28.5,7.21 -28.5,5 C-28.5,5 -28.5,-5 -28.5,-5 C-28.5,-7.21 -26.71,-9 -24.5,-9 C-24.5,-9 24.5,-9 24.5,-9 C26.71,-9 28.5,-7.21 28.5,-5c "/>
-                    </group>
-                </group>
-                <group android:name="_R_G_L_4_G" android:translateX="206" android:translateY="877">
-                    <path android:name="_R_G_L_4_G_D_0_P_0" android:fillColor="#373737" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M40 0 C40,0 40,0 40,0 C40,1.1 39.1,2 38,2 C38,2 -38,2 -38,2 C-39.1,2 -40,1.1 -40,0 C-40,0 -40,0 -40,0 C-40,-1.1 -39.1,-2 -38,-2 C-38,-2 38,-2 38,-2 C39.1,-2 40,-1.1 40,0c "/>
-                </group>
-                <group android:name="_R_G_L_3_G">
-                    <group android:name="_R_G_L_3_G_L_1_G" android:translateX="206" android:translateY="50.5">
-                        <path android:name="_R_G_L_3_G_L_1_G_D_0_P_0" android:fillColor="#202124" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -50.5 C206,-50.5 206,50.5 206,50.5 C206,50.5 -206,50.5 -206,50.5 C-206,50.5 -206,-50.5 -206,-50.5 C-206,-50.5 206,-50.5 206,-50.5c "/>
-                    </group>
-                    <group android:name="_R_G_L_3_G_L_0_G" android:translateX="206" android:translateY="66.5">
-                        <path android:name="_R_G_L_3_G_L_0_G_D_0_P_0" android:fillColor="#3c4043" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M190 0 C190,0 190,0 190,0 C190,10.21 181.71,18.5 171.5,18.5 C171.5,18.5 -171.5,18.5 -171.5,18.5 C-181.71,18.5 -190,10.21 -190,0 C-190,0 -190,0 -190,0 C-190,-10.21 -181.71,-18.5 -171.5,-18.5 C-171.5,-18.5 171.5,-18.5 171.5,-18.5 C181.71,-18.5 190,-10.21 190,0c "/>
-                    </group>
-                </group>
-                <group android:name="_R_G_L_2_G" android:translateX="382.824" android:translateY="462.5" android:scaleX="-1" android:scaleY="0">
-                    <group android:name="_R_G_L_2_G_D_0_P_0_G_0_T_0" android:translateX="-60" android:translateY="0">
-                        <path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="#000000" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M28.25 0 C28.25,31.2 2.95,56.5 -28.25,56.5 C-28.25,56.5 -28.25,-56.5 -28.25,-56.5 C2.95,-56.5 28.25,-31.2 28.25,0c "/>
-                    </group>
-                </group>
-                <group android:name="_R_G_L_1_G" android:translateX="414.087" android:translateY="463" android:scaleX="0.5" android:scaleY="0" android:rotation="180">
-                    <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="#ffffff" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M3.87 -13.45 C3.07,-14.21 1.8,-14.18 1.04,-13.38 C0.28,-12.58 0.31,-11.31 1.11,-10.55 C1.11,-10.55 9.75,-2.32 9.75,-2.32 C9.75,-2.32 -14.75,-2.32 -14.75,-2.32 C-15.85,-2.32 -16.75,-1.43 -16.75,-0.32 C-16.75,0.78 -15.85,1.68 -14.75,1.68 C-14.75,1.68 9.94,1.68 9.94,1.68 C9.94,1.68 1.07,10.59 1.07,10.59 C0.29,11.37 0.29,12.64 1.08,13.42 C1.86,14.2 3.13,14.19 3.9,13.41 C3.9,13.41 16.17,1.09 16.17,1.09 C16.55,0.71 16.76,0.19 16.75,-0.35 C16.74,-0.89 16.52,-1.4 16.13,-1.77 C16.13,-1.77 3.87,-13.45 3.87,-13.45c "/>
-                </group>
-                <group android:name="_R_G_L_0_G_N_1_T_0" android:translateX="206" android:translateY="446" android:scaleX="-1" android:scaleY="0">
-                    <group android:name="_R_G_L_0_G" android:translateX="-336.003" android:translateY="-48.003">
-                        <group android:name="_R_G_L_0_G_L_2_G" android:translateX="295.995" android:translateY="63.997" android:scaleY="0">
-                            <path android:name="_R_G_L_0_G_L_2_G_D_0_P_0" android:fillColor="#baf29d" android:fillAlpha="0.3" android:fillType="nonZero" android:pathData=" M-166 64 C-130.65,64 -102,35.35 -102,0 C-102,-35.34 -130.65,-64 -166,-64 C-201.34,-64 -230,-35.34 -230,0 C-230,35.35 -201.34,64 -166,64c "/>
-                        </group>
-                        <group android:name="_R_G_L_0_G_L_1_G" android:translateX="192" android:translateY="63.997" android:rotation="90" android:scaleX="-1" android:scaleY="0">
-                            <path android:name="_R_G_L_0_G_L_1_G_D_0_P_0" android:fillColor="#baf29d" android:fillAlpha="0.3" android:fillType="nonZero" android:pathData=" M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c "/>
-                        </group>
-                        <group android:name="_R_G_L_0_G_L_0_G" android:translateX="295.995" android:translateY="63.997" android:scaleY="0">
-                            <group android:name="_R_G_L_0_G_L_0_G_D_0_P_0_G_0_T_0" android:translateX="-166" android:translateY="0">
-                                <path android:name="_R_G_L_0_G_L_0_G_D_0_P_0" android:fillColor="#baf29d" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 64 C35.35,64 64,35.35 64,0 C64,-35.34 35.35,-64 0,-64 C-35.34,-64 -64,-35.34 -64,0 C-64,35.35 -35.34,64 0,64c "/>
-                            </group>
-                        </group>
-                    </group>
-                </group>
-            </group>
-            <group android:name="time_group"/>
-        </vector>
-    </aapt:attr>
-    <target android:name="_R_G_L_6_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_6_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2283" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_6_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_6_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2283" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_6_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_6_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2267" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_6_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleX" android:duration="2133" android:startOffset="0" android:valueFrom="1" android:valueTo="1" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="2133" android:startOffset="0" android:valueFrom="1" android:valueTo="1" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="283" android:startOffset="2133" android:valueFrom="1" android:valueTo="0.88012" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="283" android:startOffset="2133" android:valueFrom="1" android:valueTo="0.88012" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_6_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_6_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2417" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_5_G_L_11_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2333" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_5_G_L_10_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2433" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_5_G_L_9_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2433" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_5_G_L_8_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_5_G_L_7_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2367" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_5_G_L_6_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2367" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_5_G_L_5_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2367" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_5_G_L_4_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2367" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_5_G_L_3_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2367" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_5_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2367" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_5_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2333" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_5_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2333" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_5_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2333" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_D_0_P_0_G_0_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="translateXY" android:duration="1133" android:startOffset="0" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -60,0C -50.167,0 -69.833,0 -60,0">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="667" android:startOffset="1133" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -60,0C -50.167,0 -10.833,0 -1,0">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="333" android:startOffset="1800" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -1,0C -1,0 -1,0 -1,0">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0.333 0,0 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="333" android:startOffset="2133" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -1,0C -10.833,0 -50.167,0 -60,0">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1133" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2467" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="translateXY" android:duration="1133" android:startOffset="0" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 414.087,463C 409.087,463 419.087,463 414.087,463">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="583" android:startOffset="1133" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 414.087,463C 409.087,463 389.087,463 384.087,463">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="417" android:startOffset="1717" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 384.087,463C 384.087,463 384.087,463 384.087,463">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0.333 0.667,0.667 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="333" android:startOffset="2133" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 384.087,463C 389.087,463 409.087,463 414.087,463">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleX" android:duration="1300" android:startOffset="0" android:valueFrom="0.5" android:valueTo="0.5" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="1300" android:startOffset="0" android:valueFrom="0.5" android:valueTo="0.5" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="417" android:startOffset="1300" android:valueFrom="0.5" android:valueTo="1" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="417" android:startOffset="1300" android:valueFrom="0.5" android:valueTo="1" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="417" android:startOffset="1717" android:valueFrom="1" android:valueTo="1" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="417" android:startOffset="1717" android:valueFrom="1" android:valueTo="1" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="200" android:startOffset="2133" android:valueFrom="1" android:valueTo="0.5" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="200" android:startOffset="2133" android:valueFrom="1" android:valueTo="0.5" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1300" android:valueFrom="0" android:valueTo="0.5" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2333" android:valueFrom="0.5" android:valueTo="0" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="867" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1033" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_1_G_D_0_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="pathData" android:duration="167" android:startOffset="867" android:valueFrom="M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c " android:valueTo="M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c " android:valueType="pathType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.508,0 0.487,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="pathData" android:duration="467" android:startOffset="1033" android:valueFrom="M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c " android:valueTo="M0 167.99 C35.35,167.99 64,139.34 64,104 C64,104 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,104 -64,104 C-64,139.34 -35.34,167.99 0,167.99c " android:valueType="pathType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.508,0 0.487,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1033" android:valueFrom="0" android:valueTo="-1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2267" android:valueFrom="-1" android:valueTo="0" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_0_G_D_0_P_0_G_0_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="translateXY" android:duration="167" android:startOffset="867" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -166,0C -138.333,0 -193.667,0 -166,0">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.508,0 0.487,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="467" android:startOffset="1033" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -166,0C -138.333,0 -27.667,0 0,0">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.508,0 0.487,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="867" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2267" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_N_1_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="867" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_N_1_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2267" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="time_group">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="translateX" android:duration="4017" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_home.xml b/quickstep/res/drawable/gesture_tutorial_home.xml
deleted file mode 100644
index e77eb7401f..0000000000
--- a/quickstep/res/drawable/gesture_tutorial_home.xml
+++ /dev/null
@@ -1,394 +0,0 @@
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt">
-    <aapt:attr name="android:drawable">
-        <vector android:height="892dp" android:width="412dp" android:viewportHeight="892" android:viewportWidth="412">
-            <group android:name="_R_G">
-                <group android:name="_R_G_L_4_G" android:translateX="206" android:translateY="877">
-                    <path android:name="_R_G_L_4_G_D_0_P_0" android:fillColor="#373737" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M40 0 C40,0 40,0 40,0 C40,1.1 39.1,2 38,2 C38,2 -38,2 -38,2 C-39.1,2 -40,1.1 -40,0 C-40,0 -40,0 -40,0 C-40,-1.1 -39.1,-2 -38,-2 C-38,-2 38,-2 38,-2 C39.1,-2 40,-1.1 40,0c "/>
-                </group>
-                <group android:name="_R_G_L_3_G">
-                    <path android:name="_R_G_L_3_G_S" android:fillColor="#000000" android:pathData="M0,0 L412,0 L412,892 L0,892z"/>
-                </group>
-                <group android:name="_R_G_L_2_G" android:scaleY="0">
-                    <group android:name="_R_G_L_2_G_L_5_G" android:translateX="206" android:translateY="872" android:scaleY="0">
-                        <path android:name="_R_G_L_2_G_L_5_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M40 0 C40,0 40,0 40,0 C40,1.1 39.1,2 38,2 C38,2 -38,2 -38,2 C-39.1,2 -40,1.1 -40,0 C-40,0 -40,0 -40,0 C-40,-1.1 -39.1,-2 -38,-2 C-38,-2 38,-2 38,-2 C39.1,-2 40,-1.1 40,0c "/>
-                    </group>
-                    <group android:name="_R_G_L_2_G_L_4_G" android:translateX="206" android:translateY="776" android:scaleY="0">
-                        <path android:name="_R_G_L_2_G_L_4_G_D_0_P_0" android:fillColor="#3c4043" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M180 0 C180,0 180,0 180,0 C180,13.8 168.8,25 155,25 C155,25 -155,25 -155,25 C-168.8,25 -180,13.8 -180,0 C-180,0 -180,0 -180,0 C-180,-13.8 -168.8,-25 -155,-25 C-155,-25 155,-25 155,-25 C168.8,-25 180,-13.8 180,0c "/>
-                    </group>
-                    <group android:name="_R_G_L_2_G_L_3_G" android:translateX="56" android:translateY="673" android:scaleY="0">
-                        <path android:name="_R_G_L_2_G_L_3_G_D_0_P_0" android:fillColor="#8ab4f8" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 -30 C16.56,-30 30,-16.56 30,0 C30,16.56 16.56,30 0,30 C-16.56,30 -30,16.56 -30,0 C-30,-16.56 -16.56,-30 0,-30c "/>
-                    </group>
-                    <group android:name="_R_G_L_2_G_L_2_G" android:translateX="156" android:translateY="673" android:scaleY="0">
-                        <path android:name="_R_G_L_2_G_L_2_G_D_0_P_0" android:fillColor="#f28b82" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 -30 C16.56,-30 30,-16.56 30,0 C30,16.56 16.56,30 0,30 C-16.56,30 -30,16.56 -30,0 C-30,-16.56 -16.56,-30 0,-30c "/>
-                    </group>
-                    <group android:name="_R_G_L_2_G_L_1_G" android:translateX="256" android:translateY="673" android:scaleY="0">
-                        <path android:name="_R_G_L_2_G_L_1_G_D_0_P_0" android:fillColor="#fdd663" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 -30 C16.56,-30 30,-16.56 30,0 C30,16.56 16.56,30 0,30 C-16.56,30 -30,16.56 -30,0 C-30,-16.56 -16.56,-30 0,-30c "/>
-                    </group>
-                    <group android:name="_R_G_L_2_G_L_0_G" android:translateX="356" android:translateY="673" android:scaleY="0">
-                        <path android:name="_R_G_L_2_G_L_0_G_D_0_P_0" android:fillColor="#81c995" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 -30 C16.56,-30 30,-16.56 30,0 C30,16.56 16.56,30 0,30 C-16.56,30 -30,16.56 -30,0 C-30,-16.56 -16.56,-30 0,-30c "/>
-                    </group>
-                </group>
-                <group android:name="_R_G_L_1_G_N_1_T_0" android:translateX="206" android:translateY="446" android:scaleX="1" android:scaleY="1">
-                    <group android:name="_R_G_L_1_G" android:translateX="-206" android:translateY="-446">
-                        <group android:name="_R_G_L_1_G_L_4_G">
-                            <group android:name="_R_G_L_1_G_L_4_G_L_11_G" android:translateX="206" android:translateY="472.769" android:scaleX="0.87473" android:scaleY="0.98643">
-                                <path android:name="_R_G_L_1_G_L_4_G_L_11_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M235.5 -407 C235.5,-407 235.5,407 235.5,407 C235.5,416.93 227.43,425 217.5,425 C217.5,425 -217.5,425 -217.5,425 C-227.43,425 -235.5,416.93 -235.5,407 C-235.5,407 -235.5,-407 -235.5,-407 C-235.5,-416.93 -227.43,-425 -217.5,-425 C-217.5,-425 217.5,-425 217.5,-425 C227.43,-425 235.5,-416.93 235.5,-407c "/>
-                            </group>
-                            <group android:name="_R_G_L_1_G_L_4_G_L_10_G" android:translateX="182.5" android:translateY="831">
-                                <path android:name="_R_G_L_1_G_L_4_G_L_10_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M158.5 -7 C158.5,-7 158.5,7 158.5,7 C158.5,9.21 156.71,11 154.5,11 C154.5,11 -154.5,11 -154.5,11 C-156.71,11 -158.5,9.21 -158.5,7 C-158.5,7 -158.5,-7 -158.5,-7 C-158.5,-9.21 -156.71,-11 -154.5,-11 C-154.5,-11 154.5,-11 154.5,-11 C156.71,-11 158.5,-9.21 158.5,-7c "/>
-                            </group>
-                            <group android:name="_R_G_L_1_G_L_4_G_L_9_G" android:translateX="186" android:translateY="801">
-                                <path android:name="_R_G_L_1_G_L_4_G_L_9_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M162 -7 C162,-7 162,7 162,7 C162,9.21 160.21,11 158,11 C158,11 -158,11 -158,11 C-160.21,11 -162,9.21 -162,7 C-162,7 -162,-7 -162,-7 C-162,-9.21 -160.21,-11 -158,-11 C-158,-11 158,-11 158,-11 C160.21,-11 162,-9.21 162,-7c "/>
-                            </group>
-                            <group android:name="_R_G_L_1_G_L_4_G_L_8_G" android:translateX="119" android:translateY="755">
-                                <path android:name="_R_G_L_1_G_L_4_G_L_8_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M95 -7 C95,-7 95,7 95,7 C95,9.21 93.21,11 91,11 C91,11 -91,11 -91,11 C-93.21,11 -95,9.21 -95,7 C-95,7 -95,-7 -95,-7 C-95,-9.21 -93.21,-11 -91,-11 C-91,-11 91,-11 91,-11 C93.21,-11 95,-9.21 95,-7c "/>
-                            </group>
-                            <group android:name="_R_G_L_1_G_L_4_G_L_7_G" android:translateX="182.5" android:translateY="725">
-                                <path android:name="_R_G_L_1_G_L_4_G_L_7_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M158.5 -7 C158.5,-7 158.5,7 158.5,7 C158.5,9.21 156.71,11 154.5,11 C154.5,11 -154.5,11 -154.5,11 C-156.71,11 -158.5,9.21 -158.5,7 C-158.5,7 -158.5,-7 -158.5,-7 C-158.5,-9.21 -156.71,-11 -154.5,-11 C-154.5,-11 154.5,-11 154.5,-11 C156.71,-11 158.5,-9.21 158.5,-7c "/>
-                            </group>
-                            <group android:name="_R_G_L_1_G_L_4_G_L_6_G" android:translateX="197.5" android:translateY="695">
-                                <path android:name="_R_G_L_1_G_L_4_G_L_6_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M173.5 -7 C173.5,-7 173.5,7 173.5,7 C173.5,9.21 171.71,11 169.5,11 C169.5,11 -169.5,11 -169.5,11 C-171.71,11 -173.5,9.21 -173.5,7 C-173.5,7 -173.5,-7 -173.5,-7 C-173.5,-9.21 -171.71,-11 -169.5,-11 C-169.5,-11 169.5,-11 169.5,-11 C171.71,-11 173.5,-9.21 173.5,-7c "/>
-                            </group>
-                            <group android:name="_R_G_L_1_G_L_4_G_L_5_G" android:translateX="192" android:translateY="665">
-                                <path android:name="_R_G_L_1_G_L_4_G_L_5_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M168 -7 C168,-7 168,7 168,7 C168,9.21 166.21,11 164,11 C164,11 -164,11 -164,11 C-166.21,11 -168,9.21 -168,7 C-168,7 -168,-7 -168,-7 C-168,-9.21 -166.21,-11 -164,-11 C-164,-11 164,-11 164,-11 C166.21,-11 168,-9.21 168,-7c "/>
-                            </group>
-                            <group android:name="_R_G_L_1_G_L_4_G_L_4_G" android:translateX="105.5" android:translateY="360">
-                                <path android:name="_R_G_L_1_G_L_4_G_L_4_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M23.5 -2 C23.5,-2 23.5,2 23.5,2 C23.5,4.21 21.71,6 19.5,6 C19.5,6 -19.5,6 -19.5,6 C-21.71,6 -23.5,4.21 -23.5,2 C-23.5,2 -23.5,-2 -23.5,-2 C-23.5,-4.21 -21.71,-6 -19.5,-6 C-19.5,-6 19.5,-6 19.5,-6 C21.71,-6 23.5,-4.21 23.5,-2c "/>
-                            </group>
-                            <group android:name="_R_G_L_1_G_L_4_G_L_3_G" android:translateX="47.5" android:translateY="360">
-                                <path android:name="_R_G_L_1_G_L_4_G_L_3_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M23.5 -2 C23.5,-2 23.5,2 23.5,2 C23.5,4.21 21.71,6 19.5,6 C19.5,6 -19.5,6 -19.5,6 C-21.71,6 -23.5,4.21 -23.5,2 C-23.5,2 -23.5,-2 -23.5,-2 C-23.5,-4.21 -21.71,-6 -19.5,-6 C-19.5,-6 19.5,-6 19.5,-6 C21.71,-6 23.5,-4.21 23.5,-2c "/>
-                            </group>
-                            <group android:name="_R_G_L_1_G_L_4_G_L_2_G" android:translateX="142.5" android:translateY="328">
-                                <path android:name="_R_G_L_1_G_L_4_G_L_2_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M118.5 -14 C118.5,-14 118.5,14 118.5,14 C118.5,16.21 116.71,18 114.5,18 C114.5,18 -114.5,18 -114.5,18 C-116.71,18 -118.5,16.21 -118.5,14 C-118.5,14 -118.5,-14 -118.5,-14 C-118.5,-16.21 -116.71,-18 -114.5,-18 C-114.5,-18 114.5,-18 114.5,-18 C116.71,-18 118.5,-16.21 118.5,-14c "/>
-                            </group>
-                            <group android:name="_R_G_L_1_G_L_4_G_L_1_G" android:translateX="186" android:translateY="284">
-                                <path android:name="_R_G_L_1_G_L_4_G_L_1_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M162 -14 C162,-14 162,14 162,14 C162,16.21 160.21,18 158,18 C158,18 -158,18 -158,18 C-160.21,18 -162,16.21 -162,14 C-162,14 -162,-14 -162,-14 C-162,-16.21 -160.21,-18 -158,-18 C-158,-18 158,-18 158,-18 C160.21,-18 162,-16.21 162,-14c "/>
-                            </group>
-                            <group android:name="_R_G_L_1_G_L_4_G_L_0_G" android:translateX="155" android:translateY="240">
-                                <path android:name="_R_G_L_1_G_L_4_G_L_0_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M131 -14 C131,-14 131,14 131,14 C131,16.21 129.21,18 127,18 C127,18 -127,18 -127,18 C-129.21,18 -131,16.21 -131,14 C-131,14 -131,-14 -131,-14 C-131,-16.21 -129.21,-18 -127,-18 C-127,-18 127,-18 127,-18 C129.21,-18 131,-16.21 131,-14c "/>
-                            </group>
-                        </group>
-                        <group android:name="_R_G_L_1_G_L_3_G" android:translateX="24" android:translateY="390">
-                            <group android:name="_R_G_L_1_G_L_3_G_L_7_G" android:translateX="182" android:translateY="120"/>
-                            <group android:name="_R_G_L_1_G_L_3_G_L_6_G" android:translateX="182" android:translateY="120">
-                                <path android:name="_R_G_L_1_G_L_3_G_L_6_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M182 -116 C182,-116 182,116 182,116 C182,118.21 180.21,120 178,120 C178,120 -178,120 -178,120 C-180.21,120 -182,118.21 -182,116 C-182,116 -182,-116 -182,-116 C-182,-118.21 -180.21,-120 -178,-120 C-178,-120 178,-120 178,-120 C180.21,-120 182,-118.21 182,-116c "/>
-                            </group>
-                            <group android:name="_R_G_L_1_G_L_3_G_L_5_G" android:translateX="77.322" android:translateY="150.552">
-                                <path android:name="_R_G_L_1_G_L_3_G_L_5_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 20.61 C0,20.61 -10.39,8.69 -10.39,8.69  M0 -6.11 C0,-6.11 -6.78,-15.61 -6.78,-15.61  M0 33.64 C0,33.64 8.26,17.67 8.26,17.67  M0 7.58 C0,7.58 8.26,-7.73 8.26,-7.73  M0 71.19 C0,71.19 0,-18.04 0,-18.04  M-30.22 37.18 C-30.22,37.18 0,-71.19 0,-71.19 C0,-71.19 30.22,37.18 30.22,37.18 C30.22,37.18 -30.22,37.18 -30.22,37.18c "/>
-                                <path android:name="_R_G_L_1_G_L_3_G_L_5_G_D_1_P_0" android:strokeColor="#9adcb2" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M0 20.61 C0,20.61 -10.39,8.69 -10.39,8.69  M0 -6.11 C0,-6.11 -6.78,-15.61 -6.78,-15.61  M0 33.64 C0,33.64 8.26,17.67 8.26,17.67  M0 7.58 C0,7.58 8.26,-7.73 8.26,-7.73  M0 71.19 C0,71.19 0,-18.04 0,-18.04  M-30.22 37.18 C-30.22,37.18 0,-71.19 0,-71.19 C0,-71.19 30.22,37.18 30.22,37.18 C30.22,37.18 -30.22,37.18 -30.22,37.18c "/>
-                            </group>
-                            <group android:name="_R_G_L_1_G_L_3_G_L_4_G" android:translateX="38.772" android:translateY="121.73">
-                                <path android:name="_R_G_L_1_G_L_3_G_L_4_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 28.82 C0,28.82 -14.52,12.18 -14.52,12.18  M0 -8.58 C0,-8.58 -9.51,-21.75 -9.51,-21.75  M0 47.01 C0,47.01 11.57,24.7 11.57,24.7  M0 10.64 C0,10.64 11.57,-10.78 11.57,-10.78  M0 99.42 C0,99.42 0,-25.21 0,-25.21  M-31.92 51.94 C-31.92,51.94 0,-99.42 0,-99.42 C0,-99.42 31.92,51.94 31.92,51.94 C31.92,51.94 -31.92,51.94 -31.92,51.94c "/>
-                                <path android:name="_R_G_L_1_G_L_3_G_L_4_G_D_1_P_0" android:strokeColor="#9adcb2" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M0 28.82 C0,28.82 -14.52,12.18 -14.52,12.18  M0 -8.58 C0,-8.58 -9.51,-21.75 -9.51,-21.75  M0 47.01 C0,47.01 11.57,24.7 11.57,24.7  M0 10.64 C0,10.64 11.57,-10.78 11.57,-10.78  M0 99.42 C0,99.42 0,-25.21 0,-25.21  M-31.92 51.94 C-31.92,51.94 0,-99.42 0,-99.42 C0,-99.42 31.92,51.94 31.92,51.94 C31.92,51.94 -31.92,51.94 -31.92,51.94c "/>
-                            </group>
-                            <group android:name="_R_G_L_1_G_L_3_G_L_3_G" android:translateX="183" android:translateY="222">
-                                <path android:name="_R_G_L_1_G_L_3_G_L_3_G_D_0_P_0" android:fillColor="#000000" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M170 0 C170,0 -170,0 -170,0 "/>
-                                <path android:name="_R_G_L_1_G_L_3_G_L_3_G_D_1_P_0" android:strokeColor="#9aa0a6" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="4" android:strokeAlpha="1" android:pathData=" M170 0 C170,0 -170,0 -170,0 "/>
-                            </group>
-                            <group android:name="_R_G_L_1_G_L_3_G_L_2_G" android:translateX="265.619" android:translateY="162.331">
-                                <path android:name="_R_G_L_1_G_L_3_G_L_2_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M-34.05 50.06 C-34.05,50.06 -34.05,-49.25 -34.05,-49.25  M-34.05 -49.55 C-34.05,-49.55 17.54,50.06 17.54,50.06 C17.54,50.06 84.62,50.06 84.62,50.06 C84.62,50.06 32.65,-50.06 32.65,-50.06 C32.65,-50.06 -34.05,-50.06 -34.05,-50.06 C-34.05,-50.06 -84.62,50.06 -84.62,50.06 C-84.62,50.06 17.54,50.06 17.54,50.06 "/>
-                                <path android:name="_R_G_L_1_G_L_3_G_L_2_G_D_1_P_0" android:strokeColor="#a8cbfe" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M-34.05 50.06 C-34.05,50.06 -34.05,-49.25 -34.05,-49.25  M-34.05 -49.55 C-34.05,-49.55 17.54,50.06 17.54,50.06 C17.54,50.06 84.62,50.06 84.62,50.06 C84.62,50.06 32.65,-50.06 32.65,-50.06 C32.65,-50.06 -34.05,-50.06 -34.05,-50.06 C-34.05,-50.06 -84.62,50.06 -84.62,50.06 C-84.62,50.06 17.54,50.06 17.54,50.06 "/>
-                            </group>
-                            <group android:name="_R_G_L_1_G_L_3_G_L_1_G" android:translateX="319.271" android:translateY="37.945">
-                                <path android:name="_R_G_L_1_G_L_3_G_L_1_G_D_0_P_0" android:fillColor="#feefc3" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M13.42 2.99 C14.95,-4.17 9.93,-11.31 2.21,-12.96 C-0.9,-13.62 -3.97,-13.3 -6.64,-12.2 C-6.58,-12.19 -6.53,-12.18 -6.48,-12.17 C-1.03,-11.01 2.52,-5.97 1.44,-0.92 C0.36,4.13 -4.94,7.28 -10.4,6.12 C-11.6,5.86 -12.7,5.42 -13.69,4.83 C-11.9,8.78 -8.15,11.93 -3.34,12.96 C4.38,14.61 11.88,10.14 13.42,2.99c "/>
-                            </group>
-                            <group android:name="_R_G_L_1_G_L_3_G_L_0_G" android:translateX="179.5" android:translateY="73.351">
-                                <path android:name="_R_G_L_1_G_L_3_G_L_0_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M51.08 -40.95 C51.08,-40.95 50.55,-42.54 50.55,-42.54 C50.55,-42.54 49.67,-41.13 49.67,-41.13 C49.67,-41.13 48.17,-41.21 48.17,-41.21 C48.17,-41.21 49.05,-39.8 49.05,-39.8 C49.05,-39.8 48.61,-38.22 48.61,-38.22 C48.61,-38.22 50.02,-38.74 50.02,-38.74 C50.02,-38.74 51.35,-37.69 51.35,-37.69 C51.35,-37.69 51.26,-39.45 51.26,-39.45 C51.26,-39.45 52.59,-40.42 52.59,-40.42 C52.59,-40.42 51.08,-40.95 51.08,-40.95c  M8.78 30.58 C8.78,30.58 8.25,28.99 8.25,28.99 C8.25,28.99 7.37,30.4 7.37,30.4 C7.37,30.4 5.87,30.31 5.87,30.31 C5.87,30.31 6.75,31.72 6.75,31.72 C6.75,31.72 6.31,33.31 6.31,33.31 C6.31,33.31 7.72,32.78 7.72,32.78 C7.72,32.78 9.05,33.84 9.05,33.84 C9.05,33.84 8.96,32.08 8.96,32.08 C8.96,32.08 10.29,31.11 10.29,31.11 C10.29,31.11 8.78,30.58 8.78,30.58c  M19.38 -61.67 C19.38,-61.67 18.94,-63.35 18.94,-63.35 C18.94,-63.35 17.97,-61.94 17.97,-61.94 C17.97,-61.94 16.47,-61.94 16.47,-61.94 C16.47,-61.94 17.35,-60.62 17.35,-60.62 C17.35,-60.62 16.91,-58.94 16.91,-58.94 C16.91,-58.94 18.41,-59.56 18.41,-59.56 C18.41,-59.56 19.65,-58.5 19.65,-58.5 C19.65,-58.5 19.56,-60.18 19.56,-60.18 C19.56,-60.18 20.88,-61.23 20.88,-61.23 C20.88,-61.23 19.38,-61.67 19.38,-61.67c  M-32.98 35.08 C-32.98,35.08 -33.51,33.4 -33.51,33.4 C-33.51,33.4 -34.4,34.81 -34.4,34.81 C-34.4,34.81 -35.9,34.81 -35.9,34.81 C-35.9,34.81 -35.01,36.22 -35.01,36.22 C-35.01,36.22 -35.45,37.81 -35.45,37.81 C-35.45,37.81 -34.04,37.28 -34.04,37.28 C-34.04,37.28 -32.72,38.25 -32.72,38.25 C-32.72,38.25 -32.81,36.58 -32.81,36.58 C-32.81,36.58 -31.48,35.6 -31.48,35.6 C-31.48,35.6 -32.98,35.08 -32.98,35.08c  M45.34 7.56 C45.34,7.56 44.81,5.97 44.81,5.97 C44.81,5.97 43.93,7.38 43.93,7.38 C43.93,7.38 42.34,7.3 42.34,7.3 C42.34,7.3 43.31,8.71 43.31,8.71 C43.31,8.71 42.87,10.29 42.87,10.29 C42.87,10.29 44.28,9.77 44.28,9.77 C44.28,9.77 45.52,10.82 45.52,10.82 C45.52,10.82 45.52,9.06 45.52,9.06 C45.52,9.06 46.76,8.09 46.76,8.09 C46.76,8.09 45.34,7.56 45.34,7.56c  M-9.59 -41.67 C-9.59,-41.67 -10.12,-43.35 -10.12,-43.35 C-10.12,-43.35 -11,-41.94 -11,-41.94 C-11,-41.94 -12.5,-41.94 -12.5,-41.94 C-12.5,-41.94 -11.62,-40.62 -11.62,-40.62 C-11.62,-40.62 -12.06,-38.94 -12.06,-38.94 C-12.06,-38.94 -10.65,-39.56 -10.65,-39.56 C-10.65,-39.56 -9.32,-38.5 -9.32,-38.5 C-9.32,-38.5 -9.41,-40.26 -9.41,-40.26 C-9.41,-40.26 -8.09,-41.23 -8.09,-41.23 C-8.09,-41.23 -9.59,-41.67 -9.59,-41.67c  M97.74 -23.97 C97.74,-23.97 97.03,-26.35 97.03,-26.35 C97.03,-26.35 95.8,-24.32 95.8,-24.32 C95.8,-24.32 93.5,-24.32 93.5,-24.32 C93.5,-24.32 94.91,-22.38 94.91,-22.38 C94.91,-22.38 94.21,-20 94.21,-20 C94.21,-20 96.33,-20.88 96.33,-20.88 C96.33,-20.88 98.09,-19.38 98.09,-19.38 C98.09,-19.38 98.09,-21.85 98.09,-21.85 C98.09,-21.85 99.86,-23.26 99.86,-23.26 C99.86,-23.26 97.74,-23.97 97.74,-23.97c  M167.29 43.28 C167.29,43.28 166.67,40.9 166.67,40.9 C166.67,40.9 165.35,42.93 165.35,42.93 C165.35,42.93 163.14,42.93 163.14,42.93 C163.14,42.93 164.47,44.87 164.47,44.87 C164.47,44.87 163.76,47.25 163.76,47.25 C163.76,47.25 165.88,46.37 165.88,46.37 C165.88,46.37 167.73,47.87 167.73,47.87 C167.73,47.87 167.65,45.4 167.65,45.4 C167.65,45.4 169.5,43.98 169.5,43.98 C169.5,43.98 167.29,43.28 167.29,43.28c  M-1.1 -1.79 C-1.1,-1.79 -1.72,-4.08 -1.72,-4.08 C-1.72,-4.08 -3.05,-2.14 -3.05,-2.14 C-3.05,-2.14 -5.25,-2.14 -5.25,-2.14 C-5.25,-2.14 -3.93,-0.11 -3.93,-0.11 C-3.93,-0.11 -4.64,2.18 -4.64,2.18 C-4.64,2.18 -2.52,1.38 -2.52,1.38 C-2.52,1.38 -0.66,2.8 -0.66,2.8 C-0.66,2.8 -0.75,0.41 -0.75,0.41 C-0.75,0.41 1.1,-1.08 1.1,-1.08 C1.1,-1.08 -1.1,-1.79 -1.1,-1.79c  M-60.89 -5.23 C-60.89,-5.23 -61.59,-7.61 -61.59,-7.61 C-61.59,-7.61 -62.83,-5.58 -62.83,-5.58 C-62.83,-5.58 -65.13,-5.58 -65.13,-5.58 C-65.13,-5.58 -63.71,-3.64 -63.71,-3.64 C-63.71,-3.64 -64.42,-1.26 -64.42,-1.26 C-64.42,-1.26 -62.39,-2.14 -62.39,-2.14 C-62.39,-2.14 -60.53,-0.64 -60.53,-0.64 C-60.53,-0.64 -60.62,-3.11 -60.62,-3.11 C-60.62,-3.11 -58.77,-4.52 -58.77,-4.52 C-58.77,-4.52 -60.89,-5.23 -60.89,-5.23c  M-165.26 -10.97 C-165.26,-10.97 -165.97,-13.35 -165.97,-13.35 C-165.97,-13.35 -167.29,-11.32 -167.29,-11.32 C-167.29,-11.32 -169.5,-11.32 -169.5,-11.32 C-169.5,-11.32 -168.18,-9.38 -168.18,-9.38 C-168.18,-9.38 -168.88,-7 -168.88,-7 C-168.88,-7 -166.76,-7.79 -166.76,-7.79 C-166.76,-7.79 -164.91,-6.38 -164.91,-6.38 C-164.91,-6.38 -165,-8.85 -165,-8.85 C-165,-8.85 -163.14,-10.26 -163.14,-10.26 C-163.14,-10.26 -165.26,-10.97 -165.26,-10.97c  M-51.26 -42.98 C-51.26,-42.98 -54.09,-45.01 -54.09,-45.01 C-54.09,-45.01 -53.91,-41.57 -53.91,-41.57 C-53.91,-41.57 -56.65,-39.54 -56.65,-39.54 C-56.65,-39.54 -53.38,-38.57 -53.38,-38.57 C-53.38,-38.57 -52.32,-35.3 -52.32,-35.3 C-52.32,-35.3 -50.38,-38.13 -50.38,-38.13 C-50.38,-38.13 -46.94,-38.22 -46.94,-38.22 C-46.94,-38.22 -49.05,-40.86 -49.05,-40.86 C-49.05,-40.86 -47.99,-44.21 -47.99,-44.21 C-47.99,-44.21 -51.26,-42.98 -51.26,-42.98c  M-92.06 -47.92 C-92.06,-47.92 -92.59,-49.59 -92.59,-49.59 C-92.59,-49.59 -93.47,-48.18 -93.47,-48.18 C-93.47,-48.18 -95.06,-48.18 -95.06,-48.18 C-95.06,-48.18 -94.09,-46.86 -94.09,-46.86 C-94.09,-46.86 -94.53,-45.18 -94.53,-45.18 C-94.53,-45.18 -93.12,-45.8 -93.12,-45.8 C-93.12,-45.8 -91.88,-44.74 -91.88,-44.74 C-91.88,-44.74 -91.88,-46.42 -91.88,-46.42 C-91.88,-46.42 -90.65,-47.47 -90.65,-47.47 C-90.65,-47.47 -92.06,-47.92 -92.06,-47.92c  M62.83 -13.34 C62.83,-13.34 62.39,-14.93 62.39,-14.93 C62.39,-14.93 61.5,-13.52 61.5,-13.52 C61.5,-13.52 59.91,-13.52 59.91,-13.52 C59.91,-13.52 60.89,-12.2 60.89,-12.2 C60.89,-12.2 60.36,-10.52 60.36,-10.52 C60.36,-10.52 61.86,-11.14 61.86,-11.14 C61.86,-11.14 63.09,-10.08 63.09,-10.08 C63.09,-10.08 63.09,-11.84 63.09,-11.84 C63.09,-11.84 64.33,-12.81 64.33,-12.81 C64.33,-12.81 62.83,-13.34 62.83,-13.34c  M-155.99 -40.95 C-155.99,-40.95 -156.43,-42.54 -156.43,-42.54 C-156.43,-42.54 -157.32,-41.13 -157.32,-41.13 C-157.32,-41.13 -158.91,-41.21 -158.91,-41.21 C-158.91,-41.21 -157.93,-39.8 -157.93,-39.8 C-157.93,-39.8 -158.46,-38.22 -158.46,-38.22 C-158.46,-38.22 -156.96,-38.74 -156.96,-38.74 C-156.96,-38.74 -155.73,-37.69 -155.73,-37.69 C-155.73,-37.69 -155.73,-39.45 -155.73,-39.45 C-155.73,-39.45 -154.49,-40.42 -154.49,-40.42 C-154.49,-40.42 -155.99,-40.95 -155.99,-40.95c  M141.24 26.52 C141.24,26.52 140.71,24.85 140.71,24.85 C140.71,24.85 139.83,26.26 139.83,26.26 C139.83,26.26 138.33,26.26 138.33,26.26 C138.33,26.26 139.21,27.67 139.21,27.67 C139.21,27.67 138.77,29.26 138.77,29.26 C138.77,29.26 140.18,28.73 140.18,28.73 C140.18,28.73 141.51,29.7 141.51,29.7 C141.51,29.7 141.42,28.02 141.42,28.02 C141.42,28.02 142.74,27.05 142.74,27.05 C142.74,27.05 141.24,26.52 141.24,26.52c  M111.4 -51.27 C111.4,-51.27 110.95,-52.94 110.95,-52.94 C110.95,-52.94 110.07,-51.53 110.07,-51.53 C110.07,-51.53 108.48,-51.53 108.48,-51.53 C108.48,-51.53 109.45,-50.21 109.45,-50.21 C109.45,-50.21 108.92,-48.53 108.92,-48.53 C108.92,-48.53 110.42,-49.15 110.42,-49.15 C110.42,-49.15 111.66,-48.09 111.66,-48.09 C111.66,-48.09 111.66,-49.86 111.66,-49.86 C111.66,-49.86 112.9,-50.83 112.9,-50.83 C112.9,-50.83 111.4,-51.27 111.4,-51.27c  M-66.59 53.33 C-66.59,53.33 -67.03,51.65 -67.03,51.65 C-67.03,51.65 -67.91,53.06 -67.91,53.06 C-67.91,53.06 -69.5,53.06 -69.5,53.06 C-69.5,53.06 -68.53,54.47 -68.53,54.47 C-68.53,54.47 -69.06,56.06 -69.06,56.06 C-69.06,56.06 -67.56,55.53 -67.56,55.53 C-67.56,55.53 -66.32,56.5 -66.32,56.5 C-66.32,56.5 -66.32,54.82 -66.32,54.82 C-66.32,54.82 -65.08,53.77 -65.08,53.77 C-65.08,53.77 -66.59,53.33 -66.59,53.33c  M-50.59 59.33 C-50.59,59.33 -51.12,57.65 -51.12,57.65 C-51.12,57.65 -52,59.06 -52,59.06 C-52,59.06 -53.5,59.06 -53.5,59.06 C-53.5,59.06 -52.62,60.38 -52.62,60.38 C-52.62,60.38 -53.06,62.06 -53.06,62.06 C-53.06,62.06 -51.65,61.53 -51.65,61.53 C-51.65,61.53 -50.32,62.5 -50.32,62.5 C-50.32,62.5 -50.41,60.82 -50.41,60.82 C-50.41,60.82 -49.08,59.77 -49.08,59.77 C-49.08,59.77 -50.59,59.33 -50.59,59.33c  M29.98 -16.08 C29.98,-16.08 29.27,-18.46 29.27,-18.46 C29.27,-18.46 27.95,-16.43 27.95,-16.43 C27.95,-16.43 25.74,-16.43 25.74,-16.43 C25.74,-16.43 27.06,-14.49 27.06,-14.49 C27.06,-14.49 26.36,-12.11 26.36,-12.11 C26.36,-12.11 28.48,-12.9 28.48,-12.9 C28.48,-12.9 30.33,-11.49 30.33,-11.49 C30.33,-11.49 30.24,-13.96 30.24,-13.96 C30.24,-13.96 32.1,-15.37 32.1,-15.37 C32.1,-15.37 29.98,-16.08 29.98,-16.08c  M81.28 55.98 C81.28,55.98 80.58,53.6 80.58,53.6 C80.58,53.6 79.25,55.63 79.25,55.63 C79.25,55.63 77.04,55.63 77.04,55.63 C77.04,55.63 78.37,57.57 78.37,57.57 C78.37,57.57 77.66,59.95 77.66,59.95 C77.66,59.95 79.78,59.07 79.78,59.07 C79.78,59.07 81.64,60.56 81.64,60.56 C81.64,60.56 81.55,58.1 81.55,58.1 C81.55,58.1 83.4,56.68 83.4,56.68 C83.4,56.68 81.28,55.98 81.28,55.98c  M-165.26 -10.97 C-165.26,-10.97 -165.97,-13.35 -165.97,-13.35 C-165.97,-13.35 -167.29,-11.32 -167.29,-11.32 C-167.29,-11.32 -169.5,-11.32 -169.5,-11.32 C-169.5,-11.32 -168.18,-9.38 -168.18,-9.38 C-168.18,-9.38 -168.88,-7 -168.88,-7 C-168.88,-7 -166.76,-7.79 -166.76,-7.79 C-166.76,-7.79 -164.91,-6.38 -164.91,-6.38 C-164.91,-6.38 -165,-8.85 -165,-8.85 C-165,-8.85 -163.14,-10.26 -163.14,-10.26 C-163.14,-10.26 -165.26,-10.97 -165.26,-10.97c  M-74.05 21.76 C-74.05,21.76 -74.66,19.47 -74.66,19.47 C-74.66,19.47 -75.99,21.49 -75.99,21.49 C-75.99,21.49 -78.2,21.41 -78.2,21.41 C-78.2,21.41 -76.87,23.43 -76.87,23.43 C-76.87,23.43 -77.58,25.73 -77.58,25.73 C-77.58,25.73 -75.46,24.93 -75.46,24.93 C-75.46,24.93 -73.6,26.43 -73.6,26.43 C-73.6,26.43 -73.69,23.96 -73.69,23.96 C-73.69,23.96 -71.84,22.46 -71.84,22.46 C-71.84,22.46 -74.05,21.76 -74.05,21.76c  M8.98 55.68 C8.98,55.68 6.15,53.65 6.15,53.65 C6.15,53.65 6.24,57.09 6.24,57.09 C6.24,57.09 3.5,59.12 3.5,59.12 C3.5,59.12 6.86,60.09 6.86,60.09 C6.86,60.09 7.92,63.35 7.92,63.35 C7.92,63.35 9.86,60.44 9.86,60.44 C9.86,60.44 13.3,60.44 13.3,60.44 C13.3,60.44 11.18,57.71 11.18,57.71 C11.18,57.71 12.15,54.44 12.15,54.44 C12.15,54.44 8.98,55.68 8.98,55.68c  M124.89 -2.41 C124.89,-2.41 122.06,-4.35 122.06,-4.35 C122.06,-4.35 122.24,-0.91 122.24,-0.91 C122.24,-0.91 119.5,1.12 119.5,1.12 C119.5,1.12 122.77,2 122.77,2 C122.77,2 123.83,5.26 123.83,5.26 C123.83,5.26 125.77,2.44 125.77,2.44 C125.77,2.44 129.21,2.44 129.21,2.44 C129.21,2.44 127.09,-0.29 127.09,-0.29 C127.09,-0.29 128.15,-3.56 128.15,-3.56 C128.15,-3.56 124.89,-2.41 124.89,-2.41c  M77.31 19.91 C77.31,19.91 74.57,17.88 74.57,17.88 C74.57,17.88 74.66,21.32 74.66,21.32 C74.66,21.32 71.92,23.35 71.92,23.35 C71.92,23.35 75.19,24.32 75.19,24.32 C75.19,24.32 76.34,27.58 76.34,27.58 C76.34,27.58 78.19,24.67 78.19,24.67 C78.19,24.67 81.64,24.67 81.64,24.67 C81.64,24.67 79.52,21.94 79.52,21.94 C79.52,21.94 80.58,18.67 80.58,18.67 C80.58,18.67 77.31,19.91 77.31,19.91c  M-28.11 7.68 C-28.11,7.68 -30.94,5.65 -30.94,5.65 C-30.94,5.65 -30.76,9.09 -30.76,9.09 C-30.76,9.09 -33.5,11.12 -33.5,11.12 C-33.5,11.12 -30.23,12.09 -30.23,12.09 C-30.23,12.09 -29.17,15.35 -29.17,15.35 C-29.17,15.35 -27.23,12.44 -27.23,12.44 C-27.23,12.44 -23.79,12.44 -23.79,12.44 C-23.79,12.44 -25.91,9.71 -25.91,9.71 C-25.91,9.71 -24.85,6.44 -24.85,6.44 C-24.85,6.44 -28.11,7.68 -28.11,7.68c  M-119.43 -20.22 C-119.43,-20.22 -122.26,-22.16 -122.26,-22.16 C-122.26,-22.16 -122.08,-18.72 -122.08,-18.72 C-122.08,-18.72 -124.82,-16.7 -124.82,-16.7 C-124.82,-16.7 -121.55,-15.81 -121.55,-15.81 C-121.55,-15.81 -120.49,-12.55 -120.49,-12.55 C-120.49,-12.55 -118.55,-15.37 -118.55,-15.37 C-118.55,-15.37 -115.11,-15.37 -115.11,-15.37 C-115.11,-15.37 -117.23,-18.11 -117.23,-18.11 C-117.23,-18.11 -116.17,-21.37 -116.17,-21.37 C-116.17,-21.37 -119.43,-20.22 -119.43,-20.22c "/>
-                            </group>
-                        </group>
-                        <group android:name="_R_G_L_1_G_L_2_G">
-                            <group android:name="_R_G_L_1_G_L_2_G_L_2_G" android:translateX="206" android:translateY="145">
-                                <path android:name="_R_G_L_1_G_L_2_G_L_2_G_D_0_P_0" android:fillColor="#e8eaed" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -95.63 C206,-95.63 206,42.37 206,42.37 C206,43.47 205.1,44.37 204,44.37 C204,44.37 -204,44.37 -204,44.37 C-205.1,44.37 -206,43.47 -206,42.37 C-206,42.37 -206,-95.63 -206,-95.63 C-206,-96.73 -205.1,-97.63 -204,-97.63 C-204,-97.63 204,-97.63 204,-97.63 C205.1,-97.63 206,-96.73 206,-95.63c "/>
-                            </group>
-                            <group android:name="_R_G_L_1_G_L_2_G_L_1_G" android:translateX="206" android:translateY="145">
-                                <path android:name="_R_G_L_1_G_L_2_G_L_1_G_D_0_P_0" android:fillColor="#80868b" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M109 -14 C109,-14 109,14 109,14 C109,15.1 108.1,16 107,16 C107,16 -107,16 -107,16 C-108.1,16 -109,15.1 -109,14 C-109,14 -109,-14 -109,-14 C-109,-15.1 -108.1,-16 -107,-16 C-107,-16 107,-16 107,-16 C108.1,-16 109,-15.1 109,-14c "/>
-                            </group>
-                            <group android:name="_R_G_L_1_G_L_2_G_L_0_G" android:translateX="46" android:translateY="145">
-                                <path android:name="_R_G_L_1_G_L_2_G_L_0_G_D_0_P_0" android:fillColor="#80868b" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M22 -14 C22,-14 22,14 22,14 C22,18.42 18.42,22 14,22 C14,22 -14,22 -14,22 C-18.42,22 -22,18.42 -22,14 C-22,14 -22,-14 -22,-14 C-22,-18.42 -18.42,-22 -14,-22 C-14,-22 14,-22 14,-22 C18.42,-22 22,-18.42 22,-14c "/>
-                            </group>
-                        </group>
-                        <group android:name="_R_G_L_1_G_L_1_G" android:translateX="206" android:translateY="877">
-                            <path android:name="_R_G_L_1_G_L_1_G_D_0_P_0" android:fillColor="#373737" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M40 0 C40,0 40,0 40,0 C40,1.1 39.1,2 38,2 C38,2 -38,2 -38,2 C-39.1,2 -40,1.1 -40,0 C-40,0 -40,0 -40,0 C-40,-1.1 -39.1,-2 -38,-2 C-38,-2 38,-2 38,-2 C39.1,-2 40,-1.1 40,0c "/>
-                        </group>
-                        <group android:name="_R_G_L_1_G_L_0_G">
-                            <group android:name="_R_G_L_1_G_L_0_G_L_2_G" android:translateX="206" android:translateY="51">
-                                <path android:name="_R_G_L_1_G_L_0_G_L_2_G_D_0_P_0" android:fillColor="#202124" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -0.27 C206,-0.27 206,49.73 206,49.73 C206,49.73 -206,49.73 -206,49.73 C-206,49.73 -206,-0.27 -206,-0.27 C-206,-0.27 206,-0.27 206,-0.27c "/>
-                            </group>
-                            <group android:name="_R_G_L_1_G_L_0_G_L_1_G" android:translateX="206" android:translateY="50.5">
-                                <path android:name="_R_G_L_1_G_L_0_G_L_1_G_D_0_P_0" android:fillColor="#202124" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -32.5 C206,-32.5 206,32.5 206,32.5 C206,42.43 197.93,50.5 188,50.5 C188,50.5 -188,50.5 -188,50.5 C-197.93,50.5 -206,42.43 -206,32.5 C-206,32.5 -206,-32.5 -206,-32.5 C-206,-42.43 -197.93,-50.5 -188,-50.5 C-188,-50.5 188,-50.5 188,-50.5 C197.93,-50.5 206,-42.43 206,-32.5c "/>
-                            </group>
-                            <group android:name="_R_G_L_1_G_L_0_G_L_0_G" android:translateX="206" android:translateY="66.5">
-                                <path android:name="_R_G_L_1_G_L_0_G_L_0_G_D_0_P_0" android:fillColor="#3c4043" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M190 0 C190,0 190,0 190,0 C190,10.21 181.71,18.5 171.5,18.5 C171.5,18.5 -171.5,18.5 -171.5,18.5 C-181.71,18.5 -190,10.21 -190,0 C-190,0 -190,0 -190,0 C-190,-10.21 -181.71,-18.5 -171.5,-18.5 C-171.5,-18.5 171.5,-18.5 171.5,-18.5 C181.71,-18.5 190,-10.21 190,0c "/>
-                            </group>
-                        </group>
-                    </group>
-                </group>
-                <group android:name="_R_G_L_0_G" android:translateX="-30" android:translateY="658.997" android:pivotX="300" android:pivotY="64" android:rotation="-90" android:scaleY="0">
-                    <group android:name="_R_G_L_0_G_L_2_G" android:translateX="295.995" android:translateY="63.997" android:scaleY="0">
-                        <path android:name="_R_G_L_0_G_L_2_G_D_0_P_0" android:fillColor="#baf29d" android:fillAlpha="0.3" android:fillType="nonZero" android:pathData=" M-166 64 C-130.65,64 -102,35.35 -102,0 C-102,-35.34 -130.65,-64 -166,-64 C-201.34,-64 -230,-35.34 -230,0 C-230,35.35 -201.34,64 -166,64c "/>
-                    </group>
-                    <group android:name="_R_G_L_0_G_L_1_G" android:translateX="192" android:translateY="63.997" android:rotation="90" android:scaleX="-1" android:scaleY="0">
-                        <path android:name="_R_G_L_0_G_L_1_G_D_0_P_0" android:fillColor="#baf29d" android:fillAlpha="0.3" android:fillType="nonZero" android:pathData=" M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c "/>
-                    </group>
-                    <group android:name="_R_G_L_0_G_L_0_G" android:translateX="295.995" android:translateY="63.997" android:scaleY="0">
-                        <group android:name="_R_G_L_0_G_L_0_G_D_0_P_0_G_0_T_0" android:translateX="-166" android:translateY="0">
-                            <path android:name="_R_G_L_0_G_L_0_G_D_0_P_0" android:fillColor="#baf29d" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 64 C35.35,64 64,35.35 64,0 C64,-35.34 35.35,-64 0,-64 C-35.34,-64 -64,-35.34 -64,0 C-64,35.35 -35.34,64 0,64c "/>
-                        </group>
-                    </group>
-                </group>
-            </group>
-            <group android:name="time_group"/>
-        </vector>
-    </aapt:attr>
-    <target android:name="_R_G_L_2_G_L_5_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1917" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_4_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="translateXY" android:duration="50" android:startOffset="1917" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 206,776C 206,776 206,776 206,776">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.27,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="700" android:startOffset="1967" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 206,776C 206,776 206,797 206,797">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.27,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_4_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1967" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_3_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="translateXY" android:duration="700" android:startOffset="1917" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 56,673C 56,673 56,706 56,706">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.27,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_3_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1917" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="translateXY" android:duration="700" android:startOffset="1917" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 156,673C 156,673 156,706 156,706">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.27,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1917" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="translateXY" android:duration="700" android:startOffset="1917" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 256,673C 256,673 256,706 256,706">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.27,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1917" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="translateXY" android:duration="700" android:startOffset="1917" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 356,673C 356,673 356,706 356,706">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.27,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1917" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1917" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G_N_1_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="translateXY" android:duration="1533" android:startOffset="0" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 206,446C 206,446 206,446 206,446">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.477,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="317" android:startOffset="1533" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 206,446C 206,446 206,354.603 206,354.603">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.477,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="300" android:startOffset="1850" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 206,354.603C 206,354.603 206,639 206,639">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.531,0.542 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G_N_1_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleX" android:duration="1533" android:startOffset="0" android:valueFrom="1" android:valueTo="1" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,0.833 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="1533" android:startOffset="0" android:valueFrom="1" android:valueTo="1" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,0.833 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="617" android:startOffset="1533" android:valueFrom="1" android:valueTo="0.16" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,0.833 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="617" android:startOffset="1533" android:valueFrom="1" android:valueTo="0.16" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,0.833 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="600" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1550" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_1_G_D_0_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="pathData" android:duration="217" android:startOffset="1317" android:valueFrom="M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c " android:valueTo="M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c " android:valueType="pathType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.508,0 0.487,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="pathData" android:duration="383" android:startOffset="1533" android:valueFrom="M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c " android:valueTo="M-0.01 363.74 C35.34,363.74 63.99,335.09 63.99,299.75 C63.99,299.75 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64.01,299.75 -64.01,299.75 C-64.01,335.09 -35.35,363.74 -0.01,363.74c " android:valueType="pathType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.508,0 0.487,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1550" android:valueFrom="0" android:valueTo="-1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2050" android:valueFrom="-1" android:valueTo="0" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_0_G_D_0_P_0_G_0_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="translateXY" android:duration="217" android:startOffset="1317" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -166,0C -105.667,0 -226.333,0 -166,0">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.508,0 0.487,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="383" android:startOffset="1533" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -166,0C -105.667,0 135.667,0 196,0">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.508,0 0.487,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="600" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2050" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1317" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2050" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="time_group">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="translateX" android:duration="4017" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-</animated-vector>
diff --git a/quickstep/res/drawable/gesture_tutorial_loop_back_left.xml b/quickstep/res/drawable/gesture_tutorial_loop_back_left.xml
new file mode 100644
index 0000000000..8bf305cd15
--- /dev/null
+++ b/quickstep/res/drawable/gesture_tutorial_loop_back_left.xml
@@ -0,0 +1,96 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <target android:name="_R_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="783"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="1000"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="0"
+                    android:valueFrom="0.25"
+                    android:valueTo="0.75"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="1000"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1000"
+                    android:valueFrom="0.75"
+                    android:valueTo="0.25"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="2000"
+                    android:propertyName="translateX"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <aapt:attr name="android:drawable">
+        <vector
+            android:width="412dp"
+            android:height="892dp"
+            android:viewportHeight="892"
+            android:viewportWidth="412">
+            <group android:name="_R_G">
+                <group
+                    android:name="_R_G_L_1_G"
+                    android:translateX="206"
+                    android:translateY="446" />
+                <group
+                    android:name="_R_G_L_0_G"
+                    android:translateX="12.5"
+                    android:translateY="446">
+                    <path
+                        android:name="_R_G_L_0_G_D_0_P_0"
+                        android:fillAlpha="0.25"
+                        android:fillColor="#84ba69"
+                        android:fillType="nonZero"
+                        android:pathData=" M12.5 -446 C12.5,-446 12.5,446 12.5,446 C12.5,446 -12.5,446 -12.5,446 C-12.5,446 -12.5,-446 -12.5,-446 C-12.5,-446 12.5,-446 12.5,-446c " />
+                </group>
+            </group>
+            <group android:name="time_group" />
+        </vector>
+    </aapt:attr>
+</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_loop_back_right.xml b/quickstep/res/drawable/gesture_tutorial_loop_back_right.xml
new file mode 100644
index 0000000000..812c54c9e2
--- /dev/null
+++ b/quickstep/res/drawable/gesture_tutorial_loop_back_right.xml
@@ -0,0 +1,96 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <target android:name="_R_G_L_1_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="1000"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="0"
+                    android:valueFrom="0.25"
+                    android:valueTo="0.75"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="1000"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1000"
+                    android:valueFrom="0.75"
+                    android:valueTo="0.25"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="783"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="2000"
+                    android:propertyName="translateX"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <aapt:attr name="android:drawable">
+        <vector
+            android:width="412dp"
+            android:height="892dp"
+            android:viewportHeight="892"
+            android:viewportWidth="412">
+            <group android:name="_R_G">
+                <group
+                    android:name="_R_G_L_1_G"
+                    android:translateX="399.5"
+                    android:translateY="446">
+                    <path
+                        android:name="_R_G_L_1_G_D_0_P_0"
+                        android:fillAlpha="0.25"
+                        android:fillColor="#84ba69"
+                        android:fillType="nonZero"
+                        android:pathData=" M12.5 -446 C12.5,-446 12.5,446 12.5,446 C12.5,446 -12.5,446 -12.5,446 C-12.5,446 -12.5,-446 -12.5,-446 C-12.5,-446 12.5,-446 12.5,-446c " />
+                </group>
+                <group
+                    android:name="_R_G_L_0_G"
+                    android:translateX="206"
+                    android:translateY="446" />
+            </group>
+            <group android:name="time_group" />
+        </vector>
+    </aapt:attr>
+</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_loop_bottom_edge.xml b/quickstep/res/drawable/gesture_tutorial_loop_bottom_edge.xml
new file mode 100644
index 0000000000..3efb52d16f
--- /dev/null
+++ b/quickstep/res/drawable/gesture_tutorial_loop_bottom_edge.xml
@@ -0,0 +1,38 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="2000"
+                    android:propertyName="translateX"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <aapt:attr name="android:drawable">
+        <vector
+            android:width="412dp"
+            android:height="892dp"
+            android:viewportHeight="892"
+            android:viewportWidth="412">
+            <group android:name="_R_G">
+                <group
+                    android:name="_R_G_L_0_G"
+                    android:translateX="206"
+                    android:translateY="874.5">
+                    <path
+                        android:name="_R_G_L_0_G_D_0_P_0"
+                        android:fillAlpha="1"
+                        android:fillColor="#84ba69"
+                        android:fillType="nonZero"
+                        android:pathData=" M206 -17.5 C206,-17.5 206,17.5 206,17.5 C206,17.5 -206,17.5 -206,17.5 C-206,17.5 -206,-17.5 -206,-17.5 C-206,-17.5 206,-17.5 206,-17.5c " />
+                </group>
+            </group>
+            <group android:name="time_group" />
+        </vector>
+    </aapt:attr>
+</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_loop_gesture_back_right.xml b/quickstep/res/drawable/gesture_tutorial_loop_gesture_back_right.xml
new file mode 100644
index 0000000000..c41d077218
--- /dev/null
+++ b/quickstep/res/drawable/gesture_tutorial_loop_gesture_back_right.xml
@@ -0,0 +1,57 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <target android:name="_R_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="783"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="2000"
+                    android:propertyName="translateX"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <aapt:attr name="android:drawable">
+        <vector
+            android:width="412dp"
+            android:height="892dp"
+            android:viewportHeight="892"
+            android:viewportWidth="412">
+            <group android:name="_R_G">
+                <group
+                    android:name="_R_G_L_0_G"
+                    android:translateX="206"
+                    android:translateY="446" />
+            </group>
+            <group android:name="time_group" />
+        </vector>
+    </aapt:attr>
+</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_loop_gesture_home.xml b/quickstep/res/drawable/gesture_tutorial_loop_gesture_home.xml
new file mode 100644
index 0000000000..c5dd41b520
--- /dev/null
+++ b/quickstep/res/drawable/gesture_tutorial_loop_gesture_home.xml
@@ -0,0 +1,57 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <target android:name="_R_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="850"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="2000"
+                    android:propertyName="translateX"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <aapt:attr name="android:drawable">
+        <vector
+            android:width="412dp"
+            android:height="892dp"
+            android:viewportHeight="892"
+            android:viewportWidth="412">
+            <group android:name="_R_G">
+                <group
+                    android:name="_R_G_L_0_G"
+                    android:translateX="206"
+                    android:translateY="446" />
+            </group>
+            <group android:name="time_group" />
+        </vector>
+    </aapt:attr>
+</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_loop_gesture_left_edge.xml b/quickstep/res/drawable/gesture_tutorial_loop_gesture_left_edge.xml
new file mode 100644
index 0000000000..c41d077218
--- /dev/null
+++ b/quickstep/res/drawable/gesture_tutorial_loop_gesture_left_edge.xml
@@ -0,0 +1,57 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <target android:name="_R_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="783"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="2000"
+                    android:propertyName="translateX"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <aapt:attr name="android:drawable">
+        <vector
+            android:width="412dp"
+            android:height="892dp"
+            android:viewportHeight="892"
+            android:viewportWidth="412">
+            <group android:name="_R_G">
+                <group
+                    android:name="_R_G_L_0_G"
+                    android:translateX="206"
+                    android:translateY="446" />
+            </group>
+            <group android:name="time_group" />
+        </vector>
+    </aapt:attr>
+</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_loop_gesture_overview.xml b/quickstep/res/drawable/gesture_tutorial_loop_gesture_overview.xml
new file mode 100644
index 0000000000..5d87805e3c
--- /dev/null
+++ b/quickstep/res/drawable/gesture_tutorial_loop_gesture_overview.xml
@@ -0,0 +1,57 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <target android:name="_R_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="1500"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="2000"
+                    android:propertyName="translateX"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <aapt:attr name="android:drawable">
+        <vector
+            android:width="412dp"
+            android:height="892dp"
+            android:viewportHeight="892"
+            android:viewportWidth="412">
+            <group android:name="_R_G">
+                <group
+                    android:name="_R_G_L_0_G"
+                    android:translateX="206"
+                    android:translateY="446" />
+            </group>
+            <group android:name="time_group" />
+        </vector>
+    </aapt:attr>
+</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_loop_home.xml b/quickstep/res/drawable/gesture_tutorial_loop_home.xml
new file mode 100644
index 0000000000..ed072a9526
--- /dev/null
+++ b/quickstep/res/drawable/gesture_tutorial_loop_home.xml
@@ -0,0 +1 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"><aapt:attr name="android:drawable"><vector android:height="892dp" android:width="412dp" android:viewportHeight="892" android:viewportWidth="412"><group android:name="_R_G"><group android:name="_R_G_L_1_G" android:translateX="206" android:translateY="879.5"><path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="#84ba69" android:fillAlpha="0.25" android:fillType="nonZero" android:pathData=" M206 -12.5 C206,-12.5 206,12.5 206,12.5 C206,12.5 -206,12.5 -206,12.5 C-206,12.5 -206,-12.5 -206,-12.5 C-206,-12.5 206,-12.5 206,-12.5c "/></group><group android:name="_R_G_L_0_G" android:translateX="206" android:translateY="446"/></group><group android:name="time_group"/></vector></aapt:attr><target android:name="_R_G_L_1_G_D_0_P_0"><aapt:attr name="android:animation"><set android:ordering="together"><objectAnimator android:propertyName="fillAlpha" android:duration="1000" android:startOffset="0" android:valueFrom="0.25" android:valueTo="0.75" android:valueType="floatType"><aapt:attr name="android:interpolator"><pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/></aapt:attr></objectAnimator><objectAnimator android:propertyName="fillAlpha" android:duration="1000" android:startOffset="1000" android:valueFrom="0.75" android:valueTo="0.25" android:valueType="floatType"><aapt:attr name="android:interpolator"><pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/></aapt:attr></objectAnimator></set></aapt:attr></target><target android:name="_R_G_L_0_G"><aapt:attr name="android:animation"><set android:ordering="together"><objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/></set></aapt:attr></target><target android:name="_R_G_L_0_G"><aapt:attr name="android:animation"><set android:ordering="together"><objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="850" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/></set></aapt:attr></target><target android:name="time_group"><aapt:attr name="android:animation"><set android:ordering="together"><objectAnimator android:propertyName="translateX" android:duration="2000" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/></set></aapt:attr></target></animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_loop_left_edge.xml b/quickstep/res/drawable/gesture_tutorial_loop_left_edge.xml
new file mode 100644
index 0000000000..07caaea042
--- /dev/null
+++ b/quickstep/res/drawable/gesture_tutorial_loop_left_edge.xml
@@ -0,0 +1,38 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="2000"
+                    android:propertyName="translateX"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <aapt:attr name="android:drawable">
+        <vector
+            android:width="412dp"
+            android:height="892dp"
+            android:viewportHeight="892"
+            android:viewportWidth="412">
+            <group android:name="_R_G">
+                <group
+                    android:name="_R_G_L_0_G"
+                    android:translateX="17.5"
+                    android:translateY="446">
+                    <path
+                        android:name="_R_G_L_0_G_D_0_P_0"
+                        android:fillAlpha="1"
+                        android:fillColor="#84ba69"
+                        android:fillType="nonZero"
+                        android:pathData=" M17.5 -446 C17.5,-446 17.5,446 17.5,446 C17.5,446 -17.5,446 -17.5,446 C-17.5,446 -17.5,-446 -17.5,-446 C-17.5,-446 17.5,-446 17.5,-446c " />
+                </group>
+            </group>
+            <group android:name="time_group" />
+        </vector>
+    </aapt:attr>
+</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_loop_overview.xml b/quickstep/res/drawable/gesture_tutorial_loop_overview.xml
new file mode 100644
index 0000000000..acf0c4c9d0
--- /dev/null
+++ b/quickstep/res/drawable/gesture_tutorial_loop_overview.xml
@@ -0,0 +1 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"><aapt:attr name="android:drawable"><vector android:height="892dp" android:width="412dp" android:viewportHeight="892" android:viewportWidth="412"><group android:name="_R_G"><group android:name="_R_G_L_1_G" android:translateX="206" android:translateY="879.5"><path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="#84ba69" android:fillAlpha="0.25" android:fillType="nonZero" android:pathData=" M206 -12.5 C206,-12.5 206,12.5 206,12.5 C206,12.5 -206,12.5 -206,12.5 C-206,12.5 -206,-12.5 -206,-12.5 C-206,-12.5 206,-12.5 206,-12.5c "/></group><group android:name="_R_G_L_0_G" android:translateX="206" android:translateY="446"/></group><group android:name="time_group"/></vector></aapt:attr><target android:name="_R_G_L_1_G_D_0_P_0"><aapt:attr name="android:animation"><set android:ordering="together"><objectAnimator android:propertyName="fillAlpha" android:duration="1000" android:startOffset="0" android:valueFrom="0.25" android:valueTo="0.75" android:valueType="floatType"><aapt:attr name="android:interpolator"><pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/></aapt:attr></objectAnimator><objectAnimator android:propertyName="fillAlpha" android:duration="1000" android:startOffset="1000" android:valueFrom="0.75" android:valueTo="0.25" android:valueType="floatType"><aapt:attr name="android:interpolator"><pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/></aapt:attr></objectAnimator></set></aapt:attr></target><target android:name="_R_G_L_0_G"><aapt:attr name="android:animation"><set android:ordering="together"><objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/></set></aapt:attr></target><target android:name="_R_G_L_0_G"><aapt:attr name="android:animation"><set android:ordering="together"><objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1500" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/></set></aapt:attr></target><target android:name="time_group"><aapt:attr name="android:animation"><set android:ordering="together"><objectAnimator android:propertyName="translateX" android:duration="2000" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/></set></aapt:attr></target></animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_loop_right_edge.xml b/quickstep/res/drawable/gesture_tutorial_loop_right_edge.xml
new file mode 100644
index 0000000000..d86b653e50
--- /dev/null
+++ b/quickstep/res/drawable/gesture_tutorial_loop_right_edge.xml
@@ -0,0 +1,38 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="2000"
+                    android:propertyName="translateX"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <aapt:attr name="android:drawable">
+        <vector
+            android:width="412dp"
+            android:height="892dp"
+            android:viewportHeight="892"
+            android:viewportWidth="412">
+            <group android:name="_R_G">
+                <group
+                    android:name="_R_G_L_0_G"
+                    android:translateX="394.5"
+                    android:translateY="446">
+                    <path
+                        android:name="_R_G_L_0_G_D_0_P_0"
+                        android:fillAlpha="1"
+                        android:fillColor="#84ba69"
+                        android:fillType="nonZero"
+                        android:pathData=" M17.5 -446 C17.5,-446 17.5,446 17.5,446 C17.5,446 -17.5,446 -17.5,446 C-17.5,446 -17.5,-446 -17.5,-446 C-17.5,-446 17.5,-446 17.5,-446c " />
+                </group>
+            </group>
+            <group android:name="time_group" />
+        </vector>
+    </aapt:attr>
+</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_motion_back_left.xml b/quickstep/res/drawable/gesture_tutorial_motion_back_left.xml
new file mode 100644
index 0000000000..e944c0e919
--- /dev/null
+++ b/quickstep/res/drawable/gesture_tutorial_motion_back_left.xml
@@ -0,0 +1,1412 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_1_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_2_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_3_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_4_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_5_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_6_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_7_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_8_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_9_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_10_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_11_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_12_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_13_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="1367"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="283"
+                    android:propertyName="scaleX"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0.88012"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="283"
+                    android:propertyName="scaleY"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0.88012"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2417"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_1_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_2_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_3_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_4_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_5_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_6_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_7_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_8_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_9_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_10_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_11_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_12_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_13_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_14_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_15_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_16_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_17_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_18_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_19_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_20_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_21_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_22_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_23_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_D_0_P_0_G_0_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="667"
+                    android:pathData="M -60,53C -50,53 -10,53 0,53"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="217">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="333"
+                    android:pathData="M 0,53C 0,53 0,53 0,53"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="883">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0.333 0,0 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="333"
+                    android:pathData="M 0,53C -10,53 -50,53 -60,53"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="1217">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="217"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2467"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="417"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="383"
+                    android:valueFrom="0"
+                    android:valueTo="0.5"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="417"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="800"
+                    android:valueFrom="0.5"
+                    android:valueTo="0.5"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="200"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="0.5"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="583"
+                    android:pathData="M 39,0C 32.5,0 6.5,0 0,0"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="217">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="417"
+                    android:pathData="M 0,0C 0,0 0,0 0,0"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="800">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0.333 0.667,0.667 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="333"
+                    android:pathData="M 0,0C 6.5,0 32.5,0 39,0"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="1217">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="583"
+                    android:propertyName="scaleX"
+                    android:startOffset="217"
+                    android:valueFrom="0.5"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="583"
+                    android:propertyName="scaleY"
+                    android:startOffset="217"
+                    android:valueFrom="0.5"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="417"
+                    android:propertyName="scaleX"
+                    android:startOffset="800"
+                    android:valueFrom="1"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="417"
+                    android:propertyName="scaleY"
+                    android:startOffset="800"
+                    android:valueFrom="1"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="scaleX"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0.5"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="scaleY"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0.5"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="383"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2333"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="217"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="0.75"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="967"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="217"
+                    android:valueFrom="0.75"
+                    android:valueTo="0.75"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1183"
+                    android:valueFrom="0.75"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="217"
+                    android:propertyName="pathData"
+                    android:startOffset="0"
+                    android:valueFrom="M-206.5 13.5 C-186.34,13.5 -170,29.84 -170,50 C-170,70.16 -186.34,86.5 -206.5,86.5 C-226.66,86.5 -243,70.16 -243,50 C-243,29.84 -226.66,13.5 -206.5,13.5c "
+                    android:valueTo="M-206 0 C-178.39,0 -156,22.39 -156,50 C-156,77.61 -178.39,100 -206,100 C-233.61,100 -256,77.61 -256,50 C-256,22.39 -233.61,0 -206,0c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="583"
+                    android:propertyName="pathData"
+                    android:startOffset="217"
+                    android:valueFrom="M-206 0 C-178.39,0 -156,22.39 -156,50 C-156,77.61 -178.39,100 -206,100 C-233.61,100 -256,77.61 -256,50 C-256,22.39 -233.61,0 -206,0c "
+                    android:valueTo="M0 0 C27.61,0 50,22.39 50,50 C50,77.61 27.61,100 0,100 C-27.61,100 -50,77.61 -50,50 C-50,22.39 -27.61,0 0,0c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="383"
+                    android:propertyName="pathData"
+                    android:startOffset="800"
+                    android:valueFrom="M0 0 C27.61,0 50,22.39 50,50 C50,77.61 27.61,100 0,100 C-27.61,100 -50,77.61 -50,50 C-50,22.39 -27.61,0 0,0c "
+                    android:valueTo="M0 0 C27.61,0 50,22.39 50,50 C50,77.61 27.61,100 0,100 C-27.61,100 -50,77.61 -50,50 C-50,22.39 -27.61,0 0,0c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="pathData"
+                    android:startOffset="1183"
+                    android:valueFrom="M0 0 C27.61,0 50,22.39 50,50 C50,77.61 27.61,100 0,100 C-27.61,100 -50,77.61 -50,50 C-50,22.39 -27.61,0 0,0c "
+                    android:valueTo="M0 13.5 C20.16,13.5 36.5,29.84 36.5,50 C36.5,70.16 20.16,86.5 0,86.5 C-20.16,86.5 -36.5,70.16 -36.5,50 C-36.5,29.84 -20.16,13.5 0,13.5c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="1767"
+                    android:propertyName="translateX"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <aapt:attr name="android:drawable">
+        <vector
+            android:width="412dp"
+            android:height="892dp"
+            android:viewportHeight="892"
+            android:viewportWidth="412">
+            <group android:name="_R_G">
+                <group
+                    android:name="_R_G_L_5_G"
+                    android:translateX="206"
+                    android:translateY="446">
+                    <path
+                        android:name="_R_G_L_5_G_D_0_P_0"
+                        android:fillAlpha="1"
+                        android:fillColor="#dadce0"
+                        android:fillType="nonZero"
+                        android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c " />
+                </group>
+                <group
+                    android:name="_R_G_L_4_G"
+                    android:pivotX="206"
+                    android:pivotY="446"
+                    android:scaleX="1"
+                    android:scaleY="1">
+                    <group android:name="_R_G_L_4_G_L_0_G">
+                        <group android:name="_R_G_L_4_G_L_0_G_L_0_G">
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#f1f3f4"
+                                android:fillType="nonZero"
+                                android:pathData=" M412 101 C412,101 412,892 412,892 C412,892 0,892 0,892 C0,892 0,101 0,101 C0,101 412,101 412,101c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_1_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#e8eaed"
+                                android:fillType="nonZero"
+                                android:pathData=" M412 0 C412,0 412,101 412,101 C412,101 0,101 0,101 C0,101 0,0 0,0 C0,0 412,0 412,0c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_2_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M383 804 C383,816.15 373.15,826 361,826 C361,826 51,826 51,826 C38.85,826 29,816.15 29,804 C29,791.85 38.85,782 51,782 C51,782 361,782 361,782 C373.15,782 383,791.85 383,804c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_3_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M201 47 C201,47 201,75 201,75 C201,77.21 199.21,79 197,79 C197,79 38,79 38,79 C35.79,79 34,77.21 34,75 C34,75 34,47 34,47 C34,44.79 35.79,43 38,43 C38,43 197,43 197,43 C199.21,43 201,44.79 201,47c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_4_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M388 47 C388,47 388,75 388,75 C388,77.21 386.21,79 384,79 C384,79 356,79 356,79 C353.79,79 352,77.21 352,75 C352,75 352,47 352,47 C352,44.79 353.79,43 356,43 C356,43 384,43 384,43 C386.21,43 388,44.79 388,47c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_5_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M336 47 C336,47 336,75 336,75 C336,77.21 334.21,79 332,79 C332,79 304,79 304,79 C301.79,79 300,77.21 300,75 C300,75 300,47 300,47 C300,44.79 301.79,43 304,43 C304,43 332,43 332,43 C334.21,43 336,44.79 336,47c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_6_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M70 618 C70,630.15 60.15,640 48,640 C35.85,640 26,630.15 26,618 C26,605.85 35.85,596 48,596 C60.15,596 70,605.85 70,618c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_7_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M70 396 C70,408.15 60.15,418 48,418 C35.85,418 26,408.15 26,396 C26,383.85 35.85,374 48,374 C60.15,374 70,383.85 70,396c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_8_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M394 248 C394,248 394,324 394,324 C394,333.94 385.94,342 376,342 C376,342 142,342 142,342 C132.06,342 124,333.94 124,324 C124,324 124,248 124,248 C124,238.06 132.06,230 142,230 C142,230 376,230 376,230 C385.94,230 394,238.06 394,248c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_9_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M393.94 468.38 C393.94,468.38 393.94,481.5 393.94,481.5 C393.94,483.71 392.15,485.5 389.94,485.5 C389.94,485.5 303.5,485.5 303.5,485.5 C301.29,485.5 299.5,483.71 299.5,481.5 C299.5,481.5 299.5,468.38 299.5,468.38 C299.5,466.17 301.29,464.38 303.5,464.38 C303.5,464.38 389.94,464.38 389.94,464.38 C392.15,464.38 393.94,466.17 393.94,468.38c  M394 468 C394,477.67 386.17,485.5 376.5,485.5 C376.5,485.5 290,485.5 290,485.5 C280.33,485.5 272.5,477.67 272.5,468 C272.5,458.34 280.33,450.5 290,450.5 C290,450.5 376.5,450.5 376.5,450.5 C386.17,450.5 394,458.34 394,468c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_10_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M394 494 C394,494 394,547 394,547 C394,549.21 392.21,551 390,551 C390,551 164,551 164,551 C161.79,551 160,549.21 160,547 C160,547 160,494 160,494 C160,491.79 161.79,490 164,490 C164,490 390,490 390,490 C392.21,490 394,491.79 394,494c  M394 508 C394,508 394,545 394,545 C394,554.94 385.94,563 376,563 C376,563 142,563 142,563 C132.06,563 124,554.94 124,545 C124,545 124,508 124,508 C124,498.06 132.06,490 142,490 C142,490 376,490 376,490 C385.94,490 394,498.06 394,508c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_11_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M394 690 C394,690 394,727 394,727 C394,736.94 385.94,745 376,745 C376,745 142,745 142,745 C132.06,745 124,736.94 124,727 C124,727 124,690 124,690 C124,680.06 132.06,672 142,672 C142,672 376,672 376,672 C385.94,672 394,680.06 394,690c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_12_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#e8eaed"
+                                android:fillType="nonZero"
+                                android:pathData=" M267.5 617 C267.5,626.67 259.67,634.5 250,634.5 C250,634.5 104.5,634.5 104.5,634.5 C94.84,634.5 87,626.67 87,617 C87,607.34 94.84,599.5 104.5,599.5 C104.5,599.5 250,599.5 250,599.5 C259.67,599.5 267.5,607.34 267.5,617c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_13_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#e8eaed"
+                                android:fillType="nonZero"
+                                android:pathData=" M299 395.5 C299,405.17 291.16,413 281.5,413 C281.5,413 104.5,413 104.5,413 C94.84,413 87,405.17 87,395.5 C87,385.84 94.84,378 104.5,378 C104.5,378 281.5,378 281.5,378 C291.16,378 299,385.84 299,395.5c " />
+                        </group>
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_3_G"
+                    android:scaleY="0">
+                    <group
+                        android:name="_R_G_L_3_G_L_0_G"
+                        android:scaleY="0">
+                        <group
+                            android:name="_R_G_L_3_G_L_0_G_L_0_G"
+                            android:scaleY="0">
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_0_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M412 0 C412,0 412,892 412,892 C412,892 0,892 0,892 C0,892 0,0 0,0 C0,0 412,0 412,0c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_1_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#e8eaed"
+                                android:fillType="nonZero"
+                                android:pathData=" M412 0 C412,0 412,101 412,101 C412,101 0,101 0,101 C0,101 0,0 0,0 C0,0 412,0 412,0c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_2_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M195 143 C195,143 195,153 195,153 C195,155.21 193.21,157 191,157 C191,157 106,157 106,157 C103.79,157 102,155.21 102,153 C102,153 102,143 102,143 C102,140.79 103.79,139 106,139 C106,139 191,139 191,139 C193.21,139 195,140.79 195,143c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_3_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M270 165 C270,165 270,173 270,173 C270,175.21 268.21,177 266,177 C266,177 106,177 106,177 C103.79,177 102,175.21 102,173 C102,173 102,165 102,165 C102,162.79 103.79,161 106,161 C106,161 266,161 266,161 C268.21,161 270,162.79 270,165c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_4_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M222 231 C222,231 222,241 222,241 C222,243.21 220.21,245 218,245 C218,245 106,245 106,245 C103.79,245 102,243.21 102,241 C102,241 102,231 102,231 C102,228.79 103.79,227 106,227 C106,227 218,227 218,227 C220.21,227 222,228.79 222,231c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_5_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M241 253 C241,253 241,261 241,261 C241,263.21 239.21,265 237,265 C237,265 106,265 106,265 C103.79,265 102,263.21 102,261 C102,261 102,253 102,253 C102,250.79 103.79,249 106,249 C106,249 237,249 237,249 C239.21,249 241,250.79 241,253c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_6_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M214 319 C214,319 214,329 214,329 C214,331.21 212.21,333 210,333 C210,333 106,333 106,333 C103.79,333 102,331.21 102,329 C102,329 102,319 102,319 C102,316.79 103.79,315 106,315 C106,315 210,315 210,315 C212.21,315 214,316.79 214,319c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_7_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M333 341 C333,341 333,349 333,349 C333,351.21 331.21,353 329,353 C329,353 106,353 106,353 C103.79,353 102,351.21 102,349 C102,349 102,341 102,341 C102,338.79 103.79,337 106,337 C106,337 329,337 329,337 C331.21,337 333,338.79 333,341c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_8_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M238 407 C238,407 238,417 238,417 C238,419.21 236.21,421 234,421 C234,421 106,421 106,421 C103.79,421 102,419.21 102,417 C102,417 102,407 102,407 C102,404.79 103.79,403 106,403 C106,403 234,403 234,403 C236.21,403 238,404.79 238,407c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_9_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M295 429 C295,429 295,437 295,437 C295,439.21 293.21,441 291,441 C291,441 106,441 106,441 C103.79,441 102,439.21 102,437 C102,437 102,429 102,429 C102,426.79 103.79,425 106,425 C106,425 291,425 291,425 C293.21,425 295,426.79 295,429c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_10_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M168 495 C168,495 168,505 168,505 C168,507.21 166.21,509 164,509 C164,509 106,509 106,509 C103.79,509 102,507.21 102,505 C102,505 102,495 102,495 C102,492.79 103.79,491 106,491 C106,491 164,491 164,491 C166.21,491 168,492.79 168,495c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_11_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M269 517 C269,517 269,525 269,525 C269,527.21 267.21,529 265,529 C265,529 106,529 106,529 C103.79,529 102,527.21 102,525 C102,525 102,517 102,517 C102,514.79 103.79,513 106,513 C106,513 265,513 265,513 C267.21,513 269,514.79 269,517c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_12_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M235 583 C235,583 235,593 235,593 C235,595.21 233.21,597 231,597 C231,597 106,597 106,597 C103.79,597 102,595.21 102,593 C102,593 102,583 102,583 C102,580.79 103.79,579 106,579 C106,579 231,579 231,579 C233.21,579 235,580.79 235,583c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_13_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M295 605 C295,605 295,613 295,613 C295,615.21 293.21,617 291,617 C291,617 106,617 106,617 C103.79,617 102,615.21 102,613 C102,613 102,605 102,605 C102,602.79 103.79,601 106,601 C106,601 291,601 291,601 C293.21,601 295,602.79 295,605c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_14_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M223 671 C223,671 223,681 223,681 C223,683.21 221.21,685 219,685 C219,685 106,685 106,685 C103.79,685 102,683.21 102,681 C102,681 102,671 102,671 C102,668.79 103.79,667 106,667 C106,667 219,667 219,667 C221.21,667 223,668.79 223,671c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_15_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M246 693 C246,693 246,701 246,701 C246,703.21 244.21,705 242,705 C242,705 106,705 106,705 C103.79,705 102,703.21 102,701 C102,701 102,693 102,693 C102,690.79 103.79,689 106,689 C106,689 242,689 242,689 C244.21,689 246,690.79 246,693c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_16_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M388 798 C388,798 388,798 388,798 C388,813.45 375.45,826 360,826 C360,826 267,826 267,826 C251.55,826 239,813.45 239,798 C239,798 239,798 239,798 C239,782.55 251.55,770 267,770 C267,770 360,770 360,770 C375.45,770 388,782.55 388,798c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_17_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#f8f9fa"
+                                android:fillType="nonZero"
+                                android:pathData=" M377 47 C377,47 377,75 377,75 C377,77.21 375.21,79 373,79 C373,79 38,79 38,79 C35.79,79 34,77.21 34,75 C34,75 34,47 34,47 C34,44.79 35.79,43 38,43 C38,43 373,43 373,43 C375.21,43 377,44.79 377,47c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_18_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M82 157 C82,172.46 69.46,185 54,185 C38.54,185 26,172.46 26,157 C26,141.54 38.54,129 54,129 C69.46,129 82,141.54 82,157c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_19_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M82 245 C82,260.46 69.46,273 54,273 C38.54,273 26,260.46 26,245 C26,229.54 38.54,217 54,217 C69.46,217 82,229.54 82,245c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_20_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M82 333 C82,348.46 69.46,361 54,361 C38.54,361 26,348.46 26,333 C26,317.54 38.54,305 54,305 C69.46,305 82,317.54 82,333c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_21_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M82 421 C82,436.46 69.46,449 54,449 C38.54,449 26,436.46 26,421 C26,405.54 38.54,393 54,393 C69.46,393 82,405.54 82,421c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_22_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M82 509 C82,524.46 69.46,537 54,537 C38.54,537 26,524.46 26,509 C26,493.54 38.54,481 54,481 C69.46,481 82,493.54 82,509c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_23_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M82 597 C82,612.46 69.46,625 54,625 C38.54,625 26,612.46 26,597 C26,581.54 38.54,569 54,569 C69.46,569 82,581.54 82,597c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_24_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M82 685 C82,700.46 69.46,713 54,713 C38.54,713 26,700.46 26,685 C26,669.54 38.54,657 54,657 C69.46,657 82,669.54 82,685c " />
+                        </group>
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_2_G"
+                    android:scaleY="0"
+                    android:translateX="28.25"
+                    android:translateY="443">
+                    <group
+                        android:name="_R_G_L_2_G_D_0_P_0_G_0_T_0"
+                        android:translateX="-60"
+                        android:translateY="53">
+                        <path
+                            android:name="_R_G_L_2_G_D_0_P_0"
+                            android:fillAlpha="1"
+                            android:fillColor="#000000"
+                            android:fillType="nonZero"
+                            android:pathData=" M28.25 0 C28.25,31.2 2.95,56.5 -28.25,56.5 C-28.25,56.5 -28.25,-56.5 -28.25,-56.5 C2.95,-56.5 28.25,-31.2 28.25,0c " />
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_1_G"
+                    android:rotation="180"
+                    android:scaleY="0"
+                    android:translateX="25.75"
+                    android:translateY="496">
+                    <group
+                        android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0"
+                        android:scaleX="0.5"
+                        android:scaleY="0.5"
+                        android:translateX="39"
+                        android:translateY="0">
+                        <path
+                            android:name="_R_G_L_1_G_D_0_P_0"
+                            android:fillAlpha="0"
+                            android:fillColor="#ffffff"
+                            android:fillType="nonZero"
+                            android:pathData=" M3.87 -13.45 C3.07,-14.21 1.8,-14.18 1.04,-13.38 C0.28,-12.58 0.31,-11.31 1.11,-10.55 C1.11,-10.55 9.75,-2.32 9.75,-2.32 C9.75,-2.32 -14.75,-2.32 -14.75,-2.32 C-15.85,-2.32 -16.75,-1.43 -16.75,-0.32 C-16.75,0.78 -15.85,1.68 -14.75,1.68 C-14.75,1.68 9.94,1.68 9.94,1.68 C9.94,1.68 1.07,10.59 1.07,10.59 C0.29,11.37 0.29,12.64 1.08,13.42 C1.86,14.2 3.13,14.19 3.9,13.41 C3.9,13.41 16.17,1.09 16.17,1.09 C16.55,0.71 16.76,0.19 16.75,-0.35 C16.74,-0.89 16.52,-1.4 16.13,-1.77 C16.13,-1.77 3.87,-13.45 3.87,-13.45c " />
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_0_G"
+                    android:translateX="206"
+                    android:translateY="446">
+                    <path
+                        android:name="_R_G_L_0_G_D_0_P_0"
+                        android:fillAlpha="0"
+                        android:fillColor="#84ba69"
+                        android:fillType="nonZero"
+                        android:pathData=" M-206.5 13.5 C-186.34,13.5 -170,29.84 -170,50 C-170,70.16 -186.34,86.5 -206.5,86.5 C-226.66,86.5 -243,70.16 -243,50 C-243,29.84 -226.66,13.5 -206.5,13.5c " />
+                </group>
+            </group>
+            <group android:name="time_group" />
+        </vector>
+    </aapt:attr>
+</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_motion_back_right.xml b/quickstep/res/drawable/gesture_tutorial_motion_back_right.xml
new file mode 100644
index 0000000000..f8d649abb2
--- /dev/null
+++ b/quickstep/res/drawable/gesture_tutorial_motion_back_right.xml
@@ -0,0 +1,1413 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_1_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_2_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_3_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_4_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_5_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_6_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_7_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_8_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_9_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_10_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_11_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_12_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_13_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="1367"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="283"
+                    android:propertyName="scaleX"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0.88012"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="283"
+                    android:propertyName="scaleY"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0.88012"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2417"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_1_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_2_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_3_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_4_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_5_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_6_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_7_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_8_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_9_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_10_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_11_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_12_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_13_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_14_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_15_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_16_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_17_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_18_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_19_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_20_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_21_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_22_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_23_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_D_0_P_0_G_0_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="667"
+                    android:pathData="M 414,53C 404.333,53 365.667,53 356,53"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="217">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="333"
+                    android:pathData="M 356,53C 356,53 356,53 356,53"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="883">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0.333 0,0 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="333"
+                    android:pathData="M 356,53C 365.667,53 404.333,53 414,53"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="1217">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="217"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2467"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="417"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="383"
+                    android:valueFrom="0"
+                    android:valueTo="0.5"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="417"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="800"
+                    android:valueFrom="0.5"
+                    android:valueTo="0.5"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="200"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="0.5"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="583"
+                    android:pathData="M -407,0C -399,0 -367,0 -359,0"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="217">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="417"
+                    android:pathData="M -359,0C -359,0 -359,0 -359,0"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="800">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0.333 0.667,0.667 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="333"
+                    android:pathData="M -359,0C -367,0 -399,0 -407,0"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="1217">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="583"
+                    android:propertyName="scaleX"
+                    android:startOffset="217"
+                    android:valueFrom="0.5"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="583"
+                    android:propertyName="scaleY"
+                    android:startOffset="217"
+                    android:valueFrom="0.5"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="417"
+                    android:propertyName="scaleX"
+                    android:startOffset="800"
+                    android:valueFrom="1"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="417"
+                    android:propertyName="scaleY"
+                    android:startOffset="800"
+                    android:valueFrom="1"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="scaleX"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0.5"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="scaleY"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0.5"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="383"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2333"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="217"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="0.75"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="967"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="217"
+                    android:valueFrom="0.75"
+                    android:valueTo="0.75"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1183"
+                    android:valueFrom="0.75"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="217"
+                    android:propertyName="pathData"
+                    android:startOffset="0"
+                    android:valueFrom="M205 13.5 C225.16,13.5 241.5,29.84 241.5,50 C241.5,70.16 225.16,86.5 205,86.5 C184.84,86.5 168.5,70.16 168.5,50 C168.5,29.84 184.84,13.5 205,13.5c "
+                    android:valueTo="M205.5 0 C233.11,0 255.5,22.39 255.5,50 C255.5,77.61 233.11,100 205.5,100 C177.89,100 155.5,77.61 155.5,50 C155.5,22.39 177.89,0 205.5,0c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="583"
+                    android:propertyName="pathData"
+                    android:startOffset="217"
+                    android:valueFrom="M205.5 0 C233.11,0 255.5,22.39 255.5,50 C255.5,77.61 233.11,100 205.5,100 C177.89,100 155.5,77.61 155.5,50 C155.5,22.39 177.89,0 205.5,0c "
+                    android:valueTo="M0 0 C27.61,0 50,22.39 50,50 C50,77.61 27.61,100 0,100 C-27.61,100 -50,77.61 -50,50 C-50,22.39 -27.61,0 0,0c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="383"
+                    android:propertyName="pathData"
+                    android:startOffset="800"
+                    android:valueFrom="M0 0 C27.61,0 50,22.39 50,50 C50,77.61 27.61,100 0,100 C-27.61,100 -50,77.61 -50,50 C-50,22.39 -27.61,0 0,0c "
+                    android:valueTo="M0 0 C27.61,0 50,22.39 50,50 C50,77.61 27.61,100 0,100 C-27.61,100 -50,77.61 -50,50 C-50,22.39 -27.61,0 0,0c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="pathData"
+                    android:startOffset="1183"
+                    android:valueFrom="M0 0 C27.61,0 50,22.39 50,50 C50,77.61 27.61,100 0,100 C-27.61,100 -50,77.61 -50,50 C-50,22.39 -27.61,0 0,0c "
+                    android:valueTo="M0 13.5 C20.16,13.5 36.5,29.84 36.5,50 C36.5,70.16 20.16,86.5 0,86.5 C-20.16,86.5 -36.5,70.16 -36.5,50 C-36.5,29.84 -20.16,13.5 0,13.5c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="1767"
+                    android:propertyName="translateX"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <aapt:attr name="android:drawable">
+        <vector
+            android:width="412dp"
+            android:height="892dp"
+            android:viewportHeight="892"
+            android:viewportWidth="412">
+            <group android:name="_R_G">
+                <group
+                    android:name="_R_G_L_5_G"
+                    android:translateX="206"
+                    android:translateY="446">
+                    <path
+                        android:name="_R_G_L_5_G_D_0_P_0"
+                        android:fillAlpha="1"
+                        android:fillColor="#dadce0"
+                        android:fillType="nonZero"
+                        android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c " />
+                </group>
+                <group
+                    android:name="_R_G_L_4_G"
+                    android:pivotX="206"
+                    android:pivotY="446"
+                    android:scaleX="1"
+                    android:scaleY="1">
+                    <group android:name="_R_G_L_4_G_L_0_G">
+                        <group android:name="_R_G_L_4_G_L_0_G_L_0_G">
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#f1f3f4"
+                                android:fillType="nonZero"
+                                android:pathData=" M412 101 C412,101 412,892 412,892 C412,892 0,892 0,892 C0,892 0,101 0,101 C0,101 412,101 412,101c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_1_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#e8eaed"
+                                android:fillType="nonZero"
+                                android:pathData=" M412 0 C412,0 412,101 412,101 C412,101 0,101 0,101 C0,101 0,0 0,0 C0,0 412,0 412,0c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_2_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M383 804 C383,816.15 373.15,826 361,826 C361,826 51,826 51,826 C38.85,826 29,816.15 29,804 C29,791.85 38.85,782 51,782 C51,782 361,782 361,782 C373.15,782 383,791.85 383,804c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_3_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M201 47 C201,47 201,75 201,75 C201,77.21 199.21,79 197,79 C197,79 38,79 38,79 C35.79,79 34,77.21 34,75 C34,75 34,47 34,47 C34,44.79 35.79,43 38,43 C38,43 197,43 197,43 C199.21,43 201,44.79 201,47c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_4_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M388 47 C388,47 388,75 388,75 C388,77.21 386.21,79 384,79 C384,79 356,79 356,79 C353.79,79 352,77.21 352,75 C352,75 352,47 352,47 C352,44.79 353.79,43 356,43 C356,43 384,43 384,43 C386.21,43 388,44.79 388,47c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_5_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M336 47 C336,47 336,75 336,75 C336,77.21 334.21,79 332,79 C332,79 304,79 304,79 C301.79,79 300,77.21 300,75 C300,75 300,47 300,47 C300,44.79 301.79,43 304,43 C304,43 332,43 332,43 C334.21,43 336,44.79 336,47c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_6_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M70 618 C70,630.15 60.15,640 48,640 C35.85,640 26,630.15 26,618 C26,605.85 35.85,596 48,596 C60.15,596 70,605.85 70,618c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_7_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M70 396 C70,408.15 60.15,418 48,418 C35.85,418 26,408.15 26,396 C26,383.85 35.85,374 48,374 C60.15,374 70,383.85 70,396c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_8_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M394 248 C394,248 394,324 394,324 C394,333.94 385.94,342 376,342 C376,342 142,342 142,342 C132.06,342 124,333.94 124,324 C124,324 124,248 124,248 C124,238.06 132.06,230 142,230 C142,230 376,230 376,230 C385.94,230 394,238.06 394,248c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_9_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M393.94 468.38 C393.94,468.38 393.94,481.5 393.94,481.5 C393.94,483.71 392.15,485.5 389.94,485.5 C389.94,485.5 303.5,485.5 303.5,485.5 C301.29,485.5 299.5,483.71 299.5,481.5 C299.5,481.5 299.5,468.38 299.5,468.38 C299.5,466.17 301.29,464.38 303.5,464.38 C303.5,464.38 389.94,464.38 389.94,464.38 C392.15,464.38 393.94,466.17 393.94,468.38c  M394 468 C394,477.67 386.17,485.5 376.5,485.5 C376.5,485.5 290,485.5 290,485.5 C280.33,485.5 272.5,477.67 272.5,468 C272.5,458.34 280.33,450.5 290,450.5 C290,450.5 376.5,450.5 376.5,450.5 C386.17,450.5 394,458.34 394,468c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_10_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M394 494 C394,494 394,547 394,547 C394,549.21 392.21,551 390,551 C390,551 164,551 164,551 C161.79,551 160,549.21 160,547 C160,547 160,494 160,494 C160,491.79 161.79,490 164,490 C164,490 390,490 390,490 C392.21,490 394,491.79 394,494c  M394 508 C394,508 394,545 394,545 C394,554.94 385.94,563 376,563 C376,563 142,563 142,563 C132.06,563 124,554.94 124,545 C124,545 124,508 124,508 C124,498.06 132.06,490 142,490 C142,490 376,490 376,490 C385.94,490 394,498.06 394,508c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_11_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M394 690 C394,690 394,727 394,727 C394,736.94 385.94,745 376,745 C376,745 142,745 142,745 C132.06,745 124,736.94 124,727 C124,727 124,690 124,690 C124,680.06 132.06,672 142,672 C142,672 376,672 376,672 C385.94,672 394,680.06 394,690c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_12_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#e8eaed"
+                                android:fillType="nonZero"
+                                android:pathData=" M267.5 617 C267.5,626.67 259.67,634.5 250,634.5 C250,634.5 104.5,634.5 104.5,634.5 C94.84,634.5 87,626.67 87,617 C87,607.34 94.84,599.5 104.5,599.5 C104.5,599.5 250,599.5 250,599.5 C259.67,599.5 267.5,607.34 267.5,617c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_13_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#e8eaed"
+                                android:fillType="nonZero"
+                                android:pathData=" M299 395.5 C299,405.17 291.16,413 281.5,413 C281.5,413 104.5,413 104.5,413 C94.84,413 87,405.17 87,395.5 C87,385.84 94.84,378 104.5,378 C104.5,378 281.5,378 281.5,378 C291.16,378 299,385.84 299,395.5c " />
+                        </group>
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_3_G"
+                    android:scaleY="0">
+                    <group
+                        android:name="_R_G_L_3_G_L_0_G"
+                        android:scaleY="0">
+                        <group
+                            android:name="_R_G_L_3_G_L_0_G_L_0_G"
+                            android:scaleY="0">
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_0_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M412 0 C412,0 412,892 412,892 C412,892 0,892 0,892 C0,892 0,0 0,0 C0,0 412,0 412,0c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_1_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#e8eaed"
+                                android:fillType="nonZero"
+                                android:pathData=" M412 0 C412,0 412,101 412,101 C412,101 0,101 0,101 C0,101 0,0 0,0 C0,0 412,0 412,0c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_2_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M195 143 C195,143 195,153 195,153 C195,155.21 193.21,157 191,157 C191,157 106,157 106,157 C103.79,157 102,155.21 102,153 C102,153 102,143 102,143 C102,140.79 103.79,139 106,139 C106,139 191,139 191,139 C193.21,139 195,140.79 195,143c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_3_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M270 165 C270,165 270,173 270,173 C270,175.21 268.21,177 266,177 C266,177 106,177 106,177 C103.79,177 102,175.21 102,173 C102,173 102,165 102,165 C102,162.79 103.79,161 106,161 C106,161 266,161 266,161 C268.21,161 270,162.79 270,165c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_4_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M222 231 C222,231 222,241 222,241 C222,243.21 220.21,245 218,245 C218,245 106,245 106,245 C103.79,245 102,243.21 102,241 C102,241 102,231 102,231 C102,228.79 103.79,227 106,227 C106,227 218,227 218,227 C220.21,227 222,228.79 222,231c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_5_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M241 253 C241,253 241,261 241,261 C241,263.21 239.21,265 237,265 C237,265 106,265 106,265 C103.79,265 102,263.21 102,261 C102,261 102,253 102,253 C102,250.79 103.79,249 106,249 C106,249 237,249 237,249 C239.21,249 241,250.79 241,253c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_6_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M214 319 C214,319 214,329 214,329 C214,331.21 212.21,333 210,333 C210,333 106,333 106,333 C103.79,333 102,331.21 102,329 C102,329 102,319 102,319 C102,316.79 103.79,315 106,315 C106,315 210,315 210,315 C212.21,315 214,316.79 214,319c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_7_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M333 341 C333,341 333,349 333,349 C333,351.21 331.21,353 329,353 C329,353 106,353 106,353 C103.79,353 102,351.21 102,349 C102,349 102,341 102,341 C102,338.79 103.79,337 106,337 C106,337 329,337 329,337 C331.21,337 333,338.79 333,341c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_8_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M238 407 C238,407 238,417 238,417 C238,419.21 236.21,421 234,421 C234,421 106,421 106,421 C103.79,421 102,419.21 102,417 C102,417 102,407 102,407 C102,404.79 103.79,403 106,403 C106,403 234,403 234,403 C236.21,403 238,404.79 238,407c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_9_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M295 429 C295,429 295,437 295,437 C295,439.21 293.21,441 291,441 C291,441 106,441 106,441 C103.79,441 102,439.21 102,437 C102,437 102,429 102,429 C102,426.79 103.79,425 106,425 C106,425 291,425 291,425 C293.21,425 295,426.79 295,429c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_10_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M168 495 C168,495 168,505 168,505 C168,507.21 166.21,509 164,509 C164,509 106,509 106,509 C103.79,509 102,507.21 102,505 C102,505 102,495 102,495 C102,492.79 103.79,491 106,491 C106,491 164,491 164,491 C166.21,491 168,492.79 168,495c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_11_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M269 517 C269,517 269,525 269,525 C269,527.21 267.21,529 265,529 C265,529 106,529 106,529 C103.79,529 102,527.21 102,525 C102,525 102,517 102,517 C102,514.79 103.79,513 106,513 C106,513 265,513 265,513 C267.21,513 269,514.79 269,517c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_12_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M235 583 C235,583 235,593 235,593 C235,595.21 233.21,597 231,597 C231,597 106,597 106,597 C103.79,597 102,595.21 102,593 C102,593 102,583 102,583 C102,580.79 103.79,579 106,579 C106,579 231,579 231,579 C233.21,579 235,580.79 235,583c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_13_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M295 605 C295,605 295,613 295,613 C295,615.21 293.21,617 291,617 C291,617 106,617 106,617 C103.79,617 102,615.21 102,613 C102,613 102,605 102,605 C102,602.79 103.79,601 106,601 C106,601 291,601 291,601 C293.21,601 295,602.79 295,605c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_14_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M223 671 C223,671 223,681 223,681 C223,683.21 221.21,685 219,685 C219,685 106,685 106,685 C103.79,685 102,683.21 102,681 C102,681 102,671 102,671 C102,668.79 103.79,667 106,667 C106,667 219,667 219,667 C221.21,667 223,668.79 223,671c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_15_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M246 693 C246,693 246,701 246,701 C246,703.21 244.21,705 242,705 C242,705 106,705 106,705 C103.79,705 102,703.21 102,701 C102,701 102,693 102,693 C102,690.79 103.79,689 106,689 C106,689 242,689 242,689 C244.21,689 246,690.79 246,693c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_16_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M388 798 C388,798 388,798 388,798 C388,813.45 375.45,826 360,826 C360,826 267,826 267,826 C251.55,826 239,813.45 239,798 C239,798 239,798 239,798 C239,782.55 251.55,770 267,770 C267,770 360,770 360,770 C375.45,770 388,782.55 388,798c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_17_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#f8f9fa"
+                                android:fillType="nonZero"
+                                android:pathData=" M377 47 C377,47 377,75 377,75 C377,77.21 375.21,79 373,79 C373,79 38,79 38,79 C35.79,79 34,77.21 34,75 C34,75 34,47 34,47 C34,44.79 35.79,43 38,43 C38,43 373,43 373,43 C375.21,43 377,44.79 377,47c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_18_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M82 157 C82,172.46 69.46,185 54,185 C38.54,185 26,172.46 26,157 C26,141.54 38.54,129 54,129 C69.46,129 82,141.54 82,157c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_19_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M82 245 C82,260.46 69.46,273 54,273 C38.54,273 26,260.46 26,245 C26,229.54 38.54,217 54,217 C69.46,217 82,229.54 82,245c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_20_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M82 333 C82,348.46 69.46,361 54,361 C38.54,361 26,348.46 26,333 C26,317.54 38.54,305 54,305 C69.46,305 82,317.54 82,333c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_21_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M82 421 C82,436.46 69.46,449 54,449 C38.54,449 26,436.46 26,421 C26,405.54 38.54,393 54,393 C69.46,393 82,405.54 82,421c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_22_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M82 509 C82,524.46 69.46,537 54,537 C38.54,537 26,524.46 26,509 C26,493.54 38.54,481 54,481 C69.46,481 82,493.54 82,509c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_23_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M82 597 C82,612.46 69.46,625 54,625 C38.54,625 26,612.46 26,597 C26,581.54 38.54,569 54,569 C69.46,569 82,581.54 82,597c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_24_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M82 685 C82,700.46 69.46,713 54,713 C38.54,713 26,700.46 26,685 C26,669.54 38.54,657 54,657 C69.46,657 82,669.54 82,685c " />
+                        </group>
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_2_G"
+                    android:scaleY="0"
+                    android:translateX="28.25"
+                    android:translateY="443">
+                    <group
+                        android:name="_R_G_L_2_G_D_0_P_0_G_0_T_0"
+                        android:rotation="180"
+                        android:translateX="414"
+                        android:translateY="53">
+                        <path
+                            android:name="_R_G_L_2_G_D_0_P_0"
+                            android:fillAlpha="1"
+                            android:fillColor="#000000"
+                            android:fillType="nonZero"
+                            android:pathData=" M28.25 0 C28.25,31.2 2.95,56.5 -28.25,56.5 C-28.25,56.5 -28.25,-56.5 -28.25,-56.5 C2.95,-56.5 28.25,-31.2 28.25,0c " />
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_1_G"
+                    android:rotation="180"
+                    android:scaleY="0"
+                    android:translateX="25.75"
+                    android:translateY="496">
+                    <group
+                        android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0"
+                        android:scaleX="0.5"
+                        android:scaleY="0.5"
+                        android:translateX="-407"
+                        android:translateY="0">
+                        <path
+                            android:name="_R_G_L_1_G_D_0_P_0"
+                            android:fillAlpha="0"
+                            android:fillColor="#ffffff"
+                            android:fillType="nonZero"
+                            android:pathData=" M3.87 -13.45 C3.07,-14.21 1.8,-14.18 1.04,-13.38 C0.28,-12.58 0.31,-11.31 1.11,-10.55 C1.11,-10.55 9.75,-2.32 9.75,-2.32 C9.75,-2.32 -14.75,-2.32 -14.75,-2.32 C-15.85,-2.32 -16.75,-1.43 -16.75,-0.32 C-16.75,0.78 -15.85,1.68 -14.75,1.68 C-14.75,1.68 9.94,1.68 9.94,1.68 C9.94,1.68 1.07,10.59 1.07,10.59 C0.29,11.37 0.29,12.64 1.08,13.42 C1.86,14.2 3.13,14.19 3.9,13.41 C3.9,13.41 16.17,1.09 16.17,1.09 C16.55,0.71 16.76,0.19 16.75,-0.35 C16.74,-0.89 16.52,-1.4 16.13,-1.77 C16.13,-1.77 3.87,-13.45 3.87,-13.45c " />
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_0_G"
+                    android:translateX="206"
+                    android:translateY="446">
+                    <path
+                        android:name="_R_G_L_0_G_D_0_P_0"
+                        android:fillAlpha="0"
+                        android:fillColor="#84ba69"
+                        android:fillType="nonZero"
+                        android:pathData=" M205 13.5 C225.16,13.5 241.5,29.84 241.5,50 C241.5,70.16 225.16,86.5 205,86.5 C184.84,86.5 168.5,70.16 168.5,50 C168.5,29.84 184.84,13.5 205,13.5c " />
+                </group>
+            </group>
+            <group android:name="time_group" />
+        </vector>
+    </aapt:attr>
+</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_motion_home.xml b/quickstep/res/drawable/gesture_tutorial_motion_home.xml
new file mode 100644
index 0000000000..9dbaee6247
--- /dev/null
+++ b/quickstep/res/drawable/gesture_tutorial_motion_home.xml
@@ -0,0 +1,1254 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <target android:name="_R_G_L_2_G_L_4_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="50"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="600"
+                    android:valueFrom="0"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="650"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_4_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="50"
+                    android:pathData="M 206,776C 206,776 206,776 206,776"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="600">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.27,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="700"
+                    android:pathData="M 206,776C 206,776 206,797 206,797"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="650">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.27,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_4_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="650"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_3_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="600"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_3_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="700"
+                    android:pathData="M 56,673C 56,673 56,706 56,706"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="600">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.27,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_3_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="600"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_2_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="600"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="700"
+                    android:pathData="M 156,673C 156,673 156,706 156,706"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="600">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.27,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="600"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_1_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="600"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="700"
+                    android:pathData="M 256,673C 256,673 256,706 256,706"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="600">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.27,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="600"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="600"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="700"
+                    android:pathData="M 356,673C 356,673 356,706 356,706"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="600">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.27,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="600"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="600"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_4_G_L_11_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#dadce0"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1.215 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_4_G_L_10_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#bdc1c6"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1.92 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_4_G_L_9_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#bdc1c6"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1.92 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_4_G_L_8_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#bdc1c6"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1.92 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_4_G_L_7_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#bdc1c6"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1.92 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_4_G_L_6_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#bdc1c6"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1.92 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_4_G_L_5_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#bdc1c6"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1.92 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_4_G_L_4_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#bdc1c6"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1.92 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_4_G_L_3_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#bdc1c6"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1.92 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_4_G_L_2_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#bdc1c6"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1.92 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_4_G_L_1_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#bdc1c6"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1.92 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_4_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#bdc1c6"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1.92 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_4_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="517"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_3_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#bdc1c6"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1.92 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_3_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="517"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_2_G_L_2_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#e8eaed"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1.232 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_2_G_L_1_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#80868b"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,0.674 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_2_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#80868b"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,0.674 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="517"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_1_G_L_2_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="150"
+                    android:propertyName="fillColor"
+                    android:startOffset="350"
+                    android:valueFrom="#202124"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,0.69 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_1_G_L_1_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="150"
+                    android:propertyName="fillColor"
+                    android:startOffset="350"
+                    android:valueFrom="#202124"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,0.69 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_1_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="150"
+                    android:propertyName="fillColor"
+                    android:startOffset="350"
+                    android:valueFrom="#3c4043"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,0.69 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="517"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillColor"
+                    android:startOffset="500"
+                    android:valueFrom="#bac4d6"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="50"
+                    android:propertyName="fillColor"
+                    android:startOffset="633"
+                    android:valueFrom="#bac4d6"
+                    android:valueTo="#8ab4f8"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,-0.214 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="283"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="500"
+                    android:valueFrom="1"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.999,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="283"
+                    android:propertyName="pathData"
+                    android:startOffset="500"
+                    android:valueFrom="M206.06 -430.06 C206.06,-430.06 206,431 206,431 C206,446 189.75,446 189.79,446 C189.79,446 -189.98,446 -189.98,446 C-189.94,446 -206,446 -206,431 C-206,431 -206,-430 -206,-430 C-206,-446 -189.97,-446 -190.01,-446 C-190.01,-446 188.98,-446.06 188.98,-446.06 C188.94,-446.06 206,-446 206.06,-430.06c "
+                    android:valueTo="M60 -0.06 C60,-0.06 60,0.06 60,0.06 C60,28 36,60.25 -0.02,60.25 C-0.02,60.25 0.02,60.25 0.02,60.25 C-32.5,60.25 -60,31.5 -60,0.06 C-60,0.06 -60,-0.06 -60,-0.06 C-60,-31.25 -34,-59.25 0.02,-59.25 C0.02,-59.25 -0.02,-59.25 -0.02,-59.25 C33.5,-59.25 60,-38 60,-0.06c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.999,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="500"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="850"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_T_1">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="283"
+                    android:pathData="M 206,446C 201.417,411.133 195,385.297 195,385.297"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="217">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="333"
+                    android:pathData="M 195,385.297C 195,385.297 105.5,148.09000000000003 56,691.5"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="500">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.443,0.093 0.5,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_T_1">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="467"
+                    android:propertyName="scaleX"
+                    android:startOffset="217"
+                    android:valueFrom="1"
+                    android:valueTo="0.5"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="467"
+                    android:propertyName="scaleY"
+                    android:startOffset="217"
+                    android:valueFrom="1"
+                    android:valueTo="0.5"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_T_1">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2167"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="217"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="0.75"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="233"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="217"
+                    android:valueFrom="0.75"
+                    android:valueTo="0.75"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="450"
+                    android:valueFrom="0.75"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="217"
+                    android:propertyName="pathData"
+                    android:startOffset="0"
+                    android:valueFrom="M0 411 C19.33,411 35,426.67 35,446 C35,465.33 19.33,481 0,481 C-19.33,481 -35,465.33 -35,446 C-35,426.67 -19.33,411 0,411c "
+                    android:valueTo="M0 396 C27.61,396 50,418.39 50,446 C50,473.61 27.61,496 0,496 C-27.61,496 -50,473.61 -50,446 C-50,418.39 -27.61,396 0,396c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="433"
+                    android:propertyName="pathData"
+                    android:startOffset="217"
+                    android:valueFrom="M0 396 C27.61,396 50,418.39 50,446 C50,473.61 27.61,496 0,496 C-27.61,496 -50,473.61 -50,446 C-50,418.39 -27.61,396 0,396c "
+                    android:valueTo="M0 68 C27.61,68 50,90.39 50,118 C50,145.61 27.61,168 0,168 C-27.61,168 -50,145.61 -50,118 C-50,90.39 -27.61,68 0,68c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2167"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="1367"
+                    android:propertyName="translateX"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <aapt:attr name="android:drawable">
+        <vector
+            android:width="412dp"
+            android:height="892dp"
+            android:viewportHeight="892"
+            android:viewportWidth="412">
+            <group android:name="_R_G">
+                <group
+                    android:name="_R_G_L_3_G"
+                    android:translateX="206"
+                    android:translateY="446">
+                    <path
+                        android:name="_R_G_L_3_G_D_0_P_0"
+                        android:fillAlpha="1"
+                        android:fillColor="#000000"
+                        android:fillType="nonZero"
+                        android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c " />
+                </group>
+                <group
+                    android:name="_R_G_L_2_G"
+                    android:scaleY="0">
+                    <group
+                        android:name="_R_G_L_2_G_L_4_G"
+                        android:scaleY="0"
+                        android:translateX="206"
+                        android:translateY="776">
+                        <path
+                            android:name="_R_G_L_2_G_L_4_G_D_0_P_0"
+                            android:fillAlpha="0"
+                            android:fillColor="#3c4043"
+                            android:fillType="nonZero"
+                            android:pathData=" M180 0 C180,0 180,0 180,0 C180,13.8 168.8,25 155,25 C155,25 -155,25 -155,25 C-168.8,25 -180,13.8 -180,0 C-180,0 -180,0 -180,0 C-180,-13.8 -168.8,-25 -155,-25 C-155,-25 155,-25 155,-25 C168.8,-25 180,-13.8 180,0c " />
+                    </group>
+                    <group
+                        android:name="_R_G_L_2_G_L_3_G"
+                        android:scaleY="0"
+                        android:translateX="56"
+                        android:translateY="673">
+                        <path
+                            android:name="_R_G_L_2_G_L_3_G_D_0_P_0"
+                            android:fillAlpha="0"
+                            android:fillColor="#8ab4f8"
+                            android:fillType="nonZero"
+                            android:pathData=" M0 -30 C16.56,-30 30,-16.56 30,0 C30,16.56 16.56,30 0,30 C-16.56,30 -30,16.56 -30,0 C-30,-16.56 -16.56,-30 0,-30c " />
+                    </group>
+                    <group
+                        android:name="_R_G_L_2_G_L_2_G"
+                        android:scaleY="0"
+                        android:translateX="156"
+                        android:translateY="673">
+                        <path
+                            android:name="_R_G_L_2_G_L_2_G_D_0_P_0"
+                            android:fillAlpha="0"
+                            android:fillColor="#f28b82"
+                            android:fillType="nonZero"
+                            android:pathData=" M0 -30 C16.56,-30 30,-16.56 30,0 C30,16.56 16.56,30 0,30 C-16.56,30 -30,16.56 -30,0 C-30,-16.56 -16.56,-30 0,-30c " />
+                    </group>
+                    <group
+                        android:name="_R_G_L_2_G_L_1_G"
+                        android:scaleY="0"
+                        android:translateX="256"
+                        android:translateY="673">
+                        <path
+                            android:name="_R_G_L_2_G_L_1_G_D_0_P_0"
+                            android:fillAlpha="0"
+                            android:fillColor="#fdd663"
+                            android:fillType="nonZero"
+                            android:pathData=" M0 -30 C16.56,-30 30,-16.56 30,0 C30,16.56 16.56,30 0,30 C-16.56,30 -30,16.56 -30,0 C-30,-16.56 -16.56,-30 0,-30c " />
+                    </group>
+                    <group
+                        android:name="_R_G_L_2_G_L_0_G"
+                        android:scaleY="0"
+                        android:translateX="356"
+                        android:translateY="673">
+                        <path
+                            android:name="_R_G_L_2_G_L_0_G_D_0_P_0"
+                            android:fillAlpha="0"
+                            android:fillColor="#81c995"
+                            android:fillType="nonZero"
+                            android:pathData=" M0 -30 C16.56,-30 30,-16.56 30,0 C30,16.56 16.56,30 0,30 C-16.56,30 -30,16.56 -30,0 C-30,-16.56 -16.56,-30 0,-30c " />
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_1_G_T_1"
+                    android:scaleX="1"
+                    android:scaleY="1"
+                    android:translateX="206"
+                    android:translateY="446">
+                    <group
+                        android:name="_R_G_L_1_G"
+                        android:translateX="-206"
+                        android:translateY="-446">
+                        <group android:name="_R_G_L_1_G_L_4_G">
+                            <group
+                                android:name="_R_G_L_1_G_L_4_G_L_11_G"
+                                android:scaleX="0.87473"
+                                android:scaleY="0.98643"
+                                android:translateX="206"
+                                android:translateY="472.769">
+                                <path
+                                    android:name="_R_G_L_1_G_L_4_G_L_11_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#dadce0"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M235.5 -407 C235.5,-407 235.5,407 235.5,407 C235.5,416.93 227.43,425 217.5,425 C217.5,425 -217.5,425 -217.5,425 C-227.43,425 -235.5,416.93 -235.5,407 C-235.5,407 -235.5,-407 -235.5,-407 C-235.5,-416.93 -227.43,-425 -217.5,-425 C-217.5,-425 217.5,-425 217.5,-425 C227.43,-425 235.5,-416.93 235.5,-407c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_4_G_L_10_G"
+                                android:translateX="182.5"
+                                android:translateY="831">
+                                <path
+                                    android:name="_R_G_L_1_G_L_4_G_L_10_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M158.5 -3 C158.5,-3 158.5,3 158.5,3 C158.5,7.42 154.92,11 150.5,11 C150.5,11 -150.5,11 -150.5,11 C-154.92,11 -158.5,7.42 -158.5,3 C-158.5,3 -158.5,-3 -158.5,-3 C-158.5,-7.42 -154.92,-11 -150.5,-11 C-150.5,-11 150.5,-11 150.5,-11 C154.92,-11 158.5,-7.42 158.5,-3c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_4_G_L_9_G"
+                                android:translateX="186"
+                                android:translateY="801">
+                                <path
+                                    android:name="_R_G_L_1_G_L_4_G_L_9_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M162 -3 C162,-3 162,3 162,3 C162,7.42 158.42,11 154,11 C154,11 -154,11 -154,11 C-158.42,11 -162,7.42 -162,3 C-162,3 -162,-3 -162,-3 C-162,-7.42 -158.42,-11 -154,-11 C-154,-11 154,-11 154,-11 C158.42,-11 162,-7.42 162,-3c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_4_G_L_8_G"
+                                android:translateX="119"
+                                android:translateY="755">
+                                <path
+                                    android:name="_R_G_L_1_G_L_4_G_L_8_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M95 -3 C95,-3 95,3 95,3 C95,7.42 91.42,11 87,11 C87,11 -87,11 -87,11 C-91.42,11 -95,7.42 -95,3 C-95,3 -95,-3 -95,-3 C-95,-7.42 -91.42,-11 -87,-11 C-87,-11 87,-11 87,-11 C91.42,-11 95,-7.42 95,-3c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_4_G_L_7_G"
+                                android:translateX="182.5"
+                                android:translateY="725">
+                                <path
+                                    android:name="_R_G_L_1_G_L_4_G_L_7_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M158.5 -3 C158.5,-3 158.5,3 158.5,3 C158.5,7.42 154.92,11 150.5,11 C150.5,11 -150.5,11 -150.5,11 C-154.92,11 -158.5,7.42 -158.5,3 C-158.5,3 -158.5,-3 -158.5,-3 C-158.5,-7.42 -154.92,-11 -150.5,-11 C-150.5,-11 150.5,-11 150.5,-11 C154.92,-11 158.5,-7.42 158.5,-3c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_4_G_L_6_G"
+                                android:translateX="197.5"
+                                android:translateY="695">
+                                <path
+                                    android:name="_R_G_L_1_G_L_4_G_L_6_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M173.5 -3 C173.5,-3 173.5,3 173.5,3 C173.5,7.42 169.92,11 165.5,11 C165.5,11 -165.5,11 -165.5,11 C-169.92,11 -173.5,7.42 -173.5,3 C-173.5,3 -173.5,-3 -173.5,-3 C-173.5,-7.42 -169.92,-11 -165.5,-11 C-165.5,-11 165.5,-11 165.5,-11 C169.92,-11 173.5,-7.42 173.5,-3c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_4_G_L_5_G"
+                                android:translateX="192"
+                                android:translateY="665">
+                                <path
+                                    android:name="_R_G_L_1_G_L_4_G_L_5_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M168 -3 C168,-3 168,3 168,3 C168,7.42 164.42,11 160,11 C160,11 -160,11 -160,11 C-164.42,11 -168,7.42 -168,3 C-168,3 -168,-3 -168,-3 C-168,-7.42 -164.42,-11 -160,-11 C-160,-11 160,-11 160,-11 C164.42,-11 168,-7.42 168,-3c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_4_G_L_4_G"
+                                android:translateX="105.5"
+                                android:translateY="360">
+                                <path
+                                    android:name="_R_G_L_1_G_L_4_G_L_4_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M23.5 -2 C23.5,-2 23.5,2 23.5,2 C23.5,4.21 21.71,6 19.5,6 C19.5,6 -19.5,6 -19.5,6 C-21.71,6 -23.5,4.21 -23.5,2 C-23.5,2 -23.5,-2 -23.5,-2 C-23.5,-4.21 -21.71,-6 -19.5,-6 C-19.5,-6 19.5,-6 19.5,-6 C21.71,-6 23.5,-4.21 23.5,-2c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_4_G_L_3_G"
+                                android:translateX="47.5"
+                                android:translateY="360">
+                                <path
+                                    android:name="_R_G_L_1_G_L_4_G_L_3_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M23.5 -2 C23.5,-2 23.5,2 23.5,2 C23.5,4.21 21.71,6 19.5,6 C19.5,6 -19.5,6 -19.5,6 C-21.71,6 -23.5,4.21 -23.5,2 C-23.5,2 -23.5,-2 -23.5,-2 C-23.5,-4.21 -21.71,-6 -19.5,-6 C-19.5,-6 19.5,-6 19.5,-6 C21.71,-6 23.5,-4.21 23.5,-2c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_4_G_L_2_G"
+                                android:translateX="142.5"
+                                android:translateY="328">
+                                <path
+                                    android:name="_R_G_L_1_G_L_4_G_L_2_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M118.5 -10 C118.5,-10 118.5,10 118.5,10 C118.5,14.42 114.92,18 110.5,18 C110.5,18 -110.5,18 -110.5,18 C-114.92,18 -118.5,14.42 -118.5,10 C-118.5,10 -118.5,-10 -118.5,-10 C-118.5,-14.42 -114.92,-18 -110.5,-18 C-110.5,-18 110.5,-18 110.5,-18 C114.92,-18 118.5,-14.42 118.5,-10c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_4_G_L_1_G"
+                                android:translateX="186"
+                                android:translateY="284">
+                                <path
+                                    android:name="_R_G_L_1_G_L_4_G_L_1_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M162 -10 C162,-10 162,10 162,10 C162,14.42 158.42,18 154,18 C154,18 -154,18 -154,18 C-158.42,18 -162,14.42 -162,10 C-162,10 -162,-10 -162,-10 C-162,-14.42 -158.42,-18 -154,-18 C-154,-18 154,-18 154,-18 C158.42,-18 162,-14.42 162,-10c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_4_G_L_0_G"
+                                android:translateX="155"
+                                android:translateY="240">
+                                <path
+                                    android:name="_R_G_L_1_G_L_4_G_L_0_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M131 -10 C131,-10 131,10 131,10 C131,14.42 127.42,18 123,18 C123,18 -123,18 -123,18 C-127.42,18 -131,14.42 -131,10 C-131,10 -131,-10 -131,-10 C-131,-14.42 -127.42,-18 -123,-18 C-123,-18 123,-18 123,-18 C127.42,-18 131,-14.42 131,-10c " />
+                            </group>
+                        </group>
+                        <group
+                            android:name="_R_G_L_1_G_L_3_G"
+                            android:translateX="24"
+                            android:translateY="390">
+                            <group
+                                android:name="_R_G_L_1_G_L_3_G_L_0_G"
+                                android:translateX="182"
+                                android:translateY="120">
+                                <path
+                                    android:name="_R_G_L_1_G_L_3_G_L_0_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M182 -98 C182,-98 182,98 182,98 C182,110.14 172.14,120 160,120 C160,120 -160,120 -160,120 C-172.14,120 -182,110.14 -182,98 C-182,98 -182,-98 -182,-98 C-182,-110.14 -172.14,-120 -160,-120 C-160,-120 160,-120 160,-120 C172.14,-120 182,-110.14 182,-98c " />
+                            </group>
+                        </group>
+                        <group android:name="_R_G_L_1_G_L_2_G">
+                            <group
+                                android:name="_R_G_L_1_G_L_2_G_L_2_G"
+                                android:translateX="206"
+                                android:translateY="145">
+                                <path
+                                    android:name="_R_G_L_1_G_L_2_G_L_2_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#e8eaed"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M206 -95.63 C206,-95.63 206,42.37 206,42.37 C206,43.47 205.1,44.37 204,44.37 C204,44.37 -204,44.37 -204,44.37 C-205.1,44.37 -206,43.47 -206,42.37 C-206,42.37 -206,-95.63 -206,-95.63 C-206,-96.73 -205.1,-97.63 -204,-97.63 C-204,-97.63 204,-97.63 204,-97.63 C205.1,-97.63 206,-96.73 206,-95.63c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_2_G_L_1_G"
+                                android:translateX="206"
+                                android:translateY="145">
+                                <path
+                                    android:name="_R_G_L_1_G_L_2_G_L_1_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#80868b"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M109 -14 C109,-14 109,14 109,14 C109,15.1 108.1,16 107,16 C107,16 -107,16 -107,16 C-108.1,16 -109,15.1 -109,14 C-109,14 -109,-14 -109,-14 C-109,-15.1 -108.1,-16 -107,-16 C-107,-16 107,-16 107,-16 C108.1,-16 109,-15.1 109,-14c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_2_G_L_0_G"
+                                android:translateX="46"
+                                android:translateY="145">
+                                <path
+                                    android:name="_R_G_L_1_G_L_2_G_L_0_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#80868b"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M22 -14 C22,-14 22,14 22,14 C22,18.42 18.42,22 14,22 C14,22 -14,22 -14,22 C-18.42,22 -22,18.42 -22,14 C-22,14 -22,-14 -22,-14 C-22,-18.42 -18.42,-22 -14,-22 C-14,-22 14,-22 14,-22 C18.42,-22 22,-18.42 22,-14c " />
+                            </group>
+                        </group>
+                        <group android:name="_R_G_L_1_G_L_1_G">
+                            <group
+                                android:name="_R_G_L_1_G_L_1_G_L_2_G"
+                                android:translateX="206"
+                                android:translateY="51">
+                                <path
+                                    android:name="_R_G_L_1_G_L_1_G_L_2_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#202124"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M206 -0.27 C206,-0.27 206,49.73 206,49.73 C206,49.73 -206,49.73 -206,49.73 C-206,49.73 -206,-0.27 -206,-0.27 C-206,-0.27 206,-0.27 206,-0.27c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_1_G_L_1_G"
+                                android:translateX="206"
+                                android:translateY="50.5">
+                                <path
+                                    android:name="_R_G_L_1_G_L_1_G_L_1_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#202124"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M206 -32.5 C206,-32.5 206,32.5 206,32.5 C206,42.43 197.93,50.5 188,50.5 C188,50.5 -188,50.5 -188,50.5 C-197.93,50.5 -206,42.43 -206,32.5 C-206,32.5 -206,-32.5 -206,-32.5 C-206,-42.43 -197.93,-50.5 -188,-50.5 C-188,-50.5 188,-50.5 188,-50.5 C197.93,-50.5 206,-42.43 206,-32.5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_1_G_L_0_G"
+                                android:translateX="206"
+                                android:translateY="66.5">
+                                <path
+                                    android:name="_R_G_L_1_G_L_1_G_L_0_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#3c4043"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M190 0 C190,0 190,0 190,0 C190,10.21 181.71,18.5 171.5,18.5 C171.5,18.5 -171.5,18.5 -171.5,18.5 C-181.71,18.5 -190,10.21 -190,0 C-190,0 -190,0 -190,0 C-190,-10.21 -181.71,-18.5 -171.5,-18.5 C-171.5,-18.5 171.5,-18.5 171.5,-18.5 C181.71,-18.5 190,-10.21 190,0c " />
+                            </group>
+                        </group>
+                        <group
+                            android:name="_R_G_L_1_G_L_0_G"
+                            android:scaleY="0"
+                            android:translateX="206"
+                            android:translateY="446">
+                            <path
+                                android:name="_R_G_L_1_G_L_0_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bac4d6"
+                                android:fillType="nonZero"
+                                android:pathData=" M206.06 -430.06 C206.06,-430.06 206,431 206,431 C206,446 189.75,446 189.79,446 C189.79,446 -189.98,446 -189.98,446 C-189.94,446 -206,446 -206,431 C-206,431 -206,-430 -206,-430 C-206,-446 -189.97,-446 -190.01,-446 C-190.01,-446 188.98,-446.06 188.98,-446.06 C188.94,-446.06 206,-446 206.06,-430.06c " />
+                        </group>
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_0_G"
+                    android:translateX="206"
+                    android:translateY="446">
+                    <path
+                        android:name="_R_G_L_0_G_D_0_P_0"
+                        android:fillAlpha="0"
+                        android:fillColor="#84ba69"
+                        android:fillType="nonZero"
+                        android:pathData=" M0 411 C19.33,411 35,426.67 35,446 C35,465.33 19.33,481 0,481 C-19.33,481 -35,465.33 -35,446 C-35,426.67 -19.33,411 0,411c " />
+                </group>
+            </group>
+            <group android:name="time_group" />
+        </vector>
+    </aapt:attr>
+</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_motion_overview.xml b/quickstep/res/drawable/gesture_tutorial_motion_overview.xml
new file mode 100644
index 0000000000..4751fa9e2b
--- /dev/null
+++ b/quickstep/res/drawable/gesture_tutorial_motion_overview.xml
@@ -0,0 +1,1623 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <target android:name="_R_G_L_4_G_N_3_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="1050"
+                    android:pathData="M 206,446C 206,446 206,395 206,395"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="217">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_N_3_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="1050"
+                    android:propertyName="scaleX"
+                    android:startOffset="217"
+                    android:valueFrom="1"
+                    android:valueTo="0.6"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="1050"
+                    android:propertyName="scaleY"
+                    android:startOffset="217"
+                    android:valueFrom="1"
+                    android:valueTo="0.6"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_N_3_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="3400"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_28_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_27_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_26_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_25_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_24_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_23_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_22_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_21_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_20_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_19_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_18_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_17_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_16_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_15_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_14_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_13_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_12_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_11_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_10_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_9_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_8_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_7_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_6_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_5_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_4_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_3_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_N_2_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="350"
+                    android:pathData="M 206,395C 206,403.5 206,437.5 206,446"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="2083">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_N_2_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="350"
+                    android:propertyName="scaleX"
+                    android:startOffset="2083"
+                    android:valueFrom="0.6"
+                    android:valueTo="0.72718"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="350"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0.6"
+                    android:valueTo="0.72718"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="217"
+                    android:propertyName="scaleX"
+                    android:startOffset="2433"
+                    android:valueFrom="0.72718"
+                    android:valueTo="0.72"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.51,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="217"
+                    android:propertyName="scaleY"
+                    android:startOffset="2433"
+                    android:valueFrom="0.72718"
+                    android:valueTo="0.72"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.51,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_N_2_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="0.6"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_D_0_P_0_G_0_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="scaleX"
+                    android:startOffset="2567"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="scaleY"
+                    android:startOffset="2567"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_N_2_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="350"
+                    android:pathData="M 206,395C 206,403.5 206,437.5 206,446"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="2083">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_N_2_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="350"
+                    android:propertyName="scaleX"
+                    android:startOffset="2083"
+                    android:valueFrom="0.6"
+                    android:valueTo="0.72718"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="350"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0.6"
+                    android:valueTo="0.72718"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="217"
+                    android:propertyName="scaleX"
+                    android:startOffset="2433"
+                    android:valueFrom="0.72718"
+                    android:valueTo="0.72"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.51,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="217"
+                    android:propertyName="scaleY"
+                    android:startOffset="2433"
+                    android:valueFrom="0.72718"
+                    android:valueTo="0.72"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.51,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_N_2_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2567"
+                    android:valueFrom="0"
+                    android:valueTo="0.6"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="250"
+                    android:pathData="M -556.176,-7.307C -556.176,-7.307 -421.176,-7.307 -421.176,-7.307"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="1350">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.272,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="417"
+                    android:pathData="M -421.176,-7.307C -421.176,-7.307 -429.51,-7.307 -429.51,-7.307"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="1600">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_N_2_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="350"
+                    android:pathData="M 206,395C 206,403.5 206,437.5 206,446"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="2083">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_N_2_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="350"
+                    android:propertyName="scaleX"
+                    android:startOffset="2083"
+                    android:valueFrom="0.6"
+                    android:valueTo="0.72718"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="350"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0.6"
+                    android:valueTo="0.72718"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="217"
+                    android:propertyName="scaleX"
+                    android:startOffset="2433"
+                    android:valueFrom="0.72718"
+                    android:valueTo="0.72"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.51,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="217"
+                    android:propertyName="scaleY"
+                    android:startOffset="2433"
+                    android:valueFrom="0.72718"
+                    android:valueTo="0.72"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.51,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_N_2_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="1350"
+                    android:valueFrom="0"
+                    android:valueTo="0.6"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="217"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="0.75"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="1833"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="217"
+                    android:valueFrom="0.75"
+                    android:valueTo="0.75"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="2050"
+                    android:valueFrom="0.75"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="217"
+                    android:propertyName="pathData"
+                    android:startOffset="0"
+                    android:valueFrom="M0 406 C21.54,406 39,423.46 39,445 C39,466.54 21.54,484 0,484 C-21.54,484 -39,466.54 -39,445 C-39,423.46 -21.54,406 0,406c "
+                    android:valueTo="M0 395 C27.61,395 50,417.39 50,445 C50,472.61 27.61,495 0,495 C-27.61,495 -50,472.61 -50,445 C-50,417.39 -27.61,395 0,395c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="1050"
+                    android:propertyName="pathData"
+                    android:startOffset="217"
+                    android:valueFrom="M0 395 C27.61,395 50,417.39 50,445 C50,472.61 27.61,495 0,495 C-27.61,495 -50,472.61 -50,445 C-50,417.39 -27.61,395 0,395c "
+                    android:valueTo="M0 166 C27.61,166 50,188.39 50,216 C50,243.61 27.61,266 0,266 C-27.61,266 -50,243.61 -50,216 C-50,188.39 -27.61,166 0,166c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="783"
+                    android:propertyName="pathData"
+                    android:startOffset="1267"
+                    android:valueFrom="M0 166 C27.61,166 50,188.39 50,216 C50,243.61 27.61,266 0,266 C-27.61,266 -50,243.61 -50,216 C-50,188.39 -27.61,166 0,166c "
+                    android:valueTo="M0 166 C27.61,166 50,188.39 50,216 C50,243.61 27.61,266 0,266 C-27.61,266 -50,243.61 -50,216 C-50,188.39 -27.61,166 0,166c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="pathData"
+                    android:startOffset="2050"
+                    android:valueFrom="M0 166 C27.61,166 50,188.39 50,216 C50,243.61 27.61,266 0,266 C-27.61,266 -50,243.61 -50,216 C-50,188.39 -27.61,166 0,166c "
+                    android:valueTo="M0 180 C19.88,180 36,196.12 36,216 C36,235.88 19.88,252 0,252 C-19.88,252 -36,235.88 -36,216 C-36,196.12 -19.88,180 0,180c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="2750"
+                    android:propertyName="translateX"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <aapt:attr name="android:drawable">
+        <vector
+            android:width="412dp"
+            android:height="892dp"
+            android:viewportHeight="892"
+            android:viewportWidth="412">
+            <group android:name="_R_G">
+                <group
+                    android:name="_R_G_L_5_G"
+                    android:translateX="206"
+                    android:translateY="446">
+                    <path
+                        android:name="_R_G_L_5_G_D_0_P_0"
+                        android:fillAlpha="1"
+                        android:fillColor="#000000"
+                        android:fillType="nonZero"
+                        android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c " />
+                </group>
+                <group
+                    android:name="_R_G_L_4_G_N_3_T_0"
+                    android:scaleX="1"
+                    android:scaleY="1"
+                    android:translateX="206"
+                    android:translateY="446">
+                    <group
+                        android:name="_R_G_L_4_G"
+                        android:translateX="-206"
+                        android:translateY="-446">
+                        <group android:name="_R_G_L_4_G_L_0_G">
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_28_G"
+                                android:translateX="206"
+                                android:translateY="446">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_28_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#000000"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M206 -422 C206,-422 206,422 206,422 C206,435.25 195.25,446 182,446 C182,446 -182,446 -182,446 C-195.25,446 -206,435.25 -206,422 C-206,422 -206,-422 -206,-422 C-206,-435.25 -195.25,-446 -182,-446 C-182,-446 182,-446 182,-446 C195.25,-446 206,-435.25 206,-422c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_27_G"
+                                android:translateX="206"
+                                android:translateY="422.5">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_27_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#dadce0"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M206 -395.5 C206,-395.5 206,395.5 206,395.5 C206,395.5 -206,395.5 -206,395.5 C-206,395.5 -206,-395.5 -206,-395.5 C-206,-395.5 206,-395.5 206,-395.5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_26_G"
+                                android:translateX="206"
+                                android:translateY="496.5">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_26_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#dadce0"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M206 -377.5 C206,-377.5 206,377.5 206,377.5 C206,387.43 197.93,395.5 188,395.5 C188,395.5 -188,395.5 -188,395.5 C-197.93,395.5 -206,387.43 -206,377.5 C-206,377.5 -206,-377.5 -206,-377.5 C-206,-387.43 -197.93,-395.5 -188,-395.5 C-188,-395.5 188,-395.5 188,-395.5 C197.93,-395.5 206,-387.43 206,-377.5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_25_G"
+                                android:translateX="206"
+                                android:translateY="50.5">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_25_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#e8eaed"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M206 -23.5 C206,-23.5 206,50.5 206,50.5 C206,50.5 -206,50.5 -206,50.5 C-206,50.5 -206,-23.5 -206,-23.5 C-206,-23.5 206,-23.5 206,-23.5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_24_G"
+                                android:translateX="206"
+                                android:translateY="50.5">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_24_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#e8eaed"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M206 -32.5 C206,-32.5 206,32.5 206,32.5 C206,42.43 197.93,50.5 188,50.5 C188,50.5 -188,50.5 -188,50.5 C-197.93,50.5 -206,42.43 -206,32.5 C-206,32.5 -206,-32.5 -206,-32.5 C-206,-42.43 -197.93,-50.5 -188,-50.5 C-188,-50.5 188,-50.5 188,-50.5 C197.93,-50.5 206,-42.43 206,-32.5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_23_G"
+                                android:translateX="54"
+                                android:translateY="157">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_23_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_22_G"
+                                android:translateX="54"
+                                android:translateY="157">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_22_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_21_G"
+                                android:translateX="148.5"
+                                android:translateY="148">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_21_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M46.5 -5 C46.5,-5 46.5,5 46.5,5 C46.5,7.21 44.71,9 42.5,9 C42.5,9 -42.5,9 -42.5,9 C-44.71,9 -46.5,7.21 -46.5,5 C-46.5,5 -46.5,-5 -46.5,-5 C-46.5,-7.21 -44.71,-9 -42.5,-9 C-42.5,-9 42.5,-9 42.5,-9 C44.71,-9 46.5,-7.21 46.5,-5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_20_G"
+                                android:translateX="186"
+                                android:translateY="169">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_20_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M84 -4 C84,-4 84,4 84,4 C84,6.21 82.21,8 80,8 C80,8 -80,8 -80,8 C-82.21,8 -84,6.21 -84,4 C-84,4 -84,-4 -84,-4 C-84,-6.21 -82.21,-8 -80,-8 C-80,-8 80,-8 80,-8 C82.21,-8 84,-6.21 84,-4c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_19_G"
+                                android:translateX="54"
+                                android:translateY="245">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_19_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_18_G"
+                                android:translateX="162"
+                                android:translateY="236">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_18_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M60 -5 C60,-5 60,5 60,5 C60,7.21 58.21,9 56,9 C56,9 -56,9 -56,9 C-58.21,9 -60,7.21 -60,5 C-60,5 -60,-5 -60,-5 C-60,-7.21 -58.21,-9 -56,-9 C-56,-9 56,-9 56,-9 C58.21,-9 60,-7.21 60,-5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_17_G"
+                                android:translateX="171.5"
+                                android:translateY="257">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_17_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M69.5 -4 C69.5,-4 69.5,4 69.5,4 C69.5,6.21 67.71,8 65.5,8 C65.5,8 -65.5,8 -65.5,8 C-67.71,8 -69.5,6.21 -69.5,4 C-69.5,4 -69.5,-4 -69.5,-4 C-69.5,-6.21 -67.71,-8 -65.5,-8 C-65.5,-8 65.5,-8 65.5,-8 C67.71,-8 69.5,-6.21 69.5,-4c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_16_G"
+                                android:translateX="54"
+                                android:translateY="333">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_16_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_15_G"
+                                android:translateX="158"
+                                android:translateY="324">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_15_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M56 -5 C56,-5 56,5 56,5 C56,7.21 54.21,9 52,9 C52,9 -52,9 -52,9 C-54.21,9 -56,7.21 -56,5 C-56,5 -56,-5 -56,-5 C-56,-7.21 -54.21,-9 -52,-9 C-52,-9 52,-9 52,-9 C54.21,-9 56,-7.21 56,-5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_14_G"
+                                android:translateX="217.5"
+                                android:translateY="345">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_14_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M115.5 -4 C115.5,-4 115.5,4 115.5,4 C115.5,6.21 113.71,8 111.5,8 C111.5,8 -111.5,8 -111.5,8 C-113.71,8 -115.5,6.21 -115.5,4 C-115.5,4 -115.5,-4 -115.5,-4 C-115.5,-6.21 -113.71,-8 -111.5,-8 C-111.5,-8 111.5,-8 111.5,-8 C113.71,-8 115.5,-6.21 115.5,-4c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_13_G"
+                                android:translateX="54"
+                                android:translateY="421">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_13_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_12_G"
+                                android:translateX="170"
+                                android:translateY="412">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_12_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M68 -5 C68,-5 68,5 68,5 C68,7.21 66.21,9 64,9 C64,9 -64,9 -64,9 C-66.21,9 -68,7.21 -68,5 C-68,5 -68,-5 -68,-5 C-68,-7.21 -66.21,-9 -64,-9 C-64,-9 64,-9 64,-9 C66.21,-9 68,-7.21 68,-5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_11_G"
+                                android:translateX="198.5"
+                                android:translateY="433">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_11_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M96.5 -4 C96.5,-4 96.5,4 96.5,4 C96.5,6.21 94.71,8 92.5,8 C92.5,8 -92.5,8 -92.5,8 C-94.71,8 -96.5,6.21 -96.5,4 C-96.5,4 -96.5,-4 -96.5,-4 C-96.5,-6.21 -94.71,-8 -92.5,-8 C-92.5,-8 92.5,-8 92.5,-8 C94.71,-8 96.5,-6.21 96.5,-4c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_10_G"
+                                android:translateX="54"
+                                android:translateY="509">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_10_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_9_G"
+                                android:translateX="135"
+                                android:translateY="500">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_9_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M33 -5 C33,-5 33,5 33,5 C33,7.21 31.21,9 29,9 C29,9 -29,9 -29,9 C-31.21,9 -33,7.21 -33,5 C-33,5 -33,-5 -33,-5 C-33,-7.21 -31.21,-9 -29,-9 C-29,-9 29,-9 29,-9 C31.21,-9 33,-7.21 33,-5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_8_G"
+                                android:translateX="185.5"
+                                android:translateY="521">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_8_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M83.5 -4 C83.5,-4 83.5,4 83.5,4 C83.5,6.21 81.71,8 79.5,8 C79.5,8 -79.5,8 -79.5,8 C-81.71,8 -83.5,6.21 -83.5,4 C-83.5,4 -83.5,-4 -83.5,-4 C-83.5,-6.21 -81.71,-8 -79.5,-8 C-79.5,-8 79.5,-8 79.5,-8 C81.71,-8 83.5,-6.21 83.5,-4c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_7_G"
+                                android:translateX="54"
+                                android:translateY="597">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_7_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_6_G"
+                                android:translateX="168.5"
+                                android:translateY="588">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_6_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M66.5 -5 C66.5,-5 66.5,5 66.5,5 C66.5,7.21 64.71,9 62.5,9 C62.5,9 -62.5,9 -62.5,9 C-64.71,9 -66.5,7.21 -66.5,5 C-66.5,5 -66.5,-5 -66.5,-5 C-66.5,-7.21 -64.71,-9 -62.5,-9 C-62.5,-9 62.5,-9 62.5,-9 C64.71,-9 66.5,-7.21 66.5,-5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_5_G"
+                                android:translateX="198.5"
+                                android:translateY="609">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_5_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M96.5 -4 C96.5,-4 96.5,4 96.5,4 C96.5,6.21 94.71,8 92.5,8 C92.5,8 -92.5,8 -92.5,8 C-94.71,8 -96.5,6.21 -96.5,4 C-96.5,4 -96.5,-4 -96.5,-4 C-96.5,-6.21 -94.71,-8 -92.5,-8 C-92.5,-8 92.5,-8 92.5,-8 C94.71,-8 96.5,-6.21 96.5,-4c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_4_G"
+                                android:translateX="54"
+                                android:translateY="685">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_4_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_3_G"
+                                android:translateX="162.5"
+                                android:translateY="676">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_3_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M60.5 -5 C60.5,-5 60.5,5 60.5,5 C60.5,7.21 58.71,9 56.5,9 C56.5,9 -56.5,9 -56.5,9 C-58.71,9 -60.5,7.21 -60.5,5 C-60.5,5 -60.5,-5 -60.5,-5 C-60.5,-7.21 -58.71,-9 -56.5,-9 C-56.5,-9 56.5,-9 56.5,-9 C58.71,-9 60.5,-7.21 60.5,-5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_2_G"
+                                android:translateX="174"
+                                android:translateY="697">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_2_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M72 -4 C72,-4 72,4 72,4 C72,6.21 70.21,8 68,8 C68,8 -68,8 -68,8 C-70.21,8 -72,6.21 -72,4 C-72,4 -72,-4 -72,-4 C-72,-6.21 -70.21,-8 -68,-8 C-68,-8 68,-8 68,-8 C70.21,-8 72,-6.21 72,-4c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_1_G"
+                                android:translateX="313.5"
+                                android:translateY="798">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_1_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M74.5 0 C74.5,0 74.5,0 74.5,0 C74.5,15.45 61.95,28 46.5,28 C46.5,28 -46.5,28 -46.5,28 C-61.95,28 -74.5,15.45 -74.5,0 C-74.5,0 -74.5,0 -74.5,0 C-74.5,-15.45 -61.95,-28 -46.5,-28 C-46.5,-28 46.5,-28 46.5,-28 C61.95,-28 74.5,-15.45 74.5,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G"
+                                android:translateX="205.5"
+                                android:translateY="61">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_0_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#f8f9fa"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M171.5 -14 C171.5,-14 171.5,14 171.5,14 C171.5,16.21 169.71,18 167.5,18 C167.5,18 -167.5,18 -167.5,18 C-169.71,18 -171.5,16.21 -171.5,14 C-171.5,14 -171.5,-14 -171.5,-14 C-171.5,-16.21 -169.71,-18 -167.5,-18 C-167.5,-18 167.5,-18 167.5,-18 C169.71,-18 171.5,-16.21 171.5,-14c " />
+                            </group>
+                        </group>
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_3_G_N_2_T_0"
+                    android:scaleX="0.6"
+                    android:scaleY="0"
+                    android:translateX="206"
+                    android:translateY="395">
+                    <group
+                        android:name="_R_G_L_3_G"
+                        android:translateX="-206"
+                        android:translateY="-446">
+                        <group
+                            android:name="_R_G_L_3_G_L_0_G"
+                            android:scaleY="0">
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_28_G"
+                                android:scaleY="0"
+                                android:translateX="206"
+                                android:translateY="446">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_28_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#000000"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M206 -422 C206,-422 206,422 206,422 C206,435.25 195.25,446 182,446 C182,446 -182,446 -182,446 C-195.25,446 -206,435.25 -206,422 C-206,422 -206,-422 -206,-422 C-206,-435.25 -195.25,-446 -182,-446 C-182,-446 182,-446 182,-446 C195.25,-446 206,-435.25 206,-422c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_27_G"
+                                android:scaleY="0"
+                                android:translateX="206"
+                                android:translateY="422.5">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_27_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#dadce0"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M206 -395.5 C206,-395.5 206,395.5 206,395.5 C206,395.5 -206,395.5 -206,395.5 C-206,395.5 -206,-395.5 -206,-395.5 C-206,-395.5 206,-395.5 206,-395.5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_26_G"
+                                android:scaleY="0"
+                                android:translateX="206"
+                                android:translateY="496.5">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_26_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#dadce0"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M206 -377.5 C206,-377.5 206,377.5 206,377.5 C206,387.43 197.93,395.5 188,395.5 C188,395.5 -188,395.5 -188,395.5 C-197.93,395.5 -206,387.43 -206,377.5 C-206,377.5 -206,-377.5 -206,-377.5 C-206,-387.43 -197.93,-395.5 -188,-395.5 C-188,-395.5 188,-395.5 188,-395.5 C197.93,-395.5 206,-387.43 206,-377.5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_25_G"
+                                android:scaleY="0"
+                                android:translateX="206"
+                                android:translateY="50.5">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_25_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#e8eaed"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M206 -23.5 C206,-23.5 206,50.5 206,50.5 C206,50.5 -206,50.5 -206,50.5 C-206,50.5 -206,-23.5 -206,-23.5 C-206,-23.5 206,-23.5 206,-23.5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_24_G"
+                                android:scaleY="0"
+                                android:translateX="206"
+                                android:translateY="50.5">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_24_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#e8eaed"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M206 -32.5 C206,-32.5 206,32.5 206,32.5 C206,42.43 197.93,50.5 188,50.5 C188,50.5 -188,50.5 -188,50.5 C-197.93,50.5 -206,42.43 -206,32.5 C-206,32.5 -206,-32.5 -206,-32.5 C-206,-42.43 -197.93,-50.5 -188,-50.5 C-188,-50.5 188,-50.5 188,-50.5 C197.93,-50.5 206,-42.43 206,-32.5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_23_G"
+                                android:scaleY="0"
+                                android:translateX="54"
+                                android:translateY="157">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_23_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_22_G"
+                                android:scaleY="0"
+                                android:translateX="54"
+                                android:translateY="157">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_22_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_21_G"
+                                android:scaleY="0"
+                                android:translateX="148.5"
+                                android:translateY="148">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_21_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M46.5 -5 C46.5,-5 46.5,5 46.5,5 C46.5,7.21 44.71,9 42.5,9 C42.5,9 -42.5,9 -42.5,9 C-44.71,9 -46.5,7.21 -46.5,5 C-46.5,5 -46.5,-5 -46.5,-5 C-46.5,-7.21 -44.71,-9 -42.5,-9 C-42.5,-9 42.5,-9 42.5,-9 C44.71,-9 46.5,-7.21 46.5,-5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_20_G"
+                                android:scaleY="0"
+                                android:translateX="186"
+                                android:translateY="169">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_20_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M84 -4 C84,-4 84,4 84,4 C84,6.21 82.21,8 80,8 C80,8 -80,8 -80,8 C-82.21,8 -84,6.21 -84,4 C-84,4 -84,-4 -84,-4 C-84,-6.21 -82.21,-8 -80,-8 C-80,-8 80,-8 80,-8 C82.21,-8 84,-6.21 84,-4c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_19_G"
+                                android:scaleY="0"
+                                android:translateX="54"
+                                android:translateY="245">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_19_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_18_G"
+                                android:scaleY="0"
+                                android:translateX="162"
+                                android:translateY="236">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_18_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M60 -5 C60,-5 60,5 60,5 C60,7.21 58.21,9 56,9 C56,9 -56,9 -56,9 C-58.21,9 -60,7.21 -60,5 C-60,5 -60,-5 -60,-5 C-60,-7.21 -58.21,-9 -56,-9 C-56,-9 56,-9 56,-9 C58.21,-9 60,-7.21 60,-5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_17_G"
+                                android:scaleY="0"
+                                android:translateX="171.5"
+                                android:translateY="257">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_17_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M69.5 -4 C69.5,-4 69.5,4 69.5,4 C69.5,6.21 67.71,8 65.5,8 C65.5,8 -65.5,8 -65.5,8 C-67.71,8 -69.5,6.21 -69.5,4 C-69.5,4 -69.5,-4 -69.5,-4 C-69.5,-6.21 -67.71,-8 -65.5,-8 C-65.5,-8 65.5,-8 65.5,-8 C67.71,-8 69.5,-6.21 69.5,-4c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_16_G"
+                                android:scaleY="0"
+                                android:translateX="54"
+                                android:translateY="333">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_16_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_15_G"
+                                android:scaleY="0"
+                                android:translateX="158"
+                                android:translateY="324">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_15_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M56 -5 C56,-5 56,5 56,5 C56,7.21 54.21,9 52,9 C52,9 -52,9 -52,9 C-54.21,9 -56,7.21 -56,5 C-56,5 -56,-5 -56,-5 C-56,-7.21 -54.21,-9 -52,-9 C-52,-9 52,-9 52,-9 C54.21,-9 56,-7.21 56,-5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_14_G"
+                                android:scaleY="0"
+                                android:translateX="217.5"
+                                android:translateY="345">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_14_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M115.5 -4 C115.5,-4 115.5,4 115.5,4 C115.5,6.21 113.71,8 111.5,8 C111.5,8 -111.5,8 -111.5,8 C-113.71,8 -115.5,6.21 -115.5,4 C-115.5,4 -115.5,-4 -115.5,-4 C-115.5,-6.21 -113.71,-8 -111.5,-8 C-111.5,-8 111.5,-8 111.5,-8 C113.71,-8 115.5,-6.21 115.5,-4c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_13_G"
+                                android:scaleY="0"
+                                android:translateX="54"
+                                android:translateY="421">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_13_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_12_G"
+                                android:scaleY="0"
+                                android:translateX="170"
+                                android:translateY="412">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_12_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M68 -5 C68,-5 68,5 68,5 C68,7.21 66.21,9 64,9 C64,9 -64,9 -64,9 C-66.21,9 -68,7.21 -68,5 C-68,5 -68,-5 -68,-5 C-68,-7.21 -66.21,-9 -64,-9 C-64,-9 64,-9 64,-9 C66.21,-9 68,-7.21 68,-5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_11_G"
+                                android:scaleY="0"
+                                android:translateX="198.5"
+                                android:translateY="433">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_11_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M96.5 -4 C96.5,-4 96.5,4 96.5,4 C96.5,6.21 94.71,8 92.5,8 C92.5,8 -92.5,8 -92.5,8 C-94.71,8 -96.5,6.21 -96.5,4 C-96.5,4 -96.5,-4 -96.5,-4 C-96.5,-6.21 -94.71,-8 -92.5,-8 C-92.5,-8 92.5,-8 92.5,-8 C94.71,-8 96.5,-6.21 96.5,-4c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_10_G"
+                                android:scaleY="0"
+                                android:translateX="54"
+                                android:translateY="509">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_10_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_9_G"
+                                android:scaleY="0"
+                                android:translateX="135"
+                                android:translateY="500">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_9_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M33 -5 C33,-5 33,5 33,5 C33,7.21 31.21,9 29,9 C29,9 -29,9 -29,9 C-31.21,9 -33,7.21 -33,5 C-33,5 -33,-5 -33,-5 C-33,-7.21 -31.21,-9 -29,-9 C-29,-9 29,-9 29,-9 C31.21,-9 33,-7.21 33,-5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_8_G"
+                                android:scaleY="0"
+                                android:translateX="185.5"
+                                android:translateY="521">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_8_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M83.5 -4 C83.5,-4 83.5,4 83.5,4 C83.5,6.21 81.71,8 79.5,8 C79.5,8 -79.5,8 -79.5,8 C-81.71,8 -83.5,6.21 -83.5,4 C-83.5,4 -83.5,-4 -83.5,-4 C-83.5,-6.21 -81.71,-8 -79.5,-8 C-79.5,-8 79.5,-8 79.5,-8 C81.71,-8 83.5,-6.21 83.5,-4c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_7_G"
+                                android:scaleY="0"
+                                android:translateX="54"
+                                android:translateY="597">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_7_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_6_G"
+                                android:scaleY="0"
+                                android:translateX="168.5"
+                                android:translateY="588">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_6_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M66.5 -5 C66.5,-5 66.5,5 66.5,5 C66.5,7.21 64.71,9 62.5,9 C62.5,9 -62.5,9 -62.5,9 C-64.71,9 -66.5,7.21 -66.5,5 C-66.5,5 -66.5,-5 -66.5,-5 C-66.5,-7.21 -64.71,-9 -62.5,-9 C-62.5,-9 62.5,-9 62.5,-9 C64.71,-9 66.5,-7.21 66.5,-5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_5_G"
+                                android:scaleY="0"
+                                android:translateX="198.5"
+                                android:translateY="609">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_5_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M96.5 -4 C96.5,-4 96.5,4 96.5,4 C96.5,6.21 94.71,8 92.5,8 C92.5,8 -92.5,8 -92.5,8 C-94.71,8 -96.5,6.21 -96.5,4 C-96.5,4 -96.5,-4 -96.5,-4 C-96.5,-6.21 -94.71,-8 -92.5,-8 C-92.5,-8 92.5,-8 92.5,-8 C94.71,-8 96.5,-6.21 96.5,-4c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_4_G"
+                                android:scaleY="0"
+                                android:translateX="54"
+                                android:translateY="685">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_4_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_3_G"
+                                android:scaleY="0"
+                                android:translateX="162.5"
+                                android:translateY="676">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_3_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M60.5 -5 C60.5,-5 60.5,5 60.5,5 C60.5,7.21 58.71,9 56.5,9 C56.5,9 -56.5,9 -56.5,9 C-58.71,9 -60.5,7.21 -60.5,5 C-60.5,5 -60.5,-5 -60.5,-5 C-60.5,-7.21 -58.71,-9 -56.5,-9 C-56.5,-9 56.5,-9 56.5,-9 C58.71,-9 60.5,-7.21 60.5,-5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_2_G"
+                                android:scaleY="0"
+                                android:translateX="174"
+                                android:translateY="697">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_2_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M72 -4 C72,-4 72,4 72,4 C72,6.21 70.21,8 68,8 C68,8 -68,8 -68,8 C-70.21,8 -72,6.21 -72,4 C-72,4 -72,-4 -72,-4 C-72,-6.21 -70.21,-8 -68,-8 C-68,-8 68,-8 68,-8 C70.21,-8 72,-6.21 72,-4c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_1_G"
+                                android:scaleY="0"
+                                android:translateX="313.5"
+                                android:translateY="798">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_1_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M74.5 0 C74.5,0 74.5,0 74.5,0 C74.5,15.45 61.95,28 46.5,28 C46.5,28 -46.5,28 -46.5,28 C-61.95,28 -74.5,15.45 -74.5,0 C-74.5,0 -74.5,0 -74.5,0 C-74.5,-15.45 -61.95,-28 -46.5,-28 C-46.5,-28 46.5,-28 46.5,-28 C61.95,-28 74.5,-15.45 74.5,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G"
+                                android:scaleY="0"
+                                android:translateX="205.5"
+                                android:translateY="61">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_0_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#f8f9fa"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M171.5 -14 C171.5,-14 171.5,14 171.5,14 C171.5,16.21 169.71,18 167.5,18 C167.5,18 -167.5,18 -167.5,18 C-169.71,18 -171.5,16.21 -171.5,14 C-171.5,14 -171.5,-14 -171.5,-14 C-171.5,-16.21 -169.71,-18 -167.5,-18 C-167.5,-18 167.5,-18 167.5,-18 C169.71,-18 171.5,-16.21 171.5,-14c " />
+                            </group>
+                        </group>
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_2_G_N_2_T_0"
+                    android:scaleX="0.6"
+                    android:scaleY="0"
+                    android:translateX="206"
+                    android:translateY="395">
+                    <group
+                        android:name="_R_G_L_2_G"
+                        android:scaleX="1.3767699999999998"
+                        android:scaleY="1.3767699999999998"
+                        android:translateY="-508.163">
+                        <group
+                            android:name="_R_G_L_2_G_D_0_P_0_G_0_T_0"
+                            android:scaleX="0"
+                            android:scaleY="0">
+                            <path
+                                android:name="_R_G_L_2_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M0 25 C13.81,25 25,13.81 25,0 C25,-13.81 13.81,-25 0,-25 C-13.81,-25 -25,-13.81 -25,0 C-25,13.81 -13.81,25 0,25c " />
+                        </group>
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_1_G_N_2_T_0"
+                    android:scaleX="0.6"
+                    android:scaleY="0"
+                    android:translateX="206"
+                    android:translateY="395">
+                    <group
+                        android:name="_R_G_L_1_G"
+                        android:scaleX="1.39"
+                        android:scaleY="1.39"
+                        android:translateX="-556.176"
+                        android:translateY="-7.307">
+                        <path
+                            android:name="_R_G_L_1_G_D_0_P_0"
+                            android:fillAlpha="1"
+                            android:fillColor="#3c4043"
+                            android:fillType="nonZero"
+                            android:pathData=" M135 -301 C135,-301 135,311 135,311 C135,319.28 128.28,326 120,326 C120,326 -120,326 -120,326 C-128.28,326 -135,319.28 -135,311 C-135,311 -135,-301 -135,-301 C-135,-309.28 -128.28,-316 -120,-316 C-120,-316 120,-316 120,-316 C128.28,-316 135,-309.28 135,-301c " />
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_0_G"
+                    android:translateX="206"
+                    android:translateY="446">
+                    <path
+                        android:name="_R_G_L_0_G_D_0_P_0"
+                        android:fillAlpha="0"
+                        android:fillColor="#84ba69"
+                        android:fillType="nonZero"
+                        android:pathData=" M0 406 C21.54,406 39,423.46 39,445 C39,466.54 21.54,484 0,484 C-21.54,484 -39,466.54 -39,445 C-39,423.46 -21.54,406 0,406c " />
+                </group>
+            </group>
+            <group android:name="time_group" />
+        </vector>
+    </aapt:attr>
+</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_overview.xml b/quickstep/res/drawable/gesture_tutorial_overview.xml
deleted file mode 100644
index c4ca72f5a1..0000000000
--- a/quickstep/res/drawable/gesture_tutorial_overview.xml
+++ /dev/null
@@ -1,823 +0,0 @@
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt">
-    <aapt:attr name="android:drawable">
-        <vector android:height="892dp" android:width="412dp" android:viewportHeight="892" android:viewportWidth="412">
-            <group android:name="_R_G">
-                <group android:name="_R_G_L_7_G" android:translateX="206" android:translateY="446">
-                    <path android:name="_R_G_L_7_G_D_0_P_0" android:fillColor="#666666" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c "/>
-                </group>
-                <group android:name="_R_G_L_6_G">
-                    <path android:name="_R_G_L_6_G_S" android:fillColor="#000000" android:pathData="M0,0 L412,0 L412,892 L0,892z"/>
-                </group>
-                <group android:name="_R_G_L_5_G" android:translateX="206" android:translateY="877">
-                    <path android:name="_R_G_L_5_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M40 0 C40,0 40,0 40,0 C40,1.1 39.1,2 38,2 C38,2 -38,2 -38,2 C-39.1,2 -40,1.1 -40,0 C-40,0 -40,0 -40,0 C-40,-1.1 -39.1,-2 -38,-2 C-38,-2 38,-2 38,-2 C39.1,-2 40,-1.1 40,0c "/>
-                </group>
-                <group android:name="_R_G_L_4_G_N_7_T_0" android:translateX="206" android:translateY="446" android:scaleX="1" android:scaleY="1">
-                    <group android:name="_R_G_L_4_G" android:translateX="-206" android:translateY="-446">
-                        <group android:name="_R_G_L_4_G_L_4_G">
-                            <group android:name="_R_G_L_4_G_L_4_G_L_11_G" android:translateX="206" android:translateY="467">
-                                <path android:name="_R_G_L_4_G_L_4_G_L_11_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -407 C206,-407 206,407 206,407 C206,416.93 197.93,425 188,425 C188,425 -188,425 -188,425 C-197.93,425 -206,416.93 -206,407 C-206,407 -206,-407 -206,-407 C-206,-416.93 -197.93,-425 -188,-425 C-188,-425 188,-425 188,-425 C197.93,-425 206,-416.93 206,-407c "/>
-                            </group>
-                            <group android:name="_R_G_L_4_G_L_4_G_L_10_G" android:translateX="182.5" android:translateY="831">
-                                <path android:name="_R_G_L_4_G_L_4_G_L_10_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M158.5 -7 C158.5,-7 158.5,7 158.5,7 C158.5,9.21 156.71,11 154.5,11 C154.5,11 -154.5,11 -154.5,11 C-156.71,11 -158.5,9.21 -158.5,7 C-158.5,7 -158.5,-7 -158.5,-7 C-158.5,-9.21 -156.71,-11 -154.5,-11 C-154.5,-11 154.5,-11 154.5,-11 C156.71,-11 158.5,-9.21 158.5,-7c "/>
-                            </group>
-                            <group android:name="_R_G_L_4_G_L_4_G_L_9_G" android:translateX="186" android:translateY="801">
-                                <path android:name="_R_G_L_4_G_L_4_G_L_9_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M162 -7 C162,-7 162,7 162,7 C162,9.21 160.21,11 158,11 C158,11 -158,11 -158,11 C-160.21,11 -162,9.21 -162,7 C-162,7 -162,-7 -162,-7 C-162,-9.21 -160.21,-11 -158,-11 C-158,-11 158,-11 158,-11 C160.21,-11 162,-9.21 162,-7c "/>
-                            </group>
-                            <group android:name="_R_G_L_4_G_L_4_G_L_8_G" android:translateX="119" android:translateY="755">
-                                <path android:name="_R_G_L_4_G_L_4_G_L_8_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M95 -7 C95,-7 95,7 95,7 C95,9.21 93.21,11 91,11 C91,11 -91,11 -91,11 C-93.21,11 -95,9.21 -95,7 C-95,7 -95,-7 -95,-7 C-95,-9.21 -93.21,-11 -91,-11 C-91,-11 91,-11 91,-11 C93.21,-11 95,-9.21 95,-7c "/>
-                            </group>
-                            <group android:name="_R_G_L_4_G_L_4_G_L_7_G" android:translateX="182.5" android:translateY="725">
-                                <path android:name="_R_G_L_4_G_L_4_G_L_7_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M158.5 -7 C158.5,-7 158.5,7 158.5,7 C158.5,9.21 156.71,11 154.5,11 C154.5,11 -154.5,11 -154.5,11 C-156.71,11 -158.5,9.21 -158.5,7 C-158.5,7 -158.5,-7 -158.5,-7 C-158.5,-9.21 -156.71,-11 -154.5,-11 C-154.5,-11 154.5,-11 154.5,-11 C156.71,-11 158.5,-9.21 158.5,-7c "/>
-                            </group>
-                            <group android:name="_R_G_L_4_G_L_4_G_L_6_G" android:translateX="197.5" android:translateY="695">
-                                <path android:name="_R_G_L_4_G_L_4_G_L_6_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M173.5 -7 C173.5,-7 173.5,7 173.5,7 C173.5,9.21 171.71,11 169.5,11 C169.5,11 -169.5,11 -169.5,11 C-171.71,11 -173.5,9.21 -173.5,7 C-173.5,7 -173.5,-7 -173.5,-7 C-173.5,-9.21 -171.71,-11 -169.5,-11 C-169.5,-11 169.5,-11 169.5,-11 C171.71,-11 173.5,-9.21 173.5,-7c "/>
-                            </group>
-                            <group android:name="_R_G_L_4_G_L_4_G_L_5_G" android:translateX="192" android:translateY="665">
-                                <path android:name="_R_G_L_4_G_L_4_G_L_5_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M168 -7 C168,-7 168,7 168,7 C168,9.21 166.21,11 164,11 C164,11 -164,11 -164,11 C-166.21,11 -168,9.21 -168,7 C-168,7 -168,-7 -168,-7 C-168,-9.21 -166.21,-11 -164,-11 C-164,-11 164,-11 164,-11 C166.21,-11 168,-9.21 168,-7c "/>
-                            </group>
-                            <group android:name="_R_G_L_4_G_L_4_G_L_4_G" android:translateX="105.5" android:translateY="360">
-                                <path android:name="_R_G_L_4_G_L_4_G_L_4_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M23.5 -2 C23.5,-2 23.5,2 23.5,2 C23.5,4.21 21.71,6 19.5,6 C19.5,6 -19.5,6 -19.5,6 C-21.71,6 -23.5,4.21 -23.5,2 C-23.5,2 -23.5,-2 -23.5,-2 C-23.5,-4.21 -21.71,-6 -19.5,-6 C-19.5,-6 19.5,-6 19.5,-6 C21.71,-6 23.5,-4.21 23.5,-2c "/>
-                            </group>
-                            <group android:name="_R_G_L_4_G_L_4_G_L_3_G" android:translateX="47.5" android:translateY="360">
-                                <path android:name="_R_G_L_4_G_L_4_G_L_3_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M23.5 -2 C23.5,-2 23.5,2 23.5,2 C23.5,4.21 21.71,6 19.5,6 C19.5,6 -19.5,6 -19.5,6 C-21.71,6 -23.5,4.21 -23.5,2 C-23.5,2 -23.5,-2 -23.5,-2 C-23.5,-4.21 -21.71,-6 -19.5,-6 C-19.5,-6 19.5,-6 19.5,-6 C21.71,-6 23.5,-4.21 23.5,-2c "/>
-                            </group>
-                            <group android:name="_R_G_L_4_G_L_4_G_L_2_G" android:translateX="142.5" android:translateY="328">
-                                <path android:name="_R_G_L_4_G_L_4_G_L_2_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M118.5 -14 C118.5,-14 118.5,14 118.5,14 C118.5,16.21 116.71,18 114.5,18 C114.5,18 -114.5,18 -114.5,18 C-116.71,18 -118.5,16.21 -118.5,14 C-118.5,14 -118.5,-14 -118.5,-14 C-118.5,-16.21 -116.71,-18 -114.5,-18 C-114.5,-18 114.5,-18 114.5,-18 C116.71,-18 118.5,-16.21 118.5,-14c "/>
-                            </group>
-                            <group android:name="_R_G_L_4_G_L_4_G_L_1_G" android:translateX="186" android:translateY="284">
-                                <path android:name="_R_G_L_4_G_L_4_G_L_1_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M162 -14 C162,-14 162,14 162,14 C162,16.21 160.21,18 158,18 C158,18 -158,18 -158,18 C-160.21,18 -162,16.21 -162,14 C-162,14 -162,-14 -162,-14 C-162,-16.21 -160.21,-18 -158,-18 C-158,-18 158,-18 158,-18 C160.21,-18 162,-16.21 162,-14c "/>
-                            </group>
-                            <group android:name="_R_G_L_4_G_L_4_G_L_0_G" android:translateX="155" android:translateY="240">
-                                <path android:name="_R_G_L_4_G_L_4_G_L_0_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M131 -14 C131,-14 131,14 131,14 C131,16.21 129.21,18 127,18 C127,18 -127,18 -127,18 C-129.21,18 -131,16.21 -131,14 C-131,14 -131,-14 -131,-14 C-131,-16.21 -129.21,-18 -127,-18 C-127,-18 127,-18 127,-18 C129.21,-18 131,-16.21 131,-14c "/>
-                            </group>
-                        </group>
-                        <group android:name="_R_G_L_4_G_L_3_G" android:translateX="24" android:translateY="390">
-                            <group android:name="_R_G_L_4_G_L_3_G_L_7_G" android:translateX="182" android:translateY="120"/>
-                            <group android:name="_R_G_L_4_G_L_3_G_L_6_G" android:translateX="182" android:translateY="120">
-                                <path android:name="_R_G_L_4_G_L_3_G_L_6_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M182 -116 C182,-116 182,116 182,116 C182,118.21 180.21,120 178,120 C178,120 -178,120 -178,120 C-180.21,120 -182,118.21 -182,116 C-182,116 -182,-116 -182,-116 C-182,-118.21 -180.21,-120 -178,-120 C-178,-120 178,-120 178,-120 C180.21,-120 182,-118.21 182,-116c "/>
-                            </group>
-                            <group android:name="_R_G_L_4_G_L_3_G_L_5_G" android:translateX="77.322" android:translateY="150.552">
-                                <path android:name="_R_G_L_4_G_L_3_G_L_5_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 20.61 C0,20.61 -10.39,8.69 -10.39,8.69  M0 -6.11 C0,-6.11 -6.78,-15.61 -6.78,-15.61  M0 33.64 C0,33.64 8.26,17.67 8.26,17.67  M0 7.58 C0,7.58 8.26,-7.73 8.26,-7.73  M0 71.19 C0,71.19 0,-18.04 0,-18.04  M-30.22 37.18 C-30.22,37.18 0,-71.19 0,-71.19 C0,-71.19 30.22,37.18 30.22,37.18 C30.22,37.18 -30.22,37.18 -30.22,37.18c "/>
-                                <path android:name="_R_G_L_4_G_L_3_G_L_5_G_D_1_P_0" android:strokeColor="#9adcb2" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M0 20.61 C0,20.61 -10.39,8.69 -10.39,8.69  M0 -6.11 C0,-6.11 -6.78,-15.61 -6.78,-15.61  M0 33.64 C0,33.64 8.26,17.67 8.26,17.67  M0 7.58 C0,7.58 8.26,-7.73 8.26,-7.73  M0 71.19 C0,71.19 0,-18.04 0,-18.04  M-30.22 37.18 C-30.22,37.18 0,-71.19 0,-71.19 C0,-71.19 30.22,37.18 30.22,37.18 C30.22,37.18 -30.22,37.18 -30.22,37.18c "/>
-                            </group>
-                            <group android:name="_R_G_L_4_G_L_3_G_L_4_G" android:translateX="38.772" android:translateY="121.73">
-                                <path android:name="_R_G_L_4_G_L_3_G_L_4_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 28.82 C0,28.82 -14.52,12.18 -14.52,12.18  M0 -8.58 C0,-8.58 -9.51,-21.75 -9.51,-21.75  M0 47.01 C0,47.01 11.57,24.7 11.57,24.7  M0 10.64 C0,10.64 11.57,-10.78 11.57,-10.78  M0 99.42 C0,99.42 0,-25.21 0,-25.21  M-31.92 51.94 C-31.92,51.94 0,-99.42 0,-99.42 C0,-99.42 31.92,51.94 31.92,51.94 C31.92,51.94 -31.92,51.94 -31.92,51.94c "/>
-                                <path android:name="_R_G_L_4_G_L_3_G_L_4_G_D_1_P_0" android:strokeColor="#9adcb2" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M0 28.82 C0,28.82 -14.52,12.18 -14.52,12.18  M0 -8.58 C0,-8.58 -9.51,-21.75 -9.51,-21.75  M0 47.01 C0,47.01 11.57,24.7 11.57,24.7  M0 10.64 C0,10.64 11.57,-10.78 11.57,-10.78  M0 99.42 C0,99.42 0,-25.21 0,-25.21  M-31.92 51.94 C-31.92,51.94 0,-99.42 0,-99.42 C0,-99.42 31.92,51.94 31.92,51.94 C31.92,51.94 -31.92,51.94 -31.92,51.94c "/>
-                            </group>
-                            <group android:name="_R_G_L_4_G_L_3_G_L_3_G" android:translateX="183" android:translateY="222">
-                                <path android:name="_R_G_L_4_G_L_3_G_L_3_G_D_0_P_0" android:fillColor="#000000" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M170 0 C170,0 -170,0 -170,0 "/>
-                                <path android:name="_R_G_L_4_G_L_3_G_L_3_G_D_1_P_0" android:strokeColor="#9aa0a6" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="4" android:strokeAlpha="1" android:pathData=" M170 0 C170,0 -170,0 -170,0 "/>
-                            </group>
-                            <group android:name="_R_G_L_4_G_L_3_G_L_2_G" android:translateX="265.619" android:translateY="162.331">
-                                <path android:name="_R_G_L_4_G_L_3_G_L_2_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M-34.05 50.06 C-34.05,50.06 -34.05,-49.25 -34.05,-49.25  M-34.05 -49.55 C-34.05,-49.55 17.54,50.06 17.54,50.06 C17.54,50.06 84.62,50.06 84.62,50.06 C84.62,50.06 32.65,-50.06 32.65,-50.06 C32.65,-50.06 -34.05,-50.06 -34.05,-50.06 C-34.05,-50.06 -84.62,50.06 -84.62,50.06 C-84.62,50.06 17.54,50.06 17.54,50.06 "/>
-                                <path android:name="_R_G_L_4_G_L_3_G_L_2_G_D_1_P_0" android:strokeColor="#a8cbfe" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M-34.05 50.06 C-34.05,50.06 -34.05,-49.25 -34.05,-49.25  M-34.05 -49.55 C-34.05,-49.55 17.54,50.06 17.54,50.06 C17.54,50.06 84.62,50.06 84.62,50.06 C84.62,50.06 32.65,-50.06 32.65,-50.06 C32.65,-50.06 -34.05,-50.06 -34.05,-50.06 C-34.05,-50.06 -84.62,50.06 -84.62,50.06 C-84.62,50.06 17.54,50.06 17.54,50.06 "/>
-                            </group>
-                            <group android:name="_R_G_L_4_G_L_3_G_L_1_G" android:translateX="319.271" android:translateY="37.945">
-                                <path android:name="_R_G_L_4_G_L_3_G_L_1_G_D_0_P_0" android:fillColor="#feefc3" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M13.42 2.99 C14.95,-4.17 9.93,-11.31 2.21,-12.96 C-0.9,-13.62 -3.97,-13.3 -6.64,-12.2 C-6.58,-12.19 -6.53,-12.18 -6.48,-12.17 C-1.03,-11.01 2.52,-5.97 1.44,-0.92 C0.36,4.13 -4.94,7.28 -10.4,6.12 C-11.6,5.86 -12.7,5.42 -13.69,4.83 C-11.9,8.78 -8.15,11.93 -3.34,12.96 C4.38,14.61 11.88,10.14 13.42,2.99c "/>
-                            </group>
-                            <group android:name="_R_G_L_4_G_L_3_G_L_0_G" android:translateX="179.5" android:translateY="73.351">
-                                <path android:name="_R_G_L_4_G_L_3_G_L_0_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M51.08 -40.95 C51.08,-40.95 50.55,-42.54 50.55,-42.54 C50.55,-42.54 49.67,-41.13 49.67,-41.13 C49.67,-41.13 48.17,-41.21 48.17,-41.21 C48.17,-41.21 49.05,-39.8 49.05,-39.8 C49.05,-39.8 48.61,-38.22 48.61,-38.22 C48.61,-38.22 50.02,-38.74 50.02,-38.74 C50.02,-38.74 51.35,-37.69 51.35,-37.69 C51.35,-37.69 51.26,-39.45 51.26,-39.45 C51.26,-39.45 52.59,-40.42 52.59,-40.42 C52.59,-40.42 51.08,-40.95 51.08,-40.95c  M8.78 30.58 C8.78,30.58 8.25,28.99 8.25,28.99 C8.25,28.99 7.37,30.4 7.37,30.4 C7.37,30.4 5.87,30.31 5.87,30.31 C5.87,30.31 6.75,31.72 6.75,31.72 C6.75,31.72 6.31,33.31 6.31,33.31 C6.31,33.31 7.72,32.78 7.72,32.78 C7.72,32.78 9.05,33.84 9.05,33.84 C9.05,33.84 8.96,32.08 8.96,32.08 C8.96,32.08 10.29,31.11 10.29,31.11 C10.29,31.11 8.78,30.58 8.78,30.58c  M19.38 -61.67 C19.38,-61.67 18.94,-63.35 18.94,-63.35 C18.94,-63.35 17.97,-61.94 17.97,-61.94 C17.97,-61.94 16.47,-61.94 16.47,-61.94 C16.47,-61.94 17.35,-60.62 17.35,-60.62 C17.35,-60.62 16.91,-58.94 16.91,-58.94 C16.91,-58.94 18.41,-59.56 18.41,-59.56 C18.41,-59.56 19.65,-58.5 19.65,-58.5 C19.65,-58.5 19.56,-60.18 19.56,-60.18 C19.56,-60.18 20.88,-61.23 20.88,-61.23 C20.88,-61.23 19.38,-61.67 19.38,-61.67c  M-32.98 35.08 C-32.98,35.08 -33.51,33.4 -33.51,33.4 C-33.51,33.4 -34.4,34.81 -34.4,34.81 C-34.4,34.81 -35.9,34.81 -35.9,34.81 C-35.9,34.81 -35.01,36.22 -35.01,36.22 C-35.01,36.22 -35.45,37.81 -35.45,37.81 C-35.45,37.81 -34.04,37.28 -34.04,37.28 C-34.04,37.28 -32.72,38.25 -32.72,38.25 C-32.72,38.25 -32.81,36.58 -32.81,36.58 C-32.81,36.58 -31.48,35.6 -31.48,35.6 C-31.48,35.6 -32.98,35.08 -32.98,35.08c  M45.34 7.56 C45.34,7.56 44.81,5.97 44.81,5.97 C44.81,5.97 43.93,7.38 43.93,7.38 C43.93,7.38 42.34,7.3 42.34,7.3 C42.34,7.3 43.31,8.71 43.31,8.71 C43.31,8.71 42.87,10.29 42.87,10.29 C42.87,10.29 44.28,9.77 44.28,9.77 C44.28,9.77 45.52,10.82 45.52,10.82 C45.52,10.82 45.52,9.06 45.52,9.06 C45.52,9.06 46.76,8.09 46.76,8.09 C46.76,8.09 45.34,7.56 45.34,7.56c  M-9.59 -41.67 C-9.59,-41.67 -10.12,-43.35 -10.12,-43.35 C-10.12,-43.35 -11,-41.94 -11,-41.94 C-11,-41.94 -12.5,-41.94 -12.5,-41.94 C-12.5,-41.94 -11.62,-40.62 -11.62,-40.62 C-11.62,-40.62 -12.06,-38.94 -12.06,-38.94 C-12.06,-38.94 -10.65,-39.56 -10.65,-39.56 C-10.65,-39.56 -9.32,-38.5 -9.32,-38.5 C-9.32,-38.5 -9.41,-40.26 -9.41,-40.26 C-9.41,-40.26 -8.09,-41.23 -8.09,-41.23 C-8.09,-41.23 -9.59,-41.67 -9.59,-41.67c  M97.74 -23.97 C97.74,-23.97 97.03,-26.35 97.03,-26.35 C97.03,-26.35 95.8,-24.32 95.8,-24.32 C95.8,-24.32 93.5,-24.32 93.5,-24.32 C93.5,-24.32 94.91,-22.38 94.91,-22.38 C94.91,-22.38 94.21,-20 94.21,-20 C94.21,-20 96.33,-20.88 96.33,-20.88 C96.33,-20.88 98.09,-19.38 98.09,-19.38 C98.09,-19.38 98.09,-21.85 98.09,-21.85 C98.09,-21.85 99.86,-23.26 99.86,-23.26 C99.86,-23.26 97.74,-23.97 97.74,-23.97c  M167.29 43.28 C167.29,43.28 166.67,40.9 166.67,40.9 C166.67,40.9 165.35,42.93 165.35,42.93 C165.35,42.93 163.14,42.93 163.14,42.93 C163.14,42.93 164.47,44.87 164.47,44.87 C164.47,44.87 163.76,47.25 163.76,47.25 C163.76,47.25 165.88,46.37 165.88,46.37 C165.88,46.37 167.73,47.87 167.73,47.87 C167.73,47.87 167.65,45.4 167.65,45.4 C167.65,45.4 169.5,43.98 169.5,43.98 C169.5,43.98 167.29,43.28 167.29,43.28c  M-1.1 -1.79 C-1.1,-1.79 -1.72,-4.08 -1.72,-4.08 C-1.72,-4.08 -3.05,-2.14 -3.05,-2.14 C-3.05,-2.14 -5.25,-2.14 -5.25,-2.14 C-5.25,-2.14 -3.93,-0.11 -3.93,-0.11 C-3.93,-0.11 -4.64,2.18 -4.64,2.18 C-4.64,2.18 -2.52,1.38 -2.52,1.38 C-2.52,1.38 -0.66,2.8 -0.66,2.8 C-0.66,2.8 -0.75,0.41 -0.75,0.41 C-0.75,0.41 1.1,-1.08 1.1,-1.08 C1.1,-1.08 -1.1,-1.79 -1.1,-1.79c  M-60.89 -5.23 C-60.89,-5.23 -61.59,-7.61 -61.59,-7.61 C-61.59,-7.61 -62.83,-5.58 -62.83,-5.58 C-62.83,-5.58 -65.13,-5.58 -65.13,-5.58 C-65.13,-5.58 -63.71,-3.64 -63.71,-3.64 C-63.71,-3.64 -64.42,-1.26 -64.42,-1.26 C-64.42,-1.26 -62.39,-2.14 -62.39,-2.14 C-62.39,-2.14 -60.53,-0.64 -60.53,-0.64 C-60.53,-0.64 -60.62,-3.11 -60.62,-3.11 C-60.62,-3.11 -58.77,-4.52 -58.77,-4.52 C-58.77,-4.52 -60.89,-5.23 -60.89,-5.23c  M-165.26 -10.97 C-165.26,-10.97 -165.97,-13.35 -165.97,-13.35 C-165.97,-13.35 -167.29,-11.32 -167.29,-11.32 C-167.29,-11.32 -169.5,-11.32 -169.5,-11.32 C-169.5,-11.32 -168.18,-9.38 -168.18,-9.38 C-168.18,-9.38 -168.88,-7 -168.88,-7 C-168.88,-7 -166.76,-7.79 -166.76,-7.79 C-166.76,-7.79 -164.91,-6.38 -164.91,-6.38 C-164.91,-6.38 -165,-8.85 -165,-8.85 C-165,-8.85 -163.14,-10.26 -163.14,-10.26 C-163.14,-10.26 -165.26,-10.97 -165.26,-10.97c  M-51.26 -42.98 C-51.26,-42.98 -54.09,-45.01 -54.09,-45.01 C-54.09,-45.01 -53.91,-41.57 -53.91,-41.57 C-53.91,-41.57 -56.65,-39.54 -56.65,-39.54 C-56.65,-39.54 -53.38,-38.57 -53.38,-38.57 C-53.38,-38.57 -52.32,-35.3 -52.32,-35.3 C-52.32,-35.3 -50.38,-38.13 -50.38,-38.13 C-50.38,-38.13 -46.94,-38.22 -46.94,-38.22 C-46.94,-38.22 -49.05,-40.86 -49.05,-40.86 C-49.05,-40.86 -47.99,-44.21 -47.99,-44.21 C-47.99,-44.21 -51.26,-42.98 -51.26,-42.98c  M-92.06 -47.92 C-92.06,-47.92 -92.59,-49.59 -92.59,-49.59 C-92.59,-49.59 -93.47,-48.18 -93.47,-48.18 C-93.47,-48.18 -95.06,-48.18 -95.06,-48.18 C-95.06,-48.18 -94.09,-46.86 -94.09,-46.86 C-94.09,-46.86 -94.53,-45.18 -94.53,-45.18 C-94.53,-45.18 -93.12,-45.8 -93.12,-45.8 C-93.12,-45.8 -91.88,-44.74 -91.88,-44.74 C-91.88,-44.74 -91.88,-46.42 -91.88,-46.42 C-91.88,-46.42 -90.65,-47.47 -90.65,-47.47 C-90.65,-47.47 -92.06,-47.92 -92.06,-47.92c  M62.83 -13.34 C62.83,-13.34 62.39,-14.93 62.39,-14.93 C62.39,-14.93 61.5,-13.52 61.5,-13.52 C61.5,-13.52 59.91,-13.52 59.91,-13.52 C59.91,-13.52 60.89,-12.2 60.89,-12.2 C60.89,-12.2 60.36,-10.52 60.36,-10.52 C60.36,-10.52 61.86,-11.14 61.86,-11.14 C61.86,-11.14 63.09,-10.08 63.09,-10.08 C63.09,-10.08 63.09,-11.84 63.09,-11.84 C63.09,-11.84 64.33,-12.81 64.33,-12.81 C64.33,-12.81 62.83,-13.34 62.83,-13.34c  M-155.99 -40.95 C-155.99,-40.95 -156.43,-42.54 -156.43,-42.54 C-156.43,-42.54 -157.32,-41.13 -157.32,-41.13 C-157.32,-41.13 -158.91,-41.21 -158.91,-41.21 C-158.91,-41.21 -157.93,-39.8 -157.93,-39.8 C-157.93,-39.8 -158.46,-38.22 -158.46,-38.22 C-158.46,-38.22 -156.96,-38.74 -156.96,-38.74 C-156.96,-38.74 -155.73,-37.69 -155.73,-37.69 C-155.73,-37.69 -155.73,-39.45 -155.73,-39.45 C-155.73,-39.45 -154.49,-40.42 -154.49,-40.42 C-154.49,-40.42 -155.99,-40.95 -155.99,-40.95c  M141.24 26.52 C141.24,26.52 140.71,24.85 140.71,24.85 C140.71,24.85 139.83,26.26 139.83,26.26 C139.83,26.26 138.33,26.26 138.33,26.26 C138.33,26.26 139.21,27.67 139.21,27.67 C139.21,27.67 138.77,29.26 138.77,29.26 C138.77,29.26 140.18,28.73 140.18,28.73 C140.18,28.73 141.51,29.7 141.51,29.7 C141.51,29.7 141.42,28.02 141.42,28.02 C141.42,28.02 142.74,27.05 142.74,27.05 C142.74,27.05 141.24,26.52 141.24,26.52c  M111.4 -51.27 C111.4,-51.27 110.95,-52.94 110.95,-52.94 C110.95,-52.94 110.07,-51.53 110.07,-51.53 C110.07,-51.53 108.48,-51.53 108.48,-51.53 C108.48,-51.53 109.45,-50.21 109.45,-50.21 C109.45,-50.21 108.92,-48.53 108.92,-48.53 C108.92,-48.53 110.42,-49.15 110.42,-49.15 C110.42,-49.15 111.66,-48.09 111.66,-48.09 C111.66,-48.09 111.66,-49.86 111.66,-49.86 C111.66,-49.86 112.9,-50.83 112.9,-50.83 C112.9,-50.83 111.4,-51.27 111.4,-51.27c  M-66.59 53.33 C-66.59,53.33 -67.03,51.65 -67.03,51.65 C-67.03,51.65 -67.91,53.06 -67.91,53.06 C-67.91,53.06 -69.5,53.06 -69.5,53.06 C-69.5,53.06 -68.53,54.47 -68.53,54.47 C-68.53,54.47 -69.06,56.06 -69.06,56.06 C-69.06,56.06 -67.56,55.53 -67.56,55.53 C-67.56,55.53 -66.32,56.5 -66.32,56.5 C-66.32,56.5 -66.32,54.82 -66.32,54.82 C-66.32,54.82 -65.08,53.77 -65.08,53.77 C-65.08,53.77 -66.59,53.33 -66.59,53.33c  M-50.59 59.33 C-50.59,59.33 -51.12,57.65 -51.12,57.65 C-51.12,57.65 -52,59.06 -52,59.06 C-52,59.06 -53.5,59.06 -53.5,59.06 C-53.5,59.06 -52.62,60.38 -52.62,60.38 C-52.62,60.38 -53.06,62.06 -53.06,62.06 C-53.06,62.06 -51.65,61.53 -51.65,61.53 C-51.65,61.53 -50.32,62.5 -50.32,62.5 C-50.32,62.5 -50.41,60.82 -50.41,60.82 C-50.41,60.82 -49.08,59.77 -49.08,59.77 C-49.08,59.77 -50.59,59.33 -50.59,59.33c  M29.98 -16.08 C29.98,-16.08 29.27,-18.46 29.27,-18.46 C29.27,-18.46 27.95,-16.43 27.95,-16.43 C27.95,-16.43 25.74,-16.43 25.74,-16.43 C25.74,-16.43 27.06,-14.49 27.06,-14.49 C27.06,-14.49 26.36,-12.11 26.36,-12.11 C26.36,-12.11 28.48,-12.9 28.48,-12.9 C28.48,-12.9 30.33,-11.49 30.33,-11.49 C30.33,-11.49 30.24,-13.96 30.24,-13.96 C30.24,-13.96 32.1,-15.37 32.1,-15.37 C32.1,-15.37 29.98,-16.08 29.98,-16.08c  M81.28 55.98 C81.28,55.98 80.58,53.6 80.58,53.6 C80.58,53.6 79.25,55.63 79.25,55.63 C79.25,55.63 77.04,55.63 77.04,55.63 C77.04,55.63 78.37,57.57 78.37,57.57 C78.37,57.57 77.66,59.95 77.66,59.95 C77.66,59.95 79.78,59.07 79.78,59.07 C79.78,59.07 81.64,60.56 81.64,60.56 C81.64,60.56 81.55,58.1 81.55,58.1 C81.55,58.1 83.4,56.68 83.4,56.68 C83.4,56.68 81.28,55.98 81.28,55.98c  M-165.26 -10.97 C-165.26,-10.97 -165.97,-13.35 -165.97,-13.35 C-165.97,-13.35 -167.29,-11.32 -167.29,-11.32 C-167.29,-11.32 -169.5,-11.32 -169.5,-11.32 C-169.5,-11.32 -168.18,-9.38 -168.18,-9.38 C-168.18,-9.38 -168.88,-7 -168.88,-7 C-168.88,-7 -166.76,-7.79 -166.76,-7.79 C-166.76,-7.79 -164.91,-6.38 -164.91,-6.38 C-164.91,-6.38 -165,-8.85 -165,-8.85 C-165,-8.85 -163.14,-10.26 -163.14,-10.26 C-163.14,-10.26 -165.26,-10.97 -165.26,-10.97c  M-74.05 21.76 C-74.05,21.76 -74.66,19.47 -74.66,19.47 C-74.66,19.47 -75.99,21.49 -75.99,21.49 C-75.99,21.49 -78.2,21.41 -78.2,21.41 C-78.2,21.41 -76.87,23.43 -76.87,23.43 C-76.87,23.43 -77.58,25.73 -77.58,25.73 C-77.58,25.73 -75.46,24.93 -75.46,24.93 C-75.46,24.93 -73.6,26.43 -73.6,26.43 C-73.6,26.43 -73.69,23.96 -73.69,23.96 C-73.69,23.96 -71.84,22.46 -71.84,22.46 C-71.84,22.46 -74.05,21.76 -74.05,21.76c  M8.98 55.68 C8.98,55.68 6.15,53.65 6.15,53.65 C6.15,53.65 6.24,57.09 6.24,57.09 C6.24,57.09 3.5,59.12 3.5,59.12 C3.5,59.12 6.86,60.09 6.86,60.09 C6.86,60.09 7.92,63.35 7.92,63.35 C7.92,63.35 9.86,60.44 9.86,60.44 C9.86,60.44 13.3,60.44 13.3,60.44 C13.3,60.44 11.18,57.71 11.18,57.71 C11.18,57.71 12.15,54.44 12.15,54.44 C12.15,54.44 8.98,55.68 8.98,55.68c  M124.89 -2.41 C124.89,-2.41 122.06,-4.35 122.06,-4.35 C122.06,-4.35 122.24,-0.91 122.24,-0.91 C122.24,-0.91 119.5,1.12 119.5,1.12 C119.5,1.12 122.77,2 122.77,2 C122.77,2 123.83,5.26 123.83,5.26 C123.83,5.26 125.77,2.44 125.77,2.44 C125.77,2.44 129.21,2.44 129.21,2.44 C129.21,2.44 127.09,-0.29 127.09,-0.29 C127.09,-0.29 128.15,-3.56 128.15,-3.56 C128.15,-3.56 124.89,-2.41 124.89,-2.41c  M77.31 19.91 C77.31,19.91 74.57,17.88 74.57,17.88 C74.57,17.88 74.66,21.32 74.66,21.32 C74.66,21.32 71.92,23.35 71.92,23.35 C71.92,23.35 75.19,24.32 75.19,24.32 C75.19,24.32 76.34,27.58 76.34,27.58 C76.34,27.58 78.19,24.67 78.19,24.67 C78.19,24.67 81.64,24.67 81.64,24.67 C81.64,24.67 79.52,21.94 79.52,21.94 C79.52,21.94 80.58,18.67 80.58,18.67 C80.58,18.67 77.31,19.91 77.31,19.91c  M-28.11 7.68 C-28.11,7.68 -30.94,5.65 -30.94,5.65 C-30.94,5.65 -30.76,9.09 -30.76,9.09 C-30.76,9.09 -33.5,11.12 -33.5,11.12 C-33.5,11.12 -30.23,12.09 -30.23,12.09 C-30.23,12.09 -29.17,15.35 -29.17,15.35 C-29.17,15.35 -27.23,12.44 -27.23,12.44 C-27.23,12.44 -23.79,12.44 -23.79,12.44 C-23.79,12.44 -25.91,9.71 -25.91,9.71 C-25.91,9.71 -24.85,6.44 -24.85,6.44 C-24.85,6.44 -28.11,7.68 -28.11,7.68c  M-119.43 -20.22 C-119.43,-20.22 -122.26,-22.16 -122.26,-22.16 C-122.26,-22.16 -122.08,-18.72 -122.08,-18.72 C-122.08,-18.72 -124.82,-16.7 -124.82,-16.7 C-124.82,-16.7 -121.55,-15.81 -121.55,-15.81 C-121.55,-15.81 -120.49,-12.55 -120.49,-12.55 C-120.49,-12.55 -118.55,-15.37 -118.55,-15.37 C-118.55,-15.37 -115.11,-15.37 -115.11,-15.37 C-115.11,-15.37 -117.23,-18.11 -117.23,-18.11 C-117.23,-18.11 -116.17,-21.37 -116.17,-21.37 C-116.17,-21.37 -119.43,-20.22 -119.43,-20.22c "/>
-                            </group>
-                        </group>
-                        <group android:name="_R_G_L_4_G_L_2_G">
-                            <group android:name="_R_G_L_4_G_L_2_G_L_2_G" android:translateX="206" android:translateY="145">
-                                <path android:name="_R_G_L_4_G_L_2_G_L_2_G_D_0_P_0" android:fillColor="#e8eaed" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -95.63 C206,-95.63 206,42.37 206,42.37 C206,43.47 205.1,44.37 204,44.37 C204,44.37 -204,44.37 -204,44.37 C-205.1,44.37 -206,43.47 -206,42.37 C-206,42.37 -206,-95.63 -206,-95.63 C-206,-96.73 -205.1,-97.63 -204,-97.63 C-204,-97.63 204,-97.63 204,-97.63 C205.1,-97.63 206,-96.73 206,-95.63c "/>
-                            </group>
-                            <group android:name="_R_G_L_4_G_L_2_G_L_1_G" android:translateX="206" android:translateY="145">
-                                <path android:name="_R_G_L_4_G_L_2_G_L_1_G_D_0_P_0" android:fillColor="#80868b" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M109 -14 C109,-14 109,14 109,14 C109,15.1 108.1,16 107,16 C107,16 -107,16 -107,16 C-108.1,16 -109,15.1 -109,14 C-109,14 -109,-14 -109,-14 C-109,-15.1 -108.1,-16 -107,-16 C-107,-16 107,-16 107,-16 C108.1,-16 109,-15.1 109,-14c "/>
-                            </group>
-                            <group android:name="_R_G_L_4_G_L_2_G_L_0_G" android:translateX="46" android:translateY="145">
-                                <path android:name="_R_G_L_4_G_L_2_G_L_0_G_D_0_P_0" android:fillColor="#80868b" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M22 -14 C22,-14 22,14 22,14 C22,18.42 18.42,22 14,22 C14,22 -14,22 -14,22 C-18.42,22 -22,18.42 -22,14 C-22,14 -22,-14 -22,-14 C-22,-18.42 -18.42,-22 -14,-22 C-14,-22 14,-22 14,-22 C18.42,-22 22,-18.42 22,-14c "/>
-                            </group>
-                        </group>
-                        <group android:name="_R_G_L_4_G_L_1_G" android:translateX="206" android:translateY="877">
-                            <path android:name="_R_G_L_4_G_L_1_G_D_0_P_0" android:fillColor="#373737" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M40 0 C40,0 40,0 40,0 C40,1.1 39.1,2 38,2 C38,2 -38,2 -38,2 C-39.1,2 -40,1.1 -40,0 C-40,0 -40,0 -40,0 C-40,-1.1 -39.1,-2 -38,-2 C-38,-2 38,-2 38,-2 C39.1,-2 40,-1.1 40,0c "/>
-                        </group>
-                        <group android:name="_R_G_L_4_G_L_0_G">
-                            <group android:name="_R_G_L_4_G_L_0_G_L_2_G" android:translateX="206" android:translateY="50.5">
-                                <path android:name="_R_G_L_4_G_L_0_G_L_2_G_D_0_P_0" android:fillColor="#202124" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -29.67 C206,-29.67 206,50.33 206,50.33 C206,50.33 -206,50.33 -206,50.33 C-206,50.33 -206,-29.67 -206,-29.67 C-206,-29.67 206,-29.67 206,-29.67c "/>
-                            </group>
-                            <group android:name="_R_G_L_4_G_L_0_G_L_1_G" android:translateX="206" android:translateY="50.5">
-                                <path android:name="_R_G_L_4_G_L_0_G_L_1_G_D_0_P_0" android:fillColor="#202124" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -32.5 C206,-32.5 206,32.5 206,32.5 C206,42.43 197.93,50.5 188,50.5 C188,50.5 -188,50.5 -188,50.5 C-197.93,50.5 -206,42.43 -206,32.5 C-206,32.5 -206,-32.5 -206,-32.5 C-206,-42.43 -197.93,-50.5 -188,-50.5 C-188,-50.5 188,-50.5 188,-50.5 C197.93,-50.5 206,-42.43 206,-32.5c "/>
-                            </group>
-                            <group android:name="_R_G_L_4_G_L_0_G_L_0_G" android:translateX="206" android:translateY="66.5">
-                                <path android:name="_R_G_L_4_G_L_0_G_L_0_G_D_0_P_0" android:fillColor="#3c4043" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M190 0 C190,0 190,0 190,0 C190,10.21 181.71,18.5 171.5,18.5 C171.5,18.5 -171.5,18.5 -171.5,18.5 C-181.71,18.5 -190,10.21 -190,0 C-190,0 -190,0 -190,0 C-190,-10.21 -181.71,-18.5 -171.5,-18.5 C-171.5,-18.5 171.5,-18.5 171.5,-18.5 C181.71,-18.5 190,-10.21 190,0c "/>
-                            </group>
-                        </group>
-                    </group>
-                </group>
-                <group android:name="_R_G_L_3_G_N_3_T_0" android:translateX="206" android:translateY="395" android:scaleX="0.6" android:scaleY="0">
-                    <group android:name="_R_G_L_3_G" android:translateX="-206" android:translateY="-446">
-                        <group android:name="_R_G_L_3_G_L_4_G" android:scaleY="0">
-                            <group android:name="_R_G_L_3_G_L_4_G_L_11_G" android:translateX="206" android:translateY="467" android:scaleY="0">
-                                <path android:name="_R_G_L_3_G_L_4_G_L_11_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -407 C206,-407 206,407 206,407 C206,416.93 197.93,425 188,425 C188,425 -188,425 -188,425 C-197.93,425 -206,416.93 -206,407 C-206,407 -206,-407 -206,-407 C-206,-416.93 -197.93,-425 -188,-425 C-188,-425 188,-425 188,-425 C197.93,-425 206,-416.93 206,-407c "/>
-                            </group>
-                            <group android:name="_R_G_L_3_G_L_4_G_L_10_G" android:translateX="182.5" android:translateY="831" android:scaleY="0">
-                                <path android:name="_R_G_L_3_G_L_4_G_L_10_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M158.5 -7 C158.5,-7 158.5,7 158.5,7 C158.5,9.21 156.71,11 154.5,11 C154.5,11 -154.5,11 -154.5,11 C-156.71,11 -158.5,9.21 -158.5,7 C-158.5,7 -158.5,-7 -158.5,-7 C-158.5,-9.21 -156.71,-11 -154.5,-11 C-154.5,-11 154.5,-11 154.5,-11 C156.71,-11 158.5,-9.21 158.5,-7c "/>
-                            </group>
-                            <group android:name="_R_G_L_3_G_L_4_G_L_9_G" android:translateX="186" android:translateY="801" android:scaleY="0">
-                                <path android:name="_R_G_L_3_G_L_4_G_L_9_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M162 -7 C162,-7 162,7 162,7 C162,9.21 160.21,11 158,11 C158,11 -158,11 -158,11 C-160.21,11 -162,9.21 -162,7 C-162,7 -162,-7 -162,-7 C-162,-9.21 -160.21,-11 -158,-11 C-158,-11 158,-11 158,-11 C160.21,-11 162,-9.21 162,-7c "/>
-                            </group>
-                            <group android:name="_R_G_L_3_G_L_4_G_L_8_G" android:translateX="119" android:translateY="755" android:scaleY="0">
-                                <path android:name="_R_G_L_3_G_L_4_G_L_8_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M95 -7 C95,-7 95,7 95,7 C95,9.21 93.21,11 91,11 C91,11 -91,11 -91,11 C-93.21,11 -95,9.21 -95,7 C-95,7 -95,-7 -95,-7 C-95,-9.21 -93.21,-11 -91,-11 C-91,-11 91,-11 91,-11 C93.21,-11 95,-9.21 95,-7c "/>
-                            </group>
-                            <group android:name="_R_G_L_3_G_L_4_G_L_7_G" android:translateX="182.5" android:translateY="725" android:scaleY="0">
-                                <path android:name="_R_G_L_3_G_L_4_G_L_7_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M158.5 -7 C158.5,-7 158.5,7 158.5,7 C158.5,9.21 156.71,11 154.5,11 C154.5,11 -154.5,11 -154.5,11 C-156.71,11 -158.5,9.21 -158.5,7 C-158.5,7 -158.5,-7 -158.5,-7 C-158.5,-9.21 -156.71,-11 -154.5,-11 C-154.5,-11 154.5,-11 154.5,-11 C156.71,-11 158.5,-9.21 158.5,-7c "/>
-                            </group>
-                            <group android:name="_R_G_L_3_G_L_4_G_L_6_G" android:translateX="197.5" android:translateY="695" android:scaleY="0">
-                                <path android:name="_R_G_L_3_G_L_4_G_L_6_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M173.5 -7 C173.5,-7 173.5,7 173.5,7 C173.5,9.21 171.71,11 169.5,11 C169.5,11 -169.5,11 -169.5,11 C-171.71,11 -173.5,9.21 -173.5,7 C-173.5,7 -173.5,-7 -173.5,-7 C-173.5,-9.21 -171.71,-11 -169.5,-11 C-169.5,-11 169.5,-11 169.5,-11 C171.71,-11 173.5,-9.21 173.5,-7c "/>
-                            </group>
-                            <group android:name="_R_G_L_3_G_L_4_G_L_5_G" android:translateX="192" android:translateY="665" android:scaleY="0">
-                                <path android:name="_R_G_L_3_G_L_4_G_L_5_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M168 -7 C168,-7 168,7 168,7 C168,9.21 166.21,11 164,11 C164,11 -164,11 -164,11 C-166.21,11 -168,9.21 -168,7 C-168,7 -168,-7 -168,-7 C-168,-9.21 -166.21,-11 -164,-11 C-164,-11 164,-11 164,-11 C166.21,-11 168,-9.21 168,-7c "/>
-                            </group>
-                            <group android:name="_R_G_L_3_G_L_4_G_L_4_G" android:translateX="105.5" android:translateY="360" android:scaleY="0">
-                                <path android:name="_R_G_L_3_G_L_4_G_L_4_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M23.5 -2 C23.5,-2 23.5,2 23.5,2 C23.5,4.21 21.71,6 19.5,6 C19.5,6 -19.5,6 -19.5,6 C-21.71,6 -23.5,4.21 -23.5,2 C-23.5,2 -23.5,-2 -23.5,-2 C-23.5,-4.21 -21.71,-6 -19.5,-6 C-19.5,-6 19.5,-6 19.5,-6 C21.71,-6 23.5,-4.21 23.5,-2c "/>
-                            </group>
-                            <group android:name="_R_G_L_3_G_L_4_G_L_3_G" android:translateX="47.5" android:translateY="360" android:scaleY="0">
-                                <path android:name="_R_G_L_3_G_L_4_G_L_3_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M23.5 -2 C23.5,-2 23.5,2 23.5,2 C23.5,4.21 21.71,6 19.5,6 C19.5,6 -19.5,6 -19.5,6 C-21.71,6 -23.5,4.21 -23.5,2 C-23.5,2 -23.5,-2 -23.5,-2 C-23.5,-4.21 -21.71,-6 -19.5,-6 C-19.5,-6 19.5,-6 19.5,-6 C21.71,-6 23.5,-4.21 23.5,-2c "/>
-                            </group>
-                            <group android:name="_R_G_L_3_G_L_4_G_L_2_G" android:translateX="142.5" android:translateY="328" android:scaleY="0">
-                                <path android:name="_R_G_L_3_G_L_4_G_L_2_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M118.5 -14 C118.5,-14 118.5,14 118.5,14 C118.5,16.21 116.71,18 114.5,18 C114.5,18 -114.5,18 -114.5,18 C-116.71,18 -118.5,16.21 -118.5,14 C-118.5,14 -118.5,-14 -118.5,-14 C-118.5,-16.21 -116.71,-18 -114.5,-18 C-114.5,-18 114.5,-18 114.5,-18 C116.71,-18 118.5,-16.21 118.5,-14c "/>
-                            </group>
-                            <group android:name="_R_G_L_3_G_L_4_G_L_1_G" android:translateX="186" android:translateY="284" android:scaleY="0">
-                                <path android:name="_R_G_L_3_G_L_4_G_L_1_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M162 -14 C162,-14 162,14 162,14 C162,16.21 160.21,18 158,18 C158,18 -158,18 -158,18 C-160.21,18 -162,16.21 -162,14 C-162,14 -162,-14 -162,-14 C-162,-16.21 -160.21,-18 -158,-18 C-158,-18 158,-18 158,-18 C160.21,-18 162,-16.21 162,-14c "/>
-                            </group>
-                            <group android:name="_R_G_L_3_G_L_4_G_L_0_G" android:translateX="155" android:translateY="240" android:scaleY="0">
-                                <path android:name="_R_G_L_3_G_L_4_G_L_0_G_D_0_P_0" android:fillColor="#bdc1c6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M131 -14 C131,-14 131,14 131,14 C131,16.21 129.21,18 127,18 C127,18 -127,18 -127,18 C-129.21,18 -131,16.21 -131,14 C-131,14 -131,-14 -131,-14 C-131,-16.21 -129.21,-18 -127,-18 C-127,-18 127,-18 127,-18 C129.21,-18 131,-16.21 131,-14c "/>
-                            </group>
-                        </group>
-                        <group android:name="_R_G_L_3_G_L_3_G" android:translateX="24" android:translateY="390" android:scaleY="0">
-                            <group android:name="_R_G_L_3_G_L_3_G_L_7_G" android:translateX="182" android:translateY="120" android:scaleY="0"/>
-                            <group android:name="_R_G_L_3_G_L_3_G_L_6_G" android:translateX="182" android:translateY="120" android:scaleY="0">
-                                <path android:name="_R_G_L_3_G_L_3_G_L_6_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M182 -116 C182,-116 182,116 182,116 C182,118.21 180.21,120 178,120 C178,120 -178,120 -178,120 C-180.21,120 -182,118.21 -182,116 C-182,116 -182,-116 -182,-116 C-182,-118.21 -180.21,-120 -178,-120 C-178,-120 178,-120 178,-120 C180.21,-120 182,-118.21 182,-116c "/>
-                            </group>
-                            <group android:name="_R_G_L_3_G_L_3_G_L_5_G" android:translateX="77.322" android:translateY="150.552" android:scaleY="0">
-                                <path android:name="_R_G_L_3_G_L_3_G_L_5_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 20.61 C0,20.61 -10.39,8.69 -10.39,8.69  M0 -6.11 C0,-6.11 -6.78,-15.61 -6.78,-15.61  M0 33.64 C0,33.64 8.26,17.67 8.26,17.67  M0 7.58 C0,7.58 8.26,-7.73 8.26,-7.73  M0 71.19 C0,71.19 0,-18.04 0,-18.04  M-30.22 37.18 C-30.22,37.18 0,-71.19 0,-71.19 C0,-71.19 30.22,37.18 30.22,37.18 C30.22,37.18 -30.22,37.18 -30.22,37.18c "/>
-                                <path android:name="_R_G_L_3_G_L_3_G_L_5_G_D_1_P_0" android:strokeColor="#9adcb2" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M0 20.61 C0,20.61 -10.39,8.69 -10.39,8.69  M0 -6.11 C0,-6.11 -6.78,-15.61 -6.78,-15.61  M0 33.64 C0,33.64 8.26,17.67 8.26,17.67  M0 7.58 C0,7.58 8.26,-7.73 8.26,-7.73  M0 71.19 C0,71.19 0,-18.04 0,-18.04  M-30.22 37.18 C-30.22,37.18 0,-71.19 0,-71.19 C0,-71.19 30.22,37.18 30.22,37.18 C30.22,37.18 -30.22,37.18 -30.22,37.18c "/>
-                            </group>
-                            <group android:name="_R_G_L_3_G_L_3_G_L_4_G" android:translateX="38.772" android:translateY="121.73" android:scaleY="0">
-                                <path android:name="_R_G_L_3_G_L_3_G_L_4_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 28.82 C0,28.82 -14.52,12.18 -14.52,12.18  M0 -8.58 C0,-8.58 -9.51,-21.75 -9.51,-21.75  M0 47.01 C0,47.01 11.57,24.7 11.57,24.7  M0 10.64 C0,10.64 11.57,-10.78 11.57,-10.78  M0 99.42 C0,99.42 0,-25.21 0,-25.21  M-31.92 51.94 C-31.92,51.94 0,-99.42 0,-99.42 C0,-99.42 31.92,51.94 31.92,51.94 C31.92,51.94 -31.92,51.94 -31.92,51.94c "/>
-                                <path android:name="_R_G_L_3_G_L_3_G_L_4_G_D_1_P_0" android:strokeColor="#9adcb2" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M0 28.82 C0,28.82 -14.52,12.18 -14.52,12.18  M0 -8.58 C0,-8.58 -9.51,-21.75 -9.51,-21.75  M0 47.01 C0,47.01 11.57,24.7 11.57,24.7  M0 10.64 C0,10.64 11.57,-10.78 11.57,-10.78  M0 99.42 C0,99.42 0,-25.21 0,-25.21  M-31.92 51.94 C-31.92,51.94 0,-99.42 0,-99.42 C0,-99.42 31.92,51.94 31.92,51.94 C31.92,51.94 -31.92,51.94 -31.92,51.94c "/>
-                            </group>
-                            <group android:name="_R_G_L_3_G_L_3_G_L_3_G" android:translateX="183" android:translateY="222" android:scaleY="0">
-                                <path android:name="_R_G_L_3_G_L_3_G_L_3_G_D_0_P_0" android:fillColor="#000000" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M170 0 C170,0 -170,0 -170,0 "/>
-                                <path android:name="_R_G_L_3_G_L_3_G_L_3_G_D_1_P_0" android:strokeColor="#9aa0a6" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="4" android:strokeAlpha="1" android:pathData=" M170 0 C170,0 -170,0 -170,0 "/>
-                            </group>
-                            <group android:name="_R_G_L_3_G_L_3_G_L_2_G" android:translateX="265.619" android:translateY="162.331" android:scaleY="0">
-                                <path android:name="_R_G_L_3_G_L_3_G_L_2_G_D_0_P_0" android:fillColor="#5f6368" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M-34.05 50.06 C-34.05,50.06 -34.05,-49.25 -34.05,-49.25  M-34.05 -49.55 C-34.05,-49.55 17.54,50.06 17.54,50.06 C17.54,50.06 84.62,50.06 84.62,50.06 C84.62,50.06 32.65,-50.06 32.65,-50.06 C32.65,-50.06 -34.05,-50.06 -34.05,-50.06 C-34.05,-50.06 -84.62,50.06 -84.62,50.06 C-84.62,50.06 17.54,50.06 17.54,50.06 "/>
-                                <path android:name="_R_G_L_3_G_L_3_G_L_2_G_D_1_P_0" android:strokeColor="#a8cbfe" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M-34.05 50.06 C-34.05,50.06 -34.05,-49.25 -34.05,-49.25  M-34.05 -49.55 C-34.05,-49.55 17.54,50.06 17.54,50.06 C17.54,50.06 84.62,50.06 84.62,50.06 C84.62,50.06 32.65,-50.06 32.65,-50.06 C32.65,-50.06 -34.05,-50.06 -34.05,-50.06 C-34.05,-50.06 -84.62,50.06 -84.62,50.06 C-84.62,50.06 17.54,50.06 17.54,50.06 "/>
-                            </group>
-                            <group android:name="_R_G_L_3_G_L_3_G_L_1_G" android:translateX="319.271" android:translateY="37.945" android:scaleY="0">
-                                <path android:name="_R_G_L_3_G_L_3_G_L_1_G_D_0_P_0" android:fillColor="#feefc3" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M13.42 2.99 C14.95,-4.17 9.93,-11.31 2.21,-12.96 C-0.9,-13.62 -3.97,-13.3 -6.64,-12.2 C-6.58,-12.19 -6.53,-12.18 -6.48,-12.17 C-1.03,-11.01 2.52,-5.97 1.44,-0.92 C0.36,4.13 -4.94,7.28 -10.4,6.12 C-11.6,5.86 -12.7,5.42 -13.69,4.83 C-11.9,8.78 -8.15,11.93 -3.34,12.96 C4.38,14.61 11.88,10.14 13.42,2.99c "/>
-                            </group>
-                            <group android:name="_R_G_L_3_G_L_3_G_L_0_G" android:translateX="179.5" android:translateY="73.351" android:scaleY="0">
-                                <path android:name="_R_G_L_3_G_L_3_G_L_0_G_D_0_P_0" android:fillColor="#dadce0" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M51.08 -40.95 C51.08,-40.95 50.55,-42.54 50.55,-42.54 C50.55,-42.54 49.67,-41.13 49.67,-41.13 C49.67,-41.13 48.17,-41.21 48.17,-41.21 C48.17,-41.21 49.05,-39.8 49.05,-39.8 C49.05,-39.8 48.61,-38.22 48.61,-38.22 C48.61,-38.22 50.02,-38.74 50.02,-38.74 C50.02,-38.74 51.35,-37.69 51.35,-37.69 C51.35,-37.69 51.26,-39.45 51.26,-39.45 C51.26,-39.45 52.59,-40.42 52.59,-40.42 C52.59,-40.42 51.08,-40.95 51.08,-40.95c  M8.78 30.58 C8.78,30.58 8.25,28.99 8.25,28.99 C8.25,28.99 7.37,30.4 7.37,30.4 C7.37,30.4 5.87,30.31 5.87,30.31 C5.87,30.31 6.75,31.72 6.75,31.72 C6.75,31.72 6.31,33.31 6.31,33.31 C6.31,33.31 7.72,32.78 7.72,32.78 C7.72,32.78 9.05,33.84 9.05,33.84 C9.05,33.84 8.96,32.08 8.96,32.08 C8.96,32.08 10.29,31.11 10.29,31.11 C10.29,31.11 8.78,30.58 8.78,30.58c  M19.38 -61.67 C19.38,-61.67 18.94,-63.35 18.94,-63.35 C18.94,-63.35 17.97,-61.94 17.97,-61.94 C17.97,-61.94 16.47,-61.94 16.47,-61.94 C16.47,-61.94 17.35,-60.62 17.35,-60.62 C17.35,-60.62 16.91,-58.94 16.91,-58.94 C16.91,-58.94 18.41,-59.56 18.41,-59.56 C18.41,-59.56 19.65,-58.5 19.65,-58.5 C19.65,-58.5 19.56,-60.18 19.56,-60.18 C19.56,-60.18 20.88,-61.23 20.88,-61.23 C20.88,-61.23 19.38,-61.67 19.38,-61.67c  M-32.98 35.08 C-32.98,35.08 -33.51,33.4 -33.51,33.4 C-33.51,33.4 -34.4,34.81 -34.4,34.81 C-34.4,34.81 -35.9,34.81 -35.9,34.81 C-35.9,34.81 -35.01,36.22 -35.01,36.22 C-35.01,36.22 -35.45,37.81 -35.45,37.81 C-35.45,37.81 -34.04,37.28 -34.04,37.28 C-34.04,37.28 -32.72,38.25 -32.72,38.25 C-32.72,38.25 -32.81,36.58 -32.81,36.58 C-32.81,36.58 -31.48,35.6 -31.48,35.6 C-31.48,35.6 -32.98,35.08 -32.98,35.08c  M45.34 7.56 C45.34,7.56 44.81,5.97 44.81,5.97 C44.81,5.97 43.93,7.38 43.93,7.38 C43.93,7.38 42.34,7.3 42.34,7.3 C42.34,7.3 43.31,8.71 43.31,8.71 C43.31,8.71 42.87,10.29 42.87,10.29 C42.87,10.29 44.28,9.77 44.28,9.77 C44.28,9.77 45.52,10.82 45.52,10.82 C45.52,10.82 45.52,9.06 45.52,9.06 C45.52,9.06 46.76,8.09 46.76,8.09 C46.76,8.09 45.34,7.56 45.34,7.56c  M-9.59 -41.67 C-9.59,-41.67 -10.12,-43.35 -10.12,-43.35 C-10.12,-43.35 -11,-41.94 -11,-41.94 C-11,-41.94 -12.5,-41.94 -12.5,-41.94 C-12.5,-41.94 -11.62,-40.62 -11.62,-40.62 C-11.62,-40.62 -12.06,-38.94 -12.06,-38.94 C-12.06,-38.94 -10.65,-39.56 -10.65,-39.56 C-10.65,-39.56 -9.32,-38.5 -9.32,-38.5 C-9.32,-38.5 -9.41,-40.26 -9.41,-40.26 C-9.41,-40.26 -8.09,-41.23 -8.09,-41.23 C-8.09,-41.23 -9.59,-41.67 -9.59,-41.67c  M97.74 -23.97 C97.74,-23.97 97.03,-26.35 97.03,-26.35 C97.03,-26.35 95.8,-24.32 95.8,-24.32 C95.8,-24.32 93.5,-24.32 93.5,-24.32 C93.5,-24.32 94.91,-22.38 94.91,-22.38 C94.91,-22.38 94.21,-20 94.21,-20 C94.21,-20 96.33,-20.88 96.33,-20.88 C96.33,-20.88 98.09,-19.38 98.09,-19.38 C98.09,-19.38 98.09,-21.85 98.09,-21.85 C98.09,-21.85 99.86,-23.26 99.86,-23.26 C99.86,-23.26 97.74,-23.97 97.74,-23.97c  M167.29 43.28 C167.29,43.28 166.67,40.9 166.67,40.9 C166.67,40.9 165.35,42.93 165.35,42.93 C165.35,42.93 163.14,42.93 163.14,42.93 C163.14,42.93 164.47,44.87 164.47,44.87 C164.47,44.87 163.76,47.25 163.76,47.25 C163.76,47.25 165.88,46.37 165.88,46.37 C165.88,46.37 167.73,47.87 167.73,47.87 C167.73,47.87 167.65,45.4 167.65,45.4 C167.65,45.4 169.5,43.98 169.5,43.98 C169.5,43.98 167.29,43.28 167.29,43.28c  M-1.1 -1.79 C-1.1,-1.79 -1.72,-4.08 -1.72,-4.08 C-1.72,-4.08 -3.05,-2.14 -3.05,-2.14 C-3.05,-2.14 -5.25,-2.14 -5.25,-2.14 C-5.25,-2.14 -3.93,-0.11 -3.93,-0.11 C-3.93,-0.11 -4.64,2.18 -4.64,2.18 C-4.64,2.18 -2.52,1.38 -2.52,1.38 C-2.52,1.38 -0.66,2.8 -0.66,2.8 C-0.66,2.8 -0.75,0.41 -0.75,0.41 C-0.75,0.41 1.1,-1.08 1.1,-1.08 C1.1,-1.08 -1.1,-1.79 -1.1,-1.79c  M-60.89 -5.23 C-60.89,-5.23 -61.59,-7.61 -61.59,-7.61 C-61.59,-7.61 -62.83,-5.58 -62.83,-5.58 C-62.83,-5.58 -65.13,-5.58 -65.13,-5.58 C-65.13,-5.58 -63.71,-3.64 -63.71,-3.64 C-63.71,-3.64 -64.42,-1.26 -64.42,-1.26 C-64.42,-1.26 -62.39,-2.14 -62.39,-2.14 C-62.39,-2.14 -60.53,-0.64 -60.53,-0.64 C-60.53,-0.64 -60.62,-3.11 -60.62,-3.11 C-60.62,-3.11 -58.77,-4.52 -58.77,-4.52 C-58.77,-4.52 -60.89,-5.23 -60.89,-5.23c  M-165.26 -10.97 C-165.26,-10.97 -165.97,-13.35 -165.97,-13.35 C-165.97,-13.35 -167.29,-11.32 -167.29,-11.32 C-167.29,-11.32 -169.5,-11.32 -169.5,-11.32 C-169.5,-11.32 -168.18,-9.38 -168.18,-9.38 C-168.18,-9.38 -168.88,-7 -168.88,-7 C-168.88,-7 -166.76,-7.79 -166.76,-7.79 C-166.76,-7.79 -164.91,-6.38 -164.91,-6.38 C-164.91,-6.38 -165,-8.85 -165,-8.85 C-165,-8.85 -163.14,-10.26 -163.14,-10.26 C-163.14,-10.26 -165.26,-10.97 -165.26,-10.97c  M-51.26 -42.98 C-51.26,-42.98 -54.09,-45.01 -54.09,-45.01 C-54.09,-45.01 -53.91,-41.57 -53.91,-41.57 C-53.91,-41.57 -56.65,-39.54 -56.65,-39.54 C-56.65,-39.54 -53.38,-38.57 -53.38,-38.57 C-53.38,-38.57 -52.32,-35.3 -52.32,-35.3 C-52.32,-35.3 -50.38,-38.13 -50.38,-38.13 C-50.38,-38.13 -46.94,-38.22 -46.94,-38.22 C-46.94,-38.22 -49.05,-40.86 -49.05,-40.86 C-49.05,-40.86 -47.99,-44.21 -47.99,-44.21 C-47.99,-44.21 -51.26,-42.98 -51.26,-42.98c  M-92.06 -47.92 C-92.06,-47.92 -92.59,-49.59 -92.59,-49.59 C-92.59,-49.59 -93.47,-48.18 -93.47,-48.18 C-93.47,-48.18 -95.06,-48.18 -95.06,-48.18 C-95.06,-48.18 -94.09,-46.86 -94.09,-46.86 C-94.09,-46.86 -94.53,-45.18 -94.53,-45.18 C-94.53,-45.18 -93.12,-45.8 -93.12,-45.8 C-93.12,-45.8 -91.88,-44.74 -91.88,-44.74 C-91.88,-44.74 -91.88,-46.42 -91.88,-46.42 C-91.88,-46.42 -90.65,-47.47 -90.65,-47.47 C-90.65,-47.47 -92.06,-47.92 -92.06,-47.92c  M62.83 -13.34 C62.83,-13.34 62.39,-14.93 62.39,-14.93 C62.39,-14.93 61.5,-13.52 61.5,-13.52 C61.5,-13.52 59.91,-13.52 59.91,-13.52 C59.91,-13.52 60.89,-12.2 60.89,-12.2 C60.89,-12.2 60.36,-10.52 60.36,-10.52 C60.36,-10.52 61.86,-11.14 61.86,-11.14 C61.86,-11.14 63.09,-10.08 63.09,-10.08 C63.09,-10.08 63.09,-11.84 63.09,-11.84 C63.09,-11.84 64.33,-12.81 64.33,-12.81 C64.33,-12.81 62.83,-13.34 62.83,-13.34c  M-155.99 -40.95 C-155.99,-40.95 -156.43,-42.54 -156.43,-42.54 C-156.43,-42.54 -157.32,-41.13 -157.32,-41.13 C-157.32,-41.13 -158.91,-41.21 -158.91,-41.21 C-158.91,-41.21 -157.93,-39.8 -157.93,-39.8 C-157.93,-39.8 -158.46,-38.22 -158.46,-38.22 C-158.46,-38.22 -156.96,-38.74 -156.96,-38.74 C-156.96,-38.74 -155.73,-37.69 -155.73,-37.69 C-155.73,-37.69 -155.73,-39.45 -155.73,-39.45 C-155.73,-39.45 -154.49,-40.42 -154.49,-40.42 C-154.49,-40.42 -155.99,-40.95 -155.99,-40.95c  M141.24 26.52 C141.24,26.52 140.71,24.85 140.71,24.85 C140.71,24.85 139.83,26.26 139.83,26.26 C139.83,26.26 138.33,26.26 138.33,26.26 C138.33,26.26 139.21,27.67 139.21,27.67 C139.21,27.67 138.77,29.26 138.77,29.26 C138.77,29.26 140.18,28.73 140.18,28.73 C140.18,28.73 141.51,29.7 141.51,29.7 C141.51,29.7 141.42,28.02 141.42,28.02 C141.42,28.02 142.74,27.05 142.74,27.05 C142.74,27.05 141.24,26.52 141.24,26.52c  M111.4 -51.27 C111.4,-51.27 110.95,-52.94 110.95,-52.94 C110.95,-52.94 110.07,-51.53 110.07,-51.53 C110.07,-51.53 108.48,-51.53 108.48,-51.53 C108.48,-51.53 109.45,-50.21 109.45,-50.21 C109.45,-50.21 108.92,-48.53 108.92,-48.53 C108.92,-48.53 110.42,-49.15 110.42,-49.15 C110.42,-49.15 111.66,-48.09 111.66,-48.09 C111.66,-48.09 111.66,-49.86 111.66,-49.86 C111.66,-49.86 112.9,-50.83 112.9,-50.83 C112.9,-50.83 111.4,-51.27 111.4,-51.27c  M-66.59 53.33 C-66.59,53.33 -67.03,51.65 -67.03,51.65 C-67.03,51.65 -67.91,53.06 -67.91,53.06 C-67.91,53.06 -69.5,53.06 -69.5,53.06 C-69.5,53.06 -68.53,54.47 -68.53,54.47 C-68.53,54.47 -69.06,56.06 -69.06,56.06 C-69.06,56.06 -67.56,55.53 -67.56,55.53 C-67.56,55.53 -66.32,56.5 -66.32,56.5 C-66.32,56.5 -66.32,54.82 -66.32,54.82 C-66.32,54.82 -65.08,53.77 -65.08,53.77 C-65.08,53.77 -66.59,53.33 -66.59,53.33c  M-50.59 59.33 C-50.59,59.33 -51.12,57.65 -51.12,57.65 C-51.12,57.65 -52,59.06 -52,59.06 C-52,59.06 -53.5,59.06 -53.5,59.06 C-53.5,59.06 -52.62,60.38 -52.62,60.38 C-52.62,60.38 -53.06,62.06 -53.06,62.06 C-53.06,62.06 -51.65,61.53 -51.65,61.53 C-51.65,61.53 -50.32,62.5 -50.32,62.5 C-50.32,62.5 -50.41,60.82 -50.41,60.82 C-50.41,60.82 -49.08,59.77 -49.08,59.77 C-49.08,59.77 -50.59,59.33 -50.59,59.33c  M29.98 -16.08 C29.98,-16.08 29.27,-18.46 29.27,-18.46 C29.27,-18.46 27.95,-16.43 27.95,-16.43 C27.95,-16.43 25.74,-16.43 25.74,-16.43 C25.74,-16.43 27.06,-14.49 27.06,-14.49 C27.06,-14.49 26.36,-12.11 26.36,-12.11 C26.36,-12.11 28.48,-12.9 28.48,-12.9 C28.48,-12.9 30.33,-11.49 30.33,-11.49 C30.33,-11.49 30.24,-13.96 30.24,-13.96 C30.24,-13.96 32.1,-15.37 32.1,-15.37 C32.1,-15.37 29.98,-16.08 29.98,-16.08c  M81.28 55.98 C81.28,55.98 80.58,53.6 80.58,53.6 C80.58,53.6 79.25,55.63 79.25,55.63 C79.25,55.63 77.04,55.63 77.04,55.63 C77.04,55.63 78.37,57.57 78.37,57.57 C78.37,57.57 77.66,59.95 77.66,59.95 C77.66,59.95 79.78,59.07 79.78,59.07 C79.78,59.07 81.64,60.56 81.64,60.56 C81.64,60.56 81.55,58.1 81.55,58.1 C81.55,58.1 83.4,56.68 83.4,56.68 C83.4,56.68 81.28,55.98 81.28,55.98c  M-165.26 -10.97 C-165.26,-10.97 -165.97,-13.35 -165.97,-13.35 C-165.97,-13.35 -167.29,-11.32 -167.29,-11.32 C-167.29,-11.32 -169.5,-11.32 -169.5,-11.32 C-169.5,-11.32 -168.18,-9.38 -168.18,-9.38 C-168.18,-9.38 -168.88,-7 -168.88,-7 C-168.88,-7 -166.76,-7.79 -166.76,-7.79 C-166.76,-7.79 -164.91,-6.38 -164.91,-6.38 C-164.91,-6.38 -165,-8.85 -165,-8.85 C-165,-8.85 -163.14,-10.26 -163.14,-10.26 C-163.14,-10.26 -165.26,-10.97 -165.26,-10.97c  M-74.05 21.76 C-74.05,21.76 -74.66,19.47 -74.66,19.47 C-74.66,19.47 -75.99,21.49 -75.99,21.49 C-75.99,21.49 -78.2,21.41 -78.2,21.41 C-78.2,21.41 -76.87,23.43 -76.87,23.43 C-76.87,23.43 -77.58,25.73 -77.58,25.73 C-77.58,25.73 -75.46,24.93 -75.46,24.93 C-75.46,24.93 -73.6,26.43 -73.6,26.43 C-73.6,26.43 -73.69,23.96 -73.69,23.96 C-73.69,23.96 -71.84,22.46 -71.84,22.46 C-71.84,22.46 -74.05,21.76 -74.05,21.76c  M8.98 55.68 C8.98,55.68 6.15,53.65 6.15,53.65 C6.15,53.65 6.24,57.09 6.24,57.09 C6.24,57.09 3.5,59.12 3.5,59.12 C3.5,59.12 6.86,60.09 6.86,60.09 C6.86,60.09 7.92,63.35 7.92,63.35 C7.92,63.35 9.86,60.44 9.86,60.44 C9.86,60.44 13.3,60.44 13.3,60.44 C13.3,60.44 11.18,57.71 11.18,57.71 C11.18,57.71 12.15,54.44 12.15,54.44 C12.15,54.44 8.98,55.68 8.98,55.68c  M124.89 -2.41 C124.89,-2.41 122.06,-4.35 122.06,-4.35 C122.06,-4.35 122.24,-0.91 122.24,-0.91 C122.24,-0.91 119.5,1.12 119.5,1.12 C119.5,1.12 122.77,2 122.77,2 C122.77,2 123.83,5.26 123.83,5.26 C123.83,5.26 125.77,2.44 125.77,2.44 C125.77,2.44 129.21,2.44 129.21,2.44 C129.21,2.44 127.09,-0.29 127.09,-0.29 C127.09,-0.29 128.15,-3.56 128.15,-3.56 C128.15,-3.56 124.89,-2.41 124.89,-2.41c  M77.31 19.91 C77.31,19.91 74.57,17.88 74.57,17.88 C74.57,17.88 74.66,21.32 74.66,21.32 C74.66,21.32 71.92,23.35 71.92,23.35 C71.92,23.35 75.19,24.32 75.19,24.32 C75.19,24.32 76.34,27.58 76.34,27.58 C76.34,27.58 78.19,24.67 78.19,24.67 C78.19,24.67 81.64,24.67 81.64,24.67 C81.64,24.67 79.52,21.94 79.52,21.94 C79.52,21.94 80.58,18.67 80.58,18.67 C80.58,18.67 77.31,19.91 77.31,19.91c  M-28.11 7.68 C-28.11,7.68 -30.94,5.65 -30.94,5.65 C-30.94,5.65 -30.76,9.09 -30.76,9.09 C-30.76,9.09 -33.5,11.12 -33.5,11.12 C-33.5,11.12 -30.23,12.09 -30.23,12.09 C-30.23,12.09 -29.17,15.35 -29.17,15.35 C-29.17,15.35 -27.23,12.44 -27.23,12.44 C-27.23,12.44 -23.79,12.44 -23.79,12.44 C-23.79,12.44 -25.91,9.71 -25.91,9.71 C-25.91,9.71 -24.85,6.44 -24.85,6.44 C-24.85,6.44 -28.11,7.68 -28.11,7.68c  M-119.43 -20.22 C-119.43,-20.22 -122.26,-22.16 -122.26,-22.16 C-122.26,-22.16 -122.08,-18.72 -122.08,-18.72 C-122.08,-18.72 -124.82,-16.7 -124.82,-16.7 C-124.82,-16.7 -121.55,-15.81 -121.55,-15.81 C-121.55,-15.81 -120.49,-12.55 -120.49,-12.55 C-120.49,-12.55 -118.55,-15.37 -118.55,-15.37 C-118.55,-15.37 -115.11,-15.37 -115.11,-15.37 C-115.11,-15.37 -117.23,-18.11 -117.23,-18.11 C-117.23,-18.11 -116.17,-21.37 -116.17,-21.37 C-116.17,-21.37 -119.43,-20.22 -119.43,-20.22c "/>
-                            </group>
-                        </group>
-                        <group android:name="_R_G_L_3_G_L_2_G" android:scaleY="0">
-                            <group android:name="_R_G_L_3_G_L_2_G_L_2_G" android:translateX="206" android:translateY="145" android:scaleY="0">
-                                <path android:name="_R_G_L_3_G_L_2_G_L_2_G_D_0_P_0" android:fillColor="#e8eaed" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -95.63 C206,-95.63 206,42.37 206,42.37 C206,43.47 205.1,44.37 204,44.37 C204,44.37 -204,44.37 -204,44.37 C-205.1,44.37 -206,43.47 -206,42.37 C-206,42.37 -206,-95.63 -206,-95.63 C-206,-96.73 -205.1,-97.63 -204,-97.63 C-204,-97.63 204,-97.63 204,-97.63 C205.1,-97.63 206,-96.73 206,-95.63c "/>
-                            </group>
-                            <group android:name="_R_G_L_3_G_L_2_G_L_1_G" android:translateX="206" android:translateY="145" android:scaleY="0">
-                                <path android:name="_R_G_L_3_G_L_2_G_L_1_G_D_0_P_0" android:fillColor="#80868b" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M109 -14 C109,-14 109,14 109,14 C109,15.1 108.1,16 107,16 C107,16 -107,16 -107,16 C-108.1,16 -109,15.1 -109,14 C-109,14 -109,-14 -109,-14 C-109,-15.1 -108.1,-16 -107,-16 C-107,-16 107,-16 107,-16 C108.1,-16 109,-15.1 109,-14c "/>
-                            </group>
-                            <group android:name="_R_G_L_3_G_L_2_G_L_0_G" android:translateX="46" android:translateY="145" android:scaleY="0">
-                                <path android:name="_R_G_L_3_G_L_2_G_L_0_G_D_0_P_0" android:fillColor="#80868b" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M22 -14 C22,-14 22,14 22,14 C22,18.42 18.42,22 14,22 C14,22 -14,22 -14,22 C-18.42,22 -22,18.42 -22,14 C-22,14 -22,-14 -22,-14 C-22,-18.42 -18.42,-22 -14,-22 C-14,-22 14,-22 14,-22 C18.42,-22 22,-18.42 22,-14c "/>
-                            </group>
-                        </group>
-                        <group android:name="_R_G_L_3_G_L_1_G" android:translateX="206" android:translateY="877" android:scaleY="0">
-                            <path android:name="_R_G_L_3_G_L_1_G_D_0_P_0" android:fillColor="#373737" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M40 0 C40,0 40,0 40,0 C40,1.1 39.1,2 38,2 C38,2 -38,2 -38,2 C-39.1,2 -40,1.1 -40,0 C-40,0 -40,0 -40,0 C-40,-1.1 -39.1,-2 -38,-2 C-38,-2 38,-2 38,-2 C39.1,-2 40,-1.1 40,0c "/>
-                        </group>
-                        <group android:name="_R_G_L_3_G_L_0_G" android:scaleY="0">
-                            <group android:name="_R_G_L_3_G_L_0_G_L_2_G" android:translateX="206" android:translateY="50.5" android:scaleY="0">
-                                <path android:name="_R_G_L_3_G_L_0_G_L_2_G_D_0_P_0" android:fillColor="#202124" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -29.67 C206,-29.67 206,50.33 206,50.33 C206,50.33 -206,50.33 -206,50.33 C-206,50.33 -206,-29.67 -206,-29.67 C-206,-29.67 206,-29.67 206,-29.67c "/>
-                            </group>
-                            <group android:name="_R_G_L_3_G_L_0_G_L_1_G" android:translateX="206" android:translateY="50.5" android:scaleY="0">
-                                <path android:name="_R_G_L_3_G_L_0_G_L_1_G_D_0_P_0" android:fillColor="#202124" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M206 -32.5 C206,-32.5 206,32.5 206,32.5 C206,42.43 197.93,50.5 188,50.5 C188,50.5 -188,50.5 -188,50.5 C-197.93,50.5 -206,42.43 -206,32.5 C-206,32.5 -206,-32.5 -206,-32.5 C-206,-42.43 -197.93,-50.5 -188,-50.5 C-188,-50.5 188,-50.5 188,-50.5 C197.93,-50.5 206,-42.43 206,-32.5c "/>
-                            </group>
-                            <group android:name="_R_G_L_3_G_L_0_G_L_0_G" android:translateX="206" android:translateY="66.5" android:scaleY="0">
-                                <path android:name="_R_G_L_3_G_L_0_G_L_0_G_D_0_P_0" android:fillColor="#3c4043" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M190 0 C190,0 190,0 190,0 C190,10.21 181.71,18.5 171.5,18.5 C171.5,18.5 -171.5,18.5 -171.5,18.5 C-181.71,18.5 -190,10.21 -190,0 C-190,0 -190,0 -190,0 C-190,-10.21 -181.71,-18.5 -171.5,-18.5 C-171.5,-18.5 171.5,-18.5 171.5,-18.5 C181.71,-18.5 190,-10.21 190,0c "/>
-                            </group>
-                        </group>
-                    </group>
-                </group>
-                <group android:name="_R_G_L_2_G_N_3_T_0" android:translateX="206" android:translateY="395" android:scaleX="0.6" android:scaleY="0">
-                    <group android:name="_R_G_L_2_G" android:translateY="-508.163" android:scaleX="0.68838" android:scaleY="0.68838">
-                        <path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="#9aa0a6" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 25 C13.81,25 25,13.81 25,0 C25,-13.81 13.81,-25 0,-25 C-13.81,-25 -25,-13.81 -25,0 C-25,13.81 -13.81,25 0,25c "/>
-                    </group>
-                </group>
-                <group android:name="_R_G_L_1_G_N_3_T_0" android:translateX="206" android:translateY="395" android:scaleX="0.6" android:scaleY="0">
-                    <group android:name="_R_G_L_1_G" android:translateX="-556.176" android:translateY="-7.307" android:scaleX="1.39" android:scaleY="1.39">
-                        <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="#3c4043" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M136.82 -315.36 C136.82,-315.36 -137.18,-315.36 -137.18,-315.36 C-137.18,-315.36 -137.18,326.29 -137.18,326.29 C-137.18,326.29 136.82,326.29 136.82,326.29 C136.82,326.29 136.82,-315.36 136.82,-315.36c "/>
-                    </group>
-                </group>
-                <group android:name="_R_G_L_0_G" android:translateX="-30" android:translateY="658.997" android:pivotX="300" android:pivotY="64" android:rotation="-90" android:scaleY="0">
-                    <group android:name="_R_G_L_0_G_L_2_G" android:translateX="295.995" android:translateY="63.997" android:scaleY="0">
-                        <path android:name="_R_G_L_0_G_L_2_G_D_0_P_0" android:fillColor="#baf29d" android:fillAlpha="0.3" android:fillType="nonZero" android:pathData=" M-166 64 C-130.65,64 -102,35.35 -102,0 C-102,-35.34 -130.65,-64 -166,-64 C-201.34,-64 -230,-35.34 -230,0 C-230,35.35 -201.34,64 -166,64c "/>
-                    </group>
-                    <group android:name="_R_G_L_0_G_L_1_G" android:translateX="192" android:translateY="63.997" android:rotation="90" android:scaleX="-1" android:scaleY="0">
-                        <path android:name="_R_G_L_0_G_L_1_G_D_0_P_0" android:fillColor="#baf29d" android:fillAlpha="0.3" android:fillType="nonZero" android:pathData=" M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c "/>
-                    </group>
-                    <group android:name="_R_G_L_0_G_L_0_G" android:translateX="295.995" android:translateY="63.997" android:scaleY="0">
-                        <group android:name="_R_G_L_0_G_L_0_G_D_0_P_0_G_0_T_0" android:translateX="-166" android:translateY="0">
-                            <path android:name="_R_G_L_0_G_L_0_G_D_0_P_0" android:fillColor="#baf29d" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M0 64 C35.35,64 64,35.35 64,0 C64,-35.34 35.35,-64 0,-64 C-35.34,-64 -64,-35.34 -64,0 C-64,35.35 -35.34,64 0,64c "/>
-                        </group>
-                    </group>
-                </group>
-            </group>
-            <group android:name="time_group"/>
-        </vector>
-    </aapt:attr>
-    <target android:name="_R_G_L_4_G_N_7_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="translateXY" android:duration="1500" android:startOffset="0" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 206,446C 206,446 206,446 206,446">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="950" android:startOffset="1500" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 206,446C 206,446 206,395 206,395">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_N_7_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleX" android:duration="1500" android:startOffset="0" android:valueFrom="1" android:valueTo="1" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="1500" android:startOffset="0" android:valueFrom="1" android:valueTo="1" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="950" android:startOffset="1500" android:valueFrom="1" android:valueTo="0.6" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="950" android:startOffset="1500" android:valueFrom="1" android:valueTo="0.6" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_N_7_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_N_7_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_4_G_L_11_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_4_G_L_10_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_4_G_L_9_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_4_G_L_8_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_4_G_L_7_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_4_G_L_6_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_4_G_L_5_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_4_G_L_4_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_4_G_L_3_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_4_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_4_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_4_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_4_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_3_G_L_7_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_3_G_L_6_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_3_G_L_5_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_3_G_L_4_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_3_G_L_3_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_3_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_3_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_3_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_3_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_2_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_2_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_2_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_N_3_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="translateXY" android:duration="3400" android:startOffset="0" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 206,395C 206,403.5 206,386.5 206,395">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="350" android:startOffset="3400" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 206,395C 206,403.5 206,437.5 206,446">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_N_3_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleX" android:duration="3400" android:startOffset="0" android:valueFrom="0.6" android:valueTo="0.6" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="3400" android:startOffset="0" android:valueFrom="0.6" android:valueTo="0.6" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="350" android:startOffset="3400" android:valueFrom="0.6" android:valueTo="0.72718" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="350" android:startOffset="3400" android:valueFrom="0.6" android:valueTo="0.72718" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="217" android:startOffset="3750" android:valueFrom="0.72718" android:valueTo="0.72" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.51,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="217" android:startOffset="3750" android:valueFrom="0.72718" android:valueTo="0.72" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.51,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_N_3_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3400" android:valueFrom="0" android:valueTo="0.6" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleX" android:duration="3883" android:startOffset="0" android:valueFrom="0.68838" android:valueTo="0.68838" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="3883" android:startOffset="0" android:valueFrom="0.68838" android:valueTo="0.68838" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="167" android:startOffset="3883" android:valueFrom="0.68838" android:valueTo="1.37677" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="167" android:startOffset="3883" android:valueFrom="0.68838" android:valueTo="1.37677" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_N_3_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="translateXY" android:duration="3400" android:startOffset="0" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 206,395C 206,403.5 206,386.5 206,395">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="350" android:startOffset="3400" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 206,395C 206,403.5 206,437.5 206,446">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_N_3_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleX" android:duration="3400" android:startOffset="0" android:valueFrom="0.6" android:valueTo="0.6" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="3400" android:startOffset="0" android:valueFrom="0.6" android:valueTo="0.6" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="350" android:startOffset="3400" android:valueFrom="0.6" android:valueTo="0.72718" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="350" android:startOffset="3400" android:valueFrom="0.6" android:valueTo="0.72718" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="217" android:startOffset="3750" android:valueFrom="0.72718" android:valueTo="0.72" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.51,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="217" android:startOffset="3750" android:valueFrom="0.72718" android:valueTo="0.72" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.51,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_N_3_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3883" android:valueFrom="0" android:valueTo="0.6" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="translateXY" android:duration="2667" android:startOffset="0" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -556.176,-7.307C -556.176,-7.307 -556.176,-7.307 -556.176,-7.307">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.272,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="250" android:startOffset="2667" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -556.176,-7.307C -556.176,-7.307 -421.176,-7.307 -421.176,-7.307">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.272,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="417" android:startOffset="2917" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -421.176,-7.307C -421.176,-7.307 -429.51,-7.307 -429.51,-7.307">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G_N_3_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="translateXY" android:duration="3400" android:startOffset="0" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 206,395C 206,403.5 206,386.5 206,395">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="350" android:startOffset="3400" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 206,395C 206,403.5 206,437.5 206,446">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G_N_3_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleX" android:duration="3400" android:startOffset="0" android:valueFrom="0.6" android:valueTo="0.6" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="3400" android:startOffset="0" android:valueFrom="0.6" android:valueTo="0.6" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="350" android:startOffset="3400" android:valueFrom="0.6" android:valueTo="0.72718" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="350" android:startOffset="3400" android:valueFrom="0.6" android:valueTo="0.72718" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="217" android:startOffset="3750" android:valueFrom="0.72718" android:valueTo="0.72" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.51,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="217" android:startOffset="3750" android:valueFrom="0.72718" android:valueTo="0.72" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.51,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G_N_3_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="2667" android:valueFrom="0" android:valueTo="0.6" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1233" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1400" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_1_G_D_0_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="pathData" android:duration="167" android:startOffset="1233" android:valueFrom="M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c " android:valueTo="M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c " android:valueType="pathType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="pathData" android:duration="1050" android:startOffset="1400" android:valueFrom="M0 1.99 C35.34,1.99 64,-26.66 63.99,-62.01 C63.99,-62.01 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64,-62 -64,-62 C-64,-26.66 -35.35,1.99 0,1.99c " android:valueTo="M-0.01 229.99 C35.33,229.99 63.99,201.34 63.99,166 C63.99,166 64.01,-61.87 64.01,-61.87 C64.01,-97.21 35.35,-125.87 0.01,-125.87 C-35.34,-125.87 -63.99,-97.21 -63.99,-61.87 C-63.99,-61.87 -64.01,166 -64.01,166 C-64.01,201.34 -35.36,229.99 -0.01,229.99c " android:valueType="pathType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1400" android:valueFrom="0" android:valueTo="-1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3483" android:valueFrom="-1" android:valueTo="0" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_0_G_D_0_P_0_G_0_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="translateXY" android:duration="167" android:startOffset="1233" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -166,0C -128,0 -204,0 -166,0">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="1050" android:startOffset="1400" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M -166,0C -128,0 24,0 62,0">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1233" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3483" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1233" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="3483" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="time_group">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="translateX" android:duration="5133" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-</animated-vector>
diff --git a/quickstep/res/drawable/mock_conversation.xml b/quickstep/res/drawable/mock_conversation.xml
new file mode 100644
index 0000000000..272d9ed8a8
--- /dev/null
+++ b/quickstep/res/drawable/mock_conversation.xml
@@ -0,0 +1,212 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="83"
+                    android:propertyName="translateX"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <aapt:attr name="android:drawable">
+        <vector
+            android:width="412dp"
+            android:height="892dp"
+            android:viewportHeight="892"
+            android:viewportWidth="412">
+            <group android:name="_R_G">
+                <group
+                    android:name="_R_G_L_1_G"
+                    android:translateX="206"
+                    android:translateY="446">
+                    <path
+                        android:name="_R_G_L_1_G_D_0_P_0"
+                        android:fillAlpha="1"
+                        android:fillColor="#dadce0"
+                        android:fillType="nonZero"
+                        android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c " />
+                </group>
+                <group
+                    android:name="_R_G_L_0_G"
+                    android:pivotX="206"
+                    android:pivotY="446"
+                    android:scaleX="1"
+                    android:scaleY="1">
+                    <group android:name="_R_G_L_0_G_L_0_G">
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_14_G"
+                            android:translateX="206"
+                            android:translateY="446">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_14_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#000000"
+                                android:fillType="nonZero"
+                                android:pathData=" M206 -422 C206,-422 206,422 206,422 C206,435.25 195.25,446 182,446 C182,446 -182,446 -182,446 C-195.25,446 -206,435.25 -206,422 C-206,422 -206,-422 -206,-422 C-206,-435.25 -195.25,-446 -182,-446 C-182,-446 182,-446 182,-446 C195.25,-446 206,-435.25 206,-422c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_13_G"
+                            android:translateX="206"
+                            android:translateY="496.5">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_13_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#f1f3f4"
+                                android:fillType="nonZero"
+                                android:pathData=" M206 -395.5 C206,-395.5 206,395.5 206,395.5 C206,395.5 -206,395.5 -206,395.5 C-206,395.5 -206,-395.5 -206,-395.5 C-206,-395.5 206,-395.5 206,-395.5c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_12_G"
+                            android:translateX="206"
+                            android:translateY="50.5">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_12_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#e8eaed"
+                                android:fillType="nonZero"
+                                android:pathData=" M206 -50.5 C206,-50.5 206,50.5 206,50.5 C206,50.5 -206,50.5 -206,50.5 C-206,50.5 -206,-50.5 -206,-50.5 C-206,-50.5 206,-50.5 206,-50.5c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_11_G"
+                            android:translateX="206"
+                            android:translateY="804">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_11_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M177 0 C177,12.15 167.15,22 155,22 C155,22 -155,22 -155,22 C-167.15,22 -177,12.15 -177,0 C-177,-12.15 -167.15,-22 -155,-22 C-155,-22 155,-22 155,-22 C167.15,-22 177,-12.15 177,0c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_10_G"
+                            android:translateX="117.5"
+                            android:translateY="61">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_10_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M83.5 -14 C83.5,-14 83.5,14 83.5,14 C83.5,16.21 81.71,18 79.5,18 C79.5,18 -79.5,18 -79.5,18 C-81.71,18 -83.5,16.21 -83.5,14 C-83.5,14 -83.5,-14 -83.5,-14 C-83.5,-16.21 -81.71,-18 -79.5,-18 C-79.5,-18 79.5,-18 79.5,-18 C81.71,-18 83.5,-16.21 83.5,-14c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_9_G"
+                            android:translateX="370"
+                            android:translateY="61">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_9_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M18 -14 C18,-14 18,14 18,14 C18,16.21 16.21,18 14,18 C14,18 -14,18 -14,18 C-16.21,18 -18,16.21 -18,14 C-18,14 -18,-14 -18,-14 C-18,-16.21 -16.21,-18 -14,-18 C-14,-18 14,-18 14,-18 C16.21,-18 18,-16.21 18,-14c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_8_G"
+                            android:translateX="318"
+                            android:translateY="61">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_8_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M18 -14 C18,-14 18,14 18,14 C18,16.21 16.21,18 14,18 C14,18 -14,18 -14,18 C-16.21,18 -18,16.21 -18,14 C-18,14 -18,-14 -18,-14 C-18,-16.21 -16.21,-18 -14,-18 C-14,-18 14,-18 14,-18 C16.21,-18 18,-16.21 18,-14c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_7_G"
+                            android:translateX="48"
+                            android:translateY="618">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_7_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M22 0 C22,12.15 12.15,22 0,22 C-12.15,22 -22,12.15 -22,0 C-22,-12.15 -12.15,-22 0,-22 C12.15,-22 22,-12.15 22,0c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_6_G"
+                            android:translateX="48"
+                            android:translateY="396">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_6_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M22 0 C22,12.15 12.15,22 0,22 C-12.15,22 -22,12.15 -22,0 C-22,-12.15 -12.15,-22 0,-22 C12.15,-22 22,-12.15 22,0c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_5_G"
+                            android:translateX="259"
+                            android:translateY="286">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_5_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M135 -38 C135,-38 135,38 135,38 C135,47.94 126.94,56 117,56 C117,56 -117,56 -117,56 C-126.94,56 -135,47.94 -135,38 C-135,38 -135,-38 -135,-38 C-135,-47.94 -126.94,-56 -117,-56 C-117,-56 117,-56 117,-56 C126.94,-56 135,-47.94 135,-38c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_4_G"
+                            android:translateX="259"
+                            android:translateY="468">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_4_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M134.5 4 C134.5,4 134.5,14 134.5,14 C134.5,16.21 132.71,18 130.5,18 C130.5,18 44.5,18 44.5,18 C42.29,18 40.5,16.21 40.5,14 C40.5,14 40.5,4 40.5,4 C40.5,1.79 42.29,0 44.5,0 C44.5,0 130.5,0 130.5,0 C132.71,0 134.5,1.79 134.5,4c  M135 0 C135,9.66 127.17,17.5 117.5,17.5 C117.5,17.5 31,17.5 31,17.5 C21.34,17.5 13.5,9.66 13.5,0 C13.5,-9.66 21.34,-17.5 31,-17.5 C31,-17.5 117.5,-17.5 117.5,-17.5 C127.17,-17.5 135,-9.66 135,0c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_3_G"
+                            android:translateX="259"
+                            android:translateY="526.5">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_3_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M135 -32.5 C135,-32.5 135,20.5 135,20.5 C135,22.71 133.21,24.5 131,24.5 C131,24.5 -95,24.5 -95,24.5 C-97.21,24.5 -99,22.71 -99,20.5 C-99,20.5 -99,-32.5 -99,-32.5 C-99,-34.71 -97.21,-36.5 -95,-36.5 C-95,-36.5 131,-36.5 131,-36.5 C133.21,-36.5 135,-34.71 135,-32.5c  M135 -18.5 C135,-18.5 135,18.5 135,18.5 C135,28.44 126.94,36.5 117,36.5 C117,36.5 -117,36.5 -117,36.5 C-126.94,36.5 -135,28.44 -135,18.5 C-135,18.5 -135,-18.5 -135,-18.5 C-135,-28.44 -126.94,-36.5 -117,-36.5 C-117,-36.5 117,-36.5 117,-36.5 C126.94,-36.5 135,-28.44 135,-18.5c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_2_G"
+                            android:translateX="259"
+                            android:translateY="708.5">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_2_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M135 -18.5 C135,-18.5 135,18.5 135,18.5 C135,28.44 126.94,36.5 117,36.5 C117,36.5 -117,36.5 -117,36.5 C-126.94,36.5 -135,28.44 -135,18.5 C-135,18.5 -135,-18.5 -135,-18.5 C-135,-28.44 -126.94,-36.5 -117,-36.5 C-117,-36.5 117,-36.5 117,-36.5 C126.94,-36.5 135,-28.44 135,-18.5c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_1_G"
+                            android:translateX="222"
+                            android:translateY="617">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_1_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#e8eaed"
+                                android:fillType="nonZero"
+                                android:pathData=" M45.5 0 C45.5,9.66 37.67,17.5 28,17.5 C28,17.5 -117.5,17.5 -117.5,17.5 C-127.16,17.5 -135,9.66 -135,0 C-135,-9.66 -127.16,-17.5 -117.5,-17.5 C-117.5,-17.5 28,-17.5 28,-17.5 C37.67,-17.5 45.5,-9.66 45.5,0c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_0_G"
+                            android:translateX="222"
+                            android:translateY="395.5">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_0_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#e8eaed"
+                                android:fillType="nonZero"
+                                android:pathData=" M77 0 C77,9.66 69.16,17.5 59.5,17.5 C59.5,17.5 -117.5,17.5 -117.5,17.5 C-127.16,17.5 -135,9.66 -135,0 C-135,-9.66 -127.16,-17.5 -117.5,-17.5 C-117.5,-17.5 59.5,-17.5 59.5,-17.5 C69.16,-17.5 77,-9.66 77,0c " />
+                        </group>
+                    </group>
+                </group>
+            </group>
+            <group android:name="time_group" />
+        </vector>
+    </aapt:attr>
+</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/mock_conversations_list.xml b/quickstep/res/drawable/mock_conversations_list.xml
new file mode 100644
index 0000000000..2dbc88f0bf
--- /dev/null
+++ b/quickstep/res/drawable/mock_conversations_list.xml
@@ -0,0 +1,361 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="83"
+                    android:propertyName="translateX"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <aapt:attr name="android:drawable">
+        <vector
+            android:width="412dp"
+            android:height="892dp"
+            android:viewportHeight="892"
+            android:viewportWidth="412">
+            <group android:name="_R_G">
+                <group
+                    android:name="_R_G_L_1_G"
+                    android:translateX="206"
+                    android:translateY="446">
+                    <path
+                        android:name="_R_G_L_1_G_D_0_P_0"
+                        android:fillAlpha="1"
+                        android:fillColor="#dadce0"
+                        android:fillType="nonZero"
+                        android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c " />
+                </group>
+                <group android:name="_R_G_L_0_G">
+                    <group android:name="_R_G_L_0_G_L_0_G">
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_28_G"
+                            android:translateX="206"
+                            android:translateY="446">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_28_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#000000"
+                                android:fillType="nonZero"
+                                android:pathData=" M206 -422 C206,-422 206,422 206,422 C206,435.25 195.25,446 182,446 C182,446 -182,446 -182,446 C-195.25,446 -206,435.25 -206,422 C-206,422 -206,-422 -206,-422 C-206,-435.25 -195.25,-446 -182,-446 C-182,-446 182,-446 182,-446 C195.25,-446 206,-435.25 206,-422c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_27_G"
+                            android:translateX="206"
+                            android:translateY="422.5">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_27_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M206 -395.5 C206,-395.5 206,395.5 206,395.5 C206,395.5 -206,395.5 -206,395.5 C-206,395.5 -206,-395.5 -206,-395.5 C-206,-395.5 206,-395.5 206,-395.5c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_26_G"
+                            android:translateX="206"
+                            android:translateY="496.5">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_26_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M206 -377.5 C206,-377.5 206,377.5 206,377.5 C206,387.43 197.93,395.5 188,395.5 C188,395.5 -188,395.5 -188,395.5 C-197.93,395.5 -206,387.43 -206,377.5 C-206,377.5 -206,-377.5 -206,-377.5 C-206,-387.43 -197.93,-395.5 -188,-395.5 C-188,-395.5 188,-395.5 188,-395.5 C197.93,-395.5 206,-387.43 206,-377.5c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_25_G"
+                            android:translateX="206"
+                            android:translateY="50.5">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_25_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#e8eaed"
+                                android:fillType="nonZero"
+                                android:pathData=" M206 -23.5 C206,-23.5 206,50.5 206,50.5 C206,50.5 -206,50.5 -206,50.5 C-206,50.5 -206,-23.5 -206,-23.5 C-206,-23.5 206,-23.5 206,-23.5c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_24_G"
+                            android:translateX="206"
+                            android:translateY="50.5">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_24_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#e8eaed"
+                                android:fillType="nonZero"
+                                android:pathData=" M206 -32.5 C206,-32.5 206,32.5 206,32.5 C206,42.43 197.93,50.5 188,50.5 C188,50.5 -188,50.5 -188,50.5 C-197.93,50.5 -206,42.43 -206,32.5 C-206,32.5 -206,-32.5 -206,-32.5 C-206,-42.43 -197.93,-50.5 -188,-50.5 C-188,-50.5 188,-50.5 188,-50.5 C197.93,-50.5 206,-42.43 206,-32.5c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_23_G"
+                            android:translateX="54"
+                            android:translateY="157">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_23_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_22_G"
+                            android:translateX="54"
+                            android:translateY="157">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_22_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_21_G"
+                            android:translateX="148.5"
+                            android:translateY="148">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_21_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M46.5 -5 C46.5,-5 46.5,5 46.5,5 C46.5,7.21 44.71,9 42.5,9 C42.5,9 -42.5,9 -42.5,9 C-44.71,9 -46.5,7.21 -46.5,5 C-46.5,5 -46.5,-5 -46.5,-5 C-46.5,-7.21 -44.71,-9 -42.5,-9 C-42.5,-9 42.5,-9 42.5,-9 C44.71,-9 46.5,-7.21 46.5,-5c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_20_G"
+                            android:translateX="186"
+                            android:translateY="169">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_20_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M84 -4 C84,-4 84,4 84,4 C84,6.21 82.21,8 80,8 C80,8 -80,8 -80,8 C-82.21,8 -84,6.21 -84,4 C-84,4 -84,-4 -84,-4 C-84,-6.21 -82.21,-8 -80,-8 C-80,-8 80,-8 80,-8 C82.21,-8 84,-6.21 84,-4c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_19_G"
+                            android:translateX="54"
+                            android:translateY="245">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_19_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_18_G"
+                            android:translateX="162"
+                            android:translateY="236">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_18_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M60 -5 C60,-5 60,5 60,5 C60,7.21 58.21,9 56,9 C56,9 -56,9 -56,9 C-58.21,9 -60,7.21 -60,5 C-60,5 -60,-5 -60,-5 C-60,-7.21 -58.21,-9 -56,-9 C-56,-9 56,-9 56,-9 C58.21,-9 60,-7.21 60,-5c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_17_G"
+                            android:translateX="171.5"
+                            android:translateY="257">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_17_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M69.5 -4 C69.5,-4 69.5,4 69.5,4 C69.5,6.21 67.71,8 65.5,8 C65.5,8 -65.5,8 -65.5,8 C-67.71,8 -69.5,6.21 -69.5,4 C-69.5,4 -69.5,-4 -69.5,-4 C-69.5,-6.21 -67.71,-8 -65.5,-8 C-65.5,-8 65.5,-8 65.5,-8 C67.71,-8 69.5,-6.21 69.5,-4c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_16_G"
+                            android:translateX="54"
+                            android:translateY="333">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_16_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_15_G"
+                            android:translateX="158"
+                            android:translateY="324">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_15_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M56 -5 C56,-5 56,5 56,5 C56,7.21 54.21,9 52,9 C52,9 -52,9 -52,9 C-54.21,9 -56,7.21 -56,5 C-56,5 -56,-5 -56,-5 C-56,-7.21 -54.21,-9 -52,-9 C-52,-9 52,-9 52,-9 C54.21,-9 56,-7.21 56,-5c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_14_G"
+                            android:translateX="217.5"
+                            android:translateY="345">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_14_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M115.5 -4 C115.5,-4 115.5,4 115.5,4 C115.5,6.21 113.71,8 111.5,8 C111.5,8 -111.5,8 -111.5,8 C-113.71,8 -115.5,6.21 -115.5,4 C-115.5,4 -115.5,-4 -115.5,-4 C-115.5,-6.21 -113.71,-8 -111.5,-8 C-111.5,-8 111.5,-8 111.5,-8 C113.71,-8 115.5,-6.21 115.5,-4c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_13_G"
+                            android:translateX="54"
+                            android:translateY="421">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_13_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_12_G"
+                            android:translateX="170"
+                            android:translateY="412">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_12_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M68 -5 C68,-5 68,5 68,5 C68,7.21 66.21,9 64,9 C64,9 -64,9 -64,9 C-66.21,9 -68,7.21 -68,5 C-68,5 -68,-5 -68,-5 C-68,-7.21 -66.21,-9 -64,-9 C-64,-9 64,-9 64,-9 C66.21,-9 68,-7.21 68,-5c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_11_G"
+                            android:translateX="198.5"
+                            android:translateY="433">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_11_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M96.5 -4 C96.5,-4 96.5,4 96.5,4 C96.5,6.21 94.71,8 92.5,8 C92.5,8 -92.5,8 -92.5,8 C-94.71,8 -96.5,6.21 -96.5,4 C-96.5,4 -96.5,-4 -96.5,-4 C-96.5,-6.21 -94.71,-8 -92.5,-8 C-92.5,-8 92.5,-8 92.5,-8 C94.71,-8 96.5,-6.21 96.5,-4c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_10_G"
+                            android:translateX="54"
+                            android:translateY="509">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_10_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_9_G"
+                            android:translateX="135"
+                            android:translateY="500">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_9_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M33 -5 C33,-5 33,5 33,5 C33,7.21 31.21,9 29,9 C29,9 -29,9 -29,9 C-31.21,9 -33,7.21 -33,5 C-33,5 -33,-5 -33,-5 C-33,-7.21 -31.21,-9 -29,-9 C-29,-9 29,-9 29,-9 C31.21,-9 33,-7.21 33,-5c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_8_G"
+                            android:translateX="185.5"
+                            android:translateY="521">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_8_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M83.5 -4 C83.5,-4 83.5,4 83.5,4 C83.5,6.21 81.71,8 79.5,8 C79.5,8 -79.5,8 -79.5,8 C-81.71,8 -83.5,6.21 -83.5,4 C-83.5,4 -83.5,-4 -83.5,-4 C-83.5,-6.21 -81.71,-8 -79.5,-8 C-79.5,-8 79.5,-8 79.5,-8 C81.71,-8 83.5,-6.21 83.5,-4c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_7_G"
+                            android:translateX="54"
+                            android:translateY="597">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_7_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_6_G"
+                            android:translateX="168.5"
+                            android:translateY="588">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_6_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M66.5 -5 C66.5,-5 66.5,5 66.5,5 C66.5,7.21 64.71,9 62.5,9 C62.5,9 -62.5,9 -62.5,9 C-64.71,9 -66.5,7.21 -66.5,5 C-66.5,5 -66.5,-5 -66.5,-5 C-66.5,-7.21 -64.71,-9 -62.5,-9 C-62.5,-9 62.5,-9 62.5,-9 C64.71,-9 66.5,-7.21 66.5,-5c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_5_G"
+                            android:translateX="198.5"
+                            android:translateY="609">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_5_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M96.5 -4 C96.5,-4 96.5,4 96.5,4 C96.5,6.21 94.71,8 92.5,8 C92.5,8 -92.5,8 -92.5,8 C-94.71,8 -96.5,6.21 -96.5,4 C-96.5,4 -96.5,-4 -96.5,-4 C-96.5,-6.21 -94.71,-8 -92.5,-8 C-92.5,-8 92.5,-8 92.5,-8 C94.71,-8 96.5,-6.21 96.5,-4c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_4_G"
+                            android:translateX="54"
+                            android:translateY="685">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_4_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_3_G"
+                            android:translateX="162.5"
+                            android:translateY="676">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_3_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M60.5 -5 C60.5,-5 60.5,5 60.5,5 C60.5,7.21 58.71,9 56.5,9 C56.5,9 -56.5,9 -56.5,9 C-58.71,9 -60.5,7.21 -60.5,5 C-60.5,5 -60.5,-5 -60.5,-5 C-60.5,-7.21 -58.71,-9 -56.5,-9 C-56.5,-9 56.5,-9 56.5,-9 C58.71,-9 60.5,-7.21 60.5,-5c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_2_G"
+                            android:translateX="174"
+                            android:translateY="697">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_2_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M72 -4 C72,-4 72,4 72,4 C72,6.21 70.21,8 68,8 C68,8 -68,8 -68,8 C-70.21,8 -72,6.21 -72,4 C-72,4 -72,-4 -72,-4 C-72,-6.21 -70.21,-8 -68,-8 C-68,-8 68,-8 68,-8 C70.21,-8 72,-6.21 72,-4c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_1_G"
+                            android:translateX="313.5"
+                            android:translateY="798">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_1_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M74.5 0 C74.5,0 74.5,0 74.5,0 C74.5,15.45 61.95,28 46.5,28 C46.5,28 -46.5,28 -46.5,28 C-61.95,28 -74.5,15.45 -74.5,0 C-74.5,0 -74.5,0 -74.5,0 C-74.5,-15.45 -61.95,-28 -46.5,-28 C-46.5,-28 46.5,-28 46.5,-28 C61.95,-28 74.5,-15.45 74.5,0c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_0_G"
+                            android:translateX="205.5"
+                            android:translateY="61">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_0_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#f8f9fa"
+                                android:fillType="nonZero"
+                                android:pathData=" M171.5 -14 C171.5,-14 171.5,14 171.5,14 C171.5,16.21 169.71,18 167.5,18 C167.5,18 -167.5,18 -167.5,18 C-169.71,18 -171.5,16.21 -171.5,14 C-171.5,14 -171.5,-14 -171.5,-14 C-171.5,-16.21 -169.71,-18 -167.5,-18 C-167.5,-18 167.5,-18 167.5,-18 C169.71,-18 171.5,-16.21 171.5,-14c " />
+                        </group>
+                    </group>
+                </group>
+            </group>
+            <group android:name="time_group" />
+        </vector>
+    </aapt:attr>
+</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/mock_webpage.xml b/quickstep/res/drawable/mock_webpage.xml
new file mode 100644
index 0000000000..93b22b7d31
--- /dev/null
+++ b/quickstep/res/drawable/mock_webpage.xml
@@ -0,0 +1,251 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="83"
+                    android:propertyName="translateX"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <aapt:attr name="android:drawable">
+        <vector
+            android:width="412dp"
+            android:height="892dp"
+            android:viewportHeight="892"
+            android:viewportWidth="412">
+            <group android:name="_R_G">
+                <group android:name="_R_G_L_0_G">
+                    <group android:name="_R_G_L_0_G_L_3_G">
+                        <group
+                            android:name="_R_G_L_0_G_L_3_G_L_11_G"
+                            android:scaleX="0.87473"
+                            android:scaleY="0.98643"
+                            android:translateX="206"
+                            android:translateY="472.769">
+                            <path
+                                android:name="_R_G_L_0_G_L_3_G_L_11_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M235.5 -407 C235.5,-407 235.5,407 235.5,407 C235.5,416.93 227.43,425 217.5,425 C217.5,425 -217.5,425 -217.5,425 C-227.43,425 -235.5,416.93 -235.5,407 C-235.5,407 -235.5,-407 -235.5,-407 C-235.5,-416.93 -227.43,-425 -217.5,-425 C-217.5,-425 217.5,-425 217.5,-425 C227.43,-425 235.5,-416.93 235.5,-407c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_3_G_L_10_G"
+                            android:translateX="182.5"
+                            android:translateY="831">
+                            <path
+                                android:name="_R_G_L_0_G_L_3_G_L_10_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M158.5 -3 C158.5,-3 158.5,3 158.5,3 C158.5,7.42 154.92,11 150.5,11 C150.5,11 -150.5,11 -150.5,11 C-154.92,11 -158.5,7.42 -158.5,3 C-158.5,3 -158.5,-3 -158.5,-3 C-158.5,-7.42 -154.92,-11 -150.5,-11 C-150.5,-11 150.5,-11 150.5,-11 C154.92,-11 158.5,-7.42 158.5,-3c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_3_G_L_9_G"
+                            android:translateX="186"
+                            android:translateY="801">
+                            <path
+                                android:name="_R_G_L_0_G_L_3_G_L_9_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M162 -3 C162,-3 162,3 162,3 C162,7.42 158.42,11 154,11 C154,11 -154,11 -154,11 C-158.42,11 -162,7.42 -162,3 C-162,3 -162,-3 -162,-3 C-162,-7.42 -158.42,-11 -154,-11 C-154,-11 154,-11 154,-11 C158.42,-11 162,-7.42 162,-3c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_3_G_L_8_G"
+                            android:translateX="119"
+                            android:translateY="755">
+                            <path
+                                android:name="_R_G_L_0_G_L_3_G_L_8_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M95 -3 C95,-3 95,3 95,3 C95,7.42 91.42,11 87,11 C87,11 -87,11 -87,11 C-91.42,11 -95,7.42 -95,3 C-95,3 -95,-3 -95,-3 C-95,-7.42 -91.42,-11 -87,-11 C-87,-11 87,-11 87,-11 C91.42,-11 95,-7.42 95,-3c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_3_G_L_7_G"
+                            android:translateX="182.5"
+                            android:translateY="725">
+                            <path
+                                android:name="_R_G_L_0_G_L_3_G_L_7_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M158.5 -3 C158.5,-3 158.5,3 158.5,3 C158.5,7.42 154.92,11 150.5,11 C150.5,11 -150.5,11 -150.5,11 C-154.92,11 -158.5,7.42 -158.5,3 C-158.5,3 -158.5,-3 -158.5,-3 C-158.5,-7.42 -154.92,-11 -150.5,-11 C-150.5,-11 150.5,-11 150.5,-11 C154.92,-11 158.5,-7.42 158.5,-3c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_3_G_L_6_G"
+                            android:translateX="197.5"
+                            android:translateY="695">
+                            <path
+                                android:name="_R_G_L_0_G_L_3_G_L_6_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M173.5 -3 C173.5,-3 173.5,3 173.5,3 C173.5,7.42 169.92,11 165.5,11 C165.5,11 -165.5,11 -165.5,11 C-169.92,11 -173.5,7.42 -173.5,3 C-173.5,3 -173.5,-3 -173.5,-3 C-173.5,-7.42 -169.92,-11 -165.5,-11 C-165.5,-11 165.5,-11 165.5,-11 C169.92,-11 173.5,-7.42 173.5,-3c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_3_G_L_5_G"
+                            android:translateX="192"
+                            android:translateY="665">
+                            <path
+                                android:name="_R_G_L_0_G_L_3_G_L_5_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M168 -3 C168,-3 168,3 168,3 C168,7.42 164.42,11 160,11 C160,11 -160,11 -160,11 C-164.42,11 -168,7.42 -168,3 C-168,3 -168,-3 -168,-3 C-168,-7.42 -164.42,-11 -160,-11 C-160,-11 160,-11 160,-11 C164.42,-11 168,-7.42 168,-3c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_3_G_L_4_G"
+                            android:translateX="105.5"
+                            android:translateY="360">
+                            <path
+                                android:name="_R_G_L_0_G_L_3_G_L_4_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M23.5 -2 C23.5,-2 23.5,2 23.5,2 C23.5,4.21 21.71,6 19.5,6 C19.5,6 -19.5,6 -19.5,6 C-21.71,6 -23.5,4.21 -23.5,2 C-23.5,2 -23.5,-2 -23.5,-2 C-23.5,-4.21 -21.71,-6 -19.5,-6 C-19.5,-6 19.5,-6 19.5,-6 C21.71,-6 23.5,-4.21 23.5,-2c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_3_G_L_3_G"
+                            android:translateX="47.5"
+                            android:translateY="360">
+                            <path
+                                android:name="_R_G_L_0_G_L_3_G_L_3_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M23.5 -2 C23.5,-2 23.5,2 23.5,2 C23.5,4.21 21.71,6 19.5,6 C19.5,6 -19.5,6 -19.5,6 C-21.71,6 -23.5,4.21 -23.5,2 C-23.5,2 -23.5,-2 -23.5,-2 C-23.5,-4.21 -21.71,-6 -19.5,-6 C-19.5,-6 19.5,-6 19.5,-6 C21.71,-6 23.5,-4.21 23.5,-2c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_3_G_L_2_G"
+                            android:translateX="142.5"
+                            android:translateY="328">
+                            <path
+                                android:name="_R_G_L_0_G_L_3_G_L_2_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M118.5 -10 C118.5,-10 118.5,10 118.5,10 C118.5,14.42 114.92,18 110.5,18 C110.5,18 -110.5,18 -110.5,18 C-114.92,18 -118.5,14.42 -118.5,10 C-118.5,10 -118.5,-10 -118.5,-10 C-118.5,-14.42 -114.92,-18 -110.5,-18 C-110.5,-18 110.5,-18 110.5,-18 C114.92,-18 118.5,-14.42 118.5,-10c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_3_G_L_1_G"
+                            android:translateX="186"
+                            android:translateY="284">
+                            <path
+                                android:name="_R_G_L_0_G_L_3_G_L_1_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M162 -10 C162,-10 162,10 162,10 C162,14.42 158.42,18 154,18 C154,18 -154,18 -154,18 C-158.42,18 -162,14.42 -162,10 C-162,10 -162,-10 -162,-10 C-162,-14.42 -158.42,-18 -154,-18 C-154,-18 154,-18 154,-18 C158.42,-18 162,-14.42 162,-10c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_3_G_L_0_G"
+                            android:translateX="155"
+                            android:translateY="240">
+                            <path
+                                android:name="_R_G_L_0_G_L_3_G_L_0_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M131 -10 C131,-10 131,10 131,10 C131,14.42 127.42,18 123,18 C123,18 -123,18 -123,18 C-127.42,18 -131,14.42 -131,10 C-131,10 -131,-10 -131,-10 C-131,-14.42 -127.42,-18 -123,-18 C-123,-18 123,-18 123,-18 C127.42,-18 131,-14.42 131,-10c " />
+                        </group>
+                    </group>
+                    <group
+                        android:name="_R_G_L_0_G_L_2_G"
+                        android:translateX="24"
+                        android:translateY="390">
+                        <group
+                            android:name="_R_G_L_0_G_L_2_G_L_0_G"
+                            android:translateX="182"
+                            android:translateY="120">
+                            <path
+                                android:name="_R_G_L_0_G_L_2_G_L_0_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M182 -98 C182,-98 182,98 182,98 C182,110.14 172.14,120 160,120 C160,120 -160,120 -160,120 C-172.14,120 -182,110.14 -182,98 C-182,98 -182,-98 -182,-98 C-182,-110.14 -172.14,-120 -160,-120 C-160,-120 160,-120 160,-120 C172.14,-120 182,-110.14 182,-98c " />
+                        </group>
+                    </group>
+                    <group android:name="_R_G_L_0_G_L_1_G">
+                        <group
+                            android:name="_R_G_L_0_G_L_1_G_L_2_G"
+                            android:translateX="206"
+                            android:translateY="145">
+                            <path
+                                android:name="_R_G_L_0_G_L_1_G_L_2_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#e8eaed"
+                                android:fillType="nonZero"
+                                android:pathData=" M206 -95.63 C206,-95.63 206,42.37 206,42.37 C206,43.47 205.1,44.37 204,44.37 C204,44.37 -204,44.37 -204,44.37 C-205.1,44.37 -206,43.47 -206,42.37 C-206,42.37 -206,-95.63 -206,-95.63 C-206,-96.73 -205.1,-97.63 -204,-97.63 C-204,-97.63 204,-97.63 204,-97.63 C205.1,-97.63 206,-96.73 206,-95.63c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_1_G_L_1_G"
+                            android:translateX="206"
+                            android:translateY="145">
+                            <path
+                                android:name="_R_G_L_0_G_L_1_G_L_1_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#80868b"
+                                android:fillType="nonZero"
+                                android:pathData=" M109 -14 C109,-14 109,14 109,14 C109,15.1 108.1,16 107,16 C107,16 -107,16 -107,16 C-108.1,16 -109,15.1 -109,14 C-109,14 -109,-14 -109,-14 C-109,-15.1 -108.1,-16 -107,-16 C-107,-16 107,-16 107,-16 C108.1,-16 109,-15.1 109,-14c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_1_G_L_0_G"
+                            android:translateX="46"
+                            android:translateY="145">
+                            <path
+                                android:name="_R_G_L_0_G_L_1_G_L_0_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#80868b"
+                                android:fillType="nonZero"
+                                android:pathData=" M22 -14 C22,-14 22,14 22,14 C22,18.42 18.42,22 14,22 C14,22 -14,22 -14,22 C-18.42,22 -22,18.42 -22,14 C-22,14 -22,-14 -22,-14 C-22,-18.42 -18.42,-22 -14,-22 C-14,-22 14,-22 14,-22 C18.42,-22 22,-18.42 22,-14c " />
+                        </group>
+                    </group>
+                    <group android:name="_R_G_L_0_G_L_0_G">
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_2_G"
+                            android:translateX="206"
+                            android:translateY="51">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_2_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#202124"
+                                android:fillType="nonZero"
+                                android:pathData=" M206 -0.27 C206,-0.27 206,49.73 206,49.73 C206,49.73 -206,49.73 -206,49.73 C-206,49.73 -206,-0.27 -206,-0.27 C-206,-0.27 206,-0.27 206,-0.27c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_1_G"
+                            android:translateX="206"
+                            android:translateY="50.5">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_1_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#202124"
+                                android:fillType="nonZero"
+                                android:pathData=" M206 -32.5 C206,-32.5 206,32.5 206,32.5 C206,42.43 197.93,50.5 188,50.5 C188,50.5 -188,50.5 -188,50.5 C-197.93,50.5 -206,42.43 -206,32.5 C-206,32.5 -206,-32.5 -206,-32.5 C-206,-42.43 -197.93,-50.5 -188,-50.5 C-188,-50.5 188,-50.5 188,-50.5 C197.93,-50.5 206,-42.43 206,-32.5c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_0_G_L_0_G"
+                            android:translateX="206"
+                            android:translateY="66.5">
+                            <path
+                                android:name="_R_G_L_0_G_L_0_G_L_0_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#3c4043"
+                                android:fillType="nonZero"
+                                android:pathData=" M190 0 C190,0 190,0 190,0 C190,10.21 181.71,18.5 171.5,18.5 C171.5,18.5 -171.5,18.5 -171.5,18.5 C-181.71,18.5 -190,10.21 -190,0 C-190,0 -190,0 -190,0 C-190,-10.21 -181.71,-18.5 -171.5,-18.5 C-171.5,-18.5 171.5,-18.5 171.5,-18.5 C181.71,-18.5 190,-10.21 190,0c " />
+                        </group>
+                    </group>
+                </group>
+            </group>
+            <group android:name="time_group" />
+        </vector>
+    </aapt:attr>
+</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/sandbox_fake_google_search.xml b/quickstep/res/drawable/sandbox_fake_google_search.xml
deleted file mode 100644
index f06b92784c..0000000000
--- a/quickstep/res/drawable/sandbox_fake_google_search.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="412dp"
-    android:height="892dp"
-    android:viewportWidth="412"
-    android:viewportHeight="892">
-  <group>
-    <clip-path
-        android:pathData="M24,0L388,0A24,24 0,0 1,412 24L412,868A24,24 0,0 1,388 892L24,892A24,24 0,0 1,0 868L0,24A24,24 0,0 1,24 0z"/>
-    <path
-        android:pathData="M24,0L388,0A24,24 0,0 1,412 24L412,868A24,24 0,0 1,388 892L24,892A24,24 0,0 1,0 868L0,24A24,24 0,0 1,24 0z"
-        android:fillColor="#000000"/>
-    <path
-        android:pathData="M183,464L183,464A46,46 0,0 1,137 510L-81,510A46,46 0,0 1,-127 464L-127,464A46,46 0,0 1,-81 418L137,418A46,46 0,0 1,183 464z"
-        android:strokeAlpha="0.6"
-        android:fillColor="#EA4335"
-        android:fillAlpha="0.3"/>
-    <path
-        android:pathData="M91,464C91,489.405 111.595,510 137,510C162.405,510 183,489.405 183,464C183,438.595 162.405,418 137,418C111.595,418 91,438.595 91,464Z"
-        android:strokeAlpha="0.6"
-        android:fillColor="#EA4335"
-        android:fillAlpha="0.6"/>
-    <path
-        android:pathData="M100,464C100,484.435 116.565,501 137,501C157.434,501 174,484.435 174,464C174,443.565 157.434,427 137,427C116.565,427 100,443.565 100,464Z"
-        android:fillColor="#EA4335"/>
-    <path
-        android:pathData="M24,0L388,0A24,24 0,0 1,412 24L412,868A24,24 0,0 1,388 892L24,892A24,24 0,0 1,0 868L0,24A24,24 0,0 1,24 0z"
-        android:fillColor="#000000"/>
-    <path
-        android:pathData="M24,0L388,0A24,24 0,0 1,412 24L412,868A24,24 0,0 1,388 892L24,892A24,24 0,0 1,0 868L0,24A24,24 0,0 1,24 0z"
-        android:fillColor="#000000"/>
-    <path
-        android:pathData="M0,101h412v791h-412z"
-        android:fillColor="#F1F3F4"/>
-    <path
-        android:pathData="M0,0h412v101h-412z"
-        android:fillColor="#202124"/>
-    <path
-        android:pathData="M34.5,48L377.5,48A18.5,18.5 0,0 1,396 66.5L396,66.5A18.5,18.5 0,0 1,377.5 85L34.5,85A18.5,18.5 0,0 1,16 66.5L16,66.5A18.5,18.5 0,0 1,34.5 48z"
-        android:fillColor="#3C4043"/>
-    <path
-        android:pathData="M168,875L244,875A2,2 0,0 1,246 877L246,877A2,2 0,0 1,244 879L168,879A2,2 0,0 1,166 877L166,877A2,2 0,0 1,168 875z"
-        android:fillColor="#373737"/>
-    <path
-        android:pathData="M57,355L355,355A25,25 0,0 1,380 380L380,380A25,25 0,0 1,355 405L57,405A25,25 0,0 1,32 380L32,380A25,25 0,0 1,57 355z"
-        android:strokeWidth="4"
-        android:fillColor="#DADCE0"
-        android:strokeColor="#BDC1C6"/>
-    <path
-        android:pathData="M104,429L192,429A4,4 0,0 1,196 433L196,449A4,4 0,0 1,192 453L104,453A4,4 0,0 1,100 449L100,433A4,4 0,0 1,104 429z"
-        android:fillColor="#DADCE0"/>
-    <path
-        android:pathData="M220,429L308,429A4,4 0,0 1,312 433L312,449A4,4 0,0 1,308 453L220,453A4,4 0,0 1,216 449L216,433A4,4 0,0 1,220 429z"
-        android:fillColor="#DADCE0"/>
-    <path
-        android:pathData="M120,242L120,242A26,26 0,0 1,146 268L146,268A26,26 0,0 1,120 294L120,294A26,26 0,0 1,94 268L94,268A26,26 0,0 1,120 242z"
-        android:fillColor="#4285F4"/>
-    <path
-        android:pathData="M243,261L243,261A17,17 0,0 1,260 278L260,294A17,17 0,0 1,243 311L243,311A17,17 0,0 1,226 294L226,278A17,17 0,0 1,243 261z"
-        android:fillColor="#4285F4"/>
-    <path
-        android:pathData="M272,244L272,244A8,8 0,0 1,280 252L280,286A8,8 0,0 1,272 294L272,294A8,8 0,0 1,264 286L264,252A8,8 0,0 1,272 244z"
-        android:fillColor="#34A853"/>
-    <path
-        android:pathData="M167,261L167,261A17,17 0,0 1,184 278L184,278A17,17 0,0 1,167 295L167,295A17,17 0,0 1,150 278L150,278A17,17 0,0 1,167 261z"
-        android:fillColor="#E94235"/>
-    <path
-        android:pathData="M301,261L301,261A17,17 0,0 1,318 278L318,278A17,17 0,0 1,301 295L301,295A17,17 0,0 1,284 278L284,278A17,17 0,0 1,301 261z"
-        android:fillColor="#E94235"/>
-    <path
-        android:pathData="M205,261L205,261A17,17 0,0 1,222 278L222,278A17,17 0,0 1,205 295L205,295A17,17 0,0 1,188 278L188,278A17,17 0,0 1,205 261z"
-        android:fillColor="#FABB05"/>
-    <path
-        android:pathData="M34,128L50,128A4,4 0,0 1,54 132L54,148A4,4 0,0 1,50 152L34,152A4,4 0,0 1,30 148L30,132A4,4 0,0 1,34 128z"
-        android:fillColor="#BDC1C6"/>
-    <path
-        android:pathData="M68,131L117,131A4,4 0,0 1,121 135L121,145A4,4 0,0 1,117 149L68,149A4,4 0,0 1,64 145L64,135A4,4 0,0 1,68 131z"
-        android:fillColor="#BDC1C6"/>
-  </group>
-</vector>
diff --git a/quickstep/res/layout/gesture_tutorial_fragment.xml b/quickstep/res/layout/gesture_tutorial_fragment.xml
index 700dd1f9f5..5f827309d9 100644
--- a/quickstep/res/layout/gesture_tutorial_fragment.xml
+++ b/quickstep/res/layout/gesture_tutorial_fragment.xml
@@ -65,6 +65,17 @@
         android:scaleType="fitXY"
         android:visibility="gone"/>
 
+    <ImageView
+        android:id="@+id/gesture_tutorial_gesture_video"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentEnd="true"
+        android:scaleType="fitXY"
+        android:visibility="gone"/>
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/gesture_tutorial_fragment_feedback_view"
         android:layout_width="match_parent"
diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml
index a0f1638c8a..de187a6524 100644
--- a/quickstep/res/values/strings.xml
+++ b/quickstep/res/values/strings.xml
@@ -95,30 +95,37 @@
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge">Make sure you swipe from the far-left edge.</string>
     <!-- Feedback shown during interactive parts of Back gesture tutorial for left edge when the gesture is cancelled. [CHAR LIMIT=100] -->
     <string name="back_gesture_feedback_cancelled_left_edge">Make sure you swipe from the left edge to the middle of the screen and let go.</string>
-    <!-- Feedback shown after completing the left back gesture before continuing on to the right edge. [CHAR LIMIT=60] -->
-    <string name="back_gesture_feedback_complete_left_edge">That\'s it! Now try swiping from the right edge.</string>
+    <!-- Feedback title shown after completing the left back gesture before continuing on to the right edge. [CHAR LIMIT=60] -->
+    <string name="back_gesture_feedback_title_complete_left_edge">Nice! Now swipe from the right to go back</string>
+    <!-- Feedback subtitle shown after completing the left back gesture before continuing on to the right edge. [CHAR LIMIT=60] -->
+    <string name="back_gesture_feedback_subtitle_complete_left_edge">You can also go back to the last screen by swiping from the right edge to the middle of the screen.</string>
     <!-- Feedback shown during interactive parts of Back gesture tutorial for right edge when the gesture is too far from the edge. [CHAR LIMIT=100] -->
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge">Make sure you swipe from the far-right edge.</string>
     <!-- Feedback shown during interactive parts of Back gesture tutorial for right edge when the gesture is cancelled. [CHAR LIMIT=100] -->
     <string name="back_gesture_feedback_cancelled_right_edge">Make sure you swipe from the right edge to the middle of the screen and let go.</string>
-    <!-- Feedback shown during interactive parts of Back gesture tutorial for left edge when the gesture is cancelled. [CHAR LIMIT=100] -->
-    <string name="back_gesture_feedback_complete">You completed the go back gesture. Next up, learn how to go Home.</string>
+    <!-- Feedback shown after completing the back gesture step if the user is following the full gesture tutorial flow. [CHAR LIMIT=100] -->
+    <string name="back_gesture_feedback_complete_with_follow_up">You completed the go back gesture. Next up, learn how to switch apps.</string>
+    <!-- Feedback shown after completing the back gesture step if the user started this tutorial individually. [CHAR LIMIT=100] -->
+    <string name="back_gesture_feedback_complete_without_follow_up">You completed the go back gesture.</string>
     <!-- Feedback shown during interactive parts of Back gesture tutorial when the gesture is within the nav bar region. [CHAR LIMIT=100] -->
     <string name="back_gesture_feedback_swipe_in_nav_bar">Make sure you don\'t swipe too close to the bottom of the screen.</string>
     <!-- Subtitle shown on the confirmation screen after successful gesture. [CHAR LIMIT=60] -->
     <string name="back_gesture_tutorial_confirm_subtitle">To change the sensitivity of the back gesture, go to Settings</string>
     <!-- Feedback shown during interactive parts of Home gesture tutorial when the gesture is started too far from the edge. [CHAR LIMIT=100] -->
     <!-- Introduction title for the Back gesture tutorial. [CHAR LIMIT=100] -->
-    <string name="back_gesture_intro_title">Swipe to go back</string>
+    <string name="back_gesture_intro_title">Swipe from the left to go back</string>
     <!-- Introduction subtitle for the Back gesture tutorial. [CHAR LIMIT=100] -->
-    <string name="back_gesture_intro_subtitle">To go back to the last screen, swipe from the left or right edge to the middle of the screen.</string>
+    <string name="back_gesture_intro_subtitle">To go back to the last screen you were on, swipe from the left edge to the middle of the screen.</string>
 
     <string name="home_gesture_feedback_swipe_too_far_from_edge">Make sure you swipe up from the bottom edge of the screen.</string>
     <!-- Feedback shown during interactive parts of Home gesture tutorial when the Overview gesture is detected. [CHAR LIMIT=100] -->
     <string name="home_gesture_feedback_overview_detected">Make sure you don\'t pause before letting go.</string>
     <!-- Feedback shown during interactive parts of Home gesture tutorial when the gesture is horizontal instead of vertical. [CHAR LIMIT=100] -->
     <string name="home_gesture_feedback_wrong_swipe_direction">Make sure you swipe straight up.</string>
-    <string name="home_gesture_feedback_complete">You completed the go Home gesture. Next up, learn how to switch apps.</string>
+    <!-- Feedback shown after completing the home gesture step if the user is following the full gesture tutorial flow. [CHAR LIMIT=100] -->
+    <string name="home_gesture_feedback_complete_with_follow_up">You completed the go Home gesture. Next up, learn how to go back.</string>
+    <!-- Feedback shown after completing the home gesture step if the user started this tutorial individually. [CHAR LIMIT=100] -->
+    <string name="home_gesture_feedback_complete_without_follow_up">You completed the go Home gesture.</string>
     <!-- Introduction title for the Home gesture tutorial. [CHAR LIMIT=100] -->
     <string name="home_gesture_intro_title">Swipe to go home</string>
     <!-- Introduction subtitle for the Home gesture tutorial. [CHAR LIMIT=100] -->
@@ -130,7 +137,10 @@
     <string name="overview_gesture_feedback_home_detected">Try holding the window for longer before releasing.</string>
     <!-- Feedback shown during interactive parts of Overview gesture tutorial when the gesture is horizontal instead of vertical. [CHAR LIMIT=100] -->
     <string name="overview_gesture_feedback_wrong_swipe_direction">Make sure you swipe straight up, then pause.</string>
-    <string name="overview_gesture_feedback_complete">You completed the switch apps gesture. You\'re ready to use your phone!</string>
+    <!-- Feedback shown after completing the overview gesture step if the user is following the full gesture tutorial flow. [CHAR LIMIT=100] -->
+    <string name="overview_gesture_feedback_complete_with_follow_up">You learned how to use gestures. To turn off gestures, go to Settings.</string>
+    <!-- Feedback shown after completing the overview gesture step if the user started this tutorial individually. [CHAR LIMIT=100] -->
+    <string name="overview_gesture_feedback_complete_without_follow_up">You completed the switch apps gesture.</string>
     <!-- Introduction title for the Overview gesture tutorial. [CHAR LIMIT=100] -->
     <string name="overview_gesture_intro_title">Swipe to switch apps</string>
     <!-- Introduction subtitle for the Overview gesture tutorial. [CHAR LIMIT=100] -->
diff --git a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
index c396eec50e..34f556bb04 100644
--- a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
@@ -53,6 +53,11 @@ final class BackGestureTutorialController extends TutorialController {
                 ? R.string.back_gesture_intro_subtitle : null;
     }
 
+    @Override
+    protected int getMockAppTaskThumbnailResId() {
+        return R.drawable.mock_conversation;
+    }
+
     @Override
     public void onBackGestureAttempted(BackGestureResult result) {
         switch (mTutorialType) {
@@ -74,11 +79,14 @@ final class BackGestureTutorialController extends TutorialController {
     private void handleAttemptFromRight(BackGestureResult result) {
         switch (result) {
             case BACK_COMPLETED_FROM_RIGHT:
+                mTutorialFragment.releaseGestureVideoView();
                 hideFeedback(true);
                 mFakeTaskView.setBackground(AppCompatResources.getDrawable(mContext,
-                        R.drawable.sandbox_fake_google_search));
-                showRippleEffect(null);
-                showFeedback(R.string.back_gesture_feedback_complete, true);
+                        R.drawable.mock_conversations_list));
+                int subtitleResId = mTutorialFragment.getNumSteps() == 1
+                        ? R.string.back_gesture_feedback_complete_without_follow_up
+                        : R.string.back_gesture_feedback_complete_with_follow_up;
+                showFeedback(subtitleResId, true);
                 break;
             case BACK_CANCELLED_FROM_RIGHT:
                 showFeedback(R.string.back_gesture_feedback_cancelled_right_edge);
@@ -97,11 +105,13 @@ final class BackGestureTutorialController extends TutorialController {
     private void handleAttemptFromLeft(BackGestureResult result) {
         switch (result) {
             case BACK_COMPLETED_FROM_LEFT:
+                mTutorialFragment.releaseGestureVideoView();
                 hideFeedback(true);
                 mFakeTaskView.setBackground(AppCompatResources.getDrawable(mContext,
-                        R.drawable.sandbox_fake_google_search));
-                showRippleEffect(null);
-                showFeedback(R.string.back_gesture_feedback_complete_left_edge,
+                        R.drawable.mock_conversations_list));
+                showFeedback(
+                        R.string.back_gesture_feedback_title_complete_left_edge,
+                        R.string.back_gesture_feedback_subtitle_complete_left_edge,
                         () -> mTutorialFragment.changeController(RIGHT_EDGE_BACK_NAVIGATION));
                 break;
             case BACK_CANCELLED_FROM_LEFT:
diff --git a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java
index 71d00f03a2..830d0ad54e 100644
--- a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java
@@ -29,8 +29,16 @@ public class BackGestureTutorialFragment extends TutorialFragment {
     @Override
     Integer getFeedbackVideoResId() {
         return mTutorialType == TutorialType.RIGHT_EDGE_BACK_NAVIGATION
-                ? R.drawable.gesture_tutorial_back_right
-                : R.drawable.gesture_tutorial_back_left;
+                ? R.drawable.gesture_tutorial_motion_back_right
+                : R.drawable.gesture_tutorial_motion_back_left;
+    }
+
+    @Nullable
+    @Override
+    Integer getGestureVideoResId() {
+        return mTutorialType == TutorialType.RIGHT_EDGE_BACK_NAVIGATION
+                ? R.drawable.gesture_tutorial_loop_back_right
+                : R.drawable.gesture_tutorial_loop_back_left;
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
index 2e580af18f..ff50a0e01b 100644
--- a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
@@ -41,6 +41,11 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll
         return R.string.home_gesture_intro_subtitle;
     }
 
+    @Override
+    protected int getMockAppTaskThumbnailResId() {
+        return R.drawable.mock_webpage;
+    }
+
     @Override
     public void onBackGestureAttempted(BackGestureResult result) {
         switch (mTutorialType) {
@@ -72,10 +77,13 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll
             case HOME_NAVIGATION:
                 switch (result) {
                     case HOME_GESTURE_COMPLETED: {
+                        mTutorialFragment.releaseGestureVideoView();
                         animateFakeTaskViewHome(finalVelocity, null);
                         showActionButton();
-                        showFeedback(R.string.home_gesture_feedback_complete,
-                                true);
+                        int subtitleResId = mTutorialFragment.getNumSteps() == 1
+                                ? R.string.home_gesture_feedback_complete_without_follow_up
+                                : R.string.home_gesture_feedback_complete_with_follow_up;
+                        showFeedback(subtitleResId, true);
                         break;
                     }
                     case HOME_NOT_STARTED_TOO_FAR_FROM_EDGE:
diff --git a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialFragment.java
index ebddc6934b..47964d27c3 100644
--- a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialFragment.java
@@ -25,7 +25,13 @@ public class HomeGestureTutorialFragment extends TutorialFragment {
     @Nullable
     @Override
     Integer getFeedbackVideoResId() {
-        return R.drawable.gesture_tutorial_home;
+        return R.drawable.gesture_tutorial_motion_home;
+    }
+
+    @Nullable
+    @Override
+    Integer getGestureVideoResId() {
+        return R.drawable.gesture_tutorial_loop_home;
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
index 3c59ed3007..d148d81aa6 100644
--- a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
@@ -58,6 +58,11 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont
         return null;
     }
 
+    @Override
+    protected int getMockAppTaskThumbnailResId() {
+        return R.drawable.mock_conversations_list;
+    }
+
     @Override
     public void onBackGestureAttempted(BackGestureResult result) {
         switch (mTutorialType) {
@@ -100,6 +105,7 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont
                         showFeedback(R.string.overview_gesture_feedback_swipe_too_far_from_edge);
                         break;
                     case OVERVIEW_GESTURE_COMPLETED:
+                        mTutorialFragment.releaseGestureVideoView();
                         PendingAnimation anim = new PendingAnimation(300);
                         anim.setFloat(mTaskViewSwipeUpAnimation
                                 .getCurrentShift(), AnimatedFloat.VALUE, 1, ACCEL);
@@ -107,7 +113,10 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont
                         animset.start();
                         mRunningWindowAnim = SwipeUpAnimationLogic.RunningWindowAnim.wrap(animset);
                         onMotionPaused(true /*arbitrary value*/);
-                        showFeedback(R.string.overview_gesture_feedback_complete, true);
+                        int subtitleResId = mTutorialFragment.getNumSteps() == 1
+                                ? R.string.overview_gesture_feedback_complete_without_follow_up
+                                : R.string.overview_gesture_feedback_complete_with_follow_up;
+                        showFeedback(subtitleResId, true);
                         break;
                     case HOME_OR_OVERVIEW_NOT_STARTED_WRONG_SWIPE_DIRECTION:
                     case HOME_OR_OVERVIEW_CANCELLED:
diff --git a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java
index 86344ab292..c919b96a46 100644
--- a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java
@@ -25,7 +25,13 @@ public class OverviewGestureTutorialFragment extends TutorialFragment {
     @Nullable
     @Override
     Integer getFeedbackVideoResId() {
-        return R.drawable.gesture_tutorial_overview;
+        return R.drawable.gesture_tutorial_motion_overview;
+    }
+
+    @Nullable
+    @Override
+    Integer getGestureVideoResId() {
+        return R.drawable.gesture_tutorial_loop_overview;
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
index 6f82f8596b..14d16c8723 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
@@ -63,6 +63,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
     final ImageButton mCloseButton;
     final ViewGroup mFeedbackView;
     final ImageView mFeedbackVideoView;
+    final ImageView mGestureVideoView;
     final ImageView mFakeLauncherView;
     final ClipIconView mFakeIconView;
     final View mFakeTaskView;
@@ -85,6 +86,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         mCloseButton.setOnClickListener(button -> showSkipTutorialDialog());
         mFeedbackView = rootView.findViewById(R.id.gesture_tutorial_fragment_feedback_view);
         mFeedbackVideoView = rootView.findViewById(R.id.gesture_tutorial_feedback_video);
+        mGestureVideoView = rootView.findViewById(R.id.gesture_tutorial_gesture_video);
         mFakeLauncherView = rootView.findViewById(R.id.gesture_tutorial_fake_launcher_view);
         mFakeIconView = rootView.findViewById(R.id.gesture_tutorial_fake_icon_view);
         mFakeTaskView = rootView.findViewById(R.id.gesture_tutorial_fake_task_view);
@@ -181,8 +183,8 @@ abstract class TutorialController implements BackGestureAttemptCallback,
     /**
      * Show feedback reflecting a failed gesture attempt.
      **/
-    void showFeedback(int subtitleResId, @Nullable Runnable successEndAction) {
-        showFeedback(subtitleResId, successEndAction, false);
+    void showFeedback(int titleResId, int subtitleResId, @Nullable Runnable successEndAction) {
+        showFeedback(titleResId, subtitleResId, successEndAction, false);
     }
 
     /**
@@ -220,7 +222,8 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         mHideFeedbackEndAction = successEndAction;
 
         AnimatedVectorDrawable tutorialAnimation = mTutorialFragment.getTutorialAnimation();
-        if (tutorialAnimation != null) {
+        AnimatedVectorDrawable gestureAnimation = mTutorialFragment.getGestureAnimation();
+        if (tutorialAnimation != null && gestureAnimation != null) {
             if (successEndAction == null) {
                 if (tutorialAnimation.isRunning()) {
                     tutorialAnimation.reset();
@@ -231,6 +234,11 @@ abstract class TutorialController implements BackGestureAttemptCallback,
                     public void onAnimationStart(Drawable drawable) {
                         super.onAnimationStart(drawable);
 
+                        mGestureVideoView.setVisibility(View.GONE);
+                        if (gestureAnimation.isRunning()) {
+                            gestureAnimation.stop();
+                        }
+
                         mFeedbackView.setTranslationY(
                                 -mFeedbackView.getHeight() - mFeedbackView.getTop());
                         mFeedbackView.setVisibility(View.VISIBLE);
@@ -244,6 +252,9 @@ abstract class TutorialController implements BackGestureAttemptCallback,
                     public void onAnimationEnd(Drawable drawable) {
                         super.onAnimationEnd(drawable);
 
+                        mGestureVideoView.setVisibility(View.VISIBLE);
+                        gestureAnimation.start();
+
                         mFeedbackView.removeCallbacks(mHideFeedbackRunnable);
                         mFeedbackView.post(mHideFeedbackRunnable);
 
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
index b6663b8b81..0220f2d21f 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
@@ -51,8 +51,10 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
     EdgeBackGestureHandler mEdgeBackGestureHandler;
     NavBarGestureHandler mNavBarGestureHandler;
     private ImageView mFeedbackVideoView;
+    private ImageView mGestureVideoView;
 
     @Nullable private AnimatedVectorDrawable mTutorialAnimation = null;
+    @Nullable private AnimatedVectorDrawable mGestureAnimation = null;
     private boolean mIntroductionShown = false;
 
     public static TutorialFragment newInstance(TutorialType tutorialType) {
@@ -96,11 +98,20 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
         return null;
     }
 
+    @Nullable Integer getGestureVideoResId() {
+        return null;
+    }
+
     @Nullable
     AnimatedVectorDrawable getTutorialAnimation() {
         return mTutorialAnimation;
     }
 
+    @Nullable
+    AnimatedVectorDrawable getGestureAnimation() {
+        return mGestureAnimation;
+    }
+
     abstract TutorialController createController(TutorialType type);
 
     abstract Class<? extends TutorialController> getControllerClass();
@@ -135,6 +146,7 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
         });
         mRootView.setOnTouchListener(this);
         mFeedbackVideoView = mRootView.findViewById(R.id.gesture_tutorial_feedback_video);
+        mGestureVideoView = mRootView.findViewById(R.id.gesture_tutorial_gesture_video);
         return mRootView;
     }
 
@@ -162,7 +174,7 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
 
     boolean updateFeedbackVideo() {
         Integer feedbackVideoResId = getFeedbackVideoResId();
-        if (feedbackVideoResId == null || getContext() == null) {
+        if (feedbackVideoResId == null || getContext() == null || !updateGestureVideo()) {
             return false;
         }
         mTutorialAnimation = (AnimatedVectorDrawable) getContext().getDrawable(feedbackVideoResId);
@@ -190,6 +202,29 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
         return true;
     }
 
+    boolean updateGestureVideo() {
+        Integer gestureVideoResId = getGestureVideoResId();
+        if (gestureVideoResId == null || getContext() == null) {
+            return false;
+        }
+        mGestureAnimation = (AnimatedVectorDrawable) getContext().getDrawable(gestureVideoResId);
+
+        if (mGestureAnimation != null) {
+            mGestureAnimation.registerAnimationCallback(new Animatable2.AnimationCallback() {
+
+                @Override
+                public void onAnimationEnd(Drawable drawable) {
+                    super.onAnimationEnd(drawable);
+
+                    mGestureAnimation.start();
+                }
+            });
+        }
+        mGestureVideoView.setImageDrawable(mGestureAnimation);
+
+        return true;
+    }
+
     void releaseFeedbackVideoView() {
         if (mTutorialAnimation != null && mTutorialAnimation.isRunning()) {
             mTutorialAnimation.stop();
@@ -198,6 +233,14 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
         mFeedbackVideoView.setVisibility(View.GONE);
     }
 
+    void releaseGestureVideoView() {
+        if (mGestureAnimation != null && mGestureAnimation.isRunning()) {
+            mGestureAnimation.stop();
+        }
+
+        mGestureVideoView.setVisibility(View.GONE);
+    }
+
     @Override
     public void onResume() {
         super.onResume();
diff --git a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
index 217453fb63..d0a8c711b0 100644
--- a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
+++ b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
@@ -277,8 +277,8 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
             startActivity(launchSandboxIntent.putExtra(
                     "tutorial_steps",
                     new String[] {
-                            "LEFT_EDGE_BACK_NAVIGATION",
                             "HOME_NAVIGATION",
+                            "LEFT_EDGE_BACK_NAVIGATION",
                             "OVERVIEW_NAVIGATION"}));
             return true;
         });
-- 
GitLab


From 9e0189bac66ae8cf80faebb4ddc8b978566ee21f Mon Sep 17 00:00:00 2001
From: Jon Spivack <spivack@google.com>
Date: Tue, 11 May 2021 19:02:58 -0700
Subject: [PATCH 1146/1664] Default screen context permissions for NIU Actions

This updates the checks for ASSIST_STRUCTURE_ENABLED and ASSIST_SCREENSHOT_ENABLED to return 1 if the settings do not exist. This matches the logic in the Settings app iself, which has the toggle boxes on by default but does not actually initialize those values until they are toggled for the first time.

Bug: 187868947
Test: Manual (tested on Pixel 3A)
Change-Id: I4ef067dcf21b40eea71199e057d7a00d1d8fb2b3
---
 .../src/com/android/quickstep/TaskOverlayFactoryGo.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
index 67e9d898e5..907767551c 100644
--- a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
+++ b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
@@ -170,9 +170,9 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
         public void checkPermissions() {
             ContentResolver contentResolver = mApplicationContext.getContentResolver();
             boolean structureEnabled = Settings.Secure.getInt(contentResolver,
-                    Settings.Secure.ASSIST_STRUCTURE_ENABLED, 0) != 0;
+                    Settings.Secure.ASSIST_STRUCTURE_ENABLED, 1) != 0;
             boolean screenshotEnabled = Settings.Secure.getInt(contentResolver,
-                    Settings.Secure.ASSIST_SCREENSHOT_ENABLED, 0) != 0;
+                    Settings.Secure.ASSIST_SCREENSHOT_ENABLED, 1) != 0;
             mAssistPermissionsEnabled = structureEnabled && screenshotEnabled;
         }
 
-- 
GitLab


From f78ba72379091227989ce71953e4d97c1294ee72 Mon Sep 17 00:00:00 2001
From: Evan Rosky <erosky@google.com>
Date: Mon, 10 May 2021 21:46:43 +0000
Subject: [PATCH 1147/1664] Revert "Fix a bug in TouchInteractionService for
 fixed-display input rotation"

This reverts commit 04fb7ee44c54a5f9b8de42dbde33fb2e4a532f49.

Reason for revert: This wasn't the right fix.

Bug: 179274888
Change-Id: Ic9aaf2b43252533837206cc82ac5fd1f2d7297f8
---
 .../src/com/android/quickstep/TouchInteractionService.java | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 338a6efd82..4fc97702ed 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -496,13 +496,6 @@ public class TouchInteractionService extends Service implements PluginListener<O
             Point sz = new Point();
             display.getRealSize(sz);
             if (rotation != Surface.ROTATION_0) {
-                if ((rotation % 2) != 0) {
-                    // via display-manager, the display size is unrotated, so "rotate" its size
-                    // to match the rotation we are transforming the event into.
-                    final int tmpX = sz.x;
-                    sz.x = sz.y;
-                    sz.y = tmpX;
-                }
                 event.transform(InputChannelCompat.createRotationMatrix(rotation, sz.x, sz.y));
             }
         }
-- 
GitLab


From 3af62c1e25809a835a6b43d86eb32a012ae518ba Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Wed, 12 May 2021 00:29:53 -0700
Subject: [PATCH 1148/1664] Fix white text on light accent color issue for all
 apps and widgets drawer

Bug: 187857897
Bug: 185211063

Test: manual, see screenshot on the bug
Change-Id: Ie7461ce4724c15dafda35a5c533d9539a34d68ab
---
 res/color/all_apps_tab_text.xml            | 2 +-
 res/layout/all_apps_personal_work_tabs.xml | 4 ++--
 res/values/styles.xml                      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/res/color/all_apps_tab_text.xml b/res/color/all_apps_tab_text.xml
index 0c9acf95af..4ddb277163 100644
--- a/res/color/all_apps_tab_text.xml
+++ b/res/color/all_apps_tab_text.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/white" android:state_selected="true"/>
+    <item android:color="?android:attr/textColorPrimaryInverse" android:state_selected="true"/>
     <item android:color="?android:attr/textColorTertiary"/>
 </selector>
\ No newline at end of file
diff --git a/res/layout/all_apps_personal_work_tabs.xml b/res/layout/all_apps_personal_work_tabs.xml
index cefd0ab72c..750e101b16 100644
--- a/res/layout/all_apps_personal_work_tabs.xml
+++ b/res/layout/all_apps_personal_work_tabs.xml
@@ -35,7 +35,7 @@
         android:background="?android:attr/selectableItemBackground"
         android:text="@string/all_apps_personal_tab"
         android:textColor="@color/all_apps_tab_text"
-        android:textSize="14sp" />
+        android:textSize="16sp" />
 
     <Button
         android:id="@+id/tab_work"
@@ -45,5 +45,5 @@
         android:background="?android:attr/selectableItemBackground"
         android:text="@string/all_apps_work_tab"
         android:textColor="@color/all_apps_tab_text"
-        android:textSize="14sp" />
+        android:textSize="16sp" />
 </com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index dd72114495..8691ad954e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -195,7 +195,7 @@
         <item name="android:alpha">0</item>
         <item name="android:elevation">3dp</item>
         <item name="android:saveEnabled">false</item>
-        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
         <item name="android:includeFontPadding">false</item>
         <item name="android:importantForAccessibility">no</item>
     </style>
-- 
GitLab


From 34041385833e4555ceadd139657bccfea1cd99c7 Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Wed, 12 May 2021 02:25:33 -0700
Subject: [PATCH 1149/1664] Forces a back region for sandbox even if gesture
 nav is disabled.

When gesture nav is disabled, this config value returns 0,
preventing the back gesture from being recognized.
Probably we won't show the sandbox in that case, but it'd
be good to have a reasonable fallback just in case.

Bug: 186715828
Test: Manual with gesture nav enabled and disabled
Change-Id: Ic5e03bede80521670f81e6ac7b02f364259b9f96
---
 .../quickstep/interaction/EdgeBackGestureHandler.java    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/interaction/EdgeBackGestureHandler.java b/quickstep/src/com/android/quickstep/interaction/EdgeBackGestureHandler.java
index 9489bac266..c532f8e43d 100644
--- a/quickstep/src/com/android/quickstep/interaction/EdgeBackGestureHandler.java
+++ b/quickstep/src/com/android/quickstep/interaction/EdgeBackGestureHandler.java
@@ -30,6 +30,7 @@ import android.view.ViewGroup.LayoutParams;
 import androidx.annotation.Nullable;
 
 import com.android.launcher3.ResourceUtils;
+import com.android.launcher3.Utilities;
 
 /**
  * Utility class to handle edge swipes for back gestures.
@@ -47,9 +48,9 @@ public class EdgeBackGestureHandler implements OnTouchListener {
     private final Point mDisplaySize = new Point();
 
     // The edge width where touch down is allowed
-    private int mEdgeWidth;
+    private final int mEdgeWidth;
     // The bottom gesture area height
-    private int mBottomGestureHeight;
+    private final int mBottomGestureHeight;
     // The slop to distinguish between horizontal and vertical motion
     private final float mTouchSlop;
     // Duration after which we consider the event as longpress.
@@ -97,7 +98,9 @@ public class EdgeBackGestureHandler implements OnTouchListener {
 
         mBottomGestureHeight =
             ResourceUtils.getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE, res);
-        mEdgeWidth = ResourceUtils.getNavbarSize("config_backGestureInset", res);
+        int systemBackRegion = ResourceUtils.getNavbarSize("config_backGestureInset", res);
+        // System back region is 0 if gesture nav is not currently enabled.
+        mEdgeWidth = systemBackRegion == 0 ? Utilities.dpToPx(18) : systemBackRegion;
     }
 
     void setViewGroupParent(@Nullable ViewGroup parent) {
-- 
GitLab


From 670473301a6341c91b58e3fd6b19006a31cb4fc2 Mon Sep 17 00:00:00 2001
From: Cyrus Boadway <boadway@google.com>
Date: Wed, 12 May 2021 11:32:16 +0000
Subject: [PATCH 1150/1664] Improve widget-activity transition animation for
 translucent activities

Activities may be translucent. In that case, the widget should not
visually be a part of the activity launch or return animations.

Bug: 169042867
Test: manual
Change-Id: Ifb690672f71854e491fa240a6c7f0d882910a47c
---
 .../launcher3/QuickstepTransitionManager.java |  2 +-
 .../android/quickstep/AbsSwipeUpHandler.java  |  6 ++-
 .../quickstep/FallbackSwipeHandler.java       |  2 +-
 .../quickstep/LauncherSwipeHandlerV2.java     |  9 +++--
 .../quickstep/views/FloatingWidgetView.java   | 40 +++++++++++--------
 5 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 1b54211beb..de9b361197 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -783,7 +783,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
         final FloatingWidgetView floatingView = FloatingWidgetView.getFloatingWidgetView(mLauncher,
                 v, widgetBackgroundBounds,
                 new Size(windowTargetBounds.width(), windowTargetBounds.height()),
-                finalWindowRadius);
+                finalWindowRadius, appTargetsAreTranslucent);
         final float initialWindowRadius = supportsRoundedCornersOnWindows(mLauncher.getResources())
                 ? floatingView.getInitialCornerRadius() : 0;
 
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 25be30fc4b..bdb9fb0377 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1056,7 +1056,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     }
 
     protected abstract HomeAnimationFactory createHomeAnimationFactory(
-            ArrayList<IBinder> launchCookies, long duration);
+            ArrayList<IBinder> launchCookies, long duration, boolean isTargetTranslucent);
 
     private final TaskStackChangeListener mActivityRestartListener = new TaskStackChangeListener() {
         @Override
@@ -1100,7 +1100,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
             final ArrayList<IBinder> cookies = runningTaskTarget != null
                     ? runningTaskTarget.taskInfo.launchCookies
                     : new ArrayList<>();
-            HomeAnimationFactory homeAnimFactory = createHomeAnimationFactory(cookies, duration);
+            boolean isTranslucent = runningTaskTarget != null && runningTaskTarget.isTranslucent;
+            HomeAnimationFactory homeAnimFactory =
+                    createHomeAnimationFactory(cookies, duration, isTranslucent);
             mIsSwipingPipToHome = homeAnimFactory.supportSwipePipToHome()
                     && runningTaskTarget != null
                     && runningTaskTarget.taskInfo.pictureInPictureParams != null
diff --git a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
index 9846ee78e3..2d81429a94 100644
--- a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
+++ b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
@@ -129,7 +129,7 @@ public class FallbackSwipeHandler extends
 
     @Override
     protected HomeAnimationFactory createHomeAnimationFactory(ArrayList<IBinder> launchCookies,
-            long duration) {
+            long duration, boolean isTargetTranslucent) {
         mActiveAnimationFactory = new FallbackHomeAnimationFactory(duration);
         ActivityOptions options = ActivityOptions.makeCustomAnimation(mContext, 0, 0);
         Intent intent = new Intent(mGestureState.getHomeIntent());
diff --git a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
index 46cd8a2cf9..267227dce5 100644
--- a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
+++ b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
@@ -80,7 +80,7 @@ public class LauncherSwipeHandlerV2 extends
 
     @Override
     protected HomeAnimationFactory createHomeAnimationFactory(ArrayList<IBinder> launchCookies,
-            long duration) {
+            long duration, boolean isTargetTranslucent) {
         if (mActivity == null) {
             mStateCallback.addChangeListener(STATE_LAUNCHER_PRESENT | STATE_HANDLER_INVALIDATED,
                     isPresent -> mRecentsView.startHome());
@@ -103,7 +103,8 @@ public class LauncherSwipeHandlerV2 extends
             return new LauncherHomeAnimationFactory();
         }
         if (workspaceView instanceof LauncherAppWidgetHostView) {
-            return createWidgetHomeAnimationFactory((LauncherAppWidgetHostView) workspaceView);
+            return createWidgetHomeAnimationFactory((LauncherAppWidgetHostView) workspaceView,
+                    isTargetTranslucent);
         }
         return createIconHomeAnimationFactory(workspaceView);
     }
@@ -235,7 +236,7 @@ public class LauncherSwipeHandlerV2 extends
     }
 
     private HomeAnimationFactory createWidgetHomeAnimationFactory(
-            LauncherAppWidgetHostView hostView) {
+            LauncherAppWidgetHostView hostView, boolean isTargetTranslucent) {
 
         RectF backgroundLocation = new RectF();
         Rect crop = new Rect();
@@ -243,7 +244,7 @@ public class LauncherSwipeHandlerV2 extends
         Size windowSize = new Size(crop.width(), crop.height());
         FloatingWidgetView floatingWidgetView = FloatingWidgetView.getFloatingWidgetView(mActivity,
                 hostView, backgroundLocation, windowSize,
-                mTaskViewSimulator.getCurrentCornerRadius());
+                mTaskViewSimulator.getCurrentCornerRadius(), isTargetTranslucent);
 
         return new LauncherHomeAnimationFactory() {
 
diff --git a/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java b/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java
index ed54f1007e..121e09400f 100644
--- a/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java
+++ b/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java
@@ -57,6 +57,7 @@ public class FloatingWidgetView extends FrameLayout implements AnimatorListener,
     private Runnable mEndRunnable;
     private Runnable mFastFinishRunnable;
     private Runnable mOnTargetChangeRunnable;
+    private boolean mAppTargetIsTranslucent;
 
     public FloatingWidgetView(Context context) {
         this(context, null);
@@ -142,10 +143,12 @@ public class FloatingWidgetView extends FrameLayout implements AnimatorListener,
     }
 
     private void init(DragLayer dragLayer, LauncherAppWidgetHostView originalView,
-            RectF widgetBackgroundPosition, Size windowSize, float windowCornerRadius) {
+            RectF widgetBackgroundPosition, Size windowSize, float windowCornerRadius,
+            boolean appTargetIsTranslucent) {
         mAppWidgetView = originalView;
         mAppWidgetView.beginDeferringUpdates();
         mBackgroundPosition = widgetBackgroundPosition;
+        mAppTargetIsTranslucent = appTargetIsTranslucent;
         mEndRunnable = () -> finish(dragLayer);
 
         mAppWidgetBackgroundView = RoundedCornerEnforcement.findBackground(mAppWidgetView);
@@ -155,11 +158,13 @@ public class FloatingWidgetView extends FrameLayout implements AnimatorListener,
 
         getRelativePosition(mAppWidgetBackgroundView, dragLayer, mBackgroundPosition);
         getRelativePosition(mAppWidgetBackgroundView, mAppWidgetView, mBackgroundOffset);
-        mBackgroundView.init(mAppWidgetView, mAppWidgetBackgroundView, windowCornerRadius);
-        // Layout call before GhostView creation so that the overlaid view isn't clipped
-        layout(0, 0, windowSize.getWidth(), windowSize.getHeight());
-        mForegroundOverlayView = GhostView.addGhost(mAppWidgetView, this);
-        positionViews();
+        if (!mAppTargetIsTranslucent) {
+            mBackgroundView.init(mAppWidgetView, mAppWidgetBackgroundView, windowCornerRadius);
+            // Layout call before GhostView creation so that the overlaid view isn't clipped
+            layout(0, 0, windowSize.getWidth(), windowSize.getHeight());
+            mForegroundOverlayView = GhostView.addGhost(mAppWidgetView, this);
+            positionViews();
+        }
 
         mListenerView.setListener(this::fastFinish);
         dragLayer.addView(mListenerView);
@@ -179,7 +184,7 @@ public class FloatingWidgetView extends FrameLayout implements AnimatorListener,
      */
     public void update(RectF backgroundPosition, float floatingWidgetAlpha, float foregroundAlpha,
             float fallbackBackgroundAlpha, float cornerRadiusProgress) {
-        if (isUninitialized()) return;
+        if (isUninitialized() || mAppTargetIsTranslucent) return;
         setAlpha(floatingWidgetAlpha);
         mBackgroundView.update(cornerRadiusProgress, fallbackBackgroundAlpha);
         mAppWidgetView.setAlpha(foregroundAlpha);
@@ -203,13 +208,16 @@ public class FloatingWidgetView extends FrameLayout implements AnimatorListener,
         backgroundParams.height = (int) mBackgroundPosition.height();
         mBackgroundView.setLayoutParams(backgroundParams);
 
-        sTmpMatrix.reset();
-        float foregroundScale = mBackgroundPosition.width() / mAppWidgetBackgroundView.getWidth();
-        sTmpMatrix.setTranslate(-mBackgroundOffset.left - mAppWidgetView.getLeft(),
-                -mBackgroundOffset.top - mAppWidgetView.getTop());
-        sTmpMatrix.postScale(foregroundScale, foregroundScale);
-        sTmpMatrix.postTranslate(mBackgroundPosition.left, mBackgroundPosition.top);
-        mForegroundOverlayView.setMatrix(sTmpMatrix);
+        if (mForegroundOverlayView != null) {
+            sTmpMatrix.reset();
+            float foregroundScale =
+                    mBackgroundPosition.width() / mAppWidgetBackgroundView.getWidth();
+            sTmpMatrix.setTranslate(-mBackgroundOffset.left - mAppWidgetView.getLeft(),
+                    -mBackgroundOffset.top - mAppWidgetView.getTop());
+            sTmpMatrix.postScale(foregroundScale, foregroundScale);
+            sTmpMatrix.postTranslate(mBackgroundPosition.left, mBackgroundPosition.top);
+            mForegroundOverlayView.setMatrix(sTmpMatrix);
+        }
     }
 
     private void finish(DragLayer dragLayer) {
@@ -254,7 +262,7 @@ public class FloatingWidgetView extends FrameLayout implements AnimatorListener,
      */
     public static FloatingWidgetView getFloatingWidgetView(Launcher launcher,
             LauncherAppWidgetHostView originalView, RectF widgetBackgroundPosition,
-            Size windowSize, float windowCornerRadius) {
+            Size windowSize, float windowCornerRadius, boolean appTargetsAreTranslucent) {
         final DragLayer dragLayer = launcher.getDragLayer();
         ViewGroup parent = (ViewGroup) dragLayer.getParent();
         FloatingWidgetView floatingView =
@@ -262,7 +270,7 @@ public class FloatingWidgetView extends FrameLayout implements AnimatorListener,
         floatingView.recycle();
 
         floatingView.init(dragLayer, originalView, widgetBackgroundPosition, windowSize,
-                windowCornerRadius);
+                windowCornerRadius, appTargetsAreTranslucent);
         parent.addView(floatingView);
         return floatingView;
     }
-- 
GitLab


From 071665c89b680ba582d78b9781ab3aa68a16ec45 Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Wed, 12 May 2021 14:57:42 +0100
Subject: [PATCH 1151/1664] Prevent cropping of personal/work tabs in full
 screen widget picker.

Bug: 187632869
Test: Tested manually
Change-Id: I39a43ed1efae5802ffdd5d79ad3cb1a50af38d62
---
 res/layout/widgets_full_sheet_paged_view.xml | 5 +----
 res/layout/widgets_personal_work_tabs.xml    | 3 +--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/res/layout/widgets_full_sheet_paged_view.xml b/res/layout/widgets_full_sheet_paged_view.xml
index e3d34f6978..580ca496a3 100644
--- a/res/layout/widgets_full_sheet_paged_view.xml
+++ b/res/layout/widgets_full_sheet_paged_view.xml
@@ -38,8 +38,5 @@
 
     </com.android.launcher3.workprofile.PersonalWorkPagedView>
 
-    <include layout="@layout/widgets_personal_work_tabs"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="16dp" />
+    <include layout="@layout/widgets_personal_work_tabs"/>
 </merge>
\ No newline at end of file
diff --git a/res/layout/widgets_personal_work_tabs.xml b/res/layout/widgets_personal_work_tabs.xml
index 3402415e84..f835b52e9a 100644
--- a/res/layout/widgets_personal_work_tabs.xml
+++ b/res/layout/widgets_personal_work_tabs.xml
@@ -20,8 +20,7 @@
     android:id="@+id/tabs"
     android:layout_width="match_parent"
     android:layout_height="@dimen/all_apps_header_pill_height"
-    android:layout_marginLeft="@dimen/all_apps_tabs_side_padding"
-    android:layout_marginRight="@dimen/all_apps_tabs_side_padding"
+    android:layout_marginHorizontal="16dp"
     android:orientation="horizontal"
     android:elevation="2dp"
     style="@style/TextHeadline">
-- 
GitLab


From 80b25cfd5d8b7292cf15f260812981eff3fa8aea Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 11 May 2021 11:55:20 -0700
Subject: [PATCH 1152/1664] Fix widget drop animation

When removing content from the dragView, replace it with a snapshot
so that the preview remains the same

Test: Drag a widget and observe the drop animation is shown.
Bug: 187423667
Change-Id: I1e726f50a2b3d0a5f1562297cccf47a435affd02
---
 .../android/launcher3/dragndrop/DragView.java  | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/dragndrop/DragView.java b/src/com/android/launcher3/dragndrop/DragView.java
index 30ee9ecddd..1664980c35 100644
--- a/src/com/android/launcher3/dragndrop/DragView.java
+++ b/src/com/android/launcher3/dragndrop/DragView.java
@@ -33,11 +33,13 @@ import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Path;
+import android.graphics.Picture;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.drawable.AdaptiveIconDrawable;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
+import android.graphics.drawable.PictureDrawable;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
@@ -457,7 +459,6 @@ public class DragView extends FrameLayout implements StateListener<LauncherState
         setTranslationY(mLastTouchY - mRegistrationY + mAnimatedShiftY);
     }
 
-
     /**
      * Detaches {@link #mContent}, if previously attached, from this view.
      *
@@ -466,7 +467,20 @@ public class DragView extends FrameLayout implements StateListener<LauncherState
      */
     public void detachContentView(boolean reattachToPreviousParent) {
         if (mContent != null && mContentViewParent != null && mContentViewInParentViewIndex >= 0) {
-            removeView(mContent);
+            Picture picture = new Picture();
+            mContent.draw(picture.beginRecording(mWidth, mHeight));
+            picture.endRecording();
+            View view = new View(mLauncher);
+            view.setClipToOutline(mContent.getClipToOutline());
+            view.setOutlineProvider(mContent.getOutlineProvider());
+            view.setBackground(new PictureDrawable(picture));
+            view.measure(makeMeasureSpec(mWidth, EXACTLY), makeMeasureSpec(mHeight, EXACTLY));
+            view.layout(mContent.getLeft(), mContent.getTop(),
+                    mContent.getRight(), mContent.getBottom());
+            addViewInLayout(view, indexOfChild(mContent), mContent.getLayoutParams(), true);
+
+            removeViewInLayout(mContent);
+            mContent.setVisibility(INVISIBLE);
             mContent.setLayoutParams(mContentViewLayoutParams);
             if (reattachToPreviousParent) {
                 mContentViewParent.addView(mContent, mContentViewInParentViewIndex);
-- 
GitLab


From ce07a3721aa5461ce246c0a9dd040faab7dda3e7 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 7 May 2021 14:20:38 -0700
Subject: [PATCH 1153/1664] Defer some heavy work from final frame of app ->
 home transition

- Call reapplyState() on the next frame after settling on home.
- Post some calls from RecentsView#reset() to the next frame.
- Remove onSwipeUpToRecentsComplete() which only called reapplyState()
  uncessarily.
- Also animate TASK_SECONDARY_TRANSLATION back to 0 to ensure state
  machine is in sync with long swipe resistance properties.

Test: profile swipe to home, significantly reduced last frame time.
Bug: 183139317
Change-Id: I37b1829f6f1d5a718e99c131935b87b5200d567f
---
 .../BaseRecentsViewStateController.java          |  2 ++
 .../com/android/quickstep/AbsSwipeUpHandler.java |  1 -
 .../android/quickstep/BaseActivityInterface.java | 12 ++----------
 .../quickstep/FallbackActivityInterface.java     |  6 ------
 .../quickstep/LauncherActivityInterface.java     | 11 ++++++++---
 .../com/android/quickstep/views/RecentsView.java | 16 ++++++++++------
 6 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
index e508690113..192a29bbe0 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
@@ -99,6 +99,8 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView>
                 config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_X, LINEAR));
         setter.setFloat(mRecentsView, ADJACENT_PAGE_VERTICAL_OFFSET, scaleAndOffset[2],
                 config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, LINEAR));
+        setter.setFloat(mRecentsView, TASK_SECONDARY_TRANSLATION, 0f,
+                config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, LINEAR));
         PagedOrientationHandler orientationHandler =
                 ((RecentsView) mLauncher.getOverviewPanel()).getPagedOrientationHandler();
         FloatProperty taskViewsFloat = orientationHandler.getSplitSelectTaskOffset(
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index d04bfe95e2..ac7356fdd3 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1519,7 +1519,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
 
     private void setupLauncherUiAfterSwipeUpToRecentsAnimation() {
         endLauncherTransitionController();
-        mActivityInterface.onSwipeUpToRecentsComplete();
         mRecentsView.onSwipeUpAnimationSuccess();
         if (LIVE_TILE.get()) {
             mTaskAnimationManager.setLiveTileCleanUpHandler(mInputConsumerProxy::destroy);
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index b60b1be24b..c8865c4b3b 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -99,16 +99,8 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
             DeviceProfile dp, Context context, Rect outRect,
             PagedOrientationHandler orientationHandler);
 
-    public void onSwipeUpToRecentsComplete() {
-        // Re apply state in case we did something funky during the transition.
-        ACTIVITY_TYPE activity = getCreatedActivity();
-        if (activity == null) {
-            return;
-        }
-        activity.getStateManager().reapplyState();
-    }
-
-    public abstract void onSwipeUpToHomeComplete(RecentsAnimationDeviceState deviceState);
+    /** Called when the animation to home has fully settled. */
+    public void onSwipeUpToHomeComplete(RecentsAnimationDeviceState deviceState) {}
 
     public abstract void onAssistantVisibilityChanged(float visibility);
 
diff --git a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
index 3c81d1bb8a..4ee4398d81 100644
--- a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
@@ -65,12 +65,6 @@ public final class FallbackActivityInterface extends
         }
     }
 
-    /** 4 */
-    @Override
-    public void onSwipeUpToHomeComplete(RecentsAnimationDeviceState deviceState) {
-        onSwipeUpToRecentsComplete();
-    }
-
     /** 5 */
     @Override
     public void onAssistantVisibilityChanged(float visibility) {
diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
index c43d3c9653..5217c3b169 100644
--- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
@@ -21,6 +21,7 @@ import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.QUICK_SWITCH;
 import static com.android.launcher3.anim.AnimatorListeners.forEndCallback;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING;
 
 import android.animation.Animator;
@@ -84,9 +85,13 @@ public final class LauncherActivityInterface extends
         if (launcher == null) {
             return;
         }
-        // Ensure recents is at the correct position for NORMAL state. For example, when we detach
-        // recents, we assume the first task is invisible, making translation off by one task.
-        launcher.getStateManager().reapplyState();
+        // When going to home, the state animator we use has SKIP_OVERVIEW because we assume that
+        // setRecentsAttachedToAppWindow() will handle animating Overview instead. Thus, at the end
+        // of the animation, we should ensure recents is at the correct position for NORMAL state.
+        // For example, when doing a long swipe to home, RecentsView may be scaled down. This is
+        // relatively expensive, so do it on the next frame instead of critical path.
+        MAIN_EXECUTOR.getHandler().post(launcher.getStateManager()::reapplyState);
+
         launcher.getRootView().setForceHideBackArrow(false);
         notifyRecentsOfOrientation(deviceState.getRotationTouchHelper());
     }
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index dfe0c4347a..b1ce236bdb 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1584,12 +1584,16 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         mLiveTileParams.setTargetSet(null);
         mLiveTileTaskViewSimulator.setDrawsBelowRecents(true);
 
-        unloadVisibleTaskData(TaskView.FLAG_UPDATE_ALL);
-        setCurrentPage(0);
-        LayoutUtils.setViewEnabled(mActionsView, true);
-        if (mOrientationState.setGestureActive(false)) {
-            updateOrientationHandler();
-        }
+        // These are relatively expensive and don't need to be done this frame (RecentsView isn't
+        // visible anyway), so defer by a frame to get off the critical path, e.g. app to home.
+        post(() -> {
+            unloadVisibleTaskData(TaskView.FLAG_UPDATE_ALL);
+            setCurrentPage(0);
+            LayoutUtils.setViewEnabled(mActionsView, true);
+            if (mOrientationState.setGestureActive(false)) {
+                updateOrientationHandler();
+            }
+        });
     }
 
     public int getRunningTaskId() {
-- 
GitLab


From 395c58d303c6354d52694a45eebb4abb00d45c12 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Wed, 12 May 2021 11:09:31 -0700
Subject: [PATCH 1154/1664] Temporarily demoting failing tests from presubmits

Bug: 187899876
Test: local build
Change-Id: I7b66dbfacc27c10cdafae27ab11afc29d965e4b3
---
 .../src/com/android/quickstep/TaplTestsQuickstep.java      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
index a5038a1fb0..cabbe93eaf 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
@@ -17,13 +17,14 @@
 package com.android.quickstep;
 
 import static com.android.launcher3.ui.TaplTestsLauncher3.getAppPackageName;
+import static com.android.launcher3.util.rule.TestStabilityRule.LOCAL;
+import static com.android.launcher3.util.rule.TestStabilityRule.UNBUNDLED_POSTSUBMIT;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import android.content.Intent;
-import android.util.Log;
 
 import androidx.test.filters.LargeTest;
 import androidx.test.runner.AndroidJUnit4;
@@ -37,8 +38,8 @@ import com.android.launcher3.tapl.LauncherInstrumentation.NavigationModel;
 import com.android.launcher3.tapl.Overview;
 import com.android.launcher3.tapl.OverviewActions;
 import com.android.launcher3.tapl.OverviewTask;
-import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.ui.TaplTestsLauncher3;
+import com.android.launcher3.util.rule.TestStabilityRule.Stability;
 import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch;
 import com.android.quickstep.views.RecentsView;
 
@@ -94,6 +95,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
 
     @Test
     @PortraitLandscape
+    @Stability(flavors = LOCAL | UNBUNDLED_POSTSUBMIT) // b/187899876
     public void testOverview() throws Exception {
         startTestAppsWithCheck();
         // mLauncher.pressHome() also tests an important case of pressing home while in background.
@@ -163,6 +165,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
     @Test
     @NavigationModeSwitch
     @PortraitLandscape
+    @Stability(flavors = LOCAL | UNBUNDLED_POSTSUBMIT) // b/187899876
     public void testOverviewActions() throws Exception {
         // Experimenting for b/165029151:
         final Overview overview = mLauncher.pressHome().switchToOverview();
-- 
GitLab


From 9e4a9bc777d5db3ecdf038c75d53396b17f1f218 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Wed, 12 May 2021 14:43:46 -0500
Subject: [PATCH 1155/1664] [WorkProfile] Fix Work profile switch
 synchronization

Bug: 185566696
Bug: 185557440
Test: Manual
Change-Id: Ie9c94c6daee233d299aa63dc5bcb258a37c321e4
---
 src/com/android/launcher3/allapps/AllAppsContainerView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index b11b63ed69..63aac53a51 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -439,7 +439,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
                     R.layout.work_mode_switch, this, false);
             this.addView(mWorkModeSwitch);
             mWorkModeSwitch.setInsets(mInsets);
-            mWorkModeSwitch.post(() -> mAH[AdapterHolder.WORK].applyPadding());
+            mWorkModeSwitch.post(this::resetWorkProfile);
         }
     }
 
-- 
GitLab


From d7f11d5fb96caa358085418564c3836190505696 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 12 May 2021 21:22:20 +0000
Subject: [PATCH 1156/1664] Revert "Exposing AnimatorListeners in StateManager
 to receive both success and failure callback"

This reverts commit a75f5768901647e0dc1d78a2a95dca88c54601c6.

Reason for revert: b/187887269
Bug: 187887269

Change-Id: I8a56ff7054e71cf30b113fdaa213397dae0c53cb
---
 .../HotseatPredictionController.java          |  9 +-
 .../RecentsViewStateController.java           |  4 +-
 .../NavBarToHomeTouchController.java          |  7 +-
 ...ButtonNavbarToOverviewTouchController.java |  5 +-
 .../NoButtonQuickSwitchTouchController.java   |  3 +-
 .../quickstep/LauncherActivityInterface.java  |  4 +-
 .../SwipeUpGestureTutorialController.java     | 10 +-
 .../interaction/TutorialController.java       |  8 +-
 .../android/quickstep/views/RecentsView.java  |  4 +-
 src/com/android/launcher3/Workspace.java      |  5 +-
 .../LauncherAccessibilityDelegate.java        | 43 ++++----
 .../ShortcutMenuAccessibilityDelegate.java    | 22 +++--
 .../allapps/AllAppsTransitionController.java  |  8 +-
 .../anim/AnimationSuccessListener.java        | 20 ++++
 .../launcher3/anim/AnimatorListeners.java     | 98 -------------------
 .../launcher3/anim/PendingAnimation.java      | 30 +++++-
 .../launcher3/statemanager/StateManager.java  | 39 ++++----
 17 files changed, 135 insertions(+), 184 deletions(-)
 delete mode 100644 src/com/android/launcher3/anim/AnimatorListeners.java

diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
index 5dcf84c249..67ed5fb5e5 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
@@ -17,7 +17,6 @@ package com.android.launcher3.hybridhotseat;
 
 import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
 import static com.android.launcher3.LauncherState.NORMAL;
-import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback;
 import static com.android.launcher3.hybridhotseat.HotseatEduController.getSettingsIntent;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOTSEAT_PREDICTION_PINNED;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOTSEAT_RANKED;
@@ -151,7 +150,7 @@ public class HotseatPredictionController implements DragController.DragListener,
      * Shows appropriate hotseat education based on prediction enabled and migration states.
      */
     public void showEdu() {
-        mLauncher.getStateManager().goToState(NORMAL, true, forSuccessCallback(() -> {
+        mLauncher.getStateManager().goToState(NORMAL, true, () -> {
             if (mPredictedItems.isEmpty()) {
                 // launcher has empty predictions set
                 Snackbar.show(mLauncher, R.string.hotsaet_tip_prediction_disabled,
@@ -166,7 +165,7 @@ public class HotseatPredictionController implements DragController.DragListener,
                         .collect(Collectors.toList()));
                 eduController.showEdu();
             }
-        }));
+        });
     }
 
     /**
@@ -256,8 +255,8 @@ public class HotseatPredictionController implements DragController.DragListener,
             }
         }
         if (animate) {
-            animationSet.addListener(
-                    forSuccessCallback(this::removeOutlineDrawings));
+            animationSet.addListener(AnimationSuccessListener
+                    .forRunnable(this::removeOutlineDrawings));
             animationSet.start();
         } else {
             removeOutlineDrawings();
diff --git a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
index 996d36aadc..0652d48c11 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
@@ -35,7 +35,7 @@ import androidx.annotation.NonNull;
 
 import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.LauncherState;
-import com.android.launcher3.anim.AnimatorListeners;
+import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.anim.PropertySetter;
 import com.android.launcher3.states.StateAnimationConfig;
@@ -78,7 +78,7 @@ public final class RecentsViewStateController extends
             mRecentsView.updateEmptyMessage();
         } else {
             builder.addListener(
-                    AnimatorListeners.forSuccessCallback(mRecentsView::resetTaskVisuals));
+                    AnimationSuccessListener.forRunnable(mRecentsView::resetTaskVisuals));
         }
 
         // Create or dismiss split screen select animations
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
index 19d1b32a1b..b8caf81f14 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
@@ -22,7 +22,6 @@ import static com.android.launcher3.LauncherAnimUtils.newCancelListener;
 import static com.android.launcher3.LauncherState.ALL_APPS;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS;
-import static com.android.launcher3.anim.AnimatorListeners.forEndCallback;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_ALL_APPS_EDU;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE;
@@ -39,7 +38,7 @@ import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.allapps.AllAppsTransitionController;
-import com.android.launcher3.anim.AnimatorListeners;
+import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.anim.PendingAnimation;
@@ -200,7 +199,7 @@ public class NavBarToHomeTouchController implements TouchController,
                         .animateWithVelocity(velocity);
             } else {
                 mLauncher.getStateManager().goToState(mEndState, true,
-                        forEndCallback(() -> onSwipeInteractionCompleted(mEndState)));
+                        () -> onSwipeInteractionCompleted(mEndState));
             }
             if (mStartState != mEndState) {
                 logHomeGesture();
@@ -215,7 +214,7 @@ public class NavBarToHomeTouchController implements TouchController,
             // Quickly return to the state we came from (we didn't move far).
             ValueAnimator anim = mCurrentAnimation.getAnimationPlayer();
             anim.setFloatValues(progress, 0);
-            anim.addListener(AnimatorListeners.forSuccessCallback(
+            anim.addListener(AnimationSuccessListener.forRunnable(
                     () -> onSwipeInteractionCompleted(mStartState)));
             anim.setDuration(80).start();
         }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
index eb62110065..729e2cb5c6 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -22,7 +22,6 @@ import static com.android.launcher3.LauncherState.HINT_STATE;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.Utilities.EDGE_NAV_BAR;
-import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback;
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
@@ -173,13 +172,13 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
         }
         mNormalToHintOverviewScrimAnimator = null;
         mCurrentAnimation.getTarget().addListener(newCancelListener(() ->
-                mLauncher.getStateManager().goToState(OVERVIEW, true, forSuccessCallback(() -> {
+                mLauncher.getStateManager().goToState(OVERVIEW, true, () -> {
                     mOverviewResistYAnim = AnimatorControllerWithResistance
                             .createRecentsResistanceFromOverviewAnim(mLauncher, null)
                             .createPlaybackController();
                     mReachedOverview = true;
                     maybeSwipeInteractionToOverviewComplete();
-                }))));
+                })));
 
         mCurrentAnimation.getTarget().removeListener(mClearStateOnCancelListener);
         mCurrentAnimation.dispatchOnCancel();
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
index 62687c5f35..0f64abca61 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
@@ -21,7 +21,6 @@ import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.OVERVIEW_ACTIONS;
 import static com.android.launcher3.LauncherState.QUICK_SWITCH;
 import static com.android.launcher3.anim.AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD;
-import static com.android.launcher3.anim.AnimatorListeners.forEndCallback;
 import static com.android.launcher3.anim.Interpolators.ACCEL_0_75;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
@@ -419,7 +418,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
                         targetState.ordinal > mStartState.ordinal
                                 ? LAUNCHER_UNKNOWN_SWIPEUP
                                 : LAUNCHER_UNKNOWN_SWIPEDOWN));
-        mLauncher.getStateManager().goToState(targetState, false, forEndCallback(this::clearState));
+        mLauncher.getStateManager().goToState(targetState, false, this::clearState);
     }
 
     private void cancelAnimations() {
diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
index c43d3c9653..dffee7fda8 100644
--- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
@@ -19,7 +19,6 @@ import static com.android.launcher3.LauncherState.BACKGROUND_APP;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.QUICK_SWITCH;
-import static com.android.launcher3.anim.AnimatorListeners.forEndCallback;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING;
 
@@ -193,8 +192,7 @@ public final class LauncherActivityInterface extends
 
         closeOverlay();
         launcher.getStateManager().goToState(OVERVIEW,
-                launcher.getStateManager().shouldAnimateStateChange(),
-                onCompleteCallback == null ? null : forEndCallback(onCompleteCallback));
+                launcher.getStateManager().shouldAnimateStateChange(), onCompleteCallback);
         return true;
     }
 
diff --git a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
index 66e04008f6..1aa64fae1c 100644
--- a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
@@ -43,7 +43,7 @@ import androidx.annotation.Nullable;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.anim.AnimatorListeners;
+import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.quickstep.AnimatedFloat;
@@ -156,7 +156,7 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
                         fadeAnim.setViewAlpha(mFakePreviousTaskView, 0, ACCEL);
                     }
                     if (onEndRunnable != null) {
-                        fadeAnim.addListener(AnimatorListeners.forSuccessCallback(onEndRunnable));
+                        fadeAnim.addListener(AnimationSuccessListener.forRunnable(onEndRunnable));
                     }
                     AnimatorSet animset = fadeAnim.buildAnim();
                     animset.setStartDelay(100);
@@ -174,7 +174,7 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
                 anim.setViewAlpha(mFakePreviousTaskView, 0, ACCEL);
             }
             if (onEndRunnable != null) {
-                anim.addListener(AnimatorListeners.forSuccessCallback(onEndRunnable));
+                anim.addListener(AnimationSuccessListener.forRunnable(onEndRunnable));
             }
         }
         AnimatorSet animset = anim.buildAnim();
@@ -205,10 +205,10 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
         PendingAnimation fadeAnim = new PendingAnimation(300);
         fadeAnim.setViewAlpha(mFakeIconView, 0, ACCEL);
         if (onEndRunnable != null) {
-            fadeAnim.addListener(AnimatorListeners.forSuccessCallback(onEndRunnable));
+            fadeAnim.addListener(AnimationSuccessListener.forRunnable(onEndRunnable));
         }
         AnimatorSet animset = fadeAnim.buildAnim();
-        rectAnim.addAnimatorListener(AnimatorListeners.forSuccessCallback(animset::start));
+        rectAnim.addAnimatorListener(AnimationSuccessListener.forRunnable(animset::start));
         mRunningWindowAnim = RunningWindowAnim.wrap(rectAnim);
     }
 
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
index 1128a7ca24..55972adcbe 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
@@ -38,7 +38,7 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.content.res.AppCompatResources;
 
 import com.android.launcher3.R;
-import com.android.launcher3.anim.AnimatorListeners;
+import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.views.ClipIconView;
 import com.android.quickstep.interaction.EdgeBackGestureHandler.BackGestureAttemptCallback;
 import com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureAttemptCallback;
@@ -139,7 +139,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
     }
 
     void fadeTaskViewAndRun(Runnable r) {
-        mFakeTaskView.animate().alpha(0).setListener(AnimatorListeners.forSuccessCallback(r));
+        mFakeTaskView.animate().alpha(0).setListener(AnimationSuccessListener.forRunnable(r));
     }
 
     @StringRes
@@ -348,8 +348,8 @@ abstract class TutorialController implements BackGestureAttemptCallback,
                     mContext, getMockLauncherResId()));
             mFakeTaskView.setBackground(AppCompatResources.getDrawable(
                     mContext, getMockAppTaskThumbnailResId()));
-            mFakeTaskView.animate().alpha(1).setListener(
-                    AnimatorListeners.forSuccessCallback(() -> mFakeTaskView.animate().cancel()));
+            mFakeTaskView.animate().alpha(1).setListener(AnimationSuccessListener.forRunnable(
+                    () -> mFakeTaskView.animate().cancel()));
             mFakePreviousTaskView.setBackground(AppCompatResources.getDrawable(
                     mContext, getMockPreviousAppTaskThumbnailResId()));
             mFakeIconView.setBackground(AppCompatResources.getDrawable(
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 49fc2dd1ae..5a58a827b5 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -111,7 +111,6 @@ import com.android.launcher3.PagedView;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimationSuccessListener;
-import com.android.launcher3.anim.AnimatorListeners;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.anim.SpringProperty;
@@ -121,6 +120,7 @@ import com.android.launcher3.icons.cache.HandlerRunnable;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.BaseState;
 import com.android.launcher3.statemanager.StatefulActivity;
+import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.OverScroll;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.util.DynamicResource;
@@ -1672,7 +1672,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             return;
         }
         AnimatorSet pa = setRecentsChangedOrientation(true);
-        pa.addListener(AnimatorListeners.forSuccessCallback(() -> {
+        pa.addListener(AnimationSuccessListener.forRunnable(() -> {
             setLayoutRotation(newRotation, mOrientationState.getDisplayRotation());
             mActivity.getDragLayer().recreateControllers();
             updateChildTaskOrientations();
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 81d4fcfd5d..f846d14ff9 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -25,7 +25,6 @@ import static com.android.launcher3.LauncherState.FLAG_WORKSPACE_INACCESSIBLE;
 import static com.android.launcher3.LauncherState.HINT_STATE;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.SPRING_LOADED;
-import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback;
 import static com.android.launcher3.config.FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM;
 import static com.android.launcher3.dragndrop.DragLayer.ALPHA_INDEX_OVERLAY;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
@@ -1951,8 +1950,8 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
             }
             parent.onDropChild(cell);
 
-            mLauncher.getStateManager().goToState(NORMAL, SPRING_LOADED_EXIT_DELAY,
-                    onCompleteRunnable == null ? null : forSuccessCallback(onCompleteRunnable));
+            mLauncher.getStateManager().goToState(
+                    NORMAL, SPRING_LOADED_EXIT_DELAY, onCompleteRunnable);
             mStatsLogManager.logger().withItemInfo(d.dragInfo).withInstanceId(d.logInstanceId)
                     .log(LauncherEvent.LAUNCHER_ITEM_DROP_COMPLETED);
         }
diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
index 2b36f19226..c580d47994 100644
--- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
+++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
@@ -3,7 +3,6 @@ package com.android.launcher3.accessibility;
 import static android.view.accessibility.AccessibilityNodeInfo.ACTION_LONG_CLICK;
 
 import static com.android.launcher3.LauncherState.NORMAL;
-import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.IGNORE;
 
 import android.appwidget.AppWidgetProviderInfo;
@@ -221,26 +220,30 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
         } else if (action == ADD_TO_WORKSPACE) {
             final int[] coordinates = new int[2];
             final int screenId = findSpaceOnWorkspace(item, coordinates);
-            mLauncher.getStateManager().goToState(NORMAL, true, forSuccessCallback(() -> {
-                if (item instanceof AppInfo) {
-                    WorkspaceItemInfo info = ((AppInfo) item).makeWorkspaceItem();
-                    mLauncher.getModelWriter().addItemToDatabase(info,
-                            Favorites.CONTAINER_DESKTOP,
-                            screenId, coordinates[0], coordinates[1]);
-
-                    mLauncher.bindItems(
-                            Collections.singletonList(info),
-                            /* forceAnimateIcons= */ true,
-                            /* focusFirstItemForAccessibility= */ true);
-                    announceConfirmation(R.string.item_added_to_workspace);
-                } else if (item instanceof PendingAddItemInfo) {
-                    PendingAddItemInfo info = (PendingAddItemInfo) item;
-                    Workspace workspace = mLauncher.getWorkspace();
-                    workspace.snapToPage(workspace.getPageIndexForScreenId(screenId));
-                    mLauncher.addPendingItem(info, Favorites.CONTAINER_DESKTOP,
-                            screenId, coordinates, info.spanX, info.spanY);
+            mLauncher.getStateManager().goToState(NORMAL, true, new Runnable() {
+
+                @Override
+                public void run() {
+                    if (item instanceof AppInfo) {
+                        WorkspaceItemInfo info = ((AppInfo) item).makeWorkspaceItem();
+                        mLauncher.getModelWriter().addItemToDatabase(info,
+                                Favorites.CONTAINER_DESKTOP,
+                                screenId, coordinates[0], coordinates[1]);
+
+                        mLauncher.bindItems(
+                                Collections.singletonList(info),
+                                /* forceAnimateIcons= */ true,
+                                /* focusFirstItemForAccessibility= */ true);
+                        announceConfirmation(R.string.item_added_to_workspace);
+                    } else if (item instanceof PendingAddItemInfo) {
+                        PendingAddItemInfo info = (PendingAddItemInfo) item;
+                        Workspace workspace = mLauncher.getWorkspace();
+                        workspace.snapToPage(workspace.getPageIndexForScreenId(screenId));
+                        mLauncher.addPendingItem(info, Favorites.CONTAINER_DESKTOP,
+                                screenId, coordinates, info.spanX, info.spanY);
+                    }
                 }
-            }));
+            });
             return true;
         } else if (action == MOVE_TO_WORKSPACE) {
             Folder folder = Folder.getOpen(mLauncher);
diff --git a/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java
index f96afa856b..1733e5dd41 100644
--- a/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java
+++ b/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java
@@ -17,7 +17,6 @@
 package com.android.launcher3.accessibility;
 
 import static com.android.launcher3.LauncherState.NORMAL;
-import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback;
 
 import android.view.KeyEvent;
 import android.view.View;
@@ -68,14 +67,19 @@ public class ShortcutMenuAccessibilityDelegate extends LauncherAccessibilityDele
             final WorkspaceItemInfo info = ((DeepShortcutView) host.getParent()).getFinalInfo();
             final int[] coordinates = new int[2];
             final int screenId = findSpaceOnWorkspace(item, coordinates);
-            mLauncher.getStateManager().goToState(NORMAL, true, forSuccessCallback(() -> {
-                mLauncher.getModelWriter().addItemToDatabase(info,
-                        LauncherSettings.Favorites.CONTAINER_DESKTOP,
-                        screenId, coordinates[0], coordinates[1]);
-                mLauncher.bindItems(Collections.singletonList(info), true);
-                AbstractFloatingView.closeAllOpenViews(mLauncher);
-                announceConfirmation(R.string.item_added_to_workspace);
-            }));
+            Runnable onComplete = new Runnable() {
+                @Override
+                public void run() {
+                    mLauncher.getModelWriter().addItemToDatabase(info,
+                            LauncherSettings.Favorites.CONTAINER_DESKTOP,
+                            screenId, coordinates[0], coordinates[1]);
+                    mLauncher.bindItems(Collections.singletonList(info), true);
+                    AbstractFloatingView.closeAllOpenViews(mLauncher);
+                    announceConfirmation(R.string.item_added_to_workspace);
+                }
+            };
+
+            mLauncher.getStateManager().goToState(NORMAL, true, onComplete);
             return true;
         } else if (action == DISMISS_NOTIFICATION) {
             if (!(host instanceof NotificationMainView)) {
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 2cfbdf9d59..90f2d7cde5 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -28,7 +28,7 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_VERTICAL_PR
 import static com.android.launcher3.util.SystemUiController.UI_STATE_ALLAPPS;
 
 import android.animation.Animator;
-import android.animation.Animator.AnimatorListener;
+import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.util.FloatProperty;
 import android.view.View;
@@ -39,7 +39,7 @@ import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.anim.AnimatorListeners;
+import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.anim.PropertySetter;
 import com.android.launcher3.config.FeatureFlags;
@@ -189,8 +189,8 @@ public class AllAppsTransitionController
         mScrimView.setDrawingController(shouldProtectHeader ? mAppsView : null);
     }
 
-    public AnimatorListener getProgressAnimatorListener() {
-        return AnimatorListeners.forSuccessCallback(this::onProgressAnimationEnd);
+    public AnimatorListenerAdapter getProgressAnimatorListener() {
+        return AnimationSuccessListener.forRunnable(this::onProgressAnimationEnd);
     }
 
     /**
diff --git a/src/com/android/launcher3/anim/AnimationSuccessListener.java b/src/com/android/launcher3/anim/AnimationSuccessListener.java
index a312070e58..9905e81638 100644
--- a/src/com/android/launcher3/anim/AnimationSuccessListener.java
+++ b/src/com/android/launcher3/anim/AnimationSuccessListener.java
@@ -40,4 +40,24 @@ public abstract class AnimationSuccessListener extends AnimatorListenerAdapter {
 
     public abstract void onAnimationSuccess(Animator animator);
 
+    /**
+     * Returns an AnimationSuccessListener which runs the provided action on success
+     */
+    public static AnimationSuccessListener forRunnable(Runnable r) {
+        return new RunnableSuccessListener(r);
+    }
+
+    private static class RunnableSuccessListener extends AnimationSuccessListener {
+
+        private final Runnable mRunnable;
+
+        private RunnableSuccessListener(Runnable r) {
+            mRunnable = r;
+        }
+
+        @Override
+        public void onAnimationSuccess(Animator animator) {
+            mRunnable.run();
+        }
+    }
 }
diff --git a/src/com/android/launcher3/anim/AnimatorListeners.java b/src/com/android/launcher3/anim/AnimatorListeners.java
deleted file mode 100644
index 379970049a..0000000000
--- a/src/com/android/launcher3/anim/AnimatorListeners.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.anim;
-
-import static com.android.launcher3.LauncherAnimUtils.SUCCESS_TRANSITION_PROGRESS;
-
-import android.animation.Animator;
-import android.animation.Animator.AnimatorListener;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.ValueAnimator;
-
-import java.util.function.Consumer;
-
-/**
- * Utility class for creating common {@link AnimatorListener}
- */
-public class AnimatorListeners {
-
-    /**
-     * Returns an AnimatorListener which executes the callback on successful animation completion
-     */
-    public static AnimatorListener forSuccessCallback(Runnable callback) {
-        return new RunnableSuccessListener(callback);
-    }
-
-    /**
-     * Returns an AnimatorListener which executes the callback on animation completion,
-     * with the boolean representing success
-     */
-    public static AnimatorListener forEndCallback(Consumer<Boolean> callback) {
-        return new EndStateCallbackWrapper(callback);
-    }
-
-    /**
-     * Returns an AnimatorListener which executes the callback on animation completion
-     */
-    public static AnimatorListener forEndCallback(Runnable callback) {
-        return new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(Animator animation, boolean isReverse) {
-                callback.run();
-            }
-        };
-    }
-
-    private static class EndStateCallbackWrapper extends AnimatorListenerAdapter {
-
-        private final Consumer<Boolean> mListener;
-        private boolean mListenerCalled = false;
-
-        EndStateCallbackWrapper(Consumer<Boolean> listener) {
-            mListener = listener;
-        }
-
-        @Override
-        public void onAnimationCancel(Animator animation) {
-            if (!mListenerCalled) {
-                mListenerCalled = true;
-                mListener.accept(false);
-            }
-        }
-
-        @Override
-        public void onAnimationEnd(Animator animation) {
-            if (!mListenerCalled) {
-                ValueAnimator anim = (ValueAnimator) animation;
-                mListener.accept(anim.getAnimatedFraction() > SUCCESS_TRANSITION_PROGRESS);
-            }
-        }
-    }
-
-    private static class RunnableSuccessListener extends AnimationSuccessListener {
-
-        private final Runnable mRunnable;
-
-        private RunnableSuccessListener(Runnable r) {
-            mRunnable = r;
-        }
-
-        @Override
-        public void onAnimationSuccess(Animator animator) {
-            mRunnable.run();
-        }
-    }
-}
diff --git a/src/com/android/launcher3/anim/PendingAnimation.java b/src/com/android/launcher3/anim/PendingAnimation.java
index 01f7de66ce..8057475fb4 100644
--- a/src/com/android/launcher3/anim/PendingAnimation.java
+++ b/src/com/android/launcher3/anim/PendingAnimation.java
@@ -15,11 +15,13 @@
  */
 package com.android.launcher3.anim;
 
+import static com.android.launcher3.LauncherAnimUtils.SUCCESS_TRANSITION_PROGRESS;
 import static com.android.launcher3.LauncherAnimUtils.VIEW_BACKGROUND_COLOR;
 import static com.android.launcher3.anim.AnimatorPlaybackController.addAnimationHoldersRecur;
 
 import android.animation.Animator;
 import android.animation.Animator.AnimatorListener;
+import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.TimeInterpolator;
@@ -180,6 +182,32 @@ public class PendingAnimation implements PropertySetter {
         if (mProgressAnimator == null) {
             mProgressAnimator = ValueAnimator.ofFloat(0, 1);
         }
-        mProgressAnimator.addListener(AnimatorListeners.forEndCallback(listener));
+        mProgressAnimator.addListener(new EndStateCallbackWrapper(listener));
+    }
+
+    private static class EndStateCallbackWrapper extends AnimatorListenerAdapter {
+
+        private final Consumer<Boolean> mListener;
+        private boolean mCalled = false;
+
+        EndStateCallbackWrapper(Consumer<Boolean> listener) {
+            mListener = listener;
+        }
+
+        @Override
+        public void onAnimationCancel(Animator animation) {
+            if (!mCalled) {
+                mCalled = true;
+                mListener.accept(false);
+            }
+        }
+
+        @Override
+        public void onAnimationEnd(Animator animation) {
+            if (!mCalled) {
+                ValueAnimator anim = (ValueAnimator) animation;
+                mListener.accept(anim.getAnimatedFraction() > SUCCESS_TRANSITION_PROGRESS);
+            }
+        }
     }
 }
diff --git a/src/com/android/launcher3/statemanager/StateManager.java b/src/com/android/launcher3/statemanager/StateManager.java
index 03b68535bc..14ef2dc652 100644
--- a/src/com/android/launcher3/statemanager/StateManager.java
+++ b/src/com/android/launcher3/statemanager/StateManager.java
@@ -129,14 +129,14 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
     }
 
     /**
-     * @see #goToState(STATE_TYPE, boolean, AnimatorListener)
+     * @see #goToState(STATE_TYPE, boolean, Runnable)
      */
     public void goToState(STATE_TYPE state) {
         goToState(state, shouldAnimateStateChange());
     }
 
     /**
-     * @see #goToState(STATE_TYPE, boolean, AnimatorListener)
+     * @see #goToState(STATE_TYPE, boolean, Runnable)
      */
     public void goToState(STATE_TYPE state, boolean animated) {
         goToState(state, animated, 0, null);
@@ -149,15 +149,15 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
      *                true otherwise
      * @paras onCompleteRunnable any action to perform at the end of the transition, of null.
      */
-    public void goToState(STATE_TYPE state, boolean animated, AnimatorListener listener) {
-        goToState(state, animated, 0, listener);
+    public void goToState(STATE_TYPE state, boolean animated, Runnable onCompleteRunnable) {
+        goToState(state, animated, 0, onCompleteRunnable);
     }
 
     /**
      * Changes the Launcher state to the provided state after the given delay.
      */
-    public void goToState(STATE_TYPE state, long delay, AnimatorListener listener) {
-        goToState(state, true, delay, listener);
+    public void goToState(STATE_TYPE state, long delay, Runnable onCompleteRunnable) {
+        goToState(state, true, delay, onCompleteRunnable);
     }
 
     /**
@@ -187,20 +187,21 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
         }
     }
 
-    private void goToState(
-            STATE_TYPE state, boolean animated, long delay, AnimatorListener listener) {
+    private void goToState(STATE_TYPE state, boolean animated, long delay,
+            final Runnable onCompleteRunnable) {
         animated &= areAnimatorsEnabled();
         if (mActivity.isInState(state)) {
             if (mConfig.currentAnimation == null) {
                 // Run any queued runnable
-                if (listener != null) {
-                    listener.onAnimationEnd(null);
+                if (onCompleteRunnable != null) {
+                    onCompleteRunnable.run();
                 }
                 return;
             } else if (!mConfig.userControlled && animated && mConfig.targetState == state) {
                 // We are running the same animation as requested
-                if (listener != null) {
-                    mConfig.currentAnimation.addListener(listener);
+                if (onCompleteRunnable != null) {
+                    mConfig.currentAnimation.addListener(
+                            AnimationSuccessListener.forRunnable(onCompleteRunnable));
                 }
                 return;
             }
@@ -220,8 +221,8 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
             onStateTransitionEnd(state);
 
             // Run any queued runnable
-            if (listener != null) {
-                listener.onAnimationEnd(null);
+            if (onCompleteRunnable != null) {
+                onCompleteRunnable.run();
             }
             return;
         }
@@ -232,16 +233,16 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
             int startChangeId = mConfig.changeId;
             mUiHandler.postDelayed(() -> {
                 if (mConfig.changeId == startChangeId) {
-                    goToStateAnimated(state, fromState, listener);
+                    goToStateAnimated(state, fromState, onCompleteRunnable);
                 }
             }, delay);
         } else {
-            goToStateAnimated(state, fromState, listener);
+            goToStateAnimated(state, fromState, onCompleteRunnable);
         }
     }
 
     private void goToStateAnimated(STATE_TYPE state, STATE_TYPE fromState,
-            AnimatorListener listener) {
+            Runnable onCompleteRunnable) {
         // Since state mBaseState can be reached from multiple states, just assume that the
         // transition plays in reverse and use the same duration as previous state.
         mConfig.duration = state == mBaseState
@@ -249,8 +250,8 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
                 : state.getTransitionDuration(mActivity);
         prepareForAtomicAnimation(fromState, state, mConfig);
         AnimatorSet animation = createAnimationToNewWorkspaceInternal(state).buildAnim();
-        if (listener != null) {
-            animation.addListener(listener);
+        if (onCompleteRunnable != null) {
+            animation.addListener(AnimationSuccessListener.forRunnable(onCompleteRunnable));
         }
         mUiHandler.post(new StartAnimRunnable(animation));
     }
-- 
GitLab


From b3a267b58ab810e4da84b996d4b074b455cea0d3 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Tue, 11 May 2021 21:15:41 -0700
Subject: [PATCH 1157/1664] Tuning app close, and turn on flag.

- Tracks centery, slowed things down a bit

* We will be replacing StaggeredWorkspaceAnim with
  another animation, but I'm keeping it here in
  case we decide to turn the flag off later on.

Bug: 173107751
Test: manual
Change-Id: I5cd54ec374ad07c4912aff125a905b3b1dc7ebd5
---
 .../quickstep/LauncherSwipeHandlerV2.java     |   4 +-
 .../quickstep/util/RectFSpringAnim2.java      |  43 +++----
 .../util/StaggeredWorkspaceAnim.java          | 119 +++++++++---------
 res/values/config.xml                         |  12 +-
 .../launcher3/config/FeatureFlags.java        |   2 +-
 5 files changed, 86 insertions(+), 94 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
index 46cd8a2cf9..b353eee21a 100644
--- a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
+++ b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
@@ -335,8 +335,8 @@ public class LauncherSwipeHandlerV2 extends
 
         @Override
         public void playAtomicAnimation(float velocity) {
-            new StaggeredWorkspaceAnim(mActivity, velocity,
-                    true /* animateOverviewScrim */).start();
+            new StaggeredWorkspaceAnim(mActivity, velocity, true /* animateOverviewScrim */,
+                    !PROTOTYPE_APP_CLOSE.get()).start();
         }
 
         @Override
diff --git a/quickstep/src/com/android/quickstep/util/RectFSpringAnim2.java b/quickstep/src/com/android/quickstep/util/RectFSpringAnim2.java
index 95d56aaca4..97be2b1787 100644
--- a/quickstep/src/com/android/quickstep/util/RectFSpringAnim2.java
+++ b/quickstep/src/com/android/quickstep/util/RectFSpringAnim2.java
@@ -69,12 +69,12 @@ public class RectFSpringAnim2 extends RectFSpringAnim {
             new FloatPropertyCompat<RectFSpringAnim2>("rectYSpring") {
                 @Override
                 public float getValue(RectFSpringAnim2 anim) {
-                    return anim.mCurrentY;
+                    return anim.mCurrentCenterY;
                 }
 
                 @Override
                 public void setValue(RectFSpringAnim2 anim, float y) {
-                    anim.mCurrentY = y;
+                    anim.mCurrentCenterY = y;
                     anim.onUpdate();
                 }
             };
@@ -100,13 +100,12 @@ public class RectFSpringAnim2 extends RectFSpringAnim {
     private final List<Animator.AnimatorListener> mAnimatorListeners = new ArrayList<>();
 
     private float mCurrentCenterX;
-    private float mCurrentY;
+    private float mCurrentCenterY;
 
     private float mTargetX;
     private float mTargetY;
 
     // If true, tracking the bottom of the rects, else tracking the top.
-    private final boolean mTrackingBottomY;
     private float mProgress;
     private SpringAnimation mRectXAnim;
     private SpringAnimation mRectYAnim;
@@ -139,11 +138,10 @@ public class RectFSpringAnim2 extends RectFSpringAnim {
         mStartRect = startRect;
         mTargetRect = targetRect;
 
-        mTrackingBottomY = startRect.bottom < targetRect.bottom;
-        mCurrentY = mTrackingBottomY ? mStartRect.bottom : mStartRect.top;
+        mCurrentCenterY = mStartRect.centerY();
         mCurrentCenterX = mStartRect.centerX();
 
-        mTargetY = mTrackingBottomY ? mTargetRect.bottom : mTargetRect.top;
+        mTargetY = mTargetRect.centerY();
         mTargetX = mTargetRect.centerX();
 
         ResourceProvider rp = DynamicResource.provider(context);
@@ -157,12 +155,6 @@ public class RectFSpringAnim2 extends RectFSpringAnim {
         mHomeTransYEnd = dpToPx(rp.getFloat(R.dimen.swipe_up_trans_y_dp));
         mScaleStart = rp.getFloat(R.dimen.swipe_up_scale_start);
 
-
-        if (!mTrackingBottomY) {
-            mYStiffness *= rp.getFloat(R.dimen.swipe_up_rect_2_y_stiffness_low_swipe_multiplier);
-            mDuration *= rp.getFloat(R.dimen.swipe_up_low_swipe_duration_multiplier);
-        }
-
         mCloseInterpolator = getAppCloseInterpolator(context);
 
         // End on a "round-enough" radius so that the shape reveal doesn't have to do too much
@@ -180,11 +172,8 @@ public class RectFSpringAnim2 extends RectFSpringAnim {
         }
 
         if (mRectYAnim != null) {
-            if (mTrackingBottomY && mTargetY != mTargetRect.bottom) {
-                mTargetY = mTargetRect.bottom;
-                mRectYAnim.animateToFinalPosition(mTargetY);
-            } else if (!mTrackingBottomY && mTargetY != mTargetRect.top) {
-                mTargetY = mTargetRect.top;
+            if (mTargetY != mTargetRect.centerY()) {
+                mTargetY = mTargetRect.centerY();
                 mRectYAnim.animateToFinalPosition(mTargetY);
             }
         }
@@ -220,9 +209,9 @@ public class RectFSpringAnim2 extends RectFSpringAnim {
         }));
 
         mRectYAnim = new SpringAnimation(this, RECT_Y)
-                .setStartValue(mCurrentY)
-                .setMinValue(Math.min(0, mCurrentY))
-                .setMaxValue(Math.max(dp.heightPx, mCurrentY))
+                .setStartValue(mCurrentCenterY)
+                .setMinValue(Math.min(0, mCurrentCenterY))
+                .setMaxValue(Math.max(dp.heightPx, mCurrentCenterY))
                 .setStartVelocity(velocityPxPerMs.y * 1000)
                 .setSpring(new SpringForce(mTargetY)
                         .setStiffness(mYStiffness)
@@ -336,13 +325,11 @@ public class RectFSpringAnim2 extends RectFSpringAnim {
                     mTargetRect.width());
             float currentHeight = Utilities.mapRange(rectProgress, mStartRect.height(),
                     mTargetRect.height());
-            if (mTrackingBottomY) {
-                mCurrentRect.set(mCurrentCenterX - currentWidth / 2, mCurrentY - currentHeight,
-                        mCurrentCenterX + currentWidth / 2, mCurrentY);
-            } else {
-                mCurrentRect.set(mCurrentCenterX - currentWidth / 2, mCurrentY,
-                        mCurrentCenterX + currentWidth / 2, mCurrentY + currentHeight);
-            }
+
+            mCurrentRect.set(mCurrentCenterX - currentWidth / 2,
+                    mCurrentCenterY - currentHeight / 2,
+                    mCurrentCenterX + currentWidth / 2,
+                    mCurrentCenterY + currentHeight / 2);
 
             float currentPlayTime = mRectScaleAnimEnded ? mRectScaleAnim.getDuration()
                     : mRectScaleAnim.getCurrentPlayTime();
diff --git a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
index 0ea1fcac76..d430028f8c 100644
--- a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
+++ b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
@@ -20,7 +20,6 @@ import static com.android.launcher3.LauncherState.BACKGROUND_APP;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
-import static com.android.launcher3.config.FeatureFlags.PROTOTYPE_APP_CLOSE;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_DEPTH_CONTROLLER;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_SCRIM;
@@ -71,6 +70,11 @@ public class StaggeredWorkspaceAnim {
     private final AnimatorSet mAnimators = new AnimatorSet();
 
     public StaggeredWorkspaceAnim(Launcher launcher, float velocity, boolean animateOverviewScrim) {
+        this(launcher, velocity, animateOverviewScrim, true);
+    }
+
+    public StaggeredWorkspaceAnim(Launcher launcher, float velocity, boolean animateOverviewScrim,
+            boolean staggerWorkspace) {
         prepareToAnimate(launcher, animateOverviewScrim);
 
         mVelocity = velocity;
@@ -81,53 +85,66 @@ public class StaggeredWorkspaceAnim {
         mSpringTransY = transFactor * launcher.getResources()
                 .getDimensionPixelSize(R.dimen.swipe_up_max_workspace_trans_y);
 
-        DeviceProfile grid = launcher.getDeviceProfile();
-        Workspace workspace = launcher.getWorkspace();
-        Hotseat hotseat = launcher.getHotseat();
-
-        // Hotseat and QSB takes up two additional rows.
-        int totalRows = grid.inv.numRows + (grid.isVerticalBarLayout() ? 0 : 2);
-
-        // Add animation for all the visible workspace pages
-        workspace.forEachVisiblePage(page -> addAnimationForPage((CellLayout) page, totalRows));
-
-        boolean workspaceClipChildren = workspace.getClipChildren();
-        boolean workspaceClipToPadding = workspace.getClipToPadding();
-        boolean hotseatClipChildren = hotseat.getClipChildren();
-        boolean hotseatClipToPadding = hotseat.getClipToPadding();
-
-        workspace.setClipChildren(false);
-        workspace.setClipToPadding(false);
-        hotseat.setClipChildren(false);
-        hotseat.setClipToPadding(false);
-
-        // Set up springs for the hotseat and qsb.
-        ViewGroup hotseatIcons = hotseat.getShortcutsAndWidgets();
-        if (grid.isVerticalBarLayout()) {
-            for (int i = hotseatIcons.getChildCount() - 1; i >= 0; i--) {
-                View child = hotseatIcons.getChildAt(i);
-                CellLayout.LayoutParams lp = ((CellLayout.LayoutParams) child.getLayoutParams());
-                addStaggeredAnimationForView(child, lp.cellY + 1, totalRows);
-            }
-        } else {
-            final int hotseatRow, qsbRow, taskbarRow;
-            if (grid.isTaskbarPresent) {
-                qsbRow = grid.inv.numRows + 1;
-                hotseatRow = grid.inv.numRows + 2;
+        if (staggerWorkspace) {
+            DeviceProfile grid = launcher.getDeviceProfile();
+            Workspace workspace = launcher.getWorkspace();
+            Hotseat hotseat = launcher.getHotseat();
+
+            // Hotseat and QSB takes up two additional rows.
+            int totalRows = grid.inv.numRows + (grid.isVerticalBarLayout() ? 0 : 2);
+
+            // Add animation for all the visible workspace pages
+            workspace.forEachVisiblePage(page -> addAnimationForPage((CellLayout) page, totalRows));
+
+            boolean workspaceClipChildren = workspace.getClipChildren();
+            boolean workspaceClipToPadding = workspace.getClipToPadding();
+            boolean hotseatClipChildren = hotseat.getClipChildren();
+            boolean hotseatClipToPadding = hotseat.getClipToPadding();
+
+            workspace.setClipChildren(false);
+            workspace.setClipToPadding(false);
+            hotseat.setClipChildren(false);
+            hotseat.setClipToPadding(false);
+
+            // Set up springs for the hotseat and qsb.
+            ViewGroup hotseatIcons = hotseat.getShortcutsAndWidgets();
+            if (grid.isVerticalBarLayout()) {
+                for (int i = hotseatIcons.getChildCount() - 1; i >= 0; i--) {
+                    View child = hotseatIcons.getChildAt(i);
+                    CellLayout.LayoutParams lp =
+                            ((CellLayout.LayoutParams) child.getLayoutParams());
+                    addStaggeredAnimationForView(child, lp.cellY + 1, totalRows);
+                }
             } else {
-                hotseatRow = grid.inv.numRows + 1;
-                qsbRow = grid.inv.numRows + 2;
+                final int hotseatRow, qsbRow, taskbarRow;
+                if (grid.isTaskbarPresent) {
+                    qsbRow = grid.inv.numRows + 1;
+                    hotseatRow = grid.inv.numRows + 2;
+                } else {
+                    hotseatRow = grid.inv.numRows + 1;
+                    qsbRow = grid.inv.numRows + 2;
+                }
+                // Taskbar and hotseat overlap.
+                taskbarRow = hotseatRow;
+
+                for (int i = hotseatIcons.getChildCount() - 1; i >= 0; i--) {
+                    View child = hotseatIcons.getChildAt(i);
+                    addStaggeredAnimationForView(child, hotseatRow, totalRows);
+                }
+
+                addStaggeredAnimationForView(hotseat.getQsb(), qsbRow, totalRows);
+                addStaggeredAnimationForView(hotseat.getTaskbarView(), taskbarRow, totalRows);
             }
-            // Taskbar and hotseat overlap.
-            taskbarRow = hotseatRow;
 
-            for (int i = hotseatIcons.getChildCount() - 1; i >= 0; i--) {
-                View child = hotseatIcons.getChildAt(i);
-                addStaggeredAnimationForView(child, hotseatRow, totalRows);
-            }
-
-            addStaggeredAnimationForView(hotseat.getQsb(), qsbRow, totalRows);
-            addStaggeredAnimationForView(hotseat.getTaskbarView(), taskbarRow, totalRows);
+            mAnimators.addListener(new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationEnd(Animator animation) {
+                    workspace.setClipChildren(workspaceClipChildren);
+                    workspace.setClipToPadding(workspaceClipToPadding);
+                    hotseat.setClipChildren(hotseatClipChildren);
+                    hotseat.setClipToPadding(hotseatClipToPadding);
+                }
+            });
         }
 
         if (animateOverviewScrim) {
@@ -141,15 +158,6 @@ public class StaggeredWorkspaceAnim {
 
         mAnimators.play(launcher.getRootView().getSysUiScrim().createSysuiMultiplierAnim(0f, 1f)
                 .setDuration(DURATION_MS));
-        mAnimators.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                workspace.setClipChildren(workspaceClipChildren);
-                workspace.setClipToPadding(workspaceClipToPadding);
-                hotseat.setClipChildren(hotseatClipChildren);
-                hotseat.setClipToPadding(hotseatClipToPadding);
-            }
-        });
     }
 
     private void addAnimationForPage(CellLayout page, int totalRows) {
@@ -220,9 +228,6 @@ public class StaggeredWorkspaceAnim {
      * @param totalRows Total number of rows.
      */
     private void addStaggeredAnimationForView(View v, int row, int totalRows) {
-        if (PROTOTYPE_APP_CLOSE.get()) {
-            return;
-        }
         // Invert the rows, because we stagger starting from the bottom of the screen.
         int invertedRow = totalRows - row;
         // Add 1 to the inverted row so that the bottom most row has a start delay.
diff --git a/res/values/config.xml b/res/values/config.xml
index e65c65277e..102d4e0c37 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -127,12 +127,12 @@
     <item name="swipe_up_rect_xy_fling_friction" type="dimen" format="float">1.5</item>
 
     <item name="swipe_up_scale_start"  type="dimen" format="float">0.98</item>
-    <item name="swipe_up_duration"  type="dimen" format="float">500</item>
+    <item name="swipe_up_duration"  type="dimen" format="float">400</item>
 
-    <item name="swipe_up_trans_y_dp"  type="dimen" format="float">3</item>
+    <item name="swipe_up_trans_y_dp"  type="dimen" format="float">4.5</item>
     <item name="swipe_up_trans_y_dp_per_s" type="dimen" format="float">3</item>
 
-    <item name="swipe_up_trans_y_damping" type="dimen" format="float">0.4</item>
+    <item name="swipe_up_trans_y_damping" type="dimen" format="float">0.45</item>
     <item name="swipe_up_trans_y_stiffness" type="dimen" format="float">200</item>
 
     <item name="swipe_up_rect_xy_damping_ratio" type="dimen" format="float">0.8</item>
@@ -140,12 +140,12 @@
 
 
     <item name="swipe_up_rect_2_x_damping_ratio" type="dimen" format="float">1</item>
-    <item name="swipe_up_rect_2_x_stiffness" type="dimen" format="float">350</item>
+    <item name="swipe_up_rect_2_x_stiffness" type="dimen" format="float">250</item>
 
     <item name="swipe_up_rect_2_y_damping_ratio" type="dimen" format="float">1</item>
-    <item name="swipe_up_rect_2_y_stiffness" type="dimen" format="float">700</item>
+    <item name="swipe_up_rect_2_y_stiffness" type="dimen" format="float">600</item>
 
-    <item name="swipe_up_rect_2_y_stiffness_low_swipe_multiplier" type="dimen" format="float">1</item>
+    <item name="swipe_up_rect_2_y_stiffness_low_swipe_multiplier" type="dimen" format="float">0.8</item>
     <item name="swipe_up_low_swipe_duration_multiplier"  type="dimen" format="float">1</item>
 
     <item name="swipe_up_launcher_alpha_max_progress" type="dimen" format="float">0.85</item>
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 7ef43ed4be..0c0c92ed04 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -238,7 +238,7 @@ public final class FeatureFlags {
             "Sends a notification whenever launcher encounters an uncaught exception.");
 
     public static final BooleanFlag PROTOTYPE_APP_CLOSE = getDebugFlag(
-            "PROTOTYPE_APP_CLOSE", false, "Enables new app close");
+            "PROTOTYPE_APP_CLOSE", true, "Enables new app close");
 
     public static final BooleanFlag ENABLE_WALLPAPER_SCRIM = getDebugFlag(
             "ENABLE_WALLPAPER_SCRIM", false,
-- 
GitLab


From 8dbba26e7652d9fd334be1c027f44cd007f44d76 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 6 Apr 2021 22:54:40 -0700
Subject: [PATCH 1158/1664] Add a content overlay for auto-enter w/o a source
 hint rect

Bug: 184703546
Test: Swipe up from app with auto-enter but no source hint rect

Signed-off-by: Winson Chung <winsonc@google.com>
Change-Id: Ib6f03dc6b11d37c44d732c75adabf45d1795fefc
---
 .../android/quickstep/AbsSwipeUpHandler.java  |  6 ++-
 .../quickstep/RecentsAnimationController.java | 10 +++--
 .../com/android/quickstep/SystemUiProxy.java  |  6 ++-
 .../util/SwipePipToHomeAnimator.java          | 43 +++++++++++++++++++
 src/com/android/launcher3/util/Themes.java    |  2 +-
 5 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index d04bfe95e2..8356eab893 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1507,10 +1507,12 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         if (mIsSwipingPipToHome && mSwipePipToHomeAnimator != null) {
             SystemUiProxy.INSTANCE.get(mContext).stopSwipePipToHome(
                     mSwipePipToHomeAnimator.getComponentName(),
-                    mSwipePipToHomeAnimator.getDestinationBounds());
+                    mSwipePipToHomeAnimator.getDestinationBounds(),
+                    mSwipePipToHomeAnimator.getContentOverlay());
             mRecentsAnimationController.setFinishTaskTransaction(
                     mSwipePipToHomeAnimator.getTaskId(),
-                    mSwipePipToHomeAnimator.getFinishTransaction());
+                    mSwipePipToHomeAnimator.getFinishTransaction(),
+                    mSwipePipToHomeAnimator.getContentOverlay());
             mIsSwipingPipToHome = false;
         }
     }
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationController.java b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
index 78da311971..f2bd916e11 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationController.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
@@ -19,6 +19,7 @@ import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.THREAD_POOL_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
+import android.view.SurfaceControl;
 import android.window.PictureInPictureSurfaceTransaction;
 
 import androidx.annotation.NonNull;
@@ -159,12 +160,15 @@ public class RecentsAnimationController {
      * that animating Activity to PiP has completed and the associated task surface should be
      * updated accordingly. This should be called before `finish`
      * @param taskId for which the leash should be updated
-     * @param finishTransaction leash operations for the final transform.
+     * @param finishTransaction the transaction to transfer to the task surface control after the
+     *                          leash is removed
+     * @param overlay the surface control for an overlay being shown above the pip (can be null)
      */
     public void setFinishTaskTransaction(int taskId,
-            PictureInPictureSurfaceTransaction finishTransaction) {
+            PictureInPictureSurfaceTransaction finishTransaction,
+            SurfaceControl overlay) {
         UI_HELPER_EXECUTOR.execute(
-                () -> mController.setFinishTaskTransaction(taskId, finishTransaction));
+                () -> mController.setFinishTaskTransaction(taskId, finishTransaction, overlay));
     }
 
     /**
diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index 39d8888c72..6fb938ad32 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -33,6 +33,7 @@ import android.os.RemoteException;
 import android.os.UserHandle;
 import android.util.Log;
 import android.view.MotionEvent;
+import android.view.SurfaceControl;
 
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.launcher3.util.SplitConfigurationOptions;
@@ -427,10 +428,11 @@ public class SystemUiProxy implements ISystemUiProxy,
         return null;
     }
 
-    public void stopSwipePipToHome(ComponentName componentName, Rect destinationBounds) {
+    public void stopSwipePipToHome(ComponentName componentName, Rect destinationBounds,
+            SurfaceControl overlay) {
         if (mPip != null) {
             try {
-                mPip.stopSwipePipToHome(componentName, destinationBounds);
+                mPip.stopSwipePipToHome(componentName, destinationBounds, overlay);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call stopSwipePipToHome");
             }
diff --git a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
index b5570a7445..36311302bf 100644
--- a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
+++ b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
@@ -22,19 +22,24 @@ import android.animation.Animator;
 import android.animation.RectEvaluator;
 import android.animation.ValueAnimator;
 import android.content.ComponentName;
+import android.graphics.Color;
 import android.graphics.Matrix;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.util.Log;
 import android.view.Surface;
 import android.view.SurfaceControl;
+import android.view.SurfaceSession;
 import android.view.View;
 import android.window.PictureInPictureSurfaceTransaction;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimationSuccessListener;
+import com.android.launcher3.anim.Interpolators;
+import com.android.launcher3.util.Themes;
 import com.android.systemui.shared.pip.PipSurfaceTransactionHelper;
 import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
 
@@ -78,6 +83,12 @@ public class SwipePipToHomeAnimator extends ValueAnimator {
      */
     private boolean mHasAnimationEnded;
 
+    /**
+     * An overlay used to mask changes in content when entering PiP for apps that aren't seamless.
+     */
+    @Nullable
+    private SurfaceControl mContentOverlay;
+
     /**
      * @param taskId Task id associated with this animator, see also {@link #getTaskId()}
      * @param componentName Component associated with this animator,
@@ -112,6 +123,33 @@ public class SwipePipToHomeAnimator extends ValueAnimator {
 
         if (sourceRectHint == null) {
             mSourceHintRectInsets = null;
+
+            // Create a new overlay layer
+            SurfaceSession session = new SurfaceSession();
+            mContentOverlay = new SurfaceControl.Builder(session)
+                    .setCallsite("SwipePipToHomeAnimator")
+                    .setName("PipContentOverlay")
+                    .setColorLayer()
+                    .build();
+            SurfaceControl.Transaction t = new SurfaceControl.Transaction();
+            t.show(mContentOverlay);
+            t.setLayer(mContentOverlay, Integer.MAX_VALUE);
+            int color = Themes.getColorBackground(view.getContext());
+            float[] bgColor = new float[] {Color.red(color) / 255f, Color.green(color) / 255f,
+                    Color.blue(color) / 255f};
+            t.setColor(mContentOverlay, bgColor);
+            t.setAlpha(mContentOverlay, 0f);
+            t.reparent(mContentOverlay, mLeash);
+            t.apply();
+
+            addUpdateListener(valueAnimator -> {
+                float alpha = valueAnimator.getAnimatedFraction() < 0.5f
+                        ? 0
+                        : Utilities.mapToRange(valueAnimator.getAnimatedFraction(), 0.5f, 1f,
+                                0f, 1f, Interpolators.FAST_OUT_SLOW_IN);
+                t.setAlpha(mContentOverlay, alpha);
+                t.apply();
+            });
         } else {
             mSourceHintRectInsets = new Rect(sourceRectHint.left - appBounds.left,
                     sourceRectHint.top - appBounds.top,
@@ -234,6 +272,11 @@ public class SwipePipToHomeAnimator extends ValueAnimator {
         return mDestinationBounds;
     }
 
+    @Nullable
+    public SurfaceControl getContentOverlay() {
+        return mContentOverlay;
+    }
+
     /** @return {@link PictureInPictureSurfaceTransaction} for the final leash transaction. */
     public PictureInPictureSurfaceTransaction getFinishTransaction() {
         // get the final leash operations but do not apply to the leash.
diff --git a/src/com/android/launcher3/util/Themes.java b/src/com/android/launcher3/util/Themes.java
index 06cac08aec..8243dd480b 100644
--- a/src/com/android/launcher3/util/Themes.java
+++ b/src/com/android/launcher3/util/Themes.java
@@ -92,7 +92,7 @@ public class Themes {
         return getAttrColor(context, android.R.attr.colorAccent);
     }
 
-    /** Returns the floating background color attribute. */
+    /** Returns the background color attribute. */
     public static int getColorBackground(Context context) {
         return getAttrColor(context, android.R.attr.colorBackground);
     }
-- 
GitLab


From 62dbe9827a2d0cfbb40706e22bc63e29e2e5e7bc Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 12 May 2021 16:19:58 -0700
Subject: [PATCH 1159/1664] Specify REQUEST_RECONFIGURE_APPWIDGET when dropping
 on Setup target

Test: Add a configurable widget to the home screen, drag it to the
Setup drop target, and swipe up to home from the setup page
Fixes: 187839837

Change-Id: I0912317248a33764d4f2a49db73b8fba44dfeca1
---
 src/com/android/launcher3/SecondaryDropTarget.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/SecondaryDropTarget.java b/src/com/android/launcher3/SecondaryDropTarget.java
index 05cef386df..6ccfa7e3b5 100644
--- a/src/com/android/launcher3/SecondaryDropTarget.java
+++ b/src/com/android/launcher3/SecondaryDropTarget.java
@@ -3,6 +3,7 @@ package com.android.launcher3;
 import static android.appwidget.AppWidgetManager.INVALID_APPWIDGET_ID;
 import static android.appwidget.AppWidgetProviderInfo.WIDGET_FEATURE_RECONFIGURABLE;
 
+import static com.android.launcher3.Launcher.REQUEST_RECONFIGURE_APPWIDGET;
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_DESKTOP;
 import static com.android.launcher3.accessibility.LauncherAccessibilityDelegate.DISMISS_PREDICTION;
 import static com.android.launcher3.accessibility.LauncherAccessibilityDelegate.RECONFIGURE;
@@ -266,7 +267,8 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList
         if (mCurrentAccessibilityAction == RECONFIGURE) {
             int widgetId = getReconfigurableWidgetId(view);
             if (widgetId != INVALID_APPWIDGET_ID) {
-                mLauncher.getAppWidgetHost().startConfigActivity(mLauncher, widgetId, -1);
+                mLauncher.getAppWidgetHost().startConfigActivity(mLauncher, widgetId,
+                        REQUEST_RECONFIGURE_APPWIDGET);
             }
             return null;
         }
-- 
GitLab


From 8239ed8733f42e2f8506a9294fe12a64dc1e1fdc Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 12 May 2021 16:36:31 -0700
Subject: [PATCH 1160/1664] Remove mOnRecentsScrollListener when continuing
 quick switch gesture

Test: Quick switch from A to B, touch nav during the transition and
continue quick switching to C; ensure running task doesn't jump to
fullscreen randomly throughout the scroll
Fixes: 186269584

Change-Id: Ibebad3d8c8e8f86c7f53a028c75bb5916369df7f
---
 quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index d04bfe95e2..79935d75cb 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1376,7 +1376,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     private void invalidateHandlerWithLauncher() {
         endLauncherTransitionController();
 
-        mRecentsView.removeOnScrollChangedListener(mOnRecentsScrollListener);
         mRecentsView.onGestureAnimationEnd();
         resetLauncherListeners();
     }
@@ -1391,12 +1390,18 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         }
     }
 
+    /**
+     * Unlike invalidateHandlerWithLauncher, this is called even when switching consumers, e.g. on
+     * continued quick switch gesture, which cancels the previous handler but doesn't invalidate it.
+     */
     private void resetLauncherListeners() {
         // Reset the callback for deferred activity launches
         if (!LIVE_TILE.get()) {
             mActivityInterface.setOnDeferredActivityLaunchCallback(null);
         }
         mActivity.getRootView().setOnApplyWindowInsetsListener(null);
+
+        mRecentsView.removeOnScrollChangedListener(mOnRecentsScrollListener);
     }
 
     private void resetStateForAnimationCancel() {
-- 
GitLab


From e2801bcb77f6a58d094a46b474624a42b46fd548 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Wed, 12 May 2021 18:29:23 -0700
Subject: [PATCH 1161/1664] Removing pss checks in memory tests

Test: presubmit
Bug: 185181057
Change-Id: I4f504f9540b80c62cd3f1024ff1d1b57102f2ed6
---
 .../testing/DebugTestInformationHandler.java  | 33 +------------------
 .../launcher3/testing/TestProtocol.java       |  4 +--
 .../launcher3/ui/AbstractLauncherUiTest.java  |  2 +-
 .../tapl/LauncherInstrumentation.java         | 13 ++------
 4 files changed, 5 insertions(+), 47 deletions(-)

diff --git a/ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java b/ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java
index aa3710b6d9..c6ae6bef21 100644
--- a/ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java
+++ b/ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java
@@ -16,16 +16,11 @@
 
 package com.android.launcher3.testing;
 
-import static android.graphics.Bitmap.Config.ARGB_8888;
-
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 
 import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Color;
 import android.os.Binder;
 import android.os.Bundle;
-import android.os.Debug;
 import android.system.Os;
 import android.view.View;
 
@@ -106,34 +101,8 @@ public class DebugTestInformationHandler extends TestInformationHandler {
                 return response;
             }
 
-            case TestProtocol.REQUEST_TOTAL_PSS_KB: {
+            case TestProtocol.REQUEST_FORCE_GC: {
                 runGcAndFinalizersSync();
-                Debug.MemoryInfo mem = new Debug.MemoryInfo();
-                Debug.getMemoryInfo(mem);
-                response.putInt(TestProtocol.TEST_INFO_RESPONSE_FIELD, mem.getTotalPss());
-                return response;
-            }
-
-            case TestProtocol.REQUEST_JAVA_LEAK: {
-                if (sLeaks == null) sLeaks = new LinkedList();
-
-                // Allocate and dirty the memory.
-                final int leakSize = 1024 * 1024;
-                final byte[] bytes = new byte[leakSize];
-                for (int i = 0; i < leakSize; i += 239) {
-                    bytes[i] = (byte) (i % 256);
-                }
-                sLeaks.add(bytes);
-                return response;
-            }
-
-            case TestProtocol.REQUEST_NATIVE_LEAK: {
-                if (sLeaks == null) sLeaks = new LinkedList();
-
-                // Allocate and dirty a bitmap.
-                final Bitmap bitmap = Bitmap.createBitmap(512, 512, ARGB_8888);
-                bitmap.eraseColor(Color.RED);
-                sLeaks.add(bitmap);
                 return response;
             }
 
diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java
index 4012e89a9a..b6da7fcd37 100644
--- a/src/com/android/launcher3/testing/TestProtocol.java
+++ b/src/com/android/launcher3/testing/TestProtocol.java
@@ -87,9 +87,7 @@ public final class TestProtocol {
     public static final String REQUEST_WIDGETS_SCROLL_Y = "widgets-scroll-y";
     public static final String REQUEST_WINDOW_INSETS = "window-insets";
     public static final String REQUEST_PID = "pid";
-    public static final String REQUEST_TOTAL_PSS_KB = "total_pss";
-    public static final String REQUEST_JAVA_LEAK = "java-leak";
-    public static final String REQUEST_NATIVE_LEAK = "native-leak";
+    public static final String REQUEST_FORCE_GC = "gc";
     public static final String REQUEST_VIEW_LEAK = "view-leak";
     public static final String REQUEST_RECENT_TASKS_LIST = "recent-tasks-list";
     public static final String REQUEST_START_EVENT_LOGGING = "start-event-logging";
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index 8936f39e88..ca463e6042 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -138,7 +138,7 @@ public abstract class AbstractLauncherUiTest {
         // Check whether activity leak detector has found leaked activities.
         Wait.atMost(AbstractLauncherUiTest::getActivityLeakErrorMessage,
                 () -> {
-                    launcher.getTotalPssKb();  // Triggers GC
+                    launcher.forceGc();
                     return MAIN_EXECUTOR.submit(
                             () -> ACTIVITY_LEAK_TRACKER.noLeakedActivities()).get();
                 }, DEFAULT_UI_TIMEOUT, launcher);
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index f993bcf547..57f40db205 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -1358,11 +1358,10 @@ public final class LauncherInstrumentation {
         getTestInfo(TestProtocol.REQUEST_DISABLE_DEBUG_TRACING);
     }
 
-    public int getTotalPssKb() {
+    public void forceGc() {
         // GC the system & sysui first before gc'ing launcher
         logShellCommand("cmd statusbar run-gc");
-        return getTestInfo(TestProtocol.REQUEST_TOTAL_PSS_KB).
-                getInt(TestProtocol.TEST_INFO_RESPONSE_FIELD);
+        getTestInfo(TestProtocol.REQUEST_FORCE_GC);
     }
 
     public Integer getPid() {
@@ -1370,14 +1369,6 @@ public final class LauncherInstrumentation {
         return testInfo != null ? testInfo.getInt(TestProtocol.TEST_INFO_RESPONSE_FIELD) : null;
     }
 
-    public void produceJavaLeak() {
-        getTestInfo(TestProtocol.REQUEST_JAVA_LEAK);
-    }
-
-    public void produceNativeLeak() {
-        getTestInfo(TestProtocol.REQUEST_NATIVE_LEAK);
-    }
-
     public void produceViewLeak() {
         getTestInfo(TestProtocol.REQUEST_VIEW_LEAK);
     }
-- 
GitLab


From af7c86ada5ce013fd6172095b571a119cb899744 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 12 May 2021 20:33:13 -0700
Subject: [PATCH 1162/1664] Skip setting up ui if the handler is already
 invalidated

- Also unregister the task stack listener in case the restart
  message comes in right before the animation is finished

Bug: 186760990
Test: Swipe up/quickswitch repeatedly
Change-Id: I5af7a26f05e7c15e099d6666e4662fd1af9aa861
---
 quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java   | 3 +++
 .../src/com/android/quickstep/TaskAnimationManager.java      | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index d04bfe95e2..bc98dabdd9 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1518,6 +1518,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     protected abstract void finishRecentsControllerToHome(Runnable callback);
 
     private void setupLauncherUiAfterSwipeUpToRecentsAnimation() {
+        if (mStateCallback.hasStates(STATE_HANDLER_INVALIDATED)) {
+            return;
+        }
         endLauncherTransitionController();
         mActivityInterface.onSwipeUpToRecentsComplete();
         mRecentsView.onSwipeUpAnimationSuccess();
diff --git a/quickstep/src/com/android/quickstep/TaskAnimationManager.java b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
index 44a3e95744..e90a1ab7b1 100644
--- a/quickstep/src/com/android/quickstep/TaskAnimationManager.java
+++ b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
@@ -57,6 +57,11 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
         @Override
         public void onActivityRestartAttempt(ActivityManager.RunningTaskInfo task,
                 boolean homeTaskVisible, boolean clearedTask, boolean wasVisible) {
+            if (mLastGestureState == null) {
+                ActivityManagerWrapper.getInstance().unregisterTaskStackListener(
+                        mLiveTileRestartListener);
+                return;
+            }
             BaseActivityInterface activityInterface = mLastGestureState.getActivityInterface();
             if (LIVE_TILE.get() && activityInterface.isInLiveTileMode()
                     && activityInterface.getCreatedActivity() != null) {
-- 
GitLab


From 2a99f41b95378f68203f0280a077cbb6ed26bcf6 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Thu, 13 May 2021 07:38:56 +0000
Subject: [PATCH 1163/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Iadb532dd2ccc98ba1437e944adf69a9ffb62fba2
---
 quickstep/res/values-af/strings.xml        | 26 +++++++++++----
 quickstep/res/values-am/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-ar/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-as/strings.xml        | 26 +++++++++++----
 quickstep/res/values-az/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-b+sr+Latn/strings.xml | 38 ++++++++++++++--------
 quickstep/res/values-be/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-bg/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-bn/strings.xml        | 26 +++++++++++----
 quickstep/res/values-bs/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-ca/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-cs/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-da/strings.xml        | 26 +++++++++++----
 quickstep/res/values-de/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-el/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-en-rAU/strings.xml    | 26 +++++++++++----
 quickstep/res/values-en-rCA/strings.xml    | 26 +++++++++++----
 quickstep/res/values-en-rGB/strings.xml    | 26 +++++++++++----
 quickstep/res/values-en-rIN/strings.xml    | 26 +++++++++++----
 quickstep/res/values-en-rXC/strings.xml    | 16 +++++----
 quickstep/res/values-es-rUS/strings.xml    | 26 +++++++++++----
 quickstep/res/values-es/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-et/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-eu/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-fa/strings.xml        | 26 +++++++++++----
 quickstep/res/values-fi/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-fr-rCA/strings.xml    | 38 ++++++++++++++--------
 quickstep/res/values-fr/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-gl/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-gu/strings.xml        | 26 +++++++++++----
 quickstep/res/values-hi/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-hr/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-hu/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-hy/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-in/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-is/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-it/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-iw/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-ja/strings.xml        | 26 +++++++++++----
 quickstep/res/values-ka/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-kk/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-km/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-kn/strings.xml        | 26 +++++++++++----
 quickstep/res/values-ko/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-ky/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-lo/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-lt/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-lv/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-mk/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-ml/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-mn/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-mr/strings.xml        | 26 +++++++++++----
 quickstep/res/values-ms/strings.xml        | 26 +++++++++++----
 quickstep/res/values-my/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-nb/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-ne/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-nl/strings.xml        | 28 ++++++++++++----
 quickstep/res/values-or/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-pa/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-pl/strings.xml        | 26 +++++++++++----
 quickstep/res/values-pt-rPT/strings.xml    | 38 ++++++++++++++--------
 quickstep/res/values-pt/strings.xml        | 26 +++++++++++----
 quickstep/res/values-ro/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-ru/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-si/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-sk/strings.xml        | 26 +++++++++++----
 quickstep/res/values-sl/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-sq/strings.xml        | 26 +++++++++++----
 quickstep/res/values-sr/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-sv/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-sw/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-ta/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-te/strings.xml        | 26 +++++++++++----
 quickstep/res/values-th/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-tl/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-tr/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-uk/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-ur/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-uz/strings.xml        | 26 +++++++++++----
 quickstep/res/values-vi/strings.xml        | 38 ++++++++++++++--------
 quickstep/res/values-zh-rCN/strings.xml    | 38 ++++++++++++++--------
 quickstep/res/values-zh-rHK/strings.xml    | 38 ++++++++++++++--------
 quickstep/res/values-zh-rTW/strings.xml    | 38 ++++++++++++++--------
 quickstep/res/values-zu/strings.xml        | 26 +++++++++++----
 84 files changed, 1911 insertions(+), 985 deletions(-)

diff --git a/quickstep/res/values-af/strings.xml b/quickstep/res/values-af/strings.xml
index 0a82e04fb0..3ac5a370e1 100644
--- a/quickstep/res/values-af/strings.xml
+++ b/quickstep/res/values-af/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Voorspelde program: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Maak seker dat jy van die rand heel links af swiep."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Maak seker dat jy van die linkerrand na die middel van die skerm swiep en laat los."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Dis al! Probeer nou om van die regterrand af te swiep."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Maak seker dat jy van die rand heel regs af swiep."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Maak seker dat jy van die regterrand na die middel van die skerm swiep en laat los."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Jy het die \"gaan terug\"-gebaar voltooi. Nou kan jy leer hoe om na tuisskerm te gaan."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Maak seker dat jy nie te naby aan die onderkant van die skerm swiep nie."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Gaan na Instellings om sensitiwiteit van teruggebaar te verander"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Swiep om terug te gaan"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Swiep van die linker- of regterrand na die middel van die skerm om na die vorige skerm terug te gaan."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Maak seker dat jy van die onderrand van die skerm af opswiep."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Maak seker jy onderbreek nie voordat jy laat los nie."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Maak seker jy swiep reguit op."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Jy het die \"gaan na tuisskerm\"-gebaar voltooi. Nou kan jy leer hoe om tussen programme te wissel."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Swiep om na tuisskerm toe te gaan"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Swiep op van die onderkant van jou skerm af. Hierdie gebaar neem jou altyd na die tuisskerm toe."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Maak seker dat jy van die onderrand van die skerm af opswiep."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Probeer om die venster langer te hou voordat jy laat los."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Maak seker dat jy reguit opswiep en dan onderbreek."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Jy het die \"wissel tussen programme\"-gebaar voltooi. Jy is gereed om jou foon te gebruik!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swiep om tussen programme te wissel"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swiep op van die onderkant van jou skerm af, hou en laat los dan."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Gereed"</string>
diff --git a/quickstep/res/values-am/strings.xml b/quickstep/res/values-am/strings.xml
index c74819e69d..6dd34c1593 100644
--- a/quickstep/res/values-am/strings.xml
+++ b/quickstep/res/values-am/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"የተገመተው መተግበሪያ፦ <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ከግራ ጠርዝ ጥግ ጀምሮ ማንሸራተትዎን ያረጋግጡ።"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ከግራ ጠርዝ ወደ ማያ ገጹ መሃል ማንሸራተትዎን እና መልቀቅዎን ያረጋግጡ።"</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"ይሄው ነው! አሁን ደግሞ ከግራ ጥግ ጠረግ ማንሸራተትን ይሞክሩ።"</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ከቀኝ ጠርዝ ጥግ ጀምሮ ማንሸራተትዎን ያረጋግጡ።"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ከቀኝ ጠርዝ ወደ ማያ ገጹ መሃል ማንሸራተትዎን እና መልቀቅዎን ያረጋግጡ።"</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"ወደኋላ የመመለስ ምልክትን አጠናቀዋል። ቀጥሎም ወደ ቤት እንዴት መሄድ እንደሚችሉ ይወቁ።"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ከማያ ገጹ ታችኛው ክፍል ጋር በጣም ጠጋ ብለው አለማንሸራተትዎን ያረጋግጡ።"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ከኋላ ስሜት ሰጭነት ደረጃ ለመለወጥ ወደ ቅንብሮች ይመለሱ"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"ወደኋላ ለመመለስ ያንሸራትቱ"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"ወደ መጨረሻው ማያ ገጽ ለመመለስ ከግራ ወይም ከቀኝ ጠርዝ ወደ ማያ ገጹ መሃል ያንሸራትቱ።"</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ከማያ ገጹ የታችኛው ጫፍ ወደ ላይ ማንሸራተትዎን ያረጋግጡ።"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ከመልቀቅዎ በፊት ለአፍታ እንዳልቆሙ ያረጋግጡ።"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"በቀጥታ ወደ ላይ ማንሸራተትዎን ያረጋግጡ።"</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"የመነሻ ምልክትን አጠናቀዋል። ቀጥሎም መተግበሪያዎችን እንዴት መቀየር እንደሚችሉ ይወቁ።"</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"ወደ መነሻ ለመሄድ ያንሸራትቱ"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"ከእርስዎ ማያ ገጽ ግርጌ ላይ ወደ ላይ በጣት ጠረግ ያድርጉ። ይህ የእጅ ውዝዋዜ ሁልጊዜ ወደ መነሻ ማያ ገጽ ይወስድዎታል።"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ከማያ ገጹ የታችኛው ጫፍ ወደ ላይ ማንሸራተትዎን ያረጋግጡ።"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"ከመልቀቅዎ በፊት መስኮቱን ረዘም ላለ ጊዜ ለመያዝ ይሞክሩ።"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"በቀጥታ ወደ ላይ ማንሸራተትዎን ያረጋግጡ፣ ከዚያ ለአፍታ ያቁሙ።"</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"መተግበሪያዎችን የመቀያየር ምልክትን አጠናቀዋል። ስልክዎን ለመጠቀም ዝግጁ ነዎት!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"መተግበሪያዎችን ለመቀየር ያንሸራትቱ"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ከእርስዎ ማያ ገጽ ግርጌ ላይ ወደ ላይ በጣት ጠረግ ያድርጉ፣ ይያዙ፣ በመቀጠል ይልቀቁ።"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"ሁሉም ዝግጁ"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"እንደገና ሞክር"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ጥሩ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"አጋዥ ሥልጠና <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"ሁሉም ዝግጁ!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"ወደ መነሻ ለመሄድ በጣት ወደ ላይ ይጥረጉ"</string>
+    <string name="allset_description" msgid="6350320429953234580">"ስልክዎን መጠቀም ለመጀመር ዝግጁ ነዎት"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"የአሰሳ ቅንብሮች ለተደራሽነት"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"አጋራ"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ቅጽበታዊ ገጽ እይታ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ይህ ድርጊት በመተግበሪያው ወይም በእርስዎ ድርጅት አይፈቀድም"</string>
diff --git a/quickstep/res/values-ar/strings.xml b/quickstep/res/values-ar/strings.xml
index cf4407e88c..337fba7d71 100644
--- a/quickstep/res/values-ar/strings.xml
+++ b/quickstep/res/values-ar/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"التطبيق المتوقع: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"تأكّد من التمرير سريعًا من أقصى الحافة اليمنى."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"تأكّد من التمرير سريعًا من الحافة اليمنى إلى وسط الشاشة ثم ارفع إصبعك."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"أكملت هذه الخطوة. جرِّب الآن التمرير سريعًا من الحافة اليسرى"</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"تأكّد من التمرير سريعًا من أقصى الحافة اليسرى."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"تأكّد من التمرير سريعًا من الحافة اليسرى إلى وسط الشاشة ثم ارفع إصبعك."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"لقد أكملت التدريب على إيماءة الرجوع. تعرّف بعد ذلك على كيفية الانتقال إلى الشاشة الرئيسية."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"تأكّد من عدم التمرير بالقرب من أسفل الشاشة."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"لتغيير مستوى حساسية إيماءة الرجوع، انتقِل إلى \"الإعدادات\""</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"مرِّر سريعًا للرجوع."</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"للرجوع إلى الشاشة السابقة، مرِّر سريعًا من الحافة اليسرى أو الحافة اليمنى إلى وسط الشاشة."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"تأكّد من التمرير سريعًا من الحافة السفلى للشاشة إلى أعلاها."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"تأكّد من عدم التوقّف قليلاً قبل رفع إصبعك."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"تأكّد من التمرير إلى الأعلى مباشرةً."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"أكملت التدريب على إيماءة الانتقال إلى الشاشة الرئيسية. تعرّف بعد ذلك على كيفية التبديل بين التطبيقات."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"مرِّر سريعًا للانتقال إلى الشاشة الرئيسية"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"مرِّر سريعًا من أسفل الشاشة إلى أعلاها. تنقلك هذه الإيماءة دائمًا إلى الشاشة الرئيسية."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"تأكّد من التمرير سريعًا من الحافة السفلى للشاشة إلى أعلاها."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"حاوِل إبقاء إصبعك على النافذة لمدة أطول قبل رفعه."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"تأكّد من التمرير سريعًا للأعلى مباشرةً ثم التوقّف قليلاً."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"أكملت التدريب على إيماءة التبديل بين التطبيقات. أنت جاهز لاستخدام هاتفك."</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"مرِّر سريعًا للتبديل بين التطبيقات"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"مرِّر سريعًا من أسفل الشاشة إلى أعلاها، وأبقِ إصبعك على الشاشة قليلاً ثم ارفعه."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"اكتمل التدريب على الإيماءة"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"إعادة المحاولة"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"أحسنت"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"الدليل التوجيهي <xliff:g id="CURRENT">%1$d</xliff:g> من إجمالي <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"اكتمال الإعداد"</string>
+    <string name="allset_hint" msgid="459504134589971527">"يمكنك التمرير السريع إلى الأعلى للانتقال إلى الشاشة الرئيسية."</string>
+    <string name="allset_description" msgid="6350320429953234580">"يمكنك الآن بدء استخدام هاتفك."</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"إعدادات التنقل لسهولة الاستخدام"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"مشاركة"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"لقطة شاشة"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"لا يسمح التطبيق أو لا تسمح مؤسستك بهذا الإجراء."</string>
diff --git a/quickstep/res/values-as/strings.xml b/quickstep/res/values-as/strings.xml
index 8c11cddf57..d152abfba0 100644
--- a/quickstep/res/values-as/strings.xml
+++ b/quickstep/res/values-as/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"পূৰ্বানুমান কৰা এপ্: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"আপুনি বাওঁ প্ৰান্তৰৰ একেবাৰে সীমাৰ পৰা ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"আপুনি স্ক্ৰীনৰ বাওঁ প্ৰান্তৰৰ পৰা সোঁ প্ৰান্তৰৰ ফালে মধ্যভাগলৈকে ছোৱাইপ কৰি এৰি দিয়াটো নিশ্চিত কৰক।"</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"ইমানেই! এতিয়া বাওঁ প্ৰান্তৰৰ পৰা ছোৱাইপ কৰি চাওক।"</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"আপুনি সোঁ প্ৰান্তৰৰ একেবাৰে সীমাৰ পৰা ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"আপুনি স্ক্ৰীনৰ সোঁ প্ৰান্তৰৰ পৰা মধ্যভাগলৈকে ছোৱাইপ কৰি এৰি দিয়াটো নিশ্চিত কৰক।"</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"আপুনি উভতি যাওক নিৰ্দেশটো সম্পূৰ্ণ কৰিলে। ইয়াৰ পাছত, গৃহ স্ক্ৰীনলৈ কেনেকৈ যাব সেয়া জানক।"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"আপুনি স্ক্ৰীনৰ তলৰ অংশৰ বেছি ওচৰলৈ ছোৱাইপ নকৰাটো নিশ্চিত কৰক।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"উভতি যোৱাৰ নির্দেশটোৰ সংবেদনশীলতা সলনি কৰিবলৈ ছেটিঙলৈ যাওক"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"উভতি যাবলৈ ছোৱাইপ কৰক"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"অন্তিম স্ক্ৰীনখনলৈ উভতি যাবলৈ বাওঁ অথবা সোঁ প্ৰান্তৰৰ পৰা মাজলৈ ছোৱাইপ কৰক।"</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"আপুনি স্ক্ৰীনৰ তলৰ প্ৰান্তৰ পৰা ওপৰলৈ ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"আপুনি এৰি দিয়াৰ পূৰ্বে অলপো নোৰোৱাটো নিশ্চিত কৰক।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"আপুনি পোনকৈ ওপৰলৈ ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"আপুনি গৃহ স্ক্ৰীনলৈ যোৱাৰ নিৰ্দেশটো সম্পূৰ্ণ কৰিলে। ইয়াৰ পাছত, এপ্‌ কেনেকৈ সলনি কৰিব সেয়া জানক।"</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"গৃহ স্ক্ৰীনলৈ যাবলৈ ছোৱাইপ কৰক"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"আপোনাৰ স্ক্ৰীনৰ তলৰ অংশৰ পৰা ওপৰলৈ ছোৱাইপ কৰক। এই নিৰ্দেশটোৱে আপোনাক সদায় গৃহ স্ক্ৰীনলৈ লৈ যায়।"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"আপুনি স্ক্ৰীনৰ তলৰ প্ৰান্তৰ পৰা ওপৰলৈ ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"এৰি দিয়াৰ পূৰ্বে ৱিণ্ডখন দীৰ্ঘ সময়ৰ বাবে ধৰি ৰাখিবলৈ চেষ্টা কৰক।"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"আপুনি স্ক্ৰীনৰ ওপৰলৈ পোনকৈ ছোৱাইপ কৰি তাৰ পাছত ৰোৱাটো নিশ্চিত কৰক।"</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"আপুনি এপ্‌ সলনি কৰাৰ নিৰ্দেশটো সম্পূৰ্ণ কৰিলে। আপুনি নিজৰ ফ’নটো ব্যৱহাৰ কৰিবলৈ সাজু!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"এপ্‌ সলনি কৰিবলৈ ছোৱাইপ কৰক"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"আপোনাৰ স্ক্ৰীনৰ একেবাৰে তলৰ অংশৰ পৰা ওপৰলৈ ছোৱাইপ কৰি ধৰি ৰাখক আৰু তাৰ পাছত এৰি দিয়ক।"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"সম্পূৰ্ণ সাজু"</string>
diff --git a/quickstep/res/values-az/strings.xml b/quickstep/res/values-az/strings.xml
index 0d8e5b9d62..ad4ad901c5 100644
--- a/quickstep/res/values-az/strings.xml
+++ b/quickstep/res/values-az/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Proqnozlaşdırılan tətbiq: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Ən sol tərəfdən sürüşdürdüyünüzə əmin olun."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Ekranın sol kənarından ortasına sürüşdürüb buraxın."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Bu qədər! İndi isə sağ kənardan sürüşdürün."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Ən sağ tərəfdən sürüşdürdüyünüzə əmin olun."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Ekranın sağ kənarından ortasına sürüşdürüb buraxın."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Geri getmə jestini tamamladınız. Sonra Əsas səhifəyə keçməyi öyrənin."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ekranın altına çox yaxın sürüşdürmədiyinizə əmin olun."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Geri qayıtma jestinin həssaslığını dəyişmək üçün Ayarlara keçin"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Geri qayıtmaq üçün sürüşdürün"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Sonuncu ekrana qayıtmaq üçün ekranın sol, yaxud sağ kənarından mərkəzinə doğru sürüşdürün."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Ekranın aşağı kənarından yuxarı sürüşdürdüyünüzə əmin olun."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Buraxmazdan əvvəl durdurmadığınıza əmin olun."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Birbaşa yuxarı sürüşdürdüyünüzə əmin olun."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Əsas səhifəyə keçmə jestini tamamladınız. Sonra tətbiqləri keçirməyi öyrənin."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Əsas səhifəyə keçmək üçün sürüşdürün"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Ekranın aşağısından yuxarısına sürüşdürün. Bu jest həmişə Əsas səhifəyə aparır."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Ekranın aşağı kənarından yuxarı sürüşdürdüyünüzə əmin olun."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Buraxmadan əvvəl pəncərəni daha uzun müddət saxlamağa çalışın."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Birbaşa yuxarı sürüşdürdüyünüzə, sonra durdurduğunuza əmin olun."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Tətbiqləri keçirmə jestini tamamladınız. Telefonunuzu istifadə etməyə hazırsınız!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Tətbiqi keçirmək üçün sürüşdürün"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Ekranın aşağısından yuxarı doğru sürüşdürüb saxlayın, sonra buraxın."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Tam hazır"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Yenə sınayın"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Əla!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Dərslik <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Hər şey hazırdır!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Əsas səhifəyə keçmək üçün yuxarı çəkin"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Telefondan istifadəyə başlamağa hazırsınız"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Əlçatımlıq üzrə naviqasiya ayarları"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Paylaşın"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Ekran şəkli"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Bu əməliyyata tətbiq və ya təşkilatınız tərəfindən icazə verilmir"</string>
diff --git a/quickstep/res/values-b+sr+Latn/strings.xml b/quickstep/res/values-b+sr+Latn/strings.xml
index 8f3a5555a4..7298d1a1fd 100644
--- a/quickstep/res/values-b+sr+Latn/strings.xml
+++ b/quickstep/res/values-b+sr+Latn/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predviđamo aplikaciju: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Obavezno prevucite od same leve ivice."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Obavezno prevucite od leve ivice do sredine ekrana i otpustite."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"To je sve! Sada probajte da prevučete od desne ivice."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Obavezno prevucite od same desne ivice."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Obavezno prevucite od desne ivice do sredine ekrana i otpustite."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Dovršili ste pokret za povratak. Sada saznajte kako da odete na početnu stranicu."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nikako ne prevlačite previše blizu dna ekrana."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Osetljivost pok. za nazad možete da promenite u Podešavanjima"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Prevucite da biste se vratili"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Da biste se vratili na poslednji ekran, prevucite od leve ili desne ivice do sredine ekrana."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Obavezno prevucite nagore od donje ivice ekrana."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Nikako ne stajte pre otpuštanja."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Obavezno prevucite pravo nagore."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Dovršili ste pokret za povratak na početnu stranicu. Sada saznajte kako da promenite aplikacije."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Prevucite da biste otišli na početnu stranicu"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Prevucite nagore od dna ekrana. Ovaj pokret vas uvek vodi na početni ekran."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Obavezno prevucite nagore od donje ivice ekrana."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Probajte da držite prozor duže pre otpuštanja."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Obavezno prevucite pravo nagore, pa zastanite."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Dovršili ste pokret za promenu aplikacija. Spremni ste za korišćenje telefona!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Prevucite da biste promenili aplikacije"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Prevucite nagore od dna ekrana, zadržite, pa pustite."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"To je to"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Probajte ponovo"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Svaka čast!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Vodič <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Gotovo!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Prevucite nagore da biste otvorili početni ekran"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Spremni ste da počnete da koristite telefon"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Podešavanja navigacije za pristupačnost"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Deli"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Snimak ekrana"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikacija ili organizacija ne dozvoljavaju ovu radnju"</string>
diff --git a/quickstep/res/values-be/strings.xml b/quickstep/res/values-be/strings.xml
index 0473b5fd3b..be617a482b 100644
--- a/quickstep/res/values-be/strings.xml
+++ b/quickstep/res/values-be/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Праграма з падказкі: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Пераканайцеся, што вы не праводзіце пальцам занадта далёка ад левага вугла экрана."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Пераканайцеся, што праводзіце пальцам з левага вугла ў цэнтр экрана, а потым адпускаеце."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Гатова! Цяпер правядзіце пальцам ад правага краю."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Пераканайцеся, што вы не праводзіце пальцам занадта далёка ад правага вугла экрана."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Пераканайцеся, што праводзіце пальцам з правага вугла ў цэнтр экрана, а потым адпускаеце."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Вы навучыліся рабіць жэст вяртання. А зараз даведайцеся, як перайсці на галоўны экран."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Пераканайцеся, што вы не праводзіце пальцам занадта блізка да ніжняга краю экрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Каб змяніць адчувальнасць жэста вяртання, адкрыйце налады"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Правядзіце пальцам, каб вярнуцца"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Каб вярнуцца на папярэдні экран, правядзіце пальцам ад левага ці правага краю да цэнтра экрана."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Пераканайцеся, што праводзіце пальцам па экране знізу ўверх."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Пераканайцеся, што не затрымліваецеся перад адпусканнем."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Пераканайцеся, што праводзіце пальцам вертыкальна."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Вы навучыліся рабіць жэст пераходу на галоўны экран. А зараз даведайцеся, як пераключацца паміж праграмамі."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Правесці пальцам для пераходу на галоўны экран"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Правядзіце пальцам па экране знізу ўверх. Гэты жэст дазваляе вярнуцца на Галоўны экран."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Пераканайцеся, што праводзіце пальцам па экране знізу ўверх."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Перш чым адпусціць палец, паспрабуйце даўжэй утрымліваць акно націснутым."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Пераканайцеся, што праводзіце пальцам вертыкальна, а потым затрымліваеце яго."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Вы навучыліся рабіць жэст пераключэння паміж праграмамі. Цяпер вы можаце выкарыстоўваць тэлефон!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Правесці пальцам для пераключэння паміж праграмамі"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Правядзіце па экране знізу ўверх, утрымліваючы палец націснутым, потым адпусціце."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Гатова"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Паўтарыць спробу"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Выдатна!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Дапаможнік <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Гатова!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Каб перайсці на галоўны экран, правядзіце пальцам уверх"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Вы можаце пачаць карыстанне тэлефонам"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Налады навігацыі для спецыяльных магчымасцей"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Абагуліць"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Здымак экрана"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Гэта дзеянне не дазволена праграмай ці вашай арганізацыяй"</string>
diff --git a/quickstep/res/values-bg/strings.xml b/quickstep/res/values-bg/strings.xml
index f7845e3d68..a5dc2f0a36 100644
--- a/quickstep/res/values-bg/strings.xml
+++ b/quickstep/res/values-bg/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Предвидено приложение: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Трябва да прекарате пръст от най-лявата част на екрана."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Трябва да прекарате пръст от левия край на екрана до средата, след което да вдигнете пръста си."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Това е всичко! Сега прекарайте пръст от десния край."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Трябва да прекарате пръст от най-дясната част на екрана."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Трябва да прекарате пръст от десния край на екрана до средата, след което да вдигнете пръста си."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Изпълнихте жеста за връщане назад. В следващия урок ще научите как се преминава към началния екран."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Не прекарвайте пръст твърде близо до долната част на екрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Променете чувств. на жеста за връщане назад от настройките"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Прекарване на пръст за връщане назад"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"За да се върнете на предишния екран, прекарайте пръст от левия или десния край на екрана до средата."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Трябва да прекарате пръст нагоре от долния край на екрана."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Не задържайте, преди да вдигнете пръста си."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Трябва да прекарате пръст право нагоре."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Изпълнихте жеста за преминаване към началния екран. В следващия урок ще научите как се превключва между приложенията."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Прекарване на пръст за преминаване към началния екран"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Прекарайте пръст нагоре от долната част на екрана. Този жест винаги ще ви отвежда до началния екран."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Трябва да прекарате пръст нагоре от долния край на екрана."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Задръжте прозореца по-дълго, преди да вдигнете пръста си."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Прекарайте пръст право нагоре, след което задръжте."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Изпълнихте жеста за превключване между приложенията. Вече можете да използвате телефона си!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Прекарване на пръст за превключване между приложенията"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Прекарайте пръст нагоре от долната част на екрана, задръжте и след това вдигнете пръста си."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Готово"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Опитайте отново"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Чудесно!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Урок <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Готово!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Прекарайте пръст нагоре, за да отворите началния екран"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Можете да започнете да използвате телефона си"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Настройки за навигиране за достъпността"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Споделяне"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Екранна снимка"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Това действие не е разрешено от приложението или организацията ви"</string>
diff --git a/quickstep/res/values-bn/strings.xml b/quickstep/res/values-bn/strings.xml
index c99f9b0a59..7226c4139d 100644
--- a/quickstep/res/values-bn/strings.xml
+++ b/quickstep/res/values-bn/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"আপনার প্রয়োজন হতে পারে এমন অ্যাপ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"একদম বাঁ প্রান্ত থেকে সোয়াইপ করছেন কিনা ভাল করে দেখে নিন।"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"আপনি বাঁ প্রান্ত থেকে স্ক্রিনের মাঝখান পর্যন্ত সোয়াইপ করছেন ও পরে আঙুল তুলে নিন। এটির খেয়াল রাখুন।"</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"এটুকুই যথেষ্ট! এখন ডান প্রান্ত থেকে সোয়াইপের চেষ্টা করুন।"</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"একদম ডান প্রান্ত থেকে সোয়াইপ করছেন কিনা ভাল করে দেখে নিন।"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"আপনি ডান প্রান্ত থেকে স্ক্রিনের মাঝখান পর্যন্ত সোয়াইপ করছেন ও পরে আঙুল তুলে নিন। এটি খেয়াল রাখুন।"</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"আপনি ফিরে যাওয়ার জেসচার সম্পর্কে জেনেছেন। এরপর, হোম স্ক্রিনে কীভাবে যাবেন জেনে নিন।"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"স্ক্রিনের নিচের প্রান্তের খুব কাছে পর্যন্ত যাতে সোয়াইপ না করেন সেটি ভাল করে দেখে নিন।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ফিরে যাওয়ার জেসচারের সেন্সিটিভিটি পরিবর্তন করতে, সেটিংসে যান"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"ফিরে যেতে সোয়াইপ করুন"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"শেষের স্ক্রিনে ফিরে যেতে, ডান বা বাঁ প্রান্ত থেকে স্ক্রিনের মাঝখান পর্যন্ত সোয়াইপ করুন।"</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"স্ক্রিনের নিচের প্রান্ত থেকে আপনি সোয়াইপ করেছেন কিনা ভাল করে দেখে নিন।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"আঙুল তুলে নেওয়ার আগে আপনি যাতে পজ না করেন সেটি ভাল করে দেখে নিন।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"আপনি উপরের দিকে সোজাসুজি সোয়াইপ করেছেন কিনা ভাল করে দেখে নিন।"</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"আপনি হোম স্ক্রিনে যাওয়ার জেসচার সম্পর্কে জেনেছেন। এরপর, একটি অ্যাপ থেকে অন্য অ্যাপে কীভাবে যাবেন জেনে নিন।"</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"হোম স্ক্রিনে যেতে সোয়াইপ করুন"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"স্ক্রিনের নিচের প্রান্ত থেকে উপরের দিকে সোয়াইপ করুন। এটি করলে, আপনি সবসময় হোম স্ক্রিনে যেতে পারবেন।"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"স্ক্রিনের নিচের প্রান্ত থেকে আপনি সোয়াইপ করেছেন কিনা ভাল করে দেখে নিন।"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"চেষ্টা করুন যাতে আঙুল সরিয়ে নেওয়ার আগে উইন্ডো কিছুক্ষণ প্রেস করে রাখা যায়।"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"আপনি উপরের দিকে সোজাসুজি সোয়াইপ করেছেন কিনা ভাল করে দেখে নিয়ে তারপর পজ করুন।"</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"আপনি একটি অ্যাপ থেকে অন্য অ্যাপে যাওয়ার জেসচার সম্পর্কে জেনেছেন। আপনি এখন আপনার ফোন ব্যবহার করার জন্য প্রস্তুত!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"একটি অ্যাপ থেকে অন্য অ্যাপে যেতে সোয়াইপ করুন"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"স্ক্রিনের নিচ থেকে উপরের দিকে সোয়াইপ করে ধরে থাকুন, তারপর ছেড়ে দিন।"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"সব প্রস্তুত"</string>
diff --git a/quickstep/res/values-bs/strings.xml b/quickstep/res/values-bs/strings.xml
index 15979c174f..23c3d6f842 100644
--- a/quickstep/res/values-bs/strings.xml
+++ b/quickstep/res/values-bs/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predviđena aplikacija: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Obratite pažnju da prevučete s krajnjeg lijevog ruba."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Obratite pažnju da prevučete s lijevog ruba prema sredini ekrana, a zatim pustite."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"To je to! Sada pokušajte prevući s desnog ruba."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Obratite pažnju da prevučete s krajnjeg desnog ruba."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Obratite pažnju da prevučete s desnog ruba prema sredini ekrana, a zatim pustite."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Završili ste pokret za vraćanje. Sljedeće naučite kako otvoriti Početni ekran."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Obratite pažnju da ne prevučete preblizu donjem dijelu ekrana."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Promijenite osjetljivost pokreta za povratak u Postavkama"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Prevucite da se vratite"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Da se vratite na posljednji ekran, prevucite s lijevog ili desnog ruba prema sredini ekrana."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Obratite pažnju da prevučete prema gore s donjeg ruba ekrana."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Obratite pažnju da ne zastanete prije puštanja."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Obratite pažnju da prevučete ravno prema gore."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Završili ste pokret za otvaranje Početnog ekrana. Sljedeće naučite kako prebacivati između aplikacija."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Prevucite da odete na početni ekran"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Prevucite s dna ekrana prema gore. Tim pokretom uvijek idete na Početni ekran."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Obratite pažnju da prevučete prema gore s donjeg ruba ekrana."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Pokušajte zadržati prozor duže prije puštanja."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Obratite pažnju da prevučete ravno prema gore, a zatim zastanite."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Završili ste pokret za prebacivanje između aplikacija. Spremni ste da koristite telefon!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Prevucite da prebacujete između aplikacija"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Prevucite s dna ekrana prema gore, zadržite, a zatim pustite."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Sve je spremno"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Pokušaj ponovo"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Lijepo!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Vodič <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Sve je spremno!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Prevucite prema gore da odete na početnu stranicu"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Sve je spremno da počnete koristiti telefon"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Postavke navigacije za pristupačnost"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Dijeli"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Snimak ekrana"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Ovu radnju ne dozvoljava aplikacija ili vaša organizacija"</string>
diff --git a/quickstep/res/values-ca/strings.xml b/quickstep/res/values-ca/strings.xml
index 795f2e4e89..24677b56c4 100644
--- a/quickstep/res/values-ca/strings.xml
+++ b/quickstep/res/values-ca/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicció d\'aplicació: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Assegura\'t de lliscar des de l\'extrem esquerre de la pantalla."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Assegura\'t de lliscar des de la vora esquerra cap al centre de la pantalla i deixa anar."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Ja està! Ara, prova de lliscar des de la vora dreta."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Assegura\'t de lliscar des de l\'extrem dret de la pantalla."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Assegura\'t de lliscar des de la vora dreta cap al centre de la pantalla i deixa anar."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Has completat el gest per anar enrere. Ara, descobreix com pots anar a la pantalla d\'inici."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Assegura\'t de no lliscar massa a prop de la part inferior de la pantalla."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Per canviar la sensibilitat del gest, ves a Configuració"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Llisca per anar enrere"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Per tornar a la darrera pantalla, llisca des de la vora esquerra o dreta cap al centre de la pantalla."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Assegura\'t de lliscar des de la vora inferior de la pantalla."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Assegura\'t de no aturar-te abans de deixar anar."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Assegura\'t de lliscar directament cap amunt."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Has completat el gest per anar a la pantalla d\'inici. Ara, descobreix com pots canviar d\'aplicació."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Llisca per anar a la pantalla d\'inici"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Llisca cap amunt des de la part inferior de la pantalla. Aquest gest et porta a la pantalla d\'inici."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Assegura\'t de lliscar des de la vora inferior de la pantalla."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Prova de mantenir premuda la finestra durant més temps abans de deixar anar."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Assegura\'t de lliscar directament cap amunt i després aturar-te."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Has completat el gest per canviar d\'aplicació. Ja ho tens tot a punt per utilitzar el telèfon."</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Llisca per canviar d\'aplicació"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Llisca cap amunt des de la part inferior de la pantalla, mantén premut i deixa anar."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Tot a punt"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Torna-ho a provar"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Molt bé!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Tot a punt!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Llisca cap amunt per anar a la pàgina d\'inici"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Ja pots començar a utilitzar el telèfon"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Configuració de navegació per utilitzar les funcions d\'accessibilitat"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Comparteix"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Captura de pantalla"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"L\'aplicació o la teva organització no permeten aquesta acció"</string>
diff --git a/quickstep/res/values-cs/strings.xml b/quickstep/res/values-cs/strings.xml
index b2e222f897..9bf841d2e9 100644
--- a/quickstep/res/values-cs/strings.xml
+++ b/quickstep/res/values-cs/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Předpokládaná aplikace: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Přejeďte prstem z úplného levého okraje obrazovky."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Přejeďte prstem z levého okraje doprostřed obrazovky a zdvihněte prst."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"A je to! Teď zkuste přejet prstem z pravého okraje."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Přejeďte prstem z úplného pravého okraje obrazovky."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Přejeďte prstem z pravého okraje doprostřed obrazovky a zdvihněte prst."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Dokončili jste gesto pro přechod zpět. Teď se naučíme přejít na plochu."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Dejte pozor, abyste prstem nepřejížděli moc blízko ke spodnímu okraji obrazovky."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Citlivost gesta pro přechod zpět můžete změnit v Nastavení"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Přejetím prstem se vrátíte zpět"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"K návratu na poslední obrazovku přejeďte prstem z levého nebo pravého okraje obrazovky doprostřed."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Přejeďte prstem nahoru z dolního okraje obrazovky."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Před zdvihnutím prstu nedělejte pauzu."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Přejeďte prstem přímo nahoru."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Dokončili jste gesto pro přechod na plochu. Teď se naučíme přepínat aplikace."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Přechod na plochu přejetím prstem"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Přejeďte prstem ze spodní části obrazovky nahoru. Tímto gestem se vždy dostanete na plochu."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Přejeďte prstem nahoru z dolního okraje obrazovky."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Zkuste podržet okno delší dobu, než ho uvolníte."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Přejeďte prstem přímo nahoru a pak udělejte pauzu."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Dokončili jste gesto pro přepínání aplikací. Jste připraveni používat telefon."</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Přepínání aplikací přejetím prstem"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Přejeďte prstem nahoru z dolního okraje obrazovky, podržte obrazovku a potom prst uvolněte."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Vše je nastaveno"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Zkusit znovu"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Skvělé!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Výukový program <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Hotovo!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Přejetím nahoru se vrátíte na plochu"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Jste připraveni začít používat telefon"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Nastavení navigace pro usnadnění přístupu"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Sdílet"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Snímek obrazovky"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikace nebo organizace zakazuje tuto akci"</string>
diff --git a/quickstep/res/values-da/strings.xml b/quickstep/res/values-da/strings.xml
index f4519b89c0..d917c76420 100644
--- a/quickstep/res/values-da/strings.xml
+++ b/quickstep/res/values-da/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App, du forventes at skulle bruge: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Stryg fra kanten yderst til venstre."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Stryg fra venstre kant mod midten af skærmen, og løft fingeren."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Det var det. Nu kan du prøve at stryge fra højre kant."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Stryg fra kanten yderst til højre."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Stryg fra højre kant mod midten af skærmen, og løft fingeren."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Du har fuldført bevægelsen for Gå tilbage. Som det næste kan du se, hvordan du går til startskærmen."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Undgå at stryge for tæt på bunden af skærmen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Juster følsomheden for bevægelsen Gå tilbage i Indstillinger"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Stryg for at gå tilbage"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Stryg mod midten af skærmen fra venstre eller højre kant for at gå tilbage til den seneste skærm."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Stryg opad fra bunden af skærmen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Undlad at holde fingeren stille, indtil du løfter fingeren."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Stryg lige opad."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Du har fuldført bevægelsen for Gå til start. Som det næste kan du se, hvordan du skifter app."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Stryg for at gå til startskærmen"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Stryg opad fra bunden af skærmen. Denne bevægelse åbner altid startskærmen."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Stryg opad fra bunden af skærmen."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Prøv at holde fingeren nede på vinduet i længere tid, inden du løfter den."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Stryg lige opad, og hold derefter fingeren stille."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Du har fuldført bevægelsen for Skift app. Du er klar til at bruge din telefon."</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Stryg for at skifte app"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Stryg opad fra bunden af skærmen, hold fingeren stille, og løft den."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Så er du klar"</string>
diff --git a/quickstep/res/values-de/strings.xml b/quickstep/res/values-de/strings.xml
index 3e6345875a..6c00953b3e 100644
--- a/quickstep/res/values-de/strings.xml
+++ b/quickstep/res/values-de/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Vorgeschlagene App: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Wische vom äußersten linken Bildschirmrand."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Wische vom linken Bildschirmrand zur Bildschirmmitte und lass los."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Gut gemacht. Versuch es jetzt mal vom rechten Rand aus."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Wische vom äußersten rechten Bildschirmrand."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Wische vom rechten Bildschirmrand zur Bildschirmmitte und lass los."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Du hast die „Zurück“-Touch-Geste abgeschlossen. Nun lernst du, wie du zum Startbildschirm gelangst."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Wische nicht zu nah am unteren Bildschirmrand."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Du kannst die Empfindlichkeit von „Zurück“ in den Einstellungen ändern"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Zum Zurückgehen wischen"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Wenn du zum letzten Bildschirm zurückgehen möchtest, wische vom linken oder rechten Rand zur Mitte."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Wische vom unteren Bildschirmrand nach oben."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Achte darauf, nicht innezuhalten, bevor du loslässt."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Wische gerade nach oben."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Du hast die „Startbildschirm“-Touch-Geste abgeschlossen. Als Nächstes lernst du, wie du zwischen Apps wechseln kannst."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Zum Startbildschirm gehen"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Wenn du zum Startbildschirm gehen möchtest, wische einfach vom unteren Bildschirmrand nach oben."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Wische vom unteren Bildschirmrand nach oben."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Versuche, das Fenster länger festzuhalten, bevor du es loslässt."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Wische gerade nach oben und halte dann inne."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Du hast die „Apps wechseln“-Touch-Geste abgeschlossen. Nun bist du bereit, dein Smartphone zu verwenden!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Zwischen Apps wechseln"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Wische auf dem Bildschirm von unten nach oben, halte ihn gedrückt und lass ihn dann los."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Fertig"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Wiederholen"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Sehr gut!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Anleitung <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Fertig!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Nach oben wischen, um den Startbildschirm aufzurufen"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Du kannst dein Smartphone jetzt verwenden"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Navigationseinstellungen für mehr Barrierefreiheit"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Teilen"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Die App oder deine Organisation lässt diese Aktion nicht zu"</string>
diff --git a/quickstep/res/values-el/strings.xml b/quickstep/res/values-el/strings.xml
index 0eb9098e40..9757265770 100644
--- a/quickstep/res/values-el/strings.xml
+++ b/quickstep/res/values-el/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Εφαρμογή από πρόβλεψη: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Φροντίστε να σύρετε από το άκρο της αριστερής πλευράς."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Φροντίστε να σύρετε από το αριστερό άκρο προς το μέσο της οθόνης και απομακρύνετε το δάχτυλό σας."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Αυτό ήταν! Δοκιμάστε τώρα να σύρετε από το δεξί άκρο."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Φροντίστε να σύρετε από το άκρο της δεξιάς πλευράς."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Φροντίστε να σύρετε από το δεξί άκρο προς το μέσο της οθόνης και απομακρύνετε το δάχτυλό σας."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Ολοκληρώσατε την κίνηση επιστροφής. Στη συνέχεια, μάθετε πώς να μεταβείτε στην αρχική σελίδα."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Φροντίστε να μην σύρετε υπερβολικά κοντά στο κάτω μέρος της οθόνης."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Μεταβείτε στις Ρυθμίσεις για αλλαγή ευαισθ. κίνησης επιστρ."</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Σύρετε για επιστροφή"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Για να επιστρέψετε στην τελευτ. οθόνη, σύρετε από το αριστ. ή το δεξί άκρο προς το μέσο της οθόνης."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Φροντίστε να σύρετε προς τα επάνω από το κάτω άκρο της οθόνης."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Φροντίστε να μην κάνετε παύση προτού απομακρύνετε τα δάχτυλά σας."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Φροντίστε να σύρετε απευθείας προς τα επάνω."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Ολοκληρώσατε την κίνηση μετάβασης στην αρχική οθόνη. Στη συνέχεια, μάθετε πώς να κάνετε εναλλαγή εφαρμογών."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Σύρετε για μετάβαση στην αρχική οθόνη"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Σύρετε προς τα πάνω από το κάτω μέρος της οθόνης. Αυτή η κίνηση σάς μεταφέρει πάντα στην αρχ. οθόνη."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Φροντίστε να σύρετε προς τα επάνω από το κάτω άκρο της οθόνης."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Δοκιμάστε να κρατήσετε περισσότερο το παράθυρο προτού απελευθερώσετε."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Φροντίστε να σύρετε απευθείας προς τα επάνω και έπειτα κάντε παύση."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Ολοκληρώσατε την κίνηση εναλλαγής εφαρμογών. Είστε έτοιμοι να χρησιμοποιήσετε το τηλέφωνό σας!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Σύρετε για εναλλαγή εφαρμογών"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Σύρετε προς τα πάνω από το κάτω μέρος της οθόνης σας, κρατήστε παρατεταμένα και έπειτα ελευθερώστε."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Όλα είναι έτοιμα"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Δοκιμάστε ξανά"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Ωραία!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Οδηγός <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Όλα έτοιμα!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Σύρετε προς τα επάνω για να μεταβείτε στην αρχική σελίδα"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Είστε έτοιμοι να ξεκινήστε να χρησιμοποιείτε το τηλέφωνό σας"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Ρυθμίσεις πλοήγησης για προσβασιμότητα"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Κοινοποίηση"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Στιγμιότυπο οθόνης"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Αυτή η ενέργεια δεν επιτρέπεται από την εφαρμογή ή τον οργανισμό σας."</string>
diff --git a/quickstep/res/values-en-rAU/strings.xml b/quickstep/res/values-en-rAU/strings.xml
index 5aae288631..c47dc57634 100644
--- a/quickstep/res/values-en-rAU/strings.xml
+++ b/quickstep/res/values-en-rAU/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicted app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Make sure that you swipe from the far-left edge."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Make sure that you swipe from the left edge to the middle of the screen and let go."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"That\'s it! Now try swiping from the right edge."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Make sure that you swipe from the far-right edge."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Make sure that you swipe from the right edge to the middle of the screen and let go."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"You completed the go back gesture. Next up, learn how to go Home."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"To change sensitivity of the back gesture, go to Settings"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Swipe to go back"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"To go back to the last screen, swipe from the left or right edge to the middle of the screen."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Make sure that you don\'t pause before letting go."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Make sure that you swipe straight up."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"You completed the go home gesture. Next up, learn how to switch apps."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Swipe to go home"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Swipe up from the bottom of your screen. This gesture always takes you to the home screen."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Try holding the window for longer before releasing."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Make sure that you swipe straight up, then pause."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"You completed the switch apps gesture. You\'re ready to use your phone!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe to switch apps"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swipe up from the bottom of your screen, hold, then release."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"All set"</string>
diff --git a/quickstep/res/values-en-rCA/strings.xml b/quickstep/res/values-en-rCA/strings.xml
index 5aae288631..c47dc57634 100644
--- a/quickstep/res/values-en-rCA/strings.xml
+++ b/quickstep/res/values-en-rCA/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicted app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Make sure that you swipe from the far-left edge."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Make sure that you swipe from the left edge to the middle of the screen and let go."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"That\'s it! Now try swiping from the right edge."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Make sure that you swipe from the far-right edge."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Make sure that you swipe from the right edge to the middle of the screen and let go."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"You completed the go back gesture. Next up, learn how to go Home."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"To change sensitivity of the back gesture, go to Settings"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Swipe to go back"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"To go back to the last screen, swipe from the left or right edge to the middle of the screen."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Make sure that you don\'t pause before letting go."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Make sure that you swipe straight up."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"You completed the go home gesture. Next up, learn how to switch apps."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Swipe to go home"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Swipe up from the bottom of your screen. This gesture always takes you to the home screen."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Try holding the window for longer before releasing."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Make sure that you swipe straight up, then pause."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"You completed the switch apps gesture. You\'re ready to use your phone!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe to switch apps"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swipe up from the bottom of your screen, hold, then release."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"All set"</string>
diff --git a/quickstep/res/values-en-rGB/strings.xml b/quickstep/res/values-en-rGB/strings.xml
index 5aae288631..c47dc57634 100644
--- a/quickstep/res/values-en-rGB/strings.xml
+++ b/quickstep/res/values-en-rGB/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicted app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Make sure that you swipe from the far-left edge."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Make sure that you swipe from the left edge to the middle of the screen and let go."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"That\'s it! Now try swiping from the right edge."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Make sure that you swipe from the far-right edge."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Make sure that you swipe from the right edge to the middle of the screen and let go."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"You completed the go back gesture. Next up, learn how to go Home."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"To change sensitivity of the back gesture, go to Settings"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Swipe to go back"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"To go back to the last screen, swipe from the left or right edge to the middle of the screen."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Make sure that you don\'t pause before letting go."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Make sure that you swipe straight up."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"You completed the go home gesture. Next up, learn how to switch apps."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Swipe to go home"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Swipe up from the bottom of your screen. This gesture always takes you to the home screen."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Try holding the window for longer before releasing."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Make sure that you swipe straight up, then pause."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"You completed the switch apps gesture. You\'re ready to use your phone!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe to switch apps"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swipe up from the bottom of your screen, hold, then release."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"All set"</string>
diff --git a/quickstep/res/values-en-rIN/strings.xml b/quickstep/res/values-en-rIN/strings.xml
index 5aae288631..c47dc57634 100644
--- a/quickstep/res/values-en-rIN/strings.xml
+++ b/quickstep/res/values-en-rIN/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicted app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Make sure that you swipe from the far-left edge."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Make sure that you swipe from the left edge to the middle of the screen and let go."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"That\'s it! Now try swiping from the right edge."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Make sure that you swipe from the far-right edge."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Make sure that you swipe from the right edge to the middle of the screen and let go."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"You completed the go back gesture. Next up, learn how to go Home."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"To change sensitivity of the back gesture, go to Settings"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Swipe to go back"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"To go back to the last screen, swipe from the left or right edge to the middle of the screen."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Make sure that you don\'t pause before letting go."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Make sure that you swipe straight up."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"You completed the go home gesture. Next up, learn how to switch apps."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Swipe to go home"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Swipe up from the bottom of your screen. This gesture always takes you to the home screen."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Try holding the window for longer before releasing."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Make sure that you swipe straight up, then pause."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"You completed the switch apps gesture. You\'re ready to use your phone!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe to switch apps"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swipe up from the bottom of your screen, hold, then release."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"All set"</string>
diff --git a/quickstep/res/values-en-rXC/strings.xml b/quickstep/res/values-en-rXC/strings.xml
index 4d10fd59f8..ce7dccc7ef 100644
--- a/quickstep/res/values-en-rXC/strings.xml
+++ b/quickstep/res/values-en-rXC/strings.xml
@@ -47,24 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‎‎‏‎‎‏‏‏‎‏‎‏‏‎‎‏‏‏‎‏‏‏‎‎‏‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‎‎‏‏‎Predicted app: ‎‏‎‎‏‏‎<xliff:g id="TITLE">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‏‎‎‎Make sure you swipe from the far-left edge.‎‏‎‎‏‎"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‎‏‎‏‎‏‎‎‎‏‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‎‎‎‎‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‎‎‎‎‏‎‎Make sure you swipe from the left edge to the middle of the screen and let go.‎‏‎‎‏‎"</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‏‎‎‎‏‏‏‎‏‎‏‏‎‏‏‎‏‏‏‏‎‏‎‏‏‏‎‎‎‎‏‏‎‏‎‎That\'s it! Now try swiping from the right edge.‎‏‎‎‏‎"</string>
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‏‏‎‎‏‏‎Nice! Now swipe from the right to go back‎‏‎‎‏‎"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‎‎‎‎‏‏‎‏‎‎‎‏‏‎‎‎‎‎‏‏‎‏‎‎‎‎‎‏‎‏‎‎‎‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‏‏‎‎You can also go back to the last screen by swiping from the right edge to the middle of the screen.‎‏‎‎‏‎"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‏‏‏‏‎‎‎‏‏‎‏‏‎‏‎‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‎‏‎‏‎‎‏‎‎‏‎‏‎‎‎‎‏‎Make sure you swipe from the far-right edge.‎‏‎‎‏‎"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‎‎‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‎‎Make sure you swipe from the right edge to the middle of the screen and let go.‎‏‎‎‏‎"</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‏‎‏‎‎‎‎‏‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‎‏‏‏‎‎‏‎‎You completed the go back gesture. Next up, learn how to go Home.‎‏‎‎‏‎"</string>
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‏‎‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‎‎‎You completed the go back gesture. Next up, learn how to switch apps.‎‏‎‎‏‎"</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‏‎‏‎‏‏‏‎‎‎‎‎‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‏‏‎‏‏‎‎‏‏‎‎You completed the go back gesture.‎‏‎‎‏‎"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‏‎‎‎‎‏‎‎‎‏‎‏‎‎‏‎‎‏‎‎‏‎‏‏‎‎‏‎‎‎‎‏‎‏‏‎Make sure you don\'t swipe too close to the bottom of the screen.‎‏‎‎‏‎"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‎‏‏‏‎‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‏‎‎‏‏‏‏‏‎‎‏‎‎‎‏‎‎To change the sensitivity of the back gesture, go to Settings‎‏‎‎‏‎"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‎‏‏‏‎‏‎‏‏‏‎‎‎‎‏‏‏‎‎‏‏‏‏‎‎‏‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎‎Swipe to go back‎‏‎‎‏‎"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‏‏‏‎‎‎‏‏‏‏‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‎‏‎‎‏‏‏‎‎‎‎‏‏‎‎‎‏‏‏‎‏‎‏‏‎‏‎To go back to the last screen, swipe from the left or right edge to the middle of the screen.‎‏‎‎‏‎"</string>
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‎‏‎‎‎‏‎‎‎‎‎‎‏‏‏‎‏‏‏‎‏‏‎‏‎‎‎‎Swipe from the left to go back‎‏‎‎‏‎"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‎‎‏‎‏‎‎‎‏‎‏‏‏‎‏‎‎‏‏‏‏‏‏‏‎‎‎To go back to the last screen you were on, swipe from the left edge to the middle of the screen.‎‏‎‎‏‎"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‏‎‏‏‎‏‎‎‏‎‎Make sure you swipe up from the bottom edge of the screen.‎‏‎‎‏‎"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‏‎‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‎‏‏‏‎‏‎‏‎Make sure you don\'t pause before letting go.‎‏‎‎‏‎"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‎‏‏‏‎‏‎‎‏‎‎‏‏‎‏‎‎‏‎‎‏‏‏‏‎‎‎‎‏‎‏‏‏‏‎‎Make sure you swipe straight up.‎‏‎‎‏‎"</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‎‎‎‏‏‎‏‎‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‏‎‏‎‎‏‏‎‏‏‎‏‎‎‎‏‎‏‎‎‎‏‏‏‎‏‎You completed the go Home gesture. Next up, learn how to switch apps.‎‏‎‎‏‎"</string>
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‎‎‎‎‏‏‎‏‎‎‏‎‎‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‏‎‏‎‎You completed the go Home gesture. Next up, learn how to go back.‎‏‎‎‏‎"</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‏‎‏‎‏‎‏‎‏‏‎‎‏‎‏‏‏‎‎‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‎‏‏‏‏‏‎‏‎‎You completed the go Home gesture.‎‏‎‎‏‎"</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‏‏‏‎‎‎‎‏‎‏‎‏‎‎‏‏‏‎‏‎‏‎‎‎‎‎‏‎‎‎‏‏‏‎‏‎‏‏‏‎‏‏‎‎‎‎‏‏‎‎‏‏‎‎Swipe to go home‎‏‎‎‏‎"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‎‏‎‏‏‏‎‎‏‏‎‎‏‎‎‎‎‏‎‎‎‎‎‎‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‏‏‏‏‎‎Swipe up from the bottom of your screen. This gesture always takes you to the Home screen.‎‏‎‎‏‎"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎‎‏‎‏‎‎‏‏‏‏‎‏‎‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‎‏‏‎‏‏‎‎‏‎‎‎‏‎‎‏‎Make sure you swipe up from the bottom edge of the screen.‎‏‎‎‏‎"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‏‎‏‎‏‎‏‎‏‏‎‎‎‎‎‏‎‎‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‏‎‏‎‎‎‏‎‎‏‎Try holding the window for longer before releasing.‎‏‎‎‏‎"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎‏‏‎‏‏‏‎‏‎‏‎‎‎‎‏‏‏‎‎‎‏‎‏‎‎‏‏‏‎‎‏‎‏‏‎‎‎‏‎‏‎‎‎‎‎‎‏‎‏‎‏‎Make sure you swipe straight up, then pause.‎‏‎‎‏‎"</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‎‏‎‏‎‎‏‎‏‏‎‎‎‏‏‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‎You completed the switch apps gesture. You\'re ready to use your phone!‎‏‎‎‏‎"</string>
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‎‎‎‎‎‏‎‎‏‏‎‎‏‏‎‎‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‎You learned how to use gestures. To turn off gestures, go to Settings.‎‏‎‎‏‎"</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‎‏‏‎‏‏‎‏‏‎‏‏‏‏‎‎‎‎‎‎‎‎‎‏‏‏‎‎‎‏‎‎‏‏‎‏‏‏‎‎‎‏‏‏‎‎‎‏‎‎‎‎‎You completed the switch apps gesture.‎‏‎‎‏‎"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‎‎‏‏‎‎‎‏‎‏‎‏‏‎‎‎‏‏‏‎‎‏‏‎‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎‏‎‎‎‎‏‎‏‎‎‎‏‎‎Swipe to switch apps‎‏‎‎‏‎"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‎‏‎‏‏‏‎‎‏‎‎‏‎‏‎‎‎‎‏‎‎‏‏‏‎‎‏‏‏‏‏‎‎‎‎‏‏‏‎‎‏‏‏‎‏‏‏‏‏‏‎‏‎‎Swipe up from the bottom of your screen, hold, then release.‎‏‎‎‏‎"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‎‎‎‏‏‏‎‎‎‏‎‎‏‎‏‏‎‏‎‏‎‏‎‏‏‏‎‏‎‏‏‏‎‏‏‎‏‏‎‎‎All set‎‏‎‎‏‎"</string>
diff --git a/quickstep/res/values-es-rUS/strings.xml b/quickstep/res/values-es-rUS/strings.xml
index 10f4479351..1b55b2dddd 100644
--- a/quickstep/res/values-es-rUS/strings.xml
+++ b/quickstep/res/values-es-rUS/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicción de app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Asegúrate de deslizar el dedo bien desde el borde izquierdo."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Asegúrate de deslizar el dedo del borde izquierdo hacia el centro de la pantalla y, luego, suéltalo."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Eso es todo. Ahora desliza el dedo desde el borde derecho."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Asegúrate de deslizar el dedo bien desde el borde derecho."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Asegúrate de deslizar el dedo del borde derecho hacia el centro de la pantalla y, luego, suéltalo."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Completaste el gesto \"Atrás\". A continuación, obtén información para ir a la página principal."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Asegúrate de no hacerlo muy cerca de la parte inferior de la pantalla."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Cambia sensibilidad de gesto \"Atrás\" en Configuración"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Desliza el dedo para volver"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Desliza el dedo desde el borde derecho o izquierdo para volver a la última pantalla."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Asegúrate de deslizar el dedo hacia arriba desde la borde inferior de la pantalla."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Asegúrate de no detenerte antes de soltarlo."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Asegúrate de deslizar el dedo derecho hacia arriba."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Completaste el gesto para ir a la página principal. A continuación, obtén información para cambiar de app."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Desliza el dedo para ir a la página principal"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Desliza el dedo hacia arriba desde la parte inferior de la pantalla. Este gesto te llevará siempre a la pantalla principal."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Asegúrate de deslizar el dedo hacia arriba desde la borde inferior de la pantalla."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Prueba mantener presionada la ventana más tiempo antes de soltarla."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Asegúrate de deslizar el dedo derecho hacia arriba y, luego, detente."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Completaste el gesto para cambiar de app. El teléfono ya está listo para usar."</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Desliza el dedo para cambiar de app"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Desliza el dedo hacia arriba desde la parte inferior de la pantalla, mantenlo presionado y, luego, suéltalo."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Listo"</string>
diff --git a/quickstep/res/values-es/strings.xml b/quickstep/res/values-es/strings.xml
index 46bd267290..f803990ca4 100644
--- a/quickstep/res/values-es/strings.xml
+++ b/quickstep/res/values-es/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplicación sugerida: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Desliza el dedo desde el extremo izquierdo."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Desliza el dedo desde el borde izquierdo de la pantalla hasta el centro y levántalo."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Eso es todo. Ahora desliza el dedo desde el borde derecho."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Desliza el dedo desde el extremo derecho."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Desliza el dedo desde el borde derecho de la pantalla hasta el centro y levántalo."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Has completado el gesto para volver. Ahora, descubre cómo ir a la pantalla de inicio."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"No deslices el dedo demasiado cerca de la parte inferior de la pantalla."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Para cambiar la sensibilidad del gesto, ve a Ajustes"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Desliza el dedo para volver"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Para volver a la última pantalla, desliza el dedo desde un lateral de la pantalla hasta el centro."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Desliza el dedo hacia arriba desde el borde inferior de la pantalla."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"No hagas ninguna pausa antes de levantar el dedo."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Desliza el dedo directamente hacia arriba."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Has completado el gesto para ir a la pantalla de inicio. Ahora, descubre cómo cambiar de aplicación."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Desliza el dedo para ir a la pantalla de inicio"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Desliza hacia arriba desde la parte inferior. Con este gesto, siempre irás a la pantalla de inicio."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Desliza el dedo hacia arriba desde el borde inferior de la pantalla."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Prueba a mantener pulsada la ventana durante más tiempo antes de soltarla."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Desliza el dedo directamente hacia arriba y luego mantenlo pulsado."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Has completado el gesto para cambiar de aplicación. Ya puedes usar el teléfono."</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Deslizar el dedo para cambiar de aplicación"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Desliza el dedo hacia arriba desde la parte inferior de la pantalla, mantenlo pulsado y levántalo."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Todo listo"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Reintentar"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"¡Muy bien!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"¡Ya está!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Desliza el dedo hacia arriba para ir a la pantalla de inicio"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Ya puedes empezar a usar tu teléfono"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Ajustes de navegación para accesibilidad"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Compartir"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Hacer captura"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"No puedes hacerlo porque la aplicación o tu organización no lo permiten"</string>
diff --git a/quickstep/res/values-et/strings.xml b/quickstep/res/values-et/strings.xml
index b059585f25..28dcdca0cb 100644
--- a/quickstep/res/values-et/strings.xml
+++ b/quickstep/res/values-et/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Ennustatud rakendus: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pühkige kindlasti vasakpoolsest servast."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pühkige ekraanikuva vasakust servast keskele ja eemaldage sõrm."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Ongi kõik! Nüüd proovige paremast servast pühkida."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pühkige kindlasti parempoolsest servast."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pühkige ekraanikuva paremast servast keskele ja eemaldage sõrm."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Tegite tagasiliikumise liigutuse. Järgmisena vaadake, kuidas minna avakuvale."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Veenduge, et te ei pühiks liiga ekraanikuva allosa lähedalt."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Tagasiliigutuse tundlikkuse muutmiseks avage menüü Seaded"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Tagasiliikumiseks pühkige"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Eelmisele ekraanikuvale naasmiseks pühkige vasakust või paremast servast ekraanikuva keskele."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pühkige kindlasti ekraanikuva alumisest servast üles."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Veenduge, et te enne vabastamist liigutust ei peataks."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pühkige kindlasti otse üles."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Tegite avakuvale minemise liigutuse. Järgmisena vaadake, kuidas rakenduste vahel vahetada."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Pühkimine avakuvale minemiseks"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Pühkige ekraani alaosast üles. See liigutus viib teid alati tagasi avakuvale."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Pühkige kindlasti ekraanikuva alumisest servast üles."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Hoidke sõrme aknal pisut kauem, enne kui vabastate."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Pühkige kindlasti otse üles, seejärel peatuge."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Tegite rakenduste vahel vahetamise liigutuse. Olete oma telefoni kasutamiseks valmis!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Rakenduste vahel vahetamiseks pühkimine"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Pühkige ekraanikuva alaosast üles, hoidke ja seejärel vabastage."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Valmis"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Proovige uuesti"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Tubli töö!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Õpetus <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Valmis!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Avalehele liikumiseks pühkige üles"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Olete valmis oma telefoni kasutama"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Juurdepääsetavuse navigeerimisseaded"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Jaga"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Ekraanipilt"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Rakendus või teie organisatsioon on selle toimingu keelanud"</string>
diff --git a/quickstep/res/values-eu/strings.xml b/quickstep/res/values-eu/strings.xml
index 10232a4dd1..a8ae3848c0 100644
--- a/quickstep/res/values-eu/strings.xml
+++ b/quickstep/res/values-eu/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Iragarritako aplikazioa: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Ziurtatu hatza ezkerreko ertzetik pasatzen duzula."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Ziurtatu hatza pantailaren ezkerreko ertzetik erdialdera pasatzen eta askatzen duzula."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Hori da. Orain, pasatu hatza eskuineko ertzetik."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Ziurtatu hatza eskuineko ertzetik pasatzen duzula."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Ziurtatu hatza pantailaren eskuineko ertzetik erdialdera pasatzen eta askatzen duzula."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Ikasi duzu atzera egiteko keinua. Jarraian, ikasi hasierako pantailara joaten."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ziurtatu hatza ez duzula pantailaren behealdetik gertuegi pasatzen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Keinuaren sentikortasuna aldatzeko, joan ezarpenetara"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Pasatu hatza atzera egiteko"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Aurreko pantailara itzultzeko, pasatu hatza pantailaren ezkerreko edo eskuineko ertzetik erdialdera."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Ziurtatu hatza pantailaren beheko ertzetik gora pasatzen duzula."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Ziurtatu askatu aurretik ez duzula hatza gelditzen."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Ziurtatu hatza zuzen gora pasatzen duzula."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Ikasi duzu hasierako pantailara joateko keinua. Jarraian, ikasi aplikazioa aldatzen."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Pasatu hatza hasierako pantailara joateko"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Pasatu hatza pantailaren behealdetik gora. Keinu horrek hasierako pantailara eramango zaitu beti."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Ziurtatu hatza pantailaren beheko ertzetik gora pasatzen duzula."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Eduki sakatuta leihoa luzaroago hatza altxatu aurretik."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Ziurtatu hatza zuzen gora pasatzen duzula; ondoren, gelditu."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Ikasi duzu aplikazioa aldatzeko keinua. Prest zaude telefonoa erabiltzeko."</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Pasatu hatza aplikazioa aldatzeko"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Pasatu hatza pantailaren behealdetik gora, eduki pantaila sakatuta eta altxatu hatza."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Dena prest"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Saiatu berriro"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Ederki!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutoriala: <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Dena prest!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Pasatu hatza gora hasierako pantailara joateko"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Prest zaude telefonoa erabiltzen hasteko"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Erabilerraztasunerako nabigazio-ezarpenak"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Partekatu"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Atera pantaila-argazki bat"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikazioak edo erakundeak ez du eman ekintza hori gauzatzeko baimena"</string>
diff --git a/quickstep/res/values-fa/strings.xml b/quickstep/res/values-fa/strings.xml
index bd8f3b8888..670ca2e3c0 100644
--- a/quickstep/res/values-fa/strings.xml
+++ b/quickstep/res/values-fa/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"برنامه پیش‌بینی‌شده: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"دقت کنید که از ابتدای لبه سمت چپ تند بکشید."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"دقت کنید که از لبه سمت چپ تند به وسط صفحه بکشید و رها کنید."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"تمام شد! اکنون از لبه سمت راست تند بکشید."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"دقت کنید که از ابتدای لبه سمت راست تند بکشید."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"دقت کنید که از لبه سمت راست تند به وسط صفحه بکشید و رها کنید."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"اشاره برگشتن را تکمیل کردید. مورد بعدی، با نحوه رفتن به «صفحه اصلی» آشنا شوید."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"دقت کنید که موقع تند کشیدن بیش‌از حد به پایین صفحه نزدیک نشوید."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"برای تغییر حساسیت اشاره برگشت، به «تنظیمات» بروید"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"تند بکشید تا به‌عقب برگردید"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"برای برگشتن به صفحه آخر، از لبه سمت چپ یا راست تند به وسط صفحه بکشید."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"دقت کنید که از لبه پایینی صفحه تند به بالا بکشید."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"دقت کنید که تا قبل‌از رها کردن، کشیدن را متوقف نکنید."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"دقت کنید که مستقیماً تند به بالا بکشید."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"اشاره رفتن به «صفحه اصلی» را تکمیل کردید. مورد بعدی، با نحوه جابه‌جا شدن بین برنامه‌ها آشنا شوید."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"تند کشیدن برای رفتن به صفحه اصلی"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"از پایین صفحه، تند به‌سمت بالا بکشید. این اشاره همیشه شما را به صفحه اصلی می‌برد."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"دقت کنید که از لبه پایینی صفحه تند به بالا بکشید."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"سعی کنید قبل‌از رها کردن، پنجره را برای مدت طولانی‌تری نگه دارید."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"دقت کنید که مستقیماً تند به بالا بکشید و سپس توقف کنید."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"اشاره جابه‌جا شدن بین برنامه‌ها را تکمیل کردید. آماده‌اید از تلفنتان استفاده کنید!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"تند کشیدن برای جابه‌جا شدن بین برنامه‌ها"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"از پایین صفحه‌نمایش تند به‌سمت بالا بکشید، نگه دارید، و سپس رها کنید."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"همه چیز آماده است"</string>
diff --git a/quickstep/res/values-fi/strings.xml b/quickstep/res/values-fi/strings.xml
index d75d7a3164..c70e0c6957 100644
--- a/quickstep/res/values-fi/strings.xml
+++ b/quickstep/res/values-fi/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Ennakoitu sovellus: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Muista pyyhkäistä aivan vasemmasta reunasta."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pyyhkäise näytön vasemmasta reunasta keskelle ja päästä irti."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Valmista tuli! Kokeile nyt pyyhkäistä oikeasta reunasta."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Muista pyyhkäistä aivan oikeasta reunasta."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pyyhkäise näytön oikeasta reunasta keskelle ja päästä irti."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Olet oppinut Takaisin-eleen. Opettele seuraavaksi siirtymään aloitusnäytölle."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Varo, ettet pyyhkäise liian lähellä alareunaa."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Voit muuttaa Takaisin-eleen herkkyyttä asetuksista"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Siirry takaisin pyyhkäisemällä"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Voit palata edelliseen näkymään pyyhkäisemällä näytön vasemmasta tai oikeasta reunasta keskelle."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pyyhkäise ylös näytön alareunasta."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Varo keskeyttämästä ennen kuin päästät irti."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Muista pyyhkäistä suoraan ylöspäin."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Olet oppinut aloitusnäytölle palaamiseleen. Opettele seuraavaksi vaihtamaan sovellusta."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Siirry aloitusnäytölle pyyhkäisemällä"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Pyyhkäise ylös näytön alareunasta. Tämä ele vie sinut aina aloitusnäytölle."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Pyyhkäise ylös näytön alareunasta."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Kokeile pitää ikkunaa painettuna pidempään ennen kuin päästät irti."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Muista pyyhkäistä suoraan ylöspäin ja keskeytä sitten."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Olet oppinut sovellusten vaihtamiseleen. Olet valmis käyttämään puhelintasi."</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Vaihda sovellusta pyyhkäisemällä"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Pyyhkäise ylöspäin näytön alareunasta ja päästä irti."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Valmista"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Yritä uudelleen"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Hienoa!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Ohje <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Valmis"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Siirry aloitusnäytölle pyyhkäisemällä ylös"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Olet valmis aloittamaan puhelimen käytön"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Siirtymisasetukset esteettömyyttä varten"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Jaa"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Kuvakaappaus"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Sovellus tai organisaatio ei salli tätä toimintoa"</string>
diff --git a/quickstep/res/values-fr-rCA/strings.xml b/quickstep/res/values-fr-rCA/strings.xml
index 59ef61ad6b..b4375df6b7 100644
--- a/quickstep/res/values-fr-rCA/strings.xml
+++ b/quickstep/res/values-fr-rCA/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Application prédite : <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Assurez-vous de balayer l\'écran à partir de l\'extrémité gauche."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Assurez-vous de balayer l\'écran de l\'extrémité gauche jusqu\'au centre, puis de lever le doigt."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"C\'est tout! Maintenant, essayez à partir de la droite."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Assurez-vous de balayer l\'écran à partir de l\'extrémité droite."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Assurez-vous de balayer l\'écran de l\'extrémité droite jusqu\'au centre, puis de lever le doigt."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Vous avez terminé le geste de retour. Ensuite, vous apprendrez comment revenir à l\'écran d\'accueil."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Assurez-vous de ne pas balayer trop près du bas de l\'écran."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Modifiez la sensibilité du geste de retour dans Paramètres"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Balayez l\'écran pour revenir en arrière"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Pour revenir à l\'écran précédent, balayez l\'écran de l\'extrémité gauche ou droite vers le centre"</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Assurez-vous de balayer l\'écran à partir de l\'extrémité inférieure vers le haut."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Assurez-vous de ne pas interrompre le geste avant de lever le doigt."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Assurez-vous de balayer l\'écran en ligne droite vers le haut."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Vous avez terminé le geste de retour à l\'écran d\'accueil. Ensuite, vous apprendrez comment basculer entre les applications."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Balayer pour revenir à l\'écran d\'accueil"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Balayez l\'écran du bas vers le haut. Ce geste vous ramène toujours à l\'écran d\'accueil."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Assurez-vous de balayer l\'écran à partir de l\'extrémité inférieure vers le haut."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Essayez de tenir la fenêtre plus longtemps avant de relâcher."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Assurez-vous de balayer l\'écran vers le haut, puis de faire une pause."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Vous avez terminé le geste de basculement entre les applications. Vous êtes prêt à utiliser votre téléphone!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Balayer pour basculer entre les applications"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Balayez l\'écran de bas en haut, maintenez le doigt en place, puis relâchez-le."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Terminé"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Réessayer"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bien!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Étape <xliff:g id="CURRENT">%1$d</xliff:g> sur <xliff:g id="TOTAL">%2$d</xliff:g> du tutoriel"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Tout est prêt!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Balayez l\'écran vers le haut pour accéder à l\'écran d\'accueil"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Vous êtes maintenant prêt à utiliser votre téléphone"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Paramètres de navigation pour les options d\'accessibilité"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Partager"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Capture d\'écran"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"L\'application ou votre organisation n\'autorise pas cette action"</string>
diff --git a/quickstep/res/values-fr/strings.xml b/quickstep/res/values-fr/strings.xml
index 394b7cdbc6..c00e02cc5b 100644
--- a/quickstep/res/values-fr/strings.xml
+++ b/quickstep/res/values-fr/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Application prédite : <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Veillez à balayer l\'écran depuis le bord gauche."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Veillez à bien balayer l\'écran depuis le bord gauche jusqu\'au centre avant de relever le doigt."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Et voilà ! Balayez maintenant l\'écran depuis le côté droit."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Veillez à balayer l\'écran depuis le bord droit."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Veillez à bien balayer l\'écran depuis le bord droit jusqu\'au centre avant de relever le doigt."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Vous avez appris le geste pour revenir en arrière. Apprenez ensuite à revenir à l\'écran d\'accueil."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Veillez à ne pas balayer l\'écran trop près du bas."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Modifiez la sensibilité du geste retour dans les paramètres"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Balayez l\'écran pour revenir en arrière"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Pour revenir à l\'écran précédent, balayez l\'écran depuis le bord droit ou gauche jusqu\'au centre."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Veillez à balayer l\'écran du bas vers le haut."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Veillez à ne pas marquer de pause dans votre geste avant de relever le doigt."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Veillez à balayer l\'écran vers le haut."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Vous avez appris le geste pour revenir à l\'écran d\'accueil. Apprenez ensuite à passer d\'une appli à l\'autre."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Balayer pour revenir à l\'écran d\'accueil"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Balayez l\'écran de bas en haut. Ce geste vous ramènera toujours à l\'écran d\'accueil."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Veillez à balayer l\'écran du bas vers le haut."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Essayez d\'appuyer plus longtemps sur la fenêtre avant de relever le doigt."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Veillez à balayer l\'écran vers le haut et à marquer une pause dans votre geste."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Vous avez appris le geste pour passer d\'une appli à l\'autre. Vous êtes prêt à utiliser votre téléphone."</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Balayer pour passer d\'une appli à l\'autre"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Balayez l\'écran du bas vers le haut, appuyez de manière prolongée, puis relevez le doigt."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Vous avez terminé"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Réessayez"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bravo !"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutoriel <xliff:g id="CURRENT">%1$d</xliff:g> sur <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Tout est prêt !"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Balayez l\'écran vers le haut pour revenir à l\'accueil"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Vous êtes prêt à utiliser votre téléphone"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Paramètres de navigation pour l\'accessibilité"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Partager"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Capture d\'écran"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Cette action n\'est pas autorisée par l\'application ou par votre organisation"</string>
diff --git a/quickstep/res/values-gl/strings.xml b/quickstep/res/values-gl/strings.xml
index f7e3058fbf..31c2c330e3 100644
--- a/quickstep/res/values-gl/strings.xml
+++ b/quickstep/res/values-gl/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplicación predita: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Asegúrate de pasar o dedo desde o bordo esquerdo máis afastado."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Asegúrate de pasar o dedo desde o bordo esquerdo ata o medio da pantalla e avanza."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Xa está! Proba a pasar o dedo desde o bordo dereito."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Asegúrate de pasar o dedo desde o bordo dereito máis afastado."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Asegúrate de pasar o dedo desde o bordo dereito ata o medio da pantalla e avanza."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Completaches o xesto de volver. O próximo é aprender a ir ao inicio."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Asegúrate de non pasar o dedo demasiado preto da parte inferior da pantalla."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Podes cambiar a sensibilidade do xesto en Configuración"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Pasar o dedo para volver"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Para volver á última pantalla, pasa o dedo cara ao medio desde o bordo dereito ou esquerdo."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Asegúrate de pasar o dedo cara arriba desde o bordo inferior da pantalla."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Asegúrate de non facer unha pausa antes de avanzar."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Asegúrate de pasar o dedo cara arriba cun movemento vertical."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Completaches o xesto de ir ao inicio. O próximo é aprender a cambiar de aplicación."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Pasar o dedo para ir ao inicio"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Pasa o dedo cara arriba desde a parte inferior da pantalla. Ao facelo, irás á pantalla de inicio."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Asegúrate de pasar o dedo cara arriba desde o bordo inferior da pantalla."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Proba a manter premida a pantalla máis tempo antes de soltala."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Asegúrate de pasar o dedo cara arriba cun movemento vertical. Despois, fai unha pausa."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Completaches o xesto para cambiar de aplicación. Xa podes usar o teléfono!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Pasar o dedo para cambiar de aplicación"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Pasa o dedo cara arriba desde a parte inferior da pantalla, mantena premida e sepárao."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Todo listo"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Téntao de novo"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Excelente!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Titorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Todo listo"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Pasa o dedo cara arriba para ir á pantalla de inicio"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Todo está listo para comezar a utilizar o teléfono"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Configuración da navegación para a accesibilidade"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Compartir"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Facer captura"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"A aplicación ou a túa organización non permite realizar esta acción"</string>
diff --git a/quickstep/res/values-gu/strings.xml b/quickstep/res/values-gu/strings.xml
index 62aa28e3cb..a35abda3cf 100644
--- a/quickstep/res/values-gu/strings.xml
+++ b/quickstep/res/values-gu/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"પૂર્વાનુમાનિત ઍપ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ખાતરી કરો કે તમે એકદમ દૂરની ડાબી કિનારીએથી સ્વાઇપ કરો છો."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ખાતરી કરો કે તમે ડાબી કિનારીએથી સ્ક્રીનના મધ્ય ભાગ સુધી સ્વાઇપ કરો છે અને આંગળી ઊંચકી લો છો."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"બસ થઈ ગયું! હવે જમણી કિનારીએથી સ્વાઇપ કરવાનો પ્રયાસ કરો."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ખાતરી કરો કે તમે એકદમ દૂરની જમણી કિનારીએથી સ્વાઇપ કરો છો."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ખાતરી કરો કે તમે જમણી કિનારીએથી સ્ક્રીનના મધ્ય ભાગ સુધી સ્વાઇપ કરો છે અને આંગળી ઊંચકી લો છો."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"તમે પાછા જવાનો સંકેત પૂર્ણ કર્યો છે. હવે પછી, હોમ સ્ક્રીન પર જવાની રીત વિશે જાણો."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ખાતરી કરો કે તમારાથી સ્ક્રીનની એકદમ નીચેની કિનારીની ખૂબ નજીક સુધી સ્વાઇપ ન થઈ જાય."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"પાછા જવાના સંકેતની સંવેદિતા બદલવા માટે, સેટિંગમાં જાઓ"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"પાછળ જવા માટે સ્વાઇપ કરો"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"છેલ્લી સ્ક્રીન પર પાછા જવા, ડાબી કે જમણી કિનારીએથી સ્ક્રીનના મધ્ય ભાગ સુધી સ્વાઇપ કરો."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ખાતરી કરો કે તમે સ્ક્રીનની નીચેની કિનારીએથી ઉપરની તરફ સ્વાઇપ કરો છો."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ખાતરી કરો કે તમે આંગળી ઊંચકી લેતા પહેલાં સ્વાઇપ કરવાનું થોભાવતા નથી."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ખાતરી કરો કે તમે સીધું ઉપરની તરફ સ્વાઇપ કરો છો."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"તમે હોમ સ્ક્રીન પર પાછા જવાનો સંકેત પૂર્ણ કર્યો છે. હવે પછી, ઍપ સ્વિચ કરવાની રીત વિશે જાણો."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"હોમ સ્ક્રીન પર જવા માટે સ્વાઇપ કરો"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"તમારી સ્ક્રીનના નીચેના ભાગથી ઉપરની તરફ સ્વાઇપ કરો. આ સંકેત તમને હંમેશાં હોમ સ્ક્રીન પર લઈ જાય છે."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ખાતરી કરો કે તમે સ્ક્રીનની નીચેની કિનારીએથી ઉપરની તરફ સ્વાઇપ કરો છો."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"તમારી આંગળી ઊંચકતા પહેલાં તેને વિન્ડો પર થોડી વધારે વાર માટે દબાવી રાખવાનો પ્રયાસ કરો."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"ખાતરી કરો કે તમે સીધું ઉપર સ્વાઇપ કરો છો, પછી થોભી જાઓ છો."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"તમે ઍપ સ્વિચ કરવાનો સંકેત પૂર્ણ કર્યો છે. તમે તમારા ફોનનો ઉપયોગ કરવા માટે તૈયાર છો!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ઍપ સ્વિચ કરવા સ્વાઇપ કરો"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"તમારી સ્ક્રીનના નીચેના ભાગથી ઉપરની તરફ સ્વાઇપ કરીને, થોડીવાર દબાવી રાખો, પછી છોડી દો."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"બધું સેટ થઈ ગયું"</string>
diff --git a/quickstep/res/values-hi/strings.xml b/quickstep/res/values-hi/strings.xml
index a39faf01d8..133c200ee8 100644
--- a/quickstep/res/values-hi/strings.xml
+++ b/quickstep/res/values-hi/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"सुझाया गया ऐप्लिकेशन: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"देख लें कि आप स्क्रीन की बाईं तरफ़ के बिल्कुल किनारे से स्वाइप कर रहे हों."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"देख लें कि आप स्क्रीन के बाएं किनारे से बीचों-बीच तक स्वाइप कर रहे हों और फिर अपनी उंगली उठा लें."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"हो गया! अब, दाएं किनारे से स्वाइप करने की कोशिश करें."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"देख लें कि आप स्क्रीन की दाईं तरफ़ के बिल्कुल किनारे से स्वाइप कर रहे हों."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"देख लें कि आप स्क्रीन के दाएं किनारे से बीचों-बीच तक स्वाइप कर रहे हों और फिर अपनी उंगली उठा लें."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"आपने पीछे जाने के लिए इस्तेमाल होने वाले हाथ के जेस्चर (हाव-भाव) के बारे में जान लिया है. अब, होम स्क्रीन पर जाने का तरीका जानें."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"देखे लें कि आप स्क्रीन पर बिल्कुल नीचे तक स्वाइप न कर रहे हों."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"\'सेटिंग\' में जाकर, पीछे जाने के लिए इस्तेमाल होने वाले हाथ के जेस्चर (हाव-भाव) की संवेदनशीलता बदलें"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"पिछली स्क्रीन पर वापस जाने के लिए स्वाइप करें"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"पिछली स्क्रीन पर वापस जाने के लिए, स्क्रीन के बाएं या दाएं किनारे से बीचों-बीच तक स्वाइप करें."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"देख लें कि आप स्क्रीन के निचले किनारे से ऊपर की ओर स्वाइप कर रहे हों."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"देख लें कि आप स्क्रीन से अपनी उंगली उठाने से पहले, इसे कहीं न रोक रहे हों."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"देख लें कि आप ऊपर की ओर बिल्कुल सीधे स्वाइप कर रहे हों."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"आपने होम स्क्रीन पर जाने के लिए इस्तेमाल होने वाले हाथ के जेस्चर (हाव-भाव) के बारे में जान लिया है. अब, एक से दूसरे ऐप्लिकेशन पर जाने का तरीका जानें."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"होम स्क्रीन पर जाने के लिए स्वाइप करें"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"स्क्रीन पर नीचे से ऊपर की ओर स्वाइप करें. हाथ का यह जेस्चर आपको हमेशा होम स्क्रीन पर ले जाता है."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"देख लें कि आप स्क्रीन के निचले किनारे से ऊपर की ओर स्वाइप कर रहे हों."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"कोशिश करें कि स्क्रीन से उंगली उठाने से पहले, इसे कुछ देर स्क्रीन पर दबाकर रखें."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"देख लें कि आप स्क्रीन पर ऊपर की तरफ़, बिल्कुल सीधे स्वाइप कर रहे हों और फिर रुकें."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"आपने एक ऐप्लिकेशन से दूसरे पर जाने के लिए इस्तेमाल होने वाले हाथ के जेस्चर (हाव-भाव) के बारे में जान लिया है. आप अपना फ़ोन इस्तेमाल करने के लिए तैयार हैं!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"एक ऐप्लिकेशन से दूसरे पर जाने के लिए स्वाइप करें"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"अपनी स्क्रीन पर नीचे से ऊपर की तरफ़ स्वाइप करें, दबाकर रखें, फिर छोड़ दें."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"आप पूरी तरह तैयार हैं"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"फिर से कोशिश करें"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"बहुत बढ़िया!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ट्यूटोरियल <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"हो गया!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"होम पेज पर जाने के लिए, ऊपर की ओर स्वाइप करें"</string>
+    <string name="allset_description" msgid="6350320429953234580">"अब आप अपना फ़ोन इस्तेमाल कर सकते हैं"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"सुलभता के लिए नेविगेशन सेटिंग"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"शेयर करें"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"स्क्रीनशॉट"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ऐप्लिकेशन या आपका संगठन इस कार्रवाई की अनुमति नहीं देता"</string>
diff --git a/quickstep/res/values-hr/strings.xml b/quickstep/res/values-hr/strings.xml
index e3e62bd74e..583c006f07 100644
--- a/quickstep/res/values-hr/strings.xml
+++ b/quickstep/res/values-hr/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predviđena aplikacija: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pazite da prijeđete prstom od krajnjeg lijevog ruba."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pazite da prijeđete prstom od lijevog ruba do sredine zaslona i podignite prst."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"To je to! Sad pokušajte prijeći prstom od desnog ruba."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pazite da prijeđete prstom od krajnjeg desnog ruba."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pazite da prijeđete prstom od desnog ruba do sredine zaslona i podignite prst."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Izvršili ste pokret za povratak. Sad saznajte kako otvoriti početni zaslon."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pazite da ne prijeđete prstom preblizu dnu zaslona."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Osjetljivost pokreta povratka promijenite u postavkama"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Prijeđite prstom da biste se vratili"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Za povratak na zadnji zaslon prijeđite prstom od lijevog ili desnog ruba do sredine zaslona."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pazite da prijeđete prstom prema gore od donjeg ruba zaslona."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pazite da ne zastanete prije podizanja prsta."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pazite da prijeđete prstom ravno prema gore."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Izvršili ste pokret za otvaranje početnog zaslona. Sad saznajte kako promijeniti aplikaciju."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Prijeđite prstom da biste otvorili početni zaslon"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Prijeđite prstom od dna zaslona prema gore. Tim pokretom uvijek će se otvoriti početni zaslon."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Pazite da prijeđete prstom prema gore od donjeg ruba zaslona."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Pokušajte zadržati prozor dulje prije podizanja prsta."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Pazite da prijeđete prstom ravno prema gore, a zatim zastanete."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Izvršili ste pokret za promjenu aplikacije. Spremni ste za upotrebu telefona!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Prijeđite prstom da biste promijenili aplikaciju"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Prijeđite prstom od dna zaslona prema gore, zadržite pritisak pa podignite prst."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Sve je spremno"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Pokušajte ponovo"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Odlično!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Vodič <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Sve je spremno!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Prijeđite prstom prema gore da biste otvorili početni zaslon"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Spremni ste za početak upotrebe telefona"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Postavke navigacije za pristupačnost"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Podijeli"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Snimka zaslona"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikacija ili vaša organizacija ne dopuštaju ovu radnju"</string>
diff --git a/quickstep/res/values-hu/strings.xml b/quickstep/res/values-hu/strings.xml
index 49c0c1b9f6..457556014b 100644
--- a/quickstep/res/values-hu/strings.xml
+++ b/quickstep/res/values-hu/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Várható alkalmazás: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Csúsztasson a képernyő bal széléről."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Csúsztasson a képernyő bal széléről a képernyő közepéig, és engedje el a képernyőt."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Ennyi az egész! Most csúsztasson a jobb szélről."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Csúsztasson a képernyő jobb széléről."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Csúsztasson a képernyő jobb széléről a képernyő közepéig, és engedje el a képernyőt."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Teljesítette a visszalépési kézmozdulatot. Most megtanulhatja, hogyan léphet a kezdőképernyőre."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ne csúsztasson túl közel a képernyő aljához."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"A vissza mozdulat érzékenysége a Beállításokban módosítható"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Csúsztasson a visszalépéshez"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Ha visszatérne a legutóbbi képernyőre, csúsztasson a képernyő közepére a bal vagy a jobb széléről."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Csúsztasson felfelé a képernyő aljától."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Ne álljon meg, mielőtt elengedi a képernyőt."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Csúsztasson egyenesen felfelé."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Teljesítette a kezdőképernyőre lépés kézmozdulatát. Most megtanulhatja, hogyan válthat az alkalmazások között."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Csúsztatás a kezdőképernyőre lépéshez"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Csúsztassa ujját felfelé a képernyő aljától. Ez a mozdulat mindig a kezdőképernyőre visz."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Csúsztasson felfelé a képernyő aljától."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Próbálja tovább lenyomva tartani az ablakot, mielőtt elengedi a képernyőt."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Csúsztasson egyenesen felfelé, majd várjon egy kicsit."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Teljesítette az alkalmazásváltás kézmozdulatát. Készen áll a telefonja használatára!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Alkalmazásváltás csúsztatással"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Csúsztasson felfelé a képernyő aljáról, tartsa lenyomva az ujját, majd emelje fel."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Minden kész"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Újra"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Remek!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Útmutató (<xliff:g id="TOTAL">%2$d</xliff:g>/<xliff:g id="CURRENT">%1$d</xliff:g>.)"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Kész is!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Felfelé csúsztatva megjelenik a kezdőképernyő"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Készen áll a telefon használatára"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"A kisegítő lehetőségek navigációs beállításai"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Megosztás"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Képernyőkép"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Az alkalmazás vagy az Ön szervezete nem engedélyezi ezt a műveletet"</string>
diff --git a/quickstep/res/values-hy/strings.xml b/quickstep/res/values-hy/strings.xml
index 9b25392f92..d7ceead475 100644
--- a/quickstep/res/values-hy/strings.xml
+++ b/quickstep/res/values-hy/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Առաջարկվող հավելված՝ <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Համոզվեք, որ մատը սահեցնում եք էկրանի ձախ եզրից։"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Սահեցրեք մատն էկրանի ձախ եզրից դեպի կենտրոն և բաց թողեք։"</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Ահա և վերջ։ Հիմա փորձեք սահեցնել մատն էկրանի աջ եզրից։"</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Համոզվեք, որ մատը սահեցնում եք էկրանի աջ եզրից։"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Սահեցրեք մատն էկրանի աջ եզրից դեպի կենտրոն և բաց թողեք։"</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Դուք սովորեցիք հետ գնալու ժեստը։ Այժմ սովորենք՝ ինչպես անցնել հիմնական էկրան։"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Համոզվեք, որ մատը չափազանց մոտ չեք սահեցնում էկրանին ներքևի հատվածին։"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Հետ գնալու ժեստի զգայունությունը փոփոխեք կարգավորումներում"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Սահեցրեք մատը՝ հետ գնալու համար"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Վերջին էկրան վերադառնալու համար էկրանի աջ կամ ձախ եզրից մատը սահեցրեք դեպի կենտրոն։"</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Համոզվեք, որ մատն էկրանի ներքևի եզրից վերև եք սահեցնում։"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Համոզվեք, որ դադար չեք տալիս նախքան բաց թողնելը։"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Համոզվեք, որ մատն ուղիղ վերև եք սահեցնում։"</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Դուք սովորեցիք հիմնական էկրան անցնելու ժեստը։ Այժմ սովորենք՝ ինչպես անցնել մի հավելվածից մյուսին։"</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Սահեցրեք մատը՝ հիմնական էկրան անցնելու համար"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Մատը սահեցրեք էկրանի ներքևից վերև։ Այս ժեստը բացում է հիմնական էկրանը։"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Համոզվեք, որ մատն էկրանի ներքևի եզրից վերև եք սահեցնում։"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Նախքան բաց թողնելը փորձեք հնարավորինս երկար պահել պատուհանը։"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Համոզվեք, որ մատն ուղիղ վերև եք սահեցնում, այնուհետև դադար տվեք։"</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Դուք սովորեցիք մի հավելվածից մյուսին անցնելու ժեստը։ Այժմ հանգիստ կարող եք օգտագործել ձեր հեռախոսը։"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Մատը սահեցրեք՝ մյուս հավելվածին անցնելու համար"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Մատը սահեցրեք էկրանի ներքևից վերև, պահեք և բաց թողեք։"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Պատրաստ է"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Նորից փորձեք"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Գերազանց է"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Ուղեցույց <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Պատրաստ է"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Մատը սահեցրեք վերև՝ հիմնական էկրան անցնելու համար"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Դուք արդեն կարող եք օգտագործել ձեր հեռախոսը"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Նավիգացիայի կարգավորումներ հատուկ գործառույթների համար"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Կիսվել"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Սքրինշոթ անել"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Այս գործողությունն արգելված է հավելվածի կամ ձեր կազմակերպության կողմից"</string>
diff --git a/quickstep/res/values-in/strings.xml b/quickstep/res/values-in/strings.xml
index dc105b5ef8..9c972b7e55 100644
--- a/quickstep/res/values-in/strings.xml
+++ b/quickstep/res/values-in/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplikasi yang diprediksi: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pastikan Anda menggeser dari tepi ujung kiri."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pastikan Anda menggeser dari tepi kiri ke tengah layar, lalu lepaskan."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Selesai. Sekarang, coba geser dari tepi kanan."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pastikan Anda menggeser dari tepi ujung kanan."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pastikan Anda menggeser dari tepi kanan ke tengah layar, lalu lepaskan."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Anda telah menyelesaikan gestur kembali. Selanjutnya, pelajari cara beralih ke Layar utama."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pastikan Anda tidak menggeser terlalu dekat ke bagian bawah layar."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Untuk mengubah sensitivitas gestur kembali, buka Setelan"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Geser untuk kembali"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Untuk kembali ke layar terakhir, geser dari tepi kiri atau kanan ke tengah layar."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pastikan Anda menggeser ke atas dari tepi bawah layar."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pastikan Anda tidak menjeda sebelum melepaskan."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pastikan Anda menggeser lurus ke atas."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Anda telah menyelesaikan gestur beralih ke Layar utama. Selanjutnya, pelajari cara beralih aplikasi."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Geser untuk beralih ke layar utama"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Geser ke atas dari bagian bawah layar. Gestur ini akan selalu membawa Anda ke Layar utama."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Pastikan Anda menggeser ke atas dari tepi bawah layar."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Coba tahan jendela lebih lama sebelum melepaskan."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Pastikan Anda menggeser lurus ke atas, lalu menjedanya."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Anda telah menyelesaikan gestur beralih aplikasi. Anda siap menggunakan ponsel Anda!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Geser untuk beralih aplikasi"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Geser ke atas dari bagian bawah layar, tahan, lalu lepaskan."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Semua siap"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Coba lagi"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bagus!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Semua siap."</string>
+    <string name="allset_hint" msgid="459504134589971527">"Geser ke atas untuk beralih ke layar utama"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Anda sudah siap untuk mulai menggunakan ponsel"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Setelan navigasi untuk aksesibilitas"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Bagikan"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Tindakan ini tidak diizinkan oleh aplikasi atau organisasi Anda"</string>
diff --git a/quickstep/res/values-is/strings.xml b/quickstep/res/values-is/strings.xml
index eb5fc951d8..55d387a70f 100644
--- a/quickstep/res/values-is/strings.xml
+++ b/quickstep/res/values-is/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Tillaga að forriti: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Passaðu að strjúka frá jaðri vinstri brúnar."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Passaðu að strjúka frá vinstri brún skjásins að miðju hans og sleppa svo."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Það er komið! Prófaðu að strjúka frá vinstri brúninni."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Passaðu að strjúka frá jaðri hægri brúnar."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Passaðu að strjúka frá hægri brún skjásins að miðju hans og sleppa svo."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Þú laukst við að kynna þér bendinguna „til baka“. Næst skaltu læra hvernig þú ferð „heim“."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Passaðu að strjúka ekki of nálægt neðri brún skjásins."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Til að breyta næmi til baka-bendingar ferðu í stillingar"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Strjúktu til að fara til baka"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Til að fara til baka á síðasta skjá skaltu strjúka frá vinstri eða hægri brún að miðju skjásins."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Passaðu að strjúka upp frá neðri brún skjásins."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Passaðu að stoppa ekki áður en þú sleppir."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Passaðu að strjúka beint upp."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Þú laukst við að kynna þér bendinguna „heim“. Næst skaltu læra hvernig þú skiptir á milli forrita."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Strjúktu til að fara heim"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Strjúktu upp frá neðri hluta skjásins. Þetta flytur þig alltaf á heimaskjáinn."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Passaðu að strjúka upp frá neðri brún skjásins."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Prófaðu að halda fingrinum lengur á glugganum áður en þú sleppir."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Passaðu að strjúka beint upp og stoppa svo."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Þú laukst við að kynna þér bendinguna „skipta um forrit“. Nú geturðu notað símann þinn!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Strjúktu til að skipta á milli forrita"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Strjúktu upp frá neðri hluta skjásins, haltu fingrinum á skjánum og slepptu svo."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Allt til reiðu"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Reyna aftur"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Flott!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Leiðsögn <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Allt tilbúið!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Strjúktu upp til að fara á heimaskjáinn"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Þú getur byrjað að nota símann"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Flettistillingar fyrir aðgengi"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Deila"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Skjámynd"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Forritið eða fyrirtækið leyfir ekki þessa aðgerð"</string>
diff --git a/quickstep/res/values-it/strings.xml b/quickstep/res/values-it/strings.xml
index a17c188c40..2a66ae47c9 100644
--- a/quickstep/res/values-it/strings.xml
+++ b/quickstep/res/values-it/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App prevista: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Assicurati di scorrere dall\'estremità del bordo sinistro."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Assicurati di scorrere dal bordo sinistro verso il centro dello schermo e solleva il dito."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"È tutto. Ora prova a scorrere dal bordo destro."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Assicurati di scorrere dall\'estremità del bordo destro."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Assicurati di scorrere dal bordo destro verso il centro dello schermo e solleva il dito."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Hai completato il gesto Indietro. Ora, impara come andare alla schermata Home."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Assicurati di non scorrere troppo vicino alla parte inferiore dello schermo."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Usa Impostazioni per cambiare sensibilità del gesto Indietro"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Scorri per tornare indietro"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Per tornare all\'ultima schermata, scorri dal bordo sinistro o destro verso il centro dello schermo."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Assicurati di scorrere verso l\'alto dal bordo inferiore dello schermo."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Assicurati di non fare pause prima di sollevare il dito."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Assicurati di scorrere verso l\'alto senza fermarti."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Hai completato il gesto Vai alla schermata Home. Ora, impara come passare da un\'app all\'altra."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Scorri per andare alla schermata Home"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Scorri verso l\'alto dalla parte inferiore dello schermo; così arrivi sempre alla schermata Home."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Assicurati di scorrere verso l\'alto dal bordo inferiore dello schermo."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Prova a tenere premuta la finestra più a lungo prima di rilasciarla."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Assicurati di scorrere verso l\'alto senza fermarti, poi fai una pausa."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Hai completato il gesto Cambia app. Ora è tutto pronto per usare il telefono."</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Scorri per passare da un\'app all\'altra"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Scorri verso l\'alto dalla parte inferiore dello schermo, tieni premuto e rilascia."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Fatto"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Riprova"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bene!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Finito."</string>
+    <string name="allset_hint" msgid="459504134589971527">"Scorri verso l\'alto per andare alla schermata Home"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Puoi iniziare a usare il tuo telefono"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Impostazioni di navigazione per l\'accessibilità"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Condividi"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Questa azione non è consentita dall\'app o dall\'organizzazione"</string>
diff --git a/quickstep/res/values-iw/strings.xml b/quickstep/res/values-iw/strings.xml
index da2e79ab7a..1c52011487 100644
--- a/quickstep/res/values-iw/strings.xml
+++ b/quickstep/res/values-iw/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"האפליקציות החזויות: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"חשוב להקפיד להחליק מהקצה הימני."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"חשוב להקפיד להחליק מהקצה הימני למרכז המסך ואז לשחרר."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"זהו! עכשיו צריך לנסות להחליק מהקצה השמאלי."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"חשוב להקפיד להחליק מהקצה השמאלי."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"חשוב להקפיד להחליק מהקצה השמאלי למרכז המסך ואז לשחרר."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"השלמת את תנועת \'הקודם\'. בשלב הבא לומדים איך לעבור למסך הבית."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"חשוב להקפיד שלא להחליק קרוב מדי לתחתית המסך."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"כדי לשנות את מידת הרגישות של תנועת החזרה, יש לעבור להגדרות"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"יש להחליק כדי לחזור"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"כדי לחזור למסך הקודם, יש להחליק מהקצה השמאלי או הימני למרכז המסך."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"חשוב להקפיד להחליק למעלה מהקצה התחתון של המסך."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"חשוב לוודא שלא מחכים לפני שמשחררים."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"חשוב להקפיד להחליק ישר למעלה."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"השלמת את תנועת המעבר למסך הבית. בשלב הבא לומדים איך לעבור בין אפליקציות."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"יש להחליק כדי לעבור למסך הבית"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"החלקה למעלה מתחתית המסך תמיד תעביר אותך למסך הבית."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"חשוב להקפיד להחליק למעלה מהקצה התחתון של המסך."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"יש לנסות להחזיק את החלון לזמן רב יותר לפני שמשחררים."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"חשוב להקפיד להחליק ישר למעלה ואז להמתין."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"השלמת את תנועת המעבר בין האפליקציות. הטלפון מוכן לשימוש!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"יש להחליק כדי לעבור בין אפליקציות"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"יש להחליק למעלה מתחתית המסך, להחזיק ולאחר מכן לשחרר."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"הכול מוכן"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"אפשר לנסות שוב"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"איזה יופי!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"מדריך <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"הכול מוכן!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"כדי לחזור לדף הבית, מחליקים כלפי מעלה"</string>
+    <string name="allset_description" msgid="6350320429953234580">"הכול מוכן ואפשר להתחיל להשתמש בטלפון"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"הגדרות ניווט לנגישות"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"שיתוף"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"צילום מסך"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"האפליקציה או הארגון שלך אינם מתירים את הפעולה הזאת"</string>
diff --git a/quickstep/res/values-ja/strings.xml b/quickstep/res/values-ja/strings.xml
index 960b839710..1a867e7621 100644
--- a/quickstep/res/values-ja/strings.xml
+++ b/quickstep/res/values-ja/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"予測されたアプリ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"一番左端からスワイプしてください。"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"画面の左端から中央に向かってスワイプし、指を離してください。"</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"そのとおりです。次に、右端からスワイプしてみましょう。"</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"一番右端からスワイプしてください。"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"画面の右端から中央に向かってスワイプし、指を離してください。"</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"「戻る」操作を完了しました。次は、ホームに戻る方法を覚えましょう。"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"スワイプする際は画面の下部に近づきすぎないようにしましょう。"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"「戻る」操作の感度を変更するには [設定] に移動します"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"スワイプで戻りましょう"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"直前の画面に戻るには、画面の左端または右端から中央に向かってスワイプします。"</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"画面の下端から上にスワイプしてください。"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"指を離す前にいったん止めないでください。"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"まっすぐ上にスワイプしてください。"</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"「ホームに戻る」操作を完了しました。次は、アプリを切り替える方法を覚えましょう。"</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"スワイプでホームに戻る"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"画面を下から上にスワイプします。この操作でいつでもホーム画面に戻れます。"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"画面の下端から上にスワイプしてください。"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"指を離す前にウィンドウをもう少し長押ししてみましょう。"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"まっすぐ上にスワイプしてから、いったん指を止めてください。"</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"「アプリを切り替える」操作を完了しました。スマートフォンをご利用いただけるようになりました。"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"スワイプでアプリを切り替え"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"画面を下から上にスワイプして長押しし、指を離します。"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"設定完了"</string>
diff --git a/quickstep/res/values-ka/strings.xml b/quickstep/res/values-ka/strings.xml
index 8b3b95c046..afb5ebef5b 100644
--- a/quickstep/res/values-ka/strings.xml
+++ b/quickstep/res/values-ka/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ნაწინასწარმეტყველები აპი: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"არ გადაფურცლოთ მარცხენა კიდის ბოლოდან."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"გადაფურცლეთ მარცხენა კიდიდან ეკრანის ცენტრისკენ და თითი აუშვით."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"სულ ეს არის! ახლა კი ცადეთ, გადაფურცლოთ მარჯვენა კიდიდან."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"არ გადაფურცლოთ მარჯვენა კიდის ბოლოდან."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"გადაფურცლეთ მარჯვენა კიდიდან ეკრანის ცენტრისკენ და თითი აუშვით."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"თქვენ შეასრულეთ უკან დაბრუნების ჟესტი. ახლა კი შევიტყოთ, თუ როგორ დავბრუნდეთ მთავარ გვერდზე."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"არ გადაფურცლოთ ეკრანის ბოლოსთან ახლოს."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"დაბრუნების ჟესტის მგრძნობელობის შესაცვლელად გადადით პარამეტრებზე"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"უკან დასაბრუნებლად გადაფურცლეთ"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"ბოლო ეკრანზე დასაბრუნებლად გადაფურცლეთ მარცხენა ან მარჯვენა კიდიდან ეკრანის ცენტრისკენ."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"გადაფურცლეთ ეკრანის ქვედა კიდიდან ზემოთ."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"არ დააპაუზოთ თითის აშვებამდე."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"გადაფურცლეთ ზემოთ."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"თქვენ შეასრულეთ მთავარ ეკრანზე დაბრუნების ჟესტი. ახლა კი შევიტყოთ, როგორ გადავრთოთ აპები."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"მთავარ გვერდზე გადასასვლელად გადაფურცლეთ"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"გადაფურცლეთ ეკრანის ქვედა კიდიდან ზემოთ. ამ ჟესტს ყოველთვის მთავარი გვერდის ეკრანზე გადაყავხართ."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"გადაფურცლეთ ეკრანის ქვედა კიდიდან ზემოთ."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"უფრო ხანგრძლივად დააჭირეთ თითი ფანჯარას, რომ არ დაიხუროს."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"გადაფურცლეთ პირდაპირ ზემოთ და შემდეგ დააპაუზეთ."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"თქვენ შეასრულეთ აპების გადართვის ჟესტი. შეგიძლიათ ტელეფონით სარგებლობა!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"აპების გადასართავად გადაფურცლეთ"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"გადაფურცლეთ ეკრანის ქვედა კიდიდან ზემოთ, დააყოვნეთ, შემდეგ თითი აუშვით."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"მზად არის"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ხელახლა ცდა"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"მშვენიერია!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"სახელმძღვანელო <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"მზადაა!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"მთავარ გვერდზე გადასასვლელად გადაფურცლეთ ზევით"</string>
+    <string name="allset_description" msgid="6350320429953234580">"მზად ხართ ტელეფონის გამოსაყენებლად"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"ნავიგაციის პარამეტრები მარტივი წვდომისთვის"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"გაზიარება"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ეკრანის ანაბეჭდი"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ეს მოქმედება არ არის დაშვებული აპის ან თქვენი ორგანიზაციის მიერ"</string>
diff --git a/quickstep/res/values-kk/strings.xml b/quickstep/res/values-kk/strings.xml
index 45618e0b04..4f32e053ae 100644
--- a/quickstep/res/values-kk/strings.xml
+++ b/quickstep/res/values-kk/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Болжалды қолданба: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Сол жақтағы ең шеткі нүктеден бастап сырғытыңыз."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Экранның сол жақ шетінен ортасына қарай сырғытыңыз да, жіберіңіз."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Дайын! Енді оң жақ шеттен сырғытып көріңіз."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Оң жақтағы ең шеткі нүктеден бастап сырғытыңыз."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Экранның оң жақ шетінен ортасына қарай сырғытыңыз да, жіберіңіз."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Артқа қайту қимылын аяқтадыңыз. Енді негізгі экранға өтуді үйреніңіз."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Саусағыңызбен сырғыту кезінде экранның төменгі жағына тым жақындамаңыз."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Артқа қайту қимылы сезгіштігін параметрлерден өзгертіңіз."</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Артқа қайту үшін сырғытыңыз"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Соңғы ашылған экранға оралу үшін экранның сол немесе оң жақ шетінен ортасына қарай сырғытыңыз."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Экранның төменгі шетінен жоғары қарай сырғытыңыз."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Жіберер алдында кідіріс жасамаңыз."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Тігінен жоғары қарай сырғытыңыз."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Негізгі экранға қайту қимылын аяқтадыңыз. Енді қолданбаларды ауыстыруды үйреніңіз."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Негізгі экранға өту үшін сырғытыңыз"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Экранның төменгі жағынан жоғары қарай сырғытыңыз. Сонда негізгі экран ашылады."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Экранның төменгі шетінен жоғары қарай сырғытыңыз."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Жіберер алдында терезені ұзағырақ ұстап тұруға тырысыңыз."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Тігінен жоғары қарай сырғытыңыз да, кідіріңіз."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Қолданбаларды ауыстыру қимылын аяқтадыңыз. Телефоныңызды пайдалануға дайынсыз!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Қолданбаларды ауыстыру үшін сырғытыңыз"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Экранның төменгі жағынан жоғары қарай сырғытып, ұстап тұрыңыз да, жіберіңіз."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Бәрі дайын"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Қайталау"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Жақсы!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Оқулық: <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Бәрі дайын!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Негізгі экранға өту үшін жоғары қарай сырғытыңыз."</string>
+    <string name="allset_description" msgid="6350320429953234580">"Телефоныңыз пайдалануға дайын."</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Арнайы мүмкіндіктерге арналған навигация параметрлері"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Бөлісу"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Скриншот"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Бұл әрекетке қолданба не ұйым рұқсат етпейді."</string>
diff --git a/quickstep/res/values-km/strings.xml b/quickstep/res/values-km/strings.xml
index 9e12034179..1acf6075ba 100644
--- a/quickstep/res/values-km/strings.xml
+++ b/quickstep/res/values-km/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"កម្មវិធី​ដែលបាន​ព្យាករ៖ <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ត្រូវប្រាកដថា​អ្នកអូសពី​ចុងគែម​ខាងឆ្វេង​។"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ត្រូវប្រាកដថា​អ្នកអូសពី​គែមខាងឆ្វេង​ទៅផ្នែកកណ្ដាល​នៃអេក្រង់ រួច​ដកដៃ​។"</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"ត្រឹមត្រូវហើយ! ឥឡូវនេះ សូមសាកល្បង​អូសពីគែម​ខាងស្ដាំ។"</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ត្រូវប្រាកដថា​អ្នកអូសពី​ចុងគែម​ខាងស្ដាំ​។"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ត្រូវប្រាកដថា​អ្នកអូសពី​គែមខាងស្ដាំ​ទៅផ្នែកកណ្ដាល​នៃអេក្រង់ រួច​ដកដៃ​។"</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"អ្នក​បានបញ្ចប់​ចលនា​ថយក្រោយ​ហើយ។ បន្ទាប់​ទៀត សូមស្វែងយល់​ពីរបៀប​ចូលទៅកាន់​អេក្រង់ដើម​។"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ត្រូវប្រាកដថា​អ្នកមិនអូស​ទៅជិត​ផ្នែកខាងក្រោម​នៃអេក្រង់ពេក​។"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ដើម្បីប្ដូរកម្រិត​រំញោចនឹង​ចលនាថយក្រោយ សូមចូលទៅកាន់​ការកំណត់"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"អូស​ដើម្បី​ត្រឡប់​ទៅវិញ"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"ដើម្បី​ត្រឡប់ទៅ​អេក្រង់​ចុងក្រោយវិញ សូមអូស​ពីគែម​ខាងឆ្វេង ឬខាងស្ដាំ​ទៅផ្នែកកណ្ដាល​នៃអេក្រង់​។"</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ត្រូវប្រាកដថា​អ្នកអូសឡើងលើ​ពីគែមខាងក្រោម​នៃអេក្រង់​។"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ត្រូវប្រាកដថា​អ្នកមិនផ្អាក មុនពេល​ដកដៃ​។"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ត្រូវប្រាកដថា​អ្នកអូស​ត្រង់ឡើងលើ​។"</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"អ្នក​បានបញ្ចប់​ចលនា​ចូលទៅកាន់​អេក្រង់ដើម​ហើយ។ បន្ទាប់​ទៀត សូមស្វែងយល់​ពីរបៀប​ប្ដូរកម្មវិធី​។"</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"អូស​ដើម្បីចូល​ទៅកាន់​អេក្រង់ដើម"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"អូស​ឡើងលើ​ពីផ្នែកខាងក្រោម​នៃ​អេក្រង់របស់អ្នក។ ចលនា​នេះ​នាំ​អ្នក​ទៅ​អេក្រង់ដើម​ជានិច្ច។"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ត្រូវប្រាកដថា​អ្នកអូសឡើងលើ​ពីគែមខាងក្រោម​នៃអេក្រង់​។"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"សាកល្បង​សង្កត់វិនដូ​ឱ្យបានយូរ​ជាងនេះ មុនពេល​ដកដៃ​។"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"ត្រូវប្រាកដថា​អ្នកអូស​ត្រង់ឡើងលើ រួចផ្អាក។"</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"អ្នក​បានបញ្ចប់​ចលនា​ប្ដូរកម្មវិធី​ហើយ។ អ្នក​អាចប្រើ​ទូរសព្ទ​របស់អ្នក​បានហើយ!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"អូស​ដើម្បីប្ដូរ​កម្មវិធី"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"អូសឡើងលើ​ពីផ្នែកខាងក្រោមនៃអេក្រង់​របស់អ្នក រួចសង្កត់​ឱ្យជាប់ បន្ទាប់មកដកដៃចេញ។"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"រួចហើយ"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ព្យាយាមម្ដងទៀត"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ល្អ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"មេរៀនទី <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"រួចហើយ!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"អូស​ឡើង​លើ ​ដើម្បី​ចូលទៅកាន់អេក្រង់ដើម"</string>
+    <string name="allset_description" msgid="6350320429953234580">"អ្នក​អាច​ចាប់ផ្ដើម​ប្រើ​ទូរសព្ទ​របស់អ្នក​បានហើយ"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"ការកំណត់​ការរុករក​សម្រាប់​ភាពងាយស្រួល"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"ចែករំលែក"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"រូបថតអេក្រង់"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"សកម្មភាពនេះ​មិនត្រូវបានអនុញ្ញាតដោយកម្មវិធី​ ឬ​ស្ថាប័ន​របស់អ្នកទេ"</string>
diff --git a/quickstep/res/values-kn/strings.xml b/quickstep/res/values-kn/strings.xml
index 3cf37b4504..dd3cb388dc 100644
--- a/quickstep/res/values-kn/strings.xml
+++ b/quickstep/res/values-kn/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ಶಿಫಾರಸು ಮಾಡಿದ ಆ್ಯಪ್: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ನೀವು ದೂರದ ಎಡ ಅಂಚಿನಿಂದ ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ಎಡ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ ಹಾಗೂ ನಿಮ್ಮ ಬೆರಳನ್ನು ಮೇಲೆತ್ತಿ."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"ಅಷ್ಟೇ! ಈಗ ಬಲ ತುದಿಯಿಂದ ಸ್ವೈಪ್ ಮಾಡಲು ಪ್ರಯತ್ನಿಸಿ."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ನೀವು ದೂರದ ಬಲ ಅಂಚಿನಿಂದ ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ಬಲ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ ಹಾಗೂ ನಿಮ್ಮ ಬೆರಳನ್ನು ಮೇಲೆತ್ತಿ."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"ನೀವು ಗೋ ಬ್ಯಾಕ್ ಗೆಸ್ಚರ್ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದ್ದೀರಿ. ಮುಂದೆ, ಹೋಮ್‌ಗೆ ಹೋಗುವುದು ಹೇಗೆ ಎಂದು ತಿಳಿಯಿರಿ."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ನೀವು ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಭಾಗಕ್ಕೆ ಹೆಚ್ಚು ಹತ್ತಿರ ಸ್ವೈಪ್ ಮಾಡದಂತೆ ನೋಡಿಕೊಳ್ಳಿ."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ಬ್ಯಾಕ್ ಗೆಸ್ಚರ್‌ನ ಸೂಕ್ಷ್ಮತೆ ಬದಲಾಯಿಸಲು, ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಹೋಗಿ"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"ಹಿಂದಕ್ಕೆ ಹೋಗಲು ಸ್ವೈಪ್ ಮಾಡಿ"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"ಕೊನೆಯ ಸ್ಕ್ರೀನ್‌ಗೆ ಹಿಂತಿರುಗಲು, ಎಡ ಅಥವಾ ಬಲ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಗಿನ ಅಂಚಿನಿಂದ ನೀವು ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ವಿರಾಮಗೊಳಿಸದೆ ನಿಮ್ಮ ಬೆರಳನ್ನು ಸ್ಕ್ರೀನ್‌ನಿಂದ ಮೇಲೆತ್ತಿ."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ನೀವು ನೇರವಾಗಿ ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"ನೀವು ಗೋ ಹೋಮ್ ಗೆಸ್ಚರ್ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದ್ದೀರಿ. ಮುಂದೆ, ಆ್ಯಪ್‌ಗಳನ್ನು ಬದಲಾಯಿಸುವುದು ಹೇಗೆ ಎಂದು ತಿಳಿಯಿರಿ."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ಗೆ ಹಿಂತಿರುಗಲು ಸ್ವೈಪ್ ಮಾಡಿ"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಗಿನಿಂದ ಮೇಲೆ ಸ್ವೈಪ್ ಮಾಡಿ. ಈ ಗೆಸ್ಚರ್ ಯಾವಾಗಲೂ ನಿಮ್ಮನ್ನು ಹೋಮ್‌ ಸ್ಕ್ರೀನ್‌ಗೆ ಕರೆದೊಯ್ಯುತ್ತದೆ."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಗಿನ ಅಂಚಿನಿಂದ ನೀವು ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"ಬೆರಳನ್ನು ಮೇಲೆತ್ತುವ ಮೊದಲು ವಿಂಡೋವನ್ನು ಹೆಚ್ಚು ಸಮಯ ಹಿಡಿದಿಡಲು ಪ್ರಯತ್ನಿಸಿ."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"ನೀವು ನೇರವಾಗಿ ಸ್ವೈಪ್ ಮಾಡಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ, ನಂತರ ವಿರಾಮಗೊಳಿಸಿ."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"ನೀವು ಆ್ಯಪ್‌ಗಳನ್ನು ಬದಲಾಯಿಸುವ ಗೆಸ್ಚರ್ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದ್ದೀರಿ. ನಿಮ್ಮ ಫೋನ್ ಬಳಸಲು ನೀವು ಸಿದ್ಧರಿದ್ದೀರಿ!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ಆ್ಯಪ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಲು ಸ್ವೈಪ್ ಮಾಡಿ"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ನಿಮ್ಮ ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಗಿನಿಂದ ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ, ಒತ್ತಿ ಹಿಡಿಯಿರಿ, ನಂತರ ಬಿಟ್ಟು ಬಿಡಿ."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"ಸಂಪೂರ್ಣ ಸಿದ್ಧವಾಗಿದೆ"</string>
diff --git a/quickstep/res/values-ko/strings.xml b/quickstep/res/values-ko/strings.xml
index 63f2d96a42..f5e9147a02 100644
--- a/quickstep/res/values-ko/strings.xml
+++ b/quickstep/res/values-ko/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"예상 앱: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"왼쪽 가장자리 끝에서 스와이프하세요."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"왼쪽 가장자리에서 화면 중앙으로 스와이프한 후 손가락을 떼세요."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"좋습니다. 이번에는 오른쪽 가장자리에서 스와이프해 보세요."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"오른쪽 가장자리 끝에서 스와이프하세요."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"오른쪽 가장자리에서 화면 중앙으로 스와이프한 후 손가락을 떼세요."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"돌아가기 동작을 완료했습니다. 이번에는 홈으로 가는 방법을 알아보겠습니다."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"화면 하단에 지나치게 가까운 곳에서 스와이프하면 안 됩니다."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"돌아가기 동작의 민감도를 변경하려면 설정으로 이동하세요"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"스와이프하여 돌아가기"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"마지막 화면으로 돌아가려면 왼쪽 또는 오른쪽 가장자리에서 화면 중앙으로 스와이프하세요"</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"화면 하단 가장자리에서 위로 스와이프하세요."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"손가락을 떼기 전에 멈추지 않아야 합니다."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"위로 똑바르게 스와이프하세요."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"홈으로 이동 동작을 완료했습니다. 이번에는 앱 전환 방법을 알아보겠습니다."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"스와이프하여 홈으로 이동"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"화면 하단에서 위로 스와이프합니다. 이 동작을 사용하면 언제든지 홈 화면으로 이동할 수 있습니다"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"화면 하단 가장자리에서 위로 스와이프하세요."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"창을 더 오래 누르고 있다가 손가락을 떼 보세요."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"위로 똑바르게 스와이프한 후 잠깐 멈추세요."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"앱 전환 동작을 완료했습니다. 휴대전화를 사용할 준비가 됐습니다."</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"스와이프로 앱 전환"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"화면 하단에서 위로 스와이프하고 잠시 멈춘 다음 손가락을 떼세요"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"설정 완료"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"다시 시도"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"잘하셨습니다"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"튜토리얼 <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"설정 완료"</string>
+    <string name="allset_hint" msgid="459504134589971527">"위로 스와이프하여 홈으로 이동"</string>
+    <string name="allset_description" msgid="6350320429953234580">"휴대전화를 사용할 준비가 되었습니다."</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"탐색 접근성 설정"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"공유"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"스크린샷"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"이 작업은 앱 또는 조직에서 허용되지 않습니다."</string>
diff --git a/quickstep/res/values-ky/strings.xml b/quickstep/res/values-ky/strings.xml
index 5d2d7e0ce5..d0ed6deba2 100644
--- a/quickstep/res/values-ky/strings.xml
+++ b/quickstep/res/values-ky/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Божомолдонгон колдонмо: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Экранды эң четинен солдон оңго карай сүрүңүз."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Экранды сол жагынан ортосуна карай сүрүп, манжаңызды алыңыз."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Бүттү! Эми экранды оң жагынан сүрүп көрүңүз."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Экранды эң четинен оңдой солго карай сүрүңүз."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Экранды оң жагынан ортосуна карай сүрүп, манжаңызды алыңыз."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"\"Артка\" жаңсоосу боюнча үйрөткүчтү бүтүрдүңүз. Эми башкы бетке кантип өтүүнү үйрөнүп алыңыз."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Манжаңызды экрандын ылдый жагына өтө жакындатпай сүрүңүз."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"\"Артка\" жаң-нун сезгичтигин өзгөртүү үчүн Жөндөөлөргө өтүңүз"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Артка кайтуу үчүн сүрүңүз"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Акыркы экранга кайтуу үчүн экранды сол же оң жагынан ортосуна карай сүрүңүз."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Экранды ылдыйдан өйдө карай сүрүңүз."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Манжаңызды алганга чейин токтотпоңуз."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Экранды өйдө карай сүрүңүз."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"\"Башкы бетке өтүү\" жаңсоосу боюнча үйрөткүчтү бүтүрдүңүз. Эми колдонмолорду которуштуруу ыкмасын үйрөнүп алыңыз."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Башкы бетке өтүү үчүн сүрүп коюңуз"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Экранды ылдый жагынан өйдө карай сүрүңүз. Бул жаңсоо сизди ар дайым Башкы экранга алып барат."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Экранды ылдыйдан өйдө карай сүрүңүз."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Манжаңызды алуудан мурун экранда узагыраак кармаңыз."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Экранды өйдө карай сүрүп, токтоп туруңуз."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"\"Колдонмолорду которуштуруу\" жаңсоосу боюнча үйрөткүчтү бүтүрдүңүз. Телефонуңузду колдоно берсеңиз болот."</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Колдонмолорду которуштуруу үчүн сүрүңүз"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Экранды ылдыйдан өйдө карай сүрүп, бир аз коё бербей кармап туруңуз."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Дапдаяр!"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Кайра аракет кылыңыз"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Сонун!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Үйрөткүч: <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Бүттү!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Башкы бетке өтүү үчүн экранды өйдө сүрүңүз"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Телефонуңузду колдонуп баштоого даярсыз"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Атайын мүмкүнчүлүктөр үчүн чабыттоо жөндөөлөрү"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Бөлүшүү"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Скриншот"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Бул аракетти аткарууга колдонмо же ишканаңыз тыюу салган"</string>
diff --git a/quickstep/res/values-lo/strings.xml b/quickstep/res/values-lo/strings.xml
index ee09438662..9b175ad4d1 100644
--- a/quickstep/res/values-lo/strings.xml
+++ b/quickstep/res/values-lo/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ແອັບທີ່ຄາດເດົາໄວ້: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ກະລຸນາກວດສອບວ່າທ່ານປັດຈາກຂອບຊ້າຍສຸດ."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ກະລຸນາກວດສອບວ່າທ່ານປັດຈາກຂອບຊ້າຍໄປຫາທາງກາງຂອງຈໍແລ້ວປ່ອຍ."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"ແລ້ວໆ! ຕອນນີ້ໃຫ້ລອງປັດຈາກຂອບຂວາເບິ່ງ."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ກະລຸນາກວດສອບວ່າທ່ານປັດຈາກຂອບຂວາສຸດ."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ກະລຸນາກວດສອບວ່າທ່ານປັດຈາກຂອບຂວາໄປຫາທາງກາງຂອງຈໍແລ້ວປ່ອຍ."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"ທ່ານໃຊ້ທ່າທາງກັບຄືນສຳເລັດແລ້ວ. ຕໍ່ໄປ, ມາສຶກສາວິທີໄປໜ້າຫຼັກ."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ກະລຸນາກວດສອບວ່າທ່ານບໍ່ໄດ້ປັດໃກ້ກັບທາງລຸ່ມຂອງໜ້າຈໍເກີນໄປ."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ເພື່ອປ່ຽນຄວາມລະອຽດອ່ອນຂອງທ່າທາງກັບຄືນ, ໃຫ້ໄປຫາການຕັ້ງຄ່າ"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"ປັດເພື່ອກັບຄືນ"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"ເພື່ອກັບໄປໜ້າຈໍຫຼ້າສຸດ, ໃຫ້ປັດຈາກຂອບຊ້າຍ ຫຼື ຂວາໄປຫາທາງກາງຂອງໜ້າຈໍ."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ກະລຸນາກວດສອບວ່າທ່ານປັດຂຶ້ນຈາກຂອບລຸ່ມສຸດຂອງໜ້າຈໍ."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ກະລຸນາກວດສອບວ່າທ່ານບໍ່ຢຸດຊົ່ວຄາວກ່ອນປ່ອຍນິ້ວ."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ກະລຸນາກວດສອບວ່າທ່ານປັດຂຶ້ນໄປຊື່ໆ."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"ທ່ານໃຊ້ທ່າທາງໄປໜ້າຫຼັກສຳເລັດແລ້ວ. ຕໍ່ໄປ, ມາສຶກສາວິທີສະຫຼັບແອັບ."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"ປັດເພື່ອໄປໜ້າຫຼັກ"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"ປັດຂຶ້ນມາຈາກລຸ່ມສຸດຂອງໜ້າຈໍທ່ານ. ທ່າທາງນີ້ຈະພາທ່ານໄປໂຮມສະກຣີນສະເໝີ."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ກະລຸນາກວດສອບວ່າທ່ານປັດຂຶ້ນຈາກຂອບລຸ່ມສຸດຂອງໜ້າຈໍ."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"ລອງກົດໃສ່ໜ້າຈໍຄ້າງໄວ້ດົນຂຶ້ນກ່ອນປ່ອຍນິ້ວ."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"ກະລຸນາກວດສອບວ່າທ່ານປັດຂຶ້ນຊື່ໆ, ຈາກນັ້ນຢຸດຊົ່ວຄາວ."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"ທ່ານໃຊ້ທ່າທາງສະຫຼັບແອັບສຳເລັດແລ້ວ. ທ່ານພ້ອມໃຊ້ໂທລະສັບຂອງທ່ານແລ້ວ!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ປັດເພື່ອສະຫຼັບແອັບ"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ປັດຂຶ້ນຈາກລຸ່ມສຸດຂອງໜ້າຈໍທ່ານ, ຈາກນັ້ນປ່ອຍ."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"ທຸກຢ່າງພ້ອມແລ້ວ"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ລອງໃໝ່"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ດີ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ການສອນການນຳໃຊ້ທີ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"ຮຽບຮ້ອຍໝົດແລ້ວ!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"ປັດຂຶ້ນເພື່ອໄປຫາໜ້າຫຼັກ"</string>
+    <string name="allset_description" msgid="6350320429953234580">"ທ່ານພ້ອມເລີ່ມຕົ້ນໃຊ້ໂທລະສັບຂອງທ່ານແລ້ວ"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"ການຕັ້ງຄ່າການນຳທາງສຳລັບການຊ່ວຍເຂົ້າເຖິງ"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"ແບ່ງປັນ"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ຮູບໜ້າຈໍ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ແອັບ ຫຼື ອົງການຂອງທ່ານບໍ່ອະນຸຍາດໃຫ້ໃຊ້ຄຳສັ່ງນີ້"</string>
diff --git a/quickstep/res/values-lt/strings.xml b/quickstep/res/values-lt/strings.xml
index d2f217fda1..8604a6a5bf 100644
--- a/quickstep/res/values-lt/strings.xml
+++ b/quickstep/res/values-lt/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Numatoma programa: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Turite perbraukti nuo kairiojo krašto."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Turite perbraukti nuo kairiojo krašto link ekrano vidurio ir pakelti pirštą."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Tai viskas! Dabar pabandykite perbr. nuo dešiniojo krašto."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Turite perbraukti nuo dešiniojo krašto."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Turite perbraukti nuo dešiniojo krašto link ekrano vidurio ir pakelti pirštą."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Atlikote grįžimo atgal gestą. Toliau sužinosite, kaip pereiti į pagrindinį ekraną."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nebraukite per arti ekrano apačios."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Norėd. pak. grįžimo gesto jautr., eikite į sk. „Nustatymai“"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Norėdami grįžti, perbraukite"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Norėdami grįžti į ankstesnį ekraną, perbr. nuo kairiojo arba dešinio krašto link ekrano vidurio."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Turite perbraukti aukštyn nuo apatinio ekrano krašto."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Nepristabdykite prieš pakeldami pirštą."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Turite tiesiai perbraukti aukštyn."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Atlikote perėjimo į pagrindinį ekraną gestą. Toliau sužinosite, kaip perjungti programas."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Perbraukite, kad pereitumėte į pagrindinį ekraną"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Perbraukite aukštyn nuo ekrano apačios. Atlikus šį gestą, visada nukreipiama į pagrindinį ekraną."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Turite perbraukti aukštyn nuo apatinio ekrano krašto."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Pabandykite palaikyti langą ilgiau prieš pakeldami pirštą."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Turite tiesiai perbraukti aukštyn, o tada pristabdyti."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Atlikote programų perjungimo gestą. Esate pasirengę naudoti telefoną!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Perbraukite, kad perjungtumėte programas"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Perbraukite aukštyn nuo ekrano apačios, palaikykite ir paleiskite."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Viskas nustatyta"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Bandykite dar kartą"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Šaunu!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Mokymo programa: <xliff:g id="CURRENT">%1$d</xliff:g> iš <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Paruošta!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Perbraukite aukštyn, kad grįžtumėte į pagrindinį ekraną"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Esate pasiruošę pradėti naudoti telefoną"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Pritaikomumo naršymo nustatymai"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Bendrinti"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Ekrano kopija"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Jūsų organizacijoje arba naudojant šią programą neleidžiama atlikti šio veiksmo"</string>
diff --git a/quickstep/res/values-lv/strings.xml b/quickstep/res/values-lv/strings.xml
index 702e97a683..b6cadc641b 100644
--- a/quickstep/res/values-lv/strings.xml
+++ b/quickstep/res/values-lv/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Prognozētā lietotne: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Jāvelk no pašas kreisās malas."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Jāvelk no ekrāna kreisās malas uz vidu un jāatlaiž."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Tas arī viss! Tagad mēģiniet vilkt no labās malas."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Jāvelk no pašas labās malas."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Jāvelk no ekrāna labās malas uz vidu un jāatlaiž."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Jūs sekmīgi veicāt atgriešanās žestu. Tagad varat iemācīties, kā pāriet uz sākumu."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nevelciet pārāk tuvu ekrāna apakšdaļai."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Atgriešanās žesta jutīguma līmeni varat mainīt iestatījumos."</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Vilkšana, lai atgrieztos"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Lai atgrieztos iepriekšējā ekrānā, velciet no kreisās vai labās malas uz ekrāna vidu."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Jāvelk augšup no ekrāna apakšmalas."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pirms atlaišanas nepārtrauciet kustību."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Jāvelk tieši uz augšu."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Jūs sekmīgi veicāt sākuma ekrāna atvēršanas žestu. Tagad varat iemācīties, kā pārslēgt lietotnes."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Vilkšana, lai pārietu uz sākumu"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Velciet augšup no ekrāna apakšdaļas. Ar šo žestu vienmēr varat atvērt sākuma ekrānu."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Jāvelk augšup no ekrāna apakšmalas."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Mēģiniet ilgāk turēt logu, pirms atlaižat."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Jāvelk tieši uz augšu un pēc tam jāaptur kustība."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Jūs sekmīgi veicāt lietotņu pārslēgšanas žestu. Esat gatavs izmantot tālruni!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Vilkšana, lai pārslēgtu lietotnes"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Velciet augšup no ekrāna apakšdaļas, turiet un pēc tam atlaidiet."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Gatavs"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Mēģināt vēlreiz"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Lieliski!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"<xliff:g id="CURRENT">%1$d</xliff:g>. mācību darbība no <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Gatavs!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Velciet augšup, lai pārietu uz sākuma ekrānu"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Varat sākt izmantot savu tālruni"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Navigācijas iestatījumi pieejamībai"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Kopīgot"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Veikt ekrānuzņēmumu"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Lietotne vai jūsu organizācija neatļauj veikt šo darbību."</string>
diff --git a/quickstep/res/values-mk/strings.xml b/quickstep/res/values-mk/strings.xml
index 2da1cec87f..fd235f9390 100644
--- a/quickstep/res/values-mk/strings.xml
+++ b/quickstep/res/values-mk/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Предвидена апликација: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Повлечете од подалечниот лев агол."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Повлечете од левиот раб кон средината на екранот и пуштете."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Тоа е сѐ! Сега пробајте да повлечете од десниот раб."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Повлечете од подалечниот десен агол."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Повлечете од десниот раб кон средината на екранот и пуштете."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Завршивте со упатството за враќање назад. Следно, дознајте како да одите на почетната страница."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Не повлекувајте преблиску до долниот раб на екранот."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"За да ја промените чувствителноста, одете во „Поставки“"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Повлечете за да се вратите назад"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"За да се вратите на последниот екран, повлечете од левиот или десниот раб кон средината на екранот."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Повлечете нагоре од долниот раб на екранот."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Не правете пауза пред да пуштите."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Повлечете право нагоре."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Завршивте со упатството за почетната страница. Следно, дознајте како да се префрлате помеѓу апликации."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Повлечете за да одите на почетната страница"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Повлечете нагоре од долниот раб на екранот. Ова движење секогаш ќе ве одведе на почетниот екран."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Повлечете нагоре од долниот раб на екранот."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Задржете го прозорецот подолго пред да го пуштите."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Повлечете право нагоре, а потоа застанете."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Завршивте со упатството за префрлање помеѓу апликации. Спремни сте да го користите телефонот."</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Повлечете за префрлање помеѓу апликации"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Повлечете нагоре од дното на екранот и задржете, па пуштете."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Готово"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Обиди се пак"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Одлично!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Упатство <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Готово!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Повлечете нагоре за да појдете на почетен екран"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Спремни сте да почнете да го користите телефонот"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Поставки за навигација за пристапност"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Сподели"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Слика од екранот"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Апликацијата или вашата организација не го дозволува дејствово"</string>
diff --git a/quickstep/res/values-ml/strings.xml b/quickstep/res/values-ml/strings.xml
index ebd804aa6e..85aebde36e 100644
--- a/quickstep/res/values-ml/strings.xml
+++ b/quickstep/res/values-ml/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"പ്രവചിച്ച ആപ്പ്: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ഇടത്തേയറ്റത്തെ അരികിൽ നിന്ന് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ഇടത്തേ അരികിൽ നിന്ന് സ്‌ക്രീനിന്റെ മധ്യഭാഗത്തേക്ക് സ്വെെപ്പ് ചെയ്‌ത് വിടുക."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"അത്ര മാത്രം! ഇനി വലത്തേ അരികിൽ നിന്ന് സ്വെെപ്പ് ചെയ്യൂ."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"വലത്തേയറ്റത്തെ അരികിൽ നിന്ന് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"വലത്തേ അരികിൽ നിന്ന് സ്‌ക്രീനിന്റെ മധ്യഭാഗത്തേക്ക് സ്വെെപ്പ് ചെയ്‌ത് വിടുക."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"മടങ്ങുക ജെസ്ച്ചർ നിങ്ങൾ പൂർത്തിയാക്കി. അടുത്തത്, ഹോമിലേക്ക് പോകുന്നതെങ്ങനെയെന്ന് മനസ്സിലാക്കുക."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"സ്‌ക്രീനിന്റെ ഏറ്റവും അടിഭാഗത്തേക്ക് സ്വെെപ്പ് ചെയ്യുന്നില്ലെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ബാക്ക്ജെസ്റ്ററിന്റെ സെൻസിറ്റിവിറ്റി മാറ്റാൻ ക്രമീകരണത്തിൽ പോകൂ"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"മടങ്ങാൻ സ്വെെപ്പ് ചെയ്യുക"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"മുൻ സ്‌ക്രീനിലേക്ക് മടങ്ങാൻ, ഇടതോ വലതോ അരികിൽ നിന്ന് സ്‌ക്രീനിന്റെ നടുവിലേക്ക് സ്വെെപ്പ് ചെയ്യുക."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"സ്‌ക്രീനിന്റെ താഴത്തെ അരികിൽ നിന്ന് മുകളിലേക്ക് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"വിടുന്നതിന് മുമ്പ് നിങ്ങൾ താൽക്കാലികമായി നിർത്തുന്നില്ലെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"നേരെ മുകളിലേക്ക് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പിക്കുക."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"ഹോമിലേക്ക് പോകുക ജെസ്‌ച്ചർ നിങ്ങൾ പൂർത്തിയാക്കി. അടുത്തത്, എങ്ങനെ ആപ്പുകൾ മാറാമെന്ന് മനസ്സിലാക്കുക."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"ഹോമിലേക്ക് പോകാൻ സ്വെെപ്പ് ചെയ്യുക"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"സ്‌ക്രീനിന്റെ താഴെ നിന്ന് മുകളിലേക്ക് സ്വൈപ്പ് ചെയ്യൂ. ഈ ജെസ്ച്ചർ എപ്പോഴും ഹോം സ്‌ക്രീനിലേക്ക് നയിക്കുന്നു."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"സ്‌ക്രീനിന്റെ താഴത്തെ അരികിൽ നിന്ന് മുകളിലേക്ക് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"റിലീസ് ചെയ്യുന്നതിന് മുമ്പ് വിൻഡോ കൂടുതൽ സമയം ഹോൾഡ് ചെയ്യാൻ ശ്രമിക്കുക."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"നേരെ മുകളിലേക്ക് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പാക്കുക, ശേഷം താൽക്കാലികമായി നിർത്തുക."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"ആപ്പുകൾ മാറുക ജെസ്‌ച്ചർ നിങ്ങൾ പൂർത്തിയാക്കി. ഫോൺ ഉപയോഗിക്കാൻ നിങ്ങൾ തയ്യാറാണ്!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ആപ്പുകൾ മാറാൻ സ്വെെപ്പ് ചെയ്യുക"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"സ്‌ക്രീനിന്റെ താഴെ നിന്ന് മുകളിലേക്ക് സ്വൈപ്പ് ചെയ്‌ത് പിടിച്ച ശേഷം വിടുക."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"എല്ലാം സജ്ജീകരിച്ചു"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"വീണ്ടും ശ്രമിക്കുക"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"കൊള്ളാം!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ട്യൂട്ടോറിയൽ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"എല്ലാം സജ്ജീകരിച്ചു!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"ഹോമിലേക്ക് പോകാൻ മുകളിലേക്ക് സ്വൈപ്പ് ചെയ്യുക"</string>
+    <string name="allset_description" msgid="6350320429953234580">"ഫോൺ ഉപയോഗിച്ച് തുടങ്ങാൻ നിങ്ങൾ തയ്യാറാണ്"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"ഉപയോഗസഹായിക്കുള്ള നാവിഗേഷൻ ക്രമീകരണം"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"പങ്കിടുക"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"സ്ക്രീൻഷോട്ട്"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ഈ നടപടി എടുക്കുന്നത് ആപ്പോ നിങ്ങളുടെ സ്ഥാപനമോ അനുവദിക്കുന്നില്ല"</string>
diff --git a/quickstep/res/values-mn/strings.xml b/quickstep/res/values-mn/strings.xml
index f7fb0f81b9..0c8c5973d8 100644
--- a/quickstep/res/values-mn/strings.xml
+++ b/quickstep/res/values-mn/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Таамаглаж буй апп: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Та зүүн захын булангаас шударна уу."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Та дэлгэцийн зүүн булангаас дунд хэсэг хүртэл шударч, суллаарай."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Ингээд л боллоо! Одоо баруун булангаас шударч үзнэ үү."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Та баруун захын булангаас шударна уу."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Та дэлгэцийн баруун булангаас дунд хэсэг хүртэл шударч, суллаарай."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Та буцах зангааг гүйцэтгэлээ. Дараа нь Нүүр лүү хэрхэн очихыг мэдэж авна уу."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Та дэлгэцийн доод хэсэгтэй хэт ойр бүү шудраарай."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Буцах зангааны мэдрэгшлийг өөрчлөх бол Тохиргоо руу очно уу"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Буцахын тулд шудрах"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Сүүлийн дэлгэц рүү буцахын тулд дэлгэцийн зүүн эсвэл баруун булангаас дунд хэсэг рүү шударна уу."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Та дэлгэцийн доод булангаас дээш шударна уу."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Та суллахаасаа өмнө түр зогсоож болохгүй."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Та чигээрээ шударна уу."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Та Нүүр лүү очих зангааг гүйцэтгэлээ. Дараа нь аппуудыг хэрхэн сэлгэх талаар мэдэж авна уу."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Нүүр лүү очихын тулд шудрах"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Дэлгэцийнхээ доороос дээш шударна уу. Энэ зангаа таныг тогтмол Үндсэн нүүрэнд аваачна."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Та дэлгэцийн доод булангаас дээш шударна уу."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Суллахаасаа өмнө цонхыг илүү удаан дарж үзнэ үү."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Та чигээрээ шударч, дараа нь түр зогсооно уу."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Та аппуудыг сэлгэх зангааг гүйцэтгэлээ. Та утсаа ашиглахад бэлэн боллоо!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Аппуудыг сэлгэхийн тулд шудрах"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Дэлгэцийнхээ доод хэсгээс дээш шударч, удаан дараад суллана уу."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Бүгдийг тохируулсан"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Дахин оролдох"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Янзтай!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"<xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g> практик хичээл"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Тохируулж дууслаа!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Нүүр хуудас руу очихын тулд дээш шударна уу"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Та утсаа ашиглаж эхлэхэд бэлэн боллоо"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Хандалтын навигацын тохиргоо"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Хуваалцах"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Дэлгэцийн агшин дарах"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Энэ үйлдлийг апп эсвэл танай байгууллага зөвшөөрдөггүй"</string>
diff --git a/quickstep/res/values-mr/strings.xml b/quickstep/res/values-mr/strings.xml
index bac7f7867e..77173b7c2f 100644
--- a/quickstep/res/values-mr/strings.xml
+++ b/quickstep/res/values-mr/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"पूर्वानुमान केलेले अ‍ॅप: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"तुम्ही स्क्रीनच्या अगदी डाव्या कडेपासून स्‍वाइप करत आहात याची खात्री करा."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"तुम्ही स्क्रीनच्या डाव्या कडेपासून मध्यावर स्‍वाइप करून बोट उचलत आहात याची खात्री करा."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"पूर्ण झाले! आता उजव्या कोपऱ्यावरून स्वाइप करून पहा."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"तुम्ही स्क्रीनच्या अगदी उजव्या कडेपासून स्‍वाइप करत आहात याची खात्री करा."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"तुम्ही स्क्रीनच्या उजव्या कडेपासून मध्यावर स्‍वाइप करून बोट उचलत आहात याची खात्री करा."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"तुम्ही गो बॅक जेश्चर पूर्ण केले. आता, होम वर कसे जायचे ते जाणून घ्या."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"तुम्ही स्क्रीनच्या तळाच्या अगदी जवळून स्‍वाइप करत नाही याची खात्री करा."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"बॅक जेश्चरची संवेदनशीलता बदलण्यासाठी, सेटिंग्ज वर जा"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"परत जाण्यासाठी स्वाइप करा"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"मागील स्क्रीनवर परत जाण्यासाठी, स्क्रीनच्या डाव्या किंवा उजव्या कडेपासून मध्यावर स्‍वाइप करा."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"तुम्ही स्क्रीनच्या तळाच्या कडेपासून वर स्वाइप करत आहात याची खात्री करा."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"तुम्ही स्क्रीनवरून बोट उचलण्यापूर्वी ते थांबवत नाही याची खात्री करा."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"तुम्ही सरळ वर स्वाइप करत आहात याची खात्री करा."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"तुम्ही गो होम जेश्चर पूर्ण केले. आता, ॲप्स कशी स्विच करायची ते जाणून घ्या."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"होमवर जाण्यासाठी स्‍वाइप करा"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"तुमच्या स्क्रीनच्या तळाकडून वर स्वाइप करा. हे जेश्चर तुम्हाला नेहमी होम स्क्रीनवर घेऊन जाते."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"तुम्ही स्क्रीनच्या तळाच्या कडेपासून वर स्वाइप करत आहात याची खात्री करा."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"विंडोवरून बोट उचलण्यापूर्वी थोडा वेळ ते तेथेच धरून ठेवा."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"तुम्ही सरळ वर स्वाइप करून, त्यानंतर बोट थांबवत आहात याची खात्री करा."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"तुम्ही स्विच ॲप्स जेश्चर पूर्ण केले. तुम्ही तुमचा फोन वापरण्यासाठी तयार आहात!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"अ‍ॅप्स स्विच करण्यासाठी स्वाइप करा"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"तुमच्या स्क्रीनच्या तळाकडून वर स्वाइप करा, धरून ठेवा, त्यानंतर बोट उचला."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"सर्व तयार आहे"</string>
diff --git a/quickstep/res/values-ms/strings.xml b/quickstep/res/values-ms/strings.xml
index d80e6b31ff..c458c7a5e5 100644
--- a/quickstep/res/values-ms/strings.xml
+++ b/quickstep/res/values-ms/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Apl yang diramalkan: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pastikan anda meleret dari hujung sebelah kiri."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pastikan anda meleret dari tepi sebelah kiri ke tengah skrin dan lepaskan."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Itu sahaja! Sekarang, cuba leret dari tepi sebelah kanan."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pastikan anda meleret dari hujung sebelah kanan."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pastikan anda meleret dari tepi sebelah kanan ke tengah skrin dan lepaskan."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Anda telah melengkapkan gerak isyarat undur. Seterusnya, ketahui cara kembali ke Laman Utama."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pastikan anda tidak meleret terlalu dekat dengan bahagian bawah skrin."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Utk mengubah kepekaan gerak isyarat undur, pergi ke Tetapan"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Leret untuk kembali"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Untuk kembali ke skrin terakhir, leret dari tepi sebelah kiri atau kanan ke tengah skrin."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pastikan anda meleret ke atas dari tepi sebelah bawah skrin."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pastikan anda tidak menjeda sebelum melepaskan gerak isyarat tersebut."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pastikan anda meleret terus ke atas."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Anda telah melengkapkan gerak isyarat kembali ke Laman Utama. Seterusnya, ketahui cara menukar apl."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Leret untuk kembali ke laman utama"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Leret ke atas dari bahagian bawah skrin. Gerak isyarat ini sentiasa membawa anda ke Skrin utama."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Pastikan anda meleret ke atas dari tepi sebelah bawah skrin."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Cuba tahan tetingkap untuk tempoh yang lebih lama sebelum melepaskan."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Pastikan anda meleret ke atas, kemudian menjeda."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Anda telah melengkapkan gerak isyarat menukar apl. Telefon anda sudah bersedia untuk digunakan!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Leret untuk menukar apl"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Leret ke atas dari bahagian bawah skrin anda, tahan, kemudian lepaskan."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Selesai"</string>
diff --git a/quickstep/res/values-my/strings.xml b/quickstep/res/values-my/strings.xml
index d61f8008d0..8693fb1aac 100644
--- a/quickstep/res/values-my/strings.xml
+++ b/quickstep/res/values-my/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ကြိုတင်မှန်းဆထားသော အက်ပ်− <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ဘယ်ဘက်အစွန် ခပ်လှမ်းလှမ်းမှ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ဘယ်ဘက်အစွန်မှ ဖန်သားပြင်အလယ်သို့ ပွတ်ဆွဲပြီး လွှတ်လိုက်ကြောင်း သေချာပါစေ။"</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"ရပါပြီ။ ညာဘက်အစွန်မှနေ၍ ယခု ပွတ်ဆွဲကြည့်ပါ။"</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ညာဘက်အစွန် ခပ်လှမ်းလှမ်းမှ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ညာဘက်အစွန်မှ ဖန်သားပြင်အလယ်သို့ ပွတ်ဆွဲပြီး လွှတ်လိုက်ကြောင်း သေချာပါစေ။"</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"နောက်ဆုတ်လက်ဟန် ရှင်းလင်းပို့ချချက် ပြီးပါပြီ။ နောက်အဆင့်တွင် ပင်မစာမျက်နှာသို့ သွားနည်းကို လေ့လာပါ။"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ဖန်သားပြင် အောက်ခြေနှင့် အလွန်နီးကပ်စွာ ပွတ်ဆွဲခြင်းမရှိကြောင်း သေချာပါစေ။"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"နောက်ဆုတ်လက်ဟန်၏ အာရုံခံစွမ်းကိုပြောင်းရန် ‘ဆက်တင်များ’ သို့ သွားပါ"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"နောက်ပြန်သွားရန် ပွတ်ဆွဲပါ"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"နောက်ဆုံးဖန်သားပြင်သို့ ပြန်သွားရန် ဘယ်ဘက် (သို့) ညာဘက်အစွန်မှ ဖန်သားပြင်အလယ်သို့ ပွတ်ဆွဲပါ။"</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ဖန်သားပြင် အောက်ခြေအစွန်မှ အပေါ်သို့ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"လက်မလွှတ်ခင် ခဏရပ်ခြင်းမရှိကြောင်း သေချာပါစေ။"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"အပေါ်တည့်တည့်သို့ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"ပင်မစာမျက်နှာသို့သွားသည့် လက်ဟန် ရှင်းလင်းပို့ချချက် ပြီးပါပြီ။ နောက်အဆင့်တွင် အက်ပ်များပြောင်းနည်းကို လေ့လာပါ။"</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"ပင်မစာမျက်နှာသို့သွားရန် ပွတ်ဆွဲပါ"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"သင့်ဖန်သားပြင် အောက်ခြေမှ အပေါ်သို့ပွတ်ဆွဲပါ။ ဤလက်ဟန်ဖြင့် ပင်မစာမျက်နှာသို့ အမြဲပြန်သွားနိုင်သည်။"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ဖန်သားပြင် အောက်ခြေအစွန်မှ အပေါ်သို့ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"မလွှတ်ခင် ဝင်းဒိုးကို အချိန်ကြာကြာ ဖိထားကြည့်ပါ။"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"အပေါ်တည့်တည့်သို့ ပွတ်ဆွဲပြီးနောက် ခဏရပ်ကြောင်း သေချာပါစေ။"</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"အက်ပ်များပြောင်းသည့် လက်ဟန် ရှင်းလင်းပို့ချချက် ပြီးပါပြီ။ သင့်ဖုန်းကို သုံးရန် အဆင်သင့်ဖြစ်ပါပြီ။"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"အက်ပ်များပြောင်းရန် ပွတ်ဆွဲပါ"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"သင့်ဖန်သားပြင် အောက်ခြေမှ အပေါ်သို့ ပွတ်ဆွဲပါ၊ ဖိထားပြီးနောက် လွှတ်လိုက်ပါ။"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"အားလုံးအဆင်သင့်ဖြစ်ပါပြီ"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ထပ်စမ်းကြည့်ရန်"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ကောင်းသည်။"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ရှင်းလင်းပို့ချချက် <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"အားလုံး အဆင်သင့်ပါ။"</string>
+    <string name="allset_hint" msgid="459504134589971527">"ပင်မစာမျက်နှာသို့သွားရန် အပေါ်သို့ ပွတ်ဆွဲပါ"</string>
+    <string name="allset_description" msgid="6350320429953234580">"သင့်ဖုန်းကို စတင်အသုံးပြုရန် အသင့်ဖြစ်ပါပြီ"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"အများသုံးစွဲနိုင်မှုအတွက် လမ်းညွှန်ဆက်တင်များ"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"မျှဝေရန်"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ဖန်သားပြင်ဓာတ်ပုံ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ဤလုပ်ဆောင်ချက်ကို အက်ပ် သို့မဟုတ် သင်၏အဖွဲ့အစည်းက ခွင့်မပြုပါ"</string>
diff --git a/quickstep/res/values-nb/strings.xml b/quickstep/res/values-nb/strings.xml
index e725ebefb9..8dce6c016a 100644
--- a/quickstep/res/values-nb/strings.xml
+++ b/quickstep/res/values-nb/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Foreslått app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Sørg for at du sveiper fra kanten helt til venstre."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Sørg for at du sveiper fra den venstre kanten til midten av skjermen og slipper."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Så enkelt er det! Prøv nå å sveipe fra den høyre kanten."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Sørg for at du sveiper fra kanten helt til høyre."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Sørg for at du sveiper fra den høyre kanten til midten av skjermen og slipper."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Du har fullført bevegelsen for å gå tilbake. I neste trinn ser du hvordan du går til startskjermen."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Sørg for at du ikke sveiper for nær bunnen av skjermen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Gå til Innstillinger for å endre tilbakebevegelsefølsomheten"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Sveip for å gå tilbake"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"For å gå tilbake til forrige skjerm, sveip fra venstre eller høyre kant til midten av skjermen."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Sørg for at du sveiper opp fra den nederste kanten av skjermen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Sørg for at du ikke setter på pause før du slipper."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Sørg for at du sveiper rett opp."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Du har fullført bevegelsen for å gå til startskjermen. I neste trinn lærer du hvordan du bytter app."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Sveip for å gå til startskjermen"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Sveip opp fra bunnen av skjermen. Denne bevegelsen tar deg alltid til startskjermen."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Sørg for at du sveiper opp fra den nederste kanten av skjermen."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Prøv å holde vinduet lenger før du slipper."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Sørg for at du sveiper rett opp, og så stopper du."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Du har fullført bevegelsen for å bytte app. Du er klar til å bruke telefonen."</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Sveip for å bytte app"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Sveip opp fra bunnen av skjermen, hold og slipp."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Ferdig"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Prøv igjen"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bra!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Veiledning <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Alt er klart!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Sveip opp for å gå til startskjermen"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Du er klar til å begynne å bruke telefonen"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Navigasjonsinnstillinger for tilgjengelighet"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Del"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Skjermdump"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Appen eller organisasjonen din tillater ikke denne handlingen"</string>
diff --git a/quickstep/res/values-ne/strings.xml b/quickstep/res/values-ne/strings.xml
index 369649ae34..cd9f79a9fd 100644
--- a/quickstep/res/values-ne/strings.xml
+++ b/quickstep/res/values-ne/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"पूर्वानुमान गरिएको एप: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"स्क्रिनको सबैभन्दा बायाँ किनाराबाट स्वाइप गर्नुहोस्।"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"स्क्रिनको बायाँ किनाराबाट मध्य भागसम्म स्वाइप गर्नुहोस् अनि औँला उठाउनुहोस्।"</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"यत्ति हो! अब दायाँ किनाराबाट स्वाइप गरी हेर्नुहोस्।"</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"स्क्रिनको सबैभन्दा दायाँ किनाराबाट स्वाइप गर्नुहोस्।"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"स्क्रिनको दायाँ किनाराबाट मध्य भागसम्म स्वाइप गर्नुहोस् अनि औँला उठाउनुहोस्।"</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"तपाईंले \'पछाडि जानुहोस्\' नामक इसारा प्रयोग गर्ने तरिका सिक्नुभयो। अब होम स्क्रिनमा जाने तरिका सिक्नुहोस्।"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"स्क्रिनको फेदको धेरै नजिकसम्म स्वाइप नगर्नुहोस्।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"\'पछाडि\' नामक इसाराको संवेदनशीलता बदल्न सेटिङमा जानुहोस्"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"पछाडि जान स्वाइप गर्नुहोस्"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"यसअघिको स्क्रिनमा फर्कन स्क्रिनको बायाँ वा दायाँ किनाराबाट मध्य भागसम्म स्वाइप गर्नुहोस्।"</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"स्क्रिनको फेदबाट माथितिर स्वाइप गर्नुहोस्।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"औँला उठाउनुअघि नरोकिनुहोस्।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"सीधै माथितिर स्वाइप गर्नुहोस्।"</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"तपाईंले \'होम स्क्रिनमा जानुहोस्\' नामक इसारा प्रयोग गर्ने तरिका सिक्नुभयो। अब एउटा एपबाट अर्को एपमा जाने तरिका सिक्नुहोस्।"</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"होम स्क्रिनमा जान स्वाइप गर्नुहोस्"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"स्क्रिनको फेदबाट माथितिर स्वाइप गर्नुहोस्। यो इसारा प्रयोग गर्दा सधैँ होम स्क्रिन खुल्छ।"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"स्क्रिनको फेदबाट माथितिर स्वाइप गर्नुहोस्।"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"स्क्रिनबाट औँला उठाउनुअघि एपको विन्डोमा केही बेर छोइराख्नुहोस्।"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"सीधै माथितिर स्वाइप गर्नुहोस् अनि रोकिनुहोस्।"</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"तपाईंले \'एउटा एपबाट अर्को एपमा जानुहोस्\' नामक इसारा प्रयोग गर्ने तरिका सिक्नुभयो। तपाईं अब आफ्नो फोन चलाउन सक्नुहुन्छ!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"एउटा एपबाट अर्को एपमा जान स्वाइप गर्नुहोस्"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"स्क्रिनको फेदबाट माथितिर स्वाइप गर्नुहोस्, छोइराख्नुहोस् अनि औँला उठाउनुहोस्।"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"सबै तयार छ"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"फेरि प्रयास गर्नुहोस्"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"राम्रो!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ट्युटोरियल <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"सबै तयार भयो!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"होममा जान माथितिर स्वाइप गर्नुहोस्"</string>
+    <string name="allset_description" msgid="6350320429953234580">"तपाईं आफ्नो फोन चलाउन थाल्न सक्नुहुन्छ"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"सर्वसुलभताका लागि नेभिगेसनसम्बन्धी सेटिङ"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"सेयर गर्नुहोस्"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"स्क्रिनसट"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"यो एप वा तपाईंको सङ्गठनले यो कारबाही गर्ने अनुमति दिँदैन"</string>
diff --git a/quickstep/res/values-nl/strings.xml b/quickstep/res/values-nl/strings.xml
index ebf84858a1..5426128c99 100644
--- a/quickstep/res/values-nl/strings.xml
+++ b/quickstep/res/values-nl/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Voorspelde app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Swipe helemaal vanaf de linkerrand."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Swipe vanaf de linkerrand naar het midden van het scherm en laat los."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Dat is alles. Swipe nu vanaf de rechterrand."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Swipe helemaal vanaf de rechterrand."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Swipe vanaf de rechterrand naar het midden van het scherm en laat los."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Je hebt het gebaar Terug voltooid. Ontdek nu hoe je naar het startscherm gaat."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Swipe niet te dicht bij de onderkant van het scherm."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Open Instellingen om de gevoeligheid van Terug te wijzigen"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Swipe om terug te gaan"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Swipe vanaf de linker- of rechterrand naar het midden om terug te gaan naar het vorige scherm."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Swipe vanaf de onderrand van het scherm omhoog."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pauzeer niet voordat je loslaat."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Swipe recht omhoog."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Je hebt het gebaar Naar startscherm voltooid. Ontdek nu hoe je tussen apps schakelt."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Swipe om naar het startscherm te gaan"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Swipe omhoog vanaf de onderkant van het scherm. Met dit gebaar ga je altijd naar het startscherm."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Swipe vanaf de onderrand van het scherm omhoog."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Houd het venster langer vast voordat je loslaat."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Swipe recht omhoog en pauzeer dan."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Je hebt het gebaar Schakelen tussen apps voltooid. Je kunt nu je telefoon gebruiken."</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe om tussen apps te schakelen"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swipe omhoog vanaf de onderkant van het scherm, houd vast en laat dan los."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Klaar"</string>
@@ -74,7 +88,7 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Opnieuw"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Dat gaat lekker."</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="allset_title" msgid="5021126669778966707">"Klaar!"</string>
+    <string name="allset_title" msgid="5021126669778966707">"Klaar"</string>
     <string name="allset_hint" msgid="459504134589971527">"Swipe omhoog om naar het startscherm te gaan"</string>
     <string name="allset_description" msgid="6350320429953234580">"Je bent klaar om je telefoon te gebruiken"</string>
     <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Navigatie-instellingen voor toegankelijkheid"</annotation></string>
diff --git a/quickstep/res/values-or/strings.xml b/quickstep/res/values-or/strings.xml
index 9cbbd351ef..84f52b41ab 100644
--- a/quickstep/res/values-or/strings.xml
+++ b/quickstep/res/values-or/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ପୂର୍ବାନୁମାନ କରାଯାଇଥିବା ଆପ୍: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ଆପଣ ଦୂର-ବାମ ଧାରରୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ଆପଣ ସ୍କ୍ରିନର ବାମ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରି ଛାଡ଼ି ଦେଉଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"କେବଳ ଏତିକି! ବର୍ତ୍ତମାନ ଡାହାଣ ଧାରରୁ ସ୍ୱାଇପ୍ କରି ଦେଖନ୍ତୁ।"</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ଆପଣ ଦୂର-ଡାହାଣ ଧାରରୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ଆପଣ ସ୍କ୍ରିନର ଡାହାଣ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରି ଛାଡ଼ି ଦେଉଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"ଆପଣ \'ପଛକୁ ଫେରନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି। ତା\'ପରେ, ମୂଳପୃଷ୍ଠାକୁ କିପରି ଯିବେ ଜାଣନ୍ତୁ।"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ଆପଣ ସ୍କ୍ରିନର ତଳଭାଗର ଅତି ନିକଟରୁ ସ୍ୱାଇପ୍ କରୁନଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ପଛକୁ ଫେରିବା ଜେଶ୍ଚରର ସମ୍ବେଦନଶୀଳତା ବଦଳାଇବାକୁ ସେଟିଂସକୁ ଯାଆନ୍ତୁ"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"ପଛକୁ ଫେରିବା ପାଇଁ ସ୍ୱାଇପ୍ କରନ୍ତୁ"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"ପୂର୍ବବର୍ତ୍ତୀ ସ୍କ୍ରିନକୁ ଫେରିବା ପାଇଁ, ସ୍କ୍ରିନର ବାମ କିମ୍ବା ଡାହାଣ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ।"</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ଆପଣ ସ୍କ୍ରିନର ତଳ ଧାରରୁ ଉପରକୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ଆପଣ ଛାଡ଼ିବା ପୂର୍ବରୁ ବିରତ କରୁନଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ଆପଣ ସିଧା ଉପରକୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"ଆପଣ \'ମୂଳପୃଷ୍ଠାକୁ ଯାଆନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି। ତା\'ପରେ, ଆପଗୁଡ଼ିକୁ କିପରି ସ୍ୱିଚ୍ କରିବେ ଜାଣନ୍ତୁ।"</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"ମୂଳପୃଷ୍ଠାକୁ ଯିବା ପାଇଁ ସ୍ୱାଇପ୍ କରନ୍ତୁ"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"ଆପଣଙ୍କ ସ୍କ୍ରିନର ତଳୁ ଉପରକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ। ଏହି ଜେଶ୍ଚର୍ ସର୍ବଦା ଆପଣଙ୍କୁ ମୂଳସ୍କ୍ରିନକୁ ନେଇଥାଏ।"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ଆପଣ ସ୍କ୍ରିନର ତଳ ଧାରରୁ ଉପରକୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"ୱିଣ୍ଡୋକୁ ରିଲିଜ୍ କରିବା ପୂର୍ବରୁ ଅଧିକ ସମୟ ଧରି ରଖିବାକୁ ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"ଆପଣ ସିଧା ଉପରକୁ ସ୍ୱାଇପ୍ କରି ତା\'ପରେ ବିରତ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"ଆପଣ \'ଆପଗୁଡ଼ିକୁ ସ୍ୱିଚ୍ କରନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି। ଆପଣ ଆପଣଙ୍କ ଫୋନ୍ ବ୍ୟବହାର କରିବାକୁ ପ୍ରସ୍ତୁତ ଅଛନ୍ତି!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ଆପଗୁଡ଼ିକୁ ସ୍ୱିଚ୍ କରିବା ପାଇଁ ସ୍ୱାଇପ୍ କରନ୍ତୁ"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ଆପଣଙ୍କ ସ୍କ୍ରିନର ତଳୁ ଉପରକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ, ଧରି ରଖନ୍ତୁ, ତା\'ପରେ ରିଲିଜ୍ କରନ୍ତୁ।"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"ସବୁ ପ୍ରସ୍ତୁତ"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ବଢ଼ିଆ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ଟ୍ୟୁଟୋରିଆଲ୍ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"ସମ୍ପୂର୍ଣ୍ଣ ଭାବେ ପ୍ରସ୍ତୁତ!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"ମୂଳପୃଷ୍ଠାକୁ ଯିବା ପାଇଁ ଉପରକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ"</string>
+    <string name="allset_description" msgid="6350320429953234580">"ଆପଣ ଆପଣଙ୍କ ଫୋନ୍ ବ୍ୟବହାର କରିବା ପାଇଁ ପ୍ରସ୍ତୁତ ଅଛନ୍ତି"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"ଆକ୍ସେସିବିଲିଟୀ ପାଇଁ ନାଭିଗେସନ୍ ସେଟିଂସ୍"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"ସେୟାର୍ କରନ୍ତୁ"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ସ୍କ୍ରିନସଟ୍"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ଆପ୍ କିମ୍ବା ଆପଣଙ୍କ ସଂସ୍ଥା ଦ୍ୱାରା ଏହି କାର୍ଯ୍ୟକୁ ଅନୁମତି ଦିଆଯାଇ ନାହିଁ"</string>
diff --git a/quickstep/res/values-pa/strings.xml b/quickstep/res/values-pa/strings.xml
index 56b66c7f5f..fc3ea1c227 100644
--- a/quickstep/res/values-pa/strings.xml
+++ b/quickstep/res/values-pa/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ਪੂਰਵ ਅਨੁਮਾਨਿਤ ਐਪ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਦੂਰ-ਖੱਬੇ ਕਿਨਾਰੇ ਤੋਂ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਖੱਬੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰਦੇ ਹੋ ਅਤੇ ਛੱਡ ਦਿੰਦੇ ਹੋ।"</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"ਹੋ ਗਿਆ! ਹੁਣ ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਵਾਈਪ ਕਰਕੇ ਦੇੇਖੋ।"</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਦੂਰ-ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰਦੇ ਹੋ ਅਤੇ ਛੱਡ ਦਿੰਦੇ ਹੋ।"</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"ਤੁਸੀਂ \'ਵਾਪਸ ਜਾਓ\' ਦਾ ਇਸ਼ਾਰਾ ਪੂਰਾ ਕੀਤਾ। ਅੱਗੇ, ਜਾਣੋ ਕਿ ਹੋਮ \'ਤੇ ਕਿਵੇਂ ਜਾਣਾ ਹੈ।"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਲੇ ਹਿੱਸੇ ਦੇ ਬਹੁਤ ਨੇੜੇ ਸਵਾਈਪ ਨਾ ਕਰੋ।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ਪਿੱਛੇ ਜਾਣ ਦੇ ਸੰਕੇਤ ਦੀ ਸੰਵੇਦਨਸ਼ੀਲਤਾ ਬਦਲਣ ਲਈ, ਸੈਟਿੰਗਾਂ \'ਤੇ ਜਾਓ"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"ਪਿੱਛੇ ਜਾਣ ਲਈ ਸਵਾਈਪ ਕਰੋ"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"ਪਿਛਲੀ ਸਕ੍ਰੀਨ \'ਤੇ ਵਾਪਸ ਜਾਣ ਲਈ, ਖੱਬੇ ਜਾਂ ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰੋ।"</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਲੇ ਕਿਨਾਰੇ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ਪੱਕਾ ਕਰੋ ਕਿ ਸਕ੍ਰੀਨ ਨੂੰ ਛੱਡਣ ਤੋਂ ਪਹਿਲਾਂ ਰੁਕੋ ਨਾ।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਿੱਧੇ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"ਤੁਸੀਂ ਹੋਮ \'ਤੇ ਜਾਓ ਦਾ ਇਸ਼ਾਰਾ ਪੂਰਾ ਕੀਤਾ। ਅੱਗੇ, ਜਾਣੋ ਕਿ ਐਪਾਂ ਵਿਚਾਲੇ ਅਦਲਾ-ਬਦਲੀ ਕਿਵੇਂ ਕਰਨੀ ਹੈ।"</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"ਹੋਮ \'ਤੇ ਜਾਣ ਲਈ ਸਵਾਈਪ ਕਰੋ"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"ਆਪਣੀ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਾਂ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ। ਇਹ ਸੰਕੇਤ ਹਮੇਸ਼ਾਂ ਤੁਹਾਨੂੰ ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਲੈ ਜਾਂਦਾ ਹੈ।"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਲੇ ਕਿਨਾਰੇ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"ਛੱਡਣ ਤੋਂ ਪਹਿਲਾਂ ਵਿੰਡੋ ਨੂੰ ਕੁਝ ਸਮੇਂ ਲਈ ਦਬਾ ਕੇ ਰੱਖੋ।"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਿੱਧੇ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰਦੇ ਹੋ, ਫਿਰ ਰੋਕੋ।"</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"ਤੁਸੀਂ ਐਪਾਂ ਵਿਚਾਲੇ ਅਦਲਾ-ਬਦਲੀ ਦਾ ਇਸ਼ਾਰਾ ਪੂਰਾ ਕੀਤਾ। ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ ਤਿਆਰ ਹੋ!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ਐਪਾਂ ਵਿਚਾਲੇ ਅਦਲਾ-ਬਦਲੀ ਕਰਨ ਲਈ ਸਵਾਈਪ ਕਰੋ"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ਆਪਣੀ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਾਂ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰਕੇ ਦਬਾਈ ਰੱਖੋ, ਅਤੇ ਫਿਰ ਛੱਡੋ।"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"ਪੂਰੀ ਤਰ੍ਹਾਂ ਤਿਆਰ"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ਵਧੀਆ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ਟਿਊਟੋਰੀਅਲ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"ਪੂਰੀ ਤਰ੍ਹਾਂ ਤਿਆਰ!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"ਹੋਮ \'ਤੇ ਜਾਣ ਲਈ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ"</string>
+    <string name="allset_description" msgid="6350320429953234580">"ਤੁਸੀਂ ਆਪਣਾ ਫ਼ੋਨ ਵਰਤਣ ਲਈ ਤਿਆਰ ਹੋ"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"ਪਹੁੰਚਯੋਗਤਾ ਲਈ ਨੈਵੀਗੇਸ਼ਨ ਸੈਟਿੰਗਾਂ"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"ਸਾਂਝਾ ਕਰੋ"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ਸਕ੍ਰੀਨਸ਼ਾਟ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ਐਪ ਜਾਂ ਤੁਹਾਡੀ ਸੰਸਥਾ ਵੱਲੋਂ ਇਸ ਕਾਰਵਾਈ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ"</string>
diff --git a/quickstep/res/values-pl/strings.xml b/quickstep/res/values-pl/strings.xml
index e01dc081a7..e76b357d01 100644
--- a/quickstep/res/values-pl/strings.xml
+++ b/quickstep/res/values-pl/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Przewidywana aplikacja: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pamiętaj, aby przesuwać palcem od samej lewej krawędzi."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pamiętaj, aby przesuwać palcem od lewej krawędzi do środka ekranu, a potem podnieść palec."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Dobrze. Teraz przesuń palcem od prawej krawędzi."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pamiętaj, aby przesuwać palcem od samej prawej krawędzi."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pamiętaj, aby przesuwać palcem od prawej krawędzi do środka ekranu, a potem podnieść palec."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Gest przejścia wstecz został opanowany. Poćwicz teraz przechodzenie na ekran główny."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pamiętaj, aby nie przesuwać palcem zbyt blisko dolnej części ekranu."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Czułość gestu cofania możesz zmienić w Ustawieniach"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Przesuwanie palcem, aby przejść wstecz"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Aby wrócić do ostatniego ekranu, przesuń palcem od lewej lub prawej krawędzi do środka ekranu."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pamiętaj, aby przesuwać palcem od dolnej krawędzi ekranu."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pamiętaj, aby przed podniesieniem palca nie było przerwy."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pamiętaj, aby przesuwać palcem prosto do góry."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Gest przechodzenia na ekran główny został opanowany. Poćwicz teraz przełączanie aplikacji."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Przesuwanie palcem, aby przejść na ekran główny"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Przesuń palcem z dołu ekranu. Ten gest zawsze powoduje przejście na ekran główny."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Pamiętaj, aby przesuwać palcem od dolnej krawędzi ekranu."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Przytrzymaj okno dłużej, zanim podniesiesz palec."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Pamiętaj, aby przesuwać palcem prosto do góry, a potem przerwać ruch."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Gest przełączania aplikacji został opanowany. Możesz już używać telefonu."</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Przesuwanie palcem, aby przełączać aplikacje"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Przesuń palcem od dołu ekranu, przytrzymaj i puść."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Wszystko gotowe"</string>
diff --git a/quickstep/res/values-pt-rPT/strings.xml b/quickstep/res/values-pt-rPT/strings.xml
index 5fd560ab83..f5dc80d99b 100644
--- a/quickstep/res/values-pt-rPT/strings.xml
+++ b/quickstep/res/values-pt-rPT/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App prevista: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Garanta que desliza rapidamente com o dedo a partir da extremidade esquerda."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Garanta que desliza rapidamente com o dedo do limite esquerdo até ao centro do ecrã e solta."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Já está! Agora deslize rapidamente do limite direito."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Garanta que desliza rapidamente com o dedo a partir da extremidade direita."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Garanta que desliza rapidamente com o dedo do limite direito até ao centro do ecrã e solta."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Concluiu o gesto para retroceder. A seguir, saiba como aceder à Página inicial."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Garanta que não desliza rapidamente com o dedo demasiado perto da parte inferior do ecrã."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Altere a sensibilidade do gesto para voltar nas Definições."</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Deslize rapidamente com o dedo para retroceder"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Para voltar ao último ecrã, deslize rapidamente do limite esquerdo ou direito até ao centro do ecrã."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Garanta que desliza rapidamente com o dedo a partir do limite inferior do ecrã."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Garanta que não faz uma pausa antes de soltar."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Garanta que desliza rapidamente com o dedo para cima."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Concluiu o gesto para aceder à Página inicial. A seguir, saiba como alternar entre apps."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Deslize rapidamente com o dedo para aceder à Página inicial"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Deslize rapidamente para cima a partir da parte inferior. Este gesto abre sempre o ecrã principal."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Garanta que desliza rapidamente com o dedo a partir do limite inferior do ecrã."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Experimente premir a janela durante mais tempo antes de soltar."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Garanta que desliza rapidamente com o dedo para cima e, em seguida, faz uma pausa."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Concluiu o gesto para alternar entre apps. Já pode utilizar o seu telemóvel!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Deslize rapidamente com o dedo para alternar entre apps"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Deslize rapidamente para cima a partir da parte inferior do ecrã sem soltar e, em seguida, solte."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Está tudo pronto"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Tente novamente"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Boa!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Tudo pronto!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Deslize rapidamente para cima para aceder ao ecrã principal"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Já pode começar a utilizar o seu telemóvel"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Definições de navegação para acessibilidade"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Partilhar"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Fazer captura de ecrã"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Esta ação não é permitida pela app ou a sua entidade."</string>
diff --git a/quickstep/res/values-pt/strings.xml b/quickstep/res/values-pt/strings.xml
index 704afb6988..55b7f52ed1 100644
--- a/quickstep/res/values-pt/strings.xml
+++ b/quickstep/res/values-pt/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App previsto: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Deslize da borda esquerda."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Deslize da borda esquerda até o meio da tela e solte."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Pronto! Agora tente deslizar da borda direita."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Deslize da borda direita."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Deslize da borda direita até o meio da tela e solte."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Você concluiu o gesto para voltar. A seguir, aprenda a acessar a tela inicial."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Não deslize perto demais da parte inferior da tela."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Mude a sensibilidade do gesto de voltar nas configurações"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Deslize para voltar"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Para voltar à tela anterior, deslize da borda esquerda ou direita até o meio da tela."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Deslize da borda inferior da tela para cima."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Não pare antes de soltar."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Deslize para cima."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Você concluiu o gesto para acessar a tela inicial. A seguir, aprenda a trocar de app."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Deslizar para voltar à tela inicial"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Deslize de baixo para cima na tela. Esse gesto sempre leva você para a tela inicial."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Deslize da borda inferior da tela para cima."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Mantenha a janela pressionada por mais tempo antes de soltar."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Deslize para cima e pare."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Você concluiu o gesto para trocar de app. Você já pode usar o smartphone."</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Deslizar para trocar de app"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Deslize de baixo para cima na tela, mantenha-a pressionada e depois solte."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Tudo pronto"</string>
diff --git a/quickstep/res/values-ro/strings.xml b/quickstep/res/values-ro/strings.xml
index ae781fec7f..b03ea41d1a 100644
--- a/quickstep/res/values-ro/strings.xml
+++ b/quickstep/res/values-ro/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplicația estimată: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Glisați dinspre marginea stângă îndepărtată."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Glisați dinspre marginea stângă spre mijlocul ecranului și eliberați."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Atât! Acum încercați să glisați dinspre marginea dreaptă."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Glisați dinspre marginea dreaptă îndepărtată."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Glisați dinspre marginea dreaptă spre mijlocul ecranului și eliberați."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Ați finalizat gestul „Înapoi”. În continuare, aflați cum să accesați pagina de pornire."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nu glisați prea aproape de partea de jos a ecranului."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Schimbați sensibilitatea gestului „Înapoi” accesând Setările"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Glisați pentru a reveni"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Pentru a reveni la ultimul ecran, glisați de la marginea stângă sau dreaptă spre mijlocul ecranului."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Glisați în sus dinspre marginea de jos a ecranului."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Nu întrerupeți gestul înainte de a elibera."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Glisați direct în sus."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Ați finalizat gestul „Pagina de pornire”. În continuare, aflați cum să comutați aplicațiile."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Glisați pentru a accesa pagina de pornire"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Glisați în sus din partea de jos a ecranului. Cu acest gest accesați întotdeauna ecranul de pornire."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Glisați în sus dinspre marginea de jos a ecranului."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Încercați să țineți fereastra mai mult înainte s-o eliberați."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Glisați direct în sus, apoi întrerupeți."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Ați finalizat gestul „schimbați aplicațiile”. Sunteți gata să vă folosiți telefonul!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Glisați pentru a comuta între aplicații"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Glisați în sus din partea de jos a ecranului, așteptați, apoi eliberați."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Gata"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Reîncercați"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bravo!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorialul <xliff:g id="CURRENT">%1$d</xliff:g> / <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Gata!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Glisați în sus pentru a accesa pagina principală"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Sunteți gata să folosiți telefonul"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Setări de navigare pentru accesibilitate"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Distribuiți"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Captură de ecran"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Această acțiune nu este permisă de aplicație sau de organizația dvs."</string>
diff --git a/quickstep/res/values-ru/strings.xml b/quickstep/res/values-ru/strings.xml
index 608ebd43da..f98d5d57ab 100644
--- a/quickstep/res/values-ru/strings.xml
+++ b/quickstep/res/values-ru/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Рекомендуемое приложение: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Проведите слева направо от самого края экрана."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Проведите от левого края экрана до середины дисплея и отпустите палец."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Готово! Теперь попробуйте провести от правого края экрана."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Проведите справа налево от самого края экрана."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Проведите от правого края экрана до середины дисплея и отпустите палец."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Вы выполнили жест \"Назад\". Далее мы расскажем, как переходить на главный экран."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Проведите пальцем не слишком близко к нижнему краю экрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Уровень чувствительности можно изменить в настройках."</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Возврат к предыдущему экрану"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Чтобы вернуться к предыдущему экрану, проведите от левого или правого края дисплея к центру."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Проведите снизу вверх от самого края экрана."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Не приостанавливайтесь перед тем, как отпустить палец."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Проведите по экрану ровно вверх."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Вы выполнили жест \"На главный экран\". Далее мы расскажем, как переключаться между приложениями."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Переход на главный экран"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Проведите вверх от нижнего края дисплея. Этот жест открывает главный экран."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Проведите снизу вверх от самого края экрана."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Прежде чем отпускать палец, задержите его на дисплее подольше."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Проведите по экрану ровно вверх, а затем задержите палец в крайнем положении."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Вы выполнили жест \"Переключение между приложениями\". Теперь вы готовы начать работу с телефоном."</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Переключение между приложениями"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Проведите вверх от нижнего края экрана, задержите палец в крайнем положении, а затем отпустите."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Готово"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Повторите попытку"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Поздравляем!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Руководство (шаг <xliff:g id="CURRENT">%1$d</xliff:g> из <xliff:g id="TOTAL">%2$d</xliff:g>)"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Готово!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Чтобы перейти на главный экран, проведите вверх."</string>
+    <string name="allset_description" msgid="6350320429953234580">"Теперь вы можете использовать телефон."</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Настройки навигации для функции \"Специальные возможности\""</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Поделиться"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Скриншот"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Это действие заблокировано приложением или организацией."</string>
diff --git a/quickstep/res/values-si/strings.xml b/quickstep/res/values-si/strings.xml
index 64cf9cc956..59d0d6f125 100644
--- a/quickstep/res/values-si/strings.xml
+++ b/quickstep/res/values-si/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"පුරෝකථනය කළ යෙදුම: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ඔබ ඈත වම් දාරයෙන් ස්වයිප් කරන බවට සහතික කර ගන්න."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ඔබ වම් දාරයේ සිට තිරයේ මැදට ස්වයිප් කර අත හරින බව සහතික කර ගන්න."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"එච්චරයි! දැන් දකුණු දාරයෙන් ස්වයිප් කිරීම උත්සාහ කරන්න."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ඔබ ඈත දකුණු දාරයෙන් ස්වයිප් කරන බවට සහතික කර ගන්න."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ඔබ දකුණු දාරයේ සිට තිරයේ මැදට ස්වයිප් කර අත හරින බව සහතික කර ගන්න."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"ඔබ ආපසු යාමේ ඉංගිතය සම්පූර්ණ කරන ලදි. ඊළඟට, මුල් පිටුවට යන ආකාරය දැන ගන්න."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ඔබ තිරයේ පහළට ඉතාම සමීපව ස්වයිප් නොකරන බවට සහතික කර ගන්න."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ආපසු ඉංගිතයෙහි සංවේදීතාව වෙනස් කිරීමට, සැකසීම් වෙත යන්න"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"ආපසු යාමට ස්වයිප් කරන්න"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"අවසාන තිරයට ආපසු යාමට, වම් හෝ දකුණු දාරයෙන් තිරයේ මැදට ස්වයිප් කරන්න."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ඔබ තිරයේ පහළ දාරයේ සිට ඉහළට ස්වයිප් කරන බව සහතික කර ගන්න."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"යාමට ඉඩ හැරීමට පෙර ඔබ විරාමයක් නොගන්නා බව සහතික කර ගන්න."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ඔබ කෙලින්ම ඉහළට ස්වයිප් කරන බව සහතික කර ගන්න."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"ඔබ මුල් පිටුවට යාමේ ඉංගිතය සම්පූර්ණ කරන ලදි. ඊළඟට, යෙදුම් මාරු කරන ආකාරය දැන ගන්න."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"මුල් පිටුවට යාමට ස්වයිප් කරන්න"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"ඔබගේ තිරයේ පහළින් උඩට ස්වයිප් කරන්න.මෙම ඉංගිතය සැම විටම ඔබව මුල් තිරයට ගෙන යයි."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ඔබ තිරයේ පහළ දාරයේ සිට ඉහළට ස්වයිප් කරන බව සහතික කර ගන්න."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"මුදා හැරීමට පෙර කවුළුව වැඩි වේලාවක් රඳවා තබා ගැනීමට උත්සාහ කරන්න."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"ඔබ කෙලින්ම ඉහළට ස්වයිප් කර, අනතුරුව විරාම කරන බව සහතික කර ගන්න."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"ඔබ යෙදුම් මාරු කිරීමේ ඉංගිතය සම්පූර්ණ කළේය. ඔබ ඔබගේ දුරකථනය භාවිත කිරීමට සූදානම්ය!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"යෙදුම් මාරු කිරීමට ස්වයිප් කරන්න"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ඔබගේ තිරයේ පහළින් උඩට ස්වයිප් කර, අල්ලාගෙන සිට, අනතුරුව මුදා හරින්න."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"සියල්ල සකසා ඇත"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"නැවත උත්සාහ කරන්න"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"කදිමයි!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"නිබන්ධනය <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"සියල්ල සූදානම්!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"මුල් පිටුවට යාමට ඉහළට ස්වයිප් කරන්න"</string>
+    <string name="allset_description" msgid="6350320429953234580">"ඔබ ඔබගේ දුරකථනය භාවිත කිරීම පටන් ගැනීමට සූදානම්"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"ප්‍රවේශ්‍යතාව සඳහා සංචාලන සැකසීම්"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"බෙදා ගන්න"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"තිර රුව"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"මෙම ක්‍රියාව යෙදුම හෝ ඔබේ සංවිධානය මගින් ඉඩ නොදේ"</string>
diff --git a/quickstep/res/values-sk/strings.xml b/quickstep/res/values-sk/strings.xml
index 56f0616e6f..7d2d0b7b4b 100644
--- a/quickstep/res/values-sk/strings.xml
+++ b/quickstep/res/values-sk/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predpovedaná aplikácia: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Musite potiahnuť z úplne krajného ľavého okraja."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Musíte potiahnuť z ľavého okraja do stredu obrazovky a uvoľniť."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Hotovo! Teraz skúste potiahnuť z pravého okraja."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Musite potiahnuť z úplne krajného pravého okraja."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Musíte potiahnuť z pravého okraja do stredu obrazovky a uvoľniť."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Dokončili ste gesto na prejdenie späť. V ďalšom kroku sa naučíte, ako prejsť na plochu."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nesmiete potiahnuť príliš blízko dolnej časti obrazovky."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Ak chcete zmeniť citlivosť gesta Späť, prejdite do Nastavení"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Prejdite späť potiahnutím"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Na poslednú obrazovku prejdete potiahnutím z ľavého alebo pravého okraja do stredu obrazovky."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Musíte potiahnuť nahor z dolného okraja obrazovky."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pred uvoľnením nesmiete zastať."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Musíte potiahnuť priamo hore."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Dokončili ste gesto na prechod na plochu. V ďalšom kroku sa naučíte, ako prepínať aplikácie."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Prechod na plochu potiahnutím"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Potiahnite nahor z dolného okraja obrazovky. Týmto gestom sa vždy vrátite na plochu."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Musíte potiahnuť nahor z dolného okraja obrazovky."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Skúste okno pred uvoľnením podržať dlhšie."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Musite potiahnuť priamo hore a potom zastať."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Dokončili ste gesto na prepnutie aplikácií. Môžete začať používať telefón."</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Prepínanie aplikácií potiahnutím"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Potiahnite nahor z dolnej časti obrazovky, pridržte a uvoľnite."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Hotovo"</string>
diff --git a/quickstep/res/values-sl/strings.xml b/quickstep/res/values-sl/strings.xml
index 55a0fbad41..9458b8cd91 100644
--- a/quickstep/res/values-sl/strings.xml
+++ b/quickstep/res/values-sl/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predvidena aplikacija: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pazite, da ne povlečete s skrajno levega roba."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pazite, da povlečete z levega roba do sredine zaslona in dvignete prst."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"To je vse. Zdaj preizkusite vlečenje z levega roba."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pazite, da ne povlečete s skrajno desnega roba."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pazite, da povlečete z desnega roba do sredine zaslona in dvignete prst."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Izvedli ste potezo za nazaj. Zdaj se naučite, kako se pomaknete na začetni zaslon."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pazite, da ne povlečete preblizu dna zaslona."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Občutljivost poteze za nazaj lahko spremenite v nastavitvah."</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Povlecite za vrnitev."</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Če se želite vrniti na zadnji zaslon, povlecite z levega ali desnega roba do sredine zaslona."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pazite, da povlečete s spodnjega roba zaslona navzgor."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pazite, da ne zaustavite prsta, preden ga dvignete."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pazite, da povlečete naravnost navzgor."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Izvedli ste potezo za pomik na začetni zaslon. Zdaj se naučite preklapljanja med aplikacijami."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Vlečenje za pomik na začetni zaslon"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Z dna zaslona s prstom povlecite navzgor. S to potezo lahko vedno odprete začetni zaslon."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Pazite, da povlečete s spodnjega roba zaslona navzgor."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Poskusite okno pridržati dalj časa, preden ga izpustite."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Pazite, da povlečete naravnost navzgor in nato zaustavite prst."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Izvedli ste potezo za preklapljanje med aplikacijami. Pripravljeni ste na uporabo telefona."</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Vlečenje za preklapljanje med aplikacijami"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Povlecite navzgor z dna zaslona, pridržite, nato izpustite."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Zdaj znate"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Poskusite znova"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Odlično!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Vadnica <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Končano"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Povlecite navzgor za začetni zaslon"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Pripravljeni ste, da začnete uporabljati telefon"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Nastavitve krmarjenja za dostopnost"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Deli"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Posnetek zaslona"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikacija ali vaša organizacija ne dovoljuje tega dejanja"</string>
diff --git a/quickstep/res/values-sq/strings.xml b/quickstep/res/values-sq/strings.xml
index 73d983baab..046155ed91 100644
--- a/quickstep/res/values-sq/strings.xml
+++ b/quickstep/res/values-sq/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplikacioni i parashikuar: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Sigurohu që të rrëshqasësh shpejt nga skaji sa më majtas."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Sigurohu që të rrëshqasësh shpejt nga skaji i majtë drejt mesit të ekranit dhe lëshoje."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Kaq ishte! Tani provo të rrëshqasësh shpejt nga skaji i djathtë."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Sigurohu që të rrëshqasësh shpejt nga skaji sa më djathtas."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Sigurohu që të rrëshqasësh shpejt nga skaji i djathtë drejt mesit të ekranit dhe lëshoje."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"E ke përfunduar gjestin e kthimit prapa. Në vijim do të mësosh si të shkosh tek ekrani bazë."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Sigurohu që të mos rrëshqasësh shumë afër fundit të ekranit."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Për të ndryshuar ndjeshmërinë e gjestit të kthimit prapa, shko te \"Cilësimet\""</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Rrëshqit shpejt për t\'u kthyer prapa"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Për t\'u kthyer prapa tek ekrani i fundit, rrëshqit shpejt nga skaji i majtë ose i djathtë drejt mesit të ekranit"</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Sigurohu që të rrëshqasësh shpejt lart nga skaji i poshtëm i ekranit."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Sigurohu që të mos ndalosh para se ta lëshosh."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Sigurohu që të rrëshqasësh shpejt drejt lart."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"E ke përfunduar gjestin e kalimit tek ekrani bazë. Në vijim do të mësosh se si t\'i ndërrosh aplikacionet."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Rrëshqit shpejt për të kaluar tek ekrani bazë"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Rrëshqit shpejt lart nga fundi i ekranit tënd. Ky gjest të dërgon gjithmonë tek ekrani bazë."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Sigurohu që të rrëshqasësh shpejt lart nga skaji i poshtëm i ekranit."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Provo ta mbash shtypur dritaren për një kohë më të gjatë para se ta lëshosh."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Sigurohu që të rrëshqasësh shpejt drejt lart dhe më pas ndalo."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"E ke përfunduar gjestin e ndërrimit të aplikacioneve. Je gati për të përdorur telefonin!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Rrëshqit shpejt për të ndërruar aplikacionet"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Rrëshqit shpejt lart nga fundi i ekranit, mbaje të shtypur dhe më pas lëshoje."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Plotësisht gati"</string>
diff --git a/quickstep/res/values-sr/strings.xml b/quickstep/res/values-sr/strings.xml
index 900950f1bf..4288e4adba 100644
--- a/quickstep/res/values-sr/strings.xml
+++ b/quickstep/res/values-sr/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Предвиђамо апликацију: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Обавезно превуците од саме леве ивице."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Обавезно превуците од леве ивице до средине екрана и отпустите."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"То је све! Сада пробајте да превучете од десне ивице."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Обавезно превуците од саме десне ивице."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Обавезно превуците од десне ивице до средине екрана и отпустите."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Довршили сте покрет за повратак. Сада сазнајте како да одете на почетну страницу."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Никако не превлачите превише близу дна екрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Осетљивост пок. за назад можете да промените у Подешавањима"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Превуците да бисте се вратили"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Да бисте се вратили на последњи екран, превуците од леве или десне ивице до средине екрана."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Обавезно превуците нагоре од доње ивице екрана."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Никако не стајте пре отпуштања."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Обавезно превуците право нагоре."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Довршили сте покрет за повратак на почетну страницу. Сада сазнајте како да промените апликације."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Превуците да бисте отишли на почетну страницу"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Превуците нагоре од дна екрана. Овај покрет вас увек води на почетни екран."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Обавезно превуците нагоре од доње ивице екрана."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Пробајте да држите прозор дуже пре отпуштања."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Обавезно превуците право нагоре, па застаните."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Довршили сте покрет за промену апликација. Спремни сте за коришћење телефона!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Превуците да бисте променили апликације"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Превуците нагоре од дна екрана, задржите, па пустите."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"То је то"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Пробајте поново"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Свака част!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Водич <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Готово!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Превуците нагоре да бисте отворили почетни екран"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Спремни сте да почнете да користите телефон"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Подешавања навигације за приступачност"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Дели"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Снимак екрана"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Апликација или организација не дозвољавају ову радњу"</string>
diff --git a/quickstep/res/values-sv/strings.xml b/quickstep/res/values-sv/strings.xml
index ce256db563..dd3490b4b9 100644
--- a/quickstep/res/values-sv/strings.xml
+++ b/quickstep/res/values-sv/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Appförslag: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Se till att du sveper ända från vänsterkanten."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Se till att du sveper från den vänstra kanten till mitten av skärmen och sedan släpper."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Så där ja! Nu kan du testa att svepa från högerkanten."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Se till att du sveper ända från högerkanten."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Se till att du sveper från den högra kanten till mitten av skärmen och sedan släpper."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Du är klar med rörelsen för att gå tillbaka. Nu ska du få lära dig hur du öppnar startskärmen."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Se till att du inte sveper för nära skärmens nederkant."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Öppna inställningarna om du vill ändra rörelsens känslighet"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Svep för att återgå"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Återgå till den senaste skärmen genom att svepa från skärmens vänster- eller högerkant till mitten."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Se till att du sveper från nederkanten på skärmen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Se till att du sveper i en jämn rörelse innan du släpper."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Se till att du sveper rakt uppåt."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Du är klar med rörelsen för att öppna startskärmen. Nu ska du få lära dig hur du byter mellan appar."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Svep för att öppna startskärmen"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Svep uppåt från skärmens nederkant. Du kan alltid återgå startskärmen med den här rörelsen."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Se till att du sveper från nederkanten på skärmen."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Testa att trycka längre på fönstret innan du släpper."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Se till att du sveper rakt uppåt och sedan pausar."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Du är klar med rörelsen för att byta mellan appar. Nu kan du börja använda telefonen!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Svep för att byta mellan appar"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Svep uppåt från skärmens nederkant. Håll fingret nedtryckt och släpp sedan."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Klart"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Försök igen"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bra!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Självstudie <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Klart!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Svep uppåt för att öppna startskärmen"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Nu kan du börja använda telefonen"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Navigeringsinställningar för tillgänglighet"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Dela"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Skärmbild"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Appen eller organisationen tillåter inte den här åtgärden"</string>
diff --git a/quickstep/res/values-sw/strings.xml b/quickstep/res/values-sw/strings.xml
index 92b7839a76..603d3703d2 100644
--- a/quickstep/res/values-sw/strings.xml
+++ b/quickstep/res/values-sw/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Programu iliyotabiriwa: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Hakikisha unatelezesha kidole kuanzia ukingo wa mbali wa kushoto."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Hakikisha unatelezesha kidole kuanzia ukingo wa kushoto kuelekea katikati ya skrini na uachilie."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Ni hivyo tu! Sasa jaribu kutelezesha kidole kuanzia ukingo wa kuilia."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Hakikisha unatelezesha kidole kuanzia ukingo wa mbali wa kulia."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Hakikisha unatelezesha kidole kuanzia ukingo wa kulia kuelekea katikati ya skrini na uachilie."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Umekamilisha ishara ya kurudi nyuma. Inayofuata, jifunze jinsi ya kwenda kwenye Skrini ya kwanza."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Hakikisha hutelezeshi kidole karibu sana na sehemu ya chini ya skrini."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Kubadilisha hisi ya ishara ya nyuma, nenda kwenye Mipangilio"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Telezesha kidole ili urudi nyuma"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Ili urudi kwenye skrini iliyotangulia, telezesha kidole kuanzia ukingo wa kushoto au wa kulia kuelekea katikati ya skrini."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Hakikisha unatelezesha kidole juu kuanzia ukingo wa chini wa skrini."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Hakikisha kuwa husimamishi kabla ya kuachilia."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Hakikisha unatelezesha kidole kuelekea juu."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Umekamilisha ishara ya kwenda kwenye Skrini ya kwanza. Hatua inayofuata, jifunze jinsi ya kubadilisha programu."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Telezesha kidole ili uende kwenye skrini ya kwanza"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Telezesha kidole juu kuanzia chini ya skrini yako. Ishara hii kila wakati hukupeleka kwenye Skrini ya kwanza."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Hakikisha unatelezesha kidole juu kuanzia ukingo wa chini wa skrini."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Jaribu kushikilia dirisha kwa muda mrefu kabla ya kuachilia."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Hakikisha unatelezesha kidole kuelekea juu, kisha usimamishe."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Umekamilisha ishara ya kubadilisha programu. Uko tayari kutumia simu yako!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Telezesha kidole ili ubadilishe programu"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Telezesha kidole juu kuanzia sehemu ya chini ya skrini yako, ushikilie, kisha uachilie."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Kila kitu kiko tayari"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Jaribu tena"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Safi!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Mafunzo ya <xliff:g id="CURRENT">%1$d</xliff:g> kati ya <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Tayari!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Telezesha kidole juu ili uende kwenye skrini ya kwanza"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Uko tayari kuanza kutumia simu yako"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Mipangilio ya kusogeza kwa ajili ya ufikivu"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Shiriki"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Picha ya skrini"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Kitendo hiki hakiruhusiwi na programu au shirika lako"</string>
diff --git a/quickstep/res/values-ta/strings.xml b/quickstep/res/values-ta/strings.xml
index cd8e3a3b4e..a2bc05b6b1 100644
--- a/quickstep/res/values-ta/strings.xml
+++ b/quickstep/res/values-ta/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"கணித்த ஆப்ஸ்: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"இடது ஓரத்தின் விளிம்பிலிருந்து ஸ்வைப் செய்கிறீர்கள் என்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"இடது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்தபிறகு விடுவிப்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"அவ்வளவுதான்! இப்போது வலது ஓரத்திலிருந்து ஸ்வைப் செய்க."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"வலது ஓரத்தின் விளிம்பிலிருந்து ஸ்வைப் செய்கிறீர்கள் என்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"வலது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்தபிறகு விடுவிப்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"பின்செல் சைகைப் பயிற்சியை முடித்துவிட்டீர்கள். அடுத்து, முகப்புக்குச் செல்வது எப்படி என்பதை அறிக."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"திரையின் கீழ்பகுதிக்கு மிக நெருக்கமாக ஸ்வைப் செய்யவில்லை என்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"பின்செல் சைகையின் உணர்திறனை மாற்ற அமைப்புகளுக்குச் செல்க"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"பின்செல்ல ஸ்வைப் செய்யுங்கள்"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"முந்தைய திரைக்கு மீண்டும் செல்ல, இடது/வலது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்க."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"திரையின் கீழ் ஓரத்திலிருந்து மேல்நோக்கி ஸ்வைப் செய்வதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"விடுவிப்பதற்கு முன்பாக இடைநிறுத்தவில்லை என்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"மேல்நோக்கி நேராக ஸ்வைப் செய்வதை உறுதிசெய்துகொள்ளுங்கள்."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"முகப்புக்குச் செல் சைகைப் பயிற்சியை முடித்துவிட்டீர்கள். அடுத்து, ஆப்ஸுக்கிடையே மாறுவது எப்படி என்பதை அறிக."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"முகப்புக்குச் செல்ல ஸ்வைப் செய்யுங்கள்"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"திரையின் கீழிருந்து மேலாக ஸ்வைப் செய்க. இந்தச் சைகை எப்போதும் முகப்புத் திரைக்கு அழைத்துச் செல்லும்."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"திரையின் கீழ் ஓரத்திலிருந்து மேல்நோக்கி ஸ்வைப் செய்வதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"விடுவிப்பதற்கு முன்பாக நீண்டநேரம் சாளரத்தை அழுத்திப் பிடித்திருங்கள்."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"மேல்நோக்கி நேராக ஸ்வைப் செய்தபிறகு இடைநிறுத்துவதை உறுதிசெய்துகொள்ளுங்கள்."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"ஆப்ஸுக்கிடையே மாறும் சைகைப் பயிற்சியை முடித்துவிட்டீர்கள். உங்கள் மொபைலைப் பயன்படுத்தத் தயாராகிவிட்டீர்கள்!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ஆப்ஸுக்கிடையே மாற ஸ்வைப் செய்யுங்கள்"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"திரையின் கீழிலிருந்து மேலாக ஸ்வைப் செய்து, சில விநாடிகள் பிடித்திருந்து, பிறகு விரலை எடுங்கள்."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"எல்லாம் தயார்"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"மீண்டும் முயல்க"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"அருமை!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"பயிற்சி <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"அனைத்தையும் அமைத்துவிட்டீர்கள்!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"முகப்புக்குச் செல்ல மேல்நோக்கி ஸ்வைப் செய்யுங்கள்"</string>
+    <string name="allset_description" msgid="6350320429953234580">"மொபைலைப் பயன்படுத்தத் தயாராகிவிட்டீர்கள்"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"அணுகல்தன்மைக்கான வழிசெலுத்தல் அமைப்புகள்"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"பகிர்"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ஸ்கிரீன்ஷாட்"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ஆப்ஸோ உங்கள் நிறுவனமோ இந்த செயலை அனுமதிப்பதில்லை"</string>
diff --git a/quickstep/res/values-te/strings.xml b/quickstep/res/values-te/strings.xml
index 5e8230c4e4..bc122eb50d 100644
--- a/quickstep/res/values-te/strings.xml
+++ b/quickstep/res/values-te/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"సూచించబడిన యాప్: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"మీరు చాలా-ఎడమ అంచు నుండి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"మీరు ఎడమ అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేశారని నిర్ధారించుకోని, ఆపై మీ వేలిని ఎత్తండి."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"అంతే! ఇప్పుడు కుడి అంచు నుండి స్వైప్ చేయడానికి ట్రై చేయండి."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"మీరు చాలా-కుడి అంచు నుండి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"మీరు కుడి అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేశారని నిర్ధారించుకోని, ఆపై మీ వేలిని ఎత్తండి."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"మీరు తిరిగి వెళ్లే సంజ్ఞను పూర్తి చేశారు. తర్వాత, మొదటి ట్యాబ్‌కు ఎలా వెళ్లాలో తెలుసుకోండి."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"మీరు స్క్రీన్ దిగువకు చాలా దగ్గరగా స్వైప్ చేయలేదని నిర్ధారించుకోండి."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"వెనుక సంజ్ఞ సున్నితత్వం మార్చడానికి, సెట్టింగ్‌లకు వెళ్లండి"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"వెనుకకు వెళ్ళడం కోసం స్వైప్ చేయండి"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"మునుపటి స్క్రీన్‌కు తిరిగి వెళ్లడానికి, ఎడమ లేదా కుడి అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేయండి."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"మీరు స్క్రీన్ దిగువ అంచు నుండి పైకి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"బయలుదేరే ముందు మీరు పాజ్ చేయకుండా చూసుకోండి."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"మీరు నేరుగా పైకి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"మీరు మొదటి ట్యాబ్‌కు వెళ్లే సంజ్ఞను పూర్తి చేశారు. తర్వాత, యాప్‌ల మధ్య ఎలా మార్చాలో తెలుసుకోండి."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"వర్చువల్ హోమ్‌కి వెళ్లడానికి స్వైప్ చేయండి"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"మీ స్క్రీన్ కింది నుండి పైకి స్వైప్ చేయి. ఈ సంజ్ఞ ఎప్పుడూ మిమ్మల్ని మొదటి స్క్రీన్‌కు తీసుకెళ్తుంది."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"మీరు స్క్రీన్ దిగువ అంచు నుండి పైకి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"రిలీజ్ చేయడానికి ముందు విండోను ఎక్కువసేపు పట్టుకోడానికి ట్రై చేయండి."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"మీరు నేరుగా స్వైప్ చేశారని నిర్ధారించుకోండి, ఆపై పాజ్ చేయండి."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"మీరు \'యాప్‌ల మధ్య మార్పు\' సంజ్ఞను పూర్తి చేశారు. మీరు మీ ఫోన్‌ను ఉపయోగించడానికి సిద్ధంగా ఉన్నారు!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"యాప్‌ల మధ్య మార్చడం కోసం స్వైప్ చేయండి"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"మీ స్క్రీన్ కింది వైపు నుండి పైకి స్వైప్ చేసి, హోల్డ్ చేసి, తర్వాత రిలీజ్ చేయండి."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"అంతా సిద్ధంగా ఉంది"</string>
diff --git a/quickstep/res/values-th/strings.xml b/quickstep/res/values-th/strings.xml
index ec7c652c78..95591fed9a 100644
--- a/quickstep/res/values-th/strings.xml
+++ b/quickstep/res/values-th/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"แอปที่คาดว่าจะใช้: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ตรวจสอบว่าปัดจากขอบด้านซ้ายสุด"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ตรวจสอบว่าปัดจากขอบด้านซ้ายไปตรงกลางหน้าจอ แล้วยกนิ้วขึ้น"</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"เท่านี้ก็เรียบร้อย คราวนี้ให้ลองปัดจากขอบด้านขวา"</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ตรวจสอบว่าปัดจากขอบด้านขวาสุด"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ตรวจสอบว่าปัดจากขอบด้านขวาไปตรงกลางหน้าจอ แล้วยกนิ้วขึ้น"</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"คุณทำท่าทางสัมผัสเพื่อย้อนกลับเสร็จแล้ว ต่อไปดูวิธีไปที่หน้าแรก"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ตรวจสอบว่าไม่ได้ปัดใกล้กับด้านล่างของหน้าจอมากเกินไป"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"เปลี่ยนความไวของท่าทางสัมผัสเพื่อย้อนกลับได้ที่การตั้งค่า"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"ปัดเพื่อย้อนกลับ"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"หากต้องการย้อนกลับไปที่หน้าจอล่าสุด ให้ปัดจากขอบด้านซ้ายหรือขวาไปตรงกลางหน้าจอ"</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ตรวจสอบว่าปัดขึ้นจากขอบด้านล่างของหน้าจอ"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ตรวจสอบว่าไม่มีการหยุดชั่วคราวก่อนยกนิ้วขึ้น"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ตรวจสอบว่าปัดขึ้นในแนวตรง"</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"คุณทำท่าทางสัมผัสเพื่อไปที่หน้าแรกเสร็จแล้ว ต่อไปดูวิธีสลับแอป"</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"ปัดเพื่อไปที่หน้าแรก"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"ปัดขึ้นจากด้านล่างของหน้าจอ ท่าทางสัมผัสนี้จะนำคุณไปที่หน้าจอหลักเสมอ"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ตรวจสอบว่าปัดขึ้นจากขอบด้านล่างของหน้าจอ"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"ลองแตะหน้าต่างค้างไว้นานขึ้นก่อนปล่อยนิ้ว"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"ตรวจสอบว่าปัดขึ้นในแนวตรง แล้วหยุดชั่วคราว"</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"คุณทำท่าทางสัมผัสเพื่อสลับแอปเสร็จแล้ว คุณพร้อมใช้โทรศัพท์แล้ว"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ปัดเพื่อสลับแอป"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ปัดขึ้นจากด้านล่างของหน้าจอค้างไว้ แล้วปล่อย"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"เรียบร้อย"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ลองอีกครั้ง"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ดีมาก"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"บทแนะนำ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"เรียบร้อยแล้ว"</string>
+    <string name="allset_hint" msgid="459504134589971527">"ปัดขึ้นเพื่อไปที่หน้าแรก"</string>
+    <string name="allset_description" msgid="6350320429953234580">"คุณเริ่มใช้โทรศัพท์ได้แล้ว"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"การตั้งค่าการนำทางสำหรับการช่วยเหลือพิเศษ"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"แชร์"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ภาพหน้าจอ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"แอปหรือองค์กรของคุณไม่อนุญาตการดำเนินการนี้"</string>
diff --git a/quickstep/res/values-tl/strings.xml b/quickstep/res/values-tl/strings.xml
index f973042f10..211087efba 100644
--- a/quickstep/res/values-tl/strings.xml
+++ b/quickstep/res/values-tl/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Hinulaang app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Tiyaking magsa-swipe ka mula sa pinakadulo sa kaliwa."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Tiyaking mag-swipe mula sa kaliwang gilid papunta sa gitna ng screen, saka iangat ang iyong daliri."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Iyon lang! Subukang mag-swipe mula sa kaliwang gilid."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Tiyaking magsa-swipe ka mula sa pinakadulo sa kanan."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Tiyaking mag-swipe mula sa kanang gilid papunta sa gitna ng screen, saka iangat ang iyong daliri."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Nakumpleto mo na ang galaw para bumalik. Susunod, alamin kung paano pumunta sa Home."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Tiyaking hindi ka magsa-swipe nang masyadong malapit sa ibaba ng screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Pumunta sa Settings para baguhin ang sensitivity ng pagbalik"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Mag-swipe para bumalik"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Para bumalik sa nakaraang screen, mag-swipe mula sa kaliwa o kanang gilid patungo sa gitna ng screen."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Tiyaking magsa-swipe ka pataas mula sa pinakaibaba ng screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Tiyaking hindi ka magpo-pause bago iangat ang iyong daliri."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Tiyaking magsa-swipe ka nang diretso pataas."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Nakumpleto mo na ang galaw para pumunta sa Home. Susunod, alamin kung paano magpalipat-lipat sa mga app."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Mag-swipe para pumunta sa home"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Mag-swipe pataas mula sa ibaba ng iyong screen. Dadalhin ka palagi ng galaw na ito sa Home screen."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Tiyaking magsa-swipe ka pataas mula sa pinakaibaba ng screen."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Subukang pindutin nang mas matagal ang window bago ito bitawan."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Tiyaking magsa-swipe ka nang diretso pataas, pagkatapos ay mag-pause."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Nakumpleto mo na ang galaw para magpalipat-lipat sa mga app. Handa ka nang gamitin ang iyong telepono!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Mag-swipe para lumipat ng app"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Mag-swipe pataas mula sa ibaba ng iyong screen, mag-hold, pagkatapos ay bitawan ito."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Handa na ang lahat"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Subukan ulit"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Magaling!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Handa na lahat!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Mag-swipe pataas para pumunta sa home"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Handa mo nang simulan ang paggamit sa iyong telepono"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Mga setting ng navigation para sa accessibility"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Ibahagi"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Hindi pinapayagan ng app o ng iyong organisasyon ang pagkilos na ito"</string>
diff --git a/quickstep/res/values-tr/strings.xml b/quickstep/res/values-tr/strings.xml
index dc89f44fef..0f44140df0 100644
--- a/quickstep/res/values-tr/strings.xml
+++ b/quickstep/res/values-tr/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Tahmin edilen uygulama: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Ekranın en solundan kaydırdığınızdan emin olun."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Sol kenardan ekranın ortasına doğru kaydırıp bıraktığınızdan emin olun."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"İşte oldu. Şimdi sağ kenardan kaydırmayı deneyin."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Ekranın en sağından kaydırdığınızdan emin olun."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Sağ kenardan ekranın ortasına doğru kaydırıp bıraktığınızdan emin olun."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Geri dön hareketini tamamladınız. Sırada, Ana ekrana gitmeyi öğrenmek var."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ekranın alt kısmına çok yakın bir şekilde kaydırmadığınızdan emin olun."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Geri hareketinin hassasiyetini değiştirmek için Ayarlar\'a gidin"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Geri dönmek için kaydırın"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Son ekrana geri gitmek için sol veya sağ kenardan ekranın ortasına doğru kaydırın."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Ekranın alt kenarından yukarı kaydırdığınızdan emin olun."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Bırakmadan önce parmağınızı duraklatmadığınızdan emin olun."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Düz bir şekilde yukarı kaydırdığınızdan emin olun."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Ana ekrana git hareketini tamamladınız. Sırada, uygulamalar arasında geçiş yapmayı öğrenmek var."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Ana ekrana gitmek için kaydırma"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Ekranın alt kısmından yukarıya doğru kaydırın. Bu hareket sizi her zaman Ana ekrana götürür."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Ekranın alt kenarından yukarı kaydırdığınızdan emin olun."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Bırakmadan önce pencereyi daha uzun süre tutmayı deneyin."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Düz bir şekilde yukarı kaydırıp ardından parmağınızı duraklattığınızdan emin olun."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Uygulamalar arasında geçiş yapma hareketini tamamladınız. Telefonunuzu kullanmaya hazırsınız."</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Uygulamalar arasında geçiş yapmak için kaydırma"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Ekranınızın alt tarafından yukarı doğru kaydırın, tutun ve sonra bırakın."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Hepsi bu kadar"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Tekrar deneyin"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Güzel!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Eğitici <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"İşlem tamam!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Ana ekrana gitmek için yukarı kaydırın"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Telefonunuzu kullanmaya hazırsınız"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Erişilebilirlik için gezinme ayarları"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Paylaş"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Ekran görüntüsü"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Uygulamanız veya kuruluşunuz bu işleme izin vermiyor"</string>
diff --git a/quickstep/res/values-uk/strings.xml b/quickstep/res/values-uk/strings.xml
index 926c1fb852..413531fac8 100644
--- a/quickstep/res/values-uk/strings.xml
+++ b/quickstep/res/values-uk/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Передбачений додаток: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Проведіть пальцем саме від лівого краю екрана."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Проведіть пальцем від лівого краю до середини екрана й підніміть палець."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Це й усе! Тепер проведіть пальцем від правого краю."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Проведіть пальцем саме від правого краю екрана."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Проведіть пальцем від правого краю до середини екрана й підніміть палець."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Ви виконали жест \"Назад\". Далі дізнайтеся, як перейти на головний екран."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Не проводьте пальцем надто близько до нижнього краю екрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Щоб змінити чутливість жесту \"Назад\", відкрийте налаштування"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Щоб повернутися, проведіть пальцем по екрану"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Щоб перейти на попередній екран, проведіть пальцем від лівого чи правого краю до середини екрана."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Проведіть пальцем угору від нижнього краю екрана."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Не робіть паузу перед тим, як відірвати палець від екрана."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Проводьте пальцем вертикально вгору."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Ви виконали жест переходу на головний екран. Тепер дізнайтеся, як переходити між додатками."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Проведіть пальцем, щоб перейти на головний екран"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Проведіть пальцем по екрану знизу вгору. Цей жест завжди повертатиме вас на головний екран."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Проведіть пальцем угору від нижнього краю екрана."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Спробуйте втримувати вікно довше, перш ніж відпустити."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Проведіть пальцем вертикально вгору, а тоді зробіть паузу."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Ви виконали жест переходу в інший додаток. Усе готово! Почніть користуватися телефоном."</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Проведіть пальцем, щоб перейти в інший додаток"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Проведіть пальцем вгору від низу екрана, утримуйте палець на екрані, а потім відпустіть."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Усе готово!"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Спробуйте ще"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Чудово!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Навчальний посібник <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Готово."</string>
+    <string name="allset_hint" msgid="459504134589971527">"Щоб перейти на головний екран, проведіть пальцем угору"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Тепер ви можете користуватися телефоном"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Налаштування навігації для спеціальних можливостей"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Поділитися"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Знімок екрана"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Ця дія заборонена додатком або адміністратором організації"</string>
diff --git a/quickstep/res/values-ur/strings.xml b/quickstep/res/values-ur/strings.xml
index a04e090179..509e234a51 100644
--- a/quickstep/res/values-ur/strings.xml
+++ b/quickstep/res/values-ur/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"پیشن گوئی کردہ ایپ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"اس بات کو یقینی بنائیں کہ آپ بائیں کنارے سے دور سے سوائپ کریں۔"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"یقینی طور پر بائیں کنارے سے اسکرین کے وسط تک سوائپ کریں اور پھر اپنی انگلی اٹھا لیں۔"</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"بس اتنا ہی! اب دائیں کنارے سے سوائپ کرنا شروع کریں۔"</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"اس بات کو یقینی بنائیں کہ آپ دائیں کنارے سے دور سے سوائپ کریں۔"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"یقینی طور پر دائیں کنارے سے اسکرین کے وسط تک سوائپ کریں اور پھر اپنی انگلی اٹھا لیں۔"</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"آپ نے واپس جائیں اشارے کو مکمل کر لیا۔ اس کے بعد آپ ہوم پر جانے کا طریقہ جانیں۔"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"اس بات کو یقینی بنائیں کہ آپ اسکرین کے نچلے حصے سے زیادہ قریب سے سوائپ نہ کریں۔"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"پچھلے اشارے کی حساسیت تبدیل کرنے کے لیے ترتیبات پر جائیں"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"واپس جانے کے لیے سوائپ کریں"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"پچھلی اسکرین پر واپس جانے کے لیے بائیں یا دائیں کنارے سے اسکرین کے وسط تک سوائپ کریں۔"</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"اس بات کو یقینی بنائیں کہ آپ اسکرین کے نچلے کنارے سے اوپر کی طرف سوائپ کریں۔"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"اس بات کو یقینی بنائیں کہ آپ اپنی انگلی اوپر اٹھانے سے پہلے موقوف نہ کریں۔"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"اس بات کو یقینی بنائیں کہ آپ سیدھا اوپر کی طرف سوائپ کریں۔"</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"آپ نے ہوم پر جانے کا اشارہ مکمل کر لیا۔ اس کے بعد ایپس سوئچ کرنے کا طریقہ جانیں۔"</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"ہوم پر جانے کے لیے سوائپ کریں"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"اپنی اسکرین کے نیچے سے اوپر کی طرف سوائپ کریں۔ یہ اشارہ آپ کو ہمیشہ ہوم اسکرین پر لے جاتا ہے۔"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"اس بات کو یقینی بنائیں کہ آپ اسکرین کے نچلے کنارے سے اوپر کی طرف سوائپ کریں۔"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"انگلی اٹھانے سے پہلے ونڈو کو زیادہ دیر تک پکڑنے کی کوشش کریں۔"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"اس بات کو یقینی بنائیں کہ آپ سیدھا اوپر کی طرف سوائپ کریں، پھر موقوف کریں۔"</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"آپ نے ایپ کو سوئچ کرنے کا اشارہ مکمل کر لیا۔ آپ اپنا فون استعمال کرنے کے لیے تیار ہیں!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ایپس سوئچ کرنے کے لیے سوائپ کریں"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"اپنی اسکرین کے نچلے حصے سے اوپر کی طرف سوائپ کریں، پکڑ کر رکھیں، پھر چھوڑ دیں۔"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"سب ہو گیا"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"پھر کوشش کریں"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"عمدہ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ٹیوٹوریل <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"سب کچھ تیار ہے!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"ہوم پر جانے کے لیے اوپر سوائپ کریں"</string>
+    <string name="allset_description" msgid="6350320429953234580">"آپ اپنا فون استعمال شروع کرنے کے لیے تیار ہیں"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"ایکسیسبیلٹی کے لئے نیویگیشن کی ترتیبات"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"اشتراک کریں"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"اسکرین شاٹ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ایپ یا آپ کی تنظیم کی جانب سے اس کارروائی کی اجازت نہیں ہے"</string>
diff --git a/quickstep/res/values-uz/strings.xml b/quickstep/res/values-uz/strings.xml
index 8ca3898234..7f3df0199c 100644
--- a/quickstep/res/values-uz/strings.xml
+++ b/quickstep/res/values-uz/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Taklif etilgan ilova: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Barmoqni chapdagi eng chekkadan suring."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Barmoqni ekranning chap chetidan oʻrtasigacha suring va ekrandan uzing."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Tamom! Endi oʻng chetidan surishga urining."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Barmoqni oʻngdagi eng chekkadan suring."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Barmoqni ekranning oʻng chetidan oʻrtasigacha suring va ekrandan uzing."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Ortga qaytish ishorasi darsini tamomladingiz. Endi Bosh sahifaga qaytishni oʻrganamiz."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Barmoqni ekran pastiga yaqin surmaslikka harakat qiling."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Orqaga ishorasi sezuvchanligi Sozlamalardan oʻzgartiriladi"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Ortga qaytish uchun suring"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Ortga qaytish uchun barmoqni ekranning yon chekkalaridan oʻrtasigacha suring."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Barmoqni ekranning pastki chetidan yuqoriga suring."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Barmoqni ekrandan pauzasiz qoʻyib uzing."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Barmoqni tik tepaga suring."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Bosh ekranni ochish ishorasi darsini tamomladingiz. Endi ilovalarni almashtirishni oʻrganamiz."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Svayp bilan bosh ekranni ochish"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Ekranning pastidan tepaga qarab suring. Bu ishora doim Bosh ekranni ochadi."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Barmoqni ekranning pastki chetidan yuqoriga suring."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Barmoqni uzishdan oldin oynani biroz bosib turing."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Avval tik tepaga surib, keyin pauza qiling."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Ilovalarni almashtirish darsini tamomladingiz. Endi telefondan foydalana olasiz!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Svayp bilan ilovalarni almashtirish"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Ekranning pastidan tepasiga suring, bosib turing va qoʻyib yuboring."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Tayyor"</string>
diff --git a/quickstep/res/values-vi/strings.xml b/quickstep/res/values-vi/strings.xml
index 3034ce7a89..fed4a7f079 100644
--- a/quickstep/res/values-vi/strings.xml
+++ b/quickstep/res/values-vi/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Ứng dụng dự đoán: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Hãy vuốt từ mép ngoài cùng bên trái."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Hãy vuốt từ mép trái tới chính giữa màn hình rồi nhấc ngón tay."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Vậy là xong! Bây giờ, hãy thử vuốt từ mép phải."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Hãy vuốt từ mép ngoài cùng bên phải."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Hãy vuốt từ mép phải tới chính giữa màn hình rồi nhấc ngón tay."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Bạn đã thực hiện xong cử chỉ quay lại. Tiếp theo, hãy tìm hiểu cách chuyển đến Màn hình chính."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Hãy nhớ không được vuốt quá gần phần cuối màn hình."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Để thay đổi độ nhạy của cử chỉ quay lại, hãy vào mục Cài đặt"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Hãy vuốt để quay lại"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Để quay lại màn hình gần đây nhất, hãy vuốt từ mép trái hoặc mép phải tới chính giữa màn hình."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Hãy vuốt lên từ mép dưới cùng của màn hình."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Hãy nhớ không được tạm dừng trước khi nhấc ngón tay."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Hãy vuốt thẳng lên."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Bạn đã thực hiện xong cử chỉ chuyển đến Màn hình chính. Tiếp theo, hãy tìm hiểu cách chuyển đổi ứng dụng."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Vuốt để chuyển đến Màn hình chính"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Vuốt lên từ cuối màn hình. Cử chỉ này luôn đưa bạn đến Màn hình chính."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Hãy vuốt lên từ mép dưới cùng của màn hình."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Hãy thử giữ cửa sổ lâu hơn trước khi thả tay ra."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Hãy vuốt thẳng lên, sau đó tạm dừng."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Bạn đã thực hiện xong cử chỉ chuyển đổi ứng dụng. Bạn đã sẵn sàng sử dụng điện thoại!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Vuốt để chuyển đổi ứng dụng"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Vuốt lên từ cuối màn hình, giữ rồi thả tay ra."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Đã hoàn tất"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Thử lại"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Tuyệt vời!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Hướng dẫn <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Đã hoàn tất!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Vuốt lên để chuyển đến màn hình chính"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Hiện giờ, bạn đã có thể sử dụng điện thoại"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Chế độ cài đặt di chuyển cho tính năng hỗ trợ tiếp cận"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Chia sẻ"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Chụp ảnh màn hình"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Ứng dụng hoặc tổ chức của bạn không cho phép thực hiện hành động này"</string>
diff --git a/quickstep/res/values-zh-rCN/strings.xml b/quickstep/res/values-zh-rCN/strings.xml
index e60e2a8c13..4129299faf 100644
--- a/quickstep/res/values-zh-rCN/strings.xml
+++ b/quickstep/res/values-zh-rCN/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"预测的应用：<xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"请从最左侧边缘开始滑动。"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"请从左侧边缘滑动到屏幕中间位置后再松开手指。"</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"大功告成！现在试着从右侧边缘开始滑动。"</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"请从最右侧边缘开始滑动。"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"请从右侧边缘滑动到屏幕中间位置后再松开手指。"</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"您完成了“返回”手势教程。接下来了解如何转到主屏幕。"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"滑动时，手的位置不要太靠近屏幕底部。"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"如要调节“返回”手势的灵敏度，请转到“设置”"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"滑动即可返回"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"如要返回上一个屏幕，请从左侧或右侧边缘滑动到屏幕中间位置。"</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"请从屏幕底部边缘向上滑动。"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"在松开手指前请勿停下来。"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"请向上滑动。"</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"您完成了“转到主屏幕”手势教程。接下来了解如何切换应用。"</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"滑动即可转到主屏幕"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"从屏幕底部向上滑动。这个手势会一律将您转到主屏幕。"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"请从屏幕底部边缘向上滑动。"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"请尝试按住窗口较长时间，然后再松开手指。"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"请向上滑动，然后停住。"</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"您完成了“切换应用”手势教程。您现在可以使用手机了！"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"滑动即可切换应用"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"从屏幕底部向上滑动后按住，然后松开。"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"大功告成"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"重试"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"很好！"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"教程 <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"设置完毕！"</string>
+    <string name="allset_hint" msgid="459504134589971527">"向上滑动可转到主屏幕"</string>
+    <string name="allset_description" msgid="6350320429953234580">"您可以开始使用手机了"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"无障碍功能的导航设置"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"分享"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"屏幕截图"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"该应用或您所在的单位不允许执行此操作"</string>
diff --git a/quickstep/res/values-zh-rHK/strings.xml b/quickstep/res/values-zh-rHK/strings.xml
index b54682027c..0b1c53dbaa 100644
--- a/quickstep/res/values-zh-rHK/strings.xml
+++ b/quickstep/res/values-zh-rHK/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"預測應用程式：<xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"請從螢幕左側邊緣滑動。"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"請從螢幕左側邊緣往中央滑動，然後放開手指。"</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"大功告成！現在試試從螢幕右側邊緣滑動。"</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"請從螢幕右側邊緣滑動。"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"請從螢幕右側邊緣往中央滑動，然後放開手指"</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"您已完成「返回」手勢的教學課程。接下來一起瞭解如何返回主畫面。"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"滑動時，手的位置不要太接近螢幕底部。"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"如要變更「返回」手勢的敏感度，請前往「設定」"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"滑動即可返回"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"如要返回上一個畫面，請從螢幕左側或右側邊緣往中央滑動。"</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"請從螢幕底部邊緣向上滑動。"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"放開手指前請勿停下來。"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"請向上滑動。"</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"您已完成「返回主畫面」手勢的教學課程。接下來一起瞭解如何切換應用程式。"</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"向上滑動即可返回主畫面。"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"從螢幕底部向上滑動。這個手勢在所有畫面下都可讓您返回主畫面。"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"請從螢幕底部邊緣向上滑動。"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"請嘗試按住視窗更長時間，然後再放開。"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"請向上滑動，然後停住。"</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"您已完成「切換應用程式」手勢的教學課程。現在可以開始使用手機了！"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"滑動即可切換應用程式"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"從螢幕底部向上滑動並按住，然後放開。"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"大功告成"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"再試一次"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"很好！"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"教學課程 <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"設定完成！"</string>
+    <string name="allset_hint" msgid="459504134589971527">"向上滑動即可前往主畫面"</string>
+    <string name="allset_description" msgid="6350320429953234580">"您可以開始使用手機了"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"無障礙功能導覽設定"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"分享"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"螢幕截圖"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"應用程式或您的機構不允許此操作"</string>
diff --git a/quickstep/res/values-zh-rTW/strings.xml b/quickstep/res/values-zh-rTW/strings.xml
index 8146ec3114..6ad7e8d057 100644
--- a/quickstep/res/values-zh-rTW/strings.xml
+++ b/quickstep/res/values-zh-rTW/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"預測的應用程式：<xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"請從螢幕左側邊緣滑動。"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"請從螢幕左側邊緣往中央滑動，然後放開手指。"</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"大功告成！現在請試著從螢幕右側邊緣滑動。"</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"請從螢幕右側邊緣滑動。"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"請從螢幕右側邊緣往中央滑動，然後放開手指。"</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"你已完成「返回」手勢的教學課程。接著，一起來瞭解如何返回主畫面。"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"滑動時，手的位置不要太接近螢幕底部。"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"如要變更「返回」手勢的敏感度，請前往「設定」"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"滑動即可返回"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"如要返回上一個畫面，請從螢幕左側或右側邊緣往中央滑動。"</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"請從螢幕底部邊緣向上滑動。"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"放開手指前請勿停下來。"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"請向上滑動。"</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"你已完成「返回主畫面」手勢的教學課程。接著，一起來瞭解如何切換應用程式。"</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"使用滑動手勢返回主畫面"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"從螢幕底部向上滑動，即可返回主畫面。"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"請從螢幕底部邊緣向上滑動。"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"請按住視窗久一點，然後再放開。"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"請向上滑動，然後停住。"</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"你已完成「切換應用程式」手勢的教學課程。現在可以開始使用手機了！"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"使用滑動手勢切換應用程式"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"從螢幕底部向上滑動並按住，然後放開。"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"大功告成"</string>
@@ -74,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"重試"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"很好！"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"教學課程 <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"設定完成！"</string>
+    <string name="allset_hint" msgid="459504134589971527">"向上滑動即可前往主畫面"</string>
+    <string name="allset_description" msgid="6350320429953234580">"你可以開始使用手機了"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"無障礙工具的導覽設定"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"分享"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"擷取螢幕畫面"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"這個應用程式或貴機構不允許執行這個動作"</string>
diff --git a/quickstep/res/values-zu/strings.xml b/quickstep/res/values-zu/strings.xml
index 7f61e7d03a..82dc5cf7d1 100644
--- a/quickstep/res/values-zu/strings.xml
+++ b/quickstep/res/values-zu/strings.xml
@@ -47,24 +47,38 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Uhlelo lokusebenza olubikezelwe: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Qiniseka ukuthi uswayiphela ekudeni emngceleni ongakwesobunxele."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Qiniseka ukuthi uswayipha kusuka emngceleni okwesobunxele kuya phakathi kwesikrini bese uyadedela."</string>
-    <string name="back_gesture_feedback_complete_left_edge" msgid="3220478647881674266">"Yilokho nje! Manje zama ukuswayipha kusuka kwesokudla."</string>
+    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Qiniseka ukuthi uswayiphela ekudeni emngceleni ongakwesokudla."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Qiniseka ukuthi uswayipha kusuka emngceleni okwesokudla kuya phakathi kwesikrini bese uyadedela."</string>
-    <string name="back_gesture_feedback_complete" msgid="7261221999760772210">"Ukuqedile ukuthinta kokubuyela emuva. Ngokulandelayo, funda indlela yokuya Ekhaya."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
+    <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Qiniseka ukuba awuswayipheli eduze kakhulu naphansi kwesikrini."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Ukuze ushintshe ukuzwela kokuthinta emuva, iya Kumasethingi"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Swayipha ukuze uye emuva"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Ukuze ubuyele emuva esikrinini sokugcina, swapha kusuka emngceleni wesobunxele noma wesokudla kuya phakathi kwesikrini."</string>
+    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <skip />
+    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Qiniseka ukuthi uswayiphela phezulu kusuka emngceleni ophansi wesikrini."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Qiniseka ukuthi awumisi ngaphambi kokudedela."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Qiniseka ukuthi uswayiphela ngqo phezulu."</string>
-    <string name="home_gesture_feedback_complete" msgid="2324789183070815517">"Ukuqedile ukuthinta kokuya Ekhaya. Ngokulandelayo, funda indlela yokushintsha ama-app."</string>
+    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
+    <skip />
+    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
+    <skip />
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Swayipha ukuze uye ekhaya"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Swayiphela phezulu kusuka phansi kwesikrini sakho.Lokhu kuthinta kuhlala kukusa esikrinini sasekhaya."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Qiniseka ukuthi uswayiphela phezulu kusuka emngceleni ophansi wesikrini."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Zama ukubamba iwindi isikhashana ngaphambi kokulidedela."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Qiniseka ukuthi uswayiphela ngqo phezulu bese uyamisa."</string>
-    <string name="overview_gesture_feedback_complete" msgid="5477014491632199169">"Ukuqedile ukuthinta kokushintsha ama-app. Ukulungele ukusebenzisa ifoni yakho!"</string>
+    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
+    <skip />
+    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
+    <skip />
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swayipha ukuze ushintshe ama-app"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swayiphela phezulu kusuka ngezansi kwesikrini sakho, ubambe, bese udedele."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Konke kusethiwe"</string>
-- 
GitLab


From 6b2be3789c31cd72a244ec5d5aeb753f18492748 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Thu, 13 May 2021 07:39:28 +0000
Subject: [PATCH 1164/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Ia6bc84a966d24fa30a9a5d812c76bd18066acf31
---
 go/quickstep/res/values-am/strings.xml        | 8 ++++++++
 go/quickstep/res/values-ar/strings.xml        | 8 ++++++++
 go/quickstep/res/values-az/strings.xml        | 8 ++++++++
 go/quickstep/res/values-b+sr+Latn/strings.xml | 8 ++++++++
 go/quickstep/res/values-be/strings.xml        | 8 ++++++++
 go/quickstep/res/values-bg/strings.xml        | 8 ++++++++
 go/quickstep/res/values-bs/strings.xml        | 8 ++++++++
 go/quickstep/res/values-ca/strings.xml        | 8 ++++++++
 go/quickstep/res/values-cs/strings.xml        | 8 ++++++++
 go/quickstep/res/values-de/strings.xml        | 8 ++++++++
 go/quickstep/res/values-el/strings.xml        | 8 ++++++++
 go/quickstep/res/values-es/strings.xml        | 8 ++++++++
 go/quickstep/res/values-et/strings.xml        | 8 ++++++++
 go/quickstep/res/values-eu/strings.xml        | 8 ++++++++
 go/quickstep/res/values-fi/strings.xml        | 8 ++++++++
 go/quickstep/res/values-fr-rCA/strings.xml    | 8 ++++++++
 go/quickstep/res/values-fr/strings.xml        | 8 ++++++++
 go/quickstep/res/values-gl/strings.xml        | 8 ++++++++
 go/quickstep/res/values-hi/strings.xml        | 8 ++++++++
 go/quickstep/res/values-hr/strings.xml        | 8 ++++++++
 go/quickstep/res/values-hu/strings.xml        | 8 ++++++++
 go/quickstep/res/values-hy/strings.xml        | 8 ++++++++
 go/quickstep/res/values-in/strings.xml        | 8 ++++++++
 go/quickstep/res/values-is/strings.xml        | 8 ++++++++
 go/quickstep/res/values-it/strings.xml        | 8 ++++++++
 go/quickstep/res/values-iw/strings.xml        | 8 ++++++++
 go/quickstep/res/values-ka/strings.xml        | 8 ++++++++
 go/quickstep/res/values-kk/strings.xml        | 8 ++++++++
 go/quickstep/res/values-km/strings.xml        | 8 ++++++++
 go/quickstep/res/values-ko/strings.xml        | 8 ++++++++
 go/quickstep/res/values-ky/strings.xml        | 8 ++++++++
 go/quickstep/res/values-lo/strings.xml        | 8 ++++++++
 go/quickstep/res/values-lt/strings.xml        | 8 ++++++++
 go/quickstep/res/values-lv/strings.xml        | 8 ++++++++
 go/quickstep/res/values-mk/strings.xml        | 8 ++++++++
 go/quickstep/res/values-ml/strings.xml        | 8 ++++++++
 go/quickstep/res/values-mn/strings.xml        | 8 ++++++++
 go/quickstep/res/values-my/strings.xml        | 8 ++++++++
 go/quickstep/res/values-nb/strings.xml        | 8 ++++++++
 go/quickstep/res/values-ne/strings.xml        | 8 ++++++++
 go/quickstep/res/values-or/strings.xml        | 8 ++++++++
 go/quickstep/res/values-pa/strings.xml        | 8 ++++++++
 go/quickstep/res/values-pt-rPT/strings.xml    | 8 ++++++++
 go/quickstep/res/values-ro/strings.xml        | 8 ++++++++
 go/quickstep/res/values-ru/strings.xml        | 8 ++++++++
 go/quickstep/res/values-si/strings.xml        | 8 ++++++++
 go/quickstep/res/values-sl/strings.xml        | 8 ++++++++
 go/quickstep/res/values-sr/strings.xml        | 8 ++++++++
 go/quickstep/res/values-sv/strings.xml        | 8 ++++++++
 go/quickstep/res/values-sw/strings.xml        | 8 ++++++++
 go/quickstep/res/values-ta/strings.xml        | 8 ++++++++
 go/quickstep/res/values-th/strings.xml        | 8 ++++++++
 go/quickstep/res/values-tl/strings.xml        | 8 ++++++++
 go/quickstep/res/values-tr/strings.xml        | 8 ++++++++
 go/quickstep/res/values-uk/strings.xml        | 8 ++++++++
 go/quickstep/res/values-ur/strings.xml        | 8 ++++++++
 go/quickstep/res/values-vi/strings.xml        | 8 ++++++++
 go/quickstep/res/values-zh-rCN/strings.xml    | 8 ++++++++
 go/quickstep/res/values-zh-rHK/strings.xml    | 8 ++++++++
 go/quickstep/res/values-zh-rTW/strings.xml    | 8 ++++++++
 60 files changed, 480 insertions(+)
 create mode 100644 go/quickstep/res/values-am/strings.xml
 create mode 100644 go/quickstep/res/values-ar/strings.xml
 create mode 100644 go/quickstep/res/values-az/strings.xml
 create mode 100644 go/quickstep/res/values-b+sr+Latn/strings.xml
 create mode 100644 go/quickstep/res/values-be/strings.xml
 create mode 100644 go/quickstep/res/values-bg/strings.xml
 create mode 100644 go/quickstep/res/values-bs/strings.xml
 create mode 100644 go/quickstep/res/values-ca/strings.xml
 create mode 100644 go/quickstep/res/values-cs/strings.xml
 create mode 100644 go/quickstep/res/values-de/strings.xml
 create mode 100644 go/quickstep/res/values-el/strings.xml
 create mode 100644 go/quickstep/res/values-es/strings.xml
 create mode 100644 go/quickstep/res/values-et/strings.xml
 create mode 100644 go/quickstep/res/values-eu/strings.xml
 create mode 100644 go/quickstep/res/values-fi/strings.xml
 create mode 100644 go/quickstep/res/values-fr-rCA/strings.xml
 create mode 100644 go/quickstep/res/values-fr/strings.xml
 create mode 100644 go/quickstep/res/values-gl/strings.xml
 create mode 100644 go/quickstep/res/values-hi/strings.xml
 create mode 100644 go/quickstep/res/values-hr/strings.xml
 create mode 100644 go/quickstep/res/values-hu/strings.xml
 create mode 100644 go/quickstep/res/values-hy/strings.xml
 create mode 100644 go/quickstep/res/values-in/strings.xml
 create mode 100644 go/quickstep/res/values-is/strings.xml
 create mode 100644 go/quickstep/res/values-it/strings.xml
 create mode 100644 go/quickstep/res/values-iw/strings.xml
 create mode 100644 go/quickstep/res/values-ka/strings.xml
 create mode 100644 go/quickstep/res/values-kk/strings.xml
 create mode 100644 go/quickstep/res/values-km/strings.xml
 create mode 100644 go/quickstep/res/values-ko/strings.xml
 create mode 100644 go/quickstep/res/values-ky/strings.xml
 create mode 100644 go/quickstep/res/values-lo/strings.xml
 create mode 100644 go/quickstep/res/values-lt/strings.xml
 create mode 100644 go/quickstep/res/values-lv/strings.xml
 create mode 100644 go/quickstep/res/values-mk/strings.xml
 create mode 100644 go/quickstep/res/values-ml/strings.xml
 create mode 100644 go/quickstep/res/values-mn/strings.xml
 create mode 100644 go/quickstep/res/values-my/strings.xml
 create mode 100644 go/quickstep/res/values-nb/strings.xml
 create mode 100644 go/quickstep/res/values-ne/strings.xml
 create mode 100644 go/quickstep/res/values-or/strings.xml
 create mode 100644 go/quickstep/res/values-pa/strings.xml
 create mode 100644 go/quickstep/res/values-pt-rPT/strings.xml
 create mode 100644 go/quickstep/res/values-ro/strings.xml
 create mode 100644 go/quickstep/res/values-ru/strings.xml
 create mode 100644 go/quickstep/res/values-si/strings.xml
 create mode 100644 go/quickstep/res/values-sl/strings.xml
 create mode 100644 go/quickstep/res/values-sr/strings.xml
 create mode 100644 go/quickstep/res/values-sv/strings.xml
 create mode 100644 go/quickstep/res/values-sw/strings.xml
 create mode 100644 go/quickstep/res/values-ta/strings.xml
 create mode 100644 go/quickstep/res/values-th/strings.xml
 create mode 100644 go/quickstep/res/values-tl/strings.xml
 create mode 100644 go/quickstep/res/values-tr/strings.xml
 create mode 100644 go/quickstep/res/values-uk/strings.xml
 create mode 100644 go/quickstep/res/values-ur/strings.xml
 create mode 100644 go/quickstep/res/values-vi/strings.xml
 create mode 100644 go/quickstep/res/values-zh-rCN/strings.xml
 create mode 100644 go/quickstep/res/values-zh-rHK/strings.xml
 create mode 100644 go/quickstep/res/values-zh-rTW/strings.xml

diff --git a/go/quickstep/res/values-am/strings.xml b/go/quickstep/res/values-am/strings.xml
new file mode 100644
index 0000000000..fc82f599e6
--- /dev/null
+++ b/go/quickstep/res/values-am/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"መተግበሪያን አጋራ"</string>
+    <string name="action_listen" msgid="2370304050784689486">"ያዳምጡ"</string>
+    <string name="action_translate" msgid="8028378961867277746">"ተርጉም"</string>
+    <string name="action_search" msgid="6269564710943755464">"ሌንስ"</string>
+</resources>
diff --git a/go/quickstep/res/values-ar/strings.xml b/go/quickstep/res/values-ar/strings.xml
new file mode 100644
index 0000000000..8fc64dc252
--- /dev/null
+++ b/go/quickstep/res/values-ar/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"مشاركة التطبيق"</string>
+    <string name="action_listen" msgid="2370304050784689486">"استماع"</string>
+    <string name="action_translate" msgid="8028378961867277746">"‏ترجمة Google"</string>
+    <string name="action_search" msgid="6269564710943755464">"‏عدسة Google"</string>
+</resources>
diff --git a/go/quickstep/res/values-az/strings.xml b/go/quickstep/res/values-az/strings.xml
new file mode 100644
index 0000000000..8b47b7f8b7
--- /dev/null
+++ b/go/quickstep/res/values-az/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Tətbiqi paylaşın"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Dinləyin"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Tərcümə"</string>
+    <string name="action_search" msgid="6269564710943755464">"Linza"</string>
+</resources>
diff --git a/go/quickstep/res/values-b+sr+Latn/strings.xml b/go/quickstep/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000000..7d383e1f0c
--- /dev/null
+++ b/go/quickstep/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Deli aplikaciju"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Pusti"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Prevedi"</string>
+    <string name="action_search" msgid="6269564710943755464">"Objektiv"</string>
+</resources>
diff --git a/go/quickstep/res/values-be/strings.xml b/go/quickstep/res/values-be/strings.xml
new file mode 100644
index 0000000000..95bff60b46
--- /dev/null
+++ b/go/quickstep/res/values-be/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Абагуліць праграму"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Праслухаць"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Перакласці"</string>
+    <string name="action_search" msgid="6269564710943755464">"Аб\'ектыў"</string>
+</resources>
diff --git a/go/quickstep/res/values-bg/strings.xml b/go/quickstep/res/values-bg/strings.xml
new file mode 100644
index 0000000000..018d53623b
--- /dev/null
+++ b/go/quickstep/res/values-bg/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Споделяне на прилож."</string>
+    <string name="action_listen" msgid="2370304050784689486">"Слушане"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Превод"</string>
+    <string name="action_search" msgid="6269564710943755464">"Обектив"</string>
+</resources>
diff --git a/go/quickstep/res/values-bs/strings.xml b/go/quickstep/res/values-bs/strings.xml
new file mode 100644
index 0000000000..90ea104715
--- /dev/null
+++ b/go/quickstep/res/values-bs/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Dijeli aplikaciju"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Poslušajte"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Prevedi"</string>
+    <string name="action_search" msgid="6269564710943755464">"Objektiv"</string>
+</resources>
diff --git a/go/quickstep/res/values-ca/strings.xml b/go/quickstep/res/values-ca/strings.xml
new file mode 100644
index 0000000000..e578f5a6a3
--- /dev/null
+++ b/go/quickstep/res/values-ca/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Comparteix aplicació"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Escolta"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Tradueix"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-cs/strings.xml b/go/quickstep/res/values-cs/strings.xml
new file mode 100644
index 0000000000..cb21abe77f
--- /dev/null
+++ b/go/quickstep/res/values-cs/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Sdílet aplikaci"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Poslechnout"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Přeložit"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-de/strings.xml b/go/quickstep/res/values-de/strings.xml
new file mode 100644
index 0000000000..1052b0cdf0
--- /dev/null
+++ b/go/quickstep/res/values-de/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"App teilen"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Anhören"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Übersetzen"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-el/strings.xml b/go/quickstep/res/values-el/strings.xml
new file mode 100644
index 0000000000..3d514d966e
--- /dev/null
+++ b/go/quickstep/res/values-el/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Κοινή χρήση εφαρμογ."</string>
+    <string name="action_listen" msgid="2370304050784689486">"Ακρόαση"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Μετάφραση"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-es/strings.xml b/go/quickstep/res/values-es/strings.xml
new file mode 100644
index 0000000000..845e34b840
--- /dev/null
+++ b/go/quickstep/res/values-es/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Compartir aplicación"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Escuchar"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Traducir"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-et/strings.xml b/go/quickstep/res/values-et/strings.xml
new file mode 100644
index 0000000000..5d3c42753a
--- /dev/null
+++ b/go/quickstep/res/values-et/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Jaga rakendust"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Kuula"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Tõlge"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-eu/strings.xml b/go/quickstep/res/values-eu/strings.xml
new file mode 100644
index 0000000000..2b89057fe4
--- /dev/null
+++ b/go/quickstep/res/values-eu/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Partekatu aplikazioa"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Entzun"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Itzuli"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-fi/strings.xml b/go/quickstep/res/values-fi/strings.xml
new file mode 100644
index 0000000000..29f71d8fe7
--- /dev/null
+++ b/go/quickstep/res/values-fi/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Jaa sovellus"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Kuuntele"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Käännä"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-fr-rCA/strings.xml b/go/quickstep/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000000..158bdd05f2
--- /dev/null
+++ b/go/quickstep/res/values-fr-rCA/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Partager application"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Écouter"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Traduire"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lentille"</string>
+</resources>
diff --git a/go/quickstep/res/values-fr/strings.xml b/go/quickstep/res/values-fr/strings.xml
new file mode 100644
index 0000000000..7f48fdf0f5
--- /dev/null
+++ b/go/quickstep/res/values-fr/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Partager l\'appli"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Écouter"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Traduire"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-gl/strings.xml b/go/quickstep/res/values-gl/strings.xml
new file mode 100644
index 0000000000..9ffaef716d
--- /dev/null
+++ b/go/quickstep/res/values-gl/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Compartir aplicación"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Escoitar"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Traducir"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-hi/strings.xml b/go/quickstep/res/values-hi/strings.xml
new file mode 100644
index 0000000000..e19001b54f
--- /dev/null
+++ b/go/quickstep/res/values-hi/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"ऐप्लिकेशन शेयर करें"</string>
+    <string name="action_listen" msgid="2370304050784689486">"सुनें"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-hr/strings.xml b/go/quickstep/res/values-hr/strings.xml
new file mode 100644
index 0000000000..e22034257b
--- /dev/null
+++ b/go/quickstep/res/values-hr/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Dijeli aplikaciju"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Slušajte"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Prevedi"</string>
+    <string name="action_search" msgid="6269564710943755464">"Objektiv"</string>
+</resources>
diff --git a/go/quickstep/res/values-hu/strings.xml b/go/quickstep/res/values-hu/strings.xml
new file mode 100644
index 0000000000..c6fb51e574
--- /dev/null
+++ b/go/quickstep/res/values-hu/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"App megosztása"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Lejátszás"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Fordítás"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-hy/strings.xml b/go/quickstep/res/values-hy/strings.xml
new file mode 100644
index 0000000000..f5bb44de80
--- /dev/null
+++ b/go/quickstep/res/values-hy/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Կիսվել հավելվածով"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Լսել"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Թարգմանել"</string>
+    <string name="action_search" msgid="6269564710943755464">"Տեսապակի"</string>
+</resources>
diff --git a/go/quickstep/res/values-in/strings.xml b/go/quickstep/res/values-in/strings.xml
new file mode 100644
index 0000000000..ddadb35543
--- /dev/null
+++ b/go/quickstep/res/values-in/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Bagikan Aplikasi"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Dengarkan"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Terjemahkan"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-is/strings.xml b/go/quickstep/res/values-is/strings.xml
new file mode 100644
index 0000000000..2231cc56f6
--- /dev/null
+++ b/go/quickstep/res/values-is/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Deila forriti"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Hlusta"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Þýða"</string>
+    <string name="action_search" msgid="6269564710943755464">"Linsa"</string>
+</resources>
diff --git a/go/quickstep/res/values-it/strings.xml b/go/quickstep/res/values-it/strings.xml
new file mode 100644
index 0000000000..59ed75c488
--- /dev/null
+++ b/go/quickstep/res/values-it/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Condividi l\'app"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Ascolta"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Traduci"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-iw/strings.xml b/go/quickstep/res/values-iw/strings.xml
new file mode 100644
index 0000000000..d70d57a919
--- /dev/null
+++ b/go/quickstep/res/values-iw/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"לשיתוף האפליקציה"</string>
+    <string name="action_listen" msgid="2370304050784689486">"האזנה"</string>
+    <string name="action_translate" msgid="8028378961867277746">"תרגום"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-ka/strings.xml b/go/quickstep/res/values-ka/strings.xml
new file mode 100644
index 0000000000..b430c88488
--- /dev/null
+++ b/go/quickstep/res/values-ka/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"აპის გაზიარება"</string>
+    <string name="action_listen" msgid="2370304050784689486">"მოსმენა"</string>
+    <string name="action_translate" msgid="8028378961867277746">"თარგმნა"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-kk/strings.xml b/go/quickstep/res/values-kk/strings.xml
new file mode 100644
index 0000000000..ed59c9c466
--- /dev/null
+++ b/go/quickstep/res/values-kk/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Қолданбаны бөлісу"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Тыңдау"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Аудару"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-km/strings.xml b/go/quickstep/res/values-km/strings.xml
new file mode 100644
index 0000000000..822ca781f9
--- /dev/null
+++ b/go/quickstep/res/values-km/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"ចែក​រំលែក​កម្មវិធី"</string>
+    <string name="action_listen" msgid="2370304050784689486">"ស្តាប់"</string>
+    <string name="action_translate" msgid="8028378961867277746">"បកប្រែ"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-ko/strings.xml b/go/quickstep/res/values-ko/strings.xml
new file mode 100644
index 0000000000..991df2a7ba
--- /dev/null
+++ b/go/quickstep/res/values-ko/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"앱 공유"</string>
+    <string name="action_listen" msgid="2370304050784689486">"듣기"</string>
+    <string name="action_translate" msgid="8028378961867277746">"번역"</string>
+    <string name="action_search" msgid="6269564710943755464">"렌즈"</string>
+</resources>
diff --git a/go/quickstep/res/values-ky/strings.xml b/go/quickstep/res/values-ky/strings.xml
new file mode 100644
index 0000000000..e0baff3b01
--- /dev/null
+++ b/go/quickstep/res/values-ky/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Колдонмону бөлүшүү"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Угуу"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Которуу"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-lo/strings.xml b/go/quickstep/res/values-lo/strings.xml
new file mode 100644
index 0000000000..720fddb8f4
--- /dev/null
+++ b/go/quickstep/res/values-lo/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"ແບ່ງປັນແອັບ"</string>
+    <string name="action_listen" msgid="2370304050784689486">"ຟັງ"</string>
+    <string name="action_translate" msgid="8028378961867277746">"ແປພາສາ"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-lt/strings.xml b/go/quickstep/res/values-lt/strings.xml
new file mode 100644
index 0000000000..2b1255c477
--- /dev/null
+++ b/go/quickstep/res/values-lt/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Bendrinti programą"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Klausyti"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Išversti"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-lv/strings.xml b/go/quickstep/res/values-lv/strings.xml
new file mode 100644
index 0000000000..d6c0a9c8f8
--- /dev/null
+++ b/go/quickstep/res/values-lv/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Kopīgot lietotni"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Klausīties"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Tulkot"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-mk/strings.xml b/go/quickstep/res/values-mk/strings.xml
new file mode 100644
index 0000000000..7df0e90e18
--- /dev/null
+++ b/go/quickstep/res/values-mk/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Сподели апликација"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Слушај"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Преведи"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-ml/strings.xml b/go/quickstep/res/values-ml/strings.xml
new file mode 100644
index 0000000000..0887f8b47a
--- /dev/null
+++ b/go/quickstep/res/values-ml/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"ആപ്പ് പങ്കിടുക"</string>
+    <string name="action_listen" msgid="2370304050784689486">"കേൾക്കുക"</string>
+    <string name="action_translate" msgid="8028378961867277746">"വിവർത്തനം ചെയ്യുക"</string>
+    <string name="action_search" msgid="6269564710943755464">"ലെൻസ്"</string>
+</resources>
diff --git a/go/quickstep/res/values-mn/strings.xml b/go/quickstep/res/values-mn/strings.xml
new file mode 100644
index 0000000000..4b0bdc1cfa
--- /dev/null
+++ b/go/quickstep/res/values-mn/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Аппыг хуваалцах"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Сонсох"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Орчуулах"</string>
+    <string name="action_search" msgid="6269564710943755464">"Дуран"</string>
+</resources>
diff --git a/go/quickstep/res/values-my/strings.xml b/go/quickstep/res/values-my/strings.xml
new file mode 100644
index 0000000000..27d0e32bc9
--- /dev/null
+++ b/go/quickstep/res/values-my/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"အက်ပ် မျှဝေရန်"</string>
+    <string name="action_listen" msgid="2370304050784689486">"နားထောင်ရန်"</string>
+    <string name="action_translate" msgid="8028378961867277746">"ဘာသာပြန်ရန်"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-nb/strings.xml b/go/quickstep/res/values-nb/strings.xml
new file mode 100644
index 0000000000..1121816f08
--- /dev/null
+++ b/go/quickstep/res/values-nb/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Del appen"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Lytt"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Oversett"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-ne/strings.xml b/go/quickstep/res/values-ne/strings.xml
new file mode 100644
index 0000000000..5e06bd4107
--- /dev/null
+++ b/go/quickstep/res/values-ne/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"एप सेयर गर्नुहोस्"</string>
+    <string name="action_listen" msgid="2370304050784689486">"सुन्नुहोस्"</string>
+    <string name="action_translate" msgid="8028378961867277746">"अनुवाद गर्नुहोस्"</string>
+    <string name="action_search" msgid="6269564710943755464">"लेन्स"</string>
+</resources>
diff --git a/go/quickstep/res/values-or/strings.xml b/go/quickstep/res/values-or/strings.xml
new file mode 100644
index 0000000000..079d29eea3
--- /dev/null
+++ b/go/quickstep/res/values-or/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"ଆପ୍ ସେୟାର୍ କରନ୍ତୁ"</string>
+    <string name="action_listen" msgid="2370304050784689486">"ଶୁଣନ୍ତୁ"</string>
+    <string name="action_translate" msgid="8028378961867277746">"ଅନୁବାଦ କରନ୍ତୁ"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-pa/strings.xml b/go/quickstep/res/values-pa/strings.xml
new file mode 100644
index 0000000000..2226876656
--- /dev/null
+++ b/go/quickstep/res/values-pa/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"ਐਪ ਨੂੰ ਸਾਂਝਾ ਕਰੋ"</string>
+    <string name="action_listen" msgid="2370304050784689486">"ਸੁਣੋ"</string>
+    <string name="action_translate" msgid="8028378961867277746">"ਅਨੁਵਾਦ ਕਰੋ"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-pt-rPT/strings.xml b/go/quickstep/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000000..ada33f349c
--- /dev/null
+++ b/go/quickstep/res/values-pt-rPT/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Partilhar app"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Ouvir"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Traduzir"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-ro/strings.xml b/go/quickstep/res/values-ro/strings.xml
new file mode 100644
index 0000000000..0b6f2e7e98
--- /dev/null
+++ b/go/quickstep/res/values-ro/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Trimiteți aplicația"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Ascultați"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Traduceți"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-ru/strings.xml b/go/quickstep/res/values-ru/strings.xml
new file mode 100644
index 0000000000..d54b39afb1
--- /dev/null
+++ b/go/quickstep/res/values-ru/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Поделиться приложением"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Слушать"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Перевести"</string>
+    <string name="action_search" msgid="6269564710943755464">"Объектив"</string>
+</resources>
diff --git a/go/quickstep/res/values-si/strings.xml b/go/quickstep/res/values-si/strings.xml
new file mode 100644
index 0000000000..0004387592
--- /dev/null
+++ b/go/quickstep/res/values-si/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"යෙදුම බෙදා ගන්න"</string>
+    <string name="action_listen" msgid="2370304050784689486">"සවන් දෙන්න"</string>
+    <string name="action_translate" msgid="8028378961867277746">"පරිවර්තනය කරන්න"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-sl/strings.xml b/go/quickstep/res/values-sl/strings.xml
new file mode 100644
index 0000000000..1adc3f722b
--- /dev/null
+++ b/go/quickstep/res/values-sl/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Deli aplikacijo"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Poslušanje"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Prevedi"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-sr/strings.xml b/go/quickstep/res/values-sr/strings.xml
new file mode 100644
index 0000000000..b9dae390c6
--- /dev/null
+++ b/go/quickstep/res/values-sr/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Дели апликацију"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Пусти"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Преведи"</string>
+    <string name="action_search" msgid="6269564710943755464">"Објектив"</string>
+</resources>
diff --git a/go/quickstep/res/values-sv/strings.xml b/go/quickstep/res/values-sv/strings.xml
new file mode 100644
index 0000000000..e50dcbea52
--- /dev/null
+++ b/go/quickstep/res/values-sv/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Dela app"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Lyssna"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Översätt"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-sw/strings.xml b/go/quickstep/res/values-sw/strings.xml
new file mode 100644
index 0000000000..4deb7533f7
--- /dev/null
+++ b/go/quickstep/res/values-sw/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Shiriki Programu"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Sikiliza"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Tafsiri"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lenzi"</string>
+</resources>
diff --git a/go/quickstep/res/values-ta/strings.xml b/go/quickstep/res/values-ta/strings.xml
new file mode 100644
index 0000000000..fd445cd1fb
--- /dev/null
+++ b/go/quickstep/res/values-ta/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"ஆப்ஸைப் பகிருங்கள்"</string>
+    <string name="action_listen" msgid="2370304050784689486">"கேளுங்கள்"</string>
+    <string name="action_translate" msgid="8028378961867277746">"மொழிபெயர்"</string>
+    <string name="action_search" msgid="6269564710943755464">"லென்ஸ்"</string>
+</resources>
diff --git a/go/quickstep/res/values-th/strings.xml b/go/quickstep/res/values-th/strings.xml
new file mode 100644
index 0000000000..bcd56d0744
--- /dev/null
+++ b/go/quickstep/res/values-th/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"แชร์แอป"</string>
+    <string name="action_listen" msgid="2370304050784689486">"ฟัง"</string>
+    <string name="action_translate" msgid="8028378961867277746">"แปลภาษา"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-tl/strings.xml b/go/quickstep/res/values-tl/strings.xml
new file mode 100644
index 0000000000..0b6f74ab10
--- /dev/null
+++ b/go/quickstep/res/values-tl/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Ibahagi ang App"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Makinig"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Isalin"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-tr/strings.xml b/go/quickstep/res/values-tr/strings.xml
new file mode 100644
index 0000000000..20a27b3c55
--- /dev/null
+++ b/go/quickstep/res/values-tr/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Uygulamayı paylaş"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Dinle"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Çevir"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-uk/strings.xml b/go/quickstep/res/values-uk/strings.xml
new file mode 100644
index 0000000000..5041f8b877
--- /dev/null
+++ b/go/quickstep/res/values-uk/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Поділитися додатком"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Слухати"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Перекласти"</string>
+    <string name="action_search" msgid="6269564710943755464">"Об’єктив"</string>
+</resources>
diff --git a/go/quickstep/res/values-ur/strings.xml b/go/quickstep/res/values-ur/strings.xml
new file mode 100644
index 0000000000..aeea1f303d
--- /dev/null
+++ b/go/quickstep/res/values-ur/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"ایپ کا اشتراک کریں"</string>
+    <string name="action_listen" msgid="2370304050784689486">"سنیں"</string>
+    <string name="action_translate" msgid="8028378961867277746">"‏Google ترجمہ"</string>
+    <string name="action_search" msgid="6269564710943755464">"‏Google لینز"</string>
+</resources>
diff --git a/go/quickstep/res/values-vi/strings.xml b/go/quickstep/res/values-vi/strings.xml
new file mode 100644
index 0000000000..2e1f10a84a
--- /dev/null
+++ b/go/quickstep/res/values-vi/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Chia sẻ ứng dụng"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Nghe"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Dịch"</string>
+    <string name="action_search" msgid="6269564710943755464">"Ống kính"</string>
+</resources>
diff --git a/go/quickstep/res/values-zh-rCN/strings.xml b/go/quickstep/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000000..afd12e1525
--- /dev/null
+++ b/go/quickstep/res/values-zh-rCN/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"分享应用"</string>
+    <string name="action_listen" msgid="2370304050784689486">"聆听"</string>
+    <string name="action_translate" msgid="8028378961867277746">"翻译"</string>
+    <string name="action_search" msgid="6269564710943755464">"智能镜头"</string>
+</resources>
diff --git a/go/quickstep/res/values-zh-rHK/strings.xml b/go/quickstep/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000000..6cb3d60bf2
--- /dev/null
+++ b/go/quickstep/res/values-zh-rHK/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"分享應用程式"</string>
+    <string name="action_listen" msgid="2370304050784689486">"聆聽"</string>
+    <string name="action_translate" msgid="8028378961867277746">"翻譯"</string>
+    <string name="action_search" msgid="6269564710943755464">"智能鏡頭"</string>
+</resources>
diff --git a/go/quickstep/res/values-zh-rTW/strings.xml b/go/quickstep/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000000..443f7099e3
--- /dev/null
+++ b/go/quickstep/res/values-zh-rTW/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"分享應用程式"</string>
+    <string name="action_listen" msgid="2370304050784689486">"聆聽"</string>
+    <string name="action_translate" msgid="8028378961867277746">"翻譯"</string>
+    <string name="action_search" msgid="6269564710943755464">"智慧鏡頭"</string>
+</resources>
-- 
GitLab


From 57d250944af842104ca04712dc454a153e09a305 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Thu, 13 May 2021 07:40:05 +0000
Subject: [PATCH 1165/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I01c33a3b97106b9b40c6175118e9d47153d8599c
---
 res/values-am/strings.xml        | 3 +--
 res/values-ar/strings.xml        | 3 +--
 res/values-az/strings.xml        | 3 +--
 res/values-b+sr+Latn/strings.xml | 3 +--
 res/values-be/strings.xml        | 3 +--
 res/values-bg/strings.xml        | 3 +--
 res/values-bs/strings.xml        | 3 +--
 res/values-ca/strings.xml        | 3 +--
 res/values-cs/strings.xml        | 3 +--
 res/values-de/strings.xml        | 3 +--
 res/values-el/strings.xml        | 3 +--
 res/values-es/strings.xml        | 3 +--
 res/values-et/strings.xml        | 3 +--
 res/values-eu/strings.xml        | 3 +--
 res/values-fi/strings.xml        | 3 +--
 res/values-fr-rCA/strings.xml    | 3 +--
 res/values-fr/strings.xml        | 3 +--
 res/values-gl/strings.xml        | 3 +--
 res/values-hi/strings.xml        | 3 +--
 res/values-hr/strings.xml        | 3 +--
 res/values-hu/strings.xml        | 3 +--
 res/values-hy/strings.xml        | 3 +--
 res/values-in/strings.xml        | 3 +--
 res/values-is/strings.xml        | 3 +--
 res/values-it/strings.xml        | 3 +--
 res/values-iw/strings.xml        | 3 +--
 res/values-ka/strings.xml        | 3 +--
 res/values-kk/strings.xml        | 3 +--
 res/values-km/strings.xml        | 3 +--
 res/values-ko/strings.xml        | 3 +--
 res/values-ky/strings.xml        | 3 +--
 res/values-lo/strings.xml        | 3 +--
 res/values-lt/strings.xml        | 3 +--
 res/values-lv/strings.xml        | 3 +--
 res/values-mk/strings.xml        | 3 +--
 res/values-ml/strings.xml        | 3 +--
 res/values-mn/strings.xml        | 3 +--
 res/values-my/strings.xml        | 3 +--
 res/values-nb/strings.xml        | 3 +--
 res/values-ne/strings.xml        | 3 +--
 res/values-or/strings.xml        | 3 +--
 res/values-pa/strings.xml        | 3 +--
 res/values-pt-rPT/strings.xml    | 3 +--
 res/values-ro/strings.xml        | 3 +--
 res/values-ru/strings.xml        | 3 +--
 res/values-si/strings.xml        | 3 +--
 res/values-sl/strings.xml        | 3 +--
 res/values-sr/strings.xml        | 3 +--
 res/values-sv/strings.xml        | 3 +--
 res/values-sw/strings.xml        | 3 +--
 res/values-ta/strings.xml        | 3 +--
 res/values-th/strings.xml        | 3 +--
 res/values-tl/strings.xml        | 3 +--
 res/values-tr/strings.xml        | 3 +--
 res/values-uk/strings.xml        | 3 +--
 res/values-ur/strings.xml        | 3 +--
 res/values-vi/strings.xml        | 3 +--
 res/values-zh-rCN/strings.xml    | 3 +--
 res/values-zh-rHK/strings.xml    | 3 +--
 res/values-zh-rTW/strings.xml    | 3 +--
 60 files changed, 60 insertions(+), 120 deletions(-)

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index af30fa5994..1de056de97 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"አቃፊ፦ <xliff:g id="NAME">%1$s</xliff:g>፣ <xliff:g id="SIZE">%2$d</xliff:g> ንጥሎች"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"አቃፊ፦ <xliff:g id="NAME">%1$s</xliff:g>፣ <xliff:g id="SIZE">%2$d</xliff:g> ወይም ተጨማሪ ንጥሎች"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"የግድግዳ ወረቀቶች"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"ልጣፍ እና ቅጥ"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"የመነሻ ቅንብሮች"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"በእርስዎ አስተዳዳሪ የተሰናከለ"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"የመነሻ ማያ ገጽ ማሽከርከርን ይፍቀዱ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 92295db899..9ddb736247 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -109,8 +109,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"المجلد: <xliff:g id="NAME">%1$s</xliff:g>، <xliff:g id="SIZE">%2$d</xliff:g> عنصر"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"المجلد: <xliff:g id="NAME">%1$s</xliff:g>، <xliff:g id="SIZE">%2$d</xliff:g> عنصر أو أكثر"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"الخلفيات"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"الخلفية والنمط"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"إعدادات الشاشة الرئيسية"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"أوقف المشرف هذه الميزة"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"السماح بتدوير الشاشة الرئيسية"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 62581b82d1..4faba10935 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Qovluq: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> element"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Qovluq: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> və ya daha çox element"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Divar kağızları"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Divar kağızı və üslub"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Home ayarları"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Admininiz tərəfindən deaktiv edilib"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Əsas ekranın firlanmağına icazə verin"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index ce69fd94dc..700565615f 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -100,8 +100,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> stavke"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ili više stavki"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Pozadine"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Pozadina i stil"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Podešavanja početnog ekrana"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Administrator je onemogućio"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Dozvoli rotaciju početnog ekrana"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 2efdad405c..c082f9fe7d 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -103,8 +103,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Папка: <xliff:g id="NAME">%1$s</xliff:g>, элементы: <xliff:g id="SIZE">%2$d</xliff:g>"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Папка: <xliff:g id="NAME">%1$s</xliff:g>, элементы: <xliff:g id="SIZE">%2$d</xliff:g> ці больш"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Шпалеры"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Шпалеры і стыль"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Налады галоўнага экрана"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Адключаная адміністратарам"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Дазволіць паварот галоўнага экрана"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 9484a75206..7c1af2a7b1 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Папка: „<xliff:g id="NAME">%1$s</xliff:g>“ – <xliff:g id="SIZE">%2$d</xliff:g> елемента"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Папка: „<xliff:g id="NAME">%1$s</xliff:g>“ – <xliff:g id="SIZE">%2$d</xliff:g> или повече елементи"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Тапети"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Тапет и стил"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Настройки за началния екран"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Деактивирано от администратора ви"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Разрешаване на завъртането на началния екран"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index f79b99c826..b7d93f6aad 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -100,8 +100,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, br. stavki: <xliff:g id="SIZE">%2$d</xliff:g>"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ili više stavki"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Pozadinske slike"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Pozadinska slika i stil"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Postavke početnog ekrana"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Onemogućio vaš administrator"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Dozvoli rotiranje početnog ekrana"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index ecfaebe8b7..2926d563f3 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Carpeta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elements"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Carpeta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> o més elements"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fons de pantalla"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Fons de pantalla i estil"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Config. pantalla d\'inici"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Desactivada per l\'administrador"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Permet la rotació de la pantalla d\'inici"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 4cfadc190e..3198068209 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -103,8 +103,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Složka: <xliff:g id="NAME">%1$s</xliff:g>, počet položek: <xliff:g id="SIZE">%2$d</xliff:g>"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Složka: <xliff:g id="NAME">%1$s</xliff:g>, počet položek: <xliff:g id="SIZE">%2$d</xliff:g> nebo více"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Tapety"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Tapeta a styl"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Nastavení plochy"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Zakázáno administrátorem"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Povolit otáčení plochy"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f040310611..63c58c7e59 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Ordner: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> Elemente"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Ordner: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> oder mehr Elemente"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Hintergründe"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Hintergrund &amp; Stil"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Startbildschirm-Einstellungen"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Von deinem Administrator deaktiviert"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Drehen des Startbildschirms zulassen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 8d00829ae6..0ffe2c430c 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Φάκελος: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> στοιχεία"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Φάκελος: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ή περισσότερα στοιχεία"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Ταπετσαρίες"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Ταπετσαρία και στιλ"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Ρυθμίσεις Αρχ. Οθ."</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Απενεργοποιήθηκε από τον διαχειριστή σας"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Να επιτρέπεται η περιστροφή της αρχικής οθόνης"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index d34ff3262f..1448117e81 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Carpeta: <xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="SIZE">%2$d</xliff:g> elementos)"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Carpeta: <xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="SIZE">%2$d</xliff:g> o más elementos)"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fondos de pantalla"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Fondo de pantalla y estilo"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Ajustes de la pantalla de inicio"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Inhabilitado por el administrador"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Permitir rotación de la pantalla de inicio"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 06cac349d3..4908c4da3f 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Kaust: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> üksust"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Kaust: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> või rohkem üksust"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Taustapildid"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Taustapilt ja stiil"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Avakuva seaded"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Keelas administraator"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Luba avakuva pööramine"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index ad61cb6cf4..c15b18c5a5 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"<xliff:g id="NAME">%1$s</xliff:g> karpeta (<xliff:g id="SIZE">%2$d</xliff:g> elementu)"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"<xliff:g id="NAME">%1$s</xliff:g> karpeta (<xliff:g id="SIZE">%2$d</xliff:g> elementu edo gehiago)"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Horma-paperak"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Horma-papera eta estiloa"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Hasierako pantailaren ezarpenak"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Administratzaileak desgaitu du"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Eman hasierako pantaila biratzeko baimena"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 1e1b1e395b..dcee366453 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Kansio: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> kohdetta"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Kansio: <xliff:g id="NAME">%1$s</xliff:g>, ainakin <xliff:g id="SIZE">%2$d</xliff:g> kohdetta"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Taustakuvat"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Taustakuva ja tyyli"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Aloitusnäyttö"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Järjestelmänvalvoja on poistanut toiminnon käytöstä."</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Salli aloitusnäytön kiertäminen"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 1867a5dd5f..4b8c690080 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Dossier : <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> élément(s)"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Dossier : <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> éléments ou plus"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fonds d\'écran"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Fond d\'écran et style"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Paramètres d\'accueil"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Cette fonction est désactivée par votre administrateur"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Autoriser la rotation de l\'écran d\'accueil"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index d8b666b3b4..49bc7fd8c0 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Dossier : <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> éléments"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Dossier : <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> éléments ou plus"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fonds d\'écran"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Fond d\'écran et style"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Paramètres de l\'accueil"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Désactivé par votre administrateur"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Autoriser la rotation de l\'écran d\'accueil"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 3609b17ed0..ecbc9405ca 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Cartafol: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elementos"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Cartafol: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elementos ou máis"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fondos de pantalla"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Fondo de pantalla e estilo"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Axustes de Inicio"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Función desactivada polo administrador"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Permitir xirar a pantalla de inicio"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 4c17b168fc..471e08897d 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"फ़ोल्डर: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> आइटम"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"फ़ोल्डर: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> या इससे ज़्यादा आइटम"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"वॉलपेपर"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"वॉलपेपर और स्टाइल"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"होम पेज की सेटिंग"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"आपके एडमिन ने बंद किया हुआ है"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"होमस्क्रीन घुमाने की अनुमति दें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index a165fd7daa..413afcece3 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -100,8 +100,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Mapa: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> stavke"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Mapa: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ili više stavki"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Pozadine"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Pozadina i stil"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Postavke početnog zaslona"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Onemogućio administrator"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Dopusti zakretanje početnog zaslona"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index c89b55b127..0435801250 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Mappa: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elem"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Mappa: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> vagy több elem"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Háttérképek"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Háttérkép és stílus"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Kezdőképernyő beállításai"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"A rendszergazda letiltotta"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"A kezdőképernyő elforgatásának engedélyezése"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 522aa6542b..37d0815717 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Պանակ՝ <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> տարր"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Պանակ՝ <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> կամ ավելի տարրեր"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Պաստառներ"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Պաստառ և ոճ"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Գլխավոր էջի կարգավորումներ"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Անջատվել է ձեր ադմինիստրատորի կողմից"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Թույլ տալ հիմնական էկրանի պտտումը"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index e7a2ee6356..abad5f0b9c 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> item"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> item atau lebih"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Wallpaper"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Wallpaper &amp; gaya"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Setelan layar utama"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Dinonaktifkan oleh admin"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Izinkan Layar utama diputar"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 5dcdb520f3..bb4ee9bd6a 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Mappa: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> atriði"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Mappa: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> eða fleiri atriði"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Veggfóður"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Veggfóður og stíll"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Heimastillingar"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Gert óvirkt af kerfisstjóra"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Leyfa snúning á heimaskjá"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index c527a2ecec..2a19b739af 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Cartella: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elementi"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Cartella: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> o più elementi"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Sfondi"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Sfondo e stile"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Impostazioni schermata Home"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Disattivata dall\'amministratore"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Consenti rotazione della schermata Home"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 12647388ac..c8793ac9ce 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -103,8 +103,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"תיקייה: <xliff:g id="NAME">%1$s</xliff:g>, מספר הפריטים: <xliff:g id="SIZE">%2$d</xliff:g>"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"תיקייה: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> פריטים או יותר"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"טפטים"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"טפט וסגנון"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"הגדרות של מסך הבית"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"הושבת על ידי מנהל המערכת שלך"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"סיבוב של מסך הבית"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 03e0bbb62e..ca8f665b27 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"საქაღალდე: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ერთეული"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"საქაღალდე: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ან მეტი ერთეული"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"ფონები"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"ფონი და სტილი"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"მთავარი გვერდის პარამეტრები"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"გათიშულია თქვენი ადმინისტრატორის მიერ"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"მთავარი ეკრანის შეტრიალების დაშვება"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index f0a8f807b7..8353c249da 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Қалта: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> элемент бар"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Қалта: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> не одан көп элемент бар"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Тұсқағаздар"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Тұсқағаз және стиль"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Негізгі экран параметрлері"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Әкімші өшірді"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Негізгі экранның бұрылуына рұқсат ету"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index e0332b93fa..b941b18c18 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"ថត៖ <xliff:g id="NAME">%1$s</xliff:g>, ធាតុ <xliff:g id="SIZE">%2$d</xliff:g>"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ថត៖ <xliff:g id="NAME">%1$s</xliff:g>, ធាតុ <xliff:g id="SIZE">%2$d</xliff:g> ឬច្រើនជាងនេះ"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"ផ្ទាំង​រូបភាព"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"ផ្ទាំងរូបភាព និងរចនាប័ទ្ម"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"ការកំណត់​ទំព័រដើម"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"បានបិទដំណើរការដោយអ្នកគ្រប់គ្រងរបស់អ្នក"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"អនុញ្ញាតការបងិ្វលអេក្រង់ដើម"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a240ac3f66..e8a19ebe77 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"폴더: <xliff:g id="NAME">%1$s</xliff:g>, 항목 <xliff:g id="SIZE">%2$d</xliff:g>개"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"폴더: <xliff:g id="NAME">%1$s</xliff:g>, 항목 <xliff:g id="SIZE">%2$d</xliff:g>개 이상"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"배경화면"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"배경화면 및 스타일"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"홈 설정"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"관리자가 사용 중지함"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"홈 화면 회전 허용"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index f848940e59..7f131771c6 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"<xliff:g id="NAME">%1$s</xliff:g> папкасындагы объекттер: <xliff:g id="SIZE">%2$d</xliff:g>"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"<xliff:g id="NAME">%1$s</xliff:g> папкасындагы объекттер: <xliff:g id="SIZE">%2$d</xliff:g> же андан көбүрөөк"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Тушкагаздар"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Тушкагаз жана стиль"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Башкы бет жөндөөлөрү"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Администраторуңуз өчүрүп койгон"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Башкы экранды бурууга уруксат берүү"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 1f3f6b7f71..041e3222e7 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"ໂຟນເດີ: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ລາຍການ"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ໂຟນເດີ: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ຫຼື ລາຍການເພີ່ມເຕີມ"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"ພາບພື້ນຫຼັງ"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"ຮູບພື້ນຫຼັງ ແລະ ຮູບແບບ"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"ການຕັ້ງຄ່າໜ້າຫຼັກ"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"ຖືກປິດການນຳໃຊ້ໂດຍຜູ້ເບິ່ງແຍງລະບົບຂອງທ່ານ"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"ອະນຸຍາດໃຫ້ໝຸນໜ້າຈໍຢູ່ໜ້າຫຼັກໄດ້"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 2d76f92017..707cef4638 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -103,8 +103,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Aplankas: „<xliff:g id="NAME">%1$s</xliff:g>“, elementų: <xliff:g id="SIZE">%2$d</xliff:g>"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Aplankas: „<xliff:g id="NAME">%1$s</xliff:g>“, elementų: <xliff:g id="SIZE">%2$d</xliff:g> ar daugiau"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Ekrano fonai"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Ekrano fonas ir stilius"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"„Home“ nustatymai"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Išjungė administratorius"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Leisti pasukti pagrindinį ekraną"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index ada97fb30c..382784b39d 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -100,8 +100,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Mape <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> vienumi"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Mape <xliff:g id="NAME">%1$s</xliff:g>, vienumu skaits mapē: vismaz <xliff:g id="SIZE">%2$d</xliff:g>"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fona tapetes"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Fona tapete un stils"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Sākumlapas iestatījumi"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Atspējojis administrators"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Atļaut sākuma ekrāna pagriešanu"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 128b87ded8..dcfd1d9d40 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Папка: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ставки"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Папка: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> или повеќе ставки"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Тапети"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Тапет и стил"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Поставки за почетен екран"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Оневозможено од администраторот"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Дозволи ротација на почетниот екран"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index b64bb99b26..2d7c9250eb 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"ഫോൾഡർ: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ഇനങ്ങൾ"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ഫോൾഡർ: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> അല്ലെങ്കിൽ അതിലധികം ഇനങ്ങൾ"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"വാൾപേപ്പർ"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"വാൾപേപ്പറും സ്‌റ്റൈലും"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"ഹോം ക്രമീകരണം"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"അഡ്മിൻ പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നു"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"ഹോം സ്ക്രീൻ തിരിക്കൽ അനുവദിക്കുക"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 4d9acc217d..5a072fea72 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Фолдер: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> зүйл"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Фолдер: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> эсвэл үүнээс олон зүйл"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Дэлгэцийн зураг"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Дэлгэцийн зураг, загвар"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Нүүр хуудасны тохиргоо"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Таны админ идэвхгүй болгосон"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Нүүр дэлгэцийг эргүүлэхийг зөвшөөрөх"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 063f791d83..1fb7e5644f 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"ဖိုင်တွဲ - <xliff:g id="NAME">%1$s</xliff:g>၊ <xliff:g id="SIZE">%2$d</xliff:g> ဖိုင်များ"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ဖိုင်တွဲ - <xliff:g id="NAME">%1$s</xliff:g>၊ <xliff:g id="SIZE">%2$d</xliff:g> သို့မဟုတ် နောက်ထပ်ဖိုင်များ"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"နောက်ခံများ"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"နောက်ခံနှင့် ပုံစံ"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"ပင်မဆက်တင်များ"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"သင့်စီမံခန့်ခွဲသူက ပိတ်လိုက်ပါသည်"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"ပင်မစာမျက်နှာလှည့်ခြင်းကို ခွင့်ပြုပါ"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 52ff8782b6..42d04a2231 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Mappe: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elementer"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Mappe: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> eller flere elementer"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Bakgrunner"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Bakgrunn og stil"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Startsideinnstillinger"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Administratoren har slått av funksjonen"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Tillat rotasjon av startskjermen"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index cecc3ab019..9e26e1d9e5 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"फोल्डर: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> वस्तुहरू"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"फोल्डर: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> वा सोभन्दा बढी वस्तुहरू"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"वालपेपरहरु"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"वालपेपर तथा शैली"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"गृहपृष्ठका सेटिङहरू"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"तपाईँको प्रशासकद्वारा असक्षम गरिएको"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"गृह स्क्रिनलाई रोटेट हुन दिइयोस्"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index ffbc6901df..dfcc716796 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"ଫୋଲ୍ଡର୍: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ଆଇଟମଗୁଡ଼ିକ"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ଫୋଲ୍ଡର୍: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> କିମ୍ବା ଅଧିକ ଆଇଟମ୍"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"ୱାଲପେପର୍‌"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"ୱାଲପେପର୍ ଏବଂ ଷ୍ଟାଇଲ୍"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"ହୋମ୍‌ ସେଟିଂସ୍"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"ଆପଣଙ୍କ ଆଡମିନଙ୍କ ଦ୍ୱାରା ଅକ୍ଷମ କରାଯାଇଛି"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"ହୋମ୍‌ ସ୍କ୍ରିନ୍ ବୁଲାଇବାକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 869d8542fe..495f3c4b7c 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"ਫੋਲਡਰ: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ਆਈਟਮਾਂ"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ਫੋਲਡਰ: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ਜਾਂ ਹੋਰ ਆਈਟਮਾਂ"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"ਵਾਲਪੇਪਰ"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"ਵਾਲਪੇਪਰ ਅਤੇ ਸਟਾਈਲ"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"ਹੋਮ ਸੈਟਿੰਗਾਂ"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"ਤੁਹਾਡੇ ਪ੍ਰਸ਼ਾਸਕ ਦੁਆਰਾ ਅਯੋਗ ਬਣਾਈ ਗਈ"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"ਹੋਮ ਸਕ੍ਰੀਨ ਨੂੰ ਘੁਮਾਉਣ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 283529dfdc..d429ebe188 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Pasta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> itens"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Pasta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ou mais itens"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Imagens de fundo"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Imagem de fundo e estilo"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Definições de início"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Desativada pelo gestor"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Permitir rotação do ecrã principal"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 4faa6e12b9..5ba9e8d7b5 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -100,8 +100,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Dosar: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elemente"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Dosar: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> sau mai multe elemente"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Imagini de fundal"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Imagine de fundal și stil"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Setări ecran de pornire"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Dezactivată de administrator"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Permite rotirea ecranului de pornire"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 6b1cc6b887..7da57db748 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -103,8 +103,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Папка \"<xliff:g id="NAME">%1$s</xliff:g>\" (объектов: <xliff:g id="SIZE">%2$d</xliff:g>)"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Папка \"<xliff:g id="NAME">%1$s</xliff:g>\" (объектов: <xliff:g id="SIZE">%2$d</xliff:g> или больше)"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Обои"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Обои и стиль"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Главный экран"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Функция отключена администратором"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Разрешить поворачивать главный экран"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 4826639925..3741c76483 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"ෆෝල්ඩරය: <xliff:g id="NAME">%1$s</xliff:g>, අයිතම <xliff:g id="SIZE">%2$d</xliff:g>"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ෆෝල්ඩර: <xliff:g id="NAME">%1$s</xliff:g>, අයිතම <xliff:g id="SIZE">%2$d</xliff:g>ක් හෝ වැඩි ගණනක්"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"වෝල්පේපර"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"වෝල්පේපරය සහ මෝස්තරය"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"නිවසේ සැකසීම්"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"ඔබගේ පරිපාලක විසින් අබල කරන ලදී"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"මුල් පිටු තිරය කරකැවීමට ඉඩ දෙන්න"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 40e202f43a..cb7f0bc560 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -103,8 +103,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Mapa: <xliff:g id="NAME">%1$s</xliff:g>, št. elementov: <xliff:g id="SIZE">%2$d</xliff:g>"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Mapa: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ali več elementov"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Ozadja"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Zaslonsko ozadje in slog"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Domače nastavitve"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Onemogočil skrbnik."</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Omogoči sukanje začetnega zaslona"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index bd90dadc0a..bcc867ca79 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -100,8 +100,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Фолдер: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ставке"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Фолдер: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> или више ставки"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Позадине"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Позадина и стил"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Подешавања почетног екрана"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Администратор је онемогућио"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Дозволи ротацију почетног екрана"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index cbbd497621..ce973202cf 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Mapp: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> objekt"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Mapp: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> eller fler objekt"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Bakgrunder"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Bakgrund och utseende"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Startinställningar"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Inaktiverat av administratören"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Tillåt rotering av startskärmen"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 353d74a2b9..3a46d73c90 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Folda: <xliff:g id="NAME">%1$s</xliff:g>, vipengee <xliff:g id="SIZE">%2$d</xliff:g>"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folda: <xliff:g id="NAME">%1$s</xliff:g>, vipengee <xliff:g id="SIZE">%2$d</xliff:g> au zaidi"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Mandhari"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Mandhari na muundo"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Mipangilio ya mwanzo"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Imezimwa na msimamizi wako"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Ruhusu kuzungusha skrini ya Kwanza"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 2badf1073e..3b891cb4ca 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"கோப்புறை: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> கோப்புகள்"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"கோப்புறை: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> அல்லது அதற்கு அதிகமான கோப்புகள்"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"வால்பேப்பர்கள்"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"வால்பேப்பர் &amp; ஸ்டைல்"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"முகப்பு அமைப்புகள்"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"உங்கள் நிர்வாகி முடக்கியுள்ளார்"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"முகப்புத் திரை சுழற்சியை அனுமதி"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 905d5a175c..2dd6ccc799 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"โฟลเดอร์: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> รายการ"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"โฟลเดอร์: <xliff:g id="NAME">%1$s</xliff:g>, อย่างน้อย <xliff:g id="SIZE">%2$d</xliff:g> รายการ"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"วอลเปเปอร์"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"วอลเปเปอร์และรูปแบบ"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"การตั้งค่าหน้าแรก"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"ปิดใช้โดยผู้ดูแลระบบ"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"อนุญาตให้หมุนหน้าจอหลัก"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index a3dc55ddf8..cec90c4dbd 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> (na) item"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> o higit pang item"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Mga Wallpaper"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Wallpaper &amp; istilo"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Mga setting ng Home"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Na-disable ng iyong admin"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Payagan ang pag-rotate ng Home screen"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 94b557431f..baa5ccef3f 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Klasör: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> öğe"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Klasör: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> veya daha fazla öğe"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Duvar Kağıtları"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Duvar kağıdı ve stil"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Ana ekran ayarları"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Yöneticiniz tarafından devre dışı bırakıldı"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Ana ekranı döndürmeye izin ver"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 371a583989..e266d6aca4 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -103,8 +103,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Папка \"<xliff:g id="NAME">%1$s</xliff:g>\", елементів: <xliff:g id="SIZE">%2$d</xliff:g>"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Папка \"<xliff:g id="NAME">%1$s</xliff:g>\", елементів: <xliff:g id="SIZE">%2$d</xliff:g> або більше"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Фонові малюнки"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Фоновий малюнок і стиль"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Налаштування головного екрана"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Вимкнув адміністратор"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Дозволити обертання головного екрана"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 890bc68fe3..4e986b8947 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"فولڈر: <xliff:g id="NAME">%1$s</xliff:g>، <xliff:g id="SIZE">%2$d</xliff:g> آئٹمز"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"فولڈر: <xliff:g id="NAME">%1$s</xliff:g>، <xliff:g id="SIZE">%2$d</xliff:g> یا مزید آئٹمز"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"وال پیپرز"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"وال پیپر اور طرز"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"ہوم ترتیبات"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"آپ کے منتظم کی طرف سے غیر فعال کر دیا گیا"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"ہوم اسکرین گھمانے کی اجازت دیں"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 495b4e4028..eb39c9a132 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Thư mục: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> mục"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Thư mục: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> mục trở lên"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Hình nền"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Hình nền và kiểu"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Cài đặt màn hình chính"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Bị tắt bởi quản trị viên của bạn"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Cho phép xoay Màn hình chính"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 86685b5ce1..f7aa74add6 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"文件夹：<xliff:g id="NAME">%1$s</xliff:g>，<xliff:g id="SIZE">%2$d</xliff:g> 个项目"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"文件夹：<xliff:g id="NAME">%1$s</xliff:g>，<xliff:g id="SIZE">%2$d</xliff:g> 个或更多项目"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"壁纸"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"壁纸和样式"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"主屏幕设置"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"已被您的管理员停用"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"允许旋转主屏幕"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 9334b8ea94..0fd5284705 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"資料夾：<xliff:g id="NAME">%1$s</xliff:g>，<xliff:g id="SIZE">%2$d</xliff:g> 個項目"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"資料夾：<xliff:g id="NAME">%1$s</xliff:g>，<xliff:g id="SIZE">%2$d</xliff:g> 個或以上的項目"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"桌布"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"桌布和樣式"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"主畫面設定"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"已由您的管理員停用"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"允許主畫面旋轉"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index da1743f24c..99e22a2d46 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"資料夾：<xliff:g id="NAME">%1$s</xliff:g>，<xliff:g id="SIZE">%2$d</xliff:g> 個項目"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"資料夾：<xliff:g id="NAME">%1$s</xliff:g>，<xliff:g id="SIZE">%2$d</xliff:g> 個以上的項目"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"桌布"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"桌布和樣式"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"主畫面設定"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"已由你的管理員停用"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"允許旋轉主畫面"</string>
-- 
GitLab


From af6686bf1f859d822b0e7b7cf9ca04950e8dd13f Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Thu, 13 May 2021 01:13:57 -0700
Subject: [PATCH 1166/1664] Use IMM.hideSoftInputFromWindow to close the window

Bug: 187589678
Test: manual
Change-Id: Id46a36432a03638877f854f32bfa03183c7cb019
---
 src/com/android/launcher3/util/UiThreadHelper.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/util/UiThreadHelper.java b/src/com/android/launcher3/util/UiThreadHelper.java
index 523f3d6d13..947f96fe56 100644
--- a/src/com/android/launcher3/util/UiThreadHelper.java
+++ b/src/com/android/launcher3/util/UiThreadHelper.java
@@ -50,11 +50,9 @@ public class UiThreadHelper {
             WindowInsets rootInsets = root.getRootWindowInsets();
             boolean isImeShown = rootInsets != null && rootInsets.isVisible(
                     WindowInsets.Type.ime());
-            if (isImeShown) {
-                // this call is already asynchronous
-                root.getWindowInsetsController().hide(WindowInsets.Type.ime());
+            if (!isImeShown) {
+                return;
             }
-            return;
         }
 
         Message.obtain(HANDLER.get(root.getContext()),
-- 
GitLab


From ff9fcd8e6b15fd556b9dd47b08266300673c98da Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Thu, 13 May 2021 10:25:51 -0500
Subject: [PATCH 1167/1664] Fix CastError on SecondaryDisplay

Bug: 185566696
Test: Manual
Change-Id: I0dbf0edccc40172e802cc197e200a8fb9502b4ec
---
 .../launcher3/allapps/AllAppsContainerView.java       | 11 ++++++++++-
 .../launcher3/allapps/AllAppsRecyclerView.java        |  9 ---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 5c9c037a62..7be1138b5f 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -94,6 +94,14 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
     private final ItemInfoMatcher mWorkMatcher = mPersonalMatcher.negate();
     private final AllAppsStore mAllAppsStore = new AllAppsStore();
 
+    private final RecyclerView.OnScrollListener mScrollListener =
+            new RecyclerView.OnScrollListener() {
+                @Override
+                public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
+                    updateHeaderScroll(((AllAppsRecyclerView) recyclerView).getCurrentScrollY());
+                }
+            };
+
     private final Paint mNavBarScrimPaint;
     private int mNavBarScrimHeight = 0;
 
@@ -149,7 +157,6 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         mLauncher.addOnDeviceProfileChangeListener(this);
 
 
-
         mSearchAdapterProvider = mLauncher.createSearchAdapterProvider(this);
         mSearchQueryBuilder = new SpannableStringBuilder();
         Selection.setSelection(mSearchQueryBuilder, 0);
@@ -676,6 +683,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         anim1.start();
         super.onRelease();
     }
+
     @Override
     public void getDrawingRect(Rect outRect) {
         super.getDrawingRect(outRect);
@@ -738,6 +746,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
             recyclerView.setHasFixedSize(true);
             // No animations will occur when changes occur to the items in this RecyclerView.
             recyclerView.setItemAnimator(null);
+            recyclerView.addOnScrollListener(mScrollListener);
             FocusedItemDecorator focusedItemDecorator = new FocusedItemDecorator(recyclerView);
             recyclerView.addItemDecoration(focusedItemDecorator);
             adapter.setIconFocusListener(focusedItemDecorator.getFocusListener());
diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
index 197d74c401..c6c9c9b72b 100644
--- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
@@ -38,7 +38,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.BaseRecyclerView;
 import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.logging.StatsLogManager;
@@ -53,7 +52,6 @@ import java.util.List;
 public class AllAppsRecyclerView extends BaseRecyclerView {
     private static final String TAG = "AllAppsContainerView";
     private static final boolean DEBUG = false;
-    private final Launcher mLauncher;
 
     private AlphabeticalAppsList mApps;
     private final int mNumAppsPerRow;
@@ -89,7 +87,6 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
                 R.dimen.all_apps_empty_search_bg_top_offset);
         mNumAppsPerRow = LauncherAppState.getIDP(context).numColumns;
         mFastScrollHelper = new AllAppsFastScrollHelper(this);
-        mLauncher = Launcher.getLauncher(context);
     }
 
     /**
@@ -202,12 +199,6 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
         }
     }
 
-    @Override
-    public void onScrolled(int dx, int dy) {
-        super.onScrolled(dx, dy);
-        mLauncher.getAppsView().updateHeaderScroll(getCurrentScrollY());
-    }
-
     @Override
     public boolean onInterceptTouchEvent(MotionEvent e) {
         boolean result = super.onInterceptTouchEvent(e);
-- 
GitLab


From a7c9c144440cab22efb81286b79ccf2425c06df2 Mon Sep 17 00:00:00 2001
From: Vadim Tryshev <vadimt@google.com>
Date: Thu, 13 May 2021 17:20:36 +0000
Subject: [PATCH 1168/1664] Revert "Temporarily demoting failing tests from
 presubmits"

This reverts commit 395c58d303c6354d52694a45eebb4abb00d45c12.

Reason for revert: The bug was fixed

Bug: 187899876
Change-Id: I73f93f5fb1ec0ab0352ba174aabbaf6935dd9fc4
Test: presubmit
---
 .../src/com/android/quickstep/TaplTestsQuickstep.java      | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
index cabbe93eaf..a5038a1fb0 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
@@ -17,14 +17,13 @@
 package com.android.quickstep;
 
 import static com.android.launcher3.ui.TaplTestsLauncher3.getAppPackageName;
-import static com.android.launcher3.util.rule.TestStabilityRule.LOCAL;
-import static com.android.launcher3.util.rule.TestStabilityRule.UNBUNDLED_POSTSUBMIT;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import android.content.Intent;
+import android.util.Log;
 
 import androidx.test.filters.LargeTest;
 import androidx.test.runner.AndroidJUnit4;
@@ -38,8 +37,8 @@ import com.android.launcher3.tapl.LauncherInstrumentation.NavigationModel;
 import com.android.launcher3.tapl.Overview;
 import com.android.launcher3.tapl.OverviewActions;
 import com.android.launcher3.tapl.OverviewTask;
+import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.ui.TaplTestsLauncher3;
-import com.android.launcher3.util.rule.TestStabilityRule.Stability;
 import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch;
 import com.android.quickstep.views.RecentsView;
 
@@ -95,7 +94,6 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
 
     @Test
     @PortraitLandscape
-    @Stability(flavors = LOCAL | UNBUNDLED_POSTSUBMIT) // b/187899876
     public void testOverview() throws Exception {
         startTestAppsWithCheck();
         // mLauncher.pressHome() also tests an important case of pressing home while in background.
@@ -165,7 +163,6 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
     @Test
     @NavigationModeSwitch
     @PortraitLandscape
-    @Stability(flavors = LOCAL | UNBUNDLED_POSTSUBMIT) // b/187899876
     public void testOverviewActions() throws Exception {
         // Experimenting for b/165029151:
         final Overview overview = mLauncher.pressHome().switchToOverview();
-- 
GitLab


From 01b32466c3e26b748c146f8fe5a0d2edf3c80d30 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 13 May 2021 17:14:10 +0000
Subject: [PATCH 1169/1664] Revert "Revert "Exposing AnimatorListeners in
 StateManager to receive both success and failure callback""

This reverts commit d7f11d5fb96caa358085418564c3836190505696.

Reason for revert: Fixed initial error
Bug: 185554764

Change-Id: I32cc49f9b3820166736ceb347f33577939aa6efa
---
 .../HotseatPredictionController.java          |   9 +-
 .../RecentsViewStateController.java           |   4 +-
 .../NavBarToHomeTouchController.java          |   7 +-
 ...ButtonNavbarToOverviewTouchController.java |   5 +-
 .../NoButtonQuickSwitchTouchController.java   |   3 +-
 .../quickstep/LauncherActivityInterface.java  |   4 +-
 .../SwipeUpGestureTutorialController.java     |  10 +-
 .../interaction/TutorialController.java       |   8 +-
 .../android/quickstep/views/RecentsView.java  |   4 +-
 src/com/android/launcher3/Workspace.java      |   5 +-
 .../LauncherAccessibilityDelegate.java        |  43 ++++----
 .../ShortcutMenuAccessibilityDelegate.java    |  22 ++--
 .../allapps/AllAppsTransitionController.java  |   8 +-
 .../anim/AnimationSuccessListener.java        |  20 ----
 .../launcher3/anim/AnimatorListeners.java     | 100 ++++++++++++++++++
 .../launcher3/anim/PendingAnimation.java      |  30 +-----
 .../launcher3/statemanager/StateManager.java  |  39 ++++---
 17 files changed, 185 insertions(+), 136 deletions(-)
 create mode 100644 src/com/android/launcher3/anim/AnimatorListeners.java

diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
index 67ed5fb5e5..5dcf84c249 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
@@ -17,6 +17,7 @@ package com.android.launcher3.hybridhotseat;
 
 import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
 import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback;
 import static com.android.launcher3.hybridhotseat.HotseatEduController.getSettingsIntent;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOTSEAT_PREDICTION_PINNED;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOTSEAT_RANKED;
@@ -150,7 +151,7 @@ public class HotseatPredictionController implements DragController.DragListener,
      * Shows appropriate hotseat education based on prediction enabled and migration states.
      */
     public void showEdu() {
-        mLauncher.getStateManager().goToState(NORMAL, true, () -> {
+        mLauncher.getStateManager().goToState(NORMAL, true, forSuccessCallback(() -> {
             if (mPredictedItems.isEmpty()) {
                 // launcher has empty predictions set
                 Snackbar.show(mLauncher, R.string.hotsaet_tip_prediction_disabled,
@@ -165,7 +166,7 @@ public class HotseatPredictionController implements DragController.DragListener,
                         .collect(Collectors.toList()));
                 eduController.showEdu();
             }
-        });
+        }));
     }
 
     /**
@@ -255,8 +256,8 @@ public class HotseatPredictionController implements DragController.DragListener,
             }
         }
         if (animate) {
-            animationSet.addListener(AnimationSuccessListener
-                    .forRunnable(this::removeOutlineDrawings));
+            animationSet.addListener(
+                    forSuccessCallback(this::removeOutlineDrawings));
             animationSet.start();
         } else {
             removeOutlineDrawings();
diff --git a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
index 0652d48c11..996d36aadc 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
@@ -35,7 +35,7 @@ import androidx.annotation.NonNull;
 
 import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.LauncherState;
-import com.android.launcher3.anim.AnimationSuccessListener;
+import com.android.launcher3.anim.AnimatorListeners;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.anim.PropertySetter;
 import com.android.launcher3.states.StateAnimationConfig;
@@ -78,7 +78,7 @@ public final class RecentsViewStateController extends
             mRecentsView.updateEmptyMessage();
         } else {
             builder.addListener(
-                    AnimationSuccessListener.forRunnable(mRecentsView::resetTaskVisuals));
+                    AnimatorListeners.forSuccessCallback(mRecentsView::resetTaskVisuals));
         }
 
         // Create or dismiss split screen select animations
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
index b8caf81f14..521dd233b8 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
@@ -22,6 +22,7 @@ import static com.android.launcher3.LauncherAnimUtils.newCancelListener;
 import static com.android.launcher3.LauncherState.ALL_APPS;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS;
+import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_ALL_APPS_EDU;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE;
@@ -38,7 +39,6 @@ import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.allapps.AllAppsTransitionController;
-import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.anim.PendingAnimation;
@@ -199,7 +199,7 @@ public class NavBarToHomeTouchController implements TouchController,
                         .animateWithVelocity(velocity);
             } else {
                 mLauncher.getStateManager().goToState(mEndState, true,
-                        () -> onSwipeInteractionCompleted(mEndState));
+                        forSuccessCallback(() -> onSwipeInteractionCompleted(mEndState)));
             }
             if (mStartState != mEndState) {
                 logHomeGesture();
@@ -214,8 +214,7 @@ public class NavBarToHomeTouchController implements TouchController,
             // Quickly return to the state we came from (we didn't move far).
             ValueAnimator anim = mCurrentAnimation.getAnimationPlayer();
             anim.setFloatValues(progress, 0);
-            anim.addListener(AnimationSuccessListener.forRunnable(
-                    () -> onSwipeInteractionCompleted(mStartState)));
+            anim.addListener(forSuccessCallback(() -> onSwipeInteractionCompleted(mStartState)));
             anim.setDuration(80).start();
         }
     }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
index 729e2cb5c6..eb62110065 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -22,6 +22,7 @@ import static com.android.launcher3.LauncherState.HINT_STATE;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.Utilities.EDGE_NAV_BAR;
+import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback;
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
@@ -172,13 +173,13 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
         }
         mNormalToHintOverviewScrimAnimator = null;
         mCurrentAnimation.getTarget().addListener(newCancelListener(() ->
-                mLauncher.getStateManager().goToState(OVERVIEW, true, () -> {
+                mLauncher.getStateManager().goToState(OVERVIEW, true, forSuccessCallback(() -> {
                     mOverviewResistYAnim = AnimatorControllerWithResistance
                             .createRecentsResistanceFromOverviewAnim(mLauncher, null)
                             .createPlaybackController();
                     mReachedOverview = true;
                     maybeSwipeInteractionToOverviewComplete();
-                })));
+                }))));
 
         mCurrentAnimation.getTarget().removeListener(mClearStateOnCancelListener);
         mCurrentAnimation.dispatchOnCancel();
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
index 0f64abca61..62687c5f35 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
@@ -21,6 +21,7 @@ import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.OVERVIEW_ACTIONS;
 import static com.android.launcher3.LauncherState.QUICK_SWITCH;
 import static com.android.launcher3.anim.AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD;
+import static com.android.launcher3.anim.AnimatorListeners.forEndCallback;
 import static com.android.launcher3.anim.Interpolators.ACCEL_0_75;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
@@ -418,7 +419,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
                         targetState.ordinal > mStartState.ordinal
                                 ? LAUNCHER_UNKNOWN_SWIPEUP
                                 : LAUNCHER_UNKNOWN_SWIPEDOWN));
-        mLauncher.getStateManager().goToState(targetState, false, this::clearState);
+        mLauncher.getStateManager().goToState(targetState, false, forEndCallback(this::clearState));
     }
 
     private void cancelAnimations() {
diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
index 1ca4fd7fd1..5217c3b169 100644
--- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
@@ -19,6 +19,7 @@ import static com.android.launcher3.LauncherState.BACKGROUND_APP;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.QUICK_SWITCH;
+import static com.android.launcher3.anim.AnimatorListeners.forEndCallback;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING;
@@ -197,7 +198,8 @@ public final class LauncherActivityInterface extends
 
         closeOverlay();
         launcher.getStateManager().goToState(OVERVIEW,
-                launcher.getStateManager().shouldAnimateStateChange(), onCompleteCallback);
+                launcher.getStateManager().shouldAnimateStateChange(),
+                onCompleteCallback == null ? null : forEndCallback(onCompleteCallback));
         return true;
     }
 
diff --git a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
index 1aa64fae1c..66e04008f6 100644
--- a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
@@ -43,7 +43,7 @@ import androidx.annotation.Nullable;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.anim.AnimationSuccessListener;
+import com.android.launcher3.anim.AnimatorListeners;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.quickstep.AnimatedFloat;
@@ -156,7 +156,7 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
                         fadeAnim.setViewAlpha(mFakePreviousTaskView, 0, ACCEL);
                     }
                     if (onEndRunnable != null) {
-                        fadeAnim.addListener(AnimationSuccessListener.forRunnable(onEndRunnable));
+                        fadeAnim.addListener(AnimatorListeners.forSuccessCallback(onEndRunnable));
                     }
                     AnimatorSet animset = fadeAnim.buildAnim();
                     animset.setStartDelay(100);
@@ -174,7 +174,7 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
                 anim.setViewAlpha(mFakePreviousTaskView, 0, ACCEL);
             }
             if (onEndRunnable != null) {
-                anim.addListener(AnimationSuccessListener.forRunnable(onEndRunnable));
+                anim.addListener(AnimatorListeners.forSuccessCallback(onEndRunnable));
             }
         }
         AnimatorSet animset = anim.buildAnim();
@@ -205,10 +205,10 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
         PendingAnimation fadeAnim = new PendingAnimation(300);
         fadeAnim.setViewAlpha(mFakeIconView, 0, ACCEL);
         if (onEndRunnable != null) {
-            fadeAnim.addListener(AnimationSuccessListener.forRunnable(onEndRunnable));
+            fadeAnim.addListener(AnimatorListeners.forSuccessCallback(onEndRunnable));
         }
         AnimatorSet animset = fadeAnim.buildAnim();
-        rectAnim.addAnimatorListener(AnimationSuccessListener.forRunnable(animset::start));
+        rectAnim.addAnimatorListener(AnimatorListeners.forSuccessCallback(animset::start));
         mRunningWindowAnim = RunningWindowAnim.wrap(rectAnim);
     }
 
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
index e86062c643..f9d5c94375 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
@@ -38,7 +38,7 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.content.res.AppCompatResources;
 
 import com.android.launcher3.R;
-import com.android.launcher3.anim.AnimationSuccessListener;
+import com.android.launcher3.anim.AnimatorListeners;
 import com.android.launcher3.views.ClipIconView;
 import com.android.quickstep.interaction.EdgeBackGestureHandler.BackGestureAttemptCallback;
 import com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureAttemptCallback;
@@ -141,7 +141,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
     }
 
     void fadeTaskViewAndRun(Runnable r) {
-        mFakeTaskView.animate().alpha(0).setListener(AnimationSuccessListener.forRunnable(r));
+        mFakeTaskView.animate().alpha(0).setListener(AnimatorListeners.forSuccessCallback(r));
     }
 
     @StringRes
@@ -359,8 +359,8 @@ abstract class TutorialController implements BackGestureAttemptCallback,
                     mContext, getMockLauncherResId()));
             mFakeTaskView.setBackground(AppCompatResources.getDrawable(
                     mContext, getMockAppTaskThumbnailResId()));
-            mFakeTaskView.animate().alpha(1).setListener(AnimationSuccessListener.forRunnable(
-                    () -> mFakeTaskView.animate().cancel()));
+            mFakeTaskView.animate().alpha(1).setListener(
+                    AnimatorListeners.forSuccessCallback(() -> mFakeTaskView.animate().cancel()));
             mFakePreviousTaskView.setBackground(AppCompatResources.getDrawable(
                     mContext, getMockPreviousAppTaskThumbnailResId()));
             mFakeIconView.setBackground(AppCompatResources.getDrawable(
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index aea03e0c46..21100c4499 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -111,6 +111,7 @@ import com.android.launcher3.PagedView;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimationSuccessListener;
+import com.android.launcher3.anim.AnimatorListeners;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.anim.SpringProperty;
@@ -120,7 +121,6 @@ import com.android.launcher3.icons.cache.HandlerRunnable;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.BaseState;
 import com.android.launcher3.statemanager.StatefulActivity;
-import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.OverScroll;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.util.DynamicResource;
@@ -1677,7 +1677,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             return;
         }
         AnimatorSet pa = setRecentsChangedOrientation(true);
-        pa.addListener(AnimationSuccessListener.forRunnable(() -> {
+        pa.addListener(AnimatorListeners.forSuccessCallback(() -> {
             setLayoutRotation(newRotation, mOrientationState.getDisplayRotation());
             mActivity.getDragLayer().recreateControllers();
             updateChildTaskOrientations();
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 47c67b9796..5ba7623ece 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -25,6 +25,7 @@ import static com.android.launcher3.LauncherState.FLAG_WORKSPACE_INACCESSIBLE;
 import static com.android.launcher3.LauncherState.HINT_STATE;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.SPRING_LOADED;
+import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback;
 import static com.android.launcher3.config.FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM;
 import static com.android.launcher3.dragndrop.DragLayer.ALPHA_INDEX_OVERLAY;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
@@ -1946,8 +1947,8 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
             }
             parent.onDropChild(cell);
 
-            mLauncher.getStateManager().goToState(
-                    NORMAL, SPRING_LOADED_EXIT_DELAY, onCompleteRunnable);
+            mLauncher.getStateManager().goToState(NORMAL, SPRING_LOADED_EXIT_DELAY,
+                    onCompleteRunnable == null ? null : forSuccessCallback(onCompleteRunnable));
             mStatsLogManager.logger().withItemInfo(d.dragInfo).withInstanceId(d.logInstanceId)
                     .log(LauncherEvent.LAUNCHER_ITEM_DROP_COMPLETED);
         }
diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
index c580d47994..2b36f19226 100644
--- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
+++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
@@ -3,6 +3,7 @@ package com.android.launcher3.accessibility;
 import static android.view.accessibility.AccessibilityNodeInfo.ACTION_LONG_CLICK;
 
 import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.IGNORE;
 
 import android.appwidget.AppWidgetProviderInfo;
@@ -220,30 +221,26 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
         } else if (action == ADD_TO_WORKSPACE) {
             final int[] coordinates = new int[2];
             final int screenId = findSpaceOnWorkspace(item, coordinates);
-            mLauncher.getStateManager().goToState(NORMAL, true, new Runnable() {
-
-                @Override
-                public void run() {
-                    if (item instanceof AppInfo) {
-                        WorkspaceItemInfo info = ((AppInfo) item).makeWorkspaceItem();
-                        mLauncher.getModelWriter().addItemToDatabase(info,
-                                Favorites.CONTAINER_DESKTOP,
-                                screenId, coordinates[0], coordinates[1]);
-
-                        mLauncher.bindItems(
-                                Collections.singletonList(info),
-                                /* forceAnimateIcons= */ true,
-                                /* focusFirstItemForAccessibility= */ true);
-                        announceConfirmation(R.string.item_added_to_workspace);
-                    } else if (item instanceof PendingAddItemInfo) {
-                        PendingAddItemInfo info = (PendingAddItemInfo) item;
-                        Workspace workspace = mLauncher.getWorkspace();
-                        workspace.snapToPage(workspace.getPageIndexForScreenId(screenId));
-                        mLauncher.addPendingItem(info, Favorites.CONTAINER_DESKTOP,
-                                screenId, coordinates, info.spanX, info.spanY);
-                    }
+            mLauncher.getStateManager().goToState(NORMAL, true, forSuccessCallback(() -> {
+                if (item instanceof AppInfo) {
+                    WorkspaceItemInfo info = ((AppInfo) item).makeWorkspaceItem();
+                    mLauncher.getModelWriter().addItemToDatabase(info,
+                            Favorites.CONTAINER_DESKTOP,
+                            screenId, coordinates[0], coordinates[1]);
+
+                    mLauncher.bindItems(
+                            Collections.singletonList(info),
+                            /* forceAnimateIcons= */ true,
+                            /* focusFirstItemForAccessibility= */ true);
+                    announceConfirmation(R.string.item_added_to_workspace);
+                } else if (item instanceof PendingAddItemInfo) {
+                    PendingAddItemInfo info = (PendingAddItemInfo) item;
+                    Workspace workspace = mLauncher.getWorkspace();
+                    workspace.snapToPage(workspace.getPageIndexForScreenId(screenId));
+                    mLauncher.addPendingItem(info, Favorites.CONTAINER_DESKTOP,
+                            screenId, coordinates, info.spanX, info.spanY);
                 }
-            });
+            }));
             return true;
         } else if (action == MOVE_TO_WORKSPACE) {
             Folder folder = Folder.getOpen(mLauncher);
diff --git a/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java
index 1733e5dd41..f96afa856b 100644
--- a/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java
+++ b/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java
@@ -17,6 +17,7 @@
 package com.android.launcher3.accessibility;
 
 import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback;
 
 import android.view.KeyEvent;
 import android.view.View;
@@ -67,19 +68,14 @@ public class ShortcutMenuAccessibilityDelegate extends LauncherAccessibilityDele
             final WorkspaceItemInfo info = ((DeepShortcutView) host.getParent()).getFinalInfo();
             final int[] coordinates = new int[2];
             final int screenId = findSpaceOnWorkspace(item, coordinates);
-            Runnable onComplete = new Runnable() {
-                @Override
-                public void run() {
-                    mLauncher.getModelWriter().addItemToDatabase(info,
-                            LauncherSettings.Favorites.CONTAINER_DESKTOP,
-                            screenId, coordinates[0], coordinates[1]);
-                    mLauncher.bindItems(Collections.singletonList(info), true);
-                    AbstractFloatingView.closeAllOpenViews(mLauncher);
-                    announceConfirmation(R.string.item_added_to_workspace);
-                }
-            };
-
-            mLauncher.getStateManager().goToState(NORMAL, true, onComplete);
+            mLauncher.getStateManager().goToState(NORMAL, true, forSuccessCallback(() -> {
+                mLauncher.getModelWriter().addItemToDatabase(info,
+                        LauncherSettings.Favorites.CONTAINER_DESKTOP,
+                        screenId, coordinates[0], coordinates[1]);
+                mLauncher.bindItems(Collections.singletonList(info), true);
+                AbstractFloatingView.closeAllOpenViews(mLauncher);
+                announceConfirmation(R.string.item_added_to_workspace);
+            }));
             return true;
         } else if (action == DISMISS_NOTIFICATION) {
             if (!(host instanceof NotificationMainView)) {
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 75f3149736..3a616093db 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -25,7 +25,7 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_VERTICAL_PR
 import static com.android.launcher3.util.SystemUiController.UI_STATE_ALLAPPS;
 
 import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
+import android.animation.Animator.AnimatorListener;
 import android.animation.ObjectAnimator;
 import android.util.FloatProperty;
 import android.view.View;
@@ -36,7 +36,7 @@ import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.anim.AnimationSuccessListener;
+import com.android.launcher3.anim.AnimatorListeners;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.anim.PropertySetter;
 import com.android.launcher3.config.FeatureFlags;
@@ -185,8 +185,8 @@ public class AllAppsTransitionController
         mScrimView.setDrawingController(shouldProtectHeader ? mAppsView : null);
     }
 
-    public AnimatorListenerAdapter getProgressAnimatorListener() {
-        return AnimationSuccessListener.forRunnable(this::onProgressAnimationEnd);
+    public AnimatorListener getProgressAnimatorListener() {
+        return AnimatorListeners.forSuccessCallback(this::onProgressAnimationEnd);
     }
 
     /**
diff --git a/src/com/android/launcher3/anim/AnimationSuccessListener.java b/src/com/android/launcher3/anim/AnimationSuccessListener.java
index 9905e81638..a312070e58 100644
--- a/src/com/android/launcher3/anim/AnimationSuccessListener.java
+++ b/src/com/android/launcher3/anim/AnimationSuccessListener.java
@@ -40,24 +40,4 @@ public abstract class AnimationSuccessListener extends AnimatorListenerAdapter {
 
     public abstract void onAnimationSuccess(Animator animator);
 
-    /**
-     * Returns an AnimationSuccessListener which runs the provided action on success
-     */
-    public static AnimationSuccessListener forRunnable(Runnable r) {
-        return new RunnableSuccessListener(r);
-    }
-
-    private static class RunnableSuccessListener extends AnimationSuccessListener {
-
-        private final Runnable mRunnable;
-
-        private RunnableSuccessListener(Runnable r) {
-            mRunnable = r;
-        }
-
-        @Override
-        public void onAnimationSuccess(Animator animator) {
-            mRunnable.run();
-        }
-    }
 }
diff --git a/src/com/android/launcher3/anim/AnimatorListeners.java b/src/com/android/launcher3/anim/AnimatorListeners.java
new file mode 100644
index 0000000000..57c2f8df93
--- /dev/null
+++ b/src/com/android/launcher3/anim/AnimatorListeners.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.anim;
+
+import static com.android.launcher3.LauncherAnimUtils.SUCCESS_TRANSITION_PROGRESS;
+
+import android.animation.Animator;
+import android.animation.Animator.AnimatorListener;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.ValueAnimator;
+
+import java.util.function.Consumer;
+
+/**
+ * Utility class for creating common {@link AnimatorListener}
+ */
+public class AnimatorListeners {
+
+    /**
+     * Returns an AnimatorListener which executes the callback on successful animation completion
+     */
+    public static AnimatorListener forSuccessCallback(Runnable callback) {
+        return new RunnableSuccessListener(callback);
+    }
+
+    /**
+     * Returns an AnimatorListener which executes the callback on animation completion,
+     * with the boolean representing success
+     */
+    public static AnimatorListener forEndCallback(Consumer<Boolean> callback) {
+        return new EndStateCallbackWrapper(callback);
+    }
+
+    /**
+     * Returns an AnimatorListener which executes the callback on animation completion
+     */
+    public static AnimatorListener forEndCallback(Runnable callback) {
+        return new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation, boolean isReverse) {
+                callback.run();
+            }
+        };
+    }
+
+    private static class EndStateCallbackWrapper extends AnimatorListenerAdapter {
+
+        private final Consumer<Boolean> mListener;
+        private boolean mListenerCalled = false;
+
+        EndStateCallbackWrapper(Consumer<Boolean> listener) {
+            mListener = listener;
+        }
+
+        @Override
+        public void onAnimationCancel(Animator animation) {
+            if (!mListenerCalled) {
+                mListenerCalled = true;
+                mListener.accept(false);
+            }
+        }
+
+        @Override
+        public void onAnimationEnd(Animator anim) {
+            if (!mListenerCalled) {
+                mListenerCalled = true;
+                mListener.accept(anim instanceof ValueAnimator
+                        ? ((ValueAnimator) anim).getAnimatedFraction() > SUCCESS_TRANSITION_PROGRESS
+                        : true);
+            }
+        }
+    }
+
+    private static class RunnableSuccessListener extends AnimationSuccessListener {
+
+        private final Runnable mRunnable;
+
+        private RunnableSuccessListener(Runnable r) {
+            mRunnable = r;
+        }
+
+        @Override
+        public void onAnimationSuccess(Animator animator) {
+            mRunnable.run();
+        }
+    }
+}
diff --git a/src/com/android/launcher3/anim/PendingAnimation.java b/src/com/android/launcher3/anim/PendingAnimation.java
index 8057475fb4..01f7de66ce 100644
--- a/src/com/android/launcher3/anim/PendingAnimation.java
+++ b/src/com/android/launcher3/anim/PendingAnimation.java
@@ -15,13 +15,11 @@
  */
 package com.android.launcher3.anim;
 
-import static com.android.launcher3.LauncherAnimUtils.SUCCESS_TRANSITION_PROGRESS;
 import static com.android.launcher3.LauncherAnimUtils.VIEW_BACKGROUND_COLOR;
 import static com.android.launcher3.anim.AnimatorPlaybackController.addAnimationHoldersRecur;
 
 import android.animation.Animator;
 import android.animation.Animator.AnimatorListener;
-import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.TimeInterpolator;
@@ -182,32 +180,6 @@ public class PendingAnimation implements PropertySetter {
         if (mProgressAnimator == null) {
             mProgressAnimator = ValueAnimator.ofFloat(0, 1);
         }
-        mProgressAnimator.addListener(new EndStateCallbackWrapper(listener));
-    }
-
-    private static class EndStateCallbackWrapper extends AnimatorListenerAdapter {
-
-        private final Consumer<Boolean> mListener;
-        private boolean mCalled = false;
-
-        EndStateCallbackWrapper(Consumer<Boolean> listener) {
-            mListener = listener;
-        }
-
-        @Override
-        public void onAnimationCancel(Animator animation) {
-            if (!mCalled) {
-                mCalled = true;
-                mListener.accept(false);
-            }
-        }
-
-        @Override
-        public void onAnimationEnd(Animator animation) {
-            if (!mCalled) {
-                ValueAnimator anim = (ValueAnimator) animation;
-                mListener.accept(anim.getAnimatedFraction() > SUCCESS_TRANSITION_PROGRESS);
-            }
-        }
+        mProgressAnimator.addListener(AnimatorListeners.forEndCallback(listener));
     }
 }
diff --git a/src/com/android/launcher3/statemanager/StateManager.java b/src/com/android/launcher3/statemanager/StateManager.java
index 14ef2dc652..03b68535bc 100644
--- a/src/com/android/launcher3/statemanager/StateManager.java
+++ b/src/com/android/launcher3/statemanager/StateManager.java
@@ -129,14 +129,14 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
     }
 
     /**
-     * @see #goToState(STATE_TYPE, boolean, Runnable)
+     * @see #goToState(STATE_TYPE, boolean, AnimatorListener)
      */
     public void goToState(STATE_TYPE state) {
         goToState(state, shouldAnimateStateChange());
     }
 
     /**
-     * @see #goToState(STATE_TYPE, boolean, Runnable)
+     * @see #goToState(STATE_TYPE, boolean, AnimatorListener)
      */
     public void goToState(STATE_TYPE state, boolean animated) {
         goToState(state, animated, 0, null);
@@ -149,15 +149,15 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
      *                true otherwise
      * @paras onCompleteRunnable any action to perform at the end of the transition, of null.
      */
-    public void goToState(STATE_TYPE state, boolean animated, Runnable onCompleteRunnable) {
-        goToState(state, animated, 0, onCompleteRunnable);
+    public void goToState(STATE_TYPE state, boolean animated, AnimatorListener listener) {
+        goToState(state, animated, 0, listener);
     }
 
     /**
      * Changes the Launcher state to the provided state after the given delay.
      */
-    public void goToState(STATE_TYPE state, long delay, Runnable onCompleteRunnable) {
-        goToState(state, true, delay, onCompleteRunnable);
+    public void goToState(STATE_TYPE state, long delay, AnimatorListener listener) {
+        goToState(state, true, delay, listener);
     }
 
     /**
@@ -187,21 +187,20 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
         }
     }
 
-    private void goToState(STATE_TYPE state, boolean animated, long delay,
-            final Runnable onCompleteRunnable) {
+    private void goToState(
+            STATE_TYPE state, boolean animated, long delay, AnimatorListener listener) {
         animated &= areAnimatorsEnabled();
         if (mActivity.isInState(state)) {
             if (mConfig.currentAnimation == null) {
                 // Run any queued runnable
-                if (onCompleteRunnable != null) {
-                    onCompleteRunnable.run();
+                if (listener != null) {
+                    listener.onAnimationEnd(null);
                 }
                 return;
             } else if (!mConfig.userControlled && animated && mConfig.targetState == state) {
                 // We are running the same animation as requested
-                if (onCompleteRunnable != null) {
-                    mConfig.currentAnimation.addListener(
-                            AnimationSuccessListener.forRunnable(onCompleteRunnable));
+                if (listener != null) {
+                    mConfig.currentAnimation.addListener(listener);
                 }
                 return;
             }
@@ -221,8 +220,8 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
             onStateTransitionEnd(state);
 
             // Run any queued runnable
-            if (onCompleteRunnable != null) {
-                onCompleteRunnable.run();
+            if (listener != null) {
+                listener.onAnimationEnd(null);
             }
             return;
         }
@@ -233,16 +232,16 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
             int startChangeId = mConfig.changeId;
             mUiHandler.postDelayed(() -> {
                 if (mConfig.changeId == startChangeId) {
-                    goToStateAnimated(state, fromState, onCompleteRunnable);
+                    goToStateAnimated(state, fromState, listener);
                 }
             }, delay);
         } else {
-            goToStateAnimated(state, fromState, onCompleteRunnable);
+            goToStateAnimated(state, fromState, listener);
         }
     }
 
     private void goToStateAnimated(STATE_TYPE state, STATE_TYPE fromState,
-            Runnable onCompleteRunnable) {
+            AnimatorListener listener) {
         // Since state mBaseState can be reached from multiple states, just assume that the
         // transition plays in reverse and use the same duration as previous state.
         mConfig.duration = state == mBaseState
@@ -250,8 +249,8 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
                 : state.getTransitionDuration(mActivity);
         prepareForAtomicAnimation(fromState, state, mConfig);
         AnimatorSet animation = createAnimationToNewWorkspaceInternal(state).buildAnim();
-        if (onCompleteRunnable != null) {
-            animation.addListener(AnimationSuccessListener.forRunnable(onCompleteRunnable));
+        if (listener != null) {
+            animation.addListener(listener);
         }
         mUiHandler.post(new StartAnimRunnable(animation));
     }
-- 
GitLab


From c169e5b9af9a69a059ca162ffbb94c28f75a17ba Mon Sep 17 00:00:00 2001
From: Cyrus Boadway <boadway@google.com>
Date: Thu, 13 May 2021 14:57:24 +0000
Subject: [PATCH 1170/1664] Register a remote animation for the next activity
 start

Widgets are permitted to start broadcast receivers which launch
activities, otherwise known as a broadcast trampoline. Unfortunately,
launch animations provided through ActivityOptions are not applied to
the activity launch.

If a widget interaction's pending intent is not an activity, set a
return animation for the next activity start, in the event it starts an
activity.

Bug: 169042867
Test: presubmit
Change-Id: Ibbee9cadcd5153e285433fcb1b8038d77b1384a2
---
 .../uioverrides/QuickstepInteractionHandler.java  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
index a54f963100..0014b85125 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
@@ -16,8 +16,11 @@
 package com.android.launcher3.uioverrides;
 
 import android.app.ActivityOptions;
+import android.app.ActivityTaskManager;
 import android.app.PendingIntent;
 import android.content.Intent;
+import android.os.Build;
+import android.os.RemoteException;
 import android.util.Log;
 import android.util.Pair;
 import android.view.View;
@@ -50,6 +53,18 @@ class QuickstepInteractionHandler implements RemoteViews.InteractionHandler {
         Pair<Intent, ActivityOptions> options = remoteResponse.getLaunchOptions(hostView);
         ActivityOptionsWrapper activityOptions = mLauncher.getAppTransitionManager()
                 .getActivityLaunchOptions(mLauncher, hostView);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && !pendingIntent.isActivity()) {
+            // In the event this pending intent eventually launches an activity, i.e. a trampoline,
+            // use the Quickstep transition animation.
+            try {
+                ActivityTaskManager.getService()
+                        .registerRemoteAnimationForNextActivityStart(
+                                pendingIntent.getCreatorPackage(),
+                                activityOptions.options.getRemoteAnimationAdapter());
+            } catch (RemoteException e) {
+                // Do nothing.
+            }
+        }
         activityOptions.options.setPendingIntentLaunchFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         Object itemInfo = hostView.getTag();
         if (itemInfo instanceof ItemInfo) {
-- 
GitLab


From 6a5920c6823207516c3d538eac1e479d58190313 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Tue, 4 May 2021 14:24:10 +0100
Subject: [PATCH 1171/1664] Enable free scroll immediately if gesture goes to
 overview

Fixes: 186871947
Test: Swipe up from app, scroll immediately, free scroll should be enabled
Change-Id: I20b782df04fb6e61dfd5c7e82e1ab90dbd6ed8fc
---
 quickstep/src/com/android/quickstep/views/RecentsView.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index aea03e0c46..396dafb37f 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1730,6 +1730,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             // When switching to tasks in quick switch, ensures the snapped page's scroll maintain
             // invariant between quick switch and overview, to ensure a smooth animation transition.
             updateGridProperties();
+        } else if (endTarget == GestureState.GestureEndTarget.RECENTS) {
+            setEnableFreeScroll(true);
         }
     }
 
-- 
GitLab


From a6ca69aa5336f04174ada0be2d4d6d5d07bf6427 Mon Sep 17 00:00:00 2001
From: zakcohen <zakcohen@google.com>
Date: Wed, 12 May 2021 13:55:34 -0700
Subject: [PATCH 1172/1664] Overview - don't update task overlay on thumbnail
 update.

Only init and reset the task overlay on the enabled state of the overlay
changing.
Previously the overlay was also updated when the thumbnail changed, but
this can happen for lots of different reasons so was causing janky
transitions and potentially excess work in code that was following the
overlay.

The overlay code really only cares about the thumbnail after the task has
settled, so should be safe to ignore the thumbnail updates.



Bug: 188097940
Test: local build and run on p5
Change-Id: I4ad1767046cb0316af19713bc188788d8f581d7c
---
 .../quickstep/views/TaskThumbnailView.java    | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
index 5b8d4ce471..02888a1f14 100644
--- a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
@@ -335,16 +335,13 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
     public void setOverlayEnabled(boolean overlayEnabled) {
         if (mOverlayEnabled != overlayEnabled) {
             mOverlayEnabled = overlayEnabled;
-            updateOverlay();
-        }
-    }
 
-    private void updateOverlay() {
-        if (mOverlayEnabled) {
-            getTaskOverlay().initOverlay(mTask, mThumbnailData, mPreviewPositionHelper.mMatrix,
-                    mPreviewPositionHelper.mIsOrientationChanged);
-        } else {
-            getTaskOverlay().reset();
+            if (mOverlayEnabled) {
+                getTaskOverlay().initOverlay(mTask, mThumbnailData, mPreviewPositionHelper.mMatrix,
+                        mPreviewPositionHelper.mIsOrientationChanged);
+            } else {
+                getTaskOverlay().reset();
+            }
         }
     }
 
@@ -379,10 +376,6 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
         }
         getTaskView().updateCurrentFullscreenParams(mPreviewPositionHelper);
         invalidate();
-
-        // Update can be called from {@link #onSizeChanged} during layout, post handling of overlay
-        // as overlay could modify the views in the overlay as a side effect of its update.
-        post(this::updateOverlay);
     }
 
     @Override
-- 
GitLab


From c9bf0f616148d185029ddd0ec6793af6b325e915 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Thu, 13 May 2021 21:27:11 -0700
Subject: [PATCH 1173/1664] Pass home rotation state to SysUI

Fixes: 185962767
Test: manual

Change-Id: I3d2103b665f099a087545a97fdb84bc240b8d261
---
 .../src/com/android/quickstep/SystemUiProxy.java      | 11 +++++++++++
 .../android/quickstep/util/RecentsOrientedState.java  |  6 ++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index 39d8888c72..02dcf03a44 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -105,6 +105,17 @@ public class SystemUiProxy implements ISystemUiProxy,
         }
     }
 
+    @Override
+    public void setHomeRotationEnabled(boolean enabled) {
+        if (mSystemUiProxy != null) {
+            try {
+                mSystemUiProxy.setHomeRotationEnabled(enabled);
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call onBackPressed", e);
+            }
+        }
+    }
+
     @Override
     public IBinder asBinder() {
         // Do nothing
diff --git a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
index e983f461ee..bfd900835b 100644
--- a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
+++ b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
@@ -51,6 +51,7 @@ import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.SettingsCache;
 import com.android.launcher3.util.WindowBounds;
 import com.android.quickstep.BaseActivityInterface;
+import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.views.TaskView;
 
 import java.lang.annotation.Retention;
@@ -287,8 +288,9 @@ public final class RecentsOrientedState implements
     }
 
     private void updateHomeRotationSetting() {
-        setFlag(FLAG_HOME_ROTATION_ALLOWED_IN_PREFS,
-                mSharedPrefs.getBoolean(ALLOW_ROTATION_PREFERENCE_KEY, false));
+        boolean homeRotationEnabled = mSharedPrefs.getBoolean(ALLOW_ROTATION_PREFERENCE_KEY, false);
+        setFlag(FLAG_HOME_ROTATION_ALLOWED_IN_PREFS, homeRotationEnabled);
+        SystemUiProxy.INSTANCE.get(mContext).setHomeRotationEnabled(homeRotationEnabled);
     }
 
     private void initFlags() {
-- 
GitLab


From 5fc74c7f8fa2af2db4baab8b772d44af7cd7f6fd Mon Sep 17 00:00:00 2001
From: Stevie Kideckel <kideckel@google.com>
Date: Fri, 14 May 2021 12:37:44 +0000
Subject: [PATCH 1174/1664] Add start to widget app name layout gravity

This fixes the alignment issue in RTL. Seems like the default is start
if layout_gravity isn't set, but if you set layout_gravity to
center_vertical, you need to explicitly set start or it will go to the
left.

Bug: 188147009
Test: validated locally and in AS layout preview
Change-Id: Ic4b4d7e6dfe03e1e6dd3ead5c3821e77261b4bb5
---
 res/layout/widgets_list_row_header.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/layout/widgets_list_row_header.xml b/res/layout/widgets_list_row_header.xml
index f20af87906..a0a04564b0 100644
--- a/res/layout/widgets_list_row_header.xml
+++ b/res/layout/widgets_list_row_header.xml
@@ -48,7 +48,7 @@
             android:id="@+id/app_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
+            android:layout_gravity="start|center_vertical"
             android:textColor="?android:attr/textColorPrimary"
             android:textSize="16sp"
             tools:text="App name" />
-- 
GitLab


From 3503e6fa25299324c4edd273dd70f1763b468e24 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Fri, 14 May 2021 16:56:37 +0100
Subject: [PATCH 1175/1664] Add a scrim underneath the top section of search &
 recommendation UI

Test: In the full widgets picker, scroll up. Recommended widgets are
      not visible behind the search bar when they overlap.
Bug: 188021019
Change-Id: I13144ad534c74393bb1b12c651e734bb8bee0bc2
---
 res/drawable/bg_widgets_picker_handle.xml     | 29 +++++++++++++++
 ..._full_sheet_search_and_recommendations.xml | 35 ++++++++++++-------
 res/layout/widgets_search_bar.xml             |  7 ++--
 ...rchAndRecommendationsScrollController.java |  8 ++---
 .../widget/picker/WidgetsFullSheet.java       |  2 ++
 5 files changed, 60 insertions(+), 21 deletions(-)
 create mode 100644 res/drawable/bg_widgets_picker_handle.xml

diff --git a/res/drawable/bg_widgets_picker_handle.xml b/res/drawable/bg_widgets_picker_handle.xml
new file mode 100644
index 0000000000..68681a684d
--- /dev/null
+++ b/res/drawable/bg_widgets_picker_handle.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="?android:attr/colorBackground" />
+            <padding android:top="16dp"/>
+        </shape>
+    </item>
+    <item android:gravity="center">
+        <shape android:shape="rectangle">
+            <solid android:color="?android:attr/textColorSecondary" />
+            <size android:width="48dp" android:height="2dp" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/res/layout/widgets_full_sheet_search_and_recommendations.xml b/res/layout/widgets_full_sheet_search_and_recommendations.xml
index ce7a682376..a89f85f695 100644
--- a/res/layout/widgets_full_sheet_search_and_recommendations.xml
+++ b/res/layout/widgets_full_sheet_search_and_recommendations.xml
@@ -18,35 +18,44 @@
     android:id="@+id/search_and_recommendations_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingHorizontal="16dp"
     android:layout_marginBottom="16dp"
-    android:orientation="vertical"
-    android:clipToPadding="false">
+    android:orientation="vertical">
+
     <View
         android:id="@+id/collapse_handle"
-        android:layout_width="48dp"
-        android:layout_height="2dp"
-        android:layout_marginTop="16dp"
-        android:elevation="2dp"
-        android:layout_gravity="center_horizontal"
-        android:background="?android:attr/textColorSecondary"/>
+        android:layout_width="match_parent"
+        android:layout_height="18dp"
+        android:elevation="0.1dp"
+        android:background="@drawable/bg_widgets_picker_handle"/>
+
     <TextView
         android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:textSize="24sp"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="24dp"
         android:textColor="?android:attr/textColorSecondary"
         android:text="@string/widget_button_text"/>
-    <include layout="@layout/widgets_search_bar"/>
+
+    <FrameLayout
+        android:id="@+id/search_bar_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:elevation="0.1dp"
+        android:background="?android:attr/colorBackground"
+        android:paddingBottom="8dp"
+        android:clipToPadding="false">
+        <include layout="@layout/widgets_search_bar" />
+    </FrameLayout>
 
     <com.android.launcher3.widget.picker.WidgetsRecommendationTableLayout
         android:id="@+id/recommended_widget_table"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:layout_marginTop="8dp"
         android:background="@drawable/widgets_recommendation_background"
         android:paddingVertical="@dimen/recommended_widgets_table_vertical_padding"
-        android:layout_marginTop="16dp"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 </com.android.launcher3.widget.picker.SearchAndRecommendationsView>
diff --git a/res/layout/widgets_search_bar.xml b/res/layout/widgets_search_bar.xml
index 24671565ee..6a4bb4d2d0 100644
--- a/res/layout/widgets_search_bar.xml
+++ b/res/layout/widgets_search_bar.xml
@@ -5,10 +5,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:layout_marginTop="16dp"
-    android:layout_marginBottom="1dp"
-    android:background="@drawable/bg_widgets_searchbox"
-    android:elevation="2dp">
+    android:layout_marginTop="24dp"
+    android:layout_marginHorizontal="16dp"
+    android:background="@drawable/bg_widgets_searchbox">
 
     <com.android.launcher3.ExtendedEditText
         android:id="@+id/widgets_search_bar_edit_text"
diff --git a/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java b/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java
index 317fd03afe..34346ab672 100644
--- a/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java
+++ b/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java
@@ -101,7 +101,7 @@ final class SearchAndRecommendationsScrollController implements
         mCurrentRecyclerView.setOnContentChangeListener(mOnContentChangeListener);
         mViewHolder.mHeaderTitle.setTranslationY(0);
         mViewHolder.mRecommendedWidgetsTable.setTranslationY(0);
-        mViewHolder.mSearchBar.setTranslationY(0);
+        mViewHolder.mSearchBarContainer.setTranslationY(0);
 
         if (mHasWorkProfile) {
             mPrimaryWorkTabsView.setTranslationY(0);
@@ -120,7 +120,7 @@ final class SearchAndRecommendationsScrollController implements
         mCollapsibleHeightForRecommendation =
                 measureHeightWithVerticalMargins(mViewHolder.mHeaderTitle)
                         + measureHeightWithVerticalMargins(mViewHolder.mCollapseHandle)
-                        + measureHeightWithVerticalMargins((View) mViewHolder.mSearchBar)
+                        + measureHeightWithVerticalMargins((View) mViewHolder.mSearchBarContainer)
                         + measureHeightWithVerticalMargins(mViewHolder.mRecommendedWidgetsTable);
 
         int topContainerHeight = measureHeightWithVerticalMargins(mViewHolder.mContainer);
@@ -243,7 +243,7 @@ final class SearchAndRecommendationsScrollController implements
 
         if (mCollapsibleHeightForSearch > 0) {
             int searchYDisplacement = Math.max(-recyclerViewYOffset, -mCollapsibleHeightForSearch);
-            mViewHolder.mSearchBar.setTranslationY(searchYDisplacement);
+            mViewHolder.mSearchBarContainer.setTranslationY(searchYDisplacement);
         }
 
         if (mHasWorkProfile && mCollapsibleHeightForTabs > 0) {
@@ -255,7 +255,7 @@ final class SearchAndRecommendationsScrollController implements
     /** Resets any previous view translation. */
     public void reset() {
         mViewHolder.mHeaderTitle.setTranslationY(0);
-        mViewHolder.mSearchBar.setTranslationY(0);
+        mViewHolder.mSearchBarContainer.setTranslationY(0);
         if (mHasWorkProfile) {
             mPrimaryWorkTabsView.setTranslationY(0);
         }
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 4d8c1ca2ab..08ef1a0077 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -711,6 +711,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
     final class SearchAndRecommendationViewHolder {
         final SearchAndRecommendationsView mContainer;
         final View mCollapseHandle;
+        final View mSearchBarContainer;
         final WidgetsSearchBar mSearchBar;
         final TextView mHeaderTitle;
         final WidgetsRecommendationTableLayout mRecommendedWidgetsTable;
@@ -719,6 +720,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
                 SearchAndRecommendationsView searchAndRecommendationContainer) {
             mContainer = searchAndRecommendationContainer;
             mCollapseHandle = mContainer.findViewById(R.id.collapse_handle);
+            mSearchBarContainer = mContainer.findViewById(R.id.search_bar_container);
             mSearchBar = mContainer.findViewById(R.id.widgets_search_bar);
             mHeaderTitle = mContainer.findViewById(R.id.title);
             mRecommendedWidgetsTable = mContainer.findViewById(R.id.recommended_widget_table);
-- 
GitLab


From 960ab121db79b19851422a493089c94ac862f04e Mon Sep 17 00:00:00 2001
From: Cyrus Boadway <boadway@google.com>
Date: Fri, 14 May 2021 10:13:26 +0000
Subject: [PATCH 1176/1664] Fix SDK guard

Use dev-friendly utility instead of Build version codes.

Bug: 169042867
Test: manual
Change-Id: I528bafdcad8644e6f96caf5ada4f44ed2b8dff06
---
 .../launcher3/uioverrides/QuickstepInteractionHandler.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
index 0014b85125..3a8de3cace 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
@@ -19,13 +19,13 @@ import android.app.ActivityOptions;
 import android.app.ActivityTaskManager;
 import android.app.PendingIntent;
 import android.content.Intent;
-import android.os.Build;
 import android.os.RemoteException;
 import android.util.Log;
 import android.util.Pair;
 import android.view.View;
 import android.widget.RemoteViews;
 
+import com.android.launcher3.Utilities;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.util.ActivityOptionsWrapper;
 import com.android.launcher3.widget.LauncherAppWidgetHostView;
@@ -41,6 +41,7 @@ class QuickstepInteractionHandler implements RemoteViews.InteractionHandler {
         mLauncher = launcher;
     }
 
+    @SuppressWarnings("NewApi")
     @Override
     public boolean onInteraction(View view, PendingIntent pendingIntent,
             RemoteViews.RemoteResponse remoteResponse) {
@@ -53,7 +54,7 @@ class QuickstepInteractionHandler implements RemoteViews.InteractionHandler {
         Pair<Intent, ActivityOptions> options = remoteResponse.getLaunchOptions(hostView);
         ActivityOptionsWrapper activityOptions = mLauncher.getAppTransitionManager()
                 .getActivityLaunchOptions(mLauncher, hostView);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && !pendingIntent.isActivity()) {
+        if (Utilities.ATLEAST_S && !pendingIntent.isActivity()) {
             // In the event this pending intent eventually launches an activity, i.e. a trampoline,
             // use the Quickstep transition animation.
             try {
-- 
GitLab


From d80cec62b4f2433f975f949bedd017b248753157 Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Thu, 13 May 2021 14:13:18 +0100
Subject: [PATCH 1177/1664] Modify pin widget dialog open-close animation.

Pin widget sheet should open from bottom up and close on drag down.
Behaviour with navigation bar is similar to that of widgets bottom sheet.

Add a drag layer and reuse AbstractSlideInView for open-close
animation.

Test: Tested manually- opening, closing through dragging/ cancel button/
back button. Adding widget to screen by dragging/ add to home screen
button.
Bug: 186124244

Change-Id: I4b77d5bdd4ed1689b651847dfed69d19cafa7456
---
 AndroidManifest-common.xml                    |   2 +-
 .../hybridhotseat/HotseatEduDialog.java       |  20 +--
 res/layout/add_item_confirmation_activity.xml | 126 ++++++++++--------
 res/values-night/styles.xml                   |  10 +-
 res/values/styles.xml                         |  10 +-
 .../launcher3/AbstractFloatingView.java       |   7 +-
 .../launcher3/dragndrop/AddItemActivity.java  |  47 +++++--
 .../launcher3/dragndrop/AddItemDragLayer.java |  42 ++++++
 .../launcher3/views/AbstractSlideInView.java  |  45 +++++--
 .../android/launcher3/views/WorkEduView.java  |  16 ++-
 .../widget/AddItemWidgetsBottomSheet.java     |  98 ++++++++++++++
 .../launcher3/widget/BaseWidgetSheet.java     |  12 +-
 .../launcher3/widget/WidgetsBottomSheet.java  |   8 +-
 .../widget/picker/WidgetsFullSheet.java       |  26 ++--
 14 files changed, 334 insertions(+), 135 deletions(-)
 create mode 100644 src/com/android/launcher3/dragndrop/AddItemDragLayer.java
 create mode 100644 src/com/android/launcher3/widget/AddItemWidgetsBottomSheet.java

diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index 87a08afc24..d725a16f80 100644
--- a/AndroidManifest-common.xml
+++ b/AndroidManifest-common.xml
@@ -107,7 +107,7 @@
                        android:value="true" />
 
         <activity android:name="com.android.launcher3.dragndrop.AddItemActivity"
-            android:theme="@style/AppItemActivityTheme"
+            android:theme="@style/AddItemActivityTheme"
             android:excludeFromRecents="true"
             android:autoRemoveFromRecents="true"
             android:exported="true">
diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java
index a2ed21143c..14b0c5dd62 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java
@@ -48,7 +48,7 @@ import java.util.List;
  * User education dialog for hybrid hotseat. Allows user to migrate hotseat items to a new page in
  * the workspace and shows predictions on the whole hotseat
  */
-public class HotseatEduDialog extends AbstractSlideInView implements Insettable {
+public class HotseatEduDialog extends AbstractSlideInView<Launcher> implements Insettable {
 
     private static final int DEFAULT_CLOSE_DURATION = 200;
     protected static final int FINAL_SCRIM_BG_COLOR = 0x88000000;
@@ -84,7 +84,7 @@ public class HotseatEduDialog extends AbstractSlideInView implements Insettable
         mHotseatWrapper = findViewById(R.id.hotseat_wrapper);
         mSampleHotseat = findViewById(R.id.sample_prediction);
 
-        DeviceProfile grid = mLauncher.getDeviceProfile();
+        DeviceProfile grid = mActivityContext.getDeviceProfile();
         Rect padding = grid.getHotseatLayoutPadding();
 
         mSampleHotseat.getLayoutParams().height = grid.cellHeightPx;
@@ -110,13 +110,13 @@ public class HotseatEduDialog extends AbstractSlideInView implements Insettable
 
         mHotseatEduController.moveHotseatItems();
         mHotseatEduController.finishOnboarding();
-        mLauncher.getStatsLogManager().logger().log(LAUNCHER_HOTSEAT_EDU_ACCEPT);
+        mActivityContext.getStatsLogManager().logger().log(LAUNCHER_HOTSEAT_EDU_ACCEPT);
     }
 
     private void onDismiss(View v) {
         mHotseatEduController.showDimissTip();
         mHotseatEduController.finishOnboarding();
-        mLauncher.getStatsLogManager().logger().log(LAUNCHER_HOTSEAT_EDU_DENY);
+        mActivityContext.getStatsLogManager().logger().log(LAUNCHER_HOTSEAT_EDU_DENY);
         handleClose(true);
     }
 
@@ -131,12 +131,12 @@ public class HotseatEduDialog extends AbstractSlideInView implements Insettable
         int rightInset = insets.right - mInsets.right;
         int bottomInset = insets.bottom - mInsets.bottom;
         mInsets.set(insets);
-        if (mLauncher.getOrientation() == Configuration.ORIENTATION_PORTRAIT) {
+        if (mActivityContext.getOrientation() == Configuration.ORIENTATION_PORTRAIT) {
             setPadding(leftInset, getPaddingTop(), rightInset, 0);
             mHotseatWrapper.setPadding(mHotseatWrapper.getPaddingLeft(), getPaddingTop(),
                     mHotseatWrapper.getPaddingRight(), bottomInset);
             mHotseatWrapper.getLayoutParams().height =
-                    mLauncher.getDeviceProfile().hotseatBarSizePx + insets.bottom;
+                    mActivityContext.getDeviceProfile().hotseatBarSizePx + insets.bottom;
 
         } else {
             setPadding(0, getPaddingTop(), 0, 0);
@@ -178,7 +178,7 @@ public class HotseatEduDialog extends AbstractSlideInView implements Insettable
     }
 
     private void populatePreview(List<WorkspaceItemInfo> predictions) {
-        for (int i = 0; i < mLauncher.getDeviceProfile().numShownHotseatIcons; i++) {
+        for (int i = 0; i < mActivityContext.getDeviceProfile().numShownHotseatIcons; i++) {
             WorkspaceItemInfo info = predictions.get(i);
             PredictedAppIcon icon = PredictedAppIcon.createIcon(mSampleHotseat, info);
             icon.setEnabled(false);
@@ -194,13 +194,13 @@ public class HotseatEduDialog extends AbstractSlideInView implements Insettable
      */
     public void show(List<WorkspaceItemInfo> predictions) {
         if (getParent() != null
-                || predictions.size() < mLauncher.getDeviceProfile().numShownHotseatIcons
+                || predictions.size() < mActivityContext.getDeviceProfile().numShownHotseatIcons
                 || mHotseatEduController == null) {
             return;
         }
-        AbstractFloatingView.closeAllOpenViews(mLauncher);
+        AbstractFloatingView.closeAllOpenViews(mActivityContext);
         attachToContainer();
-        mLauncher.getStatsLogManager().logger().log(LAUNCHER_HOTSEAT_EDU_SEEN);
+        mActivityContext.getStatsLogManager().logger().log(LAUNCHER_HOTSEAT_EDU_SEEN);
         animateOpen();
         populatePreview(predictions);
     }
diff --git a/res/layout/add_item_confirmation_activity.xml b/res/layout/add_item_confirmation_activity.xml
index 00d148f2dc..0a3fbbcd01 100644
--- a/res/layout/add_item_confirmation_activity.xml
+++ b/res/layout/add_item_confirmation_activity.xml
@@ -16,69 +16,85 @@
 ** limitations under the License.
 */
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/add_item_confirmation"
+<com.android.launcher3.dragndrop.AddItemDragLayer
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/add_item_drag_layer"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="24dp"
-    android:theme="?attr/widgetsTheme"
-    android:orientation="vertical">
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:importantForAccessibility="no">
 
-    <TextView
-        style="@style/TextHeadline"
-        android:id="@+id/widget_appName"
+    <com.android.launcher3.widget.AddItemWidgetsBottomSheet
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/add_item_bottom_sheet"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textSize="24sp"
-        android:ellipsize="end"
-        android:fadingEdge="horizontal"
-        android:singleLine="true"
-        android:maxLines="1" />
+        android:background="@drawable/add_item_dialog_background"
+        android:padding="24dp"
+        android:theme="?attr/widgetsTheme"
+        android:layout_gravity="bottom"
+        android:orientation="vertical">
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:paddingVertical="8dp"
-        android:text="@string/add_item_request_drag_hint"
-        android:textSize="14sp"
-        android:textColor="?android:attr/textColorSecondary"
-        android:alpha="0.7"
-        android:importantForAccessibility="no"/>
-
-    <include layout="@layout/widget_cell"
-        android:id="@+id/widget_cell"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:layout_marginVertical="16dp" />
+        <TextView
+            style="@style/TextHeadline"
+            android:id="@+id/widget_appName"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="24sp"
+            android:ellipsize="end"
+            android:fadingEdge="horizontal"
+            android:singleLine="true"
+            android:maxLines="1" />
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="end"
-        android:padding="8dp"
-        android:orientation="horizontal">
-        <Button
-            style="@style/Widget.DeviceDefault.Button.Rounded.Colored"
-            android:layout_width="wrap_content"
+        <TextView
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingHorizontal="16dp"
-            android:onClick="onCancelClick"
-            android:text="@android:string/cancel" />
+            android:gravity="center_horizontal"
+            android:paddingVertical="8dp"
+            android:text="@string/add_item_request_drag_hint"
+            android:textSize="14sp"
+            android:textColor="?android:attr/textColorSecondary"
+            android:alpha="0.7"
+            android:importantForAccessibility="no"/>
 
-        <Space
-            android:layout_width="4dp"
-            android:layout_height="wrap_content" />
+        <include layout="@layout/widget_cell"
+            android:id="@+id/widget_cell"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:layout_marginVertical="16dp" />
 
-        <Button
-            style="@style/Widget.DeviceDefault.Button.Rounded.Colored"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingHorizontal="16dp"
-            android:onClick="onPlaceAutomaticallyClick"
-            android:text="@string/add_to_home_screen" />
-    </LinearLayout>
-</LinearLayout>
+            android:gravity="end"
+            android:padding="8dp"
+            android:orientation="horizontal">
+            <Button
+                style="@style/Widget.DeviceDefault.Button.Rounded.Colored"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="16dp"
+                android:onClick="onCancelClick"
+                android:text="@android:string/cancel" />
+
+            <Space
+                android:layout_width="4dp"
+                android:layout_height="wrap_content" />
+
+            <Button
+                style="@style/Widget.DeviceDefault.Button.Rounded.Colored"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="16dp"
+                android:onClick="onPlaceAutomaticallyClick"
+                android:text="@string/add_to_home_screen"/>
+        </LinearLayout>
+    </com.android.launcher3.widget.AddItemWidgetsBottomSheet>
+
+</com.android.launcher3.dragndrop.AddItemDragLayer>
+
+
diff --git a/res/values-night/styles.xml b/res/values-night/styles.xml
index 07a5096849..427525b42d 100644
--- a/res/values-night/styles.xml
+++ b/res/values-night/styles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 /*
-* Copyright (C) 2018 The Android Open Source Project
+* Copyright (C) 2008 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -18,11 +18,7 @@
 -->
 
 <resources>
-
-    <style name="AppItemActivityTheme" parent="@android:style/Theme.DeviceDefault.Dialog.Alert">
+    <style name="AddItemActivityTheme" parent="@android:style/Theme.Translucent.NoTitleBar">
         <item name="widgetsTheme">@style/WidgetContainerTheme.Dark</item>
-        <item name="android:windowBackground">@drawable/add_item_dialog_background</item>
-        <item name="android:windowNoTitle">true</item>
     </style>
-
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index fa41b1aaa2..9bc3af53e6 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -149,12 +149,6 @@
     <style name="AppTheme.Dark.DarkMainColor" parent="@style/LauncherTheme.Dark.DarkMainColor" />
     <style name="AppTheme.Dark.DarkText" parent="@style/LauncherTheme.Dark.DarkText" />
 
-    <style name="AppItemActivityTheme" parent="@android:style/Theme.DeviceDefault.Light.Dialog.Alert">
-        <item name="widgetsTheme">@style/WidgetContainerTheme</item>
-        <item name="android:windowBackground">@drawable/add_item_dialog_background</item>
-        <item name="android:windowNoTitle">true</item>
-    </style>
-
     <style name="HomeSettingsTheme" parent="@android:style/Theme.DeviceDefault.Settings">
         <item name="android:navigationBarColor">?android:colorPrimaryDark</item>
         <item name="preferenceTheme">@style/HomeSettingsPreferenceTheme</item>
@@ -291,4 +285,8 @@
     <style name="Widget.DeviceDefault.Button.Rounded.Colored" parent="@android:style/Widget.DeviceDefault.Button.Colored">
         <item name="android:background">@drawable/add_item_dialog_button_background</item>
     </style>
+
+    <style name="AddItemActivityTheme" parent="@android:style/Theme.Translucent.NoTitleBar">
+        <item name="widgetsTheme">@style/WidgetContainerTheme</item>
+    </style>
 </resources>
diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java
index 32b2c9a755..b3952ca1bc 100644
--- a/src/com/android/launcher3/AbstractFloatingView.java
+++ b/src/com/android/launcher3/AbstractFloatingView.java
@@ -63,7 +63,8 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
             TYPE_DRAG_DROP_POPUP,
             TYPE_TASK_MENU,
             TYPE_OPTIONS_POPUP,
-            TYPE_ICON_SURFACE
+            TYPE_ICON_SURFACE,
+            TYPE_PIN_WIDGET_FROM_EXTERNAL_POPUP
     })
     @Retention(RetentionPolicy.SOURCE)
     public @interface FloatingViewType {}
@@ -84,11 +85,13 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
     public static final int TYPE_OPTIONS_POPUP = 1 << 12;
     public static final int TYPE_ICON_SURFACE = 1 << 13;
 
+    public static final int TYPE_PIN_WIDGET_FROM_EXTERNAL_POPUP = 1 << 14;
+
     public static final int TYPE_ALL = TYPE_FOLDER | TYPE_ACTION_POPUP
             | TYPE_WIDGETS_BOTTOM_SHEET | TYPE_WIDGET_RESIZE_FRAME | TYPE_WIDGETS_FULL_SHEET
             | TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE | TYPE_TASK_MENU
             | TYPE_OPTIONS_POPUP | TYPE_SNACKBAR | TYPE_LISTENER | TYPE_ALL_APPS_EDU
-            | TYPE_ICON_SURFACE | TYPE_DRAG_DROP_POPUP;
+            | TYPE_ICON_SURFACE | TYPE_DRAG_DROP_POPUP | TYPE_PIN_WIDGET_FROM_EXTERNAL_POPUP;
 
     // Type of popups which should be kept open during launcher rebind
     public static final int TYPE_REBIND_SAFE = TYPE_WIDGETS_FULL_SHEET
diff --git a/src/com/android/launcher3/dragndrop/AddItemActivity.java b/src/com/android/launcher3/dragndrop/AddItemActivity.java
index 5ba36f21e3..5dae5a672d 100644
--- a/src/com/android/launcher3/dragndrop/AddItemActivity.java
+++ b/src/com/android/launcher3/dragndrop/AddItemActivity.java
@@ -30,6 +30,7 @@ import android.content.ClipData;
 import android.content.ClipDescription;
 import android.content.Intent;
 import android.content.pm.LauncherApps.PinItemRequest;
+import android.content.res.Configuration;
 import android.graphics.Canvas;
 import android.graphics.Point;
 import android.graphics.PointF;
@@ -37,7 +38,6 @@ import android.graphics.Rect;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.DragShadowBuilder;
@@ -56,6 +56,8 @@ import com.android.launcher3.model.ItemInstallQueue;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.pm.PinRequestHelper;
+import com.android.launcher3.util.SystemUiController;
+import com.android.launcher3.views.AbstractSlideInView;
 import com.android.launcher3.views.BaseDragLayer;
 import com.android.launcher3.widget.LauncherAppWidgetHost;
 import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
@@ -69,8 +71,12 @@ import com.android.launcher3.widget.WidgetManagerHelper;
 
 import java.util.function.Supplier;
 
+/**
+ * Activity to show pin widget dialog.
+ */
 @TargetApi(Build.VERSION_CODES.O)
-public class AddItemActivity extends BaseActivity implements OnLongClickListener, OnTouchListener {
+public class AddItemActivity extends BaseActivity
+        implements OnLongClickListener, OnTouchListener, AbstractSlideInView.OnCloseListener {
 
     private static final int SHADOW_SIZE = 10;
 
@@ -82,6 +88,7 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
     private PinItemRequest mRequest;
     private LauncherAppState mApp;
     private InvariantDeviceProfile mIdp;
+    private BaseDragLayer<AddItemActivity> mDragLayer;
 
     private WidgetCell mWidgetCell;
 
@@ -111,6 +118,14 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
         mDeviceProfile = mIdp.getDeviceProfile(getApplicationContext());
 
         setContentView(R.layout.add_item_confirmation_activity);
+        // Set flag to allow activity to draw over navigation and status bar.
+        getWindow().setFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS,
+                WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
+        mDragLayer = findViewById(R.id.add_item_drag_layer);
+        mDragLayer.recreateControllers();
+        mDragLayer.setInsets(mDeviceProfile.getInsets());
+        AbstractSlideInView<AddItemActivity> slideInView = findViewById(R.id.add_item_bottom_sheet);
+        slideInView.addOnCloseListener(this);
         mWidgetCell = findViewById(R.id.widget_cell);
 
         if (mRequest.getRequestType() == PinItemRequest.REQUEST_TYPE_SHORTCUT) {
@@ -135,6 +150,8 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
 
         TextView widgetAppName = findViewById(R.id.widget_appName);
         widgetAppName.setText(getApplicationInfo().labelRes);
+
+        setupNavBarColor();
     }
 
     @Override
@@ -338,7 +355,20 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
 
     @Override
     public BaseDragLayer getDragLayer() {
-        throw new UnsupportedOperationException();
+        return mDragLayer;
+    }
+
+    @Override
+    public void onSlideInViewClosed() {
+        finish();
+    }
+
+    protected void setupNavBarColor() {
+        boolean isSheetDark = (getApplicationContext().getResources().getConfiguration().uiMode
+                & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES;
+        getSystemUiController().updateUiState(
+                SystemUiController.UI_STATE_BASE_WINDOW,
+                isSheetDark ? SystemUiController.FLAG_DARK_NAV : SystemUiController.FLAG_LIGHT_NAV);
     }
 
     private void logCommand(StatsLogManager.EventEnum command) {
@@ -346,15 +376,4 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
                 .withItemInfo((ItemInfo) mWidgetCell.getWidgetView().getTag())
                 .log(command);
     }
-
-    @Override
-    public void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        View view = getWindow().getDecorView();
-        WindowManager.LayoutParams layoutParams =
-                (WindowManager.LayoutParams) view.getLayoutParams();
-        layoutParams.gravity = Gravity.BOTTOM;
-        layoutParams.width = WindowManager.LayoutParams.MATCH_PARENT;
-        getWindowManager().updateViewLayout(view, layoutParams);
-    }
 }
diff --git a/src/com/android/launcher3/dragndrop/AddItemDragLayer.java b/src/com/android/launcher3/dragndrop/AddItemDragLayer.java
new file mode 100644
index 0000000000..5b52c3d57c
--- /dev/null
+++ b/src/com/android/launcher3/dragndrop/AddItemDragLayer.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.dragndrop;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import com.android.launcher3.util.TouchController;
+import com.android.launcher3.views.BaseDragLayer;
+
+/**
+ * Drag layer for {@link AddItemActivity}.
+ */
+public class AddItemDragLayer extends BaseDragLayer<AddItemActivity> {
+
+    public AddItemDragLayer(Context context, AttributeSet attrs) {
+        this(context, attrs, /*alphaChannelCount= */ 1);
+    }
+
+    public AddItemDragLayer(Context context, AttributeSet attrs, int alphaChannelCount) {
+        super(context, attrs, alphaChannelCount);
+    }
+
+    @Override
+    public void recreateControllers() {
+        mControllers = new TouchController[] {};
+    }
+}
diff --git a/src/com/android/launcher3/views/AbstractSlideInView.java b/src/com/android/launcher3/views/AbstractSlideInView.java
index f79313f026..92ca8a17b8 100644
--- a/src/com/android/launcher3/views/AbstractSlideInView.java
+++ b/src/com/android/launcher3/views/AbstractSlideInView.java
@@ -31,17 +31,21 @@ import android.view.View;
 import android.view.animation.Interpolator;
 
 import com.android.launcher3.AbstractFloatingView;
-import com.android.launcher3.Launcher;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.touch.BaseSwipeDetector;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
- * Extension of AbstractFloatingView with common methods for sliding in from bottom
+ * Extension of {@link AbstractFloatingView} with common methods for sliding in from bottom.
+ *
+ * @param <T> Type of ActivityContext inflating this view.
  */
-public abstract class AbstractSlideInView extends AbstractFloatingView
-        implements SingleAxisSwipeDetector.Listener {
+public abstract class AbstractSlideInView<T extends Context & ActivityContext>
+        extends AbstractFloatingView implements SingleAxisSwipeDetector.Listener {
 
     protected static final Property<AbstractSlideInView, Float> TRANSLATION_SHIFT =
             new Property<AbstractSlideInView, Float>(Float.class, "translationShift") {
@@ -59,7 +63,8 @@ public abstract class AbstractSlideInView extends AbstractFloatingView
     protected static final float TRANSLATION_SHIFT_CLOSED = 1f;
     protected static final float TRANSLATION_SHIFT_OPENED = 0f;
 
-    protected final Launcher mLauncher;
+    protected final T mActivityContext;
+
     protected final SingleAxisSwipeDetector mSwipeDetector;
     protected final ObjectAnimator mOpenCloseAnimator;
 
@@ -71,10 +76,11 @@ public abstract class AbstractSlideInView extends AbstractFloatingView
     protected float mTranslationShift = TRANSLATION_SHIFT_CLOSED;
 
     protected boolean mNoIntercept;
+    protected List<OnCloseListener> mOnCloseListeners = new ArrayList<>();
 
     public AbstractSlideInView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        mLauncher = Launcher.getLauncher(context);
+        mActivityContext = ActivityContext.lookupContext(context);
 
         mScrollInterpolator = Interpolators.SCROLL_CUBIC;
         mSwipeDetector = new SingleAxisSwipeDetector(context, this,
@@ -88,8 +94,8 @@ public abstract class AbstractSlideInView extends AbstractFloatingView
                 announceAccessibilityChanges();
             }
         });
-        int scrimColor = getScrimColor(mLauncher);
-        mColorScrim = scrimColor != -1 ? createColorScrim(mLauncher, scrimColor) : null;
+        int scrimColor = getScrimColor(context);
+        mColorScrim = scrimColor != -1 ? createColorScrim(context, scrimColor) : null;
     }
 
     protected void attachToContainer() {
@@ -120,8 +126,8 @@ public abstract class AbstractSlideInView extends AbstractFloatingView
             return false;
         }
 
-        int directionsToDetectScroll = mSwipeDetector.isIdleState() ?
-                SingleAxisSwipeDetector.DIRECTION_NEGATIVE : 0;
+        int directionsToDetectScroll = mSwipeDetector.isIdleState()
+                ? SingleAxisSwipeDetector.DIRECTION_NEGATIVE : 0;
         mSwipeDetector.setDetectableScrollConditions(
                 directionsToDetectScroll, false);
         mSwipeDetector.onTouchEvent(ev);
@@ -176,6 +182,11 @@ public abstract class AbstractSlideInView extends AbstractFloatingView
         }
     }
 
+    /** Registers an {@link OnCloseListener}. */
+    public void addOnCloseListener(OnCloseListener listener) {
+        mOnCloseListeners.add(listener);
+    }
+
     protected void handleClose(boolean animate, long defaultDuration) {
         if (!mIsOpen) {
             return;
@@ -210,10 +221,11 @@ public abstract class AbstractSlideInView extends AbstractFloatingView
         if (mColorScrim != null) {
             getPopupContainer().removeView(mColorScrim);
         }
+        mOnCloseListeners.forEach(OnCloseListener::onSlideInViewClosed);
     }
 
     protected BaseDragLayer getPopupContainer() {
-        return mLauncher.getDragLayer();
+        return mActivityContext.getDragLayer();
     }
 
     protected View createColorScrim(Context context, int bgColor) {
@@ -227,4 +239,15 @@ public abstract class AbstractSlideInView extends AbstractFloatingView
 
         return view;
     }
+
+    /**
+     * Interface to report that the {@link AbstractSlideInView} has closed.
+     */
+    public interface OnCloseListener {
+
+        /**
+         * Called when {@link AbstractSlideInView} closes.
+         */
+        void onSlideInViewClosed();
+    }
 }
diff --git a/src/com/android/launcher3/views/WorkEduView.java b/src/com/android/launcher3/views/WorkEduView.java
index c8cf627a7f..6be0c23577 100644
--- a/src/com/android/launcher3/views/WorkEduView.java
+++ b/src/com/android/launcher3/views/WorkEduView.java
@@ -42,7 +42,7 @@ import com.android.launcher3.statemanager.StateManager.StateListener;
 /**
  * On boarding flow for users right after setting up work profile
  */
-public class WorkEduView extends AbstractSlideInView
+public class WorkEduView extends AbstractSlideInView<Launcher>
         implements Insettable, StateListener<LauncherState> {
 
     private static final int DEFAULT_CLOSE_DURATION = 200;
@@ -76,14 +76,15 @@ public class WorkEduView extends AbstractSlideInView
 
     @Override
     protected void handleClose(boolean animate) {
-        mLauncher.getSharedPrefs().edit().putInt(KEY_WORK_EDU_STEP, mNextWorkEduStep).apply();
+        mActivityContext.getSharedPrefs().edit()
+                .putInt(KEY_WORK_EDU_STEP, mNextWorkEduStep).apply();
         handleClose(true, DEFAULT_CLOSE_DURATION);
     }
 
     @Override
     protected void onCloseComplete() {
         super.onCloseComplete();
-        mLauncher.getStateManager().removeStateListener(this);
+        mActivityContext.getStateManager().removeStateListener(this);
     }
 
     @Override
@@ -116,13 +117,14 @@ public class WorkEduView extends AbstractSlideInView
             animator.addListener(new AnimationSuccessListener() {
                 @Override
                 public void onAnimationSuccess(Animator animator) {
-                    mContentText.setText(mLauncher.getString(R.string.work_profile_edu_work_apps));
+                    mContentText.setText(
+                            mActivityContext.getString(R.string.work_profile_edu_work_apps));
                     ObjectAnimator.ofFloat(mContentText, ALPHA, 1).start();
                 }
             });
             animator.start();
         } else {
-            mContentText.setText(mLauncher.getString(R.string.work_profile_edu_work_apps));
+            mContentText.setText(mActivityContext.getString(R.string.work_profile_edu_work_apps));
         }
         mNextWorkEduStep = WORK_EDU_WORK_APPS;
         mProceedButton.setOnClickListener(v -> handleClose(true));
@@ -142,7 +144,7 @@ public class WorkEduView extends AbstractSlideInView
     private void show() {
         attachToContainer();
         animateOpen();
-        mLauncher.getStateManager().addStateListener(this);
+        mActivityContext.getStateManager().addStateListener(this);
     }
 
     @Override
@@ -168,7 +170,7 @@ public class WorkEduView extends AbstractSlideInView
     }
 
     private AllAppsPagedView getAllAppsPagedView() {
-        View v = mLauncher.getAppsView().getContentView();
+        View v = mActivityContext.getAppsView().getContentView();
         return (v instanceof AllAppsPagedView) ? (AllAppsPagedView) v : null;
     }
 
diff --git a/src/com/android/launcher3/widget/AddItemWidgetsBottomSheet.java b/src/com/android/launcher3/widget/AddItemWidgetsBottomSheet.java
new file mode 100644
index 0000000000..9e0830309e
--- /dev/null
+++ b/src/com/android/launcher3/widget/AddItemWidgetsBottomSheet.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.widget;
+
+import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
+
+import android.animation.PropertyValuesHolder;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+
+import com.android.launcher3.Insettable;
+import com.android.launcher3.dragndrop.AddItemActivity;
+import com.android.launcher3.views.AbstractSlideInView;
+
+/**
+ * Bottom sheet for the pin widget.
+ */
+public class AddItemWidgetsBottomSheet extends AbstractSlideInView<AddItemActivity>
+        implements Insettable {
+
+    private static final int DEFAULT_CLOSE_DURATION = 200;
+
+    private Rect mInsets;
+    private Configuration mCurrentConfiguration;
+
+    public AddItemWidgetsBottomSheet(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public AddItemWidgetsBottomSheet(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mContent = this;
+        mInsets = new Rect();
+        mCurrentConfiguration = new Configuration(getResources().getConfiguration());
+        animateOpen();
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        super.onLayout(changed, l, t, r, b);
+        setTranslationShift(mTranslationShift);
+    }
+
+    private void animateOpen() {
+        if (mIsOpen || mOpenCloseAnimator.isRunning()) {
+            return;
+        }
+        mIsOpen = true;
+        mOpenCloseAnimator.setValues(
+                PropertyValuesHolder.ofFloat(TRANSLATION_SHIFT, TRANSLATION_SHIFT_OPENED));
+        mOpenCloseAnimator.setInterpolator(FAST_OUT_SLOW_IN);
+        mOpenCloseAnimator.start();
+    }
+
+    @Override
+    protected void handleClose(boolean animate) {
+        handleClose(animate, DEFAULT_CLOSE_DURATION);
+    }
+
+    @Override
+    protected boolean isOfType(@FloatingViewType int type) {
+        return (type & TYPE_PIN_WIDGET_FROM_EXTERNAL_POPUP) != 0;
+    }
+
+    @Override
+    public void setInsets(Rect insets) {
+        // Extend behind left, right, and bottom insets.
+        int leftInset = insets.left - mInsets.left;
+        int rightInset = insets.right - mInsets.right;
+        int bottomInset = insets.bottom - mInsets.bottom;
+        mInsets.set(insets);
+        setPadding(leftInset, getPaddingTop(), rightInset, bottomInset);
+    }
+
+    @Override
+    protected void onConfigurationChanged(Configuration newConfig) {
+        if (mCurrentConfiguration.orientation != newConfig.orientation) {
+            mInsets.setEmpty();
+        }
+        mCurrentConfiguration.updateFrom(newConfig);
+    }
+}
diff --git a/src/com/android/launcher3/widget/BaseWidgetSheet.java b/src/com/android/launcher3/widget/BaseWidgetSheet.java
index a7ecb078c2..f7e295e7e8 100644
--- a/src/com/android/launcher3/widget/BaseWidgetSheet.java
+++ b/src/com/android/launcher3/widget/BaseWidgetSheet.java
@@ -28,6 +28,7 @@ import android.widget.Toast;
 
 import com.android.launcher3.DragSource;
 import com.android.launcher3.DropTarget.DragObject;
+import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.dragndrop.DragOptions;
@@ -42,11 +43,10 @@ import com.android.launcher3.views.AbstractSlideInView;
 /**
  * Base class for various widgets popup
  */
-public abstract class BaseWidgetSheet extends AbstractSlideInView
+public abstract class BaseWidgetSheet extends AbstractSlideInView<Launcher>
         implements OnClickListener, OnLongClickListener, DragSource,
         PopupDataProvider.PopupDataChangeListener {
 
-
     /* Touch handling related member variables. */
     private Toast mWidgetInstructionToast;
 
@@ -62,13 +62,13 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
-        mLauncher.getPopupDataProvider().setChangeListener(this);
+        mActivityContext.getPopupDataProvider().setChangeListener(this);
     }
 
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
-        mLauncher.getPopupDataProvider().setChangeListener(null);
+        mActivityContext.getPopupDataProvider().setChangeListener(null);
     }
 
     @Override
@@ -91,7 +91,7 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView
     public boolean onLongClick(View v) {
         TestLogging.recordEvent(TestProtocol.SEQUENCE_MAIN, "Widgets.onLongClick");
         v.cancelLongPress();
-        if (!ItemLongClickListener.canStartDrag(mLauncher)) return false;
+        if (!ItemLongClickListener.canStartDrag(mActivityContext)) return false;
 
         if (v instanceof WidgetCell) {
             return beginDraggingWidget((WidgetCell) v);
@@ -160,7 +160,7 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView
     }
 
     protected SystemUiController getSystemUiController() {
-        return mLauncher.getSystemUiController();
+        return mActivityContext.getSystemUiController();
     }
 
     /**
diff --git a/src/com/android/launcher3/widget/WidgetsBottomSheet.java b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
index 995ac47e41..787a2d1262 100644
--- a/src/com/android/launcher3/widget/WidgetsBottomSheet.java
+++ b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
@@ -83,7 +83,7 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
         setWillNotDraw(false);
         mInsets = new Rect();
         mContent = this;
-        DeviceProfile deviceProfile = mLauncher.getDeviceProfile();
+        DeviceProfile deviceProfile = mActivityContext.getDeviceProfile();
         // Set the max table height to 2 / 3 of the grid height so that the bottom picker won't
         // take over the entire view vertically.
         mMaxTableHeight = deviceProfile.inv.numRows * 2 / 3  * deviceProfile.cellHeightPx;
@@ -97,7 +97,7 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
         int paddingPx = 2 * getResources().getDimensionPixelOffset(
                 R.dimen.widget_cell_horizontal_padding);
         int maxHorizontalSpan = findViewById(R.id.widgets_table).getMeasuredWidth()
-                / (mLauncher.getDeviceProfile().cellWidthPx + paddingPx);
+                / (mActivityContext.getDeviceProfile().cellWidthPx + paddingPx);
 
         if (mMaxHorizontalSpan != maxHorizontalSpan) {
             // Ensure the table layout is showing widgets in the right column after measure.
@@ -134,7 +134,7 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
 
     @Override
     public void onWidgetsBound() {
-        List<WidgetItem> widgets = mLauncher.getPopupDataProvider().getWidgetsForPackageUser(
+        List<WidgetItem> widgets = mActivityContext.getPopupDataProvider().getWidgetsForPackageUser(
                 new PackageUserKey(
                         mOriginalItemInfo.getTargetComponent().getPackageName(),
                         mOriginalItemInfo.user));
@@ -148,7 +148,7 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
             row.forEach(widgetItem -> {
                 WidgetCell widget = addItemCell(tableRow);
                 widget.setPreviewSize(widgetItem.spanX, widgetItem.spanY);
-                widget.applyFromCellItem(widgetItem, LauncherAppState.getInstance(mLauncher)
+                widget.applyFromCellItem(widgetItem, LauncherAppState.getInstance(mActivityContext)
                         .getWidgetCache());
                 widget.ensurePreview();
                 widget.setVisibility(View.VISIBLE);
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 4d8c1ca2ab..0ea50e6514 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -207,7 +207,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         onWidgetsBound();
 
         mSearchAndRecommendationViewHolder.mSearchBar.initialize(
-                mLauncher.getPopupDataProvider(), /* searchModeListener= */ this);
+                mActivityContext.getPopupDataProvider(), /* searchModeListener= */ this);
 
         if (!hasSeenEducationTip()) {
             addOnLayoutChangeListener(mLayoutChangeListenerToShowTips);
@@ -271,7 +271,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
-        mLauncher.getAppWidgetHost().addProviderChangeListener(this);
+        mActivityContext.getAppWidgetHost().addProviderChangeListener(this);
         notifyWidgetProvidersChanged();
         onRecommendedWidgetsBound();
     }
@@ -279,7 +279,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
-        mLauncher.getAppWidgetHost().removeProviderChangeListener(this);
+        mActivityContext.getAppWidgetHost().removeProviderChangeListener(this);
     }
 
     @Override
@@ -327,7 +327,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
     }
 
     private void doMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        DeviceProfile deviceProfile = mLauncher.getDeviceProfile();
+        DeviceProfile deviceProfile = mActivityContext.getDeviceProfile();
         int widthUsed;
         if (mInsets.bottom > 0) {
             widthUsed = mInsets.left + mInsets.right;
@@ -350,7 +350,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
 
         int previousMaxSpansPerRow = mMaxSpansPerRow;
         mMaxSpansPerRow = getMeasuredWidth()
-                / (mLauncher.getDeviceProfile().cellWidthPx + mWidgetCellHorizontalPadding);
+                / (mActivityContext.getDeviceProfile().cellWidthPx + mWidgetCellHorizontalPadding);
 
         if (previousMaxSpansPerRow != mMaxSpansPerRow) {
             mAdapters.get(AdapterHolder.PRIMARY).mWidgetsListAdapter.setMaxHorizontalSpansPerRow(
@@ -383,7 +383,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
 
     @Override
     public void notifyWidgetProvidersChanged() {
-        mLauncher.refreshAndBindWidgetsForPackageUser(null);
+        mActivityContext.refreshAndBindWidgetsForPackageUser(null);
     }
 
     @Override
@@ -391,7 +391,8 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         if (mIsInSearchMode) {
             return;
         }
-        List<WidgetsListBaseEntry> allWidgets = mLauncher.getPopupDataProvider().getAllWidgets();
+        List<WidgetsListBaseEntry> allWidgets =
+                mActivityContext.getPopupDataProvider().getAllWidgets();
 
         AdapterHolder primaryUserAdapterHolder = mAdapters.get(AdapterHolder.PRIMARY);
         primaryUserAdapterHolder.mWidgetsListAdapter.setWidgets(allWidgets);
@@ -468,12 +469,12 @@ public class WidgetsFullSheet extends BaseWidgetSheet
             return;
         }
         List<WidgetItem> recommendedWidgets =
-                mLauncher.getPopupDataProvider().getRecommendedWidgets();
+                mActivityContext.getPopupDataProvider().getRecommendedWidgets();
         WidgetsRecommendationTableLayout table =
                 mSearchAndRecommendationViewHolder.mRecommendedWidgetsTable;
         if (recommendedWidgets.size() > 0) {
             float maxTableHeight =
-                    (mLauncher.getDeviceProfile().availableHeightPx - mTabsHeight
+                    (mActivityContext.getDeviceProfile().availableHeightPx - mTabsHeight
                             - getHeaderViewHeight()) * RECOMMENDATION_TABLE_HEIGHT_RATIO;
             List<ArrayList<WidgetItem>> recommendedWidgetsInTable =
                     WidgetsTableUtils.groupWidgetItemsIntoTable(recommendedWidgets,
@@ -614,10 +615,11 @@ public class WidgetsFullSheet extends BaseWidgetSheet
     }
 
     private void showEducationTipOnView(View view) {
-        mLauncher.getSharedPrefs().edit().putBoolean(WIDGETS_EDUCATION_TIP_SEEN, true).apply();
+        mActivityContext.getSharedPrefs().edit()
+                .putBoolean(WIDGETS_EDUCATION_TIP_SEEN, true).apply();
         int[] coords = new int[2];
         view.getLocationOnScreen(coords);
-        ArrowTipView arrowTipView = new ArrowTipView(mLauncher);
+        ArrowTipView arrowTipView = new ArrowTipView(mActivityContext);
         arrowTipView.showAtLocation(
                 getContext().getString(R.string.long_press_widget_to_add),
                 /* arrowXCoord= */coords[0] + view.getWidth() / 2,
@@ -653,7 +655,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
     }
 
     private boolean hasSeenEducationTip() {
-        return mLauncher.getSharedPrefs().getBoolean(WIDGETS_EDUCATION_TIP_SEEN, false)
+        return mActivityContext.getSharedPrefs().getBoolean(WIDGETS_EDUCATION_TIP_SEEN, false)
                 || Utilities.IS_RUNNING_IN_TEST_HARNESS;
     }
 
-- 
GitLab


From 7ad2e846b477a744396e7caa3fdca7a4d66c9612 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Fri, 14 May 2021 00:17:05 -0700
Subject: [PATCH 1178/1664] Detach nav bar from app after settling into
 overview

Fixes: 185042209
Test: manual
Change-Id: Id302ac9f8e86c3af6b2c05a4314401505eb26b1e
---
 quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index d04bfe95e2..52aad98cdd 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1476,6 +1476,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     private void finishCurrentTransitionToRecents() {
         if (LIVE_TILE.get()) {
             mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);
+            if (mRecentsAnimationController != null) {
+                mRecentsAnimationController.getController().detachNavigationBarFromApp(true);
+            }
         } else if (!hasTargets() || mRecentsAnimationController == null) {
             // If there are no targets or the animation not started, then there is nothing to finish
             mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);
-- 
GitLab


From f9ccf0175dc56049abfa067704dbd81af16331cc Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Fri, 14 May 2021 11:04:41 -0700
Subject: [PATCH 1179/1664] Revert "Removing workaround for battery defender"

This reverts commit f4bb052ca076fc2fb8d6f29140252b6154c984e1.

Reason: we have new episodes of phone locking during the test.
https://flakes-clusters.corp.google.com/#?androidAtpBranch=git_sc-dev&androidAtpModule=com.google.android.apps.nexuslauncher.out_of_proc_tests&d=3&maxResults=10

https://flakes-clusters.corp.google.com/#?androidAtpBranch=git_sc-dev&androidAtpModule=com.google.android.apps.nexuslauncher.tests&d=3&maxResults=10

Search for "Phone is locked" and "Keyguard is visible".

Also, for new devices, the phone is locked consistently, see for example
Redfin here:
https://blackbox.googleplex.com/dashboard/Launcher3Main_new_devices/testsuite/git_master/nexuslauncher_oop_tests_platform/2/bramble-userdebug/0

Reverting to see whether this helps.

Bug: 151613234
Test: presubmit
Change-Id: I44a94f9722deaa21d89fdfd79646ae661ebe972d
---
 .../launcher3/ui/AbstractLauncherUiTest.java     | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index ca463e6042..cbd948035c 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -247,12 +247,26 @@ public abstract class AbstractLauncherUiTest {
         return mDevice;
     }
 
+    private boolean hasSystemUiObject(String resId) {
+        return mDevice.hasObject(By.res(SYSTEMUI_PACKAGE, resId));
+    }
+
     @Before
     public void setUp() throws Exception {
         mLauncher.onTestStart();
-        Assert.assertTrue("Keyguard is visible, which is likely caused by a crash in SysUI",
+        Log.d(TAG, "Before disabling battery defender");
+        mDevice.executeShellCommand("setprop vendor.battery.defender.disable 1");
+        Log.d(TAG, "Before enabling stay awake");
+        mDevice.executeShellCommand("settings put global stay_on_while_plugged_in 3");
+        for (int i = 0; i < 10 && hasSystemUiObject("keyguard_status_view"); ++i) {
+            Log.d(TAG, "Before unlocking the phone");
+            mDevice.executeShellCommand("input keyevent 82");
+            mDevice.waitForIdle();
+        }
+        Assert.assertTrue("Keyguard still visible",
                 TestHelpers.wait(
                         Until.gone(By.res(SYSTEMUI_PACKAGE, "keyguard_status_view")), 60000));
+        Log.d(TAG, "Keyguard is not visible");
 
         final String launcherPackageName = mDevice.getLauncherPackageName();
         try {
-- 
GitLab


From 9400d2be3e708261b99f3bb8cdb9d0e5be06db2a Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Fri, 14 May 2021 12:07:04 -0700
Subject: [PATCH 1180/1664] Leak 2 views for the view leak detection test

This compensates for the noise in the view count.

Test: labtest
Bug: 187761685
Change-Id: I04a256f2b36a62e6c7c602d51cccf3a6f1c75ee0
---
 .../android/launcher3/testing/DebugTestInformationHandler.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java b/ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java
index c6ae6bef21..72b8d3fcae 100644
--- a/ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java
+++ b/ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java
@@ -109,6 +109,7 @@ public class DebugTestInformationHandler extends TestInformationHandler {
             case TestProtocol.REQUEST_VIEW_LEAK: {
                 if (sLeaks == null) sLeaks = new LinkedList();
                 sLeaks.add(new View(mContext));
+                sLeaks.add(new View(mContext));
                 return response;
             }
 
-- 
GitLab


From 38dd6ec9012f35138868d0167c71a5fadc721e0d Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 14 May 2021 14:49:08 -0700
Subject: [PATCH 1181/1664] Fix AnimatorListeners.forEndCallback()

Override onAnimationEnd(Animator), rather than (Animator, boolean)
which may not be called.

Test: Swipe right to quick switch from home, then swipe back left
(in the same gesture), ensure next quick switch isn't broken.
Bug: 185554764

Change-Id: I53e7526ed5b55fbae9aa654ace70a6ef7561e1d8
---
 src/com/android/launcher3/anim/AnimatorListeners.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/anim/AnimatorListeners.java b/src/com/android/launcher3/anim/AnimatorListeners.java
index 57c2f8df93..d9046b9459 100644
--- a/src/com/android/launcher3/anim/AnimatorListeners.java
+++ b/src/com/android/launcher3/anim/AnimatorListeners.java
@@ -50,7 +50,7 @@ public class AnimatorListeners {
     public static AnimatorListener forEndCallback(Runnable callback) {
         return new AnimatorListenerAdapter() {
             @Override
-            public void onAnimationEnd(Animator animation, boolean isReverse) {
+            public void onAnimationEnd(Animator animation) {
                 callback.run();
             }
         };
-- 
GitLab


From 262ae769b0243bb57a5297f9f15d1d3fbfe4fc0c Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Fri, 14 May 2021 15:29:18 -0700
Subject: [PATCH 1182/1664] Reapply All Apps icons on download complete.

Fixes: 187853323
Test: manual
Change-Id: I800a13a3665997f323f23667c8128c8034a7b4d3
---
 src/com/android/launcher3/allapps/AllAppsStore.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsStore.java b/src/com/android/launcher3/allapps/AllAppsStore.java
index 355ccadeba..2443b8360d 100644
--- a/src/com/android/launcher3/allapps/AllAppsStore.java
+++ b/src/com/android/launcher3/allapps/AllAppsStore.java
@@ -17,6 +17,7 @@ package com.android.launcher3.allapps;
 
 import static com.android.launcher3.model.data.AppInfo.COMPONENT_KEY_COMPARATOR;
 import static com.android.launcher3.model.data.AppInfo.EMPTY_ARRAY;
+import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_SHOW_DOWNLOAD_PROGRESS_MASK;
 
 import android.view.View;
 import android.view.ViewGroup;
@@ -157,11 +158,17 @@ public class AllAppsStore {
      * If this app is installed and supports incremental downloads, the progress bar will be updated
      * the app's total download progress. Otherwise, the progress bar will be updated to the app's
      * installation progress.
+     *
+     * If this app is fully downloaded, the app icon will be reapplied.
      */
     public void updateProgressBar(AppInfo app) {
         updateAllIcons((child) -> {
             if (child.getTag() == app) {
-                child.applyProgressLevel();
+                if ((app.runtimeStatusFlags & FLAG_SHOW_DOWNLOAD_PROGRESS_MASK) == 0) {
+                    child.applyFromApplicationInfo(app);
+                } else {
+                    child.applyProgressLevel();
+                }
             }
         });
     }
-- 
GitLab


From 82d5a0681da8cba0e1c1a7a1aabfefe77a41162a Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 14 May 2021 14:37:12 -0700
Subject: [PATCH 1183/1664] Revert to overview coming from the side instead of
 bottom

Test: Visually checking all of these. As appropriate, repeat in 0, 2, 3
button modes, landscape/portrait/fake landscape, and 3P launcher
- Quick switch from home
- Home to overview
- Overview to home (swipe up)
- Overview to home (tap outside)
- Overview to home (back invocation)
- Quick switch from app
- Swipe up and hold from app
- Dismiss an app
- Empty recents
- Split select state to home
- Modal state to home
Fixes: 185411781

Change-Id: If00a22fee35c832a259bfc62808efbac5990ce2e
---
 .../launcher3/BaseQuickstepLauncher.java      |  4 +-
 .../BaseRecentsViewStateController.java       |  4 -
 .../states/BackgroundAppState.java            |  2 +-
 .../states/OverviewModalTaskState.java        |  2 +-
 .../uioverrides/states/OverviewState.java     |  4 +-
 .../QuickstepAtomicAnimationFactory.java      | 56 ++++++------
 .../NoButtonQuickSwitchTouchController.java   |  2 -
 .../QuickSwitchTouchController.java           |  2 -
 .../quickstep/BaseActivityInterface.java      | 14 +--
 .../FallbackRecentsStateController.java       |  3 -
 .../quickstep/fallback/RecentsState.java      |  4 +-
 .../util/RecentsAtomicAnimationFactory.java   |  8 +-
 .../android/quickstep/views/RecentsView.java  | 91 +------------------
 .../com/android/quickstep/views/TaskView.java |  5 -
 src/com/android/launcher3/Launcher.java       |  2 +-
 src/com/android/launcher3/LauncherState.java  |  4 +-
 16 files changed, 53 insertions(+), 154 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 6966fb65dd..e777ee7354 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -29,10 +29,10 @@ import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SY
 import android.animation.AnimatorSet;
 import android.animation.ValueAnimator;
 import android.app.ActivityOptions;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentSender;
-import android.content.ComponentName;
 import android.content.ServiceConnection;
 import android.os.Bundle;
 import android.os.CancellationSignal;
@@ -388,7 +388,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
     @Override
     public float[] getNormalOverviewScaleAndOffset() {
         return SysUINavigationMode.getMode(this).hasGestures
-                ? new float[] {1, NO_OFFSET, 1} : new float[] {1.1f, NO_OFFSET, NO_OFFSET};
+                ? new float[] {1, 1} : new float[] {1.1f, NO_OFFSET};
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
index 814cf93936..1d523151db 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
@@ -25,7 +25,6 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TR
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
 import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_HORIZONTAL_OFFSET;
-import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_VERTICAL_OFFSET;
 import static com.android.quickstep.views.RecentsView.RECENTS_GRID_PROGRESS;
 import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
 import static com.android.quickstep.views.RecentsView.TASK_PRIMARY_SPLIT_TRANSLATION;
@@ -65,7 +64,6 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView>
         float[] scaleAndOffset = state.getOverviewScaleAndOffset(mLauncher);
         RECENTS_SCALE_PROPERTY.set(mRecentsView, scaleAndOffset[0]);
         ADJACENT_PAGE_HORIZONTAL_OFFSET.set(mRecentsView, scaleAndOffset[1]);
-        ADJACENT_PAGE_VERTICAL_OFFSET.set(mRecentsView, scaleAndOffset[2]);
         TASK_SECONDARY_TRANSLATION.set(mRecentsView, 0f);
 
         getContentAlphaProperty().set(mRecentsView, state.overviewUi ? 1f : 0);
@@ -97,8 +95,6 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView>
                 config.getInterpolator(ANIM_OVERVIEW_SCALE, LINEAR));
         setter.setFloat(mRecentsView, ADJACENT_PAGE_HORIZONTAL_OFFSET, scaleAndOffset[1],
                 config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_X, LINEAR));
-        setter.setFloat(mRecentsView, ADJACENT_PAGE_VERTICAL_OFFSET, scaleAndOffset[2],
-                config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, LINEAR));
         setter.setFloat(mRecentsView, TASK_SECONDARY_TRANSLATION, 0f,
                 config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, LINEAR));
         PagedOrientationHandler orientationHandler =
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
index 06ffae449e..77c261154b 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
@@ -96,6 +96,6 @@ public class BackgroundAppState extends OverviewState {
             BaseDraggingActivity activity) {
         return new float[] {
                 ((RecentsView) activity.getOverviewPanel()).getMaxScaleForFullScreen(),
-                NO_OFFSET, NO_OFFSET};
+                NO_OFFSET};
     }
 }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java
index 1fc288f7cf..6f084a1f97 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java
@@ -78,6 +78,6 @@ public class OverviewModalTaskState extends OverviewState {
         float scale = Math.min((float) modalTaskSize.height() / taskSize.y,
                 (float) modalTaskSize.width() / taskSize.x);
 
-        return new float[] {scale, NO_OFFSET, NO_OFFSET};
+        return new float[] {scale, NO_OFFSET};
     }
 }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
index c9cfad3d3f..45791a3136 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -59,7 +59,7 @@ public class OverviewState extends LauncherState {
 
     @Override
     public int getTransitionDuration(Context context) {
-        // In gesture modes, overview comes in all the way from the bottom, so give it more time.
+        // In gesture modes, overview comes in all the way from the side, so give it more time.
         return SysUINavigationMode.INSTANCE.get(context).getMode().hasGestures ? 380 : 250;
     }
 
@@ -78,7 +78,7 @@ public class OverviewState extends LauncherState {
 
     @Override
     public float[] getOverviewScaleAndOffset(Launcher launcher) {
-        return new float[] {NO_SCALE, NO_OFFSET, NO_OFFSET};
+        return new float[] {NO_SCALE, NO_OFFSET};
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
index adc6b18fed..eb524a9145 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
@@ -23,10 +23,11 @@ import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.WorkspaceStateTransitionAnimation.getSpringScaleAnimator;
 import static com.android.launcher3.anim.Interpolators.ACCEL;
-import static com.android.launcher3.anim.Interpolators.AGGRESSIVE_EASE_IN_OUT;
+import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.anim.Interpolators.DEACCEL;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_1_7;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
+import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 import static com.android.launcher3.anim.Interpolators.FINAL_FRAME;
 import static com.android.launcher3.anim.Interpolators.INSTANT;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
@@ -66,11 +67,11 @@ public class QuickstepAtomicAnimationFactory extends
     // Scale recents takes before animating in
     private static final float RECENTS_PREPARE_SCALE = 1.33f;
     // Scale workspace takes before animating in
-    private static final float WORKSPACE_PREPARE_SCALE_GESTURES = 0.97f;
-    private static final float WORKSPACE_PREPARE_SCALE_BUTTONS = 0.92f;
-    // When the overview to home transition reaches this percentage, immediately hide overview and
-    // start animating away the scrim and animating in workspace.
-    private static final float OVERVIEW_TO_HOME_HARD_HAND_OFF = 0.4f;
+    private static final float WORKSPACE_PREPARE_SCALE = 0.92f;
+    // Constants to specify how to scroll RecentsView to the default page if it's not already there.
+    private static final int DEFAULT_PAGE = 0;
+    private static final int PER_PAGE_SCROLL_DURATION = 150;
+    private static final int MAX_PAGE_SCROLL_DURATION = 750;
 
     // Due to use of physics, duration may differ between devices so we need to calculate and
     // cache the value.
@@ -85,33 +86,32 @@ public class QuickstepAtomicAnimationFactory extends
             StateAnimationConfig config) {
         RecentsView overview = mActivity.getOverviewPanel();
         if (toState == NORMAL && fromState == OVERVIEW) {
-            final float workspacePrepareScale;
+            config.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, DEACCEL);
+            config.setInterpolator(ANIM_SCRIM_FADE, LINEAR);
+            config.setInterpolator(ANIM_WORKSPACE_SCALE, DEACCEL);
+            config.setInterpolator(ANIM_WORKSPACE_FADE, ACCEL);
+
             if (SysUINavigationMode.getMode(mActivity).hasGestures
                     && overview.getTaskViewCount() > 0) {
-                workspacePrepareScale = WORKSPACE_PREPARE_SCALE_GESTURES;
                 // Overview is going offscreen, so keep it at its current scale and opacity.
                 config.setInterpolator(ANIM_OVERVIEW_SCALE, FINAL_FRAME);
-                config.setInterpolator(ANIM_OVERVIEW_FADE, clampToProgress(
-                        FINAL_FRAME, 0f, OVERVIEW_TO_HOME_HARD_HAND_OFF));
-                config.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, clampToProgress(
-                        DEACCEL, 0f, OVERVIEW_TO_HOME_HARD_HAND_OFF));
-                config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, AGGRESSIVE_EASE_IN_OUT);
-                config.setInterpolator(ANIM_SCRIM_FADE, clampToProgress(
-                        DEACCEL, OVERVIEW_TO_HOME_HARD_HAND_OFF, 1f));
-                config.setInterpolator(ANIM_WORKSPACE_SCALE, clampToProgress(
-                        DEACCEL, OVERVIEW_TO_HOME_HARD_HAND_OFF, 1f));
-                config.setInterpolator(ANIM_WORKSPACE_FADE, clampToProgress(
-                        INSTANT, OVERVIEW_TO_HOME_HARD_HAND_OFF, 1f));
+                config.setInterpolator(ANIM_OVERVIEW_FADE, FINAL_FRAME);
+                config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X,
+                        clampToProgress(FAST_OUT_SLOW_IN, 0, 0.75f));
+                config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, FINAL_FRAME);
             } else {
-                workspacePrepareScale = WORKSPACE_PREPARE_SCALE_BUTTONS;
+                config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, ACCEL_DEACCEL);
                 config.setInterpolator(ANIM_OVERVIEW_SCALE, clampToProgress(ACCEL, 0, 0.9f));
                 config.setInterpolator(ANIM_OVERVIEW_FADE, DEACCEL_1_7);
-                config.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, LINEAR);
-                config.setInterpolator(ANIM_SCRIM_FADE, LINEAR);
-                config.setInterpolator(ANIM_WORKSPACE_SCALE, DEACCEL);
-                config.setInterpolator(ANIM_WORKSPACE_FADE, ACCEL);
             }
 
+            // Scroll RecentsView to page 0 as it goes offscreen, if necessary.
+            int numPagesToScroll = overview.getNextPage() - DEFAULT_PAGE;
+            long scrollDuration = Math.min(MAX_PAGE_SCROLL_DURATION,
+                    numPagesToScroll * PER_PAGE_SCROLL_DURATION);
+            config.duration = Math.max(config.duration, scrollDuration);
+            overview.snapToPage(DEFAULT_PAGE, Math.toIntExact(config.duration));
+
             Workspace workspace = mActivity.getWorkspace();
             // Start from a higher workspace scale, but only if we're invisible so we don't jump.
             boolean isWorkspaceVisible = workspace.getVisibility() == VISIBLE;
@@ -122,14 +122,14 @@ public class QuickstepAtomicAnimationFactory extends
                         && currentChild.getShortcutsAndWidgets().getAlpha() > 0;
             }
             if (!isWorkspaceVisible) {
-                workspace.setScaleX(workspacePrepareScale);
-                workspace.setScaleY(workspacePrepareScale);
+                workspace.setScaleX(WORKSPACE_PREPARE_SCALE);
+                workspace.setScaleY(WORKSPACE_PREPARE_SCALE);
             }
             Hotseat hotseat = mActivity.getHotseat();
             boolean isHotseatVisible = hotseat.getVisibility() == VISIBLE && hotseat.getAlpha() > 0;
             if (!isHotseatVisible) {
-                hotseat.setScaleX(workspacePrepareScale);
-                hotseat.setScaleY(workspacePrepareScale);
+                hotseat.setScaleX(WORKSPACE_PREPARE_SCALE);
+                hotseat.setScaleY(WORKSPACE_PREPARE_SCALE);
             }
         } else if ((fromState == NORMAL || fromState == HINT_STATE
                 || fromState == HINT_STATE_TWO_BUTTON) && toState == OVERVIEW) {
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
index 62687c5f35..5837a707ca 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
@@ -43,7 +43,6 @@ import static com.android.launcher3.touch.BothAxesSwipeDetector.DIRECTION_UP;
 import static com.android.launcher3.util.DisplayController.getSingleFrameMs;
 import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;
 import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_HORIZONTAL_OFFSET;
-import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_VERTICAL_OFFSET;
 import static com.android.quickstep.views.RecentsView.CONTENT_ALPHA;
 import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS;
 import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
@@ -224,7 +223,6 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
         // Set RecentView's initial properties.
         RECENTS_SCALE_PROPERTY.set(mRecentsView, fromState.getOverviewScaleAndOffset(mLauncher)[0]);
         ADJACENT_PAGE_HORIZONTAL_OFFSET.set(mRecentsView, 1f);
-        ADJACENT_PAGE_VERTICAL_OFFSET.set(mRecentsView, 0f);
         mRecentsView.setContentAlpha(1);
         mRecentsView.setFullscreenProgress(fromState.getOverviewFullscreenProgress());
         mLauncher.getActionsView().getVisibilityAlpha().setValue(
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
index 5891d5f16a..f0ef9cc2d7 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
@@ -31,7 +31,6 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_F
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_TRANSLATE;
 import static com.android.launcher3.util.SystemUiController.UI_STATE_FULLSCREEN_TASK;
 import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_HORIZONTAL_OFFSET;
-import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_VERTICAL_OFFSET;
 import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
 import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
@@ -113,7 +112,6 @@ public class QuickSwitchTouchController extends AbstractStateChangeTouchControll
         RECENTS_SCALE_PROPERTY.set(mOverviewPanel,
                 QUICK_SWITCH.getOverviewScaleAndOffset(mLauncher)[0] * 0.85f);
         ADJACENT_PAGE_HORIZONTAL_OFFSET.set(mOverviewPanel, 1f);
-        ADJACENT_PAGE_VERTICAL_OFFSET.set(mOverviewPanel, 0f);
         mOverviewPanel.setContentAlpha(1);
 
         mCurrentAnimation = mLauncher.getStateManager()
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index c8865c4b3b..f5ddd0e52f 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -23,8 +23,8 @@ import static com.android.quickstep.AbsSwipeUpHandler.RECENTS_ATTACH_DURATION;
 import static com.android.quickstep.GestureState.GestureEndTarget.RECENTS;
 import static com.android.quickstep.SysUINavigationMode.getMode;
 import static com.android.quickstep.util.RecentsAtomicAnimationFactory.INDEX_RECENTS_FADE_ANIM;
-import static com.android.quickstep.util.RecentsAtomicAnimationFactory.INDEX_RECENTS_TRANSLATE_Y_ANIM;
-import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_VERTICAL_OFFSET;
+import static com.android.quickstep.util.RecentsAtomicAnimationFactory.INDEX_RECENTS_TRANSLATE_X_ANIM;
+import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_HORIZONTAL_OFFSET;
 import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS;
 import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
 import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION;
@@ -461,17 +461,17 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
             float fromTranslation = attached ? 1 : 0;
             float toTranslation = attached ? 0 : 1;
             mActivity.getStateManager()
-                    .cancelStateElementAnimation(INDEX_RECENTS_TRANSLATE_Y_ANIM);
+                    .cancelStateElementAnimation(INDEX_RECENTS_TRANSLATE_X_ANIM);
             if (!recentsView.isShown() && animate) {
-                ADJACENT_PAGE_VERTICAL_OFFSET.set(recentsView, fromTranslation);
+                ADJACENT_PAGE_HORIZONTAL_OFFSET.set(recentsView, fromTranslation);
             } else {
-                fromTranslation = ADJACENT_PAGE_VERTICAL_OFFSET.get(recentsView);
+                fromTranslation = ADJACENT_PAGE_HORIZONTAL_OFFSET.get(recentsView);
             }
             if (!animate) {
-                ADJACENT_PAGE_VERTICAL_OFFSET.set(recentsView, toTranslation);
+                ADJACENT_PAGE_HORIZONTAL_OFFSET.set(recentsView, toTranslation);
             } else {
                 mActivity.getStateManager().createStateElementAnimation(
-                        INDEX_RECENTS_TRANSLATE_Y_ANIM,
+                        INDEX_RECENTS_TRANSLATE_X_ANIM,
                         fromTranslation, toTranslation).start();
             }
 
diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
index 4d776bafca..f0364eb410 100644
--- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
+++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
@@ -23,7 +23,6 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TR
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_SCRIM_FADE;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
 import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_HORIZONTAL_OFFSET;
-import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_VERTICAL_OFFSET;
 import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS;
 import static com.android.quickstep.views.RecentsView.RECENTS_GRID_PROGRESS;
 import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
@@ -89,8 +88,6 @@ public class FallbackRecentsStateController implements StateHandler<RecentsState
                 config.getInterpolator(ANIM_OVERVIEW_SCALE, LINEAR));
         setter.setFloat(mRecentsView, ADJACENT_PAGE_HORIZONTAL_OFFSET, scaleAndOffset[1],
                 config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_X, LINEAR));
-        setter.setFloat(mRecentsView, ADJACENT_PAGE_VERTICAL_OFFSET, scaleAndOffset[2],
-                config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, LINEAR));
         setter.setFloat(mRecentsView, TASK_SECONDARY_TRANSLATION, 0f,
                 config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, LINEAR));
 
diff --git a/quickstep/src/com/android/quickstep/fallback/RecentsState.java b/quickstep/src/com/android/quickstep/fallback/RecentsState.java
index 532f2190ce..b6cfdce65a 100644
--- a/quickstep/src/com/android/quickstep/fallback/RecentsState.java
+++ b/quickstep/src/com/android/quickstep/fallback/RecentsState.java
@@ -126,7 +126,7 @@ public class RecentsState implements BaseState<RecentsState> {
     }
 
     public float[] getOverviewScaleAndOffset(RecentsActivity activity) {
-        return new float[] { NO_SCALE, NO_OFFSET, NO_OFFSET };
+        return new float[] { NO_SCALE, NO_OFFSET };
     }
 
     /**
@@ -170,7 +170,7 @@ public class RecentsState implements BaseState<RecentsState> {
 
         @Override
         public float[] getOverviewScaleAndOffset(RecentsActivity activity) {
-            return new float[] { NO_SCALE, NO_OFFSET, 1 };
+            return new float[] { NO_SCALE, 1 };
         }
     }
 }
diff --git a/quickstep/src/com/android/quickstep/util/RecentsAtomicAnimationFactory.java b/quickstep/src/com/android/quickstep/util/RecentsAtomicAnimationFactory.java
index c1ca060a60..5c72c8fe26 100644
--- a/quickstep/src/com/android/quickstep/util/RecentsAtomicAnimationFactory.java
+++ b/quickstep/src/com/android/quickstep/util/RecentsAtomicAnimationFactory.java
@@ -15,7 +15,7 @@
  */
 package com.android.quickstep.util;
 
-import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_VERTICAL_OFFSET;
+import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_HORIZONTAL_OFFSET;
 
 import android.animation.Animator;
 import android.animation.ObjectAnimator;
@@ -31,7 +31,7 @@ public class RecentsAtomicAnimationFactory<ACTIVITY_TYPE extends StatefulActivit
         extends AtomicAnimationFactory<STATE_TYPE> {
 
     public static final int INDEX_RECENTS_FADE_ANIM = AtomicAnimationFactory.NEXT_INDEX + 0;
-    public static final int INDEX_RECENTS_TRANSLATE_Y_ANIM = AtomicAnimationFactory.NEXT_INDEX + 1;
+    public static final int INDEX_RECENTS_TRANSLATE_X_ANIM = AtomicAnimationFactory.NEXT_INDEX + 1;
 
     private static final int MY_ANIM_COUNT = 2;
 
@@ -48,14 +48,14 @@ public class RecentsAtomicAnimationFactory<ACTIVITY_TYPE extends StatefulActivit
             case INDEX_RECENTS_FADE_ANIM:
                 return ObjectAnimator.ofFloat(mActivity.getOverviewPanel(),
                         RecentsView.CONTENT_ALPHA, values);
-            case INDEX_RECENTS_TRANSLATE_Y_ANIM: {
+            case INDEX_RECENTS_TRANSLATE_X_ANIM: {
                 RecentsView rv = mActivity.getOverviewPanel();
                 return new SpringAnimationBuilder(mActivity)
                         .setMinimumVisibleChange(DynamicAnimation.MIN_VISIBLE_CHANGE_SCALE)
                         .setDampingRatio(0.8f)
                         .setStiffness(250)
                         .setValues(values)
-                        .build(rv, ADJACENT_PAGE_VERTICAL_OFFSET);
+                        .build(rv, ADJACENT_PAGE_HORIZONTAL_OFFSET);
             }
             default:
                 return super.createStateElementAnimation(index, values);
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 5bad5e8cf5..7cd2a6ab65 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -231,22 +231,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 }
             };
 
-    public static final FloatProperty<RecentsView> ADJACENT_PAGE_VERTICAL_OFFSET =
-            new FloatProperty<RecentsView>("adjacentPageVerticalOffset") {
-                @Override
-                public void setValue(RecentsView recentsView, float v) {
-                    if (recentsView.mAdjacentPageVerticalOffset != v) {
-                        recentsView.mAdjacentPageVerticalOffset = v;
-                        recentsView.updateVerticalPageOffsets();
-                    }
-                }
-
-                @Override
-                public Float get(RecentsView recentsView) {
-                    return recentsView.mAdjacentPageVerticalOffset;
-                }
-            };
-
     /**
      * Can be used to tint the color of the RecentsView to simulate a scrim that can views
      * excluded from. Really should be a proper scrim.
@@ -276,8 +260,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 @Override
                 public void setValue(RecentsView recentsView, float v) {
                     recentsView.setTaskViewsResistanceTranslation(v);
-                    recentsView.mLastComputedTaskBottomPushOutDistance = null;
-                    recentsView.updateVerticalPageOffsets();
                 }
 
                 @Override
@@ -327,11 +309,9 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                     view.setScaleY(scale);
                     view.mLastComputedTaskStartPushOutDistance = null;
                     view.mLastComputedTaskEndPushOutDistance = null;
-                    view.mLastComputedTaskBottomPushOutDistance = null;
                     view.mLiveTileTaskViewSimulator.recentsViewScale.value = scale;
                     view.setTaskViewsResistanceTranslation(view.mTaskViewsSecondaryTranslation);
                     view.updatePageOffsets();
-                    view.updateVerticalPageOffsets();
                 }
 
                 @Override
@@ -370,7 +350,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     // How much a task that is directly offscreen will be pushed out due to RecentsView scale/pivot.
     protected Float mLastComputedTaskStartPushOutDistance = null;
     protected Float mLastComputedTaskEndPushOutDistance = null;
-    protected Float mLastComputedTaskBottomPushOutDistance = null;
     protected boolean mEnableDrawingLiveTile = false;
     protected final Rect mTempRect = new Rect();
     protected final RectF mTempRectF = new RectF();
@@ -415,7 +394,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     private boolean mOverviewFullscreenEnabled;
 
     private float mAdjacentPageHorizontalOffset = 0;
-    private float mAdjacentPageVerticalOffset = 0;
     protected float mTaskViewsSecondaryTranslation = 0;
     protected float mTaskViewsPrimarySplitTranslation = 0;
     protected float mTaskViewsSecondarySplitTranslation = 0;
@@ -1214,7 +1192,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         // Update the set of visible task's data
         loadVisibleTaskData(TaskView.FLAG_UPDATE_ALL);
         setTaskModalness(0);
-        updateVerticalPageOffsets();
         setColorTint(0);
     }
 
@@ -2733,9 +2710,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         setTaskModalness(mTaskModalness);
         mLastComputedTaskStartPushOutDistance = null;
         mLastComputedTaskEndPushOutDistance = null;
-        mLastComputedTaskBottomPushOutDistance = null;
         updatePageOffsets();
-        updateVerticalPageOffsets();
         setImportantForAccessibility(isModal() ? IMPORTANT_FOR_ACCESSIBILITY_NO
                 : IMPORTANT_FOR_ACCESSIBILITY_AUTO);
     }
@@ -2752,7 +2727,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
 
         float midpointOffsetSize = 0;
         float leftOffsetSize = midpoint - 1 >= 0
-                ? -getHorizontalOffsetSize(midpoint - 1, midpoint, offset)
+                ? getHorizontalOffsetSize(midpoint - 1, midpoint, offset)
                 : 0;
         float rightOffsetSize = midpoint + 1 < count
                 ? getHorizontalOffsetSize(midpoint + 1, midpoint, offset)
@@ -2889,64 +2864,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         return distanceToOffscreen * offsetProgress;
     }
 
-    private void updateVerticalPageOffsets() {
-        float offset = mAdjacentPageVerticalOffset;
-        int count = getTaskViewCount();
-
-        TaskView runningTask = mRunningTaskId == -1 || !mRunningTaskTileHidden
-                ? null : getTaskView(mRunningTaskId);
-        int midpoint = runningTask == null ? -1 : indexOfChild(runningTask);
-
-        float offsetSize = getVerticalOffsetSize(offset);
-        float midpointOffsetSize = 0;
-
-        for (int i = 0; i < count; i++) {
-            float translation = i == midpoint
-                    ? midpointOffsetSize
-                    : offsetSize;
-            int directionFactor = mOrientationHandler.getSecondaryTranslationDirectionFactor() * -1;
-            translation *= directionFactor;
-            TaskView child = getTaskViewAt(i);
-            FloatProperty translationProperty = child.getSecondaryTaskOffsetTranslationProperty();
-            translationProperty.set(child, translation);
-            if (LIVE_TILE.get() && mEnableDrawingLiveTile && i == getRunningTaskIndex()) {
-                mLiveTileTaskViewSimulator.taskSecondaryTranslation.value = translation;
-                redrawLiveTile();
-            }
-        }
-    }
-
-    /**
-     * Computes the distance to offset the given child such that it is completely offscreen when
-     * translating away from its position in overview.
-     * @param offsetProgress From 0 to 1 where 0 means no offset and 1 means offset offscreen.
-     */
-    private float getVerticalOffsetSize(float offsetProgress) {
-        if (offsetProgress == 0) {
-            // Don't bother calculating everything below if we won't offset anyway.
-            return 0;
-        }
-        // First, find the distance to offscreen from the normal (centered) task position.
-        mTempRectF.set(mLastComputedTaskSize);
-        RectF taskPosition = mTempRectF;
-        float desiredTop = getHeight();
-        float distanceToOffscreen = desiredTop - taskPosition.top;
-        // Next, we need to account for the resistance translation if any (e.g. long swipe up).
-        float translationY = mTaskViewsSecondaryTranslation;
-        distanceToOffscreen -= translationY;
-        // Finally, we need to account for RecentsView scale, because it moves tasks based on its
-        // pivot. To do this, we move the task position to where it would be offscreen at scale = 1
-        // (computed above), then we apply the scale via getMatrix() to determine how much that
-        // moves the task from its desired position, and adjust the computed distance accordingly.
-        if (mLastComputedTaskBottomPushOutDistance == null) {
-            taskPosition.offsetTo(0, desiredTop + translationY);
-            getMatrix().mapRect(taskPosition);
-            mLastComputedTaskBottomPushOutDistance = (taskPosition.top - desiredTop) / getScaleY();
-        }
-        distanceToOffscreen -= mLastComputedTaskBottomPushOutDistance;
-        return distanceToOffscreen * offsetProgress;
-    }
-
     protected void setTaskViewsResistanceTranslation(float translation) {
         mTaskViewsSecondaryTranslation = translation;
         for (int i = 0; i < getTaskViewCount(); i++) {
@@ -3598,11 +3515,11 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         }
 
         int overScrollShift = getOverScrollShift();
-        if (mAdjacentPageVerticalOffset > 0) {
+        if (mAdjacentPageHorizontalOffset > 0) {
             // Don't dampen the scroll (due to overscroll) if the adjacent tasks are offscreen, so
             // that the page can move freely given there's no visual indication why it shouldn't.
-            overScrollShift = (int) Utilities.mapRange(mAdjacentPageVerticalOffset, overScrollShift,
-                    getUndampedOverScrollShift());
+            overScrollShift = (int) Utilities.mapRange(mAdjacentPageHorizontalOffset,
+                    overScrollShift, getUndampedOverScrollShift());
         }
         return getScrollForPage(pageIndex) - mOrientationHandler.getPrimaryScroll(this)
                 + overScrollShift;
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index f8be5b63c3..cfac32cb09 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -1133,11 +1133,6 @@ public class TaskView extends FrameLayout implements Reusable {
                 TASK_OFFSET_TRANSLATION_X, TASK_OFFSET_TRANSLATION_Y);
     }
 
-    public FloatProperty<TaskView> getSecondaryTaskOffsetTranslationProperty() {
-        return getPagedOrientationHandler().getSecondaryValue(
-                TASK_OFFSET_TRANSLATION_X, TASK_OFFSET_TRANSLATION_Y);
-    }
-
     public FloatProperty<TaskView> getTaskResistanceTranslationProperty() {
         return getPagedOrientationHandler().getSecondaryValue(
                 TASK_RESISTANCE_TRANSLATION_X, TASK_RESISTANCE_TRANSLATION_Y);
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 7b67807697..dda2a6fb63 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2801,7 +2801,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
      * @see LauncherState#getOverviewScaleAndOffset(Launcher)
      */
     public float[] getNormalOverviewScaleAndOffset() {
-        return new float[] {NO_SCALE, NO_OFFSET, NO_OFFSET};
+        return new float[] {NO_SCALE, NO_OFFSET};
     }
 
     /**
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java
index 8432f4be29..3399ce9cd6 100644
--- a/src/com/android/launcher3/LauncherState.java
+++ b/src/com/android/launcher3/LauncherState.java
@@ -172,12 +172,10 @@ public abstract class LauncherState implements BaseState<LauncherState> {
     }
 
     /**
-     * Returns an array of three elements.
+     * Returns an array of two elements.
      * The first specifies the scale for the overview
      * The second is the factor ([0, 1], 0 => center-screen; 1 => offscreen) by which overview
      * should be shifted horizontally.
-     * The third is the factor ([0, 1], 0 => center-screen; 1 => offscreen) by which overview
-     * should be shifted vertically.
      */
     public float[] getOverviewScaleAndOffset(Launcher launcher) {
         return launcher.getNormalOverviewScaleAndOffset();
-- 
GitLab


From 0b15c7ee07c4a874d9b08516c6355e3377263e89 Mon Sep 17 00:00:00 2001
From: Yogisha Dixit <ydixit@google.com>
Date: Mon, 10 May 2021 12:01:58 +0100
Subject: [PATCH 1184/1664] Log widget features.

Design doc: go/widgets-logging
Note that this doesn't log dynamic colors yet. I'll work on that in a
follow-up CL.

Bug: 185778648
Test: manual
Change-Id: I04249ef267907b4112c220fb206e077d1bee783a
---
 protos/launcher_atom.proto                    |  1 +
 .../logging/StatsLogCompatManager.java        |  4 ++
 src/com/android/launcher3/Launcher.java       | 13 ++--
 .../model/data/LauncherAppWidgetInfo.java     | 68 +++++++++++++++++++
 .../widget/LauncherAppWidgetProviderInfo.java |  6 ++
 5 files changed, 87 insertions(+), 5 deletions(-)

diff --git a/protos/launcher_atom.proto b/protos/launcher_atom.proto
index fb47b0aad6..475b5bead0 100644
--- a/protos/launcher_atom.proto
+++ b/protos/launcher_atom.proto
@@ -162,6 +162,7 @@ message Widget {
   optional int32 app_widget_id = 3;
   optional string package_name = 4; // only populated during snapshot if from workspace
   optional string component_name = 5; // only populated during snapshot if from workspace
+  optional int32 widget_features = 6;
 }
 
 // Tasks handled by PackageManager
diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
index 3b26108aab..719cb0a032 100644
--- a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
+++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
@@ -354,6 +354,10 @@ public class StatsLogCompatManager extends StatsLogManager {
     }
 
     private static int getCardinality(LauncherAtom.ItemInfo info) {
+        // TODO(b/187734511): Implement a unified solution for 1x1 widgets in folders/hotseat.
+        if (info.getItemCase().equals(LauncherAtom.ItemInfo.ItemCase.WIDGET)) {
+            return info.getWidget().getWidgetFeatures();
+        }
         switch (info.getContainerInfo().getContainerCase()) {
             case PREDICTED_HOTSEAT_CONTAINER:
                 return info.getContainerInfo().getPredictedHotseatContainer().getCardinality();
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 5896f5a4de..c9700add3a 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1315,8 +1315,15 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
             appWidgetInfo = mAppWidgetManager.getLauncherAppWidgetInfo(appWidgetId);
         }
 
+        if (hostView == null) {
+            // Perform actual inflation because we're live
+            hostView = mAppWidgetHost.createView(this, appWidgetId, appWidgetInfo);
+        }
+
         LauncherAppWidgetInfo launcherInfo;
-        launcherInfo = new LauncherAppWidgetInfo(appWidgetId, appWidgetInfo.provider);
+        launcherInfo =
+                new LauncherAppWidgetInfo(
+                        appWidgetId, appWidgetInfo.provider, appWidgetInfo, hostView);
         launcherInfo.spanX = itemInfo.spanX;
         launcherInfo.spanY = itemInfo.spanY;
         launcherInfo.minSpanX = itemInfo.minSpanX;
@@ -1326,10 +1333,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         getModelWriter().addItemToDatabase(launcherInfo,
                 itemInfo.container, itemInfo.screenId, itemInfo.cellX, itemInfo.cellY);
 
-        if (hostView == null) {
-            // Perform actual inflation because we're live
-            hostView = mAppWidgetHost.createView(this, appWidgetId, appWidgetInfo);
-        }
         hostView.setVisibility(View.VISIBLE);
         prepareAppWidget(hostView, launcherInfo);
         mWorkspace.addInScreen(hostView, launcherInfo);
diff --git a/src/com/android/launcher3/model/data/LauncherAppWidgetInfo.java b/src/com/android/launcher3/model/data/LauncherAppWidgetInfo.java
index c04b7f0ffa..003b3bdc22 100644
--- a/src/com/android/launcher3/model/data/LauncherAppWidgetInfo.java
+++ b/src/com/android/launcher3/model/data/LauncherAppWidgetInfo.java
@@ -16,9 +16,12 @@
 
 package com.android.launcher3.model.data;
 
+import static com.android.launcher3.Utilities.ATLEAST_S;
+
 import android.appwidget.AppWidgetHostView;
 import android.content.ComponentName;
 import android.content.Intent;
+import android.content.res.Resources;
 import android.os.Process;
 
 import androidx.annotation.Nullable;
@@ -26,7 +29,10 @@ import androidx.annotation.Nullable;
 import com.android.launcher3.AppWidgetResizeFrame;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherSettings;
+import com.android.launcher3.logger.LauncherAtom;
 import com.android.launcher3.util.ContentWriter;
+import com.android.launcher3.widget.LauncherAppWidgetHostView;
+import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 
 /**
  * Represents a widget (either instantiated or about to be) in the Launcher.
@@ -80,6 +86,18 @@ public class LauncherAppWidgetInfo extends ItemInfo {
      */
     public static final int CUSTOM_WIDGET_ID = -100;
 
+    /**
+     * Flags for recording all the features that a widget has enabled.
+     * @see widgetFeatures
+     */
+    public static final int FEATURE_RECONFIGURABLE = 1;
+    public static final int FEATURE_OPTIONAL_CONFIGURATION = 1 << 1;
+    public static final int FEATURE_PREVIEW_LAYOUT = 1 << 2;
+    public static final int FEATURE_TARGET_CELL_SIZE = 1 << 3;
+    public static final int FEATURE_MIN_SIZE = 1 << 4;
+    public static final int FEATURE_MAX_SIZE = 1 << 5;
+    public static final int FEATURE_ROUNDED_CORNERS = 1 << 6;
+
     /**
      * Identifier for this widget when talking with
      * {@link android.appwidget.AppWidgetManager} for updates.
@@ -113,6 +131,12 @@ public class LauncherAppWidgetInfo extends ItemInfo {
      */
     public PackageItemInfo pendingItemInfo;
 
+    /**
+     * Contains a binary representation indicating which widget features are enabled. This value is
+     * -1 if widget features could not be identified.
+     */
+    private int widgetFeatures;
+
     private boolean mHasNotifiedInitialWidgetSizeChanged;
 
     public LauncherAppWidgetInfo(int appWidgetId, ComponentName providerName) {
@@ -129,11 +153,18 @@ public class LauncherAppWidgetInfo extends ItemInfo {
         // to indicate that they should be calculated based on the layout and minWidth/minHeight
         spanX = -1;
         spanY = -1;
+        widgetFeatures = -1;
         // We only support app widgets on current user.
         user = Process.myUserHandle();
         restoreStatus = RESTORE_COMPLETED;
     }
 
+    public LauncherAppWidgetInfo(int appWidgetId, ComponentName providerName,
+            LauncherAppWidgetProviderInfo providerInfo, AppWidgetHostView hostView) {
+        this(appWidgetId, providerName);
+        widgetFeatures = computeWidgetFeatures(providerInfo, hostView);
+    }
+
     /** Used for testing **/
     public LauncherAppWidgetInfo() {
         itemType = LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET;
@@ -194,4 +225,41 @@ public class LauncherAppWidgetInfo extends ItemInfo {
     public final boolean hasOptionFlag(int option) {
         return (options & option) != 0;
     }
+
+    @SuppressWarnings("NewApi")
+    private static int computeWidgetFeatures(
+            LauncherAppWidgetProviderInfo providerInfo, AppWidgetHostView hostView) {
+        int widgetFeatures = 0;
+        if (providerInfo.isReconfigurable()) {
+            widgetFeatures |= FEATURE_RECONFIGURABLE;
+        }
+        if (providerInfo.isConfigurationOptional()) {
+            widgetFeatures |= FEATURE_OPTIONAL_CONFIGURATION;
+        }
+        if (ATLEAST_S && providerInfo.previewLayout != Resources.ID_NULL) {
+            widgetFeatures |= FEATURE_PREVIEW_LAYOUT;
+        }
+        if (ATLEAST_S && providerInfo.targetCellWidth > 0 || providerInfo.targetCellHeight > 0) {
+            widgetFeatures |= FEATURE_TARGET_CELL_SIZE;
+        }
+        if (providerInfo.minResizeWidth > 0 || providerInfo.minResizeHeight > 0) {
+            widgetFeatures |= FEATURE_MIN_SIZE;
+        }
+        if (ATLEAST_S && providerInfo.maxResizeWidth > 0 || providerInfo.maxResizeHeight > 0) {
+            widgetFeatures |= FEATURE_MAX_SIZE;
+        }
+        if (hostView instanceof LauncherAppWidgetHostView &&
+                ((LauncherAppWidgetHostView) hostView).hasEnforcedCornerRadius()) {
+            widgetFeatures |= FEATURE_ROUNDED_CORNERS;
+        }
+        return widgetFeatures;
+    }
+
+    @Override
+    public LauncherAtom.ItemInfo buildProto(FolderInfo folderInfo) {
+        LauncherAtom.ItemInfo info = super.buildProto(folderInfo);
+        return info.toBuilder()
+                .setWidget(info.getWidget().toBuilder().setWidgetFeatures(widgetFeatures))
+                .build();
+    }
 }
diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java b/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
index de511cd00b..53b5fec31c 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
@@ -149,6 +149,12 @@ public class LauncherAppWidgetProviderInfo extends AppWidgetProviderInfo
         return configure != null && (getWidgetFeatures() & WIDGET_FEATURE_RECONFIGURABLE) != 0;
     }
 
+    public boolean isConfigurationOptional() {
+        return ATLEAST_S
+                && isReconfigurable()
+                && (getWidgetFeatures() & WIDGET_FEATURE_CONFIGURATION_OPTIONAL) != 0;
+    }
+
     @Override
     public final ComponentName getComponent() {
         return provider;
-- 
GitLab


From 2ecf12625662df9eafebf8ad75298f693f098c2a Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Fri, 14 May 2021 16:12:56 -0700
Subject: [PATCH 1185/1664] Removing @Stability flavors for unbundled.

They can be accidentally used.

Test: presubmit.
Bug: 187761685
Change-Id: I0cf859a51fb708ed51ba2f9506ab76af42ee3d5c
---
 .../android/quickstep/DigitalWellBeingToastTest.java   |  3 ---
 .../android/launcher3/util/rule/TestStabilityRule.java | 10 ----------
 2 files changed, 13 deletions(-)

diff --git a/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java b/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java
index 2a7da7eca8..3e84a76695 100644
--- a/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java
+++ b/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java
@@ -3,8 +3,6 @@ package com.android.quickstep;
 import static androidx.test.InstrumentationRegistry.getInstrumentation;
 
 import static com.android.launcher3.LauncherState.OVERVIEW;
-import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUBMIT;
-import static com.android.launcher3.util.rule.TestStabilityRule.UNBUNDLED_POSTSUBMIT;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -18,7 +16,6 @@ import androidx.test.filters.LargeTest;
 import androidx.test.runner.AndroidJUnit4;
 
 import com.android.launcher3.Launcher;
-import com.android.launcher3.util.rule.TestStabilityRule;
 import com.android.quickstep.views.DigitalWellBeingToast;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
diff --git a/tests/src/com/android/launcher3/util/rule/TestStabilityRule.java b/tests/src/com/android/launcher3/util/rule/TestStabilityRule.java
index 61f5e05aa5..0e27b61b84 100644
--- a/tests/src/com/android/launcher3/util/rule/TestStabilityRule.java
+++ b/tests/src/com/android/launcher3/util/rule/TestStabilityRule.java
@@ -53,8 +53,6 @@ public class TestStabilityRule implements TestRule {
                     + ")$");
 
     public static final int LOCAL = 0x1;
-    public static final int UNBUNDLED_PRESUBMIT = 0x2;
-    public static final int UNBUNDLED_POSTSUBMIT = 0x4;
     public static final int PLATFORM_PRESUBMIT = 0x8;
     public static final int PLATFORM_POSTSUBMIT = 0x10;
 
@@ -136,14 +134,6 @@ public class TestStabilityRule implements TestRule {
                         platformBuildMatcher.group("postsubmit") != null)) {
             Log.d(TAG, "LOCAL RUN");
             sRunFlavor = LOCAL;
-        } else if (launcherBuildMatcher.group("presubmit") != null
-                && platformBuildMatcher.group("postsubmit") != null) {
-            Log.d(TAG, "UNBUNDLED PRESUBMIT");
-            sRunFlavor = UNBUNDLED_PRESUBMIT;
-        } else if (launcherBuildMatcher.group("postsubmit") != null
-                && platformBuildMatcher.group("postsubmit") != null) {
-            Log.d(TAG, "UNBUNDLED POSTSUBMIT");
-            sRunFlavor = UNBUNDLED_POSTSUBMIT;
         } else if (launcherBuildMatcher.group("platform") != null
                 && platformBuildMatcher.group("presubmit") != null) {
             Log.d(TAG, "PLATFORM PRESUBMIT");
-- 
GitLab


From 2cecad8e756810b9853056b1ce2d43b3c3da5600 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Mon, 17 May 2021 00:33:54 -0700
Subject: [PATCH 1186/1664] Catch NPE for
 AllAppsContainerView.dispatchRestoreInstanceState

TL;DR;;
Missing view id for work profile recycler view
caused restore failure as there are different type of
views that contains same id. However, even after that fix,
lack of view id in slice views generated by other process
causes failure when mFlags on these not restored slice
views needs to be accessed.

Bug: 186596139
Test: manual
Change-Id: I8a97598c27acbc05ac8a39c50fe5862e541d62ad
---
 res/values/id.xml                               |  1 +
 .../launcher3/allapps/AllAppsContainerView.java | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/res/values/id.xml b/res/values/id.xml
index 39c49bd5e1..1bd40cec4a 100644
--- a/res/values/id.xml
+++ b/res/values/id.xml
@@ -15,6 +15,7 @@
     limitations under the License.
 -->
 <resources>
+    <item type="id" name="apps_list_view_work" />
     <item type="id" name="view_type_widgets_list" />
     <item type="id" name="view_type_widgets_header" />
     <item type="id" name="view_type_widgets_search_header" />
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 7be1138b5f..6f26e3b93b 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -30,11 +30,13 @@ import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Point;
 import android.graphics.Rect;
+import android.os.Parcelable;
 import android.os.Process;
 import android.text.Selection;
 import android.text.SpannableStringBuilder;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.util.SparseArray;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -133,6 +135,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
     private int mHeaderColor;
 
 
+
     public AllAppsContainerView(Context context) {
         this(context, null);
     }
@@ -171,6 +174,19 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         mAllAppsStore.addUpdateListener(this::onAppsUpdated);
     }
 
+    @Override
+    protected void dispatchRestoreInstanceState(SparseArray<Parcelable> sparseArray) {
+        try {
+            // Many slice view id is not properly assigned, and hence throws null
+            // pointer exception in the underneath method. Catching the exception
+            // simply doesn't restore these slice views. This doesn't have any
+            // user visible effect because because we query them again.
+            super.dispatchRestoreInstanceState(sparseArray);
+        } catch (Exception e) {
+            Log.e("AllAppsContainerView", "restoreInstanceState viewId = 0", e);
+        }
+    }
+
     /**
      * Sets the long click listener for icons
      */
@@ -438,6 +454,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
             setupWorkToggle();
             mAH[AdapterHolder.MAIN].setup(mViewPager.getChildAt(0), mPersonalMatcher);
             mAH[AdapterHolder.WORK].setup(mViewPager.getChildAt(1), mWorkMatcher);
+            mAH[AdapterHolder.WORK].recyclerView.setId(R.id.apps_list_view_work);
             mViewPager.getPageIndicator().setActiveMarker(AdapterHolder.MAIN);
             findViewById(R.id.tab_personal)
                     .setOnClickListener((View view) -> {
-- 
GitLab


From 05d3e86401567ddadadd387eca3b89da8f091d7a Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Fri, 14 May 2021 00:00:19 -0700
Subject: [PATCH 1187/1664] Fix searchbox font and other specs

Bug: 187654557
Test: manual, see attached image on the bug

Change-Id: I570df1bcc926258ca406810ea10b3d1fdd3cd2ec
---
 res/color/all_apps_tab_bg.xml                 | 19 +++++++++++++++++++
 res/color/all_apps_tab_text.xml               |  2 +-
 res/drawable/all_apps_tabs_background.xml     |  2 +-
 res/values/dimens.xml                         |  6 +++---
 res/values/styles.xml                         |  6 +++---
 .../allapps/AllAppsContainerView.java         |  4 +---
 .../PersonalWorkSlidingTabStrip.java          |  3 +--
 7 files changed, 29 insertions(+), 13 deletions(-)
 create mode 100644 res/color/all_apps_tab_bg.xml

diff --git a/res/color/all_apps_tab_bg.xml b/res/color/all_apps_tab_bg.xml
new file mode 100644
index 0000000000..e59e8d2198
--- /dev/null
+++ b/res/color/all_apps_tab_bg.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+    <item android:color="?androidprv:attr/colorAccentPrimary"/>
+</selector>
\ No newline at end of file
diff --git a/res/color/all_apps_tab_text.xml b/res/color/all_apps_tab_text.xml
index 4ddb277163..2db0fb5d74 100644
--- a/res/color/all_apps_tab_text.xml
+++ b/res/color/all_apps_tab_text.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?android:attr/textColorPrimaryInverse" android:state_selected="true"/>
+    <item android:color="@android:color/black" android:state_selected="true"/>
     <item android:color="?android:attr/textColorTertiary"/>
 </selector>
\ No newline at end of file
diff --git a/res/drawable/all_apps_tabs_background.xml b/res/drawable/all_apps_tabs_background.xml
index ca2beec244..377b653781 100644
--- a/res/drawable/all_apps_tabs_background.xml
+++ b/res/drawable/all_apps_tabs_background.xml
@@ -16,6 +16,6 @@
 <shape android:shape="rectangle"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
-    <solid android:color="?androidprv:attr/colorSurfaceVariant" />
+    <solid android:color="?androidprv:attr/colorSurface" />
     <corners android:radius="@dimen/all_apps_header_pill_corner_radius" />
 </shape>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 26587d8a72..fd1a29c117 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -91,14 +91,14 @@
     <dimen name="all_apps_empty_search_bg_top_offset">144dp</dimen>
     <dimen name="all_apps_background_canvas_width">700dp</dimen>
     <dimen name="all_apps_background_canvas_height">475dp</dimen>
-    <dimen name="all_apps_header_pill_height">50dp</dimen>
-    <dimen name="all_apps_header_pill_corner_radius">48dp</dimen>
+    <dimen name="all_apps_header_pill_height">36dp</dimen>
+    <dimen name="all_apps_header_pill_corner_radius">18dp</dimen>
     <dimen name="all_apps_header_tab_height">48dp</dimen>
     <dimen name="all_apps_tabs_indicator_height">2dp</dimen>
     <dimen name="all_apps_header_top_padding">36dp</dimen>
     <dimen name="all_apps_work_profile_tab_footer_top_padding">16dp</dimen>
     <dimen name="all_apps_work_profile_tab_footer_bottom_padding">20dp</dimen>
-    <dimen name="all_apps_tabs_side_padding">12dp</dimen>
+    <dimen name="all_apps_tabs_side_padding">32dp</dimen>
     <dimen name="all_apps_divider_height">1dp</dimen>
 
     <dimen name="all_apps_tip_bottom_margin">8dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index fa41b1aaa2..7078febfee 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -213,8 +213,7 @@
         <item name="disabledIconAlpha">.54</item>
     </style>
 
-
-    <style name="BaseIconUnBounded" parent="@android:style/TextAppearance.DeviceDefault">
+    <style name="BaseIconUnBounded" parent="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">match_parent</item>
         <item name="android:layout_gravity">center</item>
@@ -272,7 +271,8 @@
 
     <style name="DropTargetButton" parent="DropTargetButtonBase" />
 
-    <style name="TextHeadline" parent="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle" />
+    <style name="TextHeadline" parent="@android:style/TextAppearance.DeviceDefault" />
+
     <style name="PrimaryHeadline" parent="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle"/>
 
     <style name="TextTitle" parent="@android:style/TextAppearance.DeviceDefault" />
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 7be1138b5f..3fdcea5234 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -151,12 +151,10 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
                 R.dimen.dynamic_grid_cell_border_spacing);
         mHeaderTopPadding = context.getResources()
                 .getDimensionPixelSize(R.dimen.all_apps_header_top_padding);
-        int accentColor = Themes.getColorAccent(getContext());
-        mHeaderProtectionColor = ColorUtils.blendARGB(mScrimColor, accentColor, .3f);
+        mHeaderProtectionColor = context.getColor(R.color.all_apps_tab_bg);
 
         mLauncher.addOnDeviceProfileChangeListener(this);
 
-
         mSearchAdapterProvider = mLauncher.createSearchAdapterProvider(this);
         mSearchQueryBuilder = new SpannableStringBuilder();
         Selection.setSelection(mSearchQueryBuilder, 0);
diff --git a/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java b/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
index b5db8f441a..47328d667e 100644
--- a/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
+++ b/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
@@ -62,8 +62,7 @@ public class PersonalWorkSlidingTabStrip extends LinearLayout implements PageInd
                 R.dimen.all_apps_header_pill_corner_radius);
 
         mSelectedIndicatorPaint = new Paint();
-        mSelectedIndicatorPaint.setColor(
-                Themes.getAttrColor(context, android.R.attr.colorAccent));
+        mSelectedIndicatorPaint.setColor(context.getColor(R.color.all_apps_tab_bg));
 
         mDividerPaint = new Paint();
         mDividerPaint.setColor(Themes.getAttrColor(context, android.R.attr.colorControlHighlight));
-- 
GitLab


From 8d233cd42ab5bd2a093d76594e8b7db58449e448 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Mon, 17 May 2021 10:49:53 +0000
Subject: [PATCH 1188/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Ie6f2bc52b3b9f8af036e67d3527d2c77b89be7a0
---
 quickstep/res/values-af/strings.xml        | 30 ++++++----------
 quickstep/res/values-am/strings.xml        | 30 ++++++----------
 quickstep/res/values-ar/strings.xml        | 30 ++++++----------
 quickstep/res/values-as/strings.xml        | 12 +++----
 quickstep/res/values-az/strings.xml        | 30 ++++++----------
 quickstep/res/values-b+sr+Latn/strings.xml | 30 ++++++----------
 quickstep/res/values-be/strings.xml        | 30 ++++++----------
 quickstep/res/values-bg/strings.xml        | 30 ++++++----------
 quickstep/res/values-bn/strings.xml        | 12 +++----
 quickstep/res/values-bs/strings.xml        | 30 ++++++----------
 quickstep/res/values-ca/strings.xml        | 32 ++++++-----------
 quickstep/res/values-cs/strings.xml        | 30 ++++++----------
 quickstep/res/values-da/strings.xml        | 30 ++++++----------
 quickstep/res/values-de/strings.xml        | 30 ++++++----------
 quickstep/res/values-el/strings.xml        | 30 ++++++----------
 quickstep/res/values-en-rAU/strings.xml    | 30 ++++++----------
 quickstep/res/values-en-rCA/strings.xml    | 30 ++++++----------
 quickstep/res/values-en-rGB/strings.xml    | 30 ++++++----------
 quickstep/res/values-en-rIN/strings.xml    | 30 ++++++----------
 quickstep/res/values-es-rUS/strings.xml    | 30 ++++++----------
 quickstep/res/values-es/strings.xml        | 30 ++++++----------
 quickstep/res/values-et/strings.xml        | 30 ++++++----------
 quickstep/res/values-eu/strings.xml        | 30 ++++++----------
 quickstep/res/values-fa/strings.xml        | 30 ++++++----------
 quickstep/res/values-fi/strings.xml        | 30 ++++++----------
 quickstep/res/values-fr-rCA/strings.xml    | 30 ++++++----------
 quickstep/res/values-fr/strings.xml        | 30 ++++++----------
 quickstep/res/values-gl/strings.xml        | 30 ++++++----------
 quickstep/res/values-hi/strings.xml        | 30 ++++++----------
 quickstep/res/values-hr/strings.xml        | 30 ++++++----------
 quickstep/res/values-hu/strings.xml        | 30 ++++++----------
 quickstep/res/values-hy/strings.xml        | 30 ++++++----------
 quickstep/res/values-in/strings.xml        | 30 ++++++----------
 quickstep/res/values-is/strings.xml        | 30 ++++++----------
 quickstep/res/values-it/strings.xml        | 30 ++++++----------
 quickstep/res/values-iw/strings.xml        | 30 ++++++----------
 quickstep/res/values-ja/strings.xml        | 42 ++++++++--------------
 quickstep/res/values-ka/strings.xml        | 30 ++++++----------
 quickstep/res/values-kk/strings.xml        | 30 ++++++----------
 quickstep/res/values-km/strings.xml        | 30 ++++++----------
 quickstep/res/values-ko/strings.xml        | 30 ++++++----------
 quickstep/res/values-ky/strings.xml        | 30 ++++++----------
 quickstep/res/values-lo/strings.xml        | 30 ++++++----------
 quickstep/res/values-lt/strings.xml        | 30 ++++++----------
 quickstep/res/values-lv/strings.xml        | 30 ++++++----------
 quickstep/res/values-mk/strings.xml        | 30 ++++++----------
 quickstep/res/values-mn/strings.xml        | 30 ++++++----------
 quickstep/res/values-mr/strings.xml        | 12 +++----
 quickstep/res/values-my/strings.xml        | 30 ++++++----------
 quickstep/res/values-nb/strings.xml        | 30 ++++++----------
 quickstep/res/values-nl/strings.xml        | 30 ++++++----------
 quickstep/res/values-pl/strings.xml        | 30 ++++++----------
 quickstep/res/values-pt-rPT/strings.xml    | 30 ++++++----------
 quickstep/res/values-pt/strings.xml        | 30 ++++++----------
 quickstep/res/values-ro/strings.xml        | 30 ++++++----------
 quickstep/res/values-ru/strings.xml        | 30 ++++++----------
 quickstep/res/values-si/strings.xml        | 30 ++++++----------
 quickstep/res/values-sk/strings.xml        | 30 ++++++----------
 quickstep/res/values-sl/strings.xml        | 30 ++++++----------
 quickstep/res/values-sq/strings.xml        | 30 ++++++----------
 quickstep/res/values-sr/strings.xml        | 30 ++++++----------
 quickstep/res/values-sw/strings.xml        | 30 ++++++----------
 quickstep/res/values-ta/strings.xml        | 30 ++++++----------
 quickstep/res/values-te/strings.xml        | 12 +++----
 quickstep/res/values-th/strings.xml        | 30 ++++++----------
 quickstep/res/values-tl/strings.xml        | 30 ++++++----------
 quickstep/res/values-tr/strings.xml        | 30 ++++++----------
 quickstep/res/values-uk/strings.xml        | 30 ++++++----------
 quickstep/res/values-uz/strings.xml        | 30 ++++++----------
 quickstep/res/values-vi/strings.xml        | 30 ++++++----------
 quickstep/res/values-zh-rCN/strings.xml    | 30 ++++++----------
 quickstep/res/values-zh-rHK/strings.xml    | 30 ++++++----------
 quickstep/res/values-zh-rTW/strings.xml    | 30 ++++++----------
 quickstep/res/values-zu/strings.xml        | 30 ++++++----------
 74 files changed, 721 insertions(+), 1441 deletions(-)

diff --git a/quickstep/res/values-af/strings.xml b/quickstep/res/values-af/strings.xml
index 3ac5a370e1..69d5d1f864 100644
--- a/quickstep/res/values-af/strings.xml
+++ b/quickstep/res/values-af/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Voorspelde program: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Maak seker dat jy van die rand heel links af swiep."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Maak seker dat jy van die linkerrand na die middel van die skerm swiep en laat los."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Mooi so! Swiep nou van die regterkant om terug te gaan"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Swiep van regs na middel van skerm om terug te gaan na laaste skerm."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Maak seker dat jy van die rand heel regs af swiep."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Maak seker dat jy van die regterrand na die middel van die skerm swiep en laat los."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Jy het die \"gaan terug\"-gebaar voltooi. Nou kan jy leer hoe om tussen programme te wissel."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Jy het die \"gaan terug\"-gebaar voltooi."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Maak seker dat jy nie te naby aan die onderkant van die skerm swiep nie."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Gaan na Instellings om sensitiwiteit van teruggebaar te verander"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Swiep van links af om terug te gaan"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Swiep van linkerkant na middel van skerm om terug te gaan na laaste skerm waarop jy was."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Maak seker dat jy van die onderrand van die skerm af opswiep."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Maak seker jy onderbreek nie voordat jy laat los nie."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Maak seker jy swiep reguit op."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Jy het die \"gaan na tuisskerm\"-gebaar voltooi. Nou kan jy leer hoe om terug te gaan."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Jy het die \"gaan na tuisskerm\"-gebaar voltooi."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Swiep om na tuisskerm toe te gaan"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Swiep op van die onderkant van jou skerm af. Hierdie gebaar neem jou altyd na die tuisskerm toe."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Maak seker dat jy van die onderrand van die skerm af opswiep."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Probeer om die venster langer te hou voordat jy laat los."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Maak seker dat jy reguit opswiep en dan onderbreek."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Jy het geleer hoe om gebare te gebruik. Gaan na Instellings om gebare af te skakel."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Jy het die \"wissel tussen programme\"-gebaar voltooi."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swiep om tussen programme te wissel"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swiep op van die onderkant van jou skerm af, hou en laat los dan."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Gereed"</string>
diff --git a/quickstep/res/values-am/strings.xml b/quickstep/res/values-am/strings.xml
index 6dd34c1593..8e3fe8af08 100644
--- a/quickstep/res/values-am/strings.xml
+++ b/quickstep/res/values-am/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"የተገመተው መተግበሪያ፦ <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ከግራ ጠርዝ ጥግ ጀምሮ ማንሸራተትዎን ያረጋግጡ።"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ከግራ ጠርዝ ወደ ማያ ገጹ መሃል ማንሸራተትዎን እና መልቀቅዎን ያረጋግጡ።"</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"ጥሩ! አሁን ወደ ኋላ ለመመለስ ከቀኝ ያንሸራትቱ"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"እንዲሁም ከቀኝ ጠርዝ ወደ ማያ ገጹ መሃል በማንሸራተት ወደ መጨረሻው ማያ ገጽ መመለስ ይችላሉ።"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ከቀኝ ጠርዝ ጥግ ጀምሮ ማንሸራተትዎን ያረጋግጡ።"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ከቀኝ ጠርዝ ወደ ማያ ገጹ መሃል ማንሸራተትዎን እና መልቀቅዎን ያረጋግጡ።"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"ወደኋላ የመመለስ ምልክትን አጠናቀዋል። ቀጥሎም መተግበሪያዎችን እንዴት መቀየር እንደሚችሉ ይወቁ።"</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ወደኋላ የመመለስ ምልክትን አጠናቀዋል።"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ከማያ ገጹ ታችኛው ክፍል ጋር በጣም ጠጋ ብለው አለማንሸራተትዎን ያረጋግጡ።"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ከኋላ ስሜት ሰጭነት ደረጃ ለመለወጥ ወደ ቅንብሮች ይመለሱ"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"ወደ ኋላ ለመመለስ ከግራ ጀምረው ያንሸራትቱ"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"ወደነበሩበት የመጨረሻው ማያ ገጽ ለመመለስ ከግራ ጠርዝ ወደ ማያ ገጹ መሃል ያንሸራትቱ።"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ከማያ ገጹ የታችኛው ጫፍ ወደ ላይ ማንሸራተትዎን ያረጋግጡ።"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ከመልቀቅዎ በፊት ለአፍታ እንዳልቆሙ ያረጋግጡ።"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"በቀጥታ ወደ ላይ ማንሸራተትዎን ያረጋግጡ።"</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"የወደ መነሻ ሂድ ምልክትን አጠናቀዋል። ቀጥሎም ወደ ኋላ እንዴት መሄድ እንደሚችሉ ይወቁ።"</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"የወደ መነሻ ሂድ ምልክትን አጠናቀዋል።"</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"ወደ መነሻ ለመሄድ ያንሸራትቱ"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"ከእርስዎ ማያ ገጽ ግርጌ ላይ ወደ ላይ በጣት ጠረግ ያድርጉ። ይህ የእጅ ውዝዋዜ ሁልጊዜ ወደ መነሻ ማያ ገጽ ይወስድዎታል።"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ከማያ ገጹ የታችኛው ጫፍ ወደ ላይ ማንሸራተትዎን ያረጋግጡ።"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"ከመልቀቅዎ በፊት መስኮቱን ረዘም ላለ ጊዜ ለመያዝ ይሞክሩ።"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"በቀጥታ ወደ ላይ ማንሸራተትዎን ያረጋግጡ፣ ከዚያ ለአፍታ ያቁሙ።"</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"የእጅ ምልክቶችን እንዴት እንደሚጠቀሙ ተምረዋል። የእጅ ምልክቶችን ለማጥፋት ወደ ቅንብሮች ይሂዱ።"</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"መተግበሪያዎችን የመቀያየር ምልክትን አጠናቀዋል።"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"መተግበሪያዎችን ለመቀየር ያንሸራትቱ"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ከእርስዎ ማያ ገጽ ግርጌ ላይ ወደ ላይ በጣት ጠረግ ያድርጉ፣ ይያዙ፣ በመቀጠል ይልቀቁ።"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"ሁሉም ዝግጁ"</string>
diff --git a/quickstep/res/values-ar/strings.xml b/quickstep/res/values-ar/strings.xml
index 337fba7d71..b716419435 100644
--- a/quickstep/res/values-ar/strings.xml
+++ b/quickstep/res/values-ar/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"التطبيق المتوقع: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"تأكّد من التمرير سريعًا من أقصى الحافة اليمنى."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"تأكّد من التمرير سريعًا من الحافة اليمنى إلى وسط الشاشة ثم ارفع إصبعك."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"أحسنت. والآن مرِّر سريعًا من اليسار للرجوع."</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"يمكنك أيضًا الرجوع إلى الشاشة السابقة عن طريق التمرير سريعًا من الحافة اليسرى إلى وسط الشاشة"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"تأكّد من التمرير سريعًا من أقصى الحافة اليسرى."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"تأكّد من التمرير سريعًا من الحافة اليسرى إلى وسط الشاشة ثم ارفع إصبعك."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"لقد أكملت التدريب على إيماءة الرجوع. تعرّف بعد ذلك على كيفية التبديل بين التطبيقات."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"لقد أكملت التدريب على إيماءة الرجوع."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"تأكّد من عدم التمرير بالقرب من أسفل الشاشة."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"لتغيير مستوى حساسية إيماءة الرجوع، انتقِل إلى \"الإعدادات\""</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"مرِّر سريعًا من اليسار للرجوع."</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"للرجوع إلى الشاشة السابقة، مرِّر سريعًا من الحافة اليمنى إلى وسط الشاشة"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"تأكّد من التمرير سريعًا من الحافة السفلى للشاشة إلى أعلاها."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"تأكّد من عدم التوقّف قليلاً قبل رفع إصبعك."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"تأكّد من التمرير إلى الأعلى مباشرةً."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"أكملت التدريب على إيماءة الانتقال إلى الشاشة الرئيسية. تعرّف بعد ذلك على كيفية الرجوع."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"أكملت التدريب على إيماءة الانتقال إلى الشاشة الرئيسية."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"مرِّر سريعًا للانتقال إلى الشاشة الرئيسية"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"مرِّر سريعًا من أسفل الشاشة إلى أعلاها. تنقلك هذه الإيماءة دائمًا إلى الشاشة الرئيسية."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"تأكّد من التمرير سريعًا من الحافة السفلى للشاشة إلى أعلاها."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"حاوِل إبقاء إصبعك على النافذة لمدة أطول قبل رفعه."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"تأكّد من التمرير سريعًا للأعلى مباشرةً ثم التوقّف قليلاً."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"تعرّفت على كيفية استخدام الإيماءات. لإيقاف الإيماءات، انتقِل إلى \"الإعدادات\"."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"أكملت التدريب على إيماءة التبديل بين التطبيقات."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"مرِّر سريعًا للتبديل بين التطبيقات"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"مرِّر سريعًا من أسفل الشاشة إلى أعلاها، وأبقِ إصبعك على الشاشة قليلاً ثم ارفعه."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"اكتمل التدريب على الإيماءة"</string>
diff --git a/quickstep/res/values-as/strings.xml b/quickstep/res/values-as/strings.xml
index d152abfba0..0832b1b392 100644
--- a/quickstep/res/values-as/strings.xml
+++ b/quickstep/res/values-as/strings.xml
@@ -88,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"পুনৰ চেষ্টা কৰক"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"সুন্দৰ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"টিউট’ৰিয়েল <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"সকলো সাজু!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"গৃহ স্ক্ৰীনলৈ যাবলৈ ওপৰলৈ ছোৱাইপ কৰক"</string>
+    <string name="allset_description" msgid="6350320429953234580">"আপুনি আপোনাৰ ফ’নটো ব্যৱহাৰ কৰিবলৈ সাজু"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"সাধ্য-সুবিধাৰ বাবে নেভিগেশ্বনৰ ছেটিং"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"শ্বেয়াৰ কৰক"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"স্ক্ৰীনশ্বট"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"এপ্‌টোৱে অথবা আপোনাৰ প্ৰতিষ্ঠানে এই কাৰ্যটোৰ অনুমতি নিদিয়ে"</string>
diff --git a/quickstep/res/values-az/strings.xml b/quickstep/res/values-az/strings.xml
index ad4ad901c5..674302daaa 100644
--- a/quickstep/res/values-az/strings.xml
+++ b/quickstep/res/values-az/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Proqnozlaşdırılan tətbiq: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Ən sol tərəfdən sürüşdürdüyünüzə əmin olun."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Ekranın sol kənarından ortasına sürüşdürüb buraxın."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Əla! İndi geri qayıtmaq üçün sağdan sürüşdürün"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Həmçinin ekranın sağ kənarından ortasına sürüşdürərək son ekrana qayıda bilərsiniz."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Ən sağ tərəfdən sürüşdürdüyünüzə əmin olun."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Ekranın sağ kənarından ortasına sürüşdürüb buraxın."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Geri getmə jestini tamamladınız. Sonra tətbiqləri keçirməyi öyrənin."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Geri getmə jestini tamamladınız."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ekranın altına çox yaxın sürüşdürmədiyinizə əmin olun."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Geri qayıtma jestinin həssaslığını dəyişmək üçün Ayarlara keçin"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Geri qayıtmaq üçün soldan sürüşdürün"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Son ekrana qayıtmaq üçün ekranın sol kənarından ortasına doğru sürüşdürün."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Ekranın aşağı kənarından yuxarı sürüşdürdüyünüzə əmin olun."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Buraxmazdan əvvəl durdurmadığınıza əmin olun."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Birbaşa yuxarı sürüşdürdüyünüzə əmin olun."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Əsas səhifəyə keçmə jestini tamamladınız. Sonra geri qayıtmağı öyrənin."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Əsas səhifəyə keçmə jestini tamamladınız."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Əsas səhifəyə keçmək üçün sürüşdürün"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Ekranın aşağısından yuxarısına sürüşdürün. Bu jest həmişə Əsas səhifəyə aparır."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Ekranın aşağı kənarından yuxarı sürüşdürdüyünüzə əmin olun."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Buraxmadan əvvəl pəncərəni daha uzun müddət saxlamağa çalışın."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Birbaşa yuxarı sürüşdürdüyünüzə, sonra durdurduğunuza əmin olun."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Jestlərdən istifadə qaydasını öyrəndiniz. Jestləri deaktiv etmək üçün Ayarlara keçin."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Tətbiqləri keçirmə jestini tamamladınız."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Tətbiqi keçirmək üçün sürüşdürün"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Ekranın aşağısından yuxarı doğru sürüşdürüb saxlayın, sonra buraxın."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Tam hazır"</string>
diff --git a/quickstep/res/values-b+sr+Latn/strings.xml b/quickstep/res/values-b+sr+Latn/strings.xml
index 7298d1a1fd..4519deb30f 100644
--- a/quickstep/res/values-b+sr+Latn/strings.xml
+++ b/quickstep/res/values-b+sr+Latn/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predviđamo aplikaciju: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Obavezno prevucite od same leve ivice."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Obavezno prevucite od leve ivice do sredine ekrana i otpustite."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Svaka čast! Sada prevucite zdesna da biste se vratili"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Vratite se na poslednji ekran prevlačenjem zdesna ka sredini."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Obavezno prevucite od same desne ivice."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Obavezno prevucite od desne ivice do sredine ekrana i otpustite."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Dovršili ste pokret za povratak. Sada saznajte kako da promenite aplikacije."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Dovršili ste pokret za povratak."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nikako ne prevlačite previše blizu dna ekrana."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Osetljivost pok. za nazad možete da promenite u Podešavanjima"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Prevucite sa leve strane da biste se vratili"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Da biste se vratili na poslednji ekran, prevucite od leve ivice ka sredini ekrana."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Obavezno prevucite nagore od donje ivice ekrana."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Nikako ne stajte pre otpuštanja."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Obavezno prevucite pravo nagore."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Dovršili ste pokret za povratak na početnu stranicu. Sada saznajte kako da se vratite."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Dovršili ste pokret za povratak na početnu stranicu."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Prevucite da biste otišli na početnu stranicu"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Prevucite nagore od dna ekrana. Ovaj pokret vas uvek vodi na početni ekran."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Obavezno prevucite nagore od donje ivice ekrana."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Probajte da držite prozor duže pre otpuštanja."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Obavezno prevucite pravo nagore, pa zastanite."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Naučili ste kako da koristite pokrete. Da biste isključili pokrete, idite na podešavanja."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Dovršili ste pokret za promenu aplikacija."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Prevucite da biste promenili aplikacije"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Prevucite nagore od dna ekrana, zadržite, pa pustite."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"To je to"</string>
diff --git a/quickstep/res/values-be/strings.xml b/quickstep/res/values-be/strings.xml
index be617a482b..20e09caccc 100644
--- a/quickstep/res/values-be/strings.xml
+++ b/quickstep/res/values-be/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Праграма з падказкі: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Пераканайцеся, што вы не праводзіце пальцам занадта далёка ад левага вугла экрана."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Пераканайцеся, што праводзіце пальцам з левага вугла ў цэнтр экрана, а потым адпускаеце."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Выдатна! Каб вярнуцца, правядзіце пальцам ад правага краю"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Каб вярнуцца, правядзіце ад правага краю ў цэнтр экрана."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Пераканайцеся, што вы не праводзіце пальцам занадта далёка ад правага вугла экрана."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Пераканайцеся, што праводзіце пальцам з правага вугла ў цэнтр экрана, а потым адпускаеце."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Вы навучыліся рабіць жэст вяртання. А зараз даведайцеся, як пераключацца паміж праграмамі."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Вы навучыліся рабіць жэст вяртання."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Пераканайцеся, што вы не праводзіце пальцам занадта блізка да ніжняга краю экрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Каб змяніць адчувальнасць жэста вяртання, адкрыйце налады"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Каб вярнуцца назад, правядзіце пальцам ад левага краю"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Каб вярнуцца на папярэдні экран, правядзіце пальцам ад левага краю ў цэнтр экрана."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Пераканайцеся, што праводзіце пальцам па экране знізу ўверх."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Пераканайцеся, што не затрымліваецеся перад адпусканнем."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Пераканайцеся, што праводзіце пальцам вертыкальна."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Вы навучыліся рабіць жэст пераходу на галоўны экран. А зараз даведайцеся, як вярнуцца назад."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Вы навучыліся рабіць жэст пераходу на галоўны экран."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Правесці пальцам для пераходу на галоўны экран"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Правядзіце пальцам па экране знізу ўверх. Гэты жэст дазваляе вярнуцца на Галоўны экран."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Пераканайцеся, што праводзіце пальцам па экране знізу ўверх."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Перш чым адпусціць палец, паспрабуйце даўжэй утрымліваць акно націснутым."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Пераканайцеся, што праводзіце пальцам вертыкальна, а потым затрымліваеце яго."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Вы навучыліся выкарыстоўваць жэсты. Каб выключыць жэсты, адкрыйце Налады."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Вы навучыліся рабіць жэст пераключэння паміж праграмамі."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Правесці пальцам для пераключэння паміж праграмамі"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Правядзіце па экране знізу ўверх, утрымліваючы палец націснутым, потым адпусціце."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Гатова"</string>
diff --git a/quickstep/res/values-bg/strings.xml b/quickstep/res/values-bg/strings.xml
index a5dc2f0a36..1e02bfc608 100644
--- a/quickstep/res/values-bg/strings.xml
+++ b/quickstep/res/values-bg/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Предвидено приложение: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Трябва да прекарате пръст от най-лявата част на екрана."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Трябва да прекарате пръст от левия край на екрана до средата, след което да вдигнете пръста си."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Чудесно! Прекарайте пръст от дясно, за да се върнете назад"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Можете да се върнете на последния екран, като прекарате пръст от десния край на екрана до средата."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Трябва да прекарате пръст от най-дясната част на екрана."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Трябва да прекарате пръст от десния край на екрана до средата, след което да вдигнете пръста си."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Изпълнихте жеста за връщане назад. В следващия урок ще научите как се превключва между приложения."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Изпълнихте жеста за връщане назад."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Не прекарвайте пръст твърде близо до долната част на екрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Променете чувств. на жеста за връщане назад от настройките"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Прекарайте пръст от ляво, за да се върнете назад"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"За да се върнете на последния активен екран, прекарайте пръст от левия край на екрана до средата."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Трябва да прекарате пръст нагоре от долния край на екрана."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Не задържайте, преди да вдигнете пръста си."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Трябва да прекарате пръст право нагоре."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Изпълнихте жеста за преминаване към началния екран. В следващия урок ще научите как се връща назад."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Изпълнихте жеста за преминаване към началния екран."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Прекарване на пръст за преминаване към началния екран"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Прекарайте пръст нагоре от долната част на екрана. Този жест винаги ще ви отвежда до началния екран."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Трябва да прекарате пръст нагоре от долния край на екрана."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Задръжте прозореца по-дълго, преди да вдигнете пръста си."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Прекарайте пръст право нагоре, след което задръжте."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Научихте как да използвате жестовете. За да ги изключите, отворете настройките."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Изпълнихте жеста за превключване между приложения."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Прекарване на пръст за превключване между приложенията"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Прекарайте пръст нагоре от долната част на екрана, задръжте и след това вдигнете пръста си."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Готово"</string>
diff --git a/quickstep/res/values-bn/strings.xml b/quickstep/res/values-bn/strings.xml
index 7226c4139d..b37c56ba62 100644
--- a/quickstep/res/values-bn/strings.xml
+++ b/quickstep/res/values-bn/strings.xml
@@ -88,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"আবার চেষ্টা করুন"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"সাবাস!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"টিউটোরিয়াল <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"সব রেডি!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"হোম স্ক্রিনে যেতে উপরের দিকে সোয়াইপ করুন"</string>
+    <string name="allset_description" msgid="6350320429953234580">"এবারে আপনি ফোন ব্যবহার করতে পারবেন"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"অ্যাক্সেসিবিলিটির জন্য নেভিগেশন সেটিংস"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"শেয়ার করুন"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"স্ক্রিনশট নিন"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"এই অ্যাপ বা আপনার প্রতিষ্ঠান এই অ্যাকশনটি পারফর্ম করার অনুমতি দেয়নি"</string>
diff --git a/quickstep/res/values-bs/strings.xml b/quickstep/res/values-bs/strings.xml
index 23c3d6f842..10d8f16e6d 100644
--- a/quickstep/res/values-bs/strings.xml
+++ b/quickstep/res/values-bs/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predviđena aplikacija: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Obratite pažnju da prevučete s krajnjeg lijevog ruba."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Obratite pažnju da prevučete s lijevog ruba prema sredini ekrana, a zatim pustite."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Lijepo! Sada prevucite zdesna ulijevo da se vratite"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Na posljednji ekran se možete vratiti i prevlačenjem od desnog ruba do sredine ekrana."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Obratite pažnju da prevučete s krajnjeg desnog ruba."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Obratite pažnju da prevučete s desnog ruba prema sredini ekrana, a zatim pustite."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Završili ste pokret za vraćanje. Sljedeće naučite kako prebacivati između aplikacija."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Završili ste pokret za vraćanje."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Obratite pažnju da ne prevučete preblizu donjem dijelu ekrana."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Promijenite osjetljivost pokreta za povratak u Postavkama"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Prevucite slijeva nadesno da se vratite"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Da se vratite na posljednji ekran na kojem ste bili, prevucite od lijevog ruba do sredine ekrana."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Obratite pažnju da prevučete prema gore s donjeg ruba ekrana."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Obratite pažnju da ne zastanete prije puštanja."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Obratite pažnju da prevučete ravno prema gore."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Završili ste pokret za otvaranje Početnog ekrana. Sljedeće naučite kako se vratiti."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Završili ste pokret za otvaranje Početnog ekrana."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Prevucite da odete na početni ekran"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Prevucite s dna ekrana prema gore. Tim pokretom uvijek idete na Početni ekran."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Obratite pažnju da prevučete prema gore s donjeg ruba ekrana."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Pokušajte zadržati prozor duže prije puštanja."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Obratite pažnju da prevučete ravno prema gore, a zatim zastanite."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Naučili ste kako koristiti pokrete. Idite u Postavke da isključite pokrete."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Završili ste pokret za prebacivanje između aplikacija."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Prevucite da prebacujete između aplikacija"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Prevucite s dna ekrana prema gore, zadržite, a zatim pustite."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Sve je spremno"</string>
diff --git a/quickstep/res/values-ca/strings.xml b/quickstep/res/values-ca/strings.xml
index 24677b56c4..0b8188499b 100644
--- a/quickstep/res/values-ca/strings.xml
+++ b/quickstep/res/values-ca/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicció d\'aplicació: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Assegura\'t de lliscar des de l\'extrem esquerre de la pantalla."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Assegura\'t de lliscar des de la vora esquerra cap al centre de la pantalla i deixa anar."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Molt bé! Ara llisca des de la dreta per tornar enrere."</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"També pots tornar a la darrera pantalla lliscant des de l\'extrem dret cap al centre."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Assegura\'t de lliscar des de l\'extrem dret de la pantalla."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Assegura\'t de lliscar des de la vora dreta cap al centre de la pantalla i deixa anar."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Has completat el gest per tornar enrere. Ara, descobreix com pots canviar d\'aplicació."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Has completat el gest per tornar enrere."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Assegura\'t de no lliscar massa a prop de la part inferior de la pantalla."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Per canviar la sensibilitat del gest, ves a Configuració"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Llisca des de l\'esquerra per tornar enrere"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Per tornar a la darrera pantalla, llisca des de l\'extrem esquerre cap al centre de la pantalla."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Assegura\'t de lliscar des de la vora inferior de la pantalla."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Assegura\'t de no aturar-te abans de deixar anar."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Assegura\'t de lliscar directament cap amunt."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Has completat el gest per anar a la pantalla d\'inici. Ara, descobreix com pots tornar enrere."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Has completat el gest per anar a la pantalla d\'inici."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Llisca per anar a la pantalla d\'inici"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Llisca cap amunt des de la part inferior de la pantalla. Aquest gest et porta a la pantalla d\'inici."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Assegura\'t de lliscar des de la vora inferior de la pantalla."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Prova de mantenir premuda la finestra durant més temps abans de deixar anar."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Assegura\'t de lliscar directament cap amunt i després aturar-te."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Has après a utilitzar els gestos. Per desactivar-los, ves a Configuració."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Has completat el gest per canviar d\'aplicació."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Llisca per canviar d\'aplicació"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Llisca cap amunt des de la part inferior de la pantalla, mantén premut i deixa anar."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Tot a punt"</string>
@@ -91,7 +81,7 @@
     <string name="allset_title" msgid="5021126669778966707">"Tot a punt!"</string>
     <string name="allset_hint" msgid="459504134589971527">"Llisca cap amunt per anar a la pàgina d\'inici"</string>
     <string name="allset_description" msgid="6350320429953234580">"Ja pots començar a utilitzar el telèfon"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Configuració de navegació per utilitzar les funcions d\'accessibilitat"</annotation></string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Configuració de navegació per a accessibilitat"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Comparteix"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Captura de pantalla"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"L\'aplicació o la teva organització no permeten aquesta acció"</string>
diff --git a/quickstep/res/values-cs/strings.xml b/quickstep/res/values-cs/strings.xml
index 9bf841d2e9..d5feff7f8d 100644
--- a/quickstep/res/values-cs/strings.xml
+++ b/quickstep/res/values-cs/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Předpokládaná aplikace: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Přejeďte prstem z úplného levého okraje obrazovky."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Přejeďte prstem z levého okraje doprostřed obrazovky a zdvihněte prst."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Skvělé! Teď se přejetím prstem zprava vraťte"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Přejetím prstem z pravého okraje doprostřed obrazovky se také můžete vrátit zpět na poslední obrazovku."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Přejeďte prstem z úplného pravého okraje obrazovky."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Přejeďte prstem z pravého okraje doprostřed obrazovky a zdvihněte prst."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Dokončili jste gesto pro přechod zpět. Teď se naučíte přepínat aplikace."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Dokončili jste gesto pro přechod zpět."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Dejte pozor, abyste prstem nepřejížděli moc blízko ke spodnímu okraji obrazovky."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Citlivost gesta pro přechod zpět můžete změnit v Nastavení"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Pokud se chcete vrátit, přejeďte prstem zleva"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Na poslední obrazovku se můžete vrátit přejetím prstem z levého okraje doprostřed obrazovky."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Přejeďte prstem nahoru z dolního okraje obrazovky."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Před zdvihnutím prstu nedělejte pauzu."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Přejeďte prstem přímo nahoru."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Dokončili jste gesto pro přechod na plochu. Teď se naučíte vrátit se zpět."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Dokončili jste gesto pro přechod na plochu."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Přechod na plochu přejetím prstem"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Přejeďte prstem ze spodní části obrazovky nahoru. Tímto gestem se vždy dostanete na plochu."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Přejeďte prstem nahoru z dolního okraje obrazovky."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Zkuste podržet okno delší dobu, než ho uvolníte."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Přejeďte prstem přímo nahoru a pak udělejte pauzu."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Naučili jste se používat gesta. Gesta můžete vypnout v nastavení."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Dokončili jste gesto pro přepínání aplikací."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Přepínání aplikací přejetím prstem"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Přejeďte prstem nahoru z dolního okraje obrazovky, podržte obrazovku a potom prst uvolněte."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Vše je nastaveno"</string>
diff --git a/quickstep/res/values-da/strings.xml b/quickstep/res/values-da/strings.xml
index d917c76420..c2d94a12b6 100644
--- a/quickstep/res/values-da/strings.xml
+++ b/quickstep/res/values-da/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App, du forventes at skulle bruge: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Stryg fra kanten yderst til venstre."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Stryg fra venstre kant mod midten af skærmen, og løft fingeren."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Sådan! Prøv derefter at stryge fra højre for at gå tilbage"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Du kan også gå tilbage til den seneste skærm ved at stryge mod midten af skærmen fra højre kant."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Stryg fra kanten yderst til højre."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Stryg fra højre kant mod midten af skærmen, og løft fingeren."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Du har fuldført bevægelsen for Gå tilbage. Som det næste kan du se, hvordan du skifter app."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Du har fuldført bevægelsen for Gå tilbage."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Undgå at stryge for tæt på bunden af skærmen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Juster følsomheden for bevægelsen Gå tilbage i Indstillinger"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Stryg fra venstre for at gå tilbage"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Stryg mod midten af skærmen fra venstre kant for at gå tilbage til den seneste skærm, du var på."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Stryg opad fra bunden af skærmen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Undlad at holde fingeren stille, indtil du løfter fingeren."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Stryg lige opad."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Du har fuldført bevægelsen for Gå til startskærmen. Som det næste kan du se, hvordan du går til startskærmen."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Du har fuldført bevægelsen for Gå til startskærmen."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Stryg for at gå til startskærmen"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Stryg opad fra bunden af skærmen. Denne bevægelse åbner altid startskærmen."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Stryg opad fra bunden af skærmen."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Prøv at holde fingeren nede på vinduet i længere tid, inden du løfter den."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Stryg lige opad, og hold derefter fingeren stille."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Du har lært, hvordan du bruger bevægelser. Du kan aktivere bevægelser i Indstillinger."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Du har fuldført bevægelsen for Skift app."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Stryg for at skifte app"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Stryg opad fra bunden af skærmen, hold fingeren stille, og løft den."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Så er du klar"</string>
diff --git a/quickstep/res/values-de/strings.xml b/quickstep/res/values-de/strings.xml
index 6c00953b3e..14f123fa5d 100644
--- a/quickstep/res/values-de/strings.xml
+++ b/quickstep/res/values-de/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Vorgeschlagene App: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Wische vom äußersten linken Bildschirmrand."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Wische vom linken Bildschirmrand zur Bildschirmmitte und lass los."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Sehr gut! Wische von rechts nach links, um zurückzugehen."</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Du kannst auch zum letzten Bildschirm zurückgehen, indem du vom rechten Bildschirmrand zur Mitte wischst."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Wische vom äußersten rechten Bildschirmrand."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Wische vom rechten Bildschirmrand zur Bildschirmmitte und lass los."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Du hast die „Zurück“-Touch-Geste abgeschlossen. Gleich lernst du, wie man zwischen Apps wechselt."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Du hast die „Zurück“-Touch-Geste abgeschlossen."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Wische nicht zu nah am unteren Bildschirmrand."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Du kannst die Empfindlichkeit von „Zurück“ in den Einstellungen ändern"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Von links nach rechts wischen, um zurückzugehen"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Wenn du zum letzten Bildschirm zurückgehen möchtest, wische vom linken Bildschirmrand zur Mitte."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Wische vom unteren Bildschirmrand nach oben."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Achte darauf, nicht innezuhalten, bevor du loslässt."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Wische gerade nach oben."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Du hast die „Startbildschirm“-Touch-Geste abgeschlossen. Gleich lernst du, wie du zurückgelangst."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Du hast die „Startbildschirm“-Touch-Geste abgeschlossen."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Zum Startbildschirm gehen"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Wenn du zum Startbildschirm gehen möchtest, wische einfach vom unteren Bildschirmrand nach oben."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Wische vom unteren Bildschirmrand nach oben."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Versuche, das Fenster länger festzuhalten, bevor du es loslässt."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Wische gerade nach oben und halte dann inne."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Nun weißt du, wie Touch-Gesten funktionieren. Du kannst sie in den Einstellungen deaktivieren."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Du hast die „Apps wechseln“-Touch-Geste abgeschlossen."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Zwischen Apps wechseln"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Wische auf dem Bildschirm von unten nach oben, halte ihn gedrückt und lass ihn dann los."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Fertig"</string>
diff --git a/quickstep/res/values-el/strings.xml b/quickstep/res/values-el/strings.xml
index 9757265770..ecc574f822 100644
--- a/quickstep/res/values-el/strings.xml
+++ b/quickstep/res/values-el/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Εφαρμογή από πρόβλεψη: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Φροντίστε να σύρετε από το άκρο της αριστερής πλευράς."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Φροντίστε να σύρετε από το αριστερό άκρο προς το μέσο της οθόνης και απομακρύνετε το δάχτυλό σας."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Ωραία! Τώρα σύρετε από τα δεξιά για επιστροφή"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Μπορείτε να επιστρέψετε στην τελευταία οθόνη με σάρωση από το δεξί άκρο προς το κέντρο της οθόνης."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Φροντίστε να σύρετε από το άκρο της δεξιάς πλευράς."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Φροντίστε να σύρετε από το δεξί άκρο προς το μέσο της οθόνης και απομακρύνετε το δάχτυλό σας."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Ολοκληρώσατε την κίνηση επιστροφής. Στη συνέχεια, μάθετε πώς να κάνετε εναλλαγή εφαρμογών."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ολοκληρώσατε την κίνηση επιστροφής."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Φροντίστε να μην σύρετε υπερβολικά κοντά στο κάτω μέρος της οθόνης."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Μεταβείτε στις Ρυθμίσεις για αλλαγή ευαισθ. κίνησης επιστρ."</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Για να επιστρέψετε, σύρετε από τα αριστερά"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Για να επιστρέψετε στην τελευταία οθόνη, σύρετε από το αριστερό άκρο προς το κέντρο της οθόνης."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Φροντίστε να σύρετε προς τα επάνω από το κάτω άκρο της οθόνης."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Φροντίστε να μην κάνετε παύση προτού απομακρύνετε τα δάχτυλά σας."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Φροντίστε να σύρετε απευθείας προς τα επάνω."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Ολοκληρώσατε την κίνηση μετάβασης στην αρχική οθόνη. Στη συνέχεια, μάθετε πώς να κάνετε επιστροφή."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Ολοκληρώσατε την κίνηση μετάβασης στην αρχική οθόνη."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Σύρετε για μετάβαση στην αρχική οθόνη"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Σύρετε προς τα πάνω από το κάτω μέρος της οθόνης. Αυτή η κίνηση σάς μεταφέρει πάντα στην αρχ. οθόνη."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Φροντίστε να σύρετε προς τα επάνω από το κάτω άκρο της οθόνης."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Δοκιμάστε να κρατήσετε περισσότερο το παράθυρο προτού απελευθερώσετε."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Φροντίστε να σύρετε απευθείας προς τα επάνω και έπειτα κάντε παύση."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Μάθατε πώς να χρησιμοποιείτε κινήσεις. Μεταβείτε στις Ρυθμίσεις για απενεργοποίηση των κινήσεων."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Ολοκληρώσατε την κίνηση εναλλαγής εφαρμογών."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Σύρετε για εναλλαγή εφαρμογών"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Σύρετε προς τα πάνω από το κάτω μέρος της οθόνης σας, κρατήστε παρατεταμένα και έπειτα ελευθερώστε."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Όλα είναι έτοιμα"</string>
diff --git a/quickstep/res/values-en-rAU/strings.xml b/quickstep/res/values-en-rAU/strings.xml
index c47dc57634..882f98a53e 100644
--- a/quickstep/res/values-en-rAU/strings.xml
+++ b/quickstep/res/values-en-rAU/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicted app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Make sure that you swipe from the far-left edge."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Make sure that you swipe from the left edge to the middle of the screen and let go."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Nice! Now swipe from the right to go back"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"You can also go back to the last screen by swiping from the right edge to the middle of the screen."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Make sure that you swipe from the far-right edge."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Make sure that you swipe from the right edge to the middle of the screen and let go."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"You completed the go back gesture. Next, learn how to switch apps."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"You completed the go back gesture."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"To change sensitivity of the back gesture, go to Settings"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Swipe from the left to go back"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"To go back to the last screen you were on, swipe from the left edge to the middle of the screen."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Make sure that you don\'t pause before letting go."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Make sure that you swipe straight up."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"You completed the go home gesture. Next, learn how to go back."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"You completed the go home gesture."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Swipe to go home"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Swipe up from the bottom of your screen. This gesture always takes you to the home screen."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Try holding the window for longer before releasing."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Make sure that you swipe straight up, then pause."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"You learned how to use gestures. To turn off gestures, go to settings."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"You completed the switch apps gesture."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe to switch apps"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swipe up from the bottom of your screen, hold, then release."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"All set"</string>
diff --git a/quickstep/res/values-en-rCA/strings.xml b/quickstep/res/values-en-rCA/strings.xml
index c47dc57634..882f98a53e 100644
--- a/quickstep/res/values-en-rCA/strings.xml
+++ b/quickstep/res/values-en-rCA/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicted app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Make sure that you swipe from the far-left edge."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Make sure that you swipe from the left edge to the middle of the screen and let go."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Nice! Now swipe from the right to go back"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"You can also go back to the last screen by swiping from the right edge to the middle of the screen."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Make sure that you swipe from the far-right edge."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Make sure that you swipe from the right edge to the middle of the screen and let go."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"You completed the go back gesture. Next, learn how to switch apps."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"You completed the go back gesture."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"To change sensitivity of the back gesture, go to Settings"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Swipe from the left to go back"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"To go back to the last screen you were on, swipe from the left edge to the middle of the screen."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Make sure that you don\'t pause before letting go."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Make sure that you swipe straight up."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"You completed the go home gesture. Next, learn how to go back."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"You completed the go home gesture."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Swipe to go home"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Swipe up from the bottom of your screen. This gesture always takes you to the home screen."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Try holding the window for longer before releasing."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Make sure that you swipe straight up, then pause."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"You learned how to use gestures. To turn off gestures, go to settings."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"You completed the switch apps gesture."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe to switch apps"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swipe up from the bottom of your screen, hold, then release."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"All set"</string>
diff --git a/quickstep/res/values-en-rGB/strings.xml b/quickstep/res/values-en-rGB/strings.xml
index c47dc57634..882f98a53e 100644
--- a/quickstep/res/values-en-rGB/strings.xml
+++ b/quickstep/res/values-en-rGB/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicted app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Make sure that you swipe from the far-left edge."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Make sure that you swipe from the left edge to the middle of the screen and let go."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Nice! Now swipe from the right to go back"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"You can also go back to the last screen by swiping from the right edge to the middle of the screen."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Make sure that you swipe from the far-right edge."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Make sure that you swipe from the right edge to the middle of the screen and let go."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"You completed the go back gesture. Next, learn how to switch apps."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"You completed the go back gesture."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"To change sensitivity of the back gesture, go to Settings"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Swipe from the left to go back"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"To go back to the last screen you were on, swipe from the left edge to the middle of the screen."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Make sure that you don\'t pause before letting go."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Make sure that you swipe straight up."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"You completed the go home gesture. Next, learn how to go back."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"You completed the go home gesture."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Swipe to go home"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Swipe up from the bottom of your screen. This gesture always takes you to the home screen."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Try holding the window for longer before releasing."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Make sure that you swipe straight up, then pause."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"You learned how to use gestures. To turn off gestures, go to settings."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"You completed the switch apps gesture."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe to switch apps"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swipe up from the bottom of your screen, hold, then release."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"All set"</string>
diff --git a/quickstep/res/values-en-rIN/strings.xml b/quickstep/res/values-en-rIN/strings.xml
index c47dc57634..882f98a53e 100644
--- a/quickstep/res/values-en-rIN/strings.xml
+++ b/quickstep/res/values-en-rIN/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicted app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Make sure that you swipe from the far-left edge."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Make sure that you swipe from the left edge to the middle of the screen and let go."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Nice! Now swipe from the right to go back"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"You can also go back to the last screen by swiping from the right edge to the middle of the screen."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Make sure that you swipe from the far-right edge."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Make sure that you swipe from the right edge to the middle of the screen and let go."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"You completed the go back gesture. Next, learn how to switch apps."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"You completed the go back gesture."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"To change sensitivity of the back gesture, go to Settings"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Swipe from the left to go back"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"To go back to the last screen you were on, swipe from the left edge to the middle of the screen."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Make sure that you don\'t pause before letting go."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Make sure that you swipe straight up."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"You completed the go home gesture. Next, learn how to go back."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"You completed the go home gesture."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Swipe to go home"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Swipe up from the bottom of your screen. This gesture always takes you to the home screen."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Try holding the window for longer before releasing."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Make sure that you swipe straight up, then pause."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"You learned how to use gestures. To turn off gestures, go to settings."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"You completed the switch apps gesture."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe to switch apps"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swipe up from the bottom of your screen, hold, then release."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"All set"</string>
diff --git a/quickstep/res/values-es-rUS/strings.xml b/quickstep/res/values-es-rUS/strings.xml
index 1b55b2dddd..f8aa17d9f1 100644
--- a/quickstep/res/values-es-rUS/strings.xml
+++ b/quickstep/res/values-es-rUS/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicción de app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Asegúrate de deslizar el dedo bien desde el borde izquierdo."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Asegúrate de deslizar el dedo del borde izquierdo hacia el centro de la pantalla y, luego, suéltalo."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"¡Genial! Ahora, desliza el dedo desde la derecha para volver"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Desliza de derecha al centro para volver a última pantalla."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Asegúrate de deslizar el dedo bien desde el borde derecho."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Asegúrate de deslizar el dedo del borde derecho hacia el centro de la pantalla y, luego, suéltalo."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Completaste el gesto \"Atrás\". A continuación, obtén información para cambiar de app."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Completaste el gesto \"Atrás\"."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Asegúrate de no hacerlo muy cerca de la parte inferior de la pantalla."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Cambia sensibilidad de gesto \"Atrás\" en Configuración"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Para volver, desliza el dedo desde la izquierda"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Para volver a la última pantalla, desliza el dedo del borde izquierdo al centro de la pantalla."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Asegúrate de deslizar el dedo hacia arriba desde la borde inferior de la pantalla."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Asegúrate de no detenerte antes de soltarlo."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Asegúrate de deslizar el dedo derecho hacia arriba."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Completaste el gesto para ir a la página principal. A continuación, obtén información para volver."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Completaste el gesto para ir a la página principal."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Desliza el dedo para ir a la página principal"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Desliza el dedo hacia arriba desde la parte inferior de la pantalla. Este gesto te llevará siempre a la pantalla principal."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Asegúrate de deslizar el dedo hacia arriba desde la borde inferior de la pantalla."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Prueba mantener presionada la ventana más tiempo antes de soltarla."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Asegúrate de deslizar el dedo derecho hacia arriba y, luego, detente."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Ya sabes cómo usar los gestos. Para desactivarlos, ve a Configuración."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Completaste el gesto para cambiar de app."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Desliza el dedo para cambiar de app"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Desliza el dedo hacia arriba desde la parte inferior de la pantalla, mantenlo presionado y, luego, suéltalo."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Listo"</string>
diff --git a/quickstep/res/values-es/strings.xml b/quickstep/res/values-es/strings.xml
index f803990ca4..9be5db1c7b 100644
--- a/quickstep/res/values-es/strings.xml
+++ b/quickstep/res/values-es/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplicación sugerida: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Desliza el dedo desde el extremo izquierdo."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Desliza el dedo desde el borde izquierdo de la pantalla hasta el centro y levántalo."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"¡Muy bien! Desliza el dedo desde la derecha para volver"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"También puedes deslizar el dedo del borde derecho al centro para volver a la pantalla anterior."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Desliza el dedo desde el extremo derecho."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Desliza el dedo desde el borde derecho de la pantalla hasta el centro y levántalo."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Has completado el gesto para volver. Ahora, descubre cómo cambiar de aplicación."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Has completado el gesto para volver."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"No deslices el dedo demasiado cerca de la parte inferior de la pantalla."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Para cambiar la sensibilidad del gesto, ve a Ajustes"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Desliza el dedo desde la izquierda para volver"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Si quieres volver a la pantalla anterior, desliza el dedo del borde izquierdo al centro."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Desliza el dedo hacia arriba desde el borde inferior de la pantalla."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"No hagas ninguna pausa antes de levantar el dedo."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Desliza el dedo directamente hacia arriba."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Has completado el gesto para ir a la pantalla de inicio. Ahora, descubre cómo volver."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Has completado el gesto para ir a la pantalla de inicio."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Desliza el dedo para ir a la pantalla de inicio"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Desliza hacia arriba desde la parte inferior. Con este gesto, siempre irás a la pantalla de inicio."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Desliza el dedo hacia arriba desde el borde inferior de la pantalla."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Prueba a mantener pulsada la ventana durante más tiempo antes de soltarla."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Desliza el dedo directamente hacia arriba y luego mantenlo pulsado."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Ya sabes cómo utilizar gestos. Para desactivarlos, ve a Configuración."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Has completado el gesto para cambiar de aplicación."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Deslizar el dedo para cambiar de aplicación"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Desliza el dedo hacia arriba desde la parte inferior de la pantalla, mantenlo pulsado y levántalo."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Todo listo"</string>
diff --git a/quickstep/res/values-et/strings.xml b/quickstep/res/values-et/strings.xml
index 28dcdca0cb..9241d30f7f 100644
--- a/quickstep/res/values-et/strings.xml
+++ b/quickstep/res/values-et/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Ennustatud rakendus: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pühkige kindlasti vasakpoolsest servast."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pühkige ekraanikuva vasakust servast keskele ja eemaldage sõrm."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Tubli töö! Nüüd pühkige tagasiliikumiseks paremalt vasakule."</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Eelmisele ekraanikuvale naasmiseks võite ka ekraanikuva paremast servast keskele pühkida."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pühkige kindlasti parempoolsest servast."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pühkige ekraanikuva paremast servast keskele ja eemaldage sõrm."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Tegite tagasiliikumise liigutuse. Järgmisena vaadake, kuidas rakenduste vahel vahetada."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Tegite tagasiliikumise liigutuse."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Veenduge, et te ei pühiks liiga ekraanikuva allosa lähedalt."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Tagasiliigutuse tundlikkuse muutmiseks avage menüü Seaded"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Tagasiliikumiseks pühkige vasakult paremale"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Eelmisele ekraanikuvale naasmiseks pühkige vasakust servast ekraanikuva keskele."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pühkige kindlasti ekraanikuva alumisest servast üles."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Veenduge, et te enne vabastamist liigutust ei peataks."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pühkige kindlasti otse üles."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Tegite avakuvale minemise liigutuse. Järgmisena vaadake, kuidas minna tagasi."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Tegite avakuvale minemise liigutuse."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Pühkimine avakuvale minemiseks"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Pühkige ekraani alaosast üles. See liigutus viib teid alati tagasi avakuvale."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Pühkige kindlasti ekraanikuva alumisest servast üles."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Hoidke sõrme aknal pisut kauem, enne kui vabastate."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Pühkige kindlasti otse üles, seejärel peatuge."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Õppisite liigutusi kasutama. Liigutuste väljalülitamiseks avage seaded."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Tegite rakenduste vahel vahetamise liigutuse."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Rakenduste vahel vahetamiseks pühkimine"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Pühkige ekraanikuva alaosast üles, hoidke ja seejärel vabastage."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Valmis"</string>
diff --git a/quickstep/res/values-eu/strings.xml b/quickstep/res/values-eu/strings.xml
index a8ae3848c0..f810b4282e 100644
--- a/quickstep/res/values-eu/strings.xml
+++ b/quickstep/res/values-eu/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Iragarritako aplikazioa: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Ziurtatu hatza ezkerreko ertzetik pasatzen duzula."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Ziurtatu hatza pantailaren ezkerreko ertzetik erdialdera pasatzen eta askatzen duzula."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Ederki! Orain, atzera egiteko, pasatu hatza eskuinetik."</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Aurreko pantailara itzultzeko beste modu bat: pasatu hatza pantailaren eskuineko ertzetik erdialdera."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Ziurtatu hatza eskuineko ertzetik pasatzen duzula."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Ziurtatu hatza pantailaren eskuineko ertzetik erdialdera pasatzen eta askatzen duzula."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Ikasi duzu atzera egiteko keinua. Jarraian, ikasi aplikazioa aldatzen."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ikasi duzu atzera egiteko keinua."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ziurtatu hatza ez duzula pantailaren behealdetik gertuegi pasatzen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Keinuaren sentikortasuna aldatzeko, joan ezarpenetara"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Atzera egiteko, pasatu hatza ezkerretik"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Aurreko pantailara itzultzeko, pasatu hatza pantailaren ezkerreko ertzetik erdialdera."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Ziurtatu hatza pantailaren beheko ertzetik gora pasatzen duzula."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Ziurtatu askatu aurretik ez duzula hatza gelditzen."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Ziurtatu hatza zuzen gora pasatzen duzula."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Ikasi duzu hasierako pantailara joateko keinua. Jarraian, ikasi atzera egiten."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Ikasi duzu hasierako pantailara joateko keinua."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Pasatu hatza hasierako pantailara joateko"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Pasatu hatza pantailaren behealdetik gora. Keinu horrek hasierako pantailara eramango zaitu beti."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Ziurtatu hatza pantailaren beheko ertzetik gora pasatzen duzula."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Eduki sakatuta leihoa luzaroago hatza altxatu aurretik."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Ziurtatu hatza zuzen gora pasatzen duzula; ondoren, gelditu."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Ikasi duzu keinuak erabiltzen. Keinuak desaktibatzeko, joan ezarpenetara."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Ikasi duzu aplikazioa aldatzeko keinua."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Pasatu hatza aplikazioa aldatzeko"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Pasatu hatza pantailaren behealdetik gora, eduki pantaila sakatuta eta altxatu hatza."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Dena prest"</string>
diff --git a/quickstep/res/values-fa/strings.xml b/quickstep/res/values-fa/strings.xml
index 670ca2e3c0..ccde33a31d 100644
--- a/quickstep/res/values-fa/strings.xml
+++ b/quickstep/res/values-fa/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"برنامه پیش‌بینی‌شده: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"دقت کنید که از ابتدای لبه سمت چپ تند بکشید."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"دقت کنید که از لبه سمت چپ تند به وسط صفحه بکشید و رها کنید."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"عالی! اکنون از سمت راست تند بکشید تا به عقب بروید"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"با تند کشیدن از لبه سمت راست به وسط صفحه هم می‌توانید به عقب بروید."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"دقت کنید که از ابتدای لبه سمت راست تند بکشید."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"دقت کنید که از لبه سمت راست تند به وسط صفحه بکشید و رها کنید."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"اشاره برگشتن را تکمیل کردید. مورد بعدی، با نحوه جابه‌جا شدن بین برنامه‌ها آشنا شوید."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"اشاره برگشتن را تکمیل کردید."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"دقت کنید که موقع تند کشیدن بیش‌از حد به پایین صفحه نزدیک نشوید."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"برای تغییر حساسیت اشاره برگشت، به «تنظیمات» بروید"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"برای برگشتن به عقب، از سمت چپ تند بکشید"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"برای برگشتن به آخرین صفحه‌ای که در آن بودید، از لبه سمت چپ تند به وسط صفحه بکشید."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"دقت کنید که از لبه پایینی صفحه تند به بالا بکشید."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"دقت کنید که تا قبل‌از رها کردن، کشیدن را متوقف نکنید."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"دقت کنید که مستقیماً تند به بالا بکشید."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"اشاره رفتن به «صفحه اصلی» را تکمیل کردید. مورد بعدی، با نحوه برگشتن به عقب آشنا شوید."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"اشاره رفتن به «صفحه اصلی» را تکمیل کردید."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"تند کشیدن برای رفتن به صفحه اصلی"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"از پایین صفحه، تند به‌سمت بالا بکشید. این اشاره همیشه شما را به صفحه اصلی می‌برد."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"دقت کنید که از لبه پایینی صفحه تند به بالا بکشید."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"سعی کنید قبل‌از رها کردن، پنجره را برای مدت طولانی‌تری نگه دارید."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"دقت کنید که مستقیماً تند به بالا بکشید و سپس توقف کنید."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"با نحوه استفاده از اشاره‌ها آشنا شدید. برای خاموش کردن اشاره‌ها، به «تنظیمات» بروید."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"اشاره جابه‌جا شدن بین برنامه‌ها را تکمیل کردید."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"تند کشیدن برای جابه‌جا شدن بین برنامه‌ها"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"از پایین صفحه‌نمایش تند به‌سمت بالا بکشید، نگه دارید، و سپس رها کنید."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"همه چیز آماده است"</string>
diff --git a/quickstep/res/values-fi/strings.xml b/quickstep/res/values-fi/strings.xml
index c70e0c6957..e903138770 100644
--- a/quickstep/res/values-fi/strings.xml
+++ b/quickstep/res/values-fi/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Ennakoitu sovellus: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Muista pyyhkäistä aivan vasemmasta reunasta."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pyyhkäise näytön vasemmasta reunasta keskelle ja päästä irti."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Hienoa! Palaa nyt takaisin pyyhkäisemällä oikeasta reunasta"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Voit myös palata edelliseen näkymään pyyhkäisemällä näytön oikeasta reunasta keskelle."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Muista pyyhkäistä aivan oikeasta reunasta."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pyyhkäise näytön oikeasta reunasta keskelle ja päästä irti."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Olet oppinut Takaisin-eleen. Opettele seuraavaksi vaihtamaan sovellusta."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Olet oppinut Takaisin-eleen."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Varo, ettet pyyhkäise liian lähellä alareunaa."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Voit muuttaa Takaisin-eleen herkkyyttä asetuksista"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Palaa takaisin pyyhkäisemällä vasemmasta reunasta"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Voit palata edelliseen näkymään pyyhkäisemällä näytön vasemmasta reunasta keskelle."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pyyhkäise ylös näytön alareunasta."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Varo keskeyttämästä ennen kuin päästät irti."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Muista pyyhkäistä suoraan ylöspäin."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Olet oppinut aloitusnäytölle palaamiseleen. Opettele seuraavaksi siirtymään takaisin."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Olet oppinut aloitusnäytölle palaamiseleen."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Siirry aloitusnäytölle pyyhkäisemällä"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Pyyhkäise ylös näytön alareunasta. Tämä ele vie sinut aina aloitusnäytölle."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Pyyhkäise ylös näytön alareunasta."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Kokeile pitää ikkunaa painettuna pidempään ennen kuin päästät irti."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Muista pyyhkäistä suoraan ylöspäin ja keskeytä sitten."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Olet oppinut käyttämään eleitä. Jos haluat laittaa eleet pois päältä, avaa Asetukset."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Olet oppinut sovellusten vaihtamiseleen."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Vaihda sovellusta pyyhkäisemällä"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Pyyhkäise ylöspäin näytön alareunasta ja päästä irti."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Valmista"</string>
diff --git a/quickstep/res/values-fr-rCA/strings.xml b/quickstep/res/values-fr-rCA/strings.xml
index b4375df6b7..1aa67e033a 100644
--- a/quickstep/res/values-fr-rCA/strings.xml
+++ b/quickstep/res/values-fr-rCA/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Application prédite : <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Assurez-vous de balayer l\'écran à partir de l\'extrémité gauche."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Assurez-vous de balayer l\'écran de l\'extrémité gauche jusqu\'au centre, puis de lever le doigt."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Bien! Maintenant, balayez à partir de la droite pour revenir."</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Vous pouvez aussi revenir à l\'écran précédent en balayant du côté droit jusqu\'au centre de l\'écran."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Assurez-vous de balayer l\'écran à partir de l\'extrémité droite."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Assurez-vous de balayer l\'écran de l\'extrémité droite jusqu\'au centre, puis de lever le doigt."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Vous avez appris le geste de retour. Ensuite, vous apprendrez comment basculer entre les applications."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Vous avez appris le geste de retour."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Assurez-vous de ne pas balayer trop près du bas de l\'écran."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Modifiez la sensibilité du geste de retour dans Paramètres"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Balayez l\'écran vers la gauche pour revenir en arrière"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Pour revenir à l\'écran précédent, balayez du côté gauche jusqu\'au centre de l\'écran."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Assurez-vous de balayer l\'écran à partir de l\'extrémité inférieure vers le haut."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Assurez-vous de ne pas interrompre le geste avant de lever le doigt."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Assurez-vous de balayer l\'écran en ligne droite vers le haut."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Vous avez appris le geste pour revenir à l\'écran d\'accueil. Apprenez ensuite à revenir en arrière."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Vous avez appris le geste pour revenir à l\'écran d\'accueil."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Balayer pour revenir à l\'écran d\'accueil"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Balayez l\'écran du bas vers le haut. Ce geste vous ramène toujours à l\'écran d\'accueil."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Assurez-vous de balayer l\'écran à partir de l\'extrémité inférieure vers le haut."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Essayez de tenir la fenêtre plus longtemps avant de relâcher."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Assurez-vous de balayer l\'écran vers le haut, puis de faire une pause."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Vous avez appris à utiliser les gestes. Pour les désactiver, accédez au menu Paramètres."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Vous avez appris le geste pour basculer entre les applications."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Balayer pour basculer entre les applications"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Balayez l\'écran de bas en haut, maintenez le doigt en place, puis relâchez-le."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Terminé"</string>
diff --git a/quickstep/res/values-fr/strings.xml b/quickstep/res/values-fr/strings.xml
index c00e02cc5b..e010152da4 100644
--- a/quickstep/res/values-fr/strings.xml
+++ b/quickstep/res/values-fr/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Application prédite : <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Veillez à balayer l\'écran depuis le bord gauche."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Veillez à bien balayer l\'écran depuis le bord gauche jusqu\'au centre avant de relever le doigt."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Bravo ! Pour revenir en arrière, balayez l\'écran depuis la droite."</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Pour revenir à l\'écran précédent, balayez l\'écran depuis le bord droit jusqu\'au centre."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Veillez à balayer l\'écran depuis le bord droit."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Veillez à bien balayer l\'écran depuis le bord droit jusqu\'au centre avant de relever le doigt."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Vous avez appris le geste pour revenir en arrière. Apprenez ensuite à passer d\'une appli à l\'autre."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Vous avez appris le geste pour revenir en arrière."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Veillez à ne pas balayer l\'écran trop près du bas."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Modifiez la sensibilité du geste retour dans les paramètres"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Balayez l\'écran depuis le bord gauche pour revenir en arrière"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Pour revenir à l\'écran précédent, balayez l\'écran depuis le bord gauche jusqu\'au centre."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Veillez à balayer l\'écran du bas vers le haut."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Veillez à ne pas marquer de pause dans votre geste avant de relever le doigt."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Veillez à balayer l\'écran vers le haut."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Vous avez appris le geste pour revenir à l\'écran d\'accueil. Apprenez ensuite à revenir en arrière."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Vous avez appris le geste pour revenir à l\'écran d\'accueil."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Balayer pour revenir à l\'écran d\'accueil"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Balayez l\'écran de bas en haut. Ce geste vous ramènera toujours à l\'écran d\'accueil."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Veillez à balayer l\'écran du bas vers le haut."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Essayez d\'appuyer plus longtemps sur la fenêtre avant de relever le doigt."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Veillez à balayer l\'écran vers le haut et à marquer une pause dans votre geste."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Vous avez appris à utiliser les gestes. Pour les désactiver, accédez aux paramètres."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Vous avez appris le geste pour passer d\'une appli à l\'autre."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Balayer pour passer d\'une appli à l\'autre"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Balayez l\'écran du bas vers le haut, appuyez de manière prolongée, puis relevez le doigt."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Vous avez terminé"</string>
diff --git a/quickstep/res/values-gl/strings.xml b/quickstep/res/values-gl/strings.xml
index 31c2c330e3..eddca5d5af 100644
--- a/quickstep/res/values-gl/strings.xml
+++ b/quickstep/res/values-gl/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplicación predita: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Asegúrate de pasar o dedo desde o bordo esquerdo máis afastado."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Asegúrate de pasar o dedo desde o bordo esquerdo ata o medio da pantalla e avanza."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Excelente! Agora pasa o dedo desde a dereita para volver"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Podes volver á última pantalla pasando o dedo desde o bordo dereito ata a metade da pantalla."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Asegúrate de pasar o dedo desde o bordo dereito máis afastado."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Asegúrate de pasar o dedo desde o bordo dereito ata o medio da pantalla e avanza."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Completaches o xesto de volver á última pantalla. O próximo é aprender a cambiar de aplicación."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Completaches o xesto de volver á última pantalla."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Asegúrate de non pasar o dedo demasiado preto da parte inferior da pantalla."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Podes cambiar a sensibilidade do xesto en Configuración"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Pasa o dedo desde a esquerda para volver"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Para volver á última pantalla, pasa o dedo desde o bordo esquerdo ata a metade da pantalla."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Asegúrate de pasar o dedo cara arriba desde o bordo inferior da pantalla."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Asegúrate de non facer unha pausa antes de avanzar."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Asegúrate de pasar o dedo cara arriba cun movemento vertical."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Completaches o xesto de ir ao inicio. O próximo é aprender a volver á última pantalla."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Completaches o xesto de ir ao inicio."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Pasar o dedo para ir ao inicio"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Pasa o dedo cara arriba desde a parte inferior da pantalla. Ao facelo, irás á pantalla de inicio."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Asegúrate de pasar o dedo cara arriba desde o bordo inferior da pantalla."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Proba a manter premida a pantalla máis tempo antes de soltala."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Asegúrate de pasar o dedo cara arriba cun movemento vertical. Despois, fai unha pausa."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Aprendiches a usar os xestos. Para desactivalos, vai a Configuración."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Completaches o xesto para cambiar de aplicación."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Pasar o dedo para cambiar de aplicación"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Pasa o dedo cara arriba desde a parte inferior da pantalla, mantena premida e sepárao."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Todo listo"</string>
diff --git a/quickstep/res/values-hi/strings.xml b/quickstep/res/values-hi/strings.xml
index 133c200ee8..fdf62a7fef 100644
--- a/quickstep/res/values-hi/strings.xml
+++ b/quickstep/res/values-hi/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"सुझाया गया ऐप्लिकेशन: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"देख लें कि आप स्क्रीन की बाईं तरफ़ के बिल्कुल किनारे से स्वाइप कर रहे हों."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"देख लें कि आप स्क्रीन के बाएं किनारे से बीचों-बीच तक स्वाइप कर रहे हों और फिर अपनी उंगली उठा लें."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"बढ़िया! अब वापस जाने के लिए, स्क्रीन के दाएं किनारे से स्वाइप करें"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"आप दाएं किनारे से स्क्रीन के बीच तक स्वाइप करके भी पिछली स्क्रीन पर जा सकते हैं."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"देख लें कि आप स्क्रीन की दाईं तरफ़ के बिल्कुल किनारे से स्वाइप कर रहे हों."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"देख लें कि आप स्क्रीन के दाएं किनारे से बीचों-बीच तक स्वाइप कर रहे हों और फिर अपनी उंगली उठा लें."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"आपने पीछे ले जाने वाले हाथ के जेस्चर के बारे में जान लिया है. एक ऐप से दूसरे पर जाने का तरीका जानें."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"आपने पेज पर पीछे ले जाने वाले हाथ के जेस्चर (हाव-भाव) के बारे में जान लिया है."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"देखे लें कि आप स्क्रीन पर बिल्कुल नीचे तक स्वाइप न कर रहे हों."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"\'सेटिंग\' में जाकर, पीछे जाने के लिए इस्तेमाल होने वाले हाथ के जेस्चर (हाव-भाव) की संवेदनशीलता बदलें"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"वापस जाने के लिए, स्क्रीन के बाएं किनारे से स्वाइप करें"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"पिछली स्क्रीन पर वापस जाने के लिए, बाएं किनारे से स्क्रीन के बीच तक स्वाइप करें."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"देख लें कि आप स्क्रीन के निचले किनारे से ऊपर की ओर स्वाइप कर रहे हों."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"देख लें कि आप स्क्रीन से अपनी उंगली उठाने से पहले, इसे कहीं न रोक रहे हों."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"देख लें कि आप ऊपर की ओर बिल्कुल सीधे स्वाइप कर रहे हों."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"आपने होम स्क्रीन पर ले जाने वाले हाथ के जेस्चर के बारे में जान लिया है. अब, वापस जाने का तरीका जानें."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"आपने होम स्क्रीन पर ले जाने वाले हाथ के जेस्चर (हाव-भाव) के बारे में जान लिया है."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"होम स्क्रीन पर जाने के लिए स्वाइप करें"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"स्क्रीन पर नीचे से ऊपर की ओर स्वाइप करें. हाथ का यह जेस्चर आपको हमेशा होम स्क्रीन पर ले जाता है."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"देख लें कि आप स्क्रीन के निचले किनारे से ऊपर की ओर स्वाइप कर रहे हों."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"कोशिश करें कि स्क्रीन से उंगली उठाने से पहले, इसे कुछ देर स्क्रीन पर दबाकर रखें."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"देख लें कि आप स्क्रीन पर ऊपर की तरफ़, बिल्कुल सीधे स्वाइप कर रहे हों और फिर रुकें."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"आपने हाथ के जेस्चर (हाव-भाव) को इस्तेमाल करना सीख लिया है. जेस्चर बंद करने के लिए, सेटिंग में जाएं."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"आपने एक ऐप्लिकेशन से दूसरे पर जाने के लिए इस्तेमाल होने वाले हाथ के जेस्चर के बारे में जान लिया है."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"एक ऐप्लिकेशन से दूसरे पर जाने के लिए स्वाइप करें"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"अपनी स्क्रीन पर नीचे से ऊपर की तरफ़ स्वाइप करें, दबाकर रखें, फिर छोड़ दें."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"आप पूरी तरह तैयार हैं"</string>
diff --git a/quickstep/res/values-hr/strings.xml b/quickstep/res/values-hr/strings.xml
index 583c006f07..7c50ae2af5 100644
--- a/quickstep/res/values-hr/strings.xml
+++ b/quickstep/res/values-hr/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predviđena aplikacija: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pazite da prijeđete prstom od krajnjeg lijevog ruba."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pazite da prijeđete prstom od lijevog ruba do sredine zaslona i podignite prst."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Odlično! Prijeđite prstom zdesna ulijevo da biste se vratili"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Na posljednji se zaslon možete vratiti i prelaskom od desnog ruba do sredine zaslona."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pazite da prijeđete prstom od krajnjeg desnog ruba."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pazite da prijeđete prstom od desnog ruba do sredine zaslona i podignite prst."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Izvršili ste pokret za povratak. Sad saznajte kako promijeniti aplikaciju."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Izvršili ste pokret za povratak."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pazite da ne prijeđete prstom preblizu dnu zaslona."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Osjetljivost pokreta povratka promijenite u postavkama"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Prijeđite prstom slijeva udesno da biste se vratili"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Da biste se vratili na posljednji posjećeni zaslon, prijeđite od lijevog ruba do sredine zaslona."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pazite da prijeđete prstom prema gore od donjeg ruba zaslona."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pazite da ne zastanete prije podizanja prsta."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pazite da prijeđete prstom ravno prema gore."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Izvršili ste pokret za otvaranje početnog zaslona. Sad saznajte kako se vratiti."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Izvršili ste pokret za otvaranje početnog zaslona."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Prijeđite prstom da biste otvorili početni zaslon"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Prijeđite prstom od dna zaslona prema gore. Tim pokretom uvijek će se otvoriti početni zaslon."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Pazite da prijeđete prstom prema gore od donjeg ruba zaslona."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Pokušajte zadržati prozor dulje prije podizanja prsta."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Pazite da prijeđete prstom ravno prema gore, a zatim zastanete."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Naučili ste koristiti pokrete. Pokrete možete isključiti u postavkama."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Izvršili ste pokret za promjenu aplikacije."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Prijeđite prstom da biste promijenili aplikaciju"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Prijeđite prstom od dna zaslona prema gore, zadržite pritisak pa podignite prst."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Sve je spremno"</string>
diff --git a/quickstep/res/values-hu/strings.xml b/quickstep/res/values-hu/strings.xml
index 457556014b..6436738cac 100644
--- a/quickstep/res/values-hu/strings.xml
+++ b/quickstep/res/values-hu/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Várható alkalmazás: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Csúsztasson a képernyő bal széléről."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Csúsztasson a képernyő bal széléről a képernyő közepéig, és engedje el a képernyőt."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Remek! Most csúsztasson jobbról a visszalépéshez."</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"A képernyő jobb széléről a képernyő közepéig csúsztatva is visszatérhet a legutóbbi képernyőre."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Csúsztasson a képernyő jobb széléről."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Csúsztasson a képernyő jobb széléről a képernyő közepéig, és engedje el a képernyőt."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Teljesítette a visszalépési kézmozdulatot. Most megtanulhatja, hogyan válthat az appok között."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Teljesítette a visszalépési kézmozdulatot."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ne csúsztasson túl közel a képernyő aljához."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"A vissza mozdulat érzékenysége a Beállításokban módosítható"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"A visszalépéshez csúsztasson balról jobbra"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Ha visszatérne a legutóbbi képernyőre, csúsztasson a képernyő közepére a bal szélétől."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Csúsztasson felfelé a képernyő aljától."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Ne álljon meg, mielőtt elengedi a képernyőt."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Csúsztasson egyenesen felfelé."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Teljesítette a kezdőképernyőre lépés kézmozdulatát. Most megtanulhatja, hogyan léphet vissza."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Teljesítette a kezdőképernyőre lépés kézmozdulatát."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Csúsztatás a kezdőképernyőre lépéshez"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Csúsztassa ujját felfelé a képernyő aljától. Ez a mozdulat mindig a kezdőképernyőre visz."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Csúsztasson felfelé a képernyő aljától."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Próbálja tovább lenyomva tartani az ablakot, mielőtt elengedi a képernyőt."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Csúsztasson egyenesen felfelé, majd várjon egy kicsit."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Eddig megismerhette a kézmozdulatok használatát. A kézmozdulatokat a Beállításokban kapcsolhatja ki."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Teljesítette az alkalmazásváltás kézmozdulatát."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Alkalmazásváltás csúsztatással"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Csúsztasson felfelé a képernyő aljáról, tartsa lenyomva az ujját, majd emelje fel."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Minden kész"</string>
diff --git a/quickstep/res/values-hy/strings.xml b/quickstep/res/values-hy/strings.xml
index d7ceead475..3ca7112611 100644
--- a/quickstep/res/values-hy/strings.xml
+++ b/quickstep/res/values-hy/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Առաջարկվող հավելված՝ <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Համոզվեք, որ մատը սահեցնում եք էկրանի ձախ եզրից։"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Սահեցրեք մատն էկրանի ձախ եզրից դեպի կենտրոն և բաց թողեք։"</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Գերազանց է․ այժմ մատը սահեցրեք աջ եզրից՝ հետ գնալու համար"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Անցեք վերջին էկրան՝ էկրանի աջ եզրից մատը սահեցնելով դեպի կենտրոն։"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Համոզվեք, որ մատը սահեցնում եք էկրանի աջ եզրից։"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Սահեցրեք մատն էկրանի աջ եզրից դեպի կենտրոն և բաց թողեք։"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Դուք սովորեցիք հետ գնալու ժեստը։ Այժմ սովորենք՝ ինչպես անցնել մի հավելվածից մյուսը։"</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Դուք սովորեցիք հետ գնալու ժեստը։"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Համոզվեք, որ մատը չափազանց մոտ չեք սահեցնում էկրանին ներքևի հատվածին։"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Հետ գնալու ժեստի զգայունությունը փոփոխեք կարգավորումներում"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Սահեցրեք մատը ձախից՝ հետ գնալու համար"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Վերջին էկրան վերադառնալու համար էկրանի եզրից մատը սահեցրեք դեպի կենտրոն։"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Համոզվեք, որ մատն էկրանի ներքևի եզրից վերև եք սահեցնում։"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Համոզվեք, որ դադար չեք տալիս նախքան բաց թողնելը։"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Համոզվեք, որ մատն ուղիղ վերև եք սահեցնում։"</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Դուք սովորեցիք հիմնական էկրան անցնելու ժեստը։ Այժմ սովորենք՝ ինչպես հետ գնալ։"</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Դուք սովորեցիք հիմնական էկրան անցնելու ժեստը։"</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Սահեցրեք մատը՝ հիմնական էկրան անցնելու համար"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Մատը սահեցրեք էկրանի ներքևից վերև։ Այս ժեստը բացում է հիմնական էկրանը։"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Համոզվեք, որ մատն էկրանի ներքևի եզրից վերև եք սահեցնում։"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Նախքան բաց թողնելը փորձեք հնարավորինս երկար պահել պատուհանը։"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Համոզվեք, որ մատն ուղիղ վերև եք սահեցնում, այնուհետև դադար տվեք։"</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Դուք սովորեցիք՝ ինչպես օգտագործել ժեստերը։ Ժեստերը կարող եք անջատել կարգավորումներում։"</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Դուք սովորեցիք մի հավելվածից մյուսն անցնելու ժեստը։"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Մատը սահեցրեք՝ մյուս հավելվածին անցնելու համար"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Մատը սահեցրեք էկրանի ներքևից վերև, պահեք և բաց թողեք։"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Պատրաստ է"</string>
diff --git a/quickstep/res/values-in/strings.xml b/quickstep/res/values-in/strings.xml
index 9c972b7e55..9efc53ea83 100644
--- a/quickstep/res/values-in/strings.xml
+++ b/quickstep/res/values-in/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplikasi yang diprediksi: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pastikan Anda menggeser dari tepi ujung kiri."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pastikan Anda menggeser dari tepi kiri ke tengah layar, lalu lepaskan."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Bagus! Sekarang geser dari kanan untuk kembali"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Geser dari tepi kanan ke tengah layar menuju layar terakhir."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pastikan Anda menggeser dari tepi ujung kanan."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pastikan Anda menggeser dari tepi kanan ke tengah layar, lalu lepaskan."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Anda telah menyelesaikan gestur kembali. Selanjutnya, pelajari cara beralih aplikasi."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Anda telah menyelesaikan gestur kembali."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pastikan Anda tidak menggeser terlalu dekat ke bagian bawah layar."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Untuk mengubah sensitivitas gestur kembali, buka Setelan"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Geser dari kiri untuk kembali"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Untuk kembali ke layar terakhir, geser dari tepi kiri ke tengah layar."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pastikan Anda menggeser ke atas dari tepi bawah layar."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pastikan Anda tidak menjeda sebelum melepaskan."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pastikan Anda menggeser lurus ke atas."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Anda telah menyelesaikan gestur menuju Layar utama. Selanjutnya, pelajari cara beralih kembali."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Anda telah menyelesaikan gestur menuju Layar utama."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Geser untuk beralih ke layar utama"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Geser ke atas dari bagian bawah layar. Gestur ini akan selalu membawa Anda ke Layar utama."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Pastikan Anda menggeser ke atas dari tepi bawah layar."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Coba tahan jendela lebih lama sebelum melepaskan."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Pastikan Anda menggeser lurus ke atas, lalu menjedanya."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Anda telah mempelajari cara menggunakan gestur. Untuk menonaktifkan gestur, buka Setelan."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Anda telah menyelesaikan gestur beralih aplikasi."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Geser untuk beralih aplikasi"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Geser ke atas dari bagian bawah layar, tahan, lalu lepaskan."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Semua siap"</string>
diff --git a/quickstep/res/values-is/strings.xml b/quickstep/res/values-is/strings.xml
index 55d387a70f..2687b9c3d8 100644
--- a/quickstep/res/values-is/strings.xml
+++ b/quickstep/res/values-is/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Tillaga að forriti: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Passaðu að strjúka frá jaðri vinstri brúnar."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Passaðu að strjúka frá vinstri brún skjásins að miðju hans og sleppa svo."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Flott! Strjúktu núna til hægri til að fara til baka"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Þú getur einnig farið til baka á síðasta skjá með því að strjúka frá hægri brún að miðju skjásins."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Passaðu að strjúka frá jaðri hægri brúnar."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Passaðu að strjúka frá hægri brún skjásins að miðju hans og sleppa svo."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Þú laukst við að kynna þér bendinguna „til baka“. Næst skaltu læra hvernig þú skiptir á milli forrita."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Þú laukst við að kynna þér bendinguna „til baka“."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Passaðu að strjúka ekki of nálægt neðri brún skjásins."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Til að breyta næmi til baka-bendingar ferðu í stillingar"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Strjúktu frá vinstri til að fara til baka"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Strjúktu frá vinstri brún að miðju skjásins til að fara aftur til baka í síðasta skjá sem var opinn."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Passaðu að strjúka upp frá neðri brún skjásins."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Passaðu að stoppa ekki áður en þú sleppir."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Passaðu að strjúka beint upp."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Þú laukst við að kynna þér bendinguna „heim“. Næst skaltu læra hvernig þú ferð „til baka“."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Þú laukst við að kynna þér bendinguna „heim“."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Strjúktu til að fara heim"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Strjúktu upp frá neðri hluta skjásins. Þetta flytur þig alltaf á heimaskjáinn."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Passaðu að strjúka upp frá neðri brún skjásins."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Prófaðu að halda fingrinum lengur á glugganum áður en þú sleppir."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Passaðu að strjúka beint upp og stoppa svo."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Þú kynntir þér hvernig á að nota bendingar. Opnaðu stillingar til að slökkva á bendingum."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Þú laukst við að kynna þér bendinguna „skipta um forrit“."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Strjúktu til að skipta á milli forrita"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Strjúktu upp frá neðri hluta skjásins, haltu fingrinum á skjánum og slepptu svo."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Allt til reiðu"</string>
diff --git a/quickstep/res/values-it/strings.xml b/quickstep/res/values-it/strings.xml
index 2a66ae47c9..a37a102c3a 100644
--- a/quickstep/res/values-it/strings.xml
+++ b/quickstep/res/values-it/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App prevista: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Assicurati di scorrere dall\'estremità del bordo sinistro."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Assicurati di scorrere dal bordo sinistro verso il centro dello schermo e solleva il dito."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Bene! Ora scorri da destra per tornare indietro."</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Puoi anche tornare all\'ultima schermata scorrendo dal bordo destro verso il centro dello schermo."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Assicurati di scorrere dall\'estremità del bordo destro."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Assicurati di scorrere dal bordo destro verso il centro dello schermo e solleva il dito."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Hai completato il gesto Indietro. Ora, impara come passare da un\'app all\'altra."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Hai completato il gesto Indietro."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Assicurati di non scorrere troppo vicino alla parte inferiore dello schermo."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Usa Impostazioni per cambiare sensibilità del gesto Indietro"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Scorri da sinistra per tornare indietro"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Per tornare all\'ultima schermata mostrata, scorri dal bordo sinistro verso il centro dello schermo."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Assicurati di scorrere verso l\'alto dal bordo inferiore dello schermo."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Assicurati di non fare pause prima di sollevare il dito."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Assicurati di scorrere verso l\'alto senza fermarti."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Hai completato il gesto Vai alla schermata Home. Ora, impara come tornare indietro."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Hai completato il gesto Vai alla schermata Home."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Scorri per andare alla schermata Home"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Scorri verso l\'alto dalla parte inferiore dello schermo; così arrivi sempre alla schermata Home."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Assicurati di scorrere verso l\'alto dal bordo inferiore dello schermo."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Prova a tenere premuta la finestra più a lungo prima di rilasciarla."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Assicurati di scorrere verso l\'alto senza fermarti, poi fai una pausa."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Hai imparato a usare i gesti. Per disattivarli, vai alle Impostazioni."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Hai completato il gesto Cambia app."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Scorri per passare da un\'app all\'altra"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Scorri verso l\'alto dalla parte inferiore dello schermo, tieni premuto e rilascia."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Fatto"</string>
diff --git a/quickstep/res/values-iw/strings.xml b/quickstep/res/values-iw/strings.xml
index 1c52011487..8d61fd4440 100644
--- a/quickstep/res/values-iw/strings.xml
+++ b/quickstep/res/values-iw/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"האפליקציות החזויות: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"חשוב להקפיד להחליק מהקצה הימני."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"חשוב להקפיד להחליק מהקצה הימני למרכז המסך ואז לשחרר."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"איזה יופי! עכשיו עליך להחליק מהקצה הימני כדי לחזור"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"אפשר לחזור למסך הקודם בהחלקה מהקצה הימני של המסך אל המרכז."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"חשוב להקפיד להחליק מהקצה השמאלי."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"חשוב להקפיד להחליק מהקצה השמאלי למרכז המסך ואז לשחרר."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"השלמת את תנועת \'הקודם\'. בשלב הבא לומדים איך לעבור בין אפליקציות."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"השלמת את תנועת \'הקודם\'."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"חשוב להקפיד שלא להחליק קרוב מדי לתחתית המסך."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"כדי לשנות את מידת הרגישות של תנועת החזרה, יש לעבור להגדרות"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"יש להחליק מצד שמאל כדי לחזור למסך הקודם"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"כדי לחזור למסך הקודם, יש להחליק מהקצה השמאלי של המסך אל המרכז."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"חשוב להקפיד להחליק למעלה מהקצה התחתון של המסך."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"חשוב לוודא שלא מחכים לפני שמשחררים."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"חשוב להקפיד להחליק ישר למעלה."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"השלמת את תנועת המעבר למסך הבית. בשלב הבא לומדים איך לחזור למסך הקודם."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"השלמת את תנועת המעבר למסך הבית."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"יש להחליק כדי לעבור למסך הבית"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"החלקה למעלה מתחתית המסך תמיד תעביר אותך למסך הבית."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"חשוב להקפיד להחליק למעלה מהקצה התחתון של המסך."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"יש לנסות להחזיק את החלון לזמן רב יותר לפני שמשחררים."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"חשוב להקפיד להחליק ישר למעלה ואז להמתין."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"למדת איך להשתמש בתנועות. ניתן להשבית את התנועות ב\'הגדרות\'."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"השלמת את תנועת המעבר בין האפליקציות."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"יש להחליק כדי לעבור בין אפליקציות"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"יש להחליק למעלה מתחתית המסך, להחזיק ולאחר מכן לשחרר."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"הכול מוכן"</string>
diff --git a/quickstep/res/values-ja/strings.xml b/quickstep/res/values-ja/strings.xml
index 1a867e7621..57fca5b5c6 100644
--- a/quickstep/res/values-ja/strings.xml
+++ b/quickstep/res/values-ja/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"予測されたアプリ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"一番左端からスワイプしてください。"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"画面の左端から中央に向かってスワイプし、指を離してください。"</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"では、右端からスワイプして前の画面に戻りましょう"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"画面の右端から中央に向かってスワイプして直前の画面に戻ることもできます。"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"一番右端からスワイプしてください。"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"画面の右端から中央に向かってスワイプし、指を離してください。"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"「戻る」操作を完了しました。次は、アプリを切り替える方法を覚えましょう。"</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"「戻る」操作を完了しました。"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"スワイプする際は画面の下部に近づきすぎないようにしましょう。"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"「戻る」操作の感度を変更するには [設定] に移動します"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"左端からスワイプすると前の画面に戻ります"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"直前の画面に戻るには、画面の左端から中央に向かってスワイプします。"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"画面の下端から上にスワイプしてください。"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"指を離す前にいったん止めないでください。"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"まっすぐ上にスワイプしてください。"</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"「ホームに戻る」操作を完了しました。次は、前の画面に戻る方法を覚えましょう。"</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"「ホームに戻る」操作を完了しました。"</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"スワイプでホームに戻る"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"画面を下から上にスワイプします。この操作でいつでもホーム画面に戻れます。"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"画面の下端から上にスワイプしてください。"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"指を離す前にウィンドウをもう少し長押ししてみましょう。"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"まっすぐ上にスワイプしてから、いったん指を止めてください。"</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"主な操作方法を覚えました。操作を OFF にするには、設定に移動してください。"</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"「アプリを切り替える」操作を完了しました。"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"スワイプでアプリを切り替え"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"画面を下から上にスワイプして長押しし、指を離します。"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"設定完了"</string>
@@ -88,14 +78,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"再試行"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"成功"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"チュートリアル <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"設定完了"</string>
+    <string name="allset_hint" msgid="459504134589971527">"ホームに移動するには上にスワイプします"</string>
+    <string name="allset_description" msgid="6350320429953234580">"スマートフォンを使い始めることができます"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"ユーザー補助の操作設定"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"共有"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"スクリーンショット"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"この操作はアプリまたは組織で許可されていません"</string>
diff --git a/quickstep/res/values-ka/strings.xml b/quickstep/res/values-ka/strings.xml
index afb5ebef5b..ea2e4d1af4 100644
--- a/quickstep/res/values-ka/strings.xml
+++ b/quickstep/res/values-ka/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ნაწინასწარმეტყველები აპი: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"არ გადაფურცლოთ მარცხენა კიდის ბოლოდან."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"გადაფურცლეთ მარცხენა კიდიდან ეკრანის ცენტრისკენ და თითი აუშვით."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"მშვენიერია! ახლა უკან დასაბრუნებლად გადაფურცლეთ მარჯვნიდან"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"ასევე, შეგიძლიათ, დაბრუნდეთ ბოლო ეკრანზე მარჯვენა კიდიდან ეკრანის შუისკენ გადაფურცვლით."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"არ გადაფურცლოთ მარჯვენა კიდის ბოლოდან."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"გადაფურცლეთ მარჯვენა კიდიდან ეკრანის ცენტრისკენ და თითი აუშვით."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"თქვენ შეასრულეთ უკან დაბრუნების ჟესტი. ახლა კი შევიტყოთ, როგორ გადავრთოთ აპები."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"თქვენ შეასრულეთ უკან დაბრუნების ჟესტი."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"არ გადაფურცლოთ ეკრანის ბოლოსთან ახლოს."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"დაბრუნების ჟესტის მგრძნობელობის შესაცვლელად გადადით პარამეტრებზე"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"უკან დასაბრუნებლად გადაფურცლეთ მარცხნიდან"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"ბოლო ნანახ ეკრანზე დასაბრუნებლად გადაფურცლეთ მარცხენა კიდიდან ეკრანის ცენტრისკენ."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"გადაფურცლეთ ეკრანის ქვედა კიდიდან ზემოთ."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"არ დააპაუზოთ თითის აშვებამდე."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"გადაფურცლეთ ზემოთ."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"თქვენ შეასრულეთ მთავარ ეკრანზე დაბრუნების ჟესტი. ახლა კი შევიტყოთ, თუ როგორ დავბრუნდეთ უკან."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"თქვენ შეასრულეთ მთავარ ეკრანზე დაბრუნების ჟესტი."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"მთავარ გვერდზე გადასასვლელად გადაფურცლეთ"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"გადაფურცლეთ ეკრანის ქვედა კიდიდან ზემოთ. ამ ჟესტს ყოველთვის მთავარი გვერდის ეკრანზე გადაყავხართ."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"გადაფურცლეთ ეკრანის ქვედა კიდიდან ზემოთ."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"უფრო ხანგრძლივად დააჭირეთ თითი ფანჯარას, რომ არ დაიხუროს."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"გადაფურცლეთ პირდაპირ ზემოთ და შემდეგ დააპაუზეთ."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"თქვენ ისწავლეთ ჟესტების გამოყენება. ჟესტების გამოსართავად გადადით პარამეტრებში."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"თქვენ შეასრულეთ აპების გადართვის ჟესტი."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"აპების გადასართავად გადაფურცლეთ"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"გადაფურცლეთ ეკრანის ქვედა კიდიდან ზემოთ, დააყოვნეთ, შემდეგ თითი აუშვით."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"მზად არის"</string>
diff --git a/quickstep/res/values-kk/strings.xml b/quickstep/res/values-kk/strings.xml
index 4f32e053ae..6515840d9a 100644
--- a/quickstep/res/values-kk/strings.xml
+++ b/quickstep/res/values-kk/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Болжалды қолданба: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Сол жақтағы ең шеткі нүктеден бастап сырғытыңыз."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Экранның сол жақ шетінен ортасына қарай сырғытыңыз да, жіберіңіз."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Жақсы! Енді артқа қайту үшін оң жақтан сырғытыңыз"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Экранның оң жақ шетінен ортасына қарай сырғыту арқылы соңғы ашылған экранға орала аласыз."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Оң жақтағы ең шеткі нүктеден бастап сырғытыңыз."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Экранның оң жақ шетінен ортасына қарай сырғытыңыз да, жіберіңіз."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Артқа қайту қимылын аяқтадыңыз. Енді қолданбаларды ауыстыруды үйреніңіз."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Артқа қайту қимылын аяқтадыңыз."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Саусағыңызбен сырғыту кезінде экранның төменгі жағына тым жақындамаңыз."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Артқа қайту қимылы сезгіштігін параметрлерден өзгертіңіз."</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Артқа қайту үшін сол жақтан сырғытыңыз"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Соңғы ашылған экранға оралу үшін экранның сол жақ шетінен ортасына қарай сырғытыңыз."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Экранның төменгі шетінен жоғары қарай сырғытыңыз."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Жіберер алдында кідіріс жасамаңыз."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Тігінен жоғары қарай сырғытыңыз."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Негізгі экранға қайту қимылын аяқтадыңыз. Енді артқа қайтуды үйреніңіз."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Негізгі экранға қайту қимылын аяқтадыңыз."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Негізгі экранға өту үшін сырғытыңыз"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Экранның төменгі жағынан жоғары қарай сырғытыңыз. Сонда негізгі экран ашылады."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Экранның төменгі шетінен жоғары қарай сырғытыңыз."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Жіберер алдында терезені ұзағырақ ұстап тұруға тырысыңыз."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Тігінен жоғары қарай сырғытыңыз да, кідіріңіз."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Қимылдарды қолдануды үйрендіңіз. Қимылдарды өшіру үшін \"Параметрлер\" бөліміне өтіңіз."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Қолданбаларды ауыстыру қимылын аяқтадыңыз."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Қолданбаларды ауыстыру үшін сырғытыңыз"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Экранның төменгі жағынан жоғары қарай сырғытып, ұстап тұрыңыз да, жіберіңіз."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Бәрі дайын"</string>
diff --git a/quickstep/res/values-km/strings.xml b/quickstep/res/values-km/strings.xml
index 1acf6075ba..5185c4cd6c 100644
--- a/quickstep/res/values-km/strings.xml
+++ b/quickstep/res/values-km/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"កម្មវិធី​ដែលបាន​ព្យាករ៖ <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ត្រូវប្រាកដថា​អ្នកអូសពី​ចុងគែម​ខាងឆ្វេង​។"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ត្រូវប្រាកដថា​អ្នកអូសពី​គែមខាងឆ្វេង​ទៅផ្នែកកណ្ដាល​នៃអេក្រង់ រួច​ដកដៃ​។"</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"ល្អ! ឥឡូវនេះ សូមអូសពីខាងស្ដាំ​ដើម្បីថយក្រោយ"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"អ្នកក៏អាចត្រឡប់ទៅអេក្រង់ចុងក្រោយបានផងដែរ ដោយអូសពីគែមខាងស្ដាំទៅផ្នែកកណ្ដាលនៃអេក្រង់។"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ត្រូវប្រាកដថា​អ្នកអូសពី​ចុងគែម​ខាងស្ដាំ​។"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ត្រូវប្រាកដថា​អ្នកអូសពី​គែមខាងស្ដាំ​ទៅផ្នែកកណ្ដាល​នៃអេក្រង់ រួច​ដកដៃ​។"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"អ្នក​បានបញ្ចប់​ចលនា​ថយក្រោយ​ហើយ។ បន្ទាប់​មកទៀត សូមស្វែងយល់​ពីរបៀប​ប្ដូរកម្មវិធី​។"</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"អ្នក​បានបញ្ចប់​ចលនា​ថយក្រោយ​ហើយ។"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ត្រូវប្រាកដថា​អ្នកមិនអូស​ទៅជិត​ផ្នែកខាងក្រោម​នៃអេក្រង់ពេក​។"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ដើម្បីប្ដូរកម្រិត​រំញោចនឹង​ចលនាថយក្រោយ សូមចូលទៅកាន់​ការកំណត់"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"អូសពីឆ្វេងដើម្បីថយក្រោយ"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"ដើម្បីត្រឡប់ទៅ​អេក្រង់ចុងក្រោយ​ដែលអ្នកបានចូល សូមអូសពី​គែមខាងឆ្វេង​ទៅផ្នែកកណ្ដាល​នៃអេក្រង់។"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ត្រូវប្រាកដថា​អ្នកអូសឡើងលើ​ពីគែមខាងក្រោម​នៃអេក្រង់​។"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ត្រូវប្រាកដថា​អ្នកមិនផ្អាក មុនពេល​ដកដៃ​។"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ត្រូវប្រាកដថា​អ្នកអូស​ត្រង់ឡើងលើ​។"</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"អ្នក​បានបញ្ចប់​ចលនា​ចូលទៅកាន់​ទំព័រដើម​ហើយ។ បន្ទាប់​មកទៀត សូមស្វែងយល់​ពីរបៀប​ថយក្រោយ​។"</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"អ្នក​បានបញ្ចប់​ចលនា​ចូលទៅកាន់​ទំព័រដើម​ហើយ។"</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"អូស​ដើម្បីចូល​ទៅកាន់​អេក្រង់ដើម"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"អូស​ឡើងលើ​ពីផ្នែកខាងក្រោម​នៃ​អេក្រង់របស់អ្នក។ ចលនា​នេះ​នាំ​អ្នក​ទៅ​អេក្រង់ដើម​ជានិច្ច។"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ត្រូវប្រាកដថា​អ្នកអូសឡើងលើ​ពីគែមខាងក្រោម​នៃអេក្រង់​។"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"សាកល្បង​សង្កត់វិនដូ​ឱ្យបានយូរ​ជាងនេះ មុនពេល​ដកដៃ​។"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"ត្រូវប្រាកដថា​អ្នកអូស​ត្រង់ឡើងលើ រួចផ្អាក។"</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"អ្នក​បានស្វែងយល់អំពី​របៀបប្រើចលនា​ហើយ។ ដើម្បីបិទ​ចលនា សូមចូល​ទៅកាន់​ការកំណត់។"</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"អ្នក​បានបញ្ចប់​ចលនា​ប្ដូរកម្មវិធី​ហើយ។"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"អូស​ដើម្បីប្ដូរ​កម្មវិធី"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"អូសឡើងលើ​ពីផ្នែកខាងក្រោមនៃអេក្រង់​របស់អ្នក រួចសង្កត់​ឱ្យជាប់ បន្ទាប់មកដកដៃចេញ។"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"រួចហើយ"</string>
diff --git a/quickstep/res/values-ko/strings.xml b/quickstep/res/values-ko/strings.xml
index f5e9147a02..fb35a53f8c 100644
--- a/quickstep/res/values-ko/strings.xml
+++ b/quickstep/res/values-ko/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"예상 앱: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"왼쪽 가장자리 끝에서 스와이프하세요."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"왼쪽 가장자리에서 화면 중앙으로 스와이프한 후 손가락을 떼세요."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"잘하셨습니다. 이제 오른쪽에서 스와이프하여 뒤로 돌아가세요"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"오른쪽 가장자리에서 화면 중앙으로 스와이프하여 마지막 화면으로 돌아갈 수도 있습니다"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"오른쪽 가장자리 끝에서 스와이프하세요."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"오른쪽 가장자리에서 화면 중앙으로 스와이프한 후 손가락을 떼세요."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"돌아가기 동작을 완료했습니다. 이번에는 앱 전환 방법을 알아보겠습니다."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"돌아가기 동작을 완료했습니다."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"화면 하단에 지나치게 가까운 곳에서 스와이프하면 안 됩니다."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"돌아가기 동작의 민감도를 변경하려면 설정으로 이동하세요"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"왼쪽에서 스와이프하여 뒤로 돌아가세요"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"마지막 화면으로 돌아가려면 왼쪽 가장자리에서 화면 중앙으로 스와이프하세요"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"화면 하단 가장자리에서 위로 스와이프하세요."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"손가락을 떼기 전에 멈추지 않아야 합니다."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"위로 똑바르게 스와이프하세요."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"홈으로 이동 동작을 완료했습니다. 이번에는 뒤로 돌아가는 방법을 알아보겠습니다."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"홈으로 이동 동작을 완료했습니다."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"스와이프하여 홈으로 이동"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"화면 하단에서 위로 스와이프합니다. 이 동작을 사용하면 언제든지 홈 화면으로 이동할 수 있습니다"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"화면 하단 가장자리에서 위로 스와이프하세요."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"창을 더 오래 누르고 있다가 손가락을 떼 보세요."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"위로 똑바르게 스와이프한 후 잠깐 멈추세요."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"동작 사용 방법을 알아봤습니다. 동작을 사용 중지하려면 설정으로 이동하세요."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"앱 전환 동작을 완료했습니다."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"스와이프로 앱 전환"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"화면 하단에서 위로 스와이프하고 잠시 멈춘 다음 손가락을 떼세요"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"설정 완료"</string>
diff --git a/quickstep/res/values-ky/strings.xml b/quickstep/res/values-ky/strings.xml
index d0ed6deba2..6f631460a3 100644
--- a/quickstep/res/values-ky/strings.xml
+++ b/quickstep/res/values-ky/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Божомолдонгон колдонмо: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Экранды эң четинен солдон оңго карай сүрүңүз."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Экранды сол жагынан ортосуна карай сүрүп, манжаңызды алыңыз."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Сонун! Артка кайтуу үчүн экрандын оң четинен сүрүп коюңуз"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Акыркы экранга кайтуу үчүн экранды оң жагынан ортосуна карай сүрүңүз."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Экранды эң четинен оңдой солго карай сүрүңүз."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Экранды оң жагынан ортосуна карай сүрүп, манжаңызды алыңыз."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"\"Артка\" жаңсоосу боюнча үйрөткүчтү бүтүрдүңүз. Эми колдонмолорду которуштурганды үйрөнүп алыңыз."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"\"Артка\" жаңсоосу боюнча үйрөткүчтү бүтүрдүңүз."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Манжаңызды экрандын ылдый жагына өтө жакындатпай сүрүңүз."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"\"Артка\" жаң-нун сезгичтигин өзгөртүү үчүн Жөндөөлөргө өтүңүз"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Артка кайтуу үчүн экраныңыздын сол четинен сүрүп коюңуз"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Акыркы экранга кайтуу үчүн экранды сол жагынан ортосуна карай сүрүңүз."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Экранды ылдыйдан өйдө карай сүрүңүз."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Манжаңызды алганга чейин токтотпоңуз."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Экранды өйдө карай сүрүңүз."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"\"Башкы бетке өтүү\" жаңсоосу боюнча үйрөткүчтү бүтүрдүңүз. Эми артка кайтууну үйрөнүп алыңыз."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"\"Башкы бетке өтүү\" жаңсоосу боюнча үйрөткүчтү бүтүрдүңүз."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Башкы бетке өтүү үчүн сүрүп коюңуз"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Экранды ылдый жагынан өйдө карай сүрүңүз. Бул жаңсоо сизди ар дайым Башкы экранга алып барат."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Экранды ылдыйдан өйдө карай сүрүңүз."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Манжаңызды алуудан мурун экранда узагыраак кармаңыз."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Экранды өйдө карай сүрүп, токтоп туруңуз."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Жаңсоолорду колдонгонду үйрөндүңүз. Жаңсоолорду өчүрүү үчүн Жөндөөлөргө өтүңүз."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"\"Колдонмолорду которуштуруу\" жаңсоосу боюнча үйрөткүчтү бүтүрдүңүз."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Колдонмолорду которуштуруу үчүн сүрүңүз"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Экранды ылдыйдан өйдө карай сүрүп, бир аз коё бербей кармап туруңуз."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Дапдаяр!"</string>
diff --git a/quickstep/res/values-lo/strings.xml b/quickstep/res/values-lo/strings.xml
index 9b175ad4d1..7b2ed2eabc 100644
--- a/quickstep/res/values-lo/strings.xml
+++ b/quickstep/res/values-lo/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ແອັບທີ່ຄາດເດົາໄວ້: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ກະລຸນາກວດສອບວ່າທ່ານປັດຈາກຂອບຊ້າຍສຸດ."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ກະລຸນາກວດສອບວ່າທ່ານປັດຈາກຂອບຊ້າຍໄປຫາທາງກາງຂອງຈໍແລ້ວປ່ອຍ."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"ດີ! ຕອນນີ້ໃຫ້ປັດຈາກຂວາເພື່ອກັບຄືນ"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"ທ່ານສາມາດກັບໄປຫາໜ້າຈໍຫຼ້າສຸດໄດ້ໂດຍການປັດຈາກຂອບຂວາໄປຫາກາງຈໍ."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ກະລຸນາກວດສອບວ່າທ່ານປັດຈາກຂອບຂວາສຸດ."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ກະລຸນາກວດສອບວ່າທ່ານປັດຈາກຂອບຂວາໄປຫາທາງກາງຂອງຈໍແລ້ວປ່ອຍ."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"ທ່ານໃຊ້ທ່າທາງກັບຄືນສຳເລັດແລ້ວ. ຕໍ່ໄປ, ມາສຶກສາວິທີສະຫຼັບແອັບ."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ທ່ານໃຊ້ທ່າທາງກັບຄືນສຳເລັດແລ້ວ."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ກະລຸນາກວດສອບວ່າທ່ານບໍ່ໄດ້ປັດໃກ້ກັບທາງລຸ່ມຂອງໜ້າຈໍເກີນໄປ."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ເພື່ອປ່ຽນຄວາມລະອຽດອ່ອນຂອງທ່າທາງກັບຄືນ, ໃຫ້ໄປຫາການຕັ້ງຄ່າ"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"ປັດຈາກຊ້າຍເພື່ອກັບຄືນ"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"ເພື່ອກັບຄືນໄປໜ້າຈໍຫຼ້າສຸດທີ່ທ່ານໃຊ້, ໃຫ້ປັດຈາກຂອບຊ້າຍໄປຫາກາງຈໍ."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ກະລຸນາກວດສອບວ່າທ່ານປັດຂຶ້ນຈາກຂອບລຸ່ມສຸດຂອງໜ້າຈໍ."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ກະລຸນາກວດສອບວ່າທ່ານບໍ່ຢຸດຊົ່ວຄາວກ່ອນປ່ອຍນິ້ວ."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ກະລຸນາກວດສອບວ່າທ່ານປັດຂຶ້ນໄປຊື່ໆ."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"ທ່ານໃຊ້ທ່າທາງໄປໜ້າຫຼັກສຳເລັດແລ້ວ. ຕໍ່ໄປ, ມາສຶກສາວິທີກັບຄືນ."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"ທ່ານໃຊ້ທ່າທາງໄປໜ້າຫຼັກສຳເລັດແລ້ວ."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"ປັດເພື່ອໄປໜ້າຫຼັກ"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"ປັດຂຶ້ນມາຈາກລຸ່ມສຸດຂອງໜ້າຈໍທ່ານ. ທ່າທາງນີ້ຈະພາທ່ານໄປໂຮມສະກຣີນສະເໝີ."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ກະລຸນາກວດສອບວ່າທ່ານປັດຂຶ້ນຈາກຂອບລຸ່ມສຸດຂອງໜ້າຈໍ."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"ລອງກົດໃສ່ໜ້າຈໍຄ້າງໄວ້ດົນຂຶ້ນກ່ອນປ່ອຍນິ້ວ."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"ກະລຸນາກວດສອບວ່າທ່ານປັດຂຶ້ນຊື່ໆ, ຈາກນັ້ນຢຸດຊົ່ວຄາວ."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"ທ່ານໄດ້ສຶກສາວິທີໃຊ້ທ່າທາງແລ້ວ. ເພື່ອປິດທ່າທາງຕ່າງໆ, ໃຫ້ເຂົ້າໄປຫາການຕັ້ງຄ່າ."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"ທ່ານໃຊ້ທ່າທາງສະຫຼັບແອັບສຳເລັດແລ້ວ."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ປັດເພື່ອສະຫຼັບແອັບ"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ປັດຂຶ້ນຈາກລຸ່ມສຸດຂອງໜ້າຈໍທ່ານ, ຈາກນັ້ນປ່ອຍ."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"ທຸກຢ່າງພ້ອມແລ້ວ"</string>
diff --git a/quickstep/res/values-lt/strings.xml b/quickstep/res/values-lt/strings.xml
index 8604a6a5bf..bebefbbe28 100644
--- a/quickstep/res/values-lt/strings.xml
+++ b/quickstep/res/values-lt/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Numatoma programa: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Turite perbraukti nuo kairiojo krašto."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Turite perbraukti nuo kairiojo krašto link ekrano vidurio ir pakelti pirštą."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Šaunu! Dabar perbraukite iš dešinės, kad grįžtumėte"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Į ankstesnį ekraną taip pat galite grįžti, perbraukdami nuo dešiniojo krašto link ekrano vidurio."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Turite perbraukti nuo dešiniojo krašto."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Turite perbraukti nuo dešiniojo krašto link ekrano vidurio ir pakelti pirštą."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Atlikote grįžimo atgal gestą. Toliau sužinosite, kaip perjungti programas."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Atlikote grįžimo atgal gestą."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nebraukite per arti ekrano apačios."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Norėd. pak. grįžimo gesto jautr., eikite į sk. „Nustatymai“"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Perbraukite iš kairės, kad grįžtumėte"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Norėdami grįžti į ankstesnį ekraną, kuriame lankėtės, perbraukite nuo kairiojo krašto link ekrano vidurio."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Turite perbraukti aukštyn nuo apatinio ekrano krašto."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Nepristabdykite prieš pakeldami pirštą."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Turite tiesiai perbraukti aukštyn."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Atlikote perėjimo į pagrindinį ekraną gestą. Toliau sužinosite, kaip grįžti atgal."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Atlikote perėjimo į pagrindinį ekraną gestą."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Perbraukite, kad pereitumėte į pagrindinį ekraną"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Perbraukite aukštyn nuo ekrano apačios. Atlikus šį gestą, visada nukreipiama į pagrindinį ekraną."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Turite perbraukti aukštyn nuo apatinio ekrano krašto."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Pabandykite palaikyti langą ilgiau prieš pakeldami pirštą."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Turite tiesiai perbraukti aukštyn, o tada pristabdyti."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"išmokote naudotis gestais. Gestus galite išjungti nustatymuose."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Atlikote programų perjungimo gestą."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Perbraukite, kad perjungtumėte programas"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Perbraukite aukštyn nuo ekrano apačios, palaikykite ir paleiskite."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Viskas nustatyta"</string>
diff --git a/quickstep/res/values-lv/strings.xml b/quickstep/res/values-lv/strings.xml
index b6cadc641b..97a8197035 100644
--- a/quickstep/res/values-lv/strings.xml
+++ b/quickstep/res/values-lv/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Prognozētā lietotne: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Jāvelk no pašas kreisās malas."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Jāvelk no ekrāna kreisās malas uz vidu un jāatlaiž."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Lieliski! Tagad velciet no labās puses, lai pārietu atpakaļ"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Varat arī pāriet atpakaļ uz pēdējo ekrānu, velkot no labās malas uz ekrāna vidu."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Jāvelk no pašas labās malas."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Jāvelk no ekrāna labās malas uz vidu un jāatlaiž."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Jūs sekmīgi veicāt atgriešanās žestu. Tagad varat iemācīties, kā pārslēgt lietotnes."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Jūs sekmīgi veicāt atgriešanās žestu."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nevelciet pārāk tuvu ekrāna apakšdaļai."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Atgriešanās žesta jutīguma līmeni varat mainīt iestatījumos."</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Lai pārietu atpakaļ, velciet no kreisās malas."</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Lai pārietu atpakaļ uz pēdējo izmantoto ekrānu, velciet no kreisās malas uz ekrāna vidu."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Jāvelk augšup no ekrāna apakšmalas."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pirms atlaišanas nepārtrauciet kustību."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Jāvelk tieši uz augšu."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Jūs sekmīgi veicāt sākuma ekrāna atvēršanas žestu. Tagad varat iemācīties, kā pāriet atpakaļ."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Jūs sekmīgi veicāt sākuma ekrāna atvēršanas žestu."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Vilkšana, lai pārietu uz sākumu"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Velciet augšup no ekrāna apakšdaļas. Ar šo žestu vienmēr varat atvērt sākuma ekrānu."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Jāvelk augšup no ekrāna apakšmalas."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Mēģiniet ilgāk turēt logu, pirms atlaižat."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Jāvelk tieši uz augšu un pēc tam jāaptur kustība."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Jūs esat apguvis žestu izmantošanu. Lai izslēgtu žestus, pārejiet uz sadaļu Iestatījumi."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Jūs sekmīgi veicāt lietotņu pārslēgšanas žestu."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Vilkšana, lai pārslēgtu lietotnes"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Velciet augšup no ekrāna apakšdaļas, turiet un pēc tam atlaidiet."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Gatavs"</string>
diff --git a/quickstep/res/values-mk/strings.xml b/quickstep/res/values-mk/strings.xml
index fd235f9390..e21f45ca5b 100644
--- a/quickstep/res/values-mk/strings.xml
+++ b/quickstep/res/values-mk/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Предвидена апликација: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Повлечете од подалечниот лев агол."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Повлечете од левиот раб кон средината на екранот и пуштете."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Одлично! Сега повлечете оддесно за да се вратите назад"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Може да се вратите на последниот екран и со повлекување од десниот раб кон средината на екранот."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Повлечете од подалечниот десен агол."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Повлечете од десниот раб кон средината на екранот и пуштете."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Завршивте со упатството за враќање назад. Следно, дознајте како да се префрлате помеѓу апликации."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Завршивте со упатството за враќање назад."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Не повлекувајте преблиску до долниот раб на екранот."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"За да ја промените чувствителноста, одете во „Поставки“"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Повлечете одлево за да се вратите назад"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"За да се вратите на последниот екран на кој бевте, повлечете од левиот раб кон средината на екранот."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Повлечете нагоре од долниот раб на екранот."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Не правете пауза пред да пуштите."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Повлечете право нагоре."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Завршивте со упатството за почетната страница. Следно, дознајте како да се вратите назад."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Завршивте со упатството за почетната страница."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Повлечете за да одите на почетната страница"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Повлечете нагоре од долниот раб на екранот. Ова движење секогаш ќе ве одведе на почетниот екран."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Повлечете нагоре од долниот раб на екранот."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Задржете го прозорецот подолго пред да го пуштите."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Повлечете право нагоре, а потоа застанете."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Дознавте како се користат движењата. За да ги исклучите движењата, одете во „Поставки“."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Завршивте со упатството за префрлање помеѓу апликации."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Повлечете за префрлање помеѓу апликации"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Повлечете нагоре од дното на екранот и задржете, па пуштете."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Готово"</string>
diff --git a/quickstep/res/values-mn/strings.xml b/quickstep/res/values-mn/strings.xml
index 0c8c5973d8..ea3a2201c0 100644
--- a/quickstep/res/values-mn/strings.xml
+++ b/quickstep/res/values-mn/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Таамаглаж буй апп: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Та зүүн захын булангаас шударна уу."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Та дэлгэцийн зүүн булангаас дунд хэсэг хүртэл шударч, суллаарай."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Янзтай! Одоо буцахын тулд баруун талаас шударна уу"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Та мөн дэлгэцийн баруун булангаас дунд хэсэг рүү шударснаар сүүлийн дэлгэц рүү буцах боломжтой."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Та баруун захын булангаас шударна уу."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Та дэлгэцийн баруун булангаас дунд хэсэг хүртэл шударч, суллаарай."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Та буцах зангааг гүйцэтгэлээ. Дараа нь аппуудыг хэрхэн сэлгэх талаар мэдэж авна уу."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Та буцах зангааг гүйцэтгэлээ."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Та дэлгэцийн доод хэсэгтэй хэт ойр бүү шудраарай."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Буцах зангааны мэдрэгшлийг өөрчлөх бол Тохиргоо руу очно уу"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Буцахын тулд зүүн талаас шударна уу"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Та байсан сүүлийн дэлгэц рүүгээ буцахын тулд дэлгэцийн баруун булангаас дунд хэсэг рүү шударна уу"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Та дэлгэцийн доод булангаас дээш шударна уу."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Та суллахаасаа өмнө түр зогсоож болохгүй."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Та чигээрээ шударна уу."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Та Нүүр лүү очих зангааг гүйцэтгэлээ. Дараа нь хэрхэн буцахыг мэдэж авна уу."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Та Нүүр лүү очих зангааг гүйцэтгэлээ."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Нүүр лүү очихын тулд шудрах"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Дэлгэцийнхээ доороос дээш шударна уу. Энэ зангаа таныг тогтмол Үндсэн нүүрэнд аваачна."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Та дэлгэцийн доод булангаас дээш шударна уу."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Суллахаасаа өмнө цонхыг илүү удаан дарж үзнэ үү."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Та чигээрээ шударч, дараа нь түр зогсооно уу."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Та зангааг хэрхэн ашиглахыг мэдэж авлаа. Зангааг унтраахын тулд Тохиргоо руу очно уу."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Та аппуудыг сэлгэх зангааг гүйцэтгэлээ."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Аппуудыг сэлгэхийн тулд шудрах"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Дэлгэцийнхээ доод хэсгээс дээш шударч, удаан дараад суллана уу."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Бүгдийг тохируулсан"</string>
diff --git a/quickstep/res/values-mr/strings.xml b/quickstep/res/values-mr/strings.xml
index 77173b7c2f..bb1f89094f 100644
--- a/quickstep/res/values-mr/strings.xml
+++ b/quickstep/res/values-mr/strings.xml
@@ -88,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"पुन्हा प्रयत्न करा"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"छान!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ट्युटोरियल <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"सर्व तयार आहे!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"होमवर जाण्यासाठी वरती स्वाइप करा"</string>
+    <string name="allset_description" msgid="6350320429953234580">"तुम्ही तुमचा फोन वापरण्यास सुरुवात करू शकता"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"अ‍ॅक्सेसिबिलिटीसाठी नेव्हिगेशन सेटिंग्ज"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"शेअर करा"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"स्क्रीनशॉट"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"अ‍ॅप किंवा तुमच्या संस्थेद्वारे ही क्रिया करण्याची अनुमती नाही"</string>
diff --git a/quickstep/res/values-my/strings.xml b/quickstep/res/values-my/strings.xml
index 8693fb1aac..44d096259a 100644
--- a/quickstep/res/values-my/strings.xml
+++ b/quickstep/res/values-my/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ကြိုတင်မှန်းဆထားသော အက်ပ်− <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ဘယ်ဘက်အစွန် ခပ်လှမ်းလှမ်းမှ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ဘယ်ဘက်အစွန်မှ ဖန်သားပြင်အလယ်သို့ ပွတ်ဆွဲပြီး လွှတ်လိုက်ကြောင်း သေချာပါစေ။"</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"ကောင်းသည်။ နောက်သို့ပြန်သွားရန် ညာဘက်မှ ပွတ်ဆွဲပါ"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"ဖန်သားပြင်၏ညာအစွန်းမှ အလယ်သို့ပွတ်ဆွဲ၍ ပြီးခဲ့သောဖန်သားပြင်သို့လည်း ပြန်သွားနိုင်သည်။"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ညာဘက်အစွန် ခပ်လှမ်းလှမ်းမှ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ညာဘက်အစွန်မှ ဖန်သားပြင်အလယ်သို့ ပွတ်ဆွဲပြီး လွှတ်လိုက်ကြောင်း သေချာပါစေ။"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"နောက်ဆုတ်လက်ဟန် ရှင်းလင်းပို့ချချက် ပြီးပါပြီ။ နောက်အဆင့်တွင် အက်ပ်များပြောင်းနည်းကို လေ့လာပါ။"</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"နောက်ဆုတ်လက်ဟန် ရှင်းလင်းပို့ချချက် ပြီးပါပြီ။"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ဖန်သားပြင် အောက်ခြေနှင့် အလွန်နီးကပ်စွာ ပွတ်ဆွဲခြင်းမရှိကြောင်း သေချာပါစေ။"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"နောက်ဆုတ်လက်ဟန်၏ အာရုံခံစွမ်းကိုပြောင်းရန် ‘ဆက်တင်များ’ သို့ သွားပါ"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"နောက်သို့ပြန်သွားရန် ဘယ်ဘက်မှ ပွတ်ဆွဲပါ"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"သင်ရှိခဲ့သည့် ပြီးခဲ့သောဖန်သားပြင်သို့ ပြန်သွားရန် ဖန်သားပြင်၏ဘယ်အစွန်းမှ အလယ်သို့ပွတ်ဆွဲပါ။"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ဖန်သားပြင် အောက်ခြေအစွန်မှ အပေါ်သို့ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"လက်မလွှတ်ခင် ခဏရပ်ခြင်းမရှိကြောင်း သေချာပါစေ။"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"အပေါ်တည့်တည့်သို့ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"ပင်မစာမျက်နှာသို့သွားသည့် လက်ဟန် ရှင်းလင်းပို့ချချက် ပြီးပါပြီ။ နောက်အဆင့်တွင် နောက်သို့ပြန်သွားနည်းကို လေ့လာပါ။"</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"ပင်မစာမျက်နှာသို့သွားသည့် လက်ဟန် ရှင်းလင်းပို့ချချက် ပြီးပါပြီ။"</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"ပင်မစာမျက်နှာသို့သွားရန် ပွတ်ဆွဲပါ"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"သင့်ဖန်သားပြင် အောက်ခြေမှ အပေါ်သို့ပွတ်ဆွဲပါ။ ဤလက်ဟန်ဖြင့် ပင်မစာမျက်နှာသို့ အမြဲပြန်သွားနိုင်သည်။"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ဖန်သားပြင် အောက်ခြေအစွန်မှ အပေါ်သို့ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"မလွှတ်ခင် ဝင်းဒိုးကို အချိန်ကြာကြာ ဖိထားကြည့်ပါ။"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"အပေါ်တည့်တည့်သို့ ပွတ်ဆွဲပြီးနောက် ခဏရပ်ကြောင်း သေချာပါစေ။"</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"လက်ဟန်များသုံးနည်းကို သင်သိသွားပါပြီ။ လက်ဟန်များကို ပိတ်ရန် ‘ဆက်တင်များ’ သို့ သွားပါ။"</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"အက်ပ်များပြောင်းသည့် လက်ဟန် ရှင်းလင်းပို့ချချက် ပြီးပါပြီ။"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"အက်ပ်များပြောင်းရန် ပွတ်ဆွဲပါ"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"သင့်ဖန်သားပြင် အောက်ခြေမှ အပေါ်သို့ ပွတ်ဆွဲပါ၊ ဖိထားပြီးနောက် လွှတ်လိုက်ပါ။"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"အားလုံးအဆင်သင့်ဖြစ်ပါပြီ"</string>
diff --git a/quickstep/res/values-nb/strings.xml b/quickstep/res/values-nb/strings.xml
index 8dce6c016a..42ba19f92e 100644
--- a/quickstep/res/values-nb/strings.xml
+++ b/quickstep/res/values-nb/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Foreslått app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Sørg for at du sveiper fra kanten helt til venstre."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Sørg for at du sveiper fra den venstre kanten til midten av skjermen og slipper."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Bra! Sveip nå fra høyre for å gå tilbake"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Du kan også gå tilbake til forrige skjerm ved å sveipe fra høyre kant til midten av skjermen."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Sørg for at du sveiper fra kanten helt til høyre."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Sørg for at du sveiper fra den høyre kanten til midten av skjermen og slipper."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Du har fullført bevegelsen for å gå tilbake. I neste trinn lærer du hvordan du bytter app."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Du har fullført bevegelsen for å gå tilbake."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Sørg for at du ikke sveiper for nær bunnen av skjermen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Gå til Innstillinger for å endre tilbakebevegelsefølsomheten"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Sveip fra venstre for å gå tilbake"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"For å gå tilbake til den forrige skjermen du var på, sveip fra venstre kant til midten av skjermen."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Sørg for at du sveiper opp fra den nederste kanten av skjermen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Sørg for at du ikke setter på pause før du slipper."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Sørg for at du sveiper rett opp."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Du har fullført bevegelsen for å gå til startskjermen. I neste trinn ser du hvordan du går tilbake."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Du har fullført bevegelsen for å gå til startskjermen."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Sveip for å gå til startskjermen"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Sveip opp fra bunnen av skjermen. Denne bevegelsen tar deg alltid til startskjermen."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Sørg for at du sveiper opp fra den nederste kanten av skjermen."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Prøv å holde vinduet lenger før du slipper."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Sørg for at du sveiper rett opp, og så stopper du."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Du har lært hvordan du bruker bevegelser. For å slå av bevegelser, gå til Innstillinger."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Du har fullført bevegelsen for å bytte app."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Sveip for å bytte app"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Sveip opp fra bunnen av skjermen, hold og slipp."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Ferdig"</string>
diff --git a/quickstep/res/values-nl/strings.xml b/quickstep/res/values-nl/strings.xml
index 5426128c99..af043e104f 100644
--- a/quickstep/res/values-nl/strings.xml
+++ b/quickstep/res/values-nl/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Voorspelde app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Swipe helemaal vanaf de linkerrand."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Swipe vanaf de linkerrand naar het midden van het scherm en laat los."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Mooi! Swipe nu vanaf de rechterkant om terug te gaan."</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Je kunt ook teruggaan naar het laatste scherm door vanaf de rechterkant naar het midden van het scherm te swipen."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Swipe helemaal vanaf de rechterrand."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Swipe vanaf de rechterrand naar het midden van het scherm en laat los."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Je weet nu hoe je het gebaar Terug maakt. Ontdek als volgende hoe je tussen apps schakelt."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Je weet nu hoe je het gebaar Terug maakt."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Swipe niet te dicht bij de onderkant van het scherm."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Open Instellingen om de gevoeligheid van Terug te wijzigen"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Swipe vanaf de linkerkant om terug te gaan"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Swipe vanaf de linkerkant naar het midden van het scherm om terug te gaan naar het vorige scherm."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Swipe vanaf de onderrand van het scherm omhoog."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pauzeer niet voordat je loslaat."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Swipe recht omhoog."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Je weet nu hoe je het gebaar Naar startscherm maakt. Ontdek als volgende hoe je kunt teruggaan."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Je weet nu hoe je het gebaar Naar startscherm maakt."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Swipe om naar het startscherm te gaan"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Swipe omhoog vanaf de onderkant van het scherm. Met dit gebaar ga je altijd naar het startscherm."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Swipe vanaf de onderrand van het scherm omhoog."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Houd het venster langer vast voordat je loslaat."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Swipe recht omhoog en pauzeer dan."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Je weet nu hoe je gebaren gebruikt. Als je gebaren wilt uitzetten, kun je dat via Instellingen doen."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Je weet nu hoe je het gebaar Schakelen tussen apps maakt."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe om tussen apps te schakelen"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swipe omhoog vanaf de onderkant van het scherm, houd vast en laat dan los."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Klaar"</string>
diff --git a/quickstep/res/values-pl/strings.xml b/quickstep/res/values-pl/strings.xml
index e76b357d01..6a8f188a3c 100644
--- a/quickstep/res/values-pl/strings.xml
+++ b/quickstep/res/values-pl/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Przewidywana aplikacja: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pamiętaj, aby przesuwać palcem od samej lewej krawędzi."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pamiętaj, aby przesuwać palcem od lewej krawędzi do środka ekranu, a potem podnieść palec."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Super! A teraz przesuń palcem od prawej strony, by powrócić"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Możesz także wrócić do ostatniego ekranu, przesuwając palcem od prawej krawędzi do środka ekranu."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pamiętaj, aby przesuwać palcem od samej prawej krawędzi."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pamiętaj, aby przesuwać palcem od prawej krawędzi do środka ekranu, a potem podnieść palec."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Gest przejścia wstecz został opanowany. Poćwicz teraz przełączanie aplikacji."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Gest przejścia wstecz został opanowany."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pamiętaj, aby nie przesuwać palcem zbyt blisko dolnej części ekranu."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Czułość gestu cofania możesz zmienić w Ustawieniach"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Aby wrócić, przesuń palcem od lewej strony"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Aby wrócić do ostatniego ekranu, przesuń palcem od lewej krawędzi do środka ekranu."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pamiętaj, aby przesuwać palcem od dolnej krawędzi ekranu."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pamiętaj, aby przed podniesieniem palca nie było przerwy."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pamiętaj, aby przesuwać palcem prosto do góry."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Gest przechodzenia na ekran główny został opanowany. Poćwicz teraz przechodzenie na ekran główny."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Gest przechodzenia na ekran główny został opanowany."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Przesuwanie palcem, aby przejść na ekran główny"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Przesuń palcem z dołu ekranu. Ten gest zawsze powoduje przejście na ekran główny."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Pamiętaj, aby przesuwać palcem od dolnej krawędzi ekranu."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Przytrzymaj okno dłużej, zanim podniesiesz palec."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Pamiętaj, aby przesuwać palcem prosto do góry, a potem przerwać ruch."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Wiesz już, jak używać gestów. Aby wyłączyć gesty, przejdź do Ustawień."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Gest przełączania aplikacji został opanowany."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Przesuwanie palcem, aby przełączać aplikacje"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Przesuń palcem od dołu ekranu, przytrzymaj i puść."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Wszystko gotowe"</string>
diff --git a/quickstep/res/values-pt-rPT/strings.xml b/quickstep/res/values-pt-rPT/strings.xml
index f5dc80d99b..b553c4c92b 100644
--- a/quickstep/res/values-pt-rPT/strings.xml
+++ b/quickstep/res/values-pt-rPT/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App prevista: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Garanta que desliza rapidamente com o dedo a partir da extremidade esquerda."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Garanta que desliza rapidamente com o dedo do limite esquerdo até ao centro do ecrã e solta."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Boa! Deslize rapidamente a partir da direita para retroceder"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Também pode voltar ao último ecrã ao deslizar rapidamente da direita para o centro do ecrã."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Garanta que desliza rapidamente com o dedo a partir da extremidade direita."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Garanta que desliza rapidamente com o dedo do limite direito até ao centro do ecrã e solta."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Concluiu o gesto para retroceder. A seguir, saiba como alternar entre apps."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Concluiu o gesto para retroceder."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Garanta que não desliza rapidamente com o dedo demasiado perto da parte inferior do ecrã."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Altere a sensibilidade do gesto para voltar nas Definições."</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Deslize rapidamente a partir da esquerda para retroceder"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Para voltar ao último ecrã, deslize rapidamente a partir do limite esquerdo para o centro do ecrã."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Garanta que desliza rapidamente com o dedo a partir do limite inferior do ecrã."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Garanta que não faz uma pausa antes de soltar."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Garanta que desliza rapidamente com o dedo para cima."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Concluiu o gesto para aceder à Página inicial. A seguir, saiba como retroceder."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Concluiu o gesto para aceder à Página inicial."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Deslize rapidamente com o dedo para aceder à Página inicial"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Deslize rapidamente para cima a partir da parte inferior. Este gesto abre sempre o ecrã principal."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Garanta que desliza rapidamente com o dedo a partir do limite inferior do ecrã."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Experimente premir a janela durante mais tempo antes de soltar."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Garanta que desliza rapidamente com o dedo para cima e, em seguida, faz uma pausa."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Aprendeu a utilizar gestos. Para desativar os gestos, aceda às Definições."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Concluiu o gesto para alternar entre apps."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Deslize rapidamente com o dedo para alternar entre apps"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Deslize rapidamente para cima a partir da parte inferior do ecrã sem soltar e, em seguida, solte."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Está tudo pronto"</string>
diff --git a/quickstep/res/values-pt/strings.xml b/quickstep/res/values-pt/strings.xml
index 55b7f52ed1..3b3148f258 100644
--- a/quickstep/res/values-pt/strings.xml
+++ b/quickstep/res/values-pt/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App previsto: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Deslize da borda esquerda."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Deslize da borda esquerda até o meio da tela e solte."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Muito bem! Agora deslize da direita para voltar"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Para voltar à tela anterior, deslize da borda direita até o meio da tela."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Deslize da borda direita."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Deslize da borda direita até o meio da tela e solte."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Você concluiu o gesto para voltar. A seguir, aprenda a trocar de app."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Você concluiu o gesto para voltar."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Não deslize perto demais da parte inferior da tela."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Mude a sensibilidade do gesto de voltar nas configurações"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Deslize da esquerda para voltar"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Para voltar à tela anterior, deslize da borda esquerda até o meio da tela."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Deslize da borda inferior da tela para cima."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Não pare antes de soltar."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Deslize para cima."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Você concluiu o gesto para acessar a tela inicial. A seguir, aprenda a voltar."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Você concluiu o gesto para acessar a tela inicial."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Deslizar para voltar à tela inicial"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Deslize de baixo para cima na tela. Esse gesto sempre leva você para a tela inicial."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Deslize da borda inferior da tela para cima."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Mantenha a janela pressionada por mais tempo antes de soltar."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Deslize para cima e pare."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Você aprendeu a usar gestos. Para desativá-los, acesse as Configurações."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Você concluiu o gesto para trocar de app."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Deslizar para trocar de app"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Deslize de baixo para cima na tela, mantenha-a pressionada e depois solte."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Tudo pronto"</string>
diff --git a/quickstep/res/values-ro/strings.xml b/quickstep/res/values-ro/strings.xml
index b03ea41d1a..11d23d1945 100644
--- a/quickstep/res/values-ro/strings.xml
+++ b/quickstep/res/values-ro/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplicația estimată: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Glisați dinspre marginea stângă îndepărtată."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Glisați dinspre marginea stângă spre mijlocul ecranului și eliberați."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Bravo! Acum glisați dinspre dreapta pentru a reveni."</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Reveniți la ultimul ecran glisând de la marginea dreaptă spre mijlocul ecranului."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Glisați dinspre marginea dreaptă îndepărtată."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Glisați dinspre marginea dreaptă spre mijlocul ecranului și eliberați."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Ați finalizat gestul „înapoi”. În continuare, aflați cum să comutați între aplicații."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ați finalizat gestul „înapoi”."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nu glisați prea aproape de partea de jos a ecranului."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Schimbați sensibilitatea gestului „Înapoi” accesând Setările"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Glisați dinspre stânga pentru a reveni"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Pentru a reveni la ultimul ecran accesat, glisați de la marginea stângă spre mijlocul ecranului."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Glisați în sus dinspre marginea de jos a ecranului."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Nu întrerupeți gestul înainte de a elibera."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Glisați direct în sus."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Ați finalizat gestul „înapoi la pagina de pornire”. În continuare, aflați cum să reveniți."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Ați finalizat gestul „înapoi la pagina de pornire”."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Glisați pentru a accesa pagina de pornire"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Glisați în sus din partea de jos a ecranului. Cu acest gest accesați întotdeauna ecranul de pornire."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Glisați în sus dinspre marginea de jos a ecranului."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Încercați să țineți fereastra mai mult înainte s-o eliberați."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Glisați direct în sus, apoi întrerupeți."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Ați învățat cum să folosiți gesturi. Pentru a dezactiva gesturile, accesați Setările."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Ați finalizat gestul „comutați între aplicații”."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Glisați pentru a comuta între aplicații"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Glisați în sus din partea de jos a ecranului, așteptați, apoi eliberați."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Gata"</string>
diff --git a/quickstep/res/values-ru/strings.xml b/quickstep/res/values-ru/strings.xml
index f98d5d57ab..e8a1be3a80 100644
--- a/quickstep/res/values-ru/strings.xml
+++ b/quickstep/res/values-ru/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Рекомендуемое приложение: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Проведите слева направо от самого края экрана."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Проведите от левого края экрана до середины дисплея и отпустите палец."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Отлично! Теперь проведите справа налево, чтобы вернуться."</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Вернуться назад можно, проведя от правого края к центру."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Проведите справа налево от самого края экрана."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Проведите от правого края экрана до середины дисплея и отпустите палец."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Вы выполнили жест для перехода назад. Теперь мы расскажем, как переключаться между приложениями."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Вы выполнили жест для перехода назад."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Проведите пальцем не слишком близко к нижнему краю экрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Уровень чувствительности можно изменить в настройках."</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Чтобы вернуться, проведите слева направо."</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Чтобы вернуться к предыдущему экрану, проведите от левого края к центру."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Проведите снизу вверх от самого края экрана."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Не приостанавливайтесь перед тем, как отпустить палец."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Проведите по экрану ровно вверх."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Вы выполнили жест для перехода на главный экран. Далее мы расскажем, как вернуться назад."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Вы выполнили жест для перехода на главный экран."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Переход на главный экран"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Проведите вверх от нижнего края дисплея. Этот жест открывает главный экран."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Проведите снизу вверх от самого края экрана."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Прежде чем отпускать палец, задержите его на дисплее подольше."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Проведите по экрану ровно вверх, а затем задержите палец в крайнем положении."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Теперь вы знаете, как использовать жесты. Чтобы отключить их, перейдите в настройки."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Вы выполнили жест для переключения между приложениями."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Переключение между приложениями"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Проведите вверх от нижнего края экрана, задержите палец в крайнем положении, а затем отпустите."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Готово"</string>
diff --git a/quickstep/res/values-si/strings.xml b/quickstep/res/values-si/strings.xml
index 59d0d6f125..f540b44a10 100644
--- a/quickstep/res/values-si/strings.xml
+++ b/quickstep/res/values-si/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"පුරෝකථනය කළ යෙදුම: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ඔබ ඈත වම් දාරයෙන් ස්වයිප් කරන බවට සහතික කර ගන්න."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ඔබ වම් දාරයේ සිට තිරයේ මැදට ස්වයිප් කර අත හරින බව සහතික කර ගන්න."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"කදිමයි! දැන් ආපසු යාමට දකුණේ සිට ස්වයිප් කරන්න"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"දකුණු මායිමේ සිට තිරයේ මැදට ස්වයිප් කර අවසාන තිරයට යා හැකිය."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ඔබ ඈත දකුණු දාරයෙන් ස්වයිප් කරන බවට සහතික කර ගන්න."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ඔබ දකුණු දාරයේ සිට තිරයේ මැදට ස්වයිප් කර අත හරින බව සහතික කර ගන්න."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"ඔබ ආපසු යාමේ ඉංගිතය සම්පූර්ණ කරන ලදි. ඊළඟට, යෙදුම් මාරු කරන ආකාරය දැන ගන්න."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ඔබ ආපසු යාමේ ඉංගිතය සම්පූර්ණ කරන ලදි."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ඔබ තිරයේ පහළට ඉතාම සමීපව ස්වයිප් නොකරන බවට සහතික කර ගන්න."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ආපසු ඉංගිතයෙහි සංවේදීතාව වෙනස් කිරීමට, සැකසීම් වෙත යන්න"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"ආපසු යාමට වමේ සිට ස්වයිප් කරන්න"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"ඔබ සිටි අවසාන තිරයට ආපසු යාමට, වම් මායිමෙන් තිරයේ මැදට ස්වයිප් කරන්න."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ඔබ තිරයේ පහළ දාරයේ සිට ඉහළට ස්වයිප් කරන බව සහතික කර ගන්න."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"යාමට ඉඩ හැරීමට පෙර ඔබ විරාමයක් නොගන්නා බව සහතික කර ගන්න."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ඔබ කෙලින්ම ඉහළට ස්වයිප් කරන බව සහතික කර ගන්න."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"ඔබ මුල් පිටුවට යාමේ ඉංගිතය සම්පූර්ණ කරන ලදි. ඊළඟට, ආපසු යන ආකාරය දැන ගන්න."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"ඔබ මුල් පිටුවට යාමේ ඉංගිතය සම්පූර්ණ කරන ලදි."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"මුල් පිටුවට යාමට ස්වයිප් කරන්න"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"ඔබගේ තිරයේ පහළින් උඩට ස්වයිප් කරන්න.මෙම ඉංගිතය සැම විටම ඔබව මුල් තිරයට ගෙන යයි."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ඔබ තිරයේ පහළ දාරයේ සිට ඉහළට ස්වයිප් කරන බව සහතික කර ගන්න."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"මුදා හැරීමට පෙර කවුළුව වැඩි වේලාවක් රඳවා තබා ගැනීමට උත්සාහ කරන්න."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"ඔබ කෙලින්ම ඉහළට ස්වයිප් කර, අනතුරුව විරාම කරන බව සහතික කර ගන්න."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"ඔබ ඉංගිත භාවිත කරන ආකාරය දැන ගෙන ඇත. ඉංගිත ක්‍රියාවිරහිත කිරීමට, සැකසීම් වෙත යන්න."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"ඔබ යෙදුම් මාරු කිරීමේ ඉංගිතය සම්පූර්ණ කර ඇත."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"යෙදුම් මාරු කිරීමට ස්වයිප් කරන්න"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ඔබගේ තිරයේ පහළින් උඩට ස්වයිප් කර, අල්ලාගෙන සිට, අනතුරුව මුදා හරින්න."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"සියල්ල සකසා ඇත"</string>
diff --git a/quickstep/res/values-sk/strings.xml b/quickstep/res/values-sk/strings.xml
index 7d2d0b7b4b..95f220d29d 100644
--- a/quickstep/res/values-sk/strings.xml
+++ b/quickstep/res/values-sk/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predpovedaná aplikácia: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Musite potiahnuť z úplne krajného ľavého okraja."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Musíte potiahnuť z ľavého okraja do stredu obrazovky a uvoľniť."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Výborne! Teraz prejdite späť potiahnutím sprava."</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Na poslednú obrazovku sa môžete tiež vrátiť potiahnutím z pravého okraja do stredu obrazovky."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Musite potiahnuť z úplne krajného pravého okraja."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Musíte potiahnuť z pravého okraja do stredu obrazovky a uvoľniť."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Dokončili ste gesto na prechod späť. V ďalšom kroku sa naučíte, ako prepínať aplikácie."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Dokončili ste gesto na prechod späť."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nesmiete potiahnuť príliš blízko dolnej časti obrazovky."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Ak chcete zmeniť citlivosť gesta Späť, prejdite do Nastavení"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Vrátite sa potiahnutím zľava"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Na poslednú obrazovku prejdete potiahnutím z ľavého okraja do stredu obrazovky."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Musíte potiahnuť nahor z dolného okraja obrazovky."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pred uvoľnením nesmiete zastať."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Musíte potiahnuť priamo hore."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Dokončili ste gesto na prechod na plochu. V ďalšom kroku sa naučíte, ako sa vrátiť späť."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Dokončili ste gesto na prechod na plochu."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Prechod na plochu potiahnutím"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Potiahnite nahor z dolného okraja obrazovky. Týmto gestom sa vždy vrátite na plochu."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Musíte potiahnuť nahor z dolného okraja obrazovky."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Skúste okno pred uvoľnením podržať dlhšie."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Musite potiahnuť priamo hore a potom zastať."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Naučili ste sa používať gestá. Ak ich chcete vypnúť, prejdite do Nastavení."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Dokončili ste gesto na prepnutie aplikácií."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Prepínanie aplikácií potiahnutím"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Potiahnite nahor z dolnej časti obrazovky, pridržte a uvoľnite."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Hotovo"</string>
diff --git a/quickstep/res/values-sl/strings.xml b/quickstep/res/values-sl/strings.xml
index 9458b8cd91..42b093d6bb 100644
--- a/quickstep/res/values-sl/strings.xml
+++ b/quickstep/res/values-sl/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predvidena aplikacija: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pazite, da ne povlečete s skrajno levega roba."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pazite, da povlečete z levega roba do sredine zaslona in dvignete prst."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Odlično! Zdaj za pomik nazaj povlecite z desne."</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Na zadnji zaslon se lahko vrnete tudi tako, da z desnega roba povlečete do sredine zaslona."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pazite, da ne povlečete s skrajno desnega roba."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pazite, da povlečete z desnega roba do sredine zaslona in dvignete prst."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Izvedli ste potezo za pomik nazaj. Zdaj se naučite preklapljanja med aplikacijami."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Izvedli ste potezo za pomik nazaj."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pazite, da ne povlečete preblizu dna zaslona."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Občutljivost poteze za nazaj lahko spremenite v nastavitvah."</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Povlecite z leve za pomik nazaj."</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Če se želite vrniti na zadnji prikazani zaslon, povlecite z levega roba do sredine zaslona."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pazite, da povlečete s spodnjega roba zaslona navzgor."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pazite, da ne zaustavite prsta, preden ga dvignete."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pazite, da povlečete naravnost navzgor."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Izvedli ste potezo za pomik na začetni zaslon. Zdaj se naučite, kako se pomaknete nazaj."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Izvedli ste potezo za pomik na začetni zaslon."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Vlečenje za pomik na začetni zaslon"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Z dna zaslona s prstom povlecite navzgor. S to potezo lahko vedno odprete začetni zaslon."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Pazite, da povlečete s spodnjega roba zaslona navzgor."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Poskusite okno pridržati dalj časa, preden ga izpustite."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Pazite, da povlečete naravnost navzgor in nato zaustavite prst."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Naučili ste se uporabljati poteze. Poteze lahko izklopite v nastavitvah."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Izvedli ste potezo za preklapljanje med aplikacijami."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Vlečenje za preklapljanje med aplikacijami"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Povlecite navzgor z dna zaslona, pridržite, nato izpustite."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Zdaj znate"</string>
diff --git a/quickstep/res/values-sq/strings.xml b/quickstep/res/values-sq/strings.xml
index 046155ed91..cee7183616 100644
--- a/quickstep/res/values-sq/strings.xml
+++ b/quickstep/res/values-sq/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplikacioni i parashikuar: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Sigurohu që të rrëshqasësh shpejt nga skaji sa më majtas."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Sigurohu që të rrëshqasësh shpejt nga skaji i majtë drejt mesit të ekranit dhe lëshoje."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Bukur! Tani rrëshqit shpejt nga e djathta për t\'u kthyer prapa"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Mund dhe të kthehesh në ekranin e fundit duke rrëshqitur shpejt nga skaji i djathtë në mes të ekranit."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Sigurohu që të rrëshqasësh shpejt nga skaji sa më djathtas."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Sigurohu që të rrëshqasësh shpejt nga skaji i djathtë drejt mesit të ekranit dhe lëshoje."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"E ke përfunduar gjestin e kthimit prapa. Në vijim do të mësosh se si t\'i ndërrosh aplikacionet."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"E ke përfunduar gjestin e kthimit prapa."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Sigurohu që të mos rrëshqasësh shumë afër fundit të ekranit."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Për të ndryshuar ndjeshmërinë e gjestit të kthimit prapa, shko te \"Cilësimet\""</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Rrëshqit shpejt nga e majta për t\'u kthyer prapa"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Për t\'u kthyer në ekranin e fundit ku ishe, rrëshqit shpejt nga skaji i majtë në mes të ekranit."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Sigurohu që të rrëshqasësh shpejt lart nga skaji i poshtëm i ekranit."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Sigurohu që të mos ndalosh para se ta lëshosh."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Sigurohu që të rrëshqasësh shpejt drejt lart."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"E ke përfunduar gjestin e kalimit tek ekrani bazë. Në vijim do të mësosh si të kthehesh prapa."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"E ke përfunduar gjestin e kalimit tek ekrani bazë."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Rrëshqit shpejt për të kaluar tek ekrani bazë"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Rrëshqit shpejt lart nga fundi i ekranit tënd. Ky gjest të dërgon gjithmonë tek ekrani bazë."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Sigurohu që të rrëshqasësh shpejt lart nga skaji i poshtëm i ekranit."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Provo ta mbash shtypur dritaren për një kohë më të gjatë para se ta lëshosh."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Sigurohu që të rrëshqasësh shpejt drejt lart dhe më pas ndalo."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Ke mësuar si të përdorësh gjestet. Për t\'i çaktivizuar gjestet, shko te \"Cilësimet\"."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"E ke përfunduar gjestin e ndërrimit të aplikacioneve."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Rrëshqit shpejt për të ndërruar aplikacionet"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Rrëshqit shpejt lart nga fundi i ekranit, mbaje të shtypur dhe më pas lëshoje."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Plotësisht gati"</string>
diff --git a/quickstep/res/values-sr/strings.xml b/quickstep/res/values-sr/strings.xml
index 4288e4adba..21bcda23e5 100644
--- a/quickstep/res/values-sr/strings.xml
+++ b/quickstep/res/values-sr/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Предвиђамо апликацију: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Обавезно превуците од саме леве ивице."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Обавезно превуците од леве ивице до средине екрана и отпустите."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Свака част! Сада превуците здесна да бисте се вратили"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Вратите се на последњи екран превлачењем здесна ка средини."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Обавезно превуците од саме десне ивице."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Обавезно превуците од десне ивице до средине екрана и отпустите."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Довршили сте покрет за повратак. Сада сазнајте како да промените апликације."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Довршили сте покрет за повратак."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Никако не превлачите превише близу дна екрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Осетљивост пок. за назад можете да промените у Подешавањима"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Превуците са леве стране да бисте се вратили"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Да бисте се вратили на последњи екран, превуците од леве ивице ка средини екрана."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Обавезно превуците нагоре од доње ивице екрана."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Никако не стајте пре отпуштања."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Обавезно превуците право нагоре."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Довршили сте покрет за повратак на почетну страницу. Сада сазнајте како да се вратите."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Довршили сте покрет за повратак на почетну страницу."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Превуците да бисте отишли на почетну страницу"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Превуците нагоре од дна екрана. Овај покрет вас увек води на почетни екран."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Обавезно превуците нагоре од доње ивице екрана."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Пробајте да држите прозор дуже пре отпуштања."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Обавезно превуците право нагоре, па застаните."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Научили сте како да користите покрете. Да бисте искључили покрете, идите на подешавања."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Довршили сте покрет за промену апликација."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Превуците да бисте променили апликације"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Превуците нагоре од дна екрана, задржите, па пустите."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"То је то"</string>
diff --git a/quickstep/res/values-sw/strings.xml b/quickstep/res/values-sw/strings.xml
index 603d3703d2..d8bfcf06d4 100644
--- a/quickstep/res/values-sw/strings.xml
+++ b/quickstep/res/values-sw/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Programu iliyotabiriwa: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Hakikisha unatelezesha kidole kuanzia ukingo wa mbali wa kushoto."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Hakikisha unatelezesha kidole kuanzia ukingo wa kushoto kuelekea katikati ya skrini na uachilie."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Safi! Sasa telezesha kidole kuanzia kulia ili urudi nyuma"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Unaweza pia kurudi kwenye skrini iliyotangulia kwa kutelezesha kidole kuanzia ukingo wa kulia kuelekea katikati ya skrini."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Hakikisha unatelezesha kidole kuanzia ukingo wa mbali wa kulia."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Hakikisha unatelezesha kidole kuanzia ukingo wa kulia kuelekea katikati ya skrini na uachilie."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Umekamilisha ishara ya kurudi nyuma. Hatua inayofuata, jifunze jinsi ya kubadilisha programu."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Umekamilisha ishara ya kurudi nyuma."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Hakikisha hutelezeshi kidole karibu sana na sehemu ya chini ya skrini."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Kubadilisha hisi ya ishara ya nyuma, nenda kwenye Mipangilio"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Telezesha kidole kutoka kushoto ili urudi nyuma"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Ili urudi kwenye skrini iliyotangulia, telezesha kidole kuanzia ukingo wa kushoto kuelekea katikati ya skrini."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Hakikisha unatelezesha kidole juu kuanzia ukingo wa chini wa skrini."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Hakikisha kuwa husimamishi kabla ya kuachilia."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Hakikisha unatelezesha kidole kuelekea juu."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Umekamilisha ishara ya kwenda kwenye Skrini ya kwanza. Inayofuata, jifunze jinsi ya kurudi nyuma."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Umekamilisha ishara ya kwenda kwenye Skrini ya kwanza."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Telezesha kidole ili uende kwenye skrini ya kwanza"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Telezesha kidole juu kuanzia chini ya skrini yako. Ishara hii kila wakati hukupeleka kwenye Skrini ya kwanza."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Hakikisha unatelezesha kidole juu kuanzia ukingo wa chini wa skrini."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Jaribu kushikilia dirisha kwa muda mrefu kabla ya kuachilia."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Hakikisha unatelezesha kidole kuelekea juu, kisha usimamishe."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Umejifunza jinsi ya kutumia ishara. Ili uzime ishara, nenda kwenye Mipangilio."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Umekamilisha ishara ya kubadilisha programu."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Telezesha kidole ili ubadilishe programu"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Telezesha kidole juu kuanzia sehemu ya chini ya skrini yako, ushikilie, kisha uachilie."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Kila kitu kiko tayari"</string>
diff --git a/quickstep/res/values-ta/strings.xml b/quickstep/res/values-ta/strings.xml
index a2bc05b6b1..d12c51c2a8 100644
--- a/quickstep/res/values-ta/strings.xml
+++ b/quickstep/res/values-ta/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"கணித்த ஆப்ஸ்: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"இடது ஓரத்தின் விளிம்பிலிருந்து ஸ்வைப் செய்கிறீர்கள் என்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"இடது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்தபிறகு விடுவிப்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"அருமை! பின்செல்வதற்கு வலதுபுறத்திலிருந்து ஸ்வைப் செய்யுங்கள்"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"வலது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்தும் முந்தைய திரைக்கு மீண்டும் செல்லலாம்."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"வலது ஓரத்தின் விளிம்பிலிருந்து ஸ்வைப் செய்கிறீர்கள் என்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"வலது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்தபிறகு விடுவிப்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"பின்செல் சைகைப் பயிற்சியை முடித்துவிட்டீர்கள். அடுத்து, ஆப்ஸுக்கிடையே மாறுவது எப்படி என்பதை அறிக."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"பின்செல் சைகைப் பயிற்சியை முடித்துவிட்டீர்கள்."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"திரையின் கீழ்பகுதிக்கு மிக நெருக்கமாக ஸ்வைப் செய்யவில்லை என்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"பின்செல் சைகையின் உணர்திறனை மாற்ற அமைப்புகளுக்குச் செல்க"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"பின்செல்வதற்கு இடதுபுறத்திலிருந்து ஸ்வைப் செய்யுங்கள்"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"முந்தைய திரைக்கு மீண்டும் செல்ல, இடது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்யுங்கள்."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"திரையின் கீழ் ஓரத்திலிருந்து மேல்நோக்கி ஸ்வைப் செய்வதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"விடுவிப்பதற்கு முன்பாக இடைநிறுத்தவில்லை என்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"மேல்நோக்கி நேராக ஸ்வைப் செய்வதை உறுதிசெய்துகொள்ளுங்கள்."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"முகப்புக்குச் செல் சைகைப் பயிற்சியை முடித்துவிட்டீர்கள். அடுத்து, பின்செல்வது எப்படி என்பதை அறிக."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"முகப்புக்குச் செல் சைகைப் பயிற்சியை முடித்துவிட்டீர்கள்."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"முகப்புக்குச் செல்ல ஸ்வைப் செய்யுங்கள்"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"திரையின் கீழிருந்து மேலாக ஸ்வைப் செய்க. இந்தச் சைகை எப்போதும் முகப்புத் திரைக்கு அழைத்துச் செல்லும்."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"திரையின் கீழ் ஓரத்திலிருந்து மேல்நோக்கி ஸ்வைப் செய்வதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"விடுவிப்பதற்கு முன்பாக நீண்டநேரம் சாளரத்தை அழுத்திப் பிடித்திருங்கள்."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"மேல்நோக்கி நேராக ஸ்வைப் செய்தபிறகு இடைநிறுத்துவதை உறுதிசெய்துகொள்ளுங்கள்."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"சைகைகளை எப்படி உபயோகிப்பது என்று கற்றுக்கொண்டீர்கள். சைகைகளை முடக்க அமைப்புகளுக்குச் செல்லுங்கள்."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"ஆப்ஸுக்கிடையே மாறும் சைகைப் பயிற்சியை முடித்துவிட்டீர்கள்."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ஆப்ஸுக்கிடையே மாற ஸ்வைப் செய்யுங்கள்"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"திரையின் கீழிலிருந்து மேலாக ஸ்வைப் செய்து, சில விநாடிகள் பிடித்திருந்து, பிறகு விரலை எடுங்கள்."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"எல்லாம் தயார்"</string>
diff --git a/quickstep/res/values-te/strings.xml b/quickstep/res/values-te/strings.xml
index bc122eb50d..78932d5e34 100644
--- a/quickstep/res/values-te/strings.xml
+++ b/quickstep/res/values-te/strings.xml
@@ -88,14 +88,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"మళ్లీ ట్రై చేయండి"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"పనితీరు బాగుంది!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ట్యుటోరియల్ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"అంతా సెట్ అయింది!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"హోమ్‌కు వెళ్లడానికి పైకి స్వైప్ చేయండి"</string>
+    <string name="allset_description" msgid="6350320429953234580">"మీరు మీ ఫోన్‌ను ఉపయోగించడానికి సిద్ధంగా ఉన్నారు"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"యాక్సెసిబిలిటీ కోసం నావిగేషన్ సెట్టింగ్‌లు"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"షేర్ చేయండి"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"స్క్రీన్‌షాట్"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ఈ చర్యను యాప్ గానీ, మీ సంస్థ గానీ అనుమతించవు"</string>
diff --git a/quickstep/res/values-th/strings.xml b/quickstep/res/values-th/strings.xml
index 95591fed9a..89206db038 100644
--- a/quickstep/res/values-th/strings.xml
+++ b/quickstep/res/values-th/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"แอปที่คาดว่าจะใช้: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ตรวจสอบว่าปัดจากขอบด้านซ้ายสุด"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ตรวจสอบว่าปัดจากขอบด้านซ้ายไปตรงกลางหน้าจอ แล้วยกนิ้วขึ้น"</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"ดีมาก ทีนี้ปัดจากด้านขวาเพื่อย้อนกลับ"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"หรือจะกลับไปหน้าจอล่าสุดโดยปัดจากขอบขวาไปตรงกลางหน้าจอก็ได้"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ตรวจสอบว่าปัดจากขอบด้านขวาสุด"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ตรวจสอบว่าปัดจากขอบด้านขวาไปตรงกลางหน้าจอ แล้วยกนิ้วขึ้น"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"คุณทำท่าทางสัมผัสเพื่อย้อนกลับเสร็จแล้ว ต่อไปดูวิธีสลับแอป"</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"คุณทำท่าทางสัมผัสเพื่อย้อนกลับเสร็จแล้ว"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ตรวจสอบว่าไม่ได้ปัดใกล้กับด้านล่างของหน้าจอมากเกินไป"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"เปลี่ยนความไวของท่าทางสัมผัสเพื่อย้อนกลับได้ที่การตั้งค่า"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"ปัดจากด้านซ้ายเพื่อย้อนกลับ"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"หากต้องการย้อนกลับไปที่หน้าจอล่าสุดที่เปิด ให้ปัดจากขอบด้านซ้ายไปตรงกลางหน้าจอ"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ตรวจสอบว่าปัดขึ้นจากขอบด้านล่างของหน้าจอ"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ตรวจสอบว่าไม่มีการหยุดชั่วคราวก่อนยกนิ้วขึ้น"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ตรวจสอบว่าปัดขึ้นในแนวตรง"</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"คุณทำท่าทางสัมผัสเพื่อไปที่หน้าแรกเสร็จแล้ว ต่อไปดูวิธีย้อนกลับ"</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"คุณทำท่าทางสัมผัสเพื่อไปที่หน้าแรกเสร็จแล้ว"</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"ปัดเพื่อไปที่หน้าแรก"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"ปัดขึ้นจากด้านล่างของหน้าจอ ท่าทางสัมผัสนี้จะนำคุณไปที่หน้าจอหลักเสมอ"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ตรวจสอบว่าปัดขึ้นจากขอบด้านล่างของหน้าจอ"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"ลองแตะหน้าต่างค้างไว้นานขึ้นก่อนปล่อยนิ้ว"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"ตรวจสอบว่าปัดขึ้นในแนวตรง แล้วหยุดชั่วคราว"</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"คุณรู้วิธีใช้ท่าทางสัมผัสแล้ว หากต้องการปิดท่าทางสัมผัส ให้ไปที่การตั้งค่า"</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"คุณทำท่าทางสัมผัสเพื่อสลับแอปเสร็จแล้ว"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ปัดเพื่อสลับแอป"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ปัดขึ้นจากด้านล่างของหน้าจอค้างไว้ แล้วปล่อย"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"เรียบร้อย"</string>
diff --git a/quickstep/res/values-tl/strings.xml b/quickstep/res/values-tl/strings.xml
index 211087efba..a4da3376a9 100644
--- a/quickstep/res/values-tl/strings.xml
+++ b/quickstep/res/values-tl/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Hinulaang app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Tiyaking magsa-swipe ka mula sa pinakadulo sa kaliwa."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Tiyaking mag-swipe mula sa kaliwang gilid papunta sa gitna ng screen, saka iangat ang iyong daliri."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Magaling! Ngayon, mag-swipe mula sa kanan para bumalik"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Puwede ka ring mag-swipe mula sa kanan papunta sa gitna para bumalik sa nakaraang screen."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Tiyaking magsa-swipe ka mula sa pinakadulo sa kanan."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Tiyaking mag-swipe mula sa kanang gilid papunta sa gitna ng screen, saka iangat ang iyong daliri."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Nakumpleto mo na ang galaw para bumalik. Susunod, alamin kung paano magpalipat-lipat sa mga app."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Nakumpleto mo na ang galaw para bumalik."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Tiyaking hindi ka magsa-swipe nang masyadong malapit sa ibaba ng screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Pumunta sa Settings para baguhin ang sensitivity ng pagbalik"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Mag-swipe mula sa kaliwa para bumalik"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Mag-swipe mula sa kaliwang gilid papunta sa gitna para bumalik sa nakaraang screen na pinuntahan mo."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Tiyaking magsa-swipe ka pataas mula sa pinakaibaba ng screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Tiyaking hindi ka magpo-pause bago iangat ang iyong daliri."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Tiyaking magsa-swipe ka nang diretso pataas."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Nakumpleto mo na ang galaw para pumunta sa Home. Susunod, alamin kung paano bumalik."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Nakumpleto mo na ang galaw para pumunta sa Home."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Mag-swipe para pumunta sa home"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Mag-swipe pataas mula sa ibaba ng iyong screen. Dadalhin ka palagi ng galaw na ito sa Home screen."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Tiyaking magsa-swipe ka pataas mula sa pinakaibaba ng screen."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Subukang pindutin nang mas matagal ang window bago ito bitawan."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Tiyaking magsa-swipe ka nang diretso pataas, pagkatapos ay mag-pause."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Alam mo na kung paano gumamit ng mga galaw. Para i-off ang mga galaw, pumunta sa Mga Setting."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Nakumpleto mo na ang galaw para magpalipat-lipat sa mga app."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Mag-swipe para lumipat ng app"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Mag-swipe pataas mula sa ibaba ng iyong screen, mag-hold, pagkatapos ay bitawan ito."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Handa na ang lahat"</string>
diff --git a/quickstep/res/values-tr/strings.xml b/quickstep/res/values-tr/strings.xml
index 0f44140df0..595a8a64c4 100644
--- a/quickstep/res/values-tr/strings.xml
+++ b/quickstep/res/values-tr/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Tahmin edilen uygulama: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Ekranın en solundan kaydırdığınızdan emin olun."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Sol kenardan ekranın ortasına doğru kaydırıp bıraktığınızdan emin olun."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Güzel! Şimdi geri gitmek için sağdan kaydırın"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"İsterseniz sağ kenardan ekranın ortasına kaydırarak son ekrana dönebilirsiniz."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Ekranın en sağından kaydırdığınızdan emin olun."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Sağ kenardan ekranın ortasına doğru kaydırıp bıraktığınızdan emin olun."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Geri dön hareketini tamamladınız. Sırada, uygulamalar arasında geçiş yapmayı öğrenmek var."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Geri dön hareketini tamamladınız."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ekranın alt kısmına çok yakın bir şekilde kaydırmadığınızdan emin olun."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Geri hareketinin hassasiyetini değiştirmek için Ayarlar\'a gidin"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Geri gitmek için soldan kaydırın"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Görüntülediğiniz son ekrana dönmek için sol kenardan ekranın ortasına kaydırın."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Ekranın alt kenarından yukarı kaydırdığınızdan emin olun."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Bırakmadan önce parmağınızı duraklatmadığınızdan emin olun."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Düz bir şekilde yukarı kaydırdığınızdan emin olun."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Ana ekrana git hareketini tamamladınız. Şimdi ana ekrana nasıl gideceğinizi öğreneceksiniz."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Ana ekrana git hareketini tamamladınız."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Ana ekrana gitmek için kaydırma"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Ekranın alt kısmından yukarıya doğru kaydırın. Bu hareket sizi her zaman Ana ekrana götürür."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Ekranın alt kenarından yukarı kaydırdığınızdan emin olun."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Bırakmadan önce pencereyi daha uzun süre tutmayı deneyin."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Düz bir şekilde yukarı kaydırıp ardından parmağınızı duraklattığınızdan emin olun."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Hareketleri nasıl kullanacağınızı öğrendiniz. Hareketleri kapatmak için Ayarlar\'a gidin."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Uygulamalar arasında geçiş yapma hareketini tamamladınız."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Uygulamalar arasında geçiş yapmak için kaydırma"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Ekranınızın alt tarafından yukarı doğru kaydırın, tutun ve sonra bırakın."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Hepsi bu kadar"</string>
diff --git a/quickstep/res/values-uk/strings.xml b/quickstep/res/values-uk/strings.xml
index 413531fac8..f350cd248e 100644
--- a/quickstep/res/values-uk/strings.xml
+++ b/quickstep/res/values-uk/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Передбачений додаток: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Проведіть пальцем саме від лівого краю екрана."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Проведіть пальцем від лівого краю до середини екрана й підніміть палець."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Чудово! Щоб повернутися, проведіть пальцем справа наліво"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Щоб повернутися, проведіть пальцем справа до середини."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Проведіть пальцем саме від правого краю екрана."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Проведіть пальцем від правого краю до середини екрана й підніміть палець."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Ви виконали жест \"Назад\". Тепер дізнайтеся, як переходити між додатками."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ви виконали жест \"Назад\"."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Не проводьте пальцем надто близько до нижнього краю екрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Щоб змінити чутливість жесту \"Назад\", відкрийте налаштування"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Щоб повернутися, проведіть пальцем зліва направо"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Щоб перейти на попередній екран, проведіть пальцем від лівого краю до середини екрана."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Проведіть пальцем угору від нижнього краю екрана."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Не робіть паузу перед тим, як відірвати палець від екрана."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Проводьте пальцем вертикально вгору."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Ви виконали жест переходу на головний екран. Тепер дізнайтеся, як повернутися."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Ви виконали жест переходу на головний екран."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Проведіть пальцем, щоб перейти на головний екран"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Проведіть пальцем по екрану знизу вгору. Цей жест завжди повертатиме вас на головний екран."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Проведіть пальцем угору від нижнього краю екрана."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Спробуйте втримувати вікно довше, перш ніж відпустити."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Проведіть пальцем вертикально вгору, а тоді зробіть паузу."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Ви вивчили жести. Щоб вимкнути їх, перейдіть у налаштування."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Ви виконали жест переходу в інший додаток."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Проведіть пальцем, щоб перейти в інший додаток"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Проведіть пальцем вгору від низу екрана, утримуйте палець на екрані, а потім відпустіть."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Усе готово!"</string>
diff --git a/quickstep/res/values-uz/strings.xml b/quickstep/res/values-uz/strings.xml
index 7f3df0199c..32579d6ce8 100644
--- a/quickstep/res/values-uz/strings.xml
+++ b/quickstep/res/values-uz/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Taklif etilgan ilova: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Barmoqni chapdagi eng chekkadan suring."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Barmoqni ekranning chap chetidan oʻrtasigacha suring va ekrandan uzing."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Yaxshi! Endi orqaga qaytish uchun oʻngdan suring"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Shuningdek, oʻng chetdan ekran oʻrtasiga surish orqali ham oxirgi ekranga qaytish mumkin."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Barmoqni oʻngdagi eng chekkadan suring."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Barmoqni ekranning oʻng chetidan oʻrtasigacha suring va ekrandan uzing."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Ortga qaytish ishorasi darsini tamomladingiz. Endi ilovalarni almashtirishni oʻrganamiz."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ortga qaytish ishorasi darsini tamomladingiz."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Barmoqni ekran pastiga yaqin surmaslikka harakat qiling."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Orqaga ishorasi sezuvchanligi Sozlamalardan oʻzgartiriladi"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Orqaga qaytish uchun chapdan suring"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Oxirgi ekranga qaytish uchun barmoqni ekranning chap chekkasidan oʻrtasigacha suring."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Barmoqni ekranning pastki chetidan yuqoriga suring."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Barmoqni ekrandan pauzasiz qoʻyib uzing."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Barmoqni tik tepaga suring."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Bosh ekranni ochish ishorasi darsini tamomladingiz. Endi orqaga qaytishni oʻrganamiz."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Bosh ekranni ochish ishorasi darsini tamomladingiz."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Svayp bilan bosh ekranni ochish"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Ekranning pastidan tepaga qarab suring. Bu ishora doim Bosh ekranni ochadi."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Barmoqni ekranning pastki chetidan yuqoriga suring."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Barmoqni uzishdan oldin oynani biroz bosib turing."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Avval tik tepaga surib, keyin pauza qiling."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Ishoralardan qanday foydalanishni oʻrganib oldingiz. Ishoralarni oʻchirish uchun Sozlamalarga kiring."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Ilovalarni almashtirish darsini tamomladingiz."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Svayp bilan ilovalarni almashtirish"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Ekranning pastidan tepasiga suring, bosib turing va qoʻyib yuboring."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Tayyor"</string>
diff --git a/quickstep/res/values-vi/strings.xml b/quickstep/res/values-vi/strings.xml
index fed4a7f079..4b6889a881 100644
--- a/quickstep/res/values-vi/strings.xml
+++ b/quickstep/res/values-vi/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Ứng dụng dự đoán: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Hãy vuốt từ mép ngoài cùng bên trái."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Hãy vuốt từ mép trái tới chính giữa màn hình rồi nhấc ngón tay."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Tuyệt vời! Bây giờ, hãy vuốt từ mép phải để quay lại"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Bạn cũng có thể vuốt từ mép phải tới chính giữa màn hình để quay lại màn hình gần đây nhất."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Hãy vuốt từ mép ngoài cùng bên phải."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Hãy vuốt từ mép phải tới chính giữa màn hình rồi nhấc ngón tay."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Bạn đã thực hiện xong cử chỉ quay lại. Tiếp theo, hãy tìm hiểu cách chuyển đổi ứng dụng."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Bạn đã thực hiện xong cử chỉ quay lại."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Hãy nhớ không được vuốt quá gần phần cuối màn hình."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Để thay đổi độ nhạy của cử chỉ quay lại, hãy vào mục Cài đặt"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Vuốt từ mép trái để quay lại"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Để quay lại màn hình gần đây nhất mà bạn xem, hãy vuốt từ mép trái tới chính giữa màn hình."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Hãy vuốt lên từ mép dưới cùng của màn hình."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Hãy nhớ không được tạm dừng trước khi nhấc ngón tay."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Hãy vuốt thẳng lên."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Bạn đã thực hiện xong cử chỉ chuyển đến Màn hình chính. Tiếp theo, hãy tìm hiểu cách quay lại."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Bạn đã thực hiện xong cử chỉ chuyển đến Màn hình chính."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Vuốt để chuyển đến Màn hình chính"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Vuốt lên từ cuối màn hình. Cử chỉ này luôn đưa bạn đến Màn hình chính."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Hãy vuốt lên từ mép dưới cùng của màn hình."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Hãy thử giữ cửa sổ lâu hơn trước khi thả tay ra."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Hãy vuốt thẳng lên, sau đó tạm dừng."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Bạn đã tìm hiểu cách sử dụng cử chỉ. Để tắt cử chỉ, hãy chuyển đến phần Cài đặt."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Bạn đã thực hiện xong cử chỉ chuyển đổi ứng dụng."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Vuốt để chuyển đổi ứng dụng"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Vuốt lên từ cuối màn hình, giữ rồi thả tay ra."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Đã hoàn tất"</string>
diff --git a/quickstep/res/values-zh-rCN/strings.xml b/quickstep/res/values-zh-rCN/strings.xml
index 4129299faf..b65553f37c 100644
--- a/quickstep/res/values-zh-rCN/strings.xml
+++ b/quickstep/res/values-zh-rCN/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"预测的应用：<xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"请从最左侧边缘开始滑动。"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"请从左侧边缘滑动到屏幕中间位置后再松开手指。"</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"太好了！现在从右侧向左滑动手指即可返回"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"如要返回上一个屏幕，您也可以从右侧边缘滑动到屏幕中间位置。"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"请从最右侧边缘开始滑动。"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"请从右侧边缘滑动到屏幕中间位置后再松开手指。"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"您完成了“返回”手势教程。接下来了解如何切换应用。"</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"您完成了“返回”手势教程。"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"滑动时，手的位置不要太靠近屏幕底部。"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"如要调节“返回”手势的灵敏度，请转到“设置”"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"从左侧向右滑动手指即可返回"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"如要返回您查看过的上一个屏幕，请从左侧边缘滑动到屏幕中间位置。"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"请从屏幕底部边缘向上滑动。"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"在松开手指前请勿停下来。"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"请向上滑动。"</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"您完成了“转到主屏幕”手势教程。接下来了解如何返回。"</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"您完成了“转到主屏幕”手势教程。"</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"滑动即可转到主屏幕"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"从屏幕底部向上滑动。这个手势会一律将您转到主屏幕。"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"请从屏幕底部边缘向上滑动。"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"请尝试按住窗口较长时间，然后再松开手指。"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"请向上滑动，然后停住。"</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"您已了解如何使用手势了。如要关闭手势，请转到“设置”。"</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"您完成了“切换应用”手势教程。"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"滑动即可切换应用"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"从屏幕底部向上滑动后按住，然后松开。"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"大功告成"</string>
diff --git a/quickstep/res/values-zh-rHK/strings.xml b/quickstep/res/values-zh-rHK/strings.xml
index 0b1c53dbaa..feee950fc3 100644
--- a/quickstep/res/values-zh-rHK/strings.xml
+++ b/quickstep/res/values-zh-rHK/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"預測應用程式：<xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"請從螢幕左側邊緣滑動。"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"請從螢幕左側邊緣往中央滑動，然後放開手指。"</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"太好了！現在只要從螢幕右側往左滑動即可返回"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"從螢幕右側往中央滑動亦可返回上一個畫面。"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"請從螢幕右側邊緣滑動。"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"請從螢幕右側邊緣往中央滑動，然後放開手指"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"您已完成「返回」手勢的教學課程。接下來一起瞭解如何切換應用程式。"</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"您已完成「返回」手勢的教學課程。"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"滑動時，手的位置不要太接近螢幕底部。"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"如要變更「返回」手勢的敏感度，請前往「設定」"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"從螢幕左側往右滑動即可返回"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"如要返回上一個畫面，請從螢幕左側往中央滑動。"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"請從螢幕底部邊緣向上滑動。"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"放開手指前請勿停下來。"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"請向上滑動。"</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"您已完成「返回主畫面」手勢的教學課程。接著，一起來瞭解如何返回上一個畫面。"</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"您已完成「返回主畫面」手勢的教學課程。"</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"向上滑動即可返回主畫面。"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"從螢幕底部向上滑動。這個手勢在所有畫面下都可讓您返回主畫面。"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"請從螢幕底部邊緣向上滑動。"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"請嘗試按住視窗更長時間，然後再放開。"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"請向上滑動，然後停住。"</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"您已學會如何使用手勢。如要關閉手勢，請前往「設定」。"</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"您已完成「切換應用程式」手勢的教學課程。"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"滑動即可切換應用程式"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"從螢幕底部向上滑動並按住，然後放開。"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"大功告成"</string>
diff --git a/quickstep/res/values-zh-rTW/strings.xml b/quickstep/res/values-zh-rTW/strings.xml
index 6ad7e8d057..6dc5c572ab 100644
--- a/quickstep/res/values-zh-rTW/strings.xml
+++ b/quickstep/res/values-zh-rTW/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"預測的應用程式：<xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"請從螢幕左側邊緣滑動。"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"請從螢幕左側邊緣往中央滑動，然後放開手指。"</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"太好了！現在只要從螢幕右側往左滑動即可返回"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"從螢幕右側往中央滑動也可返回上一個畫面。"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"請從螢幕右側邊緣滑動。"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"請從螢幕右側邊緣往中央滑動，然後放開手指。"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"你已完成「返回」手勢的教學課程。接著，一起來瞭解如何切換應用程式。"</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"你已完成「返回」手勢的教學課程。"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"滑動時，手的位置不要太接近螢幕底部。"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"如要變更「返回」手勢的敏感度，請前往「設定」"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"從螢幕左側往右滑動即可返回"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"如要返回先前的畫面，請從螢幕左側往中央滑動。"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"請從螢幕底部邊緣向上滑動。"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"放開手指前請勿停下來。"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"請向上滑動。"</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"你已完成「返回主畫面」手勢的教學課程。接著，一起來瞭解如何返回上一個畫面。"</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"你已完成「返回主畫面」手勢的教學課程。"</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"使用滑動手勢返回主畫面"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"從螢幕底部向上滑動，即可返回主畫面。"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"請從螢幕底部邊緣向上滑動。"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"請按住視窗久一點，然後再放開。"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"請向上滑動，然後停住。"</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"你已瞭解如何使用手勢了。如要關閉手勢，請前往「設定」。"</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"你已完成「切換應用程式」手勢的教學課程。"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"使用滑動手勢切換應用程式"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"從螢幕底部向上滑動並按住，然後放開。"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"大功告成"</string>
diff --git a/quickstep/res/values-zu/strings.xml b/quickstep/res/values-zu/strings.xml
index 82dc5cf7d1..06d039f9ad 100644
--- a/quickstep/res/values-zu/strings.xml
+++ b/quickstep/res/values-zu/strings.xml
@@ -47,38 +47,28 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Uhlelo lokusebenza olubikezelwe: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Qiniseka ukuthi uswayiphela ekudeni emngceleni ongakwesobunxele."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Qiniseka ukuthi uswayipha kusuka emngceleni okwesobunxele kuya phakathi kwesikrini bese uyadedela."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Kuhle! Manje swayipha kusuka kwesokudla ukuze uye emuva"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Futhi ungabuyela emuva esikrinini sangaphambilini ngokuswayipha kusuka kunqenqema langakwesokudla ukuya maphakathi nesikrini."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Qiniseka ukuthi uswayiphela ekudeni emngceleni ongakwesokudla."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Qiniseka ukuthi uswayipha kusuka emngceleni okwesokudla kuya phakathi kwesikrini bese uyadedela."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Ukuqedile ukuthinta kokubuyela emuva. Ngokulandelayo, funda indlela yokushintsha ama-app."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ukuqedile ukuthinta kokubuyela emuva."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Qiniseka ukuba awuswayipheli eduze kakhulu naphansi kwesikrini."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Ukuze ushintshe ukuzwela kokuthinta emuva, iya Kumasethingi"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Swayipha kusuka kwesobunxele ukuze ubuyele emuva"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Ukuze ubuyele esikrinini sangaphambilini lapho ubukade ukhona, swayipha kusuka kunqenqema lwesokunxele ukuya maphakathi nesikrini."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Qiniseka ukuthi uswayiphela phezulu kusuka emngceleni ophansi wesikrini."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Qiniseka ukuthi awumisi ngaphambi kokudedela."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Qiniseka ukuthi uswayiphela ngqo phezulu."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Ukuqedile ukuthinta kokuya Ekhaya. Ngokulandelayo, funda indlela yokuya emuva."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Ukuqedile ukuthinta kokuya Ekhaya."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Swayipha ukuze uye ekhaya"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Swayiphela phezulu kusuka phansi kwesikrini sakho.Lokhu kuthinta kuhlala kukusa esikrinini sasekhaya."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Qiniseka ukuthi uswayiphela phezulu kusuka emngceleni ophansi wesikrini."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Zama ukubamba iwindi isikhashana ngaphambi kokulidedela."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Qiniseka ukuthi uswayiphela ngqo phezulu bese uyamisa."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Ufunde ukusebenzisa ukuthinta. Ukuze uvale ukuthinta, iya kokuthi Amasethingi."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Ukuqedile ukuthinta kokushintsha ama-app."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swayipha ukuze ushintshe ama-app"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swayiphela phezulu kusuka ngezansi kwesikrini sakho, ubambe, bese udedele."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Konke kusethiwe"</string>
-- 
GitLab


From 8132baf3deeccb0d9df61cf192e1fd1d4dc1fce9 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Mon, 17 May 2021 10:50:49 +0000
Subject: [PATCH 1189/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I71372d68317892f9044ff5c8f9397f8f6fd70e71
---
 go/quickstep/res/values-as/strings.xml | 8 ++++++++
 go/quickstep/res/values-bn/strings.xml | 8 ++++++++
 go/quickstep/res/values-hi/strings.xml | 2 +-
 go/quickstep/res/values-it/strings.xml | 2 +-
 go/quickstep/res/values-ja/strings.xml | 8 ++++++++
 go/quickstep/res/values-mr/strings.xml | 8 ++++++++
 go/quickstep/res/values-te/strings.xml | 8 ++++++++
 go/quickstep/res/values-uz/strings.xml | 2 +-
 8 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 go/quickstep/res/values-as/strings.xml
 create mode 100644 go/quickstep/res/values-bn/strings.xml
 create mode 100644 go/quickstep/res/values-ja/strings.xml
 create mode 100644 go/quickstep/res/values-mr/strings.xml
 create mode 100644 go/quickstep/res/values-te/strings.xml

diff --git a/go/quickstep/res/values-as/strings.xml b/go/quickstep/res/values-as/strings.xml
new file mode 100644
index 0000000000..a3b95c4851
--- /dev/null
+++ b/go/quickstep/res/values-as/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"এপ্‌ শ্বেয়াৰ কৰক"</string>
+    <string name="action_listen" msgid="2370304050784689486">"শুনক"</string>
+    <string name="action_translate" msgid="8028378961867277746">"অনুবাদ কৰক"</string>
+    <string name="action_search" msgid="6269564710943755464">"লেন্স"</string>
+</resources>
diff --git a/go/quickstep/res/values-bn/strings.xml b/go/quickstep/res/values-bn/strings.xml
new file mode 100644
index 0000000000..b5c8ec949d
--- /dev/null
+++ b/go/quickstep/res/values-bn/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"অ্যাপ শেয়ার করুন"</string>
+    <string name="action_listen" msgid="2370304050784689486">"শুনুন"</string>
+    <string name="action_translate" msgid="8028378961867277746">"অনুবাদ করুন"</string>
+    <string name="action_search" msgid="6269564710943755464">"লেন্স"</string>
+</resources>
diff --git a/go/quickstep/res/values-hi/strings.xml b/go/quickstep/res/values-hi/strings.xml
index e19001b54f..cdf83db358 100644
--- a/go/quickstep/res/values-hi/strings.xml
+++ b/go/quickstep/res/values-hi/strings.xml
@@ -4,5 +4,5 @@
     <string name="app_share_drop_target_label" msgid="5804774105974539508">"ऐप्लिकेशन शेयर करें"</string>
     <string name="action_listen" msgid="2370304050784689486">"सुनें"</string>
     <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
-    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="action_search" msgid="6269564710943755464">"Google Lens"</string>
 </resources>
diff --git a/go/quickstep/res/values-it/strings.xml b/go/quickstep/res/values-it/strings.xml
index 59ed75c488..485dcd6160 100644
--- a/go/quickstep/res/values-it/strings.xml
+++ b/go/quickstep/res/values-it/strings.xml
@@ -3,6 +3,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_share_drop_target_label" msgid="5804774105974539508">"Condividi l\'app"</string>
     <string name="action_listen" msgid="2370304050784689486">"Ascolta"</string>
-    <string name="action_translate" msgid="8028378961867277746">"Traduci"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Traduttore"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
 </resources>
diff --git a/go/quickstep/res/values-ja/strings.xml b/go/quickstep/res/values-ja/strings.xml
new file mode 100644
index 0000000000..f8cbbab7aa
--- /dev/null
+++ b/go/quickstep/res/values-ja/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"アプリを共有"</string>
+    <string name="action_listen" msgid="2370304050784689486">"聴く"</string>
+    <string name="action_translate" msgid="8028378961867277746">"翻訳"</string>
+    <string name="action_search" msgid="6269564710943755464">"レンズ"</string>
+</resources>
diff --git a/go/quickstep/res/values-mr/strings.xml b/go/quickstep/res/values-mr/strings.xml
new file mode 100644
index 0000000000..f1fb72a36a
--- /dev/null
+++ b/go/quickstep/res/values-mr/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"अ‍ॅप शेअर करा"</string>
+    <string name="action_listen" msgid="2370304050784689486">"ऐका"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-te/strings.xml b/go/quickstep/res/values-te/strings.xml
new file mode 100644
index 0000000000..2fb3b596f0
--- /dev/null
+++ b/go/quickstep/res/values-te/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"యాప్‌ను షేర్ చేయండి"</string>
+    <string name="action_listen" msgid="2370304050784689486">"వినండి"</string>
+    <string name="action_translate" msgid="8028378961867277746">"అనువదించండి"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-uz/strings.xml b/go/quickstep/res/values-uz/strings.xml
index 4e375c7e71..bc751484d8 100644
--- a/go/quickstep/res/values-uz/strings.xml
+++ b/go/quickstep/res/values-uz/strings.xml
@@ -3,6 +3,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_share_drop_target_label" msgid="5804774105974539508">"Ilovani ulashish"</string>
     <string name="action_listen" msgid="2370304050784689486">"Tinglash"</string>
-    <string name="action_translate" msgid="8028378961867277746">"Tarjimon"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Tarjima"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
 </resources>
-- 
GitLab


From 420c76786273380d5c2c7dd6d01d394572bec52d Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Mon, 17 May 2021 10:51:51 +0000
Subject: [PATCH 1190/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Ia5ccecac9aa14e4d00d1beced9d823d80f8c1fcd
---
 res/values-as/strings.xml | 3 +--
 res/values-bn/strings.xml | 3 +--
 res/values-es/strings.xml | 6 +++---
 res/values-gl/strings.xml | 2 +-
 res/values-ja/strings.xml | 3 +--
 res/values-mr/strings.xml | 3 +--
 res/values-te/strings.xml | 3 +--
 res/values-uz/strings.xml | 2 +-
 8 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 8e5558553f..8ff9e493b1 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"ফ’ল্ডাৰ: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> টা বস্তু"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ফ’ল্ডাৰ: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> টা অথবা তাতকৈ অধিক বস্তু"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"ৱালপেপাৰসমূহ"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"ৱালপেপাৰ আৰু শৈলী"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"গৃহ ছেটিং"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"আপোনাৰ প্ৰশাসকে অক্ষম কৰি ৰাখিছে"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"গৃহ স্ক্ৰীণ ঘূৰোৱাৰ অনুমতি দিয়ক"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 95b0b8df27..71b00eb647 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"ফোল্ডার: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g>টি আইটেম"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ফোল্ডার: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g>টি বা তার বেশি আইটেম"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"ওয়ালপেপারগুলি"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"ওয়ালপেপার এবং স্টাইল"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"হোম সেটিংস"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"আপনার প্রশাসক দ্বারা অক্ষম করা হয়েছে"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"হোম স্ক্রিন ঘোরানোর অনুমতি দিন"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 1448117e81..686d2240bf 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -35,8 +35,8 @@
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Mantén pulsado el widget para moverlo por la pantalla de inicio"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Añadir a la pantalla de inicio"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
-      <item quantity="other">Widgets: <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
-      <item quantity="one">Widget: <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g></item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
     </plurals>
     <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
       <item quantity="other">Accesos directos: <xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g></item>
@@ -97,7 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Carpeta: <xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="SIZE">%2$d</xliff:g> elementos)"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Carpeta: <xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="SIZE">%2$d</xliff:g> o más elementos)"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fondos de pantalla"</string>
-    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Fondo de pantalla y estilo"</string>
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Estilo y fondo de pantalla"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Ajustes de la pantalla de inicio"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Inhabilitado por el administrador"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Permitir rotación de la pantalla de inicio"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index ecbc9405ca..e4a93d421c 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -97,7 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Cartafol: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elementos"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Cartafol: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elementos ou máis"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fondos de pantalla"</string>
-    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Fondo de pantalla e estilo"</string>
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Estilo e fondo de pantalla"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Axustes de Inicio"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Función desactivada polo administrador"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Permitir xirar a pantalla de inicio"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index af588b86ba..7f2e4a9118 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"フォルダ: <xliff:g id="NAME">%1$s</xliff:g>、<xliff:g id="SIZE">%2$d</xliff:g> 件のアイテム"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"フォルダ: <xliff:g id="NAME">%1$s</xliff:g>、<xliff:g id="SIZE">%2$d</xliff:g> 件以上のアイテム"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"壁紙"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"壁紙とスタイル"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"ホームの設定"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"管理者により無効にされています"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"ホーム画面の回転を許可"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 01c132ffe0..e87e6b9fc7 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"फोल्डर: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> आयटम"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"फोल्डर: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> किंवा त्याहून अधिक आयटम"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"वॉलपेपर"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"वॉलपेपर आणि शैली"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"होम सेटिंग्‍ज"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"आपल्या प्रशासकाने अक्षम केले"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"मुख्य स्क्रीन फिरविण्‍यास अनुमती द्या"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 6b4094d32c..68c8039858 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"ఫోల్డర్: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ఐటెమ్‌లు"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ఫోల్డర్: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> లేదా అంతకంటే ఎక్కువ ఐటెమ్‌లు"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"వాల్‌పేపర్‌లు"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"వాల్‌పేపర్ &amp; స్టయిల్"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"హోమ్ సెట్టింగ్‌లు"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"మీ నిర్వాహకులు నిలిపివేసారు"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"హోమ్ స్క్రీన్ రొటేషన్‌ను అనుమతించండి"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 7f0ced4fb8..7328311e50 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -97,7 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Jild: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> fayllar"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Jild: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> va undan ortiq fayllar"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fon rasmlari"</string>
-    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Fon rasmi va stili"</string>
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Fon rasmi va uslubi"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Bosh ekran sozlamalari"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Administrator tomonidan o‘chirilgan"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Bosh ekranni burishga ruxsat"</string>
-- 
GitLab


From 58367f53461da213938986bec337c1cd016b859c Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Mon, 17 May 2021 13:32:39 +0100
Subject: [PATCH 1191/1664] Removed page spacing scaling

- Removed page spacing scaling as it casuses page jump problem without too much benefit, as the RecnetView's fullscale is less significant now (see b/187839470)

Fixes: 184262404
Test: Swipe up after quick switching
Change-Id: I1e080aa2d6530fdac120426ff4b92e19e128ec30
---
 quickstep/src/com/android/quickstep/views/RecentsView.java | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 5bad5e8cf5..e1ee257818 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -377,7 +377,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     private final PointF mTempPointF = new PointF();
     private final float[] mTempFloat = new float[1];
     private final List<OnScrollChangedListener> mScrollListeners = new ArrayList<>();
-    private float mFullscreenScale;
 
     private static final int DISMISS_TASK_DURATION = 300;
     private static final int DISMISS_TASK_TRANSLATION_DURATION = 200;
@@ -1350,8 +1349,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             // Compensate space caused by TaskView scaling.
             float widthDiff =
                     taskView.getLayoutParams().width * (1 - taskView.getFullscreenScale());
-            // Compensate page spacing widening caused by RecentsView scaling.
-            widthDiff += mPageSpacing * (1 - 1 / mFullscreenScale);
             accumulatedTranslationX += mIsRtl ? widthDiff : -widthDiff;
         }
 
@@ -2726,8 +2723,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
 
         // Update the pivots such that when the task is scaled, it fills the full page
         getTaskSize(mTempRect);
-        mFullscreenScale = getPagedViewOrientedState().getFullScreenScaleAndPivot(
-                mTempRect, mActivity.getDeviceProfile(), mTempPointF);
+        getPagedViewOrientedState().getFullScreenScaleAndPivot(mTempRect,
+                mActivity.getDeviceProfile(), mTempPointF);
         setPivotX(mTempPointF.x);
         setPivotY(mTempPointF.y);
         setTaskModalness(mTaskModalness);
-- 
GitLab


From cc64218e68eb98fc4a9943b36e87ae151c83f055 Mon Sep 17 00:00:00 2001
From: Pat Manning <patmanning@google.com>
Date: Fri, 23 Apr 2021 17:56:40 +0000
Subject: [PATCH 1192/1664] Animate task translation on dismissal.

Test: manual
Bug: 186416527
Fix: 186416527
Change-Id: I3919b96b96fdd490e15968b7c2e680dad7f6e5d6
---
 quickstep/res/values/dimens.xml               |   5 +
 .../TaskViewTouchController.java              |  32 +++++-
 .../android/quickstep/views/RecentsView.java  | 103 +++++++++---------
 .../android/launcher3/anim/Interpolators.java |  11 +-
 4 files changed, 94 insertions(+), 57 deletions(-)

diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index c45947205f..7c9a2b8f3c 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -39,6 +39,11 @@
     <dimen name="overview_grid_focus_vertical_margin">90dp</dimen>
     <dimen name="split_placeholder_size">110dp</dimen>
 
+    <!-- These speeds are in dp/s -->
+    <dimen name="max_task_dismiss_drag_velocity">2.25dp</dimen>
+    <dimen name="default_task_dismiss_drag_velocity">1.75dp</dimen>
+    <dimen name="default_task_dismiss_drag_velocity_grid">0.75dp</dimen>
+
     <dimen name="recents_page_spacing">16dp</dimen>
     <dimen name="recents_clear_all_deadzone_vertical_margin">70dp</dimen>
 
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
index 70b3870a6c..c6ea953aff 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
@@ -28,6 +28,7 @@ import android.view.animation.Interpolator;
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.LauncherAnimUtils;
+import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.Interpolators;
@@ -50,6 +51,10 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
         extends AnimatorListenerAdapter implements TouchController,
         SingleAxisSwipeDetector.Listener {
 
+    private static final float ANIMATION_PROGRESS_FRACTION_MIDPOINT = 0.5f;
+    private static final long MIN_TASK_DISMISS_ANIMATION_DURATION = 300;
+    private static final long MAX_TASK_DISMISS_ANIMATION_DURATION = 600;
+
     protected final T mActivity;
     private final SingleAxisSwipeDetector mDetector;
     private final RecentsView mRecentsView;
@@ -277,14 +282,32 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
         } else {
             mFlingBlockCheck.onEvent();
         }
-        mCurrentAnimation.setPlayFraction(Utilities.boundToRange(
-                totalDisplacement * mProgressMultiplier, 0, 1));
+
+        // Once halfway through task dismissal interpolation, switch from reversible dragging-task
+        // animation to playing the remaining task translation animations
+        if (mCurrentAnimation.getProgressFraction() < ANIMATION_PROGRESS_FRACTION_MIDPOINT) {
+            // Halve the value as we are animating the drag across the full length for only the
+            // first half of the progress
+            mCurrentAnimation.setPlayFraction(
+                    Utilities.boundToRange(totalDisplacement * mProgressMultiplier / 2, 0, 1));
+        } else {
+            float dragVelocity = -mTaskBeingDragged.getResources().getDimension(
+                    mRecentsView.showAsGrid() ? R.dimen.default_task_dismiss_drag_velocity_grid
+                            : R.dimen.default_task_dismiss_drag_velocity);
+            onDragEnd(dragVelocity);
+            return true;
+        }
 
         return true;
     }
 
     @Override
     public void onDragEnd(float velocity) {
+        // Limit velocity, as very large scalar values make animations play too quickly
+        float maxTaskDismissDragVelocity = mTaskBeingDragged.getResources().getDimension(
+                R.dimen.max_task_dismiss_drag_velocity);
+        velocity = Utilities.boundToRange(velocity, -maxTaskDismissDragVelocity,
+                maxTaskDismissDragVelocity);
         boolean fling = mDetector.isFling(velocity);
         final boolean goingToEnd;
         boolean blockedFling = fling && mFlingBlockCheck.isBlocked();
@@ -305,6 +328,11 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
         if (blockedFling && !goingToEnd) {
             animationDuration *= LauncherAnimUtils.blockedFlingDurationFactor(velocity);
         }
+        // Due to very high or low velocity dismissals, animation durations can be inconsistently
+        // long or short. Bound the duration for animation of task translations for a more
+        // standardized feel.
+        animationDuration = Utilities.boundToRange(animationDuration,
+                MIN_TASK_DISMISS_ANIMATION_DURATION, MAX_TASK_DISMISS_ANIMATION_DURATION);
 
         mCurrentAnimation.setEndAction(this::clearState);
         mCurrentAnimation.startWithVelocity(mActivity, goingToEnd,
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 5bad5e8cf5..b2e4c426f3 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -32,11 +32,12 @@ import static com.android.launcher3.Utilities.mapToRange;
 import static com.android.launcher3.Utilities.squaredHypot;
 import static com.android.launcher3.Utilities.squaredTouchSlop;
 import static com.android.launcher3.anim.Interpolators.ACCEL;
+import static com.android.launcher3.anim.Interpolators.ACCEL_0_5;
 import static com.android.launcher3.anim.Interpolators.ACCEL_0_75;
-import static com.android.launcher3.anim.Interpolators.ACCEL_2;
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
+import static com.android.launcher3.anim.Interpolators.clampToProgress;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_CLEAR_ALL;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_DISMISS_SWIPE_UP;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_SWIPE_DOWN;
@@ -356,6 +357,11 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     // OverScroll constants
     private static final int OVERSCROLL_PAGE_SNAP_ANIMATION_DURATION = 270;
 
+    private static final int DISMISS_TASK_DURATION = 300;
+    private static final int ADDITION_TASK_DURATION = 200;
+    private static final float INITIAL_DISMISS_TRANSLATION_INTERPOLATION_OFFSET = 0.55f;
+    private static final float ADDITIONAL_DISMISS_TRANSLATION_INTERPOLATION_OFFSET = 0.05f;
+
     protected final RecentsOrientedState mOrientationState;
     protected final BaseActivityInterface<STATE_TYPE, ACTIVITY_TYPE> mSizeStrategy;
     protected RecentsAnimationController mRecentsAnimationController;
@@ -379,10 +385,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     private final List<OnScrollChangedListener> mScrollListeners = new ArrayList<>();
     private float mFullscreenScale;
 
-    private static final int DISMISS_TASK_DURATION = 300;
-    private static final int DISMISS_TASK_TRANSLATION_DURATION = 200;
-    private static final int ADDITIONAL_DISMISS_TASK_TRANSLATION_DURATION = 75;
-    private static final int ADDITION_TASK_DURATION = 200;
     // The threshold at which we update the SystemUI flags when animating from the task into the app
     public static final float UPDATE_SYSUI_FLAGS_THRESHOLD = 0.85f;
 
@@ -1909,21 +1911,18 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
      * This method is used when no task dismissal has occurred.
      */
     private void updateGridProperties() {
-        updateGridProperties(null, -1);
+        updateGridProperties(false);
     }
 
     /**
      * Updates TaskView and ClearAllButton scaling and translation required to turn into grid
      * layout.
      * This method only calculates the potential position and depends on {@link #setGridProgress} to
-     * apply the actual scaling and translation. This adds task translation animations in the case
-     * of task dismissals: e.g. when dismissedTask is not null.
+     * apply the actual scaling and translation.
      *
-     * @param dismissedTask the TaskView dismissed, possibly null
-     * @param dismissedIndex the index at which the dismissedTask was prior to dismissal, if no
-     *                       dismissal occurred, this is unused
+     * @param isTaskDismissal indicates if update was called due to task dismissal
      */
-    private void updateGridProperties(TaskView dismissedTask, int dismissedIndex) {
+    private void updateGridProperties(boolean isTaskDismissal) {
         int taskCount = getTaskViewCount();
         if (taskCount == 0) {
             return;
@@ -1963,10 +1962,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         int snappedPage = getNextPage();
         TaskView snappedTaskView = getTaskViewAtByAbsoluteIndex(snappedPage);
 
-        boolean isTaskDismissal = dismissedTask != null;
-        float dismissedTaskWidth =
-                isTaskDismissal ? dismissedTask.getLayoutParams().width + mPageSpacing : 0;
-
         if (!isTaskDismissal) {
             mTopRowIdSet.clear();
         }
@@ -2062,34 +2057,13 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             snappedTaskGridTranslationX = gridTranslations[snappedPage - mTaskViewStartIndex];
         }
 
-        // Animate task dismissTranslationX for tasks with index >= dismissed index and in the
-        // same row as the dismissed index, or if the dismissed task was the focused task. Offset
-        // successive task dismissal durations for a staggered effect.
-        ArrayList<Animator> gridTranslationAnimators = new ArrayList<>();
-        boolean isFocusedTaskDismissed =
-                isTaskDismissal && dismissedTask.getTask().key.id == mFocusedTaskId;
         for (int i = 0; i < taskCount; i++) {
             TaskView taskView = getTaskViewAt(i);
-            if (isFocusedTaskDismissed || (i >= dismissedIndex && isSameGridRow(dismissedTask,
-                    taskView))) {
-                Animator taskDismissAnimator = ObjectAnimator.ofFloat(taskView,
-                        taskView.getPrimaryDismissTranslationProperty(),
-                        mIsRtl ? -dismissedTaskWidth : dismissedTaskWidth, 0f);
-                int additionalTranslationDuration =
-                        i >= dismissedIndex ? (ADDITIONAL_DISMISS_TASK_TRANSLATION_DURATION * (
-                                (i - dismissedIndex) / 2)) : 0;
-                taskDismissAnimator.setDuration(
-                        DISMISS_TASK_TRANSLATION_DURATION + additionalTranslationDuration);
-                gridTranslationAnimators.add(taskDismissAnimator);
-            }
             taskView.setGridTranslationX(gridTranslations[i] - snappedTaskGridTranslationX);
             taskView.getPrimaryNonFullscreenTranslationProperty().set(taskView,
                     snappedTaskFullscreenScrollAdjustment);
             taskView.getSecondaryNonFullscreenTranslationProperty().set(taskView, 0f);
         }
-        AnimatorSet gridTranslationAnimatorSet = new AnimatorSet();
-        gridTranslationAnimatorSet.playTogether(gridTranslationAnimators);
-        gridTranslationAnimatorSet.start();
 
         // Use the accumulated translation of the row containing the last task.
         float clearAllAccumulatedTranslation = topSet.contains(taskCount - 1)
@@ -2233,7 +2207,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             PendingAnimation anim) {
         // Use setFloat instead of setViewAlpha as we want to keep the view visible even when it's
         // alpha is set to 0 so that it can be recycled in the view pool properly
-        anim.setFloat(taskView, VIEW_ALPHA, 0, ACCEL_2);
+        anim.setFloat(taskView, VIEW_ALPHA, 0, clampToProgress(ACCEL, 0, 0.5f));
         SplitSelectStateController splitController = mSplitPlaceholderView.getSplitController();
 
         ResourceProvider rp = DynamicResource.provider(mActivity);
@@ -2269,8 +2243,10 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                     throw new IllegalStateException("Invalid split task translation: " + dir);
             }
         }
+        // Double translation distance so dismissal drag is the full height, as we only animate
+        // the drag for the first half of the progress.
         anim.add(ObjectAnimator.ofFloat(taskView, dismissingTaskViewTranslate,
-                positiveNegativeFactor * translateDistance).setDuration(duration), LINEAR, sp);
+                positiveNegativeFactor * translateDistance * 2).setDuration(duration), LINEAR, sp);
 
         if (LIVE_TILE.get() && taskView.isRunningTask()) {
             anim.addOnFrameCallback(() -> {
@@ -2306,6 +2282,11 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         }
         int draggedIndex = indexOfChild(taskView);
 
+        boolean isFocusedTaskDismissed = taskView.getTask().key.id == mFocusedTaskId;
+        if (isFocusedTaskDismissed && showAsGrid()) {
+            anim.setFloat(mActionsView, VIEW_ALPHA, 0, clampToProgress(ACCEL_0_5, 0, 0.5f));
+        }
+        float dismissedTaskWidth = taskView.getLayoutParams().width + mPageSpacing;
         boolean needsCurveUpdates = false;
         for (int i = 0; i < count; i++) {
             View child = getChildAt(i);
@@ -2314,7 +2295,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                     addDismissedTaskAnimations(taskView, duration, anim);
                 }
             } else if (!showAsGrid()) {
-                // For grid layout, don't animate other tasks when dismissing in grid for now.
+                // Compute scroll offsets from task dismissal for animation.
                 // If we just take newScroll - oldScroll, everything to the right of dragged task
                 // translates to the left. We need to offset this in some cases:
                 // - In RTL, add page offset to all pages, since we want pages to move to the right
@@ -2341,15 +2322,31 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                             ? ((TaskView) child).getPrimaryDismissTranslationProperty()
                             : mOrientationHandler.getPrimaryViewTranslate();
 
-                    ResourceProvider rp = DynamicResource.provider(mActivity);
-                    SpringProperty sp = new SpringProperty(SpringProperty.FLAG_CAN_SPRING_ON_END)
-                            .setDampingRatio(
-                                    rp.getFloat(R.dimen.dismiss_task_trans_x_damping_ratio))
-                            .setStiffness(rp.getFloat(R.dimen.dismiss_task_trans_x_stiffness));
-                    anim.add(ObjectAnimator.ofFloat(child, translationProperty, scrollDiff)
-                            .setDuration(duration), ACCEL, sp);
+                    float additionalDismissDuration =
+                            ADDITIONAL_DISMISS_TRANSLATION_INTERPOLATION_OFFSET * Math.abs(
+                                    i - draggedIndex);
+                    anim.setFloat(child, translationProperty, scrollDiff, clampToProgress(LINEAR,
+                            Utilities.boundToRange(INITIAL_DISMISS_TRANSLATION_INTERPOLATION_OFFSET
+                                    + additionalDismissDuration, 0f, 1f), 1));
                     needsCurveUpdates = true;
                 }
+            } else if (child instanceof TaskView) {
+                // Animate task with index >= dismissed index and in the same row as the
+                // dismissed index, or if the dismissed task was the focused task. Offset
+                // successive task dismissal durations for a staggered effect.
+                if (isFocusedTaskDismissed || (i >= draggedIndex && isSameGridRow((TaskView) child,
+                        taskView))) {
+                    FloatProperty translationProperty =
+                            ((TaskView) child).getPrimaryDismissTranslationProperty();
+                    float additionalDismissDuration =
+                            ADDITIONAL_DISMISS_TRANSLATION_INTERPOLATION_OFFSET * Math.abs(
+                                    i - draggedIndex);
+                    anim.setFloat(child, translationProperty,
+                            !mIsRtl ? -dismissedTaskWidth : dismissedTaskWidth,
+                            clampToProgress(LINEAR, Utilities.boundToRange(
+                                    INITIAL_DISMISS_TRANSLATION_INTERPOLATION_OFFSET
+                                            + additionalDismissDuration, 0f, 1f), 1));
+                }
             }
         }
 
@@ -2387,6 +2384,10 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                         }
                     }
 
+                    // Reset task translations as they may have updated via animations in
+                    // createTaskDismissAnimation
+                    resetTaskVisuals();
+
                     int pageToSnapTo = mCurrentPage;
                     // Snap to start if focused task was dismissed, as after quick switch it could
                     // be at any page but the focused task always displays at the start.
@@ -2404,7 +2405,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                     } else {
                         snapToPageImmediately(pageToSnapTo);
                         // Grid got messed up, reapply.
-                        updateGridProperties(taskView, draggedIndex - mTaskViewStartIndex);
+                        updateGridProperties(true);
                         if (showAsGrid() && getFocusedTaskView() == null
                                 && mActionsView.getVisibilityAlpha().getValue() == 1) {
                             animateActionsViewOut();
@@ -2414,9 +2415,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                     // immediately available.
                     onLayout(false /*  changed */, getLeft(), getTop(), getRight(), getBottom());
                 }
-                if (!showAsGrid()) {
-                    resetTaskVisuals();
-                }
                 onDismissAnimationEnds();
                 mPendingAnimation = null;
             }
@@ -3794,7 +3792,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         return mColorTint;
     }
 
-    private boolean showAsGrid() {
+    /** Returns {@code true} if the overview tasks are displayed as a grid. */
+    public boolean showAsGrid() {
         return mOverviewGridEnabled || (mCurrentGestureEndTarget != null
                 && mSizeStrategy.stateFromGestureEndTarget(
                 mCurrentGestureEndTarget).displayOverviewTasksAsGrid(mActivity.getDeviceProfile()));
diff --git a/src/com/android/launcher3/anim/Interpolators.java b/src/com/android/launcher3/anim/Interpolators.java
index 9d73bba5dd..1e7b2247b8 100644
--- a/src/com/android/launcher3/anim/Interpolators.java
+++ b/src/com/android/launcher3/anim/Interpolators.java
@@ -35,6 +35,7 @@ public class Interpolators {
     public static final Interpolator LINEAR = new LinearInterpolator();
 
     public static final Interpolator ACCEL = new AccelerateInterpolator();
+    public static final Interpolator ACCEL_0_5 = new AccelerateInterpolator(0.5f);
     public static final Interpolator ACCEL_0_75 = new AccelerateInterpolator(0.75f);
     public static final Interpolator ACCEL_1_5 = new AccelerateInterpolator(1.5f);
     public static final Interpolator ACCEL_2 = new AccelerateInterpolator(2);
@@ -149,11 +150,15 @@ public class Interpolators {
      */
     public static Interpolator clampToProgress(Interpolator interpolator, float lowerBound,
             float upperBound) {
-        if (upperBound <= lowerBound) {
-            throw new IllegalArgumentException(String.format(
-                    "lowerBound (%f) must be less than upperBound (%f)", lowerBound, upperBound));
+        if (upperBound < lowerBound) {
+            throw new IllegalArgumentException(
+                    String.format("upperBound (%f) must be greater than lowerBound (%f)",
+                            upperBound, lowerBound));
         }
         return t -> {
+            if (t == lowerBound && t == upperBound) {
+                return t == 0f ? 0 : 1;
+            }
             if (t < lowerBound) {
                 return 0;
             }
-- 
GitLab


From f90db8a8eb5073e4c33b5a528ef0460c17412405 Mon Sep 17 00:00:00 2001
From: Jon Spivack <spivack@google.com>
Date: Fri, 14 May 2021 19:02:36 -0700
Subject: [PATCH 1193/1664] NIU Actions and Recents UI updates on Go

This tweaks the layout and fonts in the Go Overview. It also adds rounded corners to the task snapshots in the Recents view on Go by adding an overrideable value to the base Quickstep Launcher.

Bug: 186004471
Test: Manual (Pixel 3A)
Change-Id: I220836a95a6416b85bdb71d88822d25d939cf205
---
 .../res/layout/overview_actions_container.xml        | 10 +++++++++-
 go/quickstep/res/values/dimens.xml                   |  4 ++++
 go/quickstep/res/values/styles.xml                   |  2 +-
 quickstep/res/values/dimens.xml                      |  2 ++
 .../com/android/quickstep/util/TaskCornerRadius.java | 12 +++++++++---
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/go/quickstep/res/layout/overview_actions_container.xml b/go/quickstep/res/layout/overview_actions_container.xml
index 6a331ea235..b36214ba7d 100644
--- a/go/quickstep/res/layout/overview_actions_container.xml
+++ b/go/quickstep/res/layout/overview_actions_container.xml
@@ -24,10 +24,14 @@
     <LinearLayout
         android:id="@+id/action_buttons"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/overview_actions_height"
         android:layout_gravity="top|center_horizontal"
         android:orientation="horizontal">
 
+        <Space
+            android:layout_width="@dimen/go_overview_button_width"
+            android:layout_height="1dp" />
+
         <Space
             android:layout_width="0dp"
             android:layout_height="1dp"
@@ -86,6 +90,10 @@
             android:layout_height="1dp"
             android:layout_weight="1" />
 
+        <Space
+            android:layout_width="@dimen/go_overview_button_width"
+            android:layout_height="1dp" />
+
         <!-- Will be enabled in a future version. -->
         <LinearLayout
             style="@style/GoOverviewActionButtonContainer"
diff --git a/go/quickstep/res/values/dimens.xml b/go/quickstep/res/values/dimens.xml
index cb260b55d1..da684fa23b 100644
--- a/go/quickstep/res/values/dimens.xml
+++ b/go/quickstep/res/values/dimens.xml
@@ -23,4 +23,8 @@
     <dimen name="go_overview_button_height">60dp</dimen>
     <dimen name="go_overview_button_container_width">80dp</dimen>
     <dimen name="go_overview_button_caption_margin">8dp</dimen>
+    <dimen name="overview_actions_height">96dp</dimen>
+    <dimen name="overview_proactive_row_height">0dp</dimen>
+    <dimen name="overview_proactive_row_bottom_margin">24dp</dimen>
+    <dimen name="task_corner_radius_override">28dp</dimen>
 </resources>
diff --git a/go/quickstep/res/values/styles.xml b/go/quickstep/res/values/styles.xml
index df49ecd4d3..9b3fe67b98 100644
--- a/go/quickstep/res/values/styles.xml
+++ b/go/quickstep/res/values/styles.xml
@@ -25,7 +25,7 @@
     </style>
 
     <style name="GoOverviewActionButtonCaption">
-        <item name="android:fontFamily">roboto-medium</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textSize">14dp</item>
         <item name="android:textColor">@color/go_overview_button_icon_color</item>
         <item name="android:lineHeight">20dp</item>
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index c45947205f..8dff413474 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -19,6 +19,8 @@
     <dimen name="task_thumbnail_icon_size_grid">32dp</dimen>
     <!-- For screens without rounded corners -->
     <dimen name="task_corner_radius_small">2dp</dimen>
+    <!-- For Launchers that want to override the default dialog corner radius -->
+    <dimen name="task_corner_radius_override">-1dp</dimen>
 
     <dimen name="overview_proactive_row_height">48dp</dimen>
     <dimen name="overview_proactive_row_bottom_margin">16dp</dimen>
diff --git a/quickstep/src/com/android/quickstep/util/TaskCornerRadius.java b/quickstep/src/com/android/quickstep/util/TaskCornerRadius.java
index 3ddf1b60f3..6f9c99a431 100644
--- a/quickstep/src/com/android/quickstep/util/TaskCornerRadius.java
+++ b/quickstep/src/com/android/quickstep/util/TaskCornerRadius.java
@@ -18,6 +18,7 @@ package com.android.quickstep.util;
 import static com.android.systemui.shared.system.QuickStepContract.supportsRoundedCornersOnWindows;
 
 import android.content.Context;
+import android.content.res.Resources;
 
 import com.android.launcher3.R;
 import com.android.launcher3.util.Themes;
@@ -25,8 +26,13 @@ import com.android.launcher3.util.Themes;
 public class TaskCornerRadius {
 
     public static float get(Context context) {
-        return supportsRoundedCornersOnWindows(context.getResources()) ?
-                Themes.getDialogCornerRadius(context):
-                context.getResources().getDimension(R.dimen.task_corner_radius_small);
+        Resources resources = context.getResources();
+        if (!supportsRoundedCornersOnWindows(resources)) {
+            return resources.getDimension(R.dimen.task_corner_radius_small);
+        }
+
+        float overriddenRadius =
+                resources.getDimension(R.dimen.task_corner_radius_override);
+        return (overriddenRadius > 0) ? overriddenRadius : Themes.getDialogCornerRadius(context);
     }
 }
-- 
GitLab


From 9681849b164d822c8f096c1baf110b4d21f442f1 Mon Sep 17 00:00:00 2001
From: Josh Tsuji <tsuji@google.com>
Date: Fri, 7 May 2021 18:39:38 -0400
Subject: [PATCH 1194/1664] Adds launcher-side support for the SmartSpace
 shared element transition.

This adds a new SmartSpaceTransitionController, which Launcher uses to register its SmartSpace with SysUI so that SysUI can manipulate it during an unlock animation.

Bug: 187025480
Test: manual with all the different lock types
Change-Id: I8ebf33e1a253e90f97875548113106cd828721e0
---
 .../launcher3/BaseQuickstepLauncher.java      |  2 +-
 .../com/android/quickstep/SystemUiProxy.java  | 31 +++++++++++++++++--
 .../quickstep/TouchInteractionService.java    |  8 ++++-
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index e777ee7354..1b711d352d 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -184,7 +184,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
     }
 
     @Override
-    protected void onUiChangedWhileSleeping() {
+    public void onUiChangedWhileSleeping() {
         // Remove the snapshot because the content view may have obvious changes.
         UI_HELPER_EXECUTOR.execute(
                 () -> ActivityManagerWrapper.getInstance().invalidateHomeTaskSnapshot(this));
diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index acf999253f..c20a4ccdda 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -40,6 +40,8 @@ import com.android.launcher3.util.SplitConfigurationOptions;
 import com.android.systemui.shared.recents.ISystemUiProxy;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.system.RemoteTransitionCompat;
+import com.android.systemui.shared.system.smartspace.ISmartspaceCallback;
+import com.android.systemui.shared.system.smartspace.ISmartspaceTransitionController;
 import com.android.wm.shell.onehanded.IOneHanded;
 import com.android.wm.shell.pip.IPip;
 import com.android.wm.shell.pip.IPipAnimationListener;
@@ -61,6 +63,7 @@ public class SystemUiProxy implements ISystemUiProxy,
 
     private ISystemUiProxy mSystemUiProxy;
     private IPip mPip;
+    private ISmartspaceTransitionController mSmartspaceTransitionController;
     private ISplitScreen mSplitScreen;
     private IOneHanded mOneHanded;
     private IShellTransitions mShellTransitions;
@@ -74,6 +77,7 @@ public class SystemUiProxy implements ISystemUiProxy,
     private IPipAnimationListener mPendingPipAnimationListener;
     private ISplitScreenListener mPendingSplitScreenListener;
     private IStartingWindowListener mPendingStartingWindowListener;
+    private ISmartspaceCallback mPendingSmartspaceCallback;
 
     // Used to dedupe calls to SystemUI
     private int mLastShelfHeight;
@@ -125,7 +129,8 @@ public class SystemUiProxy implements ISystemUiProxy,
 
     public void setProxy(ISystemUiProxy proxy, IPip pip, ISplitScreen splitScreen,
             IOneHanded oneHanded, IShellTransitions shellTransitions,
-            IStartingWindow startingWindow) {
+            IStartingWindow startingWindow,
+            ISmartspaceTransitionController smartSpaceTransitionController) {
         unlinkToDeath();
         mSystemUiProxy = proxy;
         mPip = pip;
@@ -133,6 +138,7 @@ public class SystemUiProxy implements ISystemUiProxy,
         mOneHanded = oneHanded;
         mShellTransitions = shellTransitions;
         mStartingWindow = startingWindow;
+        mSmartspaceTransitionController = smartSpaceTransitionController;
         linkToDeath();
         // re-attach the listeners once missing due to setProxy has not been initialized yet.
         if (mPendingPipAnimationListener != null && mPip != null) {
@@ -147,10 +153,14 @@ public class SystemUiProxy implements ISystemUiProxy,
             setStartingWindowListener(mPendingStartingWindowListener);
             mPendingStartingWindowListener = null;
         }
+        if (mPendingSmartspaceCallback != null && mSmartspaceTransitionController != null) {
+            setSmartspaceCallback(mPendingSmartspaceCallback);
+            mPendingSmartspaceCallback = null;
+        }
     }
 
     public void clearProxy() {
-        setProxy(null, null, null, null, null, null);
+        setProxy(null, null, null, null, null, null, null);
     }
 
     // TODO(141886704): Find a way to remove this
@@ -631,4 +641,21 @@ public class SystemUiProxy implements ISystemUiProxy,
             mPendingStartingWindowListener = listener;
         }
     }
+
+
+    //
+    // SmartSpace transitions
+    //
+
+    public void setSmartspaceCallback(ISmartspaceCallback callback) {
+        if (mSmartspaceTransitionController != null) {
+            try {
+                mSmartspaceTransitionController.setSmartspace(callback);
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call setStartingWindowListener", e);
+            }
+        } else {
+            mPendingSmartspaceCallback = callback;
+        }
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index edc7a3c8b8..419c60c5af 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -30,6 +30,7 @@ import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHE
 import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_SHELL_TRANSITIONS;
 import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_SPLIT_SCREEN;
 import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_STARTING_WINDOW;
+import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SMARTSPACE_TRANSITION_CONTROLLER;
 import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SYSUI_PROXY;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_TRACING_ENABLED;
 
@@ -107,6 +108,7 @@ import com.android.systemui.shared.system.InputChannelCompat;
 import com.android.systemui.shared.system.InputChannelCompat.InputEventReceiver;
 import com.android.systemui.shared.system.InputConsumerController;
 import com.android.systemui.shared.system.InputMonitorCompat;
+import com.android.systemui.shared.system.smartspace.ISmartspaceTransitionController;
 import com.android.systemui.shared.tracing.ProtoTraceable;
 import com.android.wm.shell.onehanded.IOneHanded;
 import com.android.wm.shell.pip.IPip;
@@ -176,9 +178,13 @@ public class TouchInteractionService extends Service implements PluginListener<O
                     bundle.getBinder(KEY_EXTRA_SHELL_SHELL_TRANSITIONS));
             IStartingWindow startingWindow = IStartingWindow.Stub.asInterface(
                     bundle.getBinder(KEY_EXTRA_SHELL_STARTING_WINDOW));
+            ISmartspaceTransitionController smartspaceTransitionController =
+                    ISmartspaceTransitionController.Stub.asInterface(
+                            bundle.getBinder(KEY_EXTRA_SMARTSPACE_TRANSITION_CONTROLLER));
             MAIN_EXECUTOR.execute(() -> {
                 SystemUiProxy.INSTANCE.get(TouchInteractionService.this).setProxy(proxy, pip,
-                        splitscreen, onehanded, shellTransitions, startingWindow);
+                        splitscreen, onehanded, shellTransitions, startingWindow,
+                        smartspaceTransitionController);
                 TouchInteractionService.this.initInputMonitor();
                 preloadOverview(true /* fromInit */);
                 mDeviceState.runOnUserUnlocked(() -> {
-- 
GitLab


From e744c0fed4c11cd366566169b5d8023da3aebbf3 Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Mon, 17 May 2021 11:28:17 -0700
Subject: [PATCH 1195/1664] Do not send onUserLeaveHint on overview actions

Video: http://recall/-/aaaaaabFQoRHlzixHdtY/bM49GXyCRWEf5KVfP3kIiS
Bug: 188431197
Test: tap on split screen in overview, see video
Change-Id: I15d85cbaec0c878e2f5fe915866980aefeee84f6
---
 quickstep/src/com/android/quickstep/views/TaskMenuView.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
index 32cd367be5..bff10136d1 100644
--- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
@@ -215,6 +215,7 @@ public class TaskMenuView extends AbstractFloatingView implements OnScrollChange
                 RecentsView recentsView = mTaskView.getRecentsView();
                 recentsView.switchToScreenshot(null,
                         () -> recentsView.finishRecentsAnimation(true /* toRecents */,
+                                false /* shouldPip */,
                                 () -> menuOption.onClick(view)));
             } else {
                 menuOption.onClick(view);
-- 
GitLab


From 33a328370b7ddc184ce7ebf2b337e838c9e611d9 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 17 May 2021 23:16:37 +0100
Subject: [PATCH 1196/1664] Fix all apps & widgets picker tabs ripple effect

Test: Switch between tabs in all apps & widgets picker
Bug: 188091348
Change-Id: I9d8aae33ffe11a0c19f166517be881e06cf6d6b0
---
 res/drawable/personal_work_tabs_ripple.xml | 22 ++++++++++++++++++++++
 res/layout/all_apps_personal_work_tabs.xml |  4 ++--
 res/layout/widgets_personal_work_tabs.xml  |  5 +++--
 3 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 res/drawable/personal_work_tabs_ripple.xml

diff --git a/res/drawable/personal_work_tabs_ripple.xml b/res/drawable/personal_work_tabs_ripple.xml
new file mode 100644
index 0000000000..2e57b80570
--- /dev/null
+++ b/res/drawable/personal_work_tabs_ripple.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <shape android:shape="rectangle">
+        <solid android:color="@android:color/transparent" />
+        <corners android:radius="@dimen/all_apps_header_pill_corner_radius" />
+    </shape>
+</ripple>
\ No newline at end of file
diff --git a/res/layout/all_apps_personal_work_tabs.xml b/res/layout/all_apps_personal_work_tabs.xml
index 750e101b16..31fa5cfaca 100644
--- a/res/layout/all_apps_personal_work_tabs.xml
+++ b/res/layout/all_apps_personal_work_tabs.xml
@@ -32,7 +32,7 @@
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:background="?android:attr/selectableItemBackground"
+        android:background="@drawable/personal_work_tabs_ripple"
         android:text="@string/all_apps_personal_tab"
         android:textColor="@color/all_apps_tab_text"
         android:textSize="16sp" />
@@ -42,7 +42,7 @@
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:background="?android:attr/selectableItemBackground"
+        android:background="@drawable/personal_work_tabs_ripple"
         android:text="@string/all_apps_work_tab"
         android:textColor="@color/all_apps_tab_text"
         android:textSize="16sp" />
diff --git a/res/layout/widgets_personal_work_tabs.xml b/res/layout/widgets_personal_work_tabs.xml
index f835b52e9a..72d83e8874 100644
--- a/res/layout/widgets_personal_work_tabs.xml
+++ b/res/layout/widgets_personal_work_tabs.xml
@@ -22,6 +22,7 @@
     android:layout_height="@dimen/all_apps_header_pill_height"
     android:layout_marginHorizontal="16dp"
     android:orientation="horizontal"
+    android:background="@drawable/all_apps_tabs_background"
     android:elevation="2dp"
     style="@style/TextHeadline">
 
@@ -30,7 +31,7 @@
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:background="?android:attr/selectableItemBackground"
+        android:background="@drawable/personal_work_tabs_ripple"
         android:text="@string/widgets_full_sheet_personal_tab"
         android:textColor="@color/all_apps_tab_text"
         android:textSize="14sp" />
@@ -40,7 +41,7 @@
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:background="?android:attr/selectableItemBackground"
+        android:background="@drawable/personal_work_tabs_ripple"
         android:text="@string/widgets_full_sheet_work_tab"
         android:textColor="@color/all_apps_tab_text"
         android:textSize="14sp" />
-- 
GitLab


From 7d2dfcfb3f6194d84326ee2d36a3b182cc71a209 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Fri, 14 May 2021 13:07:43 -0700
Subject: [PATCH 1197/1664] Add WorkspaceRevealAnim, successor to
 StaggeredWorkspaceAnim.

- Added support for widgets for the new close animation.
- This anim is used with the new app close.
- This anim is not compataible with the old app close, so we need to
  keep StaggeredWorkspaceAnim in case we turn the app close flag off.

- We will also use this anim in the lockscreen to launcher anim, will
  connect them in a follow up CL.

Bug: 188413065
Bug: 173107751
Test: manual
Change-Id: Icab3fd700f2c268bb1c4509a37466e4e6748f789
---
 .../launcher3/QuickstepTransitionManager.java |   8 +-
 .../NoButtonQuickSwitchTouchController.java   |   5 +-
 .../android/quickstep/AbsSwipeUpHandler.java  |   5 +-
 .../quickstep/LauncherSwipeHandlerV2.java     | 221 +++++++++++-------
 .../quickstep/SwipeUpAnimationLogic.java      |   9 +
 .../quickstep/util/OverviewToHomeAnim.java    |  16 +-
 .../quickstep/util/WorkspaceRevealAnim.java   | 137 +++++++++++
 .../quickstep/views/FloatingWidgetView.java   |  18 +-
 res/values/config.xml                         |   2 +-
 .../launcher3/views/FloatingIconView.java     |   7 +-
 .../android/launcher3/views/FloatingView.java |  32 +++
 11 files changed, 347 insertions(+), 113 deletions(-)
 create mode 100644 quickstep/src/com/android/quickstep/util/WorkspaceRevealAnim.java
 create mode 100644 src/com/android/launcher3/views/FloatingView.java

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 275dfda607..1b8fcb3c67 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -75,7 +75,6 @@ import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.shortcuts.DeepShortcutView;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.util.ActivityOptionsWrapper;
-import com.android.launcher3.util.DynamicResource;
 import com.android.launcher3.util.MultiValueAlpha;
 import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;
 import com.android.launcher3.util.RunnableList;
@@ -86,8 +85,8 @@ import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.TaskViewUtils;
 import com.android.quickstep.util.MultiValueUpdateListener;
 import com.android.quickstep.util.RemoteAnimationProvider;
-import com.android.quickstep.util.StaggeredWorkspaceAnim;
 import com.android.quickstep.util.SurfaceTransactionApplier;
+import com.android.quickstep.util.WorkspaceRevealAnim;
 import com.android.quickstep.views.FloatingWidgetView;
 import com.android.quickstep.views.RecentsView;
 import com.android.systemui.shared.system.ActivityCompat;
@@ -1213,10 +1212,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                             }
                         });
                     } else {
-                        float velocityPxPerS = DynamicResource.provider(mLauncher)
-                                .getDimension(R.dimen.unlock_staggered_velocity_dp_per_s);
-                        anim.play(new StaggeredWorkspaceAnim(mLauncher, velocityPxPerS, false)
-                                .getAnimators());
+                        anim.play(new WorkspaceRevealAnim(mLauncher, false).getAnimators());
                     }
                 }
             }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
index 5837a707ca..40c3e02238 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
@@ -73,7 +73,7 @@ import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
 import com.android.quickstep.util.LayoutUtils;
 import com.android.quickstep.util.MotionPauseDetector;
-import com.android.quickstep.util.StaggeredWorkspaceAnim;
+import com.android.quickstep.util.WorkspaceRevealAnim;
 import com.android.quickstep.views.LauncherRecentsView;
 
 /**
@@ -384,8 +384,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
             updateNonOverviewAnim(targetState, config);
             nonOverviewAnim = mNonOverviewAnim.getAnimationPlayer();
 
-            new StaggeredWorkspaceAnim(mLauncher, velocity.y, false /* animateOverviewScrim */)
-                    .start();
+            new WorkspaceRevealAnim(mLauncher, false /* animateOverviewScrim */).start();
         } else {
             boolean canceled = targetState == NORMAL;
             if (canceled) {
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 1317b4cb24..e0f430d6cf 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -102,10 +102,10 @@ import com.android.quickstep.util.MotionPauseDetector;
 import com.android.quickstep.util.ProtoTracer;
 import com.android.quickstep.util.RecentsOrientedState;
 import com.android.quickstep.util.RectFSpringAnim;
-import com.android.quickstep.util.StaggeredWorkspaceAnim;
 import com.android.quickstep.util.SurfaceTransactionApplier;
 import com.android.quickstep.util.SwipePipToHomeAnimator;
 import com.android.quickstep.util.TransformParams;
+import com.android.quickstep.util.WorkspaceRevealAnim;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
 import com.android.systemui.shared.recents.model.ThumbnailData;
@@ -201,7 +201,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
             STATE_LAUNCHER_PRESENT | STATE_LAUNCHER_DRAWN | STATE_LAUNCHER_STARTED;
 
     public static final long MAX_SWIPE_DURATION = 350;
-    public static final long HOME_DURATION = StaggeredWorkspaceAnim.DURATION_MS;
+    public static final long HOME_DURATION = WorkspaceRevealAnim.DURATION_MS;
 
     public static final float MIN_PROGRESS_FOR_OVERVIEW = 0.7f;
     private static final float SWIPE_DURATION_MULTIPLIER =
@@ -1126,6 +1126,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                 windowAnim.start(mContext, velocityPxPerMs);
                 mRunningWindowAnim = RunningWindowAnim.wrap(windowAnim);
             }
+            homeAnimFactory.setSwipeVelocity(velocityPxPerMs.y);
             homeAnimFactory.playAtomicAnimation(velocityPxPerMs.y);
             mLauncherTransitionController = null;
 
diff --git a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
index f1250637a8..811af7e658 100644
--- a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
+++ b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
@@ -18,13 +18,14 @@ package com.android.quickstep;
 import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
 import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y;
 import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.Utilities.boundToRange;
 import static com.android.launcher3.Utilities.dpToPx;
-import static com.android.launcher3.Utilities.mapToRange;
-import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.config.FeatureFlags.PROTOTYPE_APP_CLOSE;
 import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION;
 import static com.android.launcher3.views.FloatingIconView.getFloatingIconView;
 
+import static java.lang.Math.round;
+
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
@@ -52,10 +53,12 @@ import com.android.launcher3.states.StateAnimationConfig;
 import com.android.launcher3.util.DynamicResource;
 import com.android.launcher3.util.ObjectWrapper;
 import com.android.launcher3.views.FloatingIconView;
+import com.android.launcher3.views.FloatingView;
 import com.android.launcher3.widget.LauncherAppWidgetHostView;
 import com.android.quickstep.util.AppCloseConfig;
 import com.android.quickstep.util.RectFSpringAnim;
 import com.android.quickstep.util.StaggeredWorkspaceAnim;
+import com.android.quickstep.util.WorkspaceRevealAnim;
 import com.android.quickstep.views.FloatingWidgetView;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
@@ -112,10 +115,6 @@ public class LauncherSwipeHandlerV2 extends
     private HomeAnimationFactory createIconHomeAnimationFactory(View workspaceView) {
         final ResourceProvider rp = DynamicResource.provider(mActivity);
         final float transY = dpToPx(rp.getFloat(R.dimen.swipe_up_trans_y_dp));
-        float dpPerSecond = dpToPx(rp.getFloat(R.dimen.swipe_up_trans_y_dp_per_s));
-        final float launcherAlphaMax =
-                rp.getFloat(R.dimen.swipe_up_launcher_alpha_max_progress);
-
         RectF iconLocation = new RectF();
         FloatingIconView floatingIconView = getFloatingIconView(mActivity, workspaceView,
                 true /* hideOriginal */, iconLocation, false /* isOpening */);
@@ -123,73 +122,25 @@ public class LauncherSwipeHandlerV2 extends
         // We want the window alpha to be 0 once this threshold is met, so that the
         // FolderIconView can be seen morphing into the icon shape.
         float windowAlphaThreshold = 1f - SHAPE_PROGRESS_DURATION;
-        return new LauncherHomeAnimationFactory() {
+
+        return new FloatingViewHomeAnimationFactory(floatingIconView) {
 
             // There is a delay in loading the icon, so we need to keep the window
             // opaque until it is ready.
             private boolean mIsFloatingIconReady = false;
 
-            private @Nullable ValueAnimator mBounceBackAnimator;
-
             @Override
             public RectF getWindowTargetRect() {
-                if (PROTOTYPE_APP_CLOSE.get()) {
-                    // We want the target rect to be at this offset position, so that all
-                    // launcher content can spring back upwards.
-                    floatingIconView.setPositionOffsetY(transY);
-                }
+                super.getWindowTargetRect();
                 return iconLocation;
             }
 
             @Override
             public void setAnimation(RectFSpringAnim anim) {
+                super.setAnimation(anim);
                 anim.addAnimatorListener(floatingIconView);
                 floatingIconView.setOnTargetChangeListener(anim::onTargetPositionChanged);
                 floatingIconView.setFastFinishRunnable(anim::end);
-                if (PROTOTYPE_APP_CLOSE.get()) {
-                    mBounceBackAnimator = bounceBackToRestingPosition();
-                    // Use a spring to put drag layer translation back to 0.
-                    anim.addAnimatorListener(new AnimatorListenerAdapter() {
-                        @Override
-                        public void onAnimationEnd(Animator animation) {
-                            floatingIconView.setPositionOffsetY(0);
-                            mBounceBackAnimator.start();
-                        }
-                    });
-
-                    Workspace workspace = mActivity.getWorkspace();
-                    workspace.setPivotToScaleWithSelf(mActivity.getHotseat());
-                }
-            }
-
-            private ValueAnimator bounceBackToRestingPosition() {
-                DragLayer dl = mActivity.getDragLayer();
-                Workspace workspace = mActivity.getWorkspace();
-                Hotseat hotseat = mActivity.getHotseat();
-
-                final float startValue = transY;
-                final float endValue = 0;
-                // Ensures the velocity is always aligned with the direction.
-                float pixelPerSecond = Math.abs(dpPerSecond) * Math.signum(endValue - transY);
-
-                ValueAnimator springTransY = new SpringAnimationBuilder(dl.getContext())
-                        .setStiffness(rp.getFloat(R.dimen.swipe_up_trans_y_stiffness))
-                        .setDampingRatio(rp.getFloat(R.dimen.swipe_up_trans_y_damping))
-                        .setMinimumVisibleChange(1f)
-                        .setStartValue(startValue)
-                        .setEndValue(endValue)
-                        .setStartVelocity(pixelPerSecond)
-                        .build(dl, VIEW_TRANSLATE_Y);
-                springTransY.addListener(new AnimatorListenerAdapter() {
-                    @Override
-                    public void onAnimationEnd(Animator animation) {
-                        dl.setTranslationY(0f);
-                        dl.setAlpha(1f);
-                        SCALE_PROPERTY.set(workspace, 1f);
-                        SCALE_PROPERTY.set(hotseat, 1f);
-                    }
-                });
-                return springTransY;
             }
 
             @Override
@@ -204,34 +155,15 @@ public class LauncherSwipeHandlerV2 extends
             @Override
             public void update(@Nullable AppCloseConfig config, RectF currentRect,
                     float progress, float radius) {
+                super.update(config, currentRect, progress, radius);
                 int fgAlpha = 255;
                 if (config != null && PROTOTYPE_APP_CLOSE.get()) {
-                    DragLayer dl = mActivity.getDragLayer();
-                    float translationY = config.getWorkspaceTransY();
-                    dl.setTranslationY(translationY);
-
-                    float alpha = mapToRange(progress, 0, launcherAlphaMax, 0, 1f, LINEAR);
-                    dl.setAlpha(Math.min(alpha, 1f));
-
-                    float scale = Math.min(1f, config.getWorkspaceScale());
-                    SCALE_PROPERTY.set(mActivity.getWorkspace(), scale);
-                    SCALE_PROPERTY.set(mActivity.getHotseat(), scale);
-                    SCALE_PROPERTY.set(mActivity.getAppsView(), scale);
-
                     progress = config.getInterpolatedProgress();
                     fgAlpha = config.getFgAlpha();
                 }
                 floatingIconView.update(1f, fgAlpha, currentRect, progress,
                         windowAlphaThreshold, radius, false);
             }
-
-            @Override
-            public void onCancel() {
-                floatingIconView.fastFinish();
-                if (mBounceBackAnimator != null) {
-                    mBounceBackAnimator.cancel();
-                }
-            }
         };
     }
 
@@ -246,10 +178,11 @@ public class LauncherSwipeHandlerV2 extends
                 hostView, backgroundLocation, windowSize,
                 mTaskViewSimulator.getCurrentCornerRadius(), isTargetTranslucent);
 
-        return new LauncherHomeAnimationFactory() {
+        return new FloatingViewHomeAnimationFactory(floatingWidgetView) {
 
             @Override
             public RectF getWindowTargetRect() {
+                super.getWindowTargetRect();
                 return backgroundLocation;
             }
 
@@ -260,6 +193,8 @@ public class LauncherSwipeHandlerV2 extends
 
             @Override
             public void setAnimation(RectFSpringAnim anim) {
+                super.setAnimation(anim);
+
                 anim.addAnimatorListener(floatingWidgetView);
                 floatingWidgetView.setOnTargetChangeListener(anim::onTargetPositionChanged);
                 floatingWidgetView.setFastFinishRunnable(anim::end);
@@ -273,15 +208,11 @@ public class LauncherSwipeHandlerV2 extends
             @Override
             public void update(@Nullable AppCloseConfig config, RectF currentRect,
                     float progress, float radius) {
+                super.update(config, currentRect, progress, radius);
                 floatingWidgetView.update(currentRect, 1 /* floatingWidgetAlpha */,
                         config != null ? config.getFgAlpha() : 1f /* foregroundAlpha */,
                         0 /* fallbackBackgroundAlpha */, 1 - progress);
             }
-
-            @Override
-            public void onCancel() {
-                floatingWidgetView.fastFinish();
-            }
         };
     }
 
@@ -323,6 +254,120 @@ public class LauncherSwipeHandlerV2 extends
                 true /* toRecents */, callback, true /* sendUserLeaveHint */);
     }
 
+    private class FloatingViewHomeAnimationFactory extends LauncherHomeAnimationFactory {
+
+        private final float mTransY;
+        private final FloatingView mFloatingView;
+        private ValueAnimator mBounceBackAnimator;
+        private final AnimatorSet mWorkspaceReveal;
+
+        FloatingViewHomeAnimationFactory(FloatingView floatingView) {
+            mFloatingView = floatingView;
+
+            ResourceProvider rp = DynamicResource.provider(mActivity);
+            mTransY = dpToPx(rp.getFloat(R.dimen.swipe_up_trans_y_dp));
+
+            mWorkspaceReveal = PROTOTYPE_APP_CLOSE.get()
+                    ? new WorkspaceRevealAnim(mActivity, true /* animateScrim */).getAnimators()
+                    : null;
+        }
+
+        @Override
+        public @NonNull RectF getWindowTargetRect() {
+            if (PROTOTYPE_APP_CLOSE.get()) {
+                // We want the target rect to be at this offset position, so that all
+                // launcher content can spring back upwards.
+                mFloatingView.setPositionOffsetY(mTransY);
+            }
+            return super.getWindowTargetRect();
+        }
+
+        @Override
+        public boolean shouldPlayAtomicWorkspaceReveal() {
+            return false;
+        }
+
+        @Override
+        public void update(@Nullable AppCloseConfig config, RectF currentRect, float progress,
+                float radius) {
+            if (config != null && PROTOTYPE_APP_CLOSE.get()) {
+                DragLayer dl = mActivity.getDragLayer();
+                float translationY = config.getWorkspaceTransY();
+                dl.setTranslationY(translationY);
+
+                long duration = mWorkspaceReveal.getDuration();
+                long playTime = boundToRange(round(duration * progress), 0, duration);
+                mWorkspaceReveal.setCurrentPlayTime(playTime);
+            }
+        }
+
+        protected void bounceBackToRestingPosition() {
+            final float startValue = mTransY;
+            final float endValue = 0;
+            // Ensures the velocity is always aligned with the direction.
+            float pixelPerSecond = Math.abs(mSwipeVelocity) * Math.signum(endValue - mTransY);
+
+            DragLayer dl = mActivity.getDragLayer();
+            Workspace workspace = mActivity.getWorkspace();
+            Hotseat hotseat = mActivity.getHotseat();
+
+            ResourceProvider rp = DynamicResource.provider(mActivity);
+            ValueAnimator springTransY = new SpringAnimationBuilder(dl.getContext())
+                    .setStiffness(rp.getFloat(R.dimen.swipe_up_trans_y_stiffness))
+                    .setDampingRatio(rp.getFloat(R.dimen.swipe_up_trans_y_damping))
+                    .setMinimumVisibleChange(1f)
+                    .setStartValue(startValue)
+                    .setEndValue(endValue)
+                    .setStartVelocity(pixelPerSecond)
+                    .build(dl, VIEW_TRANSLATE_Y);
+            springTransY.addListener(new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationEnd(Animator animation) {
+                    dl.setTranslationY(0f);
+                    dl.setAlpha(1f);
+                    SCALE_PROPERTY.set(workspace, 1f);
+                    SCALE_PROPERTY.set(hotseat, 1f);
+                }
+            });
+
+            mBounceBackAnimator = springTransY;
+            mBounceBackAnimator.start();
+        }
+
+        @Override
+        public void setAnimation(RectFSpringAnim anim) {
+            if (PROTOTYPE_APP_CLOSE.get()) {
+                // Use a spring to put drag layer translation back to 0.
+                anim.addAnimatorListener(new AnimatorListenerAdapter() {
+                    @Override
+                    public void onAnimationEnd(Animator animation) {
+                        mFloatingView.setPositionOffsetY(0);
+                        bounceBackToRestingPosition();
+                    }
+                });
+
+                // Will be updated manually below so that the two animations are in sync.
+                mWorkspaceReveal.start();
+                mWorkspaceReveal.pause();
+
+                anim.addAnimatorListener(new AnimatorListenerAdapter() {
+                    @Override
+                    public void onAnimationEnd(Animator animation) {
+                        mWorkspaceReveal.end();
+                    }
+                });
+            }
+        }
+
+        @Override
+        public void onCancel() {
+            mFloatingView.fastFinish();
+            if (mBounceBackAnimator != null) {
+                mBounceBackAnimator.cancel();
+            }
+        }
+    }
+
     private class LauncherHomeAnimationFactory extends HomeAnimationFactory {
         @NonNull
         @Override
@@ -336,8 +381,12 @@ public class LauncherSwipeHandlerV2 extends
 
         @Override
         public void playAtomicAnimation(float velocity) {
-            new StaggeredWorkspaceAnim(mActivity, velocity, true /* animateOverviewScrim */,
-                    !PROTOTYPE_APP_CLOSE.get()).start();
+            if (!PROTOTYPE_APP_CLOSE.get()) {
+                new StaggeredWorkspaceAnim(mActivity, velocity, true /* animateOverviewScrim */)
+                        .start();
+            } else if (shouldPlayAtomicWorkspaceReveal()) {
+                new WorkspaceRevealAnim(mActivity, true).start();
+            }
         }
 
         @Override
diff --git a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
index 29a00d16b0..b79e9344bf 100644
--- a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
+++ b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
@@ -129,6 +129,7 @@ public abstract class SwipeUpAnimationLogic {
     }
 
     protected abstract class HomeAnimationFactory {
+        protected float mSwipeVelocity;
 
         public @NonNull RectF getWindowTargetRect() {
             PagedOrientationHandler orientationHandler = getOrientationHandler();
@@ -152,10 +153,18 @@ public abstract class SwipeUpAnimationLogic {
 
         public abstract @NonNull AnimatorPlaybackController createActivityAnimationToHome();
 
+        public void setSwipeVelocity(float velocity) {
+            mSwipeVelocity = velocity;
+        }
+
         public void playAtomicAnimation(float velocity) {
             // No-op
         }
 
+        public boolean shouldPlayAtomicWorkspaceReveal() {
+            return true;
+        }
+
         public void setAnimation(RectFSpringAnim anim) { }
 
         public boolean keepWindowOpaque() { return false; }
diff --git a/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java b/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
index 10b7662ad9..badb41a7c9 100644
--- a/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
+++ b/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
@@ -30,7 +30,7 @@ import com.android.launcher3.states.StateAnimationConfig;
 
 /**
  * Runs an animation from overview to home. Currently, this animation is just a wrapper around the
- * normal state transition and may play a {@link StaggeredWorkspaceAnim} if we're starting from an
+ * normal state transition and may play a {@link WorkspaceRevealAnim} if we're starting from an
  * upward fling.
  */
 public class OverviewToHomeAnim {
@@ -51,7 +51,7 @@ public class OverviewToHomeAnim {
 
     /**
      * Starts the animation. If velocity < 0 (i.e. upwards), also plays a
-     * {@link StaggeredWorkspaceAnim}.
+     * {@link WorkspaceRevealAnim}.
      */
     public void animateWithVelocity(float velocity) {
         StateManager<LauncherState> stateManager = mLauncher.getStateManager();
@@ -61,18 +61,18 @@ public class OverviewToHomeAnim {
         }
         AnimatorSet anim = new AnimatorSet();
 
-        boolean playStaggeredWorkspaceAnim = velocity < 0;
-        if (playStaggeredWorkspaceAnim) {
-            StaggeredWorkspaceAnim staggeredWorkspaceAnim = new StaggeredWorkspaceAnim(
-                    mLauncher, velocity, false /* animateOverviewScrim */);
-            staggeredWorkspaceAnim.addAnimatorListener(new AnimationSuccessListener() {
+        boolean playWorkspaceRevealAnim = velocity < 0;
+        if (playWorkspaceRevealAnim) {
+            WorkspaceRevealAnim workspaceRevealAnim = new WorkspaceRevealAnim(mLauncher,
+                    false /* animateOverviewScrim */);
+            workspaceRevealAnim.addAnimatorListener(new AnimationSuccessListener() {
                 @Override
                 public void onAnimationSuccess(Animator animator) {
                     mIsHomeStaggeredAnimFinished = true;
                     maybeOverviewToHomeAnimComplete();
                 }
             });
-            anim.play(staggeredWorkspaceAnim.getAnimators());
+            anim.play(workspaceRevealAnim.getAnimators());
         } else {
             mIsHomeStaggeredAnimFinished = true;
         }
diff --git a/quickstep/src/com/android/quickstep/util/WorkspaceRevealAnim.java b/quickstep/src/com/android/quickstep/util/WorkspaceRevealAnim.java
new file mode 100644
index 0000000000..50da93b828
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/util/WorkspaceRevealAnim.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.quickstep.util;
+
+import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
+import static com.android.launcher3.LauncherState.BACKGROUND_APP;
+import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
+import static com.android.launcher3.states.StateAnimationConfig.SKIP_DEPTH_CONTROLLER;
+import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
+import static com.android.launcher3.states.StateAnimationConfig.SKIP_SCRIM;
+
+import android.animation.Animator;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.view.View;
+
+import com.android.launcher3.BaseQuickstepLauncher;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+import com.android.launcher3.Workspace;
+import com.android.launcher3.anim.Interpolators;
+import com.android.launcher3.anim.PendingAnimation;
+import com.android.launcher3.statehandlers.DepthController;
+import com.android.launcher3.states.StateAnimationConfig;
+import com.android.launcher3.util.DynamicResource;
+import com.android.quickstep.views.RecentsView;
+import com.android.systemui.plugins.ResourceProvider;
+
+/**
+ * Creates an animation that reveals the workspace.
+ * This is used in conjunction with the swipe up to home animation.
+ */
+public class WorkspaceRevealAnim {
+
+    // Should be used for animations running alongside this WorkspaceRevealAnim.
+    public static final int DURATION_MS = 350;
+
+    private final float mScaleStart;
+    private final AnimatorSet mAnimators = new AnimatorSet();
+
+    public WorkspaceRevealAnim(Launcher launcher, boolean animateOverviewScrim) {
+        prepareToAnimate(launcher, animateOverviewScrim);
+
+        ResourceProvider rp = DynamicResource.provider(launcher);
+        mScaleStart = rp.getFloat(R.dimen.swipe_up_scale_start);
+
+        Workspace workspace = launcher.getWorkspace();
+        workspace.setPivotToScaleWithSelf(launcher.getHotseat());
+
+        // Add reveal animations.
+        addRevealAnimatorsForView(workspace);
+        addRevealAnimatorsForView(launcher.getHotseat());
+
+        // Add overview scrim animation.
+        if (animateOverviewScrim) {
+            PendingAnimation overviewScrimBuilder = new PendingAnimation(DURATION_MS);
+            launcher.getWorkspace().getStateTransitionAnimation()
+                    .setScrim(overviewScrimBuilder, NORMAL, new StateAnimationConfig());
+            mAnimators.play(overviewScrimBuilder.buildAnim());
+        }
+
+        // Add depth controller animation.
+        if (launcher instanceof BaseQuickstepLauncher) {
+            PendingAnimation depthBuilder = new PendingAnimation(DURATION_MS);
+            DepthController depth = ((BaseQuickstepLauncher) launcher).getDepthController();
+            depth.setStateWithAnimation(NORMAL, new StateAnimationConfig(), depthBuilder);
+            mAnimators.play(depthBuilder.buildAnim());
+        }
+
+        // Add sysui scrim animation.
+        mAnimators.play(launcher.getRootView().getSysUiScrim().createSysuiMultiplierAnim(0f, 1f));
+
+        mAnimators.setDuration(DURATION_MS);
+        mAnimators.setInterpolator(Interpolators.DECELERATED_EASE);
+    }
+
+    private void addRevealAnimatorsForView(View v) {
+        ObjectAnimator scale = ObjectAnimator.ofFloat(v, SCALE_PROPERTY, mScaleStart, 1f);
+        scale.setDuration(DURATION_MS);
+        scale.setInterpolator(Interpolators.DECELERATED_EASE);
+        mAnimators.play(scale);
+
+        ObjectAnimator alpha = ObjectAnimator.ofFloat(v, View.ALPHA, 0, 1f);
+        alpha.setDuration(DURATION_MS);
+        alpha.setInterpolator(Interpolators.DECELERATED_EASE);
+        mAnimators.play(alpha);
+    }
+
+    /**
+     * Setup workspace with 0 duration.
+     */
+    private void prepareToAnimate(Launcher launcher, boolean animateOverviewScrim) {
+        StateAnimationConfig config = new StateAnimationConfig();
+        config.animFlags = SKIP_OVERVIEW | SKIP_DEPTH_CONTROLLER | SKIP_SCRIM;
+        config.duration = 0;
+        // setRecentsAttachedToAppWindow() will animate recents out.
+        launcher.getStateManager().createAtomicAnimation(BACKGROUND_APP, NORMAL, config).start();
+
+        // Stop scrolling so that it doesn't interfere with the translation offscreen.
+        launcher.<RecentsView>getOverviewPanel().getScroller().forceFinished(true);
+
+        if (animateOverviewScrim) {
+            launcher.getWorkspace().getStateTransitionAnimation()
+                    .setScrim(NO_ANIM_PROPERTY_SETTER, BACKGROUND_APP, config);
+        }
+    }
+
+    public AnimatorSet getAnimators() {
+        return mAnimators;
+    }
+
+    public WorkspaceRevealAnim addAnimatorListener(Animator.AnimatorListener listener) {
+        mAnimators.addListener(listener);
+        return this;
+    }
+
+    /**
+     * Starts the animation.
+     */
+    public void start() {
+        mAnimators.start();
+    }
+}
diff --git a/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java b/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java
index 121e09400f..0012dd805d 100644
--- a/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java
+++ b/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java
@@ -34,6 +34,7 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.dragndrop.DragLayer;
+import com.android.launcher3.views.FloatingView;
 import com.android.launcher3.views.ListenerView;
 import com.android.launcher3.widget.LauncherAppWidgetHostView;
 import com.android.launcher3.widget.RoundedCornerEnforcement;
@@ -41,7 +42,7 @@ import com.android.launcher3.widget.RoundedCornerEnforcement;
 /** A view that mimics an App Widget through a launch animation. */
 @TargetApi(Build.VERSION_CODES.S)
 public class FloatingWidgetView extends FrameLayout implements AnimatorListener,
-        OnGlobalLayoutListener {
+        OnGlobalLayoutListener, FloatingView {
     private static final Matrix sTmpMatrix = new Matrix();
 
     private final Launcher mLauncher;
@@ -59,6 +60,8 @@ public class FloatingWidgetView extends FrameLayout implements AnimatorListener,
     private Runnable mOnTargetChangeRunnable;
     private boolean mAppTargetIsTranslucent;
 
+    private float mIconOffsetY;
+
     public FloatingWidgetView(Context context) {
         this(context, null);
     }
@@ -129,6 +132,7 @@ public class FloatingWidgetView extends FrameLayout implements AnimatorListener,
     }
 
     /** Callback at the end or early exit of the animation. */
+    @Override
     public void fastFinish() {
         if (isUninitialized()) return;
         Runnable fastFinishRunnable = mFastFinishRunnable;
@@ -192,6 +196,12 @@ public class FloatingWidgetView extends FrameLayout implements AnimatorListener,
         positionViews();
     }
 
+    @Override
+    public void setPositionOffsetY(float y) {
+        mIconOffsetY = y;
+        onGlobalLayout();
+    }
+
     /** Sets the layout parameters of the floating view and its background view child. */
     private void positionViews() {
         LayoutParams layoutParams = (LayoutParams) getLayoutParams();
@@ -200,7 +210,7 @@ public class FloatingWidgetView extends FrameLayout implements AnimatorListener,
 
         // FloatingWidgetView layout is forced LTR
         mBackgroundView.setTranslationX(mBackgroundPosition.left);
-        mBackgroundView.setTranslationY(mBackgroundPosition.top);
+        mBackgroundView.setTranslationY(mBackgroundPosition.top + mIconOffsetY);
         LayoutParams backgroundParams = (LayoutParams) mBackgroundView.getLayoutParams();
         backgroundParams.leftMargin = 0;
         backgroundParams.topMargin = 0;
@@ -215,7 +225,8 @@ public class FloatingWidgetView extends FrameLayout implements AnimatorListener,
             sTmpMatrix.setTranslate(-mBackgroundOffset.left - mAppWidgetView.getLeft(),
                     -mBackgroundOffset.top - mAppWidgetView.getTop());
             sTmpMatrix.postScale(foregroundScale, foregroundScale);
-            sTmpMatrix.postTranslate(mBackgroundPosition.left, mBackgroundPosition.top);
+            sTmpMatrix.postTranslate(mBackgroundPosition.left, mBackgroundPosition.top
+                    + mIconOffsetY);
             mForegroundOverlayView.setMatrix(sTmpMatrix);
         }
     }
@@ -240,6 +251,7 @@ public class FloatingWidgetView extends FrameLayout implements AnimatorListener,
     }
 
     private void recycle() {
+        mIconOffsetY = 0;
         mEndRunnable = null;
         mFastFinishRunnable = null;
         mOnTargetChangeRunnable = null;
diff --git a/res/values/config.xml b/res/values/config.xml
index 102d4e0c37..77c7e986d5 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -126,7 +126,7 @@
 
     <item name="swipe_up_rect_xy_fling_friction" type="dimen" format="float">1.5</item>
 
-    <item name="swipe_up_scale_start"  type="dimen" format="float">0.98</item>
+    <item name="swipe_up_scale_start"  type="dimen" format="float">0.88</item>
     <item name="swipe_up_duration"  type="dimen" format="float">400</item>
 
     <item name="swipe_up_trans_y_dp"  type="dimen" format="float">4.5</item>
diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java
index 81581fa80a..f973c2be1e 100644
--- a/src/com/android/launcher3/views/FloatingIconView.java
+++ b/src/com/android/launcher3/views/FloatingIconView.java
@@ -63,7 +63,7 @@ import com.android.launcher3.shortcuts.DeepShortcutView;
  */
 @TargetApi(Build.VERSION_CODES.Q)
 public class FloatingIconView extends FrameLayout implements
-        Animator.AnimatorListener, OnGlobalLayoutListener {
+        Animator.AnimatorListener, OnGlobalLayoutListener, FloatingView {
 
     private static final String TAG = FloatingIconView.class.getSimpleName();
 
@@ -443,6 +443,7 @@ public class FloatingIconView extends FrameLayout implements
         mFastFinishRunnable = runnable;
     }
 
+    @Override
     public void fastFinish() {
         if (mFastFinishRunnable != null) {
             mFastFinishRunnable.run();
@@ -475,9 +476,7 @@ public class FloatingIconView extends FrameLayout implements
     @Override
     public void onAnimationRepeat(Animator animator) {}
 
-    /**
-     * Offsets and updates the position of this view by {@param y}.
-     */
+    @Override
     public void setPositionOffsetY(float y) {
         mIconOffsetY = y;
         onGlobalLayout();
diff --git a/src/com/android/launcher3/views/FloatingView.java b/src/com/android/launcher3/views/FloatingView.java
new file mode 100644
index 0000000000..ea4fd15f7f
--- /dev/null
+++ b/src/com/android/launcher3/views/FloatingView.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.views;
+
+/**
+ * Shared interface for floating views.
+ */
+public interface FloatingView {
+
+    /**
+     * Offsets and updates the position of this view by {@param y}.
+     */
+    void setPositionOffsetY(float y);
+
+    /**
+     * Fast finish the animation.
+     */
+    void fastFinish();
+}
-- 
GitLab


From e4170fa07cbfeede5a6e34fdea73d717db9e1347 Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Thu, 13 May 2021 18:33:23 -0700
Subject: [PATCH 1198/1664] Updates AllSetActivity extra keys to match SUW.

Test: Manually with apk from SUW team.
Bug: 184722307
Change-Id: I3c51aace360c6142aa37fbb9ecb4748a818b73fb
---
 .../src/com/android/quickstep/interaction/AllSetActivity.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java b/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java
index 76f43c95cd..6f681b33f1 100644
--- a/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java
+++ b/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java
@@ -45,8 +45,8 @@ public class AllSetActivity extends Activity {
     private static final String LOG_TAG = "AllSetActivity";
     private static final String URI_SYSTEM_NAVIGATION_SETTING =
             "#Intent;action=com.android.settings.SEARCH_RESULT_TRAMPOLINE;S.:settings:fragment_args_key=gesture_system_navigation_input_summary;S.:settings:show_fragment=com.android.settings.gestures.SystemNavigationGestureSettings;end";
-    private static final String EXTRA_ACCENT_COLOR_DARK_MODE = "accent_color_dark_mode";
-    private static final String EXTRA_ACCENT_COLOR_LIGHT_MODE = "accent_color_light_mode";
+    private static final String EXTRA_ACCENT_COLOR_DARK_MODE = "suwColorAccentDark";
+    private static final String EXTRA_ACCENT_COLOR_LIGHT_MODE = "suwColorAccentLight";
 
     private int mAccentColor;
 
-- 
GitLab


From 90dab00ef972ad4831d4e801ac48f83923a1afd1 Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Mon, 17 May 2021 20:16:44 -0700
Subject: [PATCH 1199/1664] Configurable sysprop for launcher depth

Fixes: 187940111
Test: adb shell setprop ro.launcher.depth.appLaunch 0
Test: adb shell setprop ro.launcher.depth.overview 0
Change-Id: I9b49ce96d61b2cf29dc571177818976f4da0a345
---
 .../launcher3/uioverrides/states/BackgroundAppState.java      | 4 +++-
 .../android/launcher3/uioverrides/states/OverviewState.java   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
index 06ffae449e..ff91c8ddf8 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
@@ -19,6 +19,7 @@ import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKG
 
 import android.content.Context;
 import android.graphics.Color;
+import android.os.SystemProperties;
 
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.DeviceProfile;
@@ -84,7 +85,8 @@ public class BackgroundAppState extends OverviewState {
 
     @Override
     protected float getDepthUnchecked(Context context) {
-        return 1f;
+        //TODO revert when b/178661709 is fixed
+        return SystemProperties.getBoolean("ro.launcher.depth.appLaunch", true) ? 1 : 0;
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
index c9cfad3d3f..26dad6984d 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -20,6 +20,7 @@ import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERV
 
 import android.content.Context;
 import android.graphics.Rect;
+import android.os.SystemProperties;
 import android.view.View;
 
 import com.android.launcher3.DeviceProfile;
@@ -127,7 +128,8 @@ public class OverviewState extends LauncherState {
 
     @Override
     protected float getDepthUnchecked(Context context) {
-        return 1f;
+        //TODO revert when b/178661709 is fixed
+        return SystemProperties.getBoolean("ro.launcher.depth.overview", true) ? 1 : 0;
     }
 
     @Override
-- 
GitLab


From e215fb730bb3d4a357a2c4bf0c082d3c0ad69495 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 5 May 2021 14:04:11 -0700
Subject: [PATCH 1200/1664] Moving taskbar lifecycle to TouchInteractionService

> Inflating taskbar views with a non-launcher window context
> Removing separate taskbar view in Launcher
> Handling taskbar icon clicks directly instead of going via launcher
> Fixing some relayouts during show/hide animation

Bug: 187353581
Test: Manual
Change-Id: Ia7d44acbb770bf0345922234b3daa5cc040a5843
---
 quickstep/res/layout/taskbar.xml              |  24 +-
 quickstep/res/layout/taskbar_view.xml         |  26 -
 quickstep/res/values/dimens.xml               |   1 +
 .../launcher3/BaseQuickstepLauncher.java      |  90 +---
 .../launcher3/QuickstepTransitionManager.java |   3 -
 .../launcher3/taskbar/ButtonProvider.java     |  32 +-
 .../android/launcher3/taskbar/ImeBarView.java |  17 +-
 .../taskbar/TaskbarActivityContext.java       | 230 ++++++++-
 .../taskbar/TaskbarAnimationController.java   |   5 +-
 .../taskbar/TaskbarContainerView.java         |  96 ++--
 .../launcher3/taskbar/TaskbarController.java  | 472 +++---------------
 .../taskbar/TaskbarDragController.java        |  13 +-
 .../taskbar/TaskbarHotseatController.java     |  17 +-
 .../taskbar/TaskbarIconController.java        | 163 ++++++
 .../launcher3/taskbar/TaskbarManager.java     | 157 ++++++
 .../taskbar/TaskbarNavButtonController.java   |  20 +-
 .../taskbar/TaskbarStateHandler.java          |  41 +-
 .../taskbar/TaskbarUIController.java          |  41 ++
 .../launcher3/taskbar/TaskbarView.java        | 262 ++++------
 .../quickstep/BaseActivityInterface.java      |  13 -
 .../quickstep/LauncherActivityInterface.java  |  14 +-
 .../quickstep/TouchInteractionService.java    |  61 +--
 .../util/StaggeredWorkspaceAnim.java          |   6 +-
 res/layout/taskbar_view.xml                   |  21 -
 src/com/android/launcher3/BubbleTextView.java |   4 -
 src/com/android/launcher3/Hotseat.java        |  21 +-
 src/com/android/launcher3/Launcher.java       |  14 -
 src/com/android/launcher3/Utilities.java      |  10 +-
 .../launcher3/touch/ItemClickHandler.java     |  56 ++-
 29 files changed, 948 insertions(+), 982 deletions(-)
 delete mode 100644 quickstep/res/layout/taskbar_view.xml
 create mode 100644 quickstep/src/com/android/launcher3/taskbar/TaskbarIconController.java
 create mode 100644 quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
 create mode 100644 quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java
 delete mode 100644 res/layout/taskbar_view.xml

diff --git a/quickstep/res/layout/taskbar.xml b/quickstep/res/layout/taskbar.xml
index 240fe556da..c4362214cb 100644
--- a/quickstep/res/layout/taskbar.xml
+++ b/quickstep/res/layout/taskbar.xml
@@ -22,9 +22,29 @@
 
     <com.android.launcher3.taskbar.TaskbarView
         android:id="@+id/taskbar_view"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center"/>
+        android:gravity="center"
+        android:forceHasOverlappingRendering="false"
+        android:layout_gravity="bottom" >
+
+        <LinearLayout
+            android:id="@+id/system_button_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="@dimen/taskbar_nav_buttons_spacing"
+            android:paddingRight="@dimen/taskbar_nav_buttons_spacing"
+            android:forceHasOverlappingRendering="false"
+            android:gravity="center" />
+
+        <LinearLayout
+            android:id="@+id/hotseat_icons_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:forceHasOverlappingRendering="false"
+            android:gravity="center" />
+
+    </com.android.launcher3.taskbar.TaskbarView>
 
     <com.android.launcher3.taskbar.ImeBarView
         android:id="@+id/ime_bar_view"
diff --git a/quickstep/res/layout/taskbar_view.xml b/quickstep/res/layout/taskbar_view.xml
deleted file mode 100644
index 34a88ea6a2..0000000000
--- a/quickstep/res/layout/taskbar_view.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<com.android.launcher3.taskbar.TaskbarView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/taskbar_view"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/taskbar_size"
-    android:background="@android:color/transparent"
-    android:layout_gravity="bottom"
-    android:gravity="center"
-    android:visibility="gone" />
-
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index c45947205f..ad20c3013e 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -142,4 +142,5 @@
     <!-- Note that this applies to both sides of all icons, so visible space is double this. -->
     <dimen name="taskbar_icon_spacing">8dp</dimen>
     <dimen name="taskbar_folder_margin">16dp</dimen>
+    <dimen name="taskbar_nav_buttons_spacing">16dp</dimen>
 </resources>
diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index e777ee7354..bc2c125854 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -20,7 +20,6 @@ import static com.android.launcher3.AbstractFloatingView.TYPE_HIDE_BACK_BUTTON;
 import static com.android.launcher3.LauncherState.FLAG_HIDE_BACK_BUTTON;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.NO_OFFSET;
-import static com.android.launcher3.util.DisplayController.CHANGE_ACTIVE_SCREEN;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
 import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
@@ -30,7 +29,6 @@ import android.animation.AnimatorSet;
 import android.animation.ValueAnimator;
 import android.app.ActivityOptions;
 import android.content.ComponentName;
-import android.content.Context;
 import android.content.Intent;
 import android.content.IntentSender;
 import android.content.ServiceConnection;
@@ -51,13 +49,11 @@ import com.android.launcher3.proxy.StartActivityParams;
 import com.android.launcher3.statehandlers.BackButtonAlphaHandler;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
-import com.android.launcher3.taskbar.TaskbarActivityContext;
 import com.android.launcher3.taskbar.TaskbarController;
+import com.android.launcher3.taskbar.TaskbarManager;
 import com.android.launcher3.taskbar.TaskbarStateHandler;
-import com.android.launcher3.taskbar.TaskbarView;
 import com.android.launcher3.uioverrides.RecentsViewStateController;
 import com.android.launcher3.util.ActivityOptionsWrapper;
-import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.ObjectWrapper;
 import com.android.launcher3.util.UiThreadHelper;
 import com.android.quickstep.RecentsModel;
@@ -67,6 +63,7 @@ import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;
 import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.TaskUtils;
 import com.android.quickstep.TouchInteractionService;
+import com.android.quickstep.TouchInteractionService.TISBinder;
 import com.android.quickstep.util.RemoteAnimationProvider;
 import com.android.quickstep.util.RemoteFadeOutAnimationListener;
 import com.android.quickstep.util.SplitSelectStateController;
@@ -88,8 +85,6 @@ public abstract class BaseQuickstepLauncher extends Launcher
 
     private DepthController mDepthController = new DepthController(this);
     private QuickstepTransitionManager mAppTransitionManager;
-    private ServiceConnection mTisBinderConnection;
-    protected TouchInteractionService.TISBinder mTisBinder;
 
     /**
      * Reusable command for applying the back button alpha on the background thread.
@@ -100,8 +95,20 @@ public abstract class BaseQuickstepLauncher extends Launcher
 
     private OverviewActionsView mActionsView;
 
+    private @Nullable TaskbarManager mTaskbarManager;
     private @Nullable TaskbarController mTaskbarController;
+    private final ServiceConnection mTisBinderConnection = new ServiceConnection() {
+        @Override
+        public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
+            mTaskbarManager = ((TISBinder) iBinder).getTaskbarManager();
+            mTaskbarManager.setLauncher(BaseQuickstepLauncher.this);
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName componentName) { }
+    };
     private final TaskbarStateHandler mTaskbarStateHandler = new TaskbarStateHandler(this);
+
     // Will be updated when dragging from taskbar.
     private @Nullable DragOptions mNextWorkspaceDragOptions = null;
     private SplitPlaceholderView mSplitPlaceholderView;
@@ -111,24 +118,6 @@ public abstract class BaseQuickstepLauncher extends Launcher
         super.onCreate(savedInstanceState);
         SysUINavigationMode.INSTANCE.get(this).addModeChangeListener(this);
         addMultiWindowModeChangedListener(mDepthController);
-        setupTouchInteractionServiceBinder();
-    }
-
-    private void setupTouchInteractionServiceBinder() {
-        Intent intent = new Intent(this, TouchInteractionService.class);
-        mTisBinderConnection = new ServiceConnection() {
-            @Override
-            public void onServiceConnected(ComponentName componentName, IBinder binder) {
-                mTisBinder = ((TouchInteractionService.TISBinder) binder);
-                mTisBinder.setTaskbarOverviewProxyDelegate(mTaskbarController);
-            }
-
-            @Override
-            public void onServiceDisconnected(ComponentName componentName) {
-                mTisBinder = null;
-            }
-        };
-        bindService(intent, mTisBinderConnection, 0);
     }
 
     @Override
@@ -136,15 +125,12 @@ public abstract class BaseQuickstepLauncher extends Launcher
         mAppTransitionManager.onActivityDestroyed();
 
         SysUINavigationMode.INSTANCE.get(this).removeModeChangeListener(this);
-        if (mTaskbarController != null) {
-            mTaskbarController.cleanup();
-            mTaskbarController = null;
-            if (mTisBinder != null) {
-                mTisBinder.setTaskbarOverviewProxyDelegate(null);
-                unbindService(mTisBinderConnection);
-            }
-        }
 
+
+        unbindService(mTisBinderConnection);
+        if (mTaskbarManager != null) {
+            mTaskbarManager.setLauncher(null);
+        }
         super.onDestroy();
     }
 
@@ -271,37 +257,12 @@ public abstract class BaseQuickstepLauncher extends Launcher
         mAppTransitionManager = new QuickstepTransitionManager(this);
         mAppTransitionManager.registerRemoteAnimations();
 
-        addTaskbarIfNecessary();
-        addOnDeviceProfileChangeListener(newDp -> addTaskbarIfNecessary());
-    }
+        bindService(new Intent(this, TouchInteractionService.class), mTisBinderConnection, 0);
 
-    @Override
-    public void onDisplayInfoChanged(Context context, DisplayController.Info info,
-            int flags) {
-        super.onDisplayInfoChanged(context, info, flags);
-        if ((flags & CHANGE_ACTIVE_SCREEN) != 0) {
-            addTaskbarIfNecessary();
-        }
     }
 
-    private void addTaskbarIfNecessary() {
-        if (mTaskbarController != null) {
-            mTaskbarController.cleanup();
-            if (mTisBinder != null) {
-                mTisBinder.setTaskbarOverviewProxyDelegate(null);
-            }
-            mTaskbarController = null;
-        }
-        if (mDeviceProfile.isTaskbarPresent) {
-            TaskbarView taskbarViewOnHome = (TaskbarView) mHotseat.getTaskbarView();
-            TaskbarActivityContext taskbarActivityContext = new TaskbarActivityContext(this);
-            mTaskbarController = new TaskbarController(this,
-                    taskbarActivityContext.getTaskbarContainerView(), taskbarViewOnHome);
-            mTaskbarController.init();
-            if (mTisBinder != null) {
-                mTisBinder.setTaskbarOverviewProxyDelegate(mTaskbarController);
-            }
-        }
+    public void setTaskbarController(TaskbarController taskbarController) {
+        mTaskbarController = taskbarController;
     }
 
     public <T extends OverviewActionsView> T getActionsView() {
@@ -340,14 +301,9 @@ public abstract class BaseQuickstepLauncher extends Launcher
     }
 
     @Override
-    public boolean isViewInTaskbar(View v) {
-        return mTaskbarController != null && mTaskbarController.isViewInTaskbar(v);
-    }
-
     public boolean supportsAdaptiveIconAnimation(View clickedView) {
         return mAppTransitionManager.hasControlRemoteAppTransitionPermission()
-                && FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM.get()
-                && !isViewInTaskbar(clickedView);
+                && FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM.get();
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 275dfda607..65dee55ca7 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -1256,7 +1256,6 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
 
             final boolean launchingFromWidget = mV instanceof LauncherAppWidgetHostView;
             final boolean launchingFromRecents = isLaunchingFromRecents(mV, appTargets);
-            final boolean launchingFromTaskbar = mLauncher.isViewInTaskbar(mV);
             if (launchingFromWidget) {
                 composeWidgetLaunchAnimator(anim, (LauncherAppWidgetHostView) mV, appTargets,
                         wallpaperTargets, nonAppTargets);
@@ -1267,8 +1266,6 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                         launcherClosing);
                 addCujInstrumentation(
                         anim, InteractionJankMonitorWrapper.CUJ_APP_LAUNCH_FROM_RECENTS);
-            } else if (launchingFromTaskbar) {
-                // TODO
             } else {
                 composeIconLaunchAnimator(anim, mV, appTargets, wallpaperTargets, nonAppTargets,
                         launcherClosing);
diff --git a/quickstep/src/com/android/launcher3/taskbar/ButtonProvider.java b/quickstep/src/com/android/launcher3/taskbar/ButtonProvider.java
index 0d4130d1bc..540f748313 100644
--- a/quickstep/src/com/android/launcher3/taskbar/ButtonProvider.java
+++ b/quickstep/src/com/android/launcher3/taskbar/ButtonProvider.java
@@ -16,12 +16,17 @@
 
 package com.android.launcher3.taskbar;
 
+import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_BACK;
+import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_HOME;
+import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_IME_SWITCH;
+import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_RECENTS;
+
 import android.annotation.DrawableRes;
-import android.content.Context;
 import android.view.View;
 import android.widget.ImageView;
 
 import com.android.launcher3.R;
+import com.android.launcher3.taskbar.TaskbarNavButtonController.TaskbarButton;
 
 /**
  * Creates Buttons for Taskbar for 3 button nav.
@@ -29,47 +34,46 @@ import com.android.launcher3.R;
  */
 public class ButtonProvider {
 
-    private int mMarginLeftRight;
-    private final Context mContext;
+    private final int mMarginLeftRight;
+    private final TaskbarActivityContext mContext;
 
-    public ButtonProvider(Context context) {
+    public ButtonProvider(TaskbarActivityContext context) {
         mContext = context;
-    }
-
-    public void setMarginLeftRight(int margin) {
-        mMarginLeftRight = margin;
+        mMarginLeftRight = context.getResources()
+                .getDimensionPixelSize(R.dimen.taskbar_icon_spacing);
     }
 
     public View getBack() {
         // Back button
-        return getButtonForDrawable(R.drawable.ic_sysbar_back);
+        return getButtonForDrawable(R.drawable.ic_sysbar_back, BUTTON_BACK);
     }
 
     public View getDown() {
         // Ime down button
-        return getButtonForDrawable(R.drawable.ic_sysbar_back);
+        return getButtonForDrawable(R.drawable.ic_sysbar_back, BUTTON_BACK);
     }
 
     public View getHome() {
         // Home button
-        return getButtonForDrawable(R.drawable.ic_sysbar_home);
+        return getButtonForDrawable(R.drawable.ic_sysbar_home, BUTTON_HOME);
     }
 
     public View getRecents() {
         // Recents button
-        return getButtonForDrawable(R.drawable.ic_sysbar_recent);
+        return getButtonForDrawable(R.drawable.ic_sysbar_recent, BUTTON_RECENTS);
     }
 
     public View getImeSwitcher() {
         // IME Switcher Button
-        return getButtonForDrawable(R.drawable.ic_ime_switcher);
+        return getButtonForDrawable(R.drawable.ic_ime_switcher, BUTTON_IME_SWITCH);
     }
 
-    private View getButtonForDrawable(@DrawableRes int drawableId) {
+    private View getButtonForDrawable(@DrawableRes int drawableId, @TaskbarButton int buttonType) {
         ImageView buttonView = new ImageView(mContext);
         buttonView.setImageResource(drawableId);
         buttonView.setBackgroundResource(R.drawable.taskbar_icon_click_feedback_roundrect);
         buttonView.setPadding(mMarginLeftRight, 0, mMarginLeftRight, 0);
+        buttonView.setOnClickListener(view -> mContext.onNavigationButtonClick(buttonType));
         return buttonView;
     }
 
diff --git a/quickstep/src/com/android/launcher3/taskbar/ImeBarView.java b/quickstep/src/com/android/launcher3/taskbar/ImeBarView.java
index bb3669beed..287caab44b 100644
--- a/quickstep/src/com/android/launcher3/taskbar/ImeBarView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/ImeBarView.java
@@ -16,9 +16,6 @@
 
 package com.android.launcher3.taskbar;
 
-import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_BACK;
-import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_IME_SWITCH;
-
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
@@ -29,7 +26,6 @@ import com.android.launcher3.views.ActivityContext;
 public class ImeBarView extends RelativeLayout {
 
     private ButtonProvider mButtonProvider;
-    private TaskbarController.TaskbarViewCallbacks mControllerCallbacks;
     private View mImeView;
 
     public ImeBarView(Context context) {
@@ -44,12 +40,9 @@ public class ImeBarView extends RelativeLayout {
         super(context, attrs, defStyleAttr);
     }
 
-    public void construct(ButtonProvider buttonProvider) {
+    public void init(ButtonProvider buttonProvider) {
         mButtonProvider = buttonProvider;
-    }
 
-    public void init(TaskbarController.TaskbarViewCallbacks taskbarCallbacks) {
-        mControllerCallbacks = taskbarCallbacks;
         ActivityContext context = getActivityContext();
         RelativeLayout.LayoutParams imeParams = new RelativeLayout.LayoutParams(
                 context.getDeviceProfile().iconSizePx,
@@ -64,24 +57,16 @@ public class ImeBarView extends RelativeLayout {
 
         // Down Arrow
         View downView = mButtonProvider.getDown();
-        downView.setOnClickListener(view -> mControllerCallbacks.onNavigationButtonClick(
-                BUTTON_BACK));
         downView.setLayoutParams(downParams);
         downView.setRotation(-90);
         addView(downView);
 
         // IME switcher button
         mImeView = mButtonProvider.getImeSwitcher();
-        mImeView.setOnClickListener(view -> mControllerCallbacks.onNavigationButtonClick(
-                BUTTON_IME_SWITCH));
         mImeView.setLayoutParams(imeParams);
         addView(mImeView);
     }
 
-    public void cleanup() {
-        removeAllViews();
-    }
-
     public void setImeSwitcherVisibility(boolean show) {
         mImeView.setVisibility(show ? VISIBLE : GONE);
     }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
index 3af51d575d..70f278874a 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
@@ -15,56 +15,164 @@
  */
 package com.android.launcher3.taskbar;
 
-import android.content.ContextWrapper;
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
+import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
+
+import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_BOTTOM_TAPPABLE_ELEMENT;
+import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_EXTRA_NAVIGATION_BAR;
+
+import android.app.ActivityOptions;
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.LauncherApps;
+import android.graphics.PixelFormat;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
+import android.os.Process;
+import android.os.SystemProperties;
+import android.util.Log;
+import android.view.ContextThemeWrapper;
+import android.view.Display;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.WindowManager;
+import android.widget.Toast;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.android.launcher3.BaseQuickstepLauncher;
+import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.DragSource;
 import com.android.launcher3.DropTarget;
+import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.R;
 import com.android.launcher3.dragndrop.DragController;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.dragndrop.DragView;
 import com.android.launcher3.dragndrop.DraggableView;
+import com.android.launcher3.folder.Folder;
+import com.android.launcher3.folder.FolderIcon;
+import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.launcher3.taskbar.TaskbarNavButtonController.TaskbarButton;
+import com.android.launcher3.touch.ItemClickHandler;
+import com.android.launcher3.util.PackageManagerHelper;
+import com.android.launcher3.util.Themes;
+import com.android.launcher3.util.TraceHelper;
 import com.android.launcher3.views.ActivityContext;
-import com.android.launcher3.views.BaseDragLayer;
+import com.android.quickstep.SysUINavigationMode;
+import com.android.quickstep.SysUINavigationMode.Mode;
+import com.android.systemui.shared.recents.model.Task;
+import com.android.systemui.shared.system.ActivityManagerWrapper;
+import com.android.systemui.shared.system.WindowManagerWrapper;
 
 /**
  * The {@link ActivityContext} with which we inflate Taskbar-related Views. This allows UI elements
  * that are used by both Launcher and Taskbar (such as Folder) to reference a generic
  * ActivityContext and BaseDragLayer instead of the Launcher activity and its DragLayer.
  */
-public class TaskbarActivityContext extends ContextWrapper implements ActivityContext {
+public class TaskbarActivityContext extends ContextThemeWrapper implements ActivityContext {
+
+    private static final boolean ENABLE_THREE_BUTTON_TASKBAR =
+            SystemProperties.getBoolean("persist.debug.taskbar_three_button", false);
+    private static final String TAG = "TaskbarActivityContext";
+
+    private static final String WINDOW_TITLE = "Taskbar";
 
     private final DeviceProfile mDeviceProfile;
     private final LayoutInflater mLayoutInflater;
     private final TaskbarContainerView mTaskbarContainerView;
+    private final TaskbarIconController mIconController;
     private final MyDragController mDragController;
 
-    public TaskbarActivityContext(BaseQuickstepLauncher launcher) {
-        super(launcher);
-        mDeviceProfile = launcher.getDeviceProfile().copy(this);
+    private final WindowManager mWindowManager;
+    private WindowManager.LayoutParams mWindowLayoutParams;
+
+    private final SysUINavigationMode.Mode mNavMode;
+    private final TaskbarNavButtonController mNavButtonController;
+
+    private final boolean mIsSafeModeEnabled;
+
+    @NonNull
+    private TaskbarUIController mUIController = TaskbarUIController.DEFAULT;
+
+    private final View.OnClickListener mOnTaskbarIconClickListener;
+    private final View.OnLongClickListener mOnTaskbarIconLongClickListener;
+
+    public TaskbarActivityContext(Context windowContext, DeviceProfile dp,
+            TaskbarNavButtonController buttonController) {
+        super(windowContext, Themes.getActivityThemeRes(windowContext));
+        mDeviceProfile = dp;
+        mNavButtonController = buttonController;
+        mNavMode = SysUINavigationMode.getMode(windowContext);
+        mIsSafeModeEnabled = TraceHelper.allowIpcs("isSafeMode",
+                () -> getPackageManager().isSafeMode());
+
+        mOnTaskbarIconLongClickListener =
+                new TaskbarDragController(this)::startSystemDragOnLongClick;
+        mOnTaskbarIconClickListener = this::onTaskbarIconClicked;
+
         float taskbarIconSize = getResources().getDimension(R.dimen.taskbar_icon_size);
         float iconScale = taskbarIconSize / mDeviceProfile.iconSizePx;
         mDeviceProfile.updateIconSize(iconScale, getResources());
 
         mLayoutInflater = LayoutInflater.from(this).cloneInContext(this);
-
         mTaskbarContainerView = (TaskbarContainerView) mLayoutInflater
                 .inflate(R.layout.taskbar, null, false);
+        mIconController = new TaskbarIconController(this, mTaskbarContainerView);
         mDragController = new MyDragController(this);
+
+        Display display = windowContext.getDisplay();
+        Context c = display.getDisplayId() == Display.DEFAULT_DISPLAY
+                ? windowContext.getApplicationContext()
+                : windowContext.getApplicationContext().createDisplayContext(display);
+        mWindowManager = c.getSystemService(WindowManager.class);
     }
 
-    public TaskbarContainerView getTaskbarContainerView() {
-        return mTaskbarContainerView;
+    public void init() {
+        mWindowLayoutParams = new WindowManager.LayoutParams(
+                MATCH_PARENT,
+                mDeviceProfile.taskbarSize,
+                TYPE_APPLICATION_OVERLAY,
+                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
+                PixelFormat.TRANSLUCENT);
+        mWindowLayoutParams.setTitle(WINDOW_TITLE);
+        mWindowLayoutParams.packageName = getPackageName();
+        mWindowLayoutParams.gravity = Gravity.BOTTOM;
+        mWindowLayoutParams.setFitInsetsTypes(0);
+        mWindowLayoutParams.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING;
+        mWindowLayoutParams.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
+        mWindowLayoutParams.setSystemApplicationOverlay(true);
+
+        WindowManagerWrapper wmWrapper = WindowManagerWrapper.getInstance();
+        wmWrapper.setProvidesInsetsTypes(
+                mWindowLayoutParams,
+                new int[] { ITYPE_EXTRA_NAVIGATION_BAR, ITYPE_BOTTOM_TAPPABLE_ELEMENT }
+        );
+
+        mIconController.init(mOnTaskbarIconClickListener, mOnTaskbarIconLongClickListener);
+        mWindowManager.addView(mTaskbarContainerView, mWindowLayoutParams);
+    }
+
+    /**
+     * Updates the TaskbarContainer height (pass deviceProfile.taskbarSize to reset).
+     */
+    public void setTaskbarWindowHeight(int height) {
+        if (mWindowLayoutParams.height == height) {
+            return;
+        }
+        mWindowLayoutParams.height = height;
+        mWindowManager.updateViewLayout(mTaskbarContainerView, mWindowLayoutParams);
+    }
+
+    public boolean canShowNavButtons() {
+        return ENABLE_THREE_BUTTON_TASKBAR && mNavMode == Mode.THREE_BUTTONS;
     }
 
     @Override
@@ -73,7 +181,7 @@ public class TaskbarActivityContext extends ContextWrapper implements ActivityCo
     }
 
     @Override
-    public BaseDragLayer<TaskbarActivityContext> getDragLayer() {
+    public TaskbarContainerView getDragLayer() {
         return mTaskbarContainerView;
     }
 
@@ -92,6 +200,103 @@ public class TaskbarActivityContext extends ContextWrapper implements ActivityCo
         return mDragController;
     }
 
+    /**
+     * Sets a new data-source for this taskbar instance
+     */
+    public void setUIController(@NonNull TaskbarUIController uiController) {
+        mUIController.onDestroy();
+        mUIController = uiController;
+        mIconController.setUIController(mUIController);
+        mUIController.onCreate();
+    }
+
+    /**
+     * Called when this instance of taskbar is no longer needed
+     */
+    public void onDestroy() {
+        setUIController(TaskbarUIController.DEFAULT);
+        mIconController.onDestroy();
+        mWindowManager.removeViewImmediate(mTaskbarContainerView);
+    }
+
+    void onNavigationButtonClick(@TaskbarButton int buttonType) {
+        mNavButtonController.onButtonClick(buttonType);
+    }
+
+    public TaskbarIconController getIconController() {
+        return mIconController;
+    }
+
+    /**
+     * Updates the TaskbarContainer to MATCH_PARENT vs original Taskbar size.
+     */
+    protected void setTaskbarWindowFullscreen(boolean fullscreen) {
+        setTaskbarWindowHeight(fullscreen ? MATCH_PARENT : getDeviceProfile().taskbarSize);
+    }
+
+    protected void onTaskbarIconClicked(View view) {
+        Object tag = view.getTag();
+        if (tag instanceof Task) {
+            Task task = (Task) tag;
+            ActivityManagerWrapper.getInstance().startActivityFromRecents(task.key,
+                    ActivityOptions.makeBasic());
+        } else if (tag instanceof FolderInfo) {
+            FolderIcon folderIcon = (FolderIcon) view;
+            Folder folder = folderIcon.getFolder();
+            setTaskbarWindowFullscreen(true);
+
+            getDragLayer().post(() -> {
+                folder.animateOpen();
+
+                folder.iterateOverItems((itemInfo, itemView) -> {
+                    itemView.setOnClickListener(mOnTaskbarIconClickListener);
+                    itemView.setOnLongClickListener(mOnTaskbarIconLongClickListener);
+                    // To play haptic when dragging, like other Taskbar items do.
+                    itemView.setHapticFeedbackEnabled(true);
+                    return false;
+                });
+            });
+        } else if (tag instanceof WorkspaceItemInfo) {
+            WorkspaceItemInfo info = (WorkspaceItemInfo) tag;
+            if (info.isDisabled()) {
+                ItemClickHandler.handleDisabledItemClicked(info, this);
+            } else {
+                Intent intent = new Intent(info.getIntent())
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                try {
+                    if (mIsSafeModeEnabled && !PackageManagerHelper.isSystemApp(this, intent)) {
+                        Toast.makeText(this, R.string.safemode_shortcut_error,
+                                Toast.LENGTH_SHORT).show();
+                    } else  if (info.isPromise()) {
+                        intent = new PackageManagerHelper(this)
+                                .getMarketIntent(info.getTargetPackage())
+                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                        startActivity(intent);
+
+                    } else if (info.itemType == Favorites.ITEM_TYPE_DEEP_SHORTCUT) {
+                        String id = info.getDeepShortcutId();
+                        String packageName = intent.getPackage();
+                        getSystemService(LauncherApps.class)
+                                .startShortcut(packageName, id, null, null, info.user);
+                    } else if (info.user.equals(Process.myUserHandle())) {
+                        startActivity(intent);
+                    } else {
+                        getSystemService(LauncherApps.class).startMainActivity(
+                                intent.getComponent(), info.user, intent.getSourceBounds(), null);
+                    }
+                } catch (NullPointerException | ActivityNotFoundException | SecurityException e) {
+                    Toast.makeText(this, R.string.activity_not_found, Toast.LENGTH_SHORT)
+                            .show();
+                    Log.e(TAG, "Unable to launch. tag=" + info + " intent=" + intent, e);
+                }
+            }
+        } else {
+            Log.e(TAG, "Unknown type clicked: " + tag);
+        }
+
+        AbstractFloatingView.closeAllOpenViews(this);
+    }
+
     private static class MyDragController extends DragController<TaskbarActivityContext> {
         MyDragController(TaskbarActivityContext activity) {
             super(activity);
@@ -106,7 +311,8 @@ public class TaskbarActivityContext extends ContextWrapper implements ActivityCo
         }
 
         @Override
-        protected void exitDrag() { }
+        protected void exitDrag() {
+        }
 
         @Override
         protected DropTarget getDefaultDropTarget(int[] dropCoordinates) {
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java
index 29f6935f8a..815efb9728 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java
@@ -21,6 +21,7 @@ import android.animation.Animator;
 
 import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.taskbar.TaskbarController.TaskbarAnimationControllerCallbacks;
 import com.android.quickstep.AnimatedFloat;
 import com.android.quickstep.SystemUiProxy;
 import com.android.systemui.shared.system.QuickStepContract;
@@ -34,7 +35,7 @@ public class TaskbarAnimationController {
     private static final long IME_VISIBILITY_ALPHA_DURATION = 120;
 
     private final BaseQuickstepLauncher mLauncher;
-    private final TaskbarController.TaskbarAnimationControllerCallbacks mTaskbarCallbacks;
+    private final TaskbarAnimationControllerCallbacks mTaskbarCallbacks;
 
     // Background alpha.
     private final AnimatedFloat mTaskbarBackgroundAlpha = new AnimatedFloat(
@@ -55,7 +56,7 @@ public class TaskbarAnimationController {
             this::updateTranslationY);
 
     public TaskbarAnimationController(BaseQuickstepLauncher launcher,
-            TaskbarController.TaskbarAnimationControllerCallbacks taskbarCallbacks) {
+            TaskbarAnimationControllerCallbacks taskbarCallbacks) {
         mLauncher = launcher;
         mTaskbarCallbacks = taskbarCallbacks;
     }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
index 621bba7e85..5034791f0e 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
@@ -15,9 +15,6 @@
  */
 package com.android.launcher3.taskbar;
 
-import static com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo.TOUCHABLE_INSETS_FRAME;
-import static com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo.TOUCHABLE_INSETS_REGION;
-
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Paint;
@@ -32,22 +29,21 @@ import com.android.launcher3.R;
 import com.android.launcher3.util.TouchController;
 import com.android.launcher3.views.BaseDragLayer;
 import com.android.systemui.shared.system.ViewTreeObserverWrapper;
+import com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo;
+import com.android.systemui.shared.system.ViewTreeObserverWrapper.OnComputeInsetsListener;
 
 /**
  * Top-level ViewGroup that hosts the TaskbarView as well as Views created by it such as Folder.
  */
 public class TaskbarContainerView extends BaseDragLayer<TaskbarActivityContext> {
 
-    private final int[] mTempLoc = new int[2];
     private final int mFolderMargin;
     private final Paint mTaskbarBackgroundPaint;
 
-    // Initialized in TaskbarController constructor.
-    private TaskbarController.TaskbarContainerViewCallbacks mControllerCallbacks;
-
-    // Initialized in init.
+    private TaskbarIconController.Callbacks mControllerCallbacks;
     private TaskbarView mTaskbarView;
-    private ViewTreeObserverWrapper.OnComputeInsetsListener mTaskbarInsetsComputer;
+
+    private final OnComputeInsetsListener mTaskbarInsetsComputer = this::onComputeTaskbarInsets;
 
     public TaskbarContainerView(@NonNull Context context) {
         this(context, null);
@@ -68,63 +64,32 @@ public class TaskbarContainerView extends BaseDragLayer<TaskbarActivityContext>
         mFolderMargin = getResources().getDimensionPixelSize(R.dimen.taskbar_folder_margin);
         mTaskbarBackgroundPaint = new Paint();
         mTaskbarBackgroundPaint.setColor(getResources().getColor(R.color.taskbar_background));
+        recreateControllers();
     }
 
-    protected void construct(TaskbarController.TaskbarContainerViewCallbacks callbacks) {
-        mControllerCallbacks = callbacks;
+    @Override
+    public void recreateControllers() {
+        mControllers = new TouchController[0];
     }
 
-    protected void init(TaskbarView taskbarView) {
+    public void init(TaskbarIconController.Callbacks callbacks, TaskbarView taskbarView) {
+        mControllerCallbacks = callbacks;
         mTaskbarView = taskbarView;
-        mTaskbarInsetsComputer = createTaskbarInsetsComputer();
-        recreateControllers();
     }
 
-    @Override
-    public void recreateControllers() {
-        mControllers = new TouchController[0];
+    private void onComputeTaskbarInsets(InsetsInfo insetsInfo) {
+        if (mControllerCallbacks != null) {
+            mControllerCallbacks.updateInsetsTouchability(insetsInfo);
+        }
     }
 
-    private ViewTreeObserverWrapper.OnComputeInsetsListener createTaskbarInsetsComputer() {
-        return insetsInfo -> {
-            if (mControllerCallbacks.isTaskbarTouchable()) {
-                 // Accept touches anywhere in our bounds.
-                insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_FRAME);
-            } else {
-                // Let touches pass through us.
-                insetsInfo.touchableRegion.setEmpty();
-                insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION);
-            }
-
-            // TaskbarContainerView provides insets to other apps based on contentInsets. These
-            // insets should stay consistent even if we expand TaskbarContainerView's bounds, e.g.
-            // to show a floating view like Folder. Thus, we set the contentInsets to be where
-            // mTaskbarView is, since its position never changes and insets rather than overlays.
-            int[] loc = mTempLoc;
-            float scale = mTaskbarView.getScaleX();
-            float translationY = mTaskbarView.getTranslationY();
-            mTaskbarView.setScaleX(1);
-            mTaskbarView.setScaleY(1);
-            mTaskbarView.setTranslationY(0);
-            mTaskbarView.getLocationInWindow(loc);
-            mTaskbarView.setScaleX(scale);
-            mTaskbarView.setScaleY(scale);
-            mTaskbarView.setTranslationY(translationY);
-            insetsInfo.contentInsets.left = loc[0];
-            insetsInfo.contentInsets.top = loc[1];
-            insetsInfo.contentInsets.right = getWidth() - (loc[0] + mTaskbarView.getWidth());
-            insetsInfo.contentInsets.bottom = getHeight() - (loc[1] + mTaskbarView.getHeight());
-        };
-    }
-
-    protected void cleanup() {
+    protected void onDestroy() {
         ViewTreeObserverWrapper.removeOnComputeInsetsListener(mTaskbarInsetsComputer);
     }
 
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
-
         ViewTreeObserverWrapper.addOnComputeInsetsListener(getViewTreeObserver(),
                 mTaskbarInsetsComputer);
     }
@@ -133,7 +98,7 @@ public class TaskbarContainerView extends BaseDragLayer<TaskbarActivityContext>
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
 
-        cleanup();
+        onDestroy();
     }
 
     @Override
@@ -143,10 +108,25 @@ public class TaskbarContainerView extends BaseDragLayer<TaskbarActivityContext>
         return true;
     }
 
+    public void updateImeBarVisibilityAlpha(float alpha) {
+        if (mControllerCallbacks != null) {
+            mControllerCallbacks.updateImeBarVisibilityAlpha(alpha);
+        }
+    }
+
     @Override
     public void onViewRemoved(View child) {
         super.onViewRemoved(child);
-        mControllerCallbacks.onViewRemoved();
+        if (mControllerCallbacks != null) {
+            mControllerCallbacks.onContainerViewRemoved();
+        }
+    }
+
+    @Override
+    protected void dispatchDraw(Canvas canvas) {
+        canvas.drawRect(0, canvas.getHeight() - mTaskbarView.getHeight(), canvas.getWidth(),
+                canvas.getHeight(), mTaskbarBackgroundPaint);
+        super.dispatchDraw(canvas);
     }
 
     /**
@@ -158,16 +138,6 @@ public class TaskbarContainerView extends BaseDragLayer<TaskbarActivityContext>
         return boundingBox;
     }
 
-    protected TaskbarActivityContext getTaskbarActivityContext() {
-        return mActivity;
-    }
-
-    @Override
-    protected void dispatchDraw(Canvas canvas) {
-        canvas.drawRect(0, canvas.getHeight() - mTaskbarView.getHeight(), canvas.getWidth(),
-                canvas.getHeight(), mTaskbarBackgroundPaint);
-        super.dispatchDraw(canvas);
-    }
 
     /**
      * Sets the alpha of the background color behind all the Taskbar contents.
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index 6084e10d85..cdae5beb9a 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -15,105 +15,83 @@
  */
 package com.android.launcher3.taskbar;
 
-import static android.view.View.GONE;
-import static android.view.View.INVISIBLE;
-import static android.view.View.VISIBLE;
-import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
-import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
-import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
-
-import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_BOTTOM_TAPPABLE_ELEMENT;
-import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_EXTRA_NAVIGATION_BAR;
-
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
-import android.app.ActivityOptions;
-import android.graphics.PixelFormat;
-import android.graphics.Point;
 import android.graphics.Rect;
-import android.inputmethodservice.InputMethodService;
-import android.view.Gravity;
+import android.graphics.RectF;
 import android.view.MotionEvent;
-import android.view.View;
-import android.view.WindowManager;
 
 import androidx.annotation.Nullable;
 
-import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.QuickstepTransitionManager;
 import com.android.launcher3.R;
-import com.android.launcher3.anim.AlphaUpdateListener;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.PendingAnimation;
-import com.android.launcher3.folder.Folder;
-import com.android.launcher3.folder.FolderIcon;
-import com.android.launcher3.model.data.FolderInfo;
-import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.states.StateAnimationConfig;
-import com.android.launcher3.taskbar.TaskbarNavButtonController.TaskbarButton;
-import com.android.launcher3.touch.ItemClickHandler;
-import com.android.launcher3.views.ActivityContext;
-import com.android.quickstep.AnimatedFloat;
-import com.android.quickstep.SysUINavigationMode;
-import com.android.quickstep.TouchInteractionService.TaskbarOverviewProxyDelegate;
-import com.android.systemui.shared.recents.model.Task;
-import com.android.systemui.shared.system.ActivityManagerWrapper;
-import com.android.systemui.shared.system.WindowManagerWrapper;
+
 
 /**
- * Interfaces with Launcher/WindowManager/SystemUI to determine what to show in TaskbarView.
+ * A data source which integrates with a Launcher instance
+ * TODO: Rename to have Launcher prefix
  */
-public class TaskbarController implements TaskbarOverviewProxyDelegate {
 
-    private static final String WINDOW_TITLE = "Taskbar";
-
-    private final TaskbarContainerView mTaskbarContainerView;
-    private final TaskbarView mTaskbarViewInApp;
-    private final TaskbarView mTaskbarViewOnHome;
-    private final ImeBarView mImeBarView;
+public class TaskbarController extends TaskbarUIController {
 
     private final BaseQuickstepLauncher mLauncher;
-    private final WindowManager mWindowManager;
-    // Layout width and height of the Taskbar in the default state.
-    private final Point mTaskbarSize;
     private final TaskbarStateHandler mTaskbarStateHandler;
     private final TaskbarAnimationController mTaskbarAnimationController;
     private final TaskbarHotseatController mHotseatController;
-    private final TaskbarDragController mDragController;
-    private final TaskbarNavButtonController mNavButtonController;
 
-    // Initialized in init().
-    private WindowManager.LayoutParams mWindowLayoutParams;
-    private SysUINavigationMode.Mode mNavMode = SysUINavigationMode.Mode.NO_BUTTON;
-    private final SysUINavigationMode.NavigationModeChangeListener mNavigationModeChangeListener =
-            this::onNavModeChanged;
+    private final TaskbarActivityContext mContext;
+    final TaskbarContainerView mTaskbarContainerView;
+    final TaskbarView mTaskbarView;
 
     private @Nullable Animator mAnimator;
     private boolean mIsAnimatingToLauncher;
 
-    public TaskbarController(BaseQuickstepLauncher launcher,
-            TaskbarContainerView taskbarContainerView, TaskbarView taskbarViewOnHome) {
+    public TaskbarController(BaseQuickstepLauncher launcher, TaskbarActivityContext context) {
+        mContext = context;
+        mTaskbarContainerView = context.getDragLayer();
+        mTaskbarView = mTaskbarContainerView.findViewById(R.id.taskbar_view);
+
         mLauncher = launcher;
-        mTaskbarContainerView = taskbarContainerView;
-        mTaskbarContainerView.construct(createTaskbarContainerViewCallbacks());
-        ButtonProvider buttonProvider = new ButtonProvider(launcher);
-        mTaskbarViewInApp = mTaskbarContainerView.findViewById(R.id.taskbar_view);
-        mTaskbarViewInApp.construct(createTaskbarViewCallbacks(), buttonProvider);
-        mTaskbarViewOnHome = taskbarViewOnHome;
-        mTaskbarViewOnHome.construct(createTaskbarViewCallbacks(), buttonProvider);
-        mImeBarView = mTaskbarContainerView.findViewById(R.id.ime_bar_view);
-        mImeBarView.construct(buttonProvider);
-        mNavButtonController = new TaskbarNavButtonController(launcher);
-        mWindowManager = mLauncher.getWindowManager();
-        mTaskbarSize = new Point(MATCH_PARENT, mLauncher.getDeviceProfile().taskbarSize);
         mTaskbarStateHandler = mLauncher.getTaskbarStateHandler();
         mTaskbarAnimationController = new TaskbarAnimationController(mLauncher,
                 createTaskbarAnimationControllerCallbacks());
-        mHotseatController = new TaskbarHotseatController(mLauncher,
-                createTaskbarHotseatControllerCallbacks());
-        mDragController = new TaskbarDragController(mLauncher);
+        mHotseatController = new TaskbarHotseatController(
+                mLauncher, mTaskbarView::updateHotseatItems);
+    }
+
+    @Override
+    protected void onCreate() {
+        mTaskbarStateHandler.setAnimationController(mTaskbarAnimationController);
+        mTaskbarAnimationController.init();
+        mHotseatController.init();
+        setTaskbarViewVisible(!mLauncher.hasBeenResumed());
+        alignRealHotseatWithTaskbar();
+        mLauncher.setTaskbarController(this);
+    }
+
+    @Override
+    protected void onDestroy() {
+        if (mAnimator != null) {
+            // End this first, in case it relies on properties that are about to be cleaned up.
+            mAnimator.end();
+        }
+        mTaskbarStateHandler.setAnimationController(null);
+        mTaskbarAnimationController.cleanup();
+        mHotseatController.cleanup();
+        setTaskbarViewVisible(true);
+        mLauncher.getHotseat().setIconsAlpha(1f);
+        mLauncher.setTaskbarController(null);
+    }
+
+    @Override
+    protected boolean isTaskbarTouchable() {
+        return !mIsAnimatingToLauncher;
     }
 
     private TaskbarAnimationControllerCallbacks createTaskbarAnimationControllerCallbacks() {
@@ -125,245 +103,34 @@ public class TaskbarController implements TaskbarOverviewProxyDelegate {
 
             @Override
             public void updateTaskbarVisibilityAlpha(float alpha) {
-                mTaskbarViewInApp.setAlpha(alpha);
-                mTaskbarViewOnHome.setAlpha(alpha);
+                mTaskbarView.setAlpha(alpha);
             }
 
             @Override
             public void updateImeBarVisibilityAlpha(float alpha) {
-                if (mNavMode != SysUINavigationMode.Mode.THREE_BUTTONS) {
-                    // TODO Remove sysui IME bar for gesture nav as well
-                    return;
-                }
-                mImeBarView.setAlpha(alpha);
-                mImeBarView.setVisibility(alpha == 0 ? GONE : VISIBLE);
+                mTaskbarContainerView.updateImeBarVisibilityAlpha(alpha);
             }
 
             @Override
             public void updateTaskbarScale(float scale) {
-                mTaskbarViewInApp.setScaleX(scale);
-                mTaskbarViewInApp.setScaleY(scale);
+                mTaskbarView.setScaleX(scale);
+                mTaskbarView.setScaleY(scale);
             }
 
             @Override
             public void updateTaskbarTranslationY(float translationY) {
                 if (translationY < 0) {
                     // Resize to accommodate the max translation we'll reach.
-                    setTaskbarWindowHeight(mTaskbarSize.y
+                    mContext.setTaskbarWindowHeight(mContext.getDeviceProfile().taskbarSize
                             + mLauncher.getHotseat().getTaskbarOffsetY());
                 } else {
-                    setTaskbarWindowHeight(mTaskbarSize.y);
-                }
-                mTaskbarViewInApp.setTranslationY(translationY);
-            }
-        };
-    }
-
-    private TaskbarContainerViewCallbacks createTaskbarContainerViewCallbacks() {
-        return new TaskbarContainerViewCallbacks() {
-            @Override
-            public void onViewRemoved() {
-                // Ensure no other children present (like Folders, etc)
-                for (int i = 0; i < mTaskbarContainerView.getChildCount(); i++) {
-                    View v = mTaskbarContainerView.getChildAt(i);
-                    if (!((v instanceof TaskbarView) || (v instanceof ImeBarView))){
-                        return;
-                    }
+                    mContext.setTaskbarWindowHeight(mContext.getDeviceProfile().taskbarSize);
                 }
-                setTaskbarWindowFullscreen(false);
-            }
-
-            @Override
-            public boolean isTaskbarTouchable() {
-                return mTaskbarContainerView.getAlpha() > AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD
-                        && (mTaskbarViewInApp.getVisibility() == VISIBLE
-                            || mImeBarView.getVisibility() == VISIBLE)
-                        && !mIsAnimatingToLauncher;
-            }
-        };
-    }
-
-    private TaskbarViewCallbacks createTaskbarViewCallbacks() {
-        return new TaskbarViewCallbacks() {
-            @Override
-            public View.OnClickListener getItemOnClickListener() {
-                return view -> {
-                    Object tag = view.getTag();
-                    if (tag instanceof Task) {
-                        Task task = (Task) tag;
-                        ActivityManagerWrapper.getInstance().startActivityFromRecents(task.key,
-                                ActivityOptions.makeBasic());
-                    } else if (tag instanceof FolderInfo) {
-                        FolderIcon folderIcon = (FolderIcon) view;
-                        Folder folder = folderIcon.getFolder();
-
-                        setTaskbarWindowFullscreen(true);
-
-                        mTaskbarContainerView.post(() -> {
-                            folder.animateOpen();
-
-                            folder.iterateOverItems((itemInfo, itemView) -> {
-                                itemView.setOnClickListener(getItemOnClickListener());
-                                itemView.setOnLongClickListener(getItemOnLongClickListener());
-                                // To play haptic when dragging, like other Taskbar items do.
-                                itemView.setHapticFeedbackEnabled(true);
-                                return false;
-                            });
-                        });
-                    } else {
-                        ItemClickHandler.INSTANCE.onClick(view);
-                    }
-
-                    AbstractFloatingView.closeAllOpenViews(
-                            mTaskbarContainerView.getTaskbarActivityContext());
-                };
-            }
-
-            @Override
-            public View.OnLongClickListener getItemOnLongClickListener() {
-                return mDragController::startSystemDragOnLongClick;
-            }
-
-            @Override
-            public int getEmptyHotseatViewVisibility(TaskbarView taskbarView) {
-                // When on the home screen, we want the empty hotseat views to take up their full
-                // space so that the others line up with the home screen hotseat.
-                boolean isOnHomeScreen = taskbarView == mTaskbarViewOnHome
-                        || mLauncher.hasBeenResumed() || mIsAnimatingToLauncher;
-                return isOnHomeScreen ? INVISIBLE : GONE;
-            }
-
-            @Override
-            public float getNonIconScale(TaskbarView taskbarView) {
-                return taskbarView == mTaskbarViewOnHome ? getTaskbarScaleOnHome() : 1f;
-            }
-
-            @Override
-            public void onItemPositionsChanged(TaskbarView taskbarView) {
-                if (taskbarView == mTaskbarViewOnHome) {
-                    alignRealHotseatWithTaskbar();
-                }
-            }
-
-            @Override
-            public void onNavigationButtonClick(@TaskbarButton int buttonType) {
-                mNavButtonController.onButtonClick(buttonType);
-            }
-        };
-    }
-
-    private TaskbarHotseatControllerCallbacks createTaskbarHotseatControllerCallbacks() {
-        return new TaskbarHotseatControllerCallbacks() {
-            @Override
-            public void updateHotseatItems(ItemInfo[] hotseatItemInfos) {
-                mTaskbarViewInApp.updateHotseatItems(hotseatItemInfos);
+                mTaskbarView.setTranslationY(translationY);
             }
         };
     }
 
-    /**
-     * Initializes the Taskbar, including adding it to the screen.
-     */
-    public void init() {
-        mNavMode = SysUINavigationMode.INSTANCE.get(mLauncher)
-                .addModeChangeListener(mNavigationModeChangeListener);
-        mTaskbarViewInApp.init(mHotseatController.getNumHotseatIcons(), mNavMode);
-        mTaskbarViewOnHome.init(mHotseatController.getNumHotseatIcons(), mNavMode);
-        mTaskbarContainerView.init(mTaskbarViewInApp);
-        mImeBarView.init(createTaskbarViewCallbacks());
-        addToWindowManager();
-        mTaskbarStateHandler.setTaskbarCallbacks(createTaskbarStateHandlerCallbacks());
-        mTaskbarAnimationController.init();
-        mHotseatController.init();
-
-        setWhichTaskbarViewIsVisible(mLauncher.hasBeenResumed()
-                ? mTaskbarViewOnHome
-                : mTaskbarViewInApp);
-    }
-
-    private TaskbarStateHandlerCallbacks createTaskbarStateHandlerCallbacks() {
-        return new TaskbarStateHandlerCallbacks() {
-            @Override
-            public AnimatedFloat getAlphaTarget() {
-                return mTaskbarAnimationController.getTaskbarVisibilityForLauncherState();
-            }
-
-            @Override
-            public AnimatedFloat getScaleTarget() {
-                return mTaskbarAnimationController.getTaskbarScaleForLauncherState();
-            }
-
-            @Override
-            public AnimatedFloat getTranslationYTarget() {
-                return mTaskbarAnimationController.getTaskbarTranslationYForLauncherState();
-            }
-        };
-    }
-
-    /**
-     * Removes the Taskbar from the screen, and removes any obsolete listeners etc.
-     */
-    public void cleanup() {
-        if (mAnimator != null) {
-            // End this first, in case it relies on properties that are about to be cleaned up.
-            mAnimator.end();
-        }
-
-        mTaskbarViewInApp.cleanup();
-        mTaskbarViewOnHome.cleanup();
-        mTaskbarContainerView.cleanup();
-        mImeBarView.cleanup();
-        removeFromWindowManager();
-        mTaskbarStateHandler.setTaskbarCallbacks(null);
-        mTaskbarAnimationController.cleanup();
-        mHotseatController.cleanup();
-
-        setWhichTaskbarViewIsVisible(null);
-        SysUINavigationMode.INSTANCE.get(mLauncher)
-                .removeModeChangeListener(mNavigationModeChangeListener);
-    }
-
-    private void removeFromWindowManager() {
-        mWindowManager.removeViewImmediate(mTaskbarContainerView);
-    }
-
-    private void addToWindowManager() {
-        final int gravity = Gravity.BOTTOM;
-
-        mWindowLayoutParams = new WindowManager.LayoutParams(
-                mTaskbarSize.x,
-                mTaskbarSize.y,
-                TYPE_APPLICATION_OVERLAY,
-                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
-                PixelFormat.TRANSLUCENT);
-        mWindowLayoutParams.setTitle(WINDOW_TITLE);
-        mWindowLayoutParams.packageName = mLauncher.getPackageName();
-        mWindowLayoutParams.gravity = gravity;
-        mWindowLayoutParams.setFitInsetsTypes(0);
-        mWindowLayoutParams.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING;
-        mWindowLayoutParams.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
-        mWindowLayoutParams.setSystemApplicationOverlay(true);
-
-        WindowManagerWrapper wmWrapper = WindowManagerWrapper.getInstance();
-        wmWrapper.setProvidesInsetsTypes(
-                mWindowLayoutParams,
-                new int[] { ITYPE_EXTRA_NAVIGATION_BAR, ITYPE_BOTTOM_TAPPABLE_ELEMENT }
-        );
-
-        TaskbarContainerView.LayoutParams taskbarLayoutParams =
-                new TaskbarContainerView.LayoutParams(mTaskbarSize.x, mTaskbarSize.y);
-        taskbarLayoutParams.gravity = gravity;
-        mTaskbarViewInApp.setLayoutParams(taskbarLayoutParams);
-
-        mWindowManager.addView(mTaskbarContainerView, mWindowLayoutParams);
-    }
-
-    private void onNavModeChanged(SysUINavigationMode.Mode newMode) {
-        mNavMode = newMode;
-        cleanup();
-        init();
-    }
-
     /**
      * Should be called from onResume() and onPause(), and animates the Taskbar accordingly.
      */
@@ -401,13 +168,14 @@ public class TaskbarController implements TaskbarOverviewProxyDelegate {
             @Override
             public void onAnimationStart(Animator animation) {
                 mIsAnimatingToLauncher = true;
-                mTaskbarViewInApp.updateHotseatItemsVisibility();
+                mTaskbarView.setHolesAllowedInLayout(true);
+                mTaskbarView.updateHotseatItemsVisibility();
             }
 
             @Override
             public void onAnimationEnd(Animator animation) {
                 mIsAnimatingToLauncher = false;
-                setWhichTaskbarViewIsVisible(mTaskbarViewOnHome);
+                setTaskbarViewVisible(false);
             }
         });
 
@@ -420,44 +188,21 @@ public class TaskbarController implements TaskbarOverviewProxyDelegate {
         anim.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationStart(Animator animation) {
-                mTaskbarViewInApp.updateHotseatItemsVisibility();
-                setWhichTaskbarViewIsVisible(mTaskbarViewInApp);
+                mTaskbarView.updateHotseatItemsVisibility();
+                setTaskbarViewVisible(true);
             }
 
             @Override
             public void onAnimationEnd(Animator animation) {
+                mTaskbarView.setHolesAllowedInLayout(false);
             }
         });
         return anim.buildAnim();
     }
 
-    /**
-     * Should be called when the IME visibility changes, so we can hide/show Taskbar accordingly.
-     */
-    public void setIsImeVisible(boolean isImeVisible) {
-        mTaskbarAnimationController.animateToVisibilityForIme(isImeVisible ? 0 : 1);
-        blockTaskbarTouchesForIme(isImeVisible);
-    }
-
-    /**
-     * When in 3 button nav, the above doesn't get called since we prevent sysui nav bar from
-     * instantiating at all, which is what's responsible for sending sysui state flags over.
-     *
-     * @param vis IME visibility flag
-     * @param backDisposition Used to determine back button behavior for software keyboard
-     *                        See BACK_DISPOSITION_* constants in {@link InputMethodService}
-     */
-    public void updateImeStatus(int displayId, int vis, int backDisposition,
-            boolean showImeSwitcher) {
-        if (displayId != mTaskbarContainerView.getContext().getDisplayId() ||
-                mNavMode != SysUINavigationMode.Mode.THREE_BUTTONS) {
-            return;
-        }
-
-        boolean imeVisible = (vis & InputMethodService.IME_VISIBLE) != 0;
-        mTaskbarAnimationController.animateToVisibilityForIme(imeVisible ? 0 : 1);
-        mImeBarView.setImeSwitcherVisibility(showImeSwitcher);
-        blockTaskbarTouchesForIme(imeVisible);
+    @Override
+    protected void onImeVisible(TaskbarContainerView containerView, boolean isVisible) {
+        mTaskbarAnimationController.animateToVisibilityForIme(isVisible ? 0 : 1);
     }
 
     /**
@@ -472,24 +217,17 @@ public class TaskbarController implements TaskbarOverviewProxyDelegate {
      * @return Whether any Taskbar item could handle the given MotionEvent if given the chance.
      */
     public boolean isEventOverAnyTaskbarItem(MotionEvent ev) {
-        return mTaskbarViewInApp.isEventOverAnyItem(ev);
+        return mTaskbarView.isEventOverAnyItem(ev);
     }
 
     public boolean isDraggingItem() {
-        return mTaskbarViewInApp.isDraggingItem() || mTaskbarViewOnHome.isDraggingItem();
-    }
-
-    /**
-     * @return Whether the given View is in the same window as Taskbar.
-     */
-    public boolean isViewInTaskbar(View v) {
-        return mTaskbarContainerView.isAttachedToWindow()
-                && mTaskbarContainerView.getWindowId().equals(v.getWindowId());
+        return mTaskbarView.isDraggingItem();
     }
 
     /**
      * Pads the Hotseat to line up exactly with Taskbar's copy of the Hotseat.
      */
+    @Override
     public void alignRealHotseatWithTaskbar() {
         Rect hotseatBounds = new Rect();
         DeviceProfile grid = mLauncher.getDeviceProfile();
@@ -498,60 +236,28 @@ public class TaskbarController implements TaskbarOverviewProxyDelegate {
         int hotseatTopDiff = hotseatHeight - grid.taskbarSize - taskbarOffset;
         int hotseatBottomDiff = taskbarOffset;
 
-        mTaskbarViewOnHome.getHotseatBounds().roundOut(hotseatBounds);
+        RectF hotseatBoundsF = mTaskbarView.getHotseatBounds();
+        Utilities.scaleRectFAboutPivot(hotseatBoundsF, getTaskbarScaleOnHome(),
+                mTaskbarView.getPivotX(), mTaskbarView.getPivotY());
+        hotseatBoundsF.round(hotseatBounds);
         mLauncher.getHotseat().setPadding(hotseatBounds.left,
                 hotseatBounds.top + hotseatTopDiff,
-                mTaskbarViewOnHome.getWidth() - hotseatBounds.right,
-                mTaskbarViewOnHome.getHeight() - hotseatBounds.bottom + hotseatBottomDiff);
-    }
-
-    private void setWhichTaskbarViewIsVisible(@Nullable TaskbarView visibleTaskbar) {
-        mTaskbarViewInApp.setVisibility(visibleTaskbar == mTaskbarViewInApp
-                ? VISIBLE : INVISIBLE);
-        mTaskbarViewOnHome.setVisibility(visibleTaskbar == mTaskbarViewOnHome
-                ? VISIBLE : INVISIBLE);
-        mLauncher.getHotseat().setIconsAlpha(visibleTaskbar != mTaskbarViewInApp ? 1f : 0f);
-    }
-
-    private void blockTaskbarTouchesForIme(boolean block) {
-        mTaskbarViewOnHome.setTouchesEnabled(!block);
-        mTaskbarViewInApp.setTouchesEnabled(!block);
+                mTaskbarView.getWidth() - hotseatBounds.right,
+                mTaskbarView.getHeight() - hotseatBounds.bottom + hotseatBottomDiff);
     }
 
     /**
      * Returns the ratio of the taskbar icon size on home vs in an app.
      */
     public float getTaskbarScaleOnHome() {
-        DeviceProfile inAppDp = mTaskbarContainerView.getTaskbarActivityContext()
-                .getDeviceProfile();
-        DeviceProfile onHomeDp = ActivityContext.lookupContext(mTaskbarViewOnHome.getContext())
-                .getDeviceProfile();
+        DeviceProfile inAppDp = mContext.getDeviceProfile();
+        DeviceProfile onHomeDp = mLauncher.getDeviceProfile();
         return (float) onHomeDp.cellWidthPx / inAppDp.cellWidthPx;
     }
 
-    /**
-     * Updates the TaskbarContainer to MATCH_PARENT vs original Taskbar size.
-     */
-    private void setTaskbarWindowFullscreen(boolean fullscreen) {
-        setTaskbarWindowHeight(fullscreen ? MATCH_PARENT : mTaskbarSize.y);
-    }
-
-    /**
-     * Updates the TaskbarContainer height (pass mTaskbarSize.y to reset).
-     */
-    private void setTaskbarWindowHeight(int height) {
-        mWindowLayoutParams.width = mTaskbarSize.x;
-        mWindowLayoutParams.height = height;
-        mWindowManager.updateViewLayout(mTaskbarContainerView, mWindowLayoutParams);
-    }
-
-    /**
-     * Contains methods that TaskbarStateHandler can call to interface with TaskbarController.
-     */
-    protected interface TaskbarStateHandlerCallbacks {
-        AnimatedFloat getAlphaTarget();
-        AnimatedFloat getScaleTarget();
-        AnimatedFloat getTranslationYTarget();
+    void setTaskbarViewVisible(boolean isVisible) {
+        mTaskbarView.setIconsVisibility(isVisible);
+        mLauncher.getHotseat().setIconsAlpha(isVisible ? 0f : 1f);
     }
 
     /**
@@ -565,32 +271,4 @@ public class TaskbarController implements TaskbarOverviewProxyDelegate {
         void updateTaskbarScale(float scale);
         void updateTaskbarTranslationY(float translationY);
     }
-
-    /**
-     * Contains methods that TaskbarContainerView can call to interface with TaskbarController.
-     */
-    protected interface TaskbarContainerViewCallbacks {
-        void onViewRemoved();
-        boolean isTaskbarTouchable();
-    }
-
-    /**
-     * Contains methods that TaskbarView can call to interface with TaskbarController.
-     */
-    protected interface TaskbarViewCallbacks {
-        View.OnClickListener getItemOnClickListener();
-        View.OnLongClickListener getItemOnLongClickListener();
-        int getEmptyHotseatViewVisibility(TaskbarView taskbarView);
-        /** Returns how much to scale non-icon elements such as spacing and dividers. */
-        float getNonIconScale(TaskbarView taskbarView);
-        void onItemPositionsChanged(TaskbarView taskbarView);
-        void onNavigationButtonClick(@TaskbarButton int buttonType);
-    }
-
-    /**
-     * Contains methods that TaskbarHotseatController can call to interface with TaskbarController.
-     */
-    protected interface TaskbarHotseatControllerCallbacks {
-        void updateHotseatItems(ItemInfo[] hotseatItemInfos);
-    }
 }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
index 5eb34cb360..ee44927ce4 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
@@ -20,6 +20,7 @@ import static android.view.View.VISIBLE;
 
 import android.content.ClipData;
 import android.content.ClipDescription;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.LauncherApps;
 import android.content.res.Resources;
@@ -29,7 +30,6 @@ import android.os.UserHandle;
 import android.view.DragEvent;
 import android.view.View;
 
-import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.R;
@@ -43,12 +43,12 @@ import com.android.systemui.shared.system.LauncherAppsCompat;
  */
 public class TaskbarDragController {
 
-    private final BaseQuickstepLauncher mLauncher;
+    private final Context mContext;
     private final int mDragIconSize;
 
-    public TaskbarDragController(BaseQuickstepLauncher launcher) {
-        mLauncher = launcher;
-        Resources resources = mLauncher.getResources();
+    public TaskbarDragController(Context context) {
+        mContext = context;
+        Resources resources = mContext.getResources();
         mDragIconSize = resources.getDimensionPixelSize(R.dimen.taskbar_icon_drag_icon_size);
     }
 
@@ -63,7 +63,6 @@ public class TaskbarDragController {
         }
 
         BubbleTextView btv = (BubbleTextView) view;
-
         View.DragShadowBuilder shadowBuilder = new View.DragShadowBuilder(view) {
             @Override
             public void onProvideShadowMetrics(Point shadowSize, Point shadowTouchPoint) {
@@ -87,7 +86,7 @@ public class TaskbarDragController {
         Intent intent = null;
         if (tag instanceof WorkspaceItemInfo) {
             WorkspaceItemInfo item = (WorkspaceItemInfo) tag;
-            LauncherApps launcherApps = mLauncher.getSystemService(LauncherApps.class);
+            LauncherApps launcherApps = mContext.getSystemService(LauncherApps.class);
             clipDescription = new ClipDescription(item.title,
                     new String[] {
                             item.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java
index 68829cd0fb..91cf7efab5 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java
@@ -26,6 +26,8 @@ import com.android.launcher3.dragndrop.DragController;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.model.data.ItemInfo;
 
+import java.util.function.Consumer;
+
 /**
  * Works with TaskbarController to update the TaskbarView's Hotseat items.
  */
@@ -33,13 +35,12 @@ public class TaskbarHotseatController {
 
     private final BaseQuickstepLauncher mLauncher;
     private final Hotseat mHotseat;
-    private final TaskbarController.TaskbarHotseatControllerCallbacks mTaskbarCallbacks;
+    private final Consumer<ItemInfo[]> mTaskbarCallbacks;
     private final int mNumHotseatIcons;
 
     private final DragController.DragListener mDragListener = new DragController.DragListener() {
         @Override
-        public void onDragStart(DropTarget.DragObject dragObject, DragOptions options) {
-        }
+        public void onDragStart(DropTarget.DragObject dragObject, DragOptions options) { }
 
         @Override
         public void onDragEnd() {
@@ -47,8 +48,8 @@ public class TaskbarHotseatController {
         }
     };
 
-    public TaskbarHotseatController(BaseQuickstepLauncher launcher,
-            TaskbarController.TaskbarHotseatControllerCallbacks taskbarCallbacks) {
+    public TaskbarHotseatController(
+            BaseQuickstepLauncher launcher, Consumer<ItemInfo[]> taskbarCallbacks) {
         mLauncher = launcher;
         mHotseat = mLauncher.getHotseat();
         mTaskbarCallbacks = taskbarCallbacks;
@@ -85,10 +86,6 @@ public class TaskbarHotseatController {
             }
         }
 
-        mTaskbarCallbacks.updateHotseatItems(hotseatItemInfos);
-    }
-
-    protected int getNumHotseatIcons() {
-        return mNumHotseatIcons;
+        mTaskbarCallbacks.accept(hotseatItemInfos);
     }
 }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarIconController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarIconController.java
new file mode 100644
index 0000000000..2a37915fcf
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarIconController.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.taskbar;
+
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
+
+import static com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo.TOUCHABLE_INSETS_FRAME;
+import static com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo.TOUCHABLE_INSETS_REGION;
+
+import android.graphics.Rect;
+import android.inputmethodservice.InputMethodService;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.View.OnLongClickListener;
+
+import androidx.annotation.NonNull;
+
+import com.android.launcher3.R;
+import com.android.launcher3.anim.AlphaUpdateListener;
+import com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo;
+
+/**
+ * Controller for taskbar icon UI
+ */
+public class TaskbarIconController {
+
+    private final Rect mTempRect = new Rect();
+
+    private final TaskbarActivityContext mActivity;
+    private final TaskbarContainerView mContainerView;
+
+    private final TaskbarView mTaskbarView;
+    private final ImeBarView mImeBarView;
+
+    @NonNull
+    private TaskbarUIController mUIController = TaskbarUIController.DEFAULT;
+
+    TaskbarIconController(TaskbarActivityContext activity, TaskbarContainerView containerView) {
+        mActivity = activity;
+        mContainerView = containerView;
+        mTaskbarView = mContainerView.findViewById(R.id.taskbar_view);
+        mImeBarView = mContainerView.findViewById(R.id.ime_bar_view);
+    }
+
+    public void init(OnClickListener clickListener, OnLongClickListener longClickListener) {
+        mContainerView.addOnLayoutChangeListener((v, a, b, c, d, e, f, g, h) ->
+                mUIController.alignRealHotseatWithTaskbar());
+
+        ButtonProvider buttonProvider = new ButtonProvider(mActivity);
+        mImeBarView.init(buttonProvider);
+        mTaskbarView.construct(clickListener, longClickListener, buttonProvider);
+        mTaskbarView.getLayoutParams().height = mActivity.getDeviceProfile().taskbarSize;
+
+        mContainerView.init(new Callbacks(), mTaskbarView);
+    }
+
+    public void onDestroy() {
+        mContainerView.onDestroy();
+    }
+
+    public void setUIController(@NonNull TaskbarUIController uiController) {
+        mUIController = uiController;
+    }
+
+    /**
+     * When in 3 button nav, the above doesn't get called since we prevent sysui nav bar from
+     * instantiating at all, which is what's responsible for sending sysui state flags over.
+     *
+     * @param vis IME visibility flag
+     */
+    public void updateImeStatus(int displayId, int vis, boolean showImeSwitcher) {
+        if (displayId != mActivity.getDisplayId() || !mActivity.canShowNavButtons()) {
+            return;
+        }
+
+        mImeBarView.setImeSwitcherVisibility(showImeSwitcher);
+        setImeIsVisible((vis & InputMethodService.IME_VISIBLE) != 0);
+    }
+
+    /**
+     * Should be called when the IME visibility changes, so we can hide/show Taskbar accordingly.
+     */
+    public void setImeIsVisible(boolean isImeVisible) {
+        mTaskbarView.setTouchesEnabled(!isImeVisible);
+        mUIController.onImeVisible(mContainerView, isImeVisible);
+    }
+
+    /**
+     * Callbacks for {@link TaskbarContainerView} to interact with the icon controller
+     */
+    public class Callbacks {
+
+        /**
+         * Called to update the touchable insets
+         */
+        public void updateInsetsTouchability(InsetsInfo insetsInfo) {
+            insetsInfo.touchableRegion.setEmpty();
+            if (mContainerView.getAlpha() < AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD) {
+                // Let touches pass through us.
+                insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION);
+            } else if (mImeBarView.getVisibility() == VISIBLE) {
+                insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_FRAME);
+            } else if (!mUIController.isTaskbarTouchable()) {
+                // Let touches pass through us.
+                insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION);
+            } else if (mTaskbarView.areIconsVisible()) {
+                // Buttons are visible, take over the full taskbar area
+                insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_FRAME);
+            } else {
+                if (mTaskbarView.mSystemButtonContainer.getVisibility() == VISIBLE) {
+                    mContainerView.getDescendantRectRelativeToSelf(
+                            mTaskbarView.mSystemButtonContainer, mTempRect);
+                    insetsInfo.touchableRegion.set(mTempRect);
+                }
+                insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION);
+            }
+
+            // TaskbarContainerView provides insets to other apps based on contentInsets. These
+            // insets should stay consistent even if we expand TaskbarContainerView's bounds, e.g.
+            // to show a floating view like Folder. Thus, we set the contentInsets to be where
+            // mTaskbarView is, since its position never changes and insets rather than overlays.
+            insetsInfo.contentInsets.left = mTaskbarView.getLeft();
+            insetsInfo.contentInsets.top = mTaskbarView.getTop();
+            insetsInfo.contentInsets.right = mContainerView.getWidth() - mTaskbarView.getRight();
+            insetsInfo.contentInsets.bottom = mContainerView.getHeight() - mTaskbarView.getBottom();
+        }
+
+        public void onContainerViewRemoved() {
+            int count = mContainerView.getChildCount();
+            // Ensure no other children present (like Folders, etc)
+            for (int i = 0; i < count; i++) {
+                View v = mContainerView.getChildAt(i);
+                if (!((v instanceof TaskbarView) || (v instanceof ImeBarView))) {
+                    return;
+                }
+            }
+            mActivity.setTaskbarWindowFullscreen(false);
+        }
+
+        public void updateImeBarVisibilityAlpha(float alpha) {
+            if (!mActivity.canShowNavButtons()) {
+                // TODO Remove sysui IME bar for gesture nav as well
+                return;
+            }
+            mImeBarView.setAlpha(alpha);
+            mImeBarView.setVisibility(alpha == 0 ? GONE : VISIBLE);
+        }
+    }
+}
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
new file mode 100644
index 0000000000..b9eec93687
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.taskbar;
+
+import static android.view.Display.DEFAULT_DISPLAY;
+import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
+
+import static com.android.launcher3.util.DisplayController.CHANGE_ACTIVE_SCREEN;
+import static com.android.launcher3.util.DisplayController.CHANGE_DENSITY;
+import static com.android.launcher3.util.DisplayController.CHANGE_SUPPORTED_BOUNDS;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING;
+
+import android.content.Context;
+import android.hardware.display.DisplayManager;
+import android.inputmethodservice.InputMethodService;
+import android.view.Display;
+
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.BaseQuickstepLauncher;
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.config.FeatureFlags;
+import com.android.launcher3.util.DisplayController;
+import com.android.launcher3.util.DisplayController.Info;
+import com.android.quickstep.SysUINavigationMode;
+import com.android.quickstep.SysUINavigationMode.Mode;
+import com.android.quickstep.TouchInteractionService;
+
+/**
+ * Class to manager taskbar lifecycle
+ */
+public class TaskbarManager implements DisplayController.DisplayInfoChangeListener,
+        SysUINavigationMode.NavigationModeChangeListener {
+
+    private final Context mContext;
+    private final DisplayController mDisplayController;
+    private final SysUINavigationMode mSysUINavigationMode;
+    private final TaskbarNavButtonController mNavButtonController;
+
+    private TaskbarActivityContext mTaskbarActivityContext;
+    private BaseQuickstepLauncher mLauncher;
+
+    private static final int CHANGE_FLAGS =
+            CHANGE_ACTIVE_SCREEN | CHANGE_DENSITY | CHANGE_SUPPORTED_BOUNDS;
+
+    public TaskbarManager(TouchInteractionService service) {
+        mDisplayController = DisplayController.INSTANCE.get(service);
+        mSysUINavigationMode = SysUINavigationMode.INSTANCE.get(service);
+        Display display =
+                service.getSystemService(DisplayManager.class).getDisplay(DEFAULT_DISPLAY);
+        mContext = service.createWindowContext(display, TYPE_APPLICATION_OVERLAY, null);
+        mNavButtonController = new TaskbarNavButtonController(service);
+
+        mDisplayController.addChangeListener(this);
+        mSysUINavigationMode.addModeChangeListener(this);
+        recreateTaskbar();
+    }
+
+    @Override
+    public void onNavigationModeChanged(Mode newMode) {
+        recreateTaskbar();
+    }
+
+    @Override
+    public void onDisplayInfoChanged(Context context, Info info, int flags) {
+        if ((flags & CHANGE_FLAGS) != 0) {
+            recreateTaskbar();
+        }
+    }
+
+    private void destroyExistingTaskbar() {
+        if (mTaskbarActivityContext != null) {
+            mTaskbarActivityContext.onDestroy();
+            mTaskbarActivityContext = null;
+        }
+    }
+
+    /**
+     * Sets or clears a launcher to act as taskbar callback
+     */
+    public void setLauncher(@Nullable BaseQuickstepLauncher launcher) {
+        mLauncher = launcher;
+        if (mTaskbarActivityContext != null) {
+            mTaskbarActivityContext.setUIController(mLauncher == null
+                    ? TaskbarUIController.DEFAULT
+                    : new TaskbarController(launcher, mTaskbarActivityContext));
+        }
+    }
+
+    private void recreateTaskbar() {
+        destroyExistingTaskbar();
+        if (!FeatureFlags.ENABLE_TASKBAR.get()) {
+            return;
+        }
+        DeviceProfile dp = LauncherAppState.getIDP(mContext).getDeviceProfile(mContext);
+        if (!dp.isTaskbarPresent) {
+            return;
+        }
+        mTaskbarActivityContext = new TaskbarActivityContext(
+                mContext, dp.copy(mContext), mNavButtonController);
+        mTaskbarActivityContext.init();
+        if (mLauncher != null) {
+            mTaskbarActivityContext.setUIController(
+                    new TaskbarController(mLauncher, mTaskbarActivityContext));
+        }
+    }
+
+    /**
+     * See {@link com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags}
+     * @param systemUiStateFlags The latest SystemUiStateFlags
+     */
+    public void onSystemUiFlagsChanged(int systemUiStateFlags) {
+        boolean isImeVisible = (systemUiStateFlags & SYSUI_STATE_IME_SHOWING) != 0;
+        if (mTaskbarActivityContext != null) {
+            mTaskbarActivityContext.getIconController().setImeIsVisible(isImeVisible);
+        }
+    }
+
+    /**
+     * When in 3 button nav, the above doesn't get called since we prevent sysui nav bar from
+     * instantiating at all, which is what's responsible for sending sysui state flags over.
+     *
+     * @param vis IME visibility flag
+     * @param backDisposition Used to determine back button behavior for software keyboard
+     *                        See BACK_DISPOSITION_* constants in {@link InputMethodService}
+     */
+    public void updateImeStatus(int displayId, int vis, int backDisposition,
+            boolean showImeSwitcher) {
+        if (mTaskbarActivityContext != null) {
+            mTaskbarActivityContext.getIconController()
+                    .updateImeStatus(displayId, vis, showImeSwitcher);
+        }
+    }
+
+    /**
+     * Called when the manager is no longer needed
+     */
+    public void destroy() {
+        destroyExistingTaskbar();
+        mDisplayController.removeChangeListener(this);
+        mSysUINavigationMode.removeModeChangeListener(this);
+    }
+}
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java
index 54e1610cd1..3b5afad691 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java
@@ -16,7 +16,8 @@
 
 package com.android.launcher3.taskbar;
 
-import android.content.Context;
+import static android.view.Display.DEFAULT_DISPLAY;
+
 import android.content.Intent;
 import android.view.inputmethod.InputMethodManager;
 
@@ -53,11 +54,10 @@ public class TaskbarNavButtonController {
     static final int BUTTON_RECENTS = BUTTON_HOME << 1;
     static final int BUTTON_IME_SWITCH = BUTTON_RECENTS << 1;
 
+    private final TouchInteractionService mService;
 
-    private final Context mContext;
-
-    public TaskbarNavButtonController(Context context) {
-        mContext = context;
+    public TaskbarNavButtonController(TouchInteractionService service) {
+        mService = service;
     }
 
     public void onButtonClick(@TaskbarButton int buttonType) {
@@ -78,13 +78,13 @@ public class TaskbarNavButtonController {
     }
 
     private void navigateHome() {
-        mContext.startActivity(new Intent(Intent.ACTION_MAIN)
+        mService.startActivity(new Intent(Intent.ACTION_MAIN)
                 .addCategory(Intent.CATEGORY_HOME)
                 .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
     }
 
     private void navigateToOverview() {
-        TouchInteractionService.getInstance().getOverviewCommandHelper()
+        mService.getOverviewCommandHelper()
                 .addCommand(OverviewCommandHelper.TYPE_SHOW);
     }
 
@@ -93,8 +93,8 @@ public class TaskbarNavButtonController {
     }
 
     private void showIMESwitcher() {
-        mContext.getSystemService(InputMethodManager.class).showInputMethodPickerFromSystem(
-                true /* showAuxiliarySubtypes */, mContext.getDisplayId());
+        mService.getSystemService(InputMethodManager.class)
+                .showInputMethodPickerFromSystem(true /* showAuxiliarySubtypes */,
+                        DEFAULT_DISPLAY);
     }
-
 }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java
index 6ea51fa5eb..a701aae088 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java
@@ -24,59 +24,52 @@ import androidx.annotation.Nullable;
 import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.anim.PendingAnimation;
+import com.android.launcher3.anim.PropertySetter;
 import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.quickstep.AnimatedFloat;
 
 /**
  * StateHandler to animate Taskbar according to Launcher's state machine. Does nothing if Taskbar
- * isn't present (i.e. {@link #setTaskbarCallbacks} is never called).
+ * isn't present (i.e. {@link #setAnimationController} is never called).
  */
 public class TaskbarStateHandler implements StateManager.StateHandler<LauncherState> {
 
     private final BaseQuickstepLauncher mLauncher;
 
     // Contains Taskbar-related methods and fields we should aniamte. If null, don't do anything.
-    private @Nullable TaskbarController.TaskbarStateHandlerCallbacks mTaskbarCallbacks = null;
+    private @Nullable TaskbarAnimationController mAnimationController = null;
 
     public TaskbarStateHandler(BaseQuickstepLauncher launcher) {
         mLauncher = launcher;
     }
 
-    public void setTaskbarCallbacks(TaskbarController.TaskbarStateHandlerCallbacks callbacks) {
-        mTaskbarCallbacks = callbacks;
+    public void setAnimationController(TaskbarAnimationController callbacks) {
+        mAnimationController = callbacks;
     }
 
     @Override
     public void setState(LauncherState state) {
-        if (mTaskbarCallbacks == null) {
-            return;
-        }
-
-        AnimatedFloat alphaTarget = mTaskbarCallbacks.getAlphaTarget();
-        AnimatedFloat scaleTarget = mTaskbarCallbacks.getScaleTarget();
-        AnimatedFloat translationYTarget = mTaskbarCallbacks.getTranslationYTarget();
-        boolean isTaskbarVisible = (state.getVisibleElements(mLauncher) & TASKBAR) != 0;
-        alphaTarget.updateValue(isTaskbarVisible ? 1f : 0f);
-        scaleTarget.updateValue(state.getTaskbarScale(mLauncher));
-        translationYTarget.updateValue(state.getTaskbarTranslationY(mLauncher));
+        setState(state, PropertySetter.NO_ANIM_PROPERTY_SETTER);
     }
 
     @Override
     public void setStateWithAnimation(LauncherState toState, StateAnimationConfig config,
             PendingAnimation animation) {
-        if (mTaskbarCallbacks == null) {
+        setState(toState, animation);
+    }
+
+    private void setState(LauncherState toState, PropertySetter setter) {
+        if (mAnimationController == null) {
             return;
         }
 
-        AnimatedFloat alphaTarget = mTaskbarCallbacks.getAlphaTarget();
-        AnimatedFloat scaleTarget = mTaskbarCallbacks.getScaleTarget();
-        AnimatedFloat translationYTarget = mTaskbarCallbacks.getTranslationYTarget();
         boolean isTaskbarVisible = (toState.getVisibleElements(mLauncher) & TASKBAR) != 0;
-        animation.setFloat(alphaTarget, AnimatedFloat.VALUE, isTaskbarVisible ? 1f : 0f, LINEAR);
-        animation.setFloat(scaleTarget, AnimatedFloat.VALUE, toState.getTaskbarScale(mLauncher),
-                LINEAR);
-        animation.setFloat(translationYTarget, AnimatedFloat.VALUE,
-                toState.getTaskbarTranslationY(mLauncher), ACCEL_DEACCEL);
+        setter.setFloat(mAnimationController.getTaskbarVisibilityForLauncherState(),
+                AnimatedFloat.VALUE, isTaskbarVisible ? 1f : 0f, LINEAR);
+        setter.setFloat(mAnimationController.getTaskbarScaleForLauncherState(),
+                AnimatedFloat.VALUE, toState.getTaskbarScale(mLauncher), LINEAR);
+        setter.setFloat(mAnimationController.getTaskbarTranslationYForLauncherState(),
+                AnimatedFloat.VALUE, toState.getTaskbarTranslationY(mLauncher), ACCEL_DEACCEL);
     }
 }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java
new file mode 100644
index 0000000000..e16f5e65b0
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.taskbar;
+
+/**
+ * Base class for providing different taskbar UI
+ */
+public class TaskbarUIController {
+
+    public static final TaskbarUIController DEFAULT = new TaskbarUIController();
+
+    /**
+     * Pads the Hotseat to line up exactly with Taskbar's copy of the Hotseat.
+     */
+    public void alignRealHotseatWithTaskbar() { }
+
+    protected void onCreate() { }
+
+    protected void onDestroy() { }
+
+    protected boolean isTaskbarTouchable() {
+        return true;
+    }
+
+    protected void onImeVisible(TaskbarContainerView container, boolean isVisible) {
+        container.updateImeBarVisibilityAlpha(isVisible ? 1 : 0);
+    }
+}
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
index 9e8013e63e..c6573a639c 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
@@ -15,20 +15,14 @@
  */
 package com.android.launcher3.taskbar;
 
-import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_BACK;
-import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_HOME;
-import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_RECENTS;
-
-import android.animation.Animator;
-import android.animation.AnimatorSet;
-import android.animation.LayoutTransition;
-import android.animation.ValueAnimator;
+import static android.view.View.MeasureSpec.EXACTLY;
+import static android.view.View.MeasureSpec.makeMeasureSpec;
+
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.RectF;
-import android.os.SystemProperties;
 import android.util.AttributeSet;
 import android.view.DragEvent;
 import android.view.Gravity;
@@ -51,17 +45,12 @@ import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.views.ActivityContext;
-import com.android.quickstep.SysUINavigationMode;
 
 /**
  * Hosts the Taskbar content such as Hotseat and Recent Apps. Drawn on top of other apps.
  */
 public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconParent, Insettable {
 
-
-    private static final boolean ENABLE_THREE_BUTTON_TASKBAR =
-            SystemProperties.getBoolean("persist.debug.taskbar_three_button", false);
-
     private final int mIconTouchSize;
     private final boolean mIsRtl;
     private final int mTouchSlop;
@@ -69,17 +58,16 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
     private final RectF mDelegateSlopBounds = new RectF();
     private final int[] mTempOutLocation = new int[2];
 
+    private final int mItemMarginLeftRight;
+
+    private final TaskbarActivityContext mActivityContext;
+
     // Initialized in TaskbarController constructor.
-    private TaskbarController.TaskbarViewCallbacks mControllerCallbacks;
-    // Scale on elements that aren't icons.
-    private float mNonIconScale;
-    private int mItemMarginLeftRight;
+    private View.OnClickListener mIconClickListener;
+    private View.OnLongClickListener mIconLongClickListener;
 
-    // Initialized in init().
-    private LayoutTransition mLayoutTransition;
-    private int mHotseatStartIndex;
-    private int mHotseatEndIndex;
-    private LinearLayout mButtonRegion;
+    LinearLayout mSystemButtonContainer;
+    LinearLayout mHotseatIconsContainer;
 
     // Delegate touches to the closest view if within mIconTouchSize.
     private boolean mDelegateTargeted;
@@ -91,10 +79,12 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
     // Only non-null when the corresponding Folder is open.
     private @Nullable FolderIcon mLeaveBehindFolderIcon;
 
-    private int mNavButtonStartIndex;
     /** Provider of buttons added to taskbar in 3 button nav */
     private ButtonProvider mButtonProvider;
 
+    private boolean mDisableRelayout;
+    private boolean mAreHolesAllowed;
+
     public TaskbarView(@NonNull Context context) {
         this(context, null);
     }
@@ -111,80 +101,58 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
     public TaskbarView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr,
             int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
+        mActivityContext = ActivityContext.lookupContext(context);
 
         Resources resources = getResources();
         mIconTouchSize = resources.getDimensionPixelSize(R.dimen.taskbar_icon_touch_size);
+        mItemMarginLeftRight = resources.getDimensionPixelSize(R.dimen.taskbar_icon_spacing);
+
         mIsRtl = Utilities.isRtl(resources);
         mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
     }
 
-    protected void construct(TaskbarController.TaskbarViewCallbacks taskbarViewCallbacks,
-            ButtonProvider buttonProvider) {
-        mControllerCallbacks = taskbarViewCallbacks;
-        mNonIconScale = mControllerCallbacks.getNonIconScale(this);
-        mItemMarginLeftRight = getResources().getDimensionPixelSize(R.dimen.taskbar_icon_spacing);
-        mItemMarginLeftRight = Math.round(mItemMarginLeftRight * mNonIconScale);
-        mButtonProvider = buttonProvider;
-        mButtonProvider.setMarginLeftRight(mItemMarginLeftRight);
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mSystemButtonContainer = findViewById(R.id.system_button_layout);
+        mHotseatIconsContainer = findViewById(R.id.hotseat_icons_layout);
     }
 
-    protected void init(int numHotseatIcons, SysUINavigationMode.Mode newMode) {
-        // TODO: check if buttons on left
-        if (newMode == SysUINavigationMode.Mode.THREE_BUTTONS && ENABLE_THREE_BUTTON_TASKBAR) {
-            // 3 button
-            mNavButtonStartIndex = 0;
+    protected void construct(OnClickListener clickListener, OnLongClickListener longClickListener,
+                ButtonProvider buttonProvider) {
+        mIconClickListener = clickListener;
+        mIconLongClickListener = longClickListener;
+        mButtonProvider = buttonProvider;
+
+        if (mActivityContext.canShowNavButtons()) {
             createNavButtons();
         } else {
-            mNavButtonStartIndex = -1;
-            removeNavButtons();
+            mSystemButtonContainer.setVisibility(GONE);
         }
 
-        mHotseatStartIndex = mNavButtonStartIndex + 1;
-        mHotseatEndIndex = mHotseatStartIndex + numHotseatIcons - 1;
+        int numHotseatIcons = mActivityContext.getDeviceProfile().numShownHotseatIcons;
         updateHotseatItems(new ItemInfo[numHotseatIcons]);
-
-        mLayoutTransition = new LayoutTransition();
-        addUpdateListenerForAllLayoutTransitions(() -> {
-            if (getLayoutTransition() == mLayoutTransition) {
-                mControllerCallbacks.onItemPositionsChanged(this);
-            }
-        });
-        setLayoutTransition(mLayoutTransition);
     }
 
-    private void addUpdateListenerForAllLayoutTransitions(Runnable onUpdate) {
-        addUpdateListenerForLayoutTransition(LayoutTransition.CHANGE_APPEARING, onUpdate);
-        addUpdateListenerForLayoutTransition(LayoutTransition.CHANGE_DISAPPEARING, onUpdate);
-        addUpdateListenerForLayoutTransition(LayoutTransition.CHANGING, onUpdate);
-        addUpdateListenerForLayoutTransition(LayoutTransition.APPEARING, onUpdate);
-        addUpdateListenerForLayoutTransition(LayoutTransition.DISAPPEARING, onUpdate);
-    }
-
-    private void addUpdateListenerForLayoutTransition(int transitionType, Runnable onUpdate) {
-        Animator anim = mLayoutTransition.getAnimator(transitionType);
-        if (anim instanceof ValueAnimator) {
-            ((ValueAnimator) anim).addUpdateListener(valueAnimator -> onUpdate.run());
-        } else {
-            AnimatorSet animSet = new AnimatorSet();
-            ValueAnimator updateAnim = ValueAnimator.ofFloat(0, 1);
-            updateAnim.addUpdateListener(valueAnimator -> onUpdate.run());
-            animSet.playTogether(anim, updateAnim);
-            mLayoutTransition.setAnimator(transitionType, animSet);
+    /**
+     * Enables/disables empty icons in taskbar so that the layout matches with Launcher
+     */
+    public void setHolesAllowedInLayout(boolean areHolesAllowed) {
+        if (mAreHolesAllowed != areHolesAllowed) {
+            mAreHolesAllowed = areHolesAllowed;
+            updateHotseatItemsVisibility();
+            // TODO: Add animation
         }
     }
 
-    protected void cleanup() {
-        endAllLayoutTransitionAnimators();
-        setLayoutTransition(null);
-        removeAllViews();
-    }
-
-    private void endAllLayoutTransitionAnimators() {
-        mLayoutTransition.getAnimator(LayoutTransition.CHANGE_APPEARING).end();
-        mLayoutTransition.getAnimator(LayoutTransition.CHANGE_DISAPPEARING).end();
-        mLayoutTransition.getAnimator(LayoutTransition.CHANGING).end();
-        mLayoutTransition.getAnimator(LayoutTransition.APPEARING).end();
-        mLayoutTransition.getAnimator(LayoutTransition.DISAPPEARING).end();
+    private void setHolesAllowedInLayoutNoAnimation(boolean areHolesAllowed) {
+        if (mAreHolesAllowed != areHolesAllowed) {
+            mAreHolesAllowed = areHolesAllowed;
+            updateHotseatItemsVisibility();
+            onMeasure(makeMeasureSpec(getMeasuredWidth(), EXACTLY),
+                    makeMeasureSpec(getMeasuredHeight(), EXACTLY));
+            onLayout(false, getLeft(), getTop(), getRight(), getBottom());
+        }
     }
 
     /**
@@ -192,10 +160,9 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
      */
     protected void updateHotseatItems(ItemInfo[] hotseatItemInfos) {
         for (int i = 0; i < hotseatItemInfos.length; i++) {
-            ItemInfo hotseatItemInfo = hotseatItemInfos[!mIsRtl ? i
-                    : hotseatItemInfos.length - i - 1];
-            int hotseatIndex = mHotseatStartIndex + i;
-            View hotseatView = getChildAt(hotseatIndex);
+            ItemInfo hotseatItemInfo = hotseatItemInfos[
+                    !mIsRtl ? i : hotseatItemInfos.length - i - 1];
+            View hotseatView = mHotseatIconsContainer.getChildAt(i);
 
             // Replace any Hotseat views with the appropriate type if it's not already that type.
             final int expectedLayoutResId;
@@ -213,23 +180,23 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
             } else {
                 expectedLayoutResId = R.layout.taskbar_app_icon;
             }
-            if (hotseatView == null || hotseatView.getSourceLayoutResId() != expectedLayoutResId
+            if (hotseatView == null
+                    || hotseatView.getSourceLayoutResId() != expectedLayoutResId
                     || needsReinflate) {
-                removeView(hotseatView);
-                ActivityContext activityContext = getActivityContext();
+                mHotseatIconsContainer.removeView(hotseatView);
                 if (isFolder) {
                     FolderInfo folderInfo = (FolderInfo) hotseatItemInfo;
                     FolderIcon folderIcon = FolderIcon.inflateFolderAndIcon(expectedLayoutResId,
-                            getActivityContext(), this, folderInfo);
+                            mActivityContext, this, folderInfo);
                     folderIcon.setTextVisible(false);
                     hotseatView = folderIcon;
                 } else {
                     hotseatView = inflate(expectedLayoutResId);
                 }
-                int iconSize = activityContext.getDeviceProfile().iconSizePx;
+                int iconSize = mActivityContext.getDeviceProfile().iconSizePx;
                 LayoutParams lp = new LayoutParams(iconSize, iconSize);
                 lp.setMargins(mItemMarginLeftRight, 0, mItemMarginLeftRight, 0);
-                addView(hotseatView, hotseatIndex, lp);
+                mHotseatIconsContainer.addView(hotseatView, i, lp);
             }
 
             // Apply the Hotseat ItemInfos, or hide the view if there is none for a given index.
@@ -237,13 +204,11 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
                     && hotseatItemInfo instanceof WorkspaceItemInfo) {
                 ((BubbleTextView) hotseatView).applyFromWorkspaceItem(
                         (WorkspaceItemInfo) hotseatItemInfo);
-                hotseatView.setOnClickListener(mControllerCallbacks.getItemOnClickListener());
-                hotseatView.setOnLongClickListener(
-                        mControllerCallbacks.getItemOnLongClickListener());
+                hotseatView.setOnClickListener(mIconClickListener);
+                hotseatView.setOnLongClickListener(mIconLongClickListener);
             } else if (isFolder) {
-                hotseatView.setOnClickListener(mControllerCallbacks.getItemOnClickListener());
-                hotseatView.setOnLongClickListener(
-                        mControllerCallbacks.getItemOnLongClickListener());
+                hotseatView.setOnClickListener(mIconClickListener);
+                hotseatView.setOnLongClickListener(mIconLongClickListener);
             } else {
                 hotseatView.setOnClickListener(null);
                 hotseatView.setOnLongClickListener(null);
@@ -254,24 +219,14 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
     }
 
     protected void updateHotseatItemsVisibility() {
-        for (int i = mHotseatStartIndex; i <= mHotseatEndIndex; i++) {
-            updateHotseatItemVisibility(getChildAt(i));
+        for (int i = mHotseatIconsContainer.getChildCount() - 1; i >= 0; i--) {
+            updateHotseatItemVisibility(mHotseatIconsContainer.getChildAt(i));
         }
     }
 
     private void updateHotseatItemVisibility(View hotseatView) {
-        if (hotseatView.getTag() != null) {
-            hotseatView.setVisibility(VISIBLE);
-        } else {
-            int oldVisibility = hotseatView.getVisibility();
-            int newVisibility = mControllerCallbacks.getEmptyHotseatViewVisibility(this);
-            hotseatView.setVisibility(newVisibility);
-            if (oldVisibility == GONE && newVisibility != GONE) {
-                // By default, the layout transition only runs when going to VISIBLE,
-                // but we want it to run when going to GONE to INVISIBLE as well.
-                getLayoutTransition().showChild(this, hotseatView, oldVisibility);
-            }
-        }
+        hotseatView.setVisibility(
+                hotseatView.getTag() != null ? VISIBLE : (mAreHolesAllowed ? INVISIBLE : GONE));
     }
 
     @Override
@@ -378,49 +333,20 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
         return findDelegateView(xInOurCoordinates, yInOurCoorindates) != null;
     }
 
-    private void removeNavButtons() {
-        if (mButtonRegion != null) {
-            mButtonRegion.removeAllViews();
-            removeView(mButtonRegion);
-        } // else We've never been in 3 button. Woah Scoob!
-    }
-
     /**
      * Add back/home/recents buttons into a single ViewGroup that will be inserted at
      * {@param navButtonStartIndex}
      */
     private void createNavButtons() {
-        ActivityContext context = getActivityContext();
-        if (mButtonRegion == null) {
-            mButtonRegion = new LinearLayout(getContext());
-        } else {
-            mButtonRegion.removeAllViews();
-        }
-        mButtonRegion.setVisibility(VISIBLE);
-
         LinearLayout.LayoutParams buttonParams = new LinearLayout.LayoutParams(
-                context.getDeviceProfile().iconSizePx,
-                context.getDeviceProfile().iconSizePx
+                mActivityContext.getDeviceProfile().iconSizePx,
+                mActivityContext.getDeviceProfile().iconSizePx
         );
         buttonParams.gravity = Gravity.CENTER;
 
-        View backButton = mButtonProvider.getBack();
-        backButton.setOnClickListener(view -> mControllerCallbacks.onNavigationButtonClick(
-                BUTTON_BACK));
-        mButtonRegion.addView(backButton, buttonParams);
-
-        // Home button
-        View homeButton = mButtonProvider.getHome();
-        homeButton.setOnClickListener(view -> mControllerCallbacks.onNavigationButtonClick(
-                BUTTON_HOME));
-        mButtonRegion.addView(homeButton, buttonParams);
-
-        View recentsButton = mButtonProvider.getRecents();
-        recentsButton.setOnClickListener(view -> mControllerCallbacks.onNavigationButtonClick(
-                BUTTON_RECENTS));
-        mButtonRegion.addView(recentsButton, buttonParams);
-
-        addView(mButtonRegion, mNavButtonStartIndex);
+        mSystemButtonContainer.addView(mButtonProvider.getBack(), buttonParams);
+        mSystemButtonContainer.addView(mButtonProvider.getHome(), buttonParams);
+        mSystemButtonContainer.addView(mButtonProvider.getRecents(), buttonParams);
     }
 
     @Override
@@ -428,7 +354,7 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
         switch (event.getAction()) {
             case DragEvent.ACTION_DRAG_STARTED:
                 mIsDraggingItem = true;
-                AbstractFloatingView.closeAllOpenViews(getActivityContext());
+                AbstractFloatingView.closeAllOpenViews(mActivityContext);
                 return true;
             case DragEvent.ACTION_DRAG_ENDED:
                 mIsDraggingItem = false;
@@ -445,26 +371,26 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
      * @return The bounding box of where the hotseat elements are relative to this TaskbarView.
      */
     protected RectF getHotseatBounds() {
-        View firstHotseatView = null, lastHotseatView = null;
-        for (int i = mHotseatStartIndex; i <= mHotseatEndIndex; i++) {
-            View child = getChildAt(i);
-            if (child.getVisibility() != GONE) {
-                if (firstHotseatView == null) {
-                    firstHotseatView = child;
-                }
-                lastHotseatView = child;
-            }
-        }
-        if (firstHotseatView == null || lastHotseatView == null) {
-            return new RectF();
+        RectF result;
+        mDisableRelayout = true;
+        boolean wereHolesAllowed = mAreHolesAllowed;
+        setHolesAllowedInLayoutNoAnimation(true);
+        result = new RectF(
+                mHotseatIconsContainer.getLeft(),
+                mHotseatIconsContainer.getTop(),
+                mHotseatIconsContainer.getRight(),
+                mHotseatIconsContainer.getBottom());
+        setHolesAllowedInLayoutNoAnimation(wereHolesAllowed);
+        mDisableRelayout = false;
+
+        return result;
+    }
+
+    @Override
+    public void requestLayout() {
+        if (!mDisableRelayout) {
+            super.requestLayout();
         }
-        View leftmostHotseatView = !mIsRtl ? firstHotseatView : lastHotseatView;
-        View rightmostHotseatView = !mIsRtl ? lastHotseatView : firstHotseatView;
-        return new RectF(
-                leftmostHotseatView.getLeft() - mItemMarginLeftRight,
-                leftmostHotseatView.getTop(),
-                rightmostHotseatView.getRight() + mItemMarginLeftRight,
-                rightmostHotseatView.getBottom());
     }
 
     // FolderIconParent implemented methods.
@@ -495,7 +421,7 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
     }
 
     private View inflate(@LayoutRes int layoutResId) {
-        return getActivityContext().getLayoutInflater().inflate(layoutResId, this, false);
+        return mActivityContext.getLayoutInflater().inflate(layoutResId, this, false);
     }
 
     @Override
@@ -503,7 +429,11 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
         // Ignore, we just implement Insettable to draw behind system insets.
     }
 
-    private <T extends Context & ActivityContext> T getActivityContext() {
-        return ActivityContext.lookupContext(getContext());
+    public void setIconsVisibility(boolean isVisible) {
+        mHotseatIconsContainer.setVisibility(isVisible ? VISIBLE : INVISIBLE);
+    }
+
+    public boolean areIconsVisible() {
+        return mHotseatIconsContainer.getVisibility() == VISIBLE;
     }
 }
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index f5ddd0e52f..86bf1194bb 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -52,7 +52,6 @@ import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.BaseState;
 import com.android.launcher3.statemanager.StatefulActivity;
-import com.android.launcher3.taskbar.TaskbarController;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.util.WindowBounds;
 import com.android.launcher3.views.ScrimView;
@@ -123,11 +122,6 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
         return null;
     }
 
-    @Nullable
-    public TaskbarController getTaskbarController() {
-        return null;
-    }
-
     public final boolean isResumed() {
         ACTIVITY_TYPE activity = getCreatedActivity();
         return activity != null && activity.hasBeenResumed();
@@ -367,13 +361,6 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
      */
     protected abstract int getOverviewScrimColorForState(ACTIVITY_TYPE activity, STATE_TYPE state);
 
-    /**
-     * See {@link com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags}
-     * @param systemUiStateFlags The latest SystemUiStateFlags
-     */
-    public void onSystemUiFlagsChanged(int systemUiStateFlags) {
-    }
-
     /**
      * Returns the expected STATE_TYPE from the provided GestureEndTarget.
      */
diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
index 5217c3b169..ff69180d33 100644
--- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
@@ -22,7 +22,6 @@ import static com.android.launcher3.LauncherState.QUICK_SWITCH;
 import static com.android.launcher3.anim.AnimatorListeners.forEndCallback;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
@@ -164,8 +163,7 @@ public final class LauncherActivityInterface extends
     }
 
     @Nullable
-    @Override
-    public TaskbarController getTaskbarController() {
+    private TaskbarController getTaskbarController() {
         BaseQuickstepLauncher launcher = getCreatedActivity();
         if (launcher == null) {
             return null;
@@ -300,16 +298,6 @@ public final class LauncherActivityInterface extends
         return state.getWorkspaceScrimColor(launcher);
     }
 
-    @Override
-    public void onSystemUiFlagsChanged(int systemUiStateFlags) {
-        TaskbarController taskbarController = getTaskbarController();
-        if (taskbarController == null) {
-            return;
-        }
-        boolean isImeVisible = (systemUiStateFlags & SYSUI_STATE_IME_SHOWING) != 0;
-        taskbarController.setIsImeVisible(isImeVisible);
-    }
-
     @Override
     public boolean deferStartingActivity(RecentsAnimationDeviceState deviceState, MotionEvent ev) {
         TaskbarController taskbarController = getTaskbarController();
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index edc7a3c8b8..d95f7b7fed 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -52,7 +52,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.Looper;
-import android.os.RemoteException;
 import android.os.SystemClock;
 import android.os.SystemProperties;
 import android.util.Log;
@@ -75,6 +74,7 @@ import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.provider.RestoreDbTask;
 import com.android.launcher3.statemanager.StatefulActivity;
+import com.android.launcher3.taskbar.TaskbarManager;
 import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.tracing.LauncherTraceProto;
@@ -147,21 +147,9 @@ public class TouchInteractionService extends Service implements PluginListener<O
     private OverscrollPlugin mOverscrollPlugin;
 
     /**
-     * Extension of OverviewProxy aidl interface without needing to modify the actual interface.
-     * This is for methods that need only need local access and not intended to make IPC calls.
+     * Local IOverviewProxy implementation with some methods for local components
      */
-    public abstract static class TISBinder extends IOverviewProxy.Stub {
-        public abstract void setTaskbarOverviewProxyDelegate(
-                @Nullable TaskbarOverviewProxyDelegate i);
-    }
-
-
-    private final TISBinder mMyBinder = new TISBinder() {
-
-        public void setTaskbarOverviewProxyDelegate(
-                @Nullable TaskbarOverviewProxyDelegate delegate) {
-            mTaskbarOverviewProxyDelegate = delegate;
-        }
+    public class TISBinder extends IOverviewProxy.Stub {
 
         @BinderThread
         public void onInitialize(Bundle bundle) {
@@ -274,40 +262,24 @@ public class TouchInteractionService extends Service implements PluginListener<O
 
         @Override
         public void onImeWindowStatusChanged(int displayId, IBinder token, int vis,
-                int backDisposition, boolean showImeSwitcher) throws RemoteException {
-            if (mTaskbarOverviewProxyDelegate == null) {
-                return;
-            }
-            MAIN_EXECUTOR.execute(() -> {
-                if (mTaskbarOverviewProxyDelegate == null) {
-                    return;
-                }
-                mTaskbarOverviewProxyDelegate
-                        .updateImeStatus(displayId, vis, backDisposition, showImeSwitcher);
-            });
+                int backDisposition, boolean showImeSwitcher) {
+            MAIN_EXECUTOR.execute(() -> mTaskbarManager.updateImeStatus(
+                    displayId, vis, backDisposition, showImeSwitcher));
         }
-    };
 
-    public interface TaskbarOverviewProxyDelegate {
-        void updateImeStatus(int displayId, int vis, int backDisposition,
-                boolean showImeSwitcher);
+        public TaskbarManager getTaskbarManager() {
+            return mTaskbarManager;
+        }
     }
 
     private static boolean sConnected = false;
-    private static TouchInteractionService sInstance;
     private static boolean sIsInitialized = false;
     private RotationTouchHelper mRotationTouchHelper;
-    @Nullable
-    private TaskbarOverviewProxyDelegate mTaskbarOverviewProxyDelegate;
 
     public static boolean isConnected() {
         return sConnected;
     }
 
-    @Nullable
-    public static TouchInteractionService getInstance() {
-        return sInstance;
-    }
 
     public static boolean isInitialized() {
         return sIsInitialized;
@@ -336,9 +308,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
 
     private DisplayManager mDisplayManager;
 
-    public TouchInteractionService() {
-        sInstance = this;
-    }
+    private TaskbarManager mTaskbarManager;
 
     @Override
     public void onCreate() {
@@ -348,13 +318,14 @@ public class TouchInteractionService extends Service implements PluginListener<O
         mMainChoreographer = Choreographer.getInstance();
         mAM = ActivityManagerWrapper.getInstance();
         mDeviceState = new RecentsAnimationDeviceState(this, true);
+        mDisplayManager = getSystemService(DisplayManager.class);
+        mTaskbarManager = new TaskbarManager(this);
+
         mRotationTouchHelper = mDeviceState.getRotationTouchHelper();
         mDeviceState.addNavigationModeChangedCallback(this::onNavigationModeChanged);
         mDeviceState.addOneHandedModeChangedCallback(this::onOneHandedModeOverlayChanged);
         mDeviceState.runOnUserUnlocked(this::onUserUnlocked);
         ProtoTracer.INSTANCE.get(this).add(this);
-        mDisplayManager = getSystemService(DisplayManager.class);
-
         sConnected = true;
     }
 
@@ -468,8 +439,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
             int systemUiStateFlags = mDeviceState.getSystemUiStateFlags();
             SystemUiProxy.INSTANCE.get(this).setLastSystemUiStateFlags(systemUiStateFlags);
             mOverviewComponentObserver.onSystemUiStateChanged();
-            mOverviewComponentObserver.getActivityInterface().onSystemUiFlagsChanged(
-                    systemUiStateFlags);
+            mTaskbarManager.onSystemUiFlagsChanged(systemUiStateFlags);
 
             if ((lastSysUIFlags & SYSUI_STATE_TRACING_ENABLED) !=
                     (systemUiStateFlags & SYSUI_STATE_TRACING_ENABLED)) {
@@ -512,6 +482,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
         getSystemService(AccessibilityManager.class)
                 .unregisterSystemAction(SYSTEM_ACTION_ID_ALL_APPS);
 
+        mTaskbarManager.destroy();
         sConnected = false;
         super.onDestroy();
     }
@@ -519,7 +490,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
     @Override
     public IBinder onBind(Intent intent) {
         Log.d(TAG, "Touch service connected: user=" + getUserId());
-        return mMyBinder;
+        return new TISBinder();
     }
 
     private void onInputEvent(InputEvent ev) {
diff --git a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
index d430028f8c..49aec933b7 100644
--- a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
+++ b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
@@ -116,7 +116,7 @@ public class StaggeredWorkspaceAnim {
                     addStaggeredAnimationForView(child, lp.cellY + 1, totalRows);
                 }
             } else {
-                final int hotseatRow, qsbRow, taskbarRow;
+                final int hotseatRow, qsbRow;
                 if (grid.isTaskbarPresent) {
                     qsbRow = grid.inv.numRows + 1;
                     hotseatRow = grid.inv.numRows + 2;
@@ -124,16 +124,12 @@ public class StaggeredWorkspaceAnim {
                     hotseatRow = grid.inv.numRows + 1;
                     qsbRow = grid.inv.numRows + 2;
                 }
-                // Taskbar and hotseat overlap.
-                taskbarRow = hotseatRow;
-
                 for (int i = hotseatIcons.getChildCount() - 1; i >= 0; i--) {
                     View child = hotseatIcons.getChildAt(i);
                     addStaggeredAnimationForView(child, hotseatRow, totalRows);
                 }
 
                 addStaggeredAnimationForView(hotseat.getQsb(), qsbRow, totalRows);
-                addStaggeredAnimationForView(hotseat.getTaskbarView(), taskbarRow, totalRows);
             }
 
             mAnimators.addListener(new AnimatorListenerAdapter() {
diff --git a/res/layout/taskbar_view.xml b/res/layout/taskbar_view.xml
deleted file mode 100644
index 96ae43db4a..0000000000
--- a/res/layout/taskbar_view.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2021 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<Space
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="0dp"
-    android:layout_height="0dp"
-    android:visibility="gone" />
\ No newline at end of file
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 3d044d68ce..322c6eed29 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -447,10 +447,6 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
      * @param canvas The canvas to draw to.
      */
     protected void drawDotIfNecessary(Canvas canvas) {
-        if (mActivity instanceof Launcher && ((Launcher) mActivity).isViewInTaskbar(this)) {
-            // TODO: support notification dots in Taskbar
-            return;
-        }
         if (!mForceHideDot && (hasDot() || mDotParams.scale > 0)) {
             getIconBounds(mDotParams.iconBounds);
             Utilities.scaleRectAboutCenter(mDotParams.iconBounds,
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index b2a9e75e50..ff380ce1ae 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -49,7 +49,6 @@ public class Hotseat extends CellLayout implements Insettable {
     private final View mQsb;
     private final int mQsbHeight;
 
-    private final View mTaskbarView;
     private final int mTaskbarViewHeight;
 
     public Hotseat(Context context) {
@@ -67,10 +66,7 @@ public class Hotseat extends CellLayout implements Insettable {
         mQsbHeight = mQsb.getLayoutParams().height;
         addView(mQsb);
 
-        mTaskbarView = LayoutInflater.from(context).inflate(R.layout.taskbar_view, this, false);
-        mTaskbarViewHeight = mTaskbarView.getLayoutParams().height;
-        // We want taskbar in the back so its background applies to Hotseat as well.
-        addView(mTaskbarView, 0);
+        mTaskbarViewHeight = context.getResources().getDimensionPixelSize(R.dimen.taskbar_size);
     }
 
     /**
@@ -187,8 +183,6 @@ public class Hotseat extends CellLayout implements Insettable {
         int width = getShortcutsAndWidgets().getMeasuredWidth();
         mQsb.measure(MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
                 MeasureSpec.makeMeasureSpec(mQsbHeight, MeasureSpec.EXACTLY));
-        mTaskbarView.measure(MeasureSpec.makeMeasureSpec(getMeasuredWidth(), MeasureSpec.EXACTLY),
-                MeasureSpec.makeMeasureSpec(mTaskbarViewHeight, MeasureSpec.EXACTLY));
     }
 
     @Override
@@ -202,13 +196,6 @@ public class Hotseat extends CellLayout implements Insettable {
         int bottom = b - t - getQsbOffsetY();
         int top = bottom - mQsbHeight;
         mQsb.layout(left, top, right, bottom);
-
-        int taskbarWidth = mTaskbarView.getMeasuredWidth();
-        left = (r - l - taskbarWidth) / 2;
-        right = left + taskbarWidth;
-        bottom = b - t - getTaskbarOffsetY();
-        top = bottom - mTaskbarViewHeight;
-        mTaskbarView.layout(left, top, right, bottom);
     }
 
     /**
@@ -244,10 +231,4 @@ public class Hotseat extends CellLayout implements Insettable {
         return mQsb;
     }
 
-    /**
-     * Returns the Taskbar inside hotseat
-     */
-    public View getTaskbarView() {
-        return mTaskbarView;
-    }
 }
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index cf902160ee..8889e60688 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1942,13 +1942,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
     @Override
     public boolean startActivitySafely(View v, Intent intent, ItemInfo item) {
-        if (isViewInTaskbar(v)) {
-            // Start the activity without the hacky workarounds below, which assume the View was
-            // clicked when Launcher was resumed and will be hidden until Launcher is re-resumed
-            // (this isn't the case for Taskbar).
-            return super.startActivitySafely(v, intent, item);
-        }
-
         if (!hasBeenResumed()) {
             // Workaround an issue where the WM launch animation is clobbered when finishing the
             // recents animation into launcher. Defer launching the activity until Launcher is
@@ -2860,13 +2853,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
                 .start();
     }
 
-    /**
-     * @return Whether the View is in the same window as the Taskbar window.
-     */
-    public boolean isViewInTaskbar(View v) {
-        return false;
-    }
-
     public boolean supportsAdaptiveIconAnimation(View clickedView) {
         return false;
     }
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 7ae729aa0c..2884fba08d 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -324,15 +324,17 @@ public final class Utilities {
     }
 
     public static void scaleRectFAboutCenter(RectF r, float scale) {
+        scaleRectFAboutPivot(r, scale, r.centerX(), r.centerY());
+    }
+
+    public static void scaleRectFAboutPivot(RectF r, float scale, float px, float py) {
         if (scale != 1.0f) {
-            float cx = r.centerX();
-            float cy = r.centerY();
-            r.offset(-cx, -cy);
+            r.offset(-px, -py);
             r.left = r.left * scale;
             r.top = r.top * scale ;
             r.right = r.right * scale;
             r.bottom = r.bottom * scale;
-            r.offset(cx, cy);
+            r.offset(px, py);
         }
     }
 
diff --git a/src/com/android/launcher3/touch/ItemClickHandler.java b/src/com/android/launcher3/touch/ItemClickHandler.java
index ce7dc07d6d..b5dcd3a041 100644
--- a/src/com/android/launcher3/touch/ItemClickHandler.java
+++ b/src/com/android/launcher3/touch/ItemClickHandler.java
@@ -27,6 +27,7 @@ import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_DISABLED_SU
 
 import android.app.AlertDialog;
 import android.app.PendingIntent;
+import android.content.Context;
 import android.content.Intent;
 import android.content.IntentSender;
 import android.content.pm.LauncherApps;
@@ -193,6 +194,35 @@ public class ItemClickHandler {
         launcher.startActivitySafely(v, intent, item);
     }
 
+    /**
+     * Handles clicking on a disabled shortcut
+     */
+    public static void handleDisabledItemClicked(WorkspaceItemInfo shortcut, Context context) {
+        final int disabledFlags = shortcut.runtimeStatusFlags
+                & WorkspaceItemInfo.FLAG_DISABLED_MASK;
+        if ((disabledFlags
+                & ~FLAG_DISABLED_SUSPENDED
+                & ~FLAG_DISABLED_QUIET_USER) == 0) {
+            // If the app is only disabled because of the above flags, launch activity anyway.
+            // Framework will tell the user why the app is suspended.
+        } else {
+            if (!TextUtils.isEmpty(shortcut.disabledMessage)) {
+                // Use a message specific to this shortcut, if it has one.
+                Toast.makeText(context, shortcut.disabledMessage, Toast.LENGTH_SHORT).show();
+                return;
+            }
+            // Otherwise just use a generic error message.
+            int error = R.string.activity_not_available;
+            if ((shortcut.runtimeStatusFlags & FLAG_DISABLED_SAFEMODE) != 0) {
+                error = R.string.safemode_shortcut_error;
+            } else if ((shortcut.runtimeStatusFlags & FLAG_DISABLED_BY_PUBLISHER) != 0
+                    || (shortcut.runtimeStatusFlags & FLAG_DISABLED_LOCKED_USER) != 0) {
+                error = R.string.shortcut_not_available;
+            }
+            Toast.makeText(context, error, Toast.LENGTH_SHORT).show();
+        }
+    }
+
     /**
      * Event handler for an app shortcut click.
      *
@@ -200,30 +230,8 @@ public class ItemClickHandler {
      */
     public static void onClickAppShortcut(View v, WorkspaceItemInfo shortcut, Launcher launcher) {
         if (shortcut.isDisabled()) {
-            final int disabledFlags = shortcut.runtimeStatusFlags
-                    & WorkspaceItemInfo.FLAG_DISABLED_MASK;
-            if ((disabledFlags &
-                    ~FLAG_DISABLED_SUSPENDED &
-                    ~FLAG_DISABLED_QUIET_USER) == 0) {
-                // If the app is only disabled because of the above flags, launch activity anyway.
-                // Framework will tell the user why the app is suspended.
-            } else {
-                if (!TextUtils.isEmpty(shortcut.disabledMessage)) {
-                    // Use a message specific to this shortcut, if it has one.
-                    Toast.makeText(launcher, shortcut.disabledMessage, Toast.LENGTH_SHORT).show();
-                    return;
-                }
-                // Otherwise just use a generic error message.
-                int error = R.string.activity_not_available;
-                if ((shortcut.runtimeStatusFlags & FLAG_DISABLED_SAFEMODE) != 0) {
-                    error = R.string.safemode_shortcut_error;
-                } else if ((shortcut.runtimeStatusFlags & FLAG_DISABLED_BY_PUBLISHER) != 0 ||
-                        (shortcut.runtimeStatusFlags & FLAG_DISABLED_LOCKED_USER) != 0) {
-                    error = R.string.shortcut_not_available;
-                }
-                Toast.makeText(launcher, error, Toast.LENGTH_SHORT).show();
-                return;
-            }
+            handleDisabledItemClicked(shortcut, launcher);
+            return;
         }
 
         // Check for abandoned promise
-- 
GitLab


From 0a709374ae05cb0222c39b9a675b702bb06d1cf6 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Mon, 17 May 2021 09:23:04 -0500
Subject: [PATCH 1201/1664] Fix header protection interactions

Bug: 184711608
Bug: 187790639
Preview: https://drive.google.com/file/d/1MDh71t8DQn0SxTQY3-GZTfIlGECQs_Kn/view?usp=sharing&resourcekey=0-ep9C3q9Meo8cQShVJqnKEw
Test: Manual
Change-Id: I9c939a894adc3e9cd1ed1beb7c11f9c2dd673824
---
 res/layout/all_apps_personal_work_tabs.xml    |  6 +-
 res/values/dimens.xml                         |  1 +
 .../allapps/AllAppsContainerView.java         |  9 ++-
 .../launcher3/allapps/FloatingHeaderView.java | 63 +++++++++++++------
 .../PersonalWorkSlidingTabStrip.java          | 10 ---
 5 files changed, 53 insertions(+), 36 deletions(-)

diff --git a/res/layout/all_apps_personal_work_tabs.xml b/res/layout/all_apps_personal_work_tabs.xml
index 31fa5cfaca..f089f8356c 100644
--- a/res/layout/all_apps_personal_work_tabs.xml
+++ b/res/layout/all_apps_personal_work_tabs.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
   ~ limitations under the License.
 -->
 
-<com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/tabs"
     android:layout_width="match_parent"
     android:layout_height="@dimen/all_apps_header_pill_height"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index fd1a29c117..451f82ba20 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -93,6 +93,7 @@
     <dimen name="all_apps_background_canvas_height">475dp</dimen>
     <dimen name="all_apps_header_pill_height">36dp</dimen>
     <dimen name="all_apps_header_pill_corner_radius">18dp</dimen>
+    <dimen name="all_apps_header_pills_width">320dp</dimen>
     <dimen name="all_apps_header_tab_height">48dp</dimen>
     <dimen name="all_apps_tabs_indicator_height">2dp</dimen>
     <dimen name="all_apps_header_top_padding">36dp</dimen>
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 1620d08d7e..9df95bffb0 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -720,7 +720,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         mHeaderPaint.setColor(mHeaderColor);
         mHeaderPaint.setAlpha((int) (getAlpha() * Color.alpha(mHeaderColor)));
         if (mHeaderPaint.getColor() != mScrimColor && mHeaderPaint.getColor() != 0) {
-            canvas.drawRect(0, 0, getWidth(), mHeaderTopPadding + getTranslationY(),
+            canvas.drawRect(0, 0, getWidth(), mSearchContainer.getTop() + getTranslationY(),
                     mHeaderPaint);
         }
     }
@@ -830,10 +830,13 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
 
     protected void updateHeaderScroll(int scrolledOffset) {
         float prog = Math.max(0, Math.min(1, (float) scrolledOffset / mHeaderThreshold));
-        int headerColor = ColorUtils.setAlphaComponent(mHeaderProtectionColor, (int) (prog * 255));
+        int viewBG = ColorUtils.blendARGB(mScrimColor, mHeaderProtectionColor, prog);
+        int headerColor = ColorUtils.setAlphaComponent(viewBG,
+                (int) (getSearchView().getAlpha() * 255));
         if (headerColor != mHeaderColor) {
             mHeaderColor = headerColor;
-            getSearchView().setBackgroundColor(mHeaderColor);
+            getSearchView().setBackgroundColor(viewBG);
+            getFloatingHeaderView().setHeaderColor(viewBG);
             invalidateHeader();
         }
     }
diff --git a/src/com/android/launcher3/allapps/FloatingHeaderView.java b/src/com/android/launcher3/allapps/FloatingHeaderView.java
index 733d867e4d..f55ab2502b 100644
--- a/src/com/android/launcher3/allapps/FloatingHeaderView.java
+++ b/src/com/android/launcher3/allapps/FloatingHeaderView.java
@@ -17,6 +17,9 @@ package com.android.launcher3.allapps;
 
 import android.animation.ValueAnimator;
 import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.util.ArrayMap;
@@ -50,26 +53,28 @@ public class FloatingHeaderView extends LinearLayout implements
     private final Rect mClip = new Rect(0, 0, Integer.MAX_VALUE, Integer.MAX_VALUE);
     private final ValueAnimator mAnimator = ValueAnimator.ofInt(0, 0);
     private final Point mTempOffset = new Point();
-    private final RecyclerView.OnScrollListener mOnScrollListener = new RecyclerView.OnScrollListener() {
-        @Override
-        public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
-        }
+    private final Paint mBGPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+    private final RecyclerView.OnScrollListener mOnScrollListener =
+            new RecyclerView.OnScrollListener() {
+                @Override
+                public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
+                }
 
-        @Override
-        public void onScrolled(RecyclerView rv, int dx, int dy) {
-            if (rv != mCurrentRV) {
-                return;
-            }
+                @Override
+                public void onScrolled(RecyclerView rv, int dx, int dy) {
+                    if (rv != mCurrentRV) {
+                        return;
+                    }
 
-            if (mAnimator.isStarted()) {
-                mAnimator.cancel();
-            }
+                    if (mAnimator.isStarted()) {
+                        mAnimator.cancel();
+                    }
 
-            int current = -mCurrentRV.getCurrentScrollY();
-            moved(current);
-            applyVerticalMove();
-        }
-    };
+                    int current = -mCurrentRV.getCurrentScrollY();
+                    moved(current);
+                    applyVerticalMove();
+                }
+            };
 
     private final int mHeaderTopPadding;
 
@@ -80,9 +85,10 @@ public class FloatingHeaderView extends LinearLayout implements
     private AllAppsRecyclerView mWorkRV;
     private AllAppsRecyclerView mCurrentRV;
     private ViewGroup mParent;
-    private boolean mHeaderCollapsed;
+    public boolean mHeaderCollapsed;
     private int mSnappedScrolledY;
     private int mTranslationY;
+    private int mHeaderColor;
 
     private boolean mForwardToRecyclerView;
 
@@ -219,7 +225,7 @@ public class FloatingHeaderView extends LinearLayout implements
     }
 
     private AllAppsRecyclerView setupRV(AllAppsRecyclerView old, AllAppsRecyclerView updated) {
-        if (old != updated && updated != null ) {
+        if (old != updated && updated != null) {
             updated.addOnScrollListener(mOnScrollListener);
         }
         return updated;
@@ -262,6 +268,7 @@ public class FloatingHeaderView extends LinearLayout implements
                 }
             } else {
                 mHeaderCollapsed = false;
+                invalidate();
             }
             mTranslationY = currentScrollY;
         } else if (!mHeaderCollapsed) {
@@ -274,10 +281,28 @@ public class FloatingHeaderView extends LinearLayout implements
             } else if (mTranslationY <= -mMaxTranslation) { // hide or stay hidden
                 mHeaderCollapsed = true;
                 mSnappedScrolledY = -mMaxTranslation;
+                invalidate();
             }
         }
     }
 
+    /**
+     * Set current header protection background color
+     */
+    public void setHeaderColor(int color) {
+        mHeaderColor = color;
+        invalidate();
+    }
+
+    @Override
+    protected void dispatchDraw(Canvas canvas) {
+        if (mHeaderCollapsed && mHeaderColor != Color.TRANSPARENT) {
+            mBGPaint.setColor(mHeaderColor);
+            canvas.drawRect(0, 0, getWidth(), getHeight() + mTranslationY, mBGPaint);
+        }
+        super.dispatchDraw(canvas);
+    }
+
     protected void applyVerticalMove() {
         int uncappedTranslationY = mTranslationY;
         mTranslationY = Math.max(mTranslationY, -mMaxTranslation);
diff --git a/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java b/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
index 47328d667e..8039fd1ef5 100644
--- a/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
+++ b/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
@@ -29,14 +29,12 @@ import androidx.annotation.Nullable;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.pageindicators.PageIndicator;
-import com.android.launcher3.util.Themes;
 
 /**
  * Supports two indicator colors, dedicated for personal and work tabs.
  */
 public class PersonalWorkSlidingTabStrip extends LinearLayout implements PageIndicator {
     private final Paint mSelectedIndicatorPaint;
-    private final Paint mDividerPaint;
 
     private int mSelectedIndicatorHeight;
     private final int mSelectedIndicatorRadius;
@@ -52,7 +50,6 @@ public class PersonalWorkSlidingTabStrip extends LinearLayout implements PageInd
 
     public PersonalWorkSlidingTabStrip(@NonNull Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
-        setOrientation(HORIZONTAL);
         setWillNotDraw(false);
 
         mSelectedIndicatorHeight =
@@ -64,11 +61,6 @@ public class PersonalWorkSlidingTabStrip extends LinearLayout implements PageInd
         mSelectedIndicatorPaint = new Paint();
         mSelectedIndicatorPaint.setColor(context.getColor(R.color.all_apps_tab_bg));
 
-        mDividerPaint = new Paint();
-        mDividerPaint.setColor(Themes.getAttrColor(context, android.R.attr.colorControlHighlight));
-        mDividerPaint.setStrokeWidth(
-                getResources().getDimensionPixelSize(R.dimen.all_apps_divider_height));
-
         mIsRtl = Utilities.isRtl(getResources());
     }
 
@@ -120,8 +112,6 @@ public class PersonalWorkSlidingTabStrip extends LinearLayout implements PageInd
     @Override
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
-
-        float y = getHeight() - mDividerPaint.getStrokeWidth();
         canvas.drawRoundRect(mIndicatorLeft, getHeight() - mSelectedIndicatorHeight,
                 mIndicatorRight, getHeight(), mSelectedIndicatorRadius, mSelectedIndicatorRadius,
                 mSelectedIndicatorPaint);
-- 
GitLab


From 7511b338387c6cb8be8756b5e8434334ff4036b0 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Tue, 18 May 2021 17:47:35 +0000
Subject: [PATCH 1202/1664] Revert "Finish the recents animation upon home
 rotation"

This reverts commit 38588dc23a68543d5f83f6253c402199bab0f134.

Reason for revert: b/188541715
Fixes: 188541715

Change-Id: I4d85ced55e1a9a4ca64f9c9a855abbfec9f306bb
---
 .../src/com/android/quickstep/views/RecentsView.java   | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index b5e34558d5..dfe0c4347a 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2592,16 +2592,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     @Override
     protected void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
-        if (LIVE_TILE.get()) {
-            switchToScreenshot(
-                    () -> finishRecentsAnimation(true /* toRecents */,
-                            this::onConfigurationChangedInternal));
-        } else {
-            onConfigurationChangedInternal();
-        }
-    }
-
-    private void onConfigurationChangedInternal() {
         final int rotation = mActivity.getDisplay().getRotation();
         if (mOrientationState.setRecentsRotation(rotation)) {
             updateOrientationHandler();
-- 
GitLab


From 8b58edf8ec8a8ef4f72cdc3eedb9c3b2b960d556 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Mon, 17 May 2021 22:33:18 -0700
Subject: [PATCH 1203/1664] Finish the recents animation upon home rotation

Fixes: 14613421
Test: presubmit
Change-Id: I4165e6da80aa0272fa4a58046521dbd86518379c
---
 .../com/android/quickstep/views/RecentsView.java  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 83d15f7c5a..4b374401bd 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -389,6 +389,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
 
     private final TaskOverlayFactory mTaskOverlayFactory;
 
+    private int mOrientation;
+
     protected boolean mDisallowScrollToClearAll;
     private boolean mOverlayEnabled;
     protected boolean mFreezeViewVisibility;
@@ -582,6 +584,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 .getDimensionPixelSize(R.dimen.recents_fast_fling_velocity);
         mModel = RecentsModel.INSTANCE.get(context);
         mIdp = InvariantDeviceProfile.INSTANCE.get(context);
+        mOrientation = getResources().getConfiguration().orientation;
 
         mClearAllButton = (ClearAllButton) LayoutInflater.from(context)
                 .inflate(R.layout.overview_clear_all_button, this, false);
@@ -2615,6 +2618,18 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     @Override
     protected void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
+        if (LIVE_TILE.get() && mEnableDrawingLiveTile && newConfig.orientation != mOrientation) {
+            switchToScreenshot(
+                    () -> finishRecentsAnimation(true /* toRecents */,
+                            this::onConfigurationChangedInternal));
+            mEnableDrawingLiveTile = false;
+        } else {
+            onConfigurationChangedInternal();
+        }
+        mOrientation = newConfig.orientation;
+    }
+
+    private void onConfigurationChangedInternal() {
         final int rotation = mActivity.getDisplay().getRotation();
         if (mOrientationState.setRecentsRotation(rotation)) {
             updateOrientationHandler();
-- 
GitLab


From 40a742161938b343589e88e4b7f44b1cd67a69f1 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 18 May 2021 11:42:11 -0700
Subject: [PATCH 1204/1664] Renaming TaskbarController to
 LauncherTaskbarUIController

Bug: 187353581
Test: N/A
Change-Id: I44aac42c4df134fd7e6fc0c3609fdb3007cf52e3
---
 .../launcher3/BaseQuickstepLauncher.java      | 20 ++++++++--------
 .../HotseatPredictionController.java          |  4 ++--
 ....java => LauncherTaskbarUIController.java} |  9 +++----
 .../taskbar/TaskbarAnimationController.java   |  2 +-
 .../launcher3/taskbar/TaskbarManager.java     |  4 ++--
 .../uioverrides/QuickstepLauncher.java        |  6 ++---
 .../quickstep/LauncherActivityInterface.java  | 24 +++++++++----------
 7 files changed, 35 insertions(+), 34 deletions(-)
 rename quickstep/src/com/android/launcher3/taskbar/{TaskbarController.java => LauncherTaskbarUIController.java} (97%)

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index bc2c125854..de62e93b4e 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -49,7 +49,7 @@ import com.android.launcher3.proxy.StartActivityParams;
 import com.android.launcher3.statehandlers.BackButtonAlphaHandler;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
-import com.android.launcher3.taskbar.TaskbarController;
+import com.android.launcher3.taskbar.LauncherTaskbarUIController;
 import com.android.launcher3.taskbar.TaskbarManager;
 import com.android.launcher3.taskbar.TaskbarStateHandler;
 import com.android.launcher3.uioverrides.RecentsViewStateController;
@@ -96,7 +96,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
     private OverviewActionsView mActionsView;
 
     private @Nullable TaskbarManager mTaskbarManager;
-    private @Nullable TaskbarController mTaskbarController;
+    private @Nullable LauncherTaskbarUIController mTaskbarUIController;
     private final ServiceConnection mTisBinderConnection = new ServiceConnection() {
         @Override
         public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
@@ -261,8 +261,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
 
     }
 
-    public void setTaskbarController(TaskbarController taskbarController) {
-        mTaskbarController = taskbarController;
+    public void setTaskbarUIController(LauncherTaskbarUIController taskbarUIController) {
+        mTaskbarUIController = taskbarUIController;
     }
 
     public <T extends OverviewActionsView> T getActionsView() {
@@ -292,8 +292,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
         return mDepthController;
     }
 
-    public @Nullable TaskbarController getTaskbarController() {
-        return mTaskbarController;
+    public @Nullable LauncherTaskbarUIController getTaskbarUIController() {
+        return mTaskbarUIController;
     }
 
     public TaskbarStateHandler getTaskbarStateHandler() {
@@ -349,8 +349,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
 
     @Override
     public float getNormalTaskbarScale() {
-        if (mTaskbarController != null) {
-            return mTaskbarController.getTaskbarScaleOnHome();
+        if (mTaskbarUIController != null) {
+            return mTaskbarUIController.getTaskbarScaleOnHome();
         }
         return super.getNormalTaskbarScale();
     }
@@ -372,8 +372,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
         }
 
         if ((changeBits & ACTIVITY_STATE_RESUMED) != 0) {
-            if (mTaskbarController != null) {
-                mTaskbarController.onLauncherResumedOrPaused(hasBeenResumed());
+            if (mTaskbarUIController != null) {
+                mTaskbarUIController.onLauncherResumedOrPaused(hasBeenResumed());
             }
         }
 
diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
index 5dcf84c249..85e5ab0a9b 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
@@ -263,8 +263,8 @@ public class HotseatPredictionController implements DragController.DragListener,
             removeOutlineDrawings();
         }
 
-        if (mLauncher.getTaskbarController() != null) {
-            mLauncher.getTaskbarController().onHotseatUpdated();
+        if (mLauncher.getTaskbarUIController() != null) {
+            mLauncher.getTaskbarUIController().onHotseatUpdated();
         }
     }
 
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
similarity index 97%
rename from quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
rename to quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
index cdae5beb9a..67264194b2 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
@@ -38,7 +38,7 @@ import com.android.launcher3.states.StateAnimationConfig;
  * TODO: Rename to have Launcher prefix
  */
 
-public class TaskbarController extends TaskbarUIController {
+public class LauncherTaskbarUIController extends TaskbarUIController {
 
     private final BaseQuickstepLauncher mLauncher;
     private final TaskbarStateHandler mTaskbarStateHandler;
@@ -52,7 +52,8 @@ public class TaskbarController extends TaskbarUIController {
     private @Nullable Animator mAnimator;
     private boolean mIsAnimatingToLauncher;
 
-    public TaskbarController(BaseQuickstepLauncher launcher, TaskbarActivityContext context) {
+    public LauncherTaskbarUIController(
+            BaseQuickstepLauncher launcher, TaskbarActivityContext context) {
         mContext = context;
         mTaskbarContainerView = context.getDragLayer();
         mTaskbarView = mTaskbarContainerView.findViewById(R.id.taskbar_view);
@@ -72,7 +73,7 @@ public class TaskbarController extends TaskbarUIController {
         mHotseatController.init();
         setTaskbarViewVisible(!mLauncher.hasBeenResumed());
         alignRealHotseatWithTaskbar();
-        mLauncher.setTaskbarController(this);
+        mLauncher.setTaskbarUIController(this);
     }
 
     @Override
@@ -86,7 +87,7 @@ public class TaskbarController extends TaskbarUIController {
         mHotseatController.cleanup();
         setTaskbarViewVisible(true);
         mLauncher.getHotseat().setIconsAlpha(1f);
-        mLauncher.setTaskbarController(null);
+        mLauncher.setTaskbarUIController(null);
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java
index 815efb9728..e20ddf88ce 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java
@@ -21,7 +21,7 @@ import android.animation.Animator;
 
 import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.taskbar.TaskbarController.TaskbarAnimationControllerCallbacks;
+import com.android.launcher3.taskbar.LauncherTaskbarUIController.TaskbarAnimationControllerCallbacks;
 import com.android.quickstep.AnimatedFloat;
 import com.android.quickstep.SystemUiProxy;
 import com.android.systemui.shared.system.QuickStepContract;
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
index b9eec93687..65c87bd279 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
@@ -97,7 +97,7 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen
         if (mTaskbarActivityContext != null) {
             mTaskbarActivityContext.setUIController(mLauncher == null
                     ? TaskbarUIController.DEFAULT
-                    : new TaskbarController(launcher, mTaskbarActivityContext));
+                    : new LauncherTaskbarUIController(launcher, mTaskbarActivityContext));
         }
     }
 
@@ -115,7 +115,7 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen
         mTaskbarActivityContext.init();
         if (mLauncher != null) {
             mTaskbarActivityContext.setUIController(
-                    new TaskbarController(mLauncher, mTaskbarActivityContext));
+                    new LauncherTaskbarUIController(mLauncher, mTaskbarActivityContext));
         }
     }
 
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 45bb521336..f0b02b3c47 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -165,7 +165,7 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
     @Override
     public boolean startActivitySafely(View v, Intent intent, ItemInfo item) {
         // Only pause is taskbar controller is not present
-        mHotseatPredictionController.setPauseUIUpdate(getTaskbarController() == null);
+        mHotseatPredictionController.setPauseUIUpdate(getTaskbarUIController() == null);
         return super.startActivitySafely(v, intent, item);
     }
 
@@ -233,9 +233,9 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
     @Override
     public void bindWorkspaceItemsChanged(List<WorkspaceItemInfo> updated) {
         super.bindWorkspaceItemsChanged(updated);
-        if (getTaskbarController() != null && updated.stream()
+        if (getTaskbarUIController() != null && updated.stream()
                 .filter(w -> w.container == CONTAINER_HOTSEAT).findFirst().isPresent()) {
-            getTaskbarController().onHotseatUpdated();
+            getTaskbarUIController().onHotseatUpdated();
         }
     }
 
diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
index ff69180d33..9014774ae7 100644
--- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
@@ -41,7 +41,7 @@ import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statehandlers.DepthController.ClampedDepthProperty;
 import com.android.launcher3.statemanager.StateManager;
-import com.android.launcher3.taskbar.TaskbarController;
+import com.android.launcher3.taskbar.LauncherTaskbarUIController;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.quickstep.GestureState.GestureEndTarget;
 import com.android.quickstep.SysUINavigationMode.Mode;
@@ -163,12 +163,12 @@ public final class LauncherActivityInterface extends
     }
 
     @Nullable
-    private TaskbarController getTaskbarController() {
+    private LauncherTaskbarUIController getTaskbarController() {
         BaseQuickstepLauncher launcher = getCreatedActivity();
         if (launcher == null) {
             return null;
         }
-        return launcher.getTaskbarController();
+        return launcher.getTaskbarUIController();
     }
 
     @Nullable
@@ -276,13 +276,13 @@ public final class LauncherActivityInterface extends
     @Override
     public @Nullable Animator getParallelAnimationToLauncher(GestureEndTarget endTarget,
             long duration) {
-        TaskbarController taskbarController = getTaskbarController();
+        LauncherTaskbarUIController uiController = getTaskbarController();
         Animator superAnimator = super.getParallelAnimationToLauncher(endTarget, duration);
-        if (taskbarController == null) {
+        if (uiController == null) {
             return superAnimator;
         }
         LauncherState toState = stateFromGestureEndTarget(endTarget);
-        Animator taskbarAnimator = taskbarController.createAnimToLauncher(toState, duration);
+        Animator taskbarAnimator = uiController.createAnimToLauncher(toState, duration);
         if (superAnimator == null) {
             return taskbarAnimator;
         } else {
@@ -300,20 +300,20 @@ public final class LauncherActivityInterface extends
 
     @Override
     public boolean deferStartingActivity(RecentsAnimationDeviceState deviceState, MotionEvent ev) {
-        TaskbarController taskbarController = getTaskbarController();
-        if (taskbarController == null) {
+        LauncherTaskbarUIController uiController = getTaskbarController();
+        if (uiController == null) {
             return super.deferStartingActivity(deviceState, ev);
         }
-        return taskbarController.isEventOverAnyTaskbarItem(ev);
+        return uiController.isEventOverAnyTaskbarItem(ev);
     }
 
     @Override
     public boolean shouldCancelCurrentGesture() {
-        TaskbarController taskbarController = getTaskbarController();
-        if (taskbarController == null) {
+        LauncherTaskbarUIController uiController = getTaskbarController();
+        if (uiController == null) {
             return super.shouldCancelCurrentGesture();
         }
-        return taskbarController.isDraggingItem();
+        return uiController.isDraggingItem();
     }
 
     @Override
-- 
GitLab


From 29f61d5d21950bdb757d11f006aa032c7dd19ad4 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Thu, 13 May 2021 15:59:02 -0700
Subject: [PATCH 1205/1664] Updated gesture navigation tutorial.

- Removed 'x' button and added tappable 'skip' text to exit the tutorial.
- Updated tutorial step indicator
- updated AVD colors.
- removed unused AVDs
- Increased the visible duration of the feedback view

Test: Manual
Bug: 148542211
Bug: 169687177
Change-Id: Ice61b1273ff270b068d008b5259d100c66057478
---
 .../gesture_tutorial_loop_back_left.xml       |   2 +-
 .../gesture_tutorial_loop_back_right.xml      |   2 +-
 .../gesture_tutorial_loop_bottom_edge.xml     |  38 ------
 ...sture_tutorial_loop_gesture_back_right.xml |  57 ---------
 .../gesture_tutorial_loop_gesture_home.xml    |  57 ---------
 ...esture_tutorial_loop_gesture_left_edge.xml |  57 ---------
 ...gesture_tutorial_loop_gesture_overview.xml |  57 ---------
 .../drawable/gesture_tutorial_loop_home.xml   |  97 +++++++++++++-
 .../gesture_tutorial_loop_left_edge.xml       |  38 ------
 .../gesture_tutorial_loop_overview.xml        |  97 +++++++++++++-
 .../gesture_tutorial_loop_right_edge.xml      |  38 ------
 .../gesture_tutorial_motion_back_left.xml     |   2 +-
 .../gesture_tutorial_motion_back_right.xml    |   2 +-
 .../drawable/gesture_tutorial_motion_home.xml |   2 +-
 .../gesture_tutorial_motion_overview.xml      |   2 +-
 .../drawable/tutorial_step_indicator_pill.xml |   6 +
 .../res/layout/gesture_tutorial_fragment.xml  |  35 +++---
 quickstep/res/values/strings.xml              |   4 +-
 quickstep/res/values/styles.xml               |   8 +-
 .../interaction/TutorialController.java       |  40 +++---
 .../interaction/TutorialStepIndicator.java    | 118 ++++++++++++++++++
 21 files changed, 365 insertions(+), 394 deletions(-)
 delete mode 100644 quickstep/res/drawable/gesture_tutorial_loop_bottom_edge.xml
 delete mode 100644 quickstep/res/drawable/gesture_tutorial_loop_gesture_back_right.xml
 delete mode 100644 quickstep/res/drawable/gesture_tutorial_loop_gesture_home.xml
 delete mode 100644 quickstep/res/drawable/gesture_tutorial_loop_gesture_left_edge.xml
 delete mode 100644 quickstep/res/drawable/gesture_tutorial_loop_gesture_overview.xml
 delete mode 100644 quickstep/res/drawable/gesture_tutorial_loop_left_edge.xml
 delete mode 100644 quickstep/res/drawable/gesture_tutorial_loop_right_edge.xml
 create mode 100644 quickstep/res/drawable/tutorial_step_indicator_pill.xml
 create mode 100644 quickstep/src/com/android/quickstep/interaction/TutorialStepIndicator.java

diff --git a/quickstep/res/drawable/gesture_tutorial_loop_back_left.xml b/quickstep/res/drawable/gesture_tutorial_loop_back_left.xml
index 8bf305cd15..d2909fffc9 100644
--- a/quickstep/res/drawable/gesture_tutorial_loop_back_left.xml
+++ b/quickstep/res/drawable/gesture_tutorial_loop_back_left.xml
@@ -85,7 +85,7 @@
                     <path
                         android:name="_R_G_L_0_G_D_0_P_0"
                         android:fillAlpha="0.25"
-                        android:fillColor="#84ba69"
+                        android:fillColor="@color/gesture_tutorial_primary_color"
                         android:fillType="nonZero"
                         android:pathData=" M12.5 -446 C12.5,-446 12.5,446 12.5,446 C12.5,446 -12.5,446 -12.5,446 C-12.5,446 -12.5,-446 -12.5,-446 C-12.5,-446 12.5,-446 12.5,-446c " />
                 </group>
diff --git a/quickstep/res/drawable/gesture_tutorial_loop_back_right.xml b/quickstep/res/drawable/gesture_tutorial_loop_back_right.xml
index 812c54c9e2..c20b252778 100644
--- a/quickstep/res/drawable/gesture_tutorial_loop_back_right.xml
+++ b/quickstep/res/drawable/gesture_tutorial_loop_back_right.xml
@@ -81,7 +81,7 @@
                     <path
                         android:name="_R_G_L_1_G_D_0_P_0"
                         android:fillAlpha="0.25"
-                        android:fillColor="#84ba69"
+                        android:fillColor="@color/gesture_tutorial_primary_color"
                         android:fillType="nonZero"
                         android:pathData=" M12.5 -446 C12.5,-446 12.5,446 12.5,446 C12.5,446 -12.5,446 -12.5,446 C-12.5,446 -12.5,-446 -12.5,-446 C-12.5,-446 12.5,-446 12.5,-446c " />
                 </group>
diff --git a/quickstep/res/drawable/gesture_tutorial_loop_bottom_edge.xml b/quickstep/res/drawable/gesture_tutorial_loop_bottom_edge.xml
deleted file mode 100644
index 3efb52d16f..0000000000
--- a/quickstep/res/drawable/gesture_tutorial_loop_bottom_edge.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
-    <target android:name="time_group">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="2000"
-                    android:propertyName="translateX"
-                    android:startOffset="0"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <aapt:attr name="android:drawable">
-        <vector
-            android:width="412dp"
-            android:height="892dp"
-            android:viewportHeight="892"
-            android:viewportWidth="412">
-            <group android:name="_R_G">
-                <group
-                    android:name="_R_G_L_0_G"
-                    android:translateX="206"
-                    android:translateY="874.5">
-                    <path
-                        android:name="_R_G_L_0_G_D_0_P_0"
-                        android:fillAlpha="1"
-                        android:fillColor="#84ba69"
-                        android:fillType="nonZero"
-                        android:pathData=" M206 -17.5 C206,-17.5 206,17.5 206,17.5 C206,17.5 -206,17.5 -206,17.5 C-206,17.5 -206,-17.5 -206,-17.5 C-206,-17.5 206,-17.5 206,-17.5c " />
-                </group>
-            </group>
-            <group android:name="time_group" />
-        </vector>
-    </aapt:attr>
-</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_loop_gesture_back_right.xml b/quickstep/res/drawable/gesture_tutorial_loop_gesture_back_right.xml
deleted file mode 100644
index c41d077218..0000000000
--- a/quickstep/res/drawable/gesture_tutorial_loop_gesture_back_right.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
-    <target android:name="_R_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="0"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="783"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="time_group">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="2000"
-                    android:propertyName="translateX"
-                    android:startOffset="0"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <aapt:attr name="android:drawable">
-        <vector
-            android:width="412dp"
-            android:height="892dp"
-            android:viewportHeight="892"
-            android:viewportWidth="412">
-            <group android:name="_R_G">
-                <group
-                    android:name="_R_G_L_0_G"
-                    android:translateX="206"
-                    android:translateY="446" />
-            </group>
-            <group android:name="time_group" />
-        </vector>
-    </aapt:attr>
-</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_loop_gesture_home.xml b/quickstep/res/drawable/gesture_tutorial_loop_gesture_home.xml
deleted file mode 100644
index c5dd41b520..0000000000
--- a/quickstep/res/drawable/gesture_tutorial_loop_gesture_home.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
-    <target android:name="_R_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="0"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="850"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="time_group">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="2000"
-                    android:propertyName="translateX"
-                    android:startOffset="0"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <aapt:attr name="android:drawable">
-        <vector
-            android:width="412dp"
-            android:height="892dp"
-            android:viewportHeight="892"
-            android:viewportWidth="412">
-            <group android:name="_R_G">
-                <group
-                    android:name="_R_G_L_0_G"
-                    android:translateX="206"
-                    android:translateY="446" />
-            </group>
-            <group android:name="time_group" />
-        </vector>
-    </aapt:attr>
-</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_loop_gesture_left_edge.xml b/quickstep/res/drawable/gesture_tutorial_loop_gesture_left_edge.xml
deleted file mode 100644
index c41d077218..0000000000
--- a/quickstep/res/drawable/gesture_tutorial_loop_gesture_left_edge.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
-    <target android:name="_R_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="0"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="783"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="time_group">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="2000"
-                    android:propertyName="translateX"
-                    android:startOffset="0"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <aapt:attr name="android:drawable">
-        <vector
-            android:width="412dp"
-            android:height="892dp"
-            android:viewportHeight="892"
-            android:viewportWidth="412">
-            <group android:name="_R_G">
-                <group
-                    android:name="_R_G_L_0_G"
-                    android:translateX="206"
-                    android:translateY="446" />
-            </group>
-            <group android:name="time_group" />
-        </vector>
-    </aapt:attr>
-</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_loop_gesture_overview.xml b/quickstep/res/drawable/gesture_tutorial_loop_gesture_overview.xml
deleted file mode 100644
index 5d87805e3c..0000000000
--- a/quickstep/res/drawable/gesture_tutorial_loop_gesture_overview.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
-    <target android:name="_R_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="0"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="1500"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="time_group">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="2000"
-                    android:propertyName="translateX"
-                    android:startOffset="0"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <aapt:attr name="android:drawable">
-        <vector
-            android:width="412dp"
-            android:height="892dp"
-            android:viewportHeight="892"
-            android:viewportWidth="412">
-            <group android:name="_R_G">
-                <group
-                    android:name="_R_G_L_0_G"
-                    android:translateX="206"
-                    android:translateY="446" />
-            </group>
-            <group android:name="time_group" />
-        </vector>
-    </aapt:attr>
-</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_loop_home.xml b/quickstep/res/drawable/gesture_tutorial_loop_home.xml
index ed072a9526..931f8c0197 100644
--- a/quickstep/res/drawable/gesture_tutorial_loop_home.xml
+++ b/quickstep/res/drawable/gesture_tutorial_loop_home.xml
@@ -1 +1,96 @@
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"><aapt:attr name="android:drawable"><vector android:height="892dp" android:width="412dp" android:viewportHeight="892" android:viewportWidth="412"><group android:name="_R_G"><group android:name="_R_G_L_1_G" android:translateX="206" android:translateY="879.5"><path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="#84ba69" android:fillAlpha="0.25" android:fillType="nonZero" android:pathData=" M206 -12.5 C206,-12.5 206,12.5 206,12.5 C206,12.5 -206,12.5 -206,12.5 C-206,12.5 -206,-12.5 -206,-12.5 C-206,-12.5 206,-12.5 206,-12.5c "/></group><group android:name="_R_G_L_0_G" android:translateX="206" android:translateY="446"/></group><group android:name="time_group"/></vector></aapt:attr><target android:name="_R_G_L_1_G_D_0_P_0"><aapt:attr name="android:animation"><set android:ordering="together"><objectAnimator android:propertyName="fillAlpha" android:duration="1000" android:startOffset="0" android:valueFrom="0.25" android:valueTo="0.75" android:valueType="floatType"><aapt:attr name="android:interpolator"><pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/></aapt:attr></objectAnimator><objectAnimator android:propertyName="fillAlpha" android:duration="1000" android:startOffset="1000" android:valueFrom="0.75" android:valueTo="0.25" android:valueType="floatType"><aapt:attr name="android:interpolator"><pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/></aapt:attr></objectAnimator></set></aapt:attr></target><target android:name="_R_G_L_0_G"><aapt:attr name="android:animation"><set android:ordering="together"><objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/></set></aapt:attr></target><target android:name="_R_G_L_0_G"><aapt:attr name="android:animation"><set android:ordering="together"><objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="850" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/></set></aapt:attr></target><target android:name="time_group"><aapt:attr name="android:animation"><set android:ordering="together"><objectAnimator android:propertyName="translateX" android:duration="2000" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/></set></aapt:attr></target></animated-vector>
\ No newline at end of file
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <target android:name="_R_G_L_1_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="1000"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="0"
+                    android:valueFrom="0.25"
+                    android:valueTo="0.75"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="1000"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1000"
+                    android:valueFrom="0.75"
+                    android:valueTo="0.25"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="850"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="2000"
+                    android:propertyName="translateX"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <aapt:attr name="android:drawable">
+        <vector
+            android:width="412dp"
+            android:height="892dp"
+            android:viewportHeight="892"
+            android:viewportWidth="412">
+            <group android:name="_R_G">
+                <group
+                    android:name="_R_G_L_1_G"
+                    android:translateX="206"
+                    android:translateY="879.5">
+                    <path
+                        android:name="_R_G_L_1_G_D_0_P_0"
+                        android:fillAlpha="0.25"
+                        android:fillColor="@color/gesture_tutorial_primary_color"
+                        android:fillType="nonZero"
+                        android:pathData=" M206 -12.5 C206,-12.5 206,12.5 206,12.5 C206,12.5 -206,12.5 -206,12.5 C-206,12.5 -206,-12.5 -206,-12.5 C-206,-12.5 206,-12.5 206,-12.5c " />
+                </group>
+                <group
+                    android:name="_R_G_L_0_G"
+                    android:translateX="206"
+                    android:translateY="446" />
+            </group>
+            <group android:name="time_group" />
+        </vector>
+    </aapt:attr>
+</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_loop_left_edge.xml b/quickstep/res/drawable/gesture_tutorial_loop_left_edge.xml
deleted file mode 100644
index 07caaea042..0000000000
--- a/quickstep/res/drawable/gesture_tutorial_loop_left_edge.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
-    <target android:name="time_group">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="2000"
-                    android:propertyName="translateX"
-                    android:startOffset="0"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <aapt:attr name="android:drawable">
-        <vector
-            android:width="412dp"
-            android:height="892dp"
-            android:viewportHeight="892"
-            android:viewportWidth="412">
-            <group android:name="_R_G">
-                <group
-                    android:name="_R_G_L_0_G"
-                    android:translateX="17.5"
-                    android:translateY="446">
-                    <path
-                        android:name="_R_G_L_0_G_D_0_P_0"
-                        android:fillAlpha="1"
-                        android:fillColor="#84ba69"
-                        android:fillType="nonZero"
-                        android:pathData=" M17.5 -446 C17.5,-446 17.5,446 17.5,446 C17.5,446 -17.5,446 -17.5,446 C-17.5,446 -17.5,-446 -17.5,-446 C-17.5,-446 17.5,-446 17.5,-446c " />
-                </group>
-            </group>
-            <group android:name="time_group" />
-        </vector>
-    </aapt:attr>
-</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_loop_overview.xml b/quickstep/res/drawable/gesture_tutorial_loop_overview.xml
index acf0c4c9d0..a4c532bdfa 100644
--- a/quickstep/res/drawable/gesture_tutorial_loop_overview.xml
+++ b/quickstep/res/drawable/gesture_tutorial_loop_overview.xml
@@ -1 +1,96 @@
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"><aapt:attr name="android:drawable"><vector android:height="892dp" android:width="412dp" android:viewportHeight="892" android:viewportWidth="412"><group android:name="_R_G"><group android:name="_R_G_L_1_G" android:translateX="206" android:translateY="879.5"><path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="#84ba69" android:fillAlpha="0.25" android:fillType="nonZero" android:pathData=" M206 -12.5 C206,-12.5 206,12.5 206,12.5 C206,12.5 -206,12.5 -206,12.5 C-206,12.5 -206,-12.5 -206,-12.5 C-206,-12.5 206,-12.5 206,-12.5c "/></group><group android:name="_R_G_L_0_G" android:translateX="206" android:translateY="446"/></group><group android:name="time_group"/></vector></aapt:attr><target android:name="_R_G_L_1_G_D_0_P_0"><aapt:attr name="android:animation"><set android:ordering="together"><objectAnimator android:propertyName="fillAlpha" android:duration="1000" android:startOffset="0" android:valueFrom="0.25" android:valueTo="0.75" android:valueType="floatType"><aapt:attr name="android:interpolator"><pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/></aapt:attr></objectAnimator><objectAnimator android:propertyName="fillAlpha" android:duration="1000" android:startOffset="1000" android:valueFrom="0.75" android:valueTo="0.25" android:valueType="floatType"><aapt:attr name="android:interpolator"><pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/></aapt:attr></objectAnimator></set></aapt:attr></target><target android:name="_R_G_L_0_G"><aapt:attr name="android:animation"><set android:ordering="together"><objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/></set></aapt:attr></target><target android:name="_R_G_L_0_G"><aapt:attr name="android:animation"><set android:ordering="together"><objectAnimator android:propertyName="scaleY" android:duration="0" android:startOffset="1500" android:valueFrom="1" android:valueTo="0" android:valueType="floatType"/></set></aapt:attr></target><target android:name="time_group"><aapt:attr name="android:animation"><set android:ordering="together"><objectAnimator android:propertyName="translateX" android:duration="2000" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/></set></aapt:attr></target></animated-vector>
\ No newline at end of file
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <target android:name="_R_G_L_1_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="1000"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="0"
+                    android:valueFrom="0.25"
+                    android:valueTo="0.75"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="1000"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1000"
+                    android:valueFrom="0.75"
+                    android:valueTo="0.25"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="1500"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="2000"
+                    android:propertyName="translateX"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <aapt:attr name="android:drawable">
+        <vector
+            android:width="412dp"
+            android:height="892dp"
+            android:viewportHeight="892"
+            android:viewportWidth="412">
+            <group android:name="_R_G">
+                <group
+                    android:name="_R_G_L_1_G"
+                    android:translateX="206"
+                    android:translateY="879.5">
+                    <path
+                        android:name="_R_G_L_1_G_D_0_P_0"
+                        android:fillAlpha="0.25"
+                        android:fillColor="@color/gesture_tutorial_primary_color"
+                        android:fillType="nonZero"
+                        android:pathData=" M206 -12.5 C206,-12.5 206,12.5 206,12.5 C206,12.5 -206,12.5 -206,12.5 C-206,12.5 -206,-12.5 -206,-12.5 C-206,-12.5 206,-12.5 206,-12.5c " />
+                </group>
+                <group
+                    android:name="_R_G_L_0_G"
+                    android:translateX="206"
+                    android:translateY="446" />
+            </group>
+            <group android:name="time_group" />
+        </vector>
+    </aapt:attr>
+</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_loop_right_edge.xml b/quickstep/res/drawable/gesture_tutorial_loop_right_edge.xml
deleted file mode 100644
index d86b653e50..0000000000
--- a/quickstep/res/drawable/gesture_tutorial_loop_right_edge.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
-    <target android:name="time_group">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="2000"
-                    android:propertyName="translateX"
-                    android:startOffset="0"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <aapt:attr name="android:drawable">
-        <vector
-            android:width="412dp"
-            android:height="892dp"
-            android:viewportHeight="892"
-            android:viewportWidth="412">
-            <group android:name="_R_G">
-                <group
-                    android:name="_R_G_L_0_G"
-                    android:translateX="394.5"
-                    android:translateY="446">
-                    <path
-                        android:name="_R_G_L_0_G_D_0_P_0"
-                        android:fillAlpha="1"
-                        android:fillColor="#84ba69"
-                        android:fillType="nonZero"
-                        android:pathData=" M17.5 -446 C17.5,-446 17.5,446 17.5,446 C17.5,446 -17.5,446 -17.5,446 C-17.5,446 -17.5,-446 -17.5,-446 C-17.5,-446 17.5,-446 17.5,-446c " />
-                </group>
-            </group>
-            <group android:name="time_group" />
-        </vector>
-    </aapt:attr>
-</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_motion_back_left.xml b/quickstep/res/drawable/gesture_tutorial_motion_back_left.xml
index e944c0e919..f5ad56916b 100644
--- a/quickstep/res/drawable/gesture_tutorial_motion_back_left.xml
+++ b/quickstep/res/drawable/gesture_tutorial_motion_back_left.xml
@@ -1401,7 +1401,7 @@
                     <path
                         android:name="_R_G_L_0_G_D_0_P_0"
                         android:fillAlpha="0"
-                        android:fillColor="#84ba69"
+                        android:fillColor="@color/gesture_tutorial_primary_color"
                         android:fillType="nonZero"
                         android:pathData=" M-206.5 13.5 C-186.34,13.5 -170,29.84 -170,50 C-170,70.16 -186.34,86.5 -206.5,86.5 C-226.66,86.5 -243,70.16 -243,50 C-243,29.84 -226.66,13.5 -206.5,13.5c " />
                 </group>
diff --git a/quickstep/res/drawable/gesture_tutorial_motion_back_right.xml b/quickstep/res/drawable/gesture_tutorial_motion_back_right.xml
index f8d649abb2..b898dc17a6 100644
--- a/quickstep/res/drawable/gesture_tutorial_motion_back_right.xml
+++ b/quickstep/res/drawable/gesture_tutorial_motion_back_right.xml
@@ -1402,7 +1402,7 @@
                     <path
                         android:name="_R_G_L_0_G_D_0_P_0"
                         android:fillAlpha="0"
-                        android:fillColor="#84ba69"
+                        android:fillColor="@color/gesture_tutorial_primary_color"
                         android:fillType="nonZero"
                         android:pathData=" M205 13.5 C225.16,13.5 241.5,29.84 241.5,50 C241.5,70.16 225.16,86.5 205,86.5 C184.84,86.5 168.5,70.16 168.5,50 C168.5,29.84 184.84,13.5 205,13.5c " />
                 </group>
diff --git a/quickstep/res/drawable/gesture_tutorial_motion_home.xml b/quickstep/res/drawable/gesture_tutorial_motion_home.xml
index 9dbaee6247..87b885715c 100644
--- a/quickstep/res/drawable/gesture_tutorial_motion_home.xml
+++ b/quickstep/res/drawable/gesture_tutorial_motion_home.xml
@@ -1243,7 +1243,7 @@
                     <path
                         android:name="_R_G_L_0_G_D_0_P_0"
                         android:fillAlpha="0"
-                        android:fillColor="#84ba69"
+                        android:fillColor="@color/gesture_tutorial_primary_color"
                         android:fillType="nonZero"
                         android:pathData=" M0 411 C19.33,411 35,426.67 35,446 C35,465.33 19.33,481 0,481 C-19.33,481 -35,465.33 -35,446 C-35,426.67 -19.33,411 0,411c " />
                 </group>
diff --git a/quickstep/res/drawable/gesture_tutorial_motion_overview.xml b/quickstep/res/drawable/gesture_tutorial_motion_overview.xml
index 4751fa9e2b..058bee2ef0 100644
--- a/quickstep/res/drawable/gesture_tutorial_motion_overview.xml
+++ b/quickstep/res/drawable/gesture_tutorial_motion_overview.xml
@@ -1612,7 +1612,7 @@
                     <path
                         android:name="_R_G_L_0_G_D_0_P_0"
                         android:fillAlpha="0"
-                        android:fillColor="#84ba69"
+                        android:fillColor="@color/gesture_tutorial_primary_color"
                         android:fillType="nonZero"
                         android:pathData=" M0 406 C21.54,406 39,423.46 39,445 C39,466.54 21.54,484 0,484 C-21.54,484 -39,466.54 -39,445 C-39,423.46 -21.54,406 0,406c " />
                 </group>
diff --git a/quickstep/res/drawable/tutorial_step_indicator_pill.xml b/quickstep/res/drawable/tutorial_step_indicator_pill.xml
new file mode 100644
index 0000000000..94a8748e64
--- /dev/null
+++ b/quickstep/res/drawable/tutorial_step_indicator_pill.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="10dp"/>
+    <size android:width="16dp" android:height="6dp"/>
+</shape>
\ No newline at end of file
diff --git a/quickstep/res/layout/gesture_tutorial_fragment.xml b/quickstep/res/layout/gesture_tutorial_fragment.xml
index 5f827309d9..a884e745e2 100644
--- a/quickstep/res/layout/gesture_tutorial_fragment.xml
+++ b/quickstep/res/layout/gesture_tutorial_fragment.xml
@@ -88,27 +88,15 @@
         android:padding="24dp"
         android:background="@drawable/bg_sandbox_feedback">
 
-        <ImageButton
-            android:id="@+id/gesture_tutorial_fragment_close_button"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:src="@drawable/close_icon"
-            android:background="@drawable/bg_sandbox_close_button"
-            android:contentDescription="@string/gesture_tutorial_close_button_content_description"
-
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
-
         <TextView
             android:id="@+id/gesture_tutorial_fragment_feedback_title"
             style="@style/TextAppearance.GestureTutorial.Feedback.Title"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
 
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/gesture_tutorial_fragment_close_button"/>
+            app:layout_constraintTop_toTopOf="parent"/>
 
         <TextView
             android:id="@+id/gesture_tutorial_fragment_feedback_subtitle"
@@ -121,14 +109,13 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/gesture_tutorial_fragment_feedback_title"/>
 
-        <TextView
+        <com.android.quickstep.interaction.TutorialStepIndicator
             android:id="@+id/gesture_tutorial_fragment_feedback_tutorial_step"
-            style="@style/TextAppearance.GestureTutorial.Feedback.Subtext"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
 
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/gesture_tutorial_fragment_action_button"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/gesture_tutorial_fragment_action_button"
             app:layout_constraintBottom_toBottomOf="@id/gesture_tutorial_fragment_action_button"/>
 
@@ -144,6 +131,7 @@
             android:paddingBottom="8dp"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
+            android:text="@string/gesture_tutorial_action_button_label_next"
             android:background="@drawable/gesture_tutorial_action_button_background"
             android:foreground="?android:attr/selectableItemBackgroundBorderless"
             android:stateListAnimator="@null"
@@ -152,6 +140,19 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/gesture_tutorial_fragment_feedback_subtitle"/>
 
+        <Button
+            style="@style/TextAppearance.GestureTutorial.Feedback.Subtext"
+            android:id="@+id/gesture_tutorial_fragment_close_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/gesture_tutorial_action_button_label_skip"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+
+            app:layout_constraintTop_toTopOf="@id/gesture_tutorial_fragment_action_button"
+            app:layout_constraintBottom_toBottomOf="@id/gesture_tutorial_fragment_action_button"
+            app:layout_constraintStart_toStartOf="@id/gesture_tutorial_fragment_action_button"
+            app:layout_constraintEnd_toEndOf="@id/gesture_tutorial_fragment_action_button"/>
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </com.android.quickstep.interaction.RootSandboxLayout>
\ No newline at end of file
diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml
index 2c8687c73a..3f75d324ea 100644
--- a/quickstep/res/values/strings.xml
+++ b/quickstep/res/values/strings.xml
@@ -97,7 +97,7 @@
     <string name="back_gesture_feedback_cancelled_left_edge">Make sure you swipe from the left edge to the middle of the screen and let go.</string>
     <!-- Feedback title shown after completing the left back gesture before continuing on to the right edge. [CHAR LIMIT=60] -->
     <string name="back_gesture_feedback_title_complete_left_edge">Nice! Now swipe from the right to go back</string>
-    <!-- Feedback subtitle shown after completing the left back gesture before continuing on to the right edge. [CHAR LIMIT=60] -->
+    <!-- Feedback subtitle shown after completing the left back gesture before continuing on to the right edge. [CHAR LIMIT=200] -->
     <string name="back_gesture_feedback_subtitle_complete_left_edge">You can also go back to the last screen by swiping from the right edge to the middle of the screen.</string>
     <!-- Feedback shown during interactive parts of Back gesture tutorial for right edge when the gesture is too far from the edge. [CHAR LIMIT=100] -->
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge">Make sure you swipe from the far-right edge.</string>
@@ -176,8 +176,6 @@
     <string name="gesture_tutorial_confirm_title">All set</string>
     <!-- Button text shown on a button on the feedback popup to proceed to the next tutorial step. [CHAR LIMIT=14] -->
     <string name="gesture_tutorial_action_button_label_next">Next</string>
-    <!-- Button text shown on a button on the feedback popup to complete the tutorial. [CHAR LIMIT=14] -->
-    <string name="gesture_tutorial_action_button_label_done">Done</string>
     <!-- Button text shown on a button to go to Settings. [CHAR LIMIT=14] -->
     <string name="gesture_tutorial_action_button_label_settings">Settings</string>
     <!-- Feedback title to try again. [CHAR LIMIT=30] -->
diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml
index 0a8ecb8bde..cfca1246ad 100644
--- a/quickstep/res/values/styles.xml
+++ b/quickstep/res/values/styles.xml
@@ -77,7 +77,13 @@
     <style name="TextAppearance.GestureTutorial.Feedback.Subtext"
         parent="TextAppearance.GestureTutorial.Feedback.Subtitle">
         <item name="android:textSize">16sp</item>
-        <item name="android:textColor">#909090</item>
+        <item name="android:textColor">@color/gesture_tutorial_primary_color</item>
+        <item name="android:gravity">center</item>
+    </style>
+
+    <style name="TextAppearance.GestureTutorial.Feedback.Subtext.Dark"
+        parent="TextAppearance.GestureTutorial.Feedback.Subtext">
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
     <style name="TextAppearance.GestureTutorial.ButtonLabel"
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
index f9d5c94375..a03e37e52d 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
@@ -15,6 +15,8 @@
  */
 package com.android.quickstep.interaction;
 
+import static android.view.View.GONE;
+
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Animatable2;
@@ -26,7 +28,6 @@ import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -38,6 +39,7 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.content.res.AppCompatResources;
 
 import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimatorListeners;
 import com.android.launcher3.views.ClipIconView;
 import com.android.quickstep.interaction.EdgeBackGestureHandler.BackGestureAttemptCallback;
@@ -51,7 +53,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
     private static final String PIXEL_TIPS_APP_PACKAGE_NAME = "com.google.android.apps.tips";
     private static final CharSequence DEFAULT_PIXEL_TIPS_APP_NAME = "Pixel Tips";
 
-    private static final int FEEDBACK_VISIBLE_MS = 2500;
+    private static final int FEEDBACK_VISIBLE_MS = 5000;
     private static final int FEEDBACK_ANIMATION_MS = 250;
     private static final int RIPPLE_VISIBLE_MS = 300;
 
@@ -59,7 +61,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
     TutorialType mTutorialType;
     final Context mContext;
 
-    final ImageButton mCloseButton;
+    final TextView mCloseButton;
     final ViewGroup mFeedbackView;
     final ImageView mFeedbackVideoView;
     final ImageView mGestureVideoView;
@@ -70,7 +72,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
     final View mRippleView;
     final RippleDrawable mRippleDrawable;
     final Button mActionButton;
-    final TextView mTutorialStepView;
+    final TutorialStepIndicator mTutorialStepView;
     private final Runnable mHideFeedbackRunnable;
     Runnable mHideFeedbackEndAction;
     private final AlertDialog mSkipTutorialDialog;
@@ -226,7 +228,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
                     public void onAnimationStart(Drawable drawable) {
                         super.onAnimationStart(drawable);
 
-                        mGestureVideoView.setVisibility(View.GONE);
+                        mGestureVideoView.setVisibility(GONE);
                         if (gestureAnimation.isRunning()) {
                             gestureAnimation.stop();
                         }
@@ -238,6 +240,8 @@ abstract class TutorialController implements BackGestureAttemptCallback,
                                 .setDuration(FEEDBACK_ANIMATION_MS)
                                 .translationY(0)
                                 .start();
+                        mFeedbackView.removeCallbacks(mHideFeedbackRunnable);
+                        mFeedbackView.postDelayed(mHideFeedbackRunnable, FEEDBACK_VISIBLE_MS);
                     }
 
                     @Override
@@ -247,9 +251,6 @@ abstract class TutorialController implements BackGestureAttemptCallback,
                         mGestureVideoView.setVisibility(View.VISIBLE);
                         gestureAnimation.start();
 
-                        mFeedbackView.removeCallbacks(mHideFeedbackRunnable);
-                        mFeedbackView.post(mHideFeedbackRunnable);
-
                         tutorialAnimation.unregisterAnimationCallback(this);
                     }
                 });
@@ -322,32 +323,25 @@ abstract class TutorialController implements BackGestureAttemptCallback,
     }
 
     void hideActionButton() {
+        mCloseButton.setVisibility(View.VISIBLE);
+        mCloseButton.setTextAppearance(Utilities.isDarkTheme(mContext)
+                ? R.style.TextAppearance_GestureTutorial_Feedback_Subtext
+                : R.style.TextAppearance_GestureTutorial_Feedback_Subtext_Dark);
+
         // Invisible to maintain the layout.
         mActionButton.setVisibility(View.INVISIBLE);
         mActionButton.setOnClickListener(null);
     }
 
     void showActionButton() {
-        int stringResId = -1;
-
-        if (mContext instanceof GestureSandboxActivity) {
-            GestureSandboxActivity sandboxActivity = (GestureSandboxActivity) mContext;
-
-            stringResId = sandboxActivity.isTutorialComplete()
-                    ? R.string.gesture_tutorial_action_button_label_done
-                    : R.string.gesture_tutorial_action_button_label_next;
-        }
-
-        mActionButton.setText(stringResId == -1 ? null : mContext.getString(stringResId));
+        mCloseButton.setVisibility(GONE);
         mActionButton.setVisibility(View.VISIBLE);
         mActionButton.setOnClickListener(this::onActionButtonClicked);
     }
 
     private void updateSubtext() {
-        mTutorialStepView.setText(mContext.getString(
-                R.string.gesture_tutorial_step,
-                mTutorialFragment.getCurrentStep(),
-                mTutorialFragment.getNumSteps()));
+        mTutorialStepView.setTutorialProgress(
+                mTutorialFragment.getCurrentStep(), mTutorialFragment.getNumSteps());
     }
 
     private void updateDrawables() {
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialStepIndicator.java b/quickstep/src/com/android/quickstep/interaction/TutorialStepIndicator.java
new file mode 100644
index 0000000000..eda61583fa
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialStepIndicator.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.quickstep.interaction;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+
+import androidx.appcompat.content.res.AppCompatResources;
+
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.icons.GraphicsUtils;
+
+/** Indicator displaying the current progress through the gesture navigation tutorial. */
+public class TutorialStepIndicator extends LinearLayout {
+
+    private static final String LOG_TAG = "TutorialStepIndicator";
+
+    private int mCurrentStep = -1;
+    private int mTotalSteps = -1;
+
+    public TutorialStepIndicator(Context context) {
+        super(context);
+    }
+
+    public TutorialStepIndicator(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public TutorialStepIndicator(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public TutorialStepIndicator(Context context, AttributeSet attrs, int defStyleAttr,
+            int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    /**
+     * Updates this indicator to display totalSteps indicator pills, with the first currentStep
+     * pills highlighted.
+     */
+    public void setTutorialProgress(int currentStep, int totalSteps) {
+        if (currentStep <= 0) {
+            Log.w(LOG_TAG, "Current step number invalid: " + currentStep + ". Assuming step 1.");
+            currentStep = 1;
+        }
+        if (totalSteps <= 0) {
+            Log.w(LOG_TAG, "Total number of steps invalid: " + totalSteps + ". Assuming 1 step.");
+            totalSteps = 1;
+        }
+        if (currentStep > totalSteps) {
+            Log.w(LOG_TAG, "Current step number greater than the total number of steps. Assuming"
+                    + " final step.");
+            currentStep = totalSteps;
+        }
+        if (totalSteps < 2) {
+            setVisibility(GONE);
+            return;
+        }
+        setVisibility(VISIBLE);
+        mCurrentStep = currentStep;
+        mTotalSteps = totalSteps;
+
+        initializeStepIndicators();
+    }
+
+    private void initializeStepIndicators() {
+        for (int i = mTotalSteps; i < getChildCount(); i++) {
+            removeViewAt(i);
+        }
+        for (int i = 0; i < mTotalSteps; i++) {
+            Drawable pageIndicatorPillDrawable = AppCompatResources.getDrawable(
+                    getContext(), R.drawable.tutorial_step_indicator_pill);
+
+            if (i >= getChildCount()) {
+                ImageView pageIndicatorPill = new ImageView(getContext());
+                pageIndicatorPill.setImageDrawable(pageIndicatorPillDrawable);
+
+                LinearLayout.LayoutParams lp = new LayoutParams(
+                        LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+
+                lp.setMarginStart(Utilities.dpToPx(3));
+                lp.setMarginEnd(Utilities.dpToPx(3));
+
+                addView(pageIndicatorPill, lp);
+            }
+            if (pageIndicatorPillDrawable != null) {
+                if (i < mCurrentStep) {
+                    pageIndicatorPillDrawable.setTint(
+                            GraphicsUtils.getAttrColor(getContext(),
+                                    android.R.attr.textColorPrimary));
+                } else {
+                    pageIndicatorPillDrawable.setTint(
+                            GraphicsUtils.getAttrColor(getContext(),
+                                    android.R.attr.textColorPrimaryInverse));
+                }
+            }
+        }
+    }
+}
-- 
GitLab


From a76bc7631708992dfe6f37fa127c1a9d945dd90c Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 18 May 2021 12:15:14 -0700
Subject: [PATCH 1206/1664] Removing number of threads used in background
 execution to prevent system thrashing

Bug: 188541475
Test: Presubmit
Change-Id: Iff73abeab813d1b80a1ff85b69723dce0bef8005
---
 .../quickstep/RecentsAnimationController.java |  3 +--
 .../model/ModelMultiCallbacksTest.java        |  4 ++--
 src/com/android/launcher3/util/Executors.java | 21 +++++--------------
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationController.java b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
index f2bd916e11..462f71440c 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationController.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
@@ -16,7 +16,6 @@
 package com.android.quickstep;
 
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-import static com.android.launcher3.util.Executors.THREAD_POOL_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
 import android.view.SurfaceControl;
@@ -102,7 +101,7 @@ public class RecentsAnimationController {
      */
     @UiThread
     public void removeTaskTarget(@NonNull RemoteAnimationTargetCompat target) {
-        THREAD_POOL_EXECUTOR.execute(() -> mController.removeTask(target.taskId));
+        UI_HELPER_EXECUTOR.execute(() -> mController.removeTask(target.taskId));
     }
 
     @UiThread
diff --git a/robolectric_tests/src/com/android/launcher3/model/ModelMultiCallbacksTest.java b/robolectric_tests/src/com/android/launcher3/model/ModelMultiCallbacksTest.java
index aab6c25f1c..a2abfd55aa 100644
--- a/robolectric_tests/src/com/android/launcher3/model/ModelMultiCallbacksTest.java
+++ b/robolectric_tests/src/com/android/launcher3/model/ModelMultiCallbacksTest.java
@@ -15,7 +15,7 @@
  */
 package com.android.launcher3.model;
 
-import static com.android.launcher3.util.Executors.createAndStartNewForegroundLooper;
+import static com.android.launcher3.util.Executors.createAndStartNewLooper;
 import static com.android.launcher3.util.LauncherModelHelper.TEST_PACKAGE;
 
 import static org.junit.Assert.assertEquals;
@@ -74,7 +74,7 @@ public class ModelMultiCallbacksTest {
 
         // Since robolectric tests run on main thread, we run the loader-UI calls on a temp thread,
         // so that we can wait appropriately for the loader to complete.
-        mTempMainExecutor = new LooperExecutor(createAndStartNewForegroundLooper("tempMain"));
+        mTempMainExecutor = new LooperExecutor(createAndStartNewLooper("tempMain"));
         ShadowLooperExecutor sle = Shadow.extract(Executors.MAIN_EXECUTOR);
         sle.setHandler(mTempMainExecutor.getHandler());
     }
diff --git a/src/com/android/launcher3/util/Executors.java b/src/com/android/launcher3/util/Executors.java
index a85ae458ed..6329540dc2 100644
--- a/src/com/android/launcher3/util/Executors.java
+++ b/src/com/android/launcher3/util/Executors.java
@@ -30,18 +30,15 @@ import java.util.concurrent.atomic.AtomicInteger;
  */
 public class Executors {
 
-    // These values are same as that in {@link AsyncTask}.
-    private static final int CPU_COUNT = Runtime.getRuntime().availableProcessors();
-    private static final int CORE_POOL_SIZE = CPU_COUNT + 1;
-    private static final int MAXIMUM_POOL_SIZE = CPU_COUNT * 2 + 1;
+    private static final int POOL_SIZE =
+            Math.max(Runtime.getRuntime().availableProcessors(), 2);
     private static final int KEEP_ALIVE = 1;
 
     /**
      * An {@link ThreadPoolExecutor} to be used with async task with no limit on the queue size.
      */
     public static final ThreadPoolExecutor THREAD_POOL_EXECUTOR = new ThreadPoolExecutor(
-            CORE_POOL_SIZE, MAXIMUM_POOL_SIZE, KEEP_ALIVE,
-            TimeUnit.SECONDS, new LinkedBlockingQueue<>());
+            POOL_SIZE, POOL_SIZE, KEEP_ALIVE, TimeUnit.SECONDS, new LinkedBlockingQueue<>());
 
     /**
      * Returns the executor for running tasks on the main thread.
@@ -53,7 +50,8 @@ public class Executors {
      * A background executor for using time sensitive actions where user is waiting for response.
      */
     public static final LooperExecutor UI_HELPER_EXECUTOR =
-            new LooperExecutor(createAndStartNewForegroundLooper("UiThreadHelper"));
+            new LooperExecutor(
+                    createAndStartNewLooper("UiThreadHelper", Process.THREAD_PRIORITY_FOREGROUND));
 
     /**
      * Utility method to get a started handler thread statically
@@ -71,15 +69,6 @@ public class Executors {
         return thread.getLooper();
     }
 
-    /**
-     * Similar to {@link #createAndStartNewLooper(String)}, but starts the thread with
-     * foreground priority.
-     * Think before using
-     */
-    public static Looper createAndStartNewForegroundLooper(String name) {
-        return createAndStartNewLooper(name, Process.THREAD_PRIORITY_FOREGROUND);
-    }
-
     /**
      * Executor used for running Launcher model related tasks (eg loading icons or updated db)
      */
-- 
GitLab


From 01c32a69be9e57eef415291776e86f14c48f31ec Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Mon, 17 May 2021 13:23:08 -0700
Subject: [PATCH 1207/1664] Adding a shared-pref to control icon theming

Bug: 183641907
Test: Manual
Change-Id: I640a8473c9ca4acfded9ebbfa823e437c3a42b45
---
 .../android/launcher3/LauncherAppState.java   | 22 ++++-
 .../graphics/GridCustomizationsProvider.java  | 93 ++++++++++++-------
 src/com/android/launcher3/util/Themes.java    | 10 ++
 3 files changed, 92 insertions(+), 33 deletions(-)

diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index 834b5a7e8c..b6cc6d644d 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -24,6 +24,8 @@ import static com.android.launcher3.util.SettingsCache.NOTIFICATION_BADGING_URI;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.content.pm.LauncherApps;
 import android.os.UserHandle;
 import android.util.Log;
@@ -45,6 +47,7 @@ import com.android.launcher3.util.RunnableList;
 import com.android.launcher3.util.SafeCloseable;
 import com.android.launcher3.util.SettingsCache;
 import com.android.launcher3.util.SimpleBroadcastReceiver;
+import com.android.launcher3.util.Themes;
 import com.android.launcher3.widget.custom.CustomWidgetManager;
 
 public class LauncherAppState {
@@ -108,6 +111,12 @@ public class LauncherAppState {
                 observer, MODEL_EXECUTOR.getHandler());
         mOnTerminateCallback.add(iconChangeTracker::close);
         MODEL_EXECUTOR.execute(observer::verifyIconChanged);
+        if (ENABLE_THEMED_ICONS.get()) {
+            SharedPreferences prefs = Utilities.getPrefs(mContext);
+            prefs.registerOnSharedPreferenceChangeListener(observer);
+            mOnTerminateCallback.add(
+                    () -> prefs.unregisterOnSharedPreferenceChangeListener(observer));
+        }
 
         InstallSessionTracker installSessionTracker =
                 InstallSessionHelper.INSTANCE.get(context).registerInstallTracker(mModel);
@@ -128,7 +137,7 @@ public class LauncherAppState {
         mContext = context;
 
         mInvariantDeviceProfile = InvariantDeviceProfile.INSTANCE.get(context);
-        mIconProvider =  new IconProvider(context, ENABLE_THEMED_ICONS.get());
+        mIconProvider =  new IconProvider(context, Themes.isThemedIconEnabled(context));
         mIconCache = new IconCache(mContext, mInvariantDeviceProfile,
                 iconCacheFileName, mIconProvider);
         mWidgetCache = new WidgetPreviewLoader(mContext, mIconCache);
@@ -187,7 +196,8 @@ public class LauncherAppState {
         return InvariantDeviceProfile.INSTANCE.get(context);
     }
 
-    private class IconObserver implements IconProvider.IconChangeListener {
+    private class IconObserver
+            implements IconProvider.IconChangeListener, OnSharedPreferenceChangeListener {
 
         @Override
         public void onAppIconChanged(String packageName, UserHandle user) {
@@ -207,5 +217,13 @@ public class LauncherAppState {
                 onSystemIconStateChanged(iconState);
             }
         }
+
+        @Override
+        public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
+            if (Themes.KEY_THEMED_ICONS.equals(key)) {
+                mIconProvider.setIconThemeSupported(Themes.isThemedIconEnabled(mContext));
+                verifyIconChanged();
+            }
+        }
     }
 }
diff --git a/src/com/android/launcher3/graphics/GridCustomizationsProvider.java b/src/com/android/launcher3/graphics/GridCustomizationsProvider.java
index cb42e7aa05..a03e48d29a 100644
--- a/src/com/android/launcher3/graphics/GridCustomizationsProvider.java
+++ b/src/com/android/launcher3/graphics/GridCustomizationsProvider.java
@@ -1,5 +1,9 @@
 package com.android.launcher3.graphics;
 
+import static com.android.launcher3.Utilities.getPrefs;
+import static com.android.launcher3.util.Themes.KEY_THEMED_ICONS;
+import static com.android.launcher3.util.Themes.isThemedIconEnabled;
+
 import android.content.ContentProvider;
 import android.content.ContentValues;
 import android.content.pm.PackageManager;
@@ -15,6 +19,7 @@ import android.util.Xml;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile.GridOption;
 import com.android.launcher3.R;
+import com.android.launcher3.config.FeatureFlags;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -55,6 +60,11 @@ public class GridCustomizationsProvider extends ContentProvider {
 
     private static final String METHOD_GET_PREVIEW = "get_preview";
 
+    private static final String GET_ICON_THEMED = "/get_icon_themed";
+    private static final String SET_ICON_THEMED = "/set_icon_themed";
+    private static final String ICON_THEMED = "/icon_themed";
+    private static final String BOOLEAN_VALUE = "boolean_value";
+
     @Override
     public boolean onCreate() {
         return true;
@@ -63,22 +73,31 @@ public class GridCustomizationsProvider extends ContentProvider {
     @Override
     public Cursor query(Uri uri, String[] projection, String selection,
             String[] selectionArgs, String sortOrder) {
-        if (!KEY_LIST_OPTIONS.equals(uri.getPath())) {
-            return null;
-        }
-        MatrixCursor cursor = new MatrixCursor(new String[] {
-                KEY_NAME, KEY_ROWS, KEY_COLS, KEY_PREVIEW_COUNT, KEY_IS_DEFAULT});
-        InvariantDeviceProfile idp = InvariantDeviceProfile.INSTANCE.get(getContext());
-        for (GridOption gridOption : parseAllGridOptions()) {
-            cursor.newRow()
-                    .add(KEY_NAME, gridOption.name)
-                    .add(KEY_ROWS, gridOption.numRows)
-                    .add(KEY_COLS, gridOption.numColumns)
-                    .add(KEY_PREVIEW_COUNT, 1)
-                    .add(KEY_IS_DEFAULT, idp.numColumns == gridOption.numColumns
-                            && idp.numRows == gridOption.numRows);
+        switch (uri.getPath()) {
+            case KEY_LIST_OPTIONS: {
+                MatrixCursor cursor = new MatrixCursor(new String[] {
+                        KEY_NAME, KEY_ROWS, KEY_COLS, KEY_PREVIEW_COUNT, KEY_IS_DEFAULT});
+                InvariantDeviceProfile idp = InvariantDeviceProfile.INSTANCE.get(getContext());
+                for (GridOption gridOption : parseAllGridOptions()) {
+                    cursor.newRow()
+                            .add(KEY_NAME, gridOption.name)
+                            .add(KEY_ROWS, gridOption.numRows)
+                            .add(KEY_COLS, gridOption.numColumns)
+                            .add(KEY_PREVIEW_COUNT, 1)
+                            .add(KEY_IS_DEFAULT, idp.numColumns == gridOption.numColumns
+                                    && idp.numRows == gridOption.numRows);
+                }
+                return cursor;
+            }
+            case GET_ICON_THEMED:
+            case ICON_THEMED: {
+                MatrixCursor cursor = new MatrixCursor(new String[] {BOOLEAN_VALUE});
+                cursor.newRow().add(BOOLEAN_VALUE, isThemedIconEnabled(getContext()) ? 1 : 0);
+                return cursor;
+            }
+            default:
+                return null;
         }
-        return cursor;
     }
 
     private List<GridOption> parseAllGridOptions() {
@@ -117,25 +136,37 @@ public class GridCustomizationsProvider extends ContentProvider {
 
     @Override
     public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
-        if (!KEY_DEFAULT_GRID.equals(uri.getPath())) {
-            return 0;
-        }
+        switch (uri.getPath()) {
+            case KEY_DEFAULT_GRID: {
+                String gridName = values.getAsString(KEY_NAME);
+                // Verify that this is a valid grid option
+                GridOption match = null;
+                for (GridOption option : parseAllGridOptions()) {
+                    if (option.name.equals(gridName)) {
+                        match = option;
+                        break;
+                    }
+                }
+                if (match == null) {
+                    return 0;
+                }
 
-        String gridName = values.getAsString(KEY_NAME);
-        // Verify that this is a valid grid option
-        GridOption match = null;
-        for (GridOption option : parseAllGridOptions()) {
-            if (option.name.equals(gridName)) {
-                match = option;
-                break;
+                InvariantDeviceProfile.INSTANCE.get(getContext())
+                        .setCurrentGrid(getContext(), gridName);
+                return 1;
             }
+            case ICON_THEMED:
+            case SET_ICON_THEMED: {
+                if (FeatureFlags.ENABLE_THEMED_ICONS.get()) {
+                    getPrefs(getContext()).edit()
+                            .putBoolean(KEY_THEMED_ICONS, values.getAsBoolean(BOOLEAN_VALUE))
+                            .apply();
+                }
+                return 1;
+            }
+            default:
+                return 0;
         }
-        if (match == null) {
-            return 0;
-        }
-
-        InvariantDeviceProfile.INSTANCE.get(getContext()).setCurrentGrid(getContext(), gridName);
-        return 1;
     }
 
     @Override
diff --git a/src/com/android/launcher3/util/Themes.java b/src/com/android/launcher3/util/Themes.java
index 8243dd480b..53a584d8de 100644
--- a/src/com/android/launcher3/util/Themes.java
+++ b/src/com/android/launcher3/util/Themes.java
@@ -32,6 +32,7 @@ import android.util.TypedValue;
 
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.icons.GraphicsUtils;
 
 /**
@@ -40,6 +41,8 @@ import com.android.launcher3.icons.GraphicsUtils;
 @SuppressWarnings("NewApi")
 public class Themes {
 
+    public static final String KEY_THEMED_ICONS = "themed_icons";
+
     public static int getActivityThemeRes(Context context) {
         final int colorHints;
         if (Utilities.ATLEAST_P) {
@@ -67,6 +70,13 @@ public class Themes {
         }
     }
 
+    /**
+     * Returns true if workspace icon theming is enabled
+     */
+    public static boolean isThemedIconEnabled(Context context) {
+        return FeatureFlags.ENABLE_THEMED_ICONS.get()
+                && Utilities.getPrefs(context).getBoolean(KEY_THEMED_ICONS, false);
+    }
 
     public static String getDefaultBodyFont(Context context) {
         TypedArray ta = context.obtainStyledAttributes(android.R.style.TextAppearance_DeviceDefault,
-- 
GitLab


From 76b33404b51c9b22ae6a483d7da98afb32209320 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Tue, 18 May 2021 16:15:46 -0500
Subject: [PATCH 1208/1664] [Search] Update all apps header protection

- Introduce spacing between header protection and search box
- introduce vertical padding for "personal | work" tab
- animate tab header protection color change when docking

Test: Manual
preview: https://drive.google.com/file/d/1eS4B7hcLExxCdjSp1IzBcziKm-9w87UR/view?usp=sharing&resourcekey=0--mtY6bCC9GJpFSUC8I5d6w
Bug: 184946772
Change-Id: I840af27c7557f1dffd7a15874aa09833514b4bb1
---
 res/drawable/all_apps_tabs_background.xml         | 15 ++++++++++-----
 res/layout/all_apps_personal_work_tabs.xml        |  5 ++---
 res/layout/secondary_launcher.xml                 |  2 --
 res/values/attrs.xml                              |  1 +
 res/values/colors.xml                             |  4 ++--
 res/values/dimens.xml                             |  4 ++--
 res/values/styles.xml                             |  1 +
 .../launcher3/allapps/AllAppsContainerView.java   |  5 +----
 .../launcher3/allapps/FloatingHeaderView.java     | 10 +++++++---
 .../workprofile/PersonalWorkSlidingTabStrip.java  | 12 ++++++------
 10 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/res/drawable/all_apps_tabs_background.xml b/res/drawable/all_apps_tabs_background.xml
index 377b653781..f88252217e 100644
--- a/res/drawable/all_apps_tabs_background.xml
+++ b/res/drawable/all_apps_tabs_background.xml
@@ -13,9 +13,14 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<shape android:shape="rectangle"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
-    <solid android:color="?androidprv:attr/colorSurface" />
-    <corners android:radius="@dimen/all_apps_header_pill_corner_radius" />
-</shape>
\ No newline at end of file
+    <item
+        android:top="6dp"
+        android:bottom="6dp">
+        <shape android:shape="rectangle">
+            <solid android:color="?androidprv:attr/colorSurface" />
+            <corners android:radius="@dimen/all_apps_header_pill_corner_radius" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/res/layout/all_apps_personal_work_tabs.xml b/res/layout/all_apps_personal_work_tabs.xml
index f089f8356c..686dda81bd 100644
--- a/res/layout/all_apps_personal_work_tabs.xml
+++ b/res/layout/all_apps_personal_work_tabs.xml
@@ -16,11 +16,10 @@
 
 <com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/tabs"
-    android:layout_width="match_parent"
+    android:layout_width="@dimen/all_apps_header_pills_width"
     android:layout_height="@dimen/all_apps_header_pill_height"
+    android:layout_gravity="center_horizontal"
     android:background="@drawable/all_apps_tabs_background"
-    android:layout_marginLeft="@dimen/all_apps_tabs_side_padding"
-    android:layout_marginRight="@dimen/all_apps_tabs_side_padding"
     android:orientation="horizontal"
     android:elevation="2dp"
     style="@style/TextHeadline">
diff --git a/res/layout/secondary_launcher.xml b/res/layout/secondary_launcher.xml
index 94fcdb9727..b15a320bba 100644
--- a/res/layout/secondary_launcher.xml
+++ b/res/layout/secondary_launcher.xml
@@ -71,8 +71,6 @@
                 android:id="@+id/tabs"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/all_apps_header_pill_height"
-                android:layout_marginLeft="@dimen/all_apps_tabs_side_padding"
-                android:layout_marginRight="@dimen/all_apps_tabs_side_padding"
                 android:orientation="horizontal"
                 style="@style/TextHeadline">
 
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index e605ca8341..dc33ab8eac 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -19,6 +19,7 @@
 
     <!-- Attributes used for launcher theme -->
     <attr name="allAppsScrimColor" format="color" />
+    <attr name="allappsHeaderProtectionColor" format="color" />
     <attr name="allAppsNavBarScrimColor" format="color" />
     <attr name="allAppsTheme" format="reference" />
     <attr name="popupColorPrimary" format="color" />
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e6553a22bc..3d21311bd7 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -17,7 +17,8 @@
 ** limitations under the License.
 */
 -->
-<resources>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
     <!-- The color tints to apply to the text and drag view when hovering
          over the delete target or the info target -->
     <color name="delete_target_hover_tint">#FFC1C1C1</color>
@@ -58,5 +59,4 @@
 
     <color name="wallpaper_popup_scrim">?android:attr/colorAccent</color>
     <color name="wallpaper_scrim_color">#0D878787</color>
-
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 451f82ba20..bfa02c07d3 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -91,7 +91,7 @@
     <dimen name="all_apps_empty_search_bg_top_offset">144dp</dimen>
     <dimen name="all_apps_background_canvas_width">700dp</dimen>
     <dimen name="all_apps_background_canvas_height">475dp</dimen>
-    <dimen name="all_apps_header_pill_height">36dp</dimen>
+    <dimen name="all_apps_header_pill_height">48dp</dimen>
     <dimen name="all_apps_header_pill_corner_radius">18dp</dimen>
     <dimen name="all_apps_header_pills_width">320dp</dimen>
     <dimen name="all_apps_header_tab_height">48dp</dimen>
@@ -99,7 +99,7 @@
     <dimen name="all_apps_header_top_padding">36dp</dimen>
     <dimen name="all_apps_work_profile_tab_footer_top_padding">16dp</dimen>
     <dimen name="all_apps_work_profile_tab_footer_bottom_padding">20dp</dimen>
-    <dimen name="all_apps_tabs_side_padding">32dp</dimen>
+    <dimen name="all_apps_tabs_vertical_padding">6dp</dimen>
     <dimen name="all_apps_divider_height">1dp</dimen>
 
     <dimen name="all_apps_tip_bottom_margin">8dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6d22951209..14ec573f11 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -33,6 +33,7 @@
     <style name="LauncherTheme" parent="@style/BaseLauncherTheme">
         <item name="android:textColorSecondary">#DE000000</item>
         <item name="allAppsScrimColor">?android:attr/colorBackgroundFloating</item>
+        <item name="allappsHeaderProtectionColor">@color/popup_color_tertiary_light</item>
         <item name="allAppsNavBarScrimColor">#66FFFFFF</item>
         <item name="allAppsTheme">@style/AllAppsTheme</item>
         <item name="popupColorPrimary">@color/popup_color_primary_light</item>
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 9df95bffb0..18de49a218 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -127,7 +127,6 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
     private Rect mInsets = new Rect();
 
     private SearchAdapterProvider mSearchAdapterProvider;
-    private final int mHeaderTopPadding;
     private final int mScrimColor;
     private final int mHeaderProtectionColor;
     private final float mHeaderThreshold;
@@ -152,9 +151,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         mScrimColor = Themes.getAttrColor(context, R.attr.allAppsScrimColor);
         mHeaderThreshold = getResources().getDimensionPixelSize(
                 R.dimen.dynamic_grid_cell_border_spacing);
-        mHeaderTopPadding = context.getResources()
-                .getDimensionPixelSize(R.dimen.all_apps_header_top_padding);
-        mHeaderProtectionColor = context.getColor(R.color.all_apps_tab_bg);
+        mHeaderProtectionColor = Themes.getAttrColor(context, R.attr.allappsHeaderProtectionColor);
 
         mLauncher.addOnDeviceProfileChangeListener(this);
 
diff --git a/src/com/android/launcher3/allapps/FloatingHeaderView.java b/src/com/android/launcher3/allapps/FloatingHeaderView.java
index f55ab2502b..af7896ac24 100644
--- a/src/com/android/launcher3/allapps/FloatingHeaderView.java
+++ b/src/com/android/launcher3/allapps/FloatingHeaderView.java
@@ -52,6 +52,7 @@ public class FloatingHeaderView extends LinearLayout implements
 
     private final Rect mClip = new Rect(0, 0, Integer.MAX_VALUE, Integer.MAX_VALUE);
     private final ValueAnimator mAnimator = ValueAnimator.ofInt(0, 0);
+    private final ValueAnimator mHeaderAnimator = ValueAnimator.ofInt(0, 1).setDuration(100);
     private final Point mTempOffset = new Point();
     private final Paint mBGPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
     private final RecyclerView.OnScrollListener mOnScrollListener =
@@ -132,6 +133,7 @@ public class FloatingHeaderView extends LinearLayout implements
         }
         mFixedRows = rows.toArray(new FloatingHeaderRow[rows.size()]);
         mAllRows = mFixedRows;
+        mHeaderAnimator.addUpdateListener(valueAnimator -> invalidate());
     }
 
     @Override
@@ -268,7 +270,6 @@ public class FloatingHeaderView extends LinearLayout implements
                 }
             } else {
                 mHeaderCollapsed = false;
-                invalidate();
             }
             mTranslationY = currentScrollY;
         } else if (!mHeaderCollapsed) {
@@ -281,7 +282,8 @@ public class FloatingHeaderView extends LinearLayout implements
             } else if (mTranslationY <= -mMaxTranslation) { // hide or stay hidden
                 mHeaderCollapsed = true;
                 mSnappedScrolledY = -mMaxTranslation;
-                invalidate();
+                mHeaderAnimator.setCurrentFraction(0);
+                mHeaderAnimator.start();
             }
         }
     }
@@ -296,8 +298,10 @@ public class FloatingHeaderView extends LinearLayout implements
 
     @Override
     protected void dispatchDraw(Canvas canvas) {
-        if (mHeaderCollapsed && mHeaderColor != Color.TRANSPARENT) {
+        if (mHeaderCollapsed && mTabLayout.getVisibility() == VISIBLE
+                && mHeaderColor != Color.TRANSPARENT) {
             mBGPaint.setColor(mHeaderColor);
+            mBGPaint.setAlpha((int) (255 * mHeaderAnimator.getAnimatedFraction()));
             canvas.drawRect(0, 0, getWidth(), getHeight() + mTranslationY, mBGPaint);
         }
         super.dispatchDraw(canvas);
diff --git a/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java b/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
index 8039fd1ef5..c7cbde8d26 100644
--- a/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
+++ b/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
@@ -36,7 +36,7 @@ import com.android.launcher3.pageindicators.PageIndicator;
 public class PersonalWorkSlidingTabStrip extends LinearLayout implements PageIndicator {
     private final Paint mSelectedIndicatorPaint;
 
-    private int mSelectedIndicatorHeight;
+    private int mTabVerticalPadding;
     private final int mSelectedIndicatorRadius;
 
     private int mIndicatorLeft = -1;
@@ -52,8 +52,8 @@ public class PersonalWorkSlidingTabStrip extends LinearLayout implements PageInd
         super(context, attrs);
         setWillNotDraw(false);
 
-        mSelectedIndicatorHeight =
-                getResources().getDimensionPixelSize(R.dimen.all_apps_header_pill_height);
+        mTabVerticalPadding =
+                getResources().getDimensionPixelSize(R.dimen.all_apps_tabs_vertical_padding);
 
         mSelectedIndicatorRadius = getResources().getDimensionPixelSize(
                 R.dimen.all_apps_header_pill_corner_radius);
@@ -112,9 +112,9 @@ public class PersonalWorkSlidingTabStrip extends LinearLayout implements PageInd
     @Override
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
-        canvas.drawRoundRect(mIndicatorLeft, getHeight() - mSelectedIndicatorHeight,
-                mIndicatorRight, getHeight(), mSelectedIndicatorRadius, mSelectedIndicatorRadius,
-                mSelectedIndicatorPaint);
+        canvas.drawRoundRect(mIndicatorLeft, mTabVerticalPadding, mIndicatorRight,
+                getHeight() - mTabVerticalPadding, mSelectedIndicatorRadius,
+                mSelectedIndicatorRadius, mSelectedIndicatorPaint);
     }
 
     @Override
-- 
GitLab


From 0a044199ecc0a1a01e59ab9ad0ad6ffc23c2fe64 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Tue, 18 May 2021 23:10:48 +0000
Subject: [PATCH 1209/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I638f862f37915af69371535dd0792ae5d59c2c3b
---
 go/quickstep/res/values-as/strings.xml | 8 ++++++++
 go/quickstep/res/values-bn/strings.xml | 8 ++++++++
 go/quickstep/res/values-hi/strings.xml | 2 +-
 go/quickstep/res/values-it/strings.xml | 2 +-
 go/quickstep/res/values-ja/strings.xml | 8 ++++++++
 go/quickstep/res/values-kk/strings.xml | 2 +-
 go/quickstep/res/values-mr/strings.xml | 8 ++++++++
 go/quickstep/res/values-sq/strings.xml | 8 ++++++++
 go/quickstep/res/values-te/strings.xml | 8 ++++++++
 go/quickstep/res/values-uz/strings.xml | 2 +-
 10 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100644 go/quickstep/res/values-as/strings.xml
 create mode 100644 go/quickstep/res/values-bn/strings.xml
 create mode 100644 go/quickstep/res/values-ja/strings.xml
 create mode 100644 go/quickstep/res/values-mr/strings.xml
 create mode 100644 go/quickstep/res/values-sq/strings.xml
 create mode 100644 go/quickstep/res/values-te/strings.xml

diff --git a/go/quickstep/res/values-as/strings.xml b/go/quickstep/res/values-as/strings.xml
new file mode 100644
index 0000000000..a3b95c4851
--- /dev/null
+++ b/go/quickstep/res/values-as/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"এপ্‌ শ্বেয়াৰ কৰক"</string>
+    <string name="action_listen" msgid="2370304050784689486">"শুনক"</string>
+    <string name="action_translate" msgid="8028378961867277746">"অনুবাদ কৰক"</string>
+    <string name="action_search" msgid="6269564710943755464">"লেন্স"</string>
+</resources>
diff --git a/go/quickstep/res/values-bn/strings.xml b/go/quickstep/res/values-bn/strings.xml
new file mode 100644
index 0000000000..b5c8ec949d
--- /dev/null
+++ b/go/quickstep/res/values-bn/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"অ্যাপ শেয়ার করুন"</string>
+    <string name="action_listen" msgid="2370304050784689486">"শুনুন"</string>
+    <string name="action_translate" msgid="8028378961867277746">"অনুবাদ করুন"</string>
+    <string name="action_search" msgid="6269564710943755464">"লেন্স"</string>
+</resources>
diff --git a/go/quickstep/res/values-hi/strings.xml b/go/quickstep/res/values-hi/strings.xml
index e19001b54f..cdf83db358 100644
--- a/go/quickstep/res/values-hi/strings.xml
+++ b/go/quickstep/res/values-hi/strings.xml
@@ -4,5 +4,5 @@
     <string name="app_share_drop_target_label" msgid="5804774105974539508">"ऐप्लिकेशन शेयर करें"</string>
     <string name="action_listen" msgid="2370304050784689486">"सुनें"</string>
     <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
-    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="action_search" msgid="6269564710943755464">"Google Lens"</string>
 </resources>
diff --git a/go/quickstep/res/values-it/strings.xml b/go/quickstep/res/values-it/strings.xml
index 59ed75c488..485dcd6160 100644
--- a/go/quickstep/res/values-it/strings.xml
+++ b/go/quickstep/res/values-it/strings.xml
@@ -3,6 +3,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_share_drop_target_label" msgid="5804774105974539508">"Condividi l\'app"</string>
     <string name="action_listen" msgid="2370304050784689486">"Ascolta"</string>
-    <string name="action_translate" msgid="8028378961867277746">"Traduci"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Traduttore"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
 </resources>
diff --git a/go/quickstep/res/values-ja/strings.xml b/go/quickstep/res/values-ja/strings.xml
new file mode 100644
index 0000000000..f8cbbab7aa
--- /dev/null
+++ b/go/quickstep/res/values-ja/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"アプリを共有"</string>
+    <string name="action_listen" msgid="2370304050784689486">"聴く"</string>
+    <string name="action_translate" msgid="8028378961867277746">"翻訳"</string>
+    <string name="action_search" msgid="6269564710943755464">"レンズ"</string>
+</resources>
diff --git a/go/quickstep/res/values-kk/strings.xml b/go/quickstep/res/values-kk/strings.xml
index ed59c9c466..c897dd84e6 100644
--- a/go/quickstep/res/values-kk/strings.xml
+++ b/go/quickstep/res/values-kk/strings.xml
@@ -4,5 +4,5 @@
     <string name="app_share_drop_target_label" msgid="5804774105974539508">"Қолданбаны бөлісу"</string>
     <string name="action_listen" msgid="2370304050784689486">"Тыңдау"</string>
     <string name="action_translate" msgid="8028378961867277746">"Аудару"</string>
-    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="action_search" msgid="6269564710943755464">"Объектив"</string>
 </resources>
diff --git a/go/quickstep/res/values-mr/strings.xml b/go/quickstep/res/values-mr/strings.xml
new file mode 100644
index 0000000000..f1fb72a36a
--- /dev/null
+++ b/go/quickstep/res/values-mr/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"अ‍ॅप शेअर करा"</string>
+    <string name="action_listen" msgid="2370304050784689486">"ऐका"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-sq/strings.xml b/go/quickstep/res/values-sq/strings.xml
new file mode 100644
index 0000000000..56b6ec6c62
--- /dev/null
+++ b/go/quickstep/res/values-sq/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Ndaj aplikacionin"</string>
+    <string name="action_listen" msgid="2370304050784689486">"Dëgjo"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Përkthe"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lentja"</string>
+</resources>
diff --git a/go/quickstep/res/values-te/strings.xml b/go/quickstep/res/values-te/strings.xml
new file mode 100644
index 0000000000..2fb3b596f0
--- /dev/null
+++ b/go/quickstep/res/values-te/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"యాప్‌ను షేర్ చేయండి"</string>
+    <string name="action_listen" msgid="2370304050784689486">"వినండి"</string>
+    <string name="action_translate" msgid="8028378961867277746">"అనువదించండి"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
diff --git a/go/quickstep/res/values-uz/strings.xml b/go/quickstep/res/values-uz/strings.xml
index 4e375c7e71..bc751484d8 100644
--- a/go/quickstep/res/values-uz/strings.xml
+++ b/go/quickstep/res/values-uz/strings.xml
@@ -3,6 +3,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_share_drop_target_label" msgid="5804774105974539508">"Ilovani ulashish"</string>
     <string name="action_listen" msgid="2370304050784689486">"Tinglash"</string>
-    <string name="action_translate" msgid="8028378961867277746">"Tarjimon"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Tarjima"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
 </resources>
-- 
GitLab


From ea03e18d60b199c050b0c3c7fa748ff0dba79eaa Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Tue, 18 May 2021 23:11:51 +0000
Subject: [PATCH 1210/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I77968af0ca2fab25ec12108db6c4e84d19c0ccec
---
 res/values-as/strings.xml | 3 +--
 res/values-bn/strings.xml | 3 +--
 res/values-es/strings.xml | 6 +++---
 res/values-fr/strings.xml | 4 ++--
 res/values-gl/strings.xml | 2 +-
 res/values-ja/strings.xml | 3 +--
 res/values-mr/strings.xml | 3 +--
 res/values-sq/strings.xml | 3 +--
 res/values-te/strings.xml | 3 +--
 res/values-uz/strings.xml | 2 +-
 10 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 8e5558553f..8ff9e493b1 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"ফ’ল্ডাৰ: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> টা বস্তু"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ফ’ল্ডাৰ: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> টা অথবা তাতকৈ অধিক বস্তু"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"ৱালপেপাৰসমূহ"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"ৱালপেপাৰ আৰু শৈলী"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"গৃহ ছেটিং"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"আপোনাৰ প্ৰশাসকে অক্ষম কৰি ৰাখিছে"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"গৃহ স্ক্ৰীণ ঘূৰোৱাৰ অনুমতি দিয়ক"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 95b0b8df27..71b00eb647 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"ফোল্ডার: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g>টি আইটেম"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ফোল্ডার: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g>টি বা তার বেশি আইটেম"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"ওয়ালপেপারগুলি"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"ওয়ালপেপার এবং স্টাইল"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"হোম সেটিংস"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"আপনার প্রশাসক দ্বারা অক্ষম করা হয়েছে"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"হোম স্ক্রিন ঘোরানোর অনুমতি দিন"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 1448117e81..686d2240bf 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -35,8 +35,8 @@
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Mantén pulsado el widget para moverlo por la pantalla de inicio"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Añadir a la pantalla de inicio"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
-      <item quantity="other">Widgets: <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
-      <item quantity="one">Widget: <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g></item>
+      <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
+      <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
     </plurals>
     <plurals name="shortcuts_count" formatted="false" msgid="8080294865447938455">
       <item quantity="other">Accesos directos: <xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g></item>
@@ -97,7 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Carpeta: <xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="SIZE">%2$d</xliff:g> elementos)"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Carpeta: <xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="SIZE">%2$d</xliff:g> o más elementos)"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fondos de pantalla"</string>
-    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Fondo de pantalla y estilo"</string>
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Estilo y fondo de pantalla"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Ajustes de la pantalla de inicio"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Inhabilitado por el administrador"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Permitir rotación de la pantalla de inicio"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 49bc7fd8c0..90c98fbc6f 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -48,8 +48,8 @@
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Effacer le texte du champ de recherche"</string>
     <string name="no_widgets_available" msgid="9140948620298620513">"Aucun widget disponible"</string>
     <string name="no_search_results" msgid="6518732304311458580">"Aucun résultat de recherche"</string>
-    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Widgets personnels"</string>
-    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Widgets professionnels"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personnels"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Professionnels"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversations"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Rechercher dans les applications"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Chargement des applications…"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index ecbc9405ca..e4a93d421c 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -97,7 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Cartafol: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elementos"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Cartafol: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elementos ou máis"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fondos de pantalla"</string>
-    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Fondo de pantalla e estilo"</string>
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Estilo e fondo de pantalla"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Axustes de Inicio"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Función desactivada polo administrador"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Permitir xirar a pantalla de inicio"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index af588b86ba..7f2e4a9118 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"フォルダ: <xliff:g id="NAME">%1$s</xliff:g>、<xliff:g id="SIZE">%2$d</xliff:g> 件のアイテム"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"フォルダ: <xliff:g id="NAME">%1$s</xliff:g>、<xliff:g id="SIZE">%2$d</xliff:g> 件以上のアイテム"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"壁紙"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"壁紙とスタイル"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"ホームの設定"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"管理者により無効にされています"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"ホーム画面の回転を許可"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 01c132ffe0..e87e6b9fc7 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"फोल्डर: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> आयटम"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"फोल्डर: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> किंवा त्याहून अधिक आयटम"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"वॉलपेपर"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"वॉलपेपर आणि शैली"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"होम सेटिंग्‍ज"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"आपल्या प्रशासकाने अक्षम केले"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"मुख्य स्क्रीन फिरविण्‍यास अनुमती द्या"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 68ffed68f7..2528aed90e 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Dosja: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> artikuj"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Dosja: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ose më shumë artikuj"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Imazhet e sfondit"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Imazhi i sfondit dhe stili"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Cilësimet e ekranit bazë"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Çaktivizuar nga administratori"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Lejo rrotullimin e ekranit bazë"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 6b4094d32c..68c8039858 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"ఫోల్డర్: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ఐటెమ్‌లు"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ఫోల్డర్: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> లేదా అంతకంటే ఎక్కువ ఐటెమ్‌లు"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"వాల్‌పేపర్‌లు"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"వాల్‌పేపర్ &amp; స్టయిల్"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"హోమ్ సెట్టింగ్‌లు"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"మీ నిర్వాహకులు నిలిపివేసారు"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"హోమ్ స్క్రీన్ రొటేషన్‌ను అనుమతించండి"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 7f0ced4fb8..7328311e50 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -97,7 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Jild: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> fayllar"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Jild: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> va undan ortiq fayllar"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fon rasmlari"</string>
-    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Fon rasmi va stili"</string>
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Fon rasmi va uslubi"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Bosh ekran sozlamalari"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Administrator tomonidan o‘chirilgan"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Bosh ekranni burishga ruxsat"</string>
-- 
GitLab


From 719154dc1bfc2b717042001945f9e147e8a72722 Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Tue, 18 May 2021 23:03:59 -0700
Subject: [PATCH 1211/1664] Don't set enabled on TaskMenu view if shortcut not
 available

Bug: 188195640
Test: No crash when opening tasks when SPLIT_SELECT flag on.
Change-Id: I8f27e311cbb03ea37dcbd63d209b6652f02074af
---
 quickstep/src/com/android/quickstep/TaskShortcutFactory.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
index c06e9a90fa..4ec1c15f4d 100644
--- a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
@@ -231,7 +231,7 @@ public interface TaskShortcutFactory {
         @Override
         public SystemShortcut getShortcut(BaseDraggingActivity activity, TaskView taskView) {
             SystemShortcut shortcut = super.getShortcut(activity, taskView);
-            if (FeatureFlags.ENABLE_SPLIT_SELECT.get()) {
+            if (shortcut != null && FeatureFlags.ENABLE_SPLIT_SELECT.get()) {
                 // Disable if there's only one recent app for split screen
                 shortcut.setEnabled(taskView.getRecentsView().getTaskViewCount() > 1);
             }
-- 
GitLab


From 66034efaaed742c798016bd55a5d9292d87fdeff Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Tue, 18 May 2021 18:52:13 +0100
Subject: [PATCH 1212/1664] Clear widgets search bar focus when the user taps
 outside the search bar

Test: Focus widgets search bar. Then tap outside the search bar and
      observe the keyboard is being dismissed.
Bug: 188540267
Change-Id: Ica1b5b804ed97dd0b1cd8d41351eddcf5249ded0
---
 .../widget/picker/WidgetsListAdapterTest.java |  2 +-
 ...WidgetsListHeaderViewHolderBinderTest.java |  3 +--
 ...sListSearchHeaderViewHolderBinderTest.java |  3 +--
 .../WidgetsListTableViewHolderBinderTest.java |  3 +--
 .../widget/picker/WidgetsFullSheet.java       | 19 ++++++-------
 .../widget/picker/WidgetsListAdapter.java     |  9 +------
 .../search/LauncherWidgetsSearchBar.java      |  5 ++++
 .../picker/search/WidgetsSearchBar.java       |  3 +++
 .../search/WidgetsSearchBarUIHelper.java      | 27 -------------------
 9 files changed, 21 insertions(+), 53 deletions(-)
 delete mode 100644 src/com/android/launcher3/widget/picker/search/WidgetsSearchBarUIHelper.java

diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java
index 6b5678cb8a..e1214ff39f 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java
@@ -82,7 +82,7 @@ public final class WidgetsListAdapterTest {
         mTestProfile.numColumns = 5;
         mUserHandle = Process.myUserHandle();
         mAdapter = new WidgetsListAdapter(mContext, mMockLayoutInflater, mMockWidgetCache,
-                mIconCache, null, null, null);
+                mIconCache, null, null);
         mAdapter.registerAdapterDataObserver(mListener);
 
         doAnswer(invocation -> ((ComponentWithLabel) invocation.getArgument(0))
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java
index 12a092dafe..84a03d572c 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java
@@ -105,8 +105,7 @@ public final class WidgetsListHeaderViewHolderBinderTest {
                 mWidgetPreviewLoader,
                 mIconCache,
                 /* iconClickListener= */ view -> {},
-                /* iconLongClickListener= */ view -> false,
-                /* searchBarUIHelper= */ null);
+                /* iconLongClickListener= */ view -> false);
         mViewHolderBinder = new WidgetsListHeaderViewHolderBinder(
                 LayoutInflater.from(mTestActivity), mOnHeaderClickListener, widgetsListAdapter);
     }
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinderTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinderTest.java
index e09034132c..075c58db6b 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinderTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinderTest.java
@@ -105,8 +105,7 @@ public final class WidgetsListSearchHeaderViewHolderBinderTest {
                 mWidgetPreviewLoader,
                 mIconCache,
                 /* iconClickListener= */ view -> {},
-                /* iconLongClickListener= */ view -> false,
-                /* searchBarUIHelper= */ null);
+                /* iconLongClickListener= */ view -> false);
         mViewHolderBinder = new WidgetsListSearchHeaderViewHolderBinder(
                 LayoutInflater.from(mTestActivity), mOnHeaderClickListener, widgetsListAdapter);
     }
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java
index 0935d1cfc4..0c6e71711d 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java
@@ -111,8 +111,7 @@ public final class WidgetsListTableViewHolderBinderTest {
                 mWidgetPreviewLoader,
                 mIconCache,
                 /* iconClickListener= */ view -> {},
-                /* iconLongClickListener= */ view -> false,
-                /* searchBarUIHelper= */ null);
+                /* iconLongClickListener= */ view -> false);
         mViewHolderBinder = new WidgetsListTableViewHolderBinder(
                 mContext,
                 LayoutInflater.from(mTestActivity),
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index e44acc363b..121df961df 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -61,7 +61,6 @@ import com.android.launcher3.widget.LauncherAppWidgetHost.ProviderChangedListene
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 import com.android.launcher3.widget.picker.search.SearchModeListener;
 import com.android.launcher3.widget.picker.search.WidgetsSearchBar;
-import com.android.launcher3.widget.picker.search.WidgetsSearchBarUIHelper;
 import com.android.launcher3.widget.util.WidgetsTableUtils;
 import com.android.launcher3.workprofile.PersonalWorkPagedView;
 import com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip.OnActivePageChangedListener;
@@ -76,8 +75,7 @@ import java.util.stream.IntStream;
  */
 public class WidgetsFullSheet extends BaseWidgetSheet
         implements Insettable, ProviderChangedListener, OnActivePageChangedListener,
-        WidgetsRecyclerView.HeaderViewDimensionsProvider, SearchModeListener,
-        WidgetsSearchBarUIHelper {
+        WidgetsRecyclerView.HeaderViewDimensionsProvider, SearchModeListener {
     private static final String TAG = WidgetsFullSheet.class.getSimpleName();
 
     private static final long DEFAULT_OPEN_DURATION = 267;
@@ -535,6 +533,12 @@ public class WidgetsFullSheet extends BaseWidgetSheet
             } else if (getPopupContainer().isEventOverView(mContent, ev)) {
                 mNoIntercept = !getRecyclerView().shouldContainerScroll(ev, getPopupContainer());
             }
+
+            if (mSearchAndRecommendationViewHolder.mSearchBar.isSearchBarFocused()
+                    && !getPopupContainer().isEventOverView(
+                            mSearchAndRecommendationViewHolder.mSearchBarContainer, ev)) {
+                mSearchAndRecommendationViewHolder.mSearchBar.clearSearchBarFocus();
+            }
         }
         return super.onControllerInterceptTouchEvent(ev);
     }
@@ -609,11 +613,6 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         getWindowInsetsController().hide(WindowInsets.Type.ime());
     }
 
-    @Override
-    public void clearSearchBarFocus() {
-        mSearchAndRecommendationViewHolder.mSearchBar.clearSearchBarFocus();
-    }
-
     private void showEducationTipOnView(View view) {
         mActivityContext.getSharedPrefs().edit()
                 .putBoolean(WIDGETS_EDUCATION_TIP_SEEN, true).apply();
@@ -681,9 +680,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
                     apps.getWidgetCache(),
                     apps.getIconCache(),
                     /* iconClickListener= */ WidgetsFullSheet.this,
-                    /* iconLongClickListener= */ WidgetsFullSheet.this,
-                    /* WidgetsSearchBarUIHelper= */
-                    mAdapterType == SEARCH ? WidgetsFullSheet.this : null);
+                    /* iconLongClickListener= */ WidgetsFullSheet.this);
             mWidgetsListAdapter.setHasStableIds(true);
             switch (mAdapterType) {
                 case PRIMARY:
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
index 0504e74695..c0981abbd9 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
@@ -41,7 +41,6 @@ import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 import com.android.launcher3.widget.model.WidgetsListContentEntry;
 import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
 import com.android.launcher3.widget.model.WidgetsListSearchHeaderEntry;
-import com.android.launcher3.widget.picker.search.WidgetsSearchBarUIHelper;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -70,7 +69,6 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
     private static final int VIEW_TYPE_WIDGETS_HEADER = R.id.view_type_widgets_header;
     private static final int VIEW_TYPE_WIDGETS_SEARCH_HEADER = R.id.view_type_widgets_search_header;
 
-    @Nullable private final WidgetsSearchBarUIHelper mSearchBarUIHelper;
     private final WidgetsDiffReporter mDiffReporter;
     private final SparseArray<ViewHolderBinder> mViewHolderBinders = new SparseArray<>();
     private final WidgetsListTableViewHolderBinder mWidgetsListTableViewHolderBinder;
@@ -90,9 +88,7 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
 
     public WidgetsListAdapter(Context context, LayoutInflater layoutInflater,
             WidgetPreviewLoader widgetPreviewLoader, IconCache iconCache,
-            OnClickListener iconClickListener, OnLongClickListener iconLongClickListener,
-            @Nullable WidgetsSearchBarUIHelper searchBarUIHelper) {
-        mSearchBarUIHelper = searchBarUIHelper;
+            OnClickListener iconClickListener, OnLongClickListener iconLongClickListener) {
         mDiffReporter = new WidgetsDiffReporter(iconCache, this);
         mWidgetsListTableViewHolderBinder = new WidgetsListTableViewHolderBinder(context,
                 layoutInflater, iconClickListener, iconLongClickListener,
@@ -243,9 +239,6 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
 
     @Override
     public void onHeaderClicked(boolean showWidgets, PackageUserKey packageUserKey) {
-        if (mSearchBarUIHelper != null) {
-            mSearchBarUIHelper.clearSearchBarFocus();
-        }
         if (showWidgets) {
             mWidgetsContentVisiblePackageUserKey = packageUserKey;
             updateVisibleEntries();
diff --git a/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java b/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java
index 42f1bb2d21..65937b644a 100644
--- a/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java
+++ b/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java
@@ -75,6 +75,11 @@ public class LauncherWidgetsSearchBar extends LinearLayout implements WidgetsSea
         mController.onDestroy();
     }
 
+    @Override
+    public boolean isSearchBarFocused() {
+        return mEditText.isFocused();
+    }
+
     @Override
     public void clearSearchBarFocus() {
         mController.clearFocus();
diff --git a/src/com/android/launcher3/widget/picker/search/WidgetsSearchBar.java b/src/com/android/launcher3/widget/picker/search/WidgetsSearchBar.java
index 0ac47ce5f2..44a5e80f5e 100644
--- a/src/com/android/launcher3/widget/picker/search/WidgetsSearchBar.java
+++ b/src/com/android/launcher3/widget/picker/search/WidgetsSearchBar.java
@@ -32,6 +32,9 @@ public interface WidgetsSearchBar {
      */
     void reset();
 
+    /** Returns {@code true} if the search bar is in focus. */
+    boolean isSearchBarFocused();
+
     /**
      * Clears focus from search bar.
      */
diff --git a/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarUIHelper.java b/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarUIHelper.java
deleted file mode 100644
index edfdc655ed..0000000000
--- a/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarUIHelper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.widget.picker.search;
-
-/**
- * UI helper for {@link WidgetsSearchBar}.
- */
-public interface WidgetsSearchBarUIHelper {
-    /**
-     * Clears focus from the search bar.
-     */
-    void clearSearchBarFocus();
-}
-- 
GitLab


From 1bcb9d94ce036f85a6e6657fb8b51c400ec5a531 Mon Sep 17 00:00:00 2001
From: wilsonshih <wilsonshih@google.com>
Date: Tue, 18 May 2021 17:04:01 +0800
Subject: [PATCH 1213/1664] Read the starting surface icon size from framework

Bug: 177264697
Test: Manual verify icon size on splash screen.
Change-Id: Iec6b0c519cf4692ac6851911ed1e21a3c1b752b4
---
 .../com/android/launcher3/QuickstepTransitionManager.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 80754a00f4..0ac0223d91 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -1340,14 +1340,14 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
 
             iconAlphaStart = hasSplashScreen ? 0 : 1f;
 
-            // TOOD: Share value from shell when available.
-            final float windowIconSize = Utilities.pxFromSp(108, r.getDisplayMetrics());
+            final int windowIconSize = ResourceUtils.getDimenByName("starting_surface_icon_size",
+                    r, 108);
 
             cropCenterXStart = windowTargetBounds.centerX();
             cropCenterYStart = windowTargetBounds.centerY();
 
-            cropWidthStart = (int) windowIconSize;
-            cropHeightStart = (int) windowIconSize;
+            cropWidthStart = windowIconSize;
+            cropHeightStart = windowIconSize;
 
             cropWidthEnd = windowTargetBounds.width();
             cropHeightEnd = windowTargetBounds.height();
-- 
GitLab


From e3104682fb626eb44ec89b7cdb063f2ac71c4103 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Tue, 18 May 2021 11:14:14 -0700
Subject: [PATCH 1214/1664] Folder polish

- Update folder hint text to ensure enough contrast.
- Clamp down on alpha when animating to local color extraction
- Update colors to new spec.

Bug: 179209484
Bug: 175329686
Test: manual
Change-Id: I9471504e10f02630ae13b2c478ced1ee05bd5220
---
 res/values-v31/colors.xml                     |  3 ++
 res/values/colors.xml                         |  3 ++
 res/values/styles.xml                         |  8 +++-
 .../launcher3/AbstractFloatingView.java       | 10 -----
 src/com/android/launcher3/folder/Folder.java  | 39 +++++++++++++++----
 .../launcher3/widget/LocalColorExtractor.java | 20 ----------
 6 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/res/values-v31/colors.xml b/res/values-v31/colors.xml
index 5ade64cb28..7b37001ade 100644
--- a/res/values-v31/colors.xml
+++ b/res/values-v31/colors.xml
@@ -28,6 +28,9 @@
     <color name="workspace_text_color_light">@android:color/system_neutral1_0</color>
     <color name="workspace_text_color_dark">@android:color/system_neutral1_1000</color>
 
+    <color name="folder_hint_text_color_light">@android:color/system_neutral1_50</color>
+    <color name="folder_hint_text_color_dark">@android:color/system_neutral2_700</color>
+
     <color name="text_color_primary_dark">@android:color/system_neutral1_50</color>
     <color name="text_color_secondary_dark">@android:color/system_neutral2_200</color>
     <color name="text_color_tertiary_dark">@android:color/system_neutral2_400</color>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e6553a22bc..ae55485fb7 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -52,6 +52,9 @@
     <color name="workspace_text_color_light">#FFF</color>
     <color name="workspace_text_color_dark">#FF000000</color>
 
+    <color name="folder_hint_text_color_light">#FFF</color>
+    <color name="folder_hint_text_color_dark">#FF000000</color>
+
     <color name="text_color_primary_dark">#FFFFFFFF</color>
     <color name="text_color_secondary_dark">#FFFFFFFF</color>
     <color name="text_color_tertiary_dark">#CCFFFFFF</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6d22951209..c668b0ccec 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -51,7 +51,7 @@
         <item name="folderIconBorderColor">?android:attr/colorPrimary</item>
         <item name="folderTextColor">?android:attr/textColorPrimary</item>
         <item name="isFolderDarkText">true</item>
-        <item name="folderHintColor">#89616161</item>
+        <item name="folderHintColor">@color/folder_hint_text_color_dark</item>
         <item name="loadingIconColor">#CCFFFFFF</item>
         <item name="iconOnlyShortcutColor">?android:attr/textColorSecondary</item>
         <item name="workProfileOverlayTextColor">#FF212121</item>
@@ -73,6 +73,7 @@
         <item name="folderFillColor">#FF3C4043</item> <!-- 100% GM2 800 -->
         <item name="folderTextColor">?attr/workspaceTextColor</item>
         <item name="isFolderDarkText">?attr/isWorkspaceDarkText</item>
+        <item name="folderHintColor">@color/folder_hint_text_color_dark</item>
         <item name="disabledIconAlpha">.254</item>
 
     </style>
@@ -89,6 +90,7 @@
         <item name="folderIconBorderColor">#FF80868B</item>
         <item name="folderTextColor">?attr/workspaceTextColor</item>
         <item name="isFolderDarkText">true</item>
+        <item name="folderHintColor">@color/folder_hint_text_color_dark</item>
     </style>
 
     <style name="LauncherTheme.Dark" parent="@style/LauncherTheme">
@@ -110,7 +112,7 @@
         <item name="folderIconBorderColor">?android:attr/colorPrimary</item>
         <item name="folderTextColor">?android:attr/textColorPrimary</item>
         <item name="isFolderDarkText">false</item>
-        <item name="folderHintColor">#89CCCCCC</item>
+        <item name="folderHintColor">@color/folder_hint_text_color_light</item>
         <item name="isMainColorDark">true</item>
         <item name="loadingIconColor">#99FFFFFF</item>
         <item name="iconOnlyShortcutColor">#B3FFFFFF</item>
@@ -123,6 +125,7 @@
         <item name="folderFillColor">#FF3C4043</item> <!-- 100% GM2 800 -->
         <item name="folderTextColor">@android:color/white</item>
         <item name="isFolderDarkText">false</item>
+        <item name="folderHintColor">@color/folder_hint_text_color_light</item>
         <item name="disabledIconAlpha">.54</item>
     </style>
 
@@ -131,6 +134,7 @@
         <item name="folderFillColor">#CDFFFFFF</item>
         <item name="folderTextColor">?attr/workspaceTextColor</item>
         <item name="isFolderDarkText">?attr/isWorkspaceDarkText</item>
+        <item name="folderHintColor">@color/folder_hint_text_color_dark</item>
         <item name="workspaceTextColor">@color/workspace_text_color_dark</item>
         <item name="workspaceShadowColor">@android:color/transparent</item>
         <item name="workspaceAmbientShadowColor">@android:color/transparent</item>
diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java
index b3952ca1bc..910094769a 100644
--- a/src/com/android/launcher3/AbstractFloatingView.java
+++ b/src/com/android/launcher3/AbstractFloatingView.java
@@ -39,7 +39,6 @@ import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.util.TouchController;
 import com.android.launcher3.views.ActivityContext;
 import com.android.launcher3.views.BaseDragLayer;
-import com.android.launcher3.widget.LocalColorExtractor;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -112,21 +111,12 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
 
     protected boolean mIsOpen;
 
-    // Index used to get background color when using local wallpaper color extraction.
-    protected int mColorExtractionIndex;
-
     public AbstractFloatingView(Context context, AttributeSet attrs) {
         super(context, attrs);
-        init(context);
     }
 
     public AbstractFloatingView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        init(context);
-    }
-
-    private void init(Context context) {
-        mColorExtractionIndex = LocalColorExtractor.getColorIndex(context);
     }
 
     /**
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index f5a8ef6f1d..e3876278b2 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -32,8 +32,10 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
 import android.appwidget.AppWidgetHostView;
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.graphics.Canvas;
 import android.graphics.Insets;
 import android.graphics.Path;
@@ -65,6 +67,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
+import androidx.core.graphics.ColorUtils;
 
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.Alarm;
@@ -157,13 +160,18 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
     private static final float ICON_OVERSCROLL_WIDTH_FACTOR = 0.45f;
 
     private static final int FOLDER_NAME_ANIMATION_DURATION = 633;
-    private static final int FOLDER_COLOR_ANIMATION_DURATION = 150;
+    private static final int FOLDER_COLOR_ANIMATION_DURATION = 200;
 
     private static final int REORDER_DELAY = 250;
     private static final int ON_EXIT_CLOSE_DELAY = 400;
     private static final Rect sTempRect = new Rect();
     private static final int MIN_FOLDERS_FOR_HARDWARE_OPTIMIZATION = 10;
 
+    // Index used to get background color when using local wallpaper color extraction,
+    private static final int DARK_COLOR_EXTRACTION_INDEX = android.R.color.system_neutral1_900;
+    private static final int LIGHT_COLOR_EXTRACTION_INDEX = android.R.color.system_neutral2_500;
+    private static final int LIGHT_COLOR_L_STAR = 98;
+
     private final Alarm mReorderAlarm = new Alarm();
     private final Alarm mOnExitAlarm = new Alarm();
     private final Alarm mOnScrollHintAlarm = new Alarm();
@@ -296,8 +304,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         }
 
         if (Utilities.ATLEAST_S) {
-            mColorExtractionIndex = LocalColorExtractor.getColorIndex(
-                    !Themes.getAttrBoolean(getContext(), R.attr.isFolderDarkText));
+            boolean isFolderDarkText = Themes.getAttrBoolean(getContext(), R.attr.isFolderDarkText);
             mColorExtractor = LocalColorExtractor.newInstance(getContext());
             mColorListener = (RectF rect, SparseIntArray extractedColors) -> {
                 mColorChangeRunnable = () -> {
@@ -313,11 +320,14 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
                         mOpenAnimationColorChangeAnimator = null;
                     }
 
-                    // Start a new animator to the extracted color.
-                    int newColor = extractedColors.get(mColorExtractionIndex);
+                    // Start a new animator to the extracted color. Clamp down on the alpha
+                    // to prevent folder from being transparent for too long.
                     GradientDrawable bg = (GradientDrawable) getBackground();
-                    mColorChangeAnimator = ObjectAnimator.ofArgb(bg, "color",
-                            bg.getColor().getDefaultColor(), newColor).setDuration(duration);
+                    int currentColor = ColorUtils.setAlphaComponent(bg.getColor().getDefaultColor(),
+                            255);
+                    int newColor = getExtractedColor(extractedColors, isFolderDarkText);
+                    mColorChangeAnimator = ObjectAnimator.ofArgb(bg, "color", currentColor,
+                            newColor).setDuration(duration);
                     mColorChangeAnimator.addListener(new AnimatorListenerAdapter() {
                         @Override
                         public void onAnimationEnd(Animator animation) {
@@ -337,6 +347,21 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         }
     }
 
+    /**
+     * Returns an index used to query the color of interest from the list of extracted colors.
+     * @param hasDarkText True when dark index is wanted, False when light index is wanted.
+     */
+    @TargetApi(Build.VERSION_CODES.S)
+    private int getExtractedColor(SparseIntArray colors, boolean hasDarkText) {
+        int color = colors.get(hasDarkText
+                ? LIGHT_COLOR_EXTRACTION_INDEX
+                : DARK_COLOR_EXTRACTION_INDEX);
+        if (hasDarkText) {
+            color = ColorStateList.valueOf(color).withLStar(LIGHT_COLOR_L_STAR).getDefaultColor();
+        }
+        return color;
+    }
+
     public boolean onLongClick(View v) {
         // Return if global dragging is not enabled
         if (!mLauncherDelegate.isDraggingEnabled()) return true;
diff --git a/src/com/android/launcher3/widget/LocalColorExtractor.java b/src/com/android/launcher3/widget/LocalColorExtractor.java
index e479b7d049..8ae6b2e435 100644
--- a/src/com/android/launcher3/widget/LocalColorExtractor.java
+++ b/src/com/android/launcher3/widget/LocalColorExtractor.java
@@ -28,7 +28,6 @@ import androidx.annotation.Nullable;
 
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
 import com.android.launcher3.util.ResourceBasedOverride;
 
 import java.util.List;
@@ -36,10 +35,6 @@ import java.util.List;
 /** Extracts the colors we need from the wallpaper at given locations. */
 public class LocalColorExtractor implements ResourceBasedOverride {
 
-    // Index used to get background color when using local wallpaper color extraction,
-    private static final int LIGHT_COLOR_EXTRACTION_INDEX = android.R.color.system_accent2_50;
-    private static final int DARK_COLOR_EXTRACTION_INDEX = android.R.color.system_accent2_800;
-
     /** Listener for color changes on a screen location. */
     public interface Listener {
         /**
@@ -108,19 +103,4 @@ public class LocalColorExtractor implements ResourceBasedOverride {
             RectF colorExtractionRectOut) {
         // no-op
     }
-
-    /**
-     * Returns an index used to query the color of interest from the list of extracted colors.
-     */
-    public static int getColorIndex(Context context) {
-        return getColorIndex(Utilities.isDarkTheme(context));
-    }
-
-    /**
-     * Returns an index used to query the color of interest from the list of extracted colors.
-     * @param getDarkIndex True when dark index is wanted, False when light index is wanted.
-     */
-    public static int getColorIndex(boolean getDarkIndex) {
-        return getDarkIndex ? DARK_COLOR_EXTRACTION_INDEX : LIGHT_COLOR_EXTRACTION_INDEX;
-    }
 }
-- 
GitLab


From 1a55d1ff37b7237fc2bbd8a848470eda5e9bbbed Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Tue, 18 May 2021 17:18:07 +0100
Subject: [PATCH 1215/1664] Widgets: Only reset expanded item & scroll to top
 if the user switch tab

Test: Open widgets picker, then adb install an app that has widget.
      Observe the newly installed app widget is shown and the widgets
      picker doesn't scroll itself back to top.
Bug: 188425375
Change-Id: I7ac29f08b06d528ef64e902e678a67e56971c681
---
 .../launcher3/widget/picker/WidgetsFullSheet.java   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index e44acc363b..bfdddebcf9 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -130,6 +130,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
     private final int mTabsHeight;
     private final int mWidgetCellHorizontalPadding;
 
+    @Nullable private WidgetsRecyclerView mCurrentWidgetsRecyclerView;
     @Nullable private PersonalWorkPagedView mViewPager;
     private boolean mIsInSearchMode;
     private int mMaxSpansPerRow = 4;
@@ -222,13 +223,18 @@ public class WidgetsFullSheet extends BaseWidgetSheet
 
         updateRecyclerViewVisibility(currentAdapterHolder);
         attachScrollbarToRecyclerView(currentRecyclerView);
-        resetExpandedHeaders();
     }
 
     private void attachScrollbarToRecyclerView(WidgetsRecyclerView recyclerView) {
         recyclerView.bindFastScrollbar();
-        mSearchAndRecommendationsScrollController.setCurrentRecyclerView(recyclerView);
-        reset();
+        if (mCurrentWidgetsRecyclerView != recyclerView) {
+            // Only reset the scroll position & expanded apps if the currently shown recycler view
+            // has been updated.
+            reset();
+            resetExpandedHeaders();
+            mCurrentWidgetsRecyclerView = recyclerView;
+            mSearchAndRecommendationsScrollController.setCurrentRecyclerView(recyclerView);
+        }
     }
 
     private void updateRecyclerViewVisibility(AdapterHolder adapterHolder) {
@@ -413,7 +419,6 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         if (mIsInSearchMode) return;
         setViewVisibilityBasedOnSearch(/*isInSearchMode= */ true);
         attachScrollbarToRecyclerView(mAdapters.get(AdapterHolder.SEARCH).mWidgetsRecyclerView);
-        resetExpandedHeaders();
     }
 
     @Override
-- 
GitLab


From 2f2cbce8186a8a15f55b522f36a0ce1ff740f848 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Tue, 18 May 2021 20:54:18 +0100
Subject: [PATCH 1216/1664] Reset visible entries when the app tile of the same
 app no longer match

Test: Switch language and then go to full widgets picker. Expand apps.
      Expanded entry is shown underneath the expanded app.
Bug: 187529983
Change-Id: Ib438cf01656d3a177309e7f22796d0fa0c11881f
---
 .../widget/picker/WidgetsListAdapter.java     | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
index 0504e74695..8345a0eaec 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
@@ -33,6 +33,7 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 import com.android.launcher3.R;
 import com.android.launcher3.WidgetPreviewLoader;
 import com.android.launcher3.icons.IconCache;
+import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.recyclerview.ViewHolderBinder;
 import com.android.launcher3.util.LabelComparator;
 import com.android.launcher3.util.PackageUserKey;
@@ -47,6 +48,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
@@ -153,6 +155,9 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
     public void setWidgets(List<WidgetsListBaseEntry> tempEntries) {
         mAllEntries = tempEntries.stream().sorted(mRowComparator)
                 .collect(Collectors.toList());
+        if (shouldClearVisibleEntries()) {
+            mVisibleEntries.clear();
+        }
         updateVisibleEntries();
     }
 
@@ -272,6 +277,30 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
         mWidgetsListTableViewHolderBinder.setMaxSpansPerRow(maxHorizontalSpans);
     }
 
+    /**
+     * Returns {@code true} if there is a change in {@link #mAllEntries} that results in an
+     * invalidation of {@link #mVisibleEntries}. e.g. there is change in the device language.
+     */
+    private boolean shouldClearVisibleEntries() {
+        Map<PackageUserKey, PackageItemInfo> packagesInfo =
+                mAllEntries.stream()
+                        .filter(entry -> entry instanceof WidgetsListHeaderEntry)
+                        .map(entry -> entry.mPkgItem)
+                        .collect(Collectors.toMap(
+                                entry -> new PackageUserKey(entry.packageName, entry.user),
+                                entry -> entry));
+        for (WidgetsListBaseEntry visibleEntry: mVisibleEntries) {
+            PackageUserKey key = new PackageUserKey(visibleEntry.mPkgItem.packageName,
+                    visibleEntry.mPkgItem.user);
+            PackageItemInfo packageItemInfo = packagesInfo.get(key);
+            if (packageItemInfo != null
+                    && !visibleEntry.mPkgItem.title.equals(packageItemInfo.title)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /** Comparator for sorting WidgetListRowEntry based on package title. */
     public static class WidgetListBaseRowEntryComparator implements
             Comparator<WidgetsListBaseEntry> {
-- 
GitLab


From 427c143ef61704c072ccd876192b3b5dd711e062 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 19 May 2021 14:30:47 +0100
Subject: [PATCH 1217/1664] Fix WidgetsSearchBarControllerTest

Test: Run WidgetsSearchBarControllerTest
Bug: 188650001
Change-Id: I687d602f8d857061f71a8fba86c30ea3017065c1
---
 .../launcher3/testing/TestActivity.java       |  7 +++-
 .../WidgetsSearchBarControllerTest.java       | 32 ++++++++++++++-----
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/robolectric_tests/src/com/android/launcher3/testing/TestActivity.java b/robolectric_tests/src/com/android/launcher3/testing/TestActivity.java
index dbf4b3e6c0..17d0ac1a9f 100644
--- a/robolectric_tests/src/com/android/launcher3/testing/TestActivity.java
+++ b/robolectric_tests/src/com/android/launcher3/testing/TestActivity.java
@@ -27,7 +27,12 @@ public class TestActivity extends BaseActivity implements ActivityContext {
 
     @Override
     public BaseDragLayer getDragLayer() {
-        return null;
+        return new BaseDragLayer(this, /* attrs= */ null, /* alphaChannelCount= */ 1) {
+            @Override
+            public void recreateControllers() {
+                // Do nothing.
+            }
+        };
     }
 
     @Override
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarControllerTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarControllerTest.java
index 4e6f17c384..a057a84d06 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarControllerTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarControllerTest.java
@@ -19,24 +19,27 @@ package com.android.launcher3.widget.picker.search;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
-import android.content.Context;
 import android.view.View;
 import android.widget.ImageButton;
 
 import com.android.launcher3.ExtendedEditText;
 import com.android.launcher3.search.SearchAlgorithm;
+import com.android.launcher3.testing.TestActivity;
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.android.controller.ActivityController;
 
 import java.util.ArrayList;
 
@@ -44,7 +47,9 @@ import java.util.ArrayList;
 public class WidgetsSearchBarControllerTest {
 
     private WidgetsSearchBarController mController;
-    private Context mContext;
+    // TODO: Replace ActivityController with ActivityScenario, which is the recommended way for
+    // activity testing.
+    private ActivityController<TestActivity> mActivityController;
     private ExtendedEditText mEditText;
     private ImageButton mCancelButton;
     @Mock
@@ -55,13 +60,20 @@ public class WidgetsSearchBarControllerTest {
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mEditText = new ExtendedEditText(mContext);
-        mCancelButton = new ImageButton(mContext);
+        mActivityController = Robolectric.buildActivity(TestActivity.class);
+        TestActivity testActivity = mActivityController.setup().get();
+
+        mEditText = new ExtendedEditText(testActivity);
+        mCancelButton = new ImageButton(testActivity);
         mController = new WidgetsSearchBarController(
                 mSearchAlgorithm, mEditText, mCancelButton, mSearchModeListener);
     }
 
+    @After
+    public void tearDown() {
+        mActivityController.destroy();
+    }
+
     @Test
     public void onSearchResult_shouldInformSearchModeListener() {
         ArrayList<WidgetsListBaseEntry> entries = new ArrayList<>();
@@ -119,14 +131,18 @@ public class WidgetsSearchBarControllerTest {
     public void cancelSearch_shouldInformSearchModeListenerToClearResultsAndExitSearch() {
         mCancelButton.performClick();
 
-        verify(mSearchModeListener).exitSearchMode();
+        // 1 time explicitly from the cancel button on click listener.
+        // Another from the setText("") the cancel button on click listener causing afterTextChange.
+        verify(mSearchModeListener, times(2)).exitSearchMode();
     }
 
     @Test
     public void cancelSearch_shouldCancelSearch() {
         mCancelButton.performClick();
 
-        verify(mSearchAlgorithm).cancel(true);
+        // 1 time explicitly from the cancel button on click listener.
+        // Another from the setText("") the cancel button on click listener causing afterTextChange.
+        verify(mSearchAlgorithm, times(2)).cancel(true);
         verifyNoMoreInteractions(mSearchAlgorithm);
     }
 
-- 
GitLab


From 3e19e57d22e7bcc2ffcb21bfd50445d87362942c Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Wed, 19 May 2021 09:01:38 -0700
Subject: [PATCH 1218/1664] Remove shadows from app launch animation

The Material You style proposes a flat model without shadows.

This will also help us reduce overdraw because shadows are drawn in
client composition, causing an almost full screen redraw, given that
shadows have the size of the window, which is not usually marked as
opaque.

Bug: 188420494
Test: manual
Change-Id: I5073788a247ea9084b8e3399d4ca8618c21b8d6b
---
 quickstep/res/values/dimens.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index c45947205f..dfcd8160da 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -61,7 +61,7 @@
     <dimen name="recents_empty_message_text_size">16sp</dimen>
     <dimen name="recents_empty_message_text_padding">16dp</dimen>
 
-    <dimen name="max_shadow_radius">5dp</dimen>
+    <dimen name="max_shadow_radius">0dp</dimen>
 
     <!-- Total space (start + end) between the task card and the edge of the screen
          in various configurations -->
-- 
GitLab


From a2ef1a02384181ca17ae48f4bab14ec375006845 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Wed, 19 May 2021 09:38:35 -0700
Subject: [PATCH 1219/1664] Remove min/max values for RectFSpringAnim2.

- Fixes crash on landscape
- We added this to stop the windows from going way out of bounds. But we no
  longer need it since we've tightened up the stiffness so that
  it would take a super aggressive swipe/high velocity for the window
  to go out of bounds

Bug: 188617892
Test: manual
Change-Id: Icc2a0af0a1b26985502ddbc7a5a370e7eecdb346
---
 .../src/com/android/quickstep/util/RectFSpringAnim2.java  | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/util/RectFSpringAnim2.java b/quickstep/src/com/android/quickstep/util/RectFSpringAnim2.java
index 97be2b1787..edd3dc3e29 100644
--- a/quickstep/src/com/android/quickstep/util/RectFSpringAnim2.java
+++ b/quickstep/src/com/android/quickstep/util/RectFSpringAnim2.java
@@ -34,8 +34,6 @@ import androidx.dynamicanimation.animation.FloatPropertyCompat;
 import androidx.dynamicanimation.animation.SpringAnimation;
 import androidx.dynamicanimation.animation.SpringForce;
 
-import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.util.DynamicResource;
@@ -193,12 +191,8 @@ public class RectFSpringAnim2 extends RectFSpringAnim {
      * @param velocityPxPerMs Velocity of swipe in px/ms.
      */
     public void start(Context context, PointF velocityPxPerMs) {
-        DeviceProfile dp = InvariantDeviceProfile.INSTANCE.get(context).getDeviceProfile(context);
-
         mRectXAnim = new SpringAnimation(this, RECT_CENTER_X)
                 .setStartValue(mCurrentCenterX)
-                .setMinValue(Math.min(0, mCurrentCenterX))
-                .setMaxValue(Math.max(dp.widthPx, mCurrentCenterX))
                 .setStartVelocity(velocityPxPerMs.x * 1000)
                 .setSpring(new SpringForce(mTargetX)
                         .setStiffness(mXStiffness)
@@ -210,8 +204,6 @@ public class RectFSpringAnim2 extends RectFSpringAnim {
 
         mRectYAnim = new SpringAnimation(this, RECT_Y)
                 .setStartValue(mCurrentCenterY)
-                .setMinValue(Math.min(0, mCurrentCenterY))
-                .setMaxValue(Math.max(dp.heightPx, mCurrentCenterY))
                 .setStartVelocity(velocityPxPerMs.y * 1000)
                 .setSpring(new SpringForce(mTargetY)
                         .setStiffness(mYStiffness)
-- 
GitLab


From f735c738ea01ff894a8fea329db9464f53dc2a54 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 19 May 2021 21:34:06 +0100
Subject: [PATCH 1220/1664] Remove work profile badge from widget previews

Test: Check work profile badge no longer shown on work widget in the
      full and bottom widgets pickers.
Bug: 177675123
Change-Id: I0e5e32e18df832c1919749404094d68805c30556
---
 res/layout/widget_cell_content.xml            |  8 ---
 .../launcher3/WidgetPreviewLoader.java        | 49 -------------------
 .../android/launcher3/widget/WidgetCell.java  | 14 ------
 3 files changed, 71 deletions(-)

diff --git a/res/layout/widget_cell_content.xml b/res/layout/widget_cell_content.xml
index 0f6fc6cdb7..b27b50560e 100644
--- a/res/layout/widget_cell_content.xml
+++ b/res/layout/widget_cell_content.xml
@@ -33,14 +33,6 @@
             android:layout_height="match_parent"
             android:importantForAccessibility="no"
             android:layout_gravity="fill"/>
-
-        <ImageView
-            android:id="@+id/widget_badge"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:importantForAccessibility="no"
-            android:layout_gravity="end|bottom"
-            android:layout_margin="@dimen/profile_badge_margin"/>
     </com.android.launcher3.widget.WidgetCellPreview>
 
     <!-- The name of the widget. -->
diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java
index 75d25d7aa3..8b7a750cc7 100644
--- a/src/com/android/launcher3/WidgetPreviewLoader.java
+++ b/src/com/android/launcher3/WidgetPreviewLoader.java
@@ -21,9 +21,7 @@ import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
-import android.graphics.Rect;
 import android.graphics.RectF;
-import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.CancellationSignal;
@@ -35,9 +33,7 @@ import android.util.LongSparseArray;
 import android.util.Pair;
 
 import androidx.annotation.Nullable;
-import androidx.annotation.UiThread;
 
-import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.icons.GraphicsUtils;
 import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.icons.LauncherIcons;
@@ -93,51 +89,6 @@ public class WidgetPreviewLoader {
         mDb = new CacheDb(context);
     }
 
-    /**
-     * Returns a drawable that can be used as a badge for the user or null.
-     */
-    @UiThread
-    public Drawable getBadgeForUser(UserHandle user, int badgeSize) {
-        if (mMyUser.equals(user)) {
-            return null;
-        }
-
-        Bitmap badgeBitmap = getUserBadge(user, badgeSize);
-        FastBitmapDrawable d = new FastBitmapDrawable(badgeBitmap);
-        d.setFilterBitmap(true);
-        d.setBounds(0, 0, badgeBitmap.getWidth(), badgeBitmap.getHeight());
-        return d;
-    }
-
-    private Bitmap getUserBadge(UserHandle user, int badgeSize) {
-        synchronized (mUserBadges) {
-            Bitmap badgeBitmap = mUserBadges.get(user);
-            if (badgeBitmap != null) {
-                return badgeBitmap;
-            }
-
-            final Resources res = mContext.getResources();
-            badgeBitmap = Bitmap.createBitmap(badgeSize, badgeSize, Bitmap.Config.ARGB_8888);
-
-            Drawable drawable = mContext.getPackageManager().getUserBadgedDrawableForDensity(
-                    new BitmapDrawable(res, badgeBitmap), user,
-                    new Rect(0, 0, badgeSize, badgeSize),
-                    0);
-            if (drawable instanceof BitmapDrawable) {
-                badgeBitmap = ((BitmapDrawable) drawable).getBitmap();
-            } else {
-                badgeBitmap.eraseColor(Color.TRANSPARENT);
-                Canvas c = new Canvas(badgeBitmap);
-                drawable.setBounds(0, 0, badgeSize, badgeSize);
-                drawable.draw(c);
-                c.setBitmap(null);
-            }
-
-            mUserBadges.put(user, badgeBitmap);
-            return badgeBitmap;
-        }
-    }
-
     /**
      * Generates the widget preview on {@link AsyncTask#THREAD_POOL_EXECUTOR}. Must be
      * called on UI thread
diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index 3fcd3f7b03..f7993dc408 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -33,7 +33,6 @@ import android.view.View.OnLayoutChangeListener;
 import android.view.ViewPropertyAnimator;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.FrameLayout;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RemoteViews;
 import android.widget.TextView;
@@ -45,7 +44,6 @@ import com.android.launcher3.CheckLongPressHelper;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.R;
 import com.android.launcher3.WidgetPreviewLoader;
-import com.android.launcher3.icons.BaseIconFactory;
 import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.icons.RoundDrawableWrapper;
 import com.android.launcher3.model.WidgetItem;
@@ -80,7 +78,6 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
 
     private FrameLayout mWidgetImageContainer;
     private WidgetImageView mWidgetImage;
-    private ImageView mWidgetBadge;
     private TextView mWidgetName;
     private TextView mWidgetDims;
     private TextView mWidgetDescription;
@@ -136,7 +133,6 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
 
         mWidgetImageContainer = findViewById(R.id.widget_preview_container);
         mWidgetImage = findViewById(R.id.widget_preview);
-        mWidgetBadge = findViewById(R.id.widget_badge);
         mWidgetName = findViewById(R.id.widget_name);
         mWidgetDims = findViewById(R.id.widget_dims);
         mWidgetDescription = findViewById(R.id.widget_description);
@@ -161,7 +157,6 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
         mWidgetImage.animate().cancel();
         mWidgetImage.setDrawable(null);
         mWidgetImage.setVisibility(View.VISIBLE);
-        mWidgetBadge.setImageDrawable(null);
         mWidgetName.setText(null);
         mWidgetDims.setText(null);
         mWidgetDescription.setText(null);
@@ -294,15 +289,6 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
                 mAppWidgetHostViewPreview = null;
             }
         }
-        Drawable badge = mWidgetPreviewLoader.getBadgeForUser(mItem.user,
-                BaseIconFactory.getBadgeSizeForIconSize(
-                        mActivity.getDeviceProfile().allAppsIconSizePx));
-        if (badge == null) {
-            mWidgetBadge.setVisibility(View.GONE);
-        } else {
-            mWidgetBadge.setVisibility(View.VISIBLE);
-            mWidgetBadge.setImageDrawable(badge);
-        }
         if (mAnimatePreview) {
             mWidgetImageContainer.setAlpha(0f);
             ViewPropertyAnimator anim = mWidgetImageContainer.animate();
-- 
GitLab


From cdbaea44865297a31a3c14c620c7e526c5765911 Mon Sep 17 00:00:00 2001
From: Jon Spivack <spivack@google.com>
Date: Mon, 17 May 2021 19:15:25 -0700
Subject: [PATCH 1221/1664] Disable NIU Actions on Work Profile apps

If the currently selected Recent app belongs to a Work Profile, do not allow the user to invoke any of the overview actions. Instead, show the standard blocked by policy message (R.string.blocked_by_policy).

Bug: 187491010
Test: Manual (Pixel 3A)
Test: m -j RunLauncherGoGoogleRoboTests
Change-Id: I552da9512ab19993eb4bb65fe9269d2aee9f0c4e
---
 .../src/com/android/quickstep/TaskOverlayFactoryGo.java  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
index 907767551c..117b8e6b92 100644
--- a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
+++ b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
@@ -27,6 +27,7 @@ import android.content.Intent;
 import android.graphics.Matrix;
 import android.net.Uri;
 import android.os.SystemClock;
+import android.os.UserManager;
 import android.provider.Settings;
 import android.text.TextUtils;
 
@@ -96,7 +97,10 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
             }
 
             getActionsView().updateDisabledFlags(DISABLED_ROTATED, rotated);
-            boolean isAllowedByPolicy = mThumbnailView.isRealSnapshot();
+            // Disable Overview Actions for Work Profile apps
+            boolean isManagedProfileTask =
+                    UserManager.get(mApplicationContext).isManagedProfile(task.key.userId);
+            boolean isAllowedByPolicy = mThumbnailView.isRealSnapshot() && !isManagedProfileTask;
             getActionsView().setCallbacks(new OverlayUICallbacksGoImpl(isAllowedByPolicy, task));
             mTaskPackageName = task.key.getPackageName();
 
@@ -127,8 +131,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
         /**
          * Creates and sends an Intent corresponding to the button that was clicked
          */
-        @VisibleForTesting
-        public void sendNIUIntent(String actionType) {
+        private void sendNIUIntent(String actionType) {
             Intent intent = createNIUIntent(actionType);
             // Only add and send the image if the appropriate permissions are held
             if (mAssistPermissionsEnabled) {
-- 
GitLab


From 73d44f63b42ab42730e150604c781510b6903282 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 19 May 2021 23:47:23 +0100
Subject: [PATCH 1222/1664] Animate recommended widgets vertical transition
 when reset widgets picker scroll position

Test: Set up work profile. Then open the widgets picker, scroll down from
      the personal tab, then switch tab. Observes a vertical transition
      animation of the search and recommendation container view.
Bug: 188538428
Change-Id: I2b8523d1682a6312de3b5393c0bff782ae110b3c
---
 ...rchAndRecommendationsScrollController.java | 72 +++++++++++++------
 .../widget/picker/WidgetsFullSheet.java       |  2 +-
 2 files changed, 50 insertions(+), 24 deletions(-)

diff --git a/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java b/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java
index 34346ab672..6781824d74 100644
--- a/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java
+++ b/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java
@@ -15,6 +15,7 @@
  */
 package com.android.launcher3.widget.picker;
 
+import android.animation.ValueAnimator;
 import android.graphics.Point;
 import android.view.MotionEvent;
 import android.view.View;
@@ -32,13 +33,14 @@ import com.android.launcher3.workprofile.PersonalWorkPagedView;
  * vertical displacement upon scrolling.
  */
 final class SearchAndRecommendationsScrollController implements
-        RecyclerViewFastScroller.OnFastScrollChangeListener {
+        RecyclerViewFastScroller.OnFastScrollChangeListener, ValueAnimator.AnimatorUpdateListener {
     private final boolean mHasWorkProfile;
     private final SearchAndRecommendationViewHolder mViewHolder;
     private final View mSearchAndRecommendationViewParent;
     private final WidgetsRecyclerView mPrimaryRecyclerView;
     private final WidgetsRecyclerView mSearchRecyclerView;
     private final int mTabsHeight;
+    private final ValueAnimator mAnimator = ValueAnimator.ofInt(0, 0);
     private final Point mTempOffset = new Point();
 
     // The following are only non null if mHasWorkProfile is true.
@@ -47,8 +49,9 @@ final class SearchAndRecommendationsScrollController implements
     @Nullable private final PersonalWorkPagedView mPrimaryWorkViewPager;
 
     private WidgetsRecyclerView mCurrentRecyclerView;
+    private int mCurrentRecyclerViewScrollY = 0;
 
-    private OnContentChangeListener mOnContentChangeListener = () -> applyVerticalTransition();
+    private OnContentChangeListener mOnContentChangeListener = () -> onScrollChanged();
 
     /**
      * The vertical distance, in pixels, until the search is pinned at the top of the screen when
@@ -89,23 +92,25 @@ final class SearchAndRecommendationsScrollController implements
         mPrimaryWorkTabsView = personalWorkTabsView;
         mPrimaryWorkViewPager = primaryWorkViewPager;
         mTabsHeight = tabsHeight;
-        setCurrentRecyclerView(mPrimaryRecyclerView);
+        setCurrentRecyclerView(mPrimaryRecyclerView, /* animateReset= */ false);
     }
 
-    /** Sets the current active {@link WidgetsRecyclerView}. */
     public void setCurrentRecyclerView(WidgetsRecyclerView currentRecyclerView) {
+        setCurrentRecyclerView(currentRecyclerView, /* animateReset= */ true);
+    }
+
+    /** Sets the current active {@link WidgetsRecyclerView}. */
+    private void setCurrentRecyclerView(WidgetsRecyclerView currentRecyclerView,
+            boolean animateReset) {
+        if (mCurrentRecyclerView == currentRecyclerView) {
+            return;
+        }
         if (mCurrentRecyclerView != null) {
             mCurrentRecyclerView.setOnContentChangeListener(null);
         }
         mCurrentRecyclerView = currentRecyclerView;
         mCurrentRecyclerView.setOnContentChangeListener(mOnContentChangeListener);
-        mViewHolder.mHeaderTitle.setTranslationY(0);
-        mViewHolder.mRecommendedWidgetsTable.setTranslationY(0);
-        mViewHolder.mSearchBarContainer.setTranslationY(0);
-
-        if (mHasWorkProfile) {
-            mPrimaryWorkTabsView.setTranslationY(0);
-        }
+        reset(animateReset);
     }
 
     /**
@@ -222,6 +227,12 @@ final class SearchAndRecommendationsScrollController implements
 
     @Override
     public void onScrollChanged() {
+        int recyclerViewYOffset = mCurrentRecyclerView.getCurrentScrollY();
+        if (recyclerViewYOffset < 0) return;
+        mCurrentRecyclerViewScrollY = recyclerViewYOffset;
+        if (mAnimator.isStarted()) {
+            mAnimator.cancel();
+        }
         applyVerticalTransition();
     }
 
@@ -230,34 +241,43 @@ final class SearchAndRecommendationsScrollController implements
      * views (e.g. recycler views, tabs) upon scrolling / content changes in the recycler view.
      */
     private void applyVerticalTransition() {
-        // Always use the recycler view offset because fast scroller offset has a different scale.
-        int recyclerViewYOffset = mCurrentRecyclerView.getCurrentScrollY();
-        if (recyclerViewYOffset < 0) return;
-
         if (mCollapsibleHeightForRecommendation > 0) {
-            int yDisplacement = Math.max(-recyclerViewYOffset,
+            int yDisplacement = Math.max(-mCurrentRecyclerViewScrollY,
                     -mCollapsibleHeightForRecommendation);
             mViewHolder.mHeaderTitle.setTranslationY(yDisplacement);
             mViewHolder.mRecommendedWidgetsTable.setTranslationY(yDisplacement);
         }
 
         if (mCollapsibleHeightForSearch > 0) {
-            int searchYDisplacement = Math.max(-recyclerViewYOffset, -mCollapsibleHeightForSearch);
+            int searchYDisplacement = Math.max(-mCurrentRecyclerViewScrollY,
+                    -mCollapsibleHeightForSearch);
             mViewHolder.mSearchBarContainer.setTranslationY(searchYDisplacement);
         }
 
         if (mHasWorkProfile && mCollapsibleHeightForTabs > 0) {
-            int yDisplacementForTabs = Math.max(-recyclerViewYOffset, -mCollapsibleHeightForTabs);
+            int yDisplacementForTabs = Math.max(-mCurrentRecyclerViewScrollY,
+                    -mCollapsibleHeightForTabs);
             mPrimaryWorkTabsView.setTranslationY(yDisplacementForTabs);
         }
     }
 
     /** Resets any previous view translation. */
-    public void reset() {
-        mViewHolder.mHeaderTitle.setTranslationY(0);
-        mViewHolder.mSearchBarContainer.setTranslationY(0);
-        if (mHasWorkProfile) {
-            mPrimaryWorkTabsView.setTranslationY(0);
+    public void reset(boolean animate) {
+        if (mCurrentRecyclerViewScrollY == 0) {
+            return;
+        }
+        if (mAnimator.isStarted()) {
+            mAnimator.cancel();
+        }
+
+        if (animate) {
+            mAnimator.setIntValues(mCurrentRecyclerViewScrollY, 0);
+            mAnimator.addUpdateListener(this);
+            mAnimator.setDuration(300);
+            mAnimator.start();
+        } else {
+            mCurrentRecyclerViewScrollY = 0;
+            applyVerticalTransition();
         }
     }
 
@@ -308,6 +328,12 @@ final class SearchAndRecommendationsScrollController implements
                 + marginLayoutParams.topMargin;
     }
 
+    @Override
+    public void onAnimationUpdate(ValueAnimator animation) {
+        mCurrentRecyclerViewScrollY = (Integer) animation.getAnimatedValue();
+        applyVerticalTransition();
+    }
+
     /**
      * A listener to be notified when there is a content change in the recycler view that may affect
      * the relative position of the search and recommendation container.
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index e44acc363b..9c7e404bf0 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -248,7 +248,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
             mAdapters.get(AdapterHolder.WORK).mWidgetsRecyclerView.scrollToTop();
         }
         mAdapters.get(AdapterHolder.SEARCH).mWidgetsRecyclerView.scrollToTop();
-        mSearchAndRecommendationsScrollController.reset();
+        mSearchAndRecommendationsScrollController.reset(/* animate= */ true);
     }
 
     @VisibleForTesting
-- 
GitLab


From ba82d94f5169918918308655e89080afc651b048 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Thu, 20 May 2021 01:53:02 +0000
Subject: [PATCH 1223/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I8e06a080ec1a5e40b106c535c299919486f66915
---
 quickstep/res/values-af/strings.xml        |  1 -
 quickstep/res/values-am/strings.xml        |  1 -
 quickstep/res/values-ar/strings.xml        |  1 -
 quickstep/res/values-as/strings.xml        | 31 +++++++---------------
 quickstep/res/values-az/strings.xml        |  1 -
 quickstep/res/values-b+sr+Latn/strings.xml |  1 -
 quickstep/res/values-be/strings.xml        |  1 -
 quickstep/res/values-bg/strings.xml        |  1 -
 quickstep/res/values-bn/strings.xml        | 31 +++++++---------------
 quickstep/res/values-bs/strings.xml        |  1 -
 quickstep/res/values-ca/strings.xml        |  1 -
 quickstep/res/values-cs/strings.xml        |  1 -
 quickstep/res/values-da/strings.xml        |  1 -
 quickstep/res/values-de/strings.xml        |  1 -
 quickstep/res/values-el/strings.xml        |  1 -
 quickstep/res/values-en-rAU/strings.xml    |  1 -
 quickstep/res/values-en-rCA/strings.xml    |  1 -
 quickstep/res/values-en-rGB/strings.xml    |  1 -
 quickstep/res/values-en-rIN/strings.xml    |  1 -
 quickstep/res/values-en-rXC/strings.xml    |  1 -
 quickstep/res/values-es-rUS/strings.xml    |  1 -
 quickstep/res/values-es/strings.xml        |  1 -
 quickstep/res/values-et/strings.xml        |  1 -
 quickstep/res/values-eu/strings.xml        |  1 -
 quickstep/res/values-fa/strings.xml        |  1 -
 quickstep/res/values-fi/strings.xml        |  1 -
 quickstep/res/values-fr-rCA/strings.xml    | 19 +++++++------
 quickstep/res/values-fr/strings.xml        |  1 -
 quickstep/res/values-gl/strings.xml        |  1 -
 quickstep/res/values-gu/strings.xml        | 31 +++++++---------------
 quickstep/res/values-hi/strings.xml        |  5 ++--
 quickstep/res/values-hr/strings.xml        |  1 -
 quickstep/res/values-hu/strings.xml        |  1 -
 quickstep/res/values-hy/strings.xml        |  1 -
 quickstep/res/values-in/strings.xml        |  1 -
 quickstep/res/values-is/strings.xml        |  1 -
 quickstep/res/values-it/strings.xml        |  1 -
 quickstep/res/values-iw/strings.xml        |  1 -
 quickstep/res/values-ja/strings.xml        |  1 -
 quickstep/res/values-ka/strings.xml        |  1 -
 quickstep/res/values-kk/strings.xml        |  1 -
 quickstep/res/values-km/strings.xml        |  1 -
 quickstep/res/values-kn/strings.xml        | 31 +++++++---------------
 quickstep/res/values-ko/strings.xml        |  1 -
 quickstep/res/values-ky/strings.xml        |  1 -
 quickstep/res/values-lo/strings.xml        |  1 -
 quickstep/res/values-lt/strings.xml        |  1 -
 quickstep/res/values-lv/strings.xml        |  1 -
 quickstep/res/values-mk/strings.xml        |  1 -
 quickstep/res/values-ml/strings.xml        | 31 +++++++---------------
 quickstep/res/values-mn/strings.xml        |  1 -
 quickstep/res/values-mr/strings.xml        | 31 +++++++---------------
 quickstep/res/values-ms/strings.xml        | 31 +++++++---------------
 quickstep/res/values-my/strings.xml        |  1 -
 quickstep/res/values-nb/strings.xml        |  1 -
 quickstep/res/values-ne/strings.xml        | 31 +++++++---------------
 quickstep/res/values-nl/strings.xml        |  1 -
 quickstep/res/values-or/strings.xml        | 31 +++++++---------------
 quickstep/res/values-pa/strings.xml        | 31 +++++++---------------
 quickstep/res/values-pl/strings.xml        |  1 -
 quickstep/res/values-pt-rPT/strings.xml    |  1 -
 quickstep/res/values-pt/strings.xml        |  1 -
 quickstep/res/values-ro/strings.xml        |  1 -
 quickstep/res/values-ru/strings.xml        |  1 -
 quickstep/res/values-si/strings.xml        |  1 -
 quickstep/res/values-sk/strings.xml        |  1 -
 quickstep/res/values-sl/strings.xml        |  1 -
 quickstep/res/values-sq/strings.xml        | 13 +++------
 quickstep/res/values-sr/strings.xml        |  1 -
 quickstep/res/values-sv/strings.xml        |  1 -
 quickstep/res/values-sw/strings.xml        |  1 -
 quickstep/res/values-ta/strings.xml        |  1 -
 quickstep/res/values-te/strings.xml        | 31 +++++++---------------
 quickstep/res/values-th/strings.xml        |  1 -
 quickstep/res/values-tl/strings.xml        |  1 -
 quickstep/res/values-tr/strings.xml        |  1 -
 quickstep/res/values-uk/strings.xml        |  1 -
 quickstep/res/values-ur/strings.xml        | 31 +++++++---------------
 quickstep/res/values-uz/strings.xml        |  1 -
 quickstep/res/values-vi/strings.xml        |  1 -
 quickstep/res/values-zh-rCN/strings.xml    |  1 -
 quickstep/res/values-zh-rHK/strings.xml    |  1 -
 quickstep/res/values-zh-rTW/strings.xml    |  1 -
 quickstep/res/values-zu/strings.xml        |  1 -
 84 files changed, 135 insertions(+), 343 deletions(-)

diff --git a/quickstep/res/values-af/strings.xml b/quickstep/res/values-af/strings.xml
index 69d5d1f864..cb8d8c069c 100644
--- a/quickstep/res/values-af/strings.xml
+++ b/quickstep/res/values-af/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swiep op van die onderkant van jou skerm af, hou en laat los dan."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Gereed"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Volgende"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Klaar"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Instellings"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Probeer weer"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Mooi so!"</string>
diff --git a/quickstep/res/values-am/strings.xml b/quickstep/res/values-am/strings.xml
index 8e3fe8af08..1c42d1f73a 100644
--- a/quickstep/res/values-am/strings.xml
+++ b/quickstep/res/values-am/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ከእርስዎ ማያ ገጽ ግርጌ ላይ ወደ ላይ በጣት ጠረግ ያድርጉ፣ ይያዙ፣ በመቀጠል ይልቀቁ።"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"ሁሉም ዝግጁ"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"ቀጣይ"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"ተጠናቋል"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ቅንብሮች"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"እንደገና ሞክር"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ጥሩ!"</string>
diff --git a/quickstep/res/values-ar/strings.xml b/quickstep/res/values-ar/strings.xml
index b716419435..c74af90abc 100644
--- a/quickstep/res/values-ar/strings.xml
+++ b/quickstep/res/values-ar/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"مرِّر سريعًا من أسفل الشاشة إلى أعلاها، وأبقِ إصبعك على الشاشة قليلاً ثم ارفعه."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"اكتمل التدريب على الإيماءة"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"التالي"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"تم"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"الإعدادات"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"إعادة المحاولة"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"أحسنت"</string>
diff --git a/quickstep/res/values-as/strings.xml b/quickstep/res/values-as/strings.xml
index 0832b1b392..8d0be72a04 100644
--- a/quickstep/res/values-as/strings.xml
+++ b/quickstep/res/values-as/strings.xml
@@ -47,43 +47,32 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"পূৰ্বানুমান কৰা এপ্: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"আপুনি বাওঁ প্ৰান্তৰৰ একেবাৰে সীমাৰ পৰা ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"আপুনি স্ক্ৰীনৰ বাওঁ প্ৰান্তৰৰ পৰা সোঁ প্ৰান্তৰৰ ফালে মধ্যভাগলৈকে ছোৱাইপ কৰি এৰি দিয়াটো নিশ্চিত কৰক।"</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"সুন্দৰ! এতিয়া উভতি যাবলৈ সোঁ প্ৰান্তৰৰ পৰা ছোৱাইপ কৰক"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"আপুনি স্ক্ৰীনখনৰ সোঁ প্ৰান্তৰৰ পৰা মাজলৈ ছোৱাইপ কৰিও অন্তিম স্ক্ৰীনখনলৈ উভতি যাব পাৰে।"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"আপুনি সোঁ প্ৰান্তৰৰ একেবাৰে সীমাৰ পৰা ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"আপুনি স্ক্ৰীনৰ সোঁ প্ৰান্তৰৰ পৰা মধ্যভাগলৈকে ছোৱাইপ কৰি এৰি দিয়াটো নিশ্চিত কৰক।"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"আপুনি উভতি যাওক নিৰ্দেশটো সম্পূৰ্ণ কৰিলে। ইয়াৰ পাছত, এপ্‌ কেনেকৈ সলনি কৰিব সেয়া জানক।"</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"আপুনি উভতি যাওক নিৰ্দেশটো সম্পূৰ্ণ কৰিলে।"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"আপুনি স্ক্ৰীনৰ তলৰ অংশৰ বেছি ওচৰলৈ ছোৱাইপ নকৰাটো নিশ্চিত কৰক।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"উভতি যোৱাৰ নির্দেশটোৰ সংবেদনশীলতা সলনি কৰিবলৈ ছেটিঙলৈ যাওক"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"উভতি যাবলৈ বাওঁ প্ৰান্তৰৰ পৰা ছোৱাইপ কৰক"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"আপুনি পূৰ্বে থকা অন্তিম স্ক্ৰীনখনলৈ উভতি যাবলৈ স্ক্ৰীনখনৰ বাওঁ প্ৰান্তৰৰ পৰা মাজলৈ ছোৱাইপ কৰক।"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"আপুনি স্ক্ৰীনৰ তলৰ প্ৰান্তৰ পৰা ওপৰলৈ ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"আপুনি এৰি দিয়াৰ পূৰ্বে অলপো নোৰোৱাটো নিশ্চিত কৰক।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"আপুনি পোনকৈ ওপৰলৈ ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"আপুনি গৃহ স্ক্ৰীনলৈ যোৱাৰ নিৰ্দেশটো সম্পূৰ্ণ কৰিলে। ইয়াৰ পাছত, গৃহ স্ক্ৰীনলৈ কেনেকৈ যাব সেয়া জানক।"</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"আপুনি গৃহ স্ক্ৰীনলৈ যোৱাৰ নিৰ্দেশটো সম্পূৰ্ণ কৰিলে।"</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"গৃহ স্ক্ৰীনলৈ যাবলৈ ছোৱাইপ কৰক"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"আপোনাৰ স্ক্ৰীনৰ তলৰ অংশৰ পৰা ওপৰলৈ ছোৱাইপ কৰক। এই নিৰ্দেশটোৱে আপোনাক সদায় গৃহ স্ক্ৰীনলৈ লৈ যায়।"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"আপুনি স্ক্ৰীনৰ তলৰ প্ৰান্তৰ পৰা ওপৰলৈ ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"এৰি দিয়াৰ পূৰ্বে ৱিণ্ডখন দীৰ্ঘ সময়ৰ বাবে ধৰি ৰাখিবলৈ চেষ্টা কৰক।"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"আপুনি স্ক্ৰীনৰ ওপৰলৈ পোনকৈ ছোৱাইপ কৰি তাৰ পাছত ৰোৱাটো নিশ্চিত কৰক।"</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"আপুনি নিৰ্দেশসমূহ কেনেকৈ ব্যৱহাৰ কৰিব লাগে সেয়া জানিলে। নিৰ্দেশসমূহ অফ কৰিবলৈ, ছেটিঙলৈ যাওক।"</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"আপুনি এপ্‌ সলনি কৰাৰ নিৰ্দেশটো সম্পূৰ্ণ কৰিলে।"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"এপ্‌ সলনি কৰিবলৈ ছোৱাইপ কৰক"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"আপোনাৰ স্ক্ৰীনৰ একেবাৰে তলৰ অংশৰ পৰা ওপৰলৈ ছোৱাইপ কৰি ধৰি ৰাখক আৰু তাৰ পাছত এৰি দিয়ক।"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"সম্পূৰ্ণ সাজু"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"পৰৱৰ্তী"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"হ’ল"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ছেটিং"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"পুনৰ চেষ্টা কৰক"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"সুন্দৰ!"</string>
diff --git a/quickstep/res/values-az/strings.xml b/quickstep/res/values-az/strings.xml
index 674302daaa..1dd47b78c1 100644
--- a/quickstep/res/values-az/strings.xml
+++ b/quickstep/res/values-az/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Ekranın aşağısından yuxarı doğru sürüşdürüb saxlayın, sonra buraxın."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Tam hazır"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Sonra"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Oldu"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Ayarlar"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Yenə sınayın"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Əla!"</string>
diff --git a/quickstep/res/values-b+sr+Latn/strings.xml b/quickstep/res/values-b+sr+Latn/strings.xml
index 4519deb30f..c1680f8f7d 100644
--- a/quickstep/res/values-b+sr+Latn/strings.xml
+++ b/quickstep/res/values-b+sr+Latn/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Prevucite nagore od dna ekrana, zadržite, pa pustite."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"To je to"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Dalje"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Gotovo"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Podešavanja"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Probajte ponovo"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Svaka čast!"</string>
diff --git a/quickstep/res/values-be/strings.xml b/quickstep/res/values-be/strings.xml
index 20e09caccc..58ccaf95f3 100644
--- a/quickstep/res/values-be/strings.xml
+++ b/quickstep/res/values-be/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Правядзіце па экране знізу ўверх, утрымліваючы палец націснутым, потым адпусціце."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Гатова"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Далей"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Гатова"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Налады"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Паўтарыць спробу"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Выдатна!"</string>
diff --git a/quickstep/res/values-bg/strings.xml b/quickstep/res/values-bg/strings.xml
index 1e02bfc608..13923a7433 100644
--- a/quickstep/res/values-bg/strings.xml
+++ b/quickstep/res/values-bg/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Прекарайте пръст нагоре от долната част на екрана, задръжте и след това вдигнете пръста си."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Готово"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Напред"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Готово"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Настройки"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Опитайте отново"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Чудесно!"</string>
diff --git a/quickstep/res/values-bn/strings.xml b/quickstep/res/values-bn/strings.xml
index b37c56ba62..a73b9a4f9e 100644
--- a/quickstep/res/values-bn/strings.xml
+++ b/quickstep/res/values-bn/strings.xml
@@ -47,43 +47,32 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"আপনার প্রয়োজন হতে পারে এমন অ্যাপ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"একদম বাঁ প্রান্ত থেকে সোয়াইপ করছেন কিনা ভাল করে দেখে নিন।"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"আপনি বাঁ প্রান্ত থেকে স্ক্রিনের মাঝখান পর্যন্ত সোয়াইপ করছেন ও পরে আঙুল তুলে নিন। এটির খেয়াল রাখুন।"</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"দুর্দান্ত! ফিরে যেতে ডানদিক থেকে সোয়াইপ করুন"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"ডান প্রান্ত থেকে স্ক্রিনের মাঝখান পর্যন্ত সোয়াইপ করে আপনি আগের ক্রিনেও ফিরে যেতে পারেন।"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"একদম ডান প্রান্ত থেকে সোয়াইপ করছেন কিনা ভাল করে দেখে নিন।"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"আপনি ডান প্রান্ত থেকে স্ক্রিনের মাঝখান পর্যন্ত সোয়াইপ করছেন ও পরে আঙুল তুলে নিন। এটি খেয়াল রাখুন।"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"আপনি ফিরে যাওয়ার জেসচার সম্পর্কে জেনেছেন। এরপর, একটি অ্যাপ থেকে অন্য অ্যাপে কীভাবে যাবেন জেনে নিন।"</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"আপনি ফিরে যাওয়ার জেসচার সম্পর্কে জেনেছেন।"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"স্ক্রিনের নিচের প্রান্তের খুব কাছে পর্যন্ত যাতে সোয়াইপ না করেন সেটি ভাল করে দেখে নিন।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ফিরে যাওয়ার জেসচারের সেন্সিটিভিটি পরিবর্তন করতে, সেটিংসে যান"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"ফিরে যেতে আপনার স্ক্রিনের বাম প্রান্ত থেকে সোয়াইপ করুন"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"আপনার থাকা আগের স্ক্রিনে ফিরে যেতে, বাঁ প্রান্ত থেকে স্ক্রিনের মাঝখান পর্যন্ত সোয়াইপ করুন।"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"স্ক্রিনের নিচের প্রান্ত থেকে আপনি সোয়াইপ করেছেন কিনা ভাল করে দেখে নিন।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"আঙুল তুলে নেওয়ার আগে আপনি যাতে পজ না করেন সেটি ভাল করে দেখে নিন।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"আপনি উপরের দিকে সোজাসুজি সোয়াইপ করেছেন কিনা ভাল করে দেখে নিন।"</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"আপনি হোম স্ক্রিনে যাওয়ার জেসচার সম্পর্কে জেনেছেন। এরপর, ফিরে কীভাবে যাবেন তা জেনে নিন।"</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"আপনি হোম স্ক্রিনে যাওয়ার জেসচার সম্পর্কে জেনেছেন।"</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"হোম স্ক্রিনে যেতে সোয়াইপ করুন"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"স্ক্রিনের নিচের প্রান্ত থেকে উপরের দিকে সোয়াইপ করুন। এটি করলে, আপনি সবসময় হোম স্ক্রিনে যেতে পারবেন।"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"স্ক্রিনের নিচের প্রান্ত থেকে আপনি সোয়াইপ করেছেন কিনা ভাল করে দেখে নিন।"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"চেষ্টা করুন যাতে আঙুল সরিয়ে নেওয়ার আগে উইন্ডো কিছুক্ষণ প্রেস করে রাখা যায়।"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"আপনি উপরের দিকে সোজাসুজি সোয়াইপ করেছেন কিনা ভাল করে দেখে নিয়ে তারপর পজ করুন।"</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"ইঙ্গিত কীভাবে ব্যবহার করতে হয় আপনি তা শিখে ফেলেছেন। ইঙ্গিত বন্ধ করতে, সেটিংসে যান।"</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"আপনি একটি অ্যাপ থেকে অন্য অ্যাপে যাওয়ার জেসচার সম্পর্কে জেনেছেন।"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"একটি অ্যাপ থেকে অন্য অ্যাপে যেতে সোয়াইপ করুন"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"স্ক্রিনের নিচ থেকে উপরের দিকে সোয়াইপ করে ধরে থাকুন, তারপর ছেড়ে দিন।"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"সব প্রস্তুত"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"পরবর্তী"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"হয়ে গেছে"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"সেটিংস"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"আবার চেষ্টা করুন"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"সাবাস!"</string>
diff --git a/quickstep/res/values-bs/strings.xml b/quickstep/res/values-bs/strings.xml
index 10d8f16e6d..e2db7f8515 100644
--- a/quickstep/res/values-bs/strings.xml
+++ b/quickstep/res/values-bs/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Prevucite s dna ekrana prema gore, zadržite, a zatim pustite."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Sve je spremno"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Naprijed"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Gotovo"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Postavke"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Pokušaj ponovo"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Lijepo!"</string>
diff --git a/quickstep/res/values-ca/strings.xml b/quickstep/res/values-ca/strings.xml
index 0b8188499b..fae2c24d13 100644
--- a/quickstep/res/values-ca/strings.xml
+++ b/quickstep/res/values-ca/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Llisca cap amunt des de la part inferior de la pantalla, mantén premut i deixa anar."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Tot a punt"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Següent"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Fet"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Configuració"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Torna-ho a provar"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Molt bé!"</string>
diff --git a/quickstep/res/values-cs/strings.xml b/quickstep/res/values-cs/strings.xml
index d5feff7f8d..c9f463228b 100644
--- a/quickstep/res/values-cs/strings.xml
+++ b/quickstep/res/values-cs/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Přejeďte prstem nahoru z dolního okraje obrazovky, podržte obrazovku a potom prst uvolněte."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Vše je nastaveno"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Další"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Hotovo"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Nastavení"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Zkusit znovu"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Skvělé!"</string>
diff --git a/quickstep/res/values-da/strings.xml b/quickstep/res/values-da/strings.xml
index c2d94a12b6..4c7f968d2c 100644
--- a/quickstep/res/values-da/strings.xml
+++ b/quickstep/res/values-da/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Stryg opad fra bunden af skærmen, hold fingeren stille, og løft den."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Så er du klar"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Næste"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Luk"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Indstillinger"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Prøv igen"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Sådan!"</string>
diff --git a/quickstep/res/values-de/strings.xml b/quickstep/res/values-de/strings.xml
index 14f123fa5d..757c28c708 100644
--- a/quickstep/res/values-de/strings.xml
+++ b/quickstep/res/values-de/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Wische auf dem Bildschirm von unten nach oben, halte ihn gedrückt und lass ihn dann los."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Fertig"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Weiter"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Fertig"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Einstellungen"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Wiederholen"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Sehr gut!"</string>
diff --git a/quickstep/res/values-el/strings.xml b/quickstep/res/values-el/strings.xml
index ecc574f822..5f0117bf97 100644
--- a/quickstep/res/values-el/strings.xml
+++ b/quickstep/res/values-el/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Σύρετε προς τα πάνω από το κάτω μέρος της οθόνης σας, κρατήστε παρατεταμένα και έπειτα ελευθερώστε."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Όλα είναι έτοιμα"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Επόμενο"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Τέλος"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Ρυθμίσεις"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Δοκιμάστε ξανά"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Ωραία!"</string>
diff --git a/quickstep/res/values-en-rAU/strings.xml b/quickstep/res/values-en-rAU/strings.xml
index 882f98a53e..cc41b22835 100644
--- a/quickstep/res/values-en-rAU/strings.xml
+++ b/quickstep/res/values-en-rAU/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swipe up from the bottom of your screen, hold, then release."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"All set"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Next"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Done"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Settings"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Try again"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Nice!"</string>
diff --git a/quickstep/res/values-en-rCA/strings.xml b/quickstep/res/values-en-rCA/strings.xml
index 882f98a53e..cc41b22835 100644
--- a/quickstep/res/values-en-rCA/strings.xml
+++ b/quickstep/res/values-en-rCA/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swipe up from the bottom of your screen, hold, then release."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"All set"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Next"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Done"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Settings"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Try again"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Nice!"</string>
diff --git a/quickstep/res/values-en-rGB/strings.xml b/quickstep/res/values-en-rGB/strings.xml
index 882f98a53e..cc41b22835 100644
--- a/quickstep/res/values-en-rGB/strings.xml
+++ b/quickstep/res/values-en-rGB/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swipe up from the bottom of your screen, hold, then release."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"All set"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Next"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Done"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Settings"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Try again"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Nice!"</string>
diff --git a/quickstep/res/values-en-rIN/strings.xml b/quickstep/res/values-en-rIN/strings.xml
index 882f98a53e..cc41b22835 100644
--- a/quickstep/res/values-en-rIN/strings.xml
+++ b/quickstep/res/values-en-rIN/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swipe up from the bottom of your screen, hold, then release."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"All set"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Next"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Done"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Settings"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Try again"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Nice!"</string>
diff --git a/quickstep/res/values-en-rXC/strings.xml b/quickstep/res/values-en-rXC/strings.xml
index ce7dccc7ef..05f696db96 100644
--- a/quickstep/res/values-en-rXC/strings.xml
+++ b/quickstep/res/values-en-rXC/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‎‏‎‏‏‏‎‎‏‎‎‏‎‏‎‎‎‎‏‎‎‏‏‏‎‎‏‏‏‏‏‎‎‎‎‏‏‏‎‎‏‏‏‎‏‏‏‏‏‏‎‏‎‎Swipe up from the bottom of your screen, hold, then release.‎‏‎‎‏‎"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‎‎‎‏‏‏‎‎‎‏‎‎‏‎‏‏‎‏‎‏‎‏‎‏‏‏‎‏‎‏‏‏‎‏‏‎‏‏‎‎‎All set‎‏‎‎‏‎"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‏‏‏‎‎‏‏‎‏‎‏‎‏‏‏‏‎‎‎‎‏‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‎‎Next‎‏‎‎‏‎"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‎‏‎‏‎‎‏‎‏‏‎‏‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‎‎‏‏‎‎‎‎‏‎‏‎‎‎‏‏‎‏‎‏‎‏‎‏‏‏‎Done‎‏‎‎‏‎"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‎‎‏‎‏‏‎‎‏‎‎‏‏‏‎‏‏‎‏‎‎‏‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎Settings‎‏‎‎‏‎"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‎‎‏‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‎‎‏‏‎‎‏‏‎‎‎‏‏‎‎‏‎Try again‎‏‎‎‏‎"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‏‏‎‎‎‎Nice!‎‏‎‎‏‎"</string>
diff --git a/quickstep/res/values-es-rUS/strings.xml b/quickstep/res/values-es-rUS/strings.xml
index f8aa17d9f1..4f543e2caf 100644
--- a/quickstep/res/values-es-rUS/strings.xml
+++ b/quickstep/res/values-es-rUS/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Desliza el dedo hacia arriba desde la parte inferior de la pantalla, mantenlo presionado y, luego, suéltalo."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Listo"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Siguiente"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Listo"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Configuración"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Reintentar"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"¡Genial!"</string>
diff --git a/quickstep/res/values-es/strings.xml b/quickstep/res/values-es/strings.xml
index 9be5db1c7b..6bad7752da 100644
--- a/quickstep/res/values-es/strings.xml
+++ b/quickstep/res/values-es/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Desliza el dedo hacia arriba desde la parte inferior de la pantalla, mantenlo pulsado y levántalo."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Todo listo"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Siguiente"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Hecho"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Ajustes"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Reintentar"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"¡Muy bien!"</string>
diff --git a/quickstep/res/values-et/strings.xml b/quickstep/res/values-et/strings.xml
index 9241d30f7f..b9615d68db 100644
--- a/quickstep/res/values-et/strings.xml
+++ b/quickstep/res/values-et/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Pühkige ekraanikuva alaosast üles, hoidke ja seejärel vabastage."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Valmis"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Järgmine"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Valmis"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Seaded"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Proovige uuesti"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Tubli töö!"</string>
diff --git a/quickstep/res/values-eu/strings.xml b/quickstep/res/values-eu/strings.xml
index f810b4282e..1d992f7909 100644
--- a/quickstep/res/values-eu/strings.xml
+++ b/quickstep/res/values-eu/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Pasatu hatza pantailaren behealdetik gora, eduki pantaila sakatuta eta altxatu hatza."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Dena prest"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Hurrengoa"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Eginda"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Ezarpenak"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Saiatu berriro"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Ederki!"</string>
diff --git a/quickstep/res/values-fa/strings.xml b/quickstep/res/values-fa/strings.xml
index ccde33a31d..344040e001 100644
--- a/quickstep/res/values-fa/strings.xml
+++ b/quickstep/res/values-fa/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"از پایین صفحه‌نمایش تند به‌سمت بالا بکشید، نگه دارید، و سپس رها کنید."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"همه چیز آماده است"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"بعدی"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"تمام"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"تنظیمات"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"امتحان مجدد"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"عالی!"</string>
diff --git a/quickstep/res/values-fi/strings.xml b/quickstep/res/values-fi/strings.xml
index e903138770..7c877c7f8a 100644
--- a/quickstep/res/values-fi/strings.xml
+++ b/quickstep/res/values-fi/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Pyyhkäise ylöspäin näytön alareunasta ja päästä irti."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Valmista"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Seuraava"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Valmis"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Asetukset"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Yritä uudelleen"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Hienoa!"</string>
diff --git a/quickstep/res/values-fr-rCA/strings.xml b/quickstep/res/values-fr-rCA/strings.xml
index 1aa67e033a..7ba30a9d64 100644
--- a/quickstep/res/values-fr-rCA/strings.xml
+++ b/quickstep/res/values-fr-rCA/strings.xml
@@ -47,33 +47,32 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Application prédite : <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Assurez-vous de balayer l\'écran à partir de l\'extrémité gauche."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Assurez-vous de balayer l\'écran de l\'extrémité gauche jusqu\'au centre, puis de lever le doigt."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Bien! Maintenant, balayez à partir de la droite pour revenir."</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Vous pouvez aussi revenir à l\'écran précédent en balayant du côté droit jusqu\'au centre de l\'écran."</string>
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Bien! Maintenant, balayez-le à partir de la droite pour revenir."</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Vous pouvez aussi revenir à l\'écran précédent en balayant l\'écran du côté droit jusqu\'au centre."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Assurez-vous de balayer l\'écran à partir de l\'extrémité droite."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Assurez-vous de balayer l\'écran de l\'extrémité droite jusqu\'au centre, puis de lever le doigt."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Vous avez appris le geste de retour. Ensuite, vous apprendrez comment basculer entre les applications."</string>
-    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Vous avez appris le geste de retour."</string>
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Vous avez appris le geste de retour en arrière. Maintenant, apprenez comment changer d\'application."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Vous avez appris le geste de retour en arrière."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Assurez-vous de ne pas balayer trop près du bas de l\'écran."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Modifiez la sensibilité du geste de retour dans Paramètres"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Balayez l\'écran vers la gauche pour revenir en arrière"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Pour revenir à l\'écran précédent, balayez du côté gauche jusqu\'au centre de l\'écran."</string>
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Balayez l\'écran à partir de la gauche pour revenir en arrière."</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Pour revenir à l\'écran précédent, balayez l\'écran du côté gauche jusqu\'au centre."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Assurez-vous de balayer l\'écran à partir de l\'extrémité inférieure vers le haut."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Assurez-vous de ne pas interrompre le geste avant de lever le doigt."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Assurez-vous de balayer l\'écran en ligne droite vers le haut."</string>
-    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Vous avez appris le geste pour revenir à l\'écran d\'accueil. Apprenez ensuite à revenir en arrière."</string>
-    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Vous avez appris le geste pour revenir à l\'écran d\'accueil."</string>
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Vous avez appris le geste de retour à l\'écran d\'accueil. Maintenant, apprenez à revenir en arrière."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Vous avez appris le geste de retour à l\'écran d\'accueil."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Balayer pour revenir à l\'écran d\'accueil"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Balayez l\'écran du bas vers le haut. Ce geste vous ramène toujours à l\'écran d\'accueil."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Assurez-vous de balayer l\'écran à partir de l\'extrémité inférieure vers le haut."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Essayez de tenir la fenêtre plus longtemps avant de relâcher."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Assurez-vous de balayer l\'écran vers le haut, puis de faire une pause."</string>
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Vous avez appris à utiliser les gestes. Pour les désactiver, accédez au menu Paramètres."</string>
-    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Vous avez appris le geste pour basculer entre les applications."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Vous avez appris le geste de changement d\'application."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Balayer pour basculer entre les applications"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Balayez l\'écran de bas en haut, maintenez le doigt en place, puis relâchez-le."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Terminé"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Suivant"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Terminé"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Paramètres"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Réessayer"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bien!"</string>
diff --git a/quickstep/res/values-fr/strings.xml b/quickstep/res/values-fr/strings.xml
index e010152da4..9f0fe50fbb 100644
--- a/quickstep/res/values-fr/strings.xml
+++ b/quickstep/res/values-fr/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Balayez l\'écran du bas vers le haut, appuyez de manière prolongée, puis relevez le doigt."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Vous avez terminé"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Suivant"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"OK"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Paramètres"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Réessayez"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bravo !"</string>
diff --git a/quickstep/res/values-gl/strings.xml b/quickstep/res/values-gl/strings.xml
index eddca5d5af..68e91e9298 100644
--- a/quickstep/res/values-gl/strings.xml
+++ b/quickstep/res/values-gl/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Pasa o dedo cara arriba desde a parte inferior da pantalla, mantena premida e sepárao."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Todo listo"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Seguinte"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Feito"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Configuración"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Téntao de novo"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Excelente!"</string>
diff --git a/quickstep/res/values-gu/strings.xml b/quickstep/res/values-gu/strings.xml
index a35abda3cf..a02e5ebd95 100644
--- a/quickstep/res/values-gu/strings.xml
+++ b/quickstep/res/values-gu/strings.xml
@@ -47,43 +47,32 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"પૂર્વાનુમાનિત ઍપ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ખાતરી કરો કે તમે એકદમ દૂરની ડાબી કિનારીએથી સ્વાઇપ કરો છો."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ખાતરી કરો કે તમે ડાબી કિનારીએથી સ્ક્રીનના મધ્ય ભાગ સુધી સ્વાઇપ કરો છે અને આંગળી ઊંચકી લો છો."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"સરસ! હવે પાછા જવા માટે જમણેથી સ્વાઇપ કરો"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"તમે જમણી કિનારીએથી સ્ક્રીનના મધ્ય ભાગ સુધી સ્વાઇપ કરીને પણ છેલ્લી સ્ક્રીન પર પાછા જઈ શકો છો."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ખાતરી કરો કે તમે એકદમ દૂરની જમણી કિનારીએથી સ્વાઇપ કરો છો."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ખાતરી કરો કે તમે જમણી કિનારીએથી સ્ક્રીનના મધ્ય ભાગ સુધી સ્વાઇપ કરો છે અને આંગળી ઊંચકી લો છો."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"તમે પાછા જવાનો સંકેત પૂર્ણ કર્યો છે. હવે પછી, ઍપ સ્વિચ કરવાની રીત વિશે જાણો."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"તમે પાછા જવાનો સંકેત પૂર્ણ કર્યો છે."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ખાતરી કરો કે તમારાથી સ્ક્રીનની એકદમ નીચેની કિનારીની ખૂબ નજીક સુધી સ્વાઇપ ન થઈ જાય."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"પાછા જવાના સંકેતની સંવેદિતા બદલવા માટે, સેટિંગમાં જાઓ"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"પાછળ જવા ડાબેથી સ્વાઇપ કરો"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"તમે જે છેલ્લી સ્ક્રીન પર હતા તેની પર પાછા જવા, ડાબી કિનારીએથી સ્ક્રીનના મધ્ય ભાગ સુધી સ્વાઇપ કરો."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ખાતરી કરો કે તમે સ્ક્રીનની નીચેની કિનારીએથી ઉપરની તરફ સ્વાઇપ કરો છો."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ખાતરી કરો કે તમે આંગળી ઊંચકી લેતા પહેલાં સ્વાઇપ કરવાનું થોભાવતા નથી."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ખાતરી કરો કે તમે સીધું ઉપરની તરફ સ્વાઇપ કરો છો."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"તમે હોમ સ્ક્રીન પર પાછા જવાનો સંકેત પૂર્ણ કર્યો છે. હવે પછી, પાછા જવાની રીત વિશે જાણો."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"તમે હોમ સ્ક્રીન પર પાછા જવાનો સંકેત પૂર્ણ કર્યો છે."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"હોમ સ્ક્રીન પર જવા માટે સ્વાઇપ કરો"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"તમારી સ્ક્રીનના નીચેના ભાગથી ઉપરની તરફ સ્વાઇપ કરો. આ સંકેત તમને હંમેશાં હોમ સ્ક્રીન પર લઈ જાય છે."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ખાતરી કરો કે તમે સ્ક્રીનની નીચેની કિનારીએથી ઉપરની તરફ સ્વાઇપ કરો છો."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"તમારી આંગળી ઊંચકતા પહેલાં તેને વિન્ડો પર થોડી વધારે વાર માટે દબાવી રાખવાનો પ્રયાસ કરો."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"ખાતરી કરો કે તમે સીધું ઉપર સ્વાઇપ કરો છો, પછી થોભી જાઓ છો."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"સંકેતોનો ઉપયોગ કરવાની રીત વિશે તમે જાણ્યું. સંકેતો બંધ કરવા, સેટિંગમાં જાઓ."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"તમે ઍપ સ્વિચ કરવાનો સંકેત પૂર્ણ કર્યો છે."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ઍપ સ્વિચ કરવા સ્વાઇપ કરો"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"તમારી સ્ક્રીનના નીચેના ભાગથી ઉપરની તરફ સ્વાઇપ કરીને, થોડીવાર દબાવી રાખો, પછી છોડી દો."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"બધું સેટ થઈ ગયું"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"આગળ"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"થઈ ગયું"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"સેટિંગ"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ફરી પ્રયાસ કરો"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"સરસ!"</string>
diff --git a/quickstep/res/values-hi/strings.xml b/quickstep/res/values-hi/strings.xml
index fdf62a7fef..fa9ca53503 100644
--- a/quickstep/res/values-hi/strings.xml
+++ b/quickstep/res/values-hi/strings.xml
@@ -67,13 +67,12 @@
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"देख लें कि आप स्क्रीन के निचले किनारे से ऊपर की ओर स्वाइप कर रहे हों."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"कोशिश करें कि स्क्रीन से उंगली उठाने से पहले, इसे कुछ देर स्क्रीन पर दबाकर रखें."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"देख लें कि आप स्क्रीन पर ऊपर की तरफ़, बिल्कुल सीधे स्वाइप कर रहे हों और फिर रुकें."</string>
-    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"आपने हाथ के जेस्चर (हाव-भाव) को इस्तेमाल करना सीख लिया है. जेस्चर बंद करने के लिए, सेटिंग में जाएं."</string>
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"आपने हाथ के जेस्चर (हाव-भाव) इस्तेमाल करने सीख लिए हैं. जेस्चर बंद करने के लिए, सेटिंग में जाएं."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"आपने एक ऐप्लिकेशन से दूसरे पर जाने के लिए इस्तेमाल होने वाले हाथ के जेस्चर के बारे में जान लिया है."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"एक ऐप्लिकेशन से दूसरे पर जाने के लिए स्वाइप करें"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"अपनी स्क्रीन पर नीचे से ऊपर की तरफ़ स्वाइप करें, दबाकर रखें, फिर छोड़ दें."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"आप पूरी तरह तैयार हैं"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"आगे बढ़ें"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"हो गया"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"सेटिंग"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"फिर से कोशिश करें"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"बहुत बढ़िया!"</string>
@@ -83,7 +82,7 @@
     <string name="allset_description" msgid="6350320429953234580">"अब आप अपना फ़ोन इस्तेमाल कर सकते हैं"</string>
     <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"सुलभता के लिए नेविगेशन सेटिंग"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"शेयर करें"</string>
-    <string name="action_screenshot" msgid="8171125848358142917">"स्क्रीनशॉट"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"स्क्रीनशॉट लें"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ऐप्लिकेशन या आपका संगठन इस कार्रवाई की अनुमति नहीं देता"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"नेविगेशन ट्यूटोरियल छोड़ना चाहते हैं?"</string>
     <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"आप बाद में, <xliff:g id="NAME">%1$s</xliff:g> ऐप्लिकेशन पर इसे देख सकते हैं"</string>
diff --git a/quickstep/res/values-hr/strings.xml b/quickstep/res/values-hr/strings.xml
index 7c50ae2af5..b6ac921ba1 100644
--- a/quickstep/res/values-hr/strings.xml
+++ b/quickstep/res/values-hr/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Prijeđite prstom od dna zaslona prema gore, zadržite pritisak pa podignite prst."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Sve je spremno"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Dalje"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Gotovo"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Postavke"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Pokušajte ponovo"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Odlično!"</string>
diff --git a/quickstep/res/values-hu/strings.xml b/quickstep/res/values-hu/strings.xml
index 6436738cac..70ecf60051 100644
--- a/quickstep/res/values-hu/strings.xml
+++ b/quickstep/res/values-hu/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Csúsztasson felfelé a képernyő aljáról, tartsa lenyomva az ujját, majd emelje fel."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Minden kész"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Tovább"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Kész"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Beállítások"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Újra"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Remek!"</string>
diff --git a/quickstep/res/values-hy/strings.xml b/quickstep/res/values-hy/strings.xml
index 3ca7112611..9f58daaac4 100644
--- a/quickstep/res/values-hy/strings.xml
+++ b/quickstep/res/values-hy/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Մատը սահեցրեք էկրանի ներքևից վերև, պահեք և բաց թողեք։"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Պատրաստ է"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Առաջ"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Պատրաստ է"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Կարգավորումներ"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Նորից փորձեք"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Գերազանց է"</string>
diff --git a/quickstep/res/values-in/strings.xml b/quickstep/res/values-in/strings.xml
index 9efc53ea83..37b802fea5 100644
--- a/quickstep/res/values-in/strings.xml
+++ b/quickstep/res/values-in/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Geser ke atas dari bagian bawah layar, tahan, lalu lepaskan."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Semua siap"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Berikutnya"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Selesai"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Setelan"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Coba lagi"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bagus!"</string>
diff --git a/quickstep/res/values-is/strings.xml b/quickstep/res/values-is/strings.xml
index 2687b9c3d8..4fbd46bec5 100644
--- a/quickstep/res/values-is/strings.xml
+++ b/quickstep/res/values-is/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Strjúktu upp frá neðri hluta skjásins, haltu fingrinum á skjánum og slepptu svo."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Allt til reiðu"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Áfram"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Lokið"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Stillingar"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Reyna aftur"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Flott!"</string>
diff --git a/quickstep/res/values-it/strings.xml b/quickstep/res/values-it/strings.xml
index a37a102c3a..3323df9d47 100644
--- a/quickstep/res/values-it/strings.xml
+++ b/quickstep/res/values-it/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Scorri verso l\'alto dalla parte inferiore dello schermo, tieni premuto e rilascia."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Fatto"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Avanti"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Fine"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Impostazioni"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Riprova"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bene!"</string>
diff --git a/quickstep/res/values-iw/strings.xml b/quickstep/res/values-iw/strings.xml
index 8d61fd4440..84a862e5a6 100644
--- a/quickstep/res/values-iw/strings.xml
+++ b/quickstep/res/values-iw/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"יש להחליק למעלה מתחתית המסך, להחזיק ולאחר מכן לשחרר."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"הכול מוכן"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"הבא"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"סיום"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"הגדרות"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"אפשר לנסות שוב"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"איזה יופי!"</string>
diff --git a/quickstep/res/values-ja/strings.xml b/quickstep/res/values-ja/strings.xml
index 57fca5b5c6..7f04d4e943 100644
--- a/quickstep/res/values-ja/strings.xml
+++ b/quickstep/res/values-ja/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"画面を下から上にスワイプして長押しし、指を離します。"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"設定完了"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"次へ"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"完了"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"設定"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"再試行"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"成功"</string>
diff --git a/quickstep/res/values-ka/strings.xml b/quickstep/res/values-ka/strings.xml
index ea2e4d1af4..8fb83d4659 100644
--- a/quickstep/res/values-ka/strings.xml
+++ b/quickstep/res/values-ka/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"გადაფურცლეთ ეკრანის ქვედა კიდიდან ზემოთ, დააყოვნეთ, შემდეგ თითი აუშვით."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"მზად არის"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"შემდეგ"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"მზადაა"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"პარამეტრები"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ხელახლა ცდა"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"მშვენიერია!"</string>
diff --git a/quickstep/res/values-kk/strings.xml b/quickstep/res/values-kk/strings.xml
index 6515840d9a..8b08bc23e5 100644
--- a/quickstep/res/values-kk/strings.xml
+++ b/quickstep/res/values-kk/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Экранның төменгі жағынан жоғары қарай сырғытып, ұстап тұрыңыз да, жіберіңіз."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Бәрі дайын"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Келесі"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Дайын"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Параметрлер"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Қайталау"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Жақсы!"</string>
diff --git a/quickstep/res/values-km/strings.xml b/quickstep/res/values-km/strings.xml
index 5185c4cd6c..3513263eaf 100644
--- a/quickstep/res/values-km/strings.xml
+++ b/quickstep/res/values-km/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"អូសឡើងលើ​ពីផ្នែកខាងក្រោមនៃអេក្រង់​របស់អ្នក រួចសង្កត់​ឱ្យជាប់ បន្ទាប់មកដកដៃចេញ។"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"រួចហើយ"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"បន្ទាប់"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"រួចរាល់"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ការកំណត់"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ព្យាយាមម្ដងទៀត"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ល្អ!"</string>
diff --git a/quickstep/res/values-kn/strings.xml b/quickstep/res/values-kn/strings.xml
index dd3cb388dc..fcfdb3c113 100644
--- a/quickstep/res/values-kn/strings.xml
+++ b/quickstep/res/values-kn/strings.xml
@@ -47,43 +47,32 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ಶಿಫಾರಸು ಮಾಡಿದ ಆ್ಯಪ್: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ನೀವು ದೂರದ ಎಡ ಅಂಚಿನಿಂದ ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ಎಡ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ ಹಾಗೂ ನಿಮ್ಮ ಬೆರಳನ್ನು ಮೇಲೆತ್ತಿ."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"ಚೆನ್ನಾಗಿದೆ! ಹಿಂತಿರುಗಲು, ಈಗ ಬಲಗಡೆಯಿಂದ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"ಬಲ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ ಕೊನೆಯ ಸ್ಕ್ರೀನ್‌ಗೆ ಹೋಗಿ."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ನೀವು ದೂರದ ಬಲ ಅಂಚಿನಿಂದ ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ಬಲ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ ಹಾಗೂ ನಿಮ್ಮ ಬೆರಳನ್ನು ಮೇಲೆತ್ತಿ."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"ನೀವು ಗೋ ಬ್ಯಾಕ್ ಗೆಸ್ಚರ್ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದ್ದೀರಿ. ಮುಂದೆ, ಆ್ಯಪ್‌ಗಳನ್ನು ಬದಲಾಯಿಸುವುದು ಹೇಗೆ ಎಂದು ತಿಳಿಯಿರಿ."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ನೀವು ಗೋ ಬ್ಯಾಕ್ ಗೆಸ್ಚರ್ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದ್ದೀರಿ."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ನೀವು ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಭಾಗಕ್ಕೆ ಹೆಚ್ಚು ಹತ್ತಿರ ಸ್ವೈಪ್ ಮಾಡದಂತೆ ನೋಡಿಕೊಳ್ಳಿ."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ಬ್ಯಾಕ್ ಗೆಸ್ಚರ್‌ನ ಸೂಕ್ಷ್ಮತೆ ಬದಲಾಯಿಸಲು, ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಹೋಗಿ"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"ಹಿಂದಕ್ಕೆ ಹೋಗಲು, ಎಡದಿಂದ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"ಈ ಮೊದಲು ನೀವಿದ್ದ ಕೊನೆಯ ಸ್ಕ್ರೀನ್‌ಗೆ ಹಿಂತಿರುಗಲು, ಬಲ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಗಿನ ಅಂಚಿನಿಂದ ನೀವು ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ವಿರಾಮಗೊಳಿಸದೆ ನಿಮ್ಮ ಬೆರಳನ್ನು ಸ್ಕ್ರೀನ್‌ನಿಂದ ಮೇಲೆತ್ತಿ."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ನೀವು ನೇರವಾಗಿ ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"ನೀವು ಗೋ ಹೋಮ್ ಗೆಸ್ಚರ್ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದ್ದೀರಿ. ಮುಂದೆ, ಹಿಂದಕ್ಕೆ ಹೋಗುವುದು ಹೇಗೆ ಎಂದು ತಿಳಿಯಿರಿ."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"ನೀವು ಗೋ ಹೋಮ್ ಗೆಸ್ಚರ್ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದ್ದೀರಿ."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ಗೆ ಹಿಂತಿರುಗಲು ಸ್ವೈಪ್ ಮಾಡಿ"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಗಿನಿಂದ ಮೇಲೆ ಸ್ವೈಪ್ ಮಾಡಿ. ಈ ಗೆಸ್ಚರ್ ಯಾವಾಗಲೂ ನಿಮ್ಮನ್ನು ಹೋಮ್‌ ಸ್ಕ್ರೀನ್‌ಗೆ ಕರೆದೊಯ್ಯುತ್ತದೆ."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಗಿನ ಅಂಚಿನಿಂದ ನೀವು ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"ಬೆರಳನ್ನು ಮೇಲೆತ್ತುವ ಮೊದಲು ವಿಂಡೋವನ್ನು ಹೆಚ್ಚು ಸಮಯ ಹಿಡಿದಿಡಲು ಪ್ರಯತ್ನಿಸಿ."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"ನೀವು ನೇರವಾಗಿ ಸ್ವೈಪ್ ಮಾಡಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ, ನಂತರ ವಿರಾಮಗೊಳಿಸಿ."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"ಗೆಸ್ಚರ್‌ಗಳನ್ನು ಬಳಕೆಯನ್ನು ನೀವು ತಿಳಿದುಕೊಂಡಿರುವಿರಿ. ಗೆಸ್ಚರ್‌ಗಳನ್ನು ಆಫ್ ಮಾಡಲು, ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಹೋಗಿ."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"ನೀವು ಆ್ಯಪ್‌ಗಳನ್ನು ಬದಲಾಯಿಸುವ ಗೆಸ್ಚರ್ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದ್ದೀರಿ."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ಆ್ಯಪ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಲು ಸ್ವೈಪ್ ಮಾಡಿ"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ನಿಮ್ಮ ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಗಿನಿಂದ ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ, ಒತ್ತಿ ಹಿಡಿಯಿರಿ, ನಂತರ ಬಿಟ್ಟು ಬಿಡಿ."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"ಸಂಪೂರ್ಣ ಸಿದ್ಧವಾಗಿದೆ"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"ಮುಂದೆ"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"ಮುಗಿದಿದೆ"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ಪುನಃ ಪ್ರಯತ್ನಿಸಿ"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ಚೆನ್ನಾಗಿದೆ!"</string>
diff --git a/quickstep/res/values-ko/strings.xml b/quickstep/res/values-ko/strings.xml
index fb35a53f8c..66125f08d0 100644
--- a/quickstep/res/values-ko/strings.xml
+++ b/quickstep/res/values-ko/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"화면 하단에서 위로 스와이프하고 잠시 멈춘 다음 손가락을 떼세요"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"설정 완료"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"다음"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"완료"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"설정"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"다시 시도"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"잘하셨습니다"</string>
diff --git a/quickstep/res/values-ky/strings.xml b/quickstep/res/values-ky/strings.xml
index 6f631460a3..0c7bb73c66 100644
--- a/quickstep/res/values-ky/strings.xml
+++ b/quickstep/res/values-ky/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Экранды ылдыйдан өйдө карай сүрүп, бир аз коё бербей кармап туруңуз."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Дапдаяр!"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Кийинки"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Бүттү"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Жөндөөлөр"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Кайра аракет кылыңыз"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Сонун!"</string>
diff --git a/quickstep/res/values-lo/strings.xml b/quickstep/res/values-lo/strings.xml
index 7b2ed2eabc..b9b563a6ac 100644
--- a/quickstep/res/values-lo/strings.xml
+++ b/quickstep/res/values-lo/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ປັດຂຶ້ນຈາກລຸ່ມສຸດຂອງໜ້າຈໍທ່ານ, ຈາກນັ້ນປ່ອຍ."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"ທຸກຢ່າງພ້ອມແລ້ວ"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"ຕໍ່ໄປ"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"ແລ້ວໆ"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ການຕັ້ງຄ່າ"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ລອງໃໝ່"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ດີ!"</string>
diff --git a/quickstep/res/values-lt/strings.xml b/quickstep/res/values-lt/strings.xml
index bebefbbe28..d88c660ed7 100644
--- a/quickstep/res/values-lt/strings.xml
+++ b/quickstep/res/values-lt/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Perbraukite aukštyn nuo ekrano apačios, palaikykite ir paleiskite."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Viskas nustatyta"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Kitas"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Atlikta"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Nustatymai"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Bandykite dar kartą"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Šaunu!"</string>
diff --git a/quickstep/res/values-lv/strings.xml b/quickstep/res/values-lv/strings.xml
index 97a8197035..de589a9608 100644
--- a/quickstep/res/values-lv/strings.xml
+++ b/quickstep/res/values-lv/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Velciet augšup no ekrāna apakšdaļas, turiet un pēc tam atlaidiet."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Gatavs"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Tālāk"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Gatavs"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Iestatījumi"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Mēģināt vēlreiz"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Lieliski!"</string>
diff --git a/quickstep/res/values-mk/strings.xml b/quickstep/res/values-mk/strings.xml
index e21f45ca5b..4eb23f5b1b 100644
--- a/quickstep/res/values-mk/strings.xml
+++ b/quickstep/res/values-mk/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Повлечете нагоре од дното на екранот и задржете, па пуштете."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Готово"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Следно"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Готово"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Поставки"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Обиди се пак"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Одлично!"</string>
diff --git a/quickstep/res/values-ml/strings.xml b/quickstep/res/values-ml/strings.xml
index 85aebde36e..13002ee0b4 100644
--- a/quickstep/res/values-ml/strings.xml
+++ b/quickstep/res/values-ml/strings.xml
@@ -47,43 +47,32 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"പ്രവചിച്ച ആപ്പ്: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ഇടത്തേയറ്റത്തെ അരികിൽ നിന്ന് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ഇടത്തേ അരികിൽ നിന്ന് സ്‌ക്രീനിന്റെ മധ്യഭാഗത്തേക്ക് സ്വെെപ്പ് ചെയ്‌ത് വിടുക."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"കൊള്ളാം! പുറകോട്ട് പോകാൻ വലതുഭാഗത്ത് നിന്ന് സ്വൈപ്പ് ചെയ്യുക"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"സ്ക്രീനിന്റെ വലത് അരികിൽ നിന്ന് നടുവിലേക്ക് സ്വൈപ്പ് ചെയ്തും മുൻ സ്ക്രീനിലേക്ക് പോകാം."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"വലത്തേയറ്റത്തെ അരികിൽ നിന്ന് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"വലത്തേ അരികിൽ നിന്ന് സ്‌ക്രീനിന്റെ മധ്യഭാഗത്തേക്ക് സ്വെെപ്പ് ചെയ്‌ത് വിടുക."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"മടങ്ങുക ജെസ്ച്ചർ നിങ്ങൾ പൂർത്തിയാക്കി. അടുത്തത്, എങ്ങനെ ആപ്പുകൾ തമ്മിൽ മാറാമെന്ന് മനസ്സിലാക്കുക."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"മടങ്ങുക ജെസ്ച്ചർ നിങ്ങൾ പൂർത്തിയാക്കി."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"സ്‌ക്രീനിന്റെ ഏറ്റവും അടിഭാഗത്തേക്ക് സ്വെെപ്പ് ചെയ്യുന്നില്ലെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ബാക്ക്ജെസ്റ്ററിന്റെ സെൻസിറ്റിവിറ്റി മാറ്റാൻ ക്രമീകരണത്തിൽ പോകൂ"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"പുറകോട്ട് പോകാൻ ഇടതുഭാഗത്ത് നിന്ന് സ്വൈപ്പ് ചെയ്യുക"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"മുമ്പത്തെ സ്ക്രീനിലേക്ക് പോകാൻ, സ്ക്രീനിന്റെ ഇടത് അരികിൽ നിന്ന് നടുവിലേക്ക് സ്വൈപ്പ് ചെയ്യുക."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"സ്‌ക്രീനിന്റെ താഴത്തെ അരികിൽ നിന്ന് മുകളിലേക്ക് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"വിടുന്നതിന് മുമ്പ് നിങ്ങൾ താൽക്കാലികമായി നിർത്തുന്നില്ലെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"നേരെ മുകളിലേക്ക് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പിക്കുക."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"ഹോമിലേക്ക് പോകുക ജെസ്ച്ചർ പൂർത്തിയാക്കി. അടുത്തത്, ഹോമിലേക്ക് എങ്ങനെ പോകാമെന്ന് മനസ്സിലാക്കുക."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"ഹോമിലേക്ക് പോകുക ജെസ്ച്ചർ നിങ്ങൾ പൂർത്തിയാക്കി."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"ഹോമിലേക്ക് പോകാൻ സ്വെെപ്പ് ചെയ്യുക"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"സ്‌ക്രീനിന്റെ താഴെ നിന്ന് മുകളിലേക്ക് സ്വൈപ്പ് ചെയ്യൂ. ഈ ജെസ്ച്ചർ എപ്പോഴും ഹോം സ്‌ക്രീനിലേക്ക് നയിക്കുന്നു."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"സ്‌ക്രീനിന്റെ താഴത്തെ അരികിൽ നിന്ന് മുകളിലേക്ക് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"റിലീസ് ചെയ്യുന്നതിന് മുമ്പ് വിൻഡോ കൂടുതൽ സമയം ഹോൾഡ് ചെയ്യാൻ ശ്രമിക്കുക."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"നേരെ മുകളിലേക്ക് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പാക്കുക, ശേഷം താൽക്കാലികമായി നിർത്തുക."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"ജെസ്ച്ചറുകൾ ഉപയോഗിക്കുന്ന രീതി നിങ്ങൾ മനസ്സിലാക്കി. ജെസ്ച്ചറുകൾ ഓഫാക്കാൻ ക്രമീകരണത്തിലേക്ക് പോകുക."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"ആപ്പുകൾ തമ്മിൽ മാറുക ജെസ്‌ച്ചർ നിങ്ങൾ പൂർത്തിയാക്കി."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ആപ്പുകൾ മാറാൻ സ്വെെപ്പ് ചെയ്യുക"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"സ്‌ക്രീനിന്റെ താഴെ നിന്ന് മുകളിലേക്ക് സ്വൈപ്പ് ചെയ്‌ത് പിടിച്ച ശേഷം വിടുക."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"എല്ലാം സജ്ജീകരിച്ചു"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"അടുത്തത്"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"പൂർത്തിയായി"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ക്രമീകരണം"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"വീണ്ടും ശ്രമിക്കുക"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"കൊള്ളാം!"</string>
diff --git a/quickstep/res/values-mn/strings.xml b/quickstep/res/values-mn/strings.xml
index ea3a2201c0..c82568e6dd 100644
--- a/quickstep/res/values-mn/strings.xml
+++ b/quickstep/res/values-mn/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Дэлгэцийнхээ доод хэсгээс дээш шударч, удаан дараад суллана уу."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Бүгдийг тохируулсан"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Дараах"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Дууссан"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Тохиргоо"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Дахин оролдох"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Янзтай!"</string>
diff --git a/quickstep/res/values-mr/strings.xml b/quickstep/res/values-mr/strings.xml
index bb1f89094f..8f7d2773cf 100644
--- a/quickstep/res/values-mr/strings.xml
+++ b/quickstep/res/values-mr/strings.xml
@@ -47,43 +47,32 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"पूर्वानुमान केलेले अ‍ॅप: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"तुम्ही स्क्रीनच्या अगदी डाव्या कडेपासून स्‍वाइप करत आहात याची खात्री करा."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"तुम्ही स्क्रीनच्या डाव्या कडेपासून मध्यावर स्‍वाइप करून बोट उचलत आहात याची खात्री करा."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"छान! आता मागे जाण्यासाठी उजवीकडून स्वाइप करा"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"तुम्ही स्क्रीनच्या उजव्या कडेपासून मध्याभागी स्वाइप करून मागील स्क्रीनवर परतदेखील जाऊ शकता."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"तुम्ही स्क्रीनच्या अगदी उजव्या कडेपासून स्‍वाइप करत आहात याची खात्री करा."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"तुम्ही स्क्रीनच्या उजव्या कडेपासून मध्यावर स्‍वाइप करून बोट उचलत आहात याची खात्री करा."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"तुम्ही गो बॅक जेश्चर पूर्ण केले. आता, ॲप्स कशी स्विच करायची ते जाणून घ्या."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"तुम्ही गो बॅक जेश्चर पूर्ण केले."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"तुम्ही स्क्रीनच्या तळाच्या अगदी जवळून स्‍वाइप करत नाही याची खात्री करा."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"बॅक जेश्चरची संवेदनशीलता बदलण्यासाठी, सेटिंग्ज वर जा"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"मागे जाण्यासाठी डावीकडून स्वाइप करा"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"तुम्ही होतात त्या मागील स्क्रीनवर परत जाण्यासाठी, स्क्रीनच्या डाव्या कडेपासून मध्याभागी स्वाइप करा."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"तुम्ही स्क्रीनच्या तळाच्या कडेपासून वर स्वाइप करत आहात याची खात्री करा."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"तुम्ही स्क्रीनवरून बोट उचलण्यापूर्वी ते थांबवत नाही याची खात्री करा."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"तुम्ही सरळ वर स्वाइप करत आहात याची खात्री करा."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"तुम्ही गो होम जेश्चर पूर्ण केले. आता, मागे कसे जायचे ते जाणून घ्या."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"तुम्ही गो होम जेश्चर पूर्ण केले."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"होमवर जाण्यासाठी स्‍वाइप करा"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"तुमच्या स्क्रीनच्या तळाकडून वर स्वाइप करा. हे जेश्चर तुम्हाला नेहमी होम स्क्रीनवर घेऊन जाते."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"तुम्ही स्क्रीनच्या तळाच्या कडेपासून वर स्वाइप करत आहात याची खात्री करा."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"विंडोवरून बोट उचलण्यापूर्वी थोडा वेळ ते तेथेच धरून ठेवा."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"तुम्ही सरळ वर स्वाइप करून, त्यानंतर बोट थांबवत आहात याची खात्री करा."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"तुम्ही जेश्चर कसे वापरायचे हे शिकलात. जेश्चर बंद करण्यासाठी, सेटिंग्ज वर जा."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"तुम्ही ॲप्स स्विच करण्याचे जेश्चर पूर्ण केले."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"अ‍ॅप्स स्विच करण्यासाठी स्वाइप करा"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"तुमच्या स्क्रीनच्या तळाकडून वर स्वाइप करा, धरून ठेवा, त्यानंतर बोट उचला."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"सर्व तयार आहे"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"पुढील"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"पूर्ण झाले"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"सेटिंग्ज"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"पुन्हा प्रयत्न करा"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"छान!"</string>
diff --git a/quickstep/res/values-ms/strings.xml b/quickstep/res/values-ms/strings.xml
index c458c7a5e5..9585d42418 100644
--- a/quickstep/res/values-ms/strings.xml
+++ b/quickstep/res/values-ms/strings.xml
@@ -47,43 +47,32 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Apl yang diramalkan: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pastikan anda meleret dari hujung sebelah kiri."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pastikan anda meleret dari tepi sebelah kiri ke tengah skrin dan lepaskan."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Bagus! Leret dari kanan untuk kembali sekarang"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Anda juga boleh kembali ke skrin terakhir dengan meleret dari tepi sebelah kanan ke tengah skrin."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pastikan anda meleret dari hujung sebelah kanan."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pastikan anda meleret dari tepi sebelah kanan ke tengah skrin dan lepaskan."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Anda telah melengkapkan gerak isyarat undur. Seterusnya, ketahui cara menukar apl."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Anda telah melengkapkan gerak isyarat undur."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pastikan anda tidak meleret terlalu dekat dengan bahagian bawah skrin."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Utk mengubah kepekaan gerak isyarat undur, pergi ke Tetapan"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Leret dari kiri untuk kembali"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Untuk kembali ke skrin terakhir yang anda berada, leret dari tepi sebelah kiri ke tengah skrin."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pastikan anda meleret ke atas dari tepi sebelah bawah skrin."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pastikan anda tidak menjeda sebelum melepaskan gerak isyarat tersebut."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pastikan anda meleret terus ke atas."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Anda telah melengkapkan gerak isyarat pergi ke Laman Utama. Seterusnya, ketahui cara kembali."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Anda telah melengkapkan gerak isyarat pergi ke Laman Utama."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Leret untuk kembali ke laman utama"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Leret ke atas dari bahagian bawah skrin. Gerak isyarat ini sentiasa membawa anda ke Skrin utama."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Pastikan anda meleret ke atas dari tepi sebelah bawah skrin."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Cuba tahan tetingkap untuk tempoh yang lebih lama sebelum melepaskan."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Pastikan anda meleret ke atas, kemudian menjeda."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Anda mempelajari cara menggunakan gerak isyarat. Untuk mematikan gerak isyarat, pergi ke Tetapan."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Anda telah melengkapkan gerak isyarat menukar apl."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Leret untuk menukar apl"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Leret ke atas dari bahagian bawah skrin anda, tahan, kemudian lepaskan."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Selesai"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Seterusnya"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Selesai"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Tetapan"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Cuba lagi"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bagus!"</string>
diff --git a/quickstep/res/values-my/strings.xml b/quickstep/res/values-my/strings.xml
index 44d096259a..63c495fb6f 100644
--- a/quickstep/res/values-my/strings.xml
+++ b/quickstep/res/values-my/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"သင့်ဖန်သားပြင် အောက်ခြေမှ အပေါ်သို့ ပွတ်ဆွဲပါ၊ ဖိထားပြီးနောက် လွှတ်လိုက်ပါ။"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"အားလုံးအဆင်သင့်ဖြစ်ပါပြီ"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"ရှေ့သို့"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"ပြီးပြီ"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ဆက်တင်များ"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ထပ်စမ်းကြည့်ရန်"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ကောင်းသည်။"</string>
diff --git a/quickstep/res/values-nb/strings.xml b/quickstep/res/values-nb/strings.xml
index 42ba19f92e..397679bc3f 100644
--- a/quickstep/res/values-nb/strings.xml
+++ b/quickstep/res/values-nb/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Sveip opp fra bunnen av skjermen, hold og slipp."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Ferdig"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Neste"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Ferdig"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Innstillinger"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Prøv igjen"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bra!"</string>
diff --git a/quickstep/res/values-ne/strings.xml b/quickstep/res/values-ne/strings.xml
index cd9f79a9fd..7dfad54325 100644
--- a/quickstep/res/values-ne/strings.xml
+++ b/quickstep/res/values-ne/strings.xml
@@ -47,43 +47,32 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"पूर्वानुमान गरिएको एप: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"स्क्रिनको सबैभन्दा बायाँ किनाराबाट स्वाइप गर्नुहोस्।"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"स्क्रिनको बायाँ किनाराबाट मध्य भागसम्म स्वाइप गर्नुहोस् अनि औँला उठाउनुहोस्।"</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"राम्रो! अब पछाडि जान दायाँ किनाराबाट स्वाइप गर्नुहोस्"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"तपाईं स्क्रिनको दायाँ किनाराबाट मध्य भागसम्म स्वाइप गरेर पनि यसअघिको स्क्रिनमा फर्कन सक्नुहुन्छ।"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"स्क्रिनको सबैभन्दा दायाँ किनाराबाट स्वाइप गर्नुहोस्।"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"स्क्रिनको दायाँ किनाराबाट मध्य भागसम्म स्वाइप गर्नुहोस् अनि औँला उठाउनुहोस्।"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"तपाईंले \'पछाडि जानुहोस्\' नामक इसारा प्रयोग गर्ने तरिका सिक्नुभयो। अब एउटा एपबाट अर्को एपमा जाने तरिका सिक्नुहोस्।"</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"तपाईंले \'पछाडि जानुहोस्\' नामक इसारा प्रयोग गर्ने तरिका सिक्नुभयो।"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"स्क्रिनको फेदको धेरै नजिकसम्म स्वाइप नगर्नुहोस्।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"\'पछाडि\' नामक इसाराको संवेदनशीलता बदल्न सेटिङमा जानुहोस्"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"पछाडि जान बायाँ किनाराबाट स्वाइप गर्नुहोस्"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"तपाईं यसअघि जुन स्क्रिनमा हुनुहुन्थ्यो त्यो फर्कन स्क्रिनको बायाँ किनाराबाट मध्य भागसम्म स्वाइप गर्नुहोस्।"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"स्क्रिनको फेदबाट माथितिर स्वाइप गर्नुहोस्।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"औँला उठाउनुअघि नरोकिनुहोस्।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"सीधै माथितिर स्वाइप गर्नुहोस्।"</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"तपाईंले \'होम स्क्रिनमा जानुहोस्\' नामक इसारा प्रयोग गर्ने तरिका सिक्नुभयो। अब पछाडि जाने तरिका सिक्नुहोस्।"</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"तपाईंले \'होम स्क्रिनमा जानुहोस्\' नामक इसारा प्रयोग गर्ने तरिका सिक्नुभयो।"</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"होम स्क्रिनमा जान स्वाइप गर्नुहोस्"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"स्क्रिनको फेदबाट माथितिर स्वाइप गर्नुहोस्। यो इसारा प्रयोग गर्दा सधैँ होम स्क्रिन खुल्छ।"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"स्क्रिनको फेदबाट माथितिर स्वाइप गर्नुहोस्।"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"स्क्रिनबाट औँला उठाउनुअघि एपको विन्डोमा केही बेर छोइराख्नुहोस्।"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"सीधै माथितिर स्वाइप गर्नुहोस् अनि रोकिनुहोस्।"</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"तपाईंले इसाराहरू प्रयोग गर्ने तरिका सिक्नुभयो। इसारा अफ गर्न सेटिङमा जानुहोस्।"</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"तपाईंले \'एउटा एपबाट अर्को एपमा जानुहोस्\' नामक इसारा प्रयोग गर्ने तरिका सिक्नुभयो।"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"एउटा एपबाट अर्को एपमा जान स्वाइप गर्नुहोस्"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"स्क्रिनको फेदबाट माथितिर स्वाइप गर्नुहोस्, छोइराख्नुहोस् अनि औँला उठाउनुहोस्।"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"सबै तयार छ"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"अर्को"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"सम्पन्न भयो"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"सेटिङ"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"फेरि प्रयास गर्नुहोस्"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"राम्रो!"</string>
diff --git a/quickstep/res/values-nl/strings.xml b/quickstep/res/values-nl/strings.xml
index af043e104f..5ef7b489eb 100644
--- a/quickstep/res/values-nl/strings.xml
+++ b/quickstep/res/values-nl/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swipe omhoog vanaf de onderkant van het scherm, houd vast en laat dan los."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Klaar"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Volgende"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Klaar"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Instellingen"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Opnieuw"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Dat gaat lekker."</string>
diff --git a/quickstep/res/values-or/strings.xml b/quickstep/res/values-or/strings.xml
index 84f52b41ab..abe1af1921 100644
--- a/quickstep/res/values-or/strings.xml
+++ b/quickstep/res/values-or/strings.xml
@@ -47,43 +47,32 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ପୂର୍ବାନୁମାନ କରାଯାଇଥିବା ଆପ୍: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ଆପଣ ଦୂର-ବାମ ଧାରରୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ଆପଣ ସ୍କ୍ରିନର ବାମ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରି ଛାଡ଼ି ଦେଉଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"ବଢ଼ିଆ! ବର୍ତ୍ତମାନ ପଛକୁ ଫେରିବା ପାଇଁ ଡାହାଣ ଧାରରୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"ଆପଣ ସ୍କ୍ରିନର ଡାହାଣ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରି ପୂର୍ବ ସ୍କ୍ରିନକୁ ମଧ୍ୟ ଫେରିପାରିବେ।"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ଆପଣ ଦୂର-ଡାହାଣ ଧାରରୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ଆପଣ ସ୍କ୍ରିନର ଡାହାଣ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରି ଛାଡ଼ି ଦେଉଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"ଆପଣ \'ପଛକୁ ଫେରନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି। ତା\'ପରେ, ଆପଗୁଡ଼ିକୁ କିପରି ସ୍ୱିଚ୍ କରିବେ ତାହା ଜାଣନ୍ତୁ।"</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ଆପଣ \'ପଛକୁ ଫେରନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି।"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ଆପଣ ସ୍କ୍ରିନର ତଳଭାଗର ଅତି ନିକଟରୁ ସ୍ୱାଇପ୍ କରୁନଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ପଛକୁ ଫେରିବା ଜେଶ୍ଚରର ସମ୍ବେଦନଶୀଳତା ବଦଳାଇବାକୁ ସେଟିଂସକୁ ଯାଆନ୍ତୁ"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"ପଛକୁ ଫେରିବା ପାଇଁ ବାମ ଧାରରୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"ଆପଣ ଯେଉଁ ପୂର୍ବ ସ୍କ୍ରିନରେ ଥିଲେ ସେହି ସ୍କ୍ରିନକୁ ଫେରିବା ପାଇଁ, ସ୍କ୍ରିନର ବାମ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ।"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ଆପଣ ସ୍କ୍ରିନର ତଳ ଧାରରୁ ଉପରକୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ଆପଣ ଛାଡ଼ିବା ପୂର୍ବରୁ ବିରତ କରୁନଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ଆପଣ ସିଧା ଉପରକୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"ଆପଣ \'ମୂଳପୃଷ୍ଠାକୁ ଯାଆନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି। ତା\'ପରେ, ପଛକୁ କିପରି ଫେରିବେ ତାହା ଜାଣନ୍ତୁ।"</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"ଆପଣ \'ମୂଳପୃଷ୍ଠାକୁ ଯାଆନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି।"</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"ମୂଳପୃଷ୍ଠାକୁ ଯିବା ପାଇଁ ସ୍ୱାଇପ୍ କରନ୍ତୁ"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"ଆପଣଙ୍କ ସ୍କ୍ରିନର ତଳୁ ଉପରକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ। ଏହି ଜେଶ୍ଚର୍ ସର୍ବଦା ଆପଣଙ୍କୁ ମୂଳସ୍କ୍ରିନକୁ ନେଇଥାଏ।"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ଆପଣ ସ୍କ୍ରିନର ତଳ ଧାରରୁ ଉପରକୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"ୱିଣ୍ଡୋକୁ ରିଲିଜ୍ କରିବା ପୂର୍ବରୁ ଅଧିକ ସମୟ ଧରି ରଖିବାକୁ ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"ଆପଣ ସିଧା ଉପରକୁ ସ୍ୱାଇପ୍ କରି ତା\'ପରେ ବିରତ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"ଜେଶ୍ଚରଗୁଡ଼ିକୁ କିପରି ବ୍ୟବହାର କରାଯିବ ଆପଣ ତାହା ଶିଖିଛନ୍ତି। ଜେଶ୍ଚରଗୁଡ଼ିକୁ ବନ୍ଦ କରିବାକୁ, ସେଟିଂସକୁ ଯାଆନ୍ତୁ।"</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"ଆପଣ \'ଆପଗୁଡ଼ିକୁ ସ୍ୱିଚ୍ କରନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି।"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ଆପଗୁଡ଼ିକୁ ସ୍ୱିଚ୍ କରିବା ପାଇଁ ସ୍ୱାଇପ୍ କରନ୍ତୁ"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ଆପଣଙ୍କ ସ୍କ୍ରିନର ତଳୁ ଉପରକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ, ଧରି ରଖନ୍ତୁ, ତା\'ପରେ ରିଲିଜ୍ କରନ୍ତୁ।"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"ସବୁ ପ୍ରସ୍ତୁତ"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"ପରବର୍ତ୍ତୀ"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"ହୋଇଗଲା"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ସେଟିଂସ୍"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ବଢ଼ିଆ!"</string>
diff --git a/quickstep/res/values-pa/strings.xml b/quickstep/res/values-pa/strings.xml
index fc3ea1c227..eb0f1b0669 100644
--- a/quickstep/res/values-pa/strings.xml
+++ b/quickstep/res/values-pa/strings.xml
@@ -47,43 +47,32 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ਪੂਰਵ ਅਨੁਮਾਨਿਤ ਐਪ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਦੂਰ-ਖੱਬੇ ਕਿਨਾਰੇ ਤੋਂ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਖੱਬੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰਦੇ ਹੋ ਅਤੇ ਛੱਡ ਦਿੰਦੇ ਹੋ।"</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"ਵਧੀਆ! ਹੁਣ ਪਿੱਛੇ ਜਾਣ ਲਈ ਸੱਜੇ ਪਾਸੇ ਤੋਂ ਸਵਾਈਪ ਕਰੋ"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"ਤੁਸੀਂ ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰਕੇ ਪਿਛਲੀ ਸਕ੍ਰੀਨ \'ਤੇ ਵਾਪਸ ਜਾ ਸਕਦੇ ਹੋ।"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਦੂਰ-ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰਦੇ ਹੋ ਅਤੇ ਛੱਡ ਦਿੰਦੇ ਹੋ।"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"ਤੁਸੀਂ \'ਵਾਪਸ ਜਾਓ\' ਦਾ ਇਸ਼ਾਰਾ ਪੂਰਾ ਕੀਤਾ। ਅੱਗੇ, ਜਾਣੋ ਕਿ ਐਪਾਂ ਵਿਚਾਲੇ ਅਦਲਾ-ਬਦਲੀ ਕਿਵੇਂ ਕਰਨੀ ਹੈ।"</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ਤੁਸੀਂ \'ਵਾਪਸ ਜਾਓ\' ਦਾ ਇਸ਼ਾਰਾ ਪੂਰਾ ਕੀਤਾ।"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਲੇ ਹਿੱਸੇ ਦੇ ਬਹੁਤ ਨੇੜੇ ਸਵਾਈਪ ਨਾ ਕਰੋ।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ਪਿੱਛੇ ਜਾਣ ਦੇ ਸੰਕੇਤ ਦੀ ਸੰਵੇਦਨਸ਼ੀਲਤਾ ਬਦਲਣ ਲਈ, ਸੈਟਿੰਗਾਂ \'ਤੇ ਜਾਓ"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"ਪਿੱਛੇ ਜਾਣ ਲਈ ਖੱਬੇ ਪਾਸੇ ਤੋਂ ਸਵਾਈਪ ਕਰੋ"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"ਜਿੱਥੇ ਤੁਸੀਂ ਸੀ ਉਸ ਸਕ੍ਰੀਨ \'ਤੇ ਵਾਪਸ ਜਾਣ ਲਈ, ਖੱਬੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰੋ।"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਲੇ ਕਿਨਾਰੇ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ਪੱਕਾ ਕਰੋ ਕਿ ਸਕ੍ਰੀਨ ਨੂੰ ਛੱਡਣ ਤੋਂ ਪਹਿਲਾਂ ਰੁਕੋ ਨਾ।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਿੱਧੇ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"ਤੁਸੀਂ \'ਹੋਮ \'ਤੇ ਜਾਓ\' ਦਾ ਇਸ਼ਾਰਾ ਪੂਰਾ ਕੀਤਾ। ਅੱਗੇ, ਜਾਣੋ ਕਿ ਪਿੱਛੇ ਕਿਵੇਂ ਜਾਣਾ ਹੈ।"</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"ਤੁਸੀਂ \'ਹੋਮ \'ਤੇ ਜਾਓ\' ਦਾ ਇਸ਼ਾਰਾ ਪੂਰਾ ਕੀਤਾ।"</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"ਹੋਮ \'ਤੇ ਜਾਣ ਲਈ ਸਵਾਈਪ ਕਰੋ"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"ਆਪਣੀ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਾਂ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ। ਇਹ ਸੰਕੇਤ ਹਮੇਸ਼ਾਂ ਤੁਹਾਨੂੰ ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਲੈ ਜਾਂਦਾ ਹੈ।"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਲੇ ਕਿਨਾਰੇ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"ਛੱਡਣ ਤੋਂ ਪਹਿਲਾਂ ਵਿੰਡੋ ਨੂੰ ਕੁਝ ਸਮੇਂ ਲਈ ਦਬਾ ਕੇ ਰੱਖੋ।"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਿੱਧੇ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰਦੇ ਹੋ, ਫਿਰ ਰੋਕੋ।"</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"ਤੁਸੀਂ ਇਸ਼ਾਰੇ ਵਰਤਣ ਬਾਰੇ ਜਾਣਿਆ। ਇਸ਼ਾਰੇ ਬੰਦ ਕਰਨ ਲਈ, ਸੈਟਿੰਗਾਂ \'ਤੇ ਜਾਓ।"</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"ਤੁਸੀਂ \'ਐਪਾਂ ਵਿਚਾਲੇ ਅਦਲਾ-ਬਦਲੀ ਕਰੋ\' ਦਾ ਇਸ਼ਾਰਾ ਪੂਰਾ ਕੀਤਾ।"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ਐਪਾਂ ਵਿਚਾਲੇ ਅਦਲਾ-ਬਦਲੀ ਕਰਨ ਲਈ ਸਵਾਈਪ ਕਰੋ"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ਆਪਣੀ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਾਂ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰਕੇ ਦਬਾਈ ਰੱਖੋ, ਅਤੇ ਫਿਰ ਛੱਡੋ।"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"ਪੂਰੀ ਤਰ੍ਹਾਂ ਤਿਆਰ"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"ਅੱਗੇ"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"ਹੋ ਗਿਆ"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ਸੈਟਿੰਗਾਂ"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ਵਧੀਆ!"</string>
diff --git a/quickstep/res/values-pl/strings.xml b/quickstep/res/values-pl/strings.xml
index 6a8f188a3c..08a8ba4417 100644
--- a/quickstep/res/values-pl/strings.xml
+++ b/quickstep/res/values-pl/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Przesuń palcem od dołu ekranu, przytrzymaj i puść."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Wszystko gotowe"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Dalej"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Gotowe"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Ustawienia"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Spróbuj ponownie"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Super!"</string>
diff --git a/quickstep/res/values-pt-rPT/strings.xml b/quickstep/res/values-pt-rPT/strings.xml
index b553c4c92b..ec14c25f9b 100644
--- a/quickstep/res/values-pt-rPT/strings.xml
+++ b/quickstep/res/values-pt-rPT/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Deslize rapidamente para cima a partir da parte inferior do ecrã sem soltar e, em seguida, solte."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Está tudo pronto"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Seguinte"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Concluído"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Definições"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Tente novamente"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Boa!"</string>
diff --git a/quickstep/res/values-pt/strings.xml b/quickstep/res/values-pt/strings.xml
index 3b3148f258..3a641fecc6 100644
--- a/quickstep/res/values-pt/strings.xml
+++ b/quickstep/res/values-pt/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Deslize de baixo para cima na tela, mantenha-a pressionada e depois solte."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Tudo pronto"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Próxima"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Concluído"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Configurações"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Tentar novamente"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Muito bem!"</string>
diff --git a/quickstep/res/values-ro/strings.xml b/quickstep/res/values-ro/strings.xml
index 11d23d1945..2803844540 100644
--- a/quickstep/res/values-ro/strings.xml
+++ b/quickstep/res/values-ro/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Glisați în sus din partea de jos a ecranului, așteptați, apoi eliberați."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Gata"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Înainte"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Gata"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Setări"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Reîncercați"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bravo!"</string>
diff --git a/quickstep/res/values-ru/strings.xml b/quickstep/res/values-ru/strings.xml
index e8a1be3a80..d70980684a 100644
--- a/quickstep/res/values-ru/strings.xml
+++ b/quickstep/res/values-ru/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Проведите вверх от нижнего края экрана, задержите палец в крайнем положении, а затем отпустите."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Готово"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Далее"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Готово"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Настройки"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Повторите попытку"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Поздравляем!"</string>
diff --git a/quickstep/res/values-si/strings.xml b/quickstep/res/values-si/strings.xml
index f540b44a10..1f735552ea 100644
--- a/quickstep/res/values-si/strings.xml
+++ b/quickstep/res/values-si/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ඔබගේ තිරයේ පහළින් උඩට ස්වයිප් කර, අල්ලාගෙන සිට, අනතුරුව මුදා හරින්න."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"සියල්ල සකසා ඇත"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"ඊළඟ"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"නිමයි"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"සැකසීම්"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"නැවත උත්සාහ කරන්න"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"කදිමයි!"</string>
diff --git a/quickstep/res/values-sk/strings.xml b/quickstep/res/values-sk/strings.xml
index 95f220d29d..c2f9a239a3 100644
--- a/quickstep/res/values-sk/strings.xml
+++ b/quickstep/res/values-sk/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Potiahnite nahor z dolnej časti obrazovky, pridržte a uvoľnite."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Hotovo"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Ďalej"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Hotovo"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Nastavenia"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Skúste to znova"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Výborne!"</string>
diff --git a/quickstep/res/values-sl/strings.xml b/quickstep/res/values-sl/strings.xml
index 42b093d6bb..cf160ba931 100644
--- a/quickstep/res/values-sl/strings.xml
+++ b/quickstep/res/values-sl/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Povlecite navzgor z dna zaslona, pridržite, nato izpustite."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Zdaj znate"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Naprej"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Končano"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Nastavitve"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Poskusite znova"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Odlično!"</string>
diff --git a/quickstep/res/values-sq/strings.xml b/quickstep/res/values-sq/strings.xml
index cee7183616..2097f35424 100644
--- a/quickstep/res/values-sq/strings.xml
+++ b/quickstep/res/values-sq/strings.xml
@@ -73,19 +73,14 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Rrëshqit shpejt lart nga fundi i ekranit, mbaje të shtypur dhe më pas lëshoje."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Plotësisht gati"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Para"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"U krye"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Cilësimet"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Provo përsëri"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bukur!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Udhëzuesi <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"Plotësisht gati!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"Rrëshqit shpejt lart për të shkuar në ekranin bazë"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Je gati për të filluar përdorimin e telefonit tënd"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Cilësimet e navigimit për qasshmërinë"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Ndaj"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Pamja e ekranit"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Ky veprim nuk lejohet nga aplikacioni ose organizata jote"</string>
diff --git a/quickstep/res/values-sr/strings.xml b/quickstep/res/values-sr/strings.xml
index 21bcda23e5..58ccab1ba1 100644
--- a/quickstep/res/values-sr/strings.xml
+++ b/quickstep/res/values-sr/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Превуците нагоре од дна екрана, задржите, па пустите."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"То је то"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Даље"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Готово"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Подешавања"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Пробајте поново"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Свака част!"</string>
diff --git a/quickstep/res/values-sv/strings.xml b/quickstep/res/values-sv/strings.xml
index dd3490b4b9..2f8f8cf4ff 100644
--- a/quickstep/res/values-sv/strings.xml
+++ b/quickstep/res/values-sv/strings.xml
@@ -83,7 +83,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Svep uppåt från skärmens nederkant. Håll fingret nedtryckt och släpp sedan."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Klart"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Nästa"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Klar"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Inställningar"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Försök igen"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bra!"</string>
diff --git a/quickstep/res/values-sw/strings.xml b/quickstep/res/values-sw/strings.xml
index d8bfcf06d4..1d5c77efa3 100644
--- a/quickstep/res/values-sw/strings.xml
+++ b/quickstep/res/values-sw/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Telezesha kidole juu kuanzia sehemu ya chini ya skrini yako, ushikilie, kisha uachilie."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Kila kitu kiko tayari"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Endelea"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Nimemaliza"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Mipangilio"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Jaribu tena"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Safi!"</string>
diff --git a/quickstep/res/values-ta/strings.xml b/quickstep/res/values-ta/strings.xml
index d12c51c2a8..a86446aa9e 100644
--- a/quickstep/res/values-ta/strings.xml
+++ b/quickstep/res/values-ta/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"திரையின் கீழிலிருந்து மேலாக ஸ்வைப் செய்து, சில விநாடிகள் பிடித்திருந்து, பிறகு விரலை எடுங்கள்."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"எல்லாம் தயார்"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"அடுத்து"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"முடிந்தது"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"அமைப்புகள்"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"மீண்டும் முயல்க"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"அருமை!"</string>
diff --git a/quickstep/res/values-te/strings.xml b/quickstep/res/values-te/strings.xml
index 78932d5e34..5d23cc07b6 100644
--- a/quickstep/res/values-te/strings.xml
+++ b/quickstep/res/values-te/strings.xml
@@ -47,43 +47,32 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"సూచించబడిన యాప్: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"మీరు చాలా-ఎడమ అంచు నుండి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"మీరు ఎడమ అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేశారని నిర్ధారించుకోని, ఆపై మీ వేలిని ఎత్తండి."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"బాగుంది! ఇప్పుడు తిరిగి వెళ్ళడానికి కుడి నుండి స్వైప్ చేయండి"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"కుడి అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేయడం ద్వారా మీరు చివరి స్క్రీన్‌కు తిరిగి వెళ్ళవచ్చు."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"మీరు చాలా-కుడి అంచు నుండి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"మీరు కుడి అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేశారని నిర్ధారించుకోని, ఆపై మీ వేలిని ఎత్తండి."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"మీరు తిరిగి వెనక్కు వెళ్లే సంజ్ఞను పూర్తి చేశారు. తర్వాత, యాప్‌ల మధ్య ఎలా మారాలో తెలుసుకోండి."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"మీరు తిరిగి వెనక్కు వెళ్లే సంజ్ఞను పూర్తి చేశారు."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"మీరు స్క్రీన్ దిగువకు చాలా దగ్గరగా స్వైప్ చేయలేదని నిర్ధారించుకోండి."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"వెనుక సంజ్ఞ సున్నితత్వం మార్చడానికి, సెట్టింగ్‌లకు వెళ్లండి"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"వెనుకకు వెళ్లడానికి ఎడమ వైపు నుండి స్వైప్ చేయండి"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"మీరు ఉన్న చివరి స్క్రీన్‌కు తిరిగి వెళ్లడానికి, ఎడమ అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేయండి."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"మీరు స్క్రీన్ దిగువ అంచు నుండి పైకి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"బయలుదేరే ముందు మీరు పాజ్ చేయకుండా చూసుకోండి."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"మీరు నేరుగా పైకి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"మీరు మొదటి ట్యాబ్‌కు వెళ్లే సంజ్ఞను పూర్తి చేశారు. తర్వాత, వెనుకకు ఎలా వెళ్లాలో తెలుసుకోండి."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"మీరు మొదటి ట్యాబ్‌కు వెళ్లే సంజ్ఞను పూర్తి చేశారు."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"వర్చువల్ హోమ్‌కి వెళ్లడానికి స్వైప్ చేయండి"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"మీ స్క్రీన్ కింది నుండి పైకి స్వైప్ చేయి. ఈ సంజ్ఞ ఎప్పుడూ మిమ్మల్ని మొదటి స్క్రీన్‌కు తీసుకెళ్తుంది."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"మీరు స్క్రీన్ దిగువ అంచు నుండి పైకి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"రిలీజ్ చేయడానికి ముందు విండోను ఎక్కువసేపు పట్టుకోడానికి ట్రై చేయండి."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"మీరు నేరుగా స్వైప్ చేశారని నిర్ధారించుకోండి, ఆపై పాజ్ చేయండి."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"మీరు సంజ్ఞలను ఎలా ఉపయోగించాలో నేర్చుకున్నారు. సంజ్ఞలను ఆఫ్ చేయడానికి, సెట్టింగ్‌లకు వెళ్లండి."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"మీరు \'యాప్‌ల మధ్య మార్పు\' సంజ్ఞను పూర్తి చేశారు."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"యాప్‌ల మధ్య మార్చడం కోసం స్వైప్ చేయండి"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"మీ స్క్రీన్ కింది వైపు నుండి పైకి స్వైప్ చేసి, హోల్డ్ చేసి, తర్వాత రిలీజ్ చేయండి."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"అంతా సిద్ధంగా ఉంది"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"తర్వాత"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"పూర్తయింది"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"సెట్టింగ్‌లు"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"మళ్లీ ట్రై చేయండి"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"పనితీరు బాగుంది!"</string>
diff --git a/quickstep/res/values-th/strings.xml b/quickstep/res/values-th/strings.xml
index 89206db038..6dc5504bd9 100644
--- a/quickstep/res/values-th/strings.xml
+++ b/quickstep/res/values-th/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ปัดขึ้นจากด้านล่างของหน้าจอค้างไว้ แล้วปล่อย"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"เรียบร้อย"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"ถัดไป"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"เสร็จสิ้น"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"การตั้งค่า"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ลองอีกครั้ง"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ดีมาก"</string>
diff --git a/quickstep/res/values-tl/strings.xml b/quickstep/res/values-tl/strings.xml
index a4da3376a9..2ca59e7f91 100644
--- a/quickstep/res/values-tl/strings.xml
+++ b/quickstep/res/values-tl/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Mag-swipe pataas mula sa ibaba ng iyong screen, mag-hold, pagkatapos ay bitawan ito."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Handa na ang lahat"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Susunod"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Tapos na"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Mga Setting"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Subukan ulit"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Magaling!"</string>
diff --git a/quickstep/res/values-tr/strings.xml b/quickstep/res/values-tr/strings.xml
index 595a8a64c4..3a235104ca 100644
--- a/quickstep/res/values-tr/strings.xml
+++ b/quickstep/res/values-tr/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Ekranınızın alt tarafından yukarı doğru kaydırın, tutun ve sonra bırakın."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Hepsi bu kadar"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Sonraki"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Bitti"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Ayarlar"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Tekrar deneyin"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Güzel!"</string>
diff --git a/quickstep/res/values-uk/strings.xml b/quickstep/res/values-uk/strings.xml
index f350cd248e..8812faa925 100644
--- a/quickstep/res/values-uk/strings.xml
+++ b/quickstep/res/values-uk/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Проведіть пальцем вгору від низу екрана, утримуйте палець на екрані, а потім відпустіть."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Усе готово!"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Далі"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Готово"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Налаштування"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Спробуйте ще"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Чудово!"</string>
diff --git a/quickstep/res/values-ur/strings.xml b/quickstep/res/values-ur/strings.xml
index 509e234a51..871a628632 100644
--- a/quickstep/res/values-ur/strings.xml
+++ b/quickstep/res/values-ur/strings.xml
@@ -47,43 +47,32 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"پیشن گوئی کردہ ایپ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"اس بات کو یقینی بنائیں کہ آپ بائیں کنارے سے دور سے سوائپ کریں۔"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"یقینی طور پر بائیں کنارے سے اسکرین کے وسط تک سوائپ کریں اور پھر اپنی انگلی اٹھا لیں۔"</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
-    <skip />
+    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"عمدہ! اب واپس جانے کے لیے دائیں کنارے سے سوائپ کریں"</string>
+    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"آپ دائیں کنارے سے اسکرین کے وسط تک سوائپ کر کے پچھلی اسکرین پر واپس بھی جا سکتے ہیں۔"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"اس بات کو یقینی بنائیں کہ آپ دائیں کنارے سے دور سے سوائپ کریں۔"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"یقینی طور پر دائیں کنارے سے اسکرین کے وسط تک سوائپ کریں اور پھر اپنی انگلی اٹھا لیں۔"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"آپ نے واپس جائیں اشارے کو مکمل کر لیا۔ اس کے بعد ایپس سوئچ کرنے کا طریقہ جانیں۔"</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"آپ نے واپس جائیں اشارے کو مکمل کر لیا۔"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"اس بات کو یقینی بنائیں کہ آپ اسکرین کے نچلے حصے سے زیادہ قریب سے سوائپ نہ کریں۔"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"پچھلے اشارے کی حساسیت تبدیل کرنے کے لیے ترتیبات پر جائیں"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
-    <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
-    <skip />
+    <string name="back_gesture_intro_title" msgid="5538727561353262952">"واپس جانے کے لیے بائیں کنارے سے سوائپ کریں"</string>
+    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"پچھلی اسکرین جس پر آپ تھے اس پر واپس جانے کے لیے بائیں کنارے سے اسکرین کے وسط تک سوائپ کریں۔"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"اس بات کو یقینی بنائیں کہ آپ اسکرین کے نچلے کنارے سے اوپر کی طرف سوائپ کریں۔"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"اس بات کو یقینی بنائیں کہ آپ اپنی انگلی اوپر اٹھانے سے پہلے موقوف نہ کریں۔"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"اس بات کو یقینی بنائیں کہ آپ سیدھا اوپر کی طرف سوائپ کریں۔"</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"آپ نے ہوم پر جانے کا اشارہ مکمل کر لیا۔ اس کے بعد واپس جانے کا طریقہ جانیں۔"</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"آپ نے ہوم پر جانے کا اشارہ مکمل کر لیا۔"</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"ہوم پر جانے کے لیے سوائپ کریں"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"اپنی اسکرین کے نیچے سے اوپر کی طرف سوائپ کریں۔ یہ اشارہ آپ کو ہمیشہ ہوم اسکرین پر لے جاتا ہے۔"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"اس بات کو یقینی بنائیں کہ آپ اسکرین کے نچلے کنارے سے اوپر کی طرف سوائپ کریں۔"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"انگلی اٹھانے سے پہلے ونڈو کو زیادہ دیر تک پکڑنے کی کوشش کریں۔"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"اس بات کو یقینی بنائیں کہ آپ سیدھا اوپر کی طرف سوائپ کریں، پھر موقوف کریں۔"</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"آپ نے اشاروں کو استعمال کرنے کا طریقہ سیکھ لیا۔ اشاروں کو آف کرنے کے لیے ترتیبات پر جائیں۔"</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"آپ نے ایپس کو سوئچ کرنے کا اشارہ مکمل کر لیا۔"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ایپس سوئچ کرنے کے لیے سوائپ کریں"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"اپنی اسکرین کے نچلے حصے سے اوپر کی طرف سوائپ کریں، پکڑ کر رکھیں، پھر چھوڑ دیں۔"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"سب ہو گیا"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"آگے"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"ہو گیا"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ترتیبات"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"پھر کوشش کریں"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"عمدہ!"</string>
diff --git a/quickstep/res/values-uz/strings.xml b/quickstep/res/values-uz/strings.xml
index 32579d6ce8..c1b1262bbc 100644
--- a/quickstep/res/values-uz/strings.xml
+++ b/quickstep/res/values-uz/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Ekranning pastidan tepasiga suring, bosib turing va qoʻyib yuboring."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Tayyor"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Keyingisi"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Tayyor"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Sozlamalar"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Qayta urinish"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Yaxshi!"</string>
diff --git a/quickstep/res/values-vi/strings.xml b/quickstep/res/values-vi/strings.xml
index 4b6889a881..836f89d330 100644
--- a/quickstep/res/values-vi/strings.xml
+++ b/quickstep/res/values-vi/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Vuốt lên từ cuối màn hình, giữ rồi thả tay ra."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Đã hoàn tất"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Tiếp theo"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Xong"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Cài đặt"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Thử lại"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Tuyệt vời!"</string>
diff --git a/quickstep/res/values-zh-rCN/strings.xml b/quickstep/res/values-zh-rCN/strings.xml
index b65553f37c..53499e2fc4 100644
--- a/quickstep/res/values-zh-rCN/strings.xml
+++ b/quickstep/res/values-zh-rCN/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"从屏幕底部向上滑动后按住，然后松开。"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"大功告成"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"继续"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"完成"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"设置"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"重试"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"很好！"</string>
diff --git a/quickstep/res/values-zh-rHK/strings.xml b/quickstep/res/values-zh-rHK/strings.xml
index feee950fc3..a8b8fc5225 100644
--- a/quickstep/res/values-zh-rHK/strings.xml
+++ b/quickstep/res/values-zh-rHK/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"從螢幕底部向上滑動並按住，然後放開。"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"大功告成"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"繼續"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"完成"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"設定"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"再試一次"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"很好！"</string>
diff --git a/quickstep/res/values-zh-rTW/strings.xml b/quickstep/res/values-zh-rTW/strings.xml
index 6dc5c572ab..8d47ace777 100644
--- a/quickstep/res/values-zh-rTW/strings.xml
+++ b/quickstep/res/values-zh-rTW/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"從螢幕底部向上滑動並按住，然後放開。"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"大功告成"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"繼續"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"完成"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"設定"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"重試"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"很好！"</string>
diff --git a/quickstep/res/values-zu/strings.xml b/quickstep/res/values-zu/strings.xml
index 06d039f9ad..212e77c60c 100644
--- a/quickstep/res/values-zu/strings.xml
+++ b/quickstep/res/values-zu/strings.xml
@@ -73,7 +73,6 @@
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swayiphela phezulu kusuka ngezansi kwesikrini sakho, ubambe, bese udedele."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Konke kusethiwe"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Okulandelayo"</string>
-    <string name="gesture_tutorial_action_button_label_done" msgid="671834508127014231">"Kwenziwe"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Amasethingi"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Zama futhi"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Kuhle!"</string>
-- 
GitLab


From 34f90233c6ff76dedd2f6a98ac93a188bd2d1ed5 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Thu, 20 May 2021 01:54:58 +0000
Subject: [PATCH 1224/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I48b71c9a8d0d380b91f614fad5fc581a67a2fb6b
---
 res/values-vi/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index eb39c9a132..9c308e0711 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -97,7 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Thư mục: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> mục"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Thư mục: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> mục trở lên"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Hình nền"</string>
-    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Hình nền và kiểu"</string>
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Hình nền và phong cách"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Cài đặt màn hình chính"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Bị tắt bởi quản trị viên của bạn"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Cho phép xoay Màn hình chính"</string>
-- 
GitLab


From f833ecebfaf2e40b32b4d3d86f3eb95760ce42aa Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Tue, 18 May 2021 17:14:52 -0700
Subject: [PATCH 1225/1664] Notify when quickstep gesture starts

Fixes: 182500083
Test: manual
Change-Id: I1ab27b309c0dd2640add1aa83566acee20708a3a
---
 .../android/quickstep/AbsSwipeUpHandler.java  |  1 +
 .../quickstep/RotationTouchHelper.java        |  2 +-
 .../com/android/quickstep/SystemUiProxy.java  | 19 +++++++++++++++----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index e0f430d6cf..005e9b5a7d 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -750,6 +750,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         setIsLikelyToStartNewTask(isLikelyToStartNewTask, false /* animate */);
         mStateCallback.setStateOnUiThread(STATE_GESTURE_STARTED);
         mGestureStarted = true;
+        SystemUiProxy.INSTANCE.get(mContext).notifySwipeUpGestureStarted();
     }
 
     /**
diff --git a/quickstep/src/com/android/quickstep/RotationTouchHelper.java b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
index 070d725890..66929d0cdb 100644
--- a/quickstep/src/com/android/quickstep/RotationTouchHelper.java
+++ b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
@@ -369,7 +369,7 @@ public class RotationTouchHelper implements
 
     private void notifySysuiOfCurrentRotation(int rotation) {
         UI_HELPER_EXECUTOR.execute(() -> SystemUiProxy.INSTANCE.get(mContext)
-                .onQuickSwitchToNewTask(rotation));
+                .notifyPrioritizedRotation(rotation));
     }
 
     /**
diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index acf999253f..7ef6a4a4c8 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -341,6 +341,17 @@ public class SystemUiProxy implements ISystemUiProxy,
         }
     }
 
+    @Override
+    public void notifySwipeUpGestureStarted() {
+        if (mSystemUiProxy != null) {
+            try {
+                mSystemUiProxy.notifySwipeUpGestureStarted();
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed call notifySwipeUpGestureStarted", e);
+            }
+        }
+    }
+
     /**
      * Notifies that swipe-to-home action is finished.
      */
@@ -350,18 +361,18 @@ public class SystemUiProxy implements ISystemUiProxy,
             try {
                 mSystemUiProxy.notifySwipeToHomeFinished();
             } catch (RemoteException e) {
-                Log.w(TAG, "Failed call setPinnedStackAnimationType", e);
+                Log.w(TAG, "Failed call notifySwipeToHomeFinished", e);
             }
         }
     }
 
     @Override
-    public void onQuickSwitchToNewTask(int rotation) {
+    public void notifyPrioritizedRotation(int rotation) {
         if (mSystemUiProxy != null) {
             try {
-                mSystemUiProxy.onQuickSwitchToNewTask(rotation);
+                mSystemUiProxy.notifyPrioritizedRotation(rotation);
             } catch (RemoteException e) {
-                Log.w(TAG, "Failed call onQuickSwitchToNewTask with arg: " + rotation, e);
+                Log.w(TAG, "Failed call notifyPrioritizedRotation with arg: " + rotation, e);
             }
         }
     }
-- 
GitLab


From bb6f6e5dae072223f8505ee9791d3eec7bc72d64 Mon Sep 17 00:00:00 2001
From: Kholoud Mohamed <kholoudm@google.com>
Date: Thu, 20 May 2021 11:54:09 +0000
Subject: [PATCH 1226/1664] Revert "Renaming TaskbarController to
 LauncherTaskbarUIController"

This reverts commit 40a742161938b343589e88e4b7f44b1cd67a69f1.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/tests/view?invocationId=I13700009003387451&testResultId=TR89423459137251402, bug https://buganizer.corp.google.com/issues/188755902

Bug: 188755902
Change-Id: Icd1ddd43e62d392f6b68b0150a1075f73106391a
---
 .../launcher3/BaseQuickstepLauncher.java      | 20 ++++++++--------
 .../HotseatPredictionController.java          |  4 ++--
 .../taskbar/TaskbarAnimationController.java   |  2 +-
 ...Controller.java => TaskbarController.java} |  9 ++++---
 .../launcher3/taskbar/TaskbarManager.java     |  4 ++--
 .../uioverrides/QuickstepLauncher.java        |  6 ++---
 .../quickstep/LauncherActivityInterface.java  | 24 +++++++++----------
 7 files changed, 34 insertions(+), 35 deletions(-)
 rename quickstep/src/com/android/launcher3/taskbar/{LauncherTaskbarUIController.java => TaskbarController.java} (97%)

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index de62e93b4e..bc2c125854 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -49,7 +49,7 @@ import com.android.launcher3.proxy.StartActivityParams;
 import com.android.launcher3.statehandlers.BackButtonAlphaHandler;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
-import com.android.launcher3.taskbar.LauncherTaskbarUIController;
+import com.android.launcher3.taskbar.TaskbarController;
 import com.android.launcher3.taskbar.TaskbarManager;
 import com.android.launcher3.taskbar.TaskbarStateHandler;
 import com.android.launcher3.uioverrides.RecentsViewStateController;
@@ -96,7 +96,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
     private OverviewActionsView mActionsView;
 
     private @Nullable TaskbarManager mTaskbarManager;
-    private @Nullable LauncherTaskbarUIController mTaskbarUIController;
+    private @Nullable TaskbarController mTaskbarController;
     private final ServiceConnection mTisBinderConnection = new ServiceConnection() {
         @Override
         public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
@@ -261,8 +261,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
 
     }
 
-    public void setTaskbarUIController(LauncherTaskbarUIController taskbarUIController) {
-        mTaskbarUIController = taskbarUIController;
+    public void setTaskbarController(TaskbarController taskbarController) {
+        mTaskbarController = taskbarController;
     }
 
     public <T extends OverviewActionsView> T getActionsView() {
@@ -292,8 +292,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
         return mDepthController;
     }
 
-    public @Nullable LauncherTaskbarUIController getTaskbarUIController() {
-        return mTaskbarUIController;
+    public @Nullable TaskbarController getTaskbarController() {
+        return mTaskbarController;
     }
 
     public TaskbarStateHandler getTaskbarStateHandler() {
@@ -349,8 +349,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
 
     @Override
     public float getNormalTaskbarScale() {
-        if (mTaskbarUIController != null) {
-            return mTaskbarUIController.getTaskbarScaleOnHome();
+        if (mTaskbarController != null) {
+            return mTaskbarController.getTaskbarScaleOnHome();
         }
         return super.getNormalTaskbarScale();
     }
@@ -372,8 +372,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
         }
 
         if ((changeBits & ACTIVITY_STATE_RESUMED) != 0) {
-            if (mTaskbarUIController != null) {
-                mTaskbarUIController.onLauncherResumedOrPaused(hasBeenResumed());
+            if (mTaskbarController != null) {
+                mTaskbarController.onLauncherResumedOrPaused(hasBeenResumed());
             }
         }
 
diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
index 85e5ab0a9b..5dcf84c249 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
@@ -263,8 +263,8 @@ public class HotseatPredictionController implements DragController.DragListener,
             removeOutlineDrawings();
         }
 
-        if (mLauncher.getTaskbarUIController() != null) {
-            mLauncher.getTaskbarUIController().onHotseatUpdated();
+        if (mLauncher.getTaskbarController() != null) {
+            mLauncher.getTaskbarController().onHotseatUpdated();
         }
     }
 
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java
index e20ddf88ce..815efb9728 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java
@@ -21,7 +21,7 @@ import android.animation.Animator;
 
 import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.taskbar.LauncherTaskbarUIController.TaskbarAnimationControllerCallbacks;
+import com.android.launcher3.taskbar.TaskbarController.TaskbarAnimationControllerCallbacks;
 import com.android.quickstep.AnimatedFloat;
 import com.android.quickstep.SystemUiProxy;
 import com.android.systemui.shared.system.QuickStepContract;
diff --git a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
similarity index 97%
rename from quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
rename to quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index 67264194b2..cdae5beb9a 100644
--- a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -38,7 +38,7 @@ import com.android.launcher3.states.StateAnimationConfig;
  * TODO: Rename to have Launcher prefix
  */
 
-public class LauncherTaskbarUIController extends TaskbarUIController {
+public class TaskbarController extends TaskbarUIController {
 
     private final BaseQuickstepLauncher mLauncher;
     private final TaskbarStateHandler mTaskbarStateHandler;
@@ -52,8 +52,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
     private @Nullable Animator mAnimator;
     private boolean mIsAnimatingToLauncher;
 
-    public LauncherTaskbarUIController(
-            BaseQuickstepLauncher launcher, TaskbarActivityContext context) {
+    public TaskbarController(BaseQuickstepLauncher launcher, TaskbarActivityContext context) {
         mContext = context;
         mTaskbarContainerView = context.getDragLayer();
         mTaskbarView = mTaskbarContainerView.findViewById(R.id.taskbar_view);
@@ -73,7 +72,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
         mHotseatController.init();
         setTaskbarViewVisible(!mLauncher.hasBeenResumed());
         alignRealHotseatWithTaskbar();
-        mLauncher.setTaskbarUIController(this);
+        mLauncher.setTaskbarController(this);
     }
 
     @Override
@@ -87,7 +86,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
         mHotseatController.cleanup();
         setTaskbarViewVisible(true);
         mLauncher.getHotseat().setIconsAlpha(1f);
-        mLauncher.setTaskbarUIController(null);
+        mLauncher.setTaskbarController(null);
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
index 65c87bd279..b9eec93687 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
@@ -97,7 +97,7 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen
         if (mTaskbarActivityContext != null) {
             mTaskbarActivityContext.setUIController(mLauncher == null
                     ? TaskbarUIController.DEFAULT
-                    : new LauncherTaskbarUIController(launcher, mTaskbarActivityContext));
+                    : new TaskbarController(launcher, mTaskbarActivityContext));
         }
     }
 
@@ -115,7 +115,7 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen
         mTaskbarActivityContext.init();
         if (mLauncher != null) {
             mTaskbarActivityContext.setUIController(
-                    new LauncherTaskbarUIController(mLauncher, mTaskbarActivityContext));
+                    new TaskbarController(mLauncher, mTaskbarActivityContext));
         }
     }
 
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index f0b02b3c47..45bb521336 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -165,7 +165,7 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
     @Override
     public boolean startActivitySafely(View v, Intent intent, ItemInfo item) {
         // Only pause is taskbar controller is not present
-        mHotseatPredictionController.setPauseUIUpdate(getTaskbarUIController() == null);
+        mHotseatPredictionController.setPauseUIUpdate(getTaskbarController() == null);
         return super.startActivitySafely(v, intent, item);
     }
 
@@ -233,9 +233,9 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
     @Override
     public void bindWorkspaceItemsChanged(List<WorkspaceItemInfo> updated) {
         super.bindWorkspaceItemsChanged(updated);
-        if (getTaskbarUIController() != null && updated.stream()
+        if (getTaskbarController() != null && updated.stream()
                 .filter(w -> w.container == CONTAINER_HOTSEAT).findFirst().isPresent()) {
-            getTaskbarUIController().onHotseatUpdated();
+            getTaskbarController().onHotseatUpdated();
         }
     }
 
diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
index 9014774ae7..ff69180d33 100644
--- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
@@ -41,7 +41,7 @@ import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statehandlers.DepthController.ClampedDepthProperty;
 import com.android.launcher3.statemanager.StateManager;
-import com.android.launcher3.taskbar.LauncherTaskbarUIController;
+import com.android.launcher3.taskbar.TaskbarController;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.quickstep.GestureState.GestureEndTarget;
 import com.android.quickstep.SysUINavigationMode.Mode;
@@ -163,12 +163,12 @@ public final class LauncherActivityInterface extends
     }
 
     @Nullable
-    private LauncherTaskbarUIController getTaskbarController() {
+    private TaskbarController getTaskbarController() {
         BaseQuickstepLauncher launcher = getCreatedActivity();
         if (launcher == null) {
             return null;
         }
-        return launcher.getTaskbarUIController();
+        return launcher.getTaskbarController();
     }
 
     @Nullable
@@ -276,13 +276,13 @@ public final class LauncherActivityInterface extends
     @Override
     public @Nullable Animator getParallelAnimationToLauncher(GestureEndTarget endTarget,
             long duration) {
-        LauncherTaskbarUIController uiController = getTaskbarController();
+        TaskbarController taskbarController = getTaskbarController();
         Animator superAnimator = super.getParallelAnimationToLauncher(endTarget, duration);
-        if (uiController == null) {
+        if (taskbarController == null) {
             return superAnimator;
         }
         LauncherState toState = stateFromGestureEndTarget(endTarget);
-        Animator taskbarAnimator = uiController.createAnimToLauncher(toState, duration);
+        Animator taskbarAnimator = taskbarController.createAnimToLauncher(toState, duration);
         if (superAnimator == null) {
             return taskbarAnimator;
         } else {
@@ -300,20 +300,20 @@ public final class LauncherActivityInterface extends
 
     @Override
     public boolean deferStartingActivity(RecentsAnimationDeviceState deviceState, MotionEvent ev) {
-        LauncherTaskbarUIController uiController = getTaskbarController();
-        if (uiController == null) {
+        TaskbarController taskbarController = getTaskbarController();
+        if (taskbarController == null) {
             return super.deferStartingActivity(deviceState, ev);
         }
-        return uiController.isEventOverAnyTaskbarItem(ev);
+        return taskbarController.isEventOverAnyTaskbarItem(ev);
     }
 
     @Override
     public boolean shouldCancelCurrentGesture() {
-        LauncherTaskbarUIController uiController = getTaskbarController();
-        if (uiController == null) {
+        TaskbarController taskbarController = getTaskbarController();
+        if (taskbarController == null) {
             return super.shouldCancelCurrentGesture();
         }
-        return uiController.isDraggingItem();
+        return taskbarController.isDraggingItem();
     }
 
     @Override
-- 
GitLab


From 430465a3d5ff0dcdd0c2e263d862049d93075a07 Mon Sep 17 00:00:00 2001
From: Kholoud Mohamed <kholoudm@google.com>
Date: Thu, 20 May 2021 09:50:23 +0000
Subject: [PATCH 1227/1664] Revert "Moving taskbar lifecycle to
 TouchInteractionService"

This reverts commit e215fb730bb3d4a357a2c4bf0c082d3c0ad69495.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/tests/view?invocationId=I13700009003387451&testResultId=TR89423459137251402, bug https://buganizer.corp.google.com/issues/188755902

Bug: 188755902
Change-Id: I4650136975b60f311499ee6ff5b27ab9a32d23d6
---
 quickstep/res/layout/taskbar.xml              |  24 +-
 quickstep/res/layout/taskbar_view.xml         |  26 +
 quickstep/res/values/dimens.xml               |   1 -
 .../launcher3/BaseQuickstepLauncher.java      |  90 +++-
 .../launcher3/QuickstepTransitionManager.java |   3 +
 .../launcher3/taskbar/ButtonProvider.java     |  32 +-
 .../android/launcher3/taskbar/ImeBarView.java |  17 +-
 .../taskbar/TaskbarActivityContext.java       | 230 +--------
 .../taskbar/TaskbarAnimationController.java   |   5 +-
 .../taskbar/TaskbarContainerView.java         |  96 ++--
 .../launcher3/taskbar/TaskbarController.java  | 472 +++++++++++++++---
 .../taskbar/TaskbarDragController.java        |  13 +-
 .../taskbar/TaskbarHotseatController.java     |  17 +-
 .../taskbar/TaskbarIconController.java        | 163 ------
 .../launcher3/taskbar/TaskbarManager.java     | 157 ------
 .../taskbar/TaskbarNavButtonController.java   |  20 +-
 .../taskbar/TaskbarStateHandler.java          |  41 +-
 .../taskbar/TaskbarUIController.java          |  41 --
 .../launcher3/taskbar/TaskbarView.java        | 262 ++++++----
 .../quickstep/BaseActivityInterface.java      |  13 +
 .../quickstep/LauncherActivityInterface.java  |  14 +-
 .../quickstep/TouchInteractionService.java    |  61 ++-
 .../util/StaggeredWorkspaceAnim.java          |   6 +-
 res/layout/taskbar_view.xml                   |  21 +
 src/com/android/launcher3/BubbleTextView.java |   4 +
 src/com/android/launcher3/Hotseat.java        |  21 +-
 src/com/android/launcher3/Launcher.java       |  14 +
 src/com/android/launcher3/Utilities.java      |  10 +-
 .../launcher3/touch/ItemClickHandler.java     |  56 +--
 29 files changed, 982 insertions(+), 948 deletions(-)
 create mode 100644 quickstep/res/layout/taskbar_view.xml
 delete mode 100644 quickstep/src/com/android/launcher3/taskbar/TaskbarIconController.java
 delete mode 100644 quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
 delete mode 100644 quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java
 create mode 100644 res/layout/taskbar_view.xml

diff --git a/quickstep/res/layout/taskbar.xml b/quickstep/res/layout/taskbar.xml
index c4362214cb..240fe556da 100644
--- a/quickstep/res/layout/taskbar.xml
+++ b/quickstep/res/layout/taskbar.xml
@@ -22,29 +22,9 @@
 
     <com.android.launcher3.taskbar.TaskbarView
         android:id="@+id/taskbar_view"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:gravity="center"
-        android:forceHasOverlappingRendering="false"
-        android:layout_gravity="bottom" >
-
-        <LinearLayout
-            android:id="@+id/system_button_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/taskbar_nav_buttons_spacing"
-            android:paddingRight="@dimen/taskbar_nav_buttons_spacing"
-            android:forceHasOverlappingRendering="false"
-            android:gravity="center" />
-
-        <LinearLayout
-            android:id="@+id/hotseat_icons_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:forceHasOverlappingRendering="false"
-            android:gravity="center" />
-
-    </com.android.launcher3.taskbar.TaskbarView>
+        android:gravity="center"/>
 
     <com.android.launcher3.taskbar.ImeBarView
         android:id="@+id/ime_bar_view"
diff --git a/quickstep/res/layout/taskbar_view.xml b/quickstep/res/layout/taskbar_view.xml
new file mode 100644
index 0000000000..34a88ea6a2
--- /dev/null
+++ b/quickstep/res/layout/taskbar_view.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.launcher3.taskbar.TaskbarView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/taskbar_view"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/taskbar_size"
+    android:background="@android:color/transparent"
+    android:layout_gravity="bottom"
+    android:gravity="center"
+    android:visibility="gone" />
+
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 50453ace16..735cb24f82 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -149,5 +149,4 @@
     <!-- Note that this applies to both sides of all icons, so visible space is double this. -->
     <dimen name="taskbar_icon_spacing">8dp</dimen>
     <dimen name="taskbar_folder_margin">16dp</dimen>
-    <dimen name="taskbar_nav_buttons_spacing">16dp</dimen>
 </resources>
diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index bc2c125854..e777ee7354 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -20,6 +20,7 @@ import static com.android.launcher3.AbstractFloatingView.TYPE_HIDE_BACK_BUTTON;
 import static com.android.launcher3.LauncherState.FLAG_HIDE_BACK_BUTTON;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.NO_OFFSET;
+import static com.android.launcher3.util.DisplayController.CHANGE_ACTIVE_SCREEN;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
 import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
@@ -29,6 +30,7 @@ import android.animation.AnimatorSet;
 import android.animation.ValueAnimator;
 import android.app.ActivityOptions;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
 import android.content.IntentSender;
 import android.content.ServiceConnection;
@@ -49,11 +51,13 @@ import com.android.launcher3.proxy.StartActivityParams;
 import com.android.launcher3.statehandlers.BackButtonAlphaHandler;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
+import com.android.launcher3.taskbar.TaskbarActivityContext;
 import com.android.launcher3.taskbar.TaskbarController;
-import com.android.launcher3.taskbar.TaskbarManager;
 import com.android.launcher3.taskbar.TaskbarStateHandler;
+import com.android.launcher3.taskbar.TaskbarView;
 import com.android.launcher3.uioverrides.RecentsViewStateController;
 import com.android.launcher3.util.ActivityOptionsWrapper;
+import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.ObjectWrapper;
 import com.android.launcher3.util.UiThreadHelper;
 import com.android.quickstep.RecentsModel;
@@ -63,7 +67,6 @@ import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;
 import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.TaskUtils;
 import com.android.quickstep.TouchInteractionService;
-import com.android.quickstep.TouchInteractionService.TISBinder;
 import com.android.quickstep.util.RemoteAnimationProvider;
 import com.android.quickstep.util.RemoteFadeOutAnimationListener;
 import com.android.quickstep.util.SplitSelectStateController;
@@ -85,6 +88,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
 
     private DepthController mDepthController = new DepthController(this);
     private QuickstepTransitionManager mAppTransitionManager;
+    private ServiceConnection mTisBinderConnection;
+    protected TouchInteractionService.TISBinder mTisBinder;
 
     /**
      * Reusable command for applying the back button alpha on the background thread.
@@ -95,20 +100,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
 
     private OverviewActionsView mActionsView;
 
-    private @Nullable TaskbarManager mTaskbarManager;
     private @Nullable TaskbarController mTaskbarController;
-    private final ServiceConnection mTisBinderConnection = new ServiceConnection() {
-        @Override
-        public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
-            mTaskbarManager = ((TISBinder) iBinder).getTaskbarManager();
-            mTaskbarManager.setLauncher(BaseQuickstepLauncher.this);
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName componentName) { }
-    };
     private final TaskbarStateHandler mTaskbarStateHandler = new TaskbarStateHandler(this);
-
     // Will be updated when dragging from taskbar.
     private @Nullable DragOptions mNextWorkspaceDragOptions = null;
     private SplitPlaceholderView mSplitPlaceholderView;
@@ -118,6 +111,24 @@ public abstract class BaseQuickstepLauncher extends Launcher
         super.onCreate(savedInstanceState);
         SysUINavigationMode.INSTANCE.get(this).addModeChangeListener(this);
         addMultiWindowModeChangedListener(mDepthController);
+        setupTouchInteractionServiceBinder();
+    }
+
+    private void setupTouchInteractionServiceBinder() {
+        Intent intent = new Intent(this, TouchInteractionService.class);
+        mTisBinderConnection = new ServiceConnection() {
+            @Override
+            public void onServiceConnected(ComponentName componentName, IBinder binder) {
+                mTisBinder = ((TouchInteractionService.TISBinder) binder);
+                mTisBinder.setTaskbarOverviewProxyDelegate(mTaskbarController);
+            }
+
+            @Override
+            public void onServiceDisconnected(ComponentName componentName) {
+                mTisBinder = null;
+            }
+        };
+        bindService(intent, mTisBinderConnection, 0);
     }
 
     @Override
@@ -125,12 +136,15 @@ public abstract class BaseQuickstepLauncher extends Launcher
         mAppTransitionManager.onActivityDestroyed();
 
         SysUINavigationMode.INSTANCE.get(this).removeModeChangeListener(this);
-
-
-        unbindService(mTisBinderConnection);
-        if (mTaskbarManager != null) {
-            mTaskbarManager.setLauncher(null);
+        if (mTaskbarController != null) {
+            mTaskbarController.cleanup();
+            mTaskbarController = null;
+            if (mTisBinder != null) {
+                mTisBinder.setTaskbarOverviewProxyDelegate(null);
+                unbindService(mTisBinderConnection);
+            }
         }
+
         super.onDestroy();
     }
 
@@ -257,12 +271,37 @@ public abstract class BaseQuickstepLauncher extends Launcher
         mAppTransitionManager = new QuickstepTransitionManager(this);
         mAppTransitionManager.registerRemoteAnimations();
 
-        bindService(new Intent(this, TouchInteractionService.class), mTisBinderConnection, 0);
+        addTaskbarIfNecessary();
+        addOnDeviceProfileChangeListener(newDp -> addTaskbarIfNecessary());
+    }
 
+    @Override
+    public void onDisplayInfoChanged(Context context, DisplayController.Info info,
+            int flags) {
+        super.onDisplayInfoChanged(context, info, flags);
+        if ((flags & CHANGE_ACTIVE_SCREEN) != 0) {
+            addTaskbarIfNecessary();
+        }
     }
 
-    public void setTaskbarController(TaskbarController taskbarController) {
-        mTaskbarController = taskbarController;
+    private void addTaskbarIfNecessary() {
+        if (mTaskbarController != null) {
+            mTaskbarController.cleanup();
+            if (mTisBinder != null) {
+                mTisBinder.setTaskbarOverviewProxyDelegate(null);
+            }
+            mTaskbarController = null;
+        }
+        if (mDeviceProfile.isTaskbarPresent) {
+            TaskbarView taskbarViewOnHome = (TaskbarView) mHotseat.getTaskbarView();
+            TaskbarActivityContext taskbarActivityContext = new TaskbarActivityContext(this);
+            mTaskbarController = new TaskbarController(this,
+                    taskbarActivityContext.getTaskbarContainerView(), taskbarViewOnHome);
+            mTaskbarController.init();
+            if (mTisBinder != null) {
+                mTisBinder.setTaskbarOverviewProxyDelegate(mTaskbarController);
+            }
+        }
     }
 
     public <T extends OverviewActionsView> T getActionsView() {
@@ -301,9 +340,14 @@ public abstract class BaseQuickstepLauncher extends Launcher
     }
 
     @Override
+    public boolean isViewInTaskbar(View v) {
+        return mTaskbarController != null && mTaskbarController.isViewInTaskbar(v);
+    }
+
     public boolean supportsAdaptiveIconAnimation(View clickedView) {
         return mAppTransitionManager.hasControlRemoteAppTransitionPermission()
-                && FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM.get();
+                && FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM.get()
+                && !isViewInTaskbar(clickedView);
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 80754a00f4..1b8fcb3c67 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -1252,6 +1252,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
 
             final boolean launchingFromWidget = mV instanceof LauncherAppWidgetHostView;
             final boolean launchingFromRecents = isLaunchingFromRecents(mV, appTargets);
+            final boolean launchingFromTaskbar = mLauncher.isViewInTaskbar(mV);
             if (launchingFromWidget) {
                 composeWidgetLaunchAnimator(anim, (LauncherAppWidgetHostView) mV, appTargets,
                         wallpaperTargets, nonAppTargets);
@@ -1262,6 +1263,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                         launcherClosing);
                 addCujInstrumentation(
                         anim, InteractionJankMonitorWrapper.CUJ_APP_LAUNCH_FROM_RECENTS);
+            } else if (launchingFromTaskbar) {
+                // TODO
             } else {
                 composeIconLaunchAnimator(anim, mV, appTargets, wallpaperTargets, nonAppTargets,
                         launcherClosing);
diff --git a/quickstep/src/com/android/launcher3/taskbar/ButtonProvider.java b/quickstep/src/com/android/launcher3/taskbar/ButtonProvider.java
index 540f748313..0d4130d1bc 100644
--- a/quickstep/src/com/android/launcher3/taskbar/ButtonProvider.java
+++ b/quickstep/src/com/android/launcher3/taskbar/ButtonProvider.java
@@ -16,17 +16,12 @@
 
 package com.android.launcher3.taskbar;
 
-import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_BACK;
-import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_HOME;
-import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_IME_SWITCH;
-import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_RECENTS;
-
 import android.annotation.DrawableRes;
+import android.content.Context;
 import android.view.View;
 import android.widget.ImageView;
 
 import com.android.launcher3.R;
-import com.android.launcher3.taskbar.TaskbarNavButtonController.TaskbarButton;
 
 /**
  * Creates Buttons for Taskbar for 3 button nav.
@@ -34,46 +29,47 @@ import com.android.launcher3.taskbar.TaskbarNavButtonController.TaskbarButton;
  */
 public class ButtonProvider {
 
-    private final int mMarginLeftRight;
-    private final TaskbarActivityContext mContext;
+    private int mMarginLeftRight;
+    private final Context mContext;
 
-    public ButtonProvider(TaskbarActivityContext context) {
+    public ButtonProvider(Context context) {
         mContext = context;
-        mMarginLeftRight = context.getResources()
-                .getDimensionPixelSize(R.dimen.taskbar_icon_spacing);
+    }
+
+    public void setMarginLeftRight(int margin) {
+        mMarginLeftRight = margin;
     }
 
     public View getBack() {
         // Back button
-        return getButtonForDrawable(R.drawable.ic_sysbar_back, BUTTON_BACK);
+        return getButtonForDrawable(R.drawable.ic_sysbar_back);
     }
 
     public View getDown() {
         // Ime down button
-        return getButtonForDrawable(R.drawable.ic_sysbar_back, BUTTON_BACK);
+        return getButtonForDrawable(R.drawable.ic_sysbar_back);
     }
 
     public View getHome() {
         // Home button
-        return getButtonForDrawable(R.drawable.ic_sysbar_home, BUTTON_HOME);
+        return getButtonForDrawable(R.drawable.ic_sysbar_home);
     }
 
     public View getRecents() {
         // Recents button
-        return getButtonForDrawable(R.drawable.ic_sysbar_recent, BUTTON_RECENTS);
+        return getButtonForDrawable(R.drawable.ic_sysbar_recent);
     }
 
     public View getImeSwitcher() {
         // IME Switcher Button
-        return getButtonForDrawable(R.drawable.ic_ime_switcher, BUTTON_IME_SWITCH);
+        return getButtonForDrawable(R.drawable.ic_ime_switcher);
     }
 
-    private View getButtonForDrawable(@DrawableRes int drawableId, @TaskbarButton int buttonType) {
+    private View getButtonForDrawable(@DrawableRes int drawableId) {
         ImageView buttonView = new ImageView(mContext);
         buttonView.setImageResource(drawableId);
         buttonView.setBackgroundResource(R.drawable.taskbar_icon_click_feedback_roundrect);
         buttonView.setPadding(mMarginLeftRight, 0, mMarginLeftRight, 0);
-        buttonView.setOnClickListener(view -> mContext.onNavigationButtonClick(buttonType));
         return buttonView;
     }
 
diff --git a/quickstep/src/com/android/launcher3/taskbar/ImeBarView.java b/quickstep/src/com/android/launcher3/taskbar/ImeBarView.java
index 287caab44b..bb3669beed 100644
--- a/quickstep/src/com/android/launcher3/taskbar/ImeBarView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/ImeBarView.java
@@ -16,6 +16,9 @@
 
 package com.android.launcher3.taskbar;
 
+import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_BACK;
+import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_IME_SWITCH;
+
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
@@ -26,6 +29,7 @@ import com.android.launcher3.views.ActivityContext;
 public class ImeBarView extends RelativeLayout {
 
     private ButtonProvider mButtonProvider;
+    private TaskbarController.TaskbarViewCallbacks mControllerCallbacks;
     private View mImeView;
 
     public ImeBarView(Context context) {
@@ -40,9 +44,12 @@ public class ImeBarView extends RelativeLayout {
         super(context, attrs, defStyleAttr);
     }
 
-    public void init(ButtonProvider buttonProvider) {
+    public void construct(ButtonProvider buttonProvider) {
         mButtonProvider = buttonProvider;
+    }
 
+    public void init(TaskbarController.TaskbarViewCallbacks taskbarCallbacks) {
+        mControllerCallbacks = taskbarCallbacks;
         ActivityContext context = getActivityContext();
         RelativeLayout.LayoutParams imeParams = new RelativeLayout.LayoutParams(
                 context.getDeviceProfile().iconSizePx,
@@ -57,16 +64,24 @@ public class ImeBarView extends RelativeLayout {
 
         // Down Arrow
         View downView = mButtonProvider.getDown();
+        downView.setOnClickListener(view -> mControllerCallbacks.onNavigationButtonClick(
+                BUTTON_BACK));
         downView.setLayoutParams(downParams);
         downView.setRotation(-90);
         addView(downView);
 
         // IME switcher button
         mImeView = mButtonProvider.getImeSwitcher();
+        mImeView.setOnClickListener(view -> mControllerCallbacks.onNavigationButtonClick(
+                BUTTON_IME_SWITCH));
         mImeView.setLayoutParams(imeParams);
         addView(mImeView);
     }
 
+    public void cleanup() {
+        removeAllViews();
+    }
+
     public void setImeSwitcherVisibility(boolean show) {
         mImeView.setVisibility(show ? VISIBLE : GONE);
     }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
index 70f278874a..3af51d575d 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
@@ -15,164 +15,56 @@
  */
 package com.android.launcher3.taskbar;
 
-import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
-import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
-import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
-
-import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_BOTTOM_TAPPABLE_ELEMENT;
-import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_EXTRA_NAVIGATION_BAR;
-
-import android.app.ActivityOptions;
-import android.content.ActivityNotFoundException;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.LauncherApps;
-import android.graphics.PixelFormat;
+import android.content.ContextWrapper;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.os.Process;
-import android.os.SystemProperties;
-import android.util.Log;
-import android.view.ContextThemeWrapper;
-import android.view.Display;
-import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.WindowManager;
-import android.widget.Toast;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.android.launcher3.AbstractFloatingView;
+import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.DragSource;
 import com.android.launcher3.DropTarget;
-import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.R;
 import com.android.launcher3.dragndrop.DragController;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.dragndrop.DragView;
 import com.android.launcher3.dragndrop.DraggableView;
-import com.android.launcher3.folder.Folder;
-import com.android.launcher3.folder.FolderIcon;
-import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.model.data.WorkspaceItemInfo;
-import com.android.launcher3.taskbar.TaskbarNavButtonController.TaskbarButton;
-import com.android.launcher3.touch.ItemClickHandler;
-import com.android.launcher3.util.PackageManagerHelper;
-import com.android.launcher3.util.Themes;
-import com.android.launcher3.util.TraceHelper;
 import com.android.launcher3.views.ActivityContext;
-import com.android.quickstep.SysUINavigationMode;
-import com.android.quickstep.SysUINavigationMode.Mode;
-import com.android.systemui.shared.recents.model.Task;
-import com.android.systemui.shared.system.ActivityManagerWrapper;
-import com.android.systemui.shared.system.WindowManagerWrapper;
+import com.android.launcher3.views.BaseDragLayer;
 
 /**
  * The {@link ActivityContext} with which we inflate Taskbar-related Views. This allows UI elements
  * that are used by both Launcher and Taskbar (such as Folder) to reference a generic
  * ActivityContext and BaseDragLayer instead of the Launcher activity and its DragLayer.
  */
-public class TaskbarActivityContext extends ContextThemeWrapper implements ActivityContext {
-
-    private static final boolean ENABLE_THREE_BUTTON_TASKBAR =
-            SystemProperties.getBoolean("persist.debug.taskbar_three_button", false);
-    private static final String TAG = "TaskbarActivityContext";
-
-    private static final String WINDOW_TITLE = "Taskbar";
+public class TaskbarActivityContext extends ContextWrapper implements ActivityContext {
 
     private final DeviceProfile mDeviceProfile;
     private final LayoutInflater mLayoutInflater;
     private final TaskbarContainerView mTaskbarContainerView;
-    private final TaskbarIconController mIconController;
     private final MyDragController mDragController;
 
-    private final WindowManager mWindowManager;
-    private WindowManager.LayoutParams mWindowLayoutParams;
-
-    private final SysUINavigationMode.Mode mNavMode;
-    private final TaskbarNavButtonController mNavButtonController;
-
-    private final boolean mIsSafeModeEnabled;
-
-    @NonNull
-    private TaskbarUIController mUIController = TaskbarUIController.DEFAULT;
-
-    private final View.OnClickListener mOnTaskbarIconClickListener;
-    private final View.OnLongClickListener mOnTaskbarIconLongClickListener;
-
-    public TaskbarActivityContext(Context windowContext, DeviceProfile dp,
-            TaskbarNavButtonController buttonController) {
-        super(windowContext, Themes.getActivityThemeRes(windowContext));
-        mDeviceProfile = dp;
-        mNavButtonController = buttonController;
-        mNavMode = SysUINavigationMode.getMode(windowContext);
-        mIsSafeModeEnabled = TraceHelper.allowIpcs("isSafeMode",
-                () -> getPackageManager().isSafeMode());
-
-        mOnTaskbarIconLongClickListener =
-                new TaskbarDragController(this)::startSystemDragOnLongClick;
-        mOnTaskbarIconClickListener = this::onTaskbarIconClicked;
-
+    public TaskbarActivityContext(BaseQuickstepLauncher launcher) {
+        super(launcher);
+        mDeviceProfile = launcher.getDeviceProfile().copy(this);
         float taskbarIconSize = getResources().getDimension(R.dimen.taskbar_icon_size);
         float iconScale = taskbarIconSize / mDeviceProfile.iconSizePx;
         mDeviceProfile.updateIconSize(iconScale, getResources());
 
         mLayoutInflater = LayoutInflater.from(this).cloneInContext(this);
+
         mTaskbarContainerView = (TaskbarContainerView) mLayoutInflater
                 .inflate(R.layout.taskbar, null, false);
-        mIconController = new TaskbarIconController(this, mTaskbarContainerView);
         mDragController = new MyDragController(this);
-
-        Display display = windowContext.getDisplay();
-        Context c = display.getDisplayId() == Display.DEFAULT_DISPLAY
-                ? windowContext.getApplicationContext()
-                : windowContext.getApplicationContext().createDisplayContext(display);
-        mWindowManager = c.getSystemService(WindowManager.class);
-    }
-
-    public void init() {
-        mWindowLayoutParams = new WindowManager.LayoutParams(
-                MATCH_PARENT,
-                mDeviceProfile.taskbarSize,
-                TYPE_APPLICATION_OVERLAY,
-                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
-                PixelFormat.TRANSLUCENT);
-        mWindowLayoutParams.setTitle(WINDOW_TITLE);
-        mWindowLayoutParams.packageName = getPackageName();
-        mWindowLayoutParams.gravity = Gravity.BOTTOM;
-        mWindowLayoutParams.setFitInsetsTypes(0);
-        mWindowLayoutParams.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING;
-        mWindowLayoutParams.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
-        mWindowLayoutParams.setSystemApplicationOverlay(true);
-
-        WindowManagerWrapper wmWrapper = WindowManagerWrapper.getInstance();
-        wmWrapper.setProvidesInsetsTypes(
-                mWindowLayoutParams,
-                new int[] { ITYPE_EXTRA_NAVIGATION_BAR, ITYPE_BOTTOM_TAPPABLE_ELEMENT }
-        );
-
-        mIconController.init(mOnTaskbarIconClickListener, mOnTaskbarIconLongClickListener);
-        mWindowManager.addView(mTaskbarContainerView, mWindowLayoutParams);
-    }
-
-    /**
-     * Updates the TaskbarContainer height (pass deviceProfile.taskbarSize to reset).
-     */
-    public void setTaskbarWindowHeight(int height) {
-        if (mWindowLayoutParams.height == height) {
-            return;
-        }
-        mWindowLayoutParams.height = height;
-        mWindowManager.updateViewLayout(mTaskbarContainerView, mWindowLayoutParams);
     }
 
-    public boolean canShowNavButtons() {
-        return ENABLE_THREE_BUTTON_TASKBAR && mNavMode == Mode.THREE_BUTTONS;
+    public TaskbarContainerView getTaskbarContainerView() {
+        return mTaskbarContainerView;
     }
 
     @Override
@@ -181,7 +73,7 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ
     }
 
     @Override
-    public TaskbarContainerView getDragLayer() {
+    public BaseDragLayer<TaskbarActivityContext> getDragLayer() {
         return mTaskbarContainerView;
     }
 
@@ -200,103 +92,6 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ
         return mDragController;
     }
 
-    /**
-     * Sets a new data-source for this taskbar instance
-     */
-    public void setUIController(@NonNull TaskbarUIController uiController) {
-        mUIController.onDestroy();
-        mUIController = uiController;
-        mIconController.setUIController(mUIController);
-        mUIController.onCreate();
-    }
-
-    /**
-     * Called when this instance of taskbar is no longer needed
-     */
-    public void onDestroy() {
-        setUIController(TaskbarUIController.DEFAULT);
-        mIconController.onDestroy();
-        mWindowManager.removeViewImmediate(mTaskbarContainerView);
-    }
-
-    void onNavigationButtonClick(@TaskbarButton int buttonType) {
-        mNavButtonController.onButtonClick(buttonType);
-    }
-
-    public TaskbarIconController getIconController() {
-        return mIconController;
-    }
-
-    /**
-     * Updates the TaskbarContainer to MATCH_PARENT vs original Taskbar size.
-     */
-    protected void setTaskbarWindowFullscreen(boolean fullscreen) {
-        setTaskbarWindowHeight(fullscreen ? MATCH_PARENT : getDeviceProfile().taskbarSize);
-    }
-
-    protected void onTaskbarIconClicked(View view) {
-        Object tag = view.getTag();
-        if (tag instanceof Task) {
-            Task task = (Task) tag;
-            ActivityManagerWrapper.getInstance().startActivityFromRecents(task.key,
-                    ActivityOptions.makeBasic());
-        } else if (tag instanceof FolderInfo) {
-            FolderIcon folderIcon = (FolderIcon) view;
-            Folder folder = folderIcon.getFolder();
-            setTaskbarWindowFullscreen(true);
-
-            getDragLayer().post(() -> {
-                folder.animateOpen();
-
-                folder.iterateOverItems((itemInfo, itemView) -> {
-                    itemView.setOnClickListener(mOnTaskbarIconClickListener);
-                    itemView.setOnLongClickListener(mOnTaskbarIconLongClickListener);
-                    // To play haptic when dragging, like other Taskbar items do.
-                    itemView.setHapticFeedbackEnabled(true);
-                    return false;
-                });
-            });
-        } else if (tag instanceof WorkspaceItemInfo) {
-            WorkspaceItemInfo info = (WorkspaceItemInfo) tag;
-            if (info.isDisabled()) {
-                ItemClickHandler.handleDisabledItemClicked(info, this);
-            } else {
-                Intent intent = new Intent(info.getIntent())
-                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                try {
-                    if (mIsSafeModeEnabled && !PackageManagerHelper.isSystemApp(this, intent)) {
-                        Toast.makeText(this, R.string.safemode_shortcut_error,
-                                Toast.LENGTH_SHORT).show();
-                    } else  if (info.isPromise()) {
-                        intent = new PackageManagerHelper(this)
-                                .getMarketIntent(info.getTargetPackage())
-                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                        startActivity(intent);
-
-                    } else if (info.itemType == Favorites.ITEM_TYPE_DEEP_SHORTCUT) {
-                        String id = info.getDeepShortcutId();
-                        String packageName = intent.getPackage();
-                        getSystemService(LauncherApps.class)
-                                .startShortcut(packageName, id, null, null, info.user);
-                    } else if (info.user.equals(Process.myUserHandle())) {
-                        startActivity(intent);
-                    } else {
-                        getSystemService(LauncherApps.class).startMainActivity(
-                                intent.getComponent(), info.user, intent.getSourceBounds(), null);
-                    }
-                } catch (NullPointerException | ActivityNotFoundException | SecurityException e) {
-                    Toast.makeText(this, R.string.activity_not_found, Toast.LENGTH_SHORT)
-                            .show();
-                    Log.e(TAG, "Unable to launch. tag=" + info + " intent=" + intent, e);
-                }
-            }
-        } else {
-            Log.e(TAG, "Unknown type clicked: " + tag);
-        }
-
-        AbstractFloatingView.closeAllOpenViews(this);
-    }
-
     private static class MyDragController extends DragController<TaskbarActivityContext> {
         MyDragController(TaskbarActivityContext activity) {
             super(activity);
@@ -311,8 +106,7 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ
         }
 
         @Override
-        protected void exitDrag() {
-        }
+        protected void exitDrag() { }
 
         @Override
         protected DropTarget getDefaultDropTarget(int[] dropCoordinates) {
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java
index 815efb9728..29f6935f8a 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java
@@ -21,7 +21,6 @@ import android.animation.Animator;
 
 import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.taskbar.TaskbarController.TaskbarAnimationControllerCallbacks;
 import com.android.quickstep.AnimatedFloat;
 import com.android.quickstep.SystemUiProxy;
 import com.android.systemui.shared.system.QuickStepContract;
@@ -35,7 +34,7 @@ public class TaskbarAnimationController {
     private static final long IME_VISIBILITY_ALPHA_DURATION = 120;
 
     private final BaseQuickstepLauncher mLauncher;
-    private final TaskbarAnimationControllerCallbacks mTaskbarCallbacks;
+    private final TaskbarController.TaskbarAnimationControllerCallbacks mTaskbarCallbacks;
 
     // Background alpha.
     private final AnimatedFloat mTaskbarBackgroundAlpha = new AnimatedFloat(
@@ -56,7 +55,7 @@ public class TaskbarAnimationController {
             this::updateTranslationY);
 
     public TaskbarAnimationController(BaseQuickstepLauncher launcher,
-            TaskbarAnimationControllerCallbacks taskbarCallbacks) {
+            TaskbarController.TaskbarAnimationControllerCallbacks taskbarCallbacks) {
         mLauncher = launcher;
         mTaskbarCallbacks = taskbarCallbacks;
     }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
index 5034791f0e..621bba7e85 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
@@ -15,6 +15,9 @@
  */
 package com.android.launcher3.taskbar;
 
+import static com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo.TOUCHABLE_INSETS_FRAME;
+import static com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo.TOUCHABLE_INSETS_REGION;
+
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Paint;
@@ -29,21 +32,22 @@ import com.android.launcher3.R;
 import com.android.launcher3.util.TouchController;
 import com.android.launcher3.views.BaseDragLayer;
 import com.android.systemui.shared.system.ViewTreeObserverWrapper;
-import com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo;
-import com.android.systemui.shared.system.ViewTreeObserverWrapper.OnComputeInsetsListener;
 
 /**
  * Top-level ViewGroup that hosts the TaskbarView as well as Views created by it such as Folder.
  */
 public class TaskbarContainerView extends BaseDragLayer<TaskbarActivityContext> {
 
+    private final int[] mTempLoc = new int[2];
     private final int mFolderMargin;
     private final Paint mTaskbarBackgroundPaint;
 
-    private TaskbarIconController.Callbacks mControllerCallbacks;
-    private TaskbarView mTaskbarView;
+    // Initialized in TaskbarController constructor.
+    private TaskbarController.TaskbarContainerViewCallbacks mControllerCallbacks;
 
-    private final OnComputeInsetsListener mTaskbarInsetsComputer = this::onComputeTaskbarInsets;
+    // Initialized in init.
+    private TaskbarView mTaskbarView;
+    private ViewTreeObserverWrapper.OnComputeInsetsListener mTaskbarInsetsComputer;
 
     public TaskbarContainerView(@NonNull Context context) {
         this(context, null);
@@ -64,32 +68,63 @@ public class TaskbarContainerView extends BaseDragLayer<TaskbarActivityContext>
         mFolderMargin = getResources().getDimensionPixelSize(R.dimen.taskbar_folder_margin);
         mTaskbarBackgroundPaint = new Paint();
         mTaskbarBackgroundPaint.setColor(getResources().getColor(R.color.taskbar_background));
-        recreateControllers();
     }
 
-    @Override
-    public void recreateControllers() {
-        mControllers = new TouchController[0];
+    protected void construct(TaskbarController.TaskbarContainerViewCallbacks callbacks) {
+        mControllerCallbacks = callbacks;
     }
 
-    public void init(TaskbarIconController.Callbacks callbacks, TaskbarView taskbarView) {
-        mControllerCallbacks = callbacks;
+    protected void init(TaskbarView taskbarView) {
         mTaskbarView = taskbarView;
+        mTaskbarInsetsComputer = createTaskbarInsetsComputer();
+        recreateControllers();
     }
 
-    private void onComputeTaskbarInsets(InsetsInfo insetsInfo) {
-        if (mControllerCallbacks != null) {
-            mControllerCallbacks.updateInsetsTouchability(insetsInfo);
-        }
+    @Override
+    public void recreateControllers() {
+        mControllers = new TouchController[0];
     }
 
-    protected void onDestroy() {
+    private ViewTreeObserverWrapper.OnComputeInsetsListener createTaskbarInsetsComputer() {
+        return insetsInfo -> {
+            if (mControllerCallbacks.isTaskbarTouchable()) {
+                 // Accept touches anywhere in our bounds.
+                insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_FRAME);
+            } else {
+                // Let touches pass through us.
+                insetsInfo.touchableRegion.setEmpty();
+                insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION);
+            }
+
+            // TaskbarContainerView provides insets to other apps based on contentInsets. These
+            // insets should stay consistent even if we expand TaskbarContainerView's bounds, e.g.
+            // to show a floating view like Folder. Thus, we set the contentInsets to be where
+            // mTaskbarView is, since its position never changes and insets rather than overlays.
+            int[] loc = mTempLoc;
+            float scale = mTaskbarView.getScaleX();
+            float translationY = mTaskbarView.getTranslationY();
+            mTaskbarView.setScaleX(1);
+            mTaskbarView.setScaleY(1);
+            mTaskbarView.setTranslationY(0);
+            mTaskbarView.getLocationInWindow(loc);
+            mTaskbarView.setScaleX(scale);
+            mTaskbarView.setScaleY(scale);
+            mTaskbarView.setTranslationY(translationY);
+            insetsInfo.contentInsets.left = loc[0];
+            insetsInfo.contentInsets.top = loc[1];
+            insetsInfo.contentInsets.right = getWidth() - (loc[0] + mTaskbarView.getWidth());
+            insetsInfo.contentInsets.bottom = getHeight() - (loc[1] + mTaskbarView.getHeight());
+        };
+    }
+
+    protected void cleanup() {
         ViewTreeObserverWrapper.removeOnComputeInsetsListener(mTaskbarInsetsComputer);
     }
 
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
+
         ViewTreeObserverWrapper.addOnComputeInsetsListener(getViewTreeObserver(),
                 mTaskbarInsetsComputer);
     }
@@ -98,7 +133,7 @@ public class TaskbarContainerView extends BaseDragLayer<TaskbarActivityContext>
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
 
-        onDestroy();
+        cleanup();
     }
 
     @Override
@@ -108,25 +143,10 @@ public class TaskbarContainerView extends BaseDragLayer<TaskbarActivityContext>
         return true;
     }
 
-    public void updateImeBarVisibilityAlpha(float alpha) {
-        if (mControllerCallbacks != null) {
-            mControllerCallbacks.updateImeBarVisibilityAlpha(alpha);
-        }
-    }
-
     @Override
     public void onViewRemoved(View child) {
         super.onViewRemoved(child);
-        if (mControllerCallbacks != null) {
-            mControllerCallbacks.onContainerViewRemoved();
-        }
-    }
-
-    @Override
-    protected void dispatchDraw(Canvas canvas) {
-        canvas.drawRect(0, canvas.getHeight() - mTaskbarView.getHeight(), canvas.getWidth(),
-                canvas.getHeight(), mTaskbarBackgroundPaint);
-        super.dispatchDraw(canvas);
+        mControllerCallbacks.onViewRemoved();
     }
 
     /**
@@ -138,6 +158,16 @@ public class TaskbarContainerView extends BaseDragLayer<TaskbarActivityContext>
         return boundingBox;
     }
 
+    protected TaskbarActivityContext getTaskbarActivityContext() {
+        return mActivity;
+    }
+
+    @Override
+    protected void dispatchDraw(Canvas canvas) {
+        canvas.drawRect(0, canvas.getHeight() - mTaskbarView.getHeight(), canvas.getWidth(),
+                canvas.getHeight(), mTaskbarBackgroundPaint);
+        super.dispatchDraw(canvas);
+    }
 
     /**
      * Sets the alpha of the background color behind all the Taskbar contents.
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index cdae5beb9a..6084e10d85 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -15,83 +15,105 @@
  */
 package com.android.launcher3.taskbar;
 
+import static android.view.View.GONE;
+import static android.view.View.INVISIBLE;
+import static android.view.View.VISIBLE;
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
+import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
+
+import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_BOTTOM_TAPPABLE_ELEMENT;
+import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_EXTRA_NAVIGATION_BAR;
+
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
+import android.app.ActivityOptions;
+import android.graphics.PixelFormat;
+import android.graphics.Point;
 import android.graphics.Rect;
-import android.graphics.RectF;
+import android.inputmethodservice.InputMethodService;
+import android.view.Gravity;
 import android.view.MotionEvent;
+import android.view.View;
+import android.view.WindowManager;
 
 import androidx.annotation.Nullable;
 
+import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.QuickstepTransitionManager;
 import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
+import com.android.launcher3.anim.AlphaUpdateListener;
 import com.android.launcher3.anim.PendingAnimation;
+import com.android.launcher3.folder.Folder;
+import com.android.launcher3.folder.FolderIcon;
+import com.android.launcher3.model.data.FolderInfo;
+import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.states.StateAnimationConfig;
-
+import com.android.launcher3.taskbar.TaskbarNavButtonController.TaskbarButton;
+import com.android.launcher3.touch.ItemClickHandler;
+import com.android.launcher3.views.ActivityContext;
+import com.android.quickstep.AnimatedFloat;
+import com.android.quickstep.SysUINavigationMode;
+import com.android.quickstep.TouchInteractionService.TaskbarOverviewProxyDelegate;
+import com.android.systemui.shared.recents.model.Task;
+import com.android.systemui.shared.system.ActivityManagerWrapper;
+import com.android.systemui.shared.system.WindowManagerWrapper;
 
 /**
- * A data source which integrates with a Launcher instance
- * TODO: Rename to have Launcher prefix
+ * Interfaces with Launcher/WindowManager/SystemUI to determine what to show in TaskbarView.
  */
+public class TaskbarController implements TaskbarOverviewProxyDelegate {
 
-public class TaskbarController extends TaskbarUIController {
+    private static final String WINDOW_TITLE = "Taskbar";
+
+    private final TaskbarContainerView mTaskbarContainerView;
+    private final TaskbarView mTaskbarViewInApp;
+    private final TaskbarView mTaskbarViewOnHome;
+    private final ImeBarView mImeBarView;
 
     private final BaseQuickstepLauncher mLauncher;
+    private final WindowManager mWindowManager;
+    // Layout width and height of the Taskbar in the default state.
+    private final Point mTaskbarSize;
     private final TaskbarStateHandler mTaskbarStateHandler;
     private final TaskbarAnimationController mTaskbarAnimationController;
     private final TaskbarHotseatController mHotseatController;
+    private final TaskbarDragController mDragController;
+    private final TaskbarNavButtonController mNavButtonController;
 
-    private final TaskbarActivityContext mContext;
-    final TaskbarContainerView mTaskbarContainerView;
-    final TaskbarView mTaskbarView;
+    // Initialized in init().
+    private WindowManager.LayoutParams mWindowLayoutParams;
+    private SysUINavigationMode.Mode mNavMode = SysUINavigationMode.Mode.NO_BUTTON;
+    private final SysUINavigationMode.NavigationModeChangeListener mNavigationModeChangeListener =
+            this::onNavModeChanged;
 
     private @Nullable Animator mAnimator;
     private boolean mIsAnimatingToLauncher;
 
-    public TaskbarController(BaseQuickstepLauncher launcher, TaskbarActivityContext context) {
-        mContext = context;
-        mTaskbarContainerView = context.getDragLayer();
-        mTaskbarView = mTaskbarContainerView.findViewById(R.id.taskbar_view);
-
+    public TaskbarController(BaseQuickstepLauncher launcher,
+            TaskbarContainerView taskbarContainerView, TaskbarView taskbarViewOnHome) {
         mLauncher = launcher;
+        mTaskbarContainerView = taskbarContainerView;
+        mTaskbarContainerView.construct(createTaskbarContainerViewCallbacks());
+        ButtonProvider buttonProvider = new ButtonProvider(launcher);
+        mTaskbarViewInApp = mTaskbarContainerView.findViewById(R.id.taskbar_view);
+        mTaskbarViewInApp.construct(createTaskbarViewCallbacks(), buttonProvider);
+        mTaskbarViewOnHome = taskbarViewOnHome;
+        mTaskbarViewOnHome.construct(createTaskbarViewCallbacks(), buttonProvider);
+        mImeBarView = mTaskbarContainerView.findViewById(R.id.ime_bar_view);
+        mImeBarView.construct(buttonProvider);
+        mNavButtonController = new TaskbarNavButtonController(launcher);
+        mWindowManager = mLauncher.getWindowManager();
+        mTaskbarSize = new Point(MATCH_PARENT, mLauncher.getDeviceProfile().taskbarSize);
         mTaskbarStateHandler = mLauncher.getTaskbarStateHandler();
         mTaskbarAnimationController = new TaskbarAnimationController(mLauncher,
                 createTaskbarAnimationControllerCallbacks());
-        mHotseatController = new TaskbarHotseatController(
-                mLauncher, mTaskbarView::updateHotseatItems);
-    }
-
-    @Override
-    protected void onCreate() {
-        mTaskbarStateHandler.setAnimationController(mTaskbarAnimationController);
-        mTaskbarAnimationController.init();
-        mHotseatController.init();
-        setTaskbarViewVisible(!mLauncher.hasBeenResumed());
-        alignRealHotseatWithTaskbar();
-        mLauncher.setTaskbarController(this);
-    }
-
-    @Override
-    protected void onDestroy() {
-        if (mAnimator != null) {
-            // End this first, in case it relies on properties that are about to be cleaned up.
-            mAnimator.end();
-        }
-        mTaskbarStateHandler.setAnimationController(null);
-        mTaskbarAnimationController.cleanup();
-        mHotseatController.cleanup();
-        setTaskbarViewVisible(true);
-        mLauncher.getHotseat().setIconsAlpha(1f);
-        mLauncher.setTaskbarController(null);
-    }
-
-    @Override
-    protected boolean isTaskbarTouchable() {
-        return !mIsAnimatingToLauncher;
+        mHotseatController = new TaskbarHotseatController(mLauncher,
+                createTaskbarHotseatControllerCallbacks());
+        mDragController = new TaskbarDragController(mLauncher);
     }
 
     private TaskbarAnimationControllerCallbacks createTaskbarAnimationControllerCallbacks() {
@@ -103,34 +125,245 @@ public class TaskbarController extends TaskbarUIController {
 
             @Override
             public void updateTaskbarVisibilityAlpha(float alpha) {
-                mTaskbarView.setAlpha(alpha);
+                mTaskbarViewInApp.setAlpha(alpha);
+                mTaskbarViewOnHome.setAlpha(alpha);
             }
 
             @Override
             public void updateImeBarVisibilityAlpha(float alpha) {
-                mTaskbarContainerView.updateImeBarVisibilityAlpha(alpha);
+                if (mNavMode != SysUINavigationMode.Mode.THREE_BUTTONS) {
+                    // TODO Remove sysui IME bar for gesture nav as well
+                    return;
+                }
+                mImeBarView.setAlpha(alpha);
+                mImeBarView.setVisibility(alpha == 0 ? GONE : VISIBLE);
             }
 
             @Override
             public void updateTaskbarScale(float scale) {
-                mTaskbarView.setScaleX(scale);
-                mTaskbarView.setScaleY(scale);
+                mTaskbarViewInApp.setScaleX(scale);
+                mTaskbarViewInApp.setScaleY(scale);
             }
 
             @Override
             public void updateTaskbarTranslationY(float translationY) {
                 if (translationY < 0) {
                     // Resize to accommodate the max translation we'll reach.
-                    mContext.setTaskbarWindowHeight(mContext.getDeviceProfile().taskbarSize
+                    setTaskbarWindowHeight(mTaskbarSize.y
                             + mLauncher.getHotseat().getTaskbarOffsetY());
                 } else {
-                    mContext.setTaskbarWindowHeight(mContext.getDeviceProfile().taskbarSize);
+                    setTaskbarWindowHeight(mTaskbarSize.y);
+                }
+                mTaskbarViewInApp.setTranslationY(translationY);
+            }
+        };
+    }
+
+    private TaskbarContainerViewCallbacks createTaskbarContainerViewCallbacks() {
+        return new TaskbarContainerViewCallbacks() {
+            @Override
+            public void onViewRemoved() {
+                // Ensure no other children present (like Folders, etc)
+                for (int i = 0; i < mTaskbarContainerView.getChildCount(); i++) {
+                    View v = mTaskbarContainerView.getChildAt(i);
+                    if (!((v instanceof TaskbarView) || (v instanceof ImeBarView))){
+                        return;
+                    }
                 }
-                mTaskbarView.setTranslationY(translationY);
+                setTaskbarWindowFullscreen(false);
+            }
+
+            @Override
+            public boolean isTaskbarTouchable() {
+                return mTaskbarContainerView.getAlpha() > AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD
+                        && (mTaskbarViewInApp.getVisibility() == VISIBLE
+                            || mImeBarView.getVisibility() == VISIBLE)
+                        && !mIsAnimatingToLauncher;
+            }
+        };
+    }
+
+    private TaskbarViewCallbacks createTaskbarViewCallbacks() {
+        return new TaskbarViewCallbacks() {
+            @Override
+            public View.OnClickListener getItemOnClickListener() {
+                return view -> {
+                    Object tag = view.getTag();
+                    if (tag instanceof Task) {
+                        Task task = (Task) tag;
+                        ActivityManagerWrapper.getInstance().startActivityFromRecents(task.key,
+                                ActivityOptions.makeBasic());
+                    } else if (tag instanceof FolderInfo) {
+                        FolderIcon folderIcon = (FolderIcon) view;
+                        Folder folder = folderIcon.getFolder();
+
+                        setTaskbarWindowFullscreen(true);
+
+                        mTaskbarContainerView.post(() -> {
+                            folder.animateOpen();
+
+                            folder.iterateOverItems((itemInfo, itemView) -> {
+                                itemView.setOnClickListener(getItemOnClickListener());
+                                itemView.setOnLongClickListener(getItemOnLongClickListener());
+                                // To play haptic when dragging, like other Taskbar items do.
+                                itemView.setHapticFeedbackEnabled(true);
+                                return false;
+                            });
+                        });
+                    } else {
+                        ItemClickHandler.INSTANCE.onClick(view);
+                    }
+
+                    AbstractFloatingView.closeAllOpenViews(
+                            mTaskbarContainerView.getTaskbarActivityContext());
+                };
+            }
+
+            @Override
+            public View.OnLongClickListener getItemOnLongClickListener() {
+                return mDragController::startSystemDragOnLongClick;
+            }
+
+            @Override
+            public int getEmptyHotseatViewVisibility(TaskbarView taskbarView) {
+                // When on the home screen, we want the empty hotseat views to take up their full
+                // space so that the others line up with the home screen hotseat.
+                boolean isOnHomeScreen = taskbarView == mTaskbarViewOnHome
+                        || mLauncher.hasBeenResumed() || mIsAnimatingToLauncher;
+                return isOnHomeScreen ? INVISIBLE : GONE;
+            }
+
+            @Override
+            public float getNonIconScale(TaskbarView taskbarView) {
+                return taskbarView == mTaskbarViewOnHome ? getTaskbarScaleOnHome() : 1f;
+            }
+
+            @Override
+            public void onItemPositionsChanged(TaskbarView taskbarView) {
+                if (taskbarView == mTaskbarViewOnHome) {
+                    alignRealHotseatWithTaskbar();
+                }
+            }
+
+            @Override
+            public void onNavigationButtonClick(@TaskbarButton int buttonType) {
+                mNavButtonController.onButtonClick(buttonType);
+            }
+        };
+    }
+
+    private TaskbarHotseatControllerCallbacks createTaskbarHotseatControllerCallbacks() {
+        return new TaskbarHotseatControllerCallbacks() {
+            @Override
+            public void updateHotseatItems(ItemInfo[] hotseatItemInfos) {
+                mTaskbarViewInApp.updateHotseatItems(hotseatItemInfos);
             }
         };
     }
 
+    /**
+     * Initializes the Taskbar, including adding it to the screen.
+     */
+    public void init() {
+        mNavMode = SysUINavigationMode.INSTANCE.get(mLauncher)
+                .addModeChangeListener(mNavigationModeChangeListener);
+        mTaskbarViewInApp.init(mHotseatController.getNumHotseatIcons(), mNavMode);
+        mTaskbarViewOnHome.init(mHotseatController.getNumHotseatIcons(), mNavMode);
+        mTaskbarContainerView.init(mTaskbarViewInApp);
+        mImeBarView.init(createTaskbarViewCallbacks());
+        addToWindowManager();
+        mTaskbarStateHandler.setTaskbarCallbacks(createTaskbarStateHandlerCallbacks());
+        mTaskbarAnimationController.init();
+        mHotseatController.init();
+
+        setWhichTaskbarViewIsVisible(mLauncher.hasBeenResumed()
+                ? mTaskbarViewOnHome
+                : mTaskbarViewInApp);
+    }
+
+    private TaskbarStateHandlerCallbacks createTaskbarStateHandlerCallbacks() {
+        return new TaskbarStateHandlerCallbacks() {
+            @Override
+            public AnimatedFloat getAlphaTarget() {
+                return mTaskbarAnimationController.getTaskbarVisibilityForLauncherState();
+            }
+
+            @Override
+            public AnimatedFloat getScaleTarget() {
+                return mTaskbarAnimationController.getTaskbarScaleForLauncherState();
+            }
+
+            @Override
+            public AnimatedFloat getTranslationYTarget() {
+                return mTaskbarAnimationController.getTaskbarTranslationYForLauncherState();
+            }
+        };
+    }
+
+    /**
+     * Removes the Taskbar from the screen, and removes any obsolete listeners etc.
+     */
+    public void cleanup() {
+        if (mAnimator != null) {
+            // End this first, in case it relies on properties that are about to be cleaned up.
+            mAnimator.end();
+        }
+
+        mTaskbarViewInApp.cleanup();
+        mTaskbarViewOnHome.cleanup();
+        mTaskbarContainerView.cleanup();
+        mImeBarView.cleanup();
+        removeFromWindowManager();
+        mTaskbarStateHandler.setTaskbarCallbacks(null);
+        mTaskbarAnimationController.cleanup();
+        mHotseatController.cleanup();
+
+        setWhichTaskbarViewIsVisible(null);
+        SysUINavigationMode.INSTANCE.get(mLauncher)
+                .removeModeChangeListener(mNavigationModeChangeListener);
+    }
+
+    private void removeFromWindowManager() {
+        mWindowManager.removeViewImmediate(mTaskbarContainerView);
+    }
+
+    private void addToWindowManager() {
+        final int gravity = Gravity.BOTTOM;
+
+        mWindowLayoutParams = new WindowManager.LayoutParams(
+                mTaskbarSize.x,
+                mTaskbarSize.y,
+                TYPE_APPLICATION_OVERLAY,
+                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
+                PixelFormat.TRANSLUCENT);
+        mWindowLayoutParams.setTitle(WINDOW_TITLE);
+        mWindowLayoutParams.packageName = mLauncher.getPackageName();
+        mWindowLayoutParams.gravity = gravity;
+        mWindowLayoutParams.setFitInsetsTypes(0);
+        mWindowLayoutParams.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING;
+        mWindowLayoutParams.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
+        mWindowLayoutParams.setSystemApplicationOverlay(true);
+
+        WindowManagerWrapper wmWrapper = WindowManagerWrapper.getInstance();
+        wmWrapper.setProvidesInsetsTypes(
+                mWindowLayoutParams,
+                new int[] { ITYPE_EXTRA_NAVIGATION_BAR, ITYPE_BOTTOM_TAPPABLE_ELEMENT }
+        );
+
+        TaskbarContainerView.LayoutParams taskbarLayoutParams =
+                new TaskbarContainerView.LayoutParams(mTaskbarSize.x, mTaskbarSize.y);
+        taskbarLayoutParams.gravity = gravity;
+        mTaskbarViewInApp.setLayoutParams(taskbarLayoutParams);
+
+        mWindowManager.addView(mTaskbarContainerView, mWindowLayoutParams);
+    }
+
+    private void onNavModeChanged(SysUINavigationMode.Mode newMode) {
+        mNavMode = newMode;
+        cleanup();
+        init();
+    }
+
     /**
      * Should be called from onResume() and onPause(), and animates the Taskbar accordingly.
      */
@@ -168,14 +401,13 @@ public class TaskbarController extends TaskbarUIController {
             @Override
             public void onAnimationStart(Animator animation) {
                 mIsAnimatingToLauncher = true;
-                mTaskbarView.setHolesAllowedInLayout(true);
-                mTaskbarView.updateHotseatItemsVisibility();
+                mTaskbarViewInApp.updateHotseatItemsVisibility();
             }
 
             @Override
             public void onAnimationEnd(Animator animation) {
                 mIsAnimatingToLauncher = false;
-                setTaskbarViewVisible(false);
+                setWhichTaskbarViewIsVisible(mTaskbarViewOnHome);
             }
         });
 
@@ -188,21 +420,44 @@ public class TaskbarController extends TaskbarUIController {
         anim.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationStart(Animator animation) {
-                mTaskbarView.updateHotseatItemsVisibility();
-                setTaskbarViewVisible(true);
+                mTaskbarViewInApp.updateHotseatItemsVisibility();
+                setWhichTaskbarViewIsVisible(mTaskbarViewInApp);
             }
 
             @Override
             public void onAnimationEnd(Animator animation) {
-                mTaskbarView.setHolesAllowedInLayout(false);
             }
         });
         return anim.buildAnim();
     }
 
-    @Override
-    protected void onImeVisible(TaskbarContainerView containerView, boolean isVisible) {
-        mTaskbarAnimationController.animateToVisibilityForIme(isVisible ? 0 : 1);
+    /**
+     * Should be called when the IME visibility changes, so we can hide/show Taskbar accordingly.
+     */
+    public void setIsImeVisible(boolean isImeVisible) {
+        mTaskbarAnimationController.animateToVisibilityForIme(isImeVisible ? 0 : 1);
+        blockTaskbarTouchesForIme(isImeVisible);
+    }
+
+    /**
+     * When in 3 button nav, the above doesn't get called since we prevent sysui nav bar from
+     * instantiating at all, which is what's responsible for sending sysui state flags over.
+     *
+     * @param vis IME visibility flag
+     * @param backDisposition Used to determine back button behavior for software keyboard
+     *                        See BACK_DISPOSITION_* constants in {@link InputMethodService}
+     */
+    public void updateImeStatus(int displayId, int vis, int backDisposition,
+            boolean showImeSwitcher) {
+        if (displayId != mTaskbarContainerView.getContext().getDisplayId() ||
+                mNavMode != SysUINavigationMode.Mode.THREE_BUTTONS) {
+            return;
+        }
+
+        boolean imeVisible = (vis & InputMethodService.IME_VISIBLE) != 0;
+        mTaskbarAnimationController.animateToVisibilityForIme(imeVisible ? 0 : 1);
+        mImeBarView.setImeSwitcherVisibility(showImeSwitcher);
+        blockTaskbarTouchesForIme(imeVisible);
     }
 
     /**
@@ -217,17 +472,24 @@ public class TaskbarController extends TaskbarUIController {
      * @return Whether any Taskbar item could handle the given MotionEvent if given the chance.
      */
     public boolean isEventOverAnyTaskbarItem(MotionEvent ev) {
-        return mTaskbarView.isEventOverAnyItem(ev);
+        return mTaskbarViewInApp.isEventOverAnyItem(ev);
     }
 
     public boolean isDraggingItem() {
-        return mTaskbarView.isDraggingItem();
+        return mTaskbarViewInApp.isDraggingItem() || mTaskbarViewOnHome.isDraggingItem();
+    }
+
+    /**
+     * @return Whether the given View is in the same window as Taskbar.
+     */
+    public boolean isViewInTaskbar(View v) {
+        return mTaskbarContainerView.isAttachedToWindow()
+                && mTaskbarContainerView.getWindowId().equals(v.getWindowId());
     }
 
     /**
      * Pads the Hotseat to line up exactly with Taskbar's copy of the Hotseat.
      */
-    @Override
     public void alignRealHotseatWithTaskbar() {
         Rect hotseatBounds = new Rect();
         DeviceProfile grid = mLauncher.getDeviceProfile();
@@ -236,28 +498,60 @@ public class TaskbarController extends TaskbarUIController {
         int hotseatTopDiff = hotseatHeight - grid.taskbarSize - taskbarOffset;
         int hotseatBottomDiff = taskbarOffset;
 
-        RectF hotseatBoundsF = mTaskbarView.getHotseatBounds();
-        Utilities.scaleRectFAboutPivot(hotseatBoundsF, getTaskbarScaleOnHome(),
-                mTaskbarView.getPivotX(), mTaskbarView.getPivotY());
-        hotseatBoundsF.round(hotseatBounds);
+        mTaskbarViewOnHome.getHotseatBounds().roundOut(hotseatBounds);
         mLauncher.getHotseat().setPadding(hotseatBounds.left,
                 hotseatBounds.top + hotseatTopDiff,
-                mTaskbarView.getWidth() - hotseatBounds.right,
-                mTaskbarView.getHeight() - hotseatBounds.bottom + hotseatBottomDiff);
+                mTaskbarViewOnHome.getWidth() - hotseatBounds.right,
+                mTaskbarViewOnHome.getHeight() - hotseatBounds.bottom + hotseatBottomDiff);
+    }
+
+    private void setWhichTaskbarViewIsVisible(@Nullable TaskbarView visibleTaskbar) {
+        mTaskbarViewInApp.setVisibility(visibleTaskbar == mTaskbarViewInApp
+                ? VISIBLE : INVISIBLE);
+        mTaskbarViewOnHome.setVisibility(visibleTaskbar == mTaskbarViewOnHome
+                ? VISIBLE : INVISIBLE);
+        mLauncher.getHotseat().setIconsAlpha(visibleTaskbar != mTaskbarViewInApp ? 1f : 0f);
+    }
+
+    private void blockTaskbarTouchesForIme(boolean block) {
+        mTaskbarViewOnHome.setTouchesEnabled(!block);
+        mTaskbarViewInApp.setTouchesEnabled(!block);
     }
 
     /**
      * Returns the ratio of the taskbar icon size on home vs in an app.
      */
     public float getTaskbarScaleOnHome() {
-        DeviceProfile inAppDp = mContext.getDeviceProfile();
-        DeviceProfile onHomeDp = mLauncher.getDeviceProfile();
+        DeviceProfile inAppDp = mTaskbarContainerView.getTaskbarActivityContext()
+                .getDeviceProfile();
+        DeviceProfile onHomeDp = ActivityContext.lookupContext(mTaskbarViewOnHome.getContext())
+                .getDeviceProfile();
         return (float) onHomeDp.cellWidthPx / inAppDp.cellWidthPx;
     }
 
-    void setTaskbarViewVisible(boolean isVisible) {
-        mTaskbarView.setIconsVisibility(isVisible);
-        mLauncher.getHotseat().setIconsAlpha(isVisible ? 0f : 1f);
+    /**
+     * Updates the TaskbarContainer to MATCH_PARENT vs original Taskbar size.
+     */
+    private void setTaskbarWindowFullscreen(boolean fullscreen) {
+        setTaskbarWindowHeight(fullscreen ? MATCH_PARENT : mTaskbarSize.y);
+    }
+
+    /**
+     * Updates the TaskbarContainer height (pass mTaskbarSize.y to reset).
+     */
+    private void setTaskbarWindowHeight(int height) {
+        mWindowLayoutParams.width = mTaskbarSize.x;
+        mWindowLayoutParams.height = height;
+        mWindowManager.updateViewLayout(mTaskbarContainerView, mWindowLayoutParams);
+    }
+
+    /**
+     * Contains methods that TaskbarStateHandler can call to interface with TaskbarController.
+     */
+    protected interface TaskbarStateHandlerCallbacks {
+        AnimatedFloat getAlphaTarget();
+        AnimatedFloat getScaleTarget();
+        AnimatedFloat getTranslationYTarget();
     }
 
     /**
@@ -271,4 +565,32 @@ public class TaskbarController extends TaskbarUIController {
         void updateTaskbarScale(float scale);
         void updateTaskbarTranslationY(float translationY);
     }
+
+    /**
+     * Contains methods that TaskbarContainerView can call to interface with TaskbarController.
+     */
+    protected interface TaskbarContainerViewCallbacks {
+        void onViewRemoved();
+        boolean isTaskbarTouchable();
+    }
+
+    /**
+     * Contains methods that TaskbarView can call to interface with TaskbarController.
+     */
+    protected interface TaskbarViewCallbacks {
+        View.OnClickListener getItemOnClickListener();
+        View.OnLongClickListener getItemOnLongClickListener();
+        int getEmptyHotseatViewVisibility(TaskbarView taskbarView);
+        /** Returns how much to scale non-icon elements such as spacing and dividers. */
+        float getNonIconScale(TaskbarView taskbarView);
+        void onItemPositionsChanged(TaskbarView taskbarView);
+        void onNavigationButtonClick(@TaskbarButton int buttonType);
+    }
+
+    /**
+     * Contains methods that TaskbarHotseatController can call to interface with TaskbarController.
+     */
+    protected interface TaskbarHotseatControllerCallbacks {
+        void updateHotseatItems(ItemInfo[] hotseatItemInfos);
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
index ee44927ce4..5eb34cb360 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
@@ -20,7 +20,6 @@ import static android.view.View.VISIBLE;
 
 import android.content.ClipData;
 import android.content.ClipDescription;
-import android.content.Context;
 import android.content.Intent;
 import android.content.pm.LauncherApps;
 import android.content.res.Resources;
@@ -30,6 +29,7 @@ import android.os.UserHandle;
 import android.view.DragEvent;
 import android.view.View;
 
+import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.R;
@@ -43,12 +43,12 @@ import com.android.systemui.shared.system.LauncherAppsCompat;
  */
 public class TaskbarDragController {
 
-    private final Context mContext;
+    private final BaseQuickstepLauncher mLauncher;
     private final int mDragIconSize;
 
-    public TaskbarDragController(Context context) {
-        mContext = context;
-        Resources resources = mContext.getResources();
+    public TaskbarDragController(BaseQuickstepLauncher launcher) {
+        mLauncher = launcher;
+        Resources resources = mLauncher.getResources();
         mDragIconSize = resources.getDimensionPixelSize(R.dimen.taskbar_icon_drag_icon_size);
     }
 
@@ -63,6 +63,7 @@ public class TaskbarDragController {
         }
 
         BubbleTextView btv = (BubbleTextView) view;
+
         View.DragShadowBuilder shadowBuilder = new View.DragShadowBuilder(view) {
             @Override
             public void onProvideShadowMetrics(Point shadowSize, Point shadowTouchPoint) {
@@ -86,7 +87,7 @@ public class TaskbarDragController {
         Intent intent = null;
         if (tag instanceof WorkspaceItemInfo) {
             WorkspaceItemInfo item = (WorkspaceItemInfo) tag;
-            LauncherApps launcherApps = mContext.getSystemService(LauncherApps.class);
+            LauncherApps launcherApps = mLauncher.getSystemService(LauncherApps.class);
             clipDescription = new ClipDescription(item.title,
                     new String[] {
                             item.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java
index 91cf7efab5..68829cd0fb 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java
@@ -26,8 +26,6 @@ import com.android.launcher3.dragndrop.DragController;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.model.data.ItemInfo;
 
-import java.util.function.Consumer;
-
 /**
  * Works with TaskbarController to update the TaskbarView's Hotseat items.
  */
@@ -35,12 +33,13 @@ public class TaskbarHotseatController {
 
     private final BaseQuickstepLauncher mLauncher;
     private final Hotseat mHotseat;
-    private final Consumer<ItemInfo[]> mTaskbarCallbacks;
+    private final TaskbarController.TaskbarHotseatControllerCallbacks mTaskbarCallbacks;
     private final int mNumHotseatIcons;
 
     private final DragController.DragListener mDragListener = new DragController.DragListener() {
         @Override
-        public void onDragStart(DropTarget.DragObject dragObject, DragOptions options) { }
+        public void onDragStart(DropTarget.DragObject dragObject, DragOptions options) {
+        }
 
         @Override
         public void onDragEnd() {
@@ -48,8 +47,8 @@ public class TaskbarHotseatController {
         }
     };
 
-    public TaskbarHotseatController(
-            BaseQuickstepLauncher launcher, Consumer<ItemInfo[]> taskbarCallbacks) {
+    public TaskbarHotseatController(BaseQuickstepLauncher launcher,
+            TaskbarController.TaskbarHotseatControllerCallbacks taskbarCallbacks) {
         mLauncher = launcher;
         mHotseat = mLauncher.getHotseat();
         mTaskbarCallbacks = taskbarCallbacks;
@@ -86,6 +85,10 @@ public class TaskbarHotseatController {
             }
         }
 
-        mTaskbarCallbacks.accept(hotseatItemInfos);
+        mTaskbarCallbacks.updateHotseatItems(hotseatItemInfos);
+    }
+
+    protected int getNumHotseatIcons() {
+        return mNumHotseatIcons;
     }
 }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarIconController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarIconController.java
deleted file mode 100644
index 2a37915fcf..0000000000
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarIconController.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.taskbar;
-
-import static android.view.View.GONE;
-import static android.view.View.VISIBLE;
-
-import static com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo.TOUCHABLE_INSETS_FRAME;
-import static com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo.TOUCHABLE_INSETS_REGION;
-
-import android.graphics.Rect;
-import android.inputmethodservice.InputMethodService;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnLongClickListener;
-
-import androidx.annotation.NonNull;
-
-import com.android.launcher3.R;
-import com.android.launcher3.anim.AlphaUpdateListener;
-import com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo;
-
-/**
- * Controller for taskbar icon UI
- */
-public class TaskbarIconController {
-
-    private final Rect mTempRect = new Rect();
-
-    private final TaskbarActivityContext mActivity;
-    private final TaskbarContainerView mContainerView;
-
-    private final TaskbarView mTaskbarView;
-    private final ImeBarView mImeBarView;
-
-    @NonNull
-    private TaskbarUIController mUIController = TaskbarUIController.DEFAULT;
-
-    TaskbarIconController(TaskbarActivityContext activity, TaskbarContainerView containerView) {
-        mActivity = activity;
-        mContainerView = containerView;
-        mTaskbarView = mContainerView.findViewById(R.id.taskbar_view);
-        mImeBarView = mContainerView.findViewById(R.id.ime_bar_view);
-    }
-
-    public void init(OnClickListener clickListener, OnLongClickListener longClickListener) {
-        mContainerView.addOnLayoutChangeListener((v, a, b, c, d, e, f, g, h) ->
-                mUIController.alignRealHotseatWithTaskbar());
-
-        ButtonProvider buttonProvider = new ButtonProvider(mActivity);
-        mImeBarView.init(buttonProvider);
-        mTaskbarView.construct(clickListener, longClickListener, buttonProvider);
-        mTaskbarView.getLayoutParams().height = mActivity.getDeviceProfile().taskbarSize;
-
-        mContainerView.init(new Callbacks(), mTaskbarView);
-    }
-
-    public void onDestroy() {
-        mContainerView.onDestroy();
-    }
-
-    public void setUIController(@NonNull TaskbarUIController uiController) {
-        mUIController = uiController;
-    }
-
-    /**
-     * When in 3 button nav, the above doesn't get called since we prevent sysui nav bar from
-     * instantiating at all, which is what's responsible for sending sysui state flags over.
-     *
-     * @param vis IME visibility flag
-     */
-    public void updateImeStatus(int displayId, int vis, boolean showImeSwitcher) {
-        if (displayId != mActivity.getDisplayId() || !mActivity.canShowNavButtons()) {
-            return;
-        }
-
-        mImeBarView.setImeSwitcherVisibility(showImeSwitcher);
-        setImeIsVisible((vis & InputMethodService.IME_VISIBLE) != 0);
-    }
-
-    /**
-     * Should be called when the IME visibility changes, so we can hide/show Taskbar accordingly.
-     */
-    public void setImeIsVisible(boolean isImeVisible) {
-        mTaskbarView.setTouchesEnabled(!isImeVisible);
-        mUIController.onImeVisible(mContainerView, isImeVisible);
-    }
-
-    /**
-     * Callbacks for {@link TaskbarContainerView} to interact with the icon controller
-     */
-    public class Callbacks {
-
-        /**
-         * Called to update the touchable insets
-         */
-        public void updateInsetsTouchability(InsetsInfo insetsInfo) {
-            insetsInfo.touchableRegion.setEmpty();
-            if (mContainerView.getAlpha() < AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD) {
-                // Let touches pass through us.
-                insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION);
-            } else if (mImeBarView.getVisibility() == VISIBLE) {
-                insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_FRAME);
-            } else if (!mUIController.isTaskbarTouchable()) {
-                // Let touches pass through us.
-                insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION);
-            } else if (mTaskbarView.areIconsVisible()) {
-                // Buttons are visible, take over the full taskbar area
-                insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_FRAME);
-            } else {
-                if (mTaskbarView.mSystemButtonContainer.getVisibility() == VISIBLE) {
-                    mContainerView.getDescendantRectRelativeToSelf(
-                            mTaskbarView.mSystemButtonContainer, mTempRect);
-                    insetsInfo.touchableRegion.set(mTempRect);
-                }
-                insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION);
-            }
-
-            // TaskbarContainerView provides insets to other apps based on contentInsets. These
-            // insets should stay consistent even if we expand TaskbarContainerView's bounds, e.g.
-            // to show a floating view like Folder. Thus, we set the contentInsets to be where
-            // mTaskbarView is, since its position never changes and insets rather than overlays.
-            insetsInfo.contentInsets.left = mTaskbarView.getLeft();
-            insetsInfo.contentInsets.top = mTaskbarView.getTop();
-            insetsInfo.contentInsets.right = mContainerView.getWidth() - mTaskbarView.getRight();
-            insetsInfo.contentInsets.bottom = mContainerView.getHeight() - mTaskbarView.getBottom();
-        }
-
-        public void onContainerViewRemoved() {
-            int count = mContainerView.getChildCount();
-            // Ensure no other children present (like Folders, etc)
-            for (int i = 0; i < count; i++) {
-                View v = mContainerView.getChildAt(i);
-                if (!((v instanceof TaskbarView) || (v instanceof ImeBarView))) {
-                    return;
-                }
-            }
-            mActivity.setTaskbarWindowFullscreen(false);
-        }
-
-        public void updateImeBarVisibilityAlpha(float alpha) {
-            if (!mActivity.canShowNavButtons()) {
-                // TODO Remove sysui IME bar for gesture nav as well
-                return;
-            }
-            mImeBarView.setAlpha(alpha);
-            mImeBarView.setVisibility(alpha == 0 ? GONE : VISIBLE);
-        }
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
deleted file mode 100644
index b9eec93687..0000000000
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.taskbar;
-
-import static android.view.Display.DEFAULT_DISPLAY;
-import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
-
-import static com.android.launcher3.util.DisplayController.CHANGE_ACTIVE_SCREEN;
-import static com.android.launcher3.util.DisplayController.CHANGE_DENSITY;
-import static com.android.launcher3.util.DisplayController.CHANGE_SUPPORTED_BOUNDS;
-import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING;
-
-import android.content.Context;
-import android.hardware.display.DisplayManager;
-import android.inputmethodservice.InputMethodService;
-import android.view.Display;
-
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.BaseQuickstepLauncher;
-import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.config.FeatureFlags;
-import com.android.launcher3.util.DisplayController;
-import com.android.launcher3.util.DisplayController.Info;
-import com.android.quickstep.SysUINavigationMode;
-import com.android.quickstep.SysUINavigationMode.Mode;
-import com.android.quickstep.TouchInteractionService;
-
-/**
- * Class to manager taskbar lifecycle
- */
-public class TaskbarManager implements DisplayController.DisplayInfoChangeListener,
-        SysUINavigationMode.NavigationModeChangeListener {
-
-    private final Context mContext;
-    private final DisplayController mDisplayController;
-    private final SysUINavigationMode mSysUINavigationMode;
-    private final TaskbarNavButtonController mNavButtonController;
-
-    private TaskbarActivityContext mTaskbarActivityContext;
-    private BaseQuickstepLauncher mLauncher;
-
-    private static final int CHANGE_FLAGS =
-            CHANGE_ACTIVE_SCREEN | CHANGE_DENSITY | CHANGE_SUPPORTED_BOUNDS;
-
-    public TaskbarManager(TouchInteractionService service) {
-        mDisplayController = DisplayController.INSTANCE.get(service);
-        mSysUINavigationMode = SysUINavigationMode.INSTANCE.get(service);
-        Display display =
-                service.getSystemService(DisplayManager.class).getDisplay(DEFAULT_DISPLAY);
-        mContext = service.createWindowContext(display, TYPE_APPLICATION_OVERLAY, null);
-        mNavButtonController = new TaskbarNavButtonController(service);
-
-        mDisplayController.addChangeListener(this);
-        mSysUINavigationMode.addModeChangeListener(this);
-        recreateTaskbar();
-    }
-
-    @Override
-    public void onNavigationModeChanged(Mode newMode) {
-        recreateTaskbar();
-    }
-
-    @Override
-    public void onDisplayInfoChanged(Context context, Info info, int flags) {
-        if ((flags & CHANGE_FLAGS) != 0) {
-            recreateTaskbar();
-        }
-    }
-
-    private void destroyExistingTaskbar() {
-        if (mTaskbarActivityContext != null) {
-            mTaskbarActivityContext.onDestroy();
-            mTaskbarActivityContext = null;
-        }
-    }
-
-    /**
-     * Sets or clears a launcher to act as taskbar callback
-     */
-    public void setLauncher(@Nullable BaseQuickstepLauncher launcher) {
-        mLauncher = launcher;
-        if (mTaskbarActivityContext != null) {
-            mTaskbarActivityContext.setUIController(mLauncher == null
-                    ? TaskbarUIController.DEFAULT
-                    : new TaskbarController(launcher, mTaskbarActivityContext));
-        }
-    }
-
-    private void recreateTaskbar() {
-        destroyExistingTaskbar();
-        if (!FeatureFlags.ENABLE_TASKBAR.get()) {
-            return;
-        }
-        DeviceProfile dp = LauncherAppState.getIDP(mContext).getDeviceProfile(mContext);
-        if (!dp.isTaskbarPresent) {
-            return;
-        }
-        mTaskbarActivityContext = new TaskbarActivityContext(
-                mContext, dp.copy(mContext), mNavButtonController);
-        mTaskbarActivityContext.init();
-        if (mLauncher != null) {
-            mTaskbarActivityContext.setUIController(
-                    new TaskbarController(mLauncher, mTaskbarActivityContext));
-        }
-    }
-
-    /**
-     * See {@link com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags}
-     * @param systemUiStateFlags The latest SystemUiStateFlags
-     */
-    public void onSystemUiFlagsChanged(int systemUiStateFlags) {
-        boolean isImeVisible = (systemUiStateFlags & SYSUI_STATE_IME_SHOWING) != 0;
-        if (mTaskbarActivityContext != null) {
-            mTaskbarActivityContext.getIconController().setImeIsVisible(isImeVisible);
-        }
-    }
-
-    /**
-     * When in 3 button nav, the above doesn't get called since we prevent sysui nav bar from
-     * instantiating at all, which is what's responsible for sending sysui state flags over.
-     *
-     * @param vis IME visibility flag
-     * @param backDisposition Used to determine back button behavior for software keyboard
-     *                        See BACK_DISPOSITION_* constants in {@link InputMethodService}
-     */
-    public void updateImeStatus(int displayId, int vis, int backDisposition,
-            boolean showImeSwitcher) {
-        if (mTaskbarActivityContext != null) {
-            mTaskbarActivityContext.getIconController()
-                    .updateImeStatus(displayId, vis, showImeSwitcher);
-        }
-    }
-
-    /**
-     * Called when the manager is no longer needed
-     */
-    public void destroy() {
-        destroyExistingTaskbar();
-        mDisplayController.removeChangeListener(this);
-        mSysUINavigationMode.removeModeChangeListener(this);
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java
index 3b5afad691..54e1610cd1 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java
@@ -16,8 +16,7 @@
 
 package com.android.launcher3.taskbar;
 
-import static android.view.Display.DEFAULT_DISPLAY;
-
+import android.content.Context;
 import android.content.Intent;
 import android.view.inputmethod.InputMethodManager;
 
@@ -54,10 +53,11 @@ public class TaskbarNavButtonController {
     static final int BUTTON_RECENTS = BUTTON_HOME << 1;
     static final int BUTTON_IME_SWITCH = BUTTON_RECENTS << 1;
 
-    private final TouchInteractionService mService;
 
-    public TaskbarNavButtonController(TouchInteractionService service) {
-        mService = service;
+    private final Context mContext;
+
+    public TaskbarNavButtonController(Context context) {
+        mContext = context;
     }
 
     public void onButtonClick(@TaskbarButton int buttonType) {
@@ -78,13 +78,13 @@ public class TaskbarNavButtonController {
     }
 
     private void navigateHome() {
-        mService.startActivity(new Intent(Intent.ACTION_MAIN)
+        mContext.startActivity(new Intent(Intent.ACTION_MAIN)
                 .addCategory(Intent.CATEGORY_HOME)
                 .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
     }
 
     private void navigateToOverview() {
-        mService.getOverviewCommandHelper()
+        TouchInteractionService.getInstance().getOverviewCommandHelper()
                 .addCommand(OverviewCommandHelper.TYPE_SHOW);
     }
 
@@ -93,8 +93,8 @@ public class TaskbarNavButtonController {
     }
 
     private void showIMESwitcher() {
-        mService.getSystemService(InputMethodManager.class)
-                .showInputMethodPickerFromSystem(true /* showAuxiliarySubtypes */,
-                        DEFAULT_DISPLAY);
+        mContext.getSystemService(InputMethodManager.class).showInputMethodPickerFromSystem(
+                true /* showAuxiliarySubtypes */, mContext.getDisplayId());
     }
+
 }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java
index a701aae088..6ea51fa5eb 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java
@@ -24,52 +24,59 @@ import androidx.annotation.Nullable;
 import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.anim.PendingAnimation;
-import com.android.launcher3.anim.PropertySetter;
 import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.quickstep.AnimatedFloat;
 
 /**
  * StateHandler to animate Taskbar according to Launcher's state machine. Does nothing if Taskbar
- * isn't present (i.e. {@link #setAnimationController} is never called).
+ * isn't present (i.e. {@link #setTaskbarCallbacks} is never called).
  */
 public class TaskbarStateHandler implements StateManager.StateHandler<LauncherState> {
 
     private final BaseQuickstepLauncher mLauncher;
 
     // Contains Taskbar-related methods and fields we should aniamte. If null, don't do anything.
-    private @Nullable TaskbarAnimationController mAnimationController = null;
+    private @Nullable TaskbarController.TaskbarStateHandlerCallbacks mTaskbarCallbacks = null;
 
     public TaskbarStateHandler(BaseQuickstepLauncher launcher) {
         mLauncher = launcher;
     }
 
-    public void setAnimationController(TaskbarAnimationController callbacks) {
-        mAnimationController = callbacks;
+    public void setTaskbarCallbacks(TaskbarController.TaskbarStateHandlerCallbacks callbacks) {
+        mTaskbarCallbacks = callbacks;
     }
 
     @Override
     public void setState(LauncherState state) {
-        setState(state, PropertySetter.NO_ANIM_PROPERTY_SETTER);
+        if (mTaskbarCallbacks == null) {
+            return;
+        }
+
+        AnimatedFloat alphaTarget = mTaskbarCallbacks.getAlphaTarget();
+        AnimatedFloat scaleTarget = mTaskbarCallbacks.getScaleTarget();
+        AnimatedFloat translationYTarget = mTaskbarCallbacks.getTranslationYTarget();
+        boolean isTaskbarVisible = (state.getVisibleElements(mLauncher) & TASKBAR) != 0;
+        alphaTarget.updateValue(isTaskbarVisible ? 1f : 0f);
+        scaleTarget.updateValue(state.getTaskbarScale(mLauncher));
+        translationYTarget.updateValue(state.getTaskbarTranslationY(mLauncher));
     }
 
     @Override
     public void setStateWithAnimation(LauncherState toState, StateAnimationConfig config,
             PendingAnimation animation) {
-        setState(toState, animation);
-    }
-
-    private void setState(LauncherState toState, PropertySetter setter) {
-        if (mAnimationController == null) {
+        if (mTaskbarCallbacks == null) {
             return;
         }
 
+        AnimatedFloat alphaTarget = mTaskbarCallbacks.getAlphaTarget();
+        AnimatedFloat scaleTarget = mTaskbarCallbacks.getScaleTarget();
+        AnimatedFloat translationYTarget = mTaskbarCallbacks.getTranslationYTarget();
         boolean isTaskbarVisible = (toState.getVisibleElements(mLauncher) & TASKBAR) != 0;
-        setter.setFloat(mAnimationController.getTaskbarVisibilityForLauncherState(),
-                AnimatedFloat.VALUE, isTaskbarVisible ? 1f : 0f, LINEAR);
-        setter.setFloat(mAnimationController.getTaskbarScaleForLauncherState(),
-                AnimatedFloat.VALUE, toState.getTaskbarScale(mLauncher), LINEAR);
-        setter.setFloat(mAnimationController.getTaskbarTranslationYForLauncherState(),
-                AnimatedFloat.VALUE, toState.getTaskbarTranslationY(mLauncher), ACCEL_DEACCEL);
+        animation.setFloat(alphaTarget, AnimatedFloat.VALUE, isTaskbarVisible ? 1f : 0f, LINEAR);
+        animation.setFloat(scaleTarget, AnimatedFloat.VALUE, toState.getTaskbarScale(mLauncher),
+                LINEAR);
+        animation.setFloat(translationYTarget, AnimatedFloat.VALUE,
+                toState.getTaskbarTranslationY(mLauncher), ACCEL_DEACCEL);
     }
 }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java
deleted file mode 100644
index e16f5e65b0..0000000000
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.taskbar;
-
-/**
- * Base class for providing different taskbar UI
- */
-public class TaskbarUIController {
-
-    public static final TaskbarUIController DEFAULT = new TaskbarUIController();
-
-    /**
-     * Pads the Hotseat to line up exactly with Taskbar's copy of the Hotseat.
-     */
-    public void alignRealHotseatWithTaskbar() { }
-
-    protected void onCreate() { }
-
-    protected void onDestroy() { }
-
-    protected boolean isTaskbarTouchable() {
-        return true;
-    }
-
-    protected void onImeVisible(TaskbarContainerView container, boolean isVisible) {
-        container.updateImeBarVisibilityAlpha(isVisible ? 1 : 0);
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
index c6573a639c..9e8013e63e 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
@@ -15,14 +15,20 @@
  */
 package com.android.launcher3.taskbar;
 
-import static android.view.View.MeasureSpec.EXACTLY;
-import static android.view.View.MeasureSpec.makeMeasureSpec;
-
+import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_BACK;
+import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_HOME;
+import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_RECENTS;
+
+import android.animation.Animator;
+import android.animation.AnimatorSet;
+import android.animation.LayoutTransition;
+import android.animation.ValueAnimator;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.RectF;
+import android.os.SystemProperties;
 import android.util.AttributeSet;
 import android.view.DragEvent;
 import android.view.Gravity;
@@ -45,12 +51,17 @@ import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.views.ActivityContext;
+import com.android.quickstep.SysUINavigationMode;
 
 /**
  * Hosts the Taskbar content such as Hotseat and Recent Apps. Drawn on top of other apps.
  */
 public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconParent, Insettable {
 
+
+    private static final boolean ENABLE_THREE_BUTTON_TASKBAR =
+            SystemProperties.getBoolean("persist.debug.taskbar_three_button", false);
+
     private final int mIconTouchSize;
     private final boolean mIsRtl;
     private final int mTouchSlop;
@@ -58,16 +69,17 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
     private final RectF mDelegateSlopBounds = new RectF();
     private final int[] mTempOutLocation = new int[2];
 
-    private final int mItemMarginLeftRight;
-
-    private final TaskbarActivityContext mActivityContext;
-
     // Initialized in TaskbarController constructor.
-    private View.OnClickListener mIconClickListener;
-    private View.OnLongClickListener mIconLongClickListener;
+    private TaskbarController.TaskbarViewCallbacks mControllerCallbacks;
+    // Scale on elements that aren't icons.
+    private float mNonIconScale;
+    private int mItemMarginLeftRight;
 
-    LinearLayout mSystemButtonContainer;
-    LinearLayout mHotseatIconsContainer;
+    // Initialized in init().
+    private LayoutTransition mLayoutTransition;
+    private int mHotseatStartIndex;
+    private int mHotseatEndIndex;
+    private LinearLayout mButtonRegion;
 
     // Delegate touches to the closest view if within mIconTouchSize.
     private boolean mDelegateTargeted;
@@ -79,12 +91,10 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
     // Only non-null when the corresponding Folder is open.
     private @Nullable FolderIcon mLeaveBehindFolderIcon;
 
+    private int mNavButtonStartIndex;
     /** Provider of buttons added to taskbar in 3 button nav */
     private ButtonProvider mButtonProvider;
 
-    private boolean mDisableRelayout;
-    private boolean mAreHolesAllowed;
-
     public TaskbarView(@NonNull Context context) {
         this(context, null);
     }
@@ -101,68 +111,91 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
     public TaskbarView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr,
             int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
-        mActivityContext = ActivityContext.lookupContext(context);
 
         Resources resources = getResources();
         mIconTouchSize = resources.getDimensionPixelSize(R.dimen.taskbar_icon_touch_size);
-        mItemMarginLeftRight = resources.getDimensionPixelSize(R.dimen.taskbar_icon_spacing);
-
         mIsRtl = Utilities.isRtl(resources);
         mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
     }
 
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        mSystemButtonContainer = findViewById(R.id.system_button_layout);
-        mHotseatIconsContainer = findViewById(R.id.hotseat_icons_layout);
-    }
-
-    protected void construct(OnClickListener clickListener, OnLongClickListener longClickListener,
-                ButtonProvider buttonProvider) {
-        mIconClickListener = clickListener;
-        mIconLongClickListener = longClickListener;
+    protected void construct(TaskbarController.TaskbarViewCallbacks taskbarViewCallbacks,
+            ButtonProvider buttonProvider) {
+        mControllerCallbacks = taskbarViewCallbacks;
+        mNonIconScale = mControllerCallbacks.getNonIconScale(this);
+        mItemMarginLeftRight = getResources().getDimensionPixelSize(R.dimen.taskbar_icon_spacing);
+        mItemMarginLeftRight = Math.round(mItemMarginLeftRight * mNonIconScale);
         mButtonProvider = buttonProvider;
+        mButtonProvider.setMarginLeftRight(mItemMarginLeftRight);
+    }
 
-        if (mActivityContext.canShowNavButtons()) {
+    protected void init(int numHotseatIcons, SysUINavigationMode.Mode newMode) {
+        // TODO: check if buttons on left
+        if (newMode == SysUINavigationMode.Mode.THREE_BUTTONS && ENABLE_THREE_BUTTON_TASKBAR) {
+            // 3 button
+            mNavButtonStartIndex = 0;
             createNavButtons();
         } else {
-            mSystemButtonContainer.setVisibility(GONE);
+            mNavButtonStartIndex = -1;
+            removeNavButtons();
         }
 
-        int numHotseatIcons = mActivityContext.getDeviceProfile().numShownHotseatIcons;
+        mHotseatStartIndex = mNavButtonStartIndex + 1;
+        mHotseatEndIndex = mHotseatStartIndex + numHotseatIcons - 1;
         updateHotseatItems(new ItemInfo[numHotseatIcons]);
+
+        mLayoutTransition = new LayoutTransition();
+        addUpdateListenerForAllLayoutTransitions(() -> {
+            if (getLayoutTransition() == mLayoutTransition) {
+                mControllerCallbacks.onItemPositionsChanged(this);
+            }
+        });
+        setLayoutTransition(mLayoutTransition);
     }
 
-    /**
-     * Enables/disables empty icons in taskbar so that the layout matches with Launcher
-     */
-    public void setHolesAllowedInLayout(boolean areHolesAllowed) {
-        if (mAreHolesAllowed != areHolesAllowed) {
-            mAreHolesAllowed = areHolesAllowed;
-            updateHotseatItemsVisibility();
-            // TODO: Add animation
-        }
+    private void addUpdateListenerForAllLayoutTransitions(Runnable onUpdate) {
+        addUpdateListenerForLayoutTransition(LayoutTransition.CHANGE_APPEARING, onUpdate);
+        addUpdateListenerForLayoutTransition(LayoutTransition.CHANGE_DISAPPEARING, onUpdate);
+        addUpdateListenerForLayoutTransition(LayoutTransition.CHANGING, onUpdate);
+        addUpdateListenerForLayoutTransition(LayoutTransition.APPEARING, onUpdate);
+        addUpdateListenerForLayoutTransition(LayoutTransition.DISAPPEARING, onUpdate);
     }
 
-    private void setHolesAllowedInLayoutNoAnimation(boolean areHolesAllowed) {
-        if (mAreHolesAllowed != areHolesAllowed) {
-            mAreHolesAllowed = areHolesAllowed;
-            updateHotseatItemsVisibility();
-            onMeasure(makeMeasureSpec(getMeasuredWidth(), EXACTLY),
-                    makeMeasureSpec(getMeasuredHeight(), EXACTLY));
-            onLayout(false, getLeft(), getTop(), getRight(), getBottom());
+    private void addUpdateListenerForLayoutTransition(int transitionType, Runnable onUpdate) {
+        Animator anim = mLayoutTransition.getAnimator(transitionType);
+        if (anim instanceof ValueAnimator) {
+            ((ValueAnimator) anim).addUpdateListener(valueAnimator -> onUpdate.run());
+        } else {
+            AnimatorSet animSet = new AnimatorSet();
+            ValueAnimator updateAnim = ValueAnimator.ofFloat(0, 1);
+            updateAnim.addUpdateListener(valueAnimator -> onUpdate.run());
+            animSet.playTogether(anim, updateAnim);
+            mLayoutTransition.setAnimator(transitionType, animSet);
         }
     }
 
+    protected void cleanup() {
+        endAllLayoutTransitionAnimators();
+        setLayoutTransition(null);
+        removeAllViews();
+    }
+
+    private void endAllLayoutTransitionAnimators() {
+        mLayoutTransition.getAnimator(LayoutTransition.CHANGE_APPEARING).end();
+        mLayoutTransition.getAnimator(LayoutTransition.CHANGE_DISAPPEARING).end();
+        mLayoutTransition.getAnimator(LayoutTransition.CHANGING).end();
+        mLayoutTransition.getAnimator(LayoutTransition.APPEARING).end();
+        mLayoutTransition.getAnimator(LayoutTransition.DISAPPEARING).end();
+    }
+
     /**
      * Inflates/binds the Hotseat views to show in the Taskbar given their ItemInfos.
      */
     protected void updateHotseatItems(ItemInfo[] hotseatItemInfos) {
         for (int i = 0; i < hotseatItemInfos.length; i++) {
-            ItemInfo hotseatItemInfo = hotseatItemInfos[
-                    !mIsRtl ? i : hotseatItemInfos.length - i - 1];
-            View hotseatView = mHotseatIconsContainer.getChildAt(i);
+            ItemInfo hotseatItemInfo = hotseatItemInfos[!mIsRtl ? i
+                    : hotseatItemInfos.length - i - 1];
+            int hotseatIndex = mHotseatStartIndex + i;
+            View hotseatView = getChildAt(hotseatIndex);
 
             // Replace any Hotseat views with the appropriate type if it's not already that type.
             final int expectedLayoutResId;
@@ -180,23 +213,23 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
             } else {
                 expectedLayoutResId = R.layout.taskbar_app_icon;
             }
-            if (hotseatView == null
-                    || hotseatView.getSourceLayoutResId() != expectedLayoutResId
+            if (hotseatView == null || hotseatView.getSourceLayoutResId() != expectedLayoutResId
                     || needsReinflate) {
-                mHotseatIconsContainer.removeView(hotseatView);
+                removeView(hotseatView);
+                ActivityContext activityContext = getActivityContext();
                 if (isFolder) {
                     FolderInfo folderInfo = (FolderInfo) hotseatItemInfo;
                     FolderIcon folderIcon = FolderIcon.inflateFolderAndIcon(expectedLayoutResId,
-                            mActivityContext, this, folderInfo);
+                            getActivityContext(), this, folderInfo);
                     folderIcon.setTextVisible(false);
                     hotseatView = folderIcon;
                 } else {
                     hotseatView = inflate(expectedLayoutResId);
                 }
-                int iconSize = mActivityContext.getDeviceProfile().iconSizePx;
+                int iconSize = activityContext.getDeviceProfile().iconSizePx;
                 LayoutParams lp = new LayoutParams(iconSize, iconSize);
                 lp.setMargins(mItemMarginLeftRight, 0, mItemMarginLeftRight, 0);
-                mHotseatIconsContainer.addView(hotseatView, i, lp);
+                addView(hotseatView, hotseatIndex, lp);
             }
 
             // Apply the Hotseat ItemInfos, or hide the view if there is none for a given index.
@@ -204,11 +237,13 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
                     && hotseatItemInfo instanceof WorkspaceItemInfo) {
                 ((BubbleTextView) hotseatView).applyFromWorkspaceItem(
                         (WorkspaceItemInfo) hotseatItemInfo);
-                hotseatView.setOnClickListener(mIconClickListener);
-                hotseatView.setOnLongClickListener(mIconLongClickListener);
+                hotseatView.setOnClickListener(mControllerCallbacks.getItemOnClickListener());
+                hotseatView.setOnLongClickListener(
+                        mControllerCallbacks.getItemOnLongClickListener());
             } else if (isFolder) {
-                hotseatView.setOnClickListener(mIconClickListener);
-                hotseatView.setOnLongClickListener(mIconLongClickListener);
+                hotseatView.setOnClickListener(mControllerCallbacks.getItemOnClickListener());
+                hotseatView.setOnLongClickListener(
+                        mControllerCallbacks.getItemOnLongClickListener());
             } else {
                 hotseatView.setOnClickListener(null);
                 hotseatView.setOnLongClickListener(null);
@@ -219,14 +254,24 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
     }
 
     protected void updateHotseatItemsVisibility() {
-        for (int i = mHotseatIconsContainer.getChildCount() - 1; i >= 0; i--) {
-            updateHotseatItemVisibility(mHotseatIconsContainer.getChildAt(i));
+        for (int i = mHotseatStartIndex; i <= mHotseatEndIndex; i++) {
+            updateHotseatItemVisibility(getChildAt(i));
         }
     }
 
     private void updateHotseatItemVisibility(View hotseatView) {
-        hotseatView.setVisibility(
-                hotseatView.getTag() != null ? VISIBLE : (mAreHolesAllowed ? INVISIBLE : GONE));
+        if (hotseatView.getTag() != null) {
+            hotseatView.setVisibility(VISIBLE);
+        } else {
+            int oldVisibility = hotseatView.getVisibility();
+            int newVisibility = mControllerCallbacks.getEmptyHotseatViewVisibility(this);
+            hotseatView.setVisibility(newVisibility);
+            if (oldVisibility == GONE && newVisibility != GONE) {
+                // By default, the layout transition only runs when going to VISIBLE,
+                // but we want it to run when going to GONE to INVISIBLE as well.
+                getLayoutTransition().showChild(this, hotseatView, oldVisibility);
+            }
+        }
     }
 
     @Override
@@ -333,20 +378,49 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
         return findDelegateView(xInOurCoordinates, yInOurCoorindates) != null;
     }
 
+    private void removeNavButtons() {
+        if (mButtonRegion != null) {
+            mButtonRegion.removeAllViews();
+            removeView(mButtonRegion);
+        } // else We've never been in 3 button. Woah Scoob!
+    }
+
     /**
      * Add back/home/recents buttons into a single ViewGroup that will be inserted at
      * {@param navButtonStartIndex}
      */
     private void createNavButtons() {
+        ActivityContext context = getActivityContext();
+        if (mButtonRegion == null) {
+            mButtonRegion = new LinearLayout(getContext());
+        } else {
+            mButtonRegion.removeAllViews();
+        }
+        mButtonRegion.setVisibility(VISIBLE);
+
         LinearLayout.LayoutParams buttonParams = new LinearLayout.LayoutParams(
-                mActivityContext.getDeviceProfile().iconSizePx,
-                mActivityContext.getDeviceProfile().iconSizePx
+                context.getDeviceProfile().iconSizePx,
+                context.getDeviceProfile().iconSizePx
         );
         buttonParams.gravity = Gravity.CENTER;
 
-        mSystemButtonContainer.addView(mButtonProvider.getBack(), buttonParams);
-        mSystemButtonContainer.addView(mButtonProvider.getHome(), buttonParams);
-        mSystemButtonContainer.addView(mButtonProvider.getRecents(), buttonParams);
+        View backButton = mButtonProvider.getBack();
+        backButton.setOnClickListener(view -> mControllerCallbacks.onNavigationButtonClick(
+                BUTTON_BACK));
+        mButtonRegion.addView(backButton, buttonParams);
+
+        // Home button
+        View homeButton = mButtonProvider.getHome();
+        homeButton.setOnClickListener(view -> mControllerCallbacks.onNavigationButtonClick(
+                BUTTON_HOME));
+        mButtonRegion.addView(homeButton, buttonParams);
+
+        View recentsButton = mButtonProvider.getRecents();
+        recentsButton.setOnClickListener(view -> mControllerCallbacks.onNavigationButtonClick(
+                BUTTON_RECENTS));
+        mButtonRegion.addView(recentsButton, buttonParams);
+
+        addView(mButtonRegion, mNavButtonStartIndex);
     }
 
     @Override
@@ -354,7 +428,7 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
         switch (event.getAction()) {
             case DragEvent.ACTION_DRAG_STARTED:
                 mIsDraggingItem = true;
-                AbstractFloatingView.closeAllOpenViews(mActivityContext);
+                AbstractFloatingView.closeAllOpenViews(getActivityContext());
                 return true;
             case DragEvent.ACTION_DRAG_ENDED:
                 mIsDraggingItem = false;
@@ -371,26 +445,26 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
      * @return The bounding box of where the hotseat elements are relative to this TaskbarView.
      */
     protected RectF getHotseatBounds() {
-        RectF result;
-        mDisableRelayout = true;
-        boolean wereHolesAllowed = mAreHolesAllowed;
-        setHolesAllowedInLayoutNoAnimation(true);
-        result = new RectF(
-                mHotseatIconsContainer.getLeft(),
-                mHotseatIconsContainer.getTop(),
-                mHotseatIconsContainer.getRight(),
-                mHotseatIconsContainer.getBottom());
-        setHolesAllowedInLayoutNoAnimation(wereHolesAllowed);
-        mDisableRelayout = false;
-
-        return result;
-    }
-
-    @Override
-    public void requestLayout() {
-        if (!mDisableRelayout) {
-            super.requestLayout();
+        View firstHotseatView = null, lastHotseatView = null;
+        for (int i = mHotseatStartIndex; i <= mHotseatEndIndex; i++) {
+            View child = getChildAt(i);
+            if (child.getVisibility() != GONE) {
+                if (firstHotseatView == null) {
+                    firstHotseatView = child;
+                }
+                lastHotseatView = child;
+            }
+        }
+        if (firstHotseatView == null || lastHotseatView == null) {
+            return new RectF();
         }
+        View leftmostHotseatView = !mIsRtl ? firstHotseatView : lastHotseatView;
+        View rightmostHotseatView = !mIsRtl ? lastHotseatView : firstHotseatView;
+        return new RectF(
+                leftmostHotseatView.getLeft() - mItemMarginLeftRight,
+                leftmostHotseatView.getTop(),
+                rightmostHotseatView.getRight() + mItemMarginLeftRight,
+                rightmostHotseatView.getBottom());
     }
 
     // FolderIconParent implemented methods.
@@ -421,7 +495,7 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
     }
 
     private View inflate(@LayoutRes int layoutResId) {
-        return mActivityContext.getLayoutInflater().inflate(layoutResId, this, false);
+        return getActivityContext().getLayoutInflater().inflate(layoutResId, this, false);
     }
 
     @Override
@@ -429,11 +503,7 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
         // Ignore, we just implement Insettable to draw behind system insets.
     }
 
-    public void setIconsVisibility(boolean isVisible) {
-        mHotseatIconsContainer.setVisibility(isVisible ? VISIBLE : INVISIBLE);
-    }
-
-    public boolean areIconsVisible() {
-        return mHotseatIconsContainer.getVisibility() == VISIBLE;
+    private <T extends Context & ActivityContext> T getActivityContext() {
+        return ActivityContext.lookupContext(getContext());
     }
 }
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index 86bf1194bb..f5ddd0e52f 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -52,6 +52,7 @@ import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.BaseState;
 import com.android.launcher3.statemanager.StatefulActivity;
+import com.android.launcher3.taskbar.TaskbarController;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.util.WindowBounds;
 import com.android.launcher3.views.ScrimView;
@@ -122,6 +123,11 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
         return null;
     }
 
+    @Nullable
+    public TaskbarController getTaskbarController() {
+        return null;
+    }
+
     public final boolean isResumed() {
         ACTIVITY_TYPE activity = getCreatedActivity();
         return activity != null && activity.hasBeenResumed();
@@ -361,6 +367,13 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
      */
     protected abstract int getOverviewScrimColorForState(ACTIVITY_TYPE activity, STATE_TYPE state);
 
+    /**
+     * See {@link com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags}
+     * @param systemUiStateFlags The latest SystemUiStateFlags
+     */
+    public void onSystemUiFlagsChanged(int systemUiStateFlags) {
+    }
+
     /**
      * Returns the expected STATE_TYPE from the provided GestureEndTarget.
      */
diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
index ff69180d33..5217c3b169 100644
--- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
@@ -22,6 +22,7 @@ import static com.android.launcher3.LauncherState.QUICK_SWITCH;
 import static com.android.launcher3.anim.AnimatorListeners.forEndCallback;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
@@ -163,7 +164,8 @@ public final class LauncherActivityInterface extends
     }
 
     @Nullable
-    private TaskbarController getTaskbarController() {
+    @Override
+    public TaskbarController getTaskbarController() {
         BaseQuickstepLauncher launcher = getCreatedActivity();
         if (launcher == null) {
             return null;
@@ -298,6 +300,16 @@ public final class LauncherActivityInterface extends
         return state.getWorkspaceScrimColor(launcher);
     }
 
+    @Override
+    public void onSystemUiFlagsChanged(int systemUiStateFlags) {
+        TaskbarController taskbarController = getTaskbarController();
+        if (taskbarController == null) {
+            return;
+        }
+        boolean isImeVisible = (systemUiStateFlags & SYSUI_STATE_IME_SHOWING) != 0;
+        taskbarController.setIsImeVisible(isImeVisible);
+    }
+
     @Override
     public boolean deferStartingActivity(RecentsAnimationDeviceState deviceState, MotionEvent ev) {
         TaskbarController taskbarController = getTaskbarController();
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index d95f7b7fed..edc7a3c8b8 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -52,6 +52,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.Looper;
+import android.os.RemoteException;
 import android.os.SystemClock;
 import android.os.SystemProperties;
 import android.util.Log;
@@ -74,7 +75,6 @@ import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.provider.RestoreDbTask;
 import com.android.launcher3.statemanager.StatefulActivity;
-import com.android.launcher3.taskbar.TaskbarManager;
 import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.tracing.LauncherTraceProto;
@@ -147,9 +147,21 @@ public class TouchInteractionService extends Service implements PluginListener<O
     private OverscrollPlugin mOverscrollPlugin;
 
     /**
-     * Local IOverviewProxy implementation with some methods for local components
+     * Extension of OverviewProxy aidl interface without needing to modify the actual interface.
+     * This is for methods that need only need local access and not intended to make IPC calls.
      */
-    public class TISBinder extends IOverviewProxy.Stub {
+    public abstract static class TISBinder extends IOverviewProxy.Stub {
+        public abstract void setTaskbarOverviewProxyDelegate(
+                @Nullable TaskbarOverviewProxyDelegate i);
+    }
+
+
+    private final TISBinder mMyBinder = new TISBinder() {
+
+        public void setTaskbarOverviewProxyDelegate(
+                @Nullable TaskbarOverviewProxyDelegate delegate) {
+            mTaskbarOverviewProxyDelegate = delegate;
+        }
 
         @BinderThread
         public void onInitialize(Bundle bundle) {
@@ -262,24 +274,40 @@ public class TouchInteractionService extends Service implements PluginListener<O
 
         @Override
         public void onImeWindowStatusChanged(int displayId, IBinder token, int vis,
-                int backDisposition, boolean showImeSwitcher) {
-            MAIN_EXECUTOR.execute(() -> mTaskbarManager.updateImeStatus(
-                    displayId, vis, backDisposition, showImeSwitcher));
+                int backDisposition, boolean showImeSwitcher) throws RemoteException {
+            if (mTaskbarOverviewProxyDelegate == null) {
+                return;
+            }
+            MAIN_EXECUTOR.execute(() -> {
+                if (mTaskbarOverviewProxyDelegate == null) {
+                    return;
+                }
+                mTaskbarOverviewProxyDelegate
+                        .updateImeStatus(displayId, vis, backDisposition, showImeSwitcher);
+            });
         }
+    };
 
-        public TaskbarManager getTaskbarManager() {
-            return mTaskbarManager;
-        }
+    public interface TaskbarOverviewProxyDelegate {
+        void updateImeStatus(int displayId, int vis, int backDisposition,
+                boolean showImeSwitcher);
     }
 
     private static boolean sConnected = false;
+    private static TouchInteractionService sInstance;
     private static boolean sIsInitialized = false;
     private RotationTouchHelper mRotationTouchHelper;
+    @Nullable
+    private TaskbarOverviewProxyDelegate mTaskbarOverviewProxyDelegate;
 
     public static boolean isConnected() {
         return sConnected;
     }
 
+    @Nullable
+    public static TouchInteractionService getInstance() {
+        return sInstance;
+    }
 
     public static boolean isInitialized() {
         return sIsInitialized;
@@ -308,7 +336,9 @@ public class TouchInteractionService extends Service implements PluginListener<O
 
     private DisplayManager mDisplayManager;
 
-    private TaskbarManager mTaskbarManager;
+    public TouchInteractionService() {
+        sInstance = this;
+    }
 
     @Override
     public void onCreate() {
@@ -318,14 +348,13 @@ public class TouchInteractionService extends Service implements PluginListener<O
         mMainChoreographer = Choreographer.getInstance();
         mAM = ActivityManagerWrapper.getInstance();
         mDeviceState = new RecentsAnimationDeviceState(this, true);
-        mDisplayManager = getSystemService(DisplayManager.class);
-        mTaskbarManager = new TaskbarManager(this);
-
         mRotationTouchHelper = mDeviceState.getRotationTouchHelper();
         mDeviceState.addNavigationModeChangedCallback(this::onNavigationModeChanged);
         mDeviceState.addOneHandedModeChangedCallback(this::onOneHandedModeOverlayChanged);
         mDeviceState.runOnUserUnlocked(this::onUserUnlocked);
         ProtoTracer.INSTANCE.get(this).add(this);
+        mDisplayManager = getSystemService(DisplayManager.class);
+
         sConnected = true;
     }
 
@@ -439,7 +468,8 @@ public class TouchInteractionService extends Service implements PluginListener<O
             int systemUiStateFlags = mDeviceState.getSystemUiStateFlags();
             SystemUiProxy.INSTANCE.get(this).setLastSystemUiStateFlags(systemUiStateFlags);
             mOverviewComponentObserver.onSystemUiStateChanged();
-            mTaskbarManager.onSystemUiFlagsChanged(systemUiStateFlags);
+            mOverviewComponentObserver.getActivityInterface().onSystemUiFlagsChanged(
+                    systemUiStateFlags);
 
             if ((lastSysUIFlags & SYSUI_STATE_TRACING_ENABLED) !=
                     (systemUiStateFlags & SYSUI_STATE_TRACING_ENABLED)) {
@@ -482,7 +512,6 @@ public class TouchInteractionService extends Service implements PluginListener<O
         getSystemService(AccessibilityManager.class)
                 .unregisterSystemAction(SYSTEM_ACTION_ID_ALL_APPS);
 
-        mTaskbarManager.destroy();
         sConnected = false;
         super.onDestroy();
     }
@@ -490,7 +519,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
     @Override
     public IBinder onBind(Intent intent) {
         Log.d(TAG, "Touch service connected: user=" + getUserId());
-        return new TISBinder();
+        return mMyBinder;
     }
 
     private void onInputEvent(InputEvent ev) {
diff --git a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
index 49aec933b7..d430028f8c 100644
--- a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
+++ b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
@@ -116,7 +116,7 @@ public class StaggeredWorkspaceAnim {
                     addStaggeredAnimationForView(child, lp.cellY + 1, totalRows);
                 }
             } else {
-                final int hotseatRow, qsbRow;
+                final int hotseatRow, qsbRow, taskbarRow;
                 if (grid.isTaskbarPresent) {
                     qsbRow = grid.inv.numRows + 1;
                     hotseatRow = grid.inv.numRows + 2;
@@ -124,12 +124,16 @@ public class StaggeredWorkspaceAnim {
                     hotseatRow = grid.inv.numRows + 1;
                     qsbRow = grid.inv.numRows + 2;
                 }
+                // Taskbar and hotseat overlap.
+                taskbarRow = hotseatRow;
+
                 for (int i = hotseatIcons.getChildCount() - 1; i >= 0; i--) {
                     View child = hotseatIcons.getChildAt(i);
                     addStaggeredAnimationForView(child, hotseatRow, totalRows);
                 }
 
                 addStaggeredAnimationForView(hotseat.getQsb(), qsbRow, totalRows);
+                addStaggeredAnimationForView(hotseat.getTaskbarView(), taskbarRow, totalRows);
             }
 
             mAnimators.addListener(new AnimatorListenerAdapter() {
diff --git a/res/layout/taskbar_view.xml b/res/layout/taskbar_view.xml
new file mode 100644
index 0000000000..96ae43db4a
--- /dev/null
+++ b/res/layout/taskbar_view.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<Space
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="0dp"
+    android:layout_height="0dp"
+    android:visibility="gone" />
\ No newline at end of file
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 322c6eed29..3d044d68ce 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -447,6 +447,10 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
      * @param canvas The canvas to draw to.
      */
     protected void drawDotIfNecessary(Canvas canvas) {
+        if (mActivity instanceof Launcher && ((Launcher) mActivity).isViewInTaskbar(this)) {
+            // TODO: support notification dots in Taskbar
+            return;
+        }
         if (!mForceHideDot && (hasDot() || mDotParams.scale > 0)) {
             getIconBounds(mDotParams.iconBounds);
             Utilities.scaleRectAboutCenter(mDotParams.iconBounds,
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index ff380ce1ae..b2a9e75e50 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -49,6 +49,7 @@ public class Hotseat extends CellLayout implements Insettable {
     private final View mQsb;
     private final int mQsbHeight;
 
+    private final View mTaskbarView;
     private final int mTaskbarViewHeight;
 
     public Hotseat(Context context) {
@@ -66,7 +67,10 @@ public class Hotseat extends CellLayout implements Insettable {
         mQsbHeight = mQsb.getLayoutParams().height;
         addView(mQsb);
 
-        mTaskbarViewHeight = context.getResources().getDimensionPixelSize(R.dimen.taskbar_size);
+        mTaskbarView = LayoutInflater.from(context).inflate(R.layout.taskbar_view, this, false);
+        mTaskbarViewHeight = mTaskbarView.getLayoutParams().height;
+        // We want taskbar in the back so its background applies to Hotseat as well.
+        addView(mTaskbarView, 0);
     }
 
     /**
@@ -183,6 +187,8 @@ public class Hotseat extends CellLayout implements Insettable {
         int width = getShortcutsAndWidgets().getMeasuredWidth();
         mQsb.measure(MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
                 MeasureSpec.makeMeasureSpec(mQsbHeight, MeasureSpec.EXACTLY));
+        mTaskbarView.measure(MeasureSpec.makeMeasureSpec(getMeasuredWidth(), MeasureSpec.EXACTLY),
+                MeasureSpec.makeMeasureSpec(mTaskbarViewHeight, MeasureSpec.EXACTLY));
     }
 
     @Override
@@ -196,6 +202,13 @@ public class Hotseat extends CellLayout implements Insettable {
         int bottom = b - t - getQsbOffsetY();
         int top = bottom - mQsbHeight;
         mQsb.layout(left, top, right, bottom);
+
+        int taskbarWidth = mTaskbarView.getMeasuredWidth();
+        left = (r - l - taskbarWidth) / 2;
+        right = left + taskbarWidth;
+        bottom = b - t - getTaskbarOffsetY();
+        top = bottom - mTaskbarViewHeight;
+        mTaskbarView.layout(left, top, right, bottom);
     }
 
     /**
@@ -231,4 +244,10 @@ public class Hotseat extends CellLayout implements Insettable {
         return mQsb;
     }
 
+    /**
+     * Returns the Taskbar inside hotseat
+     */
+    public View getTaskbarView() {
+        return mTaskbarView;
+    }
 }
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 8889e60688..cf902160ee 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1942,6 +1942,13 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
     @Override
     public boolean startActivitySafely(View v, Intent intent, ItemInfo item) {
+        if (isViewInTaskbar(v)) {
+            // Start the activity without the hacky workarounds below, which assume the View was
+            // clicked when Launcher was resumed and will be hidden until Launcher is re-resumed
+            // (this isn't the case for Taskbar).
+            return super.startActivitySafely(v, intent, item);
+        }
+
         if (!hasBeenResumed()) {
             // Workaround an issue where the WM launch animation is clobbered when finishing the
             // recents animation into launcher. Defer launching the activity until Launcher is
@@ -2853,6 +2860,13 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
                 .start();
     }
 
+    /**
+     * @return Whether the View is in the same window as the Taskbar window.
+     */
+    public boolean isViewInTaskbar(View v) {
+        return false;
+    }
+
     public boolean supportsAdaptiveIconAnimation(View clickedView) {
         return false;
     }
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 2884fba08d..7ae729aa0c 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -324,17 +324,15 @@ public final class Utilities {
     }
 
     public static void scaleRectFAboutCenter(RectF r, float scale) {
-        scaleRectFAboutPivot(r, scale, r.centerX(), r.centerY());
-    }
-
-    public static void scaleRectFAboutPivot(RectF r, float scale, float px, float py) {
         if (scale != 1.0f) {
-            r.offset(-px, -py);
+            float cx = r.centerX();
+            float cy = r.centerY();
+            r.offset(-cx, -cy);
             r.left = r.left * scale;
             r.top = r.top * scale ;
             r.right = r.right * scale;
             r.bottom = r.bottom * scale;
-            r.offset(px, py);
+            r.offset(cx, cy);
         }
     }
 
diff --git a/src/com/android/launcher3/touch/ItemClickHandler.java b/src/com/android/launcher3/touch/ItemClickHandler.java
index b5dcd3a041..ce7dc07d6d 100644
--- a/src/com/android/launcher3/touch/ItemClickHandler.java
+++ b/src/com/android/launcher3/touch/ItemClickHandler.java
@@ -27,7 +27,6 @@ import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_DISABLED_SU
 
 import android.app.AlertDialog;
 import android.app.PendingIntent;
-import android.content.Context;
 import android.content.Intent;
 import android.content.IntentSender;
 import android.content.pm.LauncherApps;
@@ -194,35 +193,6 @@ public class ItemClickHandler {
         launcher.startActivitySafely(v, intent, item);
     }
 
-    /**
-     * Handles clicking on a disabled shortcut
-     */
-    public static void handleDisabledItemClicked(WorkspaceItemInfo shortcut, Context context) {
-        final int disabledFlags = shortcut.runtimeStatusFlags
-                & WorkspaceItemInfo.FLAG_DISABLED_MASK;
-        if ((disabledFlags
-                & ~FLAG_DISABLED_SUSPENDED
-                & ~FLAG_DISABLED_QUIET_USER) == 0) {
-            // If the app is only disabled because of the above flags, launch activity anyway.
-            // Framework will tell the user why the app is suspended.
-        } else {
-            if (!TextUtils.isEmpty(shortcut.disabledMessage)) {
-                // Use a message specific to this shortcut, if it has one.
-                Toast.makeText(context, shortcut.disabledMessage, Toast.LENGTH_SHORT).show();
-                return;
-            }
-            // Otherwise just use a generic error message.
-            int error = R.string.activity_not_available;
-            if ((shortcut.runtimeStatusFlags & FLAG_DISABLED_SAFEMODE) != 0) {
-                error = R.string.safemode_shortcut_error;
-            } else if ((shortcut.runtimeStatusFlags & FLAG_DISABLED_BY_PUBLISHER) != 0
-                    || (shortcut.runtimeStatusFlags & FLAG_DISABLED_LOCKED_USER) != 0) {
-                error = R.string.shortcut_not_available;
-            }
-            Toast.makeText(context, error, Toast.LENGTH_SHORT).show();
-        }
-    }
-
     /**
      * Event handler for an app shortcut click.
      *
@@ -230,8 +200,30 @@ public class ItemClickHandler {
      */
     public static void onClickAppShortcut(View v, WorkspaceItemInfo shortcut, Launcher launcher) {
         if (shortcut.isDisabled()) {
-            handleDisabledItemClicked(shortcut, launcher);
-            return;
+            final int disabledFlags = shortcut.runtimeStatusFlags
+                    & WorkspaceItemInfo.FLAG_DISABLED_MASK;
+            if ((disabledFlags &
+                    ~FLAG_DISABLED_SUSPENDED &
+                    ~FLAG_DISABLED_QUIET_USER) == 0) {
+                // If the app is only disabled because of the above flags, launch activity anyway.
+                // Framework will tell the user why the app is suspended.
+            } else {
+                if (!TextUtils.isEmpty(shortcut.disabledMessage)) {
+                    // Use a message specific to this shortcut, if it has one.
+                    Toast.makeText(launcher, shortcut.disabledMessage, Toast.LENGTH_SHORT).show();
+                    return;
+                }
+                // Otherwise just use a generic error message.
+                int error = R.string.activity_not_available;
+                if ((shortcut.runtimeStatusFlags & FLAG_DISABLED_SAFEMODE) != 0) {
+                    error = R.string.safemode_shortcut_error;
+                } else if ((shortcut.runtimeStatusFlags & FLAG_DISABLED_BY_PUBLISHER) != 0 ||
+                        (shortcut.runtimeStatusFlags & FLAG_DISABLED_LOCKED_USER) != 0) {
+                    error = R.string.shortcut_not_available;
+                }
+                Toast.makeText(launcher, error, Toast.LENGTH_SHORT).show();
+                return;
+            }
         }
 
         // Check for abandoned promise
-- 
GitLab


From 1c52d1ee12a0f0d7d74a6374149c399f476ed34e Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pbdr@google.com>
Date: Thu, 20 May 2021 14:48:00 +0100
Subject: [PATCH 1228/1664] Correct QuickStep interaction handler.

With the current implementation, all interactions happen on the main
view, preventing any button or clickable object from working.

Fix: 188775840
Test: Using an App Widget with checkboxes
Change-Id: I1ec6391a36b6a3795545acb5e08dde0d3a2b2ac8
---
 .../launcher3/uioverrides/QuickstepInteractionHandler.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
index 3a8de3cace..1304033d08 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
@@ -51,7 +51,7 @@ class QuickstepInteractionHandler implements RemoteViews.InteractionHandler {
             return RemoteViews.startPendingIntent(hostView, pendingIntent,
                     remoteResponse.getLaunchOptions(view));
         }
-        Pair<Intent, ActivityOptions> options = remoteResponse.getLaunchOptions(hostView);
+        Pair<Intent, ActivityOptions> options = remoteResponse.getLaunchOptions(view);
         ActivityOptionsWrapper activityOptions = mLauncher.getAppTransitionManager()
                 .getActivityLaunchOptions(mLauncher, hostView);
         if (Utilities.ATLEAST_S && !pendingIntent.isActivity()) {
-- 
GitLab


From d312651f792fa72005a5f44c9ffe64f1a184bfaa Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Thu, 20 May 2021 09:13:50 -0500
Subject: [PATCH 1229/1664] Avoid drawing tall header when scrolling search
 results

Bug: 184946772
Test: manual
Change-Id: I1bedec89fb9eb5dc51b8b34511a02868cec91efe
---
 src/com/android/launcher3/allapps/FloatingHeaderView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/allapps/FloatingHeaderView.java b/src/com/android/launcher3/allapps/FloatingHeaderView.java
index af7896ac24..a0c598aa6e 100644
--- a/src/com/android/launcher3/allapps/FloatingHeaderView.java
+++ b/src/com/android/launcher3/allapps/FloatingHeaderView.java
@@ -298,7 +298,7 @@ public class FloatingHeaderView extends LinearLayout implements
 
     @Override
     protected void dispatchDraw(Canvas canvas) {
-        if (mHeaderCollapsed && mTabLayout.getVisibility() == VISIBLE
+        if (mHeaderCollapsed && !mCollapsed && mTabLayout.getVisibility() == VISIBLE
                 && mHeaderColor != Color.TRANSPARENT) {
             mBGPaint.setColor(mHeaderColor);
             mBGPaint.setAlpha((int) (255 * mHeaderAnimator.getAnimatedFraction()));
-- 
GitLab


From 1fb271f6e1b01b3ceef6f02f6f34d8f4427f9ea5 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 20 May 2021 10:43:23 -0700
Subject: [PATCH 1230/1664] Fixing some errorprone build rules

Bug: 186259590
Test: Presubmit
Change-Id: I3a4a306a0351a67d53e35a6919296dbda8649766
---
 Android.bp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Android.bp b/Android.bp
index 7e6a565f46..1b6ffe42b7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -16,6 +16,8 @@ package {
     default_applicable_licenses: ["packages_apps_Launcher3_license"],
 }
 
+min_launcher3_sdk_version = "26"
+
 // Added automatically by a large-scale-change
 // See: http://go/android-license-faq
 license {
@@ -92,7 +94,7 @@ java_library {
     srcs: ["src_plugins/**/*.java"],
 
     sdk_version: "current",
-    min_sdk_version: "28",
+    min_sdk_version: min_launcher3_sdk_version,
 }
 
 // Library with all the dependencies for building Launcher3
@@ -114,7 +116,7 @@ android_library {
     ],
     manifest: "AndroidManifest-common.xml",
     sdk_version: "current",
-    min_sdk_version: "26",
+    min_sdk_version: min_launcher3_sdk_version,
     lint: {
         baseline_filename: "lint-baseline-res-lib.xml",
     },
@@ -128,7 +130,7 @@ android_library {
     srcs: ["src_build_config/**/*.java"],
     static_libs: ["Launcher3ResLib"],
     sdk_version: "current",
-    min_sdk_version: "26",
+    min_sdk_version: min_launcher3_sdk_version,
     manifest: "AndroidManifest-common.xml",
     lint: {
         baseline_filename: "lint-baseline-common-deps-lib.xml",
@@ -160,8 +162,8 @@ android_app {
     },
 
     sdk_version: "current",
-    min_sdk_version: "26",
-    target_sdk_version: "29",
+    min_sdk_version: min_launcher3_sdk_version,
+    target_sdk_version: "current",
     privileged: true,
     system_ext_specific: true,
 
@@ -195,7 +197,7 @@ android_library {
         "SystemUI-statsd",
     ],
     manifest: "quickstep/AndroidManifest.xml",
-    min_sdk_version: "28",
+    min_sdk_version: "current",
 }
 
 
@@ -244,7 +246,7 @@ android_library {
         "go/AndroidManifest.xml",
         "AndroidManifest-common.xml",
     ],
-    min_sdk_version: "29",
+    min_sdk_version: "current",
     lint: {
         baseline_filename: "lint-baseline-go-res-lib.xml",
     },
-- 
GitLab


From 1b8bbb6c40f02edcd741d8b969601cb354030833 Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pbdr@google.com>
Date: Wed, 19 May 2021 22:45:16 +0100
Subject: [PATCH 1231/1664] Correct size of AppWidget for color extraction.

Correct the size of the App Widget: first, compute the size when the
widget is positioned (it wasn't done), then do not apply the
transformation when computing the size of the widget when drawn.

Note: Somehow, there is a shift by 1 on the position on the x axis, both
in landscape and portrait. So I added a +1 to get the exact same values.
If not, we have a risk of getting different colors.

Fix: 188759989
Bug: 187907544
Test: Added logs and moved a widget by hand, check the actual
coordinates with hsv.

Change-Id: Ia3bd5b3e3ea9a3ef75f8cdf466a9800786646a94
---
 src/com/android/launcher3/CellLayout.java              |  7 +++++--
 .../launcher3/widget/LauncherAppWidgetHostView.java    | 10 +++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 1df9df6763..bfa1769ea8 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -1080,9 +1080,10 @@ public class CellLayout extends ViewGroup {
             cellToRect(targetCell[0], targetCell[1], spanX, spanY, mTempRect);
 
             // Now get the rect in drag layer coordinates.
-            getBoundsForViewInDragLayer(launcher.getDragLayer(), workspace, mTempRect, false,
+            getBoundsForViewInDragLayer(launcher.getDragLayer(), this, mTempRect, true,
                     mTmpFloatArray, mTempRectF);
             Utilities.setRect(mTempRectF, mTempRect);
+
             ((LauncherAppWidgetHostView) view).handleDrag(mTempRect, pageId);
         }
     }
@@ -2594,7 +2595,9 @@ public class CellLayout extends ViewGroup {
         final int cellWidth = mCellWidth;
         final int cellHeight = mCellHeight;
 
-        final int hStartPadding = getPaddingLeft();
+        // We observe a shift of 1 pixel on the x coordinate compared to the actual cell coordinates
+        final int hStartPadding = getPaddingLeft()
+                + (int) Math.ceil(getUnusedHorizontalSpace() / 2f);
         final int vStartPadding = getPaddingTop();
 
         int x = hStartPadding + (cellX * mBorderSpacing) + (cellX * cellWidth);
diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
index 5deecd4c8a..8685aae737 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
@@ -319,11 +319,15 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         }
 
         mIsScrollable = checkScrollableRecursively(this);
-
         if (!mIsInDragMode && getTag() instanceof LauncherAppWidgetInfo) {
+            mCurrentWidgetSize.left = left;
+            mCurrentWidgetSize.right = right;
+            mCurrentWidgetSize.top = top;
+            mCurrentWidgetSize.bottom = bottom;
+
             LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) getTag();
-            getBoundsForViewInDragLayer(mLauncher.getDragLayer(), this, mCurrentWidgetSize, true,
-                    mTmpFloatArray, mTempRectF);
+            getBoundsForViewInDragLayer(mLauncher.getDragLayer(), (View) getParent(),
+                    mCurrentWidgetSize, true, mTmpFloatArray, mTempRectF);
             setRect(mTempRectF, mCurrentWidgetSize);
             updateColorExtraction(mCurrentWidgetSize,
                     mWorkspace.getPageIndexForScreenId(info.screenId));
-- 
GitLab


From 400493c70c96b0a4485193203c011a9dfffe919a Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 19 May 2021 15:14:05 +0100
Subject: [PATCH 1232/1664] Apply android:attr/dialogCornerRadius to widgets
 picker dialog top corners

Test: Open full & bottom widgets picker and observe the top corners.
Bug: 188651333
Change-Id: If091e2d760042582bb98cbd3e44663542098ecd9
---
 .../widgets_bottom_sheet_background.xml       | 26 +++++++++++++++++++
 .../widgets_bottom_sheet_background.xml       |  4 +--
 .../launcher3/views/TopRoundedCornerView.java |  3 +--
 3 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 res/drawable-v28/widgets_bottom_sheet_background.xml

diff --git a/res/drawable-v28/widgets_bottom_sheet_background.xml b/res/drawable-v28/widgets_bottom_sheet_background.xml
new file mode 100644
index 0000000000..c3009c3752
--- /dev/null
+++ b/res/drawable-v28/widgets_bottom_sheet_background.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/widgets_picker_surface" />
+    <corners
+        android:topLeftRadius="?android:attr/dialogCornerRadius"
+        android:topRightRadius="?android:attr/dialogCornerRadius"
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="0dp"
+        />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/widgets_bottom_sheet_background.xml b/res/drawable/widgets_bottom_sheet_background.xml
index faa414c506..24607678c6 100644
--- a/res/drawable/widgets_bottom_sheet_background.xml
+++ b/res/drawable/widgets_bottom_sheet_background.xml
@@ -18,8 +18,8 @@
     android:shape="rectangle">
     <solid android:color="@color/widgets_picker_surface" />
     <corners
-        android:topLeftRadius="@dimen/bg_round_rect_radius"
-        android:topRightRadius="@dimen/bg_round_rect_radius"
+        android:topLeftRadius="@dimen/default_dialog_corner_radius"
+        android:topRightRadius="@dimen/default_dialog_corner_radius"
         android:bottomLeftRadius="0dp"
         android:bottomRightRadius="0dp"
         />
diff --git a/src/com/android/launcher3/views/TopRoundedCornerView.java b/src/com/android/launcher3/views/TopRoundedCornerView.java
index 7888b08630..5519df1f49 100644
--- a/src/com/android/launcher3/views/TopRoundedCornerView.java
+++ b/src/com/android/launcher3/views/TopRoundedCornerView.java
@@ -21,7 +21,6 @@ import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.RectF;
 import android.util.AttributeSet;
-import android.widget.FrameLayout;
 
 import com.android.launcher3.R;
 import com.android.launcher3.util.Themes;
@@ -41,7 +40,7 @@ public class TopRoundedCornerView extends SpringRelativeLayout {
     public TopRoundedCornerView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
 
-        int radius = getResources().getDimensionPixelSize(R.dimen.bg_round_rect_radius);
+        float radius = Themes.getDialogCornerRadius(context);
         mRadii = new float[] {radius, radius, radius, radius, 0, 0, 0, 0};
 
         mNavBarScrimPaint = new Paint();
-- 
GitLab


From 0c6341af99b328de269aceced5f1c9e0fd0c9d87 Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Wed, 19 May 2021 20:06:42 -0700
Subject: [PATCH 1233/1664] Make launcher opaque when scrim becomes opaque

This will help with overdraw, because we don't need to draw the
wallpaper.

Test: manual
Test: adb shell dumpsys SurfaceFlinger --timestats -dump
Bug: 187703092
Change-Id: I2ebae94725578e5f4d640cd6b45da3f4d1f21a20
---
 .../launcher3/statehandlers/DepthController.java   | 12 +++---------
 src/com/android/launcher3/views/ScrimView.java     | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
index 59d0afa47f..e608885491 100644
--- a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
+++ b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
@@ -217,17 +217,11 @@ public class DepthController implements StateHandler<LauncherState>,
         }
 
         if (supportsBlur) {
-            final int blur;
-            if (mLauncher.isInState(LauncherState.ALL_APPS) && mDepth == 1) {
-                // All apps has a solid background. We don't need to draw blurs after it's fully
-                // visible. This will take us out of GPU composition, saving battery and increasing
-                // performance.
-                blur = 0;
-            } else {
-                blur = (int) (mDepth * mMaxBlurRadius);
-            }
+            boolean isOpaque = mLauncher.getScrimView().isFullyOpaque();
+            int blur = isOpaque ? 0 : (int) (mDepth * mMaxBlurRadius);
             new TransactionCompat()
                     .setBackgroundBlurRadius(mSurface, blur)
+                    .setOpaque(mSurface, isOpaque)
                     .apply();
         }
     }
diff --git a/src/com/android/launcher3/views/ScrimView.java b/src/com/android/launcher3/views/ScrimView.java
index 0ba94ab240..fb1485b480 100644
--- a/src/com/android/launcher3/views/ScrimView.java
+++ b/src/com/android/launcher3/views/ScrimView.java
@@ -19,6 +19,7 @@ import static com.android.launcher3.util.SystemUiController.UI_STATE_SCRIM_VIEW;
 
 import android.content.Context;
 import android.graphics.Canvas;
+import android.graphics.Color;
 import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
 import android.util.AttributeSet;
@@ -39,6 +40,8 @@ public class ScrimView extends View implements Insettable {
     private SystemUiController mSystemUiController;
 
     private ScrimDrawingController mDrawingController;
+    private int mBackgroundColor;
+    private boolean mIsVisible = true;
 
     public ScrimView(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -62,10 +65,21 @@ public class ScrimView extends View implements Insettable {
 
     @Override
     public void setBackgroundColor(int color) {
+        mBackgroundColor = color;
         updateSysUiColors();
         super.setBackgroundColor(color);
     }
 
+    @Override
+    public void onVisibilityAggregated(boolean isVisible) {
+        super.onVisibilityAggregated(isVisible);
+        mIsVisible = isVisible;
+    }
+
+    public boolean isFullyOpaque() {
+        return mIsVisible && getAlpha() == 1 && Color.alpha(mBackgroundColor) == 255;
+    }
+
     @Override
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
-- 
GitLab


From df4241ca4e8aa90f381ad7f414b60038111d6707 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 19 May 2021 19:42:14 -0700
Subject: [PATCH 1234/1664] Fixing Launcher preview leaking surface and memory

> Closing existing preview if a new request comes for same host token
> Closing in-memory icon db when closing preview
> Removing unnecessary wait blocks on UI thread and rendering
  view asynchronously
> Fixing preview loading failing on LauncherAppState access

Bug: 186712316
Bug: 187140897
Test: Manual
Change-Id: I045930b007e5dc015320224a197eee20a8354d17
---
 .../android/launcher3/LauncherAppState.java   |   5 +-
 .../graphics/GridCustomizationsProvider.java  |  84 ++++++-
 .../graphics/LauncherPreviewRenderer.java     | 200 +++-------------
 .../graphics/PreviewSurfaceRenderer.java      | 218 ++++++++++--------
 .../android/launcher3/icons/IconCache.java    |   7 +
 .../android/launcher3/model/ModelPreload.java |  12 +-
 6 files changed, 255 insertions(+), 271 deletions(-)

diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index b6cc6d644d..dabbdd3063 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -81,6 +81,8 @@ public class LauncherAppState {
 
     public LauncherAppState(Context context) {
         this(context, LauncherFiles.APP_ICONS_DB);
+        Log.v(Launcher.TAG, "LauncherAppState initiated");
+        Preconditions.assertUIThread();
 
         mInvariantDeviceProfile.addOnChangeListener(idp -> refreshAndReloadLauncher());
 
@@ -132,8 +134,6 @@ public class LauncherAppState {
     }
 
     public LauncherAppState(Context context, @Nullable String iconCacheFileName) {
-        Log.v(Launcher.TAG, "LauncherAppState initiated");
-        Preconditions.assertUIThread();
         mContext = context;
 
         mInvariantDeviceProfile = InvariantDeviceProfile.INSTANCE.get(context);
@@ -142,6 +142,7 @@ public class LauncherAppState {
                 iconCacheFileName, mIconProvider);
         mWidgetCache = new WidgetPreviewLoader(mContext, mIconCache);
         mModel = new LauncherModel(context, this, mIconCache, new AppFilter(mContext));
+        mOnTerminateCallback.add(mIconCache::close);
     }
 
     private void onNotificationSettingsChanged(boolean areNotificationDotsEnabled) {
diff --git a/src/com/android/launcher3/graphics/GridCustomizationsProvider.java b/src/com/android/launcher3/graphics/GridCustomizationsProvider.java
index a03e48d29a..60a1732bb6 100644
--- a/src/com/android/launcher3/graphics/GridCustomizationsProvider.java
+++ b/src/com/android/launcher3/graphics/GridCustomizationsProvider.java
@@ -4,6 +4,7 @@ import static com.android.launcher3.Utilities.getPrefs;
 import static com.android.launcher3.util.Themes.KEY_THEMED_ICONS;
 import static com.android.launcher3.util.Themes.isThemedIconEnabled;
 
+import android.annotation.TargetApi;
 import android.content.ContentProvider;
 import android.content.ContentValues;
 import android.content.pm.PackageManager;
@@ -12,14 +13,24 @@ import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.net.Uri;
 import android.os.Binder;
+import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.IBinder.DeathRecipient;
+import android.os.Looper;
+import android.os.Message;
+import android.os.Messenger;
+import android.util.ArrayMap;
 import android.util.Log;
 import android.util.Xml;
 
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile.GridOption;
 import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
+import com.android.launcher3.util.Executors;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -65,6 +76,11 @@ public class GridCustomizationsProvider extends ContentProvider {
     private static final String ICON_THEMED = "/icon_themed";
     private static final String BOOLEAN_VALUE = "boolean_value";
 
+    private static final String KEY_SURFACE_PACKAGE = "surface_package";
+    private static final String KEY_CALLBACK = "callback";
+
+    private final ArrayMap<IBinder, PreviewLifecycleObserver> mActivePreviews = new ArrayMap<>();
+
     @Override
     public boolean onCreate() {
         return true;
@@ -177,10 +193,74 @@ public class GridCustomizationsProvider extends ContentProvider {
             return null;
         }
 
-        if (!METHOD_GET_PREVIEW.equals(method)) {
+        if (!Utilities.ATLEAST_R || !METHOD_GET_PREVIEW.equals(method)) {
+            return null;
+        }
+        return getPreview(extras);
+    }
+
+    @TargetApi(Build.VERSION_CODES.R)
+    private synchronized Bundle getPreview(Bundle request) {
+        PreviewLifecycleObserver observer = null;
+        try {
+            PreviewSurfaceRenderer renderer = new PreviewSurfaceRenderer(getContext(), request);
+
+            // Destroy previous
+            destroyObserver(mActivePreviews.get(renderer.getHostToken()));
+
+            observer = new PreviewLifecycleObserver(renderer);
+            mActivePreviews.put(renderer.getHostToken(), observer);
+
+            renderer.loadAsync();
+            renderer.getHostToken().linkToDeath(observer, 0);
+
+            Bundle result = new Bundle();
+            result.putParcelable(KEY_SURFACE_PACKAGE, renderer.getSurfacePackage());
+
+            Messenger messenger = new Messenger(new Handler(Looper.getMainLooper(), observer));
+            Message msg = Message.obtain();
+            msg.replyTo = messenger;
+            result.putParcelable(KEY_CALLBACK, msg);
+            return result;
+        } catch (Exception e) {
+            Log.e(TAG, "Unable to generate preview", e);
+            if (observer != null) {
+                destroyObserver(observer);
+            }
             return null;
         }
+    }
+
+    private synchronized void destroyObserver(PreviewLifecycleObserver observer) {
+        if (observer == null || observer.destroyed) {
+            return;
+        }
+        observer.destroyed = true;
+        Executors.MAIN_EXECUTOR.execute(observer.renderer::destroy);
+        PreviewLifecycleObserver cached = mActivePreviews.get(observer.renderer.getHostToken());
+        if (cached == observer) {
+            mActivePreviews.remove(observer.renderer.getHostToken());
+        }
+    }
+
+    private class PreviewLifecycleObserver implements Handler.Callback, DeathRecipient {
 
-        return new PreviewSurfaceRenderer(getContext(), extras).render();
+        public final PreviewSurfaceRenderer renderer;
+        public boolean destroyed = false;
+
+        PreviewLifecycleObserver(PreviewSurfaceRenderer renderer) {
+            this.renderer = renderer;
+        }
+
+        @Override
+        public boolean handleMessage(Message message) {
+            destroyObserver(this);
+            return true;
+        }
+
+        @Override
+        public void binderDied() {
+            destroyObserver(this);
+        }
     }
 }
diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index f5b6890867..5f014db1ea 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -23,7 +23,6 @@ import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT
 import static com.android.launcher3.model.ModelUtils.filterCurrentWorkspaceItems;
 import static com.android.launcher3.model.ModelUtils.getMissingHotseatRanks;
 import static com.android.launcher3.model.ModelUtils.sortWorkspaceItemsSpatially;
-import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
 import android.annotation.TargetApi;
 import android.app.Fragment;
@@ -32,7 +31,6 @@ import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.content.Intent;
-import android.content.pm.ShortcutInfo;
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.Rect;
@@ -43,7 +41,6 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Process;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -57,8 +54,6 @@ import com.android.launcher3.Hotseat;
 import com.android.launcher3.InsettableFrameLayout;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.LauncherModel;
-import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.R;
 import com.android.launcher3.WorkspaceLayoutManager;
@@ -67,13 +62,8 @@ import com.android.launcher3.folder.FolderIcon;
 import com.android.launcher3.icons.BaseIconFactory;
 import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.LauncherIcons;
-import com.android.launcher3.model.AllAppsList;
 import com.android.launcher3.model.BgDataModel;
-import com.android.launcher3.model.BgDataModel.Callbacks;
 import com.android.launcher3.model.BgDataModel.FixedContainerItems;
-import com.android.launcher3.model.LoaderResults;
-import com.android.launcher3.model.LoaderTask;
-import com.android.launcher3.model.ModelDelegate;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.model.WidgetsModel;
 import com.android.launcher3.model.data.FolderInfo;
@@ -100,13 +90,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executor;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 
 /**
  * Utility class for generating the preview of Launcher for a given InvariantDeviceProfile.
@@ -120,8 +104,6 @@ import java.util.concurrent.TimeoutException;
 public class LauncherPreviewRenderer extends ContextWrapper
         implements ActivityContext, WorkspaceLayoutManager, LayoutInflater.Factory2 {
 
-    private static final String TAG = "LauncherPreviewRenderer";
-
     /**
      * Context used just for preview. It also provides a few objects (e.g. UserCache) just for
      * preview purposes.
@@ -138,9 +120,15 @@ public class LauncherPreviewRenderer extends ContextWrapper
         private final ConcurrentLinkedQueue<LauncherIconsForPreview> mIconPool =
                 new ConcurrentLinkedQueue<>();
 
+        private boolean mDestroyed = false;
+
         public PreviewContext(Context base, InvariantDeviceProfile idp) {
             super(base);
             mIdp = idp;
+            mObjectMap.put(InvariantDeviceProfile.INSTANCE, idp);
+            mObjectMap.put(LauncherAppState.INSTANCE,
+                    new LauncherAppState(this, null /* iconCacheFileName */));
+
         }
 
         @Override
@@ -149,11 +137,9 @@ public class LauncherPreviewRenderer extends ContextWrapper
         }
 
         public void onDestroy() {
-            CustomWidgetManager customWidgetManager = (CustomWidgetManager) mObjectMap.get(
-                    CustomWidgetManager.INSTANCE);
-            if (customWidgetManager != null) {
-                customWidgetManager.onDestroy();
-            }
+            CustomWidgetManager.INSTANCE.get(this).onDestroy();
+            LauncherAppState.INSTANCE.get(this).onTerminate();
+            mDestroyed = true;
         }
 
         /**
@@ -162,17 +148,12 @@ public class LauncherPreviewRenderer extends ContextWrapper
          */
         public <T> T getObject(MainThreadInitializedObject<T> mainThreadInitializedObject,
                 MainThreadInitializedObject.ObjectProvider<T> provider) {
+            if (FeatureFlags.IS_STUDIO_BUILD && mDestroyed) {
+                throw new RuntimeException("Context already destroyed");
+            }
             if (!mAllowedObjects.contains(mainThreadInitializedObject)) {
                 throw new IllegalStateException("Leaking unknown objects");
             }
-            if (mainThreadInitializedObject == LauncherAppState.INSTANCE) {
-                throw new IllegalStateException(
-                        "Should not use MainThreadInitializedObject to initialize this with "
-                                + "PreviewContext");
-            }
-            if (mainThreadInitializedObject == InvariantDeviceProfile.INSTANCE) {
-                return (T) mIdp;
-            }
             if (mObjectMap.containsKey(mainThreadInitializedObject)) {
                 return (T) mObjectMap.get(mainThreadInitializedObject);
             }
@@ -210,7 +191,6 @@ public class LauncherPreviewRenderer extends ContextWrapper
     private final Context mContext;
     private final InvariantDeviceProfile mIdp;
     private final DeviceProfile mDp;
-    private final boolean mMigrated;
     private final Rect mInsets;
     private final WorkspaceItemInfo mWorkspaceItemInfo;
     private final LayoutInflater mHomeElementInflater;
@@ -218,13 +198,12 @@ public class LauncherPreviewRenderer extends ContextWrapper
     private final Hotseat mHotseat;
     private final CellLayout mWorkspace;
 
-    public LauncherPreviewRenderer(Context context, InvariantDeviceProfile idp, boolean migrated) {
+    public LauncherPreviewRenderer(Context context, InvariantDeviceProfile idp) {
         super(context);
         mUiHandler = new Handler(Looper.getMainLooper());
         mContext = context;
         mIdp = idp;
         mDp = idp.getDeviceProfile(context).copy(context);
-        mMigrated = migrated;
 
         // TODO: get correct insets once display cutout API is available.
         mInsets = new Rect();
@@ -265,8 +244,9 @@ public class LauncherPreviewRenderer extends ContextWrapper
     }
 
     /** Populate preview and render it. */
-    public View getRenderedView() {
-        populate();
+    public View getRenderedView(BgDataModel dataModel,
+            Map<ComponentKey, AppWidgetProviderInfo> widgetProviderInfoMap) {
+        populate(dataModel, widgetProviderInfoMap);
         return mRootView;
     }
 
@@ -392,38 +372,17 @@ public class LauncherPreviewRenderer extends ContextWrapper
         }
     }
 
-    private void populate() {
-        WorkspaceFetcher fetcher;
-        PreviewContext previewContext = null;
-        if (mMigrated) {
-            previewContext = new PreviewContext(mContext, mIdp);
-            LauncherAppState appForPreview = new LauncherAppState(
-                    previewContext, null /* iconCacheFileName */);
-            fetcher = new WorkspaceItemsInfoFromPreviewFetcher(appForPreview);
-            MODEL_EXECUTOR.execute(fetcher);
-        } else {
-            fetcher = new WorkspaceItemsInfoFetcher();
-            LauncherAppState.getInstance(mContext).getModel().enqueueModelUpdateTask(
-                    (LauncherModel.ModelUpdateTask) fetcher);
-        }
-        WorkspaceResult workspaceResult = fetcher.get();
-        if (previewContext != null) {
-            previewContext.onDestroy();
-        }
-
-        if (workspaceResult == null) {
-            return;
-        }
-
+    private void populate(BgDataModel dataModel,
+            Map<ComponentKey, AppWidgetProviderInfo> widgetProviderInfoMap) {
         // Separate the items that are on the current screen, and the other remaining items.
         ArrayList<ItemInfo> currentWorkspaceItems = new ArrayList<>();
         ArrayList<ItemInfo> otherWorkspaceItems = new ArrayList<>();
         ArrayList<LauncherAppWidgetInfo> currentAppWidgets = new ArrayList<>();
         ArrayList<LauncherAppWidgetInfo> otherAppWidgets = new ArrayList<>();
         filterCurrentWorkspaceItems(0 /* currentScreenId */,
-                workspaceResult.mWorkspaceItems, currentWorkspaceItems,
+                dataModel.workspaceItems, currentWorkspaceItems,
                 otherWorkspaceItems);
-        filterCurrentWorkspaceItems(0 /* currentScreenId */, workspaceResult.mAppWidgets,
+        filterCurrentWorkspaceItems(0 /* currentScreenId */, dataModel.appWidgets,
                 currentAppWidgets, otherAppWidgets);
         sortWorkspaceItemsSpatially(mIdp, currentWorkspaceItems);
         for (ItemInfo itemInfo : currentWorkspaceItems) {
@@ -444,12 +403,12 @@ public class LauncherPreviewRenderer extends ContextWrapper
             switch (itemInfo.itemType) {
                 case Favorites.ITEM_TYPE_APPWIDGET:
                 case Favorites.ITEM_TYPE_CUSTOM_APPWIDGET:
-                    if (mMigrated) {
-                        inflateAndAddWidgets((LauncherAppWidgetInfo) itemInfo,
-                                workspaceResult.mWidgetProvidersMap);
+                    if (widgetProviderInfoMap != null) {
+                        inflateAndAddWidgets(
+                                (LauncherAppWidgetInfo) itemInfo, widgetProviderInfoMap);
                     } else {
                         inflateAndAddWidgets((LauncherAppWidgetInfo) itemInfo,
-                                workspaceResult.mWidgetsModel);
+                                dataModel.widgetsModel);
                     }
                     break;
                 default:
@@ -458,8 +417,10 @@ public class LauncherPreviewRenderer extends ContextWrapper
         }
         IntArray ranks = getMissingHotseatRanks(currentWorkspaceItems,
                 mDp.numShownHotseatIcons);
-        List<ItemInfo> predictions = workspaceResult.mHotseatPredictions == null
-                ? Collections.emptyList() : workspaceResult.mHotseatPredictions.items;
+        FixedContainerItems hotseatpredictions =
+                dataModel.extraItems.get(CONTAINER_HOTSEAT_PREDICTION);
+        List<ItemInfo> predictions = hotseatpredictions == null
+                ? Collections.emptyList() : hotseatpredictions.items;
         int count = Math.min(ranks.size(), predictions.size());
         for (int i = 0; i < count; i++) {
             int rank = ranks.get(i);
@@ -494,109 +455,4 @@ public class LauncherPreviewRenderer extends ContextWrapper
         view.measure(makeMeasureSpec(width, EXACTLY), makeMeasureSpec(height, EXACTLY));
         view.layout(0, 0, width, height);
     }
-
-    private static class WorkspaceItemsInfoFetcher implements LauncherModel.ModelUpdateTask,
-            WorkspaceFetcher {
-
-        private final FutureTask<WorkspaceResult> mTask = new FutureTask<>(this);
-
-        private LauncherAppState mApp;
-        private LauncherModel mModel;
-        private BgDataModel mBgDataModel;
-        private AllAppsList mAllAppsList;
-
-        @Override
-        public void init(LauncherAppState app, LauncherModel model, BgDataModel dataModel,
-                AllAppsList allAppsList, Executor uiExecutor) {
-            mApp = app;
-            mModel = model;
-            mBgDataModel = dataModel;
-            mAllAppsList = allAppsList;
-        }
-
-        @Override
-        public FutureTask<WorkspaceResult> getTask() {
-            return mTask;
-        }
-
-        @Override
-        public void run() {
-            mTask.run();
-        }
-
-        @Override
-        public WorkspaceResult call() throws Exception {
-            if (!mModel.isModelLoaded()) {
-                Log.d(TAG, "Workspace not loaded, loading now");
-                mModel.startLoaderForResults(
-                        new LoaderResults(mApp, mBgDataModel, mAllAppsList, new Callbacks[0]));
-                return null;
-            }
-
-            return new WorkspaceResult(mBgDataModel, mBgDataModel.widgetsModel, null);
-        }
-    }
-
-    private static class WorkspaceItemsInfoFromPreviewFetcher extends LoaderTask implements
-            WorkspaceFetcher {
-
-        private final FutureTask<WorkspaceResult> mTask = new FutureTask<>(this);
-
-        WorkspaceItemsInfoFromPreviewFetcher(LauncherAppState app) {
-            super(app, null, new BgDataModel(), new ModelDelegate(), null);
-        }
-
-        @Override
-        public FutureTask<WorkspaceResult> getTask() {
-            return mTask;
-        }
-
-        @Override
-        public void run() {
-            mTask.run();
-        }
-
-        @Override
-        public WorkspaceResult call() {
-            List<ShortcutInfo> allShortcuts = new ArrayList<>();
-            loadWorkspace(allShortcuts, LauncherSettings.Favorites.PREVIEW_CONTENT_URI,
-                    LauncherSettings.Favorites.SCREEN + " = 0 or "
-                            + LauncherSettings.Favorites.CONTAINER + " = "
-                            + LauncherSettings.Favorites.CONTAINER_HOTSEAT);
-            return new WorkspaceResult(mBgDataModel, null, mWidgetProvidersMap);
-        }
-    }
-
-    private interface WorkspaceFetcher extends Runnable, Callable<WorkspaceResult> {
-        FutureTask<WorkspaceResult> getTask();
-
-        default WorkspaceResult get() {
-            try {
-                return getTask().get(5, TimeUnit.SECONDS);
-            } catch (InterruptedException | ExecutionException | TimeoutException e) {
-                Log.d(TAG, "Error fetching workspace items info", e);
-                return null;
-            }
-        }
-    }
-
-    private static class WorkspaceResult {
-        private final ArrayList<ItemInfo> mWorkspaceItems;
-        private final ArrayList<LauncherAppWidgetInfo> mAppWidgets;
-        private final FixedContainerItems mHotseatPredictions;
-        private final WidgetsModel mWidgetsModel;
-        private final Map<ComponentKey, AppWidgetProviderInfo> mWidgetProvidersMap;
-
-        private WorkspaceResult(BgDataModel dataModel,
-                WidgetsModel widgetsModel,
-                Map<ComponentKey, AppWidgetProviderInfo> widgetProviderInfoMap) {
-            synchronized (dataModel) {
-                mWorkspaceItems = dataModel.workspaceItems;
-                mAppWidgets = dataModel.appWidgets;
-                mHotseatPredictions = dataModel.extraItems.get(CONTAINER_HOTSEAT_PREDICTION);
-                mWidgetsModel = widgetsModel;
-                mWidgetProvidersMap = widgetProviderInfoMap;
-            }
-        }
-    }
 }
diff --git a/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java b/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java
index 6193570e1f..8c39eaeddb 100644
--- a/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java
+++ b/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java
@@ -21,32 +21,47 @@ import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 
 import android.app.WallpaperColors;
+import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
 import android.hardware.display.DisplayManager;
 import android.os.Bundle;
-import android.os.Handler;
 import android.os.IBinder;
-import android.os.Looper;
-import android.os.Message;
-import android.os.Messenger;
+import android.util.Log;
 import android.view.ContextThemeWrapper;
 import android.view.Display;
 import android.view.SurfaceControlViewHost;
+import android.view.SurfaceControlViewHost.SurfacePackage;
 import android.view.View;
 import android.view.animation.AccelerateDecelerateInterpolator;
 
+import androidx.annotation.UiThread;
+import androidx.annotation.WorkerThread;
+
 import com.android.launcher3.InvariantDeviceProfile;
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.R;
+import com.android.launcher3.graphics.LauncherPreviewRenderer.PreviewContext;
+import com.android.launcher3.model.BgDataModel;
 import com.android.launcher3.model.GridSizeMigrationTask;
 import com.android.launcher3.model.GridSizeMigrationTaskV2;
+import com.android.launcher3.model.LoaderTask;
+import com.android.launcher3.model.ModelDelegate;
+import com.android.launcher3.model.ModelPreload;
+import com.android.launcher3.util.ComponentKey;
+import com.android.launcher3.util.RunnableList;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.widget.LocalColorExtractor;
 
+import java.util.ArrayList;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 /** Render preview using surface view. */
 @SuppressWarnings("NewApi")
-public class PreviewSurfaceRenderer implements IBinder.DeathRecipient {
+public class PreviewSurfaceRenderer {
+
+    private static final String TAG = "PreviewSurfaceRenderer";
 
     private static final int FADE_IN_ANIMATION_DURATION = 200;
 
@@ -54,8 +69,6 @@ public class PreviewSurfaceRenderer implements IBinder.DeathRecipient {
     private static final String KEY_VIEW_WIDTH = "width";
     private static final String KEY_VIEW_HEIGHT = "height";
     private static final String KEY_DISPLAY_ID = "display_id";
-    private static final String KEY_SURFACE_PACKAGE = "surface_package";
-    private static final String KEY_CALLBACK = "callback";
     private static final String KEY_COLORS = "wallpaper_colors";
 
     private final Context mContext;
@@ -65,10 +78,13 @@ public class PreviewSurfaceRenderer implements IBinder.DeathRecipient {
     private final int mHeight;
     private final Display mDisplay;
     private final WallpaperColors mWallpaperColors;
+    private final RunnableList mOnDestroyCallbacks = new RunnableList();
+
+    private final SurfaceControlViewHost mSurfaceControlViewHost;
 
-    private SurfaceControlViewHost mSurfaceControlViewHost;
+    private boolean mDestroyed = false;
 
-    PreviewSurfaceRenderer(Context context, Bundle bundle) {
+    public PreviewSurfaceRenderer(Context context, Bundle bundle) throws Exception {
         mContext = context;
 
         String gridName = bundle.getString("name");
@@ -77,106 +93,97 @@ public class PreviewSurfaceRenderer implements IBinder.DeathRecipient {
             gridName = InvariantDeviceProfile.getCurrentGridName(context);
         }
         mWallpaperColors = bundle.getParcelable(KEY_COLORS);
-
         mIdp = new InvariantDeviceProfile(context, gridName);
 
         mHostToken = bundle.getBinder(KEY_HOST_TOKEN);
         mWidth = bundle.getInt(KEY_VIEW_WIDTH);
         mHeight = bundle.getInt(KEY_VIEW_HEIGHT);
+        mDisplay = context.getSystemService(DisplayManager.class)
+                .getDisplay(bundle.getInt(KEY_DISPLAY_ID));
 
-        final DisplayManager displayManager = (DisplayManager) context.getSystemService(
-                Context.DISPLAY_SERVICE);
-        mDisplay = displayManager.getDisplay(bundle.getInt(KEY_DISPLAY_ID));
+        mSurfaceControlViewHost = MAIN_EXECUTOR
+                .submit(() -> new SurfaceControlViewHost(mContext, mDisplay, mHostToken))
+                .get(5, TimeUnit.SECONDS);
+        mOnDestroyCallbacks.add(mSurfaceControlViewHost::release);
     }
 
-    /** Handle a received surface view request. */
-    Bundle render() {
-        if (mSurfaceControlViewHost != null) {
-            binderDied();
-        }
+    public IBinder getHostToken() {
+        return mHostToken;
+    }
 
-        SurfaceControlViewHost.SurfacePackage surfacePackage;
-        try {
-            mSurfaceControlViewHost = MAIN_EXECUTOR
-                    .submit(() -> new SurfaceControlViewHost(mContext, mDisplay, mHostToken))
-                    .get(5, TimeUnit.SECONDS);
-            surfacePackage = mSurfaceControlViewHost.getSurfacePackage();
-            mHostToken.linkToDeath(this, 0);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
+    public SurfacePackage getSurfacePackage() {
+        return mSurfaceControlViewHost.getSurfacePackage();
+    }
 
-        MODEL_EXECUTOR.post(() -> {
-            final boolean success = doGridMigrationIfNecessary();
-
-            final Context inflationContext;
-            if (mWallpaperColors != null) {
-                // Workaround to create a themed context
-                Context context = mContext.createDisplayContext(mDisplay);
-                LocalColorExtractor.newInstance(mContext)
-                        .applyColorsOverride(context, mWallpaperColors);
-
-                inflationContext = new ContextThemeWrapper(context,
-                        Themes.getActivityThemeRes(context, mWallpaperColors.getColorHints()));
-            } else {
-                inflationContext = new ContextThemeWrapper(mContext,  R.style.AppTheme);
-            }
-
-            MAIN_EXECUTOR.post(() -> {
-                // If mSurfaceControlViewHost is null due to any reason (e.g. binder died,
-                // happening when user leaves the preview screen before preview rendering finishes),
-                // we should return here.
-                SurfaceControlViewHost host = mSurfaceControlViewHost;
-                if (host == null) {
-                    return;
-                }
+    /**
+     * Destroys the preview and all associated data
+     */
+    @UiThread
+    public void destroy() {
+        mDestroyed = true;
+        mOnDestroyCallbacks.executeAllAndDestroy();
+    }
 
-                View view = new LauncherPreviewRenderer(inflationContext, mIdp, success)
-                        .getRenderedView();
-                // This aspect scales the view to fit in the surface and centers it
-                final float scale = Math.min(mWidth / (float) view.getMeasuredWidth(),
-                        mHeight / (float) view.getMeasuredHeight());
-                view.setScaleX(scale);
-                view.setScaleY(scale);
-                view.setPivotX(0);
-                view.setPivotY(0);
-                view.setTranslationX((mWidth - scale * view.getWidth()) / 2);
-                view.setTranslationY((mHeight - scale * view.getHeight()) / 2);
-                view.setAlpha(0);
-                view.animate().alpha(1)
-                        .setInterpolator(new AccelerateDecelerateInterpolator())
-                        .setDuration(FADE_IN_ANIMATION_DURATION)
-                        .start();
-                host.setView(view, view.getMeasuredWidth(), view.getMeasuredHeight());
-            });
-        });
-
-        Bundle result = new Bundle();
-        result.putParcelable(KEY_SURFACE_PACKAGE, surfacePackage);
-
-        Handler handler = new Handler(Looper.getMainLooper(), message -> {
-            binderDied();
-            return true;
-        });
-        Messenger messenger = new Messenger(handler);
-        Message msg = Message.obtain();
-        msg.replyTo = messenger;
-        result.putParcelable(KEY_CALLBACK, msg);
-        return result;
+    /**
+     * Generates the preview in background
+     */
+    public void loadAsync() {
+        MODEL_EXECUTOR.execute(this::loadModelData);
     }
 
-    @Override
-    public void binderDied() {
-        if (mSurfaceControlViewHost != null) {
-            MAIN_EXECUTOR.execute(() -> {
-                mSurfaceControlViewHost.release();
-                mSurfaceControlViewHost = null;
-            });
+    @WorkerThread
+    private void loadModelData() {
+        final boolean migrated = doGridMigrationIfNecessary();
+
+        final Context inflationContext;
+        if (mWallpaperColors != null) {
+            // Create a themed context, without affecting the main application context
+            Context context = mContext.createDisplayContext(mDisplay);
+            LocalColorExtractor.newInstance(mContext)
+                    .applyColorsOverride(context, mWallpaperColors);
+            inflationContext = new ContextThemeWrapper(context,
+                    Themes.getActivityThemeRes(context, mWallpaperColors.getColorHints()));
+        } else {
+            inflationContext = new ContextThemeWrapper(mContext,  R.style.AppTheme);
+        }
+
+        if (migrated) {
+            PreviewContext previewContext = new PreviewContext(inflationContext, mIdp);
+            new LoaderTask(
+                    LauncherAppState.getInstance(previewContext),
+                    null,
+                    new BgDataModel(),
+                    new ModelDelegate(), null) {
+
+                @Override
+                public void run() {
+                    loadWorkspace(new ArrayList<>(), LauncherSettings.Favorites.PREVIEW_CONTENT_URI,
+                            LauncherSettings.Favorites.SCREEN + " = 0 or "
+                                    + LauncherSettings.Favorites.CONTAINER + " = "
+                                    + LauncherSettings.Favorites.CONTAINER_HOTSEAT);
+                    MAIN_EXECUTOR.execute(() -> {
+                        renderView(previewContext, mBgDataModel, mWidgetProvidersMap);
+                        mOnDestroyCallbacks.add(previewContext::onDestroy);
+                    });
+                }
+            }.run();
+        } else {
+            new ModelPreload() {
+
+                @Override
+                public void onComplete(boolean isSuccess) {
+                    if (isSuccess) {
+                        MAIN_EXECUTOR.execute(() ->
+                                renderView(inflationContext, getBgDataModel(), null));
+                    } else {
+                        Log.e(TAG, "Model loading failed");
+                    }
+                }
+            }.start(inflationContext);
         }
-        mHostToken.unlinkToDeath(this, 0);
     }
 
+    @WorkerThread
     private boolean doGridMigrationIfNecessary() {
         boolean needsToMigrate =
                 MULTI_DB_GRID_MIRATION_ALGO.get()
@@ -189,4 +196,29 @@ public class PreviewSurfaceRenderer implements IBinder.DeathRecipient {
                 ? GridSizeMigrationTaskV2.migrateGridIfNeeded(mContext, mIdp)
                 : GridSizeMigrationTask.migrateGridIfNeeded(mContext, mIdp);
     }
+
+    @UiThread
+    private void renderView(Context inflationContext, BgDataModel dataModel,
+            Map<ComponentKey, AppWidgetProviderInfo> widgetProviderInfoMap) {
+        if (mDestroyed) {
+            return;
+        }
+        View view = new LauncherPreviewRenderer(inflationContext, mIdp)
+                .getRenderedView(dataModel, widgetProviderInfoMap);
+        // This aspect scales the view to fit in the surface and centers it
+        final float scale = Math.min(mWidth / (float) view.getMeasuredWidth(),
+                mHeight / (float) view.getMeasuredHeight());
+        view.setScaleX(scale);
+        view.setScaleY(scale);
+        view.setPivotX(0);
+        view.setPivotY(0);
+        view.setTranslationX((mWidth - scale * view.getWidth()) / 2);
+        view.setTranslationY((mHeight - scale * view.getHeight()) / 2);
+        view.setAlpha(0);
+        view.animate().alpha(1)
+                .setInterpolator(new AccelerateDecelerateInterpolator())
+                .setDuration(FADE_IN_ANIMATION_DURATION)
+                .start();
+        mSurfaceControlViewHost.setView(view, view.getMeasuredWidth(), view.getMeasuredHeight());
+    }
 }
diff --git a/src/com/android/launcher3/icons/IconCache.java b/src/com/android/launcher3/icons/IconCache.java
index 297325a0ee..8e0a388784 100644
--- a/src/com/android/launcher3/icons/IconCache.java
+++ b/src/com/android/launcher3/icons/IconCache.java
@@ -130,6 +130,13 @@ public class IconCache extends BaseIconCache {
         }
     }
 
+    /**
+     * Closes the cache DB. This will clear any in-memory cache.
+     */
+    public void close() {
+        mIconDb.close();
+    }
+
     /**
      * Fetches high-res icon for the provided ItemInfo and updates the caller when done.
      *
diff --git a/src/com/android/launcher3/model/ModelPreload.java b/src/com/android/launcher3/model/ModelPreload.java
index 713492b9fa..756b7da759 100644
--- a/src/com/android/launcher3/model/ModelPreload.java
+++ b/src/com/android/launcher3/model/ModelPreload.java
@@ -15,6 +15,8 @@
  */
 package com.android.launcher3.model;
 
+import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
+
 import android.content.Context;
 import android.util.Log;
 
@@ -52,8 +54,14 @@ public class ModelPreload implements ModelUpdateTask {
     public final void run() {
         mModel.startLoaderForResultsIfNotLoaded(
                 new LoaderResults(mApp, mBgDataModel, mAllAppsList, new Callbacks[0]));
-        Log.d(TAG, "Preload completed : " + mModel.isModelLoaded());
-        onComplete(mModel.isModelLoaded());
+        MODEL_EXECUTOR.post(() -> {
+            Log.d(TAG, "Preload completed : " + mModel.isModelLoaded());
+            onComplete(mModel.isModelLoaded());
+        });
+    }
+
+    public BgDataModel getBgDataModel() {
+        return mBgDataModel;
     }
 
     /**
-- 
GitLab


From bd2fa26bdaa2e80f31eaef7ad6cdea83d5bd111c Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 20 May 2021 13:17:44 -0700
Subject: [PATCH 1235/1664] Tweak ordering of first match search

- Tweak iteration for finding first match, go by operator priority and
  check each cell layout by order to return the first view that matches
- Also reset the launch cookie in cases where we're launching a task
  that doesn't support cookies (ie. via prediction), otherwise we may
  still try to associate it with the last launched cookie later

Fixes: 187720286
Test: Swipe up from various icon types across hotseat/workspace
Change-Id: I71c4c13c442b0884b2247589685f976eaaeb30a4
Signed-off-by: Winson Chung <winsonc@google.com>
---
 .../launcher3/BaseQuickstepLauncher.java      |  5 ++
 .../quickstep/LauncherSwipeHandlerV2.java     |  3 +-
 src/com/android/launcher3/Workspace.java      | 48 +++++++------------
 .../launcher3/model/data/ItemInfo.java        |  2 +
 4 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index e777ee7354..25e23594ac 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -20,6 +20,7 @@ import static com.android.launcher3.AbstractFloatingView.TYPE_HIDE_BACK_BUTTON;
 import static com.android.launcher3.LauncherState.FLAG_HIDE_BACK_BUTTON;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.NO_OFFSET;
+import static com.android.launcher3.model.data.ItemInfo.NO_MATCHING_ID;
 import static com.android.launcher3.util.DisplayController.CHANGE_ACTIVE_SCREEN;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
@@ -499,6 +500,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
                     // Also allow swiping to folders
                     break;
                 }
+                // Reset any existing launch cookies associated with the cookie
+                opts.setLaunchCookie(ObjectWrapper.wrap(NO_MATCHING_ID));
                 return;
         }
         switch (info.itemType) {
@@ -509,6 +512,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
                 // Fall through and continue if it's an app, shortcut, or widget
                 break;
             default:
+                // Reset any existing launch cookies associated with the cookie
+                opts.setLaunchCookie(ObjectWrapper.wrap(NO_MATCHING_ID));
                 return;
         }
         opts.setLaunchCookie(ObjectWrapper.wrap(new Integer(info.id)));
diff --git a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
index 811af7e658..1bae1c5f6b 100644
--- a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
+++ b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
@@ -21,6 +21,7 @@ import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.Utilities.boundToRange;
 import static com.android.launcher3.Utilities.dpToPx;
 import static com.android.launcher3.config.FeatureFlags.PROTOTYPE_APP_CLOSE;
+import static com.android.launcher3.model.data.ItemInfo.NO_MATCHING_ID;
 import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION;
 import static com.android.launcher3.views.FloatingIconView.getFloatingIconView;
 
@@ -234,7 +235,7 @@ public class LauncherSwipeHandlerV2 extends
 
         // Find the associated item info for the launch cookie (if available), note that predicted
         // apps actually have an id of -1, so use another default id here
-        int launchCookieItemId = -2;
+        int launchCookieItemId = NO_MATCHING_ID;
         for (IBinder cookie : launchCookies) {
             Integer itemId = ObjectWrapper.unwrap(cookie);
             if (itemId != null) {
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 5ba7623ece..98d80fedbc 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2953,10 +2953,11 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         };
         final Workspace.ItemOperator packageAndUserAndApp = (ItemInfo info, View view) ->
                 info != null
-                        && info.getTargetComponent() != null
-                        && TextUtils.equals(info.getTargetComponent().getPackageName(), packageName)
+                        && info.itemType == ITEM_TYPE_APPLICATION
                         && info.user.equals(user)
-                        && info.itemType == ITEM_TYPE_APPLICATION;
+                        && info.getTargetComponent() != null
+                        && TextUtils.equals(info.getTargetComponent().getPackageName(),
+                                packageName);
         final Workspace.ItemOperator packageAndUserAndAppInFolder = (info, view) -> {
             if (info instanceof FolderInfo) {
                 FolderInfo folderInfo = (FolderInfo) info;
@@ -2973,7 +2974,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         cellLayouts.add(getHotseat());
         forEachVisiblePage(page -> cellLayouts.add((CellLayout) page));
 
-        // Order: App icons, app in folder. Items in hotseat get returned first.
+        // Order: Preferred item, App icons in hotseat/workspace, app in folder in hotseat/workspace
         if (ADAPTIVE_ICON_WINDOW_ANIM.get()) {
             return getFirstMatch(cellLayouts, preferredItem, preferredItemInFolder,
                     packageAndUserAndApp, packageAndUserAndAppInFolder);
@@ -3010,34 +3011,17 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
     }
 
     /**
+     * Finds the first view matching the ordered operators across the given cell layouts by order.
      * @param cellLayouts List of CellLayouts to scan, in order of preference.
      * @param operators List of operators, in order starting from best matching operator.
-     * @return
      */
     View getFirstMatch(Iterable<CellLayout> cellLayouts, final ItemOperator... operators) {
-        // This array is filled with the first match for each operator.
-        final View[] matches = new View[operators.length];
-        // For efficiency, the outer loop should be CellLayout.
-        for (CellLayout cellLayout : cellLayouts) {
-            mapOverCellLayout(cellLayout, (info, v) -> {
-                for (int i = 0; i < operators.length; ++i) {
-                    if (matches[i] == null && operators[i].evaluate(info, v)) {
-                        matches[i] = v;
-                        if (i == 0) {
-                            // We can return since this is the best match possible.
-                            return true;
-                        }
-                    }
+        for (ItemOperator operator : operators) {
+            for (CellLayout cellLayout : cellLayouts) {
+                View match = mapOverCellLayout(cellLayout, operator);
+                if (match != null) {
+                    return match;
                 }
-                return false;
-            });
-            if (matches[0] != null) {
-                break;
-            }
-        }
-        for (View match : matches) {
-            if (match != null) {
-                return match;
             }
         }
         return null;
@@ -3111,16 +3095,16 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
      */
     public void mapOverItems(ItemOperator op) {
         for (CellLayout layout : getWorkspaceAndHotseatCellLayouts()) {
-            if (mapOverCellLayout(layout, op)) {
+            if (mapOverCellLayout(layout, op) != null) {
                 return;
             }
         }
     }
 
-    private boolean mapOverCellLayout(CellLayout layout, ItemOperator op) {
+    private View mapOverCellLayout(CellLayout layout, ItemOperator op) {
         // TODO(b/128460496) Potential race condition where layout is not yet loaded
         if (layout == null) {
-            return false;
+            return null;
         }
         ShortcutAndWidgetContainer container = layout.getShortcutsAndWidgets();
         // map over all the shortcuts on the workspace
@@ -3128,10 +3112,10 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         for (int itemIdx = 0; itemIdx < itemCount; itemIdx++) {
             View item = container.getChildAt(itemIdx);
             if (op.evaluate((ItemInfo) item.getTag(), item)) {
-                return true;
+                return item;
             }
         }
-        return false;
+        return null;
     }
 
     void updateShortcuts(List<WorkspaceItemInfo> shortcuts) {
diff --git a/src/com/android/launcher3/model/data/ItemInfo.java b/src/com/android/launcher3/model/data/ItemInfo.java
index e388965e91..3abcc2b826 100644
--- a/src/com/android/launcher3/model/data/ItemInfo.java
+++ b/src/com/android/launcher3/model/data/ItemInfo.java
@@ -68,6 +68,8 @@ public class ItemInfo {
 
     public static final boolean DEBUG = false;
     public static final int NO_ID = -1;
+    // An id that doesn't match any item, including predicted apps with have an id=NO_ID
+    public static final int NO_MATCHING_ID = Integer.MIN_VALUE;
 
     /**
      * The id in the settings database for this item
-- 
GitLab


From bfac8730fe1baa8acb4e95c1392ec3cb91a003e4 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Thu, 20 May 2021 15:48:29 -0700
Subject: [PATCH 1236/1664] Improving TAPL messaging

Test: presubmit
Bug: 187761685
Change-Id: I83eb0eef2f9c8c33cc9d1b42cb52fb670a5bf427
---
 .../com/android/launcher3/tapl/LauncherInstrumentation.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 57f40db205..4cf52f071d 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -496,13 +496,14 @@ public final class LauncherInstrumentation {
     private void fail(String message) {
         checkForAnomaly();
         Assert.fail(formatSystemHealthMessage(formatErrorWithEvents(
-                "http://go/tapl test failure:\nOverview: " + getContextDescription()
+                "http://go/tapl test failure:\nSummary: " + getContextDescription()
                         + " - visible state is " + getVisibleStateMessage()
                         + ";\nDetails: " + message, true)));
     }
 
     private String getContextDescription() {
-        return mDiagnosticContext.isEmpty() ? "" : String.join(", ", mDiagnosticContext);
+        return mDiagnosticContext.isEmpty()
+                ? "(no context)" : String.join(", ", mDiagnosticContext);
     }
 
     void assertTrue(String message, boolean condition) {
-- 
GitLab


From ccb71776c64c48f87158f851a0a4b4dda563e630 Mon Sep 17 00:00:00 2001
From: Chihhang Chuang <chihhangchuang@google.com>
Date: Thu, 20 May 2021 01:50:03 +0800
Subject: [PATCH 1237/1664] Apply the current system window insets to launcher
 preview

For wallpaper picker, the position of app icon on the wallpaper preview would match to the launcher after applying the wallpaper.

Wallpaper picker: https://screenshot.googleplex.com/JZazpgZLgzacZMZ.png
Launcher: https://screenshot.googleplex.com/9uTTQwdmcnFZ7Vi.png
Gesture mode: https://screenshot.googleplex.com/3YaKbBerYgtHBFb.png
3-button mode: https://screenshot.googleplex.com/7sA5nE3GmbuKf62.png

Fixes: 188539072
Test: Manually
Change-Id: I553000e6ae646207eb94fa33e97d00a3990043c8
---
 .../graphics/LauncherPreviewRenderer.java     | 20 +++++++++++++++----
 .../graphics/PreviewSurfaceRenderer.java      |  6 ++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index 5f014db1ea..2a1aec84a3 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -45,6 +45,8 @@ import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowInsets;
+import android.view.WindowManager;
 import android.widget.TextClock;
 
 import com.android.launcher3.BubbleTextView;
@@ -56,6 +58,7 @@ import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.WorkspaceLayoutManager;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.folder.FolderIcon;
@@ -205,10 +208,19 @@ public class LauncherPreviewRenderer extends ContextWrapper
         mIdp = idp;
         mDp = idp.getDeviceProfile(context).copy(context);
 
-        // TODO: get correct insets once display cutout API is available.
-        mInsets = new Rect();
-        mInsets.left = mInsets.right = (mDp.widthPx - mDp.availableWidthPx) / 2;
-        mInsets.top = mInsets.bottom = (mDp.heightPx - mDp.availableHeightPx) / 2;
+        if (Utilities.ATLEAST_R) {
+            WindowInsets currentWindowInsets = context.getSystemService(WindowManager.class)
+                    .getCurrentWindowMetrics().getWindowInsets();
+            mInsets = new Rect(
+                    currentWindowInsets.getSystemWindowInsetLeft(),
+                    currentWindowInsets.getSystemWindowInsetTop(),
+                    currentWindowInsets.getSystemWindowInsetRight(),
+                    currentWindowInsets.getSystemWindowInsetBottom());
+        } else {
+            mInsets = new Rect();
+            mInsets.left = mInsets.right = (mDp.widthPx - mDp.availableWidthPx) / 2;
+            mInsets.top = mInsets.bottom = (mDp.heightPx - mDp.availableHeightPx) / 2;
+        }
         mDp.updateInsets(mInsets);
 
         BaseIconFactory iconFactory =
diff --git a/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java b/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java
index 8c39eaeddb..a8c3d15bde 100644
--- a/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java
+++ b/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java
@@ -32,6 +32,7 @@ import android.view.Display;
 import android.view.SurfaceControlViewHost;
 import android.view.SurfaceControlViewHost.SurfacePackage;
 import android.view.View;
+import android.view.WindowManager.LayoutParams;
 import android.view.animation.AccelerateDecelerateInterpolator;
 
 import androidx.annotation.UiThread;
@@ -41,6 +42,7 @@ import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.graphics.LauncherPreviewRenderer.PreviewContext;
 import com.android.launcher3.model.BgDataModel;
 import com.android.launcher3.model.GridSizeMigrationTask;
@@ -139,6 +141,10 @@ public class PreviewSurfaceRenderer {
         if (mWallpaperColors != null) {
             // Create a themed context, without affecting the main application context
             Context context = mContext.createDisplayContext(mDisplay);
+            if (Utilities.ATLEAST_R) {
+                context = context.createWindowContext(
+                        LayoutParams.TYPE_APPLICATION_OVERLAY, null);
+            }
             LocalColorExtractor.newInstance(mContext)
                     .applyColorsOverride(context, mWallpaperColors);
             inflationContext = new ContextThemeWrapper(context,
-- 
GitLab


From d5500548dca15d4103d1d654fb1bf9fe8cf465a8 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 20 May 2021 20:18:47 +0000
Subject: [PATCH 1238/1664] Revert^2 "Moving taskbar lifecycle to
 TouchInteractionService"

430465a3d5ff0dcdd0c2e263d862049d93075a07
Bug: 187353581
Change-Id: I7b2280d16adfafd3e85ffc1d22e32d0c00d12b67
---
 quickstep/res/layout/taskbar.xml              |  24 +-
 quickstep/res/layout/taskbar_view.xml         |  26 -
 quickstep/res/values/dimens.xml               |   1 +
 .../launcher3/BaseQuickstepLauncher.java      |  90 +---
 .../launcher3/QuickstepTransitionManager.java |   3 -
 .../launcher3/taskbar/ButtonProvider.java     |  32 +-
 .../android/launcher3/taskbar/ImeBarView.java |  17 +-
 .../taskbar/TaskbarActivityContext.java       | 230 ++++++++-
 .../taskbar/TaskbarAnimationController.java   |   5 +-
 .../taskbar/TaskbarContainerView.java         |  96 ++--
 .../launcher3/taskbar/TaskbarController.java  | 472 +++---------------
 .../taskbar/TaskbarDragController.java        |  13 +-
 .../taskbar/TaskbarHotseatController.java     |  17 +-
 .../taskbar/TaskbarIconController.java        | 163 ++++++
 .../launcher3/taskbar/TaskbarManager.java     | 157 ++++++
 .../taskbar/TaskbarNavButtonController.java   |  20 +-
 .../taskbar/TaskbarStateHandler.java          |  41 +-
 .../taskbar/TaskbarUIController.java          |  41 ++
 .../launcher3/taskbar/TaskbarView.java        | 262 ++++------
 .../quickstep/BaseActivityInterface.java      |  13 -
 .../quickstep/LauncherActivityInterface.java  |  14 +-
 .../quickstep/TouchInteractionService.java    |  61 +--
 .../util/StaggeredWorkspaceAnim.java          |   6 +-
 res/layout/taskbar_view.xml                   |  21 -
 src/com/android/launcher3/BubbleTextView.java |   4 -
 src/com/android/launcher3/Hotseat.java        |  21 +-
 src/com/android/launcher3/Launcher.java       |  14 -
 src/com/android/launcher3/Utilities.java      |  10 +-
 .../launcher3/touch/ItemClickHandler.java     |  56 ++-
 29 files changed, 948 insertions(+), 982 deletions(-)
 delete mode 100644 quickstep/res/layout/taskbar_view.xml
 create mode 100644 quickstep/src/com/android/launcher3/taskbar/TaskbarIconController.java
 create mode 100644 quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
 create mode 100644 quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java
 delete mode 100644 res/layout/taskbar_view.xml

diff --git a/quickstep/res/layout/taskbar.xml b/quickstep/res/layout/taskbar.xml
index 240fe556da..c4362214cb 100644
--- a/quickstep/res/layout/taskbar.xml
+++ b/quickstep/res/layout/taskbar.xml
@@ -22,9 +22,29 @@
 
     <com.android.launcher3.taskbar.TaskbarView
         android:id="@+id/taskbar_view"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center"/>
+        android:gravity="center"
+        android:forceHasOverlappingRendering="false"
+        android:layout_gravity="bottom" >
+
+        <LinearLayout
+            android:id="@+id/system_button_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="@dimen/taskbar_nav_buttons_spacing"
+            android:paddingRight="@dimen/taskbar_nav_buttons_spacing"
+            android:forceHasOverlappingRendering="false"
+            android:gravity="center" />
+
+        <LinearLayout
+            android:id="@+id/hotseat_icons_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:forceHasOverlappingRendering="false"
+            android:gravity="center" />
+
+    </com.android.launcher3.taskbar.TaskbarView>
 
     <com.android.launcher3.taskbar.ImeBarView
         android:id="@+id/ime_bar_view"
diff --git a/quickstep/res/layout/taskbar_view.xml b/quickstep/res/layout/taskbar_view.xml
deleted file mode 100644
index 34a88ea6a2..0000000000
--- a/quickstep/res/layout/taskbar_view.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<com.android.launcher3.taskbar.TaskbarView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/taskbar_view"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/taskbar_size"
-    android:background="@android:color/transparent"
-    android:layout_gravity="bottom"
-    android:gravity="center"
-    android:visibility="gone" />
-
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 735cb24f82..50453ace16 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -149,4 +149,5 @@
     <!-- Note that this applies to both sides of all icons, so visible space is double this. -->
     <dimen name="taskbar_icon_spacing">8dp</dimen>
     <dimen name="taskbar_folder_margin">16dp</dimen>
+    <dimen name="taskbar_nav_buttons_spacing">16dp</dimen>
 </resources>
diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 25e23594ac..300654e657 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -21,7 +21,6 @@ import static com.android.launcher3.LauncherState.FLAG_HIDE_BACK_BUTTON;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.NO_OFFSET;
 import static com.android.launcher3.model.data.ItemInfo.NO_MATCHING_ID;
-import static com.android.launcher3.util.DisplayController.CHANGE_ACTIVE_SCREEN;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
 import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
@@ -31,7 +30,6 @@ import android.animation.AnimatorSet;
 import android.animation.ValueAnimator;
 import android.app.ActivityOptions;
 import android.content.ComponentName;
-import android.content.Context;
 import android.content.Intent;
 import android.content.IntentSender;
 import android.content.ServiceConnection;
@@ -52,13 +50,11 @@ import com.android.launcher3.proxy.StartActivityParams;
 import com.android.launcher3.statehandlers.BackButtonAlphaHandler;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
-import com.android.launcher3.taskbar.TaskbarActivityContext;
 import com.android.launcher3.taskbar.TaskbarController;
+import com.android.launcher3.taskbar.TaskbarManager;
 import com.android.launcher3.taskbar.TaskbarStateHandler;
-import com.android.launcher3.taskbar.TaskbarView;
 import com.android.launcher3.uioverrides.RecentsViewStateController;
 import com.android.launcher3.util.ActivityOptionsWrapper;
-import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.ObjectWrapper;
 import com.android.launcher3.util.UiThreadHelper;
 import com.android.quickstep.RecentsModel;
@@ -68,6 +64,7 @@ import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;
 import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.TaskUtils;
 import com.android.quickstep.TouchInteractionService;
+import com.android.quickstep.TouchInteractionService.TISBinder;
 import com.android.quickstep.util.RemoteAnimationProvider;
 import com.android.quickstep.util.RemoteFadeOutAnimationListener;
 import com.android.quickstep.util.SplitSelectStateController;
@@ -89,8 +86,6 @@ public abstract class BaseQuickstepLauncher extends Launcher
 
     private DepthController mDepthController = new DepthController(this);
     private QuickstepTransitionManager mAppTransitionManager;
-    private ServiceConnection mTisBinderConnection;
-    protected TouchInteractionService.TISBinder mTisBinder;
 
     /**
      * Reusable command for applying the back button alpha on the background thread.
@@ -101,8 +96,20 @@ public abstract class BaseQuickstepLauncher extends Launcher
 
     private OverviewActionsView mActionsView;
 
+    private @Nullable TaskbarManager mTaskbarManager;
     private @Nullable TaskbarController mTaskbarController;
+    private final ServiceConnection mTisBinderConnection = new ServiceConnection() {
+        @Override
+        public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
+            mTaskbarManager = ((TISBinder) iBinder).getTaskbarManager();
+            mTaskbarManager.setLauncher(BaseQuickstepLauncher.this);
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName componentName) { }
+    };
     private final TaskbarStateHandler mTaskbarStateHandler = new TaskbarStateHandler(this);
+
     // Will be updated when dragging from taskbar.
     private @Nullable DragOptions mNextWorkspaceDragOptions = null;
     private SplitPlaceholderView mSplitPlaceholderView;
@@ -112,24 +119,6 @@ public abstract class BaseQuickstepLauncher extends Launcher
         super.onCreate(savedInstanceState);
         SysUINavigationMode.INSTANCE.get(this).addModeChangeListener(this);
         addMultiWindowModeChangedListener(mDepthController);
-        setupTouchInteractionServiceBinder();
-    }
-
-    private void setupTouchInteractionServiceBinder() {
-        Intent intent = new Intent(this, TouchInteractionService.class);
-        mTisBinderConnection = new ServiceConnection() {
-            @Override
-            public void onServiceConnected(ComponentName componentName, IBinder binder) {
-                mTisBinder = ((TouchInteractionService.TISBinder) binder);
-                mTisBinder.setTaskbarOverviewProxyDelegate(mTaskbarController);
-            }
-
-            @Override
-            public void onServiceDisconnected(ComponentName componentName) {
-                mTisBinder = null;
-            }
-        };
-        bindService(intent, mTisBinderConnection, 0);
     }
 
     @Override
@@ -137,15 +126,12 @@ public abstract class BaseQuickstepLauncher extends Launcher
         mAppTransitionManager.onActivityDestroyed();
 
         SysUINavigationMode.INSTANCE.get(this).removeModeChangeListener(this);
-        if (mTaskbarController != null) {
-            mTaskbarController.cleanup();
-            mTaskbarController = null;
-            if (mTisBinder != null) {
-                mTisBinder.setTaskbarOverviewProxyDelegate(null);
-                unbindService(mTisBinderConnection);
-            }
-        }
 
+
+        unbindService(mTisBinderConnection);
+        if (mTaskbarManager != null) {
+            mTaskbarManager.setLauncher(null);
+        }
         super.onDestroy();
     }
 
@@ -272,37 +258,12 @@ public abstract class BaseQuickstepLauncher extends Launcher
         mAppTransitionManager = new QuickstepTransitionManager(this);
         mAppTransitionManager.registerRemoteAnimations();
 
-        addTaskbarIfNecessary();
-        addOnDeviceProfileChangeListener(newDp -> addTaskbarIfNecessary());
-    }
+        bindService(new Intent(this, TouchInteractionService.class), mTisBinderConnection, 0);
 
-    @Override
-    public void onDisplayInfoChanged(Context context, DisplayController.Info info,
-            int flags) {
-        super.onDisplayInfoChanged(context, info, flags);
-        if ((flags & CHANGE_ACTIVE_SCREEN) != 0) {
-            addTaskbarIfNecessary();
-        }
     }
 
-    private void addTaskbarIfNecessary() {
-        if (mTaskbarController != null) {
-            mTaskbarController.cleanup();
-            if (mTisBinder != null) {
-                mTisBinder.setTaskbarOverviewProxyDelegate(null);
-            }
-            mTaskbarController = null;
-        }
-        if (mDeviceProfile.isTaskbarPresent) {
-            TaskbarView taskbarViewOnHome = (TaskbarView) mHotseat.getTaskbarView();
-            TaskbarActivityContext taskbarActivityContext = new TaskbarActivityContext(this);
-            mTaskbarController = new TaskbarController(this,
-                    taskbarActivityContext.getTaskbarContainerView(), taskbarViewOnHome);
-            mTaskbarController.init();
-            if (mTisBinder != null) {
-                mTisBinder.setTaskbarOverviewProxyDelegate(mTaskbarController);
-            }
-        }
+    public void setTaskbarController(TaskbarController taskbarController) {
+        mTaskbarController = taskbarController;
     }
 
     public <T extends OverviewActionsView> T getActionsView() {
@@ -341,14 +302,9 @@ public abstract class BaseQuickstepLauncher extends Launcher
     }
 
     @Override
-    public boolean isViewInTaskbar(View v) {
-        return mTaskbarController != null && mTaskbarController.isViewInTaskbar(v);
-    }
-
     public boolean supportsAdaptiveIconAnimation(View clickedView) {
         return mAppTransitionManager.hasControlRemoteAppTransitionPermission()
-                && FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM.get()
-                && !isViewInTaskbar(clickedView);
+                && FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM.get();
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 1b8fcb3c67..80754a00f4 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -1252,7 +1252,6 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
 
             final boolean launchingFromWidget = mV instanceof LauncherAppWidgetHostView;
             final boolean launchingFromRecents = isLaunchingFromRecents(mV, appTargets);
-            final boolean launchingFromTaskbar = mLauncher.isViewInTaskbar(mV);
             if (launchingFromWidget) {
                 composeWidgetLaunchAnimator(anim, (LauncherAppWidgetHostView) mV, appTargets,
                         wallpaperTargets, nonAppTargets);
@@ -1263,8 +1262,6 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                         launcherClosing);
                 addCujInstrumentation(
                         anim, InteractionJankMonitorWrapper.CUJ_APP_LAUNCH_FROM_RECENTS);
-            } else if (launchingFromTaskbar) {
-                // TODO
             } else {
                 composeIconLaunchAnimator(anim, mV, appTargets, wallpaperTargets, nonAppTargets,
                         launcherClosing);
diff --git a/quickstep/src/com/android/launcher3/taskbar/ButtonProvider.java b/quickstep/src/com/android/launcher3/taskbar/ButtonProvider.java
index 0d4130d1bc..540f748313 100644
--- a/quickstep/src/com/android/launcher3/taskbar/ButtonProvider.java
+++ b/quickstep/src/com/android/launcher3/taskbar/ButtonProvider.java
@@ -16,12 +16,17 @@
 
 package com.android.launcher3.taskbar;
 
+import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_BACK;
+import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_HOME;
+import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_IME_SWITCH;
+import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_RECENTS;
+
 import android.annotation.DrawableRes;
-import android.content.Context;
 import android.view.View;
 import android.widget.ImageView;
 
 import com.android.launcher3.R;
+import com.android.launcher3.taskbar.TaskbarNavButtonController.TaskbarButton;
 
 /**
  * Creates Buttons for Taskbar for 3 button nav.
@@ -29,47 +34,46 @@ import com.android.launcher3.R;
  */
 public class ButtonProvider {
 
-    private int mMarginLeftRight;
-    private final Context mContext;
+    private final int mMarginLeftRight;
+    private final TaskbarActivityContext mContext;
 
-    public ButtonProvider(Context context) {
+    public ButtonProvider(TaskbarActivityContext context) {
         mContext = context;
-    }
-
-    public void setMarginLeftRight(int margin) {
-        mMarginLeftRight = margin;
+        mMarginLeftRight = context.getResources()
+                .getDimensionPixelSize(R.dimen.taskbar_icon_spacing);
     }
 
     public View getBack() {
         // Back button
-        return getButtonForDrawable(R.drawable.ic_sysbar_back);
+        return getButtonForDrawable(R.drawable.ic_sysbar_back, BUTTON_BACK);
     }
 
     public View getDown() {
         // Ime down button
-        return getButtonForDrawable(R.drawable.ic_sysbar_back);
+        return getButtonForDrawable(R.drawable.ic_sysbar_back, BUTTON_BACK);
     }
 
     public View getHome() {
         // Home button
-        return getButtonForDrawable(R.drawable.ic_sysbar_home);
+        return getButtonForDrawable(R.drawable.ic_sysbar_home, BUTTON_HOME);
     }
 
     public View getRecents() {
         // Recents button
-        return getButtonForDrawable(R.drawable.ic_sysbar_recent);
+        return getButtonForDrawable(R.drawable.ic_sysbar_recent, BUTTON_RECENTS);
     }
 
     public View getImeSwitcher() {
         // IME Switcher Button
-        return getButtonForDrawable(R.drawable.ic_ime_switcher);
+        return getButtonForDrawable(R.drawable.ic_ime_switcher, BUTTON_IME_SWITCH);
     }
 
-    private View getButtonForDrawable(@DrawableRes int drawableId) {
+    private View getButtonForDrawable(@DrawableRes int drawableId, @TaskbarButton int buttonType) {
         ImageView buttonView = new ImageView(mContext);
         buttonView.setImageResource(drawableId);
         buttonView.setBackgroundResource(R.drawable.taskbar_icon_click_feedback_roundrect);
         buttonView.setPadding(mMarginLeftRight, 0, mMarginLeftRight, 0);
+        buttonView.setOnClickListener(view -> mContext.onNavigationButtonClick(buttonType));
         return buttonView;
     }
 
diff --git a/quickstep/src/com/android/launcher3/taskbar/ImeBarView.java b/quickstep/src/com/android/launcher3/taskbar/ImeBarView.java
index bb3669beed..287caab44b 100644
--- a/quickstep/src/com/android/launcher3/taskbar/ImeBarView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/ImeBarView.java
@@ -16,9 +16,6 @@
 
 package com.android.launcher3.taskbar;
 
-import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_BACK;
-import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_IME_SWITCH;
-
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
@@ -29,7 +26,6 @@ import com.android.launcher3.views.ActivityContext;
 public class ImeBarView extends RelativeLayout {
 
     private ButtonProvider mButtonProvider;
-    private TaskbarController.TaskbarViewCallbacks mControllerCallbacks;
     private View mImeView;
 
     public ImeBarView(Context context) {
@@ -44,12 +40,9 @@ public class ImeBarView extends RelativeLayout {
         super(context, attrs, defStyleAttr);
     }
 
-    public void construct(ButtonProvider buttonProvider) {
+    public void init(ButtonProvider buttonProvider) {
         mButtonProvider = buttonProvider;
-    }
 
-    public void init(TaskbarController.TaskbarViewCallbacks taskbarCallbacks) {
-        mControllerCallbacks = taskbarCallbacks;
         ActivityContext context = getActivityContext();
         RelativeLayout.LayoutParams imeParams = new RelativeLayout.LayoutParams(
                 context.getDeviceProfile().iconSizePx,
@@ -64,24 +57,16 @@ public class ImeBarView extends RelativeLayout {
 
         // Down Arrow
         View downView = mButtonProvider.getDown();
-        downView.setOnClickListener(view -> mControllerCallbacks.onNavigationButtonClick(
-                BUTTON_BACK));
         downView.setLayoutParams(downParams);
         downView.setRotation(-90);
         addView(downView);
 
         // IME switcher button
         mImeView = mButtonProvider.getImeSwitcher();
-        mImeView.setOnClickListener(view -> mControllerCallbacks.onNavigationButtonClick(
-                BUTTON_IME_SWITCH));
         mImeView.setLayoutParams(imeParams);
         addView(mImeView);
     }
 
-    public void cleanup() {
-        removeAllViews();
-    }
-
     public void setImeSwitcherVisibility(boolean show) {
         mImeView.setVisibility(show ? VISIBLE : GONE);
     }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
index 3af51d575d..70f278874a 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
@@ -15,56 +15,164 @@
  */
 package com.android.launcher3.taskbar;
 
-import android.content.ContextWrapper;
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
+import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
+
+import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_BOTTOM_TAPPABLE_ELEMENT;
+import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_EXTRA_NAVIGATION_BAR;
+
+import android.app.ActivityOptions;
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.LauncherApps;
+import android.graphics.PixelFormat;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
+import android.os.Process;
+import android.os.SystemProperties;
+import android.util.Log;
+import android.view.ContextThemeWrapper;
+import android.view.Display;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.WindowManager;
+import android.widget.Toast;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.android.launcher3.BaseQuickstepLauncher;
+import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.DragSource;
 import com.android.launcher3.DropTarget;
+import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.R;
 import com.android.launcher3.dragndrop.DragController;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.dragndrop.DragView;
 import com.android.launcher3.dragndrop.DraggableView;
+import com.android.launcher3.folder.Folder;
+import com.android.launcher3.folder.FolderIcon;
+import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.WorkspaceItemInfo;
+import com.android.launcher3.taskbar.TaskbarNavButtonController.TaskbarButton;
+import com.android.launcher3.touch.ItemClickHandler;
+import com.android.launcher3.util.PackageManagerHelper;
+import com.android.launcher3.util.Themes;
+import com.android.launcher3.util.TraceHelper;
 import com.android.launcher3.views.ActivityContext;
-import com.android.launcher3.views.BaseDragLayer;
+import com.android.quickstep.SysUINavigationMode;
+import com.android.quickstep.SysUINavigationMode.Mode;
+import com.android.systemui.shared.recents.model.Task;
+import com.android.systemui.shared.system.ActivityManagerWrapper;
+import com.android.systemui.shared.system.WindowManagerWrapper;
 
 /**
  * The {@link ActivityContext} with which we inflate Taskbar-related Views. This allows UI elements
  * that are used by both Launcher and Taskbar (such as Folder) to reference a generic
  * ActivityContext and BaseDragLayer instead of the Launcher activity and its DragLayer.
  */
-public class TaskbarActivityContext extends ContextWrapper implements ActivityContext {
+public class TaskbarActivityContext extends ContextThemeWrapper implements ActivityContext {
+
+    private static final boolean ENABLE_THREE_BUTTON_TASKBAR =
+            SystemProperties.getBoolean("persist.debug.taskbar_three_button", false);
+    private static final String TAG = "TaskbarActivityContext";
+
+    private static final String WINDOW_TITLE = "Taskbar";
 
     private final DeviceProfile mDeviceProfile;
     private final LayoutInflater mLayoutInflater;
     private final TaskbarContainerView mTaskbarContainerView;
+    private final TaskbarIconController mIconController;
     private final MyDragController mDragController;
 
-    public TaskbarActivityContext(BaseQuickstepLauncher launcher) {
-        super(launcher);
-        mDeviceProfile = launcher.getDeviceProfile().copy(this);
+    private final WindowManager mWindowManager;
+    private WindowManager.LayoutParams mWindowLayoutParams;
+
+    private final SysUINavigationMode.Mode mNavMode;
+    private final TaskbarNavButtonController mNavButtonController;
+
+    private final boolean mIsSafeModeEnabled;
+
+    @NonNull
+    private TaskbarUIController mUIController = TaskbarUIController.DEFAULT;
+
+    private final View.OnClickListener mOnTaskbarIconClickListener;
+    private final View.OnLongClickListener mOnTaskbarIconLongClickListener;
+
+    public TaskbarActivityContext(Context windowContext, DeviceProfile dp,
+            TaskbarNavButtonController buttonController) {
+        super(windowContext, Themes.getActivityThemeRes(windowContext));
+        mDeviceProfile = dp;
+        mNavButtonController = buttonController;
+        mNavMode = SysUINavigationMode.getMode(windowContext);
+        mIsSafeModeEnabled = TraceHelper.allowIpcs("isSafeMode",
+                () -> getPackageManager().isSafeMode());
+
+        mOnTaskbarIconLongClickListener =
+                new TaskbarDragController(this)::startSystemDragOnLongClick;
+        mOnTaskbarIconClickListener = this::onTaskbarIconClicked;
+
         float taskbarIconSize = getResources().getDimension(R.dimen.taskbar_icon_size);
         float iconScale = taskbarIconSize / mDeviceProfile.iconSizePx;
         mDeviceProfile.updateIconSize(iconScale, getResources());
 
         mLayoutInflater = LayoutInflater.from(this).cloneInContext(this);
-
         mTaskbarContainerView = (TaskbarContainerView) mLayoutInflater
                 .inflate(R.layout.taskbar, null, false);
+        mIconController = new TaskbarIconController(this, mTaskbarContainerView);
         mDragController = new MyDragController(this);
+
+        Display display = windowContext.getDisplay();
+        Context c = display.getDisplayId() == Display.DEFAULT_DISPLAY
+                ? windowContext.getApplicationContext()
+                : windowContext.getApplicationContext().createDisplayContext(display);
+        mWindowManager = c.getSystemService(WindowManager.class);
     }
 
-    public TaskbarContainerView getTaskbarContainerView() {
-        return mTaskbarContainerView;
+    public void init() {
+        mWindowLayoutParams = new WindowManager.LayoutParams(
+                MATCH_PARENT,
+                mDeviceProfile.taskbarSize,
+                TYPE_APPLICATION_OVERLAY,
+                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
+                PixelFormat.TRANSLUCENT);
+        mWindowLayoutParams.setTitle(WINDOW_TITLE);
+        mWindowLayoutParams.packageName = getPackageName();
+        mWindowLayoutParams.gravity = Gravity.BOTTOM;
+        mWindowLayoutParams.setFitInsetsTypes(0);
+        mWindowLayoutParams.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING;
+        mWindowLayoutParams.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
+        mWindowLayoutParams.setSystemApplicationOverlay(true);
+
+        WindowManagerWrapper wmWrapper = WindowManagerWrapper.getInstance();
+        wmWrapper.setProvidesInsetsTypes(
+                mWindowLayoutParams,
+                new int[] { ITYPE_EXTRA_NAVIGATION_BAR, ITYPE_BOTTOM_TAPPABLE_ELEMENT }
+        );
+
+        mIconController.init(mOnTaskbarIconClickListener, mOnTaskbarIconLongClickListener);
+        mWindowManager.addView(mTaskbarContainerView, mWindowLayoutParams);
+    }
+
+    /**
+     * Updates the TaskbarContainer height (pass deviceProfile.taskbarSize to reset).
+     */
+    public void setTaskbarWindowHeight(int height) {
+        if (mWindowLayoutParams.height == height) {
+            return;
+        }
+        mWindowLayoutParams.height = height;
+        mWindowManager.updateViewLayout(mTaskbarContainerView, mWindowLayoutParams);
+    }
+
+    public boolean canShowNavButtons() {
+        return ENABLE_THREE_BUTTON_TASKBAR && mNavMode == Mode.THREE_BUTTONS;
     }
 
     @Override
@@ -73,7 +181,7 @@ public class TaskbarActivityContext extends ContextWrapper implements ActivityCo
     }
 
     @Override
-    public BaseDragLayer<TaskbarActivityContext> getDragLayer() {
+    public TaskbarContainerView getDragLayer() {
         return mTaskbarContainerView;
     }
 
@@ -92,6 +200,103 @@ public class TaskbarActivityContext extends ContextWrapper implements ActivityCo
         return mDragController;
     }
 
+    /**
+     * Sets a new data-source for this taskbar instance
+     */
+    public void setUIController(@NonNull TaskbarUIController uiController) {
+        mUIController.onDestroy();
+        mUIController = uiController;
+        mIconController.setUIController(mUIController);
+        mUIController.onCreate();
+    }
+
+    /**
+     * Called when this instance of taskbar is no longer needed
+     */
+    public void onDestroy() {
+        setUIController(TaskbarUIController.DEFAULT);
+        mIconController.onDestroy();
+        mWindowManager.removeViewImmediate(mTaskbarContainerView);
+    }
+
+    void onNavigationButtonClick(@TaskbarButton int buttonType) {
+        mNavButtonController.onButtonClick(buttonType);
+    }
+
+    public TaskbarIconController getIconController() {
+        return mIconController;
+    }
+
+    /**
+     * Updates the TaskbarContainer to MATCH_PARENT vs original Taskbar size.
+     */
+    protected void setTaskbarWindowFullscreen(boolean fullscreen) {
+        setTaskbarWindowHeight(fullscreen ? MATCH_PARENT : getDeviceProfile().taskbarSize);
+    }
+
+    protected void onTaskbarIconClicked(View view) {
+        Object tag = view.getTag();
+        if (tag instanceof Task) {
+            Task task = (Task) tag;
+            ActivityManagerWrapper.getInstance().startActivityFromRecents(task.key,
+                    ActivityOptions.makeBasic());
+        } else if (tag instanceof FolderInfo) {
+            FolderIcon folderIcon = (FolderIcon) view;
+            Folder folder = folderIcon.getFolder();
+            setTaskbarWindowFullscreen(true);
+
+            getDragLayer().post(() -> {
+                folder.animateOpen();
+
+                folder.iterateOverItems((itemInfo, itemView) -> {
+                    itemView.setOnClickListener(mOnTaskbarIconClickListener);
+                    itemView.setOnLongClickListener(mOnTaskbarIconLongClickListener);
+                    // To play haptic when dragging, like other Taskbar items do.
+                    itemView.setHapticFeedbackEnabled(true);
+                    return false;
+                });
+            });
+        } else if (tag instanceof WorkspaceItemInfo) {
+            WorkspaceItemInfo info = (WorkspaceItemInfo) tag;
+            if (info.isDisabled()) {
+                ItemClickHandler.handleDisabledItemClicked(info, this);
+            } else {
+                Intent intent = new Intent(info.getIntent())
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                try {
+                    if (mIsSafeModeEnabled && !PackageManagerHelper.isSystemApp(this, intent)) {
+                        Toast.makeText(this, R.string.safemode_shortcut_error,
+                                Toast.LENGTH_SHORT).show();
+                    } else  if (info.isPromise()) {
+                        intent = new PackageManagerHelper(this)
+                                .getMarketIntent(info.getTargetPackage())
+                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                        startActivity(intent);
+
+                    } else if (info.itemType == Favorites.ITEM_TYPE_DEEP_SHORTCUT) {
+                        String id = info.getDeepShortcutId();
+                        String packageName = intent.getPackage();
+                        getSystemService(LauncherApps.class)
+                                .startShortcut(packageName, id, null, null, info.user);
+                    } else if (info.user.equals(Process.myUserHandle())) {
+                        startActivity(intent);
+                    } else {
+                        getSystemService(LauncherApps.class).startMainActivity(
+                                intent.getComponent(), info.user, intent.getSourceBounds(), null);
+                    }
+                } catch (NullPointerException | ActivityNotFoundException | SecurityException e) {
+                    Toast.makeText(this, R.string.activity_not_found, Toast.LENGTH_SHORT)
+                            .show();
+                    Log.e(TAG, "Unable to launch. tag=" + info + " intent=" + intent, e);
+                }
+            }
+        } else {
+            Log.e(TAG, "Unknown type clicked: " + tag);
+        }
+
+        AbstractFloatingView.closeAllOpenViews(this);
+    }
+
     private static class MyDragController extends DragController<TaskbarActivityContext> {
         MyDragController(TaskbarActivityContext activity) {
             super(activity);
@@ -106,7 +311,8 @@ public class TaskbarActivityContext extends ContextWrapper implements ActivityCo
         }
 
         @Override
-        protected void exitDrag() { }
+        protected void exitDrag() {
+        }
 
         @Override
         protected DropTarget getDefaultDropTarget(int[] dropCoordinates) {
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java
index 29f6935f8a..815efb9728 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java
@@ -21,6 +21,7 @@ import android.animation.Animator;
 
 import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.taskbar.TaskbarController.TaskbarAnimationControllerCallbacks;
 import com.android.quickstep.AnimatedFloat;
 import com.android.quickstep.SystemUiProxy;
 import com.android.systemui.shared.system.QuickStepContract;
@@ -34,7 +35,7 @@ public class TaskbarAnimationController {
     private static final long IME_VISIBILITY_ALPHA_DURATION = 120;
 
     private final BaseQuickstepLauncher mLauncher;
-    private final TaskbarController.TaskbarAnimationControllerCallbacks mTaskbarCallbacks;
+    private final TaskbarAnimationControllerCallbacks mTaskbarCallbacks;
 
     // Background alpha.
     private final AnimatedFloat mTaskbarBackgroundAlpha = new AnimatedFloat(
@@ -55,7 +56,7 @@ public class TaskbarAnimationController {
             this::updateTranslationY);
 
     public TaskbarAnimationController(BaseQuickstepLauncher launcher,
-            TaskbarController.TaskbarAnimationControllerCallbacks taskbarCallbacks) {
+            TaskbarAnimationControllerCallbacks taskbarCallbacks) {
         mLauncher = launcher;
         mTaskbarCallbacks = taskbarCallbacks;
     }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
index 621bba7e85..5034791f0e 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
@@ -15,9 +15,6 @@
  */
 package com.android.launcher3.taskbar;
 
-import static com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo.TOUCHABLE_INSETS_FRAME;
-import static com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo.TOUCHABLE_INSETS_REGION;
-
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Paint;
@@ -32,22 +29,21 @@ import com.android.launcher3.R;
 import com.android.launcher3.util.TouchController;
 import com.android.launcher3.views.BaseDragLayer;
 import com.android.systemui.shared.system.ViewTreeObserverWrapper;
+import com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo;
+import com.android.systemui.shared.system.ViewTreeObserverWrapper.OnComputeInsetsListener;
 
 /**
  * Top-level ViewGroup that hosts the TaskbarView as well as Views created by it such as Folder.
  */
 public class TaskbarContainerView extends BaseDragLayer<TaskbarActivityContext> {
 
-    private final int[] mTempLoc = new int[2];
     private final int mFolderMargin;
     private final Paint mTaskbarBackgroundPaint;
 
-    // Initialized in TaskbarController constructor.
-    private TaskbarController.TaskbarContainerViewCallbacks mControllerCallbacks;
-
-    // Initialized in init.
+    private TaskbarIconController.Callbacks mControllerCallbacks;
     private TaskbarView mTaskbarView;
-    private ViewTreeObserverWrapper.OnComputeInsetsListener mTaskbarInsetsComputer;
+
+    private final OnComputeInsetsListener mTaskbarInsetsComputer = this::onComputeTaskbarInsets;
 
     public TaskbarContainerView(@NonNull Context context) {
         this(context, null);
@@ -68,63 +64,32 @@ public class TaskbarContainerView extends BaseDragLayer<TaskbarActivityContext>
         mFolderMargin = getResources().getDimensionPixelSize(R.dimen.taskbar_folder_margin);
         mTaskbarBackgroundPaint = new Paint();
         mTaskbarBackgroundPaint.setColor(getResources().getColor(R.color.taskbar_background));
+        recreateControllers();
     }
 
-    protected void construct(TaskbarController.TaskbarContainerViewCallbacks callbacks) {
-        mControllerCallbacks = callbacks;
+    @Override
+    public void recreateControllers() {
+        mControllers = new TouchController[0];
     }
 
-    protected void init(TaskbarView taskbarView) {
+    public void init(TaskbarIconController.Callbacks callbacks, TaskbarView taskbarView) {
+        mControllerCallbacks = callbacks;
         mTaskbarView = taskbarView;
-        mTaskbarInsetsComputer = createTaskbarInsetsComputer();
-        recreateControllers();
     }
 
-    @Override
-    public void recreateControllers() {
-        mControllers = new TouchController[0];
+    private void onComputeTaskbarInsets(InsetsInfo insetsInfo) {
+        if (mControllerCallbacks != null) {
+            mControllerCallbacks.updateInsetsTouchability(insetsInfo);
+        }
     }
 
-    private ViewTreeObserverWrapper.OnComputeInsetsListener createTaskbarInsetsComputer() {
-        return insetsInfo -> {
-            if (mControllerCallbacks.isTaskbarTouchable()) {
-                 // Accept touches anywhere in our bounds.
-                insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_FRAME);
-            } else {
-                // Let touches pass through us.
-                insetsInfo.touchableRegion.setEmpty();
-                insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION);
-            }
-
-            // TaskbarContainerView provides insets to other apps based on contentInsets. These
-            // insets should stay consistent even if we expand TaskbarContainerView's bounds, e.g.
-            // to show a floating view like Folder. Thus, we set the contentInsets to be where
-            // mTaskbarView is, since its position never changes and insets rather than overlays.
-            int[] loc = mTempLoc;
-            float scale = mTaskbarView.getScaleX();
-            float translationY = mTaskbarView.getTranslationY();
-            mTaskbarView.setScaleX(1);
-            mTaskbarView.setScaleY(1);
-            mTaskbarView.setTranslationY(0);
-            mTaskbarView.getLocationInWindow(loc);
-            mTaskbarView.setScaleX(scale);
-            mTaskbarView.setScaleY(scale);
-            mTaskbarView.setTranslationY(translationY);
-            insetsInfo.contentInsets.left = loc[0];
-            insetsInfo.contentInsets.top = loc[1];
-            insetsInfo.contentInsets.right = getWidth() - (loc[0] + mTaskbarView.getWidth());
-            insetsInfo.contentInsets.bottom = getHeight() - (loc[1] + mTaskbarView.getHeight());
-        };
-    }
-
-    protected void cleanup() {
+    protected void onDestroy() {
         ViewTreeObserverWrapper.removeOnComputeInsetsListener(mTaskbarInsetsComputer);
     }
 
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
-
         ViewTreeObserverWrapper.addOnComputeInsetsListener(getViewTreeObserver(),
                 mTaskbarInsetsComputer);
     }
@@ -133,7 +98,7 @@ public class TaskbarContainerView extends BaseDragLayer<TaskbarActivityContext>
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
 
-        cleanup();
+        onDestroy();
     }
 
     @Override
@@ -143,10 +108,25 @@ public class TaskbarContainerView extends BaseDragLayer<TaskbarActivityContext>
         return true;
     }
 
+    public void updateImeBarVisibilityAlpha(float alpha) {
+        if (mControllerCallbacks != null) {
+            mControllerCallbacks.updateImeBarVisibilityAlpha(alpha);
+        }
+    }
+
     @Override
     public void onViewRemoved(View child) {
         super.onViewRemoved(child);
-        mControllerCallbacks.onViewRemoved();
+        if (mControllerCallbacks != null) {
+            mControllerCallbacks.onContainerViewRemoved();
+        }
+    }
+
+    @Override
+    protected void dispatchDraw(Canvas canvas) {
+        canvas.drawRect(0, canvas.getHeight() - mTaskbarView.getHeight(), canvas.getWidth(),
+                canvas.getHeight(), mTaskbarBackgroundPaint);
+        super.dispatchDraw(canvas);
     }
 
     /**
@@ -158,16 +138,6 @@ public class TaskbarContainerView extends BaseDragLayer<TaskbarActivityContext>
         return boundingBox;
     }
 
-    protected TaskbarActivityContext getTaskbarActivityContext() {
-        return mActivity;
-    }
-
-    @Override
-    protected void dispatchDraw(Canvas canvas) {
-        canvas.drawRect(0, canvas.getHeight() - mTaskbarView.getHeight(), canvas.getWidth(),
-                canvas.getHeight(), mTaskbarBackgroundPaint);
-        super.dispatchDraw(canvas);
-    }
 
     /**
      * Sets the alpha of the background color behind all the Taskbar contents.
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index 6084e10d85..cdae5beb9a 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -15,105 +15,83 @@
  */
 package com.android.launcher3.taskbar;
 
-import static android.view.View.GONE;
-import static android.view.View.INVISIBLE;
-import static android.view.View.VISIBLE;
-import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
-import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
-import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
-
-import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_BOTTOM_TAPPABLE_ELEMENT;
-import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_EXTRA_NAVIGATION_BAR;
-
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
-import android.app.ActivityOptions;
-import android.graphics.PixelFormat;
-import android.graphics.Point;
 import android.graphics.Rect;
-import android.inputmethodservice.InputMethodService;
-import android.view.Gravity;
+import android.graphics.RectF;
 import android.view.MotionEvent;
-import android.view.View;
-import android.view.WindowManager;
 
 import androidx.annotation.Nullable;
 
-import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.QuickstepTransitionManager;
 import com.android.launcher3.R;
-import com.android.launcher3.anim.AlphaUpdateListener;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.PendingAnimation;
-import com.android.launcher3.folder.Folder;
-import com.android.launcher3.folder.FolderIcon;
-import com.android.launcher3.model.data.FolderInfo;
-import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.states.StateAnimationConfig;
-import com.android.launcher3.taskbar.TaskbarNavButtonController.TaskbarButton;
-import com.android.launcher3.touch.ItemClickHandler;
-import com.android.launcher3.views.ActivityContext;
-import com.android.quickstep.AnimatedFloat;
-import com.android.quickstep.SysUINavigationMode;
-import com.android.quickstep.TouchInteractionService.TaskbarOverviewProxyDelegate;
-import com.android.systemui.shared.recents.model.Task;
-import com.android.systemui.shared.system.ActivityManagerWrapper;
-import com.android.systemui.shared.system.WindowManagerWrapper;
+
 
 /**
- * Interfaces with Launcher/WindowManager/SystemUI to determine what to show in TaskbarView.
+ * A data source which integrates with a Launcher instance
+ * TODO: Rename to have Launcher prefix
  */
-public class TaskbarController implements TaskbarOverviewProxyDelegate {
 
-    private static final String WINDOW_TITLE = "Taskbar";
-
-    private final TaskbarContainerView mTaskbarContainerView;
-    private final TaskbarView mTaskbarViewInApp;
-    private final TaskbarView mTaskbarViewOnHome;
-    private final ImeBarView mImeBarView;
+public class TaskbarController extends TaskbarUIController {
 
     private final BaseQuickstepLauncher mLauncher;
-    private final WindowManager mWindowManager;
-    // Layout width and height of the Taskbar in the default state.
-    private final Point mTaskbarSize;
     private final TaskbarStateHandler mTaskbarStateHandler;
     private final TaskbarAnimationController mTaskbarAnimationController;
     private final TaskbarHotseatController mHotseatController;
-    private final TaskbarDragController mDragController;
-    private final TaskbarNavButtonController mNavButtonController;
 
-    // Initialized in init().
-    private WindowManager.LayoutParams mWindowLayoutParams;
-    private SysUINavigationMode.Mode mNavMode = SysUINavigationMode.Mode.NO_BUTTON;
-    private final SysUINavigationMode.NavigationModeChangeListener mNavigationModeChangeListener =
-            this::onNavModeChanged;
+    private final TaskbarActivityContext mContext;
+    final TaskbarContainerView mTaskbarContainerView;
+    final TaskbarView mTaskbarView;
 
     private @Nullable Animator mAnimator;
     private boolean mIsAnimatingToLauncher;
 
-    public TaskbarController(BaseQuickstepLauncher launcher,
-            TaskbarContainerView taskbarContainerView, TaskbarView taskbarViewOnHome) {
+    public TaskbarController(BaseQuickstepLauncher launcher, TaskbarActivityContext context) {
+        mContext = context;
+        mTaskbarContainerView = context.getDragLayer();
+        mTaskbarView = mTaskbarContainerView.findViewById(R.id.taskbar_view);
+
         mLauncher = launcher;
-        mTaskbarContainerView = taskbarContainerView;
-        mTaskbarContainerView.construct(createTaskbarContainerViewCallbacks());
-        ButtonProvider buttonProvider = new ButtonProvider(launcher);
-        mTaskbarViewInApp = mTaskbarContainerView.findViewById(R.id.taskbar_view);
-        mTaskbarViewInApp.construct(createTaskbarViewCallbacks(), buttonProvider);
-        mTaskbarViewOnHome = taskbarViewOnHome;
-        mTaskbarViewOnHome.construct(createTaskbarViewCallbacks(), buttonProvider);
-        mImeBarView = mTaskbarContainerView.findViewById(R.id.ime_bar_view);
-        mImeBarView.construct(buttonProvider);
-        mNavButtonController = new TaskbarNavButtonController(launcher);
-        mWindowManager = mLauncher.getWindowManager();
-        mTaskbarSize = new Point(MATCH_PARENT, mLauncher.getDeviceProfile().taskbarSize);
         mTaskbarStateHandler = mLauncher.getTaskbarStateHandler();
         mTaskbarAnimationController = new TaskbarAnimationController(mLauncher,
                 createTaskbarAnimationControllerCallbacks());
-        mHotseatController = new TaskbarHotseatController(mLauncher,
-                createTaskbarHotseatControllerCallbacks());
-        mDragController = new TaskbarDragController(mLauncher);
+        mHotseatController = new TaskbarHotseatController(
+                mLauncher, mTaskbarView::updateHotseatItems);
+    }
+
+    @Override
+    protected void onCreate() {
+        mTaskbarStateHandler.setAnimationController(mTaskbarAnimationController);
+        mTaskbarAnimationController.init();
+        mHotseatController.init();
+        setTaskbarViewVisible(!mLauncher.hasBeenResumed());
+        alignRealHotseatWithTaskbar();
+        mLauncher.setTaskbarController(this);
+    }
+
+    @Override
+    protected void onDestroy() {
+        if (mAnimator != null) {
+            // End this first, in case it relies on properties that are about to be cleaned up.
+            mAnimator.end();
+        }
+        mTaskbarStateHandler.setAnimationController(null);
+        mTaskbarAnimationController.cleanup();
+        mHotseatController.cleanup();
+        setTaskbarViewVisible(true);
+        mLauncher.getHotseat().setIconsAlpha(1f);
+        mLauncher.setTaskbarController(null);
+    }
+
+    @Override
+    protected boolean isTaskbarTouchable() {
+        return !mIsAnimatingToLauncher;
     }
 
     private TaskbarAnimationControllerCallbacks createTaskbarAnimationControllerCallbacks() {
@@ -125,245 +103,34 @@ public class TaskbarController implements TaskbarOverviewProxyDelegate {
 
             @Override
             public void updateTaskbarVisibilityAlpha(float alpha) {
-                mTaskbarViewInApp.setAlpha(alpha);
-                mTaskbarViewOnHome.setAlpha(alpha);
+                mTaskbarView.setAlpha(alpha);
             }
 
             @Override
             public void updateImeBarVisibilityAlpha(float alpha) {
-                if (mNavMode != SysUINavigationMode.Mode.THREE_BUTTONS) {
-                    // TODO Remove sysui IME bar for gesture nav as well
-                    return;
-                }
-                mImeBarView.setAlpha(alpha);
-                mImeBarView.setVisibility(alpha == 0 ? GONE : VISIBLE);
+                mTaskbarContainerView.updateImeBarVisibilityAlpha(alpha);
             }
 
             @Override
             public void updateTaskbarScale(float scale) {
-                mTaskbarViewInApp.setScaleX(scale);
-                mTaskbarViewInApp.setScaleY(scale);
+                mTaskbarView.setScaleX(scale);
+                mTaskbarView.setScaleY(scale);
             }
 
             @Override
             public void updateTaskbarTranslationY(float translationY) {
                 if (translationY < 0) {
                     // Resize to accommodate the max translation we'll reach.
-                    setTaskbarWindowHeight(mTaskbarSize.y
+                    mContext.setTaskbarWindowHeight(mContext.getDeviceProfile().taskbarSize
                             + mLauncher.getHotseat().getTaskbarOffsetY());
                 } else {
-                    setTaskbarWindowHeight(mTaskbarSize.y);
-                }
-                mTaskbarViewInApp.setTranslationY(translationY);
-            }
-        };
-    }
-
-    private TaskbarContainerViewCallbacks createTaskbarContainerViewCallbacks() {
-        return new TaskbarContainerViewCallbacks() {
-            @Override
-            public void onViewRemoved() {
-                // Ensure no other children present (like Folders, etc)
-                for (int i = 0; i < mTaskbarContainerView.getChildCount(); i++) {
-                    View v = mTaskbarContainerView.getChildAt(i);
-                    if (!((v instanceof TaskbarView) || (v instanceof ImeBarView))){
-                        return;
-                    }
+                    mContext.setTaskbarWindowHeight(mContext.getDeviceProfile().taskbarSize);
                 }
-                setTaskbarWindowFullscreen(false);
-            }
-
-            @Override
-            public boolean isTaskbarTouchable() {
-                return mTaskbarContainerView.getAlpha() > AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD
-                        && (mTaskbarViewInApp.getVisibility() == VISIBLE
-                            || mImeBarView.getVisibility() == VISIBLE)
-                        && !mIsAnimatingToLauncher;
-            }
-        };
-    }
-
-    private TaskbarViewCallbacks createTaskbarViewCallbacks() {
-        return new TaskbarViewCallbacks() {
-            @Override
-            public View.OnClickListener getItemOnClickListener() {
-                return view -> {
-                    Object tag = view.getTag();
-                    if (tag instanceof Task) {
-                        Task task = (Task) tag;
-                        ActivityManagerWrapper.getInstance().startActivityFromRecents(task.key,
-                                ActivityOptions.makeBasic());
-                    } else if (tag instanceof FolderInfo) {
-                        FolderIcon folderIcon = (FolderIcon) view;
-                        Folder folder = folderIcon.getFolder();
-
-                        setTaskbarWindowFullscreen(true);
-
-                        mTaskbarContainerView.post(() -> {
-                            folder.animateOpen();
-
-                            folder.iterateOverItems((itemInfo, itemView) -> {
-                                itemView.setOnClickListener(getItemOnClickListener());
-                                itemView.setOnLongClickListener(getItemOnLongClickListener());
-                                // To play haptic when dragging, like other Taskbar items do.
-                                itemView.setHapticFeedbackEnabled(true);
-                                return false;
-                            });
-                        });
-                    } else {
-                        ItemClickHandler.INSTANCE.onClick(view);
-                    }
-
-                    AbstractFloatingView.closeAllOpenViews(
-                            mTaskbarContainerView.getTaskbarActivityContext());
-                };
-            }
-
-            @Override
-            public View.OnLongClickListener getItemOnLongClickListener() {
-                return mDragController::startSystemDragOnLongClick;
-            }
-
-            @Override
-            public int getEmptyHotseatViewVisibility(TaskbarView taskbarView) {
-                // When on the home screen, we want the empty hotseat views to take up their full
-                // space so that the others line up with the home screen hotseat.
-                boolean isOnHomeScreen = taskbarView == mTaskbarViewOnHome
-                        || mLauncher.hasBeenResumed() || mIsAnimatingToLauncher;
-                return isOnHomeScreen ? INVISIBLE : GONE;
-            }
-
-            @Override
-            public float getNonIconScale(TaskbarView taskbarView) {
-                return taskbarView == mTaskbarViewOnHome ? getTaskbarScaleOnHome() : 1f;
-            }
-
-            @Override
-            public void onItemPositionsChanged(TaskbarView taskbarView) {
-                if (taskbarView == mTaskbarViewOnHome) {
-                    alignRealHotseatWithTaskbar();
-                }
-            }
-
-            @Override
-            public void onNavigationButtonClick(@TaskbarButton int buttonType) {
-                mNavButtonController.onButtonClick(buttonType);
-            }
-        };
-    }
-
-    private TaskbarHotseatControllerCallbacks createTaskbarHotseatControllerCallbacks() {
-        return new TaskbarHotseatControllerCallbacks() {
-            @Override
-            public void updateHotseatItems(ItemInfo[] hotseatItemInfos) {
-                mTaskbarViewInApp.updateHotseatItems(hotseatItemInfos);
+                mTaskbarView.setTranslationY(translationY);
             }
         };
     }
 
-    /**
-     * Initializes the Taskbar, including adding it to the screen.
-     */
-    public void init() {
-        mNavMode = SysUINavigationMode.INSTANCE.get(mLauncher)
-                .addModeChangeListener(mNavigationModeChangeListener);
-        mTaskbarViewInApp.init(mHotseatController.getNumHotseatIcons(), mNavMode);
-        mTaskbarViewOnHome.init(mHotseatController.getNumHotseatIcons(), mNavMode);
-        mTaskbarContainerView.init(mTaskbarViewInApp);
-        mImeBarView.init(createTaskbarViewCallbacks());
-        addToWindowManager();
-        mTaskbarStateHandler.setTaskbarCallbacks(createTaskbarStateHandlerCallbacks());
-        mTaskbarAnimationController.init();
-        mHotseatController.init();
-
-        setWhichTaskbarViewIsVisible(mLauncher.hasBeenResumed()
-                ? mTaskbarViewOnHome
-                : mTaskbarViewInApp);
-    }
-
-    private TaskbarStateHandlerCallbacks createTaskbarStateHandlerCallbacks() {
-        return new TaskbarStateHandlerCallbacks() {
-            @Override
-            public AnimatedFloat getAlphaTarget() {
-                return mTaskbarAnimationController.getTaskbarVisibilityForLauncherState();
-            }
-
-            @Override
-            public AnimatedFloat getScaleTarget() {
-                return mTaskbarAnimationController.getTaskbarScaleForLauncherState();
-            }
-
-            @Override
-            public AnimatedFloat getTranslationYTarget() {
-                return mTaskbarAnimationController.getTaskbarTranslationYForLauncherState();
-            }
-        };
-    }
-
-    /**
-     * Removes the Taskbar from the screen, and removes any obsolete listeners etc.
-     */
-    public void cleanup() {
-        if (mAnimator != null) {
-            // End this first, in case it relies on properties that are about to be cleaned up.
-            mAnimator.end();
-        }
-
-        mTaskbarViewInApp.cleanup();
-        mTaskbarViewOnHome.cleanup();
-        mTaskbarContainerView.cleanup();
-        mImeBarView.cleanup();
-        removeFromWindowManager();
-        mTaskbarStateHandler.setTaskbarCallbacks(null);
-        mTaskbarAnimationController.cleanup();
-        mHotseatController.cleanup();
-
-        setWhichTaskbarViewIsVisible(null);
-        SysUINavigationMode.INSTANCE.get(mLauncher)
-                .removeModeChangeListener(mNavigationModeChangeListener);
-    }
-
-    private void removeFromWindowManager() {
-        mWindowManager.removeViewImmediate(mTaskbarContainerView);
-    }
-
-    private void addToWindowManager() {
-        final int gravity = Gravity.BOTTOM;
-
-        mWindowLayoutParams = new WindowManager.LayoutParams(
-                mTaskbarSize.x,
-                mTaskbarSize.y,
-                TYPE_APPLICATION_OVERLAY,
-                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
-                PixelFormat.TRANSLUCENT);
-        mWindowLayoutParams.setTitle(WINDOW_TITLE);
-        mWindowLayoutParams.packageName = mLauncher.getPackageName();
-        mWindowLayoutParams.gravity = gravity;
-        mWindowLayoutParams.setFitInsetsTypes(0);
-        mWindowLayoutParams.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING;
-        mWindowLayoutParams.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
-        mWindowLayoutParams.setSystemApplicationOverlay(true);
-
-        WindowManagerWrapper wmWrapper = WindowManagerWrapper.getInstance();
-        wmWrapper.setProvidesInsetsTypes(
-                mWindowLayoutParams,
-                new int[] { ITYPE_EXTRA_NAVIGATION_BAR, ITYPE_BOTTOM_TAPPABLE_ELEMENT }
-        );
-
-        TaskbarContainerView.LayoutParams taskbarLayoutParams =
-                new TaskbarContainerView.LayoutParams(mTaskbarSize.x, mTaskbarSize.y);
-        taskbarLayoutParams.gravity = gravity;
-        mTaskbarViewInApp.setLayoutParams(taskbarLayoutParams);
-
-        mWindowManager.addView(mTaskbarContainerView, mWindowLayoutParams);
-    }
-
-    private void onNavModeChanged(SysUINavigationMode.Mode newMode) {
-        mNavMode = newMode;
-        cleanup();
-        init();
-    }
-
     /**
      * Should be called from onResume() and onPause(), and animates the Taskbar accordingly.
      */
@@ -401,13 +168,14 @@ public class TaskbarController implements TaskbarOverviewProxyDelegate {
             @Override
             public void onAnimationStart(Animator animation) {
                 mIsAnimatingToLauncher = true;
-                mTaskbarViewInApp.updateHotseatItemsVisibility();
+                mTaskbarView.setHolesAllowedInLayout(true);
+                mTaskbarView.updateHotseatItemsVisibility();
             }
 
             @Override
             public void onAnimationEnd(Animator animation) {
                 mIsAnimatingToLauncher = false;
-                setWhichTaskbarViewIsVisible(mTaskbarViewOnHome);
+                setTaskbarViewVisible(false);
             }
         });
 
@@ -420,44 +188,21 @@ public class TaskbarController implements TaskbarOverviewProxyDelegate {
         anim.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationStart(Animator animation) {
-                mTaskbarViewInApp.updateHotseatItemsVisibility();
-                setWhichTaskbarViewIsVisible(mTaskbarViewInApp);
+                mTaskbarView.updateHotseatItemsVisibility();
+                setTaskbarViewVisible(true);
             }
 
             @Override
             public void onAnimationEnd(Animator animation) {
+                mTaskbarView.setHolesAllowedInLayout(false);
             }
         });
         return anim.buildAnim();
     }
 
-    /**
-     * Should be called when the IME visibility changes, so we can hide/show Taskbar accordingly.
-     */
-    public void setIsImeVisible(boolean isImeVisible) {
-        mTaskbarAnimationController.animateToVisibilityForIme(isImeVisible ? 0 : 1);
-        blockTaskbarTouchesForIme(isImeVisible);
-    }
-
-    /**
-     * When in 3 button nav, the above doesn't get called since we prevent sysui nav bar from
-     * instantiating at all, which is what's responsible for sending sysui state flags over.
-     *
-     * @param vis IME visibility flag
-     * @param backDisposition Used to determine back button behavior for software keyboard
-     *                        See BACK_DISPOSITION_* constants in {@link InputMethodService}
-     */
-    public void updateImeStatus(int displayId, int vis, int backDisposition,
-            boolean showImeSwitcher) {
-        if (displayId != mTaskbarContainerView.getContext().getDisplayId() ||
-                mNavMode != SysUINavigationMode.Mode.THREE_BUTTONS) {
-            return;
-        }
-
-        boolean imeVisible = (vis & InputMethodService.IME_VISIBLE) != 0;
-        mTaskbarAnimationController.animateToVisibilityForIme(imeVisible ? 0 : 1);
-        mImeBarView.setImeSwitcherVisibility(showImeSwitcher);
-        blockTaskbarTouchesForIme(imeVisible);
+    @Override
+    protected void onImeVisible(TaskbarContainerView containerView, boolean isVisible) {
+        mTaskbarAnimationController.animateToVisibilityForIme(isVisible ? 0 : 1);
     }
 
     /**
@@ -472,24 +217,17 @@ public class TaskbarController implements TaskbarOverviewProxyDelegate {
      * @return Whether any Taskbar item could handle the given MotionEvent if given the chance.
      */
     public boolean isEventOverAnyTaskbarItem(MotionEvent ev) {
-        return mTaskbarViewInApp.isEventOverAnyItem(ev);
+        return mTaskbarView.isEventOverAnyItem(ev);
     }
 
     public boolean isDraggingItem() {
-        return mTaskbarViewInApp.isDraggingItem() || mTaskbarViewOnHome.isDraggingItem();
-    }
-
-    /**
-     * @return Whether the given View is in the same window as Taskbar.
-     */
-    public boolean isViewInTaskbar(View v) {
-        return mTaskbarContainerView.isAttachedToWindow()
-                && mTaskbarContainerView.getWindowId().equals(v.getWindowId());
+        return mTaskbarView.isDraggingItem();
     }
 
     /**
      * Pads the Hotseat to line up exactly with Taskbar's copy of the Hotseat.
      */
+    @Override
     public void alignRealHotseatWithTaskbar() {
         Rect hotseatBounds = new Rect();
         DeviceProfile grid = mLauncher.getDeviceProfile();
@@ -498,60 +236,28 @@ public class TaskbarController implements TaskbarOverviewProxyDelegate {
         int hotseatTopDiff = hotseatHeight - grid.taskbarSize - taskbarOffset;
         int hotseatBottomDiff = taskbarOffset;
 
-        mTaskbarViewOnHome.getHotseatBounds().roundOut(hotseatBounds);
+        RectF hotseatBoundsF = mTaskbarView.getHotseatBounds();
+        Utilities.scaleRectFAboutPivot(hotseatBoundsF, getTaskbarScaleOnHome(),
+                mTaskbarView.getPivotX(), mTaskbarView.getPivotY());
+        hotseatBoundsF.round(hotseatBounds);
         mLauncher.getHotseat().setPadding(hotseatBounds.left,
                 hotseatBounds.top + hotseatTopDiff,
-                mTaskbarViewOnHome.getWidth() - hotseatBounds.right,
-                mTaskbarViewOnHome.getHeight() - hotseatBounds.bottom + hotseatBottomDiff);
-    }
-
-    private void setWhichTaskbarViewIsVisible(@Nullable TaskbarView visibleTaskbar) {
-        mTaskbarViewInApp.setVisibility(visibleTaskbar == mTaskbarViewInApp
-                ? VISIBLE : INVISIBLE);
-        mTaskbarViewOnHome.setVisibility(visibleTaskbar == mTaskbarViewOnHome
-                ? VISIBLE : INVISIBLE);
-        mLauncher.getHotseat().setIconsAlpha(visibleTaskbar != mTaskbarViewInApp ? 1f : 0f);
-    }
-
-    private void blockTaskbarTouchesForIme(boolean block) {
-        mTaskbarViewOnHome.setTouchesEnabled(!block);
-        mTaskbarViewInApp.setTouchesEnabled(!block);
+                mTaskbarView.getWidth() - hotseatBounds.right,
+                mTaskbarView.getHeight() - hotseatBounds.bottom + hotseatBottomDiff);
     }
 
     /**
      * Returns the ratio of the taskbar icon size on home vs in an app.
      */
     public float getTaskbarScaleOnHome() {
-        DeviceProfile inAppDp = mTaskbarContainerView.getTaskbarActivityContext()
-                .getDeviceProfile();
-        DeviceProfile onHomeDp = ActivityContext.lookupContext(mTaskbarViewOnHome.getContext())
-                .getDeviceProfile();
+        DeviceProfile inAppDp = mContext.getDeviceProfile();
+        DeviceProfile onHomeDp = mLauncher.getDeviceProfile();
         return (float) onHomeDp.cellWidthPx / inAppDp.cellWidthPx;
     }
 
-    /**
-     * Updates the TaskbarContainer to MATCH_PARENT vs original Taskbar size.
-     */
-    private void setTaskbarWindowFullscreen(boolean fullscreen) {
-        setTaskbarWindowHeight(fullscreen ? MATCH_PARENT : mTaskbarSize.y);
-    }
-
-    /**
-     * Updates the TaskbarContainer height (pass mTaskbarSize.y to reset).
-     */
-    private void setTaskbarWindowHeight(int height) {
-        mWindowLayoutParams.width = mTaskbarSize.x;
-        mWindowLayoutParams.height = height;
-        mWindowManager.updateViewLayout(mTaskbarContainerView, mWindowLayoutParams);
-    }
-
-    /**
-     * Contains methods that TaskbarStateHandler can call to interface with TaskbarController.
-     */
-    protected interface TaskbarStateHandlerCallbacks {
-        AnimatedFloat getAlphaTarget();
-        AnimatedFloat getScaleTarget();
-        AnimatedFloat getTranslationYTarget();
+    void setTaskbarViewVisible(boolean isVisible) {
+        mTaskbarView.setIconsVisibility(isVisible);
+        mLauncher.getHotseat().setIconsAlpha(isVisible ? 0f : 1f);
     }
 
     /**
@@ -565,32 +271,4 @@ public class TaskbarController implements TaskbarOverviewProxyDelegate {
         void updateTaskbarScale(float scale);
         void updateTaskbarTranslationY(float translationY);
     }
-
-    /**
-     * Contains methods that TaskbarContainerView can call to interface with TaskbarController.
-     */
-    protected interface TaskbarContainerViewCallbacks {
-        void onViewRemoved();
-        boolean isTaskbarTouchable();
-    }
-
-    /**
-     * Contains methods that TaskbarView can call to interface with TaskbarController.
-     */
-    protected interface TaskbarViewCallbacks {
-        View.OnClickListener getItemOnClickListener();
-        View.OnLongClickListener getItemOnLongClickListener();
-        int getEmptyHotseatViewVisibility(TaskbarView taskbarView);
-        /** Returns how much to scale non-icon elements such as spacing and dividers. */
-        float getNonIconScale(TaskbarView taskbarView);
-        void onItemPositionsChanged(TaskbarView taskbarView);
-        void onNavigationButtonClick(@TaskbarButton int buttonType);
-    }
-
-    /**
-     * Contains methods that TaskbarHotseatController can call to interface with TaskbarController.
-     */
-    protected interface TaskbarHotseatControllerCallbacks {
-        void updateHotseatItems(ItemInfo[] hotseatItemInfos);
-    }
 }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
index 5eb34cb360..ee44927ce4 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
@@ -20,6 +20,7 @@ import static android.view.View.VISIBLE;
 
 import android.content.ClipData;
 import android.content.ClipDescription;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.LauncherApps;
 import android.content.res.Resources;
@@ -29,7 +30,6 @@ import android.os.UserHandle;
 import android.view.DragEvent;
 import android.view.View;
 
-import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.R;
@@ -43,12 +43,12 @@ import com.android.systemui.shared.system.LauncherAppsCompat;
  */
 public class TaskbarDragController {
 
-    private final BaseQuickstepLauncher mLauncher;
+    private final Context mContext;
     private final int mDragIconSize;
 
-    public TaskbarDragController(BaseQuickstepLauncher launcher) {
-        mLauncher = launcher;
-        Resources resources = mLauncher.getResources();
+    public TaskbarDragController(Context context) {
+        mContext = context;
+        Resources resources = mContext.getResources();
         mDragIconSize = resources.getDimensionPixelSize(R.dimen.taskbar_icon_drag_icon_size);
     }
 
@@ -63,7 +63,6 @@ public class TaskbarDragController {
         }
 
         BubbleTextView btv = (BubbleTextView) view;
-
         View.DragShadowBuilder shadowBuilder = new View.DragShadowBuilder(view) {
             @Override
             public void onProvideShadowMetrics(Point shadowSize, Point shadowTouchPoint) {
@@ -87,7 +86,7 @@ public class TaskbarDragController {
         Intent intent = null;
         if (tag instanceof WorkspaceItemInfo) {
             WorkspaceItemInfo item = (WorkspaceItemInfo) tag;
-            LauncherApps launcherApps = mLauncher.getSystemService(LauncherApps.class);
+            LauncherApps launcherApps = mContext.getSystemService(LauncherApps.class);
             clipDescription = new ClipDescription(item.title,
                     new String[] {
                             item.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java
index 68829cd0fb..91cf7efab5 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java
@@ -26,6 +26,8 @@ import com.android.launcher3.dragndrop.DragController;
 import com.android.launcher3.dragndrop.DragOptions;
 import com.android.launcher3.model.data.ItemInfo;
 
+import java.util.function.Consumer;
+
 /**
  * Works with TaskbarController to update the TaskbarView's Hotseat items.
  */
@@ -33,13 +35,12 @@ public class TaskbarHotseatController {
 
     private final BaseQuickstepLauncher mLauncher;
     private final Hotseat mHotseat;
-    private final TaskbarController.TaskbarHotseatControllerCallbacks mTaskbarCallbacks;
+    private final Consumer<ItemInfo[]> mTaskbarCallbacks;
     private final int mNumHotseatIcons;
 
     private final DragController.DragListener mDragListener = new DragController.DragListener() {
         @Override
-        public void onDragStart(DropTarget.DragObject dragObject, DragOptions options) {
-        }
+        public void onDragStart(DropTarget.DragObject dragObject, DragOptions options) { }
 
         @Override
         public void onDragEnd() {
@@ -47,8 +48,8 @@ public class TaskbarHotseatController {
         }
     };
 
-    public TaskbarHotseatController(BaseQuickstepLauncher launcher,
-            TaskbarController.TaskbarHotseatControllerCallbacks taskbarCallbacks) {
+    public TaskbarHotseatController(
+            BaseQuickstepLauncher launcher, Consumer<ItemInfo[]> taskbarCallbacks) {
         mLauncher = launcher;
         mHotseat = mLauncher.getHotseat();
         mTaskbarCallbacks = taskbarCallbacks;
@@ -85,10 +86,6 @@ public class TaskbarHotseatController {
             }
         }
 
-        mTaskbarCallbacks.updateHotseatItems(hotseatItemInfos);
-    }
-
-    protected int getNumHotseatIcons() {
-        return mNumHotseatIcons;
+        mTaskbarCallbacks.accept(hotseatItemInfos);
     }
 }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarIconController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarIconController.java
new file mode 100644
index 0000000000..2a37915fcf
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarIconController.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.taskbar;
+
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
+
+import static com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo.TOUCHABLE_INSETS_FRAME;
+import static com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo.TOUCHABLE_INSETS_REGION;
+
+import android.graphics.Rect;
+import android.inputmethodservice.InputMethodService;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.View.OnLongClickListener;
+
+import androidx.annotation.NonNull;
+
+import com.android.launcher3.R;
+import com.android.launcher3.anim.AlphaUpdateListener;
+import com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo;
+
+/**
+ * Controller for taskbar icon UI
+ */
+public class TaskbarIconController {
+
+    private final Rect mTempRect = new Rect();
+
+    private final TaskbarActivityContext mActivity;
+    private final TaskbarContainerView mContainerView;
+
+    private final TaskbarView mTaskbarView;
+    private final ImeBarView mImeBarView;
+
+    @NonNull
+    private TaskbarUIController mUIController = TaskbarUIController.DEFAULT;
+
+    TaskbarIconController(TaskbarActivityContext activity, TaskbarContainerView containerView) {
+        mActivity = activity;
+        mContainerView = containerView;
+        mTaskbarView = mContainerView.findViewById(R.id.taskbar_view);
+        mImeBarView = mContainerView.findViewById(R.id.ime_bar_view);
+    }
+
+    public void init(OnClickListener clickListener, OnLongClickListener longClickListener) {
+        mContainerView.addOnLayoutChangeListener((v, a, b, c, d, e, f, g, h) ->
+                mUIController.alignRealHotseatWithTaskbar());
+
+        ButtonProvider buttonProvider = new ButtonProvider(mActivity);
+        mImeBarView.init(buttonProvider);
+        mTaskbarView.construct(clickListener, longClickListener, buttonProvider);
+        mTaskbarView.getLayoutParams().height = mActivity.getDeviceProfile().taskbarSize;
+
+        mContainerView.init(new Callbacks(), mTaskbarView);
+    }
+
+    public void onDestroy() {
+        mContainerView.onDestroy();
+    }
+
+    public void setUIController(@NonNull TaskbarUIController uiController) {
+        mUIController = uiController;
+    }
+
+    /**
+     * When in 3 button nav, the above doesn't get called since we prevent sysui nav bar from
+     * instantiating at all, which is what's responsible for sending sysui state flags over.
+     *
+     * @param vis IME visibility flag
+     */
+    public void updateImeStatus(int displayId, int vis, boolean showImeSwitcher) {
+        if (displayId != mActivity.getDisplayId() || !mActivity.canShowNavButtons()) {
+            return;
+        }
+
+        mImeBarView.setImeSwitcherVisibility(showImeSwitcher);
+        setImeIsVisible((vis & InputMethodService.IME_VISIBLE) != 0);
+    }
+
+    /**
+     * Should be called when the IME visibility changes, so we can hide/show Taskbar accordingly.
+     */
+    public void setImeIsVisible(boolean isImeVisible) {
+        mTaskbarView.setTouchesEnabled(!isImeVisible);
+        mUIController.onImeVisible(mContainerView, isImeVisible);
+    }
+
+    /**
+     * Callbacks for {@link TaskbarContainerView} to interact with the icon controller
+     */
+    public class Callbacks {
+
+        /**
+         * Called to update the touchable insets
+         */
+        public void updateInsetsTouchability(InsetsInfo insetsInfo) {
+            insetsInfo.touchableRegion.setEmpty();
+            if (mContainerView.getAlpha() < AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD) {
+                // Let touches pass through us.
+                insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION);
+            } else if (mImeBarView.getVisibility() == VISIBLE) {
+                insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_FRAME);
+            } else if (!mUIController.isTaskbarTouchable()) {
+                // Let touches pass through us.
+                insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION);
+            } else if (mTaskbarView.areIconsVisible()) {
+                // Buttons are visible, take over the full taskbar area
+                insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_FRAME);
+            } else {
+                if (mTaskbarView.mSystemButtonContainer.getVisibility() == VISIBLE) {
+                    mContainerView.getDescendantRectRelativeToSelf(
+                            mTaskbarView.mSystemButtonContainer, mTempRect);
+                    insetsInfo.touchableRegion.set(mTempRect);
+                }
+                insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION);
+            }
+
+            // TaskbarContainerView provides insets to other apps based on contentInsets. These
+            // insets should stay consistent even if we expand TaskbarContainerView's bounds, e.g.
+            // to show a floating view like Folder. Thus, we set the contentInsets to be where
+            // mTaskbarView is, since its position never changes and insets rather than overlays.
+            insetsInfo.contentInsets.left = mTaskbarView.getLeft();
+            insetsInfo.contentInsets.top = mTaskbarView.getTop();
+            insetsInfo.contentInsets.right = mContainerView.getWidth() - mTaskbarView.getRight();
+            insetsInfo.contentInsets.bottom = mContainerView.getHeight() - mTaskbarView.getBottom();
+        }
+
+        public void onContainerViewRemoved() {
+            int count = mContainerView.getChildCount();
+            // Ensure no other children present (like Folders, etc)
+            for (int i = 0; i < count; i++) {
+                View v = mContainerView.getChildAt(i);
+                if (!((v instanceof TaskbarView) || (v instanceof ImeBarView))) {
+                    return;
+                }
+            }
+            mActivity.setTaskbarWindowFullscreen(false);
+        }
+
+        public void updateImeBarVisibilityAlpha(float alpha) {
+            if (!mActivity.canShowNavButtons()) {
+                // TODO Remove sysui IME bar for gesture nav as well
+                return;
+            }
+            mImeBarView.setAlpha(alpha);
+            mImeBarView.setVisibility(alpha == 0 ? GONE : VISIBLE);
+        }
+    }
+}
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
new file mode 100644
index 0000000000..b9eec93687
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.taskbar;
+
+import static android.view.Display.DEFAULT_DISPLAY;
+import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
+
+import static com.android.launcher3.util.DisplayController.CHANGE_ACTIVE_SCREEN;
+import static com.android.launcher3.util.DisplayController.CHANGE_DENSITY;
+import static com.android.launcher3.util.DisplayController.CHANGE_SUPPORTED_BOUNDS;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING;
+
+import android.content.Context;
+import android.hardware.display.DisplayManager;
+import android.inputmethodservice.InputMethodService;
+import android.view.Display;
+
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.BaseQuickstepLauncher;
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.config.FeatureFlags;
+import com.android.launcher3.util.DisplayController;
+import com.android.launcher3.util.DisplayController.Info;
+import com.android.quickstep.SysUINavigationMode;
+import com.android.quickstep.SysUINavigationMode.Mode;
+import com.android.quickstep.TouchInteractionService;
+
+/**
+ * Class to manager taskbar lifecycle
+ */
+public class TaskbarManager implements DisplayController.DisplayInfoChangeListener,
+        SysUINavigationMode.NavigationModeChangeListener {
+
+    private final Context mContext;
+    private final DisplayController mDisplayController;
+    private final SysUINavigationMode mSysUINavigationMode;
+    private final TaskbarNavButtonController mNavButtonController;
+
+    private TaskbarActivityContext mTaskbarActivityContext;
+    private BaseQuickstepLauncher mLauncher;
+
+    private static final int CHANGE_FLAGS =
+            CHANGE_ACTIVE_SCREEN | CHANGE_DENSITY | CHANGE_SUPPORTED_BOUNDS;
+
+    public TaskbarManager(TouchInteractionService service) {
+        mDisplayController = DisplayController.INSTANCE.get(service);
+        mSysUINavigationMode = SysUINavigationMode.INSTANCE.get(service);
+        Display display =
+                service.getSystemService(DisplayManager.class).getDisplay(DEFAULT_DISPLAY);
+        mContext = service.createWindowContext(display, TYPE_APPLICATION_OVERLAY, null);
+        mNavButtonController = new TaskbarNavButtonController(service);
+
+        mDisplayController.addChangeListener(this);
+        mSysUINavigationMode.addModeChangeListener(this);
+        recreateTaskbar();
+    }
+
+    @Override
+    public void onNavigationModeChanged(Mode newMode) {
+        recreateTaskbar();
+    }
+
+    @Override
+    public void onDisplayInfoChanged(Context context, Info info, int flags) {
+        if ((flags & CHANGE_FLAGS) != 0) {
+            recreateTaskbar();
+        }
+    }
+
+    private void destroyExistingTaskbar() {
+        if (mTaskbarActivityContext != null) {
+            mTaskbarActivityContext.onDestroy();
+            mTaskbarActivityContext = null;
+        }
+    }
+
+    /**
+     * Sets or clears a launcher to act as taskbar callback
+     */
+    public void setLauncher(@Nullable BaseQuickstepLauncher launcher) {
+        mLauncher = launcher;
+        if (mTaskbarActivityContext != null) {
+            mTaskbarActivityContext.setUIController(mLauncher == null
+                    ? TaskbarUIController.DEFAULT
+                    : new TaskbarController(launcher, mTaskbarActivityContext));
+        }
+    }
+
+    private void recreateTaskbar() {
+        destroyExistingTaskbar();
+        if (!FeatureFlags.ENABLE_TASKBAR.get()) {
+            return;
+        }
+        DeviceProfile dp = LauncherAppState.getIDP(mContext).getDeviceProfile(mContext);
+        if (!dp.isTaskbarPresent) {
+            return;
+        }
+        mTaskbarActivityContext = new TaskbarActivityContext(
+                mContext, dp.copy(mContext), mNavButtonController);
+        mTaskbarActivityContext.init();
+        if (mLauncher != null) {
+            mTaskbarActivityContext.setUIController(
+                    new TaskbarController(mLauncher, mTaskbarActivityContext));
+        }
+    }
+
+    /**
+     * See {@link com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags}
+     * @param systemUiStateFlags The latest SystemUiStateFlags
+     */
+    public void onSystemUiFlagsChanged(int systemUiStateFlags) {
+        boolean isImeVisible = (systemUiStateFlags & SYSUI_STATE_IME_SHOWING) != 0;
+        if (mTaskbarActivityContext != null) {
+            mTaskbarActivityContext.getIconController().setImeIsVisible(isImeVisible);
+        }
+    }
+
+    /**
+     * When in 3 button nav, the above doesn't get called since we prevent sysui nav bar from
+     * instantiating at all, which is what's responsible for sending sysui state flags over.
+     *
+     * @param vis IME visibility flag
+     * @param backDisposition Used to determine back button behavior for software keyboard
+     *                        See BACK_DISPOSITION_* constants in {@link InputMethodService}
+     */
+    public void updateImeStatus(int displayId, int vis, int backDisposition,
+            boolean showImeSwitcher) {
+        if (mTaskbarActivityContext != null) {
+            mTaskbarActivityContext.getIconController()
+                    .updateImeStatus(displayId, vis, showImeSwitcher);
+        }
+    }
+
+    /**
+     * Called when the manager is no longer needed
+     */
+    public void destroy() {
+        destroyExistingTaskbar();
+        mDisplayController.removeChangeListener(this);
+        mSysUINavigationMode.removeModeChangeListener(this);
+    }
+}
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java
index 54e1610cd1..3b5afad691 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java
@@ -16,7 +16,8 @@
 
 package com.android.launcher3.taskbar;
 
-import android.content.Context;
+import static android.view.Display.DEFAULT_DISPLAY;
+
 import android.content.Intent;
 import android.view.inputmethod.InputMethodManager;
 
@@ -53,11 +54,10 @@ public class TaskbarNavButtonController {
     static final int BUTTON_RECENTS = BUTTON_HOME << 1;
     static final int BUTTON_IME_SWITCH = BUTTON_RECENTS << 1;
 
+    private final TouchInteractionService mService;
 
-    private final Context mContext;
-
-    public TaskbarNavButtonController(Context context) {
-        mContext = context;
+    public TaskbarNavButtonController(TouchInteractionService service) {
+        mService = service;
     }
 
     public void onButtonClick(@TaskbarButton int buttonType) {
@@ -78,13 +78,13 @@ public class TaskbarNavButtonController {
     }
 
     private void navigateHome() {
-        mContext.startActivity(new Intent(Intent.ACTION_MAIN)
+        mService.startActivity(new Intent(Intent.ACTION_MAIN)
                 .addCategory(Intent.CATEGORY_HOME)
                 .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
     }
 
     private void navigateToOverview() {
-        TouchInteractionService.getInstance().getOverviewCommandHelper()
+        mService.getOverviewCommandHelper()
                 .addCommand(OverviewCommandHelper.TYPE_SHOW);
     }
 
@@ -93,8 +93,8 @@ public class TaskbarNavButtonController {
     }
 
     private void showIMESwitcher() {
-        mContext.getSystemService(InputMethodManager.class).showInputMethodPickerFromSystem(
-                true /* showAuxiliarySubtypes */, mContext.getDisplayId());
+        mService.getSystemService(InputMethodManager.class)
+                .showInputMethodPickerFromSystem(true /* showAuxiliarySubtypes */,
+                        DEFAULT_DISPLAY);
     }
-
 }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java
index 6ea51fa5eb..a701aae088 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java
@@ -24,59 +24,52 @@ import androidx.annotation.Nullable;
 import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.anim.PendingAnimation;
+import com.android.launcher3.anim.PropertySetter;
 import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.quickstep.AnimatedFloat;
 
 /**
  * StateHandler to animate Taskbar according to Launcher's state machine. Does nothing if Taskbar
- * isn't present (i.e. {@link #setTaskbarCallbacks} is never called).
+ * isn't present (i.e. {@link #setAnimationController} is never called).
  */
 public class TaskbarStateHandler implements StateManager.StateHandler<LauncherState> {
 
     private final BaseQuickstepLauncher mLauncher;
 
     // Contains Taskbar-related methods and fields we should aniamte. If null, don't do anything.
-    private @Nullable TaskbarController.TaskbarStateHandlerCallbacks mTaskbarCallbacks = null;
+    private @Nullable TaskbarAnimationController mAnimationController = null;
 
     public TaskbarStateHandler(BaseQuickstepLauncher launcher) {
         mLauncher = launcher;
     }
 
-    public void setTaskbarCallbacks(TaskbarController.TaskbarStateHandlerCallbacks callbacks) {
-        mTaskbarCallbacks = callbacks;
+    public void setAnimationController(TaskbarAnimationController callbacks) {
+        mAnimationController = callbacks;
     }
 
     @Override
     public void setState(LauncherState state) {
-        if (mTaskbarCallbacks == null) {
-            return;
-        }
-
-        AnimatedFloat alphaTarget = mTaskbarCallbacks.getAlphaTarget();
-        AnimatedFloat scaleTarget = mTaskbarCallbacks.getScaleTarget();
-        AnimatedFloat translationYTarget = mTaskbarCallbacks.getTranslationYTarget();
-        boolean isTaskbarVisible = (state.getVisibleElements(mLauncher) & TASKBAR) != 0;
-        alphaTarget.updateValue(isTaskbarVisible ? 1f : 0f);
-        scaleTarget.updateValue(state.getTaskbarScale(mLauncher));
-        translationYTarget.updateValue(state.getTaskbarTranslationY(mLauncher));
+        setState(state, PropertySetter.NO_ANIM_PROPERTY_SETTER);
     }
 
     @Override
     public void setStateWithAnimation(LauncherState toState, StateAnimationConfig config,
             PendingAnimation animation) {
-        if (mTaskbarCallbacks == null) {
+        setState(toState, animation);
+    }
+
+    private void setState(LauncherState toState, PropertySetter setter) {
+        if (mAnimationController == null) {
             return;
         }
 
-        AnimatedFloat alphaTarget = mTaskbarCallbacks.getAlphaTarget();
-        AnimatedFloat scaleTarget = mTaskbarCallbacks.getScaleTarget();
-        AnimatedFloat translationYTarget = mTaskbarCallbacks.getTranslationYTarget();
         boolean isTaskbarVisible = (toState.getVisibleElements(mLauncher) & TASKBAR) != 0;
-        animation.setFloat(alphaTarget, AnimatedFloat.VALUE, isTaskbarVisible ? 1f : 0f, LINEAR);
-        animation.setFloat(scaleTarget, AnimatedFloat.VALUE, toState.getTaskbarScale(mLauncher),
-                LINEAR);
-        animation.setFloat(translationYTarget, AnimatedFloat.VALUE,
-                toState.getTaskbarTranslationY(mLauncher), ACCEL_DEACCEL);
+        setter.setFloat(mAnimationController.getTaskbarVisibilityForLauncherState(),
+                AnimatedFloat.VALUE, isTaskbarVisible ? 1f : 0f, LINEAR);
+        setter.setFloat(mAnimationController.getTaskbarScaleForLauncherState(),
+                AnimatedFloat.VALUE, toState.getTaskbarScale(mLauncher), LINEAR);
+        setter.setFloat(mAnimationController.getTaskbarTranslationYForLauncherState(),
+                AnimatedFloat.VALUE, toState.getTaskbarTranslationY(mLauncher), ACCEL_DEACCEL);
     }
 }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java
new file mode 100644
index 0000000000..e16f5e65b0
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.taskbar;
+
+/**
+ * Base class for providing different taskbar UI
+ */
+public class TaskbarUIController {
+
+    public static final TaskbarUIController DEFAULT = new TaskbarUIController();
+
+    /**
+     * Pads the Hotseat to line up exactly with Taskbar's copy of the Hotseat.
+     */
+    public void alignRealHotseatWithTaskbar() { }
+
+    protected void onCreate() { }
+
+    protected void onDestroy() { }
+
+    protected boolean isTaskbarTouchable() {
+        return true;
+    }
+
+    protected void onImeVisible(TaskbarContainerView container, boolean isVisible) {
+        container.updateImeBarVisibilityAlpha(isVisible ? 1 : 0);
+    }
+}
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
index 9e8013e63e..c6573a639c 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
@@ -15,20 +15,14 @@
  */
 package com.android.launcher3.taskbar;
 
-import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_BACK;
-import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_HOME;
-import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_RECENTS;
-
-import android.animation.Animator;
-import android.animation.AnimatorSet;
-import android.animation.LayoutTransition;
-import android.animation.ValueAnimator;
+import static android.view.View.MeasureSpec.EXACTLY;
+import static android.view.View.MeasureSpec.makeMeasureSpec;
+
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.RectF;
-import android.os.SystemProperties;
 import android.util.AttributeSet;
 import android.view.DragEvent;
 import android.view.Gravity;
@@ -51,17 +45,12 @@ import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.views.ActivityContext;
-import com.android.quickstep.SysUINavigationMode;
 
 /**
  * Hosts the Taskbar content such as Hotseat and Recent Apps. Drawn on top of other apps.
  */
 public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconParent, Insettable {
 
-
-    private static final boolean ENABLE_THREE_BUTTON_TASKBAR =
-            SystemProperties.getBoolean("persist.debug.taskbar_three_button", false);
-
     private final int mIconTouchSize;
     private final boolean mIsRtl;
     private final int mTouchSlop;
@@ -69,17 +58,16 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
     private final RectF mDelegateSlopBounds = new RectF();
     private final int[] mTempOutLocation = new int[2];
 
+    private final int mItemMarginLeftRight;
+
+    private final TaskbarActivityContext mActivityContext;
+
     // Initialized in TaskbarController constructor.
-    private TaskbarController.TaskbarViewCallbacks mControllerCallbacks;
-    // Scale on elements that aren't icons.
-    private float mNonIconScale;
-    private int mItemMarginLeftRight;
+    private View.OnClickListener mIconClickListener;
+    private View.OnLongClickListener mIconLongClickListener;
 
-    // Initialized in init().
-    private LayoutTransition mLayoutTransition;
-    private int mHotseatStartIndex;
-    private int mHotseatEndIndex;
-    private LinearLayout mButtonRegion;
+    LinearLayout mSystemButtonContainer;
+    LinearLayout mHotseatIconsContainer;
 
     // Delegate touches to the closest view if within mIconTouchSize.
     private boolean mDelegateTargeted;
@@ -91,10 +79,12 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
     // Only non-null when the corresponding Folder is open.
     private @Nullable FolderIcon mLeaveBehindFolderIcon;
 
-    private int mNavButtonStartIndex;
     /** Provider of buttons added to taskbar in 3 button nav */
     private ButtonProvider mButtonProvider;
 
+    private boolean mDisableRelayout;
+    private boolean mAreHolesAllowed;
+
     public TaskbarView(@NonNull Context context) {
         this(context, null);
     }
@@ -111,80 +101,58 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
     public TaskbarView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr,
             int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
+        mActivityContext = ActivityContext.lookupContext(context);
 
         Resources resources = getResources();
         mIconTouchSize = resources.getDimensionPixelSize(R.dimen.taskbar_icon_touch_size);
+        mItemMarginLeftRight = resources.getDimensionPixelSize(R.dimen.taskbar_icon_spacing);
+
         mIsRtl = Utilities.isRtl(resources);
         mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
     }
 
-    protected void construct(TaskbarController.TaskbarViewCallbacks taskbarViewCallbacks,
-            ButtonProvider buttonProvider) {
-        mControllerCallbacks = taskbarViewCallbacks;
-        mNonIconScale = mControllerCallbacks.getNonIconScale(this);
-        mItemMarginLeftRight = getResources().getDimensionPixelSize(R.dimen.taskbar_icon_spacing);
-        mItemMarginLeftRight = Math.round(mItemMarginLeftRight * mNonIconScale);
-        mButtonProvider = buttonProvider;
-        mButtonProvider.setMarginLeftRight(mItemMarginLeftRight);
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mSystemButtonContainer = findViewById(R.id.system_button_layout);
+        mHotseatIconsContainer = findViewById(R.id.hotseat_icons_layout);
     }
 
-    protected void init(int numHotseatIcons, SysUINavigationMode.Mode newMode) {
-        // TODO: check if buttons on left
-        if (newMode == SysUINavigationMode.Mode.THREE_BUTTONS && ENABLE_THREE_BUTTON_TASKBAR) {
-            // 3 button
-            mNavButtonStartIndex = 0;
+    protected void construct(OnClickListener clickListener, OnLongClickListener longClickListener,
+                ButtonProvider buttonProvider) {
+        mIconClickListener = clickListener;
+        mIconLongClickListener = longClickListener;
+        mButtonProvider = buttonProvider;
+
+        if (mActivityContext.canShowNavButtons()) {
             createNavButtons();
         } else {
-            mNavButtonStartIndex = -1;
-            removeNavButtons();
+            mSystemButtonContainer.setVisibility(GONE);
         }
 
-        mHotseatStartIndex = mNavButtonStartIndex + 1;
-        mHotseatEndIndex = mHotseatStartIndex + numHotseatIcons - 1;
+        int numHotseatIcons = mActivityContext.getDeviceProfile().numShownHotseatIcons;
         updateHotseatItems(new ItemInfo[numHotseatIcons]);
-
-        mLayoutTransition = new LayoutTransition();
-        addUpdateListenerForAllLayoutTransitions(() -> {
-            if (getLayoutTransition() == mLayoutTransition) {
-                mControllerCallbacks.onItemPositionsChanged(this);
-            }
-        });
-        setLayoutTransition(mLayoutTransition);
     }
 
-    private void addUpdateListenerForAllLayoutTransitions(Runnable onUpdate) {
-        addUpdateListenerForLayoutTransition(LayoutTransition.CHANGE_APPEARING, onUpdate);
-        addUpdateListenerForLayoutTransition(LayoutTransition.CHANGE_DISAPPEARING, onUpdate);
-        addUpdateListenerForLayoutTransition(LayoutTransition.CHANGING, onUpdate);
-        addUpdateListenerForLayoutTransition(LayoutTransition.APPEARING, onUpdate);
-        addUpdateListenerForLayoutTransition(LayoutTransition.DISAPPEARING, onUpdate);
-    }
-
-    private void addUpdateListenerForLayoutTransition(int transitionType, Runnable onUpdate) {
-        Animator anim = mLayoutTransition.getAnimator(transitionType);
-        if (anim instanceof ValueAnimator) {
-            ((ValueAnimator) anim).addUpdateListener(valueAnimator -> onUpdate.run());
-        } else {
-            AnimatorSet animSet = new AnimatorSet();
-            ValueAnimator updateAnim = ValueAnimator.ofFloat(0, 1);
-            updateAnim.addUpdateListener(valueAnimator -> onUpdate.run());
-            animSet.playTogether(anim, updateAnim);
-            mLayoutTransition.setAnimator(transitionType, animSet);
+    /**
+     * Enables/disables empty icons in taskbar so that the layout matches with Launcher
+     */
+    public void setHolesAllowedInLayout(boolean areHolesAllowed) {
+        if (mAreHolesAllowed != areHolesAllowed) {
+            mAreHolesAllowed = areHolesAllowed;
+            updateHotseatItemsVisibility();
+            // TODO: Add animation
         }
     }
 
-    protected void cleanup() {
-        endAllLayoutTransitionAnimators();
-        setLayoutTransition(null);
-        removeAllViews();
-    }
-
-    private void endAllLayoutTransitionAnimators() {
-        mLayoutTransition.getAnimator(LayoutTransition.CHANGE_APPEARING).end();
-        mLayoutTransition.getAnimator(LayoutTransition.CHANGE_DISAPPEARING).end();
-        mLayoutTransition.getAnimator(LayoutTransition.CHANGING).end();
-        mLayoutTransition.getAnimator(LayoutTransition.APPEARING).end();
-        mLayoutTransition.getAnimator(LayoutTransition.DISAPPEARING).end();
+    private void setHolesAllowedInLayoutNoAnimation(boolean areHolesAllowed) {
+        if (mAreHolesAllowed != areHolesAllowed) {
+            mAreHolesAllowed = areHolesAllowed;
+            updateHotseatItemsVisibility();
+            onMeasure(makeMeasureSpec(getMeasuredWidth(), EXACTLY),
+                    makeMeasureSpec(getMeasuredHeight(), EXACTLY));
+            onLayout(false, getLeft(), getTop(), getRight(), getBottom());
+        }
     }
 
     /**
@@ -192,10 +160,9 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
      */
     protected void updateHotseatItems(ItemInfo[] hotseatItemInfos) {
         for (int i = 0; i < hotseatItemInfos.length; i++) {
-            ItemInfo hotseatItemInfo = hotseatItemInfos[!mIsRtl ? i
-                    : hotseatItemInfos.length - i - 1];
-            int hotseatIndex = mHotseatStartIndex + i;
-            View hotseatView = getChildAt(hotseatIndex);
+            ItemInfo hotseatItemInfo = hotseatItemInfos[
+                    !mIsRtl ? i : hotseatItemInfos.length - i - 1];
+            View hotseatView = mHotseatIconsContainer.getChildAt(i);
 
             // Replace any Hotseat views with the appropriate type if it's not already that type.
             final int expectedLayoutResId;
@@ -213,23 +180,23 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
             } else {
                 expectedLayoutResId = R.layout.taskbar_app_icon;
             }
-            if (hotseatView == null || hotseatView.getSourceLayoutResId() != expectedLayoutResId
+            if (hotseatView == null
+                    || hotseatView.getSourceLayoutResId() != expectedLayoutResId
                     || needsReinflate) {
-                removeView(hotseatView);
-                ActivityContext activityContext = getActivityContext();
+                mHotseatIconsContainer.removeView(hotseatView);
                 if (isFolder) {
                     FolderInfo folderInfo = (FolderInfo) hotseatItemInfo;
                     FolderIcon folderIcon = FolderIcon.inflateFolderAndIcon(expectedLayoutResId,
-                            getActivityContext(), this, folderInfo);
+                            mActivityContext, this, folderInfo);
                     folderIcon.setTextVisible(false);
                     hotseatView = folderIcon;
                 } else {
                     hotseatView = inflate(expectedLayoutResId);
                 }
-                int iconSize = activityContext.getDeviceProfile().iconSizePx;
+                int iconSize = mActivityContext.getDeviceProfile().iconSizePx;
                 LayoutParams lp = new LayoutParams(iconSize, iconSize);
                 lp.setMargins(mItemMarginLeftRight, 0, mItemMarginLeftRight, 0);
-                addView(hotseatView, hotseatIndex, lp);
+                mHotseatIconsContainer.addView(hotseatView, i, lp);
             }
 
             // Apply the Hotseat ItemInfos, or hide the view if there is none for a given index.
@@ -237,13 +204,11 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
                     && hotseatItemInfo instanceof WorkspaceItemInfo) {
                 ((BubbleTextView) hotseatView).applyFromWorkspaceItem(
                         (WorkspaceItemInfo) hotseatItemInfo);
-                hotseatView.setOnClickListener(mControllerCallbacks.getItemOnClickListener());
-                hotseatView.setOnLongClickListener(
-                        mControllerCallbacks.getItemOnLongClickListener());
+                hotseatView.setOnClickListener(mIconClickListener);
+                hotseatView.setOnLongClickListener(mIconLongClickListener);
             } else if (isFolder) {
-                hotseatView.setOnClickListener(mControllerCallbacks.getItemOnClickListener());
-                hotseatView.setOnLongClickListener(
-                        mControllerCallbacks.getItemOnLongClickListener());
+                hotseatView.setOnClickListener(mIconClickListener);
+                hotseatView.setOnLongClickListener(mIconLongClickListener);
             } else {
                 hotseatView.setOnClickListener(null);
                 hotseatView.setOnLongClickListener(null);
@@ -254,24 +219,14 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
     }
 
     protected void updateHotseatItemsVisibility() {
-        for (int i = mHotseatStartIndex; i <= mHotseatEndIndex; i++) {
-            updateHotseatItemVisibility(getChildAt(i));
+        for (int i = mHotseatIconsContainer.getChildCount() - 1; i >= 0; i--) {
+            updateHotseatItemVisibility(mHotseatIconsContainer.getChildAt(i));
         }
     }
 
     private void updateHotseatItemVisibility(View hotseatView) {
-        if (hotseatView.getTag() != null) {
-            hotseatView.setVisibility(VISIBLE);
-        } else {
-            int oldVisibility = hotseatView.getVisibility();
-            int newVisibility = mControllerCallbacks.getEmptyHotseatViewVisibility(this);
-            hotseatView.setVisibility(newVisibility);
-            if (oldVisibility == GONE && newVisibility != GONE) {
-                // By default, the layout transition only runs when going to VISIBLE,
-                // but we want it to run when going to GONE to INVISIBLE as well.
-                getLayoutTransition().showChild(this, hotseatView, oldVisibility);
-            }
-        }
+        hotseatView.setVisibility(
+                hotseatView.getTag() != null ? VISIBLE : (mAreHolesAllowed ? INVISIBLE : GONE));
     }
 
     @Override
@@ -378,49 +333,20 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
         return findDelegateView(xInOurCoordinates, yInOurCoorindates) != null;
     }
 
-    private void removeNavButtons() {
-        if (mButtonRegion != null) {
-            mButtonRegion.removeAllViews();
-            removeView(mButtonRegion);
-        } // else We've never been in 3 button. Woah Scoob!
-    }
-
     /**
      * Add back/home/recents buttons into a single ViewGroup that will be inserted at
      * {@param navButtonStartIndex}
      */
     private void createNavButtons() {
-        ActivityContext context = getActivityContext();
-        if (mButtonRegion == null) {
-            mButtonRegion = new LinearLayout(getContext());
-        } else {
-            mButtonRegion.removeAllViews();
-        }
-        mButtonRegion.setVisibility(VISIBLE);
-
         LinearLayout.LayoutParams buttonParams = new LinearLayout.LayoutParams(
-                context.getDeviceProfile().iconSizePx,
-                context.getDeviceProfile().iconSizePx
+                mActivityContext.getDeviceProfile().iconSizePx,
+                mActivityContext.getDeviceProfile().iconSizePx
         );
         buttonParams.gravity = Gravity.CENTER;
 
-        View backButton = mButtonProvider.getBack();
-        backButton.setOnClickListener(view -> mControllerCallbacks.onNavigationButtonClick(
-                BUTTON_BACK));
-        mButtonRegion.addView(backButton, buttonParams);
-
-        // Home button
-        View homeButton = mButtonProvider.getHome();
-        homeButton.setOnClickListener(view -> mControllerCallbacks.onNavigationButtonClick(
-                BUTTON_HOME));
-        mButtonRegion.addView(homeButton, buttonParams);
-
-        View recentsButton = mButtonProvider.getRecents();
-        recentsButton.setOnClickListener(view -> mControllerCallbacks.onNavigationButtonClick(
-                BUTTON_RECENTS));
-        mButtonRegion.addView(recentsButton, buttonParams);
-
-        addView(mButtonRegion, mNavButtonStartIndex);
+        mSystemButtonContainer.addView(mButtonProvider.getBack(), buttonParams);
+        mSystemButtonContainer.addView(mButtonProvider.getHome(), buttonParams);
+        mSystemButtonContainer.addView(mButtonProvider.getRecents(), buttonParams);
     }
 
     @Override
@@ -428,7 +354,7 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
         switch (event.getAction()) {
             case DragEvent.ACTION_DRAG_STARTED:
                 mIsDraggingItem = true;
-                AbstractFloatingView.closeAllOpenViews(getActivityContext());
+                AbstractFloatingView.closeAllOpenViews(mActivityContext);
                 return true;
             case DragEvent.ACTION_DRAG_ENDED:
                 mIsDraggingItem = false;
@@ -445,26 +371,26 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
      * @return The bounding box of where the hotseat elements are relative to this TaskbarView.
      */
     protected RectF getHotseatBounds() {
-        View firstHotseatView = null, lastHotseatView = null;
-        for (int i = mHotseatStartIndex; i <= mHotseatEndIndex; i++) {
-            View child = getChildAt(i);
-            if (child.getVisibility() != GONE) {
-                if (firstHotseatView == null) {
-                    firstHotseatView = child;
-                }
-                lastHotseatView = child;
-            }
-        }
-        if (firstHotseatView == null || lastHotseatView == null) {
-            return new RectF();
+        RectF result;
+        mDisableRelayout = true;
+        boolean wereHolesAllowed = mAreHolesAllowed;
+        setHolesAllowedInLayoutNoAnimation(true);
+        result = new RectF(
+                mHotseatIconsContainer.getLeft(),
+                mHotseatIconsContainer.getTop(),
+                mHotseatIconsContainer.getRight(),
+                mHotseatIconsContainer.getBottom());
+        setHolesAllowedInLayoutNoAnimation(wereHolesAllowed);
+        mDisableRelayout = false;
+
+        return result;
+    }
+
+    @Override
+    public void requestLayout() {
+        if (!mDisableRelayout) {
+            super.requestLayout();
         }
-        View leftmostHotseatView = !mIsRtl ? firstHotseatView : lastHotseatView;
-        View rightmostHotseatView = !mIsRtl ? lastHotseatView : firstHotseatView;
-        return new RectF(
-                leftmostHotseatView.getLeft() - mItemMarginLeftRight,
-                leftmostHotseatView.getTop(),
-                rightmostHotseatView.getRight() + mItemMarginLeftRight,
-                rightmostHotseatView.getBottom());
     }
 
     // FolderIconParent implemented methods.
@@ -495,7 +421,7 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
     }
 
     private View inflate(@LayoutRes int layoutResId) {
-        return getActivityContext().getLayoutInflater().inflate(layoutResId, this, false);
+        return mActivityContext.getLayoutInflater().inflate(layoutResId, this, false);
     }
 
     @Override
@@ -503,7 +429,11 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa
         // Ignore, we just implement Insettable to draw behind system insets.
     }
 
-    private <T extends Context & ActivityContext> T getActivityContext() {
-        return ActivityContext.lookupContext(getContext());
+    public void setIconsVisibility(boolean isVisible) {
+        mHotseatIconsContainer.setVisibility(isVisible ? VISIBLE : INVISIBLE);
+    }
+
+    public boolean areIconsVisible() {
+        return mHotseatIconsContainer.getVisibility() == VISIBLE;
     }
 }
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index f5ddd0e52f..86bf1194bb 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -52,7 +52,6 @@ import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.BaseState;
 import com.android.launcher3.statemanager.StatefulActivity;
-import com.android.launcher3.taskbar.TaskbarController;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.util.WindowBounds;
 import com.android.launcher3.views.ScrimView;
@@ -123,11 +122,6 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
         return null;
     }
 
-    @Nullable
-    public TaskbarController getTaskbarController() {
-        return null;
-    }
-
     public final boolean isResumed() {
         ACTIVITY_TYPE activity = getCreatedActivity();
         return activity != null && activity.hasBeenResumed();
@@ -367,13 +361,6 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
      */
     protected abstract int getOverviewScrimColorForState(ACTIVITY_TYPE activity, STATE_TYPE state);
 
-    /**
-     * See {@link com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags}
-     * @param systemUiStateFlags The latest SystemUiStateFlags
-     */
-    public void onSystemUiFlagsChanged(int systemUiStateFlags) {
-    }
-
     /**
      * Returns the expected STATE_TYPE from the provided GestureEndTarget.
      */
diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
index 5217c3b169..ff69180d33 100644
--- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
@@ -22,7 +22,6 @@ import static com.android.launcher3.LauncherState.QUICK_SWITCH;
 import static com.android.launcher3.anim.AnimatorListeners.forEndCallback;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
@@ -164,8 +163,7 @@ public final class LauncherActivityInterface extends
     }
 
     @Nullable
-    @Override
-    public TaskbarController getTaskbarController() {
+    private TaskbarController getTaskbarController() {
         BaseQuickstepLauncher launcher = getCreatedActivity();
         if (launcher == null) {
             return null;
@@ -300,16 +298,6 @@ public final class LauncherActivityInterface extends
         return state.getWorkspaceScrimColor(launcher);
     }
 
-    @Override
-    public void onSystemUiFlagsChanged(int systemUiStateFlags) {
-        TaskbarController taskbarController = getTaskbarController();
-        if (taskbarController == null) {
-            return;
-        }
-        boolean isImeVisible = (systemUiStateFlags & SYSUI_STATE_IME_SHOWING) != 0;
-        taskbarController.setIsImeVisible(isImeVisible);
-    }
-
     @Override
     public boolean deferStartingActivity(RecentsAnimationDeviceState deviceState, MotionEvent ev) {
         TaskbarController taskbarController = getTaskbarController();
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index edc7a3c8b8..d95f7b7fed 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -52,7 +52,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.Looper;
-import android.os.RemoteException;
 import android.os.SystemClock;
 import android.os.SystemProperties;
 import android.util.Log;
@@ -75,6 +74,7 @@ import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.provider.RestoreDbTask;
 import com.android.launcher3.statemanager.StatefulActivity;
+import com.android.launcher3.taskbar.TaskbarManager;
 import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.tracing.LauncherTraceProto;
@@ -147,21 +147,9 @@ public class TouchInteractionService extends Service implements PluginListener<O
     private OverscrollPlugin mOverscrollPlugin;
 
     /**
-     * Extension of OverviewProxy aidl interface without needing to modify the actual interface.
-     * This is for methods that need only need local access and not intended to make IPC calls.
+     * Local IOverviewProxy implementation with some methods for local components
      */
-    public abstract static class TISBinder extends IOverviewProxy.Stub {
-        public abstract void setTaskbarOverviewProxyDelegate(
-                @Nullable TaskbarOverviewProxyDelegate i);
-    }
-
-
-    private final TISBinder mMyBinder = new TISBinder() {
-
-        public void setTaskbarOverviewProxyDelegate(
-                @Nullable TaskbarOverviewProxyDelegate delegate) {
-            mTaskbarOverviewProxyDelegate = delegate;
-        }
+    public class TISBinder extends IOverviewProxy.Stub {
 
         @BinderThread
         public void onInitialize(Bundle bundle) {
@@ -274,40 +262,24 @@ public class TouchInteractionService extends Service implements PluginListener<O
 
         @Override
         public void onImeWindowStatusChanged(int displayId, IBinder token, int vis,
-                int backDisposition, boolean showImeSwitcher) throws RemoteException {
-            if (mTaskbarOverviewProxyDelegate == null) {
-                return;
-            }
-            MAIN_EXECUTOR.execute(() -> {
-                if (mTaskbarOverviewProxyDelegate == null) {
-                    return;
-                }
-                mTaskbarOverviewProxyDelegate
-                        .updateImeStatus(displayId, vis, backDisposition, showImeSwitcher);
-            });
+                int backDisposition, boolean showImeSwitcher) {
+            MAIN_EXECUTOR.execute(() -> mTaskbarManager.updateImeStatus(
+                    displayId, vis, backDisposition, showImeSwitcher));
         }
-    };
 
-    public interface TaskbarOverviewProxyDelegate {
-        void updateImeStatus(int displayId, int vis, int backDisposition,
-                boolean showImeSwitcher);
+        public TaskbarManager getTaskbarManager() {
+            return mTaskbarManager;
+        }
     }
 
     private static boolean sConnected = false;
-    private static TouchInteractionService sInstance;
     private static boolean sIsInitialized = false;
     private RotationTouchHelper mRotationTouchHelper;
-    @Nullable
-    private TaskbarOverviewProxyDelegate mTaskbarOverviewProxyDelegate;
 
     public static boolean isConnected() {
         return sConnected;
     }
 
-    @Nullable
-    public static TouchInteractionService getInstance() {
-        return sInstance;
-    }
 
     public static boolean isInitialized() {
         return sIsInitialized;
@@ -336,9 +308,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
 
     private DisplayManager mDisplayManager;
 
-    public TouchInteractionService() {
-        sInstance = this;
-    }
+    private TaskbarManager mTaskbarManager;
 
     @Override
     public void onCreate() {
@@ -348,13 +318,14 @@ public class TouchInteractionService extends Service implements PluginListener<O
         mMainChoreographer = Choreographer.getInstance();
         mAM = ActivityManagerWrapper.getInstance();
         mDeviceState = new RecentsAnimationDeviceState(this, true);
+        mDisplayManager = getSystemService(DisplayManager.class);
+        mTaskbarManager = new TaskbarManager(this);
+
         mRotationTouchHelper = mDeviceState.getRotationTouchHelper();
         mDeviceState.addNavigationModeChangedCallback(this::onNavigationModeChanged);
         mDeviceState.addOneHandedModeChangedCallback(this::onOneHandedModeOverlayChanged);
         mDeviceState.runOnUserUnlocked(this::onUserUnlocked);
         ProtoTracer.INSTANCE.get(this).add(this);
-        mDisplayManager = getSystemService(DisplayManager.class);
-
         sConnected = true;
     }
 
@@ -468,8 +439,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
             int systemUiStateFlags = mDeviceState.getSystemUiStateFlags();
             SystemUiProxy.INSTANCE.get(this).setLastSystemUiStateFlags(systemUiStateFlags);
             mOverviewComponentObserver.onSystemUiStateChanged();
-            mOverviewComponentObserver.getActivityInterface().onSystemUiFlagsChanged(
-                    systemUiStateFlags);
+            mTaskbarManager.onSystemUiFlagsChanged(systemUiStateFlags);
 
             if ((lastSysUIFlags & SYSUI_STATE_TRACING_ENABLED) !=
                     (systemUiStateFlags & SYSUI_STATE_TRACING_ENABLED)) {
@@ -512,6 +482,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
         getSystemService(AccessibilityManager.class)
                 .unregisterSystemAction(SYSTEM_ACTION_ID_ALL_APPS);
 
+        mTaskbarManager.destroy();
         sConnected = false;
         super.onDestroy();
     }
@@ -519,7 +490,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
     @Override
     public IBinder onBind(Intent intent) {
         Log.d(TAG, "Touch service connected: user=" + getUserId());
-        return mMyBinder;
+        return new TISBinder();
     }
 
     private void onInputEvent(InputEvent ev) {
diff --git a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
index d430028f8c..49aec933b7 100644
--- a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
+++ b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
@@ -116,7 +116,7 @@ public class StaggeredWorkspaceAnim {
                     addStaggeredAnimationForView(child, lp.cellY + 1, totalRows);
                 }
             } else {
-                final int hotseatRow, qsbRow, taskbarRow;
+                final int hotseatRow, qsbRow;
                 if (grid.isTaskbarPresent) {
                     qsbRow = grid.inv.numRows + 1;
                     hotseatRow = grid.inv.numRows + 2;
@@ -124,16 +124,12 @@ public class StaggeredWorkspaceAnim {
                     hotseatRow = grid.inv.numRows + 1;
                     qsbRow = grid.inv.numRows + 2;
                 }
-                // Taskbar and hotseat overlap.
-                taskbarRow = hotseatRow;
-
                 for (int i = hotseatIcons.getChildCount() - 1; i >= 0; i--) {
                     View child = hotseatIcons.getChildAt(i);
                     addStaggeredAnimationForView(child, hotseatRow, totalRows);
                 }
 
                 addStaggeredAnimationForView(hotseat.getQsb(), qsbRow, totalRows);
-                addStaggeredAnimationForView(hotseat.getTaskbarView(), taskbarRow, totalRows);
             }
 
             mAnimators.addListener(new AnimatorListenerAdapter() {
diff --git a/res/layout/taskbar_view.xml b/res/layout/taskbar_view.xml
deleted file mode 100644
index 96ae43db4a..0000000000
--- a/res/layout/taskbar_view.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2021 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<Space
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="0dp"
-    android:layout_height="0dp"
-    android:visibility="gone" />
\ No newline at end of file
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 3d044d68ce..322c6eed29 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -447,10 +447,6 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
      * @param canvas The canvas to draw to.
      */
     protected void drawDotIfNecessary(Canvas canvas) {
-        if (mActivity instanceof Launcher && ((Launcher) mActivity).isViewInTaskbar(this)) {
-            // TODO: support notification dots in Taskbar
-            return;
-        }
         if (!mForceHideDot && (hasDot() || mDotParams.scale > 0)) {
             getIconBounds(mDotParams.iconBounds);
             Utilities.scaleRectAboutCenter(mDotParams.iconBounds,
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index b2a9e75e50..ff380ce1ae 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -49,7 +49,6 @@ public class Hotseat extends CellLayout implements Insettable {
     private final View mQsb;
     private final int mQsbHeight;
 
-    private final View mTaskbarView;
     private final int mTaskbarViewHeight;
 
     public Hotseat(Context context) {
@@ -67,10 +66,7 @@ public class Hotseat extends CellLayout implements Insettable {
         mQsbHeight = mQsb.getLayoutParams().height;
         addView(mQsb);
 
-        mTaskbarView = LayoutInflater.from(context).inflate(R.layout.taskbar_view, this, false);
-        mTaskbarViewHeight = mTaskbarView.getLayoutParams().height;
-        // We want taskbar in the back so its background applies to Hotseat as well.
-        addView(mTaskbarView, 0);
+        mTaskbarViewHeight = context.getResources().getDimensionPixelSize(R.dimen.taskbar_size);
     }
 
     /**
@@ -187,8 +183,6 @@ public class Hotseat extends CellLayout implements Insettable {
         int width = getShortcutsAndWidgets().getMeasuredWidth();
         mQsb.measure(MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
                 MeasureSpec.makeMeasureSpec(mQsbHeight, MeasureSpec.EXACTLY));
-        mTaskbarView.measure(MeasureSpec.makeMeasureSpec(getMeasuredWidth(), MeasureSpec.EXACTLY),
-                MeasureSpec.makeMeasureSpec(mTaskbarViewHeight, MeasureSpec.EXACTLY));
     }
 
     @Override
@@ -202,13 +196,6 @@ public class Hotseat extends CellLayout implements Insettable {
         int bottom = b - t - getQsbOffsetY();
         int top = bottom - mQsbHeight;
         mQsb.layout(left, top, right, bottom);
-
-        int taskbarWidth = mTaskbarView.getMeasuredWidth();
-        left = (r - l - taskbarWidth) / 2;
-        right = left + taskbarWidth;
-        bottom = b - t - getTaskbarOffsetY();
-        top = bottom - mTaskbarViewHeight;
-        mTaskbarView.layout(left, top, right, bottom);
     }
 
     /**
@@ -244,10 +231,4 @@ public class Hotseat extends CellLayout implements Insettable {
         return mQsb;
     }
 
-    /**
-     * Returns the Taskbar inside hotseat
-     */
-    public View getTaskbarView() {
-        return mTaskbarView;
-    }
 }
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index cf902160ee..8889e60688 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1942,13 +1942,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
     @Override
     public boolean startActivitySafely(View v, Intent intent, ItemInfo item) {
-        if (isViewInTaskbar(v)) {
-            // Start the activity without the hacky workarounds below, which assume the View was
-            // clicked when Launcher was resumed and will be hidden until Launcher is re-resumed
-            // (this isn't the case for Taskbar).
-            return super.startActivitySafely(v, intent, item);
-        }
-
         if (!hasBeenResumed()) {
             // Workaround an issue where the WM launch animation is clobbered when finishing the
             // recents animation into launcher. Defer launching the activity until Launcher is
@@ -2860,13 +2853,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
                 .start();
     }
 
-    /**
-     * @return Whether the View is in the same window as the Taskbar window.
-     */
-    public boolean isViewInTaskbar(View v) {
-        return false;
-    }
-
     public boolean supportsAdaptiveIconAnimation(View clickedView) {
         return false;
     }
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 7ae729aa0c..2884fba08d 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -324,15 +324,17 @@ public final class Utilities {
     }
 
     public static void scaleRectFAboutCenter(RectF r, float scale) {
+        scaleRectFAboutPivot(r, scale, r.centerX(), r.centerY());
+    }
+
+    public static void scaleRectFAboutPivot(RectF r, float scale, float px, float py) {
         if (scale != 1.0f) {
-            float cx = r.centerX();
-            float cy = r.centerY();
-            r.offset(-cx, -cy);
+            r.offset(-px, -py);
             r.left = r.left * scale;
             r.top = r.top * scale ;
             r.right = r.right * scale;
             r.bottom = r.bottom * scale;
-            r.offset(cx, cy);
+            r.offset(px, py);
         }
     }
 
diff --git a/src/com/android/launcher3/touch/ItemClickHandler.java b/src/com/android/launcher3/touch/ItemClickHandler.java
index ce7dc07d6d..b5dcd3a041 100644
--- a/src/com/android/launcher3/touch/ItemClickHandler.java
+++ b/src/com/android/launcher3/touch/ItemClickHandler.java
@@ -27,6 +27,7 @@ import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_DISABLED_SU
 
 import android.app.AlertDialog;
 import android.app.PendingIntent;
+import android.content.Context;
 import android.content.Intent;
 import android.content.IntentSender;
 import android.content.pm.LauncherApps;
@@ -193,6 +194,35 @@ public class ItemClickHandler {
         launcher.startActivitySafely(v, intent, item);
     }
 
+    /**
+     * Handles clicking on a disabled shortcut
+     */
+    public static void handleDisabledItemClicked(WorkspaceItemInfo shortcut, Context context) {
+        final int disabledFlags = shortcut.runtimeStatusFlags
+                & WorkspaceItemInfo.FLAG_DISABLED_MASK;
+        if ((disabledFlags
+                & ~FLAG_DISABLED_SUSPENDED
+                & ~FLAG_DISABLED_QUIET_USER) == 0) {
+            // If the app is only disabled because of the above flags, launch activity anyway.
+            // Framework will tell the user why the app is suspended.
+        } else {
+            if (!TextUtils.isEmpty(shortcut.disabledMessage)) {
+                // Use a message specific to this shortcut, if it has one.
+                Toast.makeText(context, shortcut.disabledMessage, Toast.LENGTH_SHORT).show();
+                return;
+            }
+            // Otherwise just use a generic error message.
+            int error = R.string.activity_not_available;
+            if ((shortcut.runtimeStatusFlags & FLAG_DISABLED_SAFEMODE) != 0) {
+                error = R.string.safemode_shortcut_error;
+            } else if ((shortcut.runtimeStatusFlags & FLAG_DISABLED_BY_PUBLISHER) != 0
+                    || (shortcut.runtimeStatusFlags & FLAG_DISABLED_LOCKED_USER) != 0) {
+                error = R.string.shortcut_not_available;
+            }
+            Toast.makeText(context, error, Toast.LENGTH_SHORT).show();
+        }
+    }
+
     /**
      * Event handler for an app shortcut click.
      *
@@ -200,30 +230,8 @@ public class ItemClickHandler {
      */
     public static void onClickAppShortcut(View v, WorkspaceItemInfo shortcut, Launcher launcher) {
         if (shortcut.isDisabled()) {
-            final int disabledFlags = shortcut.runtimeStatusFlags
-                    & WorkspaceItemInfo.FLAG_DISABLED_MASK;
-            if ((disabledFlags &
-                    ~FLAG_DISABLED_SUSPENDED &
-                    ~FLAG_DISABLED_QUIET_USER) == 0) {
-                // If the app is only disabled because of the above flags, launch activity anyway.
-                // Framework will tell the user why the app is suspended.
-            } else {
-                if (!TextUtils.isEmpty(shortcut.disabledMessage)) {
-                    // Use a message specific to this shortcut, if it has one.
-                    Toast.makeText(launcher, shortcut.disabledMessage, Toast.LENGTH_SHORT).show();
-                    return;
-                }
-                // Otherwise just use a generic error message.
-                int error = R.string.activity_not_available;
-                if ((shortcut.runtimeStatusFlags & FLAG_DISABLED_SAFEMODE) != 0) {
-                    error = R.string.safemode_shortcut_error;
-                } else if ((shortcut.runtimeStatusFlags & FLAG_DISABLED_BY_PUBLISHER) != 0 ||
-                        (shortcut.runtimeStatusFlags & FLAG_DISABLED_LOCKED_USER) != 0) {
-                    error = R.string.shortcut_not_available;
-                }
-                Toast.makeText(launcher, error, Toast.LENGTH_SHORT).show();
-                return;
-            }
+            handleDisabledItemClicked(shortcut, launcher);
+            return;
         }
 
         // Check for abandoned promise
-- 
GitLab


From f8b1c3b38ee438498097ffd06339050137589f2b Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 20 May 2021 20:18:47 +0000
Subject: [PATCH 1239/1664] Revert "Revert "Renaming TaskbarController to
 LauncherTaskbarUIC..."

Revert submission 14664190

Reason for revert: Errorprone fixed in ag/14667108
Reverted Changes:
Icd1ddd43e:Revert "Renaming TaskbarController to LauncherTask...
I465013697:Revert "Moving taskbar lifecycle to TouchInteracti...

Change-Id: I1dcccb43d8206830e2b7c1974e775c94ac8c542f
Bug: 187353581
---
 .../launcher3/BaseQuickstepLauncher.java      | 20 ++++++++--------
 .../HotseatPredictionController.java          |  4 ++--
 ....java => LauncherTaskbarUIController.java} |  9 +++----
 .../taskbar/TaskbarAnimationController.java   |  2 +-
 .../launcher3/taskbar/TaskbarManager.java     |  4 ++--
 .../uioverrides/QuickstepLauncher.java        |  6 ++---
 .../quickstep/LauncherActivityInterface.java  | 24 +++++++++----------
 7 files changed, 35 insertions(+), 34 deletions(-)
 rename quickstep/src/com/android/launcher3/taskbar/{TaskbarController.java => LauncherTaskbarUIController.java} (97%)

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 300654e657..0b41f15b42 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -50,7 +50,7 @@ import com.android.launcher3.proxy.StartActivityParams;
 import com.android.launcher3.statehandlers.BackButtonAlphaHandler;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
-import com.android.launcher3.taskbar.TaskbarController;
+import com.android.launcher3.taskbar.LauncherTaskbarUIController;
 import com.android.launcher3.taskbar.TaskbarManager;
 import com.android.launcher3.taskbar.TaskbarStateHandler;
 import com.android.launcher3.uioverrides.RecentsViewStateController;
@@ -97,7 +97,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
     private OverviewActionsView mActionsView;
 
     private @Nullable TaskbarManager mTaskbarManager;
-    private @Nullable TaskbarController mTaskbarController;
+    private @Nullable LauncherTaskbarUIController mTaskbarUIController;
     private final ServiceConnection mTisBinderConnection = new ServiceConnection() {
         @Override
         public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
@@ -262,8 +262,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
 
     }
 
-    public void setTaskbarController(TaskbarController taskbarController) {
-        mTaskbarController = taskbarController;
+    public void setTaskbarUIController(LauncherTaskbarUIController taskbarUIController) {
+        mTaskbarUIController = taskbarUIController;
     }
 
     public <T extends OverviewActionsView> T getActionsView() {
@@ -293,8 +293,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
         return mDepthController;
     }
 
-    public @Nullable TaskbarController getTaskbarController() {
-        return mTaskbarController;
+    public @Nullable LauncherTaskbarUIController getTaskbarUIController() {
+        return mTaskbarUIController;
     }
 
     public TaskbarStateHandler getTaskbarStateHandler() {
@@ -350,8 +350,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
 
     @Override
     public float getNormalTaskbarScale() {
-        if (mTaskbarController != null) {
-            return mTaskbarController.getTaskbarScaleOnHome();
+        if (mTaskbarUIController != null) {
+            return mTaskbarUIController.getTaskbarScaleOnHome();
         }
         return super.getNormalTaskbarScale();
     }
@@ -373,8 +373,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
         }
 
         if ((changeBits & ACTIVITY_STATE_RESUMED) != 0) {
-            if (mTaskbarController != null) {
-                mTaskbarController.onLauncherResumedOrPaused(hasBeenResumed());
+            if (mTaskbarUIController != null) {
+                mTaskbarUIController.onLauncherResumedOrPaused(hasBeenResumed());
             }
         }
 
diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
index 5dcf84c249..85e5ab0a9b 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
@@ -263,8 +263,8 @@ public class HotseatPredictionController implements DragController.DragListener,
             removeOutlineDrawings();
         }
 
-        if (mLauncher.getTaskbarController() != null) {
-            mLauncher.getTaskbarController().onHotseatUpdated();
+        if (mLauncher.getTaskbarUIController() != null) {
+            mLauncher.getTaskbarUIController().onHotseatUpdated();
         }
     }
 
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
similarity index 97%
rename from quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
rename to quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
index cdae5beb9a..67264194b2 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
@@ -38,7 +38,7 @@ import com.android.launcher3.states.StateAnimationConfig;
  * TODO: Rename to have Launcher prefix
  */
 
-public class TaskbarController extends TaskbarUIController {
+public class LauncherTaskbarUIController extends TaskbarUIController {
 
     private final BaseQuickstepLauncher mLauncher;
     private final TaskbarStateHandler mTaskbarStateHandler;
@@ -52,7 +52,8 @@ public class TaskbarController extends TaskbarUIController {
     private @Nullable Animator mAnimator;
     private boolean mIsAnimatingToLauncher;
 
-    public TaskbarController(BaseQuickstepLauncher launcher, TaskbarActivityContext context) {
+    public LauncherTaskbarUIController(
+            BaseQuickstepLauncher launcher, TaskbarActivityContext context) {
         mContext = context;
         mTaskbarContainerView = context.getDragLayer();
         mTaskbarView = mTaskbarContainerView.findViewById(R.id.taskbar_view);
@@ -72,7 +73,7 @@ public class TaskbarController extends TaskbarUIController {
         mHotseatController.init();
         setTaskbarViewVisible(!mLauncher.hasBeenResumed());
         alignRealHotseatWithTaskbar();
-        mLauncher.setTaskbarController(this);
+        mLauncher.setTaskbarUIController(this);
     }
 
     @Override
@@ -86,7 +87,7 @@ public class TaskbarController extends TaskbarUIController {
         mHotseatController.cleanup();
         setTaskbarViewVisible(true);
         mLauncher.getHotseat().setIconsAlpha(1f);
-        mLauncher.setTaskbarController(null);
+        mLauncher.setTaskbarUIController(null);
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java
index 815efb9728..e20ddf88ce 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java
@@ -21,7 +21,7 @@ import android.animation.Animator;
 
 import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.taskbar.TaskbarController.TaskbarAnimationControllerCallbacks;
+import com.android.launcher3.taskbar.LauncherTaskbarUIController.TaskbarAnimationControllerCallbacks;
 import com.android.quickstep.AnimatedFloat;
 import com.android.quickstep.SystemUiProxy;
 import com.android.systemui.shared.system.QuickStepContract;
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
index b9eec93687..65c87bd279 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
@@ -97,7 +97,7 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen
         if (mTaskbarActivityContext != null) {
             mTaskbarActivityContext.setUIController(mLauncher == null
                     ? TaskbarUIController.DEFAULT
-                    : new TaskbarController(launcher, mTaskbarActivityContext));
+                    : new LauncherTaskbarUIController(launcher, mTaskbarActivityContext));
         }
     }
 
@@ -115,7 +115,7 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen
         mTaskbarActivityContext.init();
         if (mLauncher != null) {
             mTaskbarActivityContext.setUIController(
-                    new TaskbarController(mLauncher, mTaskbarActivityContext));
+                    new LauncherTaskbarUIController(mLauncher, mTaskbarActivityContext));
         }
     }
 
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 45bb521336..f0b02b3c47 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -165,7 +165,7 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
     @Override
     public boolean startActivitySafely(View v, Intent intent, ItemInfo item) {
         // Only pause is taskbar controller is not present
-        mHotseatPredictionController.setPauseUIUpdate(getTaskbarController() == null);
+        mHotseatPredictionController.setPauseUIUpdate(getTaskbarUIController() == null);
         return super.startActivitySafely(v, intent, item);
     }
 
@@ -233,9 +233,9 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
     @Override
     public void bindWorkspaceItemsChanged(List<WorkspaceItemInfo> updated) {
         super.bindWorkspaceItemsChanged(updated);
-        if (getTaskbarController() != null && updated.stream()
+        if (getTaskbarUIController() != null && updated.stream()
                 .filter(w -> w.container == CONTAINER_HOTSEAT).findFirst().isPresent()) {
-            getTaskbarController().onHotseatUpdated();
+            getTaskbarUIController().onHotseatUpdated();
         }
     }
 
diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
index ff69180d33..9014774ae7 100644
--- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
@@ -41,7 +41,7 @@ import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.statehandlers.DepthController.ClampedDepthProperty;
 import com.android.launcher3.statemanager.StateManager;
-import com.android.launcher3.taskbar.TaskbarController;
+import com.android.launcher3.taskbar.LauncherTaskbarUIController;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.quickstep.GestureState.GestureEndTarget;
 import com.android.quickstep.SysUINavigationMode.Mode;
@@ -163,12 +163,12 @@ public final class LauncherActivityInterface extends
     }
 
     @Nullable
-    private TaskbarController getTaskbarController() {
+    private LauncherTaskbarUIController getTaskbarController() {
         BaseQuickstepLauncher launcher = getCreatedActivity();
         if (launcher == null) {
             return null;
         }
-        return launcher.getTaskbarController();
+        return launcher.getTaskbarUIController();
     }
 
     @Nullable
@@ -276,13 +276,13 @@ public final class LauncherActivityInterface extends
     @Override
     public @Nullable Animator getParallelAnimationToLauncher(GestureEndTarget endTarget,
             long duration) {
-        TaskbarController taskbarController = getTaskbarController();
+        LauncherTaskbarUIController uiController = getTaskbarController();
         Animator superAnimator = super.getParallelAnimationToLauncher(endTarget, duration);
-        if (taskbarController == null) {
+        if (uiController == null) {
             return superAnimator;
         }
         LauncherState toState = stateFromGestureEndTarget(endTarget);
-        Animator taskbarAnimator = taskbarController.createAnimToLauncher(toState, duration);
+        Animator taskbarAnimator = uiController.createAnimToLauncher(toState, duration);
         if (superAnimator == null) {
             return taskbarAnimator;
         } else {
@@ -300,20 +300,20 @@ public final class LauncherActivityInterface extends
 
     @Override
     public boolean deferStartingActivity(RecentsAnimationDeviceState deviceState, MotionEvent ev) {
-        TaskbarController taskbarController = getTaskbarController();
-        if (taskbarController == null) {
+        LauncherTaskbarUIController uiController = getTaskbarController();
+        if (uiController == null) {
             return super.deferStartingActivity(deviceState, ev);
         }
-        return taskbarController.isEventOverAnyTaskbarItem(ev);
+        return uiController.isEventOverAnyTaskbarItem(ev);
     }
 
     @Override
     public boolean shouldCancelCurrentGesture() {
-        TaskbarController taskbarController = getTaskbarController();
-        if (taskbarController == null) {
+        LauncherTaskbarUIController uiController = getTaskbarController();
+        if (uiController == null) {
             return super.shouldCancelCurrentGesture();
         }
-        return taskbarController.isDraggingItem();
+        return uiController.isDraggingItem();
     }
 
     @Override
-- 
GitLab


From 301eaf2b8c7bb49093f8a958de6d4f6901b676f1 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 20 May 2021 13:45:58 -0700
Subject: [PATCH 1240/1664] Initiate taskbar only after the user is unlocked

Bug: 188755902
Test: Presubmit
Change-Id: Ida4bc07f45396e82ab404a617aa6833afeea78bc
---
 .../android/launcher3/taskbar/TaskbarManager.java   | 13 +++++++++++++
 .../android/quickstep/TouchInteractionService.java  |  1 +
 2 files changed, 14 insertions(+)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
index 65c87bd279..263aa1142d 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
@@ -57,6 +57,8 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen
     private static final int CHANGE_FLAGS =
             CHANGE_ACTIVE_SCREEN | CHANGE_DENSITY | CHANGE_SUPPORTED_BOUNDS;
 
+    private boolean mUserUnlocked = false;
+
     public TaskbarManager(TouchInteractionService service) {
         mDisplayController = DisplayController.INSTANCE.get(service);
         mSysUINavigationMode = SysUINavigationMode.INSTANCE.get(service);
@@ -89,6 +91,14 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen
         }
     }
 
+    /**
+     * Called when the user is unlocked
+     */
+    public void onUserUnlocked() {
+        mUserUnlocked = true;
+        recreateTaskbar();
+    }
+
     /**
      * Sets or clears a launcher to act as taskbar callback
      */
@@ -106,6 +116,9 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen
         if (!FeatureFlags.ENABLE_TASKBAR.get()) {
             return;
         }
+        if (!mUserUnlocked) {
+            return;
+        }
         DeviceProfile dp = LauncherAppState.getIDP(mContext).getDeviceProfile(mContext);
         if (!dp.isTaskbarPresent) {
             return;
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index d95f7b7fed..7956fcc562 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -325,6 +325,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
         mDeviceState.addNavigationModeChangedCallback(this::onNavigationModeChanged);
         mDeviceState.addOneHandedModeChangedCallback(this::onOneHandedModeOverlayChanged);
         mDeviceState.runOnUserUnlocked(this::onUserUnlocked);
+        mDeviceState.runOnUserUnlocked(mTaskbarManager::onUserUnlocked);
         ProtoTracer.INSTANCE.get(this).add(this);
         sConnected = true;
     }
-- 
GitLab


From 260c38c4a0ac99f171a18adf27541dcdcf86c13d Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Fri, 21 May 2021 10:49:03 +0100
Subject: [PATCH 1241/1664] Align 'No widgets available' text box properly in
 Widget picker.

Bug: 186209657
Test: Tested manually
Change-Id: I85fa43cd745a8c9f9601d25ed3a35f512506234d
---
 ...rchAndRecommendationsScrollController.java | 30 ++++++++++++++-
 .../widget/picker/WidgetsFullSheet.java       | 37 +++++++++++++++----
 2 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java b/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java
index 6781824d74..664377999d 100644
--- a/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java
+++ b/src/com/android/launcher3/widget/picker/SearchAndRecommendationsScrollController.java
@@ -21,6 +21,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup.MarginLayoutParams;
 import android.widget.RelativeLayout;
+import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 
@@ -39,9 +40,11 @@ final class SearchAndRecommendationsScrollController implements
     private final View mSearchAndRecommendationViewParent;
     private final WidgetsRecyclerView mPrimaryRecyclerView;
     private final WidgetsRecyclerView mSearchRecyclerView;
+    private final TextView mNoWidgetsView;
     private final int mTabsHeight;
     private final ValueAnimator mAnimator = ValueAnimator.ofInt(0, 0);
     private final Point mTempOffset = new Point();
+    private int mBottomInset;
 
     // The following are only non null if mHasWorkProfile is true.
     @Nullable private final WidgetsRecyclerView mWorkRecyclerView;
@@ -81,7 +84,8 @@ final class SearchAndRecommendationsScrollController implements
             @Nullable WidgetsRecyclerView workRecyclerView,
             WidgetsRecyclerView searchRecyclerView,
             @Nullable View personalWorkTabsView,
-            @Nullable PersonalWorkPagedView primaryWorkViewPager) {
+            @Nullable PersonalWorkPagedView primaryWorkViewPager,
+            TextView noWidgetsView) {
         mHasWorkProfile = hasWorkProfile;
         mViewHolder = viewHolder;
         mViewHolder.mContainer.setSearchAndRecommendationScrollController(this);
@@ -92,6 +96,7 @@ final class SearchAndRecommendationsScrollController implements
         mPrimaryWorkTabsView = personalWorkTabsView;
         mPrimaryWorkViewPager = primaryWorkViewPager;
         mTabsHeight = tabsHeight;
+        mNoWidgetsView = noWidgetsView;
         setCurrentRecyclerView(mPrimaryRecyclerView, /* animateReset= */ false);
     }
 
@@ -113,6 +118,15 @@ final class SearchAndRecommendationsScrollController implements
         reset(animateReset);
     }
 
+    /**
+     * Updates padding of {@link WidgetsFullSheet} contents to include {@code bottomInset} wherever
+     * necessary.
+     */
+    public boolean updateBottomInset(int bottomInset) {
+        mBottomInset = bottomInset;
+        return updateMarginAndPadding();
+    }
+
     /**
      * Updates the margin and padding of {@link WidgetsFullSheet} to accumulate collapsible views.
      *
@@ -129,6 +143,8 @@ final class SearchAndRecommendationsScrollController implements
                         + measureHeightWithVerticalMargins(mViewHolder.mRecommendedWidgetsTable);
 
         int topContainerHeight = measureHeightWithVerticalMargins(mViewHolder.mContainer);
+        int noWidgetsViewHeight =  topContainerHeight - mBottomInset;
+
         if (mHasWorkProfile) {
             mCollapsibleHeightForTabs = measureHeightWithVerticalMargins(mViewHolder.mHeaderTitle)
                     + measureHeightWithVerticalMargins(mViewHolder.mRecommendedWidgetsTable);
@@ -180,6 +196,10 @@ final class SearchAndRecommendationsScrollController implements
             int topOffsetAfterAllViewsCollapsed =
                     topContainerHeight + mTabsHeight - mCollapsibleHeightForTabs;
 
+            if (mPrimaryWorkTabsView.getVisibility() == View.VISIBLE) {
+                noWidgetsViewHeight += mTabsHeight;
+            }
+
             RelativeLayout.LayoutParams viewPagerLayoutParams =
                     (RelativeLayout.LayoutParams) mPrimaryWorkViewPager.getLayoutParams();
             if (viewPagerLayoutParams.topMargin != topOffsetAfterAllViewsCollapsed) {
@@ -222,6 +242,14 @@ final class SearchAndRecommendationsScrollController implements
                     mSearchRecyclerView.getPaddingBottom());
             hasMarginOrPaddingUpdated = true;
         }
+        if (mNoWidgetsView.getPaddingTop() != noWidgetsViewHeight) {
+            mNoWidgetsView.setPadding(
+                    mNoWidgetsView.getPaddingLeft(),
+                    noWidgetsViewHeight,
+                    mNoWidgetsView.getPaddingRight(),
+                    mNoWidgetsView.getPaddingBottom());
+            hasMarginOrPaddingUpdated = true;
+        }
         return hasMarginOrPaddingUpdated;
     }
 
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 42ff249a4a..039cad8291 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -92,8 +92,8 @@ public class WidgetsFullSheet extends BaseWidgetSheet
     private final boolean mHasWorkProfile;
     private final SparseArray<AdapterHolder> mAdapters = new SparseArray();
     private final UserHandle mCurrentUser = Process.myUserHandle();
-    private final Predicate<WidgetsListBaseEntry> mPrimaryWidgetsFilter = entry ->
-            mCurrentUser.equals(entry.mPkgItem.user);
+    private final Predicate<WidgetsListBaseEntry> mPrimaryWidgetsFilter =
+            entry -> mCurrentUser.equals(entry.mPkgItem.user);
     private final Predicate<WidgetsListBaseEntry> mWorkWidgetsFilter =
             mPrimaryWidgetsFilter.negate();
     private final OnLayoutChangeListener mLayoutChangeListenerToShowTips =
@@ -131,6 +131,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
     @Nullable private WidgetsRecyclerView mCurrentWidgetsRecyclerView;
     @Nullable private PersonalWorkPagedView mViewPager;
     private boolean mIsInSearchMode;
+    private boolean mIsNoWidgetsViewNeeded;
     private int mMaxSpansPerRow = 4;
     private View mTabsView;
     private TextView mNoWidgetsView;
@@ -187,6 +188,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
 
         layoutInflater.inflate(R.layout.widgets_full_sheet_search_and_recommendations, springLayout,
                 true);
+        mNoWidgetsView = findViewById(R.id.no_widgets_text);
         mSearchAndRecommendationViewHolder = new SearchAndRecommendationViewHolder(
                 findViewById(R.id.search_and_recommendations_container));
         mSearchAndRecommendationsScrollController = new SearchAndRecommendationsScrollController(
@@ -197,10 +199,10 @@ public class WidgetsFullSheet extends BaseWidgetSheet
                 mHasWorkProfile ? findViewById(R.id.work_widgets_list_view) : null,
                 findViewById(R.id.search_widgets_list_view),
                 mTabsView,
-                mViewPager);
+                mViewPager,
+                mNoWidgetsView);
         fastScroller.setOnFastScrollChangeListener(mSearchAndRecommendationsScrollController);
 
-        mNoWidgetsView = findViewById(R.id.no_widgets_text);
 
         onRecommendedWidgetsBound();
         onWidgetsBound();
@@ -295,6 +297,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         if (mHasWorkProfile) {
             setBottomPadding(mAdapters.get(AdapterHolder.WORK).mWidgetsRecyclerView, insets.bottom);
         }
+        mSearchAndRecommendationsScrollController.updateBottomInset(insets.bottom);
         if (insets.bottom > 0) {
             setupNavBarColor();
         } else {
@@ -410,6 +413,16 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         } else {
             updateRecyclerViewVisibility(primaryUserAdapterHolder);
         }
+        // Update recommended widgets section so that it occupies appropriate space on screen to
+        // leave enough space for presence/absence of mNoWidgetsView.
+        boolean isNoWidgetsViewNeeded =
+                mAdapters.get(AdapterHolder.PRIMARY).mWidgetsListAdapter.getItemCount() == 0
+                        || (mHasWorkProfile && mAdapters.get(AdapterHolder.WORK)
+                                .mWidgetsListAdapter.getItemCount() == 0);
+        if (mIsNoWidgetsViewNeeded != isNoWidgetsViewNeeded) {
+            mIsNoWidgetsViewNeeded = isNoWidgetsViewNeeded;
+            onRecommendedWidgetsBound();
+        }
     }
 
     @Override
@@ -476,9 +489,19 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         WidgetsRecommendationTableLayout table =
                 mSearchAndRecommendationViewHolder.mRecommendedWidgetsTable;
         if (recommendedWidgets.size() > 0) {
-            float maxTableHeight =
-                    (mActivityContext.getDeviceProfile().availableHeightPx - mTabsHeight
-                            - getHeaderViewHeight()) * RECOMMENDATION_TABLE_HEIGHT_RATIO;
+            float noWidgetsViewHeight = 0;
+            if (mIsNoWidgetsViewNeeded) {
+                // Make sure recommended section leaves enough space for noWidgetsView.
+                Rect noWidgetsViewTextBounds = new Rect();
+                mNoWidgetsView.getPaint()
+                        .getTextBounds(mNoWidgetsView.getText().toString(), /* start= */ 0,
+                                mNoWidgetsView.getText().length(), noWidgetsViewTextBounds);
+                noWidgetsViewHeight = noWidgetsViewTextBounds.height();
+            }
+            float maxTableHeight = (mActivityContext.getDeviceProfile().availableHeightPx
+                                        - mTabsHeight - getHeaderViewHeight() - noWidgetsViewHeight)
+                                                * RECOMMENDATION_TABLE_HEIGHT_RATIO;
+
             List<ArrayList<WidgetItem>> recommendedWidgetsInTable =
                     WidgetsTableUtils.groupWidgetItemsIntoTable(recommendedWidgets,
                             mMaxSpansPerRow);
-- 
GitLab


From fd0ac0ea8ceb23d6e7cd90d4e83c92c449e7d041 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Fri, 21 May 2021 10:43:56 -0700
Subject: [PATCH 1242/1664] Improve diagnostics when cannot install wellbeing
 test apk

This apk is used for Wellbeing tests.

Test: local
Bug: 187761685
Change-Id: I66f7c308b70b6bd048806d6417417a6e398605db
---
 tests/src/com/android/launcher3/util/TestUtil.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/src/com/android/launcher3/util/TestUtil.java b/tests/src/com/android/launcher3/util/TestUtil.java
index 55e57440c8..67f3902095 100644
--- a/tests/src/com/android/launcher3/util/TestUtil.java
+++ b/tests/src/com/android/launcher3/util/TestUtil.java
@@ -22,6 +22,8 @@ import android.content.res.Resources;
 
 import androidx.test.uiautomator.UiDevice;
 
+import org.junit.Assert;
+
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -48,7 +50,10 @@ public class TestUtil {
         in.close();
         out.close();
 
-        UiDevice.getInstance(getInstrumentation()).executeShellCommand("pm install " + apkFilename);
+        final String result = UiDevice.getInstance(getInstrumentation())
+                .executeShellCommand("pm install " + apkFilename);
+        Assert.assertTrue("Failed to install wellbeing test apk; make sure the device is rooted",
+                "Success".equals(result.replaceAll("\\s+", "")));
     }
 
     public static void uninstallDummyApp() throws IOException {
-- 
GitLab


From e9d27f137ff90004538f53a3fa5d87593fe6d36f Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 21 May 2021 12:27:33 -0700
Subject: [PATCH 1243/1664] Updating method for getting themed icon

Bug: 183641907
Test: Manual
Change-Id: I417886acea1b518c184d8e7c649367cae841a7e4
---
 src/com/android/launcher3/Utilities.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 2884fba08d..cb9e1f3a5c 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -74,10 +74,10 @@ import androidx.core.os.BuildCompat;
 import com.android.launcher3.dragndrop.FolderAdaptiveIcon;
 import com.android.launcher3.graphics.GridCustomizationsProvider;
 import com.android.launcher3.graphics.TintedDrawableSpan;
+import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.icons.ShortcutCachingLogic;
-import com.android.launcher3.icons.ThemedIconDrawable.ThemedAdaptiveIcon;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.pm.ShortcutConfigActivityInfo;
@@ -654,8 +654,8 @@ public final class Utilities {
     public static Drawable getFullDrawable(Launcher launcher, ItemInfo info, int width, int height,
             Object[] outObj) {
         Drawable icon = loadFullDrawableWithoutTheme(launcher, info, width, height, outObj);
-        if (icon instanceof ThemedAdaptiveIcon) {
-            icon = ((ThemedAdaptiveIcon) icon).getThemedDrawable(launcher);
+        if (icon instanceof BitmapInfo.Extender) {
+            icon = ((BitmapInfo.Extender) icon).getThemedDrawable(launcher);
         }
         return icon;
     }
-- 
GitLab


From 67555872190572fedbb7d14eaf276528e25213b3 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 21 May 2021 12:56:55 -0700
Subject: [PATCH 1244/1664] Using icon color for dot and halo

Bug: 188839628
Test: Manual
Change-Id: I8a393cc7073d5a249619b4033ec860c55f17167a
---
 .../com/android/launcher3/uioverrides/PredictedAppIcon.java   | 4 +---
 src/com/android/launcher3/BubbleTextView.java                 | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
index 5ba1fe17b2..d839a36213 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
@@ -35,7 +35,6 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.R;
-import com.android.launcher3.graphics.IconPalette;
 import com.android.launcher3.icons.GraphicsUtils;
 import com.android.launcher3.icons.IconNormalizer;
 import com.android.launcher3.icons.LauncherIcons;
@@ -112,8 +111,7 @@ public class PredictedAppIcon extends DoubleShadowBubbleTextView {
     @Override
     public void applyFromWorkspaceItem(WorkspaceItemInfo info) {
         super.applyFromWorkspaceItem(info);
-        int color = IconPalette.getMutedColor(info.bitmap.color, 0.54f);
-        mPlateColor = ColorUtils.setAlphaComponent(color, 200);
+        mPlateColor = ColorUtils.setAlphaComponent(mDotParams.color, 200);
         if (mIsPinned) {
             setContentDescription(info.contentDescription);
         } else {
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 322c6eed29..786678631f 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -140,7 +140,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
     private DotInfo mDotInfo;
     private DotRenderer mDotRenderer;
     @ViewDebug.ExportedProperty(category = "launcher", deepExport = true)
-    private DotRenderer.DrawParams mDotParams;
+    protected DotRenderer.DrawParams mDotParams;
     private Animator mDotScaleAnim;
     private boolean mForceHideDot;
 
@@ -319,7 +319,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
     protected void applyIconAndLabel(ItemInfoWithIcon info) {
         boolean useTheme = mDisplay == DISPLAY_WORKSPACE || mDisplay == DISPLAY_FOLDER;
         FastBitmapDrawable iconDrawable = info.newIcon(getContext(), useTheme);
-        mDotParams.color = IconPalette.getMutedColor(info.bitmap.color, 0.54f);
+        mDotParams.color = IconPalette.getMutedColor(iconDrawable.getIconColor(), 0.54f);
 
         setIcon(iconDrawable);
         applyLabel(info);
-- 
GitLab


From 55845135007320487963a8c2f777f54bd3bf2ff2 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 21 May 2021 14:41:30 -0700
Subject: [PATCH 1245/1664] Renamin TaskbarContainerView to TaskbarDragLayer

Bug: 187353581
Test: Presubmit
Change-Id: I9164a956aaa896111f287ab4e97b091a7d4d30ee
---
 quickstep/res/layout/taskbar.xml              |  4 +--
 .../taskbar/LauncherTaskbarUIController.java  | 12 +++----
 .../taskbar/TaskbarActivityContext.java       | 35 +++++++++++++------
 ...ntainerView.java => TaskbarDragLayer.java} | 12 +++----
 .../taskbar/TaskbarIconController.java        | 34 +++++++++---------
 .../launcher3/taskbar/TaskbarManager.java     |  5 ++-
 .../taskbar/TaskbarUIController.java          |  2 +-
 7 files changed, 58 insertions(+), 46 deletions(-)
 rename quickstep/src/com/android/launcher3/taskbar/{TaskbarContainerView.java => TaskbarDragLayer.java} (90%)

diff --git a/quickstep/res/layout/taskbar.xml b/quickstep/res/layout/taskbar.xml
index c4362214cb..e680233e6a 100644
--- a/quickstep/res/layout/taskbar.xml
+++ b/quickstep/res/layout/taskbar.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<com.android.launcher3.taskbar.TaskbarContainerView
+<com.android.launcher3.taskbar.TaskbarDragLayer
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/taskbar_container"
     android:layout_width="wrap_content"
@@ -52,4 +52,4 @@
         android:layout_height="wrap_content"
         android:visibility="gone"/>
 
-</com.android.launcher3.taskbar.TaskbarContainerView>
\ No newline at end of file
+</com.android.launcher3.taskbar.TaskbarDragLayer>
\ No newline at end of file
diff --git a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
index 67264194b2..c2d107c22d 100644
--- a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
@@ -46,7 +46,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
     private final TaskbarHotseatController mHotseatController;
 
     private final TaskbarActivityContext mContext;
-    final TaskbarContainerView mTaskbarContainerView;
+    final TaskbarDragLayer mTaskbarDragLayer;
     final TaskbarView mTaskbarView;
 
     private @Nullable Animator mAnimator;
@@ -55,8 +55,8 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
     public LauncherTaskbarUIController(
             BaseQuickstepLauncher launcher, TaskbarActivityContext context) {
         mContext = context;
-        mTaskbarContainerView = context.getDragLayer();
-        mTaskbarView = mTaskbarContainerView.findViewById(R.id.taskbar_view);
+        mTaskbarDragLayer = context.getDragLayer();
+        mTaskbarView = mTaskbarDragLayer.findViewById(R.id.taskbar_view);
 
         mLauncher = launcher;
         mTaskbarStateHandler = mLauncher.getTaskbarStateHandler();
@@ -99,7 +99,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
         return new TaskbarAnimationControllerCallbacks() {
             @Override
             public void updateTaskbarBackgroundAlpha(float alpha) {
-                mTaskbarContainerView.setTaskbarBackgroundAlpha(alpha);
+                mTaskbarDragLayer.setTaskbarBackgroundAlpha(alpha);
             }
 
             @Override
@@ -109,7 +109,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
 
             @Override
             public void updateImeBarVisibilityAlpha(float alpha) {
-                mTaskbarContainerView.updateImeBarVisibilityAlpha(alpha);
+                mTaskbarDragLayer.updateImeBarVisibilityAlpha(alpha);
             }
 
             @Override
@@ -202,7 +202,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
     }
 
     @Override
-    protected void onImeVisible(TaskbarContainerView containerView, boolean isVisible) {
+    protected void onImeVisible(TaskbarDragLayer containerView, boolean isVisible) {
         mTaskbarAnimationController.animateToVisibilityForIme(isVisible ? 0 : 1);
     }
 
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
index 70f278874a..8c3d453b09 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
@@ -87,7 +87,7 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ
 
     private final DeviceProfile mDeviceProfile;
     private final LayoutInflater mLayoutInflater;
-    private final TaskbarContainerView mTaskbarContainerView;
+    private final TaskbarDragLayer mDragLayer;
     private final TaskbarIconController mIconController;
     private final MyDragController mDragController;
 
@@ -123,9 +123,9 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ
         mDeviceProfile.updateIconSize(iconScale, getResources());
 
         mLayoutInflater = LayoutInflater.from(this).cloneInContext(this);
-        mTaskbarContainerView = (TaskbarContainerView) mLayoutInflater
+        mDragLayer = (TaskbarDragLayer) mLayoutInflater
                 .inflate(R.layout.taskbar, null, false);
-        mIconController = new TaskbarIconController(this, mTaskbarContainerView);
+        mIconController = new TaskbarIconController(this, mDragLayer);
         mDragController = new MyDragController(this);
 
         Display display = windowContext.getDisplay();
@@ -157,7 +157,7 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ
         );
 
         mIconController.init(mOnTaskbarIconClickListener, mOnTaskbarIconLongClickListener);
-        mWindowManager.addView(mTaskbarContainerView, mWindowLayoutParams);
+        mWindowManager.addView(mDragLayer, mWindowLayoutParams);
     }
 
     /**
@@ -168,7 +168,7 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ
             return;
         }
         mWindowLayoutParams.height = height;
-        mWindowManager.updateViewLayout(mTaskbarContainerView, mWindowLayoutParams);
+        mWindowManager.updateViewLayout(mDragLayer, mWindowLayoutParams);
     }
 
     public boolean canShowNavButtons() {
@@ -181,8 +181,8 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ
     }
 
     @Override
-    public TaskbarContainerView getDragLayer() {
-        return mTaskbarContainerView;
+    public TaskbarDragLayer getDragLayer() {
+        return mDragLayer;
     }
 
     @Override
@@ -192,7 +192,7 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ
 
     @Override
     public Rect getFolderBoundingBox() {
-        return mTaskbarContainerView.getFolderBoundingBox();
+        return mDragLayer.getFolderBoundingBox();
     }
 
     @Override
@@ -216,15 +216,28 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ
     public void onDestroy() {
         setUIController(TaskbarUIController.DEFAULT);
         mIconController.onDestroy();
-        mWindowManager.removeViewImmediate(mTaskbarContainerView);
+        mWindowManager.removeViewImmediate(mDragLayer);
     }
 
     void onNavigationButtonClick(@TaskbarButton int buttonType) {
         mNavButtonController.onButtonClick(buttonType);
     }
 
-    public TaskbarIconController getIconController() {
-        return mIconController;
+    /**
+     * Should be called when the IME visibility changes, so we can hide/show Taskbar accordingly.
+     */
+    public void setImeIsVisible(boolean isImeVisible) {
+        mIconController.setImeIsVisible(isImeVisible);
+    }
+
+    /**
+     * When in 3 button nav, the above doesn't get called since we prevent sysui nav bar from
+     * instantiating at all, which is what's responsible for sending sysui state flags over.
+     *
+     * @param vis IME visibility flag
+     */
+    public void updateImeStatus(int displayId, int vis, boolean showImeSwitcher) {
+        mIconController.updateImeStatus(displayId, vis, showImeSwitcher);
     }
 
     /**
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayer.java
similarity index 90%
rename from quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
rename to quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayer.java
index 5034791f0e..45ec911527 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarContainerView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayer.java
@@ -35,7 +35,7 @@ import com.android.systemui.shared.system.ViewTreeObserverWrapper.OnComputeInset
 /**
  * Top-level ViewGroup that hosts the TaskbarView as well as Views created by it such as Folder.
  */
-public class TaskbarContainerView extends BaseDragLayer<TaskbarActivityContext> {
+public class TaskbarDragLayer extends BaseDragLayer<TaskbarActivityContext> {
 
     private final int mFolderMargin;
     private final Paint mTaskbarBackgroundPaint;
@@ -45,20 +45,20 @@ public class TaskbarContainerView extends BaseDragLayer<TaskbarActivityContext>
 
     private final OnComputeInsetsListener mTaskbarInsetsComputer = this::onComputeTaskbarInsets;
 
-    public TaskbarContainerView(@NonNull Context context) {
+    public TaskbarDragLayer(@NonNull Context context) {
         this(context, null);
     }
 
-    public TaskbarContainerView(@NonNull Context context, @Nullable AttributeSet attrs) {
+    public TaskbarDragLayer(@NonNull Context context, @Nullable AttributeSet attrs) {
         this(context, attrs, 0);
     }
 
-    public TaskbarContainerView(@NonNull Context context, @Nullable AttributeSet attrs,
+    public TaskbarDragLayer(@NonNull Context context, @Nullable AttributeSet attrs,
             int defStyleAttr) {
         this(context, attrs, defStyleAttr, 0);
     }
 
-    public TaskbarContainerView(@NonNull Context context, @Nullable AttributeSet attrs,
+    public TaskbarDragLayer(@NonNull Context context, @Nullable AttributeSet attrs,
             int defStyleAttr, int defStyleRes) {
         super(context, attrs, 1 /* alphaChannelCount */);
         mFolderMargin = getResources().getDimensionPixelSize(R.dimen.taskbar_folder_margin);
@@ -118,7 +118,7 @@ public class TaskbarContainerView extends BaseDragLayer<TaskbarActivityContext>
     public void onViewRemoved(View child) {
         super.onViewRemoved(child);
         if (mControllerCallbacks != null) {
-            mControllerCallbacks.onContainerViewRemoved();
+            mControllerCallbacks.onDragLayerViewRemoved();
         }
     }
 
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarIconController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarIconController.java
index 2a37915fcf..683a5b9fc4 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarIconController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarIconController.java
@@ -41,7 +41,7 @@ public class TaskbarIconController {
     private final Rect mTempRect = new Rect();
 
     private final TaskbarActivityContext mActivity;
-    private final TaskbarContainerView mContainerView;
+    private final TaskbarDragLayer mDragLayer;
 
     private final TaskbarView mTaskbarView;
     private final ImeBarView mImeBarView;
@@ -49,15 +49,15 @@ public class TaskbarIconController {
     @NonNull
     private TaskbarUIController mUIController = TaskbarUIController.DEFAULT;
 
-    TaskbarIconController(TaskbarActivityContext activity, TaskbarContainerView containerView) {
+    TaskbarIconController(TaskbarActivityContext activity, TaskbarDragLayer dragLayer) {
         mActivity = activity;
-        mContainerView = containerView;
-        mTaskbarView = mContainerView.findViewById(R.id.taskbar_view);
-        mImeBarView = mContainerView.findViewById(R.id.ime_bar_view);
+        mDragLayer = dragLayer;
+        mTaskbarView = mDragLayer.findViewById(R.id.taskbar_view);
+        mImeBarView = mDragLayer.findViewById(R.id.ime_bar_view);
     }
 
     public void init(OnClickListener clickListener, OnLongClickListener longClickListener) {
-        mContainerView.addOnLayoutChangeListener((v, a, b, c, d, e, f, g, h) ->
+        mDragLayer.addOnLayoutChangeListener((v, a, b, c, d, e, f, g, h) ->
                 mUIController.alignRealHotseatWithTaskbar());
 
         ButtonProvider buttonProvider = new ButtonProvider(mActivity);
@@ -65,11 +65,11 @@ public class TaskbarIconController {
         mTaskbarView.construct(clickListener, longClickListener, buttonProvider);
         mTaskbarView.getLayoutParams().height = mActivity.getDeviceProfile().taskbarSize;
 
-        mContainerView.init(new Callbacks(), mTaskbarView);
+        mDragLayer.init(new Callbacks(), mTaskbarView);
     }
 
     public void onDestroy() {
-        mContainerView.onDestroy();
+        mDragLayer.onDestroy();
     }
 
     public void setUIController(@NonNull TaskbarUIController uiController) {
@@ -96,11 +96,11 @@ public class TaskbarIconController {
      */
     public void setImeIsVisible(boolean isImeVisible) {
         mTaskbarView.setTouchesEnabled(!isImeVisible);
-        mUIController.onImeVisible(mContainerView, isImeVisible);
+        mUIController.onImeVisible(mDragLayer, isImeVisible);
     }
 
     /**
-     * Callbacks for {@link TaskbarContainerView} to interact with the icon controller
+     * Callbacks for {@link TaskbarDragLayer} to interact with the icon controller
      */
     public class Callbacks {
 
@@ -109,7 +109,7 @@ public class TaskbarIconController {
          */
         public void updateInsetsTouchability(InsetsInfo insetsInfo) {
             insetsInfo.touchableRegion.setEmpty();
-            if (mContainerView.getAlpha() < AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD) {
+            if (mDragLayer.getAlpha() < AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD) {
                 // Let touches pass through us.
                 insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION);
             } else if (mImeBarView.getVisibility() == VISIBLE) {
@@ -122,7 +122,7 @@ public class TaskbarIconController {
                 insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_FRAME);
             } else {
                 if (mTaskbarView.mSystemButtonContainer.getVisibility() == VISIBLE) {
-                    mContainerView.getDescendantRectRelativeToSelf(
+                    mDragLayer.getDescendantRectRelativeToSelf(
                             mTaskbarView.mSystemButtonContainer, mTempRect);
                     insetsInfo.touchableRegion.set(mTempRect);
                 }
@@ -135,15 +135,15 @@ public class TaskbarIconController {
             // mTaskbarView is, since its position never changes and insets rather than overlays.
             insetsInfo.contentInsets.left = mTaskbarView.getLeft();
             insetsInfo.contentInsets.top = mTaskbarView.getTop();
-            insetsInfo.contentInsets.right = mContainerView.getWidth() - mTaskbarView.getRight();
-            insetsInfo.contentInsets.bottom = mContainerView.getHeight() - mTaskbarView.getBottom();
+            insetsInfo.contentInsets.right = mDragLayer.getWidth() - mTaskbarView.getRight();
+            insetsInfo.contentInsets.bottom = mDragLayer.getHeight() - mTaskbarView.getBottom();
         }
 
-        public void onContainerViewRemoved() {
-            int count = mContainerView.getChildCount();
+        public void onDragLayerViewRemoved() {
+            int count = mDragLayer.getChildCount();
             // Ensure no other children present (like Folders, etc)
             for (int i = 0; i < count; i++) {
-                View v = mContainerView.getChildAt(i);
+                View v = mDragLayer.getChildAt(i);
                 if (!((v instanceof TaskbarView) || (v instanceof ImeBarView))) {
                     return;
                 }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
index 263aa1142d..d026bfbf37 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
@@ -139,7 +139,7 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen
     public void onSystemUiFlagsChanged(int systemUiStateFlags) {
         boolean isImeVisible = (systemUiStateFlags & SYSUI_STATE_IME_SHOWING) != 0;
         if (mTaskbarActivityContext != null) {
-            mTaskbarActivityContext.getIconController().setImeIsVisible(isImeVisible);
+            mTaskbarActivityContext.setImeIsVisible(isImeVisible);
         }
     }
 
@@ -154,8 +154,7 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen
     public void updateImeStatus(int displayId, int vis, int backDisposition,
             boolean showImeSwitcher) {
         if (mTaskbarActivityContext != null) {
-            mTaskbarActivityContext.getIconController()
-                    .updateImeStatus(displayId, vis, showImeSwitcher);
+            mTaskbarActivityContext.updateImeStatus(displayId, vis, showImeSwitcher);
         }
     }
 
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java
index e16f5e65b0..50adeadbfc 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java
@@ -35,7 +35,7 @@ public class TaskbarUIController {
         return true;
     }
 
-    protected void onImeVisible(TaskbarContainerView container, boolean isVisible) {
+    protected void onImeVisible(TaskbarDragLayer container, boolean isVisible) {
         container.updateImeBarVisibilityAlpha(isVisible ? 1 : 0);
     }
 }
-- 
GitLab


From b5596f72e4c033e66f8c1da564ad90496638b028 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 21 May 2021 15:28:57 -0700
Subject: [PATCH 1246/1664] Fixing missing unlinktoDeath

Bug: 186712316
Test: Manual
Change-Id: If06737403c346c5ccca533dec647e3a0691f1bfa
---
 .../android/launcher3/graphics/GridCustomizationsProvider.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/launcher3/graphics/GridCustomizationsProvider.java b/src/com/android/launcher3/graphics/GridCustomizationsProvider.java
index 60a1732bb6..8ca157b1d4 100644
--- a/src/com/android/launcher3/graphics/GridCustomizationsProvider.java
+++ b/src/com/android/launcher3/graphics/GridCustomizationsProvider.java
@@ -236,6 +236,7 @@ public class GridCustomizationsProvider extends ContentProvider {
             return;
         }
         observer.destroyed = true;
+        observer.renderer.getHostToken().unlinkToDeath(observer, 0);
         Executors.MAIN_EXECUTOR.execute(observer.renderer::destroy);
         PreviewLifecycleObserver cached = mActivePreviews.get(observer.renderer.getHostToken());
         if (cached == observer) {
-- 
GitLab


From 7c9dca2df2f50eb3755b4c3a28fc90301fd17028 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Fri, 21 May 2021 17:20:07 -0700
Subject: [PATCH 1247/1664] Fix PathParser error when parsing app close
 interpolator in RTL languages.

Setting locale to english so that the numbers don't get reverted

Bug: 188552618
Test: set language to arabic, swipe up to home
Change-Id: I736c83984b472d9ad09207927743c87b18637db4
---
 .../src/com/android/quickstep/util/RectFSpringAnim2.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/util/RectFSpringAnim2.java b/quickstep/src/com/android/quickstep/util/RectFSpringAnim2.java
index edd3dc3e29..93b34822ad 100644
--- a/quickstep/src/com/android/quickstep/util/RectFSpringAnim2.java
+++ b/quickstep/src/com/android/quickstep/util/RectFSpringAnim2.java
@@ -41,7 +41,7 @@ import com.android.systemui.plugins.ResourceProvider;
 
 import java.util.ArrayList;
 import java.util.List;
-
+import java.util.Locale;
 
 /**
  * Applies spring forces to animate from a starting rect to a target rect,
@@ -353,7 +353,8 @@ public class RectFSpringAnim2 extends RectFSpringAnim {
 
     private Interpolator getAppCloseInterpolator(Context context) {
         ResourceProvider rp = DynamicResource.provider(context);
-        String path = String.format("M 0,0 C %f, %f, %f, %f, %f, %f C %f, %f, %f, %f, 1, 1",
+        String path = String.format(Locale.ENGLISH,
+                "M 0,0 C %f, %f, %f, %f, %f, %f C %f, %f, %f, %f, 1, 1",
                 rp.getFloat(R.dimen.c1_a),
                 rp.getFloat(R.dimen.c1_b),
                 rp.getFloat(R.dimen.c1_c),
-- 
GitLab


From ede641bd77316af26b4dae8d8204ce965f1937a5 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 24 May 2021 11:39:54 +0100
Subject: [PATCH 1248/1664] Adjust padding, margin of tabs in the
 WidgetsFullSheet

Also remove elevation set to tab to remove unwanted shadow.

Test: Set up a work profile. Then, open the full widgets picker.
      Observe padding & margin of the work / personal tabs.
Bug: 188221455
Change-Id: I761cb1c1410f87c80a5fdca3803fb8b099d499d6
---
 res/layout/widgets_full_sheet_paged_view.xml          |  1 +
 res/layout/widgets_personal_work_tabs.xml             |  3 +--
 res/values/dimens.xml                                 |  2 ++
 .../launcher3/widget/picker/WidgetsFullSheet.java     | 11 ++++++++---
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/res/layout/widgets_full_sheet_paged_view.xml b/res/layout/widgets_full_sheet_paged_view.xml
index 580ca496a3..f0ddc2bb66 100644
--- a/res/layout/widgets_full_sheet_paged_view.xml
+++ b/res/layout/widgets_full_sheet_paged_view.xml
@@ -21,6 +21,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:clipToPadding="false"
+        android:paddingTop="@dimen/widget_picker_view_pager_top_padding"
         android:descendantFocusability="afterDescendants"
         launcher:pageIndicator="@+id/tabs">
 
diff --git a/res/layout/widgets_personal_work_tabs.xml b/res/layout/widgets_personal_work_tabs.xml
index 72d83e8874..15275a6df2 100644
--- a/res/layout/widgets_personal_work_tabs.xml
+++ b/res/layout/widgets_personal_work_tabs.xml
@@ -20,10 +20,9 @@
     android:id="@+id/tabs"
     android:layout_width="match_parent"
     android:layout_height="@dimen/all_apps_header_pill_height"
-    android:layout_marginHorizontal="16dp"
+    android:layout_marginHorizontal="32dp"
     android:orientation="horizontal"
     android:background="@drawable/all_apps_tabs_background"
-    android:elevation="2dp"
     style="@style/TextHeadline">
 
     <Button
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index bfa02c07d3..2882b1f108 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -146,6 +146,8 @@
     <dimen name="widget_picker_education_tip_width">120dp</dimen>
     <dimen name="widget_picker_education_tip_min_margin">4dp</dimen>
 
+    <dimen name="widget_picker_view_pager_top_padding">16dp</dimen>
+
     <!-- Padding applied to shortcut previews -->
     <dimen name="shortcut_preview_padding_left">0dp</dimen>
     <dimen name="shortcut_preview_padding_right">0dp</dimen>
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 039cad8291..ee5afd9265 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -126,6 +126,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         }
     };
     private final int mTabsHeight;
+    private final int mViewPagerTopPadding;
     private final int mWidgetCellHorizontalPadding;
 
     @Nullable private WidgetsRecyclerView mCurrentWidgetsRecyclerView;
@@ -148,6 +149,10 @@ public class WidgetsFullSheet extends BaseWidgetSheet
                 ? getContext().getResources()
                         .getDimensionPixelSize(R.dimen.all_apps_header_pill_height)
                 : 0;
+        mViewPagerTopPadding = mHasWorkProfile
+                ? getContext().getResources()
+                    .getDimensionPixelSize(R.dimen.widget_picker_view_pager_top_padding)
+                : 0;
         mWidgetCellHorizontalPadding = 2 * getResources().getDimensionPixelOffset(
                 R.dimen.widget_cell_horizontal_padding);
     }
@@ -499,8 +504,8 @@ public class WidgetsFullSheet extends BaseWidgetSheet
                 noWidgetsViewHeight = noWidgetsViewTextBounds.height();
             }
             float maxTableHeight = (mActivityContext.getDeviceProfile().availableHeightPx
-                                        - mTabsHeight - getHeaderViewHeight() - noWidgetsViewHeight)
-                                                * RECOMMENDATION_TABLE_HEIGHT_RATIO;
+                    - mTabsHeight - mViewPagerTopPadding - getHeaderViewHeight()
+                    - noWidgetsViewHeight) * RECOMMENDATION_TABLE_HEIGHT_RATIO;
 
             List<ArrayList<WidgetItem>> recommendedWidgetsInTable =
                     WidgetsTableUtils.groupWidgetItemsIntoTable(recommendedWidgets,
@@ -605,7 +610,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         return measureHeightWithVerticalMargins(mSearchAndRecommendationViewHolder.mCollapseHandle)
                 + measureHeightWithVerticalMargins(mSearchAndRecommendationViewHolder.mHeaderTitle)
                 + measureHeightWithVerticalMargins(
-                (View) mSearchAndRecommendationViewHolder.mSearchBar);
+                        (View) mSearchAndRecommendationViewHolder.mSearchBarContainer);
     }
 
     /** private the height, in pixel, + the vertical margins of a given view. */
-- 
GitLab


From f4afb6bc17905e6ce7e2084e601fca7d7be036f6 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 24 May 2021 14:55:33 +0100
Subject: [PATCH 1249/1664] Remove all apps tabs elevation

Test: Set up a work profile. Open all apps and observe no shadow around
      tabs.
Bug: 188727345
Change-Id: I5b8594002dbd8155b45376103d44fbda12ebe001
---
 res/layout/all_apps_personal_work_tabs.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/res/layout/all_apps_personal_work_tabs.xml b/res/layout/all_apps_personal_work_tabs.xml
index 686dda81bd..ebb69f67d3 100644
--- a/res/layout/all_apps_personal_work_tabs.xml
+++ b/res/layout/all_apps_personal_work_tabs.xml
@@ -21,7 +21,6 @@
     android:layout_gravity="center_horizontal"
     android:background="@drawable/all_apps_tabs_background"
     android:orientation="horizontal"
-    android:elevation="2dp"
     style="@style/TextHeadline">
 
     <Button
-- 
GitLab


From f375e8bebcbaea0134ae7e8d290dca9ae5dd67b7 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 24 May 2021 16:11:56 +0100
Subject: [PATCH 1250/1664] Fix ripple effect shown when tapping an app row in
 widgets picker

Test: Open the full widgets and tap an app. Ripple effect is applied
      to the entire row rather than just on the arrow.
Bug: 188873069
Change-Id: Id77b2055f6bc31c12bb19e695ea44aeaff36c4a6
---
 res/drawable/widgets_list_bottom_ripple.xml      | 1 +
 res/drawable/widgets_list_middle_ripple.xml      | 1 +
 res/drawable/widgets_list_single_item_ripple.xml | 1 +
 res/drawable/widgets_list_top_ripple.xml         | 1 +
 res/layout/widgets_list_row_header.xml           | 1 +
 5 files changed, 5 insertions(+)

diff --git a/res/drawable/widgets_list_bottom_ripple.xml b/res/drawable/widgets_list_bottom_ripple.xml
index 72262d4d7c..971d6f3da7 100644
--- a/res/drawable/widgets_list_bottom_ripple.xml
+++ b/res/drawable/widgets_list_bottom_ripple.xml
@@ -21,6 +21,7 @@
     android:color="?android:attr/colorControlHighlight">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
+            <solid android:color="@color/widgets_picker_surface" />
             <corners
                 android:topLeftRadius="@dimen/widget_list_content_corner_radius"
                 android:topRightRadius="@dimen/widget_list_content_corner_radius"
diff --git a/res/drawable/widgets_list_middle_ripple.xml b/res/drawable/widgets_list_middle_ripple.xml
index 1136beafd2..2b77d4d867 100644
--- a/res/drawable/widgets_list_middle_ripple.xml
+++ b/res/drawable/widgets_list_middle_ripple.xml
@@ -21,6 +21,7 @@
     android:color="?android:attr/colorControlHighlight">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
+            <solid android:color="@color/widgets_picker_surface" />
             <corners
                 android:topLeftRadius="@dimen/widget_list_content_corner_radius"
                 android:topRightRadius="@dimen/widget_list_content_corner_radius"
diff --git a/res/drawable/widgets_list_single_item_ripple.xml b/res/drawable/widgets_list_single_item_ripple.xml
index a82918e790..c09944ddcd 100644
--- a/res/drawable/widgets_list_single_item_ripple.xml
+++ b/res/drawable/widgets_list_single_item_ripple.xml
@@ -21,6 +21,7 @@
     android:color="?android:attr/colorControlHighlight">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
+            <solid android:color="@color/widgets_picker_surface" />
             <corners
                 android:topLeftRadius="@dimen/widget_list_top_bottom_corner_radius"
                 android:topRightRadius="@dimen/widget_list_top_bottom_corner_radius"
diff --git a/res/drawable/widgets_list_top_ripple.xml b/res/drawable/widgets_list_top_ripple.xml
index 4ad185c648..f79ab72e99 100644
--- a/res/drawable/widgets_list_top_ripple.xml
+++ b/res/drawable/widgets_list_top_ripple.xml
@@ -21,6 +21,7 @@
     android:color="?android:attr/colorControlHighlight">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
+            <solid android:color="@color/widgets_picker_surface" />
             <corners
                 android:topLeftRadius="@dimen/widget_list_top_bottom_corner_radius"
                 android:topRightRadius="@dimen/widget_list_top_bottom_corner_radius"
diff --git a/res/layout/widgets_list_row_header.xml b/res/layout/widgets_list_row_header.xml
index a0a04564b0..278d3dc8ad 100644
--- a/res/layout/widgets_list_row_header.xml
+++ b/res/layout/widgets_list_row_header.xml
@@ -74,6 +74,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_alignParentEnd="true"
+        android:enabled="false"
         android:clickable="false"
         android:importantForAccessibility="no"
         android:button="@drawable/widgets_tray_expand_button"/>
-- 
GitLab


From e90dddaaa0711e1a28320568f8226b92a698b83f Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 24 May 2021 18:04:05 +0100
Subject: [PATCH 1251/1664] Fix full widgets picker fast scroller height.

1. Fix the app title to one line.
2. Use the measured height of a header view to estimate the available
   fast scroll bar height.

Test: Open full widgets picker. Scroll to the bottom by scroll gesture.
      Observe the fast scroll bar indicator is correctly shown.
      Scroll back to top and then use the fast scroll bar to scroll to
      the end of the page. Observe the last app row is aligned to the
      bottom of the page.
Bug: 188914448
Change-Id: I57a2419d1fbfc8f946a932eebfefb67ae0c07eb6
---
 res/layout/widgets_list_row_header.xml            |  2 ++
 .../widget/picker/WidgetsRecyclerView.java        | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/res/layout/widgets_list_row_header.xml b/res/layout/widgets_list_row_header.xml
index a0a04564b0..22cf94263a 100644
--- a/res/layout/widgets_list_row_header.xml
+++ b/res/layout/widgets_list_row_header.xml
@@ -49,6 +49,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="start|center_vertical"
+            android:ellipsize="end"
+            android:maxLines="1"
             android:textColor="?android:attr/textColorPrimary"
             android:textSize="16sp"
             tools:text="App name" />
diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java b/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
index e981906774..e30e245452 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
@@ -49,10 +49,10 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
     private final int mScrollbarTop;
 
     private final Point mFastScrollerOffset = new Point();
-    private final int mEstimatedWidgetListHeaderHeight;
     private boolean mTouchDownOnScroller;
     private HeaderViewDimensionsProvider mHeaderViewDimensionsProvider;
     private int mLastVisibleWidgetContentTableHeight = 0;
+    private int mWidgetHeaderHeight = 0;
     @Nullable private OnContentChangeListener mOnContentChangeListener;
 
     public WidgetsRecyclerView(Context context) {
@@ -71,9 +71,6 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
 
         ActivityContext activity = ActivityContext.lookupContext(getContext());
         DeviceProfile grid = activity.getDeviceProfile();
-        mEstimatedWidgetListHeaderHeight = grid.iconSizePx
-                + 2 * context.getResources().getDimensionPixelSize(
-                        R.dimen.widget_list_header_view_vertical_padding);
     }
 
     @Override
@@ -164,6 +161,14 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
             if (view instanceof TableLayout) {
                 // This assumes there is ever only one content shown in this recycler view.
                 mLastVisibleWidgetContentTableHeight = view.getMeasuredHeight();
+            } else if (view instanceof WidgetsListHeader
+                    && mLastVisibleWidgetContentTableHeight == 0
+                    && view.getMeasuredHeight() > 0) {
+                // This assumes all header views are of the same height.
+                RecyclerView.LayoutParams layoutParams =
+                        (RecyclerView.LayoutParams) view.getLayoutParams();
+                mWidgetHeaderHeight = view.getMeasuredHeight() + layoutParams.topMargin
+                    + layoutParams.bottomMargin;
             }
         }
 
@@ -262,7 +267,7 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
             WidgetsListBaseEntry entry = mAdapter.getItems().get(i);
             if (entry instanceof WidgetsListHeaderEntry
                     || entry instanceof WidgetsListSearchHeaderEntry) {
-                totalItemsHeight += mEstimatedWidgetListHeaderHeight;
+                totalItemsHeight += mWidgetHeaderHeight;
             } else if (entry instanceof WidgetsListContentEntry) {
                 totalItemsHeight += mLastVisibleWidgetContentTableHeight;
             } else {
-- 
GitLab


From 7d964726d5bbd93b720b095c46bee2e321aa4754 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Mon, 24 May 2021 19:10:42 +0100
Subject: [PATCH 1252/1664] Ensure RecentsOrientedState.mRecentsRotation is up
 to date on swipe up

- Updates RecentsOrientedState.mRecentsRotation after launcher is started, as it's not updated when RecentsView is in foreground when device rotates e.g. inside another app
- No longer calls updateOrientationHandler in onConfigurationChanged, as updateOrientationHandler is already called in setInsets, which get called on rotation

Bug: 181550945
Test: Swipe up to enter overview, launch app, rotate, then swipe up again
Test: Swipe up to enter overview from landscape only app, while holding device in portrait
Change-Id: I268093617d51333678e510c910ed15275706f984
---
 .../com/android/quickstep/AbsSwipeUpHandler.java    |  3 +++
 .../com/android/quickstep/views/RecentsView.java    | 13 +++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 005e9b5a7d..2c41a5fdb1 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -393,6 +393,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         if (mStateCallback.hasStates(STATE_HANDLER_INVALIDATED)) {
             return;
         }
+        // RecentsView never updates the display rotation until swipe-up, force update
+        // RecentsOrientedState before passing to TaskViewSimulator.
+        mRecentsView.updateRecentsRotation();
         mTaskViewSimulator.setOrientationState(mRecentsView.getPagedViewOrientedState());
 
         // If we've already ended the gesture and are going home, don't prepare recents UI,
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 376cb31a90..1e8e2b19d1 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2618,19 +2618,20 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         if (LIVE_TILE.get() && mEnableDrawingLiveTile && newConfig.orientation != mOrientation) {
             switchToScreenshot(
                     () -> finishRecentsAnimation(true /* toRecents */,
-                            this::onConfigurationChangedInternal));
+                            this::updateRecentsRotation));
             mEnableDrawingLiveTile = false;
         } else {
-            onConfigurationChangedInternal();
+            updateRecentsRotation();
         }
         mOrientation = newConfig.orientation;
     }
 
-    private void onConfigurationChangedInternal() {
+    /**
+     * Updates {@link RecentsOrientedState}'s cached RecentsView rotation.
+     */
+    public void updateRecentsRotation() {
         final int rotation = mActivity.getDisplay().getRotation();
-        if (mOrientationState.setRecentsRotation(rotation)) {
-            updateOrientationHandler();
-        }
+        mOrientationState.setRecentsRotation(rotation);
     }
 
     public void setLayoutRotation(int touchRotation, int displayRotation) {
-- 
GitLab


From b199e20acc9710c7f550b8377e1af039c3249d5b Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Mon, 24 May 2021 14:41:46 -0700
Subject: [PATCH 1253/1664] Enable unpausing apps from the workspace.

Fixes: 188675002
Test: manual
Change-Id: I02715450016e9b91fff774525b5e32c337c74547
---
 .../launcher3/taskbar/TaskbarActivityContext.java     |  4 +---
 src/com/android/launcher3/touch/ItemClickHandler.java | 11 +++++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
index 8c3d453b09..4ba0ee0d41 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
@@ -271,9 +271,7 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ
             });
         } else if (tag instanceof WorkspaceItemInfo) {
             WorkspaceItemInfo info = (WorkspaceItemInfo) tag;
-            if (info.isDisabled()) {
-                ItemClickHandler.handleDisabledItemClicked(info, this);
-            } else {
+            if (!(info.isDisabled() && ItemClickHandler.handleDisabledItemClicked(info, this))) {
                 Intent intent = new Intent(info.getIntent())
                         .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 try {
diff --git a/src/com/android/launcher3/touch/ItemClickHandler.java b/src/com/android/launcher3/touch/ItemClickHandler.java
index b5dcd3a041..b53f96eea3 100644
--- a/src/com/android/launcher3/touch/ItemClickHandler.java
+++ b/src/com/android/launcher3/touch/ItemClickHandler.java
@@ -196,8 +196,10 @@ public class ItemClickHandler {
 
     /**
      * Handles clicking on a disabled shortcut
+     *
+     * @return true iff the disabled item click has been handled.
      */
-    public static void handleDisabledItemClicked(WorkspaceItemInfo shortcut, Context context) {
+    public static boolean handleDisabledItemClicked(WorkspaceItemInfo shortcut, Context context) {
         final int disabledFlags = shortcut.runtimeStatusFlags
                 & WorkspaceItemInfo.FLAG_DISABLED_MASK;
         if ((disabledFlags
@@ -205,11 +207,12 @@ public class ItemClickHandler {
                 & ~FLAG_DISABLED_QUIET_USER) == 0) {
             // If the app is only disabled because of the above flags, launch activity anyway.
             // Framework will tell the user why the app is suspended.
+            return false;
         } else {
             if (!TextUtils.isEmpty(shortcut.disabledMessage)) {
                 // Use a message specific to this shortcut, if it has one.
                 Toast.makeText(context, shortcut.disabledMessage, Toast.LENGTH_SHORT).show();
-                return;
+                return true;
             }
             // Otherwise just use a generic error message.
             int error = R.string.activity_not_available;
@@ -220,6 +223,7 @@ public class ItemClickHandler {
                 error = R.string.shortcut_not_available;
             }
             Toast.makeText(context, error, Toast.LENGTH_SHORT).show();
+            return true;
         }
     }
 
@@ -229,8 +233,7 @@ public class ItemClickHandler {
      * @param v The view that was clicked. Must be a tagged with a {@link WorkspaceItemInfo}.
      */
     public static void onClickAppShortcut(View v, WorkspaceItemInfo shortcut, Launcher launcher) {
-        if (shortcut.isDisabled()) {
-            handleDisabledItemClicked(shortcut, launcher);
+        if (shortcut.isDisabled() && handleDisabledItemClicked(shortcut, launcher)) {
             return;
         }
 
-- 
GitLab


From 21979aca50b18839f010832d63dd64291769bfca Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 24 May 2021 23:54:19 +0100
Subject: [PATCH 1254/1664] Fix tabs abruptly reset during swipe

The indicator position has already been updated by
PersonalWorkPagedView#onScrollChanged. The updateIndicatorPosition
call in setActiveMarker has abruptly reset the mScrollOffset to a page
index rather than a [0f, 1f] offset.

Test: On a work profile device, swipe left & right in the all apps.
      Then, swipe left & right in the full widgets picker. In both
      cases, I no longer observe an abruptly reset of the tabs
      transition animation.
Bug: 187704466
Change-Id: I53c4ed3a98219093f3d61dfa4de2fe21ec88851c
---
 .../launcher3/workprofile/PersonalWorkSlidingTabStrip.java       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java b/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
index c7cbde8d26..8f9cdc8a4c 100644
--- a/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
+++ b/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
@@ -127,7 +127,6 @@ public class PersonalWorkSlidingTabStrip extends LinearLayout implements PageInd
     public void setActiveMarker(int activePage) {
         updateTabTextColor(activePage);
         if (mOnActivePageChangedListener != null && mLastActivePage != activePage) {
-            updateIndicatorPosition(activePage);
             mOnActivePageChangedListener.onActivePageChanged(activePage);
         }
         mLastActivePage = activePage;
-- 
GitLab


From 6fad078a31398bbf55b7618375a532dc99d9ebd3 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Mon, 24 May 2021 16:42:07 -0700
Subject: [PATCH 1255/1664] Adding more diags for WellbeingModel

Test: presubmit
Bug: 189139513
Change-Id: Ic52ef42d2cd0a3f19f55aee048911526dd8c732f
---
 .../android/launcher3/model/WellbeingModel.java   | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/model/WellbeingModel.java b/quickstep/src/com/android/launcher3/model/WellbeingModel.java
index 995c4b04d4..154b78b1b9 100644
--- a/quickstep/src/com/android/launcher3/model/WellbeingModel.java
+++ b/quickstep/src/com/android/launcher3/model/WellbeingModel.java
@@ -319,12 +319,17 @@ public final class WellbeingModel extends BgObjectWithLooper {
 
     @WorkerThread
     private void updateActionsWithRetry(int retryCount, @Nullable String packageName) {
+        if (DEBUG || mIsInTest) {
+            Log.i(TAG,
+                    "updateActionsWithRetry(); retryCount: " + retryCount + ", package: "
+                            + packageName);
+        }
         String[] packageNames = TextUtils.isEmpty(packageName)
-                ?  mContext.getSystemService(LauncherApps.class)
+                ? mContext.getSystemService(LauncherApps.class)
                 .getActivityList(null, Process.myUserHandle()).stream()
                 .map(li -> li.getApplicationInfo().packageName).distinct()
                 .toArray(String[]::new)
-                : new String[] { packageName };
+                : new String[]{packageName};
 
         mWorkerHandler.removeCallbacksAndMessages(packageName);
         if (updateActions(packageNames)) {
@@ -335,12 +340,16 @@ public final class WellbeingModel extends BgObjectWithLooper {
             return;
         }
         mWorkerHandler.postDelayed(
-                () -> updateActionsWithRetry(retryCount + 1, packageName),
+                () -> {
+                    if (DEBUG || mIsInTest) Log.i(TAG, "Retrying; attempt " + (retryCount + 1));
+                    updateActionsWithRetry(retryCount + 1, packageName);
+                },
                 packageName, RETRY_TIMES_MS[retryCount]);
     }
 
     @WorkerThread
     private void updateAllPackages() {
+        if (DEBUG || mIsInTest) Log.i(TAG, "updateAllPackages");
         updateActionsWithRetry(0, null);
     }
 
-- 
GitLab


From 6a7a7f6bad9ddb3b09620b5bd3e931e4a7f94037 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Thu, 1 Apr 2021 13:14:23 -0400
Subject: [PATCH 1256/1664] Set FLAG_IMMUTABLE flag on FirstScreenBroadcast
 PendingIntent.

Bug: 179289753
Bug: 183927137
Test: restore phone and ensure broadcast is sent
Change-Id: I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2
(cherry picked from commit b62fba0d0199d719ac63761846e09b4b28e1dc2c)
Merged-In: I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2
---
 .../android/launcher3/model/FirstScreenBroadcast.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/model/FirstScreenBroadcast.java b/src/com/android/launcher3/model/FirstScreenBroadcast.java
index 1149b553f6..b8dbd08901 100644
--- a/src/com/android/launcher3/model/FirstScreenBroadcast.java
+++ b/src/com/android/launcher3/model/FirstScreenBroadcast.java
@@ -15,6 +15,15 @@
  */
 package com.android.launcher3.model;
 
+import static android.app.PendingIntent.FLAG_IMMUTABLE;
+import static android.app.PendingIntent.FLAG_ONE_SHOT;
+import static android.os.Process.myUserHandle;
+
+import static com.android.launcher3.pm.InstallSessionHelper.getUserHandle;
+
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.mapping;
+
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
@@ -140,7 +149,7 @@ public class FirstScreenBroadcast {
                 .putStringArrayListExtra(HOTSEAT_ITEM_EXTRA, new ArrayList<>(hotseatItems))
                 .putStringArrayListExtra(WIDGET_ITEM_EXTRA, new ArrayList<>(widgetItems))
                 .putExtra(VERIFICATION_TOKEN_EXTRA, PendingIntent.getActivity(context, 0,
-                        new Intent(), PendingIntent.FLAG_ONE_SHOT)));
+                        new Intent(), FLAG_ONE_SHOT | FLAG_IMMUTABLE)));
     }
 
     private static String getPackageName(ItemInfo info) {
-- 
GitLab


From 3380ab3053c87fa952c99a42b889bbf3158c0e97 Mon Sep 17 00:00:00 2001
From: shawnlin <shawnlin@google.com>
Date: Sat, 22 May 2021 21:18:16 +0800
Subject: [PATCH 1257/1664] Support the nav animation in widget launch remote
 animation

Launcher now support remote animation for widget but doesn't add the nav
animation for this type of animation.

Add the nav animation in widget launch remote animation in launcher.

Bug: 185303414
Test: manual - launch a widget in launcher and observe the nav bar
Change-Id: I11f4bd75b9624118b8ffef09c99f54fc7f1fbbca
---
 .../launcher3/QuickstepTransitionManager.java | 36 +++++++++++++++----
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 80754a00f4..ec77b9b902 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -691,7 +691,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                 floatingIconBounds.right += offsetX;
                 floatingIconBounds.bottom += offsetY;
 
-                SurfaceParams[] params = new SurfaceParams[appTargets.length];
+                ArrayList<SurfaceParams> params = new ArrayList<>();
                 for (int i = appTargets.length - 1; i >= 0; i--) {
                     RemoteAnimationTargetCompat target = appTargets[i];
                     SurfaceParams.Builder builder = new SurfaceParams.Builder(target.leash);
@@ -743,9 +743,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                                 .withWindowCrop(crop)
                                 .withAlpha(1f);
                     }
-                    params[i] = builder.build();
+                    params.add(builder.build());
                 }
-                surfaceApplier.scheduleApply(params);
 
                 if (navBarTarget != null) {
                     final SurfaceParams.Builder navBuilder =
@@ -759,8 +758,10 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                     } else {
                         navBuilder.withAlpha(mNavFadeOut.value);
                     }
-                    surfaceApplier.scheduleApply(navBuilder.build());
+                    params.add(navBuilder.build());
                 }
+
+                surfaceApplier.scheduleApply(params.toArray(new SurfaceParams[params.size()]));
             }
         });
 
@@ -791,6 +792,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
         SurfaceTransactionApplier surfaceApplier = new SurfaceTransactionApplier(floatingView);
         openingTargets.addReleaseCheck(surfaceApplier);
 
+        RemoteAnimationTargetCompat navBarTarget = openingTargets.getNavBarRemoteAnimationTarget();
+
         AnimatorSet animatorSet = new AnimatorSet();
         ValueAnimator appAnimator = ValueAnimator.ofFloat(0, 1);
         appAnimator.setDuration(APP_LAUNCH_DURATION);
@@ -832,6 +835,11 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                     windowTargetBounds.height(), 0 /* delay */, APP_LAUNCH_DURATION,
                     EXAGGERATED_EASE);
 
+            final FloatProp mNavFadeOut = new FloatProp(1f, 0f, 0, ANIMATION_NAV_FADE_OUT_DURATION,
+                    NAV_FADE_OUT_INTERPOLATOR);
+            final FloatProp mNavFadeIn = new FloatProp(0f, 1f, ANIMATION_DELAY_NAV_FADE_IN,
+                    ANIMATION_NAV_FADE_IN_DURATION, NAV_FADE_IN_INTERPOLATOR);
+
             @Override
             public void onUpdate(float percent) {
                 widgetBackgroundBounds.set(mDx.value - mWidth.value / 2f,
@@ -847,7 +855,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                 matrix.postScale(mAppWindowScale, mAppWindowScale, widgetBackgroundBounds.left,
                         widgetBackgroundBounds.top);
 
-                SurfaceParams[] params = new SurfaceParams[appTargets.length];
+                ArrayList<SurfaceParams> params = new ArrayList<>();
                 float floatingViewAlpha = appTargetsAreTranslucent ? 1 - mPreviewAlpha.value : 1;
                 for (int i = appTargets.length - 1; i >= 0; i--) {
                     RemoteAnimationTargetCompat target = appTargets[i];
@@ -861,9 +869,23 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                                 .withAlpha(mPreviewAlpha.value)
                                 .withCornerRadius(mWindowRadius.value / mAppWindowScale);
                     }
-                    params[i] = builder.build();
+                    params.add(builder.build());
                 }
-                surfaceApplier.scheduleApply(params);
+
+                if (navBarTarget != null) {
+                    final SurfaceParams.Builder navBuilder =
+                            new SurfaceParams.Builder(navBarTarget.leash);
+                    if (mNavFadeIn.value > mNavFadeIn.getStartValue()) {
+                        navBuilder.withMatrix(matrix)
+                                .withWindowCrop(appWindowCrop)
+                                .withAlpha(mNavFadeIn.value);
+                    } else {
+                        navBuilder.withAlpha(mNavFadeOut.value);
+                    }
+                    params.add(navBuilder.build());
+                }
+
+                surfaceApplier.scheduleApply(params.toArray(new SurfaceParams[params.size()]));
             }
         });
 
-- 
GitLab


From 9d24de1353980fe4feca89cee52b95f5fa6e2861 Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Fri, 21 May 2021 10:52:53 +0100
Subject: [PATCH 1258/1664] Add more education tips for widgets. (1/3)

Show Arrow education tip on WidgetsBottomSheet. This tip is shown only
once either in widgets full sheet or bottom sheet.

Test: Tested manually
Bug: 185354491
Change-Id: I6d770ed0906a5cb0f5bcfe6ae0cd327b790cf164
---
 res/layout/widgets_bottom_sheet.xml           |  1 -
 .../android/launcher3/views/ArrowTipView.java |  5 +--
 .../launcher3/widget/BaseWidgetSheet.java     | 31 +++++++++++++++++
 .../launcher3/widget/WidgetsBottomSheet.java  | 34 +++++++++++++++++++
 .../widget/picker/WidgetsFullSheet.java       | 24 +------------
 5 files changed, 69 insertions(+), 26 deletions(-)

diff --git a/res/layout/widgets_bottom_sheet.xml b/res/layout/widgets_bottom_sheet.xml
index 08635c6e60..1859bd8596 100644
--- a/res/layout/widgets_bottom_sheet.xml
+++ b/res/layout/widgets_bottom_sheet.xml
@@ -21,7 +21,6 @@
     android:layout_height="wrap_content"
     android:paddingTop="16dp"
     android:background="@drawable/widgets_bottom_sheet_background"
-    android:elevation="@dimen/deep_shortcuts_elevation"
     android:layout_gravity="bottom"
     android:theme="?attr/widgetsTheme">
 
diff --git a/src/com/android/launcher3/views/ArrowTipView.java b/src/com/android/launcher3/views/ArrowTipView.java
index a6f2b42a29..4ee365ede0 100644
--- a/src/com/android/launcher3/views/ArrowTipView.java
+++ b/src/com/android/launcher3/views/ArrowTipView.java
@@ -196,7 +196,6 @@ public class ArrowTipView extends AbstractFloatingView {
         parent.addView(this);
         requestLayout();
 
-        post(() -> setY(yCoord - getHeight()));
         post(() -> {
             float halfWidth = getWidth() / 2f;
             float xCoord;
@@ -208,7 +207,9 @@ public class ArrowTipView extends AbstractFloatingView {
                 xCoord = arrowXCoord - halfWidth;
             }
             setX(xCoord);
-            findViewById(R.id.arrow).setX(arrowXCoord - xCoord);
+            setY(yCoord - getHeight());
+            View arrowView = findViewById(R.id.arrow);
+            arrowView.setX(arrowXCoord - xCoord - arrowView.getWidth() / 2f);
             requestLayout();
         });
 
diff --git a/src/com/android/launcher3/widget/BaseWidgetSheet.java b/src/com/android/launcher3/widget/BaseWidgetSheet.java
index f7e295e7e8..e6791c3e9c 100644
--- a/src/com/android/launcher3/widget/BaseWidgetSheet.java
+++ b/src/com/android/launcher3/widget/BaseWidgetSheet.java
@@ -26,6 +26,9 @@ import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
 import android.widget.Toast;
 
+import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
+
 import com.android.launcher3.DragSource;
 import com.android.launcher3.DropTarget.DragObject;
 import com.android.launcher3.Launcher;
@@ -39,6 +42,7 @@ import com.android.launcher3.touch.ItemLongClickListener;
 import com.android.launcher3.util.SystemUiController;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.AbstractSlideInView;
+import com.android.launcher3.views.ArrowTipView;
 
 /**
  * Base class for various widgets popup
@@ -47,6 +51,9 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView<Launcher>
         implements OnClickListener, OnLongClickListener, DragSource,
         PopupDataProvider.PopupDataChangeListener {
 
+    protected static final String KEY_WIDGETS_EDUCATION_TIP_SEEN =
+            "launcher.widgets_education_tip_seen";
+
     /* Touch handling related member variables. */
     private Toast mWidgetInstructionToast;
 
@@ -196,4 +203,28 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView<Launcher>
         toast.show();
         return toast;
     }
+
+    /** Shows education tip on top center of {@code view} if view is laid out. */
+    @Nullable
+    protected ArrowTipView showEducationTipOnViewIfPossible(@Nullable View view) {
+        if (view == null || !ViewCompat.isLaidOut(view)) {
+            return null;
+        }
+
+        mActivityContext.getSharedPrefs().edit()
+                .putBoolean(KEY_WIDGETS_EDUCATION_TIP_SEEN, true).apply();
+        int[] coords = new int[2];
+        view.getLocationOnScreen(coords);
+        ArrowTipView arrowTipView = new ArrowTipView(mActivityContext);
+        return arrowTipView.showAtLocation(
+                getContext().getString(R.string.long_press_widget_to_add),
+                /* arrowXCoord= */coords[0] + view.getWidth() / 2,
+                /* yCoord= */coords[1]);
+    }
+
+    /** Returns {@code true} if tip has previously been shown on any of {@link BaseWidgetSheet}. */
+    protected boolean hasSeenEducationTip() {
+        return mActivityContext.getSharedPrefs().getBoolean(KEY_WIDGETS_EDUCATION_TIP_SEEN, false)
+                || Utilities.IS_RUNNING_IN_TEST_HARNESS;
+    }
 }
diff --git a/src/com/android/launcher3/widget/WidgetsBottomSheet.java b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
index 787a2d1262..81df100094 100644
--- a/src/com/android/launcher3/widget/WidgetsBottomSheet.java
+++ b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
@@ -68,12 +68,43 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
             };
 
     private static final int DEFAULT_CLOSE_DURATION = 200;
+    private static final long EDUCATION_TIP_DELAY_MS = 300;
+
     private ItemInfo mOriginalItemInfo;
     private Rect mInsets;
     private final int mMaxTableHeight;
     private int mMaxHorizontalSpan = 4;
     private Configuration mCurrentConfiguration;
 
+    private final OnLayoutChangeListener mLayoutChangeListenerToShowTips =
+            new OnLayoutChangeListener() {
+                @Override
+                public void onLayoutChange(View v, int left, int top, int right, int bottom,
+                        int oldLeft, int oldTop, int oldRight, int oldBottom) {
+                    if (hasSeenEducationTip()) {
+                        removeOnLayoutChangeListener(this);
+                        return;
+                    }
+                    // Widgets are loaded asynchronously, We are adding a delay because we only want
+                    // to show the tip when the widget preview has finished loading and rendering in
+                    // this view.
+                    removeCallbacks(mShowEducationTipTask);
+                    postDelayed(mShowEducationTipTask, EDUCATION_TIP_DELAY_MS);
+                }
+            };
+
+    private final Runnable mShowEducationTipTask = () -> {
+        if (hasSeenEducationTip()) {
+            removeOnLayoutChangeListener(mLayoutChangeListenerToShowTips);
+            return;
+        }
+        View viewForTip = ((ViewGroup) ((TableLayout) findViewById(R.id.widgets_table))
+                                    .getChildAt(0)).getChildAt(0);
+        if (showEducationTipOnViewIfPossible(viewForTip) != null) {
+            removeOnLayoutChangeListener(mLayoutChangeListenerToShowTips);
+        }
+    };
+
     public WidgetsBottomSheet(Context context, AttributeSet attrs) {
         this(context, attrs, 0);
     }
@@ -88,6 +119,9 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
         // take over the entire view vertically.
         mMaxTableHeight = deviceProfile.inv.numRows * 2 / 3  * deviceProfile.cellHeightPx;
         mCurrentConfiguration = new Configuration(getResources().getConfiguration());
+        if (!hasSeenEducationTip()) {
+            addOnLayoutChangeListener(mLayoutChangeListenerToShowTips);
+        }
     }
 
     @Override
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 42ff249a4a..145d5cbf4f 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -41,7 +41,6 @@ import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
-import androidx.core.view.ViewCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.launcher3.DeviceProfile;
@@ -49,11 +48,9 @@ import com.android.launcher3.Insettable;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.compat.AccessibilityManagerCompat;
 import com.android.launcher3.model.WidgetItem;
-import com.android.launcher3.views.ArrowTipView;
 import com.android.launcher3.views.RecyclerViewFastScroller;
 import com.android.launcher3.views.TopRoundedCornerView;
 import com.android.launcher3.widget.BaseWidgetSheet;
@@ -86,7 +83,6 @@ public class WidgetsFullSheet extends BaseWidgetSheet
     // resolution or landscape on phone. This ratio defines the max percentage of content area that
     // the table can display.
     private static final float RECOMMENDATION_TABLE_HEIGHT_RATIO = 0.75f;
-    private static final String WIDGETS_EDUCATION_TIP_SEEN = "launcher.widgets_education_tip_seen";
 
     private final Rect mInsets = new Rect();
     private final boolean mHasWorkProfile;
@@ -120,9 +116,8 @@ public class WidgetsFullSheet extends BaseWidgetSheet
             return;
         }
         View viewForTip = getViewToShowEducationTip();
-        if (viewForTip != null && ViewCompat.isLaidOut(viewForTip)) {
+        if (showEducationTipOnViewIfPossible(viewForTip) != null) {
             removeOnLayoutChangeListener(mLayoutChangeListenerToShowTips);
-            showEducationTipOnView(viewForTip);
         }
     };
     private final int mTabsHeight;
@@ -618,18 +613,6 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         getWindowInsetsController().hide(WindowInsets.Type.ime());
     }
 
-    private void showEducationTipOnView(View view) {
-        mActivityContext.getSharedPrefs().edit()
-                .putBoolean(WIDGETS_EDUCATION_TIP_SEEN, true).apply();
-        int[] coords = new int[2];
-        view.getLocationOnScreen(coords);
-        ArrowTipView arrowTipView = new ArrowTipView(mActivityContext);
-        arrowTipView.showAtLocation(
-                getContext().getString(R.string.long_press_widget_to_add),
-                /* arrowXCoord= */coords[0] + view.getWidth() / 2,
-                /* yCoord= */coords[1]);
-    }
-
     @Nullable private View getViewToShowEducationTip() {
         if (mSearchAndRecommendationViewHolder.mRecommendedWidgetsTable.getVisibility() == VISIBLE
                 && mSearchAndRecommendationViewHolder.mRecommendedWidgetsTable.getChildCount() > 0
@@ -658,11 +641,6 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         return null;
     }
 
-    private boolean hasSeenEducationTip() {
-        return mActivityContext.getSharedPrefs().getBoolean(WIDGETS_EDUCATION_TIP_SEEN, false)
-                || Utilities.IS_RUNNING_IN_TEST_HARNESS;
-    }
-
     /** A holder class for holding adapters & their corresponding recycler view. */
     private final class AdapterHolder {
         static final int PRIMARY = 0;
-- 
GitLab


From 43a6be4b82e58f31e81a59b94e5c827eba0347f1 Mon Sep 17 00:00:00 2001
From: Stevie Kideckel <kideckel@google.com>
Date: Tue, 25 May 2021 13:54:17 +0000
Subject: [PATCH 1259/1664] Remove intrinsic padding from widget previews

Also, scale down the preview size if it's wider than the target cell.

The intrinsic padding prevents the corners of the preview from being
rounded correctly and can lead to clipping or no rounding, especially at
larger sizes.

Bug: 187141692
Test: verified locally
Change-Id: Ie57ad57ba7c102330324bd0439acc55ff4fd83ff
---
 .../launcher3/WidgetPreviewLoader.java        | 34 ++++++++++++++-----
 .../android/launcher3/widget/WidgetCell.java  | 20 ++++++++---
 2 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java
index 8b7a750cc7..c7323d025b 100644
--- a/src/com/android/launcher3/WidgetPreviewLoader.java
+++ b/src/com/android/launcher3/WidgetPreviewLoader.java
@@ -385,27 +385,29 @@ public class WidgetPreviewLoader {
             previewHeight = Math.max((int)(scale * previewHeight), 1);
         }
 
-        // If a bitmap is passed in, we use it; otherwise, we create a bitmap of the right size
         final Canvas c = new Canvas();
         if (preview == null) {
+            // If no bitmap was provided, then allocate a new one with the right size.
             preview = Bitmap.createBitmap(previewWidth, previewHeight, Config.ARGB_8888);
             c.setBitmap(preview);
         } else {
-            // We use the preview bitmap height to determine where the badge will be drawn in the
-            // UI. If its larger than what we need, resize the preview bitmap so that there are
-            // no transparent pixels between the preview and the badge.
-            if (preview.getHeight() > previewHeight) {
-                preview.reconfigure(preview.getWidth(), previewHeight, preview.getConfig());
+            // If a bitmap was passed in, attempt to reconfigure the bitmap to the same dimensions
+            // as the preview.
+            try {
+                preview.reconfigure(previewWidth, previewHeight, preview.getConfig());
+            } catch (IllegalArgumentException e) {
+                // This occurs if the preview can't be reconfigured for any reason. In this case,
+                // allocate a new bitmap with the right size.
+                preview = Bitmap.createBitmap(previewWidth, previewHeight, Config.ARGB_8888);
             }
-            // Reusing bitmap. Clear it.
+
             c.setBitmap(preview);
             c.drawColor(0, PorterDuff.Mode.CLEAR);
         }
 
         // Draw the scaled preview into the final bitmap
-        int x = (preview.getWidth() - previewWidth) / 2;
         if (widgetPreviewExists) {
-            drawable.setBounds(x, 0, x + previewWidth, previewHeight);
+            drawable.setBounds(0, 0, previewWidth, previewHeight);
             drawable.draw(c);
         } else {
             RectF boxRect;
@@ -565,6 +567,7 @@ public class WidgetPreviewLoader {
         @Thunk long[] mVersions;
         @Thunk Bitmap mBitmapToRecycle;
 
+        @Nullable private Bitmap mUnusedPreviewBitmap;
         private boolean mSaveToDB = false;
 
         PreviewLoadTask(WidgetCacheKey key, WidgetItem info, int previewWidth,
@@ -625,6 +628,11 @@ public class WidgetPreviewLoader {
                 Pair<Bitmap, Boolean> pair = generatePreview(mActivity, mInfo, unusedBitmap,
                         mPreviewWidth, mPreviewHeight);
                 preview = pair.first;
+
+                if (preview != unusedBitmap) {
+                    mUnusedPreviewBitmap = unusedBitmap;
+                }
+
                 this.mSaveToDB = pair.second;
             }
             return preview;
@@ -639,6 +647,14 @@ public class WidgetPreviewLoader {
                 MODEL_EXECUTOR.post(new Runnable() {
                     @Override
                     public void run() {
+                        if (mUnusedPreviewBitmap != null) {
+                            // If we didn't end up using the bitmap, it can be added back into the
+                            // recycled set.
+                            synchronized (mUnusedBitmaps) {
+                                mUnusedBitmaps.add(mUnusedPreviewBitmap);
+                            }
+                        }
+
                         if (!isCancelled() && mSaveToDB) {
                             // If we are still using this preview, then write it to the DB and then
                             // let the normal clear mechanism recycle the bitmap
diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index f7993dc408..7d04d7b404 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -95,6 +95,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     protected final BaseActivity mActivity;
     private final CheckLongPressHelper mLongPressHelper;
     private final float mEnforcedCornerRadius;
+    private final int mPreviewPadding;
 
     private RemoteViews mRemoteViewsPreview;
     private NavigableAppWidgetHostView mAppWidgetHostViewPreview;
@@ -119,6 +120,8 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
         setClipToPadding(false);
         setAccessibilityDelegate(mActivity.getAccessibilityDelegate());
         mEnforcedCornerRadius = RoundedCornerEnforcement.computeEnforcedRadius(context);
+        mPreviewPadding =
+                2 * getResources().getDimensionPixelSize(R.dimen.widget_preview_shortcut_padding);
     }
 
     private void setContainerWidth() {
@@ -281,7 +284,16 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
             return;
         }
         if (drawable != null) {
-            setContainerSize(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
+            float scale = 1f;
+            if (getWidth() > 0 && getHeight() > 0) {
+                // Scale down the preview size if it's wider than the cell.
+                float maxWidth = getWidth() - mPreviewPadding;
+                float previewWidth = drawable.getIntrinsicWidth() * mPreviewScale;
+                scale = Math.min(maxWidth / previewWidth, 1);
+            }
+            setContainerSize(
+                    Math.round(drawable.getIntrinsicWidth() * scale),
+                    Math.round(drawable.getIntrinsicHeight() * scale));
             mWidgetImage.setDrawable(drawable);
             mWidgetImage.setVisibility(View.VISIBLE);
             if (mAppWidgetHostViewPreview != null) {
@@ -330,11 +342,9 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
 
     /** Sets the widget preview image size, in number of cells, and preview scale. */
     public void setPreviewSize(int spanX, int spanY, float previewScale) {
-        int padding = 2 * getResources()
-                .getDimensionPixelSize(R.dimen.widget_preview_shortcut_padding);
         DeviceProfile deviceProfile = mActivity.getDeviceProfile();
-        mPreviewWidth = deviceProfile.cellWidthPx * spanX + padding;
-        mPreviewHeight = deviceProfile.cellHeightPx * spanY + padding;
+        mPreviewWidth = deviceProfile.cellWidthPx * spanX + mPreviewPadding;
+        mPreviewHeight = deviceProfile.cellHeightPx * spanY + mPreviewPadding;
         mPreviewScale = previewScale;
     }
 
-- 
GitLab


From c4c326920617c360c68fd9f82187b3cdb8ab9da1 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 21 May 2021 14:23:29 -0700
Subject: [PATCH 1260/1664] Crossfading splashscreen if icon is themed

Bug: 188840653
Test: Manual
Change-Id: Ibd00bb1a94576a7512872eba39a936c174f9871d
---
 .../launcher3/QuickstepTransitionManager.java |  7 +--
 src/com/android/launcher3/BubbleTextView.java | 16 +----
 .../launcher3/views/FloatingIconView.java     | 59 +++++++++++--------
 3 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index ec77b9b902..3aa758fec2 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -583,7 +583,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
 
         AnimOpenProperties prop = new AnimOpenProperties(mLauncher.getResources(), mDeviceProfile,
                 windowTargetBounds, launcherIconBounds, v, dragLayerBounds[0], dragLayerBounds[1],
-                hasSplashScreen);
+                hasSplashScreen, floatingView.isDifferentFromAppIcon());
         int left = (int) (prop.cropCenterXStart - prop.cropWidthStart / 2);
         int top = (int) (prop.cropCenterYStart - prop.cropHeightStart / 2);
         int right = (int) (left + prop.cropWidthStart);
@@ -1327,7 +1327,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
 
         AnimOpenProperties(Resources r, DeviceProfile dp, Rect windowTargetBounds,
                 RectF launcherIconBounds, View view, int dragLayerLeft, int dragLayerTop,
-                boolean hasSplashScreen) {
+                boolean hasSplashScreen, boolean hasDifferentAppIcon) {
             // Scale the app icon to take up the entire screen. This simplifies the math when
             // animating the app window position / scale.
             float smallestSize = Math.min(windowTargetBounds.height(), windowTargetBounds.width());
@@ -1359,8 +1359,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                     : APP_LAUNCH_DOWN_CURVED_DURATION;
             alphaDuration = useUpwardAnimation ? APP_LAUNCH_ALPHA_DURATION
                     : APP_LAUNCH_ALPHA_DOWN_DURATION;
-
-            iconAlphaStart = hasSplashScreen ? 0 : 1f;
+            iconAlphaStart = hasSplashScreen && !hasDifferentAppIcon ? 0 : 1f;
 
             // TOOD: Share value from shell when available.
             final float windowIconSize = Utilities.pxFromSp(108, r.getDisplayMetrics());
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 786678631f..4f0ef12bec 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -119,7 +119,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
     };
 
     private final ActivityContext mActivity;
-    private Drawable mIcon;
+    private FastBitmapDrawable mIcon;
     private boolean mCenterVertically;
 
     protected final int mDisplay;
@@ -335,16 +335,6 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
         }
     }
 
-    /**
-     * Directly set the icon and label.
-     */
-    @UiThread
-    public void applyIconAndLabel(Drawable icon, CharSequence label) {
-        setIcon(icon);
-        setText(label);
-        setContentDescription(label);
-    }
-
     /**
      * Overrides the default long press timeout.
      */
@@ -369,7 +359,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
     }
 
     /** Returns the icon for this view. */
-    public Drawable getIcon() {
+    public FastBitmapDrawable getIcon() {
         return mIcon;
     }
 
@@ -704,7 +694,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
     /**
      * Sets the icon for this view based on the layout direction.
      */
-    protected void setIcon(Drawable icon) {
+    protected void setIcon(FastBitmapDrawable icon) {
         if (mIsIconVisible) {
             applyCompoundDrawables(icon);
         }
diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java
index f973c2be1e..25cce69063 100644
--- a/src/com/android/launcher3/views/FloatingIconView.java
+++ b/src/com/android/launcher3/views/FloatingIconView.java
@@ -52,6 +52,7 @@ import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.dragndrop.FolderAdaptiveIcon;
 import com.android.launcher3.folder.FolderIcon;
 import com.android.launcher3.graphics.PreloadIconDrawable;
+import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
@@ -250,27 +251,12 @@ public class FloatingIconView extends FrameLayout implements
     @WorkerThread
     @SuppressWarnings("WrongThread")
     private static void getIconResult(Launcher l, View originalView, ItemInfo info, RectF pos,
-            IconLoadResult iconLoadResult) {
+            Drawable btvIcon, IconLoadResult iconLoadResult) {
         Drawable drawable;
-        Drawable btvIcon;
-        Drawable badge = null;
         boolean supportsAdaptiveIcons = ADAPTIVE_ICON_WINDOW_ANIM.get()
                 && !info.isDisabled(); // Use original icon for disabled icons.
 
-        if (originalView instanceof BubbleTextView) {
-            BubbleTextView btv = (BubbleTextView) originalView;
-
-            if (info instanceof ItemInfoWithIcon
-                    && (((ItemInfoWithIcon) info).runtimeStatusFlags
-                        & ItemInfoWithIcon.FLAG_SHOW_DOWNLOAD_PROGRESS_MASK) != 0) {
-                btvIcon = btv.makePreloadIcon();
-            } else {
-                btvIcon = btv.getIcon();
-            }
-        } else {
-            btvIcon = null;
-        }
-
+        Drawable badge = null;
         if (info instanceof SystemShortcut) {
             if (originalView instanceof ImageView) {
                 drawable = ((ImageView) originalView).getDrawable();
@@ -367,6 +353,13 @@ public class FloatingIconView extends FrameLayout implements
         invalidate();
     }
 
+    /**
+     * Returns true if the icon is different from main app icon
+     */
+    public boolean isDifferentFromAppIcon() {
+        return mIconLoadResult == null ? false : mIconLoadResult.isThemed;
+    }
+
     /**
      * Checks if the icon result is loaded. If true, we set the icon immediately. Else, we add a
      * callback to set the icon once the icon result is loaded.
@@ -505,12 +498,28 @@ public class FloatingIconView extends FrameLayout implements
      */
     @UiThread
     public static IconLoadResult fetchIcon(Launcher l, View v, ItemInfo info, boolean isOpening) {
-        IconLoadResult result = new IconLoadResult(info);
-        MODEL_EXECUTOR.getHandler().postAtFrontOfQueue(() -> {
-            RectF position = new RectF();
-            getLocationBoundsForView(l, v, isOpening, position);
-            getIconResult(l, v, info, position, result);
-        });
+        RectF position = new RectF();
+        getLocationBoundsForView(l, v, isOpening, position);
+
+        final FastBitmapDrawable btvIcon;
+        if (v instanceof BubbleTextView) {
+            BubbleTextView btv = (BubbleTextView) v;
+            if (info instanceof ItemInfoWithIcon
+                    && (((ItemInfoWithIcon) info).runtimeStatusFlags
+                    & ItemInfoWithIcon.FLAG_SHOW_DOWNLOAD_PROGRESS_MASK) != 0) {
+                btvIcon = btv.makePreloadIcon();
+            } else {
+                btvIcon = btv.getIcon();
+            }
+        } else {
+            btvIcon = null;
+        }
+
+        IconLoadResult result = new IconLoadResult(info,
+                btvIcon == null ? false : btvIcon.isThemed());
+
+        MODEL_EXECUTOR.getHandler().postAtFrontOfQueue(() ->
+                getIconResult(l, v, info, position, btvIcon, result));
 
         sIconLoadResult = result;
         return result;
@@ -626,6 +635,7 @@ public class FloatingIconView extends FrameLayout implements
 
     private static class IconLoadResult {
         final ItemInfo itemInfo;
+        final boolean isThemed;
         Drawable btvDrawable;
         Drawable drawable;
         Drawable badge;
@@ -633,8 +643,9 @@ public class FloatingIconView extends FrameLayout implements
         Runnable onIconLoaded;
         boolean isIconLoaded;
 
-        IconLoadResult(ItemInfo itemInfo) {
+        IconLoadResult(ItemInfo itemInfo, boolean isThemed) {
             this.itemInfo = itemInfo;
+            this.isThemed = isThemed;
         }
     }
 }
-- 
GitLab


From 880fc577c0639bd14662db9e7d70d927279f6688 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Fri, 21 May 2021 12:42:32 -0500
Subject: [PATCH 1261/1664] Remove AllApps prediction edu

Test: Manual
Bug: 183579072
Change-Id: Ibaffc5ac711e35df5256baed8be57159046fbdda
---
 .../appprediction/AllAppsTipView.java         | 83 -------------------
 .../appprediction/PredictionRowView.java      |  1 -
 res/drawable/all_apps_tabs_background.xml     |  5 +-
 res/layout/arrow_toast.xml                    | 11 ++-
 res/values/dimens.xml                         |  1 +
 .../android/launcher3/views/ArrowTipView.java | 35 +++++---
 6 files changed, 33 insertions(+), 103 deletions(-)
 delete mode 100644 quickstep/src/com/android/launcher3/appprediction/AllAppsTipView.java

diff --git a/quickstep/src/com/android/launcher3/appprediction/AllAppsTipView.java b/quickstep/src/com/android/launcher3/appprediction/AllAppsTipView.java
deleted file mode 100644
index 98bf483a3d..0000000000
--- a/quickstep/src/com/android/launcher3/appprediction/AllAppsTipView.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.appprediction;
-
-import static com.android.launcher3.AbstractFloatingView.TYPE_DISCOVERY_BOUNCE;
-import static com.android.launcher3.AbstractFloatingView.TYPE_ON_BOARD_POPUP;
-import static com.android.launcher3.LauncherState.ALL_APPS;
-
-import android.os.UserManager;
-
-import com.android.launcher3.AbstractFloatingView;
-import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherState;
-import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
-import com.android.launcher3.allapps.FloatingHeaderView;
-import com.android.launcher3.statemanager.StateManager.StateListener;
-import com.android.launcher3.views.ArrowTipView;
-
-/**
- * ArrowTip helper aligned just above prediction apps, shown to users that enter all apps for the
- * first time.
- */
-public class AllAppsTipView {
-
-    private static final String ALL_APPS_TIP_SEEN = "launcher.all_apps_tip_seen";
-
-    private static boolean showAllAppsTipIfNecessary(Launcher launcher) {
-        FloatingHeaderView floatingHeaderView = launcher.getAppsView().getFloatingHeaderView();
-        if (!floatingHeaderView.hasVisibleContent()
-                || AbstractFloatingView.getOpenView(launcher,
-                TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE) != null
-                || !launcher.isInState(ALL_APPS)
-                || hasSeenAllAppsTip(launcher)
-                || launcher.getSystemService(UserManager.class).isDemoUser()
-                || Utilities.IS_RUNNING_IN_TEST_HARNESS) {
-            return false;
-        }
-
-        int[] coords = new int[2];
-        floatingHeaderView.findFixedRowByType(PredictionRowView.class).getLocationOnScreen(coords);
-        ArrowTipView arrowTipView = new ArrowTipView(launcher).setOnClosedCallback(() -> {
-            launcher.getSharedPrefs().edit().putBoolean(ALL_APPS_TIP_SEEN, true).apply();
-            // TODO: add log to WW
-        });
-        arrowTipView.show(launcher.getString(R.string.all_apps_prediction_tip), coords[1]);
-
-        return true;
-    }
-
-    private static boolean hasSeenAllAppsTip(Launcher launcher) {
-        return launcher.getSharedPrefs().getBoolean(ALL_APPS_TIP_SEEN, false);
-    }
-
-    public static void scheduleShowIfNeeded(Launcher launcher) {
-        if (!hasSeenAllAppsTip(launcher)) {
-            launcher.getStateManager().addStateListener(new StateListener<LauncherState>() {
-                @Override
-                public void onStateTransitionComplete(LauncherState finalState) {
-                    if (finalState == ALL_APPS) {
-                        if (showAllAppsTipIfNecessary(launcher)) {
-                            launcher.getStateManager().removeStateListener(this);
-                        }
-                    }
-                }
-            });
-        }
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
index 6d5975f5fa..de040821b4 100644
--- a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
+++ b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
@@ -88,7 +88,6 @@ public class PredictionRowView extends LinearLayout implements
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
-        AllAppsTipView.scheduleShowIfNeeded(mLauncher);
     }
 
     public void setup(FloatingHeaderView parent, FloatingHeaderRow[] rows, boolean tabsHidden) {
diff --git a/res/drawable/all_apps_tabs_background.xml b/res/drawable/all_apps_tabs_background.xml
index f88252217e..a345dd3afc 100644
--- a/res/drawable/all_apps_tabs_background.xml
+++ b/res/drawable/all_apps_tabs_background.xml
@@ -16,8 +16,9 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
     <item
-        android:top="6dp"
-        android:bottom="6dp">
+        android:top="@dimen/all_apps_tabs_vertical_padding"
+        android:bottom="@dimen/all_apps_tabs_vertical_padding
+">
         <shape android:shape="rectangle">
             <solid android:color="?androidprv:attr/colorSurface" />
             <corners android:radius="@dimen/all_apps_header_pill_corner_radius" />
diff --git a/res/layout/arrow_toast.xml b/res/layout/arrow_toast.xml
index ae60e1bf06..c071becb84 100644
--- a/res/layout/arrow_toast.xml
+++ b/res/layout/arrow_toast.xml
@@ -14,9 +14,7 @@
      limitations under the License.
 -->
 
-<merge
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="wrap_content"
     android:layout_width="wrap_content">
 
@@ -40,7 +38,8 @@
             android:gravity="center"
             android:layout_gravity="center_vertical"
             android:textColor="@color/arrow_tip_view_content"
-            android:textSize="16sp"/>
+            android:textSize="16sp" />
+
         <ImageView
             android:id="@+id/dismiss"
             android:layout_width="40dp"
@@ -53,13 +52,13 @@
             android:src="@drawable/ic_remove_no_shadow"
             android:tint="@color/arrow_tip_view_content"
             android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/accessibility_close"/>
+            android:contentDescription="@string/accessibility_close" />
     </LinearLayout>
 
     <View
         android:id="@+id/arrow"
         android:elevation="2dp"
-        android:layout_width="10dp"
+        android:layout_width="@dimen/arrow_toast_arrow_width"
         android:layout_height="8dp"
         android:layout_marginTop="-2dp"/>
 </merge>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index bfa02c07d3..7d412afa5a 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -105,6 +105,7 @@
     <dimen name="all_apps_tip_bottom_margin">8dp</dimen>
     <!-- The size of corner radius of the arrow in the arrow toast. -->
     <dimen name="arrow_toast_corner_radius">2dp</dimen>
+    <dimen name="arrow_toast_arrow_width">10dp</dimen>
 
 <!-- Search bar in All Apps -->
     <dimen name="all_apps_header_max_elevation">3dp</dimen>
diff --git a/src/com/android/launcher3/views/ArrowTipView.java b/src/com/android/launcher3/views/ArrowTipView.java
index a6f2b42a29..5fdfda81ff 100644
--- a/src/com/android/launcher3/views/ArrowTipView.java
+++ b/src/com/android/launcher3/views/ArrowTipView.java
@@ -53,11 +53,19 @@ public class ArrowTipView extends AbstractFloatingView {
 
     protected final BaseDraggingActivity mActivity;
     private final Handler mHandler = new Handler();
+    private final boolean mIsPointingUp;
+    private final int mArrowWidth;
     private Runnable mOnClosed;
 
     public ArrowTipView(Context context) {
+        this(context, false);
+    }
+
+    public ArrowTipView(Context context, boolean isPointingUp) {
         super(context, null, 0);
         mActivity = BaseDraggingActivity.fromContext(context);
+        mIsPointingUp = isPointingUp;
+        mArrowWidth = context.getResources().getDimensionPixelSize(R.dimen.arrow_toast_arrow_width);
         init(context);
     }
 
@@ -105,13 +113,17 @@ public class ArrowTipView extends AbstractFloatingView {
         View arrowView = findViewById(R.id.arrow);
         ViewGroup.LayoutParams arrowLp = arrowView.getLayoutParams();
         ShapeDrawable arrowDrawable = new ShapeDrawable(TriangleShape.create(
-                arrowLp.width, arrowLp.height, false));
+                arrowLp.width, arrowLp.height, mIsPointingUp));
         Paint arrowPaint = arrowDrawable.getPaint();
-        arrowPaint.setColor(ContextCompat.getColor(getContext(),  R.color.arrow_tip_view_bg));
+        arrowPaint.setColor(ContextCompat.getColor(getContext(), R.color.arrow_tip_view_bg));
         // The corner path effect won't be reflected in the shadow, but shouldn't be noticeable.
         arrowPaint.setPathEffect(new CornerPathEffect(
                 context.getResources().getDimension(R.dimen.arrow_toast_corner_radius)));
         arrowView.setBackground(arrowDrawable);
+        if (mIsPointingUp) {
+            removeView(arrowView);
+            addView(arrowView, 0);
+        }
 
         mIsOpen = true;
 
@@ -128,10 +140,10 @@ public class ArrowTipView extends AbstractFloatingView {
     /**
      * Show the ArrowTipView (tooltip) center, start, or end aligned.
      *
-     * @param text The text to be shown in the tooltip.
-     * @param gravity The gravity aligns the tooltip center, start, or end.
+     * @param text             The text to be shown in the tooltip.
+     * @param gravity          The gravity aligns the tooltip center, start, or end.
      * @param arrowMarginStart The margin from start to place arrow (ignored if center)
-     * @param top  The Y coordinate of the bottom of tooltip.
+     * @param top              The Y coordinate of the bottom of tooltip.
      * @return The tooltip.
      */
     public ArrowTipView show(String text, int gravity, int arrowMarginStart, int top) {
@@ -149,15 +161,15 @@ public class ArrowTipView extends AbstractFloatingView {
             arrowMarginStart = parent.getMeasuredWidth() - arrowMarginStart;
         }
         if (gravity == Gravity.END) {
-            lp.setMarginEnd(parent.getMeasuredWidth() - arrowMarginStart);
+            lp.setMarginEnd(parent.getMeasuredWidth() - arrowMarginStart - mArrowWidth);
         } else if (gravity == Gravity.START) {
-            lp.setMarginStart(arrowMarginStart);
+            lp.setMarginStart(arrowMarginStart - mArrowWidth / 2);
         }
         requestLayout();
 
         params.leftMargin = mActivity.getDeviceProfile().workspacePadding.left;
         params.rightMargin = mActivity.getDeviceProfile().workspacePadding.right;
-        post(() -> setY(top - getHeight()));
+        post(() -> setY(top - (mIsPointingUp ? 0 : getHeight())));
         setAlpha(0);
         animate()
                 .alpha(1f)
@@ -172,13 +184,14 @@ public class ArrowTipView extends AbstractFloatingView {
     /**
      * Show the ArrowTipView (tooltip) custom aligned.
      *
-     * @param text The text to be shown in the tooltip.
+     * @param text        The text to be shown in the tooltip.
      * @param arrowXCoord The X coordinate for the arrow on the tip. The arrow is usually in the
      *                    center of ArrowTipView unless the ArrowTipView goes beyond screen margin.
-     * @param yCoord The Y coordinate of the bottom of the tooltip.
+     * @param yCoord      The Y coordinate of the bottom of the tooltip.
      * @return The tool tip view.
      */
-    @Nullable public ArrowTipView showAtLocation(String text, int arrowXCoord, int yCoord) {
+    @Nullable
+    public ArrowTipView showAtLocation(String text, int arrowXCoord, int yCoord) {
         ViewGroup parent = mActivity.getDragLayer();
         @Px int parentViewWidth = parent.getWidth();
         @Px int textViewWidth = getContext().getResources()
-- 
GitLab


From 8a3a857668441b1021eaef001b9d97edd2bc66d9 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Thu, 20 May 2021 14:05:38 -0700
Subject: [PATCH 1262/1664] Update Gesture nav tutorial.

- Seperated back left and right edge tutorial steps
- updated back left and right tutorial step strings
- Removed feedback view timeout
- Added accessibility focus on title when feedback view appears
- Added logic to show feedback when the tutorial fragment is stopped then resumed

Test: manual

Bug: 169687177
Fixes: 188116424
Fixes: 188115939
Fixes: 188124784
Fixes: 188555152
Fixes: 188972969

Change-Id: I97755a455bf3fa4674955d5cc91ed8b02f484b76
---
 quickstep/res/values-af/strings.xml           |   9 +-
 quickstep/res/values-am/strings.xml           |   9 +-
 quickstep/res/values-ar/strings.xml           |   9 +-
 quickstep/res/values-as/strings.xml           |   5 +-
 quickstep/res/values-az/strings.xml           |   9 +-
 quickstep/res/values-b+sr+Latn/strings.xml    |   9 +-
 quickstep/res/values-be/strings.xml           |   9 +-
 quickstep/res/values-bg/strings.xml           |   9 +-
 quickstep/res/values-bn/strings.xml           |   5 +-
 quickstep/res/values-bs/strings.xml           |   9 +-
 quickstep/res/values-ca/strings.xml           |   9 +-
 quickstep/res/values-cs/strings.xml           |   9 +-
 quickstep/res/values-da/strings.xml           |   9 +-
 quickstep/res/values-de/strings.xml           |   9 +-
 quickstep/res/values-el/strings.xml           |   9 +-
 quickstep/res/values-en-rAU/strings.xml       |   9 +-
 quickstep/res/values-en-rCA/strings.xml       |   9 +-
 quickstep/res/values-en-rGB/strings.xml       |   9 +-
 quickstep/res/values-en-rIN/strings.xml       |   9 +-
 quickstep/res/values-en-rXC/strings.xml       |   9 +-
 quickstep/res/values-es-rUS/strings.xml       |   9 +-
 quickstep/res/values-es/strings.xml           |   9 +-
 quickstep/res/values-et/strings.xml           |   9 +-
 quickstep/res/values-eu/strings.xml           |   9 +-
 quickstep/res/values-fa/strings.xml           |   9 +-
 quickstep/res/values-fi/strings.xml           |   9 +-
 quickstep/res/values-fr-rCA/strings.xml       |   9 +-
 quickstep/res/values-fr/strings.xml           |   9 +-
 quickstep/res/values-gl/strings.xml           |   9 +-
 quickstep/res/values-gu/strings.xml           |   5 +-
 quickstep/res/values-hi/strings.xml           |   9 +-
 quickstep/res/values-hr/strings.xml           |   9 +-
 quickstep/res/values-hu/strings.xml           |   9 +-
 quickstep/res/values-hy/strings.xml           |   9 +-
 quickstep/res/values-in/strings.xml           |   9 +-
 quickstep/res/values-is/strings.xml           |   9 +-
 quickstep/res/values-it/strings.xml           |   9 +-
 quickstep/res/values-iw/strings.xml           |   9 +-
 quickstep/res/values-ja/strings.xml           |   9 +-
 quickstep/res/values-ka/strings.xml           |   9 +-
 quickstep/res/values-kk/strings.xml           |   9 +-
 quickstep/res/values-km/strings.xml           |   9 +-
 quickstep/res/values-kn/strings.xml           |   5 +-
 quickstep/res/values-ko/strings.xml           |   9 +-
 quickstep/res/values-ky/strings.xml           |   9 +-
 quickstep/res/values-lo/strings.xml           |   9 +-
 quickstep/res/values-lt/strings.xml           |   9 +-
 quickstep/res/values-lv/strings.xml           |   9 +-
 quickstep/res/values-mk/strings.xml           |   9 +-
 quickstep/res/values-ml/strings.xml           |   5 +-
 quickstep/res/values-mn/strings.xml           |   9 +-
 quickstep/res/values-mr/strings.xml           |   5 +-
 quickstep/res/values-ms/strings.xml           |   5 +-
 quickstep/res/values-my/strings.xml           |   9 +-
 quickstep/res/values-nb/strings.xml           |   9 +-
 quickstep/res/values-ne/strings.xml           |   5 +-
 quickstep/res/values-nl/strings.xml           |   9 +-
 quickstep/res/values-or/strings.xml           |   5 +-
 quickstep/res/values-pa/strings.xml           |   5 +-
 quickstep/res/values-pl/strings.xml           |   9 +-
 quickstep/res/values-pt-rPT/strings.xml       |   9 +-
 quickstep/res/values-pt/strings.xml           |   9 +-
 quickstep/res/values-ro/strings.xml           |   9 +-
 quickstep/res/values-ru/strings.xml           |   9 +-
 quickstep/res/values-si/strings.xml           |   9 +-
 quickstep/res/values-sk/strings.xml           |   9 +-
 quickstep/res/values-sl/strings.xml           |   9 +-
 quickstep/res/values-sq/strings.xml           |   9 +-
 quickstep/res/values-sr/strings.xml           |   9 +-
 quickstep/res/values-sv/strings.xml           |   2 -
 quickstep/res/values-sw/strings.xml           |   9 +-
 quickstep/res/values-ta/strings.xml           |   9 +-
 quickstep/res/values-te/strings.xml           |   5 +-
 quickstep/res/values-th/strings.xml           |   9 +-
 quickstep/res/values-tl/strings.xml           |   9 +-
 quickstep/res/values-tr/strings.xml           |   9 +-
 quickstep/res/values-uk/strings.xml           |   9 +-
 quickstep/res/values-ur/strings.xml           |   5 +-
 quickstep/res/values-uz/strings.xml           |   9 +-
 quickstep/res/values-vi/strings.xml           |   9 +-
 quickstep/res/values-zh-rCN/strings.xml       |   9 +-
 quickstep/res/values-zh-rHK/strings.xml       |   9 +-
 quickstep/res/values-zh-rTW/strings.xml       |   9 +-
 quickstep/res/values-zu/strings.xml           |   9 +-
 quickstep/res/values/strings.xml              |  20 +-
 .../BackGestureTutorialController.java        |  23 ++-
 .../HomeGestureTutorialController.java        |   7 +-
 .../OverviewGestureTutorialController.java    |  12 +-
 .../SwipeUpGestureTutorialController.java     |   4 +-
 .../interaction/TutorialController.java       | 173 +++++++++---------
 .../interaction/TutorialFragment.java         |  18 +-
 .../settings/DeveloperOptionsFragment.java    |   3 +-
 92 files changed, 450 insertions(+), 511 deletions(-)

diff --git a/quickstep/res/values-af/strings.xml b/quickstep/res/values-af/strings.xml
index cb8d8c069c..2cef1e5696 100644
--- a/quickstep/res/values-af/strings.xml
+++ b/quickstep/res/values-af/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Voorspelde program: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Maak seker dat jy van die rand heel links af swiep."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Maak seker dat jy van die linkerrand na die middel van die skerm swiep en laat los."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Mooi so! Swiep nou van die regterkant om terug te gaan"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Swiep van regs na middel van skerm om terug te gaan na laaste skerm."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Swiep van regs na middel van skerm om terug te gaan na laaste skerm."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Maak seker dat jy van die rand heel regs af swiep."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Maak seker dat jy van die regterrand na die middel van die skerm swiep en laat los."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Jy het die \"gaan terug\"-gebaar voltooi. Nou kan jy leer hoe om tussen programme te wissel."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Jy het die \"gaan terug\"-gebaar voltooi. Nou kan jy leer hoe om tussen programme te wissel."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Jy het die \"gaan terug\"-gebaar voltooi."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Maak seker dat jy nie te naby aan die onderkant van die skerm swiep nie."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Gaan na Instellings om sensitiwiteit van teruggebaar te verander"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Swiep van links af om terug te gaan"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Swiep van linkerkant na middel van skerm om terug te gaan na laaste skerm waarop jy was."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Swiep van links af om terug te gaan"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Swiep van linkerkant na middel van skerm om terug te gaan na laaste skerm waarop jy was."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Maak seker dat jy van die onderrand van die skerm af opswiep."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Maak seker jy onderbreek nie voordat jy laat los nie."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Maak seker jy swiep reguit op."</string>
diff --git a/quickstep/res/values-am/strings.xml b/quickstep/res/values-am/strings.xml
index 1c42d1f73a..253cb6cbe2 100644
--- a/quickstep/res/values-am/strings.xml
+++ b/quickstep/res/values-am/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"የተገመተው መተግበሪያ፦ <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ከግራ ጠርዝ ጥግ ጀምሮ ማንሸራተትዎን ያረጋግጡ።"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ከግራ ጠርዝ ወደ ማያ ገጹ መሃል ማንሸራተትዎን እና መልቀቅዎን ያረጋግጡ።"</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"ጥሩ! አሁን ወደ ኋላ ለመመለስ ከቀኝ ያንሸራትቱ"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"እንዲሁም ከቀኝ ጠርዝ ወደ ማያ ገጹ መሃል በማንሸራተት ወደ መጨረሻው ማያ ገጽ መመለስ ይችላሉ።"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"እንዲሁም ከቀኝ ጠርዝ ወደ ማያ ገጹ መሃል በማንሸራተት ወደ መጨረሻው ማያ ገጽ መመለስ ይችላሉ።"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ከቀኝ ጠርዝ ጥግ ጀምሮ ማንሸራተትዎን ያረጋግጡ።"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ከቀኝ ጠርዝ ወደ ማያ ገጹ መሃል ማንሸራተትዎን እና መልቀቅዎን ያረጋግጡ።"</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"ወደኋላ የመመለስ ምልክትን አጠናቀዋል። ቀጥሎም መተግበሪያዎችን እንዴት መቀየር እንደሚችሉ ይወቁ።"</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"ወደኋላ የመመለስ ምልክትን አጠናቀዋል። ቀጥሎም መተግበሪያዎችን እንዴት መቀየር እንደሚችሉ ይወቁ።"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ወደኋላ የመመለስ ምልክትን አጠናቀዋል።"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ከማያ ገጹ ታችኛው ክፍል ጋር በጣም ጠጋ ብለው አለማንሸራተትዎን ያረጋግጡ።"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ከኋላ ስሜት ሰጭነት ደረጃ ለመለወጥ ወደ ቅንብሮች ይመለሱ"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"ወደ ኋላ ለመመለስ ከግራ ጀምረው ያንሸራትቱ"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"ወደነበሩበት የመጨረሻው ማያ ገጽ ለመመለስ ከግራ ጠርዝ ወደ ማያ ገጹ መሃል ያንሸራትቱ።"</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"ወደ ኋላ ለመመለስ ከግራ ጀምረው ያንሸራትቱ"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"ወደነበሩበት የመጨረሻው ማያ ገጽ ለመመለስ ከግራ ጠርዝ ወደ ማያ ገጹ መሃል ያንሸራትቱ።"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ከማያ ገጹ የታችኛው ጫፍ ወደ ላይ ማንሸራተትዎን ያረጋግጡ።"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ከመልቀቅዎ በፊት ለአፍታ እንዳልቆሙ ያረጋግጡ።"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"በቀጥታ ወደ ላይ ማንሸራተትዎን ያረጋግጡ።"</string>
diff --git a/quickstep/res/values-ar/strings.xml b/quickstep/res/values-ar/strings.xml
index c74af90abc..002eb7e321 100644
--- a/quickstep/res/values-ar/strings.xml
+++ b/quickstep/res/values-ar/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"التطبيق المتوقع: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"تأكّد من التمرير سريعًا من أقصى الحافة اليمنى."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"تأكّد من التمرير سريعًا من الحافة اليمنى إلى وسط الشاشة ثم ارفع إصبعك."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"أحسنت. والآن مرِّر سريعًا من اليسار للرجوع."</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"يمكنك أيضًا الرجوع إلى الشاشة السابقة عن طريق التمرير سريعًا من الحافة اليسرى إلى وسط الشاشة"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"يمكنك أيضًا الرجوع إلى الشاشة السابقة عن طريق التمرير سريعًا من الحافة اليسرى إلى وسط الشاشة"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"تأكّد من التمرير سريعًا من أقصى الحافة اليسرى."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"تأكّد من التمرير سريعًا من الحافة اليسرى إلى وسط الشاشة ثم ارفع إصبعك."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"لقد أكملت التدريب على إيماءة الرجوع. تعرّف بعد ذلك على كيفية التبديل بين التطبيقات."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"لقد أكملت التدريب على إيماءة الرجوع. تعرّف بعد ذلك على كيفية التبديل بين التطبيقات."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"لقد أكملت التدريب على إيماءة الرجوع."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"تأكّد من عدم التمرير بالقرب من أسفل الشاشة."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"لتغيير مستوى حساسية إيماءة الرجوع، انتقِل إلى \"الإعدادات\""</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"مرِّر سريعًا من اليسار للرجوع."</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"للرجوع إلى الشاشة السابقة، مرِّر سريعًا من الحافة اليمنى إلى وسط الشاشة"</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"مرِّر سريعًا من اليسار للرجوع."</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"للرجوع إلى الشاشة السابقة، مرِّر سريعًا من الحافة اليمنى إلى وسط الشاشة"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"تأكّد من التمرير سريعًا من الحافة السفلى للشاشة إلى أعلاها."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"تأكّد من عدم التوقّف قليلاً قبل رفع إصبعك."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"تأكّد من التمرير إلى الأعلى مباشرةً."</string>
diff --git a/quickstep/res/values-as/strings.xml b/quickstep/res/values-as/strings.xml
index 8d0be72a04..699565f4c6 100644
--- a/quickstep/res/values-as/strings.xml
+++ b/quickstep/res/values-as/strings.xml
@@ -47,8 +47,7 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"পূৰ্বানুমান কৰা এপ্: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"আপুনি বাওঁ প্ৰান্তৰৰ একেবাৰে সীমাৰ পৰা ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"আপুনি স্ক্ৰীনৰ বাওঁ প্ৰান্তৰৰ পৰা সোঁ প্ৰান্তৰৰ ফালে মধ্যভাগলৈকে ছোৱাইপ কৰি এৰি দিয়াটো নিশ্চিত কৰক।"</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"সুন্দৰ! এতিয়া উভতি যাবলৈ সোঁ প্ৰান্তৰৰ পৰা ছোৱাইপ কৰক"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"আপুনি স্ক্ৰীনখনৰ সোঁ প্ৰান্তৰৰ পৰা মাজলৈ ছোৱাইপ কৰিও অন্তিম স্ক্ৰীনখনলৈ উভতি যাব পাৰে।"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"আপুনি স্ক্ৰীনখনৰ সোঁ প্ৰান্তৰৰ পৰা মাজলৈ ছোৱাইপ কৰিও অন্তিম স্ক্ৰীনখনলৈ উভতি যাব পাৰে।"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"আপুনি সোঁ প্ৰান্তৰৰ একেবাৰে সীমাৰ পৰা ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"আপুনি স্ক্ৰীনৰ সোঁ প্ৰান্তৰৰ পৰা মধ্যভাগলৈকে ছোৱাইপ কৰি এৰি দিয়াটো নিশ্চিত কৰক।"</string>
     <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"আপুনি উভতি যাওক নিৰ্দেশটো সম্পূৰ্ণ কৰিলে। ইয়াৰ পাছত, এপ্‌ কেনেকৈ সলনি কৰিব সেয়া জানক।"</string>
@@ -56,7 +55,7 @@
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"আপুনি স্ক্ৰীনৰ তলৰ অংশৰ বেছি ওচৰলৈ ছোৱাইপ নকৰাটো নিশ্চিত কৰক।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"উভতি যোৱাৰ নির্দেশটোৰ সংবেদনশীলতা সলনি কৰিবলৈ ছেটিঙলৈ যাওক"</string>
     <string name="back_gesture_intro_title" msgid="5538727561353262952">"উভতি যাবলৈ বাওঁ প্ৰান্তৰৰ পৰা ছোৱাইপ কৰক"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"আপুনি পূৰ্বে থকা অন্তিম স্ক্ৰীনখনলৈ উভতি যাবলৈ স্ক্ৰীনখনৰ বাওঁ প্ৰান্তৰৰ পৰা মাজলৈ ছোৱাইপ কৰক।"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"আপুনি পূৰ্বে থকা অন্তিম স্ক্ৰীনখনলৈ উভতি যাবলৈ স্ক্ৰীনখনৰ বাওঁ প্ৰান্তৰৰ পৰা মাজলৈ ছোৱাইপ কৰক।"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"আপুনি স্ক্ৰীনৰ তলৰ প্ৰান্তৰ পৰা ওপৰলৈ ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"আপুনি এৰি দিয়াৰ পূৰ্বে অলপো নোৰোৱাটো নিশ্চিত কৰক।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"আপুনি পোনকৈ ওপৰলৈ ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
diff --git a/quickstep/res/values-az/strings.xml b/quickstep/res/values-az/strings.xml
index 1dd47b78c1..2d03b4e944 100644
--- a/quickstep/res/values-az/strings.xml
+++ b/quickstep/res/values-az/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Proqnozlaşdırılan tətbiq: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Ən sol tərəfdən sürüşdürdüyünüzə əmin olun."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Ekranın sol kənarından ortasına sürüşdürüb buraxın."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Əla! İndi geri qayıtmaq üçün sağdan sürüşdürün"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Həmçinin ekranın sağ kənarından ortasına sürüşdürərək son ekrana qayıda bilərsiniz."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Həmçinin ekranın sağ kənarından ortasına sürüşdürərək son ekrana qayıda bilərsiniz."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Ən sağ tərəfdən sürüşdürdüyünüzə əmin olun."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Ekranın sağ kənarından ortasına sürüşdürüb buraxın."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Geri getmə jestini tamamladınız. Sonra tətbiqləri keçirməyi öyrənin."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Geri getmə jestini tamamladınız. Sonra tətbiqləri keçirməyi öyrənin."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Geri getmə jestini tamamladınız."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ekranın altına çox yaxın sürüşdürmədiyinizə əmin olun."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Geri qayıtma jestinin həssaslığını dəyişmək üçün Ayarlara keçin"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Geri qayıtmaq üçün soldan sürüşdürün"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Son ekrana qayıtmaq üçün ekranın sol kənarından ortasına doğru sürüşdürün."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Geri qayıtmaq üçün soldan sürüşdürün"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Son ekrana qayıtmaq üçün ekranın sol kənarından ortasına doğru sürüşdürün."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Ekranın aşağı kənarından yuxarı sürüşdürdüyünüzə əmin olun."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Buraxmazdan əvvəl durdurmadığınıza əmin olun."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Birbaşa yuxarı sürüşdürdüyünüzə əmin olun."</string>
diff --git a/quickstep/res/values-b+sr+Latn/strings.xml b/quickstep/res/values-b+sr+Latn/strings.xml
index c1680f8f7d..e9c52c25b8 100644
--- a/quickstep/res/values-b+sr+Latn/strings.xml
+++ b/quickstep/res/values-b+sr+Latn/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predviđamo aplikaciju: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Obavezno prevucite od same leve ivice."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Obavezno prevucite od leve ivice do sredine ekrana i otpustite."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Svaka čast! Sada prevucite zdesna da biste se vratili"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Vratite se na poslednji ekran prevlačenjem zdesna ka sredini."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Vratite se na poslednji ekran prevlačenjem zdesna ka sredini."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Obavezno prevucite od same desne ivice."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Obavezno prevucite od desne ivice do sredine ekrana i otpustite."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Dovršili ste pokret za povratak. Sada saznajte kako da promenite aplikacije."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Dovršili ste pokret za povratak. Sada saznajte kako da promenite aplikacije."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Dovršili ste pokret za povratak."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nikako ne prevlačite previše blizu dna ekrana."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Osetljivost pok. za nazad možete da promenite u Podešavanjima"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Prevucite sa leve strane da biste se vratili"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Da biste se vratili na poslednji ekran, prevucite od leve ivice ka sredini ekrana."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Prevucite sa leve strane da biste se vratili"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Da biste se vratili na poslednji ekran, prevucite od leve ivice ka sredini ekrana."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Obavezno prevucite nagore od donje ivice ekrana."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Nikako ne stajte pre otpuštanja."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Obavezno prevucite pravo nagore."</string>
diff --git a/quickstep/res/values-be/strings.xml b/quickstep/res/values-be/strings.xml
index 58ccaf95f3..d0774cb0e7 100644
--- a/quickstep/res/values-be/strings.xml
+++ b/quickstep/res/values-be/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Праграма з падказкі: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Пераканайцеся, што вы не праводзіце пальцам занадта далёка ад левага вугла экрана."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Пераканайцеся, што праводзіце пальцам з левага вугла ў цэнтр экрана, а потым адпускаеце."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Выдатна! Каб вярнуцца, правядзіце пальцам ад правага краю"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Каб вярнуцца, правядзіце ад правага краю ў цэнтр экрана."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Каб вярнуцца, правядзіце ад правага краю ў цэнтр экрана."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Пераканайцеся, што вы не праводзіце пальцам занадта далёка ад правага вугла экрана."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Пераканайцеся, што праводзіце пальцам з правага вугла ў цэнтр экрана, а потым адпускаеце."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Вы навучыліся рабіць жэст вяртання. А зараз даведайцеся, як пераключацца паміж праграмамі."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Вы навучыліся рабіць жэст вяртання. А зараз даведайцеся, як пераключацца паміж праграмамі."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Вы навучыліся рабіць жэст вяртання."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Пераканайцеся, што вы не праводзіце пальцам занадта блізка да ніжняга краю экрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Каб змяніць адчувальнасць жэста вяртання, адкрыйце налады"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Каб вярнуцца назад, правядзіце пальцам ад левага краю"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Каб вярнуцца на папярэдні экран, правядзіце пальцам ад левага краю ў цэнтр экрана."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Каб вярнуцца назад, правядзіце пальцам ад левага краю"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Каб вярнуцца на папярэдні экран, правядзіце пальцам ад левага краю ў цэнтр экрана."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Пераканайцеся, што праводзіце пальцам па экране знізу ўверх."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Пераканайцеся, што не затрымліваецеся перад адпусканнем."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Пераканайцеся, што праводзіце пальцам вертыкальна."</string>
diff --git a/quickstep/res/values-bg/strings.xml b/quickstep/res/values-bg/strings.xml
index 13923a7433..d9d5b4a9fa 100644
--- a/quickstep/res/values-bg/strings.xml
+++ b/quickstep/res/values-bg/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Предвидено приложение: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Трябва да прекарате пръст от най-лявата част на екрана."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Трябва да прекарате пръст от левия край на екрана до средата, след което да вдигнете пръста си."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Чудесно! Прекарайте пръст от дясно, за да се върнете назад"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Можете да се върнете на последния екран, като прекарате пръст от десния край на екрана до средата."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Можете да се върнете на последния екран, като прекарате пръст от десния край на екрана до средата."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Трябва да прекарате пръст от най-дясната част на екрана."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Трябва да прекарате пръст от десния край на екрана до средата, след което да вдигнете пръста си."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Изпълнихте жеста за връщане назад. В следващия урок ще научите как се превключва между приложения."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Изпълнихте жеста за връщане назад. В следващия урок ще научите как се превключва между приложения."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Изпълнихте жеста за връщане назад."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Не прекарвайте пръст твърде близо до долната част на екрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Променете чувств. на жеста за връщане назад от настройките"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Прекарайте пръст от ляво, за да се върнете назад"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"За да се върнете на последния активен екран, прекарайте пръст от левия край на екрана до средата."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Прекарайте пръст от ляво, за да се върнете назад"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"За да се върнете на последния активен екран, прекарайте пръст от левия край на екрана до средата."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Трябва да прекарате пръст нагоре от долния край на екрана."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Не задържайте, преди да вдигнете пръста си."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Трябва да прекарате пръст право нагоре."</string>
diff --git a/quickstep/res/values-bn/strings.xml b/quickstep/res/values-bn/strings.xml
index a73b9a4f9e..dde010f846 100644
--- a/quickstep/res/values-bn/strings.xml
+++ b/quickstep/res/values-bn/strings.xml
@@ -47,8 +47,7 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"আপনার প্রয়োজন হতে পারে এমন অ্যাপ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"একদম বাঁ প্রান্ত থেকে সোয়াইপ করছেন কিনা ভাল করে দেখে নিন।"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"আপনি বাঁ প্রান্ত থেকে স্ক্রিনের মাঝখান পর্যন্ত সোয়াইপ করছেন ও পরে আঙুল তুলে নিন। এটির খেয়াল রাখুন।"</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"দুর্দান্ত! ফিরে যেতে ডানদিক থেকে সোয়াইপ করুন"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"ডান প্রান্ত থেকে স্ক্রিনের মাঝখান পর্যন্ত সোয়াইপ করে আপনি আগের ক্রিনেও ফিরে যেতে পারেন।"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"ডান প্রান্ত থেকে স্ক্রিনের মাঝখান পর্যন্ত সোয়াইপ করে আপনি আগের ক্রিনেও ফিরে যেতে পারেন।"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"একদম ডান প্রান্ত থেকে সোয়াইপ করছেন কিনা ভাল করে দেখে নিন।"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"আপনি ডান প্রান্ত থেকে স্ক্রিনের মাঝখান পর্যন্ত সোয়াইপ করছেন ও পরে আঙুল তুলে নিন। এটি খেয়াল রাখুন।"</string>
     <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"আপনি ফিরে যাওয়ার জেসচার সম্পর্কে জেনেছেন। এরপর, একটি অ্যাপ থেকে অন্য অ্যাপে কীভাবে যাবেন জেনে নিন।"</string>
@@ -56,7 +55,7 @@
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"স্ক্রিনের নিচের প্রান্তের খুব কাছে পর্যন্ত যাতে সোয়াইপ না করেন সেটি ভাল করে দেখে নিন।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ফিরে যাওয়ার জেসচারের সেন্সিটিভিটি পরিবর্তন করতে, সেটিংসে যান"</string>
     <string name="back_gesture_intro_title" msgid="5538727561353262952">"ফিরে যেতে আপনার স্ক্রিনের বাম প্রান্ত থেকে সোয়াইপ করুন"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"আপনার থাকা আগের স্ক্রিনে ফিরে যেতে, বাঁ প্রান্ত থেকে স্ক্রিনের মাঝখান পর্যন্ত সোয়াইপ করুন।"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"আপনার থাকা আগের স্ক্রিনে ফিরে যেতে, বাঁ প্রান্ত থেকে স্ক্রিনের মাঝখান পর্যন্ত সোয়াইপ করুন।"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"স্ক্রিনের নিচের প্রান্ত থেকে আপনি সোয়াইপ করেছেন কিনা ভাল করে দেখে নিন।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"আঙুল তুলে নেওয়ার আগে আপনি যাতে পজ না করেন সেটি ভাল করে দেখে নিন।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"আপনি উপরের দিকে সোজাসুজি সোয়াইপ করেছেন কিনা ভাল করে দেখে নিন।"</string>
diff --git a/quickstep/res/values-bs/strings.xml b/quickstep/res/values-bs/strings.xml
index e2db7f8515..07268ccf7d 100644
--- a/quickstep/res/values-bs/strings.xml
+++ b/quickstep/res/values-bs/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predviđena aplikacija: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Obratite pažnju da prevučete s krajnjeg lijevog ruba."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Obratite pažnju da prevučete s lijevog ruba prema sredini ekrana, a zatim pustite."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Lijepo! Sada prevucite zdesna ulijevo da se vratite"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Na posljednji ekran se možete vratiti i prevlačenjem od desnog ruba do sredine ekrana."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Na posljednji ekran se možete vratiti i prevlačenjem od desnog ruba do sredine ekrana."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Obratite pažnju da prevučete s krajnjeg desnog ruba."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Obratite pažnju da prevučete s desnog ruba prema sredini ekrana, a zatim pustite."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Završili ste pokret za vraćanje. Sljedeće naučite kako prebacivati između aplikacija."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Završili ste pokret za vraćanje. Sljedeće naučite kako prebacivati između aplikacija."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Završili ste pokret za vraćanje."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Obratite pažnju da ne prevučete preblizu donjem dijelu ekrana."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Promijenite osjetljivost pokreta za povratak u Postavkama"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Prevucite slijeva nadesno da se vratite"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Da se vratite na posljednji ekran na kojem ste bili, prevucite od lijevog ruba do sredine ekrana."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Prevucite slijeva nadesno da se vratite"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Da se vratite na posljednji ekran na kojem ste bili, prevucite od lijevog ruba do sredine ekrana."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Obratite pažnju da prevučete prema gore s donjeg ruba ekrana."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Obratite pažnju da ne zastanete prije puštanja."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Obratite pažnju da prevučete ravno prema gore."</string>
diff --git a/quickstep/res/values-ca/strings.xml b/quickstep/res/values-ca/strings.xml
index fae2c24d13..47a4916d23 100644
--- a/quickstep/res/values-ca/strings.xml
+++ b/quickstep/res/values-ca/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicció d\'aplicació: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Assegura\'t de lliscar des de l\'extrem esquerre de la pantalla."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Assegura\'t de lliscar des de la vora esquerra cap al centre de la pantalla i deixa anar."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Molt bé! Ara llisca des de la dreta per tornar enrere."</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"També pots tornar a la darrera pantalla lliscant des de l\'extrem dret cap al centre."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"També pots tornar a la darrera pantalla lliscant des de l\'extrem dret cap al centre."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Assegura\'t de lliscar des de l\'extrem dret de la pantalla."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Assegura\'t de lliscar des de la vora dreta cap al centre de la pantalla i deixa anar."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Has completat el gest per tornar enrere. Ara, descobreix com pots canviar d\'aplicació."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Has completat el gest per tornar enrere. Ara, descobreix com pots canviar d\'aplicació."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Has completat el gest per tornar enrere."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Assegura\'t de no lliscar massa a prop de la part inferior de la pantalla."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Per canviar la sensibilitat del gest, ves a Configuració"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Llisca des de l\'esquerra per tornar enrere"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Per tornar a la darrera pantalla, llisca des de l\'extrem esquerre cap al centre de la pantalla."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Llisca des de l\'esquerra per tornar enrere"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Per tornar a la darrera pantalla, llisca des de l\'extrem esquerre cap al centre de la pantalla."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Assegura\'t de lliscar des de la vora inferior de la pantalla."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Assegura\'t de no aturar-te abans de deixar anar."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Assegura\'t de lliscar directament cap amunt."</string>
diff --git a/quickstep/res/values-cs/strings.xml b/quickstep/res/values-cs/strings.xml
index c9f463228b..de780920dc 100644
--- a/quickstep/res/values-cs/strings.xml
+++ b/quickstep/res/values-cs/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Předpokládaná aplikace: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Přejeďte prstem z úplného levého okraje obrazovky."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Přejeďte prstem z levého okraje doprostřed obrazovky a zdvihněte prst."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Skvělé! Teď se přejetím prstem zprava vraťte"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Přejetím prstem z pravého okraje doprostřed obrazovky se také můžete vrátit zpět na poslední obrazovku."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Přejetím prstem z pravého okraje doprostřed obrazovky se také můžete vrátit zpět na poslední obrazovku."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Přejeďte prstem z úplného pravého okraje obrazovky."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Přejeďte prstem z pravého okraje doprostřed obrazovky a zdvihněte prst."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Dokončili jste gesto pro přechod zpět. Teď se naučíte přepínat aplikace."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Dokončili jste gesto pro přechod zpět. Teď se naučíte přepínat aplikace."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Dokončili jste gesto pro přechod zpět."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Dejte pozor, abyste prstem nepřejížděli moc blízko ke spodnímu okraji obrazovky."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Citlivost gesta pro přechod zpět můžete změnit v Nastavení"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Pokud se chcete vrátit, přejeďte prstem zleva"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Na poslední obrazovku se můžete vrátit přejetím prstem z levého okraje doprostřed obrazovky."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Pokud se chcete vrátit, přejeďte prstem zleva"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Na poslední obrazovku se můžete vrátit přejetím prstem z levého okraje doprostřed obrazovky."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Přejeďte prstem nahoru z dolního okraje obrazovky."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Před zdvihnutím prstu nedělejte pauzu."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Přejeďte prstem přímo nahoru."</string>
diff --git a/quickstep/res/values-da/strings.xml b/quickstep/res/values-da/strings.xml
index 4c7f968d2c..aea76a2fb2 100644
--- a/quickstep/res/values-da/strings.xml
+++ b/quickstep/res/values-da/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App, du forventes at skulle bruge: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Stryg fra kanten yderst til venstre."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Stryg fra venstre kant mod midten af skærmen, og løft fingeren."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Sådan! Prøv derefter at stryge fra højre for at gå tilbage"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Du kan også gå tilbage til den seneste skærm ved at stryge mod midten af skærmen fra højre kant."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Du kan også gå tilbage til den seneste skærm ved at stryge mod midten af skærmen fra højre kant."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Stryg fra kanten yderst til højre."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Stryg fra højre kant mod midten af skærmen, og løft fingeren."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Du har fuldført bevægelsen for Gå tilbage. Som det næste kan du se, hvordan du skifter app."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Du har fuldført bevægelsen for Gå tilbage. Som det næste kan du se, hvordan du skifter app."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Du har fuldført bevægelsen for Gå tilbage."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Undgå at stryge for tæt på bunden af skærmen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Juster følsomheden for bevægelsen Gå tilbage i Indstillinger"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Stryg fra venstre for at gå tilbage"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Stryg mod midten af skærmen fra venstre kant for at gå tilbage til den seneste skærm, du var på."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Stryg fra venstre for at gå tilbage"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Stryg mod midten af skærmen fra venstre kant for at gå tilbage til den seneste skærm, du var på."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Stryg opad fra bunden af skærmen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Undlad at holde fingeren stille, indtil du løfter fingeren."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Stryg lige opad."</string>
diff --git a/quickstep/res/values-de/strings.xml b/quickstep/res/values-de/strings.xml
index 757c28c708..6ea539ce79 100644
--- a/quickstep/res/values-de/strings.xml
+++ b/quickstep/res/values-de/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Vorgeschlagene App: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Wische vom äußersten linken Bildschirmrand."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Wische vom linken Bildschirmrand zur Bildschirmmitte und lass los."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Sehr gut! Wische von rechts nach links, um zurückzugehen."</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Du kannst auch zum letzten Bildschirm zurückgehen, indem du vom rechten Bildschirmrand zur Mitte wischst."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Du kannst auch zum letzten Bildschirm zurückgehen, indem du vom rechten Bildschirmrand zur Mitte wischst."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Wische vom äußersten rechten Bildschirmrand."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Wische vom rechten Bildschirmrand zur Bildschirmmitte und lass los."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Du hast die „Zurück“-Touch-Geste abgeschlossen. Gleich lernst du, wie man zwischen Apps wechselt."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Du hast die „Zurück“-Touch-Geste abgeschlossen. Gleich lernst du, wie man zwischen Apps wechselt."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Du hast die „Zurück“-Touch-Geste abgeschlossen."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Wische nicht zu nah am unteren Bildschirmrand."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Du kannst die Empfindlichkeit von „Zurück“ in den Einstellungen ändern"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Von links nach rechts wischen, um zurückzugehen"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Wenn du zum letzten Bildschirm zurückgehen möchtest, wische vom linken Bildschirmrand zur Mitte."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Von links nach rechts wischen, um zurückzugehen"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Wenn du zum letzten Bildschirm zurückgehen möchtest, wische vom linken Bildschirmrand zur Mitte."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Wische vom unteren Bildschirmrand nach oben."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Achte darauf, nicht innezuhalten, bevor du loslässt."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Wische gerade nach oben."</string>
diff --git a/quickstep/res/values-el/strings.xml b/quickstep/res/values-el/strings.xml
index 5f0117bf97..3908929e09 100644
--- a/quickstep/res/values-el/strings.xml
+++ b/quickstep/res/values-el/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Εφαρμογή από πρόβλεψη: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Φροντίστε να σύρετε από το άκρο της αριστερής πλευράς."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Φροντίστε να σύρετε από το αριστερό άκρο προς το μέσο της οθόνης και απομακρύνετε το δάχτυλό σας."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Ωραία! Τώρα σύρετε από τα δεξιά για επιστροφή"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Μπορείτε να επιστρέψετε στην τελευταία οθόνη με σάρωση από το δεξί άκρο προς το κέντρο της οθόνης."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Μπορείτε να επιστρέψετε στην τελευταία οθόνη με σάρωση από το δεξί άκρο προς το κέντρο της οθόνης."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Φροντίστε να σύρετε από το άκρο της δεξιάς πλευράς."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Φροντίστε να σύρετε από το δεξί άκρο προς το μέσο της οθόνης και απομακρύνετε το δάχτυλό σας."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Ολοκληρώσατε την κίνηση επιστροφής. Στη συνέχεια, μάθετε πώς να κάνετε εναλλαγή εφαρμογών."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Ολοκληρώσατε την κίνηση επιστροφής. Στη συνέχεια, μάθετε πώς να κάνετε εναλλαγή εφαρμογών."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ολοκληρώσατε την κίνηση επιστροφής."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Φροντίστε να μην σύρετε υπερβολικά κοντά στο κάτω μέρος της οθόνης."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Μεταβείτε στις Ρυθμίσεις για αλλαγή ευαισθ. κίνησης επιστρ."</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Για να επιστρέψετε, σύρετε από τα αριστερά"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Για να επιστρέψετε στην τελευταία οθόνη, σύρετε από το αριστερό άκρο προς το κέντρο της οθόνης."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Για να επιστρέψετε, σύρετε από τα αριστερά"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Για να επιστρέψετε στην τελευταία οθόνη, σύρετε από το αριστερό άκρο προς το κέντρο της οθόνης."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Φροντίστε να σύρετε προς τα επάνω από το κάτω άκρο της οθόνης."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Φροντίστε να μην κάνετε παύση προτού απομακρύνετε τα δάχτυλά σας."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Φροντίστε να σύρετε απευθείας προς τα επάνω."</string>
diff --git a/quickstep/res/values-en-rAU/strings.xml b/quickstep/res/values-en-rAU/strings.xml
index cc41b22835..2bd4e21796 100644
--- a/quickstep/res/values-en-rAU/strings.xml
+++ b/quickstep/res/values-en-rAU/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicted app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Make sure that you swipe from the far-left edge."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Make sure that you swipe from the left edge to the middle of the screen and let go."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Nice! Now swipe from the right to go back"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"You can also go back to the last screen by swiping from the right edge to the middle of the screen."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"You can also go back to the last screen by swiping from the right edge to the middle of the screen."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Make sure that you swipe from the far-right edge."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Make sure that you swipe from the right edge to the middle of the screen and let go."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"You completed the go back gesture. Next, learn how to switch apps."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"You completed the go back gesture. Next, learn how to switch apps."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"You completed the go back gesture."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"To change sensitivity of the back gesture, go to Settings"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Swipe from the left to go back"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"To go back to the last screen you were on, swipe from the left edge to the middle of the screen."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Swipe from the left to go back"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"To go back to the last screen you were on, swipe from the left edge to the middle of the screen."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Make sure that you don\'t pause before letting go."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Make sure that you swipe straight up."</string>
diff --git a/quickstep/res/values-en-rCA/strings.xml b/quickstep/res/values-en-rCA/strings.xml
index cc41b22835..2bd4e21796 100644
--- a/quickstep/res/values-en-rCA/strings.xml
+++ b/quickstep/res/values-en-rCA/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicted app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Make sure that you swipe from the far-left edge."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Make sure that you swipe from the left edge to the middle of the screen and let go."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Nice! Now swipe from the right to go back"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"You can also go back to the last screen by swiping from the right edge to the middle of the screen."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"You can also go back to the last screen by swiping from the right edge to the middle of the screen."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Make sure that you swipe from the far-right edge."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Make sure that you swipe from the right edge to the middle of the screen and let go."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"You completed the go back gesture. Next, learn how to switch apps."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"You completed the go back gesture. Next, learn how to switch apps."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"You completed the go back gesture."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"To change sensitivity of the back gesture, go to Settings"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Swipe from the left to go back"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"To go back to the last screen you were on, swipe from the left edge to the middle of the screen."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Swipe from the left to go back"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"To go back to the last screen you were on, swipe from the left edge to the middle of the screen."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Make sure that you don\'t pause before letting go."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Make sure that you swipe straight up."</string>
diff --git a/quickstep/res/values-en-rGB/strings.xml b/quickstep/res/values-en-rGB/strings.xml
index cc41b22835..2bd4e21796 100644
--- a/quickstep/res/values-en-rGB/strings.xml
+++ b/quickstep/res/values-en-rGB/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicted app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Make sure that you swipe from the far-left edge."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Make sure that you swipe from the left edge to the middle of the screen and let go."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Nice! Now swipe from the right to go back"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"You can also go back to the last screen by swiping from the right edge to the middle of the screen."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"You can also go back to the last screen by swiping from the right edge to the middle of the screen."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Make sure that you swipe from the far-right edge."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Make sure that you swipe from the right edge to the middle of the screen and let go."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"You completed the go back gesture. Next, learn how to switch apps."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"You completed the go back gesture. Next, learn how to switch apps."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"You completed the go back gesture."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"To change sensitivity of the back gesture, go to Settings"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Swipe from the left to go back"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"To go back to the last screen you were on, swipe from the left edge to the middle of the screen."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Swipe from the left to go back"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"To go back to the last screen you were on, swipe from the left edge to the middle of the screen."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Make sure that you don\'t pause before letting go."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Make sure that you swipe straight up."</string>
diff --git a/quickstep/res/values-en-rIN/strings.xml b/quickstep/res/values-en-rIN/strings.xml
index cc41b22835..2bd4e21796 100644
--- a/quickstep/res/values-en-rIN/strings.xml
+++ b/quickstep/res/values-en-rIN/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicted app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Make sure that you swipe from the far-left edge."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Make sure that you swipe from the left edge to the middle of the screen and let go."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Nice! Now swipe from the right to go back"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"You can also go back to the last screen by swiping from the right edge to the middle of the screen."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"You can also go back to the last screen by swiping from the right edge to the middle of the screen."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Make sure that you swipe from the far-right edge."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Make sure that you swipe from the right edge to the middle of the screen and let go."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"You completed the go back gesture. Next, learn how to switch apps."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"You completed the go back gesture. Next, learn how to switch apps."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"You completed the go back gesture."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"To change sensitivity of the back gesture, go to Settings"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Swipe from the left to go back"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"To go back to the last screen you were on, swipe from the left edge to the middle of the screen."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Swipe from the left to go back"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"To go back to the last screen you were on, swipe from the left edge to the middle of the screen."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Make sure that you don\'t pause before letting go."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Make sure that you swipe straight up."</string>
diff --git a/quickstep/res/values-en-rXC/strings.xml b/quickstep/res/values-en-rXC/strings.xml
index 05f696db96..8c91887772 100644
--- a/quickstep/res/values-en-rXC/strings.xml
+++ b/quickstep/res/values-en-rXC/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‎‎‏‎‎‏‏‏‎‏‎‏‏‎‎‏‏‏‎‏‏‏‎‎‏‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‎‎‏‏‎Predicted app: ‎‏‎‎‏‏‎<xliff:g id="TITLE">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‏‎‎‎Make sure you swipe from the far-left edge.‎‏‎‎‏‎"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‎‏‎‏‎‏‎‎‎‏‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‎‎‎‎‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‎‎‎‎‏‎‎Make sure you swipe from the left edge to the middle of the screen and let go.‎‏‎‎‏‎"</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‏‏‎‎‏‏‎Nice! Now swipe from the right to go back‎‏‎‎‏‎"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‎‎‎‎‏‏‎‏‎‎‎‏‏‎‎‎‎‎‏‏‎‏‎‎‎‎‎‏‎‏‎‎‎‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‏‏‎‎You can also go back to the last screen by swiping from the right edge to the middle of the screen.‎‏‎‎‏‎"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‎‎‎‎‏‏‎‏‎‎‎‏‏‎‎‎‎‎‏‏‎‏‎‎‎‎‎‏‎‏‎‎‎‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‏‏‎‎You can also go back to the last screen by swiping from the right edge to the middle of the screen.‎‏‎‎‏‎"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‏‏‏‏‎‎‎‏‏‎‏‏‎‏‎‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‎‏‎‏‎‎‏‎‎‏‎‏‎‎‎‎‏‎Make sure you swipe from the far-right edge.‎‏‎‎‏‎"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‎‎‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‎‎Make sure you swipe from the right edge to the middle of the screen and let go.‎‏‎‎‏‎"</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‏‎‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‎‎‎You completed the go back gesture. Next up, learn how to switch apps.‎‏‎‎‏‎"</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‏‎‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‎‎‎You completed the go back gesture. Next up, learn how to switch apps.‎‏‎‎‏‎"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‏‎‏‎‏‏‏‎‎‎‎‎‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‏‏‎‏‏‎‎‏‏‎‎You completed the go back gesture.‎‏‎‎‏‎"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‏‎‎‎‎‏‎‎‎‏‎‏‎‎‏‎‎‏‎‎‏‎‏‏‎‎‏‎‎‎‎‏‎‏‏‎Make sure you don\'t swipe too close to the bottom of the screen.‎‏‎‎‏‎"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‎‏‏‏‎‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‏‎‎‏‏‏‏‏‎‎‏‎‎‎‏‎‎To change the sensitivity of the back gesture, go to Settings‎‏‎‎‏‎"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‎‏‎‎‎‏‎‎‎‎‎‎‏‏‏‎‏‏‏‎‏‏‎‏‎‎‎‎Swipe from the left to go back‎‏‎‎‏‎"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‎‎‏‎‏‎‎‎‏‎‏‏‏‎‏‎‎‏‏‏‏‏‏‏‎‎‎To go back to the last screen you were on, swipe from the left edge to the middle of the screen.‎‏‎‎‏‎"</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‎‏‎‎‎‏‎‎‎‎‎‎‏‏‏‎‏‏‏‎‏‏‎‏‎‎‎‎Swipe from the left to go back‎‏‎‎‏‎"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‎‎‏‎‏‎‎‎‏‎‏‏‏‎‏‎‎‏‏‏‏‏‏‏‎‎‎To go back to the last screen you were on, swipe from the left edge to the middle of the screen.‎‏‎‎‏‎"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‏‎‏‏‎‏‎‎‏‎‎Make sure you swipe up from the bottom edge of the screen.‎‏‎‎‏‎"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‏‎‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‎‏‏‏‎‏‎‏‎Make sure you don\'t pause before letting go.‎‏‎‎‏‎"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‎‏‏‏‎‏‎‎‏‎‎‏‏‎‏‎‎‏‎‎‏‏‏‏‎‎‎‎‏‎‏‏‏‏‎‎Make sure you swipe straight up.‎‏‎‎‏‎"</string>
diff --git a/quickstep/res/values-es-rUS/strings.xml b/quickstep/res/values-es-rUS/strings.xml
index 4f543e2caf..4edbfeb8f9 100644
--- a/quickstep/res/values-es-rUS/strings.xml
+++ b/quickstep/res/values-es-rUS/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicción de app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Asegúrate de deslizar el dedo bien desde el borde izquierdo."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Asegúrate de deslizar el dedo del borde izquierdo hacia el centro de la pantalla y, luego, suéltalo."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"¡Genial! Ahora, desliza el dedo desde la derecha para volver"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Desliza de derecha al centro para volver a última pantalla."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Desliza de derecha al centro para volver a última pantalla."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Asegúrate de deslizar el dedo bien desde el borde derecho."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Asegúrate de deslizar el dedo del borde derecho hacia el centro de la pantalla y, luego, suéltalo."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Completaste el gesto \"Atrás\". A continuación, obtén información para cambiar de app."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Completaste el gesto \"Atrás\". A continuación, obtén información para cambiar de app."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Completaste el gesto \"Atrás\"."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Asegúrate de no hacerlo muy cerca de la parte inferior de la pantalla."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Cambia sensibilidad de gesto \"Atrás\" en Configuración"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Para volver, desliza el dedo desde la izquierda"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Para volver a la última pantalla, desliza el dedo del borde izquierdo al centro de la pantalla."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Para volver, desliza el dedo desde la izquierda"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Para volver a la última pantalla, desliza el dedo del borde izquierdo al centro de la pantalla."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Asegúrate de deslizar el dedo hacia arriba desde la borde inferior de la pantalla."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Asegúrate de no detenerte antes de soltarlo."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Asegúrate de deslizar el dedo derecho hacia arriba."</string>
diff --git a/quickstep/res/values-es/strings.xml b/quickstep/res/values-es/strings.xml
index 6bad7752da..5abec85d74 100644
--- a/quickstep/res/values-es/strings.xml
+++ b/quickstep/res/values-es/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplicación sugerida: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Desliza el dedo desde el extremo izquierdo."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Desliza el dedo desde el borde izquierdo de la pantalla hasta el centro y levántalo."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"¡Muy bien! Desliza el dedo desde la derecha para volver"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"También puedes deslizar el dedo del borde derecho al centro para volver a la pantalla anterior."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"También puedes deslizar el dedo del borde derecho al centro para volver a la pantalla anterior."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Desliza el dedo desde el extremo derecho."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Desliza el dedo desde el borde derecho de la pantalla hasta el centro y levántalo."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Has completado el gesto para volver. Ahora, descubre cómo cambiar de aplicación."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Has completado el gesto para volver. Ahora, descubre cómo cambiar de aplicación."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Has completado el gesto para volver."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"No deslices el dedo demasiado cerca de la parte inferior de la pantalla."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Para cambiar la sensibilidad del gesto, ve a Ajustes"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Desliza el dedo desde la izquierda para volver"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Si quieres volver a la pantalla anterior, desliza el dedo del borde izquierdo al centro."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Desliza el dedo desde la izquierda para volver"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Si quieres volver a la pantalla anterior, desliza el dedo del borde izquierdo al centro."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Desliza el dedo hacia arriba desde el borde inferior de la pantalla."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"No hagas ninguna pausa antes de levantar el dedo."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Desliza el dedo directamente hacia arriba."</string>
diff --git a/quickstep/res/values-et/strings.xml b/quickstep/res/values-et/strings.xml
index b9615d68db..08e18c9e7b 100644
--- a/quickstep/res/values-et/strings.xml
+++ b/quickstep/res/values-et/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Ennustatud rakendus: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pühkige kindlasti vasakpoolsest servast."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pühkige ekraanikuva vasakust servast keskele ja eemaldage sõrm."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Tubli töö! Nüüd pühkige tagasiliikumiseks paremalt vasakule."</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Eelmisele ekraanikuvale naasmiseks võite ka ekraanikuva paremast servast keskele pühkida."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Eelmisele ekraanikuvale naasmiseks võite ka ekraanikuva paremast servast keskele pühkida."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pühkige kindlasti parempoolsest servast."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pühkige ekraanikuva paremast servast keskele ja eemaldage sõrm."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Tegite tagasiliikumise liigutuse. Järgmisena vaadake, kuidas rakenduste vahel vahetada."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Tegite tagasiliikumise liigutuse. Järgmisena vaadake, kuidas rakenduste vahel vahetada."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Tegite tagasiliikumise liigutuse."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Veenduge, et te ei pühiks liiga ekraanikuva allosa lähedalt."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Tagasiliigutuse tundlikkuse muutmiseks avage menüü Seaded"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Tagasiliikumiseks pühkige vasakult paremale"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Eelmisele ekraanikuvale naasmiseks pühkige vasakust servast ekraanikuva keskele."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Tagasiliikumiseks pühkige vasakult paremale"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Eelmisele ekraanikuvale naasmiseks pühkige vasakust servast ekraanikuva keskele."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pühkige kindlasti ekraanikuva alumisest servast üles."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Veenduge, et te enne vabastamist liigutust ei peataks."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pühkige kindlasti otse üles."</string>
diff --git a/quickstep/res/values-eu/strings.xml b/quickstep/res/values-eu/strings.xml
index 1d992f7909..aca7132e12 100644
--- a/quickstep/res/values-eu/strings.xml
+++ b/quickstep/res/values-eu/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Iragarritako aplikazioa: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Ziurtatu hatza ezkerreko ertzetik pasatzen duzula."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Ziurtatu hatza pantailaren ezkerreko ertzetik erdialdera pasatzen eta askatzen duzula."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Ederki! Orain, atzera egiteko, pasatu hatza eskuinetik."</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Aurreko pantailara itzultzeko beste modu bat: pasatu hatza pantailaren eskuineko ertzetik erdialdera."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Aurreko pantailara itzultzeko beste modu bat: pasatu hatza pantailaren eskuineko ertzetik erdialdera."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Ziurtatu hatza eskuineko ertzetik pasatzen duzula."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Ziurtatu hatza pantailaren eskuineko ertzetik erdialdera pasatzen eta askatzen duzula."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Ikasi duzu atzera egiteko keinua. Jarraian, ikasi aplikazioa aldatzen."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Ikasi duzu atzera egiteko keinua. Jarraian, ikasi aplikazioa aldatzen."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ikasi duzu atzera egiteko keinua."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ziurtatu hatza ez duzula pantailaren behealdetik gertuegi pasatzen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Keinuaren sentikortasuna aldatzeko, joan ezarpenetara"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Atzera egiteko, pasatu hatza ezkerretik"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Aurreko pantailara itzultzeko, pasatu hatza pantailaren ezkerreko ertzetik erdialdera."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Atzera egiteko, pasatu hatza ezkerretik"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Aurreko pantailara itzultzeko, pasatu hatza pantailaren ezkerreko ertzetik erdialdera."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Ziurtatu hatza pantailaren beheko ertzetik gora pasatzen duzula."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Ziurtatu askatu aurretik ez duzula hatza gelditzen."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Ziurtatu hatza zuzen gora pasatzen duzula."</string>
diff --git a/quickstep/res/values-fa/strings.xml b/quickstep/res/values-fa/strings.xml
index 344040e001..b5acf4e2cf 100644
--- a/quickstep/res/values-fa/strings.xml
+++ b/quickstep/res/values-fa/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"برنامه پیش‌بینی‌شده: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"دقت کنید که از ابتدای لبه سمت چپ تند بکشید."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"دقت کنید که از لبه سمت چپ تند به وسط صفحه بکشید و رها کنید."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"عالی! اکنون از سمت راست تند بکشید تا به عقب بروید"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"با تند کشیدن از لبه سمت راست به وسط صفحه هم می‌توانید به عقب بروید."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"با تند کشیدن از لبه سمت راست به وسط صفحه هم می‌توانید به عقب بروید."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"دقت کنید که از ابتدای لبه سمت راست تند بکشید."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"دقت کنید که از لبه سمت راست تند به وسط صفحه بکشید و رها کنید."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"اشاره برگشتن را تکمیل کردید. مورد بعدی، با نحوه جابه‌جا شدن بین برنامه‌ها آشنا شوید."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"اشاره برگشتن را تکمیل کردید. مورد بعدی، با نحوه جابه‌جا شدن بین برنامه‌ها آشنا شوید."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"اشاره برگشتن را تکمیل کردید."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"دقت کنید که موقع تند کشیدن بیش‌از حد به پایین صفحه نزدیک نشوید."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"برای تغییر حساسیت اشاره برگشت، به «تنظیمات» بروید"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"برای برگشتن به عقب، از سمت چپ تند بکشید"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"برای برگشتن به آخرین صفحه‌ای که در آن بودید، از لبه سمت چپ تند به وسط صفحه بکشید."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"برای برگشتن به عقب، از سمت چپ تند بکشید"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"برای برگشتن به آخرین صفحه‌ای که در آن بودید، از لبه سمت چپ تند به وسط صفحه بکشید."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"دقت کنید که از لبه پایینی صفحه تند به بالا بکشید."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"دقت کنید که تا قبل‌از رها کردن، کشیدن را متوقف نکنید."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"دقت کنید که مستقیماً تند به بالا بکشید."</string>
diff --git a/quickstep/res/values-fi/strings.xml b/quickstep/res/values-fi/strings.xml
index 7c877c7f8a..ae282679e6 100644
--- a/quickstep/res/values-fi/strings.xml
+++ b/quickstep/res/values-fi/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Ennakoitu sovellus: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Muista pyyhkäistä aivan vasemmasta reunasta."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pyyhkäise näytön vasemmasta reunasta keskelle ja päästä irti."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Hienoa! Palaa nyt takaisin pyyhkäisemällä oikeasta reunasta"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Voit myös palata edelliseen näkymään pyyhkäisemällä näytön oikeasta reunasta keskelle."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Voit myös palata edelliseen näkymään pyyhkäisemällä näytön oikeasta reunasta keskelle."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Muista pyyhkäistä aivan oikeasta reunasta."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pyyhkäise näytön oikeasta reunasta keskelle ja päästä irti."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Olet oppinut Takaisin-eleen. Opettele seuraavaksi vaihtamaan sovellusta."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Olet oppinut Takaisin-eleen. Opettele seuraavaksi vaihtamaan sovellusta."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Olet oppinut Takaisin-eleen."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Varo, ettet pyyhkäise liian lähellä alareunaa."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Voit muuttaa Takaisin-eleen herkkyyttä asetuksista"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Palaa takaisin pyyhkäisemällä vasemmasta reunasta"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Voit palata edelliseen näkymään pyyhkäisemällä näytön vasemmasta reunasta keskelle."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Palaa takaisin pyyhkäisemällä vasemmasta reunasta"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Voit palata edelliseen näkymään pyyhkäisemällä näytön vasemmasta reunasta keskelle."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pyyhkäise ylös näytön alareunasta."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Varo keskeyttämästä ennen kuin päästät irti."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Muista pyyhkäistä suoraan ylöspäin."</string>
diff --git a/quickstep/res/values-fr-rCA/strings.xml b/quickstep/res/values-fr-rCA/strings.xml
index 7ba30a9d64..bf3fa40328 100644
--- a/quickstep/res/values-fr-rCA/strings.xml
+++ b/quickstep/res/values-fr-rCA/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Application prédite : <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Assurez-vous de balayer l\'écran à partir de l\'extrémité gauche."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Assurez-vous de balayer l\'écran de l\'extrémité gauche jusqu\'au centre, puis de lever le doigt."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Bien! Maintenant, balayez-le à partir de la droite pour revenir."</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Vous pouvez aussi revenir à l\'écran précédent en balayant l\'écran du côté droit jusqu\'au centre."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Vous pouvez aussi revenir à l\'écran précédent en balayant l\'écran du côté droit jusqu\'au centre."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Assurez-vous de balayer l\'écran à partir de l\'extrémité droite."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Assurez-vous de balayer l\'écran de l\'extrémité droite jusqu\'au centre, puis de lever le doigt."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Vous avez appris le geste de retour en arrière. Maintenant, apprenez comment changer d\'application."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Vous avez appris le geste de retour en arrière. Maintenant, apprenez comment changer d\'application."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Vous avez appris le geste de retour en arrière."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Assurez-vous de ne pas balayer trop près du bas de l\'écran."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Modifiez la sensibilité du geste de retour dans Paramètres"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Balayez l\'écran à partir de la gauche pour revenir en arrière."</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Pour revenir à l\'écran précédent, balayez l\'écran du côté gauche jusqu\'au centre."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Balayez l\'écran à partir de la gauche pour revenir en arrière."</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Pour revenir à l\'écran précédent, balayez l\'écran du côté gauche jusqu\'au centre."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Assurez-vous de balayer l\'écran à partir de l\'extrémité inférieure vers le haut."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Assurez-vous de ne pas interrompre le geste avant de lever le doigt."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Assurez-vous de balayer l\'écran en ligne droite vers le haut."</string>
diff --git a/quickstep/res/values-fr/strings.xml b/quickstep/res/values-fr/strings.xml
index 9f0fe50fbb..e7676aea28 100644
--- a/quickstep/res/values-fr/strings.xml
+++ b/quickstep/res/values-fr/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Application prédite : <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Veillez à balayer l\'écran depuis le bord gauche."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Veillez à bien balayer l\'écran depuis le bord gauche jusqu\'au centre avant de relever le doigt."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Bravo ! Pour revenir en arrière, balayez l\'écran depuis la droite."</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Pour revenir à l\'écran précédent, balayez l\'écran depuis le bord droit jusqu\'au centre."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Pour revenir à l\'écran précédent, balayez l\'écran depuis le bord droit jusqu\'au centre."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Veillez à balayer l\'écran depuis le bord droit."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Veillez à bien balayer l\'écran depuis le bord droit jusqu\'au centre avant de relever le doigt."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Vous avez appris le geste pour revenir en arrière. Apprenez ensuite à passer d\'une appli à l\'autre."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Vous avez appris le geste pour revenir en arrière. Apprenez ensuite à passer d\'une appli à l\'autre."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Vous avez appris le geste pour revenir en arrière."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Veillez à ne pas balayer l\'écran trop près du bas."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Modifiez la sensibilité du geste retour dans les paramètres"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Balayez l\'écran depuis le bord gauche pour revenir en arrière"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Pour revenir à l\'écran précédent, balayez l\'écran depuis le bord gauche jusqu\'au centre."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Balayez l\'écran depuis le bord gauche pour revenir en arrière"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Pour revenir à l\'écran précédent, balayez l\'écran depuis le bord gauche jusqu\'au centre."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Veillez à balayer l\'écran du bas vers le haut."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Veillez à ne pas marquer de pause dans votre geste avant de relever le doigt."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Veillez à balayer l\'écran vers le haut."</string>
diff --git a/quickstep/res/values-gl/strings.xml b/quickstep/res/values-gl/strings.xml
index 68e91e9298..5841c83ef3 100644
--- a/quickstep/res/values-gl/strings.xml
+++ b/quickstep/res/values-gl/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplicación predita: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Asegúrate de pasar o dedo desde o bordo esquerdo máis afastado."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Asegúrate de pasar o dedo desde o bordo esquerdo ata o medio da pantalla e avanza."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Excelente! Agora pasa o dedo desde a dereita para volver"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Podes volver á última pantalla pasando o dedo desde o bordo dereito ata a metade da pantalla."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Podes volver á última pantalla pasando o dedo desde o bordo dereito ata a metade da pantalla."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Asegúrate de pasar o dedo desde o bordo dereito máis afastado."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Asegúrate de pasar o dedo desde o bordo dereito ata o medio da pantalla e avanza."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Completaches o xesto de volver á última pantalla. O próximo é aprender a cambiar de aplicación."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Completaches o xesto de volver á última pantalla. O próximo é aprender a cambiar de aplicación."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Completaches o xesto de volver á última pantalla."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Asegúrate de non pasar o dedo demasiado preto da parte inferior da pantalla."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Podes cambiar a sensibilidade do xesto en Configuración"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Pasa o dedo desde a esquerda para volver"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Para volver á última pantalla, pasa o dedo desde o bordo esquerdo ata a metade da pantalla."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Pasa o dedo desde a esquerda para volver"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Para volver á última pantalla, pasa o dedo desde o bordo esquerdo ata a metade da pantalla."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Asegúrate de pasar o dedo cara arriba desde o bordo inferior da pantalla."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Asegúrate de non facer unha pausa antes de avanzar."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Asegúrate de pasar o dedo cara arriba cun movemento vertical."</string>
diff --git a/quickstep/res/values-gu/strings.xml b/quickstep/res/values-gu/strings.xml
index a02e5ebd95..939dec38d2 100644
--- a/quickstep/res/values-gu/strings.xml
+++ b/quickstep/res/values-gu/strings.xml
@@ -47,8 +47,7 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"પૂર્વાનુમાનિત ઍપ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ખાતરી કરો કે તમે એકદમ દૂરની ડાબી કિનારીએથી સ્વાઇપ કરો છો."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ખાતરી કરો કે તમે ડાબી કિનારીએથી સ્ક્રીનના મધ્ય ભાગ સુધી સ્વાઇપ કરો છે અને આંગળી ઊંચકી લો છો."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"સરસ! હવે પાછા જવા માટે જમણેથી સ્વાઇપ કરો"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"તમે જમણી કિનારીએથી સ્ક્રીનના મધ્ય ભાગ સુધી સ્વાઇપ કરીને પણ છેલ્લી સ્ક્રીન પર પાછા જઈ શકો છો."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"તમે જમણી કિનારીએથી સ્ક્રીનના મધ્ય ભાગ સુધી સ્વાઇપ કરીને પણ છેલ્લી સ્ક્રીન પર પાછા જઈ શકો છો."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ખાતરી કરો કે તમે એકદમ દૂરની જમણી કિનારીએથી સ્વાઇપ કરો છો."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ખાતરી કરો કે તમે જમણી કિનારીએથી સ્ક્રીનના મધ્ય ભાગ સુધી સ્વાઇપ કરો છે અને આંગળી ઊંચકી લો છો."</string>
     <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"તમે પાછા જવાનો સંકેત પૂર્ણ કર્યો છે. હવે પછી, ઍપ સ્વિચ કરવાની રીત વિશે જાણો."</string>
@@ -56,7 +55,7 @@
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ખાતરી કરો કે તમારાથી સ્ક્રીનની એકદમ નીચેની કિનારીની ખૂબ નજીક સુધી સ્વાઇપ ન થઈ જાય."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"પાછા જવાના સંકેતની સંવેદિતા બદલવા માટે, સેટિંગમાં જાઓ"</string>
     <string name="back_gesture_intro_title" msgid="5538727561353262952">"પાછળ જવા ડાબેથી સ્વાઇપ કરો"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"તમે જે છેલ્લી સ્ક્રીન પર હતા તેની પર પાછા જવા, ડાબી કિનારીએથી સ્ક્રીનના મધ્ય ભાગ સુધી સ્વાઇપ કરો."</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"તમે જે છેલ્લી સ્ક્રીન પર હતા તેની પર પાછા જવા, ડાબી કિનારીએથી સ્ક્રીનના મધ્ય ભાગ સુધી સ્વાઇપ કરો."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ખાતરી કરો કે તમે સ્ક્રીનની નીચેની કિનારીએથી ઉપરની તરફ સ્વાઇપ કરો છો."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ખાતરી કરો કે તમે આંગળી ઊંચકી લેતા પહેલાં સ્વાઇપ કરવાનું થોભાવતા નથી."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ખાતરી કરો કે તમે સીધું ઉપરની તરફ સ્વાઇપ કરો છો."</string>
diff --git a/quickstep/res/values-hi/strings.xml b/quickstep/res/values-hi/strings.xml
index fa9ca53503..ff6ec897a0 100644
--- a/quickstep/res/values-hi/strings.xml
+++ b/quickstep/res/values-hi/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"सुझाया गया ऐप्लिकेशन: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"देख लें कि आप स्क्रीन की बाईं तरफ़ के बिल्कुल किनारे से स्वाइप कर रहे हों."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"देख लें कि आप स्क्रीन के बाएं किनारे से बीचों-बीच तक स्वाइप कर रहे हों और फिर अपनी उंगली उठा लें."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"बढ़िया! अब वापस जाने के लिए, स्क्रीन के दाएं किनारे से स्वाइप करें"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"आप दाएं किनारे से स्क्रीन के बीच तक स्वाइप करके भी पिछली स्क्रीन पर जा सकते हैं."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"आप दाएं किनारे से स्क्रीन के बीच तक स्वाइप करके भी पिछली स्क्रीन पर जा सकते हैं."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"देख लें कि आप स्क्रीन की दाईं तरफ़ के बिल्कुल किनारे से स्वाइप कर रहे हों."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"देख लें कि आप स्क्रीन के दाएं किनारे से बीचों-बीच तक स्वाइप कर रहे हों और फिर अपनी उंगली उठा लें."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"आपने पीछे ले जाने वाले हाथ के जेस्चर के बारे में जान लिया है. एक ऐप से दूसरे पर जाने का तरीका जानें."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"आपने पीछे ले जाने वाले हाथ के जेस्चर के बारे में जान लिया है. एक ऐप से दूसरे पर जाने का तरीका जानें."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"आपने पेज पर पीछे ले जाने वाले हाथ के जेस्चर (हाव-भाव) के बारे में जान लिया है."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"देखे लें कि आप स्क्रीन पर बिल्कुल नीचे तक स्वाइप न कर रहे हों."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"\'सेटिंग\' में जाकर, पीछे जाने के लिए इस्तेमाल होने वाले हाथ के जेस्चर (हाव-भाव) की संवेदनशीलता बदलें"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"वापस जाने के लिए, स्क्रीन के बाएं किनारे से स्वाइप करें"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"पिछली स्क्रीन पर वापस जाने के लिए, बाएं किनारे से स्क्रीन के बीच तक स्वाइप करें."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"वापस जाने के लिए, स्क्रीन के बाएं किनारे से स्वाइप करें"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"पिछली स्क्रीन पर वापस जाने के लिए, बाएं किनारे से स्क्रीन के बीच तक स्वाइप करें."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"देख लें कि आप स्क्रीन के निचले किनारे से ऊपर की ओर स्वाइप कर रहे हों."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"देख लें कि आप स्क्रीन से अपनी उंगली उठाने से पहले, इसे कहीं न रोक रहे हों."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"देख लें कि आप ऊपर की ओर बिल्कुल सीधे स्वाइप कर रहे हों."</string>
diff --git a/quickstep/res/values-hr/strings.xml b/quickstep/res/values-hr/strings.xml
index b6ac921ba1..0d61c2cfbc 100644
--- a/quickstep/res/values-hr/strings.xml
+++ b/quickstep/res/values-hr/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predviđena aplikacija: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pazite da prijeđete prstom od krajnjeg lijevog ruba."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pazite da prijeđete prstom od lijevog ruba do sredine zaslona i podignite prst."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Odlično! Prijeđite prstom zdesna ulijevo da biste se vratili"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Na posljednji se zaslon možete vratiti i prelaskom od desnog ruba do sredine zaslona."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Na posljednji se zaslon možete vratiti i prelaskom od desnog ruba do sredine zaslona."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pazite da prijeđete prstom od krajnjeg desnog ruba."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pazite da prijeđete prstom od desnog ruba do sredine zaslona i podignite prst."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Izvršili ste pokret za povratak. Sad saznajte kako promijeniti aplikaciju."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Izvršili ste pokret za povratak. Sad saznajte kako promijeniti aplikaciju."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Izvršili ste pokret za povratak."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pazite da ne prijeđete prstom preblizu dnu zaslona."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Osjetljivost pokreta povratka promijenite u postavkama"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Prijeđite prstom slijeva udesno da biste se vratili"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Da biste se vratili na posljednji posjećeni zaslon, prijeđite od lijevog ruba do sredine zaslona."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Prijeđite prstom slijeva udesno da biste se vratili"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Da biste se vratili na posljednji posjećeni zaslon, prijeđite od lijevog ruba do sredine zaslona."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pazite da prijeđete prstom prema gore od donjeg ruba zaslona."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pazite da ne zastanete prije podizanja prsta."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pazite da prijeđete prstom ravno prema gore."</string>
diff --git a/quickstep/res/values-hu/strings.xml b/quickstep/res/values-hu/strings.xml
index 70ecf60051..354e999491 100644
--- a/quickstep/res/values-hu/strings.xml
+++ b/quickstep/res/values-hu/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Várható alkalmazás: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Csúsztasson a képernyő bal széléről."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Csúsztasson a képernyő bal széléről a képernyő közepéig, és engedje el a képernyőt."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Remek! Most csúsztasson jobbról a visszalépéshez."</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"A képernyő jobb széléről a képernyő közepéig csúsztatva is visszatérhet a legutóbbi képernyőre."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"A képernyő jobb széléről a képernyő közepéig csúsztatva is visszatérhet a legutóbbi képernyőre."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Csúsztasson a képernyő jobb széléről."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Csúsztasson a képernyő jobb széléről a képernyő közepéig, és engedje el a képernyőt."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Teljesítette a visszalépési kézmozdulatot. Most megtanulhatja, hogyan válthat az appok között."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Teljesítette a visszalépési kézmozdulatot. Most megtanulhatja, hogyan válthat az appok között."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Teljesítette a visszalépési kézmozdulatot."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ne csúsztasson túl közel a képernyő aljához."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"A vissza mozdulat érzékenysége a Beállításokban módosítható"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"A visszalépéshez csúsztasson balról jobbra"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Ha visszatérne a legutóbbi képernyőre, csúsztasson a képernyő közepére a bal szélétől."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"A visszalépéshez csúsztasson balról jobbra"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Ha visszatérne a legutóbbi képernyőre, csúsztasson a képernyő közepére a bal szélétől."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Csúsztasson felfelé a képernyő aljától."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Ne álljon meg, mielőtt elengedi a képernyőt."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Csúsztasson egyenesen felfelé."</string>
diff --git a/quickstep/res/values-hy/strings.xml b/quickstep/res/values-hy/strings.xml
index 9f58daaac4..9f112dff9a 100644
--- a/quickstep/res/values-hy/strings.xml
+++ b/quickstep/res/values-hy/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Առաջարկվող հավելված՝ <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Համոզվեք, որ մատը սահեցնում եք էկրանի ձախ եզրից։"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Սահեցրեք մատն էկրանի ձախ եզրից դեպի կենտրոն և բաց թողեք։"</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Գերազանց է․ այժմ մատը սահեցրեք աջ եզրից՝ հետ գնալու համար"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Անցեք վերջին էկրան՝ էկրանի աջ եզրից մատը սահեցնելով դեպի կենտրոն։"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Անցեք վերջին էկրան՝ էկրանի աջ եզրից մատը սահեցնելով դեպի կենտրոն։"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Համոզվեք, որ մատը սահեցնում եք էկրանի աջ եզրից։"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Սահեցրեք մատն էկրանի աջ եզրից դեպի կենտրոն և բաց թողեք։"</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Դուք սովորեցիք հետ գնալու ժեստը։ Այժմ սովորենք՝ ինչպես անցնել մի հավելվածից մյուսը։"</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Դուք սովորեցիք հետ գնալու ժեստը։ Այժմ սովորենք՝ ինչպես անցնել մի հավելվածից մյուսը։"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Դուք սովորեցիք հետ գնալու ժեստը։"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Համոզվեք, որ մատը չափազանց մոտ չեք սահեցնում էկրանին ներքևի հատվածին։"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Հետ գնալու ժեստի զգայունությունը փոփոխեք կարգավորումներում"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Սահեցրեք մատը ձախից՝ հետ գնալու համար"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Վերջին էկրան վերադառնալու համար էկրանի եզրից մատը սահեցրեք դեպի կենտրոն։"</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Սահեցրեք մատը ձախից՝ հետ գնալու համար"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Վերջին էկրան վերադառնալու համար էկրանի եզրից մատը սահեցրեք դեպի կենտրոն։"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Համոզվեք, որ մատն էկրանի ներքևի եզրից վերև եք սահեցնում։"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Համոզվեք, որ դադար չեք տալիս նախքան բաց թողնելը։"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Համոզվեք, որ մատն ուղիղ վերև եք սահեցնում։"</string>
diff --git a/quickstep/res/values-in/strings.xml b/quickstep/res/values-in/strings.xml
index 37b802fea5..b7adc5ff32 100644
--- a/quickstep/res/values-in/strings.xml
+++ b/quickstep/res/values-in/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplikasi yang diprediksi: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pastikan Anda menggeser dari tepi ujung kiri."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pastikan Anda menggeser dari tepi kiri ke tengah layar, lalu lepaskan."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Bagus! Sekarang geser dari kanan untuk kembali"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Geser dari tepi kanan ke tengah layar menuju layar terakhir."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Geser dari tepi kanan ke tengah layar menuju layar terakhir."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pastikan Anda menggeser dari tepi ujung kanan."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pastikan Anda menggeser dari tepi kanan ke tengah layar, lalu lepaskan."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Anda telah menyelesaikan gestur kembali. Selanjutnya, pelajari cara beralih aplikasi."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Anda telah menyelesaikan gestur kembali. Selanjutnya, pelajari cara beralih aplikasi."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Anda telah menyelesaikan gestur kembali."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pastikan Anda tidak menggeser terlalu dekat ke bagian bawah layar."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Untuk mengubah sensitivitas gestur kembali, buka Setelan"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Geser dari kiri untuk kembali"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Untuk kembali ke layar terakhir, geser dari tepi kiri ke tengah layar."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Geser dari kiri untuk kembali"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Untuk kembali ke layar terakhir, geser dari tepi kiri ke tengah layar."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pastikan Anda menggeser ke atas dari tepi bawah layar."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pastikan Anda tidak menjeda sebelum melepaskan."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pastikan Anda menggeser lurus ke atas."</string>
diff --git a/quickstep/res/values-is/strings.xml b/quickstep/res/values-is/strings.xml
index 4fbd46bec5..abb5298eb6 100644
--- a/quickstep/res/values-is/strings.xml
+++ b/quickstep/res/values-is/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Tillaga að forriti: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Passaðu að strjúka frá jaðri vinstri brúnar."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Passaðu að strjúka frá vinstri brún skjásins að miðju hans og sleppa svo."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Flott! Strjúktu núna til hægri til að fara til baka"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Þú getur einnig farið til baka á síðasta skjá með því að strjúka frá hægri brún að miðju skjásins."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Þú getur einnig farið til baka á síðasta skjá með því að strjúka frá hægri brún að miðju skjásins."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Passaðu að strjúka frá jaðri hægri brúnar."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Passaðu að strjúka frá hægri brún skjásins að miðju hans og sleppa svo."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Þú laukst við að kynna þér bendinguna „til baka“. Næst skaltu læra hvernig þú skiptir á milli forrita."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Þú laukst við að kynna þér bendinguna „til baka“. Næst skaltu læra hvernig þú skiptir á milli forrita."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Þú laukst við að kynna þér bendinguna „til baka“."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Passaðu að strjúka ekki of nálægt neðri brún skjásins."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Til að breyta næmi til baka-bendingar ferðu í stillingar"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Strjúktu frá vinstri til að fara til baka"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Strjúktu frá vinstri brún að miðju skjásins til að fara aftur til baka í síðasta skjá sem var opinn."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Strjúktu frá vinstri til að fara til baka"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Strjúktu frá vinstri brún að miðju skjásins til að fara aftur til baka í síðasta skjá sem var opinn."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Passaðu að strjúka upp frá neðri brún skjásins."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Passaðu að stoppa ekki áður en þú sleppir."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Passaðu að strjúka beint upp."</string>
diff --git a/quickstep/res/values-it/strings.xml b/quickstep/res/values-it/strings.xml
index 3323df9d47..9d6d1f3cd3 100644
--- a/quickstep/res/values-it/strings.xml
+++ b/quickstep/res/values-it/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App prevista: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Assicurati di scorrere dall\'estremità del bordo sinistro."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Assicurati di scorrere dal bordo sinistro verso il centro dello schermo e solleva il dito."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Bene! Ora scorri da destra per tornare indietro."</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Puoi anche tornare all\'ultima schermata scorrendo dal bordo destro verso il centro dello schermo."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Puoi anche tornare all\'ultima schermata scorrendo dal bordo destro verso il centro dello schermo."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Assicurati di scorrere dall\'estremità del bordo destro."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Assicurati di scorrere dal bordo destro verso il centro dello schermo e solleva il dito."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Hai completato il gesto Indietro. Ora, impara come passare da un\'app all\'altra."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Hai completato il gesto Indietro. Ora, impara come passare da un\'app all\'altra."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Hai completato il gesto Indietro."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Assicurati di non scorrere troppo vicino alla parte inferiore dello schermo."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Usa Impostazioni per cambiare sensibilità del gesto Indietro"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Scorri da sinistra per tornare indietro"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Per tornare all\'ultima schermata mostrata, scorri dal bordo sinistro verso il centro dello schermo."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Scorri da sinistra per tornare indietro"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Per tornare all\'ultima schermata mostrata, scorri dal bordo sinistro verso il centro dello schermo."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Assicurati di scorrere verso l\'alto dal bordo inferiore dello schermo."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Assicurati di non fare pause prima di sollevare il dito."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Assicurati di scorrere verso l\'alto senza fermarti."</string>
diff --git a/quickstep/res/values-iw/strings.xml b/quickstep/res/values-iw/strings.xml
index 84a862e5a6..4173f18301 100644
--- a/quickstep/res/values-iw/strings.xml
+++ b/quickstep/res/values-iw/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"האפליקציות החזויות: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"חשוב להקפיד להחליק מהקצה הימני."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"חשוב להקפיד להחליק מהקצה הימני למרכז המסך ואז לשחרר."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"איזה יופי! עכשיו עליך להחליק מהקצה הימני כדי לחזור"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"אפשר לחזור למסך הקודם בהחלקה מהקצה הימני של המסך אל המרכז."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"אפשר לחזור למסך הקודם בהחלקה מהקצה הימני של המסך אל המרכז."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"חשוב להקפיד להחליק מהקצה השמאלי."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"חשוב להקפיד להחליק מהקצה השמאלי למרכז המסך ואז לשחרר."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"השלמת את תנועת \'הקודם\'. בשלב הבא לומדים איך לעבור בין אפליקציות."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"השלמת את תנועת \'הקודם\'. בשלב הבא לומדים איך לעבור בין אפליקציות."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"השלמת את תנועת \'הקודם\'."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"חשוב להקפיד שלא להחליק קרוב מדי לתחתית המסך."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"כדי לשנות את מידת הרגישות של תנועת החזרה, יש לעבור להגדרות"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"יש להחליק מצד שמאל כדי לחזור למסך הקודם"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"כדי לחזור למסך הקודם, יש להחליק מהקצה השמאלי של המסך אל המרכז."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"יש להחליק מצד שמאל כדי לחזור למסך הקודם"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"כדי לחזור למסך הקודם, יש להחליק מהקצה השמאלי של המסך אל המרכז."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"חשוב להקפיד להחליק למעלה מהקצה התחתון של המסך."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"חשוב לוודא שלא מחכים לפני שמשחררים."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"חשוב להקפיד להחליק ישר למעלה."</string>
diff --git a/quickstep/res/values-ja/strings.xml b/quickstep/res/values-ja/strings.xml
index 7f04d4e943..27f81b76b9 100644
--- a/quickstep/res/values-ja/strings.xml
+++ b/quickstep/res/values-ja/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"予測されたアプリ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"一番左端からスワイプしてください。"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"画面の左端から中央に向かってスワイプし、指を離してください。"</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"では、右端からスワイプして前の画面に戻りましょう"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"画面の右端から中央に向かってスワイプして直前の画面に戻ることもできます。"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"画面の右端から中央に向かってスワイプして直前の画面に戻ることもできます。"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"一番右端からスワイプしてください。"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"画面の右端から中央に向かってスワイプし、指を離してください。"</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"「戻る」操作を完了しました。次は、アプリを切り替える方法を覚えましょう。"</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"「戻る」操作を完了しました。次は、アプリを切り替える方法を覚えましょう。"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"「戻る」操作を完了しました。"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"スワイプする際は画面の下部に近づきすぎないようにしましょう。"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"「戻る」操作の感度を変更するには [設定] に移動します"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"左端からスワイプすると前の画面に戻ります"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"直前の画面に戻るには、画面の左端から中央に向かってスワイプします。"</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"左端からスワイプすると前の画面に戻ります"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"直前の画面に戻るには、画面の左端から中央に向かってスワイプします。"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"画面の下端から上にスワイプしてください。"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"指を離す前にいったん止めないでください。"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"まっすぐ上にスワイプしてください。"</string>
diff --git a/quickstep/res/values-ka/strings.xml b/quickstep/res/values-ka/strings.xml
index 8fb83d4659..c532589e1d 100644
--- a/quickstep/res/values-ka/strings.xml
+++ b/quickstep/res/values-ka/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ნაწინასწარმეტყველები აპი: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"არ გადაფურცლოთ მარცხენა კიდის ბოლოდან."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"გადაფურცლეთ მარცხენა კიდიდან ეკრანის ცენტრისკენ და თითი აუშვით."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"მშვენიერია! ახლა უკან დასაბრუნებლად გადაფურცლეთ მარჯვნიდან"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"ასევე, შეგიძლიათ, დაბრუნდეთ ბოლო ეკრანზე მარჯვენა კიდიდან ეკრანის შუისკენ გადაფურცვლით."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"ასევე, შეგიძლიათ, დაბრუნდეთ ბოლო ეკრანზე მარჯვენა კიდიდან ეკრანის შუისკენ გადაფურცვლით."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"არ გადაფურცლოთ მარჯვენა კიდის ბოლოდან."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"გადაფურცლეთ მარჯვენა კიდიდან ეკრანის ცენტრისკენ და თითი აუშვით."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"თქვენ შეასრულეთ უკან დაბრუნების ჟესტი. ახლა კი შევიტყოთ, როგორ გადავრთოთ აპები."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"თქვენ შეასრულეთ უკან დაბრუნების ჟესტი. ახლა კი შევიტყოთ, როგორ გადავრთოთ აპები."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"თქვენ შეასრულეთ უკან დაბრუნების ჟესტი."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"არ გადაფურცლოთ ეკრანის ბოლოსთან ახლოს."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"დაბრუნების ჟესტის მგრძნობელობის შესაცვლელად გადადით პარამეტრებზე"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"უკან დასაბრუნებლად გადაფურცლეთ მარცხნიდან"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"ბოლო ნანახ ეკრანზე დასაბრუნებლად გადაფურცლეთ მარცხენა კიდიდან ეკრანის ცენტრისკენ."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"უკან დასაბრუნებლად გადაფურცლეთ მარცხნიდან"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"ბოლო ნანახ ეკრანზე დასაბრუნებლად გადაფურცლეთ მარცხენა კიდიდან ეკრანის ცენტრისკენ."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"გადაფურცლეთ ეკრანის ქვედა კიდიდან ზემოთ."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"არ დააპაუზოთ თითის აშვებამდე."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"გადაფურცლეთ ზემოთ."</string>
diff --git a/quickstep/res/values-kk/strings.xml b/quickstep/res/values-kk/strings.xml
index 8b08bc23e5..4cf0d2b7ea 100644
--- a/quickstep/res/values-kk/strings.xml
+++ b/quickstep/res/values-kk/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Болжалды қолданба: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Сол жақтағы ең шеткі нүктеден бастап сырғытыңыз."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Экранның сол жақ шетінен ортасына қарай сырғытыңыз да, жіберіңіз."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Жақсы! Енді артқа қайту үшін оң жақтан сырғытыңыз"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Экранның оң жақ шетінен ортасына қарай сырғыту арқылы соңғы ашылған экранға орала аласыз."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Экранның оң жақ шетінен ортасына қарай сырғыту арқылы соңғы ашылған экранға орала аласыз."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Оң жақтағы ең шеткі нүктеден бастап сырғытыңыз."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Экранның оң жақ шетінен ортасына қарай сырғытыңыз да, жіберіңіз."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Артқа қайту қимылын аяқтадыңыз. Енді қолданбаларды ауыстыруды үйреніңіз."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Артқа қайту қимылын аяқтадыңыз. Енді қолданбаларды ауыстыруды үйреніңіз."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Артқа қайту қимылын аяқтадыңыз."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Саусағыңызбен сырғыту кезінде экранның төменгі жағына тым жақындамаңыз."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Артқа қайту қимылы сезгіштігін параметрлерден өзгертіңіз."</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Артқа қайту үшін сол жақтан сырғытыңыз"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Соңғы ашылған экранға оралу үшін экранның сол жақ шетінен ортасына қарай сырғытыңыз."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Артқа қайту үшін сол жақтан сырғытыңыз"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Соңғы ашылған экранға оралу үшін экранның сол жақ шетінен ортасына қарай сырғытыңыз."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Экранның төменгі шетінен жоғары қарай сырғытыңыз."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Жіберер алдында кідіріс жасамаңыз."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Тігінен жоғары қарай сырғытыңыз."</string>
diff --git a/quickstep/res/values-km/strings.xml b/quickstep/res/values-km/strings.xml
index 3513263eaf..1e46dedb15 100644
--- a/quickstep/res/values-km/strings.xml
+++ b/quickstep/res/values-km/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"កម្មវិធី​ដែលបាន​ព្យាករ៖ <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ត្រូវប្រាកដថា​អ្នកអូសពី​ចុងគែម​ខាងឆ្វេង​។"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ត្រូវប្រាកដថា​អ្នកអូសពី​គែមខាងឆ្វេង​ទៅផ្នែកកណ្ដាល​នៃអេក្រង់ រួច​ដកដៃ​។"</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"ល្អ! ឥឡូវនេះ សូមអូសពីខាងស្ដាំ​ដើម្បីថយក្រោយ"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"អ្នកក៏អាចត្រឡប់ទៅអេក្រង់ចុងក្រោយបានផងដែរ ដោយអូសពីគែមខាងស្ដាំទៅផ្នែកកណ្ដាលនៃអេក្រង់។"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"អ្នកក៏អាចត្រឡប់ទៅអេក្រង់ចុងក្រោយបានផងដែរ ដោយអូសពីគែមខាងស្ដាំទៅផ្នែកកណ្ដាលនៃអេក្រង់។"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ត្រូវប្រាកដថា​អ្នកអូសពី​ចុងគែម​ខាងស្ដាំ​។"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ត្រូវប្រាកដថា​អ្នកអូសពី​គែមខាងស្ដាំ​ទៅផ្នែកកណ្ដាល​នៃអេក្រង់ រួច​ដកដៃ​។"</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"អ្នក​បានបញ្ចប់​ចលនា​ថយក្រោយ​ហើយ។ បន្ទាប់​មកទៀត សូមស្វែងយល់​ពីរបៀប​ប្ដូរកម្មវិធី​។"</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"អ្នក​បានបញ្ចប់​ចលនា​ថយក្រោយ​ហើយ។ បន្ទាប់​មកទៀត សូមស្វែងយល់​ពីរបៀប​ប្ដូរកម្មវិធី​។"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"អ្នក​បានបញ្ចប់​ចលនា​ថយក្រោយ​ហើយ។"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ត្រូវប្រាកដថា​អ្នកមិនអូស​ទៅជិត​ផ្នែកខាងក្រោម​នៃអេក្រង់ពេក​។"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ដើម្បីប្ដូរកម្រិត​រំញោចនឹង​ចលនាថយក្រោយ សូមចូលទៅកាន់​ការកំណត់"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"អូសពីឆ្វេងដើម្បីថយក្រោយ"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"ដើម្បីត្រឡប់ទៅ​អេក្រង់ចុងក្រោយ​ដែលអ្នកបានចូល សូមអូសពី​គែមខាងឆ្វេង​ទៅផ្នែកកណ្ដាល​នៃអេក្រង់។"</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"អូសពីឆ្វេងដើម្បីថយក្រោយ"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"ដើម្បីត្រឡប់ទៅ​អេក្រង់ចុងក្រោយ​ដែលអ្នកបានចូល សូមអូសពី​គែមខាងឆ្វេង​ទៅផ្នែកកណ្ដាល​នៃអេក្រង់។"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ត្រូវប្រាកដថា​អ្នកអូសឡើងលើ​ពីគែមខាងក្រោម​នៃអេក្រង់​។"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ត្រូវប្រាកដថា​អ្នកមិនផ្អាក មុនពេល​ដកដៃ​។"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ត្រូវប្រាកដថា​អ្នកអូស​ត្រង់ឡើងលើ​។"</string>
diff --git a/quickstep/res/values-kn/strings.xml b/quickstep/res/values-kn/strings.xml
index fcfdb3c113..e057b7655e 100644
--- a/quickstep/res/values-kn/strings.xml
+++ b/quickstep/res/values-kn/strings.xml
@@ -47,8 +47,7 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ಶಿಫಾರಸು ಮಾಡಿದ ಆ್ಯಪ್: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ನೀವು ದೂರದ ಎಡ ಅಂಚಿನಿಂದ ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ಎಡ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ ಹಾಗೂ ನಿಮ್ಮ ಬೆರಳನ್ನು ಮೇಲೆತ್ತಿ."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"ಚೆನ್ನಾಗಿದೆ! ಹಿಂತಿರುಗಲು, ಈಗ ಬಲಗಡೆಯಿಂದ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"ಬಲ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ ಕೊನೆಯ ಸ್ಕ್ರೀನ್‌ಗೆ ಹೋಗಿ."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"ಬಲ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ ಕೊನೆಯ ಸ್ಕ್ರೀನ್‌ಗೆ ಹೋಗಿ."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ನೀವು ದೂರದ ಬಲ ಅಂಚಿನಿಂದ ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ಬಲ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ ಹಾಗೂ ನಿಮ್ಮ ಬೆರಳನ್ನು ಮೇಲೆತ್ತಿ."</string>
     <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"ನೀವು ಗೋ ಬ್ಯಾಕ್ ಗೆಸ್ಚರ್ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದ್ದೀರಿ. ಮುಂದೆ, ಆ್ಯಪ್‌ಗಳನ್ನು ಬದಲಾಯಿಸುವುದು ಹೇಗೆ ಎಂದು ತಿಳಿಯಿರಿ."</string>
@@ -56,7 +55,7 @@
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ನೀವು ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಭಾಗಕ್ಕೆ ಹೆಚ್ಚು ಹತ್ತಿರ ಸ್ವೈಪ್ ಮಾಡದಂತೆ ನೋಡಿಕೊಳ್ಳಿ."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ಬ್ಯಾಕ್ ಗೆಸ್ಚರ್‌ನ ಸೂಕ್ಷ್ಮತೆ ಬದಲಾಯಿಸಲು, ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಹೋಗಿ"</string>
     <string name="back_gesture_intro_title" msgid="5538727561353262952">"ಹಿಂದಕ್ಕೆ ಹೋಗಲು, ಎಡದಿಂದ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"ಈ ಮೊದಲು ನೀವಿದ್ದ ಕೊನೆಯ ಸ್ಕ್ರೀನ್‌ಗೆ ಹಿಂತಿರುಗಲು, ಬಲ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ."</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"ಈ ಮೊದಲು ನೀವಿದ್ದ ಕೊನೆಯ ಸ್ಕ್ರೀನ್‌ಗೆ ಹಿಂತಿರುಗಲು, ಬಲ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಗಿನ ಅಂಚಿನಿಂದ ನೀವು ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ವಿರಾಮಗೊಳಿಸದೆ ನಿಮ್ಮ ಬೆರಳನ್ನು ಸ್ಕ್ರೀನ್‌ನಿಂದ ಮೇಲೆತ್ತಿ."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ನೀವು ನೇರವಾಗಿ ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
diff --git a/quickstep/res/values-ko/strings.xml b/quickstep/res/values-ko/strings.xml
index 66125f08d0..a0c7882fe6 100644
--- a/quickstep/res/values-ko/strings.xml
+++ b/quickstep/res/values-ko/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"예상 앱: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"왼쪽 가장자리 끝에서 스와이프하세요."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"왼쪽 가장자리에서 화면 중앙으로 스와이프한 후 손가락을 떼세요."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"잘하셨습니다. 이제 오른쪽에서 스와이프하여 뒤로 돌아가세요"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"오른쪽 가장자리에서 화면 중앙으로 스와이프하여 마지막 화면으로 돌아갈 수도 있습니다"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"오른쪽 가장자리에서 화면 중앙으로 스와이프하여 마지막 화면으로 돌아갈 수도 있습니다"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"오른쪽 가장자리 끝에서 스와이프하세요."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"오른쪽 가장자리에서 화면 중앙으로 스와이프한 후 손가락을 떼세요."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"돌아가기 동작을 완료했습니다. 이번에는 앱 전환 방법을 알아보겠습니다."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"돌아가기 동작을 완료했습니다. 이번에는 앱 전환 방법을 알아보겠습니다."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"돌아가기 동작을 완료했습니다."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"화면 하단에 지나치게 가까운 곳에서 스와이프하면 안 됩니다."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"돌아가기 동작의 민감도를 변경하려면 설정으로 이동하세요"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"왼쪽에서 스와이프하여 뒤로 돌아가세요"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"마지막 화면으로 돌아가려면 왼쪽 가장자리에서 화면 중앙으로 스와이프하세요"</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"왼쪽에서 스와이프하여 뒤로 돌아가세요"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"마지막 화면으로 돌아가려면 왼쪽 가장자리에서 화면 중앙으로 스와이프하세요"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"화면 하단 가장자리에서 위로 스와이프하세요."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"손가락을 떼기 전에 멈추지 않아야 합니다."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"위로 똑바르게 스와이프하세요."</string>
diff --git a/quickstep/res/values-ky/strings.xml b/quickstep/res/values-ky/strings.xml
index 0c7bb73c66..4c89553240 100644
--- a/quickstep/res/values-ky/strings.xml
+++ b/quickstep/res/values-ky/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Божомолдонгон колдонмо: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Экранды эң четинен солдон оңго карай сүрүңүз."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Экранды сол жагынан ортосуна карай сүрүп, манжаңызды алыңыз."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Сонун! Артка кайтуу үчүн экрандын оң четинен сүрүп коюңуз"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Акыркы экранга кайтуу үчүн экранды оң жагынан ортосуна карай сүрүңүз."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Акыркы экранга кайтуу үчүн экранды оң жагынан ортосуна карай сүрүңүз."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Экранды эң четинен оңдой солго карай сүрүңүз."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Экранды оң жагынан ортосуна карай сүрүп, манжаңызды алыңыз."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"\"Артка\" жаңсоосу боюнча үйрөткүчтү бүтүрдүңүз. Эми колдонмолорду которуштурганды үйрөнүп алыңыз."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"\"Артка\" жаңсоосу боюнча үйрөткүчтү бүтүрдүңүз. Эми колдонмолорду которуштурганды үйрөнүп алыңыз."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"\"Артка\" жаңсоосу боюнча үйрөткүчтү бүтүрдүңүз."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Манжаңызды экрандын ылдый жагына өтө жакындатпай сүрүңүз."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"\"Артка\" жаң-нун сезгичтигин өзгөртүү үчүн Жөндөөлөргө өтүңүз"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Артка кайтуу үчүн экраныңыздын сол четинен сүрүп коюңуз"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Акыркы экранга кайтуу үчүн экранды сол жагынан ортосуна карай сүрүңүз."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Артка кайтуу үчүн экраныңыздын сол четинен сүрүп коюңуз"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Акыркы экранга кайтуу үчүн экранды сол жагынан ортосуна карай сүрүңүз."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Экранды ылдыйдан өйдө карай сүрүңүз."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Манжаңызды алганга чейин токтотпоңуз."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Экранды өйдө карай сүрүңүз."</string>
diff --git a/quickstep/res/values-lo/strings.xml b/quickstep/res/values-lo/strings.xml
index b9b563a6ac..714d38c926 100644
--- a/quickstep/res/values-lo/strings.xml
+++ b/quickstep/res/values-lo/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ແອັບທີ່ຄາດເດົາໄວ້: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ກະລຸນາກວດສອບວ່າທ່ານປັດຈາກຂອບຊ້າຍສຸດ."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ກະລຸນາກວດສອບວ່າທ່ານປັດຈາກຂອບຊ້າຍໄປຫາທາງກາງຂອງຈໍແລ້ວປ່ອຍ."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"ດີ! ຕອນນີ້ໃຫ້ປັດຈາກຂວາເພື່ອກັບຄືນ"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"ທ່ານສາມາດກັບໄປຫາໜ້າຈໍຫຼ້າສຸດໄດ້ໂດຍການປັດຈາກຂອບຂວາໄປຫາກາງຈໍ."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"ທ່ານສາມາດກັບໄປຫາໜ້າຈໍຫຼ້າສຸດໄດ້ໂດຍການປັດຈາກຂອບຂວາໄປຫາກາງຈໍ."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ກະລຸນາກວດສອບວ່າທ່ານປັດຈາກຂອບຂວາສຸດ."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ກະລຸນາກວດສອບວ່າທ່ານປັດຈາກຂອບຂວາໄປຫາທາງກາງຂອງຈໍແລ້ວປ່ອຍ."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"ທ່ານໃຊ້ທ່າທາງກັບຄືນສຳເລັດແລ້ວ. ຕໍ່ໄປ, ມາສຶກສາວິທີສະຫຼັບແອັບ."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"ທ່ານໃຊ້ທ່າທາງກັບຄືນສຳເລັດແລ້ວ. ຕໍ່ໄປ, ມາສຶກສາວິທີສະຫຼັບແອັບ."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ທ່ານໃຊ້ທ່າທາງກັບຄືນສຳເລັດແລ້ວ."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ກະລຸນາກວດສອບວ່າທ່ານບໍ່ໄດ້ປັດໃກ້ກັບທາງລຸ່ມຂອງໜ້າຈໍເກີນໄປ."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ເພື່ອປ່ຽນຄວາມລະອຽດອ່ອນຂອງທ່າທາງກັບຄືນ, ໃຫ້ໄປຫາການຕັ້ງຄ່າ"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"ປັດຈາກຊ້າຍເພື່ອກັບຄືນ"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"ເພື່ອກັບຄືນໄປໜ້າຈໍຫຼ້າສຸດທີ່ທ່ານໃຊ້, ໃຫ້ປັດຈາກຂອບຊ້າຍໄປຫາກາງຈໍ."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"ປັດຈາກຊ້າຍເພື່ອກັບຄືນ"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"ເພື່ອກັບຄືນໄປໜ້າຈໍຫຼ້າສຸດທີ່ທ່ານໃຊ້, ໃຫ້ປັດຈາກຂອບຊ້າຍໄປຫາກາງຈໍ."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ກະລຸນາກວດສອບວ່າທ່ານປັດຂຶ້ນຈາກຂອບລຸ່ມສຸດຂອງໜ້າຈໍ."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ກະລຸນາກວດສອບວ່າທ່ານບໍ່ຢຸດຊົ່ວຄາວກ່ອນປ່ອຍນິ້ວ."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ກະລຸນາກວດສອບວ່າທ່ານປັດຂຶ້ນໄປຊື່ໆ."</string>
diff --git a/quickstep/res/values-lt/strings.xml b/quickstep/res/values-lt/strings.xml
index d88c660ed7..55e46e7a27 100644
--- a/quickstep/res/values-lt/strings.xml
+++ b/quickstep/res/values-lt/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Numatoma programa: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Turite perbraukti nuo kairiojo krašto."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Turite perbraukti nuo kairiojo krašto link ekrano vidurio ir pakelti pirštą."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Šaunu! Dabar perbraukite iš dešinės, kad grįžtumėte"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Į ankstesnį ekraną taip pat galite grįžti, perbraukdami nuo dešiniojo krašto link ekrano vidurio."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Į ankstesnį ekraną taip pat galite grįžti, perbraukdami nuo dešiniojo krašto link ekrano vidurio."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Turite perbraukti nuo dešiniojo krašto."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Turite perbraukti nuo dešiniojo krašto link ekrano vidurio ir pakelti pirštą."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Atlikote grįžimo atgal gestą. Toliau sužinosite, kaip perjungti programas."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Atlikote grįžimo atgal gestą. Toliau sužinosite, kaip perjungti programas."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Atlikote grįžimo atgal gestą."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nebraukite per arti ekrano apačios."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Norėd. pak. grįžimo gesto jautr., eikite į sk. „Nustatymai“"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Perbraukite iš kairės, kad grįžtumėte"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Norėdami grįžti į ankstesnį ekraną, kuriame lankėtės, perbraukite nuo kairiojo krašto link ekrano vidurio."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Perbraukite iš kairės, kad grįžtumėte"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Norėdami grįžti į ankstesnį ekraną, kuriame lankėtės, perbraukite nuo kairiojo krašto link ekrano vidurio."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Turite perbraukti aukštyn nuo apatinio ekrano krašto."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Nepristabdykite prieš pakeldami pirštą."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Turite tiesiai perbraukti aukštyn."</string>
diff --git a/quickstep/res/values-lv/strings.xml b/quickstep/res/values-lv/strings.xml
index de589a9608..216d1ceaff 100644
--- a/quickstep/res/values-lv/strings.xml
+++ b/quickstep/res/values-lv/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Prognozētā lietotne: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Jāvelk no pašas kreisās malas."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Jāvelk no ekrāna kreisās malas uz vidu un jāatlaiž."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Lieliski! Tagad velciet no labās puses, lai pārietu atpakaļ"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Varat arī pāriet atpakaļ uz pēdējo ekrānu, velkot no labās malas uz ekrāna vidu."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Varat arī pāriet atpakaļ uz pēdējo ekrānu, velkot no labās malas uz ekrāna vidu."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Jāvelk no pašas labās malas."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Jāvelk no ekrāna labās malas uz vidu un jāatlaiž."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Jūs sekmīgi veicāt atgriešanās žestu. Tagad varat iemācīties, kā pārslēgt lietotnes."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Jūs sekmīgi veicāt atgriešanās žestu. Tagad varat iemācīties, kā pārslēgt lietotnes."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Jūs sekmīgi veicāt atgriešanās žestu."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nevelciet pārāk tuvu ekrāna apakšdaļai."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Atgriešanās žesta jutīguma līmeni varat mainīt iestatījumos."</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Lai pārietu atpakaļ, velciet no kreisās malas."</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Lai pārietu atpakaļ uz pēdējo izmantoto ekrānu, velciet no kreisās malas uz ekrāna vidu."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Lai pārietu atpakaļ, velciet no kreisās malas."</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Lai pārietu atpakaļ uz pēdējo izmantoto ekrānu, velciet no kreisās malas uz ekrāna vidu."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Jāvelk augšup no ekrāna apakšmalas."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pirms atlaišanas nepārtrauciet kustību."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Jāvelk tieši uz augšu."</string>
diff --git a/quickstep/res/values-mk/strings.xml b/quickstep/res/values-mk/strings.xml
index 4eb23f5b1b..a39933f9ac 100644
--- a/quickstep/res/values-mk/strings.xml
+++ b/quickstep/res/values-mk/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Предвидена апликација: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Повлечете од подалечниот лев агол."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Повлечете од левиот раб кон средината на екранот и пуштете."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Одлично! Сега повлечете оддесно за да се вратите назад"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Може да се вратите на последниот екран и со повлекување од десниот раб кон средината на екранот."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Може да се вратите на последниот екран и со повлекување од десниот раб кон средината на екранот."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Повлечете од подалечниот десен агол."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Повлечете од десниот раб кон средината на екранот и пуштете."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Завршивте со упатството за враќање назад. Следно, дознајте како да се префрлате помеѓу апликации."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Завршивте со упатството за враќање назад. Следно, дознајте како да се префрлате помеѓу апликации."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Завршивте со упатството за враќање назад."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Не повлекувајте преблиску до долниот раб на екранот."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"За да ја промените чувствителноста, одете во „Поставки“"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Повлечете одлево за да се вратите назад"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"За да се вратите на последниот екран на кој бевте, повлечете од левиот раб кон средината на екранот."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Повлечете одлево за да се вратите назад"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"За да се вратите на последниот екран на кој бевте, повлечете од левиот раб кон средината на екранот."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Повлечете нагоре од долниот раб на екранот."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Не правете пауза пред да пуштите."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Повлечете право нагоре."</string>
diff --git a/quickstep/res/values-ml/strings.xml b/quickstep/res/values-ml/strings.xml
index 13002ee0b4..c2edf3e776 100644
--- a/quickstep/res/values-ml/strings.xml
+++ b/quickstep/res/values-ml/strings.xml
@@ -47,8 +47,7 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"പ്രവചിച്ച ആപ്പ്: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ഇടത്തേയറ്റത്തെ അരികിൽ നിന്ന് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ഇടത്തേ അരികിൽ നിന്ന് സ്‌ക്രീനിന്റെ മധ്യഭാഗത്തേക്ക് സ്വെെപ്പ് ചെയ്‌ത് വിടുക."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"കൊള്ളാം! പുറകോട്ട് പോകാൻ വലതുഭാഗത്ത് നിന്ന് സ്വൈപ്പ് ചെയ്യുക"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"സ്ക്രീനിന്റെ വലത് അരികിൽ നിന്ന് നടുവിലേക്ക് സ്വൈപ്പ് ചെയ്തും മുൻ സ്ക്രീനിലേക്ക് പോകാം."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"സ്ക്രീനിന്റെ വലത് അരികിൽ നിന്ന് നടുവിലേക്ക് സ്വൈപ്പ് ചെയ്തും മുൻ സ്ക്രീനിലേക്ക് പോകാം."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"വലത്തേയറ്റത്തെ അരികിൽ നിന്ന് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"വലത്തേ അരികിൽ നിന്ന് സ്‌ക്രീനിന്റെ മധ്യഭാഗത്തേക്ക് സ്വെെപ്പ് ചെയ്‌ത് വിടുക."</string>
     <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"മടങ്ങുക ജെസ്ച്ചർ നിങ്ങൾ പൂർത്തിയാക്കി. അടുത്തത്, എങ്ങനെ ആപ്പുകൾ തമ്മിൽ മാറാമെന്ന് മനസ്സിലാക്കുക."</string>
@@ -56,7 +55,7 @@
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"സ്‌ക്രീനിന്റെ ഏറ്റവും അടിഭാഗത്തേക്ക് സ്വെെപ്പ് ചെയ്യുന്നില്ലെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ബാക്ക്ജെസ്റ്ററിന്റെ സെൻസിറ്റിവിറ്റി മാറ്റാൻ ക്രമീകരണത്തിൽ പോകൂ"</string>
     <string name="back_gesture_intro_title" msgid="5538727561353262952">"പുറകോട്ട് പോകാൻ ഇടതുഭാഗത്ത് നിന്ന് സ്വൈപ്പ് ചെയ്യുക"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"മുമ്പത്തെ സ്ക്രീനിലേക്ക് പോകാൻ, സ്ക്രീനിന്റെ ഇടത് അരികിൽ നിന്ന് നടുവിലേക്ക് സ്വൈപ്പ് ചെയ്യുക."</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"മുമ്പത്തെ സ്ക്രീനിലേക്ക് പോകാൻ, സ്ക്രീനിന്റെ ഇടത് അരികിൽ നിന്ന് നടുവിലേക്ക് സ്വൈപ്പ് ചെയ്യുക."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"സ്‌ക്രീനിന്റെ താഴത്തെ അരികിൽ നിന്ന് മുകളിലേക്ക് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"വിടുന്നതിന് മുമ്പ് നിങ്ങൾ താൽക്കാലികമായി നിർത്തുന്നില്ലെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"നേരെ മുകളിലേക്ക് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പിക്കുക."</string>
diff --git a/quickstep/res/values-mn/strings.xml b/quickstep/res/values-mn/strings.xml
index c82568e6dd..d378c7b662 100644
--- a/quickstep/res/values-mn/strings.xml
+++ b/quickstep/res/values-mn/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Таамаглаж буй апп: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Та зүүн захын булангаас шударна уу."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Та дэлгэцийн зүүн булангаас дунд хэсэг хүртэл шударч, суллаарай."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Янзтай! Одоо буцахын тулд баруун талаас шударна уу"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Та мөн дэлгэцийн баруун булангаас дунд хэсэг рүү шударснаар сүүлийн дэлгэц рүү буцах боломжтой."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Та мөн дэлгэцийн баруун булангаас дунд хэсэг рүү шударснаар сүүлийн дэлгэц рүү буцах боломжтой."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Та баруун захын булангаас шударна уу."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Та дэлгэцийн баруун булангаас дунд хэсэг хүртэл шударч, суллаарай."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Та буцах зангааг гүйцэтгэлээ. Дараа нь аппуудыг хэрхэн сэлгэх талаар мэдэж авна уу."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Та буцах зангааг гүйцэтгэлээ. Дараа нь аппуудыг хэрхэн сэлгэх талаар мэдэж авна уу."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Та буцах зангааг гүйцэтгэлээ."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Та дэлгэцийн доод хэсэгтэй хэт ойр бүү шудраарай."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Буцах зангааны мэдрэгшлийг өөрчлөх бол Тохиргоо руу очно уу"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Буцахын тулд зүүн талаас шударна уу"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Та байсан сүүлийн дэлгэц рүүгээ буцахын тулд дэлгэцийн баруун булангаас дунд хэсэг рүү шударна уу"</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Буцахын тулд зүүн талаас шударна уу"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Та байсан сүүлийн дэлгэц рүүгээ буцахын тулд дэлгэцийн баруун булангаас дунд хэсэг рүү шударна уу"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Та дэлгэцийн доод булангаас дээш шударна уу."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Та суллахаасаа өмнө түр зогсоож болохгүй."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Та чигээрээ шударна уу."</string>
diff --git a/quickstep/res/values-mr/strings.xml b/quickstep/res/values-mr/strings.xml
index 8f7d2773cf..373d20451d 100644
--- a/quickstep/res/values-mr/strings.xml
+++ b/quickstep/res/values-mr/strings.xml
@@ -47,8 +47,7 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"पूर्वानुमान केलेले अ‍ॅप: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"तुम्ही स्क्रीनच्या अगदी डाव्या कडेपासून स्‍वाइप करत आहात याची खात्री करा."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"तुम्ही स्क्रीनच्या डाव्या कडेपासून मध्यावर स्‍वाइप करून बोट उचलत आहात याची खात्री करा."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"छान! आता मागे जाण्यासाठी उजवीकडून स्वाइप करा"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"तुम्ही स्क्रीनच्या उजव्या कडेपासून मध्याभागी स्वाइप करून मागील स्क्रीनवर परतदेखील जाऊ शकता."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"तुम्ही स्क्रीनच्या उजव्या कडेपासून मध्याभागी स्वाइप करून मागील स्क्रीनवर परतदेखील जाऊ शकता."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"तुम्ही स्क्रीनच्या अगदी उजव्या कडेपासून स्‍वाइप करत आहात याची खात्री करा."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"तुम्ही स्क्रीनच्या उजव्या कडेपासून मध्यावर स्‍वाइप करून बोट उचलत आहात याची खात्री करा."</string>
     <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"तुम्ही गो बॅक जेश्चर पूर्ण केले. आता, ॲप्स कशी स्विच करायची ते जाणून घ्या."</string>
@@ -56,7 +55,7 @@
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"तुम्ही स्क्रीनच्या तळाच्या अगदी जवळून स्‍वाइप करत नाही याची खात्री करा."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"बॅक जेश्चरची संवेदनशीलता बदलण्यासाठी, सेटिंग्ज वर जा"</string>
     <string name="back_gesture_intro_title" msgid="5538727561353262952">"मागे जाण्यासाठी डावीकडून स्वाइप करा"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"तुम्ही होतात त्या मागील स्क्रीनवर परत जाण्यासाठी, स्क्रीनच्या डाव्या कडेपासून मध्याभागी स्वाइप करा."</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"तुम्ही होतात त्या मागील स्क्रीनवर परत जाण्यासाठी, स्क्रीनच्या डाव्या कडेपासून मध्याभागी स्वाइप करा."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"तुम्ही स्क्रीनच्या तळाच्या कडेपासून वर स्वाइप करत आहात याची खात्री करा."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"तुम्ही स्क्रीनवरून बोट उचलण्यापूर्वी ते थांबवत नाही याची खात्री करा."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"तुम्ही सरळ वर स्वाइप करत आहात याची खात्री करा."</string>
diff --git a/quickstep/res/values-ms/strings.xml b/quickstep/res/values-ms/strings.xml
index 9585d42418..507fb43fc4 100644
--- a/quickstep/res/values-ms/strings.xml
+++ b/quickstep/res/values-ms/strings.xml
@@ -47,8 +47,7 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Apl yang diramalkan: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pastikan anda meleret dari hujung sebelah kiri."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pastikan anda meleret dari tepi sebelah kiri ke tengah skrin dan lepaskan."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Bagus! Leret dari kanan untuk kembali sekarang"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Anda juga boleh kembali ke skrin terakhir dengan meleret dari tepi sebelah kanan ke tengah skrin."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Anda juga boleh kembali ke skrin terakhir dengan meleret dari tepi sebelah kanan ke tengah skrin."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pastikan anda meleret dari hujung sebelah kanan."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pastikan anda meleret dari tepi sebelah kanan ke tengah skrin dan lepaskan."</string>
     <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Anda telah melengkapkan gerak isyarat undur. Seterusnya, ketahui cara menukar apl."</string>
@@ -56,7 +55,7 @@
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pastikan anda tidak meleret terlalu dekat dengan bahagian bawah skrin."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Utk mengubah kepekaan gerak isyarat undur, pergi ke Tetapan"</string>
     <string name="back_gesture_intro_title" msgid="5538727561353262952">"Leret dari kiri untuk kembali"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Untuk kembali ke skrin terakhir yang anda berada, leret dari tepi sebelah kiri ke tengah skrin."</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Untuk kembali ke skrin terakhir yang anda berada, leret dari tepi sebelah kiri ke tengah skrin."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pastikan anda meleret ke atas dari tepi sebelah bawah skrin."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pastikan anda tidak menjeda sebelum melepaskan gerak isyarat tersebut."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pastikan anda meleret terus ke atas."</string>
diff --git a/quickstep/res/values-my/strings.xml b/quickstep/res/values-my/strings.xml
index 63c495fb6f..02042b494a 100644
--- a/quickstep/res/values-my/strings.xml
+++ b/quickstep/res/values-my/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ကြိုတင်မှန်းဆထားသော အက်ပ်− <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ဘယ်ဘက်အစွန် ခပ်လှမ်းလှမ်းမှ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ဘယ်ဘက်အစွန်မှ ဖန်သားပြင်အလယ်သို့ ပွတ်ဆွဲပြီး လွှတ်လိုက်ကြောင်း သေချာပါစေ။"</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"ကောင်းသည်။ နောက်သို့ပြန်သွားရန် ညာဘက်မှ ပွတ်ဆွဲပါ"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"ဖန်သားပြင်၏ညာအစွန်းမှ အလယ်သို့ပွတ်ဆွဲ၍ ပြီးခဲ့သောဖန်သားပြင်သို့လည်း ပြန်သွားနိုင်သည်။"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"ဖန်သားပြင်၏ညာအစွန်းမှ အလယ်သို့ပွတ်ဆွဲ၍ ပြီးခဲ့သောဖန်သားပြင်သို့လည်း ပြန်သွားနိုင်သည်။"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ညာဘက်အစွန် ခပ်လှမ်းလှမ်းမှ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ညာဘက်အစွန်မှ ဖန်သားပြင်အလယ်သို့ ပွတ်ဆွဲပြီး လွှတ်လိုက်ကြောင်း သေချာပါစေ။"</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"နောက်ဆုတ်လက်ဟန် ရှင်းလင်းပို့ချချက် ပြီးပါပြီ။ နောက်အဆင့်တွင် အက်ပ်များပြောင်းနည်းကို လေ့လာပါ။"</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"နောက်ဆုတ်လက်ဟန် ရှင်းလင်းပို့ချချက် ပြီးပါပြီ။ နောက်အဆင့်တွင် အက်ပ်များပြောင်းနည်းကို လေ့လာပါ။"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"နောက်ဆုတ်လက်ဟန် ရှင်းလင်းပို့ချချက် ပြီးပါပြီ။"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ဖန်သားပြင် အောက်ခြေနှင့် အလွန်နီးကပ်စွာ ပွတ်ဆွဲခြင်းမရှိကြောင်း သေချာပါစေ။"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"နောက်ဆုတ်လက်ဟန်၏ အာရုံခံစွမ်းကိုပြောင်းရန် ‘ဆက်တင်များ’ သို့ သွားပါ"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"နောက်သို့ပြန်သွားရန် ဘယ်ဘက်မှ ပွတ်ဆွဲပါ"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"သင်ရှိခဲ့သည့် ပြီးခဲ့သောဖန်သားပြင်သို့ ပြန်သွားရန် ဖန်သားပြင်၏ဘယ်အစွန်းမှ အလယ်သို့ပွတ်ဆွဲပါ။"</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"နောက်သို့ပြန်သွားရန် ဘယ်ဘက်မှ ပွတ်ဆွဲပါ"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"သင်ရှိခဲ့သည့် ပြီးခဲ့သောဖန်သားပြင်သို့ ပြန်သွားရန် ဖန်သားပြင်၏ဘယ်အစွန်းမှ အလယ်သို့ပွတ်ဆွဲပါ။"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ဖန်သားပြင် အောက်ခြေအစွန်မှ အပေါ်သို့ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"လက်မလွှတ်ခင် ခဏရပ်ခြင်းမရှိကြောင်း သေချာပါစေ။"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"အပေါ်တည့်တည့်သို့ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
diff --git a/quickstep/res/values-nb/strings.xml b/quickstep/res/values-nb/strings.xml
index 397679bc3f..6276c4570b 100644
--- a/quickstep/res/values-nb/strings.xml
+++ b/quickstep/res/values-nb/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Foreslått app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Sørg for at du sveiper fra kanten helt til venstre."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Sørg for at du sveiper fra den venstre kanten til midten av skjermen og slipper."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Bra! Sveip nå fra høyre for å gå tilbake"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Du kan også gå tilbake til forrige skjerm ved å sveipe fra høyre kant til midten av skjermen."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Du kan også gå tilbake til forrige skjerm ved å sveipe fra høyre kant til midten av skjermen."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Sørg for at du sveiper fra kanten helt til høyre."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Sørg for at du sveiper fra den høyre kanten til midten av skjermen og slipper."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Du har fullført bevegelsen for å gå tilbake. I neste trinn lærer du hvordan du bytter app."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Du har fullført bevegelsen for å gå tilbake. I neste trinn lærer du hvordan du bytter app."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Du har fullført bevegelsen for å gå tilbake."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Sørg for at du ikke sveiper for nær bunnen av skjermen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Gå til Innstillinger for å endre tilbakebevegelsefølsomheten"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Sveip fra venstre for å gå tilbake"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"For å gå tilbake til den forrige skjermen du var på, sveip fra venstre kant til midten av skjermen."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Sveip fra venstre for å gå tilbake"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"For å gå tilbake til den forrige skjermen du var på, sveip fra venstre kant til midten av skjermen."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Sørg for at du sveiper opp fra den nederste kanten av skjermen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Sørg for at du ikke setter på pause før du slipper."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Sørg for at du sveiper rett opp."</string>
diff --git a/quickstep/res/values-ne/strings.xml b/quickstep/res/values-ne/strings.xml
index 7dfad54325..1c53c2fe55 100644
--- a/quickstep/res/values-ne/strings.xml
+++ b/quickstep/res/values-ne/strings.xml
@@ -47,8 +47,7 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"पूर्वानुमान गरिएको एप: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"स्क्रिनको सबैभन्दा बायाँ किनाराबाट स्वाइप गर्नुहोस्।"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"स्क्रिनको बायाँ किनाराबाट मध्य भागसम्म स्वाइप गर्नुहोस् अनि औँला उठाउनुहोस्।"</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"राम्रो! अब पछाडि जान दायाँ किनाराबाट स्वाइप गर्नुहोस्"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"तपाईं स्क्रिनको दायाँ किनाराबाट मध्य भागसम्म स्वाइप गरेर पनि यसअघिको स्क्रिनमा फर्कन सक्नुहुन्छ।"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"तपाईं स्क्रिनको दायाँ किनाराबाट मध्य भागसम्म स्वाइप गरेर पनि यसअघिको स्क्रिनमा फर्कन सक्नुहुन्छ।"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"स्क्रिनको सबैभन्दा दायाँ किनाराबाट स्वाइप गर्नुहोस्।"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"स्क्रिनको दायाँ किनाराबाट मध्य भागसम्म स्वाइप गर्नुहोस् अनि औँला उठाउनुहोस्।"</string>
     <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"तपाईंले \'पछाडि जानुहोस्\' नामक इसारा प्रयोग गर्ने तरिका सिक्नुभयो। अब एउटा एपबाट अर्को एपमा जाने तरिका सिक्नुहोस्।"</string>
@@ -56,7 +55,7 @@
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"स्क्रिनको फेदको धेरै नजिकसम्म स्वाइप नगर्नुहोस्।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"\'पछाडि\' नामक इसाराको संवेदनशीलता बदल्न सेटिङमा जानुहोस्"</string>
     <string name="back_gesture_intro_title" msgid="5538727561353262952">"पछाडि जान बायाँ किनाराबाट स्वाइप गर्नुहोस्"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"तपाईं यसअघि जुन स्क्रिनमा हुनुहुन्थ्यो त्यो फर्कन स्क्रिनको बायाँ किनाराबाट मध्य भागसम्म स्वाइप गर्नुहोस्।"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"तपाईं यसअघि जुन स्क्रिनमा हुनुहुन्थ्यो त्यो फर्कन स्क्रिनको बायाँ किनाराबाट मध्य भागसम्म स्वाइप गर्नुहोस्।"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"स्क्रिनको फेदबाट माथितिर स्वाइप गर्नुहोस्।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"औँला उठाउनुअघि नरोकिनुहोस्।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"सीधै माथितिर स्वाइप गर्नुहोस्।"</string>
diff --git a/quickstep/res/values-nl/strings.xml b/quickstep/res/values-nl/strings.xml
index 5ef7b489eb..ca732e92fa 100644
--- a/quickstep/res/values-nl/strings.xml
+++ b/quickstep/res/values-nl/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Voorspelde app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Swipe helemaal vanaf de linkerrand."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Swipe vanaf de linkerrand naar het midden van het scherm en laat los."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Mooi! Swipe nu vanaf de rechterkant om terug te gaan."</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Je kunt ook teruggaan naar het laatste scherm door vanaf de rechterkant naar het midden van het scherm te swipen."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Je kunt ook teruggaan naar het laatste scherm door vanaf de rechterkant naar het midden van het scherm te swipen."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Swipe helemaal vanaf de rechterrand."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Swipe vanaf de rechterrand naar het midden van het scherm en laat los."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Je weet nu hoe je het gebaar Terug maakt. Ontdek als volgende hoe je tussen apps schakelt."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Je weet nu hoe je het gebaar Terug maakt. Ontdek als volgende hoe je tussen apps schakelt."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Je weet nu hoe je het gebaar Terug maakt."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Swipe niet te dicht bij de onderkant van het scherm."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Open Instellingen om de gevoeligheid van Terug te wijzigen"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Swipe vanaf de linkerkant om terug te gaan"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Swipe vanaf de linkerkant naar het midden van het scherm om terug te gaan naar het vorige scherm."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Swipe vanaf de linkerkant om terug te gaan"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Swipe vanaf de linkerkant naar het midden van het scherm om terug te gaan naar het vorige scherm."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Swipe vanaf de onderrand van het scherm omhoog."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pauzeer niet voordat je loslaat."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Swipe recht omhoog."</string>
diff --git a/quickstep/res/values-or/strings.xml b/quickstep/res/values-or/strings.xml
index abe1af1921..3159871a22 100644
--- a/quickstep/res/values-or/strings.xml
+++ b/quickstep/res/values-or/strings.xml
@@ -47,8 +47,7 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ପୂର୍ବାନୁମାନ କରାଯାଇଥିବା ଆପ୍: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ଆପଣ ଦୂର-ବାମ ଧାରରୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ଆପଣ ସ୍କ୍ରିନର ବାମ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରି ଛାଡ଼ି ଦେଉଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"ବଢ଼ିଆ! ବର୍ତ୍ତମାନ ପଛକୁ ଫେରିବା ପାଇଁ ଡାହାଣ ଧାରରୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"ଆପଣ ସ୍କ୍ରିନର ଡାହାଣ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରି ପୂର୍ବ ସ୍କ୍ରିନକୁ ମଧ୍ୟ ଫେରିପାରିବେ।"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"ଆପଣ ସ୍କ୍ରିନର ଡାହାଣ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରି ପୂର୍ବ ସ୍କ୍ରିନକୁ ମଧ୍ୟ ଫେରିପାରିବେ।"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ଆପଣ ଦୂର-ଡାହାଣ ଧାରରୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ଆପଣ ସ୍କ୍ରିନର ଡାହାଣ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରି ଛାଡ଼ି ଦେଉଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"ଆପଣ \'ପଛକୁ ଫେରନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି। ତା\'ପରେ, ଆପଗୁଡ଼ିକୁ କିପରି ସ୍ୱିଚ୍ କରିବେ ତାହା ଜାଣନ୍ତୁ।"</string>
@@ -56,7 +55,7 @@
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ଆପଣ ସ୍କ୍ରିନର ତଳଭାଗର ଅତି ନିକଟରୁ ସ୍ୱାଇପ୍ କରୁନଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ପଛକୁ ଫେରିବା ଜେଶ୍ଚରର ସମ୍ବେଦନଶୀଳତା ବଦଳାଇବାକୁ ସେଟିଂସକୁ ଯାଆନ୍ତୁ"</string>
     <string name="back_gesture_intro_title" msgid="5538727561353262952">"ପଛକୁ ଫେରିବା ପାଇଁ ବାମ ଧାରରୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"ଆପଣ ଯେଉଁ ପୂର୍ବ ସ୍କ୍ରିନରେ ଥିଲେ ସେହି ସ୍କ୍ରିନକୁ ଫେରିବା ପାଇଁ, ସ୍କ୍ରିନର ବାମ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ।"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"ଆପଣ ଯେଉଁ ପୂର୍ବ ସ୍କ୍ରିନରେ ଥିଲେ ସେହି ସ୍କ୍ରିନକୁ ଫେରିବା ପାଇଁ, ସ୍କ୍ରିନର ବାମ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ।"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ଆପଣ ସ୍କ୍ରିନର ତଳ ଧାରରୁ ଉପରକୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ଆପଣ ଛାଡ଼ିବା ପୂର୍ବରୁ ବିରତ କରୁନଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ଆପଣ ସିଧା ଉପରକୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
diff --git a/quickstep/res/values-pa/strings.xml b/quickstep/res/values-pa/strings.xml
index eb0f1b0669..801beb779f 100644
--- a/quickstep/res/values-pa/strings.xml
+++ b/quickstep/res/values-pa/strings.xml
@@ -47,8 +47,7 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ਪੂਰਵ ਅਨੁਮਾਨਿਤ ਐਪ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਦੂਰ-ਖੱਬੇ ਕਿਨਾਰੇ ਤੋਂ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਖੱਬੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰਦੇ ਹੋ ਅਤੇ ਛੱਡ ਦਿੰਦੇ ਹੋ।"</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"ਵਧੀਆ! ਹੁਣ ਪਿੱਛੇ ਜਾਣ ਲਈ ਸੱਜੇ ਪਾਸੇ ਤੋਂ ਸਵਾਈਪ ਕਰੋ"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"ਤੁਸੀਂ ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰਕੇ ਪਿਛਲੀ ਸਕ੍ਰੀਨ \'ਤੇ ਵਾਪਸ ਜਾ ਸਕਦੇ ਹੋ।"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"ਤੁਸੀਂ ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰਕੇ ਪਿਛਲੀ ਸਕ੍ਰੀਨ \'ਤੇ ਵਾਪਸ ਜਾ ਸਕਦੇ ਹੋ।"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਦੂਰ-ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰਦੇ ਹੋ ਅਤੇ ਛੱਡ ਦਿੰਦੇ ਹੋ।"</string>
     <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"ਤੁਸੀਂ \'ਵਾਪਸ ਜਾਓ\' ਦਾ ਇਸ਼ਾਰਾ ਪੂਰਾ ਕੀਤਾ। ਅੱਗੇ, ਜਾਣੋ ਕਿ ਐਪਾਂ ਵਿਚਾਲੇ ਅਦਲਾ-ਬਦਲੀ ਕਿਵੇਂ ਕਰਨੀ ਹੈ।"</string>
@@ -56,7 +55,7 @@
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਲੇ ਹਿੱਸੇ ਦੇ ਬਹੁਤ ਨੇੜੇ ਸਵਾਈਪ ਨਾ ਕਰੋ।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ਪਿੱਛੇ ਜਾਣ ਦੇ ਸੰਕੇਤ ਦੀ ਸੰਵੇਦਨਸ਼ੀਲਤਾ ਬਦਲਣ ਲਈ, ਸੈਟਿੰਗਾਂ \'ਤੇ ਜਾਓ"</string>
     <string name="back_gesture_intro_title" msgid="5538727561353262952">"ਪਿੱਛੇ ਜਾਣ ਲਈ ਖੱਬੇ ਪਾਸੇ ਤੋਂ ਸਵਾਈਪ ਕਰੋ"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"ਜਿੱਥੇ ਤੁਸੀਂ ਸੀ ਉਸ ਸਕ੍ਰੀਨ \'ਤੇ ਵਾਪਸ ਜਾਣ ਲਈ, ਖੱਬੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰੋ।"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"ਜਿੱਥੇ ਤੁਸੀਂ ਸੀ ਉਸ ਸਕ੍ਰੀਨ \'ਤੇ ਵਾਪਸ ਜਾਣ ਲਈ, ਖੱਬੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰੋ।"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਲੇ ਕਿਨਾਰੇ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ਪੱਕਾ ਕਰੋ ਕਿ ਸਕ੍ਰੀਨ ਨੂੰ ਛੱਡਣ ਤੋਂ ਪਹਿਲਾਂ ਰੁਕੋ ਨਾ।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਿੱਧੇ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
diff --git a/quickstep/res/values-pl/strings.xml b/quickstep/res/values-pl/strings.xml
index 08a8ba4417..cb0953be82 100644
--- a/quickstep/res/values-pl/strings.xml
+++ b/quickstep/res/values-pl/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Przewidywana aplikacja: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pamiętaj, aby przesuwać palcem od samej lewej krawędzi."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pamiętaj, aby przesuwać palcem od lewej krawędzi do środka ekranu, a potem podnieść palec."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Super! A teraz przesuń palcem od prawej strony, by powrócić"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Możesz także wrócić do ostatniego ekranu, przesuwając palcem od prawej krawędzi do środka ekranu."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Możesz także wrócić do ostatniego ekranu, przesuwając palcem od prawej krawędzi do środka ekranu."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pamiętaj, aby przesuwać palcem od samej prawej krawędzi."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pamiętaj, aby przesuwać palcem od prawej krawędzi do środka ekranu, a potem podnieść palec."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Gest przejścia wstecz został opanowany. Poćwicz teraz przełączanie aplikacji."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Gest przejścia wstecz został opanowany. Poćwicz teraz przełączanie aplikacji."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Gest przejścia wstecz został opanowany."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pamiętaj, aby nie przesuwać palcem zbyt blisko dolnej części ekranu."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Czułość gestu cofania możesz zmienić w Ustawieniach"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Aby wrócić, przesuń palcem od lewej strony"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Aby wrócić do ostatniego ekranu, przesuń palcem od lewej krawędzi do środka ekranu."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Aby wrócić, przesuń palcem od lewej strony"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Aby wrócić do ostatniego ekranu, przesuń palcem od lewej krawędzi do środka ekranu."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pamiętaj, aby przesuwać palcem od dolnej krawędzi ekranu."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pamiętaj, aby przed podniesieniem palca nie było przerwy."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pamiętaj, aby przesuwać palcem prosto do góry."</string>
diff --git a/quickstep/res/values-pt-rPT/strings.xml b/quickstep/res/values-pt-rPT/strings.xml
index ec14c25f9b..16f634975d 100644
--- a/quickstep/res/values-pt-rPT/strings.xml
+++ b/quickstep/res/values-pt-rPT/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App prevista: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Garanta que desliza rapidamente com o dedo a partir da extremidade esquerda."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Garanta que desliza rapidamente com o dedo do limite esquerdo até ao centro do ecrã e solta."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Boa! Deslize rapidamente a partir da direita para retroceder"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Também pode voltar ao último ecrã ao deslizar rapidamente da direita para o centro do ecrã."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Também pode voltar ao último ecrã ao deslizar rapidamente da direita para o centro do ecrã."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Garanta que desliza rapidamente com o dedo a partir da extremidade direita."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Garanta que desliza rapidamente com o dedo do limite direito até ao centro do ecrã e solta."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Concluiu o gesto para retroceder. A seguir, saiba como alternar entre apps."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Concluiu o gesto para retroceder. A seguir, saiba como alternar entre apps."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Concluiu o gesto para retroceder."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Garanta que não desliza rapidamente com o dedo demasiado perto da parte inferior do ecrã."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Altere a sensibilidade do gesto para voltar nas Definições."</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Deslize rapidamente a partir da esquerda para retroceder"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Para voltar ao último ecrã, deslize rapidamente a partir do limite esquerdo para o centro do ecrã."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Deslize rapidamente a partir da esquerda para retroceder"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Para voltar ao último ecrã, deslize rapidamente a partir do limite esquerdo para o centro do ecrã."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Garanta que desliza rapidamente com o dedo a partir do limite inferior do ecrã."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Garanta que não faz uma pausa antes de soltar."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Garanta que desliza rapidamente com o dedo para cima."</string>
diff --git a/quickstep/res/values-pt/strings.xml b/quickstep/res/values-pt/strings.xml
index 3a641fecc6..cbea6d9269 100644
--- a/quickstep/res/values-pt/strings.xml
+++ b/quickstep/res/values-pt/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App previsto: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Deslize da borda esquerda."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Deslize da borda esquerda até o meio da tela e solte."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Muito bem! Agora deslize da direita para voltar"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Para voltar à tela anterior, deslize da borda direita até o meio da tela."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Para voltar à tela anterior, deslize da borda direita até o meio da tela."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Deslize da borda direita."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Deslize da borda direita até o meio da tela e solte."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Você concluiu o gesto para voltar. A seguir, aprenda a trocar de app."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Você concluiu o gesto para voltar. A seguir, aprenda a trocar de app."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Você concluiu o gesto para voltar."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Não deslize perto demais da parte inferior da tela."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Mude a sensibilidade do gesto de voltar nas configurações"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Deslize da esquerda para voltar"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Para voltar à tela anterior, deslize da borda esquerda até o meio da tela."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Deslize da esquerda para voltar"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Para voltar à tela anterior, deslize da borda esquerda até o meio da tela."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Deslize da borda inferior da tela para cima."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Não pare antes de soltar."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Deslize para cima."</string>
diff --git a/quickstep/res/values-ro/strings.xml b/quickstep/res/values-ro/strings.xml
index 2803844540..2b78e8b5f2 100644
--- a/quickstep/res/values-ro/strings.xml
+++ b/quickstep/res/values-ro/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplicația estimată: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Glisați dinspre marginea stângă îndepărtată."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Glisați dinspre marginea stângă spre mijlocul ecranului și eliberați."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Bravo! Acum glisați dinspre dreapta pentru a reveni."</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Reveniți la ultimul ecran glisând de la marginea dreaptă spre mijlocul ecranului."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Reveniți la ultimul ecran glisând de la marginea dreaptă spre mijlocul ecranului."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Glisați dinspre marginea dreaptă îndepărtată."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Glisați dinspre marginea dreaptă spre mijlocul ecranului și eliberați."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Ați finalizat gestul „înapoi”. În continuare, aflați cum să comutați între aplicații."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Ați finalizat gestul „înapoi”. În continuare, aflați cum să comutați între aplicații."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ați finalizat gestul „înapoi”."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nu glisați prea aproape de partea de jos a ecranului."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Schimbați sensibilitatea gestului „Înapoi” accesând Setările"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Glisați dinspre stânga pentru a reveni"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Pentru a reveni la ultimul ecran accesat, glisați de la marginea stângă spre mijlocul ecranului."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Glisați dinspre stânga pentru a reveni"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Pentru a reveni la ultimul ecran accesat, glisați de la marginea stângă spre mijlocul ecranului."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Glisați în sus dinspre marginea de jos a ecranului."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Nu întrerupeți gestul înainte de a elibera."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Glisați direct în sus."</string>
diff --git a/quickstep/res/values-ru/strings.xml b/quickstep/res/values-ru/strings.xml
index d70980684a..ea513bc42a 100644
--- a/quickstep/res/values-ru/strings.xml
+++ b/quickstep/res/values-ru/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Рекомендуемое приложение: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Проведите слева направо от самого края экрана."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Проведите от левого края экрана до середины дисплея и отпустите палец."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Отлично! Теперь проведите справа налево, чтобы вернуться."</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Вернуться назад можно, проведя от правого края к центру."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Вернуться назад можно, проведя от правого края к центру."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Проведите справа налево от самого края экрана."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Проведите от правого края экрана до середины дисплея и отпустите палец."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Вы выполнили жест для перехода назад. Теперь мы расскажем, как переключаться между приложениями."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Вы выполнили жест для перехода назад. Теперь мы расскажем, как переключаться между приложениями."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Вы выполнили жест для перехода назад."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Проведите пальцем не слишком близко к нижнему краю экрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Уровень чувствительности можно изменить в настройках."</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Чтобы вернуться, проведите слева направо."</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Чтобы вернуться к предыдущему экрану, проведите от левого края к центру."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Чтобы вернуться, проведите слева направо."</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Чтобы вернуться к предыдущему экрану, проведите от левого края к центру."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Проведите снизу вверх от самого края экрана."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Не приостанавливайтесь перед тем, как отпустить палец."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Проведите по экрану ровно вверх."</string>
diff --git a/quickstep/res/values-si/strings.xml b/quickstep/res/values-si/strings.xml
index 1f735552ea..52e9acec60 100644
--- a/quickstep/res/values-si/strings.xml
+++ b/quickstep/res/values-si/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"පුරෝකථනය කළ යෙදුම: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ඔබ ඈත වම් දාරයෙන් ස්වයිප් කරන බවට සහතික කර ගන්න."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ඔබ වම් දාරයේ සිට තිරයේ මැදට ස්වයිප් කර අත හරින බව සහතික කර ගන්න."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"කදිමයි! දැන් ආපසු යාමට දකුණේ සිට ස්වයිප් කරන්න"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"දකුණු මායිමේ සිට තිරයේ මැදට ස්වයිප් කර අවසාන තිරයට යා හැකිය."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"දකුණු මායිමේ සිට තිරයේ මැදට ස්වයිප් කර අවසාන තිරයට යා හැකිය."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ඔබ ඈත දකුණු දාරයෙන් ස්වයිප් කරන බවට සහතික කර ගන්න."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ඔබ දකුණු දාරයේ සිට තිරයේ මැදට ස්වයිප් කර අත හරින බව සහතික කර ගන්න."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"ඔබ ආපසු යාමේ ඉංගිතය සම්පූර්ණ කරන ලදි. ඊළඟට, යෙදුම් මාරු කරන ආකාරය දැන ගන්න."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"ඔබ ආපසු යාමේ ඉංගිතය සම්පූර්ණ කරන ලදි. ඊළඟට, යෙදුම් මාරු කරන ආකාරය දැන ගන්න."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ඔබ ආපසු යාමේ ඉංගිතය සම්පූර්ණ කරන ලදි."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ඔබ තිරයේ පහළට ඉතාම සමීපව ස්වයිප් නොකරන බවට සහතික කර ගන්න."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ආපසු ඉංගිතයෙහි සංවේදීතාව වෙනස් කිරීමට, සැකසීම් වෙත යන්න"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"ආපසු යාමට වමේ සිට ස්වයිප් කරන්න"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"ඔබ සිටි අවසාන තිරයට ආපසු යාමට, වම් මායිමෙන් තිරයේ මැදට ස්වයිප් කරන්න."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"ආපසු යාමට වමේ සිට ස්වයිප් කරන්න"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"ඔබ සිටි අවසාන තිරයට ආපසු යාමට, වම් මායිමෙන් තිරයේ මැදට ස්වයිප් කරන්න."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ඔබ තිරයේ පහළ දාරයේ සිට ඉහළට ස්වයිප් කරන බව සහතික කර ගන්න."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"යාමට ඉඩ හැරීමට පෙර ඔබ විරාමයක් නොගන්නා බව සහතික කර ගන්න."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ඔබ කෙලින්ම ඉහළට ස්වයිප් කරන බව සහතික කර ගන්න."</string>
diff --git a/quickstep/res/values-sk/strings.xml b/quickstep/res/values-sk/strings.xml
index c2f9a239a3..fb50f2f092 100644
--- a/quickstep/res/values-sk/strings.xml
+++ b/quickstep/res/values-sk/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predpovedaná aplikácia: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Musite potiahnuť z úplne krajného ľavého okraja."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Musíte potiahnuť z ľavého okraja do stredu obrazovky a uvoľniť."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Výborne! Teraz prejdite späť potiahnutím sprava."</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Na poslednú obrazovku sa môžete tiež vrátiť potiahnutím z pravého okraja do stredu obrazovky."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Na poslednú obrazovku sa môžete tiež vrátiť potiahnutím z pravého okraja do stredu obrazovky."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Musite potiahnuť z úplne krajného pravého okraja."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Musíte potiahnuť z pravého okraja do stredu obrazovky a uvoľniť."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Dokončili ste gesto na prechod späť. V ďalšom kroku sa naučíte, ako prepínať aplikácie."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Dokončili ste gesto na prechod späť. V ďalšom kroku sa naučíte, ako prepínať aplikácie."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Dokončili ste gesto na prechod späť."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nesmiete potiahnuť príliš blízko dolnej časti obrazovky."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Ak chcete zmeniť citlivosť gesta Späť, prejdite do Nastavení"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Vrátite sa potiahnutím zľava"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Na poslednú obrazovku prejdete potiahnutím z ľavého okraja do stredu obrazovky."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Vrátite sa potiahnutím zľava"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Na poslednú obrazovku prejdete potiahnutím z ľavého okraja do stredu obrazovky."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Musíte potiahnuť nahor z dolného okraja obrazovky."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pred uvoľnením nesmiete zastať."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Musíte potiahnuť priamo hore."</string>
diff --git a/quickstep/res/values-sl/strings.xml b/quickstep/res/values-sl/strings.xml
index cf160ba931..df93eb262c 100644
--- a/quickstep/res/values-sl/strings.xml
+++ b/quickstep/res/values-sl/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predvidena aplikacija: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pazite, da ne povlečete s skrajno levega roba."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pazite, da povlečete z levega roba do sredine zaslona in dvignete prst."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Odlično! Zdaj za pomik nazaj povlecite z desne."</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Na zadnji zaslon se lahko vrnete tudi tako, da z desnega roba povlečete do sredine zaslona."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Na zadnji zaslon se lahko vrnete tudi tako, da z desnega roba povlečete do sredine zaslona."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pazite, da ne povlečete s skrajno desnega roba."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pazite, da povlečete z desnega roba do sredine zaslona in dvignete prst."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Izvedli ste potezo za pomik nazaj. Zdaj se naučite preklapljanja med aplikacijami."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Izvedli ste potezo za pomik nazaj. Zdaj se naučite preklapljanja med aplikacijami."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Izvedli ste potezo za pomik nazaj."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pazite, da ne povlečete preblizu dna zaslona."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Občutljivost poteze za nazaj lahko spremenite v nastavitvah."</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Povlecite z leve za pomik nazaj."</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Če se želite vrniti na zadnji prikazani zaslon, povlecite z levega roba do sredine zaslona."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Povlecite z leve za pomik nazaj."</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Če se želite vrniti na zadnji prikazani zaslon, povlecite z levega roba do sredine zaslona."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pazite, da povlečete s spodnjega roba zaslona navzgor."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pazite, da ne zaustavite prsta, preden ga dvignete."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pazite, da povlečete naravnost navzgor."</string>
diff --git a/quickstep/res/values-sq/strings.xml b/quickstep/res/values-sq/strings.xml
index 2097f35424..3582082828 100644
--- a/quickstep/res/values-sq/strings.xml
+++ b/quickstep/res/values-sq/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplikacioni i parashikuar: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Sigurohu që të rrëshqasësh shpejt nga skaji sa më majtas."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Sigurohu që të rrëshqasësh shpejt nga skaji i majtë drejt mesit të ekranit dhe lëshoje."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Bukur! Tani rrëshqit shpejt nga e djathta për t\'u kthyer prapa"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Mund dhe të kthehesh në ekranin e fundit duke rrëshqitur shpejt nga skaji i djathtë në mes të ekranit."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Mund dhe të kthehesh në ekranin e fundit duke rrëshqitur shpejt nga skaji i djathtë në mes të ekranit."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Sigurohu që të rrëshqasësh shpejt nga skaji sa më djathtas."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Sigurohu që të rrëshqasësh shpejt nga skaji i djathtë drejt mesit të ekranit dhe lëshoje."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"E ke përfunduar gjestin e kthimit prapa. Në vijim do të mësosh se si t\'i ndërrosh aplikacionet."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"E ke përfunduar gjestin e kthimit prapa. Në vijim do të mësosh se si t\'i ndërrosh aplikacionet."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"E ke përfunduar gjestin e kthimit prapa."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Sigurohu që të mos rrëshqasësh shumë afër fundit të ekranit."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Për të ndryshuar ndjeshmërinë e gjestit të kthimit prapa, shko te \"Cilësimet\""</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Rrëshqit shpejt nga e majta për t\'u kthyer prapa"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Për t\'u kthyer në ekranin e fundit ku ishe, rrëshqit shpejt nga skaji i majtë në mes të ekranit."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Rrëshqit shpejt nga e majta për t\'u kthyer prapa"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Për t\'u kthyer në ekranin e fundit ku ishe, rrëshqit shpejt nga skaji i majtë në mes të ekranit."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Sigurohu që të rrëshqasësh shpejt lart nga skaji i poshtëm i ekranit."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Sigurohu që të mos ndalosh para se ta lëshosh."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Sigurohu që të rrëshqasësh shpejt drejt lart."</string>
diff --git a/quickstep/res/values-sr/strings.xml b/quickstep/res/values-sr/strings.xml
index 58ccab1ba1..6a18169d52 100644
--- a/quickstep/res/values-sr/strings.xml
+++ b/quickstep/res/values-sr/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Предвиђамо апликацију: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Обавезно превуците од саме леве ивице."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Обавезно превуците од леве ивице до средине екрана и отпустите."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Свака част! Сада превуците здесна да бисте се вратили"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Вратите се на последњи екран превлачењем здесна ка средини."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Вратите се на последњи екран превлачењем здесна ка средини."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Обавезно превуците од саме десне ивице."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Обавезно превуците од десне ивице до средине екрана и отпустите."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Довршили сте покрет за повратак. Сада сазнајте како да промените апликације."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Довршили сте покрет за повратак. Сада сазнајте како да промените апликације."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Довршили сте покрет за повратак."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Никако не превлачите превише близу дна екрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Осетљивост пок. за назад можете да промените у Подешавањима"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Превуците са леве стране да бисте се вратили"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Да бисте се вратили на последњи екран, превуците од леве ивице ка средини екрана."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Превуците са леве стране да бисте се вратили"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Да бисте се вратили на последњи екран, превуците од леве ивице ка средини екрана."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Обавезно превуците нагоре од доње ивице екрана."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Никако не стајте пре отпуштања."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Обавезно превуците право нагоре."</string>
diff --git a/quickstep/res/values-sv/strings.xml b/quickstep/res/values-sv/strings.xml
index 2f8f8cf4ff..d9b5648972 100644
--- a/quickstep/res/values-sv/strings.xml
+++ b/quickstep/res/values-sv/strings.xml
@@ -47,9 +47,7 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Appförslag: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Se till att du sveper ända från vänsterkanten."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Se till att du sveper från den vänstra kanten till mitten av skärmen och sedan släpper."</string>
-    <!-- no translation found for back_gesture_feedback_title_complete_left_edge (1381455921760094003) -->
     <skip />
-    <!-- no translation found for back_gesture_feedback_subtitle_complete_left_edge (8106594510099968430) -->
     <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Se till att du sveper ända från högerkanten."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Se till att du sveper från den högra kanten till mitten av skärmen och sedan släpper."</string>
diff --git a/quickstep/res/values-sw/strings.xml b/quickstep/res/values-sw/strings.xml
index 1d5c77efa3..8670339cd6 100644
--- a/quickstep/res/values-sw/strings.xml
+++ b/quickstep/res/values-sw/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Programu iliyotabiriwa: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Hakikisha unatelezesha kidole kuanzia ukingo wa mbali wa kushoto."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Hakikisha unatelezesha kidole kuanzia ukingo wa kushoto kuelekea katikati ya skrini na uachilie."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Safi! Sasa telezesha kidole kuanzia kulia ili urudi nyuma"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Unaweza pia kurudi kwenye skrini iliyotangulia kwa kutelezesha kidole kuanzia ukingo wa kulia kuelekea katikati ya skrini."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Unaweza pia kurudi kwenye skrini iliyotangulia kwa kutelezesha kidole kuanzia ukingo wa kulia kuelekea katikati ya skrini."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Hakikisha unatelezesha kidole kuanzia ukingo wa mbali wa kulia."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Hakikisha unatelezesha kidole kuanzia ukingo wa kulia kuelekea katikati ya skrini na uachilie."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Umekamilisha ishara ya kurudi nyuma. Hatua inayofuata, jifunze jinsi ya kubadilisha programu."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Umekamilisha ishara ya kurudi nyuma. Hatua inayofuata, jifunze jinsi ya kubadilisha programu."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Umekamilisha ishara ya kurudi nyuma."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Hakikisha hutelezeshi kidole karibu sana na sehemu ya chini ya skrini."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Kubadilisha hisi ya ishara ya nyuma, nenda kwenye Mipangilio"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Telezesha kidole kutoka kushoto ili urudi nyuma"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Ili urudi kwenye skrini iliyotangulia, telezesha kidole kuanzia ukingo wa kushoto kuelekea katikati ya skrini."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Telezesha kidole kutoka kushoto ili urudi nyuma"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Ili urudi kwenye skrini iliyotangulia, telezesha kidole kuanzia ukingo wa kushoto kuelekea katikati ya skrini."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Hakikisha unatelezesha kidole juu kuanzia ukingo wa chini wa skrini."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Hakikisha kuwa husimamishi kabla ya kuachilia."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Hakikisha unatelezesha kidole kuelekea juu."</string>
diff --git a/quickstep/res/values-ta/strings.xml b/quickstep/res/values-ta/strings.xml
index a86446aa9e..8867c00de8 100644
--- a/quickstep/res/values-ta/strings.xml
+++ b/quickstep/res/values-ta/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"கணித்த ஆப்ஸ்: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"இடது ஓரத்தின் விளிம்பிலிருந்து ஸ்வைப் செய்கிறீர்கள் என்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"இடது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்தபிறகு விடுவிப்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"அருமை! பின்செல்வதற்கு வலதுபுறத்திலிருந்து ஸ்வைப் செய்யுங்கள்"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"வலது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்தும் முந்தைய திரைக்கு மீண்டும் செல்லலாம்."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"வலது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்தும் முந்தைய திரைக்கு மீண்டும் செல்லலாம்."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"வலது ஓரத்தின் விளிம்பிலிருந்து ஸ்வைப் செய்கிறீர்கள் என்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"வலது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்தபிறகு விடுவிப்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"பின்செல் சைகைப் பயிற்சியை முடித்துவிட்டீர்கள். அடுத்து, ஆப்ஸுக்கிடையே மாறுவது எப்படி என்பதை அறிக."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"பின்செல் சைகைப் பயிற்சியை முடித்துவிட்டீர்கள். அடுத்து, ஆப்ஸுக்கிடையே மாறுவது எப்படி என்பதை அறிக."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"பின்செல் சைகைப் பயிற்சியை முடித்துவிட்டீர்கள்."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"திரையின் கீழ்பகுதிக்கு மிக நெருக்கமாக ஸ்வைப் செய்யவில்லை என்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"பின்செல் சைகையின் உணர்திறனை மாற்ற அமைப்புகளுக்குச் செல்க"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"பின்செல்வதற்கு இடதுபுறத்திலிருந்து ஸ்வைப் செய்யுங்கள்"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"முந்தைய திரைக்கு மீண்டும் செல்ல, இடது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்யுங்கள்."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"பின்செல்வதற்கு இடதுபுறத்திலிருந்து ஸ்வைப் செய்யுங்கள்"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"முந்தைய திரைக்கு மீண்டும் செல்ல, இடது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்யுங்கள்."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"திரையின் கீழ் ஓரத்திலிருந்து மேல்நோக்கி ஸ்வைப் செய்வதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"விடுவிப்பதற்கு முன்பாக இடைநிறுத்தவில்லை என்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"மேல்நோக்கி நேராக ஸ்வைப் செய்வதை உறுதிசெய்துகொள்ளுங்கள்."</string>
diff --git a/quickstep/res/values-te/strings.xml b/quickstep/res/values-te/strings.xml
index 5d23cc07b6..be50c9cb15 100644
--- a/quickstep/res/values-te/strings.xml
+++ b/quickstep/res/values-te/strings.xml
@@ -47,8 +47,7 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"సూచించబడిన యాప్: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"మీరు చాలా-ఎడమ అంచు నుండి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"మీరు ఎడమ అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేశారని నిర్ధారించుకోని, ఆపై మీ వేలిని ఎత్తండి."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"బాగుంది! ఇప్పుడు తిరిగి వెళ్ళడానికి కుడి నుండి స్వైప్ చేయండి"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"కుడి అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేయడం ద్వారా మీరు చివరి స్క్రీన్‌కు తిరిగి వెళ్ళవచ్చు."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"కుడి అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేయడం ద్వారా మీరు చివరి స్క్రీన్‌కు తిరిగి వెళ్ళవచ్చు."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"మీరు చాలా-కుడి అంచు నుండి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"మీరు కుడి అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేశారని నిర్ధారించుకోని, ఆపై మీ వేలిని ఎత్తండి."</string>
     <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"మీరు తిరిగి వెనక్కు వెళ్లే సంజ్ఞను పూర్తి చేశారు. తర్వాత, యాప్‌ల మధ్య ఎలా మారాలో తెలుసుకోండి."</string>
@@ -56,7 +55,7 @@
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"మీరు స్క్రీన్ దిగువకు చాలా దగ్గరగా స్వైప్ చేయలేదని నిర్ధారించుకోండి."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"వెనుక సంజ్ఞ సున్నితత్వం మార్చడానికి, సెట్టింగ్‌లకు వెళ్లండి"</string>
     <string name="back_gesture_intro_title" msgid="5538727561353262952">"వెనుకకు వెళ్లడానికి ఎడమ వైపు నుండి స్వైప్ చేయండి"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"మీరు ఉన్న చివరి స్క్రీన్‌కు తిరిగి వెళ్లడానికి, ఎడమ అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేయండి."</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"మీరు ఉన్న చివరి స్క్రీన్‌కు తిరిగి వెళ్లడానికి, ఎడమ అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేయండి."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"మీరు స్క్రీన్ దిగువ అంచు నుండి పైకి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"బయలుదేరే ముందు మీరు పాజ్ చేయకుండా చూసుకోండి."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"మీరు నేరుగా పైకి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
diff --git a/quickstep/res/values-th/strings.xml b/quickstep/res/values-th/strings.xml
index 6dc5504bd9..c413e4edd2 100644
--- a/quickstep/res/values-th/strings.xml
+++ b/quickstep/res/values-th/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"แอปที่คาดว่าจะใช้: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ตรวจสอบว่าปัดจากขอบด้านซ้ายสุด"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ตรวจสอบว่าปัดจากขอบด้านซ้ายไปตรงกลางหน้าจอ แล้วยกนิ้วขึ้น"</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"ดีมาก ทีนี้ปัดจากด้านขวาเพื่อย้อนกลับ"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"หรือจะกลับไปหน้าจอล่าสุดโดยปัดจากขอบขวาไปตรงกลางหน้าจอก็ได้"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"หรือจะกลับไปหน้าจอล่าสุดโดยปัดจากขอบขวาไปตรงกลางหน้าจอก็ได้"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ตรวจสอบว่าปัดจากขอบด้านขวาสุด"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ตรวจสอบว่าปัดจากขอบด้านขวาไปตรงกลางหน้าจอ แล้วยกนิ้วขึ้น"</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"คุณทำท่าทางสัมผัสเพื่อย้อนกลับเสร็จแล้ว ต่อไปดูวิธีสลับแอป"</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"คุณทำท่าทางสัมผัสเพื่อย้อนกลับเสร็จแล้ว ต่อไปดูวิธีสลับแอป"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"คุณทำท่าทางสัมผัสเพื่อย้อนกลับเสร็จแล้ว"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ตรวจสอบว่าไม่ได้ปัดใกล้กับด้านล่างของหน้าจอมากเกินไป"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"เปลี่ยนความไวของท่าทางสัมผัสเพื่อย้อนกลับได้ที่การตั้งค่า"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"ปัดจากด้านซ้ายเพื่อย้อนกลับ"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"หากต้องการย้อนกลับไปที่หน้าจอล่าสุดที่เปิด ให้ปัดจากขอบด้านซ้ายไปตรงกลางหน้าจอ"</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"ปัดจากด้านซ้ายเพื่อย้อนกลับ"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"หากต้องการย้อนกลับไปที่หน้าจอล่าสุดที่เปิด ให้ปัดจากขอบด้านซ้ายไปตรงกลางหน้าจอ"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ตรวจสอบว่าปัดขึ้นจากขอบด้านล่างของหน้าจอ"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ตรวจสอบว่าไม่มีการหยุดชั่วคราวก่อนยกนิ้วขึ้น"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ตรวจสอบว่าปัดขึ้นในแนวตรง"</string>
diff --git a/quickstep/res/values-tl/strings.xml b/quickstep/res/values-tl/strings.xml
index 2ca59e7f91..b9260dca0d 100644
--- a/quickstep/res/values-tl/strings.xml
+++ b/quickstep/res/values-tl/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Hinulaang app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Tiyaking magsa-swipe ka mula sa pinakadulo sa kaliwa."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Tiyaking mag-swipe mula sa kaliwang gilid papunta sa gitna ng screen, saka iangat ang iyong daliri."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Magaling! Ngayon, mag-swipe mula sa kanan para bumalik"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Puwede ka ring mag-swipe mula sa kanan papunta sa gitna para bumalik sa nakaraang screen."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Puwede ka ring mag-swipe mula sa kanan papunta sa gitna para bumalik sa nakaraang screen."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Tiyaking magsa-swipe ka mula sa pinakadulo sa kanan."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Tiyaking mag-swipe mula sa kanang gilid papunta sa gitna ng screen, saka iangat ang iyong daliri."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Nakumpleto mo na ang galaw para bumalik. Susunod, alamin kung paano magpalipat-lipat sa mga app."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Nakumpleto mo na ang galaw para bumalik. Susunod, alamin kung paano magpalipat-lipat sa mga app."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Nakumpleto mo na ang galaw para bumalik."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Tiyaking hindi ka magsa-swipe nang masyadong malapit sa ibaba ng screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Pumunta sa Settings para baguhin ang sensitivity ng pagbalik"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Mag-swipe mula sa kaliwa para bumalik"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Mag-swipe mula sa kaliwang gilid papunta sa gitna para bumalik sa nakaraang screen na pinuntahan mo."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Mag-swipe mula sa kaliwa para bumalik"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Mag-swipe mula sa kaliwang gilid papunta sa gitna para bumalik sa nakaraang screen na pinuntahan mo."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Tiyaking magsa-swipe ka pataas mula sa pinakaibaba ng screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Tiyaking hindi ka magpo-pause bago iangat ang iyong daliri."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Tiyaking magsa-swipe ka nang diretso pataas."</string>
diff --git a/quickstep/res/values-tr/strings.xml b/quickstep/res/values-tr/strings.xml
index 3a235104ca..9db5e4abc9 100644
--- a/quickstep/res/values-tr/strings.xml
+++ b/quickstep/res/values-tr/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Tahmin edilen uygulama: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Ekranın en solundan kaydırdığınızdan emin olun."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Sol kenardan ekranın ortasına doğru kaydırıp bıraktığınızdan emin olun."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Güzel! Şimdi geri gitmek için sağdan kaydırın"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"İsterseniz sağ kenardan ekranın ortasına kaydırarak son ekrana dönebilirsiniz."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"İsterseniz sağ kenardan ekranın ortasına kaydırarak son ekrana dönebilirsiniz."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Ekranın en sağından kaydırdığınızdan emin olun."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Sağ kenardan ekranın ortasına doğru kaydırıp bıraktığınızdan emin olun."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Geri dön hareketini tamamladınız. Sırada, uygulamalar arasında geçiş yapmayı öğrenmek var."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Geri dön hareketini tamamladınız. Sırada, uygulamalar arasında geçiş yapmayı öğrenmek var."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Geri dön hareketini tamamladınız."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ekranın alt kısmına çok yakın bir şekilde kaydırmadığınızdan emin olun."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Geri hareketinin hassasiyetini değiştirmek için Ayarlar\'a gidin"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Geri gitmek için soldan kaydırın"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Görüntülediğiniz son ekrana dönmek için sol kenardan ekranın ortasına kaydırın."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Geri gitmek için soldan kaydırın"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Görüntülediğiniz son ekrana dönmek için sol kenardan ekranın ortasına kaydırın."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Ekranın alt kenarından yukarı kaydırdığınızdan emin olun."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Bırakmadan önce parmağınızı duraklatmadığınızdan emin olun."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Düz bir şekilde yukarı kaydırdığınızdan emin olun."</string>
diff --git a/quickstep/res/values-uk/strings.xml b/quickstep/res/values-uk/strings.xml
index 8812faa925..37c8802c10 100644
--- a/quickstep/res/values-uk/strings.xml
+++ b/quickstep/res/values-uk/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Передбачений додаток: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Проведіть пальцем саме від лівого краю екрана."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Проведіть пальцем від лівого краю до середини екрана й підніміть палець."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Чудово! Щоб повернутися, проведіть пальцем справа наліво"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Щоб повернутися, проведіть пальцем справа до середини."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Щоб повернутися, проведіть пальцем справа до середини."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Проведіть пальцем саме від правого краю екрана."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Проведіть пальцем від правого краю до середини екрана й підніміть палець."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Ви виконали жест \"Назад\". Тепер дізнайтеся, як переходити між додатками."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Ви виконали жест \"Назад\". Тепер дізнайтеся, як переходити між додатками."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ви виконали жест \"Назад\"."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Не проводьте пальцем надто близько до нижнього краю екрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Щоб змінити чутливість жесту \"Назад\", відкрийте налаштування"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Щоб повернутися, проведіть пальцем зліва направо"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Щоб перейти на попередній екран, проведіть пальцем від лівого краю до середини екрана."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Щоб повернутися, проведіть пальцем зліва направо"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Щоб перейти на попередній екран, проведіть пальцем від лівого краю до середини екрана."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Проведіть пальцем угору від нижнього краю екрана."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Не робіть паузу перед тим, як відірвати палець від екрана."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Проводьте пальцем вертикально вгору."</string>
diff --git a/quickstep/res/values-ur/strings.xml b/quickstep/res/values-ur/strings.xml
index 871a628632..425f498774 100644
--- a/quickstep/res/values-ur/strings.xml
+++ b/quickstep/res/values-ur/strings.xml
@@ -47,8 +47,7 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"پیشن گوئی کردہ ایپ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"اس بات کو یقینی بنائیں کہ آپ بائیں کنارے سے دور سے سوائپ کریں۔"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"یقینی طور پر بائیں کنارے سے اسکرین کے وسط تک سوائپ کریں اور پھر اپنی انگلی اٹھا لیں۔"</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"عمدہ! اب واپس جانے کے لیے دائیں کنارے سے سوائپ کریں"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"آپ دائیں کنارے سے اسکرین کے وسط تک سوائپ کر کے پچھلی اسکرین پر واپس بھی جا سکتے ہیں۔"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"آپ دائیں کنارے سے اسکرین کے وسط تک سوائپ کر کے پچھلی اسکرین پر واپس بھی جا سکتے ہیں۔"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"اس بات کو یقینی بنائیں کہ آپ دائیں کنارے سے دور سے سوائپ کریں۔"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"یقینی طور پر دائیں کنارے سے اسکرین کے وسط تک سوائپ کریں اور پھر اپنی انگلی اٹھا لیں۔"</string>
     <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"آپ نے واپس جائیں اشارے کو مکمل کر لیا۔ اس کے بعد ایپس سوئچ کرنے کا طریقہ جانیں۔"</string>
@@ -56,7 +55,7 @@
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"اس بات کو یقینی بنائیں کہ آپ اسکرین کے نچلے حصے سے زیادہ قریب سے سوائپ نہ کریں۔"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"پچھلے اشارے کی حساسیت تبدیل کرنے کے لیے ترتیبات پر جائیں"</string>
     <string name="back_gesture_intro_title" msgid="5538727561353262952">"واپس جانے کے لیے بائیں کنارے سے سوائپ کریں"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"پچھلی اسکرین جس پر آپ تھے اس پر واپس جانے کے لیے بائیں کنارے سے اسکرین کے وسط تک سوائپ کریں۔"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"پچھلی اسکرین جس پر آپ تھے اس پر واپس جانے کے لیے بائیں کنارے سے اسکرین کے وسط تک سوائپ کریں۔"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"اس بات کو یقینی بنائیں کہ آپ اسکرین کے نچلے کنارے سے اوپر کی طرف سوائپ کریں۔"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"اس بات کو یقینی بنائیں کہ آپ اپنی انگلی اوپر اٹھانے سے پہلے موقوف نہ کریں۔"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"اس بات کو یقینی بنائیں کہ آپ سیدھا اوپر کی طرف سوائپ کریں۔"</string>
diff --git a/quickstep/res/values-uz/strings.xml b/quickstep/res/values-uz/strings.xml
index c1b1262bbc..d046eb2fa4 100644
--- a/quickstep/res/values-uz/strings.xml
+++ b/quickstep/res/values-uz/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Taklif etilgan ilova: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Barmoqni chapdagi eng chekkadan suring."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Barmoqni ekranning chap chetidan oʻrtasigacha suring va ekrandan uzing."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Yaxshi! Endi orqaga qaytish uchun oʻngdan suring"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Shuningdek, oʻng chetdan ekran oʻrtasiga surish orqali ham oxirgi ekranga qaytish mumkin."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Shuningdek, oʻng chetdan ekran oʻrtasiga surish orqali ham oxirgi ekranga qaytish mumkin."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Barmoqni oʻngdagi eng chekkadan suring."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Barmoqni ekranning oʻng chetidan oʻrtasigacha suring va ekrandan uzing."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Ortga qaytish ishorasi darsini tamomladingiz. Endi ilovalarni almashtirishni oʻrganamiz."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Ortga qaytish ishorasi darsini tamomladingiz. Endi ilovalarni almashtirishni oʻrganamiz."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ortga qaytish ishorasi darsini tamomladingiz."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Barmoqni ekran pastiga yaqin surmaslikka harakat qiling."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Orqaga ishorasi sezuvchanligi Sozlamalardan oʻzgartiriladi"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Orqaga qaytish uchun chapdan suring"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Oxirgi ekranga qaytish uchun barmoqni ekranning chap chekkasidan oʻrtasigacha suring."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Orqaga qaytish uchun chapdan suring"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Oxirgi ekranga qaytish uchun barmoqni ekranning chap chekkasidan oʻrtasigacha suring."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Barmoqni ekranning pastki chetidan yuqoriga suring."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Barmoqni ekrandan pauzasiz qoʻyib uzing."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Barmoqni tik tepaga suring."</string>
diff --git a/quickstep/res/values-vi/strings.xml b/quickstep/res/values-vi/strings.xml
index 836f89d330..9f6eff9750 100644
--- a/quickstep/res/values-vi/strings.xml
+++ b/quickstep/res/values-vi/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Ứng dụng dự đoán: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Hãy vuốt từ mép ngoài cùng bên trái."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Hãy vuốt từ mép trái tới chính giữa màn hình rồi nhấc ngón tay."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Tuyệt vời! Bây giờ, hãy vuốt từ mép phải để quay lại"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Bạn cũng có thể vuốt từ mép phải tới chính giữa màn hình để quay lại màn hình gần đây nhất."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Bạn cũng có thể vuốt từ mép phải tới chính giữa màn hình để quay lại màn hình gần đây nhất."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Hãy vuốt từ mép ngoài cùng bên phải."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Hãy vuốt từ mép phải tới chính giữa màn hình rồi nhấc ngón tay."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Bạn đã thực hiện xong cử chỉ quay lại. Tiếp theo, hãy tìm hiểu cách chuyển đổi ứng dụng."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Bạn đã thực hiện xong cử chỉ quay lại. Tiếp theo, hãy tìm hiểu cách chuyển đổi ứng dụng."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Bạn đã thực hiện xong cử chỉ quay lại."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Hãy nhớ không được vuốt quá gần phần cuối màn hình."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Để thay đổi độ nhạy của cử chỉ quay lại, hãy vào mục Cài đặt"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Vuốt từ mép trái để quay lại"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Để quay lại màn hình gần đây nhất mà bạn xem, hãy vuốt từ mép trái tới chính giữa màn hình."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Vuốt từ mép trái để quay lại"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Để quay lại màn hình gần đây nhất mà bạn xem, hãy vuốt từ mép trái tới chính giữa màn hình."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Hãy vuốt lên từ mép dưới cùng của màn hình."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Hãy nhớ không được tạm dừng trước khi nhấc ngón tay."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Hãy vuốt thẳng lên."</string>
diff --git a/quickstep/res/values-zh-rCN/strings.xml b/quickstep/res/values-zh-rCN/strings.xml
index 53499e2fc4..e117c0a60b 100644
--- a/quickstep/res/values-zh-rCN/strings.xml
+++ b/quickstep/res/values-zh-rCN/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"预测的应用：<xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"请从最左侧边缘开始滑动。"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"请从左侧边缘滑动到屏幕中间位置后再松开手指。"</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"太好了！现在从右侧向左滑动手指即可返回"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"如要返回上一个屏幕，您也可以从右侧边缘滑动到屏幕中间位置。"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"如要返回上一个屏幕，您也可以从右侧边缘滑动到屏幕中间位置。"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"请从最右侧边缘开始滑动。"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"请从右侧边缘滑动到屏幕中间位置后再松开手指。"</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"您完成了“返回”手势教程。接下来了解如何切换应用。"</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"您完成了“返回”手势教程。接下来了解如何切换应用。"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"您完成了“返回”手势教程。"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"滑动时，手的位置不要太靠近屏幕底部。"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"如要调节“返回”手势的灵敏度，请转到“设置”"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"从左侧向右滑动手指即可返回"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"如要返回您查看过的上一个屏幕，请从左侧边缘滑动到屏幕中间位置。"</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"从左侧向右滑动手指即可返回"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"如要返回您查看过的上一个屏幕，请从左侧边缘滑动到屏幕中间位置。"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"请从屏幕底部边缘向上滑动。"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"在松开手指前请勿停下来。"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"请向上滑动。"</string>
diff --git a/quickstep/res/values-zh-rHK/strings.xml b/quickstep/res/values-zh-rHK/strings.xml
index a8b8fc5225..01d57488f0 100644
--- a/quickstep/res/values-zh-rHK/strings.xml
+++ b/quickstep/res/values-zh-rHK/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"預測應用程式：<xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"請從螢幕左側邊緣滑動。"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"請從螢幕左側邊緣往中央滑動，然後放開手指。"</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"太好了！現在只要從螢幕右側往左滑動即可返回"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"從螢幕右側往中央滑動亦可返回上一個畫面。"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"從螢幕右側往中央滑動亦可返回上一個畫面。"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"請從螢幕右側邊緣滑動。"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"請從螢幕右側邊緣往中央滑動，然後放開手指"</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"您已完成「返回」手勢的教學課程。接下來一起瞭解如何切換應用程式。"</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"您已完成「返回」手勢的教學課程。接下來一起瞭解如何切換應用程式。"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"您已完成「返回」手勢的教學課程。"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"滑動時，手的位置不要太接近螢幕底部。"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"如要變更「返回」手勢的敏感度，請前往「設定」"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"從螢幕左側往右滑動即可返回"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"如要返回上一個畫面，請從螢幕左側往中央滑動。"</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"從螢幕左側往右滑動即可返回"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"如要返回上一個畫面，請從螢幕左側往中央滑動。"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"請從螢幕底部邊緣向上滑動。"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"放開手指前請勿停下來。"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"請向上滑動。"</string>
diff --git a/quickstep/res/values-zh-rTW/strings.xml b/quickstep/res/values-zh-rTW/strings.xml
index 8d47ace777..b21cacded8 100644
--- a/quickstep/res/values-zh-rTW/strings.xml
+++ b/quickstep/res/values-zh-rTW/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"預測的應用程式：<xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"請從螢幕左側邊緣滑動。"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"請從螢幕左側邊緣往中央滑動，然後放開手指。"</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"太好了！現在只要從螢幕右側往左滑動即可返回"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"從螢幕右側往中央滑動也可返回上一個畫面。"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"從螢幕右側往中央滑動也可返回上一個畫面。"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"請從螢幕右側邊緣滑動。"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"請從螢幕右側邊緣往中央滑動，然後放開手指。"</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"你已完成「返回」手勢的教學課程。接著，一起來瞭解如何切換應用程式。"</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"你已完成「返回」手勢的教學課程。接著，一起來瞭解如何切換應用程式。"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"你已完成「返回」手勢的教學課程。"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"滑動時，手的位置不要太接近螢幕底部。"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"如要變更「返回」手勢的敏感度，請前往「設定」"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"從螢幕左側往右滑動即可返回"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"如要返回先前的畫面，請從螢幕左側往中央滑動。"</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"從螢幕左側往右滑動即可返回"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"如要返回先前的畫面，請從螢幕左側往中央滑動。"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"請從螢幕底部邊緣向上滑動。"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"放開手指前請勿停下來。"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"請向上滑動。"</string>
diff --git a/quickstep/res/values-zu/strings.xml b/quickstep/res/values-zu/strings.xml
index 212e77c60c..469a424a59 100644
--- a/quickstep/res/values-zu/strings.xml
+++ b/quickstep/res/values-zu/strings.xml
@@ -47,16 +47,15 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Uhlelo lokusebenza olubikezelwe: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Qiniseka ukuthi uswayiphela ekudeni emngceleni ongakwesobunxele."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Qiniseka ukuthi uswayipha kusuka emngceleni okwesobunxele kuya phakathi kwesikrini bese uyadedela."</string>
-    <string name="back_gesture_feedback_title_complete_left_edge" msgid="1381455921760094003">"Kuhle! Manje swayipha kusuka kwesokudla ukuze uye emuva"</string>
-    <string name="back_gesture_feedback_subtitle_complete_left_edge" msgid="8106594510099968430">"Futhi ungabuyela emuva esikrinini sangaphambilini ngokuswayipha kusuka kunqenqema langakwesokudla ukuya maphakathi nesikrini."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Futhi ungabuyela emuva esikrinini sangaphambilini ngokuswayipha kusuka kunqenqema langakwesokudla ukuya maphakathi nesikrini."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Qiniseka ukuthi uswayiphela ekudeni emngceleni ongakwesokudla."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Qiniseka ukuthi uswayipha kusuka emngceleni okwesokudla kuya phakathi kwesikrini bese uyadedela."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Ukuqedile ukuthinta kokubuyela emuva. Ngokulandelayo, funda indlela yokushintsha ama-app."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Ukuqedile ukuthinta kokubuyela emuva. Ngokulandelayo, funda indlela yokushintsha ama-app."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ukuqedile ukuthinta kokubuyela emuva."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Qiniseka ukuba awuswayipheli eduze kakhulu naphansi kwesikrini."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Ukuze ushintshe ukuzwela kokuthinta emuva, iya Kumasethingi"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Swayipha kusuka kwesobunxele ukuze ubuyele emuva"</string>
-    <string name="back_gesture_intro_subtitle" msgid="8139048712004626940">"Ukuze ubuyele esikrinini sangaphambilini lapho ubukade ukhona, swayipha kusuka kunqenqema lwesokunxele ukuya maphakathi nesikrini."</string>
+    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Swayipha kusuka kwesobunxele ukuze ubuyele emuva"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Ukuze ubuyele esikrinini sangaphambilini lapho ubukade ukhona, swayipha kusuka kunqenqema lwesokunxele ukuya maphakathi nesikrini."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Qiniseka ukuthi uswayiphela phezulu kusuka emngceleni ophansi wesikrini."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Qiniseka ukuthi awumisi ngaphambi kokudedela."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Qiniseka ukuthi uswayiphela ngqo phezulu."</string>
diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml
index 3f75d324ea..281f735f8f 100644
--- a/quickstep/res/values/strings.xml
+++ b/quickstep/res/values/strings.xml
@@ -95,16 +95,14 @@
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge">Make sure you swipe from the far-left edge.</string>
     <!-- Feedback shown during interactive parts of Back gesture tutorial for left edge when the gesture is cancelled. [CHAR LIMIT=100] -->
     <string name="back_gesture_feedback_cancelled_left_edge">Make sure you swipe from the left edge to the middle of the screen and let go.</string>
-    <!-- Feedback title shown after completing the left back gesture before continuing on to the right edge. [CHAR LIMIT=60] -->
-    <string name="back_gesture_feedback_title_complete_left_edge">Nice! Now swipe from the right to go back</string>
-    <!-- Feedback subtitle shown after completing the left back gesture before continuing on to the right edge. [CHAR LIMIT=200] -->
-    <string name="back_gesture_feedback_subtitle_complete_left_edge">You can also go back to the last screen by swiping from the right edge to the middle of the screen.</string>
     <!-- Feedback shown during interactive parts of Back gesture tutorial for right edge when the gesture is too far from the edge. [CHAR LIMIT=100] -->
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge">Make sure you swipe from the far-right edge.</string>
     <!-- Feedback shown during interactive parts of Back gesture tutorial for right edge when the gesture is cancelled. [CHAR LIMIT=100] -->
     <string name="back_gesture_feedback_cancelled_right_edge">Make sure you swipe from the right edge to the middle of the screen and let go.</string>
     <!-- Feedback shown after completing the back gesture step if the user is following the full gesture tutorial flow. [CHAR LIMIT=100] -->
-    <string name="back_gesture_feedback_complete_with_follow_up">You completed the go back gesture. Next up, learn how to switch apps.</string>
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up">You learned how to swipe from the left to go back.</string>
+    <!-- Feedback shown after completing the back gesture step if the user is following the full gesture tutorial flow. [CHAR LIMIT=100] -->
+    <string name="back_gesture_feedback_complete_with_overview_follow_up">You learned how to swipe from the right to go back. Next up, learn how to switch apps.</string>
     <!-- Feedback shown after completing the back gesture step if the user started this tutorial individually. [CHAR LIMIT=100] -->
     <string name="back_gesture_feedback_complete_without_follow_up">You completed the go back gesture.</string>
     <!-- Feedback shown during interactive parts of Back gesture tutorial when the gesture is within the nav bar region. [CHAR LIMIT=100] -->
@@ -112,10 +110,14 @@
     <!-- Subtitle shown on the confirmation screen after successful gesture. [CHAR LIMIT=60] -->
     <string name="back_gesture_tutorial_confirm_subtitle">To change the sensitivity of the back gesture, go to Settings</string>
     <!-- Feedback shown during interactive parts of Home gesture tutorial when the gesture is started too far from the edge. [CHAR LIMIT=100] -->
-    <!-- Introduction title for the Back gesture tutorial. [CHAR LIMIT=100] -->
-    <string name="back_gesture_intro_title">Swipe from the left to go back</string>
-    <!-- Introduction subtitle for the Back gesture tutorial. [CHAR LIMIT=100] -->
-    <string name="back_gesture_intro_subtitle">To go back to the last screen you were on, swipe from the left edge to the middle of the screen.</string>
+    <!-- Introduction title for the left edge Back gesture tutorial. [CHAR LIMIT=100] -->
+    <string name="back_left_gesture_intro_title">Swipe from the left to go back</string>
+    <!-- Introduction title for the right edge Back gesture tutorial. [CHAR LIMIT=100] -->
+    <string name="back_right_gesture_intro_title">Swipe from the right to go back</string>
+    <!-- Introduction subtitle for the Back left gesture tutorial. [CHAR LIMIT=200] -->
+    <string name="back_left_gesture_intro_subtitle">To go back to the last screen you were on, swipe from the left edge to the middle of the screen.</string>
+    <!-- Introduction subtitle for the Back right gesture tutorial. [CHAR LIMIT=100] -->
+    <string name="back_right_gesture_intro_subtitle">You can also go back to the last screen by swiping from the right edge to the middle of the screen. Try it now.</string>
 
     <string name="home_gesture_feedback_swipe_too_far_from_edge">Make sure you swipe up from the bottom edge of the screen.</string>
     <!-- Feedback shown during interactive parts of Home gesture tutorial when the Overview gesture is detected. [CHAR LIMIT=100] -->
diff --git a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
index a0fb51c432..ab42a2bd04 100644
--- a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
@@ -37,13 +37,14 @@ final class BackGestureTutorialController extends TutorialController {
     @Override
     public Integer getIntroductionTitle() {
         return mTutorialType == LEFT_EDGE_BACK_NAVIGATION
-                ? R.string.back_gesture_intro_title : null;
+                ? R.string.back_left_gesture_intro_title : R.string.back_right_gesture_intro_title;
     }
 
     @Override
     public Integer getIntroductionSubtitle() {
         return mTutorialType == LEFT_EDGE_BACK_NAVIGATION
-                ? R.string.back_gesture_intro_subtitle : null;
+                ? R.string.back_left_gesture_intro_subtitle
+                : R.string.back_right_gesture_intro_subtitle;
     }
 
     @Override
@@ -53,6 +54,9 @@ final class BackGestureTutorialController extends TutorialController {
 
     @Override
     public void onBackGestureAttempted(BackGestureResult result) {
+        if (mGestureCompleted) {
+            return;
+        }
         switch (mTutorialType) {
             case RIGHT_EDGE_BACK_NAVIGATION:
                 handleAttemptFromRight(result);
@@ -76,9 +80,9 @@ final class BackGestureTutorialController extends TutorialController {
                 hideFeedback(true);
                 mFakeTaskView.setBackground(AppCompatResources.getDrawable(mContext,
                         R.drawable.mock_conversations_list));
-                int subtitleResId = mTutorialFragment.getNumSteps() == 1
+                int subtitleResId = mTutorialFragment.isAtFinalStep()
                         ? R.string.back_gesture_feedback_complete_without_follow_up
-                        : R.string.back_gesture_feedback_complete_with_follow_up;
+                        : R.string.back_gesture_feedback_complete_with_overview_follow_up;
                 showFeedback(subtitleResId, true);
                 break;
             case BACK_CANCELLED_FROM_RIGHT:
@@ -102,10 +106,10 @@ final class BackGestureTutorialController extends TutorialController {
                 hideFeedback(true);
                 mFakeTaskView.setBackground(AppCompatResources.getDrawable(mContext,
                         R.drawable.mock_conversations_list));
-                showFeedback(
-                        R.string.back_gesture_feedback_title_complete_left_edge,
-                        R.string.back_gesture_feedback_subtitle_complete_left_edge,
-                        () -> mTutorialFragment.changeController(RIGHT_EDGE_BACK_NAVIGATION));
+                int subtitleResId = mTutorialFragment.isAtFinalStep()
+                        ? R.string.back_gesture_feedback_complete_without_follow_up
+                        : R.string.back_gesture_feedback_complete_with_back_right_follow_up;
+                showFeedback(subtitleResId, true);
                 break;
             case BACK_CANCELLED_FROM_LEFT:
                 showFeedback(R.string.back_gesture_feedback_cancelled_left_edge);
@@ -123,6 +127,9 @@ final class BackGestureTutorialController extends TutorialController {
 
     @Override
     public void onNavBarGestureAttempted(NavBarGestureResult result, PointF finalVelocity) {
+        if (mGestureCompleted) {
+            return;
+        }
         if (mTutorialType == BACK_NAVIGATION_COMPLETE) {
             if (result == NavBarGestureResult.HOME_GESTURE_COMPLETED) {
                 mTutorialFragment.closeTutorial();
diff --git a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
index ff50a0e01b..deaf586636 100644
--- a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
@@ -48,6 +48,9 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll
 
     @Override
     public void onBackGestureAttempted(BackGestureResult result) {
+        if (mGestureCompleted) {
+            return;
+        }
         switch (mTutorialType) {
             case HOME_NAVIGATION:
                 switch (result) {
@@ -70,7 +73,7 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll
 
     @Override
     public void onNavBarGestureAttempted(NavBarGestureResult result, PointF finalVelocity) {
-        if (mHideFeedbackEndAction != null) {
+        if (mGestureCompleted) {
             return;
         }
         switch (mTutorialType) {
@@ -80,7 +83,7 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll
                         mTutorialFragment.releaseGestureVideoView();
                         animateFakeTaskViewHome(finalVelocity, null);
                         showActionButton();
-                        int subtitleResId = mTutorialFragment.getNumSteps() == 1
+                        int subtitleResId = mTutorialFragment.isAtFinalStep()
                                 ? R.string.home_gesture_feedback_complete_without_follow_up
                                 : R.string.home_gesture_feedback_complete_with_follow_up;
                         showFeedback(subtitleResId, true);
diff --git a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
index 7b0961e121..984d054285 100644
--- a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
@@ -55,6 +55,9 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont
 
     @Override
     public void onBackGestureAttempted(BackGestureResult result) {
+        if (mGestureCompleted) {
+            return;
+        }
         switch (mTutorialType) {
             case OVERVIEW_NAVIGATION:
                 switch (result) {
@@ -77,7 +80,7 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont
 
     @Override
     public void onNavBarGestureAttempted(NavBarGestureResult result, PointF finalVelocity) {
-        if (mHideFeedbackEndAction != null) {
+        if (mGestureCompleted) {
             return;
         }
         switch (mTutorialType) {
@@ -103,9 +106,10 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont
                         animset.start();
                         mRunningWindowAnim = SwipeUpAnimationLogic.RunningWindowAnim.wrap(animset);
                         onMotionPaused(true /*arbitrary value*/);
-                        int subtitleResId = mTutorialFragment.getNumSteps() == 1
-                                ? R.string.overview_gesture_feedback_complete_without_follow_up
-                                : R.string.overview_gesture_feedback_complete_with_follow_up;
+                        int subtitleResId = mTutorialFragment.getNumSteps() > 1
+                                && mTutorialFragment.isAtFinalStep()
+                                ? R.string.overview_gesture_feedback_complete_with_follow_up
+                                : R.string.overview_gesture_feedback_complete_without_follow_up;
                         showFeedback(subtitleResId, true);
                         break;
                     case HOME_OR_OVERVIEW_NOT_STARTED_WRONG_SWIPE_DIRECTION:
diff --git a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
index 66e04008f6..b06f001e3b 100644
--- a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
@@ -214,7 +214,7 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
 
     @Override
     public void setNavBarGestureProgress(@Nullable Float displacement) {
-        if (mHideFeedbackEndAction != null) {
+        if (mGestureCompleted) {
             return;
         }
         if (displacement != null) {
@@ -238,7 +238,7 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
 
     @Override
     public void onMotionPaused(boolean unused) {
-        if (mHideFeedbackEndAction != null) {
+        if (mGestureCompleted) {
             return;
         }
         if (mShowTasks) {
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
index a03e37e52d..5e9457466c 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
@@ -27,12 +27,14 @@ import android.graphics.drawable.RippleDrawable;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.accessibility.AccessibilityEvent;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
@@ -53,7 +55,6 @@ abstract class TutorialController implements BackGestureAttemptCallback,
     private static final String PIXEL_TIPS_APP_PACKAGE_NAME = "com.google.android.apps.tips";
     private static final CharSequence DEFAULT_PIXEL_TIPS_APP_NAME = "Pixel Tips";
 
-    private static final int FEEDBACK_VISIBLE_MS = 5000;
     private static final int FEEDBACK_ANIMATION_MS = 250;
     private static final int RIPPLE_VISIBLE_MS = 300;
 
@@ -73,10 +74,10 @@ abstract class TutorialController implements BackGestureAttemptCallback,
     final RippleDrawable mRippleDrawable;
     final Button mActionButton;
     final TutorialStepIndicator mTutorialStepView;
-    private final Runnable mHideFeedbackRunnable;
-    Runnable mHideFeedbackEndAction;
     private final AlertDialog mSkipTutorialDialog;
 
+    protected boolean mGestureCompleted = false;
+
     TutorialController(TutorialFragment tutorialFragment, TutorialType tutorialType) {
         mTutorialFragment = tutorialFragment;
         mTutorialType = tutorialType;
@@ -99,12 +100,6 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         mTutorialStepView =
                 rootView.findViewById(R.id.gesture_tutorial_fragment_feedback_tutorial_step);
         mSkipTutorialDialog = createSkipTutorialDialog();
-
-        mHideFeedbackRunnable =
-                () -> mFeedbackView.animate()
-                        .translationY(-mFeedbackView.getTop() - mFeedbackView.getHeight())
-                        .setDuration(FEEDBACK_ANIMATION_MS)
-                        .withEndAction(this::hideFeedbackEndAction).start();
     }
 
     private void showSkipTutorialDialog() {
@@ -156,6 +151,25 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         return null;
     }
 
+    void showFeedback() {
+        if (mGestureCompleted) {
+            mFeedbackView.setTranslationY(0);
+            return;
+        }
+        AnimatedVectorDrawable tutorialAnimation = mTutorialFragment.getTutorialAnimation();
+        AnimatedVectorDrawable gestureAnimation = mTutorialFragment.getGestureAnimation();
+
+        if (tutorialAnimation != null && gestureAnimation != null) {
+            TextView title = mFeedbackView.findViewById(
+                    R.id.gesture_tutorial_fragment_feedback_title);
+
+            playFeedbackVideo(tutorialAnimation, gestureAnimation, () -> {
+                mFeedbackView.setTranslationY(0);
+                title.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);
+            });
+        }
+    }
+
     /**
      * Show feedback reflecting a failed gesture attempt.
      *
@@ -165,98 +179,50 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         showFeedback(subtitleResId, false);
     }
 
-    /**
-     * Show feedback reflecting a failed gesture attempt.
-     *
-     * @param showActionButton Whether the tutorial feedback's action button should be shown.
-     **/
-    void showFeedback(int subtitleResId, boolean showActionButton) {
-        showFeedback(subtitleResId, showActionButton ? () -> {} : null, showActionButton);
-    }
-
-    /**
-     * Show feedback reflecting a failed gesture attempt.
-     **/
-    void showFeedback(int titleResId, int subtitleResId, @Nullable Runnable successEndAction) {
-        showFeedback(titleResId, subtitleResId, successEndAction, false);
-    }
-
     /**
      * Show feedback reflecting the result of a gesture attempt.
      *
-     * @param successEndAction Non-null iff the gesture was successful; this is run after the
-     *                        feedback is shown (i.e. to go to the next step)
+     * @param isGestureSuccessful Whether the tutorial feedback's action button should be shown.
      **/
-    void showFeedback(
-            int subtitleResId, @Nullable Runnable successEndAction, boolean showActionButton) {
+    void showFeedback(int subtitleResId, boolean isGestureSuccessful) {
         showFeedback(
-                successEndAction == null
-                        ? R.string.gesture_tutorial_try_again
-                        : R.string.gesture_tutorial_nice,
+                isGestureSuccessful
+                        ? R.string.gesture_tutorial_nice : R.string.gesture_tutorial_try_again,
                 subtitleResId,
-                successEndAction,
-                showActionButton);
+                isGestureSuccessful);
     }
+
     void showFeedback(
             int titleResId,
             int subtitleResId,
-            @Nullable Runnable successEndAction,
-            boolean showActionButton) {
-        if (mHideFeedbackEndAction != null) {
-            return;
-        }
+            boolean isGestureSuccessful) {
         TextView title = mFeedbackView.findViewById(R.id.gesture_tutorial_fragment_feedback_title);
         title.setText(titleResId);
         TextView subtitle =
                 mFeedbackView.findViewById(R.id.gesture_tutorial_fragment_feedback_subtitle);
         subtitle.setText(subtitleResId);
-        if (showActionButton) {
+        if (isGestureSuccessful) {
             showActionButton();
         }
-        mHideFeedbackEndAction = successEndAction;
+        mGestureCompleted = isGestureSuccessful;
 
         AnimatedVectorDrawable tutorialAnimation = mTutorialFragment.getTutorialAnimation();
         AnimatedVectorDrawable gestureAnimation = mTutorialFragment.getGestureAnimation();
         if (tutorialAnimation != null && gestureAnimation != null) {
-            if (successEndAction == null) {
-                if (tutorialAnimation.isRunning()) {
-                    tutorialAnimation.reset();
-                }
-                tutorialAnimation.registerAnimationCallback(new Animatable2.AnimationCallback() {
-
-                    @Override
-                    public void onAnimationStart(Drawable drawable) {
-                        super.onAnimationStart(drawable);
-
-                        mGestureVideoView.setVisibility(GONE);
-                        if (gestureAnimation.isRunning()) {
-                            gestureAnimation.stop();
-                        }
-
-                        mFeedbackView.setTranslationY(
-                                -mFeedbackView.getHeight() - mFeedbackView.getTop());
-                        mFeedbackView.setVisibility(View.VISIBLE);
-                        mFeedbackView.animate()
-                                .setDuration(FEEDBACK_ANIMATION_MS)
-                                .translationY(0)
-                                .start();
-                        mFeedbackView.removeCallbacks(mHideFeedbackRunnable);
-                        mFeedbackView.postDelayed(mHideFeedbackRunnable, FEEDBACK_VISIBLE_MS);
-                    }
-
-                    @Override
-                    public void onAnimationEnd(Drawable drawable) {
-                        super.onAnimationEnd(drawable);
-
-                        mGestureVideoView.setVisibility(View.VISIBLE);
-                        gestureAnimation.start();
-
-                        tutorialAnimation.unregisterAnimationCallback(this);
-                    }
+            if (!isGestureSuccessful) {
+                playFeedbackVideo(tutorialAnimation, gestureAnimation, () -> {
+                    mFeedbackView.setTranslationY(
+                            -mFeedbackView.getHeight() - mFeedbackView.getTop());
+                    mFeedbackView.setVisibility(View.VISIBLE);
+                    mFeedbackView.animate()
+                            .setDuration(FEEDBACK_ANIMATION_MS)
+                            .translationY(0)
+                            .start();
+                    title.postDelayed(
+                            () -> title.sendAccessibilityEvent(
+                                    AccessibilityEvent.TYPE_VIEW_FOCUSED),
+                            FEEDBACK_ANIMATION_MS);
                 });
-
-                tutorialAnimation.start();
-                mFeedbackVideoView.setVisibility(View.VISIBLE);
                 return;
             } else {
                 mTutorialFragment.releaseFeedbackVideoView();
@@ -268,15 +234,13 @@ abstract class TutorialController implements BackGestureAttemptCallback,
                 .setDuration(FEEDBACK_ANIMATION_MS)
                 .translationY(0)
                 .start();
-        mFeedbackView.removeCallbacks(mHideFeedbackRunnable);
-        if (!showActionButton) {
-            mFeedbackView.postDelayed(mHideFeedbackRunnable, FEEDBACK_VISIBLE_MS);
-        }
+        title.postDelayed(
+                () -> title.sendAccessibilityEvent(
+                        AccessibilityEvent.TYPE_VIEW_FOCUSED),
+                FEEDBACK_ANIMATION_MS);
     }
 
     void hideFeedback(boolean releaseFeedbackVideo) {
-        mFeedbackView.removeCallbacks(mHideFeedbackRunnable);
-        mHideFeedbackEndAction = null;
         mFeedbackView.clearAnimation();
         mFeedbackView.setVisibility(View.INVISIBLE);
         if (releaseFeedbackVideo) {
@@ -284,11 +248,41 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         }
     }
 
-    void hideFeedbackEndAction() {
-        if (mHideFeedbackEndAction != null) {
-            mHideFeedbackEndAction.run();
-            mHideFeedbackEndAction = null;
+    private void playFeedbackVideo(
+            @NonNull AnimatedVectorDrawable tutorialAnimation,
+            @NonNull AnimatedVectorDrawable gestureAnimation,
+            @NonNull Runnable onStartRunnable) {
+
+        if (tutorialAnimation.isRunning()) {
+            tutorialAnimation.reset();
         }
+        tutorialAnimation.registerAnimationCallback(new Animatable2.AnimationCallback() {
+
+            @Override
+            public void onAnimationStart(Drawable drawable) {
+                super.onAnimationStart(drawable);
+
+                mGestureVideoView.setVisibility(GONE);
+                if (gestureAnimation.isRunning()) {
+                    gestureAnimation.stop();
+                }
+
+                onStartRunnable.run();
+            }
+
+            @Override
+            public void onAnimationEnd(Drawable drawable) {
+                super.onAnimationEnd(drawable);
+
+                mGestureVideoView.setVisibility(View.VISIBLE);
+                gestureAnimation.start();
+
+                tutorialAnimation.unregisterAnimationCallback(this);
+            }
+        });
+
+        tutorialAnimation.start();
+        mFeedbackVideoView.setVisibility(View.VISIBLE);
     }
 
     void setRippleHotspot(float x, float y) {
@@ -317,6 +311,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         updateSubtext();
         updateDrawables();
 
+        mGestureCompleted = false;
         if (mFakeLauncherView != null) {
             mFakeLauncherView.setVisibility(View.INVISIBLE);
         }
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
index 0220f2d21f..55c569dad4 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
@@ -57,6 +57,8 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
     @Nullable private AnimatedVectorDrawable mGestureAnimation = null;
     private boolean mIntroductionShown = false;
 
+    private boolean mFragmentStopped = false;
+
     public static TutorialFragment newInstance(TutorialType tutorialType) {
         TutorialFragment fragment = getFragmentForTutorialType(tutorialType);
         if (fragment == null) {
@@ -154,6 +156,8 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
     public void onStop() {
         super.onStop();
         releaseFeedbackVideoView();
+        releaseGestureVideoView();
+        mFragmentStopped = true;
     }
 
     void initializeFeedbackVideoView() {
@@ -165,8 +169,7 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
             Integer introTileStringResId = mTutorialController.getIntroductionTitle();
             Integer introSubtitleResId = mTutorialController.getIntroductionSubtitle();
             if (introTileStringResId != null && introSubtitleResId != null) {
-                mTutorialController.showFeedback(introTileStringResId,
-                        introSubtitleResId, null, false);
+                mTutorialController.showFeedback(introTileStringResId, introSubtitleResId, false);
                 mIntroductionShown = true;
             }
         }
@@ -244,7 +247,12 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
     @Override
     public void onResume() {
         super.onResume();
-        changeController(mTutorialType);
+        if (mFragmentStopped) {
+            mTutorialController.showFeedback();
+            mFragmentStopped = false;
+        } else {
+            changeController(mTutorialType);
+        }
     }
 
     @Override
@@ -326,6 +334,10 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
         return gestureSandboxActivity == null ? -1 : gestureSandboxActivity.getNumSteps();
     }
 
+    boolean isAtFinalStep() {
+        return getCurrentStep() == getNumSteps();
+    }
+
     @Nullable
     private GestureSandboxActivity getGestureSandboxActivity() {
         Context context = getContext();
diff --git a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
index d0a8c711b0..c6b0b13db3 100644
--- a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
+++ b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
@@ -279,6 +279,7 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
                     new String[] {
                             "HOME_NAVIGATION",
                             "LEFT_EDGE_BACK_NAVIGATION",
+                            "RIGHT_EDGE_BACK_NAVIGATION",
                             "OVERVIEW_NAVIGATION"}));
             return true;
         });
@@ -290,7 +291,7 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
         launchBackTutorialPreference.setOnPreferenceClickListener(preference -> {
             startActivity(launchSandboxIntent.putExtra(
                     "tutorial_steps",
-                    new String[] {"LEFT_EDGE_BACK_NAVIGATION"}));
+                    new String[] {"LEFT_EDGE_BACK_NAVIGATION", "RIGHT_EDGE_BACK_NAVIGATION"}));
             return true;
         });
         sandboxCategory.addPreference(launchBackTutorialPreference);
-- 
GitLab


From 063cb2d89247e50f4d47447f0ec0b4cb1dcc642c Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Mon, 17 May 2021 11:30:37 -0700
Subject: [PATCH 1263/1664] TaskMenu in overview UI polish

Bug: 188168717
Test: TaskMenuLooks closer to mocks.
Change-Id: I1560b66a48c4c70c7c79f7307b2b76f22e30c653
---
 quickstep/res/drawable/task_menu_bg.xml       |  3 +-
 quickstep/res/layout/task_menu.xml            | 16 +++++-----
 .../res/layout/task_view_menu_option.xml      |  9 +++---
 quickstep/res/values/dimens.xml               |  3 ++
 .../android/quickstep/views/TaskMenuView.java | 15 ++++++---
 res/drawable/all_apps_divider.xml             |  4 +--
 .../touch/LandscapePagedViewHandler.java      | 14 ++++++++-
 .../touch/PagedOrientationHandler.java        | 31 ++++++++++++++++---
 .../touch/PortraitPagedViewHandler.java       | 15 ++++++++-
 .../touch/SeascapePagedViewHandler.java       | 13 ++++++++
 10 files changed, 97 insertions(+), 26 deletions(-)

diff --git a/quickstep/res/drawable/task_menu_bg.xml b/quickstep/res/drawable/task_menu_bg.xml
index a60defc3bd..be1b387cfa 100644
--- a/quickstep/res/drawable/task_menu_bg.xml
+++ b/quickstep/res/drawable/task_menu_bg.xml
@@ -16,5 +16,6 @@
 -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?attr/popupColorPrimary" />
+    <solid android:color="@android:color/transparent"/>
+    <corners android:radius="@dimen/task_menu_corner_radius"/>
 </shape>
diff --git a/quickstep/res/layout/task_menu.xml b/quickstep/res/layout/task_menu.xml
index a219bca805..96a94bacd5 100644
--- a/quickstep/res/layout/task_menu.xml
+++ b/quickstep/res/layout/task_menu.xml
@@ -20,18 +20,20 @@
     android:layout_height="wrap_content"
     android:animateLayoutChanges="true"
     android:background="@drawable/task_menu_bg"
-    android:paddingBottom="@dimen/task_card_menu_shadow_height"
     android:orientation="vertical"
     android:visibility="invisible">
 
     <TextView
         android:id="@+id/task_name"
+        android:background="?android:attr/textColorPrimary"
+        android:textColor="?android:attr/textColorPrimaryInverse"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="16dp"
-        android:textSize="12sp"/>
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:layout_marginBottom="2dp"
+        android:paddingTop="@dimen/task_card_menu_option_vertical_padding"
+        android:paddingBottom="@dimen/task_card_menu_option_vertical_padding"
+        android:textSize="24sp"/>
 
     <LinearLayout
         android:id="@+id/menu_option_layout"
@@ -39,6 +41,6 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:divider="@drawable/all_apps_divider"
-        android:showDividers="beginning" />
+        android:showDividers="middle" />
 
 </com.android.quickstep.views.TaskMenuView>
\ No newline at end of file
diff --git a/quickstep/res/layout/task_view_menu_option.xml b/quickstep/res/layout/task_view_menu_option.xml
index a7d6e89d8d..59c7263d37 100644
--- a/quickstep/res/layout/task_view_menu_option.xml
+++ b/quickstep/res/layout/task_view_menu_option.xml
@@ -21,7 +21,7 @@
     android:orientation="vertical"
     android:paddingTop="@dimen/task_card_menu_option_vertical_padding"
     android:paddingBottom="@dimen/task_card_menu_option_vertical_padding"
-    android:background="?android:attr/selectableItemBackground"
+    android:background="?android:attr/textColorPrimary"
     android:theme="@style/PopupItem" >
 
     <View
@@ -30,7 +30,7 @@
       android:layout_height="@dimen/system_shortcut_icon_size"
       android:layout_marginStart="@dimen/task_menu_option_start_margin"
       android:layout_gravity="center_horizontal"
-      android:backgroundTint="?android:attr/textColorTertiary"/>
+      android:backgroundTint="?android:attr/textColorPrimaryInverse"/>
 
     <TextView
         style="@style/BaseIcon"
@@ -38,9 +38,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/task_menu_option_start_margin"
-        android:textSize="12sp"
-        android:textColor="?android:attr/textColorPrimary"
-        android:fontFamily="sans-serif"
+        android:textSize="14sp"
+        android:textColor="?android:attr/textColorPrimaryInverse"
         android:focusable="false" />
 
 </LinearLayout>
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 50453ace16..08f1503887 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -22,6 +22,8 @@
     <!-- For Launchers that want to override the default dialog corner radius -->
     <dimen name="task_corner_radius_override">-1dp</dimen>
 
+    <!--  Task Menu View  -->
+    <dimen name="task_menu_corner_radius">22dp</dimen>
     <dimen name="overview_proactive_row_height">48dp</dimen>
     <dimen name="overview_proactive_row_bottom_margin">16dp</dimen>
 
@@ -73,6 +75,7 @@
     <!-- Total space (start + end) between the task card and the edge of the screen
          in various configurations -->
     <dimen name="task_card_menu_option_vertical_padding">8dp</dimen>
+    <dimen name="task_card_margin">8dp</dimen>
     <dimen name="task_card_menu_shadow_height">3dp</dimen>
     <dimen name="task_menu_option_start_margin">12dp</dimen>
     <!-- Copied from framework resource:
diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
index bff10136d1..d5816b56fb 100644
--- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
@@ -24,6 +24,7 @@ import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.content.Context;
 import android.graphics.Outline;
+import android.graphics.PointF;
 import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.view.Gravity;
@@ -195,7 +196,7 @@ public class TaskMenuView extends AbstractFloatingView implements OnScrollChange
     private void addMenuOptions(TaskView taskView) {
         mTaskName.setText(TaskUtils.getTitle(getContext(), taskView.getTask()));
         mTaskName.setOnClickListener(v -> close(true));
-
+        
         TaskOverlayFactory.getEnabledShortcuts(taskView, mActivity.getDeviceProfile())
                 .forEach(this::addMenuOption);
     }
@@ -227,18 +228,24 @@ public class TaskMenuView extends AbstractFloatingView implements OnScrollChange
     private void orientAroundTaskView(TaskView taskView) {
         PagedOrientationHandler orientationHandler = taskView.getPagedOrientationHandler();
         measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
+        float taskInsetMargin = getResources().getDimension(R.dimen.task_card_margin);
+        orientationHandler.setTaskMenuAroundTaskView(this, taskInsetMargin);
         mActivity.getDragLayer().getDescendantRectRelativeToSelf(taskView, sTempRect);
         Rect insets = mActivity.getDragLayer().getInsets();
         BaseDragLayer.LayoutParams params = (BaseDragLayer.LayoutParams) getLayoutParams();
-        // TODO(b/186583656) Move the entire menu to the center/make smaller than thumbnail width
-        params.width = orientationHandler.getTaskMenuWidth(taskView.getThumbnail());
+        int padding = getResources()
+                .getDimensionPixelSize(R.dimen.task_card_menu_option_vertical_padding);
+        params.width = orientationHandler.getTaskMenuWidth(taskView.getThumbnail()) - (2 * padding);
         // Gravity set to Left instead of Start as sTempRect.left measures Left distance not Start
         params.gravity = Gravity.LEFT;
         setLayoutParams(params);
         setScaleX(taskView.getScaleX());
         setScaleY(taskView.getScaleY());
-        orientationHandler.setTaskMenuLayoutOrientation(
+        orientationHandler.setTaskOptionsMenuLayoutOrientation(
                 mActivity.getDeviceProfile(), mOptionLayout);
+        PointF additionalInset = orientationHandler.getAdditionalInsetForTaskMenu(taskInsetMargin);
+        insets.left += additionalInset.x;
+        insets.top += additionalInset.y;
         setPosition(sTempRect.left - insets.left, sTempRect.top - insets.top, 0);
     }
 
diff --git a/res/drawable/all_apps_divider.xml b/res/drawable/all_apps_divider.xml
index 4bd274dd4b..53d3522167 100644
--- a/res/drawable/all_apps_divider.xml
+++ b/res/drawable/all_apps_divider.xml
@@ -15,6 +15,6 @@
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
-    <solid android:color="?android:attr/colorControlHighlight" />
-    <size android:height="1dp" />
+    <solid android:color="@android:color/transparent" />
+    <size android:height="2dp" />
 </shape>
\ No newline at end of file
diff --git a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
index 44e55e102c..11c9649279 100644
--- a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
+++ b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
@@ -41,6 +41,7 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
+import com.android.launcher3.views.BaseDragLayer;
 
 import java.util.Collections;
 import java.util.List;
@@ -267,7 +268,7 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
     }
 
     @Override
-    public void setTaskMenuLayoutOrientation(DeviceProfile deviceProfile,
+    public void setTaskOptionsMenuLayoutOrientation(DeviceProfile deviceProfile,
         LinearLayout taskMenuLayout) {
         taskMenuLayout.setOrientation(LinearLayout.HORIZONTAL);
     }
@@ -284,6 +285,17 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
         Utilities.setStartMarginForView(viewGroup.findViewById(R.id.icon), 0);
     }
 
+    @Override
+    public void setTaskMenuAroundTaskView(LinearLayout taskView, float margin) {
+        BaseDragLayer.LayoutParams lp = (BaseDragLayer.LayoutParams) taskView.getLayoutParams();
+        lp.topMargin += margin;
+    }
+
+    @Override
+    public PointF getAdditionalInsetForTaskMenu(float margin) {
+        return new PointF(margin, 0);
+    }
+
     /* ---------- The following are only used by TaskViewTouchHandler. ---------- */
 
     @Override
diff --git a/src/com/android/launcher3/touch/PagedOrientationHandler.java b/src/com/android/launcher3/touch/PagedOrientationHandler.java
index 6811438c6a..e0b89c7ffe 100644
--- a/src/com/android/launcher3/touch/PagedOrientationHandler.java
+++ b/src/com/android/launcher3/touch/PagedOrientationHandler.java
@@ -109,16 +109,37 @@ public interface PagedOrientationHandler {
     float getSecondaryValue(float x, float y);
 
     boolean isLayoutNaturalToLauncher();
+    FloatProperty getSplitSelectTaskOffset(FloatProperty primary, FloatProperty secondary,
+            DeviceProfile deviceProfile);
+    int getDistanceToBottomOfRect(DeviceProfile dp, Rect rect);
+    List<SplitPositionOption> getSplitPositionOptions(DeviceProfile dp);
+
+    // Overview TaskMenuView methods
     float getTaskMenuX(float x, View thumbnailView, int overScroll);
     float getTaskMenuY(float y, View thumbnailView, int overScroll);
     int getTaskMenuWidth(View view);
-    void setTaskMenuLayoutOrientation(DeviceProfile deviceProfile, LinearLayout taskMenuLayout);
+    /**
+     * Sets linear layout orientation for {@link com.android.launcher3.popup.SystemShortcut} items
+     * inside task menu view.
+     */
+    void setTaskOptionsMenuLayoutOrientation(DeviceProfile deviceProfile,
+            LinearLayout taskMenuLayout);
+    /**
+     * Sets layout param attributes for {@link com.android.launcher3.popup.SystemShortcut} child
+     * views inside task menu view.
+     */
     void setLayoutParamsForTaskMenuOptionItem(LinearLayout.LayoutParams lp,
             LinearLayout viewGroup, DeviceProfile deviceProfile);
-    int getDistanceToBottomOfRect(DeviceProfile dp, Rect rect);
-    List<SplitPositionOption> getSplitPositionOptions(DeviceProfile dp);
-    FloatProperty getSplitSelectTaskOffset(FloatProperty primary, FloatProperty secondary,
-            DeviceProfile deviceProfile);
+    /**
+     * Adjusts margins for the entire task menu view itself, which comprises of both app title and
+     * shortcut options.
+     */
+    void setTaskMenuAroundTaskView(LinearLayout taskView, float margin);
+    /**
+     * Since the task menu layout is manually positioned on top of recents view, this method returns
+     * additional adjustments to the positioning based on fake land/seascape
+     */
+    PointF getAdditionalInsetForTaskMenu(float margin);
 
     // The following are only used by TaskViewTouchHandler.
     /** @return Either VERTICAL or HORIZONTAL. */
diff --git a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
index d3d77fd99a..dcbb7ca6e8 100644
--- a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
+++ b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
@@ -39,6 +39,7 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
+import com.android.launcher3.views.BaseDragLayer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -272,7 +273,7 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
     }
 
     @Override
-    public void setTaskMenuLayoutOrientation(DeviceProfile deviceProfile,
+    public void setTaskOptionsMenuLayoutOrientation(DeviceProfile deviceProfile,
         LinearLayout taskMenuLayout) {
         if (deviceProfile.isLandscape && !deviceProfile.isTablet) {
             // Phone landscape
@@ -302,6 +303,18 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
         lp.height = LinearLayout.LayoutParams.WRAP_CONTENT;
     }
 
+    @Override
+    public void setTaskMenuAroundTaskView(LinearLayout taskView, float margin) {
+        BaseDragLayer.LayoutParams lp = (BaseDragLayer.LayoutParams) taskView.getLayoutParams();
+        lp.topMargin += margin;
+        lp.leftMargin += margin;
+    }
+
+    @Override
+    public PointF getAdditionalInsetForTaskMenu(float margin) {
+        return new PointF(0, 0);
+    }
+
     /* ---------- The following are only used by TaskViewTouchHandler. ---------- */
 
     @Override
diff --git a/src/com/android/launcher3/touch/SeascapePagedViewHandler.java b/src/com/android/launcher3/touch/SeascapePagedViewHandler.java
index 893a274e9e..91d44bd29c 100644
--- a/src/com/android/launcher3/touch/SeascapePagedViewHandler.java
+++ b/src/com/android/launcher3/touch/SeascapePagedViewHandler.java
@@ -26,11 +26,13 @@ import android.graphics.PointF;
 import android.graphics.Rect;
 import android.view.Surface;
 import android.view.View;
+import android.widget.LinearLayout;
 
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
+import com.android.launcher3.views.BaseDragLayer;
 
 import java.util.Collections;
 import java.util.List;
@@ -88,6 +90,17 @@ public class SeascapePagedViewHandler extends LandscapePagedViewHandler {
         return y + thumbnailView.getMeasuredHeight() + overScroll;
     }
 
+    @Override
+    public void setTaskMenuAroundTaskView(LinearLayout taskView, float margin) {
+        BaseDragLayer.LayoutParams lp = (BaseDragLayer.LayoutParams) taskView.getLayoutParams();
+        lp.bottomMargin += margin;
+    }
+
+    @Override
+    public PointF getAdditionalInsetForTaskMenu(float margin) {
+        return new PointF(-margin, margin);
+    }
+
     @Override
     public int getDistanceToBottomOfRect(DeviceProfile dp, Rect rect) {
         return dp.widthPx - rect.right;
-- 
GitLab


From dad8a80d19d5f3c285c1ddeab4e42229b8d27138 Mon Sep 17 00:00:00 2001
From: zakcohen <zakcohen@google.com>
Date: Thu, 20 May 2021 09:52:26 -0700
Subject: [PATCH 1264/1664] Overview - Remove the space withheld for proactive
 chips

Remove the space in the ui that was being used for chips.
Centralize some of the logic around calculating the action margins to aid
that.

Bug: 179922117
Test: Local build and flash and run
Change-Id: Icd2f894c858fab475c5411f3f7c412b899d5b220
---
 quickstep/res/values/dimens.xml               |  4 +-
 .../launcher3/BaseQuickstepLauncher.java      |  1 +
 .../quickstep/BaseActivityInterface.java      | 20 +++----
 .../quickstep/views/OverviewActionsView.java  | 58 +++++++++++++------
 .../com/android/quickstep/views/TaskView.java |  6 ++
 res/values/dimens.xml                         |  2 +
 src/com/android/launcher3/DeviceProfile.java  |  6 ++
 7 files changed, 64 insertions(+), 33 deletions(-)

diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 50453ace16..2a15d15d29 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -25,12 +25,12 @@
     <dimen name="overview_proactive_row_height">48dp</dimen>
     <dimen name="overview_proactive_row_bottom_margin">16dp</dimen>
 
-    <dimen name="overview_minimum_next_prev_size">48dp</dimen>
+    <dimen name="overview_minimum_next_prev_size">50dp</dimen>
     <dimen name="overview_task_margin">16dp</dimen>
 
     <!-- Overrideable in overlay that provides the Overview Actions. -->
     <dimen name="overview_actions_height">48dp</dimen>
-    <dimen name="overview_actions_bottom_margin_gesture">12dp</dimen>
+    <dimen name="overview_actions_bottom_margin_gesture">28dp</dimen>
     <dimen name="overview_actions_bottom_margin_three_button">8dp</dimen>
     <dimen name="overview_actions_horizontal_margin">16dp</dimen>
 
diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 0b41f15b42..4720f55549 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -253,6 +253,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
                 new SplitSelectStateController(mHandler, SystemUiProxy.INSTANCE.get(this))
         );
         overviewPanel.init(mActionsView, mSplitPlaceholderView);
+        mActionsView.setDp(getDeviceProfile());
         mActionsView.updateVerticalMargin(SysUINavigationMode.getMode(this));
 
         mAppTransitionManager = new QuickstepTransitionManager(this);
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index 86bf1194bb..2696cbeb79 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -59,6 +59,7 @@ import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.util.ActivityInitListener;
 import com.android.quickstep.util.AnimatorControllerWithResistance;
 import com.android.quickstep.util.SplitScreenBounds;
+import com.android.quickstep.views.OverviewActionsView;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
 import com.android.systemui.shared.recents.model.ThumbnailData;
@@ -212,7 +213,7 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
         } else {
             int taskMargin = dp.overviewTaskMarginPx;
             int proactiveRowAndMargin;
-            if (dp.isVerticalBarLayout()) {
+            if (!TaskView.SHOW_PROACTIVE_ACTIONS || dp.isVerticalBarLayout()) {
                 // In Vertical Bar Layout the proactive row doesn't have its own space, it's inside
                 // the actions row.
                 proactiveRowAndMargin = 0;
@@ -223,7 +224,7 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
             }
             calculateTaskSizeInternal(context, dp,
                     dp.overviewTaskThumbnailTopMarginPx,
-                    proactiveRowAndMargin + getOverviewActionsHeight(context) + taskMargin,
+                    proactiveRowAndMargin + getOverviewActionsHeight(context, dp),
                     res.getDimensionPixelSize(R.dimen.overview_minimum_next_prev_size) + taskMargin,
                     outRect);
         }
@@ -314,23 +315,16 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
         calculateTaskSizeInternal(
                 context, dp,
                 dp.overviewTaskMarginPx,
-                getOverviewActionsHeight(context) + dp.overviewTaskMarginPx,
+                getOverviewActionsHeight(context, dp),
                 dp.overviewTaskMarginPx,
                 outRect);
     }
 
     /** Gets the space that the overview actions will take, including bottom margin. */
-    public final int getOverviewActionsHeight(Context context) {
+    private int getOverviewActionsHeight(Context context, DeviceProfile dp) {
         Resources res = context.getResources();
-        int actionsBottomMargin = 0;
-        if (getMode(context) == Mode.THREE_BUTTONS) {
-            actionsBottomMargin = res.getDimensionPixelSize(
-                    R.dimen.overview_actions_bottom_margin_three_button);
-        } else {
-            actionsBottomMargin = res.getDimensionPixelSize(
-                    R.dimen.overview_actions_bottom_margin_gesture);
-        }
-        return actionsBottomMargin
+        return OverviewActionsView.getOverviewActionsBottomMarginPx(getMode(context), dp)
+                + OverviewActionsView.getOverviewActionsTopMarginPx(getMode(context), dp)
                 + res.getDimensionPixelSize(R.dimen.overview_actions_height);
     }
 
diff --git a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
index 9adeea42f0..8c115e564c 100644
--- a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
+++ b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
@@ -93,6 +93,8 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
     private float mModalness;
     private float mModalTransformY;
 
+    protected DeviceProfile mDp;
+
     public OverviewActionsView(Context context) {
         this(context, null);
     }
@@ -205,36 +207,25 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
 
     /** Updates vertical margins for different navigation mode or configuration changes. */
     public void updateVerticalMargin(Mode mode) {
+        if (mDp == null) {
+            return;
+        }
         LayoutParams actionParams = (LayoutParams) findViewById(
                 R.id.action_buttons).getLayoutParams();
         actionParams.setMargins(
-                actionParams.leftMargin, actionParams.topMargin, actionParams.rightMargin,
-                getBottomVerticalMargin(mode));
+                actionParams.leftMargin, getOverviewActionsTopMarginPx(mode, mDp),
+                actionParams.rightMargin, getOverviewActionsBottomMarginPx(mode, mDp));
     }
 
     /**
      * Set the device profile for this view to draw with.
      */
     public void setDp(DeviceProfile dp) {
+        mDp = dp;
+        updateVerticalMargin(SysUINavigationMode.getMode(getContext()));
         requestLayout();
     }
 
-    protected int getBottomVerticalMargin(Mode mode) {
-        int bottomMargin;
-        int orientation = getResources().getConfiguration().orientation;
-        if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
-            bottomMargin = 0;
-        } else if (mode == Mode.THREE_BUTTONS) {
-            bottomMargin = getResources()
-                    .getDimensionPixelSize(R.dimen.overview_actions_bottom_margin_three_button);
-        } else {
-            bottomMargin = getResources()
-                    .getDimensionPixelSize(R.dimen.overview_actions_bottom_margin_gesture);
-        }
-        bottomMargin += mInsets.bottom;
-        return bottomMargin;
-    }
-
     /**
      * The current task is fully modal (modalness = 1) when it is shown on its own in a modal
      * way. Modalness 0 means the task is shown in context with all the other tasks.
@@ -257,4 +248,35 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
         float progress = ACCEL_DEACCEL.getInterpolation(mModalness);
         return Utilities.mapRange(progress, 0, endTranslation);
     }
+
+    /** Get the top margin associated with the action buttons in Overview. */
+    public static int getOverviewActionsTopMarginPx(
+            SysUINavigationMode.Mode mode, DeviceProfile dp) {
+        // In vertical bar, use the smaller task margin for the top regardless of mode
+        if (dp.isVerticalBarLayout()) {
+            return dp.overviewTaskMarginPx;
+        }
+
+        if (mode == SysUINavigationMode.Mode.THREE_BUTTONS) {
+            return dp.overviewActionsMarginThreeButtonPx;
+        }
+
+        return dp.overviewActionsMarginGesturePx;
+    }
+
+    /** Get the bottom margin associated with the action buttons in Overview. */
+    public static int getOverviewActionsBottomMarginPx(
+            SysUINavigationMode.Mode mode, DeviceProfile dp) {
+        int inset = dp.getInsets().bottom;
+
+        if (dp.isVerticalBarLayout()) {
+            return inset;
+        }
+
+        if (mode == SysUINavigationMode.Mode.THREE_BUTTONS) {
+            return dp.overviewActionsMarginThreeButtonPx + inset;
+        }
+
+        return dp.overviewActionsMarginGesturePx + inset;
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index cfac32cb09..b2a7b1b85d 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -132,6 +132,12 @@ public class TaskView extends FrameLayout implements Reusable {
     @IntDef({FLAG_UPDATE_ALL, FLAG_UPDATE_ICON, FLAG_UPDATE_THUMBNAIL})
     public @interface TaskDataChanges {}
 
+    /**
+     * Should the layout account for space for a proactive action (or chip) to be added under
+     * the task.
+     */
+    public static final boolean SHOW_PROACTIVE_ACTIONS = false;
+
     /** The maximum amount that a task view can be scrimmed, dimmed or tinted. */
     public static final float MAX_PAGE_SCRIM_ALPHA = 0.4f;
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index bfa02c07d3..f8ed902e50 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -294,6 +294,8 @@
     <dimen name="task_thumbnail_icon_size">0dp</dimen>
     <dimen name="task_thumbnail_icon_size_grid">0dp</dimen>
     <dimen name="overview_task_margin">0dp</dimen>
+    <dimen name="overview_actions_bottom_margin_gesture">0dp</dimen>
+    <dimen name="overview_actions_bottom_margin_three_button">0dp</dimen>
 
 <!-- Workspace grid visualization parameters -->
     <dimen name="grid_visualization_rounding_radius">22dp</dimen>
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 812667371d..cdc09f10d6 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -170,6 +170,8 @@ public class DeviceProfile {
     public int overviewTaskMarginPx;
     public int overviewTaskIconSizePx;
     public int overviewTaskThumbnailTopMarginPx;
+    public final int overviewActionsMarginThreeButtonPx;
+    public final int overviewActionsMarginGesturePx;
 
     // Widgets
     public final PointF appWidgetScale = new PointF(1.0f, 1.0f);
@@ -338,6 +340,10 @@ public class DeviceProfile {
                         R.dimen.task_thumbnail_icon_size_grid) : res.getDimensionPixelSize(
                         R.dimen.task_thumbnail_icon_size);
         overviewTaskThumbnailTopMarginPx = overviewTaskIconSizePx + overviewTaskMarginPx * 2;
+        overviewActionsMarginGesturePx = res.getDimensionPixelSize(
+                R.dimen.overview_actions_bottom_margin_gesture);
+        overviewActionsMarginThreeButtonPx = res.getDimensionPixelSize(
+                R.dimen.overview_actions_bottom_margin_three_button);
 
         // Calculate all of the remaining variables.
         extraSpace = updateAvailableDimensions(res);
-- 
GitLab


From 41f15a107f63a728053d089e360dcc4ce0b98915 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Tue, 25 May 2021 15:42:39 -0500
Subject: [PATCH 1265/1664] [Search] Resolve afterimage when closing allapps

Preview: https://drive.google.com/file/d/1AM6WAY4kImCgHueNvH6eXUtnHgK3U6vo/view?usp=sharing&resourcekey=0-3mzBobzFuzQXCNZRUlToYA
Test: Manual
Bug: 184711608
Bug: 188556051
Change-Id: Ib43c71083460c236347dd1f340b1ad95d7d4aa15
---
 .../android/quickstep/views/AllAppsEduView.java  | 16 ++++++++++++----
 .../WorkspaceStateTransitionAnimation.java       |  3 ++-
 .../launcher3/allapps/AllAppsContainerView.java  |  3 +--
 .../allapps/AllAppsTransitionController.java     |  5 ++++-
 .../launcher3/allapps/FloatingHeaderView.java    |  2 +-
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/AllAppsEduView.java b/quickstep/src/com/android/quickstep/views/AllAppsEduView.java
index 97a239ce86..00993e3658 100644
--- a/quickstep/src/com/android/quickstep/views/AllAppsEduView.java
+++ b/quickstep/src/com/android/quickstep/views/AllAppsEduView.java
@@ -23,6 +23,7 @@ import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_7;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALL_APPS_EDU_SHOWN;
 import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE;
+import static com.android.launcher3.states.StateAnimationConfig.ANIM_SCRIM_FADE;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -58,6 +59,9 @@ import com.android.quickstep.util.MultiValueUpdateListener;
  */
 public class AllAppsEduView extends AbstractFloatingView {
 
+    private static final float HINT_PROG_SCRIM_THRESHOLD = 0.06f;
+    private static final float HINT_PROG_CONTENT_THRESHOLD = 0.08f;
+
     private Launcher mLauncher;
 
     private AnimatorSet mAnimation;
@@ -143,7 +147,9 @@ public class AllAppsEduView extends AbstractFloatingView {
 
         StateAnimationConfig config = new StateAnimationConfig();
         config.setInterpolator(ANIM_ALL_APPS_FADE, Interpolators.clampToProgress(ACCEL,
-                0, 0.08f));
+                HINT_PROG_SCRIM_THRESHOLD, HINT_PROG_CONTENT_THRESHOLD));
+        config.setInterpolator(ANIM_SCRIM_FADE,
+                Interpolators.clampToProgress(ACCEL, 0, HINT_PROG_CONTENT_THRESHOLD));
         config.duration = secondPart;
         config.userControlled = false;
         AnimatorPlaybackController stateAnimationController =
@@ -153,6 +159,8 @@ public class AllAppsEduView extends AbstractFloatingView {
         AllAppsTransitionController allAppsController = mLauncher.getAllAppsController();
         PendingAnimation allAppsAlpha = new PendingAnimation(config.duration);
         allAppsController.setAlphas(ALL_APPS, config, allAppsAlpha);
+        mLauncher.getWorkspace().getStateTransitionAnimation().setScrim(allAppsAlpha, ALL_APPS,
+                config);
         mAnimation.play(allAppsAlpha.buildAnim());
 
         ValueAnimator intro = ValueAnimator.ofFloat(0, 1f);
@@ -219,11 +227,11 @@ public class AllAppsEduView extends AbstractFloatingView {
         int accentColor = Themes.getColorAccent(launcher);
         mGradient = new GradientDrawable(GradientDrawable.Orientation.TOP_BOTTOM,
                 Themes.getAttrBoolean(launcher, R.attr.isMainColorDark)
-                        ? new int[] {0xB3FFFFFF, 0x00FFFFFF}
-                        : new int[] {ColorUtils.setAlphaComponent(accentColor, 127),
+                        ? new int[]{0xB3FFFFFF, 0x00FFFFFF}
+                        : new int[]{ColorUtils.setAlphaComponent(accentColor, 127),
                                 ColorUtils.setAlphaComponent(accentColor, 0)});
         float r = mWidthPx / 2f;
-        mGradient.setCornerRadii(new float[] {r, r, r, r, 0, 0, 0, 0});
+        mGradient.setCornerRadii(new float[]{r, r, r, r, 0, 0, 0, 0});
 
         int top = mMaxHeightPx - mCircleSizePx + mPaddingPx;
         mCircle.setBounds(mPaddingPx, top, mPaddingPx + mCircleSizePx, top + mCircleSizePx);
diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
index c771e3e8d6..1b9647afc0 100644
--- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
+++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
@@ -27,6 +27,7 @@ import static com.android.launcher3.LauncherState.HINT_STATE;
 import static com.android.launcher3.LauncherState.HOTSEAT_ICONS;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.WORKSPACE_PAGE_INDICATOR;
+import static com.android.launcher3.anim.Interpolators.ACCEL_2;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.Interpolators.ZOOM_OUT;
 import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
@@ -168,7 +169,7 @@ public class WorkspaceStateTransitionAnimation {
 
         propertySetter.setViewBackgroundColor(mLauncher.getScrimView(),
                 state.getWorkspaceScrimColor(mLauncher),
-                config.getInterpolator(ANIM_SCRIM_FADE, LINEAR));
+                config.getInterpolator(ANIM_SCRIM_FADE, ACCEL_2));
     }
 
     public void applyChildState(LauncherState state, CellLayout cl, int childIndex) {
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 18de49a218..cb20fec47a 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -134,7 +134,6 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
     private int mHeaderColor;
 
 
-
     public AllAppsContainerView(Context context) {
         this(context, null);
     }
@@ -842,7 +841,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
      * redraws header protection
      */
     public void invalidateHeader() {
-        if (mScrimView != null) {
+        if (mScrimView != null && FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
             mScrimView.invalidate();
         }
     }
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 3a616093db..8ec8269ba0 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -37,6 +37,7 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimatorListeners;
+import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.anim.PropertySetter;
 import com.android.launcher3.config.FeatureFlags;
@@ -56,6 +57,7 @@ import com.android.launcher3.views.ScrimView;
  */
 public class AllAppsTransitionController
         implements StateHandler<LauncherState>, OnDeviceProfileChangeListener {
+    private static final float CONTENT_VISIBLE_MAX_THRESHOLD = 0.5f;
 
     public static final FloatProperty<AllAppsTransitionController> ALL_APPS_PROGRESS =
             new FloatProperty<AllAppsTransitionController>("allAppsProgress") {
@@ -177,7 +179,8 @@ public class AllAppsTransitionController
         int visibleElements = state.getVisibleElements(mLauncher);
         boolean hasAllAppsContent = (visibleElements & ALL_APPS_CONTENT) != 0;
 
-        Interpolator allAppsFade = config.getInterpolator(ANIM_ALL_APPS_FADE, LINEAR);
+        Interpolator allAppsFade = config.getInterpolator(ANIM_ALL_APPS_FADE,
+                Interpolators.clampToProgress(LINEAR, 0, CONTENT_VISIBLE_MAX_THRESHOLD));
         setter.setViewAlpha(mAppsView, hasAllAppsContent ? 1 : 0, allAppsFade);
 
         boolean shouldProtectHeader =
diff --git a/src/com/android/launcher3/allapps/FloatingHeaderView.java b/src/com/android/launcher3/allapps/FloatingHeaderView.java
index a0c598aa6e..450d2e27a0 100644
--- a/src/com/android/launcher3/allapps/FloatingHeaderView.java
+++ b/src/com/android/launcher3/allapps/FloatingHeaderView.java
@@ -299,7 +299,7 @@ public class FloatingHeaderView extends LinearLayout implements
     @Override
     protected void dispatchDraw(Canvas canvas) {
         if (mHeaderCollapsed && !mCollapsed && mTabLayout.getVisibility() == VISIBLE
-                && mHeaderColor != Color.TRANSPARENT) {
+                && mHeaderColor != Color.TRANSPARENT && FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
             mBGPaint.setColor(mHeaderColor);
             mBGPaint.setAlpha((int) (255 * mHeaderAnimator.getAnimatedFraction()));
             canvas.drawRect(0, 0, getWidth(), getHeight() + mTranslationY, mBGPaint);
-- 
GitLab


From e70d6c492b3526b37d83c6a92efcf9ac6bcdffb5 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Tue, 25 May 2021 22:36:33 +0000
Subject: [PATCH 1266/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I46496d705598b872aedbf575425d371d291c157d
---
 quickstep/res/values-gu/strings.xml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/quickstep/res/values-gu/strings.xml b/quickstep/res/values-gu/strings.xml
index a02e5ebd95..9ddde2b35a 100644
--- a/quickstep/res/values-gu/strings.xml
+++ b/quickstep/res/values-gu/strings.xml
@@ -77,14 +77,10 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ફરી પ્રયાસ કરો"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"સરસ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ટ્યૂટૉરિઅલ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <!-- no translation found for allset_title (5021126669778966707) -->
-    <skip />
-    <!-- no translation found for allset_hint (459504134589971527) -->
-    <skip />
-    <!-- no translation found for allset_description (6350320429953234580) -->
-    <skip />
-    <!-- no translation found for allset_navigation_settings (417773244979225071) -->
-    <skip />
+    <string name="allset_title" msgid="5021126669778966707">"બધું સેટ થઈ ગયું!"</string>
+    <string name="allset_hint" msgid="459504134589971527">"હોમ પર જવા માટે ઉપરની તરફ સ્વાઇપ કરો"</string>
+    <string name="allset_description" msgid="6350320429953234580">"તમે તમારા ફોનનો ઉપયોગ કરવા માટે તૈયાર છો"</string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"ઍક્સેસિબિલિટી માટે નૅવિગેશન સેટિંગ"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"શેર કરો"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"સ્ક્રીનશૉટ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ઍપ કે તમારી સંસ્થા દ્વારા આ ક્રિયા કરવાની મંજૂરી નથી"</string>
-- 
GitLab


From 1276d7b8d7d225fca389c14afa909975af88ee24 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Tue, 25 May 2021 22:37:31 +0000
Subject: [PATCH 1267/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I49ec409fe6df98ada02d378db1f652f5a7e0b278
---
 go/quickstep/res/values-gu/strings.xml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 go/quickstep/res/values-gu/strings.xml

diff --git a/go/quickstep/res/values-gu/strings.xml b/go/quickstep/res/values-gu/strings.xml
new file mode 100644
index 0000000000..e9fbdc268d
--- /dev/null
+++ b/go/quickstep/res/values-gu/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"ઍપ શેર કરો"</string>
+    <string name="action_listen" msgid="2370304050784689486">"સાંભળો"</string>
+    <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+</resources>
-- 
GitLab


From c84ee09dbd7c708e123d1cf623cb0d4544ac0028 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Tue, 25 May 2021 22:38:33 +0000
Subject: [PATCH 1268/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Ifca3cdf2713b121701f57a02c88353397a2a9222
---
 res/values-gu/strings.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 55eceee4d8..3a25705628 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -97,8 +97,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"ફોલ્ડર: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> આઇટમ"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ફોલ્ડર: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> કે વધુ આઇટમ"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"વૉલપેપર"</string>
-    <!-- no translation found for styles_wallpaper_button_text (8216961355289236794) -->
-    <skip />
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"વૉલપેપર અને શૈલી"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"હોમ સેટિંગ"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"તમારા વ્યવસ્થાપક દ્વારા અક્ષમ કરેલ"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"હોમ સ્ક્રીનને ફેરવવાની મંજૂરી આપો"</string>
-- 
GitLab


From 1ef7e145d2da5b13350651990b1259d2e1dff4c3 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Tue, 25 May 2021 23:39:40 +0100
Subject: [PATCH 1269/1664] Fix add extra empty screen logic

The bug occurred when there are two widgets in a CellLayout. When
dragging one of the widget, ShortcutAndWidgetContainer#getChildCount
returns 1 rather than 2 because the LauncherAppWidgetHostView of the
widget in drag has been detached from its parent and reattached to
DragView (introduced in ag/14234627).

Test: Place only two widgets on the last page of the home screen. Drag
      one widget. The new page indicator on the right is shown.
Bug: 188494523
Change-Id: I8255dd1b72ad7f18f4cb35a9e14ac8e61804980c
---
 src/com/android/launcher3/Workspace.java | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 98d80fedbc..05ef6ef2ef 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -426,10 +426,9 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         // When a accessible drag is started by the folder, we only allow rearranging withing the
         // folder.
         boolean addNewPage = !(options.isAccessibleDrag && dragObject.dragSource != this);
-
         if (addNewPage) {
             mDeferRemoveExtraEmptyScreen = false;
-            addExtraEmptyScreenOnDrag();
+            addExtraEmptyScreenOnDrag(dragObject);
 
             if (dragObject.dragInfo.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET
                     && dragObject.dragSource != this) {
@@ -636,12 +635,19 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         return newScreen;
     }
 
-    public void addExtraEmptyScreenOnDrag() {
+    private void addExtraEmptyScreenOnDrag(DragObject dragObject) {
         boolean lastChildOnScreen = false;
         boolean childOnFinalScreen = false;
 
         if (mDragSourceInternal != null) {
-            if (mDragSourceInternal.getChildCount() == 1) {
+            // When the drag view content is a LauncherAppWidgetHostView, we should increment the
+            // drag source child count by 1 because the widget in drag has been detached from its
+            // original parent, ShortcutAndWidgetContainer, and reattached to the DragView.
+            int dragSourceChildCount =
+                    dragObject.dragView.getContentView() instanceof LauncherAppWidgetHostView
+                            ? mDragSourceInternal.getChildCount() + 1
+                            : mDragSourceInternal.getChildCount();
+            if (dragSourceChildCount == 1) {
                 lastChildOnScreen = true;
             }
             CellLayout cl = (CellLayout) mDragSourceInternal.getParent();
-- 
GitLab


From 1fe96abb863a14e89ff71fa39b341d05a0d5cd8e Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 25 May 2021 15:59:31 -0700
Subject: [PATCH 1270/1664] Set mEnableDrawingLiveTile = false in
 RecentsView#reset()

This should help ensure we only finish the recents controller when we're actually still in live tile mode.

Test: theoretical (no repro steps)
Fixes: 187354606 (hopefully)
Change-Id: If0632f03535e4aafaea751724f080f272a6af58f
---
 quickstep/src/com/android/quickstep/views/RecentsView.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 376cb31a90..1c7242d26c 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1561,6 +1561,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 mRecentsAnimationController = null;
             }
         }
+        setEnableDrawingLiveTile(false);
         mLiveTileParams.setTargetSet(null);
         mLiveTileTaskViewSimulator.setDrawsBelowRecents(true);
 
-- 
GitLab


From da85cb91f16968abc86d89a6767172361afb6abc Mon Sep 17 00:00:00 2001
From: Jason Chang <jasonsfchang@google.com>
Date: Thu, 13 May 2021 17:20:05 +0800
Subject: [PATCH 1271/1664] Migrate trigger logic to fullfill new UI changes
 for One-handed mode settings.

According to new key visual changes for One-handed mode,
modify the trigger condition to reflect the changes.

Bug: 175851783

Test: manual
Test: atest WMShellUnitTests
Change-Id: I4d734b31cafd5ce884010642b5e613c3deadfb20
---
 .../android/quickstep/RecentsAnimationDeviceState.java    | 2 +-
 .../inputconsumers/OneHandedModeInputConsumer.java        | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index e821e06180..fa37901f27 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -561,7 +561,7 @@ public class RecentsAnimationDeviceState implements
             return false;
         }
 
-        if (mIsOneHandedModeEnabled || mIsSwipeToNotificationEnabled) {
+        if (mIsOneHandedModeEnabled) {
             final Info displayInfo = mDisplayController.getInfo();
             return (mRotationTouchHelper.touchInOneHandedModeRegion(ev)
                 && displayInfo.rotation != Surface.ROTATION_90
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
index 8d9c524a57..bc209027e8 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
@@ -147,12 +147,10 @@ public class OneHandedModeInputConsumer extends DelegateInputConsumer {
     }
 
     private void onStartGestureDetected() {
-        if (mDeviceState.isOneHandedModeEnabled()) {
-            if (!mDeviceState.isOneHandedModeActive()) {
-                SystemUiProxy.INSTANCE.get(mContext).startOneHandedMode();
-            }
-        } else if (mDeviceState.isSwipeToNotificationEnabled()) {
+        if (mDeviceState.isSwipeToNotificationEnabled()) {
             SystemUiProxy.INSTANCE.get(mContext).expandNotificationPanel();
+        } else if (!mDeviceState.isOneHandedModeActive()) {
+            SystemUiProxy.INSTANCE.get(mContext).startOneHandedMode();
         }
     }
 
-- 
GitLab


From b1ef5e5c55ee4e86124afb554fc48a1cd8791ea4 Mon Sep 17 00:00:00 2001
From: Lais Andrade <lsandrade@google.com>
Date: Fri, 21 May 2021 13:50:46 +0100
Subject: [PATCH 1272/1664] Add haptic feedback to Launcher recent apps
 scrolling

Add light LOW_TICK effects when the scrolling on RecentsView
snaps to a page, and a stronger TICK effect when the edges
absorb the scroll (by scrolling fast towards one of the edges).

Fix: 182382085
Test: manual
Change-Id: Ifb917ae499f73607707773f9870eb39cd6fe16ef
---
 .../android/quickstep/views/RecentsView.java  | 22 ++++++++++++++
 src/com/android/launcher3/PagedView.java      |  9 ++++++
 .../launcher3/util/VibratorWrapper.java       | 29 +++++++++++++++++++
 3 files changed, 60 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 376cb31a90..197fc9c168 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -76,6 +76,7 @@ import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.UserHandle;
+import android.os.VibrationEffect;
 import android.text.Layout;
 import android.text.StaticLayout;
 import android.text.TextPaint;
@@ -132,6 +133,7 @@ import com.android.launcher3.util.SplitConfigurationOptions;
 import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.util.TranslateEdgeEffect;
+import com.android.launcher3.util.VibratorWrapper;
 import com.android.launcher3.util.ViewPool;
 import com.android.quickstep.AnimatedFloat;
 import com.android.quickstep.BaseActivityInterface;
@@ -342,6 +344,17 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     private static final float INITIAL_DISMISS_TRANSLATION_INTERPOLATION_OFFSET = 0.55f;
     private static final float ADDITIONAL_DISMISS_TRANSLATION_INTERPOLATION_OFFSET = 0.05f;
 
+    private static final int SNAP_TO_PAGE_VIBRATION_PRIMITIVE =
+            Utilities.ATLEAST_S ? VibrationEffect.Composition.PRIMITIVE_LOW_TICK : -1;
+    private static final float SNAP_TO_PAGE_VIBRATION_PRIMITIVE_SCALE = 0.4f;
+    private static final VibrationEffect SNAP_TO_PAGE_VIBRATION_FALLBACK =
+            VibrationEffect.createPredefined(VibrationEffect.EFFECT_TEXTURE_TICK);
+    private static final int EDGE_IMPACT_VIBRATION_PRIMITIVE =
+            Utilities.ATLEAST_R ? VibrationEffect.Composition.PRIMITIVE_TICK : -1;
+    private static final float EDGE_IMPACT_VIBRATION_PRIMITIVE_SCALE = 0.8f;
+    private static final VibrationEffect EDGE_IMPACT_VIBRATION_FALLBACK =
+            VibrationEffect.createPredefined(VibrationEffect.EFFECT_TICK);
+
     protected final RecentsOrientedState mOrientationState;
     protected final BaseActivityInterface<STATE_TYPE, ACTIVITY_TYPE> mSizeStrategy;
     protected RecentsAnimationController mRecentsAnimationController;
@@ -960,6 +973,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     @Override
     protected void onPageEndTransition() {
         super.onPageEndTransition();
+        VibratorWrapper.INSTANCE.get(mContext).vibrate(SNAP_TO_PAGE_VIBRATION_PRIMITIVE,
+                SNAP_TO_PAGE_VIBRATION_PRIMITIVE_SCALE, SNAP_TO_PAGE_VIBRATION_FALLBACK);
         if (isClearAllHidden()) {
             mActionsView.updateDisabledFlags(OverviewActionsView.DISABLED_SCROLLING, false);
         }
@@ -1062,6 +1077,13 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         }
     }
 
+    @Override
+    protected void onEdgeAbsorbingScroll() {
+        super.onEdgeAbsorbingScroll();
+        VibratorWrapper.INSTANCE.get(mContext).vibrate(EDGE_IMPACT_VIBRATION_PRIMITIVE,
+                EDGE_IMPACT_VIBRATION_PRIMITIVE_SCALE, EDGE_IMPACT_VIBRATION_FALLBACK);
+    }
+
     @Override
     protected void determineScrollingStart(MotionEvent ev, float touchSlopScale) {
         // Enables swiping to the left or right only if the task overlay is not modal.
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index b26a7ea22d..9725b068a8 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -479,9 +479,11 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
                 if (newPos < mMinScroll && oldPos >= mMinScroll) {
                     mEdgeGlowLeft.onAbsorb((int) mScroller.getCurrVelocity());
                     mScroller.abortAnimation();
+                    onEdgeAbsorbingScroll();
                 } else if (newPos > mMaxScroll && oldPos <= mMaxScroll) {
                     mEdgeGlowRight.onAbsorb((int) mScroller.getCurrVelocity());
                     mScroller.abortAnimation();
+                    onEdgeAbsorbingScroll();
                 }
             }
 
@@ -1332,6 +1334,13 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
 
     protected void onNotSnappingToPageInFreeScroll() { }
 
+    /**
+     * Called when the view edges absorb part of the scroll. Subclasses can override this
+     * to provide custom behavior during animation.
+     */
+    protected void onEdgeAbsorbingScroll() {
+    }
+
     protected boolean shouldFlingForVelocity(int velocity) {
         float threshold = mAllowEasyFling ? mEasyFlingThresholdVelocity : mFlingThresholdVelocity;
         return Math.abs(velocity) > threshold;
diff --git a/src/com/android/launcher3/util/VibratorWrapper.java b/src/com/android/launcher3/util/VibratorWrapper.java
index b0defd445a..14bf6c2035 100644
--- a/src/com/android/launcher3/util/VibratorWrapper.java
+++ b/src/com/android/launcher3/util/VibratorWrapper.java
@@ -21,15 +21,19 @@ import static android.provider.Settings.System.HAPTIC_FEEDBACK_ENABLED;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
+import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.database.ContentObserver;
+import android.media.AudioAttributes;
 import android.os.Build;
 import android.os.VibrationEffect;
 import android.os.Vibrator;
 import android.provider.Settings;
 
+import com.android.launcher3.Utilities;
+
 /**
  * Wrapper around {@link Vibrator} to easily perform haptic feedback where necessary.
  */
@@ -39,6 +43,11 @@ public class VibratorWrapper {
     public static final MainThreadInitializedObject<VibratorWrapper> INSTANCE =
             new MainThreadInitializedObject<>(VibratorWrapper::new);
 
+    public static final AudioAttributes VIBRATION_ATTRS = new AudioAttributes.Builder()
+            .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION)
+            .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+            .build();
+
     public static final VibrationEffect EFFECT_CLICK =
             createPredefined(VibrationEffect.EFFECT_CLICK);
 
@@ -81,4 +90,24 @@ public class VibratorWrapper {
             UI_HELPER_EXECUTOR.execute(() -> mVibrator.vibrate(vibrationEffect));
         }
     }
+
+    /**
+     * Vibrates with a single primitive, if supported, or use a fallback effect instead. This only
+     * vibrates if haptic feedback is available and enabled.
+     */
+    @SuppressLint("NewApi")
+    public void vibrate(int primitiveId, float primitiveScale, VibrationEffect fallbackEffect) {
+        if (mHasVibrator && mIsHapticFeedbackEnabled) {
+            UI_HELPER_EXECUTOR.execute(() -> {
+                if (Utilities.ATLEAST_R && primitiveId >= 0
+                        && mVibrator.areAllPrimitivesSupported(primitiveId)) {
+                    mVibrator.vibrate(VibrationEffect.startComposition()
+                            .addPrimitive(primitiveId, primitiveScale)
+                            .compose(), VIBRATION_ATTRS);
+                } else {
+                    mVibrator.vibrate(fallbackEffect, VIBRATION_ATTRS);
+                }
+            });
+        }
+    }
 }
-- 
GitLab


From 47f935dbbea621d9ae149fc469ec693155f32498 Mon Sep 17 00:00:00 2001
From: Stevie Kideckel <kideckel@google.com>
Date: Wed, 26 May 2021 16:54:45 +0000
Subject: [PATCH 1273/1664] Add the DefaultItemAnimator, without change
 animations

Change animations cause the addition of another view to be able to
crossfade/interpolate the two. Disabling change animations prevents us
losing the focus when a header row changes due to expanding or
collapsing.

Test: verified locally
Bug: 183378651
Change-Id: I07837b41748b5206936321c08d376069fa81b363
---
 .../launcher3/widget/picker/WidgetsFullSheet.java        | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index c09beb6e16..fb6ac0e090 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -41,6 +41,7 @@ import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.launcher3.DeviceProfile;
@@ -677,6 +678,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
 
         private final int mAdapterType;
         private final WidgetsListAdapter mWidgetsListAdapter;
+        private final DefaultItemAnimator mWidgetsListItemAnimator;
 
         private WidgetsRecyclerView mWidgetsRecyclerView;
 
@@ -703,13 +705,16 @@ public class WidgetsFullSheet extends BaseWidgetSheet
                 default:
                     break;
             }
+            mWidgetsListItemAnimator = new DefaultItemAnimator();
+            // Disable change animations because it disrupts the item focus upon adapter item
+            // change.
+            mWidgetsListItemAnimator.setSupportsChangeAnimations(false);
         }
 
         void setup(WidgetsRecyclerView recyclerView) {
             mWidgetsRecyclerView = recyclerView;
             mWidgetsRecyclerView.setAdapter(mWidgetsListAdapter);
-            // Disables animation because it disrupts the item focus upon adapter item change.
-            mWidgetsRecyclerView.setItemAnimator(null);
+            mWidgetsRecyclerView.setItemAnimator(mWidgetsListItemAnimator);
             mWidgetsRecyclerView.setHeaderViewDimensionsProvider(WidgetsFullSheet.this);
             mWidgetsRecyclerView.setEdgeEffectFactory(
                     ((TopRoundedCornerView) mContent).createEdgeEffectFactory());
-- 
GitLab


From 14b6898126b50e2c94994beb0a4fd74f2cb07150 Mon Sep 17 00:00:00 2001
From: zakcohen <zakcohen@google.com>
Date: Tue, 4 May 2021 11:17:28 -0700
Subject: [PATCH 1274/1664] Update colors for Digital Wellbeing Toast.

Bug: 179922117
Test: Local
Change-Id: Iec58238ba92218ab2a22027b9c821804fb0d9df2
---
 quickstep/res/drawable/bg_wellbeing_toast.xml    | 6 ++++--
 quickstep/res/layout/digital_wellbeing_toast.xml | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/quickstep/res/drawable/bg_wellbeing_toast.xml b/quickstep/res/drawable/bg_wellbeing_toast.xml
index 65730f6cc7..4dc981f4a4 100644
--- a/quickstep/res/drawable/bg_wellbeing_toast.xml
+++ b/quickstep/res/drawable/bg_wellbeing_toast.xml
@@ -13,7 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="#E61A73E8" />
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:priv-android="http://schemas.android.com/apk/prv/res/android"
+    android:shape="rectangle">
+    <solid android:color="?priv-android:attr/colorAccentPrimary" />
     <corners android:radius="?android:attr/dialogCornerRadius" />
 </shape>
\ No newline at end of file
diff --git a/quickstep/res/layout/digital_wellbeing_toast.xml b/quickstep/res/layout/digital_wellbeing_toast.xml
index 83594e4ff3..c4642e443c 100644
--- a/quickstep/res/layout/digital_wellbeing_toast.xml
+++ b/quickstep/res/layout/digital_wellbeing_toast.xml
@@ -16,12 +16,13 @@
 -->
 <TextView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:priv-android="http://schemas.android.com/apk/prv/res/android"
+    style="@style/TextTitle"
     android:layout_width="match_parent"
     android:layout_height="48dp"
     android:background="@drawable/bg_wellbeing_toast"
-    android:fontFamily="sans-serif"
     android:forceHasOverlappingRendering="false"
     android:gravity="center"
     android:importantForAccessibility="noHideDescendants"
-    android:textColor="@android:color/white"
+    android:textColor="?priv-android:attr/textColorOnAccent"
     android:textSize="14sp"/>
\ No newline at end of file
-- 
GitLab


From b7773f93cf3f85cf18fd1661fb3e008682d358e5 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Tue, 25 May 2021 18:12:35 +0100
Subject: [PATCH 1275/1664] Adjust the widgets fitting algorithm to mitigate
 over packing issue

If we are fitting more than one widgets / shortcuts on the same row,
we will only allow the total width to be n - 1 cells, where n is the
grid width in cells.

Test: Run WidgetsTableUtils robolectric test.
Bug: 189103942
Change-Id: I2f23cb08fe95d68562188cc7b1852d99d7093dc0
---
 .../picker/util/WidgetsTableUtilsTest.java    | 36 ++++++++++---------
 .../widget/util/WidgetsTableUtils.java        | 14 +++++---
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/util/WidgetsTableUtilsTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/util/WidgetsTableUtilsTest.java
index e68edd3f3a..56d7d68731 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/util/WidgetsTableUtilsTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/util/WidgetsTableUtilsTest.java
@@ -96,12 +96,12 @@ public final class WidgetsTableUtilsTest {
         List<ArrayList<WidgetItem>> widgetItemInTable = WidgetsTableUtils.groupWidgetItemsIntoTable(
                 widgetItems, /* maxSpansPerRow= */ 5);
 
-        // Row 0: 1x1, 2x2, 2x3
-        // Row 1: 2x4
+        // Row 0: 1x1, 2x2
+        // Row 1: 2x3, 2x4
         // Row 2: 4x4
         assertThat(widgetItemInTable).hasSize(3);
-        assertThat(widgetItemInTable.get(0)).containsExactly(mWidget1x1, mWidget2x2, mWidget2x3);
-        assertThat(widgetItemInTable.get(1)).containsExactly(mWidget2x4);
+        assertThat(widgetItemInTable.get(0)).containsExactly(mWidget1x1, mWidget2x2);
+        assertThat(widgetItemInTable.get(1)).containsExactly(mWidget2x3, mWidget2x4);
         assertThat(widgetItemInTable.get(2)).containsExactly(mWidget4x4);
     }
 
@@ -114,12 +114,14 @@ public final class WidgetsTableUtilsTest {
                 widgetItems, /* maxSpansPerRow= */ 4);
 
         // Row 0: 1x1, 2x2
-        // Row 1: 2x3, 2x4
-        // Row 2: 4x4
-        assertThat(widgetItemInTable).hasSize(3);
+        // Row 1: 2x3,
+        // Row 2: 2x4,
+        // Row 3: 4x4
+        assertThat(widgetItemInTable).hasSize(4);
         assertThat(widgetItemInTable.get(0)).containsExactly(mWidget1x1, mWidget2x2);
-        assertThat(widgetItemInTable.get(1)).containsExactly(mWidget2x3, mWidget2x4);
-        assertThat(widgetItemInTable.get(2)).containsExactly(mWidget4x4);
+        assertThat(widgetItemInTable.get(1)).containsExactly(mWidget2x3);
+        assertThat(widgetItemInTable.get(2)).containsExactly(mWidget2x4);
+        assertThat(widgetItemInTable.get(3)).containsExactly(mWidget4x4);
     }
 
     @Test
@@ -131,14 +133,16 @@ public final class WidgetsTableUtilsTest {
                 widgetItems, /* maxSpansPerRow= */ 4);
 
         // Row 0: 1x1, 2x2
-        // Row 1: 2x3, 2x4
-        // Row 2: 4x4
-        // Row 3: shortcut3, shortcut1, shortcut2
-        assertThat(widgetItemInTable).hasSize(4);
+        // Row 1: 2x3,
+        // Row 2: 2x4,
+        // Row 3: 4x4
+        // Row 4: shortcut3, shortcut1, shortcut2
+        assertThat(widgetItemInTable).hasSize(5);
         assertThat(widgetItemInTable.get(0)).containsExactly(mWidget1x1, mWidget2x2);
-        assertThat(widgetItemInTable.get(1)).containsExactly(mWidget2x3, mWidget2x4);
-        assertThat(widgetItemInTable.get(2)).containsExactly(mWidget4x4);
-        assertThat(widgetItemInTable.get(3)).containsExactly(mShortcut3, mShortcut2, mShortcut1);
+        assertThat(widgetItemInTable.get(1)).containsExactly(mWidget2x3);
+        assertThat(widgetItemInTable.get(2)).containsExactly(mWidget2x4);
+        assertThat(widgetItemInTable.get(3)).containsExactly(mWidget4x4);
+        assertThat(widgetItemInTable.get(4)).containsExactly(mShortcut3, mShortcut2, mShortcut1);
     }
 
     private void initTestWidgets() {
diff --git a/src/com/android/launcher3/widget/util/WidgetsTableUtils.java b/src/com/android/launcher3/widget/util/WidgetsTableUtils.java
index e73d661684..7294a3ab31 100644
--- a/src/com/android/launcher3/widget/util/WidgetsTableUtils.java
+++ b/src/com/android/launcher3/widget/util/WidgetsTableUtils.java
@@ -52,9 +52,10 @@ public final class WidgetsTableUtils {
      * <p>Grouping:
      * 1. Widgets and shortcuts never group together in the same row.
      * 2. The ordered widgets are grouped together in the same row until their total horizontal
-     *    spans exceed the {@code maxSpansPerRow}.
+     *    spans exceed the {@code maxSpansPerRow} - 1.
      * 3. The order shortcuts are grouped together in the same row until their total horizontal
-     *    spans exceed the {@code maxSpansPerRow}.
+     *    spans exceed the {@code maxSpansPerRow} - 1.
+     * 4. If there is only one widget in a row, its width may exceed the {@code maxSpansPerRow}.
      */
     public static List<ArrayList<WidgetItem>> groupWidgetItemsIntoTable(
             List<WidgetItem> widgetItems, final int maxSpansPerRow) {
@@ -70,10 +71,15 @@ public final class WidgetsTableUtils {
             int numOfWidgetItems = widgetItemsAtRow.size();
             int totalHorizontalSpan = widgetItemsAtRow.stream().map(item -> item.spanX)
                     .reduce(/* default= */ 0, Integer::sum);
+            int totalHorizontalSpanAfterAddingWidget = widgetItem.spanX + totalHorizontalSpan;
             if (numOfWidgetItems == 0) {
                 widgetItemsAtRow.add(widgetItem);
-            } else if (widgetItem.spanX + totalHorizontalSpan <= maxSpansPerRow
-                    && widgetItem.hasSameType(widgetItemsAtRow.get(numOfWidgetItems - 1))) {
+            } else if (
+                    // The max spans per row is reduced by 1 to ensure we don't pack too many
+                    // 1xn widgets on the same row, which may reduce the space for rendering a
+                    // widget's description.
+                    totalHorizontalSpanAfterAddingWidget <= maxSpansPerRow - 1
+                            && widgetItem.hasSameType(widgetItemsAtRow.get(numOfWidgetItems - 1))) {
                 // Group items in the same row if
                 // 1. they are with the same type, i.e. a row can only have widgets or shortcuts but
                 //    never a mix of both.
-- 
GitLab


From 9909544c8a575d82b31bed71fb8d77960bd806ff Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Tue, 25 May 2021 12:34:47 -0700
Subject: [PATCH 1276/1664] Update gesture nav colors and animation for
 dark/light theming

- Added light mode gesture feedback animations
- Added color resources for the fake launcher wallpaper. Also using these color resources in the feedback animations for consistency
- Using fake previous app task color in feedback animations for consistency

Bug: 169687177
Test: manual
Change-Id: I1d28212e02c2ae750ce6241b64aa90f52b827c76
---
 ...ture_tutorial_action_button_background.xml |   21 +-
 ...e_tutorial_motion_back_left_dark_mode.xml} |    0
 ...e_tutorial_motion_back_left_light_mode.xml | 1412 +++++++++++++++
 ..._tutorial_motion_back_right_dark_mode.xml} |    0
 ..._tutorial_motion_back_right_light_mode.xml | 1413 +++++++++++++++
 ...esture_tutorial_motion_home_dark_mode.xml} |    2 +-
 ...esture_tutorial_motion_home_light_mode.xml | 1254 +++++++++++++
 ...re_tutorial_motion_overview_dark_mode.xml} |    4 +-
 ...webpage.xml => mock_webpage_dark_mode.xml} |    0
 .../res/drawable/mock_webpage_light_mode.xml  |  263 +++
 .../res/layout/gesture_tutorial_fragment.xml  |   22 +-
 .../BackGestureTutorialController.java        |    2 +-
 .../BackGestureTutorialFragment.java          |   10 +-
 .../HomeGestureTutorialController.java        |    4 +-
 .../HomeGestureTutorialFragment.java          |    6 +-
 .../OverviewGestureTutorialController.java    |    2 +-
 .../OverviewGestureTutorialFragment.java      |    6 +-
 .../SwipeUpGestureTutorialController.java     |    6 +-
 .../interaction/TutorialController.java       |   23 +-
 .../interaction/TutorialFragment.java         |   11 +-
 ...re_tutorial_motion_overview_light_mode.xml | 1587 +++++++++++++++++
 res/values/colors.xml                         |    3 +
 22 files changed, 6009 insertions(+), 42 deletions(-)
 rename quickstep/res/drawable/{gesture_tutorial_motion_back_left.xml => gesture_tutorial_motion_back_left_dark_mode.xml} (100%)
 create mode 100644 quickstep/res/drawable/gesture_tutorial_motion_back_left_light_mode.xml
 rename quickstep/res/drawable/{gesture_tutorial_motion_back_right.xml => gesture_tutorial_motion_back_right_dark_mode.xml} (100%)
 create mode 100644 quickstep/res/drawable/gesture_tutorial_motion_back_right_light_mode.xml
 rename quickstep/res/drawable/{gesture_tutorial_motion_home.xml => gesture_tutorial_motion_home_dark_mode.xml} (99%)
 create mode 100644 quickstep/res/drawable/gesture_tutorial_motion_home_light_mode.xml
 rename quickstep/res/drawable/{gesture_tutorial_motion_overview.xml => gesture_tutorial_motion_overview_dark_mode.xml} (99%)
 rename quickstep/res/drawable/{mock_webpage.xml => mock_webpage_dark_mode.xml} (100%)
 create mode 100644 quickstep/res/drawable/mock_webpage_light_mode.xml
 create mode 100644 res/drawable/gesture_tutorial_motion_overview_light_mode.xml

diff --git a/quickstep/res/drawable/gesture_tutorial_action_button_background.xml b/quickstep/res/drawable/gesture_tutorial_action_button_background.xml
index 6fc2b7657a..ac6a52a623 100644
--- a/quickstep/res/drawable/gesture_tutorial_action_button_background.xml
+++ b/quickstep/res/drawable/gesture_tutorial_action_button_background.xml
@@ -13,8 +13,19 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="50dp"/>
-    <solid android:color="@color/gesture_tutorial_primary_color"/>
-</shape>
\ No newline at end of file
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape
+            android:id="@android:id/mask"
+            android:shape="rectangle">
+            <corners android:radius="50dp"/>
+        </shape>
+    </item>
+    <item>
+        <shape
+            android:shape="rectangle">
+            <corners android:radius="50dp"/>
+            <solid android:color="@color/gesture_tutorial_primary_color"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_motion_back_left.xml b/quickstep/res/drawable/gesture_tutorial_motion_back_left_dark_mode.xml
similarity index 100%
rename from quickstep/res/drawable/gesture_tutorial_motion_back_left.xml
rename to quickstep/res/drawable/gesture_tutorial_motion_back_left_dark_mode.xml
diff --git a/quickstep/res/drawable/gesture_tutorial_motion_back_left_light_mode.xml b/quickstep/res/drawable/gesture_tutorial_motion_back_left_light_mode.xml
new file mode 100644
index 0000000000..c0eafda4e9
--- /dev/null
+++ b/quickstep/res/drawable/gesture_tutorial_motion_back_left_light_mode.xml
@@ -0,0 +1,1412 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_1_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_2_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_3_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_4_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_5_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_6_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_7_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_8_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_9_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_10_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_11_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_12_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_13_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="1367"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="283"
+                    android:propertyName="scaleX"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0.88012"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="283"
+                    android:propertyName="scaleY"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0.88012"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2417"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_1_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_2_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_3_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_4_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_5_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_6_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_7_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_8_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_9_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_10_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_11_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_12_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_13_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_14_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_15_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_16_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_17_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_18_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_19_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_20_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_21_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_22_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_23_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_D_0_P_0_G_0_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="667"
+                    android:pathData="M -60,53C -50,53 -10,53 0,53"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="217">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="333"
+                    android:pathData="M 0,53C 0,53 0,53 0,53"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="883">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0.333 0,0 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="333"
+                    android:pathData="M 0,53C -10,53 -50,53 -60,53"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="1217">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="217"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2467"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="417"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="383"
+                    android:valueFrom="0"
+                    android:valueTo="0.5"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="417"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="800"
+                    android:valueFrom="0.5"
+                    android:valueTo="0.5"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="200"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="0.5"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="583"
+                    android:pathData="M 39,0C 32.5,0 6.5,0 0,0"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="217">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="417"
+                    android:pathData="M 0,0C 0,0 0,0 0,0"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="800">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0.333 0.667,0.667 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="333"
+                    android:pathData="M 0,0C 6.5,0 32.5,0 39,0"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="1217">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="583"
+                    android:propertyName="scaleX"
+                    android:startOffset="217"
+                    android:valueFrom="0.5"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="583"
+                    android:propertyName="scaleY"
+                    android:startOffset="217"
+                    android:valueFrom="0.5"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="417"
+                    android:propertyName="scaleX"
+                    android:startOffset="800"
+                    android:valueFrom="1"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="417"
+                    android:propertyName="scaleY"
+                    android:startOffset="800"
+                    android:valueFrom="1"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="scaleX"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0.5"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="scaleY"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0.5"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="383"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2333"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="217"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="0.75"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="967"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="217"
+                    android:valueFrom="0.75"
+                    android:valueTo="0.75"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1183"
+                    android:valueFrom="0.75"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="217"
+                    android:propertyName="pathData"
+                    android:startOffset="0"
+                    android:valueFrom="M-206.5 13.5 C-186.34,13.5 -170,29.84 -170,50 C-170,70.16 -186.34,86.5 -206.5,86.5 C-226.66,86.5 -243,70.16 -243,50 C-243,29.84 -226.66,13.5 -206.5,13.5c "
+                    android:valueTo="M-206 0 C-178.39,0 -156,22.39 -156,50 C-156,77.61 -178.39,100 -206,100 C-233.61,100 -256,77.61 -256,50 C-256,22.39 -233.61,0 -206,0c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="583"
+                    android:propertyName="pathData"
+                    android:startOffset="217"
+                    android:valueFrom="M-206 0 C-178.39,0 -156,22.39 -156,50 C-156,77.61 -178.39,100 -206,100 C-233.61,100 -256,77.61 -256,50 C-256,22.39 -233.61,0 -206,0c "
+                    android:valueTo="M0 0 C27.61,0 50,22.39 50,50 C50,77.61 27.61,100 0,100 C-27.61,100 -50,77.61 -50,50 C-50,22.39 -27.61,0 0,0c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="383"
+                    android:propertyName="pathData"
+                    android:startOffset="800"
+                    android:valueFrom="M0 0 C27.61,0 50,22.39 50,50 C50,77.61 27.61,100 0,100 C-27.61,100 -50,77.61 -50,50 C-50,22.39 -27.61,0 0,0c "
+                    android:valueTo="M0 0 C27.61,0 50,22.39 50,50 C50,77.61 27.61,100 0,100 C-27.61,100 -50,77.61 -50,50 C-50,22.39 -27.61,0 0,0c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="pathData"
+                    android:startOffset="1183"
+                    android:valueFrom="M0 0 C27.61,0 50,22.39 50,50 C50,77.61 27.61,100 0,100 C-27.61,100 -50,77.61 -50,50 C-50,22.39 -27.61,0 0,0c "
+                    android:valueTo="M0 13.5 C20.16,13.5 36.5,29.84 36.5,50 C36.5,70.16 20.16,86.5 0,86.5 C-20.16,86.5 -36.5,70.16 -36.5,50 C-36.5,29.84 -20.16,13.5 0,13.5c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="1767"
+                    android:propertyName="translateX"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <aapt:attr name="android:drawable">
+        <vector
+            android:width="412dp"
+            android:height="892dp"
+            android:viewportHeight="892"
+            android:viewportWidth="412">
+            <group android:name="_R_G">
+                <group
+                    android:name="_R_G_L_5_G"
+                    android:translateX="206"
+                    android:translateY="446">
+                    <path
+                        android:name="_R_G_L_5_G_D_0_P_0"
+                        android:fillAlpha="1"
+                        android:fillColor="#dadce0"
+                        android:fillType="nonZero"
+                        android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c " />
+                </group>
+                <group
+                    android:name="_R_G_L_4_G"
+                    android:pivotX="206"
+                    android:pivotY="446"
+                    android:scaleX="1"
+                    android:scaleY="1">
+                    <group android:name="_R_G_L_4_G_L_0_G">
+                        <group android:name="_R_G_L_4_G_L_0_G_L_0_G">
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#f1f3f4"
+                                android:fillType="nonZero"
+                                android:pathData=" M412 101 C412,101 412,892 412,892 C412,892 0,892 0,892 C0,892 0,101 0,101 C0,101 412,101 412,101c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_1_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#e8eaed"
+                                android:fillType="nonZero"
+                                android:pathData=" M412 0 C412,0 412,101 412,101 C412,101 0,101 0,101 C0,101 0,0 0,0 C0,0 412,0 412,0c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_2_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M383 804 C383,816.15 373.15,826 361,826 C361,826 51,826 51,826 C38.85,826 29,816.15 29,804 C29,791.85 38.85,782 51,782 C51,782 361,782 361,782 C373.15,782 383,791.85 383,804c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_3_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M201 47 C201,47 201,75 201,75 C201,77.21 199.21,79 197,79 C197,79 38,79 38,79 C35.79,79 34,77.21 34,75 C34,75 34,47 34,47 C34,44.79 35.79,43 38,43 C38,43 197,43 197,43 C199.21,43 201,44.79 201,47c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_4_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M388 47 C388,47 388,75 388,75 C388,77.21 386.21,79 384,79 C384,79 356,79 356,79 C353.79,79 352,77.21 352,75 C352,75 352,47 352,47 C352,44.79 353.79,43 356,43 C356,43 384,43 384,43 C386.21,43 388,44.79 388,47c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_5_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M336 47 C336,47 336,75 336,75 C336,77.21 334.21,79 332,79 C332,79 304,79 304,79 C301.79,79 300,77.21 300,75 C300,75 300,47 300,47 C300,44.79 301.79,43 304,43 C304,43 332,43 332,43 C334.21,43 336,44.79 336,47c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_6_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M70 618 C70,630.15 60.15,640 48,640 C35.85,640 26,630.15 26,618 C26,605.85 35.85,596 48,596 C60.15,596 70,605.85 70,618c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_7_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M70 396 C70,408.15 60.15,418 48,418 C35.85,418 26,408.15 26,396 C26,383.85 35.85,374 48,374 C60.15,374 70,383.85 70,396c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_8_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M394 248 C394,248 394,324 394,324 C394,333.94 385.94,342 376,342 C376,342 142,342 142,342 C132.06,342 124,333.94 124,324 C124,324 124,248 124,248 C124,238.06 132.06,230 142,230 C142,230 376,230 376,230 C385.94,230 394,238.06 394,248c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_9_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M393.94 468.38 C393.94,468.38 393.94,481.5 393.94,481.5 C393.94,483.71 392.15,485.5 389.94,485.5 C389.94,485.5 303.5,485.5 303.5,485.5 C301.29,485.5 299.5,483.71 299.5,481.5 C299.5,481.5 299.5,468.38 299.5,468.38 C299.5,466.17 301.29,464.38 303.5,464.38 C303.5,464.38 389.94,464.38 389.94,464.38 C392.15,464.38 393.94,466.17 393.94,468.38c  M394 468 C394,477.67 386.17,485.5 376.5,485.5 C376.5,485.5 290,485.5 290,485.5 C280.33,485.5 272.5,477.67 272.5,468 C272.5,458.34 280.33,450.5 290,450.5 C290,450.5 376.5,450.5 376.5,450.5 C386.17,450.5 394,458.34 394,468c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_10_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M394 494 C394,494 394,547 394,547 C394,549.21 392.21,551 390,551 C390,551 164,551 164,551 C161.79,551 160,549.21 160,547 C160,547 160,494 160,494 C160,491.79 161.79,490 164,490 C164,490 390,490 390,490 C392.21,490 394,491.79 394,494c  M394 508 C394,508 394,545 394,545 C394,554.94 385.94,563 376,563 C376,563 142,563 142,563 C132.06,563 124,554.94 124,545 C124,545 124,508 124,508 C124,498.06 132.06,490 142,490 C142,490 376,490 376,490 C385.94,490 394,498.06 394,508c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_11_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M394 690 C394,690 394,727 394,727 C394,736.94 385.94,745 376,745 C376,745 142,745 142,745 C132.06,745 124,736.94 124,727 C124,727 124,690 124,690 C124,680.06 132.06,672 142,672 C142,672 376,672 376,672 C385.94,672 394,680.06 394,690c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_12_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#e8eaed"
+                                android:fillType="nonZero"
+                                android:pathData=" M267.5 617 C267.5,626.67 259.67,634.5 250,634.5 C250,634.5 104.5,634.5 104.5,634.5 C94.84,634.5 87,626.67 87,617 C87,607.34 94.84,599.5 104.5,599.5 C104.5,599.5 250,599.5 250,599.5 C259.67,599.5 267.5,607.34 267.5,617c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_13_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#e8eaed"
+                                android:fillType="nonZero"
+                                android:pathData=" M299 395.5 C299,405.17 291.16,413 281.5,413 C281.5,413 104.5,413 104.5,413 C94.84,413 87,405.17 87,395.5 C87,385.84 94.84,378 104.5,378 C104.5,378 281.5,378 281.5,378 C291.16,378 299,385.84 299,395.5c " />
+                        </group>
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_3_G"
+                    android:scaleY="0">
+                    <group
+                        android:name="_R_G_L_3_G_L_0_G"
+                        android:scaleY="0">
+                        <group
+                            android:name="_R_G_L_3_G_L_0_G_L_0_G"
+                            android:scaleY="0">
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_0_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M412 0 C412,0 412,892 412,892 C412,892 0,892 0,892 C0,892 0,0 0,0 C0,0 412,0 412,0c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_1_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#e8eaed"
+                                android:fillType="nonZero"
+                                android:pathData=" M412 0 C412,0 412,101 412,101 C412,101 0,101 0,101 C0,101 0,0 0,0 C0,0 412,0 412,0c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_2_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M195 143 C195,143 195,153 195,153 C195,155.21 193.21,157 191,157 C191,157 106,157 106,157 C103.79,157 102,155.21 102,153 C102,153 102,143 102,143 C102,140.79 103.79,139 106,139 C106,139 191,139 191,139 C193.21,139 195,140.79 195,143c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_3_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M270 165 C270,165 270,173 270,173 C270,175.21 268.21,177 266,177 C266,177 106,177 106,177 C103.79,177 102,175.21 102,173 C102,173 102,165 102,165 C102,162.79 103.79,161 106,161 C106,161 266,161 266,161 C268.21,161 270,162.79 270,165c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_4_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M222 231 C222,231 222,241 222,241 C222,243.21 220.21,245 218,245 C218,245 106,245 106,245 C103.79,245 102,243.21 102,241 C102,241 102,231 102,231 C102,228.79 103.79,227 106,227 C106,227 218,227 218,227 C220.21,227 222,228.79 222,231c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_5_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M241 253 C241,253 241,261 241,261 C241,263.21 239.21,265 237,265 C237,265 106,265 106,265 C103.79,265 102,263.21 102,261 C102,261 102,253 102,253 C102,250.79 103.79,249 106,249 C106,249 237,249 237,249 C239.21,249 241,250.79 241,253c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_6_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M214 319 C214,319 214,329 214,329 C214,331.21 212.21,333 210,333 C210,333 106,333 106,333 C103.79,333 102,331.21 102,329 C102,329 102,319 102,319 C102,316.79 103.79,315 106,315 C106,315 210,315 210,315 C212.21,315 214,316.79 214,319c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_7_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M333 341 C333,341 333,349 333,349 C333,351.21 331.21,353 329,353 C329,353 106,353 106,353 C103.79,353 102,351.21 102,349 C102,349 102,341 102,341 C102,338.79 103.79,337 106,337 C106,337 329,337 329,337 C331.21,337 333,338.79 333,341c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_8_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M238 407 C238,407 238,417 238,417 C238,419.21 236.21,421 234,421 C234,421 106,421 106,421 C103.79,421 102,419.21 102,417 C102,417 102,407 102,407 C102,404.79 103.79,403 106,403 C106,403 234,403 234,403 C236.21,403 238,404.79 238,407c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_9_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M295 429 C295,429 295,437 295,437 C295,439.21 293.21,441 291,441 C291,441 106,441 106,441 C103.79,441 102,439.21 102,437 C102,437 102,429 102,429 C102,426.79 103.79,425 106,425 C106,425 291,425 291,425 C293.21,425 295,426.79 295,429c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_10_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M168 495 C168,495 168,505 168,505 C168,507.21 166.21,509 164,509 C164,509 106,509 106,509 C103.79,509 102,507.21 102,505 C102,505 102,495 102,495 C102,492.79 103.79,491 106,491 C106,491 164,491 164,491 C166.21,491 168,492.79 168,495c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_11_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M269 517 C269,517 269,525 269,525 C269,527.21 267.21,529 265,529 C265,529 106,529 106,529 C103.79,529 102,527.21 102,525 C102,525 102,517 102,517 C102,514.79 103.79,513 106,513 C106,513 265,513 265,513 C267.21,513 269,514.79 269,517c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_12_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M235 583 C235,583 235,593 235,593 C235,595.21 233.21,597 231,597 C231,597 106,597 106,597 C103.79,597 102,595.21 102,593 C102,593 102,583 102,583 C102,580.79 103.79,579 106,579 C106,579 231,579 231,579 C233.21,579 235,580.79 235,583c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_13_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M295 605 C295,605 295,613 295,613 C295,615.21 293.21,617 291,617 C291,617 106,617 106,617 C103.79,617 102,615.21 102,613 C102,613 102,605 102,605 C102,602.79 103.79,601 106,601 C106,601 291,601 291,601 C293.21,601 295,602.79 295,605c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_14_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M223 671 C223,671 223,681 223,681 C223,683.21 221.21,685 219,685 C219,685 106,685 106,685 C103.79,685 102,683.21 102,681 C102,681 102,671 102,671 C102,668.79 103.79,667 106,667 C106,667 219,667 219,667 C221.21,667 223,668.79 223,671c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_15_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M246 693 C246,693 246,701 246,701 C246,703.21 244.21,705 242,705 C242,705 106,705 106,705 C103.79,705 102,703.21 102,701 C102,701 102,693 102,693 C102,690.79 103.79,689 106,689 C106,689 242,689 242,689 C244.21,689 246,690.79 246,693c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_16_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M388 798 C388,798 388,798 388,798 C388,813.45 375.45,826 360,826 C360,826 267,826 267,826 C251.55,826 239,813.45 239,798 C239,798 239,798 239,798 C239,782.55 251.55,770 267,770 C267,770 360,770 360,770 C375.45,770 388,782.55 388,798c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_17_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#f8f9fa"
+                                android:fillType="nonZero"
+                                android:pathData=" M377 47 C377,47 377,75 377,75 C377,77.21 375.21,79 373,79 C373,79 38,79 38,79 C35.79,79 34,77.21 34,75 C34,75 34,47 34,47 C34,44.79 35.79,43 38,43 C38,43 373,43 373,43 C375.21,43 377,44.79 377,47c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_18_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M82 157 C82,172.46 69.46,185 54,185 C38.54,185 26,172.46 26,157 C26,141.54 38.54,129 54,129 C69.46,129 82,141.54 82,157c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_19_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M82 245 C82,260.46 69.46,273 54,273 C38.54,273 26,260.46 26,245 C26,229.54 38.54,217 54,217 C69.46,217 82,229.54 82,245c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_20_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M82 333 C82,348.46 69.46,361 54,361 C38.54,361 26,348.46 26,333 C26,317.54 38.54,305 54,305 C69.46,305 82,317.54 82,333c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_21_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M82 421 C82,436.46 69.46,449 54,449 C38.54,449 26,436.46 26,421 C26,405.54 38.54,393 54,393 C69.46,393 82,405.54 82,421c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_22_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M82 509 C82,524.46 69.46,537 54,537 C38.54,537 26,524.46 26,509 C26,493.54 38.54,481 54,481 C69.46,481 82,493.54 82,509c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_23_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M82 597 C82,612.46 69.46,625 54,625 C38.54,625 26,612.46 26,597 C26,581.54 38.54,569 54,569 C69.46,569 82,581.54 82,597c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_24_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M82 685 C82,700.46 69.46,713 54,713 C38.54,713 26,700.46 26,685 C26,669.54 38.54,657 54,657 C69.46,657 82,669.54 82,685c " />
+                        </group>
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_2_G"
+                    android:scaleY="0"
+                    android:translateX="28.25"
+                    android:translateY="443">
+                    <group
+                        android:name="_R_G_L_2_G_D_0_P_0_G_0_T_0"
+                        android:translateX="-60"
+                        android:translateY="53">
+                        <path
+                            android:name="_R_G_L_2_G_D_0_P_0"
+                            android:fillAlpha="1"
+                            android:fillColor="#ffffff"
+                            android:fillType="nonZero"
+                            android:pathData=" M28.25 0 C28.25,31.2 2.95,56.5 -28.25,56.5 C-28.25,56.5 -28.25,-56.5 -28.25,-56.5 C2.95,-56.5 28.25,-31.2 28.25,0c " />
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_1_G"
+                    android:rotation="180"
+                    android:scaleY="0"
+                    android:translateX="25.75"
+                    android:translateY="496">
+                    <group
+                        android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0"
+                        android:scaleX="0.5"
+                        android:scaleY="0.5"
+                        android:translateX="39"
+                        android:translateY="0">
+                        <path
+                            android:name="_R_G_L_1_G_D_0_P_0"
+                            android:fillAlpha="0"
+                            android:fillColor="#3c3e40"
+                            android:fillType="nonZero"
+                            android:pathData=" M3.87 -13.45 C3.07,-14.21 1.8,-14.18 1.04,-13.38 C0.28,-12.58 0.31,-11.31 1.11,-10.55 C1.11,-10.55 9.75,-2.32 9.75,-2.32 C9.75,-2.32 -14.75,-2.32 -14.75,-2.32 C-15.85,-2.32 -16.75,-1.43 -16.75,-0.32 C-16.75,0.78 -15.85,1.68 -14.75,1.68 C-14.75,1.68 9.94,1.68 9.94,1.68 C9.94,1.68 1.07,10.59 1.07,10.59 C0.29,11.37 0.29,12.64 1.08,13.42 C1.86,14.2 3.13,14.19 3.9,13.41 C3.9,13.41 16.17,1.09 16.17,1.09 C16.55,0.71 16.76,0.19 16.75,-0.35 C16.74,-0.89 16.52,-1.4 16.13,-1.77 C16.13,-1.77 3.87,-13.45 3.87,-13.45c " />
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_0_G"
+                    android:translateX="206"
+                    android:translateY="446">
+                    <path
+                        android:name="_R_G_L_0_G_D_0_P_0"
+                        android:fillAlpha="0"
+                        android:fillColor="#84ba69"
+                        android:fillType="nonZero"
+                        android:pathData=" M-206.5 13.5 C-186.34,13.5 -170,29.84 -170,50 C-170,70.16 -186.34,86.5 -206.5,86.5 C-226.66,86.5 -243,70.16 -243,50 C-243,29.84 -226.66,13.5 -206.5,13.5c " />
+                </group>
+            </group>
+            <group android:name="time_group" />
+        </vector>
+    </aapt:attr>
+</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_motion_back_right.xml b/quickstep/res/drawable/gesture_tutorial_motion_back_right_dark_mode.xml
similarity index 100%
rename from quickstep/res/drawable/gesture_tutorial_motion_back_right.xml
rename to quickstep/res/drawable/gesture_tutorial_motion_back_right_dark_mode.xml
diff --git a/quickstep/res/drawable/gesture_tutorial_motion_back_right_light_mode.xml b/quickstep/res/drawable/gesture_tutorial_motion_back_right_light_mode.xml
new file mode 100644
index 0000000000..c24e5a5012
--- /dev/null
+++ b/quickstep/res/drawable/gesture_tutorial_motion_back_right_light_mode.xml
@@ -0,0 +1,1413 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_1_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_2_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_3_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_4_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_5_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_6_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_7_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_8_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_9_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_10_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_11_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_12_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_13_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="1367"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="283"
+                    android:propertyName="scaleX"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0.88012"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="283"
+                    android:propertyName="scaleY"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0.88012"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2417"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_1_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_2_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_3_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_4_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_5_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_6_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_7_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_8_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_9_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_10_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_11_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_12_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_13_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_14_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_15_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_16_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_17_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_18_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_19_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_20_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_21_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_22_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_23_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="1417"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_D_0_P_0_G_0_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="667"
+                    android:pathData="M 414,53C 404.333,53 365.667,53 356,53"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="217">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="333"
+                    android:pathData="M 356,53C 356,53 356,53 356,53"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="883">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0.333 0,0 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="333"
+                    android:pathData="M 356,53C 365.667,53 404.333,53 414,53"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="1217">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="217"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2467"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="417"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="383"
+                    android:valueFrom="0"
+                    android:valueTo="0.5"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="417"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="800"
+                    android:valueFrom="0.5"
+                    android:valueTo="0.5"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="200"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1217"
+                    android:valueFrom="0.5"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="583"
+                    android:pathData="M -407,0C -399,0 -367,0 -359,0"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="217">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="417"
+                    android:pathData="M -359,0C -359,0 -359,0 -359,0"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="800">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0.333 0.667,0.667 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="333"
+                    android:pathData="M -359,0C -367,0 -399,0 -407,0"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="1217">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="583"
+                    android:propertyName="scaleX"
+                    android:startOffset="217"
+                    android:valueFrom="0.5"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="583"
+                    android:propertyName="scaleY"
+                    android:startOffset="217"
+                    android:valueFrom="0.5"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="417"
+                    android:propertyName="scaleX"
+                    android:startOffset="800"
+                    android:valueFrom="1"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="417"
+                    android:propertyName="scaleY"
+                    android:startOffset="800"
+                    android:valueFrom="1"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="scaleX"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0.5"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="scaleY"
+                    android:startOffset="1217"
+                    android:valueFrom="1"
+                    android:valueTo="0.5"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="383"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2333"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="217"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="0.75"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="967"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="217"
+                    android:valueFrom="0.75"
+                    android:valueTo="0.75"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="1183"
+                    android:valueFrom="0.75"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="217"
+                    android:propertyName="pathData"
+                    android:startOffset="0"
+                    android:valueFrom="M205 13.5 C225.16,13.5 241.5,29.84 241.5,50 C241.5,70.16 225.16,86.5 205,86.5 C184.84,86.5 168.5,70.16 168.5,50 C168.5,29.84 184.84,13.5 205,13.5c "
+                    android:valueTo="M205.5 0 C233.11,0 255.5,22.39 255.5,50 C255.5,77.61 233.11,100 205.5,100 C177.89,100 155.5,77.61 155.5,50 C155.5,22.39 177.89,0 205.5,0c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="583"
+                    android:propertyName="pathData"
+                    android:startOffset="217"
+                    android:valueFrom="M205.5 0 C233.11,0 255.5,22.39 255.5,50 C255.5,77.61 233.11,100 205.5,100 C177.89,100 155.5,77.61 155.5,50 C155.5,22.39 177.89,0 205.5,0c "
+                    android:valueTo="M0 0 C27.61,0 50,22.39 50,50 C50,77.61 27.61,100 0,100 C-27.61,100 -50,77.61 -50,50 C-50,22.39 -27.61,0 0,0c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="383"
+                    android:propertyName="pathData"
+                    android:startOffset="800"
+                    android:valueFrom="M0 0 C27.61,0 50,22.39 50,50 C50,77.61 27.61,100 0,100 C-27.61,100 -50,77.61 -50,50 C-50,22.39 -27.61,0 0,0c "
+                    android:valueTo="M0 0 C27.61,0 50,22.39 50,50 C50,77.61 27.61,100 0,100 C-27.61,100 -50,77.61 -50,50 C-50,22.39 -27.61,0 0,0c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="pathData"
+                    android:startOffset="1183"
+                    android:valueFrom="M0 0 C27.61,0 50,22.39 50,50 C50,77.61 27.61,100 0,100 C-27.61,100 -50,77.61 -50,50 C-50,22.39 -27.61,0 0,0c "
+                    android:valueTo="M0 13.5 C20.16,13.5 36.5,29.84 36.5,50 C36.5,70.16 20.16,86.5 0,86.5 C-20.16,86.5 -36.5,70.16 -36.5,50 C-36.5,29.84 -20.16,13.5 0,13.5c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="1767"
+                    android:propertyName="translateX"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <aapt:attr name="android:drawable">
+        <vector
+            android:width="412dp"
+            android:height="892dp"
+            android:viewportHeight="892"
+            android:viewportWidth="412">
+            <group android:name="_R_G">
+                <group
+                    android:name="_R_G_L_5_G"
+                    android:translateX="206"
+                    android:translateY="446">
+                    <path
+                        android:name="_R_G_L_5_G_D_0_P_0"
+                        android:fillAlpha="1"
+                        android:fillColor="#dadce0"
+                        android:fillType="nonZero"
+                        android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c " />
+                </group>
+                <group
+                    android:name="_R_G_L_4_G"
+                    android:pivotX="206"
+                    android:pivotY="446"
+                    android:scaleX="1"
+                    android:scaleY="1">
+                    <group android:name="_R_G_L_4_G_L_0_G">
+                        <group android:name="_R_G_L_4_G_L_0_G_L_0_G">
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#f1f3f4"
+                                android:fillType="nonZero"
+                                android:pathData=" M412 101 C412,101 412,892 412,892 C412,892 0,892 0,892 C0,892 0,101 0,101 C0,101 412,101 412,101c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_1_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#e8eaed"
+                                android:fillType="nonZero"
+                                android:pathData=" M412 0 C412,0 412,101 412,101 C412,101 0,101 0,101 C0,101 0,0 0,0 C0,0 412,0 412,0c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_2_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M383 804 C383,816.15 373.15,826 361,826 C361,826 51,826 51,826 C38.85,826 29,816.15 29,804 C29,791.85 38.85,782 51,782 C51,782 361,782 361,782 C373.15,782 383,791.85 383,804c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_3_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M201 47 C201,47 201,75 201,75 C201,77.21 199.21,79 197,79 C197,79 38,79 38,79 C35.79,79 34,77.21 34,75 C34,75 34,47 34,47 C34,44.79 35.79,43 38,43 C38,43 197,43 197,43 C199.21,43 201,44.79 201,47c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_4_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M388 47 C388,47 388,75 388,75 C388,77.21 386.21,79 384,79 C384,79 356,79 356,79 C353.79,79 352,77.21 352,75 C352,75 352,47 352,47 C352,44.79 353.79,43 356,43 C356,43 384,43 384,43 C386.21,43 388,44.79 388,47c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_5_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M336 47 C336,47 336,75 336,75 C336,77.21 334.21,79 332,79 C332,79 304,79 304,79 C301.79,79 300,77.21 300,75 C300,75 300,47 300,47 C300,44.79 301.79,43 304,43 C304,43 332,43 332,43 C334.21,43 336,44.79 336,47c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_6_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M70 618 C70,630.15 60.15,640 48,640 C35.85,640 26,630.15 26,618 C26,605.85 35.85,596 48,596 C60.15,596 70,605.85 70,618c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_7_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M70 396 C70,408.15 60.15,418 48,418 C35.85,418 26,408.15 26,396 C26,383.85 35.85,374 48,374 C60.15,374 70,383.85 70,396c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_8_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M394 248 C394,248 394,324 394,324 C394,333.94 385.94,342 376,342 C376,342 142,342 142,342 C132.06,342 124,333.94 124,324 C124,324 124,248 124,248 C124,238.06 132.06,230 142,230 C142,230 376,230 376,230 C385.94,230 394,238.06 394,248c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_9_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M393.94 468.38 C393.94,468.38 393.94,481.5 393.94,481.5 C393.94,483.71 392.15,485.5 389.94,485.5 C389.94,485.5 303.5,485.5 303.5,485.5 C301.29,485.5 299.5,483.71 299.5,481.5 C299.5,481.5 299.5,468.38 299.5,468.38 C299.5,466.17 301.29,464.38 303.5,464.38 C303.5,464.38 389.94,464.38 389.94,464.38 C392.15,464.38 393.94,466.17 393.94,468.38c  M394 468 C394,477.67 386.17,485.5 376.5,485.5 C376.5,485.5 290,485.5 290,485.5 C280.33,485.5 272.5,477.67 272.5,468 C272.5,458.34 280.33,450.5 290,450.5 C290,450.5 376.5,450.5 376.5,450.5 C386.17,450.5 394,458.34 394,468c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_10_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M394 494 C394,494 394,547 394,547 C394,549.21 392.21,551 390,551 C390,551 164,551 164,551 C161.79,551 160,549.21 160,547 C160,547 160,494 160,494 C160,491.79 161.79,490 164,490 C164,490 390,490 390,490 C392.21,490 394,491.79 394,494c  M394 508 C394,508 394,545 394,545 C394,554.94 385.94,563 376,563 C376,563 142,563 142,563 C132.06,563 124,554.94 124,545 C124,545 124,508 124,508 C124,498.06 132.06,490 142,490 C142,490 376,490 376,490 C385.94,490 394,498.06 394,508c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_11_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M394 690 C394,690 394,727 394,727 C394,736.94 385.94,745 376,745 C376,745 142,745 142,745 C132.06,745 124,736.94 124,727 C124,727 124,690 124,690 C124,680.06 132.06,672 142,672 C142,672 376,672 376,672 C385.94,672 394,680.06 394,690c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_12_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#e8eaed"
+                                android:fillType="nonZero"
+                                android:pathData=" M267.5 617 C267.5,626.67 259.67,634.5 250,634.5 C250,634.5 104.5,634.5 104.5,634.5 C94.84,634.5 87,626.67 87,617 C87,607.34 94.84,599.5 104.5,599.5 C104.5,599.5 250,599.5 250,599.5 C259.67,599.5 267.5,607.34 267.5,617c " />
+                            <path
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_13_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#e8eaed"
+                                android:fillType="nonZero"
+                                android:pathData=" M299 395.5 C299,405.17 291.16,413 281.5,413 C281.5,413 104.5,413 104.5,413 C94.84,413 87,405.17 87,395.5 C87,385.84 94.84,378 104.5,378 C104.5,378 281.5,378 281.5,378 C291.16,378 299,385.84 299,395.5c " />
+                        </group>
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_3_G"
+                    android:scaleY="0">
+                    <group
+                        android:name="_R_G_L_3_G_L_0_G"
+                        android:scaleY="0">
+                        <group
+                            android:name="_R_G_L_3_G_L_0_G_L_0_G"
+                            android:scaleY="0">
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_0_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M412 0 C412,0 412,892 412,892 C412,892 0,892 0,892 C0,892 0,0 0,0 C0,0 412,0 412,0c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_1_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#e8eaed"
+                                android:fillType="nonZero"
+                                android:pathData=" M412 0 C412,0 412,101 412,101 C412,101 0,101 0,101 C0,101 0,0 0,0 C0,0 412,0 412,0c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_2_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M195 143 C195,143 195,153 195,153 C195,155.21 193.21,157 191,157 C191,157 106,157 106,157 C103.79,157 102,155.21 102,153 C102,153 102,143 102,143 C102,140.79 103.79,139 106,139 C106,139 191,139 191,139 C193.21,139 195,140.79 195,143c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_3_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M270 165 C270,165 270,173 270,173 C270,175.21 268.21,177 266,177 C266,177 106,177 106,177 C103.79,177 102,175.21 102,173 C102,173 102,165 102,165 C102,162.79 103.79,161 106,161 C106,161 266,161 266,161 C268.21,161 270,162.79 270,165c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_4_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M222 231 C222,231 222,241 222,241 C222,243.21 220.21,245 218,245 C218,245 106,245 106,245 C103.79,245 102,243.21 102,241 C102,241 102,231 102,231 C102,228.79 103.79,227 106,227 C106,227 218,227 218,227 C220.21,227 222,228.79 222,231c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_5_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M241 253 C241,253 241,261 241,261 C241,263.21 239.21,265 237,265 C237,265 106,265 106,265 C103.79,265 102,263.21 102,261 C102,261 102,253 102,253 C102,250.79 103.79,249 106,249 C106,249 237,249 237,249 C239.21,249 241,250.79 241,253c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_6_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M214 319 C214,319 214,329 214,329 C214,331.21 212.21,333 210,333 C210,333 106,333 106,333 C103.79,333 102,331.21 102,329 C102,329 102,319 102,319 C102,316.79 103.79,315 106,315 C106,315 210,315 210,315 C212.21,315 214,316.79 214,319c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_7_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M333 341 C333,341 333,349 333,349 C333,351.21 331.21,353 329,353 C329,353 106,353 106,353 C103.79,353 102,351.21 102,349 C102,349 102,341 102,341 C102,338.79 103.79,337 106,337 C106,337 329,337 329,337 C331.21,337 333,338.79 333,341c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_8_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M238 407 C238,407 238,417 238,417 C238,419.21 236.21,421 234,421 C234,421 106,421 106,421 C103.79,421 102,419.21 102,417 C102,417 102,407 102,407 C102,404.79 103.79,403 106,403 C106,403 234,403 234,403 C236.21,403 238,404.79 238,407c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_9_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M295 429 C295,429 295,437 295,437 C295,439.21 293.21,441 291,441 C291,441 106,441 106,441 C103.79,441 102,439.21 102,437 C102,437 102,429 102,429 C102,426.79 103.79,425 106,425 C106,425 291,425 291,425 C293.21,425 295,426.79 295,429c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_10_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M168 495 C168,495 168,505 168,505 C168,507.21 166.21,509 164,509 C164,509 106,509 106,509 C103.79,509 102,507.21 102,505 C102,505 102,495 102,495 C102,492.79 103.79,491 106,491 C106,491 164,491 164,491 C166.21,491 168,492.79 168,495c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_11_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M269 517 C269,517 269,525 269,525 C269,527.21 267.21,529 265,529 C265,529 106,529 106,529 C103.79,529 102,527.21 102,525 C102,525 102,517 102,517 C102,514.79 103.79,513 106,513 C106,513 265,513 265,513 C267.21,513 269,514.79 269,517c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_12_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M235 583 C235,583 235,593 235,593 C235,595.21 233.21,597 231,597 C231,597 106,597 106,597 C103.79,597 102,595.21 102,593 C102,593 102,583 102,583 C102,580.79 103.79,579 106,579 C106,579 231,579 231,579 C233.21,579 235,580.79 235,583c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_13_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M295 605 C295,605 295,613 295,613 C295,615.21 293.21,617 291,617 C291,617 106,617 106,617 C103.79,617 102,615.21 102,613 C102,613 102,605 102,605 C102,602.79 103.79,601 106,601 C106,601 291,601 291,601 C293.21,601 295,602.79 295,605c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_14_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M223 671 C223,671 223,681 223,681 C223,683.21 221.21,685 219,685 C219,685 106,685 106,685 C103.79,685 102,683.21 102,681 C102,681 102,671 102,671 C102,668.79 103.79,667 106,667 C106,667 219,667 219,667 C221.21,667 223,668.79 223,671c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_15_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M246 693 C246,693 246,701 246,701 C246,703.21 244.21,705 242,705 C242,705 106,705 106,705 C103.79,705 102,703.21 102,701 C102,701 102,693 102,693 C102,690.79 103.79,689 106,689 C106,689 242,689 242,689 C244.21,689 246,690.79 246,693c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_16_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M388 798 C388,798 388,798 388,798 C388,813.45 375.45,826 360,826 C360,826 267,826 267,826 C251.55,826 239,813.45 239,798 C239,798 239,798 239,798 C239,782.55 251.55,770 267,770 C267,770 360,770 360,770 C375.45,770 388,782.55 388,798c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_17_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#f8f9fa"
+                                android:fillType="nonZero"
+                                android:pathData=" M377 47 C377,47 377,75 377,75 C377,77.21 375.21,79 373,79 C373,79 38,79 38,79 C35.79,79 34,77.21 34,75 C34,75 34,47 34,47 C34,44.79 35.79,43 38,43 C38,43 373,43 373,43 C375.21,43 377,44.79 377,47c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_18_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M82 157 C82,172.46 69.46,185 54,185 C38.54,185 26,172.46 26,157 C26,141.54 38.54,129 54,129 C69.46,129 82,141.54 82,157c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_19_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M82 245 C82,260.46 69.46,273 54,273 C38.54,273 26,260.46 26,245 C26,229.54 38.54,217 54,217 C69.46,217 82,229.54 82,245c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_20_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M82 333 C82,348.46 69.46,361 54,361 C38.54,361 26,348.46 26,333 C26,317.54 38.54,305 54,305 C69.46,305 82,317.54 82,333c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_21_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M82 421 C82,436.46 69.46,449 54,449 C38.54,449 26,436.46 26,421 C26,405.54 38.54,393 54,393 C69.46,393 82,405.54 82,421c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_22_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M82 509 C82,524.46 69.46,537 54,537 C38.54,537 26,524.46 26,509 C26,493.54 38.54,481 54,481 C69.46,481 82,493.54 82,509c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_23_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M82 597 C82,612.46 69.46,625 54,625 C38.54,625 26,612.46 26,597 C26,581.54 38.54,569 54,569 C69.46,569 82,581.54 82,597c " />
+                            <path
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_24_P_0"
+                                android:fillAlpha="0"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M82 685 C82,700.46 69.46,713 54,713 C38.54,713 26,700.46 26,685 C26,669.54 38.54,657 54,657 C69.46,657 82,669.54 82,685c " />
+                        </group>
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_2_G"
+                    android:scaleY="0"
+                    android:translateX="28.25"
+                    android:translateY="443">
+                    <group
+                        android:name="_R_G_L_2_G_D_0_P_0_G_0_T_0"
+                        android:rotation="180"
+                        android:translateX="414"
+                        android:translateY="53">
+                        <path
+                            android:name="_R_G_L_2_G_D_0_P_0"
+                            android:fillAlpha="1"
+                            android:fillColor="#ffffff"
+                            android:fillType="nonZero"
+                            android:pathData=" M28.25 0 C28.25,31.2 2.95,56.5 -28.25,56.5 C-28.25,56.5 -28.25,-56.5 -28.25,-56.5 C2.95,-56.5 28.25,-31.2 28.25,0c " />
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_1_G"
+                    android:rotation="180"
+                    android:scaleY="0"
+                    android:translateX="25.75"
+                    android:translateY="496">
+                    <group
+                        android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0"
+                        android:scaleX="0.5"
+                        android:scaleY="0.5"
+                        android:translateX="-407"
+                        android:translateY="0">
+                        <path
+                            android:name="_R_G_L_1_G_D_0_P_0"
+                            android:fillAlpha="0"
+                            android:fillColor="#3c3e40"
+                            android:fillType="nonZero"
+                            android:pathData=" M3.87 -13.45 C3.07,-14.21 1.8,-14.18 1.04,-13.38 C0.28,-12.58 0.31,-11.31 1.11,-10.55 C1.11,-10.55 9.75,-2.32 9.75,-2.32 C9.75,-2.32 -14.75,-2.32 -14.75,-2.32 C-15.85,-2.32 -16.75,-1.43 -16.75,-0.32 C-16.75,0.78 -15.85,1.68 -14.75,1.68 C-14.75,1.68 9.94,1.68 9.94,1.68 C9.94,1.68 1.07,10.59 1.07,10.59 C0.29,11.37 0.29,12.64 1.08,13.42 C1.86,14.2 3.13,14.19 3.9,13.41 C3.9,13.41 16.17,1.09 16.17,1.09 C16.55,0.71 16.76,0.19 16.75,-0.35 C16.74,-0.89 16.52,-1.4 16.13,-1.77 C16.13,-1.77 3.87,-13.45 3.87,-13.45c " />
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_0_G"
+                    android:translateX="206"
+                    android:translateY="446">
+                    <path
+                        android:name="_R_G_L_0_G_D_0_P_0"
+                        android:fillAlpha="0"
+                        android:fillColor="#84ba69"
+                        android:fillType="nonZero"
+                        android:pathData=" M205 13.5 C225.16,13.5 241.5,29.84 241.5,50 C241.5,70.16 225.16,86.5 205,86.5 C184.84,86.5 168.5,70.16 168.5,50 C168.5,29.84 184.84,13.5 205,13.5c " />
+                </group>
+            </group>
+            <group android:name="time_group" />
+        </vector>
+    </aapt:attr>
+</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_motion_home.xml b/quickstep/res/drawable/gesture_tutorial_motion_home_dark_mode.xml
similarity index 99%
rename from quickstep/res/drawable/gesture_tutorial_motion_home.xml
rename to quickstep/res/drawable/gesture_tutorial_motion_home_dark_mode.xml
index 87b885715c..aff35c1bce 100644
--- a/quickstep/res/drawable/gesture_tutorial_motion_home.xml
+++ b/quickstep/res/drawable/gesture_tutorial_motion_home_dark_mode.xml
@@ -922,7 +922,7 @@
                     <path
                         android:name="_R_G_L_3_G_D_0_P_0"
                         android:fillAlpha="1"
-                        android:fillColor="#000000"
+                        android:fillColor="@color/fake_wallpaper_color_dark_mode"
                         android:fillType="nonZero"
                         android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c " />
                 </group>
diff --git a/quickstep/res/drawable/gesture_tutorial_motion_home_light_mode.xml b/quickstep/res/drawable/gesture_tutorial_motion_home_light_mode.xml
new file mode 100644
index 0000000000..98d97ad62d
--- /dev/null
+++ b/quickstep/res/drawable/gesture_tutorial_motion_home_light_mode.xml
@@ -0,0 +1,1254 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <target android:name="_R_G_L_2_G_L_4_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="50"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="600"
+                    android:valueFrom="0"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="650"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_4_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="50"
+                    android:pathData="M 206,776C 206,776 206,776 206,776"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="600">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.27,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="700"
+                    android:pathData="M 206,776C 206,776 206,797 206,797"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="650">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.27,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_4_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="650"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_3_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="600"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_3_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="700"
+                    android:pathData="M 56,673C 56,673 56,706 56,706"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="600">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.27,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_3_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="600"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_2_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="600"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="700"
+                    android:pathData="M 156,673C 156,673 156,706 156,706"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="600">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.27,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="600"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_1_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="600"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="700"
+                    android:pathData="M 256,673C 256,673 256,706 256,706"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="600">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.27,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="600"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="600"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="700"
+                    android:pathData="M 356,673C 356,673 356,706 356,706"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="600">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.27,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="600"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="600"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_4_G_L_11_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#dadce0"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1.215 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_4_G_L_10_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#bdc1c6"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1.92 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_4_G_L_9_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#bdc1c6"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1.92 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_4_G_L_8_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#bdc1c6"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1.92 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_4_G_L_7_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#bdc1c6"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1.92 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_4_G_L_6_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#bdc1c6"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1.92 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_4_G_L_5_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#bdc1c6"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1.92 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_4_G_L_4_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#bdc1c6"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1.92 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_4_G_L_3_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#bdc1c6"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1.92 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_4_G_L_2_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#bdc1c6"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1.92 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_4_G_L_1_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#bdc1c6"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1.92 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_4_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#bdc1c6"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1.92 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_4_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="517"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_3_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#bdc1c6"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1.92 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_3_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="517"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_2_G_L_2_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#e8eaed"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1.232 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_2_G_L_1_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#80868b"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,0.674 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_2_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="100"
+                    android:propertyName="fillColor"
+                    android:startOffset="400"
+                    android:valueFrom="#80868b"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,0.674 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="517"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_1_G_L_2_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="150"
+                    android:propertyName="fillColor"
+                    android:startOffset="350"
+                    android:valueFrom="#6e7175"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,0.674 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_1_G_L_1_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="150"
+                    android:propertyName="fillColor"
+                    android:startOffset="350"
+                    android:valueFrom="#6e7175"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,0.676 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_1_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="150"
+                    android:propertyName="fillColor"
+                    android:startOffset="350"
+                    android:valueFrom="#9a9a9a"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,0.584 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="517"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="fillColor"
+                    android:startOffset="500"
+                    android:valueFrom="#bac4d6"
+                    android:valueTo="#bac4d6"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="50"
+                    android:propertyName="fillColor"
+                    android:startOffset="633"
+                    android:valueFrom="#bac4d6"
+                    android:valueTo="#8ab4f8"
+                    android:valueType="colorType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,-0.214 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="283"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="500"
+                    android:valueFrom="1"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.999,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="283"
+                    android:propertyName="pathData"
+                    android:startOffset="500"
+                    android:valueFrom="M206.06 -430.06 C206.06,-430.06 206,431 206,431 C206,446 189.75,446 189.79,446 C189.79,446 -189.98,446 -189.98,446 C-189.94,446 -206,446 -206,431 C-206,431 -206,-430 -206,-430 C-206,-446 -189.97,-446 -190.01,-446 C-190.01,-446 188.98,-446.06 188.98,-446.06 C188.94,-446.06 206,-446 206.06,-430.06c "
+                    android:valueTo="M60 -0.06 C60,-0.06 60,0.06 60,0.06 C60,28 36,60.25 -0.02,60.25 C-0.02,60.25 0.02,60.25 0.02,60.25 C-32.5,60.25 -60,31.5 -60,0.06 C-60,0.06 -60,-0.06 -60,-0.06 C-60,-31.25 -34,-59.25 0.02,-59.25 C0.02,-59.25 -0.02,-59.25 -0.02,-59.25 C33.5,-59.25 60,-38 60,-0.06c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.999,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="500"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="850"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_T_1">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="283"
+                    android:pathData="M 206,446C 201.417,411.133 195,385.297 195,385.297"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="217">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="333"
+                    android:pathData="M 195,385.297C 195,385.297 105.5,148.09000000000003 56,691.5"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="500">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.443,0.093 0.5,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_T_1">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="467"
+                    android:propertyName="scaleX"
+                    android:startOffset="217"
+                    android:valueFrom="1"
+                    android:valueTo="0.5"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="467"
+                    android:propertyName="scaleY"
+                    android:startOffset="217"
+                    android:valueFrom="1"
+                    android:valueTo="0.5"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_T_1">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2167"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="217"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="0.75"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="233"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="217"
+                    android:valueFrom="0.75"
+                    android:valueTo="0.75"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="450"
+                    android:valueFrom="0.75"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="217"
+                    android:propertyName="pathData"
+                    android:startOffset="0"
+                    android:valueFrom="M0 411 C19.33,411 35,426.67 35,446 C35,465.33 19.33,481 0,481 C-19.33,481 -35,465.33 -35,446 C-35,426.67 -19.33,411 0,411c "
+                    android:valueTo="M0 396 C27.61,396 50,418.39 50,446 C50,473.61 27.61,496 0,496 C-27.61,496 -50,473.61 -50,446 C-50,418.39 -27.61,396 0,396c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="433"
+                    android:propertyName="pathData"
+                    android:startOffset="217"
+                    android:valueFrom="M0 396 C27.61,396 50,418.39 50,446 C50,473.61 27.61,496 0,496 C-27.61,496 -50,473.61 -50,446 C-50,418.39 -27.61,396 0,396c "
+                    android:valueTo="M0 68 C27.61,68 50,90.39 50,118 C50,145.61 27.61,168 0,168 C-27.61,168 -50,145.61 -50,118 C-50,90.39 -27.61,68 0,68c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2167"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="1367"
+                    android:propertyName="translateX"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <aapt:attr name="android:drawable">
+        <vector
+            android:width="412dp"
+            android:height="892dp"
+            android:viewportHeight="892"
+            android:viewportWidth="412">
+            <group android:name="_R_G">
+                <group
+                    android:name="_R_G_L_3_G"
+                    android:translateX="206"
+                    android:translateY="446">
+                    <path
+                        android:name="_R_G_L_3_G_D_0_P_0"
+                        android:fillAlpha="1"
+                        android:fillColor="@color/fake_wallpaper_color_light_mode"
+                        android:fillType="nonZero"
+                        android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c " />
+                </group>
+                <group
+                    android:name="_R_G_L_2_G"
+                    android:scaleY="0">
+                    <group
+                        android:name="_R_G_L_2_G_L_4_G"
+                        android:scaleY="0"
+                        android:translateX="206"
+                        android:translateY="776">
+                        <path
+                            android:name="_R_G_L_2_G_L_4_G_D_0_P_0"
+                            android:fillAlpha="0"
+                            android:fillColor="#d9d9da"
+                            android:fillType="nonZero"
+                            android:pathData=" M180 0 C180,0 180,0 180,0 C180,13.8 168.8,25 155,25 C155,25 -155,25 -155,25 C-168.8,25 -180,13.8 -180,0 C-180,0 -180,0 -180,0 C-180,-13.8 -168.8,-25 -155,-25 C-155,-25 155,-25 155,-25 C168.8,-25 180,-13.8 180,0c " />
+                    </group>
+                    <group
+                        android:name="_R_G_L_2_G_L_3_G"
+                        android:scaleY="0"
+                        android:translateX="56"
+                        android:translateY="673">
+                        <path
+                            android:name="_R_G_L_2_G_L_3_G_D_0_P_0"
+                            android:fillAlpha="0"
+                            android:fillColor="#8ab4f8"
+                            android:fillType="nonZero"
+                            android:pathData=" M0 -30 C16.56,-30 30,-16.56 30,0 C30,16.56 16.56,30 0,30 C-16.56,30 -30,16.56 -30,0 C-30,-16.56 -16.56,-30 0,-30c " />
+                    </group>
+                    <group
+                        android:name="_R_G_L_2_G_L_2_G"
+                        android:scaleY="0"
+                        android:translateX="156"
+                        android:translateY="673">
+                        <path
+                            android:name="_R_G_L_2_G_L_2_G_D_0_P_0"
+                            android:fillAlpha="0"
+                            android:fillColor="#f28b82"
+                            android:fillType="nonZero"
+                            android:pathData=" M0 -30 C16.56,-30 30,-16.56 30,0 C30,16.56 16.56,30 0,30 C-16.56,30 -30,16.56 -30,0 C-30,-16.56 -16.56,-30 0,-30c " />
+                    </group>
+                    <group
+                        android:name="_R_G_L_2_G_L_1_G"
+                        android:scaleY="0"
+                        android:translateX="256"
+                        android:translateY="673">
+                        <path
+                            android:name="_R_G_L_2_G_L_1_G_D_0_P_0"
+                            android:fillAlpha="0"
+                            android:fillColor="#fdd663"
+                            android:fillType="nonZero"
+                            android:pathData=" M0 -30 C16.56,-30 30,-16.56 30,0 C30,16.56 16.56,30 0,30 C-16.56,30 -30,16.56 -30,0 C-30,-16.56 -16.56,-30 0,-30c " />
+                    </group>
+                    <group
+                        android:name="_R_G_L_2_G_L_0_G"
+                        android:scaleY="0"
+                        android:translateX="356"
+                        android:translateY="673">
+                        <path
+                            android:name="_R_G_L_2_G_L_0_G_D_0_P_0"
+                            android:fillAlpha="0"
+                            android:fillColor="#81c995"
+                            android:fillType="nonZero"
+                            android:pathData=" M0 -30 C16.56,-30 30,-16.56 30,0 C30,16.56 16.56,30 0,30 C-16.56,30 -30,16.56 -30,0 C-30,-16.56 -16.56,-30 0,-30c " />
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_1_G_T_1"
+                    android:scaleX="1"
+                    android:scaleY="1"
+                    android:translateX="206"
+                    android:translateY="446">
+                    <group
+                        android:name="_R_G_L_1_G"
+                        android:translateX="-206"
+                        android:translateY="-446">
+                        <group android:name="_R_G_L_1_G_L_4_G">
+                            <group
+                                android:name="_R_G_L_1_G_L_4_G_L_11_G"
+                                android:scaleX="0.87473"
+                                android:scaleY="0.98643"
+                                android:translateX="206"
+                                android:translateY="472.769">
+                                <path
+                                    android:name="_R_G_L_1_G_L_4_G_L_11_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#dadce0"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M235.5 -407 C235.5,-407 235.5,407 235.5,407 C235.5,416.93 227.43,425 217.5,425 C217.5,425 -217.5,425 -217.5,425 C-227.43,425 -235.5,416.93 -235.5,407 C-235.5,407 -235.5,-407 -235.5,-407 C-235.5,-416.93 -227.43,-425 -217.5,-425 C-217.5,-425 217.5,-425 217.5,-425 C227.43,-425 235.5,-416.93 235.5,-407c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_4_G_L_10_G"
+                                android:translateX="182.5"
+                                android:translateY="831">
+                                <path
+                                    android:name="_R_G_L_1_G_L_4_G_L_10_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M158.5 -3 C158.5,-3 158.5,3 158.5,3 C158.5,7.42 154.92,11 150.5,11 C150.5,11 -150.5,11 -150.5,11 C-154.92,11 -158.5,7.42 -158.5,3 C-158.5,3 -158.5,-3 -158.5,-3 C-158.5,-7.42 -154.92,-11 -150.5,-11 C-150.5,-11 150.5,-11 150.5,-11 C154.92,-11 158.5,-7.42 158.5,-3c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_4_G_L_9_G"
+                                android:translateX="186"
+                                android:translateY="801">
+                                <path
+                                    android:name="_R_G_L_1_G_L_4_G_L_9_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M162 -3 C162,-3 162,3 162,3 C162,7.42 158.42,11 154,11 C154,11 -154,11 -154,11 C-158.42,11 -162,7.42 -162,3 C-162,3 -162,-3 -162,-3 C-162,-7.42 -158.42,-11 -154,-11 C-154,-11 154,-11 154,-11 C158.42,-11 162,-7.42 162,-3c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_4_G_L_8_G"
+                                android:translateX="119"
+                                android:translateY="755">
+                                <path
+                                    android:name="_R_G_L_1_G_L_4_G_L_8_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M95 -3 C95,-3 95,3 95,3 C95,7.42 91.42,11 87,11 C87,11 -87,11 -87,11 C-91.42,11 -95,7.42 -95,3 C-95,3 -95,-3 -95,-3 C-95,-7.42 -91.42,-11 -87,-11 C-87,-11 87,-11 87,-11 C91.42,-11 95,-7.42 95,-3c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_4_G_L_7_G"
+                                android:translateX="182.5"
+                                android:translateY="725">
+                                <path
+                                    android:name="_R_G_L_1_G_L_4_G_L_7_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M158.5 -3 C158.5,-3 158.5,3 158.5,3 C158.5,7.42 154.92,11 150.5,11 C150.5,11 -150.5,11 -150.5,11 C-154.92,11 -158.5,7.42 -158.5,3 C-158.5,3 -158.5,-3 -158.5,-3 C-158.5,-7.42 -154.92,-11 -150.5,-11 C-150.5,-11 150.5,-11 150.5,-11 C154.92,-11 158.5,-7.42 158.5,-3c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_4_G_L_6_G"
+                                android:translateX="197.5"
+                                android:translateY="695">
+                                <path
+                                    android:name="_R_G_L_1_G_L_4_G_L_6_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M173.5 -3 C173.5,-3 173.5,3 173.5,3 C173.5,7.42 169.92,11 165.5,11 C165.5,11 -165.5,11 -165.5,11 C-169.92,11 -173.5,7.42 -173.5,3 C-173.5,3 -173.5,-3 -173.5,-3 C-173.5,-7.42 -169.92,-11 -165.5,-11 C-165.5,-11 165.5,-11 165.5,-11 C169.92,-11 173.5,-7.42 173.5,-3c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_4_G_L_5_G"
+                                android:translateX="192"
+                                android:translateY="665">
+                                <path
+                                    android:name="_R_G_L_1_G_L_4_G_L_5_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M168 -3 C168,-3 168,3 168,3 C168,7.42 164.42,11 160,11 C160,11 -160,11 -160,11 C-164.42,11 -168,7.42 -168,3 C-168,3 -168,-3 -168,-3 C-168,-7.42 -164.42,-11 -160,-11 C-160,-11 160,-11 160,-11 C164.42,-11 168,-7.42 168,-3c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_4_G_L_4_G"
+                                android:translateX="105.5"
+                                android:translateY="360">
+                                <path
+                                    android:name="_R_G_L_1_G_L_4_G_L_4_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M23.5 -2 C23.5,-2 23.5,2 23.5,2 C23.5,4.21 21.71,6 19.5,6 C19.5,6 -19.5,6 -19.5,6 C-21.71,6 -23.5,4.21 -23.5,2 C-23.5,2 -23.5,-2 -23.5,-2 C-23.5,-4.21 -21.71,-6 -19.5,-6 C-19.5,-6 19.5,-6 19.5,-6 C21.71,-6 23.5,-4.21 23.5,-2c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_4_G_L_3_G"
+                                android:translateX="47.5"
+                                android:translateY="360">
+                                <path
+                                    android:name="_R_G_L_1_G_L_4_G_L_3_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M23.5 -2 C23.5,-2 23.5,2 23.5,2 C23.5,4.21 21.71,6 19.5,6 C19.5,6 -19.5,6 -19.5,6 C-21.71,6 -23.5,4.21 -23.5,2 C-23.5,2 -23.5,-2 -23.5,-2 C-23.5,-4.21 -21.71,-6 -19.5,-6 C-19.5,-6 19.5,-6 19.5,-6 C21.71,-6 23.5,-4.21 23.5,-2c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_4_G_L_2_G"
+                                android:translateX="142.5"
+                                android:translateY="328">
+                                <path
+                                    android:name="_R_G_L_1_G_L_4_G_L_2_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M118.5 -10 C118.5,-10 118.5,10 118.5,10 C118.5,14.42 114.92,18 110.5,18 C110.5,18 -110.5,18 -110.5,18 C-114.92,18 -118.5,14.42 -118.5,10 C-118.5,10 -118.5,-10 -118.5,-10 C-118.5,-14.42 -114.92,-18 -110.5,-18 C-110.5,-18 110.5,-18 110.5,-18 C114.92,-18 118.5,-14.42 118.5,-10c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_4_G_L_1_G"
+                                android:translateX="186"
+                                android:translateY="284">
+                                <path
+                                    android:name="_R_G_L_1_G_L_4_G_L_1_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M162 -10 C162,-10 162,10 162,10 C162,14.42 158.42,18 154,18 C154,18 -154,18 -154,18 C-158.42,18 -162,14.42 -162,10 C-162,10 -162,-10 -162,-10 C-162,-14.42 -158.42,-18 -154,-18 C-154,-18 154,-18 154,-18 C158.42,-18 162,-14.42 162,-10c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_4_G_L_0_G"
+                                android:translateX="155"
+                                android:translateY="240">
+                                <path
+                                    android:name="_R_G_L_1_G_L_4_G_L_0_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M131 -10 C131,-10 131,10 131,10 C131,14.42 127.42,18 123,18 C123,18 -123,18 -123,18 C-127.42,18 -131,14.42 -131,10 C-131,10 -131,-10 -131,-10 C-131,-14.42 -127.42,-18 -123,-18 C-123,-18 123,-18 123,-18 C127.42,-18 131,-14.42 131,-10c " />
+                            </group>
+                        </group>
+                        <group
+                            android:name="_R_G_L_1_G_L_3_G"
+                            android:translateX="24"
+                            android:translateY="390">
+                            <group
+                                android:name="_R_G_L_1_G_L_3_G_L_0_G"
+                                android:translateX="182"
+                                android:translateY="120">
+                                <path
+                                    android:name="_R_G_L_1_G_L_3_G_L_0_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M182 -98 C182,-98 182,98 182,98 C182,110.14 172.14,120 160,120 C160,120 -160,120 -160,120 C-172.14,120 -182,110.14 -182,98 C-182,98 -182,-98 -182,-98 C-182,-110.14 -172.14,-120 -160,-120 C-160,-120 160,-120 160,-120 C172.14,-120 182,-110.14 182,-98c " />
+                            </group>
+                        </group>
+                        <group android:name="_R_G_L_1_G_L_2_G">
+                            <group
+                                android:name="_R_G_L_1_G_L_2_G_L_2_G"
+                                android:translateX="206"
+                                android:translateY="145">
+                                <path
+                                    android:name="_R_G_L_1_G_L_2_G_L_2_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#e8eaed"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M206 -95.63 C206,-95.63 206,42.37 206,42.37 C206,43.47 205.1,44.37 204,44.37 C204,44.37 -204,44.37 -204,44.37 C-205.1,44.37 -206,43.47 -206,42.37 C-206,42.37 -206,-95.63 -206,-95.63 C-206,-96.73 -205.1,-97.63 -204,-97.63 C-204,-97.63 204,-97.63 204,-97.63 C205.1,-97.63 206,-96.73 206,-95.63c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_2_G_L_1_G"
+                                android:translateX="206"
+                                android:translateY="145">
+                                <path
+                                    android:name="_R_G_L_1_G_L_2_G_L_1_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#80868b"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M109 -14 C109,-14 109,14 109,14 C109,15.1 108.1,16 107,16 C107,16 -107,16 -107,16 C-108.1,16 -109,15.1 -109,14 C-109,14 -109,-14 -109,-14 C-109,-15.1 -108.1,-16 -107,-16 C-107,-16 107,-16 107,-16 C108.1,-16 109,-15.1 109,-14c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_2_G_L_0_G"
+                                android:translateX="46"
+                                android:translateY="145">
+                                <path
+                                    android:name="_R_G_L_1_G_L_2_G_L_0_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#80868b"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M22 -14 C22,-14 22,14 22,14 C22,18.42 18.42,22 14,22 C14,22 -14,22 -14,22 C-18.42,22 -22,18.42 -22,14 C-22,14 -22,-14 -22,-14 C-22,-18.42 -18.42,-22 -14,-22 C-14,-22 14,-22 14,-22 C18.42,-22 22,-18.42 22,-14c " />
+                            </group>
+                        </group>
+                        <group android:name="_R_G_L_1_G_L_1_G">
+                            <group
+                                android:name="_R_G_L_1_G_L_1_G_L_2_G"
+                                android:translateX="206"
+                                android:translateY="51">
+                                <path
+                                    android:name="_R_G_L_1_G_L_1_G_L_2_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#6e7175"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M206 -0.27 C206,-0.27 206,49.73 206,49.73 C206,49.73 -206,49.73 -206,49.73 C-206,49.73 -206,-0.27 -206,-0.27 C-206,-0.27 206,-0.27 206,-0.27c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_1_G_L_1_G"
+                                android:translateX="206"
+                                android:translateY="50.5">
+                                <path
+                                    android:name="_R_G_L_1_G_L_1_G_L_1_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#6e7175"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M206 -32.5 C206,-32.5 206,32.5 206,32.5 C206,42.43 197.93,50.5 188,50.5 C188,50.5 -188,50.5 -188,50.5 C-197.93,50.5 -206,42.43 -206,32.5 C-206,32.5 -206,-32.5 -206,-32.5 C-206,-42.43 -197.93,-50.5 -188,-50.5 C-188,-50.5 188,-50.5 188,-50.5 C197.93,-50.5 206,-42.43 206,-32.5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_1_G_L_1_G_L_0_G"
+                                android:translateX="206"
+                                android:translateY="66.5">
+                                <path
+                                    android:name="_R_G_L_1_G_L_1_G_L_0_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9a9a9a"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M190 0 C190,0 190,0 190,0 C190,10.21 181.71,18.5 171.5,18.5 C171.5,18.5 -171.5,18.5 -171.5,18.5 C-181.71,18.5 -190,10.21 -190,0 C-190,0 -190,0 -190,0 C-190,-10.21 -181.71,-18.5 -171.5,-18.5 C-171.5,-18.5 171.5,-18.5 171.5,-18.5 C181.71,-18.5 190,-10.21 190,0c " />
+                            </group>
+                        </group>
+                        <group
+                            android:name="_R_G_L_1_G_L_0_G"
+                            android:scaleY="0"
+                            android:translateX="206"
+                            android:translateY="446">
+                            <path
+                                android:name="_R_G_L_1_G_L_0_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bac4d6"
+                                android:fillType="nonZero"
+                                android:pathData=" M206.06 -430.06 C206.06,-430.06 206,431 206,431 C206,446 189.75,446 189.79,446 C189.79,446 -189.98,446 -189.98,446 C-189.94,446 -206,446 -206,431 C-206,431 -206,-430 -206,-430 C-206,-446 -189.97,-446 -190.01,-446 C-190.01,-446 188.98,-446.06 188.98,-446.06 C188.94,-446.06 206,-446 206.06,-430.06c " />
+                        </group>
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_0_G"
+                    android:translateX="206"
+                    android:translateY="446">
+                    <path
+                        android:name="_R_G_L_0_G_D_0_P_0"
+                        android:fillAlpha="0"
+                        android:fillColor="#84ba69"
+                        android:fillType="nonZero"
+                        android:pathData=" M0 411 C19.33,411 35,426.67 35,446 C35,465.33 19.33,481 0,481 C-19.33,481 -35,465.33 -35,446 C-35,426.67 -19.33,411 0,411c " />
+                </group>
+            </group>
+            <group android:name="time_group" />
+        </vector>
+    </aapt:attr>
+</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_motion_overview.xml b/quickstep/res/drawable/gesture_tutorial_motion_overview_dark_mode.xml
similarity index 99%
rename from quickstep/res/drawable/gesture_tutorial_motion_overview.xml
rename to quickstep/res/drawable/gesture_tutorial_motion_overview_dark_mode.xml
index 058bee2ef0..b007d20f34 100644
--- a/quickstep/res/drawable/gesture_tutorial_motion_overview.xml
+++ b/quickstep/res/drawable/gesture_tutorial_motion_overview_dark_mode.xml
@@ -860,7 +860,7 @@
                     <path
                         android:name="_R_G_L_5_G_D_0_P_0"
                         android:fillAlpha="1"
-                        android:fillColor="#000000"
+                        android:fillColor="@color/fake_wallpaper_color_dark_mode"
                         android:fillType="nonZero"
                         android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c " />
                 </group>
@@ -1600,7 +1600,7 @@
                         <path
                             android:name="_R_G_L_1_G_D_0_P_0"
                             android:fillAlpha="1"
-                            android:fillColor="#3c4043"
+                            android:fillColor="@color/gesture_tutorial_fake_previous_task_view_color"
                             android:fillType="nonZero"
                             android:pathData=" M135 -301 C135,-301 135,311 135,311 C135,319.28 128.28,326 120,326 C120,326 -120,326 -120,326 C-128.28,326 -135,319.28 -135,311 C-135,311 -135,-301 -135,-301 C-135,-309.28 -128.28,-316 -120,-316 C-120,-316 120,-316 120,-316 C128.28,-316 135,-309.28 135,-301c " />
                     </group>
diff --git a/quickstep/res/drawable/mock_webpage.xml b/quickstep/res/drawable/mock_webpage_dark_mode.xml
similarity index 100%
rename from quickstep/res/drawable/mock_webpage.xml
rename to quickstep/res/drawable/mock_webpage_dark_mode.xml
diff --git a/quickstep/res/drawable/mock_webpage_light_mode.xml b/quickstep/res/drawable/mock_webpage_light_mode.xml
new file mode 100644
index 0000000000..98abb92ab7
--- /dev/null
+++ b/quickstep/res/drawable/mock_webpage_light_mode.xml
@@ -0,0 +1,263 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="83"
+                    android:propertyName="translateX"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <aapt:attr name="android:drawable">
+        <vector
+            android:width="412dp"
+            android:height="892dp"
+            android:viewportHeight="892"
+            android:viewportWidth="412">
+            <group android:name="_R_G">
+                <group android:name="_R_G_L_0_G">
+                    <group android:name="_R_G_L_0_G_L_4_G">
+                        <group
+                            android:name="_R_G_L_0_G_L_4_G_L_11_G"
+                            android:scaleX="0.87473"
+                            android:scaleY="0.98643"
+                            android:translateX="206"
+                            android:translateY="472.769">
+                            <path
+                                android:name="_R_G_L_0_G_L_4_G_L_11_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#dadce0"
+                                android:fillType="nonZero"
+                                android:pathData=" M235.5 -407 C235.5,-407 235.5,407 235.5,407 C235.5,416.93 227.43,425 217.5,425 C217.5,425 -217.5,425 -217.5,425 C-227.43,425 -235.5,416.93 -235.5,407 C-235.5,407 -235.5,-407 -235.5,-407 C-235.5,-416.93 -227.43,-425 -217.5,-425 C-217.5,-425 217.5,-425 217.5,-425 C227.43,-425 235.5,-416.93 235.5,-407c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_4_G_L_10_G"
+                            android:translateX="182.5"
+                            android:translateY="831">
+                            <path
+                                android:name="_R_G_L_0_G_L_4_G_L_10_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M158.5 -3 C158.5,-3 158.5,3 158.5,3 C158.5,7.42 154.92,11 150.5,11 C150.5,11 -150.5,11 -150.5,11 C-154.92,11 -158.5,7.42 -158.5,3 C-158.5,3 -158.5,-3 -158.5,-3 C-158.5,-7.42 -154.92,-11 -150.5,-11 C-150.5,-11 150.5,-11 150.5,-11 C154.92,-11 158.5,-7.42 158.5,-3c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_4_G_L_9_G"
+                            android:translateX="186"
+                            android:translateY="801">
+                            <path
+                                android:name="_R_G_L_0_G_L_4_G_L_9_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M162 -3 C162,-3 162,3 162,3 C162,7.42 158.42,11 154,11 C154,11 -154,11 -154,11 C-158.42,11 -162,7.42 -162,3 C-162,3 -162,-3 -162,-3 C-162,-7.42 -158.42,-11 -154,-11 C-154,-11 154,-11 154,-11 C158.42,-11 162,-7.42 162,-3c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_4_G_L_8_G"
+                            android:translateX="119"
+                            android:translateY="755">
+                            <path
+                                android:name="_R_G_L_0_G_L_4_G_L_8_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M95 -3 C95,-3 95,3 95,3 C95,7.42 91.42,11 87,11 C87,11 -87,11 -87,11 C-91.42,11 -95,7.42 -95,3 C-95,3 -95,-3 -95,-3 C-95,-7.42 -91.42,-11 -87,-11 C-87,-11 87,-11 87,-11 C91.42,-11 95,-7.42 95,-3c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_4_G_L_7_G"
+                            android:translateX="182.5"
+                            android:translateY="725">
+                            <path
+                                android:name="_R_G_L_0_G_L_4_G_L_7_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M158.5 -3 C158.5,-3 158.5,3 158.5,3 C158.5,7.42 154.92,11 150.5,11 C150.5,11 -150.5,11 -150.5,11 C-154.92,11 -158.5,7.42 -158.5,3 C-158.5,3 -158.5,-3 -158.5,-3 C-158.5,-7.42 -154.92,-11 -150.5,-11 C-150.5,-11 150.5,-11 150.5,-11 C154.92,-11 158.5,-7.42 158.5,-3c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_4_G_L_6_G"
+                            android:translateX="197.5"
+                            android:translateY="695">
+                            <path
+                                android:name="_R_G_L_0_G_L_4_G_L_6_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M173.5 -3 C173.5,-3 173.5,3 173.5,3 C173.5,7.42 169.92,11 165.5,11 C165.5,11 -165.5,11 -165.5,11 C-169.92,11 -173.5,7.42 -173.5,3 C-173.5,3 -173.5,-3 -173.5,-3 C-173.5,-7.42 -169.92,-11 -165.5,-11 C-165.5,-11 165.5,-11 165.5,-11 C169.92,-11 173.5,-7.42 173.5,-3c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_4_G_L_5_G"
+                            android:translateX="192"
+                            android:translateY="665">
+                            <path
+                                android:name="_R_G_L_0_G_L_4_G_L_5_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M168 -3 C168,-3 168,3 168,3 C168,7.42 164.42,11 160,11 C160,11 -160,11 -160,11 C-164.42,11 -168,7.42 -168,3 C-168,3 -168,-3 -168,-3 C-168,-7.42 -164.42,-11 -160,-11 C-160,-11 160,-11 160,-11 C164.42,-11 168,-7.42 168,-3c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_4_G_L_4_G"
+                            android:translateX="105.5"
+                            android:translateY="360">
+                            <path
+                                android:name="_R_G_L_0_G_L_4_G_L_4_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M23.5 -2 C23.5,-2 23.5,2 23.5,2 C23.5,4.21 21.71,6 19.5,6 C19.5,6 -19.5,6 -19.5,6 C-21.71,6 -23.5,4.21 -23.5,2 C-23.5,2 -23.5,-2 -23.5,-2 C-23.5,-4.21 -21.71,-6 -19.5,-6 C-19.5,-6 19.5,-6 19.5,-6 C21.71,-6 23.5,-4.21 23.5,-2c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_4_G_L_3_G"
+                            android:translateX="47.5"
+                            android:translateY="360">
+                            <path
+                                android:name="_R_G_L_0_G_L_4_G_L_3_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M23.5 -2 C23.5,-2 23.5,2 23.5,2 C23.5,4.21 21.71,6 19.5,6 C19.5,6 -19.5,6 -19.5,6 C-21.71,6 -23.5,4.21 -23.5,2 C-23.5,2 -23.5,-2 -23.5,-2 C-23.5,-4.21 -21.71,-6 -19.5,-6 C-19.5,-6 19.5,-6 19.5,-6 C21.71,-6 23.5,-4.21 23.5,-2c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_4_G_L_2_G"
+                            android:translateX="142.5"
+                            android:translateY="328">
+                            <path
+                                android:name="_R_G_L_0_G_L_4_G_L_2_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M118.5 -10 C118.5,-10 118.5,10 118.5,10 C118.5,14.42 114.92,18 110.5,18 C110.5,18 -110.5,18 -110.5,18 C-114.92,18 -118.5,14.42 -118.5,10 C-118.5,10 -118.5,-10 -118.5,-10 C-118.5,-14.42 -114.92,-18 -110.5,-18 C-110.5,-18 110.5,-18 110.5,-18 C114.92,-18 118.5,-14.42 118.5,-10c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_4_G_L_1_G"
+                            android:translateX="186"
+                            android:translateY="284">
+                            <path
+                                android:name="_R_G_L_0_G_L_4_G_L_1_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M162 -10 C162,-10 162,10 162,10 C162,14.42 158.42,18 154,18 C154,18 -154,18 -154,18 C-158.42,18 -162,14.42 -162,10 C-162,10 -162,-10 -162,-10 C-162,-14.42 -158.42,-18 -154,-18 C-154,-18 154,-18 154,-18 C158.42,-18 162,-14.42 162,-10c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_4_G_L_0_G"
+                            android:translateX="155"
+                            android:translateY="240">
+                            <path
+                                android:name="_R_G_L_0_G_L_4_G_L_0_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M131 -10 C131,-10 131,10 131,10 C131,14.42 127.42,18 123,18 C123,18 -123,18 -123,18 C-127.42,18 -131,14.42 -131,10 C-131,10 -131,-10 -131,-10 C-131,-14.42 -127.42,-18 -123,-18 C-123,-18 123,-18 123,-18 C127.42,-18 131,-14.42 131,-10c " />
+                        </group>
+                    </group>
+                    <group
+                        android:name="_R_G_L_0_G_L_3_G"
+                        android:translateX="24"
+                        android:translateY="390">
+                        <group
+                            android:name="_R_G_L_0_G_L_3_G_L_0_G"
+                            android:translateX="182"
+                            android:translateY="120">
+                            <path
+                                android:name="_R_G_L_0_G_L_3_G_L_0_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#bdc1c6"
+                                android:fillType="nonZero"
+                                android:pathData=" M182 -98 C182,-98 182,98 182,98 C182,110.14 172.14,120 160,120 C160,120 -160,120 -160,120 C-172.14,120 -182,110.14 -182,98 C-182,98 -182,-98 -182,-98 C-182,-110.14 -172.14,-120 -160,-120 C-160,-120 160,-120 160,-120 C172.14,-120 182,-110.14 182,-98c " />
+                        </group>
+                    </group>
+                    <group android:name="_R_G_L_0_G_L_2_G">
+                        <group
+                            android:name="_R_G_L_0_G_L_2_G_L_2_G"
+                            android:translateX="206"
+                            android:translateY="145">
+                            <path
+                                android:name="_R_G_L_0_G_L_2_G_L_2_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#e8eaed"
+                                android:fillType="nonZero"
+                                android:pathData=" M206 -95.63 C206,-95.63 206,42.37 206,42.37 C206,43.47 205.1,44.37 204,44.37 C204,44.37 -204,44.37 -204,44.37 C-205.1,44.37 -206,43.47 -206,42.37 C-206,42.37 -206,-95.63 -206,-95.63 C-206,-96.73 -205.1,-97.63 -204,-97.63 C-204,-97.63 204,-97.63 204,-97.63 C205.1,-97.63 206,-96.73 206,-95.63c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_2_G_L_1_G"
+                            android:translateX="206"
+                            android:translateY="145">
+                            <path
+                                android:name="_R_G_L_0_G_L_2_G_L_1_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#80868b"
+                                android:fillType="nonZero"
+                                android:pathData=" M109 -14 C109,-14 109,14 109,14 C109,15.1 108.1,16 107,16 C107,16 -107,16 -107,16 C-108.1,16 -109,15.1 -109,14 C-109,14 -109,-14 -109,-14 C-109,-15.1 -108.1,-16 -107,-16 C-107,-16 107,-16 107,-16 C108.1,-16 109,-15.1 109,-14c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_2_G_L_0_G"
+                            android:translateX="46"
+                            android:translateY="145">
+                            <path
+                                android:name="_R_G_L_0_G_L_2_G_L_0_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#80868b"
+                                android:fillType="nonZero"
+                                android:pathData=" M22 -14 C22,-14 22,14 22,14 C22,18.42 18.42,22 14,22 C14,22 -14,22 -14,22 C-18.42,22 -22,18.42 -22,14 C-22,14 -22,-14 -22,-14 C-22,-18.42 -18.42,-22 -14,-22 C-14,-22 14,-22 14,-22 C18.42,-22 22,-18.42 22,-14c " />
+                        </group>
+                    </group>
+                    <group android:name="_R_G_L_0_G_L_1_G">
+                        <group
+                            android:name="_R_G_L_0_G_L_1_G_L_2_G"
+                            android:translateX="206"
+                            android:translateY="51">
+                            <path
+                                android:name="_R_G_L_0_G_L_1_G_L_2_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#6e7175"
+                                android:fillType="nonZero"
+                                android:pathData=" M206 -0.27 C206,-0.27 206,49.73 206,49.73 C206,49.73 -206,49.73 -206,49.73 C-206,49.73 -206,-0.27 -206,-0.27 C-206,-0.27 206,-0.27 206,-0.27c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_1_G_L_1_G"
+                            android:translateX="206"
+                            android:translateY="50.5">
+                            <path
+                                android:name="_R_G_L_0_G_L_1_G_L_1_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#6e7175"
+                                android:fillType="nonZero"
+                                android:pathData=" M206 -32.5 C206,-32.5 206,32.5 206,32.5 C206,42.43 197.93,50.5 188,50.5 C188,50.5 -188,50.5 -188,50.5 C-197.93,50.5 -206,42.43 -206,32.5 C-206,32.5 -206,-32.5 -206,-32.5 C-206,-42.43 -197.93,-50.5 -188,-50.5 C-188,-50.5 188,-50.5 188,-50.5 C197.93,-50.5 206,-42.43 206,-32.5c " />
+                        </group>
+                        <group
+                            android:name="_R_G_L_0_G_L_1_G_L_0_G"
+                            android:translateX="206"
+                            android:translateY="66.5">
+                            <path
+                                android:name="_R_G_L_0_G_L_1_G_L_0_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#9a9a9a"
+                                android:fillType="nonZero"
+                                android:pathData=" M190 0 C190,0 190,0 190,0 C190,10.21 181.71,18.5 171.5,18.5 C171.5,18.5 -171.5,18.5 -171.5,18.5 C-181.71,18.5 -190,10.21 -190,0 C-190,0 -190,0 -190,0 C-190,-10.21 -181.71,-18.5 -171.5,-18.5 C-171.5,-18.5 171.5,-18.5 171.5,-18.5 C181.71,-18.5 190,-10.21 190,0c " />
+                        </group>
+                    </group>
+                    <group
+                        android:name="_R_G_L_0_G_L_0_G"
+                        android:scaleY="0"
+                        android:translateX="206"
+                        android:translateY="446">
+                        <path
+                            android:name="_R_G_L_0_G_L_0_G_D_0_P_0"
+                            android:fillAlpha="1"
+                            android:fillColor="#bac4d6"
+                            android:fillType="nonZero"
+                            android:pathData=" M206.06 -430.06 C206.06,-430.06 206,431 206,431 C206,446 189.75,446 189.79,446 C189.79,446 -189.98,446 -189.98,446 C-189.94,446 -206,446 -206,431 C-206,431 -206,-430 -206,-430 C-206,-446 -189.97,-446 -190.01,-446 C-190.01,-446 188.98,-446.06 188.98,-446.06 C188.94,-446.06 206,-446 206.06,-430.06c " />
+                    </group>
+                </group>
+            </group>
+            <group android:name="time_group" />
+        </vector>
+    </aapt:attr>
+</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/layout/gesture_tutorial_fragment.xml b/quickstep/res/layout/gesture_tutorial_fragment.xml
index a884e745e2..1e8d0e03d3 100644
--- a/quickstep/res/layout/gesture_tutorial_fragment.xml
+++ b/quickstep/res/layout/gesture_tutorial_fragment.xml
@@ -20,13 +20,20 @@
     android:layout_height="match_parent"
     android:clipChildren="false">
 
-    <ImageView
+    <RelativeLayout
         android:id="@+id/gesture_tutorial_fake_launcher_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="70dp" />
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ImageView
+            android:id="@+id/gesture_tutorial_fake_hotseat_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="70dp"/>
+
+    </RelativeLayout>
 
     <com.android.launcher3.views.ClipIconView
         android:id="@+id/gesture_tutorial_fake_icon_view"
@@ -119,8 +126,6 @@
             app:layout_constraintTop_toTopOf="@id/gesture_tutorial_fragment_action_button"
             app:layout_constraintBottom_toBottomOf="@id/gesture_tutorial_fragment_action_button"/>
 
-        <!-- android:stateListAnimator="@null" removes shadow and normal on click behavior (increase
-             of elevation and shadow) which is replaced by ripple effect in android:foreground -->
         <Button
             android:id="@+id/gesture_tutorial_fragment_action_button"
             style="@style/TextAppearance.GestureTutorial.ButtonLabel"
@@ -133,7 +138,6 @@
             android:paddingEnd="16dp"
             android:text="@string/gesture_tutorial_action_button_label_next"
             android:background="@drawable/gesture_tutorial_action_button_background"
-            android:foreground="?android:attr/selectableItemBackgroundBorderless"
             android:stateListAnimator="@null"
             android:visibility="invisible"
 
diff --git a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
index ab42a2bd04..a06f903b48 100644
--- a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
@@ -48,7 +48,7 @@ final class BackGestureTutorialController extends TutorialController {
     }
 
     @Override
-    protected int getMockAppTaskThumbnailResId() {
+    protected int getMockAppTaskThumbnailResId(boolean forDarkMode) {
         return R.drawable.mock_conversation;
     }
 
diff --git a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java
index 830d0ad54e..32f4c58d7f 100644
--- a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java
@@ -27,10 +27,14 @@ import com.android.quickstep.interaction.TutorialController.TutorialType;
 public class BackGestureTutorialFragment extends TutorialFragment {
     @Nullable
     @Override
-    Integer getFeedbackVideoResId() {
+    Integer getFeedbackVideoResId(boolean forDarkMode) {
         return mTutorialType == TutorialType.RIGHT_EDGE_BACK_NAVIGATION
-                ? R.drawable.gesture_tutorial_motion_back_right
-                : R.drawable.gesture_tutorial_motion_back_left;
+                ? (forDarkMode
+                        ? R.drawable.gesture_tutorial_motion_back_right_dark_mode
+                        : R.drawable.gesture_tutorial_motion_back_right_light_mode)
+                : (forDarkMode
+                        ? R.drawable.gesture_tutorial_motion_back_left_dark_mode
+                        : R.drawable.gesture_tutorial_motion_back_left_light_mode);
     }
 
     @Nullable
diff --git a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
index deaf586636..83ce315052 100644
--- a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
@@ -42,8 +42,8 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll
     }
 
     @Override
-    protected int getMockAppTaskThumbnailResId() {
-        return R.drawable.mock_webpage;
+    protected int getMockAppTaskThumbnailResId(boolean forDarkMode) {
+        return forDarkMode ? R.drawable.mock_webpage_dark_mode : R.drawable.mock_webpage_light_mode;
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialFragment.java
index 47964d27c3..9572637b0f 100644
--- a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialFragment.java
@@ -24,8 +24,10 @@ import com.android.quickstep.interaction.TutorialController.TutorialType;
 public class HomeGestureTutorialFragment extends TutorialFragment {
     @Nullable
     @Override
-    Integer getFeedbackVideoResId() {
-        return R.drawable.gesture_tutorial_motion_home;
+    Integer getFeedbackVideoResId(boolean forDarkMode) {
+        return forDarkMode
+                ? R.drawable.gesture_tutorial_motion_home_dark_mode
+                : R.drawable.gesture_tutorial_motion_home_light_mode;
     }
 
     @Nullable
diff --git a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
index 984d054285..77ddb2b320 100644
--- a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
@@ -49,7 +49,7 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont
     }
 
     @Override
-    protected int getMockAppTaskThumbnailResId() {
+    protected int getMockAppTaskThumbnailResId(boolean forDarkMode) {
         return R.drawable.mock_conversations_list;
     }
 
diff --git a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java
index c919b96a46..d2ec327c81 100644
--- a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialFragment.java
@@ -24,8 +24,10 @@ import com.android.quickstep.interaction.TutorialController.TutorialType;
 public class OverviewGestureTutorialFragment extends TutorialFragment {
     @Nullable
     @Override
-    Integer getFeedbackVideoResId() {
-        return R.drawable.gesture_tutorial_motion_overview;
+    Integer getFeedbackVideoResId(boolean forDarkMode) {
+        return forDarkMode
+                ? R.drawable.gesture_tutorial_motion_overview_dark_mode
+                : R.drawable.gesture_tutorial_motion_overview_light_mode;
     }
 
     @Nullable
diff --git a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
index b06f001e3b..b2183d62dc 100644
--- a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java
@@ -72,7 +72,7 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
     private AnimatorListenerAdapter mResetTaskView = new AnimatorListenerAdapter() {
         @Override
         public void onAnimationEnd(Animator animation) {
-            mFakeLauncherView.setVisibility(View.INVISIBLE);
+            mFakeHotseatView.setVisibility(View.INVISIBLE);
             mFakeIconView.setVisibility(View.INVISIBLE);
             if (mTutorialFragment.getActivity() != null) {
                 DisplayMetrics displayMetrics =
@@ -197,7 +197,7 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
         hideFeedback(true);
         cancelRunningAnimation();
         mFakePreviousTaskView.setVisibility(View.INVISIBLE);
-        mFakeLauncherView.setVisibility(View.VISIBLE);
+        mFakeHotseatView.setVisibility(View.VISIBLE);
         mShowPreviousTasks = false;
         RectFSpringAnim rectAnim =
                 mTaskViewSwipeUpAnimation.handleSwipeUpToHome(finalVelocity);
@@ -299,7 +299,7 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
                 @Override
                 public RectF getWindowTargetRect() {
                     int fakeHomeIconSizePx = Utilities.dpToPx(60);
-                    int fakeHomeIconLeft = mFakeLauncherView.getLeft();
+                    int fakeHomeIconLeft = mFakeHotseatView.getLeft();
                     int fakeHomeIconTop = mDp.heightPx - Utilities.dpToPx(216);
                     return new RectF(fakeHomeIconLeft, fakeHomeIconTop,
                             fakeHomeIconLeft + fakeHomeIconSizePx,
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
index 5e9457466c..c9da609a08 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
@@ -30,6 +30,7 @@ import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityEvent;
 import android.widget.Button;
 import android.widget.ImageView;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import androidx.annotation.CallSuper;
@@ -66,7 +67,8 @@ abstract class TutorialController implements BackGestureAttemptCallback,
     final ViewGroup mFeedbackView;
     final ImageView mFeedbackVideoView;
     final ImageView mGestureVideoView;
-    final ImageView mFakeLauncherView;
+    final RelativeLayout mFakeLauncherView;
+    final ImageView mFakeHotseatView;
     final ClipIconView mFakeIconView;
     final View mFakeTaskView;
     final View mFakePreviousTaskView;
@@ -90,6 +92,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         mFeedbackVideoView = rootView.findViewById(R.id.gesture_tutorial_feedback_video);
         mGestureVideoView = rootView.findViewById(R.id.gesture_tutorial_gesture_video);
         mFakeLauncherView = rootView.findViewById(R.id.gesture_tutorial_fake_launcher_view);
+        mFakeHotseatView = rootView.findViewById(R.id.gesture_tutorial_fake_hotseat_view);
         mFakeIconView = rootView.findViewById(R.id.gesture_tutorial_fake_icon_view);
         mFakeTaskView = rootView.findViewById(R.id.gesture_tutorial_fake_task_view);
         mFakePreviousTaskView =
@@ -113,12 +116,12 @@ abstract class TutorialController implements BackGestureAttemptCallback,
     }
 
     @DrawableRes
-    protected int getMockLauncherResId() {
+    protected int getMockHotseatResId() {
         return R.drawable.default_sandbox_mock_launcher;
     }
 
     @DrawableRes
-    protected int getMockAppTaskThumbnailResId() {
+    protected int getMockAppTaskThumbnailResId(boolean forDarkMode) {
         return R.drawable.default_sandbox_app_task_thumbnail;
     }
 
@@ -312,8 +315,8 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         updateDrawables();
 
         mGestureCompleted = false;
-        if (mFakeLauncherView != null) {
-            mFakeLauncherView.setVisibility(View.INVISIBLE);
+        if (mFakeHotseatView != null) {
+            mFakeHotseatView.setVisibility(View.INVISIBLE);
         }
     }
 
@@ -344,10 +347,14 @@ abstract class TutorialController implements BackGestureAttemptCallback,
             mTutorialFragment.getRootView().setBackground(AppCompatResources.getDrawable(
                     mContext, getMockWallpaperResId()));
             mTutorialFragment.updateFeedbackVideo();
-            mFakeLauncherView.setImageDrawable(AppCompatResources.getDrawable(
-                    mContext, getMockLauncherResId()));
+            mFakeLauncherView.setBackgroundColor(
+                    mContext.getColor(Utilities.isDarkTheme(mContext)
+                            ? R.color.fake_wallpaper_color_dark_mode
+                            : R.color.fake_wallpaper_color_light_mode));
+            mFakeHotseatView.setImageDrawable(AppCompatResources.getDrawable(
+                    mContext, getMockHotseatResId()));
             mFakeTaskView.setBackground(AppCompatResources.getDrawable(
-                    mContext, getMockAppTaskThumbnailResId()));
+                    mContext, getMockAppTaskThumbnailResId(Utilities.isDarkTheme(mContext))));
             mFakeTaskView.animate().alpha(1).setListener(
                     AnimatorListeners.forSuccessCallback(() -> mFakeTaskView.animate().cancel()));
             mFakePreviousTaskView.setBackground(AppCompatResources.getDrawable(
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
index 55c569dad4..ec26022adf 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
@@ -38,6 +38,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
 import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
 import com.android.quickstep.interaction.TutorialController.TutorialType;
 
 abstract class TutorialFragment extends Fragment implements OnTouchListener {
@@ -96,7 +97,7 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
         return null;
     }
 
-    @Nullable Integer getFeedbackVideoResId() {
+    @Nullable Integer getFeedbackVideoResId(boolean forDarkMode) {
         return null;
     }
 
@@ -176,8 +177,12 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
     }
 
     boolean updateFeedbackVideo() {
-        Integer feedbackVideoResId = getFeedbackVideoResId();
-        if (feedbackVideoResId == null || getContext() == null || !updateGestureVideo()) {
+        if (getContext() == null) {
+            return false;
+        }
+        Integer feedbackVideoResId = getFeedbackVideoResId(Utilities.isDarkTheme(getContext()));
+
+        if (feedbackVideoResId == null || !updateGestureVideo()) {
             return false;
         }
         mTutorialAnimation = (AnimatedVectorDrawable) getContext().getDrawable(feedbackVideoResId);
diff --git a/res/drawable/gesture_tutorial_motion_overview_light_mode.xml b/res/drawable/gesture_tutorial_motion_overview_light_mode.xml
new file mode 100644
index 0000000000..75887c9352
--- /dev/null
+++ b/res/drawable/gesture_tutorial_motion_overview_light_mode.xml
@@ -0,0 +1,1587 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <target android:name="_R_G_L_4_G_N_3_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="1050"
+                    android:pathData="M 206,446C 206,446 206,395 206,395"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="217">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_N_3_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="1050"
+                    android:propertyName="scaleX"
+                    android:startOffset="217"
+                    android:valueFrom="1"
+                    android:valueTo="0.6"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="1050"
+                    android:propertyName="scaleY"
+                    android:startOffset="217"
+                    android:valueFrom="1"
+                    android:valueTo="0.6"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_4_G_N_3_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="3400"
+                    android:valueFrom="1"
+                    android:valueTo="0"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_27_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_26_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_25_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_24_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_23_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_22_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_21_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_20_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_19_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_18_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_17_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_16_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_15_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_14_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_13_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_12_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_11_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_10_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_9_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_8_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_7_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_6_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_5_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_4_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_3_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_L_0_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_N_2_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="350"
+                    android:pathData="M 206,395C 206,403.5 206,437.5 206,446"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="2083">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_N_2_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="350"
+                    android:propertyName="scaleX"
+                    android:startOffset="2083"
+                    android:valueFrom="0.6"
+                    android:valueTo="0.72718"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="350"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0.6"
+                    android:valueTo="0.72718"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="217"
+                    android:propertyName="scaleX"
+                    android:startOffset="2433"
+                    android:valueFrom="0.72718"
+                    android:valueTo="0.72"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.51,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="217"
+                    android:propertyName="scaleY"
+                    android:startOffset="2433"
+                    android:valueFrom="0.72718"
+                    android:valueTo="0.72"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.51,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_3_G_N_2_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0"
+                    android:valueTo="0.6"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_D_0_P_0_G_0_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="scaleX"
+                    android:startOffset="2567"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="scaleY"
+                    android:startOffset="2567"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_N_2_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="350"
+                    android:pathData="M 206,395C 206,403.5 206,437.5 206,446"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="2083">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_N_2_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="350"
+                    android:propertyName="scaleX"
+                    android:startOffset="2083"
+                    android:valueFrom="0.6"
+                    android:valueTo="0.72718"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="350"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0.6"
+                    android:valueTo="0.72718"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="217"
+                    android:propertyName="scaleX"
+                    android:startOffset="2433"
+                    android:valueFrom="0.72718"
+                    android:valueTo="0.72"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.51,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="217"
+                    android:propertyName="scaleY"
+                    android:startOffset="2433"
+                    android:valueFrom="0.72718"
+                    android:valueTo="0.72"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.51,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_N_2_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="2567"
+                    android:valueFrom="0"
+                    android:valueTo="0.6"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="250"
+                    android:pathData="M -556.176,-7.307C -556.176,-7.307 -421.176,-7.307 -421.176,-7.307"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="1350">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.272,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="417"
+                    android:pathData="M -421.176,-7.307C -421.176,-7.307 -429.51,-7.307 -429.51,-7.307"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="1600">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_N_2_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="350"
+                    android:pathData="M 206,395C 206,403.5 206,437.5 206,446"
+                    android:propertyName="translateXY"
+                    android:propertyXName="translateX"
+                    android:propertyYName="translateY"
+                    android:startOffset="2083">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_N_2_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="350"
+                    android:propertyName="scaleX"
+                    android:startOffset="2083"
+                    android:valueFrom="0.6"
+                    android:valueTo="0.72718"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="350"
+                    android:propertyName="scaleY"
+                    android:startOffset="2083"
+                    android:valueFrom="0.6"
+                    android:valueTo="0.72718"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.34,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="217"
+                    android:propertyName="scaleX"
+                    android:startOffset="2433"
+                    android:valueFrom="0.72718"
+                    android:valueTo="0.72"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.51,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="217"
+                    android:propertyName="scaleY"
+                    android:startOffset="2433"
+                    android:valueFrom="0.72718"
+                    android:valueTo="0.72"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.51,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_N_2_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="0"
+                    android:propertyName="scaleY"
+                    android:startOffset="1350"
+                    android:valueFrom="0"
+                    android:valueTo="0.6"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="217"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="0.75"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="1833"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="217"
+                    android:valueFrom="0.75"
+                    android:valueTo="0.75"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="fillAlpha"
+                    android:startOffset="2050"
+                    android:valueFrom="0.75"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="217"
+                    android:propertyName="pathData"
+                    android:startOffset="0"
+                    android:valueFrom="M0 406 C21.54,406 39,423.46 39,445 C39,466.54 21.54,484 0,484 C-21.54,484 -39,466.54 -39,445 C-39,423.46 -21.54,406 0,406c "
+                    android:valueTo="M0 395 C27.61,395 50,417.39 50,445 C50,472.61 27.61,495 0,495 C-27.61,495 -50,472.61 -50,445 C-50,417.39 -27.61,395 0,395c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="1050"
+                    android:propertyName="pathData"
+                    android:startOffset="217"
+                    android:valueFrom="M0 395 C27.61,395 50,417.39 50,445 C50,472.61 27.61,495 0,495 C-27.61,495 -50,472.61 -50,445 C-50,417.39 -27.61,395 0,395c "
+                    android:valueTo="M0 166 C27.61,166 50,188.39 50,216 C50,243.61 27.61,266 0,266 C-27.61,266 -50,243.61 -50,216 C-50,188.39 -27.61,166 0,166c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="783"
+                    android:propertyName="pathData"
+                    android:startOffset="1267"
+                    android:valueFrom="M0 166 C27.61,166 50,188.39 50,216 C50,243.61 27.61,266 0,266 C-27.61,266 -50,243.61 -50,216 C-50,188.39 -27.61,166 0,166c "
+                    android:valueTo="M0 166 C27.61,166 50,188.39 50,216 C50,243.61 27.61,266 0,266 C-27.61,266 -50,243.61 -50,216 C-50,188.39 -27.61,166 0,166c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="pathData"
+                    android:startOffset="2050"
+                    android:valueFrom="M0 166 C27.61,166 50,188.39 50,216 C50,243.61 27.61,266 0,266 C-27.61,266 -50,243.61 -50,216 C-50,188.39 -27.61,166 0,166c "
+                    android:valueTo="M0 180 C19.88,180 36,196.12 36,216 C36,235.88 19.88,252 0,252 C-19.88,252 -36,235.88 -36,216 C-36,196.12 -19.88,180 0,180c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="2750"
+                    android:propertyName="translateX"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+    <aapt:attr name="android:drawable">
+        <vector
+            android:width="412dp"
+            android:height="892dp"
+            android:viewportHeight="892"
+            android:viewportWidth="412">
+            <group android:name="_R_G">
+                <group
+                    android:name="_R_G_L_5_G"
+                    android:translateX="206"
+                    android:translateY="446">
+                    <path
+                        android:name="_R_G_L_5_G_D_0_P_0"
+                        android:fillAlpha="1"
+                        android:fillColor="@color/fake_wallpaper_color_light_mode"
+                        android:fillType="nonZero"
+                        android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c " />
+                </group>
+                <group
+                    android:name="_R_G_L_4_G_N_3_T_0"
+                    android:scaleX="1"
+                    android:scaleY="1"
+                    android:translateX="206"
+                    android:translateY="446">
+                    <group
+                        android:name="_R_G_L_4_G"
+                        android:translateX="-206"
+                        android:translateY="-446">
+                        <group android:name="_R_G_L_4_G_L_0_G">
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_27_G"
+                                android:translateX="206"
+                                android:translateY="422.5">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_27_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#dadce0"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M206 -395.5 C206,-395.5 206,395.5 206,395.5 C206,395.5 -206,395.5 -206,395.5 C-206,395.5 -206,-395.5 -206,-395.5 C-206,-395.5 206,-395.5 206,-395.5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_26_G"
+                                android:translateX="206"
+                                android:translateY="496.5">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_26_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#dadce0"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M206 -377.5 C206,-377.5 206,377.5 206,377.5 C206,387.43 197.93,395.5 188,395.5 C188,395.5 -188,395.5 -188,395.5 C-197.93,395.5 -206,387.43 -206,377.5 C-206,377.5 -206,-377.5 -206,-377.5 C-206,-387.43 -197.93,-395.5 -188,-395.5 C-188,-395.5 188,-395.5 188,-395.5 C197.93,-395.5 206,-387.43 206,-377.5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_25_G"
+                                android:translateX="206"
+                                android:translateY="50.5">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_25_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#e8eaed"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M206 -23.5 C206,-23.5 206,50.5 206,50.5 C206,50.5 -206,50.5 -206,50.5 C-206,50.5 -206,-23.5 -206,-23.5 C-206,-23.5 206,-23.5 206,-23.5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_24_G"
+                                android:translateX="206"
+                                android:translateY="50.5">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_24_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#e8eaed"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M206 -32.5 C206,-32.5 206,32.5 206,32.5 C206,42.43 197.93,50.5 188,50.5 C188,50.5 -188,50.5 -188,50.5 C-197.93,50.5 -206,42.43 -206,32.5 C-206,32.5 -206,-32.5 -206,-32.5 C-206,-42.43 -197.93,-50.5 -188,-50.5 C-188,-50.5 188,-50.5 188,-50.5 C197.93,-50.5 206,-42.43 206,-32.5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_23_G"
+                                android:translateX="54"
+                                android:translateY="157">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_23_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_22_G"
+                                android:translateX="54"
+                                android:translateY="157">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_22_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_21_G"
+                                android:translateX="148.5"
+                                android:translateY="148">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_21_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M46.5 -5 C46.5,-5 46.5,5 46.5,5 C46.5,7.21 44.71,9 42.5,9 C42.5,9 -42.5,9 -42.5,9 C-44.71,9 -46.5,7.21 -46.5,5 C-46.5,5 -46.5,-5 -46.5,-5 C-46.5,-7.21 -44.71,-9 -42.5,-9 C-42.5,-9 42.5,-9 42.5,-9 C44.71,-9 46.5,-7.21 46.5,-5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_20_G"
+                                android:translateX="186"
+                                android:translateY="169">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_20_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M84 -4 C84,-4 84,4 84,4 C84,6.21 82.21,8 80,8 C80,8 -80,8 -80,8 C-82.21,8 -84,6.21 -84,4 C-84,4 -84,-4 -84,-4 C-84,-6.21 -82.21,-8 -80,-8 C-80,-8 80,-8 80,-8 C82.21,-8 84,-6.21 84,-4c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_19_G"
+                                android:translateX="54"
+                                android:translateY="245">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_19_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_18_G"
+                                android:translateX="162"
+                                android:translateY="236">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_18_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M60 -5 C60,-5 60,5 60,5 C60,7.21 58.21,9 56,9 C56,9 -56,9 -56,9 C-58.21,9 -60,7.21 -60,5 C-60,5 -60,-5 -60,-5 C-60,-7.21 -58.21,-9 -56,-9 C-56,-9 56,-9 56,-9 C58.21,-9 60,-7.21 60,-5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_17_G"
+                                android:translateX="171.5"
+                                android:translateY="257">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_17_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M69.5 -4 C69.5,-4 69.5,4 69.5,4 C69.5,6.21 67.71,8 65.5,8 C65.5,8 -65.5,8 -65.5,8 C-67.71,8 -69.5,6.21 -69.5,4 C-69.5,4 -69.5,-4 -69.5,-4 C-69.5,-6.21 -67.71,-8 -65.5,-8 C-65.5,-8 65.5,-8 65.5,-8 C67.71,-8 69.5,-6.21 69.5,-4c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_16_G"
+                                android:translateX="54"
+                                android:translateY="333">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_16_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_15_G"
+                                android:translateX="158"
+                                android:translateY="324">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_15_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M56 -5 C56,-5 56,5 56,5 C56,7.21 54.21,9 52,9 C52,9 -52,9 -52,9 C-54.21,9 -56,7.21 -56,5 C-56,5 -56,-5 -56,-5 C-56,-7.21 -54.21,-9 -52,-9 C-52,-9 52,-9 52,-9 C54.21,-9 56,-7.21 56,-5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_14_G"
+                                android:translateX="217.5"
+                                android:translateY="345">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_14_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M115.5 -4 C115.5,-4 115.5,4 115.5,4 C115.5,6.21 113.71,8 111.5,8 C111.5,8 -111.5,8 -111.5,8 C-113.71,8 -115.5,6.21 -115.5,4 C-115.5,4 -115.5,-4 -115.5,-4 C-115.5,-6.21 -113.71,-8 -111.5,-8 C-111.5,-8 111.5,-8 111.5,-8 C113.71,-8 115.5,-6.21 115.5,-4c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_13_G"
+                                android:translateX="54"
+                                android:translateY="421">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_13_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_12_G"
+                                android:translateX="170"
+                                android:translateY="412">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_12_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M68 -5 C68,-5 68,5 68,5 C68,7.21 66.21,9 64,9 C64,9 -64,9 -64,9 C-66.21,9 -68,7.21 -68,5 C-68,5 -68,-5 -68,-5 C-68,-7.21 -66.21,-9 -64,-9 C-64,-9 64,-9 64,-9 C66.21,-9 68,-7.21 68,-5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_11_G"
+                                android:translateX="198.5"
+                                android:translateY="433">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_11_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M96.5 -4 C96.5,-4 96.5,4 96.5,4 C96.5,6.21 94.71,8 92.5,8 C92.5,8 -92.5,8 -92.5,8 C-94.71,8 -96.5,6.21 -96.5,4 C-96.5,4 -96.5,-4 -96.5,-4 C-96.5,-6.21 -94.71,-8 -92.5,-8 C-92.5,-8 92.5,-8 92.5,-8 C94.71,-8 96.5,-6.21 96.5,-4c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_10_G"
+                                android:translateX="54"
+                                android:translateY="509">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_10_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_9_G"
+                                android:translateX="135"
+                                android:translateY="500">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_9_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M33 -5 C33,-5 33,5 33,5 C33,7.21 31.21,9 29,9 C29,9 -29,9 -29,9 C-31.21,9 -33,7.21 -33,5 C-33,5 -33,-5 -33,-5 C-33,-7.21 -31.21,-9 -29,-9 C-29,-9 29,-9 29,-9 C31.21,-9 33,-7.21 33,-5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_8_G"
+                                android:translateX="185.5"
+                                android:translateY="521">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_8_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M83.5 -4 C83.5,-4 83.5,4 83.5,4 C83.5,6.21 81.71,8 79.5,8 C79.5,8 -79.5,8 -79.5,8 C-81.71,8 -83.5,6.21 -83.5,4 C-83.5,4 -83.5,-4 -83.5,-4 C-83.5,-6.21 -81.71,-8 -79.5,-8 C-79.5,-8 79.5,-8 79.5,-8 C81.71,-8 83.5,-6.21 83.5,-4c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_7_G"
+                                android:translateX="54"
+                                android:translateY="597">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_7_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_6_G"
+                                android:translateX="168.5"
+                                android:translateY="588">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_6_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M66.5 -5 C66.5,-5 66.5,5 66.5,5 C66.5,7.21 64.71,9 62.5,9 C62.5,9 -62.5,9 -62.5,9 C-64.71,9 -66.5,7.21 -66.5,5 C-66.5,5 -66.5,-5 -66.5,-5 C-66.5,-7.21 -64.71,-9 -62.5,-9 C-62.5,-9 62.5,-9 62.5,-9 C64.71,-9 66.5,-7.21 66.5,-5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_5_G"
+                                android:translateX="198.5"
+                                android:translateY="609">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_5_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M96.5 -4 C96.5,-4 96.5,4 96.5,4 C96.5,6.21 94.71,8 92.5,8 C92.5,8 -92.5,8 -92.5,8 C-94.71,8 -96.5,6.21 -96.5,4 C-96.5,4 -96.5,-4 -96.5,-4 C-96.5,-6.21 -94.71,-8 -92.5,-8 C-92.5,-8 92.5,-8 92.5,-8 C94.71,-8 96.5,-6.21 96.5,-4c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_4_G"
+                                android:translateX="54"
+                                android:translateY="685">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_4_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_3_G"
+                                android:translateX="162.5"
+                                android:translateY="676">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_3_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M60.5 -5 C60.5,-5 60.5,5 60.5,5 C60.5,7.21 58.71,9 56.5,9 C56.5,9 -56.5,9 -56.5,9 C-58.71,9 -60.5,7.21 -60.5,5 C-60.5,5 -60.5,-5 -60.5,-5 C-60.5,-7.21 -58.71,-9 -56.5,-9 C-56.5,-9 56.5,-9 56.5,-9 C58.71,-9 60.5,-7.21 60.5,-5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_2_G"
+                                android:translateX="174"
+                                android:translateY="697">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_2_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M72 -4 C72,-4 72,4 72,4 C72,6.21 70.21,8 68,8 C68,8 -68,8 -68,8 C-70.21,8 -72,6.21 -72,4 C-72,4 -72,-4 -72,-4 C-72,-6.21 -70.21,-8 -68,-8 C-68,-8 68,-8 68,-8 C70.21,-8 72,-6.21 72,-4c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_1_G"
+                                android:translateX="313.5"
+                                android:translateY="798">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_1_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M74.5 0 C74.5,0 74.5,0 74.5,0 C74.5,15.45 61.95,28 46.5,28 C46.5,28 -46.5,28 -46.5,28 C-61.95,28 -74.5,15.45 -74.5,0 C-74.5,0 -74.5,0 -74.5,0 C-74.5,-15.45 -61.95,-28 -46.5,-28 C-46.5,-28 46.5,-28 46.5,-28 C61.95,-28 74.5,-15.45 74.5,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_4_G_L_0_G_L_0_G"
+                                android:translateX="205.5"
+                                android:translateY="61">
+                                <path
+                                    android:name="_R_G_L_4_G_L_0_G_L_0_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#f8f9fa"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M171.5 -14 C171.5,-14 171.5,14 171.5,14 C171.5,16.21 169.71,18 167.5,18 C167.5,18 -167.5,18 -167.5,18 C-169.71,18 -171.5,16.21 -171.5,14 C-171.5,14 -171.5,-14 -171.5,-14 C-171.5,-16.21 -169.71,-18 -167.5,-18 C-167.5,-18 167.5,-18 167.5,-18 C169.71,-18 171.5,-16.21 171.5,-14c " />
+                            </group>
+                        </group>
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_3_G_N_2_T_0"
+                    android:scaleX="0.6"
+                    android:scaleY="0"
+                    android:translateX="206"
+                    android:translateY="395">
+                    <group
+                        android:name="_R_G_L_3_G"
+                        android:translateX="-206"
+                        android:translateY="-446">
+                        <group
+                            android:name="_R_G_L_3_G_L_0_G"
+                            android:scaleY="0">
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_27_G"
+                                android:scaleY="0"
+                                android:translateX="206"
+                                android:translateY="422.5">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_27_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#dadce0"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M206 -395.5 C206,-395.5 206,395.5 206,395.5 C206,395.5 -206,395.5 -206,395.5 C-206,395.5 -206,-395.5 -206,-395.5 C-206,-395.5 206,-395.5 206,-395.5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_26_G"
+                                android:scaleY="0"
+                                android:translateX="206"
+                                android:translateY="496.5">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_26_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#dadce0"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M206 -377.5 C206,-377.5 206,377.5 206,377.5 C206,387.43 197.93,395.5 188,395.5 C188,395.5 -188,395.5 -188,395.5 C-197.93,395.5 -206,387.43 -206,377.5 C-206,377.5 -206,-377.5 -206,-377.5 C-206,-387.43 -197.93,-395.5 -188,-395.5 C-188,-395.5 188,-395.5 188,-395.5 C197.93,-395.5 206,-387.43 206,-377.5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_25_G"
+                                android:scaleY="0"
+                                android:translateX="206"
+                                android:translateY="50.5">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_25_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#e8eaed"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M206 -23.5 C206,-23.5 206,50.5 206,50.5 C206,50.5 -206,50.5 -206,50.5 C-206,50.5 -206,-23.5 -206,-23.5 C-206,-23.5 206,-23.5 206,-23.5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_24_G"
+                                android:scaleY="0"
+                                android:translateX="206"
+                                android:translateY="50.5">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_24_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#e8eaed"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M206 -32.5 C206,-32.5 206,32.5 206,32.5 C206,42.43 197.93,50.5 188,50.5 C188,50.5 -188,50.5 -188,50.5 C-197.93,50.5 -206,42.43 -206,32.5 C-206,32.5 -206,-32.5 -206,-32.5 C-206,-42.43 -197.93,-50.5 -188,-50.5 C-188,-50.5 188,-50.5 188,-50.5 C197.93,-50.5 206,-42.43 206,-32.5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_23_G"
+                                android:scaleY="0"
+                                android:translateX="54"
+                                android:translateY="157">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_23_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_22_G"
+                                android:scaleY="0"
+                                android:translateX="54"
+                                android:translateY="157">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_22_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_21_G"
+                                android:scaleY="0"
+                                android:translateX="148.5"
+                                android:translateY="148">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_21_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M46.5 -5 C46.5,-5 46.5,5 46.5,5 C46.5,7.21 44.71,9 42.5,9 C42.5,9 -42.5,9 -42.5,9 C-44.71,9 -46.5,7.21 -46.5,5 C-46.5,5 -46.5,-5 -46.5,-5 C-46.5,-7.21 -44.71,-9 -42.5,-9 C-42.5,-9 42.5,-9 42.5,-9 C44.71,-9 46.5,-7.21 46.5,-5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_20_G"
+                                android:scaleY="0"
+                                android:translateX="186"
+                                android:translateY="169">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_20_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M84 -4 C84,-4 84,4 84,4 C84,6.21 82.21,8 80,8 C80,8 -80,8 -80,8 C-82.21,8 -84,6.21 -84,4 C-84,4 -84,-4 -84,-4 C-84,-6.21 -82.21,-8 -80,-8 C-80,-8 80,-8 80,-8 C82.21,-8 84,-6.21 84,-4c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_19_G"
+                                android:scaleY="0"
+                                android:translateX="54"
+                                android:translateY="245">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_19_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_18_G"
+                                android:scaleY="0"
+                                android:translateX="162"
+                                android:translateY="236">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_18_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M60 -5 C60,-5 60,5 60,5 C60,7.21 58.21,9 56,9 C56,9 -56,9 -56,9 C-58.21,9 -60,7.21 -60,5 C-60,5 -60,-5 -60,-5 C-60,-7.21 -58.21,-9 -56,-9 C-56,-9 56,-9 56,-9 C58.21,-9 60,-7.21 60,-5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_17_G"
+                                android:scaleY="0"
+                                android:translateX="171.5"
+                                android:translateY="257">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_17_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M69.5 -4 C69.5,-4 69.5,4 69.5,4 C69.5,6.21 67.71,8 65.5,8 C65.5,8 -65.5,8 -65.5,8 C-67.71,8 -69.5,6.21 -69.5,4 C-69.5,4 -69.5,-4 -69.5,-4 C-69.5,-6.21 -67.71,-8 -65.5,-8 C-65.5,-8 65.5,-8 65.5,-8 C67.71,-8 69.5,-6.21 69.5,-4c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_16_G"
+                                android:scaleY="0"
+                                android:translateX="54"
+                                android:translateY="333">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_16_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_15_G"
+                                android:scaleY="0"
+                                android:translateX="158"
+                                android:translateY="324">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_15_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M56 -5 C56,-5 56,5 56,5 C56,7.21 54.21,9 52,9 C52,9 -52,9 -52,9 C-54.21,9 -56,7.21 -56,5 C-56,5 -56,-5 -56,-5 C-56,-7.21 -54.21,-9 -52,-9 C-52,-9 52,-9 52,-9 C54.21,-9 56,-7.21 56,-5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_14_G"
+                                android:scaleY="0"
+                                android:translateX="217.5"
+                                android:translateY="345">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_14_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M115.5 -4 C115.5,-4 115.5,4 115.5,4 C115.5,6.21 113.71,8 111.5,8 C111.5,8 -111.5,8 -111.5,8 C-113.71,8 -115.5,6.21 -115.5,4 C-115.5,4 -115.5,-4 -115.5,-4 C-115.5,-6.21 -113.71,-8 -111.5,-8 C-111.5,-8 111.5,-8 111.5,-8 C113.71,-8 115.5,-6.21 115.5,-4c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_13_G"
+                                android:scaleY="0"
+                                android:translateX="54"
+                                android:translateY="421">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_13_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_12_G"
+                                android:scaleY="0"
+                                android:translateX="170"
+                                android:translateY="412">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_12_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M68 -5 C68,-5 68,5 68,5 C68,7.21 66.21,9 64,9 C64,9 -64,9 -64,9 C-66.21,9 -68,7.21 -68,5 C-68,5 -68,-5 -68,-5 C-68,-7.21 -66.21,-9 -64,-9 C-64,-9 64,-9 64,-9 C66.21,-9 68,-7.21 68,-5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_11_G"
+                                android:scaleY="0"
+                                android:translateX="198.5"
+                                android:translateY="433">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_11_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M96.5 -4 C96.5,-4 96.5,4 96.5,4 C96.5,6.21 94.71,8 92.5,8 C92.5,8 -92.5,8 -92.5,8 C-94.71,8 -96.5,6.21 -96.5,4 C-96.5,4 -96.5,-4 -96.5,-4 C-96.5,-6.21 -94.71,-8 -92.5,-8 C-92.5,-8 92.5,-8 92.5,-8 C94.71,-8 96.5,-6.21 96.5,-4c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_10_G"
+                                android:scaleY="0"
+                                android:translateX="54"
+                                android:translateY="509">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_10_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_9_G"
+                                android:scaleY="0"
+                                android:translateX="135"
+                                android:translateY="500">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_9_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M33 -5 C33,-5 33,5 33,5 C33,7.21 31.21,9 29,9 C29,9 -29,9 -29,9 C-31.21,9 -33,7.21 -33,5 C-33,5 -33,-5 -33,-5 C-33,-7.21 -31.21,-9 -29,-9 C-29,-9 29,-9 29,-9 C31.21,-9 33,-7.21 33,-5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_8_G"
+                                android:scaleY="0"
+                                android:translateX="185.5"
+                                android:translateY="521">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_8_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M83.5 -4 C83.5,-4 83.5,4 83.5,4 C83.5,6.21 81.71,8 79.5,8 C79.5,8 -79.5,8 -79.5,8 C-81.71,8 -83.5,6.21 -83.5,4 C-83.5,4 -83.5,-4 -83.5,-4 C-83.5,-6.21 -81.71,-8 -79.5,-8 C-79.5,-8 79.5,-8 79.5,-8 C81.71,-8 83.5,-6.21 83.5,-4c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_7_G"
+                                android:scaleY="0"
+                                android:translateX="54"
+                                android:translateY="597">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_7_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_6_G"
+                                android:scaleY="0"
+                                android:translateX="168.5"
+                                android:translateY="588">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_6_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M66.5 -5 C66.5,-5 66.5,5 66.5,5 C66.5,7.21 64.71,9 62.5,9 C62.5,9 -62.5,9 -62.5,9 C-64.71,9 -66.5,7.21 -66.5,5 C-66.5,5 -66.5,-5 -66.5,-5 C-66.5,-7.21 -64.71,-9 -62.5,-9 C-62.5,-9 62.5,-9 62.5,-9 C64.71,-9 66.5,-7.21 66.5,-5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_5_G"
+                                android:scaleY="0"
+                                android:translateX="198.5"
+                                android:translateY="609">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_5_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M96.5 -4 C96.5,-4 96.5,4 96.5,4 C96.5,6.21 94.71,8 92.5,8 C92.5,8 -92.5,8 -92.5,8 C-94.71,8 -96.5,6.21 -96.5,4 C-96.5,4 -96.5,-4 -96.5,-4 C-96.5,-6.21 -94.71,-8 -92.5,-8 C-92.5,-8 92.5,-8 92.5,-8 C94.71,-8 96.5,-6.21 96.5,-4c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_4_G"
+                                android:scaleY="0"
+                                android:translateX="54"
+                                android:translateY="685">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_4_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#9aa0a6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_3_G"
+                                android:scaleY="0"
+                                android:translateX="162.5"
+                                android:translateY="676">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_3_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M60.5 -5 C60.5,-5 60.5,5 60.5,5 C60.5,7.21 58.71,9 56.5,9 C56.5,9 -56.5,9 -56.5,9 C-58.71,9 -60.5,7.21 -60.5,5 C-60.5,5 -60.5,-5 -60.5,-5 C-60.5,-7.21 -58.71,-9 -56.5,-9 C-56.5,-9 56.5,-9 56.5,-9 C58.71,-9 60.5,-7.21 60.5,-5c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_2_G"
+                                android:scaleY="0"
+                                android:translateX="174"
+                                android:translateY="697">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_2_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M72 -4 C72,-4 72,4 72,4 C72,6.21 70.21,8 68,8 C68,8 -68,8 -68,8 C-70.21,8 -72,6.21 -72,4 C-72,4 -72,-4 -72,-4 C-72,-6.21 -70.21,-8 -68,-8 C-68,-8 68,-8 68,-8 C70.21,-8 72,-6.21 72,-4c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_1_G"
+                                android:scaleY="0"
+                                android:translateX="313.5"
+                                android:translateY="798">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_1_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#bdc1c6"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M74.5 0 C74.5,0 74.5,0 74.5,0 C74.5,15.45 61.95,28 46.5,28 C46.5,28 -46.5,28 -46.5,28 C-61.95,28 -74.5,15.45 -74.5,0 C-74.5,0 -74.5,0 -74.5,0 C-74.5,-15.45 -61.95,-28 -46.5,-28 C-46.5,-28 46.5,-28 46.5,-28 C61.95,-28 74.5,-15.45 74.5,0c " />
+                            </group>
+                            <group
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G"
+                                android:scaleY="0"
+                                android:translateX="205.5"
+                                android:translateY="61">
+                                <path
+                                    android:name="_R_G_L_3_G_L_0_G_L_0_G_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#f8f9fa"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M171.5 -14 C171.5,-14 171.5,14 171.5,14 C171.5,16.21 169.71,18 167.5,18 C167.5,18 -167.5,18 -167.5,18 C-169.71,18 -171.5,16.21 -171.5,14 C-171.5,14 -171.5,-14 -171.5,-14 C-171.5,-16.21 -169.71,-18 -167.5,-18 C-167.5,-18 167.5,-18 167.5,-18 C169.71,-18 171.5,-16.21 171.5,-14c " />
+                            </group>
+                        </group>
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_2_G_N_2_T_0"
+                    android:scaleX="0.6"
+                    android:scaleY="0"
+                    android:translateX="206"
+                    android:translateY="395">
+                    <group
+                        android:name="_R_G_L_2_G"
+                        android:scaleX="1.3767699999999998"
+                        android:scaleY="1.3767699999999998"
+                        android:translateY="-508.163">
+                        <group
+                            android:name="_R_G_L_2_G_D_0_P_0_G_0_T_0"
+                            android:scaleX="0"
+                            android:scaleY="0">
+                            <path
+                                android:name="_R_G_L_2_G_D_0_P_0"
+                                android:fillAlpha="1"
+                                android:fillColor="#9aa0a6"
+                                android:fillType="nonZero"
+                                android:pathData=" M0 25 C13.81,25 25,13.81 25,0 C25,-13.81 13.81,-25 0,-25 C-13.81,-25 -25,-13.81 -25,0 C-25,13.81 -13.81,25 0,25c " />
+                        </group>
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_1_G_N_2_T_0"
+                    android:scaleX="0.6"
+                    android:scaleY="0"
+                    android:translateX="206"
+                    android:translateY="395">
+                    <group
+                        android:name="_R_G_L_1_G"
+                        android:scaleX="1.39"
+                        android:scaleY="1.39"
+                        android:translateX="-556.176"
+                        android:translateY="-7.307">
+                        <path
+                            android:name="_R_G_L_1_G_D_0_P_0"
+                            android:fillAlpha="1"
+                            android:fillColor="@color/gesture_tutorial_fake_previous_task_view_color"
+                            android:fillType="nonZero"
+                            android:pathData=" M135 -301 C135,-301 135,311 135,311 C135,319.28 128.28,326 120,326 C120,326 -120,326 -120,326 C-128.28,326 -135,319.28 -135,311 C-135,311 -135,-301 -135,-301 C-135,-309.28 -128.28,-316 -120,-316 C-120,-316 120,-316 120,-316 C128.28,-316 135,-309.28 135,-301c " />
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_0_G"
+                    android:translateX="206"
+                    android:translateY="446">
+                    <path
+                        android:name="_R_G_L_0_G_D_0_P_0"
+                        android:fillAlpha="0"
+                        android:fillColor="#84ba69"
+                        android:fillType="nonZero"
+                        android:pathData=" M0 406 C21.54,406 39,423.46 39,445 C39,466.54 21.54,484 0,484 C-21.54,484 -39,466.54 -39,445 C-39,423.46 -21.54,406 0,406c " />
+                </group>
+            </group>
+            <group android:name="time_group" />
+        </vector>
+    </aapt:attr>
+</animated-vector>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 266943708a..c2b07e022d 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -38,6 +38,9 @@
 
     <color name="gesture_tutorial_ripple_color">#A0C2F9</color> <!-- Light Blue -->
     <color name="gesture_tutorial_fake_task_view_color">#6DA1FF</color> <!-- Light Blue -->
+    <color name="fake_wallpaper_color_dark_mode">#000000</color> <!-- Black -->
+    <color name="fake_wallpaper_color_light_mode">#f9f9f9</color> <!-- White -->
+    <!-- Must contrast fake_wallpaper_color_dark_mode and fake_wallpaper_color_light_mode -->
     <color name="gesture_tutorial_fake_previous_task_view_color">#3C4043</color> <!-- Gray -->
     <color name="gesture_tutorial_action_button_label_color">#FF000000</color>
     <color name="gesture_tutorial_primary_color">#B7F29F</color> <!-- Light Green -->
-- 
GitLab


From e85dc514cd5c3d4511103d2c4d21704a972b9d8a Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 26 May 2021 12:40:07 -0700
Subject: [PATCH 1277/1664] Enabling themed icon feature

Bug: 183641907
Test: Manual
Change-Id: I79643803bb50ab2f4b40122258cd1c8bf89b90ad
---
 src/com/android/launcher3/config/FeatureFlags.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 0c0c92ed04..3daf873302 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -142,7 +142,7 @@ public final class FeatureFlags {
             "MULTI_DB_GRID_MIRATION_ALGO", true, "Use the multi-db grid migration algorithm");
 
     public static final BooleanFlag ENABLE_THEMED_ICONS = getDebugFlag(
-            "ENABLE_THEMED_ICONS", false, "Enable themed icons on workspace");
+            "ENABLE_THEMED_ICONS", true, "Enable themed icons on workspace");
 
     // Keep as DeviceFlag for remote disable in emergency.
     public static final BooleanFlag ENABLE_OVERVIEW_SELECTIONS = new DeviceFlag(
-- 
GitLab


From 295a4029083b88b6917adcaa02593bcf9976738b Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pbdr@google.com>
Date: Wed, 26 May 2021 16:20:58 +0100
Subject: [PATCH 1278/1664] Update the computation of the widget span from size

The new computation takes into account the new cell layout border
spacing.

Change-Id: Ic20e0906bbbaaf1e53475585e2a6ca31c277e09b
Bug: 187461595
Test: Manual testing, varying the sizes in a widget
---
 .../LauncherAppWidgetProviderInfoTest.java    |  43 +++++++
 .../widget/LauncherAppWidgetProviderInfo.java | 107 +++++++++++-------
 2 files changed, 109 insertions(+), 41 deletions(-)

diff --git a/robolectric_tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java b/robolectric_tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java
index d97701148b..d18138f8d2 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java
@@ -20,8 +20,10 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doAnswer;
 
+import android.appwidget.AppWidgetHostView;
 import android.content.Context;
 import android.graphics.Point;
+import android.graphics.Rect;
 
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile;
@@ -110,6 +112,47 @@ public final class LauncherAppWidgetProviderInfoTest {
         assertThat(info.minSpanY).isEqualTo(2);
     }
 
+    @Test
+    public void initSpans_minResizeWidthWithCellSpacingAndWidgetInset_shouldInitializeMinSpans() {
+        InvariantDeviceProfile idp = createIDP();
+        DeviceProfile dp = idp.supportedProfiles.get(0);
+        Rect padding = new Rect();
+        AppWidgetHostView.getDefaultPaddingForWidget(mContext, null, padding);
+        int maxPadding = Math.max(Math.max(padding.left, padding.right),
+                Math.max(padding.top, padding.bottom));
+        dp.cellLayoutBorderSpacingPx = maxPadding + 1;
+        Mockito.when(dp.shouldInsetWidgets()).thenReturn(true);
+
+        LauncherAppWidgetProviderInfo info = new LauncherAppWidgetProviderInfo();
+        info.minResizeWidth = CELL_SIZE * 2 + maxPadding;
+        info.minResizeHeight = CELL_SIZE * 2 + maxPadding;
+
+        info.initSpans(mContext, idp);
+
+        assertThat(info.minSpanX).isEqualTo(2);
+        assertThat(info.minSpanY).isEqualTo(2);
+    }
+
+    @Test
+    public void initSpans_minResizeWidthWithCellSpacingAndNoWidgetInset_shouldInitializeMinSpans() {
+        InvariantDeviceProfile idp = createIDP();
+        DeviceProfile dp = idp.supportedProfiles.get(0);
+        Rect padding = new Rect();
+        AppWidgetHostView.getDefaultPaddingForWidget(mContext, null, padding);
+        int maxPadding = Math.max(Math.max(padding.left, padding.right),
+                Math.max(padding.top, padding.bottom));
+        dp.cellLayoutBorderSpacingPx = maxPadding - 1;
+        Mockito.when(dp.shouldInsetWidgets()).thenReturn(false);
+        LauncherAppWidgetProviderInfo info = new LauncherAppWidgetProviderInfo();
+        info.minResizeWidth = CELL_SIZE * 2 + maxPadding;
+        info.minResizeHeight = CELL_SIZE * 2 + maxPadding;
+
+        info.initSpans(mContext, idp);
+
+        assertThat(info.minSpanX).isEqualTo(3);
+        assertThat(info.minSpanY).isEqualTo(3);
+    }
+
     private InvariantDeviceProfile createIDP() {
         DeviceProfile profile = Mockito.mock(DeviceProfile.class);
         doAnswer(i -> {
diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java b/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
index 53b5fec31c..14108f614c 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
@@ -67,61 +67,86 @@ public class LauncherAppWidgetProviderInfo extends AppWidgetProviderInfo
     }
 
     public void initSpans(Context context, InvariantDeviceProfile idp) {
-        // Always assume we're working with the smallest span to make sure we
-        // reserve enough space in both orientations.
-        float smallestCellWidth = Float.MAX_VALUE;
-        float smallestCellHeight = Float.MAX_VALUE;
+        int minSpanX = 0;
+        int minSpanY = 0;
+        int maxSpanX = idp.numColumns;
+        int maxSpanY = idp.numRows;
+        int spanX = 0;
+        int spanY = 0;
+
+        Rect widgetPadding = new Rect();
+        Rect localPadding = new Rect();
+        AppWidgetHostView.getDefaultPaddingForWidget(context, provider, widgetPadding);
 
         Point cellSize = new Point();
-        boolean isWidgetPadded = false;
         for (DeviceProfile dp : idp.supportedProfiles) {
             dp.getCellSize(cellSize);
-            smallestCellWidth = Math.min(smallestCellWidth, cellSize.x);
-            smallestCellHeight = Math.min(smallestCellHeight, cellSize.y);
-            isWidgetPadded = isWidgetPadded || !dp.shouldInsetWidgets();
+            // We want to account for the extra amount of padding that we are adding to the widget
+            // to ensure that it gets the full amount of space that it has requested.
+            // If grids supports insetting widgets, we do not account for widget padding.
+            if (dp.shouldInsetWidgets()) {
+                localPadding.setEmpty();
+            } else {
+                localPadding.set(widgetPadding);
+            }
+            minSpanX = Math.max(minSpanX,
+                    getSpanX(localPadding, minResizeWidth, dp.cellLayoutBorderSpacingPx,
+                            cellSize.x));
+            minSpanY = Math.max(minSpanY,
+                    getSpanY(localPadding, minResizeHeight, dp.cellLayoutBorderSpacingPx,
+                            cellSize.y));
+
+            if (ATLEAST_S) {
+                if (maxResizeWidth > 0) {
+                    maxSpanX = Math.min(maxSpanX,
+                            getSpanX(localPadding, maxResizeWidth, dp.cellLayoutBorderSpacingPx,
+                                    cellSize.x));
+                }
+                if (maxResizeHeight > 0) {
+                    maxSpanY = Math.min(maxSpanY,
+                            getSpanY(localPadding, maxResizeHeight, dp.cellLayoutBorderSpacingPx,
+                                    cellSize.y));
+                }
+            }
+
+            spanX = Math.max(spanX,
+                    getSpanX(localPadding, minWidth, dp.cellLayoutBorderSpacingPx, cellSize.x));
+            spanY = Math.max(spanY,
+                    getSpanY(localPadding, minHeight, dp.cellLayoutBorderSpacingPx, cellSize.y));
         }
 
-        // We want to account for the extra amount of padding that we are adding to the widget
-        // to ensure that it gets the full amount of space that it has requested.
-        // If grids supports insetting widgets, we do not account for widget padding.
-        Rect widgetPadding = new Rect();
-        if (isWidgetPadded) {
-            AppWidgetHostView.getDefaultPaddingForWidget(context, provider, widgetPadding);
+        if (ATLEAST_S) {
+            // Ensures maxSpan >= minSpan
+            maxSpanX = Math.max(maxSpanX, minSpanX);
+            maxSpanY = Math.max(maxSpanY, minSpanY);
+
+            // Use targetCellWidth/Height if it is within the min/max ranges.
+            // Otherwise, use the span of minWidth/Height.
+            if (targetCellWidth >= minSpanX && targetCellWidth <= maxSpanX
+                    && targetCellHeight >= minSpanY && targetCellHeight <= maxSpanY) {
+                spanX = targetCellWidth;
+                spanY = targetCellHeight;
+            }
         }
 
-        minSpanX = getSpanX(widgetPadding, minResizeWidth, smallestCellWidth);
-        minSpanY = getSpanY(widgetPadding, minResizeHeight, smallestCellHeight);
-
-        // Use maxResizeWidth/Height if they are defined and we're on S or above.
-        maxSpanX =
-                (ATLEAST_S && maxResizeWidth > 0)
-                        ? getSpanX(widgetPadding, maxResizeWidth, smallestCellWidth)
-                        : idp.numColumns;
-        maxSpanY =
-                (ATLEAST_S && maxResizeHeight > 0)
-                        ? getSpanY(widgetPadding, maxResizeHeight, smallestCellHeight)
-                        : idp.numRows;
-
-        // Use targetCellWidth/Height if it is within the min/max ranges and we're on S or above.
-        // Otherwise, fall back to minWidth/Height.
-        if (ATLEAST_S && targetCellWidth >= minSpanX && targetCellWidth <= maxSpanX
-                && targetCellHeight >= minSpanY && targetCellHeight <= maxSpanY) {
-            spanX = targetCellWidth;
-            spanY = targetCellHeight;
-        } else {
-            spanX = getSpanX(widgetPadding, minWidth, smallestCellWidth);
-            spanY = getSpanY(widgetPadding, minHeight, smallestCellHeight);
-        }
+        this.minSpanX = minSpanX;
+        this.minSpanY = minSpanY;
+        this.maxSpanX = maxSpanX;
+        this.maxSpanY = maxSpanY;
+        this.spanX = spanX;
+        this.spanY = spanY;
     }
 
-    private int getSpanX(Rect widgetPadding, int widgetWidth, float cellWidth) {
+    private int getSpanX(Rect widgetPadding, int widgetWidth, int cellSpacing, float cellWidth) {
         return Math.max(1, (int) Math.ceil(
-                (widgetWidth + widgetPadding.left + widgetPadding.right) / cellWidth));
+                (widgetWidth + widgetPadding.left + widgetPadding.right + cellSpacing) / (cellWidth
+                        + cellSpacing)));
     }
 
-    private int getSpanY(Rect widgetPadding, int widgetHeight, float cellHeight) {
+    private int getSpanY(Rect widgetPadding, int widgetHeight, int cellSpacing, float cellHeight) {
         return Math.max(1, (int) Math.ceil(
-                (widgetHeight + widgetPadding.top + widgetPadding.bottom) / cellHeight));
+                (widgetHeight + widgetPadding.top + widgetPadding.bottom + cellSpacing) / (
+                        cellHeight + cellSpacing)));
     }
 
     public String getLabel(PackageManager packageManager) {
-- 
GitLab


From f8d731a808e2ffdb77cf6525bac59bcda3045eef Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 26 May 2021 14:58:13 -0700
Subject: [PATCH 1279/1664] Cleanup state properly when interacting during
 gesture nav transition

When the transition is canceled (e.g. when touching the nav bar during the transition), do the following:
- Abort the RecentsView scroll including the edge effects to ensure we get onSettledOnEndTarget() immediately.
- Jump to the current gesture end target state instead of the default rest state.

Test: Swipe up and to the left and hold to go to overview from an app, then swipe up to home during the transition; ensure that the touch down goes to overview rather than home, and subsequently that the swipe is respected and goes to home
Fixes: 189142339
Change-Id: Ie1d7dd05f45ab48968df7fdfd69fa1e1dda36d06
---
 .../src/com/android/quickstep/AbsSwipeUpHandler.java |  6 +++++-
 .../com/android/quickstep/BaseActivityInterface.java | 12 +++++++++++-
 src/com/android/launcher3/PagedView.java             |  9 +++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 005e9b5a7d..a78a8c32c5 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1392,6 +1392,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
             mLauncherTransitionController.getNormalController().getAnimationPlayer().end();
             mLauncherTransitionController = null;
         }
+
+        if (mRecentsView != null) {
+            mRecentsView.abortScrollerAnimation();
+        }
     }
 
     /**
@@ -1410,7 +1414,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
 
     private void resetStateForAnimationCancel() {
         boolean wasVisible = mWasLauncherAlreadyVisible || mGestureStarted;
-        mActivityInterface.onTransitionCancelled(wasVisible);
+        mActivityInterface.onTransitionCancelled(wasVisible, mGestureState.getEndTarget());
 
         // Leave the pending invisible flag, as it may be used by wallpaper open animation.
         if (mActivity != null) {
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index 2696cbeb79..4ae6fa8541 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -86,12 +86,22 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
         mBackgroundState = backgroundState;
     }
 
-    public void onTransitionCancelled(boolean activityVisible) {
+    /**
+     * Called when the current gesture transition is cancelled.
+     * @param activityVisible Whether the user can see the changes we make here, so try to animate.
+     * @param endTarget If the gesture ended before we got cancelled, where we were headed.
+     */
+    public void onTransitionCancelled(boolean activityVisible,
+            @Nullable GestureState.GestureEndTarget endTarget) {
         ACTIVITY_TYPE activity = getCreatedActivity();
         if (activity == null) {
             return;
         }
         STATE_TYPE startState = activity.getStateManager().getRestState();
+        if (endTarget != null) {
+            // We were on our way to this state when we got canceled, end there instead.
+            startState = stateFromGestureEndTarget(endTarget);
+        }
         activity.getStateManager().goToState(startState, activityVisible);
     }
 
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index b26a7ea22d..b423871259 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -250,6 +250,15 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         forceFinishScroller(true);
     }
 
+    /**
+     *  Immediately finishes any overscroll effect and jumps to the end of the scroller animation.
+     */
+    public void abortScrollerAnimation() {
+        mEdgeGlowLeft.finish();
+        mEdgeGlowRight.finish();
+        abortScrollerAnimation(true);
+    }
+
     private void abortScrollerAnimation(boolean resetNextPage) {
         mScroller.abortAnimation();
         // We need to clean up the next page here to avoid computeScrollHelper from
-- 
GitLab


From 45ecd6aa7d9e90548ebd447c9ad4fa671689c1a1 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 26 May 2021 00:02:21 -0700
Subject: [PATCH 1280/1664] Add missing call to finish the home animation

- This reset the task view's show-screenshot state to show the
  snapshot the next time the task view is visible

Fixes: 186143625
Test: Enter pip w/ autoenter pip app, swipe up to overview
Change-Id: I6a1ec3d0654a33b228f97a6009145450e72e8d48
---
 .../src/com/android/quickstep/AbsSwipeUpHandler.java     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index e0f430d6cf..c09620268e 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -82,6 +82,7 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimationSuccessListener;
+import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.logging.StatsLogManager.StatsLogger;
 import com.android.launcher3.statemanager.BaseState;
@@ -1213,20 +1214,22 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                 && (windowRotation == ROTATION_90 || windowRotation == ROTATION_270)) {
             swipePipToHomeAnimator.setFromRotation(mTaskViewSimulator, windowRotation);
         }
+        AnimatorPlaybackController activityAnimationToHome =
+                homeAnimFactory.createActivityAnimationToHome();
         swipePipToHomeAnimator.addListener(new AnimatorListenerAdapter() {
             private boolean mHasAnimationEnded;
             @Override
             public void onAnimationStart(Animator animation) {
                 if (mHasAnimationEnded) return;
-                // Ensure Launcher ends in NORMAL state, we intentionally skip other callbacks
-                // since they are not relevant in this swipe-pip-to-home case.
-                homeAnimFactory.createActivityAnimationToHome().dispatchOnStart();
+                // Ensure Launcher ends in NORMAL state
+                activityAnimationToHome.dispatchOnStart();
             }
 
             @Override
             public void onAnimationEnd(Animator animation) {
                 if (mHasAnimationEnded) return;
                 mHasAnimationEnded = true;
+                activityAnimationToHome.getAnimationPlayer().end();
                 if (mRecentsAnimationController == null) {
                     // If the recents animation is interrupted, we still end the running
                     // animation (not canceled) so this is still called. In that case, we can
-- 
GitLab


From 1817a5717f1d9baa5c160bb3f24ba6e01539f2dc Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Thu, 27 May 2021 02:29:56 +0000
Subject: [PATCH 1281/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I6b5cd6be5d7f2b4519dc0fa589df88ea5e6b3139
---
 quickstep/res/values-af/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-am/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-ar/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-as/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-az/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-b+sr+Latn/strings.xml | 16 ++++++++++++----
 quickstep/res/values-be/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-bg/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-bn/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-bs/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-ca/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-cs/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-da/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-de/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-el/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-en-rAU/strings.xml    | 16 ++++++++++++----
 quickstep/res/values-en-rCA/strings.xml    | 16 ++++++++++++----
 quickstep/res/values-en-rGB/strings.xml    | 16 ++++++++++++----
 quickstep/res/values-en-rIN/strings.xml    | 16 ++++++++++++----
 quickstep/res/values-en-rXC/strings.xml    | 16 ++++++++++++----
 quickstep/res/values-es-rUS/strings.xml    | 16 ++++++++++++----
 quickstep/res/values-es/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-et/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-eu/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-fa/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-fi/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-fr-rCA/strings.xml    | 16 ++++++++++++----
 quickstep/res/values-fr/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-gl/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-gu/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-hi/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-hr/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-hu/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-hy/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-in/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-is/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-it/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-iw/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-ja/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-ka/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-kk/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-km/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-kn/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-ko/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-ky/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-lo/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-lt/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-lv/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-mk/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-ml/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-mn/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-mr/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-ms/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-my/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-nb/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-ne/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-nl/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-or/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-pa/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-pl/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-pt-rPT/strings.xml    | 16 ++++++++++++----
 quickstep/res/values-pt/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-ro/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-ru/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-si/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-sk/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-sl/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-sq/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-sr/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-sv/strings.xml        | 14 +++++++++-----
 quickstep/res/values-sw/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-ta/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-te/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-th/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-tl/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-tr/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-uk/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-ur/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-uz/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-vi/strings.xml        | 16 ++++++++++++----
 quickstep/res/values-zh-rCN/strings.xml    | 16 ++++++++++++----
 quickstep/res/values-zh-rHK/strings.xml    | 16 ++++++++++++----
 quickstep/res/values-zh-rTW/strings.xml    | 16 ++++++++++++----
 quickstep/res/values-zu/strings.xml        | 16 ++++++++++++----
 84 files changed, 1005 insertions(+), 337 deletions(-)

diff --git a/quickstep/res/values-af/strings.xml b/quickstep/res/values-af/strings.xml
index 2cef1e5696..f563cdbb95 100644
--- a/quickstep/res/values-af/strings.xml
+++ b/quickstep/res/values-af/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Voorspelde program: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Maak seker dat jy van die rand heel links af swiep."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Maak seker dat jy van die linkerrand na die middel van die skerm swiep en laat los."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Swiep van regs na middel van skerm om terug te gaan na laaste skerm."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Maak seker dat jy van die rand heel regs af swiep."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Maak seker dat jy van die regterrand na die middel van die skerm swiep en laat los."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Jy het die \"gaan terug\"-gebaar voltooi. Nou kan jy leer hoe om tussen programme te wissel."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Jy het die \"gaan terug\"-gebaar voltooi."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Maak seker dat jy nie te naby aan die onderkant van die skerm swiep nie."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Gaan na Instellings om sensitiwiteit van teruggebaar te verander"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Swiep van links af om terug te gaan"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Swiep van linkerkant na middel van skerm om terug te gaan na laaste skerm waarop jy was."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Maak seker dat jy van die onderrand van die skerm af opswiep."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Maak seker jy onderbreek nie voordat jy laat los nie."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Maak seker jy swiep reguit op."</string>
diff --git a/quickstep/res/values-am/strings.xml b/quickstep/res/values-am/strings.xml
index 253cb6cbe2..3c20bb1e7d 100644
--- a/quickstep/res/values-am/strings.xml
+++ b/quickstep/res/values-am/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"የተገመተው መተግበሪያ፦ <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ከግራ ጠርዝ ጥግ ጀምሮ ማንሸራተትዎን ያረጋግጡ።"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ከግራ ጠርዝ ወደ ማያ ገጹ መሃል ማንሸራተትዎን እና መልቀቅዎን ያረጋግጡ።"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"እንዲሁም ከቀኝ ጠርዝ ወደ ማያ ገጹ መሃል በማንሸራተት ወደ መጨረሻው ማያ ገጽ መመለስ ይችላሉ።"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ከቀኝ ጠርዝ ጥግ ጀምሮ ማንሸራተትዎን ያረጋግጡ።"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ከቀኝ ጠርዝ ወደ ማያ ገጹ መሃል ማንሸራተትዎን እና መልቀቅዎን ያረጋግጡ።"</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"ወደኋላ የመመለስ ምልክትን አጠናቀዋል። ቀጥሎም መተግበሪያዎችን እንዴት መቀየር እንደሚችሉ ይወቁ።"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ወደኋላ የመመለስ ምልክትን አጠናቀዋል።"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ከማያ ገጹ ታችኛው ክፍል ጋር በጣም ጠጋ ብለው አለማንሸራተትዎን ያረጋግጡ።"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ከኋላ ስሜት ሰጭነት ደረጃ ለመለወጥ ወደ ቅንብሮች ይመለሱ"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"ወደ ኋላ ለመመለስ ከግራ ጀምረው ያንሸራትቱ"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"ወደነበሩበት የመጨረሻው ማያ ገጽ ለመመለስ ከግራ ጠርዝ ወደ ማያ ገጹ መሃል ያንሸራትቱ።"</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ከማያ ገጹ የታችኛው ጫፍ ወደ ላይ ማንሸራተትዎን ያረጋግጡ።"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ከመልቀቅዎ በፊት ለአፍታ እንዳልቆሙ ያረጋግጡ።"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"በቀጥታ ወደ ላይ ማንሸራተትዎን ያረጋግጡ።"</string>
diff --git a/quickstep/res/values-ar/strings.xml b/quickstep/res/values-ar/strings.xml
index 002eb7e321..65f4c30ba8 100644
--- a/quickstep/res/values-ar/strings.xml
+++ b/quickstep/res/values-ar/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"التطبيق المتوقع: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"تأكّد من التمرير سريعًا من أقصى الحافة اليمنى."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"تأكّد من التمرير سريعًا من الحافة اليمنى إلى وسط الشاشة ثم ارفع إصبعك."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"يمكنك أيضًا الرجوع إلى الشاشة السابقة عن طريق التمرير سريعًا من الحافة اليسرى إلى وسط الشاشة"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"تأكّد من التمرير سريعًا من أقصى الحافة اليسرى."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"تأكّد من التمرير سريعًا من الحافة اليسرى إلى وسط الشاشة ثم ارفع إصبعك."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"لقد أكملت التدريب على إيماءة الرجوع. تعرّف بعد ذلك على كيفية التبديل بين التطبيقات."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"لقد أكملت التدريب على إيماءة الرجوع."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"تأكّد من عدم التمرير بالقرب من أسفل الشاشة."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"لتغيير مستوى حساسية إيماءة الرجوع، انتقِل إلى \"الإعدادات\""</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"مرِّر سريعًا من اليسار للرجوع."</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"للرجوع إلى الشاشة السابقة، مرِّر سريعًا من الحافة اليمنى إلى وسط الشاشة"</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"تأكّد من التمرير سريعًا من الحافة السفلى للشاشة إلى أعلاها."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"تأكّد من عدم التوقّف قليلاً قبل رفع إصبعك."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"تأكّد من التمرير إلى الأعلى مباشرةً."</string>
diff --git a/quickstep/res/values-as/strings.xml b/quickstep/res/values-as/strings.xml
index 699565f4c6..d5e5761e12 100644
--- a/quickstep/res/values-as/strings.xml
+++ b/quickstep/res/values-as/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"পূৰ্বানুমান কৰা এপ্: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"আপুনি বাওঁ প্ৰান্তৰৰ একেবাৰে সীমাৰ পৰা ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"আপুনি স্ক্ৰীনৰ বাওঁ প্ৰান্তৰৰ পৰা সোঁ প্ৰান্তৰৰ ফালে মধ্যভাগলৈকে ছোৱাইপ কৰি এৰি দিয়াটো নিশ্চিত কৰক।"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"আপুনি স্ক্ৰীনখনৰ সোঁ প্ৰান্তৰৰ পৰা মাজলৈ ছোৱাইপ কৰিও অন্তিম স্ক্ৰীনখনলৈ উভতি যাব পাৰে।"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"আপুনি সোঁ প্ৰান্তৰৰ একেবাৰে সীমাৰ পৰা ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"আপুনি স্ক্ৰীনৰ সোঁ প্ৰান্তৰৰ পৰা মধ্যভাগলৈকে ছোৱাইপ কৰি এৰি দিয়াটো নিশ্চিত কৰক।"</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"আপুনি উভতি যাওক নিৰ্দেশটো সম্পূৰ্ণ কৰিলে। ইয়াৰ পাছত, এপ্‌ কেনেকৈ সলনি কৰিব সেয়া জানক।"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"আপুনি উভতি যাওক নিৰ্দেশটো সম্পূৰ্ণ কৰিলে।"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"আপুনি স্ক্ৰীনৰ তলৰ অংশৰ বেছি ওচৰলৈ ছোৱাইপ নকৰাটো নিশ্চিত কৰক।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"উভতি যোৱাৰ নির্দেশটোৰ সংবেদনশীলতা সলনি কৰিবলৈ ছেটিঙলৈ যাওক"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"উভতি যাবলৈ বাওঁ প্ৰান্তৰৰ পৰা ছোৱাইপ কৰক"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"আপুনি পূৰ্বে থকা অন্তিম স্ক্ৰীনখনলৈ উভতি যাবলৈ স্ক্ৰীনখনৰ বাওঁ প্ৰান্তৰৰ পৰা মাজলৈ ছোৱাইপ কৰক।"</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"আপুনি স্ক্ৰীনৰ তলৰ প্ৰান্তৰ পৰা ওপৰলৈ ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"আপুনি এৰি দিয়াৰ পূৰ্বে অলপো নোৰোৱাটো নিশ্চিত কৰক।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"আপুনি পোনকৈ ওপৰলৈ ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
diff --git a/quickstep/res/values-az/strings.xml b/quickstep/res/values-az/strings.xml
index 2d03b4e944..4aab9feeaf 100644
--- a/quickstep/res/values-az/strings.xml
+++ b/quickstep/res/values-az/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Proqnozlaşdırılan tətbiq: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Ən sol tərəfdən sürüşdürdüyünüzə əmin olun."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Ekranın sol kənarından ortasına sürüşdürüb buraxın."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Həmçinin ekranın sağ kənarından ortasına sürüşdürərək son ekrana qayıda bilərsiniz."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Ən sağ tərəfdən sürüşdürdüyünüzə əmin olun."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Ekranın sağ kənarından ortasına sürüşdürüb buraxın."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Geri getmə jestini tamamladınız. Sonra tətbiqləri keçirməyi öyrənin."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Geri getmə jestini tamamladınız."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ekranın altına çox yaxın sürüşdürmədiyinizə əmin olun."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Geri qayıtma jestinin həssaslığını dəyişmək üçün Ayarlara keçin"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Geri qayıtmaq üçün soldan sürüşdürün"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Son ekrana qayıtmaq üçün ekranın sol kənarından ortasına doğru sürüşdürün."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Ekranın aşağı kənarından yuxarı sürüşdürdüyünüzə əmin olun."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Buraxmazdan əvvəl durdurmadığınıza əmin olun."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Birbaşa yuxarı sürüşdürdüyünüzə əmin olun."</string>
diff --git a/quickstep/res/values-b+sr+Latn/strings.xml b/quickstep/res/values-b+sr+Latn/strings.xml
index e9c52c25b8..bff46e8b0d 100644
--- a/quickstep/res/values-b+sr+Latn/strings.xml
+++ b/quickstep/res/values-b+sr+Latn/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predviđamo aplikaciju: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Obavezno prevucite od same leve ivice."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Obavezno prevucite od leve ivice do sredine ekrana i otpustite."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Vratite se na poslednji ekran prevlačenjem zdesna ka sredini."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Obavezno prevucite od same desne ivice."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Obavezno prevucite od desne ivice do sredine ekrana i otpustite."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Dovršili ste pokret za povratak. Sada saznajte kako da promenite aplikacije."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Dovršili ste pokret za povratak."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nikako ne prevlačite previše blizu dna ekrana."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Osetljivost pok. za nazad možete da promenite u Podešavanjima"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Prevucite sa leve strane da biste se vratili"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Da biste se vratili na poslednji ekran, prevucite od leve ivice ka sredini ekrana."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Obavezno prevucite nagore od donje ivice ekrana."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Nikako ne stajte pre otpuštanja."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Obavezno prevucite pravo nagore."</string>
diff --git a/quickstep/res/values-be/strings.xml b/quickstep/res/values-be/strings.xml
index d0774cb0e7..d5b9dc9888 100644
--- a/quickstep/res/values-be/strings.xml
+++ b/quickstep/res/values-be/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Праграма з падказкі: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Пераканайцеся, што вы не праводзіце пальцам занадта далёка ад левага вугла экрана."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Пераканайцеся, што праводзіце пальцам з левага вугла ў цэнтр экрана, а потым адпускаеце."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Каб вярнуцца, правядзіце ад правага краю ў цэнтр экрана."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Пераканайцеся, што вы не праводзіце пальцам занадта далёка ад правага вугла экрана."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Пераканайцеся, што праводзіце пальцам з правага вугла ў цэнтр экрана, а потым адпускаеце."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Вы навучыліся рабіць жэст вяртання. А зараз даведайцеся, як пераключацца паміж праграмамі."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Вы навучыліся рабіць жэст вяртання."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Пераканайцеся, што вы не праводзіце пальцам занадта блізка да ніжняга краю экрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Каб змяніць адчувальнасць жэста вяртання, адкрыйце налады"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Каб вярнуцца назад, правядзіце пальцам ад левага краю"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Каб вярнуцца на папярэдні экран, правядзіце пальцам ад левага краю ў цэнтр экрана."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Пераканайцеся, што праводзіце пальцам па экране знізу ўверх."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Пераканайцеся, што не затрымліваецеся перад адпусканнем."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Пераканайцеся, што праводзіце пальцам вертыкальна."</string>
diff --git a/quickstep/res/values-bg/strings.xml b/quickstep/res/values-bg/strings.xml
index d9d5b4a9fa..727236de34 100644
--- a/quickstep/res/values-bg/strings.xml
+++ b/quickstep/res/values-bg/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Предвидено приложение: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Трябва да прекарате пръст от най-лявата част на екрана."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Трябва да прекарате пръст от левия край на екрана до средата, след което да вдигнете пръста си."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Можете да се върнете на последния екран, като прекарате пръст от десния край на екрана до средата."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Трябва да прекарате пръст от най-дясната част на екрана."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Трябва да прекарате пръст от десния край на екрана до средата, след което да вдигнете пръста си."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Изпълнихте жеста за връщане назад. В следващия урок ще научите как се превключва между приложения."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Изпълнихте жеста за връщане назад."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Не прекарвайте пръст твърде близо до долната част на екрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Променете чувств. на жеста за връщане назад от настройките"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Прекарайте пръст от ляво, за да се върнете назад"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"За да се върнете на последния активен екран, прекарайте пръст от левия край на екрана до средата."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Трябва да прекарате пръст нагоре от долния край на екрана."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Не задържайте, преди да вдигнете пръста си."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Трябва да прекарате пръст право нагоре."</string>
diff --git a/quickstep/res/values-bn/strings.xml b/quickstep/res/values-bn/strings.xml
index dde010f846..0fd888d171 100644
--- a/quickstep/res/values-bn/strings.xml
+++ b/quickstep/res/values-bn/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"আপনার প্রয়োজন হতে পারে এমন অ্যাপ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"একদম বাঁ প্রান্ত থেকে সোয়াইপ করছেন কিনা ভাল করে দেখে নিন।"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"আপনি বাঁ প্রান্ত থেকে স্ক্রিনের মাঝখান পর্যন্ত সোয়াইপ করছেন ও পরে আঙুল তুলে নিন। এটির খেয়াল রাখুন।"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"ডান প্রান্ত থেকে স্ক্রিনের মাঝখান পর্যন্ত সোয়াইপ করে আপনি আগের ক্রিনেও ফিরে যেতে পারেন।"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"একদম ডান প্রান্ত থেকে সোয়াইপ করছেন কিনা ভাল করে দেখে নিন।"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"আপনি ডান প্রান্ত থেকে স্ক্রিনের মাঝখান পর্যন্ত সোয়াইপ করছেন ও পরে আঙুল তুলে নিন। এটি খেয়াল রাখুন।"</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"আপনি ফিরে যাওয়ার জেসচার সম্পর্কে জেনেছেন। এরপর, একটি অ্যাপ থেকে অন্য অ্যাপে কীভাবে যাবেন জেনে নিন।"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"আপনি ফিরে যাওয়ার জেসচার সম্পর্কে জেনেছেন।"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"স্ক্রিনের নিচের প্রান্তের খুব কাছে পর্যন্ত যাতে সোয়াইপ না করেন সেটি ভাল করে দেখে নিন।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ফিরে যাওয়ার জেসচারের সেন্সিটিভিটি পরিবর্তন করতে, সেটিংসে যান"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"ফিরে যেতে আপনার স্ক্রিনের বাম প্রান্ত থেকে সোয়াইপ করুন"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"আপনার থাকা আগের স্ক্রিনে ফিরে যেতে, বাঁ প্রান্ত থেকে স্ক্রিনের মাঝখান পর্যন্ত সোয়াইপ করুন।"</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"স্ক্রিনের নিচের প্রান্ত থেকে আপনি সোয়াইপ করেছেন কিনা ভাল করে দেখে নিন।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"আঙুল তুলে নেওয়ার আগে আপনি যাতে পজ না করেন সেটি ভাল করে দেখে নিন।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"আপনি উপরের দিকে সোজাসুজি সোয়াইপ করেছেন কিনা ভাল করে দেখে নিন।"</string>
diff --git a/quickstep/res/values-bs/strings.xml b/quickstep/res/values-bs/strings.xml
index 07268ccf7d..72346964be 100644
--- a/quickstep/res/values-bs/strings.xml
+++ b/quickstep/res/values-bs/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predviđena aplikacija: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Obratite pažnju da prevučete s krajnjeg lijevog ruba."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Obratite pažnju da prevučete s lijevog ruba prema sredini ekrana, a zatim pustite."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Na posljednji ekran se možete vratiti i prevlačenjem od desnog ruba do sredine ekrana."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Obratite pažnju da prevučete s krajnjeg desnog ruba."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Obratite pažnju da prevučete s desnog ruba prema sredini ekrana, a zatim pustite."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Završili ste pokret za vraćanje. Sljedeće naučite kako prebacivati između aplikacija."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Završili ste pokret za vraćanje."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Obratite pažnju da ne prevučete preblizu donjem dijelu ekrana."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Promijenite osjetljivost pokreta za povratak u Postavkama"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Prevucite slijeva nadesno da se vratite"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Da se vratite na posljednji ekran na kojem ste bili, prevucite od lijevog ruba do sredine ekrana."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Obratite pažnju da prevučete prema gore s donjeg ruba ekrana."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Obratite pažnju da ne zastanete prije puštanja."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Obratite pažnju da prevučete ravno prema gore."</string>
diff --git a/quickstep/res/values-ca/strings.xml b/quickstep/res/values-ca/strings.xml
index 47a4916d23..b565f3f1f9 100644
--- a/quickstep/res/values-ca/strings.xml
+++ b/quickstep/res/values-ca/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicció d\'aplicació: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Assegura\'t de lliscar des de l\'extrem esquerre de la pantalla."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Assegura\'t de lliscar des de la vora esquerra cap al centre de la pantalla i deixa anar."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"També pots tornar a la darrera pantalla lliscant des de l\'extrem dret cap al centre."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Assegura\'t de lliscar des de l\'extrem dret de la pantalla."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Assegura\'t de lliscar des de la vora dreta cap al centre de la pantalla i deixa anar."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Has completat el gest per tornar enrere. Ara, descobreix com pots canviar d\'aplicació."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Has completat el gest per tornar enrere."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Assegura\'t de no lliscar massa a prop de la part inferior de la pantalla."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Per canviar la sensibilitat del gest, ves a Configuració"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Llisca des de l\'esquerra per tornar enrere"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Per tornar a la darrera pantalla, llisca des de l\'extrem esquerre cap al centre de la pantalla."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Assegura\'t de lliscar des de la vora inferior de la pantalla."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Assegura\'t de no aturar-te abans de deixar anar."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Assegura\'t de lliscar directament cap amunt."</string>
diff --git a/quickstep/res/values-cs/strings.xml b/quickstep/res/values-cs/strings.xml
index de780920dc..a852c768dc 100644
--- a/quickstep/res/values-cs/strings.xml
+++ b/quickstep/res/values-cs/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Předpokládaná aplikace: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Přejeďte prstem z úplného levého okraje obrazovky."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Přejeďte prstem z levého okraje doprostřed obrazovky a zdvihněte prst."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Přejetím prstem z pravého okraje doprostřed obrazovky se také můžete vrátit zpět na poslední obrazovku."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Přejeďte prstem z úplného pravého okraje obrazovky."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Přejeďte prstem z pravého okraje doprostřed obrazovky a zdvihněte prst."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Dokončili jste gesto pro přechod zpět. Teď se naučíte přepínat aplikace."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Dokončili jste gesto pro přechod zpět."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Dejte pozor, abyste prstem nepřejížděli moc blízko ke spodnímu okraji obrazovky."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Citlivost gesta pro přechod zpět můžete změnit v Nastavení"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Pokud se chcete vrátit, přejeďte prstem zleva"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Na poslední obrazovku se můžete vrátit přejetím prstem z levého okraje doprostřed obrazovky."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Přejeďte prstem nahoru z dolního okraje obrazovky."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Před zdvihnutím prstu nedělejte pauzu."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Přejeďte prstem přímo nahoru."</string>
diff --git a/quickstep/res/values-da/strings.xml b/quickstep/res/values-da/strings.xml
index aea76a2fb2..6729bfe01f 100644
--- a/quickstep/res/values-da/strings.xml
+++ b/quickstep/res/values-da/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App, du forventes at skulle bruge: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Stryg fra kanten yderst til venstre."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Stryg fra venstre kant mod midten af skærmen, og løft fingeren."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Du kan også gå tilbage til den seneste skærm ved at stryge mod midten af skærmen fra højre kant."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Stryg fra kanten yderst til højre."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Stryg fra højre kant mod midten af skærmen, og løft fingeren."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Du har fuldført bevægelsen for Gå tilbage. Som det næste kan du se, hvordan du skifter app."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Du har fuldført bevægelsen for Gå tilbage."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Undgå at stryge for tæt på bunden af skærmen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Juster følsomheden for bevægelsen Gå tilbage i Indstillinger"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Stryg fra venstre for at gå tilbage"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Stryg mod midten af skærmen fra venstre kant for at gå tilbage til den seneste skærm, du var på."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Stryg opad fra bunden af skærmen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Undlad at holde fingeren stille, indtil du løfter fingeren."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Stryg lige opad."</string>
diff --git a/quickstep/res/values-de/strings.xml b/quickstep/res/values-de/strings.xml
index 6ea539ce79..4b5fd276f3 100644
--- a/quickstep/res/values-de/strings.xml
+++ b/quickstep/res/values-de/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Vorgeschlagene App: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Wische vom äußersten linken Bildschirmrand."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Wische vom linken Bildschirmrand zur Bildschirmmitte und lass los."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Du kannst auch zum letzten Bildschirm zurückgehen, indem du vom rechten Bildschirmrand zur Mitte wischst."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Wische vom äußersten rechten Bildschirmrand."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Wische vom rechten Bildschirmrand zur Bildschirmmitte und lass los."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Du hast die „Zurück“-Touch-Geste abgeschlossen. Gleich lernst du, wie man zwischen Apps wechselt."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Du hast die „Zurück“-Touch-Geste abgeschlossen."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Wische nicht zu nah am unteren Bildschirmrand."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Du kannst die Empfindlichkeit von „Zurück“ in den Einstellungen ändern"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Von links nach rechts wischen, um zurückzugehen"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Wenn du zum letzten Bildschirm zurückgehen möchtest, wische vom linken Bildschirmrand zur Mitte."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Wische vom unteren Bildschirmrand nach oben."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Achte darauf, nicht innezuhalten, bevor du loslässt."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Wische gerade nach oben."</string>
diff --git a/quickstep/res/values-el/strings.xml b/quickstep/res/values-el/strings.xml
index 3908929e09..cf26f517b2 100644
--- a/quickstep/res/values-el/strings.xml
+++ b/quickstep/res/values-el/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Εφαρμογή από πρόβλεψη: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Φροντίστε να σύρετε από το άκρο της αριστερής πλευράς."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Φροντίστε να σύρετε από το αριστερό άκρο προς το μέσο της οθόνης και απομακρύνετε το δάχτυλό σας."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Μπορείτε να επιστρέψετε στην τελευταία οθόνη με σάρωση από το δεξί άκρο προς το κέντρο της οθόνης."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Φροντίστε να σύρετε από το άκρο της δεξιάς πλευράς."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Φροντίστε να σύρετε από το δεξί άκρο προς το μέσο της οθόνης και απομακρύνετε το δάχτυλό σας."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Ολοκληρώσατε την κίνηση επιστροφής. Στη συνέχεια, μάθετε πώς να κάνετε εναλλαγή εφαρμογών."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ολοκληρώσατε την κίνηση επιστροφής."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Φροντίστε να μην σύρετε υπερβολικά κοντά στο κάτω μέρος της οθόνης."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Μεταβείτε στις Ρυθμίσεις για αλλαγή ευαισθ. κίνησης επιστρ."</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Για να επιστρέψετε, σύρετε από τα αριστερά"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Για να επιστρέψετε στην τελευταία οθόνη, σύρετε από το αριστερό άκρο προς το κέντρο της οθόνης."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Φροντίστε να σύρετε προς τα επάνω από το κάτω άκρο της οθόνης."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Φροντίστε να μην κάνετε παύση προτού απομακρύνετε τα δάχτυλά σας."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Φροντίστε να σύρετε απευθείας προς τα επάνω."</string>
diff --git a/quickstep/res/values-en-rAU/strings.xml b/quickstep/res/values-en-rAU/strings.xml
index 2bd4e21796..6612f18530 100644
--- a/quickstep/res/values-en-rAU/strings.xml
+++ b/quickstep/res/values-en-rAU/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicted app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Make sure that you swipe from the far-left edge."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Make sure that you swipe from the left edge to the middle of the screen and let go."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"You can also go back to the last screen by swiping from the right edge to the middle of the screen."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Make sure that you swipe from the far-right edge."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Make sure that you swipe from the right edge to the middle of the screen and let go."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"You completed the go back gesture. Next, learn how to switch apps."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"You completed the go back gesture."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"To change sensitivity of the back gesture, go to Settings"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Swipe from the left to go back"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"To go back to the last screen you were on, swipe from the left edge to the middle of the screen."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Make sure that you don\'t pause before letting go."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Make sure that you swipe straight up."</string>
diff --git a/quickstep/res/values-en-rCA/strings.xml b/quickstep/res/values-en-rCA/strings.xml
index 2bd4e21796..6612f18530 100644
--- a/quickstep/res/values-en-rCA/strings.xml
+++ b/quickstep/res/values-en-rCA/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicted app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Make sure that you swipe from the far-left edge."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Make sure that you swipe from the left edge to the middle of the screen and let go."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"You can also go back to the last screen by swiping from the right edge to the middle of the screen."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Make sure that you swipe from the far-right edge."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Make sure that you swipe from the right edge to the middle of the screen and let go."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"You completed the go back gesture. Next, learn how to switch apps."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"You completed the go back gesture."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"To change sensitivity of the back gesture, go to Settings"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Swipe from the left to go back"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"To go back to the last screen you were on, swipe from the left edge to the middle of the screen."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Make sure that you don\'t pause before letting go."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Make sure that you swipe straight up."</string>
diff --git a/quickstep/res/values-en-rGB/strings.xml b/quickstep/res/values-en-rGB/strings.xml
index 2bd4e21796..6612f18530 100644
--- a/quickstep/res/values-en-rGB/strings.xml
+++ b/quickstep/res/values-en-rGB/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicted app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Make sure that you swipe from the far-left edge."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Make sure that you swipe from the left edge to the middle of the screen and let go."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"You can also go back to the last screen by swiping from the right edge to the middle of the screen."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Make sure that you swipe from the far-right edge."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Make sure that you swipe from the right edge to the middle of the screen and let go."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"You completed the go back gesture. Next, learn how to switch apps."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"You completed the go back gesture."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"To change sensitivity of the back gesture, go to Settings"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Swipe from the left to go back"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"To go back to the last screen you were on, swipe from the left edge to the middle of the screen."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Make sure that you don\'t pause before letting go."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Make sure that you swipe straight up."</string>
diff --git a/quickstep/res/values-en-rIN/strings.xml b/quickstep/res/values-en-rIN/strings.xml
index 2bd4e21796..6612f18530 100644
--- a/quickstep/res/values-en-rIN/strings.xml
+++ b/quickstep/res/values-en-rIN/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicted app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Make sure that you swipe from the far-left edge."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Make sure that you swipe from the left edge to the middle of the screen and let go."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"You can also go back to the last screen by swiping from the right edge to the middle of the screen."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Make sure that you swipe from the far-right edge."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Make sure that you swipe from the right edge to the middle of the screen and let go."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"You completed the go back gesture. Next, learn how to switch apps."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"You completed the go back gesture."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"To change sensitivity of the back gesture, go to Settings"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Swipe from the left to go back"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"To go back to the last screen you were on, swipe from the left edge to the middle of the screen."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Make sure that you don\'t pause before letting go."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Make sure that you swipe straight up."</string>
diff --git a/quickstep/res/values-en-rXC/strings.xml b/quickstep/res/values-en-rXC/strings.xml
index 8c91887772..51b2caf2b6 100644
--- a/quickstep/res/values-en-rXC/strings.xml
+++ b/quickstep/res/values-en-rXC/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‎‎‏‎‎‏‏‏‎‏‎‏‏‎‎‏‏‏‎‏‏‏‎‎‏‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‎‎‏‏‎Predicted app: ‎‏‎‎‏‏‎<xliff:g id="TITLE">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‏‎‎‎Make sure you swipe from the far-left edge.‎‏‎‎‏‎"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‎‏‎‏‎‏‎‎‎‏‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‎‎‎‎‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‎‎‎‎‏‎‎Make sure you swipe from the left edge to the middle of the screen and let go.‎‏‎‎‏‎"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‎‎‎‎‏‏‎‏‎‎‎‏‏‎‎‎‎‎‏‏‎‏‎‎‎‎‎‏‎‏‎‎‎‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‏‏‎‎You can also go back to the last screen by swiping from the right edge to the middle of the screen.‎‏‎‎‏‎"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‏‏‏‏‎‎‎‏‏‎‏‏‎‏‎‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‎‏‎‏‎‎‏‎‎‏‎‏‎‎‎‎‏‎Make sure you swipe from the far-right edge.‎‏‎‎‏‎"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‎‎‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‎‎Make sure you swipe from the right edge to the middle of the screen and let go.‎‏‎‎‏‎"</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‏‎‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‎‎‎You completed the go back gesture. Next up, learn how to switch apps.‎‏‎‎‏‎"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‏‎‏‎‏‏‏‎‎‎‎‎‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‏‏‎‏‏‎‎‏‏‎‎You completed the go back gesture.‎‏‎‎‏‎"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‏‎‎‎‎‏‎‎‎‏‎‏‎‎‏‎‎‏‎‎‏‎‏‏‎‎‏‎‎‎‎‏‎‏‏‎Make sure you don\'t swipe too close to the bottom of the screen.‎‏‎‎‏‎"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‎‏‏‏‎‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‏‎‎‏‏‏‏‏‎‎‏‎‎‎‏‎‎To change the sensitivity of the back gesture, go to Settings‎‏‎‎‏‎"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‎‏‎‎‎‏‎‎‎‎‎‎‏‏‏‎‏‏‏‎‏‏‎‏‎‎‎‎Swipe from the left to go back‎‏‎‎‏‎"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‎‎‏‎‏‎‎‎‏‎‏‏‏‎‏‎‎‏‏‏‏‏‏‏‎‎‎To go back to the last screen you were on, swipe from the left edge to the middle of the screen.‎‏‎‎‏‎"</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‏‎‏‏‎‏‎‎‏‎‎Make sure you swipe up from the bottom edge of the screen.‎‏‎‎‏‎"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‏‎‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‎‏‏‏‎‏‎‏‎Make sure you don\'t pause before letting go.‎‏‎‎‏‎"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‎‏‏‏‎‏‎‎‏‎‎‏‏‎‏‎‎‏‎‎‏‏‏‏‎‎‎‎‏‎‏‏‏‏‎‎Make sure you swipe straight up.‎‏‎‎‏‎"</string>
diff --git a/quickstep/res/values-es-rUS/strings.xml b/quickstep/res/values-es-rUS/strings.xml
index 4edbfeb8f9..ad08b6f38f 100644
--- a/quickstep/res/values-es-rUS/strings.xml
+++ b/quickstep/res/values-es-rUS/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicción de app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Asegúrate de deslizar el dedo bien desde el borde izquierdo."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Asegúrate de deslizar el dedo del borde izquierdo hacia el centro de la pantalla y, luego, suéltalo."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Desliza de derecha al centro para volver a última pantalla."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Asegúrate de deslizar el dedo bien desde el borde derecho."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Asegúrate de deslizar el dedo del borde derecho hacia el centro de la pantalla y, luego, suéltalo."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Completaste el gesto \"Atrás\". A continuación, obtén información para cambiar de app."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Completaste el gesto \"Atrás\"."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Asegúrate de no hacerlo muy cerca de la parte inferior de la pantalla."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Cambia sensibilidad de gesto \"Atrás\" en Configuración"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Para volver, desliza el dedo desde la izquierda"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Para volver a la última pantalla, desliza el dedo del borde izquierdo al centro de la pantalla."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Asegúrate de deslizar el dedo hacia arriba desde la borde inferior de la pantalla."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Asegúrate de no detenerte antes de soltarlo."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Asegúrate de deslizar el dedo derecho hacia arriba."</string>
diff --git a/quickstep/res/values-es/strings.xml b/quickstep/res/values-es/strings.xml
index 5abec85d74..73316cfa69 100644
--- a/quickstep/res/values-es/strings.xml
+++ b/quickstep/res/values-es/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplicación sugerida: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Desliza el dedo desde el extremo izquierdo."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Desliza el dedo desde el borde izquierdo de la pantalla hasta el centro y levántalo."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"También puedes deslizar el dedo del borde derecho al centro para volver a la pantalla anterior."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Desliza el dedo desde el extremo derecho."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Desliza el dedo desde el borde derecho de la pantalla hasta el centro y levántalo."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Has completado el gesto para volver. Ahora, descubre cómo cambiar de aplicación."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Has completado el gesto para volver."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"No deslices el dedo demasiado cerca de la parte inferior de la pantalla."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Para cambiar la sensibilidad del gesto, ve a Ajustes"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Desliza el dedo desde la izquierda para volver"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Si quieres volver a la pantalla anterior, desliza el dedo del borde izquierdo al centro."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Desliza el dedo hacia arriba desde el borde inferior de la pantalla."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"No hagas ninguna pausa antes de levantar el dedo."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Desliza el dedo directamente hacia arriba."</string>
diff --git a/quickstep/res/values-et/strings.xml b/quickstep/res/values-et/strings.xml
index 08e18c9e7b..aa734bcafa 100644
--- a/quickstep/res/values-et/strings.xml
+++ b/quickstep/res/values-et/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Ennustatud rakendus: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pühkige kindlasti vasakpoolsest servast."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pühkige ekraanikuva vasakust servast keskele ja eemaldage sõrm."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Eelmisele ekraanikuvale naasmiseks võite ka ekraanikuva paremast servast keskele pühkida."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pühkige kindlasti parempoolsest servast."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pühkige ekraanikuva paremast servast keskele ja eemaldage sõrm."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Tegite tagasiliikumise liigutuse. Järgmisena vaadake, kuidas rakenduste vahel vahetada."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Tegite tagasiliikumise liigutuse."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Veenduge, et te ei pühiks liiga ekraanikuva allosa lähedalt."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Tagasiliigutuse tundlikkuse muutmiseks avage menüü Seaded"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Tagasiliikumiseks pühkige vasakult paremale"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Eelmisele ekraanikuvale naasmiseks pühkige vasakust servast ekraanikuva keskele."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pühkige kindlasti ekraanikuva alumisest servast üles."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Veenduge, et te enne vabastamist liigutust ei peataks."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pühkige kindlasti otse üles."</string>
diff --git a/quickstep/res/values-eu/strings.xml b/quickstep/res/values-eu/strings.xml
index aca7132e12..02fdf04fb5 100644
--- a/quickstep/res/values-eu/strings.xml
+++ b/quickstep/res/values-eu/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Iragarritako aplikazioa: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Ziurtatu hatza ezkerreko ertzetik pasatzen duzula."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Ziurtatu hatza pantailaren ezkerreko ertzetik erdialdera pasatzen eta askatzen duzula."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Aurreko pantailara itzultzeko beste modu bat: pasatu hatza pantailaren eskuineko ertzetik erdialdera."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Ziurtatu hatza eskuineko ertzetik pasatzen duzula."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Ziurtatu hatza pantailaren eskuineko ertzetik erdialdera pasatzen eta askatzen duzula."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Ikasi duzu atzera egiteko keinua. Jarraian, ikasi aplikazioa aldatzen."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ikasi duzu atzera egiteko keinua."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ziurtatu hatza ez duzula pantailaren behealdetik gertuegi pasatzen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Keinuaren sentikortasuna aldatzeko, joan ezarpenetara"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Atzera egiteko, pasatu hatza ezkerretik"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Aurreko pantailara itzultzeko, pasatu hatza pantailaren ezkerreko ertzetik erdialdera."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Ziurtatu hatza pantailaren beheko ertzetik gora pasatzen duzula."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Ziurtatu askatu aurretik ez duzula hatza gelditzen."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Ziurtatu hatza zuzen gora pasatzen duzula."</string>
diff --git a/quickstep/res/values-fa/strings.xml b/quickstep/res/values-fa/strings.xml
index b5acf4e2cf..71bfa2a2c2 100644
--- a/quickstep/res/values-fa/strings.xml
+++ b/quickstep/res/values-fa/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"برنامه پیش‌بینی‌شده: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"دقت کنید که از ابتدای لبه سمت چپ تند بکشید."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"دقت کنید که از لبه سمت چپ تند به وسط صفحه بکشید و رها کنید."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"با تند کشیدن از لبه سمت راست به وسط صفحه هم می‌توانید به عقب بروید."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"دقت کنید که از ابتدای لبه سمت راست تند بکشید."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"دقت کنید که از لبه سمت راست تند به وسط صفحه بکشید و رها کنید."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"اشاره برگشتن را تکمیل کردید. مورد بعدی، با نحوه جابه‌جا شدن بین برنامه‌ها آشنا شوید."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"اشاره برگشتن را تکمیل کردید."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"دقت کنید که موقع تند کشیدن بیش‌از حد به پایین صفحه نزدیک نشوید."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"برای تغییر حساسیت اشاره برگشت، به «تنظیمات» بروید"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"برای برگشتن به عقب، از سمت چپ تند بکشید"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"برای برگشتن به آخرین صفحه‌ای که در آن بودید، از لبه سمت چپ تند به وسط صفحه بکشید."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"دقت کنید که از لبه پایینی صفحه تند به بالا بکشید."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"دقت کنید که تا قبل‌از رها کردن، کشیدن را متوقف نکنید."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"دقت کنید که مستقیماً تند به بالا بکشید."</string>
diff --git a/quickstep/res/values-fi/strings.xml b/quickstep/res/values-fi/strings.xml
index ae282679e6..69cc82a063 100644
--- a/quickstep/res/values-fi/strings.xml
+++ b/quickstep/res/values-fi/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Ennakoitu sovellus: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Muista pyyhkäistä aivan vasemmasta reunasta."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pyyhkäise näytön vasemmasta reunasta keskelle ja päästä irti."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Voit myös palata edelliseen näkymään pyyhkäisemällä näytön oikeasta reunasta keskelle."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Muista pyyhkäistä aivan oikeasta reunasta."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pyyhkäise näytön oikeasta reunasta keskelle ja päästä irti."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Olet oppinut Takaisin-eleen. Opettele seuraavaksi vaihtamaan sovellusta."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Olet oppinut Takaisin-eleen."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Varo, ettet pyyhkäise liian lähellä alareunaa."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Voit muuttaa Takaisin-eleen herkkyyttä asetuksista"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Palaa takaisin pyyhkäisemällä vasemmasta reunasta"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Voit palata edelliseen näkymään pyyhkäisemällä näytön vasemmasta reunasta keskelle."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pyyhkäise ylös näytön alareunasta."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Varo keskeyttämästä ennen kuin päästät irti."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Muista pyyhkäistä suoraan ylöspäin."</string>
diff --git a/quickstep/res/values-fr-rCA/strings.xml b/quickstep/res/values-fr-rCA/strings.xml
index bf3fa40328..7910dc1166 100644
--- a/quickstep/res/values-fr-rCA/strings.xml
+++ b/quickstep/res/values-fr-rCA/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Application prédite : <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Assurez-vous de balayer l\'écran à partir de l\'extrémité gauche."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Assurez-vous de balayer l\'écran de l\'extrémité gauche jusqu\'au centre, puis de lever le doigt."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Vous pouvez aussi revenir à l\'écran précédent en balayant l\'écran du côté droit jusqu\'au centre."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Assurez-vous de balayer l\'écran à partir de l\'extrémité droite."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Assurez-vous de balayer l\'écran de l\'extrémité droite jusqu\'au centre, puis de lever le doigt."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Vous avez appris le geste de retour en arrière. Maintenant, apprenez comment changer d\'application."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Vous avez appris le geste de retour en arrière."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Assurez-vous de ne pas balayer trop près du bas de l\'écran."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Modifiez la sensibilité du geste de retour dans Paramètres"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Balayez l\'écran à partir de la gauche pour revenir en arrière."</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Pour revenir à l\'écran précédent, balayez l\'écran du côté gauche jusqu\'au centre."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Assurez-vous de balayer l\'écran à partir de l\'extrémité inférieure vers le haut."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Assurez-vous de ne pas interrompre le geste avant de lever le doigt."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Assurez-vous de balayer l\'écran en ligne droite vers le haut."</string>
diff --git a/quickstep/res/values-fr/strings.xml b/quickstep/res/values-fr/strings.xml
index e7676aea28..a815d5b990 100644
--- a/quickstep/res/values-fr/strings.xml
+++ b/quickstep/res/values-fr/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Application prédite : <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Veillez à balayer l\'écran depuis le bord gauche."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Veillez à bien balayer l\'écran depuis le bord gauche jusqu\'au centre avant de relever le doigt."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Pour revenir à l\'écran précédent, balayez l\'écran depuis le bord droit jusqu\'au centre."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Veillez à balayer l\'écran depuis le bord droit."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Veillez à bien balayer l\'écran depuis le bord droit jusqu\'au centre avant de relever le doigt."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Vous avez appris le geste pour revenir en arrière. Apprenez ensuite à passer d\'une appli à l\'autre."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Vous avez appris le geste pour revenir en arrière."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Veillez à ne pas balayer l\'écran trop près du bas."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Modifiez la sensibilité du geste retour dans les paramètres"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Balayez l\'écran depuis le bord gauche pour revenir en arrière"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Pour revenir à l\'écran précédent, balayez l\'écran depuis le bord gauche jusqu\'au centre."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Veillez à balayer l\'écran du bas vers le haut."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Veillez à ne pas marquer de pause dans votre geste avant de relever le doigt."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Veillez à balayer l\'écran vers le haut."</string>
diff --git a/quickstep/res/values-gl/strings.xml b/quickstep/res/values-gl/strings.xml
index 5841c83ef3..1846efc1b3 100644
--- a/quickstep/res/values-gl/strings.xml
+++ b/quickstep/res/values-gl/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplicación predita: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Asegúrate de pasar o dedo desde o bordo esquerdo máis afastado."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Asegúrate de pasar o dedo desde o bordo esquerdo ata o medio da pantalla e avanza."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Podes volver á última pantalla pasando o dedo desde o bordo dereito ata a metade da pantalla."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Asegúrate de pasar o dedo desde o bordo dereito máis afastado."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Asegúrate de pasar o dedo desde o bordo dereito ata o medio da pantalla e avanza."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Completaches o xesto de volver á última pantalla. O próximo é aprender a cambiar de aplicación."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Completaches o xesto de volver á última pantalla."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Asegúrate de non pasar o dedo demasiado preto da parte inferior da pantalla."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Podes cambiar a sensibilidade do xesto en Configuración"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Pasa o dedo desde a esquerda para volver"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Para volver á última pantalla, pasa o dedo desde o bordo esquerdo ata a metade da pantalla."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Asegúrate de pasar o dedo cara arriba desde o bordo inferior da pantalla."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Asegúrate de non facer unha pausa antes de avanzar."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Asegúrate de pasar o dedo cara arriba cun movemento vertical."</string>
diff --git a/quickstep/res/values-gu/strings.xml b/quickstep/res/values-gu/strings.xml
index 8169eed163..dcd0dfcb6b 100644
--- a/quickstep/res/values-gu/strings.xml
+++ b/quickstep/res/values-gu/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"પૂર્વાનુમાનિત ઍપ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ખાતરી કરો કે તમે એકદમ દૂરની ડાબી કિનારીએથી સ્વાઇપ કરો છો."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ખાતરી કરો કે તમે ડાબી કિનારીએથી સ્ક્રીનના મધ્ય ભાગ સુધી સ્વાઇપ કરો છે અને આંગળી ઊંચકી લો છો."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"તમે જમણી કિનારીએથી સ્ક્રીનના મધ્ય ભાગ સુધી સ્વાઇપ કરીને પણ છેલ્લી સ્ક્રીન પર પાછા જઈ શકો છો."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ખાતરી કરો કે તમે એકદમ દૂરની જમણી કિનારીએથી સ્વાઇપ કરો છો."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ખાતરી કરો કે તમે જમણી કિનારીએથી સ્ક્રીનના મધ્ય ભાગ સુધી સ્વાઇપ કરો છે અને આંગળી ઊંચકી લો છો."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"તમે પાછા જવાનો સંકેત પૂર્ણ કર્યો છે. હવે પછી, ઍપ સ્વિચ કરવાની રીત વિશે જાણો."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"તમે પાછા જવાનો સંકેત પૂર્ણ કર્યો છે."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ખાતરી કરો કે તમારાથી સ્ક્રીનની એકદમ નીચેની કિનારીની ખૂબ નજીક સુધી સ્વાઇપ ન થઈ જાય."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"પાછા જવાના સંકેતની સંવેદિતા બદલવા માટે, સેટિંગમાં જાઓ"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"પાછળ જવા ડાબેથી સ્વાઇપ કરો"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"તમે જે છેલ્લી સ્ક્રીન પર હતા તેની પર પાછા જવા, ડાબી કિનારીએથી સ્ક્રીનના મધ્ય ભાગ સુધી સ્વાઇપ કરો."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ખાતરી કરો કે તમે સ્ક્રીનની નીચેની કિનારીએથી ઉપરની તરફ સ્વાઇપ કરો છો."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ખાતરી કરો કે તમે આંગળી ઊંચકી લેતા પહેલાં સ્વાઇપ કરવાનું થોભાવતા નથી."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ખાતરી કરો કે તમે સીધું ઉપરની તરફ સ્વાઇપ કરો છો."</string>
diff --git a/quickstep/res/values-hi/strings.xml b/quickstep/res/values-hi/strings.xml
index ff6ec897a0..b96dbe2767 100644
--- a/quickstep/res/values-hi/strings.xml
+++ b/quickstep/res/values-hi/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"सुझाया गया ऐप्लिकेशन: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"देख लें कि आप स्क्रीन की बाईं तरफ़ के बिल्कुल किनारे से स्वाइप कर रहे हों."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"देख लें कि आप स्क्रीन के बाएं किनारे से बीचों-बीच तक स्वाइप कर रहे हों और फिर अपनी उंगली उठा लें."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"आप दाएं किनारे से स्क्रीन के बीच तक स्वाइप करके भी पिछली स्क्रीन पर जा सकते हैं."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"देख लें कि आप स्क्रीन की दाईं तरफ़ के बिल्कुल किनारे से स्वाइप कर रहे हों."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"देख लें कि आप स्क्रीन के दाएं किनारे से बीचों-बीच तक स्वाइप कर रहे हों और फिर अपनी उंगली उठा लें."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"आपने पीछे ले जाने वाले हाथ के जेस्चर के बारे में जान लिया है. एक ऐप से दूसरे पर जाने का तरीका जानें."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"आपने पेज पर पीछे ले जाने वाले हाथ के जेस्चर (हाव-भाव) के बारे में जान लिया है."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"देखे लें कि आप स्क्रीन पर बिल्कुल नीचे तक स्वाइप न कर रहे हों."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"\'सेटिंग\' में जाकर, पीछे जाने के लिए इस्तेमाल होने वाले हाथ के जेस्चर (हाव-भाव) की संवेदनशीलता बदलें"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"वापस जाने के लिए, स्क्रीन के बाएं किनारे से स्वाइप करें"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"पिछली स्क्रीन पर वापस जाने के लिए, बाएं किनारे से स्क्रीन के बीच तक स्वाइप करें."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"देख लें कि आप स्क्रीन के निचले किनारे से ऊपर की ओर स्वाइप कर रहे हों."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"देख लें कि आप स्क्रीन से अपनी उंगली उठाने से पहले, इसे कहीं न रोक रहे हों."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"देख लें कि आप ऊपर की ओर बिल्कुल सीधे स्वाइप कर रहे हों."</string>
diff --git a/quickstep/res/values-hr/strings.xml b/quickstep/res/values-hr/strings.xml
index 0d61c2cfbc..d64f821e9e 100644
--- a/quickstep/res/values-hr/strings.xml
+++ b/quickstep/res/values-hr/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predviđena aplikacija: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pazite da prijeđete prstom od krajnjeg lijevog ruba."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pazite da prijeđete prstom od lijevog ruba do sredine zaslona i podignite prst."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Na posljednji se zaslon možete vratiti i prelaskom od desnog ruba do sredine zaslona."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pazite da prijeđete prstom od krajnjeg desnog ruba."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pazite da prijeđete prstom od desnog ruba do sredine zaslona i podignite prst."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Izvršili ste pokret za povratak. Sad saznajte kako promijeniti aplikaciju."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Izvršili ste pokret za povratak."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pazite da ne prijeđete prstom preblizu dnu zaslona."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Osjetljivost pokreta povratka promijenite u postavkama"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Prijeđite prstom slijeva udesno da biste se vratili"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Da biste se vratili na posljednji posjećeni zaslon, prijeđite od lijevog ruba do sredine zaslona."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pazite da prijeđete prstom prema gore od donjeg ruba zaslona."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pazite da ne zastanete prije podizanja prsta."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pazite da prijeđete prstom ravno prema gore."</string>
diff --git a/quickstep/res/values-hu/strings.xml b/quickstep/res/values-hu/strings.xml
index 354e999491..90e4ea7b44 100644
--- a/quickstep/res/values-hu/strings.xml
+++ b/quickstep/res/values-hu/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Várható alkalmazás: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Csúsztasson a képernyő bal széléről."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Csúsztasson a képernyő bal széléről a képernyő közepéig, és engedje el a képernyőt."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"A képernyő jobb széléről a képernyő közepéig csúsztatva is visszatérhet a legutóbbi képernyőre."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Csúsztasson a képernyő jobb széléről."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Csúsztasson a képernyő jobb széléről a képernyő közepéig, és engedje el a képernyőt."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Teljesítette a visszalépési kézmozdulatot. Most megtanulhatja, hogyan válthat az appok között."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Teljesítette a visszalépési kézmozdulatot."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ne csúsztasson túl közel a képernyő aljához."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"A vissza mozdulat érzékenysége a Beállításokban módosítható"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"A visszalépéshez csúsztasson balról jobbra"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Ha visszatérne a legutóbbi képernyőre, csúsztasson a képernyő közepére a bal szélétől."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Csúsztasson felfelé a képernyő aljától."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Ne álljon meg, mielőtt elengedi a képernyőt."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Csúsztasson egyenesen felfelé."</string>
diff --git a/quickstep/res/values-hy/strings.xml b/quickstep/res/values-hy/strings.xml
index 9f112dff9a..3373fe6ad3 100644
--- a/quickstep/res/values-hy/strings.xml
+++ b/quickstep/res/values-hy/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Առաջարկվող հավելված՝ <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Համոզվեք, որ մատը սահեցնում եք էկրանի ձախ եզրից։"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Սահեցրեք մատն էկրանի ձախ եզրից դեպի կենտրոն և բաց թողեք։"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Անցեք վերջին էկրան՝ էկրանի աջ եզրից մատը սահեցնելով դեպի կենտրոն։"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Համոզվեք, որ մատը սահեցնում եք էկրանի աջ եզրից։"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Սահեցրեք մատն էկրանի աջ եզրից դեպի կենտրոն և բաց թողեք։"</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Դուք սովորեցիք հետ գնալու ժեստը։ Այժմ սովորենք՝ ինչպես անցնել մի հավելվածից մյուսը։"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Դուք սովորեցիք հետ գնալու ժեստը։"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Համոզվեք, որ մատը չափազանց մոտ չեք սահեցնում էկրանին ներքևի հատվածին։"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Հետ գնալու ժեստի զգայունությունը փոփոխեք կարգավորումներում"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Սահեցրեք մատը ձախից՝ հետ գնալու համար"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Վերջին էկրան վերադառնալու համար էկրանի եզրից մատը սահեցրեք դեպի կենտրոն։"</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Համոզվեք, որ մատն էկրանի ներքևի եզրից վերև եք սահեցնում։"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Համոզվեք, որ դադար չեք տալիս նախքան բաց թողնելը։"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Համոզվեք, որ մատն ուղիղ վերև եք սահեցնում։"</string>
diff --git a/quickstep/res/values-in/strings.xml b/quickstep/res/values-in/strings.xml
index b7adc5ff32..122f6b817b 100644
--- a/quickstep/res/values-in/strings.xml
+++ b/quickstep/res/values-in/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplikasi yang diprediksi: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pastikan Anda menggeser dari tepi ujung kiri."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pastikan Anda menggeser dari tepi kiri ke tengah layar, lalu lepaskan."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Geser dari tepi kanan ke tengah layar menuju layar terakhir."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pastikan Anda menggeser dari tepi ujung kanan."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pastikan Anda menggeser dari tepi kanan ke tengah layar, lalu lepaskan."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Anda telah menyelesaikan gestur kembali. Selanjutnya, pelajari cara beralih aplikasi."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Anda telah menyelesaikan gestur kembali."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pastikan Anda tidak menggeser terlalu dekat ke bagian bawah layar."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Untuk mengubah sensitivitas gestur kembali, buka Setelan"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Geser dari kiri untuk kembali"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Untuk kembali ke layar terakhir, geser dari tepi kiri ke tengah layar."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pastikan Anda menggeser ke atas dari tepi bawah layar."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pastikan Anda tidak menjeda sebelum melepaskan."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pastikan Anda menggeser lurus ke atas."</string>
diff --git a/quickstep/res/values-is/strings.xml b/quickstep/res/values-is/strings.xml
index abb5298eb6..d79cb4af71 100644
--- a/quickstep/res/values-is/strings.xml
+++ b/quickstep/res/values-is/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Tillaga að forriti: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Passaðu að strjúka frá jaðri vinstri brúnar."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Passaðu að strjúka frá vinstri brún skjásins að miðju hans og sleppa svo."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Þú getur einnig farið til baka á síðasta skjá með því að strjúka frá hægri brún að miðju skjásins."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Passaðu að strjúka frá jaðri hægri brúnar."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Passaðu að strjúka frá hægri brún skjásins að miðju hans og sleppa svo."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Þú laukst við að kynna þér bendinguna „til baka“. Næst skaltu læra hvernig þú skiptir á milli forrita."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Þú laukst við að kynna þér bendinguna „til baka“."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Passaðu að strjúka ekki of nálægt neðri brún skjásins."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Til að breyta næmi til baka-bendingar ferðu í stillingar"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Strjúktu frá vinstri til að fara til baka"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Strjúktu frá vinstri brún að miðju skjásins til að fara aftur til baka í síðasta skjá sem var opinn."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Passaðu að strjúka upp frá neðri brún skjásins."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Passaðu að stoppa ekki áður en þú sleppir."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Passaðu að strjúka beint upp."</string>
diff --git a/quickstep/res/values-it/strings.xml b/quickstep/res/values-it/strings.xml
index 9d6d1f3cd3..51443b80f3 100644
--- a/quickstep/res/values-it/strings.xml
+++ b/quickstep/res/values-it/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App prevista: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Assicurati di scorrere dall\'estremità del bordo sinistro."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Assicurati di scorrere dal bordo sinistro verso il centro dello schermo e solleva il dito."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Puoi anche tornare all\'ultima schermata scorrendo dal bordo destro verso il centro dello schermo."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Assicurati di scorrere dall\'estremità del bordo destro."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Assicurati di scorrere dal bordo destro verso il centro dello schermo e solleva il dito."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Hai completato il gesto Indietro. Ora, impara come passare da un\'app all\'altra."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Hai completato il gesto Indietro."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Assicurati di non scorrere troppo vicino alla parte inferiore dello schermo."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Usa Impostazioni per cambiare sensibilità del gesto Indietro"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Scorri da sinistra per tornare indietro"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Per tornare all\'ultima schermata mostrata, scorri dal bordo sinistro verso il centro dello schermo."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Assicurati di scorrere verso l\'alto dal bordo inferiore dello schermo."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Assicurati di non fare pause prima di sollevare il dito."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Assicurati di scorrere verso l\'alto senza fermarti."</string>
diff --git a/quickstep/res/values-iw/strings.xml b/quickstep/res/values-iw/strings.xml
index 4173f18301..6a641e4e20 100644
--- a/quickstep/res/values-iw/strings.xml
+++ b/quickstep/res/values-iw/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"האפליקציות החזויות: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"חשוב להקפיד להחליק מהקצה הימני."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"חשוב להקפיד להחליק מהקצה הימני למרכז המסך ואז לשחרר."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"אפשר לחזור למסך הקודם בהחלקה מהקצה הימני של המסך אל המרכז."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"חשוב להקפיד להחליק מהקצה השמאלי."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"חשוב להקפיד להחליק מהקצה השמאלי למרכז המסך ואז לשחרר."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"השלמת את תנועת \'הקודם\'. בשלב הבא לומדים איך לעבור בין אפליקציות."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"השלמת את תנועת \'הקודם\'."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"חשוב להקפיד שלא להחליק קרוב מדי לתחתית המסך."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"כדי לשנות את מידת הרגישות של תנועת החזרה, יש לעבור להגדרות"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"יש להחליק מצד שמאל כדי לחזור למסך הקודם"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"כדי לחזור למסך הקודם, יש להחליק מהקצה השמאלי של המסך אל המרכז."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"חשוב להקפיד להחליק למעלה מהקצה התחתון של המסך."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"חשוב לוודא שלא מחכים לפני שמשחררים."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"חשוב להקפיד להחליק ישר למעלה."</string>
diff --git a/quickstep/res/values-ja/strings.xml b/quickstep/res/values-ja/strings.xml
index 27f81b76b9..bdc301a7e6 100644
--- a/quickstep/res/values-ja/strings.xml
+++ b/quickstep/res/values-ja/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"予測されたアプリ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"一番左端からスワイプしてください。"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"画面の左端から中央に向かってスワイプし、指を離してください。"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"画面の右端から中央に向かってスワイプして直前の画面に戻ることもできます。"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"一番右端からスワイプしてください。"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"画面の右端から中央に向かってスワイプし、指を離してください。"</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"「戻る」操作を完了しました。次は、アプリを切り替える方法を覚えましょう。"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"「戻る」操作を完了しました。"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"スワイプする際は画面の下部に近づきすぎないようにしましょう。"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"「戻る」操作の感度を変更するには [設定] に移動します"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"左端からスワイプすると前の画面に戻ります"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"直前の画面に戻るには、画面の左端から中央に向かってスワイプします。"</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"画面の下端から上にスワイプしてください。"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"指を離す前にいったん止めないでください。"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"まっすぐ上にスワイプしてください。"</string>
diff --git a/quickstep/res/values-ka/strings.xml b/quickstep/res/values-ka/strings.xml
index c532589e1d..6c879a568a 100644
--- a/quickstep/res/values-ka/strings.xml
+++ b/quickstep/res/values-ka/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ნაწინასწარმეტყველები აპი: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"არ გადაფურცლოთ მარცხენა კიდის ბოლოდან."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"გადაფურცლეთ მარცხენა კიდიდან ეკრანის ცენტრისკენ და თითი აუშვით."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"ასევე, შეგიძლიათ, დაბრუნდეთ ბოლო ეკრანზე მარჯვენა კიდიდან ეკრანის შუისკენ გადაფურცვლით."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"არ გადაფურცლოთ მარჯვენა კიდის ბოლოდან."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"გადაფურცლეთ მარჯვენა კიდიდან ეკრანის ცენტრისკენ და თითი აუშვით."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"თქვენ შეასრულეთ უკან დაბრუნების ჟესტი. ახლა კი შევიტყოთ, როგორ გადავრთოთ აპები."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"თქვენ შეასრულეთ უკან დაბრუნების ჟესტი."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"არ გადაფურცლოთ ეკრანის ბოლოსთან ახლოს."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"დაბრუნების ჟესტის მგრძნობელობის შესაცვლელად გადადით პარამეტრებზე"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"უკან დასაბრუნებლად გადაფურცლეთ მარცხნიდან"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"ბოლო ნანახ ეკრანზე დასაბრუნებლად გადაფურცლეთ მარცხენა კიდიდან ეკრანის ცენტრისკენ."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"გადაფურცლეთ ეკრანის ქვედა კიდიდან ზემოთ."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"არ დააპაუზოთ თითის აშვებამდე."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"გადაფურცლეთ ზემოთ."</string>
diff --git a/quickstep/res/values-kk/strings.xml b/quickstep/res/values-kk/strings.xml
index 4cf0d2b7ea..5daf4666b6 100644
--- a/quickstep/res/values-kk/strings.xml
+++ b/quickstep/res/values-kk/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Болжалды қолданба: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Сол жақтағы ең шеткі нүктеден бастап сырғытыңыз."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Экранның сол жақ шетінен ортасына қарай сырғытыңыз да, жіберіңіз."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Экранның оң жақ шетінен ортасына қарай сырғыту арқылы соңғы ашылған экранға орала аласыз."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Оң жақтағы ең шеткі нүктеден бастап сырғытыңыз."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Экранның оң жақ шетінен ортасына қарай сырғытыңыз да, жіберіңіз."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Артқа қайту қимылын аяқтадыңыз. Енді қолданбаларды ауыстыруды үйреніңіз."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Артқа қайту қимылын аяқтадыңыз."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Саусағыңызбен сырғыту кезінде экранның төменгі жағына тым жақындамаңыз."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Артқа қайту қимылы сезгіштігін параметрлерден өзгертіңіз."</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Артқа қайту үшін сол жақтан сырғытыңыз"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Соңғы ашылған экранға оралу үшін экранның сол жақ шетінен ортасына қарай сырғытыңыз."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Экранның төменгі шетінен жоғары қарай сырғытыңыз."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Жіберер алдында кідіріс жасамаңыз."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Тігінен жоғары қарай сырғытыңыз."</string>
diff --git a/quickstep/res/values-km/strings.xml b/quickstep/res/values-km/strings.xml
index 1e46dedb15..337c308184 100644
--- a/quickstep/res/values-km/strings.xml
+++ b/quickstep/res/values-km/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"កម្មវិធី​ដែលបាន​ព្យាករ៖ <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ត្រូវប្រាកដថា​អ្នកអូសពី​ចុងគែម​ខាងឆ្វេង​។"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ត្រូវប្រាកដថា​អ្នកអូសពី​គែមខាងឆ្វេង​ទៅផ្នែកកណ្ដាល​នៃអេក្រង់ រួច​ដកដៃ​។"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"អ្នកក៏អាចត្រឡប់ទៅអេក្រង់ចុងក្រោយបានផងដែរ ដោយអូសពីគែមខាងស្ដាំទៅផ្នែកកណ្ដាលនៃអេក្រង់។"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ត្រូវប្រាកដថា​អ្នកអូសពី​ចុងគែម​ខាងស្ដាំ​។"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ត្រូវប្រាកដថា​អ្នកអូសពី​គែមខាងស្ដាំ​ទៅផ្នែកកណ្ដាល​នៃអេក្រង់ រួច​ដកដៃ​។"</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"អ្នក​បានបញ្ចប់​ចលនា​ថយក្រោយ​ហើយ។ បន្ទាប់​មកទៀត សូមស្វែងយល់​ពីរបៀប​ប្ដូរកម្មវិធី​។"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"អ្នក​បានបញ្ចប់​ចលនា​ថយក្រោយ​ហើយ។"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ត្រូវប្រាកដថា​អ្នកមិនអូស​ទៅជិត​ផ្នែកខាងក្រោម​នៃអេក្រង់ពេក​។"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ដើម្បីប្ដូរកម្រិត​រំញោចនឹង​ចលនាថយក្រោយ សូមចូលទៅកាន់​ការកំណត់"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"អូសពីឆ្វេងដើម្បីថយក្រោយ"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"ដើម្បីត្រឡប់ទៅ​អេក្រង់ចុងក្រោយ​ដែលអ្នកបានចូល សូមអូសពី​គែមខាងឆ្វេង​ទៅផ្នែកកណ្ដាល​នៃអេក្រង់។"</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ត្រូវប្រាកដថា​អ្នកអូសឡើងលើ​ពីគែមខាងក្រោម​នៃអេក្រង់​។"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ត្រូវប្រាកដថា​អ្នកមិនផ្អាក មុនពេល​ដកដៃ​។"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ត្រូវប្រាកដថា​អ្នកអូស​ត្រង់ឡើងលើ​។"</string>
diff --git a/quickstep/res/values-kn/strings.xml b/quickstep/res/values-kn/strings.xml
index e057b7655e..1ebdea2106 100644
--- a/quickstep/res/values-kn/strings.xml
+++ b/quickstep/res/values-kn/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ಶಿಫಾರಸು ಮಾಡಿದ ಆ್ಯಪ್: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ನೀವು ದೂರದ ಎಡ ಅಂಚಿನಿಂದ ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ಎಡ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ ಹಾಗೂ ನಿಮ್ಮ ಬೆರಳನ್ನು ಮೇಲೆತ್ತಿ."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"ಬಲ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ ಕೊನೆಯ ಸ್ಕ್ರೀನ್‌ಗೆ ಹೋಗಿ."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ನೀವು ದೂರದ ಬಲ ಅಂಚಿನಿಂದ ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ಬಲ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ ಹಾಗೂ ನಿಮ್ಮ ಬೆರಳನ್ನು ಮೇಲೆತ್ತಿ."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"ನೀವು ಗೋ ಬ್ಯಾಕ್ ಗೆಸ್ಚರ್ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದ್ದೀರಿ. ಮುಂದೆ, ಆ್ಯಪ್‌ಗಳನ್ನು ಬದಲಾಯಿಸುವುದು ಹೇಗೆ ಎಂದು ತಿಳಿಯಿರಿ."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ನೀವು ಗೋ ಬ್ಯಾಕ್ ಗೆಸ್ಚರ್ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದ್ದೀರಿ."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ನೀವು ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಭಾಗಕ್ಕೆ ಹೆಚ್ಚು ಹತ್ತಿರ ಸ್ವೈಪ್ ಮಾಡದಂತೆ ನೋಡಿಕೊಳ್ಳಿ."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ಬ್ಯಾಕ್ ಗೆಸ್ಚರ್‌ನ ಸೂಕ್ಷ್ಮತೆ ಬದಲಾಯಿಸಲು, ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಹೋಗಿ"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"ಹಿಂದಕ್ಕೆ ಹೋಗಲು, ಎಡದಿಂದ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"ಈ ಮೊದಲು ನೀವಿದ್ದ ಕೊನೆಯ ಸ್ಕ್ರೀನ್‌ಗೆ ಹಿಂತಿರುಗಲು, ಬಲ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಗಿನ ಅಂಚಿನಿಂದ ನೀವು ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ವಿರಾಮಗೊಳಿಸದೆ ನಿಮ್ಮ ಬೆರಳನ್ನು ಸ್ಕ್ರೀನ್‌ನಿಂದ ಮೇಲೆತ್ತಿ."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ನೀವು ನೇರವಾಗಿ ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
diff --git a/quickstep/res/values-ko/strings.xml b/quickstep/res/values-ko/strings.xml
index a0c7882fe6..6e6f872684 100644
--- a/quickstep/res/values-ko/strings.xml
+++ b/quickstep/res/values-ko/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"예상 앱: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"왼쪽 가장자리 끝에서 스와이프하세요."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"왼쪽 가장자리에서 화면 중앙으로 스와이프한 후 손가락을 떼세요."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"오른쪽 가장자리에서 화면 중앙으로 스와이프하여 마지막 화면으로 돌아갈 수도 있습니다"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"오른쪽 가장자리 끝에서 스와이프하세요."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"오른쪽 가장자리에서 화면 중앙으로 스와이프한 후 손가락을 떼세요."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"돌아가기 동작을 완료했습니다. 이번에는 앱 전환 방법을 알아보겠습니다."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"돌아가기 동작을 완료했습니다."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"화면 하단에 지나치게 가까운 곳에서 스와이프하면 안 됩니다."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"돌아가기 동작의 민감도를 변경하려면 설정으로 이동하세요"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"왼쪽에서 스와이프하여 뒤로 돌아가세요"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"마지막 화면으로 돌아가려면 왼쪽 가장자리에서 화면 중앙으로 스와이프하세요"</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"화면 하단 가장자리에서 위로 스와이프하세요."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"손가락을 떼기 전에 멈추지 않아야 합니다."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"위로 똑바르게 스와이프하세요."</string>
diff --git a/quickstep/res/values-ky/strings.xml b/quickstep/res/values-ky/strings.xml
index 4c89553240..3d6913a96b 100644
--- a/quickstep/res/values-ky/strings.xml
+++ b/quickstep/res/values-ky/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Божомолдонгон колдонмо: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Экранды эң четинен солдон оңго карай сүрүңүз."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Экранды сол жагынан ортосуна карай сүрүп, манжаңызды алыңыз."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Акыркы экранга кайтуу үчүн экранды оң жагынан ортосуна карай сүрүңүз."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Экранды эң четинен оңдой солго карай сүрүңүз."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Экранды оң жагынан ортосуна карай сүрүп, манжаңызды алыңыз."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"\"Артка\" жаңсоосу боюнча үйрөткүчтү бүтүрдүңүз. Эми колдонмолорду которуштурганды үйрөнүп алыңыз."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"\"Артка\" жаңсоосу боюнча үйрөткүчтү бүтүрдүңүз."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Манжаңызды экрандын ылдый жагына өтө жакындатпай сүрүңүз."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"\"Артка\" жаң-нун сезгичтигин өзгөртүү үчүн Жөндөөлөргө өтүңүз"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Артка кайтуу үчүн экраныңыздын сол четинен сүрүп коюңуз"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Акыркы экранга кайтуу үчүн экранды сол жагынан ортосуна карай сүрүңүз."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Экранды ылдыйдан өйдө карай сүрүңүз."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Манжаңызды алганга чейин токтотпоңуз."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Экранды өйдө карай сүрүңүз."</string>
diff --git a/quickstep/res/values-lo/strings.xml b/quickstep/res/values-lo/strings.xml
index 714d38c926..8464d805fa 100644
--- a/quickstep/res/values-lo/strings.xml
+++ b/quickstep/res/values-lo/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ແອັບທີ່ຄາດເດົາໄວ້: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ກະລຸນາກວດສອບວ່າທ່ານປັດຈາກຂອບຊ້າຍສຸດ."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ກະລຸນາກວດສອບວ່າທ່ານປັດຈາກຂອບຊ້າຍໄປຫາທາງກາງຂອງຈໍແລ້ວປ່ອຍ."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"ທ່ານສາມາດກັບໄປຫາໜ້າຈໍຫຼ້າສຸດໄດ້ໂດຍການປັດຈາກຂອບຂວາໄປຫາກາງຈໍ."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ກະລຸນາກວດສອບວ່າທ່ານປັດຈາກຂອບຂວາສຸດ."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ກະລຸນາກວດສອບວ່າທ່ານປັດຈາກຂອບຂວາໄປຫາທາງກາງຂອງຈໍແລ້ວປ່ອຍ."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"ທ່ານໃຊ້ທ່າທາງກັບຄືນສຳເລັດແລ້ວ. ຕໍ່ໄປ, ມາສຶກສາວິທີສະຫຼັບແອັບ."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ທ່ານໃຊ້ທ່າທາງກັບຄືນສຳເລັດແລ້ວ."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ກະລຸນາກວດສອບວ່າທ່ານບໍ່ໄດ້ປັດໃກ້ກັບທາງລຸ່ມຂອງໜ້າຈໍເກີນໄປ."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ເພື່ອປ່ຽນຄວາມລະອຽດອ່ອນຂອງທ່າທາງກັບຄືນ, ໃຫ້ໄປຫາການຕັ້ງຄ່າ"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"ປັດຈາກຊ້າຍເພື່ອກັບຄືນ"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"ເພື່ອກັບຄືນໄປໜ້າຈໍຫຼ້າສຸດທີ່ທ່ານໃຊ້, ໃຫ້ປັດຈາກຂອບຊ້າຍໄປຫາກາງຈໍ."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ກະລຸນາກວດສອບວ່າທ່ານປັດຂຶ້ນຈາກຂອບລຸ່ມສຸດຂອງໜ້າຈໍ."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ກະລຸນາກວດສອບວ່າທ່ານບໍ່ຢຸດຊົ່ວຄາວກ່ອນປ່ອຍນິ້ວ."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ກະລຸນາກວດສອບວ່າທ່ານປັດຂຶ້ນໄປຊື່ໆ."</string>
diff --git a/quickstep/res/values-lt/strings.xml b/quickstep/res/values-lt/strings.xml
index 55e46e7a27..b1451a8693 100644
--- a/quickstep/res/values-lt/strings.xml
+++ b/quickstep/res/values-lt/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Numatoma programa: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Turite perbraukti nuo kairiojo krašto."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Turite perbraukti nuo kairiojo krašto link ekrano vidurio ir pakelti pirštą."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Į ankstesnį ekraną taip pat galite grįžti, perbraukdami nuo dešiniojo krašto link ekrano vidurio."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Turite perbraukti nuo dešiniojo krašto."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Turite perbraukti nuo dešiniojo krašto link ekrano vidurio ir pakelti pirštą."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Atlikote grįžimo atgal gestą. Toliau sužinosite, kaip perjungti programas."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Atlikote grįžimo atgal gestą."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nebraukite per arti ekrano apačios."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Norėd. pak. grįžimo gesto jautr., eikite į sk. „Nustatymai“"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Perbraukite iš kairės, kad grįžtumėte"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Norėdami grįžti į ankstesnį ekraną, kuriame lankėtės, perbraukite nuo kairiojo krašto link ekrano vidurio."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Turite perbraukti aukštyn nuo apatinio ekrano krašto."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Nepristabdykite prieš pakeldami pirštą."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Turite tiesiai perbraukti aukštyn."</string>
diff --git a/quickstep/res/values-lv/strings.xml b/quickstep/res/values-lv/strings.xml
index 216d1ceaff..2e6b1da319 100644
--- a/quickstep/res/values-lv/strings.xml
+++ b/quickstep/res/values-lv/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Prognozētā lietotne: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Jāvelk no pašas kreisās malas."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Jāvelk no ekrāna kreisās malas uz vidu un jāatlaiž."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Varat arī pāriet atpakaļ uz pēdējo ekrānu, velkot no labās malas uz ekrāna vidu."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Jāvelk no pašas labās malas."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Jāvelk no ekrāna labās malas uz vidu un jāatlaiž."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Jūs sekmīgi veicāt atgriešanās žestu. Tagad varat iemācīties, kā pārslēgt lietotnes."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Jūs sekmīgi veicāt atgriešanās žestu."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nevelciet pārāk tuvu ekrāna apakšdaļai."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Atgriešanās žesta jutīguma līmeni varat mainīt iestatījumos."</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Lai pārietu atpakaļ, velciet no kreisās malas."</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Lai pārietu atpakaļ uz pēdējo izmantoto ekrānu, velciet no kreisās malas uz ekrāna vidu."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Jāvelk augšup no ekrāna apakšmalas."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pirms atlaišanas nepārtrauciet kustību."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Jāvelk tieši uz augšu."</string>
diff --git a/quickstep/res/values-mk/strings.xml b/quickstep/res/values-mk/strings.xml
index a39933f9ac..011d5cedc2 100644
--- a/quickstep/res/values-mk/strings.xml
+++ b/quickstep/res/values-mk/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Предвидена апликација: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Повлечете од подалечниот лев агол."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Повлечете од левиот раб кон средината на екранот и пуштете."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Може да се вратите на последниот екран и со повлекување од десниот раб кон средината на екранот."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Повлечете од подалечниот десен агол."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Повлечете од десниот раб кон средината на екранот и пуштете."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Завршивте со упатството за враќање назад. Следно, дознајте како да се префрлате помеѓу апликации."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Завршивте со упатството за враќање назад."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Не повлекувајте преблиску до долниот раб на екранот."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"За да ја промените чувствителноста, одете во „Поставки“"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Повлечете одлево за да се вратите назад"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"За да се вратите на последниот екран на кој бевте, повлечете од левиот раб кон средината на екранот."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Повлечете нагоре од долниот раб на екранот."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Не правете пауза пред да пуштите."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Повлечете право нагоре."</string>
diff --git a/quickstep/res/values-ml/strings.xml b/quickstep/res/values-ml/strings.xml
index c2edf3e776..4f5068b13e 100644
--- a/quickstep/res/values-ml/strings.xml
+++ b/quickstep/res/values-ml/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"പ്രവചിച്ച ആപ്പ്: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ഇടത്തേയറ്റത്തെ അരികിൽ നിന്ന് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ഇടത്തേ അരികിൽ നിന്ന് സ്‌ക്രീനിന്റെ മധ്യഭാഗത്തേക്ക് സ്വെെപ്പ് ചെയ്‌ത് വിടുക."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"സ്ക്രീനിന്റെ വലത് അരികിൽ നിന്ന് നടുവിലേക്ക് സ്വൈപ്പ് ചെയ്തും മുൻ സ്ക്രീനിലേക്ക് പോകാം."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"വലത്തേയറ്റത്തെ അരികിൽ നിന്ന് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"വലത്തേ അരികിൽ നിന്ന് സ്‌ക്രീനിന്റെ മധ്യഭാഗത്തേക്ക് സ്വെെപ്പ് ചെയ്‌ത് വിടുക."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"മടങ്ങുക ജെസ്ച്ചർ നിങ്ങൾ പൂർത്തിയാക്കി. അടുത്തത്, എങ്ങനെ ആപ്പുകൾ തമ്മിൽ മാറാമെന്ന് മനസ്സിലാക്കുക."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"മടങ്ങുക ജെസ്ച്ചർ നിങ്ങൾ പൂർത്തിയാക്കി."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"സ്‌ക്രീനിന്റെ ഏറ്റവും അടിഭാഗത്തേക്ക് സ്വെെപ്പ് ചെയ്യുന്നില്ലെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ബാക്ക്ജെസ്റ്ററിന്റെ സെൻസിറ്റിവിറ്റി മാറ്റാൻ ക്രമീകരണത്തിൽ പോകൂ"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"പുറകോട്ട് പോകാൻ ഇടതുഭാഗത്ത് നിന്ന് സ്വൈപ്പ് ചെയ്യുക"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"മുമ്പത്തെ സ്ക്രീനിലേക്ക് പോകാൻ, സ്ക്രീനിന്റെ ഇടത് അരികിൽ നിന്ന് നടുവിലേക്ക് സ്വൈപ്പ് ചെയ്യുക."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"സ്‌ക്രീനിന്റെ താഴത്തെ അരികിൽ നിന്ന് മുകളിലേക്ക് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"വിടുന്നതിന് മുമ്പ് നിങ്ങൾ താൽക്കാലികമായി നിർത്തുന്നില്ലെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"നേരെ മുകളിലേക്ക് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പിക്കുക."</string>
diff --git a/quickstep/res/values-mn/strings.xml b/quickstep/res/values-mn/strings.xml
index d378c7b662..c292abdf51 100644
--- a/quickstep/res/values-mn/strings.xml
+++ b/quickstep/res/values-mn/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Таамаглаж буй апп: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Та зүүн захын булангаас шударна уу."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Та дэлгэцийн зүүн булангаас дунд хэсэг хүртэл шударч, суллаарай."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Та мөн дэлгэцийн баруун булангаас дунд хэсэг рүү шударснаар сүүлийн дэлгэц рүү буцах боломжтой."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Та баруун захын булангаас шударна уу."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Та дэлгэцийн баруун булангаас дунд хэсэг хүртэл шударч, суллаарай."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Та буцах зангааг гүйцэтгэлээ. Дараа нь аппуудыг хэрхэн сэлгэх талаар мэдэж авна уу."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Та буцах зангааг гүйцэтгэлээ."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Та дэлгэцийн доод хэсэгтэй хэт ойр бүү шудраарай."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Буцах зангааны мэдрэгшлийг өөрчлөх бол Тохиргоо руу очно уу"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Буцахын тулд зүүн талаас шударна уу"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Та байсан сүүлийн дэлгэц рүүгээ буцахын тулд дэлгэцийн баруун булангаас дунд хэсэг рүү шударна уу"</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Та дэлгэцийн доод булангаас дээш шударна уу."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Та суллахаасаа өмнө түр зогсоож болохгүй."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Та чигээрээ шударна уу."</string>
diff --git a/quickstep/res/values-mr/strings.xml b/quickstep/res/values-mr/strings.xml
index 373d20451d..0bc8e82ebf 100644
--- a/quickstep/res/values-mr/strings.xml
+++ b/quickstep/res/values-mr/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"पूर्वानुमान केलेले अ‍ॅप: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"तुम्ही स्क्रीनच्या अगदी डाव्या कडेपासून स्‍वाइप करत आहात याची खात्री करा."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"तुम्ही स्क्रीनच्या डाव्या कडेपासून मध्यावर स्‍वाइप करून बोट उचलत आहात याची खात्री करा."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"तुम्ही स्क्रीनच्या उजव्या कडेपासून मध्याभागी स्वाइप करून मागील स्क्रीनवर परतदेखील जाऊ शकता."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"तुम्ही स्क्रीनच्या अगदी उजव्या कडेपासून स्‍वाइप करत आहात याची खात्री करा."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"तुम्ही स्क्रीनच्या उजव्या कडेपासून मध्यावर स्‍वाइप करून बोट उचलत आहात याची खात्री करा."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"तुम्ही गो बॅक जेश्चर पूर्ण केले. आता, ॲप्स कशी स्विच करायची ते जाणून घ्या."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"तुम्ही गो बॅक जेश्चर पूर्ण केले."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"तुम्ही स्क्रीनच्या तळाच्या अगदी जवळून स्‍वाइप करत नाही याची खात्री करा."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"बॅक जेश्चरची संवेदनशीलता बदलण्यासाठी, सेटिंग्ज वर जा"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"मागे जाण्यासाठी डावीकडून स्वाइप करा"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"तुम्ही होतात त्या मागील स्क्रीनवर परत जाण्यासाठी, स्क्रीनच्या डाव्या कडेपासून मध्याभागी स्वाइप करा."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"तुम्ही स्क्रीनच्या तळाच्या कडेपासून वर स्वाइप करत आहात याची खात्री करा."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"तुम्ही स्क्रीनवरून बोट उचलण्यापूर्वी ते थांबवत नाही याची खात्री करा."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"तुम्ही सरळ वर स्वाइप करत आहात याची खात्री करा."</string>
diff --git a/quickstep/res/values-ms/strings.xml b/quickstep/res/values-ms/strings.xml
index 507fb43fc4..af39275338 100644
--- a/quickstep/res/values-ms/strings.xml
+++ b/quickstep/res/values-ms/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Apl yang diramalkan: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pastikan anda meleret dari hujung sebelah kiri."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pastikan anda meleret dari tepi sebelah kiri ke tengah skrin dan lepaskan."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Anda juga boleh kembali ke skrin terakhir dengan meleret dari tepi sebelah kanan ke tengah skrin."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pastikan anda meleret dari hujung sebelah kanan."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pastikan anda meleret dari tepi sebelah kanan ke tengah skrin dan lepaskan."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"Anda telah melengkapkan gerak isyarat undur. Seterusnya, ketahui cara menukar apl."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Anda telah melengkapkan gerak isyarat undur."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pastikan anda tidak meleret terlalu dekat dengan bahagian bawah skrin."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Utk mengubah kepekaan gerak isyarat undur, pergi ke Tetapan"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"Leret dari kiri untuk kembali"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Untuk kembali ke skrin terakhir yang anda berada, leret dari tepi sebelah kiri ke tengah skrin."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pastikan anda meleret ke atas dari tepi sebelah bawah skrin."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pastikan anda tidak menjeda sebelum melepaskan gerak isyarat tersebut."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pastikan anda meleret terus ke atas."</string>
diff --git a/quickstep/res/values-my/strings.xml b/quickstep/res/values-my/strings.xml
index 02042b494a..13411e2034 100644
--- a/quickstep/res/values-my/strings.xml
+++ b/quickstep/res/values-my/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ကြိုတင်မှန်းဆထားသော အက်ပ်− <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ဘယ်ဘက်အစွန် ခပ်လှမ်းလှမ်းမှ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ဘယ်ဘက်အစွန်မှ ဖန်သားပြင်အလယ်သို့ ပွတ်ဆွဲပြီး လွှတ်လိုက်ကြောင်း သေချာပါစေ။"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"ဖန်သားပြင်၏ညာအစွန်းမှ အလယ်သို့ပွတ်ဆွဲ၍ ပြီးခဲ့သောဖန်သားပြင်သို့လည်း ပြန်သွားနိုင်သည်။"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ညာဘက်အစွန် ခပ်လှမ်းလှမ်းမှ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ညာဘက်အစွန်မှ ဖန်သားပြင်အလယ်သို့ ပွတ်ဆွဲပြီး လွှတ်လိုက်ကြောင်း သေချာပါစေ။"</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"နောက်ဆုတ်လက်ဟန် ရှင်းလင်းပို့ချချက် ပြီးပါပြီ။ နောက်အဆင့်တွင် အက်ပ်များပြောင်းနည်းကို လေ့လာပါ။"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"နောက်ဆုတ်လက်ဟန် ရှင်းလင်းပို့ချချက် ပြီးပါပြီ။"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ဖန်သားပြင် အောက်ခြေနှင့် အလွန်နီးကပ်စွာ ပွတ်ဆွဲခြင်းမရှိကြောင်း သေချာပါစေ။"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"နောက်ဆုတ်လက်ဟန်၏ အာရုံခံစွမ်းကိုပြောင်းရန် ‘ဆက်တင်များ’ သို့ သွားပါ"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"နောက်သို့ပြန်သွားရန် ဘယ်ဘက်မှ ပွတ်ဆွဲပါ"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"သင်ရှိခဲ့သည့် ပြီးခဲ့သောဖန်သားပြင်သို့ ပြန်သွားရန် ဖန်သားပြင်၏ဘယ်အစွန်းမှ အလယ်သို့ပွတ်ဆွဲပါ။"</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ဖန်သားပြင် အောက်ခြေအစွန်မှ အပေါ်သို့ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"လက်မလွှတ်ခင် ခဏရပ်ခြင်းမရှိကြောင်း သေချာပါစေ။"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"အပေါ်တည့်တည့်သို့ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
diff --git a/quickstep/res/values-nb/strings.xml b/quickstep/res/values-nb/strings.xml
index 6276c4570b..ff1dde7293 100644
--- a/quickstep/res/values-nb/strings.xml
+++ b/quickstep/res/values-nb/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Foreslått app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Sørg for at du sveiper fra kanten helt til venstre."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Sørg for at du sveiper fra den venstre kanten til midten av skjermen og slipper."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Du kan også gå tilbake til forrige skjerm ved å sveipe fra høyre kant til midten av skjermen."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Sørg for at du sveiper fra kanten helt til høyre."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Sørg for at du sveiper fra den høyre kanten til midten av skjermen og slipper."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Du har fullført bevegelsen for å gå tilbake. I neste trinn lærer du hvordan du bytter app."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Du har fullført bevegelsen for å gå tilbake."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Sørg for at du ikke sveiper for nær bunnen av skjermen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Gå til Innstillinger for å endre tilbakebevegelsefølsomheten"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Sveip fra venstre for å gå tilbake"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"For å gå tilbake til den forrige skjermen du var på, sveip fra venstre kant til midten av skjermen."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Sørg for at du sveiper opp fra den nederste kanten av skjermen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Sørg for at du ikke setter på pause før du slipper."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Sørg for at du sveiper rett opp."</string>
diff --git a/quickstep/res/values-ne/strings.xml b/quickstep/res/values-ne/strings.xml
index 1c53c2fe55..f04b935a83 100644
--- a/quickstep/res/values-ne/strings.xml
+++ b/quickstep/res/values-ne/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"पूर्वानुमान गरिएको एप: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"स्क्रिनको सबैभन्दा बायाँ किनाराबाट स्वाइप गर्नुहोस्।"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"स्क्रिनको बायाँ किनाराबाट मध्य भागसम्म स्वाइप गर्नुहोस् अनि औँला उठाउनुहोस्।"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"तपाईं स्क्रिनको दायाँ किनाराबाट मध्य भागसम्म स्वाइप गरेर पनि यसअघिको स्क्रिनमा फर्कन सक्नुहुन्छ।"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"स्क्रिनको सबैभन्दा दायाँ किनाराबाट स्वाइप गर्नुहोस्।"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"स्क्रिनको दायाँ किनाराबाट मध्य भागसम्म स्वाइप गर्नुहोस् अनि औँला उठाउनुहोस्।"</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"तपाईंले \'पछाडि जानुहोस्\' नामक इसारा प्रयोग गर्ने तरिका सिक्नुभयो। अब एउटा एपबाट अर्को एपमा जाने तरिका सिक्नुहोस्।"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"तपाईंले \'पछाडि जानुहोस्\' नामक इसारा प्रयोग गर्ने तरिका सिक्नुभयो।"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"स्क्रिनको फेदको धेरै नजिकसम्म स्वाइप नगर्नुहोस्।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"\'पछाडि\' नामक इसाराको संवेदनशीलता बदल्न सेटिङमा जानुहोस्"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"पछाडि जान बायाँ किनाराबाट स्वाइप गर्नुहोस्"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"तपाईं यसअघि जुन स्क्रिनमा हुनुहुन्थ्यो त्यो फर्कन स्क्रिनको बायाँ किनाराबाट मध्य भागसम्म स्वाइप गर्नुहोस्।"</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"स्क्रिनको फेदबाट माथितिर स्वाइप गर्नुहोस्।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"औँला उठाउनुअघि नरोकिनुहोस्।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"सीधै माथितिर स्वाइप गर्नुहोस्।"</string>
diff --git a/quickstep/res/values-nl/strings.xml b/quickstep/res/values-nl/strings.xml
index ca732e92fa..5825444bb6 100644
--- a/quickstep/res/values-nl/strings.xml
+++ b/quickstep/res/values-nl/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Voorspelde app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Swipe helemaal vanaf de linkerrand."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Swipe vanaf de linkerrand naar het midden van het scherm en laat los."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Je kunt ook teruggaan naar het laatste scherm door vanaf de rechterkant naar het midden van het scherm te swipen."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Swipe helemaal vanaf de rechterrand."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Swipe vanaf de rechterrand naar het midden van het scherm en laat los."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Je weet nu hoe je het gebaar Terug maakt. Ontdek als volgende hoe je tussen apps schakelt."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Je weet nu hoe je het gebaar Terug maakt."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Swipe niet te dicht bij de onderkant van het scherm."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Open Instellingen om de gevoeligheid van Terug te wijzigen"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Swipe vanaf de linkerkant om terug te gaan"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Swipe vanaf de linkerkant naar het midden van het scherm om terug te gaan naar het vorige scherm."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Swipe vanaf de onderrand van het scherm omhoog."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pauzeer niet voordat je loslaat."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Swipe recht omhoog."</string>
diff --git a/quickstep/res/values-or/strings.xml b/quickstep/res/values-or/strings.xml
index 3159871a22..54a59327cb 100644
--- a/quickstep/res/values-or/strings.xml
+++ b/quickstep/res/values-or/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ପୂର୍ବାନୁମାନ କରାଯାଇଥିବା ଆପ୍: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ଆପଣ ଦୂର-ବାମ ଧାରରୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ଆପଣ ସ୍କ୍ରିନର ବାମ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରି ଛାଡ଼ି ଦେଉଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"ଆପଣ ସ୍କ୍ରିନର ଡାହାଣ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରି ପୂର୍ବ ସ୍କ୍ରିନକୁ ମଧ୍ୟ ଫେରିପାରିବେ।"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ଆପଣ ଦୂର-ଡାହାଣ ଧାରରୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ଆପଣ ସ୍କ୍ରିନର ଡାହାଣ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରି ଛାଡ଼ି ଦେଉଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"ଆପଣ \'ପଛକୁ ଫେରନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି। ତା\'ପରେ, ଆପଗୁଡ଼ିକୁ କିପରି ସ୍ୱିଚ୍ କରିବେ ତାହା ଜାଣନ୍ତୁ।"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ଆପଣ \'ପଛକୁ ଫେରନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି।"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ଆପଣ ସ୍କ୍ରିନର ତଳଭାଗର ଅତି ନିକଟରୁ ସ୍ୱାଇପ୍ କରୁନଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ପଛକୁ ଫେରିବା ଜେଶ୍ଚରର ସମ୍ବେଦନଶୀଳତା ବଦଳାଇବାକୁ ସେଟିଂସକୁ ଯାଆନ୍ତୁ"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"ପଛକୁ ଫେରିବା ପାଇଁ ବାମ ଧାରରୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"ଆପଣ ଯେଉଁ ପୂର୍ବ ସ୍କ୍ରିନରେ ଥିଲେ ସେହି ସ୍କ୍ରିନକୁ ଫେରିବା ପାଇଁ, ସ୍କ୍ରିନର ବାମ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ।"</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ଆପଣ ସ୍କ୍ରିନର ତଳ ଧାରରୁ ଉପରକୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ଆପଣ ଛାଡ଼ିବା ପୂର୍ବରୁ ବିରତ କରୁନଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ଆପଣ ସିଧା ଉପରକୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
diff --git a/quickstep/res/values-pa/strings.xml b/quickstep/res/values-pa/strings.xml
index 801beb779f..d00e6cfb21 100644
--- a/quickstep/res/values-pa/strings.xml
+++ b/quickstep/res/values-pa/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ਪੂਰਵ ਅਨੁਮਾਨਿਤ ਐਪ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਦੂਰ-ਖੱਬੇ ਕਿਨਾਰੇ ਤੋਂ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਖੱਬੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰਦੇ ਹੋ ਅਤੇ ਛੱਡ ਦਿੰਦੇ ਹੋ।"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"ਤੁਸੀਂ ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰਕੇ ਪਿਛਲੀ ਸਕ੍ਰੀਨ \'ਤੇ ਵਾਪਸ ਜਾ ਸਕਦੇ ਹੋ।"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਦੂਰ-ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰਦੇ ਹੋ ਅਤੇ ਛੱਡ ਦਿੰਦੇ ਹੋ।"</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"ਤੁਸੀਂ \'ਵਾਪਸ ਜਾਓ\' ਦਾ ਇਸ਼ਾਰਾ ਪੂਰਾ ਕੀਤਾ। ਅੱਗੇ, ਜਾਣੋ ਕਿ ਐਪਾਂ ਵਿਚਾਲੇ ਅਦਲਾ-ਬਦਲੀ ਕਿਵੇਂ ਕਰਨੀ ਹੈ।"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ਤੁਸੀਂ \'ਵਾਪਸ ਜਾਓ\' ਦਾ ਇਸ਼ਾਰਾ ਪੂਰਾ ਕੀਤਾ।"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਲੇ ਹਿੱਸੇ ਦੇ ਬਹੁਤ ਨੇੜੇ ਸਵਾਈਪ ਨਾ ਕਰੋ।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ਪਿੱਛੇ ਜਾਣ ਦੇ ਸੰਕੇਤ ਦੀ ਸੰਵੇਦਨਸ਼ੀਲਤਾ ਬਦਲਣ ਲਈ, ਸੈਟਿੰਗਾਂ \'ਤੇ ਜਾਓ"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"ਪਿੱਛੇ ਜਾਣ ਲਈ ਖੱਬੇ ਪਾਸੇ ਤੋਂ ਸਵਾਈਪ ਕਰੋ"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"ਜਿੱਥੇ ਤੁਸੀਂ ਸੀ ਉਸ ਸਕ੍ਰੀਨ \'ਤੇ ਵਾਪਸ ਜਾਣ ਲਈ, ਖੱਬੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰੋ।"</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਲੇ ਕਿਨਾਰੇ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ਪੱਕਾ ਕਰੋ ਕਿ ਸਕ੍ਰੀਨ ਨੂੰ ਛੱਡਣ ਤੋਂ ਪਹਿਲਾਂ ਰੁਕੋ ਨਾ।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਿੱਧੇ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
diff --git a/quickstep/res/values-pl/strings.xml b/quickstep/res/values-pl/strings.xml
index cb0953be82..ae4f238fda 100644
--- a/quickstep/res/values-pl/strings.xml
+++ b/quickstep/res/values-pl/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Przewidywana aplikacja: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pamiętaj, aby przesuwać palcem od samej lewej krawędzi."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pamiętaj, aby przesuwać palcem od lewej krawędzi do środka ekranu, a potem podnieść palec."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Możesz także wrócić do ostatniego ekranu, przesuwając palcem od prawej krawędzi do środka ekranu."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pamiętaj, aby przesuwać palcem od samej prawej krawędzi."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pamiętaj, aby przesuwać palcem od prawej krawędzi do środka ekranu, a potem podnieść palec."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Gest przejścia wstecz został opanowany. Poćwicz teraz przełączanie aplikacji."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Gest przejścia wstecz został opanowany."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pamiętaj, aby nie przesuwać palcem zbyt blisko dolnej części ekranu."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Czułość gestu cofania możesz zmienić w Ustawieniach"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Aby wrócić, przesuń palcem od lewej strony"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Aby wrócić do ostatniego ekranu, przesuń palcem od lewej krawędzi do środka ekranu."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pamiętaj, aby przesuwać palcem od dolnej krawędzi ekranu."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pamiętaj, aby przed podniesieniem palca nie było przerwy."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pamiętaj, aby przesuwać palcem prosto do góry."</string>
diff --git a/quickstep/res/values-pt-rPT/strings.xml b/quickstep/res/values-pt-rPT/strings.xml
index 16f634975d..e6065ae638 100644
--- a/quickstep/res/values-pt-rPT/strings.xml
+++ b/quickstep/res/values-pt-rPT/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App prevista: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Garanta que desliza rapidamente com o dedo a partir da extremidade esquerda."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Garanta que desliza rapidamente com o dedo do limite esquerdo até ao centro do ecrã e solta."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Também pode voltar ao último ecrã ao deslizar rapidamente da direita para o centro do ecrã."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Garanta que desliza rapidamente com o dedo a partir da extremidade direita."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Garanta que desliza rapidamente com o dedo do limite direito até ao centro do ecrã e solta."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Concluiu o gesto para retroceder. A seguir, saiba como alternar entre apps."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Concluiu o gesto para retroceder."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Garanta que não desliza rapidamente com o dedo demasiado perto da parte inferior do ecrã."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Altere a sensibilidade do gesto para voltar nas Definições."</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Deslize rapidamente a partir da esquerda para retroceder"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Para voltar ao último ecrã, deslize rapidamente a partir do limite esquerdo para o centro do ecrã."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Garanta que desliza rapidamente com o dedo a partir do limite inferior do ecrã."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Garanta que não faz uma pausa antes de soltar."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Garanta que desliza rapidamente com o dedo para cima."</string>
diff --git a/quickstep/res/values-pt/strings.xml b/quickstep/res/values-pt/strings.xml
index cbea6d9269..c4e0957df2 100644
--- a/quickstep/res/values-pt/strings.xml
+++ b/quickstep/res/values-pt/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App previsto: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Deslize da borda esquerda."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Deslize da borda esquerda até o meio da tela e solte."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Para voltar à tela anterior, deslize da borda direita até o meio da tela."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Deslize da borda direita."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Deslize da borda direita até o meio da tela e solte."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Você concluiu o gesto para voltar. A seguir, aprenda a trocar de app."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Você concluiu o gesto para voltar."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Não deslize perto demais da parte inferior da tela."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Mude a sensibilidade do gesto de voltar nas configurações"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Deslize da esquerda para voltar"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Para voltar à tela anterior, deslize da borda esquerda até o meio da tela."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Deslize da borda inferior da tela para cima."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Não pare antes de soltar."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Deslize para cima."</string>
diff --git a/quickstep/res/values-ro/strings.xml b/quickstep/res/values-ro/strings.xml
index 2b78e8b5f2..d12a616410 100644
--- a/quickstep/res/values-ro/strings.xml
+++ b/quickstep/res/values-ro/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplicația estimată: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Glisați dinspre marginea stângă îndepărtată."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Glisați dinspre marginea stângă spre mijlocul ecranului și eliberați."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Reveniți la ultimul ecran glisând de la marginea dreaptă spre mijlocul ecranului."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Glisați dinspre marginea dreaptă îndepărtată."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Glisați dinspre marginea dreaptă spre mijlocul ecranului și eliberați."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Ați finalizat gestul „înapoi”. În continuare, aflați cum să comutați între aplicații."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ați finalizat gestul „înapoi”."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nu glisați prea aproape de partea de jos a ecranului."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Schimbați sensibilitatea gestului „Înapoi” accesând Setările"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Glisați dinspre stânga pentru a reveni"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Pentru a reveni la ultimul ecran accesat, glisați de la marginea stângă spre mijlocul ecranului."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Glisați în sus dinspre marginea de jos a ecranului."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Nu întrerupeți gestul înainte de a elibera."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Glisați direct în sus."</string>
diff --git a/quickstep/res/values-ru/strings.xml b/quickstep/res/values-ru/strings.xml
index ea513bc42a..e7ebe86fd2 100644
--- a/quickstep/res/values-ru/strings.xml
+++ b/quickstep/res/values-ru/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Рекомендуемое приложение: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Проведите слева направо от самого края экрана."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Проведите от левого края экрана до середины дисплея и отпустите палец."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Вернуться назад можно, проведя от правого края к центру."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Проведите справа налево от самого края экрана."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Проведите от правого края экрана до середины дисплея и отпустите палец."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Вы выполнили жест для перехода назад. Теперь мы расскажем, как переключаться между приложениями."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Вы выполнили жест для перехода назад."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Проведите пальцем не слишком близко к нижнему краю экрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Уровень чувствительности можно изменить в настройках."</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Чтобы вернуться, проведите слева направо."</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Чтобы вернуться к предыдущему экрану, проведите от левого края к центру."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Проведите снизу вверх от самого края экрана."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Не приостанавливайтесь перед тем, как отпустить палец."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Проведите по экрану ровно вверх."</string>
diff --git a/quickstep/res/values-si/strings.xml b/quickstep/res/values-si/strings.xml
index 52e9acec60..a412d6cfc4 100644
--- a/quickstep/res/values-si/strings.xml
+++ b/quickstep/res/values-si/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"පුරෝකථනය කළ යෙදුම: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ඔබ ඈත වම් දාරයෙන් ස්වයිප් කරන බවට සහතික කර ගන්න."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ඔබ වම් දාරයේ සිට තිරයේ මැදට ස්වයිප් කර අත හරින බව සහතික කර ගන්න."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"දකුණු මායිමේ සිට තිරයේ මැදට ස්වයිප් කර අවසාන තිරයට යා හැකිය."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ඔබ ඈත දකුණු දාරයෙන් ස්වයිප් කරන බවට සහතික කර ගන්න."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ඔබ දකුණු දාරයේ සිට තිරයේ මැදට ස්වයිප් කර අත හරින බව සහතික කර ගන්න."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"ඔබ ආපසු යාමේ ඉංගිතය සම්පූර්ණ කරන ලදි. ඊළඟට, යෙදුම් මාරු කරන ආකාරය දැන ගන්න."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ඔබ ආපසු යාමේ ඉංගිතය සම්පූර්ණ කරන ලදි."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ඔබ තිරයේ පහළට ඉතාම සමීපව ස්වයිප් නොකරන බවට සහතික කර ගන්න."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ආපසු ඉංගිතයෙහි සංවේදීතාව වෙනස් කිරීමට, සැකසීම් වෙත යන්න"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"ආපසු යාමට වමේ සිට ස්වයිප් කරන්න"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"ඔබ සිටි අවසාන තිරයට ආපසු යාමට, වම් මායිමෙන් තිරයේ මැදට ස්වයිප් කරන්න."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ඔබ තිරයේ පහළ දාරයේ සිට ඉහළට ස්වයිප් කරන බව සහතික කර ගන්න."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"යාමට ඉඩ හැරීමට පෙර ඔබ විරාමයක් නොගන්නා බව සහතික කර ගන්න."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ඔබ කෙලින්ම ඉහළට ස්වයිප් කරන බව සහතික කර ගන්න."</string>
diff --git a/quickstep/res/values-sk/strings.xml b/quickstep/res/values-sk/strings.xml
index fb50f2f092..0e786cf5e3 100644
--- a/quickstep/res/values-sk/strings.xml
+++ b/quickstep/res/values-sk/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predpovedaná aplikácia: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Musite potiahnuť z úplne krajného ľavého okraja."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Musíte potiahnuť z ľavého okraja do stredu obrazovky a uvoľniť."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Na poslednú obrazovku sa môžete tiež vrátiť potiahnutím z pravého okraja do stredu obrazovky."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Musite potiahnuť z úplne krajného pravého okraja."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Musíte potiahnuť z pravého okraja do stredu obrazovky a uvoľniť."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Dokončili ste gesto na prechod späť. V ďalšom kroku sa naučíte, ako prepínať aplikácie."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Dokončili ste gesto na prechod späť."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nesmiete potiahnuť príliš blízko dolnej časti obrazovky."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Ak chcete zmeniť citlivosť gesta Späť, prejdite do Nastavení"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Vrátite sa potiahnutím zľava"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Na poslednú obrazovku prejdete potiahnutím z ľavého okraja do stredu obrazovky."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Musíte potiahnuť nahor z dolného okraja obrazovky."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pred uvoľnením nesmiete zastať."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Musíte potiahnuť priamo hore."</string>
diff --git a/quickstep/res/values-sl/strings.xml b/quickstep/res/values-sl/strings.xml
index df93eb262c..59c587b4cb 100644
--- a/quickstep/res/values-sl/strings.xml
+++ b/quickstep/res/values-sl/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predvidena aplikacija: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pazite, da ne povlečete s skrajno levega roba."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pazite, da povlečete z levega roba do sredine zaslona in dvignete prst."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Na zadnji zaslon se lahko vrnete tudi tako, da z desnega roba povlečete do sredine zaslona."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pazite, da ne povlečete s skrajno desnega roba."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pazite, da povlečete z desnega roba do sredine zaslona in dvignete prst."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Izvedli ste potezo za pomik nazaj. Zdaj se naučite preklapljanja med aplikacijami."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Izvedli ste potezo za pomik nazaj."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pazite, da ne povlečete preblizu dna zaslona."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Občutljivost poteze za nazaj lahko spremenite v nastavitvah."</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Povlecite z leve za pomik nazaj."</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Če se želite vrniti na zadnji prikazani zaslon, povlecite z levega roba do sredine zaslona."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pazite, da povlečete s spodnjega roba zaslona navzgor."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pazite, da ne zaustavite prsta, preden ga dvignete."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pazite, da povlečete naravnost navzgor."</string>
diff --git a/quickstep/res/values-sq/strings.xml b/quickstep/res/values-sq/strings.xml
index 3582082828..35037b8603 100644
--- a/quickstep/res/values-sq/strings.xml
+++ b/quickstep/res/values-sq/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplikacioni i parashikuar: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Sigurohu që të rrëshqasësh shpejt nga skaji sa më majtas."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Sigurohu që të rrëshqasësh shpejt nga skaji i majtë drejt mesit të ekranit dhe lëshoje."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Mund dhe të kthehesh në ekranin e fundit duke rrëshqitur shpejt nga skaji i djathtë në mes të ekranit."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Sigurohu që të rrëshqasësh shpejt nga skaji sa më djathtas."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Sigurohu që të rrëshqasësh shpejt nga skaji i djathtë drejt mesit të ekranit dhe lëshoje."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"E ke përfunduar gjestin e kthimit prapa. Në vijim do të mësosh se si t\'i ndërrosh aplikacionet."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"E ke përfunduar gjestin e kthimit prapa."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Sigurohu që të mos rrëshqasësh shumë afër fundit të ekranit."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Për të ndryshuar ndjeshmërinë e gjestit të kthimit prapa, shko te \"Cilësimet\""</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Rrëshqit shpejt nga e majta për t\'u kthyer prapa"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Për t\'u kthyer në ekranin e fundit ku ishe, rrëshqit shpejt nga skaji i majtë në mes të ekranit."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Sigurohu që të rrëshqasësh shpejt lart nga skaji i poshtëm i ekranit."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Sigurohu që të mos ndalosh para se ta lëshosh."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Sigurohu që të rrëshqasësh shpejt drejt lart."</string>
diff --git a/quickstep/res/values-sr/strings.xml b/quickstep/res/values-sr/strings.xml
index 6a18169d52..ef45c5c592 100644
--- a/quickstep/res/values-sr/strings.xml
+++ b/quickstep/res/values-sr/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Предвиђамо апликацију: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Обавезно превуците од саме леве ивице."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Обавезно превуците од леве ивице до средине екрана и отпустите."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Вратите се на последњи екран превлачењем здесна ка средини."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Обавезно превуците од саме десне ивице."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Обавезно превуците од десне ивице до средине екрана и отпустите."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Довршили сте покрет за повратак. Сада сазнајте како да промените апликације."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Довршили сте покрет за повратак."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Никако не превлачите превише близу дна екрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Осетљивост пок. за назад можете да промените у Подешавањима"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Превуците са леве стране да бисте се вратили"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Да бисте се вратили на последњи екран, превуците од леве ивице ка средини екрана."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Обавезно превуците нагоре од доње ивице екрана."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Никако не стајте пре отпуштања."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Обавезно превуците право нагоре."</string>
diff --git a/quickstep/res/values-sv/strings.xml b/quickstep/res/values-sv/strings.xml
index d9b5648972..29af68d029 100644
--- a/quickstep/res/values-sv/strings.xml
+++ b/quickstep/res/values-sv/strings.xml
@@ -47,19 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Appförslag: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Se till att du sveper ända från vänsterkanten."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Se till att du sveper från den vänstra kanten till mitten av skärmen och sedan släpper."</string>
-    <skip />
-    <skip />
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Se till att du sveper ända från högerkanten."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Se till att du sveper från den högra kanten till mitten av skärmen och sedan släpper."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_follow_up (8653374779579748392) -->
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
     <skip />
     <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
     <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Se till att du inte sveper för nära skärmens nederkant."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Öppna inställningarna om du vill ändra rörelsens känslighet"</string>
-    <!-- no translation found for back_gesture_intro_title (5538727561353262952) -->
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
     <skip />
-    <!-- no translation found for back_gesture_intro_subtitle (8139048712004626940) -->
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
     <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Se till att du sveper från nederkanten på skärmen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Se till att du sveper i en jämn rörelse innan du släpper."</string>
diff --git a/quickstep/res/values-sw/strings.xml b/quickstep/res/values-sw/strings.xml
index 8670339cd6..4cbc40535a 100644
--- a/quickstep/res/values-sw/strings.xml
+++ b/quickstep/res/values-sw/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Programu iliyotabiriwa: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Hakikisha unatelezesha kidole kuanzia ukingo wa mbali wa kushoto."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Hakikisha unatelezesha kidole kuanzia ukingo wa kushoto kuelekea katikati ya skrini na uachilie."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Unaweza pia kurudi kwenye skrini iliyotangulia kwa kutelezesha kidole kuanzia ukingo wa kulia kuelekea katikati ya skrini."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Hakikisha unatelezesha kidole kuanzia ukingo wa mbali wa kulia."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Hakikisha unatelezesha kidole kuanzia ukingo wa kulia kuelekea katikati ya skrini na uachilie."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Umekamilisha ishara ya kurudi nyuma. Hatua inayofuata, jifunze jinsi ya kubadilisha programu."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Umekamilisha ishara ya kurudi nyuma."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Hakikisha hutelezeshi kidole karibu sana na sehemu ya chini ya skrini."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Kubadilisha hisi ya ishara ya nyuma, nenda kwenye Mipangilio"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Telezesha kidole kutoka kushoto ili urudi nyuma"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Ili urudi kwenye skrini iliyotangulia, telezesha kidole kuanzia ukingo wa kushoto kuelekea katikati ya skrini."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Hakikisha unatelezesha kidole juu kuanzia ukingo wa chini wa skrini."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Hakikisha kuwa husimamishi kabla ya kuachilia."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Hakikisha unatelezesha kidole kuelekea juu."</string>
diff --git a/quickstep/res/values-ta/strings.xml b/quickstep/res/values-ta/strings.xml
index 8867c00de8..010e3b5ac1 100644
--- a/quickstep/res/values-ta/strings.xml
+++ b/quickstep/res/values-ta/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"கணித்த ஆப்ஸ்: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"இடது ஓரத்தின் விளிம்பிலிருந்து ஸ்வைப் செய்கிறீர்கள் என்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"இடது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்தபிறகு விடுவிப்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"வலது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்தும் முந்தைய திரைக்கு மீண்டும் செல்லலாம்."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"வலது ஓரத்தின் விளிம்பிலிருந்து ஸ்வைப் செய்கிறீர்கள் என்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"வலது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்தபிறகு விடுவிப்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"பின்செல் சைகைப் பயிற்சியை முடித்துவிட்டீர்கள். அடுத்து, ஆப்ஸுக்கிடையே மாறுவது எப்படி என்பதை அறிக."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"பின்செல் சைகைப் பயிற்சியை முடித்துவிட்டீர்கள்."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"திரையின் கீழ்பகுதிக்கு மிக நெருக்கமாக ஸ்வைப் செய்யவில்லை என்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"பின்செல் சைகையின் உணர்திறனை மாற்ற அமைப்புகளுக்குச் செல்க"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"பின்செல்வதற்கு இடதுபுறத்திலிருந்து ஸ்வைப் செய்யுங்கள்"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"முந்தைய திரைக்கு மீண்டும் செல்ல, இடது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்யுங்கள்."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"திரையின் கீழ் ஓரத்திலிருந்து மேல்நோக்கி ஸ்வைப் செய்வதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"விடுவிப்பதற்கு முன்பாக இடைநிறுத்தவில்லை என்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"மேல்நோக்கி நேராக ஸ்வைப் செய்வதை உறுதிசெய்துகொள்ளுங்கள்."</string>
diff --git a/quickstep/res/values-te/strings.xml b/quickstep/res/values-te/strings.xml
index be50c9cb15..14c83becba 100644
--- a/quickstep/res/values-te/strings.xml
+++ b/quickstep/res/values-te/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"సూచించబడిన యాప్: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"మీరు చాలా-ఎడమ అంచు నుండి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"మీరు ఎడమ అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేశారని నిర్ధారించుకోని, ఆపై మీ వేలిని ఎత్తండి."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"కుడి అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేయడం ద్వారా మీరు చివరి స్క్రీన్‌కు తిరిగి వెళ్ళవచ్చు."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"మీరు చాలా-కుడి అంచు నుండి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"మీరు కుడి అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేశారని నిర్ధారించుకోని, ఆపై మీ వేలిని ఎత్తండి."</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"మీరు తిరిగి వెనక్కు వెళ్లే సంజ్ఞను పూర్తి చేశారు. తర్వాత, యాప్‌ల మధ్య ఎలా మారాలో తెలుసుకోండి."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"మీరు తిరిగి వెనక్కు వెళ్లే సంజ్ఞను పూర్తి చేశారు."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"మీరు స్క్రీన్ దిగువకు చాలా దగ్గరగా స్వైప్ చేయలేదని నిర్ధారించుకోండి."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"వెనుక సంజ్ఞ సున్నితత్వం మార్చడానికి, సెట్టింగ్‌లకు వెళ్లండి"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"వెనుకకు వెళ్లడానికి ఎడమ వైపు నుండి స్వైప్ చేయండి"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"మీరు ఉన్న చివరి స్క్రీన్‌కు తిరిగి వెళ్లడానికి, ఎడమ అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేయండి."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"మీరు స్క్రీన్ దిగువ అంచు నుండి పైకి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"బయలుదేరే ముందు మీరు పాజ్ చేయకుండా చూసుకోండి."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"మీరు నేరుగా పైకి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
diff --git a/quickstep/res/values-th/strings.xml b/quickstep/res/values-th/strings.xml
index c413e4edd2..eab0421fd3 100644
--- a/quickstep/res/values-th/strings.xml
+++ b/quickstep/res/values-th/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"แอปที่คาดว่าจะใช้: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ตรวจสอบว่าปัดจากขอบด้านซ้ายสุด"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ตรวจสอบว่าปัดจากขอบด้านซ้ายไปตรงกลางหน้าจอ แล้วยกนิ้วขึ้น"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"หรือจะกลับไปหน้าจอล่าสุดโดยปัดจากขอบขวาไปตรงกลางหน้าจอก็ได้"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ตรวจสอบว่าปัดจากขอบด้านขวาสุด"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ตรวจสอบว่าปัดจากขอบด้านขวาไปตรงกลางหน้าจอ แล้วยกนิ้วขึ้น"</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"คุณทำท่าทางสัมผัสเพื่อย้อนกลับเสร็จแล้ว ต่อไปดูวิธีสลับแอป"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"คุณทำท่าทางสัมผัสเพื่อย้อนกลับเสร็จแล้ว"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ตรวจสอบว่าไม่ได้ปัดใกล้กับด้านล่างของหน้าจอมากเกินไป"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"เปลี่ยนความไวของท่าทางสัมผัสเพื่อย้อนกลับได้ที่การตั้งค่า"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"ปัดจากด้านซ้ายเพื่อย้อนกลับ"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"หากต้องการย้อนกลับไปที่หน้าจอล่าสุดที่เปิด ให้ปัดจากขอบด้านซ้ายไปตรงกลางหน้าจอ"</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ตรวจสอบว่าปัดขึ้นจากขอบด้านล่างของหน้าจอ"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ตรวจสอบว่าไม่มีการหยุดชั่วคราวก่อนยกนิ้วขึ้น"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ตรวจสอบว่าปัดขึ้นในแนวตรง"</string>
diff --git a/quickstep/res/values-tl/strings.xml b/quickstep/res/values-tl/strings.xml
index b9260dca0d..e8d38fdd77 100644
--- a/quickstep/res/values-tl/strings.xml
+++ b/quickstep/res/values-tl/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Hinulaang app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Tiyaking magsa-swipe ka mula sa pinakadulo sa kaliwa."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Tiyaking mag-swipe mula sa kaliwang gilid papunta sa gitna ng screen, saka iangat ang iyong daliri."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Puwede ka ring mag-swipe mula sa kanan papunta sa gitna para bumalik sa nakaraang screen."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Tiyaking magsa-swipe ka mula sa pinakadulo sa kanan."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Tiyaking mag-swipe mula sa kanang gilid papunta sa gitna ng screen, saka iangat ang iyong daliri."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Nakumpleto mo na ang galaw para bumalik. Susunod, alamin kung paano magpalipat-lipat sa mga app."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Nakumpleto mo na ang galaw para bumalik."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Tiyaking hindi ka magsa-swipe nang masyadong malapit sa ibaba ng screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Pumunta sa Settings para baguhin ang sensitivity ng pagbalik"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Mag-swipe mula sa kaliwa para bumalik"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Mag-swipe mula sa kaliwang gilid papunta sa gitna para bumalik sa nakaraang screen na pinuntahan mo."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Tiyaking magsa-swipe ka pataas mula sa pinakaibaba ng screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Tiyaking hindi ka magpo-pause bago iangat ang iyong daliri."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Tiyaking magsa-swipe ka nang diretso pataas."</string>
diff --git a/quickstep/res/values-tr/strings.xml b/quickstep/res/values-tr/strings.xml
index 9db5e4abc9..144ad0f88a 100644
--- a/quickstep/res/values-tr/strings.xml
+++ b/quickstep/res/values-tr/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Tahmin edilen uygulama: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Ekranın en solundan kaydırdığınızdan emin olun."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Sol kenardan ekranın ortasına doğru kaydırıp bıraktığınızdan emin olun."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"İsterseniz sağ kenardan ekranın ortasına kaydırarak son ekrana dönebilirsiniz."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Ekranın en sağından kaydırdığınızdan emin olun."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Sağ kenardan ekranın ortasına doğru kaydırıp bıraktığınızdan emin olun."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Geri dön hareketini tamamladınız. Sırada, uygulamalar arasında geçiş yapmayı öğrenmek var."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Geri dön hareketini tamamladınız."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ekranın alt kısmına çok yakın bir şekilde kaydırmadığınızdan emin olun."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Geri hareketinin hassasiyetini değiştirmek için Ayarlar\'a gidin"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Geri gitmek için soldan kaydırın"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Görüntülediğiniz son ekrana dönmek için sol kenardan ekranın ortasına kaydırın."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Ekranın alt kenarından yukarı kaydırdığınızdan emin olun."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Bırakmadan önce parmağınızı duraklatmadığınızdan emin olun."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Düz bir şekilde yukarı kaydırdığınızdan emin olun."</string>
diff --git a/quickstep/res/values-uk/strings.xml b/quickstep/res/values-uk/strings.xml
index 37c8802c10..e5a22665c4 100644
--- a/quickstep/res/values-uk/strings.xml
+++ b/quickstep/res/values-uk/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Передбачений додаток: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Проведіть пальцем саме від лівого краю екрана."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Проведіть пальцем від лівого краю до середини екрана й підніміть палець."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Щоб повернутися, проведіть пальцем справа до середини."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Проведіть пальцем саме від правого краю екрана."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Проведіть пальцем від правого краю до середини екрана й підніміть палець."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Ви виконали жест \"Назад\". Тепер дізнайтеся, як переходити між додатками."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ви виконали жест \"Назад\"."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Не проводьте пальцем надто близько до нижнього краю екрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Щоб змінити чутливість жесту \"Назад\", відкрийте налаштування"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Щоб повернутися, проведіть пальцем зліва направо"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Щоб перейти на попередній екран, проведіть пальцем від лівого краю до середини екрана."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Проведіть пальцем угору від нижнього краю екрана."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Не робіть паузу перед тим, як відірвати палець від екрана."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Проводьте пальцем вертикально вгору."</string>
diff --git a/quickstep/res/values-ur/strings.xml b/quickstep/res/values-ur/strings.xml
index 425f498774..6447df8a56 100644
--- a/quickstep/res/values-ur/strings.xml
+++ b/quickstep/res/values-ur/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"پیشن گوئی کردہ ایپ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"اس بات کو یقینی بنائیں کہ آپ بائیں کنارے سے دور سے سوائپ کریں۔"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"یقینی طور پر بائیں کنارے سے اسکرین کے وسط تک سوائپ کریں اور پھر اپنی انگلی اٹھا لیں۔"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"آپ دائیں کنارے سے اسکرین کے وسط تک سوائپ کر کے پچھلی اسکرین پر واپس بھی جا سکتے ہیں۔"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"اس بات کو یقینی بنائیں کہ آپ دائیں کنارے سے دور سے سوائپ کریں۔"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"یقینی طور پر دائیں کنارے سے اسکرین کے وسط تک سوائپ کریں اور پھر اپنی انگلی اٹھا لیں۔"</string>
-    <string name="back_gesture_feedback_complete_with_follow_up" msgid="8653374779579748392">"آپ نے واپس جائیں اشارے کو مکمل کر لیا۔ اس کے بعد ایپس سوئچ کرنے کا طریقہ جانیں۔"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"آپ نے واپس جائیں اشارے کو مکمل کر لیا۔"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"اس بات کو یقینی بنائیں کہ آپ اسکرین کے نچلے حصے سے زیادہ قریب سے سوائپ نہ کریں۔"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"پچھلے اشارے کی حساسیت تبدیل کرنے کے لیے ترتیبات پر جائیں"</string>
-    <string name="back_gesture_intro_title" msgid="5538727561353262952">"واپس جانے کے لیے بائیں کنارے سے سوائپ کریں"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"پچھلی اسکرین جس پر آپ تھے اس پر واپس جانے کے لیے بائیں کنارے سے اسکرین کے وسط تک سوائپ کریں۔"</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"اس بات کو یقینی بنائیں کہ آپ اسکرین کے نچلے کنارے سے اوپر کی طرف سوائپ کریں۔"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"اس بات کو یقینی بنائیں کہ آپ اپنی انگلی اوپر اٹھانے سے پہلے موقوف نہ کریں۔"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"اس بات کو یقینی بنائیں کہ آپ سیدھا اوپر کی طرف سوائپ کریں۔"</string>
diff --git a/quickstep/res/values-uz/strings.xml b/quickstep/res/values-uz/strings.xml
index d046eb2fa4..462d3aab42 100644
--- a/quickstep/res/values-uz/strings.xml
+++ b/quickstep/res/values-uz/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Taklif etilgan ilova: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Barmoqni chapdagi eng chekkadan suring."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Barmoqni ekranning chap chetidan oʻrtasigacha suring va ekrandan uzing."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Shuningdek, oʻng chetdan ekran oʻrtasiga surish orqali ham oxirgi ekranga qaytish mumkin."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Barmoqni oʻngdagi eng chekkadan suring."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Barmoqni ekranning oʻng chetidan oʻrtasigacha suring va ekrandan uzing."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Ortga qaytish ishorasi darsini tamomladingiz. Endi ilovalarni almashtirishni oʻrganamiz."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ortga qaytish ishorasi darsini tamomladingiz."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Barmoqni ekran pastiga yaqin surmaslikka harakat qiling."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Orqaga ishorasi sezuvchanligi Sozlamalardan oʻzgartiriladi"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Orqaga qaytish uchun chapdan suring"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Oxirgi ekranga qaytish uchun barmoqni ekranning chap chekkasidan oʻrtasigacha suring."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Barmoqni ekranning pastki chetidan yuqoriga suring."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Barmoqni ekrandan pauzasiz qoʻyib uzing."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Barmoqni tik tepaga suring."</string>
diff --git a/quickstep/res/values-vi/strings.xml b/quickstep/res/values-vi/strings.xml
index 9f6eff9750..d6241bed16 100644
--- a/quickstep/res/values-vi/strings.xml
+++ b/quickstep/res/values-vi/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Ứng dụng dự đoán: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Hãy vuốt từ mép ngoài cùng bên trái."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Hãy vuốt từ mép trái tới chính giữa màn hình rồi nhấc ngón tay."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Bạn cũng có thể vuốt từ mép phải tới chính giữa màn hình để quay lại màn hình gần đây nhất."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Hãy vuốt từ mép ngoài cùng bên phải."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Hãy vuốt từ mép phải tới chính giữa màn hình rồi nhấc ngón tay."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Bạn đã thực hiện xong cử chỉ quay lại. Tiếp theo, hãy tìm hiểu cách chuyển đổi ứng dụng."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Bạn đã thực hiện xong cử chỉ quay lại."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Hãy nhớ không được vuốt quá gần phần cuối màn hình."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Để thay đổi độ nhạy của cử chỉ quay lại, hãy vào mục Cài đặt"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Vuốt từ mép trái để quay lại"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Để quay lại màn hình gần đây nhất mà bạn xem, hãy vuốt từ mép trái tới chính giữa màn hình."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Hãy vuốt lên từ mép dưới cùng của màn hình."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Hãy nhớ không được tạm dừng trước khi nhấc ngón tay."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Hãy vuốt thẳng lên."</string>
diff --git a/quickstep/res/values-zh-rCN/strings.xml b/quickstep/res/values-zh-rCN/strings.xml
index e117c0a60b..21ce064662 100644
--- a/quickstep/res/values-zh-rCN/strings.xml
+++ b/quickstep/res/values-zh-rCN/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"预测的应用：<xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"请从最左侧边缘开始滑动。"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"请从左侧边缘滑动到屏幕中间位置后再松开手指。"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"如要返回上一个屏幕，您也可以从右侧边缘滑动到屏幕中间位置。"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"请从最右侧边缘开始滑动。"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"请从右侧边缘滑动到屏幕中间位置后再松开手指。"</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"您完成了“返回”手势教程。接下来了解如何切换应用。"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"您完成了“返回”手势教程。"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"滑动时，手的位置不要太靠近屏幕底部。"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"如要调节“返回”手势的灵敏度，请转到“设置”"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"从左侧向右滑动手指即可返回"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"如要返回您查看过的上一个屏幕，请从左侧边缘滑动到屏幕中间位置。"</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"请从屏幕底部边缘向上滑动。"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"在松开手指前请勿停下来。"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"请向上滑动。"</string>
diff --git a/quickstep/res/values-zh-rHK/strings.xml b/quickstep/res/values-zh-rHK/strings.xml
index 01d57488f0..d3e6c033ab 100644
--- a/quickstep/res/values-zh-rHK/strings.xml
+++ b/quickstep/res/values-zh-rHK/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"預測應用程式：<xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"請從螢幕左側邊緣滑動。"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"請從螢幕左側邊緣往中央滑動，然後放開手指。"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"從螢幕右側往中央滑動亦可返回上一個畫面。"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"請從螢幕右側邊緣滑動。"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"請從螢幕右側邊緣往中央滑動，然後放開手指"</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"您已完成「返回」手勢的教學課程。接下來一起瞭解如何切換應用程式。"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"您已完成「返回」手勢的教學課程。"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"滑動時，手的位置不要太接近螢幕底部。"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"如要變更「返回」手勢的敏感度，請前往「設定」"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"從螢幕左側往右滑動即可返回"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"如要返回上一個畫面，請從螢幕左側往中央滑動。"</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"請從螢幕底部邊緣向上滑動。"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"放開手指前請勿停下來。"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"請向上滑動。"</string>
diff --git a/quickstep/res/values-zh-rTW/strings.xml b/quickstep/res/values-zh-rTW/strings.xml
index b21cacded8..492ae141bc 100644
--- a/quickstep/res/values-zh-rTW/strings.xml
+++ b/quickstep/res/values-zh-rTW/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"預測的應用程式：<xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"請從螢幕左側邊緣滑動。"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"請從螢幕左側邊緣往中央滑動，然後放開手指。"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"從螢幕右側往中央滑動也可返回上一個畫面。"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"請從螢幕右側邊緣滑動。"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"請從螢幕右側邊緣往中央滑動，然後放開手指。"</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"你已完成「返回」手勢的教學課程。接著，一起來瞭解如何切換應用程式。"</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"你已完成「返回」手勢的教學課程。"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"滑動時，手的位置不要太接近螢幕底部。"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"如要變更「返回」手勢的敏感度，請前往「設定」"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"從螢幕左側往右滑動即可返回"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"如要返回先前的畫面，請從螢幕左側往中央滑動。"</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"請從螢幕底部邊緣向上滑動。"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"放開手指前請勿停下來。"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"請向上滑動。"</string>
diff --git a/quickstep/res/values-zu/strings.xml b/quickstep/res/values-zu/strings.xml
index 469a424a59..35edaef055 100644
--- a/quickstep/res/values-zu/strings.xml
+++ b/quickstep/res/values-zu/strings.xml
@@ -47,15 +47,23 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Uhlelo lokusebenza olubikezelwe: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Qiniseka ukuthi uswayiphela ekudeni emngceleni ongakwesobunxele."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Qiniseka ukuthi uswayipha kusuka emngceleni okwesobunxele kuya phakathi kwesikrini bese uyadedela."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="8106594510099968430">"Futhi ungabuyela emuva esikrinini sangaphambilini ngokuswayipha kusuka kunqenqema langakwesokudla ukuya maphakathi nesikrini."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Qiniseka ukuthi uswayiphela ekudeni emngceleni ongakwesokudla."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Qiniseka ukuthi uswayipha kusuka emngceleni okwesokudla kuya phakathi kwesikrini bese uyadedela."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="8653374779579748392">"Ukuqedile ukuthinta kokubuyela emuva. Ngokulandelayo, funda indlela yokushintsha ama-app."</string>
+    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
+    <skip />
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ukuqedile ukuthinta kokubuyela emuva."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Qiniseka ukuba awuswayipheli eduze kakhulu naphansi kwesikrini."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Ukuze ushintshe ukuzwela kokuthinta emuva, iya Kumasethingi"</string>
-    <string name="back_left_gesture_intro_title" msgid="5538727561353262952">"Swayipha kusuka kwesobunxele ukuze ubuyele emuva"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="8139048712004626940">"Ukuze ubuyele esikrinini sangaphambilini lapho ubukade ukhona, swayipha kusuka kunqenqema lwesokunxele ukuya maphakathi nesikrini."</string>
+    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
+    <skip />
+    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
+    <skip />
+    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
+    <skip />
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Qiniseka ukuthi uswayiphela phezulu kusuka emngceleni ophansi wesikrini."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Qiniseka ukuthi awumisi ngaphambi kokudedela."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Qiniseka ukuthi uswayiphela ngqo phezulu."</string>
-- 
GitLab


From 7a36ad396e87819459f3bf0d55b976be5b9ba5ba Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Thu, 27 May 2021 18:41:51 +0100
Subject: [PATCH 1282/1664] Don't dismiss keyboard after clicking X button on
 the widgets search bar

Test: Enter some queries in the widgets search bar. Click X button. The
      keyboard is still opened after the search queries has been erased.
Bug: 189454318
Change-Id: Icb0501cf36cbf1517e2da24044da44101fa86ed9
---
 .../picker/search/WidgetsSearchBarControllerTest.java    | 9 ++-------
 .../widget/picker/search/WidgetsSearchBarController.java | 4 +---
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarControllerTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarControllerTest.java
index a057a84d06..7ac879aa44 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarControllerTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarControllerTest.java
@@ -19,7 +19,6 @@ package com.android.launcher3.widget.picker.search;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
@@ -131,18 +130,14 @@ public class WidgetsSearchBarControllerTest {
     public void cancelSearch_shouldInformSearchModeListenerToClearResultsAndExitSearch() {
         mCancelButton.performClick();
 
-        // 1 time explicitly from the cancel button on click listener.
-        // Another from the setText("") the cancel button on click listener causing afterTextChange.
-        verify(mSearchModeListener, times(2)).exitSearchMode();
+        verify(mSearchModeListener).exitSearchMode();
     }
 
     @Test
     public void cancelSearch_shouldCancelSearch() {
         mCancelButton.performClick();
 
-        // 1 time explicitly from the cancel button on click listener.
-        // Another from the setText("") the cancel button on click listener causing afterTextChange.
-        verify(mSearchAlgorithm, times(2)).cancel(true);
+        verify(mSearchAlgorithm).cancel(true);
         verifyNoMoreInteractions(mSearchAlgorithm);
     }
 
diff --git a/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarController.java b/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarController.java
index a8294c0426..2751a52796 100644
--- a/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarController.java
+++ b/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarController.java
@@ -101,10 +101,8 @@ public class WidgetsSearchBarController implements TextWatcher,
 
     @Override
     public void clearSearchResult() {
-        mSearchAlgorithm.cancel(/* interruptActiveRequests= */ true);
+        // Any existing search session will be cancelled by setting text to empty.
         mInput.setText("");
-        clearFocus();
-        mSearchModeListener.exitSearchMode();
     }
 
     /**
-- 
GitLab


From 890d8d5a91587ffa5fc49435c37ac98f98aa9833 Mon Sep 17 00:00:00 2001
From: Brian Isganitis <brianji@google.com>
Date: Tue, 25 May 2021 00:07:53 -0400
Subject: [PATCH 1283/1664] Give each preference screen its own activity and
 toolbar title

This change is in preparation for each preference screen having its own collapsible toolbar with its specific title.

Test: Subsettings open with activity transition and title changes
Bug: 187732263
Change-Id: Iac44d688539195ddb6c2aca0a96d737ce7727071
---
 robolectric_tests/Android.bp                  |   5 +
 .../settings/SettingsActivityTest.java        | 137 ++++++++++++++++++
 .../settings/DeveloperOptionsFragment.java    |   4 +
 .../launcher3/settings/SettingsActivity.java  |  66 +++++++--
 4 files changed, 202 insertions(+), 10 deletions(-)
 create mode 100644 robolectric_tests/src/com/android/launcher3/settings/SettingsActivityTest.java

diff --git a/robolectric_tests/Android.bp b/robolectric_tests/Android.bp
index bf323623b2..9ed26ff89e 100644
--- a/robolectric_tests/Android.bp
+++ b/robolectric_tests/Android.bp
@@ -45,9 +45,14 @@ android_robolectric_test {
     java_resources: [":launcher3-robolectric-resources"],
     static_libs: [
         "truth-prebuilt",
+        "androidx.test.espresso.contrib",
+        "androidx.test.espresso.core",
+        "androidx.test.espresso.intents",
+        "androidx.test.ext.junit",
         "androidx.test.runner",
         "androidx.test.rules",
         "mockito-robolectric-prebuilt",
+        "SystemUISharedLib",
     ],
     robolectric_prebuilt_version: "4.5.1",
     instrumentation_for: "Launcher3",
diff --git a/robolectric_tests/src/com/android/launcher3/settings/SettingsActivityTest.java b/robolectric_tests/src/com/android/launcher3/settings/SettingsActivityTest.java
new file mode 100644
index 0000000000..85bf28e0b9
--- /dev/null
+++ b/robolectric_tests/src/com/android/launcher3/settings/SettingsActivityTest.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.settings;
+
+import static androidx.preference.PreferenceFragmentCompat.ARG_PREFERENCE_ROOT;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.contrib.RecyclerViewActions.actionOnItem;
+import static androidx.test.espresso.intent.Intents.intended;
+import static androidx.test.espresso.intent.matcher.BundleMatchers.hasEntry;
+import static androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent;
+import static androidx.test.espresso.intent.matcher.IntentMatchers.hasExtra;
+import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
+
+import static com.android.launcher3.settings.SettingsActivity.EXTRA_FRAGMENT;
+import static com.android.launcher3.settings.SettingsActivity.EXTRA_FRAGMENT_ARGS;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.equalTo;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.test.core.app.ActivityScenario;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.espresso.intent.Intents;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.launcher3.R;
+import com.android.systemui.shared.plugins.PluginPrefs;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class SettingsActivityTest {
+
+    private Context mApplicationContext;
+
+    @Before
+    public void setUp() {
+        mApplicationContext = ApplicationProvider.getApplicationContext();
+        Intents.init();
+    }
+
+    @After
+    public void tearDown() {
+        Intents.release();
+    }
+
+    @Test
+    public void testSettings_aboutTap_launchesActivity() {
+        ActivityScenario.launch(SettingsActivity.class);
+        onView(withId(R.id.recycler_view)).perform(
+                actionOnItem(hasDescendant(withText("About")), click()));
+
+        intended(allOf(
+                hasComponent(SettingsActivity.class.getName()),
+                hasExtra(
+                        equalTo(EXTRA_FRAGMENT_ARGS),
+                        hasEntry(ARG_PREFERENCE_ROOT, "about_screen"))));
+    }
+
+    @Test
+    public void testSettings_developerOptionsTap_launchesActivityWithFragment() {
+        PluginPrefs.setHasPlugins(mApplicationContext);
+        ActivityScenario.launch(SettingsActivity.class);
+        onView(withId(R.id.recycler_view)).perform(
+                actionOnItem(hasDescendant(withText("Developer Options")), click()));
+
+        intended(allOf(
+                hasComponent(SettingsActivity.class.getName()),
+                hasExtra(EXTRA_FRAGMENT, DeveloperOptionsFragment.class.getName())));
+    }
+
+    @Test
+    public void testSettings_aboutScreenIntent() {
+        Bundle fragmentArgs = new Bundle();
+        fragmentArgs.putString(ARG_PREFERENCE_ROOT, "about_screen");
+
+        Intent intent = new Intent(mApplicationContext, SettingsActivity.class)
+                .putExtra(EXTRA_FRAGMENT_ARGS, fragmentArgs);
+        ActivityScenario.launch(intent);
+
+        onView(withText("About")).check(matches(isDisplayed()));
+        onView(withText("Version")).check(matches(isDisplayed()));
+    }
+
+    @Test
+    public void testSettings_developerOptionsFragmentIntent() {
+        Intent intent = new Intent(mApplicationContext, SettingsActivity.class)
+                .putExtra(EXTRA_FRAGMENT, DeveloperOptionsFragment.class.getName());
+        ActivityScenario.launch(intent);
+
+        onView(withText("Developer Options")).check(matches(isDisplayed()));
+        onView(withId(R.id.filter_box)).check(matches(isDisplayed()));
+    }
+
+    @Test
+    public void testSettings_intentWithUnknownFragment() {
+        String fragmentClass = PreferenceFragmentCompat.class.getName();
+        Intent intent = new Intent(mApplicationContext, SettingsActivity.class)
+                .putExtra(EXTRA_FRAGMENT, fragmentClass);
+
+        try {
+            ActivityScenario.launch(intent);
+            Assert.fail("Should have thrown an IllegalArgumentException.");
+        } catch (IllegalArgumentException e) {
+            assertThat(e.getMessage()).contains(fragmentClass);
+        }
+    }
+}
diff --git a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
index c6b0b13db3..e2a69ff7a2 100644
--- a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
+++ b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
@@ -104,6 +104,10 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
         initFlags();
         loadPluginPrefs();
         maybeAddSandboxCategory();
+
+        if (getActivity() != null) {
+            getActivity().setTitle("Developer Options");
+        }
     }
 
     private void filterPreferences(String query, PreferenceGroup pg) {
diff --git a/src/com/android/launcher3/settings/SettingsActivity.java b/src/com/android/launcher3/settings/SettingsActivity.java
index 883ff75e37..85c249261f 100644
--- a/src/com/android/launcher3/settings/SettingsActivity.java
+++ b/src/com/android/launcher3/settings/SettingsActivity.java
@@ -20,11 +20,13 @@ import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTIO
 
 import static com.android.launcher3.states.RotationHelper.ALLOW_ROTATION_PREFERENCE_KEY;
 
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
@@ -46,6 +48,9 @@ import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.WidgetsModel;
 import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * Settings activity for Launcher. Currently implements the following setting: Allow rotation
  */
@@ -53,6 +58,10 @@ public class SettingsActivity extends FragmentActivity
         implements OnPreferenceStartFragmentCallback, OnPreferenceStartScreenCallback,
         SharedPreferences.OnSharedPreferenceChangeListener{
 
+    /** List of fragments that can be hosted by this activity. */
+    private static final List<String> VALID_PREFERENCE_FRAGMENTS = Collections.singletonList(
+            DeveloperOptionsFragment.class.getName());
+
     private static final String DEVELOPER_OPTIONS_KEY = "pref_developer_options";
     private static final String FLAGS_PREFERENCE_KEY = "flag_toggler";
 
@@ -63,20 +72,30 @@ public class SettingsActivity extends FragmentActivity
     private static final int DELAY_HIGHLIGHT_DURATION_MILLIS = 600;
     public static final String SAVE_HIGHLIGHTED_KEY = "android:preference_highlighted";
 
+    @VisibleForTesting
+    static final String EXTRA_FRAGMENT = ":settings:fragment";
+    @VisibleForTesting
+    static final String EXTRA_FRAGMENT_ARGS = ":settings:fragment_args";
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         if (savedInstanceState == null) {
-            Bundle args = new Bundle();
-            String prefKey = getIntent().getStringExtra(EXTRA_FRAGMENT_ARG_KEY);
+            Intent intent = getIntent();
+            Bundle args = intent.getBundleExtra(EXTRA_FRAGMENT_ARGS);
+            if (args == null) {
+                args = new Bundle();
+            }
+
+            String prefKey = intent.getStringExtra(EXTRA_FRAGMENT_ARG_KEY);
             if (!TextUtils.isEmpty(prefKey)) {
                 args.putString(EXTRA_FRAGMENT_ARG_KEY, prefKey);
             }
 
             final FragmentManager fm = getSupportFragmentManager();
             final Fragment f = fm.getFragmentFactory().instantiate(getClassLoader(),
-                    getString(R.string.settings_fragment_name));
+                    getPreferenceFragment());
             f.setArguments(args);
             // Display the fragment as the main content.
             fm.beginTransaction().replace(android.R.id.content, f).commit();
@@ -84,22 +103,45 @@ public class SettingsActivity extends FragmentActivity
         Utilities.getPrefs(getApplicationContext()).registerOnSharedPreferenceChangeListener(this);
     }
 
+    /**
+     * Obtains the preference fragment to instantiate in this activity.
+     *
+     * @return the preference fragment class
+     * @throws IllegalArgumentException if the fragment is unknown to this activity
+     */
+    private String getPreferenceFragment() {
+        String preferenceFragment = getIntent().getStringExtra(EXTRA_FRAGMENT);
+        String defaultFragment = getString(R.string.settings_fragment_name);
+
+        if (TextUtils.isEmpty(preferenceFragment)) {
+            return defaultFragment;
+        } else if (!preferenceFragment.equals(defaultFragment)
+                && !VALID_PREFERENCE_FRAGMENTS.contains(preferenceFragment)) {
+            throw new IllegalArgumentException(
+                    "Invalid fragment for this activity: " + preferenceFragment);
+        } else {
+            return preferenceFragment;
+        }
+    }
+
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { }
 
-    private boolean startFragment(String fragment, Bundle args, String key) {
+    private boolean startPreference(String fragment, Bundle args, String key) {
         if (Utilities.ATLEAST_P && getSupportFragmentManager().isStateSaved()) {
             // Sometimes onClick can come after onPause because of being posted on the handler.
-            // Skip starting new fragments in that case.
+            // Skip starting new preferences in that case.
             return false;
         }
         final FragmentManager fm = getSupportFragmentManager();
         final Fragment f = fm.getFragmentFactory().instantiate(getClassLoader(), fragment);
-        f.setArguments(args);
         if (f instanceof DialogFragment) {
-            ((DialogFragment) f).show(getSupportFragmentManager(), key);
+            f.setArguments(args);
+            ((DialogFragment) f).show(fm, key);
         } else {
-            fm.beginTransaction().replace(android.R.id.content, f).addToBackStack(key).commit();
+            startActivity(new Intent(this, SettingsActivity.class)
+                    .putExtra(EXTRA_FRAGMENT, fragment)
+                    .putExtra(EXTRA_FRAGMENT_ARGS, args));
         }
         return true;
     }
@@ -107,14 +149,14 @@ public class SettingsActivity extends FragmentActivity
     @Override
     public boolean onPreferenceStartFragment(
             PreferenceFragmentCompat preferenceFragment, Preference pref) {
-        return startFragment(pref.getFragment(), pref.getExtras(), pref.getKey());
+        return startPreference(pref.getFragment(), pref.getExtras(), pref.getKey());
     }
 
     @Override
     public boolean onPreferenceStartScreen(PreferenceFragmentCompat caller, PreferenceScreen pref) {
         Bundle args = new Bundle();
         args.putString(PreferenceFragmentCompat.ARG_PREFERENCE_ROOT, pref.getKey());
-        return startFragment(getString(R.string.settings_fragment_name), args, pref.getKey());
+        return startPreference(getString(R.string.settings_fragment_name), args, pref.getKey());
     }
 
     /**
@@ -148,6 +190,10 @@ public class SettingsActivity extends FragmentActivity
                     screen.removePreference(preference);
                 }
             }
+
+            if (getActivity() != null && !TextUtils.isEmpty(getPreferenceScreen().getTitle())) {
+                getActivity().setTitle(getPreferenceScreen().getTitle());
+            }
         }
 
         @Override
-- 
GitLab


From cad022499ce388bb17ff04ef83769a8a0797228a Mon Sep 17 00:00:00 2001
From: zakcohen <zakcohen@google.com>
Date: Thu, 27 May 2021 14:09:09 -0700
Subject: [PATCH 1284/1664] Remove overview feedback.

Bug: 189489289
Test: TAPL update
Change-Id: If531aed1b2e10de9b60f9929cbcdcb5e7ffd436b
---
 .../launcher3/tapl/SelectModeButtons.java       | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/SelectModeButtons.java b/tests/tapl/com/android/launcher3/tapl/SelectModeButtons.java
index 35074184d6..e1b73a4aa3 100644
--- a/tests/tapl/com/android/launcher3/tapl/SelectModeButtons.java
+++ b/tests/tapl/com/android/launcher3/tapl/SelectModeButtons.java
@@ -48,21 +48,4 @@ public class SelectModeButtons {
             }
         }
     }
-
-    /**
-     * Click feedback button.
-     */
-    @NonNull
-    public Background clickFeedback() {
-        try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck();
-             LauncherInstrumentation.Closable c =
-                     mLauncher.addContextLayer("want to click feedback button")) {
-            UiObject2 feedback = mLauncher.waitForObjectInContainer(mSelectModeButtons, "feedback");
-            mLauncher.clickLauncherObject(feedback);
-            try (LauncherInstrumentation.Closable c1 = mLauncher.addContextLayer(
-                    "clicked feedback button")) {
-                return new Background(mLauncher);
-            }
-        }
-    }
 }
-- 
GitLab


From 6eb018661658d8e685c62c32942b617f04452749 Mon Sep 17 00:00:00 2001
From: Jon Spivack <spivack@google.com>
Date: Thu, 27 May 2021 14:39:16 -0700
Subject: [PATCH 1285/1664] NIU Actions: Do not send image URI when sending
 error code

In the case of a permissions denial, we do not send a screenshot in the NIU Actions Intent. Previously, we sent a fake URI to fit with existing recipient Intent filters, but the recipients have been updated to no longer require this.

Bug: 186780965
Test: m -j RunLauncherGoGoogleRoboTests
Change-Id: I7cf92a03946e1663150f963fcea7f6b92833da68
---
 .../android/quickstep/TaskOverlayFactoryGo.java    | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
index 117b8e6b92..754782bd49 100644
--- a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
+++ b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
@@ -25,7 +25,6 @@ import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Matrix;
-import android.net.Uri;
 import android.os.SystemClock;
 import android.os.UserManager;
 import android.provider.Settings;
@@ -33,7 +32,6 @@ import android.text.TextUtils;
 
 import androidx.annotation.VisibleForTesting;
 
-import com.android.launcher3.BuildConfig;
 import com.android.launcher3.R;
 import com.android.quickstep.util.AssistContentRequester;
 import com.android.quickstep.views.OverviewActionsView;
@@ -54,9 +52,6 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
     public static final String ACTIONS_ERROR_CODE = "niu_actions_app_error_code";
     public static final int ERROR_PERMISSIONS = 1;
     private static final String TAG = "TaskOverlayFactoryGo";
-    private static final String URI_AUTHORITY =
-            BuildConfig.APPLICATION_ID + ".overview.fileprovider";
-    private static final String FAKE_FILEPATH = "shared_images/null.png";
 
     // Empty constructor required for ResourceBasedOverride
     public TaskOverlayFactoryGo(Context context) {}
@@ -138,15 +133,6 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
                 mImageApi.shareAsDataWithExplicitIntent(/* crop */ null, intent);
             } else {
                 intent.putExtra(ACTIONS_ERROR_CODE, ERROR_PERMISSIONS);
-                // The Intent recipient expects an image URI, and omitting one or using a
-                // completely invalid URI will cause the Intent parsing to crash.
-                // So we construct a URI for a nonexistent image.
-                Uri uri = new Uri.Builder()
-                        .scheme(ContentResolver.SCHEME_CONTENT)
-                        .authority(URI_AUTHORITY)
-                        .path(FAKE_FILEPATH)
-                        .build();
-                intent.setData(uri);
                 mApplicationContext.startActivity(intent);
             }
         }
-- 
GitLab


From 62769f10d75a1bf11e17103857b179ab931282d7 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Thu, 27 May 2021 15:13:36 -0700
Subject: [PATCH 1286/1664] Turn off app close flag, Revert back to R
 implementation.

Need more time to experiment with interpolated + springs based approach,
will aim for QPR instead.

Bug: 189120868
Bug: 173107751
Test: manual
Change-Id: I5698bd61c92b4fa719d82f2553125fc7f65b5969
---
 quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 4 ++--
 src/com/android/launcher3/config/FeatureFlags.java         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 92e8268570..f484568068 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -103,10 +103,10 @@ import com.android.quickstep.util.MotionPauseDetector;
 import com.android.quickstep.util.ProtoTracer;
 import com.android.quickstep.util.RecentsOrientedState;
 import com.android.quickstep.util.RectFSpringAnim;
+import com.android.quickstep.util.StaggeredWorkspaceAnim;
 import com.android.quickstep.util.SurfaceTransactionApplier;
 import com.android.quickstep.util.SwipePipToHomeAnimator;
 import com.android.quickstep.util.TransformParams;
-import com.android.quickstep.util.WorkspaceRevealAnim;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
 import com.android.systemui.shared.recents.model.ThumbnailData;
@@ -202,7 +202,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
             STATE_LAUNCHER_PRESENT | STATE_LAUNCHER_DRAWN | STATE_LAUNCHER_STARTED;
 
     public static final long MAX_SWIPE_DURATION = 350;
-    public static final long HOME_DURATION = WorkspaceRevealAnim.DURATION_MS;
+    public static final long HOME_DURATION = StaggeredWorkspaceAnim.DURATION_MS;
 
     public static final float MIN_PROGRESS_FOR_OVERVIEW = 0.7f;
     private static final float SWIPE_DURATION_MULTIPLIER =
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 0c0c92ed04..7ef43ed4be 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -238,7 +238,7 @@ public final class FeatureFlags {
             "Sends a notification whenever launcher encounters an uncaught exception.");
 
     public static final BooleanFlag PROTOTYPE_APP_CLOSE = getDebugFlag(
-            "PROTOTYPE_APP_CLOSE", true, "Enables new app close");
+            "PROTOTYPE_APP_CLOSE", false, "Enables new app close");
 
     public static final BooleanFlag ENABLE_WALLPAPER_SCRIM = getDebugFlag(
             "ENABLE_WALLPAPER_SCRIM", false,
-- 
GitLab


From 08fdf4d2696a4707c9961e6f4d967de8f0bf9442 Mon Sep 17 00:00:00 2001
From: Brian Isganitis <brianji@google.com>
Date: Tue, 25 May 2021 18:02:22 -0400
Subject: [PATCH 1287/1664] Create settings activity layout with explicit
 toolbar

This layout will be overridden to have a collapsible toolbar on API 31.

Test: Settings layout unchanged
Bug: 187732263
Change-Id: I0c098dd0a09a1787a10035a3d3f35ecf461cfc20
---
 res/layout/settings_activity.xml              | 34 +++++++++++++++++++
 res/values/styles.xml                         |  2 ++
 .../launcher3/settings/SettingsActivity.java  |  4 ++-
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 res/layout/settings_activity.xml

diff --git a/res/layout/settings_activity.xml b/res/layout/settings_activity.xml
new file mode 100644
index 0000000000..c70d5bf22c
--- /dev/null
+++ b/res/layout/settings_activity.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2021 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/content_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <Toolbar
+        android:id="@+id/action_bar"
+        style="?android:attr/actionBarStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="?android:attr/actionBarTheme" />
+
+    <FrameLayout
+        android:id="@+id/content_frame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index df617ea95e..27785a9e46 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -156,6 +156,8 @@
 
     <style name="HomeSettingsTheme" parent="@android:style/Theme.DeviceDefault.Settings">
         <item name="android:navigationBarColor">?android:colorPrimaryDark</item>
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowNoTitle">true</item>
         <item name="preferenceTheme">@style/HomeSettingsPreferenceTheme</item>
     </style>
 
diff --git a/src/com/android/launcher3/settings/SettingsActivity.java b/src/com/android/launcher3/settings/SettingsActivity.java
index 85c249261f..05927ef167 100644
--- a/src/com/android/launcher3/settings/SettingsActivity.java
+++ b/src/com/android/launcher3/settings/SettingsActivity.java
@@ -80,6 +80,8 @@ public class SettingsActivity extends FragmentActivity
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.settings_activity);
+        setActionBar(findViewById(R.id.action_bar));
 
         if (savedInstanceState == null) {
             Intent intent = getIntent();
@@ -98,7 +100,7 @@ public class SettingsActivity extends FragmentActivity
                     getPreferenceFragment());
             f.setArguments(args);
             // Display the fragment as the main content.
-            fm.beginTransaction().replace(android.R.id.content, f).commit();
+            fm.beginTransaction().replace(R.id.content_frame, f).commit();
         }
         Utilities.getPrefs(getApplicationContext()).registerOnSharedPreferenceChangeListener(this);
     }
-- 
GitLab


From 1e1f85beffc59baeb30cd684445b85f9a33a91d6 Mon Sep 17 00:00:00 2001
From: Jon Spivack <spivack@google.com>
Date: Thu, 27 May 2021 14:19:34 -0700
Subject: [PATCH 1288/1664] NIU Actions: Support Dark Mode and Landscape

This adds light and dark color variants for the UI elements on the Go Recents screen. Toggling Dark Mode will switch between the themes. Additionally, the button spacing definitions have been updated to better support Landscape orientation.

Bug: 187866121
Bug: 183714277
Test: Manual (Pixel 3A)
Change-Id: Ia2c0cbf372882aad87e4018d10d8f85bd92842e0
---
 .../res/layout/overview_actions_container.xml | 18 ++-------
 go/quickstep/res/layout/overview_panel.xml    | 39 +++++++++++++++++++
 go/quickstep/res/values/attrs.xml             | 23 +++++++++++
 go/quickstep/res/values/colors.xml            |  6 ++-
 go/quickstep/res/values/dimens.xml            |  1 +
 go/quickstep/res/values/styles.xml            | 22 +++++++++--
 6 files changed, 91 insertions(+), 18 deletions(-)
 create mode 100644 go/quickstep/res/layout/overview_panel.xml
 create mode 100644 go/quickstep/res/values/attrs.xml

diff --git a/go/quickstep/res/layout/overview_actions_container.xml b/go/quickstep/res/layout/overview_actions_container.xml
index b36214ba7d..e7da196fad 100644
--- a/go/quickstep/res/layout/overview_actions_container.xml
+++ b/go/quickstep/res/layout/overview_actions_container.xml
@@ -28,10 +28,6 @@
         android:layout_gravity="top|center_horizontal"
         android:orientation="horizontal">
 
-        <Space
-            android:layout_width="@dimen/go_overview_button_width"
-            android:layout_height="1dp" />
-
         <Space
             android:layout_width="0dp"
             android:layout_height="1dp"
@@ -50,9 +46,8 @@
         </LinearLayout>
 
         <Space
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_weight="1" />
+            android:layout_width="@dimen/go_overview_button_container_margin"
+            android:layout_height="1dp" />
 
         <LinearLayout
             style="@style/GoOverviewActionButtonContainer">
@@ -68,9 +63,8 @@
         </LinearLayout>
 
         <Space
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_weight="1" />
+            android:layout_width="@dimen/go_overview_button_container_margin"
+            android:layout_height="1dp" />
 
         <LinearLayout
             style="@style/GoOverviewActionButtonContainer">
@@ -90,10 +84,6 @@
             android:layout_height="1dp"
             android:layout_weight="1" />
 
-        <Space
-            android:layout_width="@dimen/go_overview_button_width"
-            android:layout_height="1dp" />
-
         <!-- Will be enabled in a future version. -->
         <LinearLayout
             style="@style/GoOverviewActionButtonContainer"
diff --git a/go/quickstep/res/layout/overview_panel.xml b/go/quickstep/res/layout/overview_panel.xml
new file mode 100644
index 0000000000..241b63d5d1
--- /dev/null
+++ b/go/quickstep/res/layout/overview_panel.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+     Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <com.android.quickstep.views.LauncherRecentsView
+        android:id="@+id/overview_panel"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:accessibilityPaneTitle="@string/accessibility_recent_apps"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:background="?attr/overviewBackgroundColor"
+        android:visibility="invisible" />
+
+    <com.android.quickstep.views.SplitPlaceholderView
+        android:id="@+id/split_placeholder"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/split_placeholder_size"
+        android:background="@android:color/darker_gray"
+        android:visibility="gone" />
+
+    <include
+        android:id="@+id/overview_actions_view"
+        layout="@layout/overview_actions_container" />
+
+</merge>
diff --git a/go/quickstep/res/values/attrs.xml b/go/quickstep/res/values/attrs.xml
new file mode 100644
index 0000000000..3adf462d2c
--- /dev/null
+++ b/go/quickstep/res/values/attrs.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <!-- Attributes used for Overview theming -->
+    <attr name="overviewBackgroundColor" format="color" />
+    <attr name="overviewButtonTextColor" format="color" />
+    <attr name="overviewButtonIconColor" format="color" />
+    <attr name="overviewButtonBackgroundColor" format="color" />
+</resources>
\ No newline at end of file
diff --git a/go/quickstep/res/values/colors.xml b/go/quickstep/res/values/colors.xml
index 9383770318..f815f54581 100644
--- a/go/quickstep/res/values/colors.xml
+++ b/go/quickstep/res/values/colors.xml
@@ -16,6 +16,10 @@
 -->
 <resources>
     <!-- Overview -->
-    <color name="go_overview_button_icon_color">#3C4043</color>
+    <color name="go_overview_background_color">#DADADA</color>
+    <color name="go_overview_background_color_dark">#000000</color>
+    <color name="go_overview_text_color">#3C4043</color>
+    <color name="go_overview_text_color_dark">#F8F9FA</color>
     <color name="go_overview_button_color">#70FFFFFF</color>
+    <color name="go_overview_button_color_dark">#303030</color>
 </resources>
diff --git a/go/quickstep/res/values/dimens.xml b/go/quickstep/res/values/dimens.xml
index da684fa23b..55cd138f12 100644
--- a/go/quickstep/res/values/dimens.xml
+++ b/go/quickstep/res/values/dimens.xml
@@ -22,6 +22,7 @@
     <dimen name="go_overview_button_width">60dp</dimen>
     <dimen name="go_overview_button_height">60dp</dimen>
     <dimen name="go_overview_button_container_width">80dp</dimen>
+    <dimen name="go_overview_button_container_margin">16dp</dimen>
     <dimen name="go_overview_button_caption_margin">8dp</dimen>
     <dimen name="overview_actions_height">96dp</dimen>
     <dimen name="overview_proactive_row_height">0dp</dimen>
diff --git a/go/quickstep/res/values/styles.xml b/go/quickstep/res/values/styles.xml
index 9b3fe67b98..59f7377d8e 100644
--- a/go/quickstep/res/values/styles.xml
+++ b/go/quickstep/res/values/styles.xml
@@ -15,9 +15,25 @@
      limitations under the License.
 -->
 <resources>
+    <!-- App themes -->
+    <style name="AppTheme" parent="@style/LauncherTheme">
+        <item name="overviewBackgroundColor">@color/go_overview_background_color</item>
+        <item name="overviewButtonTextColor">@color/go_overview_text_color</item>
+        <item name="overviewButtonIconColor">@color/go_overview_text_color</item>
+        <item name="overviewButtonBackgroundColor">@color/go_overview_button_color</item>
+    </style>
+
+    <style name="AppTheme.Dark" parent="@style/LauncherTheme.Dark">
+        <item name="overviewBackgroundColor">@color/go_overview_background_color_dark</item>
+        <item name="overviewButtonTextColor">@color/go_overview_text_color_dark</item>
+        <item name="overviewButtonIconColor">@color/go_overview_text_color_dark</item>
+        <item name="overviewButtonBackgroundColor">@color/go_overview_button_color_dark</item>
+    </style>
+
+    <!-- Overview -->
     <style name="GoOverviewActionButton">
-        <item name="android:tint">@color/go_overview_button_icon_color</item>
-        <item name="android:backgroundTint">@color/go_overview_button_color</item>
+        <item name="android:tint">?attr/overviewButtonIconColor</item>
+        <item name="android:backgroundTint">?attr/overviewButtonBackgroundColor</item>
         <item name="android:background">@drawable/round_rect_button</item>
         <item name="android:layout_width">@dimen/go_overview_button_width</item>
         <item name="android:layout_height">@dimen/go_overview_button_height</item>
@@ -27,7 +43,7 @@
     <style name="GoOverviewActionButtonCaption">
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textSize">14dp</item>
-        <item name="android:textColor">@color/go_overview_button_icon_color</item>
+        <item name="android:textColor">?attr/overviewButtonTextColor</item>
         <item name="android:lineHeight">20dp</item>
         <item name="android:textAlignment">center</item>
         <item name="android:importantForAccessibility">no</item>
-- 
GitLab


From de907805d1fc080a90931dc7b98cc6dce9782417 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Thu, 27 May 2021 18:13:27 -0700
Subject: [PATCH 1289/1664] Change folderFillColor to colorBackgroundFloating.

There seems to be some nuance that prevents me from defining it once in
the base theme, so just updated all of them individually to prevent
any edge case from slipping through.

Bug: 188095988
Test: manual
Change-Id: I1dea639f174fa4ec09bda93a6e2017993b2007a5
---
 res/values/styles.xml                                | 12 ++++++------
 .../android/launcher3/folder/PreviewBackground.java  |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/res/values/styles.xml b/res/values/styles.xml
index df617ea95e..757c495bca 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -48,7 +48,7 @@
         <item name="workspaceStatusBarScrim">@drawable/workspace_bg</item>
         <item name="widgetsTheme">@style/WidgetContainerTheme</item>
         <item name="folderDotColor">?android:attr/colorPrimary</item>
-        <item name="folderFillColor">?android:attr/colorBackground</item>
+        <item name="folderFillColor">?android:attr/colorBackgroundFloating</item>
         <item name="folderIconBorderColor">?android:attr/colorPrimary</item>
         <item name="folderTextColor">?android:attr/textColorPrimary</item>
         <item name="isFolderDarkText">true</item>
@@ -71,7 +71,7 @@
     </style>
 
     <style name="LauncherTheme.DarkMainColor" parent="@style/LauncherTheme">
-        <item name="folderFillColor">#FF3C4043</item> <!-- 100% GM2 800 -->
+        <item name="folderFillColor">?android:attr/colorBackgroundFloating</item>
         <item name="folderTextColor">?attr/workspaceTextColor</item>
         <item name="isFolderDarkText">?attr/isWorkspaceDarkText</item>
         <item name="folderHintColor">@color/folder_hint_text_color_dark</item>
@@ -87,7 +87,7 @@
         <item name="isWorkspaceDarkText">true</item>
         <item name="workspaceStatusBarScrim">@null</item>
         <item name="folderDotColor">#FF464646</item>
-        <item name="folderFillColor">#CDFFFFFF</item>
+        <item name="folderFillColor">?android:attr/colorBackgroundFloating</item>
         <item name="folderIconBorderColor">#FF80868B</item>
         <item name="folderTextColor">?attr/workspaceTextColor</item>
         <item name="isFolderDarkText">true</item>
@@ -109,7 +109,7 @@
         <item name="popupColorTertiary">@color/popup_color_tertiary_dark</item>
         <item name="widgetsTheme">@style/WidgetContainerTheme.Dark</item>
         <item name="folderDotColor">?android:attr/colorPrimary</item>
-        <item name="folderFillColor">?android:attr/colorBackground</item>
+        <item name="folderFillColor">?android:attr/colorBackgroundFloating</item>
         <item name="folderIconBorderColor">?android:attr/colorPrimary</item>
         <item name="folderTextColor">?android:attr/textColorPrimary</item>
         <item name="isFolderDarkText">false</item>
@@ -123,7 +123,7 @@
     </style>
 
     <style name="LauncherTheme.Dark.DarkMainColor" parent="@style/LauncherTheme.Dark">
-        <item name="folderFillColor">#FF3C4043</item> <!-- 100% GM2 800 -->
+        <item name="folderFillColor">?android:attr/colorBackgroundFloating</item>
         <item name="folderTextColor">@android:color/white</item>
         <item name="isFolderDarkText">false</item>
         <item name="folderHintColor">@color/folder_hint_text_color_light</item>
@@ -132,7 +132,7 @@
 
     <style name="LauncherTheme.Dark.DarkText" parent="@style/LauncherTheme.Dark">
         <item name="android:colorControlHighlight">#19212121</item>
-        <item name="folderFillColor">#CDFFFFFF</item>
+        <item name="folderFillColor">?android:attr/colorBackgroundFloating</item>
         <item name="folderTextColor">?attr/workspaceTextColor</item>
         <item name="isFolderDarkText">?attr/isWorkspaceDarkText</item>
         <item name="folderHintColor">@color/folder_hint_text_color_dark</item>
diff --git a/src/com/android/launcher3/folder/PreviewBackground.java b/src/com/android/launcher3/folder/PreviewBackground.java
index 5ddf84f99f..4eab63e54f 100644
--- a/src/com/android/launcher3/folder/PreviewBackground.java
+++ b/src/com/android/launcher3/folder/PreviewBackground.java
@@ -89,8 +89,8 @@ public class PreviewBackground extends CellLayout.DelegatedCellDrawing {
     private static final float ACCEPT_COLOR_MULTIPLIER = 1.5f;
 
     // Expressed on a scale from 0 to 255.
-    private static final int BG_OPACITY = 160;
-    private static final int MAX_BG_OPACITY = 225;
+    private static final int BG_OPACITY = 255;
+    private static final int MAX_BG_OPACITY = 255;
     private static final int SHADOW_OPACITY = 40;
 
     private ValueAnimator mScaleAnimator;
-- 
GitLab


From 2d35d4b97cfe85b4079eb43a62217d55ff505206 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Thu, 27 May 2021 18:55:15 -0700
Subject: [PATCH 1290/1664] Make BaseIcon.Workspace so that it can be
 overriden.

Bug: 188094809
Test: manual
Change-Id: Id31502e66d96806054e1cdd6549b226b2a22173e
---
 res/values/styles.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/res/values/styles.xml b/res/values/styles.xml
index df617ea95e..e139a560c3 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -240,7 +240,7 @@
 
 
     <!-- Icon displayed on the workspace -->
-    <style name="BaseIcon.Workspace" >
+    <style name="BaseIcon.Workspace.Shadows" parent="BaseIcon">
         <item name="android:shadowRadius">2.0</item>
         <item name="android:shadowColor">?attr/workspaceShadowColor</item>
         <item name="ambientShadowColor">?attr/workspaceAmbientShadowColor</item>
@@ -251,6 +251,10 @@
         <item name="keyShadowOffsetY">.5dp</item>
     </style>
 
+    <!-- Intentionally empty so we can override -->
+    <style name="BaseIcon.Workspace" parent="BaseIcon.Workspace.Shadows">
+    </style>
+
     <!-- Theme for the popup container -->
     <style name="PopupItem">
         <item name="android:colorControlHighlight">?attr/popupColorTertiary</item>
-- 
GitLab


From 23aa129016b6b1986c1a9e1408fb6d935b003bb0 Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Thu, 27 May 2021 19:01:09 -0700
Subject: [PATCH 1291/1664] Force initialize task stack callback for gesture
 modes on init

This handles an edge case where RotationTouchHelper#mMode starts as 3 button (by default)
* then changes to gesture nav.
* then onDestroy called
* then on re-initialization mMode will be gesture nav instead of 3-button
(it maintains state because of it being singleton).

The check to register the callback won't happen because we register only if previous mode and
current mode differ.
Don't rely on default value of mMode being 3 button when initializing

Bug: 181928969
Test: Followed repo steps in bug.
Restarted phone in all 3 nav modes and verified
expected quickswitch behavior

Change-Id: I381eba7417c4cde593edf4b9a34da55b50774e98
---
 .../android/quickstep/RotationTouchHelper.java    | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/RotationTouchHelper.java b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
index 66929d0cdb..fc7a3dfde3 100644
--- a/quickstep/src/com/android/quickstep/RotationTouchHelper.java
+++ b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
@@ -152,7 +152,7 @@ public class RotationTouchHelper implements
 
         // Register for navigation mode changes
         SysUINavigationMode.Mode newMode = mSysUiNavMode.addModeChangeListener(this);
-        onNavigationModeChanged(newMode);
+        onNavModeChangedInternal(newMode, newMode.hasGestures);
         runOnDestroy(() -> mSysUiNavMode.removeModeChangeListener(this));
 
         mOrientationListener = new OrientationEventListener(mContext) {
@@ -245,13 +245,22 @@ public class RotationTouchHelper implements
 
     @Override
     public void onNavigationModeChanged(SysUINavigationMode.Mode newMode) {
+        onNavModeChangedInternal(newMode, false);
+    }
+
+    /**
+     * @param forceRegister if {@code true}, this will register {@link #mFrozenTaskListener} via
+     *                      {@link #setupOrientationSwipeHandler()}
+     */
+    private void onNavModeChangedInternal(SysUINavigationMode.Mode newMode, boolean forceRegister) {
         mDisplayController.removeChangeListener(this);
         mDisplayController.addChangeListener(this);
         onDisplayInfoChanged(mContext, mDisplayController.getInfo(), CHANGE_ALL);
 
         mOrientationTouchTransformer.setNavigationMode(newMode, mDisplayController.getInfo(),
-            mContext.getResources());
-        if (!mMode.hasGestures && newMode.hasGestures) {
+                mContext.getResources());
+
+        if (forceRegister || (!mMode.hasGestures && newMode.hasGestures)) {
             setupOrientationSwipeHandler();
         } else if (mMode.hasGestures && !newMode.hasGestures){
             destroyOrientationSwipeHandlerCallback();
-- 
GitLab


From 8fc592d2460603f3fab512582c8ab06c9e8b4611 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Thu, 27 May 2021 21:04:06 -0700
Subject: [PATCH 1292/1664] Update device paddings to spec.

Bug: 188094809
Test: verify using device profile dump
Change-Id: I51633d590bd9079ad62a79099b3f8df1cab7894c
---
 res/xml/size_limits_80x104.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/xml/size_limits_80x104.xml b/res/xml/size_limits_80x104.xml
index f3755498dc..f5ca757586 100644
--- a/res/xml/size_limits_80x104.xml
+++ b/res/xml/size_limits_80x104.xml
@@ -62,10 +62,10 @@
     <device-padding
         launcher:maxEmptySpace="9999dp">
         <workspaceTopPadding
-            launcher:a="0.38"
+            launcher:a="0.40"
             launcher:c="36dp"/>
         <workspaceBottomPadding
-            launcher:a="0.62"
+            launcher:a="0.60"
             launcher:c="36dp"/>
         <hotseatBottomPadding
             launcher:a="0"
-- 
GitLab


From 5df1fa503147e2239340249411a220aa3df61eeb Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Thu, 27 May 2021 21:33:53 -0700
Subject: [PATCH 1293/1664] Update launcher content animation to spec.

- Scales content
- Fades in scrim

Bug: 177264697
Test: manual
Change-Id: Ie60908b6c417d94f1e075ea9728bd48eea55083e
---
 quickstep/res/values/dimens.xml               |  2 +-
 .../launcher3/QuickstepTransitionManager.java | 96 +++++++++++--------
 2 files changed, 58 insertions(+), 40 deletions(-)

diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index ffd83b1ac5..b39a8d3f09 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -64,7 +64,7 @@
     <dimen name="quickstep_fling_threshold_speed">0.5dp</dimen>
 
     <!-- Launcher app transition -->
-    <dimen name="content_trans_y">50dp</dimen>
+    <item name="content_scale" format="float" type="dimen">0.97</item>
     <dimen name="closing_window_trans_y">115dp</dimen>
 
     <dimen name="recents_empty_message_text_size">16sp</dimen>
diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 3aa758fec2..6912f94fb4 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -23,11 +23,14 @@ import static com.android.launcher3.BaseActivity.INVISIBLE_ALL;
 import static com.android.launcher3.BaseActivity.INVISIBLE_BY_APP_TRANSITIONS;
 import static com.android.launcher3.BaseActivity.INVISIBLE_BY_PENDING_FLAGS;
 import static com.android.launcher3.BaseActivity.PENDING_INVISIBLE_BY_WALLPAPER_ANIMATION;
+import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
+import static com.android.launcher3.LauncherAnimUtils.VIEW_BACKGROUND_COLOR;
 import static com.android.launcher3.LauncherState.ALL_APPS;
 import static com.android.launcher3.LauncherState.BACKGROUND_APP;
 import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.Utilities.postAsyncCallback;
 import static com.android.launcher3.anim.Interpolators.AGGRESSIVE_EASE;
+import static com.android.launcher3.anim.Interpolators.DEACCEL_1_5;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_1_7;
 import static com.android.launcher3.anim.Interpolators.EXAGGERATED_EASE;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
@@ -50,10 +53,12 @@ import android.animation.ValueAnimator;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
+import android.graphics.Color;
 import android.graphics.Matrix;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.RectF;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.CancellationSignal;
 import android.os.Handler;
@@ -67,6 +72,7 @@ import android.view.animation.PathInterpolator;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.graphics.ColorUtils;
 
 import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
 import com.android.launcher3.anim.AnimationSuccessListener;
@@ -75,10 +81,11 @@ import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.shortcuts.DeepShortcutView;
 import com.android.launcher3.statehandlers.DepthController;
 import com.android.launcher3.util.ActivityOptionsWrapper;
-import com.android.launcher3.util.MultiValueAlpha;
 import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;
 import com.android.launcher3.util.RunnableList;
+import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.FloatingIconView;
+import com.android.launcher3.views.ScrimView;
 import com.android.launcher3.widget.LauncherAppWidgetHostView;
 import com.android.quickstep.RemoteAnimationTargets;
 import com.android.quickstep.SystemUiProxy;
@@ -160,7 +167,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
     private static final int CLOSING_TRANSITION_DURATION_MS = 250;
 
     public static final int CONTENT_ALPHA_DURATION = 217;
-    protected static final int CONTENT_TRANSLATION_DURATION = 350;
+    protected static final int CONTENT_SCALE_DURATION = 350;
+    protected static final int CONTENT_SCRIM_DURATION = 350;
 
     private static final int MAX_NUM_TASKS = 5;
 
@@ -173,9 +181,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
     private final AlphaProperty mDragLayerAlpha;
 
     final Handler mHandler;
-    private final boolean mIsRtl;
 
-    private final float mContentTransY;
+    private final float mContentScale;
     private final float mClosingWindowTransY;
     private final float mMaxShadowRadius;
 
@@ -212,11 +219,10 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
         mDragLayer = mLauncher.getDragLayer();
         mDragLayerAlpha = mDragLayer.getAlphaProperty(ALPHA_INDEX_TRANSITIONS);
         mHandler = new Handler(Looper.getMainLooper());
-        mIsRtl = Utilities.isRtl(mLauncher.getResources());
         mDeviceProfile = mLauncher.getDeviceProfile();
 
         Resources res = mLauncher.getResources();
-        mContentTransY = res.getDimensionPixelSize(R.dimen.content_trans_y);
+        mContentScale = res.getFloat(R.dimen.content_scale);
         mClosingWindowTransY = res.getDimensionPixelSize(R.dimen.closing_window_trans_y);
         mMaxShadowRadius = res.getDimensionPixelSize(R.dimen.max_shadow_radius);
 
@@ -335,8 +341,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                 windowTargetBounds, areAllTargetsTranslucent(appTargets), rotationChange));
         if (launcherClosing) {
             Pair<AnimatorSet, Runnable> launcherContentAnimator =
-                    getLauncherContentAnimator(true /* isAppOpening */,
-                            new float[] {0, -mContentTransY});
+                    getLauncherContentAnimator(true /* isAppOpening */);
             anim.play(launcherContentAnimator.first);
             anim.addListener(new AnimatorListenerAdapter() {
                 @Override
@@ -436,10 +441,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
      *
      * @param isAppOpening True when this is called when an app is opening.
      *                     False when this is called when an app is closing.
-     * @param trans Array that contains the start and end translation values for the content.
      */
-    private Pair<AnimatorSet, Runnable> getLauncherContentAnimator(boolean isAppOpening,
-            float[] trans) {
+    private Pair<AnimatorSet, Runnable> getLauncherContentAnimator(boolean isAppOpening) {
         AnimatorSet launcherAnimator = new AnimatorSet();
         Runnable endListener;
 
@@ -447,13 +450,17 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                 ? new float[] {1, 0}
                 : new float[] {0, 1};
 
+        float[] scales = isAppOpening
+                ? new float[] {1, mContentScale}
+                : new float[] {mContentScale, 1};
+
         if (mLauncher.isInState(ALL_APPS)) {
             // All Apps in portrait mode is full screen, so we only animate AllAppsContainerView.
             final View appsView = mLauncher.getAppsView();
             final float startAlpha = appsView.getAlpha();
-            final float startY = appsView.getTranslationY();
+            final float startScale = SCALE_PROPERTY.get(appsView);
             appsView.setAlpha(alphas[0]);
-            appsView.setTranslationY(trans[0]);
+            SCALE_PROPERTY.set(appsView, scales[0]);
 
             ObjectAnimator alpha = ObjectAnimator.ofFloat(appsView, View.ALPHA, alphas);
             alpha.setDuration(CONTENT_ALPHA_DURATION);
@@ -465,30 +472,22 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                     appsView.setLayerType(View.LAYER_TYPE_NONE, null);
                 }
             });
-            ObjectAnimator transY = ObjectAnimator.ofFloat(appsView, View.TRANSLATION_Y, trans);
-            transY.setInterpolator(AGGRESSIVE_EASE);
-            transY.setDuration(CONTENT_TRANSLATION_DURATION);
+            ObjectAnimator scale = ObjectAnimator.ofFloat(appsView, SCALE_PROPERTY, scales);
+            scale.setInterpolator(AGGRESSIVE_EASE);
+            scale.setDuration(CONTENT_SCALE_DURATION);
 
             launcherAnimator.play(alpha);
-            launcherAnimator.play(transY);
+            launcherAnimator.play(scale);
 
             endListener = () -> {
                 appsView.setAlpha(startAlpha);
-                appsView.setTranslationY(startY);
+                SCALE_PROPERTY.set(appsView, startScale);
                 appsView.setLayerType(View.LAYER_TYPE_NONE, null);
             };
         } else if (mLauncher.isInState(OVERVIEW)) {
-            endListener = composeViewContentAnimator(launcherAnimator, alphas, trans);
+            endListener = composeViewContentAnimator(launcherAnimator, alphas, scales);
         } else {
-            mDragLayerAlpha.setValue(alphas[0]);
-            ObjectAnimator alpha =
-                    ObjectAnimator.ofFloat(mDragLayerAlpha, MultiValueAlpha.VALUE, alphas);
-            alpha.setDuration(CONTENT_ALPHA_DURATION);
-            alpha.setInterpolator(LINEAR);
-            launcherAnimator.play(alpha);
-
             List<View> viewsToAnimate = new ArrayList<>();
-
             Workspace workspace = mLauncher.getWorkspace();
             workspace.forEachVisiblePage(
                     view -> viewsToAnimate.add(((CellLayout) view).getShortcutsAndWidgets()));
@@ -499,18 +498,38 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
 
             viewsToAnimate.forEach(view -> {
                 view.setLayerType(View.LAYER_TYPE_HARDWARE, null);
-                launcherAnimator.play(ObjectAnimator.ofFloat(view, View.TRANSLATION_Y, trans));
+
+                ObjectAnimator scaleAnim = ObjectAnimator.ofFloat(view, SCALE_PROPERTY, scales)
+                        .setDuration(CONTENT_SCALE_DURATION);
+                scaleAnim.setInterpolator(DEACCEL_1_5);
+                launcherAnimator.play(scaleAnim);
             });
 
+            int scrimColor = Themes.getAttrColor(mLauncher, R.attr.overviewScrimColor);
+            int scrimColorTrans = ColorUtils.setAlphaComponent(scrimColor, 0);
+            int[] colors = isAppOpening
+                    ? new int[] {scrimColorTrans, scrimColor}
+                    : new int[] {scrimColor, scrimColorTrans};
+            ScrimView scrimView = mLauncher.getScrimView();
+            if (scrimView.getBackground() instanceof ColorDrawable) {
+                scrimView.setBackgroundColor(colors[0]);
+
+                ObjectAnimator scrim = ObjectAnimator.ofArgb(scrimView, VIEW_BACKGROUND_COLOR,
+                        colors);
+                scrim.setDuration(CONTENT_SCRIM_DURATION);
+                scrim.setInterpolator(DEACCEL_1_5);
+                launcherAnimator.play(scrim);
+            }
+
             // Pause page indicator animations as they lead to layer trashing.
             mLauncher.getWorkspace().getPageIndicator().pauseAnimations();
 
             endListener = () -> {
                 viewsToAnimate.forEach(view -> {
-                    view.setTranslationY(0);
+                    SCALE_PROPERTY.set(view, 1f);
                     view.setLayerType(View.LAYER_TYPE_NONE, null);
                 });
-                mDragLayerAlpha.setValue(1f);
+                scrimView.setBackgroundColor(Color.TRANSPARENT);
                 mLauncher.getWorkspace().getPageIndicator().skipAnimationsToEnd();
             };
         }
@@ -522,11 +541,11 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
      *
      * @param anim the animator set to add to
      * @param alphas the alphas to animate to over time
-     * @param trans the translation Y values to animator to over time
+     * @param scales the scale values to animator to over time
      * @return listener to run when the animation ends
      */
     protected Runnable composeViewContentAnimator(@NonNull AnimatorSet anim,
-            float[] alphas, float[] trans) {
+            float[] alphas, float[] scales) {
         RecentsView overview = mLauncher.getOverviewPanel();
         ObjectAnimator alpha = ObjectAnimator.ofFloat(overview,
                 RecentsView.CONTENT_ALPHA, alphas);
@@ -535,14 +554,14 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
         anim.play(alpha);
         overview.setFreezeViewVisibility(true);
 
-        ObjectAnimator transY = ObjectAnimator.ofFloat(overview, View.TRANSLATION_Y, trans);
-        transY.setInterpolator(AGGRESSIVE_EASE);
-        transY.setDuration(CONTENT_TRANSLATION_DURATION);
-        anim.play(transY);
+        ObjectAnimator scaleAnim = ObjectAnimator.ofFloat(overview, SCALE_PROPERTY, scales);
+        scaleAnim.setInterpolator(AGGRESSIVE_EASE);
+        scaleAnim.setDuration(CONTENT_SCALE_DURATION);
+        anim.play(scaleAnim);
 
         return () -> {
             overview.setFreezeViewVisibility(false);
-            overview.setTranslationY(0);
+            SCALE_PROPERTY.set(overview, 1f);
             mLauncher.getStateManager().reapplyState();
         };
     }
@@ -1223,8 +1242,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
 
                     if (mLauncher.isInState(LauncherState.ALL_APPS)) {
                         Pair<AnimatorSet, Runnable> contentAnimator =
-                                getLauncherContentAnimator(false /* isAppOpening */,
-                                        new float[] {-mContentTransY, 0});
+                                getLauncherContentAnimator(false /* isAppOpening */);
                         contentAnimator.first.setStartDelay(LAUNCHER_RESUME_START_DELAY);
                         anim.play(contentAnimator.first);
                         anim.addListener(new AnimatorListenerAdapter() {
-- 
GitLab


From a4adcbc8eda249c3503e691d0b048df94cdc8483 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Mon, 31 May 2021 10:53:02 +0000
Subject: [PATCH 1294/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Iaaa324a8b618f499da8f48f819efec176e124e85
---
 quickstep/res/values-af/strings.xml        | 18 ++++++------------
 quickstep/res/values-am/strings.xml        | 18 ++++++------------
 quickstep/res/values-ar/strings.xml        | 18 ++++++------------
 quickstep/res/values-as/strings.xml        | 18 ++++++------------
 quickstep/res/values-az/strings.xml        | 18 ++++++------------
 quickstep/res/values-b+sr+Latn/strings.xml | 18 ++++++------------
 quickstep/res/values-be/strings.xml        | 18 ++++++------------
 quickstep/res/values-bg/strings.xml        | 18 ++++++------------
 quickstep/res/values-bs/strings.xml        | 18 ++++++------------
 quickstep/res/values-ca/strings.xml        | 18 ++++++------------
 quickstep/res/values-cs/strings.xml        | 18 ++++++------------
 quickstep/res/values-da/strings.xml        | 18 ++++++------------
 quickstep/res/values-el/strings.xml        | 18 ++++++------------
 quickstep/res/values-en-rAU/strings.xml    | 18 ++++++------------
 quickstep/res/values-en-rCA/strings.xml    | 18 ++++++------------
 quickstep/res/values-en-rGB/strings.xml    | 18 ++++++------------
 quickstep/res/values-en-rIN/strings.xml    | 18 ++++++------------
 quickstep/res/values-en-rXC/strings.xml    | 18 ++++++------------
 quickstep/res/values-es-rUS/strings.xml    | 18 ++++++------------
 quickstep/res/values-es/strings.xml        | 18 ++++++------------
 quickstep/res/values-et/strings.xml        | 18 ++++++------------
 quickstep/res/values-eu/strings.xml        | 18 ++++++------------
 quickstep/res/values-fa/strings.xml        | 18 ++++++------------
 quickstep/res/values-fi/strings.xml        | 18 ++++++------------
 quickstep/res/values-fr/strings.xml        | 18 ++++++------------
 quickstep/res/values-gl/strings.xml        | 18 ++++++------------
 quickstep/res/values-hi/strings.xml        | 18 ++++++------------
 quickstep/res/values-hr/strings.xml        | 18 ++++++------------
 quickstep/res/values-hu/strings.xml        | 18 ++++++------------
 quickstep/res/values-hy/strings.xml        | 18 ++++++------------
 quickstep/res/values-in/strings.xml        | 18 ++++++------------
 quickstep/res/values-is/strings.xml        | 18 ++++++------------
 quickstep/res/values-it/strings.xml        | 18 ++++++------------
 quickstep/res/values-iw/strings.xml        | 18 ++++++------------
 quickstep/res/values-ja/strings.xml        | 18 ++++++------------
 quickstep/res/values-ka/strings.xml        | 18 ++++++------------
 quickstep/res/values-kk/strings.xml        | 18 ++++++------------
 quickstep/res/values-km/strings.xml        | 18 ++++++------------
 quickstep/res/values-kn/strings.xml        | 18 ++++++------------
 quickstep/res/values-ko/strings.xml        | 18 ++++++------------
 quickstep/res/values-ky/strings.xml        | 18 ++++++------------
 quickstep/res/values-lo/strings.xml        | 18 ++++++------------
 quickstep/res/values-lt/strings.xml        | 18 ++++++------------
 quickstep/res/values-lv/strings.xml        | 18 ++++++------------
 quickstep/res/values-mk/strings.xml        | 18 ++++++------------
 quickstep/res/values-mn/strings.xml        | 18 ++++++------------
 quickstep/res/values-ms/strings.xml        | 18 ++++++------------
 quickstep/res/values-my/strings.xml        | 18 ++++++------------
 quickstep/res/values-nb/strings.xml        | 18 ++++++------------
 quickstep/res/values-nl/strings.xml        | 18 ++++++------------
 quickstep/res/values-or/strings.xml        | 18 ++++++------------
 quickstep/res/values-pl/strings.xml        | 18 ++++++------------
 quickstep/res/values-pt-rPT/strings.xml    | 18 ++++++------------
 quickstep/res/values-pt/strings.xml        | 18 ++++++------------
 quickstep/res/values-ro/strings.xml        | 18 ++++++------------
 quickstep/res/values-ru/strings.xml        | 18 ++++++------------
 quickstep/res/values-si/strings.xml        | 18 ++++++------------
 quickstep/res/values-sk/strings.xml        | 18 ++++++------------
 quickstep/res/values-sl/strings.xml        | 18 ++++++------------
 quickstep/res/values-sq/strings.xml        | 18 ++++++------------
 quickstep/res/values-sr/strings.xml        | 18 ++++++------------
 quickstep/res/values-sv/strings.xml        | 18 ++++++------------
 quickstep/res/values-sw/strings.xml        | 18 ++++++------------
 quickstep/res/values-ta/strings.xml        | 18 ++++++------------
 quickstep/res/values-th/strings.xml        | 18 ++++++------------
 quickstep/res/values-tl/strings.xml        | 18 ++++++------------
 quickstep/res/values-tr/strings.xml        | 18 ++++++------------
 quickstep/res/values-uk/strings.xml        | 18 ++++++------------
 quickstep/res/values-ur/strings.xml        | 18 ++++++------------
 quickstep/res/values-uz/strings.xml        | 18 ++++++------------
 quickstep/res/values-vi/strings.xml        | 18 ++++++------------
 quickstep/res/values-zh-rCN/strings.xml    | 18 ++++++------------
 quickstep/res/values-zh-rHK/strings.xml    | 18 ++++++------------
 quickstep/res/values-zh-rTW/strings.xml    | 18 ++++++------------
 quickstep/res/values-zu/strings.xml        | 18 ++++++------------
 75 files changed, 450 insertions(+), 900 deletions(-)

diff --git a/quickstep/res/values-af/strings.xml b/quickstep/res/values-af/strings.xml
index f563cdbb95..468628e91a 100644
--- a/quickstep/res/values-af/strings.xml
+++ b/quickstep/res/values-af/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Maak seker dat jy van die linkerrand na die middel van die skerm swiep en laat los."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Maak seker dat jy van die rand heel regs af swiep."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Maak seker dat jy van die regterrand na die middel van die skerm swiep en laat los."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Jy het geleer hoe om van links af te swiep om terug te gaan."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Jy het geleer hoe om van regs af te swiep om terug te gaan. Nou kan jy leer hoe om tussen programme te wissel."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Jy het die \"gaan terug\"-gebaar voltooi."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Maak seker dat jy nie te naby aan die onderkant van die skerm swiep nie."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Gaan na Instellings om sensitiwiteit van teruggebaar te verander"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Swiep van links af om terug te gaan"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Swiep van regs af om terug te gaan"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Swiep van links af na middel van skerm om terug te gaan na laaste skerm waarop jy was."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Swiep van regs af na middel van skerm om terug te gaan na laaste skerm. Probeer dit nou."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Maak seker dat jy van die onderrand van die skerm af opswiep."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Maak seker jy onderbreek nie voordat jy laat los nie."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Maak seker jy swiep reguit op."</string>
diff --git a/quickstep/res/values-am/strings.xml b/quickstep/res/values-am/strings.xml
index 3c20bb1e7d..3b3366df47 100644
--- a/quickstep/res/values-am/strings.xml
+++ b/quickstep/res/values-am/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ከግራ ጠርዝ ወደ ማያ ገጹ መሃል ማንሸራተትዎን እና መልቀቅዎን ያረጋግጡ።"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ከቀኝ ጠርዝ ጥግ ጀምሮ ማንሸራተትዎን ያረጋግጡ።"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ከቀኝ ጠርዝ ወደ ማያ ገጹ መሃል ማንሸራተትዎን እና መልቀቅዎን ያረጋግጡ።"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"ወደ ኋላ ለመመለስ ከግራ ጀምሮ እንዴት ማንሸራተት እንደሚችሉ አውቀዋል።"</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ወደ ኋላ ለመመለስ ከቀኝ ጀምሮ እንዴት ማንሸራተት እንደሚችሉ አውቀዋል። ቀጥለው መተግበሪያዎችን እንዴት መቀየር እንደሚችሉ ይወቁ።"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ወደኋላ የመመለስ ምልክትን አጠናቀዋል።"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ከማያ ገጹ ታችኛው ክፍል ጋር በጣም ጠጋ ብለው አለማንሸራተትዎን ያረጋግጡ።"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ከኋላ ስሜት ሰጭነት ደረጃ ለመለወጥ ወደ ቅንብሮች ይመለሱ"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"ወደ ኋላ ለመመለስ ከግራ ጀምረው ያንሸራትቱ"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"ወደ ኋላ ለመመለስ ከቀኝ ጀምረው ያንሸራቱ"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"ወደነበሩበት የመጨረሻው ማያ ገጽ ለመመለስ ከግራ ጠርዝ ወደ ማያ ገጹ መሃል ያንሸራትቱ።"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"እንዲሁም ከቀኝ ጠርዝ ወደ ማያ ገጹ መሃል በማንሸራተት ወደ መጨረሻው ማያ ገጽ መመለስ ይችላሉ። አሁኑኑ ይሞክሩት።"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ከማያ ገጹ የታችኛው ጫፍ ወደ ላይ ማንሸራተትዎን ያረጋግጡ።"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ከመልቀቅዎ በፊት ለአፍታ እንዳልቆሙ ያረጋግጡ።"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"በቀጥታ ወደ ላይ ማንሸራተትዎን ያረጋግጡ።"</string>
diff --git a/quickstep/res/values-ar/strings.xml b/quickstep/res/values-ar/strings.xml
index 65f4c30ba8..1a6597d4da 100644
--- a/quickstep/res/values-ar/strings.xml
+++ b/quickstep/res/values-ar/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"تأكّد من التمرير سريعًا من الحافة اليمنى إلى وسط الشاشة ثم ارفع إصبعك."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"تأكّد من التمرير سريعًا من أقصى الحافة اليسرى."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"تأكّد من التمرير سريعًا من الحافة اليسرى إلى وسط الشاشة ثم ارفع إصبعك."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"لقد تعلمت كيفية التمرير سريعًا من اليمين للرجوع."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"لقد تعلمت كيفية التمرير سريعًا من اليسار للرجوع. تعرّف بعد ذلك على كيفية التبديل بين التطبيقات."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"لقد أكملت التدريب على إيماءة الرجوع."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"تأكّد من عدم التمرير بالقرب من أسفل الشاشة."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"لتغيير مستوى حساسية إيماءة الرجوع، انتقِل إلى \"الإعدادات\""</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"مرِّر سريعًا من اليمين للرجوع."</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"مرِّر سريعًا من اليسار للرجوع."</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"للرجوع إلى الشاشة السابقة، مرِّر سريعًا من الحافة اليمنى إلى وسط الشاشة"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"يمكنك أيضًا الرجوع للشاشة السابقة بالتمرير سريعًا من الحافة اليسرى إلى وسط الشاشة. جرِّب ذلك الآن."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"تأكّد من التمرير سريعًا من الحافة السفلى للشاشة إلى أعلاها."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"تأكّد من عدم التوقّف قليلاً قبل رفع إصبعك."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"تأكّد من التمرير إلى الأعلى مباشرةً."</string>
diff --git a/quickstep/res/values-as/strings.xml b/quickstep/res/values-as/strings.xml
index d5e5761e12..bf61006c54 100644
--- a/quickstep/res/values-as/strings.xml
+++ b/quickstep/res/values-as/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"আপুনি স্ক্ৰীনৰ বাওঁ প্ৰান্তৰৰ পৰা সোঁ প্ৰান্তৰৰ ফালে মধ্যভাগলৈকে ছোৱাইপ কৰি এৰি দিয়াটো নিশ্চিত কৰক।"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"আপুনি সোঁ প্ৰান্তৰৰ একেবাৰে সীমাৰ পৰা ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"আপুনি স্ক্ৰীনৰ সোঁ প্ৰান্তৰৰ পৰা মধ্যভাগলৈকে ছোৱাইপ কৰি এৰি দিয়াটো নিশ্চিত কৰক।"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"বাওঁফালৰ পৰা ছোৱাইপ কৰি কেনেকৈ উভতি যাব লাগে, সেইটো আপুনি জানিলে।"</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"সোঁফালৰ পৰা ছোৱাইপ কৰি কেনেকৈ উভতি যাব লাগে, সেইটো আপুনি জানিলে। ইয়াৰ পাছত, এপ্‌ কেনেকৈ সলনি কৰিব সেয়া জানক।"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"আপুনি উভতি যাওক নিৰ্দেশটো সম্পূৰ্ণ কৰিলে।"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"আপুনি স্ক্ৰীনৰ তলৰ অংশৰ বেছি ওচৰলৈ ছোৱাইপ নকৰাটো নিশ্চিত কৰক।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"উভতি যোৱাৰ নির্দেশটোৰ সংবেদনশীলতা সলনি কৰিবলৈ ছেটিঙলৈ যাওক"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"উভতি যাবলৈ বাওঁফালৰ পৰা ছোৱাইপ কৰক"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"উভতি যাবলৈ সোঁফালৰ পৰা ছোৱাইপ কৰক"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"আপুনি পূৰ্বে থকা অন্তিম স্ক্ৰীনখনলৈ উভতি যাবলৈ স্ক্ৰীনখনৰ বাওঁ প্ৰান্তৰৰ পৰা মাজলৈ ছোৱাইপ কৰক।"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"আপুনি স্ক্ৰীনখনৰ সোঁ প্ৰান্তৰৰ পৰা মাজলৈ ছোৱাইপ কৰিও অন্তিম স্ক্ৰীনখনলৈ উভতি যাব পাৰে। এতিয়াই চেষ্টা কৰি চাওক।"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"আপুনি স্ক্ৰীনৰ তলৰ প্ৰান্তৰ পৰা ওপৰলৈ ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"আপুনি এৰি দিয়াৰ পূৰ্বে অলপো নোৰোৱাটো নিশ্চিত কৰক।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"আপুনি পোনকৈ ওপৰলৈ ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
diff --git a/quickstep/res/values-az/strings.xml b/quickstep/res/values-az/strings.xml
index 4aab9feeaf..dceab09b1d 100644
--- a/quickstep/res/values-az/strings.xml
+++ b/quickstep/res/values-az/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Ekranın sol kənarından ortasına sürüşdürüb buraxın."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Ən sağ tərəfdən sürüşdürdüyünüzə əmin olun."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Ekranın sağ kənarından ortasına sürüşdürüb buraxın."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Geri qayıtmaq üçün soldan sürüşdürmək qaydasını öyrəndiniz."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Geri qayıtmaq üçün sağdan sürüşdürmək qaydasını öyrəndiniz. Sonra tətbiqləri keçirməyi öyrənin."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Geri getmə jestini tamamladınız."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ekranın altına çox yaxın sürüşdürmədiyinizə əmin olun."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Geri qayıtma jestinin həssaslığını dəyişmək üçün Ayarlara keçin"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Geri qayıtmaq üçün soldan sürüşdürün"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Geri qayıtmaq üçün sağdan sürüşdürün"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Son ekrana qayıtmaq üçün ekranın sol kənarından ortasına doğru sürüşdürün."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Həmçinin ekranın sağ kənarından ortasına sürüşdürərək son ekrana qayıda bilərsiniz. İndi sınayın."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Ekranın aşağı kənarından yuxarı sürüşdürdüyünüzə əmin olun."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Buraxmazdan əvvəl durdurmadığınıza əmin olun."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Birbaşa yuxarı sürüşdürdüyünüzə əmin olun."</string>
diff --git a/quickstep/res/values-b+sr+Latn/strings.xml b/quickstep/res/values-b+sr+Latn/strings.xml
index bff46e8b0d..d37a640639 100644
--- a/quickstep/res/values-b+sr+Latn/strings.xml
+++ b/quickstep/res/values-b+sr+Latn/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Obavezno prevucite od leve ivice do sredine ekrana i otpustite."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Obavezno prevucite od same desne ivice."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Obavezno prevucite od desne ivice do sredine ekrana i otpustite."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Naučili ste kako da prevlačite sleva da biste se vratili."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Naučili ste kako da prevlačite zdesna da biste se vratili. Sada naučite da menjate aplikacije."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Dovršili ste pokret za povratak."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nikako ne prevlačite previše blizu dna ekrana."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Osetljivost pok. za nazad možete da promenite u Podešavanjima"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Prevucite sleva da biste se vratili"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Prevucite zdesna da biste se vratili"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Da biste se vratili na poslednji ekran, prevucite od leve ivice ka sredini ekrana."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Možete da se vratite na poslednji ekran i prevlačenjem od desne ivice ka sredini ekrana. Isprobajte."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Obavezno prevucite nagore od donje ivice ekrana."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Nikako ne stajte pre otpuštanja."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Obavezno prevucite pravo nagore."</string>
diff --git a/quickstep/res/values-be/strings.xml b/quickstep/res/values-be/strings.xml
index d5b9dc9888..e0ae63b0f1 100644
--- a/quickstep/res/values-be/strings.xml
+++ b/quickstep/res/values-be/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Пераканайцеся, што праводзіце пальцам з левага вугла ў цэнтр экрана, а потым адпускаеце."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Пераканайцеся, што вы не праводзіце пальцам занадта далёка ад правага вугла экрана."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Пераканайцеся, што праводзіце пальцам з правага вугла ў цэнтр экрана, а потым адпускаеце."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Вы даведаліся, як праводзіць пальцам злева ўправа для вяртання."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Вы даведаліся, як гартаць справа для вяртання. Цяпер даведайцеся, як пераключацца паміж праграмамі."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Вы навучыліся рабіць жэст вяртання."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Пераканайцеся, што вы не праводзіце пальцам занадта блізка да ніжняга краю экрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Каб змяніць адчувальнасць жэста вяртання, адкрыйце налады"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Каб вярнуцца назад, правядзіце пальцам ад левага краю"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Каб вярнуцца назад, правядзіце пальцам ад правага краю"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Каб вярнуцца на папярэдні экран, правядзіце пальцам ад левага краю ў цэнтр экрана."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Для вяртання на папярэдні экран таксама можна правесці ад правага краю ў цэнтр экрана. Паспрабуйце."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Пераканайцеся, што праводзіце пальцам па экране знізу ўверх."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Пераканайцеся, што не затрымліваецеся перад адпусканнем."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Пераканайцеся, што праводзіце пальцам вертыкальна."</string>
diff --git a/quickstep/res/values-bg/strings.xml b/quickstep/res/values-bg/strings.xml
index 727236de34..47317a7404 100644
--- a/quickstep/res/values-bg/strings.xml
+++ b/quickstep/res/values-bg/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Трябва да прекарате пръст от левия край на екрана до средата, след което да вдигнете пръста си."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Трябва да прекарате пръст от най-дясната част на екрана."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Трябва да прекарате пръст от десния край на екрана до средата, след което да вдигнете пръста си."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Научихте как да се връщате назад с прекарване на пръст от левия край на екрана."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Научихте жеста за връщане с плъзгане от дясно. Сега научете как се превключва между приложения."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Изпълнихте жеста за връщане назад."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Не прекарвайте пръст твърде близо до долната част на екрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Променете чувств. на жеста за връщане назад от настройките"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Връщане назад с прекарване на пръст от левия край"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Връщане назад с прекарване на пръст от десния край"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"За да се върнете на последния активен екран, прекарайте пръст от левия край на екрана до средата."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Прекарайте пръст от десния край до средата за връщане към последния екран. Изпробвайте сега."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Трябва да прекарате пръст нагоре от долния край на екрана."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Не задържайте, преди да вдигнете пръста си."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Трябва да прекарате пръст право нагоре."</string>
diff --git a/quickstep/res/values-bs/strings.xml b/quickstep/res/values-bs/strings.xml
index 72346964be..4ec2e06317 100644
--- a/quickstep/res/values-bs/strings.xml
+++ b/quickstep/res/values-bs/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Obratite pažnju da prevučete s lijevog ruba prema sredini ekrana, a zatim pustite."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Obratite pažnju da prevučete s krajnjeg desnog ruba."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Obratite pažnju da prevučete s desnog ruba prema sredini ekrana, a zatim pustite."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Naučili ste kako prevući slijeva nadesno da se vratite."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Naučili ste kako prevući zdesna da se vratite. Sljedeće naučite kako prebacivati između aplikacija."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Završili ste pokret za vraćanje."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Obratite pažnju da ne prevučete preblizu donjem dijelu ekrana."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Promijenite osjetljivost pokreta za povratak u Postavkama"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Prevucite slijeva nadesno da se vratite"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Prevucite prstom zdesna ulijevo da se vratite"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Da se vratite na posljednji ekran na kojem ste bili, prevucite od lijevog ruba do sredine ekrana."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Na posljednji ekran se možete vratiti i prevlačenjem od desnog ruba do sredine ekrana. Isprobajte."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Obratite pažnju da prevučete prema gore s donjeg ruba ekrana."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Obratite pažnju da ne zastanete prije puštanja."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Obratite pažnju da prevučete ravno prema gore."</string>
diff --git a/quickstep/res/values-ca/strings.xml b/quickstep/res/values-ca/strings.xml
index b565f3f1f9..f93051a1c0 100644
--- a/quickstep/res/values-ca/strings.xml
+++ b/quickstep/res/values-ca/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Assegura\'t de lliscar des de la vora esquerra cap al centre de la pantalla i deixa anar."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Assegura\'t de lliscar des de l\'extrem dret de la pantalla."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Assegura\'t de lliscar des de la vora dreta cap al centre de la pantalla i deixa anar."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Has après com pots lliscar des de l\'esquerra per tornar enrere."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Has après com pots lliscar des de la dreta per tornar enrere. Ara, descobreix com pots canviar d\'app."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Has completat el gest per tornar enrere."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Assegura\'t de no lliscar massa a prop de la part inferior de la pantalla."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Per canviar la sensibilitat del gest, ves a Configuració"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Llisca des de l\'esquerra per tornar enrere"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Llisca des de la dreta per tornar enrere"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Per tornar a la darrera pantalla, llisca des de l\'extrem esquerre cap al centre de la pantalla."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"També pots tornar a la darrera pantalla lliscant des de l\'extrem dret cap al centre. Prova-ho ara."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Assegura\'t de lliscar des de la vora inferior de la pantalla."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Assegura\'t de no aturar-te abans de deixar anar."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Assegura\'t de lliscar directament cap amunt."</string>
diff --git a/quickstep/res/values-cs/strings.xml b/quickstep/res/values-cs/strings.xml
index a852c768dc..b8d24cf24e 100644
--- a/quickstep/res/values-cs/strings.xml
+++ b/quickstep/res/values-cs/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Přejeďte prstem z levého okraje doprostřed obrazovky a zdvihněte prst."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Přejeďte prstem z úplného pravého okraje obrazovky."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Přejeďte prstem z pravého okraje doprostřed obrazovky a zdvihněte prst."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Naučili jste se, jak se vrátit zpět přejetím prstem zleva."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Naučili jste se, jak se vrátit zpět přejetím prstem zprava. Teď se naučíte přepínat aplikace."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Dokončili jste gesto pro přechod zpět."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Dejte pozor, abyste prstem nepřejížděli moc blízko ke spodnímu okraji obrazovky."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Citlivost gesta pro přechod zpět můžete změnit v Nastavení"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Pokud se chcete vrátit, přejeďte prstem zleva"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Přejetím prstem zprava se vrátíte zpět"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Na poslední obrazovku se můžete vrátit přejetím prstem z levého okraje doprostřed obrazovky."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Přejetím prstem z pravého okraje doprostřed obrazovky se také můžete vrátit zpět na poslední obrazovku. Zkuste to."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Přejeďte prstem nahoru z dolního okraje obrazovky."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Před zdvihnutím prstu nedělejte pauzu."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Přejeďte prstem přímo nahoru."</string>
diff --git a/quickstep/res/values-da/strings.xml b/quickstep/res/values-da/strings.xml
index 6729bfe01f..9c9d6241bf 100644
--- a/quickstep/res/values-da/strings.xml
+++ b/quickstep/res/values-da/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Stryg fra venstre kant mod midten af skærmen, og løft fingeren."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Stryg fra kanten yderst til højre."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Stryg fra højre kant mod midten af skærmen, og løft fingeren."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Du har lært, hvordan du stryger fra venstre for at gå tilbage."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Du har lært, hvordan du stryger fra højre for at gå tilbage. Nu skal du se, hvordan du skifter app."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Du har fuldført bevægelsen for Gå tilbage."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Undgå at stryge for tæt på bunden af skærmen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Juster følsomheden for bevægelsen Gå tilbage i Indstillinger"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Stryg fra venstre for at gå tilbage"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Stryg fra højre for at gå tilbage"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Stryg mod midten af skærmen fra venstre kant for at gå tilbage til den seneste skærm, du var på."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Du kan også gå tilbage til den seneste skærm ved at stryge mod midten af skærmen fra højre kant. Prøv det nu."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Stryg opad fra bunden af skærmen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Undlad at holde fingeren stille, indtil du løfter fingeren."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Stryg lige opad."</string>
diff --git a/quickstep/res/values-el/strings.xml b/quickstep/res/values-el/strings.xml
index cf26f517b2..67209b6eed 100644
--- a/quickstep/res/values-el/strings.xml
+++ b/quickstep/res/values-el/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Φροντίστε να σύρετε από το αριστερό άκρο προς το μέσο της οθόνης και απομακρύνετε το δάχτυλό σας."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Φροντίστε να σύρετε από το άκρο της δεξιάς πλευράς."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Φροντίστε να σύρετε από το δεξί άκρο προς το μέσο της οθόνης και απομακρύνετε το δάχτυλό σας."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Μάθατε πώς να σύρετε από τα αριστερά για επιστροφή."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Μάθατε πώς να σύρετε από τα δεξιά για επιστροφή. Στη συνέχεια, μάθετε πώς να κάνετε εναλλαγή εφαρμ."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ολοκληρώσατε την κίνηση επιστροφής."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Φροντίστε να μην σύρετε υπερβολικά κοντά στο κάτω μέρος της οθόνης."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Μεταβείτε στις Ρυθμίσεις για αλλαγή ευαισθ. κίνησης επιστρ."</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Για να επιστρέψετε, σύρετε από τα αριστερά"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Για να επιστρέψετε, σύρετε από τα δεξιά"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Για να επιστρέψετε στην τελευταία οθόνη, σύρετε από το αριστερό άκρο προς το κέντρο της οθόνης."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Επιστρέψτε στην τελευταία οθόνη σύροντας από τα δεξιά προς το κέντρο της οθόνης. Δοκιμάστε το τώρα."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Φροντίστε να σύρετε προς τα επάνω από το κάτω άκρο της οθόνης."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Φροντίστε να μην κάνετε παύση προτού απομακρύνετε τα δάχτυλά σας."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Φροντίστε να σύρετε απευθείας προς τα επάνω."</string>
diff --git a/quickstep/res/values-en-rAU/strings.xml b/quickstep/res/values-en-rAU/strings.xml
index 6612f18530..86ae07f5ff 100644
--- a/quickstep/res/values-en-rAU/strings.xml
+++ b/quickstep/res/values-en-rAU/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Make sure that you swipe from the left edge to the middle of the screen and let go."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Make sure that you swipe from the far-right edge."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Make sure that you swipe from the right edge to the middle of the screen and let go."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"You learned how to swipe from the left to go back."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"You learned how to swipe from the right to go back. Next, learn how to switch apps."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"You completed the go back gesture."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"To change sensitivity of the back gesture, go to Settings"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Swipe from the left to go back"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Swipe from the right to go back"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"To go back to the last screen you were on, swipe from the left edge to the middle of the screen."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"You can also go back to the last screen by swiping from the right edge to the middle of the screen. Try it now."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Make sure that you don\'t pause before letting go."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Make sure that you swipe straight up."</string>
diff --git a/quickstep/res/values-en-rCA/strings.xml b/quickstep/res/values-en-rCA/strings.xml
index 6612f18530..86ae07f5ff 100644
--- a/quickstep/res/values-en-rCA/strings.xml
+++ b/quickstep/res/values-en-rCA/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Make sure that you swipe from the left edge to the middle of the screen and let go."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Make sure that you swipe from the far-right edge."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Make sure that you swipe from the right edge to the middle of the screen and let go."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"You learned how to swipe from the left to go back."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"You learned how to swipe from the right to go back. Next, learn how to switch apps."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"You completed the go back gesture."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"To change sensitivity of the back gesture, go to Settings"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Swipe from the left to go back"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Swipe from the right to go back"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"To go back to the last screen you were on, swipe from the left edge to the middle of the screen."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"You can also go back to the last screen by swiping from the right edge to the middle of the screen. Try it now."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Make sure that you don\'t pause before letting go."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Make sure that you swipe straight up."</string>
diff --git a/quickstep/res/values-en-rGB/strings.xml b/quickstep/res/values-en-rGB/strings.xml
index 6612f18530..86ae07f5ff 100644
--- a/quickstep/res/values-en-rGB/strings.xml
+++ b/quickstep/res/values-en-rGB/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Make sure that you swipe from the left edge to the middle of the screen and let go."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Make sure that you swipe from the far-right edge."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Make sure that you swipe from the right edge to the middle of the screen and let go."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"You learned how to swipe from the left to go back."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"You learned how to swipe from the right to go back. Next, learn how to switch apps."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"You completed the go back gesture."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"To change sensitivity of the back gesture, go to Settings"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Swipe from the left to go back"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Swipe from the right to go back"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"To go back to the last screen you were on, swipe from the left edge to the middle of the screen."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"You can also go back to the last screen by swiping from the right edge to the middle of the screen. Try it now."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Make sure that you don\'t pause before letting go."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Make sure that you swipe straight up."</string>
diff --git a/quickstep/res/values-en-rIN/strings.xml b/quickstep/res/values-en-rIN/strings.xml
index 6612f18530..86ae07f5ff 100644
--- a/quickstep/res/values-en-rIN/strings.xml
+++ b/quickstep/res/values-en-rIN/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Make sure that you swipe from the left edge to the middle of the screen and let go."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Make sure that you swipe from the far-right edge."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Make sure that you swipe from the right edge to the middle of the screen and let go."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"You learned how to swipe from the left to go back."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"You learned how to swipe from the right to go back. Next, learn how to switch apps."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"You completed the go back gesture."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"To change sensitivity of the back gesture, go to Settings"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Swipe from the left to go back"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Swipe from the right to go back"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"To go back to the last screen you were on, swipe from the left edge to the middle of the screen."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"You can also go back to the last screen by swiping from the right edge to the middle of the screen. Try it now."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Make sure that you don\'t pause before letting go."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Make sure that you swipe straight up."</string>
diff --git a/quickstep/res/values-en-rXC/strings.xml b/quickstep/res/values-en-rXC/strings.xml
index 51b2caf2b6..f7663dc70c 100644
--- a/quickstep/res/values-en-rXC/strings.xml
+++ b/quickstep/res/values-en-rXC/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‎‏‎‏‎‏‎‎‎‏‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‎‎‎‎‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‎‎‎‎‏‎‎Make sure you swipe from the left edge to the middle of the screen and let go.‎‏‎‎‏‎"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‏‏‏‏‎‎‎‏‏‎‏‏‎‏‎‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‎‏‎‏‎‎‏‎‎‏‎‏‎‎‎‎‏‎Make sure you swipe from the far-right edge.‎‏‎‎‏‎"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‎‎‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‎‎Make sure you swipe from the right edge to the middle of the screen and let go.‎‏‎‎‏‎"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‏‏‎‏‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‏‏‏‏‎‎‏‏‎You learned how to swipe from the left to go back.‎‏‎‎‏‎"</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‎‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‏‎‎‏‏‏‎‏‎‏‏‏‏‏‎‎‎‏‏‏‎You learned how to swipe from the right to go back. Next up, learn how to switch apps.‎‏‎‎‏‎"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‏‎‏‎‏‏‏‎‎‎‎‎‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‏‏‎‏‏‎‎‏‏‎‎You completed the go back gesture.‎‏‎‎‏‎"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‏‎‎‎‎‏‎‎‎‏‎‏‎‎‏‎‎‏‎‎‏‎‏‏‎‎‏‎‎‎‎‏‎‏‏‎Make sure you don\'t swipe too close to the bottom of the screen.‎‏‎‎‏‎"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‎‏‏‏‎‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‏‎‎‏‏‏‏‏‎‎‏‎‎‎‏‎‎To change the sensitivity of the back gesture, go to Settings‎‏‎‎‏‎"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‎‎‎‎‏‏‎‏‏‏‏‎‎‎‎‎‎‎‎‎‏‎‏‎‎‏‎‏‎‎‎‎‏‎‎‏‎‏‏‎‎‎‎‎‏‎‎‎‏‎Swipe from the left to go back‎‏‎‎‏‎"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‎‏‏‏‎‎‏‏‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‏‎‏‎‎Swipe from the right to go back‎‏‎‎‏‎"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‏‎‏‎‎To go back to the last screen you were on, swipe from the left edge to the middle of the screen.‎‏‎‎‏‎"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‏‎‎‎‏‏‎‎‎‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‎‏‎‏‏‏‏‎‏‎You can also go back to the last screen by swiping from the right edge to the middle of the screen. Try it now.‎‏‎‎‏‎"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‏‎‏‏‎‏‎‎‏‎‎Make sure you swipe up from the bottom edge of the screen.‎‏‎‎‏‎"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‏‎‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‎‏‏‏‎‏‎‏‎Make sure you don\'t pause before letting go.‎‏‎‎‏‎"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‎‏‏‏‎‏‎‎‏‎‎‏‏‎‏‎‎‏‎‎‏‏‏‏‎‎‎‎‏‎‏‏‏‏‎‎Make sure you swipe straight up.‎‏‎‎‏‎"</string>
diff --git a/quickstep/res/values-es-rUS/strings.xml b/quickstep/res/values-es-rUS/strings.xml
index ad08b6f38f..34d43d69c5 100644
--- a/quickstep/res/values-es-rUS/strings.xml
+++ b/quickstep/res/values-es-rUS/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Asegúrate de deslizar el dedo del borde izquierdo hacia el centro de la pantalla y, luego, suéltalo."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Asegúrate de deslizar el dedo bien desde el borde derecho."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Asegúrate de deslizar el dedo del borde derecho hacia el centro de la pantalla y, luego, suéltalo."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Aprendiste cómo deslizar el dedo desde la izquierda para volver."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Aprendiste a deslizar el dedo desde la derecha para volver. Ahora, descubre cómo cambiar de app."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Completaste el gesto \"Atrás\"."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Asegúrate de no hacerlo muy cerca de la parte inferior de la pantalla."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Cambia sensibilidad de gesto \"Atrás\" en Configuración"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Para volver, desliza el dedo desde la izquierda"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Para volver, desliza el dedo desde la derecha"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Para volver a la última pantalla, desliza el dedo del borde izquierdo al centro de la pantalla."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Desliza de derecha al centro para volver a última pantalla. Pruébalo ahora."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Asegúrate de deslizar el dedo hacia arriba desde la borde inferior de la pantalla."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Asegúrate de no detenerte antes de soltarlo."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Asegúrate de deslizar el dedo derecho hacia arriba."</string>
diff --git a/quickstep/res/values-es/strings.xml b/quickstep/res/values-es/strings.xml
index 73316cfa69..c2cb08eed7 100644
--- a/quickstep/res/values-es/strings.xml
+++ b/quickstep/res/values-es/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Desliza el dedo desde el borde izquierdo de la pantalla hasta el centro y levántalo."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Desliza el dedo desde el extremo derecho."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Desliza el dedo desde el borde derecho de la pantalla hasta el centro y levántalo."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Ya sabes deslizar el dedo desde la izquierda para ir atrás."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Ya sabes deslizar el dedo desde la derecha para ir atrás. Descubre ahora cómo cambiar de aplicación."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Has completado el gesto para volver."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"No deslices el dedo demasiado cerca de la parte inferior de la pantalla."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Para cambiar la sensibilidad del gesto, ve a Ajustes"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Desliza el dedo desde la izquierda para ir atrás"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Desliza el dedo desde la derecha para ir atrás"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Para volver a la pantalla anterior, desliza el dedo desde el borde izquierdo al centro."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"También puedes ir atrás deslizando el dedo del borde derecho al centro. Pruébalo ahora."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Desliza el dedo hacia arriba desde el borde inferior de la pantalla."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"No hagas ninguna pausa antes de levantar el dedo."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Desliza el dedo directamente hacia arriba."</string>
diff --git a/quickstep/res/values-et/strings.xml b/quickstep/res/values-et/strings.xml
index aa734bcafa..88f11cdd7b 100644
--- a/quickstep/res/values-et/strings.xml
+++ b/quickstep/res/values-et/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pühkige ekraanikuva vasakust servast keskele ja eemaldage sõrm."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pühkige kindlasti parempoolsest servast."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pühkige ekraanikuva paremast servast keskele ja eemaldage sõrm."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Õppisite, kuidas tagasiliikumiseks vasakult pühkida."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Õppisite, kuidas tagasiliikumiseks paremalt pühkida. Nüüd vaadake, kuidas rakenduste vahel vahetada."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Tegite tagasiliikumise liigutuse."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Veenduge, et te ei pühiks liiga ekraanikuva allosa lähedalt."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Tagasiliigutuse tundlikkuse muutmiseks avage menüü Seaded"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Tagasiliikumiseks pühkige vasakult paremale"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Tagasiliikumiseks pühkige paremalt vasakule"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Eelmisele ekraanikuvale naasmiseks pühkige vasakust servast ekraanikuva keskele."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Eelmisele ekraanikuvale naasmiseks võite ka kuva paremast servast keskele pühkida. Proovige kohe."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pühkige kindlasti ekraanikuva alumisest servast üles."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Veenduge, et te enne vabastamist liigutust ei peataks."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pühkige kindlasti otse üles."</string>
diff --git a/quickstep/res/values-eu/strings.xml b/quickstep/res/values-eu/strings.xml
index 02fdf04fb5..19ad2f0c67 100644
--- a/quickstep/res/values-eu/strings.xml
+++ b/quickstep/res/values-eu/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Ziurtatu hatza pantailaren ezkerreko ertzetik erdialdera pasatzen eta askatzen duzula."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Ziurtatu hatza eskuineko ertzetik pasatzen duzula."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Ziurtatu hatza pantailaren eskuineko ertzetik erdialdera pasatzen eta askatzen duzula."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Hatza ezkerretik pasatuta atzera egiten ikasi duzu."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Hatza eskuinetik pasatuta atzera egiten ikasi duzu. Jarraian, ikasi aplikazioa aldatzen."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ikasi duzu atzera egiteko keinua."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ziurtatu hatza ez duzula pantailaren behealdetik gertuegi pasatzen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Keinuaren sentikortasuna aldatzeko, joan ezarpenetara"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Atzera egiteko, pasatu hatza ezkerretik"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Atzera egiteko, pasatu hatza eskuinetik"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Aurreko pantailara itzultzeko, pasatu hatza pantailaren ezkerreko ertzetik erdialdera"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Aurreko pantailara itzultzeko beste modu bat: pasatu hatza pantailaren eskuineko ertzetik erdialdera. Proba ezazu."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Ziurtatu hatza pantailaren beheko ertzetik gora pasatzen duzula."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Ziurtatu askatu aurretik ez duzula hatza gelditzen."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Ziurtatu hatza zuzen gora pasatzen duzula."</string>
diff --git a/quickstep/res/values-fa/strings.xml b/quickstep/res/values-fa/strings.xml
index 71bfa2a2c2..721b968890 100644
--- a/quickstep/res/values-fa/strings.xml
+++ b/quickstep/res/values-fa/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"دقت کنید که از لبه سمت چپ تند به وسط صفحه بکشید و رها کنید."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"دقت کنید که از ابتدای لبه سمت راست تند بکشید."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"دقت کنید که از لبه سمت راست تند به وسط صفحه بکشید و رها کنید."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"یاد گرفتید چگونه برای رفتن به عقب از سمت چپ تند بکشید."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"یاد گرفتید چگونه برای رفتن به عقب از سمت راست تند بکشید. مورد بعدی، با نحوه جابه‌جا شدن بین برنامه‌ها آشنا شوید."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"اشاره برگشتن را تکمیل کردید."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"دقت کنید که موقع تند کشیدن بیش‌از حد به پایین صفحه نزدیک نشوید."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"برای تغییر حساسیت اشاره برگشت، به «تنظیمات» بروید"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"برای برگشتن به عقب، از سمت چپ تند بکشید"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"برای رفتن به عقب، از سمت راست تند بکشید"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"برای برگشتن به آخرین صفحه‌ای که در آن بودید، از لبه سمت چپ تند به‌وسط صفحه بکشید."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"با تند کشیدن از لبه سمت راست به وسط صفحه هم می‌توانید به عقب بروید. امتحان کنید."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"دقت کنید که از لبه پایینی صفحه تند به بالا بکشید."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"دقت کنید که تا قبل‌از رها کردن، کشیدن را متوقف نکنید."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"دقت کنید که مستقیماً تند به بالا بکشید."</string>
diff --git a/quickstep/res/values-fi/strings.xml b/quickstep/res/values-fi/strings.xml
index 69cc82a063..5c19b23658 100644
--- a/quickstep/res/values-fi/strings.xml
+++ b/quickstep/res/values-fi/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pyyhkäise näytön vasemmasta reunasta keskelle ja päästä irti."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Muista pyyhkäistä aivan oikeasta reunasta."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pyyhkäise näytön oikeasta reunasta keskelle ja päästä irti."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Nyt osaat palata takaisin pyyhkäisemällä vasemmasta reunasta."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Osaat palata takaisin pyyhkäisemällä oikeasta reunasta. Opettele seuraavaksi vaihtamaan sovellusta."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Olet oppinut Takaisin-eleen."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Varo, ettet pyyhkäise liian lähellä alareunaa."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Voit muuttaa Takaisin-eleen herkkyyttä asetuksista"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Palaa takaisin pyyhkäisemällä vasemmasta reunasta"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Palaa takaisin pyyhkäisemällä oikeasta reunasta"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Voit palata edelliseen näkymään pyyhkäisemällä näytön vasemmasta reunasta keskelle."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Voit myös palata edelliseen näkymään pyyhkäisemällä näytön oikeasta reunasta keskelle. Kokeile nyt."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pyyhkäise ylös näytön alareunasta."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Varo keskeyttämästä ennen kuin päästät irti."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Muista pyyhkäistä suoraan ylöspäin."</string>
diff --git a/quickstep/res/values-fr/strings.xml b/quickstep/res/values-fr/strings.xml
index a815d5b990..2b3b6bbd4f 100644
--- a/quickstep/res/values-fr/strings.xml
+++ b/quickstep/res/values-fr/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Veillez à bien balayer l\'écran depuis le bord gauche jusqu\'au centre avant de relever le doigt."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Veillez à balayer l\'écran depuis le bord droit."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Veillez à bien balayer l\'écran depuis le bord droit jusqu\'au centre avant de relever le doigt."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Vous avez appris comment balayer l\'écran depuis la gauche pour revenir en arrière."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Vous avez appris à balayer depuis droite pour revenir en arrière. Apprenez à passer d\'une appli à l\'autre."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Vous avez appris le geste pour revenir en arrière."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Veillez à ne pas balayer l\'écran trop près du bas."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Modifiez la sensibilité du geste retour dans les paramètres"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Balayez l\'écran depuis la gauche pour revenir en arrière"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Balayez l\'écran depuis la droite pour revenir en arrière"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Pour revenir à l\'écran précédent, balayez l\'écran depuis le bord gauche jusqu\'au centre."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Pour revenir à l\'écran précédent, balayez l\'écran depuis le bord droit jusqu\'au centre. Essayez."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Veillez à balayer l\'écran du bas vers le haut."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Veillez à ne pas marquer de pause dans votre geste avant de relever le doigt."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Veillez à balayer l\'écran vers le haut."</string>
diff --git a/quickstep/res/values-gl/strings.xml b/quickstep/res/values-gl/strings.xml
index 1846efc1b3..dca7bb6dd1 100644
--- a/quickstep/res/values-gl/strings.xml
+++ b/quickstep/res/values-gl/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Asegúrate de pasar o dedo desde o bordo esquerdo ata o medio da pantalla e avanza."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Asegúrate de pasar o dedo desde o bordo dereito máis afastado."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Asegúrate de pasar o dedo desde o bordo dereito ata o medio da pantalla e avanza."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Aprendiches a pasar o dedo desde a esquerda para volver á pantalla anterior."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Aprendiches a pasar o dedo desde a dereita para volver. Agora, aprende a cambiar de aplicación."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Completaches o xesto de volver á última pantalla."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Asegúrate de non pasar o dedo demasiado preto da parte inferior da pantalla."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Podes cambiar a sensibilidade do xesto en Configuración"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Pasa o dedo desde a esquerda para volver"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Pasar o dedo desde a dereita para volver á pantalla anterior"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Para volver á última pantalla, pasa o dedo desde o bordo esquerdo ata a metade da pantalla."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Tamén podes volver pasando o dedo desde o bordo dereito ata a metade da pantalla. Próbao agora."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Asegúrate de pasar o dedo cara arriba desde o bordo inferior da pantalla."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Asegúrate de non facer unha pausa antes de avanzar."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Asegúrate de pasar o dedo cara arriba cun movemento vertical."</string>
diff --git a/quickstep/res/values-hi/strings.xml b/quickstep/res/values-hi/strings.xml
index b96dbe2767..cb3022a3e5 100644
--- a/quickstep/res/values-hi/strings.xml
+++ b/quickstep/res/values-hi/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"देख लें कि आप स्क्रीन के बाएं किनारे से बीचों-बीच तक स्वाइप कर रहे हों और फिर अपनी उंगली उठा लें."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"देख लें कि आप स्क्रीन की दाईं तरफ़ के बिल्कुल किनारे से स्वाइप कर रहे हों."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"देख लें कि आप स्क्रीन के दाएं किनारे से बीचों-बीच तक स्वाइप कर रहे हों और फिर अपनी उंगली उठा लें."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"आपने स्क्रीन के बाएं किनारे से स्वाइप करके, पिछली स्क्रीन पर वापस जाने का तरीका सीख लिया है."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"आपने स्क्रीन के दाएं किनारे से स्वाइप करके, पिछली स्क्रीन पर वापस जाने का तरीका सीख लिया है. अब, एक ऐप्लिकेशन से दूसरे ऐप्लिकेशन पर जाने का तरीका जानें."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"आपने पेज पर पीछे ले जाने वाले हाथ के जेस्चर (हाव-भाव) के बारे में जान लिया है."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"देखे लें कि आप स्क्रीन पर बिल्कुल नीचे तक स्वाइप न कर रहे हों."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"\'सेटिंग\' में जाकर, पीछे जाने के लिए इस्तेमाल होने वाले हाथ के जेस्चर (हाव-भाव) की संवेदनशीलता बदलें"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"वापस जाने के लिए, स्क्रीन के बाएं किनारे से स्वाइप करें"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"वापस जाने के लिए, स्क्रीन के दाएं किनारे से स्वाइप करें"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"पिछली स्क्रीन पर वापस जाने के लिए, स्क्रीन के बाएं किनारे से बीचों-बीच तक स्वाइप करें."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"आप स्क्रीन के दाएं किनारे से बीचों-बीच तक स्वाइप करके भी पिछली स्क्रीन पर जा सकते हैं. इसे अभी आज़माएं."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"देख लें कि आप स्क्रीन के निचले किनारे से ऊपर की ओर स्वाइप कर रहे हों."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"देख लें कि आप स्क्रीन से अपनी उंगली उठाने से पहले, इसे कहीं न रोक रहे हों."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"देख लें कि आप ऊपर की ओर बिल्कुल सीधे स्वाइप कर रहे हों."</string>
diff --git a/quickstep/res/values-hr/strings.xml b/quickstep/res/values-hr/strings.xml
index d64f821e9e..0e3444ade3 100644
--- a/quickstep/res/values-hr/strings.xml
+++ b/quickstep/res/values-hr/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pazite da prijeđete prstom od lijevog ruba do sredine zaslona i podignite prst."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pazite da prijeđete prstom od krajnjeg desnog ruba."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pazite da prijeđete prstom od desnog ruba do sredine zaslona i podignite prst."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Naučili ste kako prijeći prstom slijeva udesno da biste se vratili."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Naučili ste kako prijeći prstom zdesna ulijevo da biste se vratili. Sad saznajte kako promijeniti aplikaciju."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Izvršili ste pokret za povratak."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pazite da ne prijeđete prstom preblizu dnu zaslona."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Osjetljivost pokreta povratka promijenite u postavkama"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Prijeđite prstom slijeva udesno da biste se vratili"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Prijeđite prstom zdesna ulijevo da biste se vratili"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Da biste se vratili na posljednji posjećeni zaslon, prijeđite od lijevog ruba do sredine zaslona."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Na posljednji se zaslon možete vratiti i prelaskom od desnog ruba do sredine zaslona. Isprobajte odmah."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pazite da prijeđete prstom prema gore od donjeg ruba zaslona."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pazite da ne zastanete prije podizanja prsta."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pazite da prijeđete prstom ravno prema gore."</string>
diff --git a/quickstep/res/values-hu/strings.xml b/quickstep/res/values-hu/strings.xml
index 90e4ea7b44..5289af1891 100644
--- a/quickstep/res/values-hu/strings.xml
+++ b/quickstep/res/values-hu/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Csúsztasson a képernyő bal széléről a képernyő közepéig, és engedje el a képernyőt."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Csúsztasson a képernyő jobb széléről."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Csúsztasson a képernyő jobb széléről a képernyő közepéig, és engedje el a képernyőt."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Megtanulta, hogyan léphet vissza balról csúsztatva."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Megtanulta, hogyan léphet vissza jobbról csúsztatva. A következő az appok közötti váltás."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Teljesítette a visszalépési kézmozdulatot."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ne csúsztasson túl közel a képernyő aljához."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"A vissza mozdulat érzékenysége a Beállításokban módosítható"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"A visszalépéshez csúsztasson balról jobbra"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"A visszalépéshez csúsztasson jobbról balra"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Ha visszatérne a legutóbbi képernyőre, csúsztasson a képernyő közepére a bal szélétől."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"A képernyő jobb széléről a közepéig csúsztatva is visszatérhet a legutóbbi képernyőre. Próbálja ki."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Csúsztasson felfelé a képernyő aljától."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Ne álljon meg, mielőtt elengedi a képernyőt."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Csúsztasson egyenesen felfelé."</string>
diff --git a/quickstep/res/values-hy/strings.xml b/quickstep/res/values-hy/strings.xml
index 3373fe6ad3..e4d9991b40 100644
--- a/quickstep/res/values-hy/strings.xml
+++ b/quickstep/res/values-hy/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Սահեցրեք մատն էկրանի ձախ եզրից դեպի կենտրոն և բաց թողեք։"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Համոզվեք, որ մատը սահեցնում եք էկրանի աջ եզրից։"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Սահեցրեք մատն էկրանի աջ եզրից դեպի կենտրոն և բաց թողեք։"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Դուք սովորեցիք՝ ինչպես մատը ձախից սահեցնելով հետ գնալ"</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Դուք սովորեցիք՝ ինչպես մատը աջից սահեցնելով հետ գնալ։ Այժմ սովորենք՝ ինչպես անցնել մի հավելվածից մյուսը։"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Դուք սովորեցիք հետ գնալու ժեստը։"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Համոզվեք, որ մատը չափազանց մոտ չեք սահեցնում էկրանին ներքևի հատվածին։"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Հետ գնալու ժեստի զգայունությունը փոփոխեք կարգավորումներում"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Սահեցրեք մատը ձախից՝ հետ գնալու համար"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Սահեցրեք մատը աջից՝ հետ գնալու համար"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Վերջին էկրան վերադառնալու համար էկրանի եզրից մատը սահեցրեք դեպի կենտրոն։"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Անցեք վերջին էկրան՝ էկրանի աջ եզրից մատը սահեցնելով դեպի կենտրոն։ Փորձեք հիմա։"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Համոզվեք, որ մատն էկրանի ներքևի եզրից վերև եք սահեցնում։"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Համոզվեք, որ դադար չեք տալիս նախքան բաց թողնելը։"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Համոզվեք, որ մատն ուղիղ վերև եք սահեցնում։"</string>
diff --git a/quickstep/res/values-in/strings.xml b/quickstep/res/values-in/strings.xml
index 122f6b817b..d6802d401f 100644
--- a/quickstep/res/values-in/strings.xml
+++ b/quickstep/res/values-in/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pastikan Anda menggeser dari tepi kiri ke tengah layar, lalu lepaskan."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pastikan Anda menggeser dari tepi ujung kanan."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pastikan Anda menggeser dari tepi kanan ke tengah layar, lalu lepaskan."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Anda telah belajar cara geser dari kiri untuk kembali."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Anda telah belajar cara geser dari kanan untuk kembali. Berikutnya, pelajari cara beralih aplikasi."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Anda telah menyelesaikan gestur kembali."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pastikan Anda tidak menggeser terlalu dekat ke bagian bawah layar."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Untuk mengubah sensitivitas gestur kembali, buka Setelan"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Geser dari kiri untuk kembali"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Geser dari kanan untuk kembali"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Untuk kembali ke layar terakhir yang Anda buka, geser dari tepi kiri ke tengah layar."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Geser dari tepi kanan ke tengah layar untuk kembali ke layar terakhir. Coba sekarang."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pastikan Anda menggeser ke atas dari tepi bawah layar."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pastikan Anda tidak menjeda sebelum melepaskan."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pastikan Anda menggeser lurus ke atas."</string>
diff --git a/quickstep/res/values-is/strings.xml b/quickstep/res/values-is/strings.xml
index d79cb4af71..5928bdfce4 100644
--- a/quickstep/res/values-is/strings.xml
+++ b/quickstep/res/values-is/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Passaðu að strjúka frá vinstri brún skjásins að miðju hans og sleppa svo."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Passaðu að strjúka frá jaðri hægri brúnar."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Passaðu að strjúka frá hægri brún skjásins að miðju hans og sleppa svo."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Þú lærðir að strjúka frá vinstri til að bakka."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Þú lærðir að strjúka frá hægri til að bakka. Næst skaltu læra hvernig þú skiptir á milli forrita."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Þú laukst við að kynna þér bendinguna „til baka“."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Passaðu að strjúka ekki of nálægt neðri brún skjásins."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Til að breyta næmi til baka-bendingar ferðu í stillingar"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Strjúktu frá vinstri til að fara til baka"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Strjúktu frá hægri til að fara til baka"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Strjúktu frá vinstri brún að miðju skjásins til að fara aftur á síðasta skjá sem var opinn."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Þú getur líka farið á síðasta skjá með því að strjúka frá hægri brún að miðju skjásins. Prófa núna."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Passaðu að strjúka upp frá neðri brún skjásins."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Passaðu að stoppa ekki áður en þú sleppir."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Passaðu að strjúka beint upp."</string>
diff --git a/quickstep/res/values-it/strings.xml b/quickstep/res/values-it/strings.xml
index 51443b80f3..ea7454ae3c 100644
--- a/quickstep/res/values-it/strings.xml
+++ b/quickstep/res/values-it/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Assicurati di scorrere dal bordo sinistro verso il centro dello schermo e solleva il dito."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Assicurati di scorrere dall\'estremità del bordo destro."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Assicurati di scorrere dal bordo destro verso il centro dello schermo e solleva il dito."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Hai imparato a scorrere da sinistra per tornare indietro."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Hai imparato a scorrere da destra per tornare indietro. Ora impara come passare da un\'app all\'altra."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Hai completato il gesto Indietro."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Assicurati di non scorrere troppo vicino alla parte inferiore dello schermo."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Usa Impostazioni per cambiare sensibilità del gesto Indietro"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Scorri da sinistra per tornare indietro"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Scorri da destra per tornare indietro"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Per tornare all\'ultima schermata mostrata, scorri dal bordo sinistro verso il centro dello schermo."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Puoi anche tornare all\'ultima schermata scorrendo da bordo destro verso centro dello schermo. Prova."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Assicurati di scorrere verso l\'alto dal bordo inferiore dello schermo."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Assicurati di non fare pause prima di sollevare il dito."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Assicurati di scorrere verso l\'alto senza fermarti."</string>
diff --git a/quickstep/res/values-iw/strings.xml b/quickstep/res/values-iw/strings.xml
index 6a641e4e20..5b89d2c3db 100644
--- a/quickstep/res/values-iw/strings.xml
+++ b/quickstep/res/values-iw/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"חשוב להקפיד להחליק מהקצה הימני למרכז המסך ואז לשחרר."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"חשוב להקפיד להחליק מהקצה השמאלי."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"חשוב להקפיד להחליק מהקצה השמאלי למרכז המסך ואז לשחרר."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"למדת איך להחליק מצד שמאל כדי לחזור אחורה."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"למדת איך להחליק מצד ימין כדי לחזור אחורה. בשלב הבא לומדים איך לעבור בין אפליקציות."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"השלמת את תנועת \'הקודם\'."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"חשוב להקפיד שלא להחליק קרוב מדי לתחתית המסך."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"כדי לשנות את מידת הרגישות של תנועת החזרה, יש לעבור להגדרות"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"יש להחליק מצד שמאל כדי לחזור למסך הקודם"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"יש להחליק מצד ימין כדי לחזור אחורה"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"כדי לחזור למסך הקודם, יש להחליק מהקצה השמאלי של המסך אל המרכז."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"בנוסף, אפשר לחזור למסך הקודם בהחלקה מהקצה הימני של המסך אל המרכז. רוצה לנסות עכשיו?"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"חשוב להקפיד להחליק למעלה מהקצה התחתון של המסך."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"חשוב לוודא שלא מחכים לפני שמשחררים."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"חשוב להקפיד להחליק ישר למעלה."</string>
diff --git a/quickstep/res/values-ja/strings.xml b/quickstep/res/values-ja/strings.xml
index bdc301a7e6..0c2a03b64e 100644
--- a/quickstep/res/values-ja/strings.xml
+++ b/quickstep/res/values-ja/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"画面の左端から中央に向かってスワイプし、指を離してください。"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"一番右端からスワイプしてください。"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"画面の右端から中央に向かってスワイプし、指を離してください。"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"左側からスワイプして前の画面に戻る方法を学習しました。"</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"右側からスワイプして前の画面に戻る方法を学習しました。次は、アプリを切り替える方法を覚えましょう。"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"「戻る」操作を完了しました。"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"スワイプする際は画面の下部に近づきすぎないようにしましょう。"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"「戻る」操作の感度を変更するには [設定] に移動します"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"左端からスワイプすると前の画面に戻ります"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"右側からスワイプすると前の画面に戻ります"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"直前の画面に戻るには、画面の左端から中央に向かってスワイプします。"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"画面の右端から中央に向かってスワイプして直前の画面に戻ることもできます。では、やってみましょう。"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"画面の下端から上にスワイプしてください。"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"指を離す前にいったん止めないでください。"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"まっすぐ上にスワイプしてください。"</string>
diff --git a/quickstep/res/values-ka/strings.xml b/quickstep/res/values-ka/strings.xml
index 6c879a568a..15c86b47f5 100644
--- a/quickstep/res/values-ka/strings.xml
+++ b/quickstep/res/values-ka/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"გადაფურცლეთ მარცხენა კიდიდან ეკრანის ცენტრისკენ და თითი აუშვით."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"არ გადაფურცლოთ მარჯვენა კიდის ბოლოდან."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"გადაფურცლეთ მარჯვენა კიდიდან ეკრანის ცენტრისკენ და თითი აუშვით."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"თქვენ ისწავლეთ მარცხნიდან გადაფურცვლა უკან დასაბრუნებლად."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"თქვენ ისწავლეთ მარჯვნიდან გადაფურცვლა უკან დასაბრუნებლად. ახლა კი შეიტყვეთ, როგორ გადართოთ აპები."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"თქვენ შეასრულეთ უკან დაბრუნების ჟესტი."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"არ გადაფურცლოთ ეკრანის ბოლოსთან ახლოს."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"დაბრუნების ჟესტის მგრძნობელობის შესაცვლელად გადადით პარამეტრებზე"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"უკან დასაბრუნებლად გადაფურცლეთ მარცხნიდან"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"უკან დასაბრუნებლად გადაფურცლეთ მარჯვნიდან"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"ბოლო ნანახ ეკრანზე დასაბრუნებლად გადაფურცლეთ მარცხენა კიდიდან ეკრანის ცენტრისკენ."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"ასევე შეგიძლიათ, დაბრუნდეთ ბოლო ეკრანზე მარჯვენა კიდიდან ეკრანის შუისკენ გადაფურცვლით. ცადეთ ახლავე."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"გადაფურცლეთ ეკრანის ქვედა კიდიდან ზემოთ."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"არ დააპაუზოთ თითის აშვებამდე."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"გადაფურცლეთ ზემოთ."</string>
diff --git a/quickstep/res/values-kk/strings.xml b/quickstep/res/values-kk/strings.xml
index 5daf4666b6..292f4cb037 100644
--- a/quickstep/res/values-kk/strings.xml
+++ b/quickstep/res/values-kk/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Экранның сол жақ шетінен ортасына қарай сырғытыңыз да, жіберіңіз."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Оң жақтағы ең шеткі нүктеден бастап сырғытыңыз."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Экранның оң жақ шетінен ортасына қарай сырғытыңыз да, жіберіңіз."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Солдан оңға сырғыту арқылы артқа қайтуды үйрендіңіз."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Оңнан солға сырғыту арқылы артқа қайтуды үйрендіңіз. Енді қолданбаларды ауыстыруды үйреніңіз."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Артқа қайту қимылын аяқтадыңыз."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Саусағыңызбен сырғыту кезінде экранның төменгі жағына тым жақындамаңыз."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Артқа қайту қимылы сезгіштігін параметрлерден өзгертіңіз."</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Артқа қайту үшін солдан оңға сырғытыңыз."</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Артқа қайту үшін оңнан солға сырғытыңыз"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Соңғы ашылған экранға оралу үшін экранның сол жағынан ортасына сырғытыңыз."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Экранның оң жағынан ортасына сырғыту арқылы соңғы ашылған экранға орала аласыз. Қазір істеп көріңіз."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Экранның төменгі шетінен жоғары қарай сырғытыңыз."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Жіберер алдында кідіріс жасамаңыз."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Тігінен жоғары қарай сырғытыңыз."</string>
diff --git a/quickstep/res/values-km/strings.xml b/quickstep/res/values-km/strings.xml
index 337c308184..2e8a5c400e 100644
--- a/quickstep/res/values-km/strings.xml
+++ b/quickstep/res/values-km/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ត្រូវប្រាកដថា​អ្នកអូសពី​គែមខាងឆ្វេង​ទៅផ្នែកកណ្ដាល​នៃអេក្រង់ រួច​ដកដៃ​។"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ត្រូវប្រាកដថា​អ្នកអូសពី​ចុងគែម​ខាងស្ដាំ​។"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ត្រូវប្រាកដថា​អ្នកអូសពី​គែមខាងស្ដាំ​ទៅផ្នែកកណ្ដាល​នៃអេក្រង់ រួច​ដកដៃ​។"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"អ្នក​បានស្វែងយល់​ពីរបៀប​អូសពី​ខាងឆ្វេង ដើម្បី​ថយក្រោយ។"</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"អ្នកបានស្វែងយល់ពីរបៀបអូសពីខាងស្ដាំ ដើម្បីថយក្រោយ។ បន្ទាប់​ទៀត សូមស្វែងយល់​ពីរបៀប​ប្ដូរកម្មវិធី​។"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"អ្នក​បានបញ្ចប់​ចលនា​ថយក្រោយ​ហើយ។"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ត្រូវប្រាកដថា​អ្នកមិនអូស​ទៅជិត​ផ្នែកខាងក្រោម​នៃអេក្រង់ពេក​។"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ដើម្បីប្ដូរកម្រិត​រំញោចនឹង​ចលនាថយក្រោយ សូមចូលទៅកាន់​ការកំណត់"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"អូសពីខាងឆ្វេងដើម្បីថយក្រោយ"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"អូសពីខាងស្ដាំ​ដើម្បីថយក្រោយ"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"ដើម្បីត្រឡប់ទៅ​អេក្រង់ចុងក្រោយ​ដែលអ្នកបានចូល សូមអូសពី​គែមខាងឆ្វេង​ទៅផ្នែកកណ្ដាល​នៃអេក្រង់។"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"អ្នកក៏អាចត្រឡប់ទៅអេក្រង់ចុងក្រោយបានផងដែរ ដោយអូសពីគែមខាងស្ដាំទៅផ្នែកកណ្ដាលនៃអេក្រង់។ សាកល្បង​ឥឡូវនេះ។"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ត្រូវប្រាកដថា​អ្នកអូសឡើងលើ​ពីគែមខាងក្រោម​នៃអេក្រង់​។"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ត្រូវប្រាកដថា​អ្នកមិនផ្អាក មុនពេល​ដកដៃ​។"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ត្រូវប្រាកដថា​អ្នកអូស​ត្រង់ឡើងលើ​។"</string>
diff --git a/quickstep/res/values-kn/strings.xml b/quickstep/res/values-kn/strings.xml
index 1ebdea2106..53de55ae7f 100644
--- a/quickstep/res/values-kn/strings.xml
+++ b/quickstep/res/values-kn/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ಎಡ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ ಹಾಗೂ ನಿಮ್ಮ ಬೆರಳನ್ನು ಮೇಲೆತ್ತಿ."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ನೀವು ದೂರದ ಬಲ ಅಂಚಿನಿಂದ ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ಬಲ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ ಹಾಗೂ ನಿಮ್ಮ ಬೆರಳನ್ನು ಮೇಲೆತ್ತಿ."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"ಹಿಂದಕ್ಕೆ ಹೋಗಲು ಎಡದಿಂದ ಸ್ವೈಪ್ ಮಾಡುವುದು ಹೇಗೆಂದು ನೀವು ಕಲಿತಿರಿ."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ಹಿಂದಕ್ಕೆ ಹೋಗಲು ಬಲದಿಂದ ಸ್ವೈಪ್ ಮಾಡುವುದು ಹೇಗೆಂದು ನೀವು ಕಲಿತಿರಿ. ಮುಂದೆ, ಆ್ಯಪ್‌ಗಳನ್ನು ಬದಲಿಸುವುದು ಹೇಗೆಂದು ತಿಳಿಯಿರಿ."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ನೀವು ಗೋ ಬ್ಯಾಕ್ ಗೆಸ್ಚರ್ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದ್ದೀರಿ."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ನೀವು ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಭಾಗಕ್ಕೆ ಹೆಚ್ಚು ಹತ್ತಿರ ಸ್ವೈಪ್ ಮಾಡದಂತೆ ನೋಡಿಕೊಳ್ಳಿ."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ಬ್ಯಾಕ್ ಗೆಸ್ಚರ್‌ನ ಸೂಕ್ಷ್ಮತೆ ಬದಲಾಯಿಸಲು, ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಹೋಗಿ"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"ಹಿಂದಕ್ಕೆ ಹೋಗಲು ಎಡದಿಂದ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"ಹಿಂದಕ್ಕೆ ಹೋಗಲು ಬಲದಿಂದ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"ಈ ಮೊದಲು ನೀವಿದ್ದ ಕೊನೆಯ ಸ್ಕ್ರೀನ್‌ಗೆ ಹಿಂತಿರುಗಲು, ಎಡ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"ಬಲ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿಯೂ ನೀವು ಕೊನೆಯ ಸ್ಕ್ರೀನ್‌ಗೆ ಹೋಗಬಹುದು. ಇದನ್ನು ಈಗಲೇ ಪ್ರಯತ್ನಿಸಿ."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಗಿನ ಅಂಚಿನಿಂದ ನೀವು ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ವಿರಾಮಗೊಳಿಸದೆ ನಿಮ್ಮ ಬೆರಳನ್ನು ಸ್ಕ್ರೀನ್‌ನಿಂದ ಮೇಲೆತ್ತಿ."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ನೀವು ನೇರವಾಗಿ ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
diff --git a/quickstep/res/values-ko/strings.xml b/quickstep/res/values-ko/strings.xml
index 6e6f872684..b31dba9735 100644
--- a/quickstep/res/values-ko/strings.xml
+++ b/quickstep/res/values-ko/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"왼쪽 가장자리에서 화면 중앙으로 스와이프한 후 손가락을 떼세요."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"오른쪽 가장자리 끝에서 스와이프하세요."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"오른쪽 가장자리에서 화면 중앙으로 스와이프한 후 손가락을 떼세요."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"왼쪽에서 스와이프하여 뒤로 돌아가는 방법을 배웠습니다."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"오른쪽에서 스와이프하여 뒤로 돌아가는 방법을 배웠습니다. 이번에는 앱 전환 방법을 알아보겠습니다."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"돌아가기 동작을 완료했습니다."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"화면 하단에 지나치게 가까운 곳에서 스와이프하면 안 됩니다."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"돌아가기 동작의 민감도를 변경하려면 설정으로 이동하세요"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"왼쪽에서 스와이프하여 뒤로 돌아가세요"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"돌아가려면 오른쪽에서 스와이프하세요"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"마지막 화면으로 돌아가려면 왼쪽 가장자리에서 화면 중앙으로 스와이프하세요"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"오른쪽 가장자리에서 화면 중앙으로 스와이프해도 마지막 화면으로 돌아갈 수도 있습니다. 지금 동작을 취해 보세요"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"화면 하단 가장자리에서 위로 스와이프하세요."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"손가락을 떼기 전에 멈추지 않아야 합니다."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"위로 똑바르게 스와이프하세요."</string>
diff --git a/quickstep/res/values-ky/strings.xml b/quickstep/res/values-ky/strings.xml
index 3d6913a96b..eb19e13102 100644
--- a/quickstep/res/values-ky/strings.xml
+++ b/quickstep/res/values-ky/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Экранды сол жагынан ортосуна карай сүрүп, манжаңызды алыңыз."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Экранды эң четинен оңдой солго карай сүрүңүз."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Экранды оң жагынан ортосуна карай сүрүп, манжаңызды алыңыз."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Артка кайтуу үчүн экранды солдон оңго карай сүрүүнү үйрөндүңүз."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Артка кайтуу үчүн экранды оңдон солго карай сүрүүнү үйрөндүңүз. Эми колдонмолорду которуштурганды үйрөнүп алыңыз."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"\"Артка\" жаңсоосу боюнча үйрөткүчтү бүтүрдүңүз."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Манжаңызды экрандын ылдый жагына өтө жакындатпай сүрүңүз."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"\"Артка\" жаң-нун сезгичтигин өзгөртүү үчүн Жөндөөлөргө өтүңүз"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Артка кайтуу үчүн экранды солдон оңго карай сүрүңүз"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Артка кайтуу үчүн экранды оңдон солго карай сүрүңүз"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Акыркы экранга кайтуу үчүн экранды сол жагынан ортосуна карай сүрүңүз."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Акыркы экранга кайтуу үчүн экранды оң жагынан ортосуна карай сүрүңүз. Азыр байкап көрүңүз."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Экранды ылдыйдан өйдө карай сүрүңүз."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Манжаңызды алганга чейин токтотпоңуз."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Экранды өйдө карай сүрүңүз."</string>
diff --git a/quickstep/res/values-lo/strings.xml b/quickstep/res/values-lo/strings.xml
index 8464d805fa..b6944eb230 100644
--- a/quickstep/res/values-lo/strings.xml
+++ b/quickstep/res/values-lo/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ກະລຸນາກວດສອບວ່າທ່ານປັດຈາກຂອບຊ້າຍໄປຫາທາງກາງຂອງຈໍແລ້ວປ່ອຍ."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ກະລຸນາກວດສອບວ່າທ່ານປັດຈາກຂອບຂວາສຸດ."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ກະລຸນາກວດສອບວ່າທ່ານປັດຈາກຂອບຂວາໄປຫາທາງກາງຂອງຈໍແລ້ວປ່ອຍ."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"ທ່ານຮຽນຮູ້ວິທີປັດຈາກຊ້າຍເພື່ອກັບຄືນແລ້ວ."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ທ່ານຮຽນຮູ້ວິທີປັດຈາກຂວາເພື່ອກັບຄືນແລ້ວ. ຕໍ່ໄປ, ມາສຶກສາວິທີສະຫຼັບແອັບ."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ທ່ານໃຊ້ທ່າທາງກັບຄືນສຳເລັດແລ້ວ."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ກະລຸນາກວດສອບວ່າທ່ານບໍ່ໄດ້ປັດໃກ້ກັບທາງລຸ່ມຂອງໜ້າຈໍເກີນໄປ."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ເພື່ອປ່ຽນຄວາມລະອຽດອ່ອນຂອງທ່າທາງກັບຄືນ, ໃຫ້ໄປຫາການຕັ້ງຄ່າ"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"ປັດຈາກຊ້າຍເພື່ອກັບຄືນ"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"ປັດຈາກຂວາເພື່ອກັບຄືນ"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"ເພື່ອກັບຄືນໄປໜ້າຈໍຫຼ້າສຸດທີ່ທ່ານໃຊ້, ໃຫ້ປັດຈາກຂອບຊ້າຍໄປຫາກາງຈໍ."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"ທ່ານສາມາດກັບໄປຫາໜ້າຈໍຫຼ້າສຸດໄດ້ໂດຍການປັດຈາກຂອບຂວາໄປຫາກາງຈໍ. ລອງໃຊ້ມັນດຽວນີ້."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ກະລຸນາກວດສອບວ່າທ່ານປັດຂຶ້ນຈາກຂອບລຸ່ມສຸດຂອງໜ້າຈໍ."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ກະລຸນາກວດສອບວ່າທ່ານບໍ່ຢຸດຊົ່ວຄາວກ່ອນປ່ອຍນິ້ວ."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ກະລຸນາກວດສອບວ່າທ່ານປັດຂຶ້ນໄປຊື່ໆ."</string>
diff --git a/quickstep/res/values-lt/strings.xml b/quickstep/res/values-lt/strings.xml
index b1451a8693..d1c08f9a9e 100644
--- a/quickstep/res/values-lt/strings.xml
+++ b/quickstep/res/values-lt/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Turite perbraukti nuo kairiojo krašto link ekrano vidurio ir pakelti pirštą."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Turite perbraukti nuo dešiniojo krašto."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Turite perbraukti nuo dešiniojo krašto link ekrano vidurio ir pakelti pirštą."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Išmokote, kaip sugrįžti perbraukiant iš kairės."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Išmokote, kaip sugrįžti perbraukiant iš dešinės. Toliau sužinosite, kaip perjungti programas."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Atlikote grįžimo atgal gestą."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nebraukite per arti ekrano apačios."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Norėd. pak. grįžimo gesto jautr., eikite į sk. „Nustatymai“"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Perbraukite iš kairės, kad grįžtumėte"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Perbraukite iš dešinės, kad grįžtumėte"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Norėdami grįžti į ankstesnį ekraną, kuriame lankėtės, perbraukite nuo kairiojo krašto link ekrano vidurio."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Į ankst. ekr. taip pat galite grįžti, perbraukdami nuo dešiniojo kr. link ekr. vidurio. Išb. dabar."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Turite perbraukti aukštyn nuo apatinio ekrano krašto."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Nepristabdykite prieš pakeldami pirštą."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Turite tiesiai perbraukti aukštyn."</string>
diff --git a/quickstep/res/values-lv/strings.xml b/quickstep/res/values-lv/strings.xml
index 2e6b1da319..e825a4e77a 100644
--- a/quickstep/res/values-lv/strings.xml
+++ b/quickstep/res/values-lv/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Jāvelk no ekrāna kreisās malas uz vidu un jāatlaiž."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Jāvelk no pašas labās malas."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Jāvelk no ekrāna labās malas uz vidu un jāatlaiž."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Jūs esat apguvis, kā vilkt no kreisās malas, lai pārietu atpakaļ."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Jūs esat apguvis, kā vilkt no labās malas, lai pārietu atpakaļ. Tagad mācieties pārslēgt lietotnes."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Jūs sekmīgi veicāt atgriešanās žestu."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nevelciet pārāk tuvu ekrāna apakšdaļai."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Atgriešanās žesta jutīguma līmeni varat mainīt iestatījumos."</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Lai pārietu atpakaļ, velciet no kreisās malas."</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Lai atgrieztos, velciet no labās malas"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Lai pārietu atpakaļ uz pēdējo izmantoto ekrānu, velciet no kreisās malas uz ekrāna vidu."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Varat arī pāriet atpakaļ uz pēdējo ekrānu, velkot no labās malas uz ekrāna vidu. Izmēģiniet tūlīt!"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Jāvelk augšup no ekrāna apakšmalas."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pirms atlaišanas nepārtrauciet kustību."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Jāvelk tieši uz augšu."</string>
diff --git a/quickstep/res/values-mk/strings.xml b/quickstep/res/values-mk/strings.xml
index 011d5cedc2..1b924130da 100644
--- a/quickstep/res/values-mk/strings.xml
+++ b/quickstep/res/values-mk/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Повлечете од левиот раб кон средината на екранот и пуштете."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Повлечете од подалечниот десен агол."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Повлечете од десниот раб кон средината на екранот и пуштете."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Научивте како да повлекувате одлево за да одите назад."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Научивте како да повлекувате оддесно за да одите назад. Следно, дознајте како да се префрлате помеѓу апликации."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Завршивте со упатството за враќање назад."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Не повлекувајте преблиску до долниот раб на екранот."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"За да ја промените чувствителноста, одете во „Поставки“"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Повлечете одлево за да се вратите назад"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Повлечете оддесно за да се вратите назад"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"За да се вратите на последниот екран на кој бевте, повлечете од левиот раб кон средината на екранот."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Може да се вратите на последниот екран и со повлекување од десниот раб кон средината. Пробајте."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Повлечете нагоре од долниот раб на екранот."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Не правете пауза пред да пуштите."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Повлечете право нагоре."</string>
diff --git a/quickstep/res/values-mn/strings.xml b/quickstep/res/values-mn/strings.xml
index c292abdf51..43d9a27cc3 100644
--- a/quickstep/res/values-mn/strings.xml
+++ b/quickstep/res/values-mn/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Та дэлгэцийн зүүн булангаас дунд хэсэг хүртэл шударч, суллаарай."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Та баруун захын булангаас шударна уу."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Та дэлгэцийн баруун булангаас дунд хэсэг хүртэл шударч, суллаарай."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Та буцахын тулд зүүнээс хэрхэн шудрахыг мэдэж авлаа."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Та буцахын тулд баруунаас хэрхэн шудрахыг мэдэж авлаа Дараа нь аппыг хэрхэн сэлгэхийг мэдэж аваарай."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Та буцах зангааг гүйцэтгэлээ."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Та дэлгэцийн доод хэсэгтэй хэт ойр бүү шудраарай."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Буцах зангааны мэдрэгшлийг өөрчлөх бол Тохиргоо руу очно уу"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Буцахын тулд зүүн талаас шударна уу"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Буцахын тулд баруун талаас шударна уу"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Та байсан сүүлийн дэлгэц рүүгээ буцахын тулд дэлгэцийн зүүн булангаас дунд хэсэг рүү шударна уу."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Та мөн дэлгэцийн баруунаас дунд хэсэг рүү шударснаар сүүлийн дэлгэц рүү буцаж болно. Одоо туршина уу"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Та дэлгэцийн доод булангаас дээш шударна уу."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Та суллахаасаа өмнө түр зогсоож болохгүй."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Та чигээрээ шударна уу."</string>
diff --git a/quickstep/res/values-ms/strings.xml b/quickstep/res/values-ms/strings.xml
index af39275338..aa81471e35 100644
--- a/quickstep/res/values-ms/strings.xml
+++ b/quickstep/res/values-ms/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pastikan anda meleret dari tepi sebelah kiri ke tengah skrin dan lepaskan."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pastikan anda meleret dari hujung sebelah kanan."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pastikan anda meleret dari tepi sebelah kanan ke tengah skrin dan lepaskan."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Anda belajar cara meleret dari kiri untuk kembali."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Anda belajar cara meleret dari kanan untuk kembali. Seterusnya, ketahui cara menukar apl."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Anda telah melengkapkan gerak isyarat undur."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pastikan anda tidak meleret terlalu dekat dengan bahagian bawah skrin."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Utk mengubah kepekaan gerak isyarat undur, pergi ke Tetapan"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Leret dari kiri untuk kembali"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Leret dari kanan untuk kembali"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Untuk kembali ke skrin terakhir yang anda berada, leret dari tepi sebelah kiri ke tengah skrin."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Anda juga boleh kembali ke skrin terakhir dengan meleret dari tepi sebelah kanan ke tengah skrin. Cubalah sekarang."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pastikan anda meleret ke atas dari tepi sebelah bawah skrin."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pastikan anda tidak menjeda sebelum melepaskan gerak isyarat tersebut."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pastikan anda meleret terus ke atas."</string>
diff --git a/quickstep/res/values-my/strings.xml b/quickstep/res/values-my/strings.xml
index 13411e2034..c01ca5f3ef 100644
--- a/quickstep/res/values-my/strings.xml
+++ b/quickstep/res/values-my/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ဘယ်ဘက်အစွန်မှ ဖန်သားပြင်အလယ်သို့ ပွတ်ဆွဲပြီး လွှတ်လိုက်ကြောင်း သေချာပါစေ။"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ညာဘက်အစွန် ခပ်လှမ်းလှမ်းမှ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ညာဘက်အစွန်မှ ဖန်သားပြင်အလယ်သို့ ပွတ်ဆွဲပြီး လွှတ်လိုက်ကြောင်း သေချာပါစေ။"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"နောက်ပြန်သွားရန် ဘယ်ဘက်မှပွတ်ဆွဲနည်းကို သိသွားပါပြီ။"</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"နောက်ပြန်သွားရန် ညာဘက်မှပွတ်ဆွဲနည်းကို သိသွားပါပြီ။ နောက်အဆင့်တွင် အက်ပ်များပြောင်းနည်းကို လေ့လာပါ။"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"နောက်ဆုတ်လက်ဟန် ရှင်းလင်းပို့ချချက် ပြီးပါပြီ။"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ဖန်သားပြင် အောက်ခြေနှင့် အလွန်နီးကပ်စွာ ပွတ်ဆွဲခြင်းမရှိကြောင်း သေချာပါစေ။"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"နောက်ဆုတ်လက်ဟန်၏ အာရုံခံစွမ်းကိုပြောင်းရန် ‘ဆက်တင်များ’ သို့ သွားပါ"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"နောက်သို့ပြန်သွားရန် ဘယ်ဘက်မှ ပွတ်ဆွဲပါ"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"နောက်သို့ပြန်သွားရန် ညာဘက်မှ ပွတ်ဆွဲပါ"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"သင်ရှိခဲ့သည့် ပြီးခဲ့သောဖန်သားပြင်သို့ ပြန်သွားရန် ဖန်သားပြင်၏ဘယ်အစွန်းမှ အလယ်သို့ပွတ်ဆွဲပါ။"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"ဖန်သားပြင်၏ညာအစွန်းမှ အလယ်သို့ပွတ်ဆွဲ၍ ပြီးခဲ့သောဖန်သားပြင်သို့လည်း ပြန်သွားနိုင်သည်။ ယခုပဲ စမ်းကြည့်လိုက်ပါ။"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ဖန်သားပြင် အောက်ခြေအစွန်မှ အပေါ်သို့ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"လက်မလွှတ်ခင် ခဏရပ်ခြင်းမရှိကြောင်း သေချာပါစေ။"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"အပေါ်တည့်တည့်သို့ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
diff --git a/quickstep/res/values-nb/strings.xml b/quickstep/res/values-nb/strings.xml
index ff1dde7293..fd85ab1b46 100644
--- a/quickstep/res/values-nb/strings.xml
+++ b/quickstep/res/values-nb/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Sørg for at du sveiper fra den venstre kanten til midten av skjermen og slipper."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Sørg for at du sveiper fra kanten helt til høyre."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Sørg for at du sveiper fra den høyre kanten til midten av skjermen og slipper."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Du har lært hvordan du sveiper fra venstre for å gå tilbake."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Du har lært hvordan du sveiper fra høyre for å gå tilbake. I neste trinn lærer du å bytte app."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Du har fullført bevegelsen for å gå tilbake."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Sørg for at du ikke sveiper for nær bunnen av skjermen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Gå til Innstillinger for å endre tilbakebevegelsefølsomheten"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Sveip fra venstre for å gå tilbake"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Sveip fra høyre for å gå tilbake"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"For å gå tilbake til den forrige skjermen du var på, sveip fra venstre kant til midten av skjermen."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Du kan også gå tilbake til forrige skjerm ved å sveipe fra høyre kant til midten. Prøv nå."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Sørg for at du sveiper opp fra den nederste kanten av skjermen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Sørg for at du ikke setter på pause før du slipper."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Sørg for at du sveiper rett opp."</string>
diff --git a/quickstep/res/values-nl/strings.xml b/quickstep/res/values-nl/strings.xml
index 5825444bb6..d97c82b645 100644
--- a/quickstep/res/values-nl/strings.xml
+++ b/quickstep/res/values-nl/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Swipe vanaf de linkerrand naar het midden van het scherm en laat los."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Swipe helemaal vanaf de rechterrand."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Swipe vanaf de rechterrand naar het midden van het scherm en laat los."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Je weet nu hoe je vanaf links kunt swipen om terug te gaan."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Je weet nu hoe je vanaf rechts kunt swipen om terug te gaan. Ontdek nu hoe je tussen apps schakelt."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Je weet nu hoe je het gebaar Terug maakt."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Swipe niet te dicht bij de onderkant van het scherm."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Open Instellingen om de gevoeligheid van Terug te wijzigen"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Swipe vanaf de linkerkant om terug te gaan"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Swipe vanaf de rechterkant om terug te gaan"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Swipe vanaf de linkerkant naar het midden van het scherm om terug te gaan naar het vorige scherm."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Je kunt ook teruggaan naar het laatste scherm door vanaf de rechterkant naar het midden van het scherm te swipen. Probeer het nu."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Swipe vanaf de onderrand van het scherm omhoog."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pauzeer niet voordat je loslaat."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Swipe recht omhoog."</string>
diff --git a/quickstep/res/values-or/strings.xml b/quickstep/res/values-or/strings.xml
index 54a59327cb..24c8f74262 100644
--- a/quickstep/res/values-or/strings.xml
+++ b/quickstep/res/values-or/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ଆପଣ ସ୍କ୍ରିନର ବାମ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରି ଛାଡ଼ି ଦେଉଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ଆପଣ ଦୂର-ଡାହାଣ ଧାରରୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ଆପଣ ସ୍କ୍ରିନର ଡାହାଣ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରି ଛାଡ଼ି ଦେଉଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"ପଛକୁ ଫେରିବା ପାଇଁ କିପରି ବାମ ଧାରରୁ ସ୍ୱାଇପ୍ କରିବେ ତାହା ଆପଣ ଜାଣିଲେ।"</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ଆପଣ ଡାହାଣ ଧାରରୁ ସ୍ୱାଇପ୍ କରି ପଛକୁ ଫେରିବା ଜାଣିଲେ। ତା\'ପରେ, ଆପଗୁଡ଼ିକୁ କିପରି ସ୍ୱିଚ୍ କରିବେ ତାହା ଜାଣନ୍ତୁ।"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ଆପଣ \'ପଛକୁ ଫେରନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି।"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ଆପଣ ସ୍କ୍ରିନର ତଳଭାଗର ଅତି ନିକଟରୁ ସ୍ୱାଇପ୍ କରୁନଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ପଛକୁ ଫେରିବା ଜେଶ୍ଚରର ସମ୍ବେଦନଶୀଳତା ବଦଳାଇବାକୁ ସେଟିଂସକୁ ଯାଆନ୍ତୁ"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"ପଛକୁ ଫେରିବା ପାଇଁ ବାମ ଧାରରୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"ପଛକୁ ଫେରିବା ପାଇଁ ଡାହାଣ ଧାରରୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"ଆପଣ ଯେଉଁ ପୂର୍ବ ସ୍କ୍ରିନରେ ଥିଲେ ସେହି ସ୍କ୍ରିନକୁ ଫେରିବା ପାଇଁ, ସ୍କ୍ରିନର ବାମ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ।"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"ଆପଣ ସ୍କ୍ରିନର ଡାହାଣ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରି ପୂର୍ବ ସ୍କ୍ରିନକୁ ବି ଫେରିପାରିବେ। ଏବେ ଏହାକୁ ବ୍ୟବହାର କରନ୍ତୁ।"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ଆପଣ ସ୍କ୍ରିନର ତଳ ଧାରରୁ ଉପରକୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ଆପଣ ଛାଡ଼ିବା ପୂର୍ବରୁ ବିରତ କରୁନଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ଆପଣ ସିଧା ଉପରକୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
diff --git a/quickstep/res/values-pl/strings.xml b/quickstep/res/values-pl/strings.xml
index ae4f238fda..db1d5ed4ee 100644
--- a/quickstep/res/values-pl/strings.xml
+++ b/quickstep/res/values-pl/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pamiętaj, aby przesuwać palcem od lewej krawędzi do środka ekranu, a potem podnieść palec."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pamiętaj, aby przesuwać palcem od samej prawej krawędzi."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pamiętaj, aby przesuwać palcem od prawej krawędzi do środka ekranu, a potem podnieść palec."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Wiesz już, jak przesuwać palcem od lewej strony, aby wrócić."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Wiesz już, jak przesuwać palcem od prawej strony, aby wrócić. Poćwicz teraz przełączanie aplikacji."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Gest przejścia wstecz został opanowany."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pamiętaj, aby nie przesuwać palcem zbyt blisko dolnej części ekranu."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Czułość gestu cofania możesz zmienić w Ustawieniach"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Aby wrócić, przesuń palcem od lewej strony"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Aby wrócić, przesuń palcem od prawej strony"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Aby wrócić do ostatniego ekranu, przesuń palcem od lewej krawędzi do środka ekranu."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Możesz także wrócić do ostatniego ekranu, przesuwając palcem od prawej krawędzi do środka ekranu. Spróbuj to zrobić teraz."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pamiętaj, aby przesuwać palcem od dolnej krawędzi ekranu."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pamiętaj, aby przed podniesieniem palca nie było przerwy."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pamiętaj, aby przesuwać palcem prosto do góry."</string>
diff --git a/quickstep/res/values-pt-rPT/strings.xml b/quickstep/res/values-pt-rPT/strings.xml
index e6065ae638..0163602e1f 100644
--- a/quickstep/res/values-pt-rPT/strings.xml
+++ b/quickstep/res/values-pt-rPT/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Garanta que desliza rapidamente com o dedo do limite esquerdo até ao centro do ecrã e solta."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Garanta que desliza rapidamente com o dedo a partir da extremidade direita."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Garanta que desliza rapidamente com o dedo do limite direito até ao centro do ecrã e solta."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Aprendeu a deslizar rapidamente a partir da esquerda para retroceder."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Aprendeu a deslizar a partir da direita para retroceder. A seguir, saiba como alternar entre apps."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Concluiu o gesto para retroceder."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Garanta que não desliza rapidamente com o dedo demasiado perto da parte inferior do ecrã."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Altere a sensibilidade do gesto para voltar nas Definições."</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Deslize rapidamente a partir da esquerda para retroceder"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Deslize rapidamente a partir da direita para retroceder"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Para voltar ao último ecrã, deslize rapidamente a partir do limite esquerdo para o centro do ecrã."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Também pode voltar ao último ecrã ao deslizar da direita para o centro do ecrã. Experimente agora."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Garanta que desliza rapidamente com o dedo a partir do limite inferior do ecrã."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Garanta que não faz uma pausa antes de soltar."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Garanta que desliza rapidamente com o dedo para cima."</string>
diff --git a/quickstep/res/values-pt/strings.xml b/quickstep/res/values-pt/strings.xml
index c4e0957df2..fa43bcbeae 100644
--- a/quickstep/res/values-pt/strings.xml
+++ b/quickstep/res/values-pt/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Deslize da borda esquerda até o meio da tela e solte."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Deslize da borda direita."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Deslize da borda direita até o meio da tela e solte."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Você aprendeu a deslizar da esquerda para voltar."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Você aprendeu a deslizar da direita para voltar. A seguir, aprenda a trocar de app."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Você concluiu o gesto para voltar."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Não deslize perto demais da parte inferior da tela."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Mude a sensibilidade do gesto de voltar nas configurações"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Deslize da esquerda para voltar"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Deslizar da direita para voltar"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Para voltar à tela anterior, deslize da borda esquerda até o meio da tela."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Para voltar à tela anterior, deslize da borda direita até o meio da tela. Faça um teste."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Deslize da borda inferior da tela para cima."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Não pare antes de soltar."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Deslize para cima."</string>
diff --git a/quickstep/res/values-ro/strings.xml b/quickstep/res/values-ro/strings.xml
index d12a616410..1e75cb5f20 100644
--- a/quickstep/res/values-ro/strings.xml
+++ b/quickstep/res/values-ro/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Glisați dinspre marginea stângă spre mijlocul ecranului și eliberați."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Glisați dinspre marginea dreaptă îndepărtată."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Glisați dinspre marginea dreaptă spre mijlocul ecranului și eliberați."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Ați învățat cum să glisați dinspre stânga pentru a reveni."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Ați învățat cum să glisați dinspre dreapta pentru a reveni. În continuare, aflați cum să comutați aplicațiile."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ați finalizat gestul „înapoi”."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nu glisați prea aproape de partea de jos a ecranului."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Schimbați sensibilitatea gestului „Înapoi” accesând Setările"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Glisați dinspre stânga pentru a reveni"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Glisați dinspre dreapta pentru a reveni"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Pentru a reveni la ultimul ecran accesat, glisați de la marginea stângă spre mijlocul ecranului."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Reveniți la ultimul ecran glisând de la marginea dreaptă spre mijlocul ecranului. Încercați acum."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Glisați în sus dinspre marginea de jos a ecranului."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Nu întrerupeți gestul înainte de a elibera."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Glisați direct în sus."</string>
diff --git a/quickstep/res/values-ru/strings.xml b/quickstep/res/values-ru/strings.xml
index e7ebe86fd2..6d28815ef2 100644
--- a/quickstep/res/values-ru/strings.xml
+++ b/quickstep/res/values-ru/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Проведите от левого края экрана до середины дисплея и отпустите палец."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Проведите справа налево от самого края экрана."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Проведите от правого края экрана до середины дисплея и отпустите палец."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Теперь вы знаете, как вернуться, проведя слева направо."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Теперь вы знаете, как вернуться, проведя справа налево. Далее мы расскажем, как переключаться между приложениями."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Вы выполнили жест для перехода назад."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Проведите пальцем не слишком близко к нижнему краю экрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Уровень чувствительности можно изменить в настройках."</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Чтобы вернуться, проведите слева направо."</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Чтобы вернуться, проведите справа налево."</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Чтобы вернуться к предыдущему экрану, проведите от левого края к центру."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Вернуться назад можно, проведя от правого края к центру. Потренируйтесь на этом экране."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Проведите снизу вверх от самого края экрана."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Не приостанавливайтесь перед тем, как отпустить палец."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Проведите по экрану ровно вверх."</string>
diff --git a/quickstep/res/values-si/strings.xml b/quickstep/res/values-si/strings.xml
index a412d6cfc4..6e453ce320 100644
--- a/quickstep/res/values-si/strings.xml
+++ b/quickstep/res/values-si/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ඔබ වම් දාරයේ සිට තිරයේ මැදට ස්වයිප් කර අත හරින බව සහතික කර ගන්න."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ඔබ ඈත දකුණු දාරයෙන් ස්වයිප් කරන බවට සහතික කර ගන්න."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ඔබ දකුණු දාරයේ සිට තිරයේ මැදට ස්වයිප් කර අත හරින බව සහතික කර ගන්න."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"ආපසු යාමට වමේ සිට ස්වයිප් කරන්නේ කෙසේදැයි ඔබ දැන ගත්තේය."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ආපසු යාමට දකුණේ සිට ස්වයිප් කරන්නේ කෙසේදැයි ඔබ දැන ගත්තේය. ඊළඟට, යෙදුම් මාරු කරන ආකාරය දැන ගන්න."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ඔබ ආපසු යාමේ ඉංගිතය සම්පූර්ණ කරන ලදි."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ඔබ තිරයේ පහළට ඉතාම සමීපව ස්වයිප් නොකරන බවට සහතික කර ගන්න."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ආපසු ඉංගිතයෙහි සංවේදීතාව වෙනස් කිරීමට, සැකසීම් වෙත යන්න"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"ආපසු යාමට වමේ සිට ස්වයිප් කරන්න"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"ආපසු යාමට දකුණින් ස්වයිප් කරන්න"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"ඔබ සිටි අවසාන තිරයට ආපසු යාමට, වම් මායිමෙන් තිරයේ මැදට ස්වයිප් කරන්න."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"දකුණු මායිමේ සිට තිරයේ මැදට ස්වයිප් කර අවසාන තිරයට යා හැකිය. දැන් එය උත්සාහ කරන්න."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ඔබ තිරයේ පහළ දාරයේ සිට ඉහළට ස්වයිප් කරන බව සහතික කර ගන්න."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"යාමට ඉඩ හැරීමට පෙර ඔබ විරාමයක් නොගන්නා බව සහතික කර ගන්න."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ඔබ කෙලින්ම ඉහළට ස්වයිප් කරන බව සහතික කර ගන්න."</string>
diff --git a/quickstep/res/values-sk/strings.xml b/quickstep/res/values-sk/strings.xml
index 0e786cf5e3..704ee61072 100644
--- a/quickstep/res/values-sk/strings.xml
+++ b/quickstep/res/values-sk/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Musíte potiahnuť z ľavého okraja do stredu obrazovky a uvoľniť."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Musite potiahnuť z úplne krajného pravého okraja."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Musíte potiahnuť z pravého okraja do stredu obrazovky a uvoľniť."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Naučili ste sa prejsť späť potiahnutím zľava."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Naučili ste sa prejsť späť potiahnutím sprava. V ďalšom kroku sa naučíte prepínať aplikácie."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Dokončili ste gesto na prechod späť."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nesmiete potiahnuť príliš blízko dolnej časti obrazovky."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Ak chcete zmeniť citlivosť gesta Späť, prejdite do Nastavení"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Späť prejdete potiahnutím zľava"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Späť prejdete potiahnutím sprava"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Na poslednú obrazovku prejdete potiahnutím z ľavého okraja do stredu obrazovky."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Na poslednú obrazovku tiež prejdete potiahnutím z pravého okraja do stredu obrazovky. Vyskúšajte to."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Musíte potiahnuť nahor z dolného okraja obrazovky."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pred uvoľnením nesmiete zastať."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Musíte potiahnuť priamo hore."</string>
diff --git a/quickstep/res/values-sl/strings.xml b/quickstep/res/values-sl/strings.xml
index 59c587b4cb..19982dfcb9 100644
--- a/quickstep/res/values-sl/strings.xml
+++ b/quickstep/res/values-sl/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pazite, da povlečete z levega roba do sredine zaslona in dvignete prst."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pazite, da ne povlečete s skrajno desnega roba."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pazite, da povlečete z desnega roba do sredine zaslona in dvignete prst."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Naučili ste se, kako povlečete z leve za vrnitev."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Naučili ste se, kako povlečete z desne za vrnitev. Zdaj se naučite preklapljanja med aplikacijami."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Izvedli ste potezo za pomik nazaj."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pazite, da ne povlečete preblizu dna zaslona."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Občutljivost poteze za nazaj lahko spremenite v nastavitvah."</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Povlecite z leve za vrnitev."</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Povlecite z desne za vrnitev"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Če se želite vrniti na zadnji prikazani zaslon, povlecite z levega roba do sredine zaslona."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Na zadnji zaslon se lahko vrnete tudi, če z desnega roba povlečete do sredine zaslona. Preizkusite."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pazite, da povlečete s spodnjega roba zaslona navzgor."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pazite, da ne zaustavite prsta, preden ga dvignete."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pazite, da povlečete naravnost navzgor."</string>
diff --git a/quickstep/res/values-sq/strings.xml b/quickstep/res/values-sq/strings.xml
index 35037b8603..2ff94a122d 100644
--- a/quickstep/res/values-sq/strings.xml
+++ b/quickstep/res/values-sq/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Sigurohu që të rrëshqasësh shpejt nga skaji i majtë drejt mesit të ekranit dhe lëshoje."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Sigurohu që të rrëshqasësh shpejt nga skaji sa më djathtas."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Sigurohu që të rrëshqasësh shpejt nga skaji i djathtë drejt mesit të ekranit dhe lëshoje."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Ke mësuar si të rrëshqasësh shpejt nga e majta për t\'u kthyer prapa."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Ke mësuar si të rrëshqasësh shpejt nga e djathta për t\'u kthyer prapa. Në vijim do të mësosh se si t\'i ndërrosh aplikacionet."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"E ke përfunduar gjestin e kthimit prapa."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Sigurohu që të mos rrëshqasësh shumë afër fundit të ekranit."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Për të ndryshuar ndjeshmërinë e gjestit të kthimit prapa, shko te \"Cilësimet\""</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Rrëshqit shpejt nga e majta për t\'u kthyer prapa"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Rrëshqit shpejt nga e djathta për t\'u kthyer prapa"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Për t\'u kthyer në ekranin e fundit ku ishe, rrëshqit shpejt nga skaji i majtë në mes të ekranit."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Mund dhe të kthehesh në ekranin e fundit duke rrëshqitur shpejt nga skaji i djathtë në mes të ekranit. Provoje tani."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Sigurohu që të rrëshqasësh shpejt lart nga skaji i poshtëm i ekranit."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Sigurohu që të mos ndalosh para se ta lëshosh."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Sigurohu që të rrëshqasësh shpejt drejt lart."</string>
diff --git a/quickstep/res/values-sr/strings.xml b/quickstep/res/values-sr/strings.xml
index ef45c5c592..28754b5baa 100644
--- a/quickstep/res/values-sr/strings.xml
+++ b/quickstep/res/values-sr/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Обавезно превуците од леве ивице до средине екрана и отпустите."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Обавезно превуците од саме десне ивице."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Обавезно превуците од десне ивице до средине екрана и отпустите."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Научили сте како да превлачите слева да бисте се вратили."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Научили сте како да превлачите здесна да бисте се вратили. Сада научите да мењате апликације."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Довршили сте покрет за повратак."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Никако не превлачите превише близу дна екрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Осетљивост пок. за назад можете да промените у Подешавањима"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Превуците слева да бисте се вратили"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Превуците здесна да бисте се вратили"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Да бисте се вратили на последњи екран, превуците од леве ивице ка средини екрана."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Можете да се вратите на последњи екран и превлачењем од десне ивице ка средини екрана. Испробајте."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Обавезно превуците нагоре од доње ивице екрана."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Никако не стајте пре отпуштања."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Обавезно превуците право нагоре."</string>
diff --git a/quickstep/res/values-sv/strings.xml b/quickstep/res/values-sv/strings.xml
index 29af68d029..4b4407b423 100644
--- a/quickstep/res/values-sv/strings.xml
+++ b/quickstep/res/values-sv/strings.xml
@@ -49,22 +49,16 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Se till att du sveper från den vänstra kanten till mitten av skärmen och sedan släpper."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Se till att du sveper ända från högerkanten."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Se till att du sveper från den högra kanten till mitten av skärmen och sedan släpper."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Nu kan du svepa från vänster för att gå tillbaka."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Nu kan du svepa från höger för att gå tillbaka. Nu ska du få lära dig hur du byter mellan appar."</string>
     <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
     <skip />
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Se till att du inte sveper för nära skärmens nederkant."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Öppna inställningarna om du vill ändra rörelsens känslighet"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Återgå genom att svepa från vänster"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Svep från höger för att gå tillbaka"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Återgå till den senaste skärmen du var på genom att svepa från skärmens vänstra kant till mitten."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Du kan återgå till föregående skärm genom att svepa från den högra kanten till mitten. Testa nu."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Se till att du sveper från nederkanten på skärmen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Se till att du sveper i en jämn rörelse innan du släpper."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Se till att du sveper rakt uppåt."</string>
diff --git a/quickstep/res/values-sw/strings.xml b/quickstep/res/values-sw/strings.xml
index 4cbc40535a..79e6483d1f 100644
--- a/quickstep/res/values-sw/strings.xml
+++ b/quickstep/res/values-sw/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Hakikisha unatelezesha kidole kuanzia ukingo wa kushoto kuelekea katikati ya skrini na uachilie."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Hakikisha unatelezesha kidole kuanzia ukingo wa mbali wa kulia."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Hakikisha unatelezesha kidole kuanzia ukingo wa kulia kuelekea katikati ya skrini na uachilie."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Umejifunza jinsi ya kutelezesha kidole kuanzia kushoto ili kurudi nyuma."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Umejifunza jinsi ya kutelezesha kidole kuanzia kulia ili kurudi nyuma. Hatua inayofuata, jifunze jinsi ya kubadilisha programu."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Umekamilisha ishara ya kurudi nyuma."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Hakikisha hutelezeshi kidole karibu sana na sehemu ya chini ya skrini."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Kubadilisha hisi ya ishara ya nyuma, nenda kwenye Mipangilio"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Telezesha kidole kuanzia kushoto ili urudi nyuma"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Telezesha kidole kuanzia kulia ili urudi nyuma"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Ili urudi kwenye skrini iliyotangulia, telezesha kidole kuanzia ukingo wa kushoto kuelekea katikati ya skrini."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Unaweza pia kurudi kwenye skrini iliyotangulia kwa kutelezesha kidole kuanzia ukingo wa kulia kuelekea katikati ya skrini. Ijaribu sasa."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Hakikisha unatelezesha kidole juu kuanzia ukingo wa chini wa skrini."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Hakikisha kuwa husimamishi kabla ya kuachilia."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Hakikisha unatelezesha kidole kuelekea juu."</string>
diff --git a/quickstep/res/values-ta/strings.xml b/quickstep/res/values-ta/strings.xml
index 010e3b5ac1..788f525ddb 100644
--- a/quickstep/res/values-ta/strings.xml
+++ b/quickstep/res/values-ta/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"இடது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்தபிறகு விடுவிப்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"வலது ஓரத்தின் விளிம்பிலிருந்து ஸ்வைப் செய்கிறீர்கள் என்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"வலது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்தபிறகு விடுவிப்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"பின்செல்வதற்கு எப்படி இடதுபுறத்திலிருந்து ஸ்வைப் செய்வதென்று கற்றுக்கொண்டீர்கள்."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"பின்செல்வதற்கு எப்படி வலதுபுறத்திலிருந்து ஸ்வைப் செய்வதென்று கற்றுக்கொண்டீர்கள். அடுத்து ஆப்ஸுக்கிடையே எப்படி மாறுவது என்பதை அறிக."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"பின்செல் சைகைப் பயிற்சியை முடித்துவிட்டீர்கள்."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"திரையின் கீழ்பகுதிக்கு மிக நெருக்கமாக ஸ்வைப் செய்யவில்லை என்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"பின்செல் சைகையின் உணர்திறனை மாற்ற அமைப்புகளுக்குச் செல்க"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"பின்செல்வதற்கு இடதுபுறத்திலிருந்து ஸ்வைப் செய்யுங்கள்"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"பின்செல்வதற்கு வலதுபுறத்திலிருந்து ஸ்வைப் செய்யுங்கள்"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"முந்தைய திரைக்கு மீண்டும் செல்ல, இடது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்யுங்கள்."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"வலது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்தும் முந்தைய திரைக்குச் செல்லலாம். இப்போதே முயலுங்கள்."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"திரையின் கீழ் ஓரத்திலிருந்து மேல்நோக்கி ஸ்வைப் செய்வதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"விடுவிப்பதற்கு முன்பாக இடைநிறுத்தவில்லை என்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"மேல்நோக்கி நேராக ஸ்வைப் செய்வதை உறுதிசெய்துகொள்ளுங்கள்."</string>
diff --git a/quickstep/res/values-th/strings.xml b/quickstep/res/values-th/strings.xml
index eab0421fd3..a13b43b776 100644
--- a/quickstep/res/values-th/strings.xml
+++ b/quickstep/res/values-th/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ตรวจสอบว่าปัดจากขอบด้านซ้ายไปตรงกลางหน้าจอ แล้วยกนิ้วขึ้น"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ตรวจสอบว่าปัดจากขอบด้านขวาสุด"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ตรวจสอบว่าปัดจากขอบด้านขวาไปตรงกลางหน้าจอ แล้วยกนิ้วขึ้น"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"คุณรู้วิธีปัดจากด้านซ้ายเพื่อย้อนกลับแล้ว"</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"คุณรู้วิธีปัดจากด้านขวาเพื่อย้อนกลับแล้ว ต่อไปดูวิธีสลับแอป"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"คุณทำท่าทางสัมผัสเพื่อย้อนกลับเสร็จแล้ว"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ตรวจสอบว่าไม่ได้ปัดใกล้กับด้านล่างของหน้าจอมากเกินไป"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"เปลี่ยนความไวของท่าทางสัมผัสเพื่อย้อนกลับได้ที่การตั้งค่า"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"ปัดจากด้านซ้ายเพื่อย้อนกลับ"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"ปัดจากด้านขวาเพื่อย้อนกลับ"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"หากต้องการย้อนกลับไปที่หน้าจอล่าสุดที่เปิด ให้ปัดจากขอบด้านซ้ายไปตรงกลางหน้าจอ"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"หรือจะกลับไปหน้าจอล่าสุดโดยปัดจากขอบขวาไปตรงกลางหน้าจอก็ได้ ลองเลย"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ตรวจสอบว่าปัดขึ้นจากขอบด้านล่างของหน้าจอ"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ตรวจสอบว่าไม่มีการหยุดชั่วคราวก่อนยกนิ้วขึ้น"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ตรวจสอบว่าปัดขึ้นในแนวตรง"</string>
diff --git a/quickstep/res/values-tl/strings.xml b/quickstep/res/values-tl/strings.xml
index e8d38fdd77..eade324ed5 100644
--- a/quickstep/res/values-tl/strings.xml
+++ b/quickstep/res/values-tl/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Tiyaking mag-swipe mula sa kaliwang gilid papunta sa gitna ng screen, saka iangat ang iyong daliri."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Tiyaking magsa-swipe ka mula sa pinakadulo sa kanan."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Tiyaking mag-swipe mula sa kanang gilid papunta sa gitna ng screen, saka iangat ang iyong daliri."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Natutunan mong mag-swipe mula sa kaliwa para bumalik."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Natuto kang mag-swipe mula sa kanan para bumalik. Sunod, alamin kung paano magpalipat-lipat ng app."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Nakumpleto mo na ang galaw para bumalik."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Tiyaking hindi ka magsa-swipe nang masyadong malapit sa ibaba ng screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Pumunta sa Settings para baguhin ang sensitivity ng pagbalik"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Mag-swipe mula sa kaliwa para bumalik"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Mag-swipe mula sa kanan para bumalik"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Mag-swipe mula sa kaliwang gilid papunta sa gitna para bumalik sa nakaraang screen na pinuntahan mo."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Puwede ka ring mag-swipe mula kanan papuntang gitna para bumalik sa naunang screen. Subukan na ito."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Tiyaking magsa-swipe ka pataas mula sa pinakaibaba ng screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Tiyaking hindi ka magpo-pause bago iangat ang iyong daliri."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Tiyaking magsa-swipe ka nang diretso pataas."</string>
diff --git a/quickstep/res/values-tr/strings.xml b/quickstep/res/values-tr/strings.xml
index 144ad0f88a..86f5a26d4e 100644
--- a/quickstep/res/values-tr/strings.xml
+++ b/quickstep/res/values-tr/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Sol kenardan ekranın ortasına doğru kaydırıp bıraktığınızdan emin olun."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Ekranın en sağından kaydırdığınızdan emin olun."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Sağ kenardan ekranın ortasına doğru kaydırıp bıraktığınızdan emin olun."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Geri dönmek için soldan kaydırmayı öğrendiniz."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Geri dönmek için sağdan kaydırmayı öğrendiniz. Sırada uygulamalar arasında geçiş yapma var."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Geri dön hareketini tamamladınız."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ekranın alt kısmına çok yakın bir şekilde kaydırmadığınızdan emin olun."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Geri hareketinin hassasiyetini değiştirmek için Ayarlar\'a gidin"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Geri gitmek için soldan kaydırın"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Geri gitmek için sağdan kaydırın"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Görüntülediğiniz son ekrana dönmek için sol kenardan ekranın ortasına doğru kaydırın."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"İsterseniz sağ kenardan ekranın ortasına doğru kaydırarak son ekrana dönebilirsiniz. Şimdi deneyin."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Ekranın alt kenarından yukarı kaydırdığınızdan emin olun."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Bırakmadan önce parmağınızı duraklatmadığınızdan emin olun."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Düz bir şekilde yukarı kaydırdığınızdan emin olun."</string>
diff --git a/quickstep/res/values-uk/strings.xml b/quickstep/res/values-uk/strings.xml
index e5a22665c4..c1ab0d8b5e 100644
--- a/quickstep/res/values-uk/strings.xml
+++ b/quickstep/res/values-uk/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Проведіть пальцем від лівого краю до середини екрана й підніміть палець."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Проведіть пальцем саме від правого краю екрана."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Проведіть пальцем від правого краю до середини екрана й підніміть палець."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Ви навчилися проводити пальцем зліва направо, щоб повертатися."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Ви вмієте проводити пальцем справа наліво, щоб повертатися. Дізнайтеся, як переходити між додатками."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ви виконали жест \"Назад\"."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Не проводьте пальцем надто близько до нижнього краю екрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Щоб змінити чутливість жесту \"Назад\", відкрийте налаштування"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Щоб повернутися, проведіть пальцем зліва направо"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Щоб повернутися, проведіть пальцем справа наліво"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Щоб перейти на попередній екран, проведіть пальцем від лівого краю до середини екрана."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Щоб повернутися, проведіть пальцем від правого краю до середини екрана. Спробуйте зараз."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Проведіть пальцем угору від нижнього краю екрана."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Не робіть паузу перед тим, як відірвати палець від екрана."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Проводьте пальцем вертикально вгору."</string>
diff --git a/quickstep/res/values-ur/strings.xml b/quickstep/res/values-ur/strings.xml
index 6447df8a56..7c01ed6b46 100644
--- a/quickstep/res/values-ur/strings.xml
+++ b/quickstep/res/values-ur/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"یقینی طور پر بائیں کنارے سے اسکرین کے وسط تک سوائپ کریں اور پھر اپنی انگلی اٹھا لیں۔"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"اس بات کو یقینی بنائیں کہ آپ دائیں کنارے سے دور سے سوائپ کریں۔"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"یقینی طور پر دائیں کنارے سے اسکرین کے وسط تک سوائپ کریں اور پھر اپنی انگلی اٹھا لیں۔"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"آپ نے واپس جانے کے لیے بائیں کنارے سے سوائپ کرنے کا طریقہ سیکھ لیا۔"</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"آپ نے واپس جانے کے لیے دائیں کنارے سے سوائپ کرنے کا طریقہ سیکھ لیا۔ اس کے بعد ایپس سوئچ کرنے کا طریقہ جانیں۔"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"آپ نے واپس جائیں اشارے کو مکمل کر لیا۔"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"اس بات کو یقینی بنائیں کہ آپ اسکرین کے نچلے حصے سے زیادہ قریب سے سوائپ نہ کریں۔"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"پچھلے اشارے کی حساسیت تبدیل کرنے کے لیے ترتیبات پر جائیں"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"واپس جانے کے لیے بائیں کنارے سے سوائپ کریں"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"واپس جانے کے لیے دائیں کنارے سے سوائپ کریں"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"پچھلی اسکرین جس پر آپ تھے اس پر واپس جانے کے لیے بائیں کنارے سے اسکرین کے وسط تک سوائپ کریں۔"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"آپ دائیں کنارے سے اسکرین کے وسط تک سوائپ کر کے پچھلی اسکرین پر واپس بھی جا سکتے ہیں۔ اسے ابھی آزمائیں۔"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"اس بات کو یقینی بنائیں کہ آپ اسکرین کے نچلے کنارے سے اوپر کی طرف سوائپ کریں۔"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"اس بات کو یقینی بنائیں کہ آپ اپنی انگلی اوپر اٹھانے سے پہلے موقوف نہ کریں۔"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"اس بات کو یقینی بنائیں کہ آپ سیدھا اوپر کی طرف سوائپ کریں۔"</string>
diff --git a/quickstep/res/values-uz/strings.xml b/quickstep/res/values-uz/strings.xml
index 462d3aab42..156730dd4f 100644
--- a/quickstep/res/values-uz/strings.xml
+++ b/quickstep/res/values-uz/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Barmoqni ekranning chap chetidan oʻrtasigacha suring va ekrandan uzing."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Barmoqni oʻngdagi eng chekkadan suring."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Barmoqni ekranning oʻng chetidan oʻrtasigacha suring va ekrandan uzing."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Ortga qaytish uchun chapdan surishni oʻrgandingiz."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Ortga qaytish uchun oʻngdan surishni oʻrgandingiz. Endi ilovalarni almashtirishni oʻrganamiz."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ortga qaytish ishorasi darsini tamomladingiz."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Barmoqni ekran pastiga yaqin surmaslikka harakat qiling."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Orqaga ishorasi sezuvchanligi Sozlamalardan oʻzgartiriladi"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Orqaga qaytish uchun chapdan suring"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Orqaga qaytish uchun oʻngdan suring"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Oxirgi ekranga qaytish uchun barmoqni ekranning chap chekkasidan oʻrtasigacha suring."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Shuningdek, oʻng chetdan ekran oʻrtasiga surish orqali ham oxirgi ekranga qaytish mumkin. Hoziroq sinang."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Barmoqni ekranning pastki chetidan yuqoriga suring."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Barmoqni ekrandan pauzasiz qoʻyib uzing."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Barmoqni tik tepaga suring."</string>
diff --git a/quickstep/res/values-vi/strings.xml b/quickstep/res/values-vi/strings.xml
index d6241bed16..13f1a10a27 100644
--- a/quickstep/res/values-vi/strings.xml
+++ b/quickstep/res/values-vi/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Hãy vuốt từ mép trái tới chính giữa màn hình rồi nhấc ngón tay."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Hãy vuốt từ mép ngoài cùng bên phải."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Hãy vuốt từ mép phải tới chính giữa màn hình rồi nhấc ngón tay."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Bạn đã tìm hiểu cách vuốt từ mép trái để quay lại."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Bạn đã tìm hiểu cách vuốt từ mép phải để quay lại. Tiếp theo, hãy tìm hiểu cách chuyển đổi ứng dụng."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Bạn đã thực hiện xong cử chỉ quay lại."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Hãy nhớ không được vuốt quá gần phần cuối màn hình."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Để thay đổi độ nhạy của cử chỉ quay lại, hãy vào mục Cài đặt"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Vuốt từ mép trái để quay lại"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Vuốt từ mép phải để quay lại"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Để quay lại màn hình gần đây nhất mà bạn xem, hãy vuốt từ mép trái tới giữa màn hình."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Bạn cũng có thể vuốt từ mép phải tới giữa màn hình để quay lại màn hình gần đây nhất. Hãy thử ngay."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Hãy vuốt lên từ mép dưới cùng của màn hình."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Hãy nhớ không được tạm dừng trước khi nhấc ngón tay."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Hãy vuốt thẳng lên."</string>
diff --git a/quickstep/res/values-zh-rCN/strings.xml b/quickstep/res/values-zh-rCN/strings.xml
index 21ce064662..f026baff3b 100644
--- a/quickstep/res/values-zh-rCN/strings.xml
+++ b/quickstep/res/values-zh-rCN/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"请从左侧边缘滑动到屏幕中间位置后再松开手指。"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"请从最右侧边缘开始滑动。"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"请从右侧边缘滑动到屏幕中间位置后再松开手指。"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"您已了解如何使用“从左侧向右滑动”手势返回。"</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"您已了解如何使用“从右侧向左滑动”手势返回。接下来了解如何切换应用。"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"您完成了“返回”手势教程。"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"滑动时，手的位置不要太靠近屏幕底部。"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"如要调节“返回”手势的灵敏度，请转到“设置”"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"从左侧向右滑动手指即可返回"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"从右侧向左滑动手指即可返回"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"如要返回您查看过的上一个屏幕，请从左侧边缘滑动到屏幕中间位置。"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"如要返回上一个屏幕，您也可以从右侧边缘滑动到屏幕中间位置。现在就试试看吧。"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"请从屏幕底部边缘向上滑动。"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"在松开手指前请勿停下来。"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"请向上滑动。"</string>
diff --git a/quickstep/res/values-zh-rHK/strings.xml b/quickstep/res/values-zh-rHK/strings.xml
index d3e6c033ab..5b03b023ee 100644
--- a/quickstep/res/values-zh-rHK/strings.xml
+++ b/quickstep/res/values-zh-rHK/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"請從螢幕左側邊緣往中央滑動，然後放開手指。"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"請從螢幕右側邊緣滑動。"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"請從螢幕右側邊緣往中央滑動，然後放開手指"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"您已瞭解如何使用「由左向右滑動」手勢返回。"</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"您已瞭解如何透過「由右向左滑動」手勢返回。接下來一起瞭解如何切換應用程式。"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"您已完成「返回」手勢的教學課程。"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"滑動時，手的位置不要太接近螢幕底部。"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"如要變更「返回」手勢的敏感度，請前往「設定」"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"從螢幕左側往右滑動即可返回"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"由右向左滑動即可返回"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"如要返回上一個畫面，請從螢幕左側往中央滑動。"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"從螢幕右側往中央滑動亦可返回上一個畫面。立即試試吧。"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"請從螢幕底部邊緣向上滑動。"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"放開手指前請勿停下來。"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"請向上滑動。"</string>
diff --git a/quickstep/res/values-zh-rTW/strings.xml b/quickstep/res/values-zh-rTW/strings.xml
index 492ae141bc..f3cb45840c 100644
--- a/quickstep/res/values-zh-rTW/strings.xml
+++ b/quickstep/res/values-zh-rTW/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"請從螢幕左側邊緣往中央滑動，然後放開手指。"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"請從螢幕右側邊緣滑動。"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"請從螢幕右側邊緣往中央滑動，然後放開手指。"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"你已瞭解如何使用「由左向右滑動」手勢返回。"</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"你已瞭解如何透過「由右向左滑動」手勢返回。接著，一起來瞭解如何切換應用程式。"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"你已完成「返回」手勢的教學課程。"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"滑動時，手的位置不要太接近螢幕底部。"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"如要變更「返回」手勢的敏感度，請前往「設定」"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"從螢幕左側往右滑動即可返回"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"由右向左滑動即可返回"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"如要返回先前的畫面，請從螢幕左側往中央滑動。"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"從螢幕右側往中央滑動也可返回上一個畫面。現在就試試看吧！"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"請從螢幕底部邊緣向上滑動。"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"放開手指前請勿停下來。"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"請向上滑動。"</string>
diff --git a/quickstep/res/values-zu/strings.xml b/quickstep/res/values-zu/strings.xml
index 35edaef055..1cfcb933df 100644
--- a/quickstep/res/values-zu/strings.xml
+++ b/quickstep/res/values-zu/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Qiniseka ukuthi uswayipha kusuka emngceleni okwesobunxele kuya phakathi kwesikrini bese uyadedela."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Qiniseka ukuthi uswayiphela ekudeni emngceleni ongakwesokudla."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Qiniseka ukuthi uswayipha kusuka emngceleni okwesokudla kuya phakathi kwesikrini bese uyadedela."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Ufunde indlela yokuswayipha kusuka kwesokunxele ukuze ubuyele emuva."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Ufunde indlela yokuswayipha kusuka kwesokudla ukuze ubuyele emuva. Ngokulandelayo, funda indlela yokushintsha ama-app."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ukuqedile ukuthinta kokubuyela emuva."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Qiniseka ukuba awuswayipheli eduze kakhulu naphansi kwesikrini."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Ukuze ushintshe ukuzwela kokuthinta emuva, iya Kumasethingi"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Swayipha kusuka kwesobunxele ukuze ubuyele emuva"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Swayipha kusuka kwesokudla ukubuyela emuva"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Ukuze ubuyele esikrinini sangaphambilini lapho ubukade ukhona, swayipha kusuka kunqenqema lwesokunxele ukuya maphakathi nesikrini."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Futhi ungabuyela emuva esikrinini sangaphambilini ngokuswayipha kusuka kunqenqema langakwesokudla ukuya maphakathi nesikrini. Izame manje."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Qiniseka ukuthi uswayiphela phezulu kusuka emngceleni ophansi wesikrini."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Qiniseka ukuthi awumisi ngaphambi kokudedela."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Qiniseka ukuthi uswayiphela ngqo phezulu."</string>
-- 
GitLab


From a0d49dcfb429835b15feb191ca0090b4f37555e4 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Thu, 27 May 2021 18:10:10 +0100
Subject: [PATCH 1295/1664] Further adjust work profile tabs paddings in the
 widgets picker

Test: Open widgets picker and observe tabs paddings are correctly set.
Bug: 188872382
Change-Id: Ib6a735bf2b0710f86b8641533cadb27116049341
---
 res/values/dimens.xml                                  |  7 ++++++-
 .../launcher3/widget/picker/WidgetsFullSheet.java      | 10 ++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 394aecb140..3bab4054f0 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -123,6 +123,11 @@
 
     <dimen name="recommended_widgets_table_vertical_padding">8dp</dimen>
 
+    <!-- Bottom margin for the search and recommended widgets container without work profile -->
+    <dimen name="search_and_recommended_widgets_container_bottom_margin">16dp</dimen>
+    <!-- Bottom margin for the search and recommended widgets container with work profile -->
+    <dimen name="search_and_recommended_widgets_container_small_bottom_margin">10dp</dimen>
+
     <dimen name="widget_list_top_bottom_corner_radius">28dp</dimen>
     <dimen name="widget_list_content_corner_radius">4dp</dimen>
 
@@ -146,7 +151,7 @@
     <dimen name="widget_picker_education_tip_width">120dp</dimen>
     <dimen name="widget_picker_education_tip_min_margin">4dp</dimen>
 
-    <dimen name="widget_picker_view_pager_top_padding">16dp</dimen>
+    <dimen name="widget_picker_view_pager_top_padding">10dp</dimen>
 
     <!-- Padding applied to shortcut previews -->
     <dimen name="shortcut_preview_padding_left">0dp</dimen>
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index c09beb6e16..545b458d8c 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -122,6 +122,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
     };
     private final int mTabsHeight;
     private final int mViewPagerTopPadding;
+    private final int mSearchAndRecommendationContainerBottomMargin;
     private final int mWidgetCellHorizontalPadding;
 
     @Nullable private WidgetsRecyclerView mCurrentWidgetsRecyclerView;
@@ -148,6 +149,10 @@ public class WidgetsFullSheet extends BaseWidgetSheet
                 ? getContext().getResources()
                     .getDimensionPixelSize(R.dimen.widget_picker_view_pager_top_padding)
                 : 0;
+        mSearchAndRecommendationContainerBottomMargin = getContext().getResources()
+                .getDimensionPixelSize(mHasWorkProfile
+                        ? R.dimen.search_and_recommended_widgets_container_small_bottom_margin
+                        : R.dimen.search_and_recommended_widgets_container_bottom_margin);
         mWidgetCellHorizontalPadding = 2 * getResources().getDimensionPixelOffset(
                 R.dimen.widget_cell_horizontal_padding);
     }
@@ -191,6 +196,11 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         mNoWidgetsView = findViewById(R.id.no_widgets_text);
         mSearchAndRecommendationViewHolder = new SearchAndRecommendationViewHolder(
                 findViewById(R.id.search_and_recommendations_container));
+        TopRoundedCornerView.LayoutParams layoutParams =
+                (TopRoundedCornerView.LayoutParams)
+                        mSearchAndRecommendationViewHolder.mContainer.getLayoutParams();
+        layoutParams.bottomMargin = mSearchAndRecommendationContainerBottomMargin;
+        mSearchAndRecommendationViewHolder.mContainer.setLayoutParams(layoutParams);
         mSearchAndRecommendationsScrollController = new SearchAndRecommendationsScrollController(
                 mHasWorkProfile,
                 mTabsHeight,
-- 
GitLab


From 7e3d96c6209a3b57d999070d76cc7a8bb13b8882 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 26 May 2021 22:26:48 +0100
Subject: [PATCH 1296/1664] Show app widget resize frame after launcher state
 change

When this bug occurs, the resize frame coordinate is incorrect because
the launcher state animation has not finished when the drag view
finishes animating back to its original position.

Test: Quickly long press and release a widget from the home screen.
      Observe the resize frame is correctly shown around the widget.

Bug: 186370472
Change-Id: I6bfba2e85e3354a215c26203dd22df13db3b8b83
---
 src/com/android/launcher3/Workspace.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 98d80fedbc..b09ec0a1ba 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -103,6 +103,7 @@ import com.android.launcher3.util.IntSparseArrayMap;
 import com.android.launcher3.util.ItemInfoMatcher;
 import com.android.launcher3.util.OverlayEdgeEffect;
 import com.android.launcher3.util.PackageUserKey;
+import com.android.launcher3.util.RunnableList;
 import com.android.launcher3.util.Thunk;
 import com.android.launcher3.util.WallpaperOffsetInterpolator;
 import com.android.launcher3.widget.LauncherAppWidgetHost;
@@ -1921,10 +1922,16 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
                 if (droppedOnOriginalCellDuringTransition) {
                     // Animate the item to its original position, while simultaneously exiting
                     // spring-loaded mode so the page meets the icon where it was picked up.
+                    final RunnableList callbackList = new RunnableList();
+                    final Runnable onCompleteCallback = onCompleteRunnable;
                     mLauncher.getDragController().animateDragViewToOriginalPosition(
-                            onCompleteRunnable, cell,
+                            /* onComplete= */ callbackList::executeAllAndDestroy, cell,
                             SPRING_LOADED.getTransitionDuration(mLauncher));
-                    mLauncher.getStateManager().goToState(NORMAL);
+                    mLauncher.getStateManager().goToState(NORMAL, /* delay= */ 0,
+                            onCompleteCallback == null
+                                    ? null
+                                    : forSuccessCallback(
+                                            () -> callbackList.add(onCompleteCallback)));
                     mLauncher.getDropTargetBar().onDragEnd();
                     parent.onDropChild(cell);
                     return;
-- 
GitLab


From f2c79dea0da80b88dac99f3d1be354412ace91bf Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Thu, 27 May 2021 14:55:21 +0100
Subject: [PATCH 1297/1664] Add more education tips for widgets. (2/3)

Show education dialog on WidgetsFullSheet.
-Have a button in widget education dialog to intent into PixelTips apps.
-Make sure arrow tip view shows after dismissing education dialog on
WidgetsFullSheet if there is a widget to show it on.
-Update colors and layout for arrow tips.

Test: Tested manually
Bug: 185354491
Change-Id: I5cbdd02fc4f19a49a42dac4451b071e3d604747f
---
 ...widgets_picker_surface.xml => surface.xml} |   0
 ...widgets_picker_surface.xml => surface.xml} |   0
 res/color/arrow_tip_view_content.xml          |   2 +-
 res/color/button_bg.xml                       |  23 ++++
 res/color/button_text.xml                     |  23 ++++
 ...widgets_picker_surface.xml => surface.xml} |   0
 .../widgets_bottom_sheet_background.xml       |   2 +-
 res/drawable/add_item_dialog_background.xml   |   2 +-
 .../arrow_toast_rounded_background.xml        |   2 +-
 .../bg_rounded_corner_bottom_sheet.xml        |  23 ++++
 res/drawable/bg_widgets_searchbox.xml         |   2 +-
 .../button_bottom_rounded_colored_ripple.xml  |  32 +++++
 .../button_rounded_colored_ripple.xml         |  28 +++++
 .../button_top_rounded_bordered_ripple.xml    |  35 ++++++
 .../widgets_bottom_sheet_background.xml       |   2 +-
 res/drawable/widgets_list_bottom_ripple.xml   |   4 +-
 res/drawable/widgets_list_middle_ripple.xml   |   4 +-
 .../widgets_list_single_item_ripple.xml       |   4 +-
 res/drawable/widgets_list_top_ripple.xml      |   4 +-
 .../widgets_recommendation_background.xml     |   2 +-
 res/layout/arrow_toast.xml                    |  42 ++-----
 res/layout/widgets_edu.xml                    |  66 ++++++++++
 res/values-v28/dimens.xml                     |  19 +++
 res/values/dimens.xml                         |   3 +-
 res/values/strings.xml                        |   9 ++
 res/values/styles.xml                         |  15 +++
 .../launcher3/AbstractFloatingView.java       |   9 +-
 .../android/launcher3/views/ArrowTipView.java |  12 +-
 .../launcher3/views/WidgetsEduView.java       | 118 ++++++++++++++++++
 .../widget/picker/WidgetsFullSheet.java       |  53 +++++++-
 30 files changed, 475 insertions(+), 65 deletions(-)
 rename res/color-night-v31/{widgets_picker_surface.xml => surface.xml} (100%)
 rename res/color-v31/{widgets_picker_surface.xml => surface.xml} (100%)
 create mode 100644 res/color/button_bg.xml
 create mode 100644 res/color/button_text.xml
 rename res/color/{widgets_picker_surface.xml => surface.xml} (100%)
 create mode 100644 res/drawable/bg_rounded_corner_bottom_sheet.xml
 create mode 100644 res/drawable/button_bottom_rounded_colored_ripple.xml
 create mode 100644 res/drawable/button_rounded_colored_ripple.xml
 create mode 100644 res/drawable/button_top_rounded_bordered_ripple.xml
 create mode 100644 res/layout/widgets_edu.xml
 create mode 100644 res/values-v28/dimens.xml
 create mode 100644 src/com/android/launcher3/views/WidgetsEduView.java

diff --git a/res/color-night-v31/widgets_picker_surface.xml b/res/color-night-v31/surface.xml
similarity index 100%
rename from res/color-night-v31/widgets_picker_surface.xml
rename to res/color-night-v31/surface.xml
diff --git a/res/color-v31/widgets_picker_surface.xml b/res/color-v31/surface.xml
similarity index 100%
rename from res/color-v31/widgets_picker_surface.xml
rename to res/color-v31/surface.xml
diff --git a/res/color/arrow_tip_view_content.xml b/res/color/arrow_tip_view_content.xml
index 87c733e7ad..7d7f98bf3d 100644
--- a/res/color/arrow_tip_view_content.xml
+++ b/res/color/arrow_tip_view_content.xml
@@ -19,5 +19,5 @@
 -->
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/white" />
+    <item android:color="?android:attr/textColorPrimaryInverse" />
 </selector>
diff --git a/res/color/button_bg.xml b/res/color/button_bg.xml
new file mode 100644
index 0000000000..91eed508b1
--- /dev/null
+++ b/res/color/button_bg.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2021, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?android:attr/colorAccent" />
+</selector>
diff --git a/res/color/button_text.xml b/res/color/button_text.xml
new file mode 100644
index 0000000000..7d7f98bf3d
--- /dev/null
+++ b/res/color/button_text.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2021, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?android:attr/textColorPrimaryInverse" />
+</selector>
diff --git a/res/color/widgets_picker_surface.xml b/res/color/surface.xml
similarity index 100%
rename from res/color/widgets_picker_surface.xml
rename to res/color/surface.xml
diff --git a/res/drawable-v28/widgets_bottom_sheet_background.xml b/res/drawable-v28/widgets_bottom_sheet_background.xml
index c3009c3752..7fb8681301 100644
--- a/res/drawable-v28/widgets_bottom_sheet_background.xml
+++ b/res/drawable-v28/widgets_bottom_sheet_background.xml
@@ -16,7 +16,7 @@
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/widgets_picker_surface" />
+    <solid android:color="@color/surface" />
     <corners
         android:topLeftRadius="?android:attr/dialogCornerRadius"
         android:topRightRadius="?android:attr/dialogCornerRadius"
diff --git a/res/drawable/add_item_dialog_background.xml b/res/drawable/add_item_dialog_background.xml
index 16a0767801..c3a82695c2 100644
--- a/res/drawable/add_item_dialog_background.xml
+++ b/res/drawable/add_item_dialog_background.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle" >
-    <solid android:color="@color/widgets_picker_surface" />
+    <solid android:color="@color/surface" />
     <corners
         android:topLeftRadius="?android:attr/dialogCornerRadius"
         android:topRightRadius="?android:attr/dialogCornerRadius" />
diff --git a/res/drawable/arrow_toast_rounded_background.xml b/res/drawable/arrow_toast_rounded_background.xml
index f3f2158186..1206ddd87b 100644
--- a/res/drawable/arrow_toast_rounded_background.xml
+++ b/res/drawable/arrow_toast_rounded_background.xml
@@ -15,5 +15,5 @@
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <solid android:color="@color/arrow_tip_view_bg" />
-    <corners android:radius="8dp" />
+    <corners android:radius="@dimen/dialogCornerRadius" />
 </shape>
diff --git a/res/drawable/bg_rounded_corner_bottom_sheet.xml b/res/drawable/bg_rounded_corner_bottom_sheet.xml
new file mode 100644
index 0000000000..aa49bced7a
--- /dev/null
+++ b/res/drawable/bg_rounded_corner_bottom_sheet.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+    <solid android:color="@color/surface" />
+    <corners
+        android:topLeftRadius="@dimen/dialogCornerRadius"
+        android:topRightRadius="@dimen/dialogCornerRadius" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/bg_widgets_searchbox.xml b/res/drawable/bg_widgets_searchbox.xml
index 3230ac86b2..dc6d868bd7 100644
--- a/res/drawable/bg_widgets_searchbox.xml
+++ b/res/drawable/bg_widgets_searchbox.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/widgets_picker_surface" />
+    <solid android:color="@color/surface" />
     <corners android:radius="24dp" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/button_bottom_rounded_colored_ripple.xml b/res/drawable/button_bottom_rounded_colored_ripple.xml
new file mode 100644
index 0000000000..95f5234089
--- /dev/null
+++ b/res/drawable/button_bottom_rounded_colored_ripple.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<inset
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <ripple
+        android:color="?android:attr/colorControlHighlight">
+        <item>
+            <shape android:shape="rectangle">
+                <corners
+                    android:topLeftRadius="4dp"
+                    android:topRightRadius="4dp"
+                    android:bottomLeftRadius="12dp"
+                    android:bottomRightRadius="12dp"  />
+                <solid android:color="@color/button_bg"/>
+            </shape>
+        </item>
+    </ripple>
+</inset>
\ No newline at end of file
diff --git a/res/drawable/button_rounded_colored_ripple.xml b/res/drawable/button_rounded_colored_ripple.xml
new file mode 100644
index 0000000000..f6d689f5aa
--- /dev/null
+++ b/res/drawable/button_rounded_colored_ripple.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<inset
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <ripple
+        android:color="?android:attr/colorControlHighlight">
+        <item>
+            <shape android:shape="rectangle">
+                <corners android:radius="12dp"/>
+                <solid android:color="@color/button_bg"/>
+            </shape>
+        </item>
+    </ripple>
+</inset>
\ No newline at end of file
diff --git a/res/drawable/button_top_rounded_bordered_ripple.xml b/res/drawable/button_top_rounded_bordered_ripple.xml
new file mode 100644
index 0000000000..f15a4a0c5f
--- /dev/null
+++ b/res/drawable/button_top_rounded_bordered_ripple.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<inset
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <ripple
+        android:color="?android:attr/colorControlHighlight">
+        <item>
+            <shape android:shape="rectangle">
+                <corners
+                    android:topLeftRadius="12dp"
+                    android:topRightRadius="12dp"
+                    android:bottomLeftRadius="4dp"
+                    android:bottomRightRadius="4dp"  />
+                <solid android:color="@color/surface"/>
+                <stroke
+                    android:width="2dp"
+                    android:color="@color/button_bg"/>
+            </shape>
+        </item>
+    </ripple>
+</inset>
\ No newline at end of file
diff --git a/res/drawable/widgets_bottom_sheet_background.xml b/res/drawable/widgets_bottom_sheet_background.xml
index 24607678c6..b877546656 100644
--- a/res/drawable/widgets_bottom_sheet_background.xml
+++ b/res/drawable/widgets_bottom_sheet_background.xml
@@ -16,7 +16,7 @@
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/widgets_picker_surface" />
+    <solid android:color="@color/surface" />
     <corners
         android:topLeftRadius="@dimen/default_dialog_corner_radius"
         android:topRightRadius="@dimen/default_dialog_corner_radius"
diff --git a/res/drawable/widgets_list_bottom_ripple.xml b/res/drawable/widgets_list_bottom_ripple.xml
index 971d6f3da7..c2debb1764 100644
--- a/res/drawable/widgets_list_bottom_ripple.xml
+++ b/res/drawable/widgets_list_bottom_ripple.xml
@@ -21,7 +21,7 @@
     android:color="?android:attr/colorControlHighlight">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
-            <solid android:color="@color/widgets_picker_surface" />
+            <solid android:color="@color/surface" />
             <corners
                 android:topLeftRadius="@dimen/widget_list_content_corner_radius"
                 android:topRightRadius="@dimen/widget_list_content_corner_radius"
@@ -31,7 +31,7 @@
     </item>
     <item android:id="@android:id/background">
         <shape android:shape="rectangle">
-            <solid android:color="@color/widgets_picker_surface" />
+            <solid android:color="@color/surface" />
             <corners
                 android:topLeftRadius="@dimen/widget_list_content_corner_radius"
                 android:topRightRadius="@dimen/widget_list_content_corner_radius"
diff --git a/res/drawable/widgets_list_middle_ripple.xml b/res/drawable/widgets_list_middle_ripple.xml
index 2b77d4d867..83f96a08c2 100644
--- a/res/drawable/widgets_list_middle_ripple.xml
+++ b/res/drawable/widgets_list_middle_ripple.xml
@@ -21,7 +21,7 @@
     android:color="?android:attr/colorControlHighlight">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
-            <solid android:color="@color/widgets_picker_surface" />
+            <solid android:color="@color/surface" />
             <corners
                 android:topLeftRadius="@dimen/widget_list_content_corner_radius"
                 android:topRightRadius="@dimen/widget_list_content_corner_radius"
@@ -32,7 +32,7 @@
 
     <item android:id="@android:id/background">
         <shape android:shape="rectangle">
-            <solid android:color="@color/widgets_picker_surface" />
+            <solid android:color="@color/surface" />
             <corners
                 android:topLeftRadius="@dimen/widget_list_content_corner_radius"
                 android:topRightRadius="@dimen/widget_list_content_corner_radius"
diff --git a/res/drawable/widgets_list_single_item_ripple.xml b/res/drawable/widgets_list_single_item_ripple.xml
index c09944ddcd..a4223a82c9 100644
--- a/res/drawable/widgets_list_single_item_ripple.xml
+++ b/res/drawable/widgets_list_single_item_ripple.xml
@@ -21,7 +21,7 @@
     android:color="?android:attr/colorControlHighlight">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
-            <solid android:color="@color/widgets_picker_surface" />
+            <solid android:color="@color/surface" />
             <corners
                 android:topLeftRadius="@dimen/widget_list_top_bottom_corner_radius"
                 android:topRightRadius="@dimen/widget_list_top_bottom_corner_radius"
@@ -31,7 +31,7 @@
     </item>
     <item android:id="@android:id/background">
         <shape android:shape="rectangle">
-            <solid android:color="@color/widgets_picker_surface" />
+            <solid android:color="@color/surface" />
             <corners
                 android:topLeftRadius="@dimen/widget_list_top_bottom_corner_radius"
                 android:topRightRadius="@dimen/widget_list_top_bottom_corner_radius"
diff --git a/res/drawable/widgets_list_top_ripple.xml b/res/drawable/widgets_list_top_ripple.xml
index f79ab72e99..bc0876e40c 100644
--- a/res/drawable/widgets_list_top_ripple.xml
+++ b/res/drawable/widgets_list_top_ripple.xml
@@ -21,7 +21,7 @@
     android:color="?android:attr/colorControlHighlight">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
-            <solid android:color="@color/widgets_picker_surface" />
+            <solid android:color="@color/surface" />
             <corners
                 android:topLeftRadius="@dimen/widget_list_top_bottom_corner_radius"
                 android:topRightRadius="@dimen/widget_list_top_bottom_corner_radius"
@@ -32,7 +32,7 @@
 
     <item android:id="@android:id/background">
         <shape android:shape="rectangle">
-            <solid android:color="@color/widgets_picker_surface" />
+            <solid android:color="@color/surface" />
             <corners
                 android:topLeftRadius="@dimen/widget_list_top_bottom_corner_radius"
                 android:topRightRadius="@dimen/widget_list_top_bottom_corner_radius"
diff --git a/res/drawable/widgets_recommendation_background.xml b/res/drawable/widgets_recommendation_background.xml
index b59de2778b..0550a34926 100644
--- a/res/drawable/widgets_recommendation_background.xml
+++ b/res/drawable/widgets_recommendation_background.xml
@@ -19,6 +19,6 @@
 -->
 <shape android:shape="rectangle"
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/widgets_picker_surface" />
+    <solid android:color="@color/surface" />
     <corners android:radius="@dimen/widget_list_top_bottom_corner_radius"/>
 </shape>
\ No newline at end of file
diff --git a/res/layout/arrow_toast.xml b/res/layout/arrow_toast.xml
index c071becb84..aee00a95ae 100644
--- a/res/layout/arrow_toast.xml
+++ b/res/layout/arrow_toast.xml
@@ -14,46 +14,22 @@
      limitations under the License.
 -->
 
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
+<merge
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="wrap_content"
     android:layout_width="wrap_content">
 
-    <LinearLayout
+    <TextView
+        android:id="@+id/text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingStart="24dp"
-        android:paddingEnd="4dp"
-        android:background="@drawable/arrow_toast_rounded_background"
         android:layout_gravity="center_horizontal"
+        android:gravity="center"
+        android:padding="16dp"
+        android:background="@drawable/arrow_toast_rounded_background"
         android:elevation="2dp"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/text"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:paddingTop="5dp"
-            android:paddingBottom="5dp"
-            android:gravity="center"
-            android:layout_gravity="center_vertical"
-            android:textColor="@color/arrow_tip_view_content"
-            android:textSize="16sp" />
-
-        <ImageView
-            android:id="@+id/dismiss"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_gravity="center_vertical"
-            android:padding="10dp"
-            android:layout_marginStart="2dp"
-            android:layout_marginEnd="2dp"
-            android:alpha="0.7"
-            android:src="@drawable/ic_remove_no_shadow"
-            android:tint="@color/arrow_tip_view_content"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/accessibility_close" />
-    </LinearLayout>
+        android:textColor="@color/arrow_tip_view_content"
+        android:textSize="14sp"/>
 
     <View
         android:id="@+id/arrow"
diff --git a/res/layout/widgets_edu.xml b/res/layout/widgets_edu.xml
new file mode 100644
index 0000000000..280c095c3c
--- /dev/null
+++ b/res/layout/widgets_edu.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.launcher3.views.WidgetsEduView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="bottom"
+    android:gravity="bottom"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/edu_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/bg_rounded_corner_bottom_sheet"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/bottom_sheet_edu_padding"
+        android:paddingTop="@dimen/bottom_sheet_edu_padding">
+
+        <TextView
+            style="@style/TextHeadline"
+            android:id="@+id/edu_header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/widget_education_header"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="24sp"
+            android:layout_marginBottom="16dp"/>
+
+        <TextView
+            android:id="@+id/edu_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/widget_education_content"
+            android:textSize="14sp"
+            android:textColor="?android:attr/textColorSecondary"
+            android:layout_marginBottom="24dp"/>
+
+        <Button
+            android:id="@+id/edu_close_button"
+            style="@style/Button.Rounded.Colored"
+            android:layout_width="match_parent"
+            android:layout_height="56dp"
+            android:text="@string/widget_education_close_button"
+            android:textSize="16sp"
+            android:textColor="@color/button_text"
+            android:layout_marginBottom="8dp"/>
+    </LinearLayout>
+</com.android.launcher3.views.WidgetsEduView>
\ No newline at end of file
diff --git a/res/values-v28/dimens.xml b/res/values-v28/dimens.xml
new file mode 100644
index 0000000000..ffa8cc4258
--- /dev/null
+++ b/res/values-v28/dimens.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <dimen name="dialogCornerRadius">?android:attr/dialogCornerRadius</dimen>
+</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c5f36ce2ea..21e978373d 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -144,7 +144,7 @@
     <dimen name="widget_row_padding">8dp</dimen>
     <dimen name="widget_row_divider">2dp</dimen>
 
-    <dimen name="widget_picker_education_tip_width">120dp</dimen>
+    <dimen name="widget_picker_education_tip_max_width">308dp</dimen>
     <dimen name="widget_picker_education_tip_min_margin">4dp</dimen>
 
     <dimen name="widget_picker_view_pager_top_padding">16dp</dimen>
@@ -283,6 +283,7 @@
 
 <!-- Theming related -->
     <dimen name="default_dialog_corner_radius">8dp</dimen>
+    <dimen name="dialogCornerRadius">@dimen/default_dialog_corner_radius</dimen>
 
     <!-- Onboarding bottomsheet related -->
     <dimen name="bottom_sheet_edu_padding">24dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index eae32b79f5..c851cf8273 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -99,6 +99,15 @@
     <!-- A widget category label for grouping widgets related to conversations. [CHAR_LIMIT=30] -->
     <string name="widget_category_conversations">Conversations</string>
 
+    <!-- Title of a dialog. This dialog lets a user know how they can use widgets on their phone.
+         [CHAR_LIMIT=NONE] -->
+    <string name="widget_education_header">Useful info at your fingertips</string>
+    <!-- Dialog text. This dialog lets a user know how they can use widgets on their phone.
+         [CHAR_LIMIT=NONE] -->
+    <string name="widget_education_content">To get info without opening apps, you can add widgets to your Home screen</string>
+    <!-- Text on the button that closes the education dialog about widgets. [CHAR_LIMIT=50] -->
+    <string name="widget_education_close_button">Got it</string>
+
     <!-- All Apps -->
     <!-- Search bar text in the apps view. [CHAR_LIMIT=50] -->
     <string name="all_apps_search_bar_hint">Search apps</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index df617ea95e..2efa377855 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -291,6 +291,21 @@
         <item name="android:background">@drawable/add_item_dialog_button_background</item>
     </style>
 
+    <style name="Button.TopRounded.Bordered" parent="@android:style/Widget.Material.Button">
+        <item name="android:background">@drawable/button_top_rounded_bordered_ripple</item>
+        <item name="android:stateListAnimator">@null</item>
+    </style>
+
+    <style name="Button.BottomRounded.Colored" parent="@android:style/Widget.Material.Button">
+        <item name="android:background">@drawable/button_bottom_rounded_colored_ripple</item>
+        <item name="android:stateListAnimator">@null</item>
+    </style>
+
+    <style name="Button.Rounded.Colored" parent="@android:style/Widget.Material.Button">
+        <item name="android:background">@drawable/button_rounded_colored_ripple</item>
+        <item name="android:stateListAnimator">@null</item>
+    </style>
+
     <style name="AddItemActivityTheme" parent="@android:style/Theme.Translucent.NoTitleBar">
         <item name="widgetsTheme">@style/WidgetContainerTheme</item>
     </style>
diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java
index 910094769a..4979b40af5 100644
--- a/src/com/android/launcher3/AbstractFloatingView.java
+++ b/src/com/android/launcher3/AbstractFloatingView.java
@@ -63,7 +63,8 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
             TYPE_TASK_MENU,
             TYPE_OPTIONS_POPUP,
             TYPE_ICON_SURFACE,
-            TYPE_PIN_WIDGET_FROM_EXTERNAL_POPUP
+            TYPE_PIN_WIDGET_FROM_EXTERNAL_POPUP,
+            TYPE_WIDGETS_EDUCATION_DIALOG
     })
     @Retention(RetentionPolicy.SOURCE)
     public @interface FloatingViewType {}
@@ -85,17 +86,19 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
     public static final int TYPE_ICON_SURFACE = 1 << 13;
 
     public static final int TYPE_PIN_WIDGET_FROM_EXTERNAL_POPUP = 1 << 14;
+    public static final int TYPE_WIDGETS_EDUCATION_DIALOG = 1 << 15;
 
     public static final int TYPE_ALL = TYPE_FOLDER | TYPE_ACTION_POPUP
             | TYPE_WIDGETS_BOTTOM_SHEET | TYPE_WIDGET_RESIZE_FRAME | TYPE_WIDGETS_FULL_SHEET
             | TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE | TYPE_TASK_MENU
             | TYPE_OPTIONS_POPUP | TYPE_SNACKBAR | TYPE_LISTENER | TYPE_ALL_APPS_EDU
-            | TYPE_ICON_SURFACE | TYPE_DRAG_DROP_POPUP | TYPE_PIN_WIDGET_FROM_EXTERNAL_POPUP;
+            | TYPE_ICON_SURFACE | TYPE_DRAG_DROP_POPUP | TYPE_PIN_WIDGET_FROM_EXTERNAL_POPUP
+            | TYPE_WIDGETS_EDUCATION_DIALOG;
 
     // Type of popups which should be kept open during launcher rebind
     public static final int TYPE_REBIND_SAFE = TYPE_WIDGETS_FULL_SHEET
             | TYPE_WIDGETS_BOTTOM_SHEET | TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE
-            | TYPE_ALL_APPS_EDU | TYPE_ICON_SURFACE;
+            | TYPE_ALL_APPS_EDU | TYPE_ICON_SURFACE | TYPE_WIDGETS_EDUCATION_DIALOG;
 
     // Usually we show the back button when a floating view is open. Instead, hide for these types.
     public static final int TYPE_HIDE_BACK_BUTTON = TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE
diff --git a/src/com/android/launcher3/views/ArrowTipView.java b/src/com/android/launcher3/views/ArrowTipView.java
index ef3df5fa37..07d377615b 100644
--- a/src/com/android/launcher3/views/ArrowTipView.java
+++ b/src/com/android/launcher3/views/ArrowTipView.java
@@ -105,10 +105,6 @@ public class ArrowTipView extends AbstractFloatingView {
     private void init(Context context) {
         inflate(context, R.layout.arrow_toast, this);
         setOrientation(LinearLayout.VERTICAL);
-        View dismissButton = findViewById(R.id.dismiss);
-        dismissButton.setOnClickListener(view -> {
-            handleClose(true);
-        });
 
         View arrowView = findViewById(R.id.arrow);
         ViewGroup.LayoutParams arrowLp = arrowView.getLayoutParams();
@@ -194,18 +190,18 @@ public class ArrowTipView extends AbstractFloatingView {
     public ArrowTipView showAtLocation(String text, int arrowXCoord, int yCoord) {
         ViewGroup parent = mActivity.getDragLayer();
         @Px int parentViewWidth = parent.getWidth();
-        @Px int textViewWidth = getContext().getResources()
-                .getDimensionPixelSize(R.dimen.widget_picker_education_tip_width);
+        @Px int maxTextViewWidth = getContext().getResources()
+                .getDimensionPixelSize(R.dimen.widget_picker_education_tip_max_width);
         @Px int minViewMargin = getContext().getResources()
                 .getDimensionPixelSize(R.dimen.widget_picker_education_tip_min_margin);
-        if (parentViewWidth < textViewWidth + 2 * minViewMargin) {
+        if (parentViewWidth < maxTextViewWidth + 2 * minViewMargin) {
             Log.w(TAG, "Cannot display tip on a small screen of size: " + parentViewWidth);
             return null;
         }
 
         TextView textView = findViewById(R.id.text);
         textView.setText(text);
-        textView.setWidth(textViewWidth);
+        textView.setMaxWidth(maxTextViewWidth);
         parent.addView(this);
         requestLayout();
 
diff --git a/src/com/android/launcher3/views/WidgetsEduView.java b/src/com/android/launcher3/views/WidgetsEduView.java
new file mode 100644
index 0000000000..e69cb5b04b
--- /dev/null
+++ b/src/com/android/launcher3/views/WidgetsEduView.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.views;
+
+import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
+
+import android.animation.PropertyValuesHolder;
+import android.content.Context;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import com.android.launcher3.Insettable;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+
+/**
+ * Education view about widgets.
+ */
+public class WidgetsEduView extends AbstractSlideInView<Launcher> implements Insettable {
+
+    private static final int DEFAULT_CLOSE_DURATION = 200;
+
+    protected static final int FINAL_SCRIM_BG_COLOR = 0x88000000;
+
+    private Rect mInsets = new Rect();
+    private View mEduView;
+
+
+    public WidgetsEduView(Context context, AttributeSet attr) {
+        this(context, attr, 0);
+    }
+
+    public WidgetsEduView(Context context, AttributeSet attrs,
+            int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mContent = this;
+    }
+
+    @Override
+    protected void handleClose(boolean animate) {
+        handleClose(true, DEFAULT_CLOSE_DURATION);
+    }
+
+    @Override
+    protected boolean isOfType(int type) {
+        return (type & TYPE_WIDGETS_EDUCATION_DIALOG) != 0;
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mEduView = findViewById(R.id.edu_view);
+        findViewById(R.id.edu_close_button)
+                .setOnClickListener(v -> close(/* animate= */ true));
+    }
+
+    @Override
+    public void setInsets(Rect insets) {
+        int leftInset = insets.left - mInsets.left;
+        int rightInset = insets.right - mInsets.right;
+        int bottomInset = insets.bottom - mInsets.bottom;
+        mInsets.set(insets);
+        setPadding(leftInset, getPaddingTop(), rightInset, 0);
+        mEduView.setPaddingRelative(mEduView.getPaddingStart(),
+                mEduView.getPaddingTop(), mEduView.getPaddingEnd(), bottomInset);
+    }
+
+    private void show() {
+        attachToContainer();
+        animateOpen();
+    }
+
+    @Override
+    protected int getScrimColor(Context context) {
+        return FINAL_SCRIM_BG_COLOR;
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        super.onLayout(changed, l, t, r, b);
+        setTranslationShift(mTranslationShift);
+    }
+
+    private void animateOpen() {
+        if (mIsOpen || mOpenCloseAnimator.isRunning()) {
+            return;
+        }
+        mIsOpen = true;
+        mOpenCloseAnimator.setValues(
+                PropertyValuesHolder.ofFloat(TRANSLATION_SHIFT, TRANSLATION_SHIFT_OPENED));
+        mOpenCloseAnimator.setInterpolator(FAST_OUT_SLOW_IN);
+        mOpenCloseAnimator.start();
+    }
+
+    /** Shows widget education dialog. */
+    public static WidgetsEduView showEducationDialog(Launcher launcher) {
+        LayoutInflater layoutInflater = LayoutInflater.from(launcher);
+        WidgetsEduView v = (WidgetsEduView) layoutInflater.inflate(
+                R.layout.widgets_edu, launcher.getDragLayer(), false);
+        v.show();
+        return v;
+    }
+}
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index fb6ac0e090..6fd16e7b6c 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -49,11 +49,14 @@ import com.android.launcher3.Insettable;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.compat.AccessibilityManagerCompat;
 import com.android.launcher3.model.WidgetItem;
+import com.android.launcher3.views.ArrowTipView;
 import com.android.launcher3.views.RecyclerViewFastScroller;
 import com.android.launcher3.views.TopRoundedCornerView;
+import com.android.launcher3.views.WidgetsEduView;
 import com.android.launcher3.widget.BaseWidgetSheet;
 import com.android.launcher3.widget.LauncherAppWidgetHost.ProviderChangedListener;
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
@@ -79,12 +82,16 @@ public class WidgetsFullSheet extends BaseWidgetSheet
     private static final long DEFAULT_OPEN_DURATION = 267;
     private static final long FADE_IN_DURATION = 150;
     private static final long EDUCATION_TIP_DELAY_MS = 200;
+    private static final long EDUCATION_DIALOG_DELAY_MS = 500;
     private static final float VERTICAL_START_POSITION = 0.3f;
     // The widget recommendation table can easily take over the entire screen on devices with small
     // resolution or landscape on phone. This ratio defines the max percentage of content area that
     // the table can display.
     private static final float RECOMMENDATION_TABLE_HEIGHT_RATIO = 0.75f;
 
+    private static final String KEY_WIDGETS_EDUCATION_DIALOG_SEEN =
+            "launcher.widgets_education_dialog_seen";
+
     private final Rect mInsets = new Rect();
     private final boolean mHasWorkProfile;
     private final SparseArray<AdapterHolder> mAdapters = new SparseArray();
@@ -93,6 +100,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
             entry -> mCurrentUser.equals(entry.mPkgItem.user);
     private final Predicate<WidgetsListBaseEntry> mWorkWidgetsFilter =
             mPrimaryWidgetsFilter.negate();
+    @Nullable private ArrowTipView mLatestEducationalTip;
     private final OnLayoutChangeListener mLayoutChangeListenerToShowTips =
             new OnLayoutChangeListener() {
                 @Override
@@ -116,11 +124,12 @@ public class WidgetsFullSheet extends BaseWidgetSheet
             removeOnLayoutChangeListener(mLayoutChangeListenerToShowTips);
             return;
         }
-        View viewForTip = getViewToShowEducationTip();
-        if (showEducationTipOnViewIfPossible(viewForTip) != null) {
+        mLatestEducationalTip = showEducationTipOnViewIfPossible(getViewToShowEducationTip());
+        if (mLatestEducationalTip != null) {
             removeOnLayoutChangeListener(mLayoutChangeListenerToShowTips);
         }
     };
+
     private final int mTabsHeight;
     private final int mViewPagerTopPadding;
     private final int mWidgetCellHorizontalPadding;
@@ -211,9 +220,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         mSearchAndRecommendationViewHolder.mSearchBar.initialize(
                 mActivityContext.getPopupDataProvider(), /* searchModeListener= */ this);
 
-        if (!hasSeenEducationTip()) {
-            addOnLayoutChangeListener(mLayoutChangeListenerToShowTips);
-        }
+        setUpEducationViewsIfNeeded();
     }
 
     @Override
@@ -598,6 +605,10 @@ public class WidgetsFullSheet extends BaseWidgetSheet
     @Override
     protected void onCloseComplete() {
         super.onCloseComplete();
+        removeCallbacks(mShowEducationTipTask);
+        if (mLatestEducationalTip != null) {
+            mLatestEducationalTip.close(false);
+        }
         AccessibilityManagerCompat.sendStateEventToTest(getContext(), NORMAL_STATE_ORDINAL);
     }
 
@@ -670,6 +681,38 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         return null;
     }
 
+    /** Shows education dialog for widgets. */
+    private WidgetsEduView showEducationDialog() {
+        mActivityContext.getSharedPrefs().edit()
+                .putBoolean(KEY_WIDGETS_EDUCATION_DIALOG_SEEN, true).apply();
+        return WidgetsEduView.showEducationDialog(mActivityContext);
+    }
+
+    /** Returns {@code true} if education dialog has previously been shown. */
+    protected boolean hasSeenEducationDialog() {
+        return mActivityContext.getSharedPrefs()
+                .getBoolean(KEY_WIDGETS_EDUCATION_DIALOG_SEEN, false)
+                || Utilities.IS_RUNNING_IN_TEST_HARNESS;
+    }
+
+    private void setUpEducationViewsIfNeeded() {
+        if (!hasSeenEducationDialog()) {
+            postDelayed(() -> {
+                WidgetsEduView eduDialog = showEducationDialog();
+                eduDialog.addOnCloseListener(() -> {
+                    if (!hasSeenEducationTip()) {
+                        addOnLayoutChangeListener(mLayoutChangeListenerToShowTips);
+                        // Call #requestLayout() to trigger layout change listener in order to show
+                        // arrow tip immediately if there is a widget to show it on.
+                        requestLayout();
+                    }
+                });
+            }, EDUCATION_DIALOG_DELAY_MS);
+        } else if (!hasSeenEducationTip()) {
+            addOnLayoutChangeListener(mLayoutChangeListenerToShowTips);
+        }
+    }
+
     /** A holder class for holding adapters & their corresponding recycler view. */
     private final class AdapterHolder {
         static final int PRIMARY = 0;
-- 
GitLab


From 8cabe52f81a6c651475962b82fbb2e3453486de9 Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Fri, 21 May 2021 17:59:19 +0100
Subject: [PATCH 1298/1664] Update buttons in pin widget picker.

Bug: 188504905
Test: Tested manually
Change-Id: Ibce57d7f70700b5f36b588ad85f8a829d4d4c5c2
---
 .../add_item_dialog_button_background.xml     | 22 --------------
 res/drawable/full_rounded_colored_ripple.xml  | 28 ++++++++++++++++++
 res/layout/add_item_confirmation_activity.xml | 29 +++++++++++--------
 res/values/styles.xml                         |  9 +++---
 4 files changed, 50 insertions(+), 38 deletions(-)
 delete mode 100644 res/drawable/add_item_dialog_button_background.xml
 create mode 100644 res/drawable/full_rounded_colored_ripple.xml

diff --git a/res/drawable/add_item_dialog_button_background.xml b/res/drawable/add_item_dialog_button_background.xml
deleted file mode 100644
index 1b4591f8c1..0000000000
--- a/res/drawable/add_item_dialog_button_background.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<inset
-    android:insetLeft="@dimen/pin_widget_button_inset_horizontal"
-    android:insetRight="@dimen/pin_widget_button_inset_horizontal"
-    android:insetTop="@dimen/pin_widget_button_inset_vertical"
-    android:insetBottom="@dimen/pin_widget_button_inset_vertical"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <ripple
-        android:color="?android:attr/colorControlHighlight">
-        <item>
-            <shape android:tint="?android:attr/colorAccent" android:shape="rectangle">
-                <corners android:radius="18dp" />
-                <solid android:color="#FFFFFF"  />
-                <padding
-                    android:left="@dimen/pin_widget_button_padding_horizontal"
-                    android:top="@dimen/pin_widget_button_padding_vertical"
-                    android:right="@dimen/pin_widget_button_padding_horizontal"
-                    android:bottom="@dimen/pin_widget_button_padding_vertical" />
-            </shape>
-        </item>
-    </ripple>
-</inset>
\ No newline at end of file
diff --git a/res/drawable/full_rounded_colored_ripple.xml b/res/drawable/full_rounded_colored_ripple.xml
new file mode 100644
index 0000000000..d89537ca0e
--- /dev/null
+++ b/res/drawable/full_rounded_colored_ripple.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<inset
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <ripple
+        android:color="?android:attr/colorControlHighlight">
+        <item>
+            <shape android:shape="rectangle">
+                <solid android:color="@color/button_bg"/>
+                <corners android:radius="28dp"/>
+            </shape>
+        </item>
+    </ripple>
+</inset>
\ No newline at end of file
diff --git a/res/layout/add_item_confirmation_activity.xml b/res/layout/add_item_confirmation_activity.xml
index 0a3fbbcd01..ddc98156e9 100644
--- a/res/layout/add_item_confirmation_activity.xml
+++ b/res/layout/add_item_confirmation_activity.xml
@@ -53,7 +53,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
-            android:paddingVertical="8dp"
+            android:paddingTop="8dp"
             android:text="@string/add_item_request_drag_hint"
             android:textSize="14sp"
             android:textColor="?android:attr/textColorSecondary"
@@ -70,28 +70,33 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="end"
-            android:padding="8dp"
+            android:gravity="center_vertical|end"
+            android:paddingHorizontal="24dp"
+            android:paddingVertical="8dp"
             android:orientation="horizontal">
             <Button
-                style="@style/Widget.DeviceDefault.Button.Rounded.Colored"
+                style="@style/Button.FullRounded.Colored"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="36dp"
                 android:paddingHorizontal="16dp"
-                android:onClick="onCancelClick"
-                android:text="@android:string/cancel" />
+                android:textSize="14sp"
+                android:textColor="@color/button_text"
+                android:text="@android:string/cancel"
+                android:onClick="onCancelClick"/>
 
             <Space
-                android:layout_width="4dp"
+                android:layout_width="8dp"
                 android:layout_height="wrap_content" />
 
             <Button
-                style="@style/Widget.DeviceDefault.Button.Rounded.Colored"
+                style="@style/Button.FullRounded.Colored"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="36dp"
                 android:paddingHorizontal="16dp"
-                android:onClick="onPlaceAutomaticallyClick"
-                android:text="@string/add_to_home_screen"/>
+                android:textSize="14sp"
+                android:textColor="@color/button_text"
+                android:text="@string/add_to_home_screen"
+                android:onClick="onPlaceAutomaticallyClick"/>
         </LinearLayout>
     </com.android.launcher3.widget.AddItemWidgetsBottomSheet>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 2efa377855..23ea9cf20f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -287,10 +287,6 @@
         <item name="android:colorForeground">@color/all_apps_bg_hand_fill_dark</item>
     </style>
 
-    <style name="Widget.DeviceDefault.Button.Rounded.Colored" parent="@android:style/Widget.DeviceDefault.Button.Colored">
-        <item name="android:background">@drawable/add_item_dialog_button_background</item>
-    </style>
-
     <style name="Button.TopRounded.Bordered" parent="@android:style/Widget.Material.Button">
         <item name="android:background">@drawable/button_top_rounded_bordered_ripple</item>
         <item name="android:stateListAnimator">@null</item>
@@ -306,6 +302,11 @@
         <item name="android:stateListAnimator">@null</item>
     </style>
 
+    <style name="Button.FullRounded.Colored" parent="@android:style/Widget.Material.Button">
+        <item name="android:background">@drawable/full_rounded_colored_ripple</item>
+        <item name="android:stateListAnimator">@null</item>
+    </style>
+
     <style name="AddItemActivityTheme" parent="@android:style/Theme.Translucent.NoTitleBar">
         <item name="widgetsTheme">@style/WidgetContainerTheme</item>
     </style>
-- 
GitLab


From 7ce8f57530a2668e1221c001c2ecbf7ccaad4d76 Mon Sep 17 00:00:00 2001
From: zakcohen <zakcohen@google.com>
Date: Thu, 27 May 2021 21:21:34 -0700
Subject: [PATCH 1299/1664] Task Overlay - refresh task overlay on size change.

The task overlay should be refreshed on size change for rotation changes.

Bug: 187515688
Test: Local
Change-Id: I1a4fa6bfbc66b9d24cfa906184bdefb9067db5ae
---
 .../quickstep/views/TaskThumbnailView.java    | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
index 02888a1f14..f730d2d31e 100644
--- a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
@@ -336,12 +336,20 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
         if (mOverlayEnabled != overlayEnabled) {
             mOverlayEnabled = overlayEnabled;
 
-            if (mOverlayEnabled) {
-                getTaskOverlay().initOverlay(mTask, mThumbnailData, mPreviewPositionHelper.mMatrix,
-                        mPreviewPositionHelper.mIsOrientationChanged);
-            } else {
-                getTaskOverlay().reset();
-            }
+            refreshOverlay();
+        }
+    }
+
+    /**
+     * Potentially re-init the task overlay. Be cautious when calling this as the overlay may
+     * do processing on initialization.
+     */
+    private void refreshOverlay() {
+        if (mOverlayEnabled) {
+            getTaskOverlay().initOverlay(mTask, mThumbnailData, mPreviewPositionHelper.mMatrix,
+                    mPreviewPositionHelper.mIsOrientationChanged);
+        } else {
+            getTaskOverlay().reset();
         }
     }
 
@@ -382,6 +390,8 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
     protected void onSizeChanged(int w, int h, int oldw, int oldh) {
         super.onSizeChanged(w, h, oldw, oldh);
         updateThumbnailMatrix();
+
+        refreshOverlay();
     }
 
     private ColorFilter getColorFilter(float dimAmount) {
-- 
GitLab


From 6e508606160773a9f50cfad599b9eab4e16416c5 Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Thu, 27 May 2021 13:48:16 -0700
Subject: [PATCH 1300/1664] Set blur on effect layer during app launch

Test: manual
Fixes: 189207458
Change-Id: I8fabba92c6831c2fd54fe08156fc9a9b5d141a56
---
 .../launcher3/QuickstepTransitionManager.java | 36 +++++++++++++++++--
 .../statehandlers/DepthController.java        | 18 ++++------
 2 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 3aa758fec2..f53d8f42c8 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -61,7 +61,9 @@ import android.os.Looper;
 import android.os.SystemProperties;
 import android.util.Pair;
 import android.util.Size;
+import android.view.SurfaceControl;
 import android.view.View;
+import android.view.ViewRootImpl;
 import android.view.animation.Interpolator;
 import android.view.animation.PathInterpolator;
 
@@ -91,6 +93,7 @@ import com.android.quickstep.views.FloatingWidgetView;
 import com.android.quickstep.views.RecentsView;
 import com.android.systemui.shared.system.ActivityCompat;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
+import com.android.systemui.shared.system.BlurUtils;
 import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
 import com.android.systemui.shared.system.QuickStepContract;
 import com.android.systemui.shared.system.RemoteAnimationAdapterCompat;
@@ -902,12 +905,39 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                 BACKGROUND_APP.getDepth(mLauncher))
                 .setDuration(APP_LAUNCH_DURATION);
         if (allowBlurringLauncher) {
-            depthController.setSurfaceToApp(RemoteAnimationProvider.findLowestOpaqueLayerTarget(
-                    appTargets, MODE_OPENING));
+            final SurfaceControl dimLayer;
+            if (BlurUtils.supportsBlursOnWindows()) {
+                // Create a temporary effect layer, that lives on top of launcher, so we can apply
+                // the blur to it. The EffectLayer will be fullscreen, which will help with caching
+                // optimizations on the SurfaceFlinger side:
+                // - Results would be able to be cached as a texture
+                // - There won't be texture allocation overhead, because EffectLayers don't have
+                //   buffers
+                ViewRootImpl viewRootImpl = mLauncher.getDragLayer().getViewRootImpl();
+                SurfaceControl parent = viewRootImpl != null
+                        ? viewRootImpl.getSurfaceControl()
+                        : null;
+                dimLayer = new SurfaceControl.Builder()
+                        .setName("Blur layer")
+                        .setParent(parent)
+                        .setOpaque(false)
+                        .setHidden(false)
+                        .setEffectLayer()
+                        .build();
+            } else {
+                dimLayer = null;
+            }
+
+            depthController.setSurface(dimLayer);
             backgroundRadiusAnim.addListener(new AnimatorListenerAdapter() {
                 @Override
                 public void onAnimationEnd(Animator animation) {
-                    depthController.setSurfaceToApp(null);
+                    depthController.setSurface(null);
+                    if (dimLayer != null) {
+                        new SurfaceControl.Transaction()
+                                .remove(dimLayer)
+                                .apply();
+                    }
                 }
             });
         }
diff --git a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
index e608885491..46ef6982ff 100644
--- a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
+++ b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
@@ -25,7 +25,9 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.os.IBinder;
 import android.util.FloatProperty;
+import android.view.SurfaceControl;
 import android.view.View;
+import android.view.ViewRootImpl;
 import android.view.ViewTreeObserver;
 
 import com.android.launcher3.BaseActivity;
@@ -37,9 +39,6 @@ import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
 import com.android.launcher3.states.StateAnimationConfig;
 import com.android.systemui.shared.system.BlurUtils;
-import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
-import com.android.systemui.shared.system.SurfaceControlCompat;
-import com.android.systemui.shared.system.TransactionCompat;
 import com.android.systemui.shared.system.WallpaperManagerCompat;
 
 /**
@@ -91,7 +90,8 @@ public class DepthController implements StateHandler<LauncherState>,
                 @Override
                 public void onDraw() {
                     View view = mLauncher.getDragLayer();
-                    setSurface(new SurfaceControlCompat(view));
+                    ViewRootImpl viewRootImpl = view.getViewRootImpl();
+                    setSurface(viewRootImpl != null ? viewRootImpl.getSurfaceControl() : null);
                     view.post(() -> view.getViewTreeObserver().removeOnDrawListener(this));
                 }
             };
@@ -102,7 +102,7 @@ public class DepthController implements StateHandler<LauncherState>,
      */
     private int mMaxBlurRadius;
     private WallpaperManagerCompat mWallpaperManager;
-    private SurfaceControlCompat mSurface;
+    private SurfaceControl mSurface;
     /**
      * Ratio from 0 to 1, where 0 is fully zoomed out, and 1 is zoomed in.
      * @see android.service.wallpaper.WallpaperService.Engine#onZoomChanged(float)
@@ -157,11 +157,7 @@ public class DepthController implements StateHandler<LauncherState>,
     /**
      * Sets the specified app target surface to apply the blur to.
      */
-    public void setSurfaceToApp(RemoteAnimationTargetCompat target) {
-        setSurface(target == null ? null : target.leash);
-    }
-
-    private void setSurface(SurfaceControlCompat surface) {
+    public void setSurface(SurfaceControl surface) {
         if (mSurface != surface) {
             mSurface = surface;
             if (surface != null) {
@@ -219,7 +215,7 @@ public class DepthController implements StateHandler<LauncherState>,
         if (supportsBlur) {
             boolean isOpaque = mLauncher.getScrimView().isFullyOpaque();
             int blur = isOpaque ? 0 : (int) (mDepth * mMaxBlurRadius);
-            new TransactionCompat()
+            new SurfaceControl.Transaction()
                     .setBackgroundBlurRadius(mSurface, blur)
                     .setOpaque(mSurface, isOpaque)
                     .apply();
-- 
GitLab


From 4c29af3a6dc8f9b6b8eb431ba3ab60883238930a Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 1 Jun 2021 12:35:43 -0700
Subject: [PATCH 1301/1664] Fixing deadlock when surface creation is waiting on
 surface destroy

Bug: 189049869
Test: Manual
Change-Id: I0f92d3666dab81bc381163d93530119d45c4fdbd
---
 .../launcher3/graphics/GridCustomizationsProvider.java       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/graphics/GridCustomizationsProvider.java b/src/com/android/launcher3/graphics/GridCustomizationsProvider.java
index 8ca157b1d4..e4f5539dbd 100644
--- a/src/com/android/launcher3/graphics/GridCustomizationsProvider.java
+++ b/src/com/android/launcher3/graphics/GridCustomizationsProvider.java
@@ -1,6 +1,7 @@
 package com.android.launcher3.graphics;
 
 import static com.android.launcher3.Utilities.getPrefs;
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.launcher3.util.Themes.KEY_THEMED_ICONS;
 import static com.android.launcher3.util.Themes.isThemedIconEnabled;
 
@@ -18,7 +19,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.IBinder.DeathRecipient;
-import android.os.Looper;
 import android.os.Message;
 import android.os.Messenger;
 import android.util.ArrayMap;
@@ -217,7 +217,8 @@ public class GridCustomizationsProvider extends ContentProvider {
             Bundle result = new Bundle();
             result.putParcelable(KEY_SURFACE_PACKAGE, renderer.getSurfacePackage());
 
-            Messenger messenger = new Messenger(new Handler(Looper.getMainLooper(), observer));
+            Messenger messenger =
+                    new Messenger(new Handler(UI_HELPER_EXECUTOR.getLooper(), observer));
             Message msg = Message.obtain();
             msg.replyTo = messenger;
             result.putParcelable(KEY_CALLBACK, msg);
-- 
GitLab


From 950388bf0e964e1f82ad90ff17ce0dc571e17d67 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 1 Jun 2021 13:56:00 -0700
Subject: [PATCH 1302/1664] Fix duplicate depth animations when swiping from
 overview to home

- Add SKIP_DEPTH_CONTROLLER in OverviewToHomeAnim if WorkspaceRevealAnim is used, because WorkspaceRevealAnim already handles the depth.

Test: visual, and also log to ensure we only get one call to DepthController#setStateWithAnimation()
Fixes: 189060172
Change-Id: Ifb4ff3278272b3e98b4cf43bf94d6e108921ea80
---
 .../src/com/android/quickstep/util/OverviewToHomeAnim.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java b/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
index badb41a7c9..5cf4f0b97f 100644
--- a/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
+++ b/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
@@ -78,6 +78,10 @@ public class OverviewToHomeAnim {
         }
 
         StateAnimationConfig config = new StateAnimationConfig();
+        if (playWorkspaceRevealAnim) {
+            // WorkspaceRevealAnim handles the depth, so don't interfere.
+            config.animFlags |= StateAnimationConfig.SKIP_DEPTH_CONTROLLER;
+        }
         config.duration = startState.getTransitionDuration(mLauncher);
         AnimatorSet stateAnim = stateManager.createAtomicAnimation(
                 startState, NORMAL, config);
-- 
GitLab


From 8d27c4c40c7ab05a253dfcbafd2d34d6a31925d0 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Tue, 1 Jun 2021 14:11:58 -0700
Subject: [PATCH 1303/1664] Delaying initializing "is launcher3" flag

Launcher3 tests may set default launcher after instantiating TAPL

Test: presubmit
Bug: 188477498
Change-Id: I6e40bc3fcf9c4f040983f164d3a04d0189228f83
---
 .../com/android/launcher3/tapl/LauncherInstrumentation.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 4cf52f071d..c99a81f0f6 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -105,7 +105,7 @@ public final class LauncherInstrumentation {
     static final Pattern EVENT_TOUCH_DOWN_TIS = getTouchEventPatternTIS("ACTION_DOWN");
     static final Pattern EVENT_TOUCH_UP_TIS = getTouchEventPatternTIS("ACTION_UP");
     private final String mLauncherPackage;
-    private final boolean mIsLauncher3;
+    private Boolean mIsLauncher3;
     private long mTestStartTime = -1;
 
     // Types for launcher containers that the user is interacting with. "Background" is a
@@ -206,7 +206,6 @@ public final class LauncherInstrumentation {
     public LauncherInstrumentation(Instrumentation instrumentation) {
         mInstrumentation = instrumentation;
         mDevice = UiDevice.getInstance(instrumentation);
-        mIsLauncher3 = "com.android.launcher3".equals(getLauncherPackageName());
 
         // Launcher should run in test harness so that custom accessibility protocol between
         // Launcher and TAPL is enabled. In-process tests enable this protocol with a direct call
@@ -1422,6 +1421,9 @@ public final class LauncherInstrumentation {
     }
 
     boolean isLauncher3() {
+        if (mIsLauncher3 == null) {
+            mIsLauncher3 = "com.android.launcher3".equals(getLauncherPackageName());
+        }
         return mIsLauncher3;
     }
 
-- 
GitLab


From 6ea5f721e52103f79e4243608f9d94599a5d9eb6 Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Tue, 1 Jun 2021 14:24:42 -0700
Subject: [PATCH 1304/1664] Adjust task menu text size and colors

Fixes: 189855320
Fixes: 189855322
Change-Id: I0df4109f91ab09211b3cb5f3d18ad7374fa3f68c
---
 quickstep/res/layout/task_menu.xml                     | 10 +++++-----
 quickstep/res/layout/task_view_menu_option.xml         |  6 +++---
 quickstep/res/values/dimens.xml                        |  3 ++-
 .../src/com/android/quickstep/views/TaskMenuView.java  |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/quickstep/res/layout/task_menu.xml b/quickstep/res/layout/task_menu.xml
index 96a94bacd5..763e45ea5b 100644
--- a/quickstep/res/layout/task_menu.xml
+++ b/quickstep/res/layout/task_menu.xml
@@ -25,15 +25,15 @@
 
     <TextView
         android:id="@+id/task_name"
-        android:background="?android:attr/textColorPrimary"
-        android:textColor="?android:attr/textColorPrimaryInverse"
+        android:background="?android:attr/colorPrimary"
+        android:textColor="?android:attr/textColorPrimary"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="center"
         android:layout_marginBottom="2dp"
-        android:paddingTop="@dimen/task_card_menu_option_vertical_padding"
-        android:paddingBottom="@dimen/task_card_menu_option_vertical_padding"
-        android:textSize="24sp"/>
+        android:paddingTop="@dimen/task_menu_vertical_padding"
+        android:paddingBottom="@dimen/task_menu_vertical_padding"
+        android:textSize="16sp"/>
 
     <LinearLayout
         android:id="@+id/menu_option_layout"
diff --git a/quickstep/res/layout/task_view_menu_option.xml b/quickstep/res/layout/task_view_menu_option.xml
index 59c7263d37..19ca3e350e 100644
--- a/quickstep/res/layout/task_view_menu_option.xml
+++ b/quickstep/res/layout/task_view_menu_option.xml
@@ -21,7 +21,7 @@
     android:orientation="vertical"
     android:paddingTop="@dimen/task_card_menu_option_vertical_padding"
     android:paddingBottom="@dimen/task_card_menu_option_vertical_padding"
-    android:background="?android:attr/textColorPrimary"
+    android:background="?android:attr/colorPrimary"
     android:theme="@style/PopupItem" >
 
     <View
@@ -30,7 +30,7 @@
       android:layout_height="@dimen/system_shortcut_icon_size"
       android:layout_marginStart="@dimen/task_menu_option_start_margin"
       android:layout_gravity="center_horizontal"
-      android:backgroundTint="?android:attr/textColorPrimaryInverse"/>
+      android:backgroundTint="?android:attr/textColorPrimary"/>
 
     <TextView
         style="@style/BaseIcon"
@@ -39,7 +39,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/task_menu_option_start_margin"
         android:textSize="14sp"
-        android:textColor="?android:attr/textColorPrimaryInverse"
+        android:textColor="?android:attr/textColorPrimary"
         android:focusable="false" />
 
 </LinearLayout>
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index b39a8d3f09..c85d3dcbdb 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -74,7 +74,8 @@
 
     <!-- Total space (start + end) between the task card and the edge of the screen
          in various configurations -->
-    <dimen name="task_card_menu_option_vertical_padding">8dp</dimen>
+    <dimen name="task_card_menu_option_vertical_padding">16dp</dimen>
+    <dimen name="task_menu_vertical_padding">8dp</dimen>
     <dimen name="task_card_margin">8dp</dimen>
     <dimen name="task_card_menu_shadow_height">3dp</dimen>
     <dimen name="task_menu_option_start_margin">12dp</dimen>
diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
index d5816b56fb..c97225ec17 100644
--- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
@@ -234,7 +234,7 @@ public class TaskMenuView extends AbstractFloatingView implements OnScrollChange
         Rect insets = mActivity.getDragLayer().getInsets();
         BaseDragLayer.LayoutParams params = (BaseDragLayer.LayoutParams) getLayoutParams();
         int padding = getResources()
-                .getDimensionPixelSize(R.dimen.task_card_menu_option_vertical_padding);
+                .getDimensionPixelSize(R.dimen.task_menu_vertical_padding);
         params.width = orientationHandler.getTaskMenuWidth(taskView.getThumbnail()) - (2 * padding);
         // Gravity set to Left instead of Start as sTempRect.left measures Left distance not Start
         params.gravity = Gravity.LEFT;
-- 
GitLab


From 0e25d2eba84c9691471fc3899c6f19958e90793c Mon Sep 17 00:00:00 2001
From: Wale Ogunwale <ogunwale@google.com>
Date: Tue, 1 Jun 2021 22:07:22 +0000
Subject: [PATCH 1305/1664] Revert "Add haptic feedback to Launcher recent apps
 scrolling"

This reverts commit b1ef5e5c55ee4e86124afb554fc48a1cd8791ea4.

Reason for revert: b/182382085#comment4

Change-Id: I001944da64dc05324b14cc9dd3db5921faf8806c
Bug: 182382085
---
 .../android/quickstep/views/RecentsView.java  | 22 --------------
 src/com/android/launcher3/PagedView.java      |  9 ------
 .../launcher3/util/VibratorWrapper.java       | 29 -------------------
 3 files changed, 60 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 197fc9c168..376cb31a90 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -76,7 +76,6 @@ import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.UserHandle;
-import android.os.VibrationEffect;
 import android.text.Layout;
 import android.text.StaticLayout;
 import android.text.TextPaint;
@@ -133,7 +132,6 @@ import com.android.launcher3.util.SplitConfigurationOptions;
 import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.util.TranslateEdgeEffect;
-import com.android.launcher3.util.VibratorWrapper;
 import com.android.launcher3.util.ViewPool;
 import com.android.quickstep.AnimatedFloat;
 import com.android.quickstep.BaseActivityInterface;
@@ -344,17 +342,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     private static final float INITIAL_DISMISS_TRANSLATION_INTERPOLATION_OFFSET = 0.55f;
     private static final float ADDITIONAL_DISMISS_TRANSLATION_INTERPOLATION_OFFSET = 0.05f;
 
-    private static final int SNAP_TO_PAGE_VIBRATION_PRIMITIVE =
-            Utilities.ATLEAST_S ? VibrationEffect.Composition.PRIMITIVE_LOW_TICK : -1;
-    private static final float SNAP_TO_PAGE_VIBRATION_PRIMITIVE_SCALE = 0.4f;
-    private static final VibrationEffect SNAP_TO_PAGE_VIBRATION_FALLBACK =
-            VibrationEffect.createPredefined(VibrationEffect.EFFECT_TEXTURE_TICK);
-    private static final int EDGE_IMPACT_VIBRATION_PRIMITIVE =
-            Utilities.ATLEAST_R ? VibrationEffect.Composition.PRIMITIVE_TICK : -1;
-    private static final float EDGE_IMPACT_VIBRATION_PRIMITIVE_SCALE = 0.8f;
-    private static final VibrationEffect EDGE_IMPACT_VIBRATION_FALLBACK =
-            VibrationEffect.createPredefined(VibrationEffect.EFFECT_TICK);
-
     protected final RecentsOrientedState mOrientationState;
     protected final BaseActivityInterface<STATE_TYPE, ACTIVITY_TYPE> mSizeStrategy;
     protected RecentsAnimationController mRecentsAnimationController;
@@ -973,8 +960,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     @Override
     protected void onPageEndTransition() {
         super.onPageEndTransition();
-        VibratorWrapper.INSTANCE.get(mContext).vibrate(SNAP_TO_PAGE_VIBRATION_PRIMITIVE,
-                SNAP_TO_PAGE_VIBRATION_PRIMITIVE_SCALE, SNAP_TO_PAGE_VIBRATION_FALLBACK);
         if (isClearAllHidden()) {
             mActionsView.updateDisabledFlags(OverviewActionsView.DISABLED_SCROLLING, false);
         }
@@ -1077,13 +1062,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         }
     }
 
-    @Override
-    protected void onEdgeAbsorbingScroll() {
-        super.onEdgeAbsorbingScroll();
-        VibratorWrapper.INSTANCE.get(mContext).vibrate(EDGE_IMPACT_VIBRATION_PRIMITIVE,
-                EDGE_IMPACT_VIBRATION_PRIMITIVE_SCALE, EDGE_IMPACT_VIBRATION_FALLBACK);
-    }
-
     @Override
     protected void determineScrollingStart(MotionEvent ev, float touchSlopScale) {
         // Enables swiping to the left or right only if the task overlay is not modal.
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 9725b068a8..b26a7ea22d 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -479,11 +479,9 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
                 if (newPos < mMinScroll && oldPos >= mMinScroll) {
                     mEdgeGlowLeft.onAbsorb((int) mScroller.getCurrVelocity());
                     mScroller.abortAnimation();
-                    onEdgeAbsorbingScroll();
                 } else if (newPos > mMaxScroll && oldPos <= mMaxScroll) {
                     mEdgeGlowRight.onAbsorb((int) mScroller.getCurrVelocity());
                     mScroller.abortAnimation();
-                    onEdgeAbsorbingScroll();
                 }
             }
 
@@ -1334,13 +1332,6 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
 
     protected void onNotSnappingToPageInFreeScroll() { }
 
-    /**
-     * Called when the view edges absorb part of the scroll. Subclasses can override this
-     * to provide custom behavior during animation.
-     */
-    protected void onEdgeAbsorbingScroll() {
-    }
-
     protected boolean shouldFlingForVelocity(int velocity) {
         float threshold = mAllowEasyFling ? mEasyFlingThresholdVelocity : mFlingThresholdVelocity;
         return Math.abs(velocity) > threshold;
diff --git a/src/com/android/launcher3/util/VibratorWrapper.java b/src/com/android/launcher3/util/VibratorWrapper.java
index 14bf6c2035..b0defd445a 100644
--- a/src/com/android/launcher3/util/VibratorWrapper.java
+++ b/src/com/android/launcher3/util/VibratorWrapper.java
@@ -21,19 +21,15 @@ import static android.provider.Settings.System.HAPTIC_FEEDBACK_ENABLED;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
-import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.database.ContentObserver;
-import android.media.AudioAttributes;
 import android.os.Build;
 import android.os.VibrationEffect;
 import android.os.Vibrator;
 import android.provider.Settings;
 
-import com.android.launcher3.Utilities;
-
 /**
  * Wrapper around {@link Vibrator} to easily perform haptic feedback where necessary.
  */
@@ -43,11 +39,6 @@ public class VibratorWrapper {
     public static final MainThreadInitializedObject<VibratorWrapper> INSTANCE =
             new MainThreadInitializedObject<>(VibratorWrapper::new);
 
-    public static final AudioAttributes VIBRATION_ATTRS = new AudioAttributes.Builder()
-            .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION)
-            .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
-            .build();
-
     public static final VibrationEffect EFFECT_CLICK =
             createPredefined(VibrationEffect.EFFECT_CLICK);
 
@@ -90,24 +81,4 @@ public class VibratorWrapper {
             UI_HELPER_EXECUTOR.execute(() -> mVibrator.vibrate(vibrationEffect));
         }
     }
-
-    /**
-     * Vibrates with a single primitive, if supported, or use a fallback effect instead. This only
-     * vibrates if haptic feedback is available and enabled.
-     */
-    @SuppressLint("NewApi")
-    public void vibrate(int primitiveId, float primitiveScale, VibrationEffect fallbackEffect) {
-        if (mHasVibrator && mIsHapticFeedbackEnabled) {
-            UI_HELPER_EXECUTOR.execute(() -> {
-                if (Utilities.ATLEAST_R && primitiveId >= 0
-                        && mVibrator.areAllPrimitivesSupported(primitiveId)) {
-                    mVibrator.vibrate(VibrationEffect.startComposition()
-                            .addPrimitive(primitiveId, primitiveScale)
-                            .compose(), VIBRATION_ATTRS);
-                } else {
-                    mVibrator.vibrate(fallbackEffect, VIBRATION_ATTRS);
-                }
-            });
-        }
-    }
 }
-- 
GitLab


From 6ed382efee0ed2571aa239dd03cbbf268aa0141f Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Tue, 1 Jun 2021 23:21:03 +0100
Subject: [PATCH 1306/1664] Remove elevation from the full widgets picker
 container

Test: Open the full widgets picker and observe no shadow added to the
      rounded corners.
Bug: 189808029
Change-Id: I539f6ebc0310cd4a037cd5eab6db4ee22b579195
---
 res/layout/widgets_full_sheet.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/res/layout/widgets_full_sheet.xml b/res/layout/widgets_full_sheet.xml
index a01aa2c581..dca3e79c62 100644
--- a/res/layout/widgets_full_sheet.xml
+++ b/res/layout/widgets_full_sheet.xml
@@ -25,8 +25,7 @@
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?android:attr/colorBackground"
-        android:elevation="4dp">
+        android:background="?android:attr/colorBackground">
 
         <TextView
             android:id="@+id/no_widgets_text"
-- 
GitLab


From 9b8ab05a179af3791e03a82036e47e331869b384 Mon Sep 17 00:00:00 2001
From: Brian Isganitis <brianji@google.com>
Date: Wed, 26 May 2021 19:13:11 -0400
Subject: [PATCH 1307/1664] Update preferences to Material Next styling

Styles are forked from SettingsLib to avoid using any private APIs.

Test: Settings root, all apps, and about have new style on S
Bug: 187732263
Fix: 188254205, 188012913
Change-Id: I0ca55eecbc82cfa5d0b8707beb4bb7c82b2aa2b1
---
 Android.bp                                    |  1 +
 AndroidManifest-common.xml                    |  2 +-
 .../home_settings_switch_thumb_color.xml      | 27 ++++++
 .../home_settings_switch_track_color.xml      | 28 ++++++
 .../home_settings_switch_thumb.xml            | 29 ++++++
 .../home_settings_switch_track.xml            | 26 +++++
 res/layout-v31/settings_activity.xml          | 69 ++++++++++++++
 res/values-night-v31/colors.xml               | 27 ++++++
 res/values-v31/colors.xml                     |  9 ++
 res/values-v31/config.xml                     | 20 ++++
 res/values-v31/styles.xml                     | 95 +++++++++++++++++++
 res/values/styles.xml                         | 10 +-
 12 files changed, 337 insertions(+), 6 deletions(-)
 create mode 100644 res/color-v31/home_settings_switch_thumb_color.xml
 create mode 100644 res/color-v31/home_settings_switch_track_color.xml
 create mode 100644 res/drawable-v31/home_settings_switch_thumb.xml
 create mode 100644 res/drawable-v31/home_settings_switch_track.xml
 create mode 100644 res/layout-v31/settings_activity.xml
 create mode 100644 res/values-night-v31/colors.xml
 create mode 100644 res/values-v31/config.xml
 create mode 100644 res/values-v31/styles.xml

diff --git a/Android.bp b/Android.bp
index 1b6ffe42b7..45d022f4fd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -112,6 +112,7 @@ android_library {
         "androidx.preference_preference",
         "androidx.slice_slice-view",
         "androidx.cardview_cardview",
+        "com.google.android.material_material",
         "iconloader_base",
     ],
     manifest: "AndroidManifest-common.xml",
diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index d725a16f80..4eecf29d67 100644
--- a/AndroidManifest-common.xml
+++ b/AndroidManifest-common.xml
@@ -144,7 +144,7 @@
         <activity
             android:name="com.android.launcher3.settings.SettingsActivity"
             android:label="@string/settings_button_text"
-            android:theme="@style/HomeSettingsTheme"
+            android:theme="@style/HomeSettings.Theme"
             android:exported="true"
             android:autoRemoveFromRecents="true">
             <intent-filter>
diff --git a/res/color-v31/home_settings_switch_thumb_color.xml b/res/color-v31/home_settings_switch_thumb_color.xml
new file mode 100644
index 0000000000..91d3d9b5e4
--- /dev/null
+++ b/res/color-v31/home_settings_switch_thumb_color.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2021 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Disabled status of thumb -->
+    <item android:state_enabled="false"
+        android:color="@color/home_settings_thumb_off_color" />
+    <!-- Toggle off status of thumb -->
+    <item android:state_checked="false"
+        android:color="@color/home_settings_thumb_off_color" />
+    <!-- Enabled or toggle on status of thumb -->
+    <item android:color="@color/home_settings_state_on_color" />
+</selector>
diff --git a/res/color-v31/home_settings_switch_track_color.xml b/res/color-v31/home_settings_switch_track_color.xml
new file mode 100644
index 0000000000..50784f527d
--- /dev/null
+++ b/res/color-v31/home_settings_switch_track_color.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2021 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Disabled status of thumb -->
+    <item android:state_enabled="false"
+        android:color="@color/home_settings_track_off_color"
+        android:alpha="?android:attr/disabledAlpha" />
+    <!-- Toggle off status of thumb -->
+    <item android:state_checked="false"
+        android:color="@color/home_settings_track_off_color" />
+    <!-- Enabled or toggle on status of thumb -->
+    <item android:color="@color/home_settings_track_on_color" />
+</selector>
diff --git a/res/drawable-v31/home_settings_switch_thumb.xml b/res/drawable-v31/home_settings_switch_thumb.xml
new file mode 100644
index 0000000000..260d5ea35f
--- /dev/null
+++ b/res/drawable-v31/home_settings_switch_thumb.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2021 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:top="4dp"
+        android:left="4dp"
+        android:right="4dp"
+        android:bottom="4dp">
+        <shape android:shape="oval" >
+            <size android:height="20dp" android:width="20dp" />
+            <solid android:color="@color/home_settings_switch_thumb_color" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable-v31/home_settings_switch_track.xml b/res/drawable-v31/home_settings_switch_track.xml
new file mode 100644
index 0000000000..502a3007a9
--- /dev/null
+++ b/res/drawable-v31/home_settings_switch_track.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2021 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    android:width="52dp"
+    android:height="28dp">
+
+    <solid android:color="@color/home_settings_switch_track_color" />
+    <corners android:radius="35dp" />
+</shape>
\ No newline at end of file
diff --git a/res/layout-v31/settings_activity.xml b/res/layout-v31/settings_activity.xml
new file mode 100644
index 0000000000..59e14f22dd
--- /dev/null
+++ b/res/layout-v31/settings_activity.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2021 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/content_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?android:attr/colorPrimary"
+        android:fitsSystemWindows="true"
+        android:outlineAmbientShadowColor="@android:color/transparent"
+        android:outlineSpotShadowColor="@android:color/transparent"
+        android:theme="@style/HomeSettings.CollapsingToolbar">
+
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:id="@+id/collapsing_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="226dp"
+            android:clipToPadding="false"
+            app:collapsedTitleTextAppearance="@style/HomeSettings.CollapsedToolbarTitle"
+            app:contentScrim="@color/home_settings_header_collapsed"
+            app:expandedTitleMarginEnd="24dp"
+            app:expandedTitleMarginStart="24dp"
+            app:expandedTitleTextAppearance="@style/HomeSettings.ExpandedToolbarTitle"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
+            app:maxLines="3"
+            app:scrimAnimationDuration="50"
+            app:scrimVisibleHeightTrigger="174dp"
+            app:statusBarScrim="@null"
+            app:titleCollapseMode="fade"
+            app:toolbarId="@id/action_bar">
+
+            <Toolbar
+                android:id="@+id/action_bar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:theme="?android:attr/actionBarTheme"
+                android:transitionName="shared_element_view"
+                app:layout_collapseMode="pin" />
+
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <FrameLayout
+        android:id="@+id/content_frame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/res/values-night-v31/colors.xml b/res/values-night-v31/colors.xml
new file mode 100644
index 0000000000..2c1bc90074
--- /dev/null
+++ b/res/values-night-v31/colors.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+/*
+* Copyright (C) 2021 The Android Open Source Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+-->
+
+<resources>
+    <color name="home_settings_header_accent">@android:color/system_accent1_100</color>
+    <color name="home_settings_header_collapsed">@android:color/system_neutral1_700</color>
+    <color name="home_settings_header_expanded">@android:color/system_neutral1_900</color>
+
+    <color name="home_settings_thumb_off_color">@android:color/system_neutral2_300</color>
+    <color name="home_settings_track_on_color">@android:color/system_accent2_700</color>
+    <color name="home_settings_track_off_color">@android:color/system_neutral1_700</color>
+</resources>
\ No newline at end of file
diff --git a/res/values-v31/colors.xml b/res/values-v31/colors.xml
index 7b37001ade..53c6a35ff1 100644
--- a/res/values-v31/colors.xml
+++ b/res/values-v31/colors.xml
@@ -37,4 +37,13 @@
 
     <color name="wallpaper_popup_scrim">@android:color/system_neutral1_900</color>
 
+    <color name="home_settings_header_accent">@android:color/system_accent1_600</color>
+    <color name="home_settings_header_collapsed">@android:color/system_neutral1_100</color>
+    <color name="home_settings_header_expanded">@android:color/system_neutral1_50</color>
+
+    <color name="home_settings_state_on_color">@android:color/system_accent1_100</color>
+    <color name="home_settings_state_off_color">@android:color/system_accent2_100</color>
+    <color name="home_settings_thumb_off_color">@android:color/system_neutral2_100</color>
+    <color name="home_settings_track_on_color">@android:color/system_accent1_600</color>
+    <color name="home_settings_track_off_color">@android:color/system_neutral2_600</color>
 </resources>
diff --git a/res/values-v31/config.xml b/res/values-v31/config.xml
new file mode 100644
index 0000000000..afb9e6d9e8
--- /dev/null
+++ b/res/values-v31/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2021 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+  -->
+<resources>
+    <bool name="home_settings_icon_space_reserved">false</bool>
+    <bool name="home_settings_allow_divider">false</bool>
+</resources>
\ No newline at end of file
diff --git a/res/values-v31/styles.xml b/res/values-v31/styles.xml
new file mode 100644
index 0000000000..0d2fce0307
--- /dev/null
+++ b/res/values-v31/styles.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright (C) 2021 The Android Open Source Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+-->
+
+<resources>
+
+    <style name="HomeSettings.Theme" parent="@android:style/Theme.DeviceDefault.Settings">
+        <item name="android:listPreferredItemPaddingEnd">16dp</item>
+        <item name="android:listPreferredItemPaddingStart">24dp</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:switchStyle">@style/HomeSettings.SwitchStyle</item>
+        <item name="android:textAppearanceListItem">@style/HomeSettings.PreferenceTitle</item>
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="preferenceTheme">@style/HomeSettings.PreferenceTheme</item>
+    </style>
+
+    <style name="HomeSettings.PreferenceTheme" parent="@style/PreferenceThemeOverlay">
+        <item name="preferenceCategoryStyle">@style/HomeSettings.CategoryStyle</item>
+        <item name="preferenceCategoryTitleTextAppearance">@style/HomeSettings.CategoryTitle</item>
+        <item name="preferenceFragmentCompatStyle">@style/HomeSettings.FragmentCompatStyle</item>
+        <item name="preferenceScreenStyle">@style/HomeSettings.PreferenceScreenStyle</item>
+        <item name="preferenceStyle">@style/HomeSettings.PreferenceStyle</item>
+        <item name="switchPreferenceStyle">@style/HomeSettings.SwitchPreferenceStyle</item>
+    </style>
+
+    <style name="HomeSettings.CategoryStyle" parent="@style/Preference.Category.Material">
+        <item name="allowDividerAbove">@bool/home_settings_allow_divider</item>
+        <item name="allowDividerBelow">@bool/home_settings_allow_divider</item>
+        <item name="iconSpaceReserved">@bool/home_settings_icon_space_reserved</item>
+    </style>
+
+    <style name="HomeSettings.PreferenceStyle" parent="@style/Preference.Material">
+        <item name="iconSpaceReserved">@bool/home_settings_icon_space_reserved</item>
+    </style>
+
+    <style name="HomeSettings.PreferenceScreenStyle"
+            parent="@style/Preference.PreferenceScreen.Material">
+        <item name="iconSpaceReserved">@bool/home_settings_icon_space_reserved</item>
+    </style>
+
+    <style name="HomeSettings.SwitchPreferenceStyle"
+            parent="@style/Preference.SwitchPreference.Material">
+        <item name="iconSpaceReserved">@bool/home_settings_icon_space_reserved</item>
+    </style>
+
+    <style name="HomeSettings.SwitchStyle"
+            parent="@android:style/Widget.Material.CompoundButton.Switch">
+        <item name="android:switchMinWidth">52dp</item>
+        <item name="android:thumb">@drawable/home_settings_switch_thumb</item>
+        <item name="android:track">@drawable/home_settings_switch_track</item>
+    </style>
+
+    <style name="HomeSettings.PreferenceTitle"
+            parent="@android:style/TextAppearance.Material.Subhead">
+        <item name="android:fontFamily">google-sans</item>
+        <item name="android:textSize">20sp</item>
+    </style>
+
+    <style name="HomeSettings.CategoryTitle" parent="@android:style/TextAppearance.Material.Body2">
+        <item name="android:fontFamily">google-sans-text-medium</item>
+    </style>
+
+    <style name="HomeSettings.CollapsingToolbar" parent="@style/Theme.MaterialComponents.DayNight">
+        <item name="colorAccent">@color/home_settings_header_accent</item>
+        <item name="colorPrimary">@color/home_settings_header_expanded</item>
+        <item name="elevationOverlayColor">?attr/colorPrimary</item>
+        <item name="elevationOverlayEnabled">true</item>
+    </style>
+
+    <style name="HomeSettings.CollapsedToolbarTitle"
+            parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
+        <item name="android:fontFamily">google-sans</item>
+    </style>
+
+    <style name="HomeSettings.ExpandedToolbarTitle" parent="HomeSettings.CollapsedToolbarTitle">
+        <item name="android:textSize">36sp</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 92824ad205..0f8169ef49 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -154,18 +154,18 @@
     <style name="AppTheme.Dark.DarkMainColor" parent="@style/LauncherTheme.Dark.DarkMainColor" />
     <style name="AppTheme.Dark.DarkText" parent="@style/LauncherTheme.Dark.DarkText" />
 
-    <style name="HomeSettingsTheme" parent="@android:style/Theme.DeviceDefault.Settings">
+    <style name="HomeSettings.Theme" parent="@android:style/Theme.DeviceDefault.Settings">
         <item name="android:navigationBarColor">?android:colorPrimaryDark</item>
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
-        <item name="preferenceTheme">@style/HomeSettingsPreferenceTheme</item>
+        <item name="preferenceTheme">@style/HomeSettings.PreferenceTheme</item>
     </style>
 
-    <style name="HomeSettingsPreferenceTheme" parent="@style/PreferenceThemeOverlay.v14.Material">
-        <item name="preferenceFragmentCompatStyle">@style/HomeSettingsFragmentCompatStyle</item>
+    <style name="HomeSettings.PreferenceTheme" parent="@style/PreferenceThemeOverlay.v14.Material">
+        <item name="preferenceFragmentCompatStyle">@style/HomeSettings.FragmentCompatStyle</item>
     </style>
 
-    <style name="HomeSettingsFragmentCompatStyle" parent="@style/PreferenceFragment.Material">
+    <style name="HomeSettings.FragmentCompatStyle" parent="@style/PreferenceFragment.Material">
         <item name="android:layout">@layout/home_settings</item>
     </style>
 
-- 
GitLab


From 49cb49b1f54de25d05f8c24e22ae7db5b79fb411 Mon Sep 17 00:00:00 2001
From: Pat Manning <patmanning@google.com>
Date: Tue, 1 Jun 2021 14:49:22 +0000
Subject: [PATCH 1308/1664] End drag touch event when crossing task drag
 threshold, and only when task is going up (drag to dismiss)

Test: manual
Fix: 188618115
Bug: 188618115
Change-Id: I51d157e224eaeee34ed131e4945bb92d6baf18cd
---
 quickstep/res/values/dimens.xml               |  5 +-
 .../TaskViewTouchController.java              | 48 ++++++++++++++-----
 2 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index c85d3dcbdb..60eeaffbbb 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -45,8 +45,9 @@
 
     <!-- These speeds are in dp/s -->
     <dimen name="max_task_dismiss_drag_velocity">2.25dp</dimen>
-    <dimen name="default_task_dismiss_drag_velocity">1.75dp</dimen>
-    <dimen name="default_task_dismiss_drag_velocity_grid">0.75dp</dimen>
+    <dimen name="default_task_dismiss_drag_velocity">1.5dp</dimen>
+    <dimen name="default_task_dismiss_drag_velocity_grid">1dp</dimen>
+    <dimen name="default_task_dismiss_drag_velocity_grid_focus_task">5dp</dimen>
 
     <dimen name="recents_page_spacing">16dp</dimen>
     <dimen name="recents_clear_all_deadzone_vertical_margin">70dp</dimen>
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
index c6ea953aff..180af0bd9f 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
@@ -21,6 +21,7 @@ import static com.android.launcher3.touch.SingleAxisSwipeDetector.DIRECTION_BOTH
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
+import android.os.SystemClock;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.animation.Interpolator;
@@ -72,6 +73,7 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
     private float mProgressMultiplier;
     private float mEndDisplacement;
     private FlingBlockCheck mFlingBlockCheck = new FlingBlockCheck();
+    private Float mOverrideVelocity = null;
 
     private TaskView mTaskBeingDragged;
 
@@ -268,6 +270,7 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
             mCurrentAnimation.pause();
         }
         mFlingBlockCheck.unblockFling();
+        mOverrideVelocity = null;
     }
 
     @Override
@@ -283,19 +286,36 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
             mFlingBlockCheck.onEvent();
         }
 
-        // Once halfway through task dismissal interpolation, switch from reversible dragging-task
-        // animation to playing the remaining task translation animations
-        if (mCurrentAnimation.getProgressFraction() < ANIMATION_PROGRESS_FRACTION_MIDPOINT) {
-            // Halve the value as we are animating the drag across the full length for only the
-            // first half of the progress
-            mCurrentAnimation.setPlayFraction(
-                    Utilities.boundToRange(totalDisplacement * mProgressMultiplier / 2, 0, 1));
+        if (isGoingUp) {
+            if (mCurrentAnimation.getProgressFraction() < ANIMATION_PROGRESS_FRACTION_MIDPOINT) {
+                // Halve the value when dismissing, as we are animating the drag across the full
+                // length for only the first half of the progress
+                mCurrentAnimation.setPlayFraction(
+                        Utilities.boundToRange(totalDisplacement * mProgressMultiplier / 2, 0, 1));
+            } else {
+                // Set mOverrideVelocity to control task dismiss velocity in onDragEnd
+                int velocityDimenId = R.dimen.default_task_dismiss_drag_velocity;
+                if (mRecentsView.showAsGrid()) {
+                    if (mTaskBeingDragged.isFocusedTask()) {
+                        velocityDimenId =
+                                R.dimen.default_task_dismiss_drag_velocity_grid_focus_task;
+                    } else {
+                        velocityDimenId = R.dimen.default_task_dismiss_drag_velocity_grid;
+                    }
+                }
+                mOverrideVelocity = -mTaskBeingDragged.getResources().getDimension(velocityDimenId);
+
+                // Once halfway through task dismissal interpolation, switch from reversible
+                // dragging-task animation to playing the remaining task translation animations
+                final long now = SystemClock.uptimeMillis();
+                MotionEvent upAction = MotionEvent.obtain(now, now,
+                        MotionEvent.ACTION_UP, 0.0f, 0.0f, 0);
+                mDetector.onTouchEvent(upAction);
+                upAction.recycle();
+            }
         } else {
-            float dragVelocity = -mTaskBeingDragged.getResources().getDimension(
-                    mRecentsView.showAsGrid() ? R.dimen.default_task_dismiss_drag_velocity_grid
-                            : R.dimen.default_task_dismiss_drag_velocity);
-            onDragEnd(dragVelocity);
-            return true;
+            mCurrentAnimation.setPlayFraction(
+                    Utilities.boundToRange(totalDisplacement * mProgressMultiplier, 0, 1));
         }
 
         return true;
@@ -303,6 +323,10 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
 
     @Override
     public void onDragEnd(float velocity) {
+        if (mOverrideVelocity != null) {
+            velocity = mOverrideVelocity;
+            mOverrideVelocity = null;
+        }
         // Limit velocity, as very large scalar values make animations play too quickly
         float maxTaskDismissDragVelocity = mTaskBeingDragged.getResources().getDimension(
                 R.dimen.max_task_dismiss_drag_velocity);
-- 
GitLab


From 243fbd3e5d3b929cdecf48f8fdc287749b02aecb Mon Sep 17 00:00:00 2001
From: zakcohen <zakcohen@google.com>
Date: Wed, 2 Jun 2021 10:33:31 -0700
Subject: [PATCH 1309/1664] AssistContentRequester move binder call to
 background thread.

The call into system server is synchronous, so make the call off the main
thread to avoid jank.

Bug: 189251291
Test: Local with flag enabled
Change-Id: I1787a0ad68488755bf19e813ecfe9fc079cfaed8
---
 .../util/AssistContentRequester.java          | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/util/AssistContentRequester.java b/quickstep/src/com/android/quickstep/util/AssistContentRequester.java
index 71c6382323..b1e38ebcbb 100644
--- a/quickstep/src/com/android/quickstep/util/AssistContentRequester.java
+++ b/quickstep/src/com/android/quickstep/util/AssistContentRequester.java
@@ -54,6 +54,7 @@ public class AssistContentRequester {
     private final IActivityTaskManager mActivityTaskManager;
     private final String mPackageName;
     private final Executor mCallbackExecutor;
+    private final Executor mSystemInteractionExecutor;
 
     // If system loses the callback, our internal cache of original callback will also get cleared.
     private final Map<Object, Callback> mPendingCallbacks =
@@ -63,6 +64,7 @@ public class AssistContentRequester {
         mActivityTaskManager = ActivityTaskManager.getService();
         mPackageName = context.getApplicationContext().getPackageName();
         mCallbackExecutor = Executors.MAIN_EXECUTOR;
+        mSystemInteractionExecutor = Executors.UI_HELPER_EXECUTOR;
     }
 
     /**
@@ -71,13 +73,16 @@ public class AssistContentRequester {
      * @param taskId to query for the content.
      * @param callback to call when the content is available, called on the main thread.
      */
-    public void requestAssistContent(int taskId, Callback callback) {
-        try {
-            mActivityTaskManager.requestAssistDataForTask(
-                    new AssistDataReceiver(callback, this), taskId, mPackageName);
-        } catch (RemoteException e) {
-            Log.e(TAG, "Requesting assist content failed for task: " + taskId, e);
-        }
+    public void requestAssistContent(final int taskId, final Callback callback) {
+        // ActivityTaskManager interaction here is synchronous, so call off the main thread.
+        mSystemInteractionExecutor.execute(() -> {
+            try {
+                mActivityTaskManager.requestAssistDataForTask(
+                        new AssistDataReceiver(callback, this), taskId, mPackageName);
+            } catch (RemoteException e) {
+                Log.e(TAG, "Requesting assist content failed for task: " + taskId, e);
+            }
+        });
     }
 
     private void executeOnMainExecutor(Runnable callback) {
-- 
GitLab


From 8796707172228fa74d77be0244568de73392983f Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Tue, 1 Jun 2021 15:17:16 +0100
Subject: [PATCH 1310/1664] Update scrim in widget pickers.

Also adjust padding in pin widget bottom sheet.

Test: Tested manually
Bug: 189802334
Change-Id: Ic25547ab1519139afdbf07aaefeb9168cf3501ff
---
 res/color-night-v31/widgets_picker_scrim.xml  | 22 +++++++++++++++++++
 res/color-v31/widgets_picker_scrim.xml        | 22 +++++++++++++++++++
 res/color/widgets_picker_scrim.xml            | 22 +++++++++++++++++++
 res/layout/add_item_confirmation_activity.xml |  4 +++-
 .../launcher3/dragndrop/AddItemActivity.java  | 13 ++++++-----
 .../launcher3/views/WidgetsEduView.java       |  4 +---
 .../widget/AddItemWidgetsBottomSheet.java     | 19 ++++++++++++++++
 .../launcher3/widget/BaseWidgetSheet.java     |  5 +----
 8 files changed, 98 insertions(+), 13 deletions(-)
 create mode 100644 res/color-night-v31/widgets_picker_scrim.xml
 create mode 100644 res/color-v31/widgets_picker_scrim.xml
 create mode 100644 res/color/widgets_picker_scrim.xml

diff --git a/res/color-night-v31/widgets_picker_scrim.xml b/res/color-night-v31/widgets_picker_scrim.xml
new file mode 100644
index 0000000000..be7010b80b
--- /dev/null
+++ b/res/color-night-v31/widgets_picker_scrim.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2021, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:color="@android:color/system_neutral1_900" android:alpha="0.8" />
+</selector>
diff --git a/res/color-v31/widgets_picker_scrim.xml b/res/color-v31/widgets_picker_scrim.xml
new file mode 100644
index 0000000000..648824ac1e
--- /dev/null
+++ b/res/color-v31/widgets_picker_scrim.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2021, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:color="@android:color/system_neutral1_200" android:alpha="0.8" />
+</selector>
diff --git a/res/color/widgets_picker_scrim.xml b/res/color/widgets_picker_scrim.xml
new file mode 100644
index 0000000000..1cf97f61f7
--- /dev/null
+++ b/res/color/widgets_picker_scrim.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2021, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#000000" android:alpha="0.32" />
+</selector>
diff --git a/res/layout/add_item_confirmation_activity.xml b/res/layout/add_item_confirmation_activity.xml
index ddc98156e9..9439baf1b3 100644
--- a/res/layout/add_item_confirmation_activity.xml
+++ b/res/layout/add_item_confirmation_activity.xml
@@ -31,7 +31,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/add_item_dialog_background"
-        android:padding="24dp"
+        android:paddingTop="24dp"
         android:theme="?attr/widgetsTheme"
         android:layout_gravity="bottom"
         android:orientation="vertical">
@@ -42,6 +42,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
+            android:paddingHorizontal="24dp"
             android:textColor="?android:attr/textColorPrimary"
             android:textSize="24sp"
             android:ellipsize="end"
@@ -53,6 +54,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
+            android:paddingHorizontal="24dp"
             android:paddingTop="8dp"
             android:text="@string/add_item_request_drag_hint"
             android:textSize="14sp"
diff --git a/src/com/android/launcher3/dragndrop/AddItemActivity.java b/src/com/android/launcher3/dragndrop/AddItemActivity.java
index 5dae5a672d..b4288ce1f5 100644
--- a/src/com/android/launcher3/dragndrop/AddItemActivity.java
+++ b/src/com/android/launcher3/dragndrop/AddItemActivity.java
@@ -59,6 +59,7 @@ import com.android.launcher3.pm.PinRequestHelper;
 import com.android.launcher3.util.SystemUiController;
 import com.android.launcher3.views.AbstractSlideInView;
 import com.android.launcher3.views.BaseDragLayer;
+import com.android.launcher3.widget.AddItemWidgetsBottomSheet;
 import com.android.launcher3.widget.LauncherAppWidgetHost;
 import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.NavigableAppWidgetHostView;
@@ -89,6 +90,7 @@ public class AddItemActivity extends BaseActivity
     private LauncherAppState mApp;
     private InvariantDeviceProfile mIdp;
     private BaseDragLayer<AddItemActivity> mDragLayer;
+    private AddItemWidgetsBottomSheet mSlideInView;
 
     private WidgetCell mWidgetCell;
 
@@ -124,8 +126,6 @@ public class AddItemActivity extends BaseActivity
         mDragLayer = findViewById(R.id.add_item_drag_layer);
         mDragLayer.recreateControllers();
         mDragLayer.setInsets(mDeviceProfile.getInsets());
-        AbstractSlideInView<AddItemActivity> slideInView = findViewById(R.id.add_item_bottom_sheet);
-        slideInView.addOnCloseListener(this);
         mWidgetCell = findViewById(R.id.widget_cell);
 
         if (mRequest.getRequestType() == PinItemRequest.REQUEST_TYPE_SHORTCUT) {
@@ -151,6 +151,9 @@ public class AddItemActivity extends BaseActivity
         TextView widgetAppName = findViewById(R.id.widget_appName);
         widgetAppName.setText(getApplicationInfo().labelRes);
 
+        mSlideInView = findViewById(R.id.add_item_bottom_sheet);
+        mSlideInView.addOnCloseListener(this);
+        mSlideInView.show();
         setupNavBarColor();
     }
 
@@ -279,7 +282,7 @@ public class AddItemActivity extends BaseActivity
      */
     public void onCancelClick(View v) {
         logCommand(LAUNCHER_ADD_EXTERNAL_ITEM_CANCELLED);
-        finish();
+        mSlideInView.close(/* animate= */ true);
     }
 
     /**
@@ -290,7 +293,7 @@ public class AddItemActivity extends BaseActivity
             ItemInstallQueue.INSTANCE.get(this).queueItem(mRequest.getShortcutInfo());
             logCommand(LAUNCHER_ADD_EXTERNAL_ITEM_PLACED_AUTOMATICALLY);
             mRequest.accept();
-            finish();
+            mSlideInView.close(/* animate= */ true);
             return;
         }
 
@@ -313,7 +316,7 @@ public class AddItemActivity extends BaseActivity
         mWidgetOptions.putInt(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId);
         mRequest.accept(mWidgetOptions);
         logCommand(LAUNCHER_ADD_EXTERNAL_ITEM_PLACED_AUTOMATICALLY);
-        finish();
+        mSlideInView.close(/* animate= */ true);
     }
 
     @Override
diff --git a/src/com/android/launcher3/views/WidgetsEduView.java b/src/com/android/launcher3/views/WidgetsEduView.java
index e69cb5b04b..c6fa98a456 100644
--- a/src/com/android/launcher3/views/WidgetsEduView.java
+++ b/src/com/android/launcher3/views/WidgetsEduView.java
@@ -35,8 +35,6 @@ public class WidgetsEduView extends AbstractSlideInView<Launcher> implements Ins
 
     private static final int DEFAULT_CLOSE_DURATION = 200;
 
-    protected static final int FINAL_SCRIM_BG_COLOR = 0x88000000;
-
     private Rect mInsets = new Rect();
     private View mEduView;
 
@@ -87,7 +85,7 @@ public class WidgetsEduView extends AbstractSlideInView<Launcher> implements Ins
 
     @Override
     protected int getScrimColor(Context context) {
-        return FINAL_SCRIM_BG_COLOR;
+        return context.getResources().getColor(R.color.widgets_picker_scrim);
     }
 
     @Override
diff --git a/src/com/android/launcher3/widget/AddItemWidgetsBottomSheet.java b/src/com/android/launcher3/widget/AddItemWidgetsBottomSheet.java
index 9e0830309e..804973f423 100644
--- a/src/com/android/launcher3/widget/AddItemWidgetsBottomSheet.java
+++ b/src/com/android/launcher3/widget/AddItemWidgetsBottomSheet.java
@@ -23,8 +23,11 @@ import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.Rect;
 import android.util.AttributeSet;
+import android.view.ViewGroup;
+import android.view.ViewParent;
 
 import com.android.launcher3.Insettable;
+import com.android.launcher3.R;
 import com.android.launcher3.dragndrop.AddItemActivity;
 import com.android.launcher3.views.AbstractSlideInView;
 
@@ -48,6 +51,17 @@ public class AddItemWidgetsBottomSheet extends AbstractSlideInView<AddItemActivi
         mContent = this;
         mInsets = new Rect();
         mCurrentConfiguration = new Configuration(getResources().getConfiguration());
+    }
+
+    /**
+     * Attaches to activity container and animates open the bottom sheet.
+     */
+    public void show() {
+        ViewParent parent = getParent();
+        if (parent instanceof ViewGroup) {
+            ((ViewGroup) parent).removeView(this);
+        }
+        attachToContainer();
         animateOpen();
     }
 
@@ -95,4 +109,9 @@ public class AddItemWidgetsBottomSheet extends AbstractSlideInView<AddItemActivi
         }
         mCurrentConfiguration.updateFrom(newConfig);
     }
+
+    @Override
+    protected int getScrimColor(Context context) {
+        return context.getResources().getColor(R.color.widgets_picker_scrim);
+    }
 }
diff --git a/src/com/android/launcher3/widget/BaseWidgetSheet.java b/src/com/android/launcher3/widget/BaseWidgetSheet.java
index e6791c3e9c..edd42b4683 100644
--- a/src/com/android/launcher3/widget/BaseWidgetSheet.java
+++ b/src/com/android/launcher3/widget/BaseWidgetSheet.java
@@ -15,8 +15,6 @@
  */
 package com.android.launcher3.widget;
 
-import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
-
 import android.content.Context;
 import android.graphics.Point;
 import android.graphics.Rect;
@@ -62,8 +60,7 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView<Launcher>
     }
 
     protected int getScrimColor(Context context) {
-        int alpha = context.getResources().getInteger(R.integer.extracted_color_gradient_alpha);
-        return setColorAlphaBound(context.getColor(R.color.wallpaper_popup_scrim), alpha);
+        return context.getResources().getColor(R.color.widgets_picker_scrim);
     }
 
     @Override
-- 
GitLab


From 09f1d8f9b7353b17fe5da6000ff62cc011591f50 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Wed, 2 Jun 2021 14:09:08 -0700
Subject: [PATCH 1311/1664] Postponing CUJ_QUICK_SWITCH and
 CUJ_APP_CLOSE_TO_HOME

Now starting at the first drawn frame.

Test: perfetto
Bug: 188645726
Change-Id: I035f225f5afe64cf6eafa9ba40cffffce0a9d8cc
---
 .../android/quickstep/AbsSwipeUpHandler.java  | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 005e9b5a7d..c05fb3fb30 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -741,10 +741,25 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
 
         if (mRecentsView != null) {
-            InteractionJankMonitorWrapper.begin(mRecentsView,
-                    InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH, 2000 /* ms timeout */);
-            InteractionJankMonitorWrapper.begin(mRecentsView,
-                    InteractionJankMonitorWrapper.CUJ_APP_CLOSE_TO_HOME);
+            mRecentsView.getViewTreeObserver().addOnDrawListener(new OnDrawListener() {
+                boolean mHandled = false;
+
+                @Override
+                public void onDraw() {
+                    if (mHandled) {
+                        return;
+                    }
+                    mHandled = true;
+
+                    InteractionJankMonitorWrapper.begin(mRecentsView,
+                            InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH, 2000 /* ms timeout */);
+                    InteractionJankMonitorWrapper.begin(mRecentsView,
+                            InteractionJankMonitorWrapper.CUJ_APP_CLOSE_TO_HOME);
+
+                    mRecentsView.post(() ->
+                            mRecentsView.getViewTreeObserver().removeOnDrawListener(this));
+                }
+            });
         }
         notifyGestureStartedAsync();
         setIsLikelyToStartNewTask(isLikelyToStartNewTask, false /* animate */);
-- 
GitLab


From 19d623d9210f2f75d25b860158da3ee6dfdd83db Mon Sep 17 00:00:00 2001
From: Weilun Du <wdu@google.com>
Date: Wed, 2 Jun 2021 20:24:50 +0000
Subject: [PATCH 1312/1664] Revert "Update preferences to Material Next
 styling"

Revert "Add dependency for settings activity collapsing toolbar"

Revert submission 14740617-collapse3

Reason for revert: Build breakage
Reverted Changes:
I5ef658979:Add dependency for settings activity collapsing to...
I0ca55eecb:Update preferences to Material Next styling

Bug: 189919452
Change-Id: I4aa0bfc473334266a951d84064b4e8e406fff0a4
---
 Android.bp                                    |  1 -
 AndroidManifest-common.xml                    |  2 +-
 .../home_settings_switch_thumb_color.xml      | 27 ------
 .../home_settings_switch_track_color.xml      | 28 ------
 .../home_settings_switch_thumb.xml            | 29 ------
 .../home_settings_switch_track.xml            | 26 -----
 res/layout-v31/settings_activity.xml          | 69 --------------
 res/values-night-v31/colors.xml               | 27 ------
 res/values-v31/colors.xml                     |  9 --
 res/values-v31/config.xml                     | 20 ----
 res/values-v31/styles.xml                     | 95 -------------------
 res/values/styles.xml                         | 10 +-
 12 files changed, 6 insertions(+), 337 deletions(-)
 delete mode 100644 res/color-v31/home_settings_switch_thumb_color.xml
 delete mode 100644 res/color-v31/home_settings_switch_track_color.xml
 delete mode 100644 res/drawable-v31/home_settings_switch_thumb.xml
 delete mode 100644 res/drawable-v31/home_settings_switch_track.xml
 delete mode 100644 res/layout-v31/settings_activity.xml
 delete mode 100644 res/values-night-v31/colors.xml
 delete mode 100644 res/values-v31/config.xml
 delete mode 100644 res/values-v31/styles.xml

diff --git a/Android.bp b/Android.bp
index 45d022f4fd..1b6ffe42b7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -112,7 +112,6 @@ android_library {
         "androidx.preference_preference",
         "androidx.slice_slice-view",
         "androidx.cardview_cardview",
-        "com.google.android.material_material",
         "iconloader_base",
     ],
     manifest: "AndroidManifest-common.xml",
diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index 4eecf29d67..d725a16f80 100644
--- a/AndroidManifest-common.xml
+++ b/AndroidManifest-common.xml
@@ -144,7 +144,7 @@
         <activity
             android:name="com.android.launcher3.settings.SettingsActivity"
             android:label="@string/settings_button_text"
-            android:theme="@style/HomeSettings.Theme"
+            android:theme="@style/HomeSettingsTheme"
             android:exported="true"
             android:autoRemoveFromRecents="true">
             <intent-filter>
diff --git a/res/color-v31/home_settings_switch_thumb_color.xml b/res/color-v31/home_settings_switch_thumb_color.xml
deleted file mode 100644
index 91d3d9b5e4..0000000000
--- a/res/color-v31/home_settings_switch_thumb_color.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2021 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Disabled status of thumb -->
-    <item android:state_enabled="false"
-        android:color="@color/home_settings_thumb_off_color" />
-    <!-- Toggle off status of thumb -->
-    <item android:state_checked="false"
-        android:color="@color/home_settings_thumb_off_color" />
-    <!-- Enabled or toggle on status of thumb -->
-    <item android:color="@color/home_settings_state_on_color" />
-</selector>
diff --git a/res/color-v31/home_settings_switch_track_color.xml b/res/color-v31/home_settings_switch_track_color.xml
deleted file mode 100644
index 50784f527d..0000000000
--- a/res/color-v31/home_settings_switch_track_color.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2021 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Disabled status of thumb -->
-    <item android:state_enabled="false"
-        android:color="@color/home_settings_track_off_color"
-        android:alpha="?android:attr/disabledAlpha" />
-    <!-- Toggle off status of thumb -->
-    <item android:state_checked="false"
-        android:color="@color/home_settings_track_off_color" />
-    <!-- Enabled or toggle on status of thumb -->
-    <item android:color="@color/home_settings_track_on_color" />
-</selector>
diff --git a/res/drawable-v31/home_settings_switch_thumb.xml b/res/drawable-v31/home_settings_switch_thumb.xml
deleted file mode 100644
index 260d5ea35f..0000000000
--- a/res/drawable-v31/home_settings_switch_thumb.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2021 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:top="4dp"
-        android:left="4dp"
-        android:right="4dp"
-        android:bottom="4dp">
-        <shape android:shape="oval" >
-            <size android:height="20dp" android:width="20dp" />
-            <solid android:color="@color/home_settings_switch_thumb_color" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/res/drawable-v31/home_settings_switch_track.xml b/res/drawable-v31/home_settings_switch_track.xml
deleted file mode 100644
index 502a3007a9..0000000000
--- a/res/drawable-v31/home_settings_switch_track.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2021 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle"
-    android:width="52dp"
-    android:height="28dp">
-
-    <solid android:color="@color/home_settings_switch_track_color" />
-    <corners android:radius="35dp" />
-</shape>
\ No newline at end of file
diff --git a/res/layout-v31/settings_activity.xml b/res/layout-v31/settings_activity.xml
deleted file mode 100644
index 59e14f22dd..0000000000
--- a/res/layout-v31/settings_activity.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2021 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/content_parent"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/app_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?android:attr/colorPrimary"
-        android:fitsSystemWindows="true"
-        android:outlineAmbientShadowColor="@android:color/transparent"
-        android:outlineSpotShadowColor="@android:color/transparent"
-        android:theme="@style/HomeSettings.CollapsingToolbar">
-
-        <com.google.android.material.appbar.CollapsingToolbarLayout
-            android:id="@+id/collapsing_toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="226dp"
-            android:clipToPadding="false"
-            app:collapsedTitleTextAppearance="@style/HomeSettings.CollapsedToolbarTitle"
-            app:contentScrim="@color/home_settings_header_collapsed"
-            app:expandedTitleMarginEnd="24dp"
-            app:expandedTitleMarginStart="24dp"
-            app:expandedTitleTextAppearance="@style/HomeSettings.ExpandedToolbarTitle"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
-            app:maxLines="3"
-            app:scrimAnimationDuration="50"
-            app:scrimVisibleHeightTrigger="174dp"
-            app:statusBarScrim="@null"
-            app:titleCollapseMode="fade"
-            app:toolbarId="@id/action_bar">
-
-            <Toolbar
-                android:id="@+id/action_bar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:theme="?android:attr/actionBarTheme"
-                android:transitionName="shared_element_view"
-                app:layout_collapseMode="pin" />
-
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <FrameLayout
-        android:id="@+id/content_frame"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/res/values-night-v31/colors.xml b/res/values-night-v31/colors.xml
deleted file mode 100644
index 2c1bc90074..0000000000
--- a/res/values-night-v31/colors.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-/*
-* Copyright (C) 2021 The Android Open Source Project
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
--->
-
-<resources>
-    <color name="home_settings_header_accent">@android:color/system_accent1_100</color>
-    <color name="home_settings_header_collapsed">@android:color/system_neutral1_700</color>
-    <color name="home_settings_header_expanded">@android:color/system_neutral1_900</color>
-
-    <color name="home_settings_thumb_off_color">@android:color/system_neutral2_300</color>
-    <color name="home_settings_track_on_color">@android:color/system_accent2_700</color>
-    <color name="home_settings_track_off_color">@android:color/system_neutral1_700</color>
-</resources>
\ No newline at end of file
diff --git a/res/values-v31/colors.xml b/res/values-v31/colors.xml
index 53c6a35ff1..7b37001ade 100644
--- a/res/values-v31/colors.xml
+++ b/res/values-v31/colors.xml
@@ -37,13 +37,4 @@
 
     <color name="wallpaper_popup_scrim">@android:color/system_neutral1_900</color>
 
-    <color name="home_settings_header_accent">@android:color/system_accent1_600</color>
-    <color name="home_settings_header_collapsed">@android:color/system_neutral1_100</color>
-    <color name="home_settings_header_expanded">@android:color/system_neutral1_50</color>
-
-    <color name="home_settings_state_on_color">@android:color/system_accent1_100</color>
-    <color name="home_settings_state_off_color">@android:color/system_accent2_100</color>
-    <color name="home_settings_thumb_off_color">@android:color/system_neutral2_100</color>
-    <color name="home_settings_track_on_color">@android:color/system_accent1_600</color>
-    <color name="home_settings_track_off_color">@android:color/system_neutral2_600</color>
 </resources>
diff --git a/res/values-v31/config.xml b/res/values-v31/config.xml
deleted file mode 100644
index afb9e6d9e8..0000000000
--- a/res/values-v31/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2021 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-  -->
-<resources>
-    <bool name="home_settings_icon_space_reserved">false</bool>
-    <bool name="home_settings_allow_divider">false</bool>
-</resources>
\ No newline at end of file
diff --git a/res/values-v31/styles.xml b/res/values-v31/styles.xml
deleted file mode 100644
index 0d2fce0307..0000000000
--- a/res/values-v31/styles.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-* Copyright (C) 2021 The Android Open Source Project
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
--->
-
-<resources>
-
-    <style name="HomeSettings.Theme" parent="@android:style/Theme.DeviceDefault.Settings">
-        <item name="android:listPreferredItemPaddingEnd">16dp</item>
-        <item name="android:listPreferredItemPaddingStart">24dp</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:switchStyle">@style/HomeSettings.SwitchStyle</item>
-        <item name="android:textAppearanceListItem">@style/HomeSettings.PreferenceTitle</item>
-        <item name="android:windowActionBar">false</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="preferenceTheme">@style/HomeSettings.PreferenceTheme</item>
-    </style>
-
-    <style name="HomeSettings.PreferenceTheme" parent="@style/PreferenceThemeOverlay">
-        <item name="preferenceCategoryStyle">@style/HomeSettings.CategoryStyle</item>
-        <item name="preferenceCategoryTitleTextAppearance">@style/HomeSettings.CategoryTitle</item>
-        <item name="preferenceFragmentCompatStyle">@style/HomeSettings.FragmentCompatStyle</item>
-        <item name="preferenceScreenStyle">@style/HomeSettings.PreferenceScreenStyle</item>
-        <item name="preferenceStyle">@style/HomeSettings.PreferenceStyle</item>
-        <item name="switchPreferenceStyle">@style/HomeSettings.SwitchPreferenceStyle</item>
-    </style>
-
-    <style name="HomeSettings.CategoryStyle" parent="@style/Preference.Category.Material">
-        <item name="allowDividerAbove">@bool/home_settings_allow_divider</item>
-        <item name="allowDividerBelow">@bool/home_settings_allow_divider</item>
-        <item name="iconSpaceReserved">@bool/home_settings_icon_space_reserved</item>
-    </style>
-
-    <style name="HomeSettings.PreferenceStyle" parent="@style/Preference.Material">
-        <item name="iconSpaceReserved">@bool/home_settings_icon_space_reserved</item>
-    </style>
-
-    <style name="HomeSettings.PreferenceScreenStyle"
-            parent="@style/Preference.PreferenceScreen.Material">
-        <item name="iconSpaceReserved">@bool/home_settings_icon_space_reserved</item>
-    </style>
-
-    <style name="HomeSettings.SwitchPreferenceStyle"
-            parent="@style/Preference.SwitchPreference.Material">
-        <item name="iconSpaceReserved">@bool/home_settings_icon_space_reserved</item>
-    </style>
-
-    <style name="HomeSettings.SwitchStyle"
-            parent="@android:style/Widget.Material.CompoundButton.Switch">
-        <item name="android:switchMinWidth">52dp</item>
-        <item name="android:thumb">@drawable/home_settings_switch_thumb</item>
-        <item name="android:track">@drawable/home_settings_switch_track</item>
-    </style>
-
-    <style name="HomeSettings.PreferenceTitle"
-            parent="@android:style/TextAppearance.Material.Subhead">
-        <item name="android:fontFamily">google-sans</item>
-        <item name="android:textSize">20sp</item>
-    </style>
-
-    <style name="HomeSettings.CategoryTitle" parent="@android:style/TextAppearance.Material.Body2">
-        <item name="android:fontFamily">google-sans-text-medium</item>
-    </style>
-
-    <style name="HomeSettings.CollapsingToolbar" parent="@style/Theme.MaterialComponents.DayNight">
-        <item name="colorAccent">@color/home_settings_header_accent</item>
-        <item name="colorPrimary">@color/home_settings_header_expanded</item>
-        <item name="elevationOverlayColor">?attr/colorPrimary</item>
-        <item name="elevationOverlayEnabled">true</item>
-    </style>
-
-    <style name="HomeSettings.CollapsedToolbarTitle"
-            parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
-        <item name="android:fontFamily">google-sans</item>
-    </style>
-
-    <style name="HomeSettings.ExpandedToolbarTitle" parent="HomeSettings.CollapsedToolbarTitle">
-        <item name="android:textSize">36sp</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 0f8169ef49..92824ad205 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -154,18 +154,18 @@
     <style name="AppTheme.Dark.DarkMainColor" parent="@style/LauncherTheme.Dark.DarkMainColor" />
     <style name="AppTheme.Dark.DarkText" parent="@style/LauncherTheme.Dark.DarkText" />
 
-    <style name="HomeSettings.Theme" parent="@android:style/Theme.DeviceDefault.Settings">
+    <style name="HomeSettingsTheme" parent="@android:style/Theme.DeviceDefault.Settings">
         <item name="android:navigationBarColor">?android:colorPrimaryDark</item>
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
-        <item name="preferenceTheme">@style/HomeSettings.PreferenceTheme</item>
+        <item name="preferenceTheme">@style/HomeSettingsPreferenceTheme</item>
     </style>
 
-    <style name="HomeSettings.PreferenceTheme" parent="@style/PreferenceThemeOverlay.v14.Material">
-        <item name="preferenceFragmentCompatStyle">@style/HomeSettings.FragmentCompatStyle</item>
+    <style name="HomeSettingsPreferenceTheme" parent="@style/PreferenceThemeOverlay.v14.Material">
+        <item name="preferenceFragmentCompatStyle">@style/HomeSettingsFragmentCompatStyle</item>
     </style>
 
-    <style name="HomeSettings.FragmentCompatStyle" parent="@style/PreferenceFragment.Material">
+    <style name="HomeSettingsFragmentCompatStyle" parent="@style/PreferenceFragment.Material">
         <item name="android:layout">@layout/home_settings</item>
     </style>
 
-- 
GitLab


From da08cb26395a9f48504d3d0129c06c412801e5d2 Mon Sep 17 00:00:00 2001
From: zakcohen <zakcohen@google.com>
Date: Wed, 2 Jun 2021 15:46:46 -0700
Subject: [PATCH 1313/1664] RecentsView - reduce work in color tint animator

Don't allocate animators when there is no animation to do. The work was
not required.

Bug: 189492167
Test: Local build, run and trace analysis
Change-Id: I111768b055ed636aa92d5d9d6b799f316a568380
---
 .../com/android/quickstep/views/RecentsView.java  | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index a0bba86e20..a4c60cf239 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -410,6 +410,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     // TODO(b/187528071): Remove these and replace with a real scrim.
     private float mColorTint;
     private final int mTintingColor;
+    private ObjectAnimator mTintingAnimator;
 
     private int mOverScrollShift = 0;
 
@@ -3693,9 +3694,17 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
      * tasks to be dimmed while other elements in the recents view are left alone.
      */
     public void showForegroundScrim(boolean show) {
-        ObjectAnimator anim = ObjectAnimator.ofFloat(this, COLOR_TINT, show ? 0.5f : 0f);
-        anim.setAutoCancel(true);
-        anim.start();
+        if (!show && mColorTint == 0) {
+            if (mTintingAnimator != null) {
+                mTintingAnimator.cancel();
+                mTintingAnimator = null;
+            }
+            return;
+        }
+
+        mTintingAnimator = ObjectAnimator.ofFloat(this, COLOR_TINT, show ? 0.5f : 0f);
+        mTintingAnimator.setAutoCancel(true);
+        mTintingAnimator.start();
     }
 
     /** Tint the RecentsView and TaskViews in to simulate a scrim. */
-- 
GitLab


From 1bd7ccd90b611bae9ac1f2696382a54d0d3eb471 Mon Sep 17 00:00:00 2001
From: Jon Spivack <spivack@google.com>
Date: Wed, 2 Jun 2021 15:55:06 -0700
Subject: [PATCH 1314/1664] TaskOverlayFactoryGo: Keep persistent instance of
 AssistContentRequester

Holding a reference to AssistContentRequester prevents it from being deleted by the garbage collector while it is still in use.

Bug: 189985872
Test: Manual (Pixel 3A)
Test: m -j RunLauncherGoGoogleRoboTests
Change-Id: I204aab907175a171c496c3bd146a8b23d2bbcf16
---
 .../quickstep/TaskOverlayFactoryGo.java        | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
index 754782bd49..65cdcf06ba 100644
--- a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
+++ b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
@@ -53,14 +53,17 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
     public static final int ERROR_PERMISSIONS = 1;
     private static final String TAG = "TaskOverlayFactoryGo";
 
-    // Empty constructor required for ResourceBasedOverride
-    public TaskOverlayFactoryGo(Context context) {}
+    private AssistContentRequester mContentRequester;
+
+    public TaskOverlayFactoryGo(Context context) {
+        mContentRequester = new AssistContentRequester(context);
+    }
 
     /**
      * Create a new overlay instance for the given View
      */
     public TaskOverlayGo createOverlay(TaskThumbnailView thumbnailView) {
-        return new TaskOverlayGo(thumbnailView);
+        return new TaskOverlayGo(thumbnailView, mContentRequester);
     }
 
     /**
@@ -72,9 +75,12 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
         private String mTaskPackageName;
         private String mWebUrl;
         private boolean mAssistPermissionsEnabled;
+        private AssistContentRequester mFactoryContentRequester;
 
-        private TaskOverlayGo(TaskThumbnailView taskThumbnailView) {
+        private TaskOverlayGo(TaskThumbnailView taskThumbnailView,
+                AssistContentRequester assistContentRequester) {
             super(taskThumbnailView);
+            mFactoryContentRequester = assistContentRequester;
         }
 
         /**
@@ -105,9 +111,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
             }
 
             int taskId = task.key.id;
-            AssistContentRequester contentRequester =
-                    new AssistContentRequester(mApplicationContext);
-            contentRequester.requestAssistContent(taskId, this::onAssistContentReceived);
+            mFactoryContentRequester.requestAssistContent(taskId, this::onAssistContentReceived);
         }
 
         /** Provide Assist Content to the overlay. */
-- 
GitLab


From 2b006fb27b81c03eb3afb1aef48073dd50e5d6a8 Mon Sep 17 00:00:00 2001
From: shawnlin <shawnlin@google.com>
Date: Thu, 3 Jun 2021 12:57:13 +0800
Subject: [PATCH 1315/1664] Detach the nav once the endTarget is determined as
 HOME

Bug: 189900722
Test: manual - swipe up to home from an app and observe the nav
Change-Id: I421de17fe4d8413deaf9ebd63166a6d2d00d096e
---
 .../src/com/android/quickstep/AbsSwipeUpHandler.java      | 6 +++++-
 .../com/android/quickstep/RecentsAnimationController.java | 8 ++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index be927e0107..306032cff2 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -972,6 +972,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         }
         if (endTarget == HOME) {
             duration = HOME_DURATION;
+            // Early detach the nav bar once the endTarget is determined as HOME
+            if (mRecentsAnimationController != null) {
+                mRecentsAnimationController.detachNavigationBarFromApp(true);
+            }
         } else if (endTarget == RECENTS) {
             if (mRecentsView != null) {
                 int nearestPage = mRecentsView.getDestinationPage();
@@ -1496,7 +1500,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         if (LIVE_TILE.get()) {
             mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);
             if (mRecentsAnimationController != null) {
-                mRecentsAnimationController.getController().detachNavigationBarFromApp(true);
+                mRecentsAnimationController.detachNavigationBarFromApp(true);
             }
         } else if (!hasTargets() || mRecentsAnimationController == null) {
             // If there are no targets or the animation not started, then there is nothing to finish
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationController.java b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
index 462f71440c..50d0569cf2 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationController.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
@@ -154,6 +154,14 @@ public class RecentsAnimationController {
         });
     }
 
+    /**
+     * @see RecentsAnimationControllerCompat#detachNavigationBarFromApp
+     */
+    @UiThread
+    public void detachNavigationBarFromApp(boolean moveHomeToTop) {
+        UI_HELPER_EXECUTOR.execute(() -> mController.detachNavigationBarFromApp(moveHomeToTop));
+    }
+
     /**
      * Sets the final surface transaction on a Task. This is used by Launcher to notify the system
      * that animating Activity to PiP has completed and the associated task surface should be
-- 
GitLab


From abd33b38e2a37ca24b70247fff9fe80b9e38b975 Mon Sep 17 00:00:00 2001
From: Stevie Kideckel <kideckel@google.com>
Date: Wed, 2 Jun 2021 16:57:18 +0000
Subject: [PATCH 1316/1664] Use the LayoutManager as the source of truth for
 visible positions

During animations, the view group child may not correspond to the
visible views that appear at the top.

The previous logic is kept in the case that the layout manager returns
null for any reason, which can happen before layout has occurred for the
position.

Fix: 189588014
Test: verified locally
Change-Id: Ie8b5dcef50287e9e90a21f86e30a1ebcbbcba30f
---
 .../widget/picker/WidgetsRecyclerView.java    | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java b/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
index e30e245452..090362ba33 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
@@ -154,8 +154,25 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
             return -1;
         }
 
-        View child = getChildAt(0);
-        int rowIndex = getChildPosition(child);
+        int rowIndex = -1;
+        View child = null;
+
+        LayoutManager layoutManager = getLayoutManager();
+        if (layoutManager instanceof LinearLayoutManager) {
+            // Use the LayoutManager as the source of truth for visible positions. During
+            // animations, the view group child may not correspond to the visible views that appear
+            // at the top.
+            rowIndex = ((LinearLayoutManager) layoutManager).findFirstVisibleItemPosition();
+            child = layoutManager.findViewByPosition(rowIndex);
+        }
+
+        if (child == null) {
+            // If the layout manager returns null for any reason, which can happen before layout
+            // has occurred for the position, then look at the child of this view as a ViewGroup.
+            child = getChildAt(0);
+            rowIndex = getChildPosition(child);
+        }
+
         for (int i = 0; i < getChildCount(); i++) {
             View view = getChildAt(i);
             if (view instanceof TableLayout) {
-- 
GitLab


From eb367e471b03a9edbb4499a230e4d8433b596d9f Mon Sep 17 00:00:00 2001
From: Stevie Kideckel <kideckel@google.com>
Date: Wed, 2 Jun 2021 16:21:54 +0000
Subject: [PATCH 1317/1664] Scroll to the selected widget picker row after
 headers are clicked

This keeps the row in view. Currently, this will scroll the row to the
centre-bottom of the screen due to the top padding being double counted,
but that will remedied in a future CL.

This also resolves the issue where the last row's widgets aren't visible
by handling that case specially

Fix: 188665456
Bug: 183378651
Test: verified locally
Change-Id: I9acb9087a8cdaf130ac5955c810c96462b368f36
---
 .../widget/picker/WidgetsListAdapter.java     | 55 +++++++++++++++++--
 1 file changed, 51 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
index 7963431932..3936ec8e80 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
@@ -25,6 +25,7 @@ import android.view.View.OnLongClickListener;
 import android.view.ViewGroup;
 import android.widget.TableRow;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.Adapter;
@@ -48,8 +49,10 @@ import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
+import java.util.OptionalInt;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 /**
  * Recycler view adapter for the widget tray.
@@ -87,6 +90,7 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
                     || new PackageUserKey(entry.mPkgItem.packageName, entry.mPkgItem.user)
                             .equals(mWidgetsContentVisiblePackageUserKey);
     @Nullable private Predicate<WidgetsListBaseEntry> mFilter = null;
+    @Nullable private RecyclerView mRecyclerView;
 
     public WidgetsListAdapter(Context context, LayoutInflater layoutInflater,
             WidgetPreviewLoader widgetPreviewLoader, IconCache iconCache,
@@ -106,6 +110,16 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
                         layoutInflater, /*onHeaderClickListener=*/ this, /* listAdapter= */ this));
     }
 
+    @Override
+    public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
+        mRecyclerView = recyclerView;
+    }
+
+    @Override
+    public void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) {
+        mRecyclerView = null;
+    }
+
     public void setFilter(Predicate<WidgetsListBaseEntry> filter) {
         mFilter = filter;
     }
@@ -168,12 +182,10 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
         mAllEntries.forEach(entry -> {
             if (entry instanceof WidgetsListHeaderEntry) {
                 ((WidgetsListHeaderEntry) entry).setIsWidgetListShown(
-                        new PackageUserKey(entry.mPkgItem.packageName, entry.mPkgItem.user)
-                                .equals(mWidgetsContentVisiblePackageUserKey));
+                        isHeaderForVisibleContent(entry));
             } else if (entry instanceof WidgetsListSearchHeaderEntry) {
                 ((WidgetsListSearchHeaderEntry) entry).setIsWidgetListShown(
-                        new PackageUserKey(entry.mPkgItem.packageName, entry.mPkgItem.user)
-                                .equals(mWidgetsContentVisiblePackageUserKey));
+                        isHeaderForVisibleContent(entry));
             }
         });
         List<WidgetsListBaseEntry> newVisibleEntries = mAllEntries.stream()
@@ -183,6 +195,13 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
         mDiffReporter.process(mVisibleEntries, newVisibleEntries, mRowComparator);
     }
 
+    private boolean isHeaderForVisibleContent(WidgetsListBaseEntry entry) {
+        return (entry instanceof WidgetsListHeaderEntry
+                || entry instanceof WidgetsListSearchHeaderEntry)
+                && new PackageUserKey(entry.mPkgItem.packageName, entry.mPkgItem.user)
+                .equals(mWidgetsContentVisiblePackageUserKey);
+    }
+
     /**
      * Resets any expanded widget header.
      */
@@ -247,12 +266,40 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
         if (showWidgets) {
             mWidgetsContentVisiblePackageUserKey = packageUserKey;
             updateVisibleEntries();
+            // Scroll the layout manager to the header position to keep it anchored to the same
+            // position.
+            scrollToSelectedHeaderPosition();
         } else if (packageUserKey.equals(mWidgetsContentVisiblePackageUserKey)) {
             mWidgetsContentVisiblePackageUserKey = null;
             updateVisibleEntries();
         }
     }
 
+    private void scrollToSelectedHeaderPosition() {
+        OptionalInt selectedHeaderPosition =
+                IntStream.range(0, mVisibleEntries.size())
+                        .filter(index -> isHeaderForVisibleContent(mVisibleEntries.get(index)))
+                        .findFirst();
+        RecyclerView.LayoutManager layoutManager =
+                mRecyclerView == null ? null : mRecyclerView.getLayoutManager();
+        if (!selectedHeaderPosition.isPresent() || layoutManager == null) {
+            return;
+        }
+
+        // Scroll to the selected header position. LinearLayoutManager scrolls the minimum distance
+        // necessary, so this will keep the selected header in place during clicks, without
+        // interrupting the animation.
+        int position = selectedHeaderPosition.getAsInt();
+        if (position == mVisibleEntries.size() - 2) {
+            // If the selected header is in the last position (-1 for the content), then scroll to
+            // the final position so the last list of widgets will show.
+            layoutManager.scrollToPosition(mVisibleEntries.size() - 1);
+        } else {
+            // Otherwise, scroll to the position of the selected header.
+            layoutManager.scrollToPosition(position);
+        }
+    }
+
     /**
      * Sets the max horizontal spans that are allowed for grouping more than one widgets in a table
      * row.
-- 
GitLab


From d7dc5702f6871e021c79e78ee03b7081b03bbe08 Mon Sep 17 00:00:00 2001
From: Stevie Kideckel <kideckel@google.com>
Date: Thu, 3 Jun 2021 16:18:02 +0000
Subject: [PATCH 1318/1664] Use scrollToPositionWithOffset in widget list and
 account for padding

Also, scroll after collapsing as well to preserve the header position.
LinearLayoutManager seems to not count/double count the top padding of
the RecyclerView when scrolling to the position. Scrolling with the
offset and deducting the top padding works around the issue.

There's still some occasional weirdness that needs to be investigated,
but this works well...most of the time.

Bug: 183378651
Test: locally
Change-Id: I0ba85fb65411991ef781f08a69faaa993a7d7fd0
---
 .../widget/picker/WidgetsListAdapter.java     | 61 ++++++++++++-------
 1 file changed, 40 insertions(+), 21 deletions(-)

diff --git a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
index 3936ec8e80..5010629639 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
@@ -20,6 +20,7 @@ import android.os.Process;
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
+import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
 import android.view.ViewGroup;
@@ -27,6 +28,7 @@ import android.widget.TableRow;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.Adapter;
 import androidx.recyclerview.widget.RecyclerView.ViewHolder;
@@ -268,36 +270,53 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
             updateVisibleEntries();
             // Scroll the layout manager to the header position to keep it anchored to the same
             // position.
-            scrollToSelectedHeaderPosition();
+            scrollToPositionAndMaintainOffset(getSelectedHeaderPosition());
         } else if (packageUserKey.equals(mWidgetsContentVisiblePackageUserKey)) {
+            OptionalInt previouslySelectedPosition = getSelectedHeaderPosition();
+
             mWidgetsContentVisiblePackageUserKey = null;
             updateVisibleEntries();
+
+            // Scroll to the header that was just collapsed so it maintains its scroll offset.
+            scrollToPositionAndMaintainOffset(previouslySelectedPosition);
         }
     }
 
-    private void scrollToSelectedHeaderPosition() {
-        OptionalInt selectedHeaderPosition =
-                IntStream.range(0, mVisibleEntries.size())
-                        .filter(index -> isHeaderForVisibleContent(mVisibleEntries.get(index)))
-                        .findFirst();
-        RecyclerView.LayoutManager layoutManager =
-                mRecyclerView == null ? null : mRecyclerView.getLayoutManager();
-        if (!selectedHeaderPosition.isPresent() || layoutManager == null) {
-            return;
-        }
+    private OptionalInt getSelectedHeaderPosition() {
+        return IntStream.range(0, mVisibleEntries.size())
+                .filter(index -> isHeaderForVisibleContent(mVisibleEntries.get(index)))
+                .findFirst();
+    }
 
-        // Scroll to the selected header position. LinearLayoutManager scrolls the minimum distance
-        // necessary, so this will keep the selected header in place during clicks, without
-        // interrupting the animation.
-        int position = selectedHeaderPosition.getAsInt();
-        if (position == mVisibleEntries.size() - 2) {
-            // If the selected header is in the last position (-1 for the content), then scroll to
-            // the final position so the last list of widgets will show.
+    /**
+     * Scrolls to the selected header position. LinearLayoutManager scrolls the minimum distance
+     * necessary, so this will keep the selected header in place during clicks, without interrupting
+     * the animation.
+     */
+    private void scrollToPositionAndMaintainOffset(OptionalInt positionOptional) {
+        if (!positionOptional.isPresent() || mRecyclerView == null) return;
+        int position = positionOptional.getAsInt();
+
+        LinearLayoutManager layoutManager = (LinearLayoutManager) mRecyclerView.getLayoutManager();
+        if (layoutManager == null) return;
+
+        if (position == mVisibleEntries.size() - 2
+                && mVisibleEntries.get(mVisibleEntries.size() - 1)
+                instanceof WidgetsListContentEntry) {
+            // If the selected header is in the last position and its content is showing, then
+            // scroll to the final position so the last list of widgets will show.
             layoutManager.scrollToPosition(mVisibleEntries.size() - 1);
-        } else {
-            // Otherwise, scroll to the position of the selected header.
-            layoutManager.scrollToPosition(position);
+            return;
         }
+
+        // Scroll to the header view's current offset, accounting for the recycler view's padding.
+        // If the header view couldn't be found, then it will appear at the top of the list.
+        View headerView = layoutManager.findViewByPosition(position);
+        int targetHeaderViewTop =
+                headerView == null ? 0 : layoutManager.getDecoratedTop(headerView);
+        layoutManager.scrollToPositionWithOffset(
+                position,
+                targetHeaderViewTop - mRecyclerView.getPaddingTop());
     }
 
     /**
-- 
GitLab


From 4981118478921c227fcba4f0991723efbc848a71 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Thu, 3 Jun 2021 09:52:40 -0700
Subject: [PATCH 1319/1664] Only inset widgets if workspaceTopPadding is
 greater than the widget padding.

This prevents widget from becoming too close to status bar.

Bug: 189724771
Test: manual
Change-Id: I86f83b6a35bd2802bdbdf175340a379b498f481d
---
 src/com/android/launcher3/DeviceProfile.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index cdc09f10d6..e9245b0819 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -399,8 +399,10 @@ public class DeviceProfile {
     public boolean shouldInsetWidgets() {
         Rect widgetPadding = inv.defaultWidgetPadding;
 
-        // Check all sides to ensure that the widget won't overlap into another cell.
-        return cellLayoutBorderSpacingPx > widgetPadding.left
+        // Check all sides to ensure that the widget won't overlap into another cell, or into
+        // status bar.
+        return workspaceTopPadding > widgetPadding.top
+                && cellLayoutBorderSpacingPx > widgetPadding.left
                 && cellLayoutBorderSpacingPx > widgetPadding.top
                 && cellLayoutBorderSpacingPx > widgetPadding.right
                 && cellLayoutBorderSpacingPx > widgetPadding.bottom;
-- 
GitLab


From 945bb34b5efbd78a9701f431da1a5b866e0a3d90 Mon Sep 17 00:00:00 2001
From: Bill Lin <lbill@google.com>
Date: Thu, 3 Jun 2021 01:29:39 +0800
Subject: [PATCH 1320/1664] 1/ Provides feasibility to adjust touch slop in
 TouchController

There is a case when one handed mode triggered(Activated), all apps
drawer is very easy to trigger while user swipe up around NavBar
region to exit one handed mode. Since System Gesture monitor regsion
is small on screen bottom, swipe-up gesture usually cross over NavBar
monitor region and invoke launcher touch controller intercept touch
event and introduce unexpectedly trigger all apps drawer.

Adding onOneHandedModeStateChanged(boolean activated) for controller
be able to adjust the touch slop by multiplier, we can set a larger
multiplier when the visible window size translate become smaller
and make swipe gesture not too sensitive.

Test: manual swipe up to swich "home <-> all apps" and monitor
      minDisplacement of SingleAxisSwipeDetector
Test: Trigger one handed mode and swipe up to exit one handed mode
      check the minDisplacement of SingleAxisSwipeDetector
Bug: 186235522
Change-Id: I9729cd408d85b2b22582bf800e28d1471fc06980
---
 ...NoButtonNavbarToOverviewTouchController.java | 12 +++++++++++-
 .../android/launcher3/dragndrop/DragLayer.java  | 11 +++++++++++
 .../touch/SingleAxisSwipeDetector.java          | 17 ++++++++++++++++-
 .../android/launcher3/util/TouchController.java |  5 +++++
 4 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
index eb62110065..283743dc64 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -51,7 +51,7 @@ import com.android.quickstep.views.RecentsView;
  * first home screen instead of to Overview.
  */
 public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouchController {
-
+    private static final float ONE_HANDED_ACTIVATED_SLOP_MULTIPLIER = 2.5f;
 
     // How much of the movement to use for translating overview after swipe and hold.
     private static final float OVERVIEW_MOVEMENT_FACTOR = 0.25f;
@@ -260,4 +260,14 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
     private float dpiFromPx(float pixels) {
         return Utilities.dpiFromPx(pixels, mLauncher.getResources().getDisplayMetrics().densityDpi);
     }
+
+    @Override
+    public void onOneHandedModeStateChanged(boolean activated) {
+        if (activated) {
+            mDetector.setTouchSlopMultiplier(ONE_HANDED_ACTIVATED_SLOP_MULTIPLIER);
+        } else {
+            // Reset touch slop multiplier to default 1.0f
+            mDetector.setTouchSlopMultiplier(1f /* default */);
+        }
+    }
 }
diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java
index c2f609c6a7..011325d6cf 100644
--- a/src/com/android/launcher3/dragndrop/DragLayer.java
+++ b/src/com/android/launcher3/dragndrop/DragLayer.java
@@ -48,6 +48,7 @@ import com.android.launcher3.folder.Folder;
 import com.android.launcher3.graphics.Scrim;
 import com.android.launcher3.keyboard.ViewGroupFocusHelper;
 import com.android.launcher3.util.Thunk;
+import com.android.launcher3.util.TouchController;
 import com.android.launcher3.views.BaseDragLayer;
 
 import java.util.ArrayList;
@@ -519,4 +520,14 @@ public class DragLayer extends BaseDragLayer<Launcher> {
     public Scrim getWorkspaceDragScrim() {
         return mWorkspaceDragScrim;
     }
+
+    /**
+     * Called when one handed mode state changed.
+     * @param activated true if one handed mode activated, false otherwise.
+     */
+    public void onOneHandedModeStateChanged(boolean activated) {
+        for (TouchController controller : mControllers) {
+            controller.onOneHandedModeStateChanged(activated);
+        }
+    }
 }
diff --git a/src/com/android/launcher3/touch/SingleAxisSwipeDetector.java b/src/com/android/launcher3/touch/SingleAxisSwipeDetector.java
index 8c3c115334..f751b7d505 100644
--- a/src/com/android/launcher3/touch/SingleAxisSwipeDetector.java
+++ b/src/com/android/launcher3/touch/SingleAxisSwipeDetector.java
@@ -102,6 +102,8 @@ public class SingleAxisSwipeDetector extends BaseSwipeDetector {
 
     private int mScrollDirections;
 
+    private float mTouchSlopMultiplier = 1f;
+
     public SingleAxisSwipeDetector(@NonNull Context context, @NonNull Listener l,
             @NonNull Direction dir) {
         this(ViewConfiguration.get(context), l, dir, Utilities.isRtl(context.getResources()));
@@ -115,6 +117,19 @@ public class SingleAxisSwipeDetector extends BaseSwipeDetector {
         mDir = dir;
     }
 
+    /**
+     * Provides feasibility to adjust touch slop when visible window size changed. When visible
+     * bounds translate become smaller, multiply a larger multiplier could ensure the UX
+     * more consistent.
+     *
+     * @see #shouldScrollStart(PointF)
+     *
+     * @param touchSlopMultiplier the value to multiply original touch slop.
+     */
+    public void setTouchSlopMultiplier(float touchSlopMultiplier) {
+        mTouchSlopMultiplier = touchSlopMultiplier;
+    }
+
     public void setDetectableScrollConditions(int scrollDirectionFlags, boolean ignoreSlop) {
         mScrollDirections = scrollDirectionFlags;
         mIgnoreSlopWhenSettling = ignoreSlop;
@@ -133,7 +148,7 @@ public class SingleAxisSwipeDetector extends BaseSwipeDetector {
     @Override
     protected boolean shouldScrollStart(PointF displacement) {
         // Reject cases where the angle or slop condition is not met.
-        float minDisplacement = Math.max(mTouchSlop,
+        float minDisplacement = Math.max(mTouchSlop * mTouchSlopMultiplier,
                 Math.abs(mDir.extractOrthogonalDirection(displacement)));
         if (Math.abs(mDir.extractDirection(displacement)) < minDisplacement) {
             return false;
diff --git a/src/com/android/launcher3/util/TouchController.java b/src/com/android/launcher3/util/TouchController.java
index fc1d819f78..9c397c0f74 100644
--- a/src/com/android/launcher3/util/TouchController.java
+++ b/src/com/android/launcher3/util/TouchController.java
@@ -32,5 +32,10 @@ public interface TouchController {
      */
     boolean onControllerInterceptTouchEvent(MotionEvent ev);
 
+    /**
+     * Called when one handed mode state changed
+     */
+    default void onOneHandedModeStateChanged(boolean activated) { }
+
     default void dump(String prefix, PrintWriter writer) { }
 }
-- 
GitLab


From a1221bcd534f3aecc44fac52b2999d316b0c472c Mon Sep 17 00:00:00 2001
From: Bill Lin <lbill@google.com>
Date: Thu, 3 Jun 2021 01:49:27 +0800
Subject: [PATCH 1321/1664] 2/ Notify adjust touch slop when one handed mode
 activated

When one handed mode activated, user swipe-up to exit usually
cross over the NavBar region, and then invoke TouchController
intercept touch event to trigger All Apps drawer on Home.

To enhanced the UX of gesture conflict of exit OHM & All Apps,
notify TouchController throught LauncherActivityInterface,
and Launcher dispatch onOneHandedModeStateChanged() event to
all mTouchControllers in DragLayer that touchController can
adjust the touch slop by it's SingleAxisSwipeDetector.

Test: manual trigger One handed mode and swipe-up to exit
Test: monitor minDisplacement of SingleAxisSwipeDetector
      OHM activated : touchSlop x multiplier
      OHM deactivated : touchSlop x 1
Test: check All Apps doesn't mis-trigger when exit one handed mode
Bug: 186235522
Change-Id: I7b9e6e7fa898231697d1866186a5f9b1717a9aa3
---
 .../src/com/android/quickstep/BaseActivityInterface.java | 3 +++
 .../com/android/quickstep/FallbackActivityInterface.java | 5 +++++
 .../com/android/quickstep/LauncherActivityInterface.java | 9 +++++++++
 .../com/android/quickstep/OverviewComponentObserver.java | 5 +++++
 src/com/android/launcher3/Launcher.java                  | 8 ++++++++
 5 files changed, 30 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index 4ae6fa8541..7ab371b4d9 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -114,6 +114,9 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
 
     public abstract void onAssistantVisibilityChanged(float visibility);
 
+    /** Called when one handed mode activated or deactivated. */
+    public abstract void onOneHandedModeStateChanged(boolean activated);
+
     public abstract AnimationFactory prepareRecentsUI(RecentsAnimationDeviceState deviceState,
             boolean activityVisible, Consumer<AnimatorControllerWithResistance> callback);
 
diff --git a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
index 4ee4398d81..906599f560 100644
--- a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
@@ -73,6 +73,11 @@ public final class FallbackActivityInterface extends
         // set to zero prior to this class becoming active.
     }
 
+    @Override
+    public void onOneHandedModeStateChanged(boolean activated) {
+        // Do nothing for FallbackActivityInterface
+    }
+
     /** 6 */
     @Override
     public AnimationFactory prepareRecentsUI(RecentsAnimationDeviceState deviceState,
diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
index 9014774ae7..30abfbb922 100644
--- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
@@ -104,6 +104,15 @@ public final class LauncherActivityInterface extends
         launcher.onAssistantVisibilityChanged(visibility);
     }
 
+    @Override
+    public void onOneHandedModeStateChanged(boolean activated) {
+        Launcher launcher = getCreatedActivity();
+        if (launcher == null) {
+            return;
+        }
+        launcher.onOneHandedStateChanged(activated);
+    }
+
     @Override
     public AnimationFactory prepareRecentsUI(RecentsAnimationDeviceState deviceState,
             boolean activityVisible, Consumer<AnimatorControllerWithResistance> callback) {
diff --git a/quickstep/src/com/android/quickstep/OverviewComponentObserver.java b/quickstep/src/com/android/quickstep/OverviewComponentObserver.java
index fb8f9fe31d..0efe6666a8 100644
--- a/quickstep/src/com/android/quickstep/OverviewComponentObserver.java
+++ b/quickstep/src/com/android/quickstep/OverviewComponentObserver.java
@@ -111,6 +111,11 @@ public final class OverviewComponentObserver {
         if (mDeviceState.isHomeDisabled() != mIsHomeDisabled) {
             updateOverviewTargets();
         }
+
+        // Notify ALL_APPS touch controller when one handed mode state activated or deactivated
+        if (mDeviceState.isOneHandedModeEnabled()) {
+            mActivityInterface.onOneHandedModeStateChanged(mDeviceState.isOneHandedModeActive());
+        }
     }
 
     private void updateOverviewTargets(Intent unused) {
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 8889e60688..299c68fdb5 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -576,6 +576,14 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         mHotseat.getQsb().setAlpha(1f - visibility);
     }
 
+    /**
+     * Called when one handed mode activated and deactivated.
+     * @param activated true if one handed mode activated, false otherwise.
+     */
+    public void onOneHandedStateChanged(boolean activated) {
+        mDragLayer.onOneHandedModeStateChanged(activated);
+    }
+
     private void initDeviceProfile(InvariantDeviceProfile idp) {
         // Load configuration-specific DeviceProfile
         mDeviceProfile = idp.getDeviceProfile(this);
-- 
GitLab


From 5821abb3e54080fb83baa2597b6f81329f935449 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Thu, 3 Jun 2021 19:00:20 +0000
Subject: [PATCH 1322/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I463274ac8154729157b0fd623b966dba8ce36711
---
 quickstep/res/values-bn/strings.xml     | 18 ++++++------------
 quickstep/res/values-de/strings.xml     | 18 ++++++------------
 quickstep/res/values-fr-rCA/strings.xml | 18 ++++++------------
 quickstep/res/values-gu/strings.xml     | 18 ++++++------------
 quickstep/res/values-hi/strings.xml     |  6 +++---
 quickstep/res/values-kn/strings.xml     |  2 +-
 quickstep/res/values-ml/strings.xml     | 18 ++++++------------
 quickstep/res/values-mr/strings.xml     | 18 ++++++------------
 quickstep/res/values-my/strings.xml     |  2 +-
 quickstep/res/values-ne/strings.xml     | 18 ++++++------------
 quickstep/res/values-pa/strings.xml     | 18 ++++++------------
 quickstep/res/values-te/strings.xml     | 18 ++++++------------
 quickstep/res/values-tr/strings.xml     |  4 ++--
 13 files changed, 61 insertions(+), 115 deletions(-)

diff --git a/quickstep/res/values-bn/strings.xml b/quickstep/res/values-bn/strings.xml
index 0fd888d171..d41edccf78 100644
--- a/quickstep/res/values-bn/strings.xml
+++ b/quickstep/res/values-bn/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"আপনি বাঁ প্রান্ত থেকে স্ক্রিনের মাঝখান পর্যন্ত সোয়াইপ করছেন ও পরে আঙুল তুলে নিন। এটির খেয়াল রাখুন।"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"একদম ডান প্রান্ত থেকে সোয়াইপ করছেন কিনা ভাল করে দেখে নিন।"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"আপনি ডান প্রান্ত থেকে স্ক্রিনের মাঝখান পর্যন্ত সোয়াইপ করছেন ও পরে আঙুল তুলে নিন। এটি খেয়াল রাখুন।"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"ফিরে যেতে, কীভাবে বাঁদিক থেকে সোয়াইপ করতে হয় তা আপনি শিখেছেন।"</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ফিরে যেতে, কীভাবে ডান দিক থেকে সোয়াইপ করতে হয় তা আপনি শিখেছেন। এরপর, একটি অ্যাপ থেকে অন্য অ্যাপে কীভাবে যাবেন জেনে নিন।"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"আপনি ফিরে যাওয়ার জেসচার সম্পর্কে জেনেছেন।"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"স্ক্রিনের নিচের প্রান্তের খুব কাছে পর্যন্ত যাতে সোয়াইপ না করেন সেটি ভাল করে দেখে নিন।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ফিরে যাওয়ার জেসচারের সেন্সিটিভিটি পরিবর্তন করতে, সেটিংসে যান"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"ফিরে যেতে স্ক্রিনের বাঁদিক থেকে সোয়াইপ করুন"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"ফিরে যেতে স্ক্রিনের ডানদিক থেকে সোয়াইপ করুন"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"শেষের যে স্ক্রিনে ছিলেন সেখানে ফিরে যেতে, বাঁদিকের প্রান্ত থেকে স্ক্রিনের মাঝখান পর্যন্ত সোয়াইপ করুন।"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"ডানদিকের প্রান্ত থেকে মাঝখান অবধি সোয়াইপ করেও, শেষের যে স্ক্রিনে ছিলেন সেখানে ফিরে যেতে পারেন। এখনই করে দেখুন।"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"স্ক্রিনের নিচের প্রান্ত থেকে আপনি সোয়াইপ করেছেন কিনা ভাল করে দেখে নিন।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"আঙুল তুলে নেওয়ার আগে আপনি যাতে পজ না করেন সেটি ভাল করে দেখে নিন।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"আপনি উপরের দিকে সোজাসুজি সোয়াইপ করেছেন কিনা ভাল করে দেখে নিন।"</string>
diff --git a/quickstep/res/values-de/strings.xml b/quickstep/res/values-de/strings.xml
index 4b5fd276f3..1e0cd3d8a8 100644
--- a/quickstep/res/values-de/strings.xml
+++ b/quickstep/res/values-de/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Wische vom linken Bildschirmrand zur Bildschirmmitte und lass los."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Wische vom äußersten rechten Bildschirmrand."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Wische vom rechten Bildschirmrand zur Bildschirmmitte und lass los."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Du kannst jetzt vom linken Bildschirmrand aus wischen, um zurückzugehen."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Du kannst jetzt vom rechten Bildschirmrand aus wischen, um zurückzugehen. Gleich erfährst du, wie man zwischen Apps wechselt."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Du hast die „Zurück“-Touch-Geste abgeschlossen."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Wische nicht zu nah am unteren Bildschirmrand."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Du kannst die Empfindlichkeit von „Zurück“ in den Einstellungen ändern"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Wische vom linken Bildschirmrand aus, um zurückzugehen"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Wische vom rechten Bildschirmrand aus, um zurückzugehen"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Wenn du zum letzten Bildschirm zurückgehen möchtest, wische vom linken Bildschirmrand zur Mitte."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Du kannst vom rechten Bildschirmrand zur Mitte wischen, um zum letzten Bildschirm zurückzugehen. Probier es aus."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Wische vom unteren Bildschirmrand nach oben."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Achte darauf, nicht innezuhalten, bevor du loslässt."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Wische gerade nach oben."</string>
diff --git a/quickstep/res/values-fr-rCA/strings.xml b/quickstep/res/values-fr-rCA/strings.xml
index 7910dc1166..e9b5fed98e 100644
--- a/quickstep/res/values-fr-rCA/strings.xml
+++ b/quickstep/res/values-fr-rCA/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Assurez-vous de balayer l\'écran de l\'extrémité gauche jusqu\'au centre, puis de lever le doigt."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Assurez-vous de balayer l\'écran à partir de l\'extrémité droite."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Assurez-vous de balayer l\'écran de l\'extrémité droite jusqu\'au centre, puis de lever le doigt."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Vous avez appris comment balayer l\'écran à partir de la gauche pour revenir en arrière."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Vous avez appris à balayer de la droite pour revenir en arrière. Apprenez comment changer d\'appli."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Vous avez appris le geste de retour en arrière."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Assurez-vous de ne pas balayer trop près du bas de l\'écran."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Modifiez la sensibilité du geste de retour dans Paramètres"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Balayez l\'écran à partir de la gauche pour revenir en arrière"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Balayer l\'écran à partir de la droite pour revenir en arrière"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Pour revenir à l\'écran précédent, balayez l\'écran du côté gauche jusqu\'au centre."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Vous pouvez revenir à l\'écran précédent en balayant l\'écran du côté droit vers le centre. Essayez-le."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Assurez-vous de balayer l\'écran à partir de l\'extrémité inférieure vers le haut."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Assurez-vous de ne pas interrompre le geste avant de lever le doigt."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Assurez-vous de balayer l\'écran en ligne droite vers le haut."</string>
diff --git a/quickstep/res/values-gu/strings.xml b/quickstep/res/values-gu/strings.xml
index dcd0dfcb6b..c1375f9465 100644
--- a/quickstep/res/values-gu/strings.xml
+++ b/quickstep/res/values-gu/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ખાતરી કરો કે તમે ડાબી કિનારીએથી સ્ક્રીનના મધ્ય ભાગ સુધી સ્વાઇપ કરો છે અને આંગળી ઊંચકી લો છો."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ખાતરી કરો કે તમે એકદમ દૂરની જમણી કિનારીએથી સ્વાઇપ કરો છો."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ખાતરી કરો કે તમે જમણી કિનારીએથી સ્ક્રીનના મધ્ય ભાગ સુધી સ્વાઇપ કરો છે અને આંગળી ઊંચકી લો છો."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"પાછળ જવા ડાબેથી કેવી રીતે સ્વાઇપ કરવું એ તમે શીખી લીધું છે."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"પાછળ જવા જમણેથી કેવી રીતે સ્વાઇપ કરવું એ તમે શીખી લીધું છે. હવે પછી, ઍપ સ્વિચ કરવાની રીત જાણો."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"તમે પાછા જવાનો સંકેત પૂર્ણ કર્યો છે."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ખાતરી કરો કે તમારાથી સ્ક્રીનની એકદમ નીચેની કિનારીની ખૂબ નજીક સુધી સ્વાઇપ ન થઈ જાય."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"પાછા જવાના સંકેતની સંવેદિતા બદલવા માટે, સેટિંગમાં જાઓ"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"પાછળ જવા ડાબેથી સ્વાઇપ કરો"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"પાછળ જવા માટે, જમણેથી સ્વાઇપ કરો"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"તમે જે છેલ્લી સ્ક્રીન પર હતા તેના પર પાછા જવા, ડાબી કિનારીએથી સ્ક્રીનના મધ્ય ભાગ સુધી સ્વાઇપ કરો."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"તમે જમણી કિનારીથી સ્ક્રીનની વચ્ચે સુધી સ્વાઇપ કરીને પણ છેલ્લી સ્ક્રીન પર પાછા જઈ શકો છો. અજમાવી જુઓ."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ખાતરી કરો કે તમે સ્ક્રીનની નીચેની કિનારીએથી ઉપરની તરફ સ્વાઇપ કરો છો."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ખાતરી કરો કે તમે આંગળી ઊંચકી લેતા પહેલાં સ્વાઇપ કરવાનું થોભાવતા નથી."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ખાતરી કરો કે તમે સીધું ઉપરની તરફ સ્વાઇપ કરો છો."</string>
diff --git a/quickstep/res/values-hi/strings.xml b/quickstep/res/values-hi/strings.xml
index cb3022a3e5..b48dee948e 100644
--- a/quickstep/res/values-hi/strings.xml
+++ b/quickstep/res/values-hi/strings.xml
@@ -50,14 +50,14 @@
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"देख लें कि आप स्क्रीन की दाईं तरफ़ के बिल्कुल किनारे से स्वाइप कर रहे हों."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"देख लें कि आप स्क्रीन के दाएं किनारे से बीचों-बीच तक स्वाइप कर रहे हों और फिर अपनी उंगली उठा लें."</string>
     <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"आपने स्क्रीन के बाएं किनारे से स्वाइप करके, पिछली स्क्रीन पर वापस जाने का तरीका सीख लिया है."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"आपने स्क्रीन के दाएं किनारे से स्वाइप करके, पिछली स्क्रीन पर वापस जाने का तरीका सीख लिया है. अब, एक ऐप्लिकेशन से दूसरे ऐप्लिकेशन पर जाने का तरीका जानें."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"आपने स्क्रीन के दाएं किनारे से स्वाइप करके, पिछली स्क्रीन पर वापस जाने का तरीका सीख लिया है. अब, एक ऐप से दूसरे ऐप पर जाने का तरीका सीखें."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"आपने पेज पर पीछे ले जाने वाले हाथ के जेस्चर (हाव-भाव) के बारे में जान लिया है."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"देखे लें कि आप स्क्रीन पर बिल्कुल नीचे तक स्वाइप न कर रहे हों."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"\'सेटिंग\' में जाकर, पीछे जाने के लिए इस्तेमाल होने वाले हाथ के जेस्चर (हाव-भाव) की संवेदनशीलता बदलें"</string>
     <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"वापस जाने के लिए, स्क्रीन के बाएं किनारे से स्वाइप करें"</string>
     <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"वापस जाने के लिए, स्क्रीन के दाएं किनारे से स्वाइप करें"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"पिछली स्क्रीन पर वापस जाने के लिए, स्क्रीन के बाएं किनारे से बीचों-बीच तक स्वाइप करें."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"आप स्क्रीन के दाएं किनारे से बीचों-बीच तक स्वाइप करके भी पिछली स्क्रीन पर जा सकते हैं. इसे अभी आज़माएं."</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"पिछली स्क्रीन पर वापस जाने के लिए, स्क्रीन के बाएं किनारे से बीच तक स्वाइप करें."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"आप स्क्रीन के दाएं किनारे से बीच तक स्वाइप करके भी पिछली स्क्रीन पर जा सकते हैं. इसे अभी आज़माएं."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"देख लें कि आप स्क्रीन के निचले किनारे से ऊपर की ओर स्वाइप कर रहे हों."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"देख लें कि आप स्क्रीन से अपनी उंगली उठाने से पहले, इसे कहीं न रोक रहे हों."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"देख लें कि आप ऊपर की ओर बिल्कुल सीधे स्वाइप कर रहे हों."</string>
diff --git a/quickstep/res/values-kn/strings.xml b/quickstep/res/values-kn/strings.xml
index 53de55ae7f..437fdbaae0 100644
--- a/quickstep/res/values-kn/strings.xml
+++ b/quickstep/res/values-kn/strings.xml
@@ -50,7 +50,7 @@
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ನೀವು ದೂರದ ಬಲ ಅಂಚಿನಿಂದ ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ಬಲ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ ಹಾಗೂ ನಿಮ್ಮ ಬೆರಳನ್ನು ಮೇಲೆತ್ತಿ."</string>
     <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"ಹಿಂದಕ್ಕೆ ಹೋಗಲು ಎಡದಿಂದ ಸ್ವೈಪ್ ಮಾಡುವುದು ಹೇಗೆಂದು ನೀವು ಕಲಿತಿರಿ."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ಹಿಂದಕ್ಕೆ ಹೋಗಲು ಬಲದಿಂದ ಸ್ವೈಪ್ ಮಾಡುವುದು ಹೇಗೆಂದು ನೀವು ಕಲಿತಿರಿ. ಮುಂದೆ, ಆ್ಯಪ್‌ಗಳನ್ನು ಬದಲಿಸುವುದು ಹೇಗೆಂದು ತಿಳಿಯಿರಿ."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ಹಿಂದೆ ಹೋಗಲು ಬಲದಿಂದ ಸ್ವೈಪ್ ಮಾಡುವುದು ಹೇಗೆಂದು ಕಲಿತಿರಿ. ಮುಂದೆ, ಆ್ಯಪ್‌ಗಳನ್ನು ಬದಲಿಸುವುದು ಹೇಗೆಂದು ತಿಳಿಯಿರಿ."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ನೀವು ಗೋ ಬ್ಯಾಕ್ ಗೆಸ್ಚರ್ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದ್ದೀರಿ."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ನೀವು ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಭಾಗಕ್ಕೆ ಹೆಚ್ಚು ಹತ್ತಿರ ಸ್ವೈಪ್ ಮಾಡದಂತೆ ನೋಡಿಕೊಳ್ಳಿ."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ಬ್ಯಾಕ್ ಗೆಸ್ಚರ್‌ನ ಸೂಕ್ಷ್ಮತೆ ಬದಲಾಯಿಸಲು, ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಹೋಗಿ"</string>
diff --git a/quickstep/res/values-ml/strings.xml b/quickstep/res/values-ml/strings.xml
index 4f5068b13e..3d9031770a 100644
--- a/quickstep/res/values-ml/strings.xml
+++ b/quickstep/res/values-ml/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ഇടത്തേ അരികിൽ നിന്ന് സ്‌ക്രീനിന്റെ മധ്യഭാഗത്തേക്ക് സ്വെെപ്പ് ചെയ്‌ത് വിടുക."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"വലത്തേയറ്റത്തെ അരികിൽ നിന്ന് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"വലത്തേ അരികിൽ നിന്ന് സ്‌ക്രീനിന്റെ മധ്യഭാഗത്തേക്ക് സ്വെെപ്പ് ചെയ്‌ത് വിടുക."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"മടങ്ങാൻ ഇടതുഭാഗത്ത് നിന്ന് സ്വൈപ്പ് ചെയ്യുന്ന രീതി നിങ്ങൾക്ക് മനസ്സിലായി."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"മടങ്ങാൻ വലതുഭാഗത്ത് നിന്ന് സ്വൈപ്പ് ചെയ്യുന്ന രീതി മനസ്സിലായി. ഇനി, ആപ്പുകൾ മാറുന്ന രീതി അറിയുക."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"മടങ്ങുക ജെസ്ച്ചർ നിങ്ങൾ പൂർത്തിയാക്കി."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"സ്‌ക്രീനിന്റെ ഏറ്റവും അടിഭാഗത്തേക്ക് സ്വെെപ്പ് ചെയ്യുന്നില്ലെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ബാക്ക്ജെസ്റ്ററിന്റെ സെൻസിറ്റിവിറ്റി മാറ്റാൻ ക്രമീകരണത്തിൽ പോകൂ"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"മടങ്ങാൻ ഇടതുഭാഗത്ത് നിന്ന് സ്വൈപ്പ് ചെയ്യുക"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"മടങ്ങാൻ വലതുഭാഗത്ത് നിന്ന് സ്വൈപ്പ് ചെയ്യുക"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"നിങ്ങളുടെ മുമ്പത്തെ സ്ക്രീനിലേക്ക് മടങ്ങാൻ, സ്ക്രീനിന്റെ ഇടത്തേ അരികിൽ നിന്ന് നടുവിലേക്ക് സ്വൈപ്പ് ചെയ്യുക."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"സ്ക്രീനിന്റെ വലത്തേ അരികിൽ നിന്ന് നടുവിലേക്ക് സ്വൈപ്പ് ചെയ്തും മുൻ സ്ക്രീനിലെത്താം. ഇതിന് ശ്രമിക്കൂ."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"സ്‌ക്രീനിന്റെ താഴത്തെ അരികിൽ നിന്ന് മുകളിലേക്ക് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"വിടുന്നതിന് മുമ്പ് നിങ്ങൾ താൽക്കാലികമായി നിർത്തുന്നില്ലെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"നേരെ മുകളിലേക്ക് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പിക്കുക."</string>
diff --git a/quickstep/res/values-mr/strings.xml b/quickstep/res/values-mr/strings.xml
index 0bc8e82ebf..d5bcc8a84a 100644
--- a/quickstep/res/values-mr/strings.xml
+++ b/quickstep/res/values-mr/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"तुम्ही स्क्रीनच्या डाव्या कडेपासून मध्यावर स्‍वाइप करून बोट उचलत आहात याची खात्री करा."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"तुम्ही स्क्रीनच्या अगदी उजव्या कडेपासून स्‍वाइप करत आहात याची खात्री करा."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"तुम्ही स्क्रीनच्या उजव्या कडेपासून मध्यावर स्‍वाइप करून बोट उचलत आहात याची खात्री करा."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"तुम्ही मागे जाण्यासाठी डावीकडून कसे स्‍वाइप करायचे ते जाणून घेतले."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"मागे जाण्यासाठी उजवीकडून कसे स्‍वाइप करावे ते शिकलात. आता पुढे, ॲप्स कशी स्विच करायची ते जाणून घ्या."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"तुम्ही गो बॅक जेश्चर पूर्ण केले."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"तुम्ही स्क्रीनच्या तळाच्या अगदी जवळून स्‍वाइप करत नाही याची खात्री करा."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"बॅक जेश्चरची संवेदनशीलता बदलण्यासाठी, सेटिंग्ज वर जा"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"मागे जाण्यासाठी डावीकडून स्वाइप करा"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"मागे जाण्यासाठी उजवीकडून स्वाइप करा"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"तुम्ही होतात त्या मागील स्क्रीनवर परत जाण्यासाठी, स्क्रीनच्या डाव्या कडेपासून मध्याभागी स्वाइप करा."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"स्क्रीनच्या उजव्या कडेपासून मध्याभागी स्वाइप करून मागील स्क्रीनवर परतदेखील जाऊ शकता. आता करून पहा."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"तुम्ही स्क्रीनच्या तळाच्या कडेपासून वर स्वाइप करत आहात याची खात्री करा."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"तुम्ही स्क्रीनवरून बोट उचलण्यापूर्वी ते थांबवत नाही याची खात्री करा."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"तुम्ही सरळ वर स्वाइप करत आहात याची खात्री करा."</string>
diff --git a/quickstep/res/values-my/strings.xml b/quickstep/res/values-my/strings.xml
index c01ca5f3ef..92eb25be8b 100644
--- a/quickstep/res/values-my/strings.xml
+++ b/quickstep/res/values-my/strings.xml
@@ -23,7 +23,7 @@
     <string name="recent_task_option_freeform" msgid="48863056265284071">"အလွတ်ပုံစံ"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"မကြာမီကဖွင့်ထားသည်များ မရှိပါ"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"အက်ပ်အသုံးပြုမှု ဆက်တင်များ"</string>
-    <string name="recents_clear_all" msgid="5328176793634888831">"အားလုံးကို ရှင်းရန်"</string>
+    <string name="recents_clear_all" msgid="5328176793634888831">"အားလုံးထုတ်ပစ်ရန်"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"လတ်တလောသုံး အက်ပ်များ"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>၊ <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; ၁ မိနစ်"</string>
diff --git a/quickstep/res/values-ne/strings.xml b/quickstep/res/values-ne/strings.xml
index f04b935a83..f1351f186d 100644
--- a/quickstep/res/values-ne/strings.xml
+++ b/quickstep/res/values-ne/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"स्क्रिनको बायाँ किनाराबाट मध्य भागसम्म स्वाइप गर्नुहोस् अनि औँला उठाउनुहोस्।"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"स्क्रिनको सबैभन्दा दायाँ किनाराबाट स्वाइप गर्नुहोस्।"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"स्क्रिनको दायाँ किनाराबाट मध्य भागसम्म स्वाइप गर्नुहोस् अनि औँला उठाउनुहोस्।"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"तपाईंले स्क्रिनको बायाँ किनाराबाट स्वाइप गरेर अघिल्लो स्क्रिनमा फर्कने तरिका सिक्नुभयो।"</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"तपाईंले स्क्रिनको दायाँ किनाराबाट स्वाइप गरेर अघिल्लो स्क्रिनमा फर्कने तरिका सिक्नुभयो। अब एउटा एपबाट अर्को एपमा जाने तरिका सिक्नुहोस्।"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"तपाईंले \'पछाडि जानुहोस्\' नामक इसारा प्रयोग गर्ने तरिका सिक्नुभयो।"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"स्क्रिनको फेदको धेरै नजिकसम्म स्वाइप नगर्नुहोस्।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"\'पछाडि\' नामक इसाराको संवेदनशीलता बदल्न सेटिङमा जानुहोस्"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"पछाडि जान बायाँ किनाराबाट स्वाइप गर्नुहोस्"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"पछाडि जान दायाँतिरबाट स्वाइप गर्नुहोस्"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"यसअघिको स्क्रिनमा फर्कन स्क्रिनको बायाँ किनाराबाट मध्य भागसम्म स्वाइप गर्नुहोस्।"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"तपाईं स्क्रिनको दायाँ किनाराबाट मध्य भागसम्म स्वाइप गरेर पनि यसअघिको स्क्रिनमा फर्कन सक्नुहुन्छ। अहिले नै यसो गरी हेर्नुहोस्।"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"स्क्रिनको फेदबाट माथितिर स्वाइप गर्नुहोस्।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"औँला उठाउनुअघि नरोकिनुहोस्।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"सीधै माथितिर स्वाइप गर्नुहोस्।"</string>
diff --git a/quickstep/res/values-pa/strings.xml b/quickstep/res/values-pa/strings.xml
index d00e6cfb21..0dc125a1cf 100644
--- a/quickstep/res/values-pa/strings.xml
+++ b/quickstep/res/values-pa/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਖੱਬੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰਦੇ ਹੋ ਅਤੇ ਛੱਡ ਦਿੰਦੇ ਹੋ।"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਦੂਰ-ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰਦੇ ਹੋ ਅਤੇ ਛੱਡ ਦਿੰਦੇ ਹੋ।"</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"ਤੁਸੀਂ ਪਿੱਛੇ ਜਾਣ ਲਈ ਖੱਬੇ ਪਾਸੇ ਤੋਂ ਸਵਾਈਪ ਕਰਨ ਦਾ ਤਰੀਕਾ ਜਾਣਿਆ।"</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ਤੁਸੀਂ ਪਿੱਛੇ ਜਾਣ ਲਈ ਸੱਜੇ ਪਾਸੇ ਤੋਂ ਸਵਾਈਪ ਕਰਨ ਦਾ ਤਰੀਕਾ ਜਾਣਿਆ। ਅੱਗੇ, ਐਪਾਂ ਵਿਚਾਲੇ ਅਦਲਾ-ਬਦਲੀ ਕਰਨ ਦਾ ਤਰੀਕਾ ਜਾਣੋ।"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ਤੁਸੀਂ \'ਵਾਪਸ ਜਾਓ\' ਦਾ ਇਸ਼ਾਰਾ ਪੂਰਾ ਕੀਤਾ।"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਲੇ ਹਿੱਸੇ ਦੇ ਬਹੁਤ ਨੇੜੇ ਸਵਾਈਪ ਨਾ ਕਰੋ।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ਪਿੱਛੇ ਜਾਣ ਦੇ ਸੰਕੇਤ ਦੀ ਸੰਵੇਦਨਸ਼ੀਲਤਾ ਬਦਲਣ ਲਈ, ਸੈਟਿੰਗਾਂ \'ਤੇ ਜਾਓ"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"ਪਿੱਛੇ ਜਾਣ ਲਈ ਖੱਬੇ ਪਾਸੇ ਤੋਂ ਸਵਾਈਪ ਕਰੋ"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"ਪਿੱਛੇ ਜਾਣ ਲਈ ਸੱਜੇ ਪਾਸੇ ਤੋਂ ਸਵਾਈਪ ਕਰੋ"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"ਜਿੱਥੇ ਤੁਸੀਂ ਸੀ ਉਸ ਪਿਛਲੀ ਸਕ੍ਰੀਨ \'ਤੇ ਵਾਪਸ ਜਾਣ ਲਈ, ਖੱਬੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰੋ।"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"ਤੁਸੀਂ ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰਕੇ ਪਿਛਲੀ ਸਕ੍ਰੀਨ \'ਤੇ ਵਾਪਸ ਜਾ ਸਕਦੇ ਹੋ। ਹੁਣੇ ਵਰਤ ਕੇ ਦੇਖੋ।"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਲੇ ਕਿਨਾਰੇ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ਪੱਕਾ ਕਰੋ ਕਿ ਸਕ੍ਰੀਨ ਨੂੰ ਛੱਡਣ ਤੋਂ ਪਹਿਲਾਂ ਰੁਕੋ ਨਾ।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਿੱਧੇ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
diff --git a/quickstep/res/values-te/strings.xml b/quickstep/res/values-te/strings.xml
index 14c83becba..a0351a79e3 100644
--- a/quickstep/res/values-te/strings.xml
+++ b/quickstep/res/values-te/strings.xml
@@ -49,21 +49,15 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"మీరు ఎడమ అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేశారని నిర్ధారించుకోని, ఆపై మీ వేలిని ఎత్తండి."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"మీరు చాలా-కుడి అంచు నుండి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"మీరు కుడి అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేశారని నిర్ధారించుకోని, ఆపై మీ వేలిని ఎత్తండి."</string>
-    <!-- no translation found for back_gesture_feedback_complete_with_back_right_follow_up (2100639504811809267) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_complete_with_overview_follow_up (9176400654037014471) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"వెనుకకు వెళ్లడానికి ఎడమ నుండి ఎలా స్వైప్ చేయాలో మీరు నేర్చుకున్నారు."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"వెనుకకు వెళ్లడానికి కుడి నుండి స్వైప్ ఎలానో మీకు తెలుసు. తర్వాత, యాప్‌ల మధ్య ఎలా మారాలో తెలుసుకోండి."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"మీరు తిరిగి వెనక్కు వెళ్లే సంజ్ఞను పూర్తి చేశారు."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"మీరు స్క్రీన్ దిగువకు చాలా దగ్గరగా స్వైప్ చేయలేదని నిర్ధారించుకోండి."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"వెనుక సంజ్ఞ సున్నితత్వం మార్చడానికి, సెట్టింగ్‌లకు వెళ్లండి"</string>
-    <!-- no translation found for back_left_gesture_intro_title (5197184481779330065) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_title (7431951986971898074) -->
-    <skip />
-    <!-- no translation found for back_left_gesture_intro_subtitle (7672761376577628602) -->
-    <skip />
-    <!-- no translation found for back_right_gesture_intro_subtitle (2735828029197816509) -->
-    <skip />
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"వెనుకకు వెళ్లడానికి ఎడమ వైపు నుండి స్వైప్ చేయండి"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"వెనుకకు వెళ్లడానికి కుడి వైపు నుండి స్వైప్ చేయండి"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"మీరు ఉన్న చివరి స్క్రీన్‌కు తిరిగి వెళ్లడానికి, ఎడమ అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేయండి."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"కుడి అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేయడం ద్వారా మీరు చివరి స్క్రీన్‌కు తిరిగి వెళ్లవచ్చు. దీన్ని ఇప్పుడే ట్రై చేయండి."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"మీరు స్క్రీన్ దిగువ అంచు నుండి పైకి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"బయలుదేరే ముందు మీరు పాజ్ చేయకుండా చూసుకోండి."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"మీరు నేరుగా పైకి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
diff --git a/quickstep/res/values-tr/strings.xml b/quickstep/res/values-tr/strings.xml
index 86f5a26d4e..9a8c467f74 100644
--- a/quickstep/res/values-tr/strings.xml
+++ b/quickstep/res/values-tr/strings.xml
@@ -77,7 +77,7 @@
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Ayarlar"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Tekrar deneyin"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Güzel!"</string>
-    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Eğitici <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="gesture_tutorial_step" msgid="1279786122817620968">"Eğitim <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"İşlem tamam!"</string>
     <string name="allset_hint" msgid="459504134589971527">"Ana ekrana gitmek için yukarı kaydırın"</string>
     <string name="allset_description" msgid="6350320429953234580">"Telefonunuzu kullanmaya hazırsınız"</string>
@@ -85,7 +85,7 @@
     <string name="action_share" msgid="2648470652637092375">"Paylaş"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Ekran görüntüsü"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Uygulamanız veya kuruluşunuz bu işleme izin vermiyor"</string>
-    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Gezinme eğitici içeriği atlansın mı?"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Gezinme eğitimi atlansın mı?"</string>
     <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Bunu daha sonra <xliff:g id="NAME">%1$s</xliff:g> uygulamasında bulabilirsiniz"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"İptal"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Atla"</string>
-- 
GitLab


From 77811638c71c7f23404ce296317cb2d645c42fa9 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Thu, 3 Jun 2021 19:02:15 +0000
Subject: [PATCH 1323/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I2aeaa7f42eb543dc89898042289ba5baf91da4ca
---
 res/values-af/strings.xml        |  3 +++
 res/values-am/strings.xml        |  3 +++
 res/values-ar/strings.xml        |  3 +++
 res/values-as/strings.xml        |  3 +++
 res/values-az/strings.xml        |  3 +++
 res/values-b+sr+Latn/strings.xml |  3 +++
 res/values-be/strings.xml        |  3 +++
 res/values-bg/strings.xml        |  5 ++++-
 res/values-bn/strings.xml        |  3 +++
 res/values-bs/strings.xml        |  3 +++
 res/values-ca/strings.xml        |  7 +++++--
 res/values-cs/strings.xml        |  5 ++++-
 res/values-da/strings.xml        |  3 +++
 res/values-de/strings.xml        |  3 +++
 res/values-el/strings.xml        |  3 +++
 res/values-en-rAU/strings.xml    |  5 ++++-
 res/values-en-rCA/strings.xml    |  5 ++++-
 res/values-en-rGB/strings.xml    |  5 ++++-
 res/values-en-rIN/strings.xml    |  5 ++++-
 res/values-en-rXC/strings.xml    |  3 +++
 res/values-es-rUS/strings.xml    |  3 +++
 res/values-es/strings.xml        |  7 +++++--
 res/values-et/strings.xml        |  3 +++
 res/values-eu/strings.xml        |  3 +++
 res/values-fa/strings.xml        |  3 +++
 res/values-fi/strings.xml        |  3 +++
 res/values-fr-rCA/strings.xml    |  6 ++++++
 res/values-fr/strings.xml        |  3 +++
 res/values-gl/strings.xml        |  5 ++++-
 res/values-gu/strings.xml        |  6 ++++++
 res/values-hi/strings.xml        |  3 +++
 res/values-hr/strings.xml        |  3 +++
 res/values-hu/strings.xml        |  5 ++++-
 res/values-hy/strings.xml        |  3 +++
 res/values-in/strings.xml        |  3 +++
 res/values-is/strings.xml        |  3 +++
 res/values-it/strings.xml        |  3 +++
 res/values-iw/strings.xml        |  3 +++
 res/values-ja/strings.xml        |  3 +++
 res/values-ka/strings.xml        |  3 +++
 res/values-kk/strings.xml        |  8 +++++++-
 res/values-km/strings.xml        |  3 +++
 res/values-kn/strings.xml        |  3 +++
 res/values-ko/strings.xml        |  3 +++
 res/values-ky/strings.xml        |  3 +++
 res/values-lo/strings.xml        |  3 +++
 res/values-lt/strings.xml        |  3 +++
 res/values-lv/strings.xml        |  3 +++
 res/values-mk/strings.xml        |  3 +++
 res/values-ml/strings.xml        |  3 +++
 res/values-mn/strings.xml        |  3 +++
 res/values-mr/strings.xml        |  3 +++
 res/values-ms/strings.xml        |  5 ++++-
 res/values-my/strings.xml        |  3 +++
 res/values-nb/strings.xml        |  3 +++
 res/values-ne/strings.xml        | 10 ++++++++--
 res/values-nl/strings.xml        |  3 +++
 res/values-or/strings.xml        |  6 ++++++
 res/values-pa/strings.xml        |  6 ++++++
 res/values-pl/strings.xml        |  5 ++++-
 res/values-pt-rPT/strings.xml    |  5 ++++-
 res/values-pt/strings.xml        |  3 +++
 res/values-ro/strings.xml        |  3 +++
 res/values-ru/strings.xml        |  5 ++++-
 res/values-si/strings.xml        |  3 +++
 res/values-sk/strings.xml        |  5 ++++-
 res/values-sl/strings.xml        |  3 +++
 res/values-sq/strings.xml        |  6 ++++++
 res/values-sr/strings.xml        |  3 +++
 res/values-sv/strings.xml        |  3 +++
 res/values-sw/strings.xml        |  3 +++
 res/values-ta/strings.xml        |  3 +++
 res/values-te/strings.xml        |  8 +++++++-
 res/values-th/strings.xml        |  3 +++
 res/values-tl/strings.xml        |  3 +++
 res/values-tr/strings.xml        |  3 +++
 res/values-uk/strings.xml        |  5 ++++-
 res/values-ur/strings.xml        |  3 +++
 res/values-uz/strings.xml        |  5 ++++-
 res/values-vi/strings.xml        |  3 +++
 res/values-zh-rCN/strings.xml    |  6 ++++++
 res/values-zh-rHK/strings.xml    |  3 +++
 res/values-zh-rTW/strings.xml    |  5 ++++-
 res/values-zu/strings.xml        |  3 +++
 84 files changed, 303 insertions(+), 24 deletions(-)

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index b3b0d2bb6e..ad353e11c3 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Persoonlik"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Werk"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Gesprekke"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Nuttige inligting binne jou bereik"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Jy kan legstukke by jou tuisskerm voeg om inligting te kry sonder om programme oop te maak"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Het dit"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Deursoek programme"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Laai tans programme …"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Kon geen programme kry wat by \"<xliff:g id="QUERY">%1$s</xliff:g>\" pas nie"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 1de056de97..34cdc03f0c 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"የግል"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ስራ"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"ውይይቶች"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"በጣቶችዎ ጫፎች ላይ ጠቃሚ መረጃ"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"መተግበሪያዎችን ሳይከፍቱ መረጃ ለማግኘት በመነሻ ማያ ገጽዎ ላይ ምግብሮችን ማከል ይችላሉ"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"ገባኝ"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"መተግበሪያዎችን ፈልግ"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"መተግበሪያዎችን በመጫን ላይ…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"ከ«<xliff:g id="QUERY">%1$s</xliff:g>» ጋር የሚዛመዱ ምንም መተግበሪያዎች አልተገኙም"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 9ddb736247..7a5488fd4a 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -59,6 +59,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"الأدوات الشخصية"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"أدوات العمل"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"المحادثات"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"معلومات مفيدة في متناول يديك"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"للحصول على معلومات بدون فتح التطبيقات، يمكنك إضافة الأدوات إلى الشاشة الرئيسية."</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"حسنًا"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"بحث في التطبيقات"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"جارٍ تحميل التطبيقات…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"لم يتم العثور على أي تطبيقات تتطابق مع \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 8ff9e493b1..1b2d8a11b9 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ব্যক্তিগত"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"কৰ্মস্থান"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"বাৰ্তালাপ"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"আপোনাৰ আঙুলিৰে টিপতে উপযোগী তথ্য পাওক"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"এপ্‌ নোখোলাকৈ তথ্য পাবলৈ আপুনি নিজৰ গৃহ স্ক্ৰীনত ৱিজেট যোগ দিব পাৰে"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"বুজি পালোঁ"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"এপসমূহ সন্ধান কৰক"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"এপসমূহ ল’ড কৰি থকা হৈছে…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\"ৰ সৈতে মিলা কোনো এপ্ বিচাৰি পোৱা নগ\'ল"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 4faba10935..41573d91f3 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Şəxsi"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"İş"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Söhbətlər"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Faydalı məlumatlar barmaqlarınızın ucunda"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Tətbiqləri açmadan məlumat almaq üçün Əsas ekrana vidcet əlavə edə bilərsiniz"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Anladım"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Tətbiqləri axtarın"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Tətbiqlər yüklənir…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"<xliff:g id="QUERY">%1$s</xliff:g> sorğusuna uyğun tətbiq tapılmadı"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 700565615f..1417ea66d4 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -53,6 +53,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Lično"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Posao"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Konverzacije"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Korisne informacije nadohvat ruke"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Da biste pronašli informacije bez otvaranja aplikacija, možete da dodate vidžete na početni ekran"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Važi"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Pretražite aplikacije"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Aplikacije se učitavaju…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nije pronađena nijedna aplikacija za „<xliff:g id="QUERY">%1$s</xliff:g>“"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index c082f9fe7d..c0047ce133 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -55,6 +55,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Асабістыя"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Працоўныя"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Размовы"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Карысная інфармацыя ў вас пад рукой"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Каб не адкрываць праграмы для прагляду патрэбнай інфармацыі, дадайце віджэты на галоўны экран"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Зразумела"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Пошук праграм"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Праграмы загружаюцца…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Праграм, якія адпавядаюць запыту \"<xliff:g id="QUERY">%1$s</xliff:g>\", не знойдзена"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 7c1af2a7b1..69f20747b7 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -32,7 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Докоснете двукратно и задръжте за преместване на приспособление или използвайте персонал. действия."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Ширина %1$d и височина %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Докоснете приспособлението и го задръжте, за да го местите на началния екран"</string>
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Докоснете приспособлението и го задръжте, за да го местите по началния екран"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Добавяне към началния екран"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> приспособления</item>
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Лични"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Служебни"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Разговори"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Лесен достъп до полезна информация"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"За да получавате информация, без да отваряте приложенията, можете да добавите приспособления към началния екран"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Разбрах"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Търсене в приложенията"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Приложенията се зареждат…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Няма намерени приложения, съответстващи на „<xliff:g id="QUERY">%1$s</xliff:g>“"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 71b00eb647..8c8292d25b 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ব্যক্তিগত"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"অফিস"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"কথোপকথন"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"সহজেই দরকারি তথ্য পান"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"অ্যাপ না খুলে তথ্য পাওয়ার জন্য, আপনার হোম স্ক্রিনে উইজেট যোগ করতে পারেন"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"বুঝেছি"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"অ্যাপ খুঁজুন"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"অ্যাপ লোড হচ্ছে…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" এর সাথে মেলে এমন কোনো অ্যাপ পাওয়া যায়নি"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index b7d93f6aad..bfec27d709 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -53,6 +53,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Lično"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Posao"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Razgovori"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Korisne informacije nadohvat ruke"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Da dobijete informacije bez otvaranja aplikacija, možete dodati vidžete na početni ekran"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Razumijem"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Pretražite aplikacije"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Aplikacije se učitavaju…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nije pronađena nijedna aplikacija za upit \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 2926d563f3..d35bfc66da 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personal"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Treball"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Converses"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Informació útil a l\'abast de la mà"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Per obtenir informació sense obrir les aplicacions, pots afegir widgets a la pantalla d\'inici"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Entesos"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Cerca aplicacions"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"S\'estan carregant les aplicacions…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"No s\'ha trobat cap aplicació que coincideixi amb \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -152,7 +155,7 @@
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Treball"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de treball"</string>
     <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Les dades personals s\'oculten i se separen de les aplicacions de treball"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"L\'administrador de TI pot veure les dades i les aplicacions de treball"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"L\'administrador de TI pot veure les teves dades i aplicacions de treball"</string>
     <string name="work_profile_edu_next" msgid="8783418929296503629">"Següent"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Entesos"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"El perfil de treball està en pausa"</string>
@@ -163,6 +166,6 @@
     <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Posa en pausa les aplicacions de treball"</string>
     <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Activa"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtra"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Posa en pausa les notificacions i les aplicacions de treball"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Posa en pausa les aplicacions i notificacions de treball"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Error: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 3198068209..c1ed2883ab 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -32,7 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvojitým klepnutím a podržením přesunete widget, případně použijte vlastní akce."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"šířka %1$d, výška %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Pokud widgetem chcete pohybovat po ploše, dotkněte se ho a podržte ho"</string>
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Pokud chcete widgetem pohybovat po ploše, podržte ho"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Přidat na plochu"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgety</item>
@@ -55,6 +55,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Osobní"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Práce"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Konverzace"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Užitečné informace na dosah"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Pokud chcete mít informace k dispozici bez otevírání aplikací, můžete si na plochu přidat widgety"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Rozumím"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Hledat v aplikacích"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Načítání aplikací…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Dotazu „<xliff:g id="QUERY">%1$s</xliff:g>“ neodpovídají žádné aplikace"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 502d5eb970..dea0183e88 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personlige"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Arbejde"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Samtaler"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Nyttige oplysninger lige ved hånden"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Hvis du vil have oplysninger uden at åbne apps, kan du føje widgets til din startskærm"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Søg efter apps"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Indlæser apps…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Der blev ikke fundet nogen apps, som matcher \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 63c58c7e59..3a20d1740a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Privat"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Geschäftlich"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Unterhaltungen"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Praktische Informationen – immer zur Hand"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Wenn du Informationen erhalten möchtest, ohne Apps zu öffnen, kannst du deinem Startbildschirm Widgets hinzufügen"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Apps finden"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Apps werden geladen…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Keine Apps für \"<xliff:g id="QUERY">%1$s</xliff:g>\" gefunden"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 0ffe2c430c..4e8ecf951f 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Προσωπικά"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Εργασίας"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Συζητήσεις"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Χρήσιμες πληροφορίες στη διάθεσή σας"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Για να λάβετε πληροφορίες χωρίς να ανοίξετε εφαρμογές, μπορείτε να προσθέσετε γραφικά στοιχεία στην αρχική σας οθόνη."</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Το κατάλαβα"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Αναζήτηση εφαρμογών"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Φόρτωση εφαρμογών…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Δεν βρέθηκαν εφαρμογές αντιστοίχισης για \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 5af3e7dcea..ecf68038be 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -32,7 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Double-tap &amp; hold to move a widget or use custom actions."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d wide by %2$d high"</string>
-    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Touch &amp; hold the widget to move it around the home screen"</string>
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Touch and hold the widget to move it around the home screen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Add to home screen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personal"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Work"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversations"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Useful info at your fingertips"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"To get info without opening apps, you can add widgets to your home screen"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Search apps"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Loading apps…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"No apps found matching \'<xliff:g id="QUERY">%1$s</xliff:g>\'"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 5af3e7dcea..ecf68038be 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -32,7 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Double-tap &amp; hold to move a widget or use custom actions."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d wide by %2$d high"</string>
-    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Touch &amp; hold the widget to move it around the home screen"</string>
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Touch and hold the widget to move it around the home screen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Add to home screen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personal"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Work"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversations"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Useful info at your fingertips"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"To get info without opening apps, you can add widgets to your home screen"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Search apps"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Loading apps…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"No apps found matching \'<xliff:g id="QUERY">%1$s</xliff:g>\'"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 5af3e7dcea..ecf68038be 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -32,7 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Double-tap &amp; hold to move a widget or use custom actions."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d wide by %2$d high"</string>
-    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Touch &amp; hold the widget to move it around the home screen"</string>
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Touch and hold the widget to move it around the home screen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Add to home screen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personal"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Work"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversations"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Useful info at your fingertips"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"To get info without opening apps, you can add widgets to your home screen"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Search apps"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Loading apps…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"No apps found matching \'<xliff:g id="QUERY">%1$s</xliff:g>\'"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 5af3e7dcea..ecf68038be 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -32,7 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Double-tap &amp; hold to move a widget or use custom actions."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d wide by %2$d high"</string>
-    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Touch &amp; hold the widget to move it around the home screen"</string>
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Touch and hold the widget to move it around the home screen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Add to home screen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personal"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Work"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversations"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Useful info at your fingertips"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"To get info without opening apps, you can add widgets to your home screen"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Search apps"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Loading apps…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"No apps found matching \'<xliff:g id="QUERY">%1$s</xliff:g>\'"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index b82f0c95f2..9475db92f1 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‏‎‎‏‏‎‎‎‎‎‎‏‏‎‎‏‏‎‎‎‎‏‎‏‎‏‏‎‏‏‏‎‎‎‎‎‎‎‎‎‎‎‏‎‏‎‎‏‏‎‏‏‎‎Personal‎‏‎‎‏‎"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‎‏‎‎‎‎‏‎‏‎‎‎‏‎‎‏‎‎‏‎‏‎Work‎‏‎‎‏‎"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‎‏‎‎‎‎‏‎‎‏‏‏‎‎‎‎‎‎‎‏‎‏‎‏‎‏‏‎‎‏‏‎‏‎‏‏‏‎‎Conversations‎‏‎‎‏‎"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‎‎‏‏‎‏‎‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‎‏‎‎‏‎‏‏‎‏‏‎‏‏‎‎‏‏‎‎‏‏‏‎‏‏‎Useful info at your fingertips‎‏‎‎‏‎"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎‎‏‏‎‏‎‎‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‏‎‎‏‎‎‏‎‏‎To get info without opening apps, you can add widgets to your Home screen‎‏‎‎‏‎"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‏‏‎‎‏‎‎‎Got it‎‏‎‎‏‎"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎‎‏‏‎‎‎‎‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‎‏‏‏‏‎‎‏‎‎‎‏‏‎‎‏‏‏‎‏‎‎‎‎‏‎‎‏‏‏‎‎Search apps‎‏‎‎‏‎"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‏‏‏‏‎‏‎‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎‎‏‎‏‏‏‏‏‏‎‏‎‏‎‎‎Loading apps…‎‏‎‎‏‎"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‏‎‎‏‏‏‏‎‏‎‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‎‏‏‏‏‎‏‎‏‎‎‎‎‎‎‏‎‏‎‎No apps found matching \"‎‏‎‎‏‏‎<xliff:g id="QUERY">%1$s</xliff:g>‎‏‎‎‏‏‏‎\"‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 56f31bf23b..1f9d5f1dbd 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personal"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Trabajo"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversaciones"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Información útil a tu alcance"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Para recibir información de apps sin abrirlas, puedes agregar widgets a la pantalla principal"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Entendido"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Buscar apps"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Cargando apps…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"No hay apps que coincidan con \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 686d2240bf..45061d5882 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personal"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Trabajo"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversaciones"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Información útil al alcance de la mano"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Para recibir información sin abrir aplicaciones, puedes añadir widgets a la pantalla de inicio."</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Entendido"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Buscar aplicaciones"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Cargando aplicaciones…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"No se han encontrado aplicaciones que contengan \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -156,8 +159,8 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"Siguiente"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Entendido"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"El perfil de trabajo está en pausa"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Las aplicaciones de trabajo no pueden enviarte notificaciones, consumir tu batería ni acceder a tu ubicación"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"El perfil de trabajo está en pausa. Las aplicaciones de trabajo no pueden enviarte notificaciones, consumir tu batería ni acceder a tu ubicación"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Las aplicaciones de trabajo no pueden enviarte notificaciones, consumir batería ni acceder a tu ubicación"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"El perfil de trabajo está en pausa. Las aplicaciones de trabajo no pueden enviarte notificaciones, consumir batería ni acceder a tu ubicación"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Las aplicaciones de trabajo tienen una insignia y tu administrador de TI las puede ver"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Entendido"</string>
     <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pausar aplicaciones de trabajo"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 4908c4da3f..ef27c2b0a6 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Isiklik"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Töö"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Vestlused"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Kasulik teave on teie käeulatuses"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Teabe saamiseks rakendusi avamata võite oma avakuvale lisada vidinaid"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Selge"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Otsige rakendusi"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Rakenduste laadimine …"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Päringule „<xliff:g id="QUERY">%1$s</xliff:g>” ei vastanud ükski rakendus"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index c15b18c5a5..812f007a23 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Pertsonalak"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Lanekoak"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Elkarrizketak"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Informazio erabilgarria beti eskura"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Aplikazioa ireki beharrik gabe informazioa zuzenean jasotzeko, gehitu widgetak hasierako pantailan"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Ados"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Bilatu aplikazioetan"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Aplikazioak kargatzen…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Ez da aurkitu \"<xliff:g id="QUERY">%1$s</xliff:g>\" bilaketaren emaitzarik"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index f1ae4d50cd..29ada372e5 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"شخصی"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"کار"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"مکالمه‌ها"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"دسترسی آسان به اطلاعات سودمند"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"با افزودن ابزارک‌ها به «صفحه اصلی» می‌توانید اطلاعات را بدون باز کردن برنامه‌ها دریافت کنید"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"متوجه‌ام"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"جستجوی برنامه‌ها"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"درحال بارگیری برنامه‌‌ها…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"هیچ برنامه‌ای در مطابقت با «<xliff:g id="QUERY">%1$s</xliff:g>» پیدا نشد"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index dcee366453..c4d0655d78 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Henkilökohtainen"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Työ"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Keskustelut"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Hyödyllisiä tietoja käden ulottuvilla"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Jos haluat nähdä tietoja avaamatta sovelluksia, voit lisätä aloitusnäytölle widgetejä"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Hae sovelluksia"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Ladataan sovelluksia…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"<xliff:g id="QUERY">%1$s</xliff:g> ei palauttanut sovelluksia."</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 4b8c690080..9522a38a67 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -51,6 +51,12 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personnels"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Professionnels"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversations"</string>
+    <!-- no translation found for widget_education_header (4874760613775913787) -->
+    <skip />
+    <!-- no translation found for widget_education_content (745542879510751525) -->
+    <skip />
+    <!-- no translation found for widget_education_close_button (8676165703104836580) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Rechercher dans les applications"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Chargement des applications en cours…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Aucune application trouvée correspondant à « <xliff:g id="QUERY">%1$s</xliff:g> »"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 90c98fbc6f..adc04fd0d3 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personnels"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Professionnels"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversations"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Infos utiles à portée de main"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Pour obtenir des infos sans ouvrir d\'applis, vous pouvez ajouter des widgets à votre écran d\'accueil"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Rechercher dans les applications"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Chargement des applications…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Aucune application ne correspond à la requête \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index e4a93d421c..615c644cc9 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Widgets persoais"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Widgets do traballo"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversas"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Información útil ao teu alcance"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Se queres obter información sen abrir as aplicacións, podes engadir widgets á pantalla de inicio"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Entendido"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Buscar aplicacións"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Cargando aplicacións…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Non se atoparon aplicacións que coincidan con \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -152,7 +155,7 @@
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Traballo"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de traballo"</string>
     <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Os datos persoais sepáranse e ocúltanse das aplicacións do traballo"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"O teu administrador de TI pode ver as aplicacións e os datos do traballo"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"O teu administrador de TI pode ver as túas aplicacións e datos do traballo"</string>
     <string name="work_profile_edu_next" msgid="8783418929296503629">"Seguinte"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Entendido"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"O perfil de traballo está en pausa"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 3a25705628..9c909a0c7b 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -51,6 +51,12 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"વ્યક્તિગત"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ઑફિસ"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"વાતચીતો"</string>
+    <!-- no translation found for widget_education_header (4874760613775913787) -->
+    <skip />
+    <!-- no translation found for widget_education_content (745542879510751525) -->
+    <skip />
+    <!-- no translation found for widget_education_close_button (8676165703104836580) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"શોધ ઍપ્લિકેશનો"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ઍપ્લિકેશનો લોડ કરી રહ્યું છે…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\"થી મેળ ખાતી કોઈ ઍપ્લિકેશનો મળી નથી"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 471e08897d..5cfb7dbf1b 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"निजी विजेट"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ऑफ़िस"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"बातचीत"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"काम की जानकारी आसानी से पाएं"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"ऐप्लिकेशन को खोले बिना उनकी जानकारी पाने के लिए, आप होम स्क्रीन पर विजेट जोड़ सकते हैं"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"ठीक है"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ऐप सर्च करें"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ऐप्लिकेशन लोड हो रहे हैं…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" से मिलता-जुलता कोई ऐप्लिकेशन नहीं मिला"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 413afcece3..6c94f31b49 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -53,6 +53,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Osobno"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Posao"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Razgovori"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Korisne informacije nadohvat ruke"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Da biste dobili informacije bez otvaranja aplikacija, možete dodati widgete na početni zaslon"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Shvaćam"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Pretraži aplikacije"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Učitavanje aplikacija…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nema aplikacija podudarnih s upitom \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 0435801250..5e1b032255 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Személyes"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Munka"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Beszélgetések"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Hasznos információk egy koppintásnyira"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Ha az alkalmazások megnyitása nélkül szeretne információhoz jutni, felvehet modulokat a kezdőképernyőre."</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Értem"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Alkalmazások keresése"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Alkalmazások betöltése…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nem található alkalmazás a(z) „<xliff:g id="QUERY">%1$s</xliff:g>” lekérdezésre"</string>
@@ -66,7 +69,7 @@
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Munkahelyi alkalmazások listája"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Törlés"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Eltávolítás"</string>
-    <string name="app_info_drop_target_label" msgid="692894985365717661">"Alkalmazásinformáció"</string>
+    <string name="app_info_drop_target_label" msgid="692894985365717661">"Alkalmazásinfó"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Telepítés"</string>
     <string name="dismiss_prediction_label" msgid="3357562989568808658">"Ne javasoljon alkalmazást"</string>
     <string name="pin_prediction" msgid="4196423321649756498">"Várható kitűzése"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 37d0815717..bc68e3edd1 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Անձնական"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Աշխատանքային"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Զրույցներ"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Օգտակար տեղեկությունները՝ միշտ հասանելի"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Ավելացրեք վիջեթներ ձեր հիմնական էկրանին և ստացեք տեղեկություններ՝ առանց հավելվածները բացելու։"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Եղավ"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Որոնել հավելվածներ"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Հավելվածների բեռնում…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"«<xliff:g id="QUERY">%1$s</xliff:g>» հարցմանը համապատասխանող հավելվածներ չեն գտնվել"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index abad5f0b9c..782737c31e 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Pribadi"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Kantor"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Percakapan"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Info bermanfaat yang mudah diakses"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Untuk mendapatkan info tanpa membuka aplikasi, Anda dapat menambahkan widget ke Layar utama"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Oke"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Telusuri aplikasi"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Memuat aplikasi…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Tidak ditemukan aplikasi yang cocok dengan \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index bb4ee9bd6a..b15e86c404 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Persónulegt"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Vinna"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Samtöl"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Gagnlegar upplýsingar innan seilingar"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Þú getur bætt við græjum á heimaskjáinn til að fá upplýsingar án þess að opna forrit"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Ég skil"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Leita í forritum"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Hleður forrit…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Ekki fundust forrit sem samsvara „<xliff:g id="QUERY">%1$s</xliff:g>“"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 2a19b739af..23297e4a4b 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personali"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Lavoro"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversazioni"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Informazioni utili a portata di mano"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Per ricevere informazioni senza aprire app, puoi aggiungere widget alla schermata Home"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Cerca nelle app"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Caricamento delle app…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nessuna app trovata corrispondente a \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index c8793ac9ce..fb72d55595 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -55,6 +55,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"אישי"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"עבודה"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"שיחות"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"קבלת מידע שימושי בהקשה"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"רוצה לקבל מידע בלי לפתוח אפליקציות? אפשר להוסיף ווידג\'טים למסך הבית"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"הבנתי"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"חיפוש אפליקציות"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"טעינת אפליקציות מתבצעת…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"לא נמצאו אפליקציות התואמות ל-\"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 7f2e4a9118..60fe4532a9 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"個人用"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"仕事用"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"会話"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"スワイプだけで役立つ情報をいつでも入手"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"ホーム画面にウィジェットを追加すると、アプリを開かずに情報を入手できます"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"アプリを検索"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"アプリを読み込んでいます…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"「<xliff:g id="QUERY">%1$s</xliff:g>」に一致するアプリは見つかりませんでした"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index ca8f665b27..1347d1debc 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"პირადი"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"სამსახური"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"მიმოწერები"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"ადვილად მისაწვდომი სასარგებლო ინფორმაცია"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"იმისთვის, რომ ინფორმაცია აპების გაუხსნელად მიიღოთ, შეგიძლიათ, მთავარ ეკრანზე ვიჯეტები დაამატოთ"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"გასაგებია"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"აპების ძიება"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"აპები იტვირთება…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"„<xliff:g id="QUERY">%1$s</xliff:g>“-ის თანხვედრი აპები არ მოიძებნა"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 8353c249da..2b1b89f292 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -32,7 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Виджетті жылжыту үшін екі рет түртіңіз де, ұстап тұрыңыз немесе арнаулы әрекеттерді пайдаланыңыз."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Ені: %1$d, биіктігі: %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Негізгі экран бойымен қозғалту үшін виджетті басып, ұстап тұрыңыз."</string>
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Негізгі экранда қозғалту үшін виджетті басып, ұстап тұрыңыз."</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Негізгі экранға қосу"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виджет</item>
@@ -51,6 +51,12 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Жеке виджеттер"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Жұмыс виджеттері"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Әңгімелер"</string>
+    <!-- no translation found for widget_education_header (4874760613775913787) -->
+    <skip />
+    <!-- no translation found for widget_education_content (745542879510751525) -->
+    <skip />
+    <!-- no translation found for widget_education_close_button (8676165703104836580) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Қолданбаларды іздеу"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Қолданбалар жүктелуде…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" сұрауына сәйкес келетін қолданбалар жоқ"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index b941b18c18..4f0964836c 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ផ្ទាល់ខ្លួន"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ការងារ"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"ការសន្ទនា"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"ទទួលបាន​ព័ត៌មានដែលមានប្រយោជន៍​យ៉ាងងាយស្រួល"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"ដើម្បីទទួលបាន​ព័ត៌មាន​ដោយមិនចាំបាច់​បើកកម្មវិធី អ្នកអាចបញ្ចូលធាតុ​ក្រាហ្វិកទៅក្នុង​អេក្រង់ដើម​របស់អ្នក"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"យល់ហើយ"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ស្វែងរក​កម្មវិធី"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"កំពុងផ្ទុកកម្មវិធី…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"រកមិនឃើញកម្មវិធី​ដែលត្រូវគ្នាជាមួយ \"<xliff:g id="QUERY">%1$s</xliff:g>\" ទេ"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 27f045e3ff..9a3075f54d 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ವೈಯಕ್ತಿಕ"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ಕೆಲಸ"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"ಸಂವಾದಗಳು"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"ನಿಮ್ಮ ಬೆರಳ ತುದಿಯಲ್ಲಿ ಉಪಯುಕ್ತ ಮಾಹಿತಿ"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"ಆ್ಯಪ್‌ಗಳನ್ನು ತೆರೆಯದೆಯೇ ಮಾಹಿತಿಯನ್ನು ಪಡೆಯಲು, ನಿಮ್ಮ ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿ ನೀವು ವಿಜೆಟ್‌ಗಳನ್ನು ಸೇರಿಸಬಹುದು"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"ಅರ್ಥವಾಯಿತು"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಹುಡುಕಿ"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" ಹೊಂದಿಕೆಯ ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಕಂಡುಬಂದಿಲ್ಲ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index e8a19ebe77..cce4c8935b 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"개인 위젯"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"직장 위젯"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"대화"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"빠르게 유용한 정보 확인"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"앱을 열지 않고 정보를 확인하려면 홈 화면에 위젯을 추가하세요."</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"확인"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"앱 검색"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"앱 로드 중…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\'<xliff:g id="QUERY">%1$s</xliff:g>\'과(와) 일치하는 앱이 없습니다."</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 7f131771c6..ed49ff1ae2 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Жеке"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Жумуш"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Сүйлөшүүлөр"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Пайдалуу маалымат манжаңыздын учунда эле турат"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Колдонмолорду ачпастан керектүү маалыматты алуу үчүн Башкы экранга виджеттерди кошуңуз"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Түшүндүм"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Колдонмолорду издөө"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Колдонмолор жүктөлүүдө…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" сурамына дал келген колдонмолор табылган жок"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 041e3222e7..ed367d98eb 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ສ່ວນຕົວ"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ວຽກ"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"ການສົນທະນາ"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"ຂໍ້ມູນທີ່ເປັນປະໂຫຍດຢູ່ປາຍນິ້ວຂອງທ່ານ"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"ເພື່ອຮັບຂໍ້ມູນໂດຍບໍ່ຕ້ອງເປີດແອັບ, ທ່ານສາມາດເພີ່ມວິດເຈັດໃສ່ໂຮມສະກຣີນຂອງທ່ານໄດ້"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"ເຂົ້າໃຈແລ້ວ"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ຊອກຫາແອັບ"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ກໍາລັງໂຫຼດແອັບ…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"ບໍ່ພົບແອັບທີ່ກົງກັບ \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 707cef4638..21f99fc127 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -55,6 +55,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Asmeniniai"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Darbas"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Pokalbiai"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Lengvai pasiekiama naudinga informacija"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Jei norite gauti informacijos neatidarę programų, galite pridėti valdiklių pagrindiniame ekrane"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Supratau"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Paieškos programos"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Įkeliamos programos…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nerasta jokių užklausą „<xliff:g id="QUERY">%1$s</xliff:g>“ atitinkančių programų"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 382784b39d..059620c314 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -53,6 +53,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personīgie"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Darba"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Sarunas"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Ērta piekļuve noderīgai informācijai"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Lai iegūtu informāciju, neatverot lietotnes, varat pievienot logrīkus sākuma ekrānā."</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Labi"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Meklēt lietotnes"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Notiek lietotņu ielāde…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Vaicājumam “<xliff:g id="QUERY">%1$s</xliff:g>” neatbilda neviena lietotne"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index dcfd1d9d40..f4c960624e 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Лични"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Работни"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Разговори"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Корисни информации на дофат на прстите"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"За да добивате информации без да ги отворате апликациите, може да додадете виџети на почетниот екран"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Сфатив"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Пребарувајте апликации"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Се вчитуваат апликации…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Не се најдени апликации што одговараат на „<xliff:g id="QUERY">%1$s</xliff:g>“"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 2d7c9250eb..0359220ac1 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"വ്യക്തിപരം"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ജോലി"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"സംഭാഷണങ്ങൾ"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"ഉപകാരപ്രദമായ വിവരങ്ങൾ നിങ്ങളുടെ വിരൽത്തുമ്പിൽ"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"ആപ്പുകൾ തുറക്കാതെ വിവരങ്ങൾ ലഭിക്കാൻ, നിങ്ങൾക്ക് ഹോം സ്ക്രീനിലേക്ക് വിജറ്റുകൾ ചേർക്കാം"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"മനസ്സിലായി"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ആപ്പുകൾ തിരയുക"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ആപ്പുകൾ ലോഡുചെയ്യുന്നു..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" എന്നതുമായി പൊരുത്തപ്പെടുന്ന ആപ്പുകളൊന്നും കണ്ടെത്തിയില്ല"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 5a072fea72..53d382dc85 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Хувийн"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Ажил"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Харилцан яриа"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Хэрэгтэй мэдээллээ хурууныхаа үзүүрээр аваарай"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Аппуудыг нээлгүйгээр мэдээлэл авахын тулд та Үндсэн нүүрэндээ жижиг хэрэгслүүд нэмэх боломжтой"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Ойлголоо"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Апп хайх"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Аппыг ачаалж байна..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\"-д тохирох апп олдсонгүй"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index e87e6b9fc7..b4c217434e 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"वैयक्तिक"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ऑफिस"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"संभाषणे"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"तुमच्यासाठी सहज उपलब्ध असलेली माहिती"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"ॲप्स न उघडता माहिती मिळवण्यासाठी, तुम्ही तुमच्या होम स्क्रीनवर विजेट जोडू शकता"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"समजले"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"अ‍ॅप्स शोधा"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"अ‍ॅप्स लोड करत आहे…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" शी जुळणारे कोणतेही अ‍ॅप्स आढळले नाहीत"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 9465be5b02..f6300ee107 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -33,7 +33,7 @@
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Lebar %1$d kali tinggi %2$d"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Sentuh &amp; tahan widget untuk menggerakkan widget di sekitar Skrin utama"</string>
-    <string name="add_to_home_screen" msgid="8631549138215492708">"Tambah pada Skrin utama"</string>
+    <string name="add_to_home_screen" msgid="8631549138215492708">"Tambahkan pada Skrin utama"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Peribadi"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Tempat kerja"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Perbualan"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Maklumat berguna di hujung jari anda"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Untuk mendapatkan maklumat tanpa membuka apl, anda boleh menambahkan widget pada skrin Utama anda"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Cari apl"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Memuatkan apl…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Tiada apl yang ditemui sepadan dengan \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 1fb7e5644f..1a8650cc16 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ကိုယ်ပိုင်"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"အလုပ်"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"စကားဝိုင်းများ"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"အသုံးဝင်သော အချက်အလက်များကို အလွယ်တကူ ရယူလိုက်ပါ"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"အက်ပ်များကိုမဖွင့်ဘဲ အချက်အလက်များရယူရန် သင်၏ ပင်မစာမျက်နှာသို့ ဝိဂျက်များ ထည့်နိုင်သည်"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"ရပြီ"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ရှာဖွေမှု အက်ပ်များ"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"အက်ပ်များကို ဖွင့်နေသည်…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" နှင့်ကိုက်ညီသည့် အပ်ပ်များကို မတွေ့ပါ"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 42d04a2231..49d29127f4 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personlig"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Jobb"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Samtaler"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Lett tilgjengelig nyttig informasjon"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"For å se informasjon uten å åpne apper kan du legge til moduler på startskjermen"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Greit"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Søk etter apper"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Laster inn appene …"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Fant ingen apper som samsvarer med «<xliff:g id="QUERY">%1$s</xliff:g>»"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 9e26e1d9e5..474a452a0d 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -32,7 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"कुनै विजेट सार्न वा आफ्नो रोजाइका कारबाही प्रयोग गर्न डबल ट्याप गरेर छोइराख्नुहोस्।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d चौडाइ गुणा %2$d उचाइ"</string>
-    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"विजेटलाई होम स्क्रिनमा यताउता सार्न त्यसमा टच एन्ड होल्ड गर्नुहोस्"</string>
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"यो विजेट होम स्क्रिनमा यताउता सार्न त्यसमा टच एन्ड होल्ड गर्नुहोस्"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"होम स्क्रिनमा हाल्नुहोस्"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> वटा विजेट</item>
@@ -51,6 +51,12 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"व्यक्तिगत"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"कामसम्बन्धी"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"वार्तालापहरू"</string>
+    <!-- no translation found for widget_education_header (4874760613775913787) -->
+    <skip />
+    <!-- no translation found for widget_education_content (745542879510751525) -->
+    <skip />
+    <!-- no translation found for widget_education_close_button (8676165703104836580) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"खोजसम्बन्धी एपहरू"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"एपहरू लोड गर्दै…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" सँग मिल्दो कुनै एप भेटिएन"</string>
@@ -121,7 +127,7 @@
     <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> स्थापना गर्न प्रतीक्षा गर्दै"</string>
     <string name="widgets_list" msgid="796804551140113767">"विजेटहरूको सूची"</string>
     <string name="widgets_list_closed" msgid="6141506579418771922">"विजेटहरूको सूची बन्द गरियो"</string>
-    <string name="action_add_to_workspace" msgid="8902165848117513641">"गृह स्क्रिनमा थप्नुहोस्"</string>
+    <string name="action_add_to_workspace" msgid="8902165848117513641">"होम स्क्रिनमा हाल्नुहोस्"</string>
     <string name="action_move_here" msgid="2170188780612570250">"वस्तु यहाँ सार्नुहोस्"</string>
     <string name="item_added_to_workspace" msgid="4211073925752213539">"वस्तु गृह स्क्रिनमा थपियो"</string>
     <string name="item_removed" msgid="851119963877842327">"वस्तु हटाइयो"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 58d1d98787..f3c55386c7 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Persoonlijk"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Werk"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Gesprekken"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Nuttige informatie binnen handbereik"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Als je informatie wilt krijgen zonder apps te openen, kun je widgets toevoegen aan je startscherm"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Apps zoeken"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Apps laden…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Er zijn geen apps gevonden die overeenkomen met \'<xliff:g id="QUERY">%1$s</xliff:g>\'"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index dfcc716796..3517dabf4b 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -51,6 +51,12 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ବ୍ୟକ୍ତିଗତ"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ୱାର୍କ"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ"</string>
+    <!-- no translation found for widget_education_header (4874760613775913787) -->
+    <skip />
+    <!-- no translation found for widget_education_content (745542879510751525) -->
+    <skip />
+    <!-- no translation found for widget_education_close_button (8676165703104836580) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ଆପ୍‌ ଖୋଜନ୍ତୁ"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ଆପ୍‌ ଲୋଡ୍‌ ହେଉଛି..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" ସହିତ ମେଳ ହେଉଥିବା କୌଣସି ଆପ୍‌ ମିଳିଲା ନାହିଁ"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 495f3c4b7c..64a180a651 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -51,6 +51,12 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ਨਿੱਜੀ"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ਕਾਰਜ-ਸਥਾਨ"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"ਗੱਲਾਂਬਾਤਾਂ"</string>
+    <!-- no translation found for widget_education_header (4874760613775913787) -->
+    <skip />
+    <!-- no translation found for widget_education_content (745542879510751525) -->
+    <skip />
+    <!-- no translation found for widget_education_close_button (8676165703104836580) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ਐਪਾਂ ਖੋਜੋ"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ਐਪਾਂ ਨੂੰ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" ਨਾਲ ਮੇਲ ਖਾਂਦੀਆਂ ਕੋਈ ਐਪਾਂ ਨਹੀਂ ਮਿਲੀਆਂ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index acce00a01d..7b47cdea25 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -32,7 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Naciśnij dwukrotnie i przytrzymaj, aby przenieść widżet lub użyć działań niestandardowych."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Szerokość %1$d, wysokość %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Kliknij i przytrzymaj widżet, by poruszać nim po ekranie głównym."</string>
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Kliknij i przytrzymaj widżet, by poruszać nim po ekranie głównym"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Dodaj do ekranu głównego"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widżety</item>
@@ -55,6 +55,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Osobiste"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Służbowe"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Rozmowy"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Użyteczne informacje w zasięgu ręki"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Aby uzyskać informacje bez otwierania aplikacji, możesz dodać widżety do ekranu głównego"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Wyszukaj aplikacje"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Ładuję aplikacje…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nie znaleziono aplikacji pasujących do zapytania „<xliff:g id="QUERY">%1$s</xliff:g>”"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index d429ebe188..84c472f642 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Pessoais"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Trabalho"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversas"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Informações úteis à sua disposição"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Para obter informações sem abrir apps, pode adicionar widgets ao seu ecrã principal"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Pesquisar aplicações"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"A carregar aplicações…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nenhuma app correspondente a \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -163,6 +166,6 @@
     <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Colocar apps de trabalho em pausa"</string>
     <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Ativar"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtrar"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Coloque as apps de trabalho e as notificações em pausa."</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Coloque as apps de trabalho e as notificações em pausa"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Falhou: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index fd793d4aa0..c44ffc8294 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Pessoal"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Trabalho"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversas"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Informações úteis ao seu alcance"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Para receber informações sem precisar abrir apps, adicione widgets à sua tela inicial"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Ok"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Pesquisar apps"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Carregando apps…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nenhum app encontrado que corresponda a \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 5ba9e8d7b5..16f0ade92f 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -53,6 +53,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personale"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Serviciu"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversații"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Informații utile la îndemâna dvs."</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Pentru a primi informații fără să deschideți aplicațiile, puteți adăuga widgeturi pe ecranul de pornire"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Căutați aplicații"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Se încarcă aplicații…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nu s-a găsit nicio aplicație pentru „<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 7da57db748..70606a9681 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -32,7 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Чтобы использовать специальные действия или перенести виджет, нажмите на него дважды и удерживайте."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d x %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Ширина %1$d, высота %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Нажмите на виджет и удерживайте его, чтобы переместить в нужное место на главном экране."</string>
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Чтобы переместить виджет, нажмите на него и удерживайте."</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Добавить на главный экран"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виджет</item>
@@ -55,6 +55,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Личные виджеты"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Рабочие виджеты"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Разговоры"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Вся нужная информация перед глазами"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Чтобы не открывать приложения каждый раз, когда нужна информация, добавьте виджеты на главный экран."</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"ОК"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Поиск приложений"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Загрузка приложений…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"По запросу \"<xliff:g id="QUERY">%1$s</xliff:g>\" ничего не найдено"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 3741c76483..2ba06fabff 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"පුද්ගලික"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"කාර්යාලය"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"සංවාද"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"ප්‍රයෝජනවත් තොරතුරු ඔබගේ ඇඟිලි තුඩු අග"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"යෙදුම් විවෘත නොකර තොරතුරු ලබා ගැනීම සඳහා, ඔබට ඔබගේ මුල් තිරයට විජට් එක් කළ හැකිය"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"තේරුණා"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"යෙදුම් සොයන්න"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"යෙදුම් පූරණය වෙමින්…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" සමග ගැළපෙන යෙදුම් හමු නොවිණි"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index e23e7a9b5a..08e7bb643e 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -32,7 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvojitým klepnutím a pridržaním presuňte miniaplikáciu alebo použite vlastné akcie."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"šírka %1$d, výška %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Po pridržaní môžete miniaplikáciu môžete posúvať po ploche"</string>
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Po pridržaní môžete miniaplikáciu posúvať po ploche"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Pridať na plochu"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> miniaplikácie</item>
@@ -55,6 +55,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Osobné"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Práca"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Konverzácie"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Užitočné informácie poruke"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Ak chcete získavať informácie bez otvárania aplikácií, môžete si pridať miniaplikácie na plochu"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Dobre"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Hľadať aplikácie"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Načítavajú sa aplikácie…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nenašli sa žiadne aplikácie zodpovedajúce dopytu <xliff:g id="QUERY">%1$s</xliff:g>"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index cb7f0bc560..57461a1e89 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -55,6 +55,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Osebno"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Služba"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Pogovori"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Koristne informacije na dosegu prstov"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Če si želite podatke ogledati brez odpiranja aplikacij, lahko na začetni zaslon dodate pripomočke."</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"V redu"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Iskanje programov"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Nalaganje aplikacij …"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Ni aplikacij, ki bi ustrezale poizvedbi »<xliff:g id="QUERY">%1$s</xliff:g>«"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 2528aed90e..338aa8b142 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -51,6 +51,12 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personale"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Puna"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Bisedat"</string>
+    <!-- no translation found for widget_education_header (4874760613775913787) -->
+    <skip />
+    <!-- no translation found for widget_education_content (745542879510751525) -->
+    <skip />
+    <!-- no translation found for widget_education_close_button (8676165703104836580) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Kërko për aplikacione"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Po ngarkon aplikacionet..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nuk u gjet asnjë aplikacion që përputhet me \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index bcc867ca79..2e87b439bf 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -53,6 +53,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Лично"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Посао"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Конверзације"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Корисне информације надохват руке"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Да бисте пронашли информације без отварања апликација, можете да додате виџете на почетни екран"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Важи"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Претражите апликације"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Апликације се учитавају…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Није пронађена ниједна апликација за „<xliff:g id="QUERY">%1$s</xliff:g>“"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index ce973202cf..29ef67d3e2 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Privata widgetar"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Arbete"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Konversationer"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Användbar information nära till hands"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Om du vill ha information utan att öppna appar kan du lägga till widgetar på startskärmen"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Sök efter appar"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Läser in appar …"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Inga appar som matchar <xliff:g id="QUERY">%1$s</xliff:g> hittades"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 3a46d73c90..7829bebe16 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Binafsi"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Kazini"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Mazungumzo"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Maelezo muhimu mahali popote ulipo"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Ili upate maelezo bila kufungua programu, unaweza kuweka wijeti kwenye Skrini yako ya kwanza"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Nimeelewa"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Tafuta programu"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Inapakia programu..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Haikupata programu zozote zinazolingana na \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 3b891cb4ca..6fe5a388fa 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"தனிப்பட்டவை"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"பணி"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"உரையாடல்கள்"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"விரல்நுனியில் பயனுள்ள தகவல்களைப் பெறுங்கள்"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"ஆப்ஸைத் திறக்காமல் தகவல்களைப் பெற, முகப்புத் திரையில் விட்ஜெட்டுகளைச் சேர்க்கலாம்"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"சரி"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"பயன்பாடுகளில் தேடுக"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ஆப்ஸை ஏற்றுகிறது…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" உடன் பொருந்தும் ஆப்ஸ் இல்லை"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 68c8039858..a4746616e5 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -32,7 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"విడ్జెట్‌ను తరలించడానికి లేదా అనుకూల చర్యలను ఉపయోగించడానికి రెండుసార్లు నొక్కండి &amp; హోల్డ్ చేయి."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d వెడల్పు X %2$d ఎత్తు"</string>
-    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"విడ్జెట్‌ను మొదటి స్క్రీన్ చుట్టూ తిప్పడానికి దాన్ని తాకి, &amp; నొక్కి ఉంచండి"</string>
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ఈ విడ్జెట్‌ను మొదటి స్క్రీన్‌లో కావాల్సిన చోట ఉంచడానికి, దాన్ని తాకి అలాగే నొక్కి పట్టుకోండి"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"మొదటి స్క్రీన్‌కు జోడించు"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> విడ్జెట్‌లు</item>
@@ -51,6 +51,12 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"వ్యక్తిగతం"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ఆఫీస్"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"సంభాషణలు"</string>
+    <!-- no translation found for widget_education_header (4874760613775913787) -->
+    <skip />
+    <!-- no translation found for widget_education_content (745542879510751525) -->
+    <skip />
+    <!-- no translation found for widget_education_close_button (8676165703104836580) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"అప్లికేషన్‌లను శోధించండి"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"అప్లికేషన్‌లను లోడ్ చేస్తోంది…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\"కి సరిపోలే అప్లికేషన్‌లేవీ కనుగొనబడలేదు"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 2dd6ccc799..0011d70c01 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ส่วนตัว"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"งาน"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"การสนทนา"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"เข้าถึงข้อมูลที่เป็นประโยชน์ได้ที่ปลายนิ้ว"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"หากต้องการรับข้อมูลโดยไม่เปิดแอป ให้เพิ่มวิดเจ็ตลงในหน้าจอหลัก"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"รับทราบ"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ค้นหาแอป"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"กำลังโหลดแอป…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"ไม่พบแอปที่ตรงกับ \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index cec90c4dbd..cd662e1eec 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personal"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Trabaho"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Mga Pag-uusap"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Abot-kamay na mahalagang impormasyon"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Para makakuha ng impormasyon nang hindi nagbubukas ng mga app, puwede kang magdagdag ng mga widget sa iyong Home screen"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Maghanap ng mga app"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Naglo-load ng mga app…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Walang nahanap na app na tumutugma sa \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index baa5ccef3f..5691fc044d 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Kişisel"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"İş"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Görüşmeler"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Faydalı bilgiler parmaklarınızın ucunda"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Uygulamaları açmadan bilgi almak için Ana ekranınıza widget\'lar ekleyebilirsiniz"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Anladım"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Uygulamalarda ara"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Uygulamalar yükleniyor…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" ile eşleşen uygulama bulunamadı"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index e266d6aca4..f0d486d108 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -32,7 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Двічі натисніть і втримуйте віджет, щоб перемістити його або виконати інші дії."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Ширина – %1$d, висота – %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Натисніть і втримуйте віджет, щоб переміщувати його головним екраном"</string>
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Натисніть і втримуйте віджет, щоб перемістити його в потрібне місце на головному екрані"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Додати на головний екран"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> віджет</item>
@@ -55,6 +55,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Особисті"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Робочі"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Розмови"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Корисна інформація завжди під рукою"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Щоб отримувати інформацію, не відкриваючи додатки, ви можете додати на головний екран віджети"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Пошук додатків"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Завантаження додатків…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Немає додатків для запиту \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 4e986b8947..1574c47e96 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ذاتی"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"دفتری ویجیٹس"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"گفتگوئیں"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"مفید معلومات کو آسانی سے حاصل کریں"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"ایپس کو کھولے بغیر معلومات حاصل کرنے کے لیے آپ اپنی ہوم اسکرین پر ویجیٹس شامل کر سکتے ہیں"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"سمجھ آ گئی"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ایپس تلاش کریں"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ایپس لوڈ کی جا رہی ہیں…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" سے مماثل کوئی ایپس نہیں ملیں"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 7328311e50..3d5db5417c 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -32,7 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Ikki marta bosib va bosib turgan holatda vidjetni tanlang yoki maxsus amaldan foydalaning."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Eni %1$d, bo‘yi %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Bosh ekranda surish uchun vidjet ustiga bosib turing"</string>
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Vidjetni ushlagan holda kerakli joyga siljiting"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Bosh ekranga chiqarish"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ta vidjet</item>
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Shaxsiy"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Ish"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Suhbatlar"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Barcha foydali axborot koʻz oldingizda"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Ilovalarni ochmasdan axborot olish uchun vidjetlarni bosh ekranga qoʻshishingiz mumkin"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Ilovalarni qidirish"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Ilovalar yuklanmoqda…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"“<xliff:g id="QUERY">%1$s</xliff:g>” bilan mos hech qanday ilova topilmadi"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 9c308e0711..9f7fea373f 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Cá nhân"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Công việc"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Cuộc trò chuyện"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Thông tin hữu ích ngay trong tầm tay bạn"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Để nhận thông tin mà không cần mở các ứng dụng, bạn có thể thêm tiện ích vào Màn hình chính"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Tôi hiểu"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Tìm kiếm ứng dụng"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Đang tải ứng dụng…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Không tìm thấy ứng dụng nào phù hợp với \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index f7aa74add6..b1fb1658da 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -51,6 +51,12 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"个人"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"工作"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"对话"</string>
+    <!-- no translation found for widget_education_header (4874760613775913787) -->
+    <skip />
+    <!-- no translation found for widget_education_content (745542879510751525) -->
+    <skip />
+    <!-- no translation found for widget_education_close_button (8676165703104836580) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"搜索应用"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"正在加载应用…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"未找到与“<xliff:g id="QUERY">%1$s</xliff:g>”相符的应用"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 0fd5284705..c7d67af481 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"個人"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"工作"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"對話"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"實用資訊，唾手可得"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"只要將小工具新增到主畫面，就可以直接查看資訊，無需開啟應用程式"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"知道了"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"搜尋應用程式"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"正在載入應用程式…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"找不到與「<xliff:g id="QUERY">%1$s</xliff:g>」相符的應用程式"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 99e22a2d46..6941c2ca8e 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -32,7 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"輕觸兩下並按住即可移動小工具或使用自訂操作。"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"寬度為 %1$d，高度為 %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"按住小工具即可將小工具移到主畫面的任一位置"</string>
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"按住小工具即可將它拖放到主畫面上的任何位置"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"新增到主畫面"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> 項小工具</item>
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"個人"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"工作"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"對話"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"實用資訊隨手可得"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"只要將小工具新增到主畫面，就可以直接查看資訊，不必開啟應用程式"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"我知道了"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"搜尋應用程式"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"正在載入應用程式…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"找不到與「<xliff:g id="QUERY">%1$s</xliff:g>」相符的應用程式"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index dbdcf1729a..1b645b2502 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -51,6 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Okomuntu siqu"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Umsebenzi"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Izingxoxo"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Ulwazi oluwusizo phambi nje kwakho"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Ukuze utholeulwazi ngaphandle kokuvula ama-app, ungakwazi ukwengeza amawijethi kusikrini sakho sasekhaya"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Ngiyezwa"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Sesha izinhlelo zokusebenza"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Ilayisha izinhlelo zokusebenza..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Azikho izinhlelo zokusebenza ezitholiwe ezifana ne-\"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
-- 
GitLab


From ed49a7187d088d5c64bfe9355aeed79085536355 Mon Sep 17 00:00:00 2001
From: Brian Isganitis <brianji@google.com>
Date: Tue, 25 May 2021 21:06:49 -0400
Subject: [PATCH 1324/1664] Pad bottom of settings list view with bottom system
 insets

This change allows for a transparent navigation bar in the settings Material next redesign.

Test: Bottom of settings not cut off by bottom navigation bar
Bug: 187732263
Change-Id: I237011003ca0c3760c0fbdbb2865ef90c19d7b81
---
 res/layout/settings_activity.xml               |  3 ++-
 .../settings/DeveloperOptionsFragment.java     | 11 +++++++++++
 .../launcher3/settings/SettingsActivity.java   | 18 ++++++++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/res/layout/settings_activity.xml b/res/layout/settings_activity.xml
index c70d5bf22c..5edd2df3f5 100644
--- a/res/layout/settings_activity.xml
+++ b/res/layout/settings_activity.xml
@@ -18,7 +18,8 @@
     android:id="@+id/content_parent"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:fitsSystemWindows="true">
 
     <Toolbar
         android:id="@+id/action_bar"
diff --git a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
index e2a69ff7a2..8fe42acf59 100644
--- a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
+++ b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
@@ -152,6 +152,17 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
                 filterPreferences(query, mPreferenceScreen);
             }
         });
+
+        View listView = getListView();
+        final int bottomPadding = listView.getPaddingBottom();
+        listView.setOnApplyWindowInsetsListener((v, insets) -> {
+            v.setPadding(
+                    v.getPaddingLeft(),
+                    v.getPaddingTop(),
+                    v.getPaddingRight(),
+                    bottomPadding + insets.getSystemWindowInsetBottom());
+            return insets.consumeSystemWindowInsets();
+        });
     }
 
     @Override
diff --git a/src/com/android/launcher3/settings/SettingsActivity.java b/src/com/android/launcher3/settings/SettingsActivity.java
index 05927ef167..d754ed2ff2 100644
--- a/src/com/android/launcher3/settings/SettingsActivity.java
+++ b/src/com/android/launcher3/settings/SettingsActivity.java
@@ -24,9 +24,11 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
+import androidx.core.view.WindowCompat;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
@@ -82,6 +84,7 @@ public class SettingsActivity extends FragmentActivity
         super.onCreate(savedInstanceState);
         setContentView(R.layout.settings_activity);
         setActionBar(findViewById(R.id.action_bar));
+        WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
 
         if (savedInstanceState == null) {
             Intent intent = getIntent();
@@ -198,6 +201,21 @@ public class SettingsActivity extends FragmentActivity
             }
         }
 
+        @Override
+        public void onViewCreated(View view, Bundle savedInstanceState) {
+            super.onViewCreated(view, savedInstanceState);
+            View listView = getListView();
+            final int bottomPadding = listView.getPaddingBottom();
+            listView.setOnApplyWindowInsetsListener((v, insets) -> {
+                v.setPadding(
+                        v.getPaddingLeft(),
+                        v.getPaddingTop(),
+                        v.getPaddingRight(),
+                        bottomPadding + insets.getSystemWindowInsetBottom());
+                return insets.consumeSystemWindowInsets();
+            });
+        }
+
         @Override
         public void onSaveInstanceState(Bundle outState) {
             super.onSaveInstanceState(outState);
-- 
GitLab


From 6afcfd7cbd2f20089ed7963cc6eb333af42d37b3 Mon Sep 17 00:00:00 2001
From: Brian Isganitis <brianji@google.com>
Date: Wed, 26 May 2021 20:43:15 -0400
Subject: [PATCH 1325/1664] Show toolbar back button on subsettings pages

Test: Back button displayed and functional on subsettings
Bug: 187732263
Change-Id: I6a3679de3a00480f5a0861f966d178be25f001d4
---
 .../launcher3/settings/SettingsActivityTest.java | 15 +++++++++++++++
 .../launcher3/settings/SettingsActivity.java     | 16 +++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/robolectric_tests/src/com/android/launcher3/settings/SettingsActivityTest.java b/robolectric_tests/src/com/android/launcher3/settings/SettingsActivityTest.java
index 85bf28e0b9..3271812b45 100644
--- a/robolectric_tests/src/com/android/launcher3/settings/SettingsActivityTest.java
+++ b/robolectric_tests/src/com/android/launcher3/settings/SettingsActivityTest.java
@@ -27,6 +27,7 @@ import static androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent;
 import static androidx.test.espresso.intent.matcher.IntentMatchers.hasExtra;
 import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant;
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 
@@ -109,6 +110,7 @@ public class SettingsActivityTest {
 
         onView(withText("About")).check(matches(isDisplayed()));
         onView(withText("Version")).check(matches(isDisplayed()));
+        onView(withContentDescription("Navigate up")).check(matches(isDisplayed()));
     }
 
     @Test
@@ -119,6 +121,7 @@ public class SettingsActivityTest {
 
         onView(withText("Developer Options")).check(matches(isDisplayed()));
         onView(withId(R.id.filter_box)).check(matches(isDisplayed()));
+        onView(withContentDescription("Navigate up")).check(matches(isDisplayed()));
     }
 
     @Test
@@ -134,4 +137,16 @@ public class SettingsActivityTest {
             assertThat(e.getMessage()).contains(fragmentClass);
         }
     }
+
+    @Test
+    public void testSettings_backButtonFinishesActivity() {
+        Bundle fragmentArgs = new Bundle();
+        fragmentArgs.putString(ARG_PREFERENCE_ROOT, "about_screen");
+        Intent intent = new Intent(mApplicationContext, SettingsActivity.class)
+                .putExtra(EXTRA_FRAGMENT_ARGS, fragmentArgs);
+        ActivityScenario<SettingsActivity> scenario = ActivityScenario.launch(intent);
+
+        onView(withContentDescription("Navigate up")).perform(click());
+        scenario.onActivity(activity -> assertThat(activity.isFinishing()).isTrue());
+    }
 }
diff --git a/src/com/android/launcher3/settings/SettingsActivity.java b/src/com/android/launcher3/settings/SettingsActivity.java
index d754ed2ff2..915e140aaf 100644
--- a/src/com/android/launcher3/settings/SettingsActivity.java
+++ b/src/com/android/launcher3/settings/SettingsActivity.java
@@ -24,6 +24,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.view.MenuItem;
 import android.view.View;
 
 import androidx.annotation.NonNull;
@@ -86,8 +87,12 @@ public class SettingsActivity extends FragmentActivity
         setActionBar(findViewById(R.id.action_bar));
         WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
 
+        Intent intent = getIntent();
+        if (intent.hasExtra(EXTRA_FRAGMENT) || intent.hasExtra(EXTRA_FRAGMENT_ARGS)) {
+            getActionBar().setDisplayHomeAsUpEnabled(true);
+        }
+
         if (savedInstanceState == null) {
-            Intent intent = getIntent();
             Bundle args = intent.getBundleExtra(EXTRA_FRAGMENT_ARGS);
             if (args == null) {
                 args = new Bundle();
@@ -164,6 +169,15 @@ public class SettingsActivity extends FragmentActivity
         return startPreference(getString(R.string.settings_fragment_name), args, pref.getKey());
     }
 
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            onBackPressed();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
     /**
      * This fragment shows the launcher preferences.
      */
-- 
GitLab


From 2e747e2194034cbb07191f4dda33907c733679e1 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Thu, 3 Jun 2021 16:47:54 -0700
Subject: [PATCH 1326/1664] Remove APP_SEARCH_IMPROVEMENTS

Bug: 190104801
Test: manual, builds

Change-Id: Icd7f0f17bf79eda9fa8e10a6699be3852a34de67
---
 src/com/android/launcher3/LauncherAppState.java    | 2 --
 src/com/android/launcher3/config/FeatureFlags.java | 4 ----
 src/com/android/launcher3/icons/IconCache.java     | 3 +--
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index dabbdd3063..b3d096c4b8 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -99,8 +99,6 @@ public class LauncherAppState {
         }
         mOnTerminateCallback.add(() -> mContext.unregisterReceiver(modelChangeReceiver));
 
-        // TODO: remove listener on terminate
-        FeatureFlags.APP_SEARCH_IMPROVEMENTS.addChangeListener(context, mModel::forceReload);
         CustomWidgetManager.INSTANCE.get(mContext)
                 .setWidgetRefreshCallback(mModel::refreshAndBindWidgetsAndShortcuts);
 
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 40dcb1e66a..ab72a077a1 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -111,10 +111,6 @@ public final class FeatureFlags {
             "FOLDER_NAME_MAJORITY_RANKING", true,
             "Suggests folder names based on majority based ranking.");
 
-    public static final BooleanFlag APP_SEARCH_IMPROVEMENTS = new DeviceFlag(
-            "APP_SEARCH_IMPROVEMENTS", true,
-            "Adds localized title and keyword search and ranking");
-
     public static final BooleanFlag ENABLE_PREDICTION_DISMISS = getDebugFlag(
             "ENABLE_PREDICTION_DISMISS", true, "Allow option to dimiss apps from predicted list");
 
diff --git a/src/com/android/launcher3/icons/IconCache.java b/src/com/android/launcher3/icons/IconCache.java
index 8e0a388784..cd13cd0ec5 100644
--- a/src/com/android/launcher3/icons/IconCache.java
+++ b/src/com/android/launcher3/icons/IconCache.java
@@ -336,8 +336,7 @@ public class IconCache extends BaseIconCache {
 
     @Override
     protected String getIconSystemState(String packageName) {
-        return mIconProvider.getSystemStateForPackage(mSystemState, packageName)
-                + ",flags_asi:" + FeatureFlags.APP_SEARCH_IMPROVEMENTS.get();
+        return mIconProvider.getSystemStateForPackage(mSystemState, packageName);
     }
 
     /**
-- 
GitLab


From e3d32b543d0af38f136c2f9f620ae3712f75b7ec Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Thu, 3 Jun 2021 21:20:18 -0700
Subject: [PATCH 1327/1664] Icon sizes/ keyline / font for AA+ results

Bug: 188946408
Bug: 189166362

Test: manual, screenshots on the bug
Change-Id: I40c77d8ea3cdcc9dcc33afb1026d1f75c21e9f05
---
 res/layout/all_apps.xml                       |  1 +
 res/layout/all_apps_personal_work_tabs.xml    |  4 ++--
 res/values/attrs.xml                          |  5 +++--
 res/values/dimens.xml                         |  4 ++++
 src/com/android/launcher3/BubbleTextView.java | 12 ++++++++----
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml
index b570464c8c..9ac6ed0f77 100644
--- a/res/layout/all_apps.xml
+++ b/res/layout/all_apps.xml
@@ -36,6 +36,7 @@
         android:layout_below="@id/search_container_all_apps"
         android:clipToPadding="false"
         android:paddingTop="@dimen/all_apps_header_top_padding"
+        android:paddingBottom="@dimen/all_apps_header_bottom_padding"
         android:orientation="vertical" >
 
         <include layout="@layout/floating_header_content" />
diff --git a/res/layout/all_apps_personal_work_tabs.xml b/res/layout/all_apps_personal_work_tabs.xml
index ebb69f67d3..cfaa261034 100644
--- a/res/layout/all_apps_personal_work_tabs.xml
+++ b/res/layout/all_apps_personal_work_tabs.xml
@@ -31,7 +31,7 @@
         android:background="@drawable/personal_work_tabs_ripple"
         android:text="@string/all_apps_personal_tab"
         android:textColor="@color/all_apps_tab_text"
-        android:textSize="16sp" />
+        android:textSize="14sp" />
 
     <Button
         android:id="@+id/tab_work"
@@ -41,5 +41,5 @@
         android:background="@drawable/personal_work_tabs_ripple"
         android:text="@string/all_apps_work_tab"
         android:textColor="@color/all_apps_tab_text"
-        android:textSize="16sp" />
+        android:textSize="14sp" />
 </com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip>
\ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index dc33ab8eac..92deb68f42 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -57,8 +57,9 @@
             <enum name="folder" value="2" />
             <enum name="widget_section" value="3" />
             <enum name="shortcut_popup" value="4" />
-            <enum name="hero_app" value="5" />
-            <enum name="taskbar" value="6" />
+            <enum name="taskbar" value="5" />
+            <enum name="search_result_tall" value="6" />
+            <enum name="search_result_small" value="7" />
         </attr>
         <attr name="centerVertically" format="boolean" />
     </declare-styleable>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d6a6f43803..ce9762d3ff 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -97,6 +97,7 @@
     <dimen name="all_apps_header_tab_height">48dp</dimen>
     <dimen name="all_apps_tabs_indicator_height">2dp</dimen>
     <dimen name="all_apps_header_top_padding">36dp</dimen>
+    <dimen name="all_apps_header_bottom_padding">16dp</dimen>
     <dimen name="all_apps_work_profile_tab_footer_top_padding">16dp</dimen>
     <dimen name="all_apps_work_profile_tab_footer_bottom_padding">20dp</dimen>
     <dimen name="all_apps_tabs_vertical_padding">6dp</dimen>
@@ -310,4 +311,7 @@
     <dimen name="grid_visualization_rounding_radius">22dp</dimen>
     <dimen name="grid_visualization_cell_spacing">6dp</dimen>
 
+<!-- Search results related parameters -->
+    <dimen name="search_row_icon_size">48dp</dimen>
+    <dimen name="search_row_small_icon_size">32dp</dimen>
 </resources>
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 4f0ef12bec..ddbd425b55 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -80,8 +80,9 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
     private static final int DISPLAY_WORKSPACE = 0;
     private static final int DISPLAY_ALL_APPS = 1;
     private static final int DISPLAY_FOLDER = 2;
-    private static final int DISPLAY_HERO_APP = 5;
-    protected static final int DISPLAY_TASKBAR = 6;
+    protected static final int DISPLAY_TASKBAR = 5;
+    private static final int DISPLAY_SEARCH_RESULT = 6;
+    private static final int DISPLAY_SEARCH_RESULT_SMALL = 7;
 
     private static final int[] STATE_PRESSED = new int[]{android.R.attr.state_pressed};
     private static final float HIGHLIGHT_SCALE = 1.16f;
@@ -187,8 +188,11 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
             setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.folderChildTextSizePx);
             setCompoundDrawablePadding(grid.folderChildDrawablePaddingPx);
             defaultIconSize = grid.folderChildIconSizePx;
-        } else if (mDisplay == DISPLAY_HERO_APP) {
-            defaultIconSize = grid.allAppsIconSizePx;
+        } else if (mDisplay == DISPLAY_SEARCH_RESULT) {
+            defaultIconSize = getResources().getDimensionPixelSize(R.dimen.search_row_icon_size);
+        } else if (mDisplay == DISPLAY_SEARCH_RESULT_SMALL) {
+            defaultIconSize = getResources().getDimensionPixelSize(
+                    R.dimen.search_row_small_icon_size);
         } else if (mDisplay == DISPLAY_TASKBAR) {
             defaultIconSize = grid.iconSizePx;
         } else {
-- 
GitLab


From 2ff963b0c7108ea6a505122c1dccad7dbb84ecf3 Mon Sep 17 00:00:00 2001
From: Yogisha Dixit <ydixit@google.com>
Date: Thu, 3 Jun 2021 10:41:44 +0100
Subject: [PATCH 1328/1664] Use a selector instead of loading resource for drop
 target.

Test: manual
Bug: 187355401,187035471
Change-Id: I65fef2c810c791c3282bd4a087359f6cff774cc4
---
 res/drawable/drop_target_background.xml       | 21 +++++++++++++++++++
 res/values/styles.xml                         |  2 +-
 .../android/launcher3/ButtonDropTarget.java   | 10 +++------
 3 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 res/drawable/drop_target_background.xml

diff --git a/res/drawable/drop_target_background.xml b/res/drawable/drop_target_background.xml
new file mode 100644
index 0000000000..7e07bf5824
--- /dev/null
+++ b/res/drawable/drop_target_background.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true"
+        android:drawable="@drawable/drop_target_frame_hover" />
+    <item android:state_selected="false"
+        android:drawable="@drawable/drop_target_frame" />
+</selector>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 92824ad205..0c389aac0e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -271,7 +271,7 @@
         <item name="android:textSize">@dimen/drop_target_text_size</item>
         <item name="android:singleLine">true</item>
         <item name="android:ellipsize">end</item>
-        <item name="android:background">@drawable/drop_target_frame</item>
+        <item name="android:background">@drawable/drop_target_background</item>
     </style>
 
     <style name="DropTargetButton" parent="DropTargetButtonBase" />
diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
index af77bf882a..7db34a5613 100644
--- a/src/com/android/launcher3/ButtonDropTarget.java
+++ b/src/com/android/launcher3/ButtonDropTarget.java
@@ -142,11 +142,6 @@ public abstract class ButtonDropTarget extends TextView
         }
     }
 
-    private void setBackgroundDrawable(int resId) {
-        Drawable bd = AppCompatResources.getDrawable(getContext(), resId);
-        setBackground(bd);
-    }
-
     @Override
     public final void onDragEnter(DragObject d) {
         if (!mAccessibleDrag && !mTextVisible) {
@@ -172,7 +167,7 @@ public abstract class ButtonDropTarget extends TextView
         }
 
         d.dragView.setAlpha(DRAG_VIEW_HOVER_OVER_OPACITY);
-        setBackgroundDrawable(R.drawable.drop_target_frame_hover);
+        setSelected(true);
         if (d.stateAnnouncer != null) {
             d.stateAnnouncer.cancel();
         }
@@ -190,7 +185,7 @@ public abstract class ButtonDropTarget extends TextView
 
         if (!d.dragComplete) {
             d.dragView.setAlpha(1f);
-            setBackgroundDrawable(R.drawable.drop_target_frame);
+            setSelected(false);
         } else {
             d.dragView.setAlpha(DRAG_VIEW_HOVER_OVER_OPACITY);
         }
@@ -230,6 +225,7 @@ public abstract class ButtonDropTarget extends TextView
     public void onDragEnd() {
         mActive = false;
         setOnClickListener(null);
+        setSelected(false);
     }
 
     /**
-- 
GitLab


From d93feeba0a137828d3b40d0c077cec510d85ed84 Mon Sep 17 00:00:00 2001
From: Stevie Kideckel <kideckel@google.com>
Date: Fri, 4 Jun 2021 09:57:41 +0000
Subject: [PATCH 1329/1664] Fix corner radius for expanded widget picker list
 items

Also create the drawables at runtime to avoid all the permutations

Fix: 189329394
Test: verified locally
Change-Id: I0497759ff68bd4ae6b1635423cfd4713f06d349f
---
 res/drawable/widgets_list_bottom_ripple.xml   | 42 -------------
 res/drawable/widgets_list_middle_ripple.xml   | 43 -------------
 .../widgets_list_single_item_ripple.xml       | 42 -------------
 res/drawable/widgets_list_top_ripple.xml      | 43 -------------
 res/layout/widgets_list_row_header.xml        |  1 -
 res/layout/widgets_table_container.xml        |  1 -
 res/values/dimens.xml                         |  1 +
 .../widget/picker/WidgetsListDrawables.java   | 60 +++++++++++++++++++
 .../widget/picker/WidgetsListHeader.java      | 23 +++++++
 .../WidgetsListHeaderViewHolderBinder.java    | 13 ++--
 ...dgetsListSearchHeaderViewHolderBinder.java | 13 ++--
 .../WidgetsListTableViewHolderBinder.java     | 26 +++++---
 12 files changed, 111 insertions(+), 197 deletions(-)
 delete mode 100644 res/drawable/widgets_list_bottom_ripple.xml
 delete mode 100644 res/drawable/widgets_list_middle_ripple.xml
 delete mode 100644 res/drawable/widgets_list_single_item_ripple.xml
 delete mode 100644 res/drawable/widgets_list_top_ripple.xml
 create mode 100644 src/com/android/launcher3/widget/picker/WidgetsListDrawables.java

diff --git a/res/drawable/widgets_list_bottom_ripple.xml b/res/drawable/widgets_list_bottom_ripple.xml
deleted file mode 100644
index c2debb1764..0000000000
--- a/res/drawable/widgets_list_bottom_ripple.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2021, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:attr/colorControlHighlight">
-    <item android:id="@android:id/mask">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/surface" />
-            <corners
-                android:topLeftRadius="@dimen/widget_list_content_corner_radius"
-                android:topRightRadius="@dimen/widget_list_content_corner_radius"
-                android:bottomLeftRadius="@dimen/widget_list_top_bottom_corner_radius"
-                android:bottomRightRadius="@dimen/widget_list_top_bottom_corner_radius" />
-        </shape>
-    </item>
-    <item android:id="@android:id/background">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/surface" />
-            <corners
-                android:topLeftRadius="@dimen/widget_list_content_corner_radius"
-                android:topRightRadius="@dimen/widget_list_content_corner_radius"
-                android:bottomLeftRadius="@dimen/widget_list_top_bottom_corner_radius"
-                android:bottomRightRadius="@dimen/widget_list_top_bottom_corner_radius" />
-        </shape>
-    </item>
-</ripple>
\ No newline at end of file
diff --git a/res/drawable/widgets_list_middle_ripple.xml b/res/drawable/widgets_list_middle_ripple.xml
deleted file mode 100644
index 83f96a08c2..0000000000
--- a/res/drawable/widgets_list_middle_ripple.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2021, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:attr/colorControlHighlight">
-    <item android:id="@android:id/mask">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/surface" />
-            <corners
-                android:topLeftRadius="@dimen/widget_list_content_corner_radius"
-                android:topRightRadius="@dimen/widget_list_content_corner_radius"
-                android:bottomLeftRadius="@dimen/widget_list_content_corner_radius"
-                android:bottomRightRadius="@dimen/widget_list_content_corner_radius" />
-        </shape>
-    </item>
-
-    <item android:id="@android:id/background">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/surface" />
-            <corners
-                android:topLeftRadius="@dimen/widget_list_content_corner_radius"
-                android:topRightRadius="@dimen/widget_list_content_corner_radius"
-                android:bottomLeftRadius="@dimen/widget_list_content_corner_radius"
-                android:bottomRightRadius="@dimen/widget_list_content_corner_radius" />
-        </shape>
-    </item>
-</ripple>
\ No newline at end of file
diff --git a/res/drawable/widgets_list_single_item_ripple.xml b/res/drawable/widgets_list_single_item_ripple.xml
deleted file mode 100644
index a4223a82c9..0000000000
--- a/res/drawable/widgets_list_single_item_ripple.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2021, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:attr/colorControlHighlight">
-    <item android:id="@android:id/mask">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/surface" />
-            <corners
-                android:topLeftRadius="@dimen/widget_list_top_bottom_corner_radius"
-                android:topRightRadius="@dimen/widget_list_top_bottom_corner_radius"
-                android:bottomLeftRadius="@dimen/widget_list_top_bottom_corner_radius"
-                android:bottomRightRadius="@dimen/widget_list_top_bottom_corner_radius" />
-        </shape>
-    </item>
-    <item android:id="@android:id/background">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/surface" />
-            <corners
-                android:topLeftRadius="@dimen/widget_list_top_bottom_corner_radius"
-                android:topRightRadius="@dimen/widget_list_top_bottom_corner_radius"
-                android:bottomLeftRadius="@dimen/widget_list_top_bottom_corner_radius"
-                android:bottomRightRadius="@dimen/widget_list_top_bottom_corner_radius" />
-        </shape>
-    </item>
-</ripple>
\ No newline at end of file
diff --git a/res/drawable/widgets_list_top_ripple.xml b/res/drawable/widgets_list_top_ripple.xml
deleted file mode 100644
index bc0876e40c..0000000000
--- a/res/drawable/widgets_list_top_ripple.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2021, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:attr/colorControlHighlight">
-    <item android:id="@android:id/mask">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/surface" />
-            <corners
-                android:topLeftRadius="@dimen/widget_list_top_bottom_corner_radius"
-                android:topRightRadius="@dimen/widget_list_top_bottom_corner_radius"
-                android:bottomLeftRadius="@dimen/widget_list_content_corner_radius"
-                android:bottomRightRadius="@dimen/widget_list_content_corner_radius" />
-        </shape>
-    </item>
-
-    <item android:id="@android:id/background">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/surface" />
-            <corners
-                android:topLeftRadius="@dimen/widget_list_top_bottom_corner_radius"
-                android:topRightRadius="@dimen/widget_list_top_bottom_corner_radius"
-                android:bottomLeftRadius="@dimen/widget_list_content_corner_radius"
-                android:bottomRightRadius="@dimen/widget_list_content_corner_radius" />
-        </shape>
-    </item>
-</ripple>
\ No newline at end of file
diff --git a/res/layout/widgets_list_row_header.xml b/res/layout/widgets_list_row_header.xml
index 8ab086c941..0bfa2b2a5e 100644
--- a/res/layout/widgets_list_row_header.xml
+++ b/res/layout/widgets_list_row_header.xml
@@ -20,7 +20,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="16dp"
-    android:background="@drawable/widgets_list_middle_ripple"
     android:layout_marginBottom="@dimen/widget_list_entry_bottom_margin"
     android:paddingVertical="@dimen/widget_list_header_view_vertical_padding"
     android:orientation="horizontal"
diff --git a/res/layout/widgets_table_container.xml b/res/layout/widgets_table_container.xml
index e63483ddd8..c6b70aa4aa 100644
--- a/res/layout/widgets_table_container.xml
+++ b/res/layout/widgets_table_container.xml
@@ -19,5 +19,4 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="16dp"
-    android:background="@drawable/widgets_list_middle_ripple"
     android:layout_marginBottom="@dimen/widget_list_entry_bottom_margin"/>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d6a6f43803..f9d62a69de 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -131,6 +131,7 @@
 
     <dimen name="widget_list_top_bottom_corner_radius">28dp</dimen>
     <dimen name="widget_list_content_corner_radius">4dp</dimen>
+    <dimen name="widget_list_content_joined_corner_radius">0dp</dimen>
 
     <dimen name="widget_list_header_view_vertical_padding">20dp</dimen>
     <dimen name="widget_list_entry_bottom_margin">2dp</dimen>
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListDrawables.java b/src/com/android/launcher3/widget/picker/WidgetsListDrawables.java
new file mode 100644
index 0000000000..b3bb544cd7
--- /dev/null
+++ b/src/com/android/launcher3/widget/picker/WidgetsListDrawables.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget.picker;
+
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.GradientDrawable;
+import android.graphics.drawable.RippleDrawable;
+
+import com.android.launcher3.R;
+import com.android.launcher3.util.Themes;
+
+/** Helper class for creating drawables to use as background for list elements. */
+final class WidgetsListDrawables {
+
+    private WidgetsListDrawables() {}
+
+    /** Creates a list background drawable with the specified radii. */
+    static Drawable createListBackgroundDrawable(
+            Context context,
+            float topRadius,
+            float bottomRadius) {
+        GradientDrawable backgroundMask = new GradientDrawable();
+        backgroundMask.setColor(context.getColorStateList(R.color.surface));
+        backgroundMask.setShape(GradientDrawable.RECTANGLE);
+
+        backgroundMask.setCornerRadii(
+                new float[]{
+                        topRadius,
+                        topRadius,
+                        topRadius,
+                        topRadius,
+                        bottomRadius,
+                        bottomRadius,
+                        bottomRadius,
+                        bottomRadius
+                });
+
+        return new RippleDrawable(
+                /* color= */ ColorStateList.valueOf(
+                        Themes.getAttrColor(context, android.R.attr.colorControlHighlight)),
+                /* content= */ backgroundMask,
+                /* mask= */ backgroundMask);
+    }
+
+}
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListHeader.java b/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
index 41aa4378f0..fece359607 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
@@ -60,6 +60,9 @@ public final class WidgetsListHeader extends LinearLayout implements ItemInfoUpd
     @Nullable private Drawable mIconDrawable;
     private final int mIconSize;
     private final int mBottomMarginSize;
+    private final float mTopBottomCornerRadius;
+    private final float mMiddleCornerRadius;
+    private final float mJoinedCornerRadius;
 
     private ImageView mAppIcon;
     private TextView mTitle;
@@ -87,6 +90,12 @@ public final class WidgetsListHeader extends LinearLayout implements ItemInfoUpd
                 grid.iconSizePx);
         mBottomMarginSize =
                 getResources().getDimensionPixelSize(R.dimen.widget_list_entry_bottom_margin);
+        mTopBottomCornerRadius =
+                getResources().getDimension(R.dimen.widget_list_top_bottom_corner_radius);
+        mMiddleCornerRadius =
+                getResources().getDimension(R.dimen.widget_list_content_corner_radius);
+        mJoinedCornerRadius =
+                getResources().getDimension(R.dimen.widget_list_content_joined_corner_radius);
     }
 
     @Override
@@ -254,6 +263,20 @@ public final class WidgetsListHeader extends LinearLayout implements ItemInfoUpd
         verifyHighRes();
     }
 
+    /** Updates the list to have a background drawable with the appropriate corner radii. */
+    @UiThread
+    public void updateListBackground(boolean isFirst, boolean isLast, boolean isExpanded) {
+        float topRadius = isFirst ? mTopBottomCornerRadius : mMiddleCornerRadius;
+        float bottomRadius = isLast
+                ? mTopBottomCornerRadius
+                : isExpanded
+                        ? mJoinedCornerRadius
+                        : mMiddleCornerRadius;
+        setBackground(
+                WidgetsListDrawables.createListBackgroundDrawable(
+                        getContext(), topRadius, bottomRadius));
+    }
+
     private void setTitles(WidgetsListSearchHeaderEntry entry) {
         mTitle.setText(entry.mPkgItem.title);
 
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinder.java b/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinder.java
index e57f4d8811..22d6d227c4 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinder.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinder.java
@@ -52,15 +52,10 @@ public final class WidgetsListHeaderViewHolderBinder implements
     public void bindViewHolder(WidgetsListHeaderHolder viewHolder, WidgetsListHeaderEntry data,
             int position) {
         WidgetsListHeader widgetsListHeader = viewHolder.mWidgetsListHeader;
-        if (mWidgetsListAdapter.getItemCount() == 1) {
-            widgetsListHeader.setBackgroundResource(R.drawable.widgets_list_single_item_ripple);
-        } else if (position == 0) {
-            widgetsListHeader.setBackgroundResource(R.drawable.widgets_list_top_ripple);
-        } else if (position == mWidgetsListAdapter.getItemCount() - 1) {
-            widgetsListHeader.setBackgroundResource(R.drawable.widgets_list_bottom_ripple);
-        } else {
-            widgetsListHeader.setBackgroundResource(R.drawable.widgets_list_middle_ripple);
-        }
+        widgetsListHeader.updateListBackground(
+                /* isFirst= */ position == 0,
+                /* isLast= */ position == mWidgetsListAdapter.getItemCount() - 1,
+                /* isExpanded= */ data.isWidgetListShown());
         widgetsListHeader.applyFromItemInfoWithIcon(data);
         widgetsListHeader.setExpanded(data.isWidgetListShown());
         widgetsListHeader.setOnExpandChangeListener(isExpanded ->
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinder.java b/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinder.java
index b98f5e18eb..d5e03a4fe0 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinder.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinder.java
@@ -53,15 +53,10 @@ public final class WidgetsListSearchHeaderViewHolderBinder implements
     public void bindViewHolder(WidgetsListSearchHeaderHolder viewHolder,
             WidgetsListSearchHeaderEntry data, int position) {
         WidgetsListHeader widgetsListHeader = viewHolder.mWidgetsListHeader;
-        if (mWidgetsListAdapter.getItemCount() == 1) {
-            widgetsListHeader.setBackgroundResource(R.drawable.widgets_list_single_item_ripple);
-        } else if (position == 0) {
-            widgetsListHeader.setBackgroundResource(R.drawable.widgets_list_top_ripple);
-        } else if (position == mWidgetsListAdapter.getItemCount() - 1) {
-            widgetsListHeader.setBackgroundResource(R.drawable.widgets_list_bottom_ripple);
-        } else {
-            widgetsListHeader.setBackgroundResource(R.drawable.widgets_list_middle_ripple);
-        }
+        widgetsListHeader.updateListBackground(
+                /* isFirst= */ position == 0,
+                /* isLast= */ position == mWidgetsListAdapter.getItemCount() - 1,
+                /* isExpanded= */ data.isWidgetListShown());
         widgetsListHeader.applyFromItemInfoWithIcon(data);
         widgetsListHeader.setExpanded(data.isWidgetListShown());
         widgetsListHeader.setOnExpandChangeListener(isExpanded ->
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java b/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
index c3eda13c3f..8e310c5d83 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
@@ -16,6 +16,7 @@
 package com.android.launcher3.widget.picker;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -51,6 +52,9 @@ public final class WidgetsListTableViewHolderBinder
     private final OnLongClickListener mIconLongClickListener;
     private final WidgetPreviewLoader mWidgetPreviewLoader;
     private final WidgetsListAdapter mWidgetsListAdapter;
+    private final float mTopBottomCornerRadius;
+    private final float mMiddleCornerRadius;
+    private final float mJoinedCornerRadius;
     private boolean mApplyBitmapDeferred = false;
 
     public WidgetsListTableViewHolderBinder(
@@ -65,6 +69,13 @@ public final class WidgetsListTableViewHolderBinder
         mIconLongClickListener = iconLongClickListener;
         mWidgetPreviewLoader = widgetPreviewLoader;
         mWidgetsListAdapter = listAdapter;
+        Resources resources = context.getResources();
+        mTopBottomCornerRadius =
+                resources.getDimension(R.dimen.widget_list_top_bottom_corner_radius);
+        mMiddleCornerRadius =
+                resources.getDimension(R.dimen.widget_list_content_corner_radius);
+        mJoinedCornerRadius =
+                resources.getDimension(R.dimen.widget_list_content_joined_corner_radius);
     }
 
     /**
@@ -100,13 +111,14 @@ public final class WidgetsListTableViewHolderBinder
                     entry.mWidgets.size(), table.getChildCount()));
         }
 
-        if (position == mWidgetsListAdapter.getItemCount() - 1) {
-            table.setBackgroundResource(R.drawable.widgets_list_bottom_ripple);
-        } else {
-            // WidgetsListContentEntry is never shown in position 0. There must be a header above
-            // it.
-            table.setBackgroundResource(R.drawable.widgets_list_middle_ripple);
-        }
+        // The content is always joined to an expanded header above.
+        float topRadius = mJoinedCornerRadius;
+        float bottomRadius = position == mWidgetsListAdapter.getItemCount() - 1
+                ? mTopBottomCornerRadius
+                : mMiddleCornerRadius;
+        table.setBackgroundDrawable(
+                WidgetsListDrawables.createListBackgroundDrawable(
+                        holder.itemView.getContext(), topRadius, bottomRadius));
 
         List<ArrayList<WidgetItem>> widgetItemsTable =
                 WidgetsTableUtils.groupWidgetItemsIntoTable(entry.mWidgets, mMaxSpansPerRow);
-- 
GitLab


From 4ff5ee3a8f2a402c98e48db9a45816c4d9c1fe8c Mon Sep 17 00:00:00 2001
From: Yogisha Dixit <ydixit@google.com>
Date: Tue, 4 May 2021 14:58:34 +0100
Subject: [PATCH 1330/1664] Add new log events for widgets.

Design doc: go/widgets-logging

Bug: 185778648
Test: manual
Change-Id: Ia3c6edb87766a33e77865e9461e7101a1df864c1
---
 .../QuickstepInteractionHandler.java          | 18 +++++++++++
 .../launcher3/AppWidgetResizeFrame.java       | 32 +++++++++++++++++--
 src/com/android/launcher3/Launcher.java       |  2 ++
 .../launcher3/SecondaryDropTarget.java        |  3 ++
 .../launcher3/logging/StatsLogManager.java    | 17 +++++++++-
 .../widget/picker/WidgetsFullSheet.java       |  2 ++
 .../widget/picker/WidgetsListAdapter.java     |  6 ++++
 7 files changed, 77 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
index 1304033d08..d15113184d 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
@@ -15,6 +15,8 @@
  */
 package com.android.launcher3.uioverrides;
 
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_APP_LAUNCH_TAP;
+
 import android.app.ActivityOptions;
 import android.app.ActivityTaskManager;
 import android.app.PendingIntent;
@@ -26,6 +28,7 @@ import android.view.View;
 import android.widget.RemoteViews;
 
 import com.android.launcher3.Utilities;
+import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.util.ActivityOptionsWrapper;
 import com.android.launcher3.widget.LauncherAppWidgetHostView;
@@ -72,9 +75,24 @@ class QuickstepInteractionHandler implements RemoteViews.InteractionHandler {
             mLauncher.addLaunchCookie((ItemInfo) itemInfo, activityOptions.options);
         }
         options = Pair.create(options.first, activityOptions.options);
+        if (pendingIntent.isActivity()) {
+            logAppLaunch(itemInfo);
+        }
         return RemoteViews.startPendingIntent(hostView, pendingIntent, options);
     }
 
+    /**
+     * Logs that the app was launched from the widget.
+     * @param itemInfo the widget info.
+     */
+    private void logAppLaunch(Object itemInfo) {
+        StatsLogManager.StatsLogger logger = mLauncher.getStatsLogManager().logger();
+        if (itemInfo instanceof ItemInfo) {
+            logger.withItemInfo((ItemInfo) itemInfo);
+        }
+        logger.log(LAUNCHER_APP_LAUNCH_TAP);
+    }
+
     private LauncherAppWidgetHostView findHostViewAncestor(View v) {
         while (v != null) {
             if (v instanceof LauncherAppWidgetHostView) return (LauncherAppWidgetHostView) v;
diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java
index c1f3ac5e0d..5d9797ff88 100644
--- a/src/com/android/launcher3/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher3/AppWidgetResizeFrame.java
@@ -5,6 +5,8 @@ import static android.appwidget.AppWidgetHostView.getDefaultPaddingForWidget;
 import static com.android.launcher3.LauncherAnimUtils.LAYOUT_HEIGHT;
 import static com.android.launcher3.LauncherAnimUtils.LAYOUT_WIDTH;
 import static com.android.launcher3.Utilities.ATLEAST_S;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WIDGET_RESIZE_COMPLETED;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WIDGET_RESIZE_STARTED;
 import static com.android.launcher3.views.BaseDragLayer.LAYOUT_X;
 import static com.android.launcher3.views.BaseDragLayer.LAYOUT_Y;
 
@@ -31,6 +33,10 @@ import android.widget.ImageView;
 
 import com.android.launcher3.accessibility.DragViewStateAnnouncer;
 import com.android.launcher3.dragndrop.DragLayer;
+import com.android.launcher3.logging.InstanceId;
+import com.android.launcher3.logging.InstanceIdSequence;
+import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.util.PendingRequestArgs;
 import com.android.launcher3.widget.LauncherAppWidgetHostView;
 import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 
@@ -96,6 +102,8 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
     private final IntRange mDeltaYRange = new IntRange();
     private final IntRange mBaselineY = new IntRange();
 
+    private final InstanceId logInstanceId = new InstanceIdSequence().newInstanceId();
+
     private boolean mLeftBorderActive;
     private boolean mRightBorderActive;
     private boolean mTopBorderActive;
@@ -222,12 +230,21 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
         mReconfigureButton = (ImageButton) findViewById(R.id.widget_reconfigure_button);
         if (info.isReconfigurable()) {
             mReconfigureButton.setVisibility(VISIBLE);
-            mReconfigureButton.setOnClickListener(view -> mLauncher
+            mReconfigureButton.setOnClickListener(view -> {
+                mLauncher.setWaitingForResult(
+                        PendingRequestArgs.forWidgetInfo(
+                                mWidgetView.getAppWidgetId(),
+                                // Widget add handler is null since we're reconfiguring an existing
+                                // widget.
+                                /* widgetHandler= */ null,
+                                (ItemInfo) mWidgetView.getTag()));
+                mLauncher
                     .getAppWidgetHost()
                     .startConfigActivity(
                             mLauncher,
                             mWidgetView.getAppWidgetId(),
-                            Launcher.REQUEST_RECONFIGURE_APPWIDGET));
+                            Launcher.REQUEST_RECONFIGURE_APPWIDGET);
+            });
         }
 
         // When we create the resize frame, we first mark all cells as unoccupied. The appropriate
@@ -235,6 +252,12 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
         // frame is dismissed.
         mCellLayout.markCellsAsUnoccupiedForView(mWidgetView);
 
+        mLauncher.getStatsLogManager()
+                .logger()
+                .withInstanceId(logInstanceId)
+                .withItemInfo((ItemInfo) mWidgetView.getTag())
+                .log(LAUNCHER_WIDGET_RESIZE_STARTED);
+
         setOnKeyListener(this);
     }
 
@@ -482,6 +505,11 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
 
         // We are done with resizing the widget. Save the widget size & position to LauncherModel
         resizeWidgetIfNeeded(true);
+        mLauncher.getStatsLogManager()
+                .logger()
+                .withInstanceId(logInstanceId)
+                .withItemInfo((ItemInfo) mWidgetView.getTag())
+                .log(LAUNCHER_WIDGET_RESIZE_COMPLETED);
     }
 
     private void onTouchUp() {
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 299c68fdb5..9aa7168f4e 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -45,6 +45,7 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_EXIT;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ONRESUME;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ONSTOP;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WIDGET_RECONFIGURED;
 import static com.android.launcher3.model.ItemInstallQueue.FLAG_ACTIVITY_PAUSED;
 import static com.android.launcher3.model.ItemInstallQueue.FLAG_DRAG_AND_DROP;
 import static com.android.launcher3.model.ItemInstallQueue.FLAG_LOADER_RUNNING;
@@ -683,6 +684,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
                 completeAddAppWidget(appWidgetId, info, null, null);
                 break;
             case REQUEST_RECONFIGURE_APPWIDGET:
+                mStatsLogManager.logger().withItemInfo(info).log(LAUNCHER_WIDGET_RECONFIGURED);
                 completeRestoreAppWidget(appWidgetId, LauncherAppWidgetInfo.RESTORE_COMPLETED);
                 break;
             case REQUEST_BIND_PENDING_APPWIDGET: {
diff --git a/src/com/android/launcher3/SecondaryDropTarget.java b/src/com/android/launcher3/SecondaryDropTarget.java
index 6ccfa7e3b5..cd06414d3f 100644
--- a/src/com/android/launcher3/SecondaryDropTarget.java
+++ b/src/com/android/launcher3/SecondaryDropTarget.java
@@ -45,6 +45,7 @@ import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.util.PackageManagerHelper;
+import com.android.launcher3.util.PendingRequestArgs;
 import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 
 import java.net.URISyntaxException;
@@ -267,6 +268,8 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList
         if (mCurrentAccessibilityAction == RECONFIGURE) {
             int widgetId = getReconfigurableWidgetId(view);
             if (widgetId != INVALID_APPWIDGET_ID) {
+                mLauncher.setWaitingForResult(
+                        PendingRequestArgs.forWidgetInfo(widgetId, null, info));
                 mLauncher.getAppWidgetHost().startConfigActivity(mLauncher, widgetId,
                         REQUEST_RECONFIGURE_APPWIDGET);
             }
diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index d065469156..418e46de71 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -135,6 +135,12 @@ public class StatsLogManager implements ResourceBasedOverride {
         @UiEvent(doc = "User tapped or long pressed on widget tray icon inside launcher settings.")
         LAUNCHER_WIDGETSTRAY_BUTTON_TAP_OR_LONGPRESS(464),
 
+        @UiEvent(doc = "User expanded the list of widgets for a single app in the widget picker.")
+        LAUNCHER_WIDGETSTRAY_APP_EXPANDED(818),
+
+        @UiEvent(doc = "User searched for a widget in the widget picker.")
+        LAUNCHER_WIDGETSTRAY_SEARCHED(819),
+
         @UiEvent(doc = "A dragged item is dropped on 'Remove' button in the target bar")
         LAUNCHER_ITEM_DROPPED_ON_REMOVE(465),
 
@@ -458,7 +464,16 @@ public class StatsLogManager implements ResourceBasedOverride {
         LAUNCHER_OVERVIEW_SHARING_TAP_MORE_TO_SHARE_URL(777),
 
         @UiEvent(doc = "User taps the More button to share an image")
-        LAUNCHER_OVERVIEW_SHARING_TAP_MORE_TO_SHARE_IMAGE(778)
+        LAUNCHER_OVERVIEW_SHARING_TAP_MORE_TO_SHARE_IMAGE(778),
+
+        @UiEvent(doc = "User started resizing a widget on their home screen.")
+        LAUNCHER_WIDGET_RESIZE_STARTED(820),
+
+        @UiEvent(doc = "User finished resizing a widget on their home screen.")
+        LAUNCHER_WIDGET_RESIZE_COMPLETED(824),
+
+        @UiEvent(doc = "User reconfigured a widget on their home screen.")
+        LAUNCHER_WIDGET_RECONFIGURED(821)
         ;
 
         // ADD MORE
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 92f84da311..1a58bb066d 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -16,6 +16,7 @@
 package com.android.launcher3.widget.picker;
 
 import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WIDGETSTRAY_SEARCHED;
 import static com.android.launcher3.testing.TestProtocol.NORMAL_STATE_ORDINAL;
 
 import android.animation.Animator;
@@ -448,6 +449,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         if (mIsInSearchMode) return;
         setViewVisibilityBasedOnSearch(/*isInSearchMode= */ true);
         attachScrollbarToRecyclerView(mAdapters.get(AdapterHolder.SEARCH).mWidgetsRecyclerView);
+        mActivityContext.getStatsLogManager().logger().log(LAUNCHER_WIDGETSTRAY_SEARCHED);
     }
 
     @Override
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
index 5010629639..826c244a92 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
@@ -15,6 +15,8 @@
  */
 package com.android.launcher3.widget.picker;
 
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WIDGETSTRAY_APP_EXPANDED;
+
 import android.content.Context;
 import android.os.Process;
 import android.util.Log;
@@ -33,6 +35,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.Adapter;
 import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 
+import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.WidgetPreviewLoader;
 import com.android.launcher3.icons.IconCache;
@@ -76,6 +79,7 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
     private static final int VIEW_TYPE_WIDGETS_HEADER = R.id.view_type_widgets_header;
     private static final int VIEW_TYPE_WIDGETS_SEARCH_HEADER = R.id.view_type_widgets_search_header;
 
+    private final Launcher mLauncher;
     private final WidgetsDiffReporter mDiffReporter;
     private final SparseArray<ViewHolderBinder> mViewHolderBinders = new SparseArray<>();
     private final WidgetsListTableViewHolderBinder mWidgetsListTableViewHolderBinder;
@@ -97,6 +101,7 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
     public WidgetsListAdapter(Context context, LayoutInflater layoutInflater,
             WidgetPreviewLoader widgetPreviewLoader, IconCache iconCache,
             OnClickListener iconClickListener, OnLongClickListener iconLongClickListener) {
+        mLauncher = Launcher.getLauncher(context);
         mDiffReporter = new WidgetsDiffReporter(iconCache, this);
         mWidgetsListTableViewHolderBinder = new WidgetsListTableViewHolderBinder(context,
                 layoutInflater, iconClickListener, iconLongClickListener,
@@ -271,6 +276,7 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
             // Scroll the layout manager to the header position to keep it anchored to the same
             // position.
             scrollToPositionAndMaintainOffset(getSelectedHeaderPosition());
+            mLauncher.getStatsLogManager().logger().log(LAUNCHER_WIDGETSTRAY_APP_EXPANDED);
         } else if (packageUserKey.equals(mWidgetsContentVisiblePackageUserKey)) {
             OptionalInt previouslySelectedPosition = getSelectedHeaderPosition();
 
-- 
GitLab


From 4a0e1b40f36286325ca71c74bce6bc43067b1d8a Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Fri, 4 Jun 2021 12:55:37 +0100
Subject: [PATCH 1331/1664] Include widget padding & boarder spacing in widget
 preview size estimation

Test: Sideload Google dev clock and verify the 5x5 widget preview is
      rendered correctly.
      Verify conversation widget preview is rendered correctly in the
      full widgets picker and priority flow (aka pin widget flow).
Bug: 189975670
Change-Id: I4b0212ae347044c970ba40b9b33439448a6aa941
---
 .../android/launcher3/widget/WidgetCell.java  | 45 ++++++++++++-------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index 7d04d7b404..e1999c9c3a 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -21,6 +21,7 @@ import static com.android.launcher3.Utilities.ATLEAST_S;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
+import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.CancellationSignal;
@@ -213,12 +214,8 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
                     return false;
                 }
             };
-            mAppWidgetHostViewPreview.setAppWidget(/* appWidgetId= */ -1, item.widgetInfo);
-            Rect padding = new Rect();
-            mAppWidgetHostViewPreview.getWidgetInset(mActivity.getDeviceProfile(), padding);
-            mAppWidgetHostViewPreview.setPadding(padding.left, padding.top, padding.right,
-                    padding.bottom);
-            mAppWidgetHostViewPreview.updateAppWidget(/* remoteViews= */ mRemoteViewsPreview);
+            setAppWidgetHostViewPreview(mAppWidgetHostViewPreview, item.widgetInfo,
+                    mRemoteViewsPreview);
             return;
         }
 
@@ -234,16 +231,31 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
             // rendering a preview layout for work profile apps yet. For non-work profile layout, a
             // proper solution is to use RemoteViews(PackageName, LayoutId).
             launcherAppWidgetProviderInfo.initialLayout = item.widgetInfo.previewLayout;
-            mAppWidgetHostViewPreview.setAppWidget(/* appWidgetId= */ -1,
-                    launcherAppWidgetProviderInfo);
-            Rect padding = new Rect();
-            mAppWidgetHostViewPreview.getWidgetInset(mActivity.getDeviceProfile(), padding);
-            mAppWidgetHostViewPreview.setPadding(padding.left, padding.top, padding.right,
-                    padding.bottom);
-            mAppWidgetHostViewPreview.updateAppWidget(/* remoteViews= */ null);
+            setAppWidgetHostViewPreview(mAppWidgetHostViewPreview,
+                    launcherAppWidgetProviderInfo, /* remoteViews= */ null);
         }
     }
 
+    private void setAppWidgetHostViewPreview(
+            NavigableAppWidgetHostView appWidgetHostViewPreview,
+            LauncherAppWidgetProviderInfo providerInfo,
+            @Nullable RemoteViews remoteViews) {
+        appWidgetHostViewPreview.setAppWidget(/* appWidgetId= */ -1, providerInfo);
+        Rect padding;
+        DeviceProfile deviceProfile = mActivity.getDeviceProfile();
+        if (deviceProfile.shouldInsetWidgets()) {
+            padding = new Rect();
+            appWidgetHostViewPreview.getWidgetInset(deviceProfile, padding);
+        } else {
+            padding = deviceProfile.inv.defaultWidgetPadding;
+        }
+        appWidgetHostViewPreview.setPadding(padding.left, padding.top, padding.right,
+                padding.bottom);
+        mPreviewWidth += padding.left + padding.right;
+        mPreviewHeight += padding.top + padding.bottom;
+        appWidgetHostViewPreview.updateAppWidget(remoteViews);
+    }
+
     public WidgetImageView getWidgetView() {
         return mWidgetImage;
     }
@@ -343,8 +355,11 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     /** Sets the widget preview image size, in number of cells, and preview scale. */
     public void setPreviewSize(int spanX, int spanY, float previewScale) {
         DeviceProfile deviceProfile = mActivity.getDeviceProfile();
-        mPreviewWidth = deviceProfile.cellWidthPx * spanX + mPreviewPadding;
-        mPreviewHeight = deviceProfile.cellHeightPx * spanY + mPreviewPadding;
+        Point cellSize = deviceProfile.getCellSize();
+        mPreviewWidth = cellSize.x * spanX + mPreviewPadding
+                + deviceProfile.cellLayoutBorderSpacingPx * (spanX - 1);
+        mPreviewHeight = cellSize.y * spanY + mPreviewPadding
+                + deviceProfile.cellLayoutBorderSpacingPx * (spanY - 1);
         mPreviewScale = previewScale;
     }
 
-- 
GitLab


From 9f5a7f8366b01fc8732f25ccb42c509d7c0bca31 Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Wed, 2 Jun 2021 19:37:22 +0100
Subject: [PATCH 1332/1664] Adjust Widgets education dialog size when in
 landscape

Test: Tested manually
Bug: 185354491
Change-Id: Ifd86f48d705b054ae6a2315a11e5398423020755
---
 .../launcher3/views/WidgetsEduView.java       | 48 ++++++++++++++-----
 1 file changed, 36 insertions(+), 12 deletions(-)

diff --git a/src/com/android/launcher3/views/WidgetsEduView.java b/src/com/android/launcher3/views/WidgetsEduView.java
index c6fa98a456..c2947c7310 100644
--- a/src/com/android/launcher3/views/WidgetsEduView.java
+++ b/src/com/android/launcher3/views/WidgetsEduView.java
@@ -22,8 +22,8 @@ import android.content.Context;
 import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
-import android.view.View;
 
+import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Insettable;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
@@ -36,8 +36,6 @@ public class WidgetsEduView extends AbstractSlideInView<Launcher> implements Ins
     private static final int DEFAULT_CLOSE_DURATION = 200;
 
     private Rect mInsets = new Rect();
-    private View mEduView;
-
 
     public WidgetsEduView(Context context, AttributeSet attr) {
         this(context, attr, 0);
@@ -46,7 +44,6 @@ public class WidgetsEduView extends AbstractSlideInView<Launcher> implements Ins
     public WidgetsEduView(Context context, AttributeSet attrs,
             int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        mContent = this;
     }
 
     @Override
@@ -62,20 +59,16 @@ public class WidgetsEduView extends AbstractSlideInView<Launcher> implements Ins
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
-        mEduView = findViewById(R.id.edu_view);
+        mContent = findViewById(R.id.edu_view);
         findViewById(R.id.edu_close_button)
                 .setOnClickListener(v -> close(/* animate= */ true));
     }
 
     @Override
     public void setInsets(Rect insets) {
-        int leftInset = insets.left - mInsets.left;
-        int rightInset = insets.right - mInsets.right;
-        int bottomInset = insets.bottom - mInsets.bottom;
         mInsets.set(insets);
-        setPadding(leftInset, getPaddingTop(), rightInset, 0);
-        mEduView.setPaddingRelative(mEduView.getPaddingStart(),
-                mEduView.getPaddingTop(), mEduView.getPaddingEnd(), bottomInset);
+        mContent.setPadding(mContent.getPaddingStart(),
+                mContent.getPaddingTop(), mContent.getPaddingEnd(), insets.bottom);
     }
 
     private void show() {
@@ -90,10 +83,41 @@ public class WidgetsEduView extends AbstractSlideInView<Launcher> implements Ins
 
     @Override
     protected void onLayout(boolean changed, int l, int t, int r, int b) {
-        super.onLayout(changed, l, t, r, b);
+        int width = r - l;
+        int height = b - t;
+
+        // Lay out the content as center bottom aligned.
+        int contentWidth = mContent.getMeasuredWidth();
+        int contentLeft = (width - contentWidth - mInsets.left - mInsets.right) / 2 + mInsets.left;
+        mContent.layout(contentLeft, height - mContent.getMeasuredHeight(),
+                contentLeft + contentWidth, height);
+
         setTranslationShift(mTranslationShift);
     }
 
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        DeviceProfile deviceProfile = mActivityContext.getDeviceProfile();
+        int widthUsed;
+        if (mInsets.bottom > 0) {
+            // Extra space between this view and mContent horizontally when the sheet is shown in
+            // portrait mode.
+            widthUsed = mInsets.left + mInsets.right;
+        } else {
+            // Extra space between this view and mContent horizontally when the sheet is shown in
+            // landscape mode.
+            Rect padding = deviceProfile.workspacePadding;
+            widthUsed = Math.max(padding.left + padding.right,
+                    2 * (mInsets.left + mInsets.right));
+        }
+
+        int heightUsed = mInsets.top + deviceProfile.edgeMarginPx;
+        measureChildWithMargins(mContent, widthMeasureSpec,
+                widthUsed, heightMeasureSpec, heightUsed);
+        setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec),
+                MeasureSpec.getSize(heightMeasureSpec));
+    }
+
     private void animateOpen() {
         if (mIsOpen || mOpenCloseAnimator.isRunning()) {
             return;
-- 
GitLab


From 258e4526b74daede125d18994d601675f98e776c Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Fri, 4 Jun 2021 09:25:37 -0700
Subject: [PATCH 1333/1664] Remove blur from launcher when in overview

The App window will be under Launcher, so we can't actually blur
launcher at that time, otherwise the live window will also be blurred.

Test: manual
Bug: 189207458
Change-Id: Ie07449d29d3b0dc60d3787b6d32aa9e46e0bb613
---
 .../statehandlers/DepthController.java        | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
index 46ef6982ff..5b4e5f24d5 100644
--- a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
+++ b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
@@ -161,7 +161,7 @@ public class DepthController implements StateHandler<LauncherState>,
         if (mSurface != surface) {
             mSurface = surface;
             if (surface != null) {
-                setDepth(mDepth);
+                dispatchTransactionSurface(mDepth);
             }
         }
     }
@@ -175,6 +175,8 @@ public class DepthController implements StateHandler<LauncherState>,
         float toDepth = toState.getDepth(mLauncher);
         if (Float.compare(mDepth, toDepth) != 0) {
             setDepth(toDepth);
+        } else if (toState == LauncherState.OVERVIEW) {
+            dispatchTransactionSurface(mDepth);
         }
     }
 
@@ -200,26 +202,35 @@ public class DepthController implements StateHandler<LauncherState>,
         if (Float.compare(mDepth, depthF) == 0) {
             return;
         }
+        if (dispatchTransactionSurface(depthF)) {
+            mDepth = depthF;
+        }
+    }
 
+    private boolean dispatchTransactionSurface(float depth) {
         boolean supportsBlur = BlurUtils.supportsBlursOnWindows();
         if (supportsBlur && (mSurface == null || !mSurface.isValid())) {
-            return;
+            return false;
         }
-        mDepth = depthF;
         ensureDependencies();
         IBinder windowToken = mLauncher.getRootView().getWindowToken();
         if (windowToken != null) {
-            mWallpaperManager.setWallpaperZoomOut(windowToken, mDepth);
+            mWallpaperManager.setWallpaperZoomOut(windowToken, depth);
         }
 
         if (supportsBlur) {
-            boolean isOpaque = mLauncher.getScrimView().isFullyOpaque();
-            int blur = isOpaque ? 0 : (int) (mDepth * mMaxBlurRadius);
+            // We cannot mark the window as opaque in overview because there will be an app window
+            // below the launcher layer, and we need to draw it -- without blurs.
+            boolean isOverview = mLauncher.isInState(LauncherState.OVERVIEW);
+            boolean opaque = mLauncher.getScrimView().isFullyOpaque() && !isOverview;
+
+            int blur = opaque || isOverview ? 0 : (int) (depth * mMaxBlurRadius);
             new SurfaceControl.Transaction()
                     .setBackgroundBlurRadius(mSurface, blur)
-                    .setOpaque(mSurface, isOpaque)
+                    .setOpaque(mSurface, opaque)
                     .apply();
         }
+        return true;
     }
 
     @Override
-- 
GitLab


From 4f3c749ffc1b91abd7fe43786ff6b9673ea8192d Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 3 Jun 2021 13:19:50 -0700
Subject: [PATCH 1334/1664] Workaround for apps to stop before removing the
 task

- With live tile enabled, the race between destroying the task and
  killing the process is more evident since the app may not get
  stopped at all.  For now, when dismissing, defer removing the
  task until we've finished the recents animation to allow the
  app to be stopped accordingly

Bug: 184899234
Test: Dismiss the task from overview, check that the app gets
      lifecycle events
Change-Id: Ib3ea479643d65859fe4cd580b4c347b87130a69d
Merged-In: Ib3ea479643d65859fe4cd580b4c347b87130a69d
---
 .../android/quickstep/RecentsActivity.java    |  3 +-
 .../android/quickstep/views/RecentsView.java  | 31 +++++++++++++------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index 0e9e3ad029..d43bb24a1e 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -350,8 +350,7 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
     public void startHome() {
         if (LIVE_TILE.get()) {
             RecentsView recentsView = getOverviewPanel();
-            recentsView.switchToScreenshot(() -> recentsView.finishRecentsAnimation(true,
-                    this::startHomeInternal));
+            recentsView.switchToScreenshotAndFinishAnimationToRecents(this::startHomeInternal);
         } else {
             startHomeInternal();
         }
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index a4c60cf239..74906ddac0 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -177,6 +177,10 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         TaskThumbnailCache.HighResLoadingState.HighResLoadingStateChangedCallback,
         TaskVisualsChangeListener, SplitScreenBounds.OnChangeListener {
 
+    // TODO(b/184899234): We use this timeout to wait a fixed period after switching to the
+    // screenshot when dismissing the current live task to ensure the app can try and get stopped.
+    private static final int REMOVE_TASK_WAIT_FOR_APP_STOP_MS = 100;
+
     public static final FloatProperty<RecentsView> CONTENT_ALPHA =
             new FloatProperty<RecentsView>("contentAlpha") {
                 @Override
@@ -2355,8 +2359,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 if (success) {
                     if (shouldRemoveTask) {
                         if (taskView.getTask() != null) {
-                            UI_HELPER_EXECUTOR.execute(() -> ActivityManagerWrapper.getInstance()
-                                    .removeTask(taskView.getTask().key.id));
+                            switchToScreenshotAndFinishAnimationToRecents(() -> {
+                                UI_HELPER_EXECUTOR.getHandler().postDelayed(() ->
+                                        ActivityManagerWrapper.getInstance().removeTask(
+                                                taskView.getTask().key.id),
+                                        REMOVE_TASK_WAIT_FOR_APP_STOP_MS);
+                            });
                             mActivity.getStatsLogManager().logger()
                                     .withItemInfo(taskView.getItemInfo())
                                     .log(LAUNCHER_TASK_DISMISS_SWIPE_UP);
@@ -2460,10 +2468,13 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         mPendingAnimation.addEndListener(isSuccess -> {
             if (isSuccess) {
                 // Remove all the task views now
-                UI_HELPER_EXECUTOR.execute(
-                        ActivityManagerWrapper.getInstance()::removeAllRecentTasks);
-                removeTasksViewsAndClearAllButton();
-                startHome();
+                switchToScreenshotAndFinishAnimationToRecents(() -> {
+                    UI_HELPER_EXECUTOR.getHandler().postDelayed(
+                            ActivityManagerWrapper.getInstance()::removeAllRecentTasks,
+                            REMOVE_TASK_WAIT_FOR_APP_STOP_MS);
+                    removeTasksViewsAndClearAllButton();
+                    startHome();
+                });
             }
             mPendingAnimation = null;
         });
@@ -2618,9 +2629,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     protected void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
         if (LIVE_TILE.get() && mEnableDrawingLiveTile && newConfig.orientation != mOrientation) {
-            switchToScreenshot(
-                    () -> finishRecentsAnimation(true /* toRecents */,
-                            this::updateRecentsRotation));
+            switchToScreenshotAndFinishAnimationToRecents(this::updateRecentsRotation);
             mEnableDrawingLiveTile = false;
         } else {
             updateRecentsRotation();
@@ -3613,6 +3622,10 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         }
     }
 
+    public void switchToScreenshotAndFinishAnimationToRecents(Runnable onFinishRunnable) {
+        switchToScreenshot(() -> finishRecentsAnimation(true /* toRecents */, onFinishRunnable));
+    }
+
     /**
      * Switch the current running task view to static snapshot mode,
      * capturing the snapshot at the same time.
-- 
GitLab


From e41dd483e63ec1aa241efb5005b11a2760800a9e Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Fri, 4 Jun 2021 17:31:02 -0700
Subject: [PATCH 1335/1664] New folder icon style (uncropped icons).

- Switch Circle to PathShape as it allows for more flexibility on
  choosing what gets cropped.
- Remove shadows, and stroke.

Bug: 188095988
Test: manual
Change-Id: I602b3efcd35c2c11dc3461f49099c2f2a56eae59
---
 res/layout/user_folder_icon_normalized.xml    |  1 -
 .../folder/ClippedFolderIconLayoutRule.java   | 12 +++----
 src/com/android/launcher3/folder/Folder.java  | 23 +++++++++++--
 .../folder/FolderAnimationManager.java        | 19 ++++++++++-
 .../android/launcher3/folder/FolderIcon.java  |  3 --
 .../launcher3/folder/FolderPagedView.java     | 24 +++++++++++--
 .../launcher3/folder/PreviewBackground.java   | 10 +++++-
 .../android/launcher3/graphics/IconShape.java | 34 ++++++++++++++++---
 8 files changed, 102 insertions(+), 24 deletions(-)

diff --git a/res/layout/user_folder_icon_normalized.xml b/res/layout/user_folder_icon_normalized.xml
index 8b188577a8..15131f11d7 100644
--- a/res/layout/user_folder_icon_normalized.xml
+++ b/res/layout/user_folder_icon_normalized.xml
@@ -18,7 +18,6 @@
     xmlns:launcher="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@drawable/round_rect_folder"
     android:orientation="vertical" >
 
     <com.android.launcher3.folder.FolderPagedView
diff --git a/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java b/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java
index c67efefa5d..68bed443c7 100644
--- a/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java
+++ b/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java
@@ -5,10 +5,10 @@ public class ClippedFolderIconLayoutRule {
     public static final int MAX_NUM_ITEMS_IN_PREVIEW = 4;
     private static final int MIN_NUM_ITEMS_IN_PREVIEW = 2;
 
-    private static final float MIN_SCALE = 0.48f;
-    private static final float MAX_SCALE = 0.58f;
-    private static final float MAX_RADIUS_DILATION = 0.15f;
-    private static final float ITEM_RADIUS_SCALE_FACTOR = 1.33f;
+    private static final float MIN_SCALE = 0.44f;
+    private static final float MAX_SCALE = 0.54f;
+    private static final float MAX_RADIUS_DILATION = 0.10f;
+    private static final float ITEM_RADIUS_SCALE_FACTOR = 1.2f;
 
     public static final int EXIT_INDEX = -2;
     public static final int ENTER_INDEX = -3;
@@ -130,10 +130,8 @@ public class ClippedFolderIconLayoutRule {
     public float scaleForItem(int numItems) {
         // Scale is determined by the number of items in the preview.
         final float scale;
-        if (numItems <= 2) {
+        if (numItems <= 3) {
             scale = MAX_SCALE;
-        } else if (numItems == 3) {
-            scale = (MAX_SCALE + MIN_SCALE) / 2;
         } else {
             scale = MIN_SCALE;
         }
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index e3876278b2..17c1329ed9 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -41,6 +41,7 @@ import android.graphics.Insets;
 import android.graphics.Path;
 import android.graphics.Rect;
 import android.graphics.RectF;
+import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Build;
 import android.text.InputType;
@@ -67,6 +68,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
+import androidx.core.content.res.ResourcesCompat;
 import androidx.core.graphics.ColorUtils;
 
 import com.android.launcher3.AbstractFloatingView;
@@ -250,6 +252,8 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
     // so that we can cancel it when starting mColorChangeAnimator.
     private ObjectAnimator mOpenAnimationColorChangeAnimator;
 
+    private GradientDrawable mBackground;
+
     /**
      * Used to inflate the Workspace from XML.
      *
@@ -268,6 +272,12 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         // name is complete, we have something to focus on, thus hiding the cursor and giving
         // reliable behavior when clicking the text field (since it will always gain focus on click).
         setFocusableInTouchMode(true);
+
+    }
+
+    @Override
+    public Drawable getBackground() {
+        return mBackground;
     }
 
     @Override
@@ -276,6 +286,9 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         final DeviceProfile dp = mActivityContext.getDeviceProfile();
         final int paddingLeftRight = dp.folderContentPaddingLeftRight;
 
+        mBackground = (GradientDrawable) ResourcesCompat.getDrawable(getResources(),
+                R.drawable.round_rect_folder, getContext().getTheme());
+
         mContent = findViewById(R.id.folder_content);
         mContent.setPadding(paddingLeftRight, dp.folderContentPaddingTop, paddingLeftRight, 0);
         mContent.setFolder(this);
@@ -1213,6 +1226,8 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         lp.x = left;
         lp.y = top;
 
+        mBackground.setBounds(0, 0, width, height);
+
         if (mColorExtractor != null) {
             mColorExtractor.removeLocations();
             mColorExtractor.setListener(mColorListener);
@@ -1714,14 +1729,16 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
     }
 
     @Override
-    public void draw(Canvas canvas) {
+    protected void dispatchDraw(Canvas canvas) {
         if (mClipPath != null) {
             int count = canvas.save();
             canvas.clipPath(mClipPath);
-            super.draw(canvas);
+            mBackground.draw(canvas);
             canvas.restoreToCount(count);
+            super.dispatchDraw(canvas);
         } else {
-            super.draw(canvas);
+            mBackground.draw(canvas);
+            super.dispatchDraw(canvas);
         }
     }
 
diff --git a/src/com/android/launcher3/folder/FolderAnimationManager.java b/src/com/android/launcher3/folder/FolderAnimationManager.java
index 7fbfb8934e..bd0dbfde08 100644
--- a/src/com/android/launcher3/folder/FolderAnimationManager.java
+++ b/src/com/android/launcher3/folder/FolderAnimationManager.java
@@ -37,6 +37,7 @@ import android.view.animation.AnimationUtils;
 
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.CellLayout;
+import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.R;
 import com.android.launcher3.ShortcutAndWidgetContainer;
 import com.android.launcher3.Utilities;
@@ -80,6 +81,8 @@ public class FolderAnimationManager {
 
     private ObjectAnimator mBgColorAnimator;
 
+    private DeviceProfile mDeviceProfile;
+
     public FolderAnimationManager(Folder folder, boolean isOpening) {
         mFolder = folder;
         mContent = folder.mContent;
@@ -89,7 +92,8 @@ public class FolderAnimationManager {
         mPreviewBackground = mFolderIcon.mBackground;
 
         mContext = folder.getContext();
-        mPreviewVerifier = new FolderGridOrganizer(folder.mActivityContext.getDeviceProfile().inv);
+        mDeviceProfile = folder.mActivityContext.getDeviceProfile();
+        mPreviewVerifier = new FolderGridOrganizer(mDeviceProfile.inv);
 
         mIsOpening = isOpening;
 
@@ -211,8 +215,21 @@ public class FolderAnimationManager {
         play(a, getAnimator(mFolder.mContent, SCALE_PROPERTY, initialScale, finalScale));
         play(a, getAnimator(mFolder.mFooter, SCALE_PROPERTY, initialScale, finalScale));
         play(a, mFolderIcon.mFolderName.createTextAlphaAnimator(!mIsOpening));
+
+        // Create reveal animator for the folder background
         play(a, getShape().createRevealAnimator(
                 mFolder, startRect, endRect, finalRadius, !mIsOpening));
+
+        // Create reveal animator for the folder content (capture the top 4 icons 2x2)
+        int width = mContent.getPaddingLeft() + mDeviceProfile.folderCellLayoutBorderSpacingPx
+                + mDeviceProfile.folderCellWidthPx * 2;
+        int height = mContent.getPaddingTop() + mDeviceProfile.folderCellLayoutBorderSpacingPx
+                + mDeviceProfile.folderCellHeightPx * 2;
+        Rect startRect2 = new Rect(0, 0, width, height);
+        play(a, getShape().createRevealAnimator(
+                mFolder.getContent(), startRect2, endRect, finalRadius, !mIsOpening));
+
+
         // Fade in the folder name, as the text can overlap the icons when grid size is small.
         mFolder.mFolderName.setAlpha(mIsOpening ? 0f : 1f);
         play(a, getAnimator(mFolder.mFolderName, View.ALPHA, 0, 1),
diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java
index 279c4457d3..6b12d86d13 100644
--- a/src/com/android/launcher3/folder/FolderIcon.java
+++ b/src/com/android/launcher3/folder/FolderIcon.java
@@ -614,10 +614,7 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
 
         if (mCurrentPreviewItems.isEmpty() && !mAnimating) return;
 
-        final int saveCount = canvas.save();
-        canvas.clipPath(mBackground.getClipPath());
         mPreviewItemManager.draw(canvas);
-        canvas.restoreToCount(saveCount);
 
         if (!mBackground.drawingDelegated()) {
             mBackground.drawBackgroundStroke(canvas);
diff --git a/src/com/android/launcher3/folder/FolderPagedView.java b/src/com/android/launcher3/folder/FolderPagedView.java
index 7fc3740106..3d2884a24c 100644
--- a/src/com/android/launcher3/folder/FolderPagedView.java
+++ b/src/com/android/launcher3/folder/FolderPagedView.java
@@ -22,6 +22,7 @@ import static com.android.launcher3.AbstractFloatingView.TYPE_FOLDER;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Canvas;
+import android.graphics.Path;
 import android.graphics.drawable.Drawable;
 import android.util.ArrayMap;
 import android.util.AttributeSet;
@@ -49,6 +50,7 @@ import com.android.launcher3.touch.ItemClickHandler;
 import com.android.launcher3.util.Thunk;
 import com.android.launcher3.util.ViewCache;
 import com.android.launcher3.views.ActivityContext;
+import com.android.launcher3.views.ClipPathView;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -57,7 +59,7 @@ import java.util.Map;
 import java.util.function.ToIntFunction;
 import java.util.stream.Collectors;
 
-public class FolderPagedView extends PagedView<PageIndicatorDots> {
+public class FolderPagedView extends PagedView<PageIndicatorDots> implements ClipPathView {
 
     private static final String TAG = "FolderPagedView";
 
@@ -89,6 +91,8 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> {
 
     private Folder mFolder;
 
+    private Path mClipPath;
+
     // If the views are attached to the folder or not. A folder should be bound when its
     // animating or is open.
     private boolean mViewsBound = false;
@@ -128,8 +132,16 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> {
 
     @Override
     protected void dispatchDraw(Canvas canvas) {
-        mFocusIndicatorHelper.draw(canvas);
-        super.dispatchDraw(canvas);
+        if (mClipPath != null) {
+            int count = canvas.save();
+            canvas.clipPath(mClipPath);
+            mFocusIndicatorHelper.draw(canvas);
+            super.dispatchDraw(canvas);
+            canvas.restoreToCount(count);
+        } else {
+            mFocusIndicatorHelper.draw(canvas);
+            super.dispatchDraw(canvas);
+        }
     }
 
     /**
@@ -628,4 +640,10 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> {
     public int itemsPerPage() {
         return mOrganizer.getMaxItemsPerPage();
     }
+
+    @Override
+    public void setClipPath(Path clipPath) {
+        mClipPath = clipPath;
+        invalidate();
+    }
 }
diff --git a/src/com/android/launcher3/folder/PreviewBackground.java b/src/com/android/launcher3/folder/PreviewBackground.java
index 4eab63e54f..204decbee4 100644
--- a/src/com/android/launcher3/folder/PreviewBackground.java
+++ b/src/com/android/launcher3/folder/PreviewBackground.java
@@ -51,6 +51,7 @@ import com.android.launcher3.views.ActivityContext;
 public class PreviewBackground extends CellLayout.DelegatedCellDrawing {
 
     private static final boolean DRAW_SHADOW = false;
+    private static final boolean DRAW_STROKE = false;
 
     private static final int CONSUMPTION_ANIMATION_DURATION = 100;
 
@@ -303,6 +304,10 @@ public class PreviewBackground extends CellLayout.DelegatedCellDrawing {
     }
 
     public void animateBackgroundStroke() {
+        if (!DRAW_STROKE) {
+            return;
+        }
+
         if (mStrokeAlphaAnimator != null) {
             mStrokeAlphaAnimator.cancel();
         }
@@ -319,6 +324,9 @@ public class PreviewBackground extends CellLayout.DelegatedCellDrawing {
     }
 
     public void drawBackgroundStroke(Canvas canvas) {
+        if (!DRAW_STROKE) {
+            return;
+        }
         mPaint.setColor(setColorAlphaBound(mStrokeColor, mStrokeAlpha));
         mPaint.setStyle(Paint.Style.STROKE);
         mPaint.setStrokeWidth(mStrokeWidth);
@@ -363,7 +371,7 @@ public class PreviewBackground extends CellLayout.DelegatedCellDrawing {
         }
 
         mDrawingDelegate = null;
-        isClipping = true;
+        isClipping = false;
         invalidate();
     }
 
diff --git a/src/com/android/launcher3/graphics/IconShape.java b/src/com/android/launcher3/graphics/IconShape.java
index 2da679c422..f82b07ebfa 100644
--- a/src/com/android/launcher3/graphics/IconShape.java
+++ b/src/com/android/launcher3/graphics/IconShape.java
@@ -156,19 +156,43 @@ public abstract class IconShape {
         }
     }
 
-    public static final class Circle extends SimpleRectShape {
+    public static final class Circle extends PathShape {
 
-        @Override
-        public void drawShape(Canvas canvas, float offsetX, float offsetY, float radius, Paint p) {
-            canvas.drawCircle(radius + offsetX, radius + offsetY, radius, p);
+        private final float[] mTempRadii = new float[8];
+
+        protected AnimatorUpdateListener newUpdateListener(Rect startRect, Rect endRect,
+                float endRadius, Path outPath) {
+            float r1 = getStartRadius(startRect);
+
+            float[] startValues = new float[] {
+                    startRect.left, startRect.top, startRect.right, startRect.bottom, r1, r1};
+            float[] endValues = new float[] {
+                    endRect.left, endRect.top, endRect.right, endRect.bottom, endRadius, endRadius};
+
+            FloatArrayEvaluator evaluator = new FloatArrayEvaluator(new float[6]);
+
+            return (anim) -> {
+                float progress = (Float) anim.getAnimatedValue();
+                float[] values = evaluator.evaluate(progress, startValues, endValues);
+                outPath.addRoundRect(
+                        values[0], values[1], values[2], values[3],
+                        getRadiiArray(values[4], values[5]), Path.Direction.CW);
+            };
+        }
+
+        private float[] getRadiiArray(float r1, float r2) {
+            mTempRadii[0] = mTempRadii [1] = mTempRadii[2] = mTempRadii[3] =
+                    mTempRadii[6] = mTempRadii[7] = r1;
+            mTempRadii[4] = mTempRadii[5] = r2;
+            return mTempRadii;
         }
 
+
         @Override
         public void addToPath(Path path, float offsetX, float offsetY, float radius) {
             path.addCircle(radius + offsetX, radius + offsetY, radius, Path.Direction.CW);
         }
 
-        @Override
         protected float getStartRadius(Rect startRect) {
             return startRect.width() / 2f;
         }
-- 
GitLab


From 5435b07ed4504522a0f6a614710f95d5d5c83865 Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Tue, 1 Jun 2021 15:49:01 -0700
Subject: [PATCH 1336/1664] [AA+] Fixing missing logs forr keyboard close
 interactions.

Bug: 178562918
Test: Manual
Change-Id: Id5a7fc3d8ded675c6a64de7416fade74ae2bacd1
---
 src/com/android/launcher3/allapps/AllAppsRecyclerView.java | 7 ++++---
 src/com/android/launcher3/util/UiThreadHelper.java         | 4 ++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
index c6c9c9b72b..d536c3afeb 100644
--- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
@@ -21,6 +21,7 @@ import static android.view.View.MeasureSpec.makeMeasureSpec;
 
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_VERTICAL_SWIPE_BEGIN;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_VERTICAL_SWIPE_END;
+import static com.android.launcher3.util.UiThreadHelper.hideKeyboardAsync;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -31,7 +32,6 @@ import android.util.Log;
 import android.util.SparseIntArray;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.WindowInsets;
 
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -41,6 +41,7 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.logging.StatsLogManager;
+import com.android.launcher3.views.ActivityContext;
 import com.android.launcher3.views.RecyclerViewFastScroller;
 
 import java.util.ArrayList;
@@ -189,8 +190,8 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
             case SCROLL_STATE_DRAGGING:
                 mgr.logger().sendToInteractionJankMonitor(
                         LAUNCHER_ALLAPPS_VERTICAL_SWIPE_BEGIN, this);
-                requestFocus();
-                getWindowInsetsController().hide(WindowInsets.Type.ime());
+                hideKeyboardAsync(ActivityContext.lookupContext(getContext()),
+                        getApplicationWindowToken());
                 break;
             case SCROLL_STATE_IDLE:
                 mgr.logger().sendToInteractionJankMonitor(
diff --git a/src/com/android/launcher3/util/UiThreadHelper.java b/src/com/android/launcher3/util/UiThreadHelper.java
index 947f96fe56..b9387a87a3 100644
--- a/src/com/android/launcher3/util/UiThreadHelper.java
+++ b/src/com/android/launcher3/util/UiThreadHelper.java
@@ -15,6 +15,7 @@
  */
 package com.android.launcher3.util;
 
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_KEYBOARD_CLOSED;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
 import android.annotation.SuppressLint;
@@ -27,6 +28,7 @@ import android.view.View;
 import android.view.WindowInsets;
 import android.view.inputmethod.InputMethodManager;
 
+import com.android.launcher3.Launcher;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.views.ActivityContext;
 
@@ -57,6 +59,8 @@ public class UiThreadHelper {
 
         Message.obtain(HANDLER.get(root.getContext()),
                 MSG_HIDE_KEYBOARD, token).sendToTarget();
+        Launcher.cast(activityContext).getStatsLogManager().logger().log(
+                LAUNCHER_ALLAPPS_KEYBOARD_CLOSED);
     }
 
     public static void setOrientationAsync(Activity activity, int orientation) {
-- 
GitLab


From 0fe2342445719852ffe09944eab06adde618654f Mon Sep 17 00:00:00 2001
From: wilsonshih <wilsonshih@google.com>
Date: Mon, 31 May 2021 13:31:16 +0800
Subject: [PATCH 1337/1664] Pre-set splash screen as icon-style when launch
 activity from Launcher.

Specify icon style splash screen when launch activity from Launcher.

Bug: 188023621
Bug: 189293785
Test: Start application from Launcher/Recents.
Change-Id: I13b7cd67576cf8822e86ff90971d6bb1a24d1a91
---
 .../src/com/android/launcher3/BaseQuickstepLauncher.java     | 2 ++
 quickstep/src/com/android/quickstep/RecentsActivity.java     | 5 ++++-
 quickstep/src/com/android/quickstep/TaskShortcutFactory.java | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index c13225abb7..1bf36278ca 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -37,6 +37,7 @@ import android.os.Bundle;
 import android.os.CancellationSignal;
 import android.os.IBinder;
 import android.view.View;
+import android.window.SplashScreen;
 
 import androidx.annotation.Nullable;
 
@@ -435,6 +436,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
             ActivityOptionsCompat.setLauncherSourceInfo(
                     activityOptions.options, mLastTouchUpTime);
         }
+        activityOptions.options.setSplashscreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_ICON);
         addLaunchCookie(item, activityOptions.options);
         return activityOptions;
     }
diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index 0e9e3ad029..0e85ec3760 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -40,6 +40,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.view.SurfaceControl.Transaction;
 import android.view.View;
+import android.window.SplashScreen;
 
 import androidx.annotation.Nullable;
 
@@ -222,9 +223,11 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
                 wrapper, RECENTS_LAUNCH_DURATION,
                 RECENTS_LAUNCH_DURATION - STATUS_BAR_TRANSITION_DURATION
                         - STATUS_BAR_TRANSITION_PRE_DELAY);
-        return new ActivityOptionsWrapper(
+        final ActivityOptionsWrapper activityOptions = new ActivityOptionsWrapper(
                 ActivityOptionsCompat.makeRemoteAnimation(adapterCompat),
                 onEndCallback);
+        activityOptions.options.setSplashscreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_ICON);
+        return activityOptions;
     }
 
     /**
diff --git a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
index 4ec1c15f4d..a078bf331e 100644
--- a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
@@ -30,6 +30,7 @@ import android.graphics.Rect;
 import android.os.Handler;
 import android.os.Looper;
 import android.view.View;
+import android.window.SplashScreen;
 
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.DeviceProfile;
@@ -165,6 +166,9 @@ public interface TaskShortcutFactory {
             dismissTaskMenuView(mTarget);
 
             ActivityOptions options = mFactory.makeLaunchOptions(mTarget);
+            if (options != null) {
+                options.setSplashscreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_ICON);
+            }
             if (options != null
                     && ActivityManagerWrapper.getInstance().startActivityFromRecents(taskId,
                             options)) {
-- 
GitLab


From db79a9f3cd853f3adc9cb0558b89b9bfb09eee34 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Mon, 7 Jun 2021 05:37:28 +0000
Subject: [PATCH 1338/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Ie4d81f7b28e3ae813bdde9fabd90872a3929187b
---
 res/values-cs/strings.xml     |  4 ++--
 res/values-de/strings.xml     |  2 +-
 res/values-eu/strings.xml     |  2 +-
 res/values-fr-rCA/strings.xml |  9 +++------
 res/values-gu/strings.xml     |  9 +++------
 res/values-hy/strings.xml     |  8 ++++----
 res/values-iw/strings.xml     |  4 ++--
 res/values-ja/strings.xml     |  6 +++---
 res/values-kk/strings.xml     | 13 +++++--------
 res/values-lv/strings.xml     |  2 +-
 res/values-my/strings.xml     |  2 +-
 res/values-ne/strings.xml     |  6 +++---
 res/values-nl/strings.xml     |  6 +++---
 res/values-or/strings.xml     |  9 +++------
 res/values-pl/strings.xml     |  2 +-
 res/values-ru/strings.xml     |  6 +++---
 res/values-sk/strings.xml     |  2 +-
 res/values-sq/strings.xml     | 13 +++++--------
 res/values-te/strings.xml     |  9 +++------
 res/values-uz/strings.xml     |  2 +-
 res/values-zh-rHK/strings.xml |  2 +-
 res/values-zh-rTW/strings.xml |  6 +++---
 22 files changed, 53 insertions(+), 71 deletions(-)

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index c1ed2883ab..558d22f812 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -160,8 +160,8 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Osobní"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Pracovní"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Pracovní profil"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Osobní údaje jsou oddělené a jsou před pracovními aplikacemi skryty"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"K datům pracovních aplikací má přístup váš administrátor IT"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Osobní údaje jsou oddělené a před pracovními aplikacemi jsou skryty"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Pracovní aplikace a údaje může vidět váš administrátor IT"</string>
     <string name="work_profile_edu_next" msgid="8783418929296503629">"Další"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Rozumím"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"Pracovní profil je pozastaven"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 3a20d1740a..72929cf869 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -154,7 +154,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Privat"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Geschäftlich"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Arbeitsprofil"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Personenbezogene Daten sind für geschäftlichen Apps nicht sichtbar oder zugänglich"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Personenbezogene Daten sind für geschäftliche Apps nicht sichtbar oder zugänglich"</string>
     <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Geschäftliche Apps und Daten können von deinem IT-Administrator eingesehen werden"</string>
     <string name="work_profile_edu_next" msgid="8783418929296503629">"Weiter"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 812f007a23..735f6e332f 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -154,7 +154,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Pertsonalak"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Lanekoak"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Laneko profila"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Datu pertsonalak bananduta daude eta ez daude laneko aplikazioen artean ikusgai"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Datu pertsonalak ez daude laneko aplikazioetan, eta ezin dira haien bidez ikusi"</string>
     <string name="work_profile_edu_work_apps" msgid="237051938268703058">"IKT saileko administratzaileak laneko aplikazioak eta datuak ikus ditzake"</string>
     <string name="work_profile_edu_next" msgid="8783418929296503629">"Hurrengoa"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Ados"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 9522a38a67..e7801c9571 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -51,12 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personnels"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Professionnels"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversations"</string>
-    <!-- no translation found for widget_education_header (4874760613775913787) -->
-    <skip />
-    <!-- no translation found for widget_education_content (745542879510751525) -->
-    <skip />
-    <!-- no translation found for widget_education_close_button (8676165703104836580) -->
-    <skip />
+    <string name="widget_education_header" msgid="4874760613775913787">"Renseignements utiles à portée de main"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Pour obtenir des renseignements sans ouvrir aucune application, vous pouvez ajouter des widgets à votre écran d\'accueil"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Rechercher dans les applications"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Chargement des applications en cours…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Aucune application trouvée correspondant à « <xliff:g id="QUERY">%1$s</xliff:g> »"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 9c909a0c7b..d9ffa68a3b 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -51,12 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"વ્યક્તિગત"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ઑફિસ"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"વાતચીતો"</string>
-    <!-- no translation found for widget_education_header (4874760613775913787) -->
-    <skip />
-    <!-- no translation found for widget_education_content (745542879510751525) -->
-    <skip />
-    <!-- no translation found for widget_education_close_button (8676165703104836580) -->
-    <skip />
+    <string name="widget_education_header" msgid="4874760613775913787">"ઉપયોગી માહિતી તમારી આંગળીના ટેરવે"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"ઍપને ખોલ્યા વિના માહિતી મેળવવા માટે, તમે તમારી હોમ સ્ક્રીન પર વિજેટ ઉમેરી શકો છો"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"સમજાઈ ગયું"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"શોધ ઍપ્લિકેશનો"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ઍપ્લિકેશનો લોડ કરી રહ્યું છે…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\"થી મેળ ખાતી કોઈ ઍપ્લિકેશનો મળી નથી"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index bc68e3edd1..f7d6b317aa 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -32,7 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Կրկնակի հպեք և պահեք՝ վիջեթ տեղափոխելու համար, կամ օգտվեք հատուկ գործողություններից։"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Լայնությունը՝ %1$d, բարձրությունը՝ %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Հպեք վիջեթին և պահեք՝ հիմնական էկրանին տեղափոխելու համար"</string>
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Հպեք վիջեթին և պահեք տեղափոխելու համար"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Ավելացնել հիմնական էկրանին"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> վիջեթ</item>
@@ -154,13 +154,13 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Անձնական"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Աշխատանքային"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Աշխատանքային պրոֆիլ"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Անձնական տվյալները թաքցված են և առանձնացված աշխատանքային հավելվածներից"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Անձնական տվյալները առանձին են և թաքցված են, երբ ցուցադրվում են աշխատանքայինները"</string>
     <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Աշխատանքային հավելվածներն ու դրանց տվյալները տեսանելի են ձեր ադմինիստրատորին"</string>
     <string name="work_profile_edu_next" msgid="8783418929296503629">"Առաջ"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Եղավ"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"Աշխատանքային պրոֆիլը դադարեցված է"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Աշխատանքային հավելվածները չեն կարող ձեզ ծանուցումներ ուղարկել, օգտագործել ձեր մարտկոցը և ձեր տեղադրության մասին տվյալներ ստանալ։"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Աշխատանքային պրոֆիլը դադարեցված է։ Աշխատանքային հավելվածները չեն կարող ձեզ ծանուցումներ ուղարկել, օգտագործել ձեր մարտկոցը և ձեր տեղադրության մասին տվյալներ ստանալ։"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Աշխատանքային հավելվածները չեն կարող ծանուցումներ ուղարկել ձեզ, օգտագործել ձեր մարտկոցը և ձեր տեղադրության մասին տվյալներ ստանալ։"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Աշխատանքային պրոֆիլը դադարեցված է։ Աշխատանքային հավելվածները չեն կարող ծանուցումներ ուղարկել ձեզ, օգտագործել ձեր մարտկոցը և ձեր տեղադրության մասին տվյալներ ստանալ։"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Աշխատանքային հավելվածները նշանակներ ունեն և տեսանելի են ձեր ՏՏ ադմինիստրատորին"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Եղավ"</string>
     <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Դադարեցնել աշխատանքային հավելվածները"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index fb72d55595..8ec7de366f 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -161,7 +161,7 @@
     <string name="all_apps_work_tab" msgid="4884822796154055118">"עבודה"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"פרופיל עבודה"</string>
     <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"מידע אישי מאוחסן בנפרד ומוסתר מאפליקציות לעבודה"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"‏אפליקציות לעבודה ונתוני העבודה שלך גלויים למנהל ה-IT"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"‏אפליקציות לעבודה ונתוני פרופיל העבודה שלך גלויים למנהל ה-IT"</string>
     <string name="work_profile_edu_next" msgid="8783418929296503629">"הבא"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"הבנתי"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"פרופיל העבודה מושהה"</string>
@@ -172,6 +172,6 @@
     <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"השהיית האפליקציות לעבודה"</string>
     <string name="work_apps_enable_btn_text" msgid="82111102541971856">"הפעלה"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"סינון"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"השהיה של התראות ואפליקציות לעבודה"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"השהיה של ההתראות והאפליקציות בפרופיל העבודה"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"הפעולה נכשלה: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 60fe4532a9..d54f884372 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -154,13 +154,13 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"個人用"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"仕事用"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"仕事用プロファイル"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"個人データは仕事用アプリとは別に保存され、一緒に表示されません"</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"個人用と仕事用のデータは分離され、アプリは別々に表示されます"</string>
     <string name="work_profile_edu_work_apps" msgid="237051938268703058">"仕事用アプリと仕事用データは IT 管理者に公開されます"</string>
     <string name="work_profile_edu_next" msgid="8783418929296503629">"次へ"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"仕事用プロファイルが一時停止しています"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"仕事用アプリは、通知の送信、バッテリーの使用、位置情報へのアクセスを行えません"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"仕事用プロファイルが一時停止しています。仕事用アプリは、通知の送信、バッテリーの使用、位置情報へのアクセスを行えません"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"仕事用アプリは、通知の送信、バッテリーの使用、位置情報の取得を行えません"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"仕事用プロファイルが一時停止しています。仕事用アプリは、通知の送信、バッテリーの使用、位置情報の取得を行えません"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"仕事用アプリはバッジが付き、IT 管理者に公開されます"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
     <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"仕事用アプリを一時停止"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 2b1b89f292..640ffca72d 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -51,12 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Жеке виджеттер"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Жұмыс виджеттері"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Әңгімелер"</string>
-    <!-- no translation found for widget_education_header (4874760613775913787) -->
-    <skip />
-    <!-- no translation found for widget_education_content (745542879510751525) -->
-    <skip />
-    <!-- no translation found for widget_education_close_button (8676165703104836580) -->
-    <skip />
+    <string name="widget_education_header" msgid="4874760613775913787">"Саусақпен түртсеңіз болғаны – пайдалы ақпарат көз алдыңызда"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Қолданбаларды ашпай-ақ ақпарат алу үшін негізгі экранға тиісті виджеттерді қосыңыз."</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Түсінікті"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Қолданбаларды іздеу"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Қолданбалар жүктелуде…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" сұрауына сәйкес келетін қолданбалар жоқ"</string>
@@ -158,7 +155,7 @@
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Жұмыс"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Жұмыс профилі"</string>
     <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Жеке деректер бөлек орналасқан және жұмыс қолданбаларынан жасырылған"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Әкімшіңіз жұмыс қолданбалары мен деректерді көре алады"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Әкімшіңіз жұмыс қолданбалары мен деректерін көре алады"</string>
     <string name="work_profile_edu_next" msgid="8783418929296503629">"Келесі"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Түсінікті"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"Жұмыс профилі кідіртілді"</string>
@@ -169,6 +166,6 @@
     <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Жұмыс қолданбаларын тоқтата тұру"</string>
     <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Қосу"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Сүзгі"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Жұмыс қолданбалары мен хабарландыруларды кідірту"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Жұмыс қолданбалары мен хабарландыруларын кідірту"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Қате шықты: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 059620c314..ad4082be57 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -50,7 +50,7 @@
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Notīrīt tekstu no meklēšanas lodziņa"</string>
     <string name="no_widgets_available" msgid="9140948620298620513">"Nav pieejams neviens logrīks"</string>
     <string name="no_search_results" msgid="6518732304311458580">"Nav meklēšanas rezultātu"</string>
-    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personīgie"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personīgs"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Darba"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Sarunas"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Ērta piekļuve noderīgai informācijai"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 1a8650cc16..c120c24725 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -157,7 +157,7 @@
     <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"ကိုယ်ပိုင်ဒေတာများသည် သီးသန့်ဖြစ်ပြီး အလုပ်အက်ပ်များမှ ဖျောက်ထားသည်"</string>
     <string name="work_profile_edu_work_apps" msgid="237051938268703058">"အလုပ်သုံးအက်ပ်နှင့် ဒေတာများကို သင်၏ IT စီမံခန့်ခွဲသူက မြင်ရပါသည်"</string>
     <string name="work_profile_edu_next" msgid="8783418929296503629">"ရှေ့သို့"</string>
-    <string name="work_profile_edu_accept" msgid="6069788082535149071">"Ok"</string>
+    <string name="work_profile_edu_accept" msgid="6069788082535149071">"ရပါပြီ"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"အလုပ်ပရိုဖိုင် ခဏရပ်ထားသည်"</string>
     <string name="work_apps_paused_body" msgid="4209084728264328628">"အလုပ်သုံးအက်ပ်များက အကြောင်းကြားချက်များ ပို့ခြင်း၊ သင့်ဘက်ထရီ သုံးခြင်း (သို့) သင့်တည်နေရာ သုံးခြင်းတို့ မပြုလုပ်နိုင်ပါ"</string>
     <string name="work_apps_paused_content_description" msgid="4473292417145736203">"အလုပ်ပရိုဖိုင် ခဏရပ်ထားသည်။ အလုပ်သုံးအက်ပ်များက အကြောင်းကြားချက်များ ပို့ခြင်း၊ သင့်ဘက်ထရီ သုံးခြင်း (သို့) သင့်တည်နေရာ သုံးခြင်းတို့ မပြုလုပ်နိုင်ပါ"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 474a452a0d..929e302e19 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -161,9 +161,9 @@
     <string name="work_profile_edu_work_apps" msgid="237051938268703058">"तपाईंका IT एड्मिनले कामसम्पबन्धी एपहरू र डेटा हेर्न सक्छन्"</string>
     <string name="work_profile_edu_next" msgid="8783418929296503629">"अर्को"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"बुझेँ"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"कार्यालयको प्रोफाइल अस्थायी रूपमा रोक्का गरिएको छ"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"कामसम्बन्धी एपहरूले तपाईंलाई सूचना पठाउन, तपाईंको डिभाइसको ब्याट्री प्रयोग गर्न वा तपाईंको स्थान हेर्न सक्दैनन्"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"कामसम्बन्धी प्रोफाइल अस्थायी रूपमा रोक्का गरिएको छ। कामसम्बन्धी एपहरूले तपाईंलाई सूचना पठाउन, तपाईंको डिभाइसको ब्याट्री प्रयोग गर्न वा तपाईंको स्थान हेर्न सक्दैनन्"</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"कार्यालयको प्रोफाइल पज गरिएको छ"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"कामसम्बन्धी एपहरूले तपाईंलाई सूचना पठाउन, तपाईंको डिभाइसको ब्याट्री प्रयोग गर्न वा तपाईंको लोकेसन हेर्न सक्दैनन्"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"कामसम्बन्धी प्रोफाइल पज गरिएको छ। कामसम्बन्धी एपहरूले तपाईंलाई सूचना पठाउन, तपाईंको डिभाइसको ब्याट्री प्रयोग गर्न वा तपाईंको लोकेसन हेर्न सक्दैनन्"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"कामसम्बन्धी एपमा ब्याज अङ्कित हुन्छ र तपाईंका IT एड्मिन ती एप हेर्न सक्नुहुन्छ"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"बुझेँ"</string>
     <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"कामसम्बन्धी एपहरू अस्थायी रूपमा रोक्का गर्नुहोस्"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index f3c55386c7..7573102e99 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -111,7 +111,7 @@
     <string name="title_missing_notification_access" msgid="7503287056163941064">"Toegang tot meldingen vereist"</string>
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Als je meldingsstipjes wilt tonen, zet je app-meldingen aan voor <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Instellingen wijzigen"</string>
-    <string name="notification_dots_service_title" msgid="4284221181793592871">"Meldingsstipjes tonen"</string>
+    <string name="notification_dots_service_title" msgid="4284221181793592871">"Toon meldingsstipjes"</string>
     <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"App-iconen toevoegen aan startscherm"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Voor nieuwe apps"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Onbekend"</string>
@@ -159,8 +159,8 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"Volgende"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"Werkprofiel is onderbroken"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Werk-apps kunnen je geen meldingen sturen, niet je batterij gebruiken en geen toegang krijgen tot je locatie"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Werkprofiel is gepauzeerd. Werk-apps kunnen je geen meldingen sturen, niet je batterij gebruiken en geen toegang krijgen tot je locatie."</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Werk-apps kunnen je geen meldingen sturen, je batterij niet gebruiken en geen toegang krijgen tot je locatie"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Werkprofiel is gepauzeerd. Werk-apps kunnen je geen meldingen sturen, je batterij niet gebruiken en geen toegang krijgen tot je locatie."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Werk-apps hebben badges en zijn zichtbaar voor je IT-beheerder"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
     <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Werk-apps pauzeren"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 3517dabf4b..5c1d498827 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -51,12 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ବ୍ୟକ୍ତିଗତ"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ୱାର୍କ"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ"</string>
-    <!-- no translation found for widget_education_header (4874760613775913787) -->
-    <skip />
-    <!-- no translation found for widget_education_content (745542879510751525) -->
-    <skip />
-    <!-- no translation found for widget_education_close_button (8676165703104836580) -->
-    <skip />
+    <string name="widget_education_header" msgid="4874760613775913787">"ଉପଯୋଗୀ ସୂଚନା ଆପଣଙ୍କ ପାଖରେ ସହଜରେ ଉପଲବ୍ଧ"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"ଆପଗୁଡ଼ିକୁ ନଖୋଲି ସୂଚନା ପାଇବା ପାଇଁ, ଆପଣ ଆପଣଙ୍କ ମୂଳସ୍କ୍ରିନରେ ୱିଜେଟଗୁଡ଼ିକୁ ଯୋଗ କରିପାରିବେ"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"ବୁଝିଗଲି"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ଆପ୍‌ ଖୋଜନ୍ତୁ"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ଆପ୍‌ ଲୋଡ୍‌ ହେଉଛି..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" ସହିତ ମେଳ ହେଉଥିବା କୌଣସି ଆପ୍‌ ମିଳିଲା ନାହିଁ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 7b47cdea25..770f3440a7 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -172,6 +172,6 @@
     <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Wstrzymaj aplikacje służbowe"</string>
     <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Włącz"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtruj"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Wstrzymaj aplikacje służbowe i powiadomienia"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Wstrzymaj służbowe aplikacje i powiadomienia"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Niepowodzenie: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 70606a9681..6d2f9e5d2e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -161,10 +161,10 @@
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Рабочие"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Рабочий профиль"</string>
     <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Личные данные скрыты от рабочих приложений и недоступны им."</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Рабочие приложения и данные видны системному администратору."</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Рабочие приложения и их данные видны системному администратору."</string>
     <string name="work_profile_edu_next" msgid="8783418929296503629">"Далее"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ОК"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Действие рабочего профиля приостановлено."</string>
+    <string name="work_apps_paused_title" msgid="2389865654362803723">"Рабочий профиль приостановлен"</string>
     <string name="work_apps_paused_body" msgid="4209084728264328628">"Рабочие приложения не могут отправлять уведомления, расходовать заряд батареи и получать доступ к данным о вашем местоположении."</string>
     <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Рабочий профиль приостановлен. Рабочие приложения не могут отправлять уведомления, расходовать заряд батареи и получать доступ к данным о вашем местоположении."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"У рабочих приложений есть специальная пометка. Они видны системному администратору."</string>
@@ -172,6 +172,6 @@
     <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Приостановить рабочие приложения"</string>
     <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Включить"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Фильтр"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Приостановить рабочие приложения и уведомления"</string>
+    <string name="work_switch_tip" msgid="808075064383839144">"Приостановить рабочие приложения и уведомления от них"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Не удалось выполнить действие (<xliff:g id="WHAT">%1$s</xliff:g>)."</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 08e7bb643e..cbb082aed1 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -165,7 +165,7 @@
     <string name="work_profile_edu_next" msgid="8783418929296503629">"Ďalej"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Dobre"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"Pracovný profil je pozastavený"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Pracovné aplikácie nemôžu posielať upozornenia, používať batériu ani polohu"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"Pracovné aplikácie vám nemôžu posielať upozornenia, používať vašu batériu ani vašu polohu"</string>
     <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Pracovný profil je pozastavený. Pracovné aplikácie nemôžu posielať upozornenia, používať batériu ani polohu."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Pracovné aplikácie majú odznak a zobrazujú sa správcovi IT"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Dobre"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 338aa8b142..1054092634 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -51,12 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personale"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Puna"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Bisedat"</string>
-    <!-- no translation found for widget_education_header (4874760613775913787) -->
-    <skip />
-    <!-- no translation found for widget_education_content (745542879510751525) -->
-    <skip />
-    <!-- no translation found for widget_education_close_button (8676165703104836580) -->
-    <skip />
+    <string name="widget_education_header" msgid="4874760613775913787">"Informacione të dobishme në majë të gishtave të tu"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Për të marrë informacione pa i hapur aplikacionet, mund të shtosh miniaplikacione në ekranin bazë"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"E kuptova"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Kërko për aplikacione"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Po ngarkon aplikacionet..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nuk u gjet asnjë aplikacion që përputhet me \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -157,8 +154,8 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personale"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Punë"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profili i punës"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Të dhënat personale janë të ndara dhe të fshehura nga aplikacionet e punës"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Aplikacionet e punës dhe të dhënat janë të dukshme për administratorin e teknologjisë së informacionit."</string>
+    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Të dhënat personale janë të veçuara dhe të fshehura nga aplikacionet e punës"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Aplikacionet e punës dhe të dhënat janë të dukshme për administratorin e teknologjisë së informacionit"</string>
     <string name="work_profile_edu_next" msgid="8783418929296503629">"Para"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"E kuptova"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"Profili i punës është në pauzë"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index a4746616e5..7a851791c6 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -51,12 +51,9 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"వ్యక్తిగతం"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ఆఫీస్"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"సంభాషణలు"</string>
-    <!-- no translation found for widget_education_header (4874760613775913787) -->
-    <skip />
-    <!-- no translation found for widget_education_content (745542879510751525) -->
-    <skip />
-    <!-- no translation found for widget_education_close_button (8676165703104836580) -->
-    <skip />
+    <string name="widget_education_header" msgid="4874760613775913787">"మీ చేతివేళ్ల మీద ఉపయోగకరమైన సమాచారం"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"యాప్‌లను తెరవకుండా సమాచారం పొందడానికి, మీరు మీ మొదటి స్క్రీన్‌కు విడ్జెట్‌లను జోడించవచ్చు"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"అర్థమైంది"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"అప్లికేషన్‌లను శోధించండి"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"అప్లికేషన్‌లను లోడ్ చేస్తోంది…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\"కి సరిపోలే అప్లికేషన్‌లేవీ కనుగొనబడలేదు"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 3d5db5417c..99bdd4b27f 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -155,7 +155,7 @@
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Ish"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Ish profili"</string>
     <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Shaxsiy maʼlumotlar ishga oid ilovalardan alohida va berkitilgan"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Ishga oid ilovalar va maʼlumotlarni AT administratoringiz koʻra oladi"</string>
+    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Administratoringiz ishga oid ilovalar va maʼlumotlarni koʻra oladi"</string>
     <string name="work_profile_edu_next" msgid="8783418929296503629">"Keyingisi"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"Ish profili pauzada"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index c7d67af481..c0bb552ddb 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -32,7 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"㩒兩下之後㩒住，就可以郁小工具或者用自訂操作。"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d 闊，%2$d 高"</string>
-    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"按住小工具即可將其移至主畫面上任何位置"</string>
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"按住小工具即可隨意在主畫面上移動"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"新增至主畫面"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> 個小工具</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 6941c2ca8e..9685d89c1d 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -152,15 +152,15 @@
     <string name="accessibility_close" msgid="2277148124685870734">"關閉"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"已關閉通知"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"個人"</string>
-    <string name="all_apps_work_tab" msgid="4884822796154055118">"公司"</string>
+    <string name="all_apps_work_tab" msgid="4884822796154055118">"工作"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"工作資料夾"</string>
     <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"系統會區隔個人資料與工作資料，因此兩者不會同時顯示"</string>
     <string name="work_profile_edu_work_apps" msgid="237051938268703058">"你的 IT 管理員可以查看工作應用程式和工作資料"</string>
     <string name="work_profile_edu_next" msgid="8783418929296503629">"繼續"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"我知道了"</string>
     <string name="work_apps_paused_title" msgid="2389865654362803723">"工作資料夾已暫停"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"工作應用程式將無法傳送通知，也無法存取你的位置資訊。你還可以省下這類應用程式消耗的電量"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"工作資料夾已暫停。工作應用程式將無法傳送通知，也無法存取你的位置資訊。你還可以省下這類應用程式消耗的電量"</string>
+    <string name="work_apps_paused_body" msgid="4209084728264328628">"工作應用程式不會消耗電量、無法傳送通知，也無法存取你的位置資訊。"</string>
+    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"系統已暫停使用工作資料夾。在這種情況下，工作應用程式不會消耗電量、無法傳送通知，也無法存取你的位置資訊。"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"你的 IT 管理員可以看見工作應用程式和相關標記"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"我知道了"</string>
     <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"暫停工作應用程式"</string>
-- 
GitLab


From 60b97de72bc3fabe88d27df6f56b30579abeda73 Mon Sep 17 00:00:00 2001
From: shawnlin <shawnlin@google.com>
Date: Mon, 7 Jun 2021 15:58:00 +0800
Subject: [PATCH 1339/1664] Play the nav bar animation for app launch from
 recent in live tile

Bug: 189278432
Test: manual - launch an app from recent in live tile mode
Change-Id: I9a39cdbbe0b8b9ee6d11a3ee53936d2fea699dd8
---
 .../android/quickstep/RecentsAnimationController.java    | 9 +++++++++
 quickstep/src/com/android/quickstep/TaskViewUtils.java   | 8 ++++++++
 .../src/com/android/quickstep/views/RecentsView.java     | 6 ++++++
 3 files changed, 23 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationController.java b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
index 50d0569cf2..0ebe13be8d 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationController.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
@@ -18,6 +18,7 @@ package com.android.quickstep;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
+import android.view.IRecentsAnimationController;
 import android.view.SurfaceControl;
 import android.window.PictureInPictureSurfaceTransaction;
 
@@ -162,6 +163,14 @@ public class RecentsAnimationController {
         UI_HELPER_EXECUTOR.execute(() -> mController.detachNavigationBarFromApp(moveHomeToTop));
     }
 
+    /**
+     * @see IRecentsAnimationController#animateNavigationBarToApp(long)
+     */
+    @UiThread
+    public void animateNavigationBarToApp(long duration) {
+        UI_HELPER_EXECUTOR.execute(() -> mController.animateNavigationBarToApp(duration));
+    }
+
     /**
      * Sets the final surface transaction on a Task. This is used by Launcher to notify the system
      * that animating Activity to PiP has completed and the associated task surface should be
diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java
index a59ba5136d..59bd1ed9ea 100644
--- a/quickstep/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java
@@ -263,6 +263,14 @@ public final class TaskViewUtils {
                         finalParams.applySurfaceParams(navBuilder.build());
                     }
                 });
+            } else if (inLiveTileMode) {
+                // There is no transition animation for app launch from recent in live tile mode so
+                // we have to trigger the navigation bar animation from system here.
+                final RecentsAnimationController controller =
+                        recentsView.getRecentsAnimationController();
+                if (controller != null) {
+                    controller.animateNavigationBarToApp(RECENTS_LAUNCH_DURATION);
+                }
             }
             topMostSimulator = tsv;
         }
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 74906ddac0..b7aca065bf 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -3843,4 +3843,10 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         // The Black blending is temporary until we have the proper color token.
         return ColorUtils.blendARGB(Color.BLACK, baseColor, 0.25f);
     }
+
+    /** Get the RecentsAnimationController */
+    @Nullable
+    public RecentsAnimationController getRecentsAnimationController() {
+        return mRecentsAnimationController;
+    }
 }
-- 
GitLab


From 7fca8705713aca91ca0c7124b1cb94e79ab17a78 Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pbdr@google.com>
Date: Fri, 4 Jun 2021 16:41:57 +0100
Subject: [PATCH 1340/1664] Improve local color extraction handling.

Local color extraction doesn't happen if the wallpaper is not currently
visible, so we don't need to add/remove the locations when the widget is
visible/hidden.

Also now compare the locations with some approximate measure, to account
for possibly slightly different calculations during drag vs drop.

Fix: 189827568
Test: Install Clock or test widgets and try to move them: the color are applied correcly.
Change-Id: Ib2a08bb0552c75bd351868e4fd5b5df8b8b732b2
---
 .../widget/LauncherAppWidgetHostView.java     | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
index 8685aae737..fad9b0b3c5 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
@@ -41,6 +41,7 @@ import android.widget.AdapterView;
 import android.widget.Advanceable;
 import android.widget.RemoteViews;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 
@@ -262,6 +263,10 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
 
         mIsAttachedToWindow = true;
         checkIfAutoAdvance();
+
+        if (mLastLocationRegistered != null) {
+            mColorExtractor.addLocation(List.of(mLastLocationRegistered));
+        }
     }
 
     @Override
@@ -366,7 +371,7 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         if (mTempRectF.isEmpty()) {
             return;
         }
-        if (!mTempRectF.equals(mLastLocationRegistered)) {
+        if (!isSameLocation(mTempRectF, mLastLocationRegistered, /* epsilon= */ 1e-6f)) {
             if (mLastLocationRegistered != null) {
                 mColorExtractor.removeLocations();
             }
@@ -375,6 +380,20 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         }
     }
 
+    // Compare two location rectangles. Locations are always in the [0;1] range.
+    private static boolean isSameLocation(@NonNull RectF rect1, @Nullable RectF rect2,
+            float epsilon) {
+        if (rect2 == null) return false;
+        return isSameCoordinate(rect1.left, rect2.left, epsilon)
+                && isSameCoordinate(rect1.right, rect2.right, epsilon)
+                && isSameCoordinate(rect1.top, rect2.top, epsilon)
+                && isSameCoordinate(rect1.bottom, rect2.bottom, epsilon);
+    }
+
+    private static boolean isSameCoordinate(float c1, float c2, float epsilon) {
+        return Math.abs(c1 - c2) < epsilon;
+    }
+
     @Override
     public void onColorsChanged(RectF rectF, SparseIntArray colors) {
         // setColorResources will reapply the view, which must happen in the UI thread.
@@ -391,14 +410,6 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
     protected void onWindowVisibilityChanged(int visibility) {
         super.onWindowVisibilityChanged(visibility);
         maybeRegisterAutoAdvance();
-
-        if (visibility == View.VISIBLE) {
-            if (mLastLocationRegistered != null) {
-                mColorExtractor.addLocation(List.of(mLastLocationRegistered));
-            }
-        } else {
-            mColorExtractor.removeLocations();
-        }
     }
 
     private void checkIfAutoAdvance() {
-- 
GitLab


From 2e4d15d2b519721361ab07768a96bdc21600f0d9 Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Fri, 4 Jun 2021 17:41:44 +0100
Subject: [PATCH 1341/1664] Make status bar icons visible in pin widget dialog
 scrim.

Use dark icons on status bar in light mode.

Bug: 189389865
Test: tested manually
Change-Id: I121fb59f52a9062ee301e1db3d8a3a7e9139ed5a
---
 res/values/styles.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 0c389aac0e..86dcf4cd53 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -315,5 +315,6 @@
 
     <style name="AddItemActivityTheme" parent="@android:style/Theme.Translucent.NoTitleBar">
         <item name="widgetsTheme">@style/WidgetContainerTheme</item>
+        <item name="android:windowLightStatusBar">true</item>
     </style>
 </resources>
-- 
GitLab


From db4ec8ac1a30f76237efce8e751529b013b34037 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 7 Jun 2021 18:37:22 +0100
Subject: [PATCH 1342/1664] Fix preview layout crash upon screen rotation

Preview layouts are rendered via LauncherAppWidgetHostView. These
layouts are not yet added to the launcher. And thus, there is no
LauncherAppWidgetInfo.

Test: When a preview layout is shown in the recommended widget section,
      rotate the screen. No crash is observed.
Bug: 190395009
Change-Id: Ib1d080a106681fbfe3a4293f9f51f9576ef9414b
---
 .../android/launcher3/widget/LauncherAppWidgetHostView.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
index 8685aae737..d9fb5f0e58 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
@@ -481,6 +481,10 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
             return;
         }
         LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) getTag();
+        if (info == null) {
+            // This occurs when LauncherAppWidgetHostView is used to render a preview layout.
+            return;
+        }
         // Remove and rebind the current widget (which was inflated in the wrong
         // orientation), but don't delete it from the database
         mLauncher.removeItem(this, info, false  /* deleteFromDb */);
-- 
GitLab


From 26ab4621ce5b4079c297c65cc94e33a0d98fe8a5 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 7 Jun 2021 14:56:12 -0700
Subject: [PATCH 1343/1664] Have AlphaUpdateListener update visibility in
 onAnimationEnd()

Previously we were only updating visibility in onAnimationSuccess(), which doesn't handle the canceled case.

Test: swipe up from nav bar twice in all apps, ensure all apps is invisible/non-interactable
Bug: 190315266
Change-Id: Ic59e6d4b404de4ee2d17c45d6fa59e2aee70c65f
---
 src/com/android/launcher3/anim/AlphaUpdateListener.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/anim/AlphaUpdateListener.java b/src/com/android/launcher3/anim/AlphaUpdateListener.java
index eabd283699..8dad1b4fa5 100644
--- a/src/com/android/launcher3/anim/AlphaUpdateListener.java
+++ b/src/com/android/launcher3/anim/AlphaUpdateListener.java
@@ -17,6 +17,7 @@
 package com.android.launcher3.anim;
 
 import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
 import android.animation.ValueAnimator;
 import android.animation.ValueAnimator.AnimatorUpdateListener;
 import android.view.View;
@@ -25,7 +26,7 @@ import android.view.ViewGroup;
 /**
  * A convenience class to update a view's visibility state after an alpha animation.
  */
-public class AlphaUpdateListener extends AnimationSuccessListener
+public class AlphaUpdateListener extends AnimatorListenerAdapter
         implements AnimatorUpdateListener {
     public static final float ALPHA_CUTOFF_THRESHOLD = 0.01f;
 
@@ -41,7 +42,7 @@ public class AlphaUpdateListener extends AnimationSuccessListener
     }
 
     @Override
-    public void onAnimationSuccess(Animator animator) {
+    public void onAnimationEnd(Animator animator) {
         updateVisibility(mView);
     }
 
-- 
GitLab


From 1fb6718c85e75a818eeb888208466f19677e8c72 Mon Sep 17 00:00:00 2001
From: zakcohen <zakcohen@google.com>
Date: Mon, 7 Jun 2021 14:54:15 -0700
Subject: [PATCH 1344/1664] DO NOT MERGE

Use focused task id for getting task size

When getting the selected task size, look at the focused task id, not
the running task id.
I believe this was a typo from the original change.

Bug: 190399315
Test: Local build and flash and run
Change-Id: Ice92e0562765f4f0142e27da0c38140df4c11425
---
 quickstep/src/com/android/quickstep/views/RecentsView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 74906ddac0..a46bc6b72d 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1358,7 +1358,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 mOrientationHandler);
         int taskWidth = mTempRect.width();
         int taskHeight = mTempRect.height();
-        if (mRunningTaskId != -1) {
+        if (mFocusedTaskId != -1) {
             int boxLength = Math.max(taskWidth, taskHeight);
             if (mFocusedTaskRatio > 1) {
                 taskWidth = boxLength;
-- 
GitLab


From ea56f849c2244e673d16995f16a852f50842c9bd Mon Sep 17 00:00:00 2001
From: thiruram <thiruram@google.com>
Date: Wed, 2 Jun 2021 16:02:37 -0700
Subject: [PATCH 1345/1664] [AA+] Reset search manager when exiting all apps.

This is required to log search session exits properly, especially when exiting AllApps without clearing search query.

Bug: 178562918
Test: Manual
Change-Id: Id4c1007b051e9efd9ae5929c274a70cf3ae3cbf1
---
 src/com/android/launcher3/Launcher.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 9aa7168f4e..578379b70d 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1076,9 +1076,10 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
             getRotationHelper().setCurrentStateRequest(REQUEST_NONE);
         }
 
-        if (mPrevLauncherState != state && !ALL_APPS.equals(state)
+        if (ALL_APPS.equals(mPrevLauncherState) && !ALL_APPS.equals(state)
                 // Making sure mAllAppsSessionLogId is not null to avoid double logging.
                 && mAllAppsSessionLogId != null) {
+            getAppsView().getSearchUiManager().resetSearch();
             getStatsLogManager().logger().log(LAUNCHER_ALLAPPS_EXIT);
             mAllAppsSessionLogId = null;
         }
-- 
GitLab


From fd9bfd3aabe8d1d249188b4e047a4389cdc282f1 Mon Sep 17 00:00:00 2001
From: Stevie Kideckel <kideckel@google.com>
Date: Mon, 7 Jun 2021 15:46:21 +0000
Subject: [PATCH 1346/1664] Fix accounting for the position/offset of headers
 with collapsing views

The offset should be taken before views are modified, the position
should be taken after. This fixes an off by one issue when expanding a
header below another already expanded header.

Bug: 183378651
Test: verified locally
Change-Id: I4987d57846d7bcde23b76280f800f19350b3521e
---
 .../widget/picker/WidgetsListAdapter.java     | 80 +++++++++++++------
 1 file changed, 57 insertions(+), 23 deletions(-)

diff --git a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
index 826c244a92..150bd9902f 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
@@ -202,11 +202,16 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
         mDiffReporter.process(mVisibleEntries, newVisibleEntries, mRowComparator);
     }
 
+    /** Returns whether {@code entry} matches {@link #mWidgetsContentVisiblePackageUserKey}. */
     private boolean isHeaderForVisibleContent(WidgetsListBaseEntry entry) {
+        return isHeaderForPackageUserKey(entry, mWidgetsContentVisiblePackageUserKey);
+    }
+
+    /** Returns whether {@code entry} matches {@code key}. */
+    private boolean isHeaderForPackageUserKey(WidgetsListBaseEntry entry, PackageUserKey key) {
         return (entry instanceof WidgetsListHeaderEntry
                 || entry instanceof WidgetsListSearchHeaderEntry)
-                && new PackageUserKey(entry.mPkgItem.packageName, entry.mPkgItem.user)
-                .equals(mWidgetsContentVisiblePackageUserKey);
+                && new PackageUserKey(entry.mPkgItem.packageName, entry.mPkgItem.user).equals(key);
     }
 
     /**
@@ -270,36 +275,68 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
 
     @Override
     public void onHeaderClicked(boolean showWidgets, PackageUserKey packageUserKey) {
+        // Ignore invalid clicks, such as collapsing a package that isn't currently expanded.
+        if (!showWidgets && !packageUserKey.equals(mWidgetsContentVisiblePackageUserKey)) return;
+
         if (showWidgets) {
             mWidgetsContentVisiblePackageUserKey = packageUserKey;
-            updateVisibleEntries();
-            // Scroll the layout manager to the header position to keep it anchored to the same
-            // position.
-            scrollToPositionAndMaintainOffset(getSelectedHeaderPosition());
             mLauncher.getStatsLogManager().logger().log(LAUNCHER_WIDGETSTRAY_APP_EXPANDED);
-        } else if (packageUserKey.equals(mWidgetsContentVisiblePackageUserKey)) {
-            OptionalInt previouslySelectedPosition = getSelectedHeaderPosition();
-
+        } else {
             mWidgetsContentVisiblePackageUserKey = null;
-            updateVisibleEntries();
-
-            // Scroll to the header that was just collapsed so it maintains its scroll offset.
-            scrollToPositionAndMaintainOffset(previouslySelectedPosition);
         }
+
+        // Get the current top of the header with the matching key before adjusting the visible
+        // entries.
+        OptionalInt topForPackageUserKey =
+                getOffsetForPosition(getPositionForPackageUserKey(packageUserKey));
+
+        updateVisibleEntries();
+
+        // Get the position for the clicked header after adjusting the visible entries. The
+        // position may have changed if another header had previously been expanded.
+        OptionalInt positionForPackageUserKey = getPositionForPackageUserKey(packageUserKey);
+        scrollToPositionAndMaintainOffset(positionForPackageUserKey, topForPackageUserKey);
     }
 
-    private OptionalInt getSelectedHeaderPosition() {
+    /**
+     * Returns the position of {@code key} in {@link #mVisibleEntries}, or  empty if it's not
+     * present.
+     */
+    private OptionalInt getPositionForPackageUserKey(PackageUserKey key) {
         return IntStream.range(0, mVisibleEntries.size())
-                .filter(index -> isHeaderForVisibleContent(mVisibleEntries.get(index)))
+                .filter(index -> isHeaderForPackageUserKey(mVisibleEntries.get(index), key))
                 .findFirst();
     }
 
     /**
-     * Scrolls to the selected header position. LinearLayoutManager scrolls the minimum distance
-     * necessary, so this will keep the selected header in place during clicks, without interrupting
-     * the animation.
+     * Returns the top of {@code positionOptional} in the recycler view, or empty if its view
+     * can't be found for any reason, including the position not being currently visible. The
+     * returned value does not include the top padding of the recycler view.
+     */
+    private OptionalInt getOffsetForPosition(OptionalInt positionOptional) {
+        if (!positionOptional.isPresent() || mRecyclerView == null) return OptionalInt.empty();
+
+        RecyclerView.LayoutManager layoutManager = mRecyclerView.getLayoutManager();
+        if (layoutManager == null) return OptionalInt.empty();
+
+        View view = layoutManager.findViewByPosition(positionOptional.getAsInt());
+        if (view == null) return OptionalInt.empty();
+
+        return OptionalInt.of(layoutManager.getDecoratedTop(view));
+    }
+
+    /**
+     * Scrolls to the selected header position with the provided offset. LinearLayoutManager
+     * scrolls the minimum distance necessary, so this will keep the selected header in place during
+     * clicks, without interrupting the animation.
+     *
+     * @param positionOptional The position too scroll to. No scrolling will be done if empty.
+     * @param offsetOptional The offset from the top to maintain. If empty, then the list will
+     *                       scroll to the top of the position.
      */
-    private void scrollToPositionAndMaintainOffset(OptionalInt positionOptional) {
+    private void scrollToPositionAndMaintainOffset(
+            OptionalInt positionOptional,
+            OptionalInt offsetOptional) {
         if (!positionOptional.isPresent() || mRecyclerView == null) return;
         int position = positionOptional.getAsInt();
 
@@ -317,12 +354,9 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
 
         // Scroll to the header view's current offset, accounting for the recycler view's padding.
         // If the header view couldn't be found, then it will appear at the top of the list.
-        View headerView = layoutManager.findViewByPosition(position);
-        int targetHeaderViewTop =
-                headerView == null ? 0 : layoutManager.getDecoratedTop(headerView);
         layoutManager.scrollToPositionWithOffset(
                 position,
-                targetHeaderViewTop - mRecyclerView.getPaddingTop());
+                offsetOptional.orElse(0) - mRecyclerView.getPaddingTop());
     }
 
     /**
-- 
GitLab


From 22b6039270bf85025a2e5c510539f736d4626700 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 7 Jun 2021 22:43:11 +0100
Subject: [PATCH 1347/1664] Exact widget sizes functionalities into an utility
 class

Test: resize widget, move widget, add widget.
Bug: 189975670
Change-Id: Ia0bc2297891e1cfa33697e985064db5d1dcdfc8b
---
 .../launcher3/AppWidgetResizeFrame.java       |  89 +----------
 src/com/android/launcher3/Workspace.java      |   6 +-
 .../LauncherAccessibilityDelegate.java        |   4 +-
 .../model/data/LauncherAppWidgetInfo.java     |   4 +-
 .../launcher3/qsb/QsbContainerView.java       |   6 +-
 .../widget/PendingAddWidgetInfo.java          |   4 +-
 .../launcher3/widget/util/WidgetSizes.java    | 145 ++++++++++++++++++
 7 files changed, 159 insertions(+), 99 deletions(-)
 create mode 100644 src/com/android/launcher3/widget/util/WidgetSizes.java

diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java
index 5d9797ff88..74ac8c24c4 100644
--- a/src/com/android/launcher3/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher3/AppWidgetResizeFrame.java
@@ -4,7 +4,6 @@ import static android.appwidget.AppWidgetHostView.getDefaultPaddingForWidget;
 
 import static com.android.launcher3.LauncherAnimUtils.LAYOUT_HEIGHT;
 import static com.android.launcher3.LauncherAnimUtils.LAYOUT_WIDTH;
-import static com.android.launcher3.Utilities.ATLEAST_S;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WIDGET_RESIZE_COMPLETED;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WIDGET_RESIZE_STARTED;
 import static com.android.launcher3.views.BaseDragLayer.LAYOUT_X;
@@ -13,18 +12,12 @@ import static com.android.launcher3.views.BaseDragLayer.LAYOUT_Y;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.PropertyValuesHolder;
-import android.appwidget.AppWidgetHostView;
-import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProviderInfo;
-import android.content.ComponentName;
 import android.content.Context;
-import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
-import android.os.Bundle;
 import android.util.AttributeSet;
-import android.util.SizeF;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
@@ -39,10 +32,10 @@ import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.util.PendingRequestArgs;
 import com.android.launcher3.widget.LauncherAppWidgetHostView;
 import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
+import com.android.launcher3.widget.util.WidgetSizes;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 public class AppWidgetResizeFrame extends AbstractFloatingView implements View.OnKeyListener {
     private static final int SNAP_DURATION = 150;
@@ -415,90 +408,12 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
             mRunningHInc += hSpanDelta;
 
             if (!onDismiss) {
-                updateWidgetSizeRanges(mWidgetView, mLauncher, spanX, spanY);
+                WidgetSizes.updateWidgetSizeRanges(mWidgetView, mLauncher, spanX, spanY);
             }
         }
         mWidgetView.requestLayout();
     }
 
-    public static void updateWidgetSizeRanges(
-            AppWidgetHostView widgetView, Context context, int spanX, int spanY) {
-        List<SizeF> sizes = getWidgetSizes(context, spanX, spanY);
-        if (ATLEAST_S) {
-            widgetView.updateAppWidgetSize(new Bundle(), sizes);
-        } else {
-            Rect bounds = getMinMaxSizes(sizes);
-            widgetView.updateAppWidgetSize(new Bundle(), bounds.left, bounds.top, bounds.right,
-                    bounds.bottom);
-        }
-    }
-
-    /** Returns the list of sizes for a widget of given span, in dp. */
-    public static ArrayList<SizeF> getWidgetSizes(Context context, int spanX, int spanY) {
-        ArrayList<SizeF> sizes = new ArrayList<>(2);
-        final float density = context.getResources().getDisplayMetrics().density;
-        Point cellSize = new Point();
-
-        for (DeviceProfile profile : LauncherAppState.getIDP(context).supportedProfiles) {
-            final float hBorderSpacing = (spanX - 1) * profile.cellLayoutBorderSpacingPx;
-            final float vBorderSpacing = (spanY - 1) * profile.cellLayoutBorderSpacingPx;
-            profile.getCellSize(cellSize);
-            sizes.add(new SizeF(
-                    ((spanX * cellSize.x) + hBorderSpacing) / density,
-                    ((spanY * cellSize.y) + vBorderSpacing) / density));
-        }
-        return sizes;
-    }
-
-    /**
-     * Returns the bundle to be used as the default options for a widget with provided size
-     */
-    public static Bundle getWidgetSizeOptions(
-            Context context, ComponentName provider, int spanX, int spanY) {
-        ArrayList<SizeF> sizes = getWidgetSizes(context, spanX, spanY);
-        Rect padding = getDefaultPaddingForWidget(context, provider, null);
-        float density = context.getResources().getDisplayMetrics().density;
-        float xPaddingDips = (padding.left + padding.right) / density;
-        float yPaddingDips = (padding.top + padding.bottom) / density;
-
-        ArrayList<SizeF> paddedSizes = sizes.stream()
-                .map(size -> new SizeF(
-                        Math.max(0.f, size.getWidth() - xPaddingDips),
-                        Math.max(0.f, size.getHeight() - yPaddingDips)))
-                .collect(Collectors.toCollection(ArrayList::new));
-
-        Rect rect = AppWidgetResizeFrame.getMinMaxSizes(paddedSizes);
-        Bundle options = new Bundle();
-        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH, rect.left);
-        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT, rect.top);
-        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH, rect.right);
-        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT, rect.bottom);
-        options.putParcelableArrayList(AppWidgetManager.OPTION_APPWIDGET_SIZES, paddedSizes);
-        return options;
-    }
-
-    /**
-     * Returns the min and max widths and heights given a list of sizes, in dp.
-     *
-     * @param sizes List of sizes to get the min/max from.
-     * @return A rectangle with the left (resp. top) is used for the min width (resp. height) and
-     * the right (resp. bottom) for the max. The returned rectangle is set with 0s if the list is
-     * empty.
-     */
-    private static Rect getMinMaxSizes(List<SizeF> sizes) {
-        if (sizes.isEmpty()) {
-            return new Rect();
-        } else {
-            SizeF first = sizes.get(0);
-            Rect result = new Rect((int) first.getWidth(), (int) first.getHeight(),
-                    (int) first.getWidth(), (int) first.getHeight());
-            for (int i = 1; i < sizes.size(); i++) {
-                result.union((int) sizes.get(i).getWidth(), (int) sizes.get(i).getHeight());
-            }
-            return result;
-        }
-    }
-
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index d136cdadd9..17c8edce6e 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -114,6 +114,7 @@ import com.android.launcher3.widget.PendingAddWidgetInfo;
 import com.android.launcher3.widget.PendingAppWidgetHostView;
 import com.android.launcher3.widget.WidgetManagerHelper;
 import com.android.launcher3.widget.dragndrop.AppWidgetHostViewDragListener;
+import com.android.launcher3.widget.util.WidgetSizes;
 import com.android.systemui.plugins.shared.LauncherOverlayManager.LauncherOverlay;
 
 import java.util.ArrayList;
@@ -1854,7 +1855,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
                     item.spanX = resultSpan[0];
                     item.spanY = resultSpan[1];
                     AppWidgetHostView awhv = (AppWidgetHostView) cell;
-                    AppWidgetResizeFrame.updateWidgetSizeRanges(awhv, mLauncher, resultSpan[0],
+                    WidgetSizes.updateWidgetSizeRanges(awhv, mLauncher, resultSpan[0],
                             resultSpan[1]);
                 }
 
@@ -2528,8 +2529,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
                     ((PendingAddWidgetInfo) pendingInfo).boundWidget : null;
 
             if (finalView != null && updateWidgetSize) {
-                AppWidgetResizeFrame.updateWidgetSizeRanges(finalView, mLauncher, item.spanX,
-                        item.spanY);
+                WidgetSizes.updateWidgetSizeRanges(finalView, mLauncher, item.spanX, item.spanY);
             }
 
             int animationStyle = ANIMATE_INTO_POSITION_AND_DISAPPEAR;
diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
index 2b36f19226..9faac5b7ef 100644
--- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
+++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
@@ -21,7 +21,6 @@ import android.view.View.AccessibilityDelegate;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
 
-import com.android.launcher3.AppWidgetResizeFrame;
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.ButtonDropTarget;
 import com.android.launcher3.CellLayout;
@@ -51,6 +50,7 @@ import com.android.launcher3.util.Thunk;
 import com.android.launcher3.views.OptionsPopupView;
 import com.android.launcher3.views.OptionsPopupView.OptionItem;
 import com.android.launcher3.widget.LauncherAppWidgetHostView;
+import com.android.launcher3.widget.util.WidgetSizes;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -367,7 +367,7 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
         }
 
         layout.markCellsAsOccupiedForView(host);
-        AppWidgetResizeFrame.updateWidgetSizeRanges(((LauncherAppWidgetHostView) host), mLauncher,
+        WidgetSizes.updateWidgetSizeRanges(((LauncherAppWidgetHostView) host), mLauncher,
                 info.spanX, info.spanY);
         host.requestLayout();
         mLauncher.getModelWriter().updateItemInDatabase(info);
diff --git a/src/com/android/launcher3/model/data/LauncherAppWidgetInfo.java b/src/com/android/launcher3/model/data/LauncherAppWidgetInfo.java
index 003b3bdc22..658c6e1dc6 100644
--- a/src/com/android/launcher3/model/data/LauncherAppWidgetInfo.java
+++ b/src/com/android/launcher3/model/data/LauncherAppWidgetInfo.java
@@ -26,13 +26,13 @@ import android.os.Process;
 
 import androidx.annotation.Nullable;
 
-import com.android.launcher3.AppWidgetResizeFrame;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.logger.LauncherAtom;
 import com.android.launcher3.util.ContentWriter;
 import com.android.launcher3.widget.LauncherAppWidgetHostView;
 import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
+import com.android.launcher3.widget.util.WidgetSizes;
 
 /**
  * Represents a widget (either instantiated or about to be) in the Launcher.
@@ -196,7 +196,7 @@ public class LauncherAppWidgetInfo extends ItemInfo {
      */
     public void onBindAppWidget(Launcher launcher, AppWidgetHostView hostView) {
         if (!mHasNotifiedInitialWidgetSizeChanged) {
-            AppWidgetResizeFrame.updateWidgetSizeRanges(hostView, launcher, spanX, spanY);
+            WidgetSizes.updateWidgetSizeRanges(hostView, launcher, spanX, spanY);
             mHasNotifiedInitialWidgetSizeChanged = true;
         }
     }
diff --git a/src/com/android/launcher3/qsb/QsbContainerView.java b/src/com/android/launcher3/qsb/QsbContainerView.java
index 22c3f58574..23ee251772 100644
--- a/src/com/android/launcher3/qsb/QsbContainerView.java
+++ b/src/com/android/launcher3/qsb/QsbContainerView.java
@@ -20,8 +20,6 @@ import static android.appwidget.AppWidgetManager.ACTION_APPWIDGET_BIND;
 import static android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID;
 import static android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_PROVIDER;
 
-import static com.android.launcher3.AppWidgetResizeFrame.getWidgetSizeOptions;
-
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.SearchManager;
@@ -49,6 +47,7 @@ import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.graphics.FragmentWithPreview;
+import com.android.launcher3.widget.util.WidgetSizes;
 
 /**
  * A frame layout which contains a QSB. This internally uses fragment to bind the view, which
@@ -292,7 +291,8 @@ public class QsbContainerView extends FrameLayout {
 
         protected Bundle createBindOptions() {
             InvariantDeviceProfile idp = LauncherAppState.getIDP(getContext());
-            return getWidgetSizeOptions(getContext(), mWidgetInfo.provider, idp.numColumns, 1);
+            return WidgetSizes.getWidgetSizeOptions(getContext(), mWidgetInfo.provider,
+                    idp.numColumns, 1);
         }
 
         protected View getDefaultView(ViewGroup container, boolean showSetupIcon) {
diff --git a/src/com/android/launcher3/widget/PendingAddWidgetInfo.java b/src/com/android/launcher3/widget/PendingAddWidgetInfo.java
index 3377abbb7b..c04c8dc8b5 100644
--- a/src/com/android/launcher3/widget/PendingAddWidgetInfo.java
+++ b/src/com/android/launcher3/widget/PendingAddWidgetInfo.java
@@ -15,7 +15,6 @@
  */
 package com.android.launcher3.widget;
 
-import static com.android.launcher3.AppWidgetResizeFrame.getWidgetSizeOptions;
 import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_TRAY;
 
 import android.appwidget.AppWidgetHostView;
@@ -24,6 +23,7 @@ import android.os.Bundle;
 
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.PendingAddItemInfo;
+import com.android.launcher3.widget.util.WidgetSizes;
 
 /**
  * Meta data used for late binding of {@link LauncherAppWidgetProviderInfo}.
@@ -61,6 +61,6 @@ public class PendingAddWidgetInfo extends PendingAddItemInfo {
     }
 
     public Bundle getDefaultSizeOptions(Context context) {
-        return getWidgetSizeOptions(context, componentName, spanX, spanY);
+        return WidgetSizes.getWidgetSizeOptions(context, componentName, spanX, spanY);
     }
 }
diff --git a/src/com/android/launcher3/widget/util/WidgetSizes.java b/src/com/android/launcher3/widget/util/WidgetSizes.java
new file mode 100644
index 0000000000..5c8ea7299b
--- /dev/null
+++ b/src/com/android/launcher3/widget/util/WidgetSizes.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget.util;
+
+import static android.appwidget.AppWidgetHostView.getDefaultPaddingForWidget;
+
+import static com.android.launcher3.Utilities.ATLEAST_S;
+
+import android.annotation.SuppressLint;
+import android.appwidget.AppWidgetHostView;
+import android.appwidget.AppWidgetManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.util.Size;
+import android.util.SizeF;
+
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.LauncherAppState;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/** A utility class for widget sizes related calculations. */
+public final class WidgetSizes {
+
+    /**
+     * Returns the list of all possible sizes, in dp, for a widget of given spans on this device.
+     */
+    public static ArrayList<SizeF> getWidgetSizes(Context context, int spanX, int spanY) {
+        ArrayList<SizeF> sizes = new ArrayList<>(2);
+        final float density = context.getResources().getDisplayMetrics().density;
+        final Point cellSize = new Point();
+
+        for (DeviceProfile profile : LauncherAppState.getIDP(context).supportedProfiles) {
+            Size widgetSizePx = getWidgetSizePx(profile, spanX, spanY, cellSize);
+            sizes.add(new SizeF(widgetSizePx.getWidth() / density,
+                    widgetSizePx.getHeight() / density));
+        }
+        return sizes;
+    }
+
+    /** Returns the size, in pixels, a widget of given spans & {@code profile}. */
+    public static Size getWidgetSizePx(DeviceProfile profile, int spanX, int spanY) {
+        return getWidgetSizePx(profile, spanX, spanY, /* recycledCellSize= */ null);
+    }
+
+    private static Size getWidgetSizePx(DeviceProfile profile, int spanX, int spanY,
+            @Nullable Point recycledCellSize) {
+        final int hBorderSpacing = (spanX - 1) * profile.cellLayoutBorderSpacingPx;
+        final int vBorderSpacing = (spanY - 1) * profile.cellLayoutBorderSpacingPx;
+        if (recycledCellSize == null) {
+            recycledCellSize = new Point();
+        }
+        profile.getCellSize(recycledCellSize);
+        return new Size(((spanX * recycledCellSize.x) + hBorderSpacing),
+                ((spanY * recycledCellSize.y) + vBorderSpacing));
+    }
+
+    /**
+     * Updates a given {@code widgetView} with size, {@code spanX}, {@code spanY}.
+     *
+     * <p>On Android S+, it also updates the given {@code widgetView} with a list of sizes derived
+     * from {@code spanX}, {@code spanY} in all supported device profiles.
+     */
+    @SuppressLint("NewApi") // Already added API check.
+    public static void updateWidgetSizeRanges(AppWidgetHostView widgetView, Context context,
+            int spanX, int spanY) {
+        List<SizeF> sizes = getWidgetSizes(context, spanX, spanY);
+        if (ATLEAST_S) {
+            widgetView.updateAppWidgetSize(new Bundle(), sizes);
+        } else {
+            Rect bounds = getMinMaxSizes(sizes);
+            widgetView.updateAppWidgetSize(new Bundle(), bounds.left, bounds.top, bounds.right,
+                    bounds.bottom);
+        }
+    }
+
+    /**
+     * Returns the bundle to be used as the default options for a widget with provided size.
+     */
+    public static Bundle getWidgetSizeOptions(Context context, ComponentName provider, int spanX,
+            int spanY) {
+        ArrayList<SizeF> sizes = getWidgetSizes(context, spanX, spanY);
+        Rect padding = getDefaultPaddingForWidget(context, provider, null);
+        float density = context.getResources().getDisplayMetrics().density;
+        float xPaddingDips = (padding.left + padding.right) / density;
+        float yPaddingDips = (padding.top + padding.bottom) / density;
+
+        ArrayList<SizeF> paddedSizes = sizes.stream()
+                .map(size -> new SizeF(
+                        Math.max(0.f, size.getWidth() - xPaddingDips),
+                        Math.max(0.f, size.getHeight() - yPaddingDips)))
+                .collect(Collectors.toCollection(ArrayList::new));
+
+        Rect rect = getMinMaxSizes(paddedSizes);
+        Bundle options = new Bundle();
+        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH, rect.left);
+        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT, rect.top);
+        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH, rect.right);
+        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT, rect.bottom);
+        options.putParcelableArrayList(AppWidgetManager.OPTION_APPWIDGET_SIZES, paddedSizes);
+        return options;
+    }
+
+    /**
+     * Returns the min and max widths and heights given a list of sizes, in dp.
+     *
+     * @param sizes List of sizes to get the min/max from.
+     * @return A rectangle with the left (resp. top) is used for the min width (resp. height) and
+     * the right (resp. bottom) for the max. The returned rectangle is set with 0s if the list is
+     * empty.
+     */
+    private static Rect getMinMaxSizes(List<SizeF> sizes) {
+        if (sizes.isEmpty()) {
+            return new Rect();
+        } else {
+            SizeF first = sizes.get(0);
+            Rect result = new Rect((int) first.getWidth(), (int) first.getHeight(),
+                    (int) first.getWidth(), (int) first.getHeight());
+            for (int i = 1; i < sizes.size(); i++) {
+                result.union((int) sizes.get(i).getWidth(), (int) sizes.get(i).getHeight());
+            }
+            return result;
+        }
+    }
+}
-- 
GitLab


From 7e06df2b50461b9f2cef5b7b00eeba1fefd74bb7 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 7 Jun 2021 23:46:03 +0100
Subject: [PATCH 1348/1664] Use WidgetSizes to estimate widget size instead of
 custom calculation

Also fix 2 bugs in WidgetCell
1. preview layout: padding is added to the AppWidgetHostView rather
   than the preview container. We shouldn't add padding to the size
   of the preview container.
2. widget_preview_shortcut_padding is a padding added to shortcuts but
    not widgets.

Test: Open full widgets picker and observe widgets are rendered
      correctly in the widgets recommendation table. Also, observe
      the generated bitmap images are correctly rendered.
      Run AddWidgetTest.
Bug: 189975670
Change-Id: I00db3200e0b61dc5e82f3c4bfdf34e197ea20314
---
 .../launcher3/WidgetPreviewLoader.java        | 12 ++++------
 .../android/launcher3/widget/WidgetCell.java  | 23 +++++++++----------
 .../WidgetsRecommendationTableLayout.java     | 11 +++++----
 3 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java
index c7323d025b..ff3584acd3 100644
--- a/src/com/android/launcher3/WidgetPreviewLoader.java
+++ b/src/com/android/launcher3/WidgetPreviewLoader.java
@@ -27,10 +27,10 @@ import android.os.AsyncTask;
 import android.os.CancellationSignal;
 import android.os.Process;
 import android.os.UserHandle;
-import android.util.ArrayMap;
 import android.util.Log;
 import android.util.LongSparseArray;
 import android.util.Pair;
+import android.util.Size;
 
 import androidx.annotation.Nullable;
 
@@ -50,6 +50,7 @@ import com.android.launcher3.util.Thunk;
 import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.WidgetCell;
 import com.android.launcher3.widget.WidgetManagerHelper;
+import com.android.launcher3.widget.util.WidgetSizes;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -79,9 +80,6 @@ public class WidgetPreviewLoader {
     private final UserCache mUserCache;
     private final CacheDb mDb;
 
-    private final UserHandle mMyUser = Process.myUserHandle();
-    private final ArrayMap<UserHandle, Bitmap> mUserBadges = new ArrayMap<>();
-
     public WidgetPreviewLoader(Context context, IconCache iconCache) {
         mContext = context;
         mIconCache = iconCache;
@@ -366,9 +364,9 @@ public class WidgetPreviewLoader {
             previewHeight = drawable.getIntrinsicHeight();
         } else {
             DeviceProfile dp = launcher.getDeviceProfile();
-            int tileSize = Math.min(dp.cellWidthPx, dp.cellHeightPx);
-            previewWidth = tileSize * spanX;
-            previewHeight = tileSize * spanY;
+            Size widgetSize = WidgetSizes.getWidgetSizePx(dp, spanX, spanY);
+            previewWidth = widgetSize.getWidth();
+            previewHeight = widgetSize.getHeight();
         }
 
         // Scale to fit width only - let the widget preview be clipped in the
diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index e1999c9c3a..b1ccfd9591 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -21,12 +21,12 @@ import static com.android.launcher3.Utilities.ATLEAST_S;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
-import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.CancellationSignal;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.util.Size;
 import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
@@ -48,6 +48,7 @@ import com.android.launcher3.WidgetPreviewLoader;
 import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.icons.RoundDrawableWrapper;
 import com.android.launcher3.model.WidgetItem;
+import com.android.launcher3.widget.util.WidgetSizes;
 
 /**
  * Represents the individual cell of the widget inside the widget tray. The preview is drawn
@@ -96,7 +97,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     protected final BaseActivity mActivity;
     private final CheckLongPressHelper mLongPressHelper;
     private final float mEnforcedCornerRadius;
-    private final int mPreviewPadding;
+    private final int mShortcutPreviewPadding;
 
     private RemoteViews mRemoteViewsPreview;
     private NavigableAppWidgetHostView mAppWidgetHostViewPreview;
@@ -114,14 +115,14 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
 
         mActivity = BaseActivity.fromContext(context);
         mLongPressHelper = new CheckLongPressHelper(this);
-
         mLongPressHelper.setLongPressTimeoutFactor(1);
+
         setContainerWidth();
         setWillNotDraw(false);
         setClipToPadding(false);
         setAccessibilityDelegate(mActivity.getAccessibilityDelegate());
         mEnforcedCornerRadius = RoundedCornerEnforcement.computeEnforcedRadius(context);
-        mPreviewPadding =
+        mShortcutPreviewPadding =
                 2 * getResources().getDimensionPixelSize(R.dimen.widget_preview_shortcut_padding);
     }
 
@@ -200,6 +201,8 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
         mWidgetPreviewLoader = loader;
         if (item.activityInfo != null) {
             setTag(new PendingAddShortcutInfo(item.activityInfo));
+            mPreviewWidth += mShortcutPreviewPadding;
+            mPreviewHeight += mShortcutPreviewPadding;
         } else {
             setTag(new PendingAddWidgetInfo(item.widgetInfo));
         }
@@ -251,8 +254,6 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
         }
         appWidgetHostViewPreview.setPadding(padding.left, padding.top, padding.right,
                 padding.bottom);
-        mPreviewWidth += padding.left + padding.right;
-        mPreviewHeight += padding.top + padding.bottom;
         appWidgetHostViewPreview.updateAppWidget(remoteViews);
     }
 
@@ -299,7 +300,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
             float scale = 1f;
             if (getWidth() > 0 && getHeight() > 0) {
                 // Scale down the preview size if it's wider than the cell.
-                float maxWidth = getWidth() - mPreviewPadding;
+                float maxWidth = getWidth();
                 float previewWidth = drawable.getIntrinsicWidth() * mPreviewScale;
                 scale = Math.min(maxWidth / previewWidth, 1);
             }
@@ -355,11 +356,9 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     /** Sets the widget preview image size, in number of cells, and preview scale. */
     public void setPreviewSize(int spanX, int spanY, float previewScale) {
         DeviceProfile deviceProfile = mActivity.getDeviceProfile();
-        Point cellSize = deviceProfile.getCellSize();
-        mPreviewWidth = cellSize.x * spanX + mPreviewPadding
-                + deviceProfile.cellLayoutBorderSpacingPx * (spanX - 1);
-        mPreviewHeight = cellSize.y * spanY + mPreviewPadding
-                + deviceProfile.cellLayoutBorderSpacingPx * (spanY - 1);
+        Size widgetSize = WidgetSizes.getWidgetSizePx(deviceProfile, spanX, spanY);
+        mPreviewWidth = widgetSize.getWidth();
+        mPreviewHeight = widgetSize.getHeight();
         mPreviewScale = previewScale;
     }
 
diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
index 62ef4ff64e..9167d870e3 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
@@ -18,6 +18,7 @@ package com.android.launcher3.widget.picker;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.util.Size;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -33,6 +34,7 @@ import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.widget.WidgetCell;
+import com.android.launcher3.widget.util.WidgetSizes;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -44,7 +46,6 @@ public final class WidgetsRecommendationTableLayout extends TableLayout {
     private static final float MAX_DOWN_SCALE_RATIO = 0.5f;
     private final float mWidgetsRecommendationTableVerticalPadding;
     private final float mWidgetCellTextViewsHeight;
-    private final float mWidgetPreviewPadding;
 
     private float mRecommendationTableMaxHeight = Float.MAX_VALUE;
     @Nullable private OnLongClickListener mWidgetCellOnLongClickListener;
@@ -61,8 +62,6 @@ public final class WidgetsRecommendationTableLayout extends TableLayout {
         mWidgetsRecommendationTableVerticalPadding = 2 * getResources()
                 .getDimensionPixelSize(R.dimen.widget_cell_vertical_padding);
         mWidgetCellTextViewsHeight = 4 * getResources().getDimension(R.dimen.widget_cell_font_size);
-        mWidgetPreviewPadding = 2 * getResources()
-                .getDimensionPixelSize(R.dimen.widget_preview_shortcut_padding);
     }
 
     /** Sets a {@link android.view.View.OnLongClickListener} for all widget cells in this table. */
@@ -149,8 +148,10 @@ public final class WidgetsRecommendationTableLayout extends TableLayout {
             List<WidgetItem> widgetItems = recommendedWidgetsInTable.get(i);
             float rowHeight = 0;
             for (int j = 0; j < widgetItems.size(); j++) {
-                float previewHeight = widgetItems.get(j).spanY * deviceProfile.cellHeightPx
-                        * previewScale + mWidgetPreviewPadding;
+                WidgetItem widgetItem = widgetItems.get(j);
+                Size widgetSize = WidgetSizes.getWidgetSizePx(
+                        deviceProfile, widgetItem.spanX, widgetItem.spanY);
+                float previewHeight = widgetSize.getHeight() * previewScale;
                 rowHeight = Math.max(rowHeight, previewHeight + mWidgetCellTextViewsHeight);
             }
             totalHeight += rowHeight;
-- 
GitLab


From 1d47d8c705928870badfb510056ec2b16f3a093c Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Tue, 1 Jun 2021 22:58:37 +0100
Subject: [PATCH 1349/1664] Use grid size as the upper bound for widgets'
 default size in initSpans

Test: In Pixel 4, drag a monthly view Google calendar widget to a new
      home page from the full widgets picker. The widget outline is
      correctly shown.
Bug: 189060113
Change-Id: I33113b29cc8923098de95f1d5eb14c2b02429de1
---
 .../LauncherAppWidgetProviderInfoTest.java    | 74 +++++++++++++++++++
 .../widget/LauncherAppWidgetProviderInfo.java | 47 +++++++++++-
 .../android/launcher3/model/WidgetsModel.java |  8 +-
 3 files changed, 122 insertions(+), 7 deletions(-)

diff --git a/robolectric_tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java b/robolectric_tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java
index d18138f8d2..c7286e5676 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java
@@ -40,6 +40,8 @@ import org.robolectric.RuntimeEnvironment;
 public final class LauncherAppWidgetProviderInfoTest {
 
     private static final int CELL_SIZE = 50;
+    private static final int NUM_OF_COLS = 4;
+    private static final int NUM_OF_ROWS = 5;
 
     private Context mContext;
 
@@ -75,6 +77,33 @@ public final class LauncherAppWidgetProviderInfoTest {
         assertThat(info.spanY).isEqualTo(2);
     }
 
+    @Test
+    public void
+            initSpans_minWidthLargerThanGridColumns_shouldInitializeSpansToAtMostTheGridColumns() {
+        LauncherAppWidgetProviderInfo info = new LauncherAppWidgetProviderInfo();
+        info.minWidth = CELL_SIZE * (NUM_OF_COLS + 1);
+        info.minHeight = 20;
+        InvariantDeviceProfile idp = createIDP();
+
+        info.initSpans(mContext, idp);
+
+        assertThat(info.spanX).isEqualTo(NUM_OF_COLS);
+        assertThat(info.spanY).isEqualTo(1);
+    }
+
+    @Test
+    public void initSpans_minHeightLargerThanGridRows_shouldInitializeSpansToAtMostTheGridRows() {
+        LauncherAppWidgetProviderInfo info = new LauncherAppWidgetProviderInfo();
+        info.minWidth = 20;
+        info.minHeight = 50 * (NUM_OF_ROWS + 1);
+        InvariantDeviceProfile idp = createIDP();
+
+        info.initSpans(mContext, idp);
+
+        assertThat(info.spanX).isEqualTo(1);
+        assertThat(info.spanY).isEqualTo(NUM_OF_ROWS);
+    }
+
     @Test
     public void initSpans_minResizeWidthUnspecified_shouldInitializeMinSpansToOne() {
         LauncherAppWidgetProviderInfo info = new LauncherAppWidgetProviderInfo();
@@ -153,6 +182,49 @@ public final class LauncherAppWidgetProviderInfoTest {
         assertThat(info.minSpanY).isEqualTo(3);
     }
 
+    @Test
+    public void isMinSizeFulfilled_minWidthAndHeightWithinGridSize_shouldReturnTrue() {
+        LauncherAppWidgetProviderInfo info = new LauncherAppWidgetProviderInfo();
+        info.minWidth = 80;
+        info.minHeight = 80;
+        info.minResizeWidth = 50;
+        info.minResizeHeight = 50;
+        InvariantDeviceProfile idp = createIDP();
+
+        info.initSpans(mContext, idp);
+
+        assertThat(info.isMinSizeFulfilled()).isTrue();
+    }
+
+    @Test
+    public void
+            isMinSizeFulfilled_minWidthAndMinResizeWidthExceededGridColumns_shouldReturnFalse() {
+        LauncherAppWidgetProviderInfo info = new LauncherAppWidgetProviderInfo();
+        info.minWidth = CELL_SIZE * (NUM_OF_COLS + 2);
+        info.minHeight = 80;
+        info.minResizeWidth = CELL_SIZE * (NUM_OF_COLS + 1);
+        info.minResizeHeight = 50;
+        InvariantDeviceProfile idp = createIDP();
+
+        info.initSpans(mContext, idp);
+
+        assertThat(info.isMinSizeFulfilled()).isFalse();
+    }
+
+    @Test
+    public void isMinSizeFulfilled_minHeightAndMinResizeHeightExceededGridRows_shouldReturnFalse() {
+        LauncherAppWidgetProviderInfo info = new LauncherAppWidgetProviderInfo();
+        info.minWidth = 80;
+        info.minHeight = CELL_SIZE * (NUM_OF_ROWS + 2);
+        info.minResizeWidth = 50;
+        info.minResizeHeight = CELL_SIZE * (NUM_OF_ROWS + 1);
+        InvariantDeviceProfile idp = createIDP();
+
+        info.initSpans(mContext, idp);
+
+        assertThat(info.isMinSizeFulfilled()).isFalse();
+    }
+
     private InvariantDeviceProfile createIDP() {
         DeviceProfile profile = Mockito.mock(DeviceProfile.class);
         doAnswer(i -> {
@@ -163,6 +235,8 @@ public final class LauncherAppWidgetProviderInfoTest {
 
         InvariantDeviceProfile idp = new InvariantDeviceProfile();
         idp.supportedProfiles.add(profile);
+        idp.numColumns = NUM_OF_COLS;
+        idp.numRows = NUM_OF_ROWS;
         return idp;
     }
 
diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java b/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
index 14108f614c..5a29171361 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
@@ -32,13 +32,44 @@ public class LauncherAppWidgetProviderInfo extends AppWidgetProviderInfo
 
     public static final String CLS_CUSTOM_WIDGET_PREFIX = "#custom-widget-";
 
+    /**
+     * The desired number of cells that this widget occupies horizontally in
+     * {@link com.android.launcher3.CellLayout}.
+     */
     public int spanX;
+
+    /**
+     * The desired number of cells that this widget occupies vertically in
+     * {@link com.android.launcher3.CellLayout}.
+     */
     public int spanY;
+
+    /**
+     * The minimum number of cells that this widget can occupy horizontally in
+     * {@link com.android.launcher3.CellLayout}.
+     */
     public int minSpanX;
+
+    /**
+     * The minimum number of cells that this widget can occupy vertically in
+     * {@link com.android.launcher3.CellLayout}.
+     */
     public int minSpanY;
+
+    /**
+     * The maximum number of cells that this widget can occupy horizontally in
+     * {@link com.android.launcher3.CellLayout}.
+     */
     public int maxSpanX;
+
+    /**
+     * The maximum number of cells that this widget can occupy vertically in
+     * {@link com.android.launcher3.CellLayout}.
+     */
     public int maxSpanY;
 
+    private boolean mIsMinSizeFulfilled;
+
     public static LauncherAppWidgetProviderInfo fromProviderInfo(Context context,
             AppWidgetProviderInfo info) {
         final LauncherAppWidgetProviderInfo launcherInfo;
@@ -133,8 +164,20 @@ public class LauncherAppWidgetProviderInfo extends AppWidgetProviderInfo
         this.minSpanY = minSpanY;
         this.maxSpanX = maxSpanX;
         this.maxSpanY = maxSpanY;
-        this.spanX = spanX;
-        this.spanY = spanY;
+        this.mIsMinSizeFulfilled = Math.min(spanX, minSpanX) <= idp.numColumns
+            && Math.min(spanY, minSpanY) <= idp.numRows;
+        // Ensures the default span X and span Y will not exceed the current grid size.
+        this.spanX = Math.min(spanX, idp.numColumns);
+        this.spanY = Math.min(spanY, idp.numRows);
+    }
+
+    /**
+     * Returns {@code true} if the widget's minimum size requirement can be fulfilled in the device
+     * grid setting, {@link InvariantDeviceProfile}, that was passed in
+     * {@link #initSpans(Context, InvariantDeviceProfile)}.
+     */
+    public boolean isMinSizeFulfilled() {
+        return mIsMinSizeFulfilled;
     }
 
     private int getSpanX(Rect widgetPadding, int widgetWidth, int cellSpacing, float cellWidth) {
diff --git a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
index be18e546d2..51c5b12b6e 100644
--- a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
+++ b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
@@ -254,13 +254,11 @@ public class WidgetsModel {
                 }
 
                 // Ensure that all widgets we show can be added on a workspace of this size
-                int minSpanX = Math.min(item.widgetInfo.spanX, item.widgetInfo.minSpanX);
-                int minSpanY = Math.min(item.widgetInfo.spanY, item.widgetInfo.minSpanY);
-                if (minSpanX > mIdp.numColumns || minSpanY > mIdp.numRows) {
+                if (!item.widgetInfo.isMinSizeFulfilled()) {
                     if (DEBUG) {
                         Log.d(TAG, String.format(
-                                "Widget %s : (%d X %d) can't fit on this device",
-                                item.componentName, minSpanX, minSpanY));
+                                "Widget %s : can't fit on this device with a grid size: %dx%d",
+                                item.componentName, mIdp.numColumns, mIdp.numRows));
                     }
                     return false;
                 }
-- 
GitLab


From 9b4448f4776ff2be373f1d53b3893bd4b8757d98 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Tue, 8 Jun 2021 10:55:58 -0700
Subject: [PATCH 1350/1664] Set folder dot color to spec.

Bug: 188095988
Test: manual
Change-Id: Idf4d7f7b8f95d1d112ece8cd03d9c7d441a5fe0f
---
 res/values-v31/colors.xml | 2 ++
 res/values/colors.xml     | 2 ++
 res/values/styles.xml     | 6 +++---
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/res/values-v31/colors.xml b/res/values-v31/colors.xml
index 7b37001ade..a9721a4434 100644
--- a/res/values-v31/colors.xml
+++ b/res/values-v31/colors.xml
@@ -37,4 +37,6 @@
 
     <color name="wallpaper_popup_scrim">@android:color/system_neutral1_900</color>
 
+    <color name="folder_dot_color">@android:color/system_accent2_50</color>
+
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index c2b07e022d..7aab4fa88c 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -59,6 +59,8 @@
     <color name="folder_hint_text_color_light">#FFF</color>
     <color name="folder_hint_text_color_dark">#FF000000</color>
 
+    <color name="folder_dot_color">?attr/colorPrimary</color>
+
     <color name="text_color_primary_dark">#FFFFFFFF</color>
     <color name="text_color_secondary_dark">#FFFFFFFF</color>
     <color name="text_color_tertiary_dark">#CCFFFFFF</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 86dcf4cd53..571377cd3f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -47,7 +47,7 @@
         <item name="workspaceKeyShadowColor">#89000000</item>
         <item name="workspaceStatusBarScrim">@drawable/workspace_bg</item>
         <item name="widgetsTheme">@style/WidgetContainerTheme</item>
-        <item name="folderDotColor">?android:attr/colorPrimary</item>
+        <item name="folderDotColor">@color/folder_dot_color</item>
         <item name="folderFillColor">?android:attr/colorBackgroundFloating</item>
         <item name="folderIconBorderColor">?android:attr/colorPrimary</item>
         <item name="folderTextColor">?android:attr/textColorPrimary</item>
@@ -86,7 +86,7 @@
         <item name="workspaceKeyShadowColor">@android:color/transparent</item>
         <item name="isWorkspaceDarkText">true</item>
         <item name="workspaceStatusBarScrim">@null</item>
-        <item name="folderDotColor">#FF464646</item>
+        <item name="folderDotColor">@color/folder_dot_color</item>
         <item name="folderFillColor">?android:attr/colorBackgroundFloating</item>
         <item name="folderIconBorderColor">#FF80868B</item>
         <item name="folderTextColor">?attr/workspaceTextColor</item>
@@ -108,7 +108,7 @@
         <item name="popupColorSecondary">@color/popup_color_secondary_dark</item>
         <item name="popupColorTertiary">@color/popup_color_tertiary_dark</item>
         <item name="widgetsTheme">@style/WidgetContainerTheme.Dark</item>
-        <item name="folderDotColor">?android:attr/colorPrimary</item>
+        <item name="folderDotColor">@color/folder_dot_color</item>
         <item name="folderFillColor">?android:attr/colorBackgroundFloating</item>
         <item name="folderIconBorderColor">?android:attr/colorPrimary</item>
         <item name="folderTextColor">?android:attr/textColorPrimary</item>
-- 
GitLab


From e721f7272c96328ca272709a1367893608f8d144 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Tue, 8 Jun 2021 13:30:56 -0500
Subject: [PATCH 1351/1664] Fix wrong highlighted personal | work tab

Bug: 189915880
Test: Manual
Change-Id: I3e8687038d4f0bfdd1c5b7d8c444520730a2bcd4
---
 .../launcher3/workprofile/PersonalWorkSlidingTabStrip.java       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java b/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
index 8f9cdc8a4c..59ada7b518 100644
--- a/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
+++ b/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
@@ -126,6 +126,7 @@ public class PersonalWorkSlidingTabStrip extends LinearLayout implements PageInd
     @Override
     public void setActiveMarker(int activePage) {
         updateTabTextColor(activePage);
+        updateIndicatorPosition(activePage);
         if (mOnActivePageChangedListener != null && mLastActivePage != activePage) {
             mOnActivePageChangedListener.onActivePageChanged(activePage);
         }
-- 
GitLab


From 284eef2bf91daddd8d07b16b83b7a680eb728dc6 Mon Sep 17 00:00:00 2001
From: zakcohen <zakcohen@google.com>
Date: Fri, 4 Jun 2021 13:49:04 -0700
Subject: [PATCH 1352/1664] Re-enable swipe up view inflation test.

Disable chips by default as they are not plan of record for launch.

Bug: 141579810
Test: Local and ran test
Change-Id: Iae270c6ac4bbec4f7c29b1137cf926383443e85e
---
 .../android/quickstep/ViewInflationDuringSwipeUp.java    | 9 +++++----
 src/com/android/launcher3/config/FeatureFlags.java       | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java b/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java
index 4ca1f593c9..b4329c1765 100644
--- a/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java
+++ b/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java
@@ -43,7 +43,6 @@ import android.view.ViewConfiguration;
 import android.widget.RemoteViews;
 
 import androidx.test.filters.LargeTest;
-import androidx.test.filters.Suppress;
 import androidx.test.runner.AndroidJUnit4;
 import androidx.test.uiautomator.By;
 import androidx.test.uiautomator.UiDevice;
@@ -79,10 +78,7 @@ import java.util.function.IntConsumer;
  *        directly (ex: new LinearLayout)
  *    Using ExtendedMockito: Mocking static methods from platform classes (loaded in zygote) makes
  *        the main thread extremely slow and untestable
- *
- * Suppressed until b/141579810 is resolved
  */
-@Suppress
 @LargeTest
 @RunWith(AndroidJUnit4.class)
 public class ViewInflationDuringSwipeUp extends AbstractQuickStepTest {
@@ -188,6 +184,11 @@ public class ViewInflationDuringSwipeUp extends AbstractQuickStepTest {
             LauncherSettings.Settings.call(mResolver,
                     LauncherSettings.Settings.METHOD_CLEAR_EMPTY_DB_FLAG);
             LauncherAppWidgetProviderInfo info = TestViewHelpers.findWidgetProvider(this, false);
+            // Make sure the widget is big enough to show a list of items
+            info.minSpanX = 2;
+            info.minSpanY = 2;
+            info.spanX = 2;
+            info.spanY = 2;
             LauncherAppWidgetInfo item = createWidgetInfo(info, getTargetContext(), true);
 
             addItemToScreen(item);
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index ab72a077a1..0e710b7898 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -93,7 +93,7 @@ public final class FeatureFlags {
 
     // Keep as DeviceFlag to allow remote disable in emergency.
     public static final BooleanFlag ENABLE_SUGGESTED_ACTIONS_OVERVIEW = new DeviceFlag(
-            "ENABLE_SUGGESTED_ACTIONS_OVERVIEW", true, "Show chip hints on the overview screen");
+            "ENABLE_SUGGESTED_ACTIONS_OVERVIEW", false, "Show chip hints on the overview screen");
 
 
     public static final BooleanFlag ENABLE_DEVICE_SEARCH = new DeviceFlag(
-- 
GitLab


From 76877fda732a657086755a47a885ccf7b58aaa5e Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Tue, 8 Jun 2021 21:51:47 -0700
Subject: [PATCH 1353/1664] Update blur radius

Bug: 189976220
Test: manual
Change-Id: If5e6d6be7314dacfad8c501a5ae2da6556ca3cea
---
 quickstep/res/values/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/res/values/config.xml b/quickstep/res/values/config.xml
index b2ff7709d4..f22a9d7dbe 100644
--- a/quickstep/res/values/config.xml
+++ b/quickstep/res/values/config.xml
@@ -37,5 +37,5 @@
 
     <string name="wellbeing_provider_pkg" translatable="false"/>
 
-    <integer name="max_depth_blur_radius">150</integer>
+    <integer name="max_depth_blur_radius">72</integer>
 </resources>
-- 
GitLab


From 206db75b872058ceb68776efa464bd663cca7ac5 Mon Sep 17 00:00:00 2001
From: Pat Manning <patmanning@google.com>
Date: Thu, 3 Jun 2021 15:01:49 +0000
Subject: [PATCH 1354/1664] [DO NOT MERGE] Animate live tile translation and
 update live tile page scroll on dismissal of non-live tile tasks.

Test: manual
Fix: 188453992
Bug: 188453992
Change-Id: I661c7a2900118ea02e4947feed99308d1a3a5619
---
 .../com/android/quickstep/views/RecentsView.java   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 27f2078580..7991614abb 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2198,7 +2198,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 .setDampingRatio(rp.getFloat(R.dimen.dismiss_task_trans_y_damping_ratio))
                 .setStiffness(rp.getFloat(R.dimen.dismiss_task_trans_y_stiffness));
         FloatProperty<TaskView> dismissingTaskViewTranslate =
-                taskView.getSecondaryDissmissTranslationProperty();;
+                taskView.getSecondaryDissmissTranslationProperty();
         // TODO(b/186800707) translate entire grid size distance
         int translateDistance = mOrientationHandler.getSecondaryDimension(taskView);
         int positiveNegativeFactor = mOrientationHandler.getSecondaryTranslationDirectionFactor();
@@ -2231,7 +2231,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         anim.add(ObjectAnimator.ofFloat(taskView, dismissingTaskViewTranslate,
                 positiveNegativeFactor * translateDistance * 2).setDuration(duration), LINEAR, sp);
 
-        if (LIVE_TILE.get() && taskView.isRunningTask()) {
+        if (LIVE_TILE.get() && mEnableDrawingLiveTile && taskView.isRunningTask()) {
             anim.addOnFrameCallback(() -> {
                 mLiveTileTaskViewSimulator.taskSecondaryTranslation.value =
                         mOrientationHandler.getSecondaryValue(
@@ -2311,6 +2311,15 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                     anim.setFloat(child, translationProperty, scrollDiff, clampToProgress(LINEAR,
                             Utilities.boundToRange(INITIAL_DISMISS_TRANSLATION_INTERPOLATION_OFFSET
                                     + additionalDismissDuration, 0f, 1f), 1));
+                    if (LIVE_TILE.get() && mEnableDrawingLiveTile && child instanceof TaskView
+                            && ((TaskView) child).isRunningTask()) {
+                        anim.addOnFrameCallback(() -> {
+                            mLiveTileTaskViewSimulator.taskPrimaryTranslation.value =
+                                    mOrientationHandler.getPrimaryValue(child.getTranslationX(),
+                                            child.getTranslationY());
+                            redrawLiveTile();
+                        });
+                    }
                     needsCurveUpdates = true;
                 }
             } else if (child instanceof TaskView) {
@@ -2391,6 +2400,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                         startHome();
                     } else {
                         snapToPageImmediately(pageToSnapTo);
+                        dispatchScrollChanged();
                         // Grid got messed up, reapply.
                         updateGridProperties(true);
                         if (showAsGrid() && getFocusedTaskView() == null
-- 
GitLab


From afa327d176b925a833ac63f5da75cb62b0e4ea94 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Mon, 7 Jun 2021 15:02:05 -0700
Subject: [PATCH 1355/1664] Revert the squish translate from all apps

Bug: 189973274
Bug: 189975416

Test: manual, attached video on the bug
Change-Id: I881a2b79462e8d420b3dcb6a6b98adbe9e8e0394
---
 .../allapps/AllAppsContainerView.java         | 28 +++----------------
 .../launcher3/views/SpringRelativeLayout.java |  2 +-
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index cb20fec47a..681f5e7a30 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -669,30 +669,10 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
     }
 
     public void onPull(float deltaDistance, float displacement) {
-        absorbPullDeltaDistance(PULL_MULTIPLIER * deltaDistance,
-                PULL_MULTIPLIER * displacement);
-        // ideally, this should be done using EdgeEffect.onPush to create squish effect.
-        // However, until such method is available, launcher to simulate the onPush method.
-        mHeader.setTranslationY(-.5f * mHeaderTop * deltaDistance);
-        getRecyclerViewContainer().setTranslationY(-mHeaderTop * deltaDistance);
-    }
-
-    public void onRelease() {
-        ValueAnimator anim1 = ValueAnimator.ofFloat(1f, 0f);
-        final float floatingHeaderHeight = getFloatingHeaderView().getTranslationY();
-        final float recyclerViewHeight = getRecyclerViewContainer().getTranslationY();
-        anim1.setDuration(200);
-        anim1.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-            @Override
-            public void onAnimationUpdate(ValueAnimator valueAnimator) {
-                getFloatingHeaderView().setTranslationY(
-                        ((float) valueAnimator.getAnimatedValue()) * floatingHeaderHeight);
-                getRecyclerViewContainer().setTranslationY(
-                        ((float) valueAnimator.getAnimatedValue()) * recyclerViewHeight);
-            }
-        });
-        anim1.start();
-        super.onRelease();
+        absorbPullDeltaDistance(PULL_MULTIPLIER * deltaDistance, PULL_MULTIPLIER * displacement);
+        // Current motion spec is to actually push and not pull
+        // on this surface. However, until EdgeEffect.onPush (b/190612804) is
+        // implemented at view level, we will simply pull
     }
 
     @Override
diff --git a/src/com/android/launcher3/views/SpringRelativeLayout.java b/src/com/android/launcher3/views/SpringRelativeLayout.java
index 8342d3e9d2..8e3ac20574 100644
--- a/src/com/android/launcher3/views/SpringRelativeLayout.java
+++ b/src/com/android/launcher3/views/SpringRelativeLayout.java
@@ -93,7 +93,7 @@ public class SpringRelativeLayout extends RelativeLayout {
         invalidate();
     }
 
-    protected void onRelease() {
+    public void onRelease() {
         mEdgeGlowBottom.onRelease();
     }
 
-- 
GitLab


From f564b65f2a23d81f7ccafaca5727b2daf7e216f4 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Tue, 8 Jun 2021 15:35:33 -0700
Subject: [PATCH 1356/1664] Folder preview polish.

- Fixes notification dot not aligning in 4x5 grid
- Fixes clipping issues with large folders
- Fixes clipping issues with preview item animations

Bug: 188095988
Test: manual

Change-Id: I6821b3cb3c65e5928c7be1cddd7f292a37842698
---
 .../folder/ClippedFolderIconLayoutRule.java   |  6 +--
 src/com/android/launcher3/folder/Folder.java  |  2 +-
 .../folder/FolderAnimationManager.java        | 34 +++++++++++--
 .../android/launcher3/folder/FolderIcon.java  |  1 +
 .../folder/FolderPreviewItemAnim.java         |  1 +
 .../folder/PreviewItemDrawingParams.java      |  1 +
 .../launcher3/folder/PreviewItemManager.java  | 50 ++++++++++++++-----
 7 files changed, 75 insertions(+), 20 deletions(-)

diff --git a/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java b/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java
index 68bed443c7..3457804c3a 100644
--- a/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java
+++ b/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java
@@ -6,9 +6,9 @@ public class ClippedFolderIconLayoutRule {
     private static final int MIN_NUM_ITEMS_IN_PREVIEW = 2;
 
     private static final float MIN_SCALE = 0.44f;
-    private static final float MAX_SCALE = 0.54f;
-    private static final float MAX_RADIUS_DILATION = 0.10f;
-    private static final float ITEM_RADIUS_SCALE_FACTOR = 1.2f;
+    private static final float MAX_SCALE = 0.51f;
+    private static final float MAX_RADIUS_DILATION = 0.1f;
+    private static final float ITEM_RADIUS_SCALE_FACTOR = 1.15f;
 
     public static final int EXIT_INDEX = -2;
     public static final int ENTER_INDEX = -3;
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index 17c1329ed9..dc188f27d4 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -743,7 +743,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         }
 
         mContent.completePendingPageChanges();
-        mContent.snapToPageImmediately(pageNo);
+        mContent.setCurrentPage(pageNo);
 
         // This is set to true in close(), but isn't reset to false until onDropCompleted(). This
         // leads to an inconsistent state if you drag out of the folder and drag back in without
diff --git a/src/com/android/launcher3/folder/FolderAnimationManager.java b/src/com/android/launcher3/folder/FolderAnimationManager.java
index bd0dbfde08..e66e2f6fc1 100644
--- a/src/com/android/launcher3/folder/FolderAnimationManager.java
+++ b/src/com/android/launcher3/folder/FolderAnimationManager.java
@@ -16,6 +16,8 @@
 
 package com.android.launcher3.folder;
 
+import static android.view.View.ALPHA;
+
 import static com.android.launcher3.BubbleTextView.TEXT_ALPHA_PROPERTY;
 import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
 import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW;
@@ -57,6 +59,7 @@ import java.util.List;
 public class FolderAnimationManager {
 
     private static final int FOLDER_NAME_ALPHA_DURATION = 32;
+    private static final int LARGE_FOLDER_FOOTER_DURATION = 128;
 
     private Folder mFolder;
     private FolderPagedView mContent;
@@ -214,7 +217,22 @@ public class FolderAnimationManager {
         play(a, getAnimator(mFolder, View.TRANSLATION_Y, yDistance, 0f));
         play(a, getAnimator(mFolder.mContent, SCALE_PROPERTY, initialScale, finalScale));
         play(a, getAnimator(mFolder.mFooter, SCALE_PROPERTY, initialScale, finalScale));
-        play(a, mFolderIcon.mFolderName.createTextAlphaAnimator(!mIsOpening));
+
+        final int footerAlphaDuration;
+        final int footerStartDelay;
+        if (isLargeFolder()) {
+            if (mIsOpening) {
+                footerAlphaDuration = LARGE_FOLDER_FOOTER_DURATION;
+                footerStartDelay = mDuration - footerAlphaDuration;
+            } else {
+                footerAlphaDuration = 0;
+                footerStartDelay = 0;
+            }
+        } else {
+            footerStartDelay = 0;
+            footerAlphaDuration = mDuration;
+        }
+        play(a, getAnimator(mFolder.mFooter, ALPHA, 0, 1f), footerStartDelay, footerAlphaDuration);
 
         // Create reveal animator for the folder background
         play(a, getShape().createRevealAnimator(
@@ -225,9 +243,13 @@ public class FolderAnimationManager {
                 + mDeviceProfile.folderCellWidthPx * 2;
         int height = mContent.getPaddingTop() + mDeviceProfile.folderCellLayoutBorderSpacingPx
                 + mDeviceProfile.folderCellHeightPx * 2;
-        Rect startRect2 = new Rect(0, 0, width, height);
+        int page = mIsOpening ? mContent.getCurrentPage() : mContent.getDestinationPage();
+        int left = mContent.getPaddingLeft() + page * mContent.getWidth();
+        Rect contentStart = new Rect(left, 0, left + width, height);
+        Rect contentEnd = new Rect(endRect.left + left, endRect.top, endRect.right + left,
+                endRect.bottom);
         play(a, getShape().createRevealAnimator(
-                mFolder.getContent(), startRect2, endRect, finalRadius, !mIsOpening));
+                mFolder.getContent(), contentStart, contentEnd, finalRadius, !mIsOpening));
 
 
         // Fade in the folder name, as the text can overlap the icons when grid size is small.
@@ -420,8 +442,12 @@ public class FolderAnimationManager {
         as.play(a);
     }
 
+    private boolean isLargeFolder() {
+        return mFolder.getItemCount() > MAX_NUM_ITEMS_IN_PREVIEW;
+    }
+
     private TimeInterpolator getPreviewItemInterpolator() {
-        if (mFolder.getItemCount() > MAX_NUM_ITEMS_IN_PREVIEW) {
+        if (isLargeFolder()) {
             // With larger folders, we want the preview items to reach their final positions faster
             // (when opening) and later (when closing) so that they appear aligned with the rest of
             // the folder items when they are both visible.
diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java
index 6b12d86d13..ed2d0a943a 100644
--- a/src/com/android/launcher3/folder/FolderIcon.java
+++ b/src/com/android/launcher3/folder/FolderIcon.java
@@ -627,6 +627,7 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
         if (!mForceHideDot && ((mDotInfo != null && mDotInfo.hasDot()) || mDotScale > 0)) {
             Rect iconBounds = mDotParams.iconBounds;
             BubbleTextView.getIconBounds(this, iconBounds, mActivity.getDeviceProfile().iconSizePx);
+            iconBounds.offset(0, mBackground.paddingY);
             float iconScale = (float) mBackground.previewSize / iconBounds.width();
             Utilities.scaleRectAboutCenter(iconBounds, iconScale);
 
diff --git a/src/com/android/launcher3/folder/FolderPreviewItemAnim.java b/src/com/android/launcher3/folder/FolderPreviewItemAnim.java
index 22f73330ef..edfd2ba35e 100644
--- a/src/com/android/launcher3/folder/FolderPreviewItemAnim.java
+++ b/src/com/android/launcher3/folder/FolderPreviewItemAnim.java
@@ -68,6 +68,7 @@ class FolderPreviewItemAnim {
             int duration, final Runnable onCompleteRunnable) {
         mItemManager = itemManager;
         mParams = params;
+        mParams.index = index1;
 
         mItemManager.computePreviewItemDrawingParams(index1, items1, sTmpParams);
         finalState = new float[] {sTmpParams.scale, sTmpParams.transX, sTmpParams.transY};
diff --git a/src/com/android/launcher3/folder/PreviewItemDrawingParams.java b/src/com/android/launcher3/folder/PreviewItemDrawingParams.java
index a14a0d8efc..5746be89d9 100644
--- a/src/com/android/launcher3/folder/PreviewItemDrawingParams.java
+++ b/src/com/android/launcher3/folder/PreviewItemDrawingParams.java
@@ -23,6 +23,7 @@ import com.android.launcher3.model.data.WorkspaceItemInfo;
  * Manages the parameters used to draw a Folder preview item.
  */
 class PreviewItemDrawingParams {
+    float index;
     float transX;
     float transY;
     float scale;
diff --git a/src/com/android/launcher3/folder/PreviewItemManager.java b/src/com/android/launcher3/folder/PreviewItemManager.java
index 6adef01514..baafbc92bc 100644
--- a/src/com/android/launcher3/folder/PreviewItemManager.java
+++ b/src/com/android/launcher3/folder/PreviewItemManager.java
@@ -28,6 +28,8 @@ import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.content.Context;
 import android.graphics.Canvas;
+import android.graphics.Path;
+import android.graphics.PointF;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.util.FloatProperty;
@@ -81,6 +83,10 @@ public class PreviewItemManager {
     // These hold the current page preview items. It is empty if the current page is the first page.
     private ArrayList<PreviewItemDrawingParams> mCurrentPageParams = new ArrayList<>();
 
+    // We clip the preview items during the middle of the animation, so that it does not go outside
+    // of the visual shape. We stop clipping at this threshold, since the preview items ultimately
+    // do not get cropped in their resting state.
+    private final float mClipThreshold;
     private float mCurrentPageItemsTransX = 0;
     private boolean mShouldSlideInFirstPage;
 
@@ -96,6 +102,7 @@ public class PreviewItemManager {
         mIcon = icon;
         mIconSize = ActivityContext.lookupContext(
                 mContext).getDeviceProfile().folderChildIconSizePx;
+        mClipThreshold = Utilities.dpToPx(1f);
     }
 
     /**
@@ -163,41 +170,60 @@ public class PreviewItemManager {
     }
 
     public void drawParams(Canvas canvas, ArrayList<PreviewItemDrawingParams> params,
-            float transX) {
-        canvas.translate(transX, 0);
+            PointF offset, boolean shouldClipPath, Path clipPath) {
         // The first item should be drawn last (ie. on top of later items)
         for (int i = params.size() - 1; i >= 0; i--) {
             PreviewItemDrawingParams p = params.get(i);
             if (!p.hidden) {
-                drawPreviewItem(canvas, p);
+                // Exiting param should always be clipped.
+                boolean isExiting = p.index == EXIT_INDEX;
+                drawPreviewItem(canvas, p, offset, isExiting | shouldClipPath, clipPath);
             }
         }
-        canvas.translate(-transX, 0);
     }
 
+    /**
+     * Draws the preview items on {@param canvas}.
+     */
     public void draw(Canvas canvas) {
+        int saveCount = canvas.getSaveCount();
         // The items are drawn in coordinates relative to the preview offset
         PreviewBackground bg = mIcon.getFolderBackground();
-        canvas.translate(bg.basePreviewOffsetX, bg.basePreviewOffsetY);
-
+        Path clipPath = bg.getClipPath();
         float firstPageItemsTransX = 0;
         if (mShouldSlideInFirstPage) {
-            drawParams(canvas, mCurrentPageParams, mCurrentPageItemsTransX);
-
+            PointF firstPageOffset = new PointF(bg.basePreviewOffsetX + mCurrentPageItemsTransX,
+                    bg.basePreviewOffsetY);
+            boolean shouldClip = mCurrentPageItemsTransX > mClipThreshold;
+            drawParams(canvas, mCurrentPageParams, firstPageOffset, shouldClip, clipPath);
             firstPageItemsTransX = -ITEM_SLIDE_IN_OUT_DISTANCE_PX + mCurrentPageItemsTransX;
         }
 
-        drawParams(canvas, mFirstPageParams, firstPageItemsTransX);
-        canvas.translate(-bg.basePreviewOffsetX, -bg.basePreviewOffsetY);
+        PointF firstPageOffset = new PointF(bg.basePreviewOffsetX + firstPageItemsTransX,
+                bg.basePreviewOffsetY);
+        boolean shouldClipFirstPage = firstPageItemsTransX < -mClipThreshold;
+        drawParams(canvas, mFirstPageParams, firstPageOffset, shouldClipFirstPage, clipPath);
+        canvas.restoreToCount(saveCount);
     }
 
     public void onParamsChanged() {
         mIcon.invalidate();
     }
 
-    private void drawPreviewItem(Canvas canvas, PreviewItemDrawingParams params) {
+    /**
+     * Draws each preview item.
+     *
+     * @param offset The offset needed to draw the preview items.
+     * @param shouldClipPath Iff true, clip path using {@param clipPath}.
+     * @param clipPath The clip path of the folder icon.
+     */
+    private void drawPreviewItem(Canvas canvas, PreviewItemDrawingParams params, PointF offset,
+            boolean shouldClipPath, Path clipPath) {
         canvas.save();
-        canvas.translate(params.transX, params.transY);
+        if (shouldClipPath) {
+            canvas.clipPath(clipPath);
+        }
+        canvas.translate(offset.x + params.transX, offset.y + params.transY);
         canvas.scale(params.scale, params.scale);
         Drawable d = params.drawable;
 
-- 
GitLab


From 08cca82ecab9327fce8ca959feaf0f88902d8f37 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Tue, 25 May 2021 19:21:37 -0500
Subject: [PATCH 1357/1664] [AllApps][Work] Introduce work toggle Fab

Screenshot: https://screenshot.googleplex.com/C4r7kKPxv3PKdyN
Bug: 186856928
Test: on-device
Change-Id: I69ffa0ef367b182688e69c730fc9dee1afa7cadd
---
 res/drawable/work_apps_toggle_background.xml  |  31 +++
 res/layout/work_mode_fab.xml                  |  33 +++
 res/layout/work_mode_switch.xml               |   9 +-
 res/layout/work_profile_edu.xml               |  61 -----
 res/values/dimens.xml                         |   4 +
 res/values/strings.xml                        |  13 +-
 .../allapps/AllAppsContainerView.java         |   4 +-
 .../allapps/LauncherAllAppsContainerView.java |   8 -
 .../launcher3/allapps/WorkModeSwitch.java     | 168 +++----------
 .../android/launcher3/views/WorkEduView.java  | 230 ------------------
 10 files changed, 118 insertions(+), 443 deletions(-)
 create mode 100644 res/drawable/work_apps_toggle_background.xml
 create mode 100644 res/layout/work_mode_fab.xml
 delete mode 100644 res/layout/work_profile_edu.xml
 delete mode 100644 src/com/android/launcher3/views/WorkEduView.java

diff --git a/res/drawable/work_apps_toggle_background.xml b/res/drawable/work_apps_toggle_background.xml
new file mode 100644
index 0000000000..a04d269875
--- /dev/null
+++ b/res/drawable/work_apps_toggle_background.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false">
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/work_fab_radius" />
+            <solid android:color="?android:attr/colorControlHighlight" />
+            <padding android:left="@dimen/work_fab_radius" android:right="@dimen/work_fab_radius" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/work_fab_radius" />
+            <solid android:color="?android:attr/colorAccent" />
+            <padding android:left="@dimen/work_fab_radius" android:right="@dimen/work_fab_radius" />
+        </shape>
+    </item>
+</selector>
diff --git a/res/layout/work_mode_fab.xml b/res/layout/work_mode_fab.xml
new file mode 100644
index 0000000000..21f269fed6
--- /dev/null
+++ b/res/layout/work_mode_fab.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.launcher3.allapps.WorkModeSwitch
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/work_mode_toggle"
+    android:layout_alignParentBottom="true"
+    android:layout_alignParentEnd="true"
+    android:layout_height="@dimen/work_fab_height"
+    android:layout_width="wrap_content"
+    android:gravity="center"
+    android:includeFontPadding="false"
+    android:drawableTint="@android:color/white"
+    android:textColor="@android:color/white"
+    android:background="@drawable/work_apps_toggle_background"
+    android:drawablePadding="16dp"
+    android:drawableStart="@drawable/ic_corp_off"
+    android:elevation="10dp"
+    android:layout_marginBottom="@dimen/work_fab_margin"
+    android:layout_marginEnd="@dimen/work_fab_margin"
+    android:text="@string/work_apps_pause_btn_text" />
\ No newline at end of file
diff --git a/res/layout/work_mode_switch.xml b/res/layout/work_mode_switch.xml
index 31953c72aa..538a180992 100644
--- a/res/layout/work_mode_switch.xml
+++ b/res/layout/work_mode_switch.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2017 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -13,8 +12,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher3.allapps.WorkModeSwitch
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher3.allapps.WorkModeSwitch xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     style="@style/PrimaryHeadline"
@@ -35,5 +33,4 @@
     android:paddingBottom="@dimen/work_profile_footer_padding"
     android:paddingLeft="@dimen/work_profile_footer_padding"
     android:paddingRight="@dimen/work_profile_footer_padding"
-    android:paddingTop="@dimen/work_profile_footer_padding"
-/>
+    android:paddingTop="@dimen/work_profile_footer_padding" />
diff --git a/res/layout/work_profile_edu.xml b/res/layout/work_profile_edu.xml
deleted file mode 100644
index c3c7010f7e..0000000000
--- a/res/layout/work_profile_edu.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.launcher3.views.WorkEduView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="bottom"
-    android:gravity="bottom"
-    android:orientation="vertical">
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="32dp"
-        android:background="@drawable/bottom_sheet_top_border"
-        android:backgroundTint="?attr/eduHalfSheetBGColor" />
-
-    <LinearLayout
-        android:id="@+id/view_wrapper"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?attr/eduHalfSheetBGColor"
-        android:orientation="vertical"
-        android:paddingLeft="@dimen/bottom_sheet_edu_padding"
-        android:paddingRight="@dimen/bottom_sheet_edu_padding">
-
-        <TextView
-            android:id="@+id/content_text"
-            style="@style/TextHeadline"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="48dp"
-            android:layout_marginBottom="48dp"
-            android:gravity="center"
-            android:text="@string/work_profile_edu_personal_apps"
-            android:textAlignment="center"
-            android:textColor="@android:color/white"
-            android:textSize="20sp" />
-
-        <Button
-            android:id="@+id/proceed"
-            android:layout_width="wrap_content"
-            android:layout_height="48dp"
-            android:layout_gravity="end"
-            android:background="?android:attr/selectableItemBackground"
-            android:gravity="center"
-            android:text="@string/work_profile_edu_next"
-            android:textAlignment="center"
-            android:textColor="@android:color/white" />
-    </LinearLayout>
-</com.android.launcher3.views.WorkEduView>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d06561112e..caeb0b4eb1 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -115,6 +115,10 @@
 
     <dimen name="all_apps_divider_margin_vertical">8dp</dimen>
 
+<!-- Floating action button inside work tab to toggle work profile -->
+    <dimen name="work_fab_height">48dp</dimen>
+    <dimen name="work_fab_radius">24dp</dimen>
+    <dimen name="work_fab_margin">18dp</dimen>
     <dimen name="work_profile_footer_padding">20dp</dimen>
     <dimen name="work_profile_footer_text_size">16sp</dimen>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c851cf8273..42f69e0f92 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -389,27 +389,24 @@
     <string name="work_profile_edu_accept">Got it</string>
 
     <!--- heading shown when user opens work apps tab while work apps are paused -->
-    <string name="work_apps_paused_title">Work profile is paused</string>
+    <string name="work_apps_paused_title">Work apps are off</string>
     <!--- body shown when user opens work apps tab while work apps are paused -->
-    <string name="work_apps_paused_body">Work apps can’t send you notifications, use your battery, or access your location</string>
+    <string name="work_apps_paused_body">Your work apps can’t send you notifications, use your battery, or access your location</string>
     <!-- content description for paused work apps list -->
-    <string name="work_apps_paused_content_description">Work profile is paused. Work apps can’t send you notifications, use your battery, or access your location</string>
+    <string name="work_apps_paused_content_description">Work apps are off. Your work apps can’t send you notifications, use your battery, or access your location</string>
     <!-- string shown in educational banner about work profile -->
     <string name="work_apps_paused_edu_banner">Work apps are badged and visible to your IT admin</string>
     <!-- button string shown to dismiss work tab education -->
     <string name="work_apps_paused_edu_accept">Got it</string>
 
     <!-- button string shown pause work profile -->
-    <string name="work_apps_pause_btn_text">Pause work apps</string>
+    <string name="work_apps_pause_btn_text">Turn off work apps</string>
     <!-- button string shown enable work profile -->
-    <string name="work_apps_enable_btn_text">Turn on</string>
+    <string name="work_apps_enable_btn_text">Turn on work apps</string>
 
     <!-- A hint shown in launcher settings develop options filter box -->
     <string name="developer_options_filter_hint">Filter</string>
 
-    <!-- A tip shown pointing at work toggle -->
-    <string name="work_switch_tip">Pause work apps and notifications</string>
-
     <!-- Failed action error message: e.g. Failed: Pause -->
     <string name="remote_action_failed">Failed: <xliff:g id="what" example="Pause">%1$s</xliff:g></string>
 </resources>
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index cb20fec47a..801a6c3300 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -228,7 +228,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
     }
 
     private void resetWorkProfile() {
-        mWorkModeSwitch.update(!mAllAppsStore.hasModelFlag(FLAG_QUIET_MODE_ENABLED));
+        mWorkModeSwitch.updateCurrentState(!mAllAppsStore.hasModelFlag(FLAG_QUIET_MODE_ENABLED));
         mAH[AdapterHolder.WORK].setupOverlay();
         mAH[AdapterHolder.WORK].applyPadding();
     }
@@ -482,7 +482,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
     private void setupWorkToggle() {
         if (Utilities.ATLEAST_P) {
             mWorkModeSwitch = (WorkModeSwitch) mLauncher.getLayoutInflater().inflate(
-                    R.layout.work_mode_switch, this, false);
+                    R.layout.work_mode_fab, this, false);
             this.addView(mWorkModeSwitch);
             mWorkModeSwitch.setInsets(mInsets);
             mWorkModeSwitch.post(this::resetWorkProfile);
diff --git a/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java b/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
index 16ae2508ec..1eb726ce0d 100644
--- a/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
@@ -25,7 +25,6 @@ import android.view.MotionEvent;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.statemanager.StateManager.StateListener;
-import com.android.launcher3.views.WorkEduView;
 
 /**
  * AllAppsContainerView with launcher specific callbacks
@@ -88,13 +87,6 @@ public class LauncherAllAppsContainerView extends AllAppsContainerView {
     @Override
     public void onActivePageChanged(int currentActivePage) {
         super.onActivePageChanged(currentActivePage);
-        if (mUsingTabs) {
-            if (currentActivePage == AdapterHolder.WORK) {
-                WorkEduView.showWorkEduIfNeeded(mLauncher);
-            } else {
-                mWorkTabListener = WorkEduView.showEduFlowIfNeeded(mLauncher, mWorkTabListener);
-            }
-        }
     }
 
     @Override
diff --git a/src/com/android/launcher3/allapps/WorkModeSwitch.java b/src/com/android/launcher3/allapps/WorkModeSwitch.java
index 4567ee620f..c742909161 100644
--- a/src/com/android/launcher3/allapps/WorkModeSwitch.java
+++ b/src/com/android/launcher3/allapps/WorkModeSwitch.java
@@ -15,108 +15,57 @@
  */
 package com.android.launcher3.allapps;
 
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.graphics.Rect;
-import android.os.AsyncTask;
 import android.os.Process;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.ViewConfiguration;
-import android.widget.Switch;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
 
 import com.android.launcher3.Insettable;
 import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
 import com.android.launcher3.pm.UserCache;
-import com.android.launcher3.views.ArrowTipView;
-
-import java.lang.ref.WeakReference;
 
 /**
  * Work profile toggle switch shown at the bottom of AllApps work tab
  */
-public class WorkModeSwitch extends Switch implements Insettable {
-
-    private static final int WORK_TIP_THRESHOLD = 2;
-    public static final String KEY_WORK_TIP_COUNTER = "worked_tip_counter";
+public class WorkModeSwitch extends Button implements Insettable, View.OnClickListener {
 
     private Rect mInsets = new Rect();
-
-    private final float[] mTouch = new float[2];
-    private int mTouchSlop;
+    private boolean mWorkEnabled;
 
     public WorkModeSwitch(Context context) {
-        super(context);
-        init();
+        this(context, null, 0);
     }
 
     public WorkModeSwitch(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init();
+        this(context, attrs, 0);
     }
 
     public WorkModeSwitch(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        init();
-    }
-
-    private void init() {
-        ViewConfiguration viewConfiguration = ViewConfiguration.get(getContext());
-        mTouchSlop = viewConfiguration.getScaledTouchSlop();
-    }
-
-    @Override
-    public void setChecked(boolean checked) { }
-
-    @Override
-    public void toggle() {
-        // don't show tip if user uses toggle
-        Utilities.getPrefs(getContext()).edit().putInt(KEY_WORK_TIP_COUNTER, -1).apply();
-        trySetQuietModeEnabledToAllProfilesAsync(isChecked());
-    }
-
-    /**
-     * Sets the enabled or disabled state of the button
-     * @param isChecked
-     */
-    public void update(boolean isChecked) {
-        super.setChecked(isChecked);
-        setCompoundDrawablesRelativeWithIntrinsicBounds(
-                isChecked ? R.drawable.ic_corp : R.drawable.ic_corp_off, 0, 0, 0);
-        setEnabled(true);
     }
 
     @Override
-    public boolean onTouchEvent(MotionEvent ev) {
-        if (ev.getActionMasked() == MotionEvent.ACTION_DOWN) {
-            mTouch[0] = ev.getX();
-            mTouch[1] = ev.getY();
-        } else if (ev.getActionMasked() == MotionEvent.ACTION_MOVE) {
-            if (Math.abs(mTouch[0] - ev.getX()) > mTouchSlop
-                    || Math.abs(mTouch[1] - ev.getY()) > mTouchSlop) {
-                int action = ev.getAction();
-                ev.setAction(MotionEvent.ACTION_CANCEL);
-                super.onTouchEvent(ev);
-                ev.setAction(action);
-                return false;
-            }
-        }
-        return super.onTouchEvent(ev);
-    }
-
-    private void trySetQuietModeEnabledToAllProfilesAsync(boolean enabled) {
-        new SetQuietModeEnabledAsyncTask(enabled, new WeakReference<>(this)).execute();
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        setOnClickListener(this);
     }
 
     @Override
     public void setInsets(Rect insets) {
         int bottomInset = insets.bottom - mInsets.bottom;
         mInsets.set(insets);
-        setPadding(getPaddingLeft(), getPaddingTop(), getPaddingRight(),
-                getPaddingBottom() + bottomInset);
+        ViewGroup.MarginLayoutParams marginLayoutParams =
+                (ViewGroup.MarginLayoutParams) getLayoutParams();
+        if (marginLayoutParams != null) {
+            marginLayoutParams.bottomMargin = bottomInset + marginLayoutParams.bottomMargin;
+        }
     }
 
     /**
@@ -125,78 +74,41 @@ public class WorkModeSwitch extends Switch implements Insettable {
     public void setWorkTabVisible(boolean workTabVisible) {
         clearAnimation();
         if (workTabVisible) {
+            setEnabled(true);
             setVisibility(VISIBLE);
             setAlpha(0);
             animate().alpha(1).start();
-            showTipIfNeeded();
         } else {
             animate().alpha(0).withEndAction(() -> this.setVisibility(GONE)).start();
         }
     }
 
-    private static final class SetQuietModeEnabledAsyncTask
-            extends AsyncTask<Void, Void, Boolean> {
-
-        private final boolean enabled;
-        private final WeakReference<WorkModeSwitch> switchWeakReference;
-
-        SetQuietModeEnabledAsyncTask(boolean enabled,
-                                     WeakReference<WorkModeSwitch> switchWeakReference) {
-            this.enabled = enabled;
-            this.switchWeakReference = switchWeakReference;
-        }
-
-        @Override
-        protected void onPreExecute() {
-            super.onPreExecute();
-            WorkModeSwitch workModeSwitch = switchWeakReference.get();
-            if (workModeSwitch != null) {
-                workModeSwitch.setEnabled(false);
-            }
-        }
-
-        @Override
-        protected Boolean doInBackground(Void... voids) {
-            WorkModeSwitch workModeSwitch = switchWeakReference.get();
-            if (workModeSwitch == null || !Utilities.ATLEAST_P) {
-                return false;
-            }
-
-            Context context = workModeSwitch.getContext();
-            UserManager userManager = context.getSystemService(UserManager.class);
-            boolean showConfirm = false;
-            for (UserHandle userProfile : UserCache.INSTANCE.get(context).getUserProfiles()) {
-                if (Process.myUserHandle().equals(userProfile)) {
-                    continue;
-                }
-                showConfirm |= !userManager.requestQuietModeEnabled(enabled, userProfile);
-            }
-            return showConfirm;
-        }
-
-        @Override
-        protected void onPostExecute(Boolean showConfirm) {
-            if (showConfirm) {
-                WorkModeSwitch workModeSwitch = switchWeakReference.get();
-                if (workModeSwitch != null) {
-                    workModeSwitch.setEnabled(true);
-                }
-            }
-        }
+    @Override
+    public void onClick(View view) {
+        setEnabled(false);
+        UI_HELPER_EXECUTOR.post(() -> setToState(!mWorkEnabled));
     }
 
     /**
-     * Shows a work tip on the Nth work tab open
+     * Sets the enabled or disabled state of the button
      */
-    public void showTipIfNeeded() {
-        Context context = getContext();
-        SharedPreferences prefs = Utilities.getPrefs(context);
-        int tipCounter = prefs.getInt(KEY_WORK_TIP_COUNTER, WORK_TIP_THRESHOLD);
-        if (tipCounter < 0) return;
-        if (tipCounter == 0) {
-            new ArrowTipView(context)
-                    .show(context.getString(R.string.work_switch_tip), getTop());
+    public void updateCurrentState(boolean active) {
+        mWorkEnabled = active;
+        setEnabled(true);
+        setCompoundDrawablesRelativeWithIntrinsicBounds(
+                active ? R.drawable.ic_corp_off : R.drawable.ic_corp, 0, 0, 0);
+        setText(active ? R.string.work_apps_pause_btn_text : R.string.work_apps_enable_btn_text);
+    }
+
+    protected Boolean setToState(boolean toState) {
+        UserManager userManager = getContext().getSystemService(UserManager.class);
+        boolean showConfirm = false;
+        for (UserHandle userProfile : UserCache.INSTANCE.get(getContext()).getUserProfiles()) {
+            if (Process.myUserHandle().equals(userProfile)) {
+                continue;
+            }
+            showConfirm |= !userManager.requestQuietModeEnabled(!toState, userProfile);
         }
-        prefs.edit().putInt(KEY_WORK_TIP_COUNTER, tipCounter - 1).apply();
+        return showConfirm;
     }
 }
diff --git a/src/com/android/launcher3/views/WorkEduView.java b/src/com/android/launcher3/views/WorkEduView.java
deleted file mode 100644
index 6be0c23577..0000000000
--- a/src/com/android/launcher3/views/WorkEduView.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.views;
-
-
-import android.animation.Animator;
-import android.animation.ObjectAnimator;
-import android.animation.PropertyValuesHolder;
-import android.content.Context;
-import android.graphics.Rect;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.Insettable;
-import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherState;
-import com.android.launcher3.R;
-import com.android.launcher3.allapps.AllAppsContainerView;
-import com.android.launcher3.allapps.AllAppsPagedView;
-import com.android.launcher3.anim.AnimationSuccessListener;
-import com.android.launcher3.anim.Interpolators;
-import com.android.launcher3.statemanager.StateManager.StateListener;
-
-/**
- * On boarding flow for users right after setting up work profile
- */
-public class WorkEduView extends AbstractSlideInView<Launcher>
-        implements Insettable, StateListener<LauncherState> {
-
-    private static final int DEFAULT_CLOSE_DURATION = 200;
-    public static final String KEY_WORK_EDU_STEP = "showed_work_profile_edu";
-    public static final String KEY_LEGACY_WORK_EDU_SEEN = "showed_bottom_user_education";
-
-    private static final int WORK_EDU_NOT_STARTED = 0;
-    private static final int WORK_EDU_PERSONAL_APPS = 1;
-    private static final int WORK_EDU_WORK_APPS = 2;
-
-    protected static final int FINAL_SCRIM_BG_COLOR = 0x88000000;
-
-
-    private Rect mInsets = new Rect();
-    private View mViewWrapper;
-    private Button mProceedButton;
-    private TextView mContentText;
-
-    private int mNextWorkEduStep = WORK_EDU_PERSONAL_APPS;
-
-
-    public WorkEduView(Context context, AttributeSet attr) {
-        this(context, attr, 0);
-    }
-
-    public WorkEduView(Context context, AttributeSet attrs,
-            int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        mContent = this;
-    }
-
-    @Override
-    protected void handleClose(boolean animate) {
-        mActivityContext.getSharedPrefs().edit()
-                .putInt(KEY_WORK_EDU_STEP, mNextWorkEduStep).apply();
-        handleClose(true, DEFAULT_CLOSE_DURATION);
-    }
-
-    @Override
-    protected void onCloseComplete() {
-        super.onCloseComplete();
-        mActivityContext.getStateManager().removeStateListener(this);
-    }
-
-    @Override
-    protected boolean isOfType(int type) {
-        return (type & TYPE_ON_BOARD_POPUP) != 0;
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        mViewWrapper = findViewById(R.id.view_wrapper);
-        mProceedButton = findViewById(R.id.proceed);
-        mContentText = findViewById(R.id.content_text);
-
-        // make sure layout does not shrink when we change the text
-        mContentText.post(() -> mContentText.setMinLines(mContentText.getLineCount()));
-
-        mProceedButton.setOnClickListener(view -> {
-            if (getAllAppsPagedView() != null) {
-                getAllAppsPagedView().snapToPage(AllAppsContainerView.AdapterHolder.WORK);
-            }
-            goToWorkTab(true);
-        });
-    }
-
-    private void goToWorkTab(boolean animate) {
-        mProceedButton.setText(R.string.work_profile_edu_accept);
-        if (animate) {
-            ObjectAnimator animator = ObjectAnimator.ofFloat(mContentText, ALPHA, 0);
-            animator.addListener(new AnimationSuccessListener() {
-                @Override
-                public void onAnimationSuccess(Animator animator) {
-                    mContentText.setText(
-                            mActivityContext.getString(R.string.work_profile_edu_work_apps));
-                    ObjectAnimator.ofFloat(mContentText, ALPHA, 1).start();
-                }
-            });
-            animator.start();
-        } else {
-            mContentText.setText(mActivityContext.getString(R.string.work_profile_edu_work_apps));
-        }
-        mNextWorkEduStep = WORK_EDU_WORK_APPS;
-        mProceedButton.setOnClickListener(v -> handleClose(true));
-    }
-
-    @Override
-    public void setInsets(Rect insets) {
-        int leftInset = insets.left - mInsets.left;
-        int rightInset = insets.right - mInsets.right;
-        int bottomInset = insets.bottom - mInsets.bottom;
-        mInsets.set(insets);
-        setPadding(leftInset, getPaddingTop(), rightInset, 0);
-        mViewWrapper.setPaddingRelative(mViewWrapper.getPaddingStart(),
-                mViewWrapper.getPaddingTop(), mViewWrapper.getPaddingEnd(), bottomInset);
-    }
-
-    private void show() {
-        attachToContainer();
-        animateOpen();
-        mActivityContext.getStateManager().addStateListener(this);
-    }
-
-    @Override
-    protected int getScrimColor(Context context) {
-        return FINAL_SCRIM_BG_COLOR;
-    }
-
-    private void goToFirstPage() {
-        if (getAllAppsPagedView() != null) {
-            getAllAppsPagedView().snapToPageImmediately(AllAppsContainerView.AdapterHolder.MAIN);
-        }
-    }
-
-    private void animateOpen() {
-        if (mIsOpen || mOpenCloseAnimator.isRunning()) {
-            return;
-        }
-        mIsOpen = true;
-        mOpenCloseAnimator.setValues(
-                PropertyValuesHolder.ofFloat(TRANSLATION_SHIFT, TRANSLATION_SHIFT_OPENED));
-        mOpenCloseAnimator.setInterpolator(Interpolators.FAST_OUT_SLOW_IN);
-        mOpenCloseAnimator.start();
-    }
-
-    private AllAppsPagedView getAllAppsPagedView() {
-        View v = mActivityContext.getAppsView().getContentView();
-        return (v instanceof AllAppsPagedView) ? (AllAppsPagedView) v : null;
-    }
-
-    /**
-     * Checks if user has not seen onboarding UI yet and shows it when user navigates to all apps
-     */
-    public static StateListener<LauncherState> showEduFlowIfNeeded(Launcher launcher,
-            @Nullable StateListener<LauncherState> oldListener) {
-        if (oldListener != null) {
-            launcher.getStateManager().removeStateListener(oldListener);
-        }
-        if (hasSeenLegacyEdu(launcher) || launcher.getSharedPrefs().getInt(KEY_WORK_EDU_STEP,
-                WORK_EDU_NOT_STARTED) != WORK_EDU_NOT_STARTED) {
-            return null;
-        }
-
-        StateListener<LauncherState> listener = new StateListener<LauncherState>() {
-            @Override
-            public void onStateTransitionComplete(LauncherState finalState) {
-                if (finalState != LauncherState.ALL_APPS) return;
-                LayoutInflater layoutInflater = LayoutInflater.from(launcher);
-                WorkEduView v = (WorkEduView) layoutInflater.inflate(
-                        R.layout.work_profile_edu, launcher.getDragLayer(),
-                        false);
-                v.show();
-                v.goToFirstPage();
-                launcher.getStateManager().removeStateListener(this);
-            }
-        };
-        launcher.getStateManager().addStateListener(listener);
-        return listener;
-    }
-
-    /**
-     * Shows work apps edu if user had dismissed full edu flow
-     */
-    public static void showWorkEduIfNeeded(Launcher launcher) {
-        if (hasSeenLegacyEdu(launcher) || launcher.getSharedPrefs().getInt(KEY_WORK_EDU_STEP,
-                WORK_EDU_NOT_STARTED) != WORK_EDU_PERSONAL_APPS) {
-            return;
-        }
-        LayoutInflater layoutInflater = LayoutInflater.from(launcher);
-        WorkEduView v = (WorkEduView) layoutInflater.inflate(
-                R.layout.work_profile_edu, launcher.getDragLayer(), false);
-        v.show();
-        v.goToWorkTab(false);
-    }
-
-    private static boolean hasSeenLegacyEdu(Launcher launcher) {
-        return launcher.getSharedPrefs().getBoolean(KEY_LEGACY_WORK_EDU_SEEN, false);
-    }
-
-    @Override
-    public void onStateTransitionComplete(LauncherState finalState) {
-        close(false);
-    }
-}
-- 
GitLab


From 1aa95b84006a8eeeac54e25e1444a5ea66fc5b02 Mon Sep 17 00:00:00 2001
From: Alex Spradlin <alexaspradlin@google.com>
Date: Wed, 9 Jun 2021 19:44:31 +0000
Subject: [PATCH 1358/1664] Revert "Set FLAG_IMMUTABLE flag on
 FirstScreenBroadcast PendingIntent. am: 6a7a7f6bad am: 3c3e3e0737 am:
 5785789dc3"

This reverts commit 1d41f93c37a9ecf3cb58b46b2f04f1faf116e5fe.

Reason for revert: Accidental submission

Change-Id: I3adaefa202ccbd027083a8fe1b5df349172de9a6
---
 .../launcher3/model/FirstScreenBroadcast.java       | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/com/android/launcher3/model/FirstScreenBroadcast.java b/src/com/android/launcher3/model/FirstScreenBroadcast.java
index 18ce0358bb..5112304fb8 100644
--- a/src/com/android/launcher3/model/FirstScreenBroadcast.java
+++ b/src/com/android/launcher3/model/FirstScreenBroadcast.java
@@ -15,18 +15,7 @@
  */
 package com.android.launcher3.model;
 
-<<<<<<< TARGET BRANCH (878601 Block recent work profile apps content capture)
 import static android.os.Process.myUserHandle;
-=======
-import static android.app.PendingIntent.FLAG_IMMUTABLE;
-import static android.app.PendingIntent.FLAG_ONE_SHOT;
-import static android.os.Process.myUserHandle;
-
-import static com.android.launcher3.pm.InstallSessionHelper.getUserHandle;
-
-import static java.util.stream.Collectors.groupingBy;
-import static java.util.stream.Collectors.mapping;
->>>>>>> SOURCE BRANCH (578578 Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingInten)
 
 import android.app.PendingIntent;
 import android.content.Context;
@@ -156,7 +145,7 @@ public class FirstScreenBroadcast {
                 .putStringArrayListExtra(HOTSEAT_ITEM_EXTRA, new ArrayList<>(hotseatItems))
                 .putStringArrayListExtra(WIDGET_ITEM_EXTRA, new ArrayList<>(widgetItems))
                 .putExtra(VERIFICATION_TOKEN_EXTRA, PendingIntent.getActivity(context, 0,
-                        new Intent(), FLAG_ONE_SHOT | FLAG_IMMUTABLE)));
+                        new Intent(), PendingIntent.FLAG_ONE_SHOT)));
     }
 
     private static String getPackageName(ItemInfo info) {
-- 
GitLab


From c0f29c6f956ac6e9bb25a4f4362f0ea9d48695a6 Mon Sep 17 00:00:00 2001
From: Yogisha Dixit <ydixit@google.com>
Date: Tue, 25 May 2021 01:13:33 +0100
Subject: [PATCH 1359/1664] Add a content description for the widget
 reconfigure button.

Bug: 186761890
Test: manual
Change-Id: Ia36972b606a524827ade8bd1c191f8b972bbb382
---
 res/layout/app_widget_resize_frame.xml | 3 ++-
 res/values/strings.xml                 | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/res/layout/app_widget_resize_frame.xml b/res/layout/app_widget_resize_frame.xml
index 53db5edd8a..249e42ce86 100644
--- a/res/layout/app_widget_resize_frame.xml
+++ b/res/layout/app_widget_resize_frame.xml
@@ -83,7 +83,8 @@
             android:layout_marginEnd="@dimen/widget_reconfigure_button_margin"
             android:src="@drawable/widget_reconfigure_button_frame"
             android:background="?android:attr/selectableItemBackground"
-            android:visibility="gone" />
+            android:visibility="gone"
+            android:contentDescription="@string/widget_reconfigure_button_content_description" />
 
     </FrameLayout>
 </com.android.launcher3.AppWidgetResizeFrame>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c851cf8273..ab1b32d68a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -108,6 +108,10 @@
     <!-- Text on the button that closes the education dialog about widgets. [CHAR_LIMIT=50] -->
     <string name="widget_education_close_button">Got it</string>
 
+    <!-- Spoken text for screen readers. This text is for an icon that lets the user change a
+         widget's settings. [CHAR_LIMIT=50] -->
+    <string name="widget_reconfigure_button_content_description">Change widget settings</string>
+
     <!-- All Apps -->
     <!-- Search bar text in the apps view. [CHAR_LIMIT=50] -->
     <string name="all_apps_search_bar_hint">Search apps</string>
-- 
GitLab


From 43d53432aa8ec30beac88e8db3fa2f472b740a96 Mon Sep 17 00:00:00 2001
From: Takeshi Hagikura <thagikura@google.com>
Date: Wed, 9 Jun 2021 18:49:14 +0900
Subject: [PATCH 1360/1664] Update the colors of the tabs of work profile
 pagination

Update the tab colors based on the discussion in the bug and the
design mock.
Rename the color/all_apps_tab_bg to
color/all_apps_tab_background_selected to make the usage of the color
explicit.
(Confirmed it's only used for the color of the selected tab)

Bug: 189488670
Test: Visual inspection
Change-Id: I6ac38f71a8dd8852e1ab2e70f2f8434e9101daa1
---
 .../all_apps_tab_background_selected.xml      | 18 ++++++++++++++++++
 res/color-night-v31/all_apps_tab_text.xml     | 19 +++++++++++++++++++
 .../all_apps_tabs_background.xml              | 18 ++++++++++++++++++
 .../all_apps_tab_background_selected.xml      | 18 ++++++++++++++++++
 res/color-night/all_apps_tab_text.xml         | 19 +++++++++++++++++++
 res/color-night/all_apps_tabs_background.xml  | 18 ++++++++++++++++++
 .../all_apps_tab_background_selected.xml      | 18 ++++++++++++++++++
 res/color-v31/all_apps_tab_text.xml           | 19 +++++++++++++++++++
 res/color-v31/all_apps_tabs_background.xml    | 18 ++++++++++++++++++
 ...l => all_apps_tab_background_selected.xml} |  5 ++---
 res/color/all_apps_tab_text.xml               |  4 ++--
 res/color/all_apps_tabs_background.xml        | 18 ++++++++++++++++++
 res/drawable/all_apps_tabs_background.xml     |  8 +++-----
 .../PersonalWorkSlidingTabStrip.java          |  3 ++-
 14 files changed, 192 insertions(+), 11 deletions(-)
 create mode 100644 res/color-night-v31/all_apps_tab_background_selected.xml
 create mode 100644 res/color-night-v31/all_apps_tab_text.xml
 create mode 100644 res/color-night-v31/all_apps_tabs_background.xml
 create mode 100644 res/color-night/all_apps_tab_background_selected.xml
 create mode 100644 res/color-night/all_apps_tab_text.xml
 create mode 100644 res/color-night/all_apps_tabs_background.xml
 create mode 100644 res/color-v31/all_apps_tab_background_selected.xml
 create mode 100644 res/color-v31/all_apps_tab_text.xml
 create mode 100644 res/color-v31/all_apps_tabs_background.xml
 rename res/color/{all_apps_tab_bg.xml => all_apps_tab_background_selected.xml} (83%)
 create mode 100644 res/color/all_apps_tabs_background.xml

diff --git a/res/color-night-v31/all_apps_tab_background_selected.xml b/res/color-night-v31/all_apps_tab_background_selected.xml
new file mode 100644
index 0000000000..b7c9ff64f2
--- /dev/null
+++ b/res/color-night-v31/all_apps_tab_background_selected.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@android:color/system_accent2_100"/>
+</selector>
\ No newline at end of file
diff --git a/res/color-night-v31/all_apps_tab_text.xml b/res/color-night-v31/all_apps_tab_text.xml
new file mode 100644
index 0000000000..83237b49e5
--- /dev/null
+++ b/res/color-night-v31/all_apps_tab_text.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@android:color/system_neutral1_50" android:state_selected="true"/>
+    <item android:color="@android:color/system_neutral2_700"/>
+</selector>
\ No newline at end of file
diff --git a/res/color-night-v31/all_apps_tabs_background.xml b/res/color-night-v31/all_apps_tabs_background.xml
new file mode 100644
index 0000000000..b396f3377e
--- /dev/null
+++ b/res/color-night-v31/all_apps_tabs_background.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@android:color/system_neutral2_100"/>
+</selector>
\ No newline at end of file
diff --git a/res/color-night/all_apps_tab_background_selected.xml b/res/color-night/all_apps_tab_background_selected.xml
new file mode 100644
index 0000000000..b22bc8b673
--- /dev/null
+++ b/res/color-night/all_apps_tab_background_selected.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#BFEBE3"/>
+</selector>
\ No newline at end of file
diff --git a/res/color-night/all_apps_tab_text.xml b/res/color-night/all_apps_tab_text.xml
new file mode 100644
index 0000000000..183af01f42
--- /dev/null
+++ b/res/color-night/all_apps_tab_text.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#F0F0F0" android:state_selected="true"/>
+    <item android:color="#464646"/>
+</selector>
\ No newline at end of file
diff --git a/res/color-night/all_apps_tabs_background.xml b/res/color-night/all_apps_tabs_background.xml
new file mode 100644
index 0000000000..c0c1621d17
--- /dev/null
+++ b/res/color-night/all_apps_tabs_background.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#E2E2E2"/>
+</selector>
\ No newline at end of file
diff --git a/res/color-v31/all_apps_tab_background_selected.xml b/res/color-v31/all_apps_tab_background_selected.xml
new file mode 100644
index 0000000000..dac8fa2994
--- /dev/null
+++ b/res/color-v31/all_apps_tab_background_selected.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@android:color/system_accent1_100"/>
+</selector>
\ No newline at end of file
diff --git a/res/color-v31/all_apps_tab_text.xml b/res/color-v31/all_apps_tab_text.xml
new file mode 100644
index 0000000000..c3520a7ab5
--- /dev/null
+++ b/res/color-v31/all_apps_tab_text.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@android:color/system_neutral1_900" android:state_selected="true"/>
+    <item android:color="@android:color/system_neutral2_700"/>
+</selector>
\ No newline at end of file
diff --git a/res/color-v31/all_apps_tabs_background.xml b/res/color-v31/all_apps_tabs_background.xml
new file mode 100644
index 0000000000..30757b0b3c
--- /dev/null
+++ b/res/color-v31/all_apps_tabs_background.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@android:color/system_neutral1_500" android:lStar="97" />
+</selector>
\ No newline at end of file
diff --git a/res/color/all_apps_tab_bg.xml b/res/color/all_apps_tab_background_selected.xml
similarity index 83%
rename from res/color/all_apps_tab_bg.xml
rename to res/color/all_apps_tab_background_selected.xml
index e59e8d2198..5cb9bd8928 100644
--- a/res/color/all_apps_tab_bg.xml
+++ b/res/color/all_apps_tab_background_selected.xml
@@ -13,7 +13,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
-    <item android:color="?androidprv:attr/colorAccentPrimary"/>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#8DF5E3"/>
 </selector>
\ No newline at end of file
diff --git a/res/color/all_apps_tab_text.xml b/res/color/all_apps_tab_text.xml
index 2db0fb5d74..dace3800cd 100644
--- a/res/color/all_apps_tab_text.xml
+++ b/res/color/all_apps_tab_text.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/black" android:state_selected="true"/>
-    <item android:color="?android:attr/textColorTertiary"/>
+    <item android:color="#1B1B1B" android:state_selected="true"/>
+    <item android:color="#464646"/>
 </selector>
\ No newline at end of file
diff --git a/res/color/all_apps_tabs_background.xml b/res/color/all_apps_tabs_background.xml
new file mode 100644
index 0000000000..a4b7d1f216
--- /dev/null
+++ b/res/color/all_apps_tabs_background.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#F6F6F6"/>
+</selector>
\ No newline at end of file
diff --git a/res/drawable/all_apps_tabs_background.xml b/res/drawable/all_apps_tabs_background.xml
index a345dd3afc..4e953152d0 100644
--- a/res/drawable/all_apps_tabs_background.xml
+++ b/res/drawable/all_apps_tabs_background.xml
@@ -13,14 +13,12 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:top="@dimen/all_apps_tabs_vertical_padding"
-        android:bottom="@dimen/all_apps_tabs_vertical_padding
-">
+        android:bottom="@dimen/all_apps_tabs_vertical_padding">
         <shape android:shape="rectangle">
-            <solid android:color="?androidprv:attr/colorSurface" />
+            <solid android:color="@color/all_apps_tabs_background" />
             <corners android:radius="@dimen/all_apps_header_pill_corner_radius" />
         </shape>
     </item>
diff --git a/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java b/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
index 8f9cdc8a4c..be5822dca4 100644
--- a/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
+++ b/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
@@ -59,7 +59,8 @@ public class PersonalWorkSlidingTabStrip extends LinearLayout implements PageInd
                 R.dimen.all_apps_header_pill_corner_radius);
 
         mSelectedIndicatorPaint = new Paint();
-        mSelectedIndicatorPaint.setColor(context.getColor(R.color.all_apps_tab_bg));
+        mSelectedIndicatorPaint.setColor(
+                context.getColor(R.color.all_apps_tab_background_selected));
 
         mIsRtl = Utilities.isRtl(getResources());
     }
-- 
GitLab


From ecdf6575ec2546ecbd888865be4d48513537992d Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Mon, 7 Jun 2021 10:27:23 +0100
Subject: [PATCH 1361/1664] Add more education tips for widgets. (3/3)

Show tip on reconfigurable widget in launcher.

Bug: 185354491
Test: Manually tested tips in widget picker, all apps, and
reconfigurable widgets tip.

Change-Id: I08154c944285cac6a21c3ef4aafd878bbbccf44b
---
 res/layout/arrow_toast.xml                    |  5 +-
 res/values-v28/dimens.xml                     |  2 +-
 res/values/dimens.xml                         |  1 +
 res/values/strings.xml                        |  5 ++
 .../launcher3/AppWidgetResizeFrame.java       | 29 +++++++++++
 .../android/launcher3/views/ArrowTipView.java | 52 ++++++++++++-------
 .../launcher3/widget/BaseWidgetSheet.java     | 18 ++++---
 7 files changed, 83 insertions(+), 29 deletions(-)

diff --git a/res/layout/arrow_toast.xml b/res/layout/arrow_toast.xml
index aee00a95ae..9a6f8c35bd 100644
--- a/res/layout/arrow_toast.xml
+++ b/res/layout/arrow_toast.xml
@@ -28,13 +28,14 @@
         android:padding="16dp"
         android:background="@drawable/arrow_toast_rounded_background"
         android:elevation="2dp"
+        android:outlineProvider="none"
         android:textColor="@color/arrow_tip_view_content"
         android:textSize="14sp"/>
 
     <View
         android:id="@+id/arrow"
         android:elevation="2dp"
+        android:outlineProvider="none"
         android:layout_width="@dimen/arrow_toast_arrow_width"
-        android:layout_height="8dp"
-        android:layout_marginTop="-2dp"/>
+        android:layout_height="10dp"/>
 </merge>
diff --git a/res/values-v28/dimens.xml b/res/values-v28/dimens.xml
index ffa8cc4258..3f118cd9eb 100644
--- a/res/values-v28/dimens.xml
+++ b/res/values-v28/dimens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!-- Copyright (C) 2021 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d06561112e..29a8016a79 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -61,6 +61,7 @@
     <dimen name="widget_reconfigure_button_padding">6dp</dimen>
     <dimen name="widget_reconfigure_button_margin">32dp</dimen>
     <dimen name="widget_reconfigure_button_size">36dp</dimen>
+    <dimen name="widget_reconfigure_tip_top_margin">16dp</dimen>
 
 <!-- Fast scroll -->
     <dimen name="fastscroll_track_min_width">6dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c851cf8273..a470bcdf4e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -105,6 +105,11 @@
     <!-- Dialog text. This dialog lets a user know how they can use widgets on their phone.
          [CHAR_LIMIT=NONE] -->
     <string name="widget_education_content">To get info without opening apps, you can add widgets to your Home screen</string>
+
+    <!-- Text on an educational tip on widget informing users that they can change widget settings.
+         [CHAR_LIMIT=NONE] -->
+    <string name="reconfigurable_widget_education_tip">Tap to change widget settings</string>
+
     <!-- Text on the button that closes the education dialog about widgets. [CHAR_LIMIT=50] -->
     <string name="widget_education_close_button">Got it</string>
 
diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java
index 74ac8c24c4..ac582cdcbf 100644
--- a/src/com/android/launcher3/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher3/AppWidgetResizeFrame.java
@@ -30,6 +30,7 @@ import com.android.launcher3.logging.InstanceId;
 import com.android.launcher3.logging.InstanceIdSequence;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.util.PendingRequestArgs;
+import com.android.launcher3.views.ArrowTipView;
 import com.android.launcher3.widget.LauncherAppWidgetHostView;
 import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.util.WidgetSizes;
@@ -42,6 +43,8 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
     private static final float DIMMED_HANDLE_ALPHA = 0f;
     private static final float RESIZE_THRESHOLD = 0.66f;
 
+    private static final String KEY_RECONFIGURABLE_WIDGET_EDUCATION_TIP_SEEN =
+            "launcher.reconfigurable_widget_education_tip_seen";
     private static final Rect sTmpRect = new Rect();
 
     private static final int HANDLE_COUNT = 4;
@@ -238,6 +241,15 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
                             mWidgetView.getAppWidgetId(),
                             Launcher.REQUEST_RECONFIGURE_APPWIDGET);
             });
+            if (!hasSeenReconfigurableWidgetEducationTip()) {
+                post(() -> {
+                    if (showReconfigurableWidgetEducationTip() != null) {
+                        mLauncher.getSharedPrefs().edit()
+                                .putBoolean(KEY_RECONFIGURABLE_WIDGET_EDUCATION_TIP_SEEN,
+                                        true).apply();
+                    }
+                });
+            }
         }
 
         // When we create the resize frame, we first mark all cells as unoccupied. The appropriate
@@ -679,4 +691,21 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
                 || keyCode == KeyEvent.KEYCODE_MOVE_HOME || keyCode == KeyEvent.KEYCODE_MOVE_END
                 || keyCode == KeyEvent.KEYCODE_PAGE_UP || keyCode == KeyEvent.KEYCODE_PAGE_DOWN);
     }
+
+    private ArrowTipView showReconfigurableWidgetEducationTip() {
+        int[] coords = new int[2];
+        mReconfigureButton.getLocationOnScreen(coords);
+        int tipTopMargin = mLauncher.getResources()
+                .getDimensionPixelSize(R.dimen.widget_reconfigure_tip_top_margin);
+        return new ArrowTipView(mLauncher, /* isPointingUp= */ true).showAtLocation(
+                getContext().getString(R.string.reconfigurable_widget_education_tip),
+                /* arrowXCoord= */ coords[0] + mReconfigureButton.getWidth() / 2,
+                /* yCoord= */ coords[1] + mReconfigureButton.getHeight() + tipTopMargin);
+    }
+
+    private boolean hasSeenReconfigurableWidgetEducationTip() {
+        return mLauncher.getSharedPrefs()
+                .getBoolean(KEY_RECONFIGURABLE_WIDGET_EDUCATION_TIP_SEEN, false)
+                || Utilities.IS_RUNNING_IN_TEST_HARNESS;
+    }
 }
diff --git a/src/com/android/launcher3/views/ArrowTipView.java b/src/com/android/launcher3/views/ArrowTipView.java
index 07d377615b..f3068a7d43 100644
--- a/src/com/android/launcher3/views/ArrowTipView.java
+++ b/src/com/android/launcher3/views/ArrowTipView.java
@@ -73,6 +73,9 @@ public class ArrowTipView extends AbstractFloatingView {
     public boolean onControllerInterceptTouchEvent(MotionEvent ev) {
         if (ev.getAction() == MotionEvent.ACTION_DOWN) {
             close(true);
+            if (mActivity.getDragLayer().isEventOverView(this, ev)) {
+                return true;
+            }
         }
         return false;
     }
@@ -111,19 +114,19 @@ public class ArrowTipView extends AbstractFloatingView {
         ShapeDrawable arrowDrawable = new ShapeDrawable(TriangleShape.create(
                 arrowLp.width, arrowLp.height, mIsPointingUp));
         Paint arrowPaint = arrowDrawable.getPaint();
+        @Px int arrowTipRadius = getContext().getResources()
+                .getDimensionPixelSize(R.dimen.arrow_toast_corner_radius);
         arrowPaint.setColor(ContextCompat.getColor(getContext(), R.color.arrow_tip_view_bg));
-        // The corner path effect won't be reflected in the shadow, but shouldn't be noticeable.
-        arrowPaint.setPathEffect(new CornerPathEffect(
-                context.getResources().getDimension(R.dimen.arrow_toast_corner_radius)));
+        arrowPaint.setPathEffect(new CornerPathEffect(arrowTipRadius));
         arrowView.setBackground(arrowDrawable);
+        // Add negative margin so that the rounded corners on base of arrow are not visible.
         if (mIsPointingUp) {
             removeView(arrowView);
             addView(arrowView, 0);
+            ((ViewGroup.MarginLayoutParams) arrowLp).setMargins(0, 0, 0, -1 * arrowTipRadius);
+        } else {
+            ((ViewGroup.MarginLayoutParams) arrowLp).setMargins(0, -1 * arrowTipRadius, 0, 0);
         }
-
-        mIsOpen = true;
-
-        mHandler.postDelayed(() -> handleClose(true), AUTO_CLOSE_TIMEOUT_MILLIS);
     }
 
     /**
@@ -136,10 +139,10 @@ public class ArrowTipView extends AbstractFloatingView {
     /**
      * Show the ArrowTipView (tooltip) center, start, or end aligned.
      *
-     * @param text             The text to be shown in the tooltip.
-     * @param gravity          The gravity aligns the tooltip center, start, or end.
+     * @param text The text to be shown in the tooltip.
+     * @param gravity The gravity aligns the tooltip center, start, or end.
      * @param arrowMarginStart The margin from start to place arrow (ignored if center)
-     * @param top              The Y coordinate of the bottom of tooltip.
+     * @param top The Y coordinate of the bottom of tooltip.
      * @return The tooltip.
      */
     public ArrowTipView show(String text, int gravity, int arrowMarginStart, int top) {
@@ -166,6 +169,9 @@ public class ArrowTipView extends AbstractFloatingView {
         params.leftMargin = mActivity.getDeviceProfile().workspacePadding.left;
         params.rightMargin = mActivity.getDeviceProfile().workspacePadding.right;
         post(() -> setY(top - (mIsPointingUp ? 0 : getHeight())));
+
+        mIsOpen = true;
+        mHandler.postDelayed(() -> handleClose(true), AUTO_CLOSE_TIMEOUT_MILLIS);
         setAlpha(0);
         animate()
                 .alpha(1f)
@@ -180,14 +186,13 @@ public class ArrowTipView extends AbstractFloatingView {
     /**
      * Show the ArrowTipView (tooltip) custom aligned.
      *
-     * @param text        The text to be shown in the tooltip.
-     * @param arrowXCoord The X coordinate for the arrow on the tip. The arrow is usually in the
-     *                    center of ArrowTipView unless the ArrowTipView goes beyond screen margin.
-     * @param yCoord      The Y coordinate of the bottom of the tooltip.
-     * @return The tool tip view.
+     * @param text The text to be shown in the tooltip.
+     * @param arrowXCoord The X coordinate for the arrow on the tooltip. The arrow is usually in the
+     *                    center of tooltip unless the tooltip goes beyond screen margin.
+     * @param yCoord The Y coordinate of the pointed tip end of the tooltip.
+     * @return The tool tip view. {@code null} if the tip can not be shown.
      */
-    @Nullable
-    public ArrowTipView showAtLocation(String text, int arrowXCoord, int yCoord) {
+    @Nullable public ArrowTipView showAtLocation(String text, @Px int arrowXCoord, @Px int yCoord) {
         ViewGroup parent = mActivity.getDragLayer();
         @Px int parentViewWidth = parent.getWidth();
         @Px int maxTextViewWidth = getContext().getResources()
@@ -209,19 +214,30 @@ public class ArrowTipView extends AbstractFloatingView {
             float halfWidth = getWidth() / 2f;
             float xCoord;
             if (arrowXCoord - halfWidth < minViewMargin) {
+                // If the tooltip is estimated to go beyond the left margin, place its start just at
+                // the left margin.
                 xCoord = minViewMargin;
             } else if (arrowXCoord + halfWidth > parentViewWidth - minViewMargin) {
+                // If the tooltip is estimated to go beyond the right margin, place it such that its
+                // end is just at the right margin.
                 xCoord = parentViewWidth - minViewMargin - getWidth();
             } else {
+                // Place the tooltip such that its center is at arrowXCoord.
                 xCoord = arrowXCoord - halfWidth;
             }
             setX(xCoord);
-            setY(yCoord - getHeight());
+            // Place the tooltip such that its top is at yCoord if arrow is pointing upwards,
+            // otherwise place it such that its bottom is at yCoord.
+            setY(mIsPointingUp ? yCoord : yCoord - getHeight());
+            // Adjust the arrow's relative position on tooltip to make sure the actual position of
+            // arrow's pointed tip is always at arrowXCoord.
             View arrowView = findViewById(R.id.arrow);
             arrowView.setX(arrowXCoord - xCoord - arrowView.getWidth() / 2f);
             requestLayout();
         });
 
+        mIsOpen = true;
+        mHandler.postDelayed(() -> handleClose(true), AUTO_CLOSE_TIMEOUT_MILLIS);
         setAlpha(0);
         animate()
                 .alpha(1f)
diff --git a/src/com/android/launcher3/widget/BaseWidgetSheet.java b/src/com/android/launcher3/widget/BaseWidgetSheet.java
index edd42b4683..3bf993e199 100644
--- a/src/com/android/launcher3/widget/BaseWidgetSheet.java
+++ b/src/com/android/launcher3/widget/BaseWidgetSheet.java
@@ -207,16 +207,18 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView<Launcher>
         if (view == null || !ViewCompat.isLaidOut(view)) {
             return null;
         }
-
-        mActivityContext.getSharedPrefs().edit()
-                .putBoolean(KEY_WIDGETS_EDUCATION_TIP_SEEN, true).apply();
         int[] coords = new int[2];
         view.getLocationOnScreen(coords);
-        ArrowTipView arrowTipView = new ArrowTipView(mActivityContext);
-        return arrowTipView.showAtLocation(
-                getContext().getString(R.string.long_press_widget_to_add),
-                /* arrowXCoord= */coords[0] + view.getWidth() / 2,
-                /* yCoord= */coords[1]);
+        ArrowTipView arrowTipView =
+                new ArrowTipView(mActivityContext,  /* isPointingUp= */ false).showAtLocation(
+                        getContext().getString(R.string.long_press_widget_to_add),
+                        /* arrowXCoord= */coords[0] + view.getWidth() / 2,
+                        /* yCoord= */coords[1]);
+        if (arrowTipView != null) {
+            mActivityContext.getSharedPrefs().edit()
+                    .putBoolean(KEY_WIDGETS_EDUCATION_TIP_SEEN, true).apply();
+        }
+        return arrowTipView;
     }
 
     /** Returns {@code true} if tip has previously been shown on any of {@link BaseWidgetSheet}. */
-- 
GitLab


From dca47432fcce4cbb91a29d0e3e0deef6460a7cc8 Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Tue, 8 Jun 2021 14:35:22 +0100
Subject: [PATCH 1362/1664] Flip ArrowTipView when it goes beyond screen
 height.

Bug: 185354491
Test: Manually tested tips in widget picker, all apps, and
reconfigurable widgets tip.

Change-Id: I5d1c9e4b8bc3ae89834bc198016ffa409a2b28ad
---
 .../launcher3/AppWidgetResizeFrame.java       |  23 ++--
 .../android/launcher3/views/ArrowTipView.java | 123 ++++++++++++++----
 2 files changed, 111 insertions(+), 35 deletions(-)

diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java
index ac582cdcbf..9e21e1a0f1 100644
--- a/src/com/android/launcher3/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher3/AppWidgetResizeFrame.java
@@ -24,6 +24,9 @@ import android.view.View;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 
+import androidx.annotation.Nullable;
+import androidx.annotation.Px;
+
 import com.android.launcher3.accessibility.DragViewStateAnnouncer;
 import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.logging.InstanceId;
@@ -692,15 +695,19 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
                 || keyCode == KeyEvent.KEYCODE_PAGE_UP || keyCode == KeyEvent.KEYCODE_PAGE_DOWN);
     }
 
-    private ArrowTipView showReconfigurableWidgetEducationTip() {
-        int[] coords = new int[2];
-        mReconfigureButton.getLocationOnScreen(coords);
-        int tipTopMargin = mLauncher.getResources()
+    @Nullable private ArrowTipView showReconfigurableWidgetEducationTip() {
+        Rect rect = new Rect();
+        if (!mReconfigureButton.getGlobalVisibleRect(rect)) {
+            return null;
+        }
+        @Px int tipMargin = mLauncher.getResources()
                 .getDimensionPixelSize(R.dimen.widget_reconfigure_tip_top_margin);
-        return new ArrowTipView(mLauncher, /* isPointingUp= */ true).showAtLocation(
-                getContext().getString(R.string.reconfigurable_widget_education_tip),
-                /* arrowXCoord= */ coords[0] + mReconfigureButton.getWidth() / 2,
-                /* yCoord= */ coords[1] + mReconfigureButton.getHeight() + tipTopMargin);
+        return new ArrowTipView(mLauncher, /* isPointingUp= */ true)
+                .showAroundRect(
+                        getContext().getString(R.string.reconfigurable_widget_education_tip),
+                        /* arrowXCoord= */ rect.left + mReconfigureButton.getWidth() / 2,
+                        /* rect= */ rect,
+                        /* margin= */ tipMargin);
     }
 
     private boolean hasSeenReconfigurableWidgetEducationTip() {
diff --git a/src/com/android/launcher3/views/ArrowTipView.java b/src/com/android/launcher3/views/ArrowTipView.java
index f3068a7d43..e449a4bfbf 100644
--- a/src/com/android/launcher3/views/ArrowTipView.java
+++ b/src/com/android/launcher3/views/ArrowTipView.java
@@ -17,8 +17,10 @@
 package com.android.launcher3.views;
 
 import android.content.Context;
+import android.content.res.Configuration;
 import android.graphics.CornerPathEffect;
 import android.graphics.Paint;
+import android.graphics.Rect;
 import android.graphics.drawable.ShapeDrawable;
 import android.os.Handler;
 import android.util.Log;
@@ -53,9 +55,10 @@ public class ArrowTipView extends AbstractFloatingView {
 
     protected final BaseDraggingActivity mActivity;
     private final Handler mHandler = new Handler();
-    private final boolean mIsPointingUp;
     private final int mArrowWidth;
+    private boolean mIsPointingUp;
     private Runnable mOnClosed;
+    private View mArrowView;
 
     public ArrowTipView(Context context) {
         this(context, false);
@@ -109,24 +112,8 @@ public class ArrowTipView extends AbstractFloatingView {
         inflate(context, R.layout.arrow_toast, this);
         setOrientation(LinearLayout.VERTICAL);
 
-        View arrowView = findViewById(R.id.arrow);
-        ViewGroup.LayoutParams arrowLp = arrowView.getLayoutParams();
-        ShapeDrawable arrowDrawable = new ShapeDrawable(TriangleShape.create(
-                arrowLp.width, arrowLp.height, mIsPointingUp));
-        Paint arrowPaint = arrowDrawable.getPaint();
-        @Px int arrowTipRadius = getContext().getResources()
-                .getDimensionPixelSize(R.dimen.arrow_toast_corner_radius);
-        arrowPaint.setColor(ContextCompat.getColor(getContext(), R.color.arrow_tip_view_bg));
-        arrowPaint.setPathEffect(new CornerPathEffect(arrowTipRadius));
-        arrowView.setBackground(arrowDrawable);
-        // Add negative margin so that the rounded corners on base of arrow are not visible.
-        if (mIsPointingUp) {
-            removeView(arrowView);
-            addView(arrowView, 0);
-            ((ViewGroup.MarginLayoutParams) arrowLp).setMargins(0, 0, 0, -1 * arrowTipRadius);
-        } else {
-            ((ViewGroup.MarginLayoutParams) arrowLp).setMargins(0, -1 * arrowTipRadius, 0, 0);
-        }
+        mArrowView = findViewById(R.id.arrow);
+        updateArrowTipInView();
     }
 
     /**
@@ -152,8 +139,7 @@ public class ArrowTipView extends AbstractFloatingView {
 
         DragLayer.LayoutParams params = (DragLayer.LayoutParams) getLayoutParams();
         params.gravity = gravity;
-        LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) findViewById(
-                R.id.arrow).getLayoutParams();
+        LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) mArrowView.getLayoutParams();
         lp.gravity = gravity;
 
         if (parent.getLayoutDirection() == LAYOUT_DIRECTION_RTL) {
@@ -184,7 +170,8 @@ public class ArrowTipView extends AbstractFloatingView {
     }
 
     /**
-     * Show the ArrowTipView (tooltip) custom aligned.
+     * Show the ArrowTipView (tooltip) custom aligned. The tooltip is vertically flipped if it
+     * cannot fit on screen in the requested orientation.
      *
      * @param text The text to be shown in the tooltip.
      * @param arrowXCoord The X coordinate for the arrow on the tooltip. The arrow is usually in the
@@ -193,8 +180,51 @@ public class ArrowTipView extends AbstractFloatingView {
      * @return The tool tip view. {@code null} if the tip can not be shown.
      */
     @Nullable public ArrowTipView showAtLocation(String text, @Px int arrowXCoord, @Px int yCoord) {
+        return showAtLocation(
+                text,
+                arrowXCoord,
+                /* yCoordDownPointingTip= */ yCoord,
+                /* yCoordUpPointingTip= */ yCoord);
+    }
+
+    /**
+     * Show the ArrowTipView (tooltip) custom aligned. The tooltip is vertically flipped if it
+     * cannot fit on screen in the requested orientation.
+     *
+     * @param text The text to be shown in the tooltip.
+     * @param arrowXCoord The X coordinate for the arrow on the tooltip. The arrow is usually in the
+     *                    center of tooltip unless the tooltip goes beyond screen margin.
+     * @param rect The coordinates of the view which requests the tooltip to be shown.
+     * @param margin The margin between {@param rect} and the tooltip.
+     * @return The tool tip view. {@code null} if the tip can not be shown.
+     */
+    @Nullable public ArrowTipView showAroundRect(
+            String text, @Px int arrowXCoord, Rect rect, @Px int margin) {
+        return showAtLocation(
+                text,
+                arrowXCoord,
+                /* yCoordDownPointingTip= */ rect.top - margin,
+                /* yCoordUpPointingTip= */ rect.bottom + margin);
+    }
+
+    /**
+     * Show the ArrowTipView (tooltip) custom aligned. The tooltip is vertically flipped if it
+     * cannot fit on screen in the requested orientation.
+     *
+     * @param text The text to be shown in the tooltip.
+     * @param arrowXCoord The X coordinate for the arrow on the tooltip. The arrow is usually in the
+     *                    center of tooltip unless the tooltip goes beyond screen margin.
+     * @param yCoordDownPointingTip The Y coordinate of the pointed tip end of the tooltip when the
+     *                              tooltip is placed pointing downwards.
+     * @param yCoordUpPointingTip The Y coordinate of the pointed tip end of the tooltip when the
+     *                            tooltip is placed pointing upwards.
+     * @return The tool tip view. {@code null} if the tip can not be shown.
+     */
+    @Nullable private ArrowTipView showAtLocation(String text, @Px int arrowXCoord,
+            @Px int yCoordDownPointingTip, @Px int yCoordUpPointingTip) {
         ViewGroup parent = mActivity.getDragLayer();
         @Px int parentViewWidth = parent.getWidth();
+        @Px int parentViewHeight = parent.getHeight();
         @Px int maxTextViewWidth = getContext().getResources()
                 .getDimensionPixelSize(R.dimen.widget_picker_education_tip_max_width);
         @Px int minViewMargin = getContext().getResources()
@@ -211,6 +241,7 @@ public class ArrowTipView extends AbstractFloatingView {
         requestLayout();
 
         post(() -> {
+            // Adjust the tooltip horizontally.
             float halfWidth = getWidth() / 2f;
             float xCoord;
             if (arrowXCoord - halfWidth < minViewMargin) {
@@ -226,13 +257,24 @@ public class ArrowTipView extends AbstractFloatingView {
                 xCoord = arrowXCoord - halfWidth;
             }
             setX(xCoord);
-            // Place the tooltip such that its top is at yCoord if arrow is pointing upwards,
-            // otherwise place it such that its bottom is at yCoord.
-            setY(mIsPointingUp ? yCoord : yCoord - getHeight());
+
+            // Adjust the tooltip vertically.
+            @Px int viewHeight = getHeight();
+            if (mIsPointingUp
+                    ? (yCoordUpPointingTip + viewHeight > parentViewHeight)
+                    : (yCoordDownPointingTip - viewHeight < 0)) {
+                // Flip the view if it exceeds the vertical bounds of screen.
+                mIsPointingUp = !mIsPointingUp;
+                updateArrowTipInView();
+            }
+            // Place the tooltip such that its top is at yCoordUpPointingTip if arrow is displayed
+            // pointing upwards, otherwise place it such that its bottom is at
+            // yCoordDownPointingTip.
+            setY(mIsPointingUp ? yCoordUpPointingTip : yCoordDownPointingTip - viewHeight);
+
             // Adjust the arrow's relative position on tooltip to make sure the actual position of
             // arrow's pointed tip is always at arrowXCoord.
-            View arrowView = findViewById(R.id.arrow);
-            arrowView.setX(arrowXCoord - xCoord - arrowView.getWidth() / 2f);
+            mArrowView.setX(arrowXCoord - xCoord - mArrowView.getWidth() / 2f);
             requestLayout();
         });
 
@@ -249,6 +291,27 @@ public class ArrowTipView extends AbstractFloatingView {
         return this;
     }
 
+    private void updateArrowTipInView() {
+        ViewGroup.LayoutParams arrowLp = mArrowView.getLayoutParams();
+        ShapeDrawable arrowDrawable = new ShapeDrawable(TriangleShape.create(
+                arrowLp.width, arrowLp.height, mIsPointingUp));
+        Paint arrowPaint = arrowDrawable.getPaint();
+        @Px int arrowTipRadius = getContext().getResources()
+                .getDimensionPixelSize(R.dimen.arrow_toast_corner_radius);
+        arrowPaint.setColor(ContextCompat.getColor(getContext(), R.color.arrow_tip_view_bg));
+        arrowPaint.setPathEffect(new CornerPathEffect(arrowTipRadius));
+        mArrowView.setBackground(arrowDrawable);
+        // Add negative margin so that the rounded corners on base of arrow are not visible.
+        removeView(mArrowView);
+        if (mIsPointingUp) {
+            addView(mArrowView, 0);
+            ((ViewGroup.MarginLayoutParams) arrowLp).setMargins(0, 0, 0, -1 * arrowTipRadius);
+        } else {
+            addView(mArrowView, 1);
+            ((ViewGroup.MarginLayoutParams) arrowLp).setMargins(0, -1 * arrowTipRadius, 0, 0);
+        }
+    }
+
     /**
      * Register a callback fired when toast is hidden
      */
@@ -256,4 +319,10 @@ public class ArrowTipView extends AbstractFloatingView {
         mOnClosed = runnable;
         return this;
     }
+
+    @Override
+    protected void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        close(/* animate= */ false);
+    }
 }
-- 
GitLab


From b1b76c34f5cb5c6f912a20361551f4be49707c95 Mon Sep 17 00:00:00 2001
From: Ryan Savitski <rsavitski@google.com>
Date: Thu, 10 Jun 2021 15:30:14 +0100
Subject: [PATCH 1363/1664] Revert "Revert "Set FLAG_IMMUTABLE flag on
 FirstScreenBroadcast PendingIntent. <snip>

This reverts commit 1aa95b84006a8eeeac54e25e1444a5ea66fc5b02.

Reason for revert: automerger got confused by the revert of a merge, and
skipped it downstream.

NB: resending this as a standalone patch, NOT generated via Gerrit's
"revert" functionality, to avoid confusing AM further (I'm told there
are hidden tags involved).

IGNORE_MERGE_CONFLICT_CHECK=="trying to fix the build, see the rest of the topic"

Since the revert was skipped downstream, using a merged-in tag to also
stop this change from propagating.

Bug: 183927137
Merged-In: I8d8e38a1aa6bdf13879d460cfa84cabe6c6bb1f2
Change-Id: I541eeb1cc1b589dc0134a5e2e4c16be9f658fbbb
---
 .../launcher3/model/FirstScreenBroadcast.java       | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/model/FirstScreenBroadcast.java b/src/com/android/launcher3/model/FirstScreenBroadcast.java
index 5112304fb8..18ce0358bb 100644
--- a/src/com/android/launcher3/model/FirstScreenBroadcast.java
+++ b/src/com/android/launcher3/model/FirstScreenBroadcast.java
@@ -15,7 +15,18 @@
  */
 package com.android.launcher3.model;
 
+<<<<<<< TARGET BRANCH (878601 Block recent work profile apps content capture)
 import static android.os.Process.myUserHandle;
+=======
+import static android.app.PendingIntent.FLAG_IMMUTABLE;
+import static android.app.PendingIntent.FLAG_ONE_SHOT;
+import static android.os.Process.myUserHandle;
+
+import static com.android.launcher3.pm.InstallSessionHelper.getUserHandle;
+
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.mapping;
+>>>>>>> SOURCE BRANCH (578578 Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingInten)
 
 import android.app.PendingIntent;
 import android.content.Context;
@@ -145,7 +156,7 @@ public class FirstScreenBroadcast {
                 .putStringArrayListExtra(HOTSEAT_ITEM_EXTRA, new ArrayList<>(hotseatItems))
                 .putStringArrayListExtra(WIDGET_ITEM_EXTRA, new ArrayList<>(widgetItems))
                 .putExtra(VERIFICATION_TOKEN_EXTRA, PendingIntent.getActivity(context, 0,
-                        new Intent(), PendingIntent.FLAG_ONE_SHOT)));
+                        new Intent(), FLAG_ONE_SHOT | FLAG_IMMUTABLE)));
     }
 
     private static String getPackageName(ItemInfo info) {
-- 
GitLab


From 5af0edefdb1f1b86f2d3112a7394c04324e79d74 Mon Sep 17 00:00:00 2001
From: Ryan Savitski <rsavitski@google.com>
Date: Thu, 10 Jun 2021 15:39:36 +0100
Subject: [PATCH 1364/1664] Set FLAG_IMMUTABLE flag on FirstScreenBroadcast
 PendingIntent.

Fixing build by getting rid of the erroneously merged conflict markers,
and applying the end state of ag/14651125.

Bug: 183927137
Merged-In: I881a2b79462e8d420b3dcb6a6b98adbe9e8e0394
Change-Id: I70acd4ce48853be728be1fb80b4b885d00a059a9
---
 .../android/launcher3/model/FirstScreenBroadcast.java    | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/com/android/launcher3/model/FirstScreenBroadcast.java b/src/com/android/launcher3/model/FirstScreenBroadcast.java
index 18ce0358bb..f9ed2c78b6 100644
--- a/src/com/android/launcher3/model/FirstScreenBroadcast.java
+++ b/src/com/android/launcher3/model/FirstScreenBroadcast.java
@@ -15,19 +15,10 @@
  */
 package com.android.launcher3.model;
 
-<<<<<<< TARGET BRANCH (878601 Block recent work profile apps content capture)
-import static android.os.Process.myUserHandle;
-=======
 import static android.app.PendingIntent.FLAG_IMMUTABLE;
 import static android.app.PendingIntent.FLAG_ONE_SHOT;
 import static android.os.Process.myUserHandle;
 
-import static com.android.launcher3.pm.InstallSessionHelper.getUserHandle;
-
-import static java.util.stream.Collectors.groupingBy;
-import static java.util.stream.Collectors.mapping;
->>>>>>> SOURCE BRANCH (578578 Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingInten)
-
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
-- 
GitLab


From 1059c30f3a049ee2fcbd6f3c2bda2a01bfa66e68 Mon Sep 17 00:00:00 2001
From: Stevie Kideckel <kideckel@google.com>
Date: Thu, 10 Jun 2021 15:29:46 +0000
Subject: [PATCH 1365/1664] Account for header margin depending on which header
 is selected

This removes jitter from incorrectly counting or not the margins for the
headers near the top of the widget picker list.

Bug: 189956230
Test: verified locally
Change-Id: I3eeddbf8a1fb7cca31fe2a12c28b0eb444de631b
---
 .../widget/picker/WidgetsListAdapter.java         |  6 ++++++
 .../widget/picker/WidgetsRecyclerView.java        | 15 +++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
index 150bd9902f..e89aea7507 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
@@ -298,6 +298,12 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
         scrollToPositionAndMaintainOffset(positionForPackageUserKey, topForPackageUserKey);
     }
 
+    /** Returns the position of the currently expanded header, or empty if it's not present. */
+    public OptionalInt getSelectedHeaderPosition() {
+        if (mWidgetsContentVisiblePackageUserKey == null) return OptionalInt.empty();
+        return getPositionForPackageUserKey(mWidgetsContentVisiblePackageUserKey);
+    }
+
     /**
      * Returns the position of {@code key} in {@link #mVisibleEntries}, or  empty if it's not
      * present.
diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java b/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
index 090362ba33..4f4f1a3566 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
@@ -53,6 +53,7 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
     private HeaderViewDimensionsProvider mHeaderViewDimensionsProvider;
     private int mLastVisibleWidgetContentTableHeight = 0;
     private int mWidgetHeaderHeight = 0;
+    private final int mCollapsedHeaderBottomMarginSize;
     @Nullable private OnContentChangeListener mOnContentChangeListener;
 
     public WidgetsRecyclerView(Context context) {
@@ -71,6 +72,10 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
 
         ActivityContext activity = ActivityContext.lookupContext(getContext());
         DeviceProfile grid = activity.getDeviceProfile();
+
+        // The bottom margin used when the header is not expanded.
+        mCollapsedHeaderBottomMarginSize =
+                getResources().getDimensionPixelSize(R.dimen.widget_list_entry_bottom_margin);
     }
 
     @Override
@@ -182,10 +187,7 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
                     && mLastVisibleWidgetContentTableHeight == 0
                     && view.getMeasuredHeight() > 0) {
                 // This assumes all header views are of the same height.
-                RecyclerView.LayoutParams layoutParams =
-                        (RecyclerView.LayoutParams) view.getLayoutParams();
-                mWidgetHeaderHeight = view.getMeasuredHeight() + layoutParams.topMargin
-                    + layoutParams.bottomMargin;
+                mWidgetHeaderHeight = view.getMeasuredHeight();
             }
         }
 
@@ -279,12 +281,17 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
         if (untilIndex > mAdapter.getItems().size()) {
             untilIndex = mAdapter.getItems().size();
         }
+        int expandedHeaderPosition = mAdapter.getSelectedHeaderPosition().orElse(-1);
         int totalItemsHeight = 0;
         for (int i = 0; i < untilIndex; i++) {
             WidgetsListBaseEntry entry = mAdapter.getItems().get(i);
             if (entry instanceof WidgetsListHeaderEntry
                     || entry instanceof WidgetsListSearchHeaderEntry) {
                 totalItemsHeight += mWidgetHeaderHeight;
+                if (expandedHeaderPosition != i) {
+                    // If the header is collapsed, include the bottom margin it will use.
+                    totalItemsHeight += mCollapsedHeaderBottomMarginSize;
+                }
             } else if (entry instanceof WidgetsListContentEntry) {
                 totalItemsHeight += mLastVisibleWidgetContentTableHeight;
             } else {
-- 
GitLab


From bc5099e9a6bd66a8b9fa1c512c84545f059a8680 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Thu, 10 Jun 2021 15:47:40 +0100
Subject: [PATCH 1366/1664] Fix height estimation of the widgets recommendation
 table

There are two vertical paddings
1. Table padding
2. Widget cell padding

We haven't taken account the widget cells padding

Test: Manual
Bug: 189814077
Change-Id: I9b1dc9e880d4402b9c461d0024a0748c0afc408a
---
 .../widget/picker/WidgetsRecommendationTableLayout.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
index 9167d870e3..fe42ddfb15 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
@@ -45,6 +45,7 @@ public final class WidgetsRecommendationTableLayout extends TableLayout {
     private static final float DOWN_SCALE_RATIO = 0.9f;
     private static final float MAX_DOWN_SCALE_RATIO = 0.5f;
     private final float mWidgetsRecommendationTableVerticalPadding;
+    private final float mWidgetCellVerticalPadding;
     private final float mWidgetCellTextViewsHeight;
 
     private float mRecommendationTableMaxHeight = Float.MAX_VALUE;
@@ -60,6 +61,8 @@ public final class WidgetsRecommendationTableLayout extends TableLayout {
         super(context, attrs);
         // There are 1 row for title, 1 row for dimension and 2 rows for description.
         mWidgetsRecommendationTableVerticalPadding = 2 * getResources()
+                .getDimensionPixelSize(R.dimen.recommended_widgets_table_vertical_padding);
+        mWidgetCellVerticalPadding = 2 * getResources()
                 .getDimensionPixelSize(R.dimen.widget_cell_vertical_padding);
         mWidgetCellTextViewsHeight = 4 * getResources().getDimension(R.dimen.widget_cell_font_size);
     }
@@ -152,7 +155,8 @@ public final class WidgetsRecommendationTableLayout extends TableLayout {
                 Size widgetSize = WidgetSizes.getWidgetSizePx(
                         deviceProfile, widgetItem.spanX, widgetItem.spanY);
                 float previewHeight = widgetSize.getHeight() * previewScale;
-                rowHeight = Math.max(rowHeight, previewHeight + mWidgetCellTextViewsHeight);
+                rowHeight = Math.max(rowHeight,
+                        previewHeight + mWidgetCellTextViewsHeight + mWidgetCellVerticalPadding);
             }
             totalHeight += rowHeight;
         }
-- 
GitLab


From 89299047d7d4760545d1269de69f581700abcdde Mon Sep 17 00:00:00 2001
From: Jonathan Miranda <jonmiranda@google.com>
Date: Thu, 10 Jun 2021 16:12:38 +0000
Subject: [PATCH 1367/1664] Forward fix for: Set FLAG_IMMUTABLE flag on
 FirstScreenBroadcast PendingIntent.

Bug: 179289753
Bug: 183927137
Test: restore phone and ensure broadcast is sent

Change-Id: I60e179d35957309f404937473fb5272f115b65ce
Merged-In: I70acd4ce48853be728be1fb80b4b885d00a059a9
---
 src/com/android/launcher3/model/FirstScreenBroadcast.java | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/com/android/launcher3/model/FirstScreenBroadcast.java b/src/com/android/launcher3/model/FirstScreenBroadcast.java
index b8dbd08901..4d017bd4e8 100644
--- a/src/com/android/launcher3/model/FirstScreenBroadcast.java
+++ b/src/com/android/launcher3/model/FirstScreenBroadcast.java
@@ -17,12 +17,6 @@ package com.android.launcher3.model;
 
 import static android.app.PendingIntent.FLAG_IMMUTABLE;
 import static android.app.PendingIntent.FLAG_ONE_SHOT;
-import static android.os.Process.myUserHandle;
-
-import static com.android.launcher3.pm.InstallSessionHelper.getUserHandle;
-
-import static java.util.stream.Collectors.groupingBy;
-import static java.util.stream.Collectors.mapping;
 
 import android.app.PendingIntent;
 import android.content.Context;
-- 
GitLab


From 139a54f20e6f1e58e56b379045c11f726a54e16b Mon Sep 17 00:00:00 2001
From: zakcohen <zakcohen@google.com>
Date: Thu, 10 Jun 2021 10:39:32 -0700
Subject: [PATCH 1368/1664] Suppress failing view inflation tests until
 investigation

Widget parts of ViewInflationDuringSwipeUp are failing on some devices,
looks like a test architecture problem, not a code failing problem.


Bug: 190729479
Test: Ran remaining tests
Change-Id: I7598f381053f7136b2fcd861ec73d2fda239bb8d
---
 .../src/com/android/quickstep/ViewInflationDuringSwipeUp.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java b/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java
index b4329c1765..ea7b7f5dfb 100644
--- a/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java
+++ b/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java
@@ -43,6 +43,7 @@ import android.view.ViewConfiguration;
 import android.widget.RemoteViews;
 
 import androidx.test.filters.LargeTest;
+import androidx.test.filters.Suppress;
 import androidx.test.runner.AndroidJUnit4;
 import androidx.test.uiautomator.By;
 import androidx.test.uiautomator.UiDevice;
@@ -133,6 +134,7 @@ public class ViewInflationDuringSwipeUp extends AbstractQuickStepTest {
 
     @Test
     @NavigationModeSwitch(mode = ZERO_BUTTON)
+    @Suppress // until b/190729479 is fixed
     public void testSwipeUpFromApp_widget_update() {
         String stubText = "Some random stub text";
 
@@ -145,6 +147,7 @@ public class ViewInflationDuringSwipeUp extends AbstractQuickStepTest {
 
     @Test
     @NavigationModeSwitch(mode = ZERO_BUTTON)
+    @Suppress // until b/190729479 is fixed
     public void testSwipeUp_with_list_widgets() {
         SimpleViewsFactory viewFactory = new SimpleViewsFactory();
         viewFactory.viewCount = 1;
-- 
GitLab


From 32ff76cb4e7f6643db05868941bb66b5934d1f31 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Tue, 1 Jun 2021 21:26:10 -0700
Subject: [PATCH 1369/1664] Adding color back to popup container.

For Color exctraction now occurs in groups:
- System shortcuts
- Deep shortcuts
- Notifications

For home setting popup, each DeepShortcutView will have its own
extracted color.

Bug: 188095443
Test: manual
Change-Id: I7e209f863ff180b8f017aeb2a73c6f1a51842e68
---
 res/layout/longpress_options_menu.xml         |   2 +-
 res/layout/popup_container.xml                |  11 +-
 res/values-v31/colors.xml                     |   4 +-
 res/values/config.xml                         |   3 +
 .../notification/NotificationItemView.java    |  10 +
 .../notification/NotificationMainView.java    |  33 ++-
 .../android/launcher3/popup/ArrowPopup.java   | 216 ++++++++++++++++--
 .../popup/PopupContainerWithArrow.java        |  42 +++-
 .../launcher3/views/OptionsPopupView.java     |  14 +-
 .../com/android/launcher3/tapl/AppIcon.java   |   4 +-
 .../tapl/LauncherInstrumentation.java         |   2 +-
 .../launcher3/tapl/OptionsPopupMenu.java      |   2 +-
 .../com/android/launcher3/tapl/Workspace.java |   2 +-
 13 files changed, 300 insertions(+), 45 deletions(-)

diff --git a/res/layout/longpress_options_menu.xml b/res/layout/longpress_options_menu.xml
index d2f7a660d9..fbe28d85a9 100644
--- a/res/layout/longpress_options_menu.xml
+++ b/res/layout/longpress_options_menu.xml
@@ -15,7 +15,7 @@
 -->
 <com.android.launcher3.views.OptionsPopupView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/deep_shortcuts_container"
+    android:id="@+id/popup_container"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:clipToPadding="false"
diff --git a/res/layout/popup_container.xml b/res/layout/popup_container.xml
index 7c78e441f2..18014bb1d0 100644
--- a/res/layout/popup_container.xml
+++ b/res/layout/popup_container.xml
@@ -16,12 +16,21 @@
 
 <com.android.launcher3.popup.PopupContainerWithArrow
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/deep_shortcuts_container"
+    android:id="@+id/popup_container"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:clipToPadding="false"
     android:clipChildren="false"
     android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/deep_shortcuts_container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:tag="@string/popup_container_iterate_children"
+        android:elevation="@dimen/deep_shortcuts_elevation"
+        android:orientation="vertical"/>
+
     <LinearLayout
         android:id="@+id/notification_container"
         android:layout_width="match_parent"
diff --git a/res/values-v31/colors.xml b/res/values-v31/colors.xml
index a9721a4434..1434430223 100644
--- a/res/values-v31/colors.xml
+++ b/res/values-v31/colors.xml
@@ -17,11 +17,11 @@
 */
 -->
 <resources>
-    <color name="popup_color_primary_light">@android:color/system_neutral1_0</color>
+    <color name="popup_color_primary_light">@android:color/system_accent2_50</color>
     <color name="popup_color_secondary_light">@android:color/system_neutral2_100</color>
     <color name="popup_color_tertiary_light">@android:color/system_neutral2_300</color>
     <color name="popup_color_neutral_dark">@android:color/system_neutral1_1000</color>
-    <color name="popup_color_primary_dark">@android:color/system_neutral1_800</color>
+    <color name="popup_color_primary_dark">@android:color/system_neutral2_800</color>
     <color name="popup_color_secondary_dark">@android:color/system_neutral1_900</color>
     <color name="popup_color_tertiary_dark">@android:color/system_neutral2_700</color>
 
diff --git a/res/values/config.xml b/res/values/config.xml
index 77c7e986d5..299c80ef8b 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -31,6 +31,9 @@
     <!-- View tag key used to store SpringAnimation data. -->
     <item type="id" name="spring_animation_tag" />
 
+    <!-- View tag key used to determine if we should fade in the child views.. -->
+    <string name="popup_container_iterate_children" translatable="false">popup_container_iterate_children</string>
+
     <!-- Workspace -->
     <!-- The duration (in ms) of the fade animation on the object outlines, used when
          we are dragging objects around on the home screen. -->
diff --git a/src/com/android/launcher3/notification/NotificationItemView.java b/src/com/android/launcher3/notification/NotificationItemView.java
index d44d158010..932e721058 100644
--- a/src/com/android/launcher3/notification/NotificationItemView.java
+++ b/src/com/android/launcher3/notification/NotificationItemView.java
@@ -18,6 +18,7 @@ package com.android.launcher3.notification;
 
 import static com.android.launcher3.touch.SingleAxisSwipeDetector.HORIZONTAL;
 
+import android.animation.AnimatorSet;
 import android.app.Notification;
 import android.content.Context;
 import android.graphics.Color;
@@ -92,6 +93,15 @@ public class NotificationItemView {
         });
     }
 
+    /**
+     * Animates the background color to a new color.
+     * @param color The color to change to.
+     * @param animatorSetOut The AnimatorSet where we add the color animator to.
+     */
+    public void updateBackgroundColor(int color, AnimatorSet animatorSetOut) {
+        mMainView.updateBackgroundColor(color, animatorSetOut);
+    }
+
     public void addGutter() {
         if (mGutter == null) {
             mGutter = mPopupContainer.inflateAndAdd(R.layout.notification_gutter, mRootView);
diff --git a/src/com/android/launcher3/notification/NotificationMainView.java b/src/com/android/launcher3/notification/NotificationMainView.java
index c9956667db..e9b5f32ce7 100644
--- a/src/com/android/launcher3/notification/NotificationMainView.java
+++ b/src/com/android/launcher3/notification/NotificationMainView.java
@@ -20,10 +20,13 @@ import static com.android.launcher3.anim.Interpolators.scrollInterpolatorForVelo
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_NOTIFICATION_DISMISSED;
 
 import android.animation.Animator;
+import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
+import android.animation.ValueAnimator;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.ColorStateList;
+import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.RippleDrawable;
 import android.os.Build;
@@ -78,6 +81,9 @@ public class NotificationMainView extends FrameLayout implements SingleAxisSwipe
 
     private SingleAxisSwipeDetector mSwipeDetector;
 
+    private final ColorDrawable mColorDrawable;
+    private final RippleDrawable mRippleDrawable;
+
     public NotificationMainView(Context context) {
         this(context, null, 0);
     }
@@ -90,6 +96,10 @@ public class NotificationMainView extends FrameLayout implements SingleAxisSwipe
         super(context, attrs, defStyle);
 
         mContentTranslateAnimator = ObjectAnimator.ofFloat(this, CONTENT_TRANSLATION, 0);
+        mColorDrawable = new ColorDrawable(Color.TRANSPARENT);
+        mRippleDrawable = new RippleDrawable(ColorStateList.valueOf(
+                Themes.getAttrColor(getContext(), android.R.attr.colorControlHighlight)),
+                mColorDrawable, null);
     }
 
     @Override
@@ -105,18 +115,31 @@ public class NotificationMainView extends FrameLayout implements SingleAxisSwipe
         updateBackgroundColor(colorBackground.getColor());
     }
 
-    public void updateBackgroundColor(int color) {
+    private void updateBackgroundColor(int color) {
         mBackgroundColor = color;
-        RippleDrawable rippleBackground = new RippleDrawable(ColorStateList.valueOf(
-                Themes.getAttrColor(getContext(), android.R.attr.colorControlHighlight)),
-                new ColorDrawable(color), null);
-        mTextAndBackground.setBackground(rippleBackground);
+        mColorDrawable.setColor(color);
+        mTextAndBackground.setBackground(mRippleDrawable);
         if (mNotificationInfo != null) {
             mIconView.setBackground(mNotificationInfo.getIconForBackground(getContext(),
                     mBackgroundColor));
         }
     }
 
+    /**
+     * Animates the background color to a new color.
+     * @param color The color to change to.
+     * @param animatorSetOut The AnimatorSet where we add the color animator to.
+     */
+    public void updateBackgroundColor(int color, AnimatorSet animatorSetOut) {
+        int oldColor = mBackgroundColor;
+        ValueAnimator colors = ValueAnimator.ofArgb(oldColor, color);
+        colors.addUpdateListener(valueAnimator -> {
+            int newColor = (int) valueAnimator.getAnimatedValue();
+            updateBackgroundColor(newColor);
+        });
+        animatorSetOut.play(colors);
+    }
+
     public void setSwipeDetector(SingleAxisSwipeDetector swipeDetector) {
         mSwipeDetector = swipeDetector;
     }
diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java
index 8dea14a8c0..2095a0de54 100644
--- a/src/com/android/launcher3/popup/ArrowPopup.java
+++ b/src/com/android/launcher3/popup/ArrowPopup.java
@@ -25,35 +25,48 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
+import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Rect;
+import android.graphics.RectF;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
+import android.os.Build;
 import android.util.AttributeSet;
 import android.util.Pair;
+import android.util.SparseIntArray;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
 import android.view.animation.Interpolator;
 import android.widget.FrameLayout;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.InsettableFrameLayout;
+import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.Workspace;
 import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.shortcuts.DeepShortcutView;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.BaseDragLayer;
+import com.android.launcher3.widget.LocalColorExtractor;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * A container for shortcuts to deep links and notifications associated with an app.
@@ -76,6 +89,10 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
     private static final int CLOSE_CHILD_FADE_START_DELAY = 0;
     private static final int CLOSE_CHILD_FADE_DURATION = 140;
 
+    // Index used to get background color when using local wallpaper color extraction,
+    private static final int DARK_COLOR_EXTRACTION_INDEX = android.R.color.system_neutral2_800;
+    private static final int LIGHT_COLOR_EXTRACTION_INDEX = android.R.color.system_accent2_50;
+
     private final Rect mTempRect = new Rect();
 
     protected final LayoutInflater mInflater;
@@ -104,9 +121,18 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
 
     private Runnable mOnCloseCallback = () -> { };
 
+    // The rect string of the view that the arrow is attached to, in screen reference frame.
+    protected String mArrowColorRectString;
+    private int mArrowColor;
+    protected final HashMap<String, View> mViewForRect = new HashMap<>();
+
+    @Nullable protected LocalColorExtractor mColorExtractor;
+
     private final float mElevation;
     private final int mBackgroundColor;
 
+    private final String mIterateChildrenTag;
+
     public ArrowPopup(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         mInflater = LayoutInflater.from(context);
@@ -115,6 +141,7 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
         mIsRtl = Utilities.isRtl(getResources());
 
         mBackgroundColor = Themes.getAttrColor(context, R.attr.popupColorPrimary);
+        mArrowColor = mBackgroundColor;
         mElevation = getResources().getDimension(R.dimen.deep_shortcuts_elevation);
 
         // Initialize arrow view
@@ -139,6 +166,14 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
         mRoundedBottom.setColor(mBackgroundColor);
         mRoundedBottom.setCornerRadii(new float[] { smallerRadius, smallerRadius, smallerRadius,
                 smallerRadius, mOutlineRadius, mOutlineRadius, mOutlineRadius, mOutlineRadius});
+
+        mIterateChildrenTag = getContext().getString(R.string.popup_container_iterate_children);
+
+        boolean isAboveAnotherSurface = getTopOpenViewWithType(mLauncher, TYPE_FOLDER) != null
+                || mLauncher.getStateManager().getState() == LauncherState.ALL_APPS;
+        if (!isAboveAnotherSurface && Utilities.ATLEAST_S) {
+            setupColorExtraction();
+        }
     }
 
     public ArrowPopup(Context context, AttributeSet attrs) {
@@ -184,11 +219,11 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
     /**
      * Set the margins and radius of backgrounds after views are properly ordered.
      */
-    protected void assignMarginsAndBackgrounds() {
-        int count = getChildCount();
+    public void assignMarginsAndBackgrounds(ViewGroup viewGroup) {
+        int count = viewGroup.getChildCount();
         int totalVisibleShortcuts = 0;
         for (int i = 0; i < count; i++) {
-            View view = getChildAt(i);
+            View view = viewGroup.getChildAt(i);
             if (view.getVisibility() == VISIBLE && view instanceof DeepShortcutView) {
                 totalVisibleShortcuts++;
             }
@@ -197,8 +232,7 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
         int numVisibleShortcut = 0;
         View lastView = null;
         for (int i = 0; i < count; i++) {
-            View view = getChildAt(i);
-            boolean isShortcut = view instanceof DeepShortcutView;
+            View view = viewGroup.getChildAt(i);
             if (view.getVisibility() == VISIBLE) {
                 if (lastView != null) {
                     MarginLayoutParams mlp = (MarginLayoutParams) lastView.getLayoutParams();
@@ -208,7 +242,12 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
                 MarginLayoutParams mlp = (MarginLayoutParams) lastView.getLayoutParams();
                 mlp.bottomMargin = 0;
 
-                if (isShortcut) {
+                if (view instanceof ViewGroup && mIterateChildrenTag.equals(view.getTag())) {
+                    assignMarginsAndBackgrounds((ViewGroup) view);
+                    continue;
+                }
+
+                if (view instanceof DeepShortcutView) {
                     if (totalVisibleShortcuts == 1) {
                         view.setBackgroundResource(R.drawable.single_item_primary);
                     } else if (totalVisibleShortcuts > 1) {
@@ -227,6 +266,118 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
         measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
     }
 
+
+    @TargetApi(Build.VERSION_CODES.S)
+    private int getExtractedColor(SparseIntArray colors) {
+        int index = Utilities.isDarkTheme(getContext())
+                ? DARK_COLOR_EXTRACTION_INDEX
+                : LIGHT_COLOR_EXTRACTION_INDEX;
+        return colors.get(index, mBackgroundColor);
+    }
+
+    @TargetApi(Build.VERSION_CODES.S)
+    private void setupColorExtraction() {
+        Workspace workspace = mLauncher.findViewById(R.id.workspace);
+        if (workspace == null) {
+            return;
+        }
+
+        mColorExtractor = LocalColorExtractor.newInstance(mLauncher);
+        mColorExtractor.setListener((rect, extractedColors) -> {
+            String rectString = rect.toShortString();
+            View v = mViewForRect.get(rectString);
+            AnimatorSet colors = new AnimatorSet();
+            if (v != null) {
+                int newColor = getExtractedColor(extractedColors);
+                setChildColor(v, newColor, colors);
+                int numChildren = v instanceof ViewGroup ? ((ViewGroup) v).getChildCount() : 0;
+                for (int i = 0; i < numChildren; ++i) {
+                    View childView = ((ViewGroup) v).getChildAt(i);
+                    setChildColor(childView, newColor, colors);
+
+                }
+                if (rectString.equals(mArrowColorRectString)) {
+                    mArrowColor = newColor;
+                    updateArrowColor();
+                }
+            }
+            colors.setDuration(150);
+            v.post(colors::start);
+        });
+    }
+
+    protected void addPreDrawForColorExtraction(Launcher launcher) {
+        getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
+            @Override
+            public boolean onPreDraw() {
+                getViewTreeObserver().removeOnPreDrawListener(this);
+                initColorExtractionLocations(launcher);
+                return true;
+            }
+        });
+    }
+
+    /**
+     * Returns list of child views that will receive local color extraction treatment.
+     * Note: Order should match the view hierarchy.
+     */
+    protected List<View> getChildrenForColorExtraction() {
+        return Collections.emptyList();
+    }
+
+    private void initColorExtractionLocations(Launcher launcher) {
+        if (mColorExtractor == null) {
+            return;
+        }
+        ArrayList<RectF> locations = new ArrayList<>();
+
+        boolean firstVisibleChild = true;
+        // Order matters here, since we need the arrow to match the color of its adjacent view.
+        for (View view : getChildrenForColorExtraction()) {
+            if (view != null && view.getVisibility() == VISIBLE) {
+                RectF rf = new RectF();
+                mColorExtractor.getExtractedRectForView(launcher,
+                        launcher.getWorkspace().getCurrentPage(), view, rf);
+                if (!rf.isEmpty()) {
+                    locations.add(rf);
+                    String rectString = rf.toShortString();
+                    mViewForRect.put(rectString, view);
+                    if (mIsAboveIcon) {
+                        mArrowColorRectString = rectString;
+                    } else {
+                        if (firstVisibleChild) {
+                            mArrowColorRectString = rectString;
+                        }
+                    }
+
+                    if (firstVisibleChild) {
+                        firstVisibleChild = false;
+                    }
+
+                }
+            }
+        }
+        if (!locations.isEmpty()) {
+            mColorExtractor.addLocation(locations);
+        }
+    }
+
+    /**
+     * Sets the background color of the child.
+     */
+    protected void setChildColor(View view, int color, AnimatorSet animatorSetOut) {
+        Drawable bg = view.getBackground();
+        if (bg instanceof GradientDrawable) {
+            GradientDrawable gd = (GradientDrawable) bg.mutate();
+            int oldColor = ((GradientDrawable) bg).getColor().getDefaultColor();
+            animatorSetOut.play(ObjectAnimator.ofArgb(gd, "color", oldColor, color));
+        } else if (bg instanceof ColorDrawable) {
+            ColorDrawable cd = (ColorDrawable) bg.mutate();
+            int oldColor = ((ColorDrawable) bg).getColor();
+            animatorSetOut.play(ObjectAnimator.ofArgb(cd, "color", oldColor, color));
+        }
+    }
+
     /**
      * Shows the popup at the desired location, optionally reversing the children.
      * @param viewsToFlip number of views from the top to to flip in case of reverse order
@@ -238,7 +389,7 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
             reverseOrder(viewsToFlip);
         }
         onInflationComplete(reverseOrder);
-        assignMarginsAndBackgrounds();
+        assignMarginsAndBackgrounds(this);
         if (shouldAddArrow()) {
             addArrow();
         }
@@ -251,7 +402,7 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
     protected void show() {
         setupForDisplay();
         onInflationComplete(false);
-        assignMarginsAndBackgrounds();
+        assignMarginsAndBackgrounds(this);
         if (shouldAddArrow()) {
             addArrow();
         }
@@ -297,18 +448,24 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
             // so we centered it instead. In that case we don't want to showDefaultOptions the arrow.
             mArrow.setVisibility(INVISIBLE);
         } else {
+            updateArrowColor();
+        }
+
+        mArrow.setPivotX(mArrowWidth / 2.0f);
+        mArrow.setPivotY(mIsAboveIcon ? mArrowHeight : 0);
+    }
+
+    private void updateArrowColor() {
+        if (!Gravity.isVertical(mGravity)) {
             mArrow.setBackground(new RoundedArrowDrawable(
                     mArrowWidth, mArrowHeight, mArrowPointRadius,
                     mOutlineRadius, getMeasuredWidth(), getMeasuredHeight(),
                     mArrowOffsetHorizontal, -mArrowOffsetVertical,
                     !mIsAboveIcon, mIsLeftAligned,
-                    mBackgroundColor));
+                    mArrowColor));
             // TODO: Remove elevation when arrow is above as it casts a shadow on the container
             mArrow.setElevation(mIsAboveIcon ? mElevation : 0);
         }
-
-        mArrow.setPivotX(mArrowWidth / 2.0f);
-        mArrow.setPivotY(mIsAboveIcon ? mArrowHeight : 0);
     }
 
     /**
@@ -506,7 +663,7 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
     private AnimatorSet getOpenCloseAnimator(boolean isOpening, int totalDuration,
             int fadeStartDelay, int fadeDuration, int childFadeStartDelay,
             int childFadeDuration, Interpolator interpolator) {
-        final AnimatorSet openAnim = new AnimatorSet();
+        final AnimatorSet animatorSet = new AnimatorSet();
         float[] alphaValues = isOpening ? new float[] {0, 1} : new float[] {1, 0};
         float[] scaleValues = isOpening ? new float[] {0.5f, 1} : new float[] {1, 0.5f};
 
@@ -519,32 +676,41 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
             mArrow.setAlpha(alpha);
             setAlpha(alpha);
         });
-        openAnim.play(fade);
+        animatorSet.play(fade);
 
         setPivotX(mIsLeftAligned ? 0 : getMeasuredWidth());
         setPivotY(mIsAboveIcon ? getMeasuredHeight() : 0);
         Animator scale = ObjectAnimator.ofFloat(this, View.SCALE_Y, scaleValues);
         scale.setDuration(totalDuration);
         scale.setInterpolator(interpolator);
-        openAnim.play(scale);
+        animatorSet.play(scale);
 
-        for (int i = getChildCount() - 1; i >= 0; --i) {
-            View view = getChildAt(i);
+        fadeInChildViews(this, alphaValues, childFadeStartDelay, childFadeDuration, animatorSet);
+
+        return animatorSet;
+    }
+
+    private void fadeInChildViews(ViewGroup group, float[] alphaValues, long startDelay,
+            long duration, AnimatorSet out) {
+        for (int i = group.getChildCount() - 1; i >= 0; --i) {
+            View view = group.getChildAt(i);
             if (view.getVisibility() == VISIBLE && view instanceof ViewGroup) {
+                if (mIterateChildrenTag.equals(view.getTag())) {
+                    fadeInChildViews((ViewGroup) view, alphaValues, startDelay, duration, out);
+                    continue;
+                }
                 for (int j = ((ViewGroup) view).getChildCount() - 1; j >= 0; --j) {
                     View childView = ((ViewGroup) view).getChildAt(j);
-
                     childView.setAlpha(alphaValues[0]);
                     ValueAnimator childFade = ObjectAnimator.ofFloat(childView, ALPHA, alphaValues);
-                    childFade.setStartDelay(childFadeStartDelay);
-                    childFade.setDuration(childFadeDuration);
+                    childFade.setStartDelay(startDelay);
+                    childFade.setDuration(duration);
                     childFade.setInterpolator(LINEAR);
 
-                    openAnim.play(childFade);
+                    out.play(childFade);
                 }
             }
         }
-        return openAnim;
     }
 
 
@@ -593,6 +759,12 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
         getPopupContainer().removeView(this);
         getPopupContainer().removeView(mArrow);
         mOnCloseCallback.run();
+        mArrowColorRectString = null;
+        mViewForRect.clear();
+        if (mColorExtractor != null) {
+            mColorExtractor.removeLocations();
+            mColorExtractor.setListener(null);
+        }
     }
 
     /**
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index b115678562..332390d8e2 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -71,6 +71,7 @@ import com.android.launcher3.util.ShortcutUtil;
 import com.android.launcher3.views.BaseDragLayer;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -95,6 +96,8 @@ public class PopupContainerWithArrow<T extends StatefulActivity<LauncherState>>
     private int mNumNotifications;
     private ViewGroup mNotificationContainer;
 
+    private ViewGroup mDeepShortcutContainer;
+
     private ViewGroup mSystemShortcutContainer;
 
     protected PopupItemDragHandler mPopupItemDragHandler;
@@ -172,6 +175,14 @@ public class PopupContainerWithArrow<T extends StatefulActivity<LauncherState>>
         return false;
     }
 
+    @Override
+    protected void setChildColor(View view, int color, AnimatorSet animatorSetOut) {
+        super.setChildColor(view, color, animatorSetOut);
+        if (view.getId() == R.id.notification_container && mNotificationItemView != null) {
+            mNotificationItemView.updateBackgroundColor(color, animatorSetOut);
+        }
+    }
+
     /**
      * Returns true if we can show the container.
      */
@@ -218,6 +229,13 @@ public class PopupContainerWithArrow<T extends StatefulActivity<LauncherState>>
         mPopupItemDragHandler = new LauncherPopupItemDragHandler(launcher, this);
         mAccessibilityDelegate = new ShortcutMenuAccessibilityDelegate(launcher);
         launcher.getDragController().addDragListener(this);
+        addPreDrawForColorExtraction(launcher);
+    }
+
+    @Override
+    protected List<View> getChildrenForColorExtraction() {
+        return Arrays.asList(mSystemShortcutContainer, mDeepShortcutContainer,
+                mNotificationContainer);
     }
 
     @Override
@@ -262,13 +280,18 @@ public class PopupContainerWithArrow<T extends StatefulActivity<LauncherState>>
         }
         int viewsToFlip = getChildCount();
         mSystemShortcutContainer = this;
+        if (mDeepShortcutContainer == null) {
+            mDeepShortcutContainer = findViewById(R.id.deep_shortcuts_container);
+        }
         if (hasDeepShortcuts) {
+            mDeepShortcutContainer.setVisibility(View.VISIBLE);
+
             if (mNotificationItemView != null) {
                 mNotificationItemView.addGutter();
             }
 
             for (int i = shortcutCount; i > 0; i--) {
-                DeepShortcutView v = inflateAndAdd(R.layout.deep_shortcut, this);
+                DeepShortcutView v = inflateAndAdd(R.layout.deep_shortcut, mDeepShortcutContainer);
                 v.getLayoutParams().width = containerWidth;
                 mShortcuts.add(v);
             }
@@ -281,13 +304,16 @@ public class PopupContainerWithArrow<T extends StatefulActivity<LauncherState>>
                             R.layout.system_shortcut_icon_only, mSystemShortcutContainer, shortcut);
                 }
             }
-        } else if (!systemShortcuts.isEmpty()) {
-            if (mNotificationItemView != null) {
-                mNotificationItemView.addGutter();
-            }
+        } else {
+            mDeepShortcutContainer.setVisibility(View.GONE);
+            if (!systemShortcuts.isEmpty()) {
+                if (mNotificationItemView != null) {
+                    mNotificationItemView.addGutter();
+                }
 
-            for (SystemShortcut shortcut : systemShortcuts) {
-                initializeSystemShortcut(R.layout.system_shortcut, this, shortcut);
+                for (SystemShortcut shortcut : systemShortcuts) {
+                    initializeSystemShortcut(R.layout.system_shortcut, this, shortcut);
+                }
             }
         }
 
@@ -563,7 +589,7 @@ public class PopupContainerWithArrow<T extends StatefulActivity<LauncherState>>
                 mNotificationItemView = null;
                 mNotificationContainer.setVisibility(GONE);
                 updateHiddenShortcuts();
-                assignMarginsAndBackgrounds();
+                assignMarginsAndBackgrounds(PopupContainerWithArrow.this);
             } else {
                 mNotificationItemView.trimNotifications(
                         NotificationKeyData.extractKeysOnly(dotInfo.getNotificationKeys()));
diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java
index 98cc876c93..06ccbbd53e 100644
--- a/src/com/android/launcher3/views/OptionsPopupView.java
+++ b/src/com/android/launcher3/views/OptionsPopupView.java
@@ -146,13 +146,25 @@ public class OptionsPopupView extends ArrowPopup
             view.setOnLongClickListener(popup);
             popup.mItemMap.put(view, item);
         }
+
+        popup.addPreDrawForColorExtraction(launcher);
         popup.show();
         return popup;
     }
 
+    @Override
+    protected List<View> getChildrenForColorExtraction() {
+        int childCount = getChildCount();
+        ArrayList<View> children = new ArrayList<>(childCount);
+        for (int i = 0; i < childCount; ++i) {
+            children.add(getChildAt(i));
+        }
+        return children;
+    }
+
     @VisibleForTesting
     public static ArrowPopup getOptionsPopup(Launcher launcher) {
-        return launcher.findViewById(R.id.deep_shortcuts_container);
+        return launcher.findViewById(R.id.popup_container);
     }
 
     public static void showDefaultOptions(Launcher launcher, float x, float y) {
diff --git a/tests/tapl/com/android/launcher3/tapl/AppIcon.java b/tests/tapl/com/android/launcher3/tapl/AppIcon.java
index 5de5b4a0a6..56723b18d2 100644
--- a/tests/tapl/com/android/launcher3/tapl/AppIcon.java
+++ b/tests/tapl/com/android/launcher3/tapl/AppIcon.java
@@ -47,7 +47,7 @@ public final class AppIcon extends Launchable {
     public AppIconMenu openMenu() {
         try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck()) {
             return new AppIconMenu(mLauncher, mLauncher.clickAndGet(
-                    mObject, "deep_shortcuts_container", LONG_CLICK_EVENT));
+                    mObject, "popup_container", LONG_CLICK_EVENT));
         }
     }
 
@@ -58,7 +58,7 @@ public final class AppIcon extends Launchable {
 
     @Override
     protected String getLongPressIndicator() {
-        return "deep_shortcuts_container";
+        return "popup_container";
     }
 
     @Override
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index c99a81f0f6..bf7984eb53 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -155,7 +155,7 @@ public final class LauncherInstrumentation {
     private static final String APPS_RES_ID = "apps_view";
     private static final String OVERVIEW_RES_ID = "overview_panel";
     private static final String WIDGETS_RES_ID = "primary_widgets_list_view";
-    private static final String CONTEXT_MENU_RES_ID = "deep_shortcuts_container";
+    private static final String CONTEXT_MENU_RES_ID = "popup_container";
     public static final int WAIT_TIME_MS = 60000;
     private static final String SYSTEMUI_PACKAGE = "com.android.systemui";
     private static final String ANDROID_PACKAGE = "android";
diff --git a/tests/tapl/com/android/launcher3/tapl/OptionsPopupMenu.java b/tests/tapl/com/android/launcher3/tapl/OptionsPopupMenu.java
index 282fca9333..787dc70063 100644
--- a/tests/tapl/com/android/launcher3/tapl/OptionsPopupMenu.java
+++ b/tests/tapl/com/android/launcher3/tapl/OptionsPopupMenu.java
@@ -26,7 +26,7 @@ public class OptionsPopupMenu {
 
     OptionsPopupMenu(LauncherInstrumentation launcher) {
         mLauncher = launcher;
-        mDeepShortcutsContainer = launcher.waitForLauncherObject("deep_shortcuts_container");
+        mDeepShortcutsContainer = launcher.waitForLauncherObject("popup_container");
     }
 
     /**
diff --git a/tests/tapl/com/android/launcher3/tapl/Workspace.java b/tests/tapl/com/android/launcher3/tapl/Workspace.java
index d43e2352a2..36246245bd 100644
--- a/tests/tapl/com/android/launcher3/tapl/Workspace.java
+++ b/tests/tapl/com/android/launcher3/tapl/Workspace.java
@@ -179,7 +179,7 @@ public final class Workspace extends Home {
                             getHotseatAppIcon("Chrome"),
                             new Point(mLauncher.getDevice().getDisplayWidth(),
                                     mLauncher.getVisibleBounds(workspace).centerY()),
-                            "deep_shortcuts_container",
+                            "popup_container",
                             false,
                             false,
                             () -> mLauncher.expectEvent(
-- 
GitLab


From 192924459ba3bef4324ebe8f9565b522c94b007a Mon Sep 17 00:00:00 2001
From: Santhosh Thangaraj <thangaraj@google.com>
Date: Tue, 8 Jun 2021 20:28:24 +0000
Subject: [PATCH 1370/1664] Fix the page number based Seen impression.

Test: On device.
Bug: 183117427
Change-Id: Ic1b11fb7630f60f11387951749420653aa3f0c8a
---
 src/com/android/launcher3/Launcher.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 578379b70d..30fe6ca021 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1080,7 +1080,13 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
                 // Making sure mAllAppsSessionLogId is not null to avoid double logging.
                 && mAllAppsSessionLogId != null) {
             getAppsView().getSearchUiManager().resetSearch();
-            getStatsLogManager().logger().log(LAUNCHER_ALLAPPS_EXIT);
+            getStatsLogManager().logger()
+                    .withContainerInfo(LauncherAtom.ContainerInfo.newBuilder()
+                            .setWorkspace(
+                                    LauncherAtom.WorkspaceContainer.newBuilder()
+                                            .setPageIndex(getWorkspace().getCurrentPage()))
+                            .build())
+                    .log(LAUNCHER_ALLAPPS_EXIT);
             mAllAppsSessionLogId = null;
         }
     }
-- 
GitLab


From 9f06168692271d808ff0358a6fc8e8135e6eecd5 Mon Sep 17 00:00:00 2001
From: Cyrus Boadway <boadway@google.com>
Date: Mon, 7 Jun 2021 20:56:37 +0000
Subject: [PATCH 1371/1664] Use the splash screen background color as the
 fallback background color

For the widget transition animation fallback background color, use either
the splash screen background color if a task is starting or the task
description-attached background color.

With a background in place, allow the window to fully fade out before
fading in the widget, by moving the window alpha math into an animation
factory-specific implementation.

Bug: 187706750
Test: Manual
Change-Id: I2b5a7783b0585d447ad60534bc48d2e2176877ed
---
 .../launcher3/QuickstepTransitionManager.java | 48 +++++++++++--------
 .../android/quickstep/AbsSwipeUpHandler.java  |  5 +-
 .../quickstep/FallbackSwipeHandler.java       |  3 +-
 .../quickstep/LauncherSwipeHandlerV2.java     | 37 ++++++++++----
 .../quickstep/RemoteAnimationTargets.java     | 11 +++++
 .../quickstep/SwipeUpAnimationLogic.java      | 38 +++++++--------
 .../views/FloatingWidgetBackgroundView.java   |  6 +--
 .../quickstep/views/FloatingWidgetView.java   | 23 +++++++--
 src/com/android/launcher3/Utilities.java      |  7 +++
 9 files changed, 118 insertions(+), 60 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 36322ce439..26d407fb96 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -214,8 +214,9 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
         }
     };
 
+    // Pairs of window starting type and starting window background color for starting tasks
     // Will never be larger than MAX_NUM_TASKS
-    private LinkedHashMap<Integer, Integer> mTypeForTaskId;
+    private LinkedHashMap<Integer, Pair<Integer, Integer>> mTaskStartParams;
 
     public QuickstepTransitionManager(Context context) {
         mLauncher = Launcher.cast(Launcher.getLauncher(context));
@@ -232,9 +233,9 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
         mLauncher.addOnDeviceProfileChangeListener(this);
 
         if (supportsSSplashScreen()) {
-            mTypeForTaskId = new LinkedHashMap<Integer, Integer>(MAX_NUM_TASKS) {
+            mTaskStartParams = new LinkedHashMap<Integer, Pair<Integer, Integer>>(MAX_NUM_TASKS) {
                 @Override
-                protected boolean removeEldestEntry(Entry<Integer, Integer> entry) {
+                protected boolean removeEldestEntry(Entry<Integer, Pair<Integer, Integer>> entry) {
                     return size() > MAX_NUM_TASKS;
                 }
             };
@@ -420,15 +421,6 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
         return bounds;
     }
 
-    private int getOpeningTaskId(RemoteAnimationTargetCompat[] appTargets) {
-        for (RemoteAnimationTargetCompat target : appTargets) {
-            if (target.mode == MODE_OPENING) {
-                return target.taskId;
-            }
-        }
-        return -1;
-    }
-
     public void setRemoteAnimationProvider(final RemoteAnimationProvider animationProvider,
             CancellationSignal cancellationSignal) {
         mRemoteAnimationProvider = animationProvider;
@@ -595,10 +587,12 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
 
         final boolean hasSplashScreen;
         if (supportsSSplashScreen()) {
-            int taskId = getOpeningTaskId(appTargets);
-            int type = mTypeForTaskId.getOrDefault(taskId, STARTING_WINDOW_TYPE_NONE);
-            mTypeForTaskId.remove(taskId);
-            hasSplashScreen = type == STARTING_WINDOW_TYPE_SPLASH_SCREEN;
+            int taskId = openingTargets.getFirstAppTargetTaskId();
+            Pair<Integer, Integer> defaultParams = Pair.create(STARTING_WINDOW_TYPE_NONE, 0);
+            Pair<Integer, Integer> taskParams =
+                    mTaskStartParams.getOrDefault(taskId, defaultParams);
+            mTaskStartParams.remove(taskId);
+            hasSplashScreen = taskParams.first == STARTING_WINDOW_TYPE_SPLASH_SCREEN;
         } else {
             hasSplashScreen = false;
         }
@@ -799,18 +793,30 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
         final RectF widgetBackgroundBounds = new RectF();
         final Rect appWindowCrop = new Rect();
         final Matrix matrix = new Matrix();
+        RemoteAnimationTargets openingTargets = new RemoteAnimationTargets(appTargets,
+                wallpaperTargets, nonAppTargets, MODE_OPENING);
+
+        RemoteAnimationTargetCompat openingTarget = openingTargets.getFirstAppTarget();
+        int fallbackBackgroundColor = 0;
+        if (openingTarget != null && supportsSSplashScreen()) {
+            fallbackBackgroundColor = mTaskStartParams.containsKey(openingTarget.taskId)
+                    ? mTaskStartParams.get(openingTarget.taskId).second : 0;
+            mTaskStartParams.remove(openingTarget.taskId);
+        }
+        if (fallbackBackgroundColor == 0) {
+            fallbackBackgroundColor =
+                    FloatingWidgetView.getDefaultBackgroundColor(mLauncher, openingTarget);
+        }
 
         final float finalWindowRadius = mDeviceProfile.isMultiWindowMode
                 ? 0 : getWindowCornerRadius(mLauncher.getResources());
         final FloatingWidgetView floatingView = FloatingWidgetView.getFloatingWidgetView(mLauncher,
                 v, widgetBackgroundBounds,
                 new Size(windowTargetBounds.width(), windowTargetBounds.height()),
-                finalWindowRadius, appTargetsAreTranslucent);
+                finalWindowRadius, appTargetsAreTranslucent, fallbackBackgroundColor);
         final float initialWindowRadius = supportsRoundedCornersOnWindows(mLauncher.getResources())
                 ? floatingView.getInitialCornerRadius() : 0;
 
-        RemoteAnimationTargets openingTargets = new RemoteAnimationTargets(appTargets,
-                wallpaperTargets, nonAppTargets, MODE_OPENING);
         SurfaceTransactionApplier surfaceApplier = new SurfaceTransactionApplier(floatingView);
         openingTargets.addReleaseCheck(surfaceApplier);
 
@@ -1434,8 +1440,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
         }
 
         @Override
-        public void onTaskLaunching(int taskId, int supportedType) {
-            mTransitionManager.mTypeForTaskId.put(taskId, supportedType);
+        public void onTaskLaunching(int taskId, int supportedType, int color) {
+            mTransitionManager.mTaskStartParams.put(taskId, Pair.create(supportedType, color));
         }
     }
 }
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 88db2741ab..52f34d90e0 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1071,7 +1071,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     }
 
     protected abstract HomeAnimationFactory createHomeAnimationFactory(
-            ArrayList<IBinder> launchCookies, long duration, boolean isTargetTranslucent);
+            ArrayList<IBinder> launchCookies, long duration, boolean isTargetTranslucent,
+            RemoteAnimationTargetCompat runningTaskTarget);
 
     private final TaskStackChangeListener mActivityRestartListener = new TaskStackChangeListener() {
         @Override
@@ -1117,7 +1118,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                     : new ArrayList<>();
             boolean isTranslucent = runningTaskTarget != null && runningTaskTarget.isTranslucent;
             HomeAnimationFactory homeAnimFactory =
-                    createHomeAnimationFactory(cookies, duration, isTranslucent);
+                    createHomeAnimationFactory(cookies, duration, isTranslucent, runningTaskTarget);
             mIsSwipingPipToHome = homeAnimFactory.supportSwipePipToHome()
                     && runningTaskTarget != null
                     && runningTaskTarget.taskInfo.pictureInPictureParams != null
diff --git a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
index 2d81429a94..7290ff6a41 100644
--- a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
+++ b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
@@ -129,7 +129,8 @@ public class FallbackSwipeHandler extends
 
     @Override
     protected HomeAnimationFactory createHomeAnimationFactory(ArrayList<IBinder> launchCookies,
-            long duration, boolean isTargetTranslucent) {
+            long duration, boolean isTargetTranslucent,
+            RemoteAnimationTargetCompat runningTaskTarget) {
         mActiveAnimationFactory = new FallbackHomeAnimationFactory(duration);
         ActivityOptions options = ActivityOptions.makeCustomAnimation(mContext, 0, 0);
         Intent intent = new Intent(mGestureState.getHomeIntent());
diff --git a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
index 1bae1c5f6b..40741e4945 100644
--- a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
+++ b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
@@ -20,6 +20,9 @@ import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.Utilities.boundToRange;
 import static com.android.launcher3.Utilities.dpToPx;
+import static com.android.launcher3.Utilities.mapBoundToRange;
+import static com.android.launcher3.anim.Interpolators.EXAGGERATED_EASE;
+import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.config.FeatureFlags.PROTOTYPE_APP_CLOSE;
 import static com.android.launcher3.model.data.ItemInfo.NO_MATCHING_ID;
 import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION;
@@ -65,6 +68,7 @@ import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
 import com.android.systemui.plugins.ResourceProvider;
 import com.android.systemui.shared.system.InputConsumerController;
+import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
 import java.util.ArrayList;
 
@@ -84,7 +88,8 @@ public class LauncherSwipeHandlerV2 extends
 
     @Override
     protected HomeAnimationFactory createHomeAnimationFactory(ArrayList<IBinder> launchCookies,
-            long duration, boolean isTargetTranslucent) {
+            long duration, boolean isTargetTranslucent,
+            RemoteAnimationTargetCompat runningTaskTarget) {
         if (mActivity == null) {
             mStateCallback.addChangeListener(STATE_LAUNCHER_PRESENT | STATE_HANDLER_INVALIDATED,
                     isPresent -> mRecentsView.startHome());
@@ -108,7 +113,7 @@ public class LauncherSwipeHandlerV2 extends
         }
         if (workspaceView instanceof LauncherAppWidgetHostView) {
             return createWidgetHomeAnimationFactory((LauncherAppWidgetHostView) workspaceView,
-                    isTargetTranslucent);
+                    isTargetTranslucent, runningTaskTarget);
         }
         return createIconHomeAnimationFactory(workspaceView);
     }
@@ -169,15 +174,19 @@ public class LauncherSwipeHandlerV2 extends
     }
 
     private HomeAnimationFactory createWidgetHomeAnimationFactory(
-            LauncherAppWidgetHostView hostView, boolean isTargetTranslucent) {
-
+            LauncherAppWidgetHostView hostView, boolean isTargetTranslucent,
+            RemoteAnimationTargetCompat runningTaskTarget) {
+        final float floatingWidgetAlpha = isTargetTranslucent ? 0 : 1;
         RectF backgroundLocation = new RectF();
         Rect crop = new Rect();
         mTaskViewSimulator.getCurrentCropRect().roundOut(crop);
         Size windowSize = new Size(crop.width(), crop.height());
+        int fallbackBackgroundColor =
+                FloatingWidgetView.getDefaultBackgroundColor(mContext, runningTaskTarget);
         FloatingWidgetView floatingWidgetView = FloatingWidgetView.getFloatingWidgetView(mActivity,
                 hostView, backgroundLocation, windowSize,
-                mTaskViewSimulator.getCurrentCornerRadius(), isTargetTranslucent);
+                mTaskViewSimulator.getCurrentCornerRadius(), isTargetTranslucent,
+                fallbackBackgroundColor);
 
         return new FloatingViewHomeAnimationFactory(floatingWidgetView) {
 
@@ -207,12 +216,20 @@ public class LauncherSwipeHandlerV2 extends
             }
 
             @Override
-            public void update(@Nullable AppCloseConfig config, RectF currentRect,
-                    float progress, float radius) {
+            public void update(@Nullable AppCloseConfig config, RectF currentRect, float progress,
+                    float radius) {
                 super.update(config, currentRect, progress, radius);
-                floatingWidgetView.update(currentRect, 1 /* floatingWidgetAlpha */,
-                        config != null ? config.getFgAlpha() : 1f /* foregroundAlpha */,
-                        0 /* fallbackBackgroundAlpha */, 1 - progress);
+                final float fallbackBackgroundAlpha =
+                        1 - mapBoundToRange(progress, 0.8f, 1, 0, 1, EXAGGERATED_EASE);
+                final float foregroundAlpha =
+                        mapBoundToRange(progress, 0.5f, 1, 0, 1, EXAGGERATED_EASE);
+                floatingWidgetView.update(currentRect, floatingWidgetAlpha, foregroundAlpha,
+                        fallbackBackgroundAlpha, 1 - progress);
+            }
+
+            @Override
+            protected float getWindowAlpha(float progress) {
+                return 1 - mapBoundToRange(progress, 0, 0.5f, 0, 1, LINEAR);
             }
         };
     }
diff --git a/quickstep/src/com/android/quickstep/RemoteAnimationTargets.java b/quickstep/src/com/android/quickstep/RemoteAnimationTargets.java
index edc3ab22f3..c032889db5 100644
--- a/quickstep/src/com/android/quickstep/RemoteAnimationTargets.java
+++ b/quickstep/src/com/android/quickstep/RemoteAnimationTargets.java
@@ -85,6 +85,17 @@ public class RemoteAnimationTargets {
         return null;
     }
 
+    /** Returns the first opening app target. */
+    public RemoteAnimationTargetCompat getFirstAppTarget() {
+        return apps.length > 0 ? apps[0] : null;
+    }
+
+    /** Returns the task id of the first opening app target, or -1 if none is found. */
+    public int getFirstAppTargetTaskId() {
+        RemoteAnimationTargetCompat target = getFirstAppTarget();
+        return target == null ? -1 : target.taskId;
+    }
+
     public boolean isAnimatingHome() {
         for (RemoteAnimationTargetCompat target : unfilteredApps) {
             if (target.activityType == RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME) {
diff --git a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
index b79e9344bf..44954555b0 100644
--- a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
+++ b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
@@ -181,6 +181,24 @@ public abstract class SwipeUpAnimationLogic {
         public boolean supportSwipePipToHome() {
             return false;
         }
+
+        /**
+         * @param progress The progress of the animation to the home screen.
+         * @return The current alpha to set on the animating app window.
+         */
+        protected float getWindowAlpha(float progress) {
+            // Alpha interpolates between [1, 0] between progress values [start, end]
+            final float start = 0f;
+            final float end = 0.85f;
+
+            if (progress <= start) {
+                return 1f;
+            }
+            if (progress >= end) {
+                return 0f;
+            }
+            return Utilities.mapToRange(progress, start, end, 1, 0, ACCEL_1_5);
+        }
     }
 
     /**
@@ -236,24 +254,6 @@ public abstract class SwipeUpAnimationLogic {
         return anim;
     }
 
-    /**
-     * @param progress The progress of the animation to the home screen.
-     * @return The current alpha to set on the animating app window.
-     */
-    protected float getWindowAlpha(float progress) {
-        // Alpha interpolates between [1, 0] between progress values [start, end]
-        final float start = 0f;
-        final float end = 0.85f;
-
-        if (progress <= start) {
-            return 1f;
-        }
-        if (progress >= end) {
-            return 0f;
-        }
-        return Utilities.mapToRange(progress, start, end, 1, 0, ACCEL_1_5);
-    }
-
     protected class SpringAnimationRunner extends AnimationSuccessListener
             implements RectFSpringAnim.OnUpdateListener, BuilderProxy {
 
@@ -292,7 +292,7 @@ public abstract class SwipeUpAnimationLogic {
 
             mMatrix.setRectToRect(mCropRectF, mWindowCurrentRect, ScaleToFit.FILL);
             float cornerRadius = Utilities.mapRange(progress, mStartRadius, mEndRadius);
-            float alpha = getWindowAlpha(progress);
+            float alpha = mAnimationFactory.getWindowAlpha(progress);
             if (config != null && PROTOTYPE_APP_CLOSE.get()) {
                 alpha = config.getWindowAlpha();
                 cornerRadius = config.getCornerRadius();
diff --git a/quickstep/src/com/android/quickstep/views/FloatingWidgetBackgroundView.java b/quickstep/src/com/android/quickstep/views/FloatingWidgetBackgroundView.java
index 9ea2369836..65dba338f8 100644
--- a/quickstep/src/com/android/quickstep/views/FloatingWidgetBackgroundView.java
+++ b/quickstep/src/com/android/quickstep/views/FloatingWidgetBackgroundView.java
@@ -27,7 +27,6 @@ import android.view.View;
 import android.view.ViewOutlineProvider;
 import android.widget.RemoteViews.RemoteViewOutlineProvider;
 
-import com.android.launcher3.util.Themes;
 import com.android.launcher3.widget.LauncherAppWidgetHostView;
 import com.android.launcher3.widget.RoundedCornerEnforcement;
 
@@ -62,7 +61,8 @@ final class FloatingWidgetBackgroundView extends View {
         setClipToOutline(true);
     }
 
-    void init(LauncherAppWidgetHostView hostView, View backgroundView, float finalRadius) {
+    void init(LauncherAppWidgetHostView hostView, View backgroundView, float finalRadius,
+            int fallbackBackgroundColor) {
         mFinalRadius = finalRadius;
         mSourceView = backgroundView;
         mInitialOutlineRadius = getOutlineRadius(hostView, backgroundView);
@@ -81,7 +81,7 @@ final class FloatingWidgetBackgroundView extends View {
             setBackground(mBackgroundProperties.mDrawable);
             mSourceView.setBackground(null);
         } else if (mOriginalForeground == null) {
-            mFallbackDrawable.setColor(Themes.getColorBackground(backgroundView.getContext()));
+            mFallbackDrawable.setColor(fallbackBackgroundColor);
             setBackground(mFallbackDrawable);
             mIsUsingFallback = true;
         }
diff --git a/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java b/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java
index 0012dd805d..22ce9421f7 100644
--- a/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java
+++ b/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java
@@ -34,10 +34,12 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.dragndrop.DragLayer;
+import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.FloatingView;
 import com.android.launcher3.views.ListenerView;
 import com.android.launcher3.widget.LauncherAppWidgetHostView;
 import com.android.launcher3.widget.RoundedCornerEnforcement;
+import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
 /** A view that mimics an App Widget through a launch animation. */
 @TargetApi(Build.VERSION_CODES.S)
@@ -148,7 +150,7 @@ public class FloatingWidgetView extends FrameLayout implements AnimatorListener,
 
     private void init(DragLayer dragLayer, LauncherAppWidgetHostView originalView,
             RectF widgetBackgroundPosition, Size windowSize, float windowCornerRadius,
-            boolean appTargetIsTranslucent) {
+            boolean appTargetIsTranslucent, int fallbackBackgroundColor) {
         mAppWidgetView = originalView;
         mAppWidgetView.beginDeferringUpdates();
         mBackgroundPosition = widgetBackgroundPosition;
@@ -163,7 +165,8 @@ public class FloatingWidgetView extends FrameLayout implements AnimatorListener,
         getRelativePosition(mAppWidgetBackgroundView, dragLayer, mBackgroundPosition);
         getRelativePosition(mAppWidgetBackgroundView, mAppWidgetView, mBackgroundOffset);
         if (!mAppTargetIsTranslucent) {
-            mBackgroundView.init(mAppWidgetView, mAppWidgetBackgroundView, windowCornerRadius);
+            mBackgroundView.init(mAppWidgetView, mAppWidgetBackgroundView, windowCornerRadius,
+                    fallbackBackgroundColor);
             // Layout call before GhostView creation so that the overlaid view isn't clipped
             layout(0, 0, windowSize.getWidth(), windowSize.getHeight());
             mForegroundOverlayView = GhostView.addGhost(mAppWidgetView, this);
@@ -274,7 +277,8 @@ public class FloatingWidgetView extends FrameLayout implements AnimatorListener,
      */
     public static FloatingWidgetView getFloatingWidgetView(Launcher launcher,
             LauncherAppWidgetHostView originalView, RectF widgetBackgroundPosition,
-            Size windowSize, float windowCornerRadius, boolean appTargetsAreTranslucent) {
+            Size windowSize, float windowCornerRadius, boolean appTargetsAreTranslucent,
+            int fallbackBackgroundColor) {
         final DragLayer dragLayer = launcher.getDragLayer();
         ViewGroup parent = (ViewGroup) dragLayer.getParent();
         FloatingWidgetView floatingView =
@@ -282,11 +286,22 @@ public class FloatingWidgetView extends FrameLayout implements AnimatorListener,
         floatingView.recycle();
 
         floatingView.init(dragLayer, originalView, widgetBackgroundPosition, windowSize,
-                windowCornerRadius, appTargetsAreTranslucent);
+                windowCornerRadius, appTargetsAreTranslucent, fallbackBackgroundColor);
         parent.addView(floatingView);
         return floatingView;
     }
 
+    /**
+     * Extract a background color from a target's task description, or fall back to the given
+     * context's theme background color.
+     */
+    public static int getDefaultBackgroundColor(
+            Context context, RemoteAnimationTargetCompat target) {
+        return (target != null && target.taskInfo.taskDescription != null)
+                ? target.taskInfo.taskDescription.getBackgroundColor()
+                : Themes.getColorBackground(context);
+    }
+
     private static void getRelativePosition(View descendant, View ancestor, RectF position) {
         float[] points = new float[]{0, 0, descendant.getWidth(), descendant.getHeight()};
         Utilities.getDescendantCoordRelativeToAncestor(descendant, ancestor, points,
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index cb9e1f3a5c..a2d86bc7fa 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -397,6 +397,13 @@ public final class Utilities {
         return mapRange(interpolator.getInterpolation(progress), toMin, toMax);
     }
 
+    /** Bounds t between a lower and upper bound and maps the result to a range. */
+    public static float mapBoundToRange(float t, float lowerBound, float upperBound,
+            float toMin, float toMax, Interpolator interpolator) {
+        return mapToRange(boundToRange(t, lowerBound, upperBound), lowerBound, upperBound,
+                toMin, toMax, interpolator);
+    }
+
     public static float getProgress(float current, float min, float max) {
         return Math.abs(current - min) / Math.abs(max - min);
     }
-- 
GitLab


From 2668e731a0b79cf94b6962ec4c75a506e163c3d2 Mon Sep 17 00:00:00 2001
From: Cyrus Boadway <boadway@google.com>
Date: Tue, 18 May 2021 16:16:14 +0000
Subject: [PATCH 1372/1664] Add activity-start/return animation to widget
 configuration

When launching the configuration activity for a widget, use the
activity transition animation.

Test: manual
Bug: 190487998

Change-Id: Ife84e86eec74f81fecddce07c833356a7962fd4b
---
 .../widget/LauncherAppWidgetHost.java         | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHost.java b/src/com/android/launcher3/widget/LauncherAppWidgetHost.java
index d745754497..6dc69712dc 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetHost.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHost.java
@@ -25,15 +25,20 @@ import android.appwidget.AppWidgetProviderInfo;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Bundle;
 import android.os.Handler;
 import android.util.SparseArray;
 import android.widget.Toast;
 
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.BaseActivity;
+import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.model.WidgetsModel;
+import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.widget.custom.CustomWidgetManager;
@@ -292,8 +297,13 @@ public class LauncherAppWidgetHost extends AppWidgetHost {
         activity.startActivityForResult(intent, requestCode);
     }
 
-
-    public void startConfigActivity(BaseActivity activity, int widgetId, int requestCode) {
+    /**
+     * Launches an app widget's configuration activity.
+     * @param activity The activity from which to launch the configuration activity
+     * @param widgetId The id of the bound app widget to be configured
+     * @param requestCode An optional request code to be returned with the result
+     */
+    public void startConfigActivity(BaseDraggingActivity activity, int widgetId, int requestCode) {
         if (WidgetsModel.GO_DISABLE_WIDGETS) {
             sendActionCancelled(activity, requestCode);
             return;
@@ -301,13 +311,27 @@ public class LauncherAppWidgetHost extends AppWidgetHost {
 
         try {
             TestLogging.recordEvent(TestProtocol.SEQUENCE_MAIN, "start: startConfigActivity");
-            startAppWidgetConfigureActivityForResult(activity, widgetId, 0, requestCode, null);
+            startAppWidgetConfigureActivityForResult(activity, widgetId, 0, requestCode,
+                    getConfigurationActivityOptions(activity, widgetId));
         } catch (ActivityNotFoundException | SecurityException e) {
             Toast.makeText(activity, R.string.activity_not_found, Toast.LENGTH_SHORT).show();
             sendActionCancelled(activity, requestCode);
         }
     }
 
+    /**
+     * Returns an {@link android.app.ActivityOptions} bundle from the {code activity} for launching
+     * the configuration of the {@code widgetId} app widget, or null of options cannot be produced.
+     */
+    @Nullable
+    private Bundle getConfigurationActivityOptions(BaseDraggingActivity activity, int widgetId) {
+        LauncherAppWidgetHostView view = mViews.get(widgetId);
+        if (view == null) return null;
+        Object tag = view.getTag();
+        if (!(tag instanceof ItemInfo)) return null;
+        return activity.getActivityLaunchOptions(view, (ItemInfo) tag).toBundle();
+    }
+
     private void sendActionCancelled(final BaseActivity activity, final int requestCode) {
         new Handler().post(() -> activity.onActivityResult(requestCode, RESULT_CANCELED, null));
     }
-- 
GitLab


From e46c7613a30a0e7225e5424abfe5bb215a8001dc Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 10 Jun 2021 14:50:17 -0700
Subject: [PATCH 1373/1664] Ensure we pass the pointer id to the velocity
 tracker and not the index

Bug: 189259717
Test: Swipe up with two fingers using accessibility + gesture nav
Change-Id: Icef48276c6da824d43dea0f7d567691af9cdedaf
---
 .../src/com/android/quickstep/util/MotionPauseDetector.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java b/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java
index 8151d412ab..1ed2da3051 100644
--- a/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java
+++ b/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java
@@ -121,7 +121,7 @@ public class MotionPauseDetector {
         mForcePauseTimeout.setAlarm(mMakePauseHarderToTrigger
                 ? HARDER_TRIGGER_TIMEOUT
                 : FORCE_PAUSE_TIMEOUT);
-        float newVelocity = mVelocityProvider.addMotionEvent(ev, pointerIndex);
+        float newVelocity = mVelocityProvider.addMotionEvent(ev, ev.getPointerId(pointerIndex));
         if (mPreviousVelocity != null) {
             checkMotionPaused(newVelocity, mPreviousVelocity, ev.getEventTime());
         }
-- 
GitLab


From cb5c35e5d1ff5f3e3b99cde590040dc76d98653f Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Thu, 10 Jun 2021 17:59:00 -0700
Subject: [PATCH 1374/1664] Calculate the position from start bounds for
 auto-enter PiP

Video: http://recall/-/aaaaaabFQoRHlzixHdtY/eUpkH2il1vYBVBPt1Vks2u
Bug: 190748719
Test: manual, see video
Change-Id: I053bd5607200ad6341d04c9bcfec5222f101cf65
---
 .../quickstep/util/SwipePipToHomeAnimator.java   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
index 36311302bf..61bd82cd39 100644
--- a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
+++ b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
@@ -289,16 +289,16 @@ public class SwipePipToHomeAnimator extends ValueAnimator {
         final float degree, positionX, positionY;
         if (mFromRotation == Surface.ROTATION_90) {
             degree = -90 * fraction;
-            positionX = fraction * (mDestinationBoundsTransformed.left - mAppBounds.left)
-                    + mAppBounds.left;
-            positionY = fraction * (mDestinationBoundsTransformed.bottom - mAppBounds.top)
-                    + mAppBounds.top;
+            positionX = fraction * (mDestinationBoundsTransformed.left - mStartBounds.left)
+                    + mStartBounds.left;
+            positionY = fraction * (mDestinationBoundsTransformed.bottom - mStartBounds.top)
+                    + mStartBounds.top;
         } else {
             degree = 90 * fraction;
-            positionX = fraction * (mDestinationBoundsTransformed.right - mAppBounds.left)
-                    + mAppBounds.left;
-            positionY = fraction * (mDestinationBoundsTransformed.top - mAppBounds.top)
-                    + mAppBounds.top;
+            positionX = fraction * (mDestinationBoundsTransformed.right - mStartBounds.left)
+                    + mStartBounds.left;
+            positionY = fraction * (mDestinationBoundsTransformed.top - mStartBounds.top)
+                    + mStartBounds.top;
         }
         return new RotatedPosition(degree, positionX, positionY);
     }
-- 
GitLab


From fc235903abcae9e88fce5a2e5ddf492df3b1f28c Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Fri, 11 Jun 2021 14:05:07 +0000
Subject: [PATCH 1375/1664] Revert "[AllApps][Work] Introduce work toggle Fab"

This reverts commit 08cca82ecab9327fce8ca959feaf0f88902d8f37.

Reason for revert: broke errorprone build
Bug: 190150515

Change-Id: I1d8707392310e745713b8780bdb957299b88a3a6
---
 res/drawable/work_apps_toggle_background.xml  |  31 ---
 res/layout/work_mode_fab.xml                  |  33 ---
 res/layout/work_mode_switch.xml               |   9 +-
 res/layout/work_profile_edu.xml               |  61 +++++
 res/values/dimens.xml                         |   4 -
 res/values/strings.xml                        |  13 +-
 .../allapps/AllAppsContainerView.java         |   4 +-
 .../allapps/LauncherAllAppsContainerView.java |   8 +
 .../launcher3/allapps/WorkModeSwitch.java     | 168 ++++++++++---
 .../android/launcher3/views/WorkEduView.java  | 230 ++++++++++++++++++
 10 files changed, 443 insertions(+), 118 deletions(-)
 delete mode 100644 res/drawable/work_apps_toggle_background.xml
 delete mode 100644 res/layout/work_mode_fab.xml
 create mode 100644 res/layout/work_profile_edu.xml
 create mode 100644 src/com/android/launcher3/views/WorkEduView.java

diff --git a/res/drawable/work_apps_toggle_background.xml b/res/drawable/work_apps_toggle_background.xml
deleted file mode 100644
index a04d269875..0000000000
--- a/res/drawable/work_apps_toggle_background.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false">
-        <shape android:shape="rectangle">
-            <corners android:radius="@dimen/work_fab_radius" />
-            <solid android:color="?android:attr/colorControlHighlight" />
-            <padding android:left="@dimen/work_fab_radius" android:right="@dimen/work_fab_radius" />
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <corners android:radius="@dimen/work_fab_radius" />
-            <solid android:color="?android:attr/colorAccent" />
-            <padding android:left="@dimen/work_fab_radius" android:right="@dimen/work_fab_radius" />
-        </shape>
-    </item>
-</selector>
diff --git a/res/layout/work_mode_fab.xml b/res/layout/work_mode_fab.xml
deleted file mode 100644
index 21f269fed6..0000000000
--- a/res/layout/work_mode_fab.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.launcher3.allapps.WorkModeSwitch
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/work_mode_toggle"
-    android:layout_alignParentBottom="true"
-    android:layout_alignParentEnd="true"
-    android:layout_height="@dimen/work_fab_height"
-    android:layout_width="wrap_content"
-    android:gravity="center"
-    android:includeFontPadding="false"
-    android:drawableTint="@android:color/white"
-    android:textColor="@android:color/white"
-    android:background="@drawable/work_apps_toggle_background"
-    android:drawablePadding="16dp"
-    android:drawableStart="@drawable/ic_corp_off"
-    android:elevation="10dp"
-    android:layout_marginBottom="@dimen/work_fab_margin"
-    android:layout_marginEnd="@dimen/work_fab_margin"
-    android:text="@string/work_apps_pause_btn_text" />
\ No newline at end of file
diff --git a/res/layout/work_mode_switch.xml b/res/layout/work_mode_switch.xml
index 538a180992..31953c72aa 100644
--- a/res/layout/work_mode_switch.xml
+++ b/res/layout/work_mode_switch.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2017 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,7 +13,8 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher3.allapps.WorkModeSwitch xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher3.allapps.WorkModeSwitch
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     style="@style/PrimaryHeadline"
@@ -33,4 +35,5 @@
     android:paddingBottom="@dimen/work_profile_footer_padding"
     android:paddingLeft="@dimen/work_profile_footer_padding"
     android:paddingRight="@dimen/work_profile_footer_padding"
-    android:paddingTop="@dimen/work_profile_footer_padding" />
+    android:paddingTop="@dimen/work_profile_footer_padding"
+/>
diff --git a/res/layout/work_profile_edu.xml b/res/layout/work_profile_edu.xml
new file mode 100644
index 0000000000..c3c7010f7e
--- /dev/null
+++ b/res/layout/work_profile_edu.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.launcher3.views.WorkEduView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="bottom"
+    android:gravity="bottom"
+    android:orientation="vertical">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="32dp"
+        android:background="@drawable/bottom_sheet_top_border"
+        android:backgroundTint="?attr/eduHalfSheetBGColor" />
+
+    <LinearLayout
+        android:id="@+id/view_wrapper"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/eduHalfSheetBGColor"
+        android:orientation="vertical"
+        android:paddingLeft="@dimen/bottom_sheet_edu_padding"
+        android:paddingRight="@dimen/bottom_sheet_edu_padding">
+
+        <TextView
+            android:id="@+id/content_text"
+            style="@style/TextHeadline"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="48dp"
+            android:layout_marginBottom="48dp"
+            android:gravity="center"
+            android:text="@string/work_profile_edu_personal_apps"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="20sp" />
+
+        <Button
+            android:id="@+id/proceed"
+            android:layout_width="wrap_content"
+            android:layout_height="48dp"
+            android:layout_gravity="end"
+            android:background="?android:attr/selectableItemBackground"
+            android:gravity="center"
+            android:text="@string/work_profile_edu_next"
+            android:textAlignment="center"
+            android:textColor="@android:color/white" />
+    </LinearLayout>
+</com.android.launcher3.views.WorkEduView>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index caeb0b4eb1..d06561112e 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -115,10 +115,6 @@
 
     <dimen name="all_apps_divider_margin_vertical">8dp</dimen>
 
-<!-- Floating action button inside work tab to toggle work profile -->
-    <dimen name="work_fab_height">48dp</dimen>
-    <dimen name="work_fab_radius">24dp</dimen>
-    <dimen name="work_fab_margin">18dp</dimen>
     <dimen name="work_profile_footer_padding">20dp</dimen>
     <dimen name="work_profile_footer_text_size">16sp</dimen>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 42f69e0f92..c851cf8273 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -389,24 +389,27 @@
     <string name="work_profile_edu_accept">Got it</string>
 
     <!--- heading shown when user opens work apps tab while work apps are paused -->
-    <string name="work_apps_paused_title">Work apps are off</string>
+    <string name="work_apps_paused_title">Work profile is paused</string>
     <!--- body shown when user opens work apps tab while work apps are paused -->
-    <string name="work_apps_paused_body">Your work apps can’t send you notifications, use your battery, or access your location</string>
+    <string name="work_apps_paused_body">Work apps can’t send you notifications, use your battery, or access your location</string>
     <!-- content description for paused work apps list -->
-    <string name="work_apps_paused_content_description">Work apps are off. Your work apps can’t send you notifications, use your battery, or access your location</string>
+    <string name="work_apps_paused_content_description">Work profile is paused. Work apps can’t send you notifications, use your battery, or access your location</string>
     <!-- string shown in educational banner about work profile -->
     <string name="work_apps_paused_edu_banner">Work apps are badged and visible to your IT admin</string>
     <!-- button string shown to dismiss work tab education -->
     <string name="work_apps_paused_edu_accept">Got it</string>
 
     <!-- button string shown pause work profile -->
-    <string name="work_apps_pause_btn_text">Turn off work apps</string>
+    <string name="work_apps_pause_btn_text">Pause work apps</string>
     <!-- button string shown enable work profile -->
-    <string name="work_apps_enable_btn_text">Turn on work apps</string>
+    <string name="work_apps_enable_btn_text">Turn on</string>
 
     <!-- A hint shown in launcher settings develop options filter box -->
     <string name="developer_options_filter_hint">Filter</string>
 
+    <!-- A tip shown pointing at work toggle -->
+    <string name="work_switch_tip">Pause work apps and notifications</string>
+
     <!-- Failed action error message: e.g. Failed: Pause -->
     <string name="remote_action_failed">Failed: <xliff:g id="what" example="Pause">%1$s</xliff:g></string>
 </resources>
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 801a6c3300..cb20fec47a 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -228,7 +228,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
     }
 
     private void resetWorkProfile() {
-        mWorkModeSwitch.updateCurrentState(!mAllAppsStore.hasModelFlag(FLAG_QUIET_MODE_ENABLED));
+        mWorkModeSwitch.update(!mAllAppsStore.hasModelFlag(FLAG_QUIET_MODE_ENABLED));
         mAH[AdapterHolder.WORK].setupOverlay();
         mAH[AdapterHolder.WORK].applyPadding();
     }
@@ -482,7 +482,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
     private void setupWorkToggle() {
         if (Utilities.ATLEAST_P) {
             mWorkModeSwitch = (WorkModeSwitch) mLauncher.getLayoutInflater().inflate(
-                    R.layout.work_mode_fab, this, false);
+                    R.layout.work_mode_switch, this, false);
             this.addView(mWorkModeSwitch);
             mWorkModeSwitch.setInsets(mInsets);
             mWorkModeSwitch.post(this::resetWorkProfile);
diff --git a/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java b/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
index 1eb726ce0d..16ae2508ec 100644
--- a/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
@@ -25,6 +25,7 @@ import android.view.MotionEvent;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.statemanager.StateManager.StateListener;
+import com.android.launcher3.views.WorkEduView;
 
 /**
  * AllAppsContainerView with launcher specific callbacks
@@ -87,6 +88,13 @@ public class LauncherAllAppsContainerView extends AllAppsContainerView {
     @Override
     public void onActivePageChanged(int currentActivePage) {
         super.onActivePageChanged(currentActivePage);
+        if (mUsingTabs) {
+            if (currentActivePage == AdapterHolder.WORK) {
+                WorkEduView.showWorkEduIfNeeded(mLauncher);
+            } else {
+                mWorkTabListener = WorkEduView.showEduFlowIfNeeded(mLauncher, mWorkTabListener);
+            }
+        }
     }
 
     @Override
diff --git a/src/com/android/launcher3/allapps/WorkModeSwitch.java b/src/com/android/launcher3/allapps/WorkModeSwitch.java
index c742909161..4567ee620f 100644
--- a/src/com/android/launcher3/allapps/WorkModeSwitch.java
+++ b/src/com/android/launcher3/allapps/WorkModeSwitch.java
@@ -15,57 +15,108 @@
  */
 package com.android.launcher3.allapps;
 
-import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
-
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.graphics.Rect;
+import android.os.AsyncTask;
 import android.os.Process;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
+import android.view.MotionEvent;
+import android.view.ViewConfiguration;
+import android.widget.Switch;
 
 import com.android.launcher3.Insettable;
 import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.pm.UserCache;
+import com.android.launcher3.views.ArrowTipView;
+
+import java.lang.ref.WeakReference;
 
 /**
  * Work profile toggle switch shown at the bottom of AllApps work tab
  */
-public class WorkModeSwitch extends Button implements Insettable, View.OnClickListener {
+public class WorkModeSwitch extends Switch implements Insettable {
+
+    private static final int WORK_TIP_THRESHOLD = 2;
+    public static final String KEY_WORK_TIP_COUNTER = "worked_tip_counter";
 
     private Rect mInsets = new Rect();
-    private boolean mWorkEnabled;
+
+    private final float[] mTouch = new float[2];
+    private int mTouchSlop;
 
     public WorkModeSwitch(Context context) {
-        this(context, null, 0);
+        super(context);
+        init();
     }
 
     public WorkModeSwitch(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
+        super(context, attrs);
+        init();
     }
 
     public WorkModeSwitch(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    private void init() {
+        ViewConfiguration viewConfiguration = ViewConfiguration.get(getContext());
+        mTouchSlop = viewConfiguration.getScaledTouchSlop();
+    }
+
+    @Override
+    public void setChecked(boolean checked) { }
+
+    @Override
+    public void toggle() {
+        // don't show tip if user uses toggle
+        Utilities.getPrefs(getContext()).edit().putInt(KEY_WORK_TIP_COUNTER, -1).apply();
+        trySetQuietModeEnabledToAllProfilesAsync(isChecked());
+    }
+
+    /**
+     * Sets the enabled or disabled state of the button
+     * @param isChecked
+     */
+    public void update(boolean isChecked) {
+        super.setChecked(isChecked);
+        setCompoundDrawablesRelativeWithIntrinsicBounds(
+                isChecked ? R.drawable.ic_corp : R.drawable.ic_corp_off, 0, 0, 0);
+        setEnabled(true);
     }
 
     @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        setOnClickListener(this);
+    public boolean onTouchEvent(MotionEvent ev) {
+        if (ev.getActionMasked() == MotionEvent.ACTION_DOWN) {
+            mTouch[0] = ev.getX();
+            mTouch[1] = ev.getY();
+        } else if (ev.getActionMasked() == MotionEvent.ACTION_MOVE) {
+            if (Math.abs(mTouch[0] - ev.getX()) > mTouchSlop
+                    || Math.abs(mTouch[1] - ev.getY()) > mTouchSlop) {
+                int action = ev.getAction();
+                ev.setAction(MotionEvent.ACTION_CANCEL);
+                super.onTouchEvent(ev);
+                ev.setAction(action);
+                return false;
+            }
+        }
+        return super.onTouchEvent(ev);
+    }
+
+    private void trySetQuietModeEnabledToAllProfilesAsync(boolean enabled) {
+        new SetQuietModeEnabledAsyncTask(enabled, new WeakReference<>(this)).execute();
     }
 
     @Override
     public void setInsets(Rect insets) {
         int bottomInset = insets.bottom - mInsets.bottom;
         mInsets.set(insets);
-        ViewGroup.MarginLayoutParams marginLayoutParams =
-                (ViewGroup.MarginLayoutParams) getLayoutParams();
-        if (marginLayoutParams != null) {
-            marginLayoutParams.bottomMargin = bottomInset + marginLayoutParams.bottomMargin;
-        }
+        setPadding(getPaddingLeft(), getPaddingTop(), getPaddingRight(),
+                getPaddingBottom() + bottomInset);
     }
 
     /**
@@ -74,41 +125,78 @@ public class WorkModeSwitch extends Button implements Insettable, View.OnClickLi
     public void setWorkTabVisible(boolean workTabVisible) {
         clearAnimation();
         if (workTabVisible) {
-            setEnabled(true);
             setVisibility(VISIBLE);
             setAlpha(0);
             animate().alpha(1).start();
+            showTipIfNeeded();
         } else {
             animate().alpha(0).withEndAction(() -> this.setVisibility(GONE)).start();
         }
     }
 
-    @Override
-    public void onClick(View view) {
-        setEnabled(false);
-        UI_HELPER_EXECUTOR.post(() -> setToState(!mWorkEnabled));
+    private static final class SetQuietModeEnabledAsyncTask
+            extends AsyncTask<Void, Void, Boolean> {
+
+        private final boolean enabled;
+        private final WeakReference<WorkModeSwitch> switchWeakReference;
+
+        SetQuietModeEnabledAsyncTask(boolean enabled,
+                                     WeakReference<WorkModeSwitch> switchWeakReference) {
+            this.enabled = enabled;
+            this.switchWeakReference = switchWeakReference;
+        }
+
+        @Override
+        protected void onPreExecute() {
+            super.onPreExecute();
+            WorkModeSwitch workModeSwitch = switchWeakReference.get();
+            if (workModeSwitch != null) {
+                workModeSwitch.setEnabled(false);
+            }
+        }
+
+        @Override
+        protected Boolean doInBackground(Void... voids) {
+            WorkModeSwitch workModeSwitch = switchWeakReference.get();
+            if (workModeSwitch == null || !Utilities.ATLEAST_P) {
+                return false;
+            }
+
+            Context context = workModeSwitch.getContext();
+            UserManager userManager = context.getSystemService(UserManager.class);
+            boolean showConfirm = false;
+            for (UserHandle userProfile : UserCache.INSTANCE.get(context).getUserProfiles()) {
+                if (Process.myUserHandle().equals(userProfile)) {
+                    continue;
+                }
+                showConfirm |= !userManager.requestQuietModeEnabled(enabled, userProfile);
+            }
+            return showConfirm;
+        }
+
+        @Override
+        protected void onPostExecute(Boolean showConfirm) {
+            if (showConfirm) {
+                WorkModeSwitch workModeSwitch = switchWeakReference.get();
+                if (workModeSwitch != null) {
+                    workModeSwitch.setEnabled(true);
+                }
+            }
+        }
     }
 
     /**
-     * Sets the enabled or disabled state of the button
+     * Shows a work tip on the Nth work tab open
      */
-    public void updateCurrentState(boolean active) {
-        mWorkEnabled = active;
-        setEnabled(true);
-        setCompoundDrawablesRelativeWithIntrinsicBounds(
-                active ? R.drawable.ic_corp_off : R.drawable.ic_corp, 0, 0, 0);
-        setText(active ? R.string.work_apps_pause_btn_text : R.string.work_apps_enable_btn_text);
-    }
-
-    protected Boolean setToState(boolean toState) {
-        UserManager userManager = getContext().getSystemService(UserManager.class);
-        boolean showConfirm = false;
-        for (UserHandle userProfile : UserCache.INSTANCE.get(getContext()).getUserProfiles()) {
-            if (Process.myUserHandle().equals(userProfile)) {
-                continue;
-            }
-            showConfirm |= !userManager.requestQuietModeEnabled(!toState, userProfile);
+    public void showTipIfNeeded() {
+        Context context = getContext();
+        SharedPreferences prefs = Utilities.getPrefs(context);
+        int tipCounter = prefs.getInt(KEY_WORK_TIP_COUNTER, WORK_TIP_THRESHOLD);
+        if (tipCounter < 0) return;
+        if (tipCounter == 0) {
+            new ArrowTipView(context)
+                    .show(context.getString(R.string.work_switch_tip), getTop());
         }
-        return showConfirm;
+        prefs.edit().putInt(KEY_WORK_TIP_COUNTER, tipCounter - 1).apply();
     }
 }
diff --git a/src/com/android/launcher3/views/WorkEduView.java b/src/com/android/launcher3/views/WorkEduView.java
new file mode 100644
index 0000000000..6be0c23577
--- /dev/null
+++ b/src/com/android/launcher3/views/WorkEduView.java
@@ -0,0 +1,230 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.views;
+
+
+import android.animation.Animator;
+import android.animation.ObjectAnimator;
+import android.animation.PropertyValuesHolder;
+import android.content.Context;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.Insettable;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherState;
+import com.android.launcher3.R;
+import com.android.launcher3.allapps.AllAppsContainerView;
+import com.android.launcher3.allapps.AllAppsPagedView;
+import com.android.launcher3.anim.AnimationSuccessListener;
+import com.android.launcher3.anim.Interpolators;
+import com.android.launcher3.statemanager.StateManager.StateListener;
+
+/**
+ * On boarding flow for users right after setting up work profile
+ */
+public class WorkEduView extends AbstractSlideInView<Launcher>
+        implements Insettable, StateListener<LauncherState> {
+
+    private static final int DEFAULT_CLOSE_DURATION = 200;
+    public static final String KEY_WORK_EDU_STEP = "showed_work_profile_edu";
+    public static final String KEY_LEGACY_WORK_EDU_SEEN = "showed_bottom_user_education";
+
+    private static final int WORK_EDU_NOT_STARTED = 0;
+    private static final int WORK_EDU_PERSONAL_APPS = 1;
+    private static final int WORK_EDU_WORK_APPS = 2;
+
+    protected static final int FINAL_SCRIM_BG_COLOR = 0x88000000;
+
+
+    private Rect mInsets = new Rect();
+    private View mViewWrapper;
+    private Button mProceedButton;
+    private TextView mContentText;
+
+    private int mNextWorkEduStep = WORK_EDU_PERSONAL_APPS;
+
+
+    public WorkEduView(Context context, AttributeSet attr) {
+        this(context, attr, 0);
+    }
+
+    public WorkEduView(Context context, AttributeSet attrs,
+            int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mContent = this;
+    }
+
+    @Override
+    protected void handleClose(boolean animate) {
+        mActivityContext.getSharedPrefs().edit()
+                .putInt(KEY_WORK_EDU_STEP, mNextWorkEduStep).apply();
+        handleClose(true, DEFAULT_CLOSE_DURATION);
+    }
+
+    @Override
+    protected void onCloseComplete() {
+        super.onCloseComplete();
+        mActivityContext.getStateManager().removeStateListener(this);
+    }
+
+    @Override
+    protected boolean isOfType(int type) {
+        return (type & TYPE_ON_BOARD_POPUP) != 0;
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mViewWrapper = findViewById(R.id.view_wrapper);
+        mProceedButton = findViewById(R.id.proceed);
+        mContentText = findViewById(R.id.content_text);
+
+        // make sure layout does not shrink when we change the text
+        mContentText.post(() -> mContentText.setMinLines(mContentText.getLineCount()));
+
+        mProceedButton.setOnClickListener(view -> {
+            if (getAllAppsPagedView() != null) {
+                getAllAppsPagedView().snapToPage(AllAppsContainerView.AdapterHolder.WORK);
+            }
+            goToWorkTab(true);
+        });
+    }
+
+    private void goToWorkTab(boolean animate) {
+        mProceedButton.setText(R.string.work_profile_edu_accept);
+        if (animate) {
+            ObjectAnimator animator = ObjectAnimator.ofFloat(mContentText, ALPHA, 0);
+            animator.addListener(new AnimationSuccessListener() {
+                @Override
+                public void onAnimationSuccess(Animator animator) {
+                    mContentText.setText(
+                            mActivityContext.getString(R.string.work_profile_edu_work_apps));
+                    ObjectAnimator.ofFloat(mContentText, ALPHA, 1).start();
+                }
+            });
+            animator.start();
+        } else {
+            mContentText.setText(mActivityContext.getString(R.string.work_profile_edu_work_apps));
+        }
+        mNextWorkEduStep = WORK_EDU_WORK_APPS;
+        mProceedButton.setOnClickListener(v -> handleClose(true));
+    }
+
+    @Override
+    public void setInsets(Rect insets) {
+        int leftInset = insets.left - mInsets.left;
+        int rightInset = insets.right - mInsets.right;
+        int bottomInset = insets.bottom - mInsets.bottom;
+        mInsets.set(insets);
+        setPadding(leftInset, getPaddingTop(), rightInset, 0);
+        mViewWrapper.setPaddingRelative(mViewWrapper.getPaddingStart(),
+                mViewWrapper.getPaddingTop(), mViewWrapper.getPaddingEnd(), bottomInset);
+    }
+
+    private void show() {
+        attachToContainer();
+        animateOpen();
+        mActivityContext.getStateManager().addStateListener(this);
+    }
+
+    @Override
+    protected int getScrimColor(Context context) {
+        return FINAL_SCRIM_BG_COLOR;
+    }
+
+    private void goToFirstPage() {
+        if (getAllAppsPagedView() != null) {
+            getAllAppsPagedView().snapToPageImmediately(AllAppsContainerView.AdapterHolder.MAIN);
+        }
+    }
+
+    private void animateOpen() {
+        if (mIsOpen || mOpenCloseAnimator.isRunning()) {
+            return;
+        }
+        mIsOpen = true;
+        mOpenCloseAnimator.setValues(
+                PropertyValuesHolder.ofFloat(TRANSLATION_SHIFT, TRANSLATION_SHIFT_OPENED));
+        mOpenCloseAnimator.setInterpolator(Interpolators.FAST_OUT_SLOW_IN);
+        mOpenCloseAnimator.start();
+    }
+
+    private AllAppsPagedView getAllAppsPagedView() {
+        View v = mActivityContext.getAppsView().getContentView();
+        return (v instanceof AllAppsPagedView) ? (AllAppsPagedView) v : null;
+    }
+
+    /**
+     * Checks if user has not seen onboarding UI yet and shows it when user navigates to all apps
+     */
+    public static StateListener<LauncherState> showEduFlowIfNeeded(Launcher launcher,
+            @Nullable StateListener<LauncherState> oldListener) {
+        if (oldListener != null) {
+            launcher.getStateManager().removeStateListener(oldListener);
+        }
+        if (hasSeenLegacyEdu(launcher) || launcher.getSharedPrefs().getInt(KEY_WORK_EDU_STEP,
+                WORK_EDU_NOT_STARTED) != WORK_EDU_NOT_STARTED) {
+            return null;
+        }
+
+        StateListener<LauncherState> listener = new StateListener<LauncherState>() {
+            @Override
+            public void onStateTransitionComplete(LauncherState finalState) {
+                if (finalState != LauncherState.ALL_APPS) return;
+                LayoutInflater layoutInflater = LayoutInflater.from(launcher);
+                WorkEduView v = (WorkEduView) layoutInflater.inflate(
+                        R.layout.work_profile_edu, launcher.getDragLayer(),
+                        false);
+                v.show();
+                v.goToFirstPage();
+                launcher.getStateManager().removeStateListener(this);
+            }
+        };
+        launcher.getStateManager().addStateListener(listener);
+        return listener;
+    }
+
+    /**
+     * Shows work apps edu if user had dismissed full edu flow
+     */
+    public static void showWorkEduIfNeeded(Launcher launcher) {
+        if (hasSeenLegacyEdu(launcher) || launcher.getSharedPrefs().getInt(KEY_WORK_EDU_STEP,
+                WORK_EDU_NOT_STARTED) != WORK_EDU_PERSONAL_APPS) {
+            return;
+        }
+        LayoutInflater layoutInflater = LayoutInflater.from(launcher);
+        WorkEduView v = (WorkEduView) layoutInflater.inflate(
+                R.layout.work_profile_edu, launcher.getDragLayer(), false);
+        v.show();
+        v.goToWorkTab(false);
+    }
+
+    private static boolean hasSeenLegacyEdu(Launcher launcher) {
+        return launcher.getSharedPrefs().getBoolean(KEY_LEGACY_WORK_EDU_SEEN, false);
+    }
+
+    @Override
+    public void onStateTransitionComplete(LauncherState finalState) {
+        close(false);
+    }
+}
-- 
GitLab


From 2dab912b950653377c2d87fd825611963480114d Mon Sep 17 00:00:00 2001
From: Stevie Kideckel <kideckel@google.com>
Date: Fri, 11 Jun 2021 13:03:41 +0000
Subject: [PATCH 1376/1664] Use LayoutManager.onLayoutCompleted as a signal
 that content has changed

onChildAttachedToWindow is called before the layout manager is finished
processing the layout, so incorrect measurements / intermediate
animation states can be present.

onLayoutCompleted occurs after each full layout calculation, including
measuring multiple views or animating, and is a better signal to use.

Fix: 190391539
Test: verified locally with search use case and other expand collapse
cases

Change-Id: If01caf33c6c3371636895e1361d80de536363239
---
 .../picker/WidgetsListLayoutManager.java      | 51 +++++++++++++++++++
 .../widget/picker/WidgetsRecyclerView.java    | 25 +++------
 2 files changed, 58 insertions(+), 18 deletions(-)
 create mode 100644 src/com/android/launcher3/widget/picker/WidgetsListLayoutManager.java

diff --git a/src/com/android/launcher3/widget/picker/WidgetsListLayoutManager.java b/src/com/android/launcher3/widget/picker/WidgetsListLayoutManager.java
new file mode 100644
index 0000000000..2b7f544c56
--- /dev/null
+++ b/src/com/android/launcher3/widget/picker/WidgetsListLayoutManager.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget.picker;
+
+import android.content.Context;
+
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.launcher3.widget.picker.SearchAndRecommendationsScrollController.OnContentChangeListener;
+
+/**
+ * A layout manager for the {@link WidgetsRecyclerView}.
+ *
+ * {@link #setOnContentChangeListener(OnContentChangeListener)} can be used to register a callback
+ * for when the content of the layout manager has changed, following measurement and animation.
+ */
+public final class WidgetsListLayoutManager extends LinearLayoutManager {
+    @Nullable
+    private OnContentChangeListener mOnContentChangeListener;
+
+    public WidgetsListLayoutManager(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void onLayoutCompleted(RecyclerView.State state) {
+        super.onLayoutCompleted(state);
+        if (mOnContentChangeListener != null) {
+            mOnContentChangeListener.onContentChanged();
+        }
+    }
+
+    public void setOnContentChangeListener(@Nullable OnContentChangeListener listener) {
+        mOnContentChangeListener = listener;
+    }
+}
diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java b/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
index 090362ba33..6e10bf6fc3 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
@@ -23,7 +23,6 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.widget.TableLayout;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -78,7 +77,9 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
         super.onFinishInflate();
         // create a layout manager with Launcher's context so that scroll position
         // can be preserved during screen rotation.
-        setLayoutManager(new LinearLayoutManager(getContext()));
+        WidgetsListLayoutManager layoutManager = new WidgetsListLayoutManager(getContext());
+        layoutManager.setOnContentChangeListener(mOnContentChangeListener);
+        setLayoutManager(layoutManager);
     }
 
     @Override
@@ -87,22 +88,6 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
         mAdapter = (WidgetsListAdapter) adapter;
     }
 
-    @Override
-    public void onChildAttachedToWindow(@NonNull View child) {
-        super.onChildAttachedToWindow(child);
-        if (mOnContentChangeListener != null) {
-            mOnContentChangeListener.onContentChanged();
-        }
-    }
-
-    @Override
-    public void onChildDetachedFromWindow(@NonNull View child) {
-        super.onChildDetachedFromWindow(child);
-        if (mOnContentChangeListener != null) {
-            mOnContentChangeListener.onContentChanged();
-        }
-    }
-
     /**
      * Maps the touch (from 0..1) to the adapter position that should be visible.
      */
@@ -266,6 +251,10 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
 
     public void setOnContentChangeListener(@Nullable OnContentChangeListener listener) {
         mOnContentChangeListener = listener;
+        WidgetsListLayoutManager layoutManager = (WidgetsListLayoutManager) getLayoutManager();
+        if (layoutManager != null) {
+            layoutManager.setOnContentChangeListener(listener);
+        }
     }
 
     /**
-- 
GitLab


From 7cc29dc44da3826fc381a1e3ddfa4f4c1311e6db Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Thu, 10 Jun 2021 00:00:35 -0700
Subject: [PATCH 1377/1664] Fix RecyclerViewFastScroller bugs, hide keyboard

Bug: 189982238
Bug: 187561242
Bug: 187909098

Test: manual
Change-Id: I693810e5761004c48d028253c25a2fe96477af40
---
 .../allapps/AllAppsRecyclerView.java          |  4 +-
 .../views/RecyclerViewFastScroller.java       | 39 ++++++++++++++-----
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
index d536c3afeb..5bbd02b5ed 100644
--- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
@@ -190,8 +190,6 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
             case SCROLL_STATE_DRAGGING:
                 mgr.logger().sendToInteractionJankMonitor(
                         LAUNCHER_ALLAPPS_VERTICAL_SWIPE_BEGIN, this);
-                hideKeyboardAsync(ActivityContext.lookupContext(getContext()),
-                        getApplicationWindowToken());
                 break;
             case SCROLL_STATE_IDLE:
                 mgr.logger().sendToInteractionJankMonitor(
@@ -207,6 +205,8 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
                 && mEmptySearchBackground != null && mEmptySearchBackground.getAlpha() > 0) {
             mEmptySearchBackground.setHotspot(e.getX(), e.getY());
         }
+        hideKeyboardAsync(ActivityContext.lookupContext(getContext()),
+                getApplicationWindowToken());
         return result;
     }
 
diff --git a/src/com/android/launcher3/views/RecyclerViewFastScroller.java b/src/com/android/launcher3/views/RecyclerViewFastScroller.java
index 9d0913ad25..e607ab3f7e 100644
--- a/src/com/android/launcher3/views/RecyclerViewFastScroller.java
+++ b/src/com/android/launcher3/views/RecyclerViewFastScroller.java
@@ -23,6 +23,7 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
+import android.graphics.Insets;
 import android.graphics.Paint;
 import android.graphics.Point;
 import android.graphics.Rect;
@@ -32,6 +33,7 @@ import android.util.Property;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
+import android.view.WindowInsets;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
@@ -51,6 +53,7 @@ import java.util.List;
  */
 public class RecyclerViewFastScroller extends View {
 
+    private static final int FASTSCROLL_THRESHOLD_MILLIS = 200;
     private static final int SCROLL_DELTA_THRESHOLD_DP = 4;
     private static final Rect sTempRect = new Rect();
 
@@ -101,6 +104,7 @@ public class RecyclerViewFastScroller extends View {
     private final boolean mCanThumbDetach;
     private boolean mIgnoreDragGesture;
     private boolean mIsRecyclerViewFirstChildInParent = true;
+    private long mDownTimeStampMillis;
 
     // This is the offset from the top of the scrollbar when the user first starts touching.  To
     // prevent jumping, this offset is applied as the user scrolls.
@@ -112,6 +116,7 @@ public class RecyclerViewFastScroller extends View {
     private TextView mPopupView;
     private boolean mPopupVisible;
     private String mPopupSectionName;
+    private Insets mSystemGestureInsets;
 
     protected BaseRecyclerView mRv;
     private RecyclerView.OnScrollListener mOnScrollListener;
@@ -237,6 +242,7 @@ public class RecyclerViewFastScroller extends View {
                 // Keep track of the down positions
                 mDownX = x;
                 mDownY = mLastY = y;
+                mDownTimeStampMillis = ev.getDownTime();
 
                 if ((Math.abs(mDy) < mDeltaThreshold &&
                         mRv.getScrollState() != RecyclerView.SCROLL_STATE_IDLE)) {
@@ -246,22 +252,27 @@ public class RecyclerViewFastScroller extends View {
                 }
                 if (isNearThumb(x, y)) {
                     mTouchOffsetY = mDownY - mThumbOffsetY;
-                } else if (mRv.supportsFastScrolling()
-                        && isNearScrollBar(mDownX)) {
-                    calcTouchOffsetAndPrepToFastScroll(mDownY, mLastY);
-                    updateFastScrollSectionNameAndThumbOffset(y);
                 }
                 break;
             case MotionEvent.ACTION_MOVE:
                 mLastY = y;
+                int absDeltaY = Math.abs(y - mDownY);
+                int absDeltaX = Math.abs(x - mDownX);
 
                 // Check if we should start scrolling, but ignore this fastscroll gesture if we have
                 // exceeded some fixed movement
-                mIgnoreDragGesture |= Math.abs(y - mDownY) > mConfig.getScaledPagingTouchSlop();
-                if (!mIsDragging && !mIgnoreDragGesture && mRv.supportsFastScrolling() &&
-                        isNearThumb(mDownX, mLastY) &&
-                        Math.abs(y - mDownY) > mConfig.getScaledTouchSlop()) {
-                    calcTouchOffsetAndPrepToFastScroll(mDownY, mLastY);
+                mIgnoreDragGesture |= absDeltaY > mConfig.getScaledPagingTouchSlop();
+
+                if (!mIsDragging && !mIgnoreDragGesture && mRv.supportsFastScrolling()) {
+                    // condition #1: triggering thumb is distance, angle based
+                    if ((isNearThumb(mDownX, mLastY)
+                            && absDeltaY > mConfig.getScaledPagingTouchSlop()
+                            && absDeltaY > absDeltaX)
+                            // condition#2: Fastscroll function is now time based
+                            || (isNearScrollBar(mDownX) && ev.getEventTime() - mDownTimeStampMillis
+                                    > FASTSCROLL_THRESHOLD_MILLIS)) {
+                        calcTouchOffsetAndPrepToFastScroll(mDownY, mLastY);
+                    }
                 }
                 if (mIsDragging) {
                     updateFastScrollSectionNameAndThumbOffset(y);
@@ -328,12 +339,22 @@ public class RecyclerViewFastScroller extends View {
         canvas.drawRoundRect(mThumbBounds, r, r, mThumbPaint);
         if (Utilities.ATLEAST_Q) {
             mThumbBounds.roundOut(SYSTEM_GESTURE_EXCLUSION_RECT.get(0));
+            // swiping very close to the thumb area (not just within it's bound)
+            // will also prevent back gesture
             SYSTEM_GESTURE_EXCLUSION_RECT.get(0).offset(mThumbDrawOffset.x, mThumbDrawOffset.y);
+            SYSTEM_GESTURE_EXCLUSION_RECT.get(0).left = SYSTEM_GESTURE_EXCLUSION_RECT.get(0).right
+                    - mSystemGestureInsets.right;
             setSystemGestureExclusionRects(SYSTEM_GESTURE_EXCLUSION_RECT);
         }
         canvas.restoreToCount(saveCount);
     }
 
+    @Override
+    public WindowInsets onApplyWindowInsets(WindowInsets insets) {
+        mSystemGestureInsets = insets.getSystemGestureInsets();
+        return super.onApplyWindowInsets(insets);
+    }
+
     private float getScrollThumbRadius() {
         return mWidth + mThumbPadding + mThumbPadding;
     }
-- 
GitLab


From 7fec8fc10c89742bbdb973cfcfad8cedd86a179e Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Wed, 9 Jun 2021 13:44:46 -0700
Subject: [PATCH 1378/1664] Polish the gesture navigation tutorial sandbox

- Updated in-memory tutorial steps to a array so we can better track the tutorial progress after changing the theme.
- Added a 1.5 second delay for the gesture video when the user first starts a step, and when the app resumes.
- Updated the tutorial step indicator color: previous color was invisible against the background.

Bug: 188972959
Test: manual
Change-Id: Ia1a67f7cd9e7ed9802dbc0d88d1e3b432acfa127
---
 .../interaction/GestureSandboxActivity.java   | 34 +++++-----
 .../interaction/TutorialController.java       | 68 ++++++++++++++-----
 .../interaction/TutorialFragment.java         |  5 +-
 .../interaction/TutorialStepIndicator.java    | 10 +--
 4 files changed, 75 insertions(+), 42 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java b/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java
index c3b342babc..cf523d054d 100644
--- a/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java
+++ b/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java
@@ -29,8 +29,6 @@ import androidx.fragment.app.FragmentActivity;
 import com.android.launcher3.R;
 import com.android.quickstep.interaction.TutorialController.TutorialType;
 
-import java.util.ArrayDeque;
-import java.util.Deque;
 import java.util.List;
 
 /** Shows the gesture interactive sandbox in full screen mode. */
@@ -39,8 +37,9 @@ public class GestureSandboxActivity extends FragmentActivity {
     private static final String LOG_TAG = "GestureSandboxActivity";
 
     private static final String KEY_TUTORIAL_STEPS = "tutorial_steps";
+    private static final String KEY_CURRENT_STEP = "current_step";
 
-    private Deque<TutorialType> mTutorialSteps;
+    private TutorialType[] mTutorialSteps;
     private TutorialType mCurrentTutorialStep;
     private TutorialFragment mFragment;
 
@@ -55,9 +54,7 @@ public class GestureSandboxActivity extends FragmentActivity {
 
         Bundle args = savedInstanceState == null ? getIntent().getExtras() : savedInstanceState;
         mTutorialSteps = getTutorialSteps(args);
-        mCurrentStep = 1;
-        mNumSteps = mTutorialSteps.size();
-        mCurrentTutorialStep = mTutorialSteps.pop();
+        mCurrentTutorialStep = mTutorialSteps[mCurrentStep - 1];
         mFragment = TutorialFragment.newInstance(mCurrentTutorialStep);
         getSupportFragmentManager().beginTransaction()
                 .add(R.id.gesture_tutorial_fragment_container, mFragment)
@@ -88,12 +85,13 @@ public class GestureSandboxActivity extends FragmentActivity {
     @Override
     protected void onSaveInstanceState(@NonNull Bundle savedInstanceState) {
         savedInstanceState.putStringArray(KEY_TUTORIAL_STEPS, getTutorialStepNames());
+        savedInstanceState.putInt(KEY_CURRENT_STEP, mCurrentStep);
         super.onSaveInstanceState(savedInstanceState);
     }
 
     /** Returns true iff there aren't anymore tutorial types to display to the user. */
     public boolean isTutorialComplete() {
-        return mTutorialSteps.isEmpty();
+        return mCurrentStep >= mNumSteps;
     }
 
     public int getCurrentStep() {
@@ -121,7 +119,7 @@ public class GestureSandboxActivity extends FragmentActivity {
             mFragment.closeTutorial();
             return;
         }
-        mCurrentTutorialStep = mTutorialSteps.pop();
+        mCurrentTutorialStep = mTutorialSteps[mCurrentStep];
         mFragment = TutorialFragment.newInstance(mCurrentTutorialStep);
         getSupportFragmentManager().beginTransaction()
             .replace(R.id.gesture_tutorial_fragment_container, mFragment)
@@ -131,10 +129,9 @@ public class GestureSandboxActivity extends FragmentActivity {
     }
 
     private String[] getTutorialStepNames() {
-        String[] tutorialStepNames = new String[mTutorialSteps.size() + 1];
+        String[] tutorialStepNames = new String[mTutorialSteps.length];
 
-        int i = 1;
-        tutorialStepNames[0] = mCurrentTutorialStep.name();
+        int i = 0;
         for (TutorialType tutorialStep : mTutorialSteps) {
             tutorialStepNames[i++] = tutorialStep.name();
         }
@@ -142,25 +139,28 @@ public class GestureSandboxActivity extends FragmentActivity {
         return tutorialStepNames;
     }
 
-    private Deque<TutorialType> getTutorialSteps(Bundle extras) {
-        Deque<TutorialType> defaultSteps = new ArrayDeque<>();
-        defaultSteps.push(TutorialType.RIGHT_EDGE_BACK_NAVIGATION);
+    private TutorialType[] getTutorialSteps(Bundle extras) {
+        TutorialType[] defaultSteps = new TutorialType[] {TutorialType.LEFT_EDGE_BACK_NAVIGATION};
 
         if (extras == null || !extras.containsKey(KEY_TUTORIAL_STEPS)) {
             return defaultSteps;
         }
 
         String[] tutorialStepNames = extras.getStringArray(KEY_TUTORIAL_STEPS);
+        int currentStep = extras.getInt(KEY_CURRENT_STEP, -1);
 
         if (tutorialStepNames == null) {
             return defaultSteps;
         }
 
-        Deque<TutorialType> tutorialSteps = new ArrayDeque<>();
-        for (String tutorialStepName : tutorialStepNames) {
-            tutorialSteps.addLast(TutorialType.valueOf(tutorialStepName));
+        TutorialType[] tutorialSteps = new TutorialType[tutorialStepNames.length];
+        for (int i = 0; i < tutorialStepNames.length; i++) {
+            tutorialSteps[i] = TutorialType.valueOf(tutorialStepNames[i]);
         }
 
+        mCurrentStep = Math.max(currentStep, 1);
+        mNumSteps = tutorialSteps.length;
+
         return tutorialSteps;
     }
 
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
index c9da609a08..dfe0c7270a 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
@@ -58,6 +58,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
 
     private static final int FEEDBACK_ANIMATION_MS = 250;
     private static final int RIPPLE_VISIBLE_MS = 300;
+    private static final int GESTURE_ANIMATION_DELAY_MS = 1500;
 
     final TutorialFragment mTutorialFragment;
     TutorialType mTutorialType;
@@ -65,6 +66,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
 
     final TextView mCloseButton;
     final ViewGroup mFeedbackView;
+    final TextView mFeedbackTitleView;
     final ImageView mFeedbackVideoView;
     final ImageView mGestureVideoView;
     final RelativeLayout mFakeLauncherView;
@@ -80,6 +82,12 @@ abstract class TutorialController implements BackGestureAttemptCallback,
 
     protected boolean mGestureCompleted = false;
 
+    // These runnables  should be used when posting callbacks to their views and cleared from their
+    // views before posting new callbacks.
+    private final Runnable mTitleViewCallback;
+    @Nullable private Runnable mFeedbackViewCallback;
+    @Nullable private Runnable mFeedbackVideoViewCallback;
+
     TutorialController(TutorialFragment tutorialFragment, TutorialType tutorialType) {
         mTutorialFragment = tutorialFragment;
         mTutorialType = tutorialType;
@@ -89,6 +97,8 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         mCloseButton = rootView.findViewById(R.id.gesture_tutorial_fragment_close_button);
         mCloseButton.setOnClickListener(button -> showSkipTutorialDialog());
         mFeedbackView = rootView.findViewById(R.id.gesture_tutorial_fragment_feedback_view);
+        mFeedbackTitleView = mFeedbackView.findViewById(
+                R.id.gesture_tutorial_fragment_feedback_title);
         mFeedbackVideoView = rootView.findViewById(R.id.gesture_tutorial_feedback_video);
         mGestureVideoView = rootView.findViewById(R.id.gesture_tutorial_gesture_video);
         mFakeLauncherView = rootView.findViewById(R.id.gesture_tutorial_fake_launcher_view);
@@ -103,6 +113,9 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         mTutorialStepView =
                 rootView.findViewById(R.id.gesture_tutorial_fragment_feedback_tutorial_step);
         mSkipTutorialDialog = createSkipTutorialDialog();
+
+        mTitleViewCallback = () -> mFeedbackTitleView.sendAccessibilityEvent(
+                AccessibilityEvent.TYPE_VIEW_FOCUSED);
     }
 
     private void showSkipTutorialDialog() {
@@ -169,7 +182,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
             playFeedbackVideo(tutorialAnimation, gestureAnimation, () -> {
                 mFeedbackView.setTranslationY(0);
                 title.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);
-            });
+            }, true);
         }
     }
 
@@ -192,15 +205,17 @@ abstract class TutorialController implements BackGestureAttemptCallback,
                 isGestureSuccessful
                         ? R.string.gesture_tutorial_nice : R.string.gesture_tutorial_try_again,
                 subtitleResId,
-                isGestureSuccessful);
+                isGestureSuccessful,
+                false);
     }
 
     void showFeedback(
             int titleResId,
             int subtitleResId,
-            boolean isGestureSuccessful) {
-        TextView title = mFeedbackView.findViewById(R.id.gesture_tutorial_fragment_feedback_title);
-        title.setText(titleResId);
+            boolean isGestureSuccessful,
+            boolean useGestureAnimationDelay) {
+        mFeedbackTitleView.setText(titleResId);
+        mFeedbackTitleView.removeCallbacks(mTitleViewCallback);
         TextView subtitle =
                 mFeedbackView.findViewById(R.id.gesture_tutorial_fragment_feedback_subtitle);
         subtitle.setText(subtitleResId);
@@ -221,11 +236,8 @@ abstract class TutorialController implements BackGestureAttemptCallback,
                             .setDuration(FEEDBACK_ANIMATION_MS)
                             .translationY(0)
                             .start();
-                    title.postDelayed(
-                            () -> title.sendAccessibilityEvent(
-                                    AccessibilityEvent.TYPE_VIEW_FOCUSED),
-                            FEEDBACK_ANIMATION_MS);
-                });
+                    mFeedbackTitleView.postDelayed(mTitleViewCallback, FEEDBACK_ANIMATION_MS);
+                }, useGestureAnimationDelay);
                 return;
             } else {
                 mTutorialFragment.releaseFeedbackVideoView();
@@ -237,10 +249,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
                 .setDuration(FEEDBACK_ANIMATION_MS)
                 .translationY(0)
                 .start();
-        title.postDelayed(
-                () -> title.sendAccessibilityEvent(
-                        AccessibilityEvent.TYPE_VIEW_FOCUSED),
-                FEEDBACK_ANIMATION_MS);
+        mFeedbackTitleView.postDelayed(mTitleViewCallback, FEEDBACK_ANIMATION_MS);
     }
 
     void hideFeedback(boolean releaseFeedbackVideo) {
@@ -254,7 +263,8 @@ abstract class TutorialController implements BackGestureAttemptCallback,
     private void playFeedbackVideo(
             @NonNull AnimatedVectorDrawable tutorialAnimation,
             @NonNull AnimatedVectorDrawable gestureAnimation,
-            @NonNull Runnable onStartRunnable) {
+            @NonNull Runnable onStartRunnable,
+            boolean useGestureAnimationDelay) {
 
         if (tutorialAnimation.isRunning()) {
             tutorialAnimation.reset();
@@ -270,7 +280,9 @@ abstract class TutorialController implements BackGestureAttemptCallback,
                     gestureAnimation.stop();
                 }
 
-                onStartRunnable.run();
+                if (!useGestureAnimationDelay) {
+                    onStartRunnable.run();
+                }
             }
 
             @Override
@@ -284,8 +296,28 @@ abstract class TutorialController implements BackGestureAttemptCallback,
             }
         });
 
-        tutorialAnimation.start();
-        mFeedbackVideoView.setVisibility(View.VISIBLE);
+        if (mFeedbackViewCallback != null) {
+            mFeedbackVideoView.removeCallbacks(mFeedbackViewCallback);
+            mFeedbackViewCallback = null;
+        }
+        if (mFeedbackVideoViewCallback != null) {
+            mFeedbackVideoView.removeCallbacks(mFeedbackVideoViewCallback);
+            mFeedbackVideoViewCallback = null;
+        }
+        if (useGestureAnimationDelay) {
+            mFeedbackViewCallback = onStartRunnable;
+            mFeedbackVideoViewCallback = () -> {
+                mFeedbackVideoView.setVisibility(View.VISIBLE);
+                tutorialAnimation.start();
+            };
+
+            mFeedbackVideoView.setVisibility(View.GONE);
+            mFeedbackView.post(mFeedbackViewCallback);
+            mFeedbackVideoView.postDelayed(mFeedbackVideoViewCallback, GESTURE_ANIMATION_DELAY_MS);
+        } else {
+            mFeedbackVideoView.setVisibility(View.VISIBLE);
+            tutorialAnimation.start();
+        }
     }
 
     void setRippleHotspot(float x, float y) {
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
index ec26022adf..da0fc668ac 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
@@ -170,7 +170,8 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
             Integer introTileStringResId = mTutorialController.getIntroductionTitle();
             Integer introSubtitleResId = mTutorialController.getIntroductionSubtitle();
             if (introTileStringResId != null && introSubtitleResId != null) {
-                mTutorialController.showFeedback(introTileStringResId, introSubtitleResId, false);
+                mTutorialController.showFeedback(
+                        introTileStringResId, introSubtitleResId, false, true);
                 mIntroductionShown = true;
             }
         }
@@ -252,7 +253,7 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
     @Override
     public void onResume() {
         super.onResume();
-        if (mFragmentStopped) {
+        if (mFragmentStopped && mTutorialController != null) {
             mTutorialController.showFeedback();
             mFragmentStopped = false;
         } else {
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialStepIndicator.java b/quickstep/src/com/android/quickstep/interaction/TutorialStepIndicator.java
index eda61583fa..d880d74e5d 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialStepIndicator.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialStepIndicator.java
@@ -23,6 +23,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 
 import androidx.appcompat.content.res.AppCompatResources;
+import androidx.core.graphics.ColorUtils;
 
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
@@ -86,6 +87,8 @@ public class TutorialStepIndicator extends LinearLayout {
         for (int i = mTotalSteps; i < getChildCount(); i++) {
             removeViewAt(i);
         }
+        int stepIndicatorColor = GraphicsUtils.getAttrColor(
+                getContext(), android.R.attr.textColorPrimary);
         for (int i = 0; i < mTotalSteps; i++) {
             Drawable pageIndicatorPillDrawable = AppCompatResources.getDrawable(
                     getContext(), R.drawable.tutorial_step_indicator_pill);
@@ -104,13 +107,10 @@ public class TutorialStepIndicator extends LinearLayout {
             }
             if (pageIndicatorPillDrawable != null) {
                 if (i < mCurrentStep) {
-                    pageIndicatorPillDrawable.setTint(
-                            GraphicsUtils.getAttrColor(getContext(),
-                                    android.R.attr.textColorPrimary));
+                    pageIndicatorPillDrawable.setTint(stepIndicatorColor);
                 } else {
                     pageIndicatorPillDrawable.setTint(
-                            GraphicsUtils.getAttrColor(getContext(),
-                                    android.R.attr.textColorPrimaryInverse));
+                            ColorUtils.setAlphaComponent(stepIndicatorColor, 0x22));
                 }
             }
         }
-- 
GitLab


From 77a1393c4484a78da20cc3943ed3221976e68a93 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Fri, 11 Jun 2021 20:17:02 +0100
Subject: [PATCH 1379/1664] Fix CellLayout cast exception when drag is canceled

Test: Long press a widget and then release when the resize frame is
      shown. Then, click the content of the widget to launch the
      widget's activity. Go back to home screen and then immediately
      long press the same widget again. No crash was observed.
Bug: 189814379
Change-Id: I4232ecf9d9d9efaba817b7777314f0814bb7ef21
---
 src/com/android/launcher3/Workspace.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 17c8edce6e..2e1cc58aa0 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1922,6 +1922,11 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
                     CellLayout layout = (CellLayout) cell.getParent().getParent();
                     layout.markCellsAsOccupiedForView(cell);
                 }
+            } else {
+                // When drag is cancelled, reattach content view back to its original parent.
+                if (mDragInfo.cell instanceof LauncherAppWidgetHostView) {
+                    d.dragView.detachContentView(/* reattachToPreviousParent= */ true);
+                }
             }
 
             final CellLayout parent = (CellLayout) cell.getParent().getParent();
-- 
GitLab


From 6c2e3b303123fa7d5862c4a25e3a10741e40fc3e Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Fri, 11 Jun 2021 13:34:57 -0700
Subject: [PATCH 1380/1664] Removing UB flavor of TAPL library

Test: presubmit
Bug: 187761685
Change-Id: Ide5060886f1b9856c1046bc2028f55418e8c1e0e
---
 tests/Android.mk | 38 ++------------------------------------
 1 file changed, 2 insertions(+), 36 deletions(-)

diff --git a/tests/Android.mk b/tests/Android.mk
index 19b9656e37..6adc685981 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -15,34 +15,6 @@
 
 LOCAL_PATH := $(call my-dir)
 
-#
-# Build rule for Tapl library.
-#
-include $(CLEAR_VARS)
-LOCAL_STATIC_JAVA_LIBRARIES := \
-	androidx.annotation_annotation \
-	androidx.test.runner \
-	androidx.test.rules \
-	androidx.preference_preference \
-	androidx.test.uiautomator_uiautomator
-
-ifneq (,$(wildcard frameworks/base))
-else
-    LOCAL_STATIC_JAVA_LIBRARIES += SystemUISharedLib
-
-    LOCAL_SRC_FILES := $(call all-java-files-under, tapl) \
-        ../src/com/android/launcher3/ResourceUtils.java \
-        ../src/com/android/launcher3/testing/TestProtocol.java
-endif
-
-LOCAL_MODULE := ub-launcher-aosp-tapl
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE
-LOCAL_SDK_VERSION := system_current
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
 #
 # Build rule for Launcher3Tests
 #
@@ -56,14 +28,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
     mockito-target-minus-junit4 \
     launcher_log_protos_lite
 
-ifneq (,$(wildcard frameworks/base))
-    LOCAL_PRIVATE_PLATFORM_APIS := true
-    LOCAL_STATIC_JAVA_LIBRARIES += launcher-aosp-tapl
-else
-    LOCAL_SDK_VERSION := system_28
-    LOCAL_MIN_SDK_VERSION := 21
-    LOCAL_STATIC_JAVA_LIBRARIES += ub-launcher-aosp-tapl
-endif
+LOCAL_PRIVATE_PLATFORM_APIS := true
+LOCAL_STATIC_JAVA_LIBRARIES += launcher-aosp-tapl
 
 LOCAL_SRC_FILES := \
 	$(call all-java-files-under, src) \
-- 
GitLab


From 77edb686d7de170fb492342148eaecd2de2d3144 Mon Sep 17 00:00:00 2001
From: Jon Spivack <spivack@google.com>
Date: Thu, 10 Jun 2021 18:12:58 -0700
Subject: [PATCH 1381/1664] Send NIU Actions Intents to default Assistant

This changes the recipient for NIU Actions from a package hard-coded in a config file to the currently selected default Assistant. The user can change this under Settings -> Default apps.

ImageActionUtils has also been updated to handle the case where its
Intents cannot be resolved, preventing a crash if the user sets the
default Assistant to something that cannot receive NIU Actions.

Bug: 186655099
Test: Manual (Pixel 3A, set default Assistant to Google Go and None)
Test: m -j RunLauncherGoGoogleRoboTests
Change-Id: I03b93597092575902d507615f32b63f4050c4c69
---
 go/quickstep/res/values/config.xml            |  2 --
 .../quickstep/TaskOverlayFactoryGo.java       | 20 ++++++++++++-------
 .../quickstep/util/ImageActionUtils.java      | 16 ++++++++++-----
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/go/quickstep/res/values/config.xml b/go/quickstep/res/values/config.xml
index 402bf9ad13..796d14db16 100644
--- a/go/quickstep/res/values/config.xml
+++ b/go/quickstep/res/values/config.xml
@@ -16,8 +16,6 @@
 <resources>
     <!-- The component to receive app sharing Intents -->
     <string name="app_sharing_component" translatable="false"/>
-    <!-- The package to receive Listen, Translate, and Search Intents -->
-    <string name="niu_actions_package" translatable="false"/>
 
     <!-- Feature Flags -->
     <bool name="enable_niu_actions">true</bool>
diff --git a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
index 65cdcf06ba..3a6e9b57cc 100644
--- a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
+++ b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
@@ -21,6 +21,7 @@ import static com.android.quickstep.views.OverviewActionsView.DISABLED_ROTATED;
 
 import android.annotation.SuppressLint;
 import android.app.assist.AssistContent;
+import android.content.ActivityNotFoundException;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
@@ -29,10 +30,10 @@ import android.os.SystemClock;
 import android.os.UserManager;
 import android.provider.Settings;
 import android.text.TextUtils;
+import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
 
-import com.android.launcher3.R;
 import com.android.quickstep.util.AssistContentRequester;
 import com.android.quickstep.views.OverviewActionsView;
 import com.android.quickstep.views.TaskThumbnailView;
@@ -90,9 +91,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
         public void initOverlay(Task task, ThumbnailData thumbnail, Matrix matrix,
                 boolean rotated) {
             getActionsView().updateDisabledFlags(DISABLED_NO_THUMBNAIL, thumbnail == null);
-            mNIUPackageName =
-                    mApplicationContext.getString(R.string.niu_actions_package);
-
+            checkSettings();
             if (thumbnail == null || TextUtils.isEmpty(mNIUPackageName)) {
                 return;
             }
@@ -105,7 +104,6 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
             getActionsView().setCallbacks(new OverlayUICallbacksGoImpl(isAllowedByPolicy, task));
             mTaskPackageName = task.key.getPackageName();
 
-            checkPermissions();
             if (!mAssistPermissionsEnabled) {
                 return;
             }
@@ -137,7 +135,11 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
                 mImageApi.shareAsDataWithExplicitIntent(/* crop */ null, intent);
             } else {
                 intent.putExtra(ACTIONS_ERROR_CODE, ERROR_PERMISSIONS);
-                mApplicationContext.startActivity(intent);
+                try {
+                    mApplicationContext.startActivity(intent);
+                } catch (ActivityNotFoundException e) {
+                    Log.e(TAG, "No activity found to receive permission error intent");
+                }
             }
         }
 
@@ -160,13 +162,17 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
          * Checks whether the Assistant has screen context permissions
          */
         @VisibleForTesting
-        public void checkPermissions() {
+        public void checkSettings() {
             ContentResolver contentResolver = mApplicationContext.getContentResolver();
             boolean structureEnabled = Settings.Secure.getInt(contentResolver,
                     Settings.Secure.ASSIST_STRUCTURE_ENABLED, 1) != 0;
             boolean screenshotEnabled = Settings.Secure.getInt(contentResolver,
                     Settings.Secure.ASSIST_SCREENSHOT_ENABLED, 1) != 0;
             mAssistPermissionsEnabled = structureEnabled && screenshotEnabled;
+
+            String assistantPackage =
+                    Settings.Secure.getString(contentResolver, Settings.Secure.ASSISTANT);
+            mNIUPackageName = assistantPackage.split("/", 2)[0];
         }
 
         protected class OverlayUICallbacksGoImpl extends OverlayUICallbacksImpl
diff --git a/quickstep/src/com/android/quickstep/util/ImageActionUtils.java b/quickstep/src/com/android/quickstep/util/ImageActionUtils.java
index 2285d74d73..de7dbd64f5 100644
--- a/quickstep/src/com/android/quickstep/util/ImageActionUtils.java
+++ b/quickstep/src/com/android/quickstep/util/ImageActionUtils.java
@@ -26,6 +26,7 @@ import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import android.app.Activity;
 import android.app.ActivityOptions;
 import android.app.prediction.AppTarget;
+import android.content.ActivityNotFoundException;
 import android.content.ClipData;
 import android.content.ClipDescription;
 import android.content.ComponentName;
@@ -68,6 +69,7 @@ public class ImageActionUtils {
     private static final long FILE_LIFE = 1000L /*ms*/ * 60L /*s*/ * 60L /*m*/ * 24L /*h*/;
     private static final String SUB_FOLDER = "Overview";
     private static final String BASE_NAME = "overview_image_";
+    private static final String TAG = "ImageActionUtils";
 
     /**
      * Saves screenshot to location determine by SystemUiProxy
@@ -154,11 +156,15 @@ public class ImageActionUtils {
             Intent intent, BiFunction<Uri, Intent, Intent[]> uriToIntentMap, String tag) {
         Intent[] intents = uriToIntentMap.apply(getImageUri(bitmap, crop, context, tag), intent);
 
-        // Work around b/159412574
-        if (intents.length == 1) {
-            context.startActivity(intents[0]);
-        } else {
-            context.startActivities(intents);
+        try {
+            // Work around b/159412574
+            if (intents.length == 1) {
+                context.startActivity(intents[0]);
+            } else {
+                context.startActivities(intents);
+            }
+        } catch (ActivityNotFoundException e) {
+            Log.e(TAG, "No activity found to receive image intent");
         }
     }
 
-- 
GitLab


From 1e1ad449a8b813a1ca359d69ba5c20751eb3c249 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Fri, 11 Jun 2021 14:10:45 -0700
Subject: [PATCH 1382/1664] Logging UPs and DOWNs that TAPL injects

Test: presubmit
Bug: 190748682
Change-Id: I82e792724bab178a9c3ca190609af913fbaf4a87
---
 .../android/launcher3/tapl/LauncherInstrumentation.java    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index c99a81f0f6..0f9761d8a3 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -1248,6 +1248,13 @@ public final class LauncherInstrumentation {
         }
 
         final MotionEvent event = getMotionEvent(downTime, currentTime, action, point.x, point.y);
+        // b/190748682
+        switch (action) {
+            case MotionEvent.ACTION_DOWN:
+            case MotionEvent.ACTION_UP:
+                log("b/190748682: injecting " + event);
+                break;
+        }
         assertTrue("injectInputEvent failed",
                 mInstrumentation.getUiAutomation().injectInputEvent(event, true, false));
         event.recycle();
-- 
GitLab


From a7b018535b3257f0d974b4a766ba732c338465da Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 11 Jun 2021 14:52:25 -0700
Subject: [PATCH 1383/1664] Ensure that the cancel and end listener are called
 when cancelling state animation

Bug: 190856140
Test: Manual
Change-Id: Ib6b869445cee9fad2a97a590d27429140f2b3ba9
---
 .../launcher3/anim/AnimatorPlaybackController.java   |  5 ++++-
 .../android/launcher3/statemanager/StateManager.java | 12 ++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/anim/AnimatorPlaybackController.java b/src/com/android/launcher3/anim/AnimatorPlaybackController.java
index f6d1651cb6..7d8b82a8eb 100644
--- a/src/com/android/launcher3/anim/AnimatorPlaybackController.java
+++ b/src/com/android/launcher3/anim/AnimatorPlaybackController.java
@@ -290,7 +290,10 @@ public class AnimatorPlaybackController implements ValueAnimator.AnimatorUpdateL
         callAnimatorCommandRecursively(mAnim, a -> a.setInterpolator(interpolator));
     }
 
-    private static void callListenerCommandRecursively(
+    /**
+     * Recursively calls a command on all the listeners of the provided animation
+     */
+    public static void callListenerCommandRecursively(
             Animator anim, BiConsumer<AnimatorListener, Animator> command) {
         callAnimatorCommandRecursively(anim, a-> {
             for (AnimatorListener l : nonNullList(a.getListeners())) {
diff --git a/src/com/android/launcher3/statemanager/StateManager.java b/src/com/android/launcher3/statemanager/StateManager.java
index 03b68535bc..13d6568f78 100644
--- a/src/com/android/launcher3/statemanager/StateManager.java
+++ b/src/com/android/launcher3/statemanager/StateManager.java
@@ -18,6 +18,7 @@ package com.android.launcher3.statemanager;
 
 import static android.animation.ValueAnimator.areAnimatorsEnabled;
 
+import static com.android.launcher3.anim.AnimatorPlaybackController.callListenerCommandRecursively;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_ALL_ANIMATIONS;
 
 import android.animation.Animator;
@@ -514,8 +515,15 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
                 playbackController.getAnimationPlayer().cancel();
                 playbackController.dispatchOnCancel();
             } else if (currentAnimation != null) {
-                currentAnimation.setDuration(0);
-                currentAnimation.cancel();
+                AnimatorSet anim = currentAnimation;
+                anim.setDuration(0);
+                if (!anim.isStarted()) {
+                    // If the animation is not started the listeners do not get notified,
+                    // notify manually.
+                    callListenerCommandRecursively(anim, AnimatorListener::onAnimationCancel);
+                    callListenerCommandRecursively(anim, AnimatorListener::onAnimationEnd);
+                }
+                anim.cancel();
             }
 
             currentAnimation = null;
-- 
GitLab


From 5fcc3a90b0fc302dc89c740e5d177bb0a89a7dfb Mon Sep 17 00:00:00 2001
From: Cyrus Boadway <boadway@google.com>
Date: Fri, 11 Jun 2021 17:27:49 +0000
Subject: [PATCH 1384/1664] Fix foreground position during widget home
 animation

The home return animation applies a position animation to all views in
the workspace. Since the widget uses a GhostView of the original widget
to represent the foreground of the animation, that animation was
reflected in the foreground's positioning.

The CL creates an ignore list of workspace views to which an animator
should not be applied.

Bug: 190488979
Test: manual
Change-Id: I5a86165e945336693eedd253a02bda1e1eb6662d
---
 .../quickstep/LauncherSwipeHandlerV2.java     | 19 ++++++++++++++++++-
 .../util/StaggeredWorkspaceAnim.java          | 12 +++++++++---
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
index 1bae1c5f6b..819e484025 100644
--- a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
+++ b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
@@ -181,6 +181,12 @@ public class LauncherSwipeHandlerV2 extends
 
         return new FloatingViewHomeAnimationFactory(floatingWidgetView) {
 
+            @Override
+            @Nullable
+            protected View getViewIgnoredInWorkspaceRevealAnimation() {
+                return hostView;
+            }
+
             @Override
             public RectF getWindowTargetRect() {
                 super.getWindowTargetRect();
@@ -370,6 +376,16 @@ public class LauncherSwipeHandlerV2 extends
     }
 
     private class LauncherHomeAnimationFactory extends HomeAnimationFactory {
+
+        /**
+         * Returns a view which should be excluded from the Workspace animation, or null if there
+         * is no view to exclude.
+         */
+        @Nullable
+        protected View getViewIgnoredInWorkspaceRevealAnimation() {
+            return null;
+        }
+
         @NonNull
         @Override
         public AnimatorPlaybackController createActivityAnimationToHome() {
@@ -383,7 +399,8 @@ public class LauncherSwipeHandlerV2 extends
         @Override
         public void playAtomicAnimation(float velocity) {
             if (!PROTOTYPE_APP_CLOSE.get()) {
-                new StaggeredWorkspaceAnim(mActivity, velocity, true /* animateOverviewScrim */)
+                new StaggeredWorkspaceAnim(mActivity, velocity, true /* animateOverviewScrim */,
+                        getViewIgnoredInWorkspaceRevealAnimation())
                         .start();
             } else if (shouldPlayAtomicWorkspaceReveal()) {
                 new WorkspaceRevealAnim(mActivity, true).start();
diff --git a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
index 49aec933b7..ccc587cd87 100644
--- a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
+++ b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
@@ -32,6 +32,8 @@ import android.animation.ValueAnimator;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.CellLayout;
 import com.android.launcher3.DeviceProfile;
@@ -68,15 +70,18 @@ public class StaggeredWorkspaceAnim {
     private final float mSpringTransY;
 
     private final AnimatorSet mAnimators = new AnimatorSet();
+    private final @Nullable View mIgnoredView;
 
-    public StaggeredWorkspaceAnim(Launcher launcher, float velocity, boolean animateOverviewScrim) {
-        this(launcher, velocity, animateOverviewScrim, true);
+    public StaggeredWorkspaceAnim(Launcher launcher, float velocity, boolean animateOverviewScrim,
+            @Nullable View ignoredView) {
+        this(launcher, velocity, animateOverviewScrim, ignoredView, true);
     }
 
     public StaggeredWorkspaceAnim(Launcher launcher, float velocity, boolean animateOverviewScrim,
-            boolean staggerWorkspace) {
+            @Nullable View ignoredView, boolean staggerWorkspace) {
         prepareToAnimate(launcher, animateOverviewScrim);
 
+        mIgnoredView = ignoredView;
         mVelocity = velocity;
 
         // Scale the translationY based on the initial velocity to better sync the workspace items
@@ -224,6 +229,7 @@ public class StaggeredWorkspaceAnim {
      * @param totalRows Total number of rows.
      */
     private void addStaggeredAnimationForView(View v, int row, int totalRows) {
+        if (mIgnoredView != null && mIgnoredView == v) return;
         // Invert the rows, because we stagger starting from the bottom of the screen.
         int invertedRow = totalRows - row;
         // Add 1 to the inverted row so that the bottom most row has a start delay.
-- 
GitLab


From ebd88cb00bc0691463f91b51e17f1579eddc16d6 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Fri, 11 Jun 2021 15:51:04 -0700
Subject: [PATCH 1385/1664] Add sdk check to recyclerviewfastscroller

Bug: 189982238
Test: builds
Change-Id: I2298a67fd957cd2a77c8e5e4c34b828c044f1a61
---
 .../launcher3/views/RecyclerViewFastScroller.java   | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/views/RecyclerViewFastScroller.java b/src/com/android/launcher3/views/RecyclerViewFastScroller.java
index e607ab3f7e..f49d1b5d2a 100644
--- a/src/com/android/launcher3/views/RecyclerViewFastScroller.java
+++ b/src/com/android/launcher3/views/RecyclerViewFastScroller.java
@@ -28,6 +28,7 @@ import android.graphics.Paint;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.RectF;
+import android.os.Build;
 import android.util.AttributeSet;
 import android.util.Property;
 import android.view.MotionEvent;
@@ -37,6 +38,7 @@ import android.view.WindowInsets;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.launcher3.BaseRecyclerView;
@@ -342,16 +344,21 @@ public class RecyclerViewFastScroller extends View {
             // swiping very close to the thumb area (not just within it's bound)
             // will also prevent back gesture
             SYSTEM_GESTURE_EXCLUSION_RECT.get(0).offset(mThumbDrawOffset.x, mThumbDrawOffset.y);
-            SYSTEM_GESTURE_EXCLUSION_RECT.get(0).left = SYSTEM_GESTURE_EXCLUSION_RECT.get(0).right
-                    - mSystemGestureInsets.right;
+            if (Utilities.ATLEAST_Q) {
+                SYSTEM_GESTURE_EXCLUSION_RECT.get(0).left =
+                        SYSTEM_GESTURE_EXCLUSION_RECT.get(0).right - mSystemGestureInsets.right;
+            }
             setSystemGestureExclusionRects(SYSTEM_GESTURE_EXCLUSION_RECT);
         }
         canvas.restoreToCount(saveCount);
     }
 
     @Override
+    @RequiresApi(Build.VERSION_CODES.Q)
     public WindowInsets onApplyWindowInsets(WindowInsets insets) {
-        mSystemGestureInsets = insets.getSystemGestureInsets();
+        if (Utilities.ATLEAST_Q) {
+            mSystemGestureInsets = insets.getSystemGestureInsets();
+        }
         return super.onApplyWindowInsets(insets);
     }
 
-- 
GitLab


From af6ebe87ea1de17f948031b218d9bc44e6f01e21 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Fri, 11 Jun 2021 17:57:05 -0700
Subject: [PATCH 1386/1664] Do not add padding left/right when cell layout
 border spacing exists.

Bug: 188094809
Test: enable layout bounds and view text spanning entire cell
Change-Id: Ia7ed45d0e844b2594a8708e03fe385a321345f5e
---
 .../launcher3/ShortcutAndWidgetContainer.java | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/com/android/launcher3/ShortcutAndWidgetContainer.java b/src/com/android/launcher3/ShortcutAndWidgetContainer.java
index 2c24c3a52e..4579705f5a 100644
--- a/src/com/android/launcher3/ShortcutAndWidgetContainer.java
+++ b/src/com/android/launcher3/ShortcutAndWidgetContainer.java
@@ -18,6 +18,9 @@ package com.android.launcher3;
 
 import static android.view.MotionEvent.ACTION_DOWN;
 
+import static com.android.launcher3.CellLayout.FOLDER;
+import static com.android.launcher3.CellLayout.WORKSPACE;
+
 import android.app.WallpaperManager;
 import android.content.Context;
 import android.graphics.Rect;
@@ -124,21 +127,27 @@ public class ShortcutAndWidgetContainer extends ViewGroup implements FolderIcon.
 
     public void measureChild(View child) {
         CellLayout.LayoutParams lp = (CellLayout.LayoutParams) child.getLayoutParams();
-        final DeviceProfile profile = mActivity.getDeviceProfile();
+        final DeviceProfile dp = mActivity.getDeviceProfile();
 
         if (child instanceof LauncherAppWidgetHostView) {
-            ((LauncherAppWidgetHostView) child).getWidgetInset(profile, mTempRect);
+            ((LauncherAppWidgetHostView) child).getWidgetInset(dp, mTempRect);
             lp.setup(mCellWidth, mCellHeight, invertLayoutHorizontally(), mCountX, mCountY,
-                    profile.appWidgetScale.x, profile.appWidgetScale.y, mBorderSpacing, mTempRect);
+                    dp.appWidgetScale.x, dp.appWidgetScale.y, mBorderSpacing, mTempRect);
         } else {
             lp.setup(mCellWidth, mCellHeight, invertLayoutHorizontally(), mCountX, mCountY,
                     mBorderSpacing, null);
             // Center the icon/folder
             int cHeight = getCellContentHeight();
             int cellPaddingY = (int) Math.max(0, ((lp.height - cHeight) / 2f));
-            int cellPaddingX = mContainerType == CellLayout.WORKSPACE
-                    ? profile.workspaceCellPaddingXPx
-                    : (int) (profile.edgeMarginPx / 2f);
+
+            // No need to add padding when cell layout border spacing is present.
+            boolean noPadding = (dp.cellLayoutBorderSpacingPx > 0 && mContainerType == WORKSPACE)
+                    || (dp.folderCellLayoutBorderSpacingPx > 0 && mContainerType == FOLDER);
+            int cellPaddingX = noPadding
+                    ? 0
+                    : mContainerType == WORKSPACE
+                            ? dp.workspaceCellPaddingXPx
+                            : (int) (dp.edgeMarginPx / 2f);
             child.setPadding(cellPaddingX, cellPaddingY, cellPaddingX, 0);
         }
         int childWidthMeasureSpec = MeasureSpec.makeMeasureSpec(lp.width, MeasureSpec.EXACTLY);
-- 
GitLab


From 5300fce94ffb621c82d917b22232a86d34812339 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Sat, 12 Jun 2021 13:46:50 -0700
Subject: [PATCH 1387/1664] Don't use icon home animator when entering PIP

- If the app supports pip, can just do the fallback workspace
  home animation since the app will not be going to the icon

Bug: 190464560
Test: Open YT, swipe up, ensure it goes to the icon,
      Reopen YT video, swipe up, ensure it goes into PIP without
      icon animation
Change-Id: Ic22ccf17c664b9941ed944c0e39dc1f8d4efa84a
---
 .../src/com/android/quickstep/AbsSwipeUpHandler.java  | 11 ++++++-----
 .../com/android/quickstep/FallbackSwipeHandler.java   |  2 +-
 .../com/android/quickstep/LauncherSwipeHandlerV2.java |  4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 52f34d90e0..b5c52179c8 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1072,7 +1072,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
 
     protected abstract HomeAnimationFactory createHomeAnimationFactory(
             ArrayList<IBinder> launchCookies, long duration, boolean isTargetTranslucent,
-            RemoteAnimationTargetCompat runningTaskTarget);
+            boolean appCanEnterPip, RemoteAnimationTargetCompat runningTaskTarget);
 
     private final TaskStackChangeListener mActivityRestartListener = new TaskStackChangeListener() {
         @Override
@@ -1117,13 +1117,14 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                     ? runningTaskTarget.taskInfo.launchCookies
                     : new ArrayList<>();
             boolean isTranslucent = runningTaskTarget != null && runningTaskTarget.isTranslucent;
-            HomeAnimationFactory homeAnimFactory =
-                    createHomeAnimationFactory(cookies, duration, isTranslucent, runningTaskTarget);
-            mIsSwipingPipToHome = homeAnimFactory.supportSwipePipToHome()
-                    && runningTaskTarget != null
+            boolean appCanEnterPip = runningTaskTarget != null
                     && runningTaskTarget.taskInfo.pictureInPictureParams != null
                     && TaskInfoCompat.isAutoEnterPipEnabled(
                             runningTaskTarget.taskInfo.pictureInPictureParams);
+            HomeAnimationFactory homeAnimFactory =
+                    createHomeAnimationFactory(cookies, duration, isTranslucent, appCanEnterPip,
+                            runningTaskTarget);
+            mIsSwipingPipToHome = homeAnimFactory.supportSwipePipToHome() && appCanEnterPip;
             if (mIsSwipingPipToHome) {
                 mSwipePipToHomeAnimator = getSwipePipToHomeAnimator(
                         homeAnimFactory, runningTaskTarget, start);
diff --git a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
index 7290ff6a41..fd44e023a7 100644
--- a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
+++ b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
@@ -129,7 +129,7 @@ public class FallbackSwipeHandler extends
 
     @Override
     protected HomeAnimationFactory createHomeAnimationFactory(ArrayList<IBinder> launchCookies,
-            long duration, boolean isTargetTranslucent,
+            long duration, boolean isTargetTranslucent, boolean appCanEnterPip,
             RemoteAnimationTargetCompat runningTaskTarget) {
         mActiveAnimationFactory = new FallbackHomeAnimationFactory(duration);
         ActivityOptions options = ActivityOptions.makeCustomAnimation(mContext, 0, 0);
diff --git a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
index 40741e4945..47d94ba2ad 100644
--- a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
+++ b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
@@ -88,7 +88,7 @@ public class LauncherSwipeHandlerV2 extends
 
     @Override
     protected HomeAnimationFactory createHomeAnimationFactory(ArrayList<IBinder> launchCookies,
-            long duration, boolean isTargetTranslucent,
+            long duration, boolean isTargetTranslucent, boolean appCanEnterPip,
             RemoteAnimationTargetCompat runningTaskTarget) {
         if (mActivity == null) {
             mStateCallback.addChangeListener(STATE_LAUNCHER_PRESENT | STATE_HANDLER_INVALIDATED,
@@ -108,7 +108,7 @@ public class LauncherSwipeHandlerV2 extends
         mActivity.getRootView().setForceHideBackArrow(true);
         mActivity.setHintUserWillBeActive();
 
-        if (!canUseWorkspaceView) {
+        if (!canUseWorkspaceView || appCanEnterPip) {
             return new LauncherHomeAnimationFactory();
         }
         if (workspaceView instanceof LauncherAppWidgetHostView) {
-- 
GitLab


From 954681d837e3374b120df023c899e439ec34b5b0 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 9 Jun 2021 21:51:14 -0700
Subject: [PATCH 1388/1664] Disallow auto-enter PIP when there is an existing
 PIP

- Remove some deprecated calls when registering task stack listeners

Bug: 190464560
Test: Enter YT Pip, try to enter another auto-enter PIP app
Change-Id: Ib7d3a07effadb7b13f7c37f938741e27cf0e254e
---
 .../android/quickstep/AbsSwipeUpHandler.java  | 11 +++--
 .../android/quickstep/RecentTasksList.java    |  3 +-
 .../RecentsAnimationDeviceState.java          | 41 ++++++++++++++++---
 .../com/android/quickstep/RecentsModel.java   |  3 +-
 .../quickstep/RotationTouchHelper.java        |  7 ++--
 .../quickstep/TaskAnimationManager.java       |  9 ++--
 6 files changed, 56 insertions(+), 18 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index b5c52179c8..8f42993b62 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -117,6 +117,7 @@ import com.android.systemui.shared.system.LatencyTrackerCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 import com.android.systemui.shared.system.TaskInfoCompat;
 import com.android.systemui.shared.system.TaskStackChangeListener;
+import com.android.systemui.shared.system.TaskStackChangeListeners;
 
 import java.util.ArrayList;
 import java.util.function.Consumer;
@@ -1083,7 +1084,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                 // Since this is an edge case, just cancel and relaunch with default activity
                 // options (since we don't know if there's an associated app icon to launch from)
                 endRunningWindowAnim(true /* cancel */);
-                ActivityManagerWrapper.getInstance().unregisterTaskStackListener(
+                TaskStackChangeListeners.getInstance().unregisterTaskStackListener(
                         mActivityRestartListener);
                 ActivityManagerWrapper.getInstance().startActivityFromRecents(task.taskId, null);
             }
@@ -1098,7 +1099,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         // If we are transitioning to launcher, then listen for the activity to be restarted while
         // the transition is in progress
         if (mGestureState.getEndTarget().isLauncher) {
-            ActivityManagerWrapper.getInstance().registerTaskStackListener(
+            TaskStackChangeListeners.getInstance().registerTaskStackListener(
                     mActivityRestartListener);
 
             mParallelRunningAnim = mActivityInterface.getParallelAnimationToLauncher(
@@ -1117,7 +1118,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                     ? runningTaskTarget.taskInfo.launchCookies
                     : new ArrayList<>();
             boolean isTranslucent = runningTaskTarget != null && runningTaskTarget.isTranslucent;
-            boolean appCanEnterPip = runningTaskTarget != null
+            boolean appCanEnterPip = !mDeviceState.isPipActive()
+                    && runningTaskTarget != null
                     && runningTaskTarget.taskInfo.pictureInPictureParams != null
                     && TaskInfoCompat.isAutoEnterPipEnabled(
                             runningTaskTarget.taskInfo.pictureInPictureParams);
@@ -1400,7 +1402,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         }
 
         mActivityInitListener.unregister();
-        ActivityManagerWrapper.getInstance().unregisterTaskStackListener(mActivityRestartListener);
+        TaskStackChangeListeners.getInstance().unregisterTaskStackListener(
+                mActivityRestartListener);
         mTaskSnapshot = null;
     }
 
diff --git a/quickstep/src/com/android/quickstep/RecentTasksList.java b/quickstep/src/com/android/quickstep/RecentTasksList.java
index 3302da0f77..3080f040ac 100644
--- a/quickstep/src/com/android/quickstep/RecentTasksList.java
+++ b/quickstep/src/com/android/quickstep/RecentTasksList.java
@@ -33,6 +33,7 @@ import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.KeyguardManagerCompat;
 import com.android.systemui.shared.system.TaskStackChangeListener;
+import com.android.systemui.shared.system.TaskStackChangeListeners;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -66,7 +67,7 @@ public class RecentTasksList extends TaskStackChangeListener {
         mKeyguardManager = keyguardManager;
         mChangeId = 1;
         mActivityManagerWrapper = activityManagerWrapper;
-        mActivityManagerWrapper.registerTaskStackListener(this);
+        TaskStackChangeListeners.getInstance().registerTaskStackListener(this);
     }
 
     @VisibleForTesting
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index fa37901f27..444d77a612 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -15,6 +15,8 @@
  */
 package com.android.quickstep;
 
+import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;
+import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
 import static android.content.Intent.ACTION_USER_UNLOCKED;
 
 import static com.android.launcher3.util.DisplayController.CHANGE_ALL;
@@ -41,6 +43,7 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_S
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED;
 
 import android.app.ActivityManager;
+import android.app.ActivityTaskManager;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
@@ -50,6 +53,7 @@ import android.content.res.Resources;
 import android.graphics.Region;
 import android.net.Uri;
 import android.os.Process;
+import android.os.RemoteException;
 import android.os.SystemProperties;
 import android.os.UserManager;
 import android.provider.Settings;
@@ -75,6 +79,8 @@ import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.QuickStepContract;
 import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags;
 import com.android.systemui.shared.system.SystemGestureExclusionListenerCompat;
+import com.android.systemui.shared.system.TaskStackChangeListener;
+import com.android.systemui.shared.system.TaskStackChangeListeners;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -96,6 +102,8 @@ public class RecentsAnimationDeviceState implements
     private final DisplayController mDisplayController;
     private final int mDisplayId;
     private final RotationTouchHelper mRotationTouchHelper;
+    private final TaskStackChangeListener mPipListener;
+    private final List<ComponentName> mGestureBlockedActivities;
 
     private final ArrayList<Runnable> mOnDestroyActions = new ArrayList<>();
 
@@ -106,9 +114,11 @@ public class RecentsAnimationDeviceState implements
     private final Region mDeferredGestureRegion = new Region();
     private boolean mAssistantAvailable;
     private float mAssistantVisibility;
+    private boolean mIsUserSetupComplete;
     private boolean mIsOneHandedModeEnabled;
     private boolean mIsSwipeToNotificationEnabled;
     private final boolean mIsOneHandedModeSupported;
+    private boolean mPipIsActive;
 
     private boolean mIsUserUnlocked;
     private final ArrayList<Runnable> mUserUnlockedActions = new ArrayList<>();
@@ -125,10 +135,6 @@ public class RecentsAnimationDeviceState implements
     private Region mExclusionRegion;
     private SystemGestureExclusionListenerCompat mExclusionListener;
 
-    private final List<ComponentName> mGestureBlockedActivities;
-
-    private boolean mIsUserSetupComplete;
-
     public RecentsAnimationDeviceState(Context context) {
         this(context, false);
     }
@@ -204,7 +210,6 @@ public class RecentsAnimationDeviceState implements
             mIsOneHandedModeEnabled = false;
         }
 
-
         Uri swipeBottomNotificationUri =
                 Settings.Secure.getUriFor(ONE_HANDED_SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED);
         SettingsCache.OnChangeListener onChangeListener =
@@ -220,6 +225,27 @@ public class RecentsAnimationDeviceState implements
             settingsCache.register(setupCompleteUri, userSetupChangeListener);
             runOnDestroy(() -> settingsCache.unregister(setupCompleteUri, userSetupChangeListener));
         }
+
+        try {
+            mPipIsActive = ActivityTaskManager.getService().getRootTaskInfo(
+                    WINDOWING_MODE_PINNED, ACTIVITY_TYPE_UNDEFINED) != null;
+        } catch (RemoteException e) {
+            // Do nothing
+        }
+        mPipListener = new TaskStackChangeListener() {
+            @Override
+            public void onActivityPinned(String packageName, int userId, int taskId, int stackId) {
+                mPipIsActive = true;
+            }
+
+            @Override
+            public void onActivityUnpinned() {
+                mPipIsActive = false;
+            }
+        };
+        TaskStackChangeListeners.getInstance().registerTaskStackListener(mPipListener);
+        runOnDestroy(() ->
+                TaskStackChangeListeners.getInstance().unregisterTaskStackListener(mPipListener));
     }
 
     private void runOnDestroy(Runnable action) {
@@ -579,6 +605,10 @@ public class RecentsAnimationDeviceState implements
         return mIsSwipeToNotificationEnabled;
     }
 
+    public boolean isPipActive() {
+        return mPipIsActive;
+    }
+
     public RotationTouchHelper getRotationTouchHelper() {
         return mRotationTouchHelper;
     }
@@ -596,6 +626,7 @@ public class RecentsAnimationDeviceState implements
         pw.println("  isOneHandedModeEnabled=" + mIsOneHandedModeEnabled);
         pw.println("  isSwipeToNotificationEnabled=" + mIsSwipeToNotificationEnabled);
         pw.println("  deferredGestureRegion=" + mDeferredGestureRegion);
+        pw.println("  pipIsActive=" + mPipIsActive);
         mRotationTouchHelper.dump(pw);
     }
 }
diff --git a/quickstep/src/com/android/quickstep/RecentsModel.java b/quickstep/src/com/android/quickstep/RecentsModel.java
index 2eb9dd84eb..1e82c8cbfa 100644
--- a/quickstep/src/com/android/quickstep/RecentsModel.java
+++ b/quickstep/src/com/android/quickstep/RecentsModel.java
@@ -39,6 +39,7 @@ import com.android.systemui.shared.recents.model.ThumbnailData;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.KeyguardManagerCompat;
 import com.android.systemui.shared.system.TaskStackChangeListener;
+import com.android.systemui.shared.system.TaskStackChangeListeners;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -75,7 +76,7 @@ public class RecentsModel extends TaskStackChangeListener implements IconChangeL
         mIconCache = new TaskIconCache(context, RECENTS_MODEL_EXECUTOR, iconProvider);
         mThumbnailCache = new TaskThumbnailCache(context, RECENTS_MODEL_EXECUTOR);
 
-        ActivityManagerWrapper.getInstance().registerTaskStackListener(this);
+        TaskStackChangeListeners.getInstance().registerTaskStackListener(this);
         iconProvider.registerIconChangeListener(this, MAIN_EXECUTOR.getHandler());
     }
 
diff --git a/quickstep/src/com/android/quickstep/RotationTouchHelper.java b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
index fc7a3dfde3..678b176151 100644
--- a/quickstep/src/com/android/quickstep/RotationTouchHelper.java
+++ b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
@@ -38,6 +38,7 @@ import com.android.quickstep.util.RecentsOrientedState;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.QuickStepContract;
 import com.android.systemui.shared.system.TaskStackChangeListener;
+import com.android.systemui.shared.system.TaskStackChangeListeners;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -178,14 +179,14 @@ public class RotationTouchHelper implements
     }
 
     private void setupOrientationSwipeHandler() {
-        ActivityManagerWrapper.getInstance().registerTaskStackListener(mFrozenTaskListener);
-        mOnDestroyFrozenTaskRunnable = () -> ActivityManagerWrapper.getInstance()
+        TaskStackChangeListeners.getInstance().registerTaskStackListener(mFrozenTaskListener);
+        mOnDestroyFrozenTaskRunnable = () -> TaskStackChangeListeners.getInstance()
                 .unregisterTaskStackListener(mFrozenTaskListener);
         runOnDestroy(mOnDestroyFrozenTaskRunnable);
     }
 
     private void destroyOrientationSwipeHandlerCallback() {
-        ActivityManagerWrapper.getInstance().unregisterTaskStackListener(mFrozenTaskListener);
+        TaskStackChangeListeners.getInstance().unregisterTaskStackListener(mFrozenTaskListener);
         mOnDestroyActions.remove(mOnDestroyFrozenTaskRunnable);
     }
 
diff --git a/quickstep/src/com/android/quickstep/TaskAnimationManager.java b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
index 29ddde0c99..9731bf187e 100644
--- a/quickstep/src/com/android/quickstep/TaskAnimationManager.java
+++ b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
@@ -39,6 +39,7 @@ import com.android.systemui.shared.system.ActivityOptionsCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 import com.android.systemui.shared.system.RemoteTransitionCompat;
 import com.android.systemui.shared.system.TaskStackChangeListener;
+import com.android.systemui.shared.system.TaskStackChangeListeners;
 
 public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAnimationListener {
     public static final boolean ENABLE_SHELL_TRANSITIONS =
@@ -58,7 +59,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
         public void onActivityRestartAttempt(ActivityManager.RunningTaskInfo task,
                 boolean homeTaskVisible, boolean clearedTask, boolean wasVisible) {
             if (mLastGestureState == null) {
-                ActivityManagerWrapper.getInstance().unregisterTaskStackListener(
+                TaskStackChangeListeners.getInstance().unregisterTaskStackListener(
                         mLiveTileRestartListener);
                 return;
             }
@@ -68,7 +69,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
                 RecentsView recentsView = activityInterface.getCreatedActivity().getOverviewPanel();
                 if (recentsView != null) {
                     recentsView.launchSideTaskInLiveTileModeForRestartedApp(task.taskId);
-                    ActivityManagerWrapper.getInstance().unregisterTaskStackListener(
+                    TaskStackChangeListeners.getInstance().unregisterTaskStackListener(
                             mLiveTileRestartListener);
                 }
             }
@@ -197,7 +198,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
     }
 
     public void enableLiveTileRestartListener() {
-        ActivityManagerWrapper.getInstance().registerTaskStackListener(mLiveTileRestartListener);
+        TaskStackChangeListeners.getInstance().registerTaskStackListener(mLiveTileRestartListener);
     }
 
     /**
@@ -241,7 +242,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
             mLiveTileCleanUpHandler.run();
             mLiveTileCleanUpHandler = null;
         }
-        ActivityManagerWrapper.getInstance().unregisterTaskStackListener(mLiveTileRestartListener);
+        TaskStackChangeListeners.getInstance().unregisterTaskStackListener(mLiveTileRestartListener);
 
         // Release all the target leashes
         if (mTargets != null) {
-- 
GitLab


From 62b56927365c9c8a973a71766a3c7d5cfcffb7a4 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 9 Jun 2021 22:25:51 -0700
Subject: [PATCH 1389/1664] Ignore source hint rect if it is too small

- When the source hint rect is too small, we can't do a nice transition
  when going home (it would require scaling the surface up to fit the
  rect, which conflicts spatially with the crop down to launcher
  icon/pip), so in this case, just fallback to the overlay

Bug: 190464560
Test: Enter YT Pip, play video, swipe it down to miniplayer then
      enter pip
Change-Id: I44b253ca440f6d2ca0eb20eef3454c5d4e3ae3e9
---
 .../android/quickstep/util/SwipePipToHomeAnimator.java   | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
index 36311302bf..1062652ed4 100644
--- a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
+++ b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
@@ -121,6 +121,15 @@ public class SwipePipToHomeAnimator extends ValueAnimator {
         mDestinationBoundsAnimation.set(mDestinationBounds);
         mSurfaceTransactionHelper = new PipSurfaceTransactionHelper(cornerRadius);
 
+        if (sourceRectHint != null && (sourceRectHint.width() < destinationBounds.width()
+                || sourceRectHint.height() < destinationBounds.height())) {
+            // This is a situation in which the source hint rect on at least one axis is smaller
+            // than the destination bounds, which presents a problem because we would have to scale
+            // up that axis to fit the bounds. So instead, just fallback to the non-source hint
+            // animation in this case.
+            sourceRectHint = null;
+        }
+
         if (sourceRectHint == null) {
             mSourceHintRectInsets = null;
 
-- 
GitLab


From 45e0e26971fdd81c0d91e18571ea8e3977fd95bc Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Tue, 25 May 2021 19:21:37 -0500
Subject: [PATCH 1390/1664] [AllApps][Work] Introduce work toggle Fab

Screenshot: https://screenshot.googleplex.com/C4r7kKPxv3PKdyN
Bug: 186856928
Test: on-device
Change-Id: Ifd8ce20fcf2247a6e80537dc7631458e594a8a63
---
 res/drawable/work_apps_toggle_background.xml  |  31 +++
 res/layout/work_mode_fab.xml                  |  33 +++
 res/layout/work_mode_switch.xml               |   9 +-
 res/layout/work_profile_edu.xml               |  61 -----
 res/values/dimens.xml                         |   4 +
 res/values/strings.xml                        |  19 +-
 .../allapps/AllAppsContainerView.java         |   4 +-
 .../allapps/LauncherAllAppsContainerView.java |   8 -
 .../launcher3/allapps/WorkModeSwitch.java     | 171 ++++---------
 .../android/launcher3/views/WorkEduView.java  | 230 ------------------
 10 files changed, 124 insertions(+), 446 deletions(-)
 create mode 100644 res/drawable/work_apps_toggle_background.xml
 create mode 100644 res/layout/work_mode_fab.xml
 delete mode 100644 res/layout/work_profile_edu.xml
 delete mode 100644 src/com/android/launcher3/views/WorkEduView.java

diff --git a/res/drawable/work_apps_toggle_background.xml b/res/drawable/work_apps_toggle_background.xml
new file mode 100644
index 0000000000..a04d269875
--- /dev/null
+++ b/res/drawable/work_apps_toggle_background.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false">
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/work_fab_radius" />
+            <solid android:color="?android:attr/colorControlHighlight" />
+            <padding android:left="@dimen/work_fab_radius" android:right="@dimen/work_fab_radius" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/work_fab_radius" />
+            <solid android:color="?android:attr/colorAccent" />
+            <padding android:left="@dimen/work_fab_radius" android:right="@dimen/work_fab_radius" />
+        </shape>
+    </item>
+</selector>
diff --git a/res/layout/work_mode_fab.xml b/res/layout/work_mode_fab.xml
new file mode 100644
index 0000000000..21f269fed6
--- /dev/null
+++ b/res/layout/work_mode_fab.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.launcher3.allapps.WorkModeSwitch
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/work_mode_toggle"
+    android:layout_alignParentBottom="true"
+    android:layout_alignParentEnd="true"
+    android:layout_height="@dimen/work_fab_height"
+    android:layout_width="wrap_content"
+    android:gravity="center"
+    android:includeFontPadding="false"
+    android:drawableTint="@android:color/white"
+    android:textColor="@android:color/white"
+    android:background="@drawable/work_apps_toggle_background"
+    android:drawablePadding="16dp"
+    android:drawableStart="@drawable/ic_corp_off"
+    android:elevation="10dp"
+    android:layout_marginBottom="@dimen/work_fab_margin"
+    android:layout_marginEnd="@dimen/work_fab_margin"
+    android:text="@string/work_apps_pause_btn_text" />
\ No newline at end of file
diff --git a/res/layout/work_mode_switch.xml b/res/layout/work_mode_switch.xml
index 31953c72aa..538a180992 100644
--- a/res/layout/work_mode_switch.xml
+++ b/res/layout/work_mode_switch.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2017 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -13,8 +12,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher3.allapps.WorkModeSwitch
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher3.allapps.WorkModeSwitch xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     style="@style/PrimaryHeadline"
@@ -35,5 +33,4 @@
     android:paddingBottom="@dimen/work_profile_footer_padding"
     android:paddingLeft="@dimen/work_profile_footer_padding"
     android:paddingRight="@dimen/work_profile_footer_padding"
-    android:paddingTop="@dimen/work_profile_footer_padding"
-/>
+    android:paddingTop="@dimen/work_profile_footer_padding" />
diff --git a/res/layout/work_profile_edu.xml b/res/layout/work_profile_edu.xml
deleted file mode 100644
index c3c7010f7e..0000000000
--- a/res/layout/work_profile_edu.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.launcher3.views.WorkEduView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="bottom"
-    android:gravity="bottom"
-    android:orientation="vertical">
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="32dp"
-        android:background="@drawable/bottom_sheet_top_border"
-        android:backgroundTint="?attr/eduHalfSheetBGColor" />
-
-    <LinearLayout
-        android:id="@+id/view_wrapper"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?attr/eduHalfSheetBGColor"
-        android:orientation="vertical"
-        android:paddingLeft="@dimen/bottom_sheet_edu_padding"
-        android:paddingRight="@dimen/bottom_sheet_edu_padding">
-
-        <TextView
-            android:id="@+id/content_text"
-            style="@style/TextHeadline"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="48dp"
-            android:layout_marginBottom="48dp"
-            android:gravity="center"
-            android:text="@string/work_profile_edu_personal_apps"
-            android:textAlignment="center"
-            android:textColor="@android:color/white"
-            android:textSize="20sp" />
-
-        <Button
-            android:id="@+id/proceed"
-            android:layout_width="wrap_content"
-            android:layout_height="48dp"
-            android:layout_gravity="end"
-            android:background="?android:attr/selectableItemBackground"
-            android:gravity="center"
-            android:text="@string/work_profile_edu_next"
-            android:textAlignment="center"
-            android:textColor="@android:color/white" />
-    </LinearLayout>
-</com.android.launcher3.views.WorkEduView>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d06561112e..caeb0b4eb1 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -115,6 +115,10 @@
 
     <dimen name="all_apps_divider_margin_vertical">8dp</dimen>
 
+<!-- Floating action button inside work tab to toggle work profile -->
+    <dimen name="work_fab_height">48dp</dimen>
+    <dimen name="work_fab_radius">24dp</dimen>
+    <dimen name="work_fab_margin">18dp</dimen>
     <dimen name="work_profile_footer_padding">20dp</dimen>
     <dimen name="work_profile_footer_text_size">16sp</dimen>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c851cf8273..b3d84db03c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -379,37 +379,30 @@
 
     <!-- This string is in the work profile tab when a user has All Apps open on their phone. This is a label for a toggle to turn the work profile on and off. "Work profile" means a separate profile on a user's phone that's specifically for their work apps and managed by their company. "Work" is used as an adjective.-->
     <string name="work_profile_toggle_label">Work profile</string>
-    <!--- User onboarding title for personal apps -->
-    <string name="work_profile_edu_personal_apps">Personal data is separate &amp; hidden from work apps</string>
     <!--- User onboarding title for work profile apps -->
-    <string name="work_profile_edu_work_apps">Work apps &amp; data are visible to your IT admin</string>
-    <!-- Action label to proceed to the next work profile edu section-->
-    <string name="work_profile_edu_next">Next</string>
+    <string name="work_profile_edu_work_apps">Work apps are badged andare visible to your IT admin</string>
     <!-- Action label to finish work profile edu-->
     <string name="work_profile_edu_accept">Got it</string>
 
     <!--- heading shown when user opens work apps tab while work apps are paused -->
-    <string name="work_apps_paused_title">Work profile is paused</string>
+    <string name="work_apps_paused_title">Work apps are off</string>
     <!--- body shown when user opens work apps tab while work apps are paused -->
-    <string name="work_apps_paused_body">Work apps can’t send you notifications, use your battery, or access your location</string>
+    <string name="work_apps_paused_body">Your work apps can’t send you notifications, use your battery, or access your location</string>
     <!-- content description for paused work apps list -->
-    <string name="work_apps_paused_content_description">Work profile is paused. Work apps can’t send you notifications, use your battery, or access your location</string>
+    <string name="work_apps_paused_content_description">Work apps are off. Your work apps can’t send you notifications, use your battery, or access your location</string>
     <!-- string shown in educational banner about work profile -->
     <string name="work_apps_paused_edu_banner">Work apps are badged and visible to your IT admin</string>
     <!-- button string shown to dismiss work tab education -->
     <string name="work_apps_paused_edu_accept">Got it</string>
 
     <!-- button string shown pause work profile -->
-    <string name="work_apps_pause_btn_text">Pause work apps</string>
+    <string name="work_apps_pause_btn_text">Turn off work apps</string>
     <!-- button string shown enable work profile -->
-    <string name="work_apps_enable_btn_text">Turn on</string>
+    <string name="work_apps_enable_btn_text">Turn on work apps</string>
 
     <!-- A hint shown in launcher settings develop options filter box -->
     <string name="developer_options_filter_hint">Filter</string>
 
-    <!-- A tip shown pointing at work toggle -->
-    <string name="work_switch_tip">Pause work apps and notifications</string>
-
     <!-- Failed action error message: e.g. Failed: Pause -->
     <string name="remote_action_failed">Failed: <xliff:g id="what" example="Pause">%1$s</xliff:g></string>
 </resources>
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index cb20fec47a..801a6c3300 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -228,7 +228,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
     }
 
     private void resetWorkProfile() {
-        mWorkModeSwitch.update(!mAllAppsStore.hasModelFlag(FLAG_QUIET_MODE_ENABLED));
+        mWorkModeSwitch.updateCurrentState(!mAllAppsStore.hasModelFlag(FLAG_QUIET_MODE_ENABLED));
         mAH[AdapterHolder.WORK].setupOverlay();
         mAH[AdapterHolder.WORK].applyPadding();
     }
@@ -482,7 +482,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
     private void setupWorkToggle() {
         if (Utilities.ATLEAST_P) {
             mWorkModeSwitch = (WorkModeSwitch) mLauncher.getLayoutInflater().inflate(
-                    R.layout.work_mode_switch, this, false);
+                    R.layout.work_mode_fab, this, false);
             this.addView(mWorkModeSwitch);
             mWorkModeSwitch.setInsets(mInsets);
             mWorkModeSwitch.post(this::resetWorkProfile);
diff --git a/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java b/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
index 16ae2508ec..1eb726ce0d 100644
--- a/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
@@ -25,7 +25,6 @@ import android.view.MotionEvent;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.statemanager.StateManager.StateListener;
-import com.android.launcher3.views.WorkEduView;
 
 /**
  * AllAppsContainerView with launcher specific callbacks
@@ -88,13 +87,6 @@ public class LauncherAllAppsContainerView extends AllAppsContainerView {
     @Override
     public void onActivePageChanged(int currentActivePage) {
         super.onActivePageChanged(currentActivePage);
-        if (mUsingTabs) {
-            if (currentActivePage == AdapterHolder.WORK) {
-                WorkEduView.showWorkEduIfNeeded(mLauncher);
-            } else {
-                mWorkTabListener = WorkEduView.showEduFlowIfNeeded(mLauncher, mWorkTabListener);
-            }
-        }
     }
 
     @Override
diff --git a/src/com/android/launcher3/allapps/WorkModeSwitch.java b/src/com/android/launcher3/allapps/WorkModeSwitch.java
index 4567ee620f..c22cd639de 100644
--- a/src/com/android/launcher3/allapps/WorkModeSwitch.java
+++ b/src/com/android/launcher3/allapps/WorkModeSwitch.java
@@ -15,108 +15,61 @@
  */
 package com.android.launcher3.allapps;
 
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.graphics.Rect;
-import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Process;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.ViewConfiguration;
-import android.widget.Switch;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+import androidx.annotation.RequiresApi;
 
 import com.android.launcher3.Insettable;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.pm.UserCache;
-import com.android.launcher3.views.ArrowTipView;
-
-import java.lang.ref.WeakReference;
 
 /**
  * Work profile toggle switch shown at the bottom of AllApps work tab
  */
-public class WorkModeSwitch extends Switch implements Insettable {
-
-    private static final int WORK_TIP_THRESHOLD = 2;
-    public static final String KEY_WORK_TIP_COUNTER = "worked_tip_counter";
+public class WorkModeSwitch extends Button implements Insettable, View.OnClickListener {
 
     private Rect mInsets = new Rect();
-
-    private final float[] mTouch = new float[2];
-    private int mTouchSlop;
+    private boolean mWorkEnabled;
 
     public WorkModeSwitch(Context context) {
-        super(context);
-        init();
+        this(context, null, 0);
     }
 
     public WorkModeSwitch(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init();
+        this(context, attrs, 0);
     }
 
     public WorkModeSwitch(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        init();
-    }
-
-    private void init() {
-        ViewConfiguration viewConfiguration = ViewConfiguration.get(getContext());
-        mTouchSlop = viewConfiguration.getScaledTouchSlop();
-    }
-
-    @Override
-    public void setChecked(boolean checked) { }
-
-    @Override
-    public void toggle() {
-        // don't show tip if user uses toggle
-        Utilities.getPrefs(getContext()).edit().putInt(KEY_WORK_TIP_COUNTER, -1).apply();
-        trySetQuietModeEnabledToAllProfilesAsync(isChecked());
-    }
-
-    /**
-     * Sets the enabled or disabled state of the button
-     * @param isChecked
-     */
-    public void update(boolean isChecked) {
-        super.setChecked(isChecked);
-        setCompoundDrawablesRelativeWithIntrinsicBounds(
-                isChecked ? R.drawable.ic_corp : R.drawable.ic_corp_off, 0, 0, 0);
-        setEnabled(true);
     }
 
     @Override
-    public boolean onTouchEvent(MotionEvent ev) {
-        if (ev.getActionMasked() == MotionEvent.ACTION_DOWN) {
-            mTouch[0] = ev.getX();
-            mTouch[1] = ev.getY();
-        } else if (ev.getActionMasked() == MotionEvent.ACTION_MOVE) {
-            if (Math.abs(mTouch[0] - ev.getX()) > mTouchSlop
-                    || Math.abs(mTouch[1] - ev.getY()) > mTouchSlop) {
-                int action = ev.getAction();
-                ev.setAction(MotionEvent.ACTION_CANCEL);
-                super.onTouchEvent(ev);
-                ev.setAction(action);
-                return false;
-            }
-        }
-        return super.onTouchEvent(ev);
-    }
-
-    private void trySetQuietModeEnabledToAllProfilesAsync(boolean enabled) {
-        new SetQuietModeEnabledAsyncTask(enabled, new WeakReference<>(this)).execute();
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        setOnClickListener(this);
     }
 
     @Override
     public void setInsets(Rect insets) {
         int bottomInset = insets.bottom - mInsets.bottom;
         mInsets.set(insets);
-        setPadding(getPaddingLeft(), getPaddingTop(), getPaddingRight(),
-                getPaddingBottom() + bottomInset);
+        ViewGroup.MarginLayoutParams marginLayoutParams =
+                (ViewGroup.MarginLayoutParams) getLayoutParams();
+        if (marginLayoutParams != null) {
+            marginLayoutParams.bottomMargin = bottomInset + marginLayoutParams.bottomMargin;
+        }
     }
 
     /**
@@ -125,78 +78,44 @@ public class WorkModeSwitch extends Switch implements Insettable {
     public void setWorkTabVisible(boolean workTabVisible) {
         clearAnimation();
         if (workTabVisible) {
+            setEnabled(true);
             setVisibility(VISIBLE);
             setAlpha(0);
             animate().alpha(1).start();
-            showTipIfNeeded();
         } else {
             animate().alpha(0).withEndAction(() -> this.setVisibility(GONE)).start();
         }
     }
 
-    private static final class SetQuietModeEnabledAsyncTask
-            extends AsyncTask<Void, Void, Boolean> {
-
-        private final boolean enabled;
-        private final WeakReference<WorkModeSwitch> switchWeakReference;
-
-        SetQuietModeEnabledAsyncTask(boolean enabled,
-                                     WeakReference<WorkModeSwitch> switchWeakReference) {
-            this.enabled = enabled;
-            this.switchWeakReference = switchWeakReference;
-        }
-
-        @Override
-        protected void onPreExecute() {
-            super.onPreExecute();
-            WorkModeSwitch workModeSwitch = switchWeakReference.get();
-            if (workModeSwitch != null) {
-                workModeSwitch.setEnabled(false);
-            }
-        }
-
-        @Override
-        protected Boolean doInBackground(Void... voids) {
-            WorkModeSwitch workModeSwitch = switchWeakReference.get();
-            if (workModeSwitch == null || !Utilities.ATLEAST_P) {
-                return false;
-            }
-
-            Context context = workModeSwitch.getContext();
-            UserManager userManager = context.getSystemService(UserManager.class);
-            boolean showConfirm = false;
-            for (UserHandle userProfile : UserCache.INSTANCE.get(context).getUserProfiles()) {
-                if (Process.myUserHandle().equals(userProfile)) {
-                    continue;
-                }
-                showConfirm |= !userManager.requestQuietModeEnabled(enabled, userProfile);
-            }
-            return showConfirm;
-        }
-
-        @Override
-        protected void onPostExecute(Boolean showConfirm) {
-            if (showConfirm) {
-                WorkModeSwitch workModeSwitch = switchWeakReference.get();
-                if (workModeSwitch != null) {
-                    workModeSwitch.setEnabled(true);
-                }
-            }
+    @Override
+    public void onClick(View view) {
+        if (Utilities.ATLEAST_P) {
+            setEnabled(false);
+            UI_HELPER_EXECUTOR.post(() -> setToState(!mWorkEnabled));
         }
     }
 
     /**
-     * Shows a work tip on the Nth work tab open
+     * Sets the enabled or disabled state of the button
      */
-    public void showTipIfNeeded() {
-        Context context = getContext();
-        SharedPreferences prefs = Utilities.getPrefs(context);
-        int tipCounter = prefs.getInt(KEY_WORK_TIP_COUNTER, WORK_TIP_THRESHOLD);
-        if (tipCounter < 0) return;
-        if (tipCounter == 0) {
-            new ArrowTipView(context)
-                    .show(context.getString(R.string.work_switch_tip), getTop());
+    public void updateCurrentState(boolean active) {
+        mWorkEnabled = active;
+        setEnabled(true);
+        setCompoundDrawablesRelativeWithIntrinsicBounds(
+                active ? R.drawable.ic_corp_off : R.drawable.ic_corp, 0, 0, 0);
+        setText(active ? R.string.work_apps_pause_btn_text : R.string.work_apps_enable_btn_text);
+    }
+
+    @RequiresApi(Build.VERSION_CODES.P)
+    protected Boolean setToState(boolean toState) {
+        UserManager userManager = getContext().getSystemService(UserManager.class);
+        boolean showConfirm = false;
+        for (UserHandle userProfile : UserCache.INSTANCE.get(getContext()).getUserProfiles()) {
+            if (Process.myUserHandle().equals(userProfile)) {
+                continue;
+            }
+            showConfirm |= !userManager.requestQuietModeEnabled(!toState, userProfile);
         }
-        prefs.edit().putInt(KEY_WORK_TIP_COUNTER, tipCounter - 1).apply();
+        return showConfirm;
     }
 }
diff --git a/src/com/android/launcher3/views/WorkEduView.java b/src/com/android/launcher3/views/WorkEduView.java
deleted file mode 100644
index 6be0c23577..0000000000
--- a/src/com/android/launcher3/views/WorkEduView.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.views;
-
-
-import android.animation.Animator;
-import android.animation.ObjectAnimator;
-import android.animation.PropertyValuesHolder;
-import android.content.Context;
-import android.graphics.Rect;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.Insettable;
-import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherState;
-import com.android.launcher3.R;
-import com.android.launcher3.allapps.AllAppsContainerView;
-import com.android.launcher3.allapps.AllAppsPagedView;
-import com.android.launcher3.anim.AnimationSuccessListener;
-import com.android.launcher3.anim.Interpolators;
-import com.android.launcher3.statemanager.StateManager.StateListener;
-
-/**
- * On boarding flow for users right after setting up work profile
- */
-public class WorkEduView extends AbstractSlideInView<Launcher>
-        implements Insettable, StateListener<LauncherState> {
-
-    private static final int DEFAULT_CLOSE_DURATION = 200;
-    public static final String KEY_WORK_EDU_STEP = "showed_work_profile_edu";
-    public static final String KEY_LEGACY_WORK_EDU_SEEN = "showed_bottom_user_education";
-
-    private static final int WORK_EDU_NOT_STARTED = 0;
-    private static final int WORK_EDU_PERSONAL_APPS = 1;
-    private static final int WORK_EDU_WORK_APPS = 2;
-
-    protected static final int FINAL_SCRIM_BG_COLOR = 0x88000000;
-
-
-    private Rect mInsets = new Rect();
-    private View mViewWrapper;
-    private Button mProceedButton;
-    private TextView mContentText;
-
-    private int mNextWorkEduStep = WORK_EDU_PERSONAL_APPS;
-
-
-    public WorkEduView(Context context, AttributeSet attr) {
-        this(context, attr, 0);
-    }
-
-    public WorkEduView(Context context, AttributeSet attrs,
-            int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        mContent = this;
-    }
-
-    @Override
-    protected void handleClose(boolean animate) {
-        mActivityContext.getSharedPrefs().edit()
-                .putInt(KEY_WORK_EDU_STEP, mNextWorkEduStep).apply();
-        handleClose(true, DEFAULT_CLOSE_DURATION);
-    }
-
-    @Override
-    protected void onCloseComplete() {
-        super.onCloseComplete();
-        mActivityContext.getStateManager().removeStateListener(this);
-    }
-
-    @Override
-    protected boolean isOfType(int type) {
-        return (type & TYPE_ON_BOARD_POPUP) != 0;
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        mViewWrapper = findViewById(R.id.view_wrapper);
-        mProceedButton = findViewById(R.id.proceed);
-        mContentText = findViewById(R.id.content_text);
-
-        // make sure layout does not shrink when we change the text
-        mContentText.post(() -> mContentText.setMinLines(mContentText.getLineCount()));
-
-        mProceedButton.setOnClickListener(view -> {
-            if (getAllAppsPagedView() != null) {
-                getAllAppsPagedView().snapToPage(AllAppsContainerView.AdapterHolder.WORK);
-            }
-            goToWorkTab(true);
-        });
-    }
-
-    private void goToWorkTab(boolean animate) {
-        mProceedButton.setText(R.string.work_profile_edu_accept);
-        if (animate) {
-            ObjectAnimator animator = ObjectAnimator.ofFloat(mContentText, ALPHA, 0);
-            animator.addListener(new AnimationSuccessListener() {
-                @Override
-                public void onAnimationSuccess(Animator animator) {
-                    mContentText.setText(
-                            mActivityContext.getString(R.string.work_profile_edu_work_apps));
-                    ObjectAnimator.ofFloat(mContentText, ALPHA, 1).start();
-                }
-            });
-            animator.start();
-        } else {
-            mContentText.setText(mActivityContext.getString(R.string.work_profile_edu_work_apps));
-        }
-        mNextWorkEduStep = WORK_EDU_WORK_APPS;
-        mProceedButton.setOnClickListener(v -> handleClose(true));
-    }
-
-    @Override
-    public void setInsets(Rect insets) {
-        int leftInset = insets.left - mInsets.left;
-        int rightInset = insets.right - mInsets.right;
-        int bottomInset = insets.bottom - mInsets.bottom;
-        mInsets.set(insets);
-        setPadding(leftInset, getPaddingTop(), rightInset, 0);
-        mViewWrapper.setPaddingRelative(mViewWrapper.getPaddingStart(),
-                mViewWrapper.getPaddingTop(), mViewWrapper.getPaddingEnd(), bottomInset);
-    }
-
-    private void show() {
-        attachToContainer();
-        animateOpen();
-        mActivityContext.getStateManager().addStateListener(this);
-    }
-
-    @Override
-    protected int getScrimColor(Context context) {
-        return FINAL_SCRIM_BG_COLOR;
-    }
-
-    private void goToFirstPage() {
-        if (getAllAppsPagedView() != null) {
-            getAllAppsPagedView().snapToPageImmediately(AllAppsContainerView.AdapterHolder.MAIN);
-        }
-    }
-
-    private void animateOpen() {
-        if (mIsOpen || mOpenCloseAnimator.isRunning()) {
-            return;
-        }
-        mIsOpen = true;
-        mOpenCloseAnimator.setValues(
-                PropertyValuesHolder.ofFloat(TRANSLATION_SHIFT, TRANSLATION_SHIFT_OPENED));
-        mOpenCloseAnimator.setInterpolator(Interpolators.FAST_OUT_SLOW_IN);
-        mOpenCloseAnimator.start();
-    }
-
-    private AllAppsPagedView getAllAppsPagedView() {
-        View v = mActivityContext.getAppsView().getContentView();
-        return (v instanceof AllAppsPagedView) ? (AllAppsPagedView) v : null;
-    }
-
-    /**
-     * Checks if user has not seen onboarding UI yet and shows it when user navigates to all apps
-     */
-    public static StateListener<LauncherState> showEduFlowIfNeeded(Launcher launcher,
-            @Nullable StateListener<LauncherState> oldListener) {
-        if (oldListener != null) {
-            launcher.getStateManager().removeStateListener(oldListener);
-        }
-        if (hasSeenLegacyEdu(launcher) || launcher.getSharedPrefs().getInt(KEY_WORK_EDU_STEP,
-                WORK_EDU_NOT_STARTED) != WORK_EDU_NOT_STARTED) {
-            return null;
-        }
-
-        StateListener<LauncherState> listener = new StateListener<LauncherState>() {
-            @Override
-            public void onStateTransitionComplete(LauncherState finalState) {
-                if (finalState != LauncherState.ALL_APPS) return;
-                LayoutInflater layoutInflater = LayoutInflater.from(launcher);
-                WorkEduView v = (WorkEduView) layoutInflater.inflate(
-                        R.layout.work_profile_edu, launcher.getDragLayer(),
-                        false);
-                v.show();
-                v.goToFirstPage();
-                launcher.getStateManager().removeStateListener(this);
-            }
-        };
-        launcher.getStateManager().addStateListener(listener);
-        return listener;
-    }
-
-    /**
-     * Shows work apps edu if user had dismissed full edu flow
-     */
-    public static void showWorkEduIfNeeded(Launcher launcher) {
-        if (hasSeenLegacyEdu(launcher) || launcher.getSharedPrefs().getInt(KEY_WORK_EDU_STEP,
-                WORK_EDU_NOT_STARTED) != WORK_EDU_PERSONAL_APPS) {
-            return;
-        }
-        LayoutInflater layoutInflater = LayoutInflater.from(launcher);
-        WorkEduView v = (WorkEduView) layoutInflater.inflate(
-                R.layout.work_profile_edu, launcher.getDragLayer(), false);
-        v.show();
-        v.goToWorkTab(false);
-    }
-
-    private static boolean hasSeenLegacyEdu(Launcher launcher) {
-        return launcher.getSharedPrefs().getBoolean(KEY_LEGACY_WORK_EDU_SEEN, false);
-    }
-
-    @Override
-    public void onStateTransitionComplete(LauncherState finalState) {
-        close(false);
-    }
-}
-- 
GitLab


From 154ad76f40b54d7264df7f076ef45703b1a2bfb6 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Mon, 14 Jun 2021 00:31:00 -0500
Subject: [PATCH 1391/1664] Introduce inline education for work profile

Bug: 186857875
Test: local
Change-Id: I796b04fbb3ffc714a01104107774819d35034f93
---
 res/drawable/work_apps_toggle_background.xml  |   2 +-
 res/drawable/work_card.xml                    |  27 +++++
 res/drawable/work_card_btn.xml                |  27 +++++
 res/layout/work_apps_edu.xml                  |  45 ++++++++
 res/layout/work_mode_fab.xml                  |  10 +-
 res/layout/work_mode_switch.xml               |  36 ------
 res/values/dimens.xml                         |   4 +-
 res/values/strings.xml                        |   2 +-
 .../allapps/AllAppsContainerView.java         |  53 ++++-----
 .../launcher3/allapps/AllAppsGridAdapter.java |  42 ++++---
 .../allapps/AlphabeticalAppsList.java         |  19 +++-
 .../allapps/BaseAdapterProvider.java          |  56 +++++++++
 .../allapps/WorkAdapterProvider.java          | 106 ++++++++++++++++++
 .../launcher3/allapps/WorkEduCard.java        |  98 ++++++++++++++++
 .../search/DefaultSearchAdapterProvider.java  |   2 +-
 .../allapps/search/SearchAdapterProvider.java |  36 +-----
 16 files changed, 433 insertions(+), 132 deletions(-)
 create mode 100644 res/drawable/work_card.xml
 create mode 100644 res/drawable/work_card_btn.xml
 create mode 100644 res/layout/work_apps_edu.xml
 delete mode 100644 res/layout/work_mode_switch.xml
 create mode 100644 src/com/android/launcher3/allapps/BaseAdapterProvider.java
 create mode 100644 src/com/android/launcher3/allapps/WorkAdapterProvider.java
 create mode 100644 src/com/android/launcher3/allapps/WorkEduCard.java

diff --git a/res/drawable/work_apps_toggle_background.xml b/res/drawable/work_apps_toggle_background.xml
index a04d269875..cb8b8e2a42 100644
--- a/res/drawable/work_apps_toggle_background.xml
+++ b/res/drawable/work_apps_toggle_background.xml
@@ -24,7 +24,7 @@
     <item>
         <shape android:shape="rectangle">
             <corners android:radius="@dimen/work_fab_radius" />
-            <solid android:color="?android:attr/colorAccent" />
+            <solid android:color="@color/all_apps_tab_bg" />
             <padding android:left="@dimen/work_fab_radius" android:right="@dimen/work_fab_radius" />
         </shape>
     </item>
diff --git a/res/drawable/work_card.xml b/res/drawable/work_card.xml
new file mode 100644
index 0000000000..0e4b05407e
--- /dev/null
+++ b/res/drawable/work_card.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (C) 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+    android:shape="rectangle">
+    <solid android:color="?androidprv:attr/colorSurface" />
+    <corners android:radius="@dimen/work_edu_card_margin" />
+    <padding
+        android:left="@dimen/work_fab_radius"
+        android:right="@dimen/work_fab_radius" />
+</shape>
+
diff --git a/res/drawable/work_card_btn.xml b/res/drawable/work_card_btn.xml
new file mode 100644
index 0000000000..3c9391912a
--- /dev/null
+++ b/res/drawable/work_card_btn.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (C) 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+    android:shape="rectangle">
+    <corners android:radius="@dimen/work_edu_card_margin" />
+    <stroke android:width="1dp" android:color="?androidprv:attr/colorAccentPrimaryVariant" />
+    <padding
+        android:left="@dimen/work_fab_radius"
+        android:right="@dimen/work_fab_radius" />
+</shape>
+
diff --git a/res/layout/work_apps_edu.xml b/res/layout/work_apps_edu.xml
new file mode 100644
index 0000000000..2c58907e4b
--- /dev/null
+++ b/res/layout/work_apps_edu.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.launcher3.allapps.WorkEduCard xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="@dimen/work_edu_card_margin"
+    android:orientation="vertical"
+    android:background="@drawable/work_card"
+    android:gravity="center">
+
+    <TextView
+        style="@style/PrimaryHeadline"
+        android:textColor="?android:attr/textColorPrimary"
+        android:id="@+id/work_apps_paused_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:text="@string/work_profile_edu_work_apps"
+        android:textAlignment="center"
+        android:textSize="20sp" />
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/action_btn"
+        android:textColor="?attr/workProfileOverlayTextColor"
+        android:text="@string/work_profile_edu_accept"
+        android:textAlignment="center"
+        android:background="@drawable/work_card_btn"
+        android:textSize="14sp" />
+</com.android.launcher3.allapps.WorkEduCard>
\ No newline at end of file
diff --git a/res/layout/work_mode_fab.xml b/res/layout/work_mode_fab.xml
index 21f269fed6..4209192cca 100644
--- a/res/layout/work_mode_fab.xml
+++ b/res/layout/work_mode_fab.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2017 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -13,8 +12,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher3.allapps.WorkModeSwitch
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher3.allapps.WorkModeSwitch xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/work_mode_toggle"
     android:layout_alignParentBottom="true"
     android:layout_alignParentEnd="true"
@@ -22,8 +20,8 @@
     android:layout_width="wrap_content"
     android:gravity="center"
     android:includeFontPadding="false"
-    android:drawableTint="@android:color/white"
-    android:textColor="@android:color/white"
+    android:drawableTint="@color/all_apps_tab_text"
+    android:textColor="@color/all_apps_tab_text"
     android:background="@drawable/work_apps_toggle_background"
     android:drawablePadding="16dp"
     android:drawableStart="@drawable/ic_corp_off"
diff --git a/res/layout/work_mode_switch.xml b/res/layout/work_mode_switch.xml
deleted file mode 100644
index 538a180992..0000000000
--- a/res/layout/work_mode_switch.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.launcher3.allapps.WorkModeSwitch xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    style="@style/PrimaryHeadline"
-    android:id="@+id/work_mode_toggle"
-    android:drawableStart="@drawable/ic_corp"
-    android:drawablePadding="16dp"
-    android:drawableTint="?attr/workProfileOverlayTextColor"
-    android:textColor="?attr/workProfileOverlayTextColor"
-    android:layout_alignParentBottom="true"
-    android:ellipsize="end"
-    android:elevation="10dp"
-    android:gravity="start"
-    android:lines="1"
-    android:showText="false"
-    android:textSize="@dimen/work_profile_footer_text_size"
-    android:background="?attr/allAppsScrimColor"
-    android:text="@string/work_profile_toggle_label"
-    android:paddingBottom="@dimen/work_profile_footer_padding"
-    android:paddingLeft="@dimen/work_profile_footer_padding"
-    android:paddingRight="@dimen/work_profile_footer_padding"
-    android:paddingTop="@dimen/work_profile_footer_padding" />
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 06bdd499c5..430a1abb90 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -122,8 +122,10 @@
     <dimen name="work_fab_margin">18dp</dimen>
     <dimen name="work_profile_footer_padding">20dp</dimen>
     <dimen name="work_profile_footer_text_size">16sp</dimen>
+    <dimen name="work_edu_card_margin">16dp</dimen>
 
-<!-- Widget tray -->
+
+    <!-- Widget tray -->
     <dimen name="widget_cell_vertical_padding">8dp</dimen>
     <dimen name="widget_cell_horizontal_padding">16dp</dimen>
     <dimen name="widget_cell_font_size">14sp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9cfe69aae1..9823df3a03 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -389,7 +389,7 @@
     <!-- This string is in the work profile tab when a user has All Apps open on their phone. This is a label for a toggle to turn the work profile on and off. "Work profile" means a separate profile on a user's phone that's specifically for their work apps and managed by their company. "Work" is used as an adjective.-->
     <string name="work_profile_toggle_label">Work profile</string>
     <!--- User onboarding title for work profile apps -->
-    <string name="work_profile_edu_work_apps">Work apps are badged andare visible to your IT admin</string>
+    <string name="work_profile_edu_work_apps">Work apps are badged and visible to your IT admin</string>
     <!-- Action label to finish work profile edu-->
     <string name="work_profile_edu_accept">Got it</string>
 
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 7249aaf7ac..d749e02d73 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -50,7 +50,6 @@ import androidx.annotation.StringRes;
 import androidx.annotation.VisibleForTesting;
 import androidx.core.graphics.ColorUtils;
 import androidx.core.os.BuildCompat;
-import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -127,6 +126,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
     private Rect mInsets = new Rect();
 
     private SearchAdapterProvider mSearchAdapterProvider;
+    private WorkAdapterProvider mWorkAdapterProvider;
     private final int mScrimColor;
     private final int mHeaderProtectionColor;
     private final float mHeaderThreshold;
@@ -159,6 +159,11 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         Selection.setSelection(mSearchQueryBuilder, 0);
 
         mAH = new AdapterHolder[2];
+        mWorkAdapterProvider = new WorkAdapterProvider(mLauncher, () -> {
+            if (mAH[AdapterHolder.WORK] != null) {
+                mAH[AdapterHolder.WORK].appsList.updateAdapterItems();
+            }
+        });
         mAH[AdapterHolder.MAIN] = new AdapterHolder(false /* isWork */);
         mAH[AdapterHolder.WORK] = new AdapterHolder(true /* isWork */);
 
@@ -228,8 +233,9 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
     }
 
     private void resetWorkProfile() {
-        mWorkModeSwitch.updateCurrentState(!mAllAppsStore.hasModelFlag(FLAG_QUIET_MODE_ENABLED));
-        mAH[AdapterHolder.WORK].setupOverlay();
+        boolean isEnabled = !mAllAppsStore.hasModelFlag(FLAG_QUIET_MODE_ENABLED);
+        mWorkModeSwitch.updateCurrentState(isEnabled);
+        mWorkAdapterProvider.updateCurrentState(isEnabled);
         mAH[AdapterHolder.WORK].applyPadding();
     }
 
@@ -392,7 +398,6 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
             mAH[i].padding.bottom = insets.bottom;
             mAH[i].padding.left = mAH[i].padding.right = leftRightPadding;
             mAH[i].applyPadding();
-            mAH[i].setupOverlay();
         }
 
         ViewGroup.MarginLayoutParams mlp = (MarginLayoutParams) getLayoutParams();
@@ -539,6 +544,9 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
                     && mAllAppsStore.hasModelFlag(
                     FLAG_HAS_SHORTCUT_PERMISSION | FLAG_QUIET_MODE_CHANGE_PERMISSION));
         }
+        if (mSearchUiManager != null && mSearchUiManager.getEditText() != null) {
+            mSearchUiManager.getEditText().hideKeyboard();
+        }
     }
 
     // Used by tests only
@@ -719,9 +727,15 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
 
         AdapterHolder(boolean isWork) {
             mIsWork = isWork;
-            appsList = new AlphabeticalAppsList(mLauncher, mAllAppsStore, isWork);
+            appsList = new AlphabeticalAppsList(mLauncher, mAllAppsStore,
+                    isWork ? mWorkAdapterProvider : null);
+
+            BaseAdapterProvider[] adapterProviders =
+                    isWork ? new BaseAdapterProvider[]{mSearchAdapterProvider, mWorkAdapterProvider}
+                            : new BaseAdapterProvider[]{mSearchAdapterProvider};
+
             adapter = new AllAppsGridAdapter(mLauncher, getLayoutInflater(), appsList,
-                    mSearchAdapterProvider);
+                    adapterProviders);
             appsList.setAdapter(adapter);
             layoutManager = adapter.getLayoutManager();
         }
@@ -743,38 +757,11 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
             adapter.setIconFocusListener(focusedItemDecorator.getFocusListener());
             applyVerticalFadingEdgeEnabled(verticalFadingEdge);
             applyPadding();
-            setupOverlay();
             if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
                 recyclerView.addItemDecoration(mSearchAdapterProvider.getDecorator());
             }
         }
 
-        void setupOverlay() {
-            if (!mIsWork || recyclerView == null) return;
-            boolean workDisabled = mAllAppsStore.hasModelFlag(FLAG_QUIET_MODE_ENABLED);
-            if (mWorkDisabled == workDisabled) return;
-            recyclerView.setContentDescription(workDisabled ? mLauncher.getString(
-                    R.string.work_apps_paused_content_description) : null);
-            View overlayView = getOverlayView();
-            recyclerView.setItemAnimator(new DefaultItemAnimator());
-            if (workDisabled) {
-                overlayView.setAlpha(0);
-                recyclerView.addAutoSizedOverlay(overlayView);
-                overlayView.animate().alpha(1).withEndAction(
-                        () -> {
-                            appsList.updateItemFilter((info, cn) -> false);
-                            recyclerView.setItemAnimator(null);
-                        }).start();
-            } else if (mInfoMatcher != null) {
-                appsList.updateItemFilter(mInfoMatcher);
-                overlayView.animate().alpha(0).withEndAction(() -> {
-                    recyclerView.setItemAnimator(null);
-                    recyclerView.clearAutoSizedOverlays();
-                }).start();
-            }
-            mWorkDisabled = workDisabled;
-        }
-
         void applyPadding() {
             if (recyclerView != null) {
                 Resources res = getResources();
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index 70588ea317..874fe80ef0 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -41,10 +41,10 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.R;
-import com.android.launcher3.allapps.search.SearchAdapterProvider;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.util.PackageManagerHelper;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -72,7 +72,8 @@ public class AllAppsGridAdapter extends
     public static final int VIEW_TYPE_MASK_DIVIDER = VIEW_TYPE_ALL_APPS_DIVIDER;
     public static final int VIEW_TYPE_MASK_ICON = VIEW_TYPE_ICON;
 
-    private final SearchAdapterProvider mSearchAdapterProvider;
+
+    private final BaseAdapterProvider[] mAdapterProviders;
 
     /**
      * ViewHolder for each icon.
@@ -242,9 +243,12 @@ public class AllAppsGridAdapter extends
             int totalSpans = mGridLayoutMgr.getSpanCount();
             if (isIconViewType(viewType)) {
                 return totalSpans / mAppsPerRow;
-            } else if (mSearchAdapterProvider.isSearchView(viewType)) {
-                return totalSpans / mSearchAdapterProvider.getItemsPerRow(viewType, mAppsPerRow);
             } else {
+                BaseAdapterProvider adapterProvider = getAdapterProvider(viewType);
+                if (adapterProvider != null) {
+                    return totalSpans / adapterProvider.getItemsPerRow(viewType, mAppsPerRow);
+                }
+
                 // Section breaks span the full width
                 return totalSpans;
             }
@@ -270,7 +274,7 @@ public class AllAppsGridAdapter extends
     private Intent mMarketSearchIntent;
 
     public AllAppsGridAdapter(BaseDraggingActivity launcher, LayoutInflater inflater,
-            AlphabeticalAppsList apps, SearchAdapterProvider searchAdapterProvider) {
+            AlphabeticalAppsList apps, BaseAdapterProvider[] adapterProviders) {
         Resources res = launcher.getResources();
         mLauncher = launcher;
         mApps = apps;
@@ -282,16 +286,18 @@ public class AllAppsGridAdapter extends
 
         mOnIconClickListener = launcher.getItemOnClickListener();
 
-        mSearchAdapterProvider = searchAdapterProvider;
+        mAdapterProviders = adapterProviders;
         setAppsPerRow(mLauncher.getDeviceProfile().numShownAllAppsColumns);
     }
 
     public void setAppsPerRow(int appsPerRow) {
         mAppsPerRow = appsPerRow;
         int totalSpans = mAppsPerRow;
-        for (int itemPerRow : mSearchAdapterProvider.getSupportedItemsPerRowArray()) {
-            if (totalSpans % itemPerRow != 0) {
-                totalSpans *= itemPerRow;
+        for (BaseAdapterProvider adapterProvider : mAdapterProviders) {
+            for (int itemPerRow : adapterProvider.getSupportedItemsPerRowArray()) {
+                if (totalSpans % itemPerRow != 0) {
+                    totalSpans *= itemPerRow;
+                }
             }
         }
         mGridLayoutMgr.setSpanCount(totalSpans);
@@ -363,9 +369,9 @@ public class AllAppsGridAdapter extends
                 return new ViewHolder(mLayoutInflater.inflate(
                         R.layout.all_apps_divider, parent, false));
             default:
-                if (mSearchAdapterProvider.isSearchView(viewType)) {
-                    return mSearchAdapterProvider.onCreateViewHolder(mLayoutInflater, parent,
-                            viewType);
+                BaseAdapterProvider adapterProvider = getAdapterProvider(viewType);
+                if (adapterProvider != null) {
+                    return adapterProvider.onCreateViewHolder(mLayoutInflater, parent, viewType);
                 }
                 throw new RuntimeException("Unexpected view type");
         }
@@ -399,7 +405,10 @@ public class AllAppsGridAdapter extends
                 // nothing to do
                 break;
             default:
-                mSearchAdapterProvider.onBindView(holder, position);
+                BaseAdapterProvider adapterProvider = getAdapterProvider(holder.getItemViewType());
+                if (adapterProvider != null) {
+                    adapterProvider.onBindView(holder, position);
+                }
         }
     }
 
@@ -424,4 +433,11 @@ public class AllAppsGridAdapter extends
         AdapterItem item = mApps.getAdapterItems().get(position);
         return item.viewType;
     }
+
+    @Nullable
+    private BaseAdapterProvider getAdapterProvider(int viewType) {
+        return Arrays.stream(mAdapterProviders).filter(
+                adapterProvider -> adapterProvider.isViewSupported(viewType)).findFirst().orElse(
+                null);
+    }
 }
diff --git a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
index 88d95faea7..ce5c5890ea 100644
--- a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
+++ b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
@@ -44,6 +44,7 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
     private static final int FAST_SCROLL_FRACTION_DISTRIBUTE_BY_NUM_SECTIONS = 1;
 
     private final int mFastScrollDistributionMode = FAST_SCROLL_FRACTION_DISTRIBUTE_BY_NUM_SECTIONS;
+    private final WorkAdapterProvider mWorkAdapterProvider;
 
     /**
      * Info about a fast scroller section, depending if sections are merged, the fast scroller
@@ -75,8 +76,6 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
     private final ArrayList<AdapterItem> mAdapterItems = new ArrayList<>();
     // The set of sections that we allow fast-scrolling to (includes non-merged sections)
     private final List<FastScrollSectionInfo> mFastScrollerSections = new ArrayList<>();
-    // Is it the work profile app list.
-    private final boolean mIsWork;
 
     // The of ordered component names as a result of a search query
     private ArrayList<AdapterItem> mSearchResults;
@@ -86,11 +85,12 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
     private int mNumAppRowsInAdapter;
     private ItemInfoMatcher mItemFilter;
 
-    public AlphabeticalAppsList(Context context, AllAppsStore appsStore, boolean isWork) {
+    public AlphabeticalAppsList(Context context, AllAppsStore appsStore,
+            WorkAdapterProvider adapterProvider) {
         mAllAppsStore = appsStore;
         mLauncher = BaseDraggingActivity.fromContext(context);
         mAppNameComparator = new AppInfoComparator(context);
-        mIsWork = isWork;
+        mWorkAdapterProvider = adapterProvider;
         mNumAppsPerRow = mLauncher.getDeviceProfile().inv.numColumns;
         mAllAppsStore.addUpdateListener(this);
     }
@@ -265,7 +265,7 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
      * Updates the set of filtered apps with the current filter. At this point, we expect
      * mCachedSectionNames to have been calculated for the set of all apps in mApps.
      */
-    private void updateAdapterItems() {
+    public void updateAdapterItems() {
         refillAdapterItems();
         refreshRecyclerView();
     }
@@ -292,6 +292,12 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
 
         if (!hasFilter()) {
             mAccessibilityResultsCount = mApps.size();
+            if (mWorkAdapterProvider != null) {
+                position += mWorkAdapterProvider.addWorkItems(mAdapterItems);
+                if (!mWorkAdapterProvider.shouldShowWorkApps()) {
+                    return;
+                }
+            }
             for (AppInfo info : mApps) {
                 String sectionName = info.sectionName;
 
@@ -303,7 +309,8 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
                 }
 
                 // Create an app item
-                AdapterItem appItem = AdapterItem.asApp(position++, sectionName, info, appIndex++);
+                AdapterItem appItem = AdapterItem.asApp(position++, sectionName, info,
+                        appIndex++);
                 if (lastFastScrollerSectionInfo.fastScrollToItem == null) {
                     lastFastScrollerSectionInfo.fastScrollToItem = appItem;
                 }
diff --git a/src/com/android/launcher3/allapps/BaseAdapterProvider.java b/src/com/android/launcher3/allapps/BaseAdapterProvider.java
new file mode 100644
index 0000000000..308294cd16
--- /dev/null
+++ b/src/com/android/launcher3/allapps/BaseAdapterProvider.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.allapps;
+
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+/**
+ * A UI expansion wrapper providing for providing dynamic recyclerview items
+ */
+public abstract class BaseAdapterProvider {
+
+    /**
+     * Returns whether or not viewType can be handled by searchProvider
+     */
+    public abstract boolean isViewSupported(int viewType);
+
+    /**
+     * Called from RecyclerView.Adapter#onBindViewHolder
+     */
+    public abstract void onBindView(AllAppsGridAdapter.ViewHolder holder, int position);
+
+    /**
+     * Called from RecyclerView.Adapter#onCreateViewHolder
+     */
+    public abstract AllAppsGridAdapter.ViewHolder onCreateViewHolder(LayoutInflater layoutInflater,
+            ViewGroup parent, int viewType);
+
+    /**
+     * Returns supported item per row combinations supported
+     */
+    public int[] getSupportedItemsPerRowArray() {
+        return new int[]{};
+    }
+
+    /**
+     * Returns how many cells a view should span
+     */
+    public int getItemsPerRow(int viewType, int appsPerRow) {
+        return appsPerRow;
+    }
+
+}
diff --git a/src/com/android/launcher3/allapps/WorkAdapterProvider.java b/src/com/android/launcher3/allapps/WorkAdapterProvider.java
new file mode 100644
index 0000000000..13444dd185
--- /dev/null
+++ b/src/com/android/launcher3/allapps/WorkAdapterProvider.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.allapps;
+
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import com.android.launcher3.BaseDraggingActivity;
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+
+import java.util.ArrayList;
+
+/**
+ * A UI expansion wrapper providing for providing work profile specific views
+ */
+public class WorkAdapterProvider extends BaseAdapterProvider {
+
+    public static final String KEY_WORK_EDU_STEP = "showed_work_profile_edu";
+
+    private static final int VIEW_TYPE_WORK_EDU_CARD = 1 << 20;
+    private static final int VIEW_TYPE_WORK_DISABLED_CARD = 1 << 21;
+    private final Runnable mRefreshCB;
+    private final BaseDraggingActivity mLauncher;
+    private boolean mEnabled;
+
+    WorkAdapterProvider(BaseDraggingActivity launcher, Runnable refreshCallback) {
+        mLauncher = launcher;
+        mRefreshCB = refreshCallback;
+    }
+
+    @Override
+    public void onBindView(AllAppsGridAdapter.ViewHolder holder, int position) {
+        if (holder.itemView instanceof WorkEduCard) {
+            ((WorkEduCard) holder.itemView).setPosition(position);
+        }
+    }
+
+    @Override
+    public AllAppsGridAdapter.ViewHolder onCreateViewHolder(LayoutInflater layoutInflater,
+            ViewGroup parent, int viewType) {
+        int viewId = viewType == VIEW_TYPE_WORK_DISABLED_CARD ? R.layout.work_apps_paused
+                : R.layout.work_apps_edu;
+        return new AllAppsGridAdapter.ViewHolder(layoutInflater.inflate(viewId, parent, false));
+    }
+
+    /**
+     * returns whether or not work apps should be visible in work tab.
+     */
+    public boolean shouldShowWorkApps() {
+        return mEnabled;
+    }
+
+    /**
+     * Adds work profile specific adapter items to adapterItems and returns number of items added
+     */
+    public int addWorkItems(ArrayList<AllAppsGridAdapter.AdapterItem> adapterItems) {
+        if (!mEnabled) {
+            //add disabled card here.
+            AllAppsGridAdapter.AdapterItem disabledCard = new AllAppsGridAdapter.AdapterItem();
+            disabledCard.viewType = VIEW_TYPE_WORK_DISABLED_CARD;
+            adapterItems.add(disabledCard);
+        } else if (!isEduSeen()) {
+            AllAppsGridAdapter.AdapterItem eduCard = new AllAppsGridAdapter.AdapterItem();
+            eduCard.viewType = VIEW_TYPE_WORK_EDU_CARD;
+            adapterItems.add(eduCard);
+        }
+
+        return adapterItems.size();
+    }
+
+    /**
+     * Sets the current state of work profile
+     */
+    public void updateCurrentState(boolean isEnabled) {
+        mEnabled = isEnabled;
+        mRefreshCB.run();
+    }
+
+    @Override
+    public boolean isViewSupported(int viewType) {
+        return viewType == VIEW_TYPE_WORK_DISABLED_CARD || viewType == VIEW_TYPE_WORK_EDU_CARD;
+    }
+
+    @Override
+    public int getItemsPerRow(int viewType, int appsPerRow) {
+        return 1;
+    }
+
+    private boolean isEduSeen() {
+        return Utilities.getPrefs(mLauncher).getInt(KEY_WORK_EDU_STEP, 0) != 0;
+    }
+}
diff --git a/src/com/android/launcher3/allapps/WorkEduCard.java b/src/com/android/launcher3/allapps/WorkEduCard.java
new file mode 100644
index 0000000000..29a42f87ef
--- /dev/null
+++ b/src/com/android/launcher3/allapps/WorkEduCard.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.allapps;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
+import android.widget.LinearLayout;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+
+/**
+ * Work profile toggle switch shown at the bottom of AllApps work tab
+ */
+public class WorkEduCard extends LinearLayout implements View.OnClickListener,
+        Animation.AnimationListener {
+
+    private final Launcher mLauncher;
+    Animation mDismissAnim;
+    private int mPosition = -1;
+
+    public WorkEduCard(Context context) {
+        this(context, null, 0);
+    }
+
+    public WorkEduCard(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public WorkEduCard(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mLauncher = Launcher.getLauncher(getContext());
+        mDismissAnim = AnimationUtils.loadAnimation(context, android.R.anim.fade_out);
+        mDismissAnim.setDuration(500);
+        mDismissAnim.setAnimationListener(this);
+    }
+
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        findViewById(R.id.action_btn).setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View view) {
+        startAnimation(mDismissAnim);
+        mLauncher.getSharedPrefs().edit().putInt(WorkAdapterProvider.KEY_WORK_EDU_STEP, 1).apply();
+    }
+
+    @Override
+    public void onAnimationEnd(Animation animation) {
+        removeCard();
+    }
+
+    @Override
+    public void onAnimationRepeat(Animation animation) {
+
+    }
+
+    @Override
+    public void onAnimationStart(Animation animation) {
+
+    }
+
+    private void removeCard() {
+        if (mPosition == -1) {
+            if (getParent() != null) ((ViewGroup) getParent()).removeView(WorkEduCard.this);
+        } else {
+            AllAppsRecyclerView rv = mLauncher.getAppsView()
+                    .mAH[AllAppsContainerView.AdapterHolder.WORK].recyclerView;
+            rv.getApps().getAdapterItems().remove(mPosition);
+            rv.getAdapter().notifyItemRemoved(mPosition);
+        }
+    }
+
+    public void setPosition(int position) {
+        mPosition = position;
+    }
+
+}
diff --git a/src/com/android/launcher3/allapps/search/DefaultSearchAdapterProvider.java b/src/com/android/launcher3/allapps/search/DefaultSearchAdapterProvider.java
index ef62da43af..7abd555b9d 100644
--- a/src/com/android/launcher3/allapps/search/DefaultSearchAdapterProvider.java
+++ b/src/com/android/launcher3/allapps/search/DefaultSearchAdapterProvider.java
@@ -57,7 +57,7 @@ public class DefaultSearchAdapterProvider extends SearchAdapterProvider {
     }
 
     @Override
-    public boolean isSearchView(int viewType) {
+    public boolean isViewSupported(int viewType) {
         return false;
     }
 
diff --git a/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java b/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
index cefb8cbdd8..7af0406e30 100644
--- a/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
+++ b/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
@@ -17,20 +17,18 @@
 package com.android.launcher3.allapps.search;
 
 import android.net.Uri;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.allapps.AllAppsContainerView;
-import com.android.launcher3.allapps.AllAppsGridAdapter;
+import com.android.launcher3.allapps.BaseAdapterProvider;
 
 /**
  * A UI expansion wrapper providing for search results
  */
-public abstract class SearchAdapterProvider {
+public abstract class SearchAdapterProvider extends BaseAdapterProvider {
 
     protected final BaseDraggingActivity mLauncher;
 
@@ -38,42 +36,12 @@ public abstract class SearchAdapterProvider {
         mLauncher = launcher;
     }
 
-    /**
-     * Called from RecyclerView.Adapter#onBindViewHolder
-     */
-    public abstract void onBindView(AllAppsGridAdapter.ViewHolder holder, int position);
-
     /**
      * Called from LiveSearchManager to notify slice status updates.
      */
     public void onSliceStatusUpdate(Uri sliceUri) {
     }
 
-    /**
-     * Returns whether or not viewType can be handled by searchProvider
-     */
-    public abstract boolean isSearchView(int viewType);
-
-    /**
-     * Called from RecyclerView.Adapter#onCreateViewHolder
-     */
-    public abstract AllAppsGridAdapter.ViewHolder onCreateViewHolder(LayoutInflater layoutInflater,
-            ViewGroup parent, int viewType);
-
-    /**
-     * Returns supported item per row combinations supported
-     */
-    public int[] getSupportedItemsPerRowArray() {
-        return new int[]{};
-    }
-
-    /**
-     * Returns how many cells a view should span
-     */
-    public int getItemsPerRow(int viewType, int appsPerRow) {
-        return appsPerRow;
-    }
-
     /**
      * Handles selection event on search adapter item. Returns false if provider can not handle
      * event
-- 
GitLab


From 96cc3c533cd8cdbad0da04f91508bab018a446ad Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Mon, 14 Jun 2021 10:18:49 -0500
Subject: [PATCH 1392/1664] Fix home settings landing page

Bug: 188565060
Test: local
Change-Id: I2100d6a6e33381ea3da761f85797fed940e5a284
---
 src/com/android/launcher3/settings/SettingsActivity.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/com/android/launcher3/settings/SettingsActivity.java b/src/com/android/launcher3/settings/SettingsActivity.java
index 915e140aaf..dbd9c281a2 100644
--- a/src/com/android/launcher3/settings/SettingsActivity.java
+++ b/src/com/android/launcher3/settings/SettingsActivity.java
@@ -113,6 +113,12 @@ public class SettingsActivity extends FragmentActivity
         Utilities.getPrefs(getApplicationContext()).registerOnSharedPreferenceChangeListener(this);
     }
 
+    @Override
+    protected void onStop() {
+        super.onStop();
+        finish();
+    }
+
     /**
      * Obtains the preference fragment to instantiate in this activity.
      *
-- 
GitLab


From a9aeebc5bb3e592047a186a4f90435c5feb71328 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Mon, 14 Jun 2021 09:12:30 -0700
Subject: [PATCH 1393/1664] Fix NPE inside REcyclerViewFastScroller

Bug: 190939643
Test: manual
Change-Id: Ic01111bb1389b2fa84d86c0ecc20f1eec0940e51
---
 src/com/android/launcher3/views/RecyclerViewFastScroller.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/views/RecyclerViewFastScroller.java b/src/com/android/launcher3/views/RecyclerViewFastScroller.java
index f49d1b5d2a..78916acd16 100644
--- a/src/com/android/launcher3/views/RecyclerViewFastScroller.java
+++ b/src/com/android/launcher3/views/RecyclerViewFastScroller.java
@@ -344,7 +344,7 @@ public class RecyclerViewFastScroller extends View {
             // swiping very close to the thumb area (not just within it's bound)
             // will also prevent back gesture
             SYSTEM_GESTURE_EXCLUSION_RECT.get(0).offset(mThumbDrawOffset.x, mThumbDrawOffset.y);
-            if (Utilities.ATLEAST_Q) {
+            if (Utilities.ATLEAST_Q && mSystemGestureInsets != null) {
                 SYSTEM_GESTURE_EXCLUSION_RECT.get(0).left =
                         SYSTEM_GESTURE_EXCLUSION_RECT.get(0).right - mSystemGestureInsets.right;
             }
-- 
GitLab


From c5d50f710aa67648eadf164cfe5fc46ab543f181 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 10 Jun 2021 18:05:56 -0700
Subject: [PATCH 1394/1664] Skip entering PIP when dismissing auto-enter pip
 task

- Revert some changes from ag/14827090, we don't actually need to
  screenshot when dismissing, but we do need to prevent pip

Fixes: 190751761
Test: Swiping up from YT -> PIP
      Swiping up from YT to Overview to home -> PIP
      Swiping up from YT to Overview
Change-Id: I2057467d5146be6edc382d3745a1e5269cd76a6b
Merged-In: I2057467d5146be6edc382d3745a1e5269cd76a6b
---
 .../com/android/quickstep/RecentsActivity.java   |  3 ++-
 .../com/android/quickstep/views/RecentsView.java | 16 ++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index 68526420ef..0e85ec3760 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -353,7 +353,8 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
     public void startHome() {
         if (LIVE_TILE.get()) {
             RecentsView recentsView = getOverviewPanel();
-            recentsView.switchToScreenshotAndFinishAnimationToRecents(this::startHomeInternal);
+            recentsView.switchToScreenshot(() -> recentsView.finishRecentsAnimation(true,
+                    this::startHomeInternal));
         } else {
             startHomeInternal();
         }
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 7991614abb..df7f8b5a2a 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2357,7 +2357,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             public void accept(Boolean success) {
                 if (LIVE_TILE.get() && mEnableDrawingLiveTile && taskView.isRunningTask()
                         && success) {
-                    finishRecentsAnimation(true /* toHome */, () -> onEnd(success));
+                    finishRecentsAnimation(true /* toRecents */, false /* shouldPip */,
+                            () -> onEnd(success));
                 } else {
                     onEnd(success);
                 }
@@ -2368,7 +2369,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 if (success) {
                     if (shouldRemoveTask) {
                         if (taskView.getTask() != null) {
-                            switchToScreenshotAndFinishAnimationToRecents(() -> {
+                            finishRecentsAnimation(true /* toRecents */, false /* shouldPip */,
+                                    () -> {
                                 UI_HELPER_EXECUTOR.getHandler().postDelayed(() ->
                                         ActivityManagerWrapper.getInstance().removeTask(
                                                 taskView.getTask().key.id),
@@ -2478,7 +2480,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         mPendingAnimation.addEndListener(isSuccess -> {
             if (isSuccess) {
                 // Remove all the task views now
-                switchToScreenshotAndFinishAnimationToRecents(() -> {
+                finishRecentsAnimation(true /* toRecents */, false /* shouldPip */, () -> {
                     UI_HELPER_EXECUTOR.getHandler().postDelayed(
                             ActivityManagerWrapper.getInstance()::removeAllRecentTasks,
                             REMOVE_TASK_WAIT_FOR_APP_STOP_MS);
@@ -2639,7 +2641,9 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     protected void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
         if (LIVE_TILE.get() && mEnableDrawingLiveTile && newConfig.orientation != mOrientation) {
-            switchToScreenshotAndFinishAnimationToRecents(this::updateRecentsRotation);
+            switchToScreenshot(
+                    () -> finishRecentsAnimation(true /* toRecents */, false /* showPip */,
+                            this::updateRecentsRotation));
             mEnableDrawingLiveTile = false;
         } else {
             updateRecentsRotation();
@@ -3632,10 +3636,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         }
     }
 
-    public void switchToScreenshotAndFinishAnimationToRecents(Runnable onFinishRunnable) {
-        switchToScreenshot(() -> finishRecentsAnimation(true /* toRecents */, onFinishRunnable));
-    }
-
     /**
      * Switch the current running task view to static snapshot mode,
      * capturing the snapshot at the same time.
-- 
GitLab


From 5688010306585f2aa05d259510ddd4cffeb3cfa8 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Fri, 11 Jun 2021 11:21:51 -0700
Subject: [PATCH 1395/1664] Folder polish - update color extraction, fix
 contrast issues.

- Also fixes open/close animation when items were not getting clipped
  due to folder not being measured yet.

Bug: 190210234
Bug: 190164147
Test: manual
Change-Id: I230c33d7e4e1871d8d702737c56c79ce46504b8f
Merged-In: I230c33d7e4e1871d8d702737c56c79ce46504b8f
---
 res/values-v31/colors.xml                     |   7 +-
 res/values/colors.xml                         |   3 +
 res/values/styles.xml                         |  32 +++---
 src/com/android/launcher3/folder/Folder.java  | 108 ------------------
 .../folder/FolderAnimationManager.java        |   8 +-
 5 files changed, 27 insertions(+), 131 deletions(-)

diff --git a/res/values-v31/colors.xml b/res/values-v31/colors.xml
index 1434430223..38a08948a0 100644
--- a/res/values-v31/colors.xml
+++ b/res/values-v31/colors.xml
@@ -16,7 +16,7 @@
 ** limitations under the License.
 */
 -->
-<resources>
+<resources  xmlns:android="http://schemas.android.com/apk/res/android">
     <color name="popup_color_primary_light">@android:color/system_accent2_50</color>
     <color name="popup_color_secondary_light">@android:color/system_neutral2_100</color>
     <color name="popup_color_tertiary_light">@android:color/system_neutral2_300</color>
@@ -36,7 +36,8 @@
     <color name="text_color_tertiary_dark">@android:color/system_neutral2_400</color>
 
     <color name="wallpaper_popup_scrim">@android:color/system_neutral1_900</color>
-
+    <color name="folder_background_light" android:lstar="98">@android:color/system_neutral1_50</color>
+    <color name="folder_background_dark" android:lstar="30">@android:color/system_neutral2_800</color>
+  
     <color name="folder_dot_color">@android:color/system_accent2_50</color>
-
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 7aab4fa88c..dac12ed40c 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -59,6 +59,9 @@
     <color name="folder_hint_text_color_light">#FFF</color>
     <color name="folder_hint_text_color_dark">#FF000000</color>
 
+    <color name="folder_background_light">#FFFFFF</color>
+    <color name="folder_background_dark">#FF3C4043</color>
+
     <color name="folder_dot_color">?attr/colorPrimary</color>
 
     <color name="text_color_primary_dark">#FFFFFFFF</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 571377cd3f..eceec8d989 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -48,9 +48,9 @@
         <item name="workspaceStatusBarScrim">@drawable/workspace_bg</item>
         <item name="widgetsTheme">@style/WidgetContainerTheme</item>
         <item name="folderDotColor">@color/folder_dot_color</item>
-        <item name="folderFillColor">?android:attr/colorBackgroundFloating</item>
+        <item name="folderFillColor">@color/folder_background_light</item>
         <item name="folderIconBorderColor">?android:attr/colorPrimary</item>
-        <item name="folderTextColor">?android:attr/textColorPrimary</item>
+        <item name="folderTextColor">@color/workspace_text_color_dark</item>
         <item name="isFolderDarkText">true</item>
         <item name="folderHintColor">@color/folder_hint_text_color_dark</item>
         <item name="loadingIconColor">#CCFFFFFF</item>
@@ -71,10 +71,10 @@
     </style>
 
     <style name="LauncherTheme.DarkMainColor" parent="@style/LauncherTheme">
-        <item name="folderFillColor">?android:attr/colorBackgroundFloating</item>
-        <item name="folderTextColor">?attr/workspaceTextColor</item>
-        <item name="isFolderDarkText">?attr/isWorkspaceDarkText</item>
-        <item name="folderHintColor">@color/folder_hint_text_color_dark</item>
+        <item name="folderFillColor">@color/folder_background_dark</item>
+        <item name="folderTextColor">@color/workspace_text_color_light</item>
+        <item name="isFolderDarkText">false</item>
+        <item name="folderHintColor">@color/folder_hint_text_color_light</item>
         <item name="disabledIconAlpha">.254</item>
 
     </style>
@@ -87,9 +87,9 @@
         <item name="isWorkspaceDarkText">true</item>
         <item name="workspaceStatusBarScrim">@null</item>
         <item name="folderDotColor">@color/folder_dot_color</item>
-        <item name="folderFillColor">?android:attr/colorBackgroundFloating</item>
+        <item name="folderFillColor">@color/folder_background_light</item>
         <item name="folderIconBorderColor">#FF80868B</item>
-        <item name="folderTextColor">?attr/workspaceTextColor</item>
+        <item name="folderTextColor">@color/workspace_text_color_dark</item>
         <item name="isFolderDarkText">true</item>
         <item name="folderHintColor">@color/folder_hint_text_color_dark</item>
     </style>
@@ -109,9 +109,9 @@
         <item name="popupColorTertiary">@color/popup_color_tertiary_dark</item>
         <item name="widgetsTheme">@style/WidgetContainerTheme.Dark</item>
         <item name="folderDotColor">@color/folder_dot_color</item>
-        <item name="folderFillColor">?android:attr/colorBackgroundFloating</item>
+        <item name="folderFillColor">@color/folder_background_dark</item>
         <item name="folderIconBorderColor">?android:attr/colorPrimary</item>
-        <item name="folderTextColor">?android:attr/textColorPrimary</item>
+        <item name="folderTextColor">@color/workspace_text_color_light</item>
         <item name="isFolderDarkText">false</item>
         <item name="folderHintColor">@color/folder_hint_text_color_light</item>
         <item name="isMainColorDark">true</item>
@@ -123,8 +123,8 @@
     </style>
 
     <style name="LauncherTheme.Dark.DarkMainColor" parent="@style/LauncherTheme.Dark">
-        <item name="folderFillColor">?android:attr/colorBackgroundFloating</item>
-        <item name="folderTextColor">@android:color/white</item>
+        <item name="folderFillColor">@color/folder_background_dark</item>
+        <item name="folderTextColor">@color/workspace_text_color_light</item>
         <item name="isFolderDarkText">false</item>
         <item name="folderHintColor">@color/folder_hint_text_color_light</item>
         <item name="disabledIconAlpha">.54</item>
@@ -132,16 +132,16 @@
 
     <style name="LauncherTheme.Dark.DarkText" parent="@style/LauncherTheme.Dark">
         <item name="android:colorControlHighlight">#19212121</item>
-        <item name="folderFillColor">?android:attr/colorBackgroundFloating</item>
-        <item name="folderTextColor">?attr/workspaceTextColor</item>
-        <item name="isFolderDarkText">?attr/isWorkspaceDarkText</item>
-        <item name="folderHintColor">@color/folder_hint_text_color_dark</item>
+        <item name="folderFillColor">@color/folder_background_light</item>
         <item name="workspaceTextColor">@color/workspace_text_color_dark</item>
         <item name="workspaceShadowColor">@android:color/transparent</item>
         <item name="workspaceAmbientShadowColor">@android:color/transparent</item>
         <item name="workspaceKeyShadowColor">@android:color/transparent</item>
         <item name="isWorkspaceDarkText">true</item>
         <item name="workspaceStatusBarScrim">@null</item>
+        <item name="folderTextColor">@color/workspace_text_color_dark</item>
+        <item name="isFolderDarkText">true</item>
+        <item name="folderHintColor">@color/folder_hint_text_color_dark</item>
     </style>
 
     <!-- A derivative project can extend these themes to customize the application theme without
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index dc188f27d4..5dcd75a364 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -30,17 +30,13 @@ import static com.android.launcher3.util.DisplayController.getSingleFrameMs;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
 import android.appwidget.AppWidgetHostView;
 import android.content.Context;
-import android.content.res.ColorStateList;
 import android.graphics.Canvas;
 import android.graphics.Insets;
 import android.graphics.Path;
 import android.graphics.Rect;
-import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Build;
@@ -50,7 +46,6 @@ import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.Pair;
-import android.util.SparseIntArray;
 import android.util.TypedValue;
 import android.view.FocusFinder;
 import android.view.KeyEvent;
@@ -69,7 +64,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.core.content.res.ResourcesCompat;
-import androidx.core.graphics.ColorUtils;
 
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.Alarm;
@@ -104,12 +98,10 @@ import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pageindicators.PageIndicatorDots;
 import com.android.launcher3.util.Executors;
-import com.android.launcher3.util.Themes;
 import com.android.launcher3.util.Thunk;
 import com.android.launcher3.views.ActivityContext;
 import com.android.launcher3.views.BaseDragLayer;
 import com.android.launcher3.views.ClipPathView;
-import com.android.launcher3.widget.LocalColorExtractor;
 import com.android.launcher3.widget.PendingAddShortcutInfo;
 
 import java.util.ArrayList;
@@ -169,11 +161,6 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
     private static final Rect sTempRect = new Rect();
     private static final int MIN_FOLDERS_FOR_HARDWARE_OPTIMIZATION = 10;
 
-    // Index used to get background color when using local wallpaper color extraction,
-    private static final int DARK_COLOR_EXTRACTION_INDEX = android.R.color.system_neutral1_900;
-    private static final int LIGHT_COLOR_EXTRACTION_INDEX = android.R.color.system_neutral2_500;
-    private static final int LIGHT_COLOR_L_STAR = 98;
-
     private final Alarm mReorderAlarm = new Alarm();
     private final Alarm mOnExitAlarm = new Alarm();
     private final Alarm mOnScrollHintAlarm = new Alarm();
@@ -241,17 +228,6 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
 
     @Nullable private FolderWindowInsetsAnimationCallback mFolderWindowInsetsAnimationCallback;
 
-    // Wallpaper local color extraction
-    @Nullable private LocalColorExtractor mColorExtractor;
-    @Nullable private LocalColorExtractor.Listener mColorListener;
-
-    // For simplicity, we start the color change only after the open animation has started.
-    private Runnable mColorChangeRunnable;
-    private Animator mColorChangeAnimator;
-    // The background color animator used in the folder open animation. We keep a reference to this,
-    // so that we can cancel it when starting mColorChangeAnimator.
-    private ObjectAnimator mOpenAnimationColorChangeAnimator;
-
     private GradientDrawable mBackground;
 
     /**
@@ -315,64 +291,6 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
 
             setWindowInsetsAnimationCallback(mFolderWindowInsetsAnimationCallback);
         }
-
-        if (Utilities.ATLEAST_S) {
-            boolean isFolderDarkText = Themes.getAttrBoolean(getContext(), R.attr.isFolderDarkText);
-            mColorExtractor = LocalColorExtractor.newInstance(getContext());
-            mColorListener = (RectF rect, SparseIntArray extractedColors) -> {
-                mColorChangeRunnable = () -> {
-                    mColorChangeRunnable = null;
-                    int duration = FOLDER_COLOR_ANIMATION_DURATION;
-
-                    // Cancel the open animation color change animator.
-                    ObjectAnimator existingAnim = mOpenAnimationColorChangeAnimator;
-                    if (existingAnim != null && existingAnim.isRunning()) {
-                        duration = (int) Math.max(FOLDER_COLOR_ANIMATION_DURATION,
-                                existingAnim.getDuration() * (1f - existingAnim.getDuration()));
-                        existingAnim.cancel();
-                        mOpenAnimationColorChangeAnimator = null;
-                    }
-
-                    // Start a new animator to the extracted color. Clamp down on the alpha
-                    // to prevent folder from being transparent for too long.
-                    GradientDrawable bg = (GradientDrawable) getBackground();
-                    int currentColor = ColorUtils.setAlphaComponent(bg.getColor().getDefaultColor(),
-                            255);
-                    int newColor = getExtractedColor(extractedColors, isFolderDarkText);
-                    mColorChangeAnimator = ObjectAnimator.ofArgb(bg, "color", currentColor,
-                            newColor).setDuration(duration);
-                    mColorChangeAnimator.addListener(new AnimatorListenerAdapter() {
-                        @Override
-                        public void onAnimationEnd(Animator animation) {
-                            mColorChangeAnimator = null;
-                        }
-                    });
-                    mColorChangeAnimator.start();
-                };
-
-                // If the folder open animation has started, we can start the color change now.
-                // Otherwise we wait for it to start.
-                if (mOpenAnimationColorChangeAnimator != null
-                        && mOpenAnimationColorChangeAnimator.isStarted()) {
-                    post(mColorChangeRunnable);
-                }
-            };
-        }
-    }
-
-    /**
-     * Returns an index used to query the color of interest from the list of extracted colors.
-     * @param hasDarkText True when dark index is wanted, False when light index is wanted.
-     */
-    @TargetApi(Build.VERSION_CODES.S)
-    private int getExtractedColor(SparseIntArray colors, boolean hasDarkText) {
-        int color = colors.get(hasDarkText
-                ? LIGHT_COLOR_EXTRACTION_INDEX
-                : DARK_COLOR_EXTRACTION_INDEX);
-        if (hasDarkText) {
-            color = ColorStateList.valueOf(color).withLStar(LIGHT_COLOR_L_STAR).getDefaultColor();
-        }
-        return color;
     }
 
     public boolean onLongClick(View v) {
@@ -753,15 +671,11 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         cancelRunningAnimations();
         FolderAnimationManager fam = new FolderAnimationManager(this, true /* isOpening */);
         AnimatorSet anim = fam.getAnimator();
-        mOpenAnimationColorChangeAnimator = fam.getBgColorAnimator();
         anim.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationStart(Animator animation) {
                 mFolderIcon.setIconVisible(false);
                 mFolderIcon.drawLeaveBehindIfExists();
-                if (mColorChangeRunnable != null) {
-                    mColorChangeRunnable.run();
-                }
             }
             @Override
             public void onAnimationEnd(Animator animation) {
@@ -857,9 +771,6 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         if (mCurrentAnimator != null && mCurrentAnimator.isRunning()) {
             mCurrentAnimator.cancel();
         }
-        if (mColorChangeAnimator != null && mColorChangeAnimator.isRunning()) {
-            mColorChangeAnimator.cancel();
-        }
     }
 
     private void animateClosed() {
@@ -945,19 +856,6 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         clearDragInfo();
         mState = STATE_SMALL;
         mContent.setCurrentPage(0);
-
-        mOpenAnimationColorChangeAnimator = null;
-        mColorChangeRunnable = null;
-        if (mColorChangeAnimator != null) {
-            mColorChangeAnimator.cancel();
-            mColorChangeAnimator = null;
-        }
-        if (mColorExtractor != null) {
-            mColorExtractor.removeLocations();
-            mColorExtractor.setListener(null);
-        }
-        GradientDrawable bg = (GradientDrawable) getBackground();
-        bg.setColor(Themes.getAttrColor(getContext(), R.attr.folderFillColor));
     }
 
     @Override
@@ -1227,12 +1125,6 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         lp.y = top;
 
         mBackground.setBounds(0, 0, width, height);
-
-        if (mColorExtractor != null) {
-            mColorExtractor.removeLocations();
-            mColorExtractor.setListener(mColorListener);
-            mLauncherDelegate.addRectForColorExtraction(lp, mColorExtractor);
-        }
     }
 
     protected int getContentAreaHeight() {
diff --git a/src/com/android/launcher3/folder/FolderAnimationManager.java b/src/com/android/launcher3/folder/FolderAnimationManager.java
index e66e2f6fc1..57b289ec34 100644
--- a/src/com/android/launcher3/folder/FolderAnimationManager.java
+++ b/src/com/android/launcher3/folder/FolderAnimationManager.java
@@ -239,13 +239,13 @@ public class FolderAnimationManager {
                 mFolder, startRect, endRect, finalRadius, !mIsOpening));
 
         // Create reveal animator for the folder content (capture the top 4 icons 2x2)
-        int width = mContent.getPaddingLeft() + mDeviceProfile.folderCellLayoutBorderSpacingPx
+        int width = mDeviceProfile.folderCellLayoutBorderSpacingPx
                 + mDeviceProfile.folderCellWidthPx * 2;
-        int height = mContent.getPaddingTop() + mDeviceProfile.folderCellLayoutBorderSpacingPx
+        int height = mDeviceProfile.folderCellLayoutBorderSpacingPx
                 + mDeviceProfile.folderCellHeightPx * 2;
         int page = mIsOpening ? mContent.getCurrentPage() : mContent.getDestinationPage();
-        int left = mContent.getPaddingLeft() + page * mContent.getWidth();
-        Rect contentStart = new Rect(left, 0, left + width, height);
+        int left = mContent.getPaddingLeft() + page * lp.width;
+        Rect contentStart = new Rect(0, 0, width, height);
         Rect contentEnd = new Rect(endRect.left + left, endRect.top, endRect.right + left,
                 endRect.bottom);
         play(a, getShape().createRevealAnimator(
-- 
GitLab


From d85735db479ddaa7472f54176837bf9566556b8f Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Mon, 14 Jun 2021 13:37:08 -0500
Subject: [PATCH 1396/1664] Update all apps divider to pill shape

Screenshot: https://screenshot.googleplex.com/4AJFL7MjJuZr7tf
Bug: 188946089
Test: local
Change-Id: If45512b24caefc66725892ab8429afd3d9ce20c8
---
 .../appprediction/AppsDividerView.java         | 18 +++++++++++-------
 res/values/dimens.xml                          |  3 ++-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java b/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java
index d17a5aed9b..63a569a65c 100644
--- a/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java
+++ b/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java
@@ -74,6 +74,8 @@ public class AppsDividerView extends View implements StateListener<LauncherState
 
     private boolean mIsScrolledOut = false;
 
+    private final int[] mDividerSize;
+
     public AppsDividerView(Context context) {
         this(context, null);
     }
@@ -87,8 +89,10 @@ public class AppsDividerView extends View implements StateListener<LauncherState
         mLauncher = Launcher.getLauncher(context);
 
         boolean isMainColorDark = Themes.getAttrBoolean(context, R.attr.isMainColorDark);
-        mPaint.setStrokeWidth(
-                getResources().getDimensionPixelSize(R.dimen.all_apps_divider_height));
+        mDividerSize = new int[]{
+                getResources().getDimensionPixelSize(R.dimen.all_apps_divider_width),
+                getResources().getDimensionPixelSize(R.dimen.all_apps_divider_height)
+        };
 
         mStrokeColor = ContextCompat.getColor(context, isMainColorDark
                 ? R.color.all_apps_prediction_row_separator_dark
@@ -187,11 +191,11 @@ public class AppsDividerView extends View implements StateListener<LauncherState
     @Override
     protected void onDraw(Canvas canvas) {
         if (mDividerType == DividerType.LINE) {
-            int side = getResources().getDimensionPixelSize(R.dimen.dynamic_grid_edge_margin);
-            int y = getHeight() - (getPaddingBottom() / 2);
-            int x1 = getPaddingLeft() + side;
-            int x2 = getWidth() - getPaddingRight() - side;
-            canvas.drawLine(x1, y, x2, y, mPaint);
+            int l = (getWidth() - getPaddingLeft() - mDividerSize[0]) / 2;
+            int t = getHeight() - (getPaddingBottom() / 2);
+            int radius = mDividerSize[1];
+            canvas.drawRoundRect(l, t, l + mDividerSize[0], t + mDividerSize[1], radius, radius,
+                    mPaint);
         } else if (mDividerType == DividerType.ALL_APPS_LABEL) {
             Layout textLayout = getAllAppsLabelLayout();
             int x = getWidth() / 2 - textLayout.getWidth() / 2;
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 06bdd499c5..f0cc64ed16 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -102,7 +102,8 @@
     <dimen name="all_apps_work_profile_tab_footer_top_padding">16dp</dimen>
     <dimen name="all_apps_work_profile_tab_footer_bottom_padding">20dp</dimen>
     <dimen name="all_apps_tabs_vertical_padding">6dp</dimen>
-    <dimen name="all_apps_divider_height">1dp</dimen>
+    <dimen name="all_apps_divider_height">2dp</dimen>
+    <dimen name="all_apps_divider_width">128dp</dimen>
 
     <dimen name="all_apps_tip_bottom_margin">8dp</dimen>
     <!-- The size of corner radius of the arrow in the arrow toast. -->
-- 
GitLab


From 7d3f73c8569b2c162ca80b56a7cefc6a374b9e7b Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Thu, 10 Jun 2021 11:39:32 -0700
Subject: [PATCH 1397/1664] Excluding corner radius from quick switch gesture.

Test: forrest on new devices
Bug: 190638716

Change-Id: Iefa89e040ab77869db7022d7c535a5546e03ae3c
---
 .../android/launcher3/tapl/Background.java    | 21 ++++++------
 .../tapl/LauncherInstrumentation.java         | 29 +++++++++++++++++
 .../com/android/launcher3/tapl/Workspace.java | 32 +------------------
 3 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/Background.java b/tests/tapl/com/android/launcher3/tapl/Background.java
index 4a666b17f3..e86be2af1e 100644
--- a/tests/tapl/com/android/launcher3/tapl/Background.java
+++ b/tests/tapl/com/android/launcher3/tapl/Background.java
@@ -163,8 +163,8 @@ public class Background extends LauncherInstrumentation.VisibleContainer {
     @NonNull
     private void quickSwitch(boolean toRight) {
         try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck();
-            LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
-                    "want to quick switch to the previous app")) {
+             LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
+                     "want to quick switch to the previous app")) {
             verifyActiveContainer();
             final boolean launcherWasVisible = mLauncher.isLauncherVisible();
             boolean transposeInLandscape = false;
@@ -177,33 +177,34 @@ public class Background extends LauncherInstrumentation.VisibleContainer {
                     final int startY;
                     final int endX;
                     final int endY;
+                    final int cornerRadius = (int) Math.ceil(mLauncher.getWindowCornerRadius());
                     if (toRight) {
                         if (mLauncher.getDevice().isNaturalOrientation() || !transposeInLandscape) {
                             // Swipe from the bottom left to the bottom right of the screen.
-                            startX = 0;
+                            startX = cornerRadius;
                             startY = getSwipeStartY();
-                            endX = mLauncher.getDevice().getDisplayWidth();
+                            endX = mLauncher.getDevice().getDisplayWidth() - cornerRadius;
                             endY = startY;
                         } else {
                             // Swipe from the bottom right to the top right of the screen.
                             startX = getSwipeStartX();
-                            startY = mLauncher.getRealDisplaySize().y - 1;
+                            startY = mLauncher.getRealDisplaySize().y - 1 - cornerRadius;
                             endX = startX;
-                            endY = 0;
+                            endY = cornerRadius;
                         }
                     } else {
                         if (mLauncher.getDevice().isNaturalOrientation() || !transposeInLandscape) {
                             // Swipe from the bottom right to the bottom left of the screen.
-                            startX = mLauncher.getDevice().getDisplayWidth();
+                            startX = mLauncher.getDevice().getDisplayWidth() - cornerRadius;
                             startY = getSwipeStartY();
-                            endX = 0;
+                            endX = cornerRadius;
                             endY = startY;
                         } else {
                             // Swipe from the bottom left to the top left of the screen.
                             startX = getSwipeStartX();
-                            startY = 0;
+                            startY = cornerRadius;
                             endX = startX;
-                            endY = mLauncher.getRealDisplaySize().y - 1;
+                            endY = mLauncher.getRealDisplaySize().y - 1 - cornerRadius;
                         }
                     }
 
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 426af19084..f5c1efa07e 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -1450,4 +1450,33 @@ public final class LauncherInstrumentation {
             return null;
         }
     }
+
+    float getWindowCornerRadius() {
+        final Resources resources = getResources();
+        if (!supportsRoundedCornersOnWindows(resources)) {
+            return 0f;
+        }
+
+        // Radius that should be used in case top or bottom aren't defined.
+        float defaultRadius = ResourceUtils.getDimenByName("rounded_corner_radius", resources, 0);
+
+        float topRadius = ResourceUtils.getDimenByName("rounded_corner_radius_top", resources, 0);
+        if (topRadius == 0f) {
+            topRadius = defaultRadius;
+        }
+        float bottomRadius = ResourceUtils.getDimenByName(
+                "rounded_corner_radius_bottom", resources, 0);
+        if (bottomRadius == 0f) {
+            bottomRadius = defaultRadius;
+        }
+
+        // Always use the smallest radius to make sure the rounded corners will
+        // completely cover the display.
+        return Math.min(topRadius, bottomRadius);
+    }
+
+    private static boolean supportsRoundedCornersOnWindows(Resources resources) {
+        return ResourceUtils.getBoolByName(
+                "config_supportsRoundedCornersOnWindows", resources, false);
+    }
 }
\ No newline at end of file
diff --git a/tests/tapl/com/android/launcher3/tapl/Workspace.java b/tests/tapl/com/android/launcher3/tapl/Workspace.java
index 36246245bd..1ea0922029 100644
--- a/tests/tapl/com/android/launcher3/tapl/Workspace.java
+++ b/tests/tapl/com/android/launcher3/tapl/Workspace.java
@@ -22,7 +22,6 @@ import static com.android.launcher3.testing.TestProtocol.SPRING_LOADED_STATE_ORD
 
 import static junit.framework.TestCase.assertTrue;
 
-import android.content.res.Resources;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.os.SystemClock;
@@ -61,34 +60,6 @@ public final class Workspace extends Home {
         mHotseat = launcher.waitForLauncherObject("hotseat");
     }
 
-    private static boolean supportsRoundedCornersOnWindows(Resources resources) {
-        return ResourceUtils.getBoolByName(
-                "config_supportsRoundedCornersOnWindows", resources, false);
-    }
-
-    private static float getWindowCornerRadius(Resources resources) {
-        if (!supportsRoundedCornersOnWindows(resources)) {
-            return 0f;
-        }
-
-        // Radius that should be used in case top or bottom aren't defined.
-        float defaultRadius = ResourceUtils.getDimenByName("rounded_corner_radius", resources, 0);
-
-        float topRadius = ResourceUtils.getDimenByName("rounded_corner_radius_top", resources, 0);
-        if (topRadius == 0f) {
-            topRadius = defaultRadius;
-        }
-        float bottomRadius = ResourceUtils.getDimenByName(
-                "rounded_corner_radius_bottom", resources, 0);
-        if (bottomRadius == 0f) {
-            bottomRadius = defaultRadius;
-        }
-
-        // Always use the smallest radius to make sure the rounded corners will
-        // completely cover the display.
-        return Math.min(topRadius, bottomRadius);
-    }
-
     /**
      * Swipes up to All Apps.
      *
@@ -103,8 +74,7 @@ public final class Workspace extends Home {
             final int deviceHeight = mLauncher.getDevice().getDisplayHeight();
             final int bottomGestureMargin = ResourceUtils.getNavbarSize(
                     ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE, mLauncher.getResources());
-            final int windowCornerRadius = (int) Math.ceil(getWindowCornerRadius(
-                    mLauncher.getResources()));
+            final int windowCornerRadius = (int) Math.ceil(mLauncher.getWindowCornerRadius());
             final int startY = deviceHeight - Math.max(bottomGestureMargin, windowCornerRadius) - 1;
             final int swipeHeight = mLauncher.getTestInfo(
                     TestProtocol.REQUEST_HOME_TO_ALL_APPS_SWIPE_HEIGHT).
-- 
GitLab


From 200c734e8ec2cbd3e1db566e6c57afdc5fabd251 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Mon, 14 Jun 2021 16:04:18 -0500
Subject: [PATCH 1398/1664] [Build Blocking] Fix conflicting resource IDs for
 work tab

Bug: 186857875
Bug: 191080190
Test: local
Change-Id: I7adbd79a061af4d07c7426db1496f8c319902266
---
 res/drawable/work_apps_toggle_background.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/drawable/work_apps_toggle_background.xml b/res/drawable/work_apps_toggle_background.xml
index cb8b8e2a42..b7115f86b5 100644
--- a/res/drawable/work_apps_toggle_background.xml
+++ b/res/drawable/work_apps_toggle_background.xml
@@ -24,7 +24,7 @@
     <item>
         <shape android:shape="rectangle">
             <corners android:radius="@dimen/work_fab_radius" />
-            <solid android:color="@color/all_apps_tab_bg" />
+            <solid android:color="@color/all_apps_tab_background_selected" />
             <padding android:left="@dimen/work_fab_radius" android:right="@dimen/work_fab_radius" />
         </shape>
     </item>
-- 
GitLab


From a5e145377938b589996b86703e03fd396fd36596 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 14 Jun 2021 23:59:28 +0100
Subject: [PATCH 1399/1664] Reattach LauncherAppWidgetHostView to its parent
 after canceling drag

onDrop isn't called if the drag is canceled at Launcher.onPause. Let's
also reattach LauncherAppWidgetHostView to its parent in this case.

Test: long press and hold a widget and, at the same time, press the
      power button. Don't let go of the long press and press the power
      button. No crash observed.
Fix: 190950646
Change-Id: Id52a51291863b7ef63c861eb6dc23b015484be65
---
 src/com/android/launcher3/Workspace.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 2e1cc58aa0..303bb01df0 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2791,6 +2791,10 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
                 removeWorkspaceItem(mDragInfo.cell);
             }
         } else if (mDragInfo != null) {
+            // When drag is cancelled, reattach content view back to its original parent.
+            if (mDragInfo.cell instanceof LauncherAppWidgetHostView) {
+                d.dragView.detachContentView(/* reattachToPreviousParent= */ true);
+            }
             final CellLayout cellLayout = mLauncher.getCellLayout(
                     mDragInfo.container, mDragInfo.screenId);
             if (cellLayout != null) {
-- 
GitLab


From 0750f03c9679746c526cf7117eb6c993644cb0d3 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Fri, 11 Jun 2021 16:30:47 -0700
Subject: [PATCH 1400/1664] Address LAUNCHER_APP_LAUNCH_FROM_ICON jank.

- Delay app launch animations by a frame, and skip logic to skip the first frame.
- Note the icon pressed state animation still occurs, so there is still some
  visual feedback for the user that something is happening.

Bug: 181901105
Test: ensure animation still looks smooth (using window animation scale & record in slow mo)
Change-Id: Ia904b8b96301042c900e0589f33fc625c1c1148b
Merged-In: Ia904b8b96301042c900e0589f33fc625c1c1148b
---
 .../launcher3/LauncherAnimationRunner.java    | 16 ++++---
 .../launcher3/QuickstepTransitionManager.java | 47 ++++++++++++++-----
 .../android/quickstep/RecentsActivity.java    |  6 ++-
 .../com/android/quickstep/TaskViewUtils.java  |  2 +-
 .../util/MultiValueUpdateListener.java        |  8 +++-
 .../quickstep/util/RectFSpringAnim2.java      |  2 +-
 .../quickstep/views/AllAppsEduView.java       |  2 +-
 .../launcher3/views/FloatingIconView.java     |  1 +
 8 files changed, 59 insertions(+), 25 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
index be98157b1b..1090099d2f 100644
--- a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
+++ b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
@@ -152,16 +152,18 @@ public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCo
 
         @UiThread
         public void setAnimation(AnimatorSet animation, Context context) {
-            setAnimation(animation, context, null);
+            setAnimation(animation, context, null, true);
 
         }
 
         /**
          * Sets the animation to play for this app launch
+         * @param skipFirstFrame Iff true, we skip the first frame of the animation.
+         *                       We set to false when skipping first frame causes jank.
          */
         @UiThread
         public void setAnimation(AnimatorSet animation, Context context,
-                @Nullable Runnable onCompleteCallback) {
+                @Nullable Runnable onCompleteCallback, boolean skipFirstFrame) {
             if (mInitialized) {
                 throw new IllegalStateException("Animation already initialized");
             }
@@ -187,10 +189,12 @@ public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCo
                 });
                 mAnimator.start();
 
-                // Because t=0 has the app icon in its original spot, we can skip the
-                // first frame and have the same movement one frame earlier.
-                mAnimator.setCurrentPlayTime(
-                        Math.min(getSingleFrameMs(context), mAnimator.getTotalDuration()));
+                if (skipFirstFrame) {
+                    // Because t=0 has the app icon in its original spot, we can skip the
+                    // first frame and have the same movement one frame earlier.
+                    mAnimator.setCurrentPlayTime(
+                            Math.min(getSingleFrameMs(context), mAnimator.getTotalDuration()));
+                }
             }
         }
     }
diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 26d407fb96..65df237e5f 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -38,6 +38,7 @@ import static com.android.launcher3.config.FeatureFlags.KEYGUARD_ANIMATION;
 import static com.android.launcher3.config.FeatureFlags.SEPARATE_RECENTS_ACTIVITY;
 import static com.android.launcher3.dragndrop.DragLayer.ALPHA_INDEX_TRANSITIONS;
 import static com.android.launcher3.statehandlers.DepthController.DEPTH;
+import static com.android.launcher3.util.DisplayController.getSingleFrameMs;
 import static com.android.quickstep.TaskUtils.taskIsATargetWithMode;
 import static com.android.quickstep.TaskViewUtils.findTaskViewToLaunch;
 import static com.android.systemui.shared.system.QuickStepContract.getWindowCornerRadius;
@@ -340,12 +341,17 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
 
         final int rotationChange = getRotationChange(appTargets);
         // Note: the targetBounds are relative to the launcher
+        int startDelay = getSingleFrameMs(mLauncher);
         Rect windowTargetBounds = getWindowTargetBounds(appTargets, rotationChange);
-        anim.play(getOpeningWindowAnimators(v, appTargets, wallpaperTargets, nonAppTargets,
-                windowTargetBounds, areAllTargetsTranslucent(appTargets), rotationChange));
+        Animator windowAnimator = getOpeningWindowAnimators(v, appTargets, wallpaperTargets,
+                nonAppTargets, windowTargetBounds, areAllTargetsTranslucent(appTargets),
+                rotationChange);
+        windowAnimator.setStartDelay(startDelay);
+        anim.play(windowAnimator);
         if (launcherClosing) {
+            // Delay animation by a frame to avoid jank.
             Pair<AnimatorSet, Runnable> launcherContentAnimator =
-                    getLauncherContentAnimator(true /* isAppOpening */);
+                    getLauncherContentAnimator(true /* isAppOpening */, startDelay);
             anim.play(launcherContentAnimator.first);
             anim.addListener(new AnimatorListenerAdapter() {
                 @Override
@@ -436,8 +442,10 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
      *
      * @param isAppOpening True when this is called when an app is opening.
      *                     False when this is called when an app is closing.
+     * @param startDelay Start delay duration.
      */
-    private Pair<AnimatorSet, Runnable> getLauncherContentAnimator(boolean isAppOpening) {
+    private Pair<AnimatorSet, Runnable> getLauncherContentAnimator(boolean isAppOpening,
+            int startDelay) {
         AnimatorSet launcherAnimator = new AnimatorSet();
         Runnable endListener;
 
@@ -528,6 +536,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                 mLauncher.getWorkspace().getPageIndicator().skipAnimationsToEnd();
             };
         }
+
+        launcherAnimator.setStartDelay(startDelay);
         return new Pair<>(launcherAnimator, endListener);
     }
 
@@ -633,7 +643,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                 ? 0 : getWindowCornerRadius(mLauncher.getResources());
         final float finalShadowRadius = appTargetsAreTranslucent ? 0 : mMaxShadowRadius;
 
-        appAnimator.addUpdateListener(new MultiValueUpdateListener() {
+        MultiValueUpdateListener listener = new MultiValueUpdateListener() {
             FloatProp mDx = new FloatProp(0, prop.dX, 0, prop.xDuration, AGGRESSIVE_EASE);
             FloatProp mDy = new FloatProp(0, prop.dY, 0, prop.yDuration, AGGRESSIVE_EASE);
 
@@ -662,7 +672,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                     ANIMATION_NAV_FADE_IN_DURATION, NAV_FADE_IN_INTERPOLATOR);
 
             @Override
-            public void onUpdate(float percent) {
+            public void onUpdate(float percent, boolean initOnly) {
                 // Calculate the size of the scaled icon.
                 float iconWidth = launcherIconBounds.width() * mIconScaleToFitScreen.value;
                 float iconHeight = launcherIconBounds.height() * mIconScaleToFitScreen.value;
@@ -707,6 +717,12 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                 floatingIconBounds.right += offsetX;
                 floatingIconBounds.bottom += offsetY;
 
+                if (initOnly) {
+                    floatingView.update(mIconAlpha.value, 255, floatingIconBounds, percent, 0f,
+                            mWindowRadius.value * scale, true /* isOpening */);
+                    return;
+                }
+
                 ArrayList<SurfaceParams> params = new ArrayList<>();
                 for (int i = appTargets.length - 1; i >= 0; i--) {
                     RemoteAnimationTargetCompat target = appTargets[i];
@@ -779,7 +795,10 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
 
                 surfaceApplier.scheduleApply(params.toArray(new SurfaceParams[params.size()]));
             }
-        });
+        };
+        appAnimator.addUpdateListener(listener);
+        // Since we added a start delay, call update here to init the FloatingIconView properly.
+        listener.onUpdate(0, true /* initOnly */);
 
         animatorSet.playTogether(appAnimator, getBackgroundAnimator(appTargets));
         return animatorSet;
@@ -869,7 +888,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                     ANIMATION_NAV_FADE_IN_DURATION, NAV_FADE_IN_INTERPOLATOR);
 
             @Override
-            public void onUpdate(float percent) {
+            public void onUpdate(float percent, boolean initOnly) {
                 widgetBackgroundBounds.set(mDx.value - mWidth.value / 2f,
                         mDy.value - mHeight.value / 2f, mDx.value + mWidth.value / 2f,
                         mDy.value + mHeight.value / 2f);
@@ -1128,7 +1147,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                     DEACCEL_1_7);
 
             @Override
-            public void onUpdate(float percent) {
+            public void onUpdate(float percent, boolean initOnly) {
                 SurfaceParams[] params = new SurfaceParams[appTargets.length];
                 for (int i = appTargets.length - 1; i >= 0; i--) {
                     RemoteAnimationTargetCompat target = appTargets[i];
@@ -1278,8 +1297,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
 
                     if (mLauncher.isInState(LauncherState.ALL_APPS)) {
                         Pair<AnimatorSet, Runnable> contentAnimator =
-                                getLauncherContentAnimator(false /* isAppOpening */);
-                        contentAnimator.first.setStartDelay(LAUNCHER_RESUME_START_DELAY);
+                                getLauncherContentAnimator(false, LAUNCHER_RESUME_START_DELAY);
                         anim.play(contentAnimator.first);
                         anim.addListener(new AnimatorListenerAdapter() {
                             @Override
@@ -1328,27 +1346,32 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
 
             final boolean launchingFromWidget = mV instanceof LauncherAppWidgetHostView;
             final boolean launchingFromRecents = isLaunchingFromRecents(mV, appTargets);
+            final boolean skipFirstFrame;
             if (launchingFromWidget) {
                 composeWidgetLaunchAnimator(anim, (LauncherAppWidgetHostView) mV, appTargets,
                         wallpaperTargets, nonAppTargets);
                 addCujInstrumentation(
                         anim, InteractionJankMonitorWrapper.CUJ_APP_LAUNCH_FROM_WIDGET);
+                skipFirstFrame = true;
             } else if (launchingFromRecents) {
                 composeRecentsLaunchAnimator(anim, mV, appTargets, wallpaperTargets, nonAppTargets,
                         launcherClosing);
                 addCujInstrumentation(
                         anim, InteractionJankMonitorWrapper.CUJ_APP_LAUNCH_FROM_RECENTS);
+                skipFirstFrame = true;
             } else {
                 composeIconLaunchAnimator(anim, mV, appTargets, wallpaperTargets, nonAppTargets,
                         launcherClosing);
                 addCujInstrumentation(anim, InteractionJankMonitorWrapper.CUJ_APP_LAUNCH_FROM_ICON);
+                skipFirstFrame = false;
             }
 
             if (launcherClosing) {
                 anim.addListener(mForceInvisibleListener);
             }
 
-            result.setAnimation(anim, mLauncher, mOnEndCallback::executeAllAndDestroy);
+            result.setAnimation(anim, mLauncher, mOnEndCallback::executeAllAndDestroy,
+                    skipFirstFrame);
         }
     }
 
diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index 68526420ef..e15066f9c1 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -214,7 +214,8 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
             AnimatorSet anim = composeRecentsLaunchAnimator(taskView, appTargets,
                     wallpaperTargets, nonAppTargets);
             anim.addListener(resetStateListener());
-            result.setAnimation(anim, RecentsActivity.this, onEndCallback::executeAllAndDestroy);
+            result.setAnimation(anim, RecentsActivity.this, onEndCallback::executeAllAndDestroy,
+                    true /* skipFirstFrame */);
         };
 
         final LauncherAnimationRunner wrapper = new WrappedLauncherAnimationRunner<>(
@@ -385,7 +386,8 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
         anim.play(controller.getAnimationPlayer());
         anim.setDuration(HOME_APPEAR_DURATION);
         result.setAnimation(anim, this,
-                () -> getStateManager().goToState(RecentsState.HOME, false));
+                () -> getStateManager().goToState(RecentsState.HOME, false),
+                true /* skipFirstFrame */);
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java
index 59bd1ed9ea..3293810582 100644
--- a/quickstep/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java
@@ -249,7 +249,7 @@ public final class TaskViewUtils {
                             ANIMATION_NAV_FADE_IN_DURATION, NAV_FADE_IN_INTERPOLATOR);
 
                     @Override
-                    public void onUpdate(float percent) {
+                    public void onUpdate(float percent, boolean initOnly) {
                         final SurfaceParams.Builder navBuilder =
                                 new SurfaceParams.Builder(navBarTarget.leash);
                         if (mNavFadeIn.value > mNavFadeIn.getStartValue()) {
diff --git a/quickstep/src/com/android/quickstep/util/MultiValueUpdateListener.java b/quickstep/src/com/android/quickstep/util/MultiValueUpdateListener.java
index b4ae1ca7fb..1c3c9c2fae 100644
--- a/quickstep/src/com/android/quickstep/util/MultiValueUpdateListener.java
+++ b/quickstep/src/com/android/quickstep/util/MultiValueUpdateListener.java
@@ -40,10 +40,14 @@ public abstract class MultiValueUpdateListener implements ValueAnimator.Animator
             newPercent = prop.mInterpolator.getInterpolation(newPercent);
             prop.value = prop.mEnd * newPercent + prop.mStart * (1 - newPercent);
         }
-        onUpdate(percent);
+        onUpdate(percent, false /* initOnly */);
     }
 
-    public abstract void onUpdate(float percent);
+    /**
+     * @param percent The total animation progress.
+     * @param initOnly When true, only does enough work to initialize the animation.
+     */
+    public abstract void onUpdate(float percent, boolean initOnly);
 
     public final class FloatProp {
 
diff --git a/quickstep/src/com/android/quickstep/util/RectFSpringAnim2.java b/quickstep/src/com/android/quickstep/util/RectFSpringAnim2.java
index 93b34822ad..c331a136d9 100644
--- a/quickstep/src/com/android/quickstep/util/RectFSpringAnim2.java
+++ b/quickstep/src/com/android/quickstep/util/RectFSpringAnim2.java
@@ -280,7 +280,7 @@ public class RectFSpringAnim2 extends RectFSpringAnim {
             }
 
             @Override
-            public void onUpdate(float percent) {}
+            public void onUpdate(float percent, boolean initOnly) {}
         };
     }
 
diff --git a/quickstep/src/com/android/quickstep/views/AllAppsEduView.java b/quickstep/src/com/android/quickstep/views/AllAppsEduView.java
index 00993e3658..f67940ab56 100644
--- a/quickstep/src/com/android/quickstep/views/AllAppsEduView.java
+++ b/quickstep/src/com/android/quickstep/views/AllAppsEduView.java
@@ -173,7 +173,7 @@ public class AllAppsEduView extends AbstractFloatingView {
             FloatProp mGradientAlpha = new FloatProp(0, 255, firstPart, secondPart * 0.3f, LINEAR);
 
             @Override
-            public void onUpdate(float progress) {
+            public void onUpdate(float progress, boolean initOnly) {
                 temp.set(circleBoundsOg);
                 temp.offset(0, (int) -mDeltaY.value);
                 Utilities.scaleRectAboutCenter(temp, mCircleScale.value);
diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java
index 25cce69063..3027db6c16 100644
--- a/src/com/android/launcher3/views/FloatingIconView.java
+++ b/src/com/android/launcher3/views/FloatingIconView.java
@@ -376,6 +376,7 @@ public class FloatingIconView extends FrameLayout implements
             if (mIconLoadResult.isIconLoaded) {
                 setIcon(mIconLoadResult.drawable, mIconLoadResult.badge,
                         mIconLoadResult.btvDrawable, mIconLoadResult.iconOffset);
+                setVisibility(VISIBLE);
                 setIconAndDotVisible(originalView, false);
             } else {
                 mIconLoadResult.onIconLoaded = () -> {
-- 
GitLab


From 1c2d522d1b2112b5a2b8925868938c359fa09664 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 8 Jun 2021 11:50:13 -0700
Subject: [PATCH 1401/1664] Don't rely on intent to call back from activity
 tracker

- The intent is not updated in certain cases which means that the
  callback may not be made if Launcher gets recreated. Instead
  have the tracker manage the set of registered callbacks.
- This change allows AbsSwipeUpHandler to continue to receive
  onActivityInit calls even if Launcher restarts, and also to
  handle a case where restarting while waiting for a page-settling
  callback will continue to finish the gesture.

Bug: 183962705
Test: Force recreate at various points in the gesture

Change-Id: Ib5ead8c868e798e26e56776f57bd715c79d087cd
---
 .../hybridhotseat/HotseatEduActivity.java     |  4 +-
 .../android/quickstep/AbsSwipeUpHandler.java  | 12 ++-
 .../quickstep/OverviewCommandHelper.java      |  5 +-
 .../android/quickstep/RecentsActivity.java    |  2 +-
 .../OtherActivityInputConsumer.java           |  4 +-
 .../quickstep/util/ActivityInitListener.java  | 15 ++--
 src/com/android/launcher3/Launcher.java       |  2 +-
 .../launcher3/dragndrop/AddItemActivity.java  |  2 +-
 .../launcher3/states/RotationHelper.java      |  3 +-
 .../launcher3/util/ActivityTracker.java       | 73 +++++++++----------
 10 files changed, 62 insertions(+), 60 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduActivity.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduActivity.java
index 3a1a2f7ae2..3a7d821ed6 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduActivity.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduActivity.java
@@ -21,6 +21,7 @@ import android.content.Intent;
 import android.os.Bundle;
 
 import com.android.launcher3.BaseActivity;
+import com.android.launcher3.Launcher;
 import com.android.launcher3.uioverrides.QuickstepLauncher;
 import com.android.launcher3.util.ActivityTracker;
 
@@ -37,7 +38,8 @@ public class HotseatEduActivity extends Activity {
                 .addCategory(Intent.CATEGORY_HOME)
                 .setPackage(getPackageName())
                 .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        new HotseatActivityTracker<>().addToIntent(homeIntent);
+
+        Launcher.ACTIVITY_TRACKER.registerCallback(new HotseatActivityTracker());
         startActivity(homeIntent);
         finish();
     }
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 52f34d90e0..44ac4ae139 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -348,6 +348,13 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         }
 
         if (mActivity != null) {
+            if (mStateCallback.hasStates(STATE_GESTURE_COMPLETED)) {
+                // If the activity has restarted between setting the page scroll settling callback
+                // and actually receiving the callback, just mark the gesture completed
+                mGestureState.setState(STATE_RECENTS_SCROLLING_FINISHED);
+                return true;
+            }
+
             // The launcher may have been recreated as a result of device rotation.
             int oldState = mStateCallback.getState() & ~LAUNCHER_UI_STATES;
             initStateCallbacks();
@@ -1713,13 +1720,12 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
 
     /**
      * Registers a callback to run when the activity is ready.
-     * @param intent The intent that will be used to start the activity if it doesn't exist already.
      */
-    public void initWhenReady(Intent intent) {
+    public void initWhenReady() {
         // Preload the plan
         RecentsModel.INSTANCE.get(mContext).getTasks(null);
 
-        mActivityInitListener.register(intent);
+        mActivityInitListener.register();
     }
 
     /**
diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
index dbdd75fc13..2beef0a7ce 100644
--- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
@@ -184,9 +184,7 @@ public class OverviewCommandHelper {
                 .newHandler(gestureState, cmd.createTime);
         interactionHandler.setGestureEndCallback(
                 () -> onTransitionComplete(cmd, interactionHandler));
-
-        Intent intent = new Intent(interactionHandler.getLaunchIntent());
-        interactionHandler.initWhenReady(intent);
+        interactionHandler.initWhenReady();
 
         RecentsAnimationListener recentAnimListener = new RecentsAnimationListener() {
             @Override
@@ -212,6 +210,7 @@ public class OverviewCommandHelper {
             cmd.mActiveCallbacks.addListener(recentAnimListener);
             mTaskAnimationManager.notifyRecentsAnimationState(recentAnimListener);
         } else {
+            Intent intent = new Intent(interactionHandler.getLaunchIntent());
             intent.putExtra(INTENT_EXTRA_LOG_TRACE_ID, gestureState.getGestureId());
             cmd.mActiveCallbacks = mTaskAnimationManager.startRecentsAnimation(
                     gestureState, intent, interactionHandler);
diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index 68526420ef..80c6a97a73 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -141,7 +141,7 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-        ACTIVITY_TRACKER.handleNewIntent(this, intent);
+        ACTIVITY_TRACKER.handleNewIntent(this);
     }
 
     /**
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
index 9878d4527a..725c7c45a5 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
@@ -389,8 +389,7 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
         mInteractionHandler = mHandlerFactory.newHandler(mGestureState, touchTimeMs);
         mInteractionHandler.setGestureEndCallback(this::onInteractionGestureFinished);
         mMotionPauseDetector.setOnMotionPauseListener(mInteractionHandler.getMotionPauseListener());
-        Intent intent = new Intent(mInteractionHandler.getLaunchIntent());
-        mInteractionHandler.initWhenReady(intent);
+        mInteractionHandler.initWhenReady();
 
         if (mTaskAnimationManager.isRecentsAnimationRunning()) {
             mActiveCallbacks = mTaskAnimationManager.continueRecentsAnimation(mGestureState);
@@ -398,6 +397,7 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
             mTaskAnimationManager.notifyRecentsAnimationState(mInteractionHandler);
             notifyGestureStarted(true /*isLikelyToStartNewTask*/);
         } else {
+            Intent intent = new Intent(mInteractionHandler.getLaunchIntent());
             intent.putExtra(INTENT_EXTRA_LOG_TRACE_ID, mGestureState.getGestureId());
             mActiveCallbacks = mTaskAnimationManager.startRecentsAnimation(mGestureState, intent,
                     mInteractionHandler);
diff --git a/quickstep/src/com/android/quickstep/util/ActivityInitListener.java b/quickstep/src/com/android/quickstep/util/ActivityInitListener.java
index dfb8c1d548..b9879ab82b 100644
--- a/quickstep/src/com/android/quickstep/util/ActivityInitListener.java
+++ b/quickstep/src/com/android/quickstep/util/ActivityInitListener.java
@@ -26,7 +26,8 @@ import com.android.launcher3.util.ActivityTracker.SchedulerCallback;
 
 import java.util.function.BiPredicate;
 
-public class ActivityInitListener<T extends BaseActivity> implements SchedulerCallback<T> {
+public class ActivityInitListener<T extends BaseActivity> implements
+        SchedulerCallback<T> {
 
     private BiPredicate<T, Boolean> mOnInitListener;
     private final ActivityTracker<T> mActivityTracker;
@@ -47,6 +48,7 @@ public class ActivityInitListener<T extends BaseActivity> implements SchedulerCa
     @Override
     public final boolean init(T activity, boolean alreadyOnHome) {
         if (!mIsRegistered) {
+            // Don't receive any more updates
             return false;
         }
         return handleInit(activity, alreadyOnHome);
@@ -59,18 +61,17 @@ public class ActivityInitListener<T extends BaseActivity> implements SchedulerCa
     /**
      * Registers the activity-created listener. If the activity is already created, then the
      * callback provided in the constructor will be called synchronously.
-     * @param intent The intent that will be used to initialize the activity, if the activity
-     *               doesn't already exist. We add the callback as an extra on this intent.
      */
-    public void register(Intent intent) {
+    public void register() {
         mIsRegistered = true;
-        mActivityTracker.runCallbackWhenActivityExists(this, intent);
+        mActivityTracker.registerCallback(this);
     }
 
     /**
      * After calling this, we won't {@link #init} even when the activity is ready.
      */
     public void unregister() {
+        mActivityTracker.unregisterCallback(this);
         mIsRegistered = false;
         mOnInitListener = null;
     }
@@ -82,9 +83,9 @@ public class ActivityInitListener<T extends BaseActivity> implements SchedulerCa
      */
     public void registerAndStartActivity(Intent intent, RemoteAnimationProvider animProvider,
             Context context, Handler handler, long duration) {
-        mIsRegistered = true;
+        register();
 
         Bundle options = animProvider.toActivityOptions(handler, duration, context).toBundle();
-        context.startActivity(addToIntent(new Intent(intent)), options);
+        context.startActivity(new Intent(intent), options);
     }
 }
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 578379b70d..c91fb27619 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1472,7 +1472,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         boolean shouldMoveToDefaultScreen = alreadyOnHome && isInState(NORMAL)
                 && AbstractFloatingView.getTopOpenView(this) == null;
         boolean isActionMain = Intent.ACTION_MAIN.equals(intent.getAction());
-        boolean internalStateHandled = ACTIVITY_TRACKER.handleNewIntent(this, intent);
+        boolean internalStateHandled = ACTIVITY_TRACKER.handleNewIntent(this);
         hideKeyboard();
         if (isActionMain) {
             if (!internalStateHandled) {
diff --git a/src/com/android/launcher3/dragndrop/AddItemActivity.java b/src/com/android/launcher3/dragndrop/AddItemActivity.java
index b4288ce1f5..2844fb2178 100644
--- a/src/com/android/launcher3/dragndrop/AddItemActivity.java
+++ b/src/com/android/launcher3/dragndrop/AddItemActivity.java
@@ -213,7 +213,7 @@ public class AddItemActivity extends BaseActivity
                         .addCategory(Intent.CATEGORY_HOME)
                         .setPackage(getPackageName())
                         .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        Launcher.ACTIVITY_TRACKER.runCallbackWhenActivityExists(listener, homeIntent);
+        Launcher.ACTIVITY_TRACKER.registerCallback(listener);
         startActivity(homeIntent,
                 ActivityOptions.makeCustomAnimation(this, 0, android.R.anim.fade_out)
                         .toBundle());
diff --git a/src/com/android/launcher3/states/RotationHelper.java b/src/com/android/launcher3/states/RotationHelper.java
index 5832711f11..87871b11db 100644
--- a/src/com/android/launcher3/states/RotationHelper.java
+++ b/src/com/android/launcher3/states/RotationHelper.java
@@ -25,6 +25,7 @@ import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import com.android.launcher3.BaseActivity;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.util.ActivityTracker;
 import com.android.launcher3.util.UiThreadHelper;
 
 /**
@@ -50,7 +51,7 @@ public class RotationHelper implements OnSharedPreferenceChangeListener,
 
     /**
      * Rotation request made by
-     * {@link com.android.launcher3.util.ActivityTracker.SchedulerCallback}.
+     * {@link ActivityTracker.SchedulerCallback}.
      * This supersedes any other request.
      */
     private int mStateHandlerRequest = REQUEST_NONE;
diff --git a/src/com/android/launcher3/util/ActivityTracker.java b/src/com/android/launcher3/util/ActivityTracker.java
index b5b9c2f43a..7af1a13d67 100644
--- a/src/com/android/launcher3/util/ActivityTracker.java
+++ b/src/com/android/launcher3/util/ActivityTracker.java
@@ -15,15 +15,14 @@
  */
 package com.android.launcher3.util;
 
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.IBinder;
-
 import androidx.annotation.Nullable;
 
 import com.android.launcher3.BaseActivity;
 
 import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * Helper class to statically track activity creation
@@ -32,8 +31,7 @@ import java.lang.ref.WeakReference;
 public final class ActivityTracker<T extends BaseActivity> {
 
     private WeakReference<T> mCurrentActivity = new WeakReference<>(null);
-
-    private static final String EXTRA_SCHEDULER_CALLBACK = "launcher.scheduler_callback";
+    private CopyOnWriteArrayList<SchedulerCallback<T>> mCallbacks = new CopyOnWriteArrayList<>();
 
     @Nullable
     public <R extends T> R getCreatedActivity() {
@@ -47,43 +45,50 @@ public final class ActivityTracker<T extends BaseActivity> {
     }
 
     /**
-     * Call {@link SchedulerCallback#init(BaseActivity, boolean)} when the activity is ready.
-     * If the activity is already created, this is called immediately, otherwise we add the
-     * callback as an extra on the intent, and will call init() when we get handleIntent().
+     * Call {@link SchedulerCallback#init(BaseActivity, boolean)} when the
+     * activity is ready. If the activity is already created, this is called immediately.
+     *
+     * The tracker maintains a strong ref to the callback, so it is up to the caller to return
+     * {@code false} in the callback OR to unregister the callback explicitly.
+     *
      * @param callback The callback to call init() on when the activity is ready.
-     * @param intent The intent that will be used to initialize the activity, if the activity
-     *               doesn't already exist. We add the callback as an extra on this intent.
      */
-    public void runCallbackWhenActivityExists(SchedulerCallback<T> callback, Intent intent) {
+    public void registerCallback(SchedulerCallback<T> callback) {
         T activity = mCurrentActivity.get();
+        mCallbacks.add(callback);
         if (activity != null) {
-            callback.init(activity, activity.isStarted());
-        } else {
-            callback.addToIntent(intent);
+            if (!callback.init(activity, activity.isStarted())) {
+                unregisterCallback(callback);
+            }
         }
     }
 
+    /**
+     * Unregisters a registered callback.
+     */
+    public void unregisterCallback(SchedulerCallback<T> callback) {
+        mCallbacks.remove(callback);
+    }
+
     public boolean handleCreate(T activity) {
         mCurrentActivity = new WeakReference<>(activity);
-        return handleIntent(activity, activity.getIntent(), false);
+        return handleIntent(activity, false /* alreadyOnHome */);
     }
 
-    public boolean handleNewIntent(T activity, Intent intent) {
-        return handleIntent(activity, intent, activity.isStarted());
+    public boolean handleNewIntent(T activity) {
+        return handleIntent(activity, activity.isStarted());
     }
 
-    private boolean handleIntent(T activity, Intent intent, boolean alreadyOnHome) {
-        if (intent != null && intent.getExtras() != null) {
-            IBinder stateBinder = intent.getExtras().getBinder(EXTRA_SCHEDULER_CALLBACK);
-            SchedulerCallback<T> handler = ObjectWrapper.unwrap(stateBinder);
-            if (handler != null) {
-                if (!handler.init(activity, alreadyOnHome)) {
-                    intent.getExtras().remove(EXTRA_SCHEDULER_CALLBACK);
-                }
-                return true;
+    private boolean handleIntent(T activity, boolean alreadyOnHome) {
+        boolean handled = false;
+        for (SchedulerCallback<T> cb : mCallbacks) {
+            if (!cb.init(activity, alreadyOnHome)) {
+                // Callback doesn't want any more updates
+                unregisterCallback(cb);
             }
+            handled = true;
         }
-        return false;
+        return handled;
     }
 
     public interface SchedulerCallback<T extends BaseActivity> {
@@ -94,17 +99,5 @@ public final class ActivityTracker<T extends BaseActivity> {
          * @return Whether to continue receiving callbacks (i.e. if the activity is recreated).
          */
         boolean init(T activity, boolean alreadyOnHome);
-
-        /**
-         * Adds this callback as an extra on the intent, so we can retrieve it in handleIntent() and
-         * call {@link #init}. The intent should be used to start the activity after calling this
-         * method in order for us to get handleIntent().
-         */
-        default Intent addToIntent(Intent intent) {
-            Bundle extras = new Bundle();
-            extras.putBinder(EXTRA_SCHEDULER_CALLBACK, ObjectWrapper.wrap(this));
-            intent.putExtras(extras);
-            return intent;
-        }
     }
 }
-- 
GitLab


From 0ba45e4d5ee21098b67f62da1521c18e389f2a21 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Mon, 14 Jun 2021 23:10:38 -0700
Subject: [PATCH 1402/1664] Remove IME visibility check before closing the
 keyboard

Bug: 185890446
Test: manual

TL;DR;;
In racy condition, keyboard is not visible when the check happens
but in next frame, it becomes visible.

Change-Id: I3336f3c967804e5ccdea9110c363e92d83b7bc02
---
 src/com/android/launcher3/util/UiThreadHelper.java | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/com/android/launcher3/util/UiThreadHelper.java b/src/com/android/launcher3/util/UiThreadHelper.java
index b9387a87a3..cb721e68d0 100644
--- a/src/com/android/launcher3/util/UiThreadHelper.java
+++ b/src/com/android/launcher3/util/UiThreadHelper.java
@@ -25,11 +25,9 @@ import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
 import android.view.View;
-import android.view.WindowInsets;
 import android.view.inputmethod.InputMethodManager;
 
 import com.android.launcher3.Launcher;
-import com.android.launcher3.Utilities;
 import com.android.launcher3.views.ActivityContext;
 
 /**
@@ -48,14 +46,6 @@ public class UiThreadHelper {
     @SuppressLint("NewApi")
     public static void hideKeyboardAsync(ActivityContext activityContext, IBinder token) {
         View root = activityContext.getDragLayer();
-        if (Utilities.ATLEAST_R) {
-            WindowInsets rootInsets = root.getRootWindowInsets();
-            boolean isImeShown = rootInsets != null && rootInsets.isVisible(
-                    WindowInsets.Type.ime());
-            if (!isImeShown) {
-                return;
-            }
-        }
 
         Message.obtain(HANDLER.get(root.getContext()),
                 MSG_HIDE_KEYBOARD, token).sendToTarget();
-- 
GitLab


From dfa6aa828c0ba6a6dcb131901c0a22739c21d8d4 Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Wed, 9 Jun 2021 16:41:22 +0100
Subject: [PATCH 1403/1664] Update bottom widget picker and pin widget dialog
 layout in landscape mode.

Bug: 189726613
Test: Manually tested
Change-Id: I048740f949571423ab53bbb01e7128d9981b1ce7
---
 res/layout/add_item_confirmation_activity.xml | 121 +++++++++---------
 res/layout/widgets_bottom_sheet.xml           |   2 -
 res/layout/widgets_bottom_sheet_content.xml   |  54 ++++----
 res/values-night/styles.xml                   |   1 +
 res/values/styles.xml                         |   1 +
 .../launcher3/dragndrop/AddItemActivity.java  |   3 +-
 .../widget/AddItemWidgetsBottomSheet.java     |  84 ++++++++----
 .../launcher3/widget/WidgetsBottomSheet.java  |  56 +++++---
 8 files changed, 192 insertions(+), 130 deletions(-)

diff --git a/res/layout/add_item_confirmation_activity.xml b/res/layout/add_item_confirmation_activity.xml
index 9439baf1b3..1aeda50c5e 100644
--- a/res/layout/add_item_confirmation_activity.xml
+++ b/res/layout/add_item_confirmation_activity.xml
@@ -26,79 +26,82 @@
     android:importantForAccessibility="no">
 
     <com.android.launcher3.widget.AddItemWidgetsBottomSheet
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/add_item_bottom_sheet"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/add_item_dialog_background"
-        android:paddingTop="24dp"
         android:theme="?attr/widgetsTheme"
         android:layout_gravity="bottom"
         android:orientation="vertical">
 
-        <TextView
-            style="@style/TextHeadline"
-            android:id="@+id/widget_appName"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:paddingHorizontal="24dp"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textSize="24sp"
-            android:ellipsize="end"
-            android:fadingEdge="horizontal"
-            android:singleLine="true"
-            android:maxLines="1" />
-
-        <TextView
+        <LinearLayout
+            android:id="@+id/add_item_bottom_sheet_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:paddingHorizontal="24dp"
-            android:paddingTop="8dp"
-            android:text="@string/add_item_request_drag_hint"
-            android:textSize="14sp"
-            android:textColor="?android:attr/textColorSecondary"
-            android:alpha="0.7"
-            android:importantForAccessibility="no"/>
+            android:padding="24dp"
+            android:background="@drawable/add_item_dialog_background"
+            android:orientation="vertical" >
 
-        <include layout="@layout/widget_cell"
-            android:id="@+id/widget_cell"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:layout_marginVertical="16dp" />
+            <TextView
+                style="@style/TextHeadline"
+                android:id="@+id/widget_appName"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:textColor="?android:attr/textColorPrimary"
+                android:textSize="24sp"
+                android:ellipsize="end"
+                android:fadingEdge="horizontal"
+                android:singleLine="true"
+                android:maxLines="1" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical|end"
-            android:paddingHorizontal="24dp"
-            android:paddingVertical="8dp"
-            android:orientation="horizontal">
-            <Button
-                style="@style/Button.FullRounded.Colored"
-                android:layout_width="wrap_content"
-                android:layout_height="36dp"
-                android:paddingHorizontal="16dp"
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:paddingTop="8dp"
+                android:text="@string/add_item_request_drag_hint"
                 android:textSize="14sp"
-                android:textColor="@color/button_text"
-                android:text="@android:string/cancel"
-                android:onClick="onCancelClick"/>
+                android:textColor="?android:attr/textColorSecondary"
+                android:alpha="0.7"
+                android:importantForAccessibility="no"/>
 
-            <Space
-                android:layout_width="8dp"
-                android:layout_height="wrap_content" />
+            <include layout="@layout/widget_cell"
+                android:id="@+id/widget_cell"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:layout_marginVertical="16dp" />
 
-            <Button
-                style="@style/Button.FullRounded.Colored"
-                android:layout_width="wrap_content"
-                android:layout_height="36dp"
-                android:paddingHorizontal="16dp"
-                android:textSize="14sp"
-                android:textColor="@color/button_text"
-                android:text="@string/add_to_home_screen"
-                android:onClick="onPlaceAutomaticallyClick"/>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical|end"
+                android:paddingVertical="8dp"
+                android:orientation="horizontal">
+                <Button
+                    style="@style/Button.FullRounded.Colored"
+                    android:layout_width="wrap_content"
+                    android:layout_height="36dp"
+                    android:paddingHorizontal="16dp"
+                    android:textSize="14sp"
+                    android:textColor="@color/button_text"
+                    android:text="@android:string/cancel"
+                    android:onClick="onCancelClick"/>
+
+                <Space
+                    android:layout_width="8dp"
+                    android:layout_height="wrap_content" />
+
+                <Button
+                    style="@style/Button.FullRounded.Colored"
+                    android:layout_width="wrap_content"
+                    android:layout_height="36dp"
+                    android:paddingHorizontal="16dp"
+                    android:textSize="14sp"
+                    android:textColor="@color/button_text"
+                    android:text="@string/add_to_home_screen"
+                    android:onClick="onPlaceAutomaticallyClick"/>
+            </LinearLayout>
         </LinearLayout>
     </com.android.launcher3.widget.AddItemWidgetsBottomSheet>
 
diff --git a/res/layout/widgets_bottom_sheet.xml b/res/layout/widgets_bottom_sheet.xml
index 1859bd8596..bbb08faf0e 100644
--- a/res/layout/widgets_bottom_sheet.xml
+++ b/res/layout/widgets_bottom_sheet.xml
@@ -19,8 +19,6 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="16dp"
-    android:background="@drawable/widgets_bottom_sheet_background"
     android:layout_gravity="bottom"
     android:theme="?attr/widgetsTheme">
 
diff --git a/res/layout/widgets_bottom_sheet_content.xml b/res/layout/widgets_bottom_sheet_content.xml
index 85c64888ea..3b3ff8b426 100644
--- a/res/layout/widgets_bottom_sheet_content.xml
+++ b/res/layout/widgets_bottom_sheet_content.xml
@@ -14,32 +14,40 @@
      limitations under the License.
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <View
-        android:id="@+id/collapse_handle"
-        android:layout_width="48dp"
-        android:layout_height="2dp"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginBottom="16dp"
-        android:visibility="gone"
-        android:background="?android:attr/textColorSecondary"/>
-    <TextView
-        style="@style/TextHeadline"
-        android:id="@+id/title"
+    <LinearLayout
+        android:id="@+id/widgets_bottom_sheet"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textSize="24sp"/>
+        android:background="@drawable/widgets_bottom_sheet_background"
+        android:paddingTop="16dp"
+        android:orientation="vertical">
+        <View
+            android:id="@+id/collapse_handle"
+            android:layout_width="48dp"
+            android:layout_height="2dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginBottom="16dp"
+            android:visibility="gone"
+            android:background="?android:attr/textColorSecondary"/>
+        <TextView
+            style="@style/TextHeadline"
+            android:id="@+id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="24sp"/>
 
-    <ScrollView
-        android:id="@+id/widgets_table_scroll_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fadeScrollbars="false"
-        android:layout_marginVertical="16dp">
-        <include layout="@layout/widgets_table_container"
+        <ScrollView
+            android:id="@+id/widgets_table_scroll_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal" />
-    </ScrollView>
+            android:fadeScrollbars="false"
+            android:layout_marginVertical="16dp">
+            <include layout="@layout/widgets_table_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal" />
+        </ScrollView>
+    </LinearLayout>
 </merge>
diff --git a/res/values-night/styles.xml b/res/values-night/styles.xml
index 427525b42d..d41eb7e289 100644
--- a/res/values-night/styles.xml
+++ b/res/values-night/styles.xml
@@ -20,5 +20,6 @@
 <resources>
     <style name="AddItemActivityTheme" parent="@android:style/Theme.Translucent.NoTitleBar">
         <item name="widgetsTheme">@style/WidgetContainerTheme.Dark</item>
+        <item name="android:windowTranslucentStatus">true</item>
     </style>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 571377cd3f..a5cd01d86a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -316,5 +316,6 @@
     <style name="AddItemActivityTheme" parent="@android:style/Theme.Translucent.NoTitleBar">
         <item name="widgetsTheme">@style/WidgetContainerTheme</item>
         <item name="android:windowLightStatusBar">true</item>
+        <item name="android:windowTranslucentStatus">true</item>
     </style>
 </resources>
diff --git a/src/com/android/launcher3/dragndrop/AddItemActivity.java b/src/com/android/launcher3/dragndrop/AddItemActivity.java
index b4288ce1f5..01f1282d9a 100644
--- a/src/com/android/launcher3/dragndrop/AddItemActivity.java
+++ b/src/com/android/launcher3/dragndrop/AddItemActivity.java
@@ -125,7 +125,6 @@ public class AddItemActivity extends BaseActivity
                 WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
         mDragLayer = findViewById(R.id.add_item_drag_layer);
         mDragLayer.recreateControllers();
-        mDragLayer.setInsets(mDeviceProfile.getInsets());
         mWidgetCell = findViewById(R.id.widget_cell);
 
         if (mRequest.getRequestType() == PinItemRequest.REQUEST_TYPE_SHORTCUT) {
@@ -322,7 +321,7 @@ public class AddItemActivity extends BaseActivity
     @Override
     public void onBackPressed() {
         logCommand(LAUNCHER_ADD_EXTERNAL_ITEM_BACK);
-        super.onBackPressed();
+        mSlideInView.close(/* animate= */ true);
     }
 
     @Override
diff --git a/src/com/android/launcher3/widget/AddItemWidgetsBottomSheet.java b/src/com/android/launcher3/widget/AddItemWidgetsBottomSheet.java
index 804973f423..1cc7f53bf9 100644
--- a/src/com/android/launcher3/widget/AddItemWidgetsBottomSheet.java
+++ b/src/com/android/launcher3/widget/AddItemWidgetsBottomSheet.java
@@ -16,17 +16,21 @@
 
 package com.android.launcher3.widget;
 
+import static com.android.launcher3.Utilities.ATLEAST_R;
 import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 
 import android.animation.PropertyValuesHolder;
+import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.res.Configuration;
+import android.graphics.Insets;
 import android.graphics.Rect;
 import android.util.AttributeSet;
+import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
+import android.view.WindowInsets;
 
-import com.android.launcher3.Insettable;
+import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.R;
 import com.android.launcher3.dragndrop.AddItemActivity;
 import com.android.launcher3.views.AbstractSlideInView;
@@ -34,13 +38,12 @@ import com.android.launcher3.views.AbstractSlideInView;
 /**
  * Bottom sheet for the pin widget.
  */
-public class AddItemWidgetsBottomSheet extends AbstractSlideInView<AddItemActivity>
-        implements Insettable {
+public class AddItemWidgetsBottomSheet extends AbstractSlideInView<AddItemActivity> implements
+        View.OnApplyWindowInsetsListener {
 
     private static final int DEFAULT_CLOSE_DURATION = 200;
 
-    private Rect mInsets;
-    private Configuration mCurrentConfiguration;
+    private final Rect mInsets;
 
     public AddItemWidgetsBottomSheet(Context context, AttributeSet attrs) {
         this(context, attrs, 0);
@@ -48,9 +51,7 @@ public class AddItemWidgetsBottomSheet extends AbstractSlideInView<AddItemActivi
 
     public AddItemWidgetsBottomSheet(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        mContent = this;
         mInsets = new Rect();
-        mCurrentConfiguration = new Configuration(getResources().getConfiguration());
     }
 
     /**
@@ -62,15 +63,49 @@ public class AddItemWidgetsBottomSheet extends AbstractSlideInView<AddItemActivi
             ((ViewGroup) parent).removeView(this);
         }
         attachToContainer();
+        setOnApplyWindowInsetsListener(this);
         animateOpen();
     }
 
     @Override
     protected void onLayout(boolean changed, int l, int t, int r, int b) {
-        super.onLayout(changed, l, t, r, b);
+        int width = r - l;
+        int height = b - t;
+
+        // Lay out content as center bottom aligned.
+        int contentWidth = mContent.getMeasuredWidth();
+        int contentLeft = (width - contentWidth - mInsets.left - mInsets.right) / 2 + mInsets.left;
+        mContent.layout(contentLeft, height - mContent.getMeasuredHeight(),
+                contentLeft + contentWidth, height);
+
         setTranslationShift(mTranslationShift);
     }
 
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        DeviceProfile deviceProfile = mActivityContext.getDeviceProfile();
+        int widthUsed;
+        if (mInsets.bottom > 0) {
+            widthUsed = mInsets.left + mInsets.right;
+        } else {
+            Rect padding = deviceProfile.workspacePadding;
+            widthUsed = Math.max(padding.left + padding.right,
+                    2 * (mInsets.left + mInsets.right));
+        }
+
+        int heightUsed = mInsets.top + deviceProfile.edgeMarginPx;
+        measureChildWithMargins(mContent, widthMeasureSpec,
+                widthUsed, heightMeasureSpec, heightUsed);
+        setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec),
+                MeasureSpec.getSize(heightMeasureSpec));
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mContent = findViewById(R.id.add_item_bottom_sheet_content);
+    }
+
     private void animateOpen() {
         if (mIsOpen || mOpenCloseAnimator.isRunning()) {
             return;
@@ -93,25 +128,24 @@ public class AddItemWidgetsBottomSheet extends AbstractSlideInView<AddItemActivi
     }
 
     @Override
-    public void setInsets(Rect insets) {
-        // Extend behind left, right, and bottom insets.
-        int leftInset = insets.left - mInsets.left;
-        int rightInset = insets.right - mInsets.right;
-        int bottomInset = insets.bottom - mInsets.bottom;
-        mInsets.set(insets);
-        setPadding(leftInset, getPaddingTop(), rightInset, bottomInset);
+    protected int getScrimColor(Context context) {
+        return context.getResources().getColor(R.color.widgets_picker_scrim);
     }
 
+    @SuppressLint("NewApi") // Already added API check.
     @Override
-    protected void onConfigurationChanged(Configuration newConfig) {
-        if (mCurrentConfiguration.orientation != newConfig.orientation) {
-            mInsets.setEmpty();
+    public WindowInsets onApplyWindowInsets(View view, WindowInsets windowInsets) {
+        if (ATLEAST_R) {
+            Insets insets = windowInsets.getInsets(WindowInsets.Type.systemBars());
+            mInsets.set(insets.left, insets.top, insets.right, insets.bottom);
+        } else {
+            mInsets.set(windowInsets.getSystemWindowInsetLeft(),
+                    windowInsets.getSystemWindowInsetTop(),
+                    windowInsets.getSystemWindowInsetRight(),
+                    windowInsets.getSystemWindowInsetBottom());
         }
-        mCurrentConfiguration.updateFrom(newConfig);
-    }
-
-    @Override
-    protected int getScrimColor(Context context) {
-        return context.getResources().getColor(R.color.widgets_picker_scrim);
+        mContent.setPadding(mContent.getPaddingStart(),
+                mContent.getPaddingTop(), mContent.getPaddingEnd(), mInsets.bottom);
+        return windowInsets;
     }
 }
diff --git a/src/com/android/launcher3/widget/WidgetsBottomSheet.java b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
index 81df100094..d0e69fa3ea 100644
--- a/src/com/android/launcher3/widget/WidgetsBottomSheet.java
+++ b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
@@ -20,7 +20,6 @@ import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 
 import android.animation.PropertyValuesHolder;
 import android.content.Context;
-import android.content.res.Configuration;
 import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.util.IntProperty;
@@ -71,10 +70,9 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
     private static final long EDUCATION_TIP_DELAY_MS = 300;
 
     private ItemInfo mOriginalItemInfo;
-    private Rect mInsets;
+    private final Rect mInsets;
     private final int mMaxTableHeight;
     private int mMaxHorizontalSpan = 4;
-    private Configuration mCurrentConfiguration;
 
     private final OnLayoutChangeListener mLayoutChangeListenerToShowTips =
             new OnLayoutChangeListener() {
@@ -113,20 +111,38 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
         super(context, attrs, defStyleAttr);
         setWillNotDraw(false);
         mInsets = new Rect();
-        mContent = this;
         DeviceProfile deviceProfile = mActivityContext.getDeviceProfile();
         // Set the max table height to 2 / 3 of the grid height so that the bottom picker won't
         // take over the entire view vertically.
         mMaxTableHeight = deviceProfile.inv.numRows * 2 / 3  * deviceProfile.cellHeightPx;
-        mCurrentConfiguration = new Configuration(getResources().getConfiguration());
         if (!hasSeenEducationTip()) {
             addOnLayoutChangeListener(mLayoutChangeListenerToShowTips);
         }
     }
 
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mContent = findViewById(R.id.widgets_bottom_sheet);
+    }
+
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        DeviceProfile deviceProfile = mActivityContext.getDeviceProfile();
+        int widthUsed;
+        if (mInsets.bottom > 0) {
+            widthUsed = mInsets.left + mInsets.right;
+        } else {
+            Rect padding = deviceProfile.workspacePadding;
+            widthUsed = Math.max(padding.left + padding.right,
+                    2 * (mInsets.left + mInsets.right));
+        }
+
+        int heightUsed = mInsets.top + deviceProfile.edgeMarginPx;
+        measureChildWithMargins(mContent, widthMeasureSpec,
+                widthUsed, heightMeasureSpec, heightUsed);
+        setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec),
+                MeasureSpec.getSize(heightMeasureSpec));
 
         int paddingPx = 2 * getResources().getDimensionPixelOffset(
                 R.dimen.widget_cell_horizontal_padding);
@@ -142,7 +158,15 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
 
     @Override
     protected void onLayout(boolean changed, int l, int t, int r, int b) {
-        super.onLayout(changed, l, t, r, b);
+        int width = r - l;
+        int height = b - t;
+
+        // Content is laid out as center bottom aligned.
+        int contentWidth = mContent.getMeasuredWidth();
+        int contentLeft = (width - contentWidth - mInsets.left - mInsets.right) / 2 + mInsets.left;
+        mContent.layout(contentLeft, height - mContent.getMeasuredHeight(),
+                contentLeft + contentWidth, height);
+
         setTranslationShift(mTranslationShift);
 
         // Ensure the scroll view height is not larger than mMaxTableHeight, which is a value
@@ -241,20 +265,14 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
 
     @Override
     public void setInsets(Rect insets) {
-        // Extend behind left, right, and bottom insets.
-        int leftInset = insets.left - mInsets.left;
-        int rightInset = insets.right - mInsets.right;
-        int bottomInset = insets.bottom - mInsets.bottom;
         mInsets.set(insets);
-        setPadding(leftInset, getPaddingTop(), rightInset, bottomInset);
-    }
-
-    @Override
-    protected void onConfigurationChanged(Configuration newConfig) {
-        if (mCurrentConfiguration.orientation != newConfig.orientation) {
-            mInsets.setEmpty();
+        mContent.setPadding(mContent.getPaddingStart(),
+                mContent.getPaddingTop(), mContent.getPaddingEnd(), insets.bottom);
+        if (insets.bottom > 0) {
+            setupNavBarColor();
+        } else {
+            clearNavBarColor();
         }
-        mCurrentConfiguration.updateFrom(newConfig);
     }
 
     @Override
-- 
GitLab


From 803927bdae8f4db9c8ede435d95388eaa58ecb89 Mon Sep 17 00:00:00 2001
From: Stevie Kideckel <kideckel@google.com>
Date: Mon, 14 Jun 2021 17:27:58 +0000
Subject: [PATCH 1404/1664] Use drawable states for list positions instead of
 swapping drawables

Replacing drawables interrupts touch feedback of ripples. Implementing
custom state lists allows altering the corner radius without cutting off
ripples and also means we reduce unnecessary object creation.

Fix: 190467676
Test: locally
Change-Id: I10eec042aae57d278f8254327d42df945767c7ac
---
 res/layout/widgets_table_container.xml        |   2 +-
 res/values/dimens.xml                         |   1 -
 ...WidgetsListHeaderViewHolderBinderTest.java |   5 +-
 ...sListSearchHeaderViewHolderBinderTest.java |   5 +-
 .../WidgetsListTableViewHolderBinderTest.java |   1 +
 .../widget/picker/WidgetsListAdapter.java     |  13 +-
 .../picker/WidgetsListDrawableFactory.java    | 113 ++++++++++++++++++
 .../picker/WidgetsListDrawableState.java      |  44 +++++++
 .../widget/picker/WidgetsListDrawables.java   |  60 ----------
 .../widget/picker/WidgetsListHeader.java      |  43 ++++---
 .../WidgetsListHeaderViewHolderBinder.java    |  14 ++-
 ...dgetsListSearchHeaderViewHolderBinder.java |  14 ++-
 .../widget/picker/WidgetsListTableView.java   |  59 +++++++++
 .../WidgetsListTableViewHolderBinder.java     |  38 +++---
 .../widget/picker/WidgetsRowViewHolder.java   |   7 +-
 15 files changed, 292 insertions(+), 127 deletions(-)
 create mode 100644 src/com/android/launcher3/widget/picker/WidgetsListDrawableFactory.java
 create mode 100644 src/com/android/launcher3/widget/picker/WidgetsListDrawableState.java
 delete mode 100644 src/com/android/launcher3/widget/picker/WidgetsListDrawables.java
 create mode 100644 src/com/android/launcher3/widget/picker/WidgetsListTableView.java

diff --git a/res/layout/widgets_table_container.xml b/res/layout/widgets_table_container.xml
index c6b70aa4aa..4f70a05374 100644
--- a/res/layout/widgets_table_container.xml
+++ b/res/layout/widgets_table_container.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<TableLayout
+<com.android.launcher3.widget.picker.WidgetsListTableView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/widgets_table"
     android:layout_width="match_parent"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 06bdd499c5..aad75414c0 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -137,7 +137,6 @@
 
     <dimen name="widget_list_top_bottom_corner_radius">28dp</dimen>
     <dimen name="widget_list_content_corner_radius">4dp</dimen>
-    <dimen name="widget_list_content_joined_corner_radius">0dp</dimen>
 
     <dimen name="widget_list_header_view_vertical_padding">20dp</dimen>
     <dimen name="widget_list_entry_bottom_margin">2dp</dimen>
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java
index 84a03d572c..4e2a508394 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java
@@ -107,7 +107,10 @@ public final class WidgetsListHeaderViewHolderBinderTest {
                 /* iconClickListener= */ view -> {},
                 /* iconLongClickListener= */ view -> false);
         mViewHolderBinder = new WidgetsListHeaderViewHolderBinder(
-                LayoutInflater.from(mTestActivity), mOnHeaderClickListener, widgetsListAdapter);
+                LayoutInflater.from(mTestActivity),
+                mOnHeaderClickListener,
+                new WidgetsListDrawableFactory(mTestActivity),
+                widgetsListAdapter);
     }
 
     @After
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinderTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinderTest.java
index 075c58db6b..d6aea554f2 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinderTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinderTest.java
@@ -107,7 +107,10 @@ public final class WidgetsListSearchHeaderViewHolderBinderTest {
                 /* iconClickListener= */ view -> {},
                 /* iconLongClickListener= */ view -> false);
         mViewHolderBinder = new WidgetsListSearchHeaderViewHolderBinder(
-                LayoutInflater.from(mTestActivity), mOnHeaderClickListener, widgetsListAdapter);
+                LayoutInflater.from(mTestActivity),
+                mOnHeaderClickListener,
+                new WidgetsListDrawableFactory(mTestActivity),
+                widgetsListAdapter);
     }
 
     @After
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java
index 0c6e71711d..2f1326fdc0 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java
@@ -118,6 +118,7 @@ public final class WidgetsListTableViewHolderBinderTest {
                 mOnIconClickListener,
                 mOnLongClickListener,
                 mWidgetPreviewLoader,
+                new WidgetsListDrawableFactory(mTestActivity),
                 widgetsListAdapter);
     }
 
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
index e89aea7507..6863c60a37 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
@@ -103,18 +103,25 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
             OnClickListener iconClickListener, OnLongClickListener iconLongClickListener) {
         mLauncher = Launcher.getLauncher(context);
         mDiffReporter = new WidgetsDiffReporter(iconCache, this);
+        WidgetsListDrawableFactory listDrawableFactory = new WidgetsListDrawableFactory(context);
         mWidgetsListTableViewHolderBinder = new WidgetsListTableViewHolderBinder(context,
                 layoutInflater, iconClickListener, iconLongClickListener,
-                widgetPreviewLoader, /* listAdapter= */ this);
+                widgetPreviewLoader, listDrawableFactory, /* listAdapter= */ this);
         mViewHolderBinders.put(VIEW_TYPE_WIDGETS_LIST, mWidgetsListTableViewHolderBinder);
         mViewHolderBinders.put(
                 VIEW_TYPE_WIDGETS_HEADER,
                 new WidgetsListHeaderViewHolderBinder(
-                        layoutInflater, /* onHeaderClickListener= */this, /* listAdapter= */ this));
+                        layoutInflater,
+                        /* onHeaderClickListener= */ this,
+                        listDrawableFactory,
+                        /* listAdapter= */ this));
         mViewHolderBinders.put(
                 VIEW_TYPE_WIDGETS_SEARCH_HEADER,
                 new WidgetsListSearchHeaderViewHolderBinder(
-                        layoutInflater, /*onHeaderClickListener=*/ this, /* listAdapter= */ this));
+                        layoutInflater,
+                        /* onHeaderClickListener= */ this,
+                        listDrawableFactory,
+                        /* listAdapter= */ this));
     }
 
     @Override
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListDrawableFactory.java b/src/com/android/launcher3/widget/picker/WidgetsListDrawableFactory.java
new file mode 100644
index 0000000000..c61e3a4349
--- /dev/null
+++ b/src/com/android/launcher3/widget/picker/WidgetsListDrawableFactory.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget.picker;
+
+import static com.android.launcher3.widget.picker.WidgetsListDrawableState.FIRST;
+import static com.android.launcher3.widget.picker.WidgetsListDrawableState.FIRST_EXPANDED;
+import static com.android.launcher3.widget.picker.WidgetsListDrawableState.LAST;
+import static com.android.launcher3.widget.picker.WidgetsListDrawableState.MIDDLE;
+import static com.android.launcher3.widget.picker.WidgetsListDrawableState.MIDDLE_EXPANDED;
+import static com.android.launcher3.widget.picker.WidgetsListDrawableState.SINGLE;
+
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.GradientDrawable;
+import android.graphics.drawable.RippleDrawable;
+import android.graphics.drawable.StateListDrawable;
+
+import com.android.launcher3.R;
+import com.android.launcher3.util.Themes;
+
+/** Factory for creating drawables to use as background for list elements. */
+final class WidgetsListDrawableFactory {
+
+    private final float mTopBottomCornerRadius;
+    private final float mMiddleCornerRadius;
+    private final ColorStateList mSurfaceColor;
+    private final ColorStateList mRippleColor;
+
+    WidgetsListDrawableFactory(Context context) {
+        Resources res = context.getResources();
+        mTopBottomCornerRadius = res.getDimension(R.dimen.widget_list_top_bottom_corner_radius);
+        mMiddleCornerRadius = res.getDimension(R.dimen.widget_list_content_corner_radius);
+        mSurfaceColor = context.getColorStateList(R.color.surface);
+        mRippleColor = ColorStateList.valueOf(
+                Themes.getAttrColor(context, android.R.attr.colorControlHighlight));
+    }
+
+    /**
+     * Creates a drawable for widget header list items. This drawable supports all positions
+     * in {@link WidgetsListDrawableState}.
+     */
+    Drawable createHeaderBackgroundDrawable() {
+        StateListDrawable stateList = new StateListDrawable();
+        stateList.addState(
+                SINGLE.mStateSet,
+                createRoundedRectDrawable(mTopBottomCornerRadius, mTopBottomCornerRadius));
+        stateList.addState(
+                FIRST_EXPANDED.mStateSet,
+                createRoundedRectDrawable(mTopBottomCornerRadius, 0));
+        stateList.addState(
+                FIRST.mStateSet,
+                createRoundedRectDrawable(mTopBottomCornerRadius, mMiddleCornerRadius));
+        stateList.addState(
+                MIDDLE_EXPANDED.mStateSet,
+                createRoundedRectDrawable(mMiddleCornerRadius, 0));
+        stateList.addState(
+                MIDDLE.mStateSet,
+                createRoundedRectDrawable(mMiddleCornerRadius, mMiddleCornerRadius));
+        stateList.addState(
+                LAST.mStateSet,
+                createRoundedRectDrawable(mMiddleCornerRadius, mTopBottomCornerRadius));
+        return new RippleDrawable(mRippleColor, /* content= */ stateList, /* mask= */ stateList);
+    }
+
+    /**
+     * Creates a drawable for widget content list items. This state list supports the middle and
+     * last states.
+     */
+    Drawable createContentBackgroundDrawable() {
+        StateListDrawable stateList = new StateListDrawable();
+        stateList.addState(
+                MIDDLE.mStateSet,
+                createRoundedRectDrawable(0, mMiddleCornerRadius));
+        stateList.addState(
+                LAST.mStateSet,
+                createRoundedRectDrawable(0, mTopBottomCornerRadius));
+        return new RippleDrawable(mRippleColor, /* content= */ stateList, /* mask= */ stateList);
+    }
+
+    /** Creates a rounded-rect drawable with the specified radii. */
+    private Drawable createRoundedRectDrawable(float topRadius, float bottomRadius) {
+        GradientDrawable backgroundMask = new GradientDrawable();
+        backgroundMask.setColor(mSurfaceColor);
+        backgroundMask.setShape(GradientDrawable.RECTANGLE);
+        backgroundMask.setCornerRadii(
+                new float[]{
+                        topRadius,
+                        topRadius,
+                        topRadius,
+                        topRadius,
+                        bottomRadius,
+                        bottomRadius,
+                        bottomRadius,
+                        bottomRadius
+                });
+        return backgroundMask;
+    }
+}
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListDrawableState.java b/src/com/android/launcher3/widget/picker/WidgetsListDrawableState.java
new file mode 100644
index 0000000000..94f292beb2
--- /dev/null
+++ b/src/com/android/launcher3/widget/picker/WidgetsListDrawableState.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget.picker;
+
+/**
+ * Different possible list position states for an item in the widgets list to have. Note that only
+ * headers use the expanded state.
+ */
+enum WidgetsListDrawableState {
+    FIRST(new int[]{android.R.attr.state_first}),
+    FIRST_EXPANDED(new int[]{android.R.attr.state_first, android.R.attr.state_expanded}),
+    MIDDLE(new int[]{android.R.attr.state_middle}),
+    MIDDLE_EXPANDED(new int[]{android.R.attr.state_middle, android.R.attr.state_expanded}),
+    LAST(new int[]{android.R.attr.state_last}),
+    SINGLE(new int[]{android.R.attr.state_single});
+
+    final int[] mStateSet;
+
+    WidgetsListDrawableState(int[] stateSet) {
+        mStateSet = stateSet;
+    }
+
+    static WidgetsListDrawableState obtain(boolean isFirst, boolean isLast, boolean isExpanded) {
+        if (isFirst && isLast) return SINGLE;
+        if (isFirst && isExpanded) return FIRST_EXPANDED;
+        if (isFirst) return FIRST;
+        if (isLast) return LAST;
+        if (isExpanded) return MIDDLE_EXPANDED;
+        return MIDDLE;
+    }
+}
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListDrawables.java b/src/com/android/launcher3/widget/picker/WidgetsListDrawables.java
deleted file mode 100644
index b3bb544cd7..0000000000
--- a/src/com/android/launcher3/widget/picker/WidgetsListDrawables.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.launcher3.widget.picker;
-
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.GradientDrawable;
-import android.graphics.drawable.RippleDrawable;
-
-import com.android.launcher3.R;
-import com.android.launcher3.util.Themes;
-
-/** Helper class for creating drawables to use as background for list elements. */
-final class WidgetsListDrawables {
-
-    private WidgetsListDrawables() {}
-
-    /** Creates a list background drawable with the specified radii. */
-    static Drawable createListBackgroundDrawable(
-            Context context,
-            float topRadius,
-            float bottomRadius) {
-        GradientDrawable backgroundMask = new GradientDrawable();
-        backgroundMask.setColor(context.getColorStateList(R.color.surface));
-        backgroundMask.setShape(GradientDrawable.RECTANGLE);
-
-        backgroundMask.setCornerRadii(
-                new float[]{
-                        topRadius,
-                        topRadius,
-                        topRadius,
-                        topRadius,
-                        bottomRadius,
-                        bottomRadius,
-                        bottomRadius,
-                        bottomRadius
-                });
-
-        return new RippleDrawable(
-                /* color= */ ColorStateList.valueOf(
-                        Themes.getAttrColor(context, android.R.attr.colorControlHighlight)),
-                /* content= */ backgroundMask,
-                /* mask= */ backgroundMask);
-    }
-
-}
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListHeader.java b/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
index fece359607..cdab964279 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
@@ -60,9 +60,6 @@ public final class WidgetsListHeader extends LinearLayout implements ItemInfoUpd
     @Nullable private Drawable mIconDrawable;
     private final int mIconSize;
     private final int mBottomMarginSize;
-    private final float mTopBottomCornerRadius;
-    private final float mMiddleCornerRadius;
-    private final float mJoinedCornerRadius;
 
     private ImageView mAppIcon;
     private TextView mTitle;
@@ -70,6 +67,7 @@ public final class WidgetsListHeader extends LinearLayout implements ItemInfoUpd
 
     private CheckBox mExpandToggle;
     private boolean mIsExpanded = false;
+    @Nullable private WidgetsListDrawableState mListDrawableState;
 
     public WidgetsListHeader(Context context) {
         this(context, /* attrs= */ null);
@@ -90,12 +88,6 @@ public final class WidgetsListHeader extends LinearLayout implements ItemInfoUpd
                 grid.iconSizePx);
         mBottomMarginSize =
                 getResources().getDimensionPixelSize(R.dimen.widget_list_entry_bottom_margin);
-        mTopBottomCornerRadius =
-                getResources().getDimension(R.dimen.widget_list_top_bottom_corner_radius);
-        mMiddleCornerRadius =
-                getResources().getDimension(R.dimen.widget_list_content_corner_radius);
-        mJoinedCornerRadius =
-                getResources().getDimension(R.dimen.widget_list_content_joined_corner_radius);
     }
 
     @Override
@@ -163,6 +155,14 @@ public final class WidgetsListHeader extends LinearLayout implements ItemInfoUpd
         }
     }
 
+    /** Sets the {@link WidgetsListDrawableState} and refreshes the background drawable. */
+    @UiThread
+    public void setListDrawableState(WidgetsListDrawableState state) {
+        if (state == mListDrawableState) return;
+        this.mListDrawableState = state;
+        refreshDrawableState();
+    }
+
     /** Apply app icon, labels and tag using a generic {@link WidgetsListHeaderEntry}. */
     @UiThread
     public void applyFromItemInfoWithIcon(WidgetsListHeaderEntry entry) {
@@ -263,20 +263,6 @@ public final class WidgetsListHeader extends LinearLayout implements ItemInfoUpd
         verifyHighRes();
     }
 
-    /** Updates the list to have a background drawable with the appropriate corner radii. */
-    @UiThread
-    public void updateListBackground(boolean isFirst, boolean isLast, boolean isExpanded) {
-        float topRadius = isFirst ? mTopBottomCornerRadius : mMiddleCornerRadius;
-        float bottomRadius = isLast
-                ? mTopBottomCornerRadius
-                : isExpanded
-                        ? mJoinedCornerRadius
-                        : mMiddleCornerRadius;
-        setBackground(
-                WidgetsListDrawables.createListBackgroundDrawable(
-                        getContext(), topRadius, bottomRadius));
-    }
-
     private void setTitles(WidgetsListSearchHeaderEntry entry) {
         mTitle.setText(entry.mPkgItem.title);
 
@@ -300,6 +286,17 @@ public final class WidgetsListHeader extends LinearLayout implements ItemInfoUpd
         }
     }
 
+    @Override
+    protected int[] onCreateDrawableState(int extraSpace) {
+        if (mListDrawableState == null) return super.onCreateDrawableState(extraSpace);
+        // Augment the state set from the super implementation with the custom states from
+        // mListDrawableState.
+        int[] drawableState =
+                super.onCreateDrawableState(extraSpace + mListDrawableState.mStateSet.length);
+        mergeDrawableStates(drawableState, mListDrawableState.mStateSet);
+        return drawableState;
+    }
+
     /** Verifies that the current icon is high-res otherwise posts a request to load the icon. */
     public void verifyHighRes() {
         if (mIconLoadRequest != null) {
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinder.java b/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinder.java
index 22d6d227c4..2f8f1bacfc 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinder.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinder.java
@@ -30,13 +30,16 @@ public final class WidgetsListHeaderViewHolderBinder implements
         ViewHolderBinder<WidgetsListHeaderEntry, WidgetsListHeaderHolder> {
     private final LayoutInflater mLayoutInflater;
     private final OnHeaderClickListener mOnHeaderClickListener;
+    private final WidgetsListDrawableFactory mListDrawableFactory;
     private final WidgetsListAdapter mWidgetsListAdapter;
 
     public WidgetsListHeaderViewHolderBinder(LayoutInflater layoutInflater,
             OnHeaderClickListener onHeaderClickListener,
+            WidgetsListDrawableFactory listDrawableFactory,
             WidgetsListAdapter listAdapter) {
         mLayoutInflater = layoutInflater;
         mOnHeaderClickListener = onHeaderClickListener;
+        mListDrawableFactory = listDrawableFactory;
         mWidgetsListAdapter = listAdapter;
     }
 
@@ -44,7 +47,7 @@ public final class WidgetsListHeaderViewHolderBinder implements
     public WidgetsListHeaderHolder newViewHolder(ViewGroup parent) {
         WidgetsListHeader header = (WidgetsListHeader) mLayoutInflater.inflate(
                 R.layout.widgets_list_row_header, parent, false);
-
+        header.setBackground(mListDrawableFactory.createHeaderBackgroundDrawable());
         return new WidgetsListHeaderHolder(header);
     }
 
@@ -52,12 +55,13 @@ public final class WidgetsListHeaderViewHolderBinder implements
     public void bindViewHolder(WidgetsListHeaderHolder viewHolder, WidgetsListHeaderEntry data,
             int position) {
         WidgetsListHeader widgetsListHeader = viewHolder.mWidgetsListHeader;
-        widgetsListHeader.updateListBackground(
-                /* isFirst= */ position == 0,
-                /* isLast= */ position == mWidgetsListAdapter.getItemCount() - 1,
-                /* isExpanded= */ data.isWidgetListShown());
         widgetsListHeader.applyFromItemInfoWithIcon(data);
         widgetsListHeader.setExpanded(data.isWidgetListShown());
+        widgetsListHeader.setListDrawableState(
+                WidgetsListDrawableState.obtain(
+                        /* isFirst= */ position == 0,
+                        /* isLast= */ position == mWidgetsListAdapter.getItemCount() - 1,
+                        /* isExpanded= */ data.isWidgetListShown()));
         widgetsListHeader.setOnExpandChangeListener(isExpanded ->
                 mOnHeaderClickListener.onHeaderClicked(
                         isExpanded,
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinder.java b/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinder.java
index d5e03a4fe0..31dd9ee0ae 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinder.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinder.java
@@ -31,13 +31,16 @@ public final class WidgetsListSearchHeaderViewHolderBinder implements
         ViewHolderBinder<WidgetsListSearchHeaderEntry, WidgetsListSearchHeaderHolder> {
     private final LayoutInflater mLayoutInflater;
     private final OnHeaderClickListener mOnHeaderClickListener;
+    private final WidgetsListDrawableFactory mListDrawableFactory;
     private final WidgetsListAdapter mWidgetsListAdapter;
 
     public WidgetsListSearchHeaderViewHolderBinder(LayoutInflater layoutInflater,
             OnHeaderClickListener onHeaderClickListener,
+            WidgetsListDrawableFactory listDrawableFactory,
             WidgetsListAdapter listAdapter) {
         mLayoutInflater = layoutInflater;
         mOnHeaderClickListener = onHeaderClickListener;
+        mListDrawableFactory = listDrawableFactory;
         mWidgetsListAdapter = listAdapter;
     }
 
@@ -45,7 +48,7 @@ public final class WidgetsListSearchHeaderViewHolderBinder implements
     public WidgetsListSearchHeaderHolder newViewHolder(ViewGroup parent) {
         WidgetsListHeader header = (WidgetsListHeader) mLayoutInflater.inflate(
                 R.layout.widgets_list_row_header, parent, false);
-
+        header.setBackground(mListDrawableFactory.createHeaderBackgroundDrawable());
         return new WidgetsListSearchHeaderHolder(header);
     }
 
@@ -53,12 +56,13 @@ public final class WidgetsListSearchHeaderViewHolderBinder implements
     public void bindViewHolder(WidgetsListSearchHeaderHolder viewHolder,
             WidgetsListSearchHeaderEntry data, int position) {
         WidgetsListHeader widgetsListHeader = viewHolder.mWidgetsListHeader;
-        widgetsListHeader.updateListBackground(
-                /* isFirst= */ position == 0,
-                /* isLast= */ position == mWidgetsListAdapter.getItemCount() - 1,
-                /* isExpanded= */ data.isWidgetListShown());
         widgetsListHeader.applyFromItemInfoWithIcon(data);
         widgetsListHeader.setExpanded(data.isWidgetListShown());
+        widgetsListHeader.setListDrawableState(
+                WidgetsListDrawableState.obtain(
+                        /* isFirst= */ position == 0,
+                        /* isLast= */ position == mWidgetsListAdapter.getItemCount() - 1,
+                        /* isExpanded= */ data.isWidgetListShown()));
         widgetsListHeader.setOnExpandChangeListener(isExpanded ->
                 mOnHeaderClickListener.onHeaderClicked(isExpanded,
                         new PackageUserKey(data.mPkgItem.packageName, data.mPkgItem.user)));
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListTableView.java b/src/com/android/launcher3/widget/picker/WidgetsListTableView.java
new file mode 100644
index 0000000000..d30e7b68ae
--- /dev/null
+++ b/src/com/android/launcher3/widget/picker/WidgetsListTableView.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget.picker;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.TableLayout;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
+
+/**
+ * Extension of {@link TableLayout} to support the drawable states used by
+ * {@link WidgetsListDrawableState}.
+ */
+public class WidgetsListTableView extends TableLayout {
+
+    @Nullable private WidgetsListDrawableState mListDrawableState;
+
+    public WidgetsListTableView(Context context) {
+        super(context);
+    }
+
+    public WidgetsListTableView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    /** Sets the {@link WidgetsListDrawableState} and refreshes the background drawable. */
+    @UiThread
+    public void setListDrawableState(WidgetsListDrawableState state) {
+        if (state == mListDrawableState) return;
+        mListDrawableState = state;
+        refreshDrawableState();
+    }
+
+    @Override
+    protected int[] onCreateDrawableState(int extraSpace) {
+        if (mListDrawableState == null) return super.onCreateDrawableState(extraSpace);
+        // Augment the state set from the super implementation with the custom states from
+        // mListDrawableState.
+        int[] drawableState =
+                super.onCreateDrawableState(extraSpace + mListDrawableState.mStateSet.length);
+        mergeDrawableStates(drawableState, mListDrawableState.mStateSet);
+        return drawableState;
+    }
+}
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java b/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
index 8e310c5d83..7e8c55bfe6 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
@@ -15,8 +15,10 @@
  */
 package com.android.launcher3.widget.picker;
 
+import static com.android.launcher3.widget.picker.WidgetsListDrawableState.LAST;
+import static com.android.launcher3.widget.picker.WidgetsListDrawableState.MIDDLE;
+
 import android.content.Context;
-import android.content.res.Resources;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -51,10 +53,8 @@ public final class WidgetsListTableViewHolderBinder
     private final OnClickListener mIconClickListener;
     private final OnLongClickListener mIconLongClickListener;
     private final WidgetPreviewLoader mWidgetPreviewLoader;
+    private final WidgetsListDrawableFactory mListDrawableFactory;
     private final WidgetsListAdapter mWidgetsListAdapter;
-    private final float mTopBottomCornerRadius;
-    private final float mMiddleCornerRadius;
-    private final float mJoinedCornerRadius;
     private boolean mApplyBitmapDeferred = false;
 
     public WidgetsListTableViewHolderBinder(
@@ -63,19 +63,14 @@ public final class WidgetsListTableViewHolderBinder
             OnClickListener iconClickListener,
             OnLongClickListener iconLongClickListener,
             WidgetPreviewLoader widgetPreviewLoader,
+            WidgetsListDrawableFactory listDrawableFactory,
             WidgetsListAdapter listAdapter) {
         mLayoutInflater = layoutInflater;
         mIconClickListener = iconClickListener;
         mIconLongClickListener = iconLongClickListener;
         mWidgetPreviewLoader = widgetPreviewLoader;
+        mListDrawableFactory = listDrawableFactory;
         mWidgetsListAdapter = listAdapter;
-        Resources resources = context.getResources();
-        mTopBottomCornerRadius =
-                resources.getDimension(R.dimen.widget_list_top_bottom_corner_radius);
-        mMiddleCornerRadius =
-                resources.getDimension(R.dimen.widget_list_content_corner_radius);
-        mJoinedCornerRadius =
-                resources.getDimension(R.dimen.widget_list_content_joined_corner_radius);
     }
 
     /**
@@ -97,28 +92,25 @@ public final class WidgetsListTableViewHolderBinder
             Log.v(TAG, "\nonCreateViewHolder");
         }
 
-        ViewGroup container = (ViewGroup) mLayoutInflater.inflate(
-                R.layout.widgets_table_container, parent, false);
-        return new WidgetsRowViewHolder(container);
+        WidgetsRowViewHolder viewHolder =
+                new WidgetsRowViewHolder(mLayoutInflater.inflate(
+                        R.layout.widgets_table_container, parent, false));
+        viewHolder.mTableContainer.setBackgroundDrawable(
+                mListDrawableFactory.createContentBackgroundDrawable());
+        return viewHolder;
     }
 
     @Override
     public void bindViewHolder(WidgetsRowViewHolder holder, WidgetsListContentEntry entry,
             int position) {
-        TableLayout table = holder.mTableContainer;
+        WidgetsListTableView table = holder.mTableContainer;
         if (DEBUG) {
             Log.d(TAG, String.format("onBindViewHolder [widget#=%d, table.getChildCount=%d]",
                     entry.mWidgets.size(), table.getChildCount()));
         }
 
-        // The content is always joined to an expanded header above.
-        float topRadius = mJoinedCornerRadius;
-        float bottomRadius = position == mWidgetsListAdapter.getItemCount() - 1
-                ? mTopBottomCornerRadius
-                : mMiddleCornerRadius;
-        table.setBackgroundDrawable(
-                WidgetsListDrawables.createListBackgroundDrawable(
-                        holder.itemView.getContext(), topRadius, bottomRadius));
+        table.setListDrawableState(
+                position == mWidgetsListAdapter.getItemCount() - 1 ? LAST : MIDDLE);
 
         List<ArrayList<WidgetItem>> widgetItemsTable =
                 WidgetsTableUtils.groupWidgetItemsIntoTable(entry.mWidgets, mMaxSpansPerRow);
diff --git a/src/com/android/launcher3/widget/picker/WidgetsRowViewHolder.java b/src/com/android/launcher3/widget/picker/WidgetsRowViewHolder.java
index aef1103c2c..618e2cbbd6 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsRowViewHolder.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRowViewHolder.java
@@ -15,8 +15,7 @@
  */
 package com.android.launcher3.widget.picker;
 
-import android.view.ViewGroup;
-import android.widget.TableLayout;
+import android.view.View;
 
 import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 
@@ -25,9 +24,9 @@ import com.android.launcher3.R;
 /** A {@link ViewHolder} for showing widgets of an app in the full widget picker. */
 public final class WidgetsRowViewHolder extends ViewHolder {
 
-    public final TableLayout mTableContainer;
+    public final WidgetsListTableView mTableContainer;
 
-    public WidgetsRowViewHolder(ViewGroup v) {
+    public WidgetsRowViewHolder(View v) {
         super(v);
 
         mTableContainer = v.findViewById(R.id.widgets_table);
-- 
GitLab


From 579b51a4d233dbae77a027e28758d621abd1a666 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Tue, 15 Jun 2021 16:40:31 +0000
Subject: [PATCH 1405/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I01c5129b1c842e461860f3f08701a3f897546503
---
 quickstep/res/values-cs/strings.xml     |  8 ++++----
 quickstep/res/values-de/strings.xml     |  4 ++--
 quickstep/res/values-fi/strings.xml     |  8 ++++----
 quickstep/res/values-hr/strings.xml     |  4 ++--
 quickstep/res/values-it/strings.xml     |  2 +-
 quickstep/res/values-iw/strings.xml     |  8 ++++----
 quickstep/res/values-ja/strings.xml     |  6 +++---
 quickstep/res/values-kk/strings.xml     |  4 ++--
 quickstep/res/values-kn/strings.xml     |  6 +++---
 quickstep/res/values-ko/strings.xml     |  4 ++--
 quickstep/res/values-ky/strings.xml     |  2 +-
 quickstep/res/values-mn/strings.xml     |  4 ++--
 quickstep/res/values-ne/strings.xml     | 10 +++++-----
 quickstep/res/values-ru/strings.xml     |  6 +++---
 quickstep/res/values-sl/strings.xml     | 10 +++++-----
 quickstep/res/values-sv/strings.xml     | 15 +++++----------
 quickstep/res/values-te/strings.xml     |  8 ++++----
 quickstep/res/values-th/strings.xml     |  2 +-
 quickstep/res/values-zh-rTW/strings.xml | 12 ++++++------
 19 files changed, 59 insertions(+), 64 deletions(-)

diff --git a/quickstep/res/values-cs/strings.xml b/quickstep/res/values-cs/strings.xml
index b8d24cf24e..101f86557a 100644
--- a/quickstep/res/values-cs/strings.xml
+++ b/quickstep/res/values-cs/strings.xml
@@ -33,14 +33,14 @@
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Návrhy aplikací pro vás"</string>
     <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Nechte si ve spodním řádku na ploše zobrazovat návrhy aplikací"</string>
     <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Nechte si na řádku oblíbených na ploše zobrazovat návrhy aplikací"</string>
-    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Mějte nejpoužívanější aplikace k dispozici přímo na ploše. Návrhy se budou měnit v závislosti na sledech činností. Aplikace ve spodním řádku se přesunou na vaši plochu."</string>
-    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Mějte nejpoužívanější aplikace k dispozici přímo na ploše. Návrhy se budou měnit v závislosti na sledech činností. Aplikace na řádku oblíbených se přesunou na plochu."</string>
-    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Mějte nejpoužívanější aplikace k dispozici přímo na ploše. Návrhy se budou měnit v závislosti na sledech činností. Aplikace ve spodním řádku se přesunou do nové složky."</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Mějte nejpoužívanější aplikace k dispozici přímo na ploše. Návrhy se budou měnit podle vašich zvyklostí. Aplikace ve spodním řádku se přesunou nahoru na vaši plochu."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Mějte nejpoužívanější aplikace k dispozici přímo na ploše. Návrhy se budou měnit podle vašich zvyklostí. Aplikace na řádku oblíbených se přesunou na plochu."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Mějte nejpoužívanější aplikace k dispozici přímo na ploše. Návrhy se budou měnit podle vašich zvyklostí. Aplikace ve spodním řádku se přesunou do nové složky."</string>
     <string name="hotseat_edu_accept" msgid="1611544083278999837">"Zobrazovat návrhy aplikací"</string>
     <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Ne, díky"</string>
     <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Nastavení"</string>
     <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Zde se zobrazují nejpoužívanější aplikace (které se mění podle sledů činností)"</string>
-    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Chcete-li získat návrhy aplikací, přetáhněte aplikace z dolního řádku"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Návrhy aplikací získáte přetažením aplikací z dolního řádku"</string>
     <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Volné místo bylo vyplněno návrhy aplikací"</string>
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Návrhy aplikací jsou povoleny"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Návrhy aplikací jsou zakázány"</string>
diff --git a/quickstep/res/values-de/strings.xml b/quickstep/res/values-de/strings.xml
index 1e0cd3d8a8..17849e0bed 100644
--- a/quickstep/res/values-de/strings.xml
+++ b/quickstep/res/values-de/strings.xml
@@ -24,7 +24,7 @@
     <string name="recents_empty_message" msgid="7040467240571714191">"Keine kürzlich verwendeten Elemente"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Einstellungen zur App-Nutzung"</string>
     <string name="recents_clear_all" msgid="5328176793634888831">"Alle Apps schließen"</string>
-    <string name="accessibility_recent_apps" msgid="4058661986695117371">"Zuletzt aktive Apps"</string>
+    <string name="accessibility_recent_apps" msgid="4058661986695117371">"Kürzlich geöffnete Apps"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>, <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; 1 Min."</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"Heute noch <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -42,7 +42,7 @@
     <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Hier erscheinen die meistverwendeten Apps. Die Angaben können sich je nach deiner gewöhnlichen Nutzung ändern"</string>
     <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Ziehe Apps aus der unteren Reihe heraus, um Vorschläge für Apps zu erhalten"</string>
     <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"App-Vorschläge in freiem Bereich hinzugefügt"</string>
-    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Funktion \"App-Vorschläge\" aktiviert"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Funktion „App-Vorschläge“ aktiviert"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Funktion \"App-Vorschläge\" deaktiviert"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Vorgeschlagene App: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Wische vom äußersten linken Bildschirmrand."</string>
diff --git a/quickstep/res/values-fi/strings.xml b/quickstep/res/values-fi/strings.xml
index 5c19b23658..e81906f95b 100644
--- a/quickstep/res/values-fi/strings.xml
+++ b/quickstep/res/values-fi/strings.xml
@@ -31,16 +31,16 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Sovellusehdotukset"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Kaikki sovellukset"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Sovellusennusteet"</string>
-    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Näytä sovellusehdotuksia aloitusnäytön alimmaisella rivillä"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Näytä sovellusehdotuksia aloitusnäytön alimmalla rivillä"</string>
     <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Näytä sovellusehdotuksia aloitusnäytön Suosikit-rivillä"</string>
-    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Voit avata käytetyimmät sovellukset kätevästi aloitusnäytöltä. Ehdotukset muuttuvat rutiiniesi perusteella. Alimmaisella rivillä olevat sovellukset siirretään aloitusnäytön yläosaan."</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Voit avata käytetyimmät sovellukset kätevästi aloitusnäytöltä. Ehdotukset muuttuvat rutiiniesi perusteella. Alimmalla rivillä olevat sovellukset siirretään aloitusnäytön yläosaan."</string>
     <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Voit avata käytetyimmät sovellukset kätevästi aloitusnäytöltä. Ehdotukset muuttuvat rutiiniesi perusteella. Suosikit-rivillä olevat sovellukset siirretään aloitusnäytölle."</string>
-    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Voit avata käytetyimmät sovellukset kätevästi aloitusnäytöltä. Ehdotukset muuttuvat rutiiniesi perusteella. Alimmaisella rivillä olevat sovellukset siirretään uuteen kansioon."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Voit avata käytetyimmät sovellukset kätevästi aloitusnäytöltä. Ehdotukset muuttuvat rutiiniesi perusteella. Alimmalla rivillä olevat sovellukset siirretään uuteen kansioon."</string>
     <string name="hotseat_edu_accept" msgid="1611544083278999837">"Näytä sovellusehdotuksia"</string>
     <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Ei kiitos"</string>
     <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Asetukset"</string>
     <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Käytetyimmät sovellukset näkyvät täällä ja muuttuvat rutiiniesi perusteella"</string>
-    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Siirrä sovelluksia pois alimmaiselta riviltä, niin voit saada sovellusehdotuksia"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Siirrä sovelluksia pois alimmalta riviltä, niin voit saada sovellusehdotuksia"</string>
     <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Sovellusehdotuksia lisätty tyhjään kohtaan"</string>
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Sovellusehdotukset käytössä"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Sovellusehdotukset on poistettu käytöstä"</string>
diff --git a/quickstep/res/values-hr/strings.xml b/quickstep/res/values-hr/strings.xml
index 0e3444ade3..c3520cbcd5 100644
--- a/quickstep/res/values-hr/strings.xml
+++ b/quickstep/res/values-hr/strings.xml
@@ -28,10 +28,10 @@
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>, <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; 1 min"</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"Još <xliff:g id="TIME">%1$s</xliff:g> danas"</string>
-    <string name="title_app_suggestions" msgid="4185902664111965088">"Predložene aplikacije"</string>
+    <string name="title_app_suggestions" msgid="4185902664111965088">"Prijedlozi aplikacija"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Sve aplikacije"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Vaše predviđene aplikacije"</string>
-    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Prijedloge aplikacija vidjet ćete u donjem retku početnog zaslona"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Primajte prijedloge aplikacija u donjem retku početnog zaslona"</string>
     <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Primajte prijedloge aplikacija u retku omiljenih na početnom zaslonu"</string>
     <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Lako pristupite najčešće upotrebljavanim aplikacijama s početnog zaslona. Prijedlozi će se mijenjati na temelju vaših rutina. Aplikacije iz donjeg retka pomaknut će se na početni zaslon."</string>
     <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Lako pristupite najčešće upotrebljavanim aplikacijama s početnog zaslona. Prijedlozi će se mijenjati na temelju vaših rutina. Aplikacije koje se nalaze u retku omiljenih pomaknut će se na početni zaslon."</string>
diff --git a/quickstep/res/values-it/strings.xml b/quickstep/res/values-it/strings.xml
index ea7454ae3c..b64926670a 100644
--- a/quickstep/res/values-it/strings.xml
+++ b/quickstep/res/values-it/strings.xml
@@ -19,7 +19,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="recent_task_option_pin" msgid="7929860679018978258">"Blocca"</string>
+    <string name="recent_task_option_pin" msgid="7929860679018978258">"Blocca su schermo"</string>
     <string name="recent_task_option_freeform" msgid="48863056265284071">"Forma libera"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"Nessun elemento recente"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Impostazioni di utilizzo delle app"</string>
diff --git a/quickstep/res/values-iw/strings.xml b/quickstep/res/values-iw/strings.xml
index 5b89d2c3db..ed69faaba5 100644
--- a/quickstep/res/values-iw/strings.xml
+++ b/quickstep/res/values-iw/strings.xml
@@ -33,16 +33,16 @@
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"האפליקציות החזויות שלך"</string>
     <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"קבלת הצעות לאפליקציות בשורה התחתונה של מסך הבית"</string>
     <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"קבלת הצעות לאפליקציות בשורת המועדפות של מסך הבית"</string>
-    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"גישה נוחה לאפליקציות הכי נפוצות ישירות ממסך הבית. ההצעות ישתנו בהתאם להרגלי השימוש שלך. אפליקציות שמופיעות בשורה התחתונה יעברו למעלה למסך הבית."</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"גישה נוחה לאפליקציות שנעשה בהן שימוש תכוף – ישירות ממסך הבית. ההצעות ישתנו בהתאם להרגלי השימוש שלך. אפליקציות שמופיעות בשורה התחתונה יעברו למעלה למסך הבית."</string>
     <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"גישה נוחה לאפליקציות שהשתמשת בהן הכי הרבה, ישירות ממסך הבית. ההצעות ישתנו בהתאם להרגלי השימוש שלך. אפליקציות בשורת המועדפות יועברו למסך הבית."</string>
-    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"גישה נוחה לאפליקציות הכי נפוצות ישירות ממסך הבית. ההצעות ישתנו בהתאם להרגלי השימוש שלך. אפליקציות שמופיעות בשורה התחתונה יעברו למעלה למסך הבית."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"גישה נוחה לאפליקציות שנעשה בהן שימוש תכוף – ישירות ממסך הבית. ההצעות ישתנו בהתאם להרגלי השימוש שלך. אפליקציות שמופיעות בשורה התחתונה יעברו לתיקייה חדשה."</string>
     <string name="hotseat_edu_accept" msgid="1611544083278999837">"קבלת הצעות לאפליקציות"</string>
     <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"לא, תודה"</string>
     <string name="hotseat_prediction_settings" msgid="6246554993566070818">"הגדרות"</string>
     <string name="hotseat_auto_enrolled" msgid="522100018967146807">"רוב האפליקציות הכי נפוצות מופיעות כאן ומשתנות בהתאם להרגלי השימוש שלך"</string>
-    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"יש לגרור אפליקציות מהשורה התחתונה כדי לקבל הצעות לאפליקציות"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"כדי לקבל הצעות נוספות לאפליקציות, צריך לגרור אפליקציות מהשורה התחתונה"</string>
     <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"הצעות לאפליקציות נוספו לאזור ריק"</string>
-    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ההצעות לאפליקציות מופעלות"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"התכונה \'הצעות לאפליקציות\' מופעלת"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ההצעות לאפליקציות מושבתות"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"האפליקציות החזויות: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"חשוב להקפיד להחליק מהקצה הימני."</string>
diff --git a/quickstep/res/values-ja/strings.xml b/quickstep/res/values-ja/strings.xml
index 0c2a03b64e..38accd1062 100644
--- a/quickstep/res/values-ja/strings.xml
+++ b/quickstep/res/values-ja/strings.xml
@@ -31,9 +31,9 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"アプリの候補"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"すべてのアプリ"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"予測されたアプリ"</string>
-    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"ホーム画面の一番下の行でアプリの候補を利用できます"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"ホーム画面の一番下にアプリの候補を表示できます"</string>
     <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"ホーム画面のお気に入りの行でアプリの候補を利用できます"</string>
-    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"ホーム画面で、使用頻度の高いアプリに簡単にアクセスできるようになります。アプリの候補はルーティンに応じて変わります。一番下の行にあるアプリがホーム画面に移動します。"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"ホーム画面で、使用頻度の高いアプリに簡単にアクセスできるようになります。アプリの候補はルーティンに応じて変わります。一番下の行にあるアプリは上に移動します。"</string>
     <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"ホーム画面で、使用頻度の高いアプリに簡単にアクセスできるようになります。アプリの候補はルーティンに応じて変わります。お気に入りの行にあるアプリがホーム画面に移動します。"</string>
     <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"ホーム画面で、使用頻度の高いアプリに簡単にアクセスできるようになります。アプリの候補はルーティンに応じて変わります。一番下の行にあるアプリが新しいフォルダに移動します。"</string>
     <string name="hotseat_edu_accept" msgid="1611544083278999837">"アプリの候補を利用"</string>
@@ -42,7 +42,7 @@
     <string name="hotseat_auto_enrolled" msgid="522100018967146807">"使用頻度の高いアプリがここに表示されます（ルーティンに応じて変わります）"</string>
     <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"一番下の行からアプリをドラッグするとアプリの候補が表示されます"</string>
     <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"空いたスペースにアプリの候補が追加されます"</string>
-    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"アプリの候補は有効です"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"アプリの候補表示が有効です"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"アプリの候補は無効です"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"予測されたアプリ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"一番左端からスワイプしてください。"</string>
diff --git a/quickstep/res/values-kk/strings.xml b/quickstep/res/values-kk/strings.xml
index 292f4cb037..52d8b91c5c 100644
--- a/quickstep/res/values-kk/strings.xml
+++ b/quickstep/res/values-kk/strings.xml
@@ -29,7 +29,7 @@
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; 1 мин"</string>
     <string name="time_left_for_app" msgid="3111996412933644358">"Бүгін <xliff:g id="TIME">%1$s</xliff:g> қалды"</string>
     <string name="title_app_suggestions" msgid="4185902664111965088">"Ұсынылған қолданбалар"</string>
-    <string name="all_apps_label" msgid="8542784161730910663">"Барлық қолданбалар"</string>
+    <string name="all_apps_label" msgid="8542784161730910663">"Барлық қолданба"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Ұсынылатын қолданбалар"</string>
     <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Негізгі экранның төменгі жолында қолданбаларды ұсыну"</string>
     <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Ұсынылған қолданбалар негізгі экранда таңдаулылар арасында көрсетілетін болады"</string>
@@ -42,7 +42,7 @@
     <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Жиі пайдаланылатын қолданбалар осы жерде көрсетіледі. Олар күнделікті әрекеттеріңізге сәйкес өзгереді."</string>
     <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Ұсынылған қолданбаларды көру үшін төменгі қатардан керектерін сүйреп шығарыңыз."</string>
     <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Ұсынылған қолданбалар бос орынға қосылды."</string>
-    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"\"Ұсынылған қолданбалар\" функциясы қосулы."</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Ұсынылған қолданбалар функциясы қосылды."</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"\"Ұсынылған қолданбалар\" функциясы өшірулі."</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Болжалды қолданба: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Сол жақтағы ең шеткі нүктеден бастап сырғытыңыз."</string>
diff --git a/quickstep/res/values-kn/strings.xml b/quickstep/res/values-kn/strings.xml
index 437fdbaae0..306f153035 100644
--- a/quickstep/res/values-kn/strings.xml
+++ b/quickstep/res/values-kn/strings.xml
@@ -33,9 +33,9 @@
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"ನಿಮ್ಮ ಮುನ್ಸೂಚಿತ ಆ್ಯಪ್‌ಗಳು"</string>
     <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"ನಿಮ್ಮ ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಭಾಗದ ಸಾಲಿನಲ್ಲಿ ಆ್ಯಪ್ ಸಲಹೆಗಳನ್ನು ಪಡೆಯಿರಿ"</string>
     <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"ನಿಮ್ಮ ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನ ಮೆಚ್ಚಿನವುಗಳ ಸಾಲಿನಲ್ಲಿ ಆ್ಯಪ್ ಸಲಹೆಗಳನ್ನು ಪಡೆಯಿರಿ"</string>
-    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿಯೇ ನೀವು ಹೆಚ್ಚು ಬಳಸಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ಸುಲಭವಾಗಿ ಪ್ರವೇಶಿಸಿ. ನಿಮ್ಮ ದಿನಚರಿಯನ್ನು ಆಧರಿಸಿ ಸಲಹೆಗಳು ಬದಲಾಗುತ್ತವೆ. ಕೆಳಭಾಗದ ಸಾಲಿನಲ್ಲಿನ ಆ್ಯಪ್‌ಗಳು ನಿಮ್ಮ ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ ಚಲಿಸುತ್ತವೆ."</string>
-    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿಯೇ ನೀವು ಹೆಚ್ಚು ಬಳಸಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ಸುಲಭವಾಗಿ ಪ್ರವೇಶಿಸಿ. ನಿಮ್ಮ ದಿನಚರಿಯನ್ನು ಆಧರಿಸಿ ಸಲಹೆಗಳು ಬದಲಾಗುತ್ತವೆ. ಮೆಚ್ಚಿನವುಗಳ ಸಾಲಿನಲ್ಲಿನ ಆ್ಯಪ್‌ಗಳು ನಿಮ್ಮ ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ಗೆ ಚಲಿಸುತ್ತವೆ."</string>
-    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿಯೇ ನೀವು ಹೆಚ್ಚು ಬಳಸಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ಸುಲಭವಾಗಿ ಪ್ರವೇಶಿಸಿ. ನಿಮ್ಮ ದಿನಚರಿಯನ್ನು ಆಧರಿಸಿ ಸಲಹೆಗಳು ಬದಲಾಗುತ್ತವೆ. ಕೆಳಭಾಗದ ಸಾಲಿನಲ್ಲಿನ ಆ್ಯಪ್‌ಗಳು ಹೊಸ ಫೋಲ್ಡರ್‌ಗೆ ಚಲಿಸುತ್ತವೆ."</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"ನೀವು ಹೆಚ್ಚು ಬಳಸಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿಯೇ ಸುಲಭವಾಗಿ ಪ್ರವೇಶಿಸಿ. ನಿಮ್ಮ ದಿನಚರಿಯನ್ನು ಆಧರಿಸಿ ಸಲಹೆಗಳು ಬದಲಾಗುತ್ತವೆ. ಕೆಳಭಾಗದ ಸಾಲಿನಲ್ಲಿನ ಆ್ಯಪ್‌ಗಳು ನಿಮ್ಮ ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ ಚಲಿಸುತ್ತವೆ."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"ನೀವು ಹೆಚ್ಚು ಬಳಸಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿಯೇ ಸುಲಭವಾಗಿ ಪ್ರವೇಶಿಸಿ. ನಿಮ್ಮ ದಿನಚರಿಯನ್ನು ಆಧರಿಸಿ ಸಲಹೆಗಳು ಬದಲಾಗುತ್ತವೆ. ಮೆಚ್ಚಿನವುಗಳ ಸಾಲಿನಲ್ಲಿನ ಆ್ಯಪ್‌ಗಳು ನಿಮ್ಮ ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ಗೆ ಚಲಿಸುತ್ತವೆ."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"ನೀವು ಹೆಚ್ಚು ಬಳಸಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿಯೇ ಸುಲಭವಾಗಿ ಪ್ರವೇಶಿಸಿ. ನಿಮ್ಮ ದಿನಚರಿಯನ್ನು ಆಧರಿಸಿ ಸಲಹೆಗಳು ಬದಲಾಗುತ್ತವೆ. ಕೆಳಭಾಗದ ಸಾಲಿನಲ್ಲಿನ ಆ್ಯಪ್‌ಗಳು ಹೊಸ ಫೋಲ್ಡರ್‌ಗೆ ಚಲಿಸುತ್ತವೆ."</string>
     <string name="hotseat_edu_accept" msgid="1611544083278999837">"ಆ್ಯಪ್ ಸಲಹೆಗಳನ್ನು ಪಡೆಯಿರಿ"</string>
     <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"ಬೇಡ"</string>
     <string name="hotseat_prediction_settings" msgid="6246554993566070818">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
diff --git a/quickstep/res/values-ko/strings.xml b/quickstep/res/values-ko/strings.xml
index b31dba9735..1666a5a1f7 100644
--- a/quickstep/res/values-ko/strings.xml
+++ b/quickstep/res/values-ko/strings.xml
@@ -57,7 +57,7 @@
     <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"왼쪽에서 스와이프하여 뒤로 돌아가세요"</string>
     <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"돌아가려면 오른쪽에서 스와이프하세요"</string>
     <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"마지막 화면으로 돌아가려면 왼쪽 가장자리에서 화면 중앙으로 스와이프하세요"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"오른쪽 가장자리에서 화면 중앙으로 스와이프해도 마지막 화면으로 돌아갈 수도 있습니다. 지금 동작을 취해 보세요"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"오른쪽 가장자리에서 화면 중앙으로 스와이프해도 마지막 화면으로 돌아갈 수 있습니다. 지금 동작을 취해 보세요"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"화면 하단 가장자리에서 위로 스와이프하세요."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"손가락을 떼기 전에 멈추지 않아야 합니다."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"위로 똑바르게 스와이프하세요."</string>
@@ -81,7 +81,7 @@
     <string name="allset_title" msgid="5021126669778966707">"설정 완료"</string>
     <string name="allset_hint" msgid="459504134589971527">"위로 스와이프하여 홈으로 이동"</string>
     <string name="allset_description" msgid="6350320429953234580">"휴대전화를 사용할 준비가 되었습니다."</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"탐색 접근성 설정"</annotation></string>
+    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"접근성 탐색 설정"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"공유"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"스크린샷"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"이 작업은 앱 또는 조직에서 허용되지 않습니다."</string>
diff --git a/quickstep/res/values-ky/strings.xml b/quickstep/res/values-ky/strings.xml
index eb19e13102..7f6741596e 100644
--- a/quickstep/res/values-ky/strings.xml
+++ b/quickstep/res/values-ky/strings.xml
@@ -40,7 +40,7 @@
     <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Жок, рахмат"</string>
     <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Жөндөөлөр"</string>
     <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Көп иштетилген колдонмолор ушул жерде көрүнүп, тартиптин негизинде өзгөрөт"</string>
-    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Сунуштарды алып туруу үчүн, ылдый жактагы тилкедеги колдонмолорду сүйрөп келиңиз"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Сунуштарды алып туруу үчүн ылдый жактагы тилкедеги колдонмолорду сүйрөп келиңиз"</string>
     <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Сунушталган колдонмолор бош жерге кошулат"</string>
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Сунушталган колдонмолор функциясы иштетилди"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Сунушталган колдонмолор функциясы өчүрүлгөн"</string>
diff --git a/quickstep/res/values-mn/strings.xml b/quickstep/res/values-mn/strings.xml
index 43d9a27cc3..1ef7299f70 100644
--- a/quickstep/res/values-mn/strings.xml
+++ b/quickstep/res/values-mn/strings.xml
@@ -31,9 +31,9 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"Санал болгож буй аппууд"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"Бүх апп"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Таны таамагласан аппууд"</string>
-    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Үндсэн нүүрнийхээ доод мөрөнд санал болгож буй аппуудыг аваарай"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Үндсэн нүүрнийхээ доод мөрд санал болгож буй аппуудыг аваарай"</string>
     <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Үндсэн нүүрний дуртай мөрнөөсөө санал болгож буй аппуудыг аваарай"</string>
-    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Хамгийн их ашигладаг аппууддаа Үндсэн нүүрнээс хялбархан хандаарай. Санал болгож буй аппуудыг таны хэвшлээс хамаарч өөрчилнө. Доод мөрөнд буй аппуудыг таны Үндсэн нүүр лүү дээш зөөнө."</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Хамгийн их ашигладаг аппууддаа Үндсэн нүүрнээс хялбархан хандаарай. Санал болгож буй аппуудыг таны хэвшлээс хамаарч өөрчилнө. Доод мөрд буй аппуудыг таны Үндсэн нүүр лүү дээш зөөнө."</string>
     <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Хамгийн их ашигладаг аппууддаа Үндсэн нүүрнээсээ хялбархан хандаарай. Санал болголтыг таны хэвшлээс хамааран өөрчилнө. Дуртай мөрөнд буй аппуудыг таны үндсэн нүүр лүү зөөнө."</string>
     <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Хамгийн их ашигладаг аппууддаа Үндсэн нүүрнээс хялбархан хандаарай. Санал болгож буй аппуудыг таны хэвшлээс хамаарч өөрчилнө. Доод мөрөнд буй аппуудыг шинэ фолдер луу зөөнө."</string>
     <string name="hotseat_edu_accept" msgid="1611544083278999837">"Санал болгож буй аппуудыг авах"</string>
diff --git a/quickstep/res/values-ne/strings.xml b/quickstep/res/values-ne/strings.xml
index f1351f186d..dea056b557 100644
--- a/quickstep/res/values-ne/strings.xml
+++ b/quickstep/res/values-ne/strings.xml
@@ -31,16 +31,16 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"एपसम्बन्धी सुझावहरू"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"सबै एपहरू"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"तपाईंलाई चाहिने एपहरू"</string>
-    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"तपाईंको गृह स्क्रिनको पुछारको पङ्क्तिमा सिफारिस गरिएका एपहरू प्राप्त गर्नुहोस्"</string>
-    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"आफ्नो होम स्क्रिनको मन पर्ने नामक पङ्क्तिमा सिफारिस गरिएका एपहरू प्राप्त गर्नुहोस्"</string>
-    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"गृह स्क्रिनबाटै आफूले सबैभन्दा बढी प्रयोग गर्ने एप सजिलै चलाउनुहोस्। सिफारिस गरिने एपहरूको क्रम तपाईंले एप प्रयोग गर्ने समयतालिकाअनुसार बदलिने छ। फेदको पङ्क्तिमा रहेका एपहरू तपाईंको गृह स्क्रिनको सिरानमा सर्ने छन्।"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"आफ्नो होम स्क्रिनको पुछारको रोमा एपसम्बन्धी सिफारिस प्राप्त गर्नुहोस्"</string>
+    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"आफ्नो होम स्क्रिनको मन पर्ने नामक पङ्क्तिमा एपसम्बन्धी सिफारिस प्राप्त गर्नुहोस्"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"आफूले सबैभन्दा बढी प्रयोग गर्ने एप होम स्क्रिनबाट सजिलै चलाउनुहोस्। सिफारिस गरिने एपहरूको क्रम तपाईंले एप प्रयोग गर्ने समयतालिकाअनुसार बदलिने छ। फेदको रोमा रहेका एपहरू तपाईंको होम स्क्रिनको सिरानमा सर्ने छन्।"</string>
     <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"आफूले सबैभन्दा बढी प्रयोग गर्ने एपहरू गृह स्क्रिनबाटै सजिलैसँग खोल्नुहोस्। सिफारिस गरिने एपहरूको क्रम तपाईंको दिनचर्याअनुसार बदलिने छ। मन पर्ने नामक पङ्क्तिमा रहेका एपहरू सारेर होम स्क्रिनमा लगिने छन्।"</string>
     <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"गृह स्क्रिनबाटै आफूले सबैभन्दा बढी प्रयोग गर्ने एप सजिलै चलाउनुहोस्। सिफारिस गरिने एपहरूको क्रम तपाईंले एप प्रयोग गर्ने समयतालिकाअनुसार बदलिने छ। फेदको पङ्क्तिमा रहेका एपहरू एउटा नयाँ फोल्डरमा सर्ने छन्।"</string>
-    <string name="hotseat_edu_accept" msgid="1611544083278999837">"सिफारिस गरिएका एपहरू प्राप्त गर्नुहोस्"</string>
+    <string name="hotseat_edu_accept" msgid="1611544083278999837">"एपसम्बन्धी सिफारिस प्राप्त गर्नुहोस्"</string>
     <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"पर्दैन धन्यवाद"</string>
     <string name="hotseat_prediction_settings" msgid="6246554993566070818">"सेटिङ"</string>
     <string name="hotseat_auto_enrolled" msgid="522100018967146807">"सबैभन्दा बढी प्रयोग हुने एपहरू यहाँ देखिन्छन् र यी एपहरूको क्रम तपाईंले एप प्रयोग गर्ने समयतालिकाअनुसार बदलिरहन्छ"</string>
-    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"सिफारिस गरिएका एपहरू प्राप्त गर्न फेदको पङ्क्तिमा रहेका एपहरू ड्र्याग गरी हटाउनुहोस्"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"एपसम्बन्धी सिफारिस प्राप्त गर्न फेदको रोमा रहेका एपहरू ड्र्याग गरी हटाउनुहोस्"</string>
     <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"खाली ठाउँमा सिफारिस गरिएका एपहरू थपिए"</string>
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"सिफारिस गरिएका एपहरू देखाउने सुविधा सक्षम पारिएका छन्"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"सिफारिस गरिएका एपहरू देखाउने सुविधा असक्षम पारिएको छ"</string>
diff --git a/quickstep/res/values-ru/strings.xml b/quickstep/res/values-ru/strings.xml
index 6d28815ef2..ef05954ce8 100644
--- a/quickstep/res/values-ru/strings.xml
+++ b/quickstep/res/values-ru/strings.xml
@@ -33,14 +33,14 @@
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Ваши рекомендуемые приложения"</string>
     <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Рекомендуемые приложения будут появляться в нижнем ряду на главном экране"</string>
     <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Рекомендуемые приложения будут появляться в разделе избранных на главном экране"</string>
-    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Быстрый доступ к часто используемым приложениям на главном экране. Список меняется с учетом ваших привычек. Приложения из нижнего ряда будут перемещены вверх на главный экран."</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Приложения, которыми вы часто пользуетесь, будут доступны прямо на главном экране. Их список может меняться с учетом ваших предпочтений. Приложения из нижнего ряда будут перемещены выше на главном экране."</string>
     <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Включите функцию для быстрого доступа к часто используемым приложениям на главном экране. Список меняется с учетом ваших действий. Приложения из раздела избранных будут перемещены на главный экран."</string>
-    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Быстрый доступ к часто используемым приложениям на главном экране. Список меняется с учетом ваших привычек. Приложения из нижнего ряда будут перемещены в новую папку."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Приложения, которыми вы часто пользуетесь, будут доступны прямо на главном экране. Их список может меняться с учетом ваших предпочтений. Приложения из нижнего ряда будут перемещены в новую папку."</string>
     <string name="hotseat_edu_accept" msgid="1611544083278999837">"Показывать рекомендации"</string>
     <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Отмена"</string>
     <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Настройки"</string>
     <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Здесь появляются часто используемые приложения. Список меняется с учетом ваших привычек."</string>
-    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Перетащите приложения из нижнего ряда, чтобы получить рекомендации"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Перетащите приложения из нижнего ряда, чтобы получить рекомендации."</string>
     <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Рекомендуемые приложения будут появляться на свободных местах."</string>
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Функция \"Рекомендуемые приложения\" включена."</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Функция \"Рекомендуемые приложения\" отключена."</string>
diff --git a/quickstep/res/values-sl/strings.xml b/quickstep/res/values-sl/strings.xml
index 19982dfcb9..ed035aa74e 100644
--- a/quickstep/res/values-sl/strings.xml
+++ b/quickstep/res/values-sl/strings.xml
@@ -33,17 +33,17 @@
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Predvidene aplikacije"</string>
     <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Oglejte si predlagane aplikacije v spodnji vrstici začetnega zaslona"</string>
     <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Prejemajte predloge aplikacij v vrstici s priljubljenimi na začetnem zaslonu"</string>
-    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Preprosto dostopajte do najpogosteje uporabljenih aplikacij kar na začetnem zaslonu. Predlogi se spreminjajo na podlagi dejanj, ki jih pogosto izvajate. Aplikacije se iz spodnje vrstice premaknejo na začetni zaslon."</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Preprosto dostopajte do najpogosteje uporabljenih aplikacij kar na začetnem zaslonu. Predlogi se spreminjajo na podlagi dejanj, ki jih pogosto izvajate. Aplikacije iz spodnje vrstice se premaknejo na začetni zaslon."</string>
     <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Preprosto dostopajte do najpogosteje uporabljenih aplikacij kar na začetnem zaslonu. Predlogi se spreminjajo na podlagi dejanj, ki jih pogosto izvajate. Aplikacije v vrstici s priljubljenimi bodo premaknjene na začetni zaslon."</string>
-    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Preprosto dostopajte do najpogosteje uporabljenih aplikacij kar na začetnem zaslonu. Predlogi se spreminjajo na podlagi dejanj, ki jih pogosto izvajate. Aplikacije se iz spodnje vrstice premaknejo v novo mapo."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Preprosto dostopajte do najpogosteje uporabljenih aplikacij kar na začetnem zaslonu. Predlogi se spreminjajo na podlagi dejanj, ki jih pogosto izvajate. Aplikacije iz spodnje vrstice se premaknejo v novo mapo."</string>
     <string name="hotseat_edu_accept" msgid="1611544083278999837">"Prikaži predlagane aplikacije"</string>
     <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"Ne, hvala"</string>
     <string name="hotseat_prediction_settings" msgid="6246554993566070818">"Nastavitve"</string>
     <string name="hotseat_auto_enrolled" msgid="522100018967146807">"Tukaj so navedene najpogosteje uporabljene aplikacije in spremembe na podlagi rutin"</string>
-    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Če si želite ogledati predlagane aplikacije, povlecite aplikacije iz spodnje vrstice"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"Če si želite ogledati predlagane aplikacije, povlecite aplikacije iz spodnje vrstice."</string>
     <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"Predlagane aplikacije so bile dodane v prazni prostor"</string>
-    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Predlogi aplikacij so omogočeni"</string>
-    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Predlogi aplikacij so onemogočeni"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Predlogi aplikacij so omogočeni."</string>
+    <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Predlogi aplikacij so onemogočeni."</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predvidena aplikacija: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pazite, da ne povlečete s skrajno levega roba."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pazite, da povlečete z levega roba do sredine zaslona in dvignete prst."</string>
diff --git a/quickstep/res/values-sv/strings.xml b/quickstep/res/values-sv/strings.xml
index 4b4407b423..1838643a64 100644
--- a/quickstep/res/values-sv/strings.xml
+++ b/quickstep/res/values-sv/strings.xml
@@ -51,8 +51,7 @@
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Se till att du sveper från den högra kanten till mitten av skärmen och sedan släpper."</string>
     <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Nu kan du svepa från vänster för att gå tillbaka."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Nu kan du svepa från höger för att gå tillbaka. Nu ska du få lära dig hur du byter mellan appar."</string>
-    <!-- no translation found for back_gesture_feedback_complete_without_follow_up (6405649621667113830) -->
-    <skip />
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Du är klar med rörelsen för att gå tillbaka."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Se till att du inte sveper för nära skärmens nederkant."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Öppna inställningarna om du vill ändra rörelsens känslighet"</string>
     <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Återgå genom att svepa från vänster"</string>
@@ -62,19 +61,15 @@
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Se till att du sveper från nederkanten på skärmen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Se till att du sveper i en jämn rörelse innan du släpper."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Se till att du sveper rakt uppåt."</string>
-    <!-- no translation found for home_gesture_feedback_complete_with_follow_up (1427872029729605034) -->
-    <skip />
-    <!-- no translation found for home_gesture_feedback_complete_without_follow_up (8049099486868933882) -->
-    <skip />
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Du är klar med rörelsen för att öppna startskärmen. Nu ska du få lära dig hur du går tillbaka."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Du är klar med rörelsen för att öppna startskärmen."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Svep för att öppna startskärmen"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Svep uppåt från skärmens nederkant. Du kan alltid återgå startskärmen med den här rörelsen."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Se till att du sveper från nederkanten på skärmen."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Testa att trycka längre på fönstret innan du släpper."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Se till att du sveper rakt uppåt och sedan pausar."</string>
-    <!-- no translation found for overview_gesture_feedback_complete_with_follow_up (3544611727467765026) -->
-    <skip />
-    <!-- no translation found for overview_gesture_feedback_complete_without_follow_up (3199486203448379152) -->
-    <skip />
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Du har lärt dig hur du använder rörelser. Om du vill inaktivera rörelser öppnar du inställningarna."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Du är klar med rörelsen för att byta mellan appar."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Svep för att byta mellan appar"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Svep uppåt från skärmens nederkant. Håll fingret nedtryckt och släpp sedan."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Klart"</string>
diff --git a/quickstep/res/values-te/strings.xml b/quickstep/res/values-te/strings.xml
index a0351a79e3..0d18e35745 100644
--- a/quickstep/res/values-te/strings.xml
+++ b/quickstep/res/values-te/strings.xml
@@ -31,11 +31,11 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"యాప్ సలహాలు"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"అన్ని యాప్‌లు"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"మీ సూచించబడిన యాప్‌లు"</string>
-    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"మీ హోమ్ స్క్రీన్‌ దిగువ వరుసలో యాప్ సలహాలను పొందండి"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"మీ మొదటి స్క్రీన్‌ దిగువ వరుసలో యాప్ సలహాలను పొందండి"</string>
     <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"మీ హోమ్ స్క్రీన్‌లోని ఇష్టమైన వాటి వరుసలో యాప్ సూచ‌న‌లు పొందండి"</string>
-    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"మీరు ఎక్కువగా ఉపయోగించే యాప్‌లను నేరుగా హోమ్ స్క్రీన్‌లోనే సులభంగా యాక్సెస్ చేయండి. మీ రోజువారీ కార్యకలాపాలను బట్టి సూచనలు మారతాయి. దిగువ వరుసలోని యాప్‌లు మీ హోమ్ స్క్రీన్ పైకి చేరుకుంటాయి."</string>
-    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"మీరు ఎక్కువగా ఉపయోగించే యాప్‌లను నేరుగా హోమ్ స్క్రీన్‌లోనే సులభంగా యాక్సెస్ చేయండి. మీ రోజువారీ కార్యకలాపాలను బట్టి సూచనలు మారతాయి. ఇష్టమైన వాటి వరుసలోని యాప్‌లు మీ హోమ్ స్క్రీన్‌కు చేరుకుంటాయి."</string>
-    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"మీరు ఎక్కువగా ఉపయోగించే యాప్‌లను నేరుగా హోమ్ స్క్రీన్‌లోనే సులభంగా యాక్సెస్ చేయండి. మీ రోజువారీ కార్యకలాపాలను బట్టి సూచనలు మారతాయి. దిగువ వరుసలోని యాప్‌లు కొత్త ఫోల్డర్‌కు తరలించబడతాయి."</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"మీరు ఎక్కువగా ఉపయోగించే యాప్‌లను నేరుగా మొదటి స్క్రీన్‌లోనే సులభంగా యాక్సెస్ చేయండి. మీ రోజువారీ కార్యకలాపాలను బట్టి సూచనలు మారతాయి. దిగువ వరుసలోని యాప్‌లు మీ మొదటి స్క్రీన్ పైకి చేరుకుంటాయి."</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"మీరు ఎక్కువగా ఉపయోగించే యాప్‌లను నేరుగా మొదటి స్క్రీన్‌లోనే సులభంగా యాక్సెస్ చేయండి. మీ రోజువారీ కార్యకలాపాలను బట్టి సూచనలు మారతాయి. ఇష్టమైన వాటి వరుసలోని యాప్‌లు మీ మొదటి స్క్రీన్‌కు చేరుకుంటాయి."</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"మీరు ఎక్కువగా ఉపయోగించే యాప్‌లను నేరుగా మొదటి స్క్రీన్‌లోనే సులభంగా యాక్సెస్ చేయండి. మీ రోజువారీ కార్యకలాపాలను బట్టి సూచనలు మారతాయి. దిగువ వరుసలోని యాప్‌లు కొత్త ఫోల్డర్‌కు తరలించబడతాయి."</string>
     <string name="hotseat_edu_accept" msgid="1611544083278999837">"యాప్ సూచ‌న‌లను పొందండి"</string>
     <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"వద్దు"</string>
     <string name="hotseat_prediction_settings" msgid="6246554993566070818">"సెట్టింగ్‌లు"</string>
diff --git a/quickstep/res/values-th/strings.xml b/quickstep/res/values-th/strings.xml
index a13b43b776..1758589f8b 100644
--- a/quickstep/res/values-th/strings.xml
+++ b/quickstep/res/values-th/strings.xml
@@ -42,7 +42,7 @@
     <string name="hotseat_auto_enrolled" msgid="522100018967146807">"แอปที่ใช้มากที่สุดจะปรากฎที่นี่และจะเปลี่ยนไปตามการใช้งานประจำ"</string>
     <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"ลากแอปออกจากแถวล่างเพื่อดูแอปแนะนำ"</string>
     <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"เพิ่มคำแนะนำเกี่ยวกับแอปในพื้นที่ว่างแล้ว"</string>
-    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"เปิดใช้คำแนะนำเกี่ยวกับแอปแล้ว"</string>
+    <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"เปิดใช้แอปแนะนำแล้ว"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ปิดใช้คำแนะนำเกี่ยวกับแอปอยู่"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"แอปที่คาดว่าจะใช้: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ตรวจสอบว่าปัดจากขอบด้านซ้ายสุด"</string>
diff --git a/quickstep/res/values-zh-rTW/strings.xml b/quickstep/res/values-zh-rTW/strings.xml
index f3cb45840c..51bb189cd8 100644
--- a/quickstep/res/values-zh-rTW/strings.xml
+++ b/quickstep/res/values-zh-rTW/strings.xml
@@ -31,16 +31,16 @@
     <string name="title_app_suggestions" msgid="4185902664111965088">"應用程式建議"</string>
     <string name="all_apps_label" msgid="8542784161730910663">"所有應用程式"</string>
     <string name="all_apps_prediction_tip" msgid="2672336544844936186">"系統預測你會使用的應用程式"</string>
-    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"在主畫面的底部取得應用程式建議"</string>
+    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"在主畫面底部顯示應用程式建議"</string>
     <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"在主畫面的收藏列取得應用程式建議"</string>
-    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"在主畫面上輕鬆存取最常使用的應用程式。應用程式建議會依據你的日常使用習慣而有所不同。系統會將底部列出的應用程式上移到主畫面。"</string>
-    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"在主畫面上輕鬆存取最常使用的應用程式。系統會根據你的日常使用習慣提供不同的應用程式建議，並在主畫面顯示收藏列中的應用程式。"</string>
-    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"在主畫面上輕鬆存取最常使用的應用程式。應用程式建議會根據日常安排有所不同。系統會將底部列出的應用程式移到新的資料夾。"</string>
+    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"你可以輕鬆地在主畫面上找到自己常用的應用程式。應用程式建議會依據你的日常使用習慣而有所不同。系統會將底部列出的應用程式上移到主畫面。"</string>
+    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"你可以輕鬆地在主畫面上找到自己常用的應用程式。系統會根據你的日常使用習慣提供不同的應用程式建議，並在主畫面顯示收藏列中的應用程式。"</string>
+    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"你可以輕鬆地在主畫面上找到自己常用的應用程式。應用程式建議會根據日常安排有所不同。系統會將底部列出的應用程式移到新的資料夾。"</string>
     <string name="hotseat_edu_accept" msgid="1611544083278999837">"取得應用程式建議"</string>
     <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"不用了，謝謝"</string>
     <string name="hotseat_prediction_settings" msgid="6246554993566070818">"設定"</string>
     <string name="hotseat_auto_enrolled" msgid="522100018967146807">"最常使用的應用程式會顯示在這裡，顯示的項目會根據日常安排有所不同"</string>
-    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"將應用程式從底部列向外拖曳，即可取得應用程式建議"</string>
+    <string name="hotseat_tip_no_empty_slots" msgid="1325212677738179185">"將底部列中顯示的應用程式拖曳出來，即可取得應用程式建議"</string>
     <string name="hotseat_tip_gaps_filled" msgid="3035673010274223538">"應用程式建議已新增到空白位置"</string>
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"應用程式建議功能已啟用"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"應用程式建議功能已停用"</string>
@@ -83,7 +83,7 @@
     <string name="allset_description" msgid="6350320429953234580">"你可以開始使用手機了"</string>
     <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"無障礙工具的導覽設定"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"分享"</string>
-    <string name="action_screenshot" msgid="8171125848358142917">"擷取螢幕畫面"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"螢幕截圖"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"這個應用程式或貴機構不允許執行這個動作"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"要略過手勢操作教學課程嗎？"</string>
     <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"你之後可以在「<xliff:g id="NAME">%1$s</xliff:g>」應用程式找到這些說明"</string>
-- 
GitLab


From 360a6e593bcad14702bdb5f456dd0bcab54864f0 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Tue, 15 Jun 2021 16:42:33 +0000
Subject: [PATCH 1406/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I7eaab8bb5354b70f5fb4f6531a06ccb1d297c1fd
---
 res/values-af/strings.xml        | 18 ++++++++---------
 res/values-am/strings.xml        | 18 ++++++++---------
 res/values-ar/strings.xml        | 20 +++++++++----------
 res/values-as/strings.xml        | 18 ++++++++---------
 res/values-az/strings.xml        | 24 +++++++++++------------
 res/values-b+sr+Latn/strings.xml | 20 +++++++++----------
 res/values-be/strings.xml        | 18 ++++++++---------
 res/values-bg/strings.xml        | 18 ++++++++---------
 res/values-bn/strings.xml        | 22 +++++++++++----------
 res/values-bs/strings.xml        | 20 +++++++++----------
 res/values-ca/strings.xml        | 18 ++++++++---------
 res/values-cs/strings.xml        | 20 +++++++++----------
 res/values-da/strings.xml        | 22 ++++++++++-----------
 res/values-de/strings.xml        | 20 +++++++++----------
 res/values-el/strings.xml        | 18 ++++++++---------
 res/values-en-rAU/strings.xml    | 18 ++++++++---------
 res/values-en-rCA/strings.xml    | 18 ++++++++---------
 res/values-en-rGB/strings.xml    | 18 ++++++++---------
 res/values-en-rIN/strings.xml    | 18 ++++++++---------
 res/values-en-rXC/strings.xml    | 18 ++++++++---------
 res/values-es-rUS/strings.xml    | 20 +++++++++----------
 res/values-es/strings.xml        | 22 ++++++++++-----------
 res/values-et/strings.xml        | 22 ++++++++++-----------
 res/values-eu/strings.xml        | 22 ++++++++++-----------
 res/values-fa/strings.xml        | 20 +++++++++----------
 res/values-fi/strings.xml        | 20 +++++++++----------
 res/values-fr-rCA/strings.xml    | 20 +++++++++----------
 res/values-fr/strings.xml        | 20 +++++++++----------
 res/values-gl/strings.xml        | 18 ++++++++---------
 res/values-gu/strings.xml        | 22 +++++++++++----------
 res/values-hi/strings.xml        | 18 ++++++++---------
 res/values-hr/strings.xml        | 22 ++++++++++-----------
 res/values-hu/strings.xml        | 18 ++++++++---------
 res/values-hy/strings.xml        | 22 ++++++++++-----------
 res/values-in/strings.xml        | 22 ++++++++++-----------
 res/values-is/strings.xml        | 18 ++++++++---------
 res/values-it/strings.xml        | 18 ++++++++---------
 res/values-iw/strings.xml        | 22 ++++++++++-----------
 res/values-ja/strings.xml        | 24 +++++++++++------------
 res/values-ka/strings.xml        | 18 ++++++++---------
 res/values-kk/strings.xml        | 24 +++++++++++------------
 res/values-km/strings.xml        | 20 +++++++++----------
 res/values-kn/strings.xml        | 20 ++++++++++---------
 res/values-ko/strings.xml        | 18 ++++++++---------
 res/values-ky/strings.xml        | 22 ++++++++++-----------
 res/values-lo/strings.xml        | 20 +++++++++----------
 res/values-lt/strings.xml        | 18 ++++++++---------
 res/values-lv/strings.xml        | 18 ++++++++---------
 res/values-mk/strings.xml        | 18 ++++++++---------
 res/values-ml/strings.xml        | 24 +++++++++++------------
 res/values-mn/strings.xml        | 20 +++++++++----------
 res/values-mr/strings.xml        | 25 +++++++++++++++---------
 res/values-ms/strings.xml        | 18 ++++++++---------
 res/values-my/strings.xml        | 18 ++++++++---------
 res/values-nb/strings.xml        | 18 ++++++++---------
 res/values-ne/strings.xml        | 33 ++++++++++++++++----------------
 res/values-nl/strings.xml        | 18 ++++++++---------
 res/values-or/strings.xml        | 22 ++++++++++-----------
 res/values-pa/strings.xml        | 29 ++++++++++++++--------------
 res/values-pl/strings.xml        | 18 ++++++++---------
 res/values-pt-rPT/strings.xml    | 20 +++++++++----------
 res/values-pt/strings.xml        | 20 +++++++++----------
 res/values-ro/strings.xml        | 18 ++++++++---------
 res/values-ru/strings.xml        | 22 ++++++++++-----------
 res/values-si/strings.xml        | 18 ++++++++---------
 res/values-sk/strings.xml        | 18 ++++++++---------
 res/values-sl/strings.xml        | 20 +++++++++----------
 res/values-sq/strings.xml        | 18 ++++++++---------
 res/values-sr/strings.xml        | 20 +++++++++----------
 res/values-sv/strings.xml        | 20 +++++++++----------
 res/values-sw/strings.xml        | 18 ++++++++---------
 res/values-ta/strings.xml        | 18 ++++++++---------
 res/values-te/strings.xml        | 30 +++++++++++++++--------------
 res/values-th/strings.xml        | 22 ++++++++++-----------
 res/values-tl/strings.xml        | 18 ++++++++---------
 res/values-tr/strings.xml        | 20 +++++++++----------
 res/values-uk/strings.xml        | 20 +++++++++----------
 res/values-ur/strings.xml        | 20 ++++++++++---------
 res/values-uz/strings.xml        | 22 ++++++++++-----------
 res/values-vi/strings.xml        | 18 ++++++++---------
 res/values-zh-rCN/strings.xml    | 27 ++++++++++++--------------
 res/values-zh-rHK/strings.xml    | 18 ++++++++---------
 res/values-zh-rTW/strings.xml    | 18 ++++++++---------
 res/values-zu/strings.xml        | 20 +++++++++----------
 84 files changed, 854 insertions(+), 842 deletions(-)

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index ad353e11c3..2703eb5e98 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Gesprekke"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Nuttige inligting binne jou bereik"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Jy kan legstukke by jou tuisskerm voeg om inligting te kry sonder om programme oop te maak"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Tik om legstukinstellings te verander"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Het dit"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Verander legstukinstellings"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Deursoek programme"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Laai tans programme …"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Kon geen programme kry wat by \"<xliff:g id="QUERY">%1$s</xliff:g>\" pas nie"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Persoonlik"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Werk"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Werkprofiel"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Persoonlike programme is apart en van werkprogramme versteek."</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Jou IT-admin kan jou werkprogramme en -data sien"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Volgende"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Het dit"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Werkprofiel is onderbreek"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Werkprogramme kan nie vir jou kennisgewings stuur, jou battery gebruik of toegang tot jou ligging kry nie"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Werkprofiel is onderbreek. Werkprogramme kan nie vir jou kennisgewings stuur, jou battery gebruik of toegang tot jou ligging kry nie"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Werkprogramme is af"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Jou werkprogramme kan nie vir jou kennisgewings stuur, jou battery gebruik of toegang tot jou ligging kry nie"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Werkprogramme is af. Jou werkprogramme kan nie vir jou kennisgewings stuur, jou battery gebruik of toegang tot jou ligging kry nie"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Werkprogramme het \'n kenteken en is sigbaar vir jou IT-administrateur"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Het dit"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Onderbreek werkprogramme"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Skakel aan"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Skakel werkprogramme af"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Skakel werkprogramme aan"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filter"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Onderbreek werkprogramme en kennisgewings"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Misluk: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 34cdc03f0c..846de43d4a 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"ውይይቶች"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"በጣቶችዎ ጫፎች ላይ ጠቃሚ መረጃ"</string>
     <string name="widget_education_content" msgid="745542879510751525">"መተግበሪያዎችን ሳይከፍቱ መረጃ ለማግኘት በመነሻ ማያ ገጽዎ ላይ ምግብሮችን ማከል ይችላሉ"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"የምግብር ቅንብሮችን ለመለወጥ መታ ያድርጉ"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"ገባኝ"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"የምግብር ቅንብሮችን ይለውጡ"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"መተግበሪያዎችን ፈልግ"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"መተግበሪያዎችን በመጫን ላይ…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"ከ«<xliff:g id="QUERY">%1$s</xliff:g>» ጋር የሚዛመዱ ምንም መተግበሪያዎች አልተገኙም"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"የግል"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"ሥራ"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"የሥራ መገለጫ"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"የግል ውሂብ የተለየ እና ከሥራ መተግበሪያዎች የተደበቀ ነው"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"የስራ መተግበሪያዎች እና ውሂብ የተለዩ እና ከሥራ መተግበሪያዎች የተደበቁ ናቸው"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"ቀጣይ"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ገባኝ"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"የሥራ መገለጫ ባለበት ቆሟል"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"የስራ መተግበሪያዎች ማሳወቂያዎችን ወደ እርስዎ መላክ፣ ባትሪዎን መጠቀም ወይም አካባቢዎ ዘንድ መድረስ አይችሉም"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"የሥራ መገለጫ ባለበት ቆሟል። የስራ መተግበሪያዎች ማሳወቂያዎችን ወደ እርስዎ መላክ፣ ባትሪዎን መጠቀም ወይም አካባቢዎ ዘንድ መድረስ አይችሉም"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"የሥራ መተግበሪያዎች ጠፍተዋል"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"የስራ መተግበሪያዎችዎ ማሳወቂያዎችን ሊልክልዎ፣ ባትሪዎን መጠቀም ወይም አካባቢዎን መድረስ አይችሉም"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"የሥራ መተግበሪያዎች ጠፍተዋል። የስራ መተግበሪያዎችዎ ማሳወቂያዎችን ሊልክልዎ፣ ባትሪዎን መጠቀም ወይም አካባቢዎን መድረስ አይችሉም"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"የሥራ መተግበሪያዎች ባጅ የተደረገባቸው ሲሆን ለእርስዎ IT ቡድን ታይ ናቸው"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"ገባኝ"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"የሥራ መተግበሪያዎችን ባሉበት አቁም"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"አብራ"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"የሥራ መተግበሪያዎችን ያጥፉ"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"የሥራ መተግበሪያዎችን ያብሩ"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"አጣራ"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"የስራ መተግበሪያዎችን እና ማሳወቂያዎችን ባሉበት ያቁሙ"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"አልተሳካም፦ <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 7a5488fd4a..18ce18c23b 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -61,7 +61,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"المحادثات"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"معلومات مفيدة في متناول يديك"</string>
     <string name="widget_education_content" msgid="745542879510751525">"للحصول على معلومات بدون فتح التطبيقات، يمكنك إضافة الأدوات إلى الشاشة الرئيسية."</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"انقر لتغيير إعدادات الأداة"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"حسنًا"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"تغيير إعدادات الأداة"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"بحث في التطبيقات"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"جارٍ تحميل التطبيقات…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"لم يتم العثور على أي تطبيقات تتطابق مع \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -70,7 +72,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"الإشعارات"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"انقر مرتين مع تثبيت إصبعك لنقل اختصار."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"انقر مرتين مع تثبيت إصبعك لنقل اختصار أو استخدام الإجراءات المخصّصة."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"ليس هناك مساحة أخرى في هذه الشاشة الرئيسية."</string>
+    <string name="out_of_space" msgid="4691004494942118364">"لا يتبقى مساحة على هذه الشاشة الرئيسية."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"لا يوجد المزيد من الحقول في علبة المفضلة"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"قائمة التطبيقات"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"قائمة التطبيقات الشخصية"</string>
@@ -166,18 +168,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"شخصية"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"للعمل"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"الملف الشخصي للعمل"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"إن البيانات الشخصية منفصلة عن تطبيقات العمل ومخفية عنها"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"إن بيانات وتطبيقات العمل مرئية لمشرف تكنولوجيا المعلومات في مؤسستك"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"التالي"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"حسنًا"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"تم إيقاف الملف الشخصي للعمل مؤقتًا"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"لا يمكن لتطبيقات العمل إرسال إشعارات إليك أو استخدام بطاريتك أو الوصول إلى موقعك الجغرافي."</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"تم إيقاف الملف الشخصي للعمل مؤقتًا. لا يمكن لتطبيقات العمل إرسال إشعارات إليك أو استخدام بطاريتك أو الوصول إلى موقعك الجغرافي."</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"تطبيقات العمل غير مفعّلة"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"لا يمكن لتطبيقات العمل إرسال إشعارات إليك أو استخدام بطاريتك أو الوصول إلى موقعك الجغرافي."</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"تطبيقات العمل غير مفعّلة، وبالتالي لا يمكنها إرسال إشعارات إليك أو استخدام بطاريتك أو الوصول إلى موقعك الجغرافي."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"تحمل تطبيقات العمل شارة وتكون مرئية لمشرف تكنولوجيا المعلومات."</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"حسنًا"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"إيقاف تطبيقات العمل مؤقتًا"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"تفعيل"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"إيقاف تطبيقات العمل"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"تفعيل تطبيقات العمل"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"فلتر"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"إيقاف تطبيقات العمل وإشعاراتها مؤقتًا"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"تعذَّر <xliff:g id="WHAT">%1$s</xliff:g>."</string>
 </resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 1b2d8a11b9..1f217cf7b6 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"বাৰ্তালাপ"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"আপোনাৰ আঙুলিৰে টিপতে উপযোগী তথ্য পাওক"</string>
     <string name="widget_education_content" msgid="745542879510751525">"এপ্‌ নোখোলাকৈ তথ্য পাবলৈ আপুনি নিজৰ গৃহ স্ক্ৰীনত ৱিজেট যোগ দিব পাৰে"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"ৱিজেটৰ ছেটিং সলনি কৰিবলৈ টিপক"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"বুজি পালোঁ"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"ৱিজেটৰ ছেটিং সলনি কৰক"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"এপসমূহ সন্ধান কৰক"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"এপসমূহ ল’ড কৰি থকা হৈছে…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\"ৰ সৈতে মিলা কোনো এপ্ বিচাৰি পোৱা নগ\'ল"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ব্যক্তিগত"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"কৰ্মস্থান"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"কৰ্মস্থানৰ প্ৰ\'ফাইল"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"ব্যক্তিগত ডেটাখিনি পৃথক হয় আৰু সেইখিনি কর্মস্থানৰ এপ্‌সমূহৰ পৰা লুকুওৱা আছে"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"আপোনাৰ আইটি প্ৰশাসকে কর্মস্থানৰ এপ্‌সমূহ আৰু ডেটা দেখা পায়"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"পৰৱৰ্তী"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"বুজি পালোঁ"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"কৰ্মস্থানৰ প্ৰ\'ফাইলটো পজ কৰা আছে"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"কৰ্মস্থানৰ এপ্‌সমূহে আপোনালৈ জাননী পঠিয়াব, আপোনাৰ বেটাৰী ব্যৱহাৰ কৰিব অথবা আপোনাৰ অৱস্থান এক্সেছ কৰিব নোৱাৰে"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"কৰ্মস্থানৰ প্ৰ’ফাইলটো পজ কৰা আছে। কৰ্মস্থানৰ এপ্‌সমূহে আপোনালৈ জাননী পঠিয়াব, আপোনাৰ বেটাৰী ব্যৱহাৰ কৰিব অথবা আপোনাৰ অৱস্থান এক্সেছ কৰিব নোৱাৰে"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"কৰ্মস্থানৰ এপ্‌সমূহ অফ হৈ আছে"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"আপোনাৰ কৰ্মস্থানৰ এপ্‌সমূহে আপোনালৈ জাননী পঠিয়াব, আপোনাৰ বেটাৰী ব্যৱহাৰ কৰিব অথবা আপোনাৰ অৱস্থান এক্সেছ কৰিব নোৱাৰে"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"কৰ্মস্থানৰ এপ্‌সমূহ অফ হৈ আছে। আপোনাৰ কৰ্মস্থানৰ এপ্‌সমূহে আপোনালৈ জাননী পঠিয়াব, আপোনাৰ বেটাৰী ব্যৱহাৰ কৰিব অথবা আপোনাৰ অৱস্থান এক্সেছ কৰিব নোৱাৰে"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"কর্মস্থানৰ এপ্‌সমূহ প্ৰতীকেৰে চিহ্নিত কৰা হয় আৰু সেইবোৰ আপোনাৰ আইটি প্ৰশাসকৰ বাবে দৃশ্যমান হয়"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"বুজি পালোঁ"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"কৰ্মস্থানৰ এপ্‌ পজ কৰক"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"অন কৰক"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"কৰ্মস্থানৰ এপ্‌সমূহ অফ কৰক"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"কৰ্মস্থানৰ এপ্‌সমূহ অন কৰক"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"ফিল্টাৰ"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"কর্মস্থানৰ এপ্‌সমূহ আৰু জাননীসমূহ পজ কৰক"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"বিফল: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 41573d91f3..f73e500c4f 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Söhbətlər"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Faydalı məlumatlar barmaqlarınızın ucunda"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Tətbiqləri açmadan məlumat almaq üçün Əsas ekrana vidcet əlavə edə bilərsiniz"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Vidcet ayarlarını dəyişmək üçün toxunun"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Anladım"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Vidcet ayarlarını dəyişin"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Tətbiqləri axtarın"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Tətbiqlər yüklənir…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"<xliff:g id="QUERY">%1$s</xliff:g> sorğusuna uyğun tətbiq tapılmadı"</string>
@@ -69,7 +71,7 @@
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"İş tətbiqlərinin siyahısı"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"Silin"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Sistemdən sil"</string>
-    <string name="app_info_drop_target_label" msgid="692894985365717661">"Tətbiq infosu"</string>
+    <string name="app_info_drop_target_label" msgid="692894985365717661">"Tətbiq haqqında"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Quraşdırın"</string>
     <string name="dismiss_prediction_label" msgid="3357562989568808658">"Tətbiq təklif olunmasın"</string>
     <string name="pin_prediction" msgid="4196423321649756498">"Proqnozlaşdırılan tətbiqi bərkidin"</string>
@@ -103,7 +105,7 @@
     <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Divar kağızı və üslub"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Home ayarları"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Admininiz tərəfindən deaktiv edilib"</string>
-    <string name="allow_rotation_title" msgid="7728578836261442095">"Əsas ekranın firlanmağına icazə verin"</string>
+    <string name="allow_rotation_title" msgid="7728578836261442095">"Əsas ekran çevrilsin"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"Telefon çevrilən zaman"</string>
     <string name="notification_dots_title" msgid="9062440428204120317">"Bildiriş nöqtələri"</string>
     <string name="notification_dots_desc_on" msgid="1679848116452218908">"Aktiv"</string>
@@ -112,7 +114,7 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Bildiriş Nöqtələrini göstərmək üçün <xliff:g id="NAME">%1$s</xliff:g> bildirişlərini aktiv edin"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Ayarları dəyişin"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Bildiriş nöqtələrini göstərin"</string>
-    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Tətbiq ikonalarını Ana ekrana əlavə edin"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Əsas ekrana nişanlar əlavə edilsin"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Yeni tətbiqlər üçün"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Naməlum"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Yığışdır"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Şəxsi"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"İş"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"İş profili"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Şəxsi data ayrı olur və iş tətbiqlərindən gizlədilir"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"İş tətbiqləri və datasını İT admininiz görə bilir"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Növbəti"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Anladım"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"İş profilinə fasilə verilib"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"İş tətbiqləri sizə bildirişlər göndərə, batareyanızdan istifadə edə və ya məkanınıza daxil ola bilməz"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"İş profili durdurulub. İş tətbiqləri sizə bildirişlər göndərə, batareyanızdan istifadə edə və ya məkanınıza daxil ola bilməz"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"İş tətbiqləri deaktivdir"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"İş tətbiqləriniz sizə bildirişlər göndərə, batareyanızdan istifadə edə və ya məkanınıza daxil ola bilməz"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"İş tətbiqləri deaktivdir. İş tətbiqləriniz sizə bildirişlər göndərə, batareyanızdan istifadə edə və ya məkanınıza daxil ola bilməz"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"İş tətbiqləri nişanlanıb və İT administratorunuza görünür"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Anladım"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"İş tətbiqlərini durdurun"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Aktiv edin"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"İş tətbiqlərini deaktiv edin"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"İş tətbiqlərini aktiv edin"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtr"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"İş tətbiqlərinə və bildirişlərə fasilə verin"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Alınmadı: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 1417ea66d4..a5000765fb 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -46,7 +46,7 @@
     </plurals>
     <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"Vidžeti"</string>
-    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Pretraga"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Pretražite"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Obrišite tekst iz okvira za pretragu"</string>
     <string name="no_widgets_available" msgid="9140948620298620513">"Nije dostupan nijedan vidžet"</string>
     <string name="no_search_results" msgid="6518732304311458580">"Nema rezultata pretrage"</string>
@@ -55,7 +55,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Konverzacije"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Korisne informacije nadohvat ruke"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Da biste pronašli informacije bez otvaranja aplikacija, možete da dodate vidžete na početni ekran"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Dodirnite da biste promenili podešavanja vidžeta"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Važi"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Promenite podešavanja vidžeta"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Pretražite aplikacije"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Aplikacije se učitavaju…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nije pronađena nijedna aplikacija za „<xliff:g id="QUERY">%1$s</xliff:g>“"</string>
@@ -157,18 +159,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Lične"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Poslovne"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Poslovni profil"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Lični podaci su odvojeni i sakriveni od aplikacija za posao"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"IT administrator vidi poslovne aplikacije i podatke"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Dalje"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Važi"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Poslovni profil je pauziran"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Poslovne aplikacije ne mogu da vam šalju obaveštenja, koriste bateriju niti pristupaju lokaciji"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Poslovni profil je pauziran. Poslovne aplikacije ne mogu da vam šalju obaveštenja, koriste bateriju niti pristupaju lokaciji"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Poslovne aplikacije su isključene"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Poslovne aplikacije ne mogu da vam šalju obaveštenja, koriste bateriju niti pristupaju lokaciji"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Poslovne aplikacije su isključene. Poslovne aplikacije ne mogu da vam šalju obaveštenja, koriste bateriju niti pristupaju lokaciji"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Poslovne aplikacije su označene značkom i IT administrator može da ih vidi"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Važi"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pauziraj poslovne aplikacije"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Uključi"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Isključi poslovne aplikacije"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Uključi poslovne aplikacije"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filter"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Pauzirajte poslovne aplikacije i obaveštenja"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Nije uspelo: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index c0047ce133..aa8acd65d0 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -57,7 +57,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Размовы"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Карысная інфармацыя ў вас пад рукой"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Каб не адкрываць праграмы для прагляду патрэбнай інфармацыі, дадайце віджэты на галоўны экран"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Націсніце, каб змяніць налады віджэта"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Зразумела"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Змяніць налады віджэта"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Пошук праграм"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Праграмы загружаюцца…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Праграм, якія адпавядаюць запыту \"<xliff:g id="QUERY">%1$s</xliff:g>\", не знойдзена"</string>
@@ -160,18 +162,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Асабістыя"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Працоўныя"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Працоўны профіль"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Асабістыя даныя схаваны і паказваюцца адасоблена ад працоўных праграм"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Ваш IТ-адміністратар мае доступ да працоўных праграм і іх даных"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Далей"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Зразумела"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Працоўны профіль прыпынены"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Працоўныя праграмы не могуць адпраўляць вам апавяшчэнні, выкарыстоўваць акумулятар або атрымліваць доступ да даных пра ваша месцазнаходжанне"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Працоўны профіль прыпынены. Працоўныя праграмы не могуць адпраўляць вам апавяшчэнні, выкарыстоўваць акумулятар або атрымліваць доступ да даных пра ваша месцазнаходжанне"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Працоўныя праграмы выключаны"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Працоўныя праграмы не могуць адпраўляць вам апавяшчэнні, выкарыстоўваць акумулятар або атрымліваць доступ да даных пра ваша месцазнаходжанне"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Працоўныя праграмы выключаны. Яны не могуць адпраўляць вам апавяшчэнні, выкарыстоўваць акумулятар або атрымліваць доступ да вашага месцазнаходжання"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Працоўныя праграмы маюць значкі і бачныя IT-адміністратару"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Зразумела"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Прыпыніць працоўныя праграмы"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Уключыць"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Выключыць працоўныя праграмы"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Уключыць працоўныя праграмы"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Фільтр"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Прыпыніць працоўныя праграмы і апавяшчэнні"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Не ўдалося: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 69f20747b7..117ee45e7b 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Разговори"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Лесен достъп до полезна информация"</string>
     <string name="widget_education_content" msgid="745542879510751525">"За да получавате информация, без да отваряте приложенията, можете да добавите приспособления към началния екран"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Докоснете, за да промените настройките на приспособлението"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Разбрах"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Промяна на настройките на приспособлението"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Търсене в приложенията"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Приложенията се зареждат…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Няма намерени приложения, съответстващи на „<xliff:g id="QUERY">%1$s</xliff:g>“"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Лични"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Служебни"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Служебен потребителски профил"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Личните данни се съхраняват отделно и са скрити от служебните приложения"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Служебните приложения и данни са видими за системния ви администратор"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Напред"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Разбрах"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Служебният потребителски профил е поставен на пауза"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Служебните приложения не могат да ви изпращат известия, да използват батерията или да осъществяват достъп до местоположението ви"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Служебният потребителски профил е поставен на пауза. Служебните приложения не могат да ви изпращат известия, да използват батерията или да осъществяват достъп до местоположението ви"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Служебните ви приложения са изключени"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Служебните ви приложения не могат да ви изпращат известия, да използват батерията или да осъществяват достъп до местоположението ви"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Служебните ви приложения са изключени. Те не могат да ви изпращат известия, да използват батерията или да осъществяват достъп до местоположението ви"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Служебните приложения са означени със значка и са видими за системния администратор"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Разбрах"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Поставяне на пауза на служебните приложения"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Включване"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Изключване на служебните приложения"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Включване на служебните приложения"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Филтър"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Поставете на пауза служебните приложения и известия"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Неуспешно: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 8c8292d25b..e88e4b923d 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -53,7 +53,11 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"কথোপকথন"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"সহজেই দরকারি তথ্য পান"</string>
     <string name="widget_education_content" msgid="745542879510751525">"অ্যাপ না খুলে তথ্য পাওয়ার জন্য, আপনার হোম স্ক্রিনে উইজেট যোগ করতে পারেন"</string>
+    <!-- no translation found for reconfigurable_widget_education_tip (6336962690888067057) -->
+    <skip />
     <string name="widget_education_close_button" msgid="8676165703104836580">"বুঝেছি"</string>
+    <!-- no translation found for widget_reconfigure_button_content_description (8811472721881205250) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"অ্যাপ খুঁজুন"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"অ্যাপ লোড হচ্ছে…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" এর সাথে মেলে এমন কোনো অ্যাপ পাওয়া যায়নি"</string>
@@ -128,7 +132,7 @@
     <string name="action_move_here" msgid="2170188780612570250">"এখানে আইটেম সরান"</string>
     <string name="item_added_to_workspace" msgid="4211073925752213539">"হোম স্ক্রীনে আইটেম যোগ করা হয়েছে"</string>
     <string name="item_removed" msgid="851119963877842327">"আইটেম সরানো হয়েছে"</string>
-    <string name="undo" msgid="4151576204245173321">"ফিরে যান"</string>
+    <string name="undo" msgid="4151576204245173321">"ফিরিয়ে আনুন"</string>
     <string name="action_move" msgid="4339390619886385032">"আইটেম সরান"</string>
     <string name="move_to_empty_cell" msgid="2833711483015685619">"সারি <xliff:g id="NUMBER_0">%1$s</xliff:g> কলাম <xliff:g id="NUMBER_1">%2$s</xliff:g> এ সরান"</string>
     <string name="move_to_position" msgid="6750008980455459790">"অবস্থানে সরান <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
@@ -154,18 +158,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ব্যক্তিগত"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"অফিস"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"অফিসের প্রোফাইল"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"অফিসের অ্যাপের থেকে ব্যক্তিগত ডেটা আলাদা করে লুকিয়ে রাখা হয়"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"আপনার আইটি অ্যাডমিন অফিস অ্যাপ এবং ডেটা দেখতে পাবেন"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"পরের"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"বুঝেছি"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"অফিস প্রোফাইল বন্ধ করা আছে"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"অফিসের অ্যাপ আপনাকে নোটিফিকেশন পাঠাতে পারবে না। এছাড়া, ব্যাটারি ব্যবহার করতে বা লোকেশন অ্যাক্সেস করতে পারবে না"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"অফিসের প্রোফাইল পজ করা আছে। অফিসের অ্যাপ আপনাকে নোটিফিকেশন পাঠাতে পারবে না। এছাড়া, ব্যাটারি ব্যবহার করতে বা লোকেশন অ্যাক্সেস করতে পারবে না"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"অফিসের অ্যাপ বন্ধ আছে"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"অফিসের অ্যাপ আপনাকে নোটিফিকেশন পাঠাতে পারবে না। এছাড়া, ব্যাটারি ব্যবহার করতে বা লোকেশন অ্যাক্সেস করতে পারবে না"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"অফিসের অ্যাপ বন্ধ আছে। আপনার অফিসের অ্যাপ আপনাকে বিজ্ঞপ্তি পাঠাতে, ব্যাটারি ব্যবহার করতে বা লোকেশন অ্যাক্সেস করতে পারবে না"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"অফিসের অ্যাপে ব্যাজ যোগ করা হয়েছে এবং আপনার আইটি অ্যাডমিন সেটি দেখতে পাবেন"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"বুঝেছি"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"অফিসের অ্যাপ পজ করুন"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"চালু করুন"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"অফিসের অ্যাপ বন্ধ করুন"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"অফিসের অ্যাপ চালু করুন"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"ফিল্টার"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"অফিস অ্যাপ এবং বিজ্ঞপ্তি বন্ধ করুন"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"কাজটি করা যায়নি: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index bfec27d709..ed7050fa30 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -55,7 +55,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Razgovori"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Korisne informacije nadohvat ruke"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Da dobijete informacije bez otvaranja aplikacija, možete dodati vidžete na početni ekran"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Dodirnite da promijenite postavke vidžeta"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Razumijem"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Promjena postavki vidžeta"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Pretražite aplikacije"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Aplikacije se učitavaju…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nije pronađena nijedna aplikacija za upit \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -64,7 +66,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Obavještenja"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Dodirnite i zadržite da pomjerite prečicu."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dvaput dodirnite i zadržite da pomjerite prečicu ili da koristite prilagođene radnje."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Na ovom početnom ekranu nema više prostora."</string>
+    <string name="out_of_space" msgid="4691004494942118364">"Nema više prostora na ovom početnom ekranu."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Nema više prostora u ladici Omiljeno"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista aplikacija"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista ličnih aplikacija"</string>
@@ -157,18 +159,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Lične"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Poslovne"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Radni profil"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Lični podaci su odvojeni i sakriveni od poslovnih aplikacija"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Vaš IT administrator može vidjeti poslovne aplikacije i podatke"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Sljedeće"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Razumijem"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Radni profil je pauziran"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Poslovne aplikacije vam ne mogu slati obavještenja, koristiti bateriju niti pristupiti vašoj lokaciji"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Radni profil je pauziran. Poslovne aplikacije vam ne mogu slati obavještenja, koristiti bateriju niti pristupiti vašoj lokaciji"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Poslovne aplikacije su isključene"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Poslovne aplikacije vam ne mogu slati obavještenja, koristiti bateriju niti pristupiti vašoj lokaciji"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Poslovne aplikacije su isključene. Poslovne aplikacije vam ne mogu slati obavještenja, koristiti bateriju ili pristupiti vašoj lokaciji"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Poslovne aplikacije su označene i vaš IT administrator ih može vidjeti"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Razumijem"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pauziraj poslovne aplikacije"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Uključi"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Isključi poslovne aplikacije"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Uključi poslovne aplikacije"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtrirajte"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Pauzirajte poslovne aplikacije i obavještenja"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Nije uspjelo: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index d35bfc66da..306e0c220f 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Converses"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Informació útil a l\'abast de la mà"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Per obtenir informació sense obrir les aplicacions, pots afegir widgets a la pantalla d\'inici"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Toca per canviar la configuració del widget"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Entesos"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Canvia la configuració del widget"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Cerca aplicacions"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"S\'estan carregant les aplicacions…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"No s\'ha trobat cap aplicació que coincideixi amb \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personal"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Treball"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de treball"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Les dades personals s\'oculten i se separen de les aplicacions de treball"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"L\'administrador de TI pot veure les teves dades i aplicacions de treball"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Següent"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Entesos"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"El perfil de treball està en pausa"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Les aplicacions de treball no poden enviar-te notificacions, consumir bateria ni accedir a la teva ubicació"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"El perfil de treball està en pausa. Les aplicacions de treball no poden enviar-te notificacions, consumir bateria ni accedir a la teva ubicació."</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Les aplicacions de treball estan desactivades"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Les aplicacions de treball no poden enviar-te notificacions, consumir bateria ni accedir a la teva ubicació"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Les aplicacions de treball estan desactivades: no poden enviar-te notificacions, consumir bateria ni accedir a la teva ubicació"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Les aplicacions de treball tenen una insígnia i són visibles per al teu administrador de TI"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Entesos"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Posa en pausa les aplicacions de treball"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Activa"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Desactiva les aplicacions de treball"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Activa les aplicacions de treball"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtra"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Posa en pausa les aplicacions i notificacions de treball"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Error: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 558d22f812..70c511fd95 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -57,7 +57,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Konverzace"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Užitečné informace na dosah"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Pokud chcete mít informace k dispozici bez otevírání aplikací, můžete si na plochu přidat widgety"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Klepnutím změníte nastavení widgetu"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Rozumím"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Změnit nastavení widgetu"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Hledat v aplikacích"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Načítání aplikací…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Dotazu „<xliff:g id="QUERY">%1$s</xliff:g>“ neodpovídají žádné aplikace"</string>
@@ -118,7 +120,7 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Chcete-li zobrazovat puntíky s oznámením, zapněte oznámení z aplikace <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Změnit nastavení"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Zobrazovat puntíky s oznámením"</string>
-    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Přidat na plochu ikony aplikací"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Přidávat na plochu ikony aplikací"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"U nových aplikací"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Neznámé"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Odstranit"</string>
@@ -160,18 +162,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Osobní"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Pracovní"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Pracovní profil"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Osobní údaje jsou oddělené a před pracovními aplikacemi jsou skryty"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Pracovní aplikace a údaje může vidět váš administrátor IT"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Další"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Rozumím"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Pracovní profil je pozastaven"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Pracovní aplikace vám nemohou zasílat oznámení, používat vaši baterii ani získat přístup k vaší poloze"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Pracovní profil je pozastaven. Pracovní aplikace vám nemohou zasílat oznámení, používat vaši baterii ani získat přístup k vaší poloze"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Pracovní aplikace jsou vypnuté"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Pracovní aplikace vám nemohou zasílat oznámení, používat vaši baterii ani získat přístup k vaší poloze"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Pracovní aplikace jsou vypnuté. Nemohou vám zasílat oznámení, používat vaši baterii ani získat přístup k vaší poloze"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Pracovní aplikace jsou označené a viditelné vašemu administrátorovi IT"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pozastavit pracovní aplikace"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Zapnout"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Vypnout pracovní aplikace"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Zapnout pracovní aplikace"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtr"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Pozastavit pracovní aplikace a oznámení"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Selhalo: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index dea0183e88..5087ac4fb0 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Samtaler"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Nyttige oplysninger lige ved hånden"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Hvis du vil have oplysninger uden at åbne apps, kan du føje widgets til din startskærm"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Tryk for at ændre widgetindstillinger"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Skift widgetindstillinger"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Søg efter apps"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Indlæser apps…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Der blev ikke fundet nogen apps, som matcher \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -101,11 +103,11 @@
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Mappe: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> eller flere elementer"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Baggrunde"</string>
     <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Baggrund og stil"</string>
-    <string name="settings_button_text" msgid="8873672322605444408">"Indstillinger for startskærm"</string>
+    <string name="settings_button_text" msgid="8873672322605444408">"Indst. for startskærm"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Deaktiveret af din administrator"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Tillad rotation af startskærmen"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"Når telefonen roteres"</string>
-    <string name="notification_dots_title" msgid="9062440428204120317">"Notifikationscirkler"</string>
+    <string name="notification_dots_title" msgid="9062440428204120317">"Notifikationsprikker"</string>
     <string name="notification_dots_desc_on" msgid="1679848116452218908">"Til"</string>
     <string name="notification_dots_desc_off" msgid="1760796511504341095">"Fra"</string>
     <string name="title_missing_notification_access" msgid="7503287056163941064">"Kræver adgang til notifikationer"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personlige"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Arbejde"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Arbejdsprofil"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Personlige data er adskilt og skjult fra arbejdsapps"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Arbejdsapps og -data er synlige for din it-administrator"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Næste"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Arbejdsprofilen er sat på pause"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Arbejdsapps kan ikke sende dig notifikationer, bruge dit batteri eller få adgang til din placering"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Arbejdsprofilen er sat på pause. Arbejdsapps kan ikke sende dig notifikationer, bruge dit batteri eller få adgang til din placering"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Arbejdsapps er deaktiveret"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Arbejdsapps kan ikke sende dig notifikationer, bruge dit batteri eller få adgang til din lokation"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Arbejdsapps er deaktiveret. Dine arbejdsapps kan ikke sende dig notifikationer, bruge dit batteri eller få adgang til din lokation"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Arbejdsapps har badges og kan ses af din it-administrator"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Sæt arbejdsapps på pause"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Aktivér"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Deaktiver arbejdsapps"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Aktivér arbejdsapps"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filter"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Sæt arbejdsapps og notifikationer på pause"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Mislykket: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 72929cf869..6ff90222ae 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Unterhaltungen"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Praktische Informationen – immer zur Hand"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Wenn du Informationen erhalten möchtest, ohne Apps zu öffnen, kannst du deinem Startbildschirm Widgets hinzufügen"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Tippen, um die Widget-Einstellungen zu ändern"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Widget-Einstellungen ändern"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Apps finden"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Apps werden geladen…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Keine Apps für \"<xliff:g id="QUERY">%1$s</xliff:g>\" gefunden"</string>
@@ -72,7 +74,7 @@
     <string name="app_info_drop_target_label" msgid="692894985365717661">"App-Info"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Installieren"</string>
     <string name="dismiss_prediction_label" msgid="3357562989568808658">"App nicht vorschlagen"</string>
-    <string name="pin_prediction" msgid="4196423321649756498">"Vorgeschlagene App anpinnen"</string>
+    <string name="pin_prediction" msgid="4196423321649756498">"Vorgeschlagene App fixieren"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"Verknüpfungen installieren"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Ermöglicht einer App das Hinzufügen von Verknüpfungen ohne Eingreifen des Nutzers"</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"Einstellungen und Verknüpfungen auf dem Startbildschirm lesen"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Privat"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Geschäftlich"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Arbeitsprofil"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Personenbezogene Daten sind für geschäftliche Apps nicht sichtbar oder zugänglich"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Geschäftliche Apps und Daten können von deinem IT-Administrator eingesehen werden"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Weiter"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Arbeitsprofil pausiert"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Geschäftliche Apps können dir keine Benachrichtigungen senden, deinen Akku nicht nutzen und nicht auf deinen Standort zugreifen"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Das Arbeitsprofil ist pausiert. Geschäftliche Apps können dir keine Benachrichtigungen senden, deinen Akku nicht nutzen und nicht auf deinen Standort zugreifen."</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Geschäftliche Apps sind deaktiviert"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Deine geschäftlichen Apps können dir keine Benachrichtigungen senden, deinen Akku nicht nutzen und nicht auf deinen Standort zugreifen"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Geschäftliche Apps sind deaktiviert. Sie können dir keine Benachrichtigungen senden, deinen Akku nicht nutzen und nicht auf deinen Standort zugreifen."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Geschäftliche Apps sind gekennzeichnet und für deinen IT-Administrator sichtbar"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Geschäftliche Apps pausieren"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Aktivieren"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Geschäftliche Apps deaktivieren"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Geschäftliche Apps aktivieren"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filter"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Geschäftliche Apps und Benachrichtigungen pausieren"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Fehler: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 4e8ecf951f..b6b44f03e1 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Συζητήσεις"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Χρήσιμες πληροφορίες στη διάθεσή σας"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Για να λάβετε πληροφορίες χωρίς να ανοίξετε εφαρμογές, μπορείτε να προσθέσετε γραφικά στοιχεία στην αρχική σας οθόνη."</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Πατήστε για αλλαγή των ρυθμίσεων του γραφικού στοιχείου"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Το κατάλαβα"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Αλλαγή ρυθμίσεων γραφικού στοιχείου"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Αναζήτηση εφαρμογών"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Φόρτωση εφαρμογών…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Δεν βρέθηκαν εφαρμογές αντιστοίχισης για \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Προσωπικές"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Εργασίας"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Προφίλ εργασίας"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Τα προσωπικά δεδομένα βρίσκονται σε ξεχωριστή θέση και δεν είναι ορατά από τις εφαρμογές εργασίας"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Οι εφαρμογές εργασίας και τα δεδομένα τους είναι ορατά στον διαχειριστή IT"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Επόμενο"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Το κατάλαβα"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Το προφίλ εργασίας έχει τεθεί σε παύση"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Οι εφαρμογές εργασιών δεν έχουν τη δυνατότητα αποστολής ειδοποιήσεων, χρήσης της μπαταρίας ή πρόσβασης στην τοποθεσία σας."</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Το προφίλ εργασίας έχει τεθεί σε παύση. Οι εφαρμογές εργασιών δεν έχουν τη δυνατότητα αποστολής ειδοποιήσεων, χρήσης της μπαταρίας ή πρόσβασης στην τοποθεσία σας."</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Οι εφαρμογές εργασιών είναι απενεργοποιημένες"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Οι εφαρμογές εργασιών δεν έχουν τη δυνατότητα αποστολής ειδοποιήσεων, χρήσης της μπαταρίας ή πρόσβασης στην τοποθεσία σας"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Οι εφαρμογές εργασιών είναι απενεργοποιημένες. Οι εφαρμογές εργασιών δεν έχουν τη δυνατότητα αποστολής ειδοποιήσεων, χρήσης της μπαταρίας ή πρόσβασης στην τοποθεσία σας"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Οι εφαρμογές εργασιών φέρουν σήμα και είναι ορατές στον διαχειριστή IT σας"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Το κατάλαβα"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Παύση εφαρμογών εργασιών"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Ενεργοποίηση"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Απενεργοποίηση εφαρμογών εργασιών"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Ενεργοποίηση εφαρμογών εργασιών"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Φίλτρο"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Παύση εφαρμογών εργασίας και ειδοποιήσεων"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Αποτυχία: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index ecf68038be..0e585f1032 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversations"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Useful info at your fingertips"</string>
     <string name="widget_education_content" msgid="745542879510751525">"To get info without opening apps, you can add widgets to your home screen"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Tap to change widget settings"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Change widget settings"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Search apps"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Loading apps…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"No apps found matching \'<xliff:g id="QUERY">%1$s</xliff:g>\'"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personal"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Work"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Work profile"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Personal data is separate and hidden from work apps"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Work apps and data are visible to your IT admin"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Next"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Work profile is paused"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Work apps can’t send you notifications, use your battery or access your location"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Work profile is paused. Work apps can’t send you notifications, use your battery or access your location"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Work apps are off"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Your work apps can’t send you notifications, use your battery or access your location"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Work apps are off. Your work apps can’t send you notifications, use your battery or access your location"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Work apps are badged and visible to your IT admin"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pause work apps"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Turn on"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Turn off work apps"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Turn on work apps"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filter"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Pause work apps and notifications"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Failed: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index ecf68038be..0e585f1032 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversations"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Useful info at your fingertips"</string>
     <string name="widget_education_content" msgid="745542879510751525">"To get info without opening apps, you can add widgets to your home screen"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Tap to change widget settings"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Change widget settings"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Search apps"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Loading apps…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"No apps found matching \'<xliff:g id="QUERY">%1$s</xliff:g>\'"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personal"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Work"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Work profile"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Personal data is separate and hidden from work apps"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Work apps and data are visible to your IT admin"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Next"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Work profile is paused"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Work apps can’t send you notifications, use your battery or access your location"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Work profile is paused. Work apps can’t send you notifications, use your battery or access your location"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Work apps are off"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Your work apps can’t send you notifications, use your battery or access your location"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Work apps are off. Your work apps can’t send you notifications, use your battery or access your location"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Work apps are badged and visible to your IT admin"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pause work apps"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Turn on"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Turn off work apps"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Turn on work apps"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filter"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Pause work apps and notifications"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Failed: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index ecf68038be..0e585f1032 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversations"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Useful info at your fingertips"</string>
     <string name="widget_education_content" msgid="745542879510751525">"To get info without opening apps, you can add widgets to your home screen"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Tap to change widget settings"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Change widget settings"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Search apps"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Loading apps…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"No apps found matching \'<xliff:g id="QUERY">%1$s</xliff:g>\'"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personal"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Work"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Work profile"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Personal data is separate and hidden from work apps"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Work apps and data are visible to your IT admin"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Next"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Work profile is paused"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Work apps can’t send you notifications, use your battery or access your location"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Work profile is paused. Work apps can’t send you notifications, use your battery or access your location"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Work apps are off"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Your work apps can’t send you notifications, use your battery or access your location"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Work apps are off. Your work apps can’t send you notifications, use your battery or access your location"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Work apps are badged and visible to your IT admin"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pause work apps"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Turn on"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Turn off work apps"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Turn on work apps"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filter"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Pause work apps and notifications"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Failed: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index ecf68038be..0e585f1032 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversations"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Useful info at your fingertips"</string>
     <string name="widget_education_content" msgid="745542879510751525">"To get info without opening apps, you can add widgets to your home screen"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Tap to change widget settings"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Change widget settings"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Search apps"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Loading apps…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"No apps found matching \'<xliff:g id="QUERY">%1$s</xliff:g>\'"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personal"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Work"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Work profile"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Personal data is separate and hidden from work apps"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Work apps and data are visible to your IT admin"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Next"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Work profile is paused"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Work apps can’t send you notifications, use your battery or access your location"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Work profile is paused. Work apps can’t send you notifications, use your battery or access your location"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Work apps are off"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Your work apps can’t send you notifications, use your battery or access your location"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Work apps are off. Your work apps can’t send you notifications, use your battery or access your location"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Work apps are badged and visible to your IT admin"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pause work apps"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Turn on"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Turn off work apps"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Turn on work apps"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filter"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Pause work apps and notifications"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Failed: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 9475db92f1..9add9f4820 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‎‏‎‎‎‎‏‎‎‏‏‏‎‎‎‎‎‎‎‏‎‏‎‏‎‏‏‎‎‏‏‎‏‎‏‏‏‎‎Conversations‎‏‎‎‏‎"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‎‎‏‏‎‏‎‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‎‏‎‎‏‎‏‏‎‏‏‎‏‏‎‎‏‏‎‎‏‏‏‎‏‏‎Useful info at your fingertips‎‏‎‎‏‎"</string>
     <string name="widget_education_content" msgid="745542879510751525">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎‎‏‏‎‏‎‎‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‏‎‎‏‎‎‏‎‏‎To get info without opening apps, you can add widgets to your Home screen‎‏‎‎‏‎"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‎‎‏‏‏‏‏‏‏‎‎‎‏‎Tap to change widget settings‎‏‎‎‏‎"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‏‏‎‎‏‎‎‎Got it‎‏‎‎‏‎"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎‎‏‎‏‎‎‎‏‏‏‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‎‏‎‏‎‎‎‎‎‎‎‏‎‎Change widget settings‎‏‎‎‏‎"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎‎‏‏‎‎‎‎‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‎‏‏‏‏‎‎‏‎‎‎‏‏‎‎‏‏‏‎‏‎‎‎‎‏‎‎‏‏‏‎‎Search apps‎‏‎‎‏‎"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‏‏‏‏‎‏‎‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎‎‏‎‏‏‏‏‏‏‎‏‎‏‎‎‎Loading apps…‎‏‎‎‏‎"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‏‎‎‏‏‏‏‎‏‎‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‎‏‏‏‏‎‏‎‏‎‎‎‎‎‎‏‎‏‎‎No apps found matching \"‎‏‎‎‏‏‎<xliff:g id="QUERY">%1$s</xliff:g>‎‏‎‎‏‏‏‎\"‎‏‎‎‏‎"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‎‏‎‎‎‎‎‎‏‏‏‎‎‎‏‎‎‎‎‏‎‏‎‏‎‎‏‎‎‏‎‏‎‏‏‏‎‏‎‎Personal‎‏‎‎‏‎"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‏‎‏‎‎‏‏‎‎‎‎‎‎‏‏‏‎‎‏‏‏‏‎‎‎‎‏‏‎‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‏‏‎‎‏‏‏‎‎Work‎‏‎‎‏‎"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‎‎‏‎‎‎‎‎‎‏‎‎‎‏‏‎‎‎‏‎‎‏‏‎‏‎‎‎‎‎‏‎‎‏‏‎‎‎‏‏‎‏‎‏‎‎‏‏‏‎‏‎‎Work profile‎‏‎‎‏‎"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‏‎‏‏‎‏‏‎‏‏‏‎‎‏‎‎‏‏‎‎‎‏‎‎‏‎‏‏‏‏‏‎‎‏‎‏‏‎‎‎‎‏‎‏‎‏‎‎‎‎‎‏‎Personal data is separate &amp; hidden from work apps‎‏‎‎‏‎"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‎‏‎‎‎‏‎‏‏‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‎‏‏‏‎‏‎‎‏‎‏‏‏‎‏‎‎‏‎‏‎‏‎‎‏‎‎Work apps &amp; data are visible to your IT admin‎‏‎‎‏‎"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‎‎‏‏‏‏‏‎‎‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‎‎‎‏‎‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‎‏‏‎‏‎Next‎‏‎‎‏‎"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‏‏‎‎‎‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎Got it‎‏‎‎‏‎"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‎‏‎‏‎‎‎‎‎‏‎‎‎‏‎‎‏‏‎‏‎‎‎‏‏‎‏‎‎‏‏‎‎‏‏‏‎‎‎‏‏‏‎‎‎‎‎‏‎‏‏‎Work profile is paused‎‏‎‎‏‎"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‏‎‎‏‏‎‏‎‏‏‎‎‎‏‎‎‎‎‏‎‎‏‏‏‏‎‎‏‏‎‏‏‎‏‏‏‏‎‎‎‎‏‎‏‏‎‏‏‎‏‎‎‎Work apps can’t send you notifications, use your battery, or access your location‎‏‎‎‏‎"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‏‎‎‎‏‎‏‎‎‏‏‏‏‎‎‎‎‎‎‏‎‏‏‏‏‎‎‎‏‏‎‏‎‏‏‏‎‎‎‏‏‎‎‎‎‎‎‏‎‏‏‎Work profile is paused. Work apps can’t send you notifications, use your battery, or access your location‎‏‎‎‏‎"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‏‎‎‏‎‎‎‏‏‎‎‏‎‎‎‎Work apps are off‎‏‎‎‏‎"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎‎‎‏‏‎‎‎‎‎‏‏‎‏‏‎‏‎‏‏‎‏‏‏‏‎‏‎‎‎‎‎‎‎‎‏‎‎‎‎‎‎‎‏‎‎‎‎‏‎‏‎‎Your work apps can’t send you notifications, use your battery, or access your location‎‏‎‎‏‎"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‏‏‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‎‎‏‎‏‎‏‎‎‏‎‎‏‎‏‎‏‏‎‏‏‎‎‎‏‎‎‏‎‏‏‏‎Work apps are off. Your work apps can’t send you notifications, use your battery, or access your location‎‏‎‎‏‎"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‎‏‎‎‎‏‏‏‏‎‏‎‎‎‏‎‎‎‎‏‎‎‏‎‏‎‏‎‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‏‎‏‎‎Work apps are badged and visible to your IT admin‎‏‎‎‏‎"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‎‎‏‎‏‎‏‏‎‎‏‎‏‏‎‎‎‎‏‏‏‏‎‎‏‏‏‎‎‎‏‏‎‏‎‏‎‏‎‏‏‏‏‏‎‎‎‎‏‎‎‎Got it‎‏‎‎‏‎"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‏‏‎‎‎‏‎‎‎‏‏‏‎‎‎‎‎‎‎‏‏‎‎‏‏‏‎‏‎‏‎‏‏‎‎‏‏‎‎Pause work apps‎‏‎‎‏‎"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‎‏‏‎‎‏‎‎‎‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‏‎‎‏‏‎‏‏‎‏‏‎‎‏‎‎‎‎‏‎‏‎‎‎‎‎‏‏‎‎‏‎‎‎‎‎Turn on‎‏‎‎‏‎"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎‏‎‎‎‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‏‎‏‎‏‎‏‎‏‎‎‎‏‎‎‏‎‎‎Turn off work apps‎‏‎‎‏‎"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‏‏‎‎‎‏‏‏‏‎‎‏‎‏‎‏‎‏‏‏‏‏‎‎‎‎‎‏‏‏‎‏‎‏‎‎‎‏‏‎‏‎‎‏‎‎‏‎‏‏‎‏‎Turn on work apps‎‏‎‎‏‎"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‏‎‏‏‎‏‏‎‏‎‎‎‎‏‏‏‎‎‎‏‏‏‎‏‎‎‏‎‏‎‎‎‎‎‎‎‎‎‎‏‎‏‎‎‏‎‎‎‎‎‎‎Filter‎‏‎‎‏‎"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‏‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‎‏‏‏‎‎‏‏‎‎‎‏‏‎‏‏‏‎‏‎‏‎‎‎‎Pause work apps and notifications‎‏‎‎‏‎"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‏‎‏‎‎‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎‏‎‏‏‎‏‏‏‏‎‎‎‎‎‏‏‎‏‎‎‎‏‏‏‎‏‏‎‏‎‏‏‎‎Failed: ‎‏‎‎‏‏‎<xliff:g id="WHAT">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 1f9d5f1dbd..53e7637707 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -48,12 +48,14 @@
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Borra el texto del cuadro de búsqueda"</string>
     <string name="no_widgets_available" msgid="9140948620298620513">"No hay widgets disponibles"</string>
     <string name="no_search_results" msgid="6518732304311458580">"La búsqueda no arrojó resultados"</string>
-    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personal"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personales"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Trabajo"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversaciones"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Información útil a tu alcance"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Para recibir información de apps sin abrirlas, puedes agregar widgets a la pantalla principal"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Presiona para cambiar la configuración del widget"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Entendido"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Cambiar la configuración del widget"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Buscar apps"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Cargando apps…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"No hay apps que coincidan con \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personales"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"De trabajo"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de trabajo"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Los datos personales están separados y ocultos de las apps de trabajo"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"El administrador de TI puede ver las apps de trabajo y los datos"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Siguiente"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Entendido"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"El perfil de trabajo está en pausa"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Las apps de trabajo no pueden enviarte notificaciones, usar la batería ni acceder a tu ubicación"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"El perfil de trabajo está en pausa. Las apps de trabajo no pueden enviarte notificaciones, usar la batería ni acceder a tu ubicación"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Las apps de trabajo están desactivadas"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Las apps de trabajo no pueden enviarte notificaciones, usar la batería ni acceder a tu ubicación"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Las apps de trabajo están desactivadas y, por ende, no pueden enviarte notificaciones, usar la batería ni acceder a tu ubicación"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Las apps de trabajo tienen una insignia y el administrador de IT las puede ver"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Entendido"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Detener apps de trabajo"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Activar"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Desactivar las apps de trabajo"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Activar las apps de trabajo"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtro"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Pon en pausa las apps de trabajo y las notificaciones"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Error: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 45061d5882..61bd39d38c 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -48,12 +48,14 @@
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Borrar texto del cuadro de búsqueda"</string>
     <string name="no_widgets_available" msgid="9140948620298620513">"No hay widgets disponibles"</string>
     <string name="no_search_results" msgid="6518732304311458580">"No hay resultados de búsqueda"</string>
-    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personal"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personales"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Trabajo"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversaciones"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Información útil al alcance de la mano"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Para recibir información sin abrir aplicaciones, puedes añadir widgets a la pantalla de inicio."</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Toca para cambiar los ajustes del widget"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Entendido"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Cambiar ajustes del widget"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Buscar aplicaciones"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Cargando aplicaciones…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"No se han encontrado aplicaciones que contengan \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -106,7 +108,7 @@
     <string name="allow_rotation_title" msgid="7728578836261442095">"Permitir rotación de la pantalla de inicio"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"Al girar el teléfono"</string>
     <string name="notification_dots_title" msgid="9062440428204120317">"Puntos de notificación"</string>
-    <string name="notification_dots_desc_on" msgid="1679848116452218908">"Activados"</string>
+    <string name="notification_dots_desc_on" msgid="1679848116452218908">"Activado"</string>
     <string name="notification_dots_desc_off" msgid="1760796511504341095">"Desactivadas"</string>
     <string name="title_missing_notification_access" msgid="7503287056163941064">"Se necesita acceso a las notificaciones"</string>
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Para mostrar puntos de notificación, activa las notificaciones de <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personal"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Trabajo"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de trabajo"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Los datos personales están separados y ocultos de las aplicaciones de trabajo"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Tu administrador de TI puede ver tus aplicaciones y datos de trabajo"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Siguiente"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Entendido"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"El perfil de trabajo está en pausa"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Las aplicaciones de trabajo no pueden enviarte notificaciones, consumir batería ni acceder a tu ubicación"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"El perfil de trabajo está en pausa. Las aplicaciones de trabajo no pueden enviarte notificaciones, consumir batería ni acceder a tu ubicación"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Las aplicaciones de trabajo están desactivadas"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Tus aplicaciones de trabajo no pueden enviarte notificaciones, consumir batería ni acceder a tu ubicación"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Las aplicaciones de trabajo están desactivadas, por lo que no pueden enviarte notificaciones, consumir batería ni acceder a tu ubicación"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Las aplicaciones de trabajo tienen una insignia y tu administrador de TI las puede ver"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Entendido"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pausar aplicaciones de trabajo"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Activar"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Desactivar aplicaciones de trabajo"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Activar aplicaciones de trabajo"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtro"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Pausa apps y notificaciones de trabajo"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Se ha producido un error: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index ef27c2b0a6..e0c8733820 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -48,12 +48,14 @@
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Kustuta otsingukastis olev tekst"</string>
     <string name="no_widgets_available" msgid="9140948620298620513">"Ühtki vidinat pole saadaval"</string>
     <string name="no_search_results" msgid="6518732304311458580">"Otsingutulemused puuduvad"</string>
-    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Isiklik"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Isiklikud"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Töö"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Vestlused"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Kasulik teave on teie käeulatuses"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Teabe saamiseks rakendusi avamata võite oma avakuvale lisada vidinaid"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Puudutage vidina seadete muutmiseks"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Selge"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Vidina seadete muutmine"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Otsige rakendusi"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Rakenduste laadimine …"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Päringule „<xliff:g id="QUERY">%1$s</xliff:g>” ei vastanud ükski rakendus"</string>
@@ -62,7 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Märguanded"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Otsetee teisaldamiseks puudutage ja hoidke all."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Otsetee teisaldamiseks või kohandatud toimingute kasutamiseks topeltpuudutage ja hoidke all."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Sellel avaekraanil pole enam ruumi."</string>
+    <string name="out_of_space" msgid="4691004494942118364">"Sellel avakuval pole enam ruumi."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Salves Lemmikud pole rohkem ruumi"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Rakenduste loend"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Isiklike rakenduste loend"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Isiklik"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Töö"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Tööprofiil"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Isiklikke andmeid hoitakse töörakendustest eraldi"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Teie IT-administraator näeb töörakendusi ja -andmeid"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Järgmine"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Selge"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Tööprofiil on peatatud"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Töörakendused ei saa teile märguandeid saata, akut kasutada ega teie asukohale juurde pääseda"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Tööprofiil on peatatud. Töörakendused ei saa teile märguandeid saata, akut kasutada ega teie asukohale juurde pääseda"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Töörakendused on välja lülitatud"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Töörakendused ei saa teile märguandeid saata, akut kasutada ega teie asukohale juurde pääseda"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Töörakendused on välja lülitatud. Töörakendused ei saa teile märguandeid saata, akut kasutada ega teie asukohale juurde pääseda."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Töörakendustel on märk ja need on teie IT-administraatorile nähtavad"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Selge"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Peata töörakendused"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Lülita sisse"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Lülita töörakendused välja"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Lülita töörakendused sisse"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filter"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Peatage töörakendused ja märguanded"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Nurjus: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 735f6e332f..eb038bae2b 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -42,7 +42,7 @@
       <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> lasterbide</item>
       <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> lasterbide</item>
     </plurals>
-    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>: <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
+    <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"Widgetak"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Bilatu"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Garbitu bilaketa-koadroko testua"</string>
@@ -52,8 +52,10 @@
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Lanekoak"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Elkarrizketak"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Informazio erabilgarria beti eskura"</string>
-    <string name="widget_education_content" msgid="745542879510751525">"Aplikazioa ireki beharrik gabe informazioa zuzenean jasotzeko, gehitu widgetak hasierako pantailan"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Aplikaziorik ireki beharrik gabe informazioa zuzenean jasotzeko, gehitu widgetak hasierako pantailan"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Sakatu hau widgeten ezarpenak aldatzeko"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Ados"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Aldatu widgeten ezarpenak"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Bilatu aplikazioetan"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Aplikazioak kargatzen…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Ez da aurkitu \"<xliff:g id="QUERY">%1$s</xliff:g>\" bilaketaren emaitzarik"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Pertsonalak"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Lanekoak"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Laneko profila"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Datu pertsonalak ez daude laneko aplikazioetan, eta ezin dira haien bidez ikusi"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"IKT saileko administratzaileak laneko aplikazioak eta datuak ikus ditzake"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Hurrengoa"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Ados"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Laneko profila pausatuta dago"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Laneko aplikazioek ezin dute jakinarazpenik bidali, bateria erabili edo kokapena atzitu"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Laneko profila pausatuta dago. Laneko aplikazioek ezin dute jakinarazpenik bidali, bateria erabili edo kokapena atzitu."</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Laneko aplikazioak desaktibatuta daude"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Laneko aplikazioek ezin dute jakinarazpenik bidali, bateria erabili edo kokapena atzitu"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Laneko aplikazioak desaktibatuta daude. Hori dela eta, ezin dute jakinarazpenik bidali, bateria erabili edo kokapena atzitu."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Laneko aplikazioek bereizgarriak dituzte, eta IKT saileko administratzaileak ikus ditzake"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Ados"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pausatu laneko aplikazioak"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Aktibatu"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Desaktibatu laneko aplikazioak"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Aktibatu laneko aplikazioak"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Iragazi"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Pausatu laneko aplikazioak eta jakinarazpenak"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Huts egin du: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 29ada372e5..0926e48f81 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -48,12 +48,14 @@
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"پاک کردن نوشتار از چارگوش جستجو"</string>
     <string name="no_widgets_available" msgid="9140948620298620513">"ابزارکی دردسترس نیست"</string>
     <string name="no_search_results" msgid="6518732304311458580">"بدون نتیجه جستجو"</string>
-    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"شخصی"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ابزارک‌های شخصی"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"کار"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"مکالمه‌ها"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"دسترسی آسان به اطلاعات سودمند"</string>
     <string name="widget_education_content" msgid="745542879510751525">"با افزودن ابزارک‌ها به «صفحه اصلی» می‌توانید اطلاعات را بدون باز کردن برنامه‌ها دریافت کنید"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"برای تغییر تنظیمات ابزارک، ضربه بزنید"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"متوجه‌ام"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"تغییر تنظیمات ابزارک"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"جستجوی برنامه‌ها"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"درحال بارگیری برنامه‌‌ها…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"هیچ برنامه‌ای در مطابقت با «<xliff:g id="QUERY">%1$s</xliff:g>» پیدا نشد"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"شخصی"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"کاری"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"نمایه کاری"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"داده‌های شخصی از برنامه‌های کاری جدا و از دسترس آن‌ها پنهان هستند"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"برنامه‌های کاری و داده‌ها برای سرپرست فناوری اطلاعات نمایان هستند"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"بعدی"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"متوجه‌ام"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"نمایه کاری موقتاً متوقف شده است"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"برنامه‌های کاری نمی‌توانند برای شما اعلان ارسال کنند، از باتری استفاده کنند، یا به مکانتان دسترسی داشته باشند"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"نمایه کاری موقتاً متوقف شده است. برنامه‌های کاری نمی‌توانند برای شما اعلان ارسال کنند، از باتری استفاده کنند، یا به مکانتان دسترسی داشته باشند"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"برنامه‌های کاری خاموش است"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"برنامه‌های کاری نمی‌توانند برای شما اعلان ارسال کنند، از باتری استفاده کنند، یا به مکانتان دسترسی داشته باشند"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"برنامه‌های کاری خاموش است. برنامه‌های کاری نمی‌توانند برای شما اعلان ارسال کنند، از باتری استفاده کنند، یا به مکانتان دسترسی داشته باشند"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"برنامه‌های کاری دارای نشان هستند و سرپرست سیستم می‌تواند آن‌ها را ببیند."</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"متوجه‌ام"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"توقف موقت برنامه‌های کاری"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"روشن کردن"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"خاموش کردن برنامه‌های کاری"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"روشن کردن برنامه‌های کاری"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"فیلتر"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"توقف موقت برنامه‌های کاری و اعلان‌ها"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"ناموفق بود: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index c4d0655d78..4ebc8d279b 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -48,12 +48,14 @@
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Tyhjennä teksti hakukentästä"</string>
     <string name="no_widgets_available" msgid="9140948620298620513">"Ei widgetejä käytettävissä"</string>
     <string name="no_search_results" msgid="6518732304311458580">"Ei hakutuloksia"</string>
-    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Henkilökohtainen"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Henkilökohtaiset"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Työ"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Keskustelut"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Hyödyllisiä tietoja käden ulottuvilla"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Jos haluat nähdä tietoja avaamatta sovelluksia, voit lisätä aloitusnäytölle widgetejä"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Napauta, niin voit muuttaa widgetin asetuksia"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Muuta widgetin asetuksia"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Hae sovelluksia"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Ladataan sovelluksia…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"<xliff:g id="QUERY">%1$s</xliff:g> ei palauttanut sovelluksia."</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Henkilökohtaiset"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Työsovellukset"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Työprofiili"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Henkilökohtainen data pidetään erillään, piilotettuna työsovelluksilta"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Työsovellukset ja ‑data näkyvät IT-järjestelmänvalvojalle"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Seuraava"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Selvä"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Työprofiilin käyttö on keskeytetty"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Työsovellukset eivät voi lähettää sinulle ilmoituksia eivätkä käyttää akkuasi tai paikantaa sijaintiasi"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Työprofiilin käyttö on keskeytetty. Työsovellukset eivät voi lähettää sinulle ilmoituksia eivätkä käyttää akkuasi tai paikantaa sijaintiasi"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Työsovellukset ovat pois päältä"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Työsovellukset eivät voi lähettää sinulle ilmoituksia eivätkä käyttää akkuasi tai paikantaa sijaintiasi"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Työsovellukset ovat pois päältä. Ne eivät voi lähettää sinulle ilmoituksia eivätkä käyttää akkuasi tai sijaintiasi"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Työsovellukset on merkitty ja ne näkyvät IT-järjestelmänvalvojalle"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Keskeytä työsovellusten käyttö"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Laita päälle"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Laita työsovellukset pois päältä"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Laita työsovellukset päälle"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Suodatin"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Keskeytä työsovellukset ja ‑ilmoitukset"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Epäonnistui: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index e7801c9571..0a66787554 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversations"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Renseignements utiles à portée de main"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Pour obtenir des renseignements sans ouvrir aucune application, vous pouvez ajouter des widgets à votre écran d\'accueil"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Touchez pour modifier les paramètres du widget"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Modifier les paramètres du widget"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Rechercher dans les applications"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Chargement des applications en cours…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Aucune application trouvée correspondant à « <xliff:g id="QUERY">%1$s</xliff:g> »"</string>
@@ -127,7 +129,7 @@
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Ajouter à l\'écran d\'accueil"</string>
     <string name="action_move_here" msgid="2170188780612570250">"Déplacer l\'élément ici"</string>
     <string name="item_added_to_workspace" msgid="4211073925752213539">"Élément ajouté à l\'écran d\'accueil"</string>
-    <string name="item_removed" msgid="851119963877842327">"Élément supprimé"</string>
+    <string name="item_removed" msgid="851119963877842327">"Élément retiré"</string>
     <string name="undo" msgid="4151576204245173321">"Annuler"</string>
     <string name="action_move" msgid="4339390619886385032">"Déplacer l\'élément"</string>
     <string name="move_to_empty_cell" msgid="2833711483015685619">"Déplacer vers rangée <xliff:g id="NUMBER_0">%1$s</xliff:g> colonne <xliff:g id="NUMBER_1">%2$s</xliff:g>"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personnel"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Travail"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profil professionnel"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Les données personnelles sont distinctes et masquées des applications professionnelles"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Les applications et les données professionnelles sont visibles pour votre administrateur informatique"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Suivant"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Le profil professionnel est interrompu"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Les applications professionnelles ne peuvent ni vous envoyer de notifications, ni utiliser la pile, ni accéder à votre position"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Le profil professionnel est interrompu. Les applications professionnelles ne peuvent ni vous envoyer de notifications, ni utiliser la pile, ni accéder à votre position"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Les applications professionnelles sont désactivées"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Les applications professionnelles ne peuvent ni vous envoyer de notifications, ni utiliser la pile, ni accéder à votre position"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Les applications professionnelles sont désactivées. Vos applications professionnelles ne peuvent ni vous envoyer de notifications, ni utiliser la pile, ni accéder à votre position"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Les applications professionnelles sont indiquées par un badge et sont visibles pour votre administrateur informatique"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Mettre en pause les applications professionnelles"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Activer"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Désactiver les applications professionnelles"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Activer les applications professionnelles"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtrer"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Interrompre les applications et les notifications professionnelles"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Échec : <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index adc04fd0d3..f08f7eb0ba 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversations"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Infos utiles à portée de main"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Pour obtenir des infos sans ouvrir d\'applis, vous pouvez ajouter des widgets à votre écran d\'accueil"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Appuyez pour modifier les paramètres du widget"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Modifier les paramètres du widget"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Rechercher dans les applications"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Chargement des applications…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Aucune application ne correspond à la requête \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -112,7 +114,7 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Pour afficher les pastilles de notification, activez les notifications de l\'application <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Modifier les paramètres"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Afficher les pastilles de notification"</string>
-    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Ajouter icônes d\'applis à l\'écran d\'acc."</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Ajouter les icônes des applis à l\'écran d\'accueil"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Pour les nouvelles applications"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Inconnu"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Supprimer"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personnelles"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Professionnelles"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profil professionnel"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Les applications professionnelles n\'ont pas accès aux données personnelles"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Votre administrateur informatique a accès à vos applications et données professionnelles"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Suivant"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Profil professionnel en pause"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Les applis professionnelles ne peuvent pas vous envoyer de notifications, utiliser votre batterie ni accéder à votre position"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Profil professionnel en pause. Les applis professionnelles ne peuvent pas vous envoyer de notifications, utiliser votre batterie ni accéder à votre position"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Les applis professionnelles sont désactivées"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Vos applis professionnelles ne peuvent pas vous envoyer de notifications, utiliser votre batterie ni accéder à votre position"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Vos applis professionnelles sont désactivées. Elles ne peuvent pas vous envoyer de notifications, utiliser votre batterie ni accéder à votre position."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Les applis professionnelles sont identifiées par un badge et votre administrateur informatique peut les voir"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Mettre en pause les applis professionnelles"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Activer"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Désactiver les applis professionnelles"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Activer les applications professionnelles"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtre"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Mettre en pause vos applications et notifications professionnelles"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Échec : <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 615c644cc9..6a7a6ef10e 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversas"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Información útil ao teu alcance"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Se queres obter información sen abrir as aplicacións, podes engadir widgets á pantalla de inicio"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Toca para cambiar a configuración do widget"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Entendido"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Cambiar configuración do widget"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Buscar aplicacións"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Cargando aplicacións…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Non se atoparon aplicacións que coincidan con \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Persoal"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Traballo"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de traballo"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Os datos persoais sepáranse e ocúltanse das aplicacións do traballo"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"O teu administrador de TI pode ver as túas aplicacións e datos do traballo"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Seguinte"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Entendido"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"O perfil de traballo está en pausa"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"As aplicacións do traballo non poden enviarche notificacións, utilizar a batería nin acceder á túa localización"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"O perfil de traballo está en pausa. As aplicacións do traballo non poden enviarche notificacións, utilizar a batería nin acceder á túa localización"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"As aplicacións do traballo están desactivadas"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"As aplicacións do traballo non poden enviarche notificacións, utilizar a batería nin acceder á túa localización"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"As aplicacións do traballo están desactivadas e non poden enviarche notificacións, utilizar a batería nin acceder á túa localización"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"O administrador de TI pode ver as aplicacións do traballo e engadirlles indicadores"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Entendido"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pór en pausa aplicacións do traballo"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Activar"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Desactivar aplicacións do traballo"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Activar aplicacións do traballo"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtra"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Pon en pausa as aplicacións e as notificacións do traballo"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Erro: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index d9ffa68a3b..4b3821ce03 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -53,7 +53,11 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"વાતચીતો"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"ઉપયોગી માહિતી તમારી આંગળીના ટેરવે"</string>
     <string name="widget_education_content" msgid="745542879510751525">"ઍપને ખોલ્યા વિના માહિતી મેળવવા માટે, તમે તમારી હોમ સ્ક્રીન પર વિજેટ ઉમેરી શકો છો"</string>
+    <!-- no translation found for reconfigurable_widget_education_tip (6336962690888067057) -->
+    <skip />
     <string name="widget_education_close_button" msgid="8676165703104836580">"સમજાઈ ગયું"</string>
+    <!-- no translation found for widget_reconfigure_button_content_description (8811472721881205250) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"શોધ ઍપ્લિકેશનો"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ઍપ્લિકેશનો લોડ કરી રહ્યું છે…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\"થી મેળ ખાતી કોઈ ઍપ્લિકેશનો મળી નથી"</string>
@@ -113,7 +117,7 @@
     <string name="title_change_settings" msgid="1376365968844349552">"સેટિંગ્સ બદલો"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"નોટિફિકેશન માટેના ચિહ્ન બતાવો"</string>
     <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"ઍપના આઇકન હોમ સ્ક્રીન પર ઉમેરો"</string>
-    <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"નવી ઍપ્લિકેશનો માટે"</string>
+    <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"નવી ઍપ માટે"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"અજાણ્યો"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"દૂર કરો"</string>
     <string name="abandoned_search" msgid="891119232568284442">"શોધો"</string>
@@ -154,18 +158,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"મનગમતી ઍપ"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"ઑફિસની ઍપ"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"ઑફિસની પ્રોફાઇલ"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"વ્યક્તિગત ડેટા ઑફિસ માટેની ઍપથી અલગ અને છુપાવીને રાખેલો છે"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"ઑફિસ માટેની ઍપ અને ડેટા તમારા IT વ્યવસ્થાપકને દેખાય છે"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"આગળ"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"સમજાઈ ગયું"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"ઑફિસની પ્રોફાઇલ થોભાવી છે"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"ઑફિસ માટેની ઍપ તમને નોટિફિકેશન મોકલી શકતી નથી, તમારી બૅટરી વાપરી શકતી નથી કે તમારું સ્થાન ઍક્સેસ કરી શકતી નથી"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"ઑફિસની પ્રોફાઇલ થોભાવી છે. ઑફિસ માટેની ઍપ તમને નોટિફિકેશન મોકલી શકતી નથી, તમારી બૅટરી વાપરી શકતી નથી કે તમારું સ્થાન ઍક્સેસ કરી શકતી નથી"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"ઑફિસ માટેની ઍપ બંધ છે"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"ઑફિસ માટેની તમારી ઍપ તમને નોટિફિકેશન મોકલી શકતી નથી, તમારી બૅટરી વાપરી શકતી નથી કે તમારું સ્થાન ઍક્સેસ કરી શકતી નથી"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"ઑફિસ માટેની ઍપ બંધ છે. ઑફિસ માટેની તમારી ઍપ તમને નોટિફિકેશન મોકલી શકતી નથી, તમારી બૅટરી વાપરી શકતી નથી કે તમારું સ્થાન ઍક્સેસ કરી શકતી નથી"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"ઑફિસની ઍપને બૅજ આપેલા હોય છે અને તમારા IT વ્યવસ્થાપક તેમને જોઈ શકે છે"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"સમજાઈ ગયું"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"ઑફિસની ઍપ થોભાવો"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"ચાલુ કરો"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"ઑફિસ માટેની ઍપ બંધ કરો"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"ઑફિસ માટેની ઍપ ચાલુ કરો"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"ફિલ્ટર કરો"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"ઑફિસ માટેની ઍપ અને નોટિફિકેશન થોભાવો"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"નિષ્ફળ: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 5cfb7dbf1b..8af8f066ad 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"बातचीत"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"काम की जानकारी आसानी से पाएं"</string>
     <string name="widget_education_content" msgid="745542879510751525">"ऐप्लिकेशन को खोले बिना उनकी जानकारी पाने के लिए, आप होम स्क्रीन पर विजेट जोड़ सकते हैं"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"विजेट की सेटिंग में बदलाव करने के लिए टैप करें"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"ठीक है"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"विजेट की सेटिंग में बदलाव करें"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ऐप सर्च करें"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ऐप्लिकेशन लोड हो रहे हैं…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" से मिलता-जुलता कोई ऐप्लिकेशन नहीं मिला"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"निजी ऐप"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"काम से जुड़े ऐप"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"वर्क प्रोफ़ाइल"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"निजी डेटा को अलग रखा जाता है. साथ ही, ऑफ़िस के काम से जुड़े ऐप्लिकेशन से छिपा कर रखा जाता है"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन और डेटा, आपके आईटी एडमिन को दिखते हैं"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"आगे बढ़ें"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ठीक है"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"वर्क प्रोफ़ाइल रोक दी गई है"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन आपको सूचनाएं नहीं भेज सकते. साथ ही, आपकी बैटरी का इस्तेमाल या आपकी जगह की जानकारी को ऐक्सेस भी नहीं कर सकते"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन रोक दिए गए हैं. ऑफ़िस के काम से जुड़े ऐप्लिकेशन आपको सूचनाएं नहीं भेज सकते. साथ ही, आपकी बैटरी का इस्तेमाल या आपकी जगह की जानकारी को ऐक्सेस भी नहीं कर सकते"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन बंद हैं"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"ऑफ़िस के काम से जुड़े आपके ऐप्लिकेशन, आपको सूचनाएं नहीं भेज सकते. साथ ही, आपकी बैटरी का इस्तेमाल या आपकी जगह की जानकारी को ऐक्सेस भी नहीं कर सकते"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन बंद हैं. ये ऐप्लिकेशन, आपको सूचनाएं नहीं भेज सकते. साथ ही, आपकी बैटरी का इस्तेमाल या आपकी जगह की जानकारी को ऐक्सेस भी नहीं कर सकते"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन, बैज किए गए हैं और आईटी एडमिन को दिख रहे हैं"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"ठीक है"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन रोकें"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"चालू करें"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन बंद करें"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन चालू करें"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"फ़िल्टर"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन और सूचनाएं रोकें"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"पूरा नहीं हुआ: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 6c94f31b49..3f1e1b0762 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -50,12 +50,14 @@
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Izbrišite tekst iz okvira za pretraživanje"</string>
     <string name="no_widgets_available" msgid="9140948620298620513">"Nije dostupan nijedan widget"</string>
     <string name="no_search_results" msgid="6518732304311458580">"Nema rezultata pretraživanja"</string>
-    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Osobno"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Osobni"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Posao"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Razgovori"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Korisne informacije nadohvat ruke"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Da biste dobili informacije bez otvaranja aplikacija, možete dodati widgete na početni zaslon"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Dodirnite da biste promijenili postavke widgeta"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Shvaćam"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Promijenite postavke widgeta"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Pretraži aplikacije"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Učitavanje aplikacija…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nema aplikacija podudarnih s upitom \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -115,7 +117,7 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Za prikaz točaka obavijesti uključite obavijesti aplikacije <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Promjena postavki"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Prikaži točke obavijesti"</string>
-    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Dodajte ikone aplikacija na početni zaslon"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Dodaj ikone aplikacija na početni zaslon"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Za nove aplikacije"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Nepoznato"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Ukloni"</string>
@@ -157,18 +159,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Osobno"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Posao"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Poslovni profil"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Osobni podaci odvojeni su i skriveni od poslovnih aplikacija"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Podaci poslovnih aplikacija vidljivi su vašem IT administratoru"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Dalje"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Shvaćam"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Poslovni profil je pauziran"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Poslovne aplikacije ne mogu vam slati obavijesti, trošiti bateriju niti pristupiti vašoj lokaciji"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Poslovni profil je pauziran. Poslovne aplikacije ne mogu vam slati obavijesti, trošiti bateriju niti pristupiti vašoj lokaciji"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Poslovne aplikacije su isključene"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Poslovne aplikacije ne mogu vam slati obavijesti, trošiti bateriju niti pristupiti vašoj lokaciji"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Poslovne aplikacije su isključene. Ne mogu vam slati obavijesti, trošiti bateriju ili pristupiti vašoj lokaciji"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Poslovne su aplikacije označene i vidljive vašem IT administratoru"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Shvaćam"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pauziraj poslovne aplikacije"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Uključi"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Isključite poslovne aplikacije"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Uključite poslovne aplikacije"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtrirajte"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Pauzirajte poslovne aplikacije i obavijesti"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Nije uspjelo: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 5e1b032255..09c4d5093a 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Beszélgetések"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Hasznos információk egy koppintásnyira"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Ha az alkalmazások megnyitása nélkül szeretne információhoz jutni, felvehet modulokat a kezdőképernyőre."</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Ide koppintva módosíthatja a modulbeállításokat"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Értem"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"A modulbeállítások módosítása"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Alkalmazások keresése"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Alkalmazások betöltése…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nem található alkalmazás a(z) „<xliff:g id="QUERY">%1$s</xliff:g>” lekérdezésre"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Személyes"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Munkahelyi"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Munkaprofil"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"A személyes adatok el vannak különítve a munkahelyi alkalmazásoktól, amelyek nem is látják őket"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"A munkahelyi alkalmazásokat és adatokat látja a rendszergazda"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Tovább"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Értem"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"A munkaprofil használata szünetel"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"A munkahelyi alkalmazások nem küldhetnek értesítéseket, nem használhatják az akkumulátort, és nem férhetnek hozzá az Ön tartózkodási helyéhez."</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"A munkaprofil szüneteltetve van. A munkahelyi alkalmazások nem küldhetnek értesítéseket, nem használhatják az akkumulátort, és nem férhetnek hozzá az Ön tartózkodási helyéhez."</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"A munkahelyi alkalmazások ki vannak kapcsolva"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"A munkahelyi alkalmazások nem küldhetnek értesítéseket, nem használhatják az akkumulátort, és nem férhetnek hozzá az Ön tartózkodási helyéhez."</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"A munkahelyi alkalmazások ki vannak kapcsolva, nem küldhetnek értesítéseket, nem használhatják az akkumulátort, és nem férhetnek hozzá az Ön tartózkodási helyéhez"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"A munkahelyi alkalmazások jelvénnyel vannak megjelölve, és láthatók a rendszergazda számára"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Értem"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Munkahelyi alkalmazások szüneteltetése"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Bekapcsolás"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Kapcsolja ki a munkahelyi alkalmazásokat"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Kapcsolja be a munkahelyi alkalmazásokat"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Szűrő"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Munkahelyi alkalmazások és értesítések szüneteltetése"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Sikertelen: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index f7d6b317aa..ef87d0619c 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Զրույցներ"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Օգտակար տեղեկությունները՝ միշտ հասանելի"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Ավելացրեք վիջեթներ ձեր հիմնական էկրանին և ստացեք տեղեկություններ՝ առանց հավելվածները բացելու։"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Հպեք՝ վիջեթի կարգավորումները փոփոխելու համար"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Եղավ"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Փոխել վիջեթի կարգավորումները"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Որոնել հավելվածներ"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Հավելվածների բեռնում…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"«<xliff:g id="QUERY">%1$s</xliff:g>» հարցմանը համապատասխանող հավելվածներ չեն գտնվել"</string>
@@ -101,7 +103,7 @@
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Պանակ՝ <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> կամ ավելի տարրեր"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Պաստառներ"</string>
     <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Պաստառ և ոճ"</string>
-    <string name="settings_button_text" msgid="8873672322605444408">"Գլխավոր էջի կարգավորումներ"</string>
+    <string name="settings_button_text" msgid="8873672322605444408">"Գլխավոր էկրանի կարգավորումներ"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Անջատվել է ձեր ադմինիստրատորի կողմից"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Թույլ տալ հիմնական էկրանի պտտումը"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"Հեռախոսը պտտելու դեպքում"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Անձնական"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Աշխատանքային"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Աշխատանքային պրոֆիլ"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Անձնական տվյալները առանձին են և թաքցված են, երբ ցուցադրվում են աշխատանքայինները"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Աշխատանքային հավելվածներն ու դրանց տվյալները տեսանելի են ձեր ադմինիստրատորին"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Առաջ"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Եղավ"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Աշխատանքային պրոֆիլը դադարեցված է"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Աշխատանքային հավելվածները չեն կարող ծանուցումներ ուղարկել ձեզ, օգտագործել ձեր մարտկոցը և ձեր տեղադրության մասին տվյալներ ստանալ։"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Աշխատանքային պրոֆիլը դադարեցված է։ Աշխատանքային հավելվածները չեն կարող ծանուցումներ ուղարկել ձեզ, օգտագործել ձեր մարտկոցը և ձեր տեղադրության մասին տվյալներ ստանալ։"</string>
-    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Աշխատանքային հավելվածները նշանակներ ունեն և տեսանելի են ձեր ՏՏ ադմինիստրատորին"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Աշխատանքային հավելվածներն անջատված են"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Աշխատանքային հավելվածները չեն կարող ծանուցումներ ուղարկել ձեզ, օգտագործել մարտկոցը և ձեր տեղադրության մասին տվյալներ ստանալ։"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Աշխատանքային հավելվածներն անջատված են։ Դրանք չեն կարող ծանուցումներ ուղարկել ձեզ, օգտագործել մարտկոցը և ձեր տեղադրության մասին տվյալներ ստանալ։"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Աշխատանքային հավելվածները նշանակներ ունեն և տեսանելի են ՏՏ ադմինիստրատորին"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Եղավ"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Դադարեցնել աշխատանքային հավելվածները"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Միացնել"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Անջատել աշխատանքային հավելվածները"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Միացնել աշխատանքային հավելվածները"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Զտեք"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Դադարեցնել աշխատանքային հավելվածներն ու ծանուցումները"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Չհաջողվեց կատարել գործողությունը (<xliff:g id="WHAT">%1$s</xliff:g>)"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 782737c31e..c3cdcfcf6a 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -51,9 +51,11 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Pribadi"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Kantor"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Percakapan"</string>
-    <string name="widget_education_header" msgid="4874760613775913787">"Info bermanfaat yang mudah diakses"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Info yang bermanfaat di ujung jari Anda"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Untuk mendapatkan info tanpa membuka aplikasi, Anda dapat menambahkan widget ke Layar utama"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Ketuk untuk mengubah setelan widget"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Oke"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Ubah setelan widget"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Telusuri aplikasi"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Memuat aplikasi…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Tidak ditemukan aplikasi yang cocok dengan \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -62,7 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notifikasi"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Sentuh lama untuk memindahkan pintasan."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Ketuk dua kali &amp; tahan untuk memindahkan pintasan atau gunakan tindakan khusus."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Tidak ada ruang lagi pada layar Utama ini."</string>
+    <string name="out_of_space" msgid="4691004494942118364">"Tidak ada ruang lagi di Layar Utama ini."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Tidak ada ruang tersisa di baki Favorit"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Daftar aplikasi"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Daftar aplikasi pribadi"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Pribadi"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Kerja"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profil kerja"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Data pribadi terpisah &amp; tersembunyi dari aplikasi kerja"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Aplikasi &amp; data kerja terlihat oleh admin IT"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Berikutnya"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Oke"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Profil kerja dijeda"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Aplikasi kerja tidak dapat mengirimi Anda notifikasi, menggunakan baterai, atau mengakses lokasi Anda"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Profil kerja dijeda. Aplikasi kerja tidak dapat mengirimi Anda notifikasi, menggunakan baterai, atau mengakses lokasi Anda"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Aplikasi kerja dinonaktifkan"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Aplikasi kerja tidak dapat mengirimkan notifikasi, menggunakan baterai, atau mengakses lokasi Anda"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Aplikasi kerja dinonaktifkan. Aplikasi kerja tidak dapat mengirimkan notifikasi, menggunakan baterai, atau mengakses lokasi Anda"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Aplikasi kerja diberi badge dan terlihat oleh admin IT"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Oke"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Jeda aplikasi kerja"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Aktifkan"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Nonaktifkan aplikasi kerja"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Aktifkan aplikasi kerja"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filter"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Jeda notifikasi dan aplikasi kerja"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Gagal: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index b15e86c404..d3774ed827 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Samtöl"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Gagnlegar upplýsingar innan seilingar"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Þú getur bætt við græjum á heimaskjáinn til að fá upplýsingar án þess að opna forrit"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Ýttu til að breyta græjustillingum"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Ég skil"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Breyta græjustillingum"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Leita í forritum"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Hleður forrit…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Ekki fundust forrit sem samsvara „<xliff:g id="QUERY">%1$s</xliff:g>“"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Persónulegt"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Vinna"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Vinnusnið"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Persónuupplýsingar eru aðskildar og faldar í vinnuforritum"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Gögn vinnuforrita eru sýnileg kerfisstjóranum þínum"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Áfram"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Ég skil"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Hlé gert á vinnusniði"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Vinnuforrit geta ekki sent þér tilkynningar, notað rafhlöðuorku eða fengið aðgang að staðsetningu þinni"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Hlé gert á vinnusniði. Vinnuforrit geta ekki sent þér tilkynningar, notað rafhlöðuorku eða fengið aðgang að staðsetningu þinni"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Slökkt er á vinnuforritum"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Vinnuforrit geta ekki sent þér tilkynningar, notað rafhlöðuorku eða fengið aðgang að staðsetningu þinni"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Slökkt er á vinnuforritum. Vinnuforrit geta ekki sent þér tilkynningar, notað rafhlöðuorku eða fengið aðgang að staðsetningu þinni"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Vinnuforrit eru merkt og kerfisstjórinn getur séð þau"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Ég skil"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Setja vinnuforrit í bið"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Kveikja"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Slökkva á vinnuforritum"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Kveikja á vinnuforritum"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Sía"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Gera hlé á vinnuforritum og tilkynningum"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Mistókst: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 23297e4a4b..58135218c0 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversazioni"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Informazioni utili a portata di mano"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Per ricevere informazioni senza aprire app, puoi aggiungere widget alla schermata Home"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Tocca per modificare le impostazioni del widget"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Modifica le impostazioni del widget"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Cerca nelle app"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Caricamento delle app…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nessuna app trovata corrispondente a \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personali"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Lavoro"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profilo di lavoro"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"I dati personali sono separati e non sono visibili nelle app di lavoro"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"I dati e le app di lavoro sono visibili all\'amministratore IT"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Avanti"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Profilo di lavoro in pausa"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Le app di lavoro non possono inviarti notifiche, usare la batteria o accedere alla tua posizione"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Profilo di lavoro in pausa. Le app di lavoro non possono inviarti notifiche, usare la batteria o accedere alla tua posizione"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Le app di lavoro non sono attive"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Le app di lavoro non possono inviarti notifiche, usare la batteria o accedere alla tua posizione"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Le app di lavoro non sono attive e non possono inviarti notifiche, usare la batteria o accedere alla tua posizione"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Le app di lavoro sono contrassegnate con un badge e sono visibili dal tuo amministratore IT"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Metti in pausa le app di lavoro"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Attiva"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Disattiva app di lavoro"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Attiva app di lavoro"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtra"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Metti in pausa le app di lavoro e le relative notifiche"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Operazione non riuscita: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 8ec7de366f..f07b4e554d 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -52,12 +52,14 @@
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"מחיקת טקסט מתיבת החיפוש"</string>
     <string name="no_widgets_available" msgid="9140948620298620513">"אין ווידג\'טים זמינים"</string>
     <string name="no_search_results" msgid="6518732304311458580">"אין תוצאות חיפוש"</string>
-    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"אישי"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ווידג\'טים אישיים"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"עבודה"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"שיחות"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"קבלת מידע שימושי בהקשה"</string>
     <string name="widget_education_content" msgid="745542879510751525">"רוצה לקבל מידע בלי לפתוח אפליקציות? אפשר להוסיף ווידג\'טים למסך הבית"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"אפשר לשנות את הגדרות הווידג\'ט בהקשה"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"הבנתי"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"שינוי הגדרות הווידג\'ט"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"חיפוש אפליקציות"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"טעינת אפליקציות מתבצעת…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"לא נמצאו אפליקציות התואמות ל-\"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -66,7 +68,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"התראות"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"כדי להעביר קיצור דרך למקום אחר יש לגעת ולא להרפות."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"כדי להעביר קיצור דרך למקום אחר או להשתמש בפעולות מותאמות אישית\' יש ללחוץ פעמיים ולא להרפות."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"אין עוד מקום במסך דף הבית הזה."</string>
+    <string name="out_of_space" msgid="4691004494942118364">"אין עוד מקום במסך הבית הזה."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"אין עוד מקום במגש המועדפים"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"רשימת אפליקציות"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"רשימת אפליקציות אישיות"</string>
@@ -160,18 +162,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"אישיות"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"עבודה"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"פרופיל עבודה"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"מידע אישי מאוחסן בנפרד ומוסתר מאפליקציות לעבודה"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"‏אפליקציות לעבודה ונתוני פרופיל העבודה שלך גלויים למנהל ה-IT"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"הבא"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"הבנתי"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"פרופיל העבודה מושהה"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"האפליקציות לעבודה לא יכולות לשלוח לך התראות, להשתמש בסוללה או לגשת למיקום שלך"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"פרופיל העבודה מושהה. האפליקציות לעבודה לא יכולות לשלוח לך התראות, להשתמש בסוללה או לגשת למיקום שלך"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"האפליקציות לעבודה מושבתות"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"האפליקציות לעבודה לא יכולות לשלוח לך התראות, להשתמש בסוללה או לגשת למיקום שלך"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"האפליקציות לעבודה מושבתות. האפליקציות לא יכולות לשלוח לך התראות, להשתמש בסוללה או לגשת למיקום שלך"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"‏האפליקציות לעבודה מתויגות ומוצגות למנהל ה-IT"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"הבנתי"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"השהיית האפליקציות לעבודה"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"הפעלה"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"כיבוי של אפליקציות לעבודה"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"הפעלה של אפליקציות לעבודה"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"סינון"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"השהיה של ההתראות והאפליקציות בפרופיל העבודה"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"הפעולה נכשלה: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index d54f884372..0d60f6d656 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"会話"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"スワイプだけで役立つ情報をいつでも入手"</string>
     <string name="widget_education_content" msgid="745542879510751525">"ホーム画面にウィジェットを追加すると、アプリを開かずに情報を入手できます"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"タップしてウィジェットの設定を変更する"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"ウィジェットの設定を変更します"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"アプリを検索"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"アプリを読み込んでいます…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"「<xliff:g id="QUERY">%1$s</xliff:g>」に一致するアプリは見つかりませんでした"</string>
@@ -62,7 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"通知"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"長押ししてショートカットを移動してください。"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ショートカットをダブルタップして長押ししながら移動するか、カスタム操作を使用してください。"</string>
-    <string name="out_of_space" msgid="4691004494942118364">"このホーム画面に空きスペースがありません。"</string>
+    <string name="out_of_space" msgid="4691004494942118364">"このホーム画面には空きスペースがありません。"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"お気に入りトレイに空きスペースがありません"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"アプリのリスト"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"個人用アプリのリスト"</string>
@@ -104,7 +106,7 @@
     <string name="settings_button_text" msgid="8873672322605444408">"ホームの設定"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"管理者により無効にされています"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"ホーム画面の回転を許可"</string>
-    <string name="allow_rotation_desc" msgid="8662546029078692509">"スマートフォンが回転したとき"</string>
+    <string name="allow_rotation_desc" msgid="8662546029078692509">"スマートフォンの向きに合わせます"</string>
     <string name="notification_dots_title" msgid="9062440428204120317">"通知ドット"</string>
     <string name="notification_dots_desc_on" msgid="1679848116452218908">"ON"</string>
     <string name="notification_dots_desc_off" msgid="1760796511504341095">"OFF"</string>
@@ -113,7 +115,7 @@
     <string name="title_change_settings" msgid="1376365968844349552">"設定を変更"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"通知ドットの表示"</string>
     <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"ホーム画面にアプリのアイコンを追加"</string>
-    <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"新しいアプリをダウンロードしたとき"</string>
+    <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"新しいアプリをダウンロードしたときに自動で追加します"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"不明"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"削除"</string>
     <string name="abandoned_search" msgid="891119232568284442">"検索"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"個人用"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"仕事用"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"仕事用プロファイル"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"個人用と仕事用のデータは分離され、アプリは別々に表示されます"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"仕事用アプリと仕事用データは IT 管理者に公開されます"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"次へ"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"仕事用プロファイルが一時停止しています"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"仕事用アプリは、通知の送信、バッテリーの使用、位置情報の取得を行えません"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"仕事用プロファイルが一時停止しています。仕事用アプリは、通知の送信、バッテリーの使用、位置情報の取得を行えません"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"仕事用アプリは OFF になっています"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"仕事用アプリは、通知の送信、バッテリーの使用、位置情報の取得を行えません"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"仕事用アプリは OFF になっています。仕事用アプリは、通知の送信、バッテリーの使用、位置情報の取得を行えません"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"仕事用アプリはバッジが付き、IT 管理者に公開されます"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"仕事用アプリを一時停止"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"ON にする"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"仕事用アプリを OFF にする"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"仕事用アプリを ON にする"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"フィルタ"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"仕事用のアプリと通知を一時停止します"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"失敗: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 1347d1debc..51246be30b 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"მიმოწერები"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"ადვილად მისაწვდომი სასარგებლო ინფორმაცია"</string>
     <string name="widget_education_content" msgid="745542879510751525">"იმისთვის, რომ ინფორმაცია აპების გაუხსნელად მიიღოთ, შეგიძლიათ, მთავარ ეკრანზე ვიჯეტები დაამატოთ"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"შეეხეთ ვიჯეტის პარამეტრების შესაცვლელად"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"გასაგებია"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"ვიჯეტის პარამეტრების შეცვლა"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"აპების ძიება"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"აპები იტვირთება…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"„<xliff:g id="QUERY">%1$s</xliff:g>“-ის თანხვედრი აპები არ მოიძებნა"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"პირადი"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"სამსახური"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"სამსახურის პროფილი"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"პერსონალური მონაცემები განცალკევებულია და თქვენი სამსახურის აპებისთვის უხილავია"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"თქვენი IT ადმინისტრატორი თქვენს სამსახურის აპებში არსებულ მონაცემებს ხედავს"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"შემდეგ"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"გასაგებია"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"სამსახურის პროფილი დაპაუზებულია"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"სამსახურის აპებს არ შეუძლია თქვენთვის შეტყობინებების გამოგზავნა, თქვენი ბატარეის გამოყენება, ან თქვენს მდებარეობაზე წვდომა"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"სამსახურის პროფილი დაპაუზებულია. სამსახურის აპებს არ შეუძლია თქვენთვის შეტყობინებების გამოგზავნა, თქვენი ბატარეის გამოყენება, ან თქვენს მდებარეობაზე წვდომა"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"სამსახურის აპები გამორთულია"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"თქვენს სამსახურის აპებს არ შეუძლია თქვენთვის შეტყობინებების გამოგზავნა, თქვენი ბატარეის გამოყენება, ან თქვენს მდებარეობაზე წვდომა"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"სამსახურის აპები გამორთულია. თქვენს სამსახურის აპებს არ შეუძლია თქვენთვის შეტყობინებების გამოგზავნა, თქვენი ბატარეის გამოყენება, ან თქვენს მდებარეობაზე წვდომა"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"სამსახურის აპები ბეჯით არის მონიშნული და ხილულია IT ადმინისტრატორისთვის"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"გასაგებია"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"სამსახურის აპების დაპაუზება"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"ჩართვა"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"სამსახურის აპების გამორთვა"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"სამსახურის აპების ჩართვა"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"ფილტრი"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"სამსახურის აპებისა და შეტყობინებების დაპაუზება"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"ვერ მოხერხდა: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 640ffca72d..b2753a2e88 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -28,11 +28,11 @@
     <string name="shortcut_not_available" msgid="2536503539825726397">"Таңбаша қолжетімді емес"</string>
     <string name="home_screen" msgid="5629429142036709174">"Негізгі экран"</string>
     <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Экранды бөлу"</string>
-    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Виджетті жылжыту үшін түртіп ұстап тұрыңыз."</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Виджетті жылжыту үшін басып тұрыңыз."</string>
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Виджетті жылжыту үшін екі рет түртіңіз де, ұстап тұрыңыз немесе арнаулы әрекеттерді пайдаланыңыз."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Ені: %1$d, биіктігі: %2$d"</string>
-    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Негізгі экранда қозғалту үшін виджетті басып, ұстап тұрыңыз."</string>
+    <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Негізгі экранда қозғалту үшін виджетті басып тұрыңыз."</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Негізгі экранға қосу"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виджет</item>
@@ -53,14 +53,16 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Әңгімелер"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Саусақпен түртсеңіз болғаны – пайдалы ақпарат көз алдыңызда"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Қолданбаларды ашпай-ақ ақпарат алу үшін негізгі экранға тиісті виджеттерді қосыңыз."</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Виджет параметрлерін өзгерту үшін түртіңіз."</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Түсінікті"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Виджет параметрлерін өзгерту"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Қолданбаларды іздеу"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Қолданбалар жүктелуде…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" сұрауына сәйкес келетін қолданбалар жоқ"</string>
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Қосымша қолданбалар іздеу"</string>
     <string name="label_application" msgid="8531721983832654978">"Қолданба"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Хабарландырулар"</string>
-    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Таңбашаны жылжыту үшін түртіп ұстап тұрыңыз."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Таңбашаны жылжыту үшін басып тұрыңыз."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Таңбашаны жылжыту үшін екі рет түртіңіз де, ұстап тұрыңыз немесе арнаулы әрекеттерді пайдаланыңыз."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Бұл Негізгі экранда орын қалмады."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Қалаулылар науасында орын қалмады"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Жеке"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Жұмыс"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Жұмыс профилі"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Жеке деректер бөлек орналасқан және жұмыс қолданбаларынан жасырылған"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Әкімшіңіз жұмыс қолданбалары мен деректерін көре алады"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Келесі"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Түсінікті"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Жұмыс профилі кідіртілді"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Жұмыс қолданбалары сізге хабарландырулар жібере алмайды, батареяңызды немесе локацияңызды пайдалана алмайды."</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Жұмыс профилі уақытша тоқтатылды. Жұмыс қолданбалары сізге хабарландырулар жібере алмайды, батареяңызды немесе локацияңызды пайдалана алмайды."</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Жұмыс қолданбалары өшірулі"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Жұмыс қолданбалары сізге хабарландырулар жібере, батареяңызды немесе локацияңызды пайдалана алмайды."</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Жұмыс қолданбалары өшірулі. Олар сізге хабарландырулар жібере, батареяңызды немесе локацияңызды пайдалана алмайды."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Жұмыс қолданбаларының танымбелгілері бар және олар әкімшіңізге көрінеді."</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Түсінікті"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Жұмыс қолданбаларын тоқтата тұру"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Қосу"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Жұмыс қолданбаларын өшіру"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Жұмыс қолданбаларын қосу"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Сүзгі"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Жұмыс қолданбалары мен хабарландыруларын кідірту"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Қате шықты: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 4f0964836c..82c9a36123 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"ការសន្ទនា"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"ទទួលបាន​ព័ត៌មានដែលមានប្រយោជន៍​យ៉ាងងាយស្រួល"</string>
     <string name="widget_education_content" msgid="745542879510751525">"ដើម្បីទទួលបាន​ព័ត៌មាន​ដោយមិនចាំបាច់​បើកកម្មវិធី អ្នកអាចបញ្ចូលធាតុ​ក្រាហ្វិកទៅក្នុង​អេក្រង់ដើម​របស់អ្នក"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"ចុចដើម្បីប្ដូរការកំណត់ធាតុ​ក្រាហ្វិក"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"យល់ហើយ"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"ប្ដូរការកំណត់ធាតុ​ក្រាហ្វិក"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ស្វែងរក​កម្មវិធី"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"កំពុងផ្ទុកកម្មវិធី…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"រកមិនឃើញកម្មវិធី​ដែលត្រូវគ្នាជាមួយ \"<xliff:g id="QUERY">%1$s</xliff:g>\" ទេ"</string>
@@ -62,7 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"ការ​ជូនដំណឹង"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"ចុចឱ្យជាប់​ដើម្បីផ្លាស់ទី​ផ្លូវកាត់​។"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ចុចពីរដង រួចសង្កត់ឱ្យជាប់ ដើម្បីផ្លាស់ទី​ផ្លូវកាត់ ឬប្រើ​សកម្មភាព​តាមបំណង​។"</string>
-    <string name="out_of_space" msgid="4691004494942118364">"គ្មាន​បន្ទប់​នៅ​លើ​អេក្រង់​ដើម​នេះ​ទៀត​ទេ។"</string>
+    <string name="out_of_space" msgid="4691004494942118364">"គ្មាន​កន្លែង​នៅ​លើ​អេក្រង់​ដើម​នេះ​ទៀត​ទេ។"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"គ្មាន​បន្ទប់​​ក្នុង​ថាស​និយម​ប្រើ"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"បញ្ជីកម្មវិធី"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"បញ្ជី​កម្មវិធី​ផ្ទាល់ខ្លួន"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ផ្ទាល់ខ្លួន"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"ការងារ"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"កម្រងព័ត៌មានការងារ"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"ទិន្នន័យ​ផ្ទាល់ខ្លួន​ស្ថិតនៅ​ដាច់ដោយឡែក និង​ត្រូវបាន​លាក់ពី​កម្មវិធី​ការងារ"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"ទិន្នន័យ និង​កម្មវិធី​ការងារ​គឺអាចមើលឃើញដោយ​អ្នកគ្រប់គ្រង​ផ្នែកព័ត៌មានវិទ្យា​របស់អ្នក"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"បន្ទាប់"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"យល់ហើយ"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"កម្រងព័ត៌មានការងារត្រូវបាន​ផ្អាក"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"កម្មវិធី​ការងារ​មិនអាចផ្ញើ​ការជូនដំណឹង​ទៅអ្នក ប្រើប្រាស់ថ្ម​របស់អ្នក ឬ​ចូលប្រើ​ទីតាំង​របស់អ្នក​បានទេ"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"កម្រងព័ត៌មាន​ការងារ​ត្រូវបាន​ផ្អាក។ កម្មវិធី​ការងារ​មិនអាចផ្ញើ​ការជូនដំណឹង​ទៅអ្នក ប្រើប្រាស់ថ្ម​របស់អ្នក ឬ​ចូលប្រើ​ទីតាំង​របស់អ្នក​បានទេ"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"កម្មវិធីការងារ​ត្រូវបានបិទ"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"កម្មវិធី​ការងារ​របស់អ្នក​មិនអាចផ្ញើ​ការជូនដំណឹង​ទៅអ្នក ប្រើប្រាស់ថ្ម​របស់អ្នក ឬ​ចូលប្រើ​ទីតាំង​របស់អ្នក​បានទេ"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"កម្មវិធីការងារ​ត្រូវបានបិទ។ កម្មវិធីការងារ​របស់អ្នកមិនអាចផ្ញើ​ការជូនដំណឹង​ទៅអ្នក ប្រើប្រាស់ថ្ម​របស់អ្នក ឬ​ចូលប្រើ​ទីតាំង​របស់អ្នក​បានទេ"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"កម្មវិធីការងារ​ត្រូវបានដាក់​គ្រឿងសម្គាល់ ហើយ​អ្នកគ្រប់គ្រង​ផ្នែកព័ត៌មានវិទ្យា​របស់អ្នក​អាចមើលឃើញ"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"យល់ហើយ"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"ផ្អាក​កម្មវិធី​ការងារ"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"បើក"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"បិទ​កម្មវិធីការងារ"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"បើក​កម្មវិធី​ការងារ"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"តម្រង"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"ផ្អាក​ការជូនដំណឹង និង​កម្មវិធី​ការងារ"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"បានបរាជ័យ៖ <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 9a3075f54d..07a0cc9238 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -53,7 +53,11 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"ಸಂವಾದಗಳು"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"ನಿಮ್ಮ ಬೆರಳ ತುದಿಯಲ್ಲಿ ಉಪಯುಕ್ತ ಮಾಹಿತಿ"</string>
     <string name="widget_education_content" msgid="745542879510751525">"ಆ್ಯಪ್‌ಗಳನ್ನು ತೆರೆಯದೆಯೇ ಮಾಹಿತಿಯನ್ನು ಪಡೆಯಲು, ನಿಮ್ಮ ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿ ನೀವು ವಿಜೆಟ್‌ಗಳನ್ನು ಸೇರಿಸಬಹುದು"</string>
+    <!-- no translation found for reconfigurable_widget_education_tip (6336962690888067057) -->
+    <skip />
     <string name="widget_education_close_button" msgid="8676165703104836580">"ಅರ್ಥವಾಯಿತು"</string>
+    <!-- no translation found for widget_reconfigure_button_content_description (8811472721881205250) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಹುಡುಕಿ"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" ಹೊಂದಿಕೆಯ ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಕಂಡುಬಂದಿಲ್ಲ"</string>
@@ -154,18 +158,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ವೈಯಕ್ತಿಕ"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"ಕೆಲಸ"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"ವೈಯಕ್ತಿಕ ಡೇಟಾ ಬೇರೆಯದಾಗಿದೆ ಮತ್ತು ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ನಿಂದ ಮರೆ ಮಾಡಲಾಗಿದೆ"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"ನಿಮ್ಮ IT ನಿರ್ವಾಹಕರಿಗೆ ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳು ಮತ್ತು ಡೇಟಾ ಗೋಚರಿಸುತ್ತದೆ"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"ಮುಂದೆ"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ಸರಿ"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್‌ ಅನ್ನು ವಿರಾಮಗೊಳಿಸಲಾಗಿದೆ"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳಿಗೆ ನಿಮಗೆ ಅಧಿಸೂಚನೆಗಳನ್ನು ಕಳುಹಿಸಲು, ನಿಮ್ಮ ಬ್ಯಾಟರಿಯನ್ನು ಬಳಸಲು ಅಥವಾ ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್‌ ಅನ್ನು ವಿರಾಮಗೊಳಿಸಲಾಗಿದೆ. ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳಿಗೆ ನಿಮಗೆ ಅಧಿಸೂಚನೆಗಳನ್ನು ಕಳುಹಿಸಲು, ನಿಮ್ಮ ಬ್ಯಾಟರಿಯನ್ನು ಬಳಸಲು ಅಥವಾ ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳು ಆಫ್ ಆಗಿವೆ"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"ನಿಮ್ಮ ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳಿಗೆ ನಿಮಗೆ ಅಧಿಸೂಚನೆಗಳನ್ನು ಕಳುಹಿಸಲು, ನಿಮ್ಮ ಬ್ಯಾಟರಿಯನ್ನು ಬಳಸಲು ಅಥವಾ ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳು ಆಫ್ ಆಗಿವೆ. ನಿಮ್ಮ ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳು ನಿಮಗೆ ಅಧಿಸೂಚನೆಗಳನ್ನು ಕಳುಹಿಸಲು, ನಿಮ್ಮ ಬ್ಯಾಟರಿಯನ್ನು ಬಳಸಲು ಅಥವಾ ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳು ಬ್ಯಾಡ್ಜ್ ಮಾಡಲಾಗಿದೆ ಮತ್ತು ನಿಮ್ಮ IT ನಿರ್ವಾಹಕರಿಗೆ ಗೋಚರಿಸುತ್ತದೆ"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"ಅರ್ಥವಾಯಿತು"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ವಿರಾಮಗೊಳಿಸಿ"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"ಆನ್ ಮಾಡಿ"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ಆಫ್ ಮಾಡಿ"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ಆನ್ ಮಾಡಿ"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"ಫಿಲ್ಟರ್‌"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳು ಮತ್ತು ಅಧಿಸೂಚನೆಗಳನ್ನು ವಿರಾಮಗೊಳಿಸಿ"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"ವಿಫಲವಾಗಿದೆ: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index cce4c8935b..68589d8ea9 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"대화"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"빠르게 유용한 정보 확인"</string>
     <string name="widget_education_content" msgid="745542879510751525">"앱을 열지 않고 정보를 확인하려면 홈 화면에 위젯을 추가하세요."</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"탭하여 위젯 설정 변경"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"확인"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"위젯 설정 변경"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"앱 검색"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"앱 로드 중…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\'<xliff:g id="QUERY">%1$s</xliff:g>\'과(와) 일치하는 앱이 없습니다."</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"개인"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"직장"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"직장 프로필"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"개인 정보는 직장 앱에서 분리되어 숨겨짐"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"직장 앱 및 데이터가 IT 관리자에게 표시됨"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"다음"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"확인"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"직장 프로필이 일시중지됨"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"직장 앱에서 알림을 보내거나 배터리를 사용하거나 내 위치 정보에 액세스할 수 없습니다."</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"직장 프로필이 일시중지되었습니다. 직장 앱에서 알림을 보내거나 배터리를 사용하거나 내 위치 정보에 액세스할 수 없습니다."</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"직장 앱이 꺼져 있음"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"직장 앱에서 알림을 보내거나 배터리를 사용하거나 위치 정보에 액세스할 수 없습니다."</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"직장 앱이 꺼져 있습니다. 직장 앱에서 알림을 보내거나 배터리를 사용하거나 위치 정보에 액세스할 수 없습니다."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"직장 앱에는 배지가 있으며, IT 관리자는 직장 앱을 확인할 수 있습니다."</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"확인"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"직장 앱 일시중지"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"사용 설정"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"직장 앱 사용 중지"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"직장 앱 사용 설정"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"필터"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"직장 앱 및 알림 일시중지"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"실패: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index ed49ff1ae2..919fe45bba 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -48,12 +48,14 @@
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Текстти издөө кутучасынан тазалоо"</string>
     <string name="no_widgets_available" msgid="9140948620298620513">"Виджет жок"</string>
     <string name="no_search_results" msgid="6518732304311458580">"Издөө жыйынтыктары жок"</string>
-    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Жеке"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Жеке виджеттер"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Жумуш"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Сүйлөшүүлөр"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Пайдалуу маалымат манжаңыздын учунда эле турат"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Колдонмолорду ачпастан керектүү маалыматты алуу үчүн Башкы экранга виджеттерди кошуңуз"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Виджеттин жөндөөлөрүн өзгөртүү үчүн таптап коюңуз"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Түшүндүм"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Виджеттин жөндөөлөрүн өзгөртүү"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Колдонмолорду издөө"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Колдонмолор жүктөлүүдө…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" сурамына дал келген колдонмолор табылган жок"</string>
@@ -62,7 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Билдирмелер"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Ыкчам баскычты жылдыруу үчүн коё бербей басып туруңуз."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Ыкчам баскычты жылдыруу үчүн эки жолу таптап, кармап туруңуз же ыңгайлаштырылган аракеттерди колдонуңуз."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Бул Үй экранында бош орун жок."</string>
+    <string name="out_of_space" msgid="4691004494942118364">"Бул экранда бош орун жок."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Тандамалдар тайпасында орун калган жок"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Колдонмолор тизмеси"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Жеке колдономолордун тизмеси"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Жеке колдонмолор"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Жумуш колдонмолору"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Жумуш профили"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Жеке маалымат жумуш колдонмолорунан өзүнчө сакталат"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Жумуш колдонмолору жана маалымат IT администраторго гана көрүнөт"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Кийинки"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Түшүндүм"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Жумуш профили тындырылган"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Жумуш колдонмолору билдирмелерди жөнөтүп, түзмөгүңүздүн батареясын керектеп же кайда жүргөнүңүздү көрө албайт"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Жумуш профили тындырылган. Жумуш колдонмолору билдирмелерди жөнөтүп, түзмөгүңүздүн батареясын керектеп же кайда жүргөнүңүздү көрө албайт"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Жумуш колдонмолору өчүк"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Жумуш колдонмолору билдирмелерди жөнөтүп, түзмөгүңүздүн батареясын керектеп же кайда жүргөнүңүздү көрө албайт"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Жумуш колдонмолору өчүк жана билдирмелерди жөнөтүп, түзмөгүңүздүн батареясын керектеп же кайда жүргөнүңүздү көрө албайт"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Жумуш колдонмолору белгиленип, аларды IT администраторлору көрөт"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Түшүндүм"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Жумуш колдонмолорун тындыруу"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Күйгүзүү"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Жумуш колдонмолорун өчүрүү"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Жумуш колдонмолорун күйгүзүү"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Чыпкалоо"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Жумуш колдонмолорун жана билдирмелерди тындыруу"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Аткарылган жок: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index ed367d98eb..b91da7d67e 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"ການສົນທະນາ"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"ຂໍ້ມູນທີ່ເປັນປະໂຫຍດຢູ່ປາຍນິ້ວຂອງທ່ານ"</string>
     <string name="widget_education_content" msgid="745542879510751525">"ເພື່ອຮັບຂໍ້ມູນໂດຍບໍ່ຕ້ອງເປີດແອັບ, ທ່ານສາມາດເພີ່ມວິດເຈັດໃສ່ໂຮມສະກຣີນຂອງທ່ານໄດ້"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"ແຕະເພື່ອປ່ຽນການຕັ້ງຄ່າວິດເຈັດ"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"ເຂົ້າໃຈແລ້ວ"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"ປ່ຽນການຕັ້ງຄ່າວິດເຈັດ"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ຊອກຫາແອັບ"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ກໍາລັງໂຫຼດແອັບ…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"ບໍ່ພົບແອັບທີ່ກົງກັບ \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -62,7 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"ການແຈ້ງເຕືອນ"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"ແຕະຄ້າງໄວ້ເພື່ອຍ້າຍທາງລັດ."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ແຕະສອງເທື່ອຄ້າງໄວ້ເພື່ອຍ້າຍທາງລັດ ຫຼື ໃຊ້ຄຳສັ່ງກຳນົດເອງ."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"ບໍ່ມີຫ້ອງເຫຼືອໃນໜ້າຈໍຫຼັກນີ້."</string>
+    <string name="out_of_space" msgid="4691004494942118364">"ບໍ່ມີບ່ອນຫວ່າງໃນໜ້ານີ້."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ບໍ່ມີບ່ອນຫວ່າງໃນຖາດສຳລັບເກັບສິ່ງທີ່ໃຊ້ເປັນປະຈຳ"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ລາຍຊື່ແອັບ"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"ລາຍຊື່ແອັບສ່ວນຕົວ"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ສ່ວນຕົວ"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"ວຽກ"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"ຂໍ້ມູນສ່ວນຕົວຈະຖືກແຍກອອກ ແລະ ເຊື່ອງໄວ້ຈາກແອັບວຽກ"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"ແອັບ ແລະ ຂໍ້ມູນວຽກຈະສະແດງໃຫ້ຜູ້ເບິ່ງແຍງໄອທີຂອງທ່ານເຫັນ"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"ຕໍ່ໄປ"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ເຂົ້າໃຈແລ້ວ"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"ຢຸດໂປຣໄຟລ໌ວຽກໄວ້ຊົ່ວຄາວແລ້ວ"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"ແອັບບ່ອນເຮັດວຽກຈະບໍ່ສາມາດສົ່ງການແຈ້ງເຕືອນຫາທ່ານ, ໃຊ້ແບັດເຕີຣີຂອງທ່ານ ຫຼື ເຂົ້າເຖິງສະຖານທີ່ຂອງທ່ານໄດ້"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"ຢຸດໂປຣໄຟລ໌ບ່ອນເຮັດວຽກໄວ້ຊົ່ວຄາວແລ້ວ. ແອັບບ່ອນເຮັດວຽກຈະບໍ່ສາມາດສົ່ງການແຈ້ງເຕືອນຫາທ່ານ, ໃຊ້ແບັດເຕີຣີຂອງທ່ານ ຫຼື ເຂົ້າເຖິງສະຖານທີ່ຂອງທ່ານໄດ້"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"ແອັບບ່ອນເຮັດວຽກຖືກປິດໄວ້ຢູ່"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"ແອັບບ່ອນເຮັດວຽກຂອງທ່ານຈະບໍ່ສາມາດສົ່ງການແຈ້ງເຕືອນຫາທ່ານ, ໃຊ້ແບັດເຕີຣີຂອງທ່ານ ຫຼື ເຂົ້າເຖິງສະຖານທີ່ຂອງທ່ານໄດ້"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"ແອັບບ່ອນເຮັດວຽກຖືກປິດໄວ້ຢູ່. ແອັບບ່ອນເຮັດວຽກຂອງທ່ານຈະບໍ່ສາມາດສົ່ງການແຈ້ງເຕືອນໃຫ້ທ່ານ, ໃຊ້ແບັດເຕີຣີຂອງທ່ານ ຫຼື ເຂົ້າເຖິງສະຖານທີ່ຂອງທ່ານໄດ້"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"ແອັບບ່ອນເຮັດວຽກແມ່ນຖືກຕິດປ້າຍ ແລະ ສະແດງໃຫ້ຜູ້ເບິ່ງແຍງໄອທີຂອງທ່ານເຫັນ"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"ເຂົ້າໃຈແລ້ວ"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"ຢຸດແອັບບ່ອນເຮັດວຽກຊົ່ວຄາວ"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"ເປີດໃຊ້"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"ປິດການໃຊ້ແອັບບ່ອນເຮັດວຽກ"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"ເປີດໃຊ້ແອັບບ່ອນເຮັດວຽກ"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"ກັ່ນຕອງ"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"ຢຸດແອັບວຽກ ແລະ ການແຈ້ງເຕືອນໄວ້ຊົ່ວຄາວ"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"ບໍ່ສຳເລັດ: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 21f99fc127..84414ca486 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -57,7 +57,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Pokalbiai"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Lengvai pasiekiama naudinga informacija"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Jei norite gauti informacijos neatidarę programų, galite pridėti valdiklių pagrindiniame ekrane"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Palieskite, kad pakeistumėte valdiklio nustatymus"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Supratau"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Pakeisti valdiklio nustatymus"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Paieškos programos"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Įkeliamos programos…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nerasta jokių užklausą „<xliff:g id="QUERY">%1$s</xliff:g>“ atitinkančių programų"</string>
@@ -160,18 +162,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Asmeninės"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Darbo"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Darbo profilis"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Asmens duomenys laikomi atskirai ir paslėpti nuo darbo programų"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Darbo programas ir duomenis mato jūsų IT administratorius"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Kitas"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Supratau"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Darbo profilis pristabdytas"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Darbo programos negali siųsti jums pranešimų, naudoti jūsų akumuliatoriaus ar pasiekti jūsų vietovės"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Darbo profilis pristabdytas. Darbo programos negali siųsti jums pranešimų, naudoti jūsų akumuliatoriaus ar pasiekti jūsų vietovės"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Darbo programos išjungtos"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Darbo programos negali siųsti jums pranešimų, naudoti jūsų akumuliatoriaus ar pasiekti jūsų vietovės"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Darbo programos išjungtos. Darbo programos negali siųsti jums pranešimų, naudoti jūsų akumuliatoriaus ar pasiekti jūsų vietovės"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Darbo programos yra pažymėtos ženkleliu ir matomos IT administratoriui"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Supratau"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pristabdyti darbo programas"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Įjungti"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Išjungti darbo programas"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Įjungti darbo programas"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtruoti"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Pristabdykite darbo programas ir pranešimus"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Nepavyko: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index ad4082be57..0b283d9b48 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -55,7 +55,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Sarunas"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Ērta piekļuve noderīgai informācijai"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Lai iegūtu informāciju, neatverot lietotnes, varat pievienot logrīkus sākuma ekrānā."</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Pieskarieties, lai mainītu logrīka iestatījumus."</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Labi"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Mainīt logrīka iestatījumus"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Meklēt lietotnes"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Notiek lietotņu ielāde…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Vaicājumam “<xliff:g id="QUERY">%1$s</xliff:g>” neatbilda neviena lietotne"</string>
@@ -157,18 +159,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personīgās lietotnes"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Darba lietotnes"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Darba profils"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Personas dati ir atsevišķi un paslēpti no darba lietotnēm"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Jūsu IT administrators var skatīt darba lietotnes un datus"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Tālāk"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Labi"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Darba profila darbība ir pārtraukta"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Darba lietotnes nevar sūtīt jums paziņojumus, izmantot akumulatoru un piekļūt jūsu atrašanās vietai."</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Darba profila darbība ir pārtraukta. Darba lietotnes nevar sūtīt jums paziņojumus, izmantot akumulatoru un piekļūt jūsu atrašanās vietai."</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Darba lietotnes ir izslēgtas"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Jūsu darba lietotnes nevar sūtīt jums paziņojumus, izmantot akumulatoru un piekļūt jūsu atrašanās vietai."</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Darba lietotnes ir izslēgtas. Jūsu darba lietotnes nevar sūtīt jums paziņojumus, izmantot akumulatoru un piekļūt jūsu atrašanās vietai."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Darba lietotnēm ir pievienota emblēma, un tās ir redzamas jūsu IT administratoram"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Labi"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pārtraukt darba lietotņu darbību"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Ieslēgt"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Izslēgt darba lietotnes"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Ieslēgt darba lietotnes"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtrs"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Pārtraukt darba lietotņu darbību un paziņojumu sūtīšanu"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Neizdevās: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index f4c960624e..29acbb87b6 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Разговори"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Корисни информации на дофат на прстите"</string>
     <string name="widget_education_content" msgid="745542879510751525">"За да добивате информации без да ги отворате апликациите, може да додадете виџети на почетниот екран"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Допрете за да ги промените поставките за виџетот"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Сфатив"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Промени ги поставките за виџетот"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Пребарувајте апликации"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Се вчитуваат апликации…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Не се најдени апликации што одговараат на „<xliff:g id="QUERY">%1$s</xliff:g>“"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Лично"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"За работа"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Работен профил"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Личните податоци се одделни и сокриени од работните апликации"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Работните апликации и податоци се видливи за IT-администраторот"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Следно"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Сфатив"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Работниот профил е паузиран"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Работните апликации не можат да ви испраќаат известувања, да ја користат батеријата или да пристапуваат до вашата локација"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Работниот профил е паузиран. Работните апликации не можат да ви испраќаат известувања, да ја користат батеријата или да пристапуваат до вашата локација"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Работните апликации се исклучени"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Работните апликации не може да ви испраќаат известувања, да ја користат батеријата или да пристапуваат до вашата локација"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Работните апликации се исклучени. Не може да ви испраќаат известувања, да ја користат батеријата или да пристапуваат до вашата локација"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Работните апликации имаат значка и се видливи за IT-администраторот"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Сфатив"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Паузирај ги работните апликации"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Вклучи"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Исклучете ги работните апликации"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Вклучете ги работните апликации"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Филтер"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Паузирајте работни апликации и известувања"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Не успеа: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 0359220ac1..53679f15c4 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -43,7 +43,7 @@
       <item quantity="one"><xliff:g id="SHORTCUTS_COUNT_0">%1$d</xliff:g> കുറുക്കുവഴി</item>
     </plurals>
     <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"വിഡ്ജെറ്റുകൾ"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"വിജറ്റുകൾ"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"തിരയൽ"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"സെർച്ച് ബോക്‌സിൽ നിന്ന് ടെക്‌സ്‌റ്റ് മായ്‌ക്കുക"</string>
     <string name="no_widgets_available" msgid="9140948620298620513">"ഒരു വിജറ്റുകളും ലഭ്യമല്ല"</string>
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"സംഭാഷണങ്ങൾ"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"ഉപകാരപ്രദമായ വിവരങ്ങൾ നിങ്ങളുടെ വിരൽത്തുമ്പിൽ"</string>
     <string name="widget_education_content" msgid="745542879510751525">"ആപ്പുകൾ തുറക്കാതെ വിവരങ്ങൾ ലഭിക്കാൻ, നിങ്ങൾക്ക് ഹോം സ്ക്രീനിലേക്ക് വിജറ്റുകൾ ചേർക്കാം"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"വിജറ്റ് ക്രമീകരണം മാറ്റാൻ ടാപ്പ് ചെയ്യുക"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"മനസ്സിലായി"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"വിജറ്റ് ക്രമീകരണം മാറ്റുക"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ആപ്പുകൾ തിരയുക"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ആപ്പുകൾ ലോഡുചെയ്യുന്നു..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" എന്നതുമായി പൊരുത്തപ്പെടുന്ന ആപ്പുകളൊന്നും കണ്ടെത്തിയില്ല"</string>
@@ -112,7 +114,7 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"അറിയിപ്പ് ഡോട്ടുകൾ കാണിക്കുന്നതിന്, <xliff:g id="NAME">%1$s</xliff:g> എന്നയാളിനായുള്ള ആപ്പ് അറിയിപ്പുകൾ ഓണാക്കുക"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"ക്രമീകരണം മാറ്റുക"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"അറിയിപ്പ് ഡോട്ടുകൾ കാണിക്കുക"</string>
-    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"ഹോം സ്‌ക്രീനിൽ ആപ്പ് ഐക്കണുകൾ ചേർക്കൂ"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"ഹോം സ്‌ക്രീനിൽ ആപ്പ് ഐക്കണുകൾ ചേർക്കുക"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"പുതിയ ആപ്പുകൾക്ക്"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"അജ്ഞാതം"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"നീക്കംചെയ്യുക"</string>
@@ -152,20 +154,18 @@
     <string name="accessibility_close" msgid="2277148124685870734">"അടയ്ക്കൂ"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"അറിയിപ്പ് നിരസിച്ചു"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"വ്യക്തിപരം"</string>
-    <string name="all_apps_work_tab" msgid="4884822796154055118">"ജോലി"</string>
+    <string name="all_apps_work_tab" msgid="4884822796154055118">"ഔദ്യോഗികം"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"ഔദ്യോഗിക പ്രൊഫൈൽ"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"ഔദ്യോഗിക ആപ്പുകളിൽ നിന്ന് വ്യക്തിപരമായ ഡാറ്റ വേർതിരിച്ച് മറച്ചിരിക്കുന്നു"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"ഔദ്യോഗിക ആപ്പുകളും ഡാറ്റയും നിങ്ങളുടെ ഐടി അഡ്‌മിന് ദൃശ്യമാണ്"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"അടുത്തത്"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"മനസ്സിലായി"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"ഔദ്യോഗിക പ്രൊഫൈൽ തൽക്കാലം നിർത്തിയിരിക്കുന്നു"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"നിങ്ങൾക്ക് അറിയിപ്പുകൾ അയയ്ക്കാനോ ബാറ്ററി ഉപയോഗിക്കാനോ ലൊക്കേഷൻ ആക്‌സസ് ചെയ്യാനോ ഔദ്യോഗിക ആപ്പുകൾക്ക് കഴിയില്ല"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"ഔദ്യോഗിക പ്രൊഫൈൽ താൽക്കാലികമായി നിർത്തിയിരിക്കുന്നു. നിങ്ങൾക്ക് അറിയിപ്പുകൾ അയയ്ക്കാനോ ബാറ്ററി ഉപയോഗിക്കാനോ ലൊക്കേഷൻ ആക്‌സസ് ചെയ്യാനോ ഔദ്യോഗിക ആപ്പുകൾക്ക് കഴിയില്ല"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"ഔദ്യോഗിക ആപ്പുകൾ ഓഫാണ്"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"നിങ്ങൾക്ക് അറിയിപ്പുകൾ അയയ്ക്കാനോ ബാറ്ററി ഉപയോഗിക്കാനോ ലൊക്കേഷൻ ആക്‌സസ് ചെയ്യാനോ നിങ്ങളുടെ ഔദ്യോഗിക ആപ്പുകൾക്ക് കഴിയില്ല"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"ഔദ്യോഗിക ആപ്പുകൾ ഓഫാണ്. നിങ്ങൾക്ക് അറിയിപ്പുകൾ അയയ്ക്കാനോ ബാറ്ററി ഉപയോഗിക്കാനോ ലൊക്കേഷൻ ആക്‌സസ് ചെയ്യാനോ നിങ്ങളുടെ ഔദ്യോഗിക ആപ്പുകൾക്ക് കഴിയില്ല"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"ഔദ്യോഗിക ആപ്പുകൾക്ക് ബാഡ്‌ജ് നൽകിയിരിക്കുന്നു, അവ നിങ്ങളുടെ ഐടി അഡ്‌മിന് കാണാനും കഴിയും"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"മനസ്സിലായി"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"ഔദ്യോഗിക ആപ്പുകൾ താൽക്കാലികമായി നിർത്തുക"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"ഓണാക്കുക"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"ഔദ്യോഗിക ആപ്പുകൾ ഓഫാക്കുക"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"ഔദ്യോഗിക ആപ്പുകൾ ഓണാക്കുക"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"ഫിൽട്ടർ ചെയ്യുക"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"ഔദ്യോഗിക ആപ്പുകളും അറിയിപ്പുകളും താൽക്കാലികമായി നിർത്തുക"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"പരാജയപ്പെട്ടു: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 53d382dc85..dc30f552a2 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -48,12 +48,14 @@
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Хайх хэсгээс текстийг арилгах"</string>
     <string name="no_widgets_available" msgid="9140948620298620513">"Боломжтой жижиг хэрэгсэл байхгүй"</string>
     <string name="no_search_results" msgid="6518732304311458580">"Хайлтын илэрц байхгүй"</string>
-    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Хувийн"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Хувийн виджетүүд"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Ажил"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Харилцан яриа"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Хэрэгтэй мэдээллээ хурууныхаа үзүүрээр аваарай"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Аппуудыг нээлгүйгээр мэдээлэл авахын тулд та Үндсэн нүүрэндээ жижиг хэрэгслүүд нэмэх боломжтой"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Жижиг хэрэгслийн тохиргоог өөрчлөхийн тулд товшино уу"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Ойлголоо"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Жижиг хэрэгслийн тохиргоог өөрчлөх"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Апп хайх"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Аппыг ачаалж байна..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\"-д тохирох апп олдсонгүй"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Хувийн"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Ажил"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Ажлын профайл"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Хувийн өгөгдөл нь ажлын аппаас тусдаа бөгөөд нуугдмал байна"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Ажлын апп болон өгөгдөл нь таны мэдээлэл технологийн админд харагдана"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Дараах"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Ойлголоо"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Ажлын профайлыг түр зогсоосон"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Ажлын аппууд танд мэдэгдэл илгээх, таны батарейг ашиглах эсвэл байршилд тань хандах боломжгүй"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Ажлын профайлыг түр зогсоосон. Ажлын аппууд танд мэдэгдэл илгээх, таны батарейг ашиглах эсвэл байршилд тань хандах боломжгүй"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Ажлын аппууд унтраалттай байна"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Таны ажлын аппууд танд мэдэгдэл илгээх, таны батарейг ашиглах эсвэл байршилд тань хандах боломжгүй"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Ажлын аппууд унтраалттай байна. Таны ажлын аппууд танд мэдэгдэл илгээх, таны батарейг ашиглах эсвэл байршилд тань хандах боломжгүй"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Ажлын аппуудыг тэмдэглэсэн бөгөөд танай IT админд харагдана"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Ойлголоо"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Ажлын аппуудыг түр зогсоох"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Асаах"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Ажлын аппуудыг унтраах"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Ажлын аппуудыг асаах"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Шүүлтүүр"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Ажлын апп болон мэдэгдлийг түр зогсоох"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Амжилтгүй болсон: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index b4c217434e..38acebffad 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -53,7 +53,11 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"संभाषणे"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"तुमच्यासाठी सहज उपलब्ध असलेली माहिती"</string>
     <string name="widget_education_content" msgid="745542879510751525">"ॲप्स न उघडता माहिती मिळवण्यासाठी, तुम्ही तुमच्या होम स्क्रीनवर विजेट जोडू शकता"</string>
+    <!-- no translation found for reconfigurable_widget_education_tip (6336962690888067057) -->
+    <skip />
     <string name="widget_education_close_button" msgid="8676165703104836580">"समजले"</string>
+    <!-- no translation found for widget_reconfigure_button_content_description (8811472721881205250) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"अ‍ॅप्स शोधा"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"अ‍ॅप्स लोड करत आहे…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" शी जुळणारे कोणतेही अ‍ॅप्स आढळले नाहीत"</string>
@@ -154,18 +158,21 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"वैयक्तिक"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"कार्यालय"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"कार्य प्रोफाइल"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"वैयक्तिक डेटा वेगळा असतो आणि तो ऑफिस अ‍ॅप्सपासून लपवलेला असतो"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"कार्य अ‍ॅप्स आणि डेटा तुमच्या अ‍ॅडमिनला दृश्यमान असतो"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"पुढील"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"समजले"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"कार्य प्रोफाइल थांबवली आहे"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Work apps तुम्हाला सूचना पाठवू शकत नाहीत, तुमची बॅटरी वापरू शकत नाहीत किंवा तुमचे स्थान अ‍ॅक्सेस करू शकत नाहीत"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"कार्य प्रोफाइल थांबवली आहे. Work apps तुम्हाला सूचना पाठवू शकत नाहीत, तुमची बॅटरी वापरू शकत नाहीत किंवा तुमचे स्थान अ‍ॅक्सेस करू शकत नाहीत"</string>
+    <!-- no translation found for work_apps_paused_title (3007471013401118920) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_body (261634750995824906) -->
+    <skip />
+    <!-- no translation found for work_apps_paused_content_description (5149623040804051095) -->
+    <skip />
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Work apps ही बॅज केलेली असून तुमच्या IT ॲडमिनला दृश्यमान आहेत"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"समजले"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Work apps थांबवा"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"सुरू करा"</string>
+    <!-- no translation found for work_apps_pause_btn_text (1921059713673767460) -->
+    <skip />
+    <!-- no translation found for work_apps_enable_btn_text (1156432622148413741) -->
+    <skip />
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"फिल्टर"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"कार्य अ‍ॅप्स आणि सूचना थांबवा"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"हे करता आले नाही: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index f6300ee107..be9496203f 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Perbualan"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Maklumat berguna di hujung jari anda"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Untuk mendapatkan maklumat tanpa membuka apl, anda boleh menambahkan widget pada skrin Utama anda"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Ketik untuk menukar tetapan widget"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Tukar tetapan widget"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Cari apl"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Memuatkan apl…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Tiada apl yang ditemui sepadan dengan \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Peribadi"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Kerja"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profil kerja"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Data peribadi adalah berasingan &amp; disembunyikan daripada apl kerja"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Apl &amp; data kerja kelihatan kepada pentadbir IT anda"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Seterusnya"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Profil kerja dijeda"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Apl kerja tidak boleh menghantar pemberitahuan kepada anda, menggunakan bateri anda atau mengakses lokasi anda"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Profil kerja dijeda. Apl kerja tidak boleh menghantar pemberitahuan kepada anda, menggunakan bateri anda atau mengakses lokasi anda"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Apl kerja dimatikan"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Apl kerja anda tidak boleh menghantar pemberitahuan kepada anda, menggunakan bateri anda atau mengakses lokasi anda"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Apl kerja dimatikan. Apl kerja anda tidak boleh menghantar pemberitahuan kepada anda, menggunakan bateri anda atau mengakses lokasi anda"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Apl kerja mempunyai lencana dan kelihatan kepada pentadbir IT anda"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Jeda apl kerja"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Hidupkan"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Matikan apl kerja"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Hidupkan apl kerja"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Tapis"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Jeda apl kerja dan pemberitahuan"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Gagal: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index c120c24725..480310064f 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"စကားဝိုင်းများ"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"အသုံးဝင်သော အချက်အလက်များကို အလွယ်တကူ ရယူလိုက်ပါ"</string>
     <string name="widget_education_content" msgid="745542879510751525">"အက်ပ်များကိုမဖွင့်ဘဲ အချက်အလက်များရယူရန် သင်၏ ပင်မစာမျက်နှာသို့ ဝိဂျက်များ ထည့်နိုင်သည်"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"ဝိဂျက် ဆက်တင်များကို ပြောင်းရန် တို့ပါ"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"ရပြီ"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"ဝိဂျက် ဆက်တင်များကို ပြောင်းပါ"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ရှာဖွေမှု အက်ပ်များ"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"အက်ပ်များကို ဖွင့်နေသည်…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" နှင့်ကိုက်ညီသည့် အပ်ပ်များကို မတွေ့ပါ"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ကိုယ်ပိုင်"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"အလုပ်"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"အလုပ်ပရိုဖိုင်"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"ကိုယ်ပိုင်ဒေတာများသည် သီးသန့်ဖြစ်ပြီး အလုပ်အက်ပ်များမှ ဖျောက်ထားသည်"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"အလုပ်သုံးအက်ပ်နှင့် ဒေတာများကို သင်၏ IT စီမံခန့်ခွဲသူက မြင်ရပါသည်"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"ရှေ့သို့"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ရပါပြီ"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"အလုပ်ပရိုဖိုင် ခဏရပ်ထားသည်"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"အလုပ်သုံးအက်ပ်များက အကြောင်းကြားချက်များ ပို့ခြင်း၊ သင့်ဘက်ထရီ သုံးခြင်း (သို့) သင့်တည်နေရာ သုံးခြင်းတို့ မပြုလုပ်နိုင်ပါ"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"အလုပ်ပရိုဖိုင် ခဏရပ်ထားသည်။ အလုပ်သုံးအက်ပ်များက အကြောင်းကြားချက်များ ပို့ခြင်း၊ သင့်ဘက်ထရီ သုံးခြင်း (သို့) သင့်တည်နေရာ သုံးခြင်းတို့ မပြုလုပ်နိုင်ပါ"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"အလုပ်သုံးအက်ပ်များ ပိတ်ထားသည်"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"သင်၏ အလုပ်သုံးအက်ပ်များက အကြောင်းကြားချက်များ ပို့ခြင်း၊ သင့်ဘက်ထရီ သုံးခြင်း (သို့) သင့်တည်နေရာ သုံးခြင်းတို့ မပြုလုပ်နိုင်ပါ"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"အလုပ်သုံးအက်ပ်များ ပိတ်ထားသည်။ သင်၏ အလုပ်သုံးအက်ပ်များက အကြောင်းကြားချက်များ ပို့ခြင်း၊ သင့်ဘက်ထရီ သုံးခြင်း (သို့) သင့်တည်နေရာ သုံးခြင်းတို့ မပြုလုပ်နိုင်ပါ"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"အလုပ်သုံးအက်ပ်များကို တံဆိပ်တပ်ထားပြီး သင်၏ IT စီမံခန့်ခွဲသူက မြင်နိုင်ပါသည်"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"ရပြီ"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"အလုပ်သုံးအက်ပ်များကို ခဏရပ်ရန်"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"ဖွင့်ရန်"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"အလုပ်သုံးအက်ပ်များ ပိတ်ရန်"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"အလုပ်သုံးအက်ပ်များ ဖွင့်ရန်"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"စစ်ထုတ်ရန်"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"အလုပ်သုံးအက်ပ်နှင့် အကြောင်းကြားချက်များ ခဏရပ်ရန်"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"မအောင်မြင်ပါ− <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 49d29127f4..55ef7a4cd1 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Samtaler"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Lett tilgjengelig nyttig informasjon"</string>
     <string name="widget_education_content" msgid="745542879510751525">"For å se informasjon uten å åpne apper kan du legge til moduler på startskjermen"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Trykk for å endre modulinnstillinger"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Greit"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Endre modulinnstillinger"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Søk etter apper"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Laster inn appene …"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Fant ingen apper som samsvarer med «<xliff:g id="QUERY">%1$s</xliff:g>»"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personlig"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Jobb"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Jobbprofil"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Personlige data er atskilte og skjules fra jobbapper"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Jobbapper og -data er synlige for IT-administratoren din"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Neste"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Greit"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Jobbprofilen er satt på pause"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Jobbapper kan ikke sende deg varsler, bruke batteriet eller få tilgang til posisjonen din"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Jobbprofilen er satt på pause. Jobbapper kan ikke sende deg varsler, bruke batteriet eller få tilgang til posisjonen din"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Jobbapper er av"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Jobbapper kan ikke sende deg varsler, bruke batteriet eller få tilgang til posisjonen din"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Jobbapper er av. De kan ikke sende deg varsler, bruke batteriet eller få tilgang til posisjonen din"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Jobbapper er merket og synlige for IT-administratoren din"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Greit"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Sett jobbapper på pause"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Slå på"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Slå av jobbapper"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Slå på jobbapper"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filter"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Sett jobbapper og -varsler på pause"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Mislyktes: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 929e302e19..14dcec8aa2 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -51,11 +51,12 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"व्यक्तिगत"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"कामसम्बन्धी"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"वार्तालापहरू"</string>
-    <!-- no translation found for widget_education_header (4874760613775913787) -->
+    <string name="widget_education_header" msgid="4874760613775913787">"उपयोगी जानकारी सजिलै प्राप्त गर्नुहोस्"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"एपहरू नखोलिकनै तिनका बारेमा जानकारी प्राप्त गर्न तपाईं आफ्नो होम स्क्रिनमा विजेटहरू हाल्न सक्नुहुन्छ"</string>
+    <!-- no translation found for reconfigurable_widget_education_tip (6336962690888067057) -->
     <skip />
-    <!-- no translation found for widget_education_content (745542879510751525) -->
-    <skip />
-    <!-- no translation found for widget_education_close_button (8676165703104836580) -->
+    <string name="widget_education_close_button" msgid="8676165703104836580">"बुझेँ"</string>
+    <!-- no translation found for widget_reconfigure_button_content_description (8811472721881205250) -->
     <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"खोजसम्बन्धी एपहरू"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"एपहरू लोड गर्दै…"</string>
@@ -65,7 +66,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"सूचनाहरू"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"कुनै सर्टकट सार्न डबल ट्याप गरेर छोइराख्नुहोस्।"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"कुनै सर्टकट सार्न वा आफ्नो रोजाइका कारबाही प्रयोग गर्न डबल ट्याप गरेर छोइराख्नुहोस्।"</string>
-    <string name="out_of_space" msgid="4691004494942118364">"यो गृह स्क्रिनमा कुनै थप ठाउँ छैन।"</string>
+    <string name="out_of_space" msgid="4691004494942118364">"यो होम स्क्रिनमा थप ठाउँ छैन।"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"मन पर्ने ट्रे अब कुनै ठाँउ छैन"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"एपको सूची"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"व्यक्तिगत अनुप्रयोगहरूको सूची"</string>
@@ -104,9 +105,9 @@
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"फोल्डर: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> वा सोभन्दा बढी वस्तुहरू"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"वालपेपरहरु"</string>
     <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"वालपेपर तथा शैली"</string>
-    <string name="settings_button_text" msgid="8873672322605444408">"गृहपृष्ठका सेटिङहरू"</string>
+    <string name="settings_button_text" msgid="8873672322605444408">"होम पेजका सेटिङहरू"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"तपाईँको प्रशासकद्वारा असक्षम गरिएको"</string>
-    <string name="allow_rotation_title" msgid="7728578836261442095">"गृह स्क्रिनलाई रोटेट हुन दिइयोस्"</string>
+    <string name="allow_rotation_title" msgid="7728578836261442095">"होम स्क्रिन रोटेट हुन दिइयोस्"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"फोनलाई घुमाइँदा"</string>
     <string name="notification_dots_title" msgid="9062440428204120317">"सूचनाको प्रतीक जनाउने थोप्लाहरू"</string>
     <string name="notification_dots_desc_on" msgid="1679848116452218908">"सक्रिय"</string>
@@ -115,7 +116,7 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"सूचनाको प्रतीक जनाउने थोप्लाहरू देखाउन <xliff:g id="NAME">%1$s</xliff:g> को एपसम्बन्धी सूचनाहरूलाई सक्रिय गर्नुहोस्"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"सेटिङहरू बदल्नुहोस्"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"सूचनाको प्रतीक जनाउने थोप्लाहरू देखाउनुहोस्"</string>
-    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"गृह स्क्रिनमा एपका आइकनहरू थप्नुहोस्"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"होम स्क्रिनमा एपका आइकन थपियोस्"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"नयाँ एपका लागि"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"अज्ञात"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"हटाउनुहोस्"</string>
@@ -157,18 +158,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"व्यक्तिगत"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"कार्यसम्बन्धी"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"कार्य प्रोफाइल"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"व्यक्तिगत डेटा कामसम्बन्धी एपहरूबाट लुकाएर छुट्टै राखिन्छ"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"तपाईंका IT एड्मिनले कामसम्पबन्धी एपहरू र डेटा हेर्न सक्छन्"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"अर्को"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"बुझेँ"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"कार्यालयको प्रोफाइल पज गरिएको छ"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"कामसम्बन्धी एपहरूले तपाईंलाई सूचना पठाउन, तपाईंको डिभाइसको ब्याट्री प्रयोग गर्न वा तपाईंको लोकेसन हेर्न सक्दैनन्"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"कामसम्बन्धी प्रोफाइल पज गरिएको छ। कामसम्बन्धी एपहरूले तपाईंलाई सूचना पठाउन, तपाईंको डिभाइसको ब्याट्री प्रयोग गर्न वा तपाईंको लोकेसन हेर्न सक्दैनन्"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"कामसम्बन्धी एपहरू अफ गरिएका छन्"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"तपाईंका कामसम्बन्धी एपहरूले तपाईंलाई सूचना पठाउन, तपाईंको डिभाइसको ब्याट्री प्रयोग गर्न वा तपाईंको लोकेसन हेर्न सक्दैनन्"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"कामसम्बन्धी एपहरू अफ गरिएका छन्। तपाईंका कामसम्बन्धी एपहरूले तपाईंलाई सूचना पठाउन, तपाईंको डिभाइसको ब्याट्री प्रयोग गर्न वा तपाईंको लोकेसन हेर्न सक्दैनन्"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"कामसम्बन्धी एपमा ब्याज अङ्कित हुन्छ र तपाईंका IT एड्मिन ती एप हेर्न सक्नुहुन्छ"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"बुझेँ"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"कामसम्बन्धी एपहरू अस्थायी रूपमा रोक्का गर्नुहोस्"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"अन गर्नुहोस्"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"कामसम्बन्धी एपहरू अफ गर्नुहोस्"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"कामसम्बन्धी एपहरू अन गर्नुहोस्"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"फिल्टर"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"कामसम्बन्धी एप र सूचनाहरू अस्थायी रूपमा रोक्का गर्नुहोस्"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"कार्य पूरा गर्न सकिएन: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 7573102e99..c9f204bc2b 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Gesprekken"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Nuttige informatie binnen handbereik"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Als je informatie wilt krijgen zonder apps te openen, kun je widgets toevoegen aan je startscherm"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Tik om de widgetinstellingen te wijzigen"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Widgetinstellingen wijzigen"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Apps zoeken"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Apps laden…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Er zijn geen apps gevonden die overeenkomen met \'<xliff:g id="QUERY">%1$s</xliff:g>\'"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Privé"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Werk"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Werkprofiel"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Persoonlijke gegevens zijn afgescheiden en verborgen voor werk-apps"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Werk-apps en -gegevens zijn zichtbaar voor je IT-beheerder"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Volgende"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Werkprofiel is onderbroken"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Werk-apps kunnen je geen meldingen sturen, je batterij niet gebruiken en geen toegang krijgen tot je locatie"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Werkprofiel is gepauzeerd. Werk-apps kunnen je geen meldingen sturen, je batterij niet gebruiken en geen toegang krijgen tot je locatie."</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Werk-apps staan uit"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Je werk-apps kunnen je geen meldingen sturen, je batterij niet gebruiken en geen toegang krijgen tot je locatie"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Werk-apps staan uit. Je werk-apps kunnen je geen meldingen sturen, je batterij niet gebruiken en geen toegang krijgen tot je locatie."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Werk-apps hebben badges en zijn zichtbaar voor je IT-beheerder"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Werk-apps pauzeren"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Aanzetten"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Werk-apps uitzetten"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Werk-apps aanzetten"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filteren"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Werk-apps en -meldingen onderbreken"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Mislukt: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 5c1d498827..81b66c6ba1 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"ଉପଯୋଗୀ ସୂଚନା ଆପଣଙ୍କ ପାଖରେ ସହଜରେ ଉପଲବ୍ଧ"</string>
     <string name="widget_education_content" msgid="745542879510751525">"ଆପଗୁଡ଼ିକୁ ନଖୋଲି ସୂଚନା ପାଇବା ପାଇଁ, ଆପଣ ଆପଣଙ୍କ ମୂଳସ୍କ୍ରିନରେ ୱିଜେଟଗୁଡ଼ିକୁ ଯୋଗ କରିପାରିବେ"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"ୱିଜେଟ୍ ସେଟିଂସ୍ ପରିବର୍ତ୍ତନ କରିବାକୁ ଟାପ୍ କରନ୍ତୁ"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"ବୁଝିଗଲି"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"ୱିଜେଟ୍ ସେଟିଂସ୍ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ଆପ୍‌ ଖୋଜନ୍ତୁ"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ଆପ୍‌ ଲୋଡ୍‌ ହେଉଛି..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" ସହିତ ମେଳ ହେଉଥିବା କୌଣସି ଆପ୍‌ ମିଳିଲା ନାହିଁ"</string>
@@ -62,7 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"ବିଜ୍ଞପ୍ତି"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"ଏକ ସର୍ଟକଟକୁ ମୁଭ୍ କରିବା ପାଇଁ ସ୍ପର୍ଶ କରି ଧରି ରଖନ୍ତୁ।"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ଏକ ସର୍ଟକଟକୁ ମୁଭ୍ କରିବା ପାଇଁ ଦୁଇଥର-ଟାପ୍ କରି ଧରି ରଖନ୍ତୁ କିମ୍ବା କଷ୍ଟମ୍ କାର୍ଯ୍ୟଗୁଡ଼ିକୁ ବ୍ୟବହାର କରନ୍ତୁ।"</string>
-    <string name="out_of_space" msgid="4691004494942118364">"ହୋମ୍‌ ସ୍କ୍ରୀନ ପାଇଁ ଆଉ କୋଠରୀ ନାହିଁ"</string>
+    <string name="out_of_space" msgid="4691004494942118364">"ଏହି ମୂଳସ୍କ୍ରୀନରେ ଆଉ ଜାଗା ନାହିଁ"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ମନପସନ୍ଦ ଟ୍ରେରେ ଆଉ କୋଠରୀ ନାହିଁ"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ଆପ୍‌ ତାଲିକା"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"ବ୍ୟକ୍ତିଗତ ଆପ୍ ତାଲିକା"</string>
@@ -127,7 +129,7 @@
     <string name="action_add_to_workspace" msgid="8902165848117513641">"ହୋମ୍‌ ସ୍କ୍ରୀନରେ ଯୋଡ଼ନ୍ତୁ"</string>
     <string name="action_move_here" msgid="2170188780612570250">"ଆଇଟମ୍‌କୁ ଏଠାକୁ ଘୁଞ୍ଚାନ୍ତୁ"</string>
     <string name="item_added_to_workspace" msgid="4211073925752213539">"ହୋମ୍‌ ସ୍କ୍ରୀନରେ ଆଇଟମ୍‌ ଯୋଡ଼ାଗଲା"</string>
-    <string name="item_removed" msgid="851119963877842327">"ଆଇଟମ୍‌ ବାହାର କରାଗଲା"</string>
+    <string name="item_removed" msgid="851119963877842327">"ଆଇଟମକୁ କାଢ଼ି ଦିଆଯାଇଛି"</string>
     <string name="undo" msgid="4151576204245173321">"ପୂର୍ବବତ୍‍"</string>
     <string name="action_move" msgid="4339390619886385032">"ଆଇଟମ୍‌ ଘୁଞ୍ଚାନ୍ତୁ"</string>
     <string name="move_to_empty_cell" msgid="2833711483015685619">"ଧାଡ଼ି <xliff:g id="NUMBER_0">%1$s</xliff:g> ସ୍ତମ୍ଭ <xliff:g id="NUMBER_1">%2$s</xliff:g>କୁ ନିଅନ୍ତୁ"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ବ୍ୟକ୍ତିଗତ"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"ୱାର୍କ"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"ୱର୍କ ପ୍ରୋଫାଇଲ୍‌"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"ବ୍ୟକ୍ତିଗତ ଡାଟା କାର୍ଯ୍ୟସ୍ଥଳୀ ଆପଗୁଡ଼ିକ ଠାରୁ ପୃଥକ୍ ଓ ଲୁକ୍କାୟିତ ଅଟେ"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"କାର୍ଯ୍ୟସ୍ଥଳୀ ଆପଗୁଡ଼ିକ ଓ ଡାଟା ଆପଣଙ୍କ IT ଆଡମିନଙ୍କୁ ଦେଖାଯାଏ"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"ପରବର୍ତ୍ତୀ"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ବୁଝିଗଲି"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"ୱାର୍କ ପ୍ରୋଫାଇଲକୁ ବିରତ କରାଯାଇଛି"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"ୱାର୍କ ଆପଗୁଡ଼ିକ ଆପଣଙ୍କୁ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ପଠାଇପାରିବ ନାହିଁ, ଆପଣଙ୍କ ବ୍ୟାଟେରୀକୁ ବ୍ୟବହାର କରିପାରିବ ନାହିଁ କିମ୍ବା ଆପଣଙ୍କର ଲୋକେସନକୁ ଆକ୍ସେସ୍ କରିପାରିବ ନାହିଁ"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"ୱାର୍କ ପ୍ରୋଫାଇଲକୁ ବିରତ କରାଯାଇଛି। ୱାର୍କ ଆପଗୁଡ଼ିକ ଆପଣଙ୍କୁ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ପଠାଇପାରିବ ନାହିଁ, ଆପଣଙ୍କ ବ୍ୟାଟେରୀକୁ ବ୍ୟବହାର କରିପାରିବ ନାହିଁ କିମ୍ବା ଆପଣଙ୍କର ଲୋକେସନକୁ ଆକ୍ସେସ୍ କରିପାରିବ ନାହିଁ"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"ୱାର୍କ ଆପଗୁଡ଼ିକ ବନ୍ଦ ଅଛି"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"ଆପଣଙ୍କ ୱାର୍କ ଆପଗୁଡ଼ିକ ଆପଣଙ୍କୁ ବିଜ୍ଞପ୍ତି ପଠାଇପାରିବ ନାହିଁ, ଆପଣଙ୍କ ବ୍ୟାଟେରୀକୁ ବ୍ୟବହାର କରିପାରିବ ନାହିଁ କିମ୍ବା ଆପଣଙ୍କର ଲୋକେସନକୁ ଆକ୍ସେସ୍ କରିପାରିବ ନାହିଁ"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"ୱାର୍କ ଆପଗୁଡ଼ିକ ବନ୍ଦ ଅଛି। ଆପଣଙ୍କ ୱାର୍କ ଆପଗୁଡ଼ିକ ଆପଣଙ୍କୁ ବିଜ୍ଞପ୍ତି ପଠାଇପାରିବ ନାହିଁ, ଆପଣଙ୍କ ବ୍ୟାଟେରୀକୁ ବ୍ୟବହାର କରିପାରିବ ନାହିଁ କିମ୍ବା ଆପଣଙ୍କର ଲୋକେସନକୁ ଆକ୍ସେସ୍ କରିପାରିବ ନାହିଁ"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"ୱାର୍କ ଆପଗୁଡ଼ିକୁ ବ୍ୟାଜ୍ କରାଯାଇଛି ଏବଂ ଆପଣଙ୍କ IT ଆଡମିନଙ୍କୁ ଦେଖାଯାଉଛି"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"ବୁଝିଗଲି"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"ୱାର୍କ ଆପଗୁଡ଼ିକୁ ବିରତ କରନ୍ତୁ"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"ଚାଲୁ କରନ୍ତୁ"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"ୱାର୍କ ଆପଗୁଡ଼ିକୁ ବନ୍ଦ କରନ୍ତୁ"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"ୱାର୍କ ଆପଗୁଡ଼ିକୁ ଚାଲୁ କରନ୍ତୁ"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"ଫିଲ୍ଟର୍"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"କାର୍ଯ୍ୟସ୍ଥଳୀ ଆପ୍ ଏବଂ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ବିରତ କରନ୍ତୁ"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"ବିଫଳ ହୋଇଛି: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 64a180a651..993b16a11b 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -51,11 +51,12 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ਨਿੱਜੀ"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ਕਾਰਜ-ਸਥਾਨ"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"ਗੱਲਾਂਬਾਤਾਂ"</string>
-    <!-- no translation found for widget_education_header (4874760613775913787) -->
+    <string name="widget_education_header" msgid="4874760613775913787">"ਤੁਹਾਡੀਆਂ ਉਂਗਲਾਂ \'ਤੇ ਲਾਹੇਵੰਦ ਜਾਣਕਾਰੀ"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"ਐਪਾਂ ਨੂੰ ਖੋਲ੍ਹੇ ਬਿਨਾਂ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ, ਤੁਸੀਂ ਆਪਣੀ ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਵਿਜੇਟ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ"</string>
+    <!-- no translation found for reconfigurable_widget_education_tip (6336962690888067057) -->
     <skip />
-    <!-- no translation found for widget_education_content (745542879510751525) -->
-    <skip />
-    <!-- no translation found for widget_education_close_button (8676165703104836580) -->
+    <string name="widget_education_close_button" msgid="8676165703104836580">"ਸਮਝ ਲਿਆ"</string>
+    <!-- no translation found for widget_reconfigure_button_content_description (8811472721881205250) -->
     <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ਐਪਾਂ ਖੋਜੋ"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ਐਪਾਂ ਨੂੰ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."</string>
@@ -65,7 +66,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"ਸੂਚਨਾਵਾਂ"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"ਕਿਸੇ ਸ਼ਾਰਟਕੱਟ ਨੂੰ ਲਿਜਾਉਣ ਲਈ ਸਪੱਰਸ਼ ਕਰਕੇ ਦਬਾਈ ਰੱਖੋ।"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ਕਿਸੇ ਸ਼ਾਰਟਕੱਟ ਨੂੰ ਲਿਜਾਉਣ ਲਈ ਡਬਲ ਟੈਪ ਕਰਕੇ ਦਬਾਈ ਰੱਖੋ ਜਾਂ ਵਿਉਂਤੀਆਂ ਕਾਰਵਾਈਆਂ ਵਰਤੋ।"</string>
-    <string name="out_of_space" msgid="4691004494942118364">"ਇਸ ਹੋਮ ਸਕ੍ਰੀਨ ਲਈ ਹੋਰ ਖਾਲੀ ਸਥਾਨ ਨਹੀਂ ਹੈ।"</string>
+    <string name="out_of_space" msgid="4691004494942118364">"ਇਸ ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਹੋਰ ਖਾਲੀ ਥਾਂ ਨਹੀਂ ਹੈ।"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ਮਨਪਸੰਦ ਟ੍ਰੇ ਵਿੱਚ ਹੋਰ ਖਾਲੀ ਸਥਾਨ ਨਹੀਂ।"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ਐਪ ਸੂਚੀ"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"ਨਿੱਜੀ ਐਪਾਂ ਦੀ ਸੂਚੀ"</string>
@@ -155,20 +156,18 @@
     <string name="accessibility_close" msgid="2277148124685870734">"ਬੰਦ ਕਰੋ"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"ਸੂਚਨਾ ਖਾਰਜ ਕੀਤੀ ਗਈ"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ਨਿੱਜੀ"</string>
-    <string name="all_apps_work_tab" msgid="4884822796154055118">"ਕਾਰਜ-ਸਥਾਨ"</string>
+    <string name="all_apps_work_tab" msgid="4884822796154055118">"ਕੰਮ ਸੰਬੰਧੀ"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"ਨਿੱਜੀ ਡਾਟਾ ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਤੋਂ ਵੱਖ ਅਤੇ ਲੁਕਾਇਆ ਹੋਇਆ ਹੈ"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਅਤੇ ਡਾਟਾ ਤੁਹਾਡੇ ਆਈ.ਟੀ. ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਦਿਖਣਯੋਗ ਹੈ"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"ਅੱਗੇ"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ਸਮਝ ਲਿਆ"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਰੋਕਿਆ ਗਿਆ ਹੈ"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਤੁਹਾਨੂੰ ਸੂਚਨਾਵਾਂ ਨਹੀਂ ਭੇਜ ਸਕਦੀਆਂ, ਤੁਹਾਡੀ ਬੈਟਰੀ ਨਹੀਂ ਵਰਤ ਸਕਦੀਆਂ ਜਾਂ ਤੁਹਾਡੇ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਨਹੀਂ ਕਰ ਸਕਦੀਆਂ"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਰੋਕਿਆ ਗਿਆ ਹੈ। ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਤੁਹਾਨੂੰ ਸੂਚਨਾਵਾਂ ਨਹੀਂ ਭੇਜ ਸਕਦੀਆਂ, ਤੁਹਾਡੀ ਬੈਟਰੀ ਨਹੀਂ ਵਰਤ ਸਕਦੀਆਂ ਜਾਂ ਤੁਹਾਡੇ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਨਹੀਂ ਕਰ ਸਕਦੀਆਂ"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਬੰਦ ਹਨ"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"ਤੁਹਾਡੀਆਂ ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਤੁਹਾਨੂੰ ਸੂਚਨਾਵਾਂ ਨਹੀਂ ਭੇਜ ਸਕਦੀਆਂ, ਤੁਹਾਡੀ ਬੈਟਰੀ ਨਹੀਂ ਵਰਤ ਸਕਦੀਆਂ ਜਾਂ ਤੁਹਾਡੇ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਨਹੀਂ ਕਰ ਸਕਦੀਆਂ"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਬੰਦ ਹਨ। ਤੁਹਾਡੀਆਂ ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਤੁਹਾਨੂੰ ਸੂਚਨਾਵਾਂ ਨਹੀਂ ਭੇਜ ਸਕਦੀਆਂ, ਤੁਹਾਡੀ ਬੈਟਰੀ ਨਹੀਂ ਵਰਤ ਸਕਦੀਆਂ ਜਾਂ ਤੁਹਾਡੇ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਨਹੀਂ ਕਰ ਸਕਦੀਆਂ"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਨੂੰ ਬੈਜ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਅਤੇ ਇਹ ਤੁਹਾਡੇ ਆਈ.ਟੀ. ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਦਿਸਣਗੀਆਂ"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"ਸਮਝ ਲਿਆ"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"ਕੰਮ ਸੰਬੰਧੀ ਐਪ ਰੋਕੋ"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"ਚਾਲੂ ਕਰੋ"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਬੰਦ ਕਰੋ"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਚਾਲੂ ਕਰੋ"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"ਫਿਲਟਰ"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਅਤੇ ਸੂਚਨਾਵਾਂ ਨੂੰ ਰੋਕੋ"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"ਇਹ ਕਾਰਵਾਈ ਅਸਫਲ ਹੋਈ: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 770f3440a7..d55f6f5173 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -57,7 +57,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Rozmowy"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Użyteczne informacje w zasięgu ręki"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Aby uzyskać informacje bez otwierania aplikacji, możesz dodać widżety do ekranu głównego"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Kliknij, aby zmienić ustawienia widżetu"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Zmień ustawienia widżetu"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Wyszukaj aplikacje"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Ładuję aplikacje…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nie znaleziono aplikacji pasujących do zapytania „<xliff:g id="QUERY">%1$s</xliff:g>”"</string>
@@ -160,18 +162,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Osobiste"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Służbowe"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profil służbowy"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Dane osobiste znajdują się w innym miejscu i są niewidoczne dla aplikacji służbowych"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Dane i aplikacje z profilu służbowego są widoczne dla Twojego administratora IT"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Dalej"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Wstrzymano profil służbowy"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Aplikacje służbowe nie mogą wysyłać powiadomień, używać baterii ani uzyskiwać dostępu do Twojej lokalizacji"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Wstrzymano profil służbowy. Aplikacje służbowe nie mogą wysyłać powiadomień, używać baterii ani uzyskiwać dostępu do Twojej lokalizacji"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Aplikacje służbowe są wyłączone"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Aplikacje służbowe nie mogą wysyłać powiadomień, używać baterii ani uzyskiwać dostępu do Twojej lokalizacji"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Aplikacje służbowe są wyłączone i nie mogą wysyłać powiadomień, używać baterii ani uzyskiwać dostępu do Twojej lokalizacji"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Aplikacje służbowe mają plakietki i są widoczne dla administratora IT"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Wstrzymaj aplikacje służbowe"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Włącz"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Wyłącz aplikacje służbowe"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Włącz aplikacje służbowe"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtruj"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Wstrzymaj służbowe aplikacje i powiadomienia"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Niepowodzenie: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 84c472f642..d844da3c22 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversas"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Informações úteis à sua disposição"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Para obter informações sem abrir apps, pode adicionar widgets ao seu ecrã principal"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Toque para alterar as definições do widget"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Alterar definições do widget"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Pesquisar aplicações"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"A carregar aplicações…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nenhuma app correspondente a \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -100,7 +102,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Pasta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> itens"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Pasta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> ou mais itens"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Imagens de fundo"</string>
-    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Imagem de fundo e estilo"</string>
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Imagem fundo/estilo"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Definições de início"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Desativada pelo gestor"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Permitir rotação do ecrã principal"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Pessoal"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Trabalho"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de trabalho"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Os dados pessoais são separados e ocultos das apps de trabalho"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Os dados e apps de trabalho estão visíveis para o seu administrador de TI"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Seguinte"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Perfil de trabalho em pausa"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"As apps de trabalho não podem enviar-lhe notificações, utilizar a sua bateria ou aceder à sua localização"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"O perfil de trabalho está em pausa. As apps de trabalho não podem enviar-lhe notificações, utilizar a sua bateria ou aceder à sua localização"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"As apps de trabalho estão desativadas"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"As apps de trabalho não podem enviar-lhe notificações, utilizar a bateria ou aceder à sua localização"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"As apps de trabalho estão desativadas. As apps de trabalho não podem enviar-lhe notificações, utilizar a bateria ou aceder à sua localização"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"As apps de trabalho têm um emblema e estão visíveis para o seu administrador de TI"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Colocar apps de trabalho em pausa"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Ativar"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Desativar apps de trabalho"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Ativar apps de trabalho"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtrar"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Coloque as apps de trabalho e as notificações em pausa"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Falhou: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index c44ffc8294..a29cc4968f 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -48,12 +48,14 @@
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Limpar texto da caixa de pesquisa"</string>
     <string name="no_widgets_available" msgid="9140948620298620513">"Nenhum widget disponível"</string>
     <string name="no_search_results" msgid="6518732304311458580">"Nenhum resultado de pesquisa"</string>
-    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Pessoal"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Pessoais"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Trabalho"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversas"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Informações úteis ao seu alcance"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Para receber informações sem precisar abrir apps, adicione widgets à sua tela inicial"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Toque para mudar as configurações do widget"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Ok"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Mudar as configurações do widget"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Pesquisar apps"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Carregando apps…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nenhum app encontrado que corresponda a \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Pessoais"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Trabalho"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de trabalho"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Os dados pessoais ficam separados e ocultos dos apps de trabalho"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Os dados de apps de trabalho ficam visíveis para seu administrador de TI"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Próxima"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Ok"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"O perfil de trabalho está pausado"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Os apps de trabalho não podem enviar notificações, usar a bateria nem acessar o local"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"O perfil de trabalho está pausado. Os apps de trabalho não podem enviar notificações, usar a bateria nem acessar o local"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Os apps de trabalho estão desativados"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Os apps de trabalho não podem enviar notificações, usar a bateria nem acessar o local"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Os apps de trabalho estão desativados. Eles não podem enviar notificações, usar a bateria nem acessar o local"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Os apps de trabalho têm um ícone e ficam visíveis para o administrador de TI"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Ok"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pausar apps de trabalho"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Ativar"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Desativar apps de trabalho"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Ativar apps de trabalho"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtrar"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Pausar apps e notificações de trabalho"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Falha: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 16f0ade92f..6fb48aa000 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -55,7 +55,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversații"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Informații utile la îndemâna dvs."</string>
     <string name="widget_education_content" msgid="745542879510751525">"Pentru a primi informații fără să deschideți aplicațiile, puteți adăuga widgeturi pe ecranul de pornire"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Atingeți ca să schimbați setările pentru widgeturi"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Modificați setările pentru widgeturi"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Căutați aplicații"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Se încarcă aplicații…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nu s-a găsit nicio aplicație pentru „<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -157,18 +159,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personale"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Profesionale"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profil de serviciu"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Datele cu caracter personal sunt separate și ascunse de aplicațiile pentru lucru"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Aplicațiile și datele pentru lucru sunt vizibile pentru administratorul IT"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Înainte"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Profilul de serviciu este întrerupt"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Aplicațiile pentru lucru nu pot să vă trimită notificări, să folosească bateria sau să vă acceseze locația"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Profilul de serviciu este întrerupt. Aplicațiile pentru lucru nu pot să vă trimită notificări, să folosească bateria sau să vă acceseze locația"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Aplicațiile pentru lucru sunt dezactivate"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Aplicațiile pentru lucru nu pot să vă trimită notificări, să folosească bateria sau să vă acceseze locația"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Aplicațiile pentru lucru sunt dezactivate. Acestea nu pot să vă trimită notificări, să folosească bateria sau să vă acceseze locația."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Aplicațiile pentru lucru sunt marcate și vizibile pentru administratorul IT"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Întrerupeți aplicațiile pentru lucru"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Activați"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Dezactivați aplicațiile pentru lucru"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Activați aplicațiile pentru lucru"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtru"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Întrerupeți aplicațiile pentru lucru și notificările"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Eșuare: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 6d2f9e5d2e..5adf04b3b1 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -57,7 +57,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Разговоры"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Вся нужная информация перед глазами"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Чтобы не открывать приложения каждый раз, когда нужна информация, добавьте виджеты на главный экран."</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Нажмите, чтобы изменить настройки виджета"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"ОК"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Изменить настройки виджета"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Поиск приложений"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Загрузка приложений…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"По запросу \"<xliff:g id="QUERY">%1$s</xliff:g>\" ничего не найдено"</string>
@@ -66,7 +68,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Уведомления"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Нажмите и удерживайте для переноса ярлыка."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Чтобы использовать специальные действия или перенести ярлык, нажмите на него дважды и удерживайте."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"На этом экране все занято"</string>
+    <string name="out_of_space" msgid="4691004494942118364">"На этом экране нет свободного места."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"В разделе \"Избранное\" больше нет места"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Список приложений"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Открыть список личных приложений"</string>
@@ -133,7 +135,7 @@
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Добавить на главный экран"</string>
     <string name="action_move_here" msgid="2170188780612570250">"Переместить элемент сюда"</string>
     <string name="item_added_to_workspace" msgid="4211073925752213539">"Элемент добавлен на главный экран"</string>
-    <string name="item_removed" msgid="851119963877842327">"Элемент удален."</string>
+    <string name="item_removed" msgid="851119963877842327">"Объект удален."</string>
     <string name="undo" msgid="4151576204245173321">"Отменить"</string>
     <string name="action_move" msgid="4339390619886385032">"Переместить элемент"</string>
     <string name="move_to_empty_cell" msgid="2833711483015685619">"Переместить в ячейку <xliff:g id="NUMBER_0">%1$s</xliff:g> <xliff:g id="NUMBER_1">%2$s</xliff:g>"</string>
@@ -160,18 +162,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Личные"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Рабочие"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Рабочий профиль"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Личные данные скрыты от рабочих приложений и недоступны им."</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Рабочие приложения и их данные видны системному администратору."</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Далее"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ОК"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Рабочий профиль приостановлен"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Рабочие приложения не могут отправлять уведомления, расходовать заряд батареи и получать доступ к данным о вашем местоположении."</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Рабочий профиль приостановлен. Рабочие приложения не могут отправлять уведомления, расходовать заряд батареи и получать доступ к данным о вашем местоположении."</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Рабочие приложения отключены"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Рабочие приложения не могут отправлять уведомления, расходовать заряд батареи и получать доступ к данным о вашем местоположении."</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Рабочие приложения отключены. Они не могут отправлять уведомления, расходовать заряд батареи и получать доступ к вашему местоположению."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"У рабочих приложений есть специальная пометка. Они видны системному администратору."</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"ОК"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Приостановить рабочие приложения"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Включить"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Отключить рабочие приложения"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Включить рабочие приложения"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Фильтр"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Приостановить рабочие приложения и уведомления от них"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Не удалось выполнить действие (<xliff:g id="WHAT">%1$s</xliff:g>)."</string>
 </resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 2ba06fabff..e9e1062b73 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"සංවාද"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"ප්‍රයෝජනවත් තොරතුරු ඔබගේ ඇඟිලි තුඩු අග"</string>
     <string name="widget_education_content" msgid="745542879510751525">"යෙදුම් විවෘත නොකර තොරතුරු ලබා ගැනීම සඳහා, ඔබට ඔබගේ මුල් තිරයට විජට් එක් කළ හැකිය"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"විජට් සැකසීම් වෙනස් කිරීමට තට්ටු කරන්න"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"තේරුණා"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"විජට් සැකසීම් වෙනස් කරන්න"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"යෙදුම් සොයන්න"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"යෙදුම් පූරණය වෙමින්…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" සමග ගැළපෙන යෙදුම් හමු නොවිණි"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"පුද්ගලික"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"කාර්යාලය"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"කාර්යාල පැතිකඩ"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"පෞද්ගලික දත්ත කාර්යාල යෙදුම්වලින් වෙන් කර සඟවා ඇත"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"කාර්යාල යෙදුම් &amp; දත්ත ඔබගේ IT පරිපාලකට දෘශ්‍යමාන වේ"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"ඊළඟ"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"තේරුණා"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"කාර්යාල පැතිකඩ විරාම කර ඇත"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"කාර්යාල යෙදුම්වලට ඔබට දැනුම්දීම් එවීමට, ඔබගේ බැටරිය භාවිත කිරීමට හෝ ඔබගේ ස්ථානයට ප්‍රවේශ වීමට නොහැකිය"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"කාර්යාල පැතිකඩ විරාම කර ඇත. කාර්යාල යෙදුම්වලට ඔබට දැනුම්දීම් එවීමට, ඔබගේ බැටරිය භාවිත කිරීමට හෝ ඔබගේ ස්ථානයට ප්‍රවේශ වීමට නොහැකිය"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"කාර්යාල යෙදුම් ක්‍රියාවිරහිතයි"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"ඔබගේ කාර්යාල යෙදුම්වලට ඔබට දැනුම්දීම් එවීමට, ඔබගේ බැටරිය භාවිත කිරීමට හෝ ඔබගේ ස්ථානයට ප්‍රවේශ වීමට නොහැකිය"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"කාර්යාල යෙදුම් ක්‍රියාවිරහිතයි. ඔබගේ කාර්යාල යෙදුම්වලට ඔබට දැනුම්දීම් එවීමට, ඔබගේ බැටරිය භාවිත කිරීමට හෝ ඔබගේ ස්ථානයට ප්‍රවේශ වීමට නොහැකිය"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"කාර්යාල යෙදුම්වලට ලාංඡන යොදා ඇති අතර ඔබගේ IT පරිපාලකට දෘශ්‍යමාන වේ"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"තේරුණා"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"කාර්යාල යෙදුම් විරාම කරන්න"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"ක්‍රියාත්මක කරන්න"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"කාර්යාල යෙදුම් ක්‍රියාවිරහිත කරන්න"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"කාර්යාල යෙදුම් ක්‍රියාත්මක කරන්න"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"පෙරහන"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"කාර්යාල යෙදුම් සහ දැනුම් දීම් විරාම කරන්න"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"අසාර්ථකයි: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index cbb082aed1..56637aed78 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -57,7 +57,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Konverzácie"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Užitočné informácie poruke"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Ak chcete získavať informácie bez otvárania aplikácií, môžete si pridať miniaplikácie na plochu"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Klepnutím zmeňte nastavenia miniaplikácie"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Dobre"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Zmena nastavení miniaplikácie"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Hľadať aplikácie"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Načítavajú sa aplikácie…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nenašli sa žiadne aplikácie zodpovedajúce dopytu <xliff:g id="QUERY">%1$s</xliff:g>"</string>
@@ -160,18 +162,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Osobné"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Pracovné"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Pracovný profil"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Osobné údaje sú oddelené a sú pred pracovnými aplikáciami skryté"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Pracovné aplikácie a údaje môže vidieť váš správca IT"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Ďalej"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Dobre"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Pracovný profil je pozastavený"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Pracovné aplikácie vám nemôžu posielať upozornenia, používať vašu batériu ani vašu polohu"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Pracovný profil je pozastavený. Pracovné aplikácie nemôžu posielať upozornenia, používať batériu ani polohu."</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Pracovné aplikácie sú vypnuté"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Pracovné aplikácie nemôžu posielať upozornenia ani používať batériu či polohu."</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Pracovné aplikácie sú vypnuté. Nemôžu posielať upozornenia ani používať batériu či polohu."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Pracovné aplikácie majú odznak a zobrazujú sa správcovi IT"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Dobre"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pozastaviť pracovné aplikácie"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Zapnúť"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Vypnúť pracovné aplikácie"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Zapnúť pracovné aplikácie"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtrujte"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Pozastavte pracovné aplikácie a upozornenia"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Zlyhalo: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 57461a1e89..3cf34d4a7a 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -52,12 +52,14 @@
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Brisanje besedila v iskalnem polju"</string>
     <string name="no_widgets_available" msgid="9140948620298620513">"Ni pripomočkov"</string>
     <string name="no_search_results" msgid="6518732304311458580">"Ni rezultatov iskanja"</string>
-    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Osebno"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Osebni"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Služba"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Pogovori"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Koristne informacije na dosegu prstov"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Če si želite podatke ogledati brez odpiranja aplikacij, lahko na začetni zaslon dodate pripomočke."</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Dotaknite se, če želite spremeniti nastavitve pripomočka."</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"V redu"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Spreminjanje nastavitev pripomočka"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Iskanje programov"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Nalaganje aplikacij …"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Ni aplikacij, ki bi ustrezale poizvedbi »<xliff:g id="QUERY">%1$s</xliff:g>«"</string>
@@ -160,18 +162,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Osebno"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Delo"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Delovni profil"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Osebni podatki so ločeni in skriti pred delovnimi aplikacijami"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Delovne aplikacije in službeni podatki so vidni skrbniku za IT"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Naprej"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Razumem"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Delovni profil je začasno zaustavljen"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Delovne aplikacije ne smejo pošiljati obvestil, porabljati energije baterije ali dostopati do lokacije."</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Delovni profil je začasno zaustavljen. Delovne aplikacije ne smejo pošiljati obvestil, porabljati energije baterije ali dostopati do lokacije."</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Delovne aplikacije so izklopljene."</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Delovne aplikacije ne smejo pošiljati obvestil, porabljati energije baterije ali dostopati do lokacije."</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Delovne aplikacije so izklopljene in ne smejo pošiljati obvestil, porabljati energije baterije ali dostopati do lokacije."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Delovne aplikacije so označene z značko in vidne skrbniku za IT."</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"V redu"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Začasno zaustavi delovne aplikacije"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Vklopi"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Izklopi delovne aplikacije"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Vklopi delovne aplikacije"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtriranje"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Začasna zaustavitev delovnih aplikacij in obvestil"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Ni uspelo: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 1054092634..62537f2312 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Bisedat"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Informacione të dobishme në majë të gishtave të tu"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Për të marrë informacione pa i hapur aplikacionet, mund të shtosh miniaplikacione në ekranin bazë"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Trokit për të ndryshuar cilësimet e miniaplikacionit"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"E kuptova"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Ndrysho cilësimet e miniaplikacionit"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Kërko për aplikacione"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Po ngarkon aplikacionet..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Nuk u gjet asnjë aplikacion që përputhet me \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personale"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Punë"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profili i punës"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Të dhënat personale janë të veçuara dhe të fshehura nga aplikacionet e punës"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Aplikacionet e punës dhe të dhënat janë të dukshme për administratorin e teknologjisë së informacionit"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Para"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"E kuptova"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Profili i punës është në pauzë"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Aplikacionet e punës nuk mund të të dërgojnë njoftime, të përdorin baterinë tënde apo të kenë qasje në vendndodhjen tënde"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Profili i punës është në pauzë. Aplikacionet e punës nuk mund të të dërgojnë njoftime, të përdorin baterinë tënde apo të kenë qasje në vendndodhjen tënde"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Aplikacionet e punës janë joaktive"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Aplikacionet e tua të punës nuk mund të të dërgojnë njoftime, të përdorin baterinë tënde apo të kenë qasje në vendndodhjen tënde"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Aplikacionet e punës janë joaktive. Aplikacionet e tua të punës nuk mund të të dërgojnë njoftime, të përdorin baterinë tënde apo të kenë qasje në vendndodhjen tënde"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Aplikacionet e punës janë të shënuara dhe të dukshme për administratorin e teknologjisë së informacionit"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"E kuptova"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Vendos në pauzë aplikacionet e punës"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Aktivizo"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Çaktivizo aplikacionet e punës"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Aktivizo aplikacionet e punës"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtro"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Vendos në pauzë aplikacionet e punës dhe njoftimet"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Dështoi: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 2e87b439bf..d5f8598b1a 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -46,7 +46,7 @@
     </plurals>
     <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"Виџети"</string>
-    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Претрага"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Претражите"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Обришите текст из оквира за претрагу"</string>
     <string name="no_widgets_available" msgid="9140948620298620513">"Није доступан ниједан виџет"</string>
     <string name="no_search_results" msgid="6518732304311458580">"Нема резултата претраге"</string>
@@ -55,7 +55,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Конверзације"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Корисне информације надохват руке"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Да бисте пронашли информације без отварања апликација, можете да додате виџете на почетни екран"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Додирните да бисте променили подешавања виџета"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Важи"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Промените подешавања виџета"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Претражите апликације"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Апликације се учитавају…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Није пронађена ниједна апликација за „<xliff:g id="QUERY">%1$s</xliff:g>“"</string>
@@ -157,18 +159,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Личне"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Пословне"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Пословни профил"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Лични подаци су одвојени и сакривени од апликација за посао"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"ИТ администратор види пословне апликације и податке"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Даље"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Важи"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Пословни профил је паузиран"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Пословне апликације не могу да вам шаљу обавештења, користе батерију нити приступају локацији"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Пословни профил је паузиран. Пословне апликације не могу да вам шаљу обавештења, користе батерију нити приступају локацији"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Пословне апликације су искључене"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Пословне апликације не могу да вам шаљу обавештења, користе батерију нити приступају локацији"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Пословне апликације су искључене. Пословне апликације не могу да вам шаљу обавештења, користе батерију нити приступају локацији"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Пословне апликације су означене значком и ИТ администратор може да их види"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Важи"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Паузирај пословне апликације"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Укључи"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Искључи пословне апликације"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Укључи пословне апликације"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Филтер"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Паузирајте пословне апликације и обавештења"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Није успело: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 29ef67d3e2..03872280ba 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -48,12 +48,14 @@
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Rensa texten från sökrutan"</string>
     <string name="no_widgets_available" msgid="9140948620298620513">"Det finns inga tillgängliga widgetar"</string>
     <string name="no_search_results" msgid="6518732304311458580">"Inga sökresultat"</string>
-    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Privata widgetar"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Privata"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Arbete"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Konversationer"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Användbar information nära till hands"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Om du vill ha information utan att öppna appar kan du lägga till widgetar på startskärmen"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Tryck för att ändra inställningarna för widgeten"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Ändra inställningarna för widgeten"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Sök efter appar"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Läser in appar …"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Inga appar som matchar <xliff:g id="QUERY">%1$s</xliff:g> hittades"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Privat"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Arbete"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Jobbprofil"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Privat data lagras för sig och är inte synlig för jobbapparna"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Jobbappar och jobbdata är synliga för IT-administratören"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Nästa"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Jobbprofilen är pausad"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Jobbappar kan inte skicka aviseringar, använda batteriet eller komma åt din plats"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Jobbprofilen är pausad. Jobbappar kan inte skicka aviseringar, använda batteriet eller komma åt din plats"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Jobbappar är inaktiverade"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Dina jobbappar kan inte skicka aviseringar, använda batteriet eller komma åt din plats"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Jobbappar är inaktiverade. Dina jobbappar kan inte skicka aviseringar, använda batteriet eller komma åt din plats"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Jobbappar är märkta och synliga för IT-administratören"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pausa jobbappar"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Aktivera"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Inaktivera jobbappar"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Aktivera jobbappar"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filter"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Pausa jobbappar och jobbaviseringar"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Misslyckades: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 7829bebe16..c8463499db 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Mazungumzo"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Maelezo muhimu mahali popote ulipo"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Ili upate maelezo bila kufungua programu, unaweza kuweka wijeti kwenye Skrini yako ya kwanza"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Gusa ili ubadilishe mipangilio ya wijeti"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Nimeelewa"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Badilisha mipangilio ya wijeti"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Tafuta programu"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Inapakia programu..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Haikupata programu zozote zinazolingana na \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Binafsi"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Kazini"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Wasifu wa kazini"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Data binafsi iko kando na haionyeshwi kwenye programu za kazini"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Programu na data ya kazini huonekana kwa msimamizi wako wa TEHAMA"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Endelea"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Nimeelewa"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Wasifu wa kazini umesimamishwa"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Programu za kazini haziwezi kukutumia arifa, kutumia betri yako au kufikia maelezo ya mahali ulipo"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Wasifu wa kazini umesimamishwa. Programu za kazini haziwezi kukutumia arifa, kutumia betri yako au kufikia maelezo ya mahali ulipo"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Programu za kazini zimezimwa"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Programu zako za kazini haziwezi kukutumia arifa, kutumia betri yako au kufikia maelezo ya mahali ulipo"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Programu za kazini zimezimwa. Programu zako za kazini haziwezi kukutumia arifa, kutumia betri yako au kufikia maelezo ya mahali ulipo"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Programu za kazini zina beji na zinaonekana kwa msimamizi wako wa TEHAMA"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Nimeelewa"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Simamisha programu za kazini"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Washa"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Zima programu za kazini"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Washa programu za kazini"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Kichujio"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Simamisha arifa na programu za kazini"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Hitilafu: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 6fe5a388fa..cfd4b3660a 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"உரையாடல்கள்"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"விரல்நுனியில் பயனுள்ள தகவல்களைப் பெறுங்கள்"</string>
     <string name="widget_education_content" msgid="745542879510751525">"ஆப்ஸைத் திறக்காமல் தகவல்களைப் பெற, முகப்புத் திரையில் விட்ஜெட்டுகளைச் சேர்க்கலாம்"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"விட்ஜெட் அமைப்புகளை மாற்றத் தட்டவும்"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"சரி"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"விட்ஜெட் அமைப்புகளை மாற்றும்"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"பயன்பாடுகளில் தேடுக"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ஆப்ஸை ஏற்றுகிறது…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" உடன் பொருந்தும் ஆப்ஸ் இல்லை"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"தனிப்பட்டவை"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"பணி"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"பணிக் கணக்கு"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"தனிப்பட்ட தரவு பணி ஆப்ஸுடன் சேர்ந்ததல்ல என்பதோடு பணி ஆப்ஸில் இருந்து அவை மறைக்கப்பட்டிருக்கும்"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"பணி ஆப்ஸையும் தரவையும் உங்கள் IT நிர்வாகியால் பார்க்க முடியும்"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"அடுத்து"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"முடிந்தது"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"பணிக் கணக்கு இடைநிறுத்தப்பட்டது"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"பணி ஆப்ஸால் அறிவிப்புகளை அனுப்பவோ பேட்டரியைப் பயன்படுத்தவோ இருப்பிடத்தை அணுகவோ முடியாது"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"பணிக் கணக்கு இடைநிறுத்தப்பட்டது. பணி ஆப்ஸால் அறிவிப்புகளை அனுப்பவோ பேட்டரியைப் பயன்படுத்தவோ இருப்பிடத்தை அணுகவோ முடியாது"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"பணி ஆப்ஸ் முடக்கப்பட்டுள்ளன"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"பணி ஆப்ஸால் உங்களுக்கு அறிவிப்புகளை அனுப்பவோ பேட்டரியைப் பயன்படுத்தவோ உங்கள் இருப்பிடத்தை அணுகவோ முடியாது"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"பணி ஆப்ஸ் முடக்கப்பட்டுள்ளன. அவற்றால் உங்களுக்கு அறிவிப்புகளை அனுப்பவோ பேட்டரியைப் பயன்படுத்தவோ உங்கள் இருப்பிடத்தை அணுகவோ முடியாது"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"பணி ஆப்ஸ் பேட்ஜ் குறியிடப்பட்டுள்ளன. மேலும் உங்கள் IT நிர்வாகியால் அவற்றைப் பார்க்க முடியும்"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"சரி"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"பணி ஆப்ஸை இடைநிறுத்து"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"இயக்கு"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"பணி ஆப்ஸை முடக்கு"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"பணி ஆப்ஸை இயக்கு"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"வடிப்பான்"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"பணி தொடர்பான ஆப்ஸையும் அறிவிப்புகளையும் இடைநிறுத்தும்"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"தோல்வி: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 7a851791c6..b42b242169 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -48,12 +48,16 @@
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"సెర్చ్ బాక్స్ నుండి టెక్స్ట్‌ను క్లియర్ చేయి"</string>
     <string name="no_widgets_available" msgid="9140948620298620513">"విడ్జెట్‌లు అందుబాటులో లేవు"</string>
     <string name="no_search_results" msgid="6518732304311458580">"సెర్చ్ ఫలితాలు లేవు"</string>
-    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"వ్యక్తిగతం"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"వ్యక్తిగత గ్యాడ్జెట్స్"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ఆఫీస్"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"సంభాషణలు"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"మీ చేతివేళ్ల మీద ఉపయోగకరమైన సమాచారం"</string>
     <string name="widget_education_content" msgid="745542879510751525">"యాప్‌లను తెరవకుండా సమాచారం పొందడానికి, మీరు మీ మొదటి స్క్రీన్‌కు విడ్జెట్‌లను జోడించవచ్చు"</string>
+    <!-- no translation found for reconfigurable_widget_education_tip (6336962690888067057) -->
+    <skip />
     <string name="widget_education_close_button" msgid="8676165703104836580">"అర్థమైంది"</string>
+    <!-- no translation found for widget_reconfigure_button_content_description (8811472721881205250) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"అప్లికేషన్‌లను శోధించండి"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"అప్లికేషన్‌లను లోడ్ చేస్తోంది…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\"కి సరిపోలే అప్లికేషన్‌లేవీ కనుగొనబడలేదు"</string>
@@ -101,9 +105,9 @@
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"ఫోల్డర్: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> లేదా అంతకంటే ఎక్కువ ఐటెమ్‌లు"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"వాల్‌పేపర్‌లు"</string>
     <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"వాల్‌పేపర్ &amp; స్టయిల్"</string>
-    <string name="settings_button_text" msgid="8873672322605444408">"హోమ్ సెట్టింగ్‌లు"</string>
+    <string name="settings_button_text" msgid="8873672322605444408">"మొదటి స్క్రీన్ సెట్టింగ్‌లు"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"మీ నిర్వాహకులు నిలిపివేసారు"</string>
-    <string name="allow_rotation_title" msgid="7728578836261442095">"హోమ్ స్క్రీన్ రొటేషన్‌ను అనుమతించండి"</string>
+    <string name="allow_rotation_title" msgid="7728578836261442095">"మొదటి స్క్రీన్ రొటేషన్‌ను అనుమతించండి"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"ఫోన్‌‌ను తిప్పినప్పుడు"</string>
     <string name="notification_dots_title" msgid="9062440428204120317">"నోటిఫికేషన్ డాట్‌లు"</string>
     <string name="notification_dots_desc_on" msgid="1679848116452218908">"ఆన్"</string>
@@ -112,7 +116,7 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"నోటిఫికేషన్ డాట్‌లను చూపించడానికి <xliff:g id="NAME">%1$s</xliff:g>కు యాప్ నోటిఫికేషన్‌లను ఆన్ చేయండి"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"సెట్టింగ్‌లను మార్చు"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"నోటిఫికేషన్ డాట్‌లను చూపు"</string>
-    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"యాప్ చిహ్నాలను హోమ్ స్క్రీన్‌కు జోడించు"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"యాప్ చిహ్నాలను మొదటి స్క్రీన్‌కు జోడించు"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"కొత్త యాప్‌ల కోసం"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"తెలియదు"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"తీసివేయి"</string>
@@ -127,7 +131,7 @@
     <string name="action_add_to_workspace" msgid="8902165848117513641">"హోమ్ స్క్రీన్‌కు జోడించండి"</string>
     <string name="action_move_here" msgid="2170188780612570250">"అంశాన్ని ఇక్కడికి తరలించు"</string>
     <string name="item_added_to_workspace" msgid="4211073925752213539">"అంశం హోమ్‌స్క్రీన్‌కి జోడించబడింది"</string>
-    <string name="item_removed" msgid="851119963877842327">"అంశం తీసివేయబడింది"</string>
+    <string name="item_removed" msgid="851119963877842327">"ఐటెమ్ తీసివేయబడింది"</string>
     <string name="undo" msgid="4151576204245173321">"చర్య రద్దు"</string>
     <string name="action_move" msgid="4339390619886385032">"అంశాన్ని తరలించు"</string>
     <string name="move_to_empty_cell" msgid="2833711483015685619">"అడ్డు వరుస <xliff:g id="NUMBER_0">%1$s</xliff:g> నిలువు వరుస <xliff:g id="NUMBER_1">%2$s</xliff:g>కి తరలించు"</string>
@@ -154,18 +158,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"వ్యక్తిగతం"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"కార్యాలయం"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"కార్యాలయ ప్రొఫైల్"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"వ్యక్తిగత డేటా అనేది విడిగా &amp; ఆఫీస్ యాప్‌లకు యాక్సెస్ లేకుండా, దాచబడి ఉంటుంది"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"ఆఫీస్ యాప్‌లు &amp; డేటా మీ IT అడ్మిన్‌కు కనిపిస్తాయి"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"తర్వాత"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"అర్థమైంది"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"ఆఫీస్ ప్రొఫైల్ పాజ్ చేయబడింది"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"మీకు నోటిఫికేషన్‌లు పంపడం, మీ బ్యాటరీని ఉపయోగించడం, లేదా మీ లొకేషన్‌ను యాక్సెస్ చేయడం \'వర్క్ యాప్\'‌లకు సాధ్యపడదు"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"వర్క్ ప్రొఫైల్ పాజ్ చేయబడింది. మీకు నోటిఫికేషన్‌లు పంపడం, మీ బ్యాటరీని ఉపయోగించడం, లేదా మీ లొకేషన్‌ను యాక్సెస్ చేయడం \'వర్క్ యాప్\'‌లకు సాధ్యపడదు"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"వర్క్ యాప్‌లు ఆఫ్‌లో ఉన్నాయి"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"మీకు నోటిఫికేషన్‌లు పంపడం, మీ బ్యాటరీని ఉపయోగించడం, లేదా మీ లొకేషన్‌ను యాక్సెస్ చేయడం మీ వర్క్ యాప్‌లకు సాధ్యపడదు"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"వర్క్ యాప్‌లు ఆఫ్‌లో ఉన్నాయి. మీకు నోటిఫికేషన్‌లు పంపడం, మీ బ్యాటరీని ఉపయోగించడం, లేదా మీ లొకేషన్‌ను యాక్సెస్ చేయడం మీ వర్క్ యాప్‌లకు సాధ్యపడదు"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"వర్క్ యాప్‌లు బ్యాడ్జ్ చేయబడ్డాయి, మీ IT అడ్మిన్‌కి కనిపిస్తాయి"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"అర్థమైంది"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"వర్క్ యాప్‌లను పాజ్ చేయి"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"ఆన్ చేయి"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"వర్క్ యాప్‌లను ఆఫ్ చేయి"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"వర్క్ యాప్‌లను ఆన్ చేయి"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"ఫిల్టర్ చేయి"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"ఆఫీస్ యాప్‌లు, నోటిఫికేషన్‌లను పాజ్ చేయండి"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"విఫలమైంది: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 0011d70c01..cbb7d2a953 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"การสนทนา"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"เข้าถึงข้อมูลที่เป็นประโยชน์ได้ที่ปลายนิ้ว"</string>
     <string name="widget_education_content" msgid="745542879510751525">"หากต้องการรับข้อมูลโดยไม่เปิดแอป ให้เพิ่มวิดเจ็ตลงในหน้าจอหลัก"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"แตะเพื่อเปลี่ยนการตั้งค่าวิดเจ็ต"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"รับทราบ"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"เปลี่ยนการตั้งค่าวิดเจ็ต"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ค้นหาแอป"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"กำลังโหลดแอป…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"ไม่พบแอปที่ตรงกับ \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -109,7 +111,7 @@
     <string name="notification_dots_desc_on" msgid="1679848116452218908">"เปิด"</string>
     <string name="notification_dots_desc_off" msgid="1760796511504341095">"ปิด"</string>
     <string name="title_missing_notification_access" msgid="7503287056163941064">"ต้องได้รับสิทธิ์เข้าถึงการแจ้งเตือน"</string>
-    <string name="msg_missing_notification_access" msgid="281113995110910548">"เปิดการแจ้งเตือนแอปของ <xliff:g id="NAME">%1$s</xliff:g> เพื่อแสดงจุดแจ้งเตือน"</string>
+    <string name="msg_missing_notification_access" msgid="281113995110910548">"เปิดการแจ้งเตือนแอปของ <xliff:g id="NAME">%1$s</xliff:g> เพื่อแสดงเครื่องหมายจุดแสดงการแจ้งเตือน"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"เปลี่ยนการตั้งค่า"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"แสดงเครื่องหมายจุดแสดงการแจ้งเตือน"</string>
     <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"เพิ่มไอคอนแอปในหน้าจอหลัก"</string>
@@ -127,7 +129,7 @@
     <string name="action_add_to_workspace" msgid="8902165848117513641">"เพิ่มลงในหน้าจอหลัก"</string>
     <string name="action_move_here" msgid="2170188780612570250">"ย้ายรายการมาที่นี่"</string>
     <string name="item_added_to_workspace" msgid="4211073925752213539">"เพิ่มรายการไปยังหน้าจอหลักแล้ว"</string>
-    <string name="item_removed" msgid="851119963877842327">"นำออกรายการออกแล้ว"</string>
+    <string name="item_removed" msgid="851119963877842327">"นำรายการออกแล้ว"</string>
     <string name="undo" msgid="4151576204245173321">"เลิกทำ"</string>
     <string name="action_move" msgid="4339390619886385032">"ย้ายรายการ"</string>
     <string name="move_to_empty_cell" msgid="2833711483015685619">"ย้ายไปที่แถว <xliff:g id="NUMBER_0">%1$s</xliff:g> คอลัมน์ <xliff:g id="NUMBER_1">%2$s</xliff:g>"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ส่วนตัว"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"งาน"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"โปรไฟล์งาน"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"ข้อมูลส่วนตัวจะอยู่แยกต่างหากและซ่อนจากแอปงาน"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"ผู้ดูแลระบบไอทีจะดูแอปและข้อมูลงานได้"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"ถัดไป"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"รับทราบ"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"โปรไฟล์งานหยุดชั่วคราว"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"แอปงานจะส่งการแจ้งเตือน ใช้แบตเตอรี่ หรือเข้าถึงตำแหน่งของคุณไม่ได้"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"โปรไฟล์งานหยุดชั่วคราว แอปงานจะส่งการแจ้งเตือน ใช้แบตเตอรี่ หรือเข้าถึงตำแหน่งของคุณไม่ได้"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"แอปงานปิดอยู่"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"แอปงานจะส่งการแจ้งเตือน ใช้แบตเตอรี่ หรือเข้าถึงตำแหน่งของคุณไม่ได้"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"แอปงานปิดอยู่ แอปงานจะส่งการแจ้งเตือน ใช้แบตเตอรี่ หรือเข้าถึงตำแหน่งของคุณไม่ได้"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"แอปงานจะติดป้ายไว้และผู้ดูแลระบบไอทีจะมองเห็น"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"รับทราบ"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"หยุดแอปงานชั่วคราว"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"เปิด"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"ปิดแอปงาน"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"เปิดแอปงาน"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"ตัวกรอง"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"หยุดแอปงานและการแจ้งเตือนไว้ชั่วคราว"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"ไม่สำเร็จ: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index cd662e1eec..aefb1204ed 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Mga Pag-uusap"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Abot-kamay na mahalagang impormasyon"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Para makakuha ng impormasyon nang hindi nagbubukas ng mga app, puwede kang magdagdag ng mga widget sa iyong Home screen"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"I-tap para baguhin ang mga setting ng widget"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Baguhin ang mga setting ng widget"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Maghanap ng mga app"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Naglo-load ng mga app…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Walang nahanap na app na tumutugma sa \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personal"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Trabaho"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profile sa trabaho"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Hiwalay at nakatago ang personal na data sa mga app para sa trabaho"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Makikita ng iyong IT admin ang mga app at data para sa trabaho"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Susunod"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Naka-pause ang profile sa trabaho"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Ang mga app para sa trabaho ay hindi makakapagpadala sa iyo ng mga notification, makakagamit ng battery mo, o makaka-access ng iyong lokasyon"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Naka-pause ang profile sa trabaho. Ang mga app para sa trabaho ay hindi makakapagpadala sa iyo ng mga notification, makakagamit ng battery mo, o makaka-access ng iyong lokasyon"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Naka-off ang mga app para sa trabaho"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Ang mga app mo para sa trabaho ay hindi makakapagpadala sa iyo ng mga notification, makakagamit ng baterya mo, o makaka-access ng iyong lokasyon"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Naka-off ang mga app para sa trabaho. Ang mga app mo para sa trabaho ay hindi makakapagpadala sa iyo ng mga notification, makakagamit ng baterya mo, o makaka-access ng iyong lokasyon"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"May badge at nakikita ng iyong IT admin ang mga app para sa trabaho"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"I-pause ang mga app para sa trabaho"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"I-on"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"I-off ang mga app para sa trabaho"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"I-on ang mga app para sa trabaho"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filter"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"I-pause ang mga app at notification para sa trabaho"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Hindi nagawa: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 5691fc044d..6c4e541f68 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Görüşmeler"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Faydalı bilgiler parmaklarınızın ucunda"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Uygulamaları açmadan bilgi almak için Ana ekranınıza widget\'lar ekleyebilirsiniz"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Widget ayarlarını değiştirmek için dokunun"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Anladım"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Widget ayarlarını değiştir"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Uygulamalarda ara"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Uygulamalar yükleniyor…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" ile eşleşen uygulama bulunamadı"</string>
@@ -112,7 +114,7 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Bildirim Noktaları\'nı göstermek için <xliff:g id="NAME">%1$s</xliff:g> uygulamasının bildirimlerini açın"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Ayarları değiştir"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Bildirim noktalarını göster"</string>
-    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Uygulama simgelerini Ana ekrana ekleyin"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Uygulama simgelerini Ana ekrana ekle"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"Yeni uygulamalar için"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Bilinmiyor"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Kaldır"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Kişisel"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"İş"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"İş profili"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Kişisel veriler ayrı olup iş uygulamalarından gizlenir"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"BT yöneticiniz iş uygulamalarını ve verilerini görebilir"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"İleri"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Anladım"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"İş profili duraklatıldı"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"İş uygulamaları size bildirim gönderemez, pilinizi kullanamaz veya konum bilginize erişemez"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"İş profili duraklatıldı. İş uygulamaları size bildirim gönderemez, pilinizi kullanamaz veya konum bilginize erişemez"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"İş uygulamaları kapalı"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"İş uygulamaları size bildirim gönderemez, pilinizi kullanamaz veya konum bilginize erişemez"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"İş uygulamaları kapalı. İş uygulamalarınız size bildirim gönderemez, pilinizi kullanamaz veya konum bilginize erişemez"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"İş uygulamaları rozetle işaretlenmiş olup BT yöneticisi tarafından görülebilir"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Anladım"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"İş uygulamalarını duraklat"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Aç"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"İş uygulamalarını kapat"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"İş uygulamalarını aç"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtre"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"İş uygulamalarını ve bildirimlerini duraklatın"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Başarısız: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index f0d486d108..1677c9e67d 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -57,7 +57,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Розмови"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Корисна інформація завжди під рукою"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Щоб отримувати інформацію, не відкриваючи додатки, ви можете додати на головний екран віджети"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Натисніть, щоб змінити налаштування віджета"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Змінити налаштування віджета"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Пошук додатків"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Завантаження додатків…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Немає додатків для запиту \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -106,7 +108,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Папка \"<xliff:g id="NAME">%1$s</xliff:g>\", елементів: <xliff:g id="SIZE">%2$d</xliff:g>"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Папка \"<xliff:g id="NAME">%1$s</xliff:g>\", елементів: <xliff:g id="SIZE">%2$d</xliff:g> або більше"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Фонові малюнки"</string>
-    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Фоновий малюнок і стиль"</string>
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Оформлення та стиль"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Налаштування головного екрана"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Вимкнув адміністратор"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Дозволити обертання головного екрана"</string>
@@ -160,18 +162,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Особисті додатки"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Робочі додатки"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Робочий профіль"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Персональні дані зберігаються окремо, вони недоступні для робочих додатків"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"ІТ-адміністратор бачить ваші робочі додатки й дані"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Далі"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Робочий профіль призупинено"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Робочі додатки не можуть надсилати сповіщення, використовувати заряд акумулятора й отримувати доступ до геоданих"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Робочий профіль призупинено. Робочі додатки не можуть надсилати сповіщення, використовувати заряд акумулятора й отримувати доступ до геоданих"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Робочі додатки вимкнено"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Ваші робочі додатки не можуть надсилати сповіщення, використовувати заряд акумулятора й отримувати доступ до геоданих"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Робочі додатки вимкнено. Вони не можуть надсилати сповіщення, використовувати заряд акумулятора й отримувати доступ до геоданих."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Робочі додатки відповідно позначені й видимі системному адміністратору"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Зрозуміло"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Призупинити робочі додатки"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Увімкнути"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Вимкнути робочі додатки"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Увімкнути робочі додатки"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Фільтр"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Призупинити робочі додатки й сповіщення"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Не вдалося <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 1574c47e96..8545f8a9b1 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -53,7 +53,11 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"گفتگوئیں"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"مفید معلومات کو آسانی سے حاصل کریں"</string>
     <string name="widget_education_content" msgid="745542879510751525">"ایپس کو کھولے بغیر معلومات حاصل کرنے کے لیے آپ اپنی ہوم اسکرین پر ویجیٹس شامل کر سکتے ہیں"</string>
+    <!-- no translation found for reconfigurable_widget_education_tip (6336962690888067057) -->
+    <skip />
     <string name="widget_education_close_button" msgid="8676165703104836580">"سمجھ آ گئی"</string>
+    <!-- no translation found for widget_reconfigure_button_content_description (8811472721881205250) -->
+    <skip />
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ایپس تلاش کریں"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ایپس لوڈ کی جا رہی ہیں…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" سے مماثل کوئی ایپس نہیں ملیں"</string>
@@ -154,18 +158,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ذاتی"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"دفتری"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"دفتری پروفائل"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"ذاتی ڈیٹا ورک ایپس سے الگ اور پوشیدہ ہے"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"‏آپ کا IT منتظم ورک ایپس اور ڈیٹا کو دیکھ سکتا ہے"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"اگلا"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"سمجھ آ گئی"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"دفتری پروفائل روک دی گئی ہے"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"ورک ایپس آپ کو اطلاعات نہیں بھیج سکتیں، آپ کی بیٹری استعمال یا آپ کے مقام تک رسائی حاصل نہیں کر سکتی ہیں"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"دفتری پروفائل موقوف کر دی گئی ہے۔ ورک ایپس آپ کو اطلاعات نہیں بھیج سکتیں، آپ کی بیٹری استعمال یا آپ کے مقام تک رسائی حاصل نہیں کر سکتی ہیں"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"ورک ایپس آف ہیں"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"آپ کی ورک ایپس آپ کو اطلاعات نہیں بھیج سکتیں، آپ کی بیٹری کا استعمال یا آپ کے مقام تک رسائی حاصل نہیں کر سکتی ہیں"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"ورک ایپس آف ہیں۔ آپ کی ورک ایپس آپ کو اطلاعات نہیں بھیج سکتیں، آپ کی بیٹری استعمال یا آپ کے مقام تک رسائی حاصل نہیں کر سکتی ہیں"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"‏ورک ایپس پر بَیج لگایا ہے اور آپ کا IT منتظم انہیں دیکھ سکتا ہے"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"سمجھ آ گئی"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"ورک ایپس موقوف کریں"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"آن کریں"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"ورک ایپس آف کریں"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"ورک ایپس آن کریں"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"فلٹر"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"ورک ایپس اور اطلاعات کو روکیں"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"ناکام ہو گيا: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 99bdd4b27f..d9f492339a 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Suhbatlar"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Barcha foydali axborot koʻz oldingizda"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Ilovalarni ochmasdan axborot olish uchun vidjetlarni bosh ekranga qoʻshishingiz mumkin"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Vidjet sozlamalarini oʻzgartirish uchun bosing"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Vidjet sozlamalarini oʻzgartirish"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Ilovalarni qidirish"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Ilovalar yuklanmoqda…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"“<xliff:g id="QUERY">%1$s</xliff:g>” bilan mos hech qanday ilova topilmadi"</string>
@@ -62,7 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Bildirishnomalar"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Yorliqni bosib turgan holatda suring."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Ikki marta bosing va yorliqni bosib turgan holatda suring yoki maxsus amaldan foydalaning."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Uy ekranida bitta ham xona yo‘q."</string>
+    <string name="out_of_space" msgid="4691004494942118364">"Bosh ekranda joy qolmadi."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Ajratilganlarda birorta ham xona yo‘q"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Ilovalar ro‘yxati"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Shaxsiy ilovalar ro‘yxati"</string>
@@ -127,7 +129,7 @@
     <string name="action_add_to_workspace" msgid="8902165848117513641">"Bosh ekranga chiqarish"</string>
     <string name="action_move_here" msgid="2170188780612570250">"Obyektni bu yerga ko‘chirish"</string>
     <string name="item_added_to_workspace" msgid="4211073925752213539">"Obyekt bosh ekranga qo‘shildi"</string>
-    <string name="item_removed" msgid="851119963877842327">"Obyekt o‘chirib tashlandi"</string>
+    <string name="item_removed" msgid="851119963877842327">"Element olib tashlandi"</string>
     <string name="undo" msgid="4151576204245173321">"Qaytarish"</string>
     <string name="action_move" msgid="4339390619886385032">"Obyektni ko‘chirib o‘tkazish"</string>
     <string name="move_to_empty_cell" msgid="2833711483015685619">"<xliff:g id="NUMBER_0">%1$s</xliff:g> <xliff:g id="NUMBER_1">%2$s</xliff:g> katakka olish"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Shaxsiy"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Ish"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Ish profili"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Shaxsiy maʼlumotlar ishga oid ilovalardan alohida va berkitilgan"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Administratoringiz ishga oid ilovalar va maʼlumotlarni koʻra oladi"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Keyingisi"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Ish profili pauzada"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Ishga oid ilovalar batareya sarfi haqida bildirishnomalar yubora olmaydi va joylashuv axborotidan foydalana olmaydi"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Ish profili pauzada. Ishga oid ilovalar batareya sarfi haqida bildirishnomalar yubora olmaydi va joylashuv axborotidan foydalana olmaydi"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Ishga oid ilovalar faolsizlantirilgan"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Ishga oid ilovalar batareya sarfi haqida bildirishnomalar yubora olmaydi va joylashuv axborotidan foydalana olmaydi"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Ishga oid ilovalar faolsizlantirilgan. Ular batareya sarfi haqida bildirishnomalar yubora olmaydi va joylashuv axborotidan foydalana olmaydi"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Ishga oid ilovalar qadalgan va IT administratoringizga koʻrinadi"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Ishga oid ilovalarni pauza qilish"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Yoqish"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Ishga oid ilovalarni faolsizlantirish"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Ishga oid ilovalarni yoqish"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Saralash"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Ishga oid ilova va bildirishnomalarni pauza qilish"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Xato: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 9f7fea373f..e15b3235ff 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"Cuộc trò chuyện"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Thông tin hữu ích ngay trong tầm tay bạn"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Để nhận thông tin mà không cần mở các ứng dụng, bạn có thể thêm tiện ích vào Màn hình chính"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Nhấn để thay đổi chế độ cài đặt tiện ích"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Tôi hiểu"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Thay đổi chế độ cài đặt tiện ích"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Tìm kiếm ứng dụng"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Đang tải ứng dụng…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Không tìm thấy ứng dụng nào phù hợp với \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Cá nhân"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Công việc"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Hồ sơ công việc"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Dữ liệu cá nhân được lưu trữ riêng biệt và ẩn khỏi các ứng dụng công việc"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Quản trị viên CNTT của bạn có thể xem dữ liệu và các ứng dụng công việc"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Tiếp theo"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Hồ sơ công việc của bạn đã bị tạm dừng"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Các ứng dụng công việc không thể gửi thông báo cho bạn, sử dụng pin hoặc truy cập thông tin vị trí của bạn"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Hồ sơ công việc đã bị tạm dừng. Các ứng dụng công việc không thể gửi thông báo cho bạn, sử dụng pin hoặc truy cập thông tin vị trí của bạn"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Ứng dụng công việc đang tắt"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Các ứng dụng công việc không thể gửi thông báo cho bạn, sử dụng pin hoặc truy cập thông tin vị trí của bạn"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Ứng dụng công việc đang tắt. Các ứng dụng công việc không thể gửi thông báo cho bạn, sử dụng pin hoặc truy cập thông tin vị trí của bạn"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Các ứng dụng công việc được gắn huy hiệu và quản trị viên CNTT sẽ nhìn thấy các ứng dụng này"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Tôi hiểu"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Tạm dừng các ứng dụng công việc"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Bật"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Tắt ứng dụng công việc"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Bật ứng dụng công việc"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Bộ lọc"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Tạm dừng các ứng dụng và thông báo liên quan tới công việc"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Không thực hiện được thao tác: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b1fb1658da..2d8162a92f 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -51,12 +51,11 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"个人"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"工作"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"对话"</string>
-    <!-- no translation found for widget_education_header (4874760613775913787) -->
-    <skip />
-    <!-- no translation found for widget_education_content (745542879510751525) -->
-    <skip />
-    <!-- no translation found for widget_education_close_button (8676165703104836580) -->
-    <skip />
+    <string name="widget_education_header" msgid="4874760613775913787">"实用信息触手可及"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"要想不打开应用就能获取信息，您可以将相应微件添加到主屏幕"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"点按即可更改微件设置"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"知道了"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"更改微件设置"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"搜索应用"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"正在加载应用…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"未找到与“<xliff:g id="QUERY">%1$s</xliff:g>”相符的应用"</string>
@@ -157,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"个人"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"工作"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"工作资料"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"工作应用与个人数据相互独立，它们无法获取此类数据"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"您的 IT 管理员可以查看工作应用和工作数据"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"继续"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"知道了"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"工作资料已被暂停"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"现在，工作应用无法向您发送通知、不能耗用电池电量，也无法获取您的位置信息"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"工作资料已暂停使用。现在，工作应用无法向您发送通知、不能耗用电池电量，也无法获取您的位置信息"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"工作应用已关闭"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"工作应用无法向您发送通知、不能耗用电池电量，也无法获取您的位置信息"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"工作应用已关闭。工作应用无法向您发送通知、不能耗用电池电量，也无法获取您的位置信息"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"工作应用带有标志，您的 IT 管理员可以看到工作应用"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"知道了"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"暂停工作应用"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"开启"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"关闭工作应用"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"开启工作应用"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"过滤器"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"暂停工作应用及其通知"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"失败：<xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index c0bb552ddb..80f9ee9315 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"對話"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"實用資訊，唾手可得"</string>
     <string name="widget_education_content" msgid="745542879510751525">"只要將小工具新增到主畫面，就可以直接查看資訊，無需開啟應用程式"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"輕按即可變更小工具設定"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"知道了"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"變更小工具設定"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"搜尋應用程式"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"正在載入應用程式…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"找不到與「<xliff:g id="QUERY">%1$s</xliff:g>」相符的應用程式"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"個人"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"工作"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"工作設定檔"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"個人資料會獨立儲存，並在工作應用程式中隱藏。"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"IT 管理員能看到工作應用程式的資料"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"繼續"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"知道了"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"工作設定檔已暫停使用"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"工作應用程式無法向您傳送通知、使用電池或存取位置"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"工作設定檔已暫停。工作應用程式無法向您傳送通知、使用電池或存取位置"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"工作應用程式已關閉"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"工作應用程式無法向您傳送通知、使用電池或存取位置"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"工作應用程式已關閉。工作應用程式無法向您傳送通知、使用電池或存取位置"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"IT 管理員可看到工作應用程式和相關標誌"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"知道了"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"暫停工作應用程式"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"開啟"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"關閉工作應用程式"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"開啟工作應用程式"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"篩選器"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"暫停工作應用程式和通知"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"操作失敗：<xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 9685d89c1d..c868137354 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -53,7 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"對話"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"實用資訊隨手可得"</string>
     <string name="widget_education_content" msgid="745542879510751525">"只要將小工具新增到主畫面，就可以直接查看資訊，不必開啟應用程式"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"輕觸即可變更小工具設定"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"我知道了"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"變更小工具設定"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"搜尋應用程式"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"正在載入應用程式…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"找不到與「<xliff:g id="QUERY">%1$s</xliff:g>」相符的應用程式"</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"個人"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"工作"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"工作資料夾"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"系統會區隔個人資料與工作資料，因此兩者不會同時顯示"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"你的 IT 管理員可以查看工作應用程式和工作資料"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"繼續"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"我知道了"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"工作資料夾已暫停"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"工作應用程式不會消耗電量、無法傳送通知，也無法存取你的位置資訊。"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"系統已暫停使用工作資料夾。在這種情況下，工作應用程式不會消耗電量、無法傳送通知，也無法存取你的位置資訊。"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"工作應用程式已關閉"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"工作應用程式不會消耗電量、無法傳送通知，也無法存取你的位置資訊"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"工作應用程式已關閉。工作應用程式不會消耗電量、無法傳送通知，也無法存取你的位置資訊"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"你的 IT 管理員可以看見工作應用程式和相關標記"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"我知道了"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"暫停工作應用程式"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"開啟"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"關閉工作應用程式"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"開啟工作應用程式"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"篩選器"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"暫停工作應用程式和通知"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"失敗：<xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 1b645b2502..03a451c5c8 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -48,12 +48,14 @@
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Sula umbhalo ovela ebhokisini lokusesha"</string>
     <string name="no_widgets_available" msgid="9140948620298620513">"Awekho amawijethi atholakalayo"</string>
     <string name="no_search_results" msgid="6518732304311458580">"Ayikho imiphumela yosesho"</string>
-    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Okomuntu siqu"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Okwabantu siqu"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Umsebenzi"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Izingxoxo"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Ulwazi oluwusizo phambi nje kwakho"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Ukuze utholeulwazi ngaphandle kokuvula ama-app, ungakwazi ukwengeza amawijethi kusikrini sakho sasekhaya"</string>
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Thepha ukuze ushintshe amasethingi ewijethi"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Ngiyezwa"</string>
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Shintsha amasethingi ewijethi"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Sesha izinhlelo zokusebenza"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Ilayisha izinhlelo zokusebenza..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"Azikho izinhlelo zokusebenza ezitholiwe ezifana ne-\"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>
@@ -154,18 +156,16 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Okomuntu siqu"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Umsebenzi"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Iphrofayela yomsebenzi"</string>
-    <string name="work_profile_edu_personal_apps" msgid="4155536355149317441">"Idatha yomuntu siqu yehlukile futhi ifihliwe kusuka kuzinhlelo zokusebenza zomsebenzi"</string>
-    <string name="work_profile_edu_work_apps" msgid="237051938268703058">"Izinhlelo zokusebenza zomsebenzi nedatha kuyobonakala kumphathi wakho we-IT"</string>
-    <string name="work_profile_edu_next" msgid="8783418929296503629">"Okulandelayo"</string>
+    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
+    <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Ngiyezwa"</string>
-    <string name="work_apps_paused_title" msgid="2389865654362803723">"Iphrofayela yomsebenzi iphunyuziwe"</string>
-    <string name="work_apps_paused_body" msgid="4209084728264328628">"Ama-app omsebenzi awakwazi ukukuthumela izaziso, ukusebenzisa ibhethri lakho, noma ukufinyelela indawo yakho"</string>
-    <string name="work_apps_paused_content_description" msgid="4473292417145736203">"Iphrofayela yomsebenzi iphunyuziwe. Ama-app omsebenzi awakwazi ukukuthumela izaziso, ukusebenzisa ibhethri lakho, noma ukufinyelela indawo yakho"</string>
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"Ama-app omsebenzi avaliwe"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Ama-app akho omsebenzi awakwazi ukukuthumela izaziso, ukusebenzisa ibhethri lakho, noma ukufinyelela indawo yakho"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Ama-app omsebenzi avaliwe. Ama-app akho omsebenzi awakwazi ukukuthumela izaziso, ukusebenzisa ibhethri lakho, noma ukufinyelela indawo yakho"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Ama-app omsebenzi anebheji futhi ayabonakala kumphathi wakho we-IT"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Ngiyezwa"</string>
-    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Misa ama-app omsebenzi"</string>
-    <string name="work_apps_enable_btn_text" msgid="82111102541971856">"Vula"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Vala ama-app omsebenzi"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Vula ama-app omsebenzi"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Hlunga"</string>
-    <string name="work_switch_tip" msgid="808075064383839144">"Phumuza izinhlelo zokusebenza zomsebenzi nezaziso"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Yehlulekile: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
-- 
GitLab


From 74a6d2ea55f65151716e0771ee68908f490d891b Mon Sep 17 00:00:00 2001
From: Thiru Ramasamy <thiruram@google.com>
Date: Tue, 15 Jun 2021 10:38:19 -0700
Subject: [PATCH 1407/1664] Enable logging for 'Themed icons' setting.

Eldar: http://eldar/510864786
Bug: 191161241
Test: local - http://gpaste/5934701681311744 & http://gpaste/6715297709948928
Change-Id: I18ad97f68b372997e222f06dabf8bbe83f15d92f
---
 .../quickstep/logging/SettingsChangeLogger.java       | 11 +++++++++++
 .../android/launcher3/logging/StatsLogManager.java    |  8 +++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java b/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java
index 4c10822fb8..7eca360224 100644
--- a/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java
+++ b/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java
@@ -27,8 +27,11 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_SCREEN_SUGGESTIONS_ENABLED;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_NOTIFICATION_DOT_DISABLED;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_NOTIFICATION_DOT_ENABLED;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_THEMED_ICON_DISABLED;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_THEMED_ICON_ENABLED;
 import static com.android.launcher3.model.QuickstepModelDelegate.LAST_PREDICTION_ENABLED_STATE;
 import static com.android.launcher3.util.SettingsCache.NOTIFICATION_BADGING_URI;
+import static com.android.launcher3.util.Themes.KEY_THEMED_ICONS;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -40,6 +43,7 @@ import android.util.Xml;
 
 import com.android.launcher3.AutoInstallsLayout;
 import com.android.launcher3.R;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.logging.InstanceIdSequence;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.logging.StatsLogManager.StatsLogger;
@@ -170,6 +174,13 @@ public class SettingsChangeLogger implements
         if (gridSizeChangedEvent != null) {
             logger.log(gridSizeChangedEvent);
         }
+
+        if (FeatureFlags.ENABLE_THEMED_ICONS.get()) {
+            logger.log(prefs.getBoolean(KEY_THEMED_ICONS, false)
+                    ? LAUNCHER_THEMED_ICON_ENABLED
+                    : LAUNCHER_THEMED_ICON_DISABLED);
+        }
+
         mLoggablePrefs.forEach((key, lp) -> logger.log(() ->
                 prefs.getBoolean(key, lp.defaultValue) ? lp.eventIdOn : lp.eventIdOff));
     }
diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index 418e46de71..345a2ac594 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -473,7 +473,13 @@ public class StatsLogManager implements ResourceBasedOverride {
         LAUNCHER_WIDGET_RESIZE_COMPLETED(824),
 
         @UiEvent(doc = "User reconfigured a widget on their home screen.")
-        LAUNCHER_WIDGET_RECONFIGURED(821)
+        LAUNCHER_WIDGET_RECONFIGURED(821),
+
+        @UiEvent(doc = "User enabled themed icons option in wallpaper & style settings.")
+        LAUNCHER_THEMED_ICON_ENABLED(836),
+
+        @UiEvent(doc = "User disabled themed icons option in wallpaper & style settings.")
+        LAUNCHER_THEMED_ICON_DISABLED(837)
         ;
 
         // ADD MORE
-- 
GitLab


From 9d3e31e67c509a0c9d09228ba95fdb893cf61a5a Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Tue, 15 Jun 2021 12:04:17 -0700
Subject: [PATCH 1408/1664] Use RectFSpringAnim for auto-enter-pip

Make SwipePipToHomeAnimator a subclass of RectFSpringAnim and use the
bounds calculated from latter for auto-enter-pip transition.

Note that the landscape to portrait case may not fully comply to
RectFSpringAnim as we calculate the position separately in
SwipePipToHomeAnimator.

Video: http://recall/-/aaaaaabFQoRHlzixHdtY/CWBPU2A6vB8CeTFRanQLx
Bug: 184789411
Test: manual, see video
Change-Id: I67dae09e682b7d8f1a1f08995eb3bcf76bdf7417
---
 .../android/quickstep/AbsSwipeUpHandler.java  | 27 +++----
 .../util/SwipePipToHomeAnimator.java          | 79 +++++++++----------
 2 files changed, 48 insertions(+), 58 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 8f42993b62..57dcad65c6 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -45,8 +45,6 @@ import static com.android.quickstep.GestureState.STATE_END_TARGET_SET;
 import static com.android.quickstep.GestureState.STATE_RECENTS_SCROLLING_FINISHED;
 import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;
 import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
-import static com.android.quickstep.util.SwipePipToHomeAnimator.FRACTION_END;
-import static com.android.quickstep.util.SwipePipToHomeAnimator.FRACTION_START;
 import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME;
@@ -248,7 +246,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
 
     private final Runnable mOnDeferredActivityLaunch = this::onDeferredActivityLaunch;
 
-    private static final long SWIPE_PIP_TO_HOME_DURATION = 425;
     private SwipePipToHomeAnimator mSwipePipToHomeAnimator;
     protected boolean mIsSwipingPipToHome;
 
@@ -1127,17 +1124,14 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                     createHomeAnimationFactory(cookies, duration, isTranslucent, appCanEnterPip,
                             runningTaskTarget);
             mIsSwipingPipToHome = homeAnimFactory.supportSwipePipToHome() && appCanEnterPip;
+            final RectFSpringAnim windowAnim;
             if (mIsSwipingPipToHome) {
-                mSwipePipToHomeAnimator = getSwipePipToHomeAnimator(
+                mSwipePipToHomeAnimator = createWindowAnimationToPip(
                         homeAnimFactory, runningTaskTarget, start);
-                mSwipePipToHomeAnimator.setDuration(SWIPE_PIP_TO_HOME_DURATION);
-                mSwipePipToHomeAnimator.setInterpolator(interpolator);
-                mSwipePipToHomeAnimator.setFloatValues(FRACTION_START, FRACTION_END);
-                mSwipePipToHomeAnimator.start();
-                mRunningWindowAnim = RunningWindowAnim.wrap(mSwipePipToHomeAnimator);
+                windowAnim = mSwipePipToHomeAnimator;
             } else {
                 mSwipePipToHomeAnimator = null;
-                RectFSpringAnim windowAnim = createWindowAnimationToHome(start, homeAnimFactory);
+                windowAnim = createWindowAnimationToHome(start, homeAnimFactory);
                 windowAnim.addAnimatorListener(new AnimationSuccessListener() {
                     @Override
                     public void onAnimationSuccess(Animator animator) {
@@ -1151,9 +1145,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                         mGestureState.setState(STATE_END_TARGET_ANIMATION_FINISHED);
                     }
                 });
-                windowAnim.start(mContext, velocityPxPerMs);
-                mRunningWindowAnim = RunningWindowAnim.wrap(windowAnim);
             }
+            windowAnim.start(mContext, velocityPxPerMs);
+            mRunningWindowAnim = RunningWindowAnim.wrap(windowAnim);
             homeAnimFactory.setSwipeVelocity(velocityPxPerMs.y);
             homeAnimFactory.playAtomicAnimation(velocityPxPerMs.y);
             mLauncherTransitionController = null;
@@ -1209,7 +1203,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         }
     }
 
-    private SwipePipToHomeAnimator getSwipePipToHomeAnimator(HomeAnimationFactory homeAnimFactory,
+    private SwipePipToHomeAnimator createWindowAnimationToPip(HomeAnimationFactory homeAnimFactory,
             RemoteAnimationTargetCompat runningTaskTarget, float startProgress) {
         // Directly animate the app to PiP (picture-in-picture) mode
         final ActivityManager.RunningTaskInfo taskInfo = mGestureState.getRunningTask();
@@ -1222,16 +1216,15 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                         runningTaskTarget.taskInfo.pictureInPictureParams,
                         homeRotation,
                         mDp.hotseatBarSizePx);
-        final Rect startBounds = new Rect();
-        updateProgressForStartRect(new Matrix(), startProgress).round(startBounds);
         final SwipePipToHomeAnimator swipePipToHomeAnimator = new SwipePipToHomeAnimator(
+                mContext,
                 runningTaskTarget.taskId,
                 taskInfo.topActivity,
                 runningTaskTarget.leash.getSurfaceControl(),
                 TaskInfoCompat.getPipSourceRectHint(
                         runningTaskTarget.taskInfo.pictureInPictureParams),
                 TaskInfoCompat.getWindowConfigurationBounds(taskInfo),
-                startBounds,
+                updateProgressForStartRect(new Matrix(), startProgress),
                 destinationBounds,
                 mRecentsView.getPipCornerRadius(),
                 mRecentsView);
@@ -1243,7 +1236,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         }
         AnimatorPlaybackController activityAnimationToHome =
                 homeAnimFactory.createActivityAnimationToHome();
-        swipePipToHomeAnimator.addListener(new AnimatorListenerAdapter() {
+        swipePipToHomeAnimator.addAnimatorListener(new AnimatorListenerAdapter() {
             private boolean mHasAnimationEnded;
             @Override
             public void onAnimationStart(Animator animation) {
diff --git a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
index 61a2eafe6d..67a635b70b 100644
--- a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
+++ b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
@@ -20,8 +20,8 @@ import static com.android.systemui.shared.system.InteractionJankMonitorWrapper.C
 
 import android.animation.Animator;
 import android.animation.RectEvaluator;
-import android.animation.ValueAnimator;
 import android.content.ComponentName;
+import android.content.Context;
 import android.graphics.Color;
 import android.graphics.Matrix;
 import android.graphics.Rect;
@@ -44,30 +44,24 @@ import com.android.systemui.shared.pip.PipSurfaceTransactionHelper;
 import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
 
 /**
- * An {@link Animator} that animates an Activity to PiP (picture-in-picture) window when
- * swiping up (in gesture navigation mode). Note that this class is derived from
- * {@link com.android.wm.shell.pip.PipAnimationController.PipTransitionAnimator}.
- *
- * TODO: consider sharing this class including the animator and leash operations between
- * Launcher and SysUI. Also, there should be one source of truth for the corner radius of the
- * PiP window, which would ideally be on SysUI side as well.
+ * Subclass of {@link RectFSpringAnim} that animates an Activity to PiP (picture-in-picture) window
+ * when swiping up (in gesture navigation mode).
  */
-public class SwipePipToHomeAnimator extends ValueAnimator {
+public class SwipePipToHomeAnimator extends RectFSpringAnim {
     private static final String TAG = SwipePipToHomeAnimator.class.getSimpleName();
 
-    public static final float FRACTION_START = 0f;
-    public static final float FRACTION_END = 1f;
+    private static final float END_PROGRESS = 1.0f;
 
     private final int mTaskId;
     private final ComponentName mComponentName;
     private final SurfaceControl mLeash;
     private final Rect mAppBounds = new Rect();
     private final Rect mStartBounds = new Rect();
+    private final Rect mCurrentBounds = new Rect();
     private final Rect mDestinationBounds = new Rect();
     private final PipSurfaceTransactionHelper mSurfaceTransactionHelper;
 
-    /** for calculating the transform in {@link #onAnimationUpdate(ValueAnimator)} */
-    private final RectEvaluator mRectEvaluator = new RectEvaluator(new Rect());
+    /** for calculating transform in {@link #onAnimationUpdate(AppCloseConfig, RectF, float)} */
     private final RectEvaluator mInsetsEvaluator = new RectEvaluator(new Rect());
     private final Rect mSourceHintRectInsets;
     private final Rect mSourceInsets = new Rect();
@@ -90,6 +84,7 @@ public class SwipePipToHomeAnimator extends ValueAnimator {
     private SurfaceControl mContentOverlay;
 
     /**
+     * @param context {@link Context} provides Launcher resources
      * @param taskId Task id associated with this animator, see also {@link #getTaskId()}
      * @param componentName Component associated with this animator,
      *                      see also {@link #getComponentName()}
@@ -102,20 +97,22 @@ public class SwipePipToHomeAnimator extends ValueAnimator {
      * @param destinationBounds Bounds of the destination this animator ends to
      * @param cornerRadius Corner radius in pixel value for PiP window
      */
-    public SwipePipToHomeAnimator(int taskId,
+    public SwipePipToHomeAnimator(@NonNull Context context,
+            int taskId,
             @NonNull ComponentName componentName,
             @NonNull SurfaceControl leash,
             @Nullable Rect sourceRectHint,
             @NonNull Rect appBounds,
-            @NonNull Rect startBounds,
+            @NonNull RectF startBounds,
             @NonNull Rect destinationBounds,
             int cornerRadius,
             @NonNull View view) {
+        super(startBounds, new RectF(destinationBounds), context);
         mTaskId = taskId;
         mComponentName = componentName;
         mLeash = leash;
         mAppBounds.set(appBounds);
-        mStartBounds.set(startBounds);
+        startBounds.round(mStartBounds);
         mDestinationBounds.set(destinationBounds);
         mDestinationBoundsTransformed.set(mDestinationBounds);
         mDestinationBoundsAnimation.set(mDestinationBounds);
@@ -151,10 +148,10 @@ public class SwipePipToHomeAnimator extends ValueAnimator {
             t.reparent(mContentOverlay, mLeash);
             t.apply();
 
-            addUpdateListener(valueAnimator -> {
-                float alpha = valueAnimator.getAnimatedFraction() < 0.5f
+            addOnUpdateListener((values, currentRect, progress) -> {
+                float alpha = progress < 0.5f
                         ? 0
-                        : Utilities.mapToRange(valueAnimator.getAnimatedFraction(), 0.5f, 1f,
+                        : Utilities.mapToRange(Math.min(progress, 1f), 0.5f, 1f,
                                 0f, 1f, Interpolators.FAST_OUT_SLOW_IN);
                 t.setAlpha(mContentOverlay, alpha);
                 t.apply();
@@ -166,7 +163,7 @@ public class SwipePipToHomeAnimator extends ValueAnimator {
                     appBounds.bottom - sourceRectHint.bottom);
         }
 
-        addListener(new AnimationSuccessListener() {
+        addAnimatorListener(new AnimationSuccessListener() {
             @Override
             public void onAnimationStart(Animator animation) {
                 InteractionJankMonitorWrapper.begin(view, CUJ_APP_CLOSE_TO_PIP);
@@ -191,7 +188,7 @@ public class SwipePipToHomeAnimator extends ValueAnimator {
                 mHasAnimationEnded = true;
             }
         });
-        addUpdateListener(this::onAnimationUpdate);
+        addOnUpdateListener(this::onAnimationUpdate);
     }
 
     /** sets the from rotation if it's different from the target rotation. */
@@ -219,34 +216,34 @@ public class SwipePipToHomeAnimator extends ValueAnimator {
                 mAppBounds.top + mDestinationBounds.height());
     }
 
-    private void onAnimationUpdate(ValueAnimator animator) {
+    private void onAnimationUpdate(@Nullable AppCloseConfig values, RectF currentRect,
+            float progress) {
         if (mHasAnimationEnded) return;
         final SurfaceControl.Transaction tx =
                 PipSurfaceTransactionHelper.newSurfaceControlTransaction();
-        onAnimationUpdate(tx, animator.getAnimatedFraction());
+        onAnimationUpdate(tx, currentRect, progress);
         tx.apply();
     }
 
     private PictureInPictureSurfaceTransaction onAnimationUpdate(SurfaceControl.Transaction tx,
-            float fraction) {
-        final Rect bounds = mRectEvaluator.evaluate(fraction, mStartBounds,
-                mDestinationBoundsAnimation);
+            RectF currentRect, float progress) {
+        currentRect.round(mCurrentBounds);
         final PictureInPictureSurfaceTransaction op;
         if (mSourceHintRectInsets == null) {
             // no source rect hint been set, directly scale the window down
-            op = onAnimationScale(fraction, tx, bounds);
+            op = onAnimationScale(progress, tx, mCurrentBounds);
         } else {
             // scale and crop according to the source rect hint
-            op = onAnimationScaleAndCrop(fraction, tx, bounds);
+            op = onAnimationScaleAndCrop(progress, tx, mCurrentBounds);
         }
         return op;
     }
 
     /** scale the window directly with no source rect hint being set */
     private PictureInPictureSurfaceTransaction onAnimationScale(
-            float fraction, SurfaceControl.Transaction tx, Rect bounds) {
+            float progress, SurfaceControl.Transaction tx, Rect bounds) {
         if (mFromRotation == Surface.ROTATION_90 || mFromRotation == Surface.ROTATION_270) {
-            final RotatedPosition rotatedPosition = getRotatedPosition(fraction);
+            final RotatedPosition rotatedPosition = getRotatedPosition(progress);
             return mSurfaceTransactionHelper.scale(tx, mLeash, mAppBounds, bounds,
                     rotatedPosition.degree, rotatedPosition.positionX, rotatedPosition.positionY);
         } else {
@@ -256,12 +253,12 @@ public class SwipePipToHomeAnimator extends ValueAnimator {
 
     /** scale and crop the window with source rect hint */
     private PictureInPictureSurfaceTransaction onAnimationScaleAndCrop(
-            float fraction, SurfaceControl.Transaction tx,
+            float progress, SurfaceControl.Transaction tx,
             Rect bounds) {
-        final Rect insets = mInsetsEvaluator.evaluate(fraction, mSourceInsets,
+        final Rect insets = mInsetsEvaluator.evaluate(progress, mSourceInsets,
                 mSourceHintRectInsets);
         if (mFromRotation == Surface.ROTATION_90 || mFromRotation == Surface.ROTATION_270) {
-            final RotatedPosition rotatedPosition = getRotatedPosition(fraction);
+            final RotatedPosition rotatedPosition = getRotatedPosition(progress);
             return mSurfaceTransactionHelper.scaleAndRotate(tx, mLeash, mAppBounds, bounds, insets,
                     rotatedPosition.degree, rotatedPosition.positionX, rotatedPosition.positionY);
         } else {
@@ -291,22 +288,22 @@ public class SwipePipToHomeAnimator extends ValueAnimator {
         // get the final leash operations but do not apply to the leash.
         final SurfaceControl.Transaction tx =
                 PipSurfaceTransactionHelper.newSurfaceControlTransaction();
-        return onAnimationUpdate(tx, FRACTION_END);
+        return onAnimationUpdate(tx, new RectF(mDestinationBounds), END_PROGRESS);
     }
 
-    private RotatedPosition getRotatedPosition(float fraction) {
+    private RotatedPosition getRotatedPosition(float progress) {
         final float degree, positionX, positionY;
         if (mFromRotation == Surface.ROTATION_90) {
-            degree = -90 * fraction;
-            positionX = fraction * (mDestinationBoundsTransformed.left - mStartBounds.left)
+            degree = -90 * progress;
+            positionX = progress * (mDestinationBoundsTransformed.left - mStartBounds.left)
                     + mStartBounds.left;
-            positionY = fraction * (mDestinationBoundsTransformed.bottom - mStartBounds.top)
+            positionY = progress * (mDestinationBoundsTransformed.bottom - mStartBounds.top)
                     + mStartBounds.top;
         } else {
-            degree = 90 * fraction;
-            positionX = fraction * (mDestinationBoundsTransformed.right - mStartBounds.left)
+            degree = 90 * progress;
+            positionX = progress * (mDestinationBoundsTransformed.right - mStartBounds.left)
                     + mStartBounds.left;
-            positionY = fraction * (mDestinationBoundsTransformed.top - mStartBounds.top)
+            positionY = progress * (mDestinationBoundsTransformed.top - mStartBounds.top)
                     + mStartBounds.top;
         }
         return new RotatedPosition(degree, positionX, positionY);
-- 
GitLab


From 12e9345f4f38be1274283f768fe0422b90cf5801 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Tue, 1 Jun 2021 14:43:14 -0700
Subject: [PATCH 1409/1664] Skip item infos that fail session info
 verification.

trichromelibrary.canary is failing session info verification, but is still being added as blank icon on the workspace in some cases. Added logic to skip apps that fail this verification until the root cause can be found.

Bug: 168788486
Test: none

Change-Id: I8a7fe76f321de493b2c6c67ba6922eae23067ff3
---
 .../model/AddWorkspaceItemsTask.java          |  5 +--
 .../launcher3/pm/InstallSessionHelper.java    | 32 +++++++++++--------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/com/android/launcher3/model/AddWorkspaceItemsTask.java b/src/com/android/launcher3/model/AddWorkspaceItemsTask.java
index 3be2c3af40..365cab1a4e 100644
--- a/src/com/android/launcher3/model/AddWorkspaceItemsTask.java
+++ b/src/com/android/launcher3/model/AddWorkspaceItemsTask.java
@@ -130,8 +130,9 @@ public class AddWorkspaceItemsTask extends BaseModelUpdateTask {
                             packageName);
 
                     if (!packageInstaller.verifySessionInfo(sessionInfo)) {
-                        FileLog.d(LOG, "Item info failed session info verification: "
-                                + workspaceInfo);
+                        FileLog.d(LOG, "Item info failed session info verification. "
+                                + "Skipping : " + workspaceInfo);
+                        continue;
                     }
 
                     List<LauncherActivityInfo> activities = launcherApps
diff --git a/src/com/android/launcher3/pm/InstallSessionHelper.java b/src/com/android/launcher3/pm/InstallSessionHelper.java
index 52554900ea..2bd9ba0037 100644
--- a/src/com/android/launcher3/pm/InstallSessionHelper.java
+++ b/src/com/android/launcher3/pm/InstallSessionHelper.java
@@ -217,7 +217,8 @@ public class InstallSessionHelper {
     void tryQueuePromiseAppIcon(PackageInstaller.SessionInfo sessionInfo) {
         if (FeatureFlags.PROMISE_APPS_NEW_INSTALLS.get()
                 && SessionCommitReceiver.isEnabled(mAppContext)
-                && verifySessionInfo(sessionInfo)) {
+                && verifySessionInfo(sessionInfo)
+                && !promiseIconAddedForId(sessionInfo.getSessionId())) {
             FileLog.d(LOG, "Adding package name to install queue: "
                     + sessionInfo.getAppPackageName());
 
@@ -234,25 +235,28 @@ public class InstallSessionHelper {
                 && sessionInfo.getInstallReason() == PackageManager.INSTALL_REASON_USER
                 && sessionInfo.getAppIcon() != null
                 && !TextUtils.isEmpty(sessionInfo.getAppLabel())
-                && !promiseIconAddedForId(sessionInfo.getSessionId())
                 && !new PackageManagerHelper(mAppContext).isAppInstalled(
                         sessionInfo.getAppPackageName(), getUserHandle(sessionInfo));
 
         if (sessionInfo != null) {
             Bitmap appIcon = sessionInfo.getAppIcon();
 
-            FileLog.d(LOG, String.format(
-                    "Verifying session info. Valid: %b, Session verified: %b, Install reason valid:"
-                            + " %b, App icon: %s, App label: %s, Promise icon added: %b, "
-                            + "App installed: %b.",
-                    validSessionInfo,
-                    verify(sessionInfo) != null,
-                    sessionInfo.getInstallReason() == PackageManager.INSTALL_REASON_USER,
-                    appIcon == null ? "null" : IOUtils.toBase64String(appIcon),
-                    sessionInfo.getAppLabel(),
-                    promiseIconAddedForId(sessionInfo.getSessionId()),
-                    new PackageManagerHelper(mAppContext).isAppInstalled(
-                            sessionInfo.getAppPackageName(), getUserHandle(sessionInfo))));
+            if (Utilities.IS_DEBUG_DEVICE) {
+                FileLog.d(LOG, String.format(
+                        "Verifying session info. Valid: %b,"
+                                + " Session verified: %b,"
+                                + " Install reason valid: %b,"
+                                + " App icon: %s,"
+                                + " App label: %s,"
+                                + " App installed: %b.",
+                        validSessionInfo,
+                        verify(sessionInfo) != null,
+                        sessionInfo.getInstallReason() == PackageManager.INSTALL_REASON_USER,
+                        appIcon == null ? "null" : IOUtils.toBase64String(appIcon),
+                        sessionInfo.getAppLabel(),
+                        new PackageManagerHelper(mAppContext).isAppInstalled(
+                                sessionInfo.getAppPackageName(), getUserHandle(sessionInfo))));
+            }
         } else {
             FileLog.d(LOG, "Verifying session info failed: session info null.");
         }
-- 
GitLab


From dfc274364e6d89bfb6a1681e4b28c785ab7e9f87 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Mon, 14 Jun 2021 18:27:44 -0500
Subject: [PATCH 1410/1664] Add work toggle to work apps paused message

This also fixes scrolling issues in landscape

Bug: 186857875
Bug: 161929312
Bug: 189983516
Bug: 190567199
screenshot: https://screenshot.googleplex.com/BCjcyJFqJo6W4Tr
Test: local
Change-Id: I7bcf23cc4be2fca936eba41342731789eb8f3292
---
 res/layout/work_apps_edu.xml                  | 52 +++++++------
 res/layout/work_apps_paused.xml               | 20 +++--
 res/values/dimens.xml                         |  2 +-
 .../allapps/AllAppsContainerView.java         | 24 +-----
 .../allapps/AllAppsRecyclerView.java          | 10 +++
 .../launcher3/allapps/FloatingHeaderView.java | 14 ++++
 .../launcher3/allapps/WorkEduCard.java        | 17 ++++-
 .../launcher3/allapps/WorkModeSwitch.java     | 19 +++--
 .../launcher3/allapps/WorkPausedCard.java     | 75 +++++++++++++++++++
 9 files changed, 172 insertions(+), 61 deletions(-)
 create mode 100644 src/com/android/launcher3/allapps/WorkPausedCard.java

diff --git a/res/layout/work_apps_edu.xml b/res/layout/work_apps_edu.xml
index 2c58907e4b..ffbf962d35 100644
--- a/res/layout/work_apps_edu.xml
+++ b/res/layout/work_apps_edu.xml
@@ -16,30 +16,38 @@
 <com.android.launcher3.allapps.WorkEduCard xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="@dimen/work_edu_card_margin"
-    android:orientation="vertical"
-    android:background="@drawable/work_card"
     android:gravity="center">
 
-    <TextView
-        style="@style/PrimaryHeadline"
-        android:textColor="?android:attr/textColorPrimary"
-        android:id="@+id/work_apps_paused_title"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:text="@string/work_profile_edu_work_apps"
-        android:textAlignment="center"
-        android:textSize="20sp" />
+        android:orientation="vertical"
+        android:padding="@dimen/work_edu_card_margin"
+        android:background="@drawable/work_card"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center"
+        android:id="@+id/wrapper">
 
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/action_btn"
-        android:textColor="?attr/workProfileOverlayTextColor"
-        android:text="@string/work_profile_edu_accept"
-        android:textAlignment="center"
-        android:background="@drawable/work_card_btn"
-        android:textSize="14sp" />
+        <TextView
+            style="@style/PrimaryHeadline"
+            android:textColor="?android:attr/textColorPrimary"
+            android:id="@+id/work_apps_paused_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/work_profile_edu_work_apps"
+            android:textAlignment="center"
+            android:textSize="20sp" />
+
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/action_btn"
+            android:textColor="?attr/workProfileOverlayTextColor"
+            android:text="@string/work_profile_edu_accept"
+            android:textAlignment="center"
+            android:background="@drawable/work_card_btn"
+            android:textSize="14sp" />
+    </LinearLayout>
 </com.android.launcher3.allapps.WorkEduCard>
\ No newline at end of file
diff --git a/res/layout/work_apps_paused.xml b/res/layout/work_apps_paused.xml
index 7f1107f68d..14dcb8c360 100644
--- a/res/layout/work_apps_paused.xml
+++ b/res/layout/work_apps_paused.xml
@@ -12,11 +12,10 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher3.allapps.WorkPausedCard xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?attr/allAppsScrimColor"
-    android:padding="48dp"
+    android:layout_height="wrap_content"
+    android:padding="@dimen/work_edu_card_margin"
     android:orientation="vertical"
     android:gravity="center">
 
@@ -39,5 +38,16 @@
         android:textColor="?attr/workProfileOverlayTextColor"
         android:text="@string/work_apps_paused_body"
         android:textAlignment="center"
+        android:layout_marginBottom="8dp"
         android:textSize="16sp" />
-</LinearLayout>
\ No newline at end of file
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/enable_work_apps"
+        android:textColor="?attr/workProfileOverlayTextColor"
+        android:text="@string/work_apps_enable_btn_text"
+        android:textAlignment="center"
+        android:background="@drawable/work_card_btn"
+        android:textSize="14sp" />
+</com.android.launcher3.allapps.WorkPausedCard>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 430a1abb90..44c864b4a6 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -94,7 +94,7 @@
     <dimen name="all_apps_background_canvas_height">475dp</dimen>
     <dimen name="all_apps_header_pill_height">48dp</dimen>
     <dimen name="all_apps_header_pill_corner_radius">18dp</dimen>
-    <dimen name="all_apps_header_pills_width">320dp</dimen>
+    <dimen name="all_apps_header_pills_width">348dp</dimen>
     <dimen name="all_apps_header_tab_height">48dp</dimen>
     <dimen name="all_apps_tabs_indicator_height">2dp</dimen>
     <dimen name="all_apps_header_top_padding">36dp</dimen>
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index d749e02d73..7003df10c2 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -23,7 +23,6 @@ import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_QUIET_MODE_
 
 import android.animation.ValueAnimator;
 import android.content.Context;
-import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -494,15 +493,6 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         }
     }
 
-    @Override
-    protected void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        View overlay = mAH[AdapterHolder.WORK].getOverlayView();
-        int v = newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE ? GONE : VISIBLE;
-        overlay.findViewById(R.id.work_apps_paused_title).setVisibility(v);
-        overlay.findViewById(R.id.work_apps_paused_content).setVisibility(v);
-    }
-
     private void replaceRVContainer(boolean showTabs) {
         for (int i = 0; i < mAH.length; i++) {
             if (mAH[i].recyclerView != null) {
@@ -544,9 +534,6 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
                     && mAllAppsStore.hasModelFlag(
                     FLAG_HAS_SHORTCUT_PERMISSION | FLAG_QUIET_MODE_CHANGE_PERMISSION));
         }
-        if (mSearchUiManager != null && mSearchUiManager.getEditText() != null) {
-            mSearchUiManager.getEditText().hideKeyboard();
-        }
     }
 
     // Used by tests only
@@ -704,7 +691,9 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         mHeaderPaint.setColor(mHeaderColor);
         mHeaderPaint.setAlpha((int) (getAlpha() * Color.alpha(mHeaderColor)));
         if (mHeaderPaint.getColor() != mScrimColor && mHeaderPaint.getColor() != 0) {
-            canvas.drawRect(0, 0, getWidth(), mSearchContainer.getTop() + getTranslationY(),
+            int bottom = mUsingTabs && mHeader.mHeaderCollapsed ? mHeader.getVisibleBottomBound()
+                    : mSearchContainer.getBottom();
+            canvas.drawRect(0, 0, getWidth(), bottom + getTranslationY(),
                     mHeaderPaint);
         }
     }
@@ -781,13 +770,6 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
             mAH[AdapterHolder.MAIN].recyclerView.setVerticalFadingEdgeEnabled(!mUsingTabs
                     && verticalFadingEdge);
         }
-
-        private View getOverlayView() {
-            if (mOverlay == null) {
-                mOverlay = mLauncher.getLayoutInflater().inflate(R.layout.work_apps_paused, null);
-            }
-            return mOverlay;
-        }
     }
 
 
diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
index 5bbd02b5ed..4ad694b31b 100644
--- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
@@ -447,4 +447,14 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
     public boolean hasOverlappingRendering() {
         return false;
     }
+
+    /**
+     * Returns distance between left and right app icons
+     */
+    public int getTabWidth() {
+        DeviceProfile grid = BaseDraggingActivity.fromContext(getContext()).getDeviceProfile();
+        int totalWidth = (grid.availableWidthPx - getPaddingLeft() - getPaddingRight());
+        int iconPadding = totalWidth / grid.numShownAllAppsColumns - grid.allAppsIconSizePx;
+        return totalWidth - iconPadding;
+    }
 }
diff --git a/src/com/android/launcher3/allapps/FloatingHeaderView.java b/src/com/android/launcher3/allapps/FloatingHeaderView.java
index 450d2e27a0..f1381e97d6 100644
--- a/src/com/android/launcher3/allapps/FloatingHeaderView.java
+++ b/src/com/android/launcher3/allapps/FloatingHeaderView.java
@@ -72,8 +72,13 @@ public class FloatingHeaderView extends LinearLayout implements
                     }
 
                     int current = -mCurrentRV.getCurrentScrollY();
+                    boolean headerCollapsed = mHeaderCollapsed;
                     moved(current);
                     applyVerticalMove();
+                    if (headerCollapsed != mHeaderCollapsed) {
+                        AllAppsContainerView parent = (AllAppsContainerView) getParent();
+                        parent.invalidateHeader();
+                    }
                 }
             };
 
@@ -219,6 +224,8 @@ public class FloatingHeaderView extends LinearLayout implements
 
         mTabsHidden = tabsHidden;
         mTabLayout.setVisibility(tabsHidden ? View.GONE : View.VISIBLE);
+        mTabLayout.getLayoutParams().width =
+                mAH[AllAppsContainerView.AdapterHolder.MAIN].recyclerView.getTabWidth();
         mMainRV = setupRV(mMainRV, mAH[AllAppsContainerView.AdapterHolder.MAIN].recyclerView);
         mWorkRV = setupRV(mWorkRV, mAH[AllAppsContainerView.AdapterHolder.WORK].recyclerView);
         mParent = (ViewGroup) mMainRV.getParent();
@@ -429,6 +436,13 @@ public class FloatingHeaderView extends LinearLayout implements
         }
         return null;
     }
+
+    /**
+     * Returns visible height of FloatingHeaderView contents
+     */
+    public int getVisibleBottomBound() {
+        return getBottom() + mTranslationY;
+    }
 }
 
 
diff --git a/src/com/android/launcher3/allapps/WorkEduCard.java b/src/com/android/launcher3/allapps/WorkEduCard.java
index 29a42f87ef..9db7bf01ac 100644
--- a/src/com/android/launcher3/allapps/WorkEduCard.java
+++ b/src/com/android/launcher3/allapps/WorkEduCard.java
@@ -21,7 +21,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
-import android.widget.LinearLayout;
+import android.widget.FrameLayout;
 
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
@@ -29,7 +29,7 @@ import com.android.launcher3.R;
 /**
  * Work profile toggle switch shown at the bottom of AllApps work tab
  */
-public class WorkEduCard extends LinearLayout implements View.OnClickListener,
+public class WorkEduCard extends FrameLayout implements View.OnClickListener,
         Animation.AnimationListener {
 
     private final Launcher mLauncher;
@@ -52,11 +52,24 @@ public class WorkEduCard extends LinearLayout implements View.OnClickListener,
         mDismissAnim.setAnimationListener(this);
     }
 
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        mDismissAnim.reset();
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        mDismissAnim.cancel();
+    }
 
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
         findViewById(R.id.action_btn).setOnClickListener(this);
+        MarginLayoutParams lp = ((MarginLayoutParams) findViewById(R.id.wrapper).getLayoutParams());
+        lp.width = mLauncher.getAppsView().getActiveRecyclerView().getTabWidth();
     }
 
     @Override
diff --git a/src/com/android/launcher3/allapps/WorkModeSwitch.java b/src/com/android/launcher3/allapps/WorkModeSwitch.java
index c22cd639de..866694fdca 100644
--- a/src/com/android/launcher3/allapps/WorkModeSwitch.java
+++ b/src/com/android/launcher3/allapps/WorkModeSwitch.java
@@ -31,7 +31,6 @@ import android.widget.Button;
 import androidx.annotation.RequiresApi;
 
 import com.android.launcher3.Insettable;
-import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.pm.UserCache;
 
@@ -79,7 +78,9 @@ public class WorkModeSwitch extends Button implements Insettable, View.OnClickLi
         clearAnimation();
         if (workTabVisible) {
             setEnabled(true);
-            setVisibility(VISIBLE);
+            if (mWorkEnabled) {
+                setVisibility(VISIBLE);
+            }
             setAlpha(0);
             animate().alpha(1).start();
         } else {
@@ -91,7 +92,7 @@ public class WorkModeSwitch extends Button implements Insettable, View.OnClickLi
     public void onClick(View view) {
         if (Utilities.ATLEAST_P) {
             setEnabled(false);
-            UI_HELPER_EXECUTOR.post(() -> setToState(!mWorkEnabled));
+            UI_HELPER_EXECUTOR.post(() -> setWorkProfileEnabled(getContext(), false));
         }
     }
 
@@ -101,20 +102,18 @@ public class WorkModeSwitch extends Button implements Insettable, View.OnClickLi
     public void updateCurrentState(boolean active) {
         mWorkEnabled = active;
         setEnabled(true);
-        setCompoundDrawablesRelativeWithIntrinsicBounds(
-                active ? R.drawable.ic_corp_off : R.drawable.ic_corp, 0, 0, 0);
-        setText(active ? R.string.work_apps_pause_btn_text : R.string.work_apps_enable_btn_text);
+        setVisibility(active ? VISIBLE : GONE);
     }
 
     @RequiresApi(Build.VERSION_CODES.P)
-    protected Boolean setToState(boolean toState) {
-        UserManager userManager = getContext().getSystemService(UserManager.class);
+    public static Boolean setWorkProfileEnabled(Context context, boolean enabled) {
+        UserManager userManager = context.getSystemService(UserManager.class);
         boolean showConfirm = false;
-        for (UserHandle userProfile : UserCache.INSTANCE.get(getContext()).getUserProfiles()) {
+        for (UserHandle userProfile : UserCache.INSTANCE.get(context).getUserProfiles()) {
             if (Process.myUserHandle().equals(userProfile)) {
                 continue;
             }
-            showConfirm |= !userManager.requestQuietModeEnabled(!toState, userProfile);
+            showConfirm |= !userManager.requestQuietModeEnabled(!enabled, userProfile);
         }
         return showConfirm;
     }
diff --git a/src/com/android/launcher3/allapps/WorkPausedCard.java b/src/com/android/launcher3/allapps/WorkPausedCard.java
new file mode 100644
index 0000000000..3955a9a9f2
--- /dev/null
+++ b/src/com/android/launcher3/allapps/WorkPausedCard.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.allapps;
+
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+
+import android.content.Context;
+import android.content.res.Configuration;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.Button;
+import android.widget.LinearLayout;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+
+/**
+ * Work profile toggle switch shown at the bottom of AllApps work tab
+ */
+public class WorkPausedCard extends LinearLayout implements View.OnClickListener {
+
+    private final Launcher mLauncher;
+    private Button mBtn;
+
+    public WorkPausedCard(Context context) {
+        this(context, null, 0);
+    }
+
+    public WorkPausedCard(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public WorkPausedCard(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mLauncher = Launcher.getLauncher(getContext());
+    }
+
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mBtn = findViewById(R.id.enable_work_apps);
+        mBtn.setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View view) {
+        if (Utilities.ATLEAST_P) {
+            setEnabled(false);
+            UI_HELPER_EXECUTOR.post(() -> WorkModeSwitch.setWorkProfileEnabled(getContext(), true));
+        }
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        int orientation = getResources().getConfiguration().orientation;
+        getLayoutParams().height = orientation == Configuration.ORIENTATION_PORTRAIT
+                ? LayoutParams.MATCH_PARENT : LayoutParams.WRAP_CONTENT;
+        super.onLayout(changed, l, t, r, b);
+    }
+}
-- 
GitLab


From d14190d547a642835bc3052ca4ab3881766c4e32 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 15 Jun 2021 13:56:20 -0700
Subject: [PATCH 1411/1664] Do some additional cleanup when switching handlers

Bug: 183962705
Test: Presubmit

Change-Id: Ia9295d2cf89fa6b6fe77c5e4861a704c4a82ab12
---
 .../src/com/android/quickstep/AbsSwipeUpHandler.java      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 44ac4ae139..80ba5dbeae 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1385,11 +1385,17 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
 
     /**
      * Cancels any running animation so that the active target can be overriden by a new swipe
-     * handle (in case of quick switch).
+     * handler (in case of quick switch).
      */
     private void cancelCurrentAnimation() {
         mCanceled = true;
         mCurrentShift.cancelAnimation();
+
+        // Cleanup when switching handlers
+        mInputConsumerProxy.unregisterCallback();
+        mActivityInitListener.unregister();
+        ActivityManagerWrapper.getInstance().unregisterTaskStackListener(mActivityRestartListener);
+        mTaskSnapshot = null;
     }
 
     private void invalidateHandler() {
-- 
GitLab


From 9d41499a3306dbf179b008c6761c3358d7f21003 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Tue, 15 Jun 2021 12:55:20 -0700
Subject: [PATCH 1412/1664] Fix bug where preview item icon fades/disappears
 for a frame during

- Remove fade since we no longer clip icons.
- Ensures a clean handoff between drag view and folder icon preview item.

Bug: 175329686
Test: create folder / add items to folder
Change-Id: Iaab592410734b0b5239dbbddbb9b2ed5a9f5d8b0
---
 .../folder/ClippedFolderIconLayoutRule.java         |  4 +---
 .../launcher3/folder/FolderAnimationManager.java    |  2 +-
 src/com/android/launcher3/folder/FolderIcon.java    | 13 +++++++------
 .../launcher3/folder/FolderPreviewItemAnim.java     |  2 +-
 .../launcher3/folder/PreviewItemDrawingParams.java  |  4 +---
 .../launcher3/folder/PreviewItemManager.java        |  2 +-
 6 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java b/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java
index 3457804c3a..54967a9915 100644
--- a/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java
+++ b/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java
@@ -34,7 +34,6 @@ public class ClippedFolderIconLayoutRule {
         float totalScale = scaleForItem(curNumItems);
         float transX;
         float transY;
-        float overlayAlpha = 0;
 
         if (index == EXIT_INDEX) {
             // 0 1 * <-- Exit position (row 0, col 2)
@@ -55,10 +54,9 @@ public class ClippedFolderIconLayoutRule {
         transY = mTmpPoint[1];
 
         if (params == null) {
-            params = new PreviewItemDrawingParams(transX, transY, totalScale, overlayAlpha);
+            params = new PreviewItemDrawingParams(transX, transY, totalScale);
         } else {
             params.update(transX, transY, totalScale);
-            params.overlayAlpha = overlayAlpha;
         }
         return params;
     }
diff --git a/src/com/android/launcher3/folder/FolderAnimationManager.java b/src/com/android/launcher3/folder/FolderAnimationManager.java
index 57b289ec34..4fe85be820 100644
--- a/src/com/android/launcher3/folder/FolderAnimationManager.java
+++ b/src/com/android/launcher3/folder/FolderAnimationManager.java
@@ -79,7 +79,7 @@ public class FolderAnimationManager {
     private final TimeInterpolator mLargeFolderPreviewItemOpenInterpolator;
     private final TimeInterpolator mLargeFolderPreviewItemCloseInterpolator;
 
-    private final PreviewItemDrawingParams mTmpParams = new PreviewItemDrawingParams(0, 0, 0, 0);
+    private final PreviewItemDrawingParams mTmpParams = new PreviewItemDrawingParams(0, 0, 0);
     private final FolderGridOrganizer mPreviewVerifier;
 
     private ObjectAnimator mBgColorAnimator;
diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java
index ed2d0a943a..5c11451535 100644
--- a/src/com/android/launcher3/folder/FolderIcon.java
+++ b/src/com/android/launcher3/folder/FolderIcon.java
@@ -113,7 +113,7 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
     FolderGridOrganizer mPreviewVerifier;
     ClippedFolderIconLayoutRule mPreviewLayoutRule;
     private PreviewItemManager mPreviewItemManager;
-    private PreviewItemDrawingParams mTmpParams = new PreviewItemDrawingParams(0, 0, 0, 0);
+    private PreviewItemDrawingParams mTmpParams = new PreviewItemDrawingParams(0, 0, 0);
     private List<WorkspaceItemInfo> mCurrentPreviewItems = new ArrayList<>();
 
     boolean mAnimating = false;
@@ -391,7 +391,7 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
             to.offset(center[0] - animateView.getMeasuredWidth() / 2,
                     center[1] - animateView.getMeasuredHeight() / 2);
 
-            float finalAlpha = index < MAX_NUM_ITEMS_IN_PREVIEW ? 0.5f : 0f;
+            float finalAlpha = index < MAX_NUM_ITEMS_IN_PREVIEW ? 1f : 0f;
 
             float finalScale = scale * scaleRelativeToDragLayer;
 
@@ -402,15 +402,18 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
                 finalScale *= containerScale;
             }
 
+            final int finalIndex = index;
             dragLayer.animateView(animateView, from, to, finalAlpha,
                     1, 1, finalScale, finalScale, DROP_IN_ANIMATION_DURATION,
                     Interpolators.DEACCEL_2, Interpolators.ACCEL_2,
-                    null, DragLayer.ANIMATION_END_DISAPPEAR, null);
+                    () -> {
+                        mPreviewItemManager.hidePreviewItem(finalIndex, false);
+                        mFolder.showItem(item);
+                    }, DragLayer.ANIMATION_END_DISAPPEAR, null);
 
             mFolder.hideItem(item);
 
             if (!itemAdded) mPreviewItemManager.hidePreviewItem(index, true);
-            final int finalIndex = index;
 
             FolderNameInfos nameInfos = new FolderNameInfos();
             if (FeatureFlags.FOLDER_NAME_SUGGEST.get()) {
@@ -430,8 +433,6 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
     private void showFinalView(int finalIndex, final WorkspaceItemInfo item,
             FolderNameInfos nameInfos, InstanceId instanceId) {
         postDelayed(() -> {
-            mPreviewItemManager.hidePreviewItem(finalIndex, false);
-            mFolder.showItem(item);
             setLabelSuggestion(nameInfos, instanceId);
             invalidate();
         }, DROP_IN_ANIMATION_DURATION);
diff --git a/src/com/android/launcher3/folder/FolderPreviewItemAnim.java b/src/com/android/launcher3/folder/FolderPreviewItemAnim.java
index edfd2ba35e..e20bafbde0 100644
--- a/src/com/android/launcher3/folder/FolderPreviewItemAnim.java
+++ b/src/com/android/launcher3/folder/FolderPreviewItemAnim.java
@@ -45,7 +45,7 @@ class FolderPreviewItemAnim {
             };
 
     private static final PreviewItemDrawingParams sTmpParams =
-            new PreviewItemDrawingParams(0, 0, 0, 0);
+            new PreviewItemDrawingParams(0, 0, 0);
     private static final float[] sTempParamsArray = new float[3];
 
     private final ObjectAnimator mAnimator;
diff --git a/src/com/android/launcher3/folder/PreviewItemDrawingParams.java b/src/com/android/launcher3/folder/PreviewItemDrawingParams.java
index 5746be89d9..58efdc12ce 100644
--- a/src/com/android/launcher3/folder/PreviewItemDrawingParams.java
+++ b/src/com/android/launcher3/folder/PreviewItemDrawingParams.java
@@ -27,17 +27,15 @@ class PreviewItemDrawingParams {
     float transX;
     float transY;
     float scale;
-    float overlayAlpha;
     public FolderPreviewItemAnim anim;
     public boolean hidden;
     public Drawable drawable;
     public WorkspaceItemInfo item;
 
-    PreviewItemDrawingParams(float transX, float transY, float scale, float overlayAlpha) {
+    PreviewItemDrawingParams(float transX, float transY, float scale) {
         this.transX = transX;
         this.transY = transY;
         this.scale = scale;
-        this.overlayAlpha = overlayAlpha;
     }
 
     public void update(float transX, float transY, float scale) {
diff --git a/src/com/android/launcher3/folder/PreviewItemManager.java b/src/com/android/launcher3/folder/PreviewItemManager.java
index baafbc92bc..a6674fcb08 100644
--- a/src/com/android/launcher3/folder/PreviewItemManager.java
+++ b/src/com/android/launcher3/folder/PreviewItemManager.java
@@ -260,7 +260,7 @@ public class PreviewItemManager {
             params.remove(params.size() - 1);
         }
         while (items.size() > params.size()) {
-            params.add(new PreviewItemDrawingParams(0, 0, 0, 0));
+            params.add(new PreviewItemDrawingParams(0, 0, 0));
         }
 
         int numItemsInFirstPagePreview = page == 0 ? items.size() : MAX_NUM_ITEMS_IN_PREVIEW;
-- 
GitLab


From a7783fd73490992baf07aa9ab61d5032b805536b Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Tue, 15 Jun 2021 14:47:30 -0700
Subject: [PATCH 1413/1664] Update launcher text to match specs.

Bug: 190915409
Test: visual, manual
Change-Id: I9560f95a452cf92ca3eada2a13f3ed63cc9b44da
---
 res/values-v28/styles.xml | 23 -----------------------
 res/values/styles.xml     |  6 ++++--
 2 files changed, 4 insertions(+), 25 deletions(-)
 delete mode 100644 res/values-v28/styles.xml

diff --git a/res/values-v28/styles.xml b/res/values-v28/styles.xml
deleted file mode 100644
index 7df9ce541f..0000000000
--- a/res/values-v28/styles.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-* Copyright (C) 2019 The Android Open Source Project
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
--->
-<resources>
-    <style name="TextHeadline" parent="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle" >
-        <item name="android:textFontWeight">400</item>
-    </style>
-</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6f7d727d7c..9960a003e5 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -214,7 +214,9 @@
         <item name="disabledIconAlpha">.54</item>
     </style>
 
-    <style name="BaseIconUnBounded" parent="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle">
+    <style name="BaseIconRoot" parent="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle"/>
+
+    <style name="BaseIconUnBounded" parent="BaseIconRoot">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">match_parent</item>
         <item name="android:layout_gravity">center</item>
@@ -276,7 +278,7 @@
 
     <style name="DropTargetButton" parent="DropTargetButtonBase" />
 
-    <style name="TextHeadline" parent="@android:style/TextAppearance.DeviceDefault" />
+    <style name="TextHeadline" parent="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle" />
 
     <style name="PrimaryHeadline" parent="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle"/>
 
-- 
GitLab


From c636900a907149489b6b4214d7c1d501070df1ec Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Tue, 15 Jun 2021 18:52:31 -0700
Subject: [PATCH 1414/1664] Improving diagnostics for objects disappearing from
 screen

Test: presubmit
Bug: 187761685
Change-Id: Id932e8100399990d791f7825787708d5d459f61e
---
 tests/tapl/com/android/launcher3/tapl/AllApps.java       | 9 ++++++++-
 .../android/launcher3/tapl/LauncherInstrumentation.java  | 5 ++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/AllApps.java b/tests/tapl/com/android/launcher3/tapl/AllApps.java
index e32250eaa5..1cb6b2debf 100644
--- a/tests/tapl/com/android/launcher3/tapl/AllApps.java
+++ b/tests/tapl/com/android/launcher3/tapl/AllApps.java
@@ -25,6 +25,7 @@ import androidx.annotation.NonNull;
 import androidx.test.uiautomator.By;
 import androidx.test.uiautomator.BySelector;
 import androidx.test.uiautomator.Direction;
+import androidx.test.uiautomator.StaleObjectException;
 import androidx.test.uiautomator.UiObject2;
 
 import com.android.launcher3.testing.TestProtocol;
@@ -61,7 +62,13 @@ public class AllApps extends LauncherInstrumentation.VisibleContainer {
 
     private boolean hasClickableIcon(UiObject2 allAppsContainer, UiObject2 appListRecycler,
             BySelector appIconSelector, int displayBottom) {
-        final UiObject2 icon = appListRecycler.findObject(appIconSelector);
+        final UiObject2 icon;
+        try {
+            icon = appListRecycler.findObject(appIconSelector);
+        } catch (StaleObjectException e) {
+            mLauncher.fail("All apps recycler disappeared from screen");
+            return false;
+        }
         if (icon == null) {
             LauncherInstrumentation.log("hasClickableIcon: icon not visible");
             return false;
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 426af19084..e80d8cac9d 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -492,7 +492,7 @@ public final class LauncherInstrumentation {
         }
     }
 
-    private void fail(String message) {
+    void fail(String message) {
         checkForAnomaly();
         Assert.fail(formatSystemHealthMessage(formatErrorWithEvents(
                 "http://go/tapl test failure:\nSummary: " + getContextDescription()
@@ -1445,6 +1445,9 @@ public final class LauncherInstrumentation {
     Rect getVisibleBounds(UiObject2 object) {
         try {
             return object.getVisibleBounds();
+        } catch (StaleObjectException e) {
+            fail("Object " + object + " disappeared from screen");
+            return null;
         } catch (Throwable t) {
             fail(t.toString());
             return null;
-- 
GitLab


From 229c4c3235b6ba162ed71ba442686d17e2160e9e Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Tue, 15 Jun 2021 12:17:13 -0700
Subject: [PATCH 1415/1664] App Shortcut menu bug fixes and polish.

- Widget is its own item.
- Change order of icon order.
- Update grab handle colors

Bug: 188095695
Test: long press on apps with/without widgets, long press apps on workspace/
      all apps/search

Change-Id: Iabb9b4b3f3a928103b9d62601f22e74ef2325d7c
---
 .../launcher3/BaseQuickstepLauncher.java      |  4 +-
 .../uioverrides/QuickstepLauncher.java        |  2 +-
 res/drawable/ic_drag_handle.xml               |  2 +-
 res/layout/system_shortcut.xml                |  2 +-
 res/layout/widget_shortcut_container.xml      | 27 +++++++++
 .../popup/PopupContainerWithArrow.java        | 57 ++++++++++++++-----
 .../launcher3/ui/TaplTestsLauncher3.java      |  4 +-
 .../com/android/launcher3/tapl/AppIcon.java   | 10 ++++
 8 files changed, 86 insertions(+), 22 deletions(-)
 create mode 100644 res/layout/widget_shortcut_container.xml

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 1bf36278ca..33dc6cf5bd 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -422,8 +422,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
 
     @Override
     public Stream<SystemShortcut.Factory> getSupportedShortcuts() {
-        return Stream.concat(super.getSupportedShortcuts(),
-                Stream.of(WellbeingModel.SHORTCUT_FACTORY));
+        return Stream.concat(Stream.of(WellbeingModel.SHORTCUT_FACTORY),
+                super.getSupportedShortcuts());
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index f0b02b3c47..ec9893c84f 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -192,7 +192,7 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
     @Override
     public Stream<SystemShortcut.Factory> getSupportedShortcuts() {
         return Stream.concat(
-                super.getSupportedShortcuts(), Stream.of(mHotseatPredictionController));
+                Stream.of(mHotseatPredictionController), super.getSupportedShortcuts());
     }
 
     /**
diff --git a/res/drawable/ic_drag_handle.xml b/res/drawable/ic_drag_handle.xml
index 0181ff15d7..9db75f4a04 100644
--- a/res/drawable/ic_drag_handle.xml
+++ b/res/drawable/ic_drag_handle.xml
@@ -19,7 +19,7 @@
         android:height="@dimen/deep_shortcut_drag_handle_size"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?android:attr/textColorHint" >
+        android:tint="?android:attr/textColorPrimary" >
 
     <path
         android:pathData="M20,9H4v2h16V9z M4,15h16v-2H4V15z"
diff --git a/res/layout/system_shortcut.xml b/res/layout/system_shortcut.xml
index 6337faeadb..2cdf1f4bdb 100644
--- a/res/layout/system_shortcut.xml
+++ b/res/layout/system_shortcut.xml
@@ -45,6 +45,6 @@
         android:layout_height="@dimen/system_shortcut_icon_size"
         android:layout_marginStart="@dimen/system_shortcut_margin_start"
         android:layout_gravity="start|center_vertical"
-        android:backgroundTint="?android:attr/textColorTertiary"/>
+        android:backgroundTint="?android:attr/textColorPrimary"/>
 
 </com.android.launcher3.shortcuts.DeepShortcutView>
diff --git a/res/layout/widget_shortcut_container.xml b/res/layout/widget_shortcut_container.xml
new file mode 100644
index 0000000000..a4d8eb4be0
--- /dev/null
+++ b/res/layout/widget_shortcut_container.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/system_shortcut_full"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/system_shortcut_header_height"
+    android:orientation="horizontal"
+    android:gravity="end|center_vertical"
+    android:elevation="@dimen/deep_shortcuts_elevation"
+    android:tag="@string/popup_container_iterate_children"
+    android:clipToPadding="true">
+</LinearLayout>
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index 332390d8e2..2ae12ac71f 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -96,6 +96,8 @@ public class PopupContainerWithArrow<T extends StatefulActivity<LauncherState>>
     private int mNumNotifications;
     private ViewGroup mNotificationContainer;
 
+    private ViewGroup mWidgetContainer;
+
     private ViewGroup mDeepShortcutContainer;
 
     private ViewGroup mSystemShortcutContainer;
@@ -234,7 +236,7 @@ public class PopupContainerWithArrow<T extends StatefulActivity<LauncherState>>
 
     @Override
     protected List<View> getChildrenForColorExtraction() {
-        return Arrays.asList(mSystemShortcutContainer, mDeepShortcutContainer,
+        return Arrays.asList(mSystemShortcutContainer, mWidgetContainer, mDeepShortcutContainer,
                 mNotificationContainer);
     }
 
@@ -298,10 +300,24 @@ public class PopupContainerWithArrow<T extends StatefulActivity<LauncherState>>
             updateHiddenShortcuts();
 
             if (!systemShortcuts.isEmpty()) {
+                for (SystemShortcut shortcut : systemShortcuts) {
+                    if (shortcut instanceof SystemShortcut.Widgets) {
+                        if (mWidgetContainer == null) {
+                            mWidgetContainer = inflateAndAdd(R.layout.widget_shortcut_container,
+                                    this);
+                        }
+                        initializeSystemShortcut(R.layout.system_shortcut, mWidgetContainer,
+                                shortcut);
+                    }
+                }
                 mSystemShortcutContainer = inflateAndAdd(R.layout.system_shortcut_icons, this);
+
                 for (SystemShortcut shortcut : systemShortcuts) {
-                    initializeSystemShortcut(
-                            R.layout.system_shortcut_icon_only, mSystemShortcutContainer, shortcut);
+                    if (!(shortcut instanceof SystemShortcut.Widgets)) {
+                        initializeSystemShortcut(
+                                R.layout.system_shortcut_icon_only, mSystemShortcutContainer,
+                                shortcut);
+                    }
                 }
             }
         } else {
@@ -524,25 +540,34 @@ public class PopupContainerWithArrow<T extends StatefulActivity<LauncherState>>
             mLauncher.getPopupDataProvider().setChangeListener(null);
         }
 
+        private View getWidgetsView(ViewGroup container) {
+            for (int i = container.getChildCount() - 1; i >= 0; --i) {
+                View systemShortcutView = container.getChildAt(i);
+                if (systemShortcutView.getTag() instanceof SystemShortcut.Widgets) {
+                    return systemShortcutView;
+                }
+            }
+            return null;
+        }
+
         @Override
         public void onWidgetsBound() {
             ItemInfo itemInfo = (ItemInfo) mOriginalIcon.getTag();
             SystemShortcut widgetInfo = SystemShortcut.WIDGETS.getShortcut(mLauncher, itemInfo);
-            View widgetsView = null;
-            int count = mSystemShortcutContainer.getChildCount();
-            for (int i = 0; i < count; i++) {
-                View systemShortcutView = mSystemShortcutContainer.getChildAt(i);
-                if (systemShortcutView.getTag() instanceof SystemShortcut.Widgets) {
-                    widgetsView = systemShortcutView;
-                    break;
-                }
+            View widgetsView = getWidgetsView(PopupContainerWithArrow.this);
+            if (widgetsView == null && mWidgetContainer != null) {
+                widgetsView = getWidgetsView(mWidgetContainer);
             }
 
             if (widgetInfo != null && widgetsView == null) {
                 // We didn't have any widgets cached but now there are some, so enable the shortcut.
                 if (mSystemShortcutContainer != PopupContainerWithArrow.this) {
-                    initializeSystemShortcut(R.layout.system_shortcut_icon_only,
-                            mSystemShortcutContainer, widgetInfo);
+                    if (mWidgetContainer == null) {
+                        mWidgetContainer = inflateAndAdd(R.layout.widget_shortcut_container,
+                                PopupContainerWithArrow.this);
+                    }
+                    initializeSystemShortcut(R.layout.system_shortcut, mWidgetContainer,
+                            widgetInfo);
                 } else {
                     // If using the expanded system shortcut (as opposed to just the icon), we need
                     // to reopen the container to ensure measurements etc. all work out. While this
@@ -554,8 +579,10 @@ public class PopupContainerWithArrow<T extends StatefulActivity<LauncherState>>
                 }
             } else if (widgetInfo == null && widgetsView != null) {
                 // No widgets exist, but we previously added the shortcut so remove it.
-                if (mSystemShortcutContainer != PopupContainerWithArrow.this) {
-                    mSystemShortcutContainer.removeView(widgetsView);
+                if (mSystemShortcutContainer
+                        != PopupContainerWithArrow.this
+                        && mWidgetContainer != null) {
+                    mWidgetContainer.removeView(widgetsView);
                 } else {
                     close(false);
                     PopupContainerWithArrow.showForIcon(mOriginalIcon);
diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
index 6f47df06a6..06bc26a2a2 100644
--- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
+++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
@@ -293,7 +293,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
         try {
             final AppIconMenu menu = allApps.
                     getAppIcon(APP_NAME).
-                    openMenu();
+                    openDeepShortcutMenu();
 
             executeOnLauncher(
                     launcher -> assertTrue("Launcher internal state didn't switch to Showing Menu",
@@ -341,7 +341,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
         try {
             final AppIconMenu menu = allApps
                     .getAppIcon(APP_NAME)
-                    .openMenu();
+                    .openDeepShortcutMenu();
             final AppIconMenuItem menuItem0 = menu.getMenuItem(0);
             final AppIconMenuItem menuItem2 = menu.getMenuItem(2);
 
diff --git a/tests/tapl/com/android/launcher3/tapl/AppIcon.java b/tests/tapl/com/android/launcher3/tapl/AppIcon.java
index 56723b18d2..57fd08ae2c 100644
--- a/tests/tapl/com/android/launcher3/tapl/AppIcon.java
+++ b/tests/tapl/com/android/launcher3/tapl/AppIcon.java
@@ -51,6 +51,16 @@ public final class AppIcon extends Launchable {
         }
     }
 
+    /**
+     * Long-clicks the icon to open its menu, and looks at the deep shortcuts container only.
+     */
+    public AppIconMenu openDeepShortcutMenu() {
+        try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck()) {
+            return new AppIconMenu(mLauncher, mLauncher.clickAndGet(
+                    mObject, "deep_shortcuts_container", LONG_CLICK_EVENT));
+        }
+    }
+
     @Override
     protected void addExpectedEventsForLongClick() {
         mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, LONG_CLICK_EVENT);
-- 
GitLab


From 5a03ade7945a51f731a1d602d2cc6c918e9b1507 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Tue, 15 Jun 2021 19:34:24 -0700
Subject: [PATCH 1416/1664] Improving diagnostics when Launcher dies while in
 ContentProvider call

Test: presubmit
Bug: 191059619
Change-Id: Ib87a41663a63729024b41603973b782cf4763551
---
 .../com/android/launcher3/tapl/LauncherInstrumentation.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 426af19084..bffd3509ea 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -39,6 +39,7 @@ import android.graphics.Point;
 import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.DeadObjectException;
 import android.os.Parcelable;
 import android.os.RemoteException;
 import android.os.SystemClock;
@@ -269,6 +270,9 @@ public final class LauncherInstrumentation {
         try (ContentProviderClient client = getContext().getContentResolver()
                 .acquireContentProviderClient(mTestProviderUri)) {
             return client.call(request, null, null);
+        } catch (DeadObjectException e) {
+            fail("Launcher crashed");
+            return null;
         } catch (RemoteException e) {
             throw new RuntimeException(e);
         }
-- 
GitLab


From 19bc880a5ff28be48c673234bbb11692ee5971b0 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Tue, 15 Jun 2021 11:57:54 +0100
Subject: [PATCH 1417/1664] Fix PendingWidgetHostView overlapping UI

* Only show launcher set up UI if a pending widget has not finished
set up.
* Update configuration string

Test: manual inspection
Bug: 190037003
Change-Id: I3b9fb39da21ea557f97e9ca7b05a3b52f3ec3452
---
 res/values/strings.xml                                    | 8 ++++----
 .../launcher3/widget/PendingAppWidgetHostView.java        | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9cfe69aae1..9ecf237e09 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -190,11 +190,11 @@
     <!-- Widgets: -->
     <skip />    
 
-    <!-- Text to show user in place of a gadget when we can't display it properly -->
-    <string name="gadget_error_text">Problem loading widget</string>
+    <!-- Error text that lets a user know that the widget can't load. -->
+    <string name="gadget_error_text">Can\'t load widget</string>
 
-    <!-- Text to show user in place of a gadget when it is not yet initialized. -->
-    <string name="gadget_setup_text">Setup</string>
+    <!-- Instructional text to encourage a user to finish setting up the widget. -->
+    <string name="gadget_setup_text">Tap to finish setup</string>
 
     <!-- Text to inform the user that they can't uninstall a system application -->
     <string name="uninstall_system_app_text">This is a system app and can\'t be uninstalled.</string>
diff --git a/src/com/android/launcher3/widget/PendingAppWidgetHostView.java b/src/com/android/launcher3/widget/PendingAppWidgetHostView.java
index 3308eecf5d..47a8914d2a 100644
--- a/src/com/android/launcher3/widget/PendingAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/PendingAppWidgetHostView.java
@@ -97,9 +97,9 @@ public class PendingAppWidgetHostView extends LauncherAppWidgetHostView
 
     @Override
     public void updateAppWidget(RemoteViews remoteViews) {
-        super.updateAppWidget(remoteViews);
         WidgetManagerHelper widgetManagerHelper = new WidgetManagerHelper(getContext());
         if (widgetManagerHelper.isAppWidgetRestored(mInfo.appWidgetId)) {
+            super.updateAppWidget(remoteViews);
             reInflate();
         }
     }
@@ -149,7 +149,7 @@ public class PendingAppWidgetHostView extends LauncherAppWidgetHostView
             // The view displays three modes,
             //   1) App icon in the center
             //   2) Preload icon in the center
-            //   3) Setup icon in the center and app icon in the top right corner.
+            //   3) App icon in the center with a setup icon on the top left corner.
             if (mDisabledForSafeMode) {
                 FastBitmapDrawable disabledIcon = info.newIcon(getContext());
                 disabledIcon.setIsDisabled(true);
-- 
GitLab


From ed052ab21221054dcb049f856bce6ee9d9e3e818 Mon Sep 17 00:00:00 2001
From: Yogisha Dixit <ydixit@google.com>
Date: Tue, 8 Jun 2021 21:19:15 +0100
Subject: [PATCH 1418/1664] Fix drop target icons being truncated.

The icons were being truncated due to incorrect viewport width/height
values for the vector drawable.

Test: manual
Bug: 187036287
Change-Id: Ie2d0ffe815501d2e943146a79cb4ede379ce0ecf
---
 res/drawable/ic_block_no_shadow.xml           |  4 ++--
 res/drawable/ic_uninstall_no_shadow.xml       |  4 ++--
 .../android/launcher3/ButtonDropTarget.java   | 23 ++++++++++---------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/res/drawable/ic_block_no_shadow.xml b/res/drawable/ic_block_no_shadow.xml
index be9aa07b38..6ac61f4f3a 100644
--- a/res/drawable/ic_block_no_shadow.xml
+++ b/res/drawable/ic_block_no_shadow.xml
@@ -16,8 +16,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="20dp"
     android:height="20dp"
-    android:viewportHeight="20.0"
-    android:viewportWidth="20.0"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
     android:tint="?android:attr/textColorPrimary">
     <path
         android:fillColor="@android:color/white"
diff --git a/res/drawable/ic_uninstall_no_shadow.xml b/res/drawable/ic_uninstall_no_shadow.xml
index 14cecacbea..fbabdd2a22 100644
--- a/res/drawable/ic_uninstall_no_shadow.xml
+++ b/res/drawable/ic_uninstall_no_shadow.xml
@@ -16,8 +16,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="20dp"
         android:height="20dp"
-        android:viewportWidth="20.0"
-        android:viewportHeight="20.0"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
         android:tint="?android:attr/textColorPrimary" >
     <path
         android:fillColor="@android:color/white"
diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
index 7db34a5613..13bf437cce 100644
--- a/src/com/android/launcher3/ButtonDropTarget.java
+++ b/src/com/android/launcher3/ButtonDropTarget.java
@@ -36,8 +36,6 @@ import android.view.accessibility.AccessibilityEvent;
 import android.widget.PopupWindow;
 import android.widget.TextView;
 
-import androidx.appcompat.content.res.AppCompatResources;
-
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.dragndrop.DragController;
 import com.android.launcher3.dragndrop.DragLayer;
@@ -82,6 +80,8 @@ public abstract class ButtonDropTarget extends TextView
     private boolean mAccessibleDrag;
     /** An item must be dragged at least this many pixels before this drop target is enabled. */
     private final int mDragDistanceThreshold;
+    /** The size of the drawable shown in the drop target. */
+    private final int mDrawableSize;
 
     protected CharSequence mText;
     protected ColorStateList mOriginalTextColor;
@@ -103,6 +103,7 @@ public abstract class ButtonDropTarget extends TextView
 
         Resources resources = getResources();
         mDragDistanceThreshold = resources.getDimensionPixelSize(R.dimen.drag_distanceThreshold);
+        mDrawableSize = resources.getDimensionPixelSize(R.dimen.drop_target_text_size);
     }
 
     @Override
@@ -120,14 +121,18 @@ public abstract class ButtonDropTarget extends TextView
     }
 
     protected void setDrawable(int resId) {
+        mDrawable = getContext().getDrawable(resId).mutate();
+        mDrawable.setBounds(0, 0, mDrawableSize, mDrawableSize);
+        setDrawable(mDrawable);
+    }
+
+    private void setDrawable(Drawable drawable) {
         // We do not set the drawable in the xml as that inflates two drawables corresponding to
         // drawableLeft and drawableStart.
         if (mTextVisible) {
-            setCompoundDrawablesRelativeWithIntrinsicBounds(resId, 0, 0, 0);
-            mDrawable = getCompoundDrawablesRelative()[0];
+            setCompoundDrawablesRelative(drawable, null, null, null);
         } else {
-            setCompoundDrawablesRelativeWithIntrinsicBounds(0, resId, 0, 0);
-            mDrawable = getCompoundDrawablesRelative()[1];
+            setCompoundDrawablesRelative(null, drawable, null, null);
         }
     }
 
@@ -329,11 +334,7 @@ public abstract class ButtonDropTarget extends TextView
         if (mTextVisible != isVisible || !TextUtils.equals(newText, getText())) {
             mTextVisible = isVisible;
             setText(newText);
-            if (mTextVisible) {
-                setCompoundDrawablesRelativeWithIntrinsicBounds(mDrawable, null, null, null);
-            } else {
-                setCompoundDrawablesRelativeWithIntrinsicBounds(null, mDrawable, null, null);
-            }
+            setDrawable(mDrawable);
         }
     }
 
-- 
GitLab


From b73e5917123b0d5b3f5ad4b9a69053833ce0c4dd Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Tue, 15 Jun 2021 18:07:26 -0700
Subject: [PATCH 1419/1664] Add ENABLE_SCRIM_FOR_APP_LAUNCH feature flag.

Bug: 191088291
Test: manual
Change-Id: Ia144c72e0fe1292ed856a37ee714a1cda50083d5
---
 .../launcher3/QuickstepTransitionManager.java | 36 +++++++++++--------
 .../launcher3/config/FeatureFlags.java        |  4 +++
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 65df237e5f..31cf51c3b3 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -34,6 +34,7 @@ import static com.android.launcher3.anim.Interpolators.DEACCEL_1_5;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_1_7;
 import static com.android.launcher3.anim.Interpolators.EXAGGERATED_EASE;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_SCRIM_FOR_APP_LAUNCH;
 import static com.android.launcher3.config.FeatureFlags.KEYGUARD_ANIMATION;
 import static com.android.launcher3.config.FeatureFlags.SEPARATE_RECENTS_ACTIVITY;
 import static com.android.launcher3.dragndrop.DragLayer.ALPHA_INDEX_TRANSITIONS;
@@ -508,20 +509,23 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                 launcherAnimator.play(scaleAnim);
             });
 
-            int scrimColor = Themes.getAttrColor(mLauncher, R.attr.overviewScrimColor);
-            int scrimColorTrans = ColorUtils.setAlphaComponent(scrimColor, 0);
-            int[] colors = isAppOpening
-                    ? new int[] {scrimColorTrans, scrimColor}
-                    : new int[] {scrimColor, scrimColorTrans};
-            ScrimView scrimView = mLauncher.getScrimView();
-            if (scrimView.getBackground() instanceof ColorDrawable) {
-                scrimView.setBackgroundColor(colors[0]);
-
-                ObjectAnimator scrim = ObjectAnimator.ofArgb(scrimView, VIEW_BACKGROUND_COLOR,
-                        colors);
-                scrim.setDuration(CONTENT_SCRIM_DURATION);
-                scrim.setInterpolator(DEACCEL_1_5);
-                launcherAnimator.play(scrim);
+            final boolean scrimEnabled = ENABLE_SCRIM_FOR_APP_LAUNCH.get();
+            if (scrimEnabled) {
+                int scrimColor = Themes.getAttrColor(mLauncher, R.attr.overviewScrimColor);
+                int scrimColorTrans = ColorUtils.setAlphaComponent(scrimColor, 0);
+                int[] colors = isAppOpening
+                        ? new int[]{scrimColorTrans, scrimColor}
+                        : new int[]{scrimColor, scrimColorTrans};
+                ScrimView scrimView = mLauncher.getScrimView();
+                if (scrimView.getBackground() instanceof ColorDrawable) {
+                    scrimView.setBackgroundColor(colors[0]);
+
+                    ObjectAnimator scrim = ObjectAnimator.ofArgb(scrimView, VIEW_BACKGROUND_COLOR,
+                            colors);
+                    scrim.setDuration(CONTENT_SCRIM_DURATION);
+                    scrim.setInterpolator(DEACCEL_1_5);
+                    launcherAnimator.play(scrim);
+                }
             }
 
             // Pause page indicator animations as they lead to layer trashing.
@@ -532,7 +536,9 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                     SCALE_PROPERTY.set(view, 1f);
                     view.setLayerType(View.LAYER_TYPE_NONE, null);
                 });
-                scrimView.setBackgroundColor(Color.TRANSPARENT);
+                if (scrimEnabled) {
+                    mLauncher.getScrimView().setBackgroundColor(Color.TRANSPARENT);
+                }
                 mLauncher.getWorkspace().getPageIndicator().skipAnimationsToEnd();
             };
         }
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 0e710b7898..65b4c3b04f 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -220,6 +220,10 @@ public final class FeatureFlags {
             "ENABLE_TWO_PANEL_HOME", false,
             "Uses two panel on home screen. Only applicable on large screen devices.");
 
+    public static final BooleanFlag ENABLE_SCRIM_FOR_APP_LAUNCH = getDebugFlag(
+            "ENABLE_SCRIM_FOR_APP_LAUNCH", false,
+            "Enables scrim during app launch animation.");
+
     public static final BooleanFlag ENABLE_SPLIT_SELECT = getDebugFlag(
             "ENABLE_SPLIT_SELECT", false, "Uses new split screen selection overview UI");
 
-- 
GitLab


From 54a44d4c44de4407c6480ee8ebf76211e5fbb90b Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Mon, 14 Jun 2021 16:33:05 -0700
Subject: [PATCH 1420/1664] All apps motion

Bug: 189970327
Test: manual

TL;DR;;

equation: settleVelocity = releaseVelocity + interpolator 2nd deritive * t

Change-Id: I86fec339523fbc3bb347dec4affbd2d1c063d13d
---
 res/values/dimens.xml                         |  2 +-
 .../allapps/AllAppsContainerView.java         | 31 +++++++++----------
 .../allapps/AllAppsTransitionController.java  |  2 ++
 .../AbstractStateChangeTouchController.java   |  4 +--
 4 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 430a1abb90..542e062abc 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -98,7 +98,7 @@
     <dimen name="all_apps_header_tab_height">48dp</dimen>
     <dimen name="all_apps_tabs_indicator_height">2dp</dimen>
     <dimen name="all_apps_header_top_padding">36dp</dimen>
-    <dimen name="all_apps_header_bottom_padding">16dp</dimen>
+    <dimen name="all_apps_header_bottom_padding">6dp</dimen>
     <dimen name="all_apps_work_profile_tab_footer_top_padding">16dp</dimen>
     <dimen name="all_apps_work_profile_tab_footer_bottom_padding">20dp</dimen>
     <dimen name="all_apps_tabs_vertical_padding">6dp</dimen>
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index d749e02d73..555c911861 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -21,6 +21,8 @@ import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_HAS_SHORTCU
 import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_QUIET_MODE_CHANGE_PERMISSION;
 import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_QUIET_MODE_ENABLED;
 
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
 import android.animation.ValueAnimator;
 import android.content.Context;
 import android.content.res.Configuration;
@@ -82,10 +84,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         ScrimView.ScrimDrawingController {
 
     public static final float PULL_MULTIPLIER = .02f;
-    public static final float FLING_VELOCITY_MULTIPLIER = 2000f;
-
-    // Starts the springs after at least 25% of the animation has passed.
-    public static final float FLING_ANIMATION_THRESHOLD = 0.25f;
+    public static final float FLING_VELOCITY_MULTIPLIER = 1200f;
 
     private final Paint mHeaderPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
 
@@ -658,20 +657,18 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
     /**
      * Adds an update listener to {@param animator} that adds springs to the animation.
      */
-    public void addSpringFromFlingUpdateListener(ValueAnimator animator, float velocity) {
-        animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-            boolean shouldSpring = true;
-
+    public void addSpringFromFlingUpdateListener(ValueAnimator animator,
+            float velocity /* release velocity */,
+            float progress /* portion of the distance to travel*/) {
+        animator.addListener(new AnimatorListenerAdapter() {
             @Override
-            public void onAnimationUpdate(ValueAnimator valueAnimator) {
-                if (shouldSpring
-                        && valueAnimator.getAnimatedFraction() >= FLING_ANIMATION_THRESHOLD) {
-                    absorbSwipeUpVelocity(Math.max(100, Math.abs(
-                            Math.round(velocity * FLING_VELOCITY_MULTIPLIER))));
-                    // calculate the velocity of using the not user controlled interpolator
-                    // of when the container reach the end.
-                    shouldSpring = false;
-                }
+            public void onAnimationStart(Animator animator) {
+                float distance = (float) ((1 - progress) * getHeight()); // px
+                float settleVelocity = Math.min(0, distance
+                        / (AllAppsTransitionController.INTERP_COEFF * animator.getDuration())
+                        + velocity);
+                absorbSwipeUpVelocity(Math.max(1000, Math.abs(
+                        Math.round(settleVelocity * FLING_VELOCITY_MULTIPLIER))));
             }
         });
     }
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 8ec8269ba0..a0551f019a 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -57,6 +57,8 @@ import com.android.launcher3.views.ScrimView;
  */
 public class AllAppsTransitionController
         implements StateHandler<LauncherState>, OnDeviceProfileChangeListener {
+    // This constant should match the second derivative of the animator interpolator.
+    public static final float INTERP_COEFF = 1.7f;
     private static final float CONTENT_VISIBLE_MAX_THRESHOLD = 0.5f;
 
     public static final FloatProperty<AllAppsTransitionController> ALL_APPS_PROGRESS =
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index a086635d57..90f37f3404 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -335,12 +335,10 @@ public abstract class AbstractStateChangeTouchController
         mCurrentAnimation.dispatchOnStart();
         if (targetState == LauncherState.ALL_APPS && !UNSTABLE_SPRINGS.get()) {
             if (mAllAppsOvershootStarted) {
-
                 mLauncher.getAppsView().onRelease();
                 mAllAppsOvershootStarted = false;
-
             } else {
-                mLauncher.getAppsView().addSpringFromFlingUpdateListener(anim, velocity);
+                mLauncher.getAppsView().addSpringFromFlingUpdateListener(anim, velocity, progress);
             }
         }
         anim.start();
-- 
GitLab


From 58c5e6576355a9a32abc6bd7172f2938baafb526 Mon Sep 17 00:00:00 2001
From: Yogisha Dixit <ydixit@google.com>
Date: Wed, 16 Jun 2021 14:18:22 +0100
Subject: [PATCH 1421/1664] Center drop target icons in landscape mode.

Spec: https://docs.google.com/presentation/d/1UxdDh8EFhPbdRWRwzjbpgL-j02ew4Ew3eG3XBCeoYdo/edit#slide=id.vXfwHn8

Test: manual
Bug: 187376586
Change-Id: I2025ba75061a5ca3a004dfef2b33cdbcc17a1408
---
 res/values/dimens.xml                           |  2 +-
 res/values/styles.xml                           |  5 ++---
 src/com/android/launcher3/ButtonDropTarget.java | 16 ++++------------
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 12f50e50b9..d0fc87b24b 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -48,7 +48,7 @@
     <dimen name="workspace_page_indicator_overlap_workspace">0dp</dimen>
 
 <!-- Drop target bar -->
-    <dimen name="dynamic_grid_drop_target_size">48dp</dimen>
+    <dimen name="dynamic_grid_drop_target_size">52dp</dimen>
     <dimen name="drop_target_vertical_gap">20dp</dimen>
 
 <!-- App Widget resize frame -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6f7d727d7c..c3476c4018 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -264,9 +264,8 @@
 
     <!-- Drop targets -->
     <style name="DropTargetButtonBase" parent="@android:style/TextAppearance.DeviceDefault">
-        <item name="android:drawablePadding">7.5dp</item>
-        <item name="android:paddingLeft">16dp</item>
-        <item name="android:paddingRight">16dp</item>
+        <item name="android:drawablePadding">8dp</item>
+        <item name="android:padding">16dp</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:textSize">@dimen/drop_target_text_size</item>
         <item name="android:singleLine">true</item>
diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
index 13bf437cce..d1cb5b8394 100644
--- a/src/com/android/launcher3/ButtonDropTarget.java
+++ b/src/com/android/launcher3/ButtonDropTarget.java
@@ -121,19 +121,11 @@ public abstract class ButtonDropTarget extends TextView
     }
 
     protected void setDrawable(int resId) {
-        mDrawable = getContext().getDrawable(resId).mutate();
-        mDrawable.setBounds(0, 0, mDrawableSize, mDrawableSize);
-        setDrawable(mDrawable);
-    }
-
-    private void setDrawable(Drawable drawable) {
         // We do not set the drawable in the xml as that inflates two drawables corresponding to
         // drawableLeft and drawableStart.
-        if (mTextVisible) {
-            setCompoundDrawablesRelative(drawable, null, null, null);
-        } else {
-            setCompoundDrawablesRelative(null, drawable, null, null);
-        }
+        mDrawable = getContext().getDrawable(resId).mutate();
+        mDrawable.setBounds(0, 0, mDrawableSize, mDrawableSize);
+        setCompoundDrawablesRelative(mDrawable, null, null, null);
     }
 
     public void setDropTargetBar(DropTargetBar dropTargetBar) {
@@ -334,7 +326,7 @@ public abstract class ButtonDropTarget extends TextView
         if (mTextVisible != isVisible || !TextUtils.equals(newText, getText())) {
             mTextVisible = isVisible;
             setText(newText);
-            setDrawable(mDrawable);
+            setCompoundDrawablesRelative(mDrawable, null, null, null);
         }
     }
 
-- 
GitLab


From 9cd63c97cecba6e135d69c3034e43afef466ed0c Mon Sep 17 00:00:00 2001
From: Pinyao Ting <pinyaoting@google.com>
Date: Wed, 16 Jun 2021 17:51:39 +0000
Subject: [PATCH 1422/1664] Prevents a ConcurrentModificationException in
 Widget

InvariantDeviceProfile.supportedProfiles can be modified in respect to
configuration changes. This CL ensures the list was cloned before access
to prevent ConcurrentModificationException

Bug: 191231591
Test: manual
Change-Id: I123458dcfe99af4babca2cf73733e3d2af0fad3c
---
 .../widget/LauncherAppWidgetProviderInfoTest.java      |  9 +++++++--
 src/com/android/launcher3/InvariantDeviceProfile.java  | 10 +++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/robolectric_tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java b/robolectric_tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java
index c7286e5676..2d87957cf7 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java
@@ -36,6 +36,10 @@ import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 @RunWith(RobolectricTestRunner.class)
 public final class LauncherAppWidgetProviderInfoTest {
 
@@ -234,10 +238,11 @@ public final class LauncherAppWidgetProviderInfoTest {
         Mockito.when(profile.getCellSize()).thenReturn(new Point(CELL_SIZE, CELL_SIZE));
 
         InvariantDeviceProfile idp = new InvariantDeviceProfile();
-        idp.supportedProfiles.add(profile);
+        List<DeviceProfile> supportedProfiles = new ArrayList<>(idp.supportedProfiles);
+        supportedProfiles.add(profile);
+        idp.supportedProfiles = Collections.unmodifiableList(supportedProfiles);
         idp.numColumns = NUM_OF_COLS;
         idp.numRows = NUM_OF_ROWS;
         return idp;
     }
-
 }
diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index 318dde1ecc..29a0223612 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -140,7 +140,10 @@ public class InvariantDeviceProfile {
     public int defaultLayoutId;
     int demoModeLayoutId;
 
-    public final List<DeviceProfile> supportedProfiles = new ArrayList<>();
+    /**
+     * An immutable list of supported profiles.
+     */
+    public List<DeviceProfile> supportedProfiles = Collections.EMPTY_LIST;
 
     @Nullable public DevicePaddings devicePaddings;
 
@@ -322,10 +325,10 @@ public class InvariantDeviceProfile {
         // Supported overrides: numRows, numColumns, iconSize
         applyPartnerDeviceProfileOverrides(context, metrics);
 
-        supportedProfiles.clear();
+        final List<DeviceProfile> localSupportedProfiles = new ArrayList<>();
         defaultWallpaperSize = new Point(displayInfo.currentSize);
         for (WindowBounds bounds : displayInfo.supportedBounds) {
-            supportedProfiles.add(new DeviceProfile.Builder(context, this, displayInfo)
+            localSupportedProfiles.add(new DeviceProfile.Builder(context, this, displayInfo)
                     .setUseTwoPanels(isSplitDisplay)
                     .setWindowBounds(bounds).build());
 
@@ -343,6 +346,7 @@ public class InvariantDeviceProfile {
             defaultWallpaperSize.x =
                     Math.max(defaultWallpaperSize.x, Math.round(parallaxFactor * displayWidth));
         }
+        supportedProfiles = Collections.unmodifiableList(localSupportedProfiles);
 
         ComponentName cn = new ComponentName(context.getPackageName(), getClass().getName());
         defaultWidgetPadding = AppWidgetHostView.getDefaultPaddingForWidget(context, cn, null);
-- 
GitLab


From d04a92d1ed318eaa83c2b2d02167f1a807f7b18e Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Wed, 16 Jun 2021 09:46:25 -0500
Subject: [PATCH 1423/1664] Refactor FolderInsetAnimationCallback to be used
 with any view

- Update ic_corp_off icon to outline
- Remove shadow from work toggle
- Translate work fab when keyboard is shown

Screenshot: https://screenshot.googleplex.com/593tEg7bE4kSS4y

Bug: 191251404
Bug: 191250785
Test: local
Change-Id: Ie7dddfd17eb90575a1e1f67e281070dd8d268f8d
---
 res/drawable/ic_corp_off.xml                  |  13 +-
 ...card_btn.xml => rounded_action_button.xml} |   6 +-
 res/layout/work_apps_edu.xml                  |   3 +-
 res/layout/work_apps_paused.xml               |   2 +-
 res/layout/work_mode_fab.xml                  |   1 -
 res/values/dimens.xml                         |   7 +-
 .../allapps/AllAppsContainerView.java         |   5 +-
 .../launcher3/allapps/WorkModeSwitch.java     |  24 ++++
 .../anim/KeyboardInsetAnimationCallback.java  |  71 ++++++++++
 .../launcher3/config/FeatureFlags.java        |   3 +
 src/com/android/launcher3/folder/Folder.java  | 128 ++++++------------
 .../launcher3/util/OnboardingPrefs.java       |  13 +-
 12 files changed, 170 insertions(+), 106 deletions(-)
 rename res/drawable/{work_card_btn.xml => rounded_action_button.xml} (84%)
 create mode 100644 src/com/android/launcher3/anim/KeyboardInsetAnimationCallback.java

diff --git a/res/drawable/ic_corp_off.xml b/res/drawable/ic_corp_off.xml
index 62a978741d..117258e3bd 100644
--- a/res/drawable/ic_corp_off.xml
+++ b/res/drawable/ic_corp_off.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,10 +15,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0"
-    android:tint="?android:attr/textColorHint" >
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/textColorHint">
     <path
-        android:pathData="M22 7.95c.05-1.11-.84-2-1.95-1.95H16V3.95c0-1.11-.84-2-1.95-1.95h-4C8.94 1.95 8 2.84 8 3.95v.32l14 14V7.95zM14 6h-4V4h4v2zm7.54 14.28l-7.56-7.56v.01l-1.7-1.7h.01L7.21 5.95 3.25 1.99 1.99 3.27 4.69 6h-.64c-1.11 0-1.99.86-1.99 1.97l-.01 11.02c0 1.11.89 2.01 2 2.01h15.64l2.05 2.02L23 21.75l-1.46-1.47z"
-        android:fillColor="@android:color/white"/>
+        android:fillColor="@android:color/white"
+        android:pathData="M20,6h-4L16,4c0,-1.11 -0.89,-2 -2,-2h-4c-1.11,0 -2,0.89 -2,2v1.17L10.83,8L20,8v9.17l1.98,1.98c0,-0.05 0.02,-0.1 0.02,-0.16L22,8c0,-1.11 -0.89,-2 -2,-2zM14,6h-4L10,4h4v2zM19,19L8,8 6,6 2.81,2.81 1.39,4.22 3.3,6.13C2.54,6.41 2.01,7.14 2.01,8L2,19c0,1.11 0.89,2 2,2h14.17l1.61,1.61 1.41,-1.41 -0.37,-0.37L19,19zM4,19L4,8h1.17l11,11L4,19z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/work_card_btn.xml b/res/drawable/rounded_action_button.xml
similarity index 84%
rename from res/drawable/work_card_btn.xml
rename to res/drawable/rounded_action_button.xml
index 3c9391912a..0c8755f66c 100644
--- a/res/drawable/work_card_btn.xml
+++ b/res/drawable/rounded_action_button.xml
@@ -18,10 +18,10 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
     android:shape="rectangle">
-    <corners android:radius="@dimen/work_edu_card_margin" />
+    <corners android:radius="@dimen/rounded_button_radius" />
     <stroke android:width="1dp" android:color="?androidprv:attr/colorAccentPrimaryVariant" />
     <padding
-        android:left="@dimen/work_fab_radius"
-        android:right="@dimen/work_fab_radius" />
+        android:left="@dimen/rounded_button_padding"
+        android:right="@dimen/rounded_button_padding" />
 </shape>
 
diff --git a/res/layout/work_apps_edu.xml b/res/layout/work_apps_edu.xml
index ffbf962d35..97feb23745 100644
--- a/res/layout/work_apps_edu.xml
+++ b/res/layout/work_apps_edu.xml
@@ -47,7 +47,8 @@
             android:textColor="?attr/workProfileOverlayTextColor"
             android:text="@string/work_profile_edu_accept"
             android:textAlignment="center"
-            android:background="@drawable/work_card_btn"
+            android:background="@drawable/rounded_action_button"
+
             android:textSize="14sp" />
     </LinearLayout>
 </com.android.launcher3.allapps.WorkEduCard>
\ No newline at end of file
diff --git a/res/layout/work_apps_paused.xml b/res/layout/work_apps_paused.xml
index 14dcb8c360..38192561fe 100644
--- a/res/layout/work_apps_paused.xml
+++ b/res/layout/work_apps_paused.xml
@@ -48,6 +48,6 @@
         android:textColor="?attr/workProfileOverlayTextColor"
         android:text="@string/work_apps_enable_btn_text"
         android:textAlignment="center"
-        android:background="@drawable/work_card_btn"
+        android:background="@drawable/rounded_action_button"
         android:textSize="14sp" />
 </com.android.launcher3.allapps.WorkPausedCard>
\ No newline at end of file
diff --git a/res/layout/work_mode_fab.xml b/res/layout/work_mode_fab.xml
index 4209192cca..1771d37def 100644
--- a/res/layout/work_mode_fab.xml
+++ b/res/layout/work_mode_fab.xml
@@ -25,7 +25,6 @@
     android:background="@drawable/work_apps_toggle_background"
     android:drawablePadding="16dp"
     android:drawableStart="@drawable/ic_corp_off"
-    android:elevation="10dp"
     android:layout_marginBottom="@dimen/work_fab_margin"
     android:layout_marginEnd="@dimen/work_fab_margin"
     android:text="@string/work_apps_pause_btn_text" />
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 12f50e50b9..481b3b1435 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -120,11 +120,16 @@
 <!-- Floating action button inside work tab to toggle work profile -->
     <dimen name="work_fab_height">48dp</dimen>
     <dimen name="work_fab_radius">24dp</dimen>
-    <dimen name="work_fab_margin">18dp</dimen>
+    <dimen name="work_fab_margin">16dp</dimen>
     <dimen name="work_profile_footer_padding">20dp</dimen>
     <dimen name="work_profile_footer_text_size">16sp</dimen>
     <dimen name="work_edu_card_margin">16dp</dimen>
 
+    <!-- rounded button shown inside card views, and snack bars  -->
+    <dimen name="rounded_button_height">32dp</dimen>
+    <dimen name="rounded_button_radius">16dp</dimen>
+    <dimen name="rounded_button_padding">8dp</dimen>
+
 
     <!-- Widget tray -->
     <dimen name="widget_cell_vertical_padding">8dp</dimen>
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 7003df10c2..90bb5c855a 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -132,7 +132,6 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
     private ScrimView mScrimView;
     private int mHeaderColor;
 
-
     public AllAppsContainerView(Context context) {
         this(context, null);
     }
@@ -572,6 +571,10 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         return mViewPager == null ? getActiveRecyclerView() : mViewPager;
     }
 
+    public int getCurrentPage() {
+        return mViewPager != null ? mViewPager.getCurrentPage() : AdapterHolder.MAIN;
+    }
+
     /**
      * Handles selection on focused view and returns success
      */
diff --git a/src/com/android/launcher3/allapps/WorkModeSwitch.java b/src/com/android/launcher3/allapps/WorkModeSwitch.java
index 866694fdca..31f0c4fc86 100644
--- a/src/com/android/launcher3/allapps/WorkModeSwitch.java
+++ b/src/com/android/launcher3/allapps/WorkModeSwitch.java
@@ -18,6 +18,7 @@ package com.android.launcher3.allapps;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
 import android.content.Context;
+import android.graphics.Insets;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.Process;
@@ -26,12 +27,15 @@ import android.os.UserManager;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowInsets;
 import android.widget.Button;
 
+import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 
 import com.android.launcher3.Insettable;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.anim.KeyboardInsetAnimationCallback;
 import com.android.launcher3.pm.UserCache;
 
 /**
@@ -42,6 +46,10 @@ public class WorkModeSwitch extends Button implements Insettable, View.OnClickLi
     private Rect mInsets = new Rect();
     private boolean mWorkEnabled;
 
+
+    @Nullable
+    private KeyboardInsetAnimationCallback mKeyboardInsetAnimationCallback;
+
     public WorkModeSwitch(Context context) {
         this(context, null, 0);
     }
@@ -58,6 +66,10 @@ public class WorkModeSwitch extends Button implements Insettable, View.OnClickLi
     protected void onFinishInflate() {
         super.onFinishInflate();
         setOnClickListener(this);
+        if (Utilities.ATLEAST_R) {
+            mKeyboardInsetAnimationCallback = new KeyboardInsetAnimationCallback(this);
+            setWindowInsetsAnimationCallback(mKeyboardInsetAnimationCallback);
+        }
     }
 
     @Override
@@ -117,4 +129,16 @@ public class WorkModeSwitch extends Button implements Insettable, View.OnClickLi
         }
         return showConfirm;
     }
+
+    @Override
+    public WindowInsets onApplyWindowInsets(WindowInsets insets) {
+        if (Utilities.ATLEAST_R) {
+            setTranslationY(0);
+            if (insets.isVisible(WindowInsets.Type.ime())) {
+                Insets keyboardInsets = insets.getInsets(WindowInsets.Type.ime());
+                setTranslationY(mInsets.bottom - keyboardInsets.bottom);
+            }
+        }
+        return insets;
+    }
 }
diff --git a/src/com/android/launcher3/anim/KeyboardInsetAnimationCallback.java b/src/com/android/launcher3/anim/KeyboardInsetAnimationCallback.java
new file mode 100644
index 0000000000..ef4ada3cd9
--- /dev/null
+++ b/src/com/android/launcher3/anim/KeyboardInsetAnimationCallback.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.anim;
+
+import android.os.Build;
+import android.view.View;
+import android.view.WindowInsets;
+import android.view.WindowInsetsAnimation;
+
+import androidx.annotation.RequiresApi;
+
+import com.android.launcher3.Utilities;
+
+import java.util.List;
+
+/**
+ * Callback that animates views above the IME
+ */
+@RequiresApi(api = Build.VERSION_CODES.R)
+public class KeyboardInsetAnimationCallback extends WindowInsetsAnimation.Callback {
+    private final View mView;
+
+    private float mInitialTranslation;
+    private float mTerminalTranslation;
+
+    public KeyboardInsetAnimationCallback(View view) {
+        super(DISPATCH_MODE_STOP);
+        mView = view;
+    }
+
+    @Override
+    public void onPrepare(WindowInsetsAnimation animation) {
+        mInitialTranslation = mView.getTranslationY();
+    }
+
+
+    @Override
+    public WindowInsets onProgress(WindowInsets windowInsets, List<WindowInsetsAnimation> list) {
+        if (list.size() == 0) {
+            mView.setTranslationY(mInitialTranslation);
+            return windowInsets;
+        }
+        float progress = list.get(0).getInterpolatedFraction();
+
+        mView.setTranslationY(
+                Utilities.mapRange(progress, mInitialTranslation, mTerminalTranslation));
+
+        return windowInsets;
+    }
+
+    @Override
+    public WindowInsetsAnimation.Bounds onStart(WindowInsetsAnimation animation,
+            WindowInsetsAnimation.Bounds bounds) {
+        mTerminalTranslation = mView.getTranslationY();
+        mView.setTranslationY(mInitialTranslation);
+        return super.onStart(animation, bounds);
+    }
+}
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 0e710b7898..00ce80fc72 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -99,6 +99,9 @@ public final class FeatureFlags {
     public static final BooleanFlag ENABLE_DEVICE_SEARCH = new DeviceFlag(
             "ENABLE_DEVICE_SEARCH", true, "Allows on device search in all apps");
 
+    public static final BooleanFlag IME_STICKY_SNACKBAR_EDU = getDebugFlag(
+            "IME_STICKY_SNACKBAR_EDU", true, "Show sticky IME edu in AllApps");
+
     public static final BooleanFlag ENABLE_PEOPLE_TILE_PREVIEW = getDebugFlag(
             "ENABLE_PEOPLE_TILE_PREVIEW", false,
             "Experimental: Shows conversation shortcuts on home screen as search results");
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index 5dcd75a364..22bb56c472 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -17,7 +17,6 @@
 package com.android.launcher3.folder;
 
 import static android.text.TextUtils.isEmpty;
-import static android.view.WindowInsetsAnimation.Callback.DISPATCH_MODE_STOP;
 
 import static com.android.launcher3.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY;
 import static com.android.launcher3.LauncherState.NORMAL;
@@ -39,7 +38,6 @@ import android.graphics.Path;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
-import android.os.Build;
 import android.text.InputType;
 import android.text.Selection;
 import android.text.TextUtils;
@@ -54,15 +52,12 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewDebug;
 import android.view.WindowInsets;
-import android.view.WindowInsetsAnimation;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.animation.AnimationUtils;
 import android.view.inputmethod.EditorInfo;
 import android.widget.TextView;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
 import androidx.core.content.res.ResourcesCompat;
 
 import com.android.launcher3.AbstractFloatingView;
@@ -83,6 +78,7 @@ import com.android.launcher3.Utilities;
 import com.android.launcher3.Workspace.ItemOperator;
 import com.android.launcher3.accessibility.AccessibleDragListenerAdapter;
 import com.android.launcher3.accessibility.FolderAccessibilityHelper;
+import com.android.launcher3.anim.KeyboardInsetAnimationCallback;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.dragndrop.DragController;
 import com.android.launcher3.dragndrop.DragController.DragListener;
@@ -164,9 +160,9 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
     private final Alarm mReorderAlarm = new Alarm();
     private final Alarm mOnExitAlarm = new Alarm();
     private final Alarm mOnScrollHintAlarm = new Alarm();
-    @Thunk final Alarm mScrollPauseAlarm = new Alarm();
+    final Alarm mScrollPauseAlarm = new Alarm();
 
-    @Thunk final ArrayList<View> mItemsInReadingOrder = new ArrayList<View>();
+    final ArrayList<View> mItemsInReadingOrder = new ArrayList<View>();
 
     private AnimatorSet mCurrentAnimator;
     private boolean mIsAnimatingClosed = false;
@@ -182,9 +178,11 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
     private CharSequence mFromTitle;
     private FromState mFromLabelState;
 
-    @Thunk FolderIcon mFolderIcon;
+    @Thunk
+    FolderIcon mFolderIcon;
 
-    @Thunk FolderPagedView mContent;
+    @Thunk
+    FolderPagedView mContent;
     public FolderNameEditText mFolderName;
     private PageIndicatorDots mPageIndicator;
 
@@ -192,7 +190,8 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
     private int mFooterHeight;
 
     // Cell ranks used for drag and drop
-    @Thunk int mTargetRank, mPrevTargetRank, mEmptyCellRank;
+    @Thunk
+    int mTargetRank, mPrevTargetRank, mEmptyCellRank;
 
     private Path mClipPath;
 
@@ -203,7 +202,8 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
                     @ViewDebug.IntToString(from = STATE_ANIMATING, to = "STATE_ANIMATING"),
                     @ViewDebug.IntToString(from = STATE_OPEN, to = "STATE_OPEN"),
             })
-    @Thunk int mState = STATE_NONE;
+    @Thunk
+    int mState = STATE_NONE;
     @ViewDebug.ExportedProperty(category = "launcher")
     private boolean mRearrangeOnClose = false;
     boolean mItemsInvalidated = false;
@@ -221,12 +221,15 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
     // Folder scrolling
     private int mScrollAreaOffset;
 
-    @Thunk int mScrollHintDir = SCROLL_NONE;
-    @Thunk int mCurrentScrollDir = SCROLL_NONE;
+    @Thunk
+    int mScrollHintDir = SCROLL_NONE;
+    @Thunk
+    int mCurrentScrollDir = SCROLL_NONE;
 
     private StatsLogManager mStatsLogManager;
 
-    @Nullable private FolderWindowInsetsAnimationCallback mFolderWindowInsetsAnimationCallback;
+    @Nullable
+    private KeyboardInsetAnimationCallback mKeyboardInsetAnimationCallback;
 
     private GradientDrawable mBackground;
 
@@ -234,7 +237,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
      * Used to inflate the Workspace from XML.
      *
      * @param context The application's context.
-     * @param attrs The attributes set containing the Workspace's customization values.
+     * @param attrs   The attributes set containing the Workspace's customization values.
      */
     public Folder(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -246,7 +249,8 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         mStatsLogManager = StatsLogManager.newInstance(context);
         // We need this view to be focusable in touch mode so that when text editing of the folder
         // name is complete, we have something to focus on, thus hiding the cursor and giving
-        // reliable behavior when clicking the text field (since it will always gain focus on click).
+        // reliable behavior when clicking the text field (since it will always gain focus on
+        // click).
         setFocusableInTouchMode(true);
 
     }
@@ -286,10 +290,8 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         mFooterHeight = getResources().getDimensionPixelSize(R.dimen.folder_label_height);
 
         if (Utilities.ATLEAST_R) {
-            mFolderWindowInsetsAnimationCallback =
-                    new FolderWindowInsetsAnimationCallback(DISPATCH_MODE_STOP, this);
-
-            setWindowInsetsAnimationCallback(mFolderWindowInsetsAnimationCallback);
+            mKeyboardInsetAnimationCallback = new KeyboardInsetAnimationCallback(this);
+            setWindowInsetsAnimationCallback(mKeyboardInsetAnimationCallback);
         }
     }
 
@@ -311,14 +313,14 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
             if (options.isAccessibleDrag) {
                 mDragController.addDragListener(new AccessibleDragListenerAdapter(
                         mContent, FolderAccessibilityHelper::new) {
-                            @Override
-                            protected void enableAccessibleDrag(boolean enable) {
-                                super.enableAccessibleDrag(enable);
-                                mFooter.setImportantForAccessibility(enable
-                                        ? IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS
-                                        : IMPORTANT_FOR_ACCESSIBILITY_AUTO);
-                            }
-                        });
+                    @Override
+                    protected void enableAccessibleDrag(boolean enable) {
+                        super.enableAccessibleDrag(enable);
+                        mFooter.setImportantForAccessibility(enable
+                                ? IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS
+                                : IMPORTANT_FOR_ACCESSIBILITY_AUTO);
+                    }
+                });
             }
 
             mLauncherDelegate.beginDragShared(v, this, options);
@@ -539,7 +541,6 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
      *
      * @param activityContext The main ActivityContext in which to inflate this Folder. It must also
      *                        be an instance or ContextWrapper around the Launcher activity context.
-     *
      * @return A new UserFolder.
      */
     @SuppressLint("InflateParams")
@@ -677,6 +678,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
                 mFolderIcon.setIconVisible(false);
                 mFolderIcon.drawLeaveBehindIfExists();
             }
+
             @Override
             public void onAnimationEnd(Animator animation) {
                 mState = STATE_OPEN;
@@ -691,7 +693,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
             int footerWidth = mContent.getDesiredWidth()
                     - mFooter.getPaddingLeft() - mFooter.getPaddingRight();
 
-            float textWidth =  mFolderName.getPaint().measureText(mFolderName.getText().toString());
+            float textWidth = mFolderName.getPaint().measureText(mFolderName.getText().toString());
             float translation = (footerWidth - textWidth) / 2;
             mFolderName.setTranslationX(mContent.mIsRtl ? -translation : translation);
             mPageIndicator.prepareEntryAnimation();
@@ -705,9 +707,9 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
                 @Override
                 public void onAnimationEnd(Animator animation) {
                     mFolderName.animate().setDuration(FOLDER_NAME_ANIMATION_DURATION)
-                        .translationX(0)
-                        .setInterpolator(AnimationUtils.loadInterpolator(
-                                getContext(), android.R.interpolator.fast_out_slow_in));
+                            .translationX(0)
+                            .setInterpolator(AnimationUtils.loadInterpolator(
+                                    getContext(), android.R.interpolator.fast_out_slow_in));
                     mPageIndicator.playEntryAnimation();
 
                     if (updateAnimationFlag) {
@@ -794,8 +796,8 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
 
             @Override
             public void onAnimationEnd(Animator animation) {
-                if (Utilities.ATLEAST_R && mFolderWindowInsetsAnimationCallback != null) {
-                    setWindowInsetsAnimationCallback(mFolderWindowInsetsAnimationCallback);
+                if (Utilities.ATLEAST_R && mKeyboardInsetAnimationCallback != null) {
+                    setWindowInsetsAnimationCallback(mKeyboardInsetAnimationCallback);
                 }
                 closeComplete(true);
                 announceAccessibilityChanges();
@@ -1109,7 +1111,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         sTempRect.set(mActivityContext.getFolderBoundingBox());
         int left = Utilities.boundToRange(centeredLeft, sTempRect.left, sTempRect.right - width);
         int top = Utilities.boundToRange(centeredTop, sTempRect.top, sTempRect.bottom - height);
-        int[] inOutPosition = new int[] {left, top};
+        int[] inOutPosition = new int[]{left, top};
         mActivityContext.updateOpenFolderPosition(inOutPosition, sTempRect, width, height);
         left = inOutPosition[0];
         top = inOutPosition[1];
@@ -1193,7 +1195,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         return mInfo.contents.size();
     }
 
-    @Thunk void replaceFolderWithFinalItem() {
+    void replaceFolderWithFinalItem() {
         mLauncherDelegate.replaceFolderWithFinalItem(this);
         mDestroyed = true;
     }
@@ -1352,6 +1354,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
             v.setVisibility(INVISIBLE);
         }
     }
+
     public void showItem(WorkspaceItemInfo info) {
         View v = getViewForInfo(info);
         if (v != null) {
@@ -1646,55 +1649,4 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
 
         return windowBottomPx - folderBottomPx;
     }
-
-    /** Callback that animates a folder sliding up above the ime. */
-    @RequiresApi(api = Build.VERSION_CODES.R)
-    private static class FolderWindowInsetsAnimationCallback
-            extends WindowInsetsAnimation.Callback {
-
-        private final Folder mFolder;
-        float mFolderTranslationStart;
-        float mFolderTranslationEnd;
-
-        FolderWindowInsetsAnimationCallback(int dispatchMode, Folder folder) {
-            super(dispatchMode);
-
-            mFolder = folder;
-        }
-
-        @Override
-        public void onPrepare(@NonNull WindowInsetsAnimation animation) {
-            mFolderTranslationStart = mFolder.getTranslationY();
-        }
-
-        @NonNull
-        @Override
-        public WindowInsetsAnimation.Bounds onStart(
-                @NonNull WindowInsetsAnimation animation,
-                @NonNull WindowInsetsAnimation.Bounds bounds) {
-            mFolderTranslationEnd = mFolder.getTranslationY();
-
-            mFolder.setTranslationY(mFolderTranslationStart);
-
-            return super.onStart(animation, bounds);
-        }
-
-        @NonNull
-        @Override
-        public WindowInsets onProgress(@NonNull WindowInsets windowInsets,
-                @NonNull List<WindowInsetsAnimation> list) {
-            if (list.size() == 0) {
-                mFolder.setTranslationY(0);
-
-                return windowInsets;
-            }
-            float progress = list.get(0).getInterpolatedFraction();
-
-            mFolder.setTranslationY(
-                    Utilities.mapRange(progress, mFolderTranslationStart, mFolderTranslationEnd));
-
-            return windowInsets;
-        }
-
-    }
 }
diff --git a/src/com/android/launcher3/util/OnboardingPrefs.java b/src/com/android/launcher3/util/OnboardingPrefs.java
index 2e279fa7d3..c395d6ced3 100644
--- a/src/com/android/launcher3/util/OnboardingPrefs.java
+++ b/src/com/android/launcher3/util/OnboardingPrefs.java
@@ -37,6 +37,7 @@ public class OnboardingPrefs<T extends Launcher> {
     public static final String HOTSEAT_DISCOVERY_TIP_COUNT = "launcher.hotseat_discovery_tip_count";
     public static final String HOTSEAT_LONGPRESS_TIP_SEEN = "launcher.hotseat_longpress_tip_seen";
     public static final String SEARCH_EDU_SEEN = "launcher.search_edu";
+    public static final String SEARCH_SNACKBAR_COUNT = "launcher.keyboard_snackbar_count";
 
     /**
      * Events that either have happened or have not (booleans).
@@ -47,23 +48,28 @@ public class OnboardingPrefs<T extends Launcher> {
             SEARCH_EDU_SEEN
     })
     @Retention(RetentionPolicy.SOURCE)
-    public @interface EventBoolKey {}
+    public @interface EventBoolKey {
+    }
 
     /**
      * Events that occur multiple times, which we count up to a max defined in {@link #MAX_COUNTS}.
      */
     @StringDef(value = {
             HOME_BOUNCE_COUNT,
-            HOTSEAT_DISCOVERY_TIP_COUNT
+            HOTSEAT_DISCOVERY_TIP_COUNT,
+            SEARCH_SNACKBAR_COUNT
     })
     @Retention(RetentionPolicy.SOURCE)
-    public @interface EventCountKey {}
+    public @interface EventCountKey {
+    }
 
     private static final Map<String, Integer> MAX_COUNTS;
+
     static {
         Map<String, Integer> maxCounts = new ArrayMap<>(4);
         maxCounts.put(HOME_BOUNCE_COUNT, 3);
         maxCounts.put(HOTSEAT_DISCOVERY_TIP_COUNT, 5);
+        maxCounts.put(SEARCH_SNACKBAR_COUNT, 3);
         MAX_COUNTS = Collections.unmodifiableMap(maxCounts);
     }
 
@@ -103,6 +109,7 @@ public class OnboardingPrefs<T extends Launcher> {
 
     /**
      * Add 1 to the given event count, if we haven't already reached the max count.
+     *
      * @return Whether we have now reached the max count.
      */
     public boolean incrementEventCount(@EventCountKey String eventKey) {
-- 
GitLab


From 7e31e9b2676fa7049125453469d867bf3887c7ef Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 16 Jun 2021 23:56:38 +0100
Subject: [PATCH 1424/1664] Modify AT_LEAST_S check to include SDK int

BuildCompat.isAtLeastS() in Launcher dependency only checks if the
code name is "S". In the recent version of Android, the code name has
changed to "REL".

Test: Open Widgets picker, expand Conversations and observe a preview
      layout is shown.
Fix: 191239040, 191216821
Change-Id: I6a6e647d4cb327d251bde3484ea2d2e79c0f86f5
---
 src/com/android/launcher3/Utilities.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index a2d86bc7fa..75f6278a47 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -122,7 +122,8 @@ public final class Utilities {
 
     public static final boolean ATLEAST_R = Build.VERSION.SDK_INT >= Build.VERSION_CODES.R;
 
-    public static final boolean ATLEAST_S = BuildCompat.isAtLeastS();
+    public static final boolean ATLEAST_S = BuildCompat.isAtLeastS()
+            || Build.VERSION.SDK_INT >= Build.VERSION_CODES.S;
 
     /**
      * Set on a motion event dispatched from the nav bar. See {@link MotionEvent#setEdgeFlags(int)}.
-- 
GitLab


From 71cefb593f99ab2d19d1b70335be8c7886040469 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 16 Jun 2021 23:18:28 +0100
Subject: [PATCH 1425/1664] Deduct padding from widget size only if padding has
 been inset

Test: Set the grid to 4x5 (without padding) and verify the min / max
      size sent to Conversation widget is expected.
Bug: 190498032
Change-Id: I8ef6e5d897ebd0e2ea9af4497b00059c8dfad70a
---
 src/com/android/launcher3/widget/util/WidgetSizes.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/widget/util/WidgetSizes.java b/src/com/android/launcher3/widget/util/WidgetSizes.java
index 5c8ea7299b..fcc0dde889 100644
--- a/src/com/android/launcher3/widget/util/WidgetSizes.java
+++ b/src/com/android/launcher3/widget/util/WidgetSizes.java
@@ -99,11 +99,13 @@ public final class WidgetSizes {
      */
     public static Bundle getWidgetSizeOptions(Context context, ComponentName provider, int spanX,
             int spanY) {
+        boolean shouldInsetWidgets =
+                LauncherAppState.getIDP(context).getDeviceProfile(context).shouldInsetWidgets();
         ArrayList<SizeF> sizes = getWidgetSizes(context, spanX, spanY);
         Rect padding = getDefaultPaddingForWidget(context, provider, null);
         float density = context.getResources().getDisplayMetrics().density;
-        float xPaddingDips = (padding.left + padding.right) / density;
-        float yPaddingDips = (padding.top + padding.bottom) / density;
+        float xPaddingDips = shouldInsetWidgets ? (padding.left + padding.right) / density : 0;
+        float yPaddingDips = shouldInsetWidgets ? (padding.top + padding.bottom) / density : 0;
 
         ArrayList<SizeF> paddedSizes = sizes.stream()
                 .map(size -> new SizeF(
-- 
GitLab


From bcd72a7b3244a447ba6639a434bf75c8ad391e41 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Wed, 16 Jun 2021 14:36:02 -0700
Subject: [PATCH 1426/1664] Fix broken app icon on restart during install.

Fixes: 186610233
Test: manual with backup/restart and restart during install
Change-Id: Ic64bd98758bc2e1a2a1562579cb25de02faa624c
---
 src/com/android/launcher3/model/PackageUpdatedTask.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/model/PackageUpdatedTask.java b/src/com/android/launcher3/model/PackageUpdatedTask.java
index 7bfa3ef481..3c0a54a586 100644
--- a/src/com/android/launcher3/model/PackageUpdatedTask.java
+++ b/src/com/android/launcher3/model/PackageUpdatedTask.java
@@ -212,7 +212,8 @@ public class PackageUpdatedTask extends BaseModelUpdateTask {
                         }
 
                         if (si.isPromise() && isNewApkAvailable) {
-                            boolean isTargetValid = true;
+                            boolean isTargetValid = !cn.getClassName().equals(
+                                    IconCache.EMPTY_CLASS_NAME);
                             if (si.itemType == Favorites.ITEM_TYPE_DEEP_SHORTCUT) {
                                 List<ShortcutInfo> shortcut =
                                         new ShortcutRequest(context, mUser)
@@ -225,7 +226,7 @@ public class PackageUpdatedTask extends BaseModelUpdateTask {
                                     si.updateFromDeepShortcutInfo(shortcut.get(0), context);
                                     infoUpdated = true;
                                 }
-                            } else if (!cn.getClassName().equals(IconCache.EMPTY_CLASS_NAME)) {
+                            } else if (isTargetValid) {
                                 isTargetValid = context.getSystemService(LauncherApps.class)
                                         .isActivityEnabled(cn, mUser);
                             }
-- 
GitLab


From 6f0e75740f9f9e4cc45b5e6871aa464600d2e646 Mon Sep 17 00:00:00 2001
From: Thiru Ramasamy <thiruram@google.com>
Date: Tue, 15 Jun 2021 18:46:30 -0700
Subject: [PATCH 1427/1664] Add logging for tapped on 'Turn on/off work apps'
 button in all apps

Bug: 190050582
Test: Manual
Change-Id: Ib83fba6dc9199ba40a500e0743c0e64cc4d4d0a0
---
 src/com/android/launcher3/allapps/WorkModeSwitch.java  | 4 ++++
 src/com/android/launcher3/allapps/WorkPausedCard.java  | 2 ++
 src/com/android/launcher3/logging/StatsLogManager.java | 8 +++++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/allapps/WorkModeSwitch.java b/src/com/android/launcher3/allapps/WorkModeSwitch.java
index 866694fdca..3680fb9948 100644
--- a/src/com/android/launcher3/allapps/WorkModeSwitch.java
+++ b/src/com/android/launcher3/allapps/WorkModeSwitch.java
@@ -15,6 +15,7 @@
  */
 package com.android.launcher3.allapps;
 
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TURN_OFF_WORK_APPS_TAP;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
 import android.content.Context;
@@ -31,6 +32,7 @@ import android.widget.Button;
 import androidx.annotation.RequiresApi;
 
 import com.android.launcher3.Insettable;
+import com.android.launcher3.Launcher;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.pm.UserCache;
 
@@ -92,6 +94,8 @@ public class WorkModeSwitch extends Button implements Insettable, View.OnClickLi
     public void onClick(View view) {
         if (Utilities.ATLEAST_P) {
             setEnabled(false);
+            Launcher.fromContext(getContext()).getStatsLogManager().logger().log(
+                    LAUNCHER_TURN_OFF_WORK_APPS_TAP);
             UI_HELPER_EXECUTOR.post(() -> setWorkProfileEnabled(getContext(), false));
         }
     }
diff --git a/src/com/android/launcher3/allapps/WorkPausedCard.java b/src/com/android/launcher3/allapps/WorkPausedCard.java
index 3955a9a9f2..7908b63ec2 100644
--- a/src/com/android/launcher3/allapps/WorkPausedCard.java
+++ b/src/com/android/launcher3/allapps/WorkPausedCard.java
@@ -15,6 +15,7 @@
  */
 package com.android.launcher3.allapps;
 
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TURN_ON_WORK_APPS_TAP;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
 import android.content.Context;
@@ -61,6 +62,7 @@ public class WorkPausedCard extends LinearLayout implements View.OnClickListener
     public void onClick(View view) {
         if (Utilities.ATLEAST_P) {
             setEnabled(false);
+            mLauncher.getStatsLogManager().logger().log(LAUNCHER_TURN_ON_WORK_APPS_TAP);
             UI_HELPER_EXECUTOR.post(() -> WorkModeSwitch.setWorkProfileEnabled(getContext(), true));
         }
     }
diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index 345a2ac594..ddff338510 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -479,7 +479,13 @@ public class StatsLogManager implements ResourceBasedOverride {
         LAUNCHER_THEMED_ICON_ENABLED(836),
 
         @UiEvent(doc = "User disabled themed icons option in wallpaper & style settings.")
-        LAUNCHER_THEMED_ICON_DISABLED(837)
+        LAUNCHER_THEMED_ICON_DISABLED(837),
+
+        @UiEvent(doc = "User tapped on 'Turn on work apps' button in all apps window.")
+        LAUNCHER_TURN_ON_WORK_APPS_TAP(838),
+
+        @UiEvent(doc = "User tapped on 'Turn off work apps' button in all apps window.")
+        LAUNCHER_TURN_OFF_WORK_APPS_TAP(839)
         ;
 
         // ADD MORE
-- 
GitLab


From 95b09f90675c487cdbdd56f23c896d73105c13bd Mon Sep 17 00:00:00 2001
From: Thiru Ramasamy <thiruram@google.com>
Date: Tue, 15 Jun 2021 16:33:35 -0700
Subject: [PATCH 1428/1664] Fixes duplicate logging for
 LAUNCHER_ALLAPPS_KEYBOARD_CLOSED events.

Bug: 178562918
Test: Manual
Change-Id: Id32b621c0f506bba4378f6f6b81d7cfece3cb373
---
 .../launcher3/util/UiThreadHelper.java        | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/com/android/launcher3/util/UiThreadHelper.java b/src/com/android/launcher3/util/UiThreadHelper.java
index cb721e68d0..0f40179f79 100644
--- a/src/com/android/launcher3/util/UiThreadHelper.java
+++ b/src/com/android/launcher3/util/UiThreadHelper.java
@@ -21,6 +21,7 @@ import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
+import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
@@ -42,15 +43,30 @@ public class UiThreadHelper {
     private static final int MSG_HIDE_KEYBOARD = 1;
     private static final int MSG_SET_ORIENTATION = 2;
     private static final int MSG_RUN_COMMAND = 3;
+    private static final String STATS_LOGGER_KEY = "STATS_LOGGER_KEY";
 
     @SuppressLint("NewApi")
     public static void hideKeyboardAsync(ActivityContext activityContext, IBinder token) {
         View root = activityContext.getDragLayer();
 
-        Message.obtain(HANDLER.get(root.getContext()),
-                MSG_HIDE_KEYBOARD, token).sendToTarget();
-        Launcher.cast(activityContext).getStatsLogManager().logger().log(
-                LAUNCHER_ALLAPPS_KEYBOARD_CLOSED);
+        // Since the launcher context cannot be accessed directly from callback, adding secondary
+        // message to log keyboard close event asynchronously.
+        Bundle mHideKeyboardLoggerMsg = new Bundle();
+        mHideKeyboardLoggerMsg.putParcelable(
+                STATS_LOGGER_KEY,
+                Message.obtain(
+                        HANDLER.get(root.getContext()),
+                        () -> Launcher.cast(activityContext)
+                                .getStatsLogManager()
+                                .logger()
+                                .log(LAUNCHER_ALLAPPS_KEYBOARD_CLOSED)
+                )
+        );
+
+        Message mHideKeyboardMsg = Message.obtain(HANDLER.get(root.getContext()), MSG_HIDE_KEYBOARD,
+                token);
+        mHideKeyboardMsg.setData(mHideKeyboardLoggerMsg);
+        mHideKeyboardMsg.sendToTarget();
     }
 
     public static void setOrientationAsync(Activity activity, int orientation) {
@@ -81,7 +97,11 @@ public class UiThreadHelper {
         public boolean handleMessage(Message message) {
             switch (message.what) {
                 case MSG_HIDE_KEYBOARD:
-                    mIMM.hideSoftInputFromWindow((IBinder) message.obj, 0);
+                    if (mIMM.hideSoftInputFromWindow((IBinder) message.obj, 0)) {
+                        // log keyboard close event only when keyboard is actually closed
+                        ((Message) message.getData().getParcelable(STATS_LOGGER_KEY))
+                                .sendToTarget();
+                    }
                     return true;
                 case MSG_SET_ORIENTATION:
                     ((Activity) message.obj).setRequestedOrientation(message.arg1);
-- 
GitLab


From 69af278f8ad850896e7c8d64f814c91d0752c036 Mon Sep 17 00:00:00 2001
From: Stevie Kideckel <kideckel@google.com>
Date: Thu, 17 Jun 2021 10:54:49 +0000
Subject: [PATCH 1429/1664] Refresh widgets in the model when packages change

Fix: 191163748
Test: local sample app
Change-Id: Ic09ad11cabf6efa471fb6e685cb255c4a17493ee
---
 .../launcher3/model/PackageUpdatedTask.java   |  9 ++++
 .../android/launcher3/model/WidgetsModel.java | 53 +++++++++++++------
 2 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/src/com/android/launcher3/model/PackageUpdatedTask.java b/src/com/android/launcher3/model/PackageUpdatedTask.java
index 7bfa3ef481..5a263bd61b 100644
--- a/src/com/android/launcher3/model/PackageUpdatedTask.java
+++ b/src/com/android/launcher3/model/PackageUpdatedTask.java
@@ -29,6 +29,7 @@ import android.os.UserHandle;
 import android.os.UserManager;
 import android.util.Log;
 
+import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.LauncherSettings.Favorites;
@@ -123,6 +124,14 @@ public class PackageUpdatedTask extends BaseModelUpdateTask {
                         activitiesLists.put(
                                 packages[i], appsList.updatePackage(context, packages[i], mUser));
                         app.getWidgetCache().removePackage(packages[i], mUser);
+
+                        // The update may have changed which shortcuts/widgets are available.
+                        // Refresh the widgets for the package if we have an activity running.
+                        Launcher launcher = Launcher.ACTIVITY_TRACKER.getCreatedActivity();
+                        if (launcher != null) {
+                            launcher.refreshAndBindWidgetsForPackageUser(
+                                    new PackageUserKey(packages[i], mUser));
+                        }
                     }
                 }
                 // Since package was just updated, the target must be available now.
diff --git a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
index 51c5b12b6e..a66b031719 100644
--- a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
+++ b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
@@ -15,6 +15,7 @@ import android.os.UserHandle;
 import android.util.Log;
 
 import androidx.annotation.Nullable;
+import androidx.collection.ArrayMap;
 
 import com.android.launcher3.AppFilter;
 import com.android.launcher3.InvariantDeviceProfile;
@@ -37,6 +38,7 @@ import com.android.launcher3.widget.picker.WidgetsDiffReporter;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -158,34 +160,29 @@ public class WidgetsModel {
             Log.d(TAG, "addWidgetsAndShortcuts, widgetsShortcuts#=" + rawWidgetsShortcuts.size());
         }
 
-        // Temporary list for {@link PackageItemInfos} to avoid having to go through
+        // Temporary cache for {@link PackageItemInfos} to avoid having to go through
         // {@link mPackageItemInfos} to locate the key to be used for {@link #mWidgetsList}
-        HashMap<WidgetPackageOrCategoryKey, PackageItemInfo> tmpPackageItemInfos = new HashMap<>();
+        PackageItemInfoCache packageItemInfoCache = new PackageItemInfoCache();
 
-        // Clear the lists only if this is an update on all widgets and shortcuts. If packageUser
-        // isn't null, only updates the shortcuts and widgets for the app represented in
-        // packageUser.
         if (packageUser == null) {
+            // Clear the list if this is an update on all widgets and shortcuts.
             mWidgetsList.clear();
+        } else {
+            // Otherwise, only clear the widgets and shortcuts for the changed package.
+            mWidgetsList.remove(
+                    packageItemInfoCache.getOrCreate(new WidgetPackageOrCategoryKey(packageUser)));
         }
+
         // add and update.
         mWidgetsList.putAll(rawWidgetsShortcuts.stream()
                 .filter(new WidgetValidityCheck(app))
-                .collect(Collectors.groupingBy(item -> {
-                    WidgetPackageOrCategoryKey packageUserKey = getWidgetPackageOrCategoryKey(item);
-                    PackageItemInfo pInfo = tmpPackageItemInfos.get(packageUserKey);
-                    if (pInfo == null) {
-                        pInfo = new PackageItemInfo(item.componentName.getPackageName(),
-                                packageUserKey.mCategory);
-                        pInfo.user = item.user;
-                        tmpPackageItemInfos.put(packageUserKey,  pInfo);
-                    }
-                    return pInfo;
-                })));
+                .collect(Collectors.groupingBy(item ->
+                        packageItemInfoCache.getOrCreate(getWidgetPackageOrCategoryKey(item))
+                )));
 
         // Update each package entry
         IconCache iconCache = app.getIconCache();
-        for (PackageItemInfo p : tmpPackageItemInfos.values()) {
+        for (PackageItemInfo p : packageItemInfoCache.values()) {
             iconCache.getTitleAndIconForApp(p, true /* userLowResIcon */);
         }
     }
@@ -289,6 +286,10 @@ public class WidgetsModel {
         public final UserHandle mUser;
         private final int mHashCode;
 
+        WidgetPackageOrCategoryKey(PackageUserKey key) {
+            this(key.mPackageName, key.mUser);
+        }
+
         WidgetPackageOrCategoryKey(String packageName, UserHandle user) {
             this(packageName,  PackageItemInfo.NO_CATEGORY, user);
         }
@@ -310,4 +311,22 @@ public class WidgetsModel {
             return mHashCode;
         }
     }
+
+    private static final class PackageItemInfoCache {
+        private final Map<WidgetPackageOrCategoryKey, PackageItemInfo> mMap = new ArrayMap<>();
+
+        PackageItemInfo getOrCreate(WidgetPackageOrCategoryKey key) {
+            PackageItemInfo pInfo = mMap.get(key);
+            if (pInfo == null) {
+                pInfo = new PackageItemInfo(key.mPackage, key.mCategory);
+                pInfo.user = key.mUser;
+                mMap.put(key,  pInfo);
+            }
+            return pInfo;
+        }
+
+        Collection<PackageItemInfo> values() {
+            return mMap.values();
+        }
+    }
 }
\ No newline at end of file
-- 
GitLab


From 360489ff5100fe1fd53d4b69b46df6176e94dd61 Mon Sep 17 00:00:00 2001
From: zakcohen <zakcohen@google.com>
Date: Thu, 17 Jun 2021 09:46:56 -0700
Subject: [PATCH 1430/1664] Suppress ViewInflationDuringSwipeUp test.

Test is failing on a subset of devices with a memory leak in an activity.
This is not repoing on other devices so could be a problem with the setup
rather than the code.

Bug: 190618549
Test: Local
Change-Id: I9c6a56432d1b1f59c337bf34e7b8c26befeb2d7d
---
 .../src/com/android/quickstep/ViewInflationDuringSwipeUp.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java b/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java
index ea7b7f5dfb..f33abb06fc 100644
--- a/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java
+++ b/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java
@@ -114,6 +114,7 @@ public class ViewInflationDuringSwipeUp extends AbstractQuickStepTest {
 
     @Test
     @NavigationModeSwitch(mode = ZERO_BUTTON)
+    @Suppress // until b/190618549 is fixed
     public void testSwipeUpFromApp() throws Exception {
         try {
             // Go to overview once so that all views are initialized and cached
-- 
GitLab


From d410a2c168535339272214453683b5cd2eb9b569 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 16 Jun 2021 16:23:33 -0700
Subject: [PATCH 1431/1664] Ensure widgets header is out of the gesture region
 before clicking

This way, NexusLauncher won't appear during the Launcher3 test.

Test: AddConfigWidgetTest#testConfigCancelled
Bug: 188450580
Change-Id: Iedf0e0e17eab2473ecd2d17a4391cf9db3e80599
---
 tests/tapl/com/android/launcher3/tapl/Widgets.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/Widgets.java b/tests/tapl/com/android/launcher3/tapl/Widgets.java
index 51e331de42..99d988926a 100644
--- a/tests/tapl/com/android/launcher3/tapl/Widgets.java
+++ b/tests/tapl/com/android/launcher3/tapl/Widgets.java
@@ -185,8 +185,12 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
                     targetAppSelector);
             if (headerTitle != null) {
                 // If we find the header and it has not been expanded, let's click it to see the
-                // widgets list.
-                if (!hasHeaderExpanded) {
+                // widgets list. Note that we wait until the header is out of the gesture region at
+                // the bottom of the screen, because tapping there in Launcher3 causes NexusLauncher
+                // to briefly appear to handle the gesture, which can break our test.
+                boolean isHeaderOutOfGestureRegion = headerTitle.getVisibleCenter().y
+                        < mLauncher.getBottomGestureStartOnScreen();
+                if (!hasHeaderExpanded && isHeaderOutOfGestureRegion) {
                     log("Header has not been expanded. Click to expand.");
                     hasHeaderExpanded = true;
                     mLauncher.clickLauncherObject(headerTitle);
-- 
GitLab


From b50d747d208a2338c98e79949e8a9d41dcac8754 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Thu, 17 Jun 2021 18:07:43 +0100
Subject: [PATCH 1432/1664] Log widget dimensions before deleting a widget
 violating min size

Test: N/A
Bug: 191223844
Change-Id: Id909ee19be1a1c7d70a09643422d9ed62a2d82a9
---
 .../android/launcher3/model/LoaderTask.java   | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index 79396b1fc9..318496ad19 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -28,6 +28,7 @@ import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 import static com.android.launcher3.util.PackageManagerHelper.hasShortcutsPermission;
 import static com.android.launcher3.util.PackageManagerHelper.isSystemApp;
 
+import android.annotation.SuppressLint;
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.ComponentName;
 import android.content.ContentResolver;
@@ -40,6 +41,7 @@ import android.content.pm.PackageInstaller;
 import android.content.pm.PackageInstaller.SessionInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ShortcutInfo;
+import android.graphics.Point;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.UserHandle;
@@ -50,6 +52,8 @@ import android.util.Log;
 import android.util.LongSparseArray;
 import android.util.TimingLogger;
 
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherModel;
 import com.android.launcher3.LauncherSettings;
@@ -754,6 +758,9 @@ public class LoaderTask implements Runnable {
                                 if (widgetProviderInfo != null
                                         && (appWidgetInfo.spanX < widgetProviderInfo.minSpanX
                                         || appWidgetInfo.spanY < widgetProviderInfo.minSpanY)) {
+                                    logDeleteWidgetInfo(mApp.getInvariantDeviceProfile(),
+                                            widgetProviderInfo);
+
                                     // This can happen when display size changes.
                                     c.markDeleted("Widget removed, min sizes not met: "
                                             + "span=" + appWidgetInfo.spanX + "x"
@@ -980,6 +987,51 @@ public class LoaderTask implements Runnable {
                 && (provider.provider.getPackageName() != null);
     }
 
+    @SuppressLint("NewApi") // Already added API check.
+    private static void logDeleteWidgetInfo(InvariantDeviceProfile idp,
+            LauncherAppWidgetProviderInfo widgetProviderInfo) {
+        FileLog.d(TAG, "Deleting " + widgetProviderInfo.getComponent()
+                + " due to min size constraint");
+        Point cellSize = new Point();
+        for (DeviceProfile deviceProfile : idp.supportedProfiles) {
+            deviceProfile.getCellSize(cellSize);
+            FileLog.d(TAG, "DeviceProfile available width: " + deviceProfile.availableWidthPx
+                    + ", available height: " + deviceProfile.availableHeightPx
+                    + ", cellLayoutBorderSpacingPx: " + deviceProfile.cellLayoutBorderSpacingPx
+                    + ", cellSize: " + cellSize);
+        }
+
+        StringBuilder widgetDimension = new StringBuilder();
+        widgetDimension.append("Widget dimensions:\n")
+                .append("minResizeWidth: ")
+                .append(widgetProviderInfo.minResizeWidth)
+                .append("\n")
+                .append("minResizeHeight: ")
+                .append(widgetProviderInfo.minResizeHeight)
+                .append("\n")
+                .append("defaultWidth: ")
+                .append(widgetProviderInfo.minWidth)
+                .append("\n")
+                .append("defaultHeight: ")
+                .append(widgetProviderInfo.minHeight)
+                .append("\n");
+        if (Utilities.ATLEAST_S) {
+            widgetDimension.append("targetCellWidth: ")
+                    .append(widgetProviderInfo.targetCellWidth)
+                    .append("\n")
+                    .append("targetCellHeight: ")
+                    .append(widgetProviderInfo.targetCellHeight)
+                    .append("\n")
+                    .append("maxResizeWidth: ")
+                    .append(widgetProviderInfo.maxResizeWidth)
+                    .append("\n")
+                    .append("maxResizeHeight: ")
+                    .append(widgetProviderInfo.maxResizeHeight)
+                    .append("\n");
+        }
+        FileLog.d(TAG, widgetDimension.toString());
+    }
+
     private static void logASplit(final TimingLogger logger, final String label) {
         logger.addSplit(label);
         if (DEBUG) {
-- 
GitLab


From 03c4fa83427366bdf66cc6c1ebbe94fa626ad0ff Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Mon, 14 Jun 2021 13:49:33 -0700
Subject: [PATCH 1433/1664] Update gesture nav tutorial back left and right
 videos

Bug: 188972959
Test: manual
Change-Id: I03aef0ad47f9a648f7a661c607dd3d4f1f2187c4
---
 ... => gesture_tutorial_motion_back_left.xml} |  411 ++---
 ...e_tutorial_motion_back_left_light_mode.xml | 1412 ----------------
 ...=> gesture_tutorial_motion_back_right.xml} |  412 ++---
 ..._tutorial_motion_back_right_light_mode.xml | 1413 -----------------
 .../BackGestureTutorialFragment.java          |    8 +-
 5 files changed, 234 insertions(+), 3422 deletions(-)
 rename quickstep/res/drawable/{gesture_tutorial_motion_back_left_dark_mode.xml => gesture_tutorial_motion_back_left.xml} (82%)
 delete mode 100644 quickstep/res/drawable/gesture_tutorial_motion_back_left_light_mode.xml
 rename quickstep/res/drawable/{gesture_tutorial_motion_back_right_dark_mode.xml => gesture_tutorial_motion_back_right.xml} (82%)
 delete mode 100644 quickstep/res/drawable/gesture_tutorial_motion_back_right_light_mode.xml

diff --git a/quickstep/res/drawable/gesture_tutorial_motion_back_left_dark_mode.xml b/quickstep/res/drawable/gesture_tutorial_motion_back_left.xml
similarity index 82%
rename from quickstep/res/drawable/gesture_tutorial_motion_back_left_dark_mode.xml
rename to quickstep/res/drawable/gesture_tutorial_motion_back_left.xml
index f5ad56916b..a6860fac64 100644
--- a/quickstep/res/drawable/gesture_tutorial_motion_back_left_dark_mode.xml
+++ b/quickstep/res/drawable/gesture_tutorial_motion_back_left.xml
@@ -1,6 +1,6 @@
 <animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt">
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_0_P_0">
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_0_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -17,7 +17,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_1_P_0">
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_1_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -34,7 +34,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_2_P_0">
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_2_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -51,7 +51,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_3_P_0">
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_3_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -68,7 +68,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_4_P_0">
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_4_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -85,7 +85,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_5_P_0">
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_5_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -102,7 +102,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_6_P_0">
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_6_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -119,7 +119,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_7_P_0">
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_7_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -136,7 +136,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_8_P_0">
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_8_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -153,7 +153,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_9_P_0">
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_9_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -170,7 +170,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_10_P_0">
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_10_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -187,7 +187,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_11_P_0">
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_11_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -204,7 +204,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_12_P_0">
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_12_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -221,7 +221,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_13_P_0">
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_13_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -238,7 +238,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G_L_0_G">
+    <target android:name="_R_G_L_3_G_L_0_G">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -251,7 +251,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G">
+    <target android:name="_R_G_L_3_G">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -279,7 +279,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G">
+    <target android:name="_R_G_L_3_G">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -292,7 +292,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_0_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_0_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -309,7 +309,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_1_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_1_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -326,7 +326,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_2_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_2_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -343,7 +343,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_3_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_3_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -360,7 +360,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_4_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_4_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -377,7 +377,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_5_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_5_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -394,7 +394,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_6_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_6_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -411,7 +411,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_7_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_7_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -428,7 +428,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_8_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_8_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -445,7 +445,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_9_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_9_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -462,7 +462,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_10_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_10_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -479,7 +479,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_11_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_11_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -496,7 +496,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_12_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_12_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -513,7 +513,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_13_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_13_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -530,7 +530,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_14_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_14_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -547,7 +547,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_15_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_15_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -564,7 +564,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_16_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_16_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -581,7 +581,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_17_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_17_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -598,7 +598,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_18_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_18_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -615,7 +615,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_19_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_19_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -632,7 +632,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_20_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_20_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -649,7 +649,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_21_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_21_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -666,7 +666,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_22_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_22_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -683,7 +683,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_23_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_23_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -700,20 +700,24 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_24_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
                     android:startOffset="1417"
                     android:valueFrom="0"
                     android:valueTo="1"
-                    android:valueType="floatType" />
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -726,7 +730,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G">
+    <target android:name="_R_G_L_2_G_L_0_G">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -739,138 +743,47 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_2_G_D_0_P_0_G_0_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="667"
-                    android:pathData="M -60,53C -50,53 -10,53 0,53"
-                    android:propertyName="translateXY"
-                    android:propertyXName="translateX"
-                    android:propertyYName="translateY"
-                    android:startOffset="217">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="333"
-                    android:pathData="M 0,53C 0,53 0,53 0,53"
-                    android:propertyName="translateXY"
-                    android:propertyXName="translateX"
-                    android:propertyYName="translateY"
-                    android:startOffset="883">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0.333 0,0 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="333"
-                    android:pathData="M 0,53C -10,53 -50,53 -60,53"
-                    android:propertyName="translateXY"
-                    android:propertyXName="translateX"
-                    android:propertyYName="translateY"
-                    android:startOffset="1217">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
     <target android:name="_R_G_L_2_G">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
                     android:duration="0"
                     android:propertyName="scaleY"
-                    android:startOffset="217"
+                    android:startOffset="1417"
                     android:valueFrom="0"
                     android:valueTo="1"
                     android:valueType="floatType" />
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="2467"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G_D_0_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="417"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="383"
-                    android:valueFrom="0"
-                    android:valueTo="0.5"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="417"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="800"
-                    android:valueFrom="0.5"
-                    android:valueTo="0.5"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="200"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="0.5"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
     <target android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
-                    android:duration="583"
-                    android:pathData="M 39,0C 32.5,0 6.5,0 0,0"
+                    android:duration="667"
+                    android:pathData="M 123.282,129.757C 134.28199999999998,129.757 178.282,129.757 189.282,129.757"
                     android:propertyName="translateXY"
                     android:propertyXName="translateX"
                     android:propertyYName="translateY"
                     android:startOffset="217">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0,1 1.0,1.0" />
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator
-                    android:duration="417"
-                    android:pathData="M 0,0C 0,0 0,0 0,0"
+                    android:duration="333"
+                    android:pathData="M 189.282,129.757C 189.282,129.757 189.282,129.757 189.282,129.757"
                     android:propertyName="translateXY"
                     android:propertyXName="translateX"
                     android:propertyYName="translateY"
-                    android:startOffset="800">
+                    android:startOffset="883">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0.333 0.667,0.667 1.0,1.0" />
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator
-                    android:duration="333"
-                    android:pathData="M 0,0C 6.5,0 32.5,0 39,0"
+                    android:duration="250"
+                    android:pathData="M 189.282,129.757C 178.282,129.757 134.28199999999998,129.757 123.282,129.757"
                     android:propertyName="translateXY"
                     android:propertyXName="translateX"
                     android:propertyYName="translateY"
@@ -882,85 +795,13 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="583"
-                    android:propertyName="scaleX"
-                    android:startOffset="217"
-                    android:valueFrom="0.5"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="583"
-                    android:propertyName="scaleY"
-                    android:startOffset="217"
-                    android:valueFrom="0.5"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="417"
-                    android:propertyName="scaleX"
-                    android:startOffset="800"
-                    android:valueFrom="1"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="417"
-                    android:propertyName="scaleY"
-                    android:startOffset="800"
-                    android:valueFrom="1"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="scaleX"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0.5"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="scaleY"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0.5"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
     <target android:name="_R_G_L_1_G">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
                     android:duration="0"
                     android:propertyName="scaleY"
-                    android:startOffset="383"
+                    android:startOffset="217"
                     android:valueFrom="0"
                     android:valueTo="1"
                     android:valueType="floatType" />
@@ -973,7 +814,7 @@
                 <objectAnimator
                     android:duration="0"
                     android:propertyName="scaleY"
-                    android:startOffset="2333"
+                    android:startOffset="2383"
                     android:valueFrom="1"
                     android:valueTo="0"
                     android:valueType="floatType" />
@@ -1090,104 +931,104 @@
             android:viewportWidth="412">
             <group android:name="_R_G">
                 <group
-                    android:name="_R_G_L_5_G"
+                    android:name="_R_G_L_4_G"
                     android:translateX="206"
                     android:translateY="446">
                     <path
-                        android:name="_R_G_L_5_G_D_0_P_0"
+                        android:name="_R_G_L_4_G_D_0_P_0"
                         android:fillAlpha="1"
                         android:fillColor="#dadce0"
                         android:fillType="nonZero"
                         android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c " />
                 </group>
                 <group
-                    android:name="_R_G_L_4_G"
+                    android:name="_R_G_L_3_G"
                     android:pivotX="206"
                     android:pivotY="446"
                     android:scaleX="1"
                     android:scaleY="1">
-                    <group android:name="_R_G_L_4_G_L_0_G">
-                        <group android:name="_R_G_L_4_G_L_0_G_L_0_G">
+                    <group android:name="_R_G_L_3_G_L_0_G">
+                        <group android:name="_R_G_L_3_G_L_0_G_L_0_G">
                             <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_0_P_0"
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_0_P_0"
                                 android:fillAlpha="1"
                                 android:fillColor="#f1f3f4"
                                 android:fillType="nonZero"
                                 android:pathData=" M412 101 C412,101 412,892 412,892 C412,892 0,892 0,892 C0,892 0,101 0,101 C0,101 412,101 412,101c " />
                             <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_1_P_0"
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_1_P_0"
                                 android:fillAlpha="1"
                                 android:fillColor="#e8eaed"
                                 android:fillType="nonZero"
                                 android:pathData=" M412 0 C412,0 412,101 412,101 C412,101 0,101 0,101 C0,101 0,0 0,0 C0,0 412,0 412,0c " />
                             <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_2_P_0"
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_2_P_0"
                                 android:fillAlpha="1"
                                 android:fillColor="#dadce0"
                                 android:fillType="nonZero"
                                 android:pathData=" M383 804 C383,816.15 373.15,826 361,826 C361,826 51,826 51,826 C38.85,826 29,816.15 29,804 C29,791.85 38.85,782 51,782 C51,782 361,782 361,782 C373.15,782 383,791.85 383,804c " />
                             <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_3_P_0"
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_3_P_0"
                                 android:fillAlpha="1"
                                 android:fillColor="#dadce0"
                                 android:fillType="nonZero"
                                 android:pathData=" M201 47 C201,47 201,75 201,75 C201,77.21 199.21,79 197,79 C197,79 38,79 38,79 C35.79,79 34,77.21 34,75 C34,75 34,47 34,47 C34,44.79 35.79,43 38,43 C38,43 197,43 197,43 C199.21,43 201,44.79 201,47c " />
                             <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_4_P_0"
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_4_P_0"
                                 android:fillAlpha="1"
                                 android:fillColor="#dadce0"
                                 android:fillType="nonZero"
                                 android:pathData=" M388 47 C388,47 388,75 388,75 C388,77.21 386.21,79 384,79 C384,79 356,79 356,79 C353.79,79 352,77.21 352,75 C352,75 352,47 352,47 C352,44.79 353.79,43 356,43 C356,43 384,43 384,43 C386.21,43 388,44.79 388,47c " />
                             <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_5_P_0"
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_5_P_0"
                                 android:fillAlpha="1"
                                 android:fillColor="#dadce0"
                                 android:fillType="nonZero"
                                 android:pathData=" M336 47 C336,47 336,75 336,75 C336,77.21 334.21,79 332,79 C332,79 304,79 304,79 C301.79,79 300,77.21 300,75 C300,75 300,47 300,47 C300,44.79 301.79,43 304,43 C304,43 332,43 332,43 C334.21,43 336,44.79 336,47c " />
                             <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_6_P_0"
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_6_P_0"
                                 android:fillAlpha="1"
                                 android:fillColor="#dadce0"
                                 android:fillType="nonZero"
                                 android:pathData=" M70 618 C70,630.15 60.15,640 48,640 C35.85,640 26,630.15 26,618 C26,605.85 35.85,596 48,596 C60.15,596 70,605.85 70,618c " />
                             <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_7_P_0"
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_7_P_0"
                                 android:fillAlpha="1"
                                 android:fillColor="#dadce0"
                                 android:fillType="nonZero"
                                 android:pathData=" M70 396 C70,408.15 60.15,418 48,418 C35.85,418 26,408.15 26,396 C26,383.85 35.85,374 48,374 C60.15,374 70,383.85 70,396c " />
                             <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_8_P_0"
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_8_P_0"
                                 android:fillAlpha="1"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M394 248 C394,248 394,324 394,324 C394,333.94 385.94,342 376,342 C376,342 142,342 142,342 C132.06,342 124,333.94 124,324 C124,324 124,248 124,248 C124,238.06 132.06,230 142,230 C142,230 376,230 376,230 C385.94,230 394,238.06 394,248c " />
                             <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_9_P_0"
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_9_P_0"
                                 android:fillAlpha="1"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M393.94 468.38 C393.94,468.38 393.94,481.5 393.94,481.5 C393.94,483.71 392.15,485.5 389.94,485.5 C389.94,485.5 303.5,485.5 303.5,485.5 C301.29,485.5 299.5,483.71 299.5,481.5 C299.5,481.5 299.5,468.38 299.5,468.38 C299.5,466.17 301.29,464.38 303.5,464.38 C303.5,464.38 389.94,464.38 389.94,464.38 C392.15,464.38 393.94,466.17 393.94,468.38c  M394 468 C394,477.67 386.17,485.5 376.5,485.5 C376.5,485.5 290,485.5 290,485.5 C280.33,485.5 272.5,477.67 272.5,468 C272.5,458.34 280.33,450.5 290,450.5 C290,450.5 376.5,450.5 376.5,450.5 C386.17,450.5 394,458.34 394,468c " />
                             <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_10_P_0"
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_10_P_0"
                                 android:fillAlpha="1"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M394 494 C394,494 394,547 394,547 C394,549.21 392.21,551 390,551 C390,551 164,551 164,551 C161.79,551 160,549.21 160,547 C160,547 160,494 160,494 C160,491.79 161.79,490 164,490 C164,490 390,490 390,490 C392.21,490 394,491.79 394,494c  M394 508 C394,508 394,545 394,545 C394,554.94 385.94,563 376,563 C376,563 142,563 142,563 C132.06,563 124,554.94 124,545 C124,545 124,508 124,508 C124,498.06 132.06,490 142,490 C142,490 376,490 376,490 C385.94,490 394,498.06 394,508c " />
                             <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_11_P_0"
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_11_P_0"
                                 android:fillAlpha="1"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M394 690 C394,690 394,727 394,727 C394,736.94 385.94,745 376,745 C376,745 142,745 142,745 C132.06,745 124,736.94 124,727 C124,727 124,690 124,690 C124,680.06 132.06,672 142,672 C142,672 376,672 376,672 C385.94,672 394,680.06 394,690c " />
                             <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_12_P_0"
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_12_P_0"
                                 android:fillAlpha="1"
                                 android:fillColor="#e8eaed"
                                 android:fillType="nonZero"
                                 android:pathData=" M267.5 617 C267.5,626.67 259.67,634.5 250,634.5 C250,634.5 104.5,634.5 104.5,634.5 C94.84,634.5 87,626.67 87,617 C87,607.34 94.84,599.5 104.5,599.5 C104.5,599.5 250,599.5 250,599.5 C259.67,599.5 267.5,607.34 267.5,617c " />
                             <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_13_P_0"
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_13_P_0"
                                 android:fillAlpha="1"
                                 android:fillColor="#e8eaed"
                                 android:fillType="nonZero"
@@ -1196,160 +1037,160 @@
                     </group>
                 </group>
                 <group
-                    android:name="_R_G_L_3_G"
+                    android:name="_R_G_L_2_G"
                     android:scaleY="0">
                     <group
-                        android:name="_R_G_L_3_G_L_0_G"
+                        android:name="_R_G_L_2_G_L_0_G"
                         android:scaleY="0">
                         <group
-                            android:name="_R_G_L_3_G_L_0_G_L_0_G"
+                            android:name="_R_G_L_2_G_L_0_G_L_0_G"
                             android:scaleY="0">
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_0_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_0_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#dadce0"
                                 android:fillType="nonZero"
                                 android:pathData=" M412 0 C412,0 412,892 412,892 C412,892 0,892 0,892 C0,892 0,0 0,0 C0,0 412,0 412,0c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_1_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_1_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#e8eaed"
                                 android:fillType="nonZero"
                                 android:pathData=" M412 0 C412,0 412,101 412,101 C412,101 0,101 0,101 C0,101 0,0 0,0 C0,0 412,0 412,0c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_2_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_2_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M195 143 C195,143 195,153 195,153 C195,155.21 193.21,157 191,157 C191,157 106,157 106,157 C103.79,157 102,155.21 102,153 C102,153 102,143 102,143 C102,140.79 103.79,139 106,139 C106,139 191,139 191,139 C193.21,139 195,140.79 195,143c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_3_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_3_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M270 165 C270,165 270,173 270,173 C270,175.21 268.21,177 266,177 C266,177 106,177 106,177 C103.79,177 102,175.21 102,173 C102,173 102,165 102,165 C102,162.79 103.79,161 106,161 C106,161 266,161 266,161 C268.21,161 270,162.79 270,165c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_4_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_4_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M222 231 C222,231 222,241 222,241 C222,243.21 220.21,245 218,245 C218,245 106,245 106,245 C103.79,245 102,243.21 102,241 C102,241 102,231 102,231 C102,228.79 103.79,227 106,227 C106,227 218,227 218,227 C220.21,227 222,228.79 222,231c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_5_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_5_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M241 253 C241,253 241,261 241,261 C241,263.21 239.21,265 237,265 C237,265 106,265 106,265 C103.79,265 102,263.21 102,261 C102,261 102,253 102,253 C102,250.79 103.79,249 106,249 C106,249 237,249 237,249 C239.21,249 241,250.79 241,253c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_6_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_6_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M214 319 C214,319 214,329 214,329 C214,331.21 212.21,333 210,333 C210,333 106,333 106,333 C103.79,333 102,331.21 102,329 C102,329 102,319 102,319 C102,316.79 103.79,315 106,315 C106,315 210,315 210,315 C212.21,315 214,316.79 214,319c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_7_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_7_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M333 341 C333,341 333,349 333,349 C333,351.21 331.21,353 329,353 C329,353 106,353 106,353 C103.79,353 102,351.21 102,349 C102,349 102,341 102,341 C102,338.79 103.79,337 106,337 C106,337 329,337 329,337 C331.21,337 333,338.79 333,341c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_8_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_8_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M238 407 C238,407 238,417 238,417 C238,419.21 236.21,421 234,421 C234,421 106,421 106,421 C103.79,421 102,419.21 102,417 C102,417 102,407 102,407 C102,404.79 103.79,403 106,403 C106,403 234,403 234,403 C236.21,403 238,404.79 238,407c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_9_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_9_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M295 429 C295,429 295,437 295,437 C295,439.21 293.21,441 291,441 C291,441 106,441 106,441 C103.79,441 102,439.21 102,437 C102,437 102,429 102,429 C102,426.79 103.79,425 106,425 C106,425 291,425 291,425 C293.21,425 295,426.79 295,429c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_10_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_10_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M168 495 C168,495 168,505 168,505 C168,507.21 166.21,509 164,509 C164,509 106,509 106,509 C103.79,509 102,507.21 102,505 C102,505 102,495 102,495 C102,492.79 103.79,491 106,491 C106,491 164,491 164,491 C166.21,491 168,492.79 168,495c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_11_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_11_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M269 517 C269,517 269,525 269,525 C269,527.21 267.21,529 265,529 C265,529 106,529 106,529 C103.79,529 102,527.21 102,525 C102,525 102,517 102,517 C102,514.79 103.79,513 106,513 C106,513 265,513 265,513 C267.21,513 269,514.79 269,517c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_12_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_12_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M235 583 C235,583 235,593 235,593 C235,595.21 233.21,597 231,597 C231,597 106,597 106,597 C103.79,597 102,595.21 102,593 C102,593 102,583 102,583 C102,580.79 103.79,579 106,579 C106,579 231,579 231,579 C233.21,579 235,580.79 235,583c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_13_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_13_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M295 605 C295,605 295,613 295,613 C295,615.21 293.21,617 291,617 C291,617 106,617 106,617 C103.79,617 102,615.21 102,613 C102,613 102,605 102,605 C102,602.79 103.79,601 106,601 C106,601 291,601 291,601 C293.21,601 295,602.79 295,605c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_14_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_14_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M223 671 C223,671 223,681 223,681 C223,683.21 221.21,685 219,685 C219,685 106,685 106,685 C103.79,685 102,683.21 102,681 C102,681 102,671 102,671 C102,668.79 103.79,667 106,667 C106,667 219,667 219,667 C221.21,667 223,668.79 223,671c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_15_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_15_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M246 693 C246,693 246,701 246,701 C246,703.21 244.21,705 242,705 C242,705 106,705 106,705 C103.79,705 102,703.21 102,701 C102,701 102,693 102,693 C102,690.79 103.79,689 106,689 C106,689 242,689 242,689 C244.21,689 246,690.79 246,693c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_16_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_16_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M388 798 C388,798 388,798 388,798 C388,813.45 375.45,826 360,826 C360,826 267,826 267,826 C251.55,826 239,813.45 239,798 C239,798 239,798 239,798 C239,782.55 251.55,770 267,770 C267,770 360,770 360,770 C375.45,770 388,782.55 388,798c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_17_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_17_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#f8f9fa"
                                 android:fillType="nonZero"
                                 android:pathData=" M377 47 C377,47 377,75 377,75 C377,77.21 375.21,79 373,79 C373,79 38,79 38,79 C35.79,79 34,77.21 34,75 C34,75 34,47 34,47 C34,44.79 35.79,43 38,43 C38,43 373,43 373,43 C375.21,43 377,44.79 377,47c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_18_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_18_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#9aa0a6"
                                 android:fillType="nonZero"
                                 android:pathData=" M82 157 C82,172.46 69.46,185 54,185 C38.54,185 26,172.46 26,157 C26,141.54 38.54,129 54,129 C69.46,129 82,141.54 82,157c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_19_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_19_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#9aa0a6"
                                 android:fillType="nonZero"
                                 android:pathData=" M82 245 C82,260.46 69.46,273 54,273 C38.54,273 26,260.46 26,245 C26,229.54 38.54,217 54,217 C69.46,217 82,229.54 82,245c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_20_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_20_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#9aa0a6"
                                 android:fillType="nonZero"
                                 android:pathData=" M82 333 C82,348.46 69.46,361 54,361 C38.54,361 26,348.46 26,333 C26,317.54 38.54,305 54,305 C69.46,305 82,317.54 82,333c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_21_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_21_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#9aa0a6"
                                 android:fillType="nonZero"
                                 android:pathData=" M82 421 C82,436.46 69.46,449 54,449 C38.54,449 26,436.46 26,421 C26,405.54 38.54,393 54,393 C69.46,393 82,405.54 82,421c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_22_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_22_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#9aa0a6"
                                 android:fillType="nonZero"
                                 android:pathData=" M82 509 C82,524.46 69.46,537 54,537 C38.54,537 26,524.46 26,509 C26,493.54 38.54,481 54,481 C69.46,481 82,493.54 82,509c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_23_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_23_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#9aa0a6"
                                 android:fillType="nonZero"
                                 android:pathData=" M82 597 C82,612.46 69.46,625 54,625 C38.54,625 26,612.46 26,597 C26,581.54 38.54,569 54,569 C69.46,569 82,581.54 82,597c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_24_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_24_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#9aa0a6"
                                 android:fillType="nonZero"
@@ -1357,41 +1198,21 @@
                         </group>
                     </group>
                 </group>
-                <group
-                    android:name="_R_G_L_2_G"
-                    android:scaleY="0"
-                    android:translateX="28.25"
-                    android:translateY="443">
-                    <group
-                        android:name="_R_G_L_2_G_D_0_P_0_G_0_T_0"
-                        android:translateX="-60"
-                        android:translateY="53">
-                        <path
-                            android:name="_R_G_L_2_G_D_0_P_0"
-                            android:fillAlpha="1"
-                            android:fillColor="#000000"
-                            android:fillType="nonZero"
-                            android:pathData=" M28.25 0 C28.25,31.2 2.95,56.5 -28.25,56.5 C-28.25,56.5 -28.25,-56.5 -28.25,-56.5 C2.95,-56.5 28.25,-31.2 28.25,0c " />
-                    </group>
-                </group>
                 <group
                     android:name="_R_G_L_1_G"
-                    android:rotation="180"
                     android:scaleY="0"
-                    android:translateX="25.75"
-                    android:translateY="496">
+                    android:translateX="-17.875"
+                    android:translateY="322.017">
                     <group
                         android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0"
-                        android:scaleX="0.5"
-                        android:scaleY="0.5"
-                        android:translateX="39"
-                        android:translateY="0">
+                        android:translateX="123.282"
+                        android:translateY="129.757">
                         <path
                             android:name="_R_G_L_1_G_D_0_P_0"
-                            android:fillAlpha="0"
-                            android:fillColor="#ffffff"
+                            android:fillAlpha="1"
+                            android:fillColor="#3b4043"
                             android:fillType="nonZero"
-                            android:pathData=" M3.87 -13.45 C3.07,-14.21 1.8,-14.18 1.04,-13.38 C0.28,-12.58 0.31,-11.31 1.11,-10.55 C1.11,-10.55 9.75,-2.32 9.75,-2.32 C9.75,-2.32 -14.75,-2.32 -14.75,-2.32 C-15.85,-2.32 -16.75,-1.43 -16.75,-0.32 C-16.75,0.78 -15.85,1.68 -14.75,1.68 C-14.75,1.68 9.94,1.68 9.94,1.68 C9.94,1.68 1.07,10.59 1.07,10.59 C0.29,11.37 0.29,12.64 1.08,13.42 C1.86,14.2 3.13,14.19 3.9,13.41 C3.9,13.41 16.17,1.09 16.17,1.09 C16.55,0.71 16.76,0.19 16.75,-0.35 C16.74,-0.89 16.52,-1.4 16.13,-1.77 C16.13,-1.77 3.87,-13.45 3.87,-13.45c " />
+                            android:pathData=" M-109 27.43 C-109,27.43 -112.61,23.81 -112.61,23.81 C-112.61,23.81 -133.03,44.23 -133.03,44.23 C-133.03,44.23 -112.61,64.64 -112.61,64.64 C-112.61,64.64 -109,61.03 -109,61.03 C-109,61.03 -125.8,44.23 -125.8,44.23 C-125.8,44.23 -109,27.43 -109,27.43c " />
                     </group>
                 </group>
                 <group
diff --git a/quickstep/res/drawable/gesture_tutorial_motion_back_left_light_mode.xml b/quickstep/res/drawable/gesture_tutorial_motion_back_left_light_mode.xml
deleted file mode 100644
index c0eafda4e9..0000000000
--- a/quickstep/res/drawable/gesture_tutorial_motion_back_left_light_mode.xml
+++ /dev/null
@@ -1,1412 +0,0 @@
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_0_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_1_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_2_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_3_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_4_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_5_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_6_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_7_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_8_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_9_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_10_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_11_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_12_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_13_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="1367"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="283"
-                    android:propertyName="scaleX"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0.88012"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="283"
-                    android:propertyName="scaleY"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0.88012"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="2417"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_0_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_1_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_2_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_3_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_4_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_5_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_6_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_7_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_8_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_9_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_10_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_11_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_12_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_13_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_14_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_15_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_16_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_17_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_18_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_19_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_20_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_21_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_22_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_23_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_D_0_P_0_G_0_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="667"
-                    android:pathData="M -60,53C -50,53 -10,53 0,53"
-                    android:propertyName="translateXY"
-                    android:propertyXName="translateX"
-                    android:propertyYName="translateY"
-                    android:startOffset="217">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="333"
-                    android:pathData="M 0,53C 0,53 0,53 0,53"
-                    android:propertyName="translateXY"
-                    android:propertyXName="translateX"
-                    android:propertyYName="translateY"
-                    android:startOffset="883">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0.333 0,0 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="333"
-                    android:pathData="M 0,53C -10,53 -50,53 -60,53"
-                    android:propertyName="translateXY"
-                    android:propertyXName="translateX"
-                    android:propertyYName="translateY"
-                    android:startOffset="1217">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="217"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="2467"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G_D_0_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="417"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="383"
-                    android:valueFrom="0"
-                    android:valueTo="0.5"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="417"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="800"
-                    android:valueFrom="0.5"
-                    android:valueTo="0.5"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="200"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="0.5"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="583"
-                    android:pathData="M 39,0C 32.5,0 6.5,0 0,0"
-                    android:propertyName="translateXY"
-                    android:propertyXName="translateX"
-                    android:propertyYName="translateY"
-                    android:startOffset="217">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="417"
-                    android:pathData="M 0,0C 0,0 0,0 0,0"
-                    android:propertyName="translateXY"
-                    android:propertyXName="translateX"
-                    android:propertyYName="translateY"
-                    android:startOffset="800">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0.333 0.667,0.667 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="333"
-                    android:pathData="M 0,0C 6.5,0 32.5,0 39,0"
-                    android:propertyName="translateXY"
-                    android:propertyXName="translateX"
-                    android:propertyYName="translateY"
-                    android:startOffset="1217">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="583"
-                    android:propertyName="scaleX"
-                    android:startOffset="217"
-                    android:valueFrom="0.5"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="583"
-                    android:propertyName="scaleY"
-                    android:startOffset="217"
-                    android:valueFrom="0.5"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="417"
-                    android:propertyName="scaleX"
-                    android:startOffset="800"
-                    android:valueFrom="1"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="417"
-                    android:propertyName="scaleY"
-                    android:startOffset="800"
-                    android:valueFrom="1"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="scaleX"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0.5"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="scaleY"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0.5"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="383"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="2333"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_D_0_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="217"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="0"
-                    android:valueFrom="0"
-                    android:valueTo="0.75"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="967"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="217"
-                    android:valueFrom="0.75"
-                    android:valueTo="0.75"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="167"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1183"
-                    android:valueFrom="0.75"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_D_0_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="217"
-                    android:propertyName="pathData"
-                    android:startOffset="0"
-                    android:valueFrom="M-206.5 13.5 C-186.34,13.5 -170,29.84 -170,50 C-170,70.16 -186.34,86.5 -206.5,86.5 C-226.66,86.5 -243,70.16 -243,50 C-243,29.84 -226.66,13.5 -206.5,13.5c "
-                    android:valueTo="M-206 0 C-178.39,0 -156,22.39 -156,50 C-156,77.61 -178.39,100 -206,100 C-233.61,100 -256,77.61 -256,50 C-256,22.39 -233.61,0 -206,0c "
-                    android:valueType="pathType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="583"
-                    android:propertyName="pathData"
-                    android:startOffset="217"
-                    android:valueFrom="M-206 0 C-178.39,0 -156,22.39 -156,50 C-156,77.61 -178.39,100 -206,100 C-233.61,100 -256,77.61 -256,50 C-256,22.39 -233.61,0 -206,0c "
-                    android:valueTo="M0 0 C27.61,0 50,22.39 50,50 C50,77.61 27.61,100 0,100 C-27.61,100 -50,77.61 -50,50 C-50,22.39 -27.61,0 0,0c "
-                    android:valueType="pathType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="383"
-                    android:propertyName="pathData"
-                    android:startOffset="800"
-                    android:valueFrom="M0 0 C27.61,0 50,22.39 50,50 C50,77.61 27.61,100 0,100 C-27.61,100 -50,77.61 -50,50 C-50,22.39 -27.61,0 0,0c "
-                    android:valueTo="M0 0 C27.61,0 50,22.39 50,50 C50,77.61 27.61,100 0,100 C-27.61,100 -50,77.61 -50,50 C-50,22.39 -27.61,0 0,0c "
-                    android:valueType="pathType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="167"
-                    android:propertyName="pathData"
-                    android:startOffset="1183"
-                    android:valueFrom="M0 0 C27.61,0 50,22.39 50,50 C50,77.61 27.61,100 0,100 C-27.61,100 -50,77.61 -50,50 C-50,22.39 -27.61,0 0,0c "
-                    android:valueTo="M0 13.5 C20.16,13.5 36.5,29.84 36.5,50 C36.5,70.16 20.16,86.5 0,86.5 C-20.16,86.5 -36.5,70.16 -36.5,50 C-36.5,29.84 -20.16,13.5 0,13.5c "
-                    android:valueType="pathType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="time_group">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="1767"
-                    android:propertyName="translateX"
-                    android:startOffset="0"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <aapt:attr name="android:drawable">
-        <vector
-            android:width="412dp"
-            android:height="892dp"
-            android:viewportHeight="892"
-            android:viewportWidth="412">
-            <group android:name="_R_G">
-                <group
-                    android:name="_R_G_L_5_G"
-                    android:translateX="206"
-                    android:translateY="446">
-                    <path
-                        android:name="_R_G_L_5_G_D_0_P_0"
-                        android:fillAlpha="1"
-                        android:fillColor="#dadce0"
-                        android:fillType="nonZero"
-                        android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c " />
-                </group>
-                <group
-                    android:name="_R_G_L_4_G"
-                    android:pivotX="206"
-                    android:pivotY="446"
-                    android:scaleX="1"
-                    android:scaleY="1">
-                    <group android:name="_R_G_L_4_G_L_0_G">
-                        <group android:name="_R_G_L_4_G_L_0_G_L_0_G">
-                            <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_0_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#f1f3f4"
-                                android:fillType="nonZero"
-                                android:pathData=" M412 101 C412,101 412,892 412,892 C412,892 0,892 0,892 C0,892 0,101 0,101 C0,101 412,101 412,101c " />
-                            <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_1_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#e8eaed"
-                                android:fillType="nonZero"
-                                android:pathData=" M412 0 C412,0 412,101 412,101 C412,101 0,101 0,101 C0,101 0,0 0,0 C0,0 412,0 412,0c " />
-                            <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_2_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#dadce0"
-                                android:fillType="nonZero"
-                                android:pathData=" M383 804 C383,816.15 373.15,826 361,826 C361,826 51,826 51,826 C38.85,826 29,816.15 29,804 C29,791.85 38.85,782 51,782 C51,782 361,782 361,782 C373.15,782 383,791.85 383,804c " />
-                            <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_3_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#dadce0"
-                                android:fillType="nonZero"
-                                android:pathData=" M201 47 C201,47 201,75 201,75 C201,77.21 199.21,79 197,79 C197,79 38,79 38,79 C35.79,79 34,77.21 34,75 C34,75 34,47 34,47 C34,44.79 35.79,43 38,43 C38,43 197,43 197,43 C199.21,43 201,44.79 201,47c " />
-                            <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_4_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#dadce0"
-                                android:fillType="nonZero"
-                                android:pathData=" M388 47 C388,47 388,75 388,75 C388,77.21 386.21,79 384,79 C384,79 356,79 356,79 C353.79,79 352,77.21 352,75 C352,75 352,47 352,47 C352,44.79 353.79,43 356,43 C356,43 384,43 384,43 C386.21,43 388,44.79 388,47c " />
-                            <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_5_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#dadce0"
-                                android:fillType="nonZero"
-                                android:pathData=" M336 47 C336,47 336,75 336,75 C336,77.21 334.21,79 332,79 C332,79 304,79 304,79 C301.79,79 300,77.21 300,75 C300,75 300,47 300,47 C300,44.79 301.79,43 304,43 C304,43 332,43 332,43 C334.21,43 336,44.79 336,47c " />
-                            <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_6_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#dadce0"
-                                android:fillType="nonZero"
-                                android:pathData=" M70 618 C70,630.15 60.15,640 48,640 C35.85,640 26,630.15 26,618 C26,605.85 35.85,596 48,596 C60.15,596 70,605.85 70,618c " />
-                            <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_7_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#dadce0"
-                                android:fillType="nonZero"
-                                android:pathData=" M70 396 C70,408.15 60.15,418 48,418 C35.85,418 26,408.15 26,396 C26,383.85 35.85,374 48,374 C60.15,374 70,383.85 70,396c " />
-                            <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_8_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M394 248 C394,248 394,324 394,324 C394,333.94 385.94,342 376,342 C376,342 142,342 142,342 C132.06,342 124,333.94 124,324 C124,324 124,248 124,248 C124,238.06 132.06,230 142,230 C142,230 376,230 376,230 C385.94,230 394,238.06 394,248c " />
-                            <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_9_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M393.94 468.38 C393.94,468.38 393.94,481.5 393.94,481.5 C393.94,483.71 392.15,485.5 389.94,485.5 C389.94,485.5 303.5,485.5 303.5,485.5 C301.29,485.5 299.5,483.71 299.5,481.5 C299.5,481.5 299.5,468.38 299.5,468.38 C299.5,466.17 301.29,464.38 303.5,464.38 C303.5,464.38 389.94,464.38 389.94,464.38 C392.15,464.38 393.94,466.17 393.94,468.38c  M394 468 C394,477.67 386.17,485.5 376.5,485.5 C376.5,485.5 290,485.5 290,485.5 C280.33,485.5 272.5,477.67 272.5,468 C272.5,458.34 280.33,450.5 290,450.5 C290,450.5 376.5,450.5 376.5,450.5 C386.17,450.5 394,458.34 394,468c " />
-                            <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_10_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M394 494 C394,494 394,547 394,547 C394,549.21 392.21,551 390,551 C390,551 164,551 164,551 C161.79,551 160,549.21 160,547 C160,547 160,494 160,494 C160,491.79 161.79,490 164,490 C164,490 390,490 390,490 C392.21,490 394,491.79 394,494c  M394 508 C394,508 394,545 394,545 C394,554.94 385.94,563 376,563 C376,563 142,563 142,563 C132.06,563 124,554.94 124,545 C124,545 124,508 124,508 C124,498.06 132.06,490 142,490 C142,490 376,490 376,490 C385.94,490 394,498.06 394,508c " />
-                            <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_11_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M394 690 C394,690 394,727 394,727 C394,736.94 385.94,745 376,745 C376,745 142,745 142,745 C132.06,745 124,736.94 124,727 C124,727 124,690 124,690 C124,680.06 132.06,672 142,672 C142,672 376,672 376,672 C385.94,672 394,680.06 394,690c " />
-                            <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_12_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#e8eaed"
-                                android:fillType="nonZero"
-                                android:pathData=" M267.5 617 C267.5,626.67 259.67,634.5 250,634.5 C250,634.5 104.5,634.5 104.5,634.5 C94.84,634.5 87,626.67 87,617 C87,607.34 94.84,599.5 104.5,599.5 C104.5,599.5 250,599.5 250,599.5 C259.67,599.5 267.5,607.34 267.5,617c " />
-                            <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_13_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#e8eaed"
-                                android:fillType="nonZero"
-                                android:pathData=" M299 395.5 C299,405.17 291.16,413 281.5,413 C281.5,413 104.5,413 104.5,413 C94.84,413 87,405.17 87,395.5 C87,385.84 94.84,378 104.5,378 C104.5,378 281.5,378 281.5,378 C291.16,378 299,385.84 299,395.5c " />
-                        </group>
-                    </group>
-                </group>
-                <group
-                    android:name="_R_G_L_3_G"
-                    android:scaleY="0">
-                    <group
-                        android:name="_R_G_L_3_G_L_0_G"
-                        android:scaleY="0">
-                        <group
-                            android:name="_R_G_L_3_G_L_0_G_L_0_G"
-                            android:scaleY="0">
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_0_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#dadce0"
-                                android:fillType="nonZero"
-                                android:pathData=" M412 0 C412,0 412,892 412,892 C412,892 0,892 0,892 C0,892 0,0 0,0 C0,0 412,0 412,0c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_1_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#e8eaed"
-                                android:fillType="nonZero"
-                                android:pathData=" M412 0 C412,0 412,101 412,101 C412,101 0,101 0,101 C0,101 0,0 0,0 C0,0 412,0 412,0c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_2_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M195 143 C195,143 195,153 195,153 C195,155.21 193.21,157 191,157 C191,157 106,157 106,157 C103.79,157 102,155.21 102,153 C102,153 102,143 102,143 C102,140.79 103.79,139 106,139 C106,139 191,139 191,139 C193.21,139 195,140.79 195,143c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_3_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M270 165 C270,165 270,173 270,173 C270,175.21 268.21,177 266,177 C266,177 106,177 106,177 C103.79,177 102,175.21 102,173 C102,173 102,165 102,165 C102,162.79 103.79,161 106,161 C106,161 266,161 266,161 C268.21,161 270,162.79 270,165c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_4_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M222 231 C222,231 222,241 222,241 C222,243.21 220.21,245 218,245 C218,245 106,245 106,245 C103.79,245 102,243.21 102,241 C102,241 102,231 102,231 C102,228.79 103.79,227 106,227 C106,227 218,227 218,227 C220.21,227 222,228.79 222,231c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_5_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M241 253 C241,253 241,261 241,261 C241,263.21 239.21,265 237,265 C237,265 106,265 106,265 C103.79,265 102,263.21 102,261 C102,261 102,253 102,253 C102,250.79 103.79,249 106,249 C106,249 237,249 237,249 C239.21,249 241,250.79 241,253c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_6_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M214 319 C214,319 214,329 214,329 C214,331.21 212.21,333 210,333 C210,333 106,333 106,333 C103.79,333 102,331.21 102,329 C102,329 102,319 102,319 C102,316.79 103.79,315 106,315 C106,315 210,315 210,315 C212.21,315 214,316.79 214,319c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_7_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M333 341 C333,341 333,349 333,349 C333,351.21 331.21,353 329,353 C329,353 106,353 106,353 C103.79,353 102,351.21 102,349 C102,349 102,341 102,341 C102,338.79 103.79,337 106,337 C106,337 329,337 329,337 C331.21,337 333,338.79 333,341c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_8_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M238 407 C238,407 238,417 238,417 C238,419.21 236.21,421 234,421 C234,421 106,421 106,421 C103.79,421 102,419.21 102,417 C102,417 102,407 102,407 C102,404.79 103.79,403 106,403 C106,403 234,403 234,403 C236.21,403 238,404.79 238,407c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_9_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M295 429 C295,429 295,437 295,437 C295,439.21 293.21,441 291,441 C291,441 106,441 106,441 C103.79,441 102,439.21 102,437 C102,437 102,429 102,429 C102,426.79 103.79,425 106,425 C106,425 291,425 291,425 C293.21,425 295,426.79 295,429c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_10_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M168 495 C168,495 168,505 168,505 C168,507.21 166.21,509 164,509 C164,509 106,509 106,509 C103.79,509 102,507.21 102,505 C102,505 102,495 102,495 C102,492.79 103.79,491 106,491 C106,491 164,491 164,491 C166.21,491 168,492.79 168,495c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_11_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M269 517 C269,517 269,525 269,525 C269,527.21 267.21,529 265,529 C265,529 106,529 106,529 C103.79,529 102,527.21 102,525 C102,525 102,517 102,517 C102,514.79 103.79,513 106,513 C106,513 265,513 265,513 C267.21,513 269,514.79 269,517c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_12_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M235 583 C235,583 235,593 235,593 C235,595.21 233.21,597 231,597 C231,597 106,597 106,597 C103.79,597 102,595.21 102,593 C102,593 102,583 102,583 C102,580.79 103.79,579 106,579 C106,579 231,579 231,579 C233.21,579 235,580.79 235,583c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_13_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M295 605 C295,605 295,613 295,613 C295,615.21 293.21,617 291,617 C291,617 106,617 106,617 C103.79,617 102,615.21 102,613 C102,613 102,605 102,605 C102,602.79 103.79,601 106,601 C106,601 291,601 291,601 C293.21,601 295,602.79 295,605c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_14_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M223 671 C223,671 223,681 223,681 C223,683.21 221.21,685 219,685 C219,685 106,685 106,685 C103.79,685 102,683.21 102,681 C102,681 102,671 102,671 C102,668.79 103.79,667 106,667 C106,667 219,667 219,667 C221.21,667 223,668.79 223,671c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_15_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M246 693 C246,693 246,701 246,701 C246,703.21 244.21,705 242,705 C242,705 106,705 106,705 C103.79,705 102,703.21 102,701 C102,701 102,693 102,693 C102,690.79 103.79,689 106,689 C106,689 242,689 242,689 C244.21,689 246,690.79 246,693c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_16_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M388 798 C388,798 388,798 388,798 C388,813.45 375.45,826 360,826 C360,826 267,826 267,826 C251.55,826 239,813.45 239,798 C239,798 239,798 239,798 C239,782.55 251.55,770 267,770 C267,770 360,770 360,770 C375.45,770 388,782.55 388,798c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_17_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#f8f9fa"
-                                android:fillType="nonZero"
-                                android:pathData=" M377 47 C377,47 377,75 377,75 C377,77.21 375.21,79 373,79 C373,79 38,79 38,79 C35.79,79 34,77.21 34,75 C34,75 34,47 34,47 C34,44.79 35.79,43 38,43 C38,43 373,43 373,43 C375.21,43 377,44.79 377,47c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_18_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#9aa0a6"
-                                android:fillType="nonZero"
-                                android:pathData=" M82 157 C82,172.46 69.46,185 54,185 C38.54,185 26,172.46 26,157 C26,141.54 38.54,129 54,129 C69.46,129 82,141.54 82,157c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_19_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#9aa0a6"
-                                android:fillType="nonZero"
-                                android:pathData=" M82 245 C82,260.46 69.46,273 54,273 C38.54,273 26,260.46 26,245 C26,229.54 38.54,217 54,217 C69.46,217 82,229.54 82,245c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_20_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#9aa0a6"
-                                android:fillType="nonZero"
-                                android:pathData=" M82 333 C82,348.46 69.46,361 54,361 C38.54,361 26,348.46 26,333 C26,317.54 38.54,305 54,305 C69.46,305 82,317.54 82,333c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_21_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#9aa0a6"
-                                android:fillType="nonZero"
-                                android:pathData=" M82 421 C82,436.46 69.46,449 54,449 C38.54,449 26,436.46 26,421 C26,405.54 38.54,393 54,393 C69.46,393 82,405.54 82,421c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_22_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#9aa0a6"
-                                android:fillType="nonZero"
-                                android:pathData=" M82 509 C82,524.46 69.46,537 54,537 C38.54,537 26,524.46 26,509 C26,493.54 38.54,481 54,481 C69.46,481 82,493.54 82,509c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_23_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#9aa0a6"
-                                android:fillType="nonZero"
-                                android:pathData=" M82 597 C82,612.46 69.46,625 54,625 C38.54,625 26,612.46 26,597 C26,581.54 38.54,569 54,569 C69.46,569 82,581.54 82,597c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_24_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#9aa0a6"
-                                android:fillType="nonZero"
-                                android:pathData=" M82 685 C82,700.46 69.46,713 54,713 C38.54,713 26,700.46 26,685 C26,669.54 38.54,657 54,657 C69.46,657 82,669.54 82,685c " />
-                        </group>
-                    </group>
-                </group>
-                <group
-                    android:name="_R_G_L_2_G"
-                    android:scaleY="0"
-                    android:translateX="28.25"
-                    android:translateY="443">
-                    <group
-                        android:name="_R_G_L_2_G_D_0_P_0_G_0_T_0"
-                        android:translateX="-60"
-                        android:translateY="53">
-                        <path
-                            android:name="_R_G_L_2_G_D_0_P_0"
-                            android:fillAlpha="1"
-                            android:fillColor="#ffffff"
-                            android:fillType="nonZero"
-                            android:pathData=" M28.25 0 C28.25,31.2 2.95,56.5 -28.25,56.5 C-28.25,56.5 -28.25,-56.5 -28.25,-56.5 C2.95,-56.5 28.25,-31.2 28.25,0c " />
-                    </group>
-                </group>
-                <group
-                    android:name="_R_G_L_1_G"
-                    android:rotation="180"
-                    android:scaleY="0"
-                    android:translateX="25.75"
-                    android:translateY="496">
-                    <group
-                        android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0"
-                        android:scaleX="0.5"
-                        android:scaleY="0.5"
-                        android:translateX="39"
-                        android:translateY="0">
-                        <path
-                            android:name="_R_G_L_1_G_D_0_P_0"
-                            android:fillAlpha="0"
-                            android:fillColor="#3c3e40"
-                            android:fillType="nonZero"
-                            android:pathData=" M3.87 -13.45 C3.07,-14.21 1.8,-14.18 1.04,-13.38 C0.28,-12.58 0.31,-11.31 1.11,-10.55 C1.11,-10.55 9.75,-2.32 9.75,-2.32 C9.75,-2.32 -14.75,-2.32 -14.75,-2.32 C-15.85,-2.32 -16.75,-1.43 -16.75,-0.32 C-16.75,0.78 -15.85,1.68 -14.75,1.68 C-14.75,1.68 9.94,1.68 9.94,1.68 C9.94,1.68 1.07,10.59 1.07,10.59 C0.29,11.37 0.29,12.64 1.08,13.42 C1.86,14.2 3.13,14.19 3.9,13.41 C3.9,13.41 16.17,1.09 16.17,1.09 C16.55,0.71 16.76,0.19 16.75,-0.35 C16.74,-0.89 16.52,-1.4 16.13,-1.77 C16.13,-1.77 3.87,-13.45 3.87,-13.45c " />
-                    </group>
-                </group>
-                <group
-                    android:name="_R_G_L_0_G"
-                    android:translateX="206"
-                    android:translateY="446">
-                    <path
-                        android:name="_R_G_L_0_G_D_0_P_0"
-                        android:fillAlpha="0"
-                        android:fillColor="#84ba69"
-                        android:fillType="nonZero"
-                        android:pathData=" M-206.5 13.5 C-186.34,13.5 -170,29.84 -170,50 C-170,70.16 -186.34,86.5 -206.5,86.5 C-226.66,86.5 -243,70.16 -243,50 C-243,29.84 -226.66,13.5 -206.5,13.5c " />
-                </group>
-            </group>
-            <group android:name="time_group" />
-        </vector>
-    </aapt:attr>
-</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_motion_back_right_dark_mode.xml b/quickstep/res/drawable/gesture_tutorial_motion_back_right.xml
similarity index 82%
rename from quickstep/res/drawable/gesture_tutorial_motion_back_right_dark_mode.xml
rename to quickstep/res/drawable/gesture_tutorial_motion_back_right.xml
index b898dc17a6..b368d9d045 100644
--- a/quickstep/res/drawable/gesture_tutorial_motion_back_right_dark_mode.xml
+++ b/quickstep/res/drawable/gesture_tutorial_motion_back_right.xml
@@ -1,6 +1,6 @@
 <animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt">
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_0_P_0">
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_0_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -17,7 +17,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_1_P_0">
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_1_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -34,7 +34,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_2_P_0">
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_2_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -51,7 +51,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_3_P_0">
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_3_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -68,7 +68,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_4_P_0">
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_4_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -85,7 +85,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_5_P_0">
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_5_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -102,7 +102,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_6_P_0">
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_6_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -119,7 +119,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_7_P_0">
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_7_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -136,7 +136,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_8_P_0">
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_8_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -153,7 +153,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_9_P_0">
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_9_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -170,7 +170,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_10_P_0">
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_10_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -187,7 +187,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_11_P_0">
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_11_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -204,7 +204,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_12_P_0">
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_12_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -221,7 +221,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_13_P_0">
+    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_13_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -238,7 +238,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G_L_0_G">
+    <target android:name="_R_G_L_3_G_L_0_G">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -251,7 +251,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G">
+    <target android:name="_R_G_L_3_G">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -279,7 +279,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_4_G">
+    <target android:name="_R_G_L_3_G">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -292,7 +292,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_0_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_0_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -309,7 +309,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_1_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_1_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -326,7 +326,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_2_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_2_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -343,7 +343,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_3_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_3_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -360,7 +360,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_4_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_4_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -377,7 +377,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_5_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_5_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -394,7 +394,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_6_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_6_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -411,7 +411,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_7_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_7_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -428,7 +428,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_8_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_8_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -445,7 +445,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_9_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_9_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -462,7 +462,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_10_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_10_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -479,7 +479,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_11_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_11_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -496,7 +496,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_12_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_12_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -513,7 +513,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_13_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_13_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -530,7 +530,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_14_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_14_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -547,7 +547,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_15_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_15_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -564,7 +564,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_16_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_16_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -581,7 +581,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_17_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_17_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -598,7 +598,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_18_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_18_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -615,7 +615,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_19_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_19_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -632,7 +632,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_20_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_20_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -649,7 +649,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_21_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_21_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -666,7 +666,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_22_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_22_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -683,7 +683,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_23_P_0">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_23_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -700,20 +700,24 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_24_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
+                    android:duration="333"
+                    android:propertyName="fillAlpha"
                     android:startOffset="1417"
                     android:valueFrom="0"
                     android:valueTo="1"
-                    android:valueType="floatType" />
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G_L_0_G">
+    <target android:name="_R_G_L_2_G_L_0_G_L_0_G">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -726,7 +730,7 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_3_G">
+    <target android:name="_R_G_L_2_G_L_0_G">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
@@ -739,138 +743,47 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_2_G_D_0_P_0_G_0_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="667"
-                    android:pathData="M 414,53C 404.333,53 365.667,53 356,53"
-                    android:propertyName="translateXY"
-                    android:propertyXName="translateX"
-                    android:propertyYName="translateY"
-                    android:startOffset="217">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="333"
-                    android:pathData="M 356,53C 356,53 356,53 356,53"
-                    android:propertyName="translateXY"
-                    android:propertyXName="translateX"
-                    android:propertyYName="translateY"
-                    android:startOffset="883">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0.333 0,0 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="333"
-                    android:pathData="M 356,53C 365.667,53 404.333,53 414,53"
-                    android:propertyName="translateXY"
-                    android:propertyXName="translateX"
-                    android:propertyYName="translateY"
-                    android:startOffset="1217">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
     <target android:name="_R_G_L_2_G">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
                     android:duration="0"
                     android:propertyName="scaleY"
-                    android:startOffset="217"
+                    android:startOffset="1417"
                     android:valueFrom="0"
                     android:valueTo="1"
                     android:valueType="floatType" />
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="2467"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G_D_0_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="417"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="383"
-                    android:valueFrom="0"
-                    android:valueTo="0.5"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="417"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="800"
-                    android:valueFrom="0.5"
-                    android:valueTo="0.5"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="200"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="0.5"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
     <target android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
-                    android:duration="583"
-                    android:pathData="M -407,0C -399,0 -367,0 -359,0"
+                    android:duration="667"
+                    android:pathData="M 565.282,129.757C 554.782,129.757 512.7819999999999,129.757 502.282,129.757"
                     android:propertyName="translateXY"
                     android:propertyXName="translateX"
                     android:propertyYName="translateY"
                     android:startOffset="217">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0,1 1.0,1.0" />
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator
-                    android:duration="417"
-                    android:pathData="M -359,0C -359,0 -359,0 -359,0"
+                    android:duration="333"
+                    android:pathData="M 502.282,129.757C 502.282,129.757 502.282,129.757 502.282,129.757"
                     android:propertyName="translateXY"
                     android:propertyXName="translateX"
                     android:propertyYName="translateY"
-                    android:startOffset="800">
+                    android:startOffset="883">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0.333 0.667,0.667 1.0,1.0" />
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator
-                    android:duration="333"
-                    android:pathData="M -359,0C -367,0 -399,0 -407,0"
+                    android:duration="250"
+                    android:pathData="M 502.282,129.757C 512.7819999999999,129.757 554.782,129.757 565.282,129.757"
                     android:propertyName="translateXY"
                     android:propertyXName="translateX"
                     android:propertyYName="translateY"
@@ -882,85 +795,13 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="583"
-                    android:propertyName="scaleX"
-                    android:startOffset="217"
-                    android:valueFrom="0.5"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="583"
-                    android:propertyName="scaleY"
-                    android:startOffset="217"
-                    android:valueFrom="0.5"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="417"
-                    android:propertyName="scaleX"
-                    android:startOffset="800"
-                    android:valueFrom="1"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="417"
-                    android:propertyName="scaleY"
-                    android:startOffset="800"
-                    android:valueFrom="1"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="scaleX"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0.5"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="scaleY"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0.5"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
     <target android:name="_R_G_L_1_G">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator
                     android:duration="0"
                     android:propertyName="scaleY"
-                    android:startOffset="383"
+                    android:startOffset="217"
                     android:valueFrom="0"
                     android:valueTo="1"
                     android:valueType="floatType" />
@@ -973,7 +814,7 @@
                 <objectAnimator
                     android:duration="0"
                     android:propertyName="scaleY"
-                    android:startOffset="2333"
+                    android:startOffset="2383"
                     android:valueFrom="1"
                     android:valueTo="0"
                     android:valueType="floatType" />
@@ -1090,104 +931,104 @@
             android:viewportWidth="412">
             <group android:name="_R_G">
                 <group
-                    android:name="_R_G_L_5_G"
+                    android:name="_R_G_L_4_G"
                     android:translateX="206"
                     android:translateY="446">
                     <path
-                        android:name="_R_G_L_5_G_D_0_P_0"
+                        android:name="_R_G_L_4_G_D_0_P_0"
                         android:fillAlpha="1"
                         android:fillColor="#dadce0"
                         android:fillType="nonZero"
                         android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c " />
                 </group>
                 <group
-                    android:name="_R_G_L_4_G"
+                    android:name="_R_G_L_3_G"
                     android:pivotX="206"
                     android:pivotY="446"
                     android:scaleX="1"
                     android:scaleY="1">
-                    <group android:name="_R_G_L_4_G_L_0_G">
-                        <group android:name="_R_G_L_4_G_L_0_G_L_0_G">
+                    <group android:name="_R_G_L_3_G_L_0_G">
+                        <group android:name="_R_G_L_3_G_L_0_G_L_0_G">
                             <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_0_P_0"
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_0_P_0"
                                 android:fillAlpha="1"
                                 android:fillColor="#f1f3f4"
                                 android:fillType="nonZero"
                                 android:pathData=" M412 101 C412,101 412,892 412,892 C412,892 0,892 0,892 C0,892 0,101 0,101 C0,101 412,101 412,101c " />
                             <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_1_P_0"
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_1_P_0"
                                 android:fillAlpha="1"
                                 android:fillColor="#e8eaed"
                                 android:fillType="nonZero"
                                 android:pathData=" M412 0 C412,0 412,101 412,101 C412,101 0,101 0,101 C0,101 0,0 0,0 C0,0 412,0 412,0c " />
                             <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_2_P_0"
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_2_P_0"
                                 android:fillAlpha="1"
                                 android:fillColor="#dadce0"
                                 android:fillType="nonZero"
                                 android:pathData=" M383 804 C383,816.15 373.15,826 361,826 C361,826 51,826 51,826 C38.85,826 29,816.15 29,804 C29,791.85 38.85,782 51,782 C51,782 361,782 361,782 C373.15,782 383,791.85 383,804c " />
                             <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_3_P_0"
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_3_P_0"
                                 android:fillAlpha="1"
                                 android:fillColor="#dadce0"
                                 android:fillType="nonZero"
                                 android:pathData=" M201 47 C201,47 201,75 201,75 C201,77.21 199.21,79 197,79 C197,79 38,79 38,79 C35.79,79 34,77.21 34,75 C34,75 34,47 34,47 C34,44.79 35.79,43 38,43 C38,43 197,43 197,43 C199.21,43 201,44.79 201,47c " />
                             <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_4_P_0"
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_4_P_0"
                                 android:fillAlpha="1"
                                 android:fillColor="#dadce0"
                                 android:fillType="nonZero"
                                 android:pathData=" M388 47 C388,47 388,75 388,75 C388,77.21 386.21,79 384,79 C384,79 356,79 356,79 C353.79,79 352,77.21 352,75 C352,75 352,47 352,47 C352,44.79 353.79,43 356,43 C356,43 384,43 384,43 C386.21,43 388,44.79 388,47c " />
                             <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_5_P_0"
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_5_P_0"
                                 android:fillAlpha="1"
                                 android:fillColor="#dadce0"
                                 android:fillType="nonZero"
                                 android:pathData=" M336 47 C336,47 336,75 336,75 C336,77.21 334.21,79 332,79 C332,79 304,79 304,79 C301.79,79 300,77.21 300,75 C300,75 300,47 300,47 C300,44.79 301.79,43 304,43 C304,43 332,43 332,43 C334.21,43 336,44.79 336,47c " />
                             <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_6_P_0"
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_6_P_0"
                                 android:fillAlpha="1"
                                 android:fillColor="#dadce0"
                                 android:fillType="nonZero"
                                 android:pathData=" M70 618 C70,630.15 60.15,640 48,640 C35.85,640 26,630.15 26,618 C26,605.85 35.85,596 48,596 C60.15,596 70,605.85 70,618c " />
                             <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_7_P_0"
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_7_P_0"
                                 android:fillAlpha="1"
                                 android:fillColor="#dadce0"
                                 android:fillType="nonZero"
                                 android:pathData=" M70 396 C70,408.15 60.15,418 48,418 C35.85,418 26,408.15 26,396 C26,383.85 35.85,374 48,374 C60.15,374 70,383.85 70,396c " />
                             <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_8_P_0"
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_8_P_0"
                                 android:fillAlpha="1"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M394 248 C394,248 394,324 394,324 C394,333.94 385.94,342 376,342 C376,342 142,342 142,342 C132.06,342 124,333.94 124,324 C124,324 124,248 124,248 C124,238.06 132.06,230 142,230 C142,230 376,230 376,230 C385.94,230 394,238.06 394,248c " />
                             <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_9_P_0"
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_9_P_0"
                                 android:fillAlpha="1"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M393.94 468.38 C393.94,468.38 393.94,481.5 393.94,481.5 C393.94,483.71 392.15,485.5 389.94,485.5 C389.94,485.5 303.5,485.5 303.5,485.5 C301.29,485.5 299.5,483.71 299.5,481.5 C299.5,481.5 299.5,468.38 299.5,468.38 C299.5,466.17 301.29,464.38 303.5,464.38 C303.5,464.38 389.94,464.38 389.94,464.38 C392.15,464.38 393.94,466.17 393.94,468.38c  M394 468 C394,477.67 386.17,485.5 376.5,485.5 C376.5,485.5 290,485.5 290,485.5 C280.33,485.5 272.5,477.67 272.5,468 C272.5,458.34 280.33,450.5 290,450.5 C290,450.5 376.5,450.5 376.5,450.5 C386.17,450.5 394,458.34 394,468c " />
                             <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_10_P_0"
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_10_P_0"
                                 android:fillAlpha="1"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M394 494 C394,494 394,547 394,547 C394,549.21 392.21,551 390,551 C390,551 164,551 164,551 C161.79,551 160,549.21 160,547 C160,547 160,494 160,494 C160,491.79 161.79,490 164,490 C164,490 390,490 390,490 C392.21,490 394,491.79 394,494c  M394 508 C394,508 394,545 394,545 C394,554.94 385.94,563 376,563 C376,563 142,563 142,563 C132.06,563 124,554.94 124,545 C124,545 124,508 124,508 C124,498.06 132.06,490 142,490 C142,490 376,490 376,490 C385.94,490 394,498.06 394,508c " />
                             <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_11_P_0"
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_11_P_0"
                                 android:fillAlpha="1"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M394 690 C394,690 394,727 394,727 C394,736.94 385.94,745 376,745 C376,745 142,745 142,745 C132.06,745 124,736.94 124,727 C124,727 124,690 124,690 C124,680.06 132.06,672 142,672 C142,672 376,672 376,672 C385.94,672 394,680.06 394,690c " />
                             <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_12_P_0"
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_12_P_0"
                                 android:fillAlpha="1"
                                 android:fillColor="#e8eaed"
                                 android:fillType="nonZero"
                                 android:pathData=" M267.5 617 C267.5,626.67 259.67,634.5 250,634.5 C250,634.5 104.5,634.5 104.5,634.5 C94.84,634.5 87,626.67 87,617 C87,607.34 94.84,599.5 104.5,599.5 C104.5,599.5 250,599.5 250,599.5 C259.67,599.5 267.5,607.34 267.5,617c " />
                             <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_13_P_0"
+                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_13_P_0"
                                 android:fillAlpha="1"
                                 android:fillColor="#e8eaed"
                                 android:fillType="nonZero"
@@ -1196,160 +1037,160 @@
                     </group>
                 </group>
                 <group
-                    android:name="_R_G_L_3_G"
+                    android:name="_R_G_L_2_G"
                     android:scaleY="0">
                     <group
-                        android:name="_R_G_L_3_G_L_0_G"
+                        android:name="_R_G_L_2_G_L_0_G"
                         android:scaleY="0">
                         <group
-                            android:name="_R_G_L_3_G_L_0_G_L_0_G"
+                            android:name="_R_G_L_2_G_L_0_G_L_0_G"
                             android:scaleY="0">
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_0_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_0_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#dadce0"
                                 android:fillType="nonZero"
                                 android:pathData=" M412 0 C412,0 412,892 412,892 C412,892 0,892 0,892 C0,892 0,0 0,0 C0,0 412,0 412,0c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_1_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_1_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#e8eaed"
                                 android:fillType="nonZero"
                                 android:pathData=" M412 0 C412,0 412,101 412,101 C412,101 0,101 0,101 C0,101 0,0 0,0 C0,0 412,0 412,0c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_2_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_2_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M195 143 C195,143 195,153 195,153 C195,155.21 193.21,157 191,157 C191,157 106,157 106,157 C103.79,157 102,155.21 102,153 C102,153 102,143 102,143 C102,140.79 103.79,139 106,139 C106,139 191,139 191,139 C193.21,139 195,140.79 195,143c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_3_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_3_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M270 165 C270,165 270,173 270,173 C270,175.21 268.21,177 266,177 C266,177 106,177 106,177 C103.79,177 102,175.21 102,173 C102,173 102,165 102,165 C102,162.79 103.79,161 106,161 C106,161 266,161 266,161 C268.21,161 270,162.79 270,165c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_4_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_4_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M222 231 C222,231 222,241 222,241 C222,243.21 220.21,245 218,245 C218,245 106,245 106,245 C103.79,245 102,243.21 102,241 C102,241 102,231 102,231 C102,228.79 103.79,227 106,227 C106,227 218,227 218,227 C220.21,227 222,228.79 222,231c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_5_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_5_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M241 253 C241,253 241,261 241,261 C241,263.21 239.21,265 237,265 C237,265 106,265 106,265 C103.79,265 102,263.21 102,261 C102,261 102,253 102,253 C102,250.79 103.79,249 106,249 C106,249 237,249 237,249 C239.21,249 241,250.79 241,253c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_6_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_6_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M214 319 C214,319 214,329 214,329 C214,331.21 212.21,333 210,333 C210,333 106,333 106,333 C103.79,333 102,331.21 102,329 C102,329 102,319 102,319 C102,316.79 103.79,315 106,315 C106,315 210,315 210,315 C212.21,315 214,316.79 214,319c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_7_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_7_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M333 341 C333,341 333,349 333,349 C333,351.21 331.21,353 329,353 C329,353 106,353 106,353 C103.79,353 102,351.21 102,349 C102,349 102,341 102,341 C102,338.79 103.79,337 106,337 C106,337 329,337 329,337 C331.21,337 333,338.79 333,341c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_8_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_8_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M238 407 C238,407 238,417 238,417 C238,419.21 236.21,421 234,421 C234,421 106,421 106,421 C103.79,421 102,419.21 102,417 C102,417 102,407 102,407 C102,404.79 103.79,403 106,403 C106,403 234,403 234,403 C236.21,403 238,404.79 238,407c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_9_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_9_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M295 429 C295,429 295,437 295,437 C295,439.21 293.21,441 291,441 C291,441 106,441 106,441 C103.79,441 102,439.21 102,437 C102,437 102,429 102,429 C102,426.79 103.79,425 106,425 C106,425 291,425 291,425 C293.21,425 295,426.79 295,429c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_10_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_10_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M168 495 C168,495 168,505 168,505 C168,507.21 166.21,509 164,509 C164,509 106,509 106,509 C103.79,509 102,507.21 102,505 C102,505 102,495 102,495 C102,492.79 103.79,491 106,491 C106,491 164,491 164,491 C166.21,491 168,492.79 168,495c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_11_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_11_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M269 517 C269,517 269,525 269,525 C269,527.21 267.21,529 265,529 C265,529 106,529 106,529 C103.79,529 102,527.21 102,525 C102,525 102,517 102,517 C102,514.79 103.79,513 106,513 C106,513 265,513 265,513 C267.21,513 269,514.79 269,517c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_12_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_12_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M235 583 C235,583 235,593 235,593 C235,595.21 233.21,597 231,597 C231,597 106,597 106,597 C103.79,597 102,595.21 102,593 C102,593 102,583 102,583 C102,580.79 103.79,579 106,579 C106,579 231,579 231,579 C233.21,579 235,580.79 235,583c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_13_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_13_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M295 605 C295,605 295,613 295,613 C295,615.21 293.21,617 291,617 C291,617 106,617 106,617 C103.79,617 102,615.21 102,613 C102,613 102,605 102,605 C102,602.79 103.79,601 106,601 C106,601 291,601 291,601 C293.21,601 295,602.79 295,605c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_14_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_14_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M223 671 C223,671 223,681 223,681 C223,683.21 221.21,685 219,685 C219,685 106,685 106,685 C103.79,685 102,683.21 102,681 C102,681 102,671 102,671 C102,668.79 103.79,667 106,667 C106,667 219,667 219,667 C221.21,667 223,668.79 223,671c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_15_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_15_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M246 693 C246,693 246,701 246,701 C246,703.21 244.21,705 242,705 C242,705 106,705 106,705 C103.79,705 102,703.21 102,701 C102,701 102,693 102,693 C102,690.79 103.79,689 106,689 C106,689 242,689 242,689 C244.21,689 246,690.79 246,693c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_16_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_16_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#bdc1c6"
                                 android:fillType="nonZero"
                                 android:pathData=" M388 798 C388,798 388,798 388,798 C388,813.45 375.45,826 360,826 C360,826 267,826 267,826 C251.55,826 239,813.45 239,798 C239,798 239,798 239,798 C239,782.55 251.55,770 267,770 C267,770 360,770 360,770 C375.45,770 388,782.55 388,798c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_17_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_17_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#f8f9fa"
                                 android:fillType="nonZero"
                                 android:pathData=" M377 47 C377,47 377,75 377,75 C377,77.21 375.21,79 373,79 C373,79 38,79 38,79 C35.79,79 34,77.21 34,75 C34,75 34,47 34,47 C34,44.79 35.79,43 38,43 C38,43 373,43 373,43 C375.21,43 377,44.79 377,47c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_18_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_18_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#9aa0a6"
                                 android:fillType="nonZero"
                                 android:pathData=" M82 157 C82,172.46 69.46,185 54,185 C38.54,185 26,172.46 26,157 C26,141.54 38.54,129 54,129 C69.46,129 82,141.54 82,157c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_19_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_19_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#9aa0a6"
                                 android:fillType="nonZero"
                                 android:pathData=" M82 245 C82,260.46 69.46,273 54,273 C38.54,273 26,260.46 26,245 C26,229.54 38.54,217 54,217 C69.46,217 82,229.54 82,245c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_20_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_20_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#9aa0a6"
                                 android:fillType="nonZero"
                                 android:pathData=" M82 333 C82,348.46 69.46,361 54,361 C38.54,361 26,348.46 26,333 C26,317.54 38.54,305 54,305 C69.46,305 82,317.54 82,333c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_21_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_21_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#9aa0a6"
                                 android:fillType="nonZero"
                                 android:pathData=" M82 421 C82,436.46 69.46,449 54,449 C38.54,449 26,436.46 26,421 C26,405.54 38.54,393 54,393 C69.46,393 82,405.54 82,421c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_22_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_22_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#9aa0a6"
                                 android:fillType="nonZero"
                                 android:pathData=" M82 509 C82,524.46 69.46,537 54,537 C38.54,537 26,524.46 26,509 C26,493.54 38.54,481 54,481 C69.46,481 82,493.54 82,509c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_23_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_23_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#9aa0a6"
                                 android:fillType="nonZero"
                                 android:pathData=" M82 597 C82,612.46 69.46,625 54,625 C38.54,625 26,612.46 26,597 C26,581.54 38.54,569 54,569 C69.46,569 82,581.54 82,597c " />
                             <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_24_P_0"
+                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_24_P_0"
                                 android:fillAlpha="0"
                                 android:fillColor="#9aa0a6"
                                 android:fillType="nonZero"
@@ -1357,42 +1198,21 @@
                         </group>
                     </group>
                 </group>
-                <group
-                    android:name="_R_G_L_2_G"
-                    android:scaleY="0"
-                    android:translateX="28.25"
-                    android:translateY="443">
-                    <group
-                        android:name="_R_G_L_2_G_D_0_P_0_G_0_T_0"
-                        android:rotation="180"
-                        android:translateX="414"
-                        android:translateY="53">
-                        <path
-                            android:name="_R_G_L_2_G_D_0_P_0"
-                            android:fillAlpha="1"
-                            android:fillColor="#000000"
-                            android:fillType="nonZero"
-                            android:pathData=" M28.25 0 C28.25,31.2 2.95,56.5 -28.25,56.5 C-28.25,56.5 -28.25,-56.5 -28.25,-56.5 C2.95,-56.5 28.25,-31.2 28.25,0c " />
-                    </group>
-                </group>
                 <group
                     android:name="_R_G_L_1_G"
-                    android:rotation="180"
                     android:scaleY="0"
-                    android:translateX="25.75"
-                    android:translateY="496">
+                    android:translateX="-17.875"
+                    android:translateY="322.017">
                     <group
                         android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0"
-                        android:scaleX="0.5"
-                        android:scaleY="0.5"
-                        android:translateX="-407"
-                        android:translateY="0">
+                        android:translateX="565.282"
+                        android:translateY="129.757">
                         <path
                             android:name="_R_G_L_1_G_D_0_P_0"
-                            android:fillAlpha="0"
-                            android:fillColor="#ffffff"
+                            android:fillAlpha="1"
+                            android:fillColor="#3b4043"
                             android:fillType="nonZero"
-                            android:pathData=" M3.87 -13.45 C3.07,-14.21 1.8,-14.18 1.04,-13.38 C0.28,-12.58 0.31,-11.31 1.11,-10.55 C1.11,-10.55 9.75,-2.32 9.75,-2.32 C9.75,-2.32 -14.75,-2.32 -14.75,-2.32 C-15.85,-2.32 -16.75,-1.43 -16.75,-0.32 C-16.75,0.78 -15.85,1.68 -14.75,1.68 C-14.75,1.68 9.94,1.68 9.94,1.68 C9.94,1.68 1.07,10.59 1.07,10.59 C0.29,11.37 0.29,12.64 1.08,13.42 C1.86,14.2 3.13,14.19 3.9,13.41 C3.9,13.41 16.17,1.09 16.17,1.09 C16.55,0.71 16.76,0.19 16.75,-0.35 C16.74,-0.89 16.52,-1.4 16.13,-1.77 C16.13,-1.77 3.87,-13.45 3.87,-13.45c " />
+                            android:pathData=" M-109 27.43 C-109,27.43 -112.61,23.81 -112.61,23.81 C-112.61,23.81 -133.03,44.23 -133.03,44.23 C-133.03,44.23 -112.61,64.64 -112.61,64.64 C-112.61,64.64 -109,61.03 -109,61.03 C-109,61.03 -125.8,44.23 -125.8,44.23 C-125.8,44.23 -109,27.43 -109,27.43c " />
                     </group>
                 </group>
                 <group
diff --git a/quickstep/res/drawable/gesture_tutorial_motion_back_right_light_mode.xml b/quickstep/res/drawable/gesture_tutorial_motion_back_right_light_mode.xml
deleted file mode 100644
index c24e5a5012..0000000000
--- a/quickstep/res/drawable/gesture_tutorial_motion_back_right_light_mode.xml
+++ /dev/null
@@ -1,1413 +0,0 @@
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_0_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_1_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_2_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_3_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_4_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_5_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_6_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_7_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_8_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_9_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_10_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_11_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_12_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_L_0_G_L_0_G_D_13_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="1367"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="283"
-                    android:propertyName="scaleX"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0.88012"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="283"
-                    android:propertyName="scaleY"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0.88012"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_4_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="2417"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_0_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_1_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_2_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_3_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_4_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_5_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_6_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_7_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_8_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_9_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_10_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_11_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_12_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_13_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_14_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_15_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_16_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_17_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_18_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_19_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_20_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_21_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_22_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_23_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_D_0_P_0_G_0_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="667"
-                    android:pathData="M 414,53C 404.333,53 365.667,53 356,53"
-                    android:propertyName="translateXY"
-                    android:propertyXName="translateX"
-                    android:propertyYName="translateY"
-                    android:startOffset="217">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="333"
-                    android:pathData="M 356,53C 356,53 356,53 356,53"
-                    android:propertyName="translateXY"
-                    android:propertyXName="translateX"
-                    android:propertyYName="translateY"
-                    android:startOffset="883">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0.333 0,0 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="333"
-                    android:pathData="M 356,53C 365.667,53 404.333,53 414,53"
-                    android:propertyName="translateXY"
-                    android:propertyXName="translateX"
-                    android:propertyYName="translateY"
-                    android:startOffset="1217">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="217"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="2467"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G_D_0_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="417"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="383"
-                    android:valueFrom="0"
-                    android:valueTo="0.5"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="417"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="800"
-                    android:valueFrom="0.5"
-                    android:valueTo="0.5"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="200"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="0.5"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="583"
-                    android:pathData="M -407,0C -399,0 -367,0 -359,0"
-                    android:propertyName="translateXY"
-                    android:propertyXName="translateX"
-                    android:propertyYName="translateY"
-                    android:startOffset="217">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="417"
-                    android:pathData="M -359,0C -359,0 -359,0 -359,0"
-                    android:propertyName="translateXY"
-                    android:propertyXName="translateX"
-                    android:propertyYName="translateY"
-                    android:startOffset="800">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0.333 0.667,0.667 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="333"
-                    android:pathData="M -359,0C -367,0 -399,0 -407,0"
-                    android:propertyName="translateXY"
-                    android:propertyXName="translateX"
-                    android:propertyYName="translateY"
-                    android:startOffset="1217">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="583"
-                    android:propertyName="scaleX"
-                    android:startOffset="217"
-                    android:valueFrom="0.5"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="583"
-                    android:propertyName="scaleY"
-                    android:startOffset="217"
-                    android:valueFrom="0.5"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="417"
-                    android:propertyName="scaleX"
-                    android:startOffset="800"
-                    android:valueFrom="1"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="417"
-                    android:propertyName="scaleY"
-                    android:startOffset="800"
-                    android:valueFrom="1"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="scaleX"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0.5"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="scaleY"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0.5"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="383"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="2333"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_D_0_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="217"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="0"
-                    android:valueFrom="0"
-                    android:valueTo="0.75"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="967"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="217"
-                    android:valueFrom="0.75"
-                    android:valueTo="0.75"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="167"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1183"
-                    android:valueFrom="0.75"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_D_0_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="217"
-                    android:propertyName="pathData"
-                    android:startOffset="0"
-                    android:valueFrom="M205 13.5 C225.16,13.5 241.5,29.84 241.5,50 C241.5,70.16 225.16,86.5 205,86.5 C184.84,86.5 168.5,70.16 168.5,50 C168.5,29.84 184.84,13.5 205,13.5c "
-                    android:valueTo="M205.5 0 C233.11,0 255.5,22.39 255.5,50 C255.5,77.61 233.11,100 205.5,100 C177.89,100 155.5,77.61 155.5,50 C155.5,22.39 177.89,0 205.5,0c "
-                    android:valueType="pathType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="583"
-                    android:propertyName="pathData"
-                    android:startOffset="217"
-                    android:valueFrom="M205.5 0 C233.11,0 255.5,22.39 255.5,50 C255.5,77.61 233.11,100 205.5,100 C177.89,100 155.5,77.61 155.5,50 C155.5,22.39 177.89,0 205.5,0c "
-                    android:valueTo="M0 0 C27.61,0 50,22.39 50,50 C50,77.61 27.61,100 0,100 C-27.61,100 -50,77.61 -50,50 C-50,22.39 -27.61,0 0,0c "
-                    android:valueType="pathType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="383"
-                    android:propertyName="pathData"
-                    android:startOffset="800"
-                    android:valueFrom="M0 0 C27.61,0 50,22.39 50,50 C50,77.61 27.61,100 0,100 C-27.61,100 -50,77.61 -50,50 C-50,22.39 -27.61,0 0,0c "
-                    android:valueTo="M0 0 C27.61,0 50,22.39 50,50 C50,77.61 27.61,100 0,100 C-27.61,100 -50,77.61 -50,50 C-50,22.39 -27.61,0 0,0c "
-                    android:valueType="pathType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="167"
-                    android:propertyName="pathData"
-                    android:startOffset="1183"
-                    android:valueFrom="M0 0 C27.61,0 50,22.39 50,50 C50,77.61 27.61,100 0,100 C-27.61,100 -50,77.61 -50,50 C-50,22.39 -27.61,0 0,0c "
-                    android:valueTo="M0 13.5 C20.16,13.5 36.5,29.84 36.5,50 C36.5,70.16 20.16,86.5 0,86.5 C-20.16,86.5 -36.5,70.16 -36.5,50 C-36.5,29.84 -20.16,13.5 0,13.5c "
-                    android:valueType="pathType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="time_group">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="1767"
-                    android:propertyName="translateX"
-                    android:startOffset="0"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <aapt:attr name="android:drawable">
-        <vector
-            android:width="412dp"
-            android:height="892dp"
-            android:viewportHeight="892"
-            android:viewportWidth="412">
-            <group android:name="_R_G">
-                <group
-                    android:name="_R_G_L_5_G"
-                    android:translateX="206"
-                    android:translateY="446">
-                    <path
-                        android:name="_R_G_L_5_G_D_0_P_0"
-                        android:fillAlpha="1"
-                        android:fillColor="#dadce0"
-                        android:fillType="nonZero"
-                        android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c " />
-                </group>
-                <group
-                    android:name="_R_G_L_4_G"
-                    android:pivotX="206"
-                    android:pivotY="446"
-                    android:scaleX="1"
-                    android:scaleY="1">
-                    <group android:name="_R_G_L_4_G_L_0_G">
-                        <group android:name="_R_G_L_4_G_L_0_G_L_0_G">
-                            <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_0_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#f1f3f4"
-                                android:fillType="nonZero"
-                                android:pathData=" M412 101 C412,101 412,892 412,892 C412,892 0,892 0,892 C0,892 0,101 0,101 C0,101 412,101 412,101c " />
-                            <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_1_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#e8eaed"
-                                android:fillType="nonZero"
-                                android:pathData=" M412 0 C412,0 412,101 412,101 C412,101 0,101 0,101 C0,101 0,0 0,0 C0,0 412,0 412,0c " />
-                            <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_2_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#dadce0"
-                                android:fillType="nonZero"
-                                android:pathData=" M383 804 C383,816.15 373.15,826 361,826 C361,826 51,826 51,826 C38.85,826 29,816.15 29,804 C29,791.85 38.85,782 51,782 C51,782 361,782 361,782 C373.15,782 383,791.85 383,804c " />
-                            <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_3_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#dadce0"
-                                android:fillType="nonZero"
-                                android:pathData=" M201 47 C201,47 201,75 201,75 C201,77.21 199.21,79 197,79 C197,79 38,79 38,79 C35.79,79 34,77.21 34,75 C34,75 34,47 34,47 C34,44.79 35.79,43 38,43 C38,43 197,43 197,43 C199.21,43 201,44.79 201,47c " />
-                            <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_4_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#dadce0"
-                                android:fillType="nonZero"
-                                android:pathData=" M388 47 C388,47 388,75 388,75 C388,77.21 386.21,79 384,79 C384,79 356,79 356,79 C353.79,79 352,77.21 352,75 C352,75 352,47 352,47 C352,44.79 353.79,43 356,43 C356,43 384,43 384,43 C386.21,43 388,44.79 388,47c " />
-                            <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_5_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#dadce0"
-                                android:fillType="nonZero"
-                                android:pathData=" M336 47 C336,47 336,75 336,75 C336,77.21 334.21,79 332,79 C332,79 304,79 304,79 C301.79,79 300,77.21 300,75 C300,75 300,47 300,47 C300,44.79 301.79,43 304,43 C304,43 332,43 332,43 C334.21,43 336,44.79 336,47c " />
-                            <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_6_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#dadce0"
-                                android:fillType="nonZero"
-                                android:pathData=" M70 618 C70,630.15 60.15,640 48,640 C35.85,640 26,630.15 26,618 C26,605.85 35.85,596 48,596 C60.15,596 70,605.85 70,618c " />
-                            <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_7_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#dadce0"
-                                android:fillType="nonZero"
-                                android:pathData=" M70 396 C70,408.15 60.15,418 48,418 C35.85,418 26,408.15 26,396 C26,383.85 35.85,374 48,374 C60.15,374 70,383.85 70,396c " />
-                            <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_8_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M394 248 C394,248 394,324 394,324 C394,333.94 385.94,342 376,342 C376,342 142,342 142,342 C132.06,342 124,333.94 124,324 C124,324 124,248 124,248 C124,238.06 132.06,230 142,230 C142,230 376,230 376,230 C385.94,230 394,238.06 394,248c " />
-                            <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_9_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M393.94 468.38 C393.94,468.38 393.94,481.5 393.94,481.5 C393.94,483.71 392.15,485.5 389.94,485.5 C389.94,485.5 303.5,485.5 303.5,485.5 C301.29,485.5 299.5,483.71 299.5,481.5 C299.5,481.5 299.5,468.38 299.5,468.38 C299.5,466.17 301.29,464.38 303.5,464.38 C303.5,464.38 389.94,464.38 389.94,464.38 C392.15,464.38 393.94,466.17 393.94,468.38c  M394 468 C394,477.67 386.17,485.5 376.5,485.5 C376.5,485.5 290,485.5 290,485.5 C280.33,485.5 272.5,477.67 272.5,468 C272.5,458.34 280.33,450.5 290,450.5 C290,450.5 376.5,450.5 376.5,450.5 C386.17,450.5 394,458.34 394,468c " />
-                            <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_10_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M394 494 C394,494 394,547 394,547 C394,549.21 392.21,551 390,551 C390,551 164,551 164,551 C161.79,551 160,549.21 160,547 C160,547 160,494 160,494 C160,491.79 161.79,490 164,490 C164,490 390,490 390,490 C392.21,490 394,491.79 394,494c  M394 508 C394,508 394,545 394,545 C394,554.94 385.94,563 376,563 C376,563 142,563 142,563 C132.06,563 124,554.94 124,545 C124,545 124,508 124,508 C124,498.06 132.06,490 142,490 C142,490 376,490 376,490 C385.94,490 394,498.06 394,508c " />
-                            <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_11_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M394 690 C394,690 394,727 394,727 C394,736.94 385.94,745 376,745 C376,745 142,745 142,745 C132.06,745 124,736.94 124,727 C124,727 124,690 124,690 C124,680.06 132.06,672 142,672 C142,672 376,672 376,672 C385.94,672 394,680.06 394,690c " />
-                            <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_12_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#e8eaed"
-                                android:fillType="nonZero"
-                                android:pathData=" M267.5 617 C267.5,626.67 259.67,634.5 250,634.5 C250,634.5 104.5,634.5 104.5,634.5 C94.84,634.5 87,626.67 87,617 C87,607.34 94.84,599.5 104.5,599.5 C104.5,599.5 250,599.5 250,599.5 C259.67,599.5 267.5,607.34 267.5,617c " />
-                            <path
-                                android:name="_R_G_L_4_G_L_0_G_L_0_G_D_13_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#e8eaed"
-                                android:fillType="nonZero"
-                                android:pathData=" M299 395.5 C299,405.17 291.16,413 281.5,413 C281.5,413 104.5,413 104.5,413 C94.84,413 87,405.17 87,395.5 C87,385.84 94.84,378 104.5,378 C104.5,378 281.5,378 281.5,378 C291.16,378 299,385.84 299,395.5c " />
-                        </group>
-                    </group>
-                </group>
-                <group
-                    android:name="_R_G_L_3_G"
-                    android:scaleY="0">
-                    <group
-                        android:name="_R_G_L_3_G_L_0_G"
-                        android:scaleY="0">
-                        <group
-                            android:name="_R_G_L_3_G_L_0_G_L_0_G"
-                            android:scaleY="0">
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_0_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#dadce0"
-                                android:fillType="nonZero"
-                                android:pathData=" M412 0 C412,0 412,892 412,892 C412,892 0,892 0,892 C0,892 0,0 0,0 C0,0 412,0 412,0c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_1_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#e8eaed"
-                                android:fillType="nonZero"
-                                android:pathData=" M412 0 C412,0 412,101 412,101 C412,101 0,101 0,101 C0,101 0,0 0,0 C0,0 412,0 412,0c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_2_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M195 143 C195,143 195,153 195,153 C195,155.21 193.21,157 191,157 C191,157 106,157 106,157 C103.79,157 102,155.21 102,153 C102,153 102,143 102,143 C102,140.79 103.79,139 106,139 C106,139 191,139 191,139 C193.21,139 195,140.79 195,143c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_3_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M270 165 C270,165 270,173 270,173 C270,175.21 268.21,177 266,177 C266,177 106,177 106,177 C103.79,177 102,175.21 102,173 C102,173 102,165 102,165 C102,162.79 103.79,161 106,161 C106,161 266,161 266,161 C268.21,161 270,162.79 270,165c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_4_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M222 231 C222,231 222,241 222,241 C222,243.21 220.21,245 218,245 C218,245 106,245 106,245 C103.79,245 102,243.21 102,241 C102,241 102,231 102,231 C102,228.79 103.79,227 106,227 C106,227 218,227 218,227 C220.21,227 222,228.79 222,231c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_5_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M241 253 C241,253 241,261 241,261 C241,263.21 239.21,265 237,265 C237,265 106,265 106,265 C103.79,265 102,263.21 102,261 C102,261 102,253 102,253 C102,250.79 103.79,249 106,249 C106,249 237,249 237,249 C239.21,249 241,250.79 241,253c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_6_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M214 319 C214,319 214,329 214,329 C214,331.21 212.21,333 210,333 C210,333 106,333 106,333 C103.79,333 102,331.21 102,329 C102,329 102,319 102,319 C102,316.79 103.79,315 106,315 C106,315 210,315 210,315 C212.21,315 214,316.79 214,319c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_7_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M333 341 C333,341 333,349 333,349 C333,351.21 331.21,353 329,353 C329,353 106,353 106,353 C103.79,353 102,351.21 102,349 C102,349 102,341 102,341 C102,338.79 103.79,337 106,337 C106,337 329,337 329,337 C331.21,337 333,338.79 333,341c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_8_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M238 407 C238,407 238,417 238,417 C238,419.21 236.21,421 234,421 C234,421 106,421 106,421 C103.79,421 102,419.21 102,417 C102,417 102,407 102,407 C102,404.79 103.79,403 106,403 C106,403 234,403 234,403 C236.21,403 238,404.79 238,407c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_9_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M295 429 C295,429 295,437 295,437 C295,439.21 293.21,441 291,441 C291,441 106,441 106,441 C103.79,441 102,439.21 102,437 C102,437 102,429 102,429 C102,426.79 103.79,425 106,425 C106,425 291,425 291,425 C293.21,425 295,426.79 295,429c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_10_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M168 495 C168,495 168,505 168,505 C168,507.21 166.21,509 164,509 C164,509 106,509 106,509 C103.79,509 102,507.21 102,505 C102,505 102,495 102,495 C102,492.79 103.79,491 106,491 C106,491 164,491 164,491 C166.21,491 168,492.79 168,495c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_11_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M269 517 C269,517 269,525 269,525 C269,527.21 267.21,529 265,529 C265,529 106,529 106,529 C103.79,529 102,527.21 102,525 C102,525 102,517 102,517 C102,514.79 103.79,513 106,513 C106,513 265,513 265,513 C267.21,513 269,514.79 269,517c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_12_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M235 583 C235,583 235,593 235,593 C235,595.21 233.21,597 231,597 C231,597 106,597 106,597 C103.79,597 102,595.21 102,593 C102,593 102,583 102,583 C102,580.79 103.79,579 106,579 C106,579 231,579 231,579 C233.21,579 235,580.79 235,583c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_13_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M295 605 C295,605 295,613 295,613 C295,615.21 293.21,617 291,617 C291,617 106,617 106,617 C103.79,617 102,615.21 102,613 C102,613 102,605 102,605 C102,602.79 103.79,601 106,601 C106,601 291,601 291,601 C293.21,601 295,602.79 295,605c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_14_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M223 671 C223,671 223,681 223,681 C223,683.21 221.21,685 219,685 C219,685 106,685 106,685 C103.79,685 102,683.21 102,681 C102,681 102,671 102,671 C102,668.79 103.79,667 106,667 C106,667 219,667 219,667 C221.21,667 223,668.79 223,671c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_15_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M246 693 C246,693 246,701 246,701 C246,703.21 244.21,705 242,705 C242,705 106,705 106,705 C103.79,705 102,703.21 102,701 C102,701 102,693 102,693 C102,690.79 103.79,689 106,689 C106,689 242,689 242,689 C244.21,689 246,690.79 246,693c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_16_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M388 798 C388,798 388,798 388,798 C388,813.45 375.45,826 360,826 C360,826 267,826 267,826 C251.55,826 239,813.45 239,798 C239,798 239,798 239,798 C239,782.55 251.55,770 267,770 C267,770 360,770 360,770 C375.45,770 388,782.55 388,798c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_17_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#f8f9fa"
-                                android:fillType="nonZero"
-                                android:pathData=" M377 47 C377,47 377,75 377,75 C377,77.21 375.21,79 373,79 C373,79 38,79 38,79 C35.79,79 34,77.21 34,75 C34,75 34,47 34,47 C34,44.79 35.79,43 38,43 C38,43 373,43 373,43 C375.21,43 377,44.79 377,47c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_18_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#9aa0a6"
-                                android:fillType="nonZero"
-                                android:pathData=" M82 157 C82,172.46 69.46,185 54,185 C38.54,185 26,172.46 26,157 C26,141.54 38.54,129 54,129 C69.46,129 82,141.54 82,157c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_19_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#9aa0a6"
-                                android:fillType="nonZero"
-                                android:pathData=" M82 245 C82,260.46 69.46,273 54,273 C38.54,273 26,260.46 26,245 C26,229.54 38.54,217 54,217 C69.46,217 82,229.54 82,245c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_20_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#9aa0a6"
-                                android:fillType="nonZero"
-                                android:pathData=" M82 333 C82,348.46 69.46,361 54,361 C38.54,361 26,348.46 26,333 C26,317.54 38.54,305 54,305 C69.46,305 82,317.54 82,333c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_21_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#9aa0a6"
-                                android:fillType="nonZero"
-                                android:pathData=" M82 421 C82,436.46 69.46,449 54,449 C38.54,449 26,436.46 26,421 C26,405.54 38.54,393 54,393 C69.46,393 82,405.54 82,421c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_22_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#9aa0a6"
-                                android:fillType="nonZero"
-                                android:pathData=" M82 509 C82,524.46 69.46,537 54,537 C38.54,537 26,524.46 26,509 C26,493.54 38.54,481 54,481 C69.46,481 82,493.54 82,509c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_23_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#9aa0a6"
-                                android:fillType="nonZero"
-                                android:pathData=" M82 597 C82,612.46 69.46,625 54,625 C38.54,625 26,612.46 26,597 C26,581.54 38.54,569 54,569 C69.46,569 82,581.54 82,597c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_24_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#9aa0a6"
-                                android:fillType="nonZero"
-                                android:pathData=" M82 685 C82,700.46 69.46,713 54,713 C38.54,713 26,700.46 26,685 C26,669.54 38.54,657 54,657 C69.46,657 82,669.54 82,685c " />
-                        </group>
-                    </group>
-                </group>
-                <group
-                    android:name="_R_G_L_2_G"
-                    android:scaleY="0"
-                    android:translateX="28.25"
-                    android:translateY="443">
-                    <group
-                        android:name="_R_G_L_2_G_D_0_P_0_G_0_T_0"
-                        android:rotation="180"
-                        android:translateX="414"
-                        android:translateY="53">
-                        <path
-                            android:name="_R_G_L_2_G_D_0_P_0"
-                            android:fillAlpha="1"
-                            android:fillColor="#ffffff"
-                            android:fillType="nonZero"
-                            android:pathData=" M28.25 0 C28.25,31.2 2.95,56.5 -28.25,56.5 C-28.25,56.5 -28.25,-56.5 -28.25,-56.5 C2.95,-56.5 28.25,-31.2 28.25,0c " />
-                    </group>
-                </group>
-                <group
-                    android:name="_R_G_L_1_G"
-                    android:rotation="180"
-                    android:scaleY="0"
-                    android:translateX="25.75"
-                    android:translateY="496">
-                    <group
-                        android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0"
-                        android:scaleX="0.5"
-                        android:scaleY="0.5"
-                        android:translateX="-407"
-                        android:translateY="0">
-                        <path
-                            android:name="_R_G_L_1_G_D_0_P_0"
-                            android:fillAlpha="0"
-                            android:fillColor="#3c3e40"
-                            android:fillType="nonZero"
-                            android:pathData=" M3.87 -13.45 C3.07,-14.21 1.8,-14.18 1.04,-13.38 C0.28,-12.58 0.31,-11.31 1.11,-10.55 C1.11,-10.55 9.75,-2.32 9.75,-2.32 C9.75,-2.32 -14.75,-2.32 -14.75,-2.32 C-15.85,-2.32 -16.75,-1.43 -16.75,-0.32 C-16.75,0.78 -15.85,1.68 -14.75,1.68 C-14.75,1.68 9.94,1.68 9.94,1.68 C9.94,1.68 1.07,10.59 1.07,10.59 C0.29,11.37 0.29,12.64 1.08,13.42 C1.86,14.2 3.13,14.19 3.9,13.41 C3.9,13.41 16.17,1.09 16.17,1.09 C16.55,0.71 16.76,0.19 16.75,-0.35 C16.74,-0.89 16.52,-1.4 16.13,-1.77 C16.13,-1.77 3.87,-13.45 3.87,-13.45c " />
-                    </group>
-                </group>
-                <group
-                    android:name="_R_G_L_0_G"
-                    android:translateX="206"
-                    android:translateY="446">
-                    <path
-                        android:name="_R_G_L_0_G_D_0_P_0"
-                        android:fillAlpha="0"
-                        android:fillColor="#84ba69"
-                        android:fillType="nonZero"
-                        android:pathData=" M205 13.5 C225.16,13.5 241.5,29.84 241.5,50 C241.5,70.16 225.16,86.5 205,86.5 C184.84,86.5 168.5,70.16 168.5,50 C168.5,29.84 184.84,13.5 205,13.5c " />
-                </group>
-            </group>
-            <group android:name="time_group" />
-        </vector>
-    </aapt:attr>
-</animated-vector>
\ No newline at end of file
diff --git a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java
index 32f4c58d7f..9b6afd6a97 100644
--- a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java
@@ -29,12 +29,8 @@ public class BackGestureTutorialFragment extends TutorialFragment {
     @Override
     Integer getFeedbackVideoResId(boolean forDarkMode) {
         return mTutorialType == TutorialType.RIGHT_EDGE_BACK_NAVIGATION
-                ? (forDarkMode
-                        ? R.drawable.gesture_tutorial_motion_back_right_dark_mode
-                        : R.drawable.gesture_tutorial_motion_back_right_light_mode)
-                : (forDarkMode
-                        ? R.drawable.gesture_tutorial_motion_back_left_dark_mode
-                        : R.drawable.gesture_tutorial_motion_back_left_light_mode);
+                ? R.drawable.gesture_tutorial_motion_back_right
+                : R.drawable.gesture_tutorial_motion_back_left;
     }
 
     @Nullable
-- 
GitLab


From 5f5b2e2558bf23a176f1677bd2ef6483f8266c74 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Thu, 17 Jun 2021 21:32:13 +0000
Subject: [PATCH 1434/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Ie7cf7ee0a2fc1095e8e59bd41c7ebc5e0fec3678
---
 res/values-af/strings.xml        |  9 +++++----
 res/values-am/strings.xml        |  9 +++++----
 res/values-ar/strings.xml        |  9 +++++----
 res/values-as/strings.xml        |  9 +++++----
 res/values-az/strings.xml        |  9 +++++----
 res/values-b+sr+Latn/strings.xml |  9 +++++----
 res/values-be/strings.xml        |  9 +++++----
 res/values-bg/strings.xml        |  9 +++++----
 res/values-bn/strings.xml        | 12 ++++++------
 res/values-bs/strings.xml        |  9 +++++----
 res/values-ca/strings.xml        |  9 +++++----
 res/values-cs/strings.xml        |  9 +++++----
 res/values-da/strings.xml        |  9 +++++----
 res/values-de/strings.xml        |  6 ++++--
 res/values-el/strings.xml        |  9 +++++----
 res/values-en-rAU/strings.xml    |  9 +++++----
 res/values-en-rCA/strings.xml    |  9 +++++----
 res/values-en-rGB/strings.xml    |  9 +++++----
 res/values-en-rIN/strings.xml    |  9 +++++----
 res/values-en-rXC/strings.xml    |  9 +++++----
 res/values-es-rUS/strings.xml    |  9 +++++----
 res/values-es/strings.xml        |  9 +++++----
 res/values-et/strings.xml        |  9 +++++----
 res/values-eu/strings.xml        |  9 +++++----
 res/values-fa/strings.xml        |  9 +++++----
 res/values-fi/strings.xml        |  9 +++++----
 res/values-fr-rCA/strings.xml    |  9 +++++----
 res/values-fr/strings.xml        |  9 +++++----
 res/values-gl/strings.xml        |  9 +++++----
 res/values-gu/strings.xml        | 12 ++++++------
 res/values-hi/strings.xml        |  9 +++++----
 res/values-hr/strings.xml        |  9 +++++----
 res/values-hu/strings.xml        |  9 +++++----
 res/values-hy/strings.xml        |  9 +++++----
 res/values-in/strings.xml        |  9 +++++----
 res/values-is/strings.xml        |  9 +++++----
 res/values-it/strings.xml        |  9 +++++----
 res/values-iw/strings.xml        |  9 +++++----
 res/values-ja/strings.xml        |  9 +++++----
 res/values-ka/strings.xml        |  9 +++++----
 res/values-kk/strings.xml        |  9 +++++----
 res/values-km/strings.xml        |  9 +++++----
 res/values-kn/strings.xml        | 12 ++++++------
 res/values-ko/strings.xml        |  9 +++++----
 res/values-ky/strings.xml        |  9 +++++----
 res/values-lo/strings.xml        |  9 +++++----
 res/values-lt/strings.xml        |  9 +++++----
 res/values-lv/strings.xml        |  9 +++++----
 res/values-mk/strings.xml        |  9 +++++----
 res/values-ml/strings.xml        |  9 +++++----
 res/values-mn/strings.xml        |  9 +++++----
 res/values-mr/strings.xml        | 27 +++++++++++----------------
 res/values-ms/strings.xml        |  9 +++++----
 res/values-my/strings.xml        |  9 +++++----
 res/values-nb/strings.xml        |  9 +++++----
 res/values-ne/strings.xml        | 15 +++++++--------
 res/values-nl/strings.xml        |  9 +++++----
 res/values-or/strings.xml        |  6 ++++--
 res/values-pa/strings.xml        | 12 ++++++------
 res/values-pl/strings.xml        |  9 +++++----
 res/values-pt-rPT/strings.xml    |  9 +++++----
 res/values-pt/strings.xml        |  9 +++++----
 res/values-ro/strings.xml        |  9 +++++----
 res/values-ru/strings.xml        |  9 +++++----
 res/values-si/strings.xml        |  9 +++++----
 res/values-sk/strings.xml        |  9 +++++----
 res/values-sl/strings.xml        |  9 +++++----
 res/values-sq/strings.xml        |  9 +++++----
 res/values-sr/strings.xml        |  9 +++++----
 res/values-sv/strings.xml        |  9 +++++----
 res/values-sw/strings.xml        |  9 +++++----
 res/values-ta/strings.xml        |  9 +++++----
 res/values-te/strings.xml        | 12 ++++++------
 res/values-th/strings.xml        |  9 +++++----
 res/values-tl/strings.xml        |  9 +++++----
 res/values-tr/strings.xml        |  9 +++++----
 res/values-uk/strings.xml        |  9 +++++----
 res/values-ur/strings.xml        | 15 +++++++--------
 res/values-uz/strings.xml        |  9 +++++----
 res/values-vi/strings.xml        |  9 +++++----
 res/values-zh-rCN/strings.xml    |  9 +++++----
 res/values-zh-rHK/strings.xml    |  9 +++++----
 res/values-zh-rTW/strings.xml    |  9 +++++----
 res/values-zu/strings.xml        |  9 +++++----
 84 files changed, 433 insertions(+), 362 deletions(-)

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 2703eb5e98..7f36dd2cc4 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"skryf Tuis-instellings en -kortpaaie"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Laat die program toe om die instellings en kortpaaie in Tuis te verander."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> word nie toegelaat om foonoproepe te maak nie"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Kon nie legstuk laai nie"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Stel op"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Dit is \'n stelselprogram en kan nie gedeïnstalleer word nie."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Wysig naam"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Het <xliff:g id="APP_NAME">%1$s</xliff:g> gedeaktiveer"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Persoonlik"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Werk"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Werkprofiel"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Werkprogramme het \'n kenteken en is sigbaar vir jou IT-administrateur"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Het dit"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Werkprogramme is af"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Jou werkprogramme kan nie vir jou kennisgewings stuur, jou battery gebruik of toegang tot jou ligging kry nie"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 846de43d4a..fe9716358a 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"የመነሻ ቅንብሮችን እና አቋራጮችን ይጽፋል"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"መተግብሪያው ቅንብሮችን እና አቋራጮችን በመነሻ ውስጥ እንዲቀይራቸው ያስችለዋል።"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> የስልክ ጥሪዎችን ለማድረግ አልተፈቀደለትም"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"ፍርግም የመጫን ችግር"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"ማዋቀሪያ"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"ይህ የስርዓት መተግበሪያ ነው እና ማራገፍ አይቻልም።"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"ስም ያርትዑ"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> ተሰናክሏል"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"የግል"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"ሥራ"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"የሥራ መገለጫ"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"የሥራ መተግበሪያዎች ባጅ የተደረገባቸው እና ለእርስዎ የአይቲ አስተዳዳሪ የሚታዩ ናቸው"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ገባኝ"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"የሥራ መተግበሪያዎች ጠፍተዋል"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"የስራ መተግበሪያዎችዎ ማሳወቂያዎችን ሊልክልዎ፣ ባትሪዎን መጠቀም ወይም አካባቢዎን መድረስ አይችሉም"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 18ce18c23b..ff2f51db3b 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -90,8 +90,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"كتابة إعدادات واختصارات الشاشة الرئيسية"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"للسماح للتطبيق بتغيير الإعدادات والاختصارات في الشاشة الرئيسية."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> غير مسموح به لإجراء مكالمات هاتفية"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"حدثت مشكلة أثناء تحميل الأداة"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"الإعداد"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"هذا تطبيق نظام وتتعذر إزالته."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"تعديل الاسم"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"تم إيقاف <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -168,8 +170,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"شخصية"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"للعمل"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"الملف الشخصي للعمل"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"تحمل تطبيقات العمل شارة وتكون مرئية لمشرف تكنولوجيا المعلومات."</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"حسنًا"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"تطبيقات العمل غير مفعّلة"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"لا يمكن لتطبيقات العمل إرسال إشعارات إليك أو استخدام بطاريتك أو الوصول إلى موقعك الجغرافي."</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 1f217cf7b6..43927f53e2 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"গৃহ ছেটিং আৰু শ্বৰ্টকাটবোৰ লিখিব পাৰে"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"এপটোক গৃহ পৃষ্ঠাত ছেটিং আৰু শ্বৰ্টকাটসমূহ সলনি কৰাৰ অনুমতি দিয়ে।"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g>ক ফ\'ন কলবোৰ কৰাৰ অনুমতি দিয়া হোৱা নাই"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"ৱিজেট ল\'ড কৰাত সমস্য়া"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"ছেটআপ কৰক"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"এইটো এটা ছিষ্টেম এপ আৰু ইয়াক আনইনষ্টল কৰিব নোৱৰি"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"নাম সম্পাদনা কৰক"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> অক্ষম কৰা হ’ল"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ব্যক্তিগত"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"কৰ্মস্থান"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"কৰ্মস্থানৰ প্ৰ\'ফাইল"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"কৰ্মস্থানৰ এপ্‌সমূহ প্ৰতীকেৰে চিহ্নিত কৰা হয় আৰু সেইবোৰ আপোনাৰ আইটি প্ৰশাসকৰ বাবে দৃশ্যমান হয়"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"বুজি পালোঁ"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"কৰ্মস্থানৰ এপ্‌সমূহ অফ হৈ আছে"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"আপোনাৰ কৰ্মস্থানৰ এপ্‌সমূহে আপোনালৈ জাননী পঠিয়াব, আপোনাৰ বেটাৰী ব্যৱহাৰ কৰিব অথবা আপোনাৰ অৱস্থান এক্সেছ কৰিব নোৱাৰে"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index f73e500c4f..7685330860 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"Əsas Səhifə ayarlarını və qısayolları yazın"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Tətbiqə Əsas Səhifədə ayarları və qısayolları dəyişməyə icazə verir."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> tətbiqinə telefon zəngləri etmək üçün icazə verilmir"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Vidcet yükləmə problemi"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Quraşdırma"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Bu sistem tətbiqi olduğu üçün sistemdən silinə bilməz."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Adı redaktə edin"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> deaktiv edildi"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Şəxsi"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"İş"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"İş profili"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"İş tətbiqləri nişanlanıb və İT administratorunuza görünür"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Anladım"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"İş tətbiqləri deaktivdir"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"İş tətbiqləriniz sizə bildirişlər göndərə, batareyanızdan istifadə edə və ya məkanınıza daxil ola bilməz"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index a5000765fb..3e43c50b93 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -84,8 +84,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"upisivanje podešavanja i prečica na početnom ekranu"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Dozvoljava aplikaciji da menja podešavanja i prečice na početnom ekranu."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> nema dozvolu za upućivanje telefonskih poziva"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Problem pri učitavanju vidžeta"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Podešavanje"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Ovo je sistemska aplikacija i ne može da se deinstalira."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Izmenite naziv"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> je onemogućena"</string>
@@ -159,8 +161,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Lične"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Poslovne"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Poslovni profil"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Poslovne aplikacije su označene značkom i IT administrator može da ih vidi"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Važi"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Poslovne aplikacije su isključene"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Poslovne aplikacije ne mogu da vam šalju obaveštenja, koriste bateriju niti pristupaju lokaciji"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index aa8acd65d0..d99972996d 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -86,8 +86,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"запісваць налады і ярлыкі на галоўнай старонцы"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Дазваляе праграме змяняць налады і ярлыкі на Галоўнай старонцы."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> не мае дазволу на здзяйсненне тэлефонных званкоў"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Праблема загрузкі віджэта"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Наладжванне"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Гэта сістэмная праграма, яе нельга выдаліць."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Змяніць назву"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> адключана"</string>
@@ -162,8 +164,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Асабістыя"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Працоўныя"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Працоўны профіль"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Працоўныя праграмы маюць значкі і бачныя IT-адміністратару"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Зразумела"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Працоўныя праграмы выключаны"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Працоўныя праграмы не могуць адпраўляць вам апавяшчэнні, выкарыстоўваць акумулятар або атрымліваць доступ да даных пра ваша месцазнаходжанне"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 117ee45e7b..a104988e2d 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"запис на настройките и преките пътища в Начало"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Разрешава на приложението да променя настройките и преките пътища в Начало."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> няма разрешение да извършва телефонни обаждания"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Проблем при зареждане на приспособлението"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Настройване"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Това е системно приложение и не може да се деинсталира."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Редактиране на името"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Деактивирахте <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Лични"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Служебни"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Служебен потребителски профил"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Служебните приложения са означени със значка и са видими за системния администратор"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Разбрах"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Служебните ви приложения са изключени"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Служебните ви приложения не могат да ви изпращат известия, да използват батерията или да осъществяват достъп до местоположението ви"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index e88e4b923d..f89aecbadd 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -53,11 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"কথোপকথন"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"সহজেই দরকারি তথ্য পান"</string>
     <string name="widget_education_content" msgid="745542879510751525">"অ্যাপ না খুলে তথ্য পাওয়ার জন্য, আপনার হোম স্ক্রিনে উইজেট যোগ করতে পারেন"</string>
-    <!-- no translation found for reconfigurable_widget_education_tip (6336962690888067057) -->
-    <skip />
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"উইজেট সেটিংস পরিবর্তন করতে ট্যাপ করুন"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"বুঝেছি"</string>
-    <!-- no translation found for widget_reconfigure_button_content_description (8811472721881205250) -->
-    <skip />
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"উইজেট সেটিংস পরিবর্তন করুন"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"অ্যাপ খুঁজুন"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"অ্যাপ লোড হচ্ছে…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" এর সাথে মেলে এমন কোনো অ্যাপ পাওয়া যায়নি"</string>
@@ -84,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"হোম সেটিংস এবং শর্টকাটগুলি লেখে"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"হোমে অ্যাপ্লিকেশানটিকে সেটিংস এবং শর্টকাটগুলি পরিবর্তন করতে দেয়৷"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"ফোন কলগুলি করার জন্য <xliff:g id="APP_NAME">%1$s</xliff:g> এর অনুমতি নেই"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"উইজেট লোড হতে সমস্যা হয়েছে"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"সেটআপ"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"এটি একটি সিস্টেম অ্যাপ্লিকেশান এবং আনইনস্টল করা যাবে না৷"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"নাম এডিট করুন"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> অক্ষম করা হয়েছে"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index ed7050fa30..b265d841e4 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -84,8 +84,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"zapisuj postavke na početnom ekranu i prečice"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Dopušta aplikaciji promjenu postavki i prečica na početnom ekranu."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> nema odobrenje da uspostavlja telefonske pozive"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Problem pri učitavanju dodatka"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Postavljanje"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Ovo je sistemska aplikacija i ne može se deinstalirati."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Uređivanje naziva"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> je onemogućena"</string>
@@ -159,8 +161,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Lične"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Poslovne"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Radni profil"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Poslovne aplikacije su označene i vaš IT administrator ih može vidjeti"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Razumijem"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Poslovne aplikacije su isključene"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Poslovne aplikacije vam ne mogu slati obavještenja, koristiti bateriju niti pristupiti vašoj lokaciji"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 306e0c220f..9cd23ba2cb 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"escriu la configuració i les dreceres de la pantalla d\'inici"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Permet que l\'aplicació canviï la configuració i les dreceres de la pantalla d\'inici."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> no té permís per fer trucades telefòniques"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"S\'ha produït un problema en carregar el widget"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Configuració"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Aquesta aplicació és una aplicació del sistema i no es pot desinstal·lar."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Edita el nom"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"S\'ha desactivat <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personal"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Treball"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de treball"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Les aplicacions de treball tenen una insígnia i són visibles per al teu administrador de TI"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Entesos"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Les aplicacions de treball estan desactivades"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Les aplicacions de treball no poden enviar-te notificacions, consumir bateria ni accedir a la teva ubicació"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 70c511fd95..9785754d58 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -86,8 +86,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"zápis nastavení a odkazů plochy"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Umožňuje aplikaci změnit nastavení a odkazy na ploše."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> nemá oprávnění telefonovat"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Problém s načtením widgetu"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Nastavení"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Toto je systémová aplikace a nelze ji odinstalovat."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Upravit název"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> je zakázána"</string>
@@ -162,8 +164,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Osobní"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Pracovní"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Pracovní profil"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Pracovní aplikace jsou označené a viditelné vašemu administrátorovi IT"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Rozumím"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Pracovní aplikace jsou vypnuté"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Pracovní aplikace vám nemohou zasílat oznámení, používat vaši baterii ani získat přístup k vaší poloze"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 5087ac4fb0..d757b0ecd2 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"skrive indstillinger og genveje for startskærmen"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Tillader, at appen ændrer indstillingerne og genvejene på startskærmen."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> har ikke tilladelse til at foretage telefonopkald"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Der er problemer med indlæsning af widgetten"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Konfigurer"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Dette er en systemapp, som ikke kan afinstalleres."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Rediger navn"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> er deaktiveret"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personlige"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Arbejde"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Arbejdsprofil"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Arbejdsapps har badges og kan ses af din it-administrator"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Arbejdsapps er deaktiveret"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Arbejdsapps kan ikke sende dig notifikationer, bruge dit batteri eller få adgang til din lokation"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 6ff90222ae..ef646245e4 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"Einstellungen und Verknüpfungen für den Startbildschirm schreiben"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Ermöglicht der App, die Einstellungen und Verknüpfungen auf dem Startbildschirm zu ändern"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> darf keine Telefonanrufe tätigen."</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Problem beim Laden des Widgets"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Einrichten"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Dies ist eine Systemanwendung, die nicht deinstalliert werden kann."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Name bearbeiten"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> deaktiviert"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index b6b44f03e1..e9ea0eae46 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"εγγραφή ρυθμίσεων και συντομεύσεων αρχικής οθόνης"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Επιτρέπει στην εφαρμογή την αλλαγή των ρυθμίσεων και των συντομεύσεων στην Αρχική οθόνη."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"Η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> δεν επιτρέπεται να πραγματοποιεί τηλεφωνικές κλήσεις"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Παρουσιάστηκε πρόβλημα στη φόρτωση του γραφικού στοιχείου"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Ρύθμιση"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Αυτή είναι μια εφαρμογή συστήματος και δεν είναι δυνατή η κατάργηση της εγκατάστασής της."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Επεξεργασία ονόματος"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> είναι απενεργοποιημένη"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Προσωπικές"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Εργασίας"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Προφίλ εργασίας"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Οι εφαρμογές εργασιών φέρουν σήμα και είναι ορατές στον διαχειριστή IT σας"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Το κατάλαβα"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Οι εφαρμογές εργασιών είναι απενεργοποιημένες"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Οι εφαρμογές εργασιών δεν έχουν τη δυνατότητα αποστολής ειδοποιήσεων, χρήσης της μπαταρίας ή πρόσβασης στην τοποθεσία σας"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 0e585f1032..c704585074 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"write Home settings and shortcuts"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Allows the app to change the settings and shortcuts in Home."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> is not allowed to make phone calls"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Problem loading widget"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Setup"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"This is a system app and can\'t be uninstalled."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Edit Name"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Disabled <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personal"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Work"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Work profile"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Work apps are badged and visible to your IT admin"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Work apps are off"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Your work apps can’t send you notifications, use your battery or access your location"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 0e585f1032..c704585074 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"write Home settings and shortcuts"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Allows the app to change the settings and shortcuts in Home."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> is not allowed to make phone calls"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Problem loading widget"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Setup"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"This is a system app and can\'t be uninstalled."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Edit Name"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Disabled <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personal"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Work"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Work profile"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Work apps are badged and visible to your IT admin"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Work apps are off"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Your work apps can’t send you notifications, use your battery or access your location"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 0e585f1032..c704585074 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"write Home settings and shortcuts"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Allows the app to change the settings and shortcuts in Home."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> is not allowed to make phone calls"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Problem loading widget"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Setup"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"This is a system app and can\'t be uninstalled."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Edit Name"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Disabled <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personal"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Work"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Work profile"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Work apps are badged and visible to your IT admin"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Work apps are off"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Your work apps can’t send you notifications, use your battery or access your location"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 0e585f1032..c704585074 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"write Home settings and shortcuts"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Allows the app to change the settings and shortcuts in Home."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> is not allowed to make phone calls"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Problem loading widget"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Setup"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"This is a system app and can\'t be uninstalled."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Edit Name"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Disabled <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personal"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Work"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Work profile"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Work apps are badged and visible to your IT admin"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Work apps are off"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Your work apps can’t send you notifications, use your battery or access your location"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 9add9f4820..930eb44567 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‎‏‏‎‏‎‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‎‎‏‏‎‏‎‎‏‎‏‎‏‎‎‏‎‏‎‏‏‎write Home settings and shortcuts‎‏‎‎‏‎"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‏‎‎‏‎‏‏‏‎‎‏‎‎‎‏‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‎‏‏‏‎‎‏‎‎‎‎‏‎Allows the app to change the settings and shortcuts in Home.‎‏‎‎‏‎"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‏‎‏‎‏‏‎‏‎‎‏‏‏‎‏‏‎‏‎‏‎‎‏‏‎‎‎‎‏‏‏‎‎‏‎‏‎‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ is not allowed to make phone calls‎‏‎‎‏‎"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‏‎‎‏‎‏‏‎‏‎‎‏‎‏‏‏‎‏‎‎‎‏‎‎‎‏‎‏‎‏‎‏‎‎‏‏‏‏‏‎Problem loading widget‎‏‎‎‏‎"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‏‏‎‎‏‎‏‎‏‎‎‎‎‏‎‏‎‎‎‏‏‏‎‎‎‎‏‎‎‏‎‎‎‏‏‎‏‎‏‎‏‏‏‎‏‎‏‎‎‎‎Setup‎‏‎‎‏‎"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‏‏‏‎‏‎‎‎‎‏‎‏‎‏‎‏‎‎‏‏‏‏‎‏‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‎‎‎This is a system app and can\'t be uninstalled.‎‏‎‎‏‎"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‏‏‎‎‎‏‎‎‏‎‏‎‏‏‎‏‎‎‎‏‎‏‎‎‏‎‎‎‎‏‏‏‎‏‏‎‏‎‏‏‎‎‎‎‎Edit Name‎‏‎‎‏‎"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‎‎‎Disabled ‎‏‎‎‏‏‎<xliff:g id="APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‎‏‎‎‎‎‎‎‏‏‏‎‎‎‏‎‎‎‎‏‎‏‎‏‎‎‏‎‎‏‎‏‎‏‏‏‎‏‎‎Personal‎‏‎‎‏‎"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‏‎‏‎‎‏‏‎‎‎‎‎‎‏‏‏‎‎‏‏‏‏‎‎‎‎‏‏‎‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‏‏‎‎‏‏‏‎‎Work‎‏‎‎‏‎"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‎‎‏‎‎‎‎‎‎‏‎‎‎‏‏‎‎‎‏‎‎‏‏‎‏‎‎‎‎‎‏‎‎‏‏‎‎‎‏‏‎‏‎‏‎‎‏‏‏‎‏‎‎Work profile‎‏‎‎‏‎"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‎‎‏‎‎‏‎‏‎‏‏‎‏‏‎‏‎‏‏‎‏‎‎‏‏‏‎‏‎‏‏‎‏‎‎‎‎‏‎‎‎‎‏‎‎‏‎‏‏‎‎‎‎Work apps are badged and visible to your IT admin‎‏‎‎‏‎"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‏‏‎‎‎‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎Got it‎‏‎‎‏‎"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‏‎‎‏‎‎‎‏‏‎‎‏‎‎‎‎Work apps are off‎‏‎‎‏‎"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎‎‎‏‏‎‎‎‎‎‏‏‎‏‏‎‏‎‏‏‎‏‏‏‏‎‏‎‎‎‎‎‎‎‎‏‎‎‎‎‎‎‎‏‎‎‎‎‏‎‏‎‎Your work apps can’t send you notifications, use your battery, or access your location‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 53e7637707..fbb616aeb7 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"escribir configuración y accesos directos de la pantalla principal"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Permite que la aplicación cambie la configuración y los accesos directos de la pantalla principal."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> no puede realizar llamadas telefónicas"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Problema al cargar el widget"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Configuración"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Esta es una aplicación del sistema y no se puede desinstalar."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Editar nombre"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Se inhabilitó <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personales"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"De trabajo"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de trabajo"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Las apps de trabajo tienen una insignia y el administrador de IT las puede ver"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Entendido"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Las apps de trabajo están desactivadas"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Las apps de trabajo no pueden enviarte notificaciones, usar la batería ni acceder a tu ubicación"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 61bd39d38c..03ac6d12e5 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"escribir información de accesos directos y de ajustes de la pantalla de inicio"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Permite que las aplicaciones cambien los ajustes y los accesos directos de la pantalla de inicio."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> no puede hacer llamadas"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Problema al cargar el widget"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Configuración"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Esta aplicación es del sistema y no se puede desinstalar."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Editar nombre"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Se ha inhabilitado <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personal"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Trabajo"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de trabajo"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Las aplicaciones de trabajo tienen una insignia, y tu administrador de TI las puede ver"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Entendido"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Las aplicaciones de trabajo están desactivadas"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Tus aplicaciones de trabajo no pueden enviarte notificaciones, consumir batería ni acceder a tu ubicación"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index e0c8733820..9ec12fce6a 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"avakuva seadete ja otseteede kirjutamine"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Võimaldab rakendusel muuta avaekraanil seadeid ja otseteid."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"Rakendusel <xliff:g id="APP_NAME">%1$s</xliff:g> pole lubatud helistada"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Probleem vidina laadimisel"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Seadistamine"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"See on süsteemirakendus ja seda ei saa desinstallida."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Muuda nime"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Rakendus <xliff:g id="APP_NAME">%1$s</xliff:g> on keelatud"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Isiklik"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Töö"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Tööprofiil"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Töörakendustel on märk ja need on teie IT-administraatorile nähtavad"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Selge"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Töörakendused on välja lülitatud"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Töörakendused ei saa teile märguandeid saata, akut kasutada ega teie asukohale juurde pääseda"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index eb038bae2b..0df92adf24 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"Idatzi hasierako ezarpenak eta lasterbideak"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Hasierako pantailako ezarpenak eta lasterbideak aldatzeko baimena ematen die aplikazioei."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak ez du telefono-deiak egiteko baimenik"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Arazo bat izan da widgeta kargatzean"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Konfigurazioa"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Sistema-aplikazioa da hau eta ezin da desinstalatu."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Editatu izena"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> desgaituta dago"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Pertsonalak"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Lanekoak"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Laneko profila"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Laneko aplikazioek bereizgarriak dituzte, eta IKT saileko administratzaileak ikus ditzake"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Ados"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Laneko aplikazioak desaktibatuta daude"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Laneko aplikazioek ezin dute jakinarazpenik bidali, bateria erabili edo kokapena atzitu"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 0926e48f81..9da53ca986 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"نوشتن تنظیمات و میان‌برهای صفحه اصلی"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"به برنامه اجازه می‌دهد تنظیمات و میان‌برها را در صفحه اصلی تغییر دهد."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> مجاز نیست تماس تلفنی برقرار کند"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"مشکل در بارگیری ابزارک"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"تنظیم"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"این برنامه سیستمی است و حذف نصب نمی‌شود."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"ویرایش نام"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> غیرفعال شد"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"شخصی"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"کاری"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"نمایه کاری"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"برنامه‌های کاری دارای نشان هستند و سرپرست سیستم می‌تواند آن‌ها را ببیند"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"متوجه‌ام"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"برنامه‌های کاری خاموش است"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"برنامه‌های کاری نمی‌توانند برای شما اعلان ارسال کنند، از باتری استفاده کنند، یا به مکانتان دسترسی داشته باشند"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 4ebc8d279b..fd8b67168f 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"kirjoita aloitusruudun asetuksia ja pikakuvakkeita"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Antaa sovelluksen muuttaa aloitusruudun asetuksia ja pikakuvakkeita."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> ei saa soittaa puheluita."</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Ongelma ladattaessa widgetiä"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Asetus"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Tämä on järjestelmäsovellus, eikä sitä voi poistaa."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Muokkaa nimeä"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> poistettiin käytöstä"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Henkilökohtaiset"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Työsovellukset"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Työprofiili"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Työsovellukset on merkitty ja ne näkyvät IT-järjestelmänvalvojalle"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Selvä"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Työsovellukset ovat pois päältä"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Työsovellukset eivät voi lähettää sinulle ilmoituksia eivätkä käyttää akkuasi tai paikantaa sijaintiasi"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 0a66787554..fb358eaf58 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"enregistrer les paramètres de la page d\'accueil et des raccourcis"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Permet à l\'application de modifier les paramètres et les raccourcis de l\'écran d\'accueil."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"L\'application <xliff:g id="APP_NAME">%1$s</xliff:g> n\'est pas autorisée à faire des appels téléphoniques"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Problème lors du chargement du widget"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Configuration"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Impossible de désinstaller cette application, car il s\'agit d\'une application système."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Modifier le nom"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"L\'application <xliff:g id="APP_NAME">%1$s</xliff:g> est désactivée"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personnel"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Travail"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profil professionnel"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Les applications professionnelles sont indiquées par un badge et elles sont visibles pour votre administrateur informatique"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Les applications professionnelles sont désactivées"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Les applications professionnelles ne peuvent ni vous envoyer de notifications, ni utiliser la pile, ni accéder à votre position"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f08f7eb0ba..098ce6f3e0 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"modifier les paramètres et les raccourcis de l\'écran d\'accueil"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Permettre à l\'application de modifier les paramètres et les raccourcis de l\'écran d\'accueil"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"L\'application <xliff:g id="APP_NAME">%1$s</xliff:g> n\'est pas autorisée à passer des appels téléphoniques."</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Problème lors du chargement du widget."</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Configuration"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Impossible de désinstaller cette application, car il s\'agit d\'une application système."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Modifier le nom"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> est désactivé."</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personnelles"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Professionnelles"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profil professionnel"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Les applis professionnelles sont identifiées par un badge et votre administrateur informatique peut les voir"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Les applis professionnelles sont désactivées"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Vos applis professionnelles ne peuvent pas vous envoyer de notifications, utiliser votre batterie ni accéder à votre position"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 6a7a6ef10e..8cc93612a2 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"modificar a configuración e os atallos da pantalla de inicio"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Permite a unha aplicación cambiar a configuración e os atallos da pantalla de inicio."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> non ten permiso para facer chamadas telefónicas"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Produciuse un problema ao cargar o widget"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Configuración"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Esta aplicación é do sistema e non se pode desinstalar."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Edita o nome"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Desactivouse <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Persoal"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Traballo"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de traballo"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"O administrador de TI pode ver as aplicacións do traballo e engadirlles indicadores"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Entendido"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"As aplicacións do traballo están desactivadas"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"As aplicacións do traballo non poden enviarche notificacións, utilizar a batería nin acceder á túa localización"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 4b3821ce03..2e0171dad6 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -53,11 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"વાતચીતો"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"ઉપયોગી માહિતી તમારી આંગળીના ટેરવે"</string>
     <string name="widget_education_content" msgid="745542879510751525">"ઍપને ખોલ્યા વિના માહિતી મેળવવા માટે, તમે તમારી હોમ સ્ક્રીન પર વિજેટ ઉમેરી શકો છો"</string>
-    <!-- no translation found for reconfigurable_widget_education_tip (6336962690888067057) -->
-    <skip />
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"વિજેટના સેટિંગ બદલવા માટે ટૅપ કરો"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"સમજાઈ ગયું"</string>
-    <!-- no translation found for widget_reconfigure_button_content_description (8811472721881205250) -->
-    <skip />
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"વિજેટના સેટિંગ બદલો"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"શોધ ઍપ્લિકેશનો"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ઍપ્લિકેશનો લોડ કરી રહ્યું છે…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\"થી મેળ ખાતી કોઈ ઍપ્લિકેશનો મળી નથી"</string>
@@ -84,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"હોમ સેટિંગ્સ અને શોર્ટકટ્સ લખો"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"એપ્લિકેશનને હોમમાં સેટિંગ્સ અને શોર્ટકટ્સ બદલવાની મંજૂરી આપે છે."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> ને ફોન કૉલ્સ કરવાની મંજૂરી નથી"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"વિજેટ લોડ કરવામાં સમસ્યા"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"સેટઅપ"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"આ એક સિસ્ટમ ઍપ્લિકેશન છે અને અનઇન્સ્ટોલ કરી શકાતી નથી."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"નામમાં ફેરફાર કરો"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> અક્ષમ કરી"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 8af8f066ad..fbadca6ba7 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"होम पेज की सेटिंग और शॉर्टकट लिखें"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"ऐप्लिकेशन को होम पेज में सेटिंग और शॉर्टकट बदलने देती है."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> को फ़ोन कॉल करने की अनुमति नहीं है"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"विजेट लोड करने में समस्‍या"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"सेटअप"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"यह एक सिस्टम ऐप्लिकेशन है और इसे अनइंस्टॉल नहीं किया जा सकता."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"नाम में बदलाव करें"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> अक्षम है"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"निजी ऐप"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"काम से जुड़े ऐप"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"वर्क प्रोफ़ाइल"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन, बैज किए गए हैं और आईटी एडमिन को दिख रहे हैं"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ठीक है"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन बंद हैं"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"ऑफ़िस के काम से जुड़े आपके ऐप्लिकेशन, आपको सूचनाएं नहीं भेज सकते. साथ ही, आपकी बैटरी का इस्तेमाल या आपकी जगह की जानकारी को ऐक्सेस भी नहीं कर सकते"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 3f1e1b0762..09d315f928 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -84,8 +84,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"pisanje postavki početnog zaslona i prečaca"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Aplikaciji omogućuje promjenu postavki i prečaca na početnom zaslonu."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> nema dopuštenje za telefonske pozive"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Problem pri učitavanju widgeta"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Postavljanje"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Ovo je aplikacija sustava i ne može se ukloniti."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Uređivanje naziva"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> onemogućena"</string>
@@ -159,8 +161,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Osobno"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Posao"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Poslovni profil"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Poslovne su aplikacije označene i vidljive vašem IT administratoru"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Shvaćam"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Poslovne aplikacije su isključene"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Poslovne aplikacije ne mogu vam slati obavijesti, trošiti bateriju niti pristupiti vašoj lokaciji"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 09c4d5093a..2167540d38 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"Főoldal beállításainak és parancsikonjainak írása"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Lehetővé teszi az alkalmazás számára, hogy módosítsa a kezdőképernyő beállításait és parancsikonjait."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"A(z) <xliff:g id="APP_NAME">%1$s</xliff:g> nem kezdeményezhet telefonhívásokat"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Probléma történt a modul betöltésekor"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Beállítás"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Ez egy rendszeralkalmazás, és nem lehet eltávolítani."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Név módosítása"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"A(z) <xliff:g id="APP_NAME">%1$s</xliff:g> letiltva"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Személyes"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Munkahelyi"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Munkaprofil"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"A munkahelyi alkalmazások jelvénnyel vannak megjelölve, és láthatók a rendszergazda számára"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Értem"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"A munkahelyi alkalmazások ki vannak kapcsolva"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"A munkahelyi alkalmazások nem küldhetnek értesítéseket, nem használhatják az akkumulátort, és nem férhetnek hozzá az Ön tartózkodási helyéhez."</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index ef87d0619c..b261b02e7a 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"ստեղծել հիմնաէջի կարգավորումներ ու դյուրանցումներ"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Ծրագրին թույլ է տալիս փոփոխել հիմնաէջի կարգավորումներն ու դյուրանցումները:"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> հավելվածին չի թույլատրվում հեռախոսազանգեր կատարել"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Վիջեթի բեռնման խնդիր կա"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Կարգավորում"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Սա համակարգային ծրագիր է և չի կարող ապատեղադրվել:"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Փոխել անունը"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> հավելվածն անջատված է"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Անձնական"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Աշխատանքային"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Աշխատանքային պրոֆիլ"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Աշխատանքային հավելվածները նշանակներ ունեն և տեսանելի են ՏՏ ադմինիստրատորին"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Եղավ"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Աշխատանքային հավելվածներն անջատված են"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Աշխատանքային հավելվածները չեն կարող ծանուցումներ ուղարկել ձեզ, օգտագործել մարտկոցը և ձեր տեղադրության մասին տվյալներ ստանալ։"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index c3cdcfcf6a..8b45632d4c 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"menulis setelan dan pintasan layar Utama"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Mengizinkan aplikasi mengubah setelan dan pintasan di layar Utama."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> tidak diizinkan untuk melakukan panggilan telepon"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Masalah memuat widget"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Siapkan"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Ini adalah aplikasi sistem dan tidak dapat dicopot pemasangannya."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Sunting Nama"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> dinonaktifkan"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Pribadi"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Kerja"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profil kerja"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Aplikasi kerja diberi badge dan terlihat oleh admin IT"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Oke"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Aplikasi kerja dinonaktifkan"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Aplikasi kerja tidak dapat mengirimkan notifikasi, menggunakan baterai, atau mengakses lokasi Anda"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index d3774ed827..baa4a87933 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"skrifa stillingar og flýtileiðir heimaskjás"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Leyfir forriti að breyta stillingum og flýtileiðum heimaskjás."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> hefur ekki leyfi til að hringja símtöl"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Vandamál við að hlaða græju"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Uppsetning"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Þetta er kerfisforrit sem ekki er hægt að fjarlægja."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Breyta nafni"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Óvirkt <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Persónulegt"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Vinna"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Vinnusnið"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Vinnuforrit eru merkt og kerfisstjórinn getur séð þau"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Ég skil"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Slökkt er á vinnuforritum"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Vinnuforrit geta ekki sent þér tilkynningar, notað rafhlöðuorku eða fengið aðgang að staðsetningu þinni"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 58135218c0..54a6560d04 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"creazione di impostazioni e scorciatoie in Home"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Consente all\'app di modificare le impostazioni e le scorciatoie in Home."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"L\'app <xliff:g id="APP_NAME">%1$s</xliff:g> non è autorizzata a effettuare telefonate"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Errore durante il caricamento del widget"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Configurazione"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Questa è un\'app di sistema e non può essere disinstallata."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Modifica nome"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"App <xliff:g id="APP_NAME">%1$s</xliff:g> disattivata"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personali"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Lavoro"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profilo di lavoro"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Le app di lavoro sono contrassegnate con un badge e visibili all\'amministratore IT"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Le app di lavoro non sono attive"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Le app di lavoro non possono inviarti notifiche, usare la batteria o accedere alla tua posizione"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index f07b4e554d..6291e308f4 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -86,8 +86,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"כתיבת הגדרות וקיצורי דרך של דף הבית"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"מאפשר לאפליקציה לשנות את ההגדרות וקיצורי הדרך בדף הבית."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> אינו רשאי להתקשר"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"בעיה בטעינת ווידג\'ט"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"הגדרה"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"זוהי אפליקציית מערכת ולא ניתן להסיר את התקנתה."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"עריכת השם"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> מושבתת"</string>
@@ -162,8 +164,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"אישיות"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"עבודה"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"פרופיל עבודה"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"‏האפליקציות לעבודה מתויגות ומוצגות למנהל ה-IT"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"הבנתי"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"האפליקציות לעבודה מושבתות"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"האפליקציות לעבודה לא יכולות לשלוח לך התראות, להשתמש בסוללה או לגשת למיקום שלך"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 0d60f6d656..3586843a2f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"ホームの設定とショートカットの書き込み"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"ホームの設定とショートカットの変更をアプリに許可します。"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」から電話をかけることはできません"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"ウィジェットを表示できません"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"セットアップ"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"このシステムアプリはアンインストールできません。"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"名前の編集"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」は無効です"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"個人用"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"仕事用"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"仕事用プロファイル"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"仕事用アプリはバッジが付き、IT 管理者に公開されます"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"仕事用アプリは OFF になっています"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"仕事用アプリは、通知の送信、バッテリーの使用、位置情報の取得を行えません"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 51246be30b..a8cbdeda02 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"მთავარი ეკრანის პარამეტრებისა და მალსახმობების ჩაწერა"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"აპისთვის მთავარი ეკრანის პარამეტრებისა და მალსახმობების შეცვლის უფლების მიცემა."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g>-ს არ აქვს სატელეფონო ზარების განხორციელების უფლება"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"პრობლემა ვიჯეტის ჩატვირთვისას"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"დაყენება"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"ეს სისტემური აპია და მისი წაშლა შეუძლებელია."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"სახელის რედაქტირება"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> გაითიშა"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"პირადი"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"სამსახური"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"სამსახურის პროფილი"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"სამსახურის აპები ბეჯით არის მონიშნული და ხილულია IT ადმინისტრატორისთვის"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"გასაგებია"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"სამსახურის აპები გამორთულია"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"თქვენს სამსახურის აპებს არ შეუძლია თქვენთვის შეტყობინებების გამოგზავნა, თქვენი ბატარეის გამოყენება, ან თქვენს მდებარეობაზე წვდომა"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index b2753a2e88..057ca353cb 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"Негізгі экран параметрлері мен төте пернелерін жазу"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Қолданбаға Негізгі экрандағы параметрлер мен төте пернелерді өзгерту мүмкіндігін береді."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> арқылы телефон қоңырауларын соғуға рұқсат етілмеген"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Виджетті жүктеу барысында мәселе орын алды"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Орнату"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Бұл жүйе қолданбасы, сондықтан оны алу мүмкін емес."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Атын өңдеу"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> өшірілді"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Жеке"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Жұмыс"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Жұмыс профилі"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Жұмыс қолданбаларының танымбелгілері бар және олар әкімшіңізге көрінеді."</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Түсінікті"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Жұмыс қолданбалары өшірулі"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Жұмыс қолданбалары сізге хабарландырулар жібере, батареяңызды немесе локацияңызды пайдалана алмайды."</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 82c9a36123..08f9d0a5e9 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"សរសេរ​ការ​កំណត់ ​និង​ផ្លូវកាត់​​លើ​អេក្រង់​ដើម"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"អនុញ្ញាត​ឲ្យ​កម្មវិធី​ប្ដូរ​ការ​កំណត់ និង​ផ្លូវ​កាត់​ក្នុង​អេក្រង់​ដើម។"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> មិនត្រូវបានអនុញ្ញាតឲ្យធ្វើការហៅទូរស័ព្ទទេ"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"បញ្ហា​ក្នុង​ការ​ផ្ទុក​ធាតុ​​ក្រាហ្វិក"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"រៀបចំ"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"នេះ​​​ជា​កម្មវិធី​ប្រព័ន្ធ មិន​អាច​លុប​បាន​ទេ។"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"កែ​ឈ្មោះ"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"បានបិទដំណើរការ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ផ្ទាល់ខ្លួន"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"ការងារ"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"កម្រងព័ត៌មានការងារ"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"កម្មវិធីការងារ​ត្រូវបានដាក់​គ្រឿងសម្គាល់ ហើយ​អ្នកគ្រប់គ្រង​ផ្នែកព័ត៌មានវិទ្យា​របស់អ្នក​អាចមើលឃើញ"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"យល់ហើយ"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"កម្មវិធីការងារ​ត្រូវបានបិទ"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"កម្មវិធី​ការងារ​របស់អ្នក​មិនអាចផ្ញើ​ការជូនដំណឹង​ទៅអ្នក ប្រើប្រាស់ថ្ម​របស់អ្នក ឬ​ចូលប្រើ​ទីតាំង​របស់អ្នក​បានទេ"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 07a0cc9238..c46e732a79 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -53,11 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"ಸಂವಾದಗಳು"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"ನಿಮ್ಮ ಬೆರಳ ತುದಿಯಲ್ಲಿ ಉಪಯುಕ್ತ ಮಾಹಿತಿ"</string>
     <string name="widget_education_content" msgid="745542879510751525">"ಆ್ಯಪ್‌ಗಳನ್ನು ತೆರೆಯದೆಯೇ ಮಾಹಿತಿಯನ್ನು ಪಡೆಯಲು, ನಿಮ್ಮ ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿ ನೀವು ವಿಜೆಟ್‌ಗಳನ್ನು ಸೇರಿಸಬಹುದು"</string>
-    <!-- no translation found for reconfigurable_widget_education_tip (6336962690888067057) -->
-    <skip />
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"ವಿಜೆಟ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"ಅರ್ಥವಾಯಿತು"</string>
-    <!-- no translation found for widget_reconfigure_button_content_description (8811472721881205250) -->
-    <skip />
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"ವಿಜೆಟ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಿ"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಹುಡುಕಿ"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" ಹೊಂದಿಕೆಯ ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಕಂಡುಬಂದಿಲ್ಲ"</string>
@@ -84,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"ಮುಖಪುಟದ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಮತ್ತು ಶಾರ್ಟ್‌ಕಟ್‌ಗಳನ್ನು ಬರೆಯಿರಿ"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"ಮುಖಪುಟದಲ್ಲಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಮತ್ತು ಶಾರ್ಟ್‌ಕಟ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಲು ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿ ನೀಡುತ್ತದೆ."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"ಫೋನ್ ಕರೆಗಳನ್ನು ಮಾಡಲು <xliff:g id="APP_NAME">%1$s</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌‌ಗೆ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"ವಿಜೆಟ್ ಲೋಡ್‌ ಮಾಡುವಲ್ಲಿ ಸಮಸ್ಯೆ"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"ಸೆಟಪ್"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"ಇದೊಂದು ಅಪ್ಲಿಕೇಶನ್ ಆಗಿದೆ ಮತ್ತು ಅಸ್ಥಾಪಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"ಹೆಸರನ್ನು ಎಡಿಟ್ ಮಾಡಿ"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 68589d8ea9..c06d33753e 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"홈 설정 및 바로가기 쓰기"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"앱이 홈에 있는 설정 및 바로가기를 변경할 수 있도록 합니다."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g>에서 전화를 걸 수 없습니다."</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"위젯을 로드하는 중 문제가 발생했습니다."</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"설정"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"시스템 앱은 제거할 수 없습니다."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"이름 수정"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> 사용 안함"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"개인"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"직장"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"직장 프로필"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"직장 앱에는 배지가 있으며, IT 관리자는 직장 앱을 확인할 수 있습니다"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"확인"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"직장 앱이 꺼져 있음"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"직장 앱에서 알림을 보내거나 배터리를 사용하거나 위치 정보에 액세스할 수 없습니다."</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 919fe45bba..122beaca13 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"Үйдүн тууралоолорун жана тез чакырмаларын жазуу"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Колдонмого Үйдүн тууралоолорун жана тез чакырмаларын өзгөртүүгө уруксат берет."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> телефон чалууларды аткарууга уруксаты жок"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Виджетти жүктөөдө маселе бар"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Орнотуу"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Бул системдик колдонмо жана аны чечкенге болбойт."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Аталышын түзөтүү"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> өчүрүлгөн"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Жеке колдонмолор"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Жумуш колдонмолору"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Жумуш профили"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Жумуш колдонмолору белгиленип, аларды IT администраторлору көрөт"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Түшүндүм"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Жумуш колдонмолору өчүк"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Жумуш колдонмолору билдирмелерди жөнөтүп, түзмөгүңүздүн батареясын керектеп же кайда жүргөнүңүздү көрө албайт"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index b91da7d67e..73d9fc4802 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"ຂຽນການຕັ້ງຄ່າໜ້າຫຼັກ ແລະທາງລັດ"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"ອະນຸຍາດໃຫ້ແອັບຯດັ່ງກ່າວ ປ່ຽນການຕັ້ງຄ່າ ແລະທາງລັດໃນໜ້າຫຼັກ."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> ບໍ່​ໄດ້​ຮັບ​ອະ​ນຸ​ຍາດ​ໃຫ້​ໂທ"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"ມີບັນຫາໃນການໂຫລດວິດເຈັດ"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"ຕິດຕັ້ງ"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"ນີ້ແມ່ນແອັບຯຂອງລະບົບ ແລະບໍ່ສາມາດຖອນການຕິດຕັ້ງອອກໄດ້."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"ແກ້ໄຂຊື່"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"ປິດການນຳໃຊ້ <xliff:g id="APP_NAME">%1$s</xliff:g> ແລ້ວ"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ສ່ວນຕົວ"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"ວຽກ"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"ແອັບບ່ອນເຮັດວຽກແມ່ນຖືກຕິດປ້າຍ ແລະ ສະແດງໃຫ້ຜູ້ເບິ່ງແຍງໄອທີຂອງທ່ານເຫັນ"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ເຂົ້າໃຈແລ້ວ"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"ແອັບບ່ອນເຮັດວຽກຖືກປິດໄວ້ຢູ່"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"ແອັບບ່ອນເຮັດວຽກຂອງທ່ານຈະບໍ່ສາມາດສົ່ງການແຈ້ງເຕືອນຫາທ່ານ, ໃຊ້ແບັດເຕີຣີຂອງທ່ານ ຫຼື ເຂົ້າເຖິງສະຖານທີ່ຂອງທ່ານໄດ້"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 84414ca486..6843530cfb 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -86,8 +86,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"rašyti pagrindinio puslapio nustatymus ir sparčiuosius klavišus"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Programai leidžiama keisti pagrindinio puslapio nustatymus ir sparčiuosius klavišus."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"„<xliff:g id="APP_NAME">%1$s</xliff:g>“ neleidžiama skambinti"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Problema įkeliant valdiklį"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Sąranka"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Tai sistemos programa ir jos negalima pašalinti."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Pavadinimo redagavimas"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"„<xliff:g id="APP_NAME">%1$s</xliff:g>“ išjungta"</string>
@@ -162,8 +164,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Asmeninės"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Darbo"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Darbo profilis"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Darbo programos yra pažymėtos ženkleliu ir matomos IT administratoriui"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Supratau"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Darbo programos išjungtos"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Darbo programos negali siųsti jums pranešimų, naudoti jūsų akumuliatoriaus ar pasiekti jūsų vietovės"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 0b283d9b48..ed6ebf610a 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -84,8 +84,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"rakstīt sākuma ekrāna iestatījumus un saīsnes"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Ļauj lietotnei mainīt iestatījumus un saīsnes sākuma ekrānā."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"Lietotnei <xliff:g id="APP_NAME">%1$s</xliff:g> nav atļauts veikt tālruņa zvanus."</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Ielādējot logrīku, radās problēma."</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Notiek iestatīšana"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Šī ir sistēmas lietotne, un to nevar atinstalēt."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Nosaukuma rediģēšana"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Lietotne <xliff:g id="APP_NAME">%1$s</xliff:g> ir atspējota"</string>
@@ -159,8 +161,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personīgās lietotnes"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Darba lietotnes"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Darba profils"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Darba lietotnēm ir pievienota emblēma, un tās ir redzamas jūsu IT administratoram"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Labi"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Darba lietotnes ir izslēgtas"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Jūsu darba lietotnes nevar sūtīt jums paziņojumus, izmantot akumulatoru un piekļūt jūsu atrašanās vietai."</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 29acbb87b6..2d5381171a 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"пишува поставки и кратенки на почетна страница"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Овозможува апликацијата да ги менува подесувањата и кратенките на почетната страница."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> нема дозвола за телефонски повици"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Проблем при вчитувањето на виџетот"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Поставување"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Ова е системска апликација и не може да се деинсталира."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Изменете го името"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> е оневозможена"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Лично"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"За работа"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Работен профил"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Работните апликации имаат значка и се видливи за IT-администраторот"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Сфатив"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Работните апликации се исклучени"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Работните апликации не може да ви испраќаат известувања, да ја користат батеријата или да пристапуваат до вашата локација"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 53679f15c4..f323d8fcfd 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"ഹോം ക്രമീകരണങ്ങളും കുറുക്കുവഴികളും റൈറ്റുചെയ്യുക"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"ഹോമിലെ ക്രമീകരണങ്ങളും കുറുക്കുവഴികളും മാറ്റാൻ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"ഫോൺ കോൾ ചെയ്യാൻ <xliff:g id="APP_NAME">%1$s</xliff:g> എന്നതിനെ അനുവദിച്ചിട്ടില്ല"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"വിജറ്റ് ലോഡുചെയ്യുന്നതിൽ പ്രശ്നമുണ്ട്"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"സജ്ജീകരിക്കുക"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"ഇതൊരു സിസ്‌റ്റം അപ്ലിക്കേഷനായതിനാൽ അൺഇൻസ്‌റ്റാളുചെയ്യാനാവില്ല."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"പേര് എഡിറ്റ് ചെയ്യുക"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> പ്രവർത്തനരഹിതമാക്കി"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"വ്യക്തിപരം"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"ഔദ്യോഗികം"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"ഔദ്യോഗിക പ്രൊഫൈൽ"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"ഔദ്യോഗിക ആപ്പുകൾക്ക് ബാഡ്‌ജ് നൽകിയിരിക്കുന്നു, അവ നിങ്ങളുടെ ഐടി അഡ്‌മിന് കാണാനുമാകും"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"മനസ്സിലായി"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"ഔദ്യോഗിക ആപ്പുകൾ ഓഫാണ്"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"നിങ്ങൾക്ക് അറിയിപ്പുകൾ അയയ്ക്കാനോ ബാറ്ററി ഉപയോഗിക്കാനോ ലൊക്കേഷൻ ആക്‌സസ് ചെയ്യാനോ നിങ്ങളുടെ ഔദ്യോഗിക ആപ്പുകൾക്ക് കഴിയില്ല"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index dc30f552a2..fc9f772bbe 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"Нүүрний тохиргоо болон товчлолыг бичих"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Апп нь Нүүрэндэх товчлол болон тохиргоог өөрчилж чадна."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> утасны дуудлага хийх боломжгүй"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Виджет ачаалахад асуудал гарав"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Тохируулга"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Энэ апп нь системийн апп ба устгах боломжгүй."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Нэр засах"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g>-г идэвхгүй болгосон"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Хувийн"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Ажил"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Ажлын профайл"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Ажлын аппуудыг тэмдэглэсэн бөгөөд танай IT админд харагдана"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Ойлголоо"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Ажлын аппууд унтраалттай байна"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Таны ажлын аппууд танд мэдэгдэл илгээх, таны батарейг ашиглах эсвэл байршилд тань хандах боломжгүй"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 38acebffad..4e1cdfb896 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -53,11 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"संभाषणे"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"तुमच्यासाठी सहज उपलब्ध असलेली माहिती"</string>
     <string name="widget_education_content" msgid="745542879510751525">"ॲप्स न उघडता माहिती मिळवण्यासाठी, तुम्ही तुमच्या होम स्क्रीनवर विजेट जोडू शकता"</string>
-    <!-- no translation found for reconfigurable_widget_education_tip (6336962690888067057) -->
-    <skip />
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"विजेट सेटिंग्ज बदलण्यासाठी टॅप करा"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"समजले"</string>
-    <!-- no translation found for widget_reconfigure_button_content_description (8811472721881205250) -->
-    <skip />
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"विजेट सेटिंग्ज बदला"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"अ‍ॅप्स शोधा"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"अ‍ॅप्स लोड करत आहे…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" शी जुळणारे कोणतेही अ‍ॅप्स आढळले नाहीत"</string>
@@ -84,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"होम सेटिंग्ज आणि शॉर्टकट लिहा"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"मुख्यपृष्ठातील सेटिंग्ज आणि शॉर्टकट बदलण्यास अ‍ॅप ला अनुमती देते."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> ला फोन कॉल करण्याची अनुमती नाही"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"विजेट लोड करण्यात समस्या"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"सेटअप"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"हा सिस्टम अ‍ॅप आहे आणि अनइंस्टॉल केला जाऊ शकत नाही."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"नाव संपादित करा"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> अक्षम केला आहे"</string>
@@ -161,18 +161,13 @@
     <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
     <skip />
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"समजले"</string>
-    <!-- no translation found for work_apps_paused_title (3007471013401118920) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_body (261634750995824906) -->
-    <skip />
-    <!-- no translation found for work_apps_paused_content_description (5149623040804051095) -->
-    <skip />
+    <string name="work_apps_paused_title" msgid="3007471013401118920">"कामाशी संबंधित ॲप्स बंद आहेत"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"तुमचे कामाशी संबंधित ॲप्स तुम्हाला सूचना पाठवू शकत नाहीत, तुमची बॅटरी वापरू शकत नाहीत किंवा तुमचे स्थान अ‍ॅक्सेस करू शकत नाहीत"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"कामाशी संबंधित ॲप्स बंद आहेत. तुमचे कामाशी संबंधित ॲप्स तुम्हाला सूचना पाठवू शकत नाहीत, तुमची बॅटरी वापरू शकत नाहीत किंवा तुमचे स्थान अ‍ॅक्सेस करू शकत नाहीत"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Work apps ही बॅज केलेली असून तुमच्या IT ॲडमिनला दृश्यमान आहेत"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"समजले"</string>
-    <!-- no translation found for work_apps_pause_btn_text (1921059713673767460) -->
-    <skip />
-    <!-- no translation found for work_apps_enable_btn_text (1156432622148413741) -->
-    <skip />
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"कामाशी संबंधित ॲप्स बंद करा"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"कामाशी संबंधित ॲप्स सुरू करा"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"फिल्टर"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"हे करता आले नाही: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index be9496203f..07b414a1d1 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"tulis tetapan dan pintasan Laman Utama"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Membenarkan apl menukar tetapan dan pintasan di Laman Utama."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> tidak dibenarkan membuat panggilan telefon"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Masalah memuatkan widget"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Persediaan"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Ini ialah apl sistem dan tidak boleh dinyahpasang."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Edit Nama"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> dilumpuhkan"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Peribadi"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Kerja"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profil kerja"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Apl kerja mempunyai lencana dan kelihatan kepada pentadbir IT anda"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Apl kerja dimatikan"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Apl kerja anda tidak boleh menghantar pemberitahuan kepada anda, menggunakan bateri anda atau mengakses lokasi anda"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 480310064f..e9f42e4014 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"ပင်မမျက်နှာစာ အပြင်အဆင် နှင့် အတိုကောက်မှတ်သားမှုများအား ရေးသားခြင်း"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"ပင်မမျက်နှာစာတွင် ရှိသော အပြင်အဆင် နှင့် အတိုကောက်မှတ်သားမှုများ ကို အပ်ပလီကေးရှင်းအား ပြောင်းခွင့်ပြုခြင်း"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g>သည် ဖုန်းခေါ်ဆိုခွင့် မရှိပါ"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"ဝဒ်ဂျက် တင်ရာတွင် ပြသနာ ရှိပါသည်"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"စဖွင့်သတ်မှတ်ရန်"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"ဤအပ်ပလီကေးရှင်းမှာ စစ်စတန်ပိုင်းဆိုင်ရာ အပ်ပလီကေးရှင်းဖြစ်ပါသည်။ ထုတ်ပစ်၍ မရပါ"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"အမည်ကို တည်းဖြတ်ပါ"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> ကို ပိတ်ထားသည်"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ကိုယ်ပိုင်"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"အလုပ်"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"အလုပ်ပရိုဖိုင်"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"အလုပ်သုံးအက်ပ်များကို တံဆိပ်တပ်ထားပြီး သင်၏ IT စီမံခန့်ခွဲသူက မြင်နိုင်ပါသည်"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ရပါပြီ"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"အလုပ်သုံးအက်ပ်များ ပိတ်ထားသည်"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"သင်၏ အလုပ်သုံးအက်ပ်များက အကြောင်းကြားချက်များ ပို့ခြင်း၊ သင့်ဘက်ထရီ သုံးခြင်း (သို့) သင့်တည်နေရာ သုံးခြင်းတို့ မပြုလုပ်နိုင်ပါ"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 55ef7a4cd1..046f4adbbd 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"angi startsideinnstillinger og -snarveier"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Lar appen endre innstillingene og snarveiene på startsiden."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> har ikke tillatelse til å ringe"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Problem ved innlasting av modul"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Konfigurering"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Dette er en systemapp som ikke kan avinstalleres."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Rediger navn"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Slo av <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personlig"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Jobb"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Jobbprofil"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Jobbapper er merket og synlige for IT-administratoren din"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Greit"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Jobbapper er av"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Jobbapper kan ikke sende deg varsler, bruke batteriet eller få tilgang til posisjonen din"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 14dcec8aa2..f7dcd964d7 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -53,11 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"वार्तालापहरू"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"उपयोगी जानकारी सजिलै प्राप्त गर्नुहोस्"</string>
     <string name="widget_education_content" msgid="745542879510751525">"एपहरू नखोलिकनै तिनका बारेमा जानकारी प्राप्त गर्न तपाईं आफ्नो होम स्क्रिनमा विजेटहरू हाल्न सक्नुहुन्छ"</string>
-    <!-- no translation found for reconfigurable_widget_education_tip (6336962690888067057) -->
-    <skip />
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"विजेटका सेटिङ बदल्न ट्याप गर्नुहोस्"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"बुझेँ"</string>
-    <!-- no translation found for widget_reconfigure_button_content_description (8811472721881205250) -->
-    <skip />
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"विजेटका सेटिङ बदल्नुहोस्"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"खोजसम्बन्धी एपहरू"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"एपहरू लोड गर्दै…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" सँग मिल्दो कुनै एप भेटिएन"</string>
@@ -84,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"गृह सेटिङहरू र सर्टकटहरू लेख्नुहोस्"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"गृहमा एउटा एपलाई सेटिङ र सर्टकट बदल्न अनुमति दिनुहोस्।"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> ले फोन कलहरू गर्न अनुमति छैन"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"समस्या लोडिङ गर्ने विजेट"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"सेटअप"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"यो प्रणाली एप हो र यसलाई स्थापना रद्द गर्न सकिँदैन।"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"नाम सम्पादन गर्नुहोस्"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"असक्षम पारिएको <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -158,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"व्यक्तिगत"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"कार्यसम्बन्धी"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"कार्य प्रोफाइल"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"कामसम्बन्धी एपहरूमा ब्याज अङ्कित हुन्छ र तपाईंका IT एड्मिन ती एप हेर्न सक्छन्"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"बुझेँ"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"कामसम्बन्धी एपहरू अफ गरिएका छन्"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"तपाईंका कामसम्बन्धी एपहरूले तपाईंलाई सूचना पठाउन, तपाईंको डिभाइसको ब्याट्री प्रयोग गर्न वा तपाईंको लोकेसन हेर्न सक्दैनन्"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index c9f204bc2b..8fa7c0253f 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"instellingen en snelkoppelingen op startscherm zetten"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"De app toestaan de instellingen en snelkoppelingen op de homepage te wijzigen."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> mag niet bellen"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Probleem bij het laden van widget"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Configuratie"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Dit is een systeemapp die niet kan worden verwijderd."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Naam bewerken"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> staat uit"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Privé"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Werk"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Werkprofiel"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Werk-apps hebben badges en zijn zichtbaar voor je IT-beheerder"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Werk-apps staan uit"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Je werk-apps kunnen je geen meldingen sturen, je batterij niet gebruiken en geen toegang krijgen tot je locatie"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 81b66c6ba1..9ef1ace198 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"ହୋମ୍‌ ସେଟିଙ୍ଗ ଏବଂ ଶର୍ଟକଟ୍‌ ଲେଖନ୍ତୁ"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"ହୋମରେ ସେଟିଙ୍ଗ ଏବଂ ଶର୍ଟକଟ୍‌ ପରିବର୍ତ୍ତନ କରିବାକୁ ଆପକୁ ଅନୁମତି ଦିଏ।"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"ଫୋନ୍‌ କଲ୍‌ କରିବାକୁ <xliff:g id="APP_NAME">%1$s</xliff:g>କୁ ଅନୁମତି ଦିଆଯାଇ ନାହିଁ"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"ୱିଜେଟ୍‌ ଲୋଡ୍‌ ହେବାରେ ସମସ୍ୟା ଅଛି"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"ସେଟ୍ ଅପ୍ କରନ୍ତୁ"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"ଏହା ଏକ ସିଷ୍ଟମ୍‌ ଆପ୍‌ ଅଟେ ଏବଂ ଏହା ଅନଇନଷ୍ଟଲ୍‌ କରାଯାଇ ପାରିବ ନାହିଁ।"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"ନାମ ସମ୍ପାଦନ କରନ୍ତୁ"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> ଅକ୍ଷମ କରାଗଲା"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 993b16a11b..ba3c39976d 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -53,11 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"ਗੱਲਾਂਬਾਤਾਂ"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"ਤੁਹਾਡੀਆਂ ਉਂਗਲਾਂ \'ਤੇ ਲਾਹੇਵੰਦ ਜਾਣਕਾਰੀ"</string>
     <string name="widget_education_content" msgid="745542879510751525">"ਐਪਾਂ ਨੂੰ ਖੋਲ੍ਹੇ ਬਿਨਾਂ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ, ਤੁਸੀਂ ਆਪਣੀ ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਵਿਜੇਟ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ"</string>
-    <!-- no translation found for reconfigurable_widget_education_tip (6336962690888067057) -->
-    <skip />
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"ਵਿਜੇਟ ਸੈਟਿੰਗਾਂ ਨੂੰ ਬਦਲਣ ਲਈ ਟੈਪ ਕਰੋ"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"ਸਮਝ ਲਿਆ"</string>
-    <!-- no translation found for widget_reconfigure_button_content_description (8811472721881205250) -->
-    <skip />
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"ਵਿਜੇਟ ਸੈਟਿੰਗਾਂ ਬਦਲੋ"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ਐਪਾਂ ਖੋਜੋ"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ਐਪਾਂ ਨੂੰ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" ਨਾਲ ਮੇਲ ਖਾਂਦੀਆਂ ਕੋਈ ਐਪਾਂ ਨਹੀਂ ਮਿਲੀਆਂ"</string>
@@ -84,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"ਹੋਮ ਸੈਟਿੰਗਾਂ ਅਤੇ ਸ਼ਾਰਟਕੱਟ ਲਿਖੋ"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"ਐਪ ਨੂੰ ਹੋਮ ਵਿੱਚ ਸੈਟਿੰਗਾਂ ਅਤੇ ਸ਼ਾਰਟਕੱਟ ਬਦਲਣ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਨੂੰ ਫ਼ੋਨ ਕਾਲਾਂ ਕਰਨ ਦੀ ਆਗਿਆ ਨਹੀਂ ਹੈ"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"ਵਿਜੇਟ ਲੋਡ ਕਰਨ ਵਿੱਚ ਸਮੱਸਿਆ"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"ਸਥਾਪਤ ਕਰੋ"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"ਇਹ ਇੱਕ ਸਿਸਟਮ ਐਪ ਹੈ ਅਤੇ ਇਸਨੂੰ ਅਣਇੰਸਟੌਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ।"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"ਨਾਮ ਦਾ ਸੰਪਾਦਨ ਕਰੋ"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਨੂੰ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index d55f6f5173..bb54c2f8e7 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -86,8 +86,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"zapisywanie ustawień i skrótów na ekranie głównym"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Umożliwia aplikacji zmianę ustawień i skrótów na ekranie głównym."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> nie może wykonywać połączeń telefonicznych"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Problem podczas ładowania widżetu"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Konfiguracja"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"To aplikacja systemowa i nie można jej odinstalować."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Edytuj nazwę"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Aplikacja <xliff:g id="APP_NAME">%1$s</xliff:g> jest wyłączona"</string>
@@ -162,8 +164,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Osobiste"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Służbowe"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profil służbowy"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Aplikacje służbowe mają plakietki i są widoczne dla administratora IT"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Aplikacje służbowe są wyłączone"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Aplikacje służbowe nie mogą wysyłać powiadomień, używać baterii ani uzyskiwać dostępu do Twojej lokalizacji"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index d844da3c22..2ffb341198 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"escrever definições e atalhos do Ecrã principal"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Permite à app alterar as definições e os atalhos no Ecrã Principal."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"O <xliff:g id="APP_NAME">%1$s</xliff:g> não tem autorização para efetuar chamadas telefónicas"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Problema ao carregar o widget"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Configuração"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"É uma app de sistema e não pode ser desinstalada."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Edite o nome"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> desativado"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Pessoal"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Trabalho"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de trabalho"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"As apps de trabalho têm um emblema e estão visíveis para o seu administrador de TI"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"As apps de trabalho estão desativadas"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"As apps de trabalho não podem enviar-lhe notificações, utilizar a bateria ou aceder à sua localização"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index a29cc4968f..76a00ae628 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"gravar configurações e atalhos da tela inicial"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Permite que o app altere as configurações e os atalhos na tela inicial."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> não tem permissão para fazer chamadas"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Problema ao carregar o widget"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Configuração"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Este é um app do sistema e não pode ser desinstalado."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Editar nome"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> desativado"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Pessoais"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Trabalho"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de trabalho"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Os apps de trabalho têm um ícone e ficam visíveis para o administrador de TI"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Ok"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Os apps de trabalho estão desativados"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Os apps de trabalho não podem enviar notificações, usar a bateria nem acessar o local"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 6fb48aa000..49c787cfc9 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -84,8 +84,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"scrie setări și comenzi rapide pentru ecranul de pornire"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Permite aplicației să modifice setările și comenzile rapide din ecranul de pornire."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> nu are permisiunea de a apela"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Problemă la încărcarea widgetului"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Configurați"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Aceasta este o aplicație de sistem și nu poate fi dezinstalată."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Modificați numele"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"S-a dezactivat <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -159,8 +161,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personale"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Profesionale"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profil de serviciu"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Aplicațiile pentru lucru sunt marcate și vizibile pentru administratorul IT"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Aplicațiile pentru lucru sunt dezactivate"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Aplicațiile pentru lucru nu pot să vă trimită notificări, să folosească bateria sau să vă acceseze locația"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 5adf04b3b1..12db0e2543 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -86,8 +86,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"Изменение настроек и ярлыков главного экрана"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Приложение сможет изменять настройки и ярлыки на главном экране."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"Приложение <xliff:g id="APP_NAME">%1$s</xliff:g> не может делать телефонные звонки"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Не удалось загрузить виджет"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Настройка"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Это системное приложение, его нельзя удалить."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Измените название"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Приложение <xliff:g id="APP_NAME">%1$s</xliff:g> отключено"</string>
@@ -162,8 +164,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Личные"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Рабочие"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Рабочий профиль"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"У рабочих приложений есть специальная пометка. Они видны системному администратору."</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ОК"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Рабочие приложения отключены"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Рабочие приложения не могут отправлять уведомления, расходовать заряд батареи и получать доступ к данным о вашем местоположении."</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index e9e1062b73..946e12c319 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"මුල් පිටු සැකසීම් සහ කෙටිමං ලියන්න"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"මුල් පිටුවේ සැකසීම් සහ කෙටිමං ඉවත් කිරීමට යෙදුමට අවසර දෙයි."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> හට දුරකථන ඇමතුම් සිදු කිරීමට ඉඩ නොදේ"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"ගැටලු පූරණ විජට් එක"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"ස්ථාපනය කරන්න"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"මෙය පද්ධති යෙදුමක් වන අතර අස්ථාපනය කළ නොහැක."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"නම සංස්කරණය කරන්න"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> අබල කෙරිණි"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"පුද්ගලික"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"කාර්යාලය"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"කාර්යාල පැතිකඩ"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"කාර්යාල යෙදුම්වලට ලාංඡන යොදා ඇති අතර ඔබගේ IT පරිපාලකට දෘශ්‍යමාන වේ"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"තේරුණා"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"කාර්යාල යෙදුම් ක්‍රියාවිරහිතයි"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"ඔබගේ කාර්යාල යෙදුම්වලට ඔබට දැනුම්දීම් එවීමට, ඔබගේ බැටරිය භාවිත කිරීමට හෝ ඔබගේ ස්ථානයට ප්‍රවේශ වීමට නොහැකිය"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 56637aed78..d4f2e00ba0 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -86,8 +86,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"zápis nastavení a odkazov plochy"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Povoľuje aplikácii zmeniť nastavenia a odkazy na ploche."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"Aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g> nemá povolenie uskutočňovať telefonické hovory"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Problém s načítaním miniaplikácií"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Nastavenie"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Toto je systémová aplikácia a nedá sa odinštalovať."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Úprava názvu"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g> je deaktivovaná"</string>
@@ -162,8 +164,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Osobné"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Pracovné"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Pracovný profil"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Pracovné aplikácie majú odznak a zobrazujú sa správcovi IT"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Dobre"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Pracovné aplikácie sú vypnuté"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Pracovné aplikácie nemôžu posielať upozornenia ani používať batériu či polohu."</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 3cf34d4a7a..d5d9f028fb 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -86,8 +86,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"zapis nastavitev in bližnjic na začetnem zaslonu"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Aplikaciji dovoli spreminjanje nastavitev in bližnjic na začetnem zaslonu."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"Aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g> ni dovoljeno opravljanje klicev"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Težava pri nalaganju pripomočka"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Nastavitev"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"To je sistemska aplikacija in je ni mogoče odstraniti."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Urejanje imena"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> je onemogočena"</string>
@@ -162,8 +164,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Osebno"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Delo"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Delovni profil"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Delovne aplikacije so označene z značko in vidne skrbniku za IT."</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Razumem"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Delovne aplikacije so izklopljene."</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Delovne aplikacije ne smejo pošiljati obvestil, porabljati energije baterije ali dostopati do lokacije."</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 62537f2312..f3a4649c28 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"shkruaj cilësimet dhe shkurtoret e ekranit bazë"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Lejon aplikacionin të ndryshojë cilësimet dhe shkurtoret në ekranin bazë."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> nuk lejohet të kryejë telefonata"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Problem në ngarkimin e miniaplikacionit"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Konfiguro"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Ky është aplikacion sistemi dhe nuk mund të çinstalohet."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Redakto emrin"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> u çaktivizua"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personale"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Punë"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profili i punës"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Aplikacionet e punës janë të shënuara dhe të dukshme për administratorin e teknologjisë së informacionit"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"E kuptova"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Aplikacionet e punës janë joaktive"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Aplikacionet e tua të punës nuk mund të të dërgojnë njoftime, të përdorin baterinë tënde apo të kenë qasje në vendndodhjen tënde"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index d5f8598b1a..b47a148072 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -84,8 +84,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"уписивање подешавања и пречица на почетном екрану"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Дозвољава апликацији да мења подешавања и пречице на почетном екрану."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> нема дозволу за упућивање телефонских позива"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Проблем при учитавању виџета"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Подешавање"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Ово је системска апликација и не може да се деинсталира."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Измените назив"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Апликација <xliff:g id="APP_NAME">%1$s</xliff:g> је онемогућена"</string>
@@ -159,8 +161,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Личне"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Пословне"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Пословни профил"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Пословне апликације су означене значком и ИТ администратор може да их види"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Важи"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Пословне апликације су искључене"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Пословне апликације не могу да вам шаљу обавештења, користе батерију нити приступају локацији"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 03872280ba..415e7bea76 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"skriva inställningar och genvägar för startsidan"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Tillåter att appen ändrar inställningar och genvägar på startsidan."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> har inte behörighet att ringa samtal"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Det gick inte att läsa in widgeten"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Konfiguration"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Det här är en systemapp som inte kan avinstalleras."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Redigera namn"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> har inaktiverats"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Privat"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Arbete"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Jobbprofil"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Jobbappar är märkta och synliga för IT-administratören"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Jobbappar är inaktiverade"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Dina jobbappar kan inte skicka aviseringar, använda batteriet eller komma åt din plats"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index c8463499db..7e1c724562 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"andika mipangilio ya skrini ya Mwanzo na njia za mkato"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Huruhusu programu kubadilisha mipangilio na njia za mkato katika skrini ya Mwanzo."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> hairuhusiwi kupiga simu"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Tatizo la kupakia wijeti"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Sanidi"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Hii ni programu ya mfumo na haiwezi kuondolewa."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Badilisha Jina"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> imezimwa"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Binafsi"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Kazini"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Wasifu wa kazini"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Programu za kazini zina beji na zinaonekana kwa msimamizi wako wa TEHAMA"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Nimeelewa"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Programu za kazini zimezimwa"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Programu zako za kazini haziwezi kukutumia arifa, kutumia betri yako au kufikia maelezo ya mahali ulipo"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index cfd4b3660a..877d92d09e 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"முகப்பின் அமைப்பு மற்றும் குறுக்குவழிகளை எழுதுதல்"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"முகப்பில் உள்ள அமைப்பு மற்றும் குறுக்குவழிகளை மாற்ற ஆப்ஸை அனுமதிக்கிறது."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"ஃபோன் அழைப்புகள் செய்ய, <xliff:g id="APP_NAME">%1$s</xliff:g> அனுமதிக்கப்படவில்லை"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"விட்ஜெட்டை ஏற்றுவதில் சிக்கல்"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"அமைவு"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"இது அமைப்பு ஆப்ஸ் என்பதால் நிறுவல் நீக்கம் செய்ய முடியாது."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"பெயரைத் திருத்துதல்"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> முடக்கப்பட்டது"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"தனிப்பட்டவை"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"பணி"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"பணிக் கணக்கு"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"பணி ஆப்ஸில் பேட்ஜ் இடப்பட்டுள்ளன. உங்கள் IT நிர்வாகியால் அவற்றைப் பார்க்க முடியும்"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"முடிந்தது"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"பணி ஆப்ஸ் முடக்கப்பட்டுள்ளன"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"பணி ஆப்ஸால் உங்களுக்கு அறிவிப்புகளை அனுப்பவோ பேட்டரியைப் பயன்படுத்தவோ உங்கள் இருப்பிடத்தை அணுகவோ முடியாது"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index b42b242169..e5bd96ee79 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -53,11 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"సంభాషణలు"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"మీ చేతివేళ్ల మీద ఉపయోగకరమైన సమాచారం"</string>
     <string name="widget_education_content" msgid="745542879510751525">"యాప్‌లను తెరవకుండా సమాచారం పొందడానికి, మీరు మీ మొదటి స్క్రీన్‌కు విడ్జెట్‌లను జోడించవచ్చు"</string>
-    <!-- no translation found for reconfigurable_widget_education_tip (6336962690888067057) -->
-    <skip />
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"విడ్జెట్ సెట్టింగ్‌లను మార్చడానికి ట్యాప్ చేయండి"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"అర్థమైంది"</string>
-    <!-- no translation found for widget_reconfigure_button_content_description (8811472721881205250) -->
-    <skip />
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"విడ్జెట్ సెట్టింగ్‌లను మార్చండి"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"అప్లికేషన్‌లను శోధించండి"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"అప్లికేషన్‌లను లోడ్ చేస్తోంది…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\"కి సరిపోలే అప్లికేషన్‌లేవీ కనుగొనబడలేదు"</string>
@@ -84,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"హోమ్ సెట్టింగ్‌లు మరియు సత్వరమార్గాలను వ్రాయడం"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"హోమ్‌లో సెట్టింగ్‌లు మరియు సత్వరమార్గాలను మార్చడానికి యాప్‌ను అనుమతిస్తుంది."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"ఫోన్ కాల్‌లను చేసేందుకు <xliff:g id="APP_NAME">%1$s</xliff:g>కి అనుమతి లేదు"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"విడ్జెట్‌ను లోడ్ చేయడంలో సమస్య"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"సెటప్ చేయి"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"ఇది సిస్టమ్ యాప్ మరియు దీన్ని అన్‌ఇన్‌స్టాల్ చేయడం సాధ్యపడదు."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"పేరును ఎడిట్ చేయండి"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> నిలిపివేయబడింది"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index cbb7d2a953..795bc7d929 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"เขียนการตั้งค่าและทางลัดหน้าแรกแล้ว"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"อนุญาตให้แอปเปลี่ยนการตั้งค่าและทางลัดในหน้าแรก"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> ไม่ได้รับอนุญาตให้โทรออก"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"มีปัญหาขณะโหลดวิดเจ็ต"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"ตั้งค่า"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"นี่เป็นแอประบบและไม่สามารถถอนการติดตั้งได้"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"แก้ไขชื่อ"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"ปิดใช้ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ส่วนตัว"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"งาน"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"โปรไฟล์งาน"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"แอปงานจะติดป้ายไว้และผู้ดูแลระบบไอทีจะมองเห็น"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"รับทราบ"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"แอปงานปิดอยู่"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"แอปงานจะส่งการแจ้งเตือน ใช้แบตเตอรี่ หรือเข้าถึงตำแหน่งของคุณไม่ได้"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index aefb1204ed..558b96bc06 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"magsulat ng mga setting at shortcut ng Home"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Pinapayagan ang app na baguhin ang mga setting at shortcut sa Home."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"Hindi pinahihintulutang tumawag ang <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Problema sa pag-load ng widget"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"I-setup"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Isa itong app ng system at hindi maaaring i-uninstall."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"I-edit ang Pangalan"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Naka-disable ang <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personal"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Trabaho"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profile sa trabaho"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"May badge at nakikita ng iyong IT admin ang mga app para sa trabaho"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Naka-off ang mga app para sa trabaho"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Ang mga app mo para sa trabaho ay hindi makakapagpadala sa iyo ng mga notification, makakagamit ng baterya mo, o makaka-access ng iyong lokasyon"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 6c4e541f68..c5980a9c87 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"Ana ekran ayarlarını ve kısayollarını yaz"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Uygulamaya, Ana ekrandaki ayarları ve kısayolları değiştirme izni verir."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> uygulamasının telefon etmesine izin verilmiyor"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Widget yüklenirken sorun oluştu"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Kurulum"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Bu bir sistem uygulamasıdır ve yüklemesi kaldırılamaz."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Adı Düzenle"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> devre dışı"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Kişisel"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"İş"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"İş profili"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"İş uygulamaları rozetle işaretlenmiş olup BT yöneticisi tarafından görülebilir"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Anladım"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"İş uygulamaları kapalı"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"İş uygulamaları size bildirim gönderemez, pilinizi kullanamaz veya konum bilginize erişemez"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 1677c9e67d..29fe67d98d 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -86,8 +86,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"записувати налаштування та ярлики головного екрана"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Дозволяє програмі змінювати налаштування та ярлики на головному екрані."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"Додаток <xliff:g id="APP_NAME">%1$s</xliff:g> не має дозволу телефонувати"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Проблема із завантаженням віджета"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Налаштування"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Це системна програма, її неможливо видалити."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Редагувати назву"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> вимкнено"</string>
@@ -162,8 +164,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Особисті додатки"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Робочі додатки"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Робочий профіль"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Робочі додатки відповідно позначені й видимі системному адміністратору"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Робочі додатки вимкнено"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Ваші робочі додатки не можуть надсилати сповіщення, використовувати заряд акумулятора й отримувати доступ до геоданих"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 8545f8a9b1..aba11d318a 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -53,11 +53,9 @@
     <string name="widget_category_conversations" msgid="8894438636213590446">"گفتگوئیں"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"مفید معلومات کو آسانی سے حاصل کریں"</string>
     <string name="widget_education_content" msgid="745542879510751525">"ایپس کو کھولے بغیر معلومات حاصل کرنے کے لیے آپ اپنی ہوم اسکرین پر ویجیٹس شامل کر سکتے ہیں"</string>
-    <!-- no translation found for reconfigurable_widget_education_tip (6336962690888067057) -->
-    <skip />
+    <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"ویجیٹ ترتیبات تبدیل کرنے کے لیے تھپتھپائیں"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"سمجھ آ گئی"</string>
-    <!-- no translation found for widget_reconfigure_button_content_description (8811472721881205250) -->
-    <skip />
+    <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"ویجیٹ ترتیبات تبدیل کریں"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"ایپس تلاش کریں"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"ایپس لوڈ کی جا رہی ہیں…"</string>
     <string name="all_apps_no_search_results" msgid="3200346862396363786">"\"<xliff:g id="QUERY">%1$s</xliff:g>\" سے مماثل کوئی ایپس نہیں ملیں"</string>
@@ -84,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"ہوم ترتیبات اور شارٹ کٹس کو لکھیں"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"ایپ کو ہوم میں ترتیبات اور شارٹ کٹس کو تبدیل کرنے کی اجازت دیتا ہے۔"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> کو فون کالیں کرنے کی اجازت نہیں ہے"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"ویجیٹ کو لوڈ کرنے میں مسئلہ"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"ترتیب دیں"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"یہ ایک سسٹم ایپ ہے اور اسے اَن انسٹال نہیں کیا جا سکتا ہے۔"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"نام میں ترمیم کریں"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> غیر فعال ہے"</string>
@@ -158,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ذاتی"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"دفتری"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"دفتری پروفائل"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"‏ورک ایپس پر بَیج لگایا گیا ہے اور آپ کا IT منتظم اسے دیکھ سکتا ہے"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"سمجھ آ گئی"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"ورک ایپس آف ہیں"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"آپ کی ورک ایپس آپ کو اطلاعات نہیں بھیج سکتیں، آپ کی بیٹری کا استعمال یا آپ کے مقام تک رسائی حاصل نہیں کر سکتی ہیں"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index d9f492339a..022e7487a0 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"Uy sozlamalari va yorliqlarini yozish"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Ilovaga \"Uy\" ekranidagi yorliqlar va sozlamalrni o‘zgartirish uchun ruxsat beradi."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> ilovasiga qo‘ng‘iroqlarni amalga oshirishga ruxsat berilmagan"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Vidjetni yuklashda muammo"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Sozlash"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Bu tizim ilovasi, shuning uchun o‘chirib bo‘lmaydi."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Nomini tahrirlash"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> ilovasi o‘chirib qo‘yildi"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Shaxsiy"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Ish"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Ish profili"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Ishga oid ilovalar qadalgan va IT administratoringizga koʻrinadi"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Ishga oid ilovalar faolsizlantirilgan"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Ishga oid ilovalar batareya sarfi haqida bildirishnomalar yubora olmaydi va joylashuv axborotidan foydalana olmaydi"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index e15b3235ff..c3e2363b5c 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"ghi cài đặt và lối tắt trên Màn hình chính"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Cho phép ứng dụng thay đổi cài đặt và lối tắt trên Màn hình chính."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> không được phép thực hiện cuộc gọi điện thoại"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Sự cố khi tải tiện ích"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Thiết lập"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Đây là ứng dụng hệ thống và không thể gỡ cài đặt."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Chỉnh sửa tên"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Đã vô hiệu hóa <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Cá nhân"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Công việc"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Hồ sơ công việc"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Các ứng dụng công việc được gắn huy hiệu và quản trị viên CNTT sẽ nhìn thấy các ứng dụng này"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Ứng dụng công việc đang tắt"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Các ứng dụng công việc không thể gửi thông báo cho bạn, sử dụng pin hoặc truy cập thông tin vị trí của bạn"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 2d8162a92f..b5f8e335b3 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"写入主屏幕设置和快捷方式"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"允许应用更改主屏幕中的设置和快捷方式。"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"不允许使用“<xliff:g id="APP_NAME">%1$s</xliff:g>”拨打电话"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"加载微件时出现问题"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"设置"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"这是系统应用，无法卸载。"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"修改名称"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"已停用<xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"个人"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"工作"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"工作资料"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"工作应用带有标志，您的 IT 管理员可以看到此类应用"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"知道了"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"工作应用已关闭"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"工作应用无法向您发送通知、不能耗用电池电量，也无法获取您的位置信息"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 80f9ee9315..0379e5b57b 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"寫入主畫面的設定和捷徑"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"允許應用程式更改主畫面中的設定和捷徑。"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"不允許 <xliff:g id="APP_NAME">%1$s</xliff:g> 撥打電話"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"載入小工具時發生問題"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"設定"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"這是系統應用程式，無法將其解除安裝。"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"編輯名稱"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」已停用"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"個人"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"工作"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"工作設定檔"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"工作應用程式會加上標誌，且你的 IT 管理員可以看到這類應用程式"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"知道了"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"工作應用程式已關閉"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"工作應用程式無法向您傳送通知、使用電池或存取位置"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index c868137354..0f6ccd8a91 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"寫入主畫面設定和捷徑"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"允許應用程式變更主畫面中的設定和捷徑。"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> 無法撥打電話"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"載入小工具時發生問題"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"設定"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"這是系統應用程式，不可解除安裝。"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"編輯名稱"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"已停用 <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"個人"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"工作"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"工作資料夾"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"工作應用程式會加上標記，而且你的 IT 管理員可以看到這類應用程式"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"我知道了"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"工作應用程式已關閉"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"工作應用程式不會消耗電量、無法傳送通知，也無法存取你的位置資訊"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 03a451c5c8..5bf5104117 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -82,8 +82,10 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"bhala izilungiselelo zokuthi Ikhaya nezinqamuleli"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Ivumela uhlelo lokusebenza ukuthi lushintshe izilungiselelo nezinqamuleli Ekhaya."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> ayivunyelwe ukwenza amakholi wefoni"</string>
-    <string name="gadget_error_text" msgid="6081085226050792095">"Inkinga yokulayisha iwijethi"</string>
-    <string name="gadget_setup_text" msgid="8274003207686040488">"Ukumisa"</string>
+    <!-- no translation found for gadget_error_text (740356548025791839) -->
+    <skip />
+    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
+    <skip />
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Lolu uhlelo lokusebenza lwesistimu futhi alikwazi ukukhishwa."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Hlela igama"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Kukhutshaziwe <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -156,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Okomuntu siqu"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Umsebenzi"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Iphrofayela yomsebenzi"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Ama-app omsebenzi anebheji futhi ayabonakala kumphathi wakho we-IT"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Ngiyezwa"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Ama-app omsebenzi avaliwe"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Ama-app akho omsebenzi awakwazi ukukuthumela izaziso, ukusebenzisa ibhethri lakho, noma ukufinyelela indawo yakho"</string>
-- 
GitLab


From e79b469986ae9c2b056da0b25145ca0aea6bc19c Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Thu, 17 Jun 2021 11:34:20 -0500
Subject: [PATCH 1435/1664] Allow AllApps to restore current selected tab on
 activity recreate

This CL also fixes:

- Wrong tab selection on RTL
- Fixes header protection hydraulic scroll issue
- Work toggle button text background contrast

Bug: 186005219
Bug: 191250799
Bug: 191227662
Bug: 191349226
Test: Manual
Change-Id: I3777474c954ed0d542ac38ff552367904be147d3
---
 res/values/config.xml                         |  3 +++
 .../allapps/AllAppsContainerView.java         | 24 ++++++++++++++++++-
 .../launcher3/allapps/WorkModeSwitch.java     |  1 +
 .../launcher3/views/SpringRelativeLayout.java |  2 --
 .../PersonalWorkSlidingTabStrip.java          |  2 +-
 5 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/res/values/config.xml b/res/values/config.xml
index 299c80ef8b..04c359ede3 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -76,6 +76,9 @@
     <!-- View IDs to store item highlight information -->
     <item type="id" name="view_unhighlight_background" />
 
+    <!-- view ID used to restore work tab state -->
+    <item type="id" name="work_tab_state_id" />
+
     <!-- Menu id for feature flags -->
     <item type="id" name="menu_apply_flags" />
 
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 8076b27300..67f2a9eb32 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -31,6 +31,7 @@ import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Point;
 import android.graphics.Rect;
+import android.os.Bundle;
 import android.os.Parcelable;
 import android.os.Process;
 import android.text.Selection;
@@ -82,6 +83,8 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         Insettable, OnDeviceProfileChangeListener, OnActivePageChangedListener,
         ScrimView.ScrimDrawingController {
 
+    private static final String BUNDLE_KEY_CURRENT_PAGE = "launcher.allapps.current_page";
+
     public static final float PULL_MULTIPLIER = .02f;
     public static final float FLING_VELOCITY_MULTIPLIER = 1200f;
 
@@ -181,6 +184,23 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         } catch (Exception e) {
             Log.e("AllAppsContainerView", "restoreInstanceState viewId = 0", e);
         }
+        Bundle state = (Bundle) sparseArray.get(R.id.work_tab_state_id, null);
+        if (state != null) {
+            int currentPage = state.getInt(BUNDLE_KEY_CURRENT_PAGE, 0);
+            if (currentPage != 0) {
+                rebindAdapters(true);
+                mViewPager.setCurrentPage(currentPage);
+            }
+        }
+    }
+
+
+    @Override
+    protected void dispatchSaveInstanceState(SparseArray<Parcelable> container) {
+        super.dispatchSaveInstanceState(container);
+        Bundle state = new Bundle();
+        state.putInt(BUNDLE_KEY_CURRENT_PAGE, getCurrentPage());
+        container.put(R.id.work_tab_state_id, state);
     }
 
     /**
@@ -231,7 +251,9 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
 
     private void resetWorkProfile() {
         boolean isEnabled = !mAllAppsStore.hasModelFlag(FLAG_QUIET_MODE_ENABLED);
-        mWorkModeSwitch.updateCurrentState(isEnabled);
+        if (mWorkModeSwitch != null) {
+            mWorkModeSwitch.updateCurrentState(isEnabled);
+        }
         mWorkAdapterProvider.updateCurrentState(isEnabled);
         mAH[AdapterHolder.WORK].applyPadding();
     }
diff --git a/src/com/android/launcher3/allapps/WorkModeSwitch.java b/src/com/android/launcher3/allapps/WorkModeSwitch.java
index 6d57aa61a9..a800d34758 100644
--- a/src/com/android/launcher3/allapps/WorkModeSwitch.java
+++ b/src/com/android/launcher3/allapps/WorkModeSwitch.java
@@ -67,6 +67,7 @@ public class WorkModeSwitch extends Button implements Insettable, View.OnClickLi
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
+        setSelected(true);
         setOnClickListener(this);
         if (Utilities.ATLEAST_R) {
             mKeyboardInsetAnimationCallback = new KeyboardInsetAnimationCallback(this);
diff --git a/src/com/android/launcher3/views/SpringRelativeLayout.java b/src/com/android/launcher3/views/SpringRelativeLayout.java
index 8e3ac20574..8f814a1949 100644
--- a/src/com/android/launcher3/views/SpringRelativeLayout.java
+++ b/src/com/android/launcher3/views/SpringRelativeLayout.java
@@ -108,8 +108,6 @@ public class SpringRelativeLayout extends RelativeLayout {
             switch (direction) {
                 case DIRECTION_TOP:
                     return new EdgeEffectProxy(getContext(), mEdgeGlowTop);
-                case DIRECTION_BOTTOM:
-                    return new EdgeEffectProxy(getContext(), mEdgeGlowBottom);
             }
             return super.createEdgeEffect(view, direction);
         }
diff --git a/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java b/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
index b35c75b429..df5d465d96 100644
--- a/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
+++ b/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
@@ -127,7 +127,7 @@ public class PersonalWorkSlidingTabStrip extends LinearLayout implements PageInd
     @Override
     public void setActiveMarker(int activePage) {
         updateTabTextColor(activePage);
-        updateIndicatorPosition(activePage);
+        updateIndicatorPosition(mIsRtl ? 1 - activePage : activePage);
         if (mOnActivePageChangedListener != null && mLastActivePage != activePage) {
             mOnActivePageChangedListener.onActivePageChanged(activePage);
         }
-- 
GitLab


From 058308098b152554af47645a5e8fba2da3b8d209 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Thu, 17 Jun 2021 23:19:31 +0100
Subject: [PATCH 1436/1664] Use relative bounds for app widget color extraction

Fix 2 bugs in this CL
1. Before this CL, getBoundsForViewInDragLayer returns absolute bounds
   for widgets. What we want is the bounds of a widget when it is
   visible in the drag layer. ViewGroupFocusHelper#viewToRect has
   taken PagedView into account. This makes it a prefect candidate to
   calculate relative bounds of a widget.
2. requestLayout at the end of endDrag is problematic due to the drop
   animation. If the drop animation is still in progress when onLayout
   is called, the bounds of the widget isn't final. Since the color of
   app widget right before is already the final color. We don't really
   need to update the color extraction.

Test: Set the wallpaper and clock widget according to the bug. Then,
      reboot the device. The clock widget color shown right after
      reboot is the expected color. Long pressing the widget doesn't
      cause a color change.
Fix: 191114337
Change-Id: I466c8102dba0e5b207b3768e0935472cbd523235
---
 .../widget/LauncherAppWidgetHostView.java        | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
index 50ab422114..70ed02f006 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
@@ -16,9 +16,6 @@
 
 package com.android.launcher3.widget;
 
-import static com.android.launcher3.Utilities.getBoundsForViewInDragLayer;
-import static com.android.launcher3.Utilities.setRect;
-
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
 import android.content.res.Configuration;
@@ -51,6 +48,7 @@ import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.Workspace;
 import com.android.launcher3.dragndrop.DragLayer;
+import com.android.launcher3.keyboard.ViewGroupFocusHelper;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.util.Executors;
@@ -102,7 +100,6 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
     private final Rect mCurrentWidgetSize = new Rect();
     private final Rect mWidgetSizeAtDrag = new Rect();
 
-    private final float[] mTmpFloatArray = new float[4];
     private final RectF mTempRectF = new RectF();
     private final Rect mEnforcedRectangle = new Rect();
     private final float mEnforcedCornerRadius;
@@ -117,6 +114,7 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         }
     };
     private final Object mUpdateLock = new Object();
+    private final ViewGroupFocusHelper mDragLayerRelativeCoordinateHelper;
     private long mDeferUpdatesUntilMillis = 0;
     private RemoteViews mMostRecentRemoteViews;
 
@@ -137,6 +135,7 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         mColorExtractor.setListener(this);
 
         mEnforcedCornerRadius = RoundedCornerEnforcement.computeEnforcedRadius(getContext());
+        mDragLayerRelativeCoordinateHelper = new ViewGroupFocusHelper(mLauncher.getDragLayer());
     }
 
     @Override
@@ -325,15 +324,9 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
 
         mIsScrollable = checkScrollableRecursively(this);
         if (!mIsInDragMode && getTag() instanceof LauncherAppWidgetInfo) {
-            mCurrentWidgetSize.left = left;
-            mCurrentWidgetSize.right = right;
-            mCurrentWidgetSize.top = top;
-            mCurrentWidgetSize.bottom = bottom;
 
             LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) getTag();
-            getBoundsForViewInDragLayer(mLauncher.getDragLayer(), (View) getParent(),
-                    mCurrentWidgetSize, true, mTmpFloatArray, mTempRectF);
-            setRect(mTempRectF, mCurrentWidgetSize);
+            mDragLayerRelativeCoordinateHelper.viewToRect(this, mCurrentWidgetSize);
             updateColorExtraction(mCurrentWidgetSize,
                     mWorkspace.getPageIndexForScreenId(info.screenId));
         }
@@ -358,7 +351,6 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         mIsInDragMode = false;
         mDragListener = null;
         mWidgetSizeAtDrag.setEmpty();
-        requestLayout();
     }
 
     /**
-- 
GitLab


From 54b5424548417769df815da072f95c6af5f872de Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Fri, 18 Jun 2021 09:36:23 +0000
Subject: [PATCH 1437/1664] Revert "Deduct padding from widget size only if
 padding has been inset"

This reverts commit 71cefb593f99ab2d19d1b70335be8c7886040469.

Reason for revert: The default padding is added by the framework not the launcher. We really need to subtract padding from the size.

Bug: 190498032
Change-Id: If7f164da34aec3d8e022ef2c752b72292cca0489
---
 src/com/android/launcher3/widget/util/WidgetSizes.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/widget/util/WidgetSizes.java b/src/com/android/launcher3/widget/util/WidgetSizes.java
index fcc0dde889..5c8ea7299b 100644
--- a/src/com/android/launcher3/widget/util/WidgetSizes.java
+++ b/src/com/android/launcher3/widget/util/WidgetSizes.java
@@ -99,13 +99,11 @@ public final class WidgetSizes {
      */
     public static Bundle getWidgetSizeOptions(Context context, ComponentName provider, int spanX,
             int spanY) {
-        boolean shouldInsetWidgets =
-                LauncherAppState.getIDP(context).getDeviceProfile(context).shouldInsetWidgets();
         ArrayList<SizeF> sizes = getWidgetSizes(context, spanX, spanY);
         Rect padding = getDefaultPaddingForWidget(context, provider, null);
         float density = context.getResources().getDisplayMetrics().density;
-        float xPaddingDips = shouldInsetWidgets ? (padding.left + padding.right) / density : 0;
-        float yPaddingDips = shouldInsetWidgets ? (padding.top + padding.bottom) / density : 0;
+        float xPaddingDips = (padding.left + padding.right) / density;
+        float yPaddingDips = (padding.top + padding.bottom) / density;
 
         ArrayList<SizeF> paddedSizes = sizes.stream()
                 .map(size -> new SizeF(
-- 
GitLab


From a0935232992a333847f845324327a27748115f64 Mon Sep 17 00:00:00 2001
From: Stevie Kideckel <kideckel@google.com>
Date: Mon, 14 Jun 2021 14:55:07 +0000
Subject: [PATCH 1438/1664] Load widget preview images before adding the rows
 to the adapter

This allows for smooth animations as the items will have their full
height resolved

Bug: 190892517
Test: verified locally
Test: CachingWidgetPreviewLoaderTest
Change-Id: I86afc6951a4cc82ae45e63795791d259a3bb3cda
---
 .../CachingWidgetPreviewLoaderTest.java       | 409 ++++++++++++++++++
 .../picker/WidgetsDiffReporterTest.java       |   7 +-
 .../widget/picker/WidgetsListAdapterTest.java |   4 +-
 ...WidgetsListHeaderViewHolderBinderTest.java |   4 +-
 ...sListSearchHeaderViewHolderBinderTest.java |   4 +-
 .../WidgetsListTableViewHolderBinderTest.java |   8 +-
 .../android/launcher3/LauncherAppState.java   |   7 +-
 .../android/launcher3/model/WidgetItem.java   |  15 +
 .../widget/CachingWidgetPreviewLoader.java    | 289 +++++++++++++
 .../DatabaseWidgetPreviewLoader.java}         | 136 ++++--
 .../android/launcher3/widget/WidgetCell.java  |  42 +-
 .../launcher3/widget/WidgetPreviewLoader.java |  47 ++
 .../widget/model/WidgetsListBaseEntry.java    |  13 +
 .../widget/model/WidgetsListHeaderEntry.java  |  42 +-
 .../model/WidgetsListSearchHeaderEntry.java   |  40 +-
 .../widget/picker/WidgetsDiffReporter.java    |   2 +-
 .../widget/picker/WidgetsListAdapter.java     | 154 +++++--
 .../WidgetsListTableViewHolderBinder.java     |  21 +-
 18 files changed, 1086 insertions(+), 158 deletions(-)
 create mode 100644 robolectric_tests/src/com/android/launcher3/widget/CachingWidgetPreviewLoaderTest.java
 create mode 100644 src/com/android/launcher3/widget/CachingWidgetPreviewLoader.java
 rename src/com/android/launcher3/{WidgetPreviewLoader.java => widget/DatabaseWidgetPreviewLoader.java} (86%)
 create mode 100644 src/com/android/launcher3/widget/WidgetPreviewLoader.java

diff --git a/robolectric_tests/src/com/android/launcher3/widget/CachingWidgetPreviewLoaderTest.java b/robolectric_tests/src/com/android/launcher3/widget/CachingWidgetPreviewLoaderTest.java
new file mode 100644
index 0000000000..c18e26ce34
--- /dev/null
+++ b/robolectric_tests/src/com/android/launcher3/widget/CachingWidgetPreviewLoaderTest.java
@@ -0,0 +1,409 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
+
+import android.content.ComponentName;
+import android.graphics.Bitmap;
+import android.os.CancellationSignal;
+import android.os.UserHandle;
+import android.util.Size;
+
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.InvariantDeviceProfile;
+import com.android.launcher3.icons.IconCache;
+import com.android.launcher3.model.WidgetItem;
+import com.android.launcher3.testing.TestActivity;
+import com.android.launcher3.widget.WidgetPreviewLoader.WidgetPreviewLoadedCallback;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+@RunWith(RobolectricTestRunner.class)
+public class CachingWidgetPreviewLoaderTest {
+    private static final Size SIZE_10_10 = new Size(10, 10);
+    private static final Size SIZE_20_20 = new Size(20, 20);
+    private static final String TEST_PACKAGE = "com.example.test";
+    private static final ComponentName TEST_PROVIDER =
+            new ComponentName(TEST_PACKAGE, ".WidgetProvider");
+    private static final ComponentName TEST_PROVIDER2 =
+            new ComponentName(TEST_PACKAGE, ".WidgetProvider2");
+    private static final Bitmap BITMAP = Bitmap.createBitmap(10, 10, Bitmap.Config.ARGB_8888);
+    private static final Bitmap BITMAP2 = Bitmap.createBitmap(20, 20, Bitmap.Config.ARGB_8888);
+
+
+    @Mock private CancellationSignal mCancellationSignal;
+    @Mock private WidgetPreviewLoader mDelegate;
+    @Mock private IconCache mIconCache;
+    @Mock private DeviceProfile mDeviceProfile;
+    @Mock private LauncherAppWidgetProviderInfo mProviderInfo;
+    @Mock private LauncherAppWidgetProviderInfo mProviderInfo2;
+    @Mock private WidgetPreviewLoadedCallback mPreviewLoadedCallback;
+    @Mock private WidgetPreviewLoadedCallback mPreviewLoadedCallback2;
+    @Captor private ArgumentCaptor<WidgetPreviewLoadedCallback> mCallbackCaptor;
+
+    private TestActivity mTestActivity;
+    private CachingWidgetPreviewLoader mLoader;
+    private WidgetItem mWidgetItem;
+    private WidgetItem mWidgetItem2;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mLoader = new CachingWidgetPreviewLoader(mDelegate);
+
+        mTestActivity = Robolectric.buildActivity(TestActivity.class).setup().get();
+        mTestActivity.setDeviceProfile(mDeviceProfile);
+
+        when(mDelegate.loadPreview(any(), any(), any(), any())).thenReturn(mCancellationSignal);
+
+        mProviderInfo.provider = TEST_PROVIDER;
+        when(mProviderInfo.getProfile()).thenReturn(new UserHandle(0));
+
+        mProviderInfo2.provider = TEST_PROVIDER2;
+        when(mProviderInfo2.getProfile()).thenReturn(new UserHandle(0));
+
+        InvariantDeviceProfile testProfile = new InvariantDeviceProfile();
+        testProfile.numRows = 5;
+        testProfile.numColumns = 5;
+
+        mWidgetItem = new WidgetItem(mProviderInfo, testProfile, mIconCache);
+        mWidgetItem2 = new WidgetItem(mProviderInfo2, testProfile, mIconCache);
+    }
+
+    @Test
+    public void getPreview_notInCache_shouldReturnNull() {
+        assertThat(mLoader.getPreview(mWidgetItem, SIZE_10_10)).isNull();
+    }
+
+    @Test
+    public void getPreview_notInCache_shouldNotCallDelegate() {
+        mLoader.getPreview(mWidgetItem, SIZE_10_10);
+
+        verifyZeroInteractions(mDelegate);
+    }
+
+    @Test
+    public void getPreview_inCache_shouldReturnCachedBitmap() {
+        loadPreviewIntoCache(mWidgetItem, SIZE_10_10, BITMAP);
+
+        assertThat(mLoader.getPreview(mWidgetItem, SIZE_10_10)).isEqualTo(BITMAP);
+    }
+
+    @Test
+    public void getPreview_otherSizeInCache_shouldReturnNull() {
+        loadPreviewIntoCache(mWidgetItem, SIZE_10_10, BITMAP);
+
+        assertThat(mLoader.getPreview(mWidgetItem, SIZE_20_20)).isNull();
+    }
+
+    @Test
+    public void getPreview_otherItemInCache_shouldReturnNull() {
+        loadPreviewIntoCache(mWidgetItem, SIZE_10_10, BITMAP);
+
+        assertThat(mLoader.getPreview(mWidgetItem2, SIZE_10_10)).isNull();
+    }
+
+    @Test
+    public void getPreview_shouldStoreMultipleSizesPerItem() {
+        loadPreviewIntoCache(mWidgetItem, SIZE_10_10, BITMAP);
+        loadPreviewIntoCache(mWidgetItem, SIZE_20_20, BITMAP2);
+
+        assertThat(mLoader.getPreview(mWidgetItem, SIZE_10_10)).isEqualTo(BITMAP);
+        assertThat(mLoader.getPreview(mWidgetItem, SIZE_20_20)).isEqualTo(BITMAP2);
+    }
+
+    @Test
+    public void loadPreview_notInCache_shouldStartLoading() {
+        mLoader.loadPreview(mTestActivity, mWidgetItem, SIZE_10_10, mPreviewLoadedCallback);
+
+        verify(mDelegate).loadPreview(eq(mTestActivity), eq(mWidgetItem), eq(SIZE_10_10), any());
+        verifyZeroInteractions(mPreviewLoadedCallback);
+    }
+
+    @Test
+    public void loadPreview_thenLoaded_shouldCallBack() {
+        mLoader.loadPreview(mTestActivity, mWidgetItem, SIZE_10_10, mPreviewLoadedCallback);
+        verify(mDelegate).loadPreview(any(), any(), any(), mCallbackCaptor.capture());
+        WidgetPreviewLoadedCallback loaderCallback = mCallbackCaptor.getValue();
+
+        loaderCallback.onPreviewLoaded(BITMAP);
+
+        verify(mPreviewLoadedCallback).onPreviewLoaded(BITMAP);
+    }
+
+    @Test
+    public void loadPreview_thenCancelled_shouldCancelDelegateRequest() {
+        CancellationSignal cancellationSignal =
+                mLoader.loadPreview(mTestActivity, mWidgetItem, SIZE_10_10, mPreviewLoadedCallback);
+
+        cancellationSignal.cancel();
+
+        verify(mCancellationSignal).cancel();
+        verifyZeroInteractions(mPreviewLoadedCallback);
+        assertThat(mLoader.getPreview(mWidgetItem, SIZE_10_10)).isNull();
+    }
+
+    @Test
+    public void loadPreview_thenCancelled_otherCallListening_shouldNotCancelDelegateRequest() {
+        CancellationSignal cancellationSignal1 =
+                mLoader.loadPreview(mTestActivity, mWidgetItem, SIZE_10_10, mPreviewLoadedCallback);
+        mLoader.loadPreview(mTestActivity, mWidgetItem, SIZE_10_10, mPreviewLoadedCallback2);
+
+        cancellationSignal1.cancel();
+
+        verifyZeroInteractions(mCancellationSignal);
+    }
+
+    @Test
+    public void loadPreview_thenCancelled_otherCallListening_loaded_shouldCallBackToNonCancelled() {
+        CancellationSignal cancellationSignal1 =
+                mLoader.loadPreview(mTestActivity, mWidgetItem, SIZE_10_10, mPreviewLoadedCallback);
+        mLoader.loadPreview(mTestActivity, mWidgetItem, SIZE_10_10, mPreviewLoadedCallback2);
+        verify(mDelegate).loadPreview(any(), any(), any(), mCallbackCaptor.capture());
+        WidgetPreviewLoadedCallback loaderCallback = mCallbackCaptor.getValue();
+
+        cancellationSignal1.cancel();
+        loaderCallback.onPreviewLoaded(BITMAP);
+
+        verifyZeroInteractions(mPreviewLoadedCallback);
+        verify(mPreviewLoadedCallback2).onPreviewLoaded(BITMAP);
+        assertThat(mLoader.getPreview(mWidgetItem, SIZE_10_10)).isEqualTo(BITMAP);
+    }
+
+    @Test
+    public void loadPreview_thenCancelled_bothCallsCancelled_shouldCancelDelegateRequest() {
+        CancellationSignal cancellationSignal1 =
+                mLoader.loadPreview(mTestActivity, mWidgetItem, SIZE_10_10, mPreviewLoadedCallback);
+        CancellationSignal cancellationSignal2 =
+                mLoader.loadPreview(
+                        mTestActivity, mWidgetItem, SIZE_10_10, mPreviewLoadedCallback2);
+
+        cancellationSignal1.cancel();
+        cancellationSignal2.cancel();
+
+        verify(mCancellationSignal).cancel();
+        verifyZeroInteractions(mPreviewLoadedCallback);
+        verifyZeroInteractions(mPreviewLoadedCallback2);
+        assertThat(mLoader.getPreview(mWidgetItem, SIZE_10_10)).isNull();
+    }
+
+    @Test
+    public void loadPreview_multipleCallbacks_shouldOnlyCallDelegateOnce() {
+        mLoader.loadPreview(mTestActivity, mWidgetItem, SIZE_10_10, mPreviewLoadedCallback);
+        mLoader.loadPreview(mTestActivity, mWidgetItem, SIZE_10_10, mPreviewLoadedCallback2);
+
+        verify(mDelegate).loadPreview(any(), any(), any(), any());
+    }
+
+    @Test
+    public void loadPreview_multipleCallbacks_shouldForwardResultToEachCallback() {
+        mLoader.loadPreview(mTestActivity, mWidgetItem, SIZE_10_10, mPreviewLoadedCallback);
+        mLoader.loadPreview(mTestActivity, mWidgetItem, SIZE_10_10, mPreviewLoadedCallback2);
+
+        verify(mDelegate).loadPreview(any(), any(), any(), mCallbackCaptor.capture());
+        WidgetPreviewLoadedCallback loaderCallback = mCallbackCaptor.getValue();
+
+        loaderCallback.onPreviewLoaded(BITMAP);
+
+        verify(mPreviewLoadedCallback).onPreviewLoaded(BITMAP);
+        verify(mPreviewLoadedCallback2).onPreviewLoaded(BITMAP);
+    }
+
+    @Test
+    public void loadPreview_inCache_shouldCallBackImmediately() {
+        loadPreviewIntoCache(mWidgetItem, SIZE_10_10, BITMAP);
+        reset(mDelegate);
+
+        mLoader.loadPreview(mTestActivity, mWidgetItem, SIZE_10_10, mPreviewLoadedCallback);
+
+        verify(mPreviewLoadedCallback).onPreviewLoaded(BITMAP);
+        verifyZeroInteractions(mDelegate);
+    }
+
+    @Test
+    public void loadPreview_thenLoaded_thenCancelled_shouldNotRemovePreviewFromCache() {
+        CancellationSignal cancellationSignal =
+                mLoader.loadPreview(mTestActivity, mWidgetItem, SIZE_10_10, mPreviewLoadedCallback);
+        verify(mDelegate).loadPreview(any(), any(), any(), mCallbackCaptor.capture());
+        WidgetPreviewLoadedCallback loaderCallback = mCallbackCaptor.getValue();
+        loaderCallback.onPreviewLoaded(BITMAP);
+
+        cancellationSignal.cancel();
+
+        assertThat(mLoader.getPreview(mWidgetItem, SIZE_10_10)).isEqualTo(BITMAP);
+    }
+
+    @Test
+    public void isPreviewLoaded_notLoaded_shouldReturnFalse() {
+        assertThat(mLoader.isPreviewLoaded(mWidgetItem, SIZE_10_10)).isFalse();
+    }
+
+    @Test
+    public void isPreviewLoaded_otherSizeLoaded_shouldReturnFalse() {
+        loadPreviewIntoCache(mWidgetItem, SIZE_20_20, BITMAP);
+
+        assertThat(mLoader.isPreviewLoaded(mWidgetItem, SIZE_10_10)).isFalse();
+    }
+
+    @Test
+    public void isPreviewLoaded_otherItemLoaded_shouldReturnFalse() {
+        loadPreviewIntoCache(mWidgetItem2, SIZE_10_10, BITMAP);
+
+        assertThat(mLoader.isPreviewLoaded(mWidgetItem, SIZE_10_10)).isFalse();
+    }
+
+    @Test
+    public void isPreviewLoaded_loaded_shouldReturnTrue() {
+        loadPreviewIntoCache(mWidgetItem, SIZE_10_10, BITMAP);
+
+        assertThat(mLoader.isPreviewLoaded(mWidgetItem, SIZE_10_10)).isTrue();
+    }
+
+    @Test
+    public void clearPreviews_notInCache_shouldBeNoOp() {
+        mLoader.clearPreviews(Collections.singletonList(mWidgetItem));
+
+        assertThat(mLoader.isPreviewLoaded(mWidgetItem, SIZE_10_10)).isFalse();
+    }
+
+    @Test
+    public void clearPreviews_inCache_shouldRemovePreview() {
+        loadPreviewIntoCache(mWidgetItem, SIZE_10_10, BITMAP);
+
+        mLoader.clearPreviews(Collections.singletonList(mWidgetItem));
+
+        assertThat(mLoader.isPreviewLoaded(mWidgetItem, SIZE_10_10)).isFalse();
+    }
+
+    @Test
+    public void clearPreviews_inCache_multipleSizes_shouldRemoveAllSizes() {
+        loadPreviewIntoCache(mWidgetItem, SIZE_10_10, BITMAP);
+        loadPreviewIntoCache(mWidgetItem, SIZE_20_20, BITMAP);
+
+        mLoader.clearPreviews(Collections.singletonList(mWidgetItem));
+
+        assertThat(mLoader.isPreviewLoaded(mWidgetItem, SIZE_10_10)).isFalse();
+        assertThat(mLoader.isPreviewLoaded(mWidgetItem, SIZE_20_20)).isFalse();
+    }
+
+    @Test
+    public void clearPreviews_inCache_otherItems_shouldOnlyRemoveSpecifiedItems() {
+        loadPreviewIntoCache(mWidgetItem, SIZE_10_10, BITMAP);
+        loadPreviewIntoCache(mWidgetItem2, SIZE_10_10, BITMAP);
+
+        mLoader.clearPreviews(Collections.singletonList(mWidgetItem));
+
+        assertThat(mLoader.isPreviewLoaded(mWidgetItem, SIZE_10_10)).isFalse();
+        assertThat(mLoader.isPreviewLoaded(mWidgetItem2, SIZE_10_10)).isTrue();
+    }
+
+    @Test
+    public void clearPreviews_inCache_otherItems_shouldRemoveAllSpecifiedItems() {
+        loadPreviewIntoCache(mWidgetItem, SIZE_10_10, BITMAP);
+        loadPreviewIntoCache(mWidgetItem2, SIZE_10_10, BITMAP);
+
+        mLoader.clearPreviews(Arrays.asList(mWidgetItem, mWidgetItem2));
+
+        assertThat(mLoader.isPreviewLoaded(mWidgetItem, SIZE_10_10)).isFalse();
+        assertThat(mLoader.isPreviewLoaded(mWidgetItem2, SIZE_10_10)).isFalse();
+    }
+
+    @Test
+    public void clearPreviews_loading_shouldCancelLoad() {
+        mLoader.loadPreview(mTestActivity, mWidgetItem, SIZE_10_10, mPreviewLoadedCallback);
+
+        mLoader.clearPreviews(Collections.singletonList(mWidgetItem));
+
+        verify(mCancellationSignal).cancel();
+    }
+
+    @Test
+    public void clearAll_cacheEmpty_shouldBeNoOp() {
+        mLoader.clearAll();
+
+        assertThat(mLoader.isPreviewLoaded(mWidgetItem, SIZE_10_10)).isFalse();
+    }
+
+    @Test
+    public void clearAll_inCache_shouldRemovePreview() {
+        loadPreviewIntoCache(mWidgetItem, SIZE_10_10, BITMAP);
+
+        mLoader.clearAll();
+
+        assertThat(mLoader.isPreviewLoaded(mWidgetItem, SIZE_10_10)).isFalse();
+    }
+
+    @Test
+    public void clearAll_inCache_multipleSizes_shouldRemoveAllSizes() {
+        loadPreviewIntoCache(mWidgetItem, SIZE_10_10, BITMAP);
+        loadPreviewIntoCache(mWidgetItem, SIZE_20_20, BITMAP);
+
+        mLoader.clearAll();
+
+        assertThat(mLoader.isPreviewLoaded(mWidgetItem, SIZE_10_10)).isFalse();
+        assertThat(mLoader.isPreviewLoaded(mWidgetItem, SIZE_20_20)).isFalse();
+    }
+
+    @Test
+    public void clearAll_inCache_multipleItems_shouldRemoveAll() {
+        loadPreviewIntoCache(mWidgetItem, SIZE_10_10, BITMAP);
+        loadPreviewIntoCache(mWidgetItem, SIZE_20_20, BITMAP);
+        loadPreviewIntoCache(mWidgetItem2, SIZE_20_20, BITMAP);
+
+        mLoader.clearAll();
+
+        assertThat(mLoader.isPreviewLoaded(mWidgetItem, SIZE_10_10)).isFalse();
+        assertThat(mLoader.isPreviewLoaded(mWidgetItem, SIZE_20_20)).isFalse();
+        assertThat(mLoader.isPreviewLoaded(mWidgetItem2, SIZE_20_20)).isFalse();
+    }
+
+    @Test
+    public void clearAll_loading_shouldCancelLoad() {
+        mLoader.loadPreview(mTestActivity, mWidgetItem, SIZE_10_10, mPreviewLoadedCallback);
+
+        mLoader.clearAll();
+
+        verify(mCancellationSignal).cancel();
+    }
+
+    private void loadPreviewIntoCache(WidgetItem widgetItem, Size size, Bitmap bitmap) {
+        reset(mDelegate);
+        mLoader.loadPreview(mTestActivity, widgetItem, size, ignored -> {});
+        verify(mDelegate).loadPreview(any(), any(), any(), mCallbackCaptor.capture());
+        WidgetPreviewLoadedCallback loaderCallback = mCallbackCaptor.getValue();
+
+        loaderCallback.onPreviewLoaded(bitmap);
+    }
+}
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsDiffReporterTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsDiffReporterTest.java
index cc36f630c9..c946c7218f 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsDiffReporterTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsDiffReporterTest.java
@@ -207,10 +207,9 @@ public final class WidgetsDiffReporterTest {
         // GIVEN the current list has app headers [A, B, E content].
         ArrayList<WidgetsListBaseEntry> currentList = new ArrayList<>(
                 List.of(mHeaderA, mHeaderB, mContentE));
-        // GIVEN the new list has app headers [A, B, E content].
-        List<WidgetsListBaseEntry> newList = List.of(mHeaderA, mHeaderB, mContentE);
-        // GIVEN the user has interacted with B.
-        mHeaderB.setIsWidgetListShown(true);
+        // GIVEN the new list has app headers [A, B, E content] and the user has interacted with B.
+        List<WidgetsListBaseEntry> newList =
+                List.of(mHeaderA, mHeaderB.withWidgetListShown(), mContentE);
 
         // WHEN computing the list difference.
         mWidgetsDiffReporter.process(currentList, newList, COMPARATOR);
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java
index e1214ff39f..c730fc0d00 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java
@@ -33,13 +33,13 @@ import android.view.LayoutInflater;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.launcher3.InvariantDeviceProfile;
-import com.android.launcher3.WidgetPreviewLoader;
 import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.ComponentWithLabel;
 import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.util.PackageUserKey;
+import com.android.launcher3.widget.DatabaseWidgetPreviewLoader;
 import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 import com.android.launcher3.widget.model.WidgetsListContentEntry;
@@ -64,7 +64,7 @@ public final class WidgetsListAdapterTest {
     private static final String TEST_PACKAGE_PLACEHOLDER = "com.google.test";
 
     @Mock private LayoutInflater mMockLayoutInflater;
-    @Mock private WidgetPreviewLoader mMockWidgetCache;
+    @Mock private DatabaseWidgetPreviewLoader mMockWidgetCache;
     @Mock private RecyclerView.AdapterDataObserver mListener;
     @Mock private IconCache mIconCache;
 
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java
index 4e2a508394..81b0c5f89c 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java
@@ -34,7 +34,6 @@ import android.widget.TextView;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.R;
-import com.android.launcher3.WidgetPreviewLoader;
 import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.ComponentWithLabel;
 import com.android.launcher3.icons.IconCache;
@@ -42,6 +41,7 @@ import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.testing.TestActivity;
 import com.android.launcher3.util.PackageUserKey;
+import com.android.launcher3.widget.DatabaseWidgetPreviewLoader;
 import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
 
@@ -79,7 +79,7 @@ public final class WidgetsListHeaderViewHolderBinderTest {
     @Mock
     private DeviceProfile mDeviceProfile;
     @Mock
-    private WidgetPreviewLoader mWidgetPreviewLoader;
+    private DatabaseWidgetPreviewLoader mWidgetPreviewLoader;
     @Mock
     private OnHeaderClickListener mOnHeaderClickListener;
 
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinderTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinderTest.java
index d6aea554f2..a0ba7c3307 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinderTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListSearchHeaderViewHolderBinderTest.java
@@ -34,7 +34,6 @@ import android.widget.TextView;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.R;
-import com.android.launcher3.WidgetPreviewLoader;
 import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.ComponentWithLabel;
 import com.android.launcher3.icons.IconCache;
@@ -42,6 +41,7 @@ import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.testing.TestActivity;
 import com.android.launcher3.util.PackageUserKey;
+import com.android.launcher3.widget.DatabaseWidgetPreviewLoader;
 import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.model.WidgetsListSearchHeaderEntry;
 
@@ -79,7 +79,7 @@ public final class WidgetsListSearchHeaderViewHolderBinderTest {
     @Mock
     private DeviceProfile mDeviceProfile;
     @Mock
-    private WidgetPreviewLoader mWidgetPreviewLoader;
+    private DatabaseWidgetPreviewLoader mWidgetPreviewLoader;
     @Mock
     private OnHeaderClickListener mOnHeaderClickListener;
 
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java
index 2f1326fdc0..8f9d132866 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java
@@ -38,13 +38,14 @@ import android.widget.TextView;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.R;
-import com.android.launcher3.WidgetPreviewLoader;
 import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.ComponentWithLabel;
 import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.testing.TestActivity;
+import com.android.launcher3.widget.CachingWidgetPreviewLoader;
+import com.android.launcher3.widget.DatabaseWidgetPreviewLoader;
 import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.widget.WidgetCell;
 import com.android.launcher3.widget.model.WidgetsListContentEntry;
@@ -85,7 +86,7 @@ public final class WidgetsListTableViewHolderBinderTest {
     @Mock
     private IconCache mIconCache;
     @Mock
-    private WidgetPreviewLoader mWidgetPreviewLoader;
+    private DatabaseWidgetPreviewLoader mWidgetPreviewLoader;
     @Mock
     private DeviceProfile mDeviceProfile;
 
@@ -113,11 +114,10 @@ public final class WidgetsListTableViewHolderBinderTest {
                 /* iconClickListener= */ view -> {},
                 /* iconLongClickListener= */ view -> false);
         mViewHolderBinder = new WidgetsListTableViewHolderBinder(
-                mContext,
                 LayoutInflater.from(mTestActivity),
                 mOnIconClickListener,
                 mOnLongClickListener,
-                mWidgetPreviewLoader,
+                new CachingWidgetPreviewLoader(mWidgetPreviewLoader),
                 new WidgetsListDrawableFactory(mTestActivity),
                 widgetsListAdapter);
     }
diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index b3d096c4b8..3d6be696bb 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -48,6 +48,7 @@ import com.android.launcher3.util.SafeCloseable;
 import com.android.launcher3.util.SettingsCache;
 import com.android.launcher3.util.SimpleBroadcastReceiver;
 import com.android.launcher3.util.Themes;
+import com.android.launcher3.widget.DatabaseWidgetPreviewLoader;
 import com.android.launcher3.widget.custom.CustomWidgetManager;
 
 public class LauncherAppState {
@@ -63,7 +64,7 @@ public class LauncherAppState {
     private final LauncherModel mModel;
     private final IconProvider mIconProvider;
     private final IconCache mIconCache;
-    private final WidgetPreviewLoader mWidgetCache;
+    private final DatabaseWidgetPreviewLoader mWidgetCache;
     private final InvariantDeviceProfile mInvariantDeviceProfile;
     private final RunnableList mOnTerminateCallback = new RunnableList();
 
@@ -138,7 +139,7 @@ public class LauncherAppState {
         mIconProvider =  new IconProvider(context, Themes.isThemedIconEnabled(context));
         mIconCache = new IconCache(mContext, mInvariantDeviceProfile,
                 iconCacheFileName, mIconProvider);
-        mWidgetCache = new WidgetPreviewLoader(mContext, mIconCache);
+        mWidgetCache = new DatabaseWidgetPreviewLoader(mContext, mIconCache);
         mModel = new LauncherModel(context, this, mIconCache, new AppFilter(mContext));
         mOnTerminateCallback.add(mIconCache::close);
     }
@@ -180,7 +181,7 @@ public class LauncherAppState {
         return mModel;
     }
 
-    public WidgetPreviewLoader getWidgetCache() {
+    public DatabaseWidgetPreviewLoader getWidgetCache() {
         return mWidgetCache;
     }
 
diff --git a/src/com/android/launcher3/model/WidgetItem.java b/src/com/android/launcher3/model/WidgetItem.java
index 97071bbaad..7198d54611 100644
--- a/src/com/android/launcher3/model/WidgetItem.java
+++ b/src/com/android/launcher3/model/WidgetItem.java
@@ -1,7 +1,11 @@
 package com.android.launcher3.model;
 
+import static com.android.launcher3.Utilities.ATLEAST_S;
+
+import android.annotation.SuppressLint;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
+import android.content.res.Resources;
 
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.Utilities;
@@ -59,4 +63,15 @@ public class WidgetItem extends ComponentKey {
         }
         return false;
     }
+
+    /** Returns whether this {@link WidgetItem} has a preview layout that can be used. */
+    @SuppressLint("NewApi") // Already added API check.
+    public boolean hasPreviewLayout() {
+        return ATLEAST_S && widgetInfo != null && widgetInfo.previewLayout != Resources.ID_NULL;
+    }
+
+    /** Returns whether this {@link WidgetItem} is for a shortcut rather than an app widget. */
+    public boolean isShortcut() {
+        return activityInfo != null;
+    }
 }
diff --git a/src/com/android/launcher3/widget/CachingWidgetPreviewLoader.java b/src/com/android/launcher3/widget/CachingWidgetPreviewLoader.java
new file mode 100644
index 0000000000..afceadd9a3
--- /dev/null
+++ b/src/com/android/launcher3/widget/CachingWidgetPreviewLoader.java
@@ -0,0 +1,289 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget;
+
+import android.graphics.Bitmap;
+import android.os.CancellationSignal;
+import android.util.Size;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
+import androidx.collection.ArrayMap;
+import androidx.collection.ArraySet;
+
+import com.android.launcher3.BaseActivity;
+import com.android.launcher3.model.WidgetItem;
+import com.android.launcher3.util.ComponentKey;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/** Wrapper around {@link DatabaseWidgetPreviewLoader} that contains caching logic. */
+public class CachingWidgetPreviewLoader implements WidgetPreviewLoader {
+
+    @NonNull private final WidgetPreviewLoader mDelegate;
+    @NonNull private final Map<ComponentKey, Map<Size, CacheResult>> mCache = new ArrayMap<>();
+
+    public CachingWidgetPreviewLoader(@NonNull WidgetPreviewLoader delegate) {
+        mDelegate = delegate;
+    }
+
+    /** Returns whether the preview is loaded for the item and size. */
+    public boolean isPreviewLoaded(@NonNull WidgetItem item, @NonNull Size previewSize) {
+        return getPreview(item, previewSize) != null;
+    }
+
+    /** Returns the cached preview for the item and size, or null if there is none. */
+    @Nullable
+    public Bitmap getPreview(@NonNull WidgetItem item, @NonNull Size previewSize) {
+        CacheResult cacheResult = getCacheResult(item, previewSize);
+        if (cacheResult instanceof CacheResult.Loaded) {
+            return ((CacheResult.Loaded) cacheResult).mBitmap;
+        } else {
+            return null;
+        }
+    }
+
+    @NonNull
+    private CacheResult getCacheResult(@NonNull WidgetItem item, @NonNull Size previewSize) {
+        synchronized (mCache) {
+            Map<Size, CacheResult> cacheResults = mCache.get(toComponentKey(item));
+            if (cacheResults == null) {
+                return CacheResult.MISS;
+            }
+
+            return cacheResults.getOrDefault(previewSize, CacheResult.MISS);
+        }
+    }
+
+    /**
+     * Puts the result in the cache for the item and size. Returns the value previously in the
+     * cache, or null if there was none.
+     */
+    @Nullable
+    private CacheResult putCacheResult(
+            @NonNull WidgetItem item,
+            @NonNull Size previewSize,
+            @Nullable CacheResult cacheResult) {
+        ComponentKey key = toComponentKey(item);
+        synchronized (mCache) {
+            Map<Size, CacheResult> cacheResults = mCache.getOrDefault(key, new ArrayMap<>());
+            CacheResult previous;
+            if (cacheResult == null) {
+                previous = cacheResults.remove(previewSize);
+                if (cacheResults.isEmpty()) {
+                    mCache.remove(key);
+                } else {
+                    previous = cacheResults.put(previewSize, cacheResult);
+                    mCache.put(key, cacheResults);
+                }
+            } else {
+                previous = cacheResults.put(previewSize, cacheResult);
+                mCache.put(key, cacheResults);
+            }
+            return previous;
+        }
+    }
+
+    private void removeCacheResult(@NonNull WidgetItem item, @NonNull Size previewSize) {
+        ComponentKey key = toComponentKey(item);
+        synchronized (mCache) {
+            Map<Size, CacheResult> cacheResults = mCache.getOrDefault(key, new ArrayMap<>());
+            cacheResults.remove(previewSize);
+            mCache.put(key, cacheResults);
+        }
+    }
+
+    /**
+     * Gets the preview for the widget item and size, using the value in the cache if stored.
+     *
+     * @return a {@link CancellationSignal}, which can cancel the request before it loads
+     */
+    @Override
+    @UiThread
+    @NonNull
+    public CancellationSignal loadPreview(
+            @NonNull BaseActivity activity, @NonNull WidgetItem item, @NonNull Size previewSize,
+            @NonNull WidgetPreviewLoadedCallback callback) {
+        CancellationSignal signal = new CancellationSignal();
+        signal.setOnCancelListener(() -> {
+            synchronized (mCache) {
+                CacheResult cacheResult = getCacheResult(item, previewSize);
+                if (!(cacheResult instanceof CacheResult.Loading)) {
+                    // If the key isn't actively loading, then this is a no-op. Cancelling loading
+                    // shouldn't clear the cache if we've already loaded.
+                    return;
+                }
+
+                CacheResult.Loading prev = (CacheResult.Loading) cacheResult;
+                CacheResult.Loading updated = prev.withoutCallback(callback);
+
+                if (updated.mCallbacks.isEmpty()) {
+                    // If the last callback was removed, then cancel the underlying request in the
+                    // delegate.
+                    prev.mCancellationSignal.cancel();
+                    removeCacheResult(item, previewSize);
+                } else {
+                    // If there are other callbacks still active, then don't cancel the delegate's
+                    // request, just remove this callback from the set.
+                    putCacheResult(item, previewSize, updated);
+                }
+            }
+        });
+
+        synchronized (mCache) {
+            CacheResult cacheResult = getCacheResult(item, previewSize);
+            if (cacheResult instanceof CacheResult.Loaded) {
+                // If the bitmap is already present in the cache, invoke the callback immediately.
+                callback.onPreviewLoaded(((CacheResult.Loaded) cacheResult).mBitmap);
+                return signal;
+            }
+
+            if (cacheResult instanceof CacheResult.Loading) {
+                // If we're already loading the preview for this key, then just add the callback
+                // to the set we'll call after it loads.
+                CacheResult.Loading prev = (CacheResult.Loading) cacheResult;
+                putCacheResult(item, previewSize, prev.withCallback(callback));
+                return signal;
+            }
+
+            CancellationSignal delegateCancellationSignal =
+                    mDelegate.loadPreview(
+                            activity,
+                            item,
+                            previewSize,
+                            preview -> {
+                                CacheResult prev;
+                                synchronized (mCache) {
+                                    prev = putCacheResult(
+                                            item, previewSize, new CacheResult.Loaded(preview));
+                                }
+                                if (prev instanceof CacheResult.Loading) {
+                                    // Notify each stored callback that the preview has loaded.
+                                    ((CacheResult.Loading) prev).mCallbacks
+                                            .forEach(c -> c.onPreviewLoaded(preview));
+                                } else {
+                                    // If there isn't a loading object in the cache, then we were
+                                    // notified before adding this signal to the cache. Just
+                                    // call back to the provided callback, there can't be others.
+                                    callback.onPreviewLoaded(preview);
+                                }
+                            });
+            ArraySet<WidgetPreviewLoadedCallback> callbacks = new ArraySet<>();
+            callbacks.add(callback);
+            putCacheResult(
+                    item,
+                    previewSize,
+                    new CacheResult.Loading(delegateCancellationSignal, callbacks));
+        }
+
+        return signal;
+    }
+
+    /** Clears all cached previews for {@code items}, cancelling any in-progress preview loading. */
+    public void clearPreviews(Iterable<WidgetItem> items) {
+        List<CacheResult> previousCacheResults = new ArrayList<>();
+        synchronized (mCache) {
+            for (WidgetItem item : items) {
+                Map<Size, CacheResult> previousMap = mCache.remove(toComponentKey(item));
+                if (previousMap != null) {
+                    previousCacheResults.addAll(previousMap.values());
+                }
+            }
+        }
+
+        for (CacheResult previousCacheResult : previousCacheResults) {
+            if (previousCacheResult instanceof CacheResult.Loading) {
+                ((CacheResult.Loading) previousCacheResult).mCancellationSignal.cancel();
+            }
+        }
+    }
+
+    /** Clears all cached previews, cancelling any in-progress preview loading. */
+    public void clearAll() {
+        List<CacheResult> previousCacheResults;
+        synchronized (mCache) {
+            previousCacheResults =
+                    mCache
+                    .values()
+                    .stream()
+                    .flatMap(sizeToResult -> sizeToResult.values().stream())
+                    .collect(Collectors.toList());
+            mCache.clear();
+        }
+
+        for (CacheResult previousCacheResult : previousCacheResults) {
+            if (previousCacheResult instanceof CacheResult.Loading) {
+                ((CacheResult.Loading) previousCacheResult).mCancellationSignal.cancel();
+            }
+        }
+    }
+
+    private abstract static class CacheResult {
+        static final CacheResult MISS = new CacheResult() {};
+
+        static final class Loading extends CacheResult {
+            @NonNull final CancellationSignal mCancellationSignal;
+            @NonNull final Set<WidgetPreviewLoadedCallback> mCallbacks;
+
+            Loading(@NonNull CancellationSignal cancellationSignal,
+                    @NonNull Set<WidgetPreviewLoadedCallback> callbacks) {
+                mCancellationSignal = cancellationSignal;
+                mCallbacks = callbacks;
+            }
+
+            @NonNull
+            Loading withCallback(@NonNull WidgetPreviewLoadedCallback callback) {
+                if (mCallbacks.contains(callback)) return this;
+                Set<WidgetPreviewLoadedCallback> newCallbacks =
+                        new ArraySet<>(mCallbacks.size() + 1);
+                newCallbacks.addAll(mCallbacks);
+                newCallbacks.add(callback);
+                return new Loading(mCancellationSignal, newCallbacks);
+            }
+
+            @NonNull
+            Loading withoutCallback(@NonNull WidgetPreviewLoadedCallback callback) {
+                if (!mCallbacks.contains(callback)) return this;
+                Set<WidgetPreviewLoadedCallback> newCallbacks =
+                        new ArraySet<>(mCallbacks.size() - 1);
+                for (WidgetPreviewLoadedCallback existingCallback : mCallbacks) {
+                    if (!existingCallback.equals(callback)) {
+                        newCallbacks.add(existingCallback);
+                    }
+                }
+                return new Loading(mCancellationSignal, newCallbacks);
+            }
+        }
+
+        static final class Loaded extends CacheResult {
+            @NonNull final Bitmap mBitmap;
+
+            Loaded(@NonNull Bitmap bitmap) {
+                mBitmap = bitmap;
+            }
+        }
+    }
+
+    @NonNull
+    private static ComponentKey toComponentKey(@NonNull WidgetItem item) {
+        return new ComponentKey(item.componentName, item.user);
+    }
+}
diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/widget/DatabaseWidgetPreviewLoader.java
similarity index 86%
rename from src/com/android/launcher3/WidgetPreviewLoader.java
rename to src/com/android/launcher3/widget/DatabaseWidgetPreviewLoader.java
index ff3584acd3..6de3e11ac8 100644
--- a/src/com/android/launcher3/WidgetPreviewLoader.java
+++ b/src/com/android/launcher3/widget/DatabaseWidgetPreviewLoader.java
@@ -1,4 +1,19 @@
-package com.android.launcher3;
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget;
 
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
@@ -32,8 +47,14 @@ import android.util.LongSparseArray;
 import android.util.Pair;
 import android.util.Size;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.android.launcher3.BaseActivity;
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.LauncherFiles;
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.icons.GraphicsUtils;
 import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.icons.LauncherIcons;
@@ -47,9 +68,6 @@ import com.android.launcher3.util.PackageUserKey;
 import com.android.launcher3.util.Preconditions;
 import com.android.launcher3.util.SQLiteCacheHelper;
 import com.android.launcher3.util.Thunk;
-import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
-import com.android.launcher3.widget.WidgetCell;
-import com.android.launcher3.widget.WidgetManagerHelper;
 import com.android.launcher3.widget.util.WidgetSizes;
 
 import java.util.ArrayList;
@@ -60,7 +78,8 @@ import java.util.Set;
 import java.util.WeakHashMap;
 import java.util.concurrent.ExecutionException;
 
-public class WidgetPreviewLoader {
+/** {@link WidgetPreviewLoader} that loads preview images from a {@link CacheDb}. */
+public class DatabaseWidgetPreviewLoader implements WidgetPreviewLoader {
 
     private static final String TAG = "WidgetPreviewLoader";
     private static final boolean DEBUG = false;
@@ -80,7 +99,7 @@ public class WidgetPreviewLoader {
     private final UserCache mUserCache;
     private final CacheDb mDb;
 
-    public WidgetPreviewLoader(Context context, IconCache iconCache) {
+    public DatabaseWidgetPreviewLoader(Context context, IconCache iconCache) {
         mContext = context;
         mIconCache = iconCache;
         mUserCache = UserCache.INSTANCE.get(context);
@@ -89,16 +108,24 @@ public class WidgetPreviewLoader {
 
     /**
      * Generates the widget preview on {@link AsyncTask#THREAD_POOL_EXECUTOR}. Must be
-     * called on UI thread
+     * called on UI thread.
      *
      * @return a request id which can be used to cancel the request.
      */
-    public CancellationSignal getPreview(WidgetItem item, int previewWidth,
-            int previewHeight, WidgetCell caller) {
+    @Override
+    @NonNull
+    public CancellationSignal loadPreview(
+            @NonNull BaseActivity activity,
+            @NonNull WidgetItem item,
+            @NonNull Size previewSize,
+            @NonNull WidgetPreviewLoadedCallback callback) {
+        int previewWidth = previewSize.getWidth();
+        int previewHeight = previewSize.getHeight();
         String size = previewWidth + "x" + previewHeight;
         WidgetCacheKey key = new WidgetCacheKey(item.componentName, item.user, size);
 
-        PreviewLoadTask task = new PreviewLoadTask(key, item, previewWidth, previewHeight, caller);
+        PreviewLoadTask task =
+                new PreviewLoadTask(activity, key, item, previewWidth, previewHeight, callback);
         task.executeOnExecutor(Executors.THREAD_POOL_EXECUTOR);
 
         CancellationSignal signal = new CancellationSignal();
@@ -106,6 +133,7 @@ public class WidgetPreviewLoader {
         return signal;
     }
 
+    /** Clears the database storing previews. */
     public void refresh() {
         mDb.clear();
     }
@@ -126,21 +154,37 @@ public class WidgetPreviewLoader {
         private static final String COLUMN_VERSION = "version";
         private static final String COLUMN_PREVIEW_BITMAP = "preview_bitmap";
 
-        public CacheDb(Context context) {
+        CacheDb(Context context) {
             super(context, LauncherFiles.WIDGET_PREVIEWS_DB, DB_VERSION, TABLE_NAME);
         }
 
         @Override
         public void onCreateTable(SQLiteDatabase database) {
-            database.execSQL("CREATE TABLE IF NOT EXISTS " + TABLE_NAME + " (" +
-                    COLUMN_COMPONENT + " TEXT NOT NULL, " +
-                    COLUMN_USER + " INTEGER NOT NULL, " +
-                    COLUMN_SIZE + " TEXT NOT NULL, " +
-                    COLUMN_PACKAGE + " TEXT NOT NULL, " +
-                    COLUMN_LAST_UPDATED + " INTEGER NOT NULL DEFAULT 0, " +
-                    COLUMN_VERSION + " INTEGER NOT NULL DEFAULT 0, " +
-                    COLUMN_PREVIEW_BITMAP + " BLOB, " +
-                    "PRIMARY KEY (" + COLUMN_COMPONENT + ", " + COLUMN_USER + ", " + COLUMN_SIZE + ") " +
+            database.execSQL("CREATE TABLE IF NOT EXISTS "
+                    + TABLE_NAME
+                    + " ("
+                    + COLUMN_COMPONENT
+                    + " TEXT NOT NULL, "
+                    + COLUMN_USER
+                    + " INTEGER NOT NULL, "
+                    + COLUMN_SIZE
+                    + " TEXT NOT NULL, "
+                    + COLUMN_PACKAGE
+                    + " TEXT NOT NULL, "
+                    + COLUMN_LAST_UPDATED
+                    + " INTEGER NOT NULL DEFAULT 0, "
+                    + COLUMN_VERSION
+                    + " INTEGER NOT NULL DEFAULT 0, "
+                    + COLUMN_PREVIEW_BITMAP
+                    + " BLOB, "
+                    + "PRIMARY KEY ("
+                    + COLUMN_COMPONENT
+                    + ", "
+                    + COLUMN_USER
+                    + ", "
+                    + COLUMN_SIZE
+                    + ") "
+                    +
                     ");");
         }
     }
@@ -149,7 +193,7 @@ public class WidgetPreviewLoader {
         ContentValues values = new ContentValues();
         values.put(CacheDb.COLUMN_COMPONENT, key.componentName.flattenToShortString());
         values.put(CacheDb.COLUMN_USER, mUserCache.getSerialNumberForUser(key.user));
-        values.put(CacheDb.COLUMN_SIZE, key.size);
+        values.put(CacheDb.COLUMN_SIZE, key.mSize);
         values.put(CacheDb.COLUMN_PACKAGE, key.componentName.getPackageName());
         values.put(CacheDb.COLUMN_VERSION, versions[0]);
         values.put(CacheDb.COLUMN_LAST_UPDATED, versions[1]);
@@ -157,12 +201,14 @@ public class WidgetPreviewLoader {
         mDb.insertOrReplace(values);
     }
 
+    /** Removes the package from the preview database. */
     public void removePackage(String packageName, UserHandle user) {
         removePackage(packageName, user, mUserCache.getSerialNumberForUser(user));
     }
 
-    private void removePackage(String packageName, UserHandle user, long userSerial) {
-        synchronized(mPackageVersions) {
+    /** Removes the package from the preview database. */
+    public void removePackage(String packageName, UserHandle user, long userSerial) {
+        synchronized (mPackageVersions) {
             mPackageVersions.remove(packageName);
         }
 
@@ -264,7 +310,7 @@ public class WidgetPreviewLoader {
                     new String[]{
                             key.componentName.flattenToShortString(),
                             Long.toString(mUserCache.getSerialNumberForUser(key.user)),
-                            key.size
+                            key.mSize
                     });
             // If cancelled, skip getting the blob and decoding it into a bitmap
             if (loadTask.isCancelled()) {
@@ -293,7 +339,7 @@ public class WidgetPreviewLoader {
     }
 
     /**
-     * Returns generatedPreview for a widget and if the preview should be saved in persistent
+     * Returns a generated preview for a widget and if the preview should be saved in persistent
      * storage.
      * @param launcher
      * @param item
@@ -344,8 +390,10 @@ public class WidgetPreviewLoader {
             if (drawable != null) {
                 drawable = mutateOnMainThread(drawable);
             } else {
-                Log.w(TAG, "Can't load widget preview drawable 0x" +
-                        Integer.toHexString(info.previewImage) + " for provider: " + info.provider);
+                Log.w(TAG, "Can't load widget preview drawable 0x"
+                        + Integer.toHexString(info.previewImage)
+                        + " for provider: "
+                        + info.provider);
             }
         }
 
@@ -379,8 +427,8 @@ public class WidgetPreviewLoader {
             scale = maxPreviewWidth / (float) (previewWidth);
         }
         if (scale != 1f) {
-            previewWidth = Math.max((int)(scale * previewWidth), 1);
-            previewHeight = Math.max((int)(scale * previewHeight), 1);
+            previewWidth = Math.max((int) (scale * previewWidth), 1);
+            previewHeight = Math.max((int) (scale * previewHeight), 1);
         }
 
         final Canvas c = new Canvas();
@@ -554,13 +602,13 @@ public class WidgetPreviewLoader {
         }
     }
 
-    public class PreviewLoadTask extends AsyncTask<Void, Void, Bitmap>
+    private class PreviewLoadTask extends AsyncTask<Void, Void, Bitmap>
             implements CancellationSignal.OnCancelListener {
         @Thunk final WidgetCacheKey mKey;
         private final WidgetItem mInfo;
         private final int mPreviewHeight;
         private final int mPreviewWidth;
-        private final WidgetCell mCaller;
+        private final WidgetPreviewLoadedCallback mCallback;
         private final BaseActivity mActivity;
         @Thunk long[] mVersions;
         @Thunk Bitmap mBitmapToRecycle;
@@ -568,14 +616,14 @@ public class WidgetPreviewLoader {
         @Nullable private Bitmap mUnusedPreviewBitmap;
         private boolean mSaveToDB = false;
 
-        PreviewLoadTask(WidgetCacheKey key, WidgetItem info, int previewWidth,
-                int previewHeight, WidgetCell caller) {
+        PreviewLoadTask(BaseActivity activity, WidgetCacheKey key, WidgetItem info,
+                int previewWidth, int previewHeight, WidgetPreviewLoadedCallback callback) {
+            mActivity = activity;
             mKey = key;
             mInfo = info;
             mPreviewHeight = previewHeight;
             mPreviewWidth = previewWidth;
-            mCaller = caller;
-            mActivity = BaseActivity.fromContext(mCaller.getContext());
+            mCallback = callback;
             if (DEBUG) {
                 Log.d(TAG, String.format("%s, %s, %d, %d",
                         mKey, mInfo, mPreviewHeight, mPreviewWidth));
@@ -593,9 +641,9 @@ public class WidgetPreviewLoader {
             synchronized (mUnusedBitmaps) {
                 // Check if we can re-use a bitmap
                 for (Bitmap candidate : mUnusedBitmaps) {
-                    if (candidate != null && candidate.isMutable() &&
-                            candidate.getWidth() == mPreviewWidth &&
-                            candidate.getHeight() == mPreviewHeight) {
+                    if (candidate != null && candidate.isMutable()
+                            && candidate.getWidth() == mPreviewWidth
+                            && candidate.getHeight() == mPreviewHeight) {
                         unusedBitmap = candidate;
                         mUnusedBitmaps.remove(unusedBitmap);
                         break;
@@ -638,7 +686,7 @@ public class WidgetPreviewLoader {
 
         @Override
         protected void onPostExecute(final Bitmap preview) {
-            mCaller.applyPreview(preview);
+            mCallback.onPreviewLoaded(preview);
 
             // Write the generated preview to the DB in the worker thread
             if (mVersions != null) {
@@ -716,21 +764,21 @@ public class WidgetPreviewLoader {
 
     private static final class WidgetCacheKey extends ComponentKey {
 
-        @Thunk final String size;
+        @Thunk final String mSize;
 
-        public WidgetCacheKey(ComponentName componentName, UserHandle user, String size) {
+        WidgetCacheKey(ComponentName componentName, UserHandle user, String size) {
             super(componentName, user);
-            this.size = size;
+            this.mSize = size;
         }
 
         @Override
         public int hashCode() {
-            return super.hashCode() ^ size.hashCode();
+            return super.hashCode() ^ mSize.hashCode();
         }
 
         @Override
         public boolean equals(Object o) {
-            return super.equals(o) && ((WidgetCacheKey) o).size.equals(size);
+            return super.equals(o) && ((WidgetCacheKey) o).mSize.equals(mSize);
         }
     }
 }
diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index b1ccfd9591..91529be30b 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -19,7 +19,6 @@ package com.android.launcher3.widget;
 import static com.android.launcher3.Utilities.ATLEAST_S;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
@@ -44,7 +43,6 @@ import com.android.launcher3.BaseActivity;
 import com.android.launcher3.CheckLongPressHelper;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.R;
-import com.android.launcher3.WidgetPreviewLoader;
 import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.icons.RoundDrawableWrapper;
 import com.android.launcher3.model.WidgetItem;
@@ -222,21 +220,18 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
             return;
         }
 
-        if (ATLEAST_S
-                && mRemoteViewsPreview == null
-                && item.widgetInfo != null
-                && item.widgetInfo.previewLayout != Resources.ID_NULL) {
-            mAppWidgetHostViewPreview = new LauncherAppWidgetHostView(getContext());
-            LauncherAppWidgetProviderInfo launcherAppWidgetProviderInfo =
-                    LauncherAppWidgetProviderInfo.fromProviderInfo(getContext(),
-                            item.widgetInfo.clone());
-            // A hack to force the initial layout to be the preview layout since there is no API for
-            // rendering a preview layout for work profile apps yet. For non-work profile layout, a
-            // proper solution is to use RemoteViews(PackageName, LayoutId).
-            launcherAppWidgetProviderInfo.initialLayout = item.widgetInfo.previewLayout;
-            setAppWidgetHostViewPreview(mAppWidgetHostViewPreview,
-                    launcherAppWidgetProviderInfo, /* remoteViews= */ null);
-        }
+        if (!item.hasPreviewLayout()) return;
+
+        mAppWidgetHostViewPreview = new LauncherAppWidgetHostView(getContext());
+        LauncherAppWidgetProviderInfo launcherAppWidgetProviderInfo =
+                LauncherAppWidgetProviderInfo.fromProviderInfo(getContext(),
+                        item.widgetInfo.clone());
+        // A hack to force the initial layout to be the preview layout since there is no API for
+        // rendering a preview layout for work profile apps yet. For non-work profile layout, a
+        // proper solution is to use RemoteViews(PackageName, LayoutId).
+        launcherAppWidgetProviderInfo.initialLayout = item.widgetInfo.previewLayout;
+        setAppWidgetHostViewPreview(mAppWidgetHostViewPreview,
+                launcherAppWidgetProviderInfo, /* remoteViews= */ null);
     }
 
     private void setAppWidgetHostViewPreview(
@@ -344,22 +339,25 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
         if (mActiveRequest != null) {
             return;
         }
-        mActiveRequest = mWidgetPreviewLoader.getPreview(mItem, mPreviewWidth, mPreviewHeight,
-                this);
+        mActiveRequest = mWidgetPreviewLoader.loadPreview(
+                BaseActivity.fromContext(getContext()), mItem,
+                new Size(mPreviewWidth, mPreviewHeight),
+                this::applyPreview);
     }
 
     /** Sets the widget preview image size in number of cells. */
-    public void setPreviewSize(int spanX, int spanY) {
-        setPreviewSize(spanX, spanY, 1f);
+    public Size setPreviewSize(int spanX, int spanY) {
+        return setPreviewSize(spanX, spanY, 1f);
     }
 
     /** Sets the widget preview image size, in number of cells, and preview scale. */
-    public void setPreviewSize(int spanX, int spanY, float previewScale) {
+    public Size setPreviewSize(int spanX, int spanY, float previewScale) {
         DeviceProfile deviceProfile = mActivity.getDeviceProfile();
         Size widgetSize = WidgetSizes.getWidgetSizePx(deviceProfile, spanX, spanY);
         mPreviewWidth = widgetSize.getWidth();
         mPreviewHeight = widgetSize.getHeight();
         mPreviewScale = previewScale;
+        return widgetSize;
     }
 
     @Override
diff --git a/src/com/android/launcher3/widget/WidgetPreviewLoader.java b/src/com/android/launcher3/widget/WidgetPreviewLoader.java
new file mode 100644
index 0000000000..ff5c82f872
--- /dev/null
+++ b/src/com/android/launcher3/widget/WidgetPreviewLoader.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.widget;
+
+import android.graphics.Bitmap;
+import android.os.CancellationSignal;
+import android.util.Size;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.UiThread;
+
+import com.android.launcher3.BaseActivity;
+import com.android.launcher3.model.WidgetItem;
+
+/** Asynchronous loader of preview bitmaps for {@link WidgetItem}s. */
+public interface WidgetPreviewLoader {
+    /**
+     * Loads a widget preview and calls back to {@code callback} when complete.
+     *
+     * @return a {@link CancellationSignal} which can be used to cancel the request.
+     */
+    @NonNull
+    @UiThread
+    CancellationSignal loadPreview(
+            @NonNull BaseActivity activity,
+            @NonNull WidgetItem item,
+            @NonNull Size previewSize,
+            @NonNull WidgetPreviewLoadedCallback callback);
+
+    /** Callback class for requests to {@link WidgetPreviewLoader}. */
+    interface WidgetPreviewLoadedCallback {
+        void onPreviewLoaded(@NonNull Bitmap preview);
+    }
+}
diff --git a/src/com/android/launcher3/widget/model/WidgetsListBaseEntry.java b/src/com/android/launcher3/widget/model/WidgetsListBaseEntry.java
index 73bae6f484..abc79ff966 100644
--- a/src/com/android/launcher3/widget/model/WidgetsListBaseEntry.java
+++ b/src/com/android/launcher3/widget/model/WidgetsListBaseEntry.java
@@ -59,6 +59,19 @@ public abstract class WidgetsListBaseEntry {
     @Rank
     public abstract int getRank();
 
+    /**
+     * Marker interface for subclasses that are headers for widget list items.
+     *
+     * @param <T> The type of this class.
+     */
+    public interface Header<T extends WidgetsListBaseEntry & Header<T>> {
+        /** Returns whether the widget list is currently expanded. */
+        boolean isWidgetListShown();
+
+        /** Returns a copy of the item with the widget list shown. */
+        T withWidgetListShown();
+    }
+
     @Retention(SOURCE)
     @IntDef({RANK_WIDGETS_LIST_HEADER, RANK_WIDGETS_LIST_SEARCH_HEADER, RANK_WIDGETS_LIST_CONTENT})
     public @interface Rank {
diff --git a/src/com/android/launcher3/widget/model/WidgetsListHeaderEntry.java b/src/com/android/launcher3/widget/model/WidgetsListHeaderEntry.java
index 1fdc39959a..5b3ea94a2d 100644
--- a/src/com/android/launcher3/widget/model/WidgetsListHeaderEntry.java
+++ b/src/com/android/launcher3/widget/model/WidgetsListHeaderEntry.java
@@ -21,41 +21,33 @@ import com.android.launcher3.model.data.PackageItemInfo;
 import java.util.List;
 
 /** An information holder for an app which has widgets or/and shortcuts. */
-public final class WidgetsListHeaderEntry extends WidgetsListBaseEntry {
+public final class WidgetsListHeaderEntry extends WidgetsListBaseEntry
+        implements WidgetsListBaseEntry.Header<WidgetsListHeaderEntry> {
 
     public final int widgetsCount;
     public final int shortcutsCount;
 
-    private boolean mIsWidgetListShown = false;
-    private boolean mHasEntryUpdated = false;
+    private final boolean mIsWidgetListShown;
 
     public WidgetsListHeaderEntry(PackageItemInfo pkgItem, String titleSectionName,
             List<WidgetItem> items) {
+        this(pkgItem, titleSectionName, items, /* isWidgetListShown= */ false);
+    }
+
+    private WidgetsListHeaderEntry(PackageItemInfo pkgItem, String titleSectionName,
+            List<WidgetItem> items, boolean isWidgetListShown) {
         super(pkgItem, titleSectionName, items);
         widgetsCount = (int) items.stream().filter(item -> item.widgetInfo != null).count();
         shortcutsCount = Math.max(0, items.size() - widgetsCount);
-    }
-
-    /** Sets if the widgets list associated with this header is shown. */
-    public void setIsWidgetListShown(boolean isWidgetListShown) {
-        if (mIsWidgetListShown != isWidgetListShown) {
-            this.mIsWidgetListShown = isWidgetListShown;
-            mHasEntryUpdated = true;
-        } else {
-            mHasEntryUpdated = false;
-        }
+        mIsWidgetListShown = isWidgetListShown;
     }
 
     /** Returns {@code true} if the widgets list associated with this header is shown. */
+    @Override
     public boolean isWidgetListShown() {
         return mIsWidgetListShown;
     }
 
-    /** Returns {@code true} if this entry has been updated due to user interactions. */
-    public boolean hasEntryUpdated() {
-        return mHasEntryUpdated;
-    }
-
     @Override
     public String toString() {
         return "Header:" + mPkgItem.packageName + ":" + mWidgets.size();
@@ -72,6 +64,18 @@ public final class WidgetsListHeaderEntry extends WidgetsListBaseEntry {
         if (!(obj instanceof WidgetsListHeaderEntry)) return false;
         WidgetsListHeaderEntry otherEntry = (WidgetsListHeaderEntry) obj;
         return mWidgets.equals(otherEntry.mWidgets) && mPkgItem.equals(otherEntry.mPkgItem)
-                && mTitleSectionName.equals(otherEntry.mTitleSectionName);
+                && mTitleSectionName.equals(otherEntry.mTitleSectionName)
+                && mIsWidgetListShown == otherEntry.mIsWidgetListShown;
+    }
+
+    /** Returns a copy of this {@link WidgetsListHeaderEntry} with the widget list shown. */
+    @Override
+    public WidgetsListHeaderEntry withWidgetListShown() {
+        if (mIsWidgetListShown) return this;
+        return new WidgetsListHeaderEntry(
+                mPkgItem,
+                mTitleSectionName,
+                mWidgets,
+                /* isWidgetListShown= */ true);
     }
 }
diff --git a/src/com/android/launcher3/widget/model/WidgetsListSearchHeaderEntry.java b/src/com/android/launcher3/widget/model/WidgetsListSearchHeaderEntry.java
index 2aec3f8fd9..c0f89bcbcc 100644
--- a/src/com/android/launcher3/widget/model/WidgetsListSearchHeaderEntry.java
+++ b/src/com/android/launcher3/widget/model/WidgetsListSearchHeaderEntry.java
@@ -21,36 +21,28 @@ import com.android.launcher3.model.data.PackageItemInfo;
 import java.util.List;
 
 /** An information holder for an app which has widgets or/and shortcuts, to be shown in search. */
-public final class WidgetsListSearchHeaderEntry extends WidgetsListBaseEntry {
+public final class WidgetsListSearchHeaderEntry extends WidgetsListBaseEntry
+        implements WidgetsListBaseEntry.Header<WidgetsListSearchHeaderEntry> {
 
-    private boolean mIsWidgetListShown = false;
-    private boolean mHasEntryUpdated = false;
+    private final boolean mIsWidgetListShown;
 
     public WidgetsListSearchHeaderEntry(PackageItemInfo pkgItem, String titleSectionName,
             List<WidgetItem> items) {
-        super(pkgItem, titleSectionName, items);
+        this(pkgItem, titleSectionName, items, /* isWidgetListShown= */ false);
     }
 
-    /** Sets if the widgets list associated with this header is shown. */
-    public void setIsWidgetListShown(boolean isWidgetListShown) {
-        if (mIsWidgetListShown != isWidgetListShown) {
-            this.mIsWidgetListShown = isWidgetListShown;
-            mHasEntryUpdated = true;
-        } else {
-            mHasEntryUpdated = false;
-        }
+    private WidgetsListSearchHeaderEntry(PackageItemInfo pkgItem, String titleSectionName,
+            List<WidgetItem> items, boolean isWidgetListShown) {
+        super(pkgItem, titleSectionName, items);
+        mIsWidgetListShown = isWidgetListShown;
     }
 
     /** Returns {@code true} if the widgets list associated with this header is shown. */
+    @Override
     public boolean isWidgetListShown() {
         return mIsWidgetListShown;
     }
 
-    /** Returns {@code true} if this entry has been updated due to user interactions. */
-    public boolean hasEntryUpdated() {
-        return mHasEntryUpdated;
-    }
-
     @Override
     public String toString() {
         return "SearchHeader:" + mPkgItem.packageName + ":" + mWidgets.size();
@@ -67,6 +59,18 @@ public final class WidgetsListSearchHeaderEntry extends WidgetsListBaseEntry {
         if (!(obj instanceof WidgetsListSearchHeaderEntry)) return false;
         WidgetsListSearchHeaderEntry otherEntry = (WidgetsListSearchHeaderEntry) obj;
         return mWidgets.equals(otherEntry.mWidgets) && mPkgItem.equals(otherEntry.mPkgItem)
-                && mTitleSectionName.equals(otherEntry.mTitleSectionName);
+                && mTitleSectionName.equals(otherEntry.mTitleSectionName)
+                && mIsWidgetListShown;
+    }
+
+    /** Returns a copy of this {@link WidgetsListSearchHeaderEntry} with the widget list shown. */
+    @Override
+    public WidgetsListSearchHeaderEntry withWidgetListShown() {
+        if (mIsWidgetListShown) return this;
+        return new WidgetsListSearchHeaderEntry(
+                mPkgItem,
+                mTitleSectionName,
+                mWidgets,
+                /* isWidgetListShown= */ true);
     }
 }
diff --git a/src/com/android/launcher3/widget/picker/WidgetsDiffReporter.java b/src/com/android/launcher3/widget/picker/WidgetsDiffReporter.java
index 42896ba350..dfe447a38e 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsDiffReporter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsDiffReporter.java
@@ -177,7 +177,7 @@ public class WidgetsDiffReporter {
      */
     private boolean hasHeaderUpdated(WidgetsListBaseEntry curRow, WidgetsListBaseEntry newRow) {
         if (newRow instanceof WidgetsListHeaderEntry && curRow instanceof WidgetsListHeaderEntry) {
-            return ((WidgetsListHeaderEntry) newRow).hasEntryUpdated() || !curRow.equals(newRow);
+            return !curRow.equals(newRow);
         }
         if (newRow instanceof WidgetsListSearchHeaderEntry
                 && curRow instanceof WidgetsListSearchHeaderEntry) {
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
index 6863c60a37..5d9adf0e71 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
@@ -20,6 +20,7 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH
 import android.content.Context;
 import android.os.Process;
 import android.util.Log;
+import android.util.Size;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -35,19 +36,25 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.Adapter;
 import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 
+import com.android.launcher3.BaseActivity;
+import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
-import com.android.launcher3.WidgetPreviewLoader;
 import com.android.launcher3.icons.IconCache;
+import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.recyclerview.ViewHolderBinder;
 import com.android.launcher3.util.LabelComparator;
 import com.android.launcher3.util.PackageUserKey;
+import com.android.launcher3.widget.CachingWidgetPreviewLoader;
+import com.android.launcher3.widget.DatabaseWidgetPreviewLoader;
 import com.android.launcher3.widget.WidgetCell;
+import com.android.launcher3.widget.WidgetPreviewLoader.WidgetPreviewLoadedCallback;
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 import com.android.launcher3.widget.model.WidgetsListContentEntry;
 import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
 import com.android.launcher3.widget.model.WidgetsListSearchHeaderEntry;
+import com.android.launcher3.widget.util.WidgetSizes;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -79,7 +86,9 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
     private static final int VIEW_TYPE_WIDGETS_HEADER = R.id.view_type_widgets_header;
     private static final int VIEW_TYPE_WIDGETS_SEARCH_HEADER = R.id.view_type_widgets_search_header;
 
+    private final Context mContext;
     private final Launcher mLauncher;
+    private final CachingWidgetPreviewLoader mCachingPreviewLoader;
     private final WidgetsDiffReporter mDiffReporter;
     private final SparseArray<ViewHolderBinder> mViewHolderBinders = new SparseArray<>();
     private final WidgetsListTableViewHolderBinder mWidgetsListTableViewHolderBinder;
@@ -97,16 +106,23 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
                             .equals(mWidgetsContentVisiblePackageUserKey);
     @Nullable private Predicate<WidgetsListBaseEntry> mFilter = null;
     @Nullable private RecyclerView mRecyclerView;
+    @Nullable private PackageUserKey mPendingClickHeader;
+    private int mShortcutPreviewPadding;
+
+    private final WidgetPreviewLoadedCallback mPreviewLoadedCallback =
+            ignored -> updateVisibleEntries();
 
     public WidgetsListAdapter(Context context, LayoutInflater layoutInflater,
-            WidgetPreviewLoader widgetPreviewLoader, IconCache iconCache,
+            DatabaseWidgetPreviewLoader widgetPreviewLoader, IconCache iconCache,
             OnClickListener iconClickListener, OnLongClickListener iconLongClickListener) {
+        mContext = context;
         mLauncher = Launcher.getLauncher(context);
+        mCachingPreviewLoader = new CachingWidgetPreviewLoader(widgetPreviewLoader);
         mDiffReporter = new WidgetsDiffReporter(iconCache, this);
         WidgetsListDrawableFactory listDrawableFactory = new WidgetsListDrawableFactory(context);
-        mWidgetsListTableViewHolderBinder = new WidgetsListTableViewHolderBinder(context,
+        mWidgetsListTableViewHolderBinder = new WidgetsListTableViewHolderBinder(
                 layoutInflater, iconClickListener, iconLongClickListener,
-                widgetPreviewLoader, listDrawableFactory, /* listAdapter= */ this);
+                mCachingPreviewLoader, listDrawableFactory, /* listAdapter= */ this);
         mViewHolderBinders.put(VIEW_TYPE_WIDGETS_LIST, mWidgetsListTableViewHolderBinder);
         mViewHolderBinders.put(
                 VIEW_TYPE_WIDGETS_HEADER,
@@ -122,6 +138,9 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
                         /* onHeaderClickListener= */ this,
                         listDrawableFactory,
                         /* listAdapter= */ this));
+        mShortcutPreviewPadding =
+                2 * context.getResources()
+                        .getDimensionPixelSize(R.dimen.widget_preview_shortcut_padding);
     }
 
     @Override
@@ -177,6 +196,7 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
 
     /** Updates the widget list based on {@code tempEntries}. */
     public void setWidgets(List<WidgetsListBaseEntry> tempEntries) {
+        mCachingPreviewLoader.clearAll();
         mAllEntries = tempEntries.stream().sorted(mRowComparator)
                 .collect(Collectors.toList());
         if (shouldClearVisibleEntries()) {
@@ -189,36 +209,110 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
     public void setWidgetsOnSearch(List<WidgetsListBaseEntry> searchResults) {
         // Forget the expanded package every time widget list is refreshed in search mode.
         mWidgetsContentVisiblePackageUserKey = null;
+        cancelLoadingPreviews();
         setWidgets(searchResults);
     }
 
     private void updateVisibleEntries() {
-        mAllEntries.forEach(entry -> {
-            if (entry instanceof WidgetsListHeaderEntry) {
-                ((WidgetsListHeaderEntry) entry).setIsWidgetListShown(
-                        isHeaderForVisibleContent(entry));
-            } else if (entry instanceof WidgetsListSearchHeaderEntry) {
-                ((WidgetsListSearchHeaderEntry) entry).setIsWidgetListShown(
-                        isHeaderForVisibleContent(entry));
-            }
-        });
+        // If not all previews are ready, then defer this update and try again after the preview
+        // loads.
+        if (!ensureAllPreviewsReady()) return;
+
+        // Get the current top of the header with the matching key before adjusting the visible
+        // entries.
+        OptionalInt previousPositionForPackageUserKey =
+                getPositionForPackageUserKey(mPendingClickHeader);
+        OptionalInt topForPackageUserKey =
+                getOffsetForPosition(previousPositionForPackageUserKey);
+
         List<WidgetsListBaseEntry> newVisibleEntries = mAllEntries.stream()
                 .filter(entry -> (mFilter == null || mFilter.test(entry))
                         && mHeaderAndSelectedContentFilter.test(entry))
+                .map(entry -> {
+                    // Adjust the original entries to expand headers for the selected content.
+                    if (entry instanceof WidgetsListBaseEntry.Header<?>
+                            && matchesKey(entry, mWidgetsContentVisiblePackageUserKey)) {
+                        return ((WidgetsListBaseEntry.Header<?>) entry).withWidgetListShown();
+                    }
+                    return entry;
+                })
                 .collect(Collectors.toList());
+
         mDiffReporter.process(mVisibleEntries, newVisibleEntries, mRowComparator);
+
+        if (mPendingClickHeader != null) {
+            // Get the position for the clicked header after adjusting the visible entries. The
+            // position may have changed if another header had previously been expanded.
+            OptionalInt positionForPackageUserKey =
+                    getPositionForPackageUserKey(mPendingClickHeader);
+            scrollToPositionAndMaintainOffset(positionForPackageUserKey, topForPackageUserKey);
+            mPendingClickHeader = null;
+        }
     }
 
-    /** Returns whether {@code entry} matches {@link #mWidgetsContentVisiblePackageUserKey}. */
-    private boolean isHeaderForVisibleContent(WidgetsListBaseEntry entry) {
-        return isHeaderForPackageUserKey(entry, mWidgetsContentVisiblePackageUserKey);
+    /**
+     * Checks that all preview images are loaded and starts loading for those that aren't ready.
+     *
+     * @return true if all previews are ready and the data can be updated, false otherwise.
+     */
+    private boolean ensureAllPreviewsReady() {
+        boolean allReady = true;
+        BaseActivity activity = BaseActivity.fromContext(mContext);
+        for (WidgetsListBaseEntry entry : mAllEntries) {
+            if (!(entry instanceof WidgetsListContentEntry)) continue;
+
+            WidgetsListContentEntry contentEntry = (WidgetsListContentEntry) entry;
+            if (!matchesKey(entry, mWidgetsContentVisiblePackageUserKey)) {
+                // If the entry isn't visible, clear any loaded previews.
+                mCachingPreviewLoader.clearPreviews(contentEntry.mWidgets);
+                continue;
+            }
+
+            for (int i = 0; i < entry.mWidgets.size(); i++) {
+                WidgetItem widgetItem = entry.mWidgets.get(i);
+                DeviceProfile deviceProfile = activity.getDeviceProfile();
+                Size widgetSize =
+                        WidgetSizes.getWidgetSizePx(
+                                deviceProfile,
+                                widgetItem.spanX,
+                                widgetItem.spanY);
+                if (widgetItem.isShortcut()) {
+                    widgetSize =
+                            new Size(
+                                    widgetSize.getWidth() + mShortcutPreviewPadding,
+                                    widgetSize.getHeight() + mShortcutPreviewPadding);
+                }
+
+                if (widgetItem.hasPreviewLayout()
+                        || mCachingPreviewLoader.isPreviewLoaded(widgetItem, widgetSize)) {
+                    // The widget is ready if it can be rendered with a preview layout or if its
+                    // preview bitmap is in the cache.
+                    continue;
+                }
+
+                // If we've reached this point, we should load the preview for the widget.
+                allReady = false;
+                mCachingPreviewLoader.loadPreview(
+                        activity,
+                        widgetItem,
+                        widgetSize,
+                        mPreviewLoadedCallback);
+            }
+        }
+        return allReady;
     }
 
     /** Returns whether {@code entry} matches {@code key}. */
-    private boolean isHeaderForPackageUserKey(WidgetsListBaseEntry entry, PackageUserKey key) {
-        return (entry instanceof WidgetsListHeaderEntry
-                || entry instanceof WidgetsListSearchHeaderEntry)
-                && new PackageUserKey(entry.mPkgItem.packageName, entry.mPkgItem.user).equals(key);
+    private static boolean isHeaderForPackageUserKey(
+            @NonNull WidgetsListBaseEntry entry, @Nullable PackageUserKey key) {
+        return entry instanceof WidgetsListBaseEntry.Header && matchesKey(entry, key);
+    }
+
+    private static boolean matchesKey(
+            @NonNull WidgetsListBaseEntry entry, @Nullable PackageUserKey key) {
+        if (key == null) return false;
+        return entry.mPkgItem.packageName.equals(key.mPackageName)
+                && entry.mPkgItem.user.equals(key.mUser);
     }
 
     /**
@@ -227,6 +321,7 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
     public void resetExpandedHeader() {
         if (mWidgetsContentVisiblePackageUserKey != null) {
             mWidgetsContentVisiblePackageUserKey = null;
+            cancelLoadingPreviews();
             updateVisibleEntries();
         }
     }
@@ -285,6 +380,8 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
         // Ignore invalid clicks, such as collapsing a package that isn't currently expanded.
         if (!showWidgets && !packageUserKey.equals(mWidgetsContentVisiblePackageUserKey)) return;
 
+        cancelLoadingPreviews();
+
         if (showWidgets) {
             mWidgetsContentVisiblePackageUserKey = packageUserKey;
             mLauncher.getStatsLogManager().logger().log(LAUNCHER_WIDGETSTRAY_APP_EXPANDED);
@@ -292,17 +389,15 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
             mWidgetsContentVisiblePackageUserKey = null;
         }
 
-        // Get the current top of the header with the matching key before adjusting the visible
-        // entries.
-        OptionalInt topForPackageUserKey =
-                getOffsetForPosition(getPositionForPackageUserKey(packageUserKey));
+        // Store the header that was clicked so that its position will be maintained the next time
+        // we update the entries.
+        mPendingClickHeader = packageUserKey;
 
         updateVisibleEntries();
+    }
 
-        // Get the position for the clicked header after adjusting the visible entries. The
-        // position may have changed if another header had previously been expanded.
-        OptionalInt positionForPackageUserKey = getPositionForPackageUserKey(packageUserKey);
-        scrollToPositionAndMaintainOffset(positionForPackageUserKey, topForPackageUserKey);
+    private void cancelLoadingPreviews() {
+        mCachingPreviewLoader.clearAll();
     }
 
     /** Returns the position of the currently expanded header, or empty if it's not present. */
@@ -315,7 +410,8 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
      * Returns the position of {@code key} in {@link #mVisibleEntries}, or  empty if it's not
      * present.
      */
-    private OptionalInt getPositionForPackageUserKey(PackageUserKey key) {
+    @NonNull
+    private OptionalInt getPositionForPackageUserKey(@Nullable PackageUserKey key) {
         return IntStream.range(0, mVisibleEntries.size())
                 .filter(index -> isHeaderForPackageUserKey(mVisibleEntries.get(index), key))
                 .findFirst();
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java b/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
index 7e8c55bfe6..7b526639f5 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
@@ -18,8 +18,9 @@ package com.android.launcher3.widget.picker;
 import static com.android.launcher3.widget.picker.WidgetsListDrawableState.LAST;
 import static com.android.launcher3.widget.picker.WidgetsListDrawableState.MIDDLE;
 
-import android.content.Context;
+import android.graphics.Bitmap;
 import android.util.Log;
+import android.util.Size;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -30,9 +31,9 @@ import android.widget.TableLayout;
 import android.widget.TableRow;
 
 import com.android.launcher3.R;
-import com.android.launcher3.WidgetPreviewLoader;
 import com.android.launcher3.model.WidgetItem;
 import com.android.launcher3.recyclerview.ViewHolderBinder;
+import com.android.launcher3.widget.CachingWidgetPreviewLoader;
 import com.android.launcher3.widget.WidgetCell;
 import com.android.launcher3.widget.model.WidgetsListContentEntry;
 import com.android.launcher3.widget.util.WidgetsTableUtils;
@@ -52,17 +53,16 @@ public final class WidgetsListTableViewHolderBinder
     private final LayoutInflater mLayoutInflater;
     private final OnClickListener mIconClickListener;
     private final OnLongClickListener mIconLongClickListener;
-    private final WidgetPreviewLoader mWidgetPreviewLoader;
     private final WidgetsListDrawableFactory mListDrawableFactory;
+    private final CachingWidgetPreviewLoader mWidgetPreviewLoader;
     private final WidgetsListAdapter mWidgetsListAdapter;
     private boolean mApplyBitmapDeferred = false;
 
     public WidgetsListTableViewHolderBinder(
-            Context context,
             LayoutInflater layoutInflater,
             OnClickListener iconClickListener,
             OnLongClickListener iconLongClickListener,
-            WidgetPreviewLoader widgetPreviewLoader,
+            CachingWidgetPreviewLoader widgetPreviewLoader,
             WidgetsListDrawableFactory listDrawableFactory,
             WidgetsListAdapter listAdapter) {
         mLayoutInflater = layoutInflater;
@@ -75,7 +75,7 @@ public final class WidgetsListTableViewHolderBinder
 
     /**
      * Defers applying bitmap on all the {@link WidgetCell} at
-     * {@link #bindViewHolder(WidgetsRowViewHolder, WidgetsListContentEntry)} if
+     * {@link #bindViewHolder(WidgetsRowViewHolder, WidgetsListContentEntry, int)} if
      * {@code applyBitmapDeferred} is {@code true}.
      */
     public void setApplyBitmapDeferred(boolean applyBitmapDeferred) {
@@ -124,10 +124,15 @@ public final class WidgetsListTableViewHolderBinder
                 WidgetCell widget = (WidgetCell) row.getChildAt(j);
                 widget.clear();
                 WidgetItem widgetItem = widgetItemsPerRow.get(j);
-                widget.setPreviewSize(widgetItem.spanX, widgetItem.spanY);
+                Size previewSize = widget.setPreviewSize(widgetItem.spanX, widgetItem.spanY);
                 widget.applyFromCellItem(widgetItem, mWidgetPreviewLoader);
                 widget.setApplyBitmapDeferred(mApplyBitmapDeferred);
-                widget.ensurePreview();
+                Bitmap preview = mWidgetPreviewLoader.getPreview(widgetItem, previewSize);
+                if (preview == null) {
+                    widget.ensurePreview();
+                } else {
+                    widget.applyPreview(preview);
+                }
                 widget.setVisibility(View.VISIBLE);
             }
         }
-- 
GitLab


From f13ddbd333d7b2aabcd45e4e708b8479e99d3cc9 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Thu, 17 Jun 2021 15:40:04 -0700
Subject: [PATCH 1439/1664] Fix bug where ripple extends out of bounds in pop
 up container.

Bug: 186820908
Test: test apps with diff. pop up container arrangements
      test prefs in all apps

Change-Id: I4d3e26871416835ab2a851fcc6fe2c4f70235b62
---
 .../android/launcher3/popup/ArrowPopup.java   |  4 +-
 .../launcher3/shortcuts/DeepShortcutView.java | 51 ++++++++++++++++++-
 2 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java
index 2095a0de54..cb35f74135 100644
--- a/src/com/android/launcher3/popup/ArrowPopup.java
+++ b/src/com/android/launcher3/popup/ArrowPopup.java
@@ -252,9 +252,9 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
                         view.setBackgroundResource(R.drawable.single_item_primary);
                     } else if (totalVisibleShortcuts > 1) {
                         if (numVisibleShortcut == 0) {
-                            view.setBackground(mRoundedTop);
+                            view.setBackground(mRoundedTop.getConstantState().newDrawable());
                         } else if (numVisibleShortcut == (totalVisibleShortcuts - 1)) {
-                            view.setBackground(mRoundedBottom);
+                            view.setBackground(mRoundedBottom.getConstantState().newDrawable());
                         } else {
                             view.setBackgroundResource(R.drawable.middle_item_primary);
                         }
diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutView.java b/src/com/android/launcher3/shortcuts/DeepShortcutView.java
index cc658c9ba0..71d288c0ab 100644
--- a/src/com/android/launcher3/shortcuts/DeepShortcutView.java
+++ b/src/com/android/launcher3/shortcuts/DeepShortcutView.java
@@ -18,7 +18,13 @@ package com.android.launcher3.shortcuts;
 
 import android.content.Context;
 import android.content.pm.ShortcutInfo;
+import android.content.res.ColorStateList;
+import android.graphics.Color;
 import android.graphics.Point;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.GradientDrawable;
+import android.graphics.drawable.RippleDrawable;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
@@ -30,16 +36,20 @@ import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.popup.PopupContainerWithArrow;
+import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.BubbleTextHolder;
 
 /**
- * A {@link android.widget.FrameLayout} that contains a {@link DeepShortcutView}.
- * This lets us animate the DeepShortcutView (icon and text) separately from the background.
+ * A {@link android.widget.FrameLayout} that contains an icon and a {@link BubbleTextView} for text.
+ * This lets us animate the child BubbleTextView's background (transparent ripple) separately from
+ * the {@link DeepShortcutView} background color.
  */
 public class DeepShortcutView extends FrameLayout implements BubbleTextHolder {
 
     private static final Point sTempPoint = new Point();
 
+    private final Drawable mTransparentDrawable = new ColorDrawable(Color.TRANSPARENT);
+
     private BubbleTextView mBubbleText;
     private View mIconView;
 
@@ -63,6 +73,43 @@ public class DeepShortcutView extends FrameLayout implements BubbleTextHolder {
         super.onFinishInflate();
         mBubbleText = findViewById(R.id.bubble_text);
         mIconView = findViewById(R.id.icon);
+        tryUpdateTextBackground();
+    }
+
+    @Override
+    public void setBackground(Drawable background) {
+        super.setBackground(background);
+        tryUpdateTextBackground();
+    }
+
+    @Override
+    public void setBackgroundResource(int resid) {
+        super.setBackgroundResource(resid);
+        tryUpdateTextBackground();
+    }
+
+    /**
+     * Updates the text background to match the shape of this background (when applicable).
+     */
+    private void tryUpdateTextBackground() {
+        if (!(getBackground() instanceof GradientDrawable) || mBubbleText == null) {
+            return;
+        }
+        GradientDrawable background = (GradientDrawable) getBackground();
+
+        int color = Themes.getAttrColor(getContext(), android.R.attr.colorControlHighlight);
+        GradientDrawable backgroundMask = new GradientDrawable();
+        backgroundMask.setColor(color);
+        backgroundMask.setShape(GradientDrawable.RECTANGLE);
+        if (background.getCornerRadii() != null) {
+            backgroundMask.setCornerRadii(background.getCornerRadii());
+        } else {
+            backgroundMask.setCornerRadius(background.getCornerRadius());
+        }
+
+        RippleDrawable drawable = new RippleDrawable(ColorStateList.valueOf(color),
+                mTransparentDrawable, backgroundMask);
+        mBubbleText.setBackground(drawable);
     }
 
     @Override
-- 
GitLab


From 4ef6bd5a7a2169f0aa7086964e51f6ef18c84ab1 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Fri, 18 Jun 2021 15:33:38 -0700
Subject: [PATCH 1440/1664] Update All set screen icon

Fixes: 191463446
Test: Manual
Change-Id: I746bfb2eab950a01041493bd72d7dda30ac66d7b
---
 quickstep/res/drawable/ic_all_set.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/quickstep/res/drawable/ic_all_set.xml b/quickstep/res/drawable/ic_all_set.xml
index a6852aa78e..656c59669c 100644
--- a/quickstep/res/drawable/ic_all_set.xml
+++ b/quickstep/res/drawable/ic_all_set.xml
@@ -15,10 +15,10 @@
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="42dp"
-    android:height="40dp"
+    android:height="42dp"
     android:viewportWidth="42"
-    android:viewportHeight="40">
+    android:viewportHeight="42">
     <path
-        android:pathData="M38,14H25.38L27.28,4.86L27.34,4.22C27.34,3.4 27,2.64 26.46,2.1L24.34,0C24.34,0 10.16,13.7 10,14H0V40H32C33.66,40 35.08,39 35.68,37.56L41.72,23.46C41.9,23 42,22.52 42,22V18C42,15.8 40.2,14 38,14ZM10,36H4V18H10V36ZM38,22L32,36H14V16L22.68,7.32L20,18H38V22Z"
+        android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"
         android:fillColor="#FFFFFF"/>
 </vector>
-- 
GitLab


From 651abb99245f31b054c4aeb8b5604d607df85fec Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Fri, 18 Jun 2021 15:39:36 -0700
Subject: [PATCH 1441/1664] Fix bug where workspace alpha does not get set to 1
 when animation gets cancelled.

- Can also remove QSB from app launch animator, since its in the hotseat now.

Bug: 189458349
Test: manual
Change-Id: Ib41376e3f8c58166c6ee6fbfed38bdd443663df4
---
 .../android/launcher3/QuickstepTransitionManager.java    | 2 --
 .../com/android/quickstep/util/WorkspaceRevealAnim.java  | 9 +++++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 31cf51c3b3..dd248e4e83 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -497,8 +497,6 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                     view -> viewsToAnimate.add(((CellLayout) view).getShortcutsAndWidgets()));
 
             viewsToAnimate.add(mLauncher.getHotseat());
-            // Add QSB
-            viewsToAnimate.add(mLauncher.findViewById(R.id.search_container_all_apps));
 
             viewsToAnimate.forEach(view -> {
                 view.setLayerType(View.LAYER_TYPE_HARDWARE, null);
diff --git a/quickstep/src/com/android/quickstep/util/WorkspaceRevealAnim.java b/quickstep/src/com/android/quickstep/util/WorkspaceRevealAnim.java
index 50da93b828..df94d0bee6 100644
--- a/quickstep/src/com/android/quickstep/util/WorkspaceRevealAnim.java
+++ b/quickstep/src/com/android/quickstep/util/WorkspaceRevealAnim.java
@@ -24,6 +24,7 @@ import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
 import static com.android.launcher3.states.StateAnimationConfig.SKIP_SCRIM;
 
 import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.view.View;
@@ -98,6 +99,14 @@ public class WorkspaceRevealAnim {
         alpha.setDuration(DURATION_MS);
         alpha.setInterpolator(Interpolators.DECELERATED_EASE);
         mAnimators.play(alpha);
+
+        mAnimators.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                SCALE_PROPERTY.set(v, 1f);
+                v.setAlpha(1f);
+            }
+        });
     }
 
     /**
-- 
GitLab


From 313b2c2d28e40f76ddadb4fde853763d7458ff0f Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Thu, 17 Jun 2021 12:35:43 -0700
Subject: [PATCH 1442/1664] Update notification popup UI.

- Update UI to match specs.
- Only shows one notification (removed footer, animation code)

Bug: 175329686
Bug: 190402054
Test: open popup, dismiss notification from shade,
      open popup, click on notification
      checked RTL

Change-Id: I92672f94233d986ae5b5c54979980967308cb156
---
 res/drawable/notification_circle.xml          |  11 +
 res/layout/notification_content.xml           |  77 ++----
 res/values-v31/colors.xml                     |   3 +
 res/values/attrs.xml                          |   1 +
 res/values/colors.xml                         |   3 +
 res/values/dimens.xml                         |  29 +--
 res/values/styles.xml                         |   2 +
 .../NotificationFooterLayout.java             | 238 ------------------
 .../notification/NotificationItemView.java    | 120 +++------
 .../notification/NotificationMainView.java    |  80 +-----
 .../popup/PopupContainerWithArrow.java        |  17 +-
 11 files changed, 96 insertions(+), 485 deletions(-)
 create mode 100644 res/drawable/notification_circle.xml
 delete mode 100644 src/com/android/launcher3/notification/NotificationFooterLayout.java

diff --git a/res/drawable/notification_circle.xml b/res/drawable/notification_circle.xml
new file mode 100644
index 0000000000..65fbaea5a6
--- /dev/null
+++ b/res/drawable/notification_circle.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <solid android:color="?attr/popupNotificationDotColor"/>
+
+    <size
+        android:width="@dimen/notification_circle_icon_size"
+        android:height="@dimen/notification_circle_icon_size"/>
+</shape>
\ No newline at end of file
diff --git a/res/layout/notification_content.xml b/res/layout/notification_content.xml
index 147aa30525..84822a671b 100644
--- a/res/layout/notification_content.xml
+++ b/res/layout/notification_content.xml
@@ -23,35 +23,36 @@
     <FrameLayout
         android:id="@+id/header"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/notification_header_height"
-        android:paddingEnd="@dimen/notification_padding_end"
-        android:paddingStart="@dimen/notification_padding_start">
+        android:layout_height="wrap_content"
+        android:paddingEnd="@dimen/notification_padding"
+        android:paddingStart="@dimen/notification_padding">
         <TextView
             android:id="@+id/notification_text"
+            android:paddingTop="@dimen/notification_padding"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="start"
-            android:gravity="center_vertical"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|start"
             android:text="@string/notifications_header"
             android:textColor="?android:attr/textColorPrimary"
-            android:textSize="@dimen/notification_header_text_size" />
+            android:textSize="@dimen/notification_header_text_size"
+            style="@style/TextHeadline"/>
         <TextView
             android:id="@+id/notification_count"
-            android:layout_width="@dimen/notification_icon_size"
-            android:layout_height="match_parent"
-            android:layout_gravity="end"
-            android:fontFamily="sans-serif-medium"
+            android:layout_width="@dimen/notification_circle_icon_size"
+            android:layout_height="@dimen/notification_circle_icon_size"
+            android:background="@drawable/notification_circle"
+            android:layout_gravity="bottom|end"
             android:gravity="center"
             android:textColor="?android:attr/textColorPrimary"
-            android:textSize="@dimen/notification_header_count_text_size" />
+            android:textSize="@dimen/notification_header_count_text_size"
+            style="@style/TextHeadline"/>
     </FrameLayout>
 
     <!-- Main view -->
     <com.android.launcher3.notification.NotificationMainView
         android:id="@+id/main_view"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/notification_main_height"
-        android:background="@drawable/bg_notification_content"
+        android:layout_height="wrap_content"
         android:focusable="true" >
 
         <LinearLayout
@@ -61,28 +62,28 @@
             android:background="?attr/popupColorPrimary"
             android:gravity="center_vertical"
             android:orientation="vertical"
-            android:paddingBottom="14dp"
-            android:paddingEnd="@dimen/notification_main_text_padding_end"
-            android:paddingStart="@dimen/notification_padding_start">
+            android:paddingTop="@dimen/notification_padding"
+            android:paddingBottom="@dimen/notification_padding"
+            android:paddingEnd="@dimen/notification_padding"
+            android:paddingStart="@dimen/notification_main_text_padding_start">
             <TextView
                 android:id="@+id/title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
-                android:fontFamily="sans-serif"
                 android:lines="1"
                 android:textAlignment="viewStart"
                 android:textColor="?android:attr/textColorPrimary"
-                android:textSize="@dimen/notification_main_title_size" />
+                android:textSize="@dimen/notification_main_title_size"
+                style="@style/TextHeadline" />
 
             <TextView
                 android:id="@+id/text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
-                android:fontFamily="sans-serif"
                 android:lines="1"
-                android:textColor="?android:attr/textColorSecondary"
+                android:textColor="?android:attr/textColorPrimary"
                 android:textSize="@dimen/notification_main_text_size" />
         </LinearLayout>
 
@@ -90,37 +91,9 @@
             android:id="@+id/popup_item_icon"
             android:layout_width="@dimen/notification_icon_size"
             android:layout_height="@dimen/notification_icon_size"
-            android:layout_gravity="center_vertical|end"
-            android:layout_marginBottom="7dp"
-            android:layout_marginEnd="@dimen/notification_padding_end" />
+            android:layout_gravity="start"
+            android:layout_marginTop="@dimen/notification_padding"
+            android:layout_marginStart="@dimen/notification_icon_padding" />
 
     </com.android.launcher3.notification.NotificationMainView>
-
-    <!-- Footer -->
-    <com.android.launcher3.notification.NotificationFooterLayout
-        android:id="@+id/footer"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/notification_footer_height"
-        android:layout_gravity="center_vertical"
-        android:clipChildren="false">
-
-        <LinearLayout
-            android:id="@+id/icon_row"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:clipChildren="false"
-            android:clipToPadding="false"
-            android:gravity="end|center_vertical"
-            android:orientation="horizontal"
-            android:padding="@dimen/notification_footer_icon_row_padding"/>
-
-        <View
-            android:id="@+id/overflow"
-            android:layout_width="@dimen/horizontal_ellipsis_size"
-            android:layout_height="@dimen/horizontal_ellipsis_size"
-            android:layout_gravity="start|center_vertical"
-            android:layout_marginStart="@dimen/horizontal_ellipsis_offset"
-            android:background="@drawable/horizontal_ellipsis" />
-
-    </com.android.launcher3.notification.NotificationFooterLayout>
 </merge>
\ No newline at end of file
diff --git a/res/values-v31/colors.xml b/res/values-v31/colors.xml
index 38a08948a0..1785623581 100644
--- a/res/values-v31/colors.xml
+++ b/res/values-v31/colors.xml
@@ -25,6 +25,9 @@
     <color name="popup_color_secondary_dark">@android:color/system_neutral1_900</color>
     <color name="popup_color_tertiary_dark">@android:color/system_neutral2_700</color>
 
+    <color name="popup_notification_dot_light">@android:color/system_accent1_100</color>
+    <color name="popup_notification_dot_dark">@android:color/system_accent2_600</color>
+
     <color name="workspace_text_color_light">@android:color/system_neutral1_0</color>
     <color name="workspace_text_color_dark">@android:color/system_neutral1_1000</color>
 
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 92deb68f42..1fadc881c2 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -36,6 +36,7 @@
     <attr name="iconOnlyShortcutColor" format="color" />
     <attr name="eduHalfSheetBGColor" format="color" />
     <attr name="overviewScrimColor" format="color" />
+    <attr name="popupNotificationDotColor" format="color" />
 
     <attr name="folderDotColor" format="color" />
     <attr name="folderFillColor" format="color" />
diff --git a/res/values/colors.xml b/res/values/colors.xml
index dac12ed40c..01f5364459 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -53,6 +53,9 @@
     <color name="popup_color_secondary_dark">#202124</color>
     <color name="popup_color_tertiary_dark">#757575</color> <!-- Gray 600 -->
 
+    <color name="popup_notification_dot_light">#FFF</color>
+    <color name="popup_notification_dot_dark">#757575</color>
+
     <color name="workspace_text_color_light">#FFF</color>
     <color name="workspace_text_color_dark">#FF000000</color>
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 9048d878e1..251f04a66e 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -259,28 +259,19 @@
 
 <!-- Notifications -->
     <dimen name="bg_round_rect_radius">8dp</dimen>
-    <dimen name="notification_padding_start">16dp</dimen>
-    <dimen name="notification_padding_end">12dp</dimen>
-    <!-- notification_padding_end + (icon_size - footer_icon_size) / 2 -->
-    <dimen name="notification_footer_icon_row_padding">15dp</dimen>
-    <dimen name="notification_header_height">36dp</dimen>
-    <dimen name="notification_main_height">84dp</dimen>
-    <dimen name="notification_footer_height">32dp</dimen>
-    <!-- How much space to keep as padding for the last notification when the footer collapses -->
-    <dimen name="notification_empty_footer_height">6dp</dimen>
-    <dimen name="notification_header_text_size">13sp</dimen>
+    <dimen name="notification_padding">16dp</dimen>
+    <dimen name="notification_padding_top">18dp</dimen>
+    <dimen name="notification_header_text_size">14sp</dimen>
     <dimen name="notification_header_count_text_size">12sp</dimen>
-    <dimen name="notification_main_title_size">16sp</dimen>
+    <dimen name="notification_main_title_size">14sp</dimen>
     <dimen name="notification_main_text_size">14sp</dimen>
-    <dimen name="notification_icon_size">24dp</dimen>
-    <dimen name="notification_footer_icon_size">18dp</dimen>
-    <!-- notification_icon_size + notification_padding_end + 16dp padding between icon and text -->
-    <dimen name="notification_main_text_padding_end">52dp</dimen>
+    <dimen name="notification_circle_icon_size">24dp</dimen>
+    <dimen name="notification_icon_size">32dp</dimen>
+    <!-- Space between edge and icon and icon and text -->
+    <dimen name="notification_icon_padding">12dp</dimen>
+    <!-- notification_icon_padding + notification_icon_size + notification_icon_padding -->
+    <dimen name="notification_main_text_padding_start">56dp</dimen>
     <dimen name="horizontal_ellipsis_size">18dp</dimen>
-    <!-- arrow_horizontal_offset_start - (ellipsis_size - arrow_width) / 2 -->
-    <dimen name="horizontal_ellipsis_offset">19dp</dimen>
-    <dimen name="popup_item_divider_height">0.5dp</dimen>
-    <dimen name="swipe_helper_falsing_threshold">70dp</dimen>
 
 <!-- Overview -->
     <dimen name="options_menu_icon_size">24dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 2119e58ada..1cacc28b0b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -39,6 +39,7 @@
         <item name="popupColorPrimary">@color/popup_color_primary_light</item>
         <item name="popupColorSecondary">@color/popup_color_secondary_light</item>
         <item name="popupColorTertiary">@color/popup_color_tertiary_light</item>
+        <item name="popupNotificationDotColor">@color/popup_notification_dot_light</item>
         <item name="isMainColorDark">false</item>
         <item name="isWorkspaceDarkText">false</item>
         <item name="workspaceTextColor">@color/workspace_text_color_light</item>
@@ -107,6 +108,7 @@
         <item name="popupColorPrimary">@color/popup_color_primary_dark</item>
         <item name="popupColorSecondary">@color/popup_color_secondary_dark</item>
         <item name="popupColorTertiary">@color/popup_color_tertiary_dark</item>
+        <item name="popupNotificationDotColor">@color/popup_notification_dot_dark</item>
         <item name="widgetsTheme">@style/WidgetContainerTheme.Dark</item>
         <item name="folderDotColor">@color/folder_dot_color</item>
         <item name="folderFillColor">@color/folder_background_dark</item>
diff --git a/src/com/android/launcher3/notification/NotificationFooterLayout.java b/src/com/android/launcher3/notification/NotificationFooterLayout.java
deleted file mode 100644
index fd3d41ade8..0000000000
--- a/src/com/android/launcher3/notification/NotificationFooterLayout.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3.notification;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Rect;
-import android.util.AttributeSet;
-import android.view.Gravity;
-import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-
-import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
-import com.android.launcher3.anim.PropertyListBuilder;
-import com.android.launcher3.anim.PropertyResetListener;
-import com.android.launcher3.util.Themes;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * A {@link FrameLayout} that contains only icons of notifications.
- * If there are more than {@link #MAX_FOOTER_NOTIFICATIONS} icons, we add a "..." overflow.
- */
-public class NotificationFooterLayout extends FrameLayout {
-
-    public interface IconAnimationEndListener {
-        void onIconAnimationEnd(NotificationInfo animatedNotification);
-    }
-
-    private static final int MAX_FOOTER_NOTIFICATIONS = 5;
-
-    private static final Rect sTempRect = new Rect();
-
-    private final List<NotificationInfo> mNotifications = new ArrayList<>();
-    private final List<NotificationInfo> mOverflowNotifications = new ArrayList<>();
-    private final boolean mRtl;
-    private final int mBackgroundColor;
-
-    FrameLayout.LayoutParams mIconLayoutParams;
-    private View mOverflowEllipsis;
-    private LinearLayout mIconRow;
-    private NotificationItemView mContainer;
-
-    public NotificationFooterLayout(Context context) {
-        this(context, null, 0);
-    }
-
-    public NotificationFooterLayout(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public NotificationFooterLayout(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-
-        Resources res = getResources();
-        mRtl = Utilities.isRtl(res);
-
-        int iconSize = res.getDimensionPixelSize(R.dimen.notification_footer_icon_size);
-        mIconLayoutParams = new LayoutParams(iconSize, iconSize);
-        mIconLayoutParams.gravity = Gravity.CENTER_VERTICAL;
-        setWidth((int) res.getDimension(R.dimen.bg_popup_item_width));
-        mBackgroundColor = Themes.getAttrColor(context, R.attr.popupColorPrimary);
-    }
-
-
-    /**
-     * Compute margin start for each icon such that the icons between the first one and the ellipsis
-     * are evenly spaced out.
-     */
-    public void setWidth(int width) {
-        if (getLayoutParams() != null) {
-            getLayoutParams().width = width;
-        }
-        Resources res = getResources();
-        int iconSize = res.getDimensionPixelSize(R.dimen.notification_footer_icon_size);
-
-        int paddingEnd = res.getDimensionPixelSize(R.dimen.notification_footer_icon_row_padding);
-        int ellipsisSpace = res.getDimensionPixelSize(R.dimen.horizontal_ellipsis_offset)
-                + res.getDimensionPixelSize(R.dimen.horizontal_ellipsis_size);
-        int availableIconRowSpace = width - paddingEnd - ellipsisSpace
-                - iconSize * MAX_FOOTER_NOTIFICATIONS;
-        mIconLayoutParams.setMarginStart(availableIconRowSpace / MAX_FOOTER_NOTIFICATIONS);
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        mOverflowEllipsis = findViewById(R.id.overflow);
-        mIconRow = findViewById(R.id.icon_row);
-    }
-
-    void setContainer(NotificationItemView container) {
-        mContainer = container;
-    }
-
-    /**
-     * Keep track of the NotificationInfo, and then update the UI when
-     * {@link #commitNotificationInfos()} is called.
-     */
-    public void addNotificationInfo(final NotificationInfo notificationInfo) {
-        if (mNotifications.size() < MAX_FOOTER_NOTIFICATIONS) {
-            mNotifications.add(notificationInfo);
-        } else {
-            mOverflowNotifications.add(notificationInfo);
-        }
-    }
-
-    /**
-     * Adds icons and potentially overflow text for all of the NotificationInfo's
-     * added using {@link #addNotificationInfo(NotificationInfo)}.
-     */
-    public void commitNotificationInfos() {
-        mIconRow.removeAllViews();
-
-        for (int i = 0; i < mNotifications.size(); i++) {
-            NotificationInfo info = mNotifications.get(i);
-            addNotificationIconForInfo(info);
-        }
-        updateOverflowEllipsisVisibility();
-    }
-
-    private void updateOverflowEllipsisVisibility() {
-        mOverflowEllipsis.setVisibility(mOverflowNotifications.isEmpty() ? GONE : VISIBLE);
-    }
-
-    /**
-     * Creates an icon for the given NotificationInfo, and adds it to the icon row.
-     * @return the icon view that was added
-     */
-    private View addNotificationIconForInfo(NotificationInfo info) {
-        View icon = new View(getContext());
-        icon.setBackground(info.getIconForBackground(getContext(), mBackgroundColor));
-        icon.setOnClickListener(info);
-        icon.setTag(info);
-        icon.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
-        mIconRow.addView(icon, 0, mIconLayoutParams);
-        return icon;
-    }
-
-    public void animateFirstNotificationTo(Rect toBounds,
-            final IconAnimationEndListener callback) {
-        AnimatorSet animation = new AnimatorSet();
-        final View firstNotification = mIconRow.getChildAt(mIconRow.getChildCount() - 1);
-
-        Rect fromBounds = sTempRect;
-        firstNotification.getGlobalVisibleRect(fromBounds);
-        float scale = (float) toBounds.height() / fromBounds.height();
-        Animator moveAndScaleIcon = new PropertyListBuilder().scale(scale)
-                .translationY(toBounds.top - fromBounds.top
-                        + (fromBounds.height() * scale - fromBounds.height()) / 2)
-                .build(firstNotification);
-        moveAndScaleIcon.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                callback.onIconAnimationEnd((NotificationInfo) firstNotification.getTag());
-                removeViewFromIconRow(firstNotification);
-            }
-        });
-        animation.play(moveAndScaleIcon);
-
-        // Shift all notifications (not the overflow) over to fill the gap.
-        int gapWidth = mIconLayoutParams.width + mIconLayoutParams.getMarginStart();
-        if (mRtl) {
-            gapWidth = -gapWidth;
-        }
-        if (!mOverflowNotifications.isEmpty()) {
-            NotificationInfo notification = mOverflowNotifications.remove(0);
-            mNotifications.add(notification);
-            View iconFromOverflow = addNotificationIconForInfo(notification);
-            animation.play(ObjectAnimator.ofFloat(iconFromOverflow, ALPHA, 0, 1));
-        }
-        int numIcons = mIconRow.getChildCount() - 1; // All children besides the one leaving.
-        // We have to reset the translation X to 0 when the new main notification
-        // is removed from the footer.
-        PropertyResetListener<View, Float> propertyResetListener
-                = new PropertyResetListener<>(TRANSLATION_X, 0f);
-        for (int i = 0; i < numIcons; i++) {
-            final View child = mIconRow.getChildAt(i);
-            Animator shiftChild = ObjectAnimator.ofFloat(child, TRANSLATION_X, gapWidth);
-            shiftChild.addListener(propertyResetListener);
-            animation.play(shiftChild);
-        }
-        animation.start();
-    }
-
-    private void removeViewFromIconRow(View child) {
-        mIconRow.removeView(child);
-        mNotifications.remove(child.getTag());
-        updateOverflowEllipsisVisibility();
-        if (mIconRow.getChildCount() == 0) {
-            // There are no more icons in the footer, so hide it.
-            if (mContainer != null) {
-                mContainer.removeFooter();
-            }
-        }
-    }
-
-    public void trimNotifications(List<String> notifications) {
-        if (!isAttachedToWindow() || mIconRow.getChildCount() == 0) {
-            return;
-        }
-        Iterator<NotificationInfo> overflowIterator = mOverflowNotifications.iterator();
-        while (overflowIterator.hasNext()) {
-            if (!notifications.contains(overflowIterator.next().notificationKey)) {
-                overflowIterator.remove();
-            }
-        }
-        for (int i = mIconRow.getChildCount() - 1; i >= 0; i--) {
-            View child = mIconRow.getChildAt(i);
-            NotificationInfo childInfo = (NotificationInfo) child.getTag();
-            if (!notifications.contains(childInfo.notificationKey)) {
-                removeViewFromIconRow(child);
-            }
-        }
-    }
-}
diff --git a/src/com/android/launcher3/notification/NotificationItemView.java b/src/com/android/launcher3/notification/NotificationItemView.java
index 932e721058..af943a6933 100644
--- a/src/com/android/launcher3/notification/NotificationItemView.java
+++ b/src/com/android/launcher3/notification/NotificationItemView.java
@@ -16,12 +16,8 @@
 
 package com.android.launcher3.notification;
 
-import static com.android.launcher3.touch.SingleAxisSwipeDetector.HORIZONTAL;
-
 import android.animation.AnimatorSet;
-import android.app.Notification;
 import android.content.Context;
-import android.graphics.Color;
 import android.graphics.Outline;
 import android.graphics.Rect;
 import android.view.MotionEvent;
@@ -32,11 +28,10 @@ import android.view.ViewOutlineProvider;
 import android.widget.TextView;
 
 import com.android.launcher3.R;
-import com.android.launcher3.graphics.IconPalette;
 import com.android.launcher3.popup.PopupContainerWithArrow;
-import com.android.launcher3.touch.SingleAxisSwipeDetector;
 import com.android.launcher3.util.Themes;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -50,39 +45,26 @@ public class NotificationItemView {
     private final PopupContainerWithArrow mPopupContainer;
     private final ViewGroup mRootView;
 
-    private final TextView mHeaderText;
     private final TextView mHeaderCount;
     private final NotificationMainView mMainView;
-    private final NotificationFooterLayout mFooter;
-    private final SingleAxisSwipeDetector mSwipeDetector;
-    private final View mIconView;
 
     private final View mHeader;
 
     private View mGutter;
 
     private boolean mIgnoreTouch = false;
-    private boolean mAnimatingNextIcon;
-    private int mNotificationHeaderTextColor = Notification.COLOR_DEFAULT;
+    private List<NotificationInfo> mNotificationInfos = new ArrayList<>();
 
     public NotificationItemView(PopupContainerWithArrow container, ViewGroup rootView) {
         mPopupContainer = container;
         mRootView = rootView;
         mContext = container.getContext();
 
-        mHeaderText = container.findViewById(R.id.notification_text);
         mHeaderCount = container.findViewById(R.id.notification_count);
         mMainView = container.findViewById(R.id.main_view);
-        mFooter = container.findViewById(R.id.footer);
-        mIconView = container.findViewById(R.id.popup_item_icon);
 
         mHeader = container.findViewById(R.id.header);
 
-        mSwipeDetector = new SingleAxisSwipeDetector(mContext, mMainView, HORIZONTAL);
-        mSwipeDetector.setDetectableScrollConditions(SingleAxisSwipeDetector.DIRECTION_BOTH, false);
-        mMainView.setSwipeDetector(mSwipeDetector);
-        mFooter.setContainer(this);
-
         float radius = Themes.getDialogCornerRadius(mContext);
         rootView.setClipToOutline(true);
         rootView.setOutlineProvider(new ViewOutlineProvider() {
@@ -108,19 +90,6 @@ public class NotificationItemView {
         }
     }
 
-    /**
-     * Sets width for notification footer and spaces out items evenly
-     */
-    public void setFooterWidth(int footerWidth) {
-        mFooter.setWidth(footerWidth);
-    }
-
-    public void removeFooter() {
-        if (mRootView.indexOfChild(mFooter) >= 0) {
-            mRootView.removeView(mFooter);
-        }
-    }
-
     public void inverseGutterMargin() {
         MarginLayoutParams lp = (MarginLayoutParams) mGutter.getLayoutParams();
         int top = lp.topMargin;
@@ -131,27 +100,28 @@ public class NotificationItemView {
     public void removeAllViews() {
         mRootView.removeView(mMainView);
         mRootView.removeView(mHeader);
-
-        if (mRootView.indexOfChild(mFooter) >= 0) {
-            mRootView.removeView(mFooter);
-        }
-
         if (mGutter != null) {
             mRootView.removeView(mGutter);
         }
     }
 
-    public void updateHeader(int notificationCount, int iconColor) {
-        mHeaderCount.setText(notificationCount <= 1 ? "" : String.valueOf(notificationCount));
-        if (Color.alpha(iconColor) > 0) {
-            if (mNotificationHeaderTextColor == Notification.COLOR_DEFAULT) {
-                mNotificationHeaderTextColor =
-                        IconPalette.resolveContrastColor(mContext, iconColor,
-                                Themes.getAttrColor(mContext, R.attr.popupColorPrimary));
-            }
-            mHeaderText.setTextColor(mNotificationHeaderTextColor);
-            mHeaderCount.setTextColor(mNotificationHeaderTextColor);
+    /**
+     * Updates the header text.
+     * @param notificationCount The number of notifications.
+     */
+    public void updateHeader(int notificationCount) {
+        final String text;
+        final int visibility;
+        if (notificationCount <= 1) {
+            text = "";
+            visibility = View.INVISIBLE;
+        } else {
+            text = String.valueOf(notificationCount);
+            visibility = View.VISIBLE;
+
         }
+        mHeaderCount.setText(text);
+        mHeaderCount.setVisibility(visibility);
     }
 
     public boolean onInterceptTouchEvent(MotionEvent ev) {
@@ -171,53 +141,39 @@ public class NotificationItemView {
             return false;
         }
 
-        mSwipeDetector.onTouchEvent(ev);
-        return mSwipeDetector.isDraggingOrSettling();
-    }
-
-    public boolean onTouchEvent(MotionEvent ev) {
-        if (mIgnoreTouch) {
-            return false;
-        }
-        if (mMainView.getNotificationInfo() == null) {
-            // The notification hasn't been populated yet.
-            return false;
-        }
-        return mSwipeDetector.onTouchEvent(ev);
+        return false;
     }
 
     public void applyNotificationInfos(final List<NotificationInfo> notificationInfos) {
+        mNotificationInfos.clear();
         if (notificationInfos.isEmpty()) {
             return;
         }
+        mNotificationInfos.addAll(notificationInfos);
 
         NotificationInfo mainNotification = notificationInfos.get(0);
         mMainView.applyNotificationInfo(mainNotification, false);
-
-        for (int i = 1; i < notificationInfos.size(); i++) {
-            mFooter.addNotificationInfo(notificationInfos.get(i));
-        }
-        mFooter.commitNotificationInfos();
     }
 
     public void trimNotifications(final List<String> notificationKeys) {
-        boolean dismissedMainNotification = !notificationKeys.contains(
-                mMainView.getNotificationInfo().notificationKey);
-        if (dismissedMainNotification && !mAnimatingNextIcon) {
-            // Animate the next icon into place as the new main notification.
-            mAnimatingNextIcon = true;
-            mMainView.setContentVisibility(View.INVISIBLE);
-            mMainView.setContentTranslation(0);
-            mIconView.getGlobalVisibleRect(sTempRect);
-            mFooter.animateFirstNotificationTo(sTempRect, (newMainNotification) -> {
-                if (newMainNotification != null) {
-                    mMainView.applyNotificationInfo(newMainNotification, true);
-                    mMainView.setContentVisibility(View.VISIBLE);
+        NotificationInfo currentMainNotificationInfo = mMainView.getNotificationInfo();
+        boolean shouldUpdateMainNotification = !notificationKeys.contains(
+                currentMainNotificationInfo.notificationKey);
+
+        if (shouldUpdateMainNotification) {
+            int size = notificationKeys.size();
+            NotificationInfo nextNotification = null;
+            // We get the latest notification by finding the notification after the one that was
+            // just dismissed.
+            for (int i = 0; i < size; ++i) {
+                if (currentMainNotificationInfo == mNotificationInfos.get(i) && i + 1 < size) {
+                    nextNotification = mNotificationInfos.get(i + 1);
+                    break;
                 }
-                mAnimatingNextIcon = false;
-            });
-        } else {
-            mFooter.trimNotifications(notificationKeys);
+            }
+            if (nextNotification != null) {
+                mMainView.applyNotificationInfo(nextNotification, true);
+            }
         }
     }
 }
diff --git a/src/com/android/launcher3/notification/NotificationMainView.java b/src/com/android/launcher3/notification/NotificationMainView.java
index e9b5f32ce7..b8aa8246fb 100644
--- a/src/com/android/launcher3/notification/NotificationMainView.java
+++ b/src/com/android/launcher3/notification/NotificationMainView.java
@@ -16,19 +16,15 @@
 
 package com.android.launcher3.notification;
 
-import static com.android.launcher3.anim.Interpolators.scrollInterpolatorForVelocity;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_NOTIFICATION_DISMISSED;
 
-import android.animation.Animator;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.annotation.TargetApi;
 import android.content.Context;
-import android.content.res.ColorStateList;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.RippleDrawable;
 import android.os.Build;
 import android.text.TextUtils;
 import android.util.AttributeSet;
@@ -40,19 +36,15 @@ import android.widget.TextView;
 
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
-import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.touch.BaseSwipeDetector;
-import com.android.launcher3.touch.OverScroll;
 import com.android.launcher3.touch.SingleAxisSwipeDetector;
-import com.android.launcher3.util.Themes;
 
 /**
  * A {@link android.widget.FrameLayout} that contains a single notification,
  * e.g. icon + title + text.
  */
 @TargetApi(Build.VERSION_CODES.N)
-public class NotificationMainView extends FrameLayout implements SingleAxisSwipeDetector.Listener {
+public class NotificationMainView extends FrameLayout {
 
     private static final FloatProperty<NotificationMainView> CONTENT_TRANSLATION =
             new FloatProperty<NotificationMainView>("contentTranslation") {
@@ -70,8 +62,6 @@ public class NotificationMainView extends FrameLayout implements SingleAxisSwipe
     // This is used only to track the notification view, so that it can be properly logged.
     public static final ItemInfo NOTIFICATION_ITEM_INFO = new ItemInfo();
 
-    private final ObjectAnimator mContentTranslateAnimator;
-
     private NotificationInfo mNotificationInfo;
     private ViewGroup mTextAndBackground;
     private int mBackgroundColor;
@@ -82,7 +72,6 @@ public class NotificationMainView extends FrameLayout implements SingleAxisSwipe
     private SingleAxisSwipeDetector mSwipeDetector;
 
     private final ColorDrawable mColorDrawable;
-    private final RippleDrawable mRippleDrawable;
 
     public NotificationMainView(Context context) {
         this(context, null, 0);
@@ -95,11 +84,7 @@ public class NotificationMainView extends FrameLayout implements SingleAxisSwipe
     public NotificationMainView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
 
-        mContentTranslateAnimator = ObjectAnimator.ofFloat(this, CONTENT_TRANSLATION, 0);
         mColorDrawable = new ColorDrawable(Color.TRANSPARENT);
-        mRippleDrawable = new RippleDrawable(ColorStateList.valueOf(
-                Themes.getAttrColor(getContext(), android.R.attr.colorControlHighlight)),
-                mColorDrawable, null);
     }
 
     @Override
@@ -118,7 +103,7 @@ public class NotificationMainView extends FrameLayout implements SingleAxisSwipe
     private void updateBackgroundColor(int color) {
         mBackgroundColor = color;
         mColorDrawable.setColor(color);
-        mTextAndBackground.setBackground(mRippleDrawable);
+        mTextAndBackground.setBackground(mColorDrawable);
         if (mNotificationInfo != null) {
             mIconView.setBackground(mNotificationInfo.getIconForBackground(getContext(),
                     mBackgroundColor));
@@ -140,10 +125,6 @@ public class NotificationMainView extends FrameLayout implements SingleAxisSwipe
         animatorSetOut.play(colors);
     }
 
-    public void setSwipeDetector(SingleAxisSwipeDetector swipeDetector) {
-        mSwipeDetector = swipeDetector;
-    }
-
     /**
      * Sets the content of this view, animating it after a new icon shifts up if necessary.
      */
@@ -182,11 +163,6 @@ public class NotificationMainView extends FrameLayout implements SingleAxisSwipe
         mIconView.setTranslationX(translation);
     }
 
-    public void setContentVisibility(int visibility) {
-        mTextAndBackground.setVisibility(visibility);
-        mIconView.setVisibility(visibility);
-    }
-
     public NotificationInfo getNotificationInfo() {
         return mNotificationInfo;
     }
@@ -202,56 +178,4 @@ public class NotificationMainView extends FrameLayout implements SingleAxisSwipe
                 mNotificationInfo.notificationKey);
         launcher.getStatsLogManager().logger().log(LAUNCHER_NOTIFICATION_DISMISSED);
     }
-
-    // SingleAxisSwipeDetector.Listener's
-    @Override
-    public void onDragStart(boolean start, float startDisplacement) { }
-
-
-    @Override
-    public boolean onDrag(float displacement) {
-        setContentTranslation(canChildBeDismissed()
-                ? displacement : OverScroll.dampedScroll(displacement, getWidth()));
-        mContentTranslateAnimator.cancel();
-        return true;
-    }
-
-    @Override
-    public void onDragEnd(float velocity) {
-        final boolean willExit;
-        final float endTranslation;
-        final float startTranslation = mTextAndBackground.getTranslationX();
-
-        if (!canChildBeDismissed()) {
-            willExit = false;
-            endTranslation = 0;
-        } else if (mSwipeDetector.isFling(velocity)) {
-            willExit = true;
-            endTranslation = velocity < 0 ? - getWidth() : getWidth();
-        } else if (Math.abs(startTranslation) > getWidth() / 2) {
-            willExit = true;
-            endTranslation = (startTranslation < 0 ? -getWidth() : getWidth());
-        } else {
-            willExit = false;
-            endTranslation = 0;
-        }
-
-        long duration = BaseSwipeDetector.calculateDuration(velocity,
-                (endTranslation - startTranslation) / getWidth());
-
-        mContentTranslateAnimator.removeAllListeners();
-        mContentTranslateAnimator.setDuration(duration)
-                .setInterpolator(scrollInterpolatorForVelocity(velocity));
-        mContentTranslateAnimator.setFloatValues(startTranslation, endTranslation);
-        mContentTranslateAnimator.addListener(new AnimationSuccessListener() {
-            @Override
-            public void onAnimationSuccess(Animator animator) {
-                mSwipeDetector.finishedScrolling();
-                if (willExit) {
-                    onChildDismissed();
-                }
-            }
-        });
-        mContentTranslateAnimator.start();
-    }
 }
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index 2ae12ac71f..18f263a8ec 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -137,14 +137,6 @@ public class PopupContainerWithArrow<T extends StatefulActivity<LauncherState>>
                 > squaredTouchSlop(getContext());
     }
 
-    @Override
-    public boolean onTouchEvent(MotionEvent ev) {
-        if (mNotificationItemView != null) {
-            return mNotificationItemView.onTouchEvent(ev) || super.onTouchEvent(ev);
-        }
-        return super.onTouchEvent(ev);
-    }
-
     @Override
     protected boolean isOfType(int type) {
         return (type & TYPE_ACTION_POPUP) != 0;
@@ -272,12 +264,6 @@ public class PopupContainerWithArrow<T extends StatefulActivity<LauncherState>>
             }
             View.inflate(getContext(), R.layout.notification_content, mNotificationContainer);
             mNotificationItemView = new NotificationItemView(this, mNotificationContainer);
-            if (mNumNotifications == 1) {
-                mNotificationItemView.removeFooter();
-            }
-            else {
-                mNotificationItemView.setFooterWidth(containerWidth);
-            }
             updateNotificationHeader();
         }
         int viewsToFlip = getChildCount();
@@ -462,8 +448,7 @@ public class PopupContainerWithArrow<T extends StatefulActivity<LauncherState>>
         ItemInfoWithIcon itemInfo = (ItemInfoWithIcon) mOriginalIcon.getTag();
         DotInfo dotInfo = mLauncher.getDotInfoForItem(itemInfo);
         if (mNotificationItemView != null && dotInfo != null) {
-            mNotificationItemView.updateHeader(
-                    dotInfo.getNotificationCount(), itemInfo.bitmap.color);
+            mNotificationItemView.updateHeader(dotInfo.getNotificationCount());
         }
     }
 
-- 
GitLab


From aefcc5a300fa1718fdd187cd8080810387bc8f33 Mon Sep 17 00:00:00 2001
From: Brian Isganitis <brianji@google.com>
Date: Fri, 18 Jun 2021 19:58:18 +0000
Subject: [PATCH 1443/1664] Revert "Fix home settings landing page"

This reverts commit 96cc3c533cd8cdbad0da04f91508bab018a446ad.

Reason for revert: Causes back to close sub-settings (b/191257243).

Change-Id: I3aa01bed1d73874176fc2568bac4ca714e9f2df7
Bug: 188565060
---
 src/com/android/launcher3/settings/SettingsActivity.java | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/com/android/launcher3/settings/SettingsActivity.java b/src/com/android/launcher3/settings/SettingsActivity.java
index dbd9c281a2..915e140aaf 100644
--- a/src/com/android/launcher3/settings/SettingsActivity.java
+++ b/src/com/android/launcher3/settings/SettingsActivity.java
@@ -113,12 +113,6 @@ public class SettingsActivity extends FragmentActivity
         Utilities.getPrefs(getApplicationContext()).registerOnSharedPreferenceChangeListener(this);
     }
 
-    @Override
-    protected void onStop() {
-        super.onStop();
-        finish();
-    }
-
     /**
      * Obtains the preference fragment to instantiate in this activity.
      *
-- 
GitLab


From 3010277cd6a76d6fb8bdd5e68292cc5fc23d1d90 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sat, 19 Jun 2021 03:16:22 +0000
Subject: [PATCH 1444/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I33f33183171d4a849e00627d4cbd747cace04851
---
 res/values-af/strings.xml     | 6 ++----
 res/values-de/strings.xml     | 3 +--
 res/values-el/strings.xml     | 6 ++----
 res/values-en-rAU/strings.xml | 6 ++----
 res/values-en-rCA/strings.xml | 6 ++----
 res/values-en-rGB/strings.xml | 6 ++----
 res/values-en-rIN/strings.xml | 6 ++----
 res/values-en-rXC/strings.xml | 6 ++----
 res/values-es-rUS/strings.xml | 6 ++----
 res/values-ka/strings.xml     | 6 ++----
 res/values-kn/strings.xml     | 3 +--
 res/values-mr/strings.xml     | 3 +--
 res/values-nl/strings.xml     | 6 ++----
 res/values-pa/strings.xml     | 3 +--
 res/values-pt-rPT/strings.xml | 6 ++----
 res/values-pt/strings.xml     | 6 ++----
 res/values-uk/strings.xml     | 6 ++----
 17 files changed, 30 insertions(+), 60 deletions(-)

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 7f36dd2cc4..571ad51536 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -82,10 +82,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"skryf Tuis-instellings en -kortpaaie"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Laat die program toe om die instellings en kortpaaie in Tuis te verander."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> word nie toegelaat om foonoproepe te maak nie"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Kan nie legstuk laai nie"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Tik om opstelling te voltooi"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Dit is \'n stelselprogram en kan nie gedeïnstalleer word nie."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Wysig naam"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Het <xliff:g id="APP_NAME">%1$s</xliff:g> gedeaktiveer"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ef646245e4..8ae811fcad 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -158,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Privat"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Geschäftlich"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Arbeitsprofil"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Geschäftliche Apps sind gekennzeichnet und für deinen IT-Administrator sichtbar"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"Geschäftliche Apps sind deaktiviert"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Deine geschäftlichen Apps können dir keine Benachrichtigungen senden, deinen Akku nicht nutzen und nicht auf deinen Standort zugreifen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index e9ea0eae46..fc7d691c03 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -82,10 +82,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"εγγραφή ρυθμίσεων και συντομεύσεων αρχικής οθόνης"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Επιτρέπει στην εφαρμογή την αλλαγή των ρυθμίσεων και των συντομεύσεων στην Αρχική οθόνη."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"Η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> δεν επιτρέπεται να πραγματοποιεί τηλεφωνικές κλήσεις"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Δεν είναι δυνατή η φόρτωση του γραφικού στοιχείου"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Πατήστε για να ολοκληρώσετε τη ρύθμιση"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Αυτή είναι μια εφαρμογή συστήματος και δεν είναι δυνατή η κατάργηση της εγκατάστασής της."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Επεξεργασία ονόματος"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> είναι απενεργοποιημένη"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index c704585074..08d032bf96 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -82,10 +82,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"write Home settings and shortcuts"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Allows the app to change the settings and shortcuts in Home."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> is not allowed to make phone calls"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Can\'t load widget"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Tap to finish setup"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"This is a system app and can\'t be uninstalled."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Edit Name"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Disabled <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index c704585074..08d032bf96 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -82,10 +82,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"write Home settings and shortcuts"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Allows the app to change the settings and shortcuts in Home."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> is not allowed to make phone calls"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Can\'t load widget"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Tap to finish setup"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"This is a system app and can\'t be uninstalled."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Edit Name"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Disabled <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index c704585074..08d032bf96 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -82,10 +82,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"write Home settings and shortcuts"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Allows the app to change the settings and shortcuts in Home."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> is not allowed to make phone calls"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Can\'t load widget"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Tap to finish setup"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"This is a system app and can\'t be uninstalled."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Edit Name"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Disabled <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index c704585074..08d032bf96 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -82,10 +82,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"write Home settings and shortcuts"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Allows the app to change the settings and shortcuts in Home."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> is not allowed to make phone calls"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Can\'t load widget"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Tap to finish setup"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"This is a system app and can\'t be uninstalled."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Edit Name"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Disabled <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 930eb44567..7ada105cbc 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -82,10 +82,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‎‏‏‎‏‎‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‎‎‏‏‎‏‎‎‏‎‏‎‏‎‎‏‎‏‎‏‏‎write Home settings and shortcuts‎‏‎‎‏‎"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‏‎‎‏‎‏‏‏‎‎‏‎‎‎‏‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‎‏‏‏‎‎‏‎‎‎‎‏‎Allows the app to change the settings and shortcuts in Home.‎‏‎‎‏‎"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‏‎‏‎‏‏‎‏‎‎‏‏‏‎‏‏‎‏‎‏‎‎‏‏‎‎‎‎‏‏‏‎‎‏‎‏‎‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ is not allowed to make phone calls‎‏‎‎‏‎"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‎‎‏‏‎‎‏‎‎‎‏‏‎‎‏‎‏‏‎‏‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‏‎‎‎‏‏‎‏‎‏‎‏‎‏‏‏‏‏‎Can\'t load widget‎‏‎‎‏‎"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‎‎‎‏‏‎‎‎‎‎‎‎‎‏‎‏‏‎‏‎‎‎‏‎‏‎‏‏‏‏‎‎‎‏‎‎‎‏‎‏‎‏‏‏‎‏‏‎‏‏‎‎Tap to finish setup‎‏‎‎‏‎"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‏‏‏‎‏‎‎‎‎‏‎‏‎‏‎‏‎‎‏‏‏‏‎‏‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‎‎‎This is a system app and can\'t be uninstalled.‎‏‎‎‏‎"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‏‏‎‎‎‏‎‎‏‎‏‎‏‏‎‏‎‎‎‏‎‏‎‎‏‎‎‎‎‏‏‏‎‏‏‎‏‎‏‏‎‎‎‎‎Edit Name‎‏‎‎‏‎"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‎‎‎Disabled ‎‏‎‎‏‏‎<xliff:g id="APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index fbb616aeb7..607d831110 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -82,10 +82,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"escribir configuración y accesos directos de la pantalla principal"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Permite que la aplicación cambie la configuración y los accesos directos de la pantalla principal."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> no puede realizar llamadas telefónicas"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"No se puede cargar el widget"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Presiona para finalizar la configuración"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Esta es una aplicación del sistema y no se puede desinstalar."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Editar nombre"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Se inhabilitó <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index a8cbdeda02..a03a45852d 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -82,10 +82,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"მთავარი ეკრანის პარამეტრებისა და მალსახმობების ჩაწერა"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"აპისთვის მთავარი ეკრანის პარამეტრებისა და მალსახმობების შეცვლის უფლების მიცემა."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g>-ს არ აქვს სატელეფონო ზარების განხორციელების უფლება"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"ვიჯეტის ჩატვირთვა ვერ ხერხდება"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"შეეხეთ დაყენების დასასრულებლად"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"ეს სისტემური აპია და მისი წაშლა შეუძლებელია."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"სახელის რედაქტირება"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> გაითიშა"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index c46e732a79..01dda6d286 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -158,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ವೈಯಕ್ತಿಕ"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"ಕೆಲಸ"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ಬ್ಯಾಡ್ಜ್ ಮಾಡಲಾಗಿದೆ ಮತ್ತು ಅವುಗಳು ನಿಮ್ಮ IT ನಿರ್ವಾಹಕರಿಗೆ ಗೋಚರಿಸುತ್ತವೆ"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ಸರಿ"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳು ಆಫ್ ಆಗಿವೆ"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"ನಿಮ್ಮ ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳಿಗೆ ನಿಮಗೆ ಅಧಿಸೂಚನೆಗಳನ್ನು ಕಳುಹಿಸಲು, ನಿಮ್ಮ ಬ್ಯಾಟರಿಯನ್ನು ಬಳಸಲು ಅಥವಾ ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 4e1cdfb896..6a333f7045 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -158,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"वैयक्तिक"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"कार्यालय"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"कार्य प्रोफाइल"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"कामाशी संबंधित ॲप्स ही बॅज केलेली असून तुमच्या IT ॲडमिनला दृश्यमान आहेत"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"समजले"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"कामाशी संबंधित ॲप्स बंद आहेत"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"तुमचे कामाशी संबंधित ॲप्स तुम्हाला सूचना पाठवू शकत नाहीत, तुमची बॅटरी वापरू शकत नाहीत किंवा तुमचे स्थान अ‍ॅक्सेस करू शकत नाहीत"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 8fa7c0253f..a48214788b 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -82,10 +82,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"instellingen en snelkoppelingen op startscherm zetten"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"De app toestaan de instellingen en snelkoppelingen op de homepage te wijzigen."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> mag niet bellen"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Kan widget niet laden"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Tik om het instellen af te ronden"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Dit is een systeemapp die niet kan worden verwijderd."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Naam bewerken"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> staat uit"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index ba3c39976d..63ec08593f 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -158,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ਨਿੱਜੀ"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"ਕੰਮ ਸੰਬੰਧੀ"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਨੂੰ ਬੈਜ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਅਤੇ ਇਹ ਤੁਹਾਡੇ ਆਈ.ਟੀ. ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਦਿਸਣਗੀਆਂ"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ਸਮਝ ਲਿਆ"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਬੰਦ ਹਨ"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"ਤੁਹਾਡੀਆਂ ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਤੁਹਾਨੂੰ ਸੂਚਨਾਵਾਂ ਨਹੀਂ ਭੇਜ ਸਕਦੀਆਂ, ਤੁਹਾਡੀ ਬੈਟਰੀ ਨਹੀਂ ਵਰਤ ਸਕਦੀਆਂ ਜਾਂ ਤੁਹਾਡੇ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਨਹੀਂ ਕਰ ਸਕਦੀਆਂ"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 2ffb341198..11f1f8370d 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -82,10 +82,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"escrever definições e atalhos do Ecrã principal"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Permite à app alterar as definições e os atalhos no Ecrã Principal."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"O <xliff:g id="APP_NAME">%1$s</xliff:g> não tem autorização para efetuar chamadas telefónicas"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Não é possível carregar o widget"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Toque para concluir a configuração"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"É uma app de sistema e não pode ser desinstalada."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Edite o nome"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> desativado"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 76a00ae628..11779edb97 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -82,10 +82,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"gravar configurações e atalhos da tela inicial"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Permite que o app altere as configurações e os atalhos na tela inicial."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> não tem permissão para fazer chamadas"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Não é possível carregar o widget"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Toque para concluir a configuração"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Este é um app do sistema e não pode ser desinstalado."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Editar nome"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> desativado"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 29fe67d98d..d7612dfc3c 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -86,10 +86,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"записувати налаштування та ярлики головного екрана"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Дозволяє програмі змінювати налаштування та ярлики на головному екрані."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"Додаток <xliff:g id="APP_NAME">%1$s</xliff:g> не має дозволу телефонувати"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Не вдається завантажити віджет"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Торкніться, щоб завершити налаштування"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Це системна програма, її неможливо видалити."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Редагувати назву"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> вимкнено"</string>
-- 
GitLab


From 5ca92844d54ab632449b2a83acabbb8d7b931784 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sun, 20 Jun 2021 03:57:28 +0000
Subject: [PATCH 1445/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: If4193b7d4f8ad8cd70c3ff2e771e48d51cdfb2b2
---
 res/values-or/strings.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 9ef1ace198..461c082e83 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -158,8 +158,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ବ୍ୟକ୍ତିଗତ"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"ୱାର୍କ"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"ୱର୍କ ପ୍ରୋଫାଇଲ୍‌"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"ୱାର୍କ ଆପଗୁଡ଼ିକୁ ବ୍ୟାଜ୍ କରାଯାଇଛି ଏବଂ ସେଗୁଡ଼ିକ ଆପଣଙ୍କ IT ଆଡମିନଙ୍କୁ ଦୃଶ୍ୟମାନ ହେଉଛି"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ବୁଝିଗଲି"</string>
     <string name="work_apps_paused_title" msgid="3007471013401118920">"ୱାର୍କ ଆପଗୁଡ଼ିକ ବନ୍ଦ ଅଛି"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"ଆପଣଙ୍କ ୱାର୍କ ଆପଗୁଡ଼ିକ ଆପଣଙ୍କୁ ବିଜ୍ଞପ୍ତି ପଠାଇପାରିବ ନାହିଁ, ଆପଣଙ୍କ ବ୍ୟାଟେରୀକୁ ବ୍ୟବହାର କରିପାରିବ ନାହିଁ କିମ୍ବା ଆପଣଙ୍କର ଲୋକେସନକୁ ଆକ୍ସେସ୍ କରିପାରିବ ନାହିଁ"</string>
-- 
GitLab


From e99f3c96665b596936a9309c328fb521c95c179e Mon Sep 17 00:00:00 2001
From: Stevie Kideckel <kideckel@google.com>
Date: Mon, 21 Jun 2021 10:41:41 +0000
Subject: [PATCH 1446/1664] Fix bug in equals implementation for search headers

Fix: 191626327
Test: verified locally
Change-Id: I8103059a2759a8533581ff86cb57b28913cf5731
---
 .../launcher3/widget/model/WidgetsListSearchHeaderEntry.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/widget/model/WidgetsListSearchHeaderEntry.java b/src/com/android/launcher3/widget/model/WidgetsListSearchHeaderEntry.java
index c0f89bcbcc..055e4ecbe6 100644
--- a/src/com/android/launcher3/widget/model/WidgetsListSearchHeaderEntry.java
+++ b/src/com/android/launcher3/widget/model/WidgetsListSearchHeaderEntry.java
@@ -60,7 +60,7 @@ public final class WidgetsListSearchHeaderEntry extends WidgetsListBaseEntry
         WidgetsListSearchHeaderEntry otherEntry = (WidgetsListSearchHeaderEntry) obj;
         return mWidgets.equals(otherEntry.mWidgets) && mPkgItem.equals(otherEntry.mPkgItem)
                 && mTitleSectionName.equals(otherEntry.mTitleSectionName)
-                && mIsWidgetListShown;
+                && mIsWidgetListShown == otherEntry.mIsWidgetListShown;
     }
 
     /** Returns a copy of this {@link WidgetsListSearchHeaderEntry} with the widget list shown. */
-- 
GitLab


From 7b27e7d0613c5bd23a33b0368c06db2252b796eb Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 21 Jun 2021 15:36:57 +0100
Subject: [PATCH 1447/1664] Copy minSpanX & minSpanY when copying from an
 existing ItemInfo

Test: Drop Gmail widget to home screen and configure it. Then, drop
      the widget to a home screen that doesn't have sufficient space
      to accommodate it. The gmail widget can't be dropped to that
      home page and is returned to its original position.
Fix: 190582606
Change-Id: I177c09562d059b658e835cbb7fdde0d7bc6565d2
---
 src/com/android/launcher3/model/data/ItemInfo.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/com/android/launcher3/model/data/ItemInfo.java b/src/com/android/launcher3/model/data/ItemInfo.java
index 3abcc2b826..7091d2b143 100644
--- a/src/com/android/launcher3/model/data/ItemInfo.java
+++ b/src/com/android/launcher3/model/data/ItemInfo.java
@@ -168,6 +168,8 @@ public class ItemInfo {
         cellY = info.cellY;
         spanX = info.spanX;
         spanY = info.spanY;
+        minSpanX = info.minSpanX;
+        minSpanY = info.minSpanY;
         rank = info.rank;
         screenId = info.screenId;
         itemType = info.itemType;
-- 
GitLab


From ded80076dbff226a3890d367ddbcb14417bcad9a Mon Sep 17 00:00:00 2001
From: Stevie Kideckel <kideckel@google.com>
Date: Mon, 21 Jun 2021 14:47:04 +0000
Subject: [PATCH 1448/1664] Add spacing between items as decorations instead of
 margins

There are bugs in the accounting for the margins if we manipulate the
view directly, causing the wrong top to be reported and the view to be
shifted when we call scrollToPosition. Item decorations ensure that the
layout system for the recycler view always has the right details about
the spacing.

Fix: 191642682
Test: verified locally
Change-Id: Ie80563757079e885c8178883ab16e314d01c5b32
---
 res/layout/widgets_list_row_header.xml        |  1 -
 res/layout/widgets_table_container.xml        |  3 +--
 res/values/dimens.xml                         |  2 +-
 res/values/id.xml                             |  1 +
 .../widget/picker/WidgetsListAdapter.java     | 24 ++++++++++++++++++-
 .../widget/picker/WidgetsListHeader.java      | 11 ---------
 .../widget/picker/WidgetsRecyclerView.java    | 16 ++++++-------
 7 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/res/layout/widgets_list_row_header.xml b/res/layout/widgets_list_row_header.xml
index 0bfa2b2a5e..3eaa7ea627 100644
--- a/res/layout/widgets_list_row_header.xml
+++ b/res/layout/widgets_list_row_header.xml
@@ -20,7 +20,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="16dp"
-    android:layout_marginBottom="@dimen/widget_list_entry_bottom_margin"
     android:paddingVertical="@dimen/widget_list_header_view_vertical_padding"
     android:orientation="horizontal"
     launcher:appIconSize="48dp">
diff --git a/res/layout/widgets_table_container.xml b/res/layout/widgets_table_container.xml
index 4f70a05374..fac21fdcf0 100644
--- a/res/layout/widgets_table_container.xml
+++ b/res/layout/widgets_table_container.xml
@@ -18,5 +18,4 @@
     android:id="@+id/widgets_table"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="16dp"
-    android:layout_marginBottom="@dimen/widget_list_entry_bottom_margin"/>
+    android:layout_marginHorizontal="16dp"/>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 251f04a66e..416179e402 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -147,7 +147,7 @@
     <dimen name="widget_list_content_corner_radius">4dp</dimen>
 
     <dimen name="widget_list_header_view_vertical_padding">20dp</dimen>
-    <dimen name="widget_list_entry_bottom_margin">2dp</dimen>
+    <dimen name="widget_list_entry_spacing">2dp</dimen>
 
     <dimen name="widget_preview_shadow_blur">0.5dp</dimen>
     <dimen name="widget_preview_key_shadow_distance">1dp</dimen>
diff --git a/res/values/id.xml b/res/values/id.xml
index 1bd40cec4a..1709c5961e 100644
--- a/res/values/id.xml
+++ b/res/values/id.xml
@@ -16,6 +16,7 @@
 -->
 <resources>
     <item type="id" name="apps_list_view_work" />
+    <item type="id" name="tag_widget_entry" />
     <item type="id" name="view_type_widgets_list" />
     <item type="id" name="view_type_widgets_header" />
     <item type="id" name="view_type_widgets_search_header" />
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
index 5d9adf0e71..b668c90031 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
@@ -18,6 +18,7 @@ package com.android.launcher3.widget.picker;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WIDGETSTRAY_APP_EXPANDED;
 
 import android.content.Context;
+import android.graphics.Rect;
 import android.os.Process;
 import android.util.Log;
 import android.util.Size;
@@ -34,6 +35,7 @@ import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.Adapter;
+import androidx.recyclerview.widget.RecyclerView.LayoutParams;
 import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 
 import com.android.launcher3.BaseActivity;
@@ -107,7 +109,8 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
     @Nullable private Predicate<WidgetsListBaseEntry> mFilter = null;
     @Nullable private RecyclerView mRecyclerView;
     @Nullable private PackageUserKey mPendingClickHeader;
-    private int mShortcutPreviewPadding;
+    private final int mShortcutPreviewPadding;
+    private final int mSpacingBetweenEntries;
 
     private final WidgetPreviewLoadedCallback mPreviewLoadedCallback =
             ignored -> updateVisibleEntries();
@@ -141,11 +144,28 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
         mShortcutPreviewPadding =
                 2 * context.getResources()
                         .getDimensionPixelSize(R.dimen.widget_preview_shortcut_padding);
+        mSpacingBetweenEntries =
+                context.getResources().getDimensionPixelSize(R.dimen.widget_list_entry_spacing);
     }
 
     @Override
     public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
         mRecyclerView = recyclerView;
+
+        mRecyclerView.addItemDecoration(new RecyclerView.ItemDecoration() {
+            @Override
+            public void getItemOffsets(
+                    @NonNull Rect outRect,
+                    @NonNull View view,
+                    @NonNull RecyclerView parent,
+                    @NonNull RecyclerView.State state) {
+                super.getItemOffsets(outRect, view, parent, state);
+                int position = ((LayoutParams) view.getLayoutParams()).getViewLayoutPosition();
+                boolean isHeader =
+                        view.getTag(R.id.tag_widget_entry) instanceof WidgetsListBaseEntry.Header;
+                outRect.top += position > 0 && isHeader ? mSpacingBetweenEntries : 0;
+            }
+        });
     }
 
     @Override
@@ -329,7 +349,9 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
     @Override
     public void onBindViewHolder(ViewHolder holder, int pos) {
         ViewHolderBinder viewHolderBinder = mViewHolderBinders.get(getItemViewType(pos));
+        WidgetsListBaseEntry entry = mVisibleEntries.get(pos);
         viewHolderBinder.bindViewHolder(holder, mVisibleEntries.get(pos), pos);
+        holder.itemView.setTag(R.id.tag_widget_entry, entry);
     }
 
     @Override
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListHeader.java b/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
index cdab964279..ef2adbb809 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
@@ -30,7 +30,6 @@ import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
-import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.LauncherAppState;
@@ -59,7 +58,6 @@ public final class WidgetsListHeader extends LinearLayout implements ItemInfoUpd
     @Nullable private HandlerRunnable mIconLoadRequest;
     @Nullable private Drawable mIconDrawable;
     private final int mIconSize;
-    private final int mBottomMarginSize;
 
     private ImageView mAppIcon;
     private TextView mTitle;
@@ -86,8 +84,6 @@ public final class WidgetsListHeader extends LinearLayout implements ItemInfoUpd
                 R.styleable.WidgetsListRowHeader, defStyleAttr, /* defStyleRes= */ 0);
         mIconSize = a.getDimensionPixelSize(R.styleable.WidgetsListRowHeader_appIconSize,
                 grid.iconSizePx);
-        mBottomMarginSize =
-                getResources().getDimensionPixelSize(R.dimen.widget_list_entry_bottom_margin);
     }
 
     @Override
@@ -146,13 +142,6 @@ public final class WidgetsListHeader extends LinearLayout implements ItemInfoUpd
     public void setExpanded(boolean isExpanded) {
         this.mIsExpanded = isExpanded;
         mExpandToggle.setChecked(isExpanded);
-        if (getLayoutParams() instanceof RecyclerView.LayoutParams) {
-            int bottomMargin = isExpanded ? 0 : mBottomMarginSize;
-            RecyclerView.LayoutParams layoutParams =
-                    ((RecyclerView.LayoutParams) getLayoutParams());
-            layoutParams.bottomMargin = bottomMargin;
-            setLayoutParams(layoutParams);
-        }
     }
 
     /** Sets the {@link WidgetsListDrawableState} and refreshes the background drawable. */
diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java b/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
index 3ee8b33b53..7671841878 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java
@@ -52,7 +52,7 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
     private HeaderViewDimensionsProvider mHeaderViewDimensionsProvider;
     private int mLastVisibleWidgetContentTableHeight = 0;
     private int mWidgetHeaderHeight = 0;
-    private final int mCollapsedHeaderBottomMarginSize;
+    private final int mSpacingBetweenEntries;
     @Nullable private OnContentChangeListener mOnContentChangeListener;
 
     public WidgetsRecyclerView(Context context) {
@@ -72,9 +72,9 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
         ActivityContext activity = ActivityContext.lookupContext(getContext());
         DeviceProfile grid = activity.getDeviceProfile();
 
-        // The bottom margin used when the header is not expanded.
-        mCollapsedHeaderBottomMarginSize =
-                getResources().getDimensionPixelSize(R.dimen.widget_list_entry_bottom_margin);
+        // The spacing used between entries.
+        mSpacingBetweenEntries =
+                getResources().getDimensionPixelSize(R.dimen.widget_list_entry_spacing);
     }
 
     @Override
@@ -270,16 +270,16 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch
         if (untilIndex > mAdapter.getItems().size()) {
             untilIndex = mAdapter.getItems().size();
         }
-        int expandedHeaderPosition = mAdapter.getSelectedHeaderPosition().orElse(-1);
         int totalItemsHeight = 0;
         for (int i = 0; i < untilIndex; i++) {
             WidgetsListBaseEntry entry = mAdapter.getItems().get(i);
             if (entry instanceof WidgetsListHeaderEntry
                     || entry instanceof WidgetsListSearchHeaderEntry) {
                 totalItemsHeight += mWidgetHeaderHeight;
-                if (expandedHeaderPosition != i) {
-                    // If the header is collapsed, include the bottom margin it will use.
-                    totalItemsHeight += mCollapsedHeaderBottomMarginSize;
+                if (i > 0) {
+                    // Each header contains the spacing between entries as top decoration, except
+                    // the first one.
+                    totalItemsHeight += mSpacingBetweenEntries;
                 }
             } else if (entry instanceof WidgetsListContentEntry) {
                 totalItemsHeight += mLastVisibleWidgetContentTableHeight;
-- 
GitLab


From 9c10d08e1e20b5b3e004bd94e7e5c371bf086c7f Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 21 Jun 2021 12:41:36 -0700
Subject: [PATCH 1449/1664] Ensure mConsumer isn't set to null in reset().

mResetGestureInputConsumer is not initialized until onUserUnlocked(), meaning it might still be null in reset(). Use NO_OP input consumer in that case.

Test: none
Bug: 191669813
Change-Id: Ib9edde50fba0b6164390ec2b5c877d3db74ddfeb
---
 .../com/android/quickstep/TouchInteractionService.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 7956fcc562..7cb6800146 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -807,7 +807,13 @@ public class TouchInteractionService extends Service implements PluginListener<O
     }
 
     private void reset() {
-        mConsumer = mUncheckedConsumer = mResetGestureInputConsumer;
+        if (mResetGestureInputConsumer != null) {
+            mConsumer = mUncheckedConsumer = mResetGestureInputConsumer;
+        } else {
+            // mResetGestureInputConsumer isn't initialized until onUserUnlocked(), so reset to
+            // NO_OP until then (we never want these to be null).
+            mConsumer = mUncheckedConsumer = InputConsumer.NO_OP;
+        }
         mGestureState = DEFAULT_STATE;
         // By default, use batching of the input events, but check receiver before using in the rare
         // case that the monitor was disposed before the swipe settled
-- 
GitLab


From de644313b0675cca9a67ec7c175a5d1ef7e65e22 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 18 Jun 2021 17:10:59 -0700
Subject: [PATCH 1450/1664] Fixing animation end not-called when cancelling
 state the animation recursively

Bug: 190856140
Test: Manual
Change-Id: I5d6a00c1d1c0e95e615b7f2115e3e4ebb56b987f
---
 .../android/quickstep/views/RecentsView.java  |  2 +-
 .../anim/AnimatorPlaybackController.java      | 13 +++++++--
 .../launcher3/statemanager/StateManager.java  | 28 +++++++++++--------
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index df7f8b5a2a..8c3e5b513b 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2245,7 +2245,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     public PendingAnimation createTaskDismissAnimation(TaskView taskView, boolean animateTaskView,
             boolean shouldRemoveTask, long duration) {
         if (mPendingAnimation != null) {
-            mPendingAnimation.createPlaybackController().dispatchOnCancel();
+            mPendingAnimation.createPlaybackController().dispatchOnCancel().dispatchOnEnd();
         }
         PendingAnimation anim = new PendingAnimation(duration);
 
diff --git a/src/com/android/launcher3/anim/AnimatorPlaybackController.java b/src/com/android/launcher3/anim/AnimatorPlaybackController.java
index 7d8b82a8eb..85ca280ba2 100644
--- a/src/com/android/launcher3/anim/AnimatorPlaybackController.java
+++ b/src/com/android/launcher3/anim/AnimatorPlaybackController.java
@@ -278,12 +278,19 @@ public class AnimatorPlaybackController implements ValueAnimator.AnimatorUpdateL
         }
     }
 
-    public void dispatchOnStart() {
+    public AnimatorPlaybackController dispatchOnStart() {
         callListenerCommandRecursively(mAnim, AnimatorListener::onAnimationStart);
+        return this;
     }
 
-    public void dispatchOnCancel() {
+    public AnimatorPlaybackController dispatchOnCancel() {
         callListenerCommandRecursively(mAnim, AnimatorListener::onAnimationCancel);
+        return this;
+    }
+
+    public AnimatorPlaybackController dispatchOnEnd() {
+        callListenerCommandRecursively(mAnim, AnimatorListener::onAnimationEnd);
+        return this;
     }
 
     public void dispatchSetInterpolator(TimeInterpolator interpolator) {
@@ -328,7 +335,7 @@ public class AnimatorPlaybackController implements ValueAnimator.AnimatorUpdateL
         public void onAnimationSuccess(Animator animator) {
             // We wait for the spring (if any) to finish running before completing the end callback.
             if (!mDispatched) {
-                callListenerCommandRecursively(mAnim, AnimatorListener::onAnimationEnd);
+                dispatchOnEnd();
                 if (mEndAction != null) {
                     mEndAction.run();
                 }
diff --git a/src/com/android/launcher3/statemanager/StateManager.java b/src/com/android/launcher3/statemanager/StateManager.java
index 13d6568f78..b34af975bd 100644
--- a/src/com/android/launcher3/statemanager/StateManager.java
+++ b/src/com/android/launcher3/statemanager/StateManager.java
@@ -209,7 +209,7 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
 
         // Cancel the current animation. This will reset mState to mCurrentStableState, so store it.
         STATE_TYPE fromState = mState;
-        mConfig.reset();
+        cancelAnimation();
 
         if (!animated) {
             mAtomicAnimationFactory.cancelAllStateElementAnimation();
@@ -303,7 +303,7 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
     public AnimatorPlaybackController createAnimationToNewWorkspace(STATE_TYPE state,
             StateAnimationConfig config) {
         config.userControlled = true;
-        mConfig.reset();
+        cancelAnimation();
         config.copyTo(mConfig);
         mConfig.playbackController = createAnimationToNewWorkspaceInternal(state)
                 .createPlaybackController();
@@ -393,6 +393,11 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
      */
     public void cancelAnimation() {
         mConfig.reset();
+        // It could happen that a new animation is set as a result of an endListener on the
+        // existing animation.
+        while (mConfig.currentAnimation != null || mConfig.playbackController != null) {
+            mConfig.reset();
+        }
     }
 
     public void setCurrentUserControlledAnimation(AnimatorPlaybackController controller) {
@@ -508,14 +513,19 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
          * Cancels the current animation and resets config variables.
          */
         public void reset() {
+            AnimatorSet anim = currentAnimation;
+            AnimatorPlaybackController pc = playbackController;
+
             DEFAULT.copyTo(this);
             targetState = null;
+            currentAnimation = null;
+            playbackController = null;
+            changeId++;
 
-            if (playbackController != null) {
-                playbackController.getAnimationPlayer().cancel();
-                playbackController.dispatchOnCancel();
-            } else if (currentAnimation != null) {
-                AnimatorSet anim = currentAnimation;
+            if (pc != null) {
+                pc.getAnimationPlayer().cancel();
+                pc.dispatchOnCancel().dispatchOnEnd();
+            } else if (anim != null) {
                 anim.setDuration(0);
                 if (!anim.isStarted()) {
                     // If the animation is not started the listeners do not get notified,
@@ -525,10 +535,6 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
                 }
                 anim.cancel();
             }
-
-            currentAnimation = null;
-            playbackController = null;
-            changeId++;
         }
 
         @Override
-- 
GitLab


From 08c3480b8459323af4fd6e16f09697fc5ac8c731 Mon Sep 17 00:00:00 2001
From: Evan Rosky <erosky@google.com>
Date: Thu, 10 Jun 2021 14:54:12 -0700
Subject: [PATCH 1451/1664] Finish wrapped launcher animations if impl is gone

If the runner impl is gone (since it is a weakreference), we
still need to complete the animation contract by calling the
finish callback, so do that.

Bug: 183993924
Test: atest ActivityMetricsLoggerTests
Change-Id: Idce1859f0417cb74bbb9884e0d06750539e4545e
(cherry picked from commit 8a672e15cc95528d70e60fd3a598edc962b0ff9c)
---
 .../com/android/launcher3/WrappedLauncherAnimationRunner.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/quickstep/src/com/android/launcher3/WrappedLauncherAnimationRunner.java b/quickstep/src/com/android/launcher3/WrappedLauncherAnimationRunner.java
index e31927550c..fcf9857649 100644
--- a/quickstep/src/com/android/launcher3/WrappedLauncherAnimationRunner.java
+++ b/quickstep/src/com/android/launcher3/WrappedLauncherAnimationRunner.java
@@ -58,6 +58,8 @@ public class WrappedLauncherAnimationRunner<R extends WrappedAnimationRunnerImpl
         if (animationRunnerImpl != null) {
             animationRunnerImpl.onCreateAnimation(transit, appTargets, wallpaperTargets,
                     nonAppTargets, result);
+        } else {
+            result.setAnimation(null, null);
         }
     }
 }
-- 
GitLab


From 50f1ff1808a238a158e0570c63733a3a9c3567c5 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 21 Jun 2021 18:39:03 +0100
Subject: [PATCH 1452/1664] Update all apps & widget pickers personal / work
 tabs

Test: Open all apps to confirm tab style match the mock in both dark &
      light mode.
      Open widgets picker to confirm tab style match the mock in both
      dark & light mode.
Bug: 191387242
Change-Id: Ie0111f65813128fef5befbdefd451cf0e9f01be9
---
 .../all_apps_tabs_background.xml              | 18 -----
 res/color-night/all_apps_tabs_background.xml  | 18 -----
 res/drawable/all_apps_tabs_background.xml     | 24 ++++--
 res/layout/all_apps_personal_work_tabs.xml    | 20 +++--
 ..._full_sheet_search_and_recommendations.xml |  2 +-
 res/layout/widgets_list_row_header.xml        |  2 +-
 res/layout/widgets_personal_work_tabs.xml     | 18 +++--
 res/layout/widgets_search_bar.xml             |  2 +-
 res/layout/widgets_table_container.xml        |  2 +-
 res/values/dimens.xml                         | 10 ++-
 .../PersonalWorkSlidingTabStrip.java          | 75 -------------------
 11 files changed, 56 insertions(+), 135 deletions(-)
 delete mode 100644 res/color-night-v31/all_apps_tabs_background.xml
 delete mode 100644 res/color-night/all_apps_tabs_background.xml

diff --git a/res/color-night-v31/all_apps_tabs_background.xml b/res/color-night-v31/all_apps_tabs_background.xml
deleted file mode 100644
index b396f3377e..0000000000
--- a/res/color-night-v31/all_apps_tabs_background.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/system_neutral2_100"/>
-</selector>
\ No newline at end of file
diff --git a/res/color-night/all_apps_tabs_background.xml b/res/color-night/all_apps_tabs_background.xml
deleted file mode 100644
index c0c1621d17..0000000000
--- a/res/color-night/all_apps_tabs_background.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="#E2E2E2"/>
-</selector>
\ No newline at end of file
diff --git a/res/drawable/all_apps_tabs_background.xml b/res/drawable/all_apps_tabs_background.xml
index 4e953152d0..bf7ee8c20c 100644
--- a/res/drawable/all_apps_tabs_background.xml
+++ b/res/drawable/all_apps_tabs_background.xml
@@ -13,13 +13,27 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:enterFadeDuration="500">
     <item
-        android:top="@dimen/all_apps_tabs_vertical_padding"
-        android:bottom="@dimen/all_apps_tabs_vertical_padding">
+        android:id="@+id/unselected"
+        android:state_selected="false">
+        <ripple android:color="@color/all_apps_tab_background_selected">
+            <item>
+                <shape android:shape="rectangle">
+                    <corners android:radius="@dimen/all_apps_header_pill_corner_radius" />
+                    <solid android:color="@color/all_apps_tabs_background" />
+                </shape>
+            </item>
+        </ripple>
+    </item>
+
+    <item
+        android:id="@+id/selected"
+        android:state_selected="true">
         <shape android:shape="rectangle">
-            <solid android:color="@color/all_apps_tabs_background" />
             <corners android:radius="@dimen/all_apps_header_pill_corner_radius" />
+            <solid android:color="@color/all_apps_tab_background_selected" />
         </shape>
     </item>
-</layer-list>
\ No newline at end of file
+</selector>
\ No newline at end of file
diff --git a/res/layout/all_apps_personal_work_tabs.xml b/res/layout/all_apps_personal_work_tabs.xml
index cfaa261034..11143fb3e1 100644
--- a/res/layout/all_apps_personal_work_tabs.xml
+++ b/res/layout/all_apps_personal_work_tabs.xml
@@ -14,12 +14,12 @@
   ~ limitations under the License.
 -->
 
-<com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/tabs"
-    android:layout_width="@dimen/all_apps_header_pills_width"
+    android:layout_width="match_parent"
     android:layout_height="@dimen/all_apps_header_pill_height"
     android:layout_gravity="center_horizontal"
-    android:background="@drawable/all_apps_tabs_background"
     android:orientation="horizontal"
     style="@style/TextHeadline">
 
@@ -27,19 +27,25 @@
         android:id="@+id/tab_personal"
         android:layout_width="0dp"
         android:layout_height="match_parent"
+        android:layout_marginEnd="@dimen/all_apps_tabs_button_horizontal_padding"
+        android:layout_marginVertical="@dimen/all_apps_tabs_vertical_padding"
         android:layout_weight="1"
-        android:background="@drawable/personal_work_tabs_ripple"
+        android:background="@drawable/all_apps_tabs_background"
         android:text="@string/all_apps_personal_tab"
         android:textColor="@color/all_apps_tab_text"
-        android:textSize="14sp" />
+        android:textSize="14sp"
+        style="?android:attr/borderlessButtonStyle" />
 
     <Button
         android:id="@+id/tab_work"
         android:layout_width="0dp"
         android:layout_height="match_parent"
+        android:layout_marginStart="@dimen/all_apps_tabs_button_horizontal_padding"
+        android:layout_marginVertical="@dimen/all_apps_tabs_vertical_padding"
         android:layout_weight="1"
-        android:background="@drawable/personal_work_tabs_ripple"
+        android:background="@drawable/all_apps_tabs_background"
         android:text="@string/all_apps_work_tab"
         android:textColor="@color/all_apps_tab_text"
-        android:textSize="14sp" />
+        android:textSize="14sp"
+        style="?android:attr/borderlessButtonStyle" />
 </com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip>
\ No newline at end of file
diff --git a/res/layout/widgets_full_sheet_search_and_recommendations.xml b/res/layout/widgets_full_sheet_search_and_recommendations.xml
index a89f85f695..4a3e20d8ba 100644
--- a/res/layout/widgets_full_sheet_search_and_recommendations.xml
+++ b/res/layout/widgets_full_sheet_search_and_recommendations.xml
@@ -53,7 +53,7 @@
         android:id="@+id/recommended_widget_table"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="16dp"
+        android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin"
         android:layout_marginTop="8dp"
         android:background="@drawable/widgets_recommendation_background"
         android:paddingVertical="@dimen/recommended_widgets_table_vertical_padding"
diff --git a/res/layout/widgets_list_row_header.xml b/res/layout/widgets_list_row_header.xml
index 3eaa7ea627..7f84050a47 100644
--- a/res/layout/widgets_list_row_header.xml
+++ b/res/layout/widgets_list_row_header.xml
@@ -19,7 +19,7 @@
     android:id="@+id/widgets_list_header"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="16dp"
+    android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin"
     android:paddingVertical="@dimen/widget_list_header_view_vertical_padding"
     android:orientation="horizontal"
     launcher:appIconSize="48dp">
diff --git a/res/layout/widgets_personal_work_tabs.xml b/res/layout/widgets_personal_work_tabs.xml
index 15275a6df2..532c42233e 100644
--- a/res/layout/widgets_personal_work_tabs.xml
+++ b/res/layout/widgets_personal_work_tabs.xml
@@ -20,28 +20,34 @@
     android:id="@+id/tabs"
     android:layout_width="match_parent"
     android:layout_height="@dimen/all_apps_header_pill_height"
-    android:layout_marginHorizontal="32dp"
+    android:gravity="center_horizontal"
     android:orientation="horizontal"
-    android:background="@drawable/all_apps_tabs_background"
+    android:layout_marginHorizontal="@dimen/widget_tabs_horizontal_margin"
     style="@style/TextHeadline">
 
     <Button
         android:id="@+id/tab_personal"
         android:layout_width="0dp"
         android:layout_height="match_parent"
+        android:layout_marginEnd="@dimen/widget_tabs_button_horizontal_padding"
+        android:layout_marginVertical="@dimen/widget_apps_tabs_vertical_padding"
         android:layout_weight="1"
-        android:background="@drawable/personal_work_tabs_ripple"
+        android:background="@drawable/all_apps_tabs_background"
         android:text="@string/widgets_full_sheet_personal_tab"
         android:textColor="@color/all_apps_tab_text"
-        android:textSize="14sp" />
+        android:textSize="14sp"
+        style="?android:attr/borderlessButtonStyle" />
 
     <Button
         android:id="@+id/tab_work"
         android:layout_width="0dp"
         android:layout_height="match_parent"
+        android:layout_marginEnd="@dimen/widget_tabs_button_horizontal_padding"
+        android:layout_marginVertical="@dimen/widget_apps_tabs_vertical_padding"
         android:layout_weight="1"
-        android:background="@drawable/personal_work_tabs_ripple"
+        android:background="@drawable/all_apps_tabs_background"
         android:text="@string/widgets_full_sheet_work_tab"
         android:textColor="@color/all_apps_tab_text"
-        android:textSize="14sp" />
+        android:textSize="14sp"
+        style="?android:attr/borderlessButtonStyle" />
 </com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip>
\ No newline at end of file
diff --git a/res/layout/widgets_search_bar.xml b/res/layout/widgets_search_bar.xml
index 6a4bb4d2d0..0b354e8aee 100644
--- a/res/layout/widgets_search_bar.xml
+++ b/res/layout/widgets_search_bar.xml
@@ -6,7 +6,7 @@
     android:layout_height="wrap_content"
     android:orientation="horizontal"
     android:layout_marginTop="24dp"
-    android:layout_marginHorizontal="16dp"
+    android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin"
     android:background="@drawable/bg_widgets_searchbox">
 
     <com.android.launcher3.ExtendedEditText
diff --git a/res/layout/widgets_table_container.xml b/res/layout/widgets_table_container.xml
index fac21fdcf0..ab470d8fa5 100644
--- a/res/layout/widgets_table_container.xml
+++ b/res/layout/widgets_table_container.xml
@@ -18,4 +18,4 @@
     android:id="@+id/widgets_table"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="16dp"/>
+    android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin" />
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 416179e402..bc63c061f8 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -93,14 +93,14 @@
     <dimen name="all_apps_background_canvas_width">700dp</dimen>
     <dimen name="all_apps_background_canvas_height">475dp</dimen>
     <dimen name="all_apps_header_pill_height">48dp</dimen>
-    <dimen name="all_apps_header_pill_corner_radius">18dp</dimen>
-    <dimen name="all_apps_header_pills_width">348dp</dimen>
+    <dimen name="all_apps_header_pill_corner_radius">12dp</dimen>
     <dimen name="all_apps_header_tab_height">48dp</dimen>
     <dimen name="all_apps_tabs_indicator_height">2dp</dimen>
     <dimen name="all_apps_header_top_padding">36dp</dimen>
     <dimen name="all_apps_header_bottom_padding">6dp</dimen>
     <dimen name="all_apps_work_profile_tab_footer_top_padding">16dp</dimen>
     <dimen name="all_apps_work_profile_tab_footer_bottom_padding">20dp</dimen>
+    <dimen name="all_apps_tabs_button_horizontal_padding">4dp</dimen>
     <dimen name="all_apps_tabs_vertical_padding">6dp</dimen>
     <dimen name="all_apps_divider_height">2dp</dimen>
     <dimen name="all_apps_divider_width">128dp</dimen>
@@ -136,6 +136,11 @@
     <dimen name="widget_cell_horizontal_padding">16dp</dimen>
     <dimen name="widget_cell_font_size">14sp</dimen>
 
+    <dimen name="widget_tabs_button_horizontal_padding">4dp</dimen>
+    <dimen name="widget_tabs_horizontal_margin">32dp</dimen>
+    <dimen name="widget_apps_header_pill_height">48dp</dimen>
+    <dimen name="widget_apps_tabs_vertical_padding">6dp</dimen>
+
     <dimen name="recommended_widgets_table_vertical_padding">8dp</dimen>
 
     <!-- Bottom margin for the search and recommended widgets container without work profile -->
@@ -148,6 +153,7 @@
 
     <dimen name="widget_list_header_view_vertical_padding">20dp</dimen>
     <dimen name="widget_list_entry_spacing">2dp</dimen>
+    <dimen name="widget_list_horizontal_margin">16dp</dimen>
 
     <dimen name="widget_preview_shadow_blur">0.5dp</dimen>
     <dimen name="widget_preview_key_shadow_distance">1dp</dimen>
diff --git a/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java b/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
index df5d465d96..11185fb511 100644
--- a/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
+++ b/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
@@ -16,118 +16,43 @@
 package com.android.launcher3.workprofile;
 
 import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Paint;
 import android.util.AttributeSet;
-import android.view.View;
 import android.widget.Button;
 import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
 import com.android.launcher3.pageindicators.PageIndicator;
 
 /**
  * Supports two indicator colors, dedicated for personal and work tabs.
  */
 public class PersonalWorkSlidingTabStrip extends LinearLayout implements PageIndicator {
-    private final Paint mSelectedIndicatorPaint;
-
-    private int mTabVerticalPadding;
-    private final int mSelectedIndicatorRadius;
-
-    private int mIndicatorLeft = -1;
-    private int mIndicatorRight = -1;
-    private float mScrollOffset;
-    private int mSelectedPosition = 0;
-
     private OnActivePageChangedListener mOnActivePageChangedListener;
     private int mLastActivePage = 0;
-    private boolean mIsRtl;
 
     public PersonalWorkSlidingTabStrip(@NonNull Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
-        setWillNotDraw(false);
-
-        mTabVerticalPadding =
-                getResources().getDimensionPixelSize(R.dimen.all_apps_tabs_vertical_padding);
-
-        mSelectedIndicatorRadius = getResources().getDimensionPixelSize(
-                R.dimen.all_apps_header_pill_corner_radius);
-
-        mSelectedIndicatorPaint = new Paint();
-        mSelectedIndicatorPaint.setColor(
-                context.getColor(R.color.all_apps_tab_background_selected));
-
-        mIsRtl = Utilities.isRtl(getResources());
     }
 
     /**
      * Highlights tab with index pos
      */
     public void updateTabTextColor(int pos) {
-        mSelectedPosition = pos;
         for (int i = 0; i < getChildCount(); i++) {
             Button tab = (Button) getChildAt(i);
             tab.setSelected(i == pos);
         }
     }
 
-    private void updateIndicatorPosition(float scrollOffset) {
-        mScrollOffset = scrollOffset;
-        updateIndicatorPosition();
-    }
-
-    @Override
-    protected void onLayout(boolean changed, int l, int t, int r, int b) {
-        super.onLayout(changed, l, t, r, b);
-        updateTabTextColor(mSelectedPosition);
-        updateIndicatorPosition(mScrollOffset);
-    }
-
-    private void updateIndicatorPosition() {
-        int left = -1, right = -1;
-        final View leftTab = getLeftTab();
-        if (leftTab != null) {
-            left = (int) (leftTab.getLeft() + leftTab.getWidth() * mScrollOffset);
-            right = left + leftTab.getWidth();
-        }
-        setIndicatorPosition(left, right);
-    }
-
-    private View getLeftTab() {
-        return mIsRtl ? getChildAt(1) : getChildAt(0);
-    }
-
-    private void setIndicatorPosition(int left, int right) {
-        if (left != mIndicatorLeft || right != mIndicatorRight) {
-            mIndicatorLeft = left;
-            mIndicatorRight = right;
-            invalidate();
-        }
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-        canvas.drawRoundRect(mIndicatorLeft, mTabVerticalPadding, mIndicatorRight,
-                getHeight() - mTabVerticalPadding, mSelectedIndicatorRadius,
-                mSelectedIndicatorRadius, mSelectedIndicatorPaint);
-    }
-
     @Override
     public void setScroll(int currentScroll, int totalScroll) {
-        float scrollOffset = ((float) currentScroll) / totalScroll;
-        updateIndicatorPosition(scrollOffset);
     }
 
     @Override
     public void setActiveMarker(int activePage) {
         updateTabTextColor(activePage);
-        updateIndicatorPosition(mIsRtl ? 1 - activePage : activePage);
         if (mOnActivePageChangedListener != null && mLastActivePage != activePage) {
             mOnActivePageChangedListener.onActivePageChanged(activePage);
         }
-- 
GitLab


From 061548668d7bf8d8d68e214719d0c1828b8784a1 Mon Sep 17 00:00:00 2001
From: zakcohen <zakcohen@google.com>
Date: Mon, 21 Jun 2021 15:18:16 -0700
Subject: [PATCH 1453/1664] Fade overview action buttons faster in overview ->
 home

Spec says transition should take ~80ms, default for this transition is
~300ms, so clamp to a quarter of the range.

Bug: 191699762
Test: Local
Change-Id: I5ef6701eee0d25d5d9987e05cb53aee3e5e8e143
---
 .../uioverrides/states/QuickstepAtomicAnimationFactory.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
index eb524a9145..0e2fbbc2bf 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
@@ -86,7 +86,7 @@ public class QuickstepAtomicAnimationFactory extends
             StateAnimationConfig config) {
         RecentsView overview = mActivity.getOverviewPanel();
         if (toState == NORMAL && fromState == OVERVIEW) {
-            config.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, DEACCEL);
+            config.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, clampToProgress(LINEAR, 0, 0.25f));
             config.setInterpolator(ANIM_SCRIM_FADE, LINEAR);
             config.setInterpolator(ANIM_WORKSPACE_SCALE, DEACCEL);
             config.setInterpolator(ANIM_WORKSPACE_FADE, ACCEL);
-- 
GitLab


From 2a2eee1949281ed26a464bf6a986e29e91f9ef6d Mon Sep 17 00:00:00 2001
From: Jon Spivack <spivack@google.com>
Date: Mon, 21 Jun 2021 15:54:05 -0700
Subject: [PATCH 1454/1664] NIU Actions: Update background and dark mode colors

This updates the Recents screen to use the default background colors and updates the NIU Actions buttons to better contrast with the background in dark mode.

Bug: 191049004
Test: Manual (Pixel 3A)
Change-Id: I8aef9968623be373fb71a729a0b99a7b9899cff1
---
 go/quickstep/res/layout/overview_panel.xml | 39 ----------------------
 go/quickstep/res/values/attrs.xml          |  1 -
 go/quickstep/res/values/colors.xml         |  4 +--
 go/quickstep/res/values/styles.xml         |  2 --
 4 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 go/quickstep/res/layout/overview_panel.xml

diff --git a/go/quickstep/res/layout/overview_panel.xml b/go/quickstep/res/layout/overview_panel.xml
deleted file mode 100644
index 241b63d5d1..0000000000
--- a/go/quickstep/res/layout/overview_panel.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-     Copyright (C) 2021 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <com.android.quickstep.views.LauncherRecentsView
-        android:id="@+id/overview_panel"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:accessibilityPaneTitle="@string/accessibility_recent_apps"
-        android:clipChildren="false"
-        android:clipToPadding="false"
-        android:background="?attr/overviewBackgroundColor"
-        android:visibility="invisible" />
-
-    <com.android.quickstep.views.SplitPlaceholderView
-        android:id="@+id/split_placeholder"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/split_placeholder_size"
-        android:background="@android:color/darker_gray"
-        android:visibility="gone" />
-
-    <include
-        android:id="@+id/overview_actions_view"
-        layout="@layout/overview_actions_container" />
-
-</merge>
diff --git a/go/quickstep/res/values/attrs.xml b/go/quickstep/res/values/attrs.xml
index 3adf462d2c..03eab50d32 100644
--- a/go/quickstep/res/values/attrs.xml
+++ b/go/quickstep/res/values/attrs.xml
@@ -16,7 +16,6 @@
 -->
 <resources>
     <!-- Attributes used for Overview theming -->
-    <attr name="overviewBackgroundColor" format="color" />
     <attr name="overviewButtonTextColor" format="color" />
     <attr name="overviewButtonIconColor" format="color" />
     <attr name="overviewButtonBackgroundColor" format="color" />
diff --git a/go/quickstep/res/values/colors.xml b/go/quickstep/res/values/colors.xml
index f815f54581..ae72ef63dc 100644
--- a/go/quickstep/res/values/colors.xml
+++ b/go/quickstep/res/values/colors.xml
@@ -16,10 +16,8 @@
 -->
 <resources>
     <!-- Overview -->
-    <color name="go_overview_background_color">#DADADA</color>
-    <color name="go_overview_background_color_dark">#000000</color>
     <color name="go_overview_text_color">#3C4043</color>
     <color name="go_overview_text_color_dark">#F8F9FA</color>
     <color name="go_overview_button_color">#70FFFFFF</color>
-    <color name="go_overview_button_color_dark">#303030</color>
+    <color name="go_overview_button_color_dark">#474747</color>
 </resources>
diff --git a/go/quickstep/res/values/styles.xml b/go/quickstep/res/values/styles.xml
index 59f7377d8e..ffe8f4607d 100644
--- a/go/quickstep/res/values/styles.xml
+++ b/go/quickstep/res/values/styles.xml
@@ -17,14 +17,12 @@
 <resources>
     <!-- App themes -->
     <style name="AppTheme" parent="@style/LauncherTheme">
-        <item name="overviewBackgroundColor">@color/go_overview_background_color</item>
         <item name="overviewButtonTextColor">@color/go_overview_text_color</item>
         <item name="overviewButtonIconColor">@color/go_overview_text_color</item>
         <item name="overviewButtonBackgroundColor">@color/go_overview_button_color</item>
     </style>
 
     <style name="AppTheme.Dark" parent="@style/LauncherTheme.Dark">
-        <item name="overviewBackgroundColor">@color/go_overview_background_color_dark</item>
         <item name="overviewButtonTextColor">@color/go_overview_text_color_dark</item>
         <item name="overviewButtonIconColor">@color/go_overview_text_color_dark</item>
         <item name="overviewButtonBackgroundColor">@color/go_overview_button_color_dark</item>
-- 
GitLab


From 696c6129642c02bcdceced283ffc4d220770827c Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 18 Jun 2021 17:42:18 -0700
Subject: [PATCH 1455/1664] Fixing TaskView.launchTask.onEndCallback is not
 called

Sometimes onAnimaitonCancelled can be called without onCreate. Calling
onEnd in this case so that the sate is cleared

Removing additional subclassing for the runner

Bug: 190856140
Test: Manual
Change-Id: If105cb343cab446a4eac90a45184ce50c6e4c485
---
 .../launcher3/BaseQuickstepLauncher.java      |  2 +-
 .../launcher3/LauncherAnimationRunner.java    | 82 ++++++++++++++-----
 .../launcher3/QuickstepTransitionManager.java | 39 ++++-----
 .../launcher3/WrappedAnimationRunnerImpl.java | 32 --------
 .../WrappedLauncherAnimationRunner.java       | 65 ---------------
 .../QuickstepInteractionHandler.java          |  2 +-
 .../android/quickstep/RecentsActivity.java    | 76 +++++++++--------
 .../util/RemoteAnimationProvider.java         |  7 +-
 .../util/SplitSelectStateController.java      | 13 ++-
 9 files changed, 135 insertions(+), 183 deletions(-)
 delete mode 100644 quickstep/src/com/android/launcher3/WrappedAnimationRunnerImpl.java
 delete mode 100644 quickstep/src/com/android/launcher3/WrappedLauncherAnimationRunner.java

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 33dc6cf5bd..2498d12931 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -430,7 +430,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
     public ActivityOptionsWrapper getActivityLaunchOptions(View v, @Nullable ItemInfo item) {
         ActivityOptionsWrapper activityOptions =
                 mAppTransitionManager.hasControlRemoteAppTransitionPermission()
-                        ? mAppTransitionManager.getActivityLaunchOptions(this, v)
+                        ? mAppTransitionManager.getActivityLaunchOptions(v)
                         : super.getActivityLaunchOptions(v, item);
         if (mLastTouchUpTime > 0) {
             ActivityOptionsCompat.setLauncherSourceInfo(
diff --git a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
index 1090099d2f..661053af18 100644
--- a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
+++ b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
@@ -36,26 +36,48 @@ import androidx.annotation.UiThread;
 import com.android.systemui.shared.system.RemoteAnimationRunnerCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
+import java.lang.ref.WeakReference;
+
+/**
+ * This class is needed to wrap any animation runner that is a part of the
+ * RemoteAnimationDefinition:
+ * - Launcher creates a new instance of the LauncherAppTransitionManagerImpl whenever it is
+ *   created, which in turn registers a new definition
+ * - When the definition is registered, window manager retains a strong binder reference to the
+ *   runner passed in
+ * - If the Launcher activity is recreated, the new definition registered will replace the old
+ *   reference in the system's activity record, but until the system server is GC'd, the binder
+ *   reference will still exist, which references the runner in the Launcher process, which
+ *   references the (old) Launcher activity through this class
+ *
+ * Instead we make the runner provided to the definition static only holding a weak reference to
+ * the runner implementation.  When this animation manager is destroyed, we remove the Launcher
+ * reference to the runner, leaving only the weak ref from the runner.
+ */
 @TargetApi(Build.VERSION_CODES.P)
-public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCompat {
+public class LauncherAnimationRunner implements RemoteAnimationRunnerCompat {
+
+    private static final RemoteAnimationFactory DEFAULT_FACTORY =
+            (transit, appTargets, wallpaperTargets, nonAppTargets, result) ->
+                    result.setAnimation(null, null);
 
     private final Handler mHandler;
     private final boolean mStartAtFrontOfQueue;
+    private final WeakReference<RemoteAnimationFactory> mFactory;
+
     private AnimationResult mAnimationResult;
 
     /**
      * @param startAtFrontOfQueue If true, the animation start will be posted at the front of the
      *                            queue to minimize latency.
      */
-    public LauncherAnimationRunner(Handler handler, boolean startAtFrontOfQueue) {
+    public LauncherAnimationRunner(Handler handler, RemoteAnimationFactory factory,
+            boolean startAtFrontOfQueue) {
         mHandler = handler;
+        mFactory = new WeakReference<>(factory);
         mStartAtFrontOfQueue = startAtFrontOfQueue;
     }
 
-    public Handler getHandler() {
-        return mHandler;
-    }
-
     // Called only in S+ platform
     @BinderThread
     public void onAnimationStart(
@@ -67,7 +89,7 @@ public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCo
         Runnable r = () -> {
             finishExistingAnimation();
             mAnimationResult = new AnimationResult(() -> mAnimationResult = null, runnable);
-            onCreateAnimation(transit, appTargets, wallpaperTargets, nonAppTargets,
+            getFactory().onCreateAnimation(transit, appTargets, wallpaperTargets, nonAppTargets,
                     mAnimationResult);
         };
         if (mStartAtFrontOfQueue) {
@@ -92,17 +114,11 @@ public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCo
         onAnimationStart(appTargets, new RemoteAnimationTargetCompat[0], runnable);
     }
 
-    /**
-     * Called on the UI thread when the animation targets are received. The implementation must
-     * call {@link AnimationResult#setAnimation} with the target animation to be run.
-     */
-    @UiThread
-    public abstract void onCreateAnimation(
-            int transit,
-            RemoteAnimationTargetCompat[] appTargets,
-            RemoteAnimationTargetCompat[] wallpaperTargets,
-            RemoteAnimationTargetCompat[] nonAppTargets,
-            AnimationResult result);
+
+    private RemoteAnimationFactory getFactory() {
+        RemoteAnimationFactory factory = mFactory.get();
+        return factory != null ? factory : DEFAULT_FACTORY;
+    }
 
     @UiThread
     private void finishExistingAnimation() {
@@ -118,7 +134,10 @@ public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCo
     @BinderThread
     @Override
     public void onAnimationCancelled() {
-        postAsyncCallback(mHandler, this::finishExistingAnimation);
+        postAsyncCallback(mHandler, () -> {
+            finishExistingAnimation();
+            getFactory().onAnimationCancelled();
+        });
     }
 
     public static final class AnimationResult {
@@ -153,7 +172,6 @@ public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCo
         @UiThread
         public void setAnimation(AnimatorSet animation, Context context) {
             setAnimation(animation, context, null, true);
-
         }
 
         /**
@@ -198,4 +216,28 @@ public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCo
             }
         }
     }
+
+    /**
+     * Used with LauncherAnimationRunner as an interface for the runner to call back to the
+     * implementation.
+     */
+    @FunctionalInterface
+    public interface RemoteAnimationFactory {
+
+        /**
+         * Called on the UI thread when the animation targets are received. The implementation must
+         * call {@link AnimationResult#setAnimation} with the target animation to be run.
+         */
+        void onCreateAnimation(int transit,
+                RemoteAnimationTargetCompat[] appTargets,
+                RemoteAnimationTargetCompat[] wallpaperTargets,
+                RemoteAnimationTargetCompat[] nonAppTargets,
+                LauncherAnimationRunner.AnimationResult result);
+
+        /**
+         * Called when the animation is cancelled. This can happen with or without
+         * the create being called.
+         */
+        default void onAnimationCancelled() { }
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index dd248e4e83..3b3f0bde8b 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -79,6 +79,7 @@ import androidx.annotation.Nullable;
 import androidx.core.graphics.ColorUtils;
 
 import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
+import com.android.launcher3.LauncherAnimationRunner.RemoteAnimationFactory;
 import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.icons.FastBitmapDrawable;
@@ -197,11 +198,11 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
 
     private RemoteAnimationProvider mRemoteAnimationProvider;
     // Strong refs to runners which are cleared when the launcher activity is destroyed
-    private WrappedAnimationRunnerImpl mWallpaperOpenRunner;
-    private WrappedAnimationRunnerImpl mAppLaunchRunner;
-    private WrappedAnimationRunnerImpl mKeyguardGoingAwayRunner;
+    private RemoteAnimationFactory mWallpaperOpenRunner;
+    private RemoteAnimationFactory mAppLaunchRunner;
+    private RemoteAnimationFactory mKeyguardGoingAwayRunner;
 
-    private WrappedAnimationRunnerImpl mWallpaperOpenTransitionRunner;
+    private RemoteAnimationFactory mWallpaperOpenTransitionRunner;
     private RemoteTransitionCompat mLauncherOpenTransition;
 
     private final AnimatorListenerAdapter mForceInvisibleListener = new AnimatorListenerAdapter() {
@@ -257,11 +258,11 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
      * @return ActivityOptions with remote animations that controls how the window of the opening
      *         targets are displayed.
      */
-    public ActivityOptionsWrapper getActivityLaunchOptions(Launcher launcher, View v) {
+    public ActivityOptionsWrapper getActivityLaunchOptions(View v) {
         boolean fromRecents = isLaunchingFromRecents(v, null /* targets */);
         RunnableList onEndCallback = new RunnableList();
-        mAppLaunchRunner = new AppLaunchAnimationRunner(mHandler, v, onEndCallback);
-        RemoteAnimationRunnerCompat runner = new WrappedLauncherAnimationRunner<>(
+        mAppLaunchRunner = new AppLaunchAnimationRunner(v, onEndCallback);
+        RemoteAnimationRunnerCompat runner = new LauncherAnimationRunner(
                 mHandler, mAppLaunchRunner, true /* startAtFrontOfQueue */);
 
         // Note that this duration is a guess as we do not know if the animation will be a
@@ -1006,7 +1007,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
             definition.addRemoteAnimation(WindowManagerWrapper.TRANSIT_WALLPAPER_OPEN,
                     WindowManagerWrapper.ACTIVITY_TYPE_STANDARD,
                     new RemoteAnimationAdapterCompat(
-                            new WrappedLauncherAnimationRunner<>(mHandler, mWallpaperOpenRunner,
+                            new LauncherAnimationRunner(mHandler, mWallpaperOpenRunner,
                                     false /* startAtFrontOfQueue */),
                             CLOSING_TRANSITION_DURATION_MS, 0 /* statusBarTransitionDelay */));
 
@@ -1015,7 +1016,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                 definition.addRemoteAnimation(
                         WindowManagerWrapper.TRANSIT_KEYGUARD_GOING_AWAY_ON_WALLPAPER,
                         new RemoteAnimationAdapterCompat(
-                                new WrappedLauncherAnimationRunner<>(
+                                new LauncherAnimationRunner(
                                         mHandler, mKeyguardGoingAwayRunner,
                                         true /* startAtFrontOfQueue */),
                                 CLOSING_TRANSITION_DURATION_MS, 0 /* statusBarTransitionDelay */));
@@ -1035,7 +1036,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
         if (hasControlRemoteAppTransitionPermission()) {
             mWallpaperOpenTransitionRunner = createWallpaperOpenRunner(false /* fromUnlock */);
             mLauncherOpenTransition = RemoteAnimationAdapterCompat.buildRemoteTransition(
-                    new WrappedLauncherAnimationRunner<>(mHandler, mWallpaperOpenTransitionRunner,
+                    new LauncherAnimationRunner(mHandler, mWallpaperOpenTransitionRunner,
                             false /* startAtFrontOfQueue */));
             mLauncherOpenTransition.addHomeOpenCheck();
             SystemUiProxy.INSTANCE.getNoCreate().registerRemoteTransition(mLauncherOpenTransition);
@@ -1085,7 +1086,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
      * @return Runner that plays when user goes to Launcher
      *         ie. pressing home, swiping up from nav bar.
      */
-    WrappedAnimationRunnerImpl createWallpaperOpenRunner(boolean fromUnlock) {
+    RemoteAnimationFactory createWallpaperOpenRunner(boolean fromUnlock) {
         return new WallpaperOpenLauncherAnimationRunner(mHandler, fromUnlock);
     }
 
@@ -1235,7 +1236,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
     /**
      * Remote animation runner for animation from the app to Launcher, including recents.
      */
-    protected class WallpaperOpenLauncherAnimationRunner implements WrappedAnimationRunnerImpl {
+    protected class WallpaperOpenLauncherAnimationRunner implements RemoteAnimationFactory {
 
         private final Handler mHandler;
         private final boolean mFromUnlock;
@@ -1323,17 +1324,12 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
     /**
      * Remote animation runner for animation to launch an app.
      */
-    private class AppLaunchAnimationRunner implements WrappedAnimationRunnerImpl {
+    private class AppLaunchAnimationRunner implements RemoteAnimationFactory {
 
-        private static final String TRANSITION_LAUNCH_FROM_RECENTS = "transition:LaunchFromRecents";
-        private static final String TRANSITION_LAUNCH_FROM_ICON = "transition:LaunchFromIcon";
-
-        private final Handler mHandler;
         private final View mV;
         private final RunnableList mOnEndCallback;
 
-        AppLaunchAnimationRunner(Handler handler, View v, RunnableList onEndCallback) {
-            mHandler = handler;
+        AppLaunchAnimationRunner(View v, RunnableList onEndCallback) {
             mV = v;
             mOnEndCallback = onEndCallback;
         }
@@ -1377,6 +1373,11 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
             result.setAnimation(anim, mLauncher, mOnEndCallback::executeAllAndDestroy,
                     skipFirstFrame);
         }
+
+        @Override
+        public void onAnimationCancelled() {
+            mOnEndCallback.executeAllAndDestroy();
+        }
     }
 
     /**
diff --git a/quickstep/src/com/android/launcher3/WrappedAnimationRunnerImpl.java b/quickstep/src/com/android/launcher3/WrappedAnimationRunnerImpl.java
deleted file mode 100644
index 16727ecfda..0000000000
--- a/quickstep/src/com/android/launcher3/WrappedAnimationRunnerImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3;
-
-import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
-
-/**
- * Used with WrappedLauncherAnimationRunner as an interface for the runner to call back to the
- * implementation.
- */
-public interface WrappedAnimationRunnerImpl {
-
-    void onCreateAnimation(int transit,
-            RemoteAnimationTargetCompat[] appTargets,
-            RemoteAnimationTargetCompat[] wallpaperTargets,
-            RemoteAnimationTargetCompat[] nonAppTargets,
-            LauncherAnimationRunner.AnimationResult result);
-}
diff --git a/quickstep/src/com/android/launcher3/WrappedLauncherAnimationRunner.java b/quickstep/src/com/android/launcher3/WrappedLauncherAnimationRunner.java
deleted file mode 100644
index fcf9857649..0000000000
--- a/quickstep/src/com/android/launcher3/WrappedLauncherAnimationRunner.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher3;
-
-import android.os.Handler;
-
-import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
-
-import java.lang.ref.WeakReference;
-
-/**
- * This class is needed to wrap any animation runner that is a part of the
- * RemoteAnimationDefinition:
- * - Launcher creates a new instance of the LauncherAppTransitionManagerImpl whenever it is
- *   created, which in turn registers a new definition
- * - When the definition is registered, window manager retains a strong binder reference to the
- *   runner passed in
- * - If the Launcher activity is recreated, the new definition registered will replace the old
- *   reference in the system's activity record, but until the system server is GC'd, the binder
- *   reference will still exist, which references the runner in the Launcher process, which
- *   references the (old) Launcher activity through this class
- *
- * Instead we make the runner provided to the definition static only holding a weak reference to
- * the runner implementation.  When this animation manager is destroyed, we remove the Launcher
- * reference to the runner, leaving only the weak ref from the runner.
- */
-public class WrappedLauncherAnimationRunner<R extends WrappedAnimationRunnerImpl>
-        extends LauncherAnimationRunner {
-    private WeakReference<R> mImpl;
-
-    public WrappedLauncherAnimationRunner(
-            Handler handler, R animationRunnerImpl, boolean startAtFrontOfQueue) {
-        super(handler, startAtFrontOfQueue);
-        mImpl = new WeakReference<>(animationRunnerImpl);
-    }
-
-    @Override
-    public void onCreateAnimation(int transit,
-            RemoteAnimationTargetCompat[] appTargets,
-            RemoteAnimationTargetCompat[] wallpaperTargets,
-            RemoteAnimationTargetCompat[] nonAppTargets,
-            AnimationResult result) {
-        R animationRunnerImpl = mImpl.get();
-        if (animationRunnerImpl != null) {
-            animationRunnerImpl.onCreateAnimation(transit, appTargets, wallpaperTargets,
-                    nonAppTargets, result);
-        } else {
-            result.setAnimation(null, null);
-        }
-    }
-}
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
index d15113184d..50038d9252 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
@@ -56,7 +56,7 @@ class QuickstepInteractionHandler implements RemoteViews.InteractionHandler {
         }
         Pair<Intent, ActivityOptions> options = remoteResponse.getLaunchOptions(view);
         ActivityOptionsWrapper activityOptions = mLauncher.getAppTransitionManager()
-                .getActivityLaunchOptions(mLauncher, hostView);
+                .getActivityLaunchOptions(hostView);
         if (Utilities.ATLEAST_S && !pendingIntent.isActivity()) {
             // In the event this pending intent eventually launches an activity, i.e. a trampoline,
             // use the Quickstep transition animation.
diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index 3d66823c98..9d99f97a3d 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -49,9 +49,8 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherAnimationRunner;
 import com.android.launcher3.LauncherAnimationRunner.AnimationResult;
+import com.android.launcher3.LauncherAnimationRunner.RemoteAnimationFactory;
 import com.android.launcher3.R;
-import com.android.launcher3.WrappedAnimationRunnerImpl;
-import com.android.launcher3.WrappedLauncherAnimationRunner;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.anim.PendingAnimation;
@@ -109,7 +108,7 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
     private StateManager<RecentsState> mStateManager;
 
     // Strong refs to runners which are cleared when the activity is destroyed
-    private WrappedAnimationRunnerImpl mActivityLaunchAnimationRunner;
+    private RemoteAnimationFactory mActivityLaunchAnimationRunner;
 
     /**
      * Init drag layer and overview panel views.
@@ -206,19 +205,25 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
         final TaskView taskView = (TaskView) v;
         RunnableList onEndCallback = new RunnableList();
 
-        mActivityLaunchAnimationRunner = (int transit,
-                    RemoteAnimationTargetCompat[] appTargets,
+        mActivityLaunchAnimationRunner = new RemoteAnimationFactory() {
+            @Override
+            public void onCreateAnimation(int transit, RemoteAnimationTargetCompat[] appTargets,
                     RemoteAnimationTargetCompat[] wallpaperTargets,
-                    RemoteAnimationTargetCompat[] nonAppTargets,
-                    AnimationResult result) -> {
-            AnimatorSet anim = composeRecentsLaunchAnimator(taskView, appTargets,
-                    wallpaperTargets, nonAppTargets);
-            anim.addListener(resetStateListener());
-            result.setAnimation(anim, RecentsActivity.this, onEndCallback::executeAllAndDestroy,
-                    true /* skipFirstFrame */);
+                    RemoteAnimationTargetCompat[] nonAppTargets, AnimationResult result) {
+                AnimatorSet anim = composeRecentsLaunchAnimator(taskView, appTargets,
+                        wallpaperTargets, nonAppTargets);
+                anim.addListener(resetStateListener());
+                result.setAnimation(anim, RecentsActivity.this, onEndCallback::executeAllAndDestroy,
+                        true /* skipFirstFrame */);
+            }
+
+            @Override
+            public void onAnimationCancelled() {
+                onEndCallback.executeAllAndDestroy();
+            }
         };
 
-        final LauncherAnimationRunner wrapper = new WrappedLauncherAnimationRunner<>(
+        final LauncherAnimationRunner wrapper = new LauncherAnimationRunner(
                 mUiHandler, mActivityLaunchAnimationRunner, true /* startAtFrontOfQueue */);
         RemoteAnimationAdapterCompat adapterCompat = new RemoteAnimationAdapterCompat(
                 wrapper, RECENTS_LAUNCH_DURATION,
@@ -362,34 +367,37 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
     }
 
     private void startHomeInternal() {
-        WrappedLauncherAnimationRunner runner = new WrappedLauncherAnimationRunner(
-                getMainThreadHandler(), this::onCreateAnimationToHome, true);
+        LauncherAnimationRunner runner = new LauncherAnimationRunner(
+                getMainThreadHandler(), mAnimationToHomeFactory, true);
         RemoteAnimationAdapterCompat adapterCompat =
                 new RemoteAnimationAdapterCompat(runner, HOME_APPEAR_DURATION, 0);
         startActivity(createHomeIntent(),
                 ActivityOptionsCompat.makeRemoteAnimation(adapterCompat).toBundle());
     }
 
-    private void onCreateAnimationToHome(
-            int transit, RemoteAnimationTargetCompat[] appTargets,
-            RemoteAnimationTargetCompat[] wallpaperTargets,
-            RemoteAnimationTargetCompat[] nonAppTargets, AnimationResult result) {
-        AnimatorPlaybackController controller = getStateManager()
-                .createAnimationToNewWorkspace(RecentsState.BG_LAUNCHER, HOME_APPEAR_DURATION);
-        controller.dispatchOnStart();
-
-        RemoteAnimationTargets targets = new RemoteAnimationTargets(
-                appTargets, wallpaperTargets, nonAppTargets, MODE_OPENING);
-        for (RemoteAnimationTargetCompat app : targets.apps) {
-            new Transaction().setAlpha(app.leash.getSurfaceControl(), 1).apply();
+    private final RemoteAnimationFactory mAnimationToHomeFactory =
+            new RemoteAnimationFactory() {
+        @Override
+        public void onCreateAnimation(int transit, RemoteAnimationTargetCompat[] appTargets,
+                RemoteAnimationTargetCompat[] wallpaperTargets,
+                RemoteAnimationTargetCompat[] nonAppTargets, AnimationResult result) {
+            AnimatorPlaybackController controller = getStateManager()
+                    .createAnimationToNewWorkspace(RecentsState.BG_LAUNCHER, HOME_APPEAR_DURATION);
+            controller.dispatchOnStart();
+
+            RemoteAnimationTargets targets = new RemoteAnimationTargets(
+                    appTargets, wallpaperTargets, nonAppTargets, MODE_OPENING);
+            for (RemoteAnimationTargetCompat app : targets.apps) {
+                new Transaction().setAlpha(app.leash.getSurfaceControl(), 1).apply();
+            }
+            AnimatorSet anim = new AnimatorSet();
+            anim.play(controller.getAnimationPlayer());
+            anim.setDuration(HOME_APPEAR_DURATION);
+            result.setAnimation(anim, RecentsActivity.this,
+                    () -> getStateManager().goToState(RecentsState.HOME, false),
+                    true /* skipFirstFrame */);
         }
-        AnimatorSet anim = new AnimatorSet();
-        anim.play(controller.getAnimationPlayer());
-        anim.setDuration(HOME_APPEAR_DURATION);
-        result.setAnimation(anim, this,
-                () -> getStateManager().goToState(RecentsState.HOME, false),
-                true /* skipFirstFrame */);
-    }
+    };
 
     @Override
     protected void collectStateHandlers(List<StateHandler> out) {
diff --git a/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java b/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java
index 5c6da1611f..98dbd47ba4 100644
--- a/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java
+++ b/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java
@@ -21,15 +21,14 @@ import android.content.Context;
 import android.os.Handler;
 
 import com.android.launcher3.LauncherAnimationRunner;
-import com.android.launcher3.WrappedAnimationRunnerImpl;
-import com.android.launcher3.WrappedLauncherAnimationRunner;
+import com.android.launcher3.LauncherAnimationRunner.RemoteAnimationFactory;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
 import com.android.systemui.shared.system.RemoteAnimationAdapterCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
 public abstract class RemoteAnimationProvider {
 
-    WrappedAnimationRunnerImpl mAnimationRunner;
+    RemoteAnimationFactory mAnimationRunner;
 
     public abstract AnimatorSet createWindowAnimation(RemoteAnimationTargetCompat[] appTargets,
             RemoteAnimationTargetCompat[] wallpaperTargets);
@@ -37,7 +36,7 @@ public abstract class RemoteAnimationProvider {
     ActivityOptions toActivityOptions(Handler handler, long duration, Context context) {
         mAnimationRunner = (transit, appTargets, wallpaperTargets, nonApps, result) ->
                 result.setAnimation(createWindowAnimation(appTargets, wallpaperTargets), context);
-        final LauncherAnimationRunner wrapper = new WrappedLauncherAnimationRunner(
+        final LauncherAnimationRunner wrapper = new LauncherAnimationRunner(
                 handler, mAnimationRunner, false /* startAtFrontOfQueue */);
         return ActivityOptionsCompat.makeRemoteAnimation(
                 new RemoteAnimationAdapterCompat(wrapper, duration, 0));
diff --git a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
index 3d33e57a36..a147b6808c 100644
--- a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
+++ b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
@@ -41,9 +41,8 @@ import com.android.launcher3.BaseQuickstepLauncher;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.InsettableFrameLayout;
 import com.android.launcher3.LauncherAnimationRunner;
+import com.android.launcher3.LauncherAnimationRunner.RemoteAnimationFactory;
 import com.android.launcher3.R;
-import com.android.launcher3.WrappedAnimationRunnerImpl;
-import com.android.launcher3.WrappedLauncherAnimationRunner;
 import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
 import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.TaskAnimationManager;
@@ -101,14 +100,14 @@ public class SplitSelectStateController {
             return;
         }
         // Assume initial mInitialTaskId is for top/left part of screen
-        WrappedAnimationRunnerImpl initialSplitRunnerWrapped =  new SplitLaunchAnimationRunner(
+        RemoteAnimationFactory initialSplitRunnerWrapped =  new SplitLaunchAnimationRunner(
                 mInitialTaskView, 0);
-        WrappedAnimationRunnerImpl secondarySplitRunnerWrapped =  new SplitLaunchAnimationRunner(
+        RemoteAnimationFactory secondarySplitRunnerWrapped =  new SplitLaunchAnimationRunner(
                 taskView, 1);
-        RemoteAnimationRunnerCompat initialSplitRunner = new WrappedLauncherAnimationRunner(
+        RemoteAnimationRunnerCompat initialSplitRunner = new LauncherAnimationRunner(
                 new Handler(Looper.getMainLooper()), initialSplitRunnerWrapped,
                 true /* startAtFrontOfQueue */);
-        RemoteAnimationRunnerCompat secondarySplitRunner = new WrappedLauncherAnimationRunner(
+        RemoteAnimationRunnerCompat secondarySplitRunner = new LauncherAnimationRunner(
                 new Handler(Looper.getMainLooper()), secondarySplitRunnerWrapped,
                 true /* startAtFrontOfQueue */);
         ActivityOptions initialOptions = ActivityOptionsCompat.makeRemoteAnimation(
@@ -192,7 +191,7 @@ public class SplitSelectStateController {
      * LEGACY
      * Remote animation runner for animation to launch an app.
      */
-    private class SplitLaunchAnimationRunner implements WrappedAnimationRunnerImpl {
+    private class SplitLaunchAnimationRunner implements RemoteAnimationFactory {
 
         private final TaskView mV;
         private final int mTargetState;
-- 
GitLab


From a6c38be150681f537ef316a56867387309861768 Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Mon, 21 Jun 2021 16:27:11 -0700
Subject: [PATCH 1456/1664] Apply depth even when surface is null

We need to update mDepth even when the surface is null, otherwise
events will be ignored and mDepth will have the wrong value when
waking up from screen-off.

Test: pull up app drawer, screen off, unlock
Test: go to overview, screen off, unlock
Test: launch app, observe blurs and zoom
Fixes: 191153501
Change-Id: I33f5d84a50e24f05a09769b1f7f3c27969f847cd
---
 .../statehandlers/DepthController.java        | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
index 5b4e5f24d5..e6333d196b 100644
--- a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
+++ b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
@@ -161,14 +161,14 @@ public class DepthController implements StateHandler<LauncherState>,
         if (mSurface != surface) {
             mSurface = surface;
             if (surface != null) {
-                dispatchTransactionSurface(mDepth);
+                dispatchTransactionSurface();
             }
         }
     }
 
     @Override
     public void setState(LauncherState toState) {
-        if (mSurface == null || mIgnoreStateChangesDuringMultiWindowAnimation) {
+        if (mIgnoreStateChangesDuringMultiWindowAnimation) {
             return;
         }
 
@@ -176,7 +176,7 @@ public class DepthController implements StateHandler<LauncherState>,
         if (Float.compare(mDepth, toDepth) != 0) {
             setDepth(toDepth);
         } else if (toState == LauncherState.OVERVIEW) {
-            dispatchTransactionSurface(mDepth);
+            dispatchTransactionSurface();
         }
     }
 
@@ -202,35 +202,30 @@ public class DepthController implements StateHandler<LauncherState>,
         if (Float.compare(mDepth, depthF) == 0) {
             return;
         }
-        if (dispatchTransactionSurface(depthF)) {
-            mDepth = depthF;
-        }
+        mDepth = depthF;
+        dispatchTransactionSurface();
     }
 
-    private boolean dispatchTransactionSurface(float depth) {
+    private void dispatchTransactionSurface() {
         boolean supportsBlur = BlurUtils.supportsBlursOnWindows();
-        if (supportsBlur && (mSurface == null || !mSurface.isValid())) {
-            return false;
-        }
         ensureDependencies();
         IBinder windowToken = mLauncher.getRootView().getWindowToken();
         if (windowToken != null) {
-            mWallpaperManager.setWallpaperZoomOut(windowToken, depth);
+            mWallpaperManager.setWallpaperZoomOut(windowToken, mDepth);
         }
 
-        if (supportsBlur) {
+        if (supportsBlur && (mSurface != null && mSurface.isValid())) {
             // We cannot mark the window as opaque in overview because there will be an app window
             // below the launcher layer, and we need to draw it -- without blurs.
             boolean isOverview = mLauncher.isInState(LauncherState.OVERVIEW);
             boolean opaque = mLauncher.getScrimView().isFullyOpaque() && !isOverview;
 
-            int blur = opaque || isOverview ? 0 : (int) (depth * mMaxBlurRadius);
+            int blur = opaque || isOverview ? 0 : (int) (mDepth * mMaxBlurRadius);
             new SurfaceControl.Transaction()
                     .setBackgroundBlurRadius(mSurface, blur)
                     .setOpaque(mSurface, opaque)
                     .apply();
         }
-        return true;
     }
 
     @Override
-- 
GitLab


From 02bbd80ee959d511f9c3afe6905364cf3f6cbcd2 Mon Sep 17 00:00:00 2001
From: Jon Spivack <spivack@google.com>
Date: Mon, 21 Jun 2021 16:49:40 -0700
Subject: [PATCH 1457/1664] NIU Actions: More specific permissions error codes

The user must enable two different Assistant permissions for the NIU Actions feature to function. Previously, a single error code was sent if either permission was missing. Now a different code is sent depending on which permission is missing, allowing Google Go to better direct the user to the proper setting.

Bug: 191109150
Test: Manual (Pixel 3A)
Test: m -j RunLauncherGoGoogleRoboTests
Change-Id: Id301ffddf36b992b5722c52ccc6e597e003942dd
---
 .../quickstep/TaskOverlayFactoryGo.java       | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
index 3a6e9b57cc..b823c36501 100644
--- a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
+++ b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
@@ -51,7 +51,8 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
     public static final String ACTIONS_URL = "niu_actions_app_url";
     public static final String ACTIONS_APP_PACKAGE = "niu_actions_app_package";
     public static final String ACTIONS_ERROR_CODE = "niu_actions_app_error_code";
-    public static final int ERROR_PERMISSIONS = 1;
+    public static final int ERROR_PERMISSIONS_STRUCTURE = 1;
+    public static final int ERROR_PERMISSIONS_SCREENSHOT = 2;
     private static final String TAG = "TaskOverlayFactoryGo";
 
     private AssistContentRequester mContentRequester;
@@ -75,7 +76,8 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
         private String mNIUPackageName;
         private String mTaskPackageName;
         private String mWebUrl;
-        private boolean mAssistPermissionsEnabled;
+        private boolean mAssistStructurePermitted;
+        private boolean mAssistScreenshotPermitted;
         private AssistContentRequester mFactoryContentRequester;
 
         private TaskOverlayGo(TaskThumbnailView taskThumbnailView,
@@ -104,7 +106,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
             getActionsView().setCallbacks(new OverlayUICallbacksGoImpl(isAllowedByPolicy, task));
             mTaskPackageName = task.key.getPackageName();
 
-            if (!mAssistPermissionsEnabled) {
+            if (!mAssistStructurePermitted || !mAssistScreenshotPermitted) {
                 return;
             }
 
@@ -131,10 +133,14 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
         private void sendNIUIntent(String actionType) {
             Intent intent = createNIUIntent(actionType);
             // Only add and send the image if the appropriate permissions are held
-            if (mAssistPermissionsEnabled) {
+            if (mAssistStructurePermitted && mAssistScreenshotPermitted) {
                 mImageApi.shareAsDataWithExplicitIntent(/* crop */ null, intent);
             } else {
-                intent.putExtra(ACTIONS_ERROR_CODE, ERROR_PERMISSIONS);
+                // If both permissions are disabled, the structure error code takes priority
+                // The user must enable that one before they can enable screenshots
+                int code = mAssistStructurePermitted ? ERROR_PERMISSIONS_SCREENSHOT
+                        : ERROR_PERMISSIONS_STRUCTURE;
+                intent.putExtra(ACTIONS_ERROR_CODE, code);
                 try {
                     mApplicationContext.startActivity(intent);
                 } catch (ActivityNotFoundException e) {
@@ -164,11 +170,10 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
         @VisibleForTesting
         public void checkSettings() {
             ContentResolver contentResolver = mApplicationContext.getContentResolver();
-            boolean structureEnabled = Settings.Secure.getInt(contentResolver,
+            mAssistStructurePermitted = Settings.Secure.getInt(contentResolver,
                     Settings.Secure.ASSIST_STRUCTURE_ENABLED, 1) != 0;
-            boolean screenshotEnabled = Settings.Secure.getInt(contentResolver,
+            mAssistScreenshotPermitted = Settings.Secure.getInt(contentResolver,
                     Settings.Secure.ASSIST_SCREENSHOT_ENABLED, 1) != 0;
-            mAssistPermissionsEnabled = structureEnabled && screenshotEnabled;
 
             String assistantPackage =
                     Settings.Secure.getString(contentResolver, Settings.Secure.ASSISTANT);
-- 
GitLab


From 2c815020286b54aba7c2265950bcc048492b893f Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Mon, 21 Jun 2021 19:21:40 -0700
Subject: [PATCH 1458/1664] Improving TAPL diagnostics

Test: presubmit
Bug: 187761685
Change-Id: Ib8e965862c6accb393681c8b3ede60c7f9d26e48
---
 .../com/android/launcher3/tapl/AppIcon.java   |  5 +++
 .../launcher3/tapl/AppIconMenuItem.java       |  7 +++-
 .../android/launcher3/tapl/Launchable.java    | 38 +++++++++++--------
 .../tapl/LauncherInstrumentation.java         |  2 +-
 .../com/android/launcher3/tapl/Widget.java    |  5 +++
 5 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/AppIcon.java b/tests/tapl/com/android/launcher3/tapl/AppIcon.java
index 57fd08ae2c..21099b4934 100644
--- a/tests/tapl/com/android/launcher3/tapl/AppIcon.java
+++ b/tests/tapl/com/android/launcher3/tapl/AppIcon.java
@@ -75,4 +75,9 @@ public final class AppIcon extends Launchable {
     protected void expectActivityStartEvents() {
         mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, LauncherInstrumentation.EVENT_START);
     }
+
+    @Override
+    protected String launchableType() {
+        return "app icon";
+    }
 }
diff --git a/tests/tapl/com/android/launcher3/tapl/AppIconMenuItem.java b/tests/tapl/com/android/launcher3/tapl/AppIconMenuItem.java
index a40919b1bd..ac0db0876c 100644
--- a/tests/tapl/com/android/launcher3/tapl/AppIconMenuItem.java
+++ b/tests/tapl/com/android/launcher3/tapl/AppIconMenuItem.java
@@ -20,8 +20,6 @@ import androidx.test.uiautomator.UiObject2;
 
 import com.android.launcher3.testing.TestProtocol;
 
-import java.util.regex.Pattern;
-
 /**
  * Menu item in an app icon menu.
  */
@@ -51,4 +49,9 @@ public class AppIconMenuItem extends Launchable {
     protected void expectActivityStartEvents() {
         mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, LauncherInstrumentation.EVENT_START);
     }
+
+    @Override
+    protected String launchableType() {
+        return "app icon menu item";
+    }
 }
diff --git a/tests/tapl/com/android/launcher3/tapl/Launchable.java b/tests/tapl/com/android/launcher3/tapl/Launchable.java
index c4a566b2c0..ec0a740dca 100644
--- a/tests/tapl/com/android/launcher3/tapl/Launchable.java
+++ b/tests/tapl/com/android/launcher3/tapl/Launchable.java
@@ -53,23 +53,29 @@ abstract class Launchable {
 
     protected abstract void expectActivityStartEvents();
 
+    protected abstract String launchableType();
+
     private Background launch(BySelector selector) {
-        LauncherInstrumentation.log("Launchable.launch before click " +
-                mObject.getVisibleCenter() + " in " + mLauncher.getVisibleBounds(mObject));
-        final String label = mObject.getText();
-
-        mLauncher.executeAndWaitForEvent(
-                () -> {
-                    mLauncher.clickLauncherObject(mObject);
-                    expectActivityStartEvents();
-                },
-                event -> event.getEventType() == TYPE_WINDOW_STATE_CHANGED,
-                () -> "Launching an app didn't open a new window: " + label);
-
-        mLauncher.assertTrue(
-                "App didn't start: " + label + " (" + selector + ")",
-                TestHelpers.wait(Until.hasObject(selector), LauncherInstrumentation.WAIT_TIME_MS));
-        return new Background(mLauncher);
+        try (LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
+                "clicking " + launchableType())) {
+            LauncherInstrumentation.log("Launchable.launch before click "
+                    + mObject.getVisibleCenter() + " in " + mLauncher.getVisibleBounds(mObject));
+            final String label = mObject.getText();
+
+            mLauncher.executeAndWaitForEvent(
+                    () -> {
+                        mLauncher.clickLauncherObject(mObject);
+                        expectActivityStartEvents();
+                    },
+                    event -> event.getEventType() == TYPE_WINDOW_STATE_CHANGED,
+                    () -> "Launching an app didn't open a new window: " + label);
+
+            mLauncher.assertTrue(
+                    "App didn't start: " + label + " (" + selector + ")",
+                    TestHelpers.wait(Until.hasObject(selector),
+                            LauncherInstrumentation.WAIT_TIME_MS));
+            return new Background(mLauncher);
+        }
     }
 
     /**
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 96e82224b1..1332df3512 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -499,7 +499,7 @@ public final class LauncherInstrumentation {
     private void fail(String message) {
         checkForAnomaly();
         Assert.fail(formatSystemHealthMessage(formatErrorWithEvents(
-                "http://go/tapl test failure:\nSummary: " + getContextDescription()
+                "http://go/tapl test failure:\nContext: " + getContextDescription()
                         + " - visible state is " + getVisibleStateMessage()
                         + ";\nDetails: " + message, true)));
     }
diff --git a/tests/tapl/com/android/launcher3/tapl/Widget.java b/tests/tapl/com/android/launcher3/tapl/Widget.java
index 53ef796c90..35203185ed 100644
--- a/tests/tapl/com/android/launcher3/tapl/Widget.java
+++ b/tests/tapl/com/android/launcher3/tapl/Widget.java
@@ -46,4 +46,9 @@ public final class Widget extends Launchable {
     protected void addExpectedEventsForLongClick() {
         mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, LONG_CLICK_EVENT);
     }
+
+    @Override
+    protected String launchableType() {
+        return "widget";
+    }
 }
-- 
GitLab


From 8af0dd3e0cce1bcc4bb69631ca5111d0e548793b Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Mon, 24 May 2021 00:31:10 -0700
Subject: [PATCH 1459/1664] Null check on target set before rendering task open
 animation

Fixes: 190854921
Test: N/A
Change-Id: Iae7ef7cf3f4d2309223bfabe6d40f24b7e34439c
---
 .../com/android/quickstep/views/TaskView.java | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index b2a7b1b85d..ae429d91d8 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -554,7 +554,13 @@ public class TaskView extends FrameLayout implements Reusable {
 
             mIsClickableAsLiveTile = false;
             RecentsView recentsView = getRecentsView();
-            RemoteAnimationTargets targets = recentsView.getLiveTileParams().getTargetSet();
+            final RemoteAnimationTargets targets = recentsView.getLiveTileParams().getTargetSet();
+            if (targets == null) {
+                // If the recents animation is cancelled somehow between the parent if block and
+                // here, try to launch the task as a non live tile task.
+                launcherNonLiveTileTask();
+                return;
+            }
 
             AnimatorSet anim = new AnimatorSet();
             TaskViewUtils.composeRecentsLaunchAnimator(
@@ -576,17 +582,21 @@ public class TaskView extends FrameLayout implements Reusable {
             });
             anim.start();
         } else {
-            if (mActivity.isInState(OVERVIEW_SPLIT_SELECT)) {
-                // User tapped to select second split screen app
-                getRecentsView().confirmSplitSelect(this);
-            } else {
-                launchTaskAnimated();
-            }
+            launcherNonLiveTileTask();
         }
         mActivity.getStatsLogManager().logger().withItemInfo(getItemInfo())
                 .log(LAUNCHER_TASK_LAUNCH_TAP);
     }
 
+    private void launcherNonLiveTileTask() {
+        if (mActivity.isInState(OVERVIEW_SPLIT_SELECT)) {
+            // User tapped to select second split screen app
+            getRecentsView().confirmSplitSelect(this);
+        } else {
+            launchTaskAnimated();
+        }
+    }
+
     /**
      * Starts the task associated with this view and animates the startup.
      * @return CompletionStage to indicate the animation completion or null if the launch failed.
-- 
GitLab


From 263a00c73884076189fdf65451f71d112a715eda Mon Sep 17 00:00:00 2001
From: Cyrus Boadway <boadway@google.com>
Date: Tue, 22 Jun 2021 09:22:33 +0000
Subject: [PATCH 1460/1664] Suppress Splash Screen on widget reconfiguration
 activity start

When a widget configuration activity is started, it's started from
the launcher. Under some circumstances the launcher's splash screen
would be shown, rather than the splash screen corresponding to the
tapped app.

To avoid confusion, we suppress the splash screen for configuration
starts.

Bug: 190153065
Test: manual
Change-Id: Ib18851f1bb50b64bc5d47b8aa5931490c969b54b
---
 .../android/launcher3/widget/LauncherAppWidgetHost.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHost.java b/src/com/android/launcher3/widget/LauncherAppWidgetHost.java
index 6dc69712dc..fe83f3f606 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetHost.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHost.java
@@ -60,6 +60,10 @@ public class LauncherAppWidgetHost extends AppWidgetHost {
     private static final int FLAG_ACTIVITY_RESUMED = 1 << 3;
     private static final int FLAGS_SHOULD_LISTEN =
             FLAG_STATE_IS_NORMAL | FLAG_ACTIVITY_STARTED | FLAG_ACTIVITY_RESUMED;
+    // TODO(b/191735836): Replace with ActivityOptions.KEY_SPLASH_SCREEN_STYLE when un-hidden
+    private static final String KEY_SPLASH_SCREEN_STYLE = "android.activity.splashScreenStyle";
+    // TODO(b/191735836): Replace with SplashScreen.SPLASH_SCREEN_STYLE_EMPTY when un-hidden
+    private static final int SPLASH_SCREEN_STYLE_EMPTY = 0;
 
     public static final int APPWIDGET_HOST_ID = 1024;
 
@@ -329,7 +333,9 @@ public class LauncherAppWidgetHost extends AppWidgetHost {
         if (view == null) return null;
         Object tag = view.getTag();
         if (!(tag instanceof ItemInfo)) return null;
-        return activity.getActivityLaunchOptions(view, (ItemInfo) tag).toBundle();
+        Bundle bundle = activity.getActivityLaunchOptions(view, (ItemInfo) tag).toBundle();
+        bundle.putInt(KEY_SPLASH_SCREEN_STYLE, SPLASH_SCREEN_STYLE_EMPTY);
+        return bundle;
     }
 
     private void sendActionCancelled(final BaseActivity activity, final int requestCode) {
-- 
GitLab


From f158ec33d8ef409a6c2d4c9f4c4731e16b59ee81 Mon Sep 17 00:00:00 2001
From: Cyrus Boadway <boadway@google.com>
Date: Tue, 22 Jun 2021 10:14:06 +0000
Subject: [PATCH 1461/1664] Use icon splash screen when starting activity from
 widget interaction

Set the flag to use the icon splash screen rather than the empty splash
screen when starting an activity from a widget interaction.

Bug: 191738655
Test: manual
Change-Id: Iff771a43648bbf6dfb88e2a6749c4526fd17da07
---
 .../launcher3/uioverrides/QuickstepInteractionHandler.java      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
index d15113184d..5e9515d0d3 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
@@ -26,6 +26,7 @@ import android.util.Log;
 import android.util.Pair;
 import android.view.View;
 import android.widget.RemoteViews;
+import android.window.SplashScreen;
 
 import com.android.launcher3.Utilities;
 import com.android.launcher3.logging.StatsLogManager;
@@ -70,6 +71,7 @@ class QuickstepInteractionHandler implements RemoteViews.InteractionHandler {
             }
         }
         activityOptions.options.setPendingIntentLaunchFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        activityOptions.options.setSplashscreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_ICON);
         Object itemInfo = hostView.getTag();
         if (itemInfo instanceof ItemInfo) {
             mLauncher.addLaunchCookie((ItemInfo) itemInfo, activityOptions.options);
-- 
GitLab


From eeac1aba306b4593df0d7290eeb57ed52a07f4be Mon Sep 17 00:00:00 2001
From: Matt Casey <mrcasey@google.com>
Date: Tue, 22 Jun 2021 10:14:10 -0400
Subject: [PATCH 1462/1664] Send a zero for assist invocation on animation end

When a corner gesture doesn't complete, we animate the progress from its
current value back to 0. When it hits 0, sysui will perform some cleanup
e.g. removing the window. However, it's possible the animator won't
return exactly 0 and will complete, so we should send an explicit 0
whenever the animator completes.

Bug: 187768368
Test: We don't have a repro for the bug, but expect this should be more
      robust. Tested to validate it didn't regress.
Change-Id: Id65f94534363c326fc2c8d0a9114a3c036aa55e4
---
 .../inputconsumers/AssistantInputConsumer.java         | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java
index a3cd7dffb2..510820a1e5 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java
@@ -26,6 +26,8 @@ import static android.view.MotionEvent.ACTION_UP;
 
 import static com.android.launcher3.Utilities.squaredHypot;
 
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
 import android.animation.ValueAnimator;
 import android.content.Context;
 import android.content.res.Resources;
@@ -199,6 +201,14 @@ public class AssistantInputConsumer extends DelegateInputConsumer {
                         float progress = (float) valueAnimator.getAnimatedValue();
                         SystemUiProxy.INSTANCE.get(mContext).onAssistantProgress(progress);
                     });
+                    // Ensure that we always send a zero at the end to clear the invocation state.
+                    animator.addListener(new AnimatorListenerAdapter() {
+                        @Override
+                        public void onAnimationEnd(Animator animation) {
+                            super.onAnimationEnd(animation);
+                            SystemUiProxy.INSTANCE.get(mContext).onAssistantProgress(0f);
+                        }
+                    });
                     animator.setInterpolator(Interpolators.DEACCEL_2);
                     animator.start();
                 }
-- 
GitLab


From 267e9b0c043df9aaa27944152937f5227d04eb3c Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Tue, 22 Jun 2021 09:11:01 +0100
Subject: [PATCH 1463/1664] Rename strings for no search results and no widgets
 in widget picker.

Also update text size and font.

Bug: 191732424
Test: Not needed, minor string change
Change-Id: I90f00f1316524c48520c4cfc265ab2d5e78e3281
---
 res/layout/widgets_full_sheet.xml |  2 ++
 res/values/strings.xml            | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/res/layout/widgets_full_sheet.xml b/res/layout/widgets_full_sheet.xml
index dca3e79c62..1b4f3b984e 100644
--- a/res/layout/widgets_full_sheet.xml
+++ b/res/layout/widgets_full_sheet.xml
@@ -33,6 +33,8 @@
             android:layout_height="match_parent"
             android:gravity="center"
             android:visibility="gone"
+            android:fontFamily="sans-serif-medium"
+            android:textSize="20sp"
             tools:text="No widgets available" />
 
         <!-- Fast scroller popup -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 60c0774ff8..3dbd760d1e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -85,12 +85,12 @@
     <!-- Spoken text for screen readers. This text lets a user know that the button is used to clear
          the text that the user entered in the search box. [CHAR_LIMIT=none] -->
     <string name="widgets_full_sheet_cancel_button_description">Clear text from search box</string>
-    <!-- Text shown when there is no widgets shown in the popup view showing all available widgets
-         installed on the device. [CHAR_LIMIT=none] -->
-    <string name="no_widgets_available">No widgets available</string>
-    <!-- Text shown when there are no matching widget search results for user's search query.
+    <!-- Text shown when there are no widgets or shortcuts that can be added to the device.
          [CHAR_LIMIT=none] -->
-    <string name="no_search_results">No search results</string>
+    <string name="no_widgets_available">Widgets and shortcuts aren\'t available</string>
+    <!-- Text shown when there are no matching widget or shortcut search results for user's search
+         query. [CHAR_LIMIT=none] -->
+    <string name="no_search_results">No widgets or shortcuts found</string>
     <!-- Tab label. A user can tap this tab to access their personal widgets. [CHAR_LIMIT=25] -->
     <string name="widgets_full_sheet_personal_tab">Personal</string>
     <!-- Tab label. A user can tap this tab to access their work widgets. [CHAR_LIMIT=25] -->
-- 
GitLab


From fa1e14c4b8c2f28d767f3776923030ef671bfa38 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Mon, 21 Jun 2021 18:05:25 -0700
Subject: [PATCH 1464/1664] Polish folder icon bugs.

- Fix bug where folders are misaligned.
- Fix bug when closing on 2nd page of large folder.

Bug: 184822585
Test: drag folder originally in hotseat to workspace, vice versa
      test on grid where isScalable=true and isScalable=false

Change-Id: I08a79b8d280df3e3974baaa07e80db6bc4165e58
---
 src/com/android/launcher3/CellLayout.java                 | 3 ---
 src/com/android/launcher3/ShortcutAndWidgetContainer.java | 8 +++++---
 .../android/launcher3/folder/FolderAnimationManager.java  | 5 ++---
 src/com/android/launcher3/folder/FolderIcon.java          | 5 -----
 src/com/android/launcher3/folder/PreviewBackground.java   | 3 +--
 5 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index bfa1769ea8..382343793c 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -684,9 +684,6 @@ public class CellLayout extends ViewGroup {
         if (child instanceof BubbleTextView) {
             BubbleTextView bubbleChild = (BubbleTextView) child;
             bubbleChild.setTextVisibility(mContainerType != HOTSEAT);
-            if (mActivity.getDeviceProfile().isScalableGrid) {
-                bubbleChild.setCenterVertically(mContainerType != HOTSEAT);
-            }
         }
 
         child.setScaleX(mChildScale);
diff --git a/src/com/android/launcher3/ShortcutAndWidgetContainer.java b/src/com/android/launcher3/ShortcutAndWidgetContainer.java
index 4579705f5a..2a5187d025 100644
--- a/src/com/android/launcher3/ShortcutAndWidgetContainer.java
+++ b/src/com/android/launcher3/ShortcutAndWidgetContainer.java
@@ -138,12 +138,14 @@ public class ShortcutAndWidgetContainer extends ViewGroup implements FolderIcon.
                     mBorderSpacing, null);
             // Center the icon/folder
             int cHeight = getCellContentHeight();
-            int cellPaddingY = (int) Math.max(0, ((lp.height - cHeight) / 2f));
+            int cellPaddingY = dp.isScalableGrid && mContainerType == WORKSPACE
+                    ? dp.cellYPaddingPx
+                    : (int) Math.max(0, ((lp.height - cHeight) / 2f));
 
             // No need to add padding when cell layout border spacing is present.
-            boolean noPadding = (dp.cellLayoutBorderSpacingPx > 0 && mContainerType == WORKSPACE)
+            boolean noPaddingX = (dp.cellLayoutBorderSpacingPx > 0 && mContainerType == WORKSPACE)
                     || (dp.folderCellLayoutBorderSpacingPx > 0 && mContainerType == FOLDER);
-            int cellPaddingX = noPadding
+            int cellPaddingX = noPaddingX
                     ? 0
                     : mContainerType == WORKSPACE
                             ? dp.workspaceCellPaddingXPx
diff --git a/src/com/android/launcher3/folder/FolderAnimationManager.java b/src/com/android/launcher3/folder/FolderAnimationManager.java
index 4fe85be820..cb3884dc47 100644
--- a/src/com/android/launcher3/folder/FolderAnimationManager.java
+++ b/src/com/android/launcher3/folder/FolderAnimationManager.java
@@ -245,9 +245,8 @@ public class FolderAnimationManager {
                 + mDeviceProfile.folderCellHeightPx * 2;
         int page = mIsOpening ? mContent.getCurrentPage() : mContent.getDestinationPage();
         int left = mContent.getPaddingLeft() + page * lp.width;
-        Rect contentStart = new Rect(0, 0, width, height);
-        Rect contentEnd = new Rect(endRect.left + left, endRect.top, endRect.right + left,
-                endRect.bottom);
+        Rect contentStart = new Rect(left, 0, left + width, height);
+        Rect contentEnd = new Rect(left, 0, left + lp.width, lp.height);
         play(a, getShape().createRevealAnimator(
                 mFolder.getContent(), contentStart, contentEnd, finalRadius, !mIsOpening));
 
diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java
index 5c11451535..25a01414d2 100644
--- a/src/com/android/launcher3/folder/FolderIcon.java
+++ b/src/com/android/launcher3/folder/FolderIcon.java
@@ -174,8 +174,6 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
         folder.setFolderIcon(icon);
         folder.bind(folderInfo);
         icon.setFolder(folder);
-        icon.mBackground.paddingY = icon.isInHotseat()
-                ? 0 : activityContext.getDeviceProfile().cellYPaddingPx;
         return icon;
     }
 
@@ -217,7 +215,6 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
 
         icon.setAccessibilityDelegate(activity.getAccessibilityDelegate());
 
-        icon.mBackground.paddingY = icon.isInHotseat() ? 0 : grid.cellYPaddingPx;
         icon.mPreviewVerifier = new FolderGridOrganizer(activity.getDeviceProfile().inv);
         icon.mPreviewVerifier.setFolderInfo(folderInfo);
         icon.updatePreviewItems(false);
@@ -580,7 +577,6 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
     public void setFolderBackground(PreviewBackground bg) {
         mBackground = bg;
         mBackground.setInvalidateDelegate(this);
-        mBackground.paddingY = isInHotseat() ? 0 : mActivity.getDeviceProfile().cellYPaddingPx;
     }
 
     @Override
@@ -628,7 +624,6 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
         if (!mForceHideDot && ((mDotInfo != null && mDotInfo.hasDot()) || mDotScale > 0)) {
             Rect iconBounds = mDotParams.iconBounds;
             BubbleTextView.getIconBounds(this, iconBounds, mActivity.getDeviceProfile().iconSizePx);
-            iconBounds.offset(0, mBackground.paddingY);
             float iconScale = (float) mBackground.previewSize / iconBounds.width();
             Utilities.scaleRectAboutCenter(iconBounds, iconScale);
 
diff --git a/src/com/android/launcher3/folder/PreviewBackground.java b/src/com/android/launcher3/folder/PreviewBackground.java
index 204decbee4..460521f1a4 100644
--- a/src/com/android/launcher3/folder/PreviewBackground.java
+++ b/src/com/android/launcher3/folder/PreviewBackground.java
@@ -77,7 +77,6 @@ public class PreviewBackground extends CellLayout.DelegatedCellDrawing {
     int previewSize;
     int basePreviewOffsetX;
     int basePreviewOffsetY;
-    int paddingY;
 
     private CellLayout mDrawingDelegate;
 
@@ -161,7 +160,7 @@ public class PreviewBackground extends CellLayout.DelegatedCellDrawing {
         previewSize = grid.folderIconSizePx;
 
         basePreviewOffsetX = (availableSpaceX - previewSize) / 2;
-        basePreviewOffsetY = paddingY + topPadding + grid.folderIconOffsetYPx;
+        basePreviewOffsetY = topPadding + grid.folderIconOffsetYPx;
 
         // Stroke width is 1dp
         mStrokeWidth = context.getResources().getDisplayMetrics().density;
-- 
GitLab


From 856cd1bd4d98c776839f786fbc18a9d48b322771 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 21 Jun 2021 21:59:34 -0700
Subject: [PATCH 1465/1664] Don't finish to home when launching a task from
 recents

- When launching without a task view, we should also not be finishing
  to home (similar to composeRecentsLaunchAnimator) since it will
  clobber the newly launched task

Fixes: 191182965
Test: Open overview with live tile, try to open usb debugging settings
      page
Change-Id: If7464ebf155cee33e81205fbf4899e9ab49a52d0
---
 quickstep/src/com/android/quickstep/views/RecentsView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 8c3e5b513b..2b256a43c6 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -874,7 +874,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             anim.addListener(new AnimatorListenerAdapter() {
                 @Override
                 public void onAnimationEnd(Animator animation) {
-                    finishRecentsAnimation(true /* toRecents */, null);
+                    finishRecentsAnimation(false /* toRecents */, null);
                 }
             });
         } else {
-- 
GitLab


From 92335ed7bd6c4a9112ce7273fbd3af52fd837541 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Tue, 22 Jun 2021 23:26:05 +0100
Subject: [PATCH 1466/1664] Add null check before detach content view from
 dragView at onDropComplete

Test: Drop a conversation widget on a configuration button. No crash
      is observed.
Fix: 191762933
Change-Id: I483c6f4dbc9fc6c096383682284a4c854707f583
---
 src/com/android/launcher3/Workspace.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 303bb01df0..f28f54a024 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2792,7 +2792,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
             }
         } else if (mDragInfo != null) {
             // When drag is cancelled, reattach content view back to its original parent.
-            if (mDragInfo.cell instanceof LauncherAppWidgetHostView) {
+            if (mDragInfo.cell instanceof LauncherAppWidgetHostView && d.dragView != null) {
                 d.dragView.detachContentView(/* reattachToPreviousParent= */ true);
             }
             final CellLayout cellLayout = mLauncher.getCellLayout(
-- 
GitLab


From 2f65e7f27405920e9ab61e1bdba9a0a553f48ad2 Mon Sep 17 00:00:00 2001
From: Thiru Ramasamy <thiruram@google.com>
Date: Mon, 14 Jun 2021 13:43:33 -0700
Subject: [PATCH 1467/1664] [AA+] Adds CorrectedDeviceSearchResultContainer to
 log user interactions on search results from corrected queries.

Bug: 188840584
Test: Local
Change-Id: Ibbf2b228537a19be1e77993efee5edc421ff70eb
---
 quickstep/protos_overrides/launcher_atom_extension.proto | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/quickstep/protos_overrides/launcher_atom_extension.proto b/quickstep/protos_overrides/launcher_atom_extension.proto
index 6253b41aac..d2dc0cb745 100644
--- a/quickstep/protos_overrides/launcher_atom_extension.proto
+++ b/quickstep/protos_overrides/launcher_atom_extension.proto
@@ -26,6 +26,7 @@ message ExtendedContainers {
 
   oneof Container{
     DeviceSearchResultContainer device_search_result_container = 1;
+    CorrectedDeviceSearchResultContainer corrected_device_search_result_container = 2;
   }
 }
 
@@ -33,3 +34,9 @@ message ExtendedContainers {
 message DeviceSearchResultContainer{
   optional int32 query_length = 1;
 }
+
+// Represents on-device search result container with results from spell-corrected query.
+message CorrectedDeviceSearchResultContainer{
+  optional int32 query_length = 1;
+}
+
-- 
GitLab


From e2c4687e51441c9200d88500b85dc483518b22b1 Mon Sep 17 00:00:00 2001
From: zakcohen <zakcohen@google.com>
Date: Mon, 21 Jun 2021 12:29:08 -0700
Subject: [PATCH 1468/1664] Sets a simple locus id when Overview is enabled

Bug: 189968849
Test: Ran with logcat to check correct locus is set
Change-Id: I5253d83b4cf5862e49c3183a843bf8f26dce149e
---
 .../com/android/quickstep/RecentsActivity.java |  2 ++
 .../android/quickstep/views/RecentsView.java   | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index 3d66823c98..412ff60a28 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -263,6 +263,7 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
         // onActivityStart callback.
         mFallbackRecentsView.setContentAlpha(1);
         super.onStart();
+        mFallbackRecentsView.updateLocusId();
     }
 
     @Override
@@ -271,6 +272,7 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
 
         // Workaround for b/78520668, explicitly trim memory once UI is hidden
         onTrimMemory(TRIM_MEMORY_UI_HIDDEN);
+        mFallbackRecentsView.updateLocusId();
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index df7f8b5a2a..428a886dc1 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -63,6 +63,7 @@ import android.animation.ValueAnimator;
 import android.annotation.TargetApi;
 import android.app.ActivityManager.RunningTaskInfo;
 import android.content.Context;
+import android.content.LocusId;
 import android.content.res.Configuration;
 import android.graphics.BlendMode;
 import android.graphics.Canvas;
@@ -75,6 +76,7 @@ import android.graphics.RectF;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
+import android.os.Bundle;
 import android.os.UserHandle;
 import android.text.Layout;
 import android.text.StaticLayout;
@@ -943,6 +945,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 cancelSplitSelect(false);
             }
         }
+        updateLocusId();
     }
 
     /**
@@ -3859,4 +3862,19 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     public RecentsAnimationController getRecentsAnimationController() {
         return mRecentsAnimationController;
     }
+
+    /** Update the current activity locus id to show the enabled state of Overview */
+    public void updateLocusId() {
+        String locusId = "Overview";
+
+        if (mOverviewStateEnabled && mActivity.isStarted()) {
+            locusId += "|ENABLED";
+        } else {
+            locusId += "|DISABLED";
+        }
+
+        final LocusId id = new LocusId(locusId);
+        // Set locus context is a binder call, don't want it to happen during a transition
+        UI_HELPER_EXECUTOR.post(() -> mActivity.setLocusContext(id, Bundle.EMPTY));
+    }
 }
-- 
GitLab


From 143748fbf4a70a3cd8c15525563119b011a39275 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Tue, 22 Jun 2021 14:09:29 -0700
Subject: [PATCH 1469/1664] Detect leaks only on test success Bug: 191690396
 Test: presubmit

Change-Id: Ie59c3b944d420ac25ebba86bf500fcf33700ca99
---
 .../com/android/quickstep/FallbackRecentsTest.java  |  2 +-
 .../launcher3/ui/AbstractLauncherUiTest.java        |  6 +++---
 .../android/launcher3/util/rule/FailureWatcher.java | 13 ++++++++++++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
index 9630d274df..a683d01f6c 100644
--- a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
+++ b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
@@ -107,7 +107,7 @@ public class FallbackRecentsTest {
 
         mOrderSensitiveRules = RuleChain
                 .outerRule(new NavigationModeSwitchRule(mLauncher))
-                .around(new FailureWatcher(mDevice));
+                .around(new FailureWatcher(mDevice, mLauncher));
 
         mOtherLauncherActivity = context.getPackageManager().queryIntentActivities(
                 getHomeIntentInPackage(context),
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index cbd948035c..2712bc02ce 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -229,7 +229,7 @@ public abstract class AbstractLauncherUiTest {
 
     protected TestRule getRulesInsideActivityMonitor() {
         final RuleChain inner = RuleChain.outerRule(new PortraitLandscapeRunner(this))
-                .around(new FailureWatcher(mDevice));
+                .around(new FailureWatcher(mDevice, mLauncher));
 
         return TestHelpers.isInLauncherProcess()
                 ? RuleChain.outerRule(ShellCommandRule.setDefaultLauncher())
@@ -310,7 +310,6 @@ public abstract class AbstractLauncherUiTest {
                 assertEquals("Launcher crashed, pid mismatch:",
                         mLauncherPid, mLauncher.getPid().intValue());
             }
-            checkDetectedLeaks(mLauncher);
         } finally {
             mLauncher.onTestFinish();
         }
@@ -618,5 +617,6 @@ public abstract class AbstractLauncherUiTest {
                 isResumed);
     }
 
-    protected void onLauncherActivityClose(Launcher launcher) { }
+    protected void onLauncherActivityClose(Launcher launcher) {
+    }
 }
diff --git a/tests/src/com/android/launcher3/util/rule/FailureWatcher.java b/tests/src/com/android/launcher3/util/rule/FailureWatcher.java
index cdda0f0dcc..4c4794789e 100644
--- a/tests/src/com/android/launcher3/util/rule/FailureWatcher.java
+++ b/tests/src/com/android/launcher3/util/rule/FailureWatcher.java
@@ -6,6 +6,9 @@ import android.util.Log;
 
 import androidx.test.uiautomator.UiDevice;
 
+import com.android.launcher3.tapl.LauncherInstrumentation;
+import com.android.launcher3.ui.AbstractLauncherUiTest;
+
 import org.junit.rules.TestWatcher;
 import org.junit.runner.Description;
 
@@ -16,9 +19,11 @@ import java.io.IOException;
 public class FailureWatcher extends TestWatcher {
     private static final String TAG = "FailureWatcher";
     final private UiDevice mDevice;
+    private final LauncherInstrumentation mLauncher;
 
-    public FailureWatcher(UiDevice device) {
+    public FailureWatcher(UiDevice device, LauncherInstrumentation launcher) {
         mDevice = device;
+        mLauncher = launcher;
     }
 
     private static void dumpViewHierarchy(UiDevice device) {
@@ -35,6 +40,12 @@ public class FailureWatcher extends TestWatcher {
         }
     }
 
+    @Override
+    protected void succeeded(Description description) {
+        super.succeeded(description);
+        AbstractLauncherUiTest.checkDetectedLeaks(mLauncher);
+    }
+
     @Override
     protected void failed(Throwable e, Description description) {
         onError(mDevice, description, e);
-- 
GitLab


From 7d3b25734a66b51cef7660b418362bb9a13896d0 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Wed, 16 Jun 2021 10:35:14 -0700
Subject: [PATCH 1470/1664] Hide searchbox when header protection is on.

Bug: 191726215
Test: manual
Change-Id: I086a05654faf718683ebe5dfbcf64b6bd6347ca8
---
 src/com/android/launcher3/ExtendedEditText.java          | 3 +++
 .../android/launcher3/allapps/AllAppsContainerView.java  | 7 +++++++
 .../android/launcher3/allapps/AllAppsRecyclerView.java   | 1 +
 src/com/android/launcher3/views/OptionsPopupView.java    | 9 +++++++++
 4 files changed, 20 insertions(+)

diff --git a/src/com/android/launcher3/ExtendedEditText.java b/src/com/android/launcher3/ExtendedEditText.java
index 20c69380cc..e8510b7600 100644
--- a/src/com/android/launcher3/ExtendedEditText.java
+++ b/src/com/android/launcher3/ExtendedEditText.java
@@ -96,6 +96,9 @@ public class ExtendedEditText extends EditText {
         }
     }
 
+    // inherited class can override to change the appearance of the edit text.
+    public void show() {}
+
     public void showKeyboard() {
         mShowImeAfterFirstLayout = !showSoftInput();
     }
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 67f2a9eb32..aabbe650ab 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -717,6 +717,10 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
                     : mSearchContainer.getBottom();
             canvas.drawRect(0, 0, getWidth(), bottom + getTranslationY(),
                     mHeaderPaint);
+
+            if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && getTranslationY() == 0) {
+                mSearchUiManager.getEditText().setBackground(null);
+            }
         }
     }
 
@@ -805,6 +809,9 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
             getSearchView().setBackgroundColor(viewBG);
             getFloatingHeaderView().setHeaderColor(viewBG);
             invalidateHeader();
+            if (scrolledOffset == 0 && mSearchUiManager.getEditText() != null) {
+                mSearchUiManager.getEditText().show();
+            }
         }
     }
 
diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
index 4ad694b31b..52dc19bbfc 100644
--- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
@@ -188,6 +188,7 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
         StatsLogManager mgr = BaseDraggingActivity.fromContext(getContext()).getStatsLogManager();
         switch (state) {
             case SCROLL_STATE_DRAGGING:
+                requestFocus();
                 mgr.logger().sendToInteractionJankMonitor(
                         LAUNCHER_ALLAPPS_VERTICAL_SWIPE_BEGIN, this);
                 break;
diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java
index 06ccbbd53e..ecdd206224 100644
--- a/src/com/android/launcher3/views/OptionsPopupView.java
+++ b/src/com/android/launcher3/views/OptionsPopupView.java
@@ -132,6 +132,12 @@ public class OptionsPopupView extends ArrowPopup
 
     public static OptionsPopupView show(
             Launcher launcher, RectF targetRect, List<OptionItem> items, boolean shouldAddArrow) {
+        return show(launcher, targetRect, items, shouldAddArrow, 0 /* width */);
+    }
+
+    public static OptionsPopupView show(
+            Launcher launcher, RectF targetRect, List<OptionItem> items, boolean shouldAddArrow,
+            int width) {
         OptionsPopupView popup = (OptionsPopupView) launcher.getLayoutInflater()
                 .inflate(R.layout.longpress_options_menu, launcher.getDragLayer(), false);
         popup.mTargetRect = targetRect;
@@ -140,6 +146,9 @@ public class OptionsPopupView extends ArrowPopup
         for (OptionItem item : items) {
             DeepShortcutView view =
                     (DeepShortcutView) popup.inflateAndAdd(R.layout.system_shortcut, popup);
+            if (width > 0) {
+                view.getLayoutParams().width = width;
+            }
             view.getIconView().setBackgroundDrawable(item.icon);
             view.getBubbleText().setText(item.label);
             view.setOnClickListener(popup);
-- 
GitLab


From 0d284852d9fdab15911242a4553f1aa315ebdc54 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Tue, 22 Jun 2021 14:50:55 -0700
Subject: [PATCH 1471/1664] Fix bug where icons in hotseat were clipped when
 display size is Small.

Simplify calculations to ensure the hotseat sizes are always accurate.

Bug: 186556930
Test: changed display setting from small to largest on different grid
      sizes (5x5, 4x4, 4x5, 3x3, 2x2)

Change-Id: I97580c50a9d821577eb63335950d5695d9bf035d
---
 src/com/android/launcher3/DeviceProfile.java | 33 +++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index e9245b0819..d301787cbc 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -149,10 +149,11 @@ public class DeviceProfile {
     // Hotseat
     public final int numShownHotseatIcons;
     public int hotseatCellHeightPx;
+    private final int hotseatExtraVerticalSize;
     // In portrait: size = height, in landscape: size = width
     public int hotseatBarSizePx;
     public final int hotseatBarTopPaddingPx;
-    public int hotseatBarBottomPaddingPx;
+    public final int hotseatBarBottomPaddingPx;
     // Start is the side next to the nav bar, end is the side next to the workspace
     public final int hotseatBarSidePaddingStartPx;
     public final int hotseatBarSidePaddingEndPx;
@@ -326,13 +327,9 @@ public class DeviceProfile {
                 res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_side_padding);
         // Add a bit of space between nav bar and hotseat in vertical bar layout.
         hotseatBarSidePaddingStartPx = isVerticalBarLayout() ? workspacePageIndicatorHeight : 0;
-        int hotseatExtraVerticalSize =
+        hotseatExtraVerticalSize =
                 res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_extra_vertical_size);
-        hotseatBarSizePx = pxFromDp(inv.iconSize, mMetrics, 1f)
-                + (isVerticalBarLayout()
-                ? (hotseatBarSidePaddingStartPx + hotseatBarSidePaddingEndPx)
-                : (hotseatBarTopPaddingPx + hotseatBarBottomPaddingPx
-                        + (isScalableGrid ? 0 : hotseatExtraVerticalSize)));
+        updateHotseatIconSize(pxFromDp(inv.iconSize, mMetrics, 1f));
 
         overviewTaskMarginPx = res.getDimensionPixelSize(R.dimen.overview_task_margin);
         overviewTaskIconSizePx =
@@ -362,7 +359,6 @@ public class DeviceProfile {
             extraHotseatBottomPadding = Math.round(paddingHotseatBottom * iconScale);
 
             hotseatBarSizePx += extraHotseatBottomPadding;
-            hotseatBarBottomPaddingPx += extraHotseatBottomPadding;
         } else if (!isVerticalBarLayout() && isPhone && isTallDevice) {
             // We increase the hotseat size when there is extra space.
             // ie. For a display with a large aspect ratio, we can keep the icons on the workspace
@@ -371,7 +367,6 @@ public class DeviceProfile {
             int extraSpace = getCellSize().y - iconSizePx - iconDrawablePaddingPx * 2
                     - workspacePageIndicatorHeight;
             hotseatBarSizePx += extraSpace;
-            hotseatBarBottomPaddingPx += extraSpace;
 
             // Recalculate the available dimensions using the new hotseat size.
             updateAvailableDimensions(res);
@@ -388,6 +383,17 @@ public class DeviceProfile {
                 new DotRenderer(allAppsIconSizePx, dotPath, DEFAULT_DOT_SIZE);
     }
 
+    private void updateHotseatIconSize(int hotseatIconSizePx) {
+        hotseatCellHeightPx = hotseatIconSizePx;
+        if (isVerticalBarLayout()) {
+            hotseatBarSizePx = hotseatIconSizePx + hotseatBarSidePaddingStartPx
+                    + hotseatBarSidePaddingEndPx;
+        } else {
+            hotseatBarSizePx = hotseatIconSizePx + hotseatBarTopPaddingPx
+                    + hotseatBarBottomPaddingPx + (isScalableGrid ? 0 : hotseatExtraVerticalSize);
+        }
+    }
+
     private void setCellLayoutBorderSpacing(int borderSpacing) {
         cellLayoutBorderSpacingPx = isScalableGrid ? borderSpacing : 0;
     }
@@ -573,11 +579,7 @@ public class DeviceProfile {
         }
 
         // Hotseat
-        if (isVerticalLayout) {
-            hotseatBarSizePx = iconSizePx + hotseatBarSidePaddingStartPx
-                    + hotseatBarSidePaddingEndPx;
-        }
-        hotseatCellHeightPx = iconSizePx;
+        updateHotseatIconSize(iconSizePx);
 
         if (!isVerticalLayout) {
             int expectedWorkspaceHeight = availableHeightPx - hotseatBarSizePx
@@ -763,7 +765,8 @@ public class DeviceProfile {
                     hotseatBarTopPaddingPx,
                     hotseatAdjustment + workspacePadding.right + cellLayoutPaddingLeftRightPx
                             + mInsets.right,
-                    hotseatBarBottomPaddingPx + mInsets.bottom + cellLayoutBottomPaddingPx);
+                    hotseatBarSizePx - hotseatCellHeightPx - hotseatBarTopPaddingPx
+                            + cellLayoutBottomPaddingPx + mInsets.bottom);
         }
         return mHotseatPadding;
     }
-- 
GitLab


From b60fff3929ccaa2bcff3700ef88e09a12c3a0496 Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Tue, 22 Jun 2021 16:57:34 -0700
Subject: [PATCH 1472/1664] Disable blurs when dev setting or battery saver

Stop rendering blurs whenever a user:
- disables blurs on developer settings
- enables battery saver

Test: manual
Bug: 191814337
Change-Id: I8fd04796054d92171732c8db95b64cfa3ec469ec
---
 .../statehandlers/DepthController.java        | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
index e6333d196b..4503e308e6 100644
--- a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
+++ b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
@@ -25,6 +25,7 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.os.IBinder;
 import android.util.FloatProperty;
+import android.view.CrossWindowBlurListeners;
 import android.view.SurfaceControl;
 import android.view.View;
 import android.view.ViewRootImpl;
@@ -41,6 +42,8 @@ import com.android.launcher3.states.StateAnimationConfig;
 import com.android.systemui.shared.system.BlurUtils;
 import com.android.systemui.shared.system.WallpaperManagerCompat;
 
+import java.util.function.Consumer;
+
 /**
  * Controls blur and wallpaper zoom, for the Launcher surface only.
  */
@@ -96,11 +99,17 @@ public class DepthController implements StateHandler<LauncherState>,
                 }
             };
 
+    private final Consumer<Boolean> mCrossWindowBlurListener = (enabled) -> {
+        mCrossWindowBlursEnabled = enabled;
+        dispatchTransactionSurface();
+    };
+
     private final Launcher mLauncher;
     /**
      * Blur radius when completely zoomed out, in pixels.
      */
     private int mMaxBlurRadius;
+    private boolean mCrossWindowBlursEnabled;
     private WallpaperManagerCompat mWallpaperManager;
     private SurfaceControl mSurface;
     /**
@@ -123,6 +132,7 @@ public class DepthController implements StateHandler<LauncherState>,
             mMaxBlurRadius = mLauncher.getResources().getInteger(R.integer.max_depth_blur_radius);
             mWallpaperManager = new WallpaperManagerCompat(mLauncher);
         }
+
         if (mLauncher.getRootView() != null && mOnAttachListener == null) {
             mOnAttachListener = new View.OnAttachStateChangeListener() {
                 @Override
@@ -132,13 +142,20 @@ public class DepthController implements StateHandler<LauncherState>,
                     if (windowToken != null) {
                         mWallpaperManager.setWallpaperZoomOut(windowToken, mDepth);
                     }
+                    CrossWindowBlurListeners.getInstance().addListener(mLauncher.getMainExecutor(),
+                            mCrossWindowBlurListener);
                 }
 
                 @Override
                 public void onViewDetachedFromWindow(View view) {
+                    CrossWindowBlurListeners.getInstance().removeListener(mCrossWindowBlurListener);
                 }
             };
             mLauncher.getRootView().addOnAttachStateChangeListener(mOnAttachListener);
+            if (mLauncher.getRootView().isAttachedToWindow()) {
+                CrossWindowBlurListeners.getInstance().addListener(mLauncher.getMainExecutor(),
+                        mCrossWindowBlurListener);
+            }
         }
     }
 
@@ -220,7 +237,8 @@ public class DepthController implements StateHandler<LauncherState>,
             boolean isOverview = mLauncher.isInState(LauncherState.OVERVIEW);
             boolean opaque = mLauncher.getScrimView().isFullyOpaque() && !isOverview;
 
-            int blur = opaque || isOverview ? 0 : (int) (mDepth * mMaxBlurRadius);
+            int blur = opaque || isOverview || !mCrossWindowBlursEnabled
+                    ? 0 : (int) (mDepth * mMaxBlurRadius);
             new SurfaceControl.Transaction()
                     .setBackgroundBlurRadius(mSurface, blur)
                     .setOpaque(mSurface, opaque)
-- 
GitLab


From 0571a370d1c838ce47c534f4c1a3ca8dd30e6d30 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 23 Jun 2021 17:11:05 +0100
Subject: [PATCH 1473/1664] Use default spans as min spans if the min spans >
 default spans

This is to match the behavior described in
AppWidgetProviderInfo#minResizeWidth/Height documentation.

Test: run LauncherAppWidgetProviderInfoTest
Bug: 191223844
Change-Id: I37c0c8bf5e4588919e5b30fab6d2fde7236e114b
---
 .../LauncherAppWidgetProviderInfoTest.java    | 24 +++++++++++++++++++
 .../widget/LauncherAppWidgetProviderInfo.java |  7 ++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/robolectric_tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java b/robolectric_tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java
index 2d87957cf7..a6f892c048 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java
@@ -122,6 +122,8 @@ public final class LauncherAppWidgetProviderInfoTest {
     @Test
     public void initSpans_minResizeWidthSmallerThanCellWidth_shouldInitializeMinSpansToOne() {
         LauncherAppWidgetProviderInfo info = new LauncherAppWidgetProviderInfo();
+        info.minWidth = 100;
+        info.minHeight = 100;
         info.minResizeWidth = 20;
         info.minResizeHeight = 20;
         InvariantDeviceProfile idp = createIDP();
@@ -135,6 +137,8 @@ public final class LauncherAppWidgetProviderInfoTest {
     @Test
     public void initSpans_minResizeWidthLargerThanCellWidth_shouldInitializeMinSpans() {
         LauncherAppWidgetProviderInfo info = new LauncherAppWidgetProviderInfo();
+        info.minWidth = 100;
+        info.minHeight = 100;
         info.minResizeWidth = 80;
         info.minResizeHeight = 80;
         InvariantDeviceProfile idp = createIDP();
@@ -157,6 +161,8 @@ public final class LauncherAppWidgetProviderInfoTest {
         Mockito.when(dp.shouldInsetWidgets()).thenReturn(true);
 
         LauncherAppWidgetProviderInfo info = new LauncherAppWidgetProviderInfo();
+        info.minWidth = CELL_SIZE * 3;
+        info.minHeight = CELL_SIZE * 3;
         info.minResizeWidth = CELL_SIZE * 2 + maxPadding;
         info.minResizeHeight = CELL_SIZE * 2 + maxPadding;
 
@@ -177,6 +183,8 @@ public final class LauncherAppWidgetProviderInfoTest {
         dp.cellLayoutBorderSpacingPx = maxPadding - 1;
         Mockito.when(dp.shouldInsetWidgets()).thenReturn(false);
         LauncherAppWidgetProviderInfo info = new LauncherAppWidgetProviderInfo();
+        info.minWidth = CELL_SIZE * 3;
+        info.minHeight = CELL_SIZE * 3;
         info.minResizeWidth = CELL_SIZE * 2 + maxPadding;
         info.minResizeHeight = CELL_SIZE * 2 + maxPadding;
 
@@ -186,6 +194,22 @@ public final class LauncherAppWidgetProviderInfoTest {
         assertThat(info.minSpanY).isEqualTo(3);
     }
 
+    @Test
+    public void
+            initSpans_minResizeWidthHeightLargerThanMinWidth_shouldUseMinWidthHeightAsMinSpans() {
+        LauncherAppWidgetProviderInfo info = new LauncherAppWidgetProviderInfo();
+        info.minWidth = 20;
+        info.minHeight = 20;
+        info.minResizeWidth = 80;
+        info.minResizeHeight = 80;
+        InvariantDeviceProfile idp = createIDP();
+
+        info.initSpans(mContext, idp);
+
+        assertThat(info.minSpanX).isEqualTo(1);
+        assertThat(info.minSpanY).isEqualTo(1);
+    }
+
     @Test
     public void isMinSizeFulfilled_minWidthAndHeightWithinGridSize_shouldReturnTrue() {
         LauncherAppWidgetProviderInfo info = new LauncherAppWidgetProviderInfo();
diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java b/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
index 5a29171361..d77d99dfa3 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
@@ -160,8 +160,11 @@ public class LauncherAppWidgetProviderInfo extends AppWidgetProviderInfo
             }
         }
 
-        this.minSpanX = minSpanX;
-        this.minSpanY = minSpanY;
+        // If minSpanX/Y > spanX/Y, ignore the minSpanX/Y to match the behavior described in
+        // minResizeWidth & minResizeHeight Android documentation. See
+        // https://developer.android.com/reference/android/appwidget/AppWidgetProviderInfo
+        this.minSpanX = Math.min(spanX, minSpanX);
+        this.minSpanY = Math.min(spanY, minSpanY);
         this.maxSpanX = maxSpanX;
         this.maxSpanY = maxSpanY;
         this.mIsMinSizeFulfilled = Math.min(spanX, minSpanX) <= idp.numColumns
-- 
GitLab


From 95d6df3647e8ca34096d377c6e3a1dc0a37a4ea9 Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Wed, 23 Jun 2021 12:24:59 +0100
Subject: [PATCH 1474/1664] Update string for no room on this Home screen
 toast.

Bug: 191852136
Test: Tested manually to check that the toast has updated string.
Change-Id: I28f73eda17fdc49dee18e4f8be89224f04471697
---
 res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 60c0774ff8..d594610801 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -140,8 +140,8 @@
     <string name="long_accessible_way_to_add_shortcut">Double-tap &amp; hold to move a shortcut or use custom actions.</string>
 
     <skip />
-    <!-- Error message when user has filled a home screen -->
-    <string name="out_of_space">No more room on this Home screen.</string>
+    <!-- Error message when a user can't add more apps, widgets, or shortcuts to a Home screen. -->
+    <string name="out_of_space">No room on this Home screen</string>
     <!-- Error message when user has filled the hotseat -->
     <string name="hotseat_out_of_space">No more room in the Favorites tray</string>
 
-- 
GitLab


From ce820f51e25cea292ddd13815b79941223bfca38 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Fri, 18 Jun 2021 17:23:48 -0500
Subject: [PATCH 1475/1664] Polish work for work profile

Bug: 191478900 Work profile toggle specs
Bug: 187761192 Fix issue where Installing app scrolling apps to top
Bug: 191121890	Fix issue where top of AllApps becomes empty when returning to AllApps
Bug: 191477329 String change for work profile paused state
Test: local
Change-Id: Idbaab333566b54afa3dc879f5bea98e1f77c44fc
---
 res/drawable/work_apps_toggle_background.xml           |  8 ++++++--
 res/layout/work_apps_edu.xml                           |  2 +-
 res/layout/work_apps_paused.xml                        | 10 +++++-----
 res/layout/work_mode_fab.xml                           |  2 ++
 res/values/strings.xml                                 |  2 +-
 src/com/android/launcher3/Launcher.java                |  2 +-
 .../launcher3/allapps/AllAppsContainerView.java        | 10 ++++++----
 .../android/launcher3/views/SpringRelativeLayout.java  |  5 ++---
 8 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/res/drawable/work_apps_toggle_background.xml b/res/drawable/work_apps_toggle_background.xml
index b7115f86b5..a47c8fef7c 100644
--- a/res/drawable/work_apps_toggle_background.xml
+++ b/res/drawable/work_apps_toggle_background.xml
@@ -18,14 +18,18 @@
         <shape android:shape="rectangle">
             <corners android:radius="@dimen/work_fab_radius" />
             <solid android:color="?android:attr/colorControlHighlight" />
-            <padding android:left="@dimen/work_fab_radius" android:right="@dimen/work_fab_radius" />
+            <padding
+                android:left="@dimen/work_profile_footer_padding"
+                android:right="@dimen/work_profile_footer_padding" />
         </shape>
     </item>
     <item>
         <shape android:shape="rectangle">
             <corners android:radius="@dimen/work_fab_radius" />
             <solid android:color="@color/all_apps_tab_background_selected" />
-            <padding android:left="@dimen/work_fab_radius" android:right="@dimen/work_fab_radius" />
+            <padding
+                android:left="@dimen/work_profile_footer_padding"
+                android:right="@dimen/work_profile_footer_padding" />
         </shape>
     </item>
 </selector>
diff --git a/res/layout/work_apps_edu.xml b/res/layout/work_apps_edu.xml
index 97feb23745..919f1b27cf 100644
--- a/res/layout/work_apps_edu.xml
+++ b/res/layout/work_apps_edu.xml
@@ -42,7 +42,7 @@
 
         <Button
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/rounded_button_height"
             android:id="@+id/action_btn"
             android:textColor="?attr/workProfileOverlayTextColor"
             android:text="@string/work_profile_edu_accept"
diff --git a/res/layout/work_apps_paused.xml b/res/layout/work_apps_paused.xml
index 38192561fe..02a50cad98 100644
--- a/res/layout/work_apps_paused.xml
+++ b/res/layout/work_apps_paused.xml
@@ -17,7 +17,7 @@
     android:layout_height="wrap_content"
     android:padding="@dimen/work_edu_card_margin"
     android:orientation="vertical"
-    android:gravity="center">
+    android:gravity="center_horizontal">
 
     <TextView
         style="@style/PrimaryHeadline"
@@ -25,8 +25,7 @@
         android:id="@+id/work_apps_paused_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginTop="40dp"
         android:text="@string/work_apps_paused_title"
         android:textAlignment="center"
         android:textSize="20sp" />
@@ -38,12 +37,13 @@
         android:textColor="?attr/workProfileOverlayTextColor"
         android:text="@string/work_apps_paused_body"
         android:textAlignment="center"
-        android:layout_marginBottom="8dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="24dp"
         android:textSize="16sp" />
 
     <Button
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/rounded_button_height"
         android:id="@+id/enable_work_apps"
         android:textColor="?attr/workProfileOverlayTextColor"
         android:text="@string/work_apps_enable_btn_text"
diff --git a/res/layout/work_mode_fab.xml b/res/layout/work_mode_fab.xml
index 1771d37def..7183817ed3 100644
--- a/res/layout/work_mode_fab.xml
+++ b/res/layout/work_mode_fab.xml
@@ -13,6 +13,7 @@
      limitations under the License.
 -->
 <com.android.launcher3.allapps.WorkModeSwitch xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/TextHeadline"
     android:id="@+id/work_mode_toggle"
     android:layout_alignParentBottom="true"
     android:layout_alignParentEnd="true"
@@ -22,6 +23,7 @@
     android:includeFontPadding="false"
     android:drawableTint="@color/all_apps_tab_text"
     android:textColor="@color/all_apps_tab_text"
+    android:textSize="14sp"
     android:background="@drawable/work_apps_toggle_background"
     android:drawablePadding="16dp"
     android:drawableStart="@drawable/ic_corp_off"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3dbd760d1e..5940a26d5d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -394,7 +394,7 @@
     <string name="work_profile_edu_accept">Got it</string>
 
     <!--- heading shown when user opens work apps tab while work apps are paused -->
-    <string name="work_apps_paused_title">Work apps are off</string>
+    <string name="work_apps_paused_title">Work apps are paused</string>
     <!--- body shown when user opens work apps tab while work apps are paused -->
     <string name="work_apps_paused_body">Your work apps can’t send you notifications, use your battery, or access your location</string>
     <!-- content description for paused work apps list -->
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index c5d280d146..11ddafb3a1 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1079,7 +1079,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         if (ALL_APPS.equals(mPrevLauncherState) && !ALL_APPS.equals(state)
                 // Making sure mAllAppsSessionLogId is not null to avoid double logging.
                 && mAllAppsSessionLogId != null) {
-            getAppsView().getSearchUiManager().resetSearch();
+            getAppsView().reset(false);
             getStatsLogManager().logger()
                     .withContainerInfo(LauncherAtom.ContainerInfo.newBuilder()
                             .setWorkspace(
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 67f2a9eb32..10101484f1 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -255,7 +255,6 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
             mWorkModeSwitch.updateCurrentState(isEnabled);
         }
         mWorkAdapterProvider.updateCurrentState(isEnabled);
-        mAH[AdapterHolder.WORK].applyPadding();
     }
 
     private void hideInput() {
@@ -509,7 +508,10 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
                     R.layout.work_mode_fab, this, false);
             this.addView(mWorkModeSwitch);
             mWorkModeSwitch.setInsets(mInsets);
-            mWorkModeSwitch.post(this::resetWorkProfile);
+            mWorkModeSwitch.post(() -> {
+                mAH[AdapterHolder.WORK].applyPadding();
+                resetWorkProfile();
+            });
         }
     }
 
@@ -633,6 +635,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
             mSearchModeWhileUsingTabs = true;
             rebindAdapters(false); // hide tabs
         }
+        mHeader.setCollapsed(true);
     }
 
     public void onClearSearchResult() {
@@ -715,7 +718,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         if (mHeaderPaint.getColor() != mScrimColor && mHeaderPaint.getColor() != 0) {
             int bottom = mUsingTabs && mHeader.mHeaderCollapsed ? mHeader.getVisibleBottomBound()
                     : mSearchContainer.getBottom();
-            canvas.drawRect(0, 0, getWidth(), bottom + getTranslationY(),
+            canvas.drawRect(0, 0, canvas.getWidth(), bottom + getTranslationY(),
                     mHeaderPaint);
         }
     }
@@ -783,7 +786,6 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
                 int bottomOffset = mWorkModeSwitch != null && mIsWork ? switchH : 0;
                 recyclerView.setPadding(padding.left, padding.top, padding.right,
                         padding.bottom + bottomOffset);
-                recyclerView.scrollToTop();
             }
         }
 
diff --git a/src/com/android/launcher3/views/SpringRelativeLayout.java b/src/com/android/launcher3/views/SpringRelativeLayout.java
index 8f814a1949..923eb19d3b 100644
--- a/src/com/android/launcher3/views/SpringRelativeLayout.java
+++ b/src/com/android/launcher3/views/SpringRelativeLayout.java
@@ -105,9 +105,8 @@ public class SpringRelativeLayout extends RelativeLayout {
 
         @NonNull @Override
         protected EdgeEffect createEdgeEffect(RecyclerView view, int direction) {
-            switch (direction) {
-                case DIRECTION_TOP:
-                    return new EdgeEffectProxy(getContext(), mEdgeGlowTop);
+            if (direction == DIRECTION_TOP) {
+                return new EdgeEffectProxy(getContext(), mEdgeGlowTop);
             }
             return super.createEdgeEffect(view, direction);
         }
-- 
GitLab


From e83189593a661d8098bbb7f82faa2e594f360443 Mon Sep 17 00:00:00 2001
From: Hilary Huo <hhuo@google.com>
Date: Tue, 22 Jun 2021 13:03:44 -0700
Subject: [PATCH 1476/1664] [settings-pixel-search] Add ww logging to track
 slice fetching timeout

Test: https://paste.googleplex.com/6310936320147456
Bug: 191297465
Change-Id: I0a4a65295e7290b55dccdb63830ff60c6838fbb2
---
 .../logging/StatsLogCompatManager.java        | 30 ++++++++++++++-----
 .../launcher3/logging/StatsLogManager.java    |  8 +++++
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
index 719cb0a032..b1c9ed0361 100644
--- a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
+++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
@@ -151,6 +151,7 @@ public class StatsLogCompatManager extends StatsLogManager {
         private Optional<ToState> mToState = Optional.empty();
         private Optional<String> mEditText = Optional.empty();
         private SliceItem mSliceItem;
+        private LauncherAtom.Slice mSlice;
 
         StatsCompatLogger(Context context) {
             mContext = context;
@@ -193,7 +194,7 @@ public class StatsLogCompatManager extends StatsLogManager {
         @Override
         public StatsLogger withContainerInfo(ContainerInfo containerInfo) {
             checkState(mItemInfo == DEFAULT_ITEM_INFO,
-                        "ItemInfo and ContainerInfo are mutual exclusive; cannot log both.");
+                    "ItemInfo and ContainerInfo are mutual exclusive; cannot log both.");
             this.mContainerInfo = Optional.of(containerInfo);
             return this;
         }
@@ -218,9 +219,21 @@ public class StatsLogCompatManager extends StatsLogManager {
 
         @Override
         public StatsLogger withSliceItem(@NonNull SliceItem sliceItem) {
+            checkState(mItemInfo == DEFAULT_ITEM_INFO && mSlice == null,
+                    "ItemInfo, Slice and SliceItem are mutual exclusive; cannot set more than one"
+                            + " of them.");
             this.mSliceItem = checkNotNull(sliceItem, "expected valid sliceItem but received null");
-            checkState(mItemInfo == DEFAULT_ITEM_INFO,
-                    "ItemInfo and SliceItem are mutual exclusive; cannot log both.");
+            return this;
+        }
+
+        @Override
+        public StatsLogger withSlice(LauncherAtom.Slice slice) {
+            checkState(mItemInfo == DEFAULT_ITEM_INFO && mSliceItem == null,
+                    "ItemInfo, Slice and SliceItem are mutual exclusive; cannot set more than one"
+                            + " of them.");
+            checkNotNull(slice, "expected valid slice but received null");
+            checkNotNull(slice.getUri(), "expected valid slice uri but received null");
+            this.mSlice = slice;
             return this;
         }
 
@@ -231,13 +244,16 @@ public class StatsLogCompatManager extends StatsLogManager {
             }
             LauncherAppState appState = LauncherAppState.getInstanceNoCreate();
 
-            if (mSliceItem != null) {
+            if (mSlice == null && mSliceItem != null) {
+                mSlice = LauncherAtom.Slice.newBuilder().setUri(
+                        mSliceItem.getSlice().getUri().toString()).build();
+            }
+
+            if (mSlice != null) {
                 Executors.MODEL_EXECUTOR.execute(
                         () -> {
                             LauncherAtom.ItemInfo.Builder itemInfoBuilder =
-                                    LauncherAtom.ItemInfo.newBuilder().setSlice(
-                                            LauncherAtom.Slice.newBuilder().setUri(
-                                                    mSliceItem.getSlice().getUri().toString()));
+                                    LauncherAtom.ItemInfo.newBuilder().setSlice(mSlice);
                             mContainerInfo.ifPresent(itemInfoBuilder::setContainerInfo);
                             write(event, applyOverwrites(itemInfoBuilder.build()));
                         });
diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index ddff338510..79e5b5d04c 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -27,6 +27,7 @@ import androidx.annotation.Nullable;
 import androidx.slice.SliceItem;
 
 import com.android.launcher3.R;
+import com.android.launcher3.logger.LauncherAtom;
 import com.android.launcher3.logger.LauncherAtom.ContainerInfo;
 import com.android.launcher3.logger.LauncherAtom.FromState;
 import com.android.launcher3.logger.LauncherAtom.ToState;
@@ -599,6 +600,13 @@ public class StatsLogManager implements ResourceBasedOverride {
             return this;
         }
 
+        /**
+         * Sets logging fields from provided {@link LauncherAtom.Slice}.
+         */
+        default StatsLogger withSlice(LauncherAtom.Slice slice) {
+            return this;
+        }
+
         /**
          * Builds the final message and logs it as {@link EventEnum}.
          */
-- 
GitLab


From d537968b3558e7ae6e0948ad818d56113fb0d3ea Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Tue, 22 Jun 2021 21:09:05 -0700
Subject: [PATCH 1477/1664] Finish recents animation on task dismissal only if
 the task is a live tile task

Fixes: 191831190
Test: manual
Change-Id: Ie1dd02a2e8cc401a613a0ed2199400712c6d5291
Merged-In: Ie1dd02a2e8cc401a613a0ed2199400712c6d5291
---
 .../android/quickstep/views/RecentsView.java  | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 2b256a43c6..0cb7501333 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2369,13 +2369,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 if (success) {
                     if (shouldRemoveTask) {
                         if (taskView.getTask() != null) {
-                            finishRecentsAnimation(true /* toRecents */, false /* shouldPip */,
-                                    () -> {
-                                UI_HELPER_EXECUTOR.getHandler().postDelayed(() ->
-                                        ActivityManagerWrapper.getInstance().removeTask(
-                                                taskView.getTask().key.id),
-                                        REMOVE_TASK_WAIT_FOR_APP_STOP_MS);
-                            });
+                            if (LIVE_TILE.get() && taskView.isRunningTask()) {
+                                finishRecentsAnimation(true /* toRecents */, false /* shouldPip */,
+                                        () -> removeTaskInternal(taskView));
+                            } else {
+                                removeTaskInternal(taskView);
+                            }
                             mActivity.getStatsLogManager().logger()
                                     .withItemInfo(taskView.getItemInfo())
                                     .log(LAUNCHER_TASK_DISMISS_SWIPE_UP);
@@ -2421,6 +2420,13 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         return anim;
     }
 
+    private void removeTaskInternal(TaskView taskView) {
+        UI_HELPER_EXECUTOR.getHandler().postDelayed(() ->
+                        ActivityManagerWrapper.getInstance().removeTask(
+                                taskView.getTask().key.id),
+                REMOVE_TASK_WAIT_FOR_APP_STOP_MS);
+    }
+
     /**
      * @return {@code true} if one of the task thumbnails would intersect/overlap with the
      *         {@link #mSplitPlaceholderView}
-- 
GitLab


From d47f715b517c21ff3ad279d71319a030b3061b8b Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Wed, 23 Jun 2021 11:22:25 -0700
Subject: [PATCH 1478/1664] Fix folders being light in dark mode.

- Simplifying the styles here, following the same pattern as
  the popup colors.

Bug: 175329686
Test: test wallpaper with light text, light mode
      test again in dark mode
      test wallpaper with dark text, light mode
      test again in dark mode

Change-Id: I04f92bd64de69c5e33fc1bff50c4ecc0e7c17d37
---
 res/values-v29/styles.xml |  2 --
 res/values-v30/styles.xml |  2 --
 res/values/styles.xml     | 20 --------------------
 3 files changed, 24 deletions(-)

diff --git a/res/values-v29/styles.xml b/res/values-v29/styles.xml
index 8254d483fc..5370b7911d 100644
--- a/res/values-v29/styles.xml
+++ b/res/values-v29/styles.xml
@@ -26,8 +26,6 @@
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowShowWallpaper">true</item>
-        <item name="folderTextColor">?attr/workspaceTextColor</item>
-        <item name="isFolderDarkText">?attr/isWorkspaceDarkText</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
         <item name="android:enforceStatusBarContrast">false</item>
         <item name="android:enforceNavigationBarContrast">false</item>
diff --git a/res/values-v30/styles.xml b/res/values-v30/styles.xml
index a144363e12..ec5c113b85 100644
--- a/res/values-v30/styles.xml
+++ b/res/values-v30/styles.xml
@@ -26,8 +26,6 @@
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowShowWallpaper">true</item>
-        <item name="folderTextColor">?attr/workspaceTextColor</item>
-        <item name="isFolderDarkText">?attr/isWorkspaceDarkText</item>
         <item name="android:windowLayoutInDisplayCutoutMode">always</item>
         <item name="android:enforceStatusBarContrast">false</item>
         <item name="android:enforceNavigationBarContrast">false</item>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 1cacc28b0b..871214fc4f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -26,8 +26,6 @@
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowShowWallpaper">true</item>
-        <item name="folderTextColor">?attr/workspaceTextColor</item>
-        <item name="isFolderDarkText">?attr/isWorkspaceDarkText</item>
     </style>
 
     <style name="LauncherTheme" parent="@style/BaseLauncherTheme">
@@ -72,10 +70,6 @@
     </style>
 
     <style name="LauncherTheme.DarkMainColor" parent="@style/LauncherTheme">
-        <item name="folderFillColor">@color/folder_background_dark</item>
-        <item name="folderTextColor">@color/workspace_text_color_light</item>
-        <item name="isFolderDarkText">false</item>
-        <item name="folderHintColor">@color/folder_hint_text_color_light</item>
         <item name="disabledIconAlpha">.254</item>
 
     </style>
@@ -87,12 +81,6 @@
         <item name="workspaceKeyShadowColor">@android:color/transparent</item>
         <item name="isWorkspaceDarkText">true</item>
         <item name="workspaceStatusBarScrim">@null</item>
-        <item name="folderDotColor">@color/folder_dot_color</item>
-        <item name="folderFillColor">@color/folder_background_light</item>
-        <item name="folderIconBorderColor">#FF80868B</item>
-        <item name="folderTextColor">@color/workspace_text_color_dark</item>
-        <item name="isFolderDarkText">true</item>
-        <item name="folderHintColor">@color/folder_hint_text_color_dark</item>
     </style>
 
     <style name="LauncherTheme.Dark" parent="@style/LauncherTheme">
@@ -125,25 +113,17 @@
     </style>
 
     <style name="LauncherTheme.Dark.DarkMainColor" parent="@style/LauncherTheme.Dark">
-        <item name="folderFillColor">@color/folder_background_dark</item>
-        <item name="folderTextColor">@color/workspace_text_color_light</item>
-        <item name="isFolderDarkText">false</item>
-        <item name="folderHintColor">@color/folder_hint_text_color_light</item>
         <item name="disabledIconAlpha">.54</item>
     </style>
 
     <style name="LauncherTheme.Dark.DarkText" parent="@style/LauncherTheme.Dark">
         <item name="android:colorControlHighlight">#19212121</item>
-        <item name="folderFillColor">@color/folder_background_light</item>
         <item name="workspaceTextColor">@color/workspace_text_color_dark</item>
         <item name="workspaceShadowColor">@android:color/transparent</item>
         <item name="workspaceAmbientShadowColor">@android:color/transparent</item>
         <item name="workspaceKeyShadowColor">@android:color/transparent</item>
         <item name="isWorkspaceDarkText">true</item>
         <item name="workspaceStatusBarScrim">@null</item>
-        <item name="folderTextColor">@color/workspace_text_color_dark</item>
-        <item name="isFolderDarkText">true</item>
-        <item name="folderHintColor">@color/folder_hint_text_color_dark</item>
     </style>
 
     <!-- A derivative project can extend these themes to customize the application theme without
-- 
GitLab


From 1351c2214d54d01ee457ee338d0559ef3796c083 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 23 Jun 2021 10:40:03 -0700
Subject: [PATCH 1479/1664] Fix some touch issues during gesture nav transition

- Don't recreate the laucher transition controller if we've already ended it, as it could clobber a touch interaction that started in the meantime
  - Test: swipe up from an app to overivew, swipe to dismiss it during the transition.
  - Previously, we were ending the controller twice (once on touch down as we started proxying, and again in setupLauncherUiAfterSwipeUpToRecentsAnimation()), and the second one could happen after starting the dismiss interaction.
- Don't recreateControllers() if orientation didn't change
  - Test: swipe up to go from an app to home, swipe up to all apps during the transition.
  - Previously, we were getting the following sequence:
    1. Touch down on home to start swiping to all apps - all current controllers get this down event to start determining whether to intercept
    2. Before reaching touch slop, we recreateControllers(), so all new controllers won't get the down event and thus won't intercept
  - Now, we avoid unnecessarily recreateControllers(), so the original controllers can still intercept.

Test: see above
Fixes: 189700453
Change-Id: Icfa5b6cdb32122adaf6ac8e8cb197b0c477dac60
---
 .../src/com/android/quickstep/AbsSwipeUpHandler.java     | 7 +++++--
 .../src/com/android/quickstep/views/RecentsView.java     | 9 ++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 4d47ef15c1..d511e6da9f 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -230,6 +230,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
 
     // Used to control launcher components throughout the swipe gesture.
     private AnimatorControllerWithResistance mLauncherTransitionController;
+    private boolean mHasEndedLauncherTransition;
 
     private AnimationFactory mAnimationFactory = (t) -> { };
 
@@ -603,11 +604,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
 
     /**
      * We don't want to change mLauncherTransitionController if mGestureState.getEndTarget() == HOME
-     * (it has its own animation).
+     * (it has its own animation) or if we explicitly ended the controller already.
      * @return Whether we can create the launcher controller or update its progress.
      */
     private boolean canCreateNewOrUpdateExistingLauncherTransitionController() {
-        return mGestureState.getEndTarget() != HOME;
+        return mGestureState.getEndTarget() != HOME && !mHasEndedLauncherTransition;
     }
 
     @Override
@@ -1421,6 +1422,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     }
 
     private void endLauncherTransitionController() {
+        mHasEndedLauncherTransition = true;
+
         if (mLauncherTransitionController != null) {
             // End the animation, but stay at the same visual progress.
             mLauncherTransitionController.getNormalController().dispatchSetInterpolator(
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 2b256a43c6..8a665251ff 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1248,7 +1248,9 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
 
     private void updateOrientationHandler() {
         // Handle orientation changes.
+        PagedOrientationHandler oldOrientationHandler = mOrientationHandler;
         mOrientationHandler = mOrientationState.getOrientationHandler();
+
         mIsRtl = mOrientationHandler.getRecentsRtlSetting(getResources());
         setLayoutDirection(mIsRtl
                 ? View.LAYOUT_DIRECTION_RTL
@@ -1257,7 +1259,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 ? View.LAYOUT_DIRECTION_LTR
                 : View.LAYOUT_DIRECTION_RTL);
         mClearAllButton.setRotation(mOrientationHandler.getDegreesRotated());
-        mActivity.getDragLayer().recreateControllers();
+
+        if (!mOrientationHandler.equals(oldOrientationHandler)) {
+            // Changed orientations, update controllers so they intercept accordingly.
+            mActivity.getDragLayer().recreateControllers();
+        }
+
         boolean isInLandscape = mOrientationState.getTouchRotation() != ROTATION_0
                 || mOrientationState.getRecentsActivityRotation() != ROTATION_0;
         mActionsView.updateHiddenFlags(HIDDEN_NON_ZERO_ROTATION,
-- 
GitLab


From e6b93993d1eb7127266a1bdf09dd386e0a035649 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Wed, 23 Jun 2021 13:06:50 -0700
Subject: [PATCH 1480/1664] Update Gesture navigation tutorial activity
 permissions

Temporarily removed REBOOT permission requirement from GESTURE_SANDBOX.

Fixes: 188035141
Test: manual
Change-Id: I11788d7c6dd5a7b10e8cc4400b17f5f2fec967f7
---
 quickstep/AndroidManifest.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml
index bf9059f1c4..a48e2c09bc 100644
--- a/quickstep/AndroidManifest.xml
+++ b/quickstep/AndroidManifest.xml
@@ -103,16 +103,10 @@
              android:clearTaskOnLaunch="true"
              android:exported="false"/>
 
-        <!--
-        Activity for gesture nav onboarding.
-        It's protected by android.permission.REBOOT to ensure that only system apps can start it
-        (setup wizard already has this permission)
-        -->
         <activity android:name="com.android.quickstep.interaction.GestureSandboxActivity"
             android:autoRemoveFromRecents="true"
             android:excludeFromRecents="true"
             android:screenOrientation="portrait"
-            android:permission="android.permission.REBOOT"
             android:exported="true">
             <intent-filter>
                 <action android:name="com.android.quickstep.action.GESTURE_SANDBOX"/>
-- 
GitLab


From 27de7d26430c829cb9fb3cc59eeafdd2f3e965c7 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Wed, 23 Jun 2021 13:49:23 -0700
Subject: [PATCH 1481/1664] Update popup colors. Add local color extraction
 behind a flag.

- Also updating folder backgrounds, lStar only works in ColorStateList.

Bug: 191496301
Test: test wallpaper with light text, in light mode
      test again in dark mode
      test wallpaper with dark text, in light mode
      test again in dark mode

Change-Id: I2d43d874e7e2fad6a9a0e039058beb58b204fa96
---
 .../folder_background_dark.xml                | 20 +++++++
 res/color-night-v31/popup_color_first.xml     | 20 +++++++
 res/color-night-v31/popup_color_second.xml    | 20 +++++++
 res/color-night-v31/popup_color_third.xml     | 20 +++++++
 res/color-v31/folder_background_light.xml     | 20 +++++++
 res/color-v31/popup_color_first.xml           | 20 +++++++
 res/color-v31/popup_color_second.xml          | 20 +++++++
 res/color-v31/popup_color_third.xml           | 20 +++++++
 res/color/popup_color_first.xml               | 18 +++++++
 res/color/popup_color_second.xml              | 18 +++++++
 res/color/popup_color_third.xml               | 18 +++++++
 res/values-v31/colors.xml                     |  4 +-
 .../launcher3/config/FeatureFlags.java        |  3 ++
 .../android/launcher3/popup/ArrowPopup.java   | 52 ++++++++++++++++++-
 14 files changed, 268 insertions(+), 5 deletions(-)
 create mode 100644 res/color-night-v31/folder_background_dark.xml
 create mode 100644 res/color-night-v31/popup_color_first.xml
 create mode 100644 res/color-night-v31/popup_color_second.xml
 create mode 100644 res/color-night-v31/popup_color_third.xml
 create mode 100644 res/color-v31/folder_background_light.xml
 create mode 100644 res/color-v31/popup_color_first.xml
 create mode 100644 res/color-v31/popup_color_second.xml
 create mode 100644 res/color-v31/popup_color_third.xml
 create mode 100644 res/color/popup_color_first.xml
 create mode 100644 res/color/popup_color_second.xml
 create mode 100644 res/color/popup_color_third.xml

diff --git a/res/color-night-v31/folder_background_dark.xml b/res/color-night-v31/folder_background_dark.xml
new file mode 100644
index 0000000000..a5bd6367d5
--- /dev/null
+++ b/res/color-night-v31/folder_background_dark.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:color="@android:color/system_neutral2_50"
+        android:lStar="30" />
+</selector>
diff --git a/res/color-night-v31/popup_color_first.xml b/res/color-night-v31/popup_color_first.xml
new file mode 100644
index 0000000000..ba7412859c
--- /dev/null
+++ b/res/color-night-v31/popup_color_first.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:color="?attr/popupColorPrimary"
+        android:lStar="20" />
+</selector>
diff --git a/res/color-night-v31/popup_color_second.xml b/res/color-night-v31/popup_color_second.xml
new file mode 100644
index 0000000000..efc620532a
--- /dev/null
+++ b/res/color-night-v31/popup_color_second.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:color="?attr/popupColorPrimary"
+        android:lStar="15" />
+</selector>
diff --git a/res/color-night-v31/popup_color_third.xml b/res/color-night-v31/popup_color_third.xml
new file mode 100644
index 0000000000..591c7ede34
--- /dev/null
+++ b/res/color-night-v31/popup_color_third.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:color="?attr/popupColorPrimary"
+        android:lStar="10" />
+</selector>
diff --git a/res/color-v31/folder_background_light.xml b/res/color-v31/folder_background_light.xml
new file mode 100644
index 0000000000..e3c7e7dab1
--- /dev/null
+++ b/res/color-v31/folder_background_light.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:color="@android:color/system_neutral1_50"
+        android:lStar="98" />
+</selector>
diff --git a/res/color-v31/popup_color_first.xml b/res/color-v31/popup_color_first.xml
new file mode 100644
index 0000000000..28d9155f5e
--- /dev/null
+++ b/res/color-v31/popup_color_first.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:color="?attr/popupColorPrimary"
+        android:lStar="98" />
+</selector>
diff --git a/res/color-v31/popup_color_second.xml b/res/color-v31/popup_color_second.xml
new file mode 100644
index 0000000000..dec562c046
--- /dev/null
+++ b/res/color-v31/popup_color_second.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:color="?attr/popupColorPrimary"
+        android:lStar="95" />
+</selector>
diff --git a/res/color-v31/popup_color_third.xml b/res/color-v31/popup_color_third.xml
new file mode 100644
index 0000000000..582232c536
--- /dev/null
+++ b/res/color-v31/popup_color_third.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:color="?attr/popupColorPrimary"
+        android:lStar="90" />
+</selector>
diff --git a/res/color/popup_color_first.xml b/res/color/popup_color_first.xml
new file mode 100644
index 0000000000..d9999a20c8
--- /dev/null
+++ b/res/color/popup_color_first.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:color="?attr/popupColorPrimary" />
+</selector>
diff --git a/res/color/popup_color_second.xml b/res/color/popup_color_second.xml
new file mode 100644
index 0000000000..d9999a20c8
--- /dev/null
+++ b/res/color/popup_color_second.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:color="?attr/popupColorPrimary" />
+</selector>
diff --git a/res/color/popup_color_third.xml b/res/color/popup_color_third.xml
new file mode 100644
index 0000000000..d7e9e794e2
--- /dev/null
+++ b/res/color/popup_color_third.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:color="?attr/popupColorPrimary" />
+</selector>
\ No newline at end of file
diff --git a/res/values-v31/colors.xml b/res/values-v31/colors.xml
index 1785623581..71eaa9eb96 100644
--- a/res/values-v31/colors.xml
+++ b/res/values-v31/colors.xml
@@ -39,8 +39,6 @@
     <color name="text_color_tertiary_dark">@android:color/system_neutral2_400</color>
 
     <color name="wallpaper_popup_scrim">@android:color/system_neutral1_900</color>
-    <color name="folder_background_light" android:lstar="98">@android:color/system_neutral1_50</color>
-    <color name="folder_background_dark" android:lstar="30">@android:color/system_neutral2_800</color>
-  
+
     <color name="folder_dot_color">@android:color/system_accent2_50</color>
 </resources>
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index d65eb2209a..66f5c87337 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -78,6 +78,9 @@ public final class FeatureFlags {
     public static final BooleanFlag UNSTABLE_SPRINGS = getDebugFlag(
             "UNSTABLE_SPRINGS", false, "Enable unstable springs for quickstep animations");
 
+    public static final BooleanFlag ENABLE_LOCAL_COLOR_POPUPS = getDebugFlag(
+            "ENABLE_LOCAL_COLOR_POPUPS", false, "Enable local color extraction for popups.");
+
     public static final BooleanFlag KEYGUARD_ANIMATION = getDebugFlag(
             "KEYGUARD_ANIMATION", false, "Enable animation for keyguard going away on wallpaper");
 
diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java
index cb35f74135..a89fb3b618 100644
--- a/src/com/android/launcher3/popup/ArrowPopup.java
+++ b/src/com/android/launcher3/popup/ArrowPopup.java
@@ -16,9 +16,12 @@
 
 package com.android.launcher3.popup;
 
+import static androidx.core.content.ContextCompat.getColorStateList;
+
 import static com.android.launcher3.anim.Interpolators.ACCELERATED_EASE;
 import static com.android.launcher3.anim.Interpolators.DECELERATED_EASE;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_LOCAL_COLOR_POPUPS;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -28,6 +31,7 @@ import android.animation.ValueAnimator;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.Resources;
+import android.graphics.Color;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.drawable.ColorDrawable;
@@ -133,6 +137,8 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
 
     private final String mIterateChildrenTag;
 
+    private final int[] mColors;
+
     public ArrowPopup(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         mInflater = LayoutInflater.from(context);
@@ -171,9 +177,19 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
 
         boolean isAboveAnotherSurface = getTopOpenViewWithType(mLauncher, TYPE_FOLDER) != null
                 || mLauncher.getStateManager().getState() == LauncherState.ALL_APPS;
-        if (!isAboveAnotherSurface && Utilities.ATLEAST_S) {
+        if (!isAboveAnotherSurface && Utilities.ATLEAST_S && ENABLE_LOCAL_COLOR_POPUPS.get()) {
             setupColorExtraction();
         }
+
+        if (isAboveAnotherSurface) {
+            mColors = new int[] {
+                    getColorStateList(context, R.color.popup_color_first).getDefaultColor()};
+        } else {
+            mColors = new int[] {
+                    getColorStateList(context, R.color.popup_color_first).getDefaultColor(),
+                    getColorStateList(context, R.color.popup_color_second).getDefaultColor(),
+                    getColorStateList(context, R.color.popup_color_third).getDefaultColor()};
+        }
     }
 
     public ArrowPopup(Context context, AttributeSet attrs) {
@@ -220,6 +236,16 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
      * Set the margins and radius of backgrounds after views are properly ordered.
      */
     public void assignMarginsAndBackgrounds(ViewGroup viewGroup) {
+        assignMarginsAndBackgrounds(viewGroup, Color.TRANSPARENT);
+    }
+
+    /**
+     * @param backgroundColor When Color.TRANSPARENT, we get color from {@link #mColors}.
+     *                        Otherwise, we will use this color for all child views.
+     */
+    private void assignMarginsAndBackgrounds(ViewGroup viewGroup, int backgroundColor) {
+        final boolean getColorFromColorArray = backgroundColor == Color.TRANSPARENT;
+
         int count = viewGroup.getChildCount();
         int totalVisibleShortcuts = 0;
         for (int i = 0; i < count; i++) {
@@ -229,8 +255,10 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
             }
         }
 
+        int numVisibleChild = 0;
         int numVisibleShortcut = 0;
         View lastView = null;
+        AnimatorSet colorAnimator = new AnimatorSet();
         for (int i = 0; i < count; i++) {
             View view = viewGroup.getChildAt(i);
             if (view.getVisibility() == VISIBLE) {
@@ -242,8 +270,14 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
                 MarginLayoutParams mlp = (MarginLayoutParams) lastView.getLayoutParams();
                 mlp.bottomMargin = 0;
 
+
+                if (getColorFromColorArray) {
+                    backgroundColor = mColors[numVisibleChild % mColors.length];
+                }
+
                 if (view instanceof ViewGroup && mIterateChildrenTag.equals(view.getTag())) {
-                    assignMarginsAndBackgrounds((ViewGroup) view);
+                    assignMarginsAndBackgrounds((ViewGroup) view, backgroundColor);
+                    numVisibleChild++;
                     continue;
                 }
 
@@ -261,8 +295,22 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
                         numVisibleShortcut++;
                     }
                 }
+
+                if (!ENABLE_LOCAL_COLOR_POPUPS.get()) {
+                    setChildColor(view, backgroundColor, colorAnimator);
+                    // Arrow color matches the first child or the last child.
+                    if (!mIsAboveIcon && numVisibleChild == 0) {
+                        mArrowColor = backgroundColor;
+                    } else if (mIsAboveIcon) {
+                        mArrowColor = backgroundColor;
+                    }
+                }
+
+                numVisibleChild++;
             }
         }
+
+        colorAnimator.setDuration(0).start();
         measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
     }
 
-- 
GitLab


From be2dc65f08d428d8d0d111662cb023b9ff5b74f0 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 23 Jun 2021 23:05:27 +0100
Subject: [PATCH 1482/1664] Refine all apps tabs alignment & remove ripple
 effect from tabs

Test: Open all apps and observe the position of tabs alignment.
       Click a tab and observe the fade in color effect.
Fix: 191387242
Change-Id: Ie23a092268ce62eba29059eb5bd266a46ca652a5
---
 res/drawable/all_apps_tabs_background.xml          | 14 +++++---------
 .../launcher3/allapps/AllAppsRecyclerView.java     |  4 ++--
 .../launcher3/allapps/FloatingHeaderView.java      | 10 ++++++++--
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/res/drawable/all_apps_tabs_background.xml b/res/drawable/all_apps_tabs_background.xml
index bf7ee8c20c..aea2e7a98b 100644
--- a/res/drawable/all_apps_tabs_background.xml
+++ b/res/drawable/all_apps_tabs_background.xml
@@ -14,18 +14,14 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="500">
+    android:enterFadeDuration="100">
     <item
         android:id="@+id/unselected"
         android:state_selected="false">
-        <ripple android:color="@color/all_apps_tab_background_selected">
-            <item>
-                <shape android:shape="rectangle">
-                    <corners android:radius="@dimen/all_apps_header_pill_corner_radius" />
-                    <solid android:color="@color/all_apps_tabs_background" />
-                </shape>
-            </item>
-        </ripple>
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/all_apps_header_pill_corner_radius" />
+            <solid android:color="@color/all_apps_tabs_background" />
+        </shape>
     </item>
 
     <item
diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
index 52dc19bbfc..d7a69f1b01 100644
--- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
@@ -454,8 +454,8 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
      */
     public int getTabWidth() {
         DeviceProfile grid = BaseDraggingActivity.fromContext(getContext()).getDeviceProfile();
-        int totalWidth = (grid.availableWidthPx - getPaddingLeft() - getPaddingRight());
+        int totalWidth = getMeasuredWidth() - getPaddingLeft() - getPaddingRight();
         int iconPadding = totalWidth / grid.numShownAllAppsColumns - grid.allAppsIconSizePx;
-        return totalWidth - iconPadding;
+        return totalWidth - iconPadding - grid.allAppsIconDrawablePaddingPx;
     }
 }
diff --git a/src/com/android/launcher3/allapps/FloatingHeaderView.java b/src/com/android/launcher3/allapps/FloatingHeaderView.java
index f1381e97d6..8ea83d56ac 100644
--- a/src/com/android/launcher3/allapps/FloatingHeaderView.java
+++ b/src/com/android/launcher3/allapps/FloatingHeaderView.java
@@ -154,6 +154,14 @@ public class FloatingHeaderView extends LinearLayout implements
         PluginManagerWrapper.INSTANCE.get(getContext()).removePluginListener(this);
     }
 
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        if (mMainRV != null) {
+            mTabLayout.getLayoutParams().width = mMainRV.getTabWidth();
+        }
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+
     private void recreateAllRowsArray() {
         int pluginCount = mPluginRows.size();
         if (pluginCount == 0) {
@@ -224,8 +232,6 @@ public class FloatingHeaderView extends LinearLayout implements
 
         mTabsHidden = tabsHidden;
         mTabLayout.setVisibility(tabsHidden ? View.GONE : View.VISIBLE);
-        mTabLayout.getLayoutParams().width =
-                mAH[AllAppsContainerView.AdapterHolder.MAIN].recyclerView.getTabWidth();
         mMainRV = setupRV(mMainRV, mAH[AllAppsContainerView.AdapterHolder.MAIN].recyclerView);
         mWorkRV = setupRV(mWorkRV, mAH[AllAppsContainerView.AdapterHolder.WORK].recyclerView);
         mParent = (ViewGroup) mMainRV.getParent();
-- 
GitLab


From d86a9948f92eafa6f87f3df61c71cb4dd660be86 Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Wed, 23 Jun 2021 16:11:54 -0700
Subject: [PATCH 1483/1664] Add rounded corners to TaskMenu Items

Bug: 188168717
Test: Manual
Change-Id: I7cce42fb08f03a9689b4c5d56ed8208d6f60f7d7
---
 quickstep/res/drawable/task_menu_item_bg.xml  | 21 +++++++++++++++++++
 quickstep/res/layout/task_menu.xml            |  2 +-
 .../res/layout/task_view_menu_option.xml      |  2 +-
 quickstep/res/values/dimens.xml               |  1 +
 4 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 quickstep/res/drawable/task_menu_item_bg.xml

diff --git a/quickstep/res/drawable/task_menu_item_bg.xml b/quickstep/res/drawable/task_menu_item_bg.xml
new file mode 100644
index 0000000000..b6a8b909ee
--- /dev/null
+++ b/quickstep/res/drawable/task_menu_item_bg.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?android:attr/colorPrimary"/>
+    <corners android:radius="@dimen/task_menu_item_corner_radius"/>
+</shape>
diff --git a/quickstep/res/layout/task_menu.xml b/quickstep/res/layout/task_menu.xml
index 763e45ea5b..3a47e99517 100644
--- a/quickstep/res/layout/task_menu.xml
+++ b/quickstep/res/layout/task_menu.xml
@@ -25,7 +25,7 @@
 
     <TextView
         android:id="@+id/task_name"
-        android:background="?android:attr/colorPrimary"
+        android:background="@drawable/task_menu_item_bg"
         android:textColor="?android:attr/textColorPrimary"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/quickstep/res/layout/task_view_menu_option.xml b/quickstep/res/layout/task_view_menu_option.xml
index 19ca3e350e..5978b97dd4 100644
--- a/quickstep/res/layout/task_view_menu_option.xml
+++ b/quickstep/res/layout/task_view_menu_option.xml
@@ -21,7 +21,7 @@
     android:orientation="vertical"
     android:paddingTop="@dimen/task_card_menu_option_vertical_padding"
     android:paddingBottom="@dimen/task_card_menu_option_vertical_padding"
-    android:background="?android:attr/colorPrimary"
+    android:background="@drawable/task_menu_item_bg"
     android:theme="@style/PopupItem" >
 
     <View
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 60eeaffbbb..28262a8721 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -24,6 +24,7 @@
 
     <!--  Task Menu View  -->
     <dimen name="task_menu_corner_radius">22dp</dimen>
+    <dimen name="task_menu_item_corner_radius">4dp</dimen>
     <dimen name="overview_proactive_row_height">48dp</dimen>
     <dimen name="overview_proactive_row_bottom_margin">16dp</dimen>
 
-- 
GitLab


From f64f9a14d8289387618e472037afa537f25d3641 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 23 Jun 2021 16:35:11 -0700
Subject: [PATCH 1484/1664] Ensure InputConsumer is non-null in remaining cases

Anywhere that was using mResetGestureInputConsumer now uses getDefaultInputConsumer, which returns NO_OP if mResetGestureInputConsumer is null.

Test: none
Bug: 191684742
Change-Id: I1ae02b01a9629fa0830955dfe4d83c95a4759c14
---
 .../quickstep/TouchInteractionService.java    | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index c9b68dfe34..84f7e83737 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -64,6 +64,7 @@ import android.view.Surface;
 import android.view.accessibility.AccessibilityManager;
 
 import androidx.annotation.BinderThread;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 import androidx.annotation.WorkerThread;
@@ -303,10 +304,10 @@ public class TouchInteractionService extends Service implements PluginListener<O
     private RecentsAnimationDeviceState mDeviceState;
     private TaskAnimationManager mTaskAnimationManager;
 
-    private InputConsumer mUncheckedConsumer = InputConsumer.NO_OP;
-    private InputConsumer mConsumer = InputConsumer.NO_OP;
+    private @NonNull InputConsumer mUncheckedConsumer = InputConsumer.NO_OP;
+    private @NonNull InputConsumer mConsumer = InputConsumer.NO_OP;
     private Choreographer mMainChoreographer;
-    private InputConsumer mResetGestureInputConsumer;
+    private @Nullable ResetGestureInputConsumer mResetGestureInputConsumer;
     private GestureState mGestureState = DEFAULT_STATE;
 
     private InputMonitorCompat mInputMonitorCompat;
@@ -635,7 +636,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
                 // launched while device is locked even after exiting direct boot mode (e.g. camera).
                 return createDeviceLockedInputConsumer(newGestureState);
             } else {
-                return mResetGestureInputConsumer;
+                return getDefaultInputConsumer();
             }
         }
 
@@ -644,7 +645,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
         InputConsumer base = canStartSystemGesture
                 || previousGestureState.isRecentsAnimationRunning()
                         ? newBaseConsumer(previousGestureState, newGestureState, event)
-                        : mResetGestureInputConsumer;
+                        : getDefaultInputConsumer();
         if (mDeviceState.isGesturalNavMode()) {
             handleOrientationSetup(base);
         }
@@ -698,7 +699,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
             }
         } else {
             if (mDeviceState.isScreenPinningActive()) {
-                base = mResetGestureInputConsumer;
+                base = getDefaultInputConsumer();
             }
 
             if (mDeviceState.canTriggerOneHandedAction(event)) {
@@ -740,14 +741,14 @@ public class TouchInteractionService extends Service implements PluginListener<O
             return createOverviewInputConsumer(
                     previousGestureState, gestureState, event, forceOverviewInputConsumer);
         } else if (gestureState.getRunningTask() == null) {
-            return mResetGestureInputConsumer;
+            return getDefaultInputConsumer();
         } else if (previousGestureState.isRunningAnimationToLauncher()
                 || gestureState.getActivityInterface().isResumed()
                 || forceOverviewInputConsumer) {
             return createOverviewInputConsumer(
                     previousGestureState, gestureState, event, forceOverviewInputConsumer);
         } else if (mDeviceState.isGestureBlockedActivity(gestureState.getRunningTask())) {
-            return mResetGestureInputConsumer;
+            return getDefaultInputConsumer();
         } else {
             return createOtherActivityInputConsumer(gestureState, event);
         }
@@ -775,7 +776,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
             return new DeviceLockedInputConsumer(this, mDeviceState, mTaskAnimationManager,
                     gestureState, mInputMonitorCompat);
         } else {
-            return mResetGestureInputConsumer;
+            return getDefaultInputConsumer();
         }
     }
 
@@ -784,7 +785,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
             boolean forceOverviewInputConsumer) {
         StatefulActivity activity = gestureState.getActivityInterface().getCreatedActivity();
         if (activity == null) {
-            return mResetGestureInputConsumer;
+            return getDefaultInputConsumer();
         }
 
         if (activity.getRootView().hasWindowFocus()
@@ -813,13 +814,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
     }
 
     private void reset() {
-        if (mResetGestureInputConsumer != null) {
-            mConsumer = mUncheckedConsumer = mResetGestureInputConsumer;
-        } else {
-            // mResetGestureInputConsumer isn't initialized until onUserUnlocked(), so reset to
-            // NO_OP until then (we never want these to be null).
-            mConsumer = mUncheckedConsumer = InputConsumer.NO_OP;
-        }
+        mConsumer = mUncheckedConsumer = getDefaultInputConsumer();
         mGestureState = DEFAULT_STATE;
         // By default, use batching of the input events, but check receiver before using in the rare
         // case that the monitor was disposed before the swipe settled
@@ -828,6 +823,19 @@ public class TouchInteractionService extends Service implements PluginListener<O
         }
     }
 
+    /**
+     * Returns the {@link ResetGestureInputConsumer} if user is unlocked, else NO_OP.
+     */
+    private @NonNull InputConsumer getDefaultInputConsumer() {
+        if (mResetGestureInputConsumer != null) {
+            return mResetGestureInputConsumer;
+        } else {
+            // mResetGestureInputConsumer isn't initialized until onUserUnlocked(), so reset to
+            // NO_OP until then (we never want these to be null).
+            return InputConsumer.NO_OP;
+        }
+    }
+
     private void preloadOverview(boolean fromInit) {
         if (!mDeviceState.isUserUnlocked()) {
             return;
-- 
GitLab


From 53e8b46f6639332383d7f192663dd8f8137120eb Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Thu, 24 Jun 2021 16:49:26 +0100
Subject: [PATCH 1485/1664] Measure WidgetsBottomPicker again when the number
 of spans changes

Bug: In onMeasure, we calculate the number of spans that can be fit
horizontally. If the number of spans has changed, we re-organize
widgets shown in the table. However, after that, we didn't measure
WidgetsBottomPicker and its children again. As a result, the newly
added widget previews' dimensions are never measured.

Test: Long press clock app and then click widgets. Rotates the screen
      and observe widgets correctly shown.
Fix: 191644950
Change-Id: Iae94fba5b137807483e061d785b18d59defb013e
---
 .../launcher3/widget/WidgetsBottomSheet.java  | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/src/com/android/launcher3/widget/WidgetsBottomSheet.java b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
index d0e69fa3ea..37b950d502 100644
--- a/src/com/android/launcher3/widget/WidgetsBottomSheet.java
+++ b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
@@ -23,6 +23,7 @@ import android.content.Context;
 import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.util.IntProperty;
+import android.util.Log;
 import android.util.Pair;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -35,6 +36,8 @@ import android.widget.TableLayout;
 import android.widget.TableRow;
 import android.widget.TextView;
 
+import androidx.annotation.GuardedBy;
+
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Insettable;
 import com.android.launcher3.LauncherAppState;
@@ -51,6 +54,7 @@ import java.util.List;
  * Bottom sheet for the "Widgets" system shortcut in the long-press popup.
  */
 public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
+    private static final String TAG = "WidgetsBottomSheet";
 
     private static final IntProperty<View> PADDING_BOTTOM =
             new IntProperty<View>("paddingBottom") {
@@ -128,6 +132,32 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        if (doMeasure(widthMeasureSpec, heightMeasureSpec)) {
+            boolean hasUpdated = doMeasure(widthMeasureSpec, heightMeasureSpec);
+            if (hasUpdated) {
+                Log.w(TAG, "WidgetsBottomSheet dimension has been updated after a 2nd"
+                        + " measurement.");
+            }
+        }
+    }
+
+    /**
+     * Measures the dimension of this view and its children.
+     *
+     * <p>This function takes account of the following during measurement:
+     * <ol>
+     *     <li>status bar and system navigation bar insets</li>
+     *     <li>
+     *         number of spans that can fit in a row. This affects the number of widgets that can
+     *         fit in a row.
+     *     </li>
+     * </ol>
+     *
+     * @return {@code true} if the width or height of this view or its children have changed after
+     *          the measurement. Otherwise, returns {@code false}.
+     */
+    @GuardedBy("MainThread")
+    private boolean doMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         DeviceProfile deviceProfile = mActivityContext.getDeviceProfile();
         int widthUsed;
         if (mInsets.bottom > 0) {
@@ -153,7 +183,9 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
             // Ensure the table layout is showing widgets in the right column after measure.
             mMaxHorizontalSpan = maxHorizontalSpan;
             onWidgetsBound();
+            return true;
         }
+        return false;
     }
 
     @Override
-- 
GitLab


From 6a936e3ec43af77dde93eefe0c06e6ce86a748b7 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Thu, 24 Jun 2021 10:58:56 -0700
Subject: [PATCH 1486/1664] Update colors for non-v31 devices.

Also renamed to popup color to popup shade to better differentiate
between the primary/secondary/tertirary popup colors.

Bug: 191496301
Test: Removed v31 colors to verify the non-v31 colors, that the shades are as expected
      Tested on wallpapaper with light text, again with dark mode
      Tested on wallpaper with dark text, and then again with dark mode

Change-Id: I3ec9ee7f85696ee48224740a1ec7f4abe42348ee
---
 .../{popup_color_first.xml => popup_shade_first.xml}  |  0
 ...{popup_color_second.xml => popup_shade_second.xml} |  0
 .../{popup_color_third.xml => popup_shade_third.xml}  |  0
 .../{popup_color_first.xml => popup_shade_first.xml}  |  0
 ...{popup_color_second.xml => popup_shade_second.xml} |  0
 .../{popup_color_third.xml => popup_shade_third.xml}  |  0
 .../{popup_color_first.xml => popup_shade_first.xml}  |  2 +-
 ...{popup_color_second.xml => popup_shade_second.xml} |  2 +-
 .../{popup_color_third.xml => popup_shade_third.xml}  |  2 +-
 res/values/attrs.xml                                  |  3 +++
 res/values/colors.xml                                 | 11 +++++++++--
 res/values/styles.xml                                 |  6 ++++++
 src/com/android/launcher3/popup/ArrowPopup.java       |  8 ++++----
 13 files changed, 25 insertions(+), 9 deletions(-)
 rename res/color-night-v31/{popup_color_first.xml => popup_shade_first.xml} (100%)
 rename res/color-night-v31/{popup_color_second.xml => popup_shade_second.xml} (100%)
 rename res/color-night-v31/{popup_color_third.xml => popup_shade_third.xml} (100%)
 rename res/color-v31/{popup_color_first.xml => popup_shade_first.xml} (100%)
 rename res/color-v31/{popup_color_second.xml => popup_shade_second.xml} (100%)
 rename res/color-v31/{popup_color_third.xml => popup_shade_third.xml} (100%)
 rename res/color/{popup_color_first.xml => popup_shade_first.xml} (93%)
 rename res/color/{popup_color_second.xml => popup_shade_second.xml} (93%)
 rename res/color/{popup_color_third.xml => popup_shade_third.xml} (93%)

diff --git a/res/color-night-v31/popup_color_first.xml b/res/color-night-v31/popup_shade_first.xml
similarity index 100%
rename from res/color-night-v31/popup_color_first.xml
rename to res/color-night-v31/popup_shade_first.xml
diff --git a/res/color-night-v31/popup_color_second.xml b/res/color-night-v31/popup_shade_second.xml
similarity index 100%
rename from res/color-night-v31/popup_color_second.xml
rename to res/color-night-v31/popup_shade_second.xml
diff --git a/res/color-night-v31/popup_color_third.xml b/res/color-night-v31/popup_shade_third.xml
similarity index 100%
rename from res/color-night-v31/popup_color_third.xml
rename to res/color-night-v31/popup_shade_third.xml
diff --git a/res/color-v31/popup_color_first.xml b/res/color-v31/popup_shade_first.xml
similarity index 100%
rename from res/color-v31/popup_color_first.xml
rename to res/color-v31/popup_shade_first.xml
diff --git a/res/color-v31/popup_color_second.xml b/res/color-v31/popup_shade_second.xml
similarity index 100%
rename from res/color-v31/popup_color_second.xml
rename to res/color-v31/popup_shade_second.xml
diff --git a/res/color-v31/popup_color_third.xml b/res/color-v31/popup_shade_third.xml
similarity index 100%
rename from res/color-v31/popup_color_third.xml
rename to res/color-v31/popup_shade_third.xml
diff --git a/res/color/popup_color_first.xml b/res/color/popup_shade_first.xml
similarity index 93%
rename from res/color/popup_color_first.xml
rename to res/color/popup_shade_first.xml
index d9999a20c8..151190b6d4 100644
--- a/res/color/popup_color_first.xml
+++ b/res/color/popup_shade_first.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:color="?attr/popupColorPrimary" />
+    <item android:color="?attr/popupShadeFirst" />
 </selector>
diff --git a/res/color/popup_color_second.xml b/res/color/popup_shade_second.xml
similarity index 93%
rename from res/color/popup_color_second.xml
rename to res/color/popup_shade_second.xml
index d9999a20c8..86608501f0 100644
--- a/res/color/popup_color_second.xml
+++ b/res/color/popup_shade_second.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:color="?attr/popupColorPrimary" />
+    <item android:color="?attr/popupShadeSecond" />
 </selector>
diff --git a/res/color/popup_color_third.xml b/res/color/popup_shade_third.xml
similarity index 93%
rename from res/color/popup_color_third.xml
rename to res/color/popup_shade_third.xml
index d7e9e794e2..95447288fd 100644
--- a/res/color/popup_color_third.xml
+++ b/res/color/popup_shade_third.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:color="?attr/popupColorPrimary" />
+    <item android:color="?attr/popupShadeThird" />
 </selector>
\ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 1fadc881c2..52df1d3ab0 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -25,6 +25,9 @@
     <attr name="popupColorPrimary" format="color" />
     <attr name="popupColorSecondary" format="color" />
     <attr name="popupColorTertiary" format="color" />
+    <attr name="popupShadeFirst" format="color" />
+    <attr name="popupShadeSecond" format="color" />
+    <attr name="popupShadeThird" format="color" />
     <attr name="isMainColorDark" format="boolean" />
     <attr name="isWorkspaceDarkText" format="boolean" />
     <attr name="workspaceTextColor" format="color" />
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 01f5364459..e32eea0e4a 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -53,6 +53,13 @@
     <color name="popup_color_secondary_dark">#202124</color>
     <color name="popup_color_tertiary_dark">#757575</color> <!-- Gray 600 -->
 
+    <color name="popup_shade_first_light">#F9F9F9</color>
+    <color name="popup_shade_second_light">#F1F1F1</color>
+    <color name="popup_shade_third_light">#E2E2E2</color>
+    <color name="popup_shade_first_dark">#303030</color>
+    <color name="popup_shade_second_dark">#262626</color>
+    <color name="popup_shade_third_dark">#1B1B1B</color>
+
     <color name="popup_notification_dot_light">#FFF</color>
     <color name="popup_notification_dot_dark">#757575</color>
 
@@ -62,8 +69,8 @@
     <color name="folder_hint_text_color_light">#FFF</color>
     <color name="folder_hint_text_color_dark">#FF000000</color>
 
-    <color name="folder_background_light">#FFFFFF</color>
-    <color name="folder_background_dark">#FF3C4043</color>
+    <color name="folder_background_light">#F9F9F9</color>
+    <color name="folder_background_dark">#464746</color>
 
     <color name="folder_dot_color">?attr/colorPrimary</color>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 871214fc4f..dbb1b0ea52 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -37,6 +37,9 @@
         <item name="popupColorPrimary">@color/popup_color_primary_light</item>
         <item name="popupColorSecondary">@color/popup_color_secondary_light</item>
         <item name="popupColorTertiary">@color/popup_color_tertiary_light</item>
+        <item name="popupShadeFirst">@color/popup_shade_first_light</item>
+        <item name="popupShadeSecond">@color/popup_shade_second_light</item>
+        <item name="popupShadeThird">@color/popup_shade_third_light</item>
         <item name="popupNotificationDotColor">@color/popup_notification_dot_light</item>
         <item name="isMainColorDark">false</item>
         <item name="isWorkspaceDarkText">false</item>
@@ -97,6 +100,9 @@
         <item name="popupColorSecondary">@color/popup_color_secondary_dark</item>
         <item name="popupColorTertiary">@color/popup_color_tertiary_dark</item>
         <item name="popupNotificationDotColor">@color/popup_notification_dot_dark</item>
+        <item name="popupShadeFirst">@color/popup_shade_first_dark</item>
+        <item name="popupShadeSecond">@color/popup_shade_second_dark</item>
+        <item name="popupShadeThird">@color/popup_shade_third_dark</item>
         <item name="widgetsTheme">@style/WidgetContainerTheme.Dark</item>
         <item name="folderDotColor">@color/folder_dot_color</item>
         <item name="folderFillColor">@color/folder_background_dark</item>
diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java
index a89fb3b618..b7fe3480fa 100644
--- a/src/com/android/launcher3/popup/ArrowPopup.java
+++ b/src/com/android/launcher3/popup/ArrowPopup.java
@@ -183,12 +183,12 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
 
         if (isAboveAnotherSurface) {
             mColors = new int[] {
-                    getColorStateList(context, R.color.popup_color_first).getDefaultColor()};
+                    getColorStateList(context, R.color.popup_shade_first).getDefaultColor()};
         } else {
             mColors = new int[] {
-                    getColorStateList(context, R.color.popup_color_first).getDefaultColor(),
-                    getColorStateList(context, R.color.popup_color_second).getDefaultColor(),
-                    getColorStateList(context, R.color.popup_color_third).getDefaultColor()};
+                    getColorStateList(context, R.color.popup_shade_first).getDefaultColor(),
+                    getColorStateList(context, R.color.popup_shade_second).getDefaultColor(),
+                    getColorStateList(context, R.color.popup_shade_third).getDefaultColor()};
         }
     }
 
-- 
GitLab


From 95d23f9a4dda4a058f66d79a1f28cd28e8314440 Mon Sep 17 00:00:00 2001
From: Zak Cohen <zakcohen@google.com>
Date: Thu, 24 Jun 2021 18:11:36 +0000
Subject: [PATCH 1487/1664] Revert "Fix some touch issues during gesture nav
 transition"

This reverts commit 1351c2214d54d01ee457ee338d0559ef3796c083.

Reason for revert: Suspect causing test failures: https://b.corp.google.com/issues/191946109

Change-Id: Ib1b5545b3a612e89923ea06a890e4a07be9fa857
---
 .../src/com/android/quickstep/AbsSwipeUpHandler.java     | 7 ++-----
 .../src/com/android/quickstep/views/RecentsView.java     | 9 +--------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index d511e6da9f..4d47ef15c1 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -230,7 +230,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
 
     // Used to control launcher components throughout the swipe gesture.
     private AnimatorControllerWithResistance mLauncherTransitionController;
-    private boolean mHasEndedLauncherTransition;
 
     private AnimationFactory mAnimationFactory = (t) -> { };
 
@@ -604,11 +603,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
 
     /**
      * We don't want to change mLauncherTransitionController if mGestureState.getEndTarget() == HOME
-     * (it has its own animation) or if we explicitly ended the controller already.
+     * (it has its own animation).
      * @return Whether we can create the launcher controller or update its progress.
      */
     private boolean canCreateNewOrUpdateExistingLauncherTransitionController() {
-        return mGestureState.getEndTarget() != HOME && !mHasEndedLauncherTransition;
+        return mGestureState.getEndTarget() != HOME;
     }
 
     @Override
@@ -1422,8 +1421,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     }
 
     private void endLauncherTransitionController() {
-        mHasEndedLauncherTransition = true;
-
         if (mLauncherTransitionController != null) {
             // End the animation, but stay at the same visual progress.
             mLauncherTransitionController.getNormalController().dispatchSetInterpolator(
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 8a665251ff..2b256a43c6 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1248,9 +1248,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
 
     private void updateOrientationHandler() {
         // Handle orientation changes.
-        PagedOrientationHandler oldOrientationHandler = mOrientationHandler;
         mOrientationHandler = mOrientationState.getOrientationHandler();
-
         mIsRtl = mOrientationHandler.getRecentsRtlSetting(getResources());
         setLayoutDirection(mIsRtl
                 ? View.LAYOUT_DIRECTION_RTL
@@ -1259,12 +1257,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 ? View.LAYOUT_DIRECTION_LTR
                 : View.LAYOUT_DIRECTION_RTL);
         mClearAllButton.setRotation(mOrientationHandler.getDegreesRotated());
-
-        if (!mOrientationHandler.equals(oldOrientationHandler)) {
-            // Changed orientations, update controllers so they intercept accordingly.
-            mActivity.getDragLayer().recreateControllers();
-        }
-
+        mActivity.getDragLayer().recreateControllers();
         boolean isInLandscape = mOrientationState.getTouchRotation() != ROTATION_0
                 || mOrientationState.getRecentsActivityRotation() != ROTATION_0;
         mActionsView.updateHiddenFlags(HIDDEN_NON_ZERO_ROTATION,
-- 
GitLab


From ca383ffdf54086e9b29c3fa9fa82253e6e800524 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Thu, 24 Jun 2021 11:44:57 -0700
Subject: [PATCH 1488/1664] Postponing CUJ start by 1 frame

for CUJ_APP_LAUNCH_FROM_ICON, CUJ_APP_CLOSE_TO_HOME,
CUJ_APP_LAUNCH_FROM_WIDGET and CUJ_APP_LAUNCH_FROM_RECENTS

Test: Local perfetto run
Bug: 190858586
Change-Id: I7a26d91c44a0a4c767bde3230d39a096a26d7b75
---
 .../launcher3/QuickstepTransitionManager.java | 55 +++++++++++++------
 1 file changed, 37 insertions(+), 18 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 31cf51c3b3..2a815d2bc2 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -71,6 +71,7 @@ import android.util.Size;
 import android.view.SurfaceControl;
 import android.view.View;
 import android.view.ViewRootImpl;
+import android.view.ViewTreeObserver;
 import android.view.animation.Interpolator;
 import android.view.animation.PathInterpolator;
 
@@ -255,7 +256,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
 
     /**
      * @return ActivityOptions with remote animations that controls how the window of the opening
-     *         targets are displayed.
+     * targets are displayed.
      */
     public ActivityOptionsWrapper getActivityLaunchOptions(Launcher launcher, View v) {
         boolean fromRecents = isLaunchingFromRecents(v, null /* targets */);
@@ -284,7 +285,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
      * may not always be correct as we may resolve the opening app to a task when the animation
      * starts.
      *
-     * @param v the view to launch from
+     * @param v       the view to launch from
      * @param targets apps that are opening/closing
      * @return true if the app is launching from recents, false if it most likely is not
      */
@@ -297,9 +298,9 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
     /**
      * Composes the animations for a launch from the recents list.
      *
-     * @param anim the animator set to add to
-     * @param v the launching view
-     * @param appTargets the apps that are opening/closing
+     * @param anim            the animator set to add to
+     * @param v               the launching view
+     * @param appTargets      the apps that are opening/closing
      * @param launcherClosing true if the launcher app is closing
      */
     protected void composeRecentsLaunchAnimator(@NonNull AnimatorSet anim, @NonNull View v,
@@ -326,9 +327,9 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
     /**
      * Compose the animations for a launch from the app icon.
      *
-     * @param anim the animation to add to
-     * @param v the launching view with the icon
-     * @param appTargets the list of opening/closing apps
+     * @param anim            the animation to add to
+     * @param v               the launching view with the icon
+     * @param appTargets      the list of opening/closing apps
      * @param launcherClosing true if launcher is closing
      */
     private void composeIconLaunchAnimator(@NonNull AnimatorSet anim, @NonNull View v,
@@ -366,7 +367,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                 public void onAnimationStart(Animator animation) {
                     mLauncher.addOnResumeCallback(() ->
                             ObjectAnimator.ofFloat(mLauncher.getDepthController(), DEPTH,
-                            mLauncher.getStateManager().getState().getDepth(mLauncher)).start());
+                                    mLauncher.getStateManager().getState().getDepth(
+                                            mLauncher)).start());
                 }
             });
         }
@@ -443,7 +445,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
      *
      * @param isAppOpening True when this is called when an app is opening.
      *                     False when this is called when an app is closing.
-     * @param startDelay Start delay duration.
+     * @param startDelay   Start delay duration.
      */
     private Pair<AnimatorSet, Runnable> getLauncherContentAnimator(boolean isAppOpening,
             int startDelay) {
@@ -451,12 +453,12 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
         Runnable endListener;
 
         float[] alphas = isAppOpening
-                ? new float[] {1, 0}
-                : new float[] {0, 1};
+                ? new float[]{1, 0}
+                : new float[]{0, 1};
 
         float[] scales = isAppOpening
-                ? new float[] {1, mContentScale}
-                : new float[] {mContentScale, 1};
+                ? new float[]{1, mContentScale}
+                : new float[]{mContentScale, 1};
 
         if (mLauncher.isInState(ALL_APPS)) {
             // All Apps in portrait mode is full screen, so we only animate AllAppsContainerView.
@@ -550,7 +552,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
     /**
      * Compose recents view alpha and translation Y animation when launcher opens/closes apps.
      *
-     * @param anim the animator set to add to
+     * @param anim   the animator set to add to
      * @param alphas the alphas to animate to over time
      * @param scales the scale values to animator to over time
      * @return listener to run when the animation ends
@@ -703,7 +705,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
 
                 float scaledCropWidth = windowCropWidth * scale;
                 float scaledCropHeight = windowCropHeight * scale;
-                float offsetX  = (scaledCropWidth - iconWidth) / 2;
+                float offsetX = (scaledCropWidth - iconWidth) / 2;
                 float offsetY = (scaledCropHeight - iconHeight) / 2;
 
                 // Calculate the window position to match the icon position.
@@ -1085,7 +1087,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
 
     /**
      * @return Runner that plays when user goes to Launcher
-     *         ie. pressing home, swiping up from nav bar.
+     * ie. pressing home, swiping up from nav bar.
      */
     WrappedAnimationRunnerImpl createWallpaperOpenRunner(boolean fromUnlock) {
         return new WallpaperOpenLauncherAnimationRunner(mHandler, fromUnlock);
@@ -1217,7 +1219,24 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
         anim.addListener(new AnimationSuccessListener() {
             @Override
             public void onAnimationStart(Animator animation) {
-                InteractionJankMonitorWrapper.begin(mDragLayer, cuj);
+                mDragLayer.getViewTreeObserver().addOnDrawListener(
+                        new ViewTreeObserver.OnDrawListener() {
+                            boolean mHandled = false;
+
+                            @Override
+                            public void onDraw() {
+                                if (mHandled) {
+                                    return;
+                                }
+                                mHandled = true;
+
+                                InteractionJankMonitorWrapper.begin(mDragLayer, cuj);
+
+                                mDragLayer.post(() ->
+                                        mDragLayer.getViewTreeObserver().removeOnDrawListener(
+                                                this));
+                            }
+                        });
                 super.onAnimationStart(animation);
             }
 
-- 
GitLab


From 8bdb222a1830e30cda1e77e0222cdbf5885cfc7d Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Wed, 23 Jun 2021 18:10:10 -0700
Subject: [PATCH 1489/1664] Move qsb according to spec.

Bug: 175329686
Test: visual test
      checked 5x5 and confirmed no visual change
      checked 4x5 and confirmed visual change
      - tested various display sizes to ensure no overlapping is caused

Change-Id: I95a80b484516f634fa13347534810c7a51cecc8d
Merged-In: I95a80b484516f634fa13347534810c7a51cecc8d
---
 res/values/dimens.xml                        |  1 +
 src/com/android/launcher3/DeviceProfile.java |  9 +++++++++
 src/com/android/launcher3/Hotseat.java       | 10 ++++++++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index bc63c061f8..270c92e871 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -41,6 +41,7 @@
 
     <!-- Scalable Grid -->
     <dimen name="scalable_grid_left_right_margin">22dp</dimen>
+    <dimen name="scalable_grid_qsb_bottom_margin">42dp</dimen>
 
     <!-- Workspace page indicator -->
     <dimen name="workspace_page_indicator_height">24dp</dimen>
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index d301787cbc..009e098fef 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -158,6 +158,9 @@ public class DeviceProfile {
     public final int hotseatBarSidePaddingStartPx;
     public final int hotseatBarSidePaddingEndPx;
 
+    public final float qsbBottomMarginOriginalPx;
+    public int qsbBottomMarginPx;
+
     // All apps
     public int allAppsOpenVerticalTranslate;
     public int allAppsCellHeightPx;
@@ -331,6 +334,10 @@ public class DeviceProfile {
                 res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_extra_vertical_size);
         updateHotseatIconSize(pxFromDp(inv.iconSize, mMetrics, 1f));
 
+        qsbBottomMarginOriginalPx = isScalableGrid
+                ? res.getDimensionPixelSize(R.dimen.scalable_grid_qsb_bottom_margin)
+                : 0;
+
         overviewTaskMarginPx = res.getDimensionPixelSize(R.dimen.overview_task_margin);
         overviewTaskIconSizePx =
                 isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get() ? res.getDimensionPixelSize(
@@ -359,6 +366,8 @@ public class DeviceProfile {
             extraHotseatBottomPadding = Math.round(paddingHotseatBottom * iconScale);
 
             hotseatBarSizePx += extraHotseatBottomPadding;
+
+            qsbBottomMarginPx = Math.round(qsbBottomMarginOriginalPx * iconScale);
         } else if (!isVerticalBarLayout() && isPhone && isTallDevice) {
             // We increase the hotseat size when there is extra space.
             // ie. For a display with a large aspect ratio, we can keep the icons on the workspace
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index ff380ce1ae..42b4e89c13 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -206,8 +206,14 @@ public class Hotseat extends CellLayout implements Insettable {
         int freeSpace = dp.isTaskbarPresent
                 ? dp.workspacePadding.bottom
                 : dp.hotseatBarSizePx - dp.hotseatCellHeightPx - mQsbHeight;
-        return (int) (freeSpace * QSB_CENTER_FACTOR)
-                + (dp.isTaskbarPresent ? dp.taskbarSize : dp.getInsets().bottom);
+
+        if (dp.isScalableGrid && dp.qsbBottomMarginPx <= freeSpace) {
+            return dp.qsbBottomMarginPx;
+        } else {
+            return (int) (freeSpace * QSB_CENTER_FACTOR) + (dp.isTaskbarPresent
+                    ? dp.taskbarSize
+                    : dp.getInsets().bottom);
+        }
     }
 
     /**
-- 
GitLab


From e92c63f45b9b29cf1b2fdd332a160c1f0a9bb73a Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Thu, 24 Jun 2021 20:09:32 +0100
Subject: [PATCH 1490/1664] Remove scrim from navigation bar from full widget
 picker.

Bug: 191926325
Test: Manually tested
Change-Id: Idc5fded9e8227a6aa9cf58c9e2cce146dc52a2c6
---
 .../launcher3/views/TopRoundedCornerView.java | 20 -------------------
 .../widget/picker/WidgetsFullSheet.java       |  1 -
 2 files changed, 21 deletions(-)

diff --git a/src/com/android/launcher3/views/TopRoundedCornerView.java b/src/com/android/launcher3/views/TopRoundedCornerView.java
index 5519df1f49..92cce92ae7 100644
--- a/src/com/android/launcher3/views/TopRoundedCornerView.java
+++ b/src/com/android/launcher3/views/TopRoundedCornerView.java
@@ -17,12 +17,10 @@ package com.android.launcher3.views;
 
 import android.content.Context;
 import android.graphics.Canvas;
-import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.RectF;
 import android.util.AttributeSet;
 
-import com.android.launcher3.R;
 import com.android.launcher3.util.Themes;
 
 /**
@@ -34,41 +32,23 @@ public class TopRoundedCornerView extends SpringRelativeLayout {
     private final Path mClipPath = new Path();
     private float[] mRadii;
 
-    private final Paint mNavBarScrimPaint;
-    private int mNavBarScrimHeight = 0;
-
     public TopRoundedCornerView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
 
         float radius = Themes.getDialogCornerRadius(context);
         mRadii = new float[] {radius, radius, radius, radius, 0, 0, 0, 0};
-
-        mNavBarScrimPaint = new Paint();
-        mNavBarScrimPaint.setColor(Themes.getAttrColor(context, R.attr.allAppsNavBarScrimColor));
     }
 
     public TopRoundedCornerView(Context context, AttributeSet attrs) {
         this(context, attrs, 0);
     }
 
-    public void setNavBarScrimHeight(int height) {
-        if (mNavBarScrimHeight != height) {
-            mNavBarScrimHeight = height;
-            invalidate();
-        }
-    }
-
     @Override
     public void draw(Canvas canvas) {
         canvas.save();
         canvas.clipPath(mClipPath);
         super.draw(canvas);
         canvas.restore();
-
-        if (mNavBarScrimHeight > 0) {
-            canvas.drawRect(0, getHeight() - mNavBarScrimHeight, getWidth(), getHeight(),
-                    mNavBarScrimPaint);
-        }
     }
 
     @Override
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 1a58bb066d..0106ef5d5f 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -323,7 +323,6 @@ public class WidgetsFullSheet extends BaseWidgetSheet
             clearNavBarColor();
         }
 
-        ((TopRoundedCornerView) mContent).setNavBarScrimHeight(mInsets.bottom);
         requestLayout();
     }
 
-- 
GitLab


From 46319004c1d5094dfcd108a591aa6dfb1318ab28 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 22 Jun 2021 14:01:28 -0700
Subject: [PATCH 1491/1664] Tweak live tile rotation handling

- With ag/15023409, the system will screenshot and cancel the recents
  animation based on the hint provided by launcher when there is a
  global config change. As such, we can remove extra handling of the
  configuration change on the launcher side, and handle the cancel
  with the provided snapshot.

  To handle the snapshot, we need to hook into the gesture state
  recents animation callbacks (which actually are of the lifecycle of
  the animation and not just the gesture).

Bug: 189843542
Test: With live-tile enabled, swipe up to overview and rotate
Change-Id: If74f3fc5d47c327f9f5cca8f1f5d23b48cd3c954
---
 .../android/quickstep/AbsSwipeUpHandler.java  | 18 +++++++--
 .../com/android/quickstep/GestureState.java   | 17 +++++++++
 .../quickstep/RecentsAnimationController.java | 16 ++++++++
 .../android/quickstep/views/RecentsView.java  | 37 +++++++++----------
 4 files changed, 66 insertions(+), 22 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 4d47ef15c1..7f38923671 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -42,6 +42,7 @@ import static com.android.quickstep.GestureState.GestureEndTarget.NEW_TASK;
 import static com.android.quickstep.GestureState.GestureEndTarget.RECENTS;
 import static com.android.quickstep.GestureState.STATE_END_TARGET_ANIMATION_FINISHED;
 import static com.android.quickstep.GestureState.STATE_END_TARGET_SET;
+import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_CANCELED;
 import static com.android.quickstep.GestureState.STATE_RECENTS_SCROLLING_FINISHED;
 import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;
 import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
@@ -378,6 +379,17 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
             activity.runOnceOnStart(this::onLauncherStart);
         }
 
+        // Set up a entire animation lifecycle callback to notify the current recents view when
+        // the animation is canceled
+        mGestureState.runOnceAtState(STATE_RECENTS_ANIMATION_CANCELED, () -> {
+                ThumbnailData snapshot = mGestureState.getRecentsAnimationCanceledSnapshot();
+                if (snapshot != null) {
+                    RecentsModel.INSTANCE.get(mContext).onTaskSnapshotChanged(
+                            mRecentsView.getRunningTaskId(), snapshot);
+                    mRecentsView.onRecentsAnimationComplete();
+                }
+            });
+
         setupRecentsViewUi();
         linkRecentsViewScroll();
 
@@ -671,6 +683,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
             mRecentsAnimationController.setUseLauncherSystemBarFlags(swipeUpThresholdPassed
                     ||  (quickswitchThresholdPassed && centermostTaskFlags != 0));
             mRecentsAnimationController.setSplitScreenMinimized(swipeUpThresholdPassed);
+            // Provide a hint to WM the direction that we will be settling in case the animation
+            // needs to be canceled
+            mRecentsAnimationController.setWillFinishToHome(swipeUpThresholdPassed);
 
             if (swipeUpThresholdPassed) {
                 mActivity.getSystemUiController().updateUiState(UI_STATE_FULLSCREEN_TASK, 0);
@@ -1467,9 +1482,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
             final boolean refreshView = !LIVE_TILE.get() /* refreshView */;
             boolean finishTransitionPosted = false;
             if (mRecentsAnimationController != null) {
-                if (LIVE_TILE.get()) {
-                    mRecentsAnimationController.getController().setWillFinishToHome(true);
-                }
                 // Update the screenshot of the task
                 if (mTaskSnapshot == null) {
                     UI_HELPER_EXECUTOR.execute(() -> {
diff --git a/quickstep/src/com/android/quickstep/GestureState.java b/quickstep/src/com/android/quickstep/GestureState.java
index 6ad7f55a3a..a302a07bca 100644
--- a/quickstep/src/com/android/quickstep/GestureState.java
+++ b/quickstep/src/com/android/quickstep/GestureState.java
@@ -142,6 +142,8 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL
     private RemoteAnimationTargetCompat mLastAppearedTaskTarget;
     private Set<Integer> mPreviouslyAppearedTaskIds = new HashSet<>();
     private int mLastStartedTaskId = -1;
+    private RecentsAnimationController mRecentsAnimationController;
+    private ThumbnailData mRecentsAnimationCanceledSnapshot;
 
     /** The time when the swipe up gesture is triggered. */
     private long mSwipeUpStartTimeMs;
@@ -351,13 +353,20 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL
     @Override
     public void onRecentsAnimationStart(RecentsAnimationController controller,
             RecentsAnimationTargets targets) {
+        mRecentsAnimationController = controller;
         mStateCallback.setState(STATE_RECENTS_ANIMATION_STARTED);
     }
 
     @Override
     public void onRecentsAnimationCanceled(ThumbnailData thumbnailData) {
+        mRecentsAnimationCanceledSnapshot = thumbnailData;
         mStateCallback.setState(STATE_RECENTS_ANIMATION_CANCELED);
         mStateCallback.setState(STATE_RECENTS_ANIMATION_ENDED);
+        if (mRecentsAnimationCanceledSnapshot != null) {
+            // Clean up the screenshot to finalize the recents animation cancel
+            mRecentsAnimationController.cleanupScreenshot();
+            mRecentsAnimationCanceledSnapshot = null;
+        }
     }
 
     @Override
@@ -366,6 +375,14 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL
         mStateCallback.setState(STATE_RECENTS_ANIMATION_ENDED);
     }
 
+    /**
+     * Returns the canceled animation thumbnail data. This call only returns a value while
+     * STATE_RECENTS_ANIMATION_CANCELED state is being set.
+     */
+    ThumbnailData getRecentsAnimationCanceledSnapshot() {
+        return mRecentsAnimationCanceledSnapshot;
+    }
+
     void setSwipeUpStartTimeMs(long uptimeMs) {
         mSwipeUpStartTimeMs = uptimeMs;
     }
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationController.java b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
index 0ebe13be8d..53b66752e2 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationController.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationController.java
@@ -155,6 +155,14 @@ public class RecentsAnimationController {
         });
     }
 
+    /**
+     * @see IRecentsAnimationController#cleanupScreenshot()
+     */
+    @UiThread
+    public void cleanupScreenshot() {
+        UI_HELPER_EXECUTOR.execute(() -> mController.cleanupScreenshot());
+    }
+
     /**
      * @see RecentsAnimationControllerCompat#detachNavigationBarFromApp
      */
@@ -171,6 +179,14 @@ public class RecentsAnimationController {
         UI_HELPER_EXECUTOR.execute(() -> mController.animateNavigationBarToApp(duration));
     }
 
+    /**
+     * @see IRecentsAnimationController#setWillFinishToHome(boolean)
+     */
+    @UiThread
+    public void setWillFinishToHome(boolean willFinishToHome) {
+        UI_HELPER_EXECUTOR.execute(() -> mController.setWillFinishToHome(willFinishToHome));
+    }
+
     /**
      * Sets the final surface transaction on a Task. This is used by Launcher to notify the system
      * that animating Activity to PiP has completed and the associated task surface should be
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 8c3e5b513b..a36f2d4c8a 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -392,8 +392,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
 
     private final TaskOverlayFactory mTaskOverlayFactory;
 
-    private int mOrientation;
-
     protected boolean mDisallowScrollToClearAll;
     private boolean mOverlayEnabled;
     protected boolean mFreezeViewVisibility;
@@ -588,7 +586,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 .getDimensionPixelSize(R.dimen.recents_fast_fling_velocity);
         mModel = RecentsModel.INSTANCE.get(context);
         mIdp = InvariantDeviceProfile.INSTANCE.get(context);
-        mOrientation = getResources().getConfiguration().orientation;
 
         mClearAllButton = (ClearAllButton) LayoutInflater.from(context)
                 .inflate(R.layout.overview_clear_all_button, this, false);
@@ -2640,15 +2637,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     @Override
     protected void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
-        if (LIVE_TILE.get() && mEnableDrawingLiveTile && newConfig.orientation != mOrientation) {
-            switchToScreenshot(
-                    () -> finishRecentsAnimation(true /* toRecents */, false /* showPip */,
-                            this::updateRecentsRotation));
-            mEnableDrawingLiveTile = false;
-        } else {
-            updateRecentsRotation();
-        }
-        mOrientation = newConfig.orientation;
+        updateRecentsRotation();
     }
 
     /**
@@ -3404,16 +3393,26 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             if (onFinishComplete != null) {
                 onFinishComplete.run();
             }
-            // After we finish the recents animation, the current task id should be correctly
-            // reset so that when the task is launched from Overview later, it goes through the
-            // flow of starting a new task instead of finishing recents animation to app. A
-            // typical example of this is (1) user swipes up from app to Overview (2) user
-            // taps on QSB (3) user goes back to Overview and launch the most recent task.
-            setCurrentTask(-1);
-            mRecentsAnimationController = null;
+            onRecentsAnimationComplete();
         }, sendUserLeaveHint);
     }
 
+    /**
+     * Called when a running recents animation has finished or canceled.
+     */
+    public void onRecentsAnimationComplete() {
+        // At this point, the recents animation is not running and if the animation was canceled
+        // by a display rotation then reset this state to show the screenshot
+        setRunningTaskViewShowScreenshot(true);
+        // After we finish the recents animation, the current task id should be correctly
+        // reset so that when the task is launched from Overview later, it goes through the
+        // flow of starting a new task instead of finishing recents animation to app. A
+        // typical example of this is (1) user swipes up from app to Overview (2) user
+        // taps on QSB (3) user goes back to Overview and launch the most recent task.
+        setCurrentTask(-1);
+        mRecentsAnimationController = null;
+    }
+
     public void setDisallowScrollToClearAll(boolean disallowScrollToClearAll) {
         if (mDisallowScrollToClearAll != disallowScrollToClearAll) {
             mDisallowScrollToClearAll = disallowScrollToClearAll;
-- 
GitLab


From ea83be4e99e1ee97ad11f6fed3aafa62ae7d25d4 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Thu, 24 Jun 2021 19:48:45 +0000
Subject: [PATCH 1492/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Id3e8879bd00e1943eab357a11e7f8e36c48250c2
---
 quickstep/res/values-az/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/res/values-az/strings.xml b/quickstep/res/values-az/strings.xml
index dceab09b1d..3c5587c07f 100644
--- a/quickstep/res/values-az/strings.xml
+++ b/quickstep/res/values-az/strings.xml
@@ -83,7 +83,7 @@
     <string name="allset_description" msgid="6350320429953234580">"Telefondan istifadəyə başlamağa hazırsınız"</string>
     <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Əlçatımlıq üzrə naviqasiya ayarları"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Paylaşın"</string>
-    <string name="action_screenshot" msgid="8171125848358142917">"Ekran şəkli"</string>
+    <string name="action_screenshot" msgid="8171125848358142917">"Skrinşot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Bu əməliyyata tətbiq və ya təşkilatınız tərəfindən icazə verilmir"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Naviqasiya dərsliyi ötürülsün?"</string>
     <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Bunu sonra <xliff:g id="NAME">%1$s</xliff:g> tətbiqində tapa bilərsiniz"</string>
-- 
GitLab


From ce114e05f39bd1139a5c0f98d52247611ff21dee Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Thu, 24 Jun 2021 19:50:04 +0000
Subject: [PATCH 1493/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Ib7e8679556fb83c611f7fccbf7bf2d7664cd9621
---
 go/quickstep/res/values-gu/strings.xml | 2 +-
 go/quickstep/res/values-hi/strings.xml | 2 +-
 go/quickstep/res/values-kn/strings.xml | 2 +-
 go/quickstep/res/values-mr/strings.xml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/go/quickstep/res/values-gu/strings.xml b/go/quickstep/res/values-gu/strings.xml
index e9fbdc268d..b0244751bb 100644
--- a/go/quickstep/res/values-gu/strings.xml
+++ b/go/quickstep/res/values-gu/strings.xml
@@ -3,6 +3,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_share_drop_target_label" msgid="5804774105974539508">"ઍપ શેર કરો"</string>
     <string name="action_listen" msgid="2370304050784689486">"સાંભળો"</string>
-    <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
+    <string name="action_translate" msgid="8028378961867277746">"અનુવાદ કરો"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
 </resources>
diff --git a/go/quickstep/res/values-hi/strings.xml b/go/quickstep/res/values-hi/strings.xml
index cdf83db358..5238d406ee 100644
--- a/go/quickstep/res/values-hi/strings.xml
+++ b/go/quickstep/res/values-hi/strings.xml
@@ -3,6 +3,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_share_drop_target_label" msgid="5804774105974539508">"ऐप्लिकेशन शेयर करें"</string>
     <string name="action_listen" msgid="2370304050784689486">"सुनें"</string>
-    <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
+    <string name="action_translate" msgid="8028378961867277746">"अनुवाद करें"</string>
     <string name="action_search" msgid="6269564710943755464">"Google Lens"</string>
 </resources>
diff --git a/go/quickstep/res/values-kn/strings.xml b/go/quickstep/res/values-kn/strings.xml
index 1083e84525..77668d62e3 100644
--- a/go/quickstep/res/values-kn/strings.xml
+++ b/go/quickstep/res/values-kn/strings.xml
@@ -3,6 +3,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_share_drop_target_label" msgid="5804774105974539508">"ಆ್ಯಪ್ ಹಂಚಿಕೊಳ್ಳಿ"</string>
     <string name="action_listen" msgid="2370304050784689486">"ಆಲಿಸಿ"</string>
-    <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
+    <string name="action_translate" msgid="8028378961867277746">"ಅನುವಾದಿಸಿ"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
 </resources>
diff --git a/go/quickstep/res/values-mr/strings.xml b/go/quickstep/res/values-mr/strings.xml
index f1fb72a36a..e7d26521d7 100644
--- a/go/quickstep/res/values-mr/strings.xml
+++ b/go/quickstep/res/values-mr/strings.xml
@@ -3,6 +3,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_share_drop_target_label" msgid="5804774105974539508">"अ‍ॅप शेअर करा"</string>
     <string name="action_listen" msgid="2370304050784689486">"ऐका"</string>
-    <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
+    <string name="action_translate" msgid="8028378961867277746">"भाषांतर करा"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
 </resources>
-- 
GitLab


From 43293e124eb531dd9a3a490d689f377aa2af555c Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Thu, 24 Jun 2021 19:51:08 +0000
Subject: [PATCH 1494/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I535422d9812c77c7fc4040c2a356336b7cf22da0
---
 res/values-af/strings.xml        |  9 +++++----
 res/values-am/strings.xml        | 15 +++++++--------
 res/values-ar/strings.xml        | 15 +++++++--------
 res/values-as/strings.xml        | 15 +++++++--------
 res/values-az/strings.xml        | 17 ++++++++---------
 res/values-b+sr+Latn/strings.xml | 15 +++++++--------
 res/values-be/strings.xml        | 15 +++++++--------
 res/values-bg/strings.xml        | 15 +++++++--------
 res/values-bn/strings.xml        | 20 ++++++++++----------
 res/values-bs/strings.xml        | 15 +++++++--------
 res/values-ca/strings.xml        | 15 +++++++--------
 res/values-cs/strings.xml        | 15 +++++++--------
 res/values-da/strings.xml        | 15 +++++++--------
 res/values-de/strings.xml        | 17 +++++++++--------
 res/values-el/strings.xml        |  9 +++++----
 res/values-en-rAU/strings.xml    |  8 ++++----
 res/values-en-rCA/strings.xml    |  8 ++++----
 res/values-en-rGB/strings.xml    |  8 ++++----
 res/values-en-rIN/strings.xml    |  8 ++++----
 res/values-en-rXC/strings.xml    |  8 ++++----
 res/values-es-rUS/strings.xml    |  9 +++++----
 res/values-es/strings.xml        | 15 +++++++--------
 res/values-et/strings.xml        | 15 +++++++--------
 res/values-eu/strings.xml        | 15 +++++++--------
 res/values-fa/strings.xml        | 15 +++++++--------
 res/values-fi/strings.xml        | 15 +++++++--------
 res/values-fr-rCA/strings.xml    | 15 +++++++--------
 res/values-fr/strings.xml        | 15 +++++++--------
 res/values-gl/strings.xml        | 15 +++++++--------
 res/values-gu/strings.xml        | 22 +++++++++++-----------
 res/values-hi/strings.xml        | 15 +++++++--------
 res/values-hr/strings.xml        | 15 +++++++--------
 res/values-hu/strings.xml        | 15 +++++++--------
 res/values-hy/strings.xml        | 15 +++++++--------
 res/values-in/strings.xml        | 15 +++++++--------
 res/values-is/strings.xml        | 15 +++++++--------
 res/values-it/strings.xml        | 15 +++++++--------
 res/values-iw/strings.xml        | 15 +++++++--------
 res/values-ja/strings.xml        | 15 +++++++--------
 res/values-ka/strings.xml        |  9 +++++----
 res/values-kk/strings.xml        | 15 +++++++--------
 res/values-km/strings.xml        | 15 +++++++--------
 res/values-kn/strings.xml        | 15 +++++++--------
 res/values-ko/strings.xml        | 15 +++++++--------
 res/values-ky/strings.xml        | 15 +++++++--------
 res/values-lo/strings.xml        | 15 +++++++--------
 res/values-lt/strings.xml        | 15 +++++++--------
 res/values-lv/strings.xml        | 15 +++++++--------
 res/values-mk/strings.xml        | 15 +++++++--------
 res/values-ml/strings.xml        | 15 +++++++--------
 res/values-mn/strings.xml        | 15 +++++++--------
 res/values-mr/strings.xml        | 17 ++++++++---------
 res/values-ms/strings.xml        | 15 +++++++--------
 res/values-my/strings.xml        | 17 ++++++++---------
 res/values-nb/strings.xml        | 17 ++++++++---------
 res/values-ne/strings.xml        | 15 +++++++--------
 res/values-nl/strings.xml        |  9 +++++----
 res/values-or/strings.xml        | 17 +++++++++--------
 res/values-pa/strings.xml        | 17 +++++++++--------
 res/values-pl/strings.xml        | 15 +++++++--------
 res/values-pt-rPT/strings.xml    |  9 +++++----
 res/values-pt/strings.xml        |  9 +++++----
 res/values-ro/strings.xml        | 15 +++++++--------
 res/values-ru/strings.xml        | 15 +++++++--------
 res/values-si/strings.xml        | 15 +++++++--------
 res/values-sk/strings.xml        | 15 +++++++--------
 res/values-sl/strings.xml        | 15 +++++++--------
 res/values-sq/strings.xml        | 19 ++++++++++---------
 res/values-sr/strings.xml        | 15 +++++++--------
 res/values-sv/strings.xml        | 15 +++++++--------
 res/values-sw/strings.xml        | 15 +++++++--------
 res/values-ta/strings.xml        | 15 +++++++--------
 res/values-te/strings.xml        | 20 ++++++++++----------
 res/values-th/strings.xml        | 15 +++++++--------
 res/values-tl/strings.xml        | 15 +++++++--------
 res/values-tr/strings.xml        | 15 +++++++--------
 res/values-uk/strings.xml        |  9 +++++----
 res/values-ur/strings.xml        | 17 +++++++++--------
 res/values-uz/strings.xml        | 15 +++++++--------
 res/values-vi/strings.xml        | 15 +++++++--------
 res/values-zh-rCN/strings.xml    | 15 +++++++--------
 res/values-zh-rHK/strings.xml    | 15 +++++++--------
 res/values-zh-rTW/strings.xml    | 15 +++++++--------
 res/values-zu/strings.xml        | 15 +++++++--------
 84 files changed, 582 insertions(+), 632 deletions(-)

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 571ad51536..d1e1253b3a 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Legstukke"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Soek"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Vee teks in hierdie soekkasie uit"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Geen legstukke beskikbaar nie"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Geen soekresultate nie"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Legstukke en kortpaaie is nie beskikbaar nie"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Geen legstukke of kortpaaie gekry nie"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Persoonlik"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Werk"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Gesprekke"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Kennisgewings"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Raak en hou om \'n kortpad te skuif."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dubbeltik en hou om \'n kortpad te skuif of gebruik gepasmaakte handelinge."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Niks meer spasie op die tuisskerm nie."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Geen plek meer in die Gunstelinge-laai nie"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Programmelys"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lys persoonlike programme"</string>
@@ -158,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Werkprofiel"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Werkprogramme het \'n kenteken en is sigbaar vir jou IT-administrateur"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Het dit"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Werkprogramme is af"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Werkprogramme is onderbreek"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Jou werkprogramme kan nie vir jou kennisgewings stuur, jou battery gebruik of toegang tot jou ligging kry nie"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Werkprogramme is af. Jou werkprogramme kan nie vir jou kennisgewings stuur, jou battery gebruik of toegang tot jou ligging kry nie"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Werkprogramme het \'n kenteken en is sigbaar vir jou IT-administrateur"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index fe9716358a..2f56a882c7 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"ፍርግሞች"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"ፍለጋ"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"ጽሁፍን ከፍለጋ ሳጥን አጽዳ"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"ምግብሮች አይገኙም"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"ምንም የፍለጋ ውጤቶች የሉም"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"መግብሮች እና አቋራጮች አይገኙም"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"ምንም መግብሮች ወይም አቋራጮች አልተገኙም"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"የግል"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ስራ"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"ውይይቶች"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"ማሳወቂያዎች"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"አቋራጭን ለማንቀሳቀስ ይንኩ እና ይያዙ"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"አቋራጭን ለማንቀሳቀስ ወይም ብጁ እርምጃዎችን ለመጠቀም ሁለቴ መታ ያድርጉ እና ይያዙ።"</string>
-    <string name="out_of_space" msgid="4691004494942118364">"በዚህ መነሻ ማያ ገጽ ላይ ምንም ቦታ የለም።"</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"በተወዳጆች መሣቢያ ውስጥ ተጨማሪ ቦታ የለም"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"የመተግበሪያዎች ዝርዝር"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"የግል መተግበሪያዎች ዝርዝር"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"የመነሻ ቅንብሮችን እና አቋራጮችን ይጽፋል"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"መተግብሪያው ቅንብሮችን እና አቋራጮችን በመነሻ ውስጥ እንዲቀይራቸው ያስችለዋል።"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> የስልክ ጥሪዎችን ለማድረግ አልተፈቀደለትም"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"ምግብርን መጫን አልተቻለም"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"ማዋቀርን ለመጨረስ መታ ያድርጉ"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"ይህ የስርዓት መተግበሪያ ነው እና ማራገፍ አይቻልም።"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"ስም ያርትዑ"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> ተሰናክሏል"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"የሥራ መገለጫ"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"የሥራ መተግበሪያዎች ባጅ የተደረገባቸው እና ለእርስዎ የአይቲ አስተዳዳሪ የሚታዩ ናቸው"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ገባኝ"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"የሥራ መተግበሪያዎች ጠፍተዋል"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"የስራ መተግበሪያዎች ባሉበት ቆመዋል"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"የስራ መተግበሪያዎችዎ ማሳወቂያዎችን ሊልክልዎ፣ ባትሪዎን መጠቀም ወይም አካባቢዎን መድረስ አይችሉም"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"የሥራ መተግበሪያዎች ጠፍተዋል። የስራ መተግበሪያዎችዎ ማሳወቂያዎችን ሊልክልዎ፣ ባትሪዎን መጠቀም ወይም አካባቢዎን መድረስ አይችሉም"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"የሥራ መተግበሪያዎች ባጅ የተደረገባቸው ሲሆን ለእርስዎ IT ቡድን ታይ ናቸው"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index ff2f51db3b..63c1e30d7b 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -54,8 +54,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"الأدوات"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"بحث"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"محو النص من مربّع البحث"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"ما مِن أدوات متاحة."</string>
-    <string name="no_search_results" msgid="6518732304311458580">"ما مِن نتائج بحث."</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"الأدوات والاختصارات غير متاحة."</string>
+    <string name="no_search_results" msgid="3787956167293097509">"لم يتم العثور على أدوات أو اختصارات."</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"الأدوات الشخصية"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"أدوات العمل"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"المحادثات"</string>
@@ -72,7 +72,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"الإشعارات"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"انقر مرتين مع تثبيت إصبعك لنقل اختصار."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"انقر مرتين مع تثبيت إصبعك لنقل اختصار أو استخدام الإجراءات المخصّصة."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"لا يتبقى مساحة على هذه الشاشة الرئيسية."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"لا يوجد المزيد من الحقول في علبة المفضلة"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"قائمة التطبيقات"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"قائمة التطبيقات الشخصية"</string>
@@ -90,10 +91,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"كتابة إعدادات واختصارات الشاشة الرئيسية"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"للسماح للتطبيق بتغيير الإعدادات والاختصارات في الشاشة الرئيسية."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> غير مسموح به لإجراء مكالمات هاتفية"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"يتعذّر تحميل الأداة."</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"انقر لإكمال الإعداد."</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"هذا تطبيق نظام وتتعذر إزالته."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"تعديل الاسم"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"تم إيقاف <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -172,7 +171,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"الملف الشخصي للعمل"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"تحمل تطبيقات العمل شارة وتكون مرئية لمشرف تكنولوجيا المعلومات."</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"حسنًا"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"تطبيقات العمل غير مفعّلة"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"تم إيقاف تطبيقات العمل مؤقتًا."</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"لا يمكن لتطبيقات العمل إرسال إشعارات إليك أو استخدام بطاريتك أو الوصول إلى موقعك الجغرافي."</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"تطبيقات العمل غير مفعّلة، وبالتالي لا يمكنها إرسال إشعارات إليك أو استخدام بطاريتك أو الوصول إلى موقعك الجغرافي."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"تحمل تطبيقات العمل شارة وتكون مرئية لمشرف تكنولوجيا المعلومات."</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 43927f53e2..7ecc9da037 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"ৱিজেটসমূহ"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"সন্ধান"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"সন্ধান বাকচত থকা পাঠ মচক"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"কোনো ৱিজেট নাই"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"সন্ধানৰ কোনো ফলাফল নাই"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"ৱিজেট আৰু শ্বৰ্টকাট উপলব্ধ নহয়"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"কোনো ৱিজেট আৰু শ্বৰ্টকাট পোৱা নগ’ল"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ব্যক্তিগত"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"কৰ্মস্থান"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"বাৰ্তালাপ"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"জাননীসমূহ"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"শ্বৰ্টকাট স্থানান্তৰ কৰিবলৈ দুবাৰ টিপি ধৰি ৰাখক।"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"কোনো শ্বৰ্টকাট স্থানান্তৰ কৰিবলৈ দুবাৰ টিপি ধৰি ৰাখক অথবা কাষ্টম কাৰ্য ব্যৱহাৰ কৰক।"</string>
-    <string name="out_of_space" msgid="4691004494942118364">"এই গৃহ স্ক্ৰীণত আৰু বেছি ঠাই নাই।"</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"পছন্দৰ ট্ৰে\'ত আৰু বেছি ঠাই নাই"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"এপৰ সূচী"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"ব্যক্তিগত এপৰ তালিকা"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"গৃহ ছেটিং আৰু শ্বৰ্টকাটবোৰ লিখিব পাৰে"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"এপটোক গৃহ পৃষ্ঠাত ছেটিং আৰু শ্বৰ্টকাটসমূহ সলনি কৰাৰ অনুমতি দিয়ে।"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g>ক ফ\'ন কলবোৰ কৰাৰ অনুমতি দিয়া হোৱা নাই"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"ৱিজেট ল’ড কৰিব নোৱাৰি"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"ছেটআপ সমাপ্ত কৰিবলৈ টিপক"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"এইটো এটা ছিষ্টেম এপ আৰু ইয়াক আনইনষ্টল কৰিব নোৱৰি"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"নাম সম্পাদনা কৰক"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> অক্ষম কৰা হ’ল"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"কৰ্মস্থানৰ প্ৰ\'ফাইল"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"কৰ্মস্থানৰ এপ্‌সমূহ প্ৰতীকেৰে চিহ্নিত কৰা হয় আৰু সেইবোৰ আপোনাৰ আইটি প্ৰশাসকৰ বাবে দৃশ্যমান হয়"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"বুজি পালোঁ"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"কৰ্মস্থানৰ এপ্‌সমূহ অফ হৈ আছে"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"কাম সম্পর্কীয় এপ্‌সমূহ পজ হৈ আছে"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"আপোনাৰ কৰ্মস্থানৰ এপ্‌সমূহে আপোনালৈ জাননী পঠিয়াব, আপোনাৰ বেটাৰী ব্যৱহাৰ কৰিব অথবা আপোনাৰ অৱস্থান এক্সেছ কৰিব নোৱাৰে"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"কৰ্মস্থানৰ এপ্‌সমূহ অফ হৈ আছে। আপোনাৰ কৰ্মস্থানৰ এপ্‌সমূহে আপোনালৈ জাননী পঠিয়াব, আপোনাৰ বেটাৰী ব্যৱহাৰ কৰিব অথবা আপোনাৰ অৱস্থান এক্সেছ কৰিব নোৱাৰে"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"কর্মস্থানৰ এপ্‌সমূহ প্ৰতীকেৰে চিহ্নিত কৰা হয় আৰু সেইবোৰ আপোনাৰ আইটি প্ৰশাসকৰ বাবে দৃশ্যমান হয়"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 7685330860..3670b01348 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -27,7 +27,7 @@
     <string name="safemode_widget_error" msgid="4863470563535682004">"Vidcetlər Güvənli rejimdə deaktiv edilib"</string>
     <string name="shortcut_not_available" msgid="2536503539825726397">"Qısayol əlçatan deyil"</string>
     <string name="home_screen" msgid="5629429142036709174">"Əsas səhifə"</string>
-    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Bölünmüş ekran"</string>
+    <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Ekran bölünməsi"</string>
     <string name="long_press_widget_to_add" msgid="3587712543577675817">"Vidceti daşımaq üçün toxunub saxlayın."</string>
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Vidceti daşımaq üçün iki dəfə toxunub saxlayın və ya fərdi əməliyyatlardan istifadə edin."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Vidcet"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Axtarış"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Axtarış qutusundan mətni silin"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Əlçatan vidcet yoxdur"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Axtarış nəticəsi yoxdur"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Vidcet və qısayollar əlçatan deyil"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Vidcet və ya qısayol tapılmayıb"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Şəxsi"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"İş"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Söhbətlər"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Bildirişlər"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Qısayolu daşımaq üçün toxunub saxlayın."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Qısayolu daşımaq üçün iki dəfə toxunub saxlayın və ya fərdi əməliyyatlardan istifadə edin."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Bu Əsas ekranda boş yer yoxdur."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Favoritlər-də yer yoxdur"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Tətbiq siyahısı"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Şəxsi tətbiqlərin siyahısı"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"Əsas Səhifə ayarlarını və qısayolları yazın"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Tətbiqə Əsas Səhifədə ayarları və qısayolları dəyişməyə icazə verir."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> tətbiqinə telefon zəngləri etmək üçün icazə verilmir"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Vidceti yükləmək olmur"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Ayarlamanı tamamlamaq üçün toxunun"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Bu sistem tətbiqi olduğu üçün sistemdən silinə bilməz."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Adı redaktə edin"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> deaktiv edildi"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"İş profili"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"İş tətbiqləri nişanlanıb və İT administratorunuza görünür"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Anladım"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"İş tətbiqləri deaktivdir"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"İş tətbiqlərinə pauza verilib"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"İş tətbiqləriniz sizə bildirişlər göndərə, batareyanızdan istifadə edə və ya məkanınıza daxil ola bilməz"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"İş tətbiqləri deaktivdir. İş tətbiqləriniz sizə bildirişlər göndərə, batareyanızdan istifadə edə və ya məkanınıza daxil ola bilməz"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"İş tətbiqləri nişanlanıb və İT administratorunuza görünür"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 3e43c50b93..50d052ab30 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -48,8 +48,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Vidžeti"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Pretražite"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Obrišite tekst iz okvira za pretragu"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Nije dostupan nijedan vidžet"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Nema rezultata pretrage"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Vidžeti i prečice nisu dostupni"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Nije pronađen nijedan vidžet ili prečica"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Lično"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Posao"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Konverzacije"</string>
@@ -66,7 +66,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Obaveštenja"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Dvaput dodirnite i zadržite radi pomeranja prečice."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dvaput dodirnite i zadržite da biste pomerali prečicu ili koristite prilagođene radnje."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Nema više prostora na ovom početnom ekranu."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Nema više prostora na traci Omiljeno"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista aplikacija"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista ličnih aplikacija"</string>
@@ -84,10 +85,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"upisivanje podešavanja i prečica na početnom ekranu"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Dozvoljava aplikaciji da menja podešavanja i prečice na početnom ekranu."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> nema dozvolu za upućivanje telefonskih poziva"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Učitavanje vidžeta nije uspelo"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Dodirnite da biste dovršili podešavanje"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Ovo je sistemska aplikacija i ne može da se deinstalira."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Izmenite naziv"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> je onemogućena"</string>
@@ -163,7 +162,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Poslovni profil"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Poslovne aplikacije su označene značkom i IT administrator može da ih vidi"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Važi"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Poslovne aplikacije su isključene"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Poslovne aplikacije su pauzirane"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Poslovne aplikacije ne mogu da vam šalju obaveštenja, koriste bateriju niti pristupaju lokaciji"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Poslovne aplikacije su isključene. Poslovne aplikacije ne mogu da vam šalju obaveštenja, koriste bateriju niti pristupaju lokaciji"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Poslovne aplikacije su označene značkom i IT administrator može da ih vidi"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index d99972996d..bdc2f196ba 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -50,8 +50,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Віджэты"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Пошук"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Ачысціць тэкст у полі пошуку"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Віджэты недаступныя"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Няма вынікаў пошуку"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Віджэты і ярлыкі недаступныя"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Віджэтаў і ярлыкоў не знойдзена"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Асабістыя"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Працоўныя"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Размовы"</string>
@@ -68,7 +68,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Апавяшчэнні"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Націсніце і ўтрымлівайце ярлык для перамяшчэння."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Дакраніцеся двойчы і ўтрымлівайце, каб перамясціць ярлык або выкарыстоўваць спецыяльныя дзеянні."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"На гэтым Галоўным экране больш няма месца."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"У латку \"Абранае\" больш няма месца"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Спіс праграм"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Спіс персанальных праграм"</string>
@@ -86,10 +87,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"запісваць налады і ярлыкі на галоўнай старонцы"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Дазваляе праграме змяняць налады і ярлыкі на Галоўнай старонцы."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> не мае дазволу на здзяйсненне тэлефонных званкоў"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Не ўдаецца загрузіць віджэт"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Націсніце, каб завяршыць наладжванне"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Гэта сістэмная праграма, яе нельга выдаліць."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Змяніць назву"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> адключана"</string>
@@ -166,7 +165,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Працоўны профіль"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Працоўныя праграмы маюць значкі і бачныя IT-адміністратару"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Зразумела"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Працоўныя праграмы выключаны"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Працоўныя праграмы прыпынены"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Працоўныя праграмы не могуць адпраўляць вам апавяшчэнні, выкарыстоўваць акумулятар або атрымліваць доступ да даных пра ваша месцазнаходжанне"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Працоўныя праграмы выключаны. Яны не могуць адпраўляць вам апавяшчэнні, выкарыстоўваць акумулятар або атрымліваць доступ да вашага месцазнаходжання"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Працоўныя праграмы маюць значкі і бачныя IT-адміністратару"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index a104988e2d..f0c86c679d 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Приспособления"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Търсене"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Изчистване на текста от полето за търсене"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Няма налични приспособления"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Няма резултати от търсенето"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Няма налице преки пътища и приспособления"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Няма открити преки пътища или приспособления"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Лични"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Служебни"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Разговори"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Известия"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Докоснете и задръжте за преместване на пряк път."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Докоснете двукратно и задръжте за преместване на пряк път или използвайте персонализирани действия."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"На този начален екран няма повече място."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Няма повече място в областта с любимите"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Списък с приложения"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Списък с лични приложения"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"запис на настройките и преките пътища в Начало"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Разрешава на приложението да променя настройките и преките пътища в Начало."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> няма разрешение да извършва телефонни обаждания"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Приспособлението не може да се зареди"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Докоснете, за да завършите настройването"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Това е системно приложение и не може да се деинсталира."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Редактиране на името"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Деактивирахте <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Служебен потребителски профил"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Служебните приложения са означени със значка и са видими за системния администратор"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Разбрах"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Служебните ви приложения са изключени"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Служебните приложения са поставени на пауза"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Служебните ви приложения не могат да ви изпращат известия, да използват батерията или да осъществяват достъп до местоположението ви"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Служебните ви приложения са изключени. Те не могат да ви изпращат известия, да използват батерията или да осъществяват достъп до местоположението ви"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Служебните приложения са означени със значка и са видими за системния администратор"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index f89aecbadd..62b5c5d944 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -46,8 +46,10 @@
     <string name="widget_button_text" msgid="2880537293434387943">"উইজেট"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"সার্চ করুন"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"সার্চ বক্স থেকে টেক্সট মুছুন"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"কোনও উইজেট ফলাফল নেই"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"কোনও সার্চ ফলাফল নেই"</string>
+    <!-- no translation found for no_widgets_available (4337693382501046170) -->
+    <skip />
+    <!-- no translation found for no_search_results (3787956167293097509) -->
+    <skip />
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ব্যক্তিগত"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"অফিস"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"কথোপকথন"</string>
@@ -64,7 +66,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"বিজ্ঞপ্তি"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"একটি শর্টকাট সরাতে টাচ করে ধরে রাখুন।"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"একটি শর্টকাট সরাতে বা কাস্টম অ্যাকশন ব্যবহার করতে ডবল ট্যাপ করে ধরে রাখুন।"</string>
-    <string name="out_of_space" msgid="4691004494942118364">"এই হোম স্ক্রীনে আর কোনো জায়গা নেই৷"</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"পছন্দসই ট্রে-তে আর কোনো জায়গা নেই"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"অ্যাপ্লিকেশানগুলির তালিকা"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"ব্যক্তিগত অ্যাপের তালিকা"</string>
@@ -82,10 +85,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"হোম সেটিংস এবং শর্টকাটগুলি লেখে"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"হোমে অ্যাপ্লিকেশানটিকে সেটিংস এবং শর্টকাটগুলি পরিবর্তন করতে দেয়৷"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"ফোন কলগুলি করার জন্য <xliff:g id="APP_NAME">%1$s</xliff:g> এর অনুমতি নেই"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"উইজেট লোড করা যাচ্ছে না"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"সেটআপ সম্পূর্ণ করতে ট্যাপ করুন"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"এটি একটি সিস্টেম অ্যাপ্লিকেশান এবং আনইনস্টল করা যাবে না৷"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"নাম এডিট করুন"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> অক্ষম করা হয়েছে"</string>
@@ -158,10 +159,9 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ব্যক্তিগত"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"অফিস"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"অফিসের প্রোফাইল"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"অফিসের অ্যাপে ব্যাজ যোগ করা হয়েছে এবং আপনার আইটি অ্যাডমিন সেটি দেখতে পাবেন"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"বুঝেছি"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"অফিসের অ্যাপ বন্ধ আছে"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"অফিসের অ্যাপ বন্ধ করা আছে"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"অফিসের অ্যাপ আপনাকে নোটিফিকেশন পাঠাতে পারবে না। এছাড়া, ব্যাটারি ব্যবহার করতে বা লোকেশন অ্যাক্সেস করতে পারবে না"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"অফিসের অ্যাপ বন্ধ আছে। আপনার অফিসের অ্যাপ আপনাকে বিজ্ঞপ্তি পাঠাতে, ব্যাটারি ব্যবহার করতে বা লোকেশন অ্যাক্সেস করতে পারবে না"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"অফিসের অ্যাপে ব্যাজ যোগ করা হয়েছে এবং আপনার আইটি অ্যাডমিন সেটি দেখতে পাবেন"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index b265d841e4..dc43c40cdf 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -48,8 +48,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Vidžeti"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Pretražite"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Brisanje teksta iz okvira za pretraživanje"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Nijedan vidžet nije dostupan"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Nema rezultata pretraživanja"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Vidžeti i prečice nisu dostupni"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Nije pronađen nijedan vidžet niti prečica"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Lično"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Posao"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Razgovori"</string>
@@ -66,7 +66,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Obavještenja"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Dodirnite i zadržite da pomjerite prečicu."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dvaput dodirnite i zadržite da pomjerite prečicu ili da koristite prilagođene radnje."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Nema više prostora na ovom početnom ekranu."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Nema više prostora u ladici Omiljeno"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista aplikacija"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista ličnih aplikacija"</string>
@@ -84,10 +85,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"zapisuj postavke na početnom ekranu i prečice"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Dopušta aplikaciji promjenu postavki i prečica na početnom ekranu."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> nema odobrenje da uspostavlja telefonske pozive"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Nije moguće učitati vidžet"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Dodirnite da završite postavljanje"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Ovo je sistemska aplikacija i ne može se deinstalirati."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Uređivanje naziva"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> je onemogućena"</string>
@@ -163,7 +162,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Radni profil"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Poslovne aplikacije su označene i vaš IT administrator ih može vidjeti"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Razumijem"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Poslovne aplikacije su isključene"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Poslovne aplikacije su pauzirane"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Poslovne aplikacije vam ne mogu slati obavještenja, koristiti bateriju niti pristupiti vašoj lokaciji"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Poslovne aplikacije su isključene. Poslovne aplikacije vam ne mogu slati obavještenja, koristiti bateriju ili pristupiti vašoj lokaciji"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Poslovne aplikacije su označene i vaš IT administrator ih može vidjeti"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 9cd23ba2cb..a84293541f 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Cerca"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Esborra el text del quadre de cerca"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"No hi ha widgets disponibles"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"No hi ha cap resultat de la cerca"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"No hi ha widgets ni dreceres disponibles"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"No s\'ha trobat cap widget ni drecera"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personal"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Treball"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Converses"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notificacions"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Fes doble toc i mantén premut per moure una drecera."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Fes doble toc i mantén premut per moure una drecera o per utilitzar accions personalitzades."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Ja no queda espai en aquesta pantalla d\'inici."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"No hi ha més espai a la safata Preferits."</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Llista d\'aplicacions"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Llista d\'aplicacions personals"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"escriu la configuració i les dreceres de la pantalla d\'inici"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Permet que l\'aplicació canviï la configuració i les dreceres de la pantalla d\'inici."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> no té permís per fer trucades telefòniques"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"No es pot carregar el widget"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Toca per finalitzar la configuració"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Aquesta aplicació és una aplicació del sistema i no es pot desinstal·lar."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Edita el nom"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"S\'ha desactivat <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de treball"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Les aplicacions de treball tenen una insígnia i són visibles per al teu administrador de TI"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Entesos"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Les aplicacions de treball estan desactivades"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Les aplicacions de treball s\'han posat en pausa"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Les aplicacions de treball no poden enviar-te notificacions, consumir bateria ni accedir a la teva ubicació"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Les aplicacions de treball estan desactivades: no poden enviar-te notificacions, consumir bateria ni accedir a la teva ubicació"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Les aplicacions de treball tenen una insígnia i són visibles per al teu administrador de TI"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 9785754d58..9b60c192f7 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -50,8 +50,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Widgety"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Vyhledávání"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Vymazat text z vyhledávacího pole"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Nejsou k dispozici žádné widgety"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Žádné výsledky hledání"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Widgety ani zkratky nejsou k dispozici"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Nebyly nalezeny žádné widgety ani zkratky"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Osobní"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Práce"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Konverzace"</string>
@@ -68,7 +68,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Oznámení"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Klepnutím a podržením přesunete zkratku."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dvojitým klepnutím a podržením přesunete zkratku, případně použijte vlastní akce."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Na této ploše již není místo."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Na panelu Oblíbené položky již není místo."</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Seznam aplikací"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Seznam osobních aplikací"</string>
@@ -86,10 +87,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"zápis nastavení a odkazů plochy"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Umožňuje aplikaci změnit nastavení a odkazy na ploše."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> nemá oprávnění telefonovat"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Widget se nepodařilo načíst"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Klepnutím dokončíte konfiguraci"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Toto je systémová aplikace a nelze ji odinstalovat."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Upravit název"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> je zakázána"</string>
@@ -166,7 +165,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Pracovní profil"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Pracovní aplikace jsou označené a viditelné vašemu administrátorovi IT"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Rozumím"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Pracovní aplikace jsou vypnuté"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Pracovní aplikace jsou pozastaveny"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Pracovní aplikace vám nemohou zasílat oznámení, používat vaši baterii ani získat přístup k vaší poloze"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Pracovní aplikace jsou vypnuté. Nemohou vám zasílat oznámení, používat vaši baterii ani získat přístup k vaší poloze"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Pracovní aplikace jsou označené a viditelné vašemu administrátorovi IT"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index d757b0ecd2..96ac1d14e5 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Søg"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Ryd teksten i søgefeltet"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Der er ingen tilgængelig widget"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Der er ingen søgeresultater"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Der er ingen tilgængelige widgets eller genveje"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Der blev ikke fundet nogen widgets eller genveje"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personlige"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Arbejde"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Samtaler"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notifikationer"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Hold en genvej nede for at flytte den."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Tryk to gange, og hold en genvej nede for at flytte den eller bruge tilpassede handlinger."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Der er ikke mere plads på denne startskærm."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Der er ikke mere plads i bakken Favoritter"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Liste med apps"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Liste over personlige apps"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"skrive indstillinger og genveje for startskærmen"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Tillader, at appen ændrer indstillingerne og genvejene på startskærmen."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> har ikke tilladelse til at foretage telefonopkald"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Widgetten kan ikke indlæses"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Tryk for at fuldføre konfigurationen"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Dette er en systemapp, som ikke kan afinstalleres."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Rediger navn"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> er deaktiveret"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Arbejdsprofil"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Arbejdsapps har badges og kan ses af din it-administrator"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Arbejdsapps er deaktiveret"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Dine arbejdsapps er sat på pause"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Arbejdsapps kan ikke sende dig notifikationer, bruge dit batteri eller få adgang til din lokation"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Arbejdsapps er deaktiveret. Dine arbejdsapps kan ikke sende dig notifikationer, bruge dit batteri eller få adgang til din lokation"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Arbejdsapps har badges og kan ses af din it-administrator"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 8ae811fcad..dfa6337a4b 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -46,8 +46,10 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Suche"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Text aus dem Suchfeld löschen"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Keine Widgets verfügbar"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Keine Suchergebnisse"</string>
+    <!-- no translation found for no_widgets_available (4337693382501046170) -->
+    <skip />
+    <!-- no translation found for no_search_results (3787956167293097509) -->
+    <skip />
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Privat"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Geschäftlich"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Unterhaltungen"</string>
@@ -64,7 +66,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Benachrichtigungen"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Tippen und halten, um eine Verknüpfung zu bewegen."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Doppeltippen und halten, um eine Verknüpfung zu bewegen oder benutzerdefinierte Aktionen zu nutzen."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Auf diesem Startbildschirm ist kein Platz mehr vorhanden."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Ablage \"Favoriten\" ist voll."</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Liste der Apps"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Liste der privaten Apps"</string>
@@ -82,10 +85,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"Einstellungen und Verknüpfungen für den Startbildschirm schreiben"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Ermöglicht der App, die Einstellungen und Verknüpfungen auf dem Startbildschirm zu ändern"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> darf keine Telefonanrufe tätigen."</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Widget kann nicht geladen werden"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Tippen, um Einrichtung abzuschließen"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Dies ist eine Systemanwendung, die nicht deinstalliert werden kann."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Name bearbeiten"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> deaktiviert"</string>
@@ -160,7 +161,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Arbeitsprofil"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Geschäftliche Apps sind gekennzeichnet und für deinen IT-Administrator sichtbar"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Geschäftliche Apps sind deaktiviert"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Geschäftliche Apps sind pausiert"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Deine geschäftlichen Apps können dir keine Benachrichtigungen senden, deinen Akku nicht nutzen und nicht auf deinen Standort zugreifen"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Geschäftliche Apps sind deaktiviert. Sie können dir keine Benachrichtigungen senden, deinen Akku nicht nutzen und nicht auf deinen Standort zugreifen."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Geschäftliche Apps sind gekennzeichnet und für deinen IT-Administrator sichtbar"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index fc7d691c03..14ff86040d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Γραφικά στοιχεία"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Αναζήτηση"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Διαγραφή κειμένου από το πλαίσιο αναζήτησης"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Δεν υπάρχουν διαθέσιμα γραφικά στοιχεία"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Κανένα αποτέλεσμα αναζήτησης"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Δεν υπάρχουν διαθέσιμα γραφικά στοιχεία και συντομεύσεις."</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Δεν βρέθηκαν γραφικά στοιχεία ή συντομεύσεις."</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Προσωπικά"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Εργασίας"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Συζητήσεις"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Ειδοποιήσεις"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Πατήστε παρατεταμένα για μετακίνηση συντόμευσης."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Πατήστε δύο φορές παρατεταμένα για μετακίνηση συντόμευσης ή χρήση προσαρμοσμένων ενεργειών."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Δεν υπάρχει χώρος σε αυτήν την αρχική οθόνη."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Δεν υπάρχει επιπλέον χώρος στην περιοχή Αγαπημένα"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Λίστα εφαρμογών"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Λίστα προσωπικών εφαρμογών"</string>
@@ -158,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Προφίλ εργασίας"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Οι εφαρμογές εργασιών φέρουν σήμα και είναι ορατές στον διαχειριστή IT σας"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Το κατάλαβα"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Οι εφαρμογές εργασιών είναι απενεργοποιημένες"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Οι εφαρμογές εργασίας τέθηκαν σε παύση."</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Οι εφαρμογές εργασιών δεν έχουν τη δυνατότητα αποστολής ειδοποιήσεων, χρήσης της μπαταρίας ή πρόσβασης στην τοποθεσία σας"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Οι εφαρμογές εργασιών είναι απενεργοποιημένες. Οι εφαρμογές εργασιών δεν έχουν τη δυνατότητα αποστολής ειδοποιήσεων, χρήσης της μπαταρίας ή πρόσβασης στην τοποθεσία σας"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Οι εφαρμογές εργασιών φέρουν σήμα και είναι ορατές στον διαχειριστή IT σας"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 08d032bf96..279f22ed37 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Search"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Clear text from search box"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"No widgets available"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"No search results"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Widgets and shortcuts aren\'t available"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"No widgets or shortcuts found"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personal"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Work"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversations"</string>
@@ -64,7 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notifications"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Touch &amp; hold to move a shortcut."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Double-tap &amp; hold to move a shortcut or use custom actions."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"No more room on this Home screen."</string>
+    <string name="out_of_space" msgid="6692471482459245734">"No room on this home screen"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"No more room in the Favourites tray"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Apps list"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Personal apps list"</string>
@@ -158,7 +158,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Work profile"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Work apps are badged and visible to your IT admin"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Work apps are off"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Work apps are paused"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Your work apps can’t send you notifications, use your battery or access your location"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Work apps are off. Your work apps can’t send you notifications, use your battery or access your location"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Work apps are badged and visible to your IT admin"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 08d032bf96..279f22ed37 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Search"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Clear text from search box"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"No widgets available"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"No search results"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Widgets and shortcuts aren\'t available"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"No widgets or shortcuts found"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personal"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Work"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversations"</string>
@@ -64,7 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notifications"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Touch &amp; hold to move a shortcut."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Double-tap &amp; hold to move a shortcut or use custom actions."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"No more room on this Home screen."</string>
+    <string name="out_of_space" msgid="6692471482459245734">"No room on this home screen"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"No more room in the Favourites tray"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Apps list"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Personal apps list"</string>
@@ -158,7 +158,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Work profile"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Work apps are badged and visible to your IT admin"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Work apps are off"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Work apps are paused"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Your work apps can’t send you notifications, use your battery or access your location"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Work apps are off. Your work apps can’t send you notifications, use your battery or access your location"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Work apps are badged and visible to your IT admin"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 08d032bf96..279f22ed37 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Search"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Clear text from search box"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"No widgets available"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"No search results"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Widgets and shortcuts aren\'t available"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"No widgets or shortcuts found"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personal"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Work"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversations"</string>
@@ -64,7 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notifications"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Touch &amp; hold to move a shortcut."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Double-tap &amp; hold to move a shortcut or use custom actions."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"No more room on this Home screen."</string>
+    <string name="out_of_space" msgid="6692471482459245734">"No room on this home screen"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"No more room in the Favourites tray"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Apps list"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Personal apps list"</string>
@@ -158,7 +158,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Work profile"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Work apps are badged and visible to your IT admin"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Work apps are off"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Work apps are paused"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Your work apps can’t send you notifications, use your battery or access your location"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Work apps are off. Your work apps can’t send you notifications, use your battery or access your location"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Work apps are badged and visible to your IT admin"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 08d032bf96..279f22ed37 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Search"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Clear text from search box"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"No widgets available"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"No search results"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Widgets and shortcuts aren\'t available"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"No widgets or shortcuts found"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personal"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Work"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversations"</string>
@@ -64,7 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notifications"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Touch &amp; hold to move a shortcut."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Double-tap &amp; hold to move a shortcut or use custom actions."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"No more room on this Home screen."</string>
+    <string name="out_of_space" msgid="6692471482459245734">"No room on this home screen"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"No more room in the Favourites tray"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Apps list"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Personal apps list"</string>
@@ -158,7 +158,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Work profile"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Work apps are badged and visible to your IT admin"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Work apps are off"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Work apps are paused"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Your work apps can’t send you notifications, use your battery or access your location"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Work apps are off. Your work apps can’t send you notifications, use your battery or access your location"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Work apps are badged and visible to your IT admin"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 7ada105cbc..a1a4ba911d 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‎‎‏‎‏‏‎‏‎‎‎‎‎‎‏‏‎‎‏‎‏‏‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎Widgets‎‏‎‎‏‎"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‎‎‎‎‏‎‎‎‏‏‎‏‏‏‎‎‏‏‏‎‏‎‎‏‎Search‎‏‎‎‏‎"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‎‎‏‎‏‏‎‎‎‏‎‏‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‎‎‎‎‏‎‏‏‎‎‎‏‏‎‏‏‎‏‎‎‏‎‎‏‎‏‎Clear text from search box‎‏‎‎‏‎"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‎‏‎‏‏‎‎‎‏‎‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‏‏‎‎‎‎‏‎No widgets available‎‏‎‎‏‎"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‏‏‏‎‎‏‏‎‎‎‎‎‏‏‏‏‏‏‎‎‎‏‏‏‎‎‎‎‏‎‏‏‎‎‏‎‎‎‏‏‎‏‏‎‎‎‏‎‏‎‎‎No search results‎‏‎‎‏‎"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎‏‎‏‎‎‏‎‏‎‏‎‎‏‎‎‏‏‎‎‎‏‏‏‎‎‎‏‎‎‎‏‎‎‏‏‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎Widgets and shortcuts aren\'t available‎‏‎‎‏‎"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‎‎‏‎‎‎‏‏‎‎‎‎‏‏‎‎‎‎‏‎‎‎‎‏‎‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‏‎‏‎‏‏‎‎‎‏‎‎‏‎‏‎No widgets or shortcuts found‎‏‎‎‏‎"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‏‎‎‏‏‎‎‎‎‎‎‏‏‎‎‏‏‎‎‎‎‏‎‏‎‏‏‎‏‏‏‎‎‎‎‎‎‎‎‎‎‎‏‎‏‎‎‏‏‎‏‏‎‎Personal‎‏‎‎‏‎"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‎‏‎‎‎‎‏‎‏‎‎‎‏‎‎‏‎‎‏‎‏‎Work‎‏‎‎‏‎"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‎‏‎‎‎‎‏‎‎‏‏‏‎‎‎‎‎‎‎‏‎‏‎‏‎‏‏‎‎‏‏‎‏‎‏‏‏‎‎Conversations‎‏‎‎‏‎"</string>
@@ -64,7 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎‏‎‏‏‎‎‏‏‏‎‏‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‏‎Notifications‎‏‎‎‏‎"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‎‎‎‎‏‏‏‎‎‏‎‏‎‏‏‏‎‏‎‏‏‏‏‎‎‎‏‏‏‎‏‎‎‏‏‎‎‏‎‎‏‎‏‏‎‏‎‏‏‎‏‎‎‏‎Touch &amp; hold to move a shortcut.‎‏‎‎‏‎"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‎‎‏‎‏‎‎‏‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‎‏‎‏‎‎‏‎‏‎‏‎‏‏‎‏‎‎‎Double-tap &amp; hold to move a shortcut or use custom actions.‎‏‎‎‏‎"</string>
-    <string name="out_of_space" msgid="4691004494942118364">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‏‎‎‏‏‏‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‎‎‏‎‎‏‎‎‎‎‏‏‏‎‏‏‏‎‎‎No more room on this Home screen.‎‏‎‎‏‎"</string>
+    <string name="out_of_space" msgid="6692471482459245734">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‎‎‎‎‎‏‏‎‏‏‏‏‎‏‎‏‏‎‏‎‏‏‏‎‎‏‎‏‎‏‏‎‏‎‏‎‎‏‎‎‏‏‎‎‏‎‏‎‎‏‏‎‎No room on this Home screen‎‏‎‎‏‎"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‏‎‏‏‏‏‎‏‎No more room in the Favorites tray‎‏‎‎‏‎"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‏‎‏‎‎‏‎‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‎‎‏‎‏‎‎‏‎‏‎‏‎‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎Apps list‎‏‎‎‏‎"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‎‏‎‏‎‎‎‏‎‎‎‏‎‏‎‎‏‎‏‏‏‏‎‏‎‎‎‏‏‏‏‏‎‎‏‎‎‎‏‎‎‎‏‎‎‎‏‎‏‎‎‎Personal apps list‎‏‎‎‏‎"</string>
@@ -158,7 +158,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‎‎‏‎‎‎‎‎‎‏‎‎‎‏‏‎‎‎‏‎‎‏‏‎‏‎‎‎‎‎‏‎‎‏‏‎‎‎‏‏‎‏‎‏‎‎‏‏‏‎‏‎‎Work profile‎‏‎‎‏‎"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‎‎‏‎‎‏‎‏‎‏‏‎‏‏‎‏‎‏‏‎‏‎‎‏‏‏‎‏‎‏‏‎‏‎‎‎‎‏‎‎‎‎‏‎‎‏‎‏‏‎‎‎‎Work apps are badged and visible to your IT admin‎‏‎‎‏‎"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‏‏‎‎‎‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎Got it‎‏‎‎‏‎"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‏‎‎‏‎‎‎‏‏‎‎‏‎‎‎‎Work apps are off‎‏‎‎‏‎"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‏‎‎‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‏‎‎‎‏‏‏‎‎‎‎‏‎‏‏‎‎‏‏‏‎‏‏‏‎‏‏‏‏‏‏‎‏‏‎‎Work apps are paused‎‏‎‎‏‎"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎‎‎‏‏‎‎‎‎‎‏‏‎‏‏‎‏‎‏‏‎‏‏‏‏‎‏‎‎‎‎‎‎‎‎‏‎‎‎‎‎‎‎‏‎‎‎‎‏‎‏‎‎Your work apps can’t send you notifications, use your battery, or access your location‎‏‎‎‏‎"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‏‏‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‎‎‏‎‏‎‏‎‎‏‎‎‏‎‏‎‏‏‎‏‏‎‎‎‏‎‎‏‎‏‏‏‎Work apps are off. Your work apps can’t send you notifications, use your battery, or access your location‎‏‎‎‏‎"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‎‏‎‎‎‏‏‏‏‎‏‎‎‎‏‎‎‎‎‏‎‎‏‎‏‎‏‎‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‏‎‏‎‎Work apps are badged and visible to your IT admin‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 607d831110..b8567155cb 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Buscar"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Borra el texto del cuadro de búsqueda"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"No hay widgets disponibles"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"La búsqueda no arrojó resultados"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Los widgets y accesos directos no están disponibles"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"No se encontraron widgets ni accesos directos"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personales"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Trabajo"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversaciones"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notificaciones"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Mantén presionado para mover un acceso directo."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Presiona dos veces y mantén presionado para mover un acceso directo o usar acciones personalizadas."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"No hay más espacio en esta pantalla principal."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"La bandeja de favoritos está llena."</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista de apps"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista de apps personales"</string>
@@ -158,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de trabajo"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Las apps de trabajo tienen una insignia y el administrador de IT las puede ver"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Entendido"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Las apps de trabajo están desactivadas"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Las apps de trabajo están detenidas"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Las apps de trabajo no pueden enviarte notificaciones, usar la batería ni acceder a tu ubicación"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Las apps de trabajo están desactivadas y, por ende, no pueden enviarte notificaciones, usar la batería ni acceder a tu ubicación"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Las apps de trabajo tienen una insignia y el administrador de IT las puede ver"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 03ac6d12e5..83e49848ed 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Buscar"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Borrar texto del cuadro de búsqueda"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"No hay widgets disponibles"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"No hay resultados de búsqueda"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Los widgets y los accesos directos no están disponibles"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"No se han encontrado widgets ni accesos directos"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personales"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Trabajo"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversaciones"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notificaciones"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Mantén pulsado un acceso directo para moverlo."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Toca dos veces y mantén pulsado un acceso directo para moverlo o usar acciones personalizadas."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"No queda espacio en la pantalla de inicio."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"La bandeja de favoritos está completa"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista de aplicaciones"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista de aplicaciones personales"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"escribir información de accesos directos y de ajustes de la pantalla de inicio"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Permite que las aplicaciones cambien los ajustes y los accesos directos de la pantalla de inicio."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> no puede hacer llamadas"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"No se puede cargar el widget"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Toca para finalizar la configuración"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Esta aplicación es del sistema y no se puede desinstalar."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Editar nombre"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Se ha inhabilitado <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de trabajo"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Las aplicaciones de trabajo tienen una insignia, y tu administrador de TI las puede ver"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Entendido"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Las aplicaciones de trabajo están desactivadas"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Se han pausado las aplicaciones de trabajo"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Tus aplicaciones de trabajo no pueden enviarte notificaciones, consumir batería ni acceder a tu ubicación"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Las aplicaciones de trabajo están desactivadas, por lo que no pueden enviarte notificaciones, consumir batería ni acceder a tu ubicación"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Las aplicaciones de trabajo tienen una insignia y tu administrador de TI las puede ver"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 9ec12fce6a..84100d4bde 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Vidinad"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Otsing"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Kustuta otsingukastis olev tekst"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Ühtki vidinat pole saadaval"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Otsingutulemused puuduvad"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Vidinad ja otseteed pole saadaval"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Ei leitud ühtegi vidinat ega otseteed"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Isiklikud"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Töö"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Vestlused"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Märguanded"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Otsetee teisaldamiseks puudutage ja hoidke all."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Otsetee teisaldamiseks või kohandatud toimingute kasutamiseks topeltpuudutage ja hoidke all."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Sellel avakuval pole enam ruumi."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Salves Lemmikud pole rohkem ruumi"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Rakenduste loend"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Isiklike rakenduste loend"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"avakuva seadete ja otseteede kirjutamine"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Võimaldab rakendusel muuta avaekraanil seadeid ja otseteid."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"Rakendusel <xliff:g id="APP_NAME">%1$s</xliff:g> pole lubatud helistada"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Vidinat ei saa laadida"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Puudutage seadistuse lõpuleviimiseks"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"See on süsteemirakendus ja seda ei saa desinstallida."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Muuda nime"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Rakendus <xliff:g id="APP_NAME">%1$s</xliff:g> on keelatud"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Tööprofiil"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Töörakendustel on märk ja need on teie IT-administraatorile nähtavad"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Selge"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Töörakendused on välja lülitatud"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Töörakendused on peatatud"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Töörakendused ei saa teile märguandeid saata, akut kasutada ega teie asukohale juurde pääseda"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Töörakendused on välja lülitatud. Töörakendused ei saa teile märguandeid saata, akut kasutada ega teie asukohale juurde pääseda."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Töörakendustel on märk ja need on teie IT-administraatorile nähtavad"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 0df92adf24..f8b3997993 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Widgetak"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Bilatu"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Garbitu bilaketa-koadroko testua"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Ez dago widget erabilgarririk"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Ez dago bilaketa-emaitzarik"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Widgetak eta lasterbideak erabilgarri daude"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Ez da aurkitu widgetik edo lasterbiderik"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Pertsonalak"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Lanekoak"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Elkarrizketak"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Jakinarazpenak"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Eduki sakatuta lasterbide bat mugitzeko."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Sakatu birritan eta eduki sakatuta lasterbide bat mugitzeko edo ekintza pertsonalizatuak erabiltzeko."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Hasierako pantaila honetan ez dago toki gehiago."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Ez dago toki gehiago Gogokoak erretiluan"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Aplikazioen zerrenda"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Aplikazio pertsonalen zerrenda"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"Idatzi hasierako ezarpenak eta lasterbideak"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Hasierako pantailako ezarpenak eta lasterbideak aldatzeko baimena ematen die aplikazioei."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak ez du telefono-deiak egiteko baimenik"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Ezin da kargatu widgeta"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Konfiguratzen amaitzeko, sakatu hau"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Sistema-aplikazioa da hau eta ezin da desinstalatu."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Editatu izena"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> desgaituta dago"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Laneko profila"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Laneko aplikazioek bereizgarriak dituzte, eta IKT saileko administratzaileak ikus ditzake"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Ados"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Laneko aplikazioak desaktibatuta daude"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Pausatu egin dira laneko aplikazioak"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Laneko aplikazioek ezin dute jakinarazpenik bidali, bateria erabili edo kokapena atzitu"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Laneko aplikazioak desaktibatuta daude. Hori dela eta, ezin dute jakinarazpenik bidali, bateria erabili edo kokapena atzitu."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Laneko aplikazioek bereizgarriak dituzte, eta IKT saileko administratzaileak ikus ditzake"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 9da53ca986..c4fda9b10a 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"ابزارک‌ها"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"جستجو"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"پاک کردن نوشتار از چارگوش جستجو"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"ابزارکی دردسترس نیست"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"بدون نتیجه جستجو"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"ابزارک و میان‌بری دردسترس نیست"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"هیچ ابزارک یا میان‌بری پیدا نشد"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ابزارک‌های شخصی"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"کار"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"مکالمه‌ها"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"اعلان‌ها"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"برای جابه‌جا کردن میان‌بر، لمس کنید و نگه دارید."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"برای جابه‌جا کردن میان‌بر یا استفاده از کنش‌های سفارشی، دوضربه بزنید و نگه دارید."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"فضای بیشتری در این صفحه اصلی موجود نیست."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"فضای بیشتری در سینی موارد دلخواه وجود ندارد"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"فهرست برنامه‌ها"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"فهرست برنامه‌های شخصی"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"نوشتن تنظیمات و میان‌برهای صفحه اصلی"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"به برنامه اجازه می‌دهد تنظیمات و میان‌برها را در صفحه اصلی تغییر دهد."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> مجاز نیست تماس تلفنی برقرار کند"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"ابزارک را نمی‌توان بار کرد"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"برای تکمیل راه‌اندازی ضربه بزنید"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"این برنامه سیستمی است و حذف نصب نمی‌شود."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"ویرایش نام"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> غیرفعال شد"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"نمایه کاری"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"برنامه‌های کاری دارای نشان هستند و سرپرست سیستم می‌تواند آن‌ها را ببیند"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"متوجه‌ام"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"برنامه‌های کاری خاموش است"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"برنامه‌های کاری موقتاً متوقف می‌شوند"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"برنامه‌های کاری نمی‌توانند برای شما اعلان ارسال کنند، از باتری استفاده کنند، یا به مکانتان دسترسی داشته باشند"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"برنامه‌های کاری خاموش است. برنامه‌های کاری نمی‌توانند برای شما اعلان ارسال کنند، از باتری استفاده کنند، یا به مکانتان دسترسی داشته باشند"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"برنامه‌های کاری دارای نشان هستند و سرپرست سیستم می‌تواند آن‌ها را ببیند."</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index fd8b67168f..7d6e7a40fd 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Widgetit"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Haku"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Tyhjennä teksti hakukentästä"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Ei widgetejä käytettävissä"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Ei hakutuloksia"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Widgetit ja pikanäppäimet eivät ole saatavilla"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Widgetejä tai pikanäppäimiä ei löytynyt"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Henkilökohtaiset"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Työ"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Keskustelut"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Ilmoitukset"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Kosketa pitkään, niin voit siirtää pikakuvaketta."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Kaksoisnapauta ja paina pitkään, niin voit siirtää pikakuvaketta tai käyttää muokattuja toimintoja."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Tässä aloitusruudussa ei ole enää tilaa."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Suosikit-valikossa ei ole enää tilaa"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Sovellusluettelo"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Omat sovellukset ‑luettelo"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"kirjoita aloitusruudun asetuksia ja pikakuvakkeita"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Antaa sovelluksen muuttaa aloitusruudun asetuksia ja pikakuvakkeita."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> ei saa soittaa puheluita."</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Widgetiä ei voi ladata"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Viimeistele asennus napauttamalla"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Tämä on järjestelmäsovellus, eikä sitä voi poistaa."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Muokkaa nimeä"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> poistettiin käytöstä"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Työprofiili"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Työsovellukset on merkitty ja ne näkyvät IT-järjestelmänvalvojalle"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Selvä"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Työsovellukset ovat pois päältä"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Työsovellukset on keskeytetty"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Työsovellukset eivät voi lähettää sinulle ilmoituksia eivätkä käyttää akkuasi tai paikantaa sijaintiasi"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Työsovellukset ovat pois päältä. Ne eivät voi lähettää sinulle ilmoituksia eivätkä käyttää akkuasi tai sijaintiasi"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Työsovellukset on merkitty ja ne näkyvät IT-järjestelmänvalvojalle"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index fb358eaf58..df3fc3f9f7 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Rechercher"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Effacer le texte dans le champ de recherche"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Aucun widget n\'est installé"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Aucun résultat de recherche"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Aucun widget ou raccourci proposé"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Aucun widget ni raccourci trouvé"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personnels"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Professionnels"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversations"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notifications"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Maintenez le doigt sur un raccourci pour le déplacer."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Touchez deux fois un raccourci et maintenez le doigt dessus pour le déplacer ou utiliser des actions personnalisées."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Pas d\'espace libre sur l\'écran d\'accueil."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Il n\'y a plus d\'espace dans la zone des favoris"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Liste des applications"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Liste des applications personnelles"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"enregistrer les paramètres de la page d\'accueil et des raccourcis"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Permet à l\'application de modifier les paramètres et les raccourcis de l\'écran d\'accueil."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"L\'application <xliff:g id="APP_NAME">%1$s</xliff:g> n\'est pas autorisée à faire des appels téléphoniques"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Impossible de charger le widget"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Touchez pour terminer la configuration"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Impossible de désinstaller cette application, car il s\'agit d\'une application système."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Modifier le nom"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"L\'application <xliff:g id="APP_NAME">%1$s</xliff:g> est désactivée"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profil professionnel"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Les applications professionnelles sont indiquées par un badge et elles sont visibles pour votre administrateur informatique"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Les applications professionnelles sont désactivées"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Les applications professionnelles sont interrompues"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Les applications professionnelles ne peuvent ni vous envoyer de notifications, ni utiliser la pile, ni accéder à votre position"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Les applications professionnelles sont désactivées. Vos applications professionnelles ne peuvent ni vous envoyer de notifications, ni utiliser la pile, ni accéder à votre position"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Les applications professionnelles sont indiquées par un badge et sont visibles pour votre administrateur informatique"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 098ce6f3e0..d21389a97d 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Rechercher"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Effacer le texte du champ de recherche"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Aucun widget disponible"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Aucun résultat de recherche"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Les widgets et les raccourcis ne sont pas disponibles"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Aucun widget ni raccourci trouvés"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personnels"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Professionnels"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversations"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notifications"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Appuyez de manière prolongée pour déplacer raccourci."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Appuyez deux fois et maintenez la pression pour déplacer un raccourci ou utiliser les actions personnalisées."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Pas d\'espace libre sur cet écran d\'accueil."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Plus d\'espace disponible dans la zone de favoris."</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Liste d\'applications"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Liste des applications personnelles"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"modifier les paramètres et les raccourcis de l\'écran d\'accueil"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Permettre à l\'application de modifier les paramètres et les raccourcis de l\'écran d\'accueil"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"L\'application <xliff:g id="APP_NAME">%1$s</xliff:g> n\'est pas autorisée à passer des appels téléphoniques."</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Impossible de charger le widget"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Appuyez pour terminer la configuration"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Impossible de désinstaller cette application, car il s\'agit d\'une application système."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Modifier le nom"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> est désactivé."</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profil professionnel"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Les applis professionnelles sont identifiées par un badge et votre administrateur informatique peut les voir"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Les applis professionnelles sont désactivées"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Applications professionnelles en veille"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Vos applis professionnelles ne peuvent pas vous envoyer de notifications, utiliser votre batterie ni accéder à votre position"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Vos applis professionnelles sont désactivées. Elles ne peuvent pas vous envoyer de notifications, utiliser votre batterie ni accéder à votre position."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Les applis professionnelles sont identifiées par un badge et votre administrateur informatique peut les voir"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 8cc93612a2..6608c2492d 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Busca Widgets"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Borrar texto da caixa de busca"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Non hai widgets dispoñibles"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Non hai resultados da busca"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Non hai widgets nin atallos dispoñibles"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Non se atoparon widgets nin atallos"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Widgets persoais"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Widgets do traballo"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversas"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notificacións"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Mantén premido un atallo para movelo."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Toca dúas veces un atallo e manteno premido para movelo ou utiliza accións personalizadas."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Non hai máis espazo nesta pantalla de inicio."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Non hai máis espazo na bandexa de favoritos"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista de aplicacións"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista de aplicacións persoais"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"modificar a configuración e os atallos da pantalla de inicio"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Permite a unha aplicación cambiar a configuración e os atallos da pantalla de inicio."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> non ten permiso para facer chamadas telefónicas"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Non se puido cargar o widget"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Toca para rematar a configuración"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Esta aplicación é do sistema e non se pode desinstalar."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Edita o nome"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Desactivouse <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de traballo"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"O administrador de TI pode ver as aplicacións do traballo e engadirlles indicadores"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Entendido"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"As aplicacións do traballo están desactivadas"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Puxéronse en pausa as aplicacións do traballo"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"As aplicacións do traballo non poden enviarche notificacións, utilizar a batería nin acceder á túa localización"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"As aplicacións do traballo están desactivadas e non poden enviarche notificacións, utilizar a batería nin acceder á túa localización"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"O administrador de TI pode ver as aplicacións do traballo e engadirlles indicadores"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 2e0171dad6..33070a7061 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -46,8 +46,10 @@
     <string name="widget_button_text" msgid="2880537293434387943">"વિજેટ્સ"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"શોધ"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"શોધ બૉક્સમાંથી ટેક્સ્ટ સાફ કરો"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"કોઈ વિજેટ ઉપલબ્ધ નથી"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"કોઈ શોધ પરિણામો નથી"</string>
+    <!-- no translation found for no_widgets_available (4337693382501046170) -->
+    <skip />
+    <!-- no translation found for no_search_results (3787956167293097509) -->
+    <skip />
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"વ્યક્તિગત"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ઑફિસ"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"વાતચીતો"</string>
@@ -64,7 +66,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"નોટિફિકેશન"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"શૉર્ટકટ ખસેડવા ટચ કરીને થોડી વાર દબાવી રાખો."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"શૉર્ટકટ ખસેડવા બે વાર ટૅપ કરીને દબાવી રાખો અથવા કસ્ટમ ક્રિયાઓનો ઉપયોગ કરો."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"આ હોમ સ્ક્રીન પર વધુ જગ્યા નથી."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"મનપસંદ ટ્રે પર વધુ જગ્યા નથી"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ઍપ્લિકેશનોની સૂચિ"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"વ્યક્તિગત ઍપની સૂચિ"</string>
@@ -75,17 +78,15 @@
     <string name="install_drop_target_label" msgid="2539096853673231757">"ઇન્સ્ટૉલ કરો"</string>
     <string name="dismiss_prediction_label" msgid="3357562989568808658">"ઍપ સૂચવશો નહીં"</string>
     <string name="pin_prediction" msgid="4196423321649756498">"પૂર્વાનુમાનને પિન કરો"</string>
-    <string name="permlab_install_shortcut" msgid="5632423390354674437">"શોર્ટકટ્સ ઇન્સ્ટોલ કરો"</string>
+    <string name="permlab_install_shortcut" msgid="5632423390354674437">"શૉર્ટકટ ઇન્સ્ટૉલ કરો"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"એપ્લિકેશનને વપરાશકર્તા હસ્તક્ષેપ વગર શોર્ટકટ્સ ઉમેરવાની મંજૂરી આપે છે."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"હોમ સેટિંગ્સ અને શોર્ટકટ્સ વાંચો"</string>
     <string name="permdesc_read_settings" msgid="5833423719057558387">"એપ્લિકેશનને હોમમાં સેટિંગ્સ અને શોર્ટકટ્સ વાંચવાની મંજૂરી આપે છે."</string>
     <string name="permlab_write_settings" msgid="3574213698004620587">"હોમ સેટિંગ્સ અને શોર્ટકટ્સ લખો"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"એપ્લિકેશનને હોમમાં સેટિંગ્સ અને શોર્ટકટ્સ બદલવાની મંજૂરી આપે છે."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> ને ફોન કૉલ્સ કરવાની મંજૂરી નથી"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"વિજેટ લોડ કરી શકાતું નથી"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"સેટઅપ પૂર્ણ કરવા માટે ટૅપ કરો"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"આ એક સિસ્ટમ ઍપ્લિકેશન છે અને અનઇન્સ્ટોલ કરી શકાતી નથી."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"નામમાં ફેરફાર કરો"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> અક્ષમ કરી"</string>
@@ -158,10 +159,9 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"મનગમતી ઍપ"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"ઑફિસની ઍપ"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"ઑફિસની પ્રોફાઇલ"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"ઑફિસની ઍપને બૅજ આપેલા હોય છે અને તમારા IT વ્યવસ્થાપક તેમને જોઈ શકે છે"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"સમજાઈ ગયું"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"ઑફિસ માટેની ઍપ બંધ છે"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"ઑફિસ માટેની ઍપ થોભાવવામાં આવેલ છે"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"ઑફિસ માટેની તમારી ઍપ તમને નોટિફિકેશન મોકલી શકતી નથી, તમારી બૅટરી વાપરી શકતી નથી કે તમારું સ્થાન ઍક્સેસ કરી શકતી નથી"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"ઑફિસ માટેની ઍપ બંધ છે. ઑફિસ માટેની તમારી ઍપ તમને નોટિફિકેશન મોકલી શકતી નથી, તમારી બૅટરી વાપરી શકતી નથી કે તમારું સ્થાન ઍક્સેસ કરી શકતી નથી"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"ઑફિસની ઍપને બૅજ આપેલા હોય છે અને તમારા IT વ્યવસ્થાપક તેમને જોઈ શકે છે"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index fbadca6ba7..1c7bbd816f 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"विजेट"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"खोजें"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"खोज बॉक्स से टेक्स्ट हटाएं"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"कोई विजेट उपलब्ध नहीं है"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"खोज का कोई नतीजा नहीं मिला"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"विजेट और शॉर्टकट उपलब्ध नहीं हैं"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"कोई विजेट या शॉर्टकट नहीं मिला"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"निजी विजेट"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ऑफ़िस"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"बातचीत"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"सूचनाएं"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"किसी शॉर्टकट को एक से दूसरी जगह ले जाने के लिए, उसे दबाकर रखें."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"किसी शॉर्टकट को एक से दूसरी जगह ले जाने के लिए, उस पर दो बार टैप करके दबाकर रखें या पसंद के मुताबिक कार्रवाइयां इस्तेमाल करें."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"इस होम स्‍क्रीन पर जगह नहीं बची है"</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"पसंदीदा ट्रे में और जगह नहीं है"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ऐप्लिकेशन सूची"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"निजी ऐप्लिकेशन की सूची"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"होम पेज की सेटिंग और शॉर्टकट लिखें"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"ऐप्लिकेशन को होम पेज में सेटिंग और शॉर्टकट बदलने देती है."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> को फ़ोन कॉल करने की अनुमति नहीं है"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"विजेट को लोड नहीं किया जा सका"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"सेट अप पूरा करने के लिए टैप करें"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"यह एक सिस्टम ऐप्लिकेशन है और इसे अनइंस्टॉल नहीं किया जा सकता."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"नाम में बदलाव करें"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> अक्षम है"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"वर्क प्रोफ़ाइल"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन, बैज किए गए हैं और आईटी एडमिन को दिख रहे हैं"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ठीक है"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन बंद हैं"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन रोके गए"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"ऑफ़िस के काम से जुड़े आपके ऐप्लिकेशन, आपको सूचनाएं नहीं भेज सकते. साथ ही, आपकी बैटरी का इस्तेमाल या आपकी जगह की जानकारी को ऐक्सेस भी नहीं कर सकते"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन बंद हैं. ये ऐप्लिकेशन, आपको सूचनाएं नहीं भेज सकते. साथ ही, आपकी बैटरी का इस्तेमाल या आपकी जगह की जानकारी को ऐक्सेस भी नहीं कर सकते"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन, बैज किए गए हैं और आईटी एडमिन को दिख रहे हैं"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 09d315f928..7f2732481a 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -48,8 +48,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Widgeti"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Pretražite"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Izbrišite tekst iz okvira za pretraživanje"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Nije dostupan nijedan widget"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Nema rezultata pretraživanja"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Widgeti i prečaci nisu dostupni"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Nema widgeta ili prečaca"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Osobni"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Posao"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Razgovori"</string>
@@ -66,7 +66,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Obavijesti"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Dodirnite i zadržite da biste premjestili prečac."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dvaput dodirnite i zadržite pritisak da biste premjestili prečac ili upotrijebite prilagođene radnje."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Na ovom početnom zaslonu više nema mjesta."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Nema više prostora na traci Favoriti"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Popis aplikacija"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Popis osobnih aplikacija"</string>
@@ -84,10 +85,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"pisanje postavki početnog zaslona i prečaca"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Aplikaciji omogućuje promjenu postavki i prečaca na početnom zaslonu."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> nema dopuštenje za telefonske pozive"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Widget se ne može učitati"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Dodirnite da biste dovršili postavljanje"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Ovo je aplikacija sustava i ne može se ukloniti."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Uređivanje naziva"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> onemogućena"</string>
@@ -163,7 +162,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Poslovni profil"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Poslovne su aplikacije označene i vidljive vašem IT administratoru"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Shvaćam"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Poslovne aplikacije su isključene"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Pauzirane su poslovne lokacije"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Poslovne aplikacije ne mogu vam slati obavijesti, trošiti bateriju niti pristupiti vašoj lokaciji"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Poslovne aplikacije su isključene. Ne mogu vam slati obavijesti, trošiti bateriju ili pristupiti vašoj lokaciji"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Poslovne su aplikacije označene i vidljive vašem IT administratoru"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 2167540d38..6f9b8c4edc 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Modulok"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Keresés"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Keresőmezőben lévő szöveg törlése"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Nincs rendelkezésre álló modul"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Nincsenek keresési találatok"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"A modulok és parancsikonok nem állnak rendelkezésre"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Nem található modul vagy parancsikon"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Személyes"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Munka"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Beszélgetések"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Értesítések"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Tartsa lenyomva a parancsikont az áthelyezéshez."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Parancsikon áthelyezéséhez koppintson duplán, és tartsa nyomva az ujját, vagy használjon egyéni műveleteket."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Nincs több hely ezen a kezdőképernyőn."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Nincs több hely a Kedvencek tálcán"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Alkalmazások listája"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Személyes alkalmazások listája"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"Főoldal beállításainak és parancsikonjainak írása"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Lehetővé teszi az alkalmazás számára, hogy módosítsa a kezdőképernyő beállításait és parancsikonjait."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"A(z) <xliff:g id="APP_NAME">%1$s</xliff:g> nem kezdeményezhet telefonhívásokat"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Nem tölthető le a modul"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Koppintson a beállítás befejezéséhez"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Ez egy rendszeralkalmazás, és nem lehet eltávolítani."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Név módosítása"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"A(z) <xliff:g id="APP_NAME">%1$s</xliff:g> letiltva"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Munkaprofil"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"A munkahelyi alkalmazások jelvénnyel vannak megjelölve, és láthatók a rendszergazda számára"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Értem"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"A munkahelyi alkalmazások ki vannak kapcsolva"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"A munkahelyi alkalmazások szüneteltetve vannak"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"A munkahelyi alkalmazások nem küldhetnek értesítéseket, nem használhatják az akkumulátort, és nem férhetnek hozzá az Ön tartózkodási helyéhez."</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"A munkahelyi alkalmazások ki vannak kapcsolva, nem küldhetnek értesítéseket, nem használhatják az akkumulátort, és nem férhetnek hozzá az Ön tartózkodási helyéhez"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"A munkahelyi alkalmazások jelvénnyel vannak megjelölve, és láthatók a rendszergazda számára"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index b261b02e7a..5bccfa4da1 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Վիջեթներ"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Որոնեք"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Մաքրել որոնման դաշտի տեքստը"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Վիջեթներ չկան"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Որոնման արդյունքներ չկան"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Հասանելի վիջեթներ և դյուրանցումներ չկան"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Ոչ մի վիջեթ կամ դյուրանցում չի գտնվել"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Անձնական"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Աշխատանքային"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Զրույցներ"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Ծանուցումներ"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Հպեք և պահեք՝ դյուրանցում տեղափոխելու համար։"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Կրկնակի հպեք և պահեք՝ դյուրանցում տեղափոխելու համար, կամ օգտվեք հատուկ գործողություններից։"</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Այլևս տեղ չկա այս հիմնական էկրանին:"</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Ընտրյալների ցուցակում այլևս ազատ տեղ չկա"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Հավելվածների ցանկ"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Անձնական հավելվածների ցանկ"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"ստեղծել հիմնաէջի կարգավորումներ ու դյուրանցումներ"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Ծրագրին թույլ է տալիս փոփոխել հիմնաէջի կարգավորումներն ու դյուրանցումները:"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> հավելվածին չի թույլատրվում հեռախոսազանգեր կատարել"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Չհաջողվեց բեռնել վիջեթը"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Հպեք՝ կարգավորումն ավարտելու համար"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Սա համակարգային ծրագիր է և չի կարող ապատեղադրվել:"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Փոխել անունը"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> հավելվածն անջատված է"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Աշխատանքային պրոֆիլ"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Աշխատանքային հավելվածները նշանակներ ունեն և տեսանելի են ՏՏ ադմինիստրատորին"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Եղավ"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Աշխատանքային հավելվածներն անջատված են"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Աշխատանքային հավելվածները դադարեցված են"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Աշխատանքային հավելվածները չեն կարող ծանուցումներ ուղարկել ձեզ, օգտագործել մարտկոցը և ձեր տեղադրության մասին տվյալներ ստանալ։"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Աշխատանքային հավելվածներն անջատված են։ Դրանք չեն կարող ծանուցումներ ուղարկել ձեզ, օգտագործել մարտկոցը և ձեր տեղադրության մասին տվյալներ ստանալ։"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Աշխատանքային հավելվածները նշանակներ ունեն և տեսանելի են ՏՏ ադմինիստրատորին"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 8b45632d4c..a87e68a5f5 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Widget"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Telusuri"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Hapus teks dari kotak penelusuran"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Widget tidak tersedia"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Tidak ada hasil penelusuran"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Widget dan pintasan tidak tersedia"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Tidak ada widget atau pintasan yang ditemukan"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Pribadi"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Kantor"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Percakapan"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notifikasi"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Sentuh lama untuk memindahkan pintasan."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Ketuk dua kali &amp; tahan untuk memindahkan pintasan atau gunakan tindakan khusus."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Tidak ada ruang lagi di Layar Utama ini."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Tidak ada ruang tersisa di baki Favorit"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Daftar aplikasi"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Daftar aplikasi pribadi"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"menulis setelan dan pintasan layar Utama"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Mengizinkan aplikasi mengubah setelan dan pintasan di layar Utama."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> tidak diizinkan untuk melakukan panggilan telepon"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Tidak dapat memuat widget"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Ketuk untuk menyelesaikan penyiapan"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Ini adalah aplikasi sistem dan tidak dapat dicopot pemasangannya."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Sunting Nama"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> dinonaktifkan"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profil kerja"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Aplikasi kerja diberi badge dan terlihat oleh admin IT"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Oke"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Aplikasi kerja dinonaktifkan"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Aplikasi kerja dijeda"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Aplikasi kerja tidak dapat mengirimkan notifikasi, menggunakan baterai, atau mengakses lokasi Anda"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Aplikasi kerja dinonaktifkan. Aplikasi kerja tidak dapat mengirimkan notifikasi, menggunakan baterai, atau mengakses lokasi Anda"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Aplikasi kerja diberi badge dan terlihat oleh admin IT"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index baa4a87933..96a0f550cc 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Græjur"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Leit"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Hreinsa texta úr leitarreit"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Engar græjur í boði"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Engar leitarniðurstöður"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Græjur og flýtileiðir eru ekki í boði"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Engar græjur eða flýtileiðir fundust"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Persónulegt"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Vinna"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Samtöl"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Tilkynningar"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Haltu fingri á flýtileið til að færa hana."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Ýttu tvisvar og haltu fingri á flýtileið til að færa hana eða notaðu sérsniðnar aðgerðir."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Ekki meira pláss á þessum heimaskjá."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Ekki meira pláss í bakka fyrir uppáhald"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Forritalisti"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Listi yfir eigin forrit"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"skrifa stillingar og flýtileiðir heimaskjás"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Leyfir forriti að breyta stillingum og flýtileiðum heimaskjás."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> hefur ekki leyfi til að hringja símtöl"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Ekki hægt að hlaða græju"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Ýttu til að ljúka við uppsetningu"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Þetta er kerfisforrit sem ekki er hægt að fjarlægja."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Breyta nafni"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Óvirkt <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Vinnusnið"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Vinnuforrit eru merkt og kerfisstjórinn getur séð þau"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Ég skil"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Slökkt er á vinnuforritum"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Hlé gert á vinnuforritum"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Vinnuforrit geta ekki sent þér tilkynningar, notað rafhlöðuorku eða fengið aðgang að staðsetningu þinni"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Slökkt er á vinnuforritum. Vinnuforrit geta ekki sent þér tilkynningar, notað rafhlöðuorku eða fengið aðgang að staðsetningu þinni"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Vinnuforrit eru merkt og kerfisstjórinn getur séð þau"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 54a6560d04..4ae23d870c 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Widget"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Cerca"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Cancella il testo nella casella di ricerca"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Nessun widget disponibile"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Nessun risultato di ricerca"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Widget e scorciatoie non disponibili"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Impossibile trovare widget o scorciatoie"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personali"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Lavoro"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversazioni"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notifiche"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Tocca e tieni premuto per spostare una scorciatoia."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Tocca due volte e tieni premuto per spostare una scorciatoia o per usare le azioni personalizzate."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Spazio nella schermata Home esaurito."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Spazio esaurito nella barra dei Preferiti"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Elenco di app"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Elenco di app personali"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"creazione di impostazioni e scorciatoie in Home"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Consente all\'app di modificare le impostazioni e le scorciatoie in Home."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"L\'app <xliff:g id="APP_NAME">%1$s</xliff:g> non è autorizzata a effettuare telefonate"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Impossibile caricare il widget"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Tocca per completare la configurazione"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Questa è un\'app di sistema e non può essere disinstallata."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Modifica nome"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"App <xliff:g id="APP_NAME">%1$s</xliff:g> disattivata"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profilo di lavoro"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Le app di lavoro sono contrassegnate con un badge e visibili all\'amministratore IT"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Le app di lavoro non sono attive"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Le app di lavoro sono in pausa"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Le app di lavoro non possono inviarti notifiche, usare la batteria o accedere alla tua posizione"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Le app di lavoro non sono attive e non possono inviarti notifiche, usare la batteria o accedere alla tua posizione"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Le app di lavoro sono contrassegnate con un badge e sono visibili dal tuo amministratore IT"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 6291e308f4..4ba2599847 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -50,8 +50,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"ווידג\'טים"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"חיפוש"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"מחיקת טקסט מתיבת החיפוש"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"אין ווידג\'טים זמינים"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"אין תוצאות חיפוש"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"אין ווידג\'טים או קיצורי דרך"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"לא נמצאו ווידג\'טים או קיצורי דרך"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ווידג\'טים אישיים"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"עבודה"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"שיחות"</string>
@@ -68,7 +68,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"התראות"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"כדי להעביר קיצור דרך למקום אחר יש לגעת ולא להרפות."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"כדי להעביר קיצור דרך למקום אחר או להשתמש בפעולות מותאמות אישית\' יש ללחוץ פעמיים ולא להרפות."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"אין עוד מקום במסך הבית הזה."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"אין עוד מקום במגש המועדפים"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"רשימת אפליקציות"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"רשימת אפליקציות אישיות"</string>
@@ -86,10 +87,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"כתיבת הגדרות וקיצורי דרך של דף הבית"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"מאפשר לאפליקציה לשנות את ההגדרות וקיצורי הדרך בדף הבית."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> אינו רשאי להתקשר"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"לא ניתן לטעון את הווידג\'ט"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"צריך להקיש כדי לסיים את תהליך ההגדרה"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"זוהי אפליקציית מערכת ולא ניתן להסיר את התקנתה."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"עריכת השם"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> מושבתת"</string>
@@ -166,7 +165,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"פרופיל עבודה"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"‏האפליקציות לעבודה מתויגות ומוצגות למנהל ה-IT"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"הבנתי"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"האפליקציות לעבודה מושבתות"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"האפליקציות לעבודה מושהות"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"האפליקציות לעבודה לא יכולות לשלוח לך התראות, להשתמש בסוללה או לגשת למיקום שלך"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"האפליקציות לעבודה מושבתות. האפליקציות לא יכולות לשלוח לך התראות, להשתמש בסוללה או לגשת למיקום שלך"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"‏האפליקציות לעבודה מתויגות ומוצגות למנהל ה-IT"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 3586843a2f..700fc44377 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"ウィジェット"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"検索"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"検索ボックスからテキストを消去します"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"利用できるウィジェットはありません"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"検索結果がありません"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"ウィジェットもショートカットも利用できません"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"ウィジェットもショートカットも見つかりませんでした"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"個人用"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"仕事用"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"会話"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"通知"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"長押ししてショートカットを移動してください。"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ショートカットをダブルタップして長押ししながら移動するか、カスタム操作を使用してください。"</string>
-    <string name="out_of_space" msgid="4691004494942118364">"このホーム画面には空きスペースがありません。"</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"お気に入りトレイに空きスペースがありません"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"アプリのリスト"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"個人用アプリのリスト"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"ホームの設定とショートカットの書き込み"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"ホームの設定とショートカットの変更をアプリに許可します。"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」から電話をかけることはできません"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"ウィジェットを読み込めません"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"タップして設定を完了してください"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"このシステムアプリはアンインストールできません。"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"名前の編集"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」は無効です"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"仕事用プロファイル"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"仕事用アプリはバッジが付き、IT 管理者に公開されます"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"仕事用アプリは OFF になっています"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"仕事用アプリの一時停止"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"仕事用アプリは、通知の送信、バッテリーの使用、位置情報の取得を行えません"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"仕事用アプリは OFF になっています。仕事用アプリは、通知の送信、バッテリーの使用、位置情報の取得を行えません"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"仕事用アプリはバッジが付き、IT 管理者に公開されます"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index a03a45852d..579ff60e52 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"ვიჯეტები"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"ძიება"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"ტექსტის გასუფთავება საძიებო ველიდან"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"ვიჯეტები მიუწვდომელია"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"ძიების შედეგები ვერ მოიძებნა"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"ვიჯეტები და მალსახმობები ხელმისაწვდომი არ არის"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"ვიჯეტები ან მალსახმობები ვერ მოიძებნა"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"პირადი"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"სამსახური"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"მიმოწერები"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"შეტყობინებები"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"შეხებით აირჩიეთ და გეჭიროთ მალსახმობის გადასაადგილებლად."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ორმაგი შეხებით აირჩიეთ და გეჭიროთ მალსახმობის გადასაადგილებლად ან მორგებული მოქმედებების გამოსაყენებლად."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"ამ მთავარ ეკრანზე ადგილი აღარ არის."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"რჩეულების თაროზე ადგილი არ არის"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"აპების სია"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"პერსონალური აპების სია"</string>
@@ -158,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"სამსახურის პროფილი"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"სამსახურის აპები ბეჯით არის მონიშნული და ხილულია IT ადმინისტრატორისთვის"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"გასაგებია"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"სამსახურის აპები გამორთულია"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"სამსახურის აპები დაპაუზებულია"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"თქვენს სამსახურის აპებს არ შეუძლია თქვენთვის შეტყობინებების გამოგზავნა, თქვენი ბატარეის გამოყენება, ან თქვენს მდებარეობაზე წვდომა"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"სამსახურის აპები გამორთულია. თქვენს სამსახურის აპებს არ შეუძლია თქვენთვის შეტყობინებების გამოგზავნა, თქვენი ბატარეის გამოყენება, ან თქვენს მდებარეობაზე წვდომა"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"სამსახურის აპები ბეჯით არის მონიშნული და ხილულია IT ადმინისტრატორისთვის"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 057ca353cb..5783873eed 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Виджеттер"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Іздеу"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Мәтінді іздеу өрісінен өшіру"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Қолжетімді виджет жоқ."</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Іздеу нәтижелері жоқ."</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Виджеттер мен таңбашалар қолжетімді емес."</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Ешқандай виджет немесе таңбаша табылмады."</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Жеке виджеттер"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Жұмыс виджеттері"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Әңгімелер"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Хабарландырулар"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Таңбашаны жылжыту үшін басып тұрыңыз."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Таңбашаны жылжыту үшін екі рет түртіңіз де, ұстап тұрыңыз немесе арнаулы әрекеттерді пайдаланыңыз."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Бұл Негізгі экранда орын қалмады."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Қалаулылар науасында орын қалмады"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Қолданбалар тізімі"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Жеке қолданбалар тізімі"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"Негізгі экран параметрлері мен төте пернелерін жазу"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Қолданбаға Негізгі экрандағы параметрлер мен төте пернелерді өзгерту мүмкіндігін береді."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> арқылы телефон қоңырауларын соғуға рұқсат етілмеген"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Виджетті жүктеу мүмкін емес."</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Реттеуді аяқтау үшін түртіңіз."</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Бұл жүйе қолданбасы, сондықтан оны алу мүмкін емес."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Атын өңдеу"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> өшірілді"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Жұмыс профилі"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Жұмыс қолданбаларының танымбелгілері бар және олар әкімшіңізге көрінеді."</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Түсінікті"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Жұмыс қолданбалары өшірулі"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Жұмыс қолданбалары кідіртілді"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Жұмыс қолданбалары сізге хабарландырулар жібере, батареяңызды немесе локацияңызды пайдалана алмайды."</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Жұмыс қолданбалары өшірулі. Олар сізге хабарландырулар жібере, батареяңызды немесе локацияңызды пайдалана алмайды."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Жұмыс қолданбаларының танымбелгілері бар және олар әкімшіңізге көрінеді."</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 08f9d0a5e9..48f968b8e7 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"ធាតុ​ក្រាហ្វិក"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"ស្វែងរក"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"សម្អាត​ពាក្យឬឃ្លា​ចេញពី​ប្រអប់ស្វែងរក"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"គ្មាន​ធាតុក្រាហ្វិក​ទេ"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"គ្មាន​លទ្ធផល​ស្វែងរក​ទេ"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"មិនមាន​ធាតុក្រាហ្វិក និងផ្លូវកាត់​បានទេ"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"រកមិនឃើញ​ធាតុក្រាហ្វិក ឬផ្លូវកាត់​ទេ"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ផ្ទាល់ខ្លួន"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ការងារ"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"ការសន្ទនា"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"ការ​ជូនដំណឹង"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"ចុចឱ្យជាប់​ដើម្បីផ្លាស់ទី​ផ្លូវកាត់​។"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ចុចពីរដង រួចសង្កត់ឱ្យជាប់ ដើម្បីផ្លាស់ទី​ផ្លូវកាត់ ឬប្រើ​សកម្មភាព​តាមបំណង​។"</string>
-    <string name="out_of_space" msgid="4691004494942118364">"គ្មាន​កន្លែង​នៅ​លើ​អេក្រង់​ដើម​នេះ​ទៀត​ទេ។"</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"គ្មាន​បន្ទប់​​ក្នុង​ថាស​និយម​ប្រើ"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"បញ្ជីកម្មវិធី"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"បញ្ជី​កម្មវិធី​ផ្ទាល់ខ្លួន"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"សរសេរ​ការ​កំណត់ ​និង​ផ្លូវកាត់​​លើ​អេក្រង់​ដើម"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"អនុញ្ញាត​ឲ្យ​កម្មវិធី​ប្ដូរ​ការ​កំណត់ និង​ផ្លូវ​កាត់​ក្នុង​អេក្រង់​ដើម។"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> មិនត្រូវបានអនុញ្ញាតឲ្យធ្វើការហៅទូរស័ព្ទទេ"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"មិនអាចផ្ទុក​ធាតុក្រាហ្វិក​បានទេ"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"ចុច​ដើម្បី​បញ្ចប់​ការរៀបចំ"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"នេះ​​​ជា​កម្មវិធី​ប្រព័ន្ធ មិន​អាច​លុប​បាន​ទេ។"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"កែ​ឈ្មោះ"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"បានបិទដំណើរការ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"កម្រងព័ត៌មានការងារ"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"កម្មវិធីការងារ​ត្រូវបានដាក់​គ្រឿងសម្គាល់ ហើយ​អ្នកគ្រប់គ្រង​ផ្នែកព័ត៌មានវិទ្យា​របស់អ្នក​អាចមើលឃើញ"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"យល់ហើយ"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"កម្មវិធីការងារ​ត្រូវបានបិទ"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"កម្មវិធី​ការងារ​ត្រូវបានផ្អាក"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"កម្មវិធី​ការងារ​របស់អ្នក​មិនអាចផ្ញើ​ការជូនដំណឹង​ទៅអ្នក ប្រើប្រាស់ថ្ម​របស់អ្នក ឬ​ចូលប្រើ​ទីតាំង​របស់អ្នក​បានទេ"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"កម្មវិធីការងារ​ត្រូវបានបិទ។ កម្មវិធីការងារ​របស់អ្នកមិនអាចផ្ញើ​ការជូនដំណឹង​ទៅអ្នក ប្រើប្រាស់ថ្ម​របស់អ្នក ឬ​ចូលប្រើ​ទីតាំង​របស់អ្នក​បានទេ"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"កម្មវិធីការងារ​ត្រូវបានដាក់​គ្រឿងសម្គាល់ ហើយ​អ្នកគ្រប់គ្រង​ផ្នែកព័ត៌មានវិទ្យា​របស់អ្នក​អាចមើលឃើញ"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 01dda6d286..a40b5685b4 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"ವಿಜೆಟ್‌ಗಳು"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"ಹುಡುಕಿ"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"ಹುಡುಕಾಟ ಪೆಟ್ಟಿಗೆಯಿಂದ ಪಠ್ಯವನ್ನು ತೆರವುಗೊಳಿಸಿ"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"ಯಾವುದೇ ವಿಜೆಟ್‌ಗಳು ಲಭ್ಯವಿಲ್ಲ"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"ಯಾವುದೇ ಹುಡುಕಾಟ ಫಲಿತಾಂಶಗಳಿಲ್ಲ"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"ವಿಜೆಟ್‌ಗಳು ಮತ್ತು ಶಾರ್ಟ್‌ಕಟ್‌ಗಳು ಲಭ್ಯವಿಲ್ಲ"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"ಯಾವುದೇ ವಿಜೆಟ್‌ಗಳು ಅಥವಾ ಶಾರ್ಟ್‌ಕಟ್‌ಗಳು ಕಂಡುಬಂದಿಲ್ಲ"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ವೈಯಕ್ತಿಕ"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ಕೆಲಸ"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"ಸಂವಾದಗಳು"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"ಶಾರ್ಟ್‌ಕಟ್ ಸರಿಸಲು ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಹಿಡಿದುಕೊಳ್ಳಿ."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ಶಾರ್ಟ್‌ಕಟ್ ಸರಿಸಲು ಅಥವಾ ಕಸ್ಟಮ್ ಕ್ರಿಯೆಗಳನ್ನು ಬಳಸಲು ಡಬಲ್-ಟ್ಯಾಪ್ ಮಾಡಿ ಮತ್ತು ಹಿಡಿದುಕೊಳ್ಳಿ."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"ಈ ಮುಖಪುಟದ ಪರದೆಯಲ್ಲಿ ಹೆಚ್ಚು ಸ್ಥಳಾವಕಾಶವಿಲ್ಲ."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ಮೆಚ್ಚಿನವುಗಳ ಟ್ರೇನಲ್ಲಿ ಹೆಚ್ಚಿನ ಸ್ಥಳಾವಕಾಶವಿಲ್ಲ"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಪಟ್ಟಿ"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"ವೈಯಕ್ತಿಕ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಪಟ್ಟಿ"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"ಮುಖಪುಟದ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಮತ್ತು ಶಾರ್ಟ್‌ಕಟ್‌ಗಳನ್ನು ಬರೆಯಿರಿ"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"ಮುಖಪುಟದಲ್ಲಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಮತ್ತು ಶಾರ್ಟ್‌ಕಟ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಲು ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿ ನೀಡುತ್ತದೆ."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"ಫೋನ್ ಕರೆಗಳನ್ನು ಮಾಡಲು <xliff:g id="APP_NAME">%1$s</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌‌ಗೆ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"ವಿಜೆಟ್ ಅನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"ಸೆಟಪ್ ಪೂರ್ಣಗೊಳಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"ಇದೊಂದು ಅಪ್ಲಿಕೇಶನ್ ಆಗಿದೆ ಮತ್ತು ಅಸ್ಥಾಪಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"ಹೆಸರನ್ನು ಎಡಿಟ್ ಮಾಡಿ"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ಬ್ಯಾಡ್ಜ್ ಮಾಡಲಾಗಿದೆ ಮತ್ತು ಅವುಗಳು ನಿಮ್ಮ IT ನಿರ್ವಾಹಕರಿಗೆ ಗೋಚರಿಸುತ್ತವೆ"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ಸರಿ"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳು ಆಫ್ ಆಗಿವೆ"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"ಉದ್ಯೋಗದ ಆ್ಯಪ್‌ಗಳನ್ನು ವಿರಾಮಗೊಲಿಸಲಾಗಿದೆ"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"ನಿಮ್ಮ ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳಿಗೆ ನಿಮಗೆ ಅಧಿಸೂಚನೆಗಳನ್ನು ಕಳುಹಿಸಲು, ನಿಮ್ಮ ಬ್ಯಾಟರಿಯನ್ನು ಬಳಸಲು ಅಥವಾ ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳು ಆಫ್ ಆಗಿವೆ. ನಿಮ್ಮ ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳು ನಿಮಗೆ ಅಧಿಸೂಚನೆಗಳನ್ನು ಕಳುಹಿಸಲು, ನಿಮ್ಮ ಬ್ಯಾಟರಿಯನ್ನು ಬಳಸಲು ಅಥವಾ ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳು ಬ್ಯಾಡ್ಜ್ ಮಾಡಲಾಗಿದೆ ಮತ್ತು ನಿಮ್ಮ IT ನಿರ್ವಾಹಕರಿಗೆ ಗೋಚರಿಸುತ್ತದೆ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index c06d33753e..aba3f3dc54 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"위젯"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"검색"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"검색창에서 텍스트 지우기"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"사용 가능한 위젯 없음"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"검색결과 없음"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"위젯이나 바로가기를 사용할 수 없습니다."</string>
+    <string name="no_search_results" msgid="3787956167293097509">"위젯이나 바로가기가 없습니다."</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"개인 위젯"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"직장 위젯"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"대화"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"알림"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"길게 터치하여 바로가기를 이동하세요."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"두 번 탭한 다음 길게 터치하여 바로가기를 이동하거나 맞춤 작업을 사용하세요."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"홈 화면에 더 이상 공간이 없습니다."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"즐겨찾기 트레이에 더 이상 공간이 없습니다."</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"앱 목록"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"개인 앱 목록"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"홈 설정 및 바로가기 쓰기"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"앱이 홈에 있는 설정 및 바로가기를 변경할 수 있도록 합니다."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g>에서 전화를 걸 수 없습니다."</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"위젯을 로드할 수 없습니다."</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"탭하여 설정을 완료하세요."</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"시스템 앱은 제거할 수 없습니다."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"이름 수정"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> 사용 안함"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"직장 프로필"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"직장 앱에는 배지가 있으며, IT 관리자는 직장 앱을 확인할 수 있습니다"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"확인"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"직장 앱이 꺼져 있음"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"직장 앱이 일시중지됨"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"직장 앱에서 알림을 보내거나 배터리를 사용하거나 위치 정보에 액세스할 수 없습니다."</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"직장 앱이 꺼져 있습니다. 직장 앱에서 알림을 보내거나 배터리를 사용하거나 위치 정보에 액세스할 수 없습니다."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"직장 앱에는 배지가 있으며, IT 관리자는 직장 앱을 확인할 수 있습니다."</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 122beaca13..605ebe1d2a 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Виджеттер"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Издөө"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Текстти издөө кутучасынан тазалоо"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Виджет жок"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Издөө жыйынтыктары жок"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Виджеттер менен ыкчам баскычтар жеткиликсиз"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Виджеттер менен ыкчам баскычтар табылган жок"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Жеке виджеттер"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Жумуш"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Сүйлөшүүлөр"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Билдирмелер"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Ыкчам баскычты жылдыруу үчүн коё бербей басып туруңуз."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Ыкчам баскычты жылдыруу үчүн эки жолу таптап, кармап туруңуз же ыңгайлаштырылган аракеттерди колдонуңуз."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Бул экранда бош орун жок."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Тандамалдар тайпасында орун калган жок"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Колдонмолор тизмеси"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Жеке колдономолордун тизмеси"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"Үйдүн тууралоолорун жана тез чакырмаларын жазуу"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Колдонмого Үйдүн тууралоолорун жана тез чакырмаларын өзгөртүүгө уруксат берет."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> телефон чалууларды аткарууга уруксаты жок"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Виджет жүктөлбөй жатат"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Жөндөп бүтүрүү үчүн таптап коюңуз"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Бул системдик колдонмо жана аны чечкенге болбойт."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Аталышын түзөтүү"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> өчүрүлгөн"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Жумуш профили"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Жумуш колдонмолору белгиленип, аларды IT администраторлору көрөт"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Түшүндүм"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Жумуш колдонмолору өчүк"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Жумуш колдонмолору тындырылды"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Жумуш колдонмолору билдирмелерди жөнөтүп, түзмөгүңүздүн батареясын керектеп же кайда жүргөнүңүздү көрө албайт"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Жумуш колдонмолору өчүк жана билдирмелерди жөнөтүп, түзмөгүңүздүн батареясын керектеп же кайда жүргөнүңүздү көрө албайт"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Жумуш колдонмолору белгиленип, аларды IT администраторлору көрөт"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 73d9fc4802..9973fa513d 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"ວິດເຈັດ"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"ຊອກຫາ"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"ລຶບລ້າງຂໍ້ຄວາມຈາກກ່ອງຊອກຫາ"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"ບໍ່ມີວິດເຈັດທີ່ສາມາດໃຊ້ໄດ້"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"ບໍ່​ມີ​ຜົນ​​ການ​ຊອກຫາ​"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"ບໍ່ສາມາດໃຊ້ວິດເຈັດ ຫຼື ທາງລັດໄດ້"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"ບໍ່ພົບວິດເຈັດ ຫຼື ທາງລັດ"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ສ່ວນຕົວ"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ວຽກ"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"ການສົນທະນາ"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"ການແຈ້ງເຕືອນ"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"ແຕະຄ້າງໄວ້ເພື່ອຍ້າຍທາງລັດ."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ແຕະສອງເທື່ອຄ້າງໄວ້ເພື່ອຍ້າຍທາງລັດ ຫຼື ໃຊ້ຄຳສັ່ງກຳນົດເອງ."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"ບໍ່ມີບ່ອນຫວ່າງໃນໜ້ານີ້."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ບໍ່ມີບ່ອນຫວ່າງໃນຖາດສຳລັບເກັບສິ່ງທີ່ໃຊ້ເປັນປະຈຳ"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ລາຍຊື່ແອັບ"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"ລາຍຊື່ແອັບສ່ວນຕົວ"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"ຂຽນການຕັ້ງຄ່າໜ້າຫຼັກ ແລະທາງລັດ"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"ອະນຸຍາດໃຫ້ແອັບຯດັ່ງກ່າວ ປ່ຽນການຕັ້ງຄ່າ ແລະທາງລັດໃນໜ້າຫຼັກ."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> ບໍ່​ໄດ້​ຮັບ​ອະ​ນຸ​ຍາດ​ໃຫ້​ໂທ"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"ບໍ່ສາມາດໂຫຼດວິດເຈັດໄດ້"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"ແຕະເພື່ອຕັ້ງຄ່າໃຫ້ແລ້ວ"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"ນີ້ແມ່ນແອັບຯຂອງລະບົບ ແລະບໍ່ສາມາດຖອນການຕິດຕັ້ງອອກໄດ້."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"ແກ້ໄຂຊື່"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"ປິດການນຳໃຊ້ <xliff:g id="APP_NAME">%1$s</xliff:g> ແລ້ວ"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"ແອັບບ່ອນເຮັດວຽກແມ່ນຖືກຕິດປ້າຍ ແລະ ສະແດງໃຫ້ຜູ້ເບິ່ງແຍງໄອທີຂອງທ່ານເຫັນ"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ເຂົ້າໃຈແລ້ວ"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"ແອັບບ່ອນເຮັດວຽກຖືກປິດໄວ້ຢູ່"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"ຢຸດແອັບວຽກໄວ້ຊົ່ວຄາວແລ້ວ"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"ແອັບບ່ອນເຮັດວຽກຂອງທ່ານຈະບໍ່ສາມາດສົ່ງການແຈ້ງເຕືອນຫາທ່ານ, ໃຊ້ແບັດເຕີຣີຂອງທ່ານ ຫຼື ເຂົ້າເຖິງສະຖານທີ່ຂອງທ່ານໄດ້"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"ແອັບບ່ອນເຮັດວຽກຖືກປິດໄວ້ຢູ່. ແອັບບ່ອນເຮັດວຽກຂອງທ່ານຈະບໍ່ສາມາດສົ່ງການແຈ້ງເຕືອນໃຫ້ທ່ານ, ໃຊ້ແບັດເຕີຣີຂອງທ່ານ ຫຼື ເຂົ້າເຖິງສະຖານທີ່ຂອງທ່ານໄດ້"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"ແອັບບ່ອນເຮັດວຽກແມ່ນຖືກຕິດປ້າຍ ແລະ ສະແດງໃຫ້ຜູ້ເບິ່ງແຍງໄອທີຂອງທ່ານເຫັນ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 6843530cfb..314fcf4492 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -50,8 +50,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Valdikliai"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Paieška"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Išvalyti tekstą iš paieškos laukelio"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Nėra jokių pasiekiamų valdiklių"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Nėra jokių paieškos rezultatų"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Valdikliai ir spartieji klavišai nepasiekiami"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Neaptikta jokių valdiklių ar sparčiųjų klavišų"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Asmeniniai"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Darbas"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Pokalbiai"</string>
@@ -68,7 +68,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Pranešimai"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Dukart pal. ir palaik., kad perk. spart. klavišą."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dukart palieskite ir palaikykite, kad perkeltumėte spartųjį klavišą ar naudotumėte tinkintus veiksmus."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Šiame pagrindiniame ekrane vietos nebėra."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Mėgstamiausių dėkle nebėra vietos"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Programų sąrašas"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Asmeninių programų sąrašas"</string>
@@ -86,10 +87,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"rašyti pagrindinio puslapio nustatymus ir sparčiuosius klavišus"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Programai leidžiama keisti pagrindinio puslapio nustatymus ir sparčiuosius klavišus."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"„<xliff:g id="APP_NAME">%1$s</xliff:g>“ neleidžiama skambinti"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Nepavyko įkelti valdiklio"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Palieskite, kad užbaigtumėte sąranką"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Tai sistemos programa ir jos negalima pašalinti."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Pavadinimo redagavimas"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"„<xliff:g id="APP_NAME">%1$s</xliff:g>“ išjungta"</string>
@@ -166,7 +165,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Darbo profilis"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Darbo programos yra pažymėtos ženkleliu ir matomos IT administratoriui"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Supratau"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Darbo programos išjungtos"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Darbo programos pristabdytos"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Darbo programos negali siųsti jums pranešimų, naudoti jūsų akumuliatoriaus ar pasiekti jūsų vietovės"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Darbo programos išjungtos. Darbo programos negali siųsti jums pranešimų, naudoti jūsų akumuliatoriaus ar pasiekti jūsų vietovės"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Darbo programos yra pažymėtos ženkleliu ir matomos IT administratoriui"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index ed6ebf610a..916893f579 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -48,8 +48,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Logrīki"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Meklēt"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Notīrīt tekstu no meklēšanas lodziņa"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Nav pieejams neviens logrīks"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Nav meklēšanas rezultātu"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Logrīki un saīsnes nav pieejamas."</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Netika atrasts neviens logrīks vai saīsne."</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personīgs"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Darba"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Sarunas"</string>
@@ -66,7 +66,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Paziņojumi"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Lai pārvietotu saīsni, pieskarieties un turiet."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Lai pārvietotu saīsni, uz tās veiciet dubultskārienu un turiet. Varat arī veikt pielāgotas darbības."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Šajā sākuma ekrānā vairs nav vietas."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Izlases joslā vairs nav vietas."</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lietotņu saraksts"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Personīgo lietotņu saraksts"</string>
@@ -84,10 +85,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"rakstīt sākuma ekrāna iestatījumus un saīsnes"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Ļauj lietotnei mainīt iestatījumus un saīsnes sākuma ekrānā."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"Lietotnei <xliff:g id="APP_NAME">%1$s</xliff:g> nav atļauts veikt tālruņa zvanus."</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Nevar ielādēt logrīku."</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Pieskarieties, lai pabeigtu iestatīšanu."</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Šī ir sistēmas lietotne, un to nevar atinstalēt."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Nosaukuma rediģēšana"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Lietotne <xliff:g id="APP_NAME">%1$s</xliff:g> ir atspējota"</string>
@@ -163,7 +162,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Darba profils"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Darba lietotnēm ir pievienota emblēma, un tās ir redzamas jūsu IT administratoram"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Labi"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Darba lietotnes ir izslēgtas"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Darba lietotnes ir apturētas"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Jūsu darba lietotnes nevar sūtīt jums paziņojumus, izmantot akumulatoru un piekļūt jūsu atrašanās vietai."</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Darba lietotnes ir izslēgtas. Jūsu darba lietotnes nevar sūtīt jums paziņojumus, izmantot akumulatoru un piekļūt jūsu atrašanās vietai."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Darba lietotnēm ir pievienota emblēma, un tās ir redzamas jūsu IT administratoram"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 2d5381171a..7ce9796205 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Виџети"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Пребарувајте"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Избриши го текстот од полето за пребарување"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Нема достапни виџети"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Нема резултати од пребарувањето"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Виџетите и кратенките не се достапни"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Не се најдени виџети или кратенки"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Лични"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Работни"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Разговори"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Известувања"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Допрете и задржете за да преместите кратенка."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Допрете двапати и задржете за да преместите кратенка или користете приспособени дејства."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Нема повеќе простор на овој екран на почетната страница."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Нема повеќе простор на лентата „Омилени“"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Список со апликации"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Список со лични апликации"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"пишува поставки и кратенки на почетна страница"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Овозможува апликацијата да ги менува подесувањата и кратенките на почетната страница."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> нема дозвола за телефонски повици"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Не може да се вчита виџетот"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Допрете за да го завршите поставувањето"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Ова е системска апликација и не може да се деинсталира."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Изменете го името"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> е оневозможена"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Работен профил"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Работните апликации имаат значка и се видливи за IT-администраторот"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Сфатив"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Работните апликации се исклучени"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Работните апликации се паузирани"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Работните апликации не може да ви испраќаат известувања, да ја користат батеријата или да пристапуваат до вашата локација"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Работните апликации се исклучени. Не може да ви испраќаат известувања, да ја користат батеријата или да пристапуваат до вашата локација"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Работните апликации имаат значка и се видливи за IT-администраторот"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index f323d8fcfd..faffb00022 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"വിജറ്റുകൾ"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"തിരയൽ"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"സെർച്ച് ബോക്‌സിൽ നിന്ന് ടെക്‌സ്‌റ്റ് മായ്‌ക്കുക"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"ഒരു വിജറ്റുകളും ലഭ്യമല്ല"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"തിരയൽ ഫലങ്ങളൊന്നുമില്ല"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"വിജറ്റുകളും കുറുക്കുവഴികളും ലഭ്യമല്ല"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"വിജറ്റുകളോ കുറുക്കുവഴികളോ കണ്ടെത്തിയില്ല"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"വ്യക്തിപരം"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ജോലി"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"സംഭാഷണങ്ങൾ"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"അറിയിപ്പുകൾ"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"കുറുക്കുവഴി നീക്കാൻ സ്‌പർശിച്ച് പിടിക്കുക."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"കുറുക്കുവഴി നീക്കാൻ ഡബിൾ ടാപ്പ് ചെയ്യൂ, ഹോൾഡ് ചെയ്യൂ അല്ലെങ്കിൽ ഇഷ്‌ടാനുസൃത പ്രവർത്തനങ്ങൾ ഉപയോഗിക്കൂ."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"ഈ ഹോം സ്‌ക്രീനിൽ ഒഴിവൊന്നുമില്ല."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"പ്രിയപ്പെട്ടവയുടെ ട്രേയിൽ ഒഴിവൊന്നുമില്ല"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"അപ്ലിക്കേഷനുകളുടെ ലിസ്‌റ്റ്"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"വ്യക്തിഗത ആപ്പുകളുടെ ലിസ്റ്റ്"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"ഹോം ക്രമീകരണങ്ങളും കുറുക്കുവഴികളും റൈറ്റുചെയ്യുക"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"ഹോമിലെ ക്രമീകരണങ്ങളും കുറുക്കുവഴികളും മാറ്റാൻ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"ഫോൺ കോൾ ചെയ്യാൻ <xliff:g id="APP_NAME">%1$s</xliff:g> എന്നതിനെ അനുവദിച്ചിട്ടില്ല"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"വിജറ്റ് ലോഡ് ചെയ്യാനാകുന്നില്ല"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"സജ്ജീകരണം പൂർത്തിയാക്കാൻ ടാപ്പ് ചെയ്യുക"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"ഇതൊരു സിസ്‌റ്റം അപ്ലിക്കേഷനായതിനാൽ അൺഇൻസ്‌റ്റാളുചെയ്യാനാവില്ല."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"പേര് എഡിറ്റ് ചെയ്യുക"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> പ്രവർത്തനരഹിതമാക്കി"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"ഔദ്യോഗിക പ്രൊഫൈൽ"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"ഔദ്യോഗിക ആപ്പുകൾക്ക് ബാഡ്‌ജ് നൽകിയിരിക്കുന്നു, അവ നിങ്ങളുടെ ഐടി അഡ്‌മിന് കാണാനുമാകും"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"മനസ്സിലായി"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"ഔദ്യോഗിക ആപ്പുകൾ ഓഫാണ്"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"ഔദ്യോഗിക ആപ്പുകൾ തൽക്കാലം നിർത്തിയിരിക്കുന്നു"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"നിങ്ങൾക്ക് അറിയിപ്പുകൾ അയയ്ക്കാനോ ബാറ്ററി ഉപയോഗിക്കാനോ ലൊക്കേഷൻ ആക്‌സസ് ചെയ്യാനോ നിങ്ങളുടെ ഔദ്യോഗിക ആപ്പുകൾക്ക് കഴിയില്ല"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"ഔദ്യോഗിക ആപ്പുകൾ ഓഫാണ്. നിങ്ങൾക്ക് അറിയിപ്പുകൾ അയയ്ക്കാനോ ബാറ്ററി ഉപയോഗിക്കാനോ ലൊക്കേഷൻ ആക്‌സസ് ചെയ്യാനോ നിങ്ങളുടെ ഔദ്യോഗിക ആപ്പുകൾക്ക് കഴിയില്ല"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"ഔദ്യോഗിക ആപ്പുകൾക്ക് ബാഡ്‌ജ് നൽകിയിരിക്കുന്നു, അവ നിങ്ങളുടെ ഐടി അഡ്‌മിന് കാണാനും കഴിയും"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index fc9f772bbe..0216ae574d 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Виджет"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Хайх"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Хайх хэсгээс текстийг арилгах"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Боломжтой жижиг хэрэгсэл байхгүй"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Хайлтын илэрц байхгүй"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Жижиг хэрэгсэл болон товчлол боломжгүй байна"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Жижиг хэрэгсэл эсвэл товчлол олдсонгүй"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Хувийн виджетүүд"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Ажил"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Харилцан яриа"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Мэдэгдэл"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Товчлолыг зөөхийн тулд хүрээд, удаан дарна уу."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Товчлолыг зөөх эсвэл захиалгат үйлдлийг ашиглахын тулд хоёр товшоод, удаан дарна уу."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Энэ Нүүр дэлгэц зайгүй."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"\"Дуртай\" трей дээр өөр зай байхгүй байна"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Апп-н жагсаалт"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Хувийн аппын жагсаалт"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"Нүүрний тохиргоо болон товчлолыг бичих"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Апп нь Нүүрэндэх товчлол болон тохиргоог өөрчилж чадна."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> утасны дуудлага хийх боломжгүй"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Жижиг хэрэгслийг ачаалах боломжгүй"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Тохируулгыг дуусгахын тулд товшино уу"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Энэ апп нь системийн апп ба устгах боломжгүй."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Нэр засах"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g>-г идэвхгүй болгосон"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Ажлын профайл"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Ажлын аппуудыг тэмдэглэсэн бөгөөд танай IT админд харагдана"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Ойлголоо"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Ажлын аппууд унтраалттай байна"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Ажлын аппуудыг түр зогсоосон"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Таны ажлын аппууд танд мэдэгдэл илгээх, таны батарейг ашиглах эсвэл байршилд тань хандах боломжгүй"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Ажлын аппууд унтраалттай байна. Таны ажлын аппууд танд мэдэгдэл илгээх, таны батарейг ашиглах эсвэл байршилд тань хандах боломжгүй"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Ажлын аппуудыг тэмдэглэсэн бөгөөд танай IT админд харагдана"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 6a333f7045..e7269caeee 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"विजेट"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"शोधा"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"सर्च बॉक्समधून मजकूर साफ करा"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"कोणतीही विजेट उपलब्ध नाहीत"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"कोणतेही शोध परिणाम नाहीत"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"विजेट आणि शॉर्टकट उपलब्ध नाहीत"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"कोणतीही विजेट किंवा शॉर्टकट आढळले नाहीत"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"वैयक्तिक"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ऑफिस"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"संभाषणे"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"सूचना"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"शॉर्टकट हलवण्यासाठी स्पर्श करा आणि धरून ठेवा."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"शॉर्टकट हलवण्यासाठी किंवा कस्टम कृती वापरण्यासाठी दोनदा टॅप करा आणि धरून ठेवा."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"या मुख्य स्क्रीनवर आणखी जागा नाही."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"आवडीच्या ट्रे मध्ये आणखी जागा नाही"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"अ‍ॅप्स सूची"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"वैयक्तिक अ‍ॅप्स सूची"</string>
@@ -75,17 +76,15 @@
     <string name="install_drop_target_label" msgid="2539096853673231757">"इंस्टॉल करा"</string>
     <string name="dismiss_prediction_label" msgid="3357562989568808658">"ॲप सुचवू नका"</string>
     <string name="pin_prediction" msgid="4196423321649756498">"पूर्वानुमान पिन करा"</string>
-    <string name="permlab_install_shortcut" msgid="5632423390354674437">"शॉर्टकट स्‍थापित करा"</string>
+    <string name="permlab_install_shortcut" msgid="5632423390354674437">"शॉर्टकट इंस्टॉल करा"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"वापरकर्ता हस्तक्षेपाशिवाय शॉर्टकट जोडण्यास अ‍ॅप ला अनुमती देते."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"होम सेटिंग्ज आणि शॉर्टकट वाचा"</string>
     <string name="permdesc_read_settings" msgid="5833423719057558387">"मुख्यपृष्ठातील सेटिंग्ज आणि शॉर्टकट वाचण्यास अ‍ॅप ला अनुमती देते."</string>
     <string name="permlab_write_settings" msgid="3574213698004620587">"होम सेटिंग्ज आणि शॉर्टकट लिहा"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"मुख्यपृष्ठातील सेटिंग्ज आणि शॉर्टकट बदलण्यास अ‍ॅप ला अनुमती देते."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> ला फोन कॉल करण्याची अनुमती नाही"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"विजेट लोड करू शकत नाही"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"सेटअप पूर्ण करण्यासाठी टॅप करा"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"हा सिस्टम अ‍ॅप आहे आणि अनइंस्टॉल केला जाऊ शकत नाही."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"नाव संपादित करा"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> अक्षम केला आहे"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"कार्य प्रोफाइल"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"कामाशी संबंधित ॲप्स ही बॅज केलेली असून तुमच्या IT ॲडमिनला दृश्यमान आहेत"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"समजले"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"कामाशी संबंधित ॲप्स बंद आहेत"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"कार्य ॲप्स थांबवली आहेत"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"तुमचे कामाशी संबंधित ॲप्स तुम्हाला सूचना पाठवू शकत नाहीत, तुमची बॅटरी वापरू शकत नाहीत किंवा तुमचे स्थान अ‍ॅक्सेस करू शकत नाहीत"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"कामाशी संबंधित ॲप्स बंद आहेत. तुमचे कामाशी संबंधित ॲप्स तुम्हाला सूचना पाठवू शकत नाहीत, तुमची बॅटरी वापरू शकत नाहीत किंवा तुमचे स्थान अ‍ॅक्सेस करू शकत नाहीत"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Work apps ही बॅज केलेली असून तुमच्या IT ॲडमिनला दृश्यमान आहेत"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 07b414a1d1..3b200fda73 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Widget"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Cari"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Kosongkan teks daripada kotak carian"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Widget tidak tersedia"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Tiada hasil carian"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Widget dan pintasan tidak tersedia"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Tiada widget atau pintasan yang dijumpai"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Peribadi"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Tempat kerja"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Perbualan"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Pemberitahuan"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Sentuh &amp; tahan untuk menggerakkan pintasan."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Ketik dua kali &amp; tahan untuk menggerakkan pintasan atau menggunakan tindakan tersuai."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Tiada lagi ruang pada skrin Laman Utama ini."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Tiada ruang dalam dulang Kegemaran lagi"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Senarai apl"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Senarai apl peribadi"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"tulis tetapan dan pintasan Laman Utama"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Membenarkan apl menukar tetapan dan pintasan di Laman Utama."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> tidak dibenarkan membuat panggilan telefon"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Tidak dapat memuatkan widget"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Ketik untuk menyelesaikan persediaan"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Ini ialah apl sistem dan tidak boleh dinyahpasang."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Edit Nama"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> dilumpuhkan"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profil kerja"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Apl kerja mempunyai lencana dan kelihatan kepada pentadbir IT anda"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Apl kerja dimatikan"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Apl kerja dijeda"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Apl kerja anda tidak boleh menghantar pemberitahuan kepada anda, menggunakan bateri anda atau mengakses lokasi anda"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Apl kerja dimatikan. Apl kerja anda tidak boleh menghantar pemberitahuan kepada anda, menggunakan bateri anda atau mengakses lokasi anda"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Apl kerja mempunyai lencana dan kelihatan kepada pentadbir IT anda"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index e9f42e4014..4077871d53 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"ဝိဂျက်များ"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"ရှာရန်"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"ရှာဖွေစာလုံးဖြည့်ကွက်လပ်မှ စာသားကို ရှင်းလင်းပါ"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"ဝိဂျက်များ မရနိုင်ပါ"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"ရှာဖွေမှု ရလဒ်များ မရှိပါ"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"ဝိဂျက်နှင့် ဖြတ်လမ်းလင့်ခ်များ မရနိုင်ပါ"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"ဝိဂျက် (သို့) ဖြတ်လမ်းလင့်ခ်များ ရှာမတွေ့ပါ"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ကိုယ်ပိုင်"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"အလုပ်"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"စကားဝိုင်းများ"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"အကြောင်းကြားချက်များ"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"ဖြတ်လမ်းလင့်ခ်ကို ရွှေ့ရန် နှစ်ချက်တို့ပြီး ဖိထားပါ။"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ဖြတ်လမ်းလင့်ခ်ကို ရွှေ့ရန် (သို့) စိတ်ကြိုက်လုပ်ဆောင်ချက်များကို သုံးရန် နှစ်ချက်တို့ပြီး ဖိထားပါ။"</string>
-    <string name="out_of_space" msgid="4691004494942118364">"ဤပင်မမျက်နှာစာတွင် နေရာလွတ် မကျန်တော့ပါ"</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"အနှစ်သက်ဆုံးများ ထားရာတွင် နေရာလွတ် မကျန်တော့ပါ"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"အက်ပ်စာရင်း"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"တစ်ကိုယ်ရေသုံး အက်ပ်စာရင်း"</string>
@@ -75,17 +76,15 @@
     <string name="install_drop_target_label" msgid="2539096853673231757">"ထည့်သွင်းရန်"</string>
     <string name="dismiss_prediction_label" msgid="3357562989568808658">"အက်ပ်ကို အကြံမပြုပါနှင့်"</string>
     <string name="pin_prediction" msgid="4196423321649756498">"ခန့်မှန်းချက်ကို ပင်ထိုးရန်"</string>
-    <string name="permlab_install_shortcut" msgid="5632423390354674437">"အတိုကောက်မှတ်သားမှုများအား ထည့်သွင်းခြင်း"</string>
+    <string name="permlab_install_shortcut" msgid="5632423390354674437">"ဖြတ်လမ်းလင့်ခ်များ ထည့်သွင်းခြင်း"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"အသုံးပြုသူ လုပ်ဆောင်မှုမရှိပဲ အပ်ပလီကေးရှင်းကို အတိုကောက်မှတ်သားမှုများ ပြုလုပ်ခွင့် ပေးခြင်း"</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"ပင်မမျက်နှာစာ အပြင်အဆင် နှင့် အတိုကောက်မှတ်သားမှုများအား ဖတ်ခြင်း"</string>
     <string name="permdesc_read_settings" msgid="5833423719057558387">"ပင်မမျက်နှာစာတွင်ရှိသော အပြင်အဆင်နှင့် အတိုကောက်မှတ်သားမှုများကို အပ်ပလီကေးရှင်းအား ဖတ်ခွင့်ပြုခြင်း"</string>
     <string name="permlab_write_settings" msgid="3574213698004620587">"ပင်မမျက်နှာစာ အပြင်အဆင် နှင့် အတိုကောက်မှတ်သားမှုများအား ရေးသားခြင်း"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"ပင်မမျက်နှာစာတွင် ရှိသော အပြင်အဆင် နှင့် အတိုကောက်မှတ်သားမှုများ ကို အပ်ပလီကေးရှင်းအား ပြောင်းခွင့်ပြုခြင်း"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g>သည် ဖုန်းခေါ်ဆိုခွင့် မရှိပါ"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"ဝိဂျက်ကို ဖွင့်၍မရပါ"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"စနစ်ထည့်သွင်းခြင်း အပြီးသတ်ရန် တို့ပါ"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"ဤအပ်ပလီကေးရှင်းမှာ စစ်စတန်ပိုင်းဆိုင်ရာ အပ်ပလီကေးရှင်းဖြစ်ပါသည်။ ထုတ်ပစ်၍ မရပါ"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"အမည်ကို တည်းဖြတ်ပါ"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> ကို ပိတ်ထားသည်"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"အလုပ်ပရိုဖိုင်"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"အလုပ်သုံးအက်ပ်များကို တံဆိပ်တပ်ထားပြီး သင်၏ IT စီမံခန့်ခွဲသူက မြင်နိုင်ပါသည်"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ရပါပြီ"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"အလုပ်သုံးအက်ပ်များ ပိတ်ထားသည်"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"အလုပ်သုံးအက်ပ်များကို ခေတ္တရပ်ထားသည်"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"သင်၏ အလုပ်သုံးအက်ပ်များက အကြောင်းကြားချက်များ ပို့ခြင်း၊ သင့်ဘက်ထရီ သုံးခြင်း (သို့) သင့်တည်နေရာ သုံးခြင်းတို့ မပြုလုပ်နိုင်ပါ"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"အလုပ်သုံးအက်ပ်များ ပိတ်ထားသည်။ သင်၏ အလုပ်သုံးအက်ပ်များက အကြောင်းကြားချက်များ ပို့ခြင်း၊ သင့်ဘက်ထရီ သုံးခြင်း (သို့) သင့်တည်နေရာ သုံးခြင်းတို့ မပြုလုပ်နိုင်ပါ"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"အလုပ်သုံးအက်ပ်များကို တံဆိပ်တပ်ထားပြီး သင်၏ IT စီမံခန့်ခွဲသူက မြင်နိုင်ပါသည်"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 046f4adbbd..4be9caa2a8 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -46,9 +46,9 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Moduler"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Søk"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Tøm tekst fra søkefeltet"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Ingen moduler er tilgjengelige"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Ingen søkeresultater"</string>
-    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personlig"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Moduler og snarveier er ikke tilgjengelige"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Fant ingen moduler eller snarveier"</string>
+    <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personlige"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Jobb"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Samtaler"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Lett tilgjengelig nyttig informasjon"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Varsler"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Trykk og hold for å flytte en snarvei."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dobbelttrykk og hold for å flytte en snarvei eller bruke tilpassede handlinger."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Denne startsiden er full."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Favoritter-skuffen er full"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"App-liste"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Personlige apper-liste"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"angi startsideinnstillinger og -snarveier"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Lar appen endre innstillingene og snarveiene på startsiden."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> har ikke tillatelse til å ringe"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Kan ikke laste inn modulen"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Trykk for å fullføre konfigureringen"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Dette er en systemapp som ikke kan avinstalleres."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Rediger navn"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Slo av <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Jobbprofil"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Jobbapper er merket og synlige for IT-administratoren din"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Greit"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Jobbapper er av"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Jobbapper er satt på pause"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Jobbapper kan ikke sende deg varsler, bruke batteriet eller få tilgang til posisjonen din"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Jobbapper er av. De kan ikke sende deg varsler, bruke batteriet eller få tilgang til posisjonen din"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Jobbapper er merket og synlige for IT-administratoren din"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index f7dcd964d7..3c21701b08 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"विजेटहरू"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"खोज्नुहोस्"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"खोज बाकसमा भएको पाठ हटाउनुहोस्"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"कुनै पनि विजेट उपलब्ध छैन"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"कुनै पनि खोज परिणाम भेटिएन"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"विजेट र सर्टकटहरू उपलब्ध छन्"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"कुनै पनि विजेट वा सर्टकट फेला परेन"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"व्यक्तिगत"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"कामसम्बन्धी"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"वार्तालापहरू"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"सूचनाहरू"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"कुनै सर्टकट सार्न डबल ट्याप गरेर छोइराख्नुहोस्।"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"कुनै सर्टकट सार्न वा आफ्नो रोजाइका कारबाही प्रयोग गर्न डबल ट्याप गरेर छोइराख्नुहोस्।"</string>
-    <string name="out_of_space" msgid="4691004494942118364">"यो होम स्क्रिनमा थप ठाउँ छैन।"</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"मन पर्ने ट्रे अब कुनै ठाँउ छैन"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"एपको सूची"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"व्यक्तिगत अनुप्रयोगहरूको सूची"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"गृह सेटिङहरू र सर्टकटहरू लेख्नुहोस्"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"गृहमा एउटा एपलाई सेटिङ र सर्टकट बदल्न अनुमति दिनुहोस्।"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> ले फोन कलहरू गर्न अनुमति छैन"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"विजेट लोड गर्न सकिएन"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"सेटअप गर्ने प्रक्रिया पूरा गर्न ट्याप गर्नुहोस्"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"यो प्रणाली एप हो र यसलाई स्थापना रद्द गर्न सकिँदैन।"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"नाम सम्पादन गर्नुहोस्"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"असक्षम पारिएको <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"कार्य प्रोफाइल"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"कामसम्बन्धी एपहरूमा ब्याज अङ्कित हुन्छ र तपाईंका IT एड्मिन ती एप हेर्न सक्छन्"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"बुझेँ"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"कामसम्बन्धी एपहरू अफ गरिएका छन्"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"कार्यसम्बन्धी एपहरू पज गरिएका छन्"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"तपाईंका कामसम्बन्धी एपहरूले तपाईंलाई सूचना पठाउन, तपाईंको डिभाइसको ब्याट्री प्रयोग गर्न वा तपाईंको लोकेसन हेर्न सक्दैनन्"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"कामसम्बन्धी एपहरू अफ गरिएका छन्। तपाईंका कामसम्बन्धी एपहरूले तपाईंलाई सूचना पठाउन, तपाईंको डिभाइसको ब्याट्री प्रयोग गर्न वा तपाईंको लोकेसन हेर्न सक्दैनन्"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"कामसम्बन्धी एपमा ब्याज अङ्कित हुन्छ र तपाईंका IT एड्मिन ती एप हेर्न सक्नुहुन्छ"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index a48214788b..5f8878b730 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Zoeken"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Tekst in zoekvak wissen"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Geen widgets beschikbaar"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Geen zoekresultaten"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Widgets en snelkoppelingen zijn niet beschikbaar"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Geen widgets of snelkoppelingen gevonden"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Persoonlijk"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Werk"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Gesprekken"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Meldingen"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Tik en houd vast om een snelkoppeling te verplaatsen."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dubbeltik en houd vast om een snelkoppeling te verplaatsen of aangepaste acties te gebruiken."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Er is geen ruimte meer op dit startscherm."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Geen ruimte meer in het vak \'Favorieten\'"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lijst met apps"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lijst met persoonlijke apps"</string>
@@ -158,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Werkprofiel"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Werk-apps hebben badges en zijn zichtbaar voor je IT-beheerder"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Werk-apps staan uit"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Werk-apps zijn onderbroken"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Je werk-apps kunnen je geen meldingen sturen, je batterij niet gebruiken en geen toegang krijgen tot je locatie"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Werk-apps staan uit. Je werk-apps kunnen je geen meldingen sturen, je batterij niet gebruiken en geen toegang krijgen tot je locatie."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Werk-apps hebben badges en zijn zichtbaar voor je IT-beheerder"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 461c082e83..3289e1ad25 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -46,8 +46,10 @@
     <string name="widget_button_text" msgid="2880537293434387943">"ୱିଜେଟ୍‌"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"ସନ୍ଧାନ କରନ୍ତୁ"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"ସନ୍ଧାନ ବାକ୍ସରୁ ଟେକ୍ସଟ୍ ଖାଲି କରନ୍ତୁ"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"କୌଣସି ୱିଜେଟ୍ ଉପଲବ୍ଧ ନାହିଁ"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"କୌଣସି ସନ୍ଧାନ ଫଳାଫଳ ନାହିଁ"</string>
+    <!-- no translation found for no_widgets_available (4337693382501046170) -->
+    <skip />
+    <!-- no translation found for no_search_results (3787956167293097509) -->
+    <skip />
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ବ୍ୟକ୍ତିଗତ"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ୱାର୍କ"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ"</string>
@@ -64,7 +66,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"ବିଜ୍ଞପ୍ତି"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"ଏକ ସର୍ଟକଟକୁ ମୁଭ୍ କରିବା ପାଇଁ ସ୍ପର୍ଶ କରି ଧରି ରଖନ୍ତୁ।"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ଏକ ସର୍ଟକଟକୁ ମୁଭ୍ କରିବା ପାଇଁ ଦୁଇଥର-ଟାପ୍ କରି ଧରି ରଖନ୍ତୁ କିମ୍ବା କଷ୍ଟମ୍ କାର୍ଯ୍ୟଗୁଡ଼ିକୁ ବ୍ୟବହାର କରନ୍ତୁ।"</string>
-    <string name="out_of_space" msgid="4691004494942118364">"ଏହି ମୂଳସ୍କ୍ରୀନରେ ଆଉ ଜାଗା ନାହିଁ"</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ମନପସନ୍ଦ ଟ୍ରେରେ ଆଉ କୋଠରୀ ନାହିଁ"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ଆପ୍‌ ତାଲିକା"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"ବ୍ୟକ୍ତିଗତ ଆପ୍ ତାଲିକା"</string>
@@ -82,10 +85,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"ହୋମ୍‌ ସେଟିଙ୍ଗ ଏବଂ ଶର୍ଟକଟ୍‌ ଲେଖନ୍ତୁ"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"ହୋମରେ ସେଟିଙ୍ଗ ଏବଂ ଶର୍ଟକଟ୍‌ ପରିବର୍ତ୍ତନ କରିବାକୁ ଆପକୁ ଅନୁମତି ଦିଏ।"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"ଫୋନ୍‌ କଲ୍‌ କରିବାକୁ <xliff:g id="APP_NAME">%1$s</xliff:g>କୁ ଅନୁମତି ଦିଆଯାଇ ନାହିଁ"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"ୱିଜେଟ୍ ଲୋଡ୍ କରାଯାଇପାରିବ ନାହିଁ"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"ସେଟ୍ ଅପ୍ ସମ୍ପୂର୍ଣ୍ଣ କରିବା ପାଇଁ ଟାପ୍ କରନ୍ତୁ"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"ଏହା ଏକ ସିଷ୍ଟମ୍‌ ଆପ୍‌ ଅଟେ ଏବଂ ଏହା ଅନଇନଷ୍ଟଲ୍‌ କରାଯାଇ ପାରିବ ନାହିଁ।"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"ନାମ ସମ୍ପାଦନ କରନ୍ତୁ"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> ଅକ୍ଷମ କରାଗଲା"</string>
@@ -160,7 +161,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"ୱର୍କ ପ୍ରୋଫାଇଲ୍‌"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"ୱାର୍କ ଆପଗୁଡ଼ିକୁ ବ୍ୟାଜ୍ କରାଯାଇଛି ଏବଂ ସେଗୁଡ଼ିକ ଆପଣଙ୍କ IT ଆଡମିନଙ୍କୁ ଦୃଶ୍ୟମାନ ହେଉଛି"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ବୁଝିଗଲି"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"ୱାର୍କ ଆପଗୁଡ଼ିକ ବନ୍ଦ ଅଛି"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"ୱାର୍କ ଆପ୍ସ ବିରତ କରାଯାଇଛି"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"ଆପଣଙ୍କ ୱାର୍କ ଆପଗୁଡ଼ିକ ଆପଣଙ୍କୁ ବିଜ୍ଞପ୍ତି ପଠାଇପାରିବ ନାହିଁ, ଆପଣଙ୍କ ବ୍ୟାଟେରୀକୁ ବ୍ୟବହାର କରିପାରିବ ନାହିଁ କିମ୍ବା ଆପଣଙ୍କର ଲୋକେସନକୁ ଆକ୍ସେସ୍ କରିପାରିବ ନାହିଁ"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"ୱାର୍କ ଆପଗୁଡ଼ିକ ବନ୍ଦ ଅଛି। ଆପଣଙ୍କ ୱାର୍କ ଆପଗୁଡ଼ିକ ଆପଣଙ୍କୁ ବିଜ୍ଞପ୍ତି ପଠାଇପାରିବ ନାହିଁ, ଆପଣଙ୍କ ବ୍ୟାଟେରୀକୁ ବ୍ୟବହାର କରିପାରିବ ନାହିଁ କିମ୍ବା ଆପଣଙ୍କର ଲୋକେସନକୁ ଆକ୍ସେସ୍ କରିପାରିବ ନାହିଁ"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"ୱାର୍କ ଆପଗୁଡ଼ିକୁ ବ୍ୟାଜ୍ କରାଯାଇଛି ଏବଂ ଆପଣଙ୍କ IT ଆଡମିନଙ୍କୁ ଦେଖାଯାଉଛି"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 63ec08593f..ed0879fb3b 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -46,8 +46,10 @@
     <string name="widget_button_text" msgid="2880537293434387943">"ਵਿਜੇਟ"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"ਖੋਜੋ"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"ਖੋਜ ਬਾਕਸ ਤੋਂ ਸਪੱਸ਼ਟ ਲਿਖਤ"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"ਕੋਈ ਵਿਜੇਟ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"ਕੋਈ ਖੋਜ ਨਤੀਜਾ ਨਹੀਂ"</string>
+    <!-- no translation found for no_widgets_available (4337693382501046170) -->
+    <skip />
+    <!-- no translation found for no_search_results (3787956167293097509) -->
+    <skip />
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ਨਿੱਜੀ"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ਕਾਰਜ-ਸਥਾਨ"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"ਗੱਲਾਂਬਾਤਾਂ"</string>
@@ -64,7 +66,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"ਸੂਚਨਾਵਾਂ"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"ਕਿਸੇ ਸ਼ਾਰਟਕੱਟ ਨੂੰ ਲਿਜਾਉਣ ਲਈ ਸਪੱਰਸ਼ ਕਰਕੇ ਦਬਾਈ ਰੱਖੋ।"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ਕਿਸੇ ਸ਼ਾਰਟਕੱਟ ਨੂੰ ਲਿਜਾਉਣ ਲਈ ਡਬਲ ਟੈਪ ਕਰਕੇ ਦਬਾਈ ਰੱਖੋ ਜਾਂ ਵਿਉਂਤੀਆਂ ਕਾਰਵਾਈਆਂ ਵਰਤੋ।"</string>
-    <string name="out_of_space" msgid="4691004494942118364">"ਇਸ ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਹੋਰ ਖਾਲੀ ਥਾਂ ਨਹੀਂ ਹੈ।"</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ਮਨਪਸੰਦ ਟ੍ਰੇ ਵਿੱਚ ਹੋਰ ਖਾਲੀ ਸਥਾਨ ਨਹੀਂ।"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ਐਪ ਸੂਚੀ"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"ਨਿੱਜੀ ਐਪਾਂ ਦੀ ਸੂਚੀ"</string>
@@ -82,10 +85,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"ਹੋਮ ਸੈਟਿੰਗਾਂ ਅਤੇ ਸ਼ਾਰਟਕੱਟ ਲਿਖੋ"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"ਐਪ ਨੂੰ ਹੋਮ ਵਿੱਚ ਸੈਟਿੰਗਾਂ ਅਤੇ ਸ਼ਾਰਟਕੱਟ ਬਦਲਣ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਨੂੰ ਫ਼ੋਨ ਕਾਲਾਂ ਕਰਨ ਦੀ ਆਗਿਆ ਨਹੀਂ ਹੈ"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"ਵਿਜੇਟ ਨੂੰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"ਸੈੱਟਅੱਪ ਪੂਰਾ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"ਇਹ ਇੱਕ ਸਿਸਟਮ ਐਪ ਹੈ ਅਤੇ ਇਸਨੂੰ ਅਣਇੰਸਟੌਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ।"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"ਨਾਮ ਦਾ ਸੰਪਾਦਨ ਕਰੋ"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਨੂੰ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ"</string>
@@ -160,7 +161,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਨੂੰ ਬੈਜ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਅਤੇ ਇਹ ਤੁਹਾਡੇ ਆਈ.ਟੀ. ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਦਿਸਣਗੀਆਂ"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ਸਮਝ ਲਿਆ"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਬੰਦ ਹਨ"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਨੂੰ ਰੋਕਿਆ ਗਿਆ ਹੈ"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"ਤੁਹਾਡੀਆਂ ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਤੁਹਾਨੂੰ ਸੂਚਨਾਵਾਂ ਨਹੀਂ ਭੇਜ ਸਕਦੀਆਂ, ਤੁਹਾਡੀ ਬੈਟਰੀ ਨਹੀਂ ਵਰਤ ਸਕਦੀਆਂ ਜਾਂ ਤੁਹਾਡੇ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਨਹੀਂ ਕਰ ਸਕਦੀਆਂ"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਬੰਦ ਹਨ। ਤੁਹਾਡੀਆਂ ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਤੁਹਾਨੂੰ ਸੂਚਨਾਵਾਂ ਨਹੀਂ ਭੇਜ ਸਕਦੀਆਂ, ਤੁਹਾਡੀ ਬੈਟਰੀ ਨਹੀਂ ਵਰਤ ਸਕਦੀਆਂ ਜਾਂ ਤੁਹਾਡੇ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਨਹੀਂ ਕਰ ਸਕਦੀਆਂ"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਨੂੰ ਬੈਜ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਅਤੇ ਇਹ ਤੁਹਾਡੇ ਆਈ.ਟੀ. ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਦਿਸਣਗੀਆਂ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index bb54c2f8e7..3cfb569fe3 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -50,8 +50,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Widżety"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Szukaj"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Wyczyść tekst w polu wyszukiwania"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Brak dostępnych widżetów"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Brak wyników wyszukiwania"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Widżety i skróty nie są dostępne"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Nie znaleziono widżetów ani skrótów"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Osobiste"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Służbowe"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Rozmowy"</string>
@@ -68,7 +68,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Powiadomienia"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Naciśnij i przytrzymaj, aby wybrać skrót."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Naciśnij dwukrotnie i przytrzymaj, aby przenieść skrót lub użyć działań niestandardowych."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Brak miejsca na tym ekranie głównym."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Brak miejsca w Ulubionych"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista aplikacji"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista aplikacji osobistych"</string>
@@ -86,10 +87,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"zapisywanie ustawień i skrótów na ekranie głównym"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Umożliwia aplikacji zmianę ustawień i skrótów na ekranie głównym."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> nie może wykonywać połączeń telefonicznych"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Nie udało się załadować widżetu"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Kliknij, aby dokończyć konfigurację"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"To aplikacja systemowa i nie można jej odinstalować."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Edytuj nazwę"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Aplikacja <xliff:g id="APP_NAME">%1$s</xliff:g> jest wyłączona"</string>
@@ -166,7 +165,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profil służbowy"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Aplikacje służbowe mają plakietki i są widoczne dla administratora IT"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Aplikacje służbowe są wyłączone"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Aplikacje do pracy zostały wstrzymane"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Aplikacje służbowe nie mogą wysyłać powiadomień, używać baterii ani uzyskiwać dostępu do Twojej lokalizacji"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Aplikacje służbowe są wyłączone i nie mogą wysyłać powiadomień, używać baterii ani uzyskiwać dostępu do Twojej lokalizacji"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Aplikacje służbowe mają plakietki i są widoczne dla administratora IT"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 11f1f8370d..9aeecdc383 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Pesquisar"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Limpe o texto da caixa de pesquisa"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Nenhum widget disponível"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Nenhum resultado da pesquisa"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Os widgets e os atalhos não estão disponíveis"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Nenhum widget ou atalho encontrado"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Pessoais"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Trabalho"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversas"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notificações"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Toque sem soltar para mover um atalho."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Toque duas vezes sem soltar para mover um atalho ou utilizar ações personalizadas."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Sem espaço suficiente neste Ecrã principal."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Não existe mais espaço no tabuleiro de Favoritos"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista de aplicações"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista de aplicações pessoais"</string>
@@ -158,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de trabalho"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"As apps de trabalho têm um emblema e estão visíveis para o seu administrador de TI"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"As apps de trabalho estão desativadas"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"As apps de trabalho estão em pausa"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"As apps de trabalho não podem enviar-lhe notificações, utilizar a bateria ou aceder à sua localização"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"As apps de trabalho estão desativadas. As apps de trabalho não podem enviar-lhe notificações, utilizar a bateria ou aceder à sua localização"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"As apps de trabalho têm um emblema e estão visíveis para o seu administrador de TI"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 11779edb97..3dbf460762 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Pesquisa"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Limpar texto da caixa de pesquisa"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Nenhum widget disponível"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Nenhum resultado de pesquisa"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Nenhum widget ou atalho disponível"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Nenhum widget ou atalho encontrado"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Pessoais"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Trabalho"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversas"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notificações"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Toque e mantenha a tela pressionada para mover um atalho."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Toque duas vezes e mantenha a tela pressionada para mover um atalho ou usar ações personalizadas."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Não há mais espaço na tela inicial."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Sem espaço na bandeja de favoritos"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista de apps"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista de apps pessoais"</string>
@@ -158,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de trabalho"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Os apps de trabalho têm um ícone e ficam visíveis para o administrador de TI"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Ok"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Os apps de trabalho estão desativados"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Os apps de trabalho foram pausados"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Os apps de trabalho não podem enviar notificações, usar a bateria nem acessar o local"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Os apps de trabalho estão desativados. Eles não podem enviar notificações, usar a bateria nem acessar o local"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Os apps de trabalho têm um ícone e ficam visíveis para o administrador de TI"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 49c787cfc9..b9b3726644 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -48,8 +48,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Widgeturi"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Căutare"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Ștergeți textul din caseta de căutare"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Niciun widget disponibil"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Niciun rezultat al căutării"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Widgeturile și comenzile rapide nu sunt disponibile"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Nu au fost găsite widgeturi sau comenzi rapide"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personale"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Serviciu"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversații"</string>
@@ -66,7 +66,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notificări"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Atingeți și țineți apăsat pentru a muta comanda rapidă."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Atingeți de două ori și țineți apăsat pentru a muta o comandă rapidă sau folosiți acțiuni personalizate."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Nu mai este loc pe acest Ecran de pornire."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Spațiu epuizat în bara Preferate"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista de aplicații"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista de aplicații personale"</string>
@@ -84,10 +85,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"scrie setări și comenzi rapide pentru ecranul de pornire"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Permite aplicației să modifice setările și comenzile rapide din ecranul de pornire."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> nu are permisiunea de a apela"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Widgetul nu poate fi încărcat"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Atingeți pentru a finaliza configurarea"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Aceasta este o aplicație de sistem și nu poate fi dezinstalată."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Modificați numele"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"S-a dezactivat <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -163,7 +162,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profil de serviciu"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Aplicațiile pentru lucru sunt marcate și vizibile pentru administratorul IT"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Aplicațiile pentru lucru sunt dezactivate"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Aplicațiile pentru lucru sunt întrerupte"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Aplicațiile pentru lucru nu pot să vă trimită notificări, să folosească bateria sau să vă acceseze locația"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Aplicațiile pentru lucru sunt dezactivate. Acestea nu pot să vă trimită notificări, să folosească bateria sau să vă acceseze locația."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Aplicațiile pentru lucru sunt marcate și vizibile pentru administratorul IT"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 12db0e2543..d5c0159762 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -50,8 +50,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Виджеты"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Поиск"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Удалить текст из окна поиска"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Нет доступных виджетов."</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Ничего не найдено."</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Виджеты и ярлыки недоступны."</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Виджеты и ярлыки не найдены."</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Личные виджеты"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Рабочие виджеты"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Разговоры"</string>
@@ -68,7 +68,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Уведомления"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Нажмите и удерживайте для переноса ярлыка."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Чтобы использовать специальные действия или перенести ярлык, нажмите на него дважды и удерживайте."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"На этом экране нет свободного места."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"В разделе \"Избранное\" больше нет места"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Список приложений"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Открыть список личных приложений"</string>
@@ -86,10 +87,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"Изменение настроек и ярлыков главного экрана"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Приложение сможет изменять настройки и ярлыки на главном экране."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"Приложение <xliff:g id="APP_NAME">%1$s</xliff:g> не может делать телефонные звонки"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Не удается загрузить виджет."</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Нажмите, чтобы завершить настройку."</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Это системное приложение, его нельзя удалить."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Измените название"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Приложение <xliff:g id="APP_NAME">%1$s</xliff:g> отключено"</string>
@@ -166,7 +165,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Рабочий профиль"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"У рабочих приложений есть специальная пометка. Они видны системному администратору."</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ОК"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Рабочие приложения отключены"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Рабочие приложения приостановлены"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Рабочие приложения не могут отправлять уведомления, расходовать заряд батареи и получать доступ к данным о вашем местоположении."</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Рабочие приложения отключены. Они не могут отправлять уведомления, расходовать заряд батареи и получать доступ к вашему местоположению."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"У рабочих приложений есть специальная пометка. Они видны системному администратору."</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 946e12c319..e32f16848a 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"විජට්"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"සෙවීම"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"සෙවීම් කොටුවෙන් පෙළ හිස් කරන්න"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"ලබා ගත හැකි විජට් නැත"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"සෙවීම් ප්‍රතිඵල නැත"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"විජට් සහ කෙටි මං ලබා ගත නොහැකිය"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"විජට් හෝ කෙටි මං හමු නොවීය"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"පුද්ගලික"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"කාර්යාලය"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"සංවාද"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"දැනුම්දීම්"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"කෙටි මගක් ගෙන යාමට ස්පර්ශ කර අල්ලාගෙන සිටින්න."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"කෙටි මගක් ගෙන යාමට හෝ අභිරුචි ක්‍රියා භාවිත කිරීමට දෙවරක් තට්ටු කර අල්ලා ගෙන සිටින්න."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"මෙම මුල් පිටු තිරය මත තවත් අවසර නැත."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ප්‍රියතම දෑ ඇති තැටියේ තවත් ඉඩ නොමැත"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"යෙදුම් ලැයිස්තුව"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"පෞද්ගලික යෙදුම් ලැයිස්තුව"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"මුල් පිටු සැකසීම් සහ කෙටිමං ලියන්න"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"මුල් පිටුවේ සැකසීම් සහ කෙටිමං ඉවත් කිරීමට යෙදුමට අවසර දෙයි."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> හට දුරකථන ඇමතුම් සිදු කිරීමට ඉඩ නොදේ"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"විජට් පූරණය කළ නොහැකිය"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"පිහිටුවීම අවසන් කිරීමට තට්ටු කරන්න"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"මෙය පද්ධති යෙදුමක් වන අතර අස්ථාපනය කළ නොහැක."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"නම සංස්කරණය කරන්න"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> අබල කෙරිණි"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"කාර්යාල පැතිකඩ"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"කාර්යාල යෙදුම්වලට ලාංඡන යොදා ඇති අතර ඔබගේ IT පරිපාලකට දෘශ්‍යමාන වේ"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"තේරුණා"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"කාර්යාල යෙදුම් ක්‍රියාවිරහිතයි"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"කාර්යාල යෙදුම් විරාම කර ඇත"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"ඔබගේ කාර්යාල යෙදුම්වලට ඔබට දැනුම්දීම් එවීමට, ඔබගේ බැටරිය භාවිත කිරීමට හෝ ඔබගේ ස්ථානයට ප්‍රවේශ වීමට නොහැකිය"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"කාර්යාල යෙදුම් ක්‍රියාවිරහිතයි. ඔබගේ කාර්යාල යෙදුම්වලට ඔබට දැනුම්දීම් එවීමට, ඔබගේ බැටරිය භාවිත කිරීමට හෝ ඔබගේ ස්ථානයට ප්‍රවේශ වීමට නොහැකිය"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"කාර්යාල යෙදුම්වලට ලාංඡන යොදා ඇති අතර ඔබගේ IT පරිපාලකට දෘශ්‍යමාන වේ"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index d4f2e00ba0..eb8ad30ff2 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -50,8 +50,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Miniaplikácie"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Vyhľadajte"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Vymazať text z vyhľadávacieho poľa"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Nie sú k dispozícii žiadne miniaplikácie"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Žiadne výsledky vyhľadávania"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Miniaplikácie a odkazy nie sú k dispozícii"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Nenašli sa žiadne miniaplikácie ani odkazy"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Osobné"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Práca"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Konverzácie"</string>
@@ -68,7 +68,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Upozornenia"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Pridržaním presuňte skratku."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dvojitým klepnutím a pridržaním presuňte odkaz alebo použite vlastné akcie."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Na tejto ploche už nie je miesto"</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Na paneli Obľúbené položky už nie je miesto"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Zoznam aplikácií"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Zoznam osobných aplikácií"</string>
@@ -86,10 +87,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"zápis nastavení a odkazov plochy"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Povoľuje aplikácii zmeniť nastavenia a odkazy na ploche."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"Aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g> nemá povolenie uskutočňovať telefonické hovory"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Miniaplikáciu sa nepodarilo načítať"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Nastavenie dokončíte klepnutím"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Toto je systémová aplikácia a nedá sa odinštalovať."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Úprava názvu"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g> je deaktivovaná"</string>
@@ -166,7 +165,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Pracovný profil"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Pracovné aplikácie majú odznak a zobrazujú sa správcovi IT"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Dobre"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Pracovné aplikácie sú vypnuté"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Pracovné aplikácie sú pozastavené"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Pracovné aplikácie nemôžu posielať upozornenia ani používať batériu či polohu."</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Pracovné aplikácie sú vypnuté. Nemôžu posielať upozornenia ani používať batériu či polohu."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Pracovné aplikácie majú odznak a zobrazujú sa správcovi IT"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index d5d9f028fb..7f440f81af 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -50,8 +50,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Pripomočki"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Iskanje"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Brisanje besedila v iskalnem polju"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Ni pripomočkov"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Ni rezultatov iskanja"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Pripomočki in bližnjice niso na voljo."</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Najden ni noben pripomoček ali bližnjica."</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Osebni"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Služba"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Pogovori"</string>
@@ -68,7 +68,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Obvestila"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Pridržite bližnjico, da jo premaknete."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dvakrat se dotaknite bližnjice in jo pridržite, da jo premaknete, ali pa uporabite dejanja po meri."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Na tem začetnem zaslonu ni več prostora."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"V vrstici za priljubljene ni več prostora"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Seznam aplikacij"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Seznam osebnih aplikacij"</string>
@@ -86,10 +87,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"zapis nastavitev in bližnjic na začetnem zaslonu"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Aplikaciji dovoli spreminjanje nastavitev in bližnjic na začetnem zaslonu."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"Aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g> ni dovoljeno opravljanje klicev"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Pripomočka ni mogoče naložiti."</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Dotaknite se, da dokončate postopek nastavitve."</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"To je sistemska aplikacija in je ni mogoče odstraniti."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Urejanje imena"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> je onemogočena"</string>
@@ -166,7 +165,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Delovni profil"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Delovne aplikacije so označene z značko in vidne skrbniku za IT."</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Razumem"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Delovne aplikacije so izklopljene."</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Delovne aplikacije so začasno zaustavljene"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Delovne aplikacije ne smejo pošiljati obvestil, porabljati energije baterije ali dostopati do lokacije."</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Delovne aplikacije so izklopljene in ne smejo pošiljati obvestil, porabljati energije baterije ali dostopati do lokacije."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Delovne aplikacije so označene z značko in vidne skrbniku za IT."</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index f3a4649c28..e39e3e7893 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -46,8 +46,10 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Miniaplikacionet"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Kërko"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Pastro tekstin nga kutia e kërkimit"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Nuk ka asnjë miniaplikacion"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Asnjë rezultat kërkimi"</string>
+    <!-- no translation found for no_widgets_available (4337693382501046170) -->
+    <skip />
+    <!-- no translation found for no_search_results (3787956167293097509) -->
+    <skip />
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personale"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Puna"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Bisedat"</string>
@@ -64,7 +66,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Njoftimet"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Prek dhe mbaj shtypur një shkurtore për ta zhvendosur."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Trokit dy herë dhe mbaje shtypur një shkurtore për ta zhvendosur atë ose për të përdorur veprimet e personalizuara."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Nuk ka më hapësirë në këtë ekran bazë."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Nuk ka më hapësirë në tabakanë \"Të preferuarat\""</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista e aplikacioneve"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista e aplikacioneve personale"</string>
@@ -75,17 +78,15 @@
     <string name="install_drop_target_label" msgid="2539096853673231757">"Instalo"</string>
     <string name="dismiss_prediction_label" msgid="3357562989568808658">"Mos sugjero aplikacion"</string>
     <string name="pin_prediction" msgid="4196423321649756498">"Gozhdo parashikimin"</string>
-    <string name="permlab_install_shortcut" msgid="5632423390354674437">"instalo shkurtore"</string>
+    <string name="permlab_install_shortcut" msgid="5632423390354674437">"instalimi i shkurtoreve"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Lejon një aplikacion të shtojë shkurtore pa ndërhyrjen e përdoruesit."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"lexo cilësimet dhe shkurtoret e ekranit bazë"</string>
     <string name="permdesc_read_settings" msgid="5833423719057558387">"Lejon aplikacionin të lexojë cilësimet dhe shkurtoret në ekranin bazë."</string>
     <string name="permlab_write_settings" msgid="3574213698004620587">"shkruaj cilësimet dhe shkurtoret e ekranit bazë"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Lejon aplikacionin të ndryshojë cilësimet dhe shkurtoret në ekranin bazë."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> nuk lejohet të kryejë telefonata"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"S\'mund të ngarkohet miniaplikacioni"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Trokit për të përfunduar konfigurimin"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Ky është aplikacion sistemi dhe nuk mund të çinstalohet."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Redakto emrin"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> u çaktivizua"</string>
@@ -160,7 +161,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profili i punës"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Aplikacionet e punës janë të shënuara dhe të dukshme për administratorin e teknologjisë së informacionit"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"E kuptova"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Aplikacionet e punës janë joaktive"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Aplikacionet e punës janë në pauzë"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Aplikacionet e tua të punës nuk mund të të dërgojnë njoftime, të përdorin baterinë tënde apo të kenë qasje në vendndodhjen tënde"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Aplikacionet e punës janë joaktive. Aplikacionet e tua të punës nuk mund të të dërgojnë njoftime, të përdorin baterinë tënde apo të kenë qasje në vendndodhjen tënde"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Aplikacionet e punës janë të shënuara dhe të dukshme për administratorin e teknologjisë së informacionit"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index b47a148072..797a2a0167 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -48,8 +48,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Виџети"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Претражите"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Обришите текст из оквира за претрагу"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Није доступан ниједан виџет"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Нема резултата претраге"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Виџети и пречице нису доступни"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Није пронађен ниједан виџет или пречица"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Лично"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Посао"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Конверзације"</string>
@@ -66,7 +66,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Обавештења"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Двапут додирните и задржите ради померања пречице."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Двапут додирните и задржите да бисте померали пречицу или користите прилагођене радње."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Нема више простора на овом почетном екрану."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Нема више простора на траци Омиљено"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Листа апликација"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Листа личних апликација"</string>
@@ -84,10 +85,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"уписивање подешавања и пречица на почетном екрану"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Дозвољава апликацији да мења подешавања и пречице на почетном екрану."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> нема дозволу за упућивање телефонских позива"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Учитавање виџета није успело"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Додирните да бисте довршили подешавање"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Ово је системска апликација и не може да се деинсталира."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Измените назив"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Апликација <xliff:g id="APP_NAME">%1$s</xliff:g> је онемогућена"</string>
@@ -163,7 +162,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Пословни профил"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Пословне апликације су означене значком и ИТ администратор може да их види"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Важи"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Пословне апликације су искључене"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Пословне апликације су паузиране"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Пословне апликације не могу да вам шаљу обавештења, користе батерију нити приступају локацији"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Пословне апликације су искључене. Пословне апликације не могу да вам шаљу обавештења, користе батерију нити приступају локацији"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Пословне апликације су означене значком и ИТ администратор може да их види"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 415e7bea76..8fa1e0e287 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Widgetar"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Sök"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Rensa texten från sökrutan"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Det finns inga tillgängliga widgetar"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Inga sökresultat"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Widgetar och genvägar är inte tillgängliga"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Inga widgetar eller genvägar hittades"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Privata"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Arbete"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Konversationer"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Aviseringar"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Tryck länge för att flytta en genväg."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Tryck snabbt två gånger och håll kvar för att flytta en genväg eller använda anpassade åtgärder."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Det finns inte plats för mer på den här startskärmen."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Favoritfältet är fullt"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Applista"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Listan Personliga appar"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"skriva inställningar och genvägar för startsidan"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Tillåter att appen ändrar inställningar och genvägar på startsidan."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> har inte behörighet att ringa samtal"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Det gick inte att läsa in widgeten"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Tryck för att slutföra konfigureringen"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Det här är en systemapp som inte kan avinstalleras."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Redigera namn"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> har inaktiverats"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Jobbprofil"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Jobbappar är märkta och synliga för IT-administratören"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Jobbappar är inaktiverade"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Jobbappar har pausats"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Dina jobbappar kan inte skicka aviseringar, använda batteriet eller komma åt din plats"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Jobbappar är inaktiverade. Dina jobbappar kan inte skicka aviseringar, använda batteriet eller komma åt din plats"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Jobbappar är märkta och synliga för IT-administratören"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 7e1c724562..1e7bf0747f 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Wijeti"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Tafuta"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Futa maandishi kwenye kisanduku cha kutafutia"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Hamna wijeti zinazopatikana"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Hamna matokeo ya utafutaji"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Wijeti na njia za mkato hazipatikani"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Hakuna wijeti wala njia za mkato zilizopatikana"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Binafsi"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Kazini"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Mazungumzo"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Arifa"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Gusa na ushikilie ili usogeze njia ya mkato."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Gusa mara mbili na ushikilie ili usogeze njia ya mkato au utumie vitendo maalum."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Hakuna nafasi katika skrini hii ya Mwanzo."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Hakuna nafasi zaidi katika treya ya Vipendeleo"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Orodha ya programu"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Orodha ya programu za binafsi"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"andika mipangilio ya skrini ya Mwanzo na njia za mkato"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Huruhusu programu kubadilisha mipangilio na njia za mkato katika skrini ya Mwanzo."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> hairuhusiwi kupiga simu"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Imeshindwa kupakia wijeti"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Gusa ili umalize kuweka mipangilio"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Hii ni programu ya mfumo na haiwezi kuondolewa."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Badilisha Jina"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> imezimwa"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Wasifu wa kazini"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Programu za kazini zina beji na zinaonekana kwa msimamizi wako wa TEHAMA"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Nimeelewa"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Programu za kazini zimezimwa"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Programu za kazini zimesimamishwa"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Programu zako za kazini haziwezi kukutumia arifa, kutumia betri yako au kufikia maelezo ya mahali ulipo"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Programu za kazini zimezimwa. Programu zako za kazini haziwezi kukutumia arifa, kutumia betri yako au kufikia maelezo ya mahali ulipo"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Programu za kazini zina beji na zinaonekana kwa msimamizi wako wa TEHAMA"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 877d92d09e..b68ee1e6ee 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"விட்ஜெட்கள்"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"தேடுக"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"தேடல் பெட்டியிலுள்ள உரையை அழிக்கும்"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"விட்ஜெட்டுகள் எதுவுமில்லை"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"தேடல் முடிவுகள் இல்லை"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"விட்ஜெட்டுகளும் ஷார்ட்கட்களும் கிடைக்கவில்லை"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"விட்ஜெட்டுகள்/ஷார்ட்கட்டுகள் எதுவும் இல்லை"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"தனிப்பட்டவை"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"பணி"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"உரையாடல்கள்"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"அறிவிப்புகள்"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"ஷார்ட்கட்டை நகர்த்தத் தொட்டுப் பிடிக்கவும்."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ஷார்ட்கட்டை நகர்த்த இருமுறை தட்டிப் பிடிக்கவும் அல்லது பிரத்தியேகச் செயல்களைப் பயன்படுத்தவும்."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"முகப்புத் திரையில் இடமில்லை."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"பிடித்தவை ட்ரேயில் இடமில்லை"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ஆப்ஸின் பட்டியல்"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"தனிப்பட்ட ஆப்ஸ் பட்டியல்"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"முகப்பின் அமைப்பு மற்றும் குறுக்குவழிகளை எழுதுதல்"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"முகப்பில் உள்ள அமைப்பு மற்றும் குறுக்குவழிகளை மாற்ற ஆப்ஸை அனுமதிக்கிறது."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"ஃபோன் அழைப்புகள் செய்ய, <xliff:g id="APP_NAME">%1$s</xliff:g> அனுமதிக்கப்படவில்லை"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"விட்ஜெட்டை ஏற்ற முடியவில்லை"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"அமைவை நிறைவுசெய்யத் தட்டவும்"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"இது அமைப்பு ஆப்ஸ் என்பதால் நிறுவல் நீக்கம் செய்ய முடியாது."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"பெயரைத் திருத்துதல்"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> முடக்கப்பட்டது"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"பணிக் கணக்கு"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"பணி ஆப்ஸில் பேட்ஜ் இடப்பட்டுள்ளன. உங்கள் IT நிர்வாகியால் அவற்றைப் பார்க்க முடியும்"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"முடிந்தது"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"பணி ஆப்ஸ் முடக்கப்பட்டுள்ளன"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"பணி ஆப்ஸ் இடைநிறுத்தப்பட்டுள்ளன"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"பணி ஆப்ஸால் உங்களுக்கு அறிவிப்புகளை அனுப்பவோ பேட்டரியைப் பயன்படுத்தவோ உங்கள் இருப்பிடத்தை அணுகவோ முடியாது"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"பணி ஆப்ஸ் முடக்கப்பட்டுள்ளன. அவற்றால் உங்களுக்கு அறிவிப்புகளை அனுப்பவோ பேட்டரியைப் பயன்படுத்தவோ உங்கள் இருப்பிடத்தை அணுகவோ முடியாது"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"பணி ஆப்ஸ் பேட்ஜ் குறியிடப்பட்டுள்ளன. மேலும் உங்கள் IT நிர்வாகியால் அவற்றைப் பார்க்க முடியும்"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index e5bd96ee79..7191c6c704 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -46,8 +46,10 @@
     <string name="widget_button_text" msgid="2880537293434387943">"విడ్జెట్‌లు"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"సెర్చ్ చేయండి"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"సెర్చ్ బాక్స్ నుండి టెక్స్ట్‌ను క్లియర్ చేయి"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"విడ్జెట్‌లు అందుబాటులో లేవు"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"సెర్చ్ ఫలితాలు లేవు"</string>
+    <!-- no translation found for no_widgets_available (4337693382501046170) -->
+    <skip />
+    <!-- no translation found for no_search_results (3787956167293097509) -->
+    <skip />
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"వ్యక్తిగత గ్యాడ్జెట్స్"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ఆఫీస్"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"సంభాషణలు"</string>
@@ -64,7 +66,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"నోటిఫికేషన్‌లు"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"షార్ట్‌కట్‌ను తరలించడానికి తాకి &amp; నొక్కి ఉంచు."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"షార్ట్‌కట్‌ను తరలించడానికి లేదా అనుకూల చర్యలను ఉపయోగించడానికి రెండుసార్లు నొక్కండి &amp; హోల్డ్ చేయండి."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"ఈ హోమ్ స్క్రీన్‌లో ఖాళీ లేదు."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ఇష్టమైనవి ట్రేలో ఖాళీ లేదు"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"అనువర్తనాల జాబితా"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"వ్యక్తిగత యాప్‌ల జాబితా"</string>
@@ -82,10 +85,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"హోమ్ సెట్టింగ్‌లు మరియు సత్వరమార్గాలను వ్రాయడం"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"హోమ్‌లో సెట్టింగ్‌లు మరియు సత్వరమార్గాలను మార్చడానికి యాప్‌ను అనుమతిస్తుంది."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"ఫోన్ కాల్‌లను చేసేందుకు <xliff:g id="APP_NAME">%1$s</xliff:g>కి అనుమతి లేదు"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"విడ్జెట్‌ను లోడ్ చేయడం సాధ్యం కాలేదు"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"సెటప్‌ను పూర్తి చేయడానికి ట్యాప్ చేయండి"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"ఇది సిస్టమ్ యాప్ మరియు దీన్ని అన్‌ఇన్‌స్టాల్ చేయడం సాధ్యపడదు."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"పేరును ఎడిట్ చేయండి"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> నిలిపివేయబడింది"</string>
@@ -158,10 +159,9 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"వ్యక్తిగతం"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"కార్యాలయం"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"కార్యాలయ ప్రొఫైల్"</string>
-    <!-- no translation found for work_profile_edu_work_apps (7895468576497746520) -->
-    <skip />
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"వర్క్ యాప్‌లు బ్యాడ్జ్ చేయబడ్డాయి, మీ IT అడ్మిన్‌కు కనిపిస్తాయి"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"అర్థమైంది"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"వర్క్ యాప్‌లు ఆఫ్‌లో ఉన్నాయి"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"వర్క్ యాప్‌లు పాజ్ చేయబడ్డాయి"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"మీకు నోటిఫికేషన్‌లు పంపడం, మీ బ్యాటరీని ఉపయోగించడం, లేదా మీ లొకేషన్‌ను యాక్సెస్ చేయడం మీ వర్క్ యాప్‌లకు సాధ్యపడదు"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"వర్క్ యాప్‌లు ఆఫ్‌లో ఉన్నాయి. మీకు నోటిఫికేషన్‌లు పంపడం, మీ బ్యాటరీని ఉపయోగించడం, లేదా మీ లొకేషన్‌ను యాక్సెస్ చేయడం మీ వర్క్ యాప్‌లకు సాధ్యపడదు"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"వర్క్ యాప్‌లు బ్యాడ్జ్ చేయబడ్డాయి, మీ IT అడ్మిన్‌కి కనిపిస్తాయి"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 795bc7d929..f42766cb68 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"วิดเจ็ต"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"ค้นหา"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"ล้างข้อความออกจากช่องค้นหา"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"ไม่มีวิดเจ็ตพร้อมใช้งาน"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"ไม่พบผลการค้นหา"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"วิดเจ็ตและทางลัดไม่พร้อมให้บริการ"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"ไม่พบวิดเจ็ตหรือทางลัด"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ส่วนตัว"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"งาน"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"การสนทนา"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"การแจ้งเตือน"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"แตะค้างไว้เพื่อย้ายทางลัด"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"แตะสองครั้งค้างไว้เพื่อย้ายทางลัดหรือใช้การดำเนินการที่กำหนดเอง"</string>
-    <string name="out_of_space" msgid="4691004494942118364">"ไม่มีที่ว่างในหน้าจอหลักนี้"</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ไม่มีพื้นที่เหลือในถาดรายการโปรด"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"รายชื่อแอป"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"รายการแอปส่วนตัว"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"เขียนการตั้งค่าและทางลัดหน้าแรกแล้ว"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"อนุญาตให้แอปเปลี่ยนการตั้งค่าและทางลัดในหน้าแรก"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> ไม่ได้รับอนุญาตให้โทรออก"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"โหลดวิดเจ็ตไม่ได้"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"แตะเพื่อสิ้นสุดการตั้งค่า"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"นี่เป็นแอประบบและไม่สามารถถอนการติดตั้งได้"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"แก้ไขชื่อ"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"ปิดใช้ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"โปรไฟล์งาน"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"แอปงานจะติดป้ายไว้และผู้ดูแลระบบไอทีจะมองเห็น"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"รับทราบ"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"แอปงานปิดอยู่"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"หยุดแอปงานไว้ชั่วคราว"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"แอปงานจะส่งการแจ้งเตือน ใช้แบตเตอรี่ หรือเข้าถึงตำแหน่งของคุณไม่ได้"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"แอปงานปิดอยู่ แอปงานจะส่งการแจ้งเตือน ใช้แบตเตอรี่ หรือเข้าถึงตำแหน่งของคุณไม่ได้"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"แอปงานจะติดป้ายไว้และผู้ดูแลระบบไอทีจะมองเห็น"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 558b96bc06..99b554c496 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Mga Widget"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Maghanap"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"I-clear ang text sa box para sa paghahanap"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Walang available na widget"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Walang resulta ng paghahanap"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Hindi available ang mga widget at shortcut"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Walang nakitang widget o shortcut"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personal"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Trabaho"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Mga Pag-uusap"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Mga Notification"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Pindutin nang matagal para ilipat ang shortcut."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"I-double tap at pindutin nang matagal para ilipat ang shortcut o gumamit ng mga custom na pagkilos."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Wala nang lugar sa Home screen na ito."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Wala nang lugar sa tray ng Mga Paborito"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Listahan ng mga app"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Listahan ng mga personal na app"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"magsulat ng mga setting at shortcut ng Home"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Pinapayagan ang app na baguhin ang mga setting at shortcut sa Home."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"Hindi pinahihintulutang tumawag ang <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Hindi ma-load ang widget"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"I-tap para tapusin ang pag-set up"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Isa itong app ng system at hindi maaaring i-uninstall."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"I-edit ang Pangalan"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Naka-disable ang <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profile sa trabaho"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"May badge at nakikita ng iyong IT admin ang mga app para sa trabaho"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Naka-off ang mga app para sa trabaho"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Naka-pause ang mga app para sa trabaho"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Ang mga app mo para sa trabaho ay hindi makakapagpadala sa iyo ng mga notification, makakagamit ng baterya mo, o makaka-access ng iyong lokasyon"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Naka-off ang mga app para sa trabaho. Ang mga app mo para sa trabaho ay hindi makakapagpadala sa iyo ng mga notification, makakagamit ng baterya mo, o makaka-access ng iyong lokasyon"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"May badge at nakikita ng iyong IT admin ang mga app para sa trabaho"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index c5980a9c87..a81a9cbc0a 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Widget\'lar"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Ara"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Arama kutusundaki metni temizle"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Kullanılabilir widget yok"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Arama sonucu yok"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Widget\'lar ve kısayollar kullanılamıyor"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Widget veya kısayol bulunamadı"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Kişisel"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"İş"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Görüşmeler"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Bildirimler"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Kısayolu taşımak için dokunup basılı tutun."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Kısayolu taşımak veya özel işlemleri kullanmak için iki kez dokunup basılı tutun."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Bu Ana ekranda yer kalmadı."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Favoriler tepsisinde başka yer kalmadı"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Uygulamalar listesi"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Kişisel uygulamalar listesi"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"Ana ekran ayarlarını ve kısayollarını yaz"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Uygulamaya, Ana ekrandaki ayarları ve kısayolları değiştirme izni verir."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> uygulamasının telefon etmesine izin verilmiyor"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Widget yüklenemiyor"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Kurulumu tamamlamak için dokunun"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Bu bir sistem uygulamasıdır ve yüklemesi kaldırılamaz."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Adı Düzenle"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> devre dışı"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"İş profili"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"İş uygulamaları rozetle işaretlenmiş olup BT yöneticisi tarafından görülebilir"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Anladım"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"İş uygulamaları kapalı"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"İş uygulamaları duraklatıldı"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"İş uygulamaları size bildirim gönderemez, pilinizi kullanamaz veya konum bilginize erişemez"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"İş uygulamaları kapalı. İş uygulamalarınız size bildirim gönderemez, pilinizi kullanamaz veya konum bilginize erişemez"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"İş uygulamaları rozetle işaretlenmiş olup BT yöneticisi tarafından görülebilir"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index d7612dfc3c..b60b50fb9f 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -50,8 +50,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Віджети"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Пошук"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Очистити текст у полі пошуку"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Немає доступних віджетів"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Нічого не знайдено"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Віджети та ярлики недоступні"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Не знайдено віджетів чи ярликів"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Особисті"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Робочі"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Розмови"</string>
@@ -68,7 +68,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Сповіщення"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Натисніть і втримуйте, щоб перемістити ярлик."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Двічі натисніть і втримуйте ярлик, щоб перемістити його або виконати інші дії."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"На цьому головному екрані більше немає місця."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"В області \"Вибране\" немає місця"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Список додатків"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Список особистих додатків"</string>
@@ -164,7 +165,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Робочий профіль"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Робочі додатки відповідно позначені й видимі системному адміністратору"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Робочі додатки вимкнено"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Робочі додатки призупинено"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Ваші робочі додатки не можуть надсилати сповіщення, використовувати заряд акумулятора й отримувати доступ до геоданих"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Робочі додатки вимкнено. Вони не можуть надсилати сповіщення, використовувати заряд акумулятора й отримувати доступ до геоданих."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Робочі додатки відповідно позначені й видимі системному адміністратору"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index aba11d318a..7fe31a6663 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -46,8 +46,10 @@
     <string name="widget_button_text" msgid="2880537293434387943">"ویجیٹس"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"تلاش کریں"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"تلاش کے خانے سے ٹیکسٹ صاف کریں"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"کوئی ویجیٹ دستیاب نہیں ہے"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"تلاش کا کوئی نتیجہ نہیں ہے"</string>
+    <!-- no translation found for no_widgets_available (4337693382501046170) -->
+    <skip />
+    <!-- no translation found for no_search_results (3787956167293097509) -->
+    <skip />
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ذاتی"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"دفتری ویجیٹس"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"گفتگوئیں"</string>
@@ -64,7 +66,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"اطلاعات"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"شارٹ کٹ منتقل کرنے کیلیے ٹچ کریں اور پکڑ کر رکھیں۔"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"شارٹ کٹ کو منتقل کرنے یا حسب ضرورت کارروائیاں استعمال کرنے کے لیے دوبار تھپتھپائیں اور پکڑ کر رکھیں۔"</string>
-    <string name="out_of_space" msgid="4691004494942118364">"اس ہوم اسکرین پر مزید کوئی گنجائش نہیں ہے۔"</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"پسندیدہ ٹرے میں مزید کوئی گنجائش نہیں ہے"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ایپس کی فہرست"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"ذاتی ایپس کی فہرست"</string>
@@ -82,10 +85,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"ہوم ترتیبات اور شارٹ کٹس کو لکھیں"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"ایپ کو ہوم میں ترتیبات اور شارٹ کٹس کو تبدیل کرنے کی اجازت دیتا ہے۔"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> کو فون کالیں کرنے کی اجازت نہیں ہے"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"ویجیٹ لوڈ نہیں کیا جا سکتا"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"سیٹ اپ مکمل کرنے کے لیے تھپتھپائیں"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"یہ ایک سسٹم ایپ ہے اور اسے اَن انسٹال نہیں کیا جا سکتا ہے۔"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"نام میں ترمیم کریں"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> غیر فعال ہے"</string>
@@ -160,7 +161,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"دفتری پروفائل"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"‏ورک ایپس پر بَیج لگایا گیا ہے اور آپ کا IT منتظم اسے دیکھ سکتا ہے"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"سمجھ آ گئی"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"ورک ایپس آف ہیں"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"ورک ایپس موقوف ہیں"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"آپ کی ورک ایپس آپ کو اطلاعات نہیں بھیج سکتیں، آپ کی بیٹری کا استعمال یا آپ کے مقام تک رسائی حاصل نہیں کر سکتی ہیں"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"ورک ایپس آف ہیں۔ آپ کی ورک ایپس آپ کو اطلاعات نہیں بھیج سکتیں، آپ کی بیٹری استعمال یا آپ کے مقام تک رسائی حاصل نہیں کر سکتی ہیں"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"‏ورک ایپس پر بَیج لگایا ہے اور آپ کا IT منتظم انہیں دیکھ سکتا ہے"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 022e7487a0..635c83d243 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Vidjetlar"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Qidiruv"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Qidiruv maydoni matnini tozalash"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Hech qanday vidjet mavjud emas"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Hech narsa topilmadi"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Vidjet va yorliqlar mavjud emas"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Hech qanday vidjet yoki yorliq topilmadi"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Shaxsiy"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Ish"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Suhbatlar"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Bildirishnomalar"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Yorliqni bosib turgan holatda suring."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Ikki marta bosing va yorliqni bosib turgan holatda suring yoki maxsus amaldan foydalaning."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Bosh ekranda joy qolmadi."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Ajratilganlarda birorta ham xona yo‘q"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Ilovalar ro‘yxati"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Shaxsiy ilovalar ro‘yxati"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"Uy sozlamalari va yorliqlarini yozish"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Ilovaga \"Uy\" ekranidagi yorliqlar va sozlamalrni o‘zgartirish uchun ruxsat beradi."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> ilovasiga qo‘ng‘iroqlarni amalga oshirishga ruxsat berilmagan"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Vidjet yuklanmadi"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Sozlashni yakunlash uchun bosing"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Bu tizim ilovasi, shuning uchun o‘chirib bo‘lmaydi."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Nomini tahrirlash"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> ilovasi o‘chirib qo‘yildi"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Ish profili"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Ishga oid ilovalar qadalgan va IT administratoringizga koʻrinadi"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Ishga oid ilovalar faolsizlantirilgan"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Ishga oid ilovalar pauza qilingan"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Ishga oid ilovalar batareya sarfi haqida bildirishnomalar yubora olmaydi va joylashuv axborotidan foydalana olmaydi"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Ishga oid ilovalar faolsizlantirilgan. Ular batareya sarfi haqida bildirishnomalar yubora olmaydi va joylashuv axborotidan foydalana olmaydi"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Ishga oid ilovalar qadalgan va IT administratoringizga koʻrinadi"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index c3e2363b5c..c3e6ffd5e4 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Tiện ích"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Tìm kiếm"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Xóa văn bản khỏi hộp tìm kiếm"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Không có tiện ích nào"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Không có kết quả tìm kiếm nào"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Không có tiện ích và lối tắt nào"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Không tìm thấy tiện ích hoặc lối tắt nào"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Cá nhân"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Công việc"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Cuộc trò chuyện"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Thông báo"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Chạm và giữ để di chuyển một lối tắt."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Nhấn đúp và giữ để di chuyển một lối tắt hoặc sử dụng các thao tác tùy chỉnh."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Không còn chỗ trên Màn hình chính này."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Không còn chỗ trong khay Mục yêu thích"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Danh sách ứng dụng"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Danh sách ứng dụng cá nhân"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"ghi cài đặt và lối tắt trên Màn hình chính"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Cho phép ứng dụng thay đổi cài đặt và lối tắt trên Màn hình chính."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> không được phép thực hiện cuộc gọi điện thoại"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Không thể tải tiện ích"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Nhấn để hoàn tất quá trình thiết lập"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Đây là ứng dụng hệ thống và không thể gỡ cài đặt."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Chỉnh sửa tên"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Đã vô hiệu hóa <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Hồ sơ công việc"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Các ứng dụng công việc được gắn huy hiệu và quản trị viên CNTT sẽ nhìn thấy các ứng dụng này"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Ứng dụng công việc đang tắt"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Đã tạm dừng ứng dụng công việc"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Các ứng dụng công việc không thể gửi thông báo cho bạn, sử dụng pin hoặc truy cập thông tin vị trí của bạn"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Ứng dụng công việc đang tắt. Các ứng dụng công việc không thể gửi thông báo cho bạn, sử dụng pin hoặc truy cập thông tin vị trí của bạn"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Các ứng dụng công việc được gắn huy hiệu và quản trị viên CNTT sẽ nhìn thấy các ứng dụng này"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b5f8e335b3..ac1955721b 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"微件"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"搜索"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"清除搜索框中的文字"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"没有可用的微件"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"无搜索结果"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"无法使用微件和快捷方式"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"未找到任何微件或快捷方式"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"个人"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"工作"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"对话"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"通知"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"轻触并按住快捷方式即可移动该快捷方式。"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"点按两次并按住快捷方式即可移动该快捷方式或使用自定义操作。"</string>
-    <string name="out_of_space" msgid="4691004494942118364">"此主屏幕上已没有空间。"</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"收藏栏已满"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"应用列表"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"个人应用列表"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"写入主屏幕设置和快捷方式"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"允许应用更改主屏幕中的设置和快捷方式。"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"不允许使用“<xliff:g id="APP_NAME">%1$s</xliff:g>”拨打电话"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"无法加载微件"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"点按即可完成设置"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"这是系统应用，无法卸载。"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"修改名称"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"已停用<xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"工作资料"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"工作应用带有标志，您的 IT 管理员可以看到此类应用"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"知道了"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"工作应用已关闭"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"工作应用已暂停"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"工作应用无法向您发送通知、不能耗用电池电量，也无法获取您的位置信息"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"工作应用已关闭。工作应用无法向您发送通知、不能耗用电池电量，也无法获取您的位置信息"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"工作应用带有标志，您的 IT 管理员可以看到工作应用"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 0379e5b57b..b4287bb795 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"小工具"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"搜尋"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"清除搜尋框中的文字"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"沒有可用的小工具"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"沒有相符的搜尋結果"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"無法使用小工具和捷徑"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"找不到小工具或捷徑"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"個人"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"工作"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"對話"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"通知"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"輕觸並按住即可移動捷徑。"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"㩒兩下之後㩒住，就可以郁捷徑或者用自訂操作。"</string>
-    <string name="out_of_space" msgid="4691004494942118364">"主畫面已無空間。"</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"我的收藏寄存區沒有足夠空間"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"應用程式清單"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"個人應用程式清單"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"寫入主畫面的設定和捷徑"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"允許應用程式更改主畫面中的設定和捷徑。"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"不允許 <xliff:g id="APP_NAME">%1$s</xliff:g> 撥打電話"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"無法載入小工具"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"輕按即可完成設定"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"這是系統應用程式，無法將其解除安裝。"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"編輯名稱"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」已停用"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"工作設定檔"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"工作應用程式會加上標誌，且你的 IT 管理員可以看到這類應用程式"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"知道了"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"工作應用程式已關閉"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"已暫停工作應用程式"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"工作應用程式無法向您傳送通知、使用電池或存取位置"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"工作應用程式已關閉。工作應用程式無法向您傳送通知、使用電池或存取位置"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"IT 管理員可看到工作應用程式和相關標誌"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 0f6ccd8a91..248a20c272 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"小工具"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"搜尋"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"清除搜尋框中的文字"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"沒有可用的小工具"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"找不到相符的搜尋結果"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"無法使用小工具和捷徑"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"找不到小工具或捷徑"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"個人"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"工作"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"對話"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"通知"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"按住即可移動捷徑。"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"輕觸兩下並按住即可移動捷徑或使用自訂操作。"</string>
-    <string name="out_of_space" msgid="4691004494942118364">"這個主畫面已無空間。"</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"「我的最愛」匣已無可用空間"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"應用程式清單"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"個人應用程式清單"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"寫入主畫面設定和捷徑"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"允許應用程式變更主畫面中的設定和捷徑。"</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> 無法撥打電話"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"無法載入小工具"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"輕觸即可完成設定"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"這是系統應用程式，不可解除安裝。"</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"編輯名稱"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"已停用 <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"工作資料夾"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"工作應用程式會加上標記，而且你的 IT 管理員可以看到這類應用程式"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"我知道了"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"工作應用程式已關閉"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"系統已暫停工作應用程式"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"工作應用程式不會消耗電量、無法傳送通知，也無法存取你的位置資訊"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"工作應用程式已關閉。工作應用程式不會消耗電量、無法傳送通知，也無法存取你的位置資訊"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"你的 IT 管理員可以看見工作應用程式和相關標記"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 5bf5104117..eccd5564ad 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -46,8 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Amawijethi"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Sesha"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Sula umbhalo ovela ebhokisini lokusesha"</string>
-    <string name="no_widgets_available" msgid="9140948620298620513">"Awekho amawijethi atholakalayo"</string>
-    <string name="no_search_results" msgid="6518732304311458580">"Ayikho imiphumela yosesho"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Amawijethi nezinqamuleli akutholakali"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Awekho amajiwethi noma izinqamuleli ezitholakele"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Okwabantu siqu"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Umsebenzi"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Izingxoxo"</string>
@@ -64,7 +64,8 @@
     <string name="notifications_header" msgid="1404149926117359025">"Izaziso"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Thinta uphinde ubambe ukuze uhambise isinqamuleli."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Thepha kabili uphinde ubambe ukuze uhambise isinqamuleli noma usebenzise izenzo ezingokwezifiso."</string>
-    <string name="out_of_space" msgid="4691004494942118364">"Asisekho isikhala kulesi sikrini Sasekhaya."</string>
+    <!-- no translation found for out_of_space (6692471482459245734) -->
+    <skip />
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Asisekho isikhala kwitreyi lezintandokazi"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Uhlu lwezinhlelo zokusebenza"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Uhlu lwezinhlelo zokusebenza zomuntu siqu"</string>
@@ -82,10 +83,8 @@
     <string name="permlab_write_settings" msgid="3574213698004620587">"bhala izilungiselelo zokuthi Ikhaya nezinqamuleli"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Ivumela uhlelo lokusebenza ukuthi lushintshe izilungiselelo nezinqamuleli Ekhaya."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> ayivunyelwe ukwenza amakholi wefoni"</string>
-    <!-- no translation found for gadget_error_text (740356548025791839) -->
-    <skip />
-    <!-- no translation found for gadget_setup_text (1745356155479272374) -->
-    <skip />
+    <string name="gadget_error_text" msgid="740356548025791839">"Ayikwazi ukulayisha iwijethi"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Thepha ukuze uqede ukusetha"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Lolu uhlelo lokusebenza lwesistimu futhi alikwazi ukukhishwa."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Hlela igama"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"Kukhutshaziwe <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Iphrofayela yomsebenzi"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Ama-app omsebenzi anebheji futhi ayabonakala kumphathi wakho we-IT"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Ngiyezwa"</string>
-    <string name="work_apps_paused_title" msgid="3007471013401118920">"Ama-app omsebenzi avaliwe"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Izinhlelo zokusebenza zomsebenzi ziphunyuziwe"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Ama-app akho omsebenzi awakwazi ukukuthumela izaziso, ukusebenzisa ibhethri lakho, noma ukufinyelela indawo yakho"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Ama-app omsebenzi avaliwe. Ama-app akho omsebenzi awakwazi ukukuthumela izaziso, ukusebenzisa ibhethri lakho, noma ukufinyelela indawo yakho"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Ama-app omsebenzi anebheji futhi ayabonakala kumphathi wakho we-IT"</string>
-- 
GitLab


From 3ff0ee1a95e1e60bbf3679901d4fcf3202ac3834 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Thu, 24 Jun 2021 21:12:07 +0100
Subject: [PATCH 1495/1664] Fix rounded corners for shortcut & generated
 preview shadow box

Test: Open the widgets picker and locate shortcuts. Rounded corners are
      rendered on the rectangular box of a shortcut
Fix: 191948061
Change-Id: I24e4dc4c4a9c9c7e875444db5294f6c33f50db85
---
 .../launcher3/widget/DatabaseWidgetPreviewLoader.java      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/widget/DatabaseWidgetPreviewLoader.java b/src/com/android/launcher3/widget/DatabaseWidgetPreviewLoader.java
index 6de3e11ac8..867c770278 100644
--- a/src/com/android/launcher3/widget/DatabaseWidgetPreviewLoader.java
+++ b/src/com/android/launcher3/widget/DatabaseWidgetPreviewLoader.java
@@ -98,12 +98,17 @@ public class DatabaseWidgetPreviewLoader implements WidgetPreviewLoader {
     private final IconCache mIconCache;
     private final UserCache mUserCache;
     private final CacheDb mDb;
+    private final float mPreviewBoxCornerRadius;
 
     public DatabaseWidgetPreviewLoader(Context context, IconCache iconCache) {
         mContext = context;
         mIconCache = iconCache;
         mUserCache = UserCache.INSTANCE.get(context);
         mDb = new CacheDb(context);
+        float previewCornerRadius = RoundedCornerEnforcement.computeEnforcedRadius(context);
+        mPreviewBoxCornerRadius = previewCornerRadius > 0
+                ? previewCornerRadius
+                : mContext.getResources().getDimension(R.dimen.widget_preview_corner_radius);
     }
 
     /**
@@ -521,7 +526,7 @@ public class DatabaseWidgetPreviewLoader implements WidgetPreviewLoader {
 
         ShadowGenerator.Builder builder = new ShadowGenerator.Builder(Color.WHITE);
         builder.shadowBlur = res.getDimension(R.dimen.widget_preview_shadow_blur);
-        builder.radius = res.getDimension(R.dimen.widget_preview_corner_radius);
+        builder.radius = mPreviewBoxCornerRadius;
         builder.keyShadowDistance = res.getDimension(R.dimen.widget_preview_key_shadow_distance);
 
         builder.bounds.set(builder.shadowBlur, builder.shadowBlur,
-- 
GitLab


From f0c2158a5f3e9342fa33b742e2fa7a73a8669acf Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Wed, 23 Jun 2021 12:38:52 -0700
Subject: [PATCH 1496/1664] Update gesture navigation intent tutorial steps
 handling

Updated gesture navigation to use either a comma-separated string or a string array for defining tutorial steps.

Fixes: 184002732
Test: manual
Change-Id: Ib2f8f78ccd57100d978db799b785fd9dffe9fb7f
---
 .../interaction/GestureSandboxActivity.java   | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java b/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java
index cf523d054d..bc4913376c 100644
--- a/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java
+++ b/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java
@@ -18,6 +18,7 @@ package com.android.quickstep.interaction;
 import android.graphics.Color;
 import android.graphics.Rect;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.view.Display;
 import android.view.View;
@@ -122,9 +123,9 @@ public class GestureSandboxActivity extends FragmentActivity {
         mCurrentTutorialStep = mTutorialSteps[mCurrentStep];
         mFragment = TutorialFragment.newInstance(mCurrentTutorialStep);
         getSupportFragmentManager().beginTransaction()
-            .replace(R.id.gesture_tutorial_fragment_container, mFragment)
-            .runOnCommit(() -> mFragment.onAttachedToWindow())
-            .commit();
+                .replace(R.id.gesture_tutorial_fragment_container, mFragment)
+                .runOnCommit(() -> mFragment.onAttachedToWindow())
+                .commit();
         mCurrentStep++;
     }
 
@@ -141,21 +142,33 @@ public class GestureSandboxActivity extends FragmentActivity {
 
     private TutorialType[] getTutorialSteps(Bundle extras) {
         TutorialType[] defaultSteps = new TutorialType[] {TutorialType.LEFT_EDGE_BACK_NAVIGATION};
+        mCurrentStep = 1;
+        mNumSteps = 1;
 
         if (extras == null || !extras.containsKey(KEY_TUTORIAL_STEPS)) {
             return defaultSteps;
         }
 
-        String[] tutorialStepNames = extras.getStringArray(KEY_TUTORIAL_STEPS);
+        Object savedSteps = extras.get(KEY_TUTORIAL_STEPS);
         int currentStep = extras.getInt(KEY_CURRENT_STEP, -1);
+        String[] savedStepsNames;
+
+        if (savedSteps instanceof String) {
+            savedStepsNames = TextUtils.isEmpty((String) savedSteps)
+                    ? null : ((String) savedSteps).split(",");
+        } else if (savedSteps instanceof String[]) {
+            savedStepsNames = (String[]) savedSteps;
+        } else {
+            return defaultSteps;
+        }
 
-        if (tutorialStepNames == null) {
+        if (savedStepsNames == null) {
             return defaultSteps;
         }
 
-        TutorialType[] tutorialSteps = new TutorialType[tutorialStepNames.length];
-        for (int i = 0; i < tutorialStepNames.length; i++) {
-            tutorialSteps[i] = TutorialType.valueOf(tutorialStepNames[i]);
+        TutorialType[] tutorialSteps = new TutorialType[savedStepsNames.length];
+        for (int i = 0; i < savedStepsNames.length; i++) {
+            tutorialSteps[i] = TutorialType.valueOf(savedStepsNames[i]);
         }
 
         mCurrentStep = Math.max(currentStep, 1);
-- 
GitLab


From b4538d1ef46a6b6d02bf1165ae5ee35a022daff2 Mon Sep 17 00:00:00 2001
From: Hilary Huo <hhuo@google.com>
Date: Wed, 23 Jun 2021 15:32:50 -0700
Subject: [PATCH 1497/1664] [settings-pixel-search] Flag guard slice logging.

Test: m
Bug: 191297465
Change-Id: I3f5f1ef5ad295e5d8ccedac00f290080653df5a3
---
 src/com/android/launcher3/config/FeatureFlags.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 66f5c87337..aab6cb232b 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -102,6 +102,10 @@ public final class FeatureFlags {
     public static final BooleanFlag ENABLE_DEVICE_SEARCH = new DeviceFlag(
             "ENABLE_DEVICE_SEARCH", true, "Allows on device search in all apps");
 
+    public static final BooleanFlag ENABLE_DEVICE_SEARCH_PERFORMANCE_LOGGING = new DeviceFlag(
+            "ENABLE_DEVICE_SEARCH_PERFORMANCE_LOGGING", true,
+            "Allows on device search in all apps logging");
+
     public static final BooleanFlag IME_STICKY_SNACKBAR_EDU = getDebugFlag(
             "IME_STICKY_SNACKBAR_EDU", true, "Show sticky IME edu in AllApps");
 
-- 
GitLab


From 011f438c9714eb1e203e9a63028722f567d573b5 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Fri, 25 Jun 2021 01:18:34 -0700
Subject: [PATCH 1498/1664] When KEYCODE_BACK is received, hide keyboard

Bug: 191845409
Bug: 190351740

Test: manual
Change-Id: I9e3a55f7eb81b2c2a668532ebb991cefbf248163
---
 src/com/android/launcher3/ExtendedEditText.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/android/launcher3/ExtendedEditText.java b/src/com/android/launcher3/ExtendedEditText.java
index e8510b7600..a4e1af6fb3 100644
--- a/src/com/android/launcher3/ExtendedEditText.java
+++ b/src/com/android/launcher3/ExtendedEditText.java
@@ -70,6 +70,9 @@ public class ExtendedEditText extends EditText {
     public boolean onKeyPreIme(int keyCode, KeyEvent event) {
         // If this is a back key, propagate the key back to the listener
         if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_UP) {
+            if (TextUtils.isEmpty(getText())) {
+                hideKeyboard();
+            }
             if (mBackKeyListener != null) {
                 return mBackKeyListener.onBackKey();
             }
-- 
GitLab


From c0ac1dda741e33011083109135cd6f0e5b54b9fb Mon Sep 17 00:00:00 2001
From: Yogisha Dixit <ydixit@google.com>
Date: Sat, 29 May 2021 00:26:25 +0100
Subject: [PATCH 1499/1664] Update widget manipulation colors.

Spec:
* Resize frame: https://docs.google.com/presentation/d/1UxdDh8EFhPbdRWRwzjbpgL-j02ew4Ew3eG3XBCeoYdo/edit#slide=id.OeO4S0j
* Drop target bar: https://docs.google.com/presentation/d/1UxdDh8EFhPbdRWRwzjbpgL-j02ew4Ew3eG3XBCeoYdo/edit#slide=id.vXfwHn8

Test: manual
Bug: 187910396
Change-Id: I6fd433796970c428841ee96e45ee4fca1ded3665
Merged-In: I6fd433796970c428841ee96e45ee4fca1ded3665
---
 res/color/drop_target_text.xml                | 19 ++++++++++++
 res/drawable/drop_target_frame.xml            |  2 +-
 res/drawable/drop_target_frame_hover.xml      |  2 +-
 res/drawable/widget_resize_frame.xml          |  2 +-
 res/layout/app_widget_resize_frame.xml        |  8 ++---
 res/values-v31/colors.xml                     |  3 ++
 res/values/attrs.xml                          |  3 +-
 res/values/colors.xml                         |  3 ++
 res/values/styles.xml                         |  7 +++--
 .../android/launcher3/ButtonDropTarget.java   | 29 +------------------
 src/com/android/launcher3/CellLayout.java     |  2 +-
 11 files changed, 41 insertions(+), 39 deletions(-)
 create mode 100644 res/color/drop_target_text.xml

diff --git a/res/color/drop_target_text.xml b/res/color/drop_target_text.xml
new file mode 100644
index 0000000000..18d78e7b50
--- /dev/null
+++ b/res/color/drop_target_text.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?workspaceAccentColor" android:state_selected="false" />
+    <item android:color="?dropTargetHoverTextColor" android:state_selected="true" />
+</selector>
\ No newline at end of file
diff --git a/res/drawable/drop_target_frame.xml b/res/drawable/drop_target_frame.xml
index fa6dafd4fc..666a96e940 100644
--- a/res/drawable/drop_target_frame.xml
+++ b/res/drawable/drop_target_frame.xml
@@ -18,5 +18,5 @@
     android:shape="rectangle">
     <solid android:color="@android:color/transparent" />
     <corners android:radius="28dp" />
-    <stroke android:width="2dp" android:color="?android:attr/colorAccent" />
+    <stroke android:width="2dp" android:color="?attr/workspaceAccentColor" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/drop_target_frame_hover.xml b/res/drawable/drop_target_frame_hover.xml
index 7d0e919331..ddf3a4d799 100644
--- a/res/drawable/drop_target_frame_hover.xml
+++ b/res/drawable/drop_target_frame_hover.xml
@@ -16,6 +16,6 @@
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="?android:attr/colorAccent" />
+    <solid android:color="?attr/workspaceAccentColor" />
     <corners android:radius="28dp" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/widget_resize_frame.xml b/res/drawable/widget_resize_frame.xml
index d157f5da40..9426de4788 100644
--- a/res/drawable/widget_resize_frame.xml
+++ b/res/drawable/widget_resize_frame.xml
@@ -18,5 +18,5 @@
     android:shape="rectangle">
     <solid android:color="@android:color/transparent" />
     <corners android:radius="@android:dimen/system_app_widget_background_radius" />
-    <stroke android:width="2dp" android:color="?android:attr/colorAccent" />
+    <stroke android:width="2dp" android:color="?attr/workspaceAccentColor" />
 </shape>
\ No newline at end of file
diff --git a/res/layout/app_widget_resize_frame.xml b/res/layout/app_widget_resize_frame.xml
index 249e42ce86..ff07a91566 100644
--- a/res/layout/app_widget_resize_frame.xml
+++ b/res/layout/app_widget_resize_frame.xml
@@ -41,7 +41,7 @@
             android:layout_gravity="left|center_vertical"
             android:layout_marginLeft="@dimen/widget_handle_margin"
             android:src="@drawable/ic_widget_resize_handle"
-            android:tint="?android:attr/colorAccent" />
+            android:tint="?attr/workspaceAccentColor" />
 
         <!-- Top -->
         <ImageView
@@ -51,7 +51,7 @@
             android:layout_gravity="top|center_horizontal"
             android:layout_marginTop="@dimen/widget_handle_margin"
             android:src="@drawable/ic_widget_resize_handle"
-            android:tint="?android:attr/colorAccent" />
+            android:tint="?attr/workspaceAccentColor" />
 
         <!-- Right -->
         <ImageView
@@ -61,7 +61,7 @@
             android:layout_gravity="right|center_vertical"
             android:layout_marginRight="@dimen/widget_handle_margin"
             android:src="@drawable/ic_widget_resize_handle"
-            android:tint="?android:attr/colorAccent" />
+            android:tint="?attr/workspaceAccentColor" />
 
         <!-- Bottom -->
         <ImageView
@@ -71,7 +71,7 @@
             android:layout_gravity="bottom|center_horizontal"
             android:layout_marginBottom="@dimen/widget_handle_margin"
             android:src="@drawable/ic_widget_resize_handle"
-            android:tint="?android:attr/colorAccent" />
+            android:tint="?attr/workspaceAccentColor" />
 
         <ImageButton
             android:id="@+id/widget_reconfigure_button"
diff --git a/res/values-v31/colors.xml b/res/values-v31/colors.xml
index 1785623581..c0f2996cf1 100644
--- a/res/values-v31/colors.xml
+++ b/res/values-v31/colors.xml
@@ -43,4 +43,7 @@
     <color name="folder_background_dark" android:lstar="30">@android:color/system_neutral2_800</color>
   
     <color name="folder_dot_color">@android:color/system_accent2_50</color>
+
+    <color name="workspace_accent_color_light">@android:color/system_accent2_700</color>
+    <color name="workspace_accent_color_dark">@android:color/system_accent1_50</color>
 </resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 1fadc881c2..ed1db30155 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -46,7 +46,8 @@
     <attr name="folderHintColor" format="color" />
     <attr name="isFolderDarkText" format="boolean" />
     <attr name="workProfileOverlayTextColor" format="color" />
-    <attr name="gridColor" format="color" />
+    <attr name="workspaceAccentColor" format="color" />
+    <attr name="dropTargetHoverTextColor" format="color" />
 
     <!-- BubbleTextView specific attributes. -->
     <declare-styleable name="BubbleTextView">
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 01f5364459..76e821d72a 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -73,4 +73,7 @@
 
     <color name="wallpaper_popup_scrim">?android:attr/colorAccent</color>
     <color name="wallpaper_scrim_color">#0D878787</color>
+
+    <color name="workspace_accent_color_light">#ff254e47</color>
+    <color name="workspace_accent_color_dark">#ff9cfff2</color>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 1cacc28b0b..273131c54b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -59,7 +59,8 @@
         <item name="workProfileOverlayTextColor">#FF212121</item>
         <item name="eduHalfSheetBGColor">?android:attr/colorAccent</item>
         <item name="disabledIconAlpha">.54</item>
-        <item name="gridColor">?android:attr/colorAccent</item>
+        <item name="workspaceAccentColor">@color/workspace_accent_color_light</item>
+        <item name="dropTargetHoverTextColor">@color/workspace_text_color_light</item>
         <item name="overviewScrimColor">@color/overview_scrim</item>
 
         <item name="android:windowTranslucentStatus">false</item>
@@ -77,6 +78,8 @@
         <item name="isFolderDarkText">false</item>
         <item name="folderHintColor">@color/folder_hint_text_color_light</item>
         <item name="disabledIconAlpha">.254</item>
+        <item name="workspaceAccentColor">@color/workspace_accent_color_dark</item>
+        <item name="dropTargetHoverTextColor">@color/workspace_text_color_dark</item>
 
     </style>
 
@@ -270,7 +273,7 @@
     <style name="DropTargetButtonBase" parent="@android:style/TextAppearance.DeviceDefault">
         <item name="android:drawablePadding">8dp</item>
         <item name="android:padding">16dp</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textColor">@color/drop_target_text</item>
         <item name="android:textSize">@dimen/drop_target_text_size</item>
         <item name="android:singleLine">true</item>
         <item name="android:ellipsize">end</item>
diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
index d1cb5b8394..23dd3bb01e 100644
--- a/src/com/android/launcher3/ButtonDropTarget.java
+++ b/src/com/android/launcher3/ButtonDropTarget.java
@@ -48,20 +48,6 @@ import com.android.launcher3.model.data.ItemInfo;
 public abstract class ButtonDropTarget extends TextView
         implements DropTarget, DragController.DragListener, OnClickListener {
 
-    private static final Property<ButtonDropTarget, Integer> TEXT_COLOR =
-            new Property<ButtonDropTarget, Integer>(Integer.TYPE, "textColor") {
-
-                @Override
-                public Integer get(ButtonDropTarget target) {
-                    return target.getTextColor();
-                }
-
-                @Override
-                public void set(ButtonDropTarget target, Integer value) {
-                    target.setTextColor(value);
-                }
-            };
-
     private static final int[] sTempCords = new int[2];
     private static final int DRAG_VIEW_DROP_DURATION = 285;
     private static final float DRAG_VIEW_HOVER_OVER_OPACITY = 0.65f;
@@ -84,15 +70,12 @@ public abstract class ButtonDropTarget extends TextView
     private final int mDrawableSize;
 
     protected CharSequence mText;
-    protected ColorStateList mOriginalTextColor;
     protected Drawable mDrawable;
     private boolean mTextVisible = true;
 
     private PopupWindow mToolTip;
     private int mToolTipLocation;
 
-    private AnimatorSet mCurrentColorAnim;
-
     public ButtonDropTarget(Context context, AttributeSet attrs) {
         this(context, attrs, 0);
     }
@@ -110,7 +93,6 @@ public abstract class ButtonDropTarget extends TextView
     protected void onFinishInflate() {
         super.onFinishInflate();
         mText = getText();
-        mOriginalTextColor = getTextColors();
         setContentDescription(mText);
     }
 
@@ -125,6 +107,7 @@ public abstract class ButtonDropTarget extends TextView
         // drawableLeft and drawableStart.
         mDrawable = getContext().getDrawable(resId).mutate();
         mDrawable.setBounds(0, 0, mDrawableSize, mDrawableSize);
+        mDrawable.setTintList(getTextColors());
         setCompoundDrawablesRelative(mDrawable, null, null, null);
     }
 
@@ -191,12 +174,6 @@ public abstract class ButtonDropTarget extends TextView
     @Override
     public void onDragStart(DropTarget.DragObject dragObject, DragOptions options) {
         mActive = !options.isKeyboardDrag && supportsDrop(dragObject.dragInfo);
-        mDrawable.setColorFilter(null);
-        if (mCurrentColorAnim != null) {
-            mCurrentColorAnim.cancel();
-            mCurrentColorAnim = null;
-        }
-        setTextColor(mOriginalTextColor);
         setVisibility(mActive ? View.VISIBLE : View.GONE);
 
         mAccessibleDrag = options.isAccessibleDrag;
@@ -317,10 +294,6 @@ public abstract class ButtonDropTarget extends TextView
         mLauncher.getAccessibilityDelegate().handleAccessibleDrop(this, null, null);
     }
 
-    public int getTextColor() {
-        return getTextColors().getDefaultColor();
-    }
-
     public void setTextVisible(boolean isVisible) {
         CharSequence newText = isVisible ? mText : "";
         if (mTextVisible != isVisible || !TextUtils.equals(newText, getText())) {
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index bfa1769ea8..550a3990e2 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -263,7 +263,7 @@ public class CellLayout extends ViewGroup {
         mBackground.setCallback(this);
         mBackground.setAlpha(0);
 
-        mGridColor = Themes.getAttrColor(getContext(), R.attr.gridColor);
+        mGridColor = Themes.getAttrColor(getContext(), R.attr.workspaceAccentColor);
         mGridVisualizationPadding =
                 res.getDimensionPixelSize(R.dimen.grid_visualization_cell_spacing);
         mGridVisualizationRoundingRadius =
-- 
GitLab


From bbb9a9c03397416fae10e7c2984332f35ef41137 Mon Sep 17 00:00:00 2001
From: Pinyao Ting <pinyaoting@google.com>
Date: Tue, 11 May 2021 15:42:54 -0700
Subject: [PATCH 1500/1664] Extra logging related to widget removal upon
 restore

As observed in b/187799223, widgets are removed after restore. We cannot
identify the root cause from the bugreport. This CL includes more
logging in the hope of identifying the root cause.

Bug: 18779922
Bug: 190565858
Test: manual
Change-Id: Ibdc9876716028592d17beac4542e1d8c498f9e4c
(cherry picked from commit 655ac082c2035b068210894ffeda1230820dbcf0)
---
 src/com/android/launcher3/Launcher.java | 26 ++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 11ddafb3a1..d107afdaf9 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -140,6 +140,7 @@ import com.android.launcher3.model.BgDataModel.Callbacks;
 import com.android.launcher3.model.ItemInstallQueue;
 import com.android.launcher3.model.ModelUtils;
 import com.android.launcher3.model.ModelWriter;
+import com.android.launcher3.model.WidgetsModel;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
@@ -2329,24 +2330,43 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
         try {
             final LauncherAppWidgetProviderInfo appWidgetInfo;
+            String reason = "";
 
             if (item.hasRestoreFlag(LauncherAppWidgetInfo.FLAG_PROVIDER_NOT_READY)) {
                 // If the provider is not ready, bind as a pending widget.
                 appWidgetInfo = null;
+                reason = "the provider not ready.";
             } else if (item.hasRestoreFlag(LauncherAppWidgetInfo.FLAG_ID_NOT_VALID)) {
                 // The widget id is not valid. Try to find the widget based on the provider info.
                 appWidgetInfo = mAppWidgetManager.findProvider(item.providerName, item.user);
+                if (appWidgetInfo == null) {
+                    if (WidgetsModel.GO_DISABLE_WIDGETS) {
+                        reason = "widgets are disabled on go device.";
+                    } else {
+                        reason = "WidgetManagerHelper cannot find a provider from provider info.";
+                    }
+                }
             } else {
                 appWidgetInfo = mAppWidgetManager.getLauncherAppWidgetInfo(item.appWidgetId);
+                if (appWidgetInfo == null) {
+                    if (item.appWidgetId <= LauncherAppWidgetInfo.CUSTOM_WIDGET_ID) {
+                        reason = "CustomWidgetManager cannot find provider from that widget id .";
+                    } else {
+                        reason = "AppWidgetManager cannot find provider for that widget id."
+                                + " It could be due to AppWidgetService is not available, or the"
+                                + " appWidgetId has not been bound to a the provider yet, or you"
+                                + " don't have access to that appWidgetId.";
+                    }
+                }
             }
 
             // If the provider is ready, but the width is not yet restored, try to restore it.
             if (!item.hasRestoreFlag(LauncherAppWidgetInfo.FLAG_PROVIDER_NOT_READY)
                     && (item.restoreStatus != LauncherAppWidgetInfo.RESTORE_COMPLETED)) {
                 if (appWidgetInfo == null) {
-                    Log.d(TAG, "Removing restored widget: id=" + item.appWidgetId
-                            + " belongs to component " + item.providerName
-                            + ", as the provider is null");
+                    FileLog.d(TAG, "Removing restored widget: id=" + item.appWidgetId
+                            + " belongs to component " + item.providerName + " user " + item.user
+                            + ", as the provider is null and " + reason);
                     getModelWriter().deleteItemFromDatabase(item);
                     return null;
                 }
-- 
GitLab


From acd9d799325543c5f74ac58760191dbda01680f7 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Fri, 25 Jun 2021 11:51:44 +0100
Subject: [PATCH 1501/1664] Refine widgets removal logging

Test: N/A
Bug: 190565858
Change-Id: I7fb20eaf727db19787fa9b1fb36eeb5d1392e50c
---
 src/com/android/launcher3/Launcher.java | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index d107afdaf9..1cfe7e0300 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2330,30 +2330,32 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
         try {
             final LauncherAppWidgetProviderInfo appWidgetInfo;
-            String reason = "";
+            String removalReason = "";
 
             if (item.hasRestoreFlag(LauncherAppWidgetInfo.FLAG_PROVIDER_NOT_READY)) {
                 // If the provider is not ready, bind as a pending widget.
                 appWidgetInfo = null;
-                reason = "the provider not ready.";
+                removalReason = "the provider isn't ready.";
             } else if (item.hasRestoreFlag(LauncherAppWidgetInfo.FLAG_ID_NOT_VALID)) {
                 // The widget id is not valid. Try to find the widget based on the provider info.
                 appWidgetInfo = mAppWidgetManager.findProvider(item.providerName, item.user);
                 if (appWidgetInfo == null) {
                     if (WidgetsModel.GO_DISABLE_WIDGETS) {
-                        reason = "widgets are disabled on go device.";
+                        removalReason = "widgets are disabled on go device.";
                     } else {
-                        reason = "WidgetManagerHelper cannot find a provider from provider info.";
+                        removalReason =
+                                "WidgetManagerHelper cannot find a provider from provider info.";
                     }
                 }
             } else {
                 appWidgetInfo = mAppWidgetManager.getLauncherAppWidgetInfo(item.appWidgetId);
                 if (appWidgetInfo == null) {
                     if (item.appWidgetId <= LauncherAppWidgetInfo.CUSTOM_WIDGET_ID) {
-                        reason = "CustomWidgetManager cannot find provider from that widget id .";
+                        removalReason =
+                                "CustomWidgetManager cannot find provider from that widget id.";
                     } else {
-                        reason = "AppWidgetManager cannot find provider for that widget id."
-                                + " It could be due to AppWidgetService is not available, or the"
+                        removalReason = "AppWidgetManager cannot find provider for that widget id."
+                                + " It could be because AppWidgetService is not available, or the"
                                 + " appWidgetId has not been bound to a the provider yet, or you"
                                 + " don't have access to that appWidgetId.";
                     }
@@ -2366,7 +2368,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
                 if (appWidgetInfo == null) {
                     FileLog.d(TAG, "Removing restored widget: id=" + item.appWidgetId
                             + " belongs to component " + item.providerName + " user " + item.user
-                            + ", as the provider is null and " + reason);
+                            + ", as the provider is null and " + removalReason);
                     getModelWriter().deleteItemFromDatabase(item);
                     return null;
                 }
-- 
GitLab


From 0b320545f8460dd1d7517f4a62670843794f9ebf Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Mon, 21 Jun 2021 17:56:44 +0100
Subject: [PATCH 1502/1664] Compare maxSpanSize for WidgetsListContentEntries
 when updating visible entries in widget picker.

This is so that widgets are rearranged according to maxSpanSize in
widget table

Bug: 191336852
Test: Manually rotated widget picker with one of the headers expanded
and checked that widgets in widget table adjust according to screen's
horizontal size.

Change-Id: I2406ca9eccd18f4bb32b396acaa188c37f0059ee
---
 .../picker/WidgetsDiffReporterTest.java       |  26 ++++-
 .../model/WidgetsListContentEntryTest.java    | 105 ++++++++++++++++--
 .../widget/model/WidgetsListContentEntry.java |  54 ++++++++-
 .../widget/picker/WidgetsDiffReporter.java    |  10 +-
 .../widget/picker/WidgetsListAdapter.java     |  23 ++--
 .../WidgetsListTableViewHolderBinder.java     |   8 +-
 .../widget/util/WidgetsTableUtils.java        |   7 ++
 7 files changed, 197 insertions(+), 36 deletions(-)

diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsDiffReporterTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsDiffReporterTest.java
index c946c7218f..b9f183c713 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsDiffReporterTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsDiffReporterTest.java
@@ -58,7 +58,7 @@ import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
 public final class WidgetsDiffReporterTest {
-    private static final String TEST_PACKAGE_PREFIX = "com.google.test";
+    private static final String TEST_PACKAGE_PREFIX = "com.android.test";
     private static final WidgetListBaseRowEntryComparator COMPARATOR =
             new WidgetListBaseRowEntryComparator();
 
@@ -241,6 +241,30 @@ public final class WidgetsDiffReporterTest {
         assertThat(currentList).containsExactlyElementsIn(newList);
     }
 
+    @Test
+    public void headersContentsMix_contentMaxSpanSizeModified_shouldInvokeCorrectCallbacks() {
+        // GIVEN the current list has app headers [A, B, E content].
+        ArrayList<WidgetsListBaseEntry> currentList = new ArrayList<>(
+                List.of(mHeaderA, mHeaderB, mContentE));
+        // GIVEN the new list has max span size in "E content" modified.
+        List<WidgetsListBaseEntry> newList = List.of(
+                mHeaderA,
+                mHeaderB,
+                new WidgetsListContentEntry(
+                        mContentE.mPkgItem,
+                        mContentE.mTitleSectionName,
+                        mContentE.mWidgets,
+                        mContentE.getMaxSpanSizeInCells() + 1));
+
+        // WHEN computing the list difference.
+        mWidgetsDiffReporter.process(currentList, newList, COMPARATOR);
+
+        // THEN notify "E content" has been changed.
+        verify(mAdapter).notifyItemChanged(/* position= */ 2);
+        // THEN the current list contains all elements from the new list.
+        assertThat(currentList).containsExactlyElementsIn(newList);
+    }
+
 
     private WidgetsListHeaderEntry createWidgetsHeaderEntry(String packageName, String appName,
             int numOfWidgets) {
diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/model/WidgetsListContentEntryTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/model/WidgetsListContentEntryTest.java
index 2d22c45e2c..106cac0fdf 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/picker/model/WidgetsListContentEntryTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/picker/model/WidgetsListContentEntryTest.java
@@ -49,8 +49,10 @@ import java.util.Map;
 
 @RunWith(RobolectricTestRunner.class)
 public final class WidgetsListContentEntryTest {
-    private static final String PACKAGE_NAME = "com.google.test";
-    private final PackageItemInfo mPackageItemInfo = new PackageItemInfo(PACKAGE_NAME);
+    private static final String PACKAGE_NAME = "com.android.test";
+    private static final String PACKAGE_NAME_2 = "com.android.test2";
+    private final PackageItemInfo mPackageItemInfo1 = new PackageItemInfo(PACKAGE_NAME);
+    private final PackageItemInfo mPackageItemInfo2 = new PackageItemInfo(PACKAGE_NAME_2);
     private final ComponentName mWidget1 = ComponentName.createRelative(PACKAGE_NAME, ".mWidget1");
     private final ComponentName mWidget2 = ComponentName.createRelative(PACKAGE_NAME, ".mWidget2");
     private final ComponentName mWidget3 = ComponentName.createRelative(PACKAGE_NAME, ".mWidget3");
@@ -91,7 +93,7 @@ public final class WidgetsListContentEntryTest {
         WidgetItem widgetItem3 = createWidgetItem(mWidget3, /* spanX= */ 2, /* spanY= */ 3);
 
         // WHEN creates a WidgetsListRowEntry with the unsorted widgets.
-        WidgetsListContentEntry widgetsListRowEntry = new WidgetsListContentEntry(mPackageItemInfo,
+        WidgetsListContentEntry widgetsListRowEntry = new WidgetsListContentEntry(mPackageItemInfo1,
                 /* titleSectionName= */ "T",
                 List.of(widgetItem1, widgetItem2, widgetItem3));
 
@@ -100,7 +102,7 @@ public final class WidgetsListContentEntryTest {
                 .containsExactly(widgetItem3, widgetItem1, widgetItem2)
                 .inOrder();
         assertThat(widgetsListRowEntry.mTitleSectionName).isEqualTo("T");
-        assertThat(widgetsListRowEntry.mPkgItem).isEqualTo(mPackageItemInfo);
+        assertThat(widgetsListRowEntry.mPkgItem).isEqualTo(mPackageItemInfo1);
     }
 
     @Test
@@ -114,7 +116,7 @@ public final class WidgetsListContentEntryTest {
         WidgetItem widgetItem3 = createWidgetItem(mWidget1, /* spanX= */ 2, /* spanY= */ 2);
 
         // WHEN creates a WidgetsListRowEntry with the unsorted widgets.
-        WidgetsListContentEntry widgetsListRowEntry = new WidgetsListContentEntry(mPackageItemInfo,
+        WidgetsListContentEntry widgetsListRowEntry = new WidgetsListContentEntry(mPackageItemInfo1,
                 /* titleSectionName= */ "T",
                 List.of(widgetItem1, widgetItem2, widgetItem3));
 
@@ -124,7 +126,7 @@ public final class WidgetsListContentEntryTest {
                 .containsExactly(widgetItem2, widgetItem3, widgetItem1)
                 .inOrder();
         assertThat(widgetsListRowEntry.mTitleSectionName).isEqualTo("T");
-        assertThat(widgetsListRowEntry.mPkgItem).isEqualTo(mPackageItemInfo);
+        assertThat(widgetsListRowEntry.mPkgItem).isEqualTo(mPackageItemInfo1);
     }
 
     @Test
@@ -140,7 +142,7 @@ public final class WidgetsListContentEntryTest {
         WidgetItem widgetItem4 = createWidgetItem(mWidget3, /* spanX= */ 2, /* spanY= */ 2);
 
         // WHEN creates a WidgetsListRowEntry with the unsorted widgets.
-        WidgetsListContentEntry widgetsListRowEntry = new WidgetsListContentEntry(mPackageItemInfo,
+        WidgetsListContentEntry widgetsListRowEntry = new WidgetsListContentEntry(mPackageItemInfo1,
                 /* titleSectionName= */ "T",
                 List.of(widgetItem1, widgetItem2, widgetItem3, widgetItem4));
 
@@ -151,9 +153,96 @@ public final class WidgetsListContentEntryTest {
                 .containsExactly(widgetItem4, widgetItem2, widgetItem1, widgetItem3)
                 .inOrder();
         assertThat(widgetsListRowEntry.mTitleSectionName).isEqualTo("T");
-        assertThat(widgetsListRowEntry.mPkgItem).isEqualTo(mPackageItemInfo);
+        assertThat(widgetsListRowEntry.mPkgItem).isEqualTo(mPackageItemInfo1);
     }
 
+    @Test
+    public void equals_entriesWithDifferentPackageItemInfo_returnFalse() {
+        WidgetItem widgetItem1 = createWidgetItem(mWidget1, /* spanX= */ 2, /* spanY= */ 3);
+        WidgetsListContentEntry widgetsListRowEntry1 = new WidgetsListContentEntry(
+                mPackageItemInfo1,
+                /* titleSectionName= */ "T",
+                List.of(widgetItem1),
+                /* maxSpanSizeInCells= */ 3);
+        WidgetsListContentEntry widgetsListRowEntry2 = new WidgetsListContentEntry(
+                mPackageItemInfo2,
+                /* titleSectionName= */ "T",
+                List.of(widgetItem1),
+                /* maxSpanSizeInCells= */ 3);
+
+        assertThat(widgetsListRowEntry1.equals(widgetsListRowEntry2)).isFalse();
+    }
+
+    @Test
+    public void equals_entriesWithDifferentTitleSectionName_returnFalse() {
+        WidgetItem widgetItem1 = createWidgetItem(mWidget1, /* spanX= */ 2, /* spanY= */ 3);
+        WidgetsListContentEntry widgetsListRowEntry1 = new WidgetsListContentEntry(
+                mPackageItemInfo1,
+                /* titleSectionName= */ "T",
+                List.of(widgetItem1),
+                /* maxSpanSizeInCells= */ 3);
+        WidgetsListContentEntry widgetsListRowEntry2 = new WidgetsListContentEntry(
+                mPackageItemInfo1,
+                /* titleSectionName= */ "S",
+                List.of(widgetItem1),
+                /* maxSpanSizeInCells= */ 3);
+
+        assertThat(widgetsListRowEntry1.equals(widgetsListRowEntry2)).isFalse();
+    }
+
+    @Test
+    public void equals_entriesWithDifferentWidgetsList_returnFalse() {
+        WidgetItem widgetItem1 = createWidgetItem(mWidget1, /* spanX= */ 2, /* spanY= */ 3);
+        WidgetItem widgetItem2 = createWidgetItem(mWidget2, /* spanX= */ 2, /* spanY= */ 3);
+        WidgetsListContentEntry widgetsListRowEntry1 = new WidgetsListContentEntry(
+                mPackageItemInfo1,
+                /* titleSectionName= */ "T",
+                List.of(widgetItem1),
+                /* maxSpanSizeInCells= */ 3);
+        WidgetsListContentEntry widgetsListRowEntry2 = new WidgetsListContentEntry(
+                mPackageItemInfo1,
+                /* titleSectionName= */ "T",
+                List.of(widgetItem2),
+                /* maxSpanSizeInCells= */ 3);
+
+        assertThat(widgetsListRowEntry1.equals(widgetsListRowEntry2)).isFalse();
+    }
+
+    @Test
+    public void equals_entriesWithDifferentMaxSpanSize_returnFalse() {
+        WidgetItem widgetItem1 = createWidgetItem(mWidget1, /* spanX= */ 2, /* spanY= */ 3);
+        WidgetsListContentEntry widgetsListRowEntry1 = new WidgetsListContentEntry(
+                mPackageItemInfo1,
+                /* titleSectionName= */ "T",
+                List.of(widgetItem1),
+                /* maxSpanSizeInCells= */ 3);
+        WidgetsListContentEntry widgetsListRowEntry2 = new WidgetsListContentEntry(
+                mPackageItemInfo1,
+                /* titleSectionName= */ "T",
+                List.of(widgetItem1),
+                /* maxSpanSizeInCells= */ 2);
+
+        assertThat(widgetsListRowEntry1.equals(widgetsListRowEntry2)).isFalse();
+    }
+
+    @Test
+    public void equals_entriesWithSameContents_returnTrue() {
+        WidgetItem widgetItem1 = createWidgetItem(mWidget1, /* spanX= */ 2, /* spanY= */ 3);
+        WidgetsListContentEntry widgetsListRowEntry1 = new WidgetsListContentEntry(
+                mPackageItemInfo1,
+                /* titleSectionName= */ "T",
+                List.of(widgetItem1),
+                /* maxSpanSizeInCells= */ 3);
+        WidgetsListContentEntry widgetsListRowEntry2 = new WidgetsListContentEntry(
+                mPackageItemInfo1,
+                /* titleSectionName= */ "T",
+                List.of(widgetItem1),
+                /* maxSpanSizeInCells= */ 3);
+
+        assertThat(widgetsListRowEntry1.equals(widgetsListRowEntry2)).isTrue();
+    }
+
+
     private WidgetItem createWidgetItem(ComponentName componentName, int spanX, int spanY) {
         String label = mWidgetsToLabels.get(componentName);
         ShadowPackageManager packageManager = shadowOf(mContext.getPackageManager());
diff --git a/src/com/android/launcher3/widget/model/WidgetsListContentEntry.java b/src/com/android/launcher3/widget/model/WidgetsListContentEntry.java
index 0328cf68ba..73b17f1d4f 100644
--- a/src/com/android/launcher3/widget/model/WidgetsListContentEntry.java
+++ b/src/com/android/launcher3/widget/model/WidgetsListContentEntry.java
@@ -26,14 +26,39 @@ import java.util.List;
  */
 public final class WidgetsListContentEntry extends WidgetsListBaseEntry {
 
+    private final int mMaxSpanSizeInCells;
+
+    /**
+     * Constructor for {@link WidgetsListContentEntry}.
+     *
+     * @param pkgItem package info associated with the entry
+     * @param titleSectionName title section name associated with the entry.
+     * @param items list of widgets for the package.
+     */
     public WidgetsListContentEntry(PackageItemInfo pkgItem, String titleSectionName,
             List<WidgetItem> items) {
+        this(pkgItem, titleSectionName, items, /* maxSpanSizeInCells= */ 0);
+    }
+
+    /**
+     * Constructor for {@link WidgetsListContentEntry}.
+     *
+     * @param pkgItem package info associated with the entry
+     * @param titleSectionName title section name associated with the entry.
+     * @param items list of widgets for the package.
+     * @param maxSpanSizeInCells the max horizontal span in cells that is allowed for grouping more
+     *                           than one widgets in a table row.
+     */
+    public WidgetsListContentEntry(PackageItemInfo pkgItem, String titleSectionName,
+            List<WidgetItem> items, int maxSpanSizeInCells) {
         super(pkgItem, titleSectionName, items);
+        mMaxSpanSizeInCells = maxSpanSizeInCells;
     }
 
     @Override
     public String toString() {
-        return "Content:" + mPkgItem.packageName + ":" + mWidgets.size();
+        return "Content:" + mPkgItem.packageName + ":" + mWidgets.size() + " maxSpanSizeInCells: "
+                + mMaxSpanSizeInCells;
     }
 
     @Override
@@ -42,11 +67,36 @@ public final class WidgetsListContentEntry extends WidgetsListBaseEntry {
         return RANK_WIDGETS_LIST_CONTENT;
     }
 
+    /**
+     * Returns a copy of this {@link WidgetsListContentEntry} with updated
+     * {@param maxSpanSizeInCells}.
+     *
+     * @param maxSpanSizeInCells the maximum horizontal span in cells that is allowed for grouping
+     *                           more than one widgets in a table row.
+     */
+    public WidgetsListContentEntry withMaxSpanSize(int maxSpanSizeInCells) {
+        if (mMaxSpanSizeInCells == maxSpanSizeInCells) return this;
+        return new WidgetsListContentEntry(
+                mPkgItem,
+                mTitleSectionName,
+                mWidgets,
+                /* maxSpanSizeInCells= */ maxSpanSizeInCells);
+    }
+
+    /**
+     * Returns the max horizontal span size in cells that is allowed for grouping more than one
+     * widget in a table row.
+     */
+    public int getMaxSpanSizeInCells() {
+        return mMaxSpanSizeInCells;
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (!(obj instanceof WidgetsListContentEntry)) return false;
         WidgetsListContentEntry otherEntry = (WidgetsListContentEntry) obj;
         return mWidgets.equals(otherEntry.mWidgets) && mPkgItem.equals(otherEntry.mPkgItem)
-                && mTitleSectionName.equals(otherEntry.mTitleSectionName);
+                && mTitleSectionName.equals(otherEntry.mTitleSectionName)
+                && mMaxSpanSizeInCells == otherEntry.mMaxSpanSizeInCells;
     }
 }
diff --git a/src/com/android/launcher3/widget/picker/WidgetsDiffReporter.java b/src/com/android/launcher3/widget/picker/WidgetsDiffReporter.java
index dfe447a38e..99374f5eef 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsDiffReporter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsDiffReporter.java
@@ -115,7 +115,7 @@ public class WidgetsDiffReporter {
                 // or did the widget size and desc, span, etc change?
                 if (!isSamePackageItemInfo(orgRowEntry.mPkgItem, newRowEntry.mPkgItem)
                         || hasHeaderUpdated(orgRowEntry, newRowEntry)
-                        || hasWidgetsListChanged(orgRowEntry, newRowEntry)) {
+                        || hasWidgetsListContentChanged(orgRowEntry, newRowEntry)) {
                     index = currentEntries.indexOf(orgRowEntry);
                     currentEntries.set(index, newRowEntry);
                     mListener.notifyItemChanged(index);
@@ -158,17 +158,15 @@ public class WidgetsDiffReporter {
 
     /**
      * Returns {@code true} if both {@code curRow} & {@code newRow} are
-     * {@link WidgetsListContentEntry}s with a different list of widgets.
+     * {@link WidgetsListContentEntry}s with a different list or arrangement of widgets.
      */
-    private boolean hasWidgetsListChanged(WidgetsListBaseEntry curRow,
+    private boolean hasWidgetsListContentChanged(WidgetsListBaseEntry curRow,
             WidgetsListBaseEntry newRow) {
         if (!(curRow instanceof WidgetsListContentEntry)
                 || !(newRow instanceof WidgetsListContentEntry)) {
             return false;
         }
-        WidgetsListContentEntry orgRowEntry = (WidgetsListContentEntry) curRow;
-        WidgetsListContentEntry newRowEntry = (WidgetsListContentEntry) newRow;
-        return !orgRowEntry.mWidgets.equals(newRowEntry.mWidgets);
+        return !curRow.equals(newRow);
     }
 
     /**
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
index b668c90031..08a2263eff 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
@@ -111,6 +111,7 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
     @Nullable private PackageUserKey mPendingClickHeader;
     private final int mShortcutPreviewPadding;
     private final int mSpacingBetweenEntries;
+    private int mMaxSpanSize = 4;
 
     private final WidgetPreviewLoadedCallback mPreviewLoadedCallback =
             ignored -> updateVisibleEntries();
@@ -249,10 +250,14 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
                 .filter(entry -> (mFilter == null || mFilter.test(entry))
                         && mHeaderAndSelectedContentFilter.test(entry))
                 .map(entry -> {
-                    // Adjust the original entries to expand headers for the selected content.
                     if (entry instanceof WidgetsListBaseEntry.Header<?>
                             && matchesKey(entry, mWidgetsContentVisiblePackageUserKey)) {
+                        // Adjust the original entries to expand headers for the selected content.
                         return ((WidgetsListBaseEntry.Header<?>) entry).withWidgetListShown();
+                    } else if (entry instanceof WidgetsListContentEntry) {
+                        // Adjust the original content entries to accommodate for the current
+                        // maxSpanSize.
+                        return ((WidgetsListContentEntry) entry).withMaxSpanSize(mMaxSpanSize);
                     }
                     return entry;
                 })
@@ -491,20 +496,12 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
     }
 
     /**
-     * Sets the max horizontal spans that are allowed for grouping more than one widgets in a table
-     * row.
-     *
-     * <p>If there is only one widget in a row, that widget horizontal span is allowed to exceed
-     * {@code maxHorizontalSpans}.
-     * <p>Let's say the max horizontal spans is set to 5. Widgets can be grouped in the same row if
-     * their total horizontal spans added don't exceed 5.
-     * Example 1: Row 1: 2x2, 2x3, 1x1. Total horizontal spans is 5. This is okay.
-     * Example 2: Row 1: 2x2, 4x3, 1x1. the total horizontal spans is 7. This is wrong.
-     *            4x3 and 1x1 should be moved to a new row.
-     * Example 3: Row 1: 6x4. This is okay because this is the only item in the row.
+     * Sets the max horizontal span in cells that is allowed for grouping more than one widget in a
+     * table row.
      */
     public void setMaxHorizontalSpansPerRow(int maxHorizontalSpans) {
-        mWidgetsListTableViewHolderBinder.setMaxSpansPerRow(maxHorizontalSpans);
+        mMaxSpanSize = maxHorizontalSpans;
+        updateVisibleEntries();
     }
 
     /**
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java b/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
index 7b526639f5..57dec1401e 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
@@ -49,7 +49,6 @@ public final class WidgetsListTableViewHolderBinder
     private static final boolean DEBUG = false;
     private static final String TAG = "WidgetsListRowViewHolderBinder";
 
-    private int mMaxSpansPerRow = 4;
     private final LayoutInflater mLayoutInflater;
     private final OnClickListener mIconClickListener;
     private final OnLongClickListener mIconLongClickListener;
@@ -82,10 +81,6 @@ public final class WidgetsListTableViewHolderBinder
         mApplyBitmapDeferred = applyBitmapDeferred;
     }
 
-    public void setMaxSpansPerRow(int maxSpansPerRow) {
-        mMaxSpansPerRow = maxSpansPerRow;
-    }
-
     @Override
     public WidgetsRowViewHolder newViewHolder(ViewGroup parent) {
         if (DEBUG) {
@@ -113,7 +108,8 @@ public final class WidgetsListTableViewHolderBinder
                 position == mWidgetsListAdapter.getItemCount() - 1 ? LAST : MIDDLE);
 
         List<ArrayList<WidgetItem>> widgetItemsTable =
-                WidgetsTableUtils.groupWidgetItemsIntoTable(entry.mWidgets, mMaxSpansPerRow);
+                WidgetsTableUtils.groupWidgetItemsIntoTable(
+                        entry.mWidgets, entry.getMaxSpanSizeInCells());
         recycleTableBeforeBinding(table, widgetItemsTable);
         // Bind the widget items.
         for (int i = 0; i < widgetItemsTable.size(); i++) {
diff --git a/src/com/android/launcher3/widget/util/WidgetsTableUtils.java b/src/com/android/launcher3/widget/util/WidgetsTableUtils.java
index 7294a3ab31..54aaf93ac0 100644
--- a/src/com/android/launcher3/widget/util/WidgetsTableUtils.java
+++ b/src/com/android/launcher3/widget/util/WidgetsTableUtils.java
@@ -56,6 +56,13 @@ public final class WidgetsTableUtils {
      * 3. The order shortcuts are grouped together in the same row until their total horizontal
      *    spans exceed the {@code maxSpansPerRow} - 1.
      * 4. If there is only one widget in a row, its width may exceed the {@code maxSpansPerRow}.
+     *
+     * <p>Let's say the {@code maxSpansPerRow} is set to 6. Widgets can be grouped in the same row
+     * if their total horizontal spans added don't exceed 5.
+     * Example 1: Row 1: 2x2, 2x3, 1x1. Total horizontal spans is 5. This is okay.
+     * Example 2: Row 1: 2x2, 4x3, 1x1. the total horizontal spans is 7. This is wrong. 4x3 and 1x1
+     * should be moved to a new row.
+     * Example 3: Row 1: 6x4. This is okay because this is the only item in the row.
      */
     public static List<ArrayList<WidgetItem>> groupWidgetItemsIntoTable(
             List<WidgetItem> widgetItems, final int maxSpansPerRow) {
-- 
GitLab


From 546188034f449cadba3a2d0027526707c6e65e15 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Fri, 25 Jun 2021 14:45:53 +0000
Subject: [PATCH 1503/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I70339606ead7b310ae985cfbb876e83326b2b019
---
 res/values-af/strings.xml | 3 +--
 res/values-az/strings.xml | 3 +--
 res/values-bn/strings.xml | 6 ++----
 res/values-ca/strings.xml | 2 +-
 res/values-de/strings.xml | 6 ++----
 res/values-eu/strings.xml | 3 +--
 res/values-ka/strings.xml | 3 +--
 res/values-kk/strings.xml | 2 +-
 res/values-ky/strings.xml | 3 +--
 res/values-mr/strings.xml | 3 +--
 res/values-pa/strings.xml | 6 ++----
 res/values-sq/strings.xml | 6 ++----
 res/values-ur/strings.xml | 6 ++----
 13 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index d1e1253b3a..6e811807aa 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Kennisgewings"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Raak en hou om \'n kortpad te skuif."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dubbeltik en hou om \'n kortpad te skuif of gebruik gepasmaakte handelinge."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Geen plek op hierdie tuisskerm nie"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Geen plek meer in die Gunstelinge-laai nie"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Programmelys"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lys persoonlike programme"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 3670b01348..1bbc006a71 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Bildirişlər"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Qısayolu daşımaq üçün toxunub saxlayın."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Qısayolu daşımaq üçün iki dəfə toxunub saxlayın və ya fərdi əməliyyatlardan istifadə edin."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Bu Əsas ekranda yer qalmayıb"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Favoritlər-də yer yoxdur"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Tətbiq siyahısı"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Şəxsi tətbiqlərin siyahısı"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 62b5c5d944..aa32151974 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -46,10 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"উইজেট"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"সার্চ করুন"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"সার্চ বক্স থেকে টেক্সট মুছুন"</string>
-    <!-- no translation found for no_widgets_available (4337693382501046170) -->
-    <skip />
-    <!-- no translation found for no_search_results (3787956167293097509) -->
-    <skip />
+    <string name="no_widgets_available" msgid="4337693382501046170">"উইজেট এবং শর্টকার্ট উপলভ্য নেই"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"কোনও উইজেট বা শর্টকার্ট খুঁজে পাওয়া যায়নি"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ব্যক্তিগত"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"অফিস"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"কথোপকথন"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index a84293541f..f1860d40f3 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -103,7 +103,7 @@
     <string name="folder_name_format_exact" msgid="8626242716117004803">"Carpeta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> elements"</string>
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Carpeta: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> o més elements"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Fons de pantalla"</string>
-    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Fons de pantalla i estil"</string>
+    <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Estil i fons de pantalla"</string>
     <string name="settings_button_text" msgid="8873672322605444408">"Config. pantalla d\'inici"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Desactivada per l\'administrador"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Permet la rotació de la pantalla d\'inici"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index dfa6337a4b..aebf5e06f8 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -46,10 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Suche"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Text aus dem Suchfeld löschen"</string>
-    <!-- no translation found for no_widgets_available (4337693382501046170) -->
-    <skip />
-    <!-- no translation found for no_search_results (3787956167293097509) -->
-    <skip />
+    <string name="no_widgets_available" msgid="4337693382501046170">"Widgets und Shortcuts nicht verfügbar"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Keine Widgets oder Shortcuts gefunden"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Privat"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Geschäftlich"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Unterhaltungen"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index f8b3997993..78ecc7014a 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Jakinarazpenak"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Eduki sakatuta lasterbide bat mugitzeko."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Sakatu birritan eta eduki sakatuta lasterbide bat mugitzeko edo ekintza pertsonalizatuak erabiltzeko."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Ez dago tokirik hasierako pantailan"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Ez dago toki gehiago Gogokoak erretiluan"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Aplikazioen zerrenda"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Aplikazio pertsonalen zerrenda"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 579ff60e52..fd6730678e 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"შეტყობინებები"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"შეხებით აირჩიეთ და გეჭიროთ მალსახმობის გადასაადგილებლად."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ორმაგი შეხებით აირჩიეთ და გეჭიროთ მალსახმობის გადასაადგილებლად ან მორგებული მოქმედებების გამოსაყენებლად."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"ამ მთავარ ეკრანზე ადგილი არ არის"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"რჩეულების თაროზე ადგილი არ არის"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"აპების სია"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"პერსონალური აპების სია"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 5783873eed..64771de1b8 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -76,7 +76,7 @@
     <string name="install_drop_target_label" msgid="2539096853673231757">"Орнату"</string>
     <string name="dismiss_prediction_label" msgid="3357562989568808658">"Қолданбаны ұсынбау"</string>
     <string name="pin_prediction" msgid="4196423321649756498">"Болжанған қолданбаны бекіту"</string>
-    <string name="permlab_install_shortcut" msgid="5632423390354674437">"төте пернелерді орнату"</string>
+    <string name="permlab_install_shortcut" msgid="5632423390354674437">"таңбаша орнату"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Қолданбаға пайдаланушының қатысуынсыз төте пернелерді қосу мүмкіндігін береді."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"Негізгі экрандағы параметрлер мен төте пернелерді оқу"</string>
     <string name="permdesc_read_settings" msgid="5833423719057558387">"Қолданбаға Негізгі экрандағы параметрлер мен төте пернелерді оқу мүмкіндігін береді."</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 605ebe1d2a..2ead1ea7a8 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Билдирмелер"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Ыкчам баскычты жылдыруу үчүн коё бербей басып туруңуз."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Ыкчам баскычты жылдыруу үчүн эки жолу таптап, кармап туруңуз же ыңгайлаштырылган аракеттерди колдонуңуз."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Башкы экранда бош орун жок"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Тандамалдар тайпасында орун калган жок"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Колдонмолор тизмеси"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Жеке колдономолордун тизмеси"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index e7269caeee..e4634dd801 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"सूचना"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"शॉर्टकट हलवण्यासाठी स्पर्श करा आणि धरून ठेवा."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"शॉर्टकट हलवण्यासाठी किंवा कस्टम कृती वापरण्यासाठी दोनदा टॅप करा आणि धरून ठेवा."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"या होम स्क्रीनवर कोणतीही रूम नाही"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"आवडीच्या ट्रे मध्ये आणखी जागा नाही"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"अ‍ॅप्स सूची"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"वैयक्तिक अ‍ॅप्स सूची"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index ed0879fb3b..ff9ed62082 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -46,10 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"ਵਿਜੇਟ"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"ਖੋਜੋ"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"ਖੋਜ ਬਾਕਸ ਤੋਂ ਸਪੱਸ਼ਟ ਲਿਖਤ"</string>
-    <!-- no translation found for no_widgets_available (4337693382501046170) -->
-    <skip />
-    <!-- no translation found for no_search_results (3787956167293097509) -->
-    <skip />
+    <string name="no_widgets_available" msgid="4337693382501046170">"ਵਿਜੇਟ ਜਾਂ ਸ਼ਾਰਟਕੱਟ ਉਪਲਬਧ ਨਹੀਂ ਹਨ"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"ਕੋਈ ਵੀ ਵਿਜੇਟ ਜਾਂ ਸ਼ਾਰਟਕੱਟ ਨਹੀਂ ਮਿਲਿਆ"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ਨਿੱਜੀ"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ਕਾਰਜ-ਸਥਾਨ"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"ਗੱਲਾਂਬਾਤਾਂ"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index e39e3e7893..833745f1d9 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -46,10 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Miniaplikacionet"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Kërko"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Pastro tekstin nga kutia e kërkimit"</string>
-    <!-- no translation found for no_widgets_available (4337693382501046170) -->
-    <skip />
-    <!-- no translation found for no_search_results (3787956167293097509) -->
-    <skip />
+    <string name="no_widgets_available" msgid="4337693382501046170">"Miniaplikacionet dhe shkurtoret nuk ofrohen"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Nuk u gjet asnjë miniaplikacion ose shkurtore"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personale"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Puna"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Bisedat"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 7fe31a6663..3353539b7d 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -46,10 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"ویجیٹس"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"تلاش کریں"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"تلاش کے خانے سے ٹیکسٹ صاف کریں"</string>
-    <!-- no translation found for no_widgets_available (4337693382501046170) -->
-    <skip />
-    <!-- no translation found for no_search_results (3787956167293097509) -->
-    <skip />
+    <string name="no_widgets_available" msgid="4337693382501046170">"ویجیٹس اور شارٹ کٹس دستیاب نہیں ہیں"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"کوئی ویجیٹ یا شارٹ کٹ نہیں ملا"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ذاتی"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"دفتری ویجیٹس"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"گفتگوئیں"</string>
-- 
GitLab


From 936f06e02c93b3d897b8d18ab7e2be20bf2c9cf0 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Wed, 23 Jun 2021 19:41:23 -0700
Subject: [PATCH 1504/1664] Wallpaper and non-app targets are not necessary

Fixes: 191773356
Test: Swipe up to overview, launch another app, and make sure it works
Change-Id: I3f71d90687e18f38ddb17876bf7c56861bc61932
---
 .../android/quickstep/TaskAnimationManager.java    |  4 +++-
 .../com/android/quickstep/views/RecentsView.java   | 14 +++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/TaskAnimationManager.java b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
index 9731bf187e..223c46df26 100644
--- a/quickstep/src/com/android/quickstep/TaskAnimationManager.java
+++ b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
@@ -146,7 +146,9 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
                     if (recentsView != null) {
                         RemoteAnimationTargetCompat[] apps = new RemoteAnimationTargetCompat[1];
                         apps[0] = appearedTaskTarget;
-                        recentsView.launchSideTaskInLiveTileMode(appearedTaskTarget.taskId, apps);
+                        recentsView.launchSideTaskInLiveTileMode(appearedTaskTarget.taskId, apps,
+                                new RemoteAnimationTargetCompat[0] /* wallpaper */,
+                                new RemoteAnimationTargetCompat[0] /* nonApps */);
                         return;
                     }
                 }
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 000a95d00e..960006a0a8 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -142,6 +142,7 @@ import com.android.quickstep.RecentsAnimationController;
 import com.android.quickstep.RecentsAnimationTargets;
 import com.android.quickstep.RecentsModel;
 import com.android.quickstep.RecentsModel.TaskVisualsChangeListener;
+import com.android.quickstep.RemoteAnimationTargets;
 import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.TaskOverlayFactory;
 import com.android.quickstep.TaskThumbnailCache;
@@ -847,11 +848,13 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     public void launchSideTaskInLiveTileModeForRestartedApp(int taskId) {
         if (mRunningTaskId != -1 && mRunningTaskId == taskId &&
                 getLiveTileParams().getTargetSet().findTask(taskId) != null) {
-            launchSideTaskInLiveTileMode(taskId, getLiveTileParams().getTargetSet().apps);
+            RemoteAnimationTargets targets = getLiveTileParams().getTargetSet();
+            launchSideTaskInLiveTileMode(taskId, targets.apps, targets.wallpapers, targets.nonApps);
         }
     }
 
-    public void launchSideTaskInLiveTileMode(int taskId, RemoteAnimationTargetCompat[] apps) {
+    public void launchSideTaskInLiveTileMode(int taskId, RemoteAnimationTargetCompat[] apps,
+            RemoteAnimationTargetCompat[] wallpaper, RemoteAnimationTargetCompat[] nonApps) {
         AnimatorSet anim = new AnimatorSet();
         TaskView taskView = getTaskView(taskId);
         if (taskView == null || !isTaskViewVisible(taskView)) {
@@ -880,11 +883,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 }
             });
         } else {
-            TaskViewUtils.composeRecentsLaunchAnimator(
-                    anim, taskView, apps,
-                    mLiveTileParams.getTargetSet().wallpapers,
-                    mLiveTileParams.getTargetSet().nonApps, true /* launcherClosing */,
-                    mActivity.getStateManager(), this,
+            TaskViewUtils.composeRecentsLaunchAnimator(anim, taskView, apps, wallpaper, nonApps,
+                    true /* launcherClosing */, mActivity.getStateManager(), this,
                     getDepthController());
         }
         anim.start();
-- 
GitLab


From 2be425b6b09ff15bc6639da8597836f2be2dfc4f Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Fri, 25 Jun 2021 10:33:20 -0700
Subject: [PATCH 1505/1664] Fix folder icon text alignment.

- We set the parent view padding to be cellYPadding, so we no longer need to
  account for it when setting the text LayoutParams.

Bug: 191954558
Test: grid where scalableGrid=true and scalableGrid=false (4x5, and 5x5)
Change-Id: I8d7578b2589f801ceef229b663446d868d135ad0
---
 src/com/android/launcher3/folder/FolderIcon.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java
index 25a01414d2..e704957d32 100644
--- a/src/com/android/launcher3/folder/FolderIcon.java
+++ b/src/com/android/launcher3/folder/FolderIcon.java
@@ -196,7 +196,7 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
         icon.mFolderName.setText(folderInfo.title);
         icon.mFolderName.setCompoundDrawablePadding(0);
         FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) icon.mFolderName.getLayoutParams();
-        lp.topMargin = grid.cellYPaddingPx + grid.iconSizePx + grid.iconDrawablePaddingPx;
+        lp.topMargin = grid.iconSizePx + grid.iconDrawablePaddingPx;
 
         icon.setTag(folderInfo);
         icon.setOnClickListener(ItemClickHandler.INSTANCE);
-- 
GitLab


From 9617332f6087fe68852de8e1bc15ad1321b5e952 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Fri, 25 Jun 2021 11:43:01 -0700
Subject: [PATCH 1506/1664] Remove expensive logging.

Removed expensive logs added for debugging. Removed unused code.

Fixes: 168788486
Test: none
Change-Id: I0579275633361d2d67399c773e6376af74c9f1b1
---
 .../model/AddWorkspaceItemsTask.java          |  9 ------
 .../launcher3/pm/InstallSessionHelper.java    | 29 +------------------
 src/com/android/launcher3/util/IOUtils.java   |  8 -----
 3 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/src/com/android/launcher3/model/AddWorkspaceItemsTask.java b/src/com/android/launcher3/model/AddWorkspaceItemsTask.java
index 365cab1a4e..01b3e6e3ba 100644
--- a/src/com/android/launcher3/model/AddWorkspaceItemsTask.java
+++ b/src/com/android/launcher3/model/AddWorkspaceItemsTask.java
@@ -32,13 +32,11 @@ import com.android.launcher3.model.BgDataModel.Callbacks;
 import com.android.launcher3.model.data.AppInfo;
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
-import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pm.InstallSessionHelper;
 import com.android.launcher3.pm.PackageInstallInfo;
 import com.android.launcher3.util.GridOccupancy;
-import com.android.launcher3.util.IOUtils;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.PackageManagerHelper;
 
@@ -182,13 +180,6 @@ public class AddWorkspaceItemsTask extends BaseModelUpdateTask {
 
                 // log bitmap and label
                 FileLog.d(LOG, "Adding item info to workspace: " + itemInfo);
-                if (itemInfo instanceof ItemInfoWithIcon) {
-                    ItemInfoWithIcon infoWithIcon = (ItemInfoWithIcon) itemInfo;
-
-                    FileLog.d(LOG, "Item info icon base 64 string: "
-                            + infoWithIcon.bitmap.icon == null
-                            ? "null" : IOUtils.toBase64String(infoWithIcon.bitmap.icon));
-                }
             }
         }
 
diff --git a/src/com/android/launcher3/pm/InstallSessionHelper.java b/src/com/android/launcher3/pm/InstallSessionHelper.java
index 2bd9ba0037..ab35bd6175 100644
--- a/src/com/android/launcher3/pm/InstallSessionHelper.java
+++ b/src/com/android/launcher3/pm/InstallSessionHelper.java
@@ -25,7 +25,6 @@ import android.content.pm.LauncherApps;
 import android.content.pm.PackageInstaller;
 import android.content.pm.PackageInstaller.SessionInfo;
 import android.content.pm.PackageManager;
-import android.graphics.Bitmap;
 import android.os.Build;
 import android.os.Process;
 import android.os.UserHandle;
@@ -41,7 +40,6 @@ import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.logging.FileLog;
 import com.android.launcher3.model.ItemInstallQueue;
-import com.android.launcher3.util.IOUtils;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.IntSet;
 import com.android.launcher3.util.MainThreadInitializedObject;
@@ -231,37 +229,12 @@ public class InstallSessionHelper {
     }
 
     public boolean verifySessionInfo(PackageInstaller.SessionInfo sessionInfo) {
-        boolean validSessionInfo = verify(sessionInfo) != null
+        return verify(sessionInfo) != null
                 && sessionInfo.getInstallReason() == PackageManager.INSTALL_REASON_USER
                 && sessionInfo.getAppIcon() != null
                 && !TextUtils.isEmpty(sessionInfo.getAppLabel())
                 && !new PackageManagerHelper(mAppContext).isAppInstalled(
                         sessionInfo.getAppPackageName(), getUserHandle(sessionInfo));
-
-        if (sessionInfo != null) {
-            Bitmap appIcon = sessionInfo.getAppIcon();
-
-            if (Utilities.IS_DEBUG_DEVICE) {
-                FileLog.d(LOG, String.format(
-                        "Verifying session info. Valid: %b,"
-                                + " Session verified: %b,"
-                                + " Install reason valid: %b,"
-                                + " App icon: %s,"
-                                + " App label: %s,"
-                                + " App installed: %b.",
-                        validSessionInfo,
-                        verify(sessionInfo) != null,
-                        sessionInfo.getInstallReason() == PackageManager.INSTALL_REASON_USER,
-                        appIcon == null ? "null" : IOUtils.toBase64String(appIcon),
-                        sessionInfo.getAppLabel(),
-                        new PackageManagerHelper(mAppContext).isAppInstalled(
-                                sessionInfo.getAppPackageName(), getUserHandle(sessionInfo))));
-            }
-        } else {
-            FileLog.d(LOG, "Verifying session info failed: session info null.");
-        }
-
-        return validSessionInfo;
     }
 
     public InstallSessionTracker registerInstallTracker(InstallSessionTracker.Callback callback) {
diff --git a/src/com/android/launcher3/util/IOUtils.java b/src/com/android/launcher3/util/IOUtils.java
index d7fa9050f2..1cec0ecc10 100644
--- a/src/com/android/launcher3/util/IOUtils.java
+++ b/src/com/android/launcher3/util/IOUtils.java
@@ -16,9 +16,7 @@
 
 package com.android.launcher3.util;
 
-import android.graphics.Bitmap;
 import android.os.FileUtils;
-import android.util.Base64;
 import android.util.Log;
 
 import com.android.launcher3.Utilities;
@@ -52,12 +50,6 @@ public class IOUtils {
         return out.toByteArray();
     }
 
-    public static String toBase64String(Bitmap bitmap) {
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        bitmap.compress(Bitmap.CompressFormat.PNG, 100, outputStream);
-        return Base64.encodeToString(outputStream.toByteArray(), Base64.DEFAULT);
-    }
-
     public static long copy(InputStream from, OutputStream to) throws IOException {
         if (Utilities.ATLEAST_Q) {
             return FileUtils.copy(from, to);
-- 
GitLab


From 420ba54dee386cbf563940e81a24aff782d7a124 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 24 Jun 2021 14:02:26 -0700
Subject: [PATCH 1507/1664] Improving hierarchy dump for test failure

Bug: 192003777
Test: Manual
Change-Id: I3223a14cd88beddd76ecae0ae37c6fdce0752bef
---
 .../launcher3/util/rule/FailureWatcher.java   | 72 +++++++++++--------
 1 file changed, 41 insertions(+), 31 deletions(-)

diff --git a/tests/src/com/android/launcher3/util/rule/FailureWatcher.java b/tests/src/com/android/launcher3/util/rule/FailureWatcher.java
index 4c4794789e..dc59bddabd 100644
--- a/tests/src/com/android/launcher3/util/rule/FailureWatcher.java
+++ b/tests/src/com/android/launcher3/util/rule/FailureWatcher.java
@@ -2,6 +2,8 @@ package com.android.launcher3.util.rule;
 
 import static androidx.test.InstrumentationRegistry.getInstrumentation;
 
+import android.os.FileUtils;
+import android.os.ParcelFileDescriptor.AutoCloseInputStream;
 import android.util.Log;
 
 import androidx.test.uiautomator.UiDevice;
@@ -12,9 +14,12 @@ import com.android.launcher3.ui.AbstractLauncherUiTest;
 import org.junit.rules.TestWatcher;
 import org.junit.runner.Description;
 
-import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 
 public class FailureWatcher extends TestWatcher {
     private static final String TAG = "FailureWatcher";
@@ -26,20 +31,6 @@ public class FailureWatcher extends TestWatcher {
         mLauncher = launcher;
     }
 
-    private static void dumpViewHierarchy(UiDevice device) {
-        final ByteArrayOutputStream stream = new ByteArrayOutputStream();
-        try {
-            device.dumpWindowHierarchy(stream);
-            stream.flush();
-            stream.close();
-            for (String line : stream.toString().split("\\r?\\n")) {
-                Log.e(TAG, line.trim());
-            }
-        } catch (IOException e) {
-            Log.e(TAG, "error dumping XML to logcat", e);
-        }
-    }
-
     @Override
     protected void succeeded(Description description) {
         super.succeeded(description);
@@ -53,22 +44,41 @@ public class FailureWatcher extends TestWatcher {
 
     public static void onError(UiDevice device, Description description, Throwable e) {
         if (device == null) return;
-        final String pathname = getInstrumentation().getTargetContext().
-                getFilesDir().getPath() + "/TestScreenshot-" + description.getMethodName()
-                + ".png";
-        Log.e(TAG, "Failed test " + description.getMethodName() +
-                ", screenshot will be saved to " + pathname +
-                ", track trace is below, UI object dump is further below:\n" +
-                Log.getStackTraceString(e));
-        dumpViewHierarchy(device);
-
-        try {
-            final String dumpsysResult = device.executeShellCommand(
-                    "dumpsys activity service TouchInteractionService");
-            Log.d(TAG, "TouchInteractionService: " + dumpsysResult);
-        } catch (IOException ex) {
-        }
+        final File parentFile = getInstrumentation().getTargetContext().getFilesDir();
+        final File sceenshot = new File(parentFile,
+                "TestScreenshot-" + description.getMethodName() + ".png");
+        final File hierarchy = new File(parentFile,
+                "Hierarchy-" + description.getMethodName() + ".zip");
+
+        // Dump window hierarchy
+        try (ZipOutputStream out = new ZipOutputStream(new FileOutputStream(hierarchy))) {
+            out.putNextEntry(new ZipEntry("bugreport.txt"));
+            dumpStringCommand("dumpsys window windows", out);
+            dumpStringCommand("dumpsys package", out);
+            dumpStringCommand("dumpsys activity service TouchInteractionService", out);
+            out.closeEntry();
+
+            out.putNextEntry(new ZipEntry("visible_windows.zip"));
+            dumpCommand("cmd window dump-visible-window-views", out);
+            out.closeEntry();
+        } catch (IOException ex) { }
 
-        device.takeScreenshot(new File(pathname));
+        Log.e(TAG, "Failed test " + description.getMethodName()
+                + ",\nscreenshot will be saved to " + sceenshot
+                + ",\nUI dump at: " + hierarchy
+                + " (use go/web-hv to open the dump file)", e);
+        device.takeScreenshot(sceenshot);
+    }
+
+    private static void dumpStringCommand(String cmd, OutputStream out) throws IOException {
+        out.write(("\n\n" + cmd + "\n").getBytes());
+        dumpCommand(cmd, out);
+    }
+
+    private static void dumpCommand(String cmd, OutputStream out) throws IOException {
+        try (AutoCloseInputStream in = new AutoCloseInputStream(getInstrumentation()
+                .getUiAutomation().executeShellCommand(cmd))) {
+            FileUtils.copy(in, out);
+        }
     }
 }
-- 
GitLab


From ef252d85ad582ab759c6167868e3e4d0a90c1a22 Mon Sep 17 00:00:00 2001
From: zakcohen <zakcohen@google.com>
Date: Fri, 25 Jun 2021 10:27:32 -0700
Subject: [PATCH 1508/1664] Make OverviewActions tests more robust, wait for
 enabled

Wait for buttons to be enabled before trying to click on them.

Bug: 192006530
Test: TaplTestQuickstep
Change-Id: I80e050dcd93b8aae195677f2cd1fed3b53682581
---
 .../launcher3/tapl/LauncherInstrumentation.java       | 11 +++++++++++
 .../com/android/launcher3/tapl/OverviewActions.java   |  1 +
 2 files changed, 12 insertions(+)

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index af3617529a..05ccf2e620 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -926,6 +926,16 @@ public final class LauncherInstrumentation {
         }
     }
 
+    void waitForObjectEnabled(UiObject2 object, String waitReason) {
+        try {
+            assertTrue("Timed out waiting for object to be enabled for " + waitReason + " "
+                    + object.getResourceName(),
+                    object.wait(Until.enabled(true), WAIT_TIME_MS));
+        } catch (StaleObjectException e) {
+            fail("The object disappeared from screen");
+        }
+    }
+
     @NonNull
     UiObject2 waitForObjectInContainer(UiObject2 container, BySelector selector) {
         try {
@@ -1072,6 +1082,7 @@ public final class LauncherInstrumentation {
     }
 
     void clickLauncherObject(UiObject2 object) {
+        waitForObjectEnabled(object, "clickLauncherObject");
         expectEvent(TestProtocol.SEQUENCE_MAIN, LauncherInstrumentation.EVENT_TOUCH_DOWN);
         expectEvent(TestProtocol.SEQUENCE_MAIN, LauncherInstrumentation.EVENT_TOUCH_UP);
         if (!isLauncher3() && getNavigationModel() != NavigationModel.THREE_BUTTON) {
diff --git a/tests/tapl/com/android/launcher3/tapl/OverviewActions.java b/tests/tapl/com/android/launcher3/tapl/OverviewActions.java
index e3e0f4209d..950c052636 100644
--- a/tests/tapl/com/android/launcher3/tapl/OverviewActions.java
+++ b/tests/tapl/com/android/launcher3/tapl/OverviewActions.java
@@ -64,6 +64,7 @@ public class OverviewActions {
                      "want to click screenshot button and exit screenshot ui")) {
             UiObject2 screenshot = mLauncher.waitForObjectInContainer(mOverviewActions,
                     "action_screenshot");
+
             mLauncher.clickLauncherObject(screenshot);
             try (LauncherInstrumentation.Closable c1 = mLauncher.addContextLayer(
                     "clicked screenshot button")) {
-- 
GitLab


From 85a84e52cc4eb4f2c07804c9ff4bbe09da92048d Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 25 Jun 2021 12:36:22 -0700
Subject: [PATCH 1509/1664] Enabling screen record for some flaky tests

Bug: 187080582
Bug: 192005114
Bug: 192018189
Bug: 192010616
Test: Manual
Change-Id: I32fc0e4c9848c4def1aa6254139579bc631862cc
---
 .../launcher3/ui/AbstractLauncherUiTest.java  |  4 +
 .../launcher3/ui/TaplTestsLauncher3.java      |  2 +
 .../ui/widget/RequestPinItemTest.java         |  3 +
 .../launcher3/util/rule/ScreenRecordRule.java | 82 +++++++++++++++++++
 4 files changed, 91 insertions(+)
 create mode 100644 tests/src/com/android/launcher3/util/rule/ScreenRecordRule.java

diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index 2712bc02ce..bf4eba0f64 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -65,6 +65,7 @@ import com.android.launcher3.util.PackageManagerHelper;
 import com.android.launcher3.util.Wait;
 import com.android.launcher3.util.rule.FailureWatcher;
 import com.android.launcher3.util.rule.LauncherActivityRule;
+import com.android.launcher3.util.rule.ScreenRecordRule;
 import com.android.launcher3.util.rule.ShellCommandRule;
 import com.android.launcher3.util.rule.TestStabilityRule;
 
@@ -204,6 +205,9 @@ public abstract class AbstractLauncherUiTest {
     public ShellCommandRule mDisableHeadsUpNotification =
             ShellCommandRule.disableHeadsUpNotification();
 
+    @Rule
+    public ScreenRecordRule mScreenRecordRule = new ScreenRecordRule();
+
     protected void clearPackageData(String pkg) throws IOException, InterruptedException {
         final CountDownLatch count = new CountDownLatch(2);
         final BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
index 06bc26a2a2..4dd44f4193 100644
--- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
+++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
@@ -36,6 +36,7 @@ import com.android.launcher3.tapl.AppIconMenu;
 import com.android.launcher3.tapl.AppIconMenuItem;
 import com.android.launcher3.tapl.Widgets;
 import com.android.launcher3.tapl.Workspace;
+import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord;
 import com.android.launcher3.views.OptionsPopupView;
 import com.android.launcher3.widget.picker.WidgetsFullSheet;
 import com.android.launcher3.widget.picker.WidgetsRecyclerView;
@@ -92,6 +93,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
     }
 
     @Test
+    @ScreenRecord //b/187080582
     public void testDevicePressMenu() throws Exception {
         mDevice.pressMenu();
         mDevice.waitForIdle();
diff --git a/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java b/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java
index 822fefc208..745dc220ba 100644
--- a/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java
+++ b/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java
@@ -42,6 +42,7 @@ import com.android.launcher3.testcomponent.RequestPinItemActivity;
 import com.android.launcher3.ui.AbstractLauncherUiTest;
 import com.android.launcher3.util.Wait;
 import com.android.launcher3.util.Wait.Condition;
+import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord;
 import com.android.launcher3.util.rule.ShellCommandRule;
 
 import org.junit.Before;
@@ -77,6 +78,7 @@ public class RequestPinItemTest extends AbstractLauncherUiTest {
     public void testEmpty() throws Throwable { /* needed while the broken tests are being fixed */ }
 
     @Test
+    @ScreenRecord  //b/192010616
     public void testPinWidgetNoConfig() throws Throwable {
         runTest("pinWidgetNoConfig", true, (info, view) -> info instanceof LauncherAppWidgetInfo &&
                 ((LauncherAppWidgetInfo) info).appWidgetId == mAppWidgetId &&
@@ -85,6 +87,7 @@ public class RequestPinItemTest extends AbstractLauncherUiTest {
     }
 
     @Test
+    @ScreenRecord  //b/192005114
     public void testPinWidgetNoConfig_customPreview() throws Throwable {
         // Command to set custom preview
         Intent command = RequestPinItemActivity.getCommandIntent(
diff --git a/tests/src/com/android/launcher3/util/rule/ScreenRecordRule.java b/tests/src/com/android/launcher3/util/rule/ScreenRecordRule.java
new file mode 100644
index 0000000000..00b1cdd35e
--- /dev/null
+++ b/tests/src/com/android/launcher3/util/rule/ScreenRecordRule.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher3.util.rule;
+
+import static androidx.test.InstrumentationRegistry.getInstrumentation;
+
+import android.app.Instrumentation;
+import android.app.UiAutomation;
+import android.os.ParcelFileDescriptor;
+import android.util.Log;
+
+import androidx.test.uiautomator.UiDevice;
+
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+import java.io.File;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Rule which captures a screen record for a test.
+ * After adding this rule to the test class, apply the annotation @ScreenRecord to individual tests
+ */
+public class ScreenRecordRule implements TestRule {
+
+    private static final String TAG = "ScreenRecordRule";
+
+    @Override
+    public Statement apply(Statement base, Description description) {
+        if (description.getAnnotation(ScreenRecord.class) == null) {
+            return base;
+        }
+
+        return new Statement() {
+            @Override
+            public void evaluate() throws Throwable {
+                Instrumentation inst = getInstrumentation();
+                UiAutomation automation = inst.getUiAutomation();
+                UiDevice device = UiDevice.getInstance(inst);
+
+                File outputFile = new File(inst.getTargetContext().getFilesDir(),
+                        "screenrecord-" + description.getMethodName() + ".mp4");
+                device.executeShellCommand("killall screenrecord");
+                ParcelFileDescriptor output =
+                        automation.executeShellCommand("screenrecord " + outputFile);
+                String screenRecordPid = device.executeShellCommand("pidof screenrecord");
+                try {
+                    base.evaluate();
+                } finally {
+                    device.executeShellCommand("kill -INT " + screenRecordPid);
+                    Log.e(TAG, "Screenrecord captured at: " + outputFile);
+                    output.close();
+                }
+            }
+        };
+    }
+
+    /**
+     * Interface to indicate that the test should capture screenrecord
+     */
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    public @interface ScreenRecord { }
+}
-- 
GitLab


From 58f49418ff0944c9aa78e79742c653f6d874b399 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Sun, 27 Jun 2021 22:20:54 -0700
Subject: [PATCH 1510/1664] RecyclerView Scrollbar is easier to target

Bug: 191666122
Test: manual

TL;DR;;
1) Allow some x offset when determining touch points are hitting the track
2) reduce the timeout to consider dragging state

Change-Id: Iebcbbbd1e50b602119795c57fc04c4c2a5ccdde5
---
 .../views/RecyclerViewFastScroller.java       | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/views/RecyclerViewFastScroller.java b/src/com/android/launcher3/views/RecyclerViewFastScroller.java
index 78916acd16..a88b8b7776 100644
--- a/src/com/android/launcher3/views/RecyclerViewFastScroller.java
+++ b/src/com/android/launcher3/views/RecyclerViewFastScroller.java
@@ -18,6 +18,8 @@ package com.android.launcher3.views;
 
 import static android.view.HapticFeedbackConstants.CLOCK_TICK;
 
+import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE;
+
 import android.animation.ObjectAnimator;
 import android.content.Context;
 import android.content.res.Resources;
@@ -30,6 +32,7 @@ import android.graphics.Rect;
 import android.graphics.RectF;
 import android.os.Build;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.util.Property;
 import android.view.MotionEvent;
 import android.view.View;
@@ -54,9 +57,14 @@ import java.util.List;
  * The track and scrollbar that shows when you scroll the list.
  */
 public class RecyclerViewFastScroller extends View {
-
-    private static final int FASTSCROLL_THRESHOLD_MILLIS = 200;
+    private static final String TAG = "RecyclerViewFastScroller";
+    private static final boolean DEBUG = false;
+    private static final int FASTSCROLL_THRESHOLD_MILLIS = 40;
     private static final int SCROLL_DELTA_THRESHOLD_DP = 4;
+
+    // Track is very narrow to target and correctly. This is especially the case if a user is
+    // using a hardware case. Even if x is offset by following amount, we consider it to be valid.
+    private static final int SCROLLBAR_LEFT_OFFSET_TOUCH_DELEGATE_DP = 5;
     private static final Rect sTempRect = new Rect();
 
     private static final Property<RecyclerViewFastScroller, Integer> TRACK_WIDTH =
@@ -86,6 +94,7 @@ public class RecyclerViewFastScroller extends View {
     /** Keeps the last known scrolling delta/velocity along y-axis. */
     private int mDy = 0;
     private final float mDeltaThreshold;
+    private final float mScrollbarLeftOffsetTouchDelegate;
 
     private final ViewConfiguration mConfig;
 
@@ -157,6 +166,8 @@ public class RecyclerViewFastScroller extends View {
 
         mConfig = ViewConfiguration.get(context);
         mDeltaThreshold = res.getDisplayMetrics().density * SCROLL_DELTA_THRESHOLD_DP;
+        mScrollbarLeftOffsetTouchDelegate = res.getDisplayMetrics().density
+                * SCROLLBAR_LEFT_OFFSET_TOUCH_DELEGATE_DP;
 
         TypedArray ta =
                 context.obtainStyledAttributes(attrs, R.styleable.RecyclerViewFastScroller, defStyleAttr, 0);
@@ -239,6 +250,7 @@ public class RecyclerViewFastScroller extends View {
     public boolean handleTouchEvent(MotionEvent ev, Point offset) {
         int x = (int) ev.getX() - offset.x;
         int y = (int) ev.getY() - offset.y;
+
         switch (ev.getAction()) {
             case MotionEvent.ACTION_DOWN:
                 // Keep track of the down positions
@@ -247,7 +259,7 @@ public class RecyclerViewFastScroller extends View {
                 mDownTimeStampMillis = ev.getDownTime();
 
                 if ((Math.abs(mDy) < mDeltaThreshold &&
-                        mRv.getScrollState() != RecyclerView.SCROLL_STATE_IDLE)) {
+                        mRv.getScrollState() != SCROLL_STATE_IDLE)) {
                     // now the touch events are being passed to the {@link WidgetCell} until the
                     // touch sequence goes over the touch slop.
                     mRv.stopScroll();
@@ -293,6 +305,13 @@ public class RecyclerViewFastScroller extends View {
                 }
                 break;
         }
+        if (DEBUG) {
+            Log.d(TAG, (ev.getAction() == MotionEvent.ACTION_DOWN ? "\n" : "")
+                    + "handleTouchEvent " + MotionEvent.actionToString(ev.getAction())
+                    + " (" + x + "," + y + ")" + " isDragging=" + mIsDragging
+                    + " mIgnoreDragGesture=" + mIgnoreDragGesture);
+
+        }
         return mIsDragging;
     }
 
@@ -401,7 +420,8 @@ public class RecyclerViewFastScroller extends View {
      * Returns whether the specified x position is near the scroll bar.
      */
     public boolean isNearScrollBar(int x) {
-        return x >= (getWidth() - mMaxWidth) / 2 && x <= (getWidth() + mMaxWidth) / 2;
+        return x >= (getWidth() - mMaxWidth) / 2 - mScrollbarLeftOffsetTouchDelegate
+                && x <= (getWidth() + mMaxWidth) / 2;
     }
 
     private void animatePopupVisibility(boolean visible) {
-- 
GitLab


From 878dedfb842f7a58b7e06a8ddf5060a2520a4638 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Thu, 24 Jun 2021 22:06:59 -0700
Subject: [PATCH 1511/1664] Don't use ProxyActivity when launching from
 SearchActionItemInfo intent

Bug: 188490184
Test: Manual
Change-Id: I9b1b17dfb7e896025a01245414cdab11cf3125cb
---
 .../launcher3/model/data/SearchActionItemInfo.java       | 9 +++++++--
 src/com/android/launcher3/touch/ItemClickHandler.java    | 9 +--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/com/android/launcher3/model/data/SearchActionItemInfo.java b/src/com/android/launcher3/model/data/SearchActionItemInfo.java
index b3057d5bd2..7ca283ee0c 100644
--- a/src/com/android/launcher3/model/data/SearchActionItemInfo.java
+++ b/src/com/android/launcher3/model/data/SearchActionItemInfo.java
@@ -25,6 +25,7 @@ import android.os.UserHandle;
 
 import androidx.annotation.Nullable;
 
+import com.android.launcher3.Utilities;
 import com.android.launcher3.logger.LauncherAtom.ItemInfo;
 import com.android.launcher3.logger.LauncherAtom.SearchActionItem;
 
@@ -34,6 +35,7 @@ import com.android.launcher3.logger.LauncherAtom.SearchActionItem;
 public class SearchActionItemInfo extends ItemInfoWithIcon {
 
     public static final int FLAG_SHOULD_START = 1 << 1;
+    @Deprecated
     public static final int FLAG_SHOULD_START_FOR_RESULT = FLAG_SHOULD_START | 1 << 2;
     public static final int FLAG_BADGE_WITH_PACKAGE = 1 << 3;
     public static final int FLAG_PRIMARY_ICON_FROM_TITLE = 1 << 4;
@@ -89,10 +91,13 @@ public class SearchActionItemInfo extends ItemInfoWithIcon {
      * Setter for mIntent with assertion for null value mPendingIntent
      */
     public void setIntent(Intent intent) {
-        if (mPendingIntent != null && intent != null) {
+        if (mPendingIntent != null && intent != null && Utilities.IS_DEBUG_DEVICE) {
             throw new RuntimeException(
                     "SearchActionItemInfo can only have either an Intent or a PendingIntent");
         }
+        if (intent != null) {
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        }
         mIntent = intent;
     }
 
@@ -104,7 +109,7 @@ public class SearchActionItemInfo extends ItemInfoWithIcon {
      * Setter of mPendingIntent with assertion for null value mIntent
      */
     public void setPendingIntent(PendingIntent pendingIntent) {
-        if (mIntent != null && pendingIntent != null) {
+        if (mIntent != null && pendingIntent != null && Utilities.IS_DEBUG_DEVICE) {
             throw new RuntimeException(
                     "SearchActionItemInfo can only have either an Intent or a PendingIntent");
         }
diff --git a/src/com/android/launcher3/touch/ItemClickHandler.java b/src/com/android/launcher3/touch/ItemClickHandler.java
index b53f96eea3..408ba28e0a 100644
--- a/src/com/android/launcher3/touch/ItemClickHandler.java
+++ b/src/com/android/launcher3/touch/ItemClickHandler.java
@@ -262,19 +262,12 @@ public class ItemClickHandler {
      */
     public static void onClickSearchAction(Launcher launcher, SearchActionItemInfo itemInfo) {
         if (itemInfo.getIntent() != null) {
-            if (itemInfo.hasFlags(SearchActionItemInfo.FLAG_SHOULD_START_FOR_RESULT)) {
-                launcher.startActivityForResult(itemInfo.getIntent(), 0);
-            } else {
-                launcher.startActivity(itemInfo.getIntent());
-            }
+            launcher.startActivity(itemInfo.getIntent());
         } else if (itemInfo.getPendingIntent() != null) {
             try {
                 PendingIntent pendingIntent = itemInfo.getPendingIntent();
                 if (!itemInfo.hasFlags(SearchActionItemInfo.FLAG_SHOULD_START)) {
                     pendingIntent.send();
-                } else if (itemInfo.hasFlags(SearchActionItemInfo.FLAG_SHOULD_START_FOR_RESULT)) {
-                    launcher.startIntentSenderForResult(pendingIntent.getIntentSender(), 0, null, 0,
-                            0, 0);
                 } else {
                     launcher.startIntentSender(pendingIntent.getIntentSender(), null, 0, 0, 0);
                 }
-- 
GitLab


From fbe1836627f66fc768459d5e6463b6a677dc7b15 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 28 Jun 2021 12:29:35 +0100
Subject: [PATCH 1512/1664] Extract common measurement in widgets pickers to
 its base class

Bug: 191644950
Test: 1. Open the full widget picker. Observe the clock widgets'
         previews are shown properly. Then, rotate the screen and
         observe the clock widgets' previews are shown properly.
      2. Open the bottom widgets picker for clock. Observe the
         clock widgets' previews are shown properly. Then, rotate
         the screen and observe the clock widgets' previews are shown
         properly.
      3. Repeat 1, 2 after changing the system navigation from button
         to gesture.
Change-Id: I564fc2ce0baf3103ae77499380ad69ec38ac6930
---
 .../launcher3/widget/BaseWidgetSheet.java     | 35 +++++++++++-
 .../launcher3/widget/WidgetsBottomSheet.java  | 56 +++----------------
 .../widget/picker/WidgetsFullSheet.java       | 24 +-------
 3 files changed, 45 insertions(+), 70 deletions(-)

diff --git a/src/com/android/launcher3/widget/BaseWidgetSheet.java b/src/com/android/launcher3/widget/BaseWidgetSheet.java
index 3bf993e199..9f0b9d9b1f 100644
--- a/src/com/android/launcher3/widget/BaseWidgetSheet.java
+++ b/src/com/android/launcher3/widget/BaseWidgetSheet.java
@@ -24,11 +24,14 @@ import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
 import android.widget.Toast;
 
+import androidx.annotation.GuardedBy;
 import androidx.annotation.Nullable;
 import androidx.core.view.ViewCompat;
 
+import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.DragSource;
 import com.android.launcher3.DropTarget.DragObject;
+import com.android.launcher3.Insettable;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
@@ -47,10 +50,11 @@ import com.android.launcher3.views.ArrowTipView;
  */
 public abstract class BaseWidgetSheet extends AbstractSlideInView<Launcher>
         implements OnClickListener, OnLongClickListener, DragSource,
-        PopupDataProvider.PopupDataChangeListener {
+        PopupDataProvider.PopupDataChangeListener, Insettable {
 
     protected static final String KEY_WIDGETS_EDUCATION_TIP_SEEN =
             "launcher.widgets_education_tip_seen";
+    protected final Rect mInsets = new Rect();
 
     /* Touch handling related member variables. */
     private Toast mWidgetInstructionToast;
@@ -105,6 +109,35 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView<Launcher>
         return true;
     }
 
+    @Override
+    public void setInsets(Rect insets) {
+        mInsets.set(insets);
+    }
+
+
+    /**
+     * Measures the dimension of this view and its children by taking system insets, navigation bar,
+     * status bar, into account.
+     */
+    @GuardedBy("MainThread")
+    protected void doMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        DeviceProfile deviceProfile = mActivityContext.getDeviceProfile();
+        int widthUsed;
+        if (mInsets.bottom > 0) {
+            widthUsed = mInsets.left + mInsets.right;
+        } else {
+            Rect padding = deviceProfile.workspacePadding;
+            widthUsed = Math.max(padding.left + padding.right,
+                    2 * (mInsets.left + mInsets.right));
+        }
+
+        int heightUsed = mInsets.top + deviceProfile.edgeMarginPx;
+        measureChildWithMargins(mContent, widthMeasureSpec,
+                widthUsed, heightMeasureSpec, heightUsed);
+        setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec),
+                MeasureSpec.getSize(heightMeasureSpec));
+    }
+
     private boolean beginDraggingWidget(WidgetCell v) {
         // Get the widget preview as the drag representation
         WidgetImageView image = v.getWidgetView();
diff --git a/src/com/android/launcher3/widget/WidgetsBottomSheet.java b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
index 37b950d502..d7928c77b9 100644
--- a/src/com/android/launcher3/widget/WidgetsBottomSheet.java
+++ b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
@@ -23,7 +23,6 @@ import android.content.Context;
 import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.util.IntProperty;
-import android.util.Log;
 import android.util.Pair;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -36,10 +35,7 @@ import android.widget.TableLayout;
 import android.widget.TableRow;
 import android.widget.TextView;
 
-import androidx.annotation.GuardedBy;
-
 import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.Insettable;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.anim.PendingAnimation;
@@ -53,7 +49,7 @@ import java.util.List;
 /**
  * Bottom sheet for the "Widgets" system shortcut in the long-press popup.
  */
-public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
+public class WidgetsBottomSheet extends BaseWidgetSheet {
     private static final String TAG = "WidgetsBottomSheet";
 
     private static final IntProperty<View> PADDING_BOTTOM =
@@ -74,7 +70,6 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
     private static final long EDUCATION_TIP_DELAY_MS = 300;
 
     private ItemInfo mOriginalItemInfo;
-    private final Rect mInsets;
     private final int mMaxTableHeight;
     private int mMaxHorizontalSpan = 4;
 
@@ -114,7 +109,6 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
     public WidgetsBottomSheet(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         setWillNotDraw(false);
-        mInsets = new Rect();
         DeviceProfile deviceProfile = mActivityContext.getDeviceProfile();
         // Set the max table height to 2 / 3 of the grid height so that the bottom picker won't
         // take over the entire view vertically.
@@ -132,53 +126,20 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        if (doMeasure(widthMeasureSpec, heightMeasureSpec)) {
-            boolean hasUpdated = doMeasure(widthMeasureSpec, heightMeasureSpec);
-            if (hasUpdated) {
-                Log.w(TAG, "WidgetsBottomSheet dimension has been updated after a 2nd"
-                        + " measurement.");
-            }
+        doMeasure(widthMeasureSpec, heightMeasureSpec);
+        if (updateMaxSpansPerRow()) {
+            doMeasure(widthMeasureSpec, heightMeasureSpec);
         }
     }
 
-    /**
-     * Measures the dimension of this view and its children.
-     *
-     * <p>This function takes account of the following during measurement:
-     * <ol>
-     *     <li>status bar and system navigation bar insets</li>
-     *     <li>
-     *         number of spans that can fit in a row. This affects the number of widgets that can
-     *         fit in a row.
-     *     </li>
-     * </ol>
-     *
-     * @return {@code true} if the width or height of this view or its children have changed after
-     *          the measurement. Otherwise, returns {@code false}.
-     */
-    @GuardedBy("MainThread")
-    private boolean doMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        DeviceProfile deviceProfile = mActivityContext.getDeviceProfile();
-        int widthUsed;
-        if (mInsets.bottom > 0) {
-            widthUsed = mInsets.left + mInsets.right;
-        } else {
-            Rect padding = deviceProfile.workspacePadding;
-            widthUsed = Math.max(padding.left + padding.right,
-                    2 * (mInsets.left + mInsets.right));
-        }
-
-        int heightUsed = mInsets.top + deviceProfile.edgeMarginPx;
-        measureChildWithMargins(mContent, widthMeasureSpec,
-                widthUsed, heightMeasureSpec, heightUsed);
-        setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec),
-                MeasureSpec.getSize(heightMeasureSpec));
+    /** Returns {@code true} if the max spans have been updated. */
+    private boolean updateMaxSpansPerRow() {
+        if (getMeasuredWidth() == 0) return false;
 
         int paddingPx = 2 * getResources().getDimensionPixelOffset(
                 R.dimen.widget_cell_horizontal_padding);
         int maxHorizontalSpan = findViewById(R.id.widgets_table).getMeasuredWidth()
                 / (mActivityContext.getDeviceProfile().cellWidthPx + paddingPx);
-
         if (mMaxHorizontalSpan != maxHorizontalSpan) {
             // Ensure the table layout is showing widgets in the right column after measure.
             mMaxHorizontalSpan = maxHorizontalSpan;
@@ -297,7 +258,8 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
 
     @Override
     public void setInsets(Rect insets) {
-        mInsets.set(insets);
+        super.setInsets(insets);
+
         mContent.setPadding(mContent.getPaddingStart(),
                 mContent.getPaddingTop(), mContent.getPaddingEnd(), insets.bottom);
         if (insets.bottom > 0) {
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 0106ef5d5f..33f4e50219 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -45,8 +45,6 @@ import androidx.annotation.VisibleForTesting;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.Insettable;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
@@ -76,7 +74,7 @@ import java.util.stream.IntStream;
  * Popup for showing the full list of available widgets
  */
 public class WidgetsFullSheet extends BaseWidgetSheet
-        implements Insettable, ProviderChangedListener, OnActivePageChangedListener,
+        implements ProviderChangedListener, OnActivePageChangedListener,
         WidgetsRecyclerView.HeaderViewDimensionsProvider, SearchModeListener {
     private static final String TAG = WidgetsFullSheet.class.getSimpleName();
 
@@ -309,7 +307,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
 
     @Override
     public void setInsets(Rect insets) {
-        mInsets.set(insets);
+        super.setInsets(insets);
 
         setBottomPadding(mAdapters.get(AdapterHolder.PRIMARY).mWidgetsRecyclerView, insets.bottom);
         setBottomPadding(mAdapters.get(AdapterHolder.SEARCH).mWidgetsRecyclerView, insets.bottom);
@@ -351,24 +349,6 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         }
     }
 
-    private void doMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        DeviceProfile deviceProfile = mActivityContext.getDeviceProfile();
-        int widthUsed;
-        if (mInsets.bottom > 0) {
-            widthUsed = mInsets.left + mInsets.right;
-        } else {
-            Rect padding = deviceProfile.workspacePadding;
-            widthUsed = Math.max(padding.left + padding.right,
-                    2 * (mInsets.left + mInsets.right));
-        }
-
-        int heightUsed = mInsets.top + deviceProfile.edgeMarginPx;
-        measureChildWithMargins(mContent, widthMeasureSpec,
-                widthUsed, heightMeasureSpec, heightUsed);
-        setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec),
-                MeasureSpec.getSize(heightMeasureSpec));
-    }
-
     /** Returns {@code true} if the max spans have been updated. */
     private boolean updateMaxSpansPerRow() {
         if (getMeasuredWidth() == 0) return false;
-- 
GitLab


From 532d29f5b32439b8bb121d1ce92cd50039a9f419 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Mon, 28 Jun 2021 18:13:43 +0000
Subject: [PATCH 1513/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Idea1ccbcb39c781829567b172269b467d2dc4d41
---
 res/values-am/strings.xml        | 3 +--
 res/values-ar/strings.xml        | 3 +--
 res/values-as/strings.xml        | 3 +--
 res/values-b+sr+Latn/strings.xml | 3 +--
 res/values-be/strings.xml        | 5 ++---
 res/values-bg/strings.xml        | 3 +--
 res/values-bs/strings.xml        | 3 +--
 res/values-ca/strings.xml        | 3 +--
 res/values-cs/strings.xml        | 3 +--
 res/values-da/strings.xml        | 3 +--
 res/values-el/strings.xml        | 3 +--
 res/values-es-rUS/strings.xml    | 3 +--
 res/values-es/strings.xml        | 3 +--
 res/values-et/strings.xml        | 3 +--
 res/values-fa/strings.xml        | 3 +--
 res/values-fi/strings.xml        | 3 +--
 res/values-fr/strings.xml        | 3 +--
 res/values-gl/strings.xml        | 3 +--
 res/values-gu/strings.xml        | 6 ++----
 res/values-hi/strings.xml        | 3 +--
 res/values-hr/strings.xml        | 3 +--
 res/values-hu/strings.xml        | 3 +--
 res/values-hy/strings.xml        | 5 ++---
 res/values-in/strings.xml        | 3 +--
 res/values-is/strings.xml        | 3 +--
 res/values-it/strings.xml        | 3 +--
 res/values-iw/strings.xml        | 3 +--
 res/values-ja/strings.xml        | 3 +--
 res/values-km/strings.xml        | 3 +--
 res/values-kn/strings.xml        | 3 +--
 res/values-ko/strings.xml        | 3 +--
 res/values-lo/strings.xml        | 3 +--
 res/values-lt/strings.xml        | 3 +--
 res/values-lv/strings.xml        | 3 +--
 res/values-mk/strings.xml        | 3 +--
 res/values-ml/strings.xml        | 3 +--
 res/values-mn/strings.xml        | 3 +--
 res/values-mr/strings.xml        | 2 +-
 res/values-ms/strings.xml        | 3 +--
 res/values-my/strings.xml        | 3 +--
 res/values-nb/strings.xml        | 3 +--
 res/values-ne/strings.xml        | 3 +--
 res/values-nl/strings.xml        | 3 +--
 res/values-or/strings.xml        | 2 +-
 res/values-pl/strings.xml        | 2 +-
 res/values-pt-rPT/strings.xml    | 3 +--
 res/values-pt/strings.xml        | 3 +--
 res/values-ro/strings.xml        | 3 +--
 res/values-ru/strings.xml        | 3 +--
 res/values-si/strings.xml        | 3 +--
 res/values-sk/strings.xml        | 5 ++---
 res/values-sl/strings.xml        | 3 +--
 res/values-sr/strings.xml        | 3 +--
 res/values-sv/strings.xml        | 3 +--
 res/values-sw/strings.xml        | 3 +--
 res/values-ta/strings.xml        | 3 +--
 res/values-te/strings.xml        | 6 ++----
 res/values-th/strings.xml        | 5 ++---
 res/values-tl/strings.xml        | 3 +--
 res/values-tr/strings.xml        | 3 +--
 res/values-uk/strings.xml        | 3 +--
 res/values-ur/strings.xml        | 3 +--
 res/values-uz/strings.xml        | 3 +--
 res/values-vi/strings.xml        | 3 +--
 res/values-zh-rCN/strings.xml    | 3 +--
 res/values-zh-rHK/strings.xml    | 3 +--
 res/values-zh-rTW/strings.xml    | 3 +--
 res/values-zu/strings.xml        | 3 +--
 68 files changed, 74 insertions(+), 141 deletions(-)

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 2f56a882c7..2eb69fb257 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"ማሳወቂያዎች"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"አቋራጭን ለማንቀሳቀስ ይንኩ እና ይያዙ"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"አቋራጭን ለማንቀሳቀስ ወይም ብጁ እርምጃዎችን ለመጠቀም ሁለቴ መታ ያድርጉ እና ይያዙ።"</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"በዚህ የመነሻ ማያ ገጽ ላይ ምንም ክፍል የለም"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"በተወዳጆች መሣቢያ ውስጥ ተጨማሪ ቦታ የለም"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"የመተግበሪያዎች ዝርዝር"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"የግል መተግበሪያዎች ዝርዝር"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 63c1e30d7b..efe361ef84 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -72,8 +72,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"الإشعارات"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"انقر مرتين مع تثبيت إصبعك لنقل اختصار."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"انقر مرتين مع تثبيت إصبعك لنقل اختصار أو استخدام الإجراءات المخصّصة."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"ما مِن مساحة على هذه الشاشة الرئيسية."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"لا يوجد المزيد من الحقول في علبة المفضلة"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"قائمة التطبيقات"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"قائمة التطبيقات الشخصية"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 7ecc9da037..f615a246a4 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"জাননীসমূহ"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"শ্বৰ্টকাট স্থানান্তৰ কৰিবলৈ দুবাৰ টিপি ধৰি ৰাখক।"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"কোনো শ্বৰ্টকাট স্থানান্তৰ কৰিবলৈ দুবাৰ টিপি ধৰি ৰাখক অথবা কাষ্টম কাৰ্য ব্যৱহাৰ কৰক।"</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"এই গৃহ স্ক্ৰীনত খালী ঠাই নাই"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"পছন্দৰ ট্ৰে\'ত আৰু বেছি ঠাই নাই"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"এপৰ সূচী"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"ব্যক্তিগত এপৰ তালিকা"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 50d052ab30..6ee49d9cd9 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -66,8 +66,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Obaveštenja"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Dvaput dodirnite i zadržite radi pomeranja prečice."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dvaput dodirnite i zadržite da biste pomerali prečicu ili koristite prilagođene radnje."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Nema prostora na ovom početnom ekranu"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Nema više prostora na traci Omiljeno"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista aplikacija"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista ličnih aplikacija"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index bdc2f196ba..93bdfa043a 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -68,8 +68,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Апавяшчэнні"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Націсніце і ўтрымлівайце ярлык для перамяшчэння."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Дакраніцеся двойчы і ўтрымлівайце, каб перамясціць ярлык або выкарыстоўваць спецыяльныя дзеянні."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"На гэтым Галоўным экране няма месца"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"У латку \"Абранае\" больш няма месца"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Спіс праграм"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Спіс персанальных праграм"</string>
@@ -80,7 +79,7 @@
     <string name="install_drop_target_label" msgid="2539096853673231757">"Усталяваць"</string>
     <string name="dismiss_prediction_label" msgid="3357562989568808658">"Не прапаноўваць праграму"</string>
     <string name="pin_prediction" msgid="4196423321649756498">"Замацаваць прапанаваную праграму"</string>
-    <string name="permlab_install_shortcut" msgid="5632423390354674437">"усталёўваць ярлыкі"</string>
+    <string name="permlab_install_shortcut" msgid="5632423390354674437">"Стварэнне ярлыкоў"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Дазваляе праграмам дадаваць ярлыкі без умяшання карыстальніка."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"счытваць налады і ярлыкі на Галоўнай старонцы"</string>
     <string name="permdesc_read_settings" msgid="5833423719057558387">"Дазваляе праграме счытваць налады і ярлыкі на Галоўнай старонцы."</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index f0c86c679d..575ec221f2 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Известия"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Докоснете и задръжте за преместване на пряк път."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Докоснете двукратно и задръжте за преместване на пряк път или използвайте персонализирани действия."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Няма място на този начален екран"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Няма повече място в областта с любимите"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Списък с приложения"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Списък с лични приложения"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index dc43c40cdf..3541cebc90 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -66,8 +66,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Obavještenja"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Dodirnite i zadržite da pomjerite prečicu."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dvaput dodirnite i zadržite da pomjerite prečicu ili da koristite prilagođene radnje."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Nema prostora na početnom ekranu"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Nema više prostora u ladici Omiljeno"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista aplikacija"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista ličnih aplikacija"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index f1860d40f3..b1f8843281 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notificacions"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Fes doble toc i mantén premut per moure una drecera."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Fes doble toc i mantén premut per moure una drecera o per utilitzar accions personalitzades."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"No queda espai en aquesta pantalla d\'inici"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"No hi ha més espai a la safata Preferits."</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Llista d\'aplicacions"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Llista d\'aplicacions personals"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 9b60c192f7..6b8f4f53f4 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -68,8 +68,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Oznámení"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Klepnutím a podržením přesunete zkratku."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dvojitým klepnutím a podržením přesunete zkratku, případně použijte vlastní akce."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Na této ploše není místo"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Na panelu Oblíbené položky již není místo."</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Seznam aplikací"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Seznam osobních aplikací"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 96ac1d14e5..7b34c032fb 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notifikationer"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Hold en genvej nede for at flytte den."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Tryk to gange, og hold en genvej nede for at flytte den eller bruge tilpassede handlinger."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Der er ikke ledig plads på startskærmen"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Der er ikke mere plads i bakken Favoritter"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Liste med apps"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Liste over personlige apps"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 14ff86040d..ffdc63c64c 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Ειδοποιήσεις"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Πατήστε παρατεταμένα για μετακίνηση συντόμευσης."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Πατήστε δύο φορές παρατεταμένα για μετακίνηση συντόμευσης ή χρήση προσαρμοσμένων ενεργειών."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Δεν υπάρχει χώρος σε αυτήν την αρχική οθόνη"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Δεν υπάρχει επιπλέον χώρος στην περιοχή Αγαπημένα"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Λίστα εφαρμογών"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Λίστα προσωπικών εφαρμογών"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index b8567155cb..15ab568eaf 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notificaciones"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Mantén presionado para mover un acceso directo."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Presiona dos veces y mantén presionado para mover un acceso directo o usar acciones personalizadas."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"No hay más espacio en esta pantalla principal"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"La bandeja de favoritos está llena."</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista de apps"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista de apps personales"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 83e49848ed..0619b39fb4 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notificaciones"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Mantén pulsado un acceso directo para moverlo."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Toca dos veces y mantén pulsado un acceso directo para moverlo o usar acciones personalizadas."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"No queda espacio en la pantalla de inicio"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"La bandeja de favoritos está completa"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista de aplicaciones"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista de aplicaciones personales"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 84100d4bde..7a91de258b 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Märguanded"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Otsetee teisaldamiseks puudutage ja hoidke all."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Otsetee teisaldamiseks või kohandatud toimingute kasutamiseks topeltpuudutage ja hoidke all."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Sellel avakuval pole ruumi"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Salves Lemmikud pole rohkem ruumi"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Rakenduste loend"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Isiklike rakenduste loend"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index c4fda9b10a..48e3c2c41a 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"اعلان‌ها"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"برای جابه‌جا کردن میان‌بر، لمس کنید و نگه دارید."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"برای جابه‌جا کردن میان‌بر یا استفاده از کنش‌های سفارشی، دوضربه بزنید و نگه دارید."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"فضای خالی در این صفحه اصلی وجود ندارد"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"فضای بیشتری در سینی موارد دلخواه وجود ندارد"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"فهرست برنامه‌ها"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"فهرست برنامه‌های شخصی"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 7d6e7a40fd..0e42836393 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Ilmoitukset"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Kosketa pitkään, niin voit siirtää pikakuvaketta."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Kaksoisnapauta ja paina pitkään, niin voit siirtää pikakuvaketta tai käyttää muokattuja toimintoja."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Tällä aloitusnäytöllä ei ole tilaa"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Suosikit-valikossa ei ole enää tilaa"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Sovellusluettelo"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Omat sovellukset ‑luettelo"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index d21389a97d..1391b43a9f 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notifications"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Appuyez de manière prolongée pour déplacer raccourci."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Appuyez deux fois et maintenez la pression pour déplacer un raccourci ou utiliser les actions personnalisées."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Pas d\'espace libre sur cet écran d\'accueil"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Plus d\'espace disponible dans la zone de favoris."</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Liste d\'applications"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Liste des applications personnelles"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 6608c2492d..4605e2f96a 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notificacións"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Mantén premido un atallo para movelo."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Toca dúas veces un atallo e manteno premido para movelo ou utiliza accións personalizadas."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Non queda espazo nesta pantalla de inicio"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Non hai máis espazo na bandexa de favoritos"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista de aplicacións"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista de aplicacións persoais"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 33070a7061..312fe0999e 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -46,10 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"વિજેટ્સ"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"શોધ"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"શોધ બૉક્સમાંથી ટેક્સ્ટ સાફ કરો"</string>
-    <!-- no translation found for no_widgets_available (4337693382501046170) -->
-    <skip />
-    <!-- no translation found for no_search_results (3787956167293097509) -->
-    <skip />
+    <string name="no_widgets_available" msgid="4337693382501046170">"વિજેટ અને શૉર્ટકટ ઉપલબ્ધ નથી"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"કોઈ વિજેટ અથવા શૉર્ટકટ મળ્યા નથી"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"વ્યક્તિગત"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ઑફિસ"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"વાતચીતો"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 1c7bbd816f..c5a62f0e58 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"सूचनाएं"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"किसी शॉर्टकट को एक से दूसरी जगह ले जाने के लिए, उसे दबाकर रखें."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"किसी शॉर्टकट को एक से दूसरी जगह ले जाने के लिए, उस पर दो बार टैप करके दबाकर रखें या पसंद के मुताबिक कार्रवाइयां इस्तेमाल करें."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"इस होम स्क्रीन पर जगह खाली नहीं है"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"पसंदीदा ट्रे में और जगह नहीं है"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ऐप्लिकेशन सूची"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"निजी ऐप्लिकेशन की सूची"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 7f2732481a..1d0566f13a 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -66,8 +66,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Obavijesti"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Dodirnite i zadržite da biste premjestili prečac."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dvaput dodirnite i zadržite pritisak da biste premjestili prečac ili upotrijebite prilagođene radnje."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Na ovom početnom zaslonu više nema mjesta"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Nema više prostora na traci Favoriti"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Popis aplikacija"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Popis osobnih aplikacija"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 6f9b8c4edc..0042ab93ae 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Értesítések"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Tartsa lenyomva a parancsikont az áthelyezéshez."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Parancsikon áthelyezéséhez koppintson duplán, és tartsa nyomva az ujját, vagy használjon egyéni műveleteket."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Nincs több hely ezen a kezdőképernyőn"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Nincs több hely a Kedvencek tálcán"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Alkalmazások listája"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Személyes alkalmazások listája"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 5bccfa4da1..239e186e01 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Ծանուցումներ"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Հպեք և պահեք՝ դյուրանցում տեղափոխելու համար։"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Կրկնակի հպեք և պահեք՝ դյուրանցում տեղափոխելու համար, կամ օգտվեք հատուկ գործողություններից։"</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Հիմնական էկրանին ազատ տեղ չկա"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Ընտրյալների ցուցակում այլևս ազատ տեղ չկա"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Հավելվածների ցանկ"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Անձնական հավելվածների ցանկ"</string>
@@ -76,7 +75,7 @@
     <string name="install_drop_target_label" msgid="2539096853673231757">"Տեղադրել"</string>
     <string name="dismiss_prediction_label" msgid="3357562989568808658">"Թաքցնել առաջարկը"</string>
     <string name="pin_prediction" msgid="4196423321649756498">"Ամրացնել առաջարկվող հավելվածը"</string>
-    <string name="permlab_install_shortcut" msgid="5632423390354674437">"տեղադրել դյուրանցումներ"</string>
+    <string name="permlab_install_shortcut" msgid="5632423390354674437">"Դյուրանցումների տեղադրում"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Ծրագրին թույլ է տալիս ավելացնել դյուրանցումներ՝ առանց օգտագործողի միջամտության:"</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"կարդալ հիմնաէջի կարգավորումներն ու դյուրանցումները"</string>
     <string name="permdesc_read_settings" msgid="5833423719057558387">"Ծրագրին թույլ է տալիս կարդալ հիմնաէջի կարգավորումներն ու դյուրանցումները:"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index a87e68a5f5..8125112434 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notifikasi"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Sentuh lama untuk memindahkan pintasan."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Ketuk dua kali &amp; tahan untuk memindahkan pintasan atau gunakan tindakan khusus."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Tidak ada ruang di Layar utama ini"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Tidak ada ruang tersisa di baki Favorit"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Daftar aplikasi"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Daftar aplikasi pribadi"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 96a0f550cc..ac0184616b 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Tilkynningar"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Haltu fingri á flýtileið til að færa hana."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Ýttu tvisvar og haltu fingri á flýtileið til að færa hana eða notaðu sérsniðnar aðgerðir."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Ekkert pláss á þessum heimaskjá"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Ekki meira pláss í bakka fyrir uppáhald"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Forritalisti"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Listi yfir eigin forrit"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 4ae23d870c..7bdaff0a37 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notifiche"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Tocca e tieni premuto per spostare una scorciatoia."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Tocca due volte e tieni premuto per spostare una scorciatoia o per usare le azioni personalizzate."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Non c\'è più spazio nella schermata Home"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Spazio esaurito nella barra dei Preferiti"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Elenco di app"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Elenco di app personali"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 4ba2599847..bc8656ab84 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -68,8 +68,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"התראות"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"כדי להעביר קיצור דרך למקום אחר יש לגעת ולא להרפות."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"כדי להעביר קיצור דרך למקום אחר או להשתמש בפעולות מותאמות אישית\' יש ללחוץ פעמיים ולא להרפות."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"אין מקום במסך הבית הזה"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"אין עוד מקום במגש המועדפים"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"רשימת אפליקציות"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"רשימת אפליקציות אישיות"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 700fc44377..cac513a473 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"通知"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"長押ししてショートカットを移動してください。"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ショートカットをダブルタップして長押ししながら移動するか、カスタム操作を使用してください。"</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"このホーム画面には空きスペースがありません"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"お気に入りトレイに空きスペースがありません"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"アプリのリスト"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"個人用アプリのリスト"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 48f968b8e7..cb886c1ee2 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"ការ​ជូនដំណឹង"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"ចុចឱ្យជាប់​ដើម្បីផ្លាស់ទី​ផ្លូវកាត់​។"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ចុចពីរដង រួចសង្កត់ឱ្យជាប់ ដើម្បីផ្លាស់ទី​ផ្លូវកាត់ ឬប្រើ​សកម្មភាព​តាមបំណង​។"</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"គ្មានកន្លែង​នៅលើ​អេក្រង់ដើមនេះទេ"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"គ្មាន​បន្ទប់​​ក្នុង​ថាស​និយម​ប្រើ"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"បញ្ជីកម្មវិធី"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"បញ្ជី​កម្មវិធី​ផ្ទាល់ខ្លួន"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index a40b5685b4..40aa013024 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"ಶಾರ್ಟ್‌ಕಟ್ ಸರಿಸಲು ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಹಿಡಿದುಕೊಳ್ಳಿ."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ಶಾರ್ಟ್‌ಕಟ್ ಸರಿಸಲು ಅಥವಾ ಕಸ್ಟಮ್ ಕ್ರಿಯೆಗಳನ್ನು ಬಳಸಲು ಡಬಲ್-ಟ್ಯಾಪ್ ಮಾಡಿ ಮತ್ತು ಹಿಡಿದುಕೊಳ್ಳಿ."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"ಈ ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿ ಸ್ಥಳಾವಾಕಾಶವಿಲ್ಲ"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ಮೆಚ್ಚಿನವುಗಳ ಟ್ರೇನಲ್ಲಿ ಹೆಚ್ಚಿನ ಸ್ಥಳಾವಕಾಶವಿಲ್ಲ"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಪಟ್ಟಿ"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"ವೈಯಕ್ತಿಕ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಪಟ್ಟಿ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index aba3f3dc54..4de5c2c74a 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"알림"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"길게 터치하여 바로가기를 이동하세요."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"두 번 탭한 다음 길게 터치하여 바로가기를 이동하거나 맞춤 작업을 사용하세요."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"홈 화면에 더 이상 공간이 없습니다."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"즐겨찾기 트레이에 더 이상 공간이 없습니다."</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"앱 목록"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"개인 앱 목록"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 9973fa513d..a38a07bbf9 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"ການແຈ້ງເຕືອນ"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"ແຕະຄ້າງໄວ້ເພື່ອຍ້າຍທາງລັດ."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ແຕະສອງເທື່ອຄ້າງໄວ້ເພື່ອຍ້າຍທາງລັດ ຫຼື ໃຊ້ຄຳສັ່ງກຳນົດເອງ."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"ບໍ່ມີບ່ອນຫວ່າງໃນໜ້າໂຮມສະກຣີນນີ້"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ບໍ່ມີບ່ອນຫວ່າງໃນຖາດສຳລັບເກັບສິ່ງທີ່ໃຊ້ເປັນປະຈຳ"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ລາຍຊື່ແອັບ"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"ລາຍຊື່ແອັບສ່ວນຕົວ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 314fcf4492..0984056807 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -68,8 +68,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Pranešimai"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Dukart pal. ir palaik., kad perk. spart. klavišą."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dukart palieskite ir palaikykite, kad perkeltumėte spartųjį klavišą ar naudotumėte tinkintus veiksmus."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Šiame pagrindiniame ekrane nebėra vietos"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Mėgstamiausių dėkle nebėra vietos"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Programų sąrašas"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Asmeninių programų sąrašas"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 916893f579..eb1eba053d 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -66,8 +66,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Paziņojumi"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Lai pārvietotu saīsni, pieskarieties un turiet."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Lai pārvietotu saīsni, uz tās veiciet dubultskārienu un turiet. Varat arī veikt pielāgotas darbības."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Šajā sākuma ekrānā nav vietas"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Izlases joslā vairs nav vietas."</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lietotņu saraksts"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Personīgo lietotņu saraksts"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 7ce9796205..4987cd5df9 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Известувања"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Допрете и задржете за да преместите кратенка."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Допрете двапати и задржете за да преместите кратенка или користете приспособени дејства."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Нема простор на почетниов екран"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Нема повеќе простор на лентата „Омилени“"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Список со апликации"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Список со лични апликации"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index faffb00022..c41d02e5f0 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"അറിയിപ്പുകൾ"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"കുറുക്കുവഴി നീക്കാൻ സ്‌പർശിച്ച് പിടിക്കുക."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"കുറുക്കുവഴി നീക്കാൻ ഡബിൾ ടാപ്പ് ചെയ്യൂ, ഹോൾഡ് ചെയ്യൂ അല്ലെങ്കിൽ ഇഷ്‌ടാനുസൃത പ്രവർത്തനങ്ങൾ ഉപയോഗിക്കൂ."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"ഈ ഹോം സ്ക്രീനിലിൽ ഇടമില്ല"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"പ്രിയപ്പെട്ടവയുടെ ട്രേയിൽ ഒഴിവൊന്നുമില്ല"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"അപ്ലിക്കേഷനുകളുടെ ലിസ്‌റ്റ്"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"വ്യക്തിഗത ആപ്പുകളുടെ ലിസ്റ്റ്"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 0216ae574d..35675d1d9c 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Мэдэгдэл"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Товчлолыг зөөхийн тулд хүрээд, удаан дарна уу."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Товчлолыг зөөх эсвэл захиалгат үйлдлийг ашиглахын тулд хоёр товшоод, удаан дарна уу."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Энэ үндсэн нүүрэнд зай байхгүй байна"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"\"Дуртай\" трей дээр өөр зай байхгүй байна"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Апп-н жагсаалт"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Хувийн аппын жагсаалт"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index e4634dd801..b973547dd9 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -159,7 +159,7 @@
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"कामाशी संबंधित ॲप्स ही बॅज केलेली असून तुमच्या IT ॲडमिनला दृश्यमान आहेत"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"समजले"</string>
     <string name="work_apps_paused_title" msgid="3040901117349444598">"कार्य ॲप्स थांबवली आहेत"</string>
-    <string name="work_apps_paused_body" msgid="261634750995824906">"तुमचे कामाशी संबंधित ॲप्स तुम्हाला सूचना पाठवू शकत नाहीत, तुमची बॅटरी वापरू शकत नाहीत किंवा तुमचे स्थान अ‍ॅक्सेस करू शकत नाहीत"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"तुमची कामाशी संबंधित ॲप्स तुम्हाला सूचना पाठवू शकत नाहीत, तुमची बॅटरी वापरू शकत नाहीत किंवा तुमचे स्थान अ‍ॅक्सेस करू शकत नाहीत"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"कामाशी संबंधित ॲप्स बंद आहेत. तुमचे कामाशी संबंधित ॲप्स तुम्हाला सूचना पाठवू शकत नाहीत, तुमची बॅटरी वापरू शकत नाहीत किंवा तुमचे स्थान अ‍ॅक्सेस करू शकत नाहीत"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Work apps ही बॅज केलेली असून तुमच्या IT ॲडमिनला दृश्यमान आहेत"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"समजले"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 3b200fda73..b1e0244f87 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Pemberitahuan"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Sentuh &amp; tahan untuk menggerakkan pintasan."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Ketik dua kali &amp; tahan untuk menggerakkan pintasan atau menggunakan tindakan tersuai."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Tiada ruang di skrin Utama ini"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Tiada ruang dalam dulang Kegemaran lagi"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Senarai apl"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Senarai apl peribadi"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 4077871d53..11e4fead98 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"အကြောင်းကြားချက်များ"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"ဖြတ်လမ်းလင့်ခ်ကို ရွှေ့ရန် နှစ်ချက်တို့ပြီး ဖိထားပါ။"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ဖြတ်လမ်းလင့်ခ်ကို ရွှေ့ရန် (သို့) စိတ်ကြိုက်လုပ်ဆောင်ချက်များကို သုံးရန် နှစ်ချက်တို့ပြီး ဖိထားပါ။"</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"ဤပင်မစာမျက်နှာတွင် နေရာလွတ် မရှိတော့ပါ"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"အနှစ်သက်ဆုံးများ ထားရာတွင် နေရာလွတ် မကျန်တော့ပါ"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"အက်ပ်စာရင်း"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"တစ်ကိုယ်ရေသုံး အက်ပ်စာရင်း"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 4be9caa2a8..a7931d0338 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Varsler"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Trykk og hold for å flytte en snarvei."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dobbelttrykk og hold for å flytte en snarvei eller bruke tilpassede handlinger."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Ingen ledig plass på denne startskjermen"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Favoritter-skuffen er full"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"App-liste"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Personlige apper-liste"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 3c21701b08..b36d400f1c 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"सूचनाहरू"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"कुनै सर्टकट सार्न डबल ट्याप गरेर छोइराख्नुहोस्।"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"कुनै सर्टकट सार्न वा आफ्नो रोजाइका कारबाही प्रयोग गर्न डबल ट्याप गरेर छोइराख्नुहोस्।"</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"यो होम स्क्रिनमा ठाउँ छैन"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"मन पर्ने ट्रे अब कुनै ठाँउ छैन"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"एपको सूची"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"व्यक्तिगत अनुप्रयोगहरूको सूची"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 5f8878b730..7b3d5953c6 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Meldingen"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Tik en houd vast om een snelkoppeling te verplaatsen."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dubbeltik en houd vast om een snelkoppeling te verplaatsen of aangepaste acties te gebruiken."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Er is geen ruimte op dit startscherm"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Geen ruimte meer in het vak \'Favorieten\'"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lijst met apps"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lijst met persoonlijke apps"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 3289e1ad25..638965dff9 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -78,7 +78,7 @@
     <string name="install_drop_target_label" msgid="2539096853673231757">"ଇନଷ୍ଟଲ୍‌ କରନ୍ତୁ"</string>
     <string name="dismiss_prediction_label" msgid="3357562989568808658">"ଆପ୍ ପରାମର୍ଶ ଦିଅନ୍ତୁ ନାହିଁ"</string>
     <string name="pin_prediction" msgid="4196423321649756498">"ପୂର୍ବାନୁମାନକୁ ପିନ୍ କରନ୍ତୁ"</string>
-    <string name="permlab_install_shortcut" msgid="5632423390354674437">"ଶର୍ଟକଟ୍‍ ଇନଷ୍ଟଲ୍‌ କରନ୍ତୁ"</string>
+    <string name="permlab_install_shortcut" msgid="5632423390354674437">"ସର୍ଟକଟ୍‍ ଇନଷ୍ଟଲ୍‌ କରନ୍ତୁ"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"ୟୁଜରଙ୍କ ବିନା ହସ୍ତକ୍ଷେପରେ ଶର୍ଟକଟ୍‌ ଯୋଡ଼ିବାକୁ ଆପକୁ ଅନୁମତି ଦିଏ।"</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"ହୋମ୍‌ ସେଟିଙ୍ଗ ଏବଂ ଶର୍ଟକଟ୍‌ ପଢ଼ନ୍ତୁ"</string>
     <string name="permdesc_read_settings" msgid="5833423719057558387">"ହୋମରେ ସେଟିଙ୍ଗ ପଢ଼ିବାକୁ ଆପ ଏବଂ ଶର୍ଟକଟକୁ ଅନୁମତି ଦିଏ।"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 3cfb569fe3..a6853e705f 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -80,7 +80,7 @@
     <string name="install_drop_target_label" msgid="2539096853673231757">"Zainstaluj"</string>
     <string name="dismiss_prediction_label" msgid="3357562989568808658">"Nie proponuj aplikacji"</string>
     <string name="pin_prediction" msgid="4196423321649756498">"Przypnij podpowiedź"</string>
-    <string name="permlab_install_shortcut" msgid="5632423390354674437">"instalowanie skrótów"</string>
+    <string name="permlab_install_shortcut" msgid="5632423390354674437">"Instalowanie skrótów"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Pozwala aplikacji dodawać skróty bez interwencji użytkownika."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"odczytywanie ustawień i skrótów na ekranie głównym"</string>
     <string name="permdesc_read_settings" msgid="5833423719057558387">"Pozwala aplikacji na odczytywanie ustawień i skrótów na ekranie głównym."</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 9aeecdc383..3141df6d95 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notificações"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Toque sem soltar para mover um atalho."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Toque duas vezes sem soltar para mover um atalho ou utilizar ações personalizadas."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Sem espaço neste ecrã principal."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Não existe mais espaço no tabuleiro de Favoritos"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista de aplicações"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista de aplicações pessoais"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 3dbf460762..c1c0e17d8e 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notificações"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Toque e mantenha a tela pressionada para mover um atalho."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Toque duas vezes e mantenha a tela pressionada para mover um atalho ou usar ações personalizadas."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Não há espaço nesta tela inicial"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Sem espaço na bandeja de favoritos"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista de apps"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista de apps pessoais"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index b9b3726644..3d8d46e7f9 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -66,8 +66,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notificări"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Atingeți și țineți apăsat pentru a muta comanda rapidă."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Atingeți de două ori și țineți apăsat pentru a muta o comandă rapidă sau folosiți acțiuni personalizate."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Nu este disponibilă nicio sală pe acest ecran de pornire"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Spațiu epuizat în bara Preferate"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista de aplicații"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista de aplicații personale"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index d5c0159762..c220cad80c 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -68,8 +68,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Уведомления"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Нажмите и удерживайте для переноса ярлыка."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Чтобы использовать специальные действия или перенести ярлык, нажмите на него дважды и удерживайте."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"На главном экране нет свободного места."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"В разделе \"Избранное\" больше нет места"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Список приложений"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Открыть список личных приложений"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index e32f16848a..90c9035b0f 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"දැනුම්දීම්"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"කෙටි මගක් ගෙන යාමට ස්පර්ශ කර අල්ලාගෙන සිටින්න."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"කෙටි මගක් ගෙන යාමට හෝ අභිරුචි ක්‍රියා භාවිත කිරීමට දෙවරක් තට්ටු කර අල්ලා ගෙන සිටින්න."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"මෙම මුල් තිරයේ ඉඩ නැත"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ප්‍රියතම දෑ ඇති තැටියේ තවත් ඉඩ නොමැත"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"යෙදුම් ලැයිස්තුව"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"පෞද්ගලික යෙදුම් ලැයිස්තුව"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index eb8ad30ff2..0830065e9a 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -68,8 +68,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Upozornenia"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Pridržaním presuňte skratku."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dvojitým klepnutím a pridržaním presuňte odkaz alebo použite vlastné akcie."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Na tejto ploche nie je miesto"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Na paneli Obľúbené položky už nie je miesto"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Zoznam aplikácií"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Zoznam osobných aplikácií"</string>
@@ -80,7 +79,7 @@
     <string name="install_drop_target_label" msgid="2539096853673231757">"Inštalovať"</string>
     <string name="dismiss_prediction_label" msgid="3357562989568808658">"Nenavrhovať aplikáciu"</string>
     <string name="pin_prediction" msgid="4196423321649756498">"Pripnúť predpoveď"</string>
-    <string name="permlab_install_shortcut" msgid="5632423390354674437">"inštalovať odkazy"</string>
+    <string name="permlab_install_shortcut" msgid="5632423390354674437">"inštalácia odkazov"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"Povoľuje aplikácii pridať odkazy bez zásahu používateľa."</string>
     <string name="permlab_read_settings" msgid="1941457408239617576">"čítanie nastavení a odkazov plochy"</string>
     <string name="permdesc_read_settings" msgid="5833423719057558387">"Povoľuje aplikácii čítať nastavenia a odkazy na ploche."</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 7f440f81af..86a85653fe 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -68,8 +68,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Obvestila"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Pridržite bližnjico, da jo premaknete."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dvakrat se dotaknite bližnjice in jo pridržite, da jo premaknete, ali pa uporabite dejanja po meri."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Na tem začetnem zaslonu ni prostora."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"V vrstici za priljubljene ni več prostora"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Seznam aplikacij"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Seznam osebnih aplikacij"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 797a2a0167..d701a114f5 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -66,8 +66,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Обавештења"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Двапут додирните и задржите ради померања пречице."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Двапут додирните и задржите да бисте померали пречицу или користите прилагођене радње."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Нема простора на овом почетном екрану"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Нема више простора на траци Омиљено"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Листа апликација"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Листа личних апликација"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 8fa1e0e287..681ddd06ba 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Aviseringar"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Tryck länge för att flytta en genväg."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Tryck snabbt två gånger och håll kvar för att flytta en genväg eller använda anpassade åtgärder."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Det finns inte plats på den här startskärmen."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Favoritfältet är fullt"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Applista"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Listan Personliga appar"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 1e7bf0747f..77106eb20d 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Arifa"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Gusa na ushikilie ili usogeze njia ya mkato."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Gusa mara mbili na ushikilie ili usogeze njia ya mkato au utumie vitendo maalum."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Hakuna nafasi kwenye Skrini hii ya kwanza"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Hakuna nafasi zaidi katika treya ya Vipendeleo"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Orodha ya programu"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Orodha ya programu za binafsi"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index b68ee1e6ee..168982c79d 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"அறிவிப்புகள்"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"ஷார்ட்கட்டை நகர்த்தத் தொட்டுப் பிடிக்கவும்."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ஷார்ட்கட்டை நகர்த்த இருமுறை தட்டிப் பிடிக்கவும் அல்லது பிரத்தியேகச் செயல்களைப் பயன்படுத்தவும்."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"இந்த முகப்புத் திரையில் இடமில்லை"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"பிடித்தவை ட்ரேயில் இடமில்லை"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ஆப்ஸின் பட்டியல்"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"தனிப்பட்ட ஆப்ஸ் பட்டியல்"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 7191c6c704..6ea2906ebf 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -46,10 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"విడ్జెట్‌లు"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"సెర్చ్ చేయండి"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"సెర్చ్ బాక్స్ నుండి టెక్స్ట్‌ను క్లియర్ చేయి"</string>
-    <!-- no translation found for no_widgets_available (4337693382501046170) -->
-    <skip />
-    <!-- no translation found for no_search_results (3787956167293097509) -->
-    <skip />
+    <string name="no_widgets_available" msgid="4337693382501046170">"విడ్జెట్‌లు, షార్ట్‌కట్‌లు అందుబాటులో లేవు"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"విడ్జెట్‌లు లేదా షార్ట్‌కట్‌లు కనుగొనబడలేదు"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"వ్యక్తిగత గ్యాడ్జెట్స్"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ఆఫీస్"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"సంభాషణలు"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index f42766cb68..f5d9fdc055 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"การแจ้งเตือน"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"แตะค้างไว้เพื่อย้ายทางลัด"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"แตะสองครั้งค้างไว้เพื่อย้ายทางลัดหรือใช้การดำเนินการที่กำหนดเอง"</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"ไม่มีที่ว่างในหน้าจอหลักนี้"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ไม่มีพื้นที่เหลือในถาดรายการโปรด"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"รายชื่อแอป"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"รายการแอปส่วนตัว"</string>
@@ -159,7 +158,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"โปรไฟล์งาน"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"แอปงานจะติดป้ายไว้และผู้ดูแลระบบไอทีจะมองเห็น"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"รับทราบ"</string>
-    <string name="work_apps_paused_title" msgid="3040901117349444598">"หยุดแอปงานไว้ชั่วคราว"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"แอปงานปิดอยู่"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"แอปงานจะส่งการแจ้งเตือน ใช้แบตเตอรี่ หรือเข้าถึงตำแหน่งของคุณไม่ได้"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"แอปงานปิดอยู่ แอปงานจะส่งการแจ้งเตือน ใช้แบตเตอรี่ หรือเข้าถึงตำแหน่งของคุณไม่ได้"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"แอปงานจะติดป้ายไว้และผู้ดูแลระบบไอทีจะมองเห็น"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 99b554c496..40d2f815e8 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Mga Notification"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Pindutin nang matagal para ilipat ang shortcut."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"I-double tap at pindutin nang matagal para ilipat ang shortcut o gumamit ng mga custom na pagkilos."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Walang espasyo sa Home screen na ito"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Wala nang lugar sa tray ng Mga Paborito"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Listahan ng mga app"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Listahan ng mga personal na app"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index a81a9cbc0a..6f6c47bad5 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Bildirimler"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Kısayolu taşımak için dokunup basılı tutun."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Kısayolu taşımak veya özel işlemleri kullanmak için iki kez dokunup basılı tutun."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Bu Ana ekranda yer yok"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Favoriler tepsisinde başka yer kalmadı"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Uygulamalar listesi"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Kişisel uygulamalar listesi"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index b60b50fb9f..b171a7647e 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -68,8 +68,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Сповіщення"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Натисніть і втримуйте, щоб перемістити ярлик."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Двічі натисніть і втримуйте ярлик, щоб перемістити його або виконати інші дії."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"На головному екрані немає місця"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"В області \"Вибране\" немає місця"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Список додатків"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Список особистих додатків"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 3353539b7d..07086b0aa5 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"اطلاعات"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"شارٹ کٹ منتقل کرنے کیلیے ٹچ کریں اور پکڑ کر رکھیں۔"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"شارٹ کٹ کو منتقل کرنے یا حسب ضرورت کارروائیاں استعمال کرنے کے لیے دوبار تھپتھپائیں اور پکڑ کر رکھیں۔"</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"اس ہوم اسکرین پر کوئی گنجائش نہیں ہے"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"پسندیدہ ٹرے میں مزید کوئی گنجائش نہیں ہے"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ایپس کی فہرست"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"ذاتی ایپس کی فہرست"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 635c83d243..cbdfae1aa1 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Bildirishnomalar"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Yorliqni bosib turgan holatda suring."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Ikki marta bosing va yorliqni bosib turgan holatda suring yoki maxsus amaldan foydalaning."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Bosh ekranda joy qolmadi."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Ajratilganlarda birorta ham xona yo‘q"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Ilovalar ro‘yxati"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Shaxsiy ilovalar ro‘yxati"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index c3e6ffd5e4..1b80cc7afc 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Thông báo"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Chạm và giữ để di chuyển một lối tắt."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Nhấn đúp và giữ để di chuyển một lối tắt hoặc sử dụng các thao tác tùy chỉnh."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Không còn khoảng trống trên Màn hình chính này"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Không còn chỗ trong khay Mục yêu thích"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Danh sách ứng dụng"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Danh sách ứng dụng cá nhân"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ac1955721b..477d1d59a2 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"通知"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"轻触并按住快捷方式即可移动该快捷方式。"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"点按两次并按住快捷方式即可移动该快捷方式或使用自定义操作。"</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"此主屏幕上已没有空间"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"收藏栏已满"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"应用列表"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"个人应用列表"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index b4287bb795..6b77042840 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"通知"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"輕觸並按住即可移動捷徑。"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"㩒兩下之後㩒住，就可以郁捷徑或者用自訂操作。"</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"這個主畫面已無空間"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"我的收藏寄存區沒有足夠空間"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"應用程式清單"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"個人應用程式清單"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 248a20c272..6a85bcc151 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"通知"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"按住即可移動捷徑。"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"輕觸兩下並按住即可移動捷徑或使用自訂操作。"</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"這個主畫面已無空間"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"「我的最愛」匣已無可用空間"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"應用程式清單"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"個人應用程式清單"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index eccd5564ad..ed5ce8bb93 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Izaziso"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Thinta uphinde ubambe ukuze uhambise isinqamuleli."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Thepha kabili uphinde ubambe ukuze uhambise isinqamuleli noma usebenzise izenzo ezingokwezifiso."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Asikho isikhala kulesi sikrini sasekhaya"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Asisekho isikhala kwitreyi lezintandokazi"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Uhlu lwezinhlelo zokusebenza"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Uhlu lwezinhlelo zokusebenza zomuntu siqu"</string>
-- 
GitLab


From 9d8580bd2a06705ce671ace1b5bc766fb8d7367a Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Mon, 28 Jun 2021 11:45:14 -0700
Subject: [PATCH 1514/1664] Reset DEPTH at the end of launch animations

This way the wallpaper won't be zoomed out if an app crashes.

Test: adb am crash <some test app>
Fixes: 191979512
Change-Id: I7576798f736d63c3e46bbac1b983b9d1a437647d
---
 .../src/com/android/launcher3/QuickstepTransitionManager.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 3b3f0bde8b..244bfc31c1 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -981,6 +981,9 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
             backgroundRadiusAnim.addListener(new AnimatorListenerAdapter() {
                 @Override
                 public void onAnimationEnd(Animator animation) {
+                    // Reset depth at the end of the launch animation, so the wallpaper won't be
+                    // zoomed out if an app crashes.
+                    DEPTH.setValue(depthController, 0f);
                     depthController.setSurface(null);
                     if (dimLayer != null) {
                         new SurfaceControl.Transaction()
-- 
GitLab


From f6b7b17fa3d5b15bae6d975050d58b32e4adecf6 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Mon, 28 Jun 2021 15:28:37 -0500
Subject: [PATCH 1515/1664] Update snackbar color

Bug: 184369338
Test: local
Change-Id: Id43b0957693d94236a3b6771b9ed881222c0e2b2
---
 src/com/android/launcher3/util/OnboardingPrefs.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/util/OnboardingPrefs.java b/src/com/android/launcher3/util/OnboardingPrefs.java
index c395d6ced3..40bc9c3abc 100644
--- a/src/com/android/launcher3/util/OnboardingPrefs.java
+++ b/src/com/android/launcher3/util/OnboardingPrefs.java
@@ -36,7 +36,7 @@ public class OnboardingPrefs<T extends Launcher> {
     public static final String HOME_BOUNCE_COUNT = "launcher.home_bounce_count";
     public static final String HOTSEAT_DISCOVERY_TIP_COUNT = "launcher.hotseat_discovery_tip_count";
     public static final String HOTSEAT_LONGPRESS_TIP_SEEN = "launcher.hotseat_longpress_tip_seen";
-    public static final String SEARCH_EDU_SEEN = "launcher.search_edu";
+    public static final String SEARCH_EDU_SEEN = "launcher.search_edu_seen";
     public static final String SEARCH_SNACKBAR_COUNT = "launcher.keyboard_snackbar_count";
 
     /**
-- 
GitLab


From 338bdd1f94d01c4d7514cb4d0adedbc0a57f1032 Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Fri, 25 Jun 2021 15:43:50 -0700
Subject: [PATCH 1516/1664] Polish auto-enter-pip from landscape and
 split-screen

- Use Builder for constructing SwipePipToHomeAnimator since the
  parameter list grows
- Use mHomeToWindowPositionMap to adjust the position, this is to fix
  the position issue when auto-enter-pip from split-screen
- The position map and its inverse does not seem to fit the case when
  auto-enter-pip from landscape, leave it as it is
- Setup the SwipePipToHomeAnimator the same way in
  createWindowAnimationToHome

Video: http://recall/-/aaaaaabFQoRHlzixHdtY/b1j4eK7BU18sOGfuDlKMFR
Bug: 190749305
Bug: 190855091
Test: manual, see video
Change-Id: Ica9ca9f43b8fd5f1898fef4c6d173502dd897872
---
 .../android/quickstep/AbsSwipeUpHandler.java  |  44 +++--
 .../util/SwipePipToHomeAnimator.java          | 153 ++++++++++++++----
 2 files changed, 150 insertions(+), 47 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 4d47ef15c1..8da2aaad16 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -60,6 +60,7 @@ import android.content.Intent;
 import android.graphics.Matrix;
 import android.graphics.PointF;
 import android.graphics.Rect;
+import android.graphics.RectF;
 import android.os.Build;
 import android.os.IBinder;
 import android.os.SystemClock;
@@ -1217,30 +1218,40 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         final RecentsOrientedState orientationState = mTaskViewSimulator.getOrientationState();
         final int windowRotation = orientationState.getDisplayRotation();
         final int homeRotation = orientationState.getRecentsActivityRotation();
+
+        final Matrix homeToWindowPositionMap = new Matrix();
+        final RectF startRect = updateProgressForStartRect(homeToWindowPositionMap, startProgress);
+        // Move the startRect to Launcher space as floatingIconView runs in Launcher
+        final Matrix windowToHomePositionMap = new Matrix();
+        homeToWindowPositionMap.invert(windowToHomePositionMap);
+        windowToHomePositionMap.mapRect(startRect);
+
         final Rect destinationBounds = SystemUiProxy.INSTANCE.get(mContext)
                 .startSwipePipToHome(taskInfo.topActivity,
                         TaskInfoCompat.getTopActivityInfo(taskInfo),
                         runningTaskTarget.taskInfo.pictureInPictureParams,
                         homeRotation,
                         mDp.hotseatBarSizePx);
-        final SwipePipToHomeAnimator swipePipToHomeAnimator = new SwipePipToHomeAnimator(
-                mContext,
-                runningTaskTarget.taskId,
-                taskInfo.topActivity,
-                runningTaskTarget.leash.getSurfaceControl(),
-                TaskInfoCompat.getPipSourceRectHint(
-                        runningTaskTarget.taskInfo.pictureInPictureParams),
-                TaskInfoCompat.getWindowConfigurationBounds(taskInfo),
-                updateProgressForStartRect(new Matrix(), startProgress),
-                destinationBounds,
-                mRecentsView.getPipCornerRadius(),
-                mRecentsView);
+        final SwipePipToHomeAnimator.Builder builder = new SwipePipToHomeAnimator.Builder()
+                .setContext(mContext)
+                .setTaskId(runningTaskTarget.taskId)
+                .setComponentName(taskInfo.topActivity)
+                .setLeash(runningTaskTarget.leash.getSurfaceControl())
+                .setSourceRectHint(TaskInfoCompat.getPipSourceRectHint(
+                        runningTaskTarget.taskInfo.pictureInPictureParams))
+                .setAppBounds(TaskInfoCompat.getWindowConfigurationBounds(taskInfo))
+                .setHomeToWindowPositionMap(homeToWindowPositionMap)
+                .setStartBounds(startRect)
+                .setDestinationBounds(destinationBounds)
+                .setCornerRadius(mRecentsView.getPipCornerRadius())
+                .setAttachedView(mRecentsView);
         // We would assume home and app window always in the same rotation While homeRotation
         // is not ROTATION_0 (which implies the rotation is turned on in launcher settings).
         if (homeRotation == ROTATION_0
                 && (windowRotation == ROTATION_90 || windowRotation == ROTATION_270)) {
-            swipePipToHomeAnimator.setFromRotation(mTaskViewSimulator, windowRotation);
+            builder.setFromRotation(mTaskViewSimulator, windowRotation);
         }
+        final SwipePipToHomeAnimator swipePipToHomeAnimator = builder.build();
         AnimatorPlaybackController activityAnimationToHome =
                 homeAnimFactory.createActivityAnimationToHome();
         swipePipToHomeAnimator.addAnimatorListener(new AnimatorListenerAdapter() {
@@ -1267,6 +1278,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                 mGestureState.setState(STATE_END_TARGET_ANIMATION_FINISHED);
             }
         });
+        setupWindowAnimation(swipePipToHomeAnimator);
         return swipePipToHomeAnimator;
     }
 
@@ -1297,6 +1309,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
             HomeAnimationFactory homeAnimationFactory) {
         RectFSpringAnim anim =
                 super.createWindowAnimationToHome(startProgress, homeAnimationFactory);
+        setupWindowAnimation(anim);
+        return anim;
+    }
+
+    private void setupWindowAnimation(RectFSpringAnim anim) {
         anim.addOnUpdateListener((v, r, p) -> {
             updateSysUiFlags(Math.max(p, mCurrentShift.value));
         });
@@ -1314,7 +1331,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         if (mRecentsAnimationTargets != null) {
             mRecentsAnimationTargets.addReleaseCheck(anim);
         }
-        return anim;
     }
 
     public void onConsumerAboutToBeSwitched() {
diff --git a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
index 67a635b70b..7488649eb7 100644
--- a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
+++ b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
@@ -56,7 +56,9 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim {
     private final ComponentName mComponentName;
     private final SurfaceControl mLeash;
     private final Rect mAppBounds = new Rect();
+    private final Matrix mHomeToWindowPositionMap = new Matrix();
     private final Rect mStartBounds = new Rect();
+    private final RectF mCurrentBoundsF = new RectF();
     private final Rect mCurrentBounds = new Rect();
     private final Rect mDestinationBounds = new Rect();
     private final PipSurfaceTransactionHelper mSurfaceTransactionHelper;
@@ -66,10 +68,9 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim {
     private final Rect mSourceHintRectInsets;
     private final Rect mSourceInsets = new Rect();
 
-    /** for rotation via {@link #setFromRotation(TaskViewSimulator, int)} */
-    private @RecentsOrientedState.SurfaceRotation int mFromRotation = Surface.ROTATION_0;
+    /** for rotation calculations */
+    private final @RecentsOrientedState.SurfaceRotation int mFromRotation;
     private final Rect mDestinationBoundsTransformed = new Rect();
-    private final Rect mDestinationBoundsAnimation = new Rect();
 
     /**
      * Flag to avoid the double-end problem since the leash would have been released
@@ -91,31 +92,39 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim {
      * @param leash {@link SurfaceControl} this animator operates on
      * @param sourceRectHint See the definition in {@link android.app.PictureInPictureParams}
      * @param appBounds Bounds of the application, sourceRectHint is based on this bounds
+     * @param homeToWindowPositionMap {@link Matrix} to map a Rect from home to window space
      * @param startBounds Bounds of the application when this animator starts. This can be
      *                    different from the appBounds if user has swiped a certain distance and
      *                    Launcher has performed transform on the leash.
      * @param destinationBounds Bounds of the destination this animator ends to
+     * @param fromRotation From rotation if different from final rotation, ROTATION_0 otherwise
+     * @param destinationBoundsTransformed Destination bounds in window space
      * @param cornerRadius Corner radius in pixel value for PiP window
+     * @param view Attached view for logging purpose
      */
-    public SwipePipToHomeAnimator(@NonNull Context context,
+    private SwipePipToHomeAnimator(@NonNull Context context,
             int taskId,
             @NonNull ComponentName componentName,
             @NonNull SurfaceControl leash,
             @Nullable Rect sourceRectHint,
             @NonNull Rect appBounds,
+            @NonNull Matrix homeToWindowPositionMap,
             @NonNull RectF startBounds,
             @NonNull Rect destinationBounds,
+            @RecentsOrientedState.SurfaceRotation int fromRotation,
+            @NonNull Rect destinationBoundsTransformed,
             int cornerRadius,
             @NonNull View view) {
-        super(startBounds, new RectF(destinationBounds), context);
+        super(startBounds, new RectF(destinationBoundsTransformed), context);
         mTaskId = taskId;
         mComponentName = componentName;
         mLeash = leash;
         mAppBounds.set(appBounds);
+        mHomeToWindowPositionMap.set(homeToWindowPositionMap);
         startBounds.round(mStartBounds);
         mDestinationBounds.set(destinationBounds);
-        mDestinationBoundsTransformed.set(mDestinationBounds);
-        mDestinationBoundsAnimation.set(mDestinationBounds);
+        mFromRotation = fromRotation;
+        mDestinationBoundsTransformed.set(destinationBoundsTransformed);
         mSurfaceTransactionHelper = new PipSurfaceTransactionHelper(cornerRadius);
 
         if (sourceRectHint != null && (sourceRectHint.width() < destinationBounds.width()
@@ -191,37 +200,13 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim {
         addOnUpdateListener(this::onAnimationUpdate);
     }
 
-    /** sets the from rotation if it's different from the target rotation. */
-    public void setFromRotation(TaskViewSimulator taskViewSimulator,
-            @RecentsOrientedState.SurfaceRotation int fromRotation) {
-        if (fromRotation != Surface.ROTATION_90 && fromRotation != Surface.ROTATION_270) {
-            Log.wtf(TAG, "Not a supported rotation, rotation=" + fromRotation);
-            return;
-        }
-        mFromRotation = fromRotation;
-        final Matrix matrix = new Matrix();
-        taskViewSimulator.applyWindowToHomeRotation(matrix);
-
-        // map the destination bounds into window space. mDestinationBounds is always calculated
-        // in the final home space and the animation runs in original window space.
-        final RectF transformed = new RectF(mDestinationBounds);
-        matrix.mapRect(transformed, new RectF(mDestinationBounds));
-        transformed.round(mDestinationBoundsTransformed);
-
-        // set the animation destination bounds for RectEvaluator calculation.
-        // bounds and insets are calculated as if the transition is from mAppBounds to
-        // mDestinationBoundsAnimation, separated from rotate / scale / position.
-        mDestinationBoundsAnimation.set(mAppBounds.left, mAppBounds.top,
-                mAppBounds.left + mDestinationBounds.width(),
-                mAppBounds.top + mDestinationBounds.height());
-    }
-
     private void onAnimationUpdate(@Nullable AppCloseConfig values, RectF currentRect,
             float progress) {
         if (mHasAnimationEnded) return;
         final SurfaceControl.Transaction tx =
                 PipSurfaceTransactionHelper.newSurfaceControlTransaction();
-        onAnimationUpdate(tx, currentRect, progress);
+        mHomeToWindowPositionMap.mapRect(mCurrentBoundsF, currentRect);
+        onAnimationUpdate(tx, mCurrentBoundsF, progress);
         tx.apply();
     }
 
@@ -309,6 +294,108 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim {
         return new RotatedPosition(degree, positionX, positionY);
     }
 
+    /** Builder class for {@link SwipePipToHomeAnimator} */
+    public static class Builder {
+        private Context mContext;
+        private int mTaskId;
+        private ComponentName mComponentName;
+        private SurfaceControl mLeash;
+        private Rect mSourceRectHint;
+        private Rect mAppBounds;
+        private Matrix mHomeToWindowPositionMap;
+        private RectF mStartBounds;
+        private Rect mDestinationBounds;
+        private int mCornerRadius;
+        private View mAttachedView;
+        private @RecentsOrientedState.SurfaceRotation int mFromRotation = Surface.ROTATION_0;
+        private final Rect mDestinationBoundsTransformed = new Rect();
+
+        public Builder setContext(Context context) {
+            mContext = context;
+            return this;
+        }
+
+        public Builder setTaskId(int taskId) {
+            mTaskId = taskId;
+            return this;
+        }
+
+        public Builder setComponentName(ComponentName componentName) {
+            mComponentName = componentName;
+            return this;
+        }
+
+        public Builder setLeash(SurfaceControl leash) {
+            mLeash = leash;
+            return this;
+        }
+
+        public Builder setSourceRectHint(Rect sourceRectHint) {
+            mSourceRectHint = new Rect(sourceRectHint);
+            return this;
+        }
+
+        public Builder setAppBounds(Rect appBounds) {
+            mAppBounds = new Rect(appBounds);
+            return this;
+        }
+
+        public Builder setHomeToWindowPositionMap(Matrix homeToWindowPositionMap) {
+            mHomeToWindowPositionMap = new Matrix(homeToWindowPositionMap);
+            return this;
+        }
+
+        public Builder setStartBounds(RectF startBounds) {
+            mStartBounds = new RectF(startBounds);
+            return this;
+        }
+
+        public Builder setDestinationBounds(Rect destinationBounds) {
+            mDestinationBounds = new Rect(destinationBounds);
+            return this;
+        }
+
+        public Builder setCornerRadius(int cornerRadius) {
+            mCornerRadius = cornerRadius;
+            return this;
+        }
+
+        public Builder setAttachedView(View attachedView) {
+            mAttachedView = attachedView;
+            return this;
+        }
+
+        public Builder setFromRotation(TaskViewSimulator taskViewSimulator,
+                @RecentsOrientedState.SurfaceRotation int fromRotation) {
+            if (fromRotation != Surface.ROTATION_90 && fromRotation != Surface.ROTATION_270) {
+                Log.wtf(TAG, "Not a supported rotation, rotation=" + fromRotation);
+                return this;
+            }
+            final Matrix matrix = new Matrix();
+            taskViewSimulator.applyWindowToHomeRotation(matrix);
+
+            // map the destination bounds into window space. mDestinationBounds is always calculated
+            // in the final home space and the animation runs in original window space.
+            final RectF transformed = new RectF(mDestinationBounds);
+            matrix.mapRect(transformed, new RectF(mDestinationBounds));
+            transformed.round(mDestinationBoundsTransformed);
+
+            mFromRotation = fromRotation;
+            return this;
+        }
+
+        public SwipePipToHomeAnimator build() {
+            if (mDestinationBoundsTransformed.isEmpty()) {
+                mDestinationBoundsTransformed.set(mDestinationBounds);
+            }
+            return new SwipePipToHomeAnimator(mContext, mTaskId, mComponentName, mLeash,
+                    mSourceRectHint, mAppBounds,
+                    mHomeToWindowPositionMap, mStartBounds, mDestinationBounds,
+                    mFromRotation, mDestinationBoundsTransformed,
+                    mCornerRadius, mAttachedView);
+        }
+    }
+
     private static class RotatedPosition {
         private final float degree;
         private final float positionX;
-- 
GitLab


From ab3c681df87798a7d7fd4c20ab6ac7c7639b5f6f Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Mon, 28 Jun 2021 15:42:28 -0700
Subject: [PATCH 1517/1664] Ensure iconScale never exceeds 1.

The rest of the scaled values should scale accordingly.

Bug: 190777089
Test: manual
Change-Id: I97f1724b7e96eea3ad81c295a98ccb71da756abb
---
 src/com/android/launcher3/DeviceProfile.java | 28 +++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 009e098fef..88e817111e 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -120,6 +120,7 @@ public class DeviceProfile {
     public int iconDrawablePaddingPx;
     public int iconDrawablePaddingOriginalPx;
 
+    public float cellScaleToFit;
     public int cellWidthPx;
     public int cellHeightPx;
     public int workspaceCellPaddingXPx;
@@ -354,20 +355,20 @@ public class DeviceProfile {
         // Now that we have all of the variables calculated, we can tune certain sizes.
         if (isScalableGrid && inv.devicePaddings != null) {
             // Paddings were created assuming no scaling, so we first unscale the extra space.
-            int unscaledExtraSpace = (int) (extraSpace / iconScale);
+            int unscaledExtraSpace = (int) (extraSpace / cellScaleToFit);
             DevicePadding padding = inv.devicePaddings.getDevicePadding(unscaledExtraSpace);
 
             int paddingWorkspaceTop = padding.getWorkspaceTopPadding(unscaledExtraSpace);
             int paddingWorkspaceBottom = padding.getWorkspaceBottomPadding(unscaledExtraSpace);
             int paddingHotseatBottom = padding.getHotseatBottomPadding(unscaledExtraSpace);
 
-            workspaceTopPadding = Math.round(paddingWorkspaceTop * iconScale);
-            workspaceBottomPadding = Math.round(paddingWorkspaceBottom * iconScale);
-            extraHotseatBottomPadding = Math.round(paddingHotseatBottom * iconScale);
+            workspaceTopPadding = Math.round(paddingWorkspaceTop * cellScaleToFit);
+            workspaceBottomPadding = Math.round(paddingWorkspaceBottom * cellScaleToFit);
+            extraHotseatBottomPadding = Math.round(paddingHotseatBottom * cellScaleToFit);
 
             hotseatBarSizePx += extraHotseatBottomPadding;
 
-            qsbBottomMarginPx = Math.round(qsbBottomMarginOriginalPx * iconScale);
+            qsbBottomMarginPx = Math.round(qsbBottomMarginOriginalPx * cellScaleToFit);
         } else if (!isVerticalBarLayout() && isPhone && isTallDevice) {
             // We increase the hotseat size when there is extra space.
             // ie. For a display with a large aspect ratio, we can keep the icons on the workspace
@@ -535,15 +536,18 @@ public class DeviceProfile {
      * hotseat sizes, workspaceSpringLoadedShrinkFactor, folderIconSizePx, and folderIconOffsetYPx.
      */
     public void updateIconSize(float scale, Resources res) {
-        iconScale = scale;
+        // Icon scale should never exceed 1, otherwise pixellation may occur.
+        iconScale = Math.min(1f, scale);
+        cellScaleToFit = scale;
+
 
         // Workspace
         final boolean isVerticalLayout = isVerticalBarLayout();
         float invIconSizeDp = isLandscape ? inv.landscapeIconSize : inv.iconSize;
-        iconSizePx = Math.max(1, pxFromDp(invIconSizeDp, mMetrics, scale));
+        iconSizePx = Math.max(1, pxFromDp(invIconSizeDp, mMetrics, iconScale));
         float invIconTextSizeSp = isLandscape ? inv.landscapeIconTextSize : inv.iconTextSize;
-        iconTextSizePx = (int) (pxFromSp(invIconTextSizeSp, mMetrics) * scale);
-        iconDrawablePaddingPx = (int) (iconDrawablePaddingOriginalPx * scale);
+        iconTextSizePx = (int) (pxFromSp(invIconTextSizeSp, mMetrics) * iconScale);
+        iconDrawablePaddingPx = (int) (iconDrawablePaddingOriginalPx * iconScale);
 
         setCellLayoutBorderSpacing((int) (cellLayoutBorderSpacingOriginalPx * scale));
 
@@ -887,6 +891,9 @@ public class DeviceProfile {
         writer.println(prefix + "\tinv.minCellWidth:" + inv.minCellWidth + "dp");
         writer.println(prefix + "\tinv.minCellHeight:" + inv.minCellHeight + "dp");
 
+        writer.println(prefix + "\tinv.numColumns:" + inv.numColumns);
+        writer.println(prefix + "\tinv.numRows:" + inv.numRows);
+
         writer.println(prefix + pxToDpStr("cellWidthPx", cellWidthPx));
         writer.println(prefix + pxToDpStr("cellHeightPx", cellHeightPx));
 
@@ -940,7 +947,8 @@ public class DeviceProfile {
         writer.println(prefix + pxToDpStr("workspacePadding.right", workspacePadding.right));
         writer.println(prefix + pxToDpStr("workspacePadding.bottom", workspacePadding.bottom));
 
-        writer.println(prefix + pxToDpStr("scaleToFit", iconScale));
+        writer.println(prefix + pxToDpStr("iconScale", iconScale));
+        writer.println(prefix + pxToDpStr("cellScaleToFit ", cellScaleToFit));
         writer.println(prefix + pxToDpStr("extraSpace", extraSpace));
 
         if (inv.devicePaddings != null) {
-- 
GitLab


From 81ba407450705231379bea088950baea59ef1f24 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Tue, 29 Jun 2021 00:22:43 +0000
Subject: [PATCH 1518/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I59f0fdfc56fb746707d480234ab850f1d61c7142
---
 res/values-gu/strings.xml | 3 +--
 res/values-kk/strings.xml | 3 +--
 res/values-or/strings.xml | 9 +++------
 res/values-pl/strings.xml | 3 +--
 res/values-te/strings.xml | 3 +--
 5 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 312fe0999e..1eca0c89a5 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"નોટિફિકેશન"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"શૉર્ટકટ ખસેડવા ટચ કરીને થોડી વાર દબાવી રાખો."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"શૉર્ટકટ ખસેડવા બે વાર ટૅપ કરીને દબાવી રાખો અથવા કસ્ટમ ક્રિયાઓનો ઉપયોગ કરો."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"આ હોમ સ્ક્રીન પર વધુ જગ્યા નથી"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"મનપસંદ ટ્રે પર વધુ જગ્યા નથી"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ઍપ્લિકેશનોની સૂચિ"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"વ્યક્તિગત ઍપની સૂચિ"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 64771de1b8..543f241f30 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Хабарландырулар"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Таңбашаны жылжыту үшін басып тұрыңыз."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Таңбашаны жылжыту үшін екі рет түртіңіз де, ұстап тұрыңыз немесе арнаулы әрекеттерді пайдаланыңыз."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Негізгі экранда бос орын қалмады."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Қалаулылар науасында орын қалмады"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Қолданбалар тізімі"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Жеке қолданбалар тізімі"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 638965dff9..73848e0906 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -46,10 +46,8 @@
     <string name="widget_button_text" msgid="2880537293434387943">"ୱିଜେଟ୍‌"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"ସନ୍ଧାନ କରନ୍ତୁ"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"ସନ୍ଧାନ ବାକ୍ସରୁ ଟେକ୍ସଟ୍ ଖାଲି କରନ୍ତୁ"</string>
-    <!-- no translation found for no_widgets_available (4337693382501046170) -->
-    <skip />
-    <!-- no translation found for no_search_results (3787956167293097509) -->
-    <skip />
+    <string name="no_widgets_available" msgid="4337693382501046170">"ୱିଜେଟ୍ ଏବଂ ସର୍ଟକଟଗୁଡ଼ିକ ଉପଲବ୍ଧ ନାହିଁ"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"କୌଣସି ୱିଜେଟ୍ କିମ୍ବା ସର୍ଟକଟ୍ ମିଳିଲା ନାହିଁ"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"ବ୍ୟକ୍ତିଗତ"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"ୱାର୍କ"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ"</string>
@@ -66,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"ବିଜ୍ଞପ୍ତି"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"ଏକ ସର୍ଟକଟକୁ ମୁଭ୍ କରିବା ପାଇଁ ସ୍ପର୍ଶ କରି ଧରି ରଖନ୍ତୁ।"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ଏକ ସର୍ଟକଟକୁ ମୁଭ୍ କରିବା ପାଇଁ ଦୁଇଥର-ଟାପ୍ କରି ଧରି ରଖନ୍ତୁ କିମ୍ବା କଷ୍ଟମ୍ କାର୍ଯ୍ୟଗୁଡ଼ିକୁ ବ୍ୟବହାର କରନ୍ତୁ।"</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"ଏହି ମୂଳସ୍କ୍ରିନରେ ଆଉ ଜାଗା ନାହିଁ"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ମନପସନ୍ଦ ଟ୍ରେରେ ଆଉ କୋଠରୀ ନାହିଁ"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ଆପ୍‌ ତାଲିକା"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"ବ୍ୟକ୍ତିଗତ ଆପ୍ ତାଲିକା"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index a6853e705f..5ec64900ff 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -68,8 +68,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Powiadomienia"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Naciśnij i przytrzymaj, aby wybrać skrót."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Naciśnij dwukrotnie i przytrzymaj, aby przenieść skrót lub użyć działań niestandardowych."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Brak miejsca na tym ekranie głównym"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Brak miejsca w Ulubionych"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista aplikacji"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista aplikacji osobistych"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 6ea2906ebf..7012b3ca6e 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -64,8 +64,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"నోటిఫికేషన్‌లు"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"షార్ట్‌కట్‌ను తరలించడానికి తాకి &amp; నొక్కి ఉంచు."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"షార్ట్‌కట్‌ను తరలించడానికి లేదా అనుకూల చర్యలను ఉపయోగించడానికి రెండుసార్లు నొక్కండి &amp; హోల్డ్ చేయండి."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"ఈ మొదటి స్క్రీన్‌లో స్థలం లేదు"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ఇష్టమైనవి ట్రేలో ఖాళీ లేదు"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"అనువర్తనాల జాబితా"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"వ్యక్తిగత యాప్‌ల జాబితా"</string>
-- 
GitLab


From ad68318048e1fc711972be4f81a4e3bf345d1e2e Mon Sep 17 00:00:00 2001
From: Yogisha Dixit <ydixit@google.com>
Date: Mon, 28 Jun 2021 12:47:41 +0100
Subject: [PATCH 1519/1664] Don't show resize handle if widget cannot be
 resized.

Test: manual
Bug: 190015493
Change-Id: Ibb0cc347103b8d01d30a19925f929617426e4889
---
 .../launcher3/AppWidgetResizeFrame.java       | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java
index 9e21e1a0f1..cd4af5e8f1 100644
--- a/src/com/android/launcher3/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher3/AppWidgetResizeFrame.java
@@ -108,7 +108,8 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
     private boolean mTopBorderActive;
     private boolean mBottomBorderActive;
 
-    private int mResizeMode;
+    private boolean mHorizontalResizeActive;
+    private boolean mVerticalResizeActive;
 
     private int mRunningHInc;
     private int mRunningVInc;
@@ -207,7 +208,6 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
         mWidgetView.addOnAttachStateChangeListener(mWidgetViewAttachStateChangeListener);
         LauncherAppWidgetProviderInfo info = (LauncherAppWidgetProviderInfo)
                 widgetView.getAppWidgetInfo();
-        mResizeMode = info.resizeMode;
         mDragLayer = dragLayer;
 
         mMinHSpan = info.minSpanX;
@@ -218,10 +218,17 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
         mWidgetPadding = getDefaultPaddingForWidget(getContext(),
                 widgetView.getAppWidgetInfo().provider, null);
 
-        if (mResizeMode == AppWidgetProviderInfo.RESIZE_HORIZONTAL) {
+        // Only show resize handles for the directions in which resizing is possible.
+        InvariantDeviceProfile idp = LauncherAppState.getIDP(cellLayout.getContext());
+        mVerticalResizeActive = (info.resizeMode & AppWidgetProviderInfo.RESIZE_VERTICAL) != 0
+                && mMinVSpan < idp.numRows && mMaxVSpan > 1;
+        if (!mVerticalResizeActive) {
             mDragHandles[INDEX_TOP].setVisibility(GONE);
             mDragHandles[INDEX_BOTTOM].setVisibility(GONE);
-        } else if (mResizeMode == AppWidgetProviderInfo.RESIZE_VERTICAL) {
+        }
+        mHorizontalResizeActive = (info.resizeMode & AppWidgetProviderInfo.RESIZE_HORIZONTAL) != 0
+                && mMinHSpan < idp.numColumns && mMaxHSpan > 1;
+        if (!mHorizontalResizeActive) {
             mDragHandles[INDEX_LEFT].setVisibility(GONE);
             mDragHandles[INDEX_RIGHT].setVisibility(GONE);
         }
@@ -270,14 +277,12 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
     }
 
     public boolean beginResizeIfPointInRegion(int x, int y) {
-        boolean horizontalActive = (mResizeMode & AppWidgetProviderInfo.RESIZE_HORIZONTAL) != 0;
-        boolean verticalActive = (mResizeMode & AppWidgetProviderInfo.RESIZE_VERTICAL) != 0;
-
-        mLeftBorderActive = (x < mTouchTargetWidth) && horizontalActive;
-        mRightBorderActive = (x > getWidth() - mTouchTargetWidth) && horizontalActive;
-        mTopBorderActive = (y < mTouchTargetWidth + mTopTouchRegionAdjustment) && verticalActive;
+        mLeftBorderActive = (x < mTouchTargetWidth) && mHorizontalResizeActive;
+        mRightBorderActive = (x > getWidth() - mTouchTargetWidth) && mHorizontalResizeActive;
+        mTopBorderActive = (y < mTouchTargetWidth + mTopTouchRegionAdjustment)
+                && mVerticalResizeActive;
         mBottomBorderActive = (y > getHeight() - mTouchTargetWidth + mBottomTouchRegionAdjustment)
-                && verticalActive;
+                && mVerticalResizeActive;
 
         boolean anyBordersActive = mLeftBorderActive || mRightBorderActive
                 || mTopBorderActive || mBottomBorderActive;
-- 
GitLab


From 85486d1c2c3c3ff47fd9c459d9f689df3e1bc605 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 28 Jun 2021 13:00:13 +0100
Subject: [PATCH 1520/1664] Set the widget preview title a11y text to "{widget
 name} widget"

Fix: 187376680
Test: Manual
Change-Id: I211d8e2b437091808d1f5a764075af4c3832ef48
---
 res/values/strings.xml                           |  3 +++
 src/com/android/launcher3/widget/WidgetCell.java | 10 +++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4f4a38907a..ddd838dbf9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -55,6 +55,9 @@
     <string name="widget_dims_format">%1$d \u00d7 %2$d</string>
     <!-- Accessibility spoken message format for the dimensions of a widget in the drawer -->
     <string name="widget_accessible_dims_format">%1$d wide by %2$d high</string>
+    <!-- Spoken text for a screen reader. The placeholder text is the widget name.
+         [CHAR_LIMIT=none]-->
+    <string name="widget_preview_context_description"><xliff:g id="widget_name" example="Calendar month view">%1$s</xliff:g> widget</string>
     <!-- Message to tell the user to press and hold a widget/icon to add it to the home screen.
          [CHAR LIMIT=NONE]  -->
     <string name="add_item_request_drag_hint">Touch &amp; hold the widget to move it around the Home screen</string>
diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index 91529be30b..a52adf673d 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -180,14 +180,17 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     public void applyFromCellItem(WidgetItem item, WidgetPreviewLoader loader) {
         applyPreviewOnAppWidgetHostView(item);
 
+        Context context = getContext();
         mItem = item;
         mWidgetName.setText(mItem.label);
-        mWidgetDims.setText(getContext().getString(R.string.widget_dims_format,
+        mWidgetName.setContentDescription(
+                context.getString(R.string.widget_preview_context_description, mItem.label));
+        mWidgetDims.setText(context.getString(R.string.widget_dims_format,
                 mItem.spanX, mItem.spanY));
-        mWidgetDims.setContentDescription(getContext().getString(
+        mWidgetDims.setContentDescription(context.getString(
                 R.string.widget_accessible_dims_format, mItem.spanX, mItem.spanY));
         if (ATLEAST_S && mItem.widgetInfo != null) {
-            CharSequence description = mItem.widgetInfo.loadDescription(getContext());
+            CharSequence description = mItem.widgetInfo.loadDescription(context);
             if (description != null && description.length() > 0) {
                 mWidgetDescription.setText(description);
                 mWidgetDescription.setVisibility(VISIBLE);
@@ -238,6 +241,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
             NavigableAppWidgetHostView appWidgetHostViewPreview,
             LauncherAppWidgetProviderInfo providerInfo,
             @Nullable RemoteViews remoteViews) {
+        appWidgetHostViewPreview.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
         appWidgetHostViewPreview.setAppWidget(/* appWidgetId= */ -1, providerInfo);
         Rect padding;
         DeviceProfile deviceProfile = mActivity.getDeviceProfile();
-- 
GitLab


From 2a9a10068c83bfd4539a3775137b273778e6070e Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Tue, 29 Jun 2021 14:19:07 +0100
Subject: [PATCH 1521/1664] Modify ripple for cancel button in search bar in
 widget picker.

Bug: 192186626
Test: Tested manually
Change-Id: Ifff98e03ad3647df7d8b273c4c3eb7cd688efbc3
---
 .../full_rounded_transparent_ripple.xml       | 26 +++++++++++++++++++
 res/layout/widgets_search_bar.xml             |  6 ++---
 2 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 res/drawable/full_rounded_transparent_ripple.xml

diff --git a/res/drawable/full_rounded_transparent_ripple.xml b/res/drawable/full_rounded_transparent_ripple.xml
new file mode 100644
index 0000000000..a1e79437a8
--- /dev/null
+++ b/res/drawable/full_rounded_transparent_ripple.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <item android:id="@android:id/mask">
+        <shape android:shape="oval">
+            <size android:height="24dp" android:width="24dp"/>
+            <solid android:color="@android:color/white"/>
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/res/layout/widgets_search_bar.xml b/res/layout/widgets_search_bar.xml
index 0b354e8aee..cb27f4fb6f 100644
--- a/res/layout/widgets_search_bar.xml
+++ b/res/layout/widgets_search_bar.xml
@@ -31,11 +31,9 @@
         android:id="@+id/widgets_search_cancel_button"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:paddingVertical="12dp"
-        android:paddingStart="8dp"
-        android:paddingEnd="12dp"
+        android:padding="12dp"
         android:src="@drawable/ic_gm_close_24"
-        android:background="?android:selectableItemBackground"
+        android:background="@drawable/full_rounded_transparent_ripple"
         android:layout_gravity="center"
         android:contentDescription="@string/widgets_full_sheet_cancel_button_description"
         android:visibility="gone"/>
-- 
GitLab


From 57973c328aab6bc23c422778b26c1ad33f00d5eb Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Tue, 29 Jun 2021 11:58:11 +0100
Subject: [PATCH 1522/1664] Make sure search recycler view is bound to fast
 scroller if user is in search mode at the time of attachment of work/personal
 recycler view.

Bug: 191980945
Test: Tested manually.
1) Open widget picker, scroll.
2) Enable dark mode, scroll.
3) Type search query, scroll.
4) Disable dark mode, scroll.
5) Have work profile in phone and repeat the above with work tab open
and search.

Change-Id: I106717091a88868c4bbe3fad0dd71c8344e9c8ed
---
 .../widget/picker/WidgetsFullSheet.java       | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 33f4e50219..6c2cca6024 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -129,6 +129,22 @@ public class WidgetsFullSheet extends BaseWidgetSheet
         }
     };
 
+    private final OnAttachStateChangeListener mBindScrollbarInSearchMode =
+            new OnAttachStateChangeListener() {
+                @Override
+                public void onViewAttachedToWindow(View view) {
+                    WidgetsRecyclerView searchRecyclerView =
+                            mAdapters.get(AdapterHolder.SEARCH).mWidgetsRecyclerView;
+                    if (mIsInSearchMode && searchRecyclerView != null) {
+                        searchRecyclerView.bindFastScrollbar();
+                    }
+                }
+
+                @Override
+                public void onViewDetachedFromWindow(View view) {
+                }
+            };
+
     private final int mTabsHeight;
     private final int mViewPagerTopPadding;
     private final int mSearchAndRecommendationContainerBottomMargin;
@@ -303,6 +319,12 @@ public class WidgetsFullSheet extends BaseWidgetSheet
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
         mActivityContext.getAppWidgetHost().removeProviderChangeListener(this);
+        mAdapters.get(AdapterHolder.PRIMARY).mWidgetsRecyclerView
+                .removeOnAttachStateChangeListener(mBindScrollbarInSearchMode);
+        if (mHasWorkProfile) {
+            mAdapters.get(AdapterHolder.WORK).mWidgetsRecyclerView
+                    .removeOnAttachStateChangeListener(mBindScrollbarInSearchMode);
+        }
     }
 
     @Override
@@ -752,6 +774,12 @@ public class WidgetsFullSheet extends BaseWidgetSheet
             mWidgetsRecyclerView.setHeaderViewDimensionsProvider(WidgetsFullSheet.this);
             mWidgetsRecyclerView.setEdgeEffectFactory(
                     ((TopRoundedCornerView) mContent).createEdgeEffectFactory());
+            // Recycler view binds to fast scroller when it is attached to screen. Make sure
+            // search recycler view is bound to fast scroller if user is in search mode at the time
+            // of attachment.
+            if (mAdapterType == PRIMARY || mAdapterType == WORK) {
+                mWidgetsRecyclerView.addOnAttachStateChangeListener(mBindScrollbarInSearchMode);
+            }
             mWidgetsListAdapter.setApplyBitmapDeferred(false, mWidgetsRecyclerView);
             mWidgetsListAdapter.setMaxHorizontalSpansPerRow(mMaxSpansPerRow);
         }
-- 
GitLab


From 12f7a59e5ccb4d287f6418607df33e1302c2a946 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Tue, 29 Jun 2021 15:10:17 +0100
Subject: [PATCH 1523/1664] Use category icon for pending conversation widgets

Fix: 192333050
Test: Manual
Change-Id: Ie3895cd4747f1bec1c8ca9af82347bb0eafa7415
---
 .../android/launcher3/model/WidgetsModel.java |  6 +++
 .../android/launcher3/model/LoaderTask.java   |  5 +--
 .../widget/PendingAppWidgetHostView.java      | 39 ++++++++++++++++---
 .../android/launcher3/model/WidgetsModel.java |  8 ++++
 4 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/go/src/com/android/launcher3/model/WidgetsModel.java b/go/src/com/android/launcher3/model/WidgetsModel.java
index cc5e1cbb46..f8448daf3d 100644
--- a/go/src/com/android/launcher3/model/WidgetsModel.java
+++ b/go/src/com/android/launcher3/model/WidgetsModel.java
@@ -24,6 +24,7 @@ import androidx.annotation.Nullable;
 
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.icons.ComponentWithLabelAndIcon;
+import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.util.PackageUserKey;
 import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 
@@ -81,4 +82,9 @@ public class WidgetsModel {
             ComponentName providerName) {
         return null;
     }
+
+    /** Returns {@link PackageItemInfo} of a pending widget. */
+    public static PackageItemInfo newPendingItemInfo(ComponentName provider) {
+        return new PackageItemInfo(provider.getPackageName());
+    }
 }
\ No newline at end of file
diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index 318496ad19..ad2d7c281e 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -75,7 +75,6 @@ import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
-import com.android.launcher3.model.data.PackageItemInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pm.InstallSessionHelper;
 import com.android.launcher3.pm.PackageInstallInfo;
@@ -791,8 +790,8 @@ public class LoaderTask implements Runnable {
 
                                 if (appWidgetInfo.restoreStatus !=
                                         LauncherAppWidgetInfo.RESTORE_COMPLETED) {
-                                    String pkg = appWidgetInfo.providerName.getPackageName();
-                                    appWidgetInfo.pendingItemInfo = new PackageItemInfo(pkg);
+                                    appWidgetInfo.pendingItemInfo = WidgetsModel.newPendingItemInfo(
+                                            appWidgetInfo.providerName);
                                     appWidgetInfo.pendingItemInfo.user = appWidgetInfo.user;
                                     mIconCache.getTitleAndIconForApp(
                                             appWidgetInfo.pendingItemInfo, false);
diff --git a/src/com/android/launcher3/widget/PendingAppWidgetHostView.java b/src/com/android/launcher3/widget/PendingAppWidgetHostView.java
index 47a8914d2a..47f30be04f 100644
--- a/src/com/android/launcher3/widget/PendingAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/PendingAppWidgetHostView.java
@@ -17,6 +17,7 @@
 package com.android.launcher3.widget;
 
 import static com.android.launcher3.graphics.PreloadIconDrawable.newPendingIcon;
+import static com.android.launcher3.model.data.PackageItemInfo.CONVERSATIONS;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -35,6 +36,8 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.RemoteViews;
 
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.R;
 import com.android.launcher3.icons.FastBitmapDrawable;
@@ -146,21 +149,32 @@ public class PendingAppWidgetHostView extends LauncherAppWidgetHostView
             mCenterDrawable = null;
         }
         if (info.bitmap.icon != null) {
+            Drawable widgetCategoryIcon = getWidgetCategoryIcon();
             // The view displays three modes,
             //   1) App icon in the center
             //   2) Preload icon in the center
             //   3) App icon in the center with a setup icon on the top left corner.
             if (mDisabledForSafeMode) {
-                FastBitmapDrawable disabledIcon = info.newIcon(getContext());
-                disabledIcon.setIsDisabled(true);
-                mCenterDrawable = disabledIcon;
+                if (widgetCategoryIcon == null) {
+                    FastBitmapDrawable disabledIcon = info.newIcon(getContext());
+                    disabledIcon.setIsDisabled(true);
+                    mCenterDrawable = disabledIcon;
+                } else {
+                    widgetCategoryIcon.setColorFilter(
+                            FastBitmapDrawable.getDisabledFColorFilter(/* disabledAlpha= */ 1f));
+                    mCenterDrawable = widgetCategoryIcon;
+                }
                 mSettingIconDrawable = null;
             } else if (isReadyForClickSetup()) {
-                mCenterDrawable = info.newIcon(getContext());
+                mCenterDrawable = widgetCategoryIcon == null
+                        ? info.newIcon(getContext())
+                        : widgetCategoryIcon;
                 mSettingIconDrawable = getResources().getDrawable(R.drawable.ic_setting).mutate();
                 updateSettingColor(info.bitmap.color);
             } else {
-                mCenterDrawable = newPendingIcon(getContext(), info);
+                mCenterDrawable = widgetCategoryIcon == null
+                        ? newPendingIcon(getContext(), info)
+                        : widgetCategoryIcon;
                 mSettingIconDrawable = null;
                 applyState();
             }
@@ -316,4 +330,19 @@ public class PendingAppWidgetHostView extends LauncherAppWidgetHostView
         }
 
     }
+
+    /**
+     * Returns the widget category icon for {@link #mInfo}.
+     *
+     * <p>If {@link #mInfo}'s category is {@code PackageItemInfo#NO_CATEGORY} or unknown, returns
+     * {@code null}.
+     */
+    @Nullable
+    private Drawable getWidgetCategoryIcon() {
+        switch (mInfo.pendingItemInfo.category) {
+            case CONVERSATIONS:
+                return getContext().getDrawable(R.drawable.ic_conversations_widget_category);
+        }
+        return null;
+    }
 }
diff --git a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
index a66b031719..631067b929 100644
--- a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
+++ b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
@@ -225,6 +225,14 @@ public class WidgetsModel {
         return null;
     }
 
+    /** Returns {@link PackageItemInfo} of a pending widget. */
+    public static PackageItemInfo newPendingItemInfo(ComponentName provider) {
+        if (CONVERSATION_WIDGET.equals(provider)) {
+            return new PackageItemInfo(provider.getPackageName(), PackageItemInfo.CONVERSATIONS);
+        }
+        return new PackageItemInfo(provider.getPackageName());
+    }
+
     private WidgetPackageOrCategoryKey getWidgetPackageOrCategoryKey(WidgetItem item) {
         if (CONVERSATION_WIDGET.equals(item.componentName)) {
             return new WidgetPackageOrCategoryKey(PackageItemInfo.CONVERSATIONS, item.user);
-- 
GitLab


From f70265f4ec02259faacec1ffb3096aee20d71040 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Tue, 29 Jun 2021 09:59:02 -0700
Subject: [PATCH 1524/1664] Add split_display device profile.

Bug: 192215417
Test: manual set isSplitDisplay=true, ensure the added device profile
      gets set on device
Change-Id: Ibe33c33d3af140352c0bb4fb44460106ad898285
---
 res/xml/device_profiles.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/res/xml/device_profiles.xml b/res/xml/device_profiles.xml
index 1c99dfcfa7..256999cd7f 100644
--- a/res/xml/device_profiles.xml
+++ b/res/xml/device_profiles.xml
@@ -115,6 +115,14 @@
             launcher:iconTextSize="14.4"
             launcher:canBeDefault="true" />
 
+        <display-option
+            launcher:name="Large Phone Split Display"
+            launcher:minWidthDps="406"
+            launcher:minHeightDps="694"
+            launcher:iconImageSize="56"
+            launcher:iconTextSize="14.4"
+            launcher:canBeDefault="split_display" />
+
         <display-option
             launcher:name="Shorter Stubby"
             launcher:minWidthDps="255"
-- 
GitLab


From 037a5362d877916450880d4b41cf5f25ee547e34 Mon Sep 17 00:00:00 2001
From: Yogisha Dixit <ydixit@google.com>
Date: Mon, 22 Mar 2021 14:13:03 +0000
Subject: [PATCH 1525/1664] Show resize frame when widget is added.

I referenced the code in Workspace.java that updates the widget view's
layout params before showing the resize frame.

Test: manual, AddWidgetTest and AddConfigWidgetTest tapl tests
Bug: 183437963
Change-Id: I6655917878fa22d6084b4bf39fc0661e7278d6f9
---
 .../launcher3/AppWidgetResizeFrame.java       | 10 +++++-
 src/com/android/launcher3/Launcher.java       | 34 +++++++++++++++++++
 .../ui/widget/AddConfigWidgetTest.java        |  2 ++
 .../launcher3/ui/widget/AddWidgetTest.java    |  2 ++
 4 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java
index cd4af5e8f1..ee711463d9 100644
--- a/src/com/android/launcher3/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher3/AppWidgetResizeFrame.java
@@ -262,6 +262,14 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
             }
         }
 
+        CellLayout.LayoutParams lp = (CellLayout.LayoutParams) mWidgetView.getLayoutParams();
+        ItemInfo widgetInfo = (ItemInfo) mWidgetView.getTag();
+        lp.cellX = lp.tmpCellX = widgetInfo.cellX;
+        lp.cellY = lp.tmpCellY = widgetInfo.cellY;
+        lp.cellHSpan = widgetInfo.spanX;
+        lp.cellVSpan = widgetInfo.spanY;
+        lp.isLockedToGrid = true;
+
         // When we create the resize frame, we first mark all cells as unoccupied. The appropriate
         // cells (same if not resized, or different) will be marked as occupied when the resize
         // frame is dismissed.
@@ -270,7 +278,7 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
         mLauncher.getStatsLogManager()
                 .logger()
                 .withInstanceId(logInstanceId)
-                .withItemInfo((ItemInfo) mWidgetView.getTag())
+                .withItemInfo(widgetInfo)
                 .log(LAUNCHER_WIDGET_RESIZE_STARTED);
 
         setOnKeyListener(this);
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 1cfe7e0300..0da16b7e23 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1347,6 +1347,40 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         prepareAppWidget(hostView, launcherInfo);
         mWorkspace.addInScreen(hostView, launcherInfo);
         announceForAccessibility(R.string.item_added_to_workspace);
+
+        // Show the widget resize frame.
+        if (hostView instanceof LauncherAppWidgetHostView) {
+            final LauncherAppWidgetHostView launcherHostView = (LauncherAppWidgetHostView) hostView;
+            CellLayout cellLayout = getCellLayout(launcherInfo.container, launcherInfo.screenId);
+            if (mStateManager.getState() == NORMAL) {
+                // Show resize frame once the widget layout is drawn.
+                View.OnLayoutChangeListener onLayoutChangeListener =
+                        new View.OnLayoutChangeListener() {
+                            @Override
+                            public void onLayoutChange(View view, int left, int top, int right,
+                                    int bottom, int oldLeft, int oldTop, int oldRight,
+                                    int oldBottom) {
+                                AppWidgetResizeFrame.showForWidget(launcherHostView, cellLayout);
+                                launcherHostView.removeOnLayoutChangeListener(this);
+                            }
+                        };
+                launcherHostView.addOnLayoutChangeListener(onLayoutChangeListener);
+                // There is a small chance that the layout was already drawn before the layout
+                // change listener was registered, which means that the resize frame wouldn't be
+                // shown. Directly call requestLayout to force a layout change.
+                launcherHostView.requestLayout();
+            } else {
+                mStateManager.addStateListener(new StateManager.StateListener<LauncherState>() {
+                    @Override
+                    public void onStateTransitionComplete(LauncherState finalState) {
+                        if (mPrevLauncherState == SPRING_LOADED && finalState == NORMAL) {
+                            AppWidgetResizeFrame.showForWidget(launcherHostView, cellLayout);
+                            mStateManager.removeStateListener(this);
+                        }
+                    }
+                });
+            }
+        }
     }
 
     private void prepareAppWidget(AppWidgetHostView hostView, LauncherAppWidgetInfo item) {
diff --git a/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java
index b421b0e876..0c9c4630a4 100644
--- a/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java
+++ b/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java
@@ -102,6 +102,8 @@ public class AddConfigWidgetTest extends AbstractLauncherUiTest {
 
         setResult(acceptConfig);
         if (acceptConfig) {
+            // Dismiss widget resize frame.
+            mDevice.pressHome();
             Wait.atMost("", new WidgetSearchCondition(), DEFAULT_ACTIVITY_TIMEOUT, mLauncher);
             assertNotNull(mAppWidgetManager.getAppWidgetInfo(mWidgetId));
         } else {
diff --git a/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java
index 714b11b18e..dad4f2b045 100644
--- a/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java
+++ b/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java
@@ -58,6 +58,8 @@ public class AddWidgetTest extends AbstractLauncherUiTest {
                 openAllWidgets().
                 getWidget(widgetInfo.getLabel(mTargetContext.getPackageManager())).
                 dragToWorkspace(false, false);
+        // Dismiss widget resize frame.
+        mDevice.pressHome();
 
         assertTrue(mActivityMonitor.itemExists(
                 (info, view) -> info instanceof LauncherAppWidgetInfo &&
-- 
GitLab


From c26e5fff7cdd93f3df85190b0990537529b7636f Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Tue, 29 Jun 2021 12:53:27 -0700
Subject: [PATCH 1526/1664] Allow two lines max for text view in system
 shortcuts.

This makes it more accessible for more languages.

Bug: 185770234
Test: set language to Spanish, ensure 2 lines
      ensure deep shortcuts remain 1 lines

Change-Id: I652fe6a51bde5d8c30f695a0a56f0879412bca01
---
 res/layout/system_shortcut.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/layout/system_shortcut.xml b/res/layout/system_shortcut.xml
index 2cdf1f4bdb..de091c51c7 100644
--- a/res/layout/system_shortcut.xml
+++ b/res/layout/system_shortcut.xml
@@ -32,7 +32,8 @@
         android:paddingStart="@dimen/deep_shortcuts_text_padding_start"
         android:paddingEnd="@dimen/popup_padding_end"
         android:textSize="14sp"
-        android:singleLine="true"
+        android:minLines="1"
+        android:maxLines="2"
         android:ellipsize="end"
         android:textColor="?android:attr/textColorPrimary"
         launcher:iconDisplay="shortcut_popup"
-- 
GitLab


From 0f00c3526879a047b1e2024048010618c225f36b Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Tue, 29 Jun 2021 13:02:12 -0700
Subject: [PATCH 1527/1664] Decouple zooms and blurs on app launch

We'd like to be able to disable blurs during app launch, but without
disabling zooms as well. The previous sysprop would set the depth of
BackgroundAppState to 0, when what we want is to conserve wallpaper
zoom.

Bug: 191969790
Test: adb shell setprop ro.launcher.blur.appLaunch false
Change-Id: Ie4b26096f6ac723c3981bba2829557e6cc6c733b
---
 .../launcher3/QuickstepTransitionManager.java |  9 ++++++---
 .../statehandlers/DepthController.java        | 20 ++++++++++++++++++-
 .../states/BackgroundAppState.java            |  4 +---
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index ae7e4771eb..310e178955 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -981,11 +981,14 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
 
             depthController.setSurface(dimLayer);
             backgroundRadiusAnim.addListener(new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationStart(Animator animation) {
+                    depthController.setIsInLaunchTransition(true);
+                }
+
                 @Override
                 public void onAnimationEnd(Animator animation) {
-                    // Reset depth at the end of the launch animation, so the wallpaper won't be
-                    // zoomed out if an app crashes.
-                    DEPTH.setValue(depthController, 0f);
+                    depthController.setIsInLaunchTransition(false);
                     depthController.setSurface(null);
                     if (dimLayer != null) {
                         new SurfaceControl.Transaction()
diff --git a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
index 4503e308e6..bb8b62db71 100644
--- a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
+++ b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
@@ -24,6 +24,7 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.os.IBinder;
+import android.os.SystemProperties;
 import android.util.FloatProperty;
 import android.view.CrossWindowBlurListeners;
 import android.view.SurfaceControl;
@@ -117,6 +118,10 @@ public class DepthController implements StateHandler<LauncherState>,
      * @see android.service.wallpaper.WallpaperService.Engine#onZoomChanged(float)
      */
     private float mDepth;
+    /**
+     * If we're launching and app and should not be blurring the screen for performance reasons.
+     */
+    private boolean mBlurDisabledForAppLaunch;
 
     // Workaround for animating the depth when multiwindow mode changes.
     private boolean mIgnoreStateChangesDuringMultiWindowAnimation = false;
@@ -211,6 +216,19 @@ public class DepthController implements StateHandler<LauncherState>,
         }
     }
 
+    /**
+     * If we're launching an app from the home screen.
+     */
+    public void setIsInLaunchTransition(boolean inLaunchTransition) {
+        boolean blurEnabled = SystemProperties.getBoolean("ro.launcher.blur.appLaunch", true);
+        mBlurDisabledForAppLaunch = inLaunchTransition && !blurEnabled;
+        if (!inLaunchTransition) {
+            // Reset depth at the end of the launch animation, so the wallpaper won't be
+            // zoomed out if an app crashes.
+            setDepth(0f);
+        }
+    }
+
     private void setDepth(float depth) {
         depth = Utilities.boundToRange(depth, 0, 1);
         // Round out the depth to dedupe frequent, non-perceptable updates
@@ -238,7 +256,7 @@ public class DepthController implements StateHandler<LauncherState>,
             boolean opaque = mLauncher.getScrimView().isFullyOpaque() && !isOverview;
 
             int blur = opaque || isOverview || !mCrossWindowBlursEnabled
-                    ? 0 : (int) (mDepth * mMaxBlurRadius);
+                    || mBlurDisabledForAppLaunch ? 0 : (int) (mDepth * mMaxBlurRadius);
             new SurfaceControl.Transaction()
                     .setBackgroundBlurRadius(mSurface, blur)
                     .setOpaque(mSurface, opaque)
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
index 01c9e765a8..fe5a3475ff 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
@@ -19,7 +19,6 @@ import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKG
 
 import android.content.Context;
 import android.graphics.Color;
-import android.os.SystemProperties;
 
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.DeviceProfile;
@@ -85,8 +84,7 @@ public class BackgroundAppState extends OverviewState {
 
     @Override
     protected float getDepthUnchecked(Context context) {
-        //TODO revert when b/178661709 is fixed
-        return SystemProperties.getBoolean("ro.launcher.depth.appLaunch", true) ? 1 : 0;
+        return 1;
     }
 
     @Override
-- 
GitLab


From 401b921c190199bb73cc2d2218e9d30911b625a8 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Tue, 29 Jun 2021 14:23:55 -0700
Subject: [PATCH 1528/1664] Fix bug where status bar was not set properly.

- Need to check both alpha of the view, and alpha of the background color.

Bug: 187467559
Test: check status bar colors when using:
      - on white wallpaper,
      - on black wallpaper,
      - on wallpaper with white text
      - on wallpaper with dark text

Change-Id: Ie6f34d34dfa9dea716f95bd6a95125fbd650fc29
---
 src/com/android/launcher3/views/ScrimView.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/views/ScrimView.java b/src/com/android/launcher3/views/ScrimView.java
index fb1485b480..1eb79ad550 100644
--- a/src/com/android/launcher3/views/ScrimView.java
+++ b/src/com/android/launcher3/views/ScrimView.java
@@ -97,8 +97,10 @@ public class ScrimView extends View implements Insettable {
     private void updateSysUiColors() {
         // Use a light system UI (dark icons) if all apps is behind at least half of the
         // status bar.
-        boolean forceChange =
-                getVisibility() == VISIBLE && getAlpha() > STATUS_BAR_COLOR_FORCE_UPDATE_THRESHOLD;
+        final float threshold = STATUS_BAR_COLOR_FORCE_UPDATE_THRESHOLD;
+        boolean forceChange = getVisibility() == VISIBLE
+                && getAlpha() > threshold
+                && (Color.alpha(mBackgroundColor) / 255f) > threshold;
         if (forceChange) {
             getSystemUiController().updateUiState(UI_STATE_SCRIM_VIEW, !isScrimDark());
         } else {
-- 
GitLab


From 0b9537e6fc9df24eda734bcb0ab6b5070a5eebae Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Mon, 28 Jun 2021 21:48:42 -0700
Subject: [PATCH 1529/1664] Rebind recycler views if launcher activity
 restarted

Bug: 185038312
Test: manual
TL;DR;;
What was attempted but was too much refactoring of the code.

Failed attempt #1: try re triggering the search.
This was not trivial as SearchSession object is yet created.

Failed attempt #2: Restoring AdapterItems in AlphabeticalAppsList
This meant AdapterItems class and also it's children
had to extend Parceleable object.

Ultimate fix:
Original issue of dupe view id among slice and work recyclerview
should be fixed. And restoring should just work.

Change-Id: I1bddd6aa5bc736ade3b02f69aa947d64cfa467d6
---
 .../android/launcher3/allapps/AllAppsContainerView.java    | 7 +++++--
 src/com/android/launcher3/allapps/AllAppsRecyclerView.java | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index ab3ea0abe7..d1e643fd9f 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -184,16 +184,19 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         } catch (Exception e) {
             Log.e("AllAppsContainerView", "restoreInstanceState viewId = 0", e);
         }
+
         Bundle state = (Bundle) sparseArray.get(R.id.work_tab_state_id, null);
         if (state != null) {
             int currentPage = state.getInt(BUNDLE_KEY_CURRENT_PAGE, 0);
             if (currentPage != 0) {
-                rebindAdapters(true);
                 mViewPager.setCurrentPage(currentPage);
+                rebindAdapters(true);
+            } else {
+                mSearchUiManager.resetSearch();
             }
         }
-    }
 
+    }
 
     @Override
     protected void dispatchSaveInstanceState(SparseArray<Parcelable> container) {
diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
index d7a69f1b01..9a5f3f2be9 100644
--- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
@@ -40,6 +40,7 @@ import com.android.launcher3.BaseRecyclerView;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.views.ActivityContext;
 import com.android.launcher3.views.RecyclerViewFastScroller;
@@ -166,7 +167,7 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
         // Always scroll the view to the top so the user can see the changed results
         scrollToTop();
 
-        if (mApps.hasNoFilteredResults()) {
+        if (mApps.hasNoFilteredResults() && !FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
             if (mEmptySearchBackground == null) {
                 mEmptySearchBackground = new AllAppsBackgroundDrawable(getContext());
                 mEmptySearchBackground.setAlpha(0);
-- 
GitLab


From fa73c02172f8c9cae098a22c289b1c924dd09c41 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Tue, 29 Jun 2021 15:49:46 -0700
Subject: [PATCH 1530/1664] Set elevation of popup and arrow to match. This
 ensures no shadow overlap.

Bug: 191823198
Test: long press app where arrow is on top and bottom in:
      workspace, all apps, and search UI

Change-Id: Icc4ac259607175d5e12447a844ba166ba28b74af
---
 src/com/android/launcher3/popup/ArrowPopup.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java
index b7fe3480fa..a534ee3eb4 100644
--- a/src/com/android/launcher3/popup/ArrowPopup.java
+++ b/src/com/android/launcher3/popup/ArrowPopup.java
@@ -511,8 +511,8 @@ public abstract class ArrowPopup<T extends StatefulActivity<LauncherState>>
                     mArrowOffsetHorizontal, -mArrowOffsetVertical,
                     !mIsAboveIcon, mIsLeftAligned,
                     mArrowColor));
-            // TODO: Remove elevation when arrow is above as it casts a shadow on the container
-            mArrow.setElevation(mIsAboveIcon ? mElevation : 0);
+            setElevation(mElevation);
+            mArrow.setElevation(mElevation);
         }
     }
 
-- 
GitLab


From ce50b9ed83c9e705ccba328b86321d5352b6b303 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 29 Jun 2021 16:31:23 -0700
Subject: [PATCH 1531/1664] AllSet page fixes

> Updating background color
> Updating activity theme to not be transparent
> Updating default accent color
> Adding an accessible target to exit

Bug: 190447132
Bug: 190136972
Bug: 190454597
Test: Manual
Change-Id: Ia8ef67ed429c062a8d1109d7f444343ec4ca09cf
---
 quickstep/AndroidManifest.xml                 |   2 +
 quickstep/res/layout/activity_allset.xml      |  13 +-
 quickstep/res/values-night/styles.xml         |  27 ++++
 quickstep/res/values/styles.xml               |   8 +
 .../quickstep/interaction/AllSetActivity.java | 113 +++++---------
 .../quickstep/interaction/AnnotationSpan.java | 143 ------------------
 6 files changed, 85 insertions(+), 221 deletions(-)
 create mode 100644 quickstep/res/values-night/styles.xml
 delete mode 100644 quickstep/src/com/android/quickstep/interaction/AnnotationSpan.java

diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml
index bf9059f1c4..483ddc1905 100644
--- a/quickstep/AndroidManifest.xml
+++ b/quickstep/AndroidManifest.xml
@@ -130,6 +130,8 @@
             android:excludeFromRecents="true"
             android:screenOrientation="portrait"
             android:permission="android.permission.REBOOT"
+            android:theme="@style/AllSetTheme"
+            android:label="@string/allset_title"
             android:exported="true">
             <intent-filter>
                 <action android:name="com.android.quickstep.action.GESTURE_ONBOARDING_ALL_SET"/>
diff --git a/quickstep/res/layout/activity_allset.xml b/quickstep/res/layout/activity_allset.xml
index a6a17e5ebc..e79e57efef 100644
--- a/quickstep/res/layout/activity_allset.xml
+++ b/quickstep/res/layout/activity_allset.xml
@@ -20,8 +20,7 @@
     android:paddingStart="@dimen/allset_page_margin_horizontal"
     android:paddingEnd="@dimen/allset_page_margin_horizontal"
     android:layoutDirection="locale"
-    android:textDirection="locale"
-    android:background="?android:attr/colorBackground">
+    android:textDirection="locale">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -59,13 +58,15 @@
 
     <TextView
         android:id="@+id/navigation_settings"
-        style="@style/TextAppearance.GestureTutorial.Feedback.Subtitle"
-        android:textSize="14sp"
+        style="@style/TextAppearance.GestureTutorial.LinkText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_above="@+id/hint"
-        android:gravity="center_horizontal"
-        android:layout_marginBottom="72dp"/>
+        android:gravity="center"
+        android:layout_marginBottom="72dp"
+        android:minHeight="48dp"
+        android:background="?android:attr/selectableItemBackground"
+        android:text="@string/allset_navigation_settings" />
 
     <TextView
         android:id="@id/hint"
diff --git a/quickstep/res/values-night/styles.xml b/quickstep/res/values-night/styles.xml
new file mode 100644
index 0000000000..1bd3f5d138
--- /dev/null
+++ b/quickstep/res/values-night/styles.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+
+    <style name="AllSetTheme" parent="@android:style/Theme.DeviceDefault.NoActionBar">
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:enforceNavigationBarContrast">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+        <item name="android:windowBackground">#FF000000</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml
index cfca1246ad..ca1e8c835e 100644
--- a/quickstep/res/values/styles.xml
+++ b/quickstep/res/values/styles.xml
@@ -110,6 +110,14 @@
         <item name="android:textSize">14sp</item>
     </style>
 
+    <style name="AllSetTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:enforceNavigationBarContrast">false</item>
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:windowBackground">#FFFFFFFF</item>
+    </style>
+
     <!--
       Can be applied to views to color things like ripples and list highlights the workspace text
       color.
diff --git a/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java b/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java
index 6f681b33f1..4472bdcf73 100644
--- a/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java
+++ b/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java
@@ -16,23 +16,22 @@
 package com.android.quickstep.interaction;
 
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
-import android.content.res.TypedArray;
 import android.graphics.Color;
-import android.graphics.Typeface;
 import android.os.Bundle;
-import android.text.TextPaint;
-import android.text.method.LinkMovementMethod;
 import android.util.Log;
 import android.view.View;
+import android.view.View.AccessibilityDelegate;
+import android.view.accessibility.AccessibilityNodeInfo;
+import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 
 import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
 
 import java.net.URISyntaxException;
 
@@ -48,86 +47,56 @@ public class AllSetActivity extends Activity {
     private static final String EXTRA_ACCENT_COLOR_DARK_MODE = "suwColorAccentDark";
     private static final String EXTRA_ACCENT_COLOR_LIGHT_MODE = "suwColorAccentLight";
 
-    private int mAccentColor;
-
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_allset);
-        setTitle(R.string.allset_title);
-
-        final int mode =
-                getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
-        mAccentColor = getIntent().getIntExtra(
-                mode == Configuration.UI_MODE_NIGHT_YES
-                        ? EXTRA_ACCENT_COLOR_DARK_MODE : EXTRA_ACCENT_COLOR_LIGHT_MODE,
-                /* defValue= */ Color.BLACK);
-
-        ((ImageView) findViewById(R.id.icon)).getDrawable().mutate().setTint(mAccentColor);
 
-        TextView navigationSettings = findViewById(R.id.navigation_settings);
-        navigationSettings.setMovementMethod(LinkMovementMethod.getInstance());
-        AnnotationSpan.LinkInfo linkInfo = new AnnotationSpan.LinkInfo(
-                AnnotationSpan.LinkInfo.DEFAULT_ANNOTATION,
-                new AllSetLinkSpan(
-                        /* context= */ this,
-                        view -> {
-                            try {
-                                startActivityForResult(
-                                        Intent.parseUri(URI_SYSTEM_NAVIGATION_SETTING, 0), 0);
-                            } catch (URISyntaxException e) {
-                                Log.e(LOG_TAG, "Failed to parse system nav settings intent", e);
-                            }
-                            finish();
-                        }));
-        navigationSettings.setText(
-                AnnotationSpan.linkify(getText(R.string.allset_navigation_settings), linkInfo));
-    }
-
-    @Override
-    public void onWindowFocusChanged(boolean hasFocus) {
-        super.onWindowFocusChanged(hasFocus);
-        if (hasFocus) {
-            hideSystemUI();
-        }
-    }
+        int mode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+        boolean isDarkTheme = mode == Configuration.UI_MODE_NIGHT_YES;
+        int accentColor = getIntent().getIntExtra(
+                isDarkTheme ? EXTRA_ACCENT_COLOR_DARK_MODE : EXTRA_ACCENT_COLOR_LIGHT_MODE,
+                isDarkTheme ? Color.WHITE : Color.BLACK);
+
+        ((ImageView) findViewById(R.id.icon)).getDrawable().mutate().setTint(accentColor);
+
+        TextView tv = findViewById(R.id.navigation_settings);
+        tv.setTextColor(accentColor);
+        tv.setOnClickListener(v -> {
+            try {
+                startActivityForResult(
+                        Intent.parseUri(URI_SYSTEM_NAVIGATION_SETTING, 0), 0);
+            } catch (URISyntaxException e) {
+                Log.e(LOG_TAG, "Failed to parse system nav settings intent", e);
+            }
+            finish();
+        });
 
-    private void hideSystemUI() {
-        getWindow().getDecorView().setSystemUiVisibility(
-                View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-                        | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                        | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                        | View.SYSTEM_UI_FLAG_FULLSCREEN);
-        getWindow().setNavigationBarColor(Color.TRANSPARENT);
+        findViewById(R.id.hint).setAccessibilityDelegate(new SkipButtonAccessibilityDelegate());
     }
 
-    private final class AllSetLinkSpan extends AnnotationSpan {
+    /**
+     * Accessibility delegate which exposes a click event without making the view
+     * clickable in touch mode
+     */
+    private class SkipButtonAccessibilityDelegate extends AccessibilityDelegate {
 
-        private final String mFontFamily;
-        private final int mTextSize;
-
-        AllSetLinkSpan(Context context, View.OnClickListener listener) {
-            super(listener);
-            TypedArray typedArray =
-                    context.obtainStyledAttributes(R.style.TextAppearance_GestureTutorial_LinkText,
-                            R.styleable.AllSetLinkSpan);
-            mFontFamily = typedArray.getString(R.styleable.AllSetLinkSpan_android_fontFamily);
-            mTextSize =
-                    typedArray.getDimensionPixelSize(
-                            R.styleable.AllSetLinkSpan_android_textSize, /* defValue= */ -1);
-            typedArray.recycle();
+        @Override
+        public AccessibilityNodeInfo createAccessibilityNodeInfo(View host) {
+            AccessibilityNodeInfo info = super.createAccessibilityNodeInfo(host);
+            info.addAction(AccessibilityAction.ACTION_CLICK);
+            info.setClickable(true);
+            return info;
         }
 
         @Override
-        public void updateDrawState(TextPaint ds) {
-            super.updateDrawState(ds);
-            ds.setColor(mAccentColor);
-            ds.setTypeface(Typeface.create(mFontFamily, Typeface.NORMAL));
-            ds.setUnderlineText(false);
-            if (mTextSize != -1) {
-                ds.setTextSize(mTextSize);
+        public boolean performAccessibilityAction(View host, int action, Bundle args) {
+            if (action == AccessibilityAction.ACTION_CLICK.getId()) {
+                startActivity(Utilities.createHomeIntent());
+                finish();
+                return true;
             }
+            return super.performAccessibilityAction(host, action, args);
         }
     }
-
 }
diff --git a/quickstep/src/com/android/quickstep/interaction/AnnotationSpan.java b/quickstep/src/com/android/quickstep/interaction/AnnotationSpan.java
deleted file mode 100644
index fea5078e56..0000000000
--- a/quickstep/src/com/android/quickstep/interaction/AnnotationSpan.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.quickstep.interaction;
-
-import android.content.ActivityNotFoundException;
-import android.content.Context;
-import android.content.Intent;
-import android.text.Annotation;
-import android.text.SpannableString;
-import android.text.SpannableStringBuilder;
-import android.text.style.URLSpan;
-import android.util.Log;
-import android.view.View;
-
-import java.util.Arrays;
-import java.util.Comparator;
-
-/**
- * This class is used to add {@link View.OnClickListener} for the text been wrapped by
- * annotation.
- *
- * Copied from packages/apps/Settings/src/com/android/settings/utils/AnnotationSpan.java.
- */
-public class AnnotationSpan extends URLSpan {
-
-    private final View.OnClickListener mClickListener;
-
-    AnnotationSpan(View.OnClickListener lsn) {
-        super((String) null);
-        mClickListener = lsn;
-    }
-
-    @Override
-    public void onClick(View widget) {
-        if (mClickListener != null) {
-            mClickListener.onClick(widget);
-        }
-    }
-
-    public static CharSequence linkify(CharSequence rawText, LinkInfo... linkInfos) {
-        SpannableString msg = new SpannableString(rawText);
-        Annotation[] spans = msg.getSpans(0, msg.length(), Annotation.class);
-        SpannableStringBuilder builder = new SpannableStringBuilder(msg);
-        for (Annotation annotation : spans) {
-            final String key = annotation.getValue();
-            int start = msg.getSpanStart(annotation);
-            int end = msg.getSpanEnd(annotation);
-            AnnotationSpan link = null;
-            for (LinkInfo linkInfo : linkInfos) {
-                if (linkInfo.mAnnotation.equals(key)) {
-                    link = linkInfo.mCustomizedSpan != null ? linkInfo.mCustomizedSpan
-                            : new AnnotationSpan(linkInfo.mClickListener);
-                    break;
-                }
-            }
-            if (link != null) {
-                builder.setSpan(link, start, end, msg.getSpanFlags(link));
-            }
-        }
-        return builder;
-    }
-
-    /**
-     * get the text part without having text for link part
-     */
-    public static CharSequence textWithoutLink(CharSequence encodedText) {
-        SpannableString msg = new SpannableString(encodedText);
-        Annotation[] spans = msg.getSpans(0, msg.length(), Annotation.class);
-        if (spans == null) {
-            return encodedText;
-        }
-        Arrays.sort(spans, Comparator.comparingInt(span -> -msg.getSpanStart(span)));
-        StringBuilder msgWithoutLink = new StringBuilder(msg.toString());
-        for (Annotation span : spans) {
-            msgWithoutLink.delete(msg.getSpanStart(span), msg.getSpanEnd(span));
-        }
-        return msgWithoutLink.toString();
-    }
-
-    /** Data class to store the annotation and the click action. */
-    public static class LinkInfo {
-        public static final String DEFAULT_ANNOTATION = "link";
-        private static final String TAG = "AnnotationSpan.LinkInfo";
-        private final String mAnnotation;
-        private final Boolean mActionable;
-        private final View.OnClickListener mClickListener;
-        private final AnnotationSpan mCustomizedSpan;
-
-        public LinkInfo(String annotation, View.OnClickListener listener) {
-            mAnnotation = annotation;
-            mClickListener = listener;
-            mActionable = true; // assume actionable
-            mCustomizedSpan = null;
-        }
-
-        public LinkInfo(String annotation, AnnotationSpan customizedSpan) {
-            mAnnotation = annotation;
-            mClickListener = null;
-            mActionable = customizedSpan != null;
-            mCustomizedSpan = customizedSpan;
-        }
-
-        public LinkInfo(Context context, String annotation, Intent intent) {
-            mAnnotation = annotation;
-            mCustomizedSpan = null;
-            if (intent != null) {
-                mActionable = context.getPackageManager().resolveActivity(intent, 0) != null;
-            } else {
-                mActionable = false;
-            }
-            if (mActionable) {
-                mClickListener =
-                        view -> {
-                            try {
-                                context.startActivity(intent);
-                            } catch (ActivityNotFoundException e) {
-                                Log.w(TAG, "Activity was not found for intent, " + intent);
-                            }
-                        };
-            } else {
-                mClickListener = null;
-            }
-        }
-
-        public boolean isActionable() {
-            return mActionable;
-        }
-    }
-}
-- 
GitLab


From 610e43f90eae6da890e9c237dd1866668be9779f Mon Sep 17 00:00:00 2001
From: Brian Isganitis <brianji@google.com>
Date: Tue, 29 Jun 2021 18:12:38 -0400
Subject: [PATCH 1532/1664] Intercept touch events for launcher preview root
 view

This change prevents any accidental touches on any widgets in the
preview.

Test: Tapping on launcher preview in wallpaper app should never activate
a widget.
Fix: 191623924

Change-Id: Iac7eab057ec33ff491365a993af75a0b06a27f7e
Merged-In: I98d462eca699cf368dcd5894f15584f280932ccc
---
 res/layout/launcher_preview_layout.xml              |  4 ++--
 .../launcher3/graphics/LauncherPreviewRenderer.java | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/res/layout/launcher_preview_layout.xml b/res/layout/launcher_preview_layout.xml
index 16916800f3..cf2f2c75ee 100644
--- a/res/layout/launcher_preview_layout.xml
+++ b/res/layout/launcher_preview_layout.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher3.InsettableFrameLayout
+<view class="com.android.launcher3.graphics.LauncherPreviewRenderer$LauncherPreviewLayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -33,4 +33,4 @@
         android:id="@+id/hotseat"
         layout="@layout/hotseat" />
 
-</com.android.launcher3.InsettableFrameLayout>
\ No newline at end of file
+</view>
\ No newline at end of file
diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index 2a1aec84a3..cf3da4b9b7 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -43,6 +43,7 @@ import android.os.Process;
 import android.util.AttributeSet;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
@@ -467,4 +468,16 @@ public class LauncherPreviewRenderer extends ContextWrapper
         view.measure(makeMeasureSpec(width, EXACTLY), makeMeasureSpec(height, EXACTLY));
         view.layout(0, 0, width, height);
     }
+
+    /** Root layout for launcher preview that intercepts all touch events. */
+    public static class LauncherPreviewLayout extends InsettableFrameLayout {
+        public LauncherPreviewLayout(Context context, AttributeSet attrs) {
+            super(context, attrs);
+        }
+
+        @Override
+        public boolean onInterceptTouchEvent(MotionEvent ev) {
+            return true;
+        }
+    }
 }
-- 
GitLab


From 8ae56bd4e397e762aca90af8a371603b7c2feaab Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 29 Jun 2021 17:02:48 -0700
Subject: [PATCH 1533/1664] Fully null check mRecentsAnimationController

It's already null checked everywhere else it's used.

Test: none
Fixes: 187354606
Change-Id: I50913c38b2653fe292d84fabe111ff3a3e10736d
---
 .../android/quickstep/AbsSwipeUpHandler.java    | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 7f38923671..524cd53839 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -140,7 +140,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     private final ArrayList<Runnable> mRecentsAnimationStartCallbacks = new ArrayList<>();
     private final OnScrollChangedListener mOnRecentsScrollListener = this::onRecentsViewScroll;
 
-    protected RecentsAnimationController mRecentsAnimationController;
+    // Null if the recents animation hasn't started yet or has been canceled or finished.
+    protected @Nullable RecentsAnimationController mRecentsAnimationController;
     protected RecentsAnimationTargets mRecentsAnimationTargets;
     protected T mActivity;
     protected Q mRecentsView;
@@ -1353,8 +1354,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
 
     @UiThread
     private void resumeLastTask() {
-        mRecentsAnimationController.finish(false /* toRecents */, null);
-        ActiveGestureLog.INSTANCE.addLog("finishRecentsAnimation", false);
+        if (mRecentsAnimationController != null) {
+            mRecentsAnimationController.finish(false /* toRecents */, null);
+            ActiveGestureLog.INSTANCE.addLog("finishRecentsAnimation", false);
+        }
         doLogGesture(LAST_TASK, null);
         reset();
     }
@@ -1662,13 +1665,17 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                         }
                     } else {
                         mActivityInterface.onLaunchTaskFailed();
-                        mRecentsAnimationController.finish(true /* toRecents */, null);
+                        if (mRecentsAnimationController != null) {
+                            mRecentsAnimationController.finish(true /* toRecents */, null);
+                        }
                     }
                 }, true /* freezeTaskList */);
             } else {
                 mActivityInterface.onLaunchTaskFailed();
                 Toast.makeText(mContext, R.string.activity_not_available, LENGTH_SHORT).show();
-                mRecentsAnimationController.finish(true /* toRecents */, null);
+                if (mRecentsAnimationController != null) {
+                    mRecentsAnimationController.finish(true /* toRecents */, null);
+                }
             }
         }
         mCanceled = false;
-- 
GitLab


From 58905b4f0a59cad3c7d256971937d38a25f3198f Mon Sep 17 00:00:00 2001
From: Jon Spivack <spivack@google.com>
Date: Thu, 24 Jun 2021 14:55:40 -0700
Subject: [PATCH 1534/1664] NIU Actions: Add privacy confirmation dialog

This adds a dialog to inform the user that the NIU Actions buttons need to send data to Google in order to function. The user can accept or reject this. The dialog will block use of the feature until the user accepts.

Bug: 191818216
Test: Manual (Pixel 3A with multiple user profiles)
Test: m -j RunLauncherGoGoogleRoboTests
Change-Id: Iedd056ce239de5269d02a31d28a9778efae34ede
---
 .../res/drawable/round_rect_dialog.xml        | 20 ++++
 .../niu_actions_confirmation_dialog.xml       | 94 +++++++++++++++++++
 go/quickstep/res/values-land/dimens.xml       | 22 +++++
 go/quickstep/res/values/attrs.xml             |  2 +
 go/quickstep/res/values/colors.xml            |  3 +
 go/quickstep/res/values/dimens.xml            |  8 ++
 go/quickstep/res/values/strings.xml           |  9 ++
 go/quickstep/res/values/styles.xml            | 31 ++++++
 .../quickstep/TaskOverlayFactoryGo.java       | 57 +++++++++++
 9 files changed, 246 insertions(+)
 create mode 100644 go/quickstep/res/drawable/round_rect_dialog.xml
 create mode 100644 go/quickstep/res/layout/niu_actions_confirmation_dialog.xml
 create mode 100644 go/quickstep/res/values-land/dimens.xml

diff --git a/go/quickstep/res/drawable/round_rect_dialog.xml b/go/quickstep/res/drawable/round_rect_dialog.xml
new file mode 100644
index 0000000000..bbb7c5b545
--- /dev/null
+++ b/go/quickstep/res/drawable/round_rect_dialog.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <corners android:radius="@dimen/modal_dialog_corner_radius" />
+</shape>
diff --git a/go/quickstep/res/layout/niu_actions_confirmation_dialog.xml b/go/quickstep/res/layout/niu_actions_confirmation_dialog.xml
new file mode 100644
index 0000000000..db1531ac58
--- /dev/null
+++ b/go/quickstep/res/layout/niu_actions_confirmation_dialog.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/niu_actions_confirmation_dialog_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"
+    android:layout_gravity="center">
+
+    <Space
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:layout_weight="1"/>
+
+    <LinearLayout
+        android:layout_width="@dimen/modal_dialog_width"
+        android:layout_height="wrap_content"
+        android:background="@drawable/round_rect_dialog"
+        android:backgroundTint="?attr/modalDialogBackground"
+        android:orientation="vertical"
+        android:layout_gravity="center"
+        android:paddingTop="@dimen/modal_dialog_padding"
+        android:paddingLeft="@dimen/modal_dialog_padding"
+        android:paddingRight="@dimen/modal_dialog_padding"
+        android:paddingBottom="@dimen/modal_dialog_padding_bottom">
+
+        <TextView
+            style="@style/ModalDialogTitle"
+            android:id="@+id/niu_actions_confirmation_header"
+            android:text="@string/niu_actions_confirmation_title"/>
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="@dimen/modal_dialog_vertical_spacer"/>
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/confirmation_dialog_text_height">
+
+            <TextView
+                style="@style/ModalDialogText"
+                android:id="@+id/niu_actions_confirmation_description"
+                android:text="@string/niu_actions_confirmation_text"/>
+        </ScrollView>
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="@dimen/modal_dialog_vertical_spacer"/>
+
+        <LinearLayout
+            android:id="@+id/niu_actions_confirmation_buttons"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+
+            <Space
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1"/>
+
+            <Button
+                style="@style/ModalDialogButton"
+                android:id="@+id/niu_actions_confirmation_reject"
+                android:text="@string/niu_actions_confirmation_no"/>
+
+            <Button
+                style="@style/ModalDialogButton"
+                android:id="@+id/niu_actions_confirmation_accept"
+                android:text="@string/niu_actions_confirmation_yes"/>
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <Space
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:layout_weight="1" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/go/quickstep/res/values-land/dimens.xml b/go/quickstep/res/values-land/dimens.xml
new file mode 100644
index 0000000000..50970162cd
--- /dev/null
+++ b/go/quickstep/res/values-land/dimens.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Modal Dialogs -->
+    <dimen name="modal_dialog_width">360dp</dimen>
+    <dimen name="confirmation_dialog_text_height">168dp</dimen>
+</resources>
diff --git a/go/quickstep/res/values/attrs.xml b/go/quickstep/res/values/attrs.xml
index 03eab50d32..cdbdc2afe7 100644
--- a/go/quickstep/res/values/attrs.xml
+++ b/go/quickstep/res/values/attrs.xml
@@ -19,4 +19,6 @@
     <attr name="overviewButtonTextColor" format="color" />
     <attr name="overviewButtonIconColor" format="color" />
     <attr name="overviewButtonBackgroundColor" format="color" />
+    <!-- Modal dialog theming -->
+    <attr name="modalDialogBackground" format="color" />
 </resources>
\ No newline at end of file
diff --git a/go/quickstep/res/values/colors.xml b/go/quickstep/res/values/colors.xml
index ae72ef63dc..8034be217d 100644
--- a/go/quickstep/res/values/colors.xml
+++ b/go/quickstep/res/values/colors.xml
@@ -20,4 +20,7 @@
     <color name="go_overview_text_color_dark">#F8F9FA</color>
     <color name="go_overview_button_color">#70FFFFFF</color>
     <color name="go_overview_button_color_dark">#474747</color>
+    <!-- Modal Dialogs -->
+    <color name="go_modal_dialog_background">#FFFFFF</color>
+    <color name="go_modal_dialog_background_dark">#424242</color>
 </resources>
diff --git a/go/quickstep/res/values/dimens.xml b/go/quickstep/res/values/dimens.xml
index 55cd138f12..0a7ac4563d 100644
--- a/go/quickstep/res/values/dimens.xml
+++ b/go/quickstep/res/values/dimens.xml
@@ -28,4 +28,12 @@
     <dimen name="overview_proactive_row_height">0dp</dimen>
     <dimen name="overview_proactive_row_bottom_margin">24dp</dimen>
     <dimen name="task_corner_radius_override">28dp</dimen>
+
+    <!-- Modal Dialogs -->
+    <dimen name="modal_dialog_width">288dp</dimen>
+    <dimen name="modal_dialog_padding">24dp</dimen>
+    <dimen name="modal_dialog_padding_bottom">8dp</dimen>
+    <dimen name="modal_dialog_vertical_spacer">12dp</dimen>
+    <dimen name="modal_dialog_corner_radius">8dp</dimen>
+    <dimen name="confirmation_dialog_text_height">216dp</dimen>
 </resources>
diff --git a/go/quickstep/res/values/strings.xml b/go/quickstep/res/values/strings.xml
index 61c8cd9343..6e9e63e3c2 100644
--- a/go/quickstep/res/values/strings.xml
+++ b/go/quickstep/res/values/strings.xml
@@ -11,4 +11,13 @@
     <string name="action_translate">Translate</string>
     <!-- Label for a button that triggers Search on a screenshot of the current app. [CHAR_LIMIT=40] -->
     <string name="action_search">Lens</string>
+    <!-- ******* NIU Actions First-Run Confirmation Dialog ******* -->
+    <!-- Dialog title -->
+    <string name="niu_actions_confirmation_title">Translate or listen to text on screen</string>
+    <!-- Dialog content -->
+    <string name="niu_actions_confirmation_text">Information such as text on your screen, web addresses, and screenshots may be shared with Google.\n\nTo change what information you share, go to <b>Settings > Apps > Default apps > Digital assistant app</b>.</string>
+    <!-- Label for a button that rejects the feature. [CHAR_LIMIT=40] -->
+    <string name="niu_actions_confirmation_no">CANCEL</string>
+    <!-- Label for a button that accepts the feature. [CHAR_LIMIT=40] -->
+    <string name="niu_actions_confirmation_yes">GOT IT</string>
 </resources>
diff --git a/go/quickstep/res/values/styles.xml b/go/quickstep/res/values/styles.xml
index ffe8f4607d..561531b623 100644
--- a/go/quickstep/res/values/styles.xml
+++ b/go/quickstep/res/values/styles.xml
@@ -20,12 +20,14 @@
         <item name="overviewButtonTextColor">@color/go_overview_text_color</item>
         <item name="overviewButtonIconColor">@color/go_overview_text_color</item>
         <item name="overviewButtonBackgroundColor">@color/go_overview_button_color</item>
+        <item name="modalDialogBackground">@color/go_modal_dialog_background</item>
     </style>
 
     <style name="AppTheme.Dark" parent="@style/LauncherTheme.Dark">
         <item name="overviewButtonTextColor">@color/go_overview_text_color_dark</item>
         <item name="overviewButtonIconColor">@color/go_overview_text_color_dark</item>
         <item name="overviewButtonBackgroundColor">@color/go_overview_button_color_dark</item>
+        <item name="modalDialogBackground">@color/go_modal_dialog_background_dark</item>
     </style>
 
     <!-- Overview -->
@@ -56,4 +58,33 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:orientation">vertical</item>
     </style>
+
+    <!-- Modal Dialogs -->
+    <style name="ModalDialogTitle">
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textSize">20sp</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:lineHeight">24dp</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_gravity">center_horizontal</item>
+    </style>
+
+    <style name="ModalDialogText">
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
+        <item name="android:lineHeight">24dp</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_gravity">center_horizontal</item>
+    </style>
+
+    <style name="ModalDialogButton" parent="@style/Widget.AppCompat.Button.Borderless">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">?android:attr/colorAccent</item>
+        <item name="android:lineHeight">20dp</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
index b823c36501..37f535200a 100644
--- a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
+++ b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
@@ -20,20 +20,31 @@ import static com.android.quickstep.views.OverviewActionsView.DISABLED_NO_THUMBN
 import static com.android.quickstep.views.OverviewActionsView.DISABLED_ROTATED;
 
 import android.annotation.SuppressLint;
+import android.app.AlertDialog;
 import android.app.assist.AssistContent;
 import android.content.ActivityNotFoundException;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
+import android.graphics.Color;
 import android.graphics.Matrix;
+import android.graphics.drawable.ColorDrawable;
 import android.os.SystemClock;
 import android.os.UserManager;
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
 
 import androidx.annotation.VisibleForTesting;
 
+import com.android.launcher3.BaseActivity;
+import com.android.launcher3.BaseDraggingActivity;
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
 import com.android.quickstep.util.AssistContentRequester;
 import com.android.quickstep.views.OverviewActionsView;
 import com.android.quickstep.views.TaskThumbnailView;
@@ -53,6 +64,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
     public static final String ACTIONS_ERROR_CODE = "niu_actions_app_error_code";
     public static final int ERROR_PERMISSIONS_STRUCTURE = 1;
     public static final int ERROR_PERMISSIONS_SCREENSHOT = 2;
+    private static final String NIU_ACTIONS_CONFIRMED = "launcher_go.niu_actions_confirmed";
     private static final String TAG = "TaskOverlayFactoryGo";
 
     private AssistContentRequester mContentRequester;
@@ -79,6 +91,9 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
         private boolean mAssistStructurePermitted;
         private boolean mAssistScreenshotPermitted;
         private AssistContentRequester mFactoryContentRequester;
+        private SharedPreferences mSharedPreferences;
+        private String mPreviousAction;
+        private AlertDialog mConfirmationDialog;
 
         private TaskOverlayGo(TaskThumbnailView taskThumbnailView,
                 AssistContentRequester assistContentRequester) {
@@ -92,6 +107,12 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
         @Override
         public void initOverlay(Task task, ThumbnailData thumbnail, Matrix matrix,
                 boolean rotated) {
+            if (mConfirmationDialog != null && mConfirmationDialog.isShowing()) {
+                // Redraw the dialog in case the layout changed
+                mConfirmationDialog.dismiss();
+                showConfirmationDialog();
+            }
+
             getActionsView().updateDisabledFlags(DISABLED_NO_THUMBNAIL, thumbnail == null);
             checkSettings();
             if (thumbnail == null || TextUtils.isEmpty(mNIUPackageName)) {
@@ -105,6 +126,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
             boolean isAllowedByPolicy = mThumbnailView.isRealSnapshot() && !isManagedProfileTask;
             getActionsView().setCallbacks(new OverlayUICallbacksGoImpl(isAllowedByPolicy, task));
             mTaskPackageName = task.key.getPackageName();
+            mSharedPreferences = Utilities.getPrefs(mApplicationContext);
 
             if (!mAssistStructurePermitted || !mAssistScreenshotPermitted) {
                 return;
@@ -131,6 +153,12 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
          * Creates and sends an Intent corresponding to the button that was clicked
          */
         private void sendNIUIntent(String actionType) {
+            if (!mSharedPreferences.getBoolean(NIU_ACTIONS_CONFIRMED, false)) {
+                mPreviousAction = actionType;
+                showConfirmationDialog();
+                return;
+            }
+
             Intent intent = createNIUIntent(actionType);
             // Only add and send the image if the appropriate permissions are held
             if (mAssistStructurePermitted && mAssistScreenshotPermitted) {
@@ -218,6 +246,35 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
         public void setImageActionsAPI(ImageActionsApi imageActionsApi) {
             mImageApi = imageActionsApi;
         }
+
+        private void showConfirmationDialog() {
+            BaseDraggingActivity activity = BaseActivity.fromContext(getActionsView().getContext());
+            LayoutInflater inflater = LayoutInflater.from(activity);
+            View view = inflater.inflate(R.layout.niu_actions_confirmation_dialog, /* root */ null);
+
+            Button acceptButton = view.findViewById(R.id.niu_actions_confirmation_accept);
+            acceptButton.setOnClickListener(this::onNiuActionsConfirmationAccept);
+
+            Button rejectButton = view.findViewById(R.id.niu_actions_confirmation_reject);
+            rejectButton.setOnClickListener(this::onNiuActionsConfirmationReject);
+
+            mConfirmationDialog = new AlertDialog.Builder(activity)
+                    .setView(view)
+                    .create();
+            mConfirmationDialog.getWindow()
+                    .setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+            mConfirmationDialog.show();
+        }
+
+        private void onNiuActionsConfirmationAccept(View v) {
+            mConfirmationDialog.dismiss();
+            mSharedPreferences.edit().putBoolean(NIU_ACTIONS_CONFIRMED, true).apply();
+            sendNIUIntent(mPreviousAction);
+        }
+
+        private void onNiuActionsConfirmationReject(View v) {
+            mConfirmationDialog.cancel();
+        }
     }
 
     /**
-- 
GitLab


From 4ce773962e84532ba44f45e52d0c5f27f1d04132 Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Tue, 29 Jun 2021 23:13:48 -0700
Subject: [PATCH 1535/1664] Take margin insets into account when setting
 position

Previously we computed insets for task menu position
whenever a Task was told that orientation had changed.
This missed a path for the TaskMenuView's onScrollChanged()
listener, which also calls set position and wasn't taking
the insets into account.

Moved the inset into setPosition() directly so it's caught
on all code paths.

Also noticed 2 bugs where
* We were calling updateChildTaskOrientation() twice, it
already happens in the call to updateOrientationHandler()
* We were directly modifying insets from the activity's
drag layer instead of copying those insets to another rect
and then modifying (this is no longer an issue since we
are not touching those insets at all anymore)

Bug: 192400086
Test: Rotated w/ task menu open for fake and real
landscape. Nothing seems broken.
Note real landscape hides the menu whereas fake one
shows it (which was behavior before this change)

Change-Id: I613dac9519220f49285655ef11a1f72e4a6d31bd
---
 .../android/quickstep/views/RecentsView.java   |  1 -
 .../android/quickstep/views/TaskMenuView.java  | 18 +++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 710a9ab9fe..1b1066a65d 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1665,7 +1665,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         pa.addListener(AnimatorListeners.forSuccessCallback(() -> {
             setLayoutRotation(newRotation, mOrientationState.getDisplayRotation());
             mActivity.getDragLayer().recreateControllers();
-            updateChildTaskOrientations();
             setRecentsChangedOrientation(false).start();
         }));
         pa.start();
diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
index c97225ec17..d663635c79 100644
--- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
@@ -59,6 +59,7 @@ public class TaskMenuView extends AbstractFloatingView implements OnScrollChange
 
     private static final int REVEAL_OPEN_DURATION = 150;
     private static final int REVEAL_CLOSE_DURATION = 100;
+    private final float mTaskInsetMargin;
 
     private BaseDraggingActivity mActivity;
     private TextView mTaskName;
@@ -75,6 +76,7 @@ public class TaskMenuView extends AbstractFloatingView implements OnScrollChange
 
         mActivity = BaseDraggingActivity.fromContext(context);
         setClipToOutline(true);
+        mTaskInsetMargin = getResources().getDimension(R.dimen.task_card_margin);
     }
 
     @Override
@@ -124,8 +126,13 @@ public class TaskMenuView extends AbstractFloatingView implements OnScrollChange
 
     private void setPosition(float x, float y, int overscrollShift) {
         PagedOrientationHandler pagedOrientationHandler = mTaskView.getPagedOrientationHandler();
+        // Inset due to margin
+        PointF additionalInset = pagedOrientationHandler
+                .getAdditionalInsetForTaskMenu(mTaskInsetMargin);
         int taskTopMargin = mActivity.getDeviceProfile().overviewTaskThumbnailTopMarginPx;
-        float adjustedY = y + taskTopMargin;
+
+        float adjustedY = y + taskTopMargin - additionalInset.y;
+        float adjustedX = x - additionalInset.x;
         // Changing pivot to make computations easier
         // NOTE: Changing the pivots means the rotated view gets rotated about the new pivots set,
         // which would render the X and Y position set here incorrect
@@ -137,7 +144,8 @@ public class TaskMenuView extends AbstractFloatingView implements OnScrollChange
             setPivotY(0);
         }
         setRotation(pagedOrientationHandler.getDegreesRotated());
-        setX(pagedOrientationHandler.getTaskMenuX(x, mTaskView.getThumbnail(), overscrollShift));
+        setX(pagedOrientationHandler.getTaskMenuX(adjustedX,
+                mTaskView.getThumbnail(), overscrollShift));
         setY(pagedOrientationHandler.getTaskMenuY(
                 adjustedY, mTaskView.getThumbnail(), overscrollShift));
     }
@@ -228,8 +236,7 @@ public class TaskMenuView extends AbstractFloatingView implements OnScrollChange
     private void orientAroundTaskView(TaskView taskView) {
         PagedOrientationHandler orientationHandler = taskView.getPagedOrientationHandler();
         measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
-        float taskInsetMargin = getResources().getDimension(R.dimen.task_card_margin);
-        orientationHandler.setTaskMenuAroundTaskView(this, taskInsetMargin);
+        orientationHandler.setTaskMenuAroundTaskView(this, mTaskInsetMargin);
         mActivity.getDragLayer().getDescendantRectRelativeToSelf(taskView, sTempRect);
         Rect insets = mActivity.getDragLayer().getInsets();
         BaseDragLayer.LayoutParams params = (BaseDragLayer.LayoutParams) getLayoutParams();
@@ -243,9 +250,6 @@ public class TaskMenuView extends AbstractFloatingView implements OnScrollChange
         setScaleY(taskView.getScaleY());
         orientationHandler.setTaskOptionsMenuLayoutOrientation(
                 mActivity.getDeviceProfile(), mOptionLayout);
-        PointF additionalInset = orientationHandler.getAdditionalInsetForTaskMenu(taskInsetMargin);
-        insets.left += additionalInset.x;
-        insets.top += additionalInset.y;
         setPosition(sTempRect.left - insets.left, sTempRect.top - insets.top, 0);
     }
 
-- 
GitLab


From a77f3a30966959ceca0ed5067a71b4c1ad70e8a0 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 30 Jun 2021 08:17:13 +0000
Subject: [PATCH 1536/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Ie7f978c5858b3280e706d0e65d31505f5be4bb2f
---
 quickstep/res/values-hy/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/quickstep/res/values-hy/strings.xml b/quickstep/res/values-hy/strings.xml
index e4d9991b40..8a5a875b0b 100644
--- a/quickstep/res/values-hy/strings.xml
+++ b/quickstep/res/values-hy/strings.xml
@@ -46,9 +46,9 @@
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"«Առաջարկվող հավելվածներ» գործառույթն անջատված է"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Առաջարկվող հավելված՝ <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Համոզվեք, որ մատը սահեցնում եք էկրանի ձախ եզրից։"</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Սահեցրեք մատն էկրանի ձախ եզրից դեպի կենտրոն և բաց թողեք։"</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Մատը սահեցրեք էկրանի ձախ եզրից դեպի կենտրոն և բաց թողեք։"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Համոզվեք, որ մատը սահեցնում եք էկրանի աջ եզրից։"</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Սահեցրեք մատն էկրանի աջ եզրից դեպի կենտրոն և բաց թողեք։"</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Մատը սահեցրեք էկրանի աջ եզրից դեպի կենտրոն և բաց թողեք։"</string>
     <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Դուք սովորեցիք՝ ինչպես մատը ձախից սահեցնելով հետ գնալ"</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Դուք սովորեցիք՝ ինչպես մատը աջից սահեցնելով հետ գնալ։ Այժմ սովորենք՝ ինչպես անցնել մի հավելվածից մյուսը։"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Դուք սովորեցիք հետ գնալու ժեստը։"</string>
-- 
GitLab


From ae265f756bea5e77242dc7331840807c5f0d15fe Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 30 Jun 2021 08:19:29 +0000
Subject: [PATCH 1537/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Idcda8ddba143ad0decd633fb5691b6db36427570
---
 res/values-af/strings.xml        | 2 ++
 res/values-am/strings.xml        | 2 ++
 res/values-ar/strings.xml        | 2 ++
 res/values-as/strings.xml        | 2 ++
 res/values-az/strings.xml        | 2 ++
 res/values-b+sr+Latn/strings.xml | 2 ++
 res/values-be/strings.xml        | 2 ++
 res/values-bg/strings.xml        | 2 ++
 res/values-bn/strings.xml        | 2 ++
 res/values-bs/strings.xml        | 2 ++
 res/values-ca/strings.xml        | 2 ++
 res/values-cs/strings.xml        | 2 ++
 res/values-da/strings.xml        | 2 ++
 res/values-de/strings.xml        | 5 +++--
 res/values-el/strings.xml        | 2 ++
 res/values-en-rAU/strings.xml    | 2 ++
 res/values-en-rCA/strings.xml    | 2 ++
 res/values-en-rGB/strings.xml    | 2 ++
 res/values-en-rIN/strings.xml    | 2 ++
 res/values-en-rXC/strings.xml    | 1 +
 res/values-es-rUS/strings.xml    | 2 ++
 res/values-es/strings.xml        | 2 ++
 res/values-et/strings.xml        | 2 ++
 res/values-eu/strings.xml        | 2 ++
 res/values-fa/strings.xml        | 2 ++
 res/values-fi/strings.xml        | 2 ++
 res/values-fr-rCA/strings.xml    | 5 +++--
 res/values-fr/strings.xml        | 2 ++
 res/values-gl/strings.xml        | 2 ++
 res/values-gu/strings.xml        | 2 ++
 res/values-hi/strings.xml        | 2 ++
 res/values-hr/strings.xml        | 2 ++
 res/values-hu/strings.xml        | 2 ++
 res/values-hy/strings.xml        | 2 ++
 res/values-in/strings.xml        | 2 ++
 res/values-is/strings.xml        | 2 ++
 res/values-it/strings.xml        | 2 ++
 res/values-iw/strings.xml        | 2 ++
 res/values-ja/strings.xml        | 6 ++++--
 res/values-ka/strings.xml        | 2 ++
 res/values-kk/strings.xml        | 2 ++
 res/values-km/strings.xml        | 2 ++
 res/values-kn/strings.xml        | 2 ++
 res/values-ko/strings.xml        | 2 ++
 res/values-ky/strings.xml        | 2 ++
 res/values-lo/strings.xml        | 2 ++
 res/values-lt/strings.xml        | 2 ++
 res/values-lv/strings.xml        | 2 ++
 res/values-mk/strings.xml        | 2 ++
 res/values-ml/strings.xml        | 2 ++
 res/values-mn/strings.xml        | 2 ++
 res/values-mr/strings.xml        | 2 ++
 res/values-ms/strings.xml        | 2 ++
 res/values-my/strings.xml        | 2 ++
 res/values-nb/strings.xml        | 2 ++
 res/values-ne/strings.xml        | 2 ++
 res/values-nl/strings.xml        | 4 +++-
 res/values-or/strings.xml        | 2 ++
 res/values-pa/strings.xml        | 2 ++
 res/values-pl/strings.xml        | 2 ++
 res/values-pt-rPT/strings.xml    | 2 ++
 res/values-pt/strings.xml        | 2 ++
 res/values-ro/strings.xml        | 2 ++
 res/values-ru/strings.xml        | 2 ++
 res/values-si/strings.xml        | 2 ++
 res/values-sk/strings.xml        | 2 ++
 res/values-sl/strings.xml        | 2 ++
 res/values-sq/strings.xml        | 5 +++--
 res/values-sr/strings.xml        | 2 ++
 res/values-sv/strings.xml        | 2 ++
 res/values-sw/strings.xml        | 2 ++
 res/values-ta/strings.xml        | 2 ++
 res/values-te/strings.xml        | 2 ++
 res/values-th/strings.xml        | 2 ++
 res/values-tl/strings.xml        | 2 ++
 res/values-tr/strings.xml        | 2 ++
 res/values-uk/strings.xml        | 2 ++
 res/values-ur/strings.xml        | 2 ++
 res/values-uz/strings.xml        | 2 ++
 res/values-vi/strings.xml        | 2 ++
 res/values-zh-rCN/strings.xml    | 2 ++
 res/values-zh-rHK/strings.xml    | 2 ++
 res/values-zh-rTW/strings.xml    | 2 ++
 res/values-zu/strings.xml        | 2 ++
 84 files changed, 173 insertions(+), 9 deletions(-)

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 6e811807aa..834e384bb6 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dubbeltik en hou om \'n legstuk te skuif of gebruik gepasmaakte handelinge."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d breed by %2$d hoog"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Raak en hou die legstuk om dit op die Tuisskerm rond te beweeg"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Voeg by Tuisskerm"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 2eb69fb257..1b9c7ee196 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ምግብርን ለማንቀሳቀስ ወይም ብጁ እርምጃዎችን ለመጠቀም ሁለቴ መታ ያድርጉ እና ይያዙ።"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ስፋት በ%2$d ከፍታ"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"በመነሻ ገጽ አካባቢ ላይ ለማንቀሳቀስ ነክተው ይያዙት"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ወደ መነሻ ገጽ አክል"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index efe361ef84..ac446a2ae8 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"انقر مرتين مع تثبيت إصبعك لنقل أداة أو استخدام الإجراءات المخصّصة."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"‏العرض %1$d الطول %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"يمكنك النقر على الأداة مع الاستمرار لتحريكها على الشاشة الرئيسية."</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"إضافة إلى الشاشة الرئيسية"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index f615a246a4..f61a1527d0 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"কোনো ৱিজেট স্থানান্তৰ কৰিবলৈ দুবাৰ টিপি ধৰি ৰাখক অথবা কাষ্টম কাৰ্য ব্যৱহাৰ কৰক।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d বহল x %2$d ওখ"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ৱিজেটটো গৃহ স্ক্ৰীনৰ আশে-পাশে নিবলৈ সেইটোত স্পৰ্শ কৰি ধৰি ৰাখক"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"গৃহ স্ক্ৰীনত যোগ কৰক"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 1bbc006a71..36d20519a1 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Vidceti daşımaq üçün iki dəfə toxunub saxlayın və ya fərdi əməliyyatlardan istifadə edin."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%2$d hündürlük %1$d enində"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Əsas ekranda hərəkət etdirmək üçün vidcetə toxunub saxlayın"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Əsas ekrana əlavə edin"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 6ee49d9cd9..62e4c2b215 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvaput dodirnite i zadržite da biste pomerali vidžet ili koristite prilagođene radnje."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d×%2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"širina od %1$d i visina od %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Dodirnite i zadržite vidžet da biste ga pomerali po početnom ekranu"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Dodaj na početni ekran"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 93bdfa043a..9162de71e4 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Дакраніцеся двойчы і ўтрымлівайце, каб перамясціць віджэт або выкарыстоўваць спецыяльныя дзеянні."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Шырына: %1$d, вышыня: %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Утрымліваючы віджэт націснутым, перамяшчайце яго па Галоўным экране"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Дадаць на Галоўны экран"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 575ec221f2..f23cef9053 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Докоснете двукратно и задръжте за преместване на приспособление или използвайте персонал. действия."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Ширина %1$d и височина %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Докоснете приспособлението и го задръжте, за да го местите по началния екран"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Добавяне към началния екран"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index aa32151974..0c4bdea72a 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"একটি উইজেট সরাতে বা কাস্টম অ্যাকশন ব্যবহার করতে ডবল ট্যাপ করে ধরে রাখুন।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%2$d উচ্চতা অনুযায়ী %1$d প্রস্থ"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"হোম স্ক্রিনের যেকোনও জায়গায় উইজেটটি নিয়ে যেতে, টাচ করে ধরে থাকুন"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"হোম স্ক্রিনে যোগ করুন"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 3541cebc90..79d47cb23f 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvaput dodirnite i zadržite da pomjerite vidžet ili da koristite prilagođene radnje."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Širina %1$d, visina %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Dodirnite i držite vidžet da ga pomjerate po Početnom ekranu"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Dodaj na početni ekran"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index b1f8843281..de59cfccf1 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Fes doble toc i mantén premut per moure un widget o per utilitzar accions personalitzades."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d d\'amplada per %2$d d\'alçada"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Mantén premut el widget per moure\'l per la pantalla d\'inici"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Afegeix a la pantalla d\'inici"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 6b8f4f53f4..6a4d753629 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvojitým klepnutím a podržením přesunete widget, případně použijte vlastní akce."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"šířka %1$d, výška %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Pokud chcete widgetem pohybovat po ploše, podržte ho"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Přidat na plochu"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 7b34c032fb..388080833f 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Tryk to gange, og hold en widget nede for at flytte den eller bruge tilpassede handlinger."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d i bredden og %2$d i højden"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Hold widgetten nede for at flytte den rundt på startskærmen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Føj til startskærm"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index aebf5e06f8..e7abca742e 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Doppeltippen und halten, um ein Widget zu bewegen oder benutzerdefinierte Aktionen zu nutzen."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d breit und %2$d hoch"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Wenn du das Widget auf dem Startbildschirm verschieben möchtest, halte es gedrückt"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Zum Startbildschirm hinzufügen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
@@ -64,8 +66,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Benachrichtigungen"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Tippen und halten, um eine Verknüpfung zu bewegen."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Doppeltippen und halten, um eine Verknüpfung zu bewegen oder benutzerdefinierte Aktionen zu nutzen."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Auf dem Startbildschirm ist kein Platz mehr vorhanden"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Ablage \"Favoriten\" ist voll."</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Liste der Apps"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Liste der privaten Apps"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index ffdc63c64c..66c6bd1a31 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Πατήστε δύο φορές παρατεταμένα για μετακίνηση γραφικού στοιχείου ή χρήση προσαρμοσμένων ενεργειών."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Πλάτος %1$d επί ύψος %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Αγγίξτε παρατεταμένα το γραφικό στοιχείο για να το μετακινήσετε στην Αρχική οθόνη"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Προσθήκη στην Αρχική οθόνη"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 279f22ed37..f032f8bcdd 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Double-tap &amp; hold to move a widget or use custom actions."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d wide by %2$d high"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Touch and hold the widget to move it around the home screen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Add to home screen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 279f22ed37..f032f8bcdd 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Double-tap &amp; hold to move a widget or use custom actions."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d wide by %2$d high"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Touch and hold the widget to move it around the home screen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Add to home screen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 279f22ed37..f032f8bcdd 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Double-tap &amp; hold to move a widget or use custom actions."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d wide by %2$d high"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Touch and hold the widget to move it around the home screen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Add to home screen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 279f22ed37..f032f8bcdd 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Double-tap &amp; hold to move a widget or use custom actions."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d wide by %2$d high"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Touch and hold the widget to move it around the home screen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Add to home screen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index a1a4ba911d..b6f01cea4d 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -32,6 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‎‏‏‏‏‎‎‎‎‏‏‎‏‎‏‏‎‎‎‎‎‎‏‎‏‎‎‎‎‎‎‎‎‎‏‏‎‎Double-tap &amp; hold to move a widget or use custom actions.‎‏‎‎‏‎"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‎‎‏‎‎‎‎‎‏‎‎‎‏‎‏‏‏‏‏‎%1$d × %2$d‎‏‎‎‏‎"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‎‏‎‎‎‏‏‎‏‎‎‎‎‏‏‎‎‎‏‎‎‎‏‏‏‎‎‎‎‏‏‏‎‎‏‎‎‏‎‎‏‏‎‎‎‎‎‏‏‏‏‎‎%1$d wide by %2$d high‎‏‎‎‏‎"</string>
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‎‏‎‎‏‎‎‎‏‏‎‎‏‎‏‎‏‎‏‎‎‎‎‎‎‎‎‎‎‏‏‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="WIDGET_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ widget‎‏‎‎‏‎"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‎‎‎‎‏‎‎‎‏‏‎‎‎‏‎‏‎‎‏‏‏‎‏‎Touch &amp; hold the widget to move it around the Home screen‎‏‎‎‏‎"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‏‎‏‏‎‏‏‎‎‎‎‏‏‎‏‎‏‏‎‎‏‎‏‎‎‏‎‏‎‏‎‎‏‏‏‎‏‏‏‎‎‎‏‏‎‎‏‎‎‎Add to Home screen‎‏‎‎‏‎"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 15ab568eaf..18b00c6ea6 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Presiona dos veces y mantén presionado para mover un widget o usar acciones personalizadas."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de ancho por %2$d de alto"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Mantén presionado el widget para moverlo por la pantalla principal"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Agregar a pantalla principal"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 0619b39fb4..4f4c697158 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Toca dos veces y mantén pulsado un widget para moverlo o usar acciones personalizadas."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de ancho por %2$d de alto"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Mantén pulsado el widget para moverlo por la pantalla de inicio"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Añadir a la pantalla de inicio"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 7a91de258b..3e3aed7d42 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Vidina teisaldamiseks või kohandatud toimingute kasutamiseks topeltpuudutage ja hoidke all."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d lai ja %2$d kõrge"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Vidina teisaldamiseks avakuval puudutage vidinat ja hoidke seda all"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Lisa avakuvale"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 78ecc7014a..1f31a5fef2 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Sakatu birritan eta eduki sakatuta widget bat mugitzeko edo ekintza pertsonalizatuak erabiltzeko."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d zabal eta %2$d luze"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Eduki sakatuta widgeta hasierako pantailan zehar mugitzeko"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Gehitu hasierako pantailan"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 48e3c2c41a..513f76f040 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"برای جابه‌جا کردن ابزارک یا استفاده از کنش‌های سفارشی، دوضربه بزنید و نگه دارید."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"‏%1$d عرض در %2$d طول"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ابزارک را لمس کنید و نگه دارید تا آن را در صفحه اصلی حرکت دهید"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"افزودن به صفحه اصلی"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 0e42836393..c930be9377 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Kaksoisnapauta ja paina pitkään, niin voit siirtää widgetiä tai käyttää muokattuja toimintoja."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Leveys: %1$d, korkeus: %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Voit siirtää widgetiä aloitusnäytöllä koskettamalla sitä pitkään"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Lisää aloitusnäytölle"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index df3fc3f9f7..6a48e94707 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Touchez 2x un widget et maintenez le doigt dessus pour le déplacer ou utiliser des actions personnalisées."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de largeur sur %2$d de hauteur"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Maintenez le doigt sur le widget pour le déplacer sur l\'écran d\'accueil"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Ajouter à l\'écran d\'accueil"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
@@ -64,8 +66,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notifications"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Maintenez le doigt sur un raccourci pour le déplacer."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Touchez deux fois un raccourci et maintenez le doigt dessus pour le déplacer ou utiliser des actions personnalisées."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Pas d\'espace libre sur cet écran d\'accueil"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Il n\'y a plus d\'espace dans la zone des favoris"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Liste des applications"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Liste des applications personnelles"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 1391b43a9f..556117d8c6 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Appuyez deux fois et maintenez la pression pour déplacer widget ou utiliser actions personnalisées."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d x %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de largeur et %2$d de hauteur"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Appuyez de manière prolongée sur le widget pour le déplacer sur l\'écran d\'accueil"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Ajouter à l\'écran d\'accueil"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 4605e2f96a..6ce88ee51c 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Toca dúas veces un widget e manteno premido para movelo ou utiliza accións personalizadas."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de largo por %2$d de alto"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Mantén premido o widget para movelo pola pantalla de inicio"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Engadir á pantalla de inicio"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 1eca0c89a5..1db9d7293d 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"વિજેટ ખસેડવા બે વાર ટૅપ કરીને દબાવી રાખો અથવા કસ્ટમ ક્રિયાઓનો ઉપયોગ કરો."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d પહોળાઈ X %2$d ઊંચાઈ"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"વિજેટને હોમ સ્ક્રીનની આજુબાજુ ખસેડવા માટે, તેને ટચ કરીને થોડીવાર દબાવી રાખો"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"હોમ સ્ક્રીન પર ઉમેરો"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index c5a62f0e58..7e9696855f 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"किसी विजेट को एक से दूसरी जगह ले जाने के लिए, उस पर दो बार टैप करके दबाकर रखें या पसंद के मुताबिक कार्रवाइयां इस्तेमाल करें."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d चौड़ाई गुणा %2$d ऊंचाई"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"होम स्क्रीन पर यहां-वहां ले जाने के लिए विजेट को दबाकर रखें"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"होम स्क्रीन पर जोड़ें"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 1d0566f13a..ac19155f5e 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvaput dodirnite i zadržite pritisak da biste premjestili widget ili upotrijebite prilagođene radnje"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d širine i %2$d visine"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Dodirnite i zadržite widget da biste ga pomicali po početnom zaslonu"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Dodaj na početni zaslon"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 0042ab93ae..2b4d9143f7 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Modul áthelyezéséhez koppintson duplán, tartsa nyomva az ujját, vagy használjon egyéni műveleteket."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d széles és %2$d magas"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Tartsa lenyomva a modult a kezdőképernyőn való mozgatáshoz"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Hozzáadás a kezdőképernyőhöz"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 239e186e01..ea421f7465 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Կրկնակի հպեք և պահեք՝ վիջեթ տեղափոխելու համար, կամ օգտվեք հատուկ գործողություններից։"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Լայնությունը՝ %1$d, բարձրությունը՝ %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Հպեք վիջեթին և պահեք տեղափոխելու համար"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Ավելացնել հիմնական էկրանին"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 8125112434..b7324eef8d 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Ketuk dua kali &amp; tahan untuk memindahkan widget atau gunakan tindakan khusus."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"lebar %1$d x tinggi %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Sentuh lama widget untuk memindahkannya di sekitar Layar utama"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Tambahkan ke Layar utama"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index ac0184616b..d9431ca639 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Ýttu tvisvar og haltu fingri á græju til að færa hana eða notaðu sérsniðnar aðgerðir."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d á breidd og %2$d á hæð"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Haltu fingri á græjunni til að hreyfa hana um heimaskjáinn"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Bæta á heimaskjá"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 7bdaff0a37..71b64983c8 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Tocca due volte e tieni premuto per spostare un widget o per usare le azioni personalizzate."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d di larghezza per %2$d di altezza"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Tocca e tieni premuto il widget per spostarlo nella schermata Home"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Aggiungi a schermata Home"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index bc8656ab84..dc0b261d0a 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"כדי להעביר ווידג\'ט למקום אחר או להשתמש בפעולות מותאמות אישית, יש ללחוץ פעמיים ולא להרפות."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"‏רוחב %1$d על גובה %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"יש ללחוץ לחיצה ארוכה על הווידג\'ט כדי להזיז אותו ברחבי מסך הבית"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"הוספה למסך הבית"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index cac513a473..abf7667297 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ウィジェットをダブルタップして長押ししながら移動するか、カスタム操作を使用してください。"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$dx%2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"幅 %1$d、高さ %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ウィジェットを押し続けると、ホーム画面上に移動できます。"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ホーム画面に追加"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
@@ -159,8 +161,8 @@
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"仕事用アプリはバッジが付き、IT 管理者に公開されます"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="3040901117349444598">"仕事用アプリの一時停止"</string>
-    <string name="work_apps_paused_body" msgid="261634750995824906">"仕事用アプリは、通知の送信、バッテリーの使用、位置情報の取得を行えません"</string>
-    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"仕事用アプリは OFF になっています。仕事用アプリは、通知の送信、バッテリーの使用、位置情報の取得を行えません"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"仕事用アプリでは、通知の送信、バッテリーの使用、位置情報の取得が無効になっています"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"仕事用アプリは OFF になっています。仕事用アプリでは、通知の送信、バッテリーの使用、位置情報の取得が無効になっています"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"仕事用アプリはバッジが付き、IT 管理者に公開されます"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
     <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"仕事用アプリを OFF にする"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index fd6730678e..8b423c00d9 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ორმაგი შეხებით აირჩიეთ და გეჭიროთ ვიჯეტის გადასაადგილებლად ან მორგებული მოქმედებების გამოსაყენებლად."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"სიგრძე: %1$d, სიგანე: %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ხანგრძლივად შეეხეთ ვიჯეტს მთავარ ეკრანზე მის გადასაადგილებლად"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"მთავარ ეკრანზე დამატება"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 543f241f30..a240a5564f 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Виджетті жылжыту үшін екі рет түртіңіз де, ұстап тұрыңыз немесе арнаулы әрекеттерді пайдаланыңыз."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Ені: %1$d, биіктігі: %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Негізгі экранда қозғалту үшін виджетті басып тұрыңыз."</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Негізгі экранға қосу"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index cb886c1ee2..1b03630f32 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ចុចពីរដង រួចសង្កត់ឱ្យជាប់ ដើម្បីផ្លាស់ទី​ធាតុក្រាហ្វិក ឬប្រើ​សកម្មភាព​តាមបំណង​។"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"ទទឺង %1$d គុណនឹងកម្ពស់ %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ចុចធាតុក្រាហ្វិក​ឱ្យជាប់ ដើម្បីផ្លាស់ទីវា​ជុំវិញអេក្រង់ដើម"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"បញ្ចូល​ទៅអេក្រង់ដើម"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 40aa013024..938aa98ede 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ವಿಜೆಟ್ ಸರಿಸಲು ಅಥವಾ ಕಸ್ಟಮ್ ಕ್ರಿಯೆಗಳನ್ನು ಬಳಸಲು ಡಬಲ್-ಟ್ಯಾಪ್ ಮಾಡಿ ಮತ್ತು ಹಿಡಿದುಕೊಳ್ಳಿ."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ಅಗಲ ಮತ್ತು %2$d ಎತ್ತರ"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ಮುಖಪುಟದ ಪರದೆ ಸುತ್ತ ವಿಜೆಟ್ ಅನ್ನು ಸರಿಸಲು, ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಒತ್ತಿ ಹಿಡಿದುಕೊಳ್ಳಿ"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ಮುಖಪುಟಕ್ಕೆ ಸೇರಿಸಿ"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 4de5c2c74a..83e190d1fe 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"두 번 탭한 다음 길게 터치하여 위젯을 이동하거나 맞춤 작업을 사용하세요."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d×%2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"너비 %1$d, 높이 %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"홈 화면에서 위젯을 이동하려면 길게 터치하세요."</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"홈 화면에 추가"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 2ead1ea7a8..3cf86ff7a4 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Виджетти жылдыруу үчүн эки жолу таптап, кармап туруңуз же ыңгайлаштырылган аракеттерди колдонуңуз."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Туурасы: %1$d, бийиктиги: %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Башкы экранга жылдыруу үчүн виджетти коё бербей басып туруңуз"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Башкы экранга кошуу"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index a38a07bbf9..be361e0ed0 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ແຕະສອງເທື່ອຄ້າງໄວ້ເພື່ອຍ້າຍວິດເຈັດ ຫຼື ໃຊ້ຄຳສັ່ງກຳນົດເອງ."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"ກວ້າງ %1$d ຄູນສູງ %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ແຕະວິດເຈັດຄ້າງໄວ້ເພື່ອຍ້າຍມັນໄປມາຢູ່ໂຮມສະກຣີນ"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ເພີ່ມໄປໃສ່ໂຮມສະກຣີນ"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 0984056807..1114f26dd8 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dukart palieskite ir palaikykite, kad perkeltumėte valdiklį ar naudotumėte tinkintus veiksmus."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d plotis ir %2$d aukštis"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Paliesdami ir palaikydami valdiklį galite judėti pagrindiniame ekrane"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Pridėti prie pagrindinio ekrano"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index eb1eba053d..5735b0606c 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Lai pārvietotu logrīku, uz tā veiciet dubultskārienu un turiet. Varat arī veikt pielāgotas darbības."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d plats un %2$d augsts"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Pieskarieties logrīkam un turiet to, lai to pārvietotu pa sākuma ekrānu."</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Pievienot sākuma ekrānam"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 4987cd5df9..3bf2a9784f 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Допрете двапати и задржете за да преместите виџет или користете приспособени дејства."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d широк на %2$d висок"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Допрете го и задржете го виџетот за да го движите наоколу на почетниот екран"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Додај на почетниот екран"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index c41d02e5f0..b46f1d72a2 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"വിജറ്റ് നീക്കാൻ ഡബിൾ ടാപ്പ് ചെയ്യൂ, ഹോൾഡ് ചെയ്യൂ അല്ലെങ്കിൽ ഇഷ്‌ടാനുസൃത പ്രവർത്തനങ്ങൾ ഉപയോഗിക്കൂ."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d വീതിയും %2$d ഉയരവും"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ഹോം സ്‌ക്രീനിന് ചുറ്റും വിജറ്റ് നീക്കാൻ അതിൽ സ്‌പർശിച്ച് പിടിക്കുക"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ഹോം സ്‌ക്രീനിലേക്ക് ചേർക്കുക"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 35675d1d9c..1320658f34 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Жижиг хэрэгслийг зөөх эсвэл захиалгат үйлдлийг ашиглахын тулд хоёр товшоод, удаан дарна уу."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d өргөн %2$d өндөр"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Жижиг хэрэгслийг Үндсэн нүүрний эргэн тойронд зөөхийн тулд түүнд хүрээд, удаан дарна уу"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Үндсэн нүүрэнд нэмэх"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index b973547dd9..dab39d9e01 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"विजेट हलवण्यासाठी किंवा कस्टम कृती वापरण्यासाठी दोनदा टॅप करा आणि धरून ठेवा."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d रूंद बाय %2$d उंच"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"होम स्क्रीनवर ते हलवण्यासाठी विजेटला स्पर्श करा आणि धरून ठेवा"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"होम स्‍क्रीनवर जोडा"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index b1e0244f87..b7469cd719 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Ketik dua kali &amp; tahan untuk menggerakkan widget atau menggunakan tindakan tersuai."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Lebar %1$d kali tinggi %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Sentuh &amp; tahan widget untuk menggerakkan widget di sekitar Skrin utama"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Tambahkan pada Skrin utama"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 11e4fead98..ef15561e10 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ဝိဂျက်ကို ရွှေ့ရန် (သို့) စိတ်ကြိုက်လုပ်ဆောင်ချက်များကို သုံးရန် နှစ်ချက်တို့ပြီး ဖိထားပါ။"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"အလျား %1$d နှင့် အမြင့် %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ပင်မစာမျက်နှာအနီးတွင် ဝိဂျက်ကိုရွှေ့ရန် ၎င်းကို တို့ထိ၍ဖိထားပါ"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ပင်မစာမျက်နှာသို့ ထည့်ရန်"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index a7931d0338..5e934c0f1c 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dobbelttrykk og hold inne for å flytte en modul eller bruke tilpassede handlinger."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d bredde x %2$d høyde"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Trykk og hold på modulen for å bevege den rundt på startskjermen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Legg til på startskjermen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index b36d400f1c..c17245043c 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"कुनै विजेट सार्न वा आफ्नो रोजाइका कारबाही प्रयोग गर्न डबल ट्याप गरेर छोइराख्नुहोस्।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d चौडाइ गुणा %2$d उचाइ"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"यो विजेट होम स्क्रिनमा यताउता सार्न त्यसमा टच एन्ड होल्ड गर्नुहोस्"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"होम स्क्रिनमा हाल्नुहोस्"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 7b3d5953c6..d7e7a9a8c7 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dubbeltik en houd vast om een widget te verplaatsen of aangepaste acties te gebruiken."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d breed en %2$d hoog"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Houd de widget ingedrukt om deze te verplaatsen op het startscherm"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Toevoegen aan startscherm"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
@@ -160,7 +162,7 @@
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="3040901117349444598">"Werk-apps zijn onderbroken"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Je werk-apps kunnen je geen meldingen sturen, je batterij niet gebruiken en geen toegang krijgen tot je locatie"</string>
-    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Werk-apps staan uit. Je werk-apps kunnen je geen meldingen sturen, je batterij niet gebruiken en geen toegang krijgen tot je locatie."</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Werk-apps staan uit. Je werk-apps kunnen geen meldingen sturen, je batterij niet gebruiken en hebben geen toegang tot je locatie."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Werk-apps hebben badges en zijn zichtbaar voor je IT-beheerder"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
     <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Werk-apps uitzetten"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 73848e0906..259b98b5a8 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ଏକ ୱିଜେଟକୁ ମୁଭ୍ କରିବା ପାଇଁ ଦୁଇଥର-ଟାପ୍ କରି ଧରି ରଖନ୍ତୁ କିମ୍ବା କଷ୍ଟମ୍ କାର୍ଯ୍ୟଗୁଡ଼ିକୁ ବ୍ୟବହାର କରନ୍ତୁ।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ଓସାର ଓ %2$d ଉଚ୍ଚ"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ମୂଳସ୍କ୍ରିନର ଆଖପାଖରେ ୱିଜେଟକୁ ମୁଭ୍ କରିବା ପାଇଁ ଏହାକୁ ସ୍ପର୍ଶ କରି ଧରି ରଖନ୍ତୁ"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ମୂଳସ୍କ୍ରିନରେ ଯୋଗ କରନ୍ତୁ"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index ff9ed62082..d0df645126 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ਵਿਜੇਟ ਲਿਜਾਉਣ ਲਈ ਜਾਂ ਵਿਉਂਂਤੀਆਂ ਕਾਰਵਾਈਆਂ ਵਰਤਣ ਲਈ ਦੋ ਵਾਰ ਟੈਪ ਕਰਕੇ ਦਬਾ ਕੇ ਰੱਖੋ।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ਚੌੜਾਈ ਅਤੇ %2$d ਲੰਬਾਈ"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ਵਿਜੇਟ ਨੂੰ ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਇੱਧਰ-ਉੱਧਰ ਲਿਜਾਉਣ ਲਈ ਸਪਰਸ਼ ਕਰਕੇ ਦਬਾਈ ਰੱਖੋ"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 5ec64900ff..6b381a1995 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Naciśnij dwukrotnie i przytrzymaj, aby przenieść widżet lub użyć działań niestandardowych."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Szerokość %1$d, wysokość %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Kliknij i przytrzymaj widżet, by poruszać nim po ekranie głównym"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Dodaj do ekranu głównego"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 3141df6d95..306b0bbfe0 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Toque duas vezes sem soltar para mover um widget ou utilizar ações personalizadas."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de largura por %2$d de altura"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Toque sem soltar no widget para o mover à volta do ecrã principal"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Adicionar ao ecrã principal"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index c1c0e17d8e..4c3113d158 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Toque duas vezes e mantenha a tela pressionada para mover um widget ou usar ações personalizadas."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de largura por %2$d de altura"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Toque no widget e mantenha-o pressionado para movê-lo pela tela inicial"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Adicionar à tela inicial"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 3d8d46e7f9..3dfcf5cda4 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Atingeți de două ori și țineți apăsat pentru a muta un widget sau folosiți acțiuni personalizate."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d lățime și %2$d înălțime"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Atingeți lung widgetul pentru a-l muta pe ecranul de pornire"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Adăugați pe ecranul de pornire"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index c220cad80c..997924ee73 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Чтобы использовать специальные действия или перенести виджет, нажмите на него дважды и удерживайте."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d x %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Ширина %1$d, высота %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Чтобы переместить виджет, нажмите на него и удерживайте."</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Добавить на главный экран"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 90c9035b0f..66d6324958 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"විජට් එකක් ගෙන යාමට හෝ අභිරුචි ක්‍රියා භාවිත කිරීමට දෙවරක් තට්ටු කර අල්ලා ගෙන සිටින්න."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"පළල %1$d උස %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"එය මුල් පිටු තිරය වටා ගෙන යාමට විජට් එක ස්පර්ශ කර අල්ලා ගන්න"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"මුල් පිටු තිරය වෙත එක් කරන්න"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 0830065e9a..cf458ce48c 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvojitým klepnutím a pridržaním presuňte miniaplikáciu alebo použite vlastné akcie."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"šírka %1$d, výška %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Po pridržaní môžete miniaplikáciu posúvať po ploche"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Pridať na plochu"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 86a85653fe..4b7927b9bb 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvakrat se dotaknite pripomočka in ga pridržite, da ga premaknete, ali pa uporabite dejanja po meri."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Širina %1$d, višina %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Pridržite pripomoček, če ga želite premikati po začetnem zaslonu."</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Dodaj na začetni zaslon"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 833745f1d9..70084dfd23 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Trokit dy herë dhe mbaje shtypur një miniapliikacion për ta zhvendosur atë ose për të përdorur veprimet e personalizuara."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d i gjerë me %2$d i lartë"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Prek dhe mbaj të shtypur miniaplikacionin për ta lëvizur nëpër \"Ekranin bazë\""</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Shto në \"Ekranin bazë\""</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
@@ -64,8 +66,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Njoftimet"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Prek dhe mbaj shtypur një shkurtore për ta zhvendosur."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Trokit dy herë dhe mbaje shtypur një shkurtore për ta zhvendosur atë ose për të përdorur veprimet e personalizuara."</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"Nuk ka vend në këtë ekran bazë"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Nuk ka më hapësirë në tabakanë \"Të preferuarat\""</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista e aplikacioneve"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista e aplikacioneve personale"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index d701a114f5..335806262f 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Двапут додирните и задржите да бисте померали виџет или користите прилагођене радње."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d×%2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"ширина од %1$d и висина од %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Додирните и задржите виџет да бисте га померали по почетном екрану"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Додај на почетни екран"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 681ddd06ba..12d99d44a5 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Tryck snabbt två gånger och håll kvar för att flytta en widget eller använda anpassade åtgärder."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d bred gånger %2$d hög"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Tryck länge på widgeten om du vill flytta den på startskärmen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Lägg till på startskärmen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 77106eb20d..a16a8c113d 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Gusa mara mbili na ushikilie ili usogeze wijeti au utumie vitendo maalum."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Upana wa %1$d na kimo cha %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Gusa na ushikilie wijeti ili uisogeze kwenye Skrini ya kwanza"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Weka kwenye Skrini ya kwanza"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 168982c79d..0117f6b2f1 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"விட்ஜெட்டை நகர்த்த இருமுறை தட்டிப் பிடிக்கவும் அல்லது பிரத்தியேகச் செயல்களைப் பயன்படுத்தவும்."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d அகலத்திற்கு %2$d உயரம்"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"முகப்புத் திரைக்கு விட்ஜெட்டை நகர்த்த அதைத் தொட்டுப் பிடிக்கவும்"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"முகப்புத் திரையில் சேர்"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 7012b3ca6e..07bb80b09d 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"విడ్జెట్‌ను తరలించడానికి లేదా అనుకూల చర్యలను ఉపయోగించడానికి రెండుసార్లు నొక్కండి &amp; హోల్డ్ చేయి."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d వెడల్పు X %2$d ఎత్తు"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ఈ విడ్జెట్‌ను మొదటి స్క్రీన్‌లో కావాల్సిన చోట ఉంచడానికి, దాన్ని తాకి అలాగే నొక్కి పట్టుకోండి"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"మొదటి స్క్రీన్‌కు జోడించు"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index f5d9fdc055..77a20be222 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"แตะสองครั้งค้างไว้เพื่อย้ายวิดเจ็ตหรือใช้การดำเนินการที่กำหนดเอง"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"กว้าง %1$d x สูง %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"แตะวิดเจ็ตค้างไว้เพื่อย้ายไปรอบๆ หน้าจอหลัก"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"เพิ่มลงในหน้าจอหลัก"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 40d2f815e8..c6e919a783 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"I-double tap at pindutin nang matagal para ilipat ang widget o gumamit ng mga custom na pagkilos."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ang lapad at %2$d ang taas"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Pindutin nang matagal ang widget para ilipat-lipat ito sa Home screen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Idagdag sa Home screen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 6f6c47bad5..ce7527624f 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Widget\'ı taşımak veya özel işlemleri kullanmak için iki kez dokunup basılı tutun."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"genişlik: %1$d, yükseklik: %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Ana ekranda taşımak için widget\'a dokunup basılı tutun"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Ana ekrana ekle"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index b171a7647e..e8a7bfc630 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Двічі натисніть і втримуйте віджет, щоб перемістити його або виконати інші дії."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Ширина – %1$d, висота – %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Натисніть і втримуйте віджет, щоб перемістити його в потрібне місце на головному екрані"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Додати на головний екран"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 07086b0aa5..90da57c0d8 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ویجیٹ کو منتقل کرنے یا حسب ضرورت کارروائیاں استعمال کرنے کے لیے دوبار تھپتھپائیں اور پکڑ کر رکھیں۔"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"‏%1$d چوڑا اور ‎%2$d اونچا"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ویجیٹ کو ہوم اسکرین کے چاروں طرف منتقل کرنے کیلئے اسے ٹچ کریں اور دبائے رکھیں"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ہوم اسکرین میں شامل کریں"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index cbdfae1aa1..bd80989d85 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Ikki marta bosib va bosib turgan holatda vidjetni tanlang yoki maxsus amaldan foydalaning."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Eni %1$d, bo‘yi %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Vidjetni ushlagan holda kerakli joyga siljiting"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Bosh ekranga chiqarish"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 1b80cc7afc..8a32ee7762 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Nhấn đúp và giữ để di chuyển một tiện ích hoặc sử dụng các thao tác tùy chỉnh."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Rộng %1$d x cao %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Chạm và giữ để di chuyển tiện ích xung quanh Màn hình chính"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Thêm vào Màn hình chính"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 477d1d59a2..225a7e1bd7 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"点按两次并按住微件即可移动该微件或使用自定义操作。"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"宽 %1$d，高 %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"轻触并按住该微件即可将其在主屏幕上四处移动"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"添加到主屏幕"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 6b77042840..98f9ef7b04 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"㩒兩下之後㩒住，就可以郁小工具或者用自訂操作。"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d 闊，%2$d 高"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"按住小工具即可隨意在主畫面上移動"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"新增至主畫面"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 6a85bcc151..f38f14334e 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"輕觸兩下並按住即可移動小工具或使用自訂操作。"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"寬度為 %1$d，高度為 %2$d"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"按住小工具即可將它拖放到主畫面上的任何位置"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"新增到主畫面"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index ed5ce8bb93..9f48102baf 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -32,6 +32,8 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Thepha kabili uphinde ubambe ukuze uhambise iwijethi noma usebenzise izindlela ezingokwezifiso."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ububanzi ngokungu-%2$d ukuya phezulu"</string>
+    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
+    <skip />
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Thinta uphinde ubambe iwijethi ukuyihambisa Kusikrini sasekhaya"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Engeza kusikrini sasekhaya"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
-- 
GitLab


From 0d96baec13bc46dcf23ae1076a82934b395f7ae7 Mon Sep 17 00:00:00 2001
From: Cyrus Boadway <boadway@google.com>
Date: Wed, 30 Jun 2021 10:36:51 +0000
Subject: [PATCH 1538/1664] Defer onColorsChanged updates during widget-to-home
 animation

Color change updates recreate the view, which can interfere with the
widget-to-home return animation, specifically the GhostView's use of the
AppWidgetHostView's render node.

Deferring the application of color changes until the end of the
animation allows the widget to settle and remove the GhostView before a
color change might recreate the widget's view.

Bug: 190818220
Test: manual
Change-Id: I6552e583ebb0e4810077d4e70fe9ecb07fd5d01a
---
 .../quickstep/views/FloatingWidgetView.java   |  2 +
 .../widget/LauncherAppWidgetHostView.java     | 45 +++++++++++++++----
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java b/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java
index 22ce9421f7..88b11a0884 100644
--- a/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java
+++ b/quickstep/src/com/android/quickstep/views/FloatingWidgetView.java
@@ -152,6 +152,7 @@ public class FloatingWidgetView extends FrameLayout implements AnimatorListener,
             RectF widgetBackgroundPosition, Size windowSize, float windowCornerRadius,
             boolean appTargetIsTranslucent, int fallbackBackgroundColor) {
         mAppWidgetView = originalView;
+        // Deferrals must begin before GhostView is created. See b/190818220
         mAppWidgetView.beginDeferringUpdates();
         mBackgroundPosition = widgetBackgroundPosition;
         mAppTargetIsTranslucent = appTargetIsTranslucent;
@@ -240,6 +241,7 @@ public class FloatingWidgetView extends FrameLayout implements AnimatorListener,
         ((ViewGroup) dragLayer.getParent()).removeView(this);
         dragLayer.removeView(mListenerView);
         mBackgroundView.finish();
+        // Removing GhostView must occur before ending deferrals. See b/190818220
         mAppWidgetView.endDeferringUpdates();
         recycle();
         mLauncher.getViewCache().recycleView(R.layout.floating_widget_view, this);
diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
index 70ed02f006..ea08a252e6 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
@@ -57,6 +57,7 @@ import com.android.launcher3.views.BaseDragLayer.TouchCompleteListener;
 import com.android.launcher3.widget.dragndrop.AppWidgetHostViewDragListener;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * {@inheritDoc}
@@ -116,7 +117,8 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
     private final Object mUpdateLock = new Object();
     private final ViewGroupFocusHelper mDragLayerRelativeCoordinateHelper;
     private long mDeferUpdatesUntilMillis = 0;
-    private RemoteViews mMostRecentRemoteViews;
+    private RemoteViews mDeferredRemoteViews;
+    private Optional<SparseIntArray> mDeferredColorChange = Optional.empty();
 
     public LauncherAppWidgetHostView(Context context) {
         super(context);
@@ -173,8 +175,11 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
     @Override
     public void updateAppWidget(RemoteViews remoteViews) {
         synchronized (mUpdateLock) {
-            mMostRecentRemoteViews = remoteViews;
-            if (SystemClock.uptimeMillis() < mDeferUpdatesUntilMillis) return;
+            if (isDeferringUpdates()) {
+                mDeferredRemoteViews = remoteViews;
+                return;
+            }
+            mDeferredRemoteViews = null;
         }
 
         super.updateAppWidget(remoteViews);
@@ -210,11 +215,20 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         return false;
     }
 
+    /**
+     * Returns true if the application of {@link RemoteViews} through {@link #updateAppWidget} and
+     * colors through {@link #onColorsChanged} are currently being deferred.
+     * @see #beginDeferringUpdates()
+     */
+    private boolean isDeferringUpdates() {
+        return SystemClock.uptimeMillis() < mDeferUpdatesUntilMillis;
+    }
+
     /**
      * Begin deferring the application of any {@link RemoteViews} updates made through
-     * {@link #updateAppWidget(RemoteViews)} until {@link #endDeferringUpdates()} has been called or
-     * the next {@link #updateAppWidget(RemoteViews)} call after {@link #UPDATE_LOCK_TIMEOUT_MILLIS}
-     * have elapsed.
+     * {@link #updateAppWidget} and color changes through {@link #onColorsChanged} until
+     * {@link #endDeferringUpdates()} has been called or the next {@link #updateAppWidget} or
+     * {@link #onColorsChanged} call after {@link #UPDATE_LOCK_TIMEOUT_MILLIS} have elapsed.
      */
     public void beginDeferringUpdates() {
         synchronized (mUpdateLock) {
@@ -224,18 +238,23 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
 
     /**
      * Stop deferring the application of {@link RemoteViews} updates made through
-     * {@link #updateAppWidget(RemoteViews)} and apply the most recently received update.
+     * {@link #updateAppWidget} and color changes made through {@link #onColorsChanged} and apply
+     * any deferred updates.
      */
     public void endDeferringUpdates() {
         RemoteViews remoteViews;
+        Optional<SparseIntArray> deferredColors;
         synchronized (mUpdateLock) {
             mDeferUpdatesUntilMillis = 0;
-            remoteViews = mMostRecentRemoteViews;
-            mMostRecentRemoteViews = null;
+            remoteViews = mDeferredRemoteViews;
+            mDeferredRemoteViews = null;
+            deferredColors = mDeferredColorChange;
+            mDeferredColorChange = Optional.empty();
         }
         if (remoteViews != null) {
             updateAppWidget(remoteViews);
         }
+        deferredColors.ifPresent(colors -> onColorsChanged(null /* rectF */, colors));
     }
 
     public boolean onInterceptTouchEvent(MotionEvent ev) {
@@ -388,6 +407,14 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
 
     @Override
     public void onColorsChanged(RectF rectF, SparseIntArray colors) {
+        synchronized (mUpdateLock) {
+            if (isDeferringUpdates()) {
+                mDeferredColorChange = Optional.ofNullable(colors);
+                return;
+            }
+            mDeferredColorChange = Optional.empty();
+        }
+
         // setColorResources will reapply the view, which must happen in the UI thread.
         post(() -> setColorResources(colors));
     }
-- 
GitLab


From 4c3259a0eb57597d983a5a4c6df0d147fbefeb6d Mon Sep 17 00:00:00 2001
From: Yogisha Dixit <ydixit@google.com>
Date: Tue, 29 Jun 2021 19:27:59 +0100
Subject: [PATCH 1539/1664] Log widget features to new features field.

Bug: 185778648, 187734511
Test: manual
Change-Id: Ifa5d88602e4fccce153b207b2d57d10d13f33dc9
---
 .../logging/StatsLogCompatManager.java          | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
index b1c9ed0361..6575996d69 100644
--- a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
+++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
@@ -130,7 +130,8 @@ public class StatsLogCompatManager extends StatsLogManager {
                 info.getAttribute().getNumber() /* origin */,
                 getCardinality(info) /* cardinality */,
                 info.getWidget().getSpanX(),
-                info.getWidget().getSpanY());
+                info.getWidget().getSpanY(),
+                getFeatures(info));
     }
 
     /**
@@ -365,15 +366,12 @@ public class StatsLogCompatManager extends StatsLogManager {
                     atomInfo.getFolderIcon().getFromLabelState().getNumber() /* fromState */,
                     atomInfo.getFolderIcon().getToLabelState().getNumber() /* toState */,
                     atomInfo.getFolderIcon().getLabelInfo() /* edittext */,
-                    getCardinality(atomInfo) /* cardinality */);
+                    getCardinality(atomInfo) /* cardinality */,
+                    getFeatures(atomInfo) /* features */);
         }
     }
 
     private static int getCardinality(LauncherAtom.ItemInfo info) {
-        // TODO(b/187734511): Implement a unified solution for 1x1 widgets in folders/hotseat.
-        if (info.getItemCase().equals(LauncherAtom.ItemInfo.ItemCase.WIDGET)) {
-            return info.getWidget().getWidgetFeatures();
-        }
         switch (info.getContainerInfo().getContainerCase()) {
             case PREDICTED_HOTSEAT_CONTAINER:
                 return info.getContainerInfo().getPredictedHotseatContainer().getCardinality();
@@ -514,6 +512,13 @@ public class StatsLogCompatManager extends StatsLogManager {
         }
     }
 
+    private static int getFeatures(LauncherAtom.ItemInfo info) {
+        if (info.getItemCase().equals(LauncherAtom.ItemInfo.ItemCase.WIDGET)) {
+            return info.getWidget().getWidgetFeatures();
+        }
+        return 0;
+    }
+
 
     /**
      * Interface to get stats log while it is dispatched to the system
-- 
GitLab


From a26516c575d99c518f8eb687a35410da576e305e Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Wed, 30 Jun 2021 08:52:54 -0700
Subject: [PATCH 1540/1664] Verifying success of setting default Launcher in
 tests

Test: local runs
Bug: 187080582
Change-Id: Iece234e58e2faa80996001f6de1943f065522400
---
 .../launcher3/util/rule/ShellCommandRule.java | 56 ++++++++++++++++---
 1 file changed, 47 insertions(+), 9 deletions(-)

diff --git a/tests/src/com/android/launcher3/util/rule/ShellCommandRule.java b/tests/src/com/android/launcher3/util/rule/ShellCommandRule.java
index 0ec0f026d9..2b2fef4ae6 100644
--- a/tests/src/com/android/launcher3/util/rule/ShellCommandRule.java
+++ b/tests/src/com/android/launcher3/util/rule/ShellCommandRule.java
@@ -15,20 +15,26 @@
  */
 package com.android.launcher3.util.rule;
 
-import static com.android.launcher3.tapl.TestHelpers.getLauncherInMyProcess;
-
 import static androidx.test.InstrumentationRegistry.getInstrumentation;
 
+import static com.android.launcher3.tapl.TestHelpers.getLauncherInMyProcess;
+
 import android.content.ComponentName;
 import android.content.pm.ActivityInfo;
+import android.util.Log;
+
+import androidx.annotation.Nullable;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.uiautomator.UiDevice;
+
+import com.android.systemui.shared.system.PackageManagerWrapper;
 
+import org.junit.Assert;
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 
-import androidx.annotation.Nullable;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.uiautomator.UiDevice;
+import java.util.ArrayList;
 
 /**
  * Test rule which executes a shell command at the start of the test.
@@ -37,10 +43,19 @@ public class ShellCommandRule implements TestRule {
 
     private final String mCmd;
     private final String mRevertCommand;
+    private final boolean mCheckSuccess;
+    private final Runnable mAdditionalChecks;
 
-    public ShellCommandRule(String cmd, @Nullable String revertCommand) {
+    public ShellCommandRule(String cmd, @Nullable String revertCommand, boolean checkSuccess,
+            Runnable additionalChecks) {
         mCmd = cmd;
         mRevertCommand = revertCommand;
+        mCheckSuccess = checkSuccess;
+        mAdditionalChecks = additionalChecks;
+    }
+
+    public ShellCommandRule(String cmd, @Nullable String revertCommand) {
+        this(cmd, revertCommand, false, null);
     }
 
     @Override
@@ -48,12 +63,27 @@ public class ShellCommandRule implements TestRule {
         return new Statement() {
             @Override
             public void evaluate() throws Throwable {
-                UiDevice.getInstance(getInstrumentation()).executeShellCommand(mCmd);
+                final String result =
+                        UiDevice.getInstance(getInstrumentation()).executeShellCommand(mCmd);
+                if (mCheckSuccess) {
+                    Assert.assertTrue(
+                            "Failed command: " + mCmd + ", result: " + result,
+                            "Success".equals(result.replaceAll("\\s", "")));
+                }
+                if (mAdditionalChecks != null) mAdditionalChecks.run();
                 try {
                     base.evaluate();
                 } finally {
                     if (mRevertCommand != null) {
-                        UiDevice.getInstance(getInstrumentation()).executeShellCommand(mRevertCommand);
+                        final String revertResult = UiDevice.getInstance(
+                                getInstrumentation()).executeShellCommand(
+                                mRevertCommand);
+                        if (mCheckSuccess) {
+                            Assert.assertTrue(
+                                    "Failed command: " + mRevertCommand
+                                            + ", result: " + revertResult,
+                                    "Success".equals(result.replaceAll("\\s", "")));
+                        }
                     }
                 }
             }
@@ -72,7 +102,15 @@ public class ShellCommandRule implements TestRule {
      * Sets the target launcher as default launcher.
      */
     public static ShellCommandRule setDefaultLauncher() {
-        return new ShellCommandRule(getLauncherCommand(getLauncherInMyProcess()), null);
+        final ActivityInfo launcher = getLauncherInMyProcess();
+        Log.d("b/187080582", "Launcher: " + new ComponentName(launcher.packageName, launcher.name)
+                .flattenToString());
+        return new ShellCommandRule(getLauncherCommand(launcher), null, true, () ->
+                Assert.assertEquals("Setting default launcher failed",
+                        new ComponentName(launcher.packageName, launcher.name)
+                                .flattenToString(),
+                        PackageManagerWrapper.getInstance().getHomeActivities(new ArrayList<>())
+                                .flattenToString()));
     }
 
     public static String getLauncherCommand(ActivityInfo launcher) {
-- 
GitLab


From 7f3c8518f163821e421fe0c0c80f4fd1516b28f6 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Wed, 30 Jun 2021 12:18:22 -0500
Subject: [PATCH 1541/1664] Polish changes for work tab

Bug: 191975224
Test: local
Change-Id: Iee1943c041ebb181d4323935ec80130fe15c62c0
---
 res/drawable/work_card.xml      | 3 ---
 res/layout/work_apps_edu.xml    | 6 +++---
 res/layout/work_apps_paused.xml | 8 +++++---
 res/layout/work_mode_fab.xml    | 2 +-
 res/values/dimens.xml           | 2 ++
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/res/drawable/work_card.xml b/res/drawable/work_card.xml
index 0e4b05407e..7048955b74 100644
--- a/res/drawable/work_card.xml
+++ b/res/drawable/work_card.xml
@@ -20,8 +20,5 @@
     android:shape="rectangle">
     <solid android:color="?androidprv:attr/colorSurface" />
     <corners android:radius="@dimen/work_edu_card_margin" />
-    <padding
-        android:left="@dimen/work_fab_radius"
-        android:right="@dimen/work_fab_radius" />
 </shape>
 
diff --git a/res/layout/work_apps_edu.xml b/res/layout/work_apps_edu.xml
index 919f1b27cf..84fdfdf3cd 100644
--- a/res/layout/work_apps_edu.xml
+++ b/res/layout/work_apps_edu.xml
@@ -22,7 +22,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="@dimen/work_edu_card_margin"
+        android:paddingHorizontal="@dimen/work_card_padding_horizontal"
+        android:paddingVertical="@dimen/work_card_padding_vertical"
         android:background="@drawable/work_card"
         android:layout_gravity="center_horizontal"
         android:gravity="center"
@@ -34,8 +35,7 @@
             android:id="@+id/work_apps_paused_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
+            android:layout_marginBottom="@dimen/work_card_padding_vertical"
             android:text="@string/work_profile_edu_work_apps"
             android:textAlignment="center"
             android:textSize="20sp" />
diff --git a/res/layout/work_apps_paused.xml b/res/layout/work_apps_paused.xml
index 02a50cad98..841734c2fc 100644
--- a/res/layout/work_apps_paused.xml
+++ b/res/layout/work_apps_paused.xml
@@ -28,18 +28,18 @@
         android:layout_marginTop="40dp"
         android:text="@string/work_apps_paused_title"
         android:textAlignment="center"
-        android:textSize="20sp" />
+        android:textSize="22sp" />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/work_apps_paused_content"
-        android:textColor="?attr/workProfileOverlayTextColor"
+        android:textColor="?android:attr/textColorSecondary"
         android:text="@string/work_apps_paused_body"
         android:textAlignment="center"
         android:layout_marginTop="16dp"
         android:layout_marginBottom="24dp"
-        android:textSize="16sp" />
+        android:textSize="14sp" />
 
     <Button
         android:layout_width="wrap_content"
@@ -49,5 +49,7 @@
         android:text="@string/work_apps_enable_btn_text"
         android:textAlignment="center"
         android:background="@drawable/rounded_action_button"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
         android:textSize="14sp" />
 </com.android.launcher3.allapps.WorkPausedCard>
\ No newline at end of file
diff --git a/res/layout/work_mode_fab.xml b/res/layout/work_mode_fab.xml
index 7183817ed3..04faa15271 100644
--- a/res/layout/work_mode_fab.xml
+++ b/res/layout/work_mode_fab.xml
@@ -25,7 +25,7 @@
     android:textColor="@color/all_apps_tab_text"
     android:textSize="14sp"
     android:background="@drawable/work_apps_toggle_background"
-    android:drawablePadding="16dp"
+    android:drawablePadding="8dp"
     android:drawableStart="@drawable/ic_corp_off"
     android:layout_marginBottom="@dimen/work_fab_margin"
     android:layout_marginEnd="@dimen/work_fab_margin"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 270c92e871..6a6e72f066 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -121,6 +121,8 @@
 <!-- Floating action button inside work tab to toggle work profile -->
     <dimen name="work_fab_height">48dp</dimen>
     <dimen name="work_fab_radius">24dp</dimen>
+    <dimen name="work_card_padding_horizontal">24dp</dimen>
+    <dimen name="work_card_padding_vertical">32dp</dimen>
     <dimen name="work_fab_margin">16dp</dimen>
     <dimen name="work_profile_footer_padding">20dp</dimen>
     <dimen name="work_profile_footer_text_size">16sp</dimen>
-- 
GitLab


From 658c5dafd4cae7d959a26df60f22ba88e8d2338d Mon Sep 17 00:00:00 2001
From: Yogisha Dixit <ydixit@google.com>
Date: Mon, 24 May 2021 23:23:15 +0100
Subject: [PATCH 1542/1664] Log widgets source.

Test: manual
(1) Upgrading to new DB version is successful (no errors thrown in logcat)
(2) Widgets that were added with the old DB version have CONTAINER_UNKNOWN as their source container
(3) Widgets that are added with the new DB version still log source container after reboot
Bug: 185778648
Change-Id: Iaa38f0be6bc4cb0d29842f9a2ea0d08de000c930
---
 protos/launcher_atom.proto                    |  3 ++
 .../model/WidgetsPredictionUpdateTask.java    | 10 ++++--
 res/raw/downgrade_schema.json                 |  8 ++++-
 src/com/android/launcher3/Launcher.java       |  9 +++++-
 .../android/launcher3/LauncherProvider.java   | 14 +++++++--
 .../android/launcher3/LauncherSettings.java   | 13 +++++++-
 .../launcher3/dragndrop/AddItemActivity.java  |  4 ++-
 .../dragndrop/PinItemDragListener.java        |  4 ++-
 .../android/launcher3/model/LoaderTask.java   |  3 ++
 .../model/data/LauncherAppWidgetInfo.java     | 31 ++++++++++++++++++-
 .../launcher3/util/PendingRequestArgs.java    | 22 ++++++++++++-
 .../widget/PendingAddWidgetInfo.java          | 18 ++++++++---
 .../android/launcher3/widget/WidgetCell.java  |  8 ++++-
 .../launcher3/widget/WidgetsBottomSheet.java  |  2 ++
 .../WidgetsRecommendationTableLayout.java     |  3 ++
 .../android/launcher3/common/WidgetUtils.java |  4 ++-
 16 files changed, 139 insertions(+), 17 deletions(-)

diff --git a/protos/launcher_atom.proto b/protos/launcher_atom.proto
index 475b5bead0..6d49d75953 100644
--- a/protos/launcher_atom.proto
+++ b/protos/launcher_atom.proto
@@ -141,6 +141,9 @@ enum Attribute {
   ALL_APPS_SEARCH_RESULT_NAVVYSITE = 25;
   ALL_APPS_SEARCH_RESULT_TIPS = 26;
   ALL_APPS_SEARCH_RESULT_PEOPLE_TILE = 27;
+
+  WIDGETS_BOTTOM_TRAY = 28;
+  WIDGETS_TRAY_PREDICTION = 29;
 }
 
 // Main app icons
diff --git a/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java b/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java
index 22a8c9b1d0..3d891e8748 100644
--- a/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java
+++ b/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java
@@ -15,6 +15,8 @@
  */
 package com.android.launcher3.model;
 
+import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_PREDICTION;
+
 import android.app.prediction.AppTarget;
 import android.content.ComponentName;
 import android.text.TextUtils;
@@ -73,7 +75,9 @@ public final class WidgetsPredictionUpdateTask extends BaseModelUpdateTask {
                     if (notAddedWidgets.size() > 0) {
                         // Even an apps have more than one widgets, we only include one widget.
                         fixedContainerItems.items.add(
-                                new PendingAddWidgetInfo(notAddedWidgets.get(0).widgetInfo));
+                                new PendingAddWidgetInfo(
+                                        notAddedWidgets.get(0).widgetInfo,
+                                        CONTAINER_WIDGETS_PREDICTION));
                     }
                 }
             }
@@ -90,7 +94,9 @@ public final class WidgetsPredictionUpdateTask extends BaseModelUpdateTask {
                         new ComponentName(app.getPackageName(), app.getClassName()), app.getUser());
                 if (widgetItems.containsKey(targetWidget)) {
                     fixedContainerItems.items.add(
-                            new PendingAddWidgetInfo(widgetItems.get(targetWidget).widgetInfo));
+                            new PendingAddWidgetInfo(widgetItems.get(
+                                    targetWidget).widgetInfo,
+                                    CONTAINER_WIDGETS_PREDICTION));
                 }
             }
         }
diff --git a/res/raw/downgrade_schema.json b/res/raw/downgrade_schema.json
index 8f1780e5f7..bc25cece2d 100644
--- a/res/raw/downgrade_schema.json
+++ b/res/raw/downgrade_schema.json
@@ -2,8 +2,14 @@
   // Note: Comments are not supported in JSON schema, but android parser is lenient.
 
   // Maximum DB version supported by this schema
-  "version" : 28,
+  "version" : 29,
 
+  "downgrade_to_28" : [
+    "ALTER TABLE favorites RENAME TO temp_favorites;",
+    "CREATE TABLE favorites(_id INTEGER PRIMARY KEY, title TEXT, intent TEXT, container INTEGER, screen INTEGER, cellX INTEGER, cellY INTEGER, spanX INTEGER, spanY INTEGER, itemType INTEGER, appWidgetId INTEGER NOT NULL DEFAULT - 1, iconPackage TEXT, iconResource TEXT, icon BLOB, appWidgetProvider TEXT, modified INTEGER NOT NULL DEFAULT 0, restored INTEGER NOT NULL DEFAULT 0, profileId INTEGER DEFAULT 0, rank INTEGER NOT NULL DEFAULT 0, options INTEGER NOT NULL DEFAULT 0);",
+    "INSERT INTO favorites SELECT _id, title, intent, container, screen, cellX, cellY, spanX, spanY, itemType, appWidgetId, iconPackage, iconResource, icon, appWidgetProvider, modified, restored, profileId, rank, options FROM temp_favorites;",
+    "DROP TABLE temp_favorites;"
+  ],
   "downgrade_to_27" : [
     "CREATE TABLE workspaceScreens (_id INTEGER PRIMARY KEY,screenRank INTEGER,modified INTEGER NOT NULL DEFAULT 0)",
     "insert into workspaceScreens (_id, screenRank) select screen as _id, screen as screenRank from favorites where container = -100 group by screen order by screen"
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 0da16b7e23..099f256982 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1339,6 +1339,12 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
         launcherInfo.minSpanX = itemInfo.minSpanX;
         launcherInfo.minSpanY = itemInfo.minSpanY;
         launcherInfo.user = appWidgetInfo.getProfile();
+        if (itemInfo instanceof PendingAddWidgetInfo) {
+            launcherInfo.sourceContainer = ((PendingAddWidgetInfo) itemInfo).sourceContainer;
+        } else if (itemInfo instanceof PendingRequestArgs) {
+            launcherInfo.sourceContainer =
+                    ((PendingRequestArgs) itemInfo).getWidgetSourceContainer();
+        }
 
         getModelWriter().addItemToDatabase(launcherInfo,
                 itemInfo.container, itemInfo.screenId, itemInfo.cellX, itemInfo.cellY);
@@ -2416,7 +2422,8 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
 
                         // Also try to bind the widget. If the bind fails, the user will be shown
                         // a click to setup UI, which will ask for the bind permission.
-                        PendingAddWidgetInfo pendingInfo = new PendingAddWidgetInfo(appWidgetInfo);
+                        PendingAddWidgetInfo pendingInfo =
+                                new PendingAddWidgetInfo(appWidgetInfo, item.sourceContainer);
                         pendingInfo.spanX = item.spanX;
                         pendingInfo.spanY = item.spanY;
                         pendingInfo.minSpanX = item.minSpanX;
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 39b16fd8d6..440e9e38dd 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -61,6 +61,7 @@ import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.logging.FileLog;
 import com.android.launcher3.model.DbDowngradeHelper;
+import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.pm.UserCache;
 import com.android.launcher3.provider.LauncherDbUtils;
 import com.android.launcher3.provider.LauncherDbUtils.SQLiteTransaction;
@@ -98,7 +99,7 @@ public class LauncherProvider extends ContentProvider {
      * Represents the schema of the database. Changes in scheme need not be backwards compatible.
      * When increasing the scheme version, ensure that downgrade_schema.json is updated
      */
-    public static final int SCHEMA_VERSION = 28;
+    public static final int SCHEMA_VERSION = 29;
 
     public static final String AUTHORITY = BuildConfig.APPLICATION_ID + ".settings";
     public static final String KEY_LAYOUT_PROVIDER_AUTHORITY = "KEY_LAYOUT_PROVIDER_AUTHORITY";
@@ -879,9 +880,18 @@ public class LauncherProvider extends ContentProvider {
                     }
                     dropTable(db, "workspaceScreens");
                 }
-                case 28:
+                case 28: {
+                    boolean columnAdded = addIntegerColumn(
+                            db, Favorites.APPWIDGET_SOURCE, Favorites.CONTAINER_UNKNOWN);
+                    if (!columnAdded) {
+                        // Old version remains, which means we wipe old data
+                        break;
+                    }
+                }
+                case 29: {
                     // DB Upgraded successfully
                     return;
+                }
             }
 
             // DB was not upgraded
diff --git a/src/com/android/launcher3/LauncherSettings.java b/src/com/android/launcher3/LauncherSettings.java
index 22c257a8cb..d663480a35 100644
--- a/src/com/android/launcher3/LauncherSettings.java
+++ b/src/com/android/launcher3/LauncherSettings.java
@@ -197,6 +197,8 @@ public class LauncherSettings {
         public static final int CONTAINER_HOTSEAT_PREDICTION = -103;
         public static final int CONTAINER_ALL_APPS = -104;
         public static final int CONTAINER_WIDGETS_TRAY = -105;
+        public static final int CONTAINER_BOTTOM_WIDGETS_TRAY = -112;
+        public static final int CONTAINER_PIN_WIDGETS = -113;
         // Represents search results view.
         public static final int CONTAINER_SEARCH_RESULTS = -106;
         public static final int CONTAINER_SHORTCUTS = -107;
@@ -207,6 +209,8 @@ public class LauncherSettings {
         // Represents any of the extended containers implemented in non-AOSP variants.
         public static final int EXTENDED_CONTAINERS = -200;
 
+        public static final int CONTAINER_UNKNOWN = -1;
+
         public static final String containerToString(int container) {
             switch (container) {
                 case CONTAINER_DESKTOP: return "desktop";
@@ -306,6 +310,12 @@ public class LauncherSettings {
          */
         public static final String OPTIONS = "options";
 
+        /**
+         * Stores the source container that the widget was added from.
+         * <p>Type: INTEGER</p>
+         */
+        public static final String APPWIDGET_SOURCE = "appWidgetSource";
+
         public static void addTableToDb(SQLiteDatabase db, long myProfileId, boolean optional) {
             addTableToDb(db, myProfileId, optional, TABLE_NAME);
         }
@@ -333,7 +343,8 @@ public class LauncherSettings {
                     "restored INTEGER NOT NULL DEFAULT 0," +
                     "profileId INTEGER DEFAULT " + myProfileId + "," +
                     "rank INTEGER NOT NULL DEFAULT 0," +
-                    "options INTEGER NOT NULL DEFAULT 0" +
+                    "options INTEGER NOT NULL DEFAULT 0," +
+                    APPWIDGET_SOURCE + " INTEGER NOT NULL DEFAULT " + CONTAINER_UNKNOWN +
                     ");");
         }
     }
diff --git a/src/com/android/launcher3/dragndrop/AddItemActivity.java b/src/com/android/launcher3/dragndrop/AddItemActivity.java
index 1503167a9d..df97bfbbda 100644
--- a/src/com/android/launcher3/dragndrop/AddItemActivity.java
+++ b/src/com/android/launcher3/dragndrop/AddItemActivity.java
@@ -16,6 +16,7 @@
 
 package com.android.launcher3.dragndrop;
 
+import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_PIN_WIDGETS;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ADD_EXTERNAL_ITEM_BACK;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ADD_EXTERNAL_ITEM_CANCELLED;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ADD_EXTERNAL_ITEM_DRAGGED;
@@ -249,7 +250,8 @@ public class AddItemActivity extends BaseActivity
         mAppWidgetManager = new WidgetManagerHelper(this);
         mAppWidgetHost = new LauncherAppWidgetHost(this);
 
-        PendingAddWidgetInfo pendingInfo = new PendingAddWidgetInfo(widgetInfo);
+        PendingAddWidgetInfo pendingInfo =
+                new PendingAddWidgetInfo(widgetInfo, CONTAINER_PIN_WIDGETS);
         pendingInfo.spanX = Math.min(mIdp.numColumns, widgetInfo.spanX);
         pendingInfo.spanY = Math.min(mIdp.numRows, widgetInfo.spanY);
         mWidgetOptions = pendingInfo.getDefaultSizeOptions(this);
diff --git a/src/com/android/launcher3/dragndrop/PinItemDragListener.java b/src/com/android/launcher3/dragndrop/PinItemDragListener.java
index 9f12e6ec45..2bdf8a085b 100644
--- a/src/com/android/launcher3/dragndrop/PinItemDragListener.java
+++ b/src/com/android/launcher3/dragndrop/PinItemDragListener.java
@@ -17,6 +17,8 @@
 package com.android.launcher3.dragndrop;
 
 
+import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_PIN_WIDGETS;
+
 import android.annotation.TargetApi;
 import android.appwidget.AppWidgetManager;
 import android.content.pm.LauncherApps.PinItemRequest;
@@ -84,7 +86,7 @@ public class PinItemDragListener extends BaseItemDragListener {
                             mLauncher, mRequest.getAppWidgetProviderInfo(mLauncher));
             final PinWidgetFlowHandler flowHandler =
                     new PinWidgetFlowHandler(providerInfo, mRequest);
-            item = new PendingAddWidgetInfo(providerInfo) {
+            item = new PendingAddWidgetInfo(providerInfo, CONTAINER_PIN_WIDGETS) {
                 @Override
                 public WidgetAddFlowHandler getHandler() {
                     return flowHandler;
diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index ad2d7c281e..28fd389c49 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -379,6 +379,8 @@ public class LoaderTask implements Runnable {
                         LauncherSettings.Favorites.RANK);
                 final int optionsIndex = c.getColumnIndexOrThrow(
                         LauncherSettings.Favorites.OPTIONS);
+                final int sourceContainerIndex = c.getColumnIndexOrThrow(
+                        LauncherSettings.Favorites.APPWIDGET_SOURCE);
 
                 final LongSparseArray<Boolean> unlockedUsers = new LongSparseArray<>();
 
@@ -746,6 +748,7 @@ public class LoaderTask implements Runnable {
                                 appWidgetInfo.spanY = c.getInt(spanYIndex);
                                 appWidgetInfo.options = c.getInt(optionsIndex);
                                 appWidgetInfo.user = c.user;
+                                appWidgetInfo.sourceContainer = c.getInt(sourceContainerIndex);
 
                                 if (appWidgetInfo.spanX <= 0 || appWidgetInfo.spanY <= 0) {
                                     c.markDeleted("Widget has invalid size: "
diff --git a/src/com/android/launcher3/model/data/LauncherAppWidgetInfo.java b/src/com/android/launcher3/model/data/LauncherAppWidgetInfo.java
index 658c6e1dc6..0283d5f398 100644
--- a/src/com/android/launcher3/model/data/LauncherAppWidgetInfo.java
+++ b/src/com/android/launcher3/model/data/LauncherAppWidgetInfo.java
@@ -16,6 +16,11 @@
 
 package com.android.launcher3.model.data;
 
+import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS;
+import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_BOTTOM_WIDGETS_TRAY;
+import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_PIN_WIDGETS;
+import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_PREDICTION;
+import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_TRAY;
 import static com.android.launcher3.Utilities.ATLEAST_S;
 
 import android.appwidget.AppWidgetHostView;
@@ -139,6 +144,11 @@ public class LauncherAppWidgetInfo extends ItemInfo {
 
     private boolean mHasNotifiedInitialWidgetSizeChanged;
 
+    /**
+     * The container from which this widget was added (e.g. widgets tray, pin widget, search)
+     */
+    public int sourceContainer = LauncherSettings.Favorites.CONTAINER_UNKNOWN;
+
     public LauncherAppWidgetInfo(int appWidgetId, ComponentName providerName) {
         this.appWidgetId = appWidgetId;
         this.providerName = providerName;
@@ -187,7 +197,8 @@ public class LauncherAppWidgetInfo extends ItemInfo {
                 .put(LauncherSettings.Favorites.APPWIDGET_PROVIDER, providerName.flattenToString())
                 .put(LauncherSettings.Favorites.RESTORED, restoreStatus)
                 .put(LauncherSettings.Favorites.OPTIONS, options)
-                .put(LauncherSettings.Favorites.INTENT, bindOptions);
+                .put(LauncherSettings.Favorites.INTENT, bindOptions)
+                .put(LauncherSettings.Favorites.APPWIDGET_SOURCE, sourceContainer);
     }
 
     /**
@@ -255,11 +266,29 @@ public class LauncherAppWidgetInfo extends ItemInfo {
         return widgetFeatures;
     }
 
+    public static LauncherAtom.Attribute getAttribute(int container) {
+        switch (container) {
+            case CONTAINER_WIDGETS_TRAY:
+                return LauncherAtom.Attribute.WIDGETS;
+            case CONTAINER_BOTTOM_WIDGETS_TRAY:
+                return LauncherAtom.Attribute.WIDGETS_BOTTOM_TRAY;
+            case CONTAINER_PIN_WIDGETS:
+                return LauncherAtom.Attribute.PINITEM;
+            case CONTAINER_WIDGETS_PREDICTION:
+                return LauncherAtom.Attribute.WIDGETS_TRAY_PREDICTION;
+            case CONTAINER_ALL_APPS:
+                return LauncherAtom.Attribute.ALL_APPS_SEARCH_RESULT_WIDGETS;
+            default:
+                return LauncherAtom.Attribute.UNKNOWN;
+        }
+    }
+
     @Override
     public LauncherAtom.ItemInfo buildProto(FolderInfo folderInfo) {
         LauncherAtom.ItemInfo info = super.buildProto(folderInfo);
         return info.toBuilder()
                 .setWidget(info.getWidget().toBuilder().setWidgetFeatures(widgetFeatures))
+                .setAttribute(getAttribute(sourceContainer))
                 .build();
     }
 }
diff --git a/src/com/android/launcher3/util/PendingRequestArgs.java b/src/com/android/launcher3/util/PendingRequestArgs.java
index 9b8c6a61e9..77c8c0c14a 100644
--- a/src/com/android/launcher3/util/PendingRequestArgs.java
+++ b/src/com/android/launcher3/util/PendingRequestArgs.java
@@ -20,7 +20,9 @@ import android.content.Intent;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.widget.PendingAddWidgetInfo;
 import com.android.launcher3.widget.WidgetAddFlowHandler;
 
 /**
@@ -34,11 +36,13 @@ public class PendingRequestArgs extends ItemInfo implements Parcelable {
     private static final int TYPE_APP_WIDGET = 2;
 
     private final int mArg1;
+    private final int mArg2;
     private final int mObjectType;
     private final Parcelable mObject;
 
     public PendingRequestArgs(ItemInfo info) {
         mArg1 = 0;
+        mArg2 = 0;
         mObjectType = TYPE_NONE;
         mObject = null;
 
@@ -46,7 +50,12 @@ public class PendingRequestArgs extends ItemInfo implements Parcelable {
     }
 
     private PendingRequestArgs(int arg1, int objectType, Parcelable object) {
+        this(arg1, 0, objectType, object);
+    }
+
+    private PendingRequestArgs(int arg1, int arg2, int objectType, Parcelable object) {
         mArg1 = arg1;
+        mArg2 = arg2;
         mObjectType = objectType;
         mObject = object;
     }
@@ -56,6 +65,7 @@ public class PendingRequestArgs extends ItemInfo implements Parcelable {
         user = parcel.readParcelable(null);
 
         mArg1 = parcel.readInt();
+        mArg2 = parcel.readInt();
         mObjectType = parcel.readInt();
         mObject = parcel.readParcelable(getClass().getClassLoader());
     }
@@ -73,6 +83,7 @@ public class PendingRequestArgs extends ItemInfo implements Parcelable {
         dest.writeParcelable(user, flags);
 
         dest.writeInt(mArg1);
+        dest.writeInt(mArg2);
         dest.writeInt(mObjectType);
         dest.writeParcelable(mObject, flags);
     }
@@ -85,6 +96,10 @@ public class PendingRequestArgs extends ItemInfo implements Parcelable {
         return mObjectType == TYPE_APP_WIDGET ? mArg1 : 0;
     }
 
+    public int getWidgetSourceContainer() {
+        return mObjectType == TYPE_APP_WIDGET ? mArg2 : Favorites.CONTAINER_UNKNOWN;
+    }
+
     public Intent getPendingIntent() {
         return mObjectType == TYPE_INTENT ? (Intent) mObject : null;
     }
@@ -95,8 +110,13 @@ public class PendingRequestArgs extends ItemInfo implements Parcelable {
 
     public static PendingRequestArgs forWidgetInfo(
             int appWidgetId, WidgetAddFlowHandler widgetHandler, ItemInfo info) {
+        int sourceContainer = Favorites.CONTAINER_UNKNOWN;
+        if (info instanceof PendingAddWidgetInfo) {
+            sourceContainer = ((PendingAddWidgetInfo) info).sourceContainer;
+        }
         PendingRequestArgs args =
-                new PendingRequestArgs(appWidgetId, TYPE_APP_WIDGET, widgetHandler);
+                new PendingRequestArgs(
+                        appWidgetId, sourceContainer, TYPE_APP_WIDGET, widgetHandler);
         args.copyFrom(info);
         return args;
     }
diff --git a/src/com/android/launcher3/widget/PendingAddWidgetInfo.java b/src/com/android/launcher3/widget/PendingAddWidgetInfo.java
index c04c8dc8b5..cbec6427a6 100644
--- a/src/com/android/launcher3/widget/PendingAddWidgetInfo.java
+++ b/src/com/android/launcher3/widget/PendingAddWidgetInfo.java
@@ -15,14 +15,15 @@
  */
 package com.android.launcher3.widget;
 
-import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_TRAY;
-
 import android.appwidget.AppWidgetHostView;
 import android.content.Context;
 import android.os.Bundle;
 
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.PendingAddItemInfo;
+import com.android.launcher3.logger.LauncherAtom;
+import com.android.launcher3.model.data.FolderInfo;
+import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.widget.util.WidgetSizes;
 
 /**
@@ -36,8 +37,9 @@ public class PendingAddWidgetInfo extends PendingAddItemInfo {
     public LauncherAppWidgetProviderInfo info;
     public AppWidgetHostView boundWidget;
     public Bundle bindOptions = null;
+    public int sourceContainer;
 
-    public PendingAddWidgetInfo(LauncherAppWidgetProviderInfo i) {
+    public PendingAddWidgetInfo(LauncherAppWidgetProviderInfo i, int container) {
         if (i.isCustomWidget()) {
             itemType = LauncherSettings.Favorites.ITEM_TYPE_CUSTOM_APPWIDGET;
         } else {
@@ -53,7 +55,7 @@ public class PendingAddWidgetInfo extends PendingAddItemInfo {
         spanY = i.spanY;
         minSpanX = i.minSpanX;
         minSpanY = i.minSpanY;
-        this.container = CONTAINER_WIDGETS_TRAY;
+        this.sourceContainer = this.container = container;
     }
 
     public WidgetAddFlowHandler getHandler() {
@@ -63,4 +65,12 @@ public class PendingAddWidgetInfo extends PendingAddItemInfo {
     public Bundle getDefaultSizeOptions(Context context) {
         return WidgetSizes.getWidgetSizeOptions(context, componentName, spanX, spanY);
     }
+
+    @Override
+    public LauncherAtom.ItemInfo buildProto(FolderInfo folderInfo) {
+        LauncherAtom.ItemInfo info = super.buildProto(folderInfo);
+        return info.toBuilder()
+                .setAttribute(LauncherAppWidgetInfo.getAttribute(sourceContainer))
+                .build();
+    }
 }
diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index a52adf673d..8798332c85 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -16,6 +16,7 @@
 
 package com.android.launcher3.widget;
 
+import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_TRAY;
 import static com.android.launcher3.Utilities.ATLEAST_S;
 
 import android.content.Context;
@@ -99,6 +100,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
 
     private RemoteViews mRemoteViewsPreview;
     private NavigableAppWidgetHostView mAppWidgetHostViewPreview;
+    private int mSourceContainer = CONTAINER_WIDGETS_TRAY;
 
     public WidgetCell(Context context) {
         this(context, null);
@@ -177,6 +179,10 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
         mAppWidgetHostViewPreview = null;
     }
 
+    public void setSourceContainer(int sourceContainer) {
+        this.mSourceContainer = sourceContainer;
+    }
+
     public void applyFromCellItem(WidgetItem item, WidgetPreviewLoader loader) {
         applyPreviewOnAppWidgetHostView(item);
 
@@ -205,7 +211,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
             mPreviewWidth += mShortcutPreviewPadding;
             mPreviewHeight += mShortcutPreviewPadding;
         } else {
-            setTag(new PendingAddWidgetInfo(item.widgetInfo));
+            setTag(new PendingAddWidgetInfo(item.widgetInfo, mSourceContainer));
         }
     }
 
diff --git a/src/com/android/launcher3/widget/WidgetsBottomSheet.java b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
index d7928c77b9..c045cf1b43 100644
--- a/src/com/android/launcher3/widget/WidgetsBottomSheet.java
+++ b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
@@ -16,6 +16,7 @@
 
 package com.android.launcher3.widget;
 
+import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_BOTTOM_WIDGETS_TRAY;
 import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 
 import android.animation.PropertyValuesHolder;
@@ -229,6 +230,7 @@ public class WidgetsBottomSheet extends BaseWidgetSheet {
         previewContainer.setOnClickListener(this);
         previewContainer.setOnLongClickListener(this);
         widget.setAnimatePreview(false);
+        widget.setSourceContainer(CONTAINER_BOTTOM_WIDGETS_TRAY);
 
         parent.addView(widget);
         return widget;
diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
index fe42ddfb15..6fc684862d 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
@@ -15,6 +15,8 @@
  */
 package com.android.launcher3.widget.picker;
 
+import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_PREDICTION;
+
 import android.content.Context;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -132,6 +134,7 @@ public final class WidgetsRecommendationTableLayout extends TableLayout {
         previewContainer.setOnClickListener(mWidgetCellOnClickListener);
         previewContainer.setOnLongClickListener(mWidgetCellOnLongClickListener);
         widget.setAnimatePreview(false);
+        widget.setSourceContainer(CONTAINER_WIDGETS_PREDICTION);
 
         parent.addView(widget);
         return widget;
diff --git a/tests/src_common/com/android/launcher3/common/WidgetUtils.java b/tests/src_common/com/android/launcher3/common/WidgetUtils.java
index 5e17e0a5a7..97500e3131 100644
--- a/tests/src_common/com/android/launcher3/common/WidgetUtils.java
+++ b/tests/src_common/com/android/launcher3/common/WidgetUtils.java
@@ -56,7 +56,9 @@ public class WidgetUtils {
         item.container = LauncherSettings.Favorites.CONTAINER_DESKTOP;
 
         if (bindWidget) {
-            PendingAddWidgetInfo pendingInfo = new PendingAddWidgetInfo(info);
+            PendingAddWidgetInfo pendingInfo =
+                    new PendingAddWidgetInfo(
+                            info, LauncherSettings.Favorites.CONTAINER_WIDGETS_TRAY);
             pendingInfo.spanX = item.spanX;
             pendingInfo.spanY = item.spanY;
             pendingInfo.minSpanX = item.minSpanX;
-- 
GitLab


From 43e17301c4d4cf2f411c42afe4122b78dc3b36e4 Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pbdr@google.com>
Date: Wed, 30 Jun 2021 18:50:41 +0100
Subject: [PATCH 1543/1664] Correct color extraction on App Widget drop.

Disable color extraction on drop until the workspace is back to its
normal size, then re-enable it and force re-coloring. This needs to
happen if the drop is on the workspace, but also if the drop is on the
secondary target.

Fix: 192354264
Test: Manual, see bug for details.
Change-Id: I79203f68843d59384503aa76f4813d886e98afa3
Merged-In: If573641e4bb5a98ed6b5008e00f70f4bbe492c24
---
 .../android/launcher3/ButtonDropTarget.java   | 11 +++--
 src/com/android/launcher3/Workspace.java      |  9 +++-
 .../android/launcher3/dragndrop/DragView.java | 19 +++++++++
 .../widget/LauncherAppWidgetHostView.java     | 42 +++++++++++++++----
 4 files changed, 68 insertions(+), 13 deletions(-)

diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
index 23dd3bb01e..61b5564941 100644
--- a/src/com/android/launcher3/ButtonDropTarget.java
+++ b/src/com/android/launcher3/ButtonDropTarget.java
@@ -20,15 +20,12 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 
 import static com.android.launcher3.LauncherState.NORMAL;
 
-import android.animation.AnimatorSet;
 import android.content.Context;
-import android.content.res.ColorStateList;
 import android.content.res.Resources;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
 import android.util.AttributeSet;
-import android.util.Property;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -40,6 +37,7 @@ import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.dragndrop.DragController;
 import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.dragndrop.DragOptions;
+import com.android.launcher3.dragndrop.DragView;
 import com.android.launcher3.model.data.ItemInfo;
 
 /**
@@ -212,18 +210,23 @@ public abstract class ButtonDropTarget extends TextView
             return;
         }
         final DragLayer dragLayer = mLauncher.getDragLayer();
+        final DragView dragView = d.dragView;
         final Rect from = new Rect();
         dragLayer.getViewRectRelativeToSelf(d.dragView, from);
 
         final Rect to = getIconRect(d);
         final float scale = (float) to.width() / from.width();
-        d.dragView.detachContentView(/* reattachToPreviousParent= */ true);
+        dragView.disableColorExtraction();
+        dragView.detachContentView(/* reattachToPreviousParent= */ true);
         mDropTargetBar.deferOnDragEnd();
 
         Runnable onAnimationEndRunnable = () -> {
             completeDrop(d);
             mDropTargetBar.onDragEnd();
             mLauncher.getStateManager().goToState(NORMAL);
+            // Only re-enable updates once the workspace is back to normal, which will be after the
+            // current frame.
+            post(dragView::resumeColorExtraction);
         };
 
         dragLayer.animateView(d.dragView, from, to, scale, 1f, 1f, 0.1f, 0.1f,
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index f28f54a024..5bdc4022c2 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1786,8 +1786,11 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
             onDropExternal(touchXY, dropTargetLayout, d);
         } else {
             final View cell = mDragInfo.cell;
+            final DragView dragView = d.dragView;
             boolean droppedOnOriginalCellDuringTransition = false;
-            Runnable onCompleteRunnable = null;
+            Runnable onCompleteRunnable = dragView::resumeColorExtraction;
+
+            dragView.disableColorExtraction();
 
             if (dropTargetLayout != null && !d.cancelled) {
                 // Move internally
@@ -1898,7 +1901,9 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
                         AppWidgetProviderInfo pInfo = hostView.getAppWidgetInfo();
                         if (pInfo != null && pInfo.resizeMode != AppWidgetProviderInfo.RESIZE_NONE
                                 && !options.isAccessibleDrag) {
+                            final Runnable previousRunnable = onCompleteRunnable;
                             onCompleteRunnable = () -> {
+                                previousRunnable.run();
                                 if (!isPageInTransition()) {
                                     AppWidgetResizeFrame.showForWidget(hostView, cellLayout);
                                 }
@@ -1967,7 +1972,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
             parent.onDropChild(cell);
 
             mLauncher.getStateManager().goToState(NORMAL, SPRING_LOADED_EXIT_DELAY,
-                    onCompleteRunnable == null ? null : forSuccessCallback(onCompleteRunnable));
+                    forSuccessCallback(onCompleteRunnable));
             mStatsLogManager.logger().withItemInfo(d.dragInfo).withInstanceId(d.logInstanceId)
                     .log(LauncherEvent.LAUNCHER_ITEM_DROP_COMPLETED);
         }
diff --git a/src/com/android/launcher3/dragndrop/DragView.java b/src/com/android/launcher3/dragndrop/DragView.java
index 1664980c35..0acded5ade 100644
--- a/src/com/android/launcher3/dragndrop/DragView.java
+++ b/src/com/android/launcher3/dragndrop/DragView.java
@@ -66,6 +66,7 @@ import com.android.launcher3.statemanager.StateManager.StateListener;
 import com.android.launcher3.util.RunnableList;
 import com.android.launcher3.util.Thunk;
 import com.android.launcher3.views.BaseDragLayer;
+import com.android.launcher3.widget.LauncherAppWidgetHostView;
 
 /** A custom view for rendering an icon, folder, shortcut or widget during drag-n-drop. */
 public class DragView extends FrameLayout implements StateListener<LauncherState> {
@@ -490,6 +491,24 @@ public class DragView extends FrameLayout implements StateListener<LauncherState
         }
     }
 
+    /**
+     * If the drag view uses color extraction, block it.
+     */
+    public void disableColorExtraction() {
+        if (mContent instanceof LauncherAppWidgetHostView) {
+            ((LauncherAppWidgetHostView) mContent).disableColorExtraction();
+        }
+    }
+
+    /**
+     * If the drag view uses color extraction, restores it.
+     */
+    public void resumeColorExtraction() {
+        if (mContent instanceof LauncherAppWidgetHostView) {
+            ((LauncherAppWidgetHostView) mContent).enableColorExtraction(/* updateColors= */ false);
+        }
+    }
+
     /**
      * Removes this view from the {@link DragLayer}.
      *
diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
index ea08a252e6..b554c212ca 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
@@ -119,6 +119,7 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
     private long mDeferUpdatesUntilMillis = 0;
     private RemoteViews mDeferredRemoteViews;
     private Optional<SparseIntArray> mDeferredColorChange = Optional.empty();
+    private boolean mEnableColorExtraction = true;
 
     public LauncherAppWidgetHostView(Context context) {
         super(context);
@@ -342,13 +343,7 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         }
 
         mIsScrollable = checkScrollableRecursively(this);
-        if (!mIsInDragMode && getTag() instanceof LauncherAppWidgetInfo) {
-
-            LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) getTag();
-            mDragLayerRelativeCoordinateHelper.viewToRect(this, mCurrentWidgetSize);
-            updateColorExtraction(mCurrentWidgetSize,
-                    mWorkspace.getPageIndexForScreenId(info.screenId));
-        }
+        updateColorExtraction();
 
         enforceRoundedCorners();
     }
@@ -377,6 +372,7 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
      * @param pageId The workspace page the widget is on.
      */
     private void updateColorExtraction(Rect rectInDragLayer, int pageId) {
+        if (!mEnableColorExtraction) return;
         mColorExtractor.getExtractedRectForViewRect(mLauncher, pageId, rectInDragLayer, mTempRectF);
 
         if (mTempRectF.isEmpty()) {
@@ -391,6 +387,38 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
         }
     }
 
+    /**
+     * Update the color extraction, using the current position of the app widget.
+     */
+    private void updateColorExtraction() {
+        if (!mIsInDragMode && getTag() instanceof LauncherAppWidgetInfo) {
+            LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) getTag();
+            mDragLayerRelativeCoordinateHelper.viewToRect(this, mCurrentWidgetSize);
+            updateColorExtraction(mCurrentWidgetSize,
+                    mWorkspace.getPageIndexForScreenId(info.screenId));
+        }
+    }
+
+    /**
+     * Enables the local color extraction.
+     *
+     * @param updateColors If true, this will update the color extraction using the current location
+     *                    of the App Widget.
+     */
+    public void enableColorExtraction(boolean updateColors) {
+        mEnableColorExtraction = true;
+        if (updateColors) {
+            updateColorExtraction();
+        }
+    }
+
+    /**
+     * Disables the local color extraction.
+     */
+    public void disableColorExtraction() {
+        mEnableColorExtraction = false;
+    }
+
     // Compare two location rectangles. Locations are always in the [0;1] range.
     private static boolean isSameLocation(@NonNull RectF rect1, @Nullable RectF rect2,
             float epsilon) {
-- 
GitLab


From a7d7f78c08b4a872fc505e8874bdf137d7843059 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 30 Jun 2021 11:59:08 -0700
Subject: [PATCH 1544/1664] Defer cleaning up screenshot until after we
 actually switch to screenshot

- In the case where we get a screenshot on cancel, we should wait to
  finish the recents animation until the view gets a chance to update

Bug: 185643608
Test: Swipe up to overview in 2 button, hit home
Change-Id: I2ac3567006f6fa7e6f473499f6862e5e408dfc3d
---
 .../src/com/android/quickstep/AbsSwipeUpHandler.java  |  6 +++---
 quickstep/src/com/android/quickstep/GestureState.java | 11 +++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 524cd53839..7727d5752f 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -383,10 +383,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         // Set up a entire animation lifecycle callback to notify the current recents view when
         // the animation is canceled
         mGestureState.runOnceAtState(STATE_RECENTS_ANIMATION_CANCELED, () -> {
-                ThumbnailData snapshot = mGestureState.getRecentsAnimationCanceledSnapshot();
+                ThumbnailData snapshot = mGestureState.consumeRecentsAnimationCanceledSnapshot();
                 if (snapshot != null) {
-                    RecentsModel.INSTANCE.get(mContext).onTaskSnapshotChanged(
-                            mRecentsView.getRunningTaskId(), snapshot);
+                    mRecentsView.switchToScreenshot(snapshot,
+                            () -> mRecentsAnimationController.cleanupScreenshot());
                     mRecentsView.onRecentsAnimationComplete();
                 }
             });
diff --git a/quickstep/src/com/android/quickstep/GestureState.java b/quickstep/src/com/android/quickstep/GestureState.java
index a302a07bca..015002f0e1 100644
--- a/quickstep/src/com/android/quickstep/GestureState.java
+++ b/quickstep/src/com/android/quickstep/GestureState.java
@@ -376,11 +376,14 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL
     }
 
     /**
-     * Returns the canceled animation thumbnail data. This call only returns a value while
-     * STATE_RECENTS_ANIMATION_CANCELED state is being set.
+     * Returns and clears the canceled animation thumbnail data. This call only returns a value
+     * while STATE_RECENTS_ANIMATION_CANCELED state is being set, and the caller is responsible for
+     * calling {@link RecentsAnimationController#cleanupScreenshot()}.
      */
-    ThumbnailData getRecentsAnimationCanceledSnapshot() {
-        return mRecentsAnimationCanceledSnapshot;
+    ThumbnailData consumeRecentsAnimationCanceledSnapshot() {
+        ThumbnailData data = mRecentsAnimationCanceledSnapshot;
+        mRecentsAnimationCanceledSnapshot = null;
+        return data;
     }
 
     void setSwipeUpStartTimeMs(long uptimeMs) {
-- 
GitLab


From 25f386edc82c44714f8fdd5040831e3b6c73eb0b Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 30 Jun 2021 12:19:07 -0700
Subject: [PATCH 1545/1664] Fixing some dimentions in AllSet activity

Bug: 192412172
Test: Manual
Change-Id: I599c858fc21d45dd41eaa01ff3d91863d52f6ae8
---
 quickstep/res/drawable/ic_all_set.xml | 8 ++++----
 quickstep/res/values/dimens.xml       | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/quickstep/res/drawable/ic_all_set.xml b/quickstep/res/drawable/ic_all_set.xml
index 656c59669c..f718b8b64b 100644
--- a/quickstep/res/drawable/ic_all_set.xml
+++ b/quickstep/res/drawable/ic_all_set.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="42dp"
-    android:height="42dp"
-    android:viewportWidth="42"
-    android:viewportHeight="42">
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"
         android:fillColor="#FFFFFF"/>
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 28262a8721..1f86d62d31 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -114,8 +114,8 @@
 
     <!-- All Set page -->
     <dimen name="allset_page_margin_horizontal">40dp</dimen>
-    <dimen name="allset_title_margin_top">28dp</dimen>
-    <dimen name="allset_title_icon_margin_top">80dp</dimen>
+    <dimen name="allset_title_margin_top">24dp</dimen>
+    <dimen name="allset_title_icon_margin_top">32dp</dimen>
     <dimen name="allset_hint_margin_bottom">52dp</dimen>
     <dimen name="allset_subtitle_margin_top">24dp</dimen>
 
-- 
GitLab


From 12b0dfb826a41fc71021fd2c2e9492b373056c42 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 30 Jun 2021 19:40:27 +0100
Subject: [PATCH 1546/1664] Fix widget animation truncated at drop if a widget
 is resized

Set the widget outline to DragView rather than the content view
hosting a Picture record of AppWidgetHostView at drop.

Fix: 191646816
Test: Manual
Change-Id: I901743f8ba392de37f3ef69ca386c4b36bfebd7f
Merged-In: I901743f8ba392de37f3ef69ca386c4b36bfebd7f
---
 src/com/android/launcher3/dragndrop/DragView.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/dragndrop/DragView.java b/src/com/android/launcher3/dragndrop/DragView.java
index 1664980c35..8de526df99 100644
--- a/src/com/android/launcher3/dragndrop/DragView.java
+++ b/src/com/android/launcher3/dragndrop/DragView.java
@@ -471,12 +471,12 @@ public class DragView extends FrameLayout implements StateListener<LauncherState
             mContent.draw(picture.beginRecording(mWidth, mHeight));
             picture.endRecording();
             View view = new View(mLauncher);
-            view.setClipToOutline(mContent.getClipToOutline());
-            view.setOutlineProvider(mContent.getOutlineProvider());
             view.setBackground(new PictureDrawable(picture));
             view.measure(makeMeasureSpec(mWidth, EXACTLY), makeMeasureSpec(mHeight, EXACTLY));
             view.layout(mContent.getLeft(), mContent.getTop(),
                     mContent.getRight(), mContent.getBottom());
+            setClipToOutline(mContent.getClipToOutline());
+            setOutlineProvider(mContent.getOutlineProvider());
             addViewInLayout(view, indexOfChild(mContent), mContent.getLayoutParams(), true);
 
             removeViewInLayout(mContent);
-- 
GitLab


From 4903c7823eabaeb71f285b5659bd524e2de3a26f Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Tue, 29 Jun 2021 19:18:17 -0700
Subject: [PATCH 1547/1664] Converting some TAPL sequence mismatches to
 human-readable diags.

Test: local runs
Bug: 187761685
Change-Id: Ie2c64a22f56b0bed1cd175486b42beedb06285cc
---
 .../launcher3/tapl/LogEventChecker.java       | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/tests/tapl/com/android/launcher3/tapl/LogEventChecker.java b/tests/tapl/com/android/launcher3/tapl/LogEventChecker.java
index a809e2e30c..710e3cd691 100644
--- a/tests/tapl/com/android/launcher3/tapl/LogEventChecker.java
+++ b/tests/tapl/com/android/launcher3/tapl/LogEventChecker.java
@@ -15,6 +15,10 @@
  */
 package com.android.launcher3.tapl;
 
+import static com.android.launcher3.testing.TestProtocol.SEQUENCE_MAIN;
+import static com.android.launcher3.testing.TestProtocol.SEQUENCE_PILFER;
+import static com.android.launcher3.testing.TestProtocol.SEQUENCE_TIS;
+
 import android.os.SystemClock;
 
 import com.android.launcher3.testing.TestProtocol;
@@ -87,6 +91,24 @@ public class LogEventChecker {
         final ListMap<String> actualEvents = finishSync(waitForExpectedCountMs);
         if (actualEvents == null) return "null event sequences because launcher likely died";
 
+        final String lowLevelDiags = lowLevelMismatchDiagnostics(actualEvents);
+        // If we have a sequence mismatch for a successful gesture, we want to provide all low-level
+        // details.
+        if (successfulGesture) {
+            return lowLevelDiags;
+        }
+
+        final String sequenceMismatchInEnglish = highLevelMismatchDiagnostics(actualEvents);
+
+        if (sequenceMismatchInEnglish != null) {
+            LauncherInstrumentation.log(lowLevelDiags);
+            return "Hint: " + sequenceMismatchInEnglish;
+        } else {
+            return lowLevelDiags;
+        }
+    }
+
+    private String lowLevelMismatchDiagnostics(ListMap<String> actualEvents) {
         final StringBuilder sb = new StringBuilder();
         boolean hasMismatches = false;
         for (Map.Entry<String, List<Pattern>> expectedEvents : mExpectedEvents.entrySet()) {
@@ -118,6 +140,42 @@ public class LogEventChecker {
         return hasMismatches ? "Mismatching events: " + sb.toString() : null;
     }
 
+    private String highLevelMismatchDiagnostics(ListMap<String> actualEvents) {
+        if (!mExpectedEvents.getNonNull(SEQUENCE_TIS).isEmpty()
+                && actualEvents.getNonNull(SEQUENCE_TIS).isEmpty()) {
+            return "TouchInteractionService didn't receive any of the touch events sent by the "
+                    + "test";
+        }
+        if (getMismatchPosition(mExpectedEvents.getNonNull(SEQUENCE_TIS),
+                actualEvents.getNonNull(SEQUENCE_TIS)) != -1) {
+            // If TIS has a mismatch that we can't convert to high-level diags, don't convert
+            // other sequences either.
+            return null;
+        }
+
+        if (mExpectedEvents.getNonNull(SEQUENCE_PILFER).size() == 1
+                && actualEvents.getNonNull(SEQUENCE_PILFER).isEmpty()) {
+            return "Launcher didn't detect the navigation gesture sent by the test";
+        }
+        if (mExpectedEvents.getNonNull(SEQUENCE_PILFER).isEmpty()
+                && actualEvents.getNonNull(SEQUENCE_PILFER).size() == 1) {
+            return "Launcher detected a navigation gesture, but the test didn't send one";
+        }
+        if (getMismatchPosition(mExpectedEvents.getNonNull(SEQUENCE_PILFER),
+                actualEvents.getNonNull(SEQUENCE_PILFER)) != -1) {
+            // If Pilfer has a mismatch that we can't convert to high-level diags, don't analyze
+            // other sequences.
+            return null;
+        }
+
+        if (!mExpectedEvents.getNonNull(SEQUENCE_MAIN).isEmpty()
+                && actualEvents.getNonNull(SEQUENCE_MAIN).isEmpty()) {
+            return "None of the touch or keyboard events sent by the test was received by "
+                    + "Launcher's main thread";
+        }
+        return null;
+    }
+
     // If the list of actual events matches the list of expected events, returns -1, otherwise
     // the position of the mismatch.
     private static int getMismatchPosition(List<Pattern> expected, List<String> actual) {
-- 
GitLab


From 17cc821c28cfa6b83a779dbcf39511e516bee91f Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Wed, 30 Jun 2021 17:09:46 -0700
Subject: [PATCH 1548/1664] Fix bug where app icon is gone for first frame on
 cold start.

We need the icon to be full alpha during the init pass, then when
the actual animation starts, we can swap the icon with the window
(splash screen that draws the icon).

Bug: 192366079
Test: slow down window animations
      check no empty frame on cold start app launch
      check no empty frame on warm start app launch

Change-Id: I16a1779e5252d8e88bc3c408e1dc40b264fe4cf4
---
 .../src/com/android/launcher3/QuickstepTransitionManager.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 6163447482..bd7a4780b1 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -725,7 +725,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
                 floatingIconBounds.bottom += offsetY;
 
                 if (initOnly) {
-                    floatingView.update(mIconAlpha.value, 255, floatingIconBounds, percent, 0f,
+                    // For the init pass, we want full alpha since the window is not yet ready.
+                    floatingView.update(1f, 255, floatingIconBounds, percent, 0f,
                             mWindowRadius.value * scale, true /* isOpening */);
                     return;
                 }
-- 
GitLab


From 2cc33ed29adb97b2660a12b8fa31db3162a6e731 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Wed, 30 Jun 2021 17:59:17 -0700
Subject: [PATCH 1549/1664] Cancel existing preview item animation during
 non-animated update.

Otherwise we end up in a bad folder icon state.

Bug: 191227370
Test: Drag icon out of folder bounds,
      Suddenly drop it so its forced to go back to the folder
      Close folder before the animation finishes

Change-Id: Ib751a8209d66c5e9772731fdc1d7f365ae47531a
---
 src/com/android/launcher3/folder/PreviewItemManager.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/android/launcher3/folder/PreviewItemManager.java b/src/com/android/launcher3/folder/PreviewItemManager.java
index a6674fcb08..8bef6ad7ff 100644
--- a/src/com/android/launcher3/folder/PreviewItemManager.java
+++ b/src/com/android/launcher3/folder/PreviewItemManager.java
@@ -269,6 +269,9 @@ public class PreviewItemManager {
             setDrawable(p, items.get(i));
 
             if (!animate) {
+                if (p.anim != null) {
+                    p.anim.cancel();
+                }
                 computePreviewItemDrawingParams(i, numItemsInFirstPagePreview, p);
                 if (mReferenceDrawable == null) {
                     mReferenceDrawable = p.drawable;
-- 
GitLab


From 837359b1ea6d5a54f40d5c6bb014e83428317d80 Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Wed, 30 Jun 2021 17:25:07 -0700
Subject: [PATCH 1550/1664] Set correct divider dimension for task menu options

Previously divider drawable dimension was set on height,
which only works when things are divided vertically.
For horizontal layouts, we need to set divider width.

Bug: 192398954
Test: Tested portrait + fake/real landscape
+ tablet

Change-Id: I5a63df9749bf37c3a563e923a1b4724aa17d9409
---
 quickstep/res/layout/task_menu.xml                  |  1 -
 quickstep/res/values/dimens.xml                     |  1 +
 .../com/android/quickstep/views/TaskMenuView.java   | 13 ++++++++++++-
 .../launcher3/touch/LandscapePagedViewHandler.java  |  6 +++++-
 .../launcher3/touch/PagedOrientationHandler.java    |  4 +++-
 .../launcher3/touch/PortraitPagedViewHandler.java   |  7 ++++++-
 6 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/quickstep/res/layout/task_menu.xml b/quickstep/res/layout/task_menu.xml
index 3a47e99517..a5c944540b 100644
--- a/quickstep/res/layout/task_menu.xml
+++ b/quickstep/res/layout/task_menu.xml
@@ -40,7 +40,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:divider="@drawable/all_apps_divider"
         android:showDividers="middle" />
 
 </com.android.quickstep.views.TaskMenuView>
\ No newline at end of file
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 28262a8721..76d2263511 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -25,6 +25,7 @@
     <!--  Task Menu View  -->
     <dimen name="task_menu_corner_radius">22dp</dimen>
     <dimen name="task_menu_item_corner_radius">4dp</dimen>
+    <dimen name="task_menu_spacing">2dp</dimen>
     <dimen name="overview_proactive_row_height">48dp</dimen>
     <dimen name="overview_proactive_row_bottom_margin">16dp</dimen>
 
diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
index d663635c79..39325cc80d 100644
--- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
@@ -26,6 +26,8 @@ import android.content.Context;
 import android.graphics.Outline;
 import android.graphics.PointF;
 import android.graphics.Rect;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.shapes.RectShape;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.MotionEvent;
@@ -237,6 +239,8 @@ public class TaskMenuView extends AbstractFloatingView implements OnScrollChange
         PagedOrientationHandler orientationHandler = taskView.getPagedOrientationHandler();
         measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
         orientationHandler.setTaskMenuAroundTaskView(this, mTaskInsetMargin);
+
+        // Get Position
         mActivity.getDragLayer().getDescendantRectRelativeToSelf(taskView, sTempRect);
         Rect insets = mActivity.getDragLayer().getInsets();
         BaseDragLayer.LayoutParams params = (BaseDragLayer.LayoutParams) getLayoutParams();
@@ -248,8 +252,15 @@ public class TaskMenuView extends AbstractFloatingView implements OnScrollChange
         setLayoutParams(params);
         setScaleX(taskView.getScaleX());
         setScaleY(taskView.getScaleY());
+
+        // Set divider spacing
+        ShapeDrawable divider = new ShapeDrawable(new RectShape());
+        divider.getPaint().setColor(getResources().getColor(android.R.color.transparent));
+        int dividerSpacing = (int) getResources().getDimension(R.dimen.task_menu_spacing);
+        mOptionLayout.setShowDividers(SHOW_DIVIDER_MIDDLE);
+
         orientationHandler.setTaskOptionsMenuLayoutOrientation(
-                mActivity.getDeviceProfile(), mOptionLayout);
+                mActivity.getDeviceProfile(), mOptionLayout, dividerSpacing, divider);
         setPosition(sTempRect.left - insets.left, sTempRect.top - insets.top, 0);
     }
 
diff --git a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
index 11c9649279..d047eca29e 100644
--- a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
+++ b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
@@ -29,6 +29,7 @@ import android.content.res.Resources;
 import android.graphics.PointF;
 import android.graphics.Rect;
 import android.graphics.RectF;
+import android.graphics.drawable.ShapeDrawable;
 import android.util.FloatProperty;
 import android.view.MotionEvent;
 import android.view.Surface;
@@ -269,8 +270,11 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
 
     @Override
     public void setTaskOptionsMenuLayoutOrientation(DeviceProfile deviceProfile,
-        LinearLayout taskMenuLayout) {
+            LinearLayout taskMenuLayout, int dividerSpacing,
+            ShapeDrawable dividerDrawable) {
         taskMenuLayout.setOrientation(LinearLayout.HORIZONTAL);
+        dividerDrawable.setIntrinsicWidth(dividerSpacing);
+        taskMenuLayout.setDividerDrawable(dividerDrawable);
     }
 
     @Override
diff --git a/src/com/android/launcher3/touch/PagedOrientationHandler.java b/src/com/android/launcher3/touch/PagedOrientationHandler.java
index e0b89c7ffe..266e05fee1 100644
--- a/src/com/android/launcher3/touch/PagedOrientationHandler.java
+++ b/src/com/android/launcher3/touch/PagedOrientationHandler.java
@@ -22,6 +22,7 @@ import android.graphics.Matrix;
 import android.graphics.PointF;
 import android.graphics.Rect;
 import android.graphics.RectF;
+import android.graphics.drawable.ShapeDrawable;
 import android.util.FloatProperty;
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
@@ -123,7 +124,8 @@ public interface PagedOrientationHandler {
      * inside task menu view.
      */
     void setTaskOptionsMenuLayoutOrientation(DeviceProfile deviceProfile,
-            LinearLayout taskMenuLayout);
+            LinearLayout taskMenuLayout, int dividerSpacing,
+            ShapeDrawable dividerDrawable);
     /**
      * Sets layout param attributes for {@link com.android.launcher3.popup.SystemShortcut} child
      * views inside task menu view.
diff --git a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
index dcbb7ca6e8..dd97af5d76 100644
--- a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
+++ b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
@@ -27,6 +27,7 @@ import android.content.res.Resources;
 import android.graphics.PointF;
 import android.graphics.Rect;
 import android.graphics.RectF;
+import android.graphics.drawable.ShapeDrawable;
 import android.util.FloatProperty;
 import android.view.MotionEvent;
 import android.view.Surface;
@@ -274,14 +275,18 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
 
     @Override
     public void setTaskOptionsMenuLayoutOrientation(DeviceProfile deviceProfile,
-        LinearLayout taskMenuLayout) {
+            LinearLayout taskMenuLayout, int dividerSpacing,
+            ShapeDrawable dividerDrawable) {
         if (deviceProfile.isLandscape && !deviceProfile.isTablet) {
             // Phone landscape
             taskMenuLayout.setOrientation(LinearLayout.HORIZONTAL);
+            dividerDrawable.setIntrinsicWidth(dividerSpacing);
         } else {
             // Phone Portrait, LargeScreen Landscape/Portrait
             taskMenuLayout.setOrientation(LinearLayout.VERTICAL);
+            dividerDrawable.setIntrinsicHeight(dividerSpacing);
         }
+        taskMenuLayout.setDividerDrawable(dividerDrawable);
     }
 
     @Override
-- 
GitLab


From 1b5efa3216b1259a153e45f3ae0302e851b2929a Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Wed, 30 Jun 2021 16:54:14 +0100
Subject: [PATCH 1551/1664] Reduce margin for DropTargetBar to avoid buttons to
 be truncated.

Bug: 187036287
Test: Tested manually by QA testing team on 4X5 grid size
Change-Id: Iaa4cd3e464ccf50427a5aa96d97093601e1d2948
---
 res/values-sw340dp/dimens.xml                | 1 -
 res/values/dimens.xml                        | 3 ++-
 res/values/styles.xml                        | 2 +-
 src/com/android/launcher3/DropTargetBar.java | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/res/values-sw340dp/dimens.xml b/res/values-sw340dp/dimens.xml
index c9f2981f70..33b06f588c 100644
--- a/res/values-sw340dp/dimens.xml
+++ b/res/values-sw340dp/dimens.xml
@@ -19,6 +19,5 @@
 
     <!-- Drag padding to add to the bottom of drop targets -->
     <dimen name="drop_target_drag_padding">20dp</dimen>
-    <dimen name="drop_target_text_size">16sp</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 270c92e871..b91b1a4fa0 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -189,8 +189,9 @@
 <!-- Dragging -->
     <!-- Drag padding to add to the bottom of drop targets -->
     <dimen name="drop_target_drag_padding">14dp</dimen>
-    <dimen name="drop_target_text_size">20sp</dimen>
+    <dimen name="drop_target_text_size">16sp</dimen>
     <dimen name="drop_target_shadow_elevation">2dp</dimen>
+    <dimen name="drop_target_bar_margin_horizontal">4dp</dimen>
 
     <!-- the distance an icon must be dragged before button drop targets accept it -->
     <dimen name="drag_distanceThreshold">30dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 416c711edc..24851f24c5 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -258,7 +258,7 @@
     <!-- Drop targets -->
     <style name="DropTargetButtonBase" parent="@android:style/TextAppearance.DeviceDefault">
         <item name="android:drawablePadding">8dp</item>
-        <item name="android:padding">16dp</item>
+        <item name="android:padding">14dp</item>
         <item name="android:textColor">@color/drop_target_text</item>
         <item name="android:textSize">@dimen/drop_target_text_size</item>
         <item name="android:singleLine">true</item>
diff --git a/src/com/android/launcher3/DropTargetBar.java b/src/com/android/launcher3/DropTargetBar.java
index 4a1b08460b..88f6c498aa 100644
--- a/src/com/android/launcher3/DropTargetBar.java
+++ b/src/com/android/launcher3/DropTargetBar.java
@@ -105,7 +105,8 @@ public class DropTargetBar extends FrameLayout
                         / (2 * (grid.inv.numColumns + 1)))
                         + grid.edgeMarginPx;
             } else {
-                gap = grid.desiredWorkspaceLeftRightMarginPx - grid.inv.defaultWidgetPadding.right;
+                gap = getContext().getResources()
+                        .getDimensionPixelSize(R.dimen.drop_target_bar_margin_horizontal);
             }
             lp.width = grid.availableWidthPx - 2 * gap;
 
-- 
GitLab


From 551b4297ed394afa51a19ff1746ea5c51797d533 Mon Sep 17 00:00:00 2001
From: Cyrus Boadway <boadway@google.com>
Date: Thu, 1 Jul 2021 12:10:53 +0000
Subject: [PATCH 1552/1664] Use nullable field and boolean rather than optional

Optional won't hold null parameters, so use a boolean flag and
colorschange fields to represent the value and whether changes are
present.

Bug: 190818220
Test: manual
Change-Id: I794507340345864e73f04039f12a035c8053fd96
---
 .../widget/LauncherAppWidgetHostView.java     | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
index b554c212ca..63bc416fa4 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
@@ -57,7 +57,6 @@ import com.android.launcher3.views.BaseDragLayer.TouchCompleteListener;
 import com.android.launcher3.widget.dragndrop.AppWidgetHostViewDragListener;
 
 import java.util.List;
-import java.util.Optional;
 
 /**
  * {@inheritDoc}
@@ -118,7 +117,8 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
     private final ViewGroupFocusHelper mDragLayerRelativeCoordinateHelper;
     private long mDeferUpdatesUntilMillis = 0;
     private RemoteViews mDeferredRemoteViews;
-    private Optional<SparseIntArray> mDeferredColorChange = Optional.empty();
+    private boolean mHasDeferredColorChange = false;
+    private @Nullable SparseIntArray mDeferredColorChange = null;
     private boolean mEnableColorExtraction = true;
 
     public LauncherAppWidgetHostView(Context context) {
@@ -244,18 +244,23 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
      */
     public void endDeferringUpdates() {
         RemoteViews remoteViews;
-        Optional<SparseIntArray> deferredColors;
+        SparseIntArray deferredColors;
+        boolean hasDeferredColors;
         synchronized (mUpdateLock) {
             mDeferUpdatesUntilMillis = 0;
             remoteViews = mDeferredRemoteViews;
             mDeferredRemoteViews = null;
             deferredColors = mDeferredColorChange;
-            mDeferredColorChange = Optional.empty();
+            hasDeferredColors = mHasDeferredColorChange;
+            mDeferredColorChange = null;
+            mHasDeferredColorChange = false;
         }
         if (remoteViews != null) {
             updateAppWidget(remoteViews);
         }
-        deferredColors.ifPresent(colors -> onColorsChanged(null /* rectF */, colors));
+        if (hasDeferredColors) {
+            onColorsChanged(null /* rectF */, deferredColors);
+        }
     }
 
     public boolean onInterceptTouchEvent(MotionEvent ev) {
@@ -437,10 +442,12 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
     public void onColorsChanged(RectF rectF, SparseIntArray colors) {
         synchronized (mUpdateLock) {
             if (isDeferringUpdates()) {
-                mDeferredColorChange = Optional.ofNullable(colors);
+                mDeferredColorChange = colors;
+                mHasDeferredColorChange = true;
                 return;
             }
-            mDeferredColorChange = Optional.empty();
+            mDeferredColorChange = null;
+            mHasDeferredColorChange = false;
         }
 
         // setColorResources will reapply the view, which must happen in the UI thread.
-- 
GitLab


From 6a777d84b843965eb9f37869ccd02637bb1b78dd Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 30 Jun 2021 14:01:59 -0700
Subject: [PATCH 1553/1664] Remove unused logs

Bug: 191698994
Test: Just removing logs
Change-Id: Ia6ae528f1444cbdbe3823657492deeb6c4a3d6ce
Merged-In: Ia6ae528f1444cbdbe3823657492deeb6c4a3d6ce
---
 .../src/com/android/quickstep/TaskAnimationManager.java      | 1 -
 quickstep/src/com/android/quickstep/views/RecentsView.java   | 5 -----
 quickstep/src/com/android/quickstep/views/TaskView.java      | 3 ---
 3 files changed, 9 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/TaskAnimationManager.java b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
index 223c46df26..d4c45e4cc2 100644
--- a/quickstep/src/com/android/quickstep/TaskAnimationManager.java
+++ b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
@@ -94,7 +94,6 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
     @UiThread
     public RecentsAnimationCallbacks startRecentsAnimation(GestureState gestureState,
             Intent intent, RecentsAnimationCallbacks.RecentsAnimationListener listener) {
-        Log.d("b/186444448", "startRecentsAnimation");
         // Notify if recents animation is still running
         if (mController != null) {
             String msg = "New recents animation started before old animation completed";
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 710a9ab9fe..b40025a2c5 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -83,7 +83,6 @@ import android.text.StaticLayout;
 import android.text.TextPaint;
 import android.util.AttributeSet;
 import android.util.FloatProperty;
-import android.util.Log;
 import android.util.SparseBooleanArray;
 import android.view.Gravity;
 import android.view.HapticFeedbackConstants;
@@ -1649,7 +1648,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
      * {@link #onGestureAnimationStart} and {@link #onGestureAnimationEnd()}.
      */
     public void onSwipeUpAnimationSuccess() {
-        Log.d("b/186444448", "onSwipeUpAnimationSuccess");
         if (getRunningTaskView() != null) {
             animateUpRunningTaskIconScale();
         }
@@ -1724,7 +1722,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
      * Called when a gesture from an app has finished, and the animation to the target has ended.
      */
     public void onGestureAnimationEnd() {
-        Log.d("b/186444448", "onGestureEnd");
         mGestureActive = false;
         if (mOrientationState.setGestureActive(false)) {
             updateOrientationHandler();
@@ -1881,8 +1878,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     public void animateUpRunningTaskIconScale() {
         mRunningTaskIconScaledDown = false;
         TaskView firstTask = getRunningTaskView();
-        Log.d("b/186444448", "animateUpRunningTaskIconScale: firstTask="
-                + (firstTask != null ? "t:" + firstTask.getTask() : null));
         if (firstTask != null) {
             firstTask.setIconScaleAnimStartProgress(0f);
             firstTask.animateIconScaleAndDimIntoView();
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index ae429d91d8..5f8298a839 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -821,8 +821,6 @@ public class TaskView extends FrameLayout implements Reusable {
     }
 
     public void animateIconScaleAndDimIntoView() {
-        Log.d("b/186444448", "animateIconScaleAndDimIntoView: startProgress="
-                + mIconScaleAnimStartProgress);
         if (mIconAndDimAnimator != null) {
             mIconAndDimAnimator.cancel();
         }
@@ -832,7 +830,6 @@ public class TaskView extends FrameLayout implements Reusable {
         mIconAndDimAnimator.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationEnd(Animator animation) {
-                Log.d("b/186444448", "animateIconScaleAndDimIntoView: end");
                 mIconAndDimAnimator = null;
             }
         });
-- 
GitLab


From 5fac02bc5eb50ef52efcc3274eb3b848b37b1369 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 23 Jun 2021 10:40:03 -0700
Subject: [PATCH 1554/1664] Fix some touch issues during gesture nav transition

- Don't recreate the laucher transition controller if we've already ended it, as it could clobber a touch interaction that started in the meantime
  - Test: swipe up from an app to overivew, swipe to dismiss it during the transition.
  - Previously, we were ending the controller twice (once on touch down as we started proxying, and again in setupLauncherUiAfterSwipeUpToRecentsAnimation()), and the second one could happen after starting the dismiss interaction.

- Don't recreateControllers() if orientation didn't change
  - Test: swipe up to go from an app to home, swipe up to all apps during the transition.
  - Previously, we were getting the following sequence:
    1. Touch down on home to start swiping to all apps - all current controllers get this down event to start determining whether to intercept
    2. Before reaching touch slop, we recreateControllers(), so all new controllers won't get the down event and thus won't intercept
  - Now, we avoid unnecessarily recreateControllers(), so the original controllers can still intercept.

Test: see above
Fixes: 189700453
Change-Id: I7b5fb3d21ab7a7a7044fcec7f2c1e39afe23c5dd
---
 .../com/android/quickstep/AbsSwipeUpHandler.java |  7 +++++--
 .../com/android/quickstep/views/RecentsView.java | 16 ++++++++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 7f38923671..9a8699fea9 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -231,6 +231,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
 
     // Used to control launcher components throughout the swipe gesture.
     private AnimatorControllerWithResistance mLauncherTransitionController;
+    private boolean mHasEndedLauncherTransition;
 
     private AnimationFactory mAnimationFactory = (t) -> { };
 
@@ -615,11 +616,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
 
     /**
      * We don't want to change mLauncherTransitionController if mGestureState.getEndTarget() == HOME
-     * (it has its own animation).
+     * (it has its own animation) or if we explicitly ended the controller already.
      * @return Whether we can create the launcher controller or update its progress.
      */
     private boolean canCreateNewOrUpdateExistingLauncherTransitionController() {
-        return mGestureState.getEndTarget() != HOME;
+        return mGestureState.getEndTarget() != HOME && !mHasEndedLauncherTransition;
     }
 
     @Override
@@ -1436,6 +1437,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     }
 
     private void endLauncherTransitionController() {
+        mHasEndedLauncherTransition = true;
+
         if (mLauncherTransitionController != null) {
             // End the animation, but stay at the same visual progress.
             mLauncherTransitionController.getNormalController().dispatchSetInterpolator(
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 710a9ab9fe..9934ad7c0d 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1247,8 +1247,14 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     }
 
     private void updateOrientationHandler() {
+        updateOrientationHandler(true);
+    }
+
+    private void updateOrientationHandler(boolean forceRecreateDragLayerControllers) {
         // Handle orientation changes.
+        PagedOrientationHandler oldOrientationHandler = mOrientationHandler;
         mOrientationHandler = mOrientationState.getOrientationHandler();
+
         mIsRtl = mOrientationHandler.getRecentsRtlSetting(getResources());
         setLayoutDirection(mIsRtl
                 ? View.LAYOUT_DIRECTION_RTL
@@ -1257,7 +1263,13 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 ? View.LAYOUT_DIRECTION_LTR
                 : View.LAYOUT_DIRECTION_RTL);
         mClearAllButton.setRotation(mOrientationHandler.getDegreesRotated());
-        mActivity.getDragLayer().recreateControllers();
+
+        if (forceRecreateDragLayerControllers
+                || !mOrientationHandler.equals(oldOrientationHandler)) {
+            // Changed orientations, update controllers so they intercept accordingly.
+            mActivity.getDragLayer().recreateControllers();
+        }
+
         boolean isInLandscape = mOrientationState.getTouchRotation() != ROTATION_0
                 || mOrientationState.getRecentsActivityRotation() != ROTATION_0;
         mActionsView.updateHiddenFlags(HIDDEN_NON_ZERO_ROTATION,
@@ -1577,7 +1589,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             setCurrentPage(0);
             LayoutUtils.setViewEnabled(mActionsView, true);
             if (mOrientationState.setGestureActive(false)) {
-                updateOrientationHandler();
+                updateOrientationHandler(/* forceRecreateDragLayerControllers = */ false);
             }
         });
     }
-- 
GitLab


From e0fcee01b3e192a6c28c7f6633590edb3225edee Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Thu, 1 Jul 2021 16:34:58 +0100
Subject: [PATCH 1555/1664] Restore previous currentPage in applyLoadPlan in
 case task is re-ordered

Fix: 186537288
Test: Repeatededly launch task from home and swipe to home, animation is correct
Test: Quick switch, launch task then swipe up, there is no jump
Change-Id: I9fd7416d9811ce4e54a1c6d20374d89d00417cd5
---
 .../src/com/android/quickstep/views/RecentsView.java  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 710a9ab9fe..65ccb138b4 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1087,6 +1087,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             return;
         }
 
+        int currentTaskId = -1;
+        TaskView currentTaskView = getTaskViewAtByAbsoluteIndex(mCurrentPage);
+        if (currentTaskView != null) {
+            currentTaskId = currentTaskView.getTask().key.id;
+        }
+
         // Unload existing visible task data
         unloadVisibleTaskData(TaskView.FLAG_UPDATE_ALL);
 
@@ -1126,6 +1132,11 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             } else if (getTaskViewCount() > 0) {
                 setCurrentPage(indexOfChild(getTaskViewAt(0)));
             }
+        } else if (currentTaskId != -1) {
+            currentTaskView = getTaskView(currentTaskId);
+            if (currentTaskView != null) {
+                setCurrentPage(indexOfChild(currentTaskView));
+            }
         }
 
         if (mIgnoreResetTaskId != -1 && getTaskView(mIgnoreResetTaskId) != ignoreResetTaskView) {
-- 
GitLab


From 99adef95b3e121a9c90f905589fa68d293425fe6 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Thu, 1 Jul 2021 10:30:59 -0700
Subject: [PATCH 1556/1664] Do not switch to screenshot and finish recents
 animation for menu options that already do so

The issue is that in landscape mode we add overview shortcuts (e.g. screenshot) to the task view menu, where we switch to screenshot and finish recents animation before executing the shortcut action. However for shortcut actions like screenshot, we do the same, resulting in two chained "switch to screenshot and finish". This is a temporary fix for S given it's late in the cycle and we don't want to introduce unwanted regressions.

Fixes: 192272546
Test: manual
Change-Id: I7ef596e8bce6c15aa4a27163197beac12359b691
---
 .../src/com/android/quickstep/TaskOverlayFactory.java  |  2 ++
 .../src/com/android/quickstep/views/TaskMenuView.java  |  2 +-
 src/com/android/launcher3/popup/SystemShortcut.java    | 10 ++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
index c1c85de413..2bcc229fff 100644
--- a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
@@ -88,6 +88,7 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
             SystemShortcut screenshotShortcut = TaskShortcutFactory.SCREENSHOT
                     .getShortcut(activity, taskView);
             if (screenshotShortcut != null) {
+                screenshotShortcut.setHasFinishRecentsInAction(true);
                 shortcuts.add(screenshotShortcut);
             }
 
@@ -96,6 +97,7 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
                 SystemShortcut modalShortcut = TaskShortcutFactory.MODAL
                         .getShortcut(activity, taskView);
                 if (modalShortcut != null) {
+                    modalShortcut.setHasFinishRecentsInAction(true);
                     shortcuts.add(modalShortcut);
                 }
             }
diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
index c97225ec17..f5f25f491d 100644
--- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
@@ -212,7 +212,7 @@ public class TaskMenuView extends AbstractFloatingView implements OnScrollChange
         menuOptionView.setEnabled(menuOption.isEnabled());
         menuOptionView.setAlpha(menuOption.isEnabled() ? 1 : 0.5f);
         menuOptionView.setOnClickListener(view -> {
-            if (LIVE_TILE.get()) {
+            if (LIVE_TILE.get() && !menuOption.hasFinishRecentsInAction()) {
                 RecentsView recentsView = mTaskView.getRecentsView();
                 recentsView.switchToScreenshot(null,
                         () -> recentsView.finishRecentsAnimation(true /* toRecents */,
diff --git a/src/com/android/launcher3/popup/SystemShortcut.java b/src/com/android/launcher3/popup/SystemShortcut.java
index e5424cfe0a..d3f4909296 100644
--- a/src/com/android/launcher3/popup/SystemShortcut.java
+++ b/src/com/android/launcher3/popup/SystemShortcut.java
@@ -50,6 +50,8 @@ public abstract class SystemShortcut<T extends BaseDraggingActivity> extends Ite
      */
     private boolean isEnabled = true;
 
+    private boolean mHasFinishRecentsInAction = false;
+
     public SystemShortcut(int iconResId, int labelResId, T target, ItemInfo itemInfo) {
         mIconResId = iconResId;
         mLabelResId = labelResId;
@@ -100,6 +102,14 @@ public abstract class SystemShortcut<T extends BaseDraggingActivity> extends Ite
         return mAccessibilityActionId == action;
     }
 
+    public void setHasFinishRecentsInAction(boolean hasFinishRecentsInAction) {
+        mHasFinishRecentsInAction = hasFinishRecentsInAction;
+    }
+
+    public boolean hasFinishRecentsInAction() {
+        return mHasFinishRecentsInAction;
+    }
+
     public interface Factory<T extends BaseDraggingActivity> {
 
         @Nullable SystemShortcut<T> getShortcut(T activity, ItemInfo itemInfo);
-- 
GitLab


From 1fe5fda3d8a6cbeead21c4c76fb70eb022000231 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Wed, 2 Jun 2021 23:54:44 -0700
Subject: [PATCH 1557/1664] Enable live tile in 3 button mode

- Previously we rely on whether launcher is resumed as a signal to see what "toggle" means. This no longer works since launcher is not resumed in Overview. Instead, we need to check the live tile signals.
- Use screenshot doesn't propagate after setting a new current task. So followed the logic around mRunningTaskIconScaledDown to work it out.
- Get rid of NavigationModeFeatureFlag, pending on 3rd party launcher change ag/14409355

Fixes: 185934639
Test: (1) Toggle overview from home screen and toggle back to fullscreen. (2) Toggle overview from app and keep toggling.

Change-Id: Iffaea18afb2179b5bb7dadda49e56efefa5658bc
Merged-In: Iffaea18afb2179b5bb7dadda49e56efefa5658bc
---
 .../launcher3/BaseQuickstepLauncher.java      |  4 +-
 .../NavBarToHomeTouchController.java          |  6 +-
 .../android/quickstep/AbsSwipeUpHandler.java  | 16 ++---
 .../quickstep/FallbackActivityInterface.java  |  9 ++-
 .../quickstep/LauncherActivityInterface.java  | 23 +++++--
 .../quickstep/OverviewCommandHelper.java      |  1 +
 .../QuickstepProcessInitializer.java          |  4 --
 .../android/quickstep/RecentsActivity.java    |  4 +-
 .../quickstep/TaskAnimationManager.java       |  6 +-
 .../android/quickstep/TaskOverlayFactory.java |  4 +-
 .../com/android/quickstep/TaskViewUtils.java  |  8 +--
 .../quickstep/TouchInteractionService.java    |  8 ++-
 .../fallback/RecentsTaskController.java       |  4 +-
 .../inputconsumers/OverviewInputConsumer.java |  4 +-
 .../util/NavigationModeFeatureFlag.java       | 58 ----------------
 .../quickstep/util/TaskViewSimulator.java     |  4 +-
 .../android/quickstep/views/RecentsView.java  | 67 ++++++++++++++-----
 .../android/quickstep/views/TaskMenuView.java |  4 +-
 .../quickstep/views/TaskThumbnailView.java    |  4 +-
 .../com/android/quickstep/views/TaskView.java | 11 ++-
 .../quickstep/AbstractQuickStepTest.java      |  4 +-
 21 files changed, 126 insertions(+), 127 deletions(-)
 delete mode 100644 quickstep/src/com/android/quickstep/util/NavigationModeFeatureFlag.java

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 2498d12931..32e2f1ad10 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -20,10 +20,10 @@ import static com.android.launcher3.AbstractFloatingView.TYPE_HIDE_BACK_BUTTON;
 import static com.android.launcher3.LauncherState.FLAG_HIDE_BACK_BUTTON;
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.NO_OFFSET;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.model.data.ItemInfo.NO_MATCHING_ID;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
-import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY;
 
 import android.animation.AnimatorSet;
@@ -181,7 +181,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
     @Override
     protected void onScreenOff() {
         super.onScreenOff();
-        if (LIVE_TILE.get()) {
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
             RecentsView recentsView = getOverviewPanel();
             recentsView.finishRecentsAnimation(true /* toRecents */, null);
         }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
index 521dd233b8..86c42caa7b 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
@@ -25,8 +25,8 @@ import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS
 import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_ALL_APPS_EDU;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE;
-import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
 
 import android.animation.ValueAnimator;
@@ -140,7 +140,7 @@ public class NavBarToHomeTouchController implements TouchController,
             AnimatorControllerWithResistance.createRecentsResistanceFromOverviewAnim(mLauncher,
                     builder);
 
-            if (LIVE_TILE.get()) {
+            if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
                 builder.addOnFrameCallback(recentsView::redrawLiveTile);
             }
 
@@ -189,7 +189,7 @@ public class NavBarToHomeTouchController implements TouchController,
         boolean success = interpolatedProgress >= SUCCESS_TRANSITION_PROGRESS
                 || (velocity < 0 && fling);
         if (success) {
-            if (LIVE_TILE.get()) {
+            if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
                 RecentsView recentsView = mLauncher.getOverviewPanel();
                 recentsView.switchToScreenshot(null,
                         () -> recentsView.finishRecentsAnimation(true /* toRecents */, null));
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index ea4b08d3bd..ad7c7106ce 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -25,6 +25,7 @@ import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAG
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.anim.Interpolators.DEACCEL;
 import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.IGNORE;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE;
@@ -45,7 +46,6 @@ import static com.android.quickstep.GestureState.STATE_END_TARGET_SET;
 import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_CANCELED;
 import static com.android.quickstep.GestureState.STATE_RECENTS_SCROLLING_FINISHED;
 import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;
-import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME;
@@ -327,7 +327,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         mStateCallback.runOnceAtState(STATE_HANDLER_INVALIDATED | STATE_FINISH_WITH_NO_END,
                 this::resetStateForAnimationCancel);
 
-        if (!LIVE_TILE.get()) {
+        if (!ENABLE_QUICKSTEP_LIVE_TILE.get()) {
             mStateCallback.addChangeListener(STATE_APP_CONTROLLER_RECEIVED | STATE_LAUNCHER_PRESENT
                             | STATE_SCREENSHOT_VIEW_SHOWN | STATE_CAPTURE_SCREENSHOT,
                     (b) -> mRecentsView.setRunningTaskHidden(!b));
@@ -490,7 +490,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     }
 
     private void onDeferredActivityLaunch() {
-        if (LIVE_TILE.get()) {
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
             mActivityInterface.switchRunningTaskViewToScreenshot(
                     null, () -> {
                         mTaskAnimationManager.finishRunningRecentsAnimation(true /* toHome */);
@@ -1429,7 +1429,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     }
 
     private void invalidateHandler() {
-        if (!LIVE_TILE.get() || !mActivityInterface.isInLiveTileMode()
+        if (!ENABLE_QUICKSTEP_LIVE_TILE.get() || !mActivityInterface.isInLiveTileMode()
                 || mGestureState.getEndTarget() != RECENTS) {
             mInputConsumerProxy.destroy();
             mTaskAnimationManager.setLiveTileCleanUpHandler(null);
@@ -1474,7 +1474,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
      */
     private void resetLauncherListeners() {
         // Reset the callback for deferred activity launches
-        if (!LIVE_TILE.get()) {
+        if (!ENABLE_QUICKSTEP_LIVE_TILE.get()) {
             mActivityInterface.setOnDeferredActivityLaunchCallback(null);
         }
         mActivity.getRootView().setOnApplyWindowInsetsListener(null);
@@ -1498,7 +1498,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
             mStateCallback.setStateOnUiThread(STATE_SCREENSHOT_CAPTURED);
         } else {
             final int runningTaskId = mGestureState.getRunningTaskId();
-            final boolean refreshView = !LIVE_TILE.get() /* refreshView */;
+            final boolean refreshView = !ENABLE_QUICKSTEP_LIVE_TILE.get() /* refreshView */;
             boolean finishTransitionPosted = false;
             if (mRecentsAnimationController != null) {
                 // Update the screenshot of the task
@@ -1554,7 +1554,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     }
 
     private void finishCurrentTransitionToRecents() {
-        if (LIVE_TILE.get()) {
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
             mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);
             if (mRecentsAnimationController != null) {
                 mRecentsAnimationController.detachNavigationBarFromApp(true);
@@ -1608,7 +1608,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         }
         endLauncherTransitionController();
         mRecentsView.onSwipeUpAnimationSuccess();
-        if (LIVE_TILE.get()) {
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
             mTaskAnimationManager.setLiveTileCleanUpHandler(mInputConsumerProxy::destroy);
             mTaskAnimationManager.enableLiveTileRestartListener();
         }
diff --git a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
index 906599f560..f29d68a72a 100644
--- a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
@@ -15,6 +15,7 @@
  */
 package com.android.quickstep;
 
+import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
 import static com.android.quickstep.fallback.RecentsState.BACKGROUND_APP;
 import static com.android.quickstep.fallback.RecentsState.DEFAULT;
@@ -105,8 +106,12 @@ public final class FallbackActivityInterface extends
     @Override
     public RecentsView getVisibleRecentsView() {
         RecentsActivity activity = getCreatedActivity();
-        if (activity != null && activity.hasBeenResumed()) {
-            return activity.getOverviewPanel();
+        if (activity != null) {
+            RecentsView recentsView = activity.getOverviewPanel();
+            if (activity.hasBeenResumed() || (ENABLE_QUICKSTEP_LIVE_TILE.get() && isInLiveTileMode()
+                    && recentsView.getRunningTaskId() == -1)) {
+                return recentsView;
+            }
         }
         return null;
     }
diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
index 30abfbb922..fb1391a309 100644
--- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java
@@ -21,6 +21,7 @@ import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.QUICK_SWITCH;
 import static com.android.launcher3.anim.AnimatorListeners.forEndCallback;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 
 import android.animation.Animator;
@@ -184,16 +185,24 @@ public final class LauncherActivityInterface extends
     @Override
     public RecentsView getVisibleRecentsView() {
         Launcher launcher = getVisibleLauncher();
-        return launcher != null && launcher.getStateManager().getState().overviewUi
-                ? launcher.getOverviewPanel() : null;
+        RecentsView recentsView =
+                launcher != null && launcher.getStateManager().getState().overviewUi
+                        ? launcher.getOverviewPanel() : null;
+        if (recentsView == null || (!launcher.hasBeenResumed()
+                && recentsView.getRunningTaskId() == -1)) {
+            // If live tile has ended, return null.
+            return null;
+        }
+        return recentsView;
     }
 
     @Nullable
     @UiThread
     private Launcher getVisibleLauncher() {
         Launcher launcher = getCreatedActivity();
-        return (launcher != null) && launcher.isStarted() && launcher.hasBeenResumed()
-                ? launcher : null;
+        return (launcher != null) && launcher.isStarted()
+                && ((ENABLE_QUICKSTEP_LIVE_TILE.get() && isInLiveTileMode())
+                || launcher.hasBeenResumed()) ? launcher : null;
     }
 
     @Override
@@ -202,6 +211,12 @@ public final class LauncherActivityInterface extends
         if (launcher == null) {
             return false;
         }
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && isInLiveTileMode()) {
+            RecentsView recentsView = getVisibleRecentsView();
+            if (recentsView == null) {
+                return false;
+            }
+        }
 
         closeOverlay();
         launcher.getStateManager().goToState(OVERVIEW,
diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
index 2beef0a7ce..742d02d204 100644
--- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
@@ -15,6 +15,7 @@
  */
 package com.android.quickstep;
 
+import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.quickstep.util.ActiveGestureLog.INTENT_EXTRA_LOG_TRACE_ID;
 
diff --git a/quickstep/src/com/android/quickstep/QuickstepProcessInitializer.java b/quickstep/src/com/android/quickstep/QuickstepProcessInitializer.java
index 192738f76a..65847f11bb 100644
--- a/quickstep/src/com/android/quickstep/QuickstepProcessInitializer.java
+++ b/quickstep/src/com/android/quickstep/QuickstepProcessInitializer.java
@@ -15,8 +15,6 @@
  */
 package com.android.quickstep;
 
-import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
-
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -61,8 +59,6 @@ public class QuickstepProcessInitializer extends MainProcessInitializer {
 
         super.init(context);
 
-        LIVE_TILE.initialize(context);
-
         // Elevate GPU priority for Quickstep and Remote animations.
         ThreadedRendererCompat.setContextPriority(
                 ThreadedRendererCompat.EGL_CONTEXT_PRIORITY_HIGH_IMG);
diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index fa5ab1cb7b..9dfcd12dde 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -23,10 +23,10 @@ import static com.android.launcher3.QuickstepTransitionManager.STATUS_BAR_TRANSI
 import static com.android.launcher3.QuickstepTransitionManager.STATUS_BAR_TRANSITION_PRE_DELAY;
 import static com.android.launcher3.Utilities.createHomeIntent;
 import static com.android.launcher3.graphics.SysUiScrim.SYSUI_PROGRESS;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.testing.TestProtocol.OVERVIEW_STATE_ORDINAL;
 import static com.android.quickstep.TaskUtils.taskIsATargetWithMode;
 import static com.android.quickstep.TaskViewUtils.createRecentsWindowAnimator;
-import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_CLOSING;
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_OPENING;
 
@@ -359,7 +359,7 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
     }
 
     public void startHome() {
-        if (LIVE_TILE.get()) {
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
             RecentsView recentsView = getOverviewPanel();
             recentsView.switchToScreenshot(() -> recentsView.finishRecentsAnimation(true,
                     this::startHomeInternal));
diff --git a/quickstep/src/com/android/quickstep/TaskAnimationManager.java b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
index 223c46df26..6c445e1b3e 100644
--- a/quickstep/src/com/android/quickstep/TaskAnimationManager.java
+++ b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
@@ -15,11 +15,11 @@
  */
 package com.android.quickstep;
 
+import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_INITIALIZED;
 import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_STARTED;
-import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 
 import android.app.ActivityManager;
 import android.content.Context;
@@ -64,7 +64,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
                 return;
             }
             BaseActivityInterface activityInterface = mLastGestureState.getActivityInterface();
-            if (LIVE_TILE.get() && activityInterface.isInLiveTileMode()
+            if (ENABLE_QUICKSTEP_LIVE_TILE.get() && activityInterface.isInLiveTileMode()
                     && activityInterface.getCreatedActivity() != null) {
                 RecentsView recentsView = activityInterface.getCreatedActivity().getOverviewPanel();
                 if (recentsView != null) {
@@ -139,7 +139,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
             @Override
             public void onTaskAppeared(RemoteAnimationTargetCompat appearedTaskTarget) {
                 BaseActivityInterface activityInterface = mLastGestureState.getActivityInterface();
-                if (LIVE_TILE.get() && activityInterface.isInLiveTileMode()
+                if (ENABLE_QUICKSTEP_LIVE_TILE.get() && activityInterface.isInLiveTileMode()
                         && activityInterface.getCreatedActivity() != null) {
                     RecentsView recentsView =
                             activityInterface.getCreatedActivity().getOverviewPanel();
diff --git a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
index 2bcc229fff..06a3c7048b 100644
--- a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
@@ -18,7 +18,7 @@ package com.android.quickstep;
 
 import static android.view.Surface.ROTATION_0;
 
-import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.quickstep.views.OverviewActionsView.DISABLED_NO_THUMBNAIL;
 import static com.android.quickstep.views.OverviewActionsView.DISABLED_ROTATED;
 
@@ -189,7 +189,7 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
          * @param callback callback to run, after switching to screenshot
          */
         public void endLiveTileMode(@NonNull Runnable callback) {
-            if (LIVE_TILE.get()) {
+            if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
                 RecentsView recentsView = mThumbnailView.getTaskView().getRecentsView();
                 recentsView.switchToScreenshot(
                         () -> recentsView.finishRecentsAnimation(true /* toRecents */,
diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java
index 3293810582..37fda73d44 100644
--- a/quickstep/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java
@@ -34,7 +34,6 @@ import static com.android.launcher3.anim.Interpolators.TOUCH_RESPONSE_INTERPOLAT
 import static com.android.launcher3.anim.Interpolators.clampToProgress;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.statehandlers.DepthController.DEPTH;
-import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_CLOSING;
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_OPENING;
 
@@ -155,7 +154,7 @@ public final class TaskViewUtils {
         boolean isRunningTask = v.isRunningTask();
         TransformParams params = null;
         TaskViewSimulator tsv = null;
-        if (LIVE_TILE.get() && isRunningTask) {
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && isRunningTask) {
             params = v.getRecentsView().getLiveTileParams();
             tsv = v.getRecentsView().getLiveTileTaskViewSimulator();
         }
@@ -176,7 +175,8 @@ public final class TaskViewUtils {
         boolean isQuickSwitch = v.isEndQuickswitchCuj();
         v.setEndQuickswitchCuj(false);
 
-        boolean inLiveTileMode = LIVE_TILE.get() && v.getRecentsView().getRunningTaskIndex() != -1;
+        boolean inLiveTileMode =
+                ENABLE_QUICKSTEP_LIVE_TILE.get() && v.getRecentsView().getRunningTaskIndex() != -1;
         final RemoteAnimationTargets targets =
                 new RemoteAnimationTargets(appTargets, wallpaperTargets, nonAppTargets,
                         inLiveTileMode ? MODE_CLOSING : MODE_OPENING);
@@ -531,7 +531,7 @@ public final class TaskViewUtils {
             };
         }
         pa.add(launcherAnim);
-        if (LIVE_TILE.get() && recentsView.getRunningTaskIndex() != -1) {
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && recentsView.getRunningTaskIndex() != -1) {
             pa.addOnFrameCallback(recentsView::redrawLiveTile);
         }
         anim.play(pa.buildAnim());
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 84f7e83737..069ed11553 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -21,9 +21,9 @@ import static android.view.MotionEvent.ACTION_DOWN;
 import static android.view.MotionEvent.ACTION_UP;
 
 import static com.android.launcher3.config.FeatureFlags.ASSISTANT_GIVES_LAUNCHER_FOCUS;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.quickstep.GestureState.DEFAULT_STATE;
-import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
 import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_ONE_HANDED;
 import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_PIP;
@@ -737,7 +737,8 @@ public class TouchInteractionService extends Service implements PluginListener<O
                     runningComponent != null && runningComponent.equals(homeComponent);
         }
 
-        if (LIVE_TILE.get() && gestureState.getActivityInterface().isInLiveTileMode()) {
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get()
+                && gestureState.getActivityInterface().isInLiveTileMode()) {
             return createOverviewInputConsumer(
                     previousGestureState, gestureState, event, forceOverviewInputConsumer);
         } else if (gestureState.getRunningTask() == null) {
@@ -792,7 +793,8 @@ public class TouchInteractionService extends Service implements PluginListener<O
                 || previousGestureState.isRunningAnimationToLauncher()
                 || (ASSISTANT_GIVES_LAUNCHER_FOCUS.get()
                     && forceOverviewInputConsumer)
-                || (LIVE_TILE.get()) && gestureState.getActivityInterface().isInLiveTileMode()) {
+                || (ENABLE_QUICKSTEP_LIVE_TILE.get()
+                && gestureState.getActivityInterface().isInLiveTileMode())) {
             return new OverviewInputConsumer(gestureState, activity, mInputMonitorCompat,
                     false /* startingInActivityBounds */);
         } else {
diff --git a/quickstep/src/com/android/quickstep/fallback/RecentsTaskController.java b/quickstep/src/com/android/quickstep/fallback/RecentsTaskController.java
index 273d1f6768..eca61bb07d 100644
--- a/quickstep/src/com/android/quickstep/fallback/RecentsTaskController.java
+++ b/quickstep/src/com/android/quickstep/fallback/RecentsTaskController.java
@@ -15,7 +15,7 @@
  */
 package com.android.quickstep.fallback;
 
-import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 
 import com.android.launcher3.uioverrides.touchcontrollers.TaskViewTouchController;
 import com.android.quickstep.RecentsActivity;
@@ -28,7 +28,7 @@ public class RecentsTaskController extends TaskViewTouchController<RecentsActivi
 
     @Override
     protected boolean isRecentsInteractive() {
-        return mActivity.hasWindowFocus() || (LIVE_TILE.get()
+        return mActivity.hasWindowFocus() || (ENABLE_QUICKSTEP_LIVE_TILE.get()
                 && mActivity.getStateManager().getState().hasLiveTile());
     }
 
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
index 4af63386e0..b0df2869c7 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
@@ -15,7 +15,7 @@
  */
 package com.android.quickstep.inputconsumers;
 
-import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
 
 import android.media.AudioManager;
@@ -102,7 +102,7 @@ public class OverviewInputConsumer<S extends BaseState<S>, T extends StatefulAct
 
     @Override
     public void onKeyEvent(KeyEvent ev) {
-        if (LIVE_TILE.get()) {
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
             switch (ev.getKeyCode()) {
                 case KeyEvent.KEYCODE_VOLUME_DOWN:
                 case KeyEvent.KEYCODE_VOLUME_UP:
diff --git a/quickstep/src/com/android/quickstep/util/NavigationModeFeatureFlag.java b/quickstep/src/com/android/quickstep/util/NavigationModeFeatureFlag.java
deleted file mode 100644
index 60c7add38f..0000000000
--- a/quickstep/src/com/android/quickstep/util/NavigationModeFeatureFlag.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.quickstep.util;
-
-import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
-
-import android.content.Context;
-
-import com.android.quickstep.SysUINavigationMode;
-
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-
-/** A feature flag that listens to navigation mode changes. */
-public class NavigationModeFeatureFlag implements
-        SysUINavigationMode.NavigationModeChangeListener {
-
-    public static final NavigationModeFeatureFlag LIVE_TILE = new NavigationModeFeatureFlag(
-            ENABLE_QUICKSTEP_LIVE_TILE::get, mode -> mode.hasGestures);
-
-    private final Supplier<Boolean> mBasePredicate;
-    private final Predicate<SysUINavigationMode.Mode> mModePredicate;
-    private boolean mSupported;
-
-    private NavigationModeFeatureFlag(Supplier<Boolean> basePredicate,
-            Predicate<SysUINavigationMode.Mode> modePredicate) {
-        mBasePredicate = basePredicate;
-        mModePredicate = modePredicate;
-    }
-
-    public boolean get() {
-        return mBasePredicate.get() && mSupported;
-    }
-
-    public void initialize(Context context) {
-        onNavigationModeChanged(SysUINavigationMode.INSTANCE.get(context).getMode());
-        SysUINavigationMode.INSTANCE.get(context).addModeChangeListener(this);
-    }
-
-    @Override
-    public void onNavigationModeChanged(SysUINavigationMode.Mode newMode) {
-        mSupported = mModePredicate.test(newMode);
-    }
-}
diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index b15bbf3ed2..c97ca32aa2 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -15,9 +15,9 @@
  */
 package com.android.quickstep.util;
 
+import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.states.RotationHelper.deltaRotation;
 import static com.android.launcher3.touch.PagedOrientationHandler.MATRIX_POST_TRANSLATE;
-import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 import static com.android.quickstep.util.RecentsOrientedState.postDisplayRotation;
 import static com.android.quickstep.util.RecentsOrientedState.preDisplayRotation;
 import static com.android.systemui.shared.system.WindowManagerWrapper.WINDOWING_MODE_FULLSCREEN;
@@ -302,7 +302,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
                 .withWindowCrop(mTmpCropRect)
                 .withCornerRadius(getCurrentCornerRadius());
 
-        if (LIVE_TILE.get() && params.getRecentsSurface() != null) {
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && params.getRecentsSurface() != null) {
             // When relativeLayer = 0, it reverts the surfaces back to the original order.
             builder.withRelativeLayerTo(params.getRecentsSurface(),
                     mDrawsBelowRecents ? Integer.MIN_VALUE : 0);
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 6767d32bac..fb5fdac23c 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -38,6 +38,7 @@ import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.Interpolators.clampToProgress;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_CLEAR_ALL;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_DISMISS_SWIPE_UP;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_SWIPE_DOWN;
@@ -47,7 +48,6 @@ import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.launcher3.util.SystemUiController.UI_STATE_FULLSCREEN_TASK;
 import static com.android.quickstep.TaskUtils.checkCurrentOrManagedUserId;
-import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NON_ZERO_ROTATION;
 import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NO_RECENTS;
 import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NO_TASKS;
@@ -131,6 +131,7 @@ import com.android.launcher3.util.IntSet;
 import com.android.launcher3.util.MultiValueAlpha;
 import com.android.launcher3.util.ResourceBasedOverride.Overrides;
 import com.android.launcher3.util.SplitConfigurationOptions;
+import com.android.launcher3.util.RunnableList;
 import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.util.TranslateEdgeEffect;
@@ -496,6 +497,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     private float mFocusedTaskRatio;
 
     private boolean mRunningTaskIconScaledDown = false;
+    private boolean mRunningTaskShowScreenshot = false;
 
     private boolean mOverviewStateEnabled;
     private boolean mHandleTaskStackChanges;
@@ -573,6 +575,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 }
             };
 
+    private RunnableList mSideTaskLaunchCallback;
+
     public RecentsView(Context context, AttributeSet attrs, int defStyleAttr,
             BaseActivityInterface sizeStrategy) {
         super(context, attrs, defStyleAttr);
@@ -677,7 +681,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             }
             super.dispatchDraw(canvas);
         }
-        if (LIVE_TILE.get() && mEnableDrawingLiveTile && mLiveTileParams.getTargetSet() != null) {
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && mEnableDrawingLiveTile
+                && mLiveTileParams.getTargetSet() != null) {
             redrawLiveTile();
         }
     }
@@ -801,6 +806,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         TaskStackChangeListeners.getInstance().unregisterTaskStackListener(mTaskStackListener);
         mSyncTransactionApplier = null;
         mLiveTileParams.setSyncTransactionApplier(null);
+        executeSideTaskLaunchCallback();
         RecentsModel.INSTANCE.get(getContext()).removeThumbnailChangeListener(this);
         SystemUiProxy.INSTANCE.get(getContext()).setPinnedStackAnimationListener(null);
         SplitScreenBounds.INSTANCE.removeOnChangeListener(this);
@@ -842,6 +848,20 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         super.draw(canvas);
     }
 
+    public void addSideTaskLaunchCallback(RunnableList callback) {
+        if (mSideTaskLaunchCallback == null) {
+            mSideTaskLaunchCallback = new RunnableList();
+        }
+        mSideTaskLaunchCallback.add(callback::executeAllAndDestroy);
+    }
+
+    private void executeSideTaskLaunchCallback() {
+        if (mSideTaskLaunchCallback != null) {
+            mSideTaskLaunchCallback.executeAllAndDestroy();
+            mSideTaskLaunchCallback = null;
+        }
+    }
+
     public void launchSideTaskInLiveTileModeForRestartedApp(int taskId) {
         if (mRunningTaskId != -1 && mRunningTaskId == taskId &&
                 getLiveTileParams().getTargetSet().findTask(taskId) != null) {
@@ -883,8 +903,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             TaskViewUtils.composeRecentsLaunchAnimator(anim, taskView, apps, wallpaper, nonApps,
                     true /* launcherClosing */, mActivity.getStateManager(), this,
                     getDepthController());
+            anim.start();
         }
-        anim.start();
     }
 
     private void updateTaskStartIndex(View affectingView) {
@@ -1190,7 +1210,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 taskView.setModalness(mTaskModalness);
             }
         }
-        if (LIVE_TILE.get()) {
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
             // Since we reuse the same mLiveTileTaskViewSimulator in the RecentsView, we need
             // to reset the params after it settles in Overview from swipe up so that we don't
             // render with obsolete param values.
@@ -1198,6 +1218,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             mLiveTileTaskViewSimulator.taskSecondaryTranslation.value = 0;
             mLiveTileTaskViewSimulator.fullScreenProgress.value = 0;
             mLiveTileTaskViewSimulator.recentsViewScale.value = 1;
+
+            // Similar to setRunningTaskHidden below, reapply the state before runningTaskView is
+            // null.
+            if (!mRunningTaskShowScreenshot) {
+                setRunningTaskViewShowScreenshot(mRunningTaskShowScreenshot);
+            }
         }
         if (mRunningTaskTileHidden) {
             setRunningTaskHidden(mRunningTaskTileHidden);
@@ -1570,7 +1596,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         mFocusedTaskId = -1;
 
         if (mRecentsAnimationController != null) {
-            if (LIVE_TILE.get() && mEnableDrawingLiveTile) {
+            if (ENABLE_QUICKSTEP_LIVE_TILE.get() && mEnableDrawingLiveTile) {
                 // We are still drawing the live tile, finish it now to clean up.
                 finishRecentsAnimation(true /* toRecents */, null);
             } else {
@@ -1742,7 +1768,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
 
         setEnableFreeScroll(true);
         setEnableDrawingLiveTile(mCurrentGestureEndTarget == GestureState.GestureEndTarget.RECENTS);
-        if (!LIVE_TILE.get()) {
+        if (!ENABLE_QUICKSTEP_LIVE_TILE.get()) {
             setRunningTaskViewShowScreenshot(true);
         }
         setRunningTaskHidden(false);
@@ -1848,10 +1874,11 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     }
 
     private void setRunningTaskViewShowScreenshot(boolean showScreenshot) {
-        if (LIVE_TILE.get()) {
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+            mRunningTaskShowScreenshot = showScreenshot;
             TaskView runningTaskView = getRunningTaskView();
             if (runningTaskView != null) {
-                runningTaskView.setShowScreenshot(showScreenshot);
+                runningTaskView.setShowScreenshot(mRunningTaskShowScreenshot);
             }
         }
     }
@@ -2241,7 +2268,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         anim.add(ObjectAnimator.ofFloat(taskView, dismissingTaskViewTranslate,
                 positiveNegativeFactor * translateDistance * 2).setDuration(duration), LINEAR, sp);
 
-        if (LIVE_TILE.get() && mEnableDrawingLiveTile && taskView.isRunningTask()) {
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && mEnableDrawingLiveTile
+                && taskView.isRunningTask()) {
             anim.addOnFrameCallback(() -> {
                 mLiveTileTaskViewSimulator.taskSecondaryTranslation.value =
                         mOrientationHandler.getSecondaryValue(
@@ -2321,7 +2349,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                     anim.setFloat(child, translationProperty, scrollDiff, clampToProgress(LINEAR,
                             Utilities.boundToRange(INITIAL_DISMISS_TRANSLATION_INTERPOLATION_OFFSET
                                     + additionalDismissDuration, 0f, 1f), 1));
-                    if (LIVE_TILE.get() && mEnableDrawingLiveTile && child instanceof TaskView
+                    if (ENABLE_QUICKSTEP_LIVE_TILE.get() && mEnableDrawingLiveTile
+                            && child instanceof TaskView
                             && ((TaskView) child).isRunningTask()) {
                         anim.addOnFrameCallback(() -> {
                             mLiveTileTaskViewSimulator.taskPrimaryTranslation.value =
@@ -2365,8 +2394,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         mPendingAnimation.addEndListener(new Consumer<Boolean>() {
             @Override
             public void accept(Boolean success) {
-                if (LIVE_TILE.get() && mEnableDrawingLiveTile && taskView.isRunningTask()
-                        && success) {
+                if (ENABLE_QUICKSTEP_LIVE_TILE.get() && mEnableDrawingLiveTile
+                        && taskView.isRunningTask() && success) {
                     finishRecentsAnimation(true /* toRecents */, false /* shouldPip */,
                             () -> onEnd(success));
                 } else {
@@ -2379,7 +2408,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 if (success) {
                     if (shouldRemoveTask) {
                         if (taskView.getTask() != null) {
-                            if (LIVE_TILE.get() && taskView.isRunningTask()) {
+                            if (ENABLE_QUICKSTEP_LIVE_TILE.get() && taskView.isRunningTask()) {
                                 finishRecentsAnimation(true /* toRecents */, false /* shouldPip */,
                                         () -> removeTaskInternal(taskView));
                             } else {
@@ -2816,7 +2845,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                     ? ((TaskView) child).getPrimaryTaskOffsetTranslationProperty()
                     : mOrientationHandler.getPrimaryViewTranslate();
             translationProperty.set(child, totalTranslation);
-            if (LIVE_TILE.get() && mEnableDrawingLiveTile && i == getRunningTaskIndex()) {
+            if (ENABLE_QUICKSTEP_LIVE_TILE.get() && mEnableDrawingLiveTile
+                    && i == getRunningTaskIndex()) {
                 mLiveTileTaskViewSimulator.taskPrimaryTranslation.value = totalTranslation;
                 redrawLiveTile();
             }
@@ -3175,7 +3205,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             anim.play(ObjectAnimator.ofFloat(getPageAt(centerTaskIndex),
                     mOrientationHandler.getPrimaryViewTranslate(), primaryTranslation));
             int runningTaskIndex = recentsView.getRunningTaskIndex();
-            if (LIVE_TILE.get() && runningTaskIndex != -1
+            if (ENABLE_QUICKSTEP_LIVE_TILE.get() && runningTaskIndex != -1
                     && runningTaskIndex != taskIndex) {
                 anim.play(ObjectAnimator.ofFloat(
                         recentsView.getLiveTileTaskViewSimulator().taskPrimaryTranslation,
@@ -3259,13 +3289,13 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
 
         mPendingAnimation = new PendingAnimation(duration);
         mPendingAnimation.add(anim);
-        if (LIVE_TILE.get()) {
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
             mLiveTileTaskViewSimulator.addOverviewToAppAnim(mPendingAnimation, interpolator);
             mPendingAnimation.addOnFrameCallback(this::redrawLiveTile);
         }
         mPendingAnimation.addEndListener(isSuccess -> {
             if (isSuccess) {
-                if (LIVE_TILE.get() && tv.isRunningTask()) {
+                if (ENABLE_QUICKSTEP_LIVE_TILE.get() && tv.isRunningTask()) {
                     finishRecentsAnimation(false /* toRecents */, null);
                     onTaskLaunchAnimationEnd(true /* success */);
                 } else {
@@ -3384,7 +3414,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
 
     public void finishRecentsAnimation(boolean toRecents, boolean shouldPip,
             Runnable onFinishComplete) {
-        if (!toRecents && LIVE_TILE.get()) {
+        if (!toRecents && ENABLE_QUICKSTEP_LIVE_TILE.get()) {
             // Reset the minimized state since we force-toggled the minimized state when entering
             // overview, but never actually finished the recents animation.  This is a catch all for
             // cases where we haven't already reset it.
@@ -3430,6 +3460,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         // taps on QSB (3) user goes back to Overview and launch the most recent task.
         setCurrentTask(-1);
         mRecentsAnimationController = null;
+        executeSideTaskLaunchCallback();
     }
 
     public void setDisallowScrollToClearAll(boolean disallowScrollToClearAll) {
diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
index b5ab40068b..2c6533c079 100644
--- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
@@ -16,7 +16,7 @@
 
 package com.android.quickstep.views;
 
-import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.quickstep.views.TaskThumbnailView.DIM_ALPHA;
 
 import android.animation.Animator;
@@ -220,7 +220,7 @@ public class TaskMenuView extends AbstractFloatingView implements OnScrollChange
         menuOptionView.setEnabled(menuOption.isEnabled());
         menuOptionView.setAlpha(menuOption.isEnabled() ? 1 : 0.5f);
         menuOptionView.setOnClickListener(view -> {
-            if (LIVE_TILE.get() && !menuOption.hasFinishRecentsInAction()) {
+            if (ENABLE_QUICKSTEP_LIVE_TILE.get() && !menuOption.hasFinishRecentsInAction()) {
                 RecentsView recentsView = mTaskView.getRecentsView();
                 recentsView.switchToScreenshot(null,
                         () -> recentsView.finishRecentsAnimation(true /* toRecents */,
diff --git a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
index f730d2d31e..8d69d88062 100644
--- a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
@@ -19,7 +19,7 @@ package com.android.quickstep.views;
 import static android.view.WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS;
 import static android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS;
 
-import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.systemui.shared.system.WindowManagerWrapper.WINDOWING_MODE_FULLSCREEN;
 
 import android.content.Context;
@@ -306,7 +306,7 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
 
     public void drawOnCanvas(Canvas canvas, float x, float y, float width, float height,
             float cornerRadius) {
-        if (LIVE_TILE.get()) {
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
             if (mTask != null && getTaskView().isRunningTask() && !getTaskView().showScreenshot()) {
                 canvas.drawRoundRect(x, y, width, height, cornerRadius, cornerRadius, mClearPaint);
                 canvas.drawRoundRect(x, y, width, height, cornerRadius, cornerRadius,
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index ae429d91d8..4eb721e2c2 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -34,11 +34,11 @@ import static com.android.launcher3.Utilities.getDescendantCoordRelativeToAncest
 import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
 import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_ICON_TAP_OR_LONGPRESS;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_TAP;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
-import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 
 import static java.lang.annotation.RetentionPolicy.SOURCE;
 
@@ -540,7 +540,7 @@ public class TaskView extends FrameLayout implements Reusable {
         if (getTask() == null) {
             return;
         }
-        if (LIVE_TILE.get() && isRunningTask()) {
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && isRunningTask()) {
             if (!mIsClickableAsLiveTile) {
                 return;
             }
@@ -608,6 +608,13 @@ public class TaskView extends FrameLayout implements Reusable {
             ActivityOptionsWrapper opts =  mActivity.getActivityLaunchOptions(this, null);
             if (ActivityManagerWrapper.getInstance()
                     .startActivityFromRecents(mTask.key, opts.options)) {
+                if (ENABLE_QUICKSTEP_LIVE_TILE.get() && getRecentsView().getRunningTaskId() != -1) {
+                    // Return a fresh callback in the live tile case, so that it's not accidentally
+                    // triggered by QuickstepTransitionManager.AppLaunchAnimationRunner.
+                    RunnableList callbackList = new RunnableList();
+                    getRecentsView().addSideTaskLaunchCallback(callbackList);
+                    return callbackList;
+                }
                 return opts.onEndCallback;
             } else {
                 notifyTaskLaunchFailed(TAG);
diff --git a/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java b/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java
index 4f27e21ae8..dc73a9a51c 100644
--- a/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java
+++ b/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java
@@ -16,7 +16,7 @@
 
 package com.android.quickstep;
 
-import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 
 import static org.junit.Assert.assertTrue;
 
@@ -75,7 +75,7 @@ public abstract class AbstractQuickStepTest extends AbstractLauncherUiTest {
 
     private boolean isInLiveTileMode(Launcher launcher,
             LauncherInstrumentation.ContainerType expectedContainerType) {
-        if (!LIVE_TILE.get()
+        if (!ENABLE_QUICKSTEP_LIVE_TILE.get()
                 || expectedContainerType != LauncherInstrumentation.ContainerType.OVERVIEW) {
             return false;
         }
-- 
GitLab


From 9804c0472e3776d9a82178e1c6b1d4f510deb255 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Thu, 1 Jul 2021 23:26:57 -0700
Subject: [PATCH 1558/1664] Fix NPE inside dispatchRestoreInstanceState

Bug: 192559704
Test: manual
Change-Id: I212518ac4a7feddd8e87f4be601332ea62e99313
---
 src/com/android/launcher3/allapps/AllAppsContainerView.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index d1e643fd9f..f4fa1e5f7a 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -188,11 +188,11 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         Bundle state = (Bundle) sparseArray.get(R.id.work_tab_state_id, null);
         if (state != null) {
             int currentPage = state.getInt(BUNDLE_KEY_CURRENT_PAGE, 0);
-            if (currentPage != 0) {
+            if (currentPage != 0 && mViewPager != null) {
                 mViewPager.setCurrentPage(currentPage);
                 rebindAdapters(true);
             } else {
-                mSearchUiManager.resetSearch();
+                reset(true);
             }
         }
 
-- 
GitLab


From d2039614e0c6750a5f60ccaa2f7629aeacfb0755 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Thu, 1 Jul 2021 23:52:34 -0700
Subject: [PATCH 1559/1664] Check if live tile targetSet is null in
 launchSideTaskInLiveTileModeForRestartedApp

Fixes: 192458435
Test: N/A
Change-Id: I3f0b828bf9fa9645bbd253612aa073f37b21e4b2
---
 .../src/com/android/quickstep/views/RecentsView.java      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 6767d32bac..50a4c2d26f 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -843,10 +843,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     }
 
     public void launchSideTaskInLiveTileModeForRestartedApp(int taskId) {
-        if (mRunningTaskId != -1 && mRunningTaskId == taskId &&
-                getLiveTileParams().getTargetSet().findTask(taskId) != null) {
+        if (mRunningTaskId != -1 && mRunningTaskId == taskId) {
             RemoteAnimationTargets targets = getLiveTileParams().getTargetSet();
-            launchSideTaskInLiveTileMode(taskId, targets.apps, targets.wallpapers, targets.nonApps);
+            if (targets != null && targets.findTask(taskId) != null) {
+                launchSideTaskInLiveTileMode(taskId, targets.apps, targets.wallpapers,
+                        targets.nonApps);
+            }
         }
     }
 
-- 
GitLab


From 199aec50ad1b117e2a555f3ac2ec46e820115124 Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pbdr@google.com>
Date: Thu, 1 Jul 2021 14:22:31 +0100
Subject: [PATCH 1560/1664] Avoid calling
 AppWidgetHostViedw#updateAppWidgetSize

We cannot call it anymore, because the system padding is not always
used.

Bug: 191612352
Test: Manually, using CtsVerifier and dedicated widgets
Change-Id: I06353ba49a8e62127e593cdbcb86fadcf89ecb24
---
 .../launcher3/widget/util/WidgetSizes.java    | 48 ++++++++++---------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/com/android/launcher3/widget/util/WidgetSizes.java b/src/com/android/launcher3/widget/util/WidgetSizes.java
index 5c8ea7299b..6d053be812 100644
--- a/src/com/android/launcher3/widget/util/WidgetSizes.java
+++ b/src/com/android/launcher3/widget/util/WidgetSizes.java
@@ -17,9 +17,7 @@ package com.android.launcher3.widget.util;
 
 import static android.appwidget.AppWidgetHostView.getDefaultPaddingForWidget;
 
-import static com.android.launcher3.Utilities.ATLEAST_S;
 
-import android.annotation.SuppressLint;
 import android.appwidget.AppWidgetHostView;
 import android.appwidget.AppWidgetManager;
 import android.content.ComponentName;
@@ -37,21 +35,30 @@ import com.android.launcher3.LauncherAppState;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /** A utility class for widget sizes related calculations. */
 public final class WidgetSizes {
 
     /**
      * Returns the list of all possible sizes, in dp, for a widget of given spans on this device.
+     *
+     * <p>The returned sizes already take into account the system padding, and whether it is applied
+     * or not in that specific configuration.
      */
-    public static ArrayList<SizeF> getWidgetSizes(Context context, int spanX, int spanY) {
+    public static ArrayList<SizeF> getWidgetPaddedSizes(Context context, ComponentName provider,
+            int spanX, int spanY) {
+        Rect padding = getDefaultPaddingForWidget(context, provider, /* padding= */ null);
+
         ArrayList<SizeF> sizes = new ArrayList<>(2);
         final float density = context.getResources().getDisplayMetrics().density;
         final Point cellSize = new Point();
 
         for (DeviceProfile profile : LauncherAppState.getIDP(context).supportedProfiles) {
             Size widgetSizePx = getWidgetSizePx(profile, spanX, spanY, cellSize);
+            if (!profile.shouldInsetWidgets()) {
+                widgetSizePx = new Size(widgetSizePx.getWidth() - padding.left - padding.right,
+                        widgetSizePx.getHeight() - padding.top - padding.bottom);
+            }
             sizes.add(new SizeF(widgetSizePx.getWidth() / density,
                     widgetSizePx.getHeight() / density));
         }
@@ -81,17 +88,22 @@ public final class WidgetSizes {
      * <p>On Android S+, it also updates the given {@code widgetView} with a list of sizes derived
      * from {@code spanX}, {@code spanY} in all supported device profiles.
      */
-    @SuppressLint("NewApi") // Already added API check.
     public static void updateWidgetSizeRanges(AppWidgetHostView widgetView, Context context,
             int spanX, int spanY) {
-        List<SizeF> sizes = getWidgetSizes(context, spanX, spanY);
-        if (ATLEAST_S) {
-            widgetView.updateAppWidgetSize(new Bundle(), sizes);
-        } else {
-            Rect bounds = getMinMaxSizes(sizes);
-            widgetView.updateAppWidgetSize(new Bundle(), bounds.left, bounds.top, bounds.right,
-                    bounds.bottom);
+        AppWidgetManager widgetManager = AppWidgetManager.getInstance(context);
+        int widgetId = widgetView.getAppWidgetId();
+        if (widgetId <= 0) {
+            return;
+        }
+        Bundle sizeOptions = getWidgetSizeOptions(context, widgetView.getAppWidgetInfo().provider,
+                spanX, spanY);
+        if (sizeOptions.<SizeF>getParcelableArrayList(
+                AppWidgetManager.OPTION_APPWIDGET_SIZES).equals(
+                widgetManager.getAppWidgetOptions(widgetId).<SizeF>getParcelableArrayList(
+                        AppWidgetManager.OPTION_APPWIDGET_SIZES))) {
+            return;
         }
+        widgetManager.updateAppWidgetOptions(widgetId, sizeOptions);
     }
 
     /**
@@ -99,17 +111,7 @@ public final class WidgetSizes {
      */
     public static Bundle getWidgetSizeOptions(Context context, ComponentName provider, int spanX,
             int spanY) {
-        ArrayList<SizeF> sizes = getWidgetSizes(context, spanX, spanY);
-        Rect padding = getDefaultPaddingForWidget(context, provider, null);
-        float density = context.getResources().getDisplayMetrics().density;
-        float xPaddingDips = (padding.left + padding.right) / density;
-        float yPaddingDips = (padding.top + padding.bottom) / density;
-
-        ArrayList<SizeF> paddedSizes = sizes.stream()
-                .map(size -> new SizeF(
-                        Math.max(0.f, size.getWidth() - xPaddingDips),
-                        Math.max(0.f, size.getHeight() - yPaddingDips)))
-                .collect(Collectors.toCollection(ArrayList::new));
+        ArrayList<SizeF> paddedSizes = getWidgetPaddedSizes(context, provider, spanX, spanY);
 
         Rect rect = getMinMaxSizes(paddedSizes);
         Bundle options = new Bundle();
-- 
GitLab


From a7b3a14e7550f161e0a0173bce6fd6bfdd2c8c16 Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pbdr@google.com>
Date: Thu, 1 Jul 2021 15:38:15 +0100
Subject: [PATCH 1561/1664] Use the computation of the widget size including
 padding.

Found all the uses of getWidgetSizePx and replaced them with the
computation of padded sizes (checked it all made sense).

Test: Try the various widget pickers.
Bug: 191612352
Change-Id: Id2a8d12ee7ce6baabef186dbb78d817975ea2212
---
 .../widget/DatabaseWidgetPreviewLoader.java   |  3 ++-
 .../android/launcher3/widget/WidgetCell.java  |  4 ++-
 .../widget/picker/WidgetsListAdapter.java     |  7 ++---
 .../WidgetsRecommendationTableLayout.java     |  4 +--
 .../launcher3/widget/util/WidgetSizes.java    | 27 +++++++++++++++++++
 5 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/com/android/launcher3/widget/DatabaseWidgetPreviewLoader.java b/src/com/android/launcher3/widget/DatabaseWidgetPreviewLoader.java
index 867c770278..4ec7e60c86 100644
--- a/src/com/android/launcher3/widget/DatabaseWidgetPreviewLoader.java
+++ b/src/com/android/launcher3/widget/DatabaseWidgetPreviewLoader.java
@@ -417,7 +417,8 @@ public class DatabaseWidgetPreviewLoader implements WidgetPreviewLoader {
             previewHeight = drawable.getIntrinsicHeight();
         } else {
             DeviceProfile dp = launcher.getDeviceProfile();
-            Size widgetSize = WidgetSizes.getWidgetSizePx(dp, spanX, spanY);
+            Size widgetSize = WidgetSizes.getWidgetPaddedSizePx(mContext, info.provider, dp, spanX,
+                    spanY);
             previewWidth = widgetSize.getWidth();
             previewHeight = widgetSize.getHeight();
         }
diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index 8798332c85..c3edcce95a 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -363,7 +363,9 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     /** Sets the widget preview image size, in number of cells, and preview scale. */
     public Size setPreviewSize(int spanX, int spanY, float previewScale) {
         DeviceProfile deviceProfile = mActivity.getDeviceProfile();
-        Size widgetSize = WidgetSizes.getWidgetSizePx(deviceProfile, spanX, spanY);
+        Size widgetSize =
+                mItem != null ? WidgetSizes.getWidgetItemSizePx(getContext(), deviceProfile, mItem)
+                : WidgetSizes.getWidgetSizePx(deviceProfile, spanX, spanY);
         mPreviewWidth = widgetSize.getWidth();
         mPreviewHeight = widgetSize.getHeight();
         mPreviewScale = previewScale;
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
index 08a2263eff..1125b82150 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
@@ -296,11 +296,8 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
             for (int i = 0; i < entry.mWidgets.size(); i++) {
                 WidgetItem widgetItem = entry.mWidgets.get(i);
                 DeviceProfile deviceProfile = activity.getDeviceProfile();
-                Size widgetSize =
-                        WidgetSizes.getWidgetSizePx(
-                                deviceProfile,
-                                widgetItem.spanX,
-                                widgetItem.spanY);
+                Size widgetSize = WidgetSizes.getWidgetItemSizePx(mContext, deviceProfile,
+                        widgetItem);
                 if (widgetItem.isShortcut()) {
                     widgetSize =
                             new Size(
diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
index 6fc684862d..3800ede169 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
@@ -155,8 +155,8 @@ public final class WidgetsRecommendationTableLayout extends TableLayout {
             float rowHeight = 0;
             for (int j = 0; j < widgetItems.size(); j++) {
                 WidgetItem widgetItem = widgetItems.get(j);
-                Size widgetSize = WidgetSizes.getWidgetSizePx(
-                        deviceProfile, widgetItem.spanX, widgetItem.spanY);
+                Size widgetSize = WidgetSizes.getWidgetItemSizePx(getContext(), deviceProfile,
+                        widgetItem);
                 float previewHeight = widgetSize.getHeight() * previewScale;
                 rowHeight = Math.max(rowHeight,
                         previewHeight + mWidgetCellTextViewsHeight + mWidgetCellVerticalPadding);
diff --git a/src/com/android/launcher3/widget/util/WidgetSizes.java b/src/com/android/launcher3/widget/util/WidgetSizes.java
index 6d053be812..e2c84b5770 100644
--- a/src/com/android/launcher3/widget/util/WidgetSizes.java
+++ b/src/com/android/launcher3/widget/util/WidgetSizes.java
@@ -32,6 +32,7 @@ import androidx.annotation.Nullable;
 
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.model.WidgetItem;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -70,6 +71,32 @@ public final class WidgetSizes {
         return getWidgetSizePx(profile, spanX, spanY, /* recycledCellSize= */ null);
     }
 
+    /**
+     * Returns the size, in pixels and removing padding, a widget of given spans & {@code profile}.
+     */
+    public static Size getWidgetPaddedSizePx(Context context, ComponentName component,
+            DeviceProfile profile, int spanX, int spanY) {
+        Size size = getWidgetSizePx(profile, spanX, spanY);
+        if (profile.shouldInsetWidgets()) {
+            return size;
+        }
+        Rect padding = getDefaultPaddingForWidget(context, component, /* padding= */ null);
+        return new Size(size.getWidth() - padding.left - padding.right,
+                size.getHeight() - padding.top - padding.bottom);
+    }
+
+    /**
+     * Returns the size of a WidgetItem.
+     */
+    public static Size getWidgetItemSizePx(Context context, DeviceProfile profile,
+            WidgetItem widgetItem) {
+        if (widgetItem.isShortcut()) {
+            return getWidgetSizePx(profile, widgetItem.spanX, widgetItem.spanY);
+        }
+        return getWidgetPaddedSizePx(context, widgetItem.componentName, profile, widgetItem.spanX,
+                widgetItem.spanY);
+    }
+
     private static Size getWidgetSizePx(DeviceProfile profile, int spanX, int spanY,
             @Nullable Point recycledCellSize) {
         final int hBorderSpacing = (spanX - 1) * profile.cellLayoutBorderSpacingPx;
-- 
GitLab


From 8b1461d2124f9d7472f82848d200345b2e761f59 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Fri, 2 Jul 2021 12:38:49 -0500
Subject: [PATCH 1562/1664] Allapps layout polishes

Bug: 192666217
Bug: 192648043
Bug: 192648475
Test: Manual
Change-Id: Ib108a6cae8317571520d367334f3bd26b259f04a
---
 res/drawable/rounded_action_button.xml | 2 +-
 res/layout/work_apps_edu.xml           | 1 +
 res/layout/work_apps_paused.xml        | 4 ++--
 res/values/dimens.xml                  | 3 +--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/res/drawable/rounded_action_button.xml b/res/drawable/rounded_action_button.xml
index 0c8755f66c..f04389399f 100644
--- a/res/drawable/rounded_action_button.xml
+++ b/res/drawable/rounded_action_button.xml
@@ -19,7 +19,7 @@
     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
     android:shape="rectangle">
     <corners android:radius="@dimen/rounded_button_radius" />
-    <stroke android:width="1dp" android:color="?androidprv:attr/colorAccentPrimaryVariant" />
+    <stroke android:width="1dp" android:color="@color/all_apps_tab_background_selected" />
     <padding
         android:left="@dimen/rounded_button_padding"
         android:right="@dimen/rounded_button_padding" />
diff --git a/res/layout/work_apps_edu.xml b/res/layout/work_apps_edu.xml
index 84fdfdf3cd..2a3d1542a4 100644
--- a/res/layout/work_apps_edu.xml
+++ b/res/layout/work_apps_edu.xml
@@ -16,6 +16,7 @@
 <com.android.launcher3.allapps.WorkEduCard xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginTop="8dp"
     android:gravity="center">
 
     <LinearLayout
diff --git a/res/layout/work_apps_paused.xml b/res/layout/work_apps_paused.xml
index 841734c2fc..ec34b47364 100644
--- a/res/layout/work_apps_paused.xml
+++ b/res/layout/work_apps_paused.xml
@@ -49,7 +49,7 @@
         android:text="@string/work_apps_enable_btn_text"
         android:textAlignment="center"
         android:background="@drawable/rounded_action_button"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
         android:textSize="14sp" />
 </com.android.launcher3.allapps.WorkPausedCard>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index ee2304c0cd..2a2cf89459 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -119,7 +119,7 @@
     <dimen name="all_apps_divider_margin_vertical">8dp</dimen>
 
 <!-- Floating action button inside work tab to toggle work profile -->
-    <dimen name="work_fab_height">48dp</dimen>
+    <dimen name="work_fab_height">56dp</dimen>
     <dimen name="work_fab_radius">24dp</dimen>
     <dimen name="work_card_padding_horizontal">24dp</dimen>
     <dimen name="work_card_padding_vertical">32dp</dimen>
@@ -128,7 +128,6 @@
     <dimen name="work_profile_footer_text_size">16sp</dimen>
     <dimen name="work_edu_card_margin">16dp</dimen>
 
-    <!-- rounded button shown inside card views, and snack bars  -->
     <dimen name="rounded_button_height">32dp</dimen>
     <dimen name="rounded_button_radius">16dp</dimen>
     <dimen name="rounded_button_padding">8dp</dimen>
-- 
GitLab


From 1b68cbb8228270390ec64a98577c2095bf694a8a Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Fri, 2 Jul 2021 11:28:47 -0700
Subject: [PATCH 1563/1664] Remove flicker when dismissing snackbar

Bug: 191972314
Test: manual

Change-Id: Icf185b89c07b363ec44c77ba3ac1bdeb34e30e59
---
 .../launcher3/allapps/AllAppsContainerView.java | 17 -----------------
 .../allapps/LauncherAllAppsContainerView.java   |  8 --------
 2 files changed, 25 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index d1e643fd9f..09436426eb 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -51,7 +51,6 @@ import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.annotation.VisibleForTesting;
 import androidx.core.graphics.ColorUtils;
-import androidx.core.os.BuildCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -260,21 +259,6 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         mWorkAdapterProvider.updateCurrentState(isEnabled);
     }
 
-    private void hideInput() {
-        if (!BuildCompat.isAtLeastR() || !FeatureFlags.ENABLE_DEVICE_SEARCH.get()) return;
-
-        WindowInsets insets = getRootWindowInsets();
-        if (insets == null) return;
-
-        if (insets.isVisible(WindowInsets.Type.ime())) {
-            hideIme();
-        }
-    }
-
-    protected void hideIme() {
-        getWindowInsetsController().hide(WindowInsets.Type.ime());
-    }
-
     /**
      * Returns whether the view itself will handle the touch event or not.
      */
@@ -290,7 +274,6 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         }
         if (rv.getScrollbar().getThumbOffsetY() >= 0 &&
                 mLauncher.getDragLayer().isEventOverView(rv.getScrollbar(), ev)) {
-            hideInput();
             return false;
         }
         return rv.shouldContainerScroll(ev, mLauncher.getDragLayer());
diff --git a/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java b/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
index 1eb726ce0d..f64b7cbd6c 100644
--- a/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/LauncherAllAppsContainerView.java
@@ -15,8 +15,6 @@
  */
 package com.android.launcher3.allapps;
 
-import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_KEYBOARD_CLOSED;
-
 import android.content.Context;
 import android.graphics.Rect;
 import android.util.AttributeSet;
@@ -88,10 +86,4 @@ public class LauncherAllAppsContainerView extends AllAppsContainerView {
     public void onActivePageChanged(int currentActivePage) {
         super.onActivePageChanged(currentActivePage);
     }
-
-    @Override
-    protected void hideIme() {
-        super.hideIme();
-        mLauncher.getStatsLogManager().logger().log(LAUNCHER_ALLAPPS_KEYBOARD_CLOSED);
-    }
 }
-- 
GitLab


From 26f47c711ad94e4f9f7daef7ea45b35b2e51f53f Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Wed, 23 Jun 2021 15:16:39 -0700
Subject: [PATCH 1564/1664] [DO NOT MERGE] Make the cutout slightly smaller

Temporary fix for S. Leaving the bug open for a proper fix in T.

Bug: 189265196
Test: https://screenshot.googleplex.com/75fgCva736rqwg5
Change-Id: Ice3b189a41f759e090334e360e44543eabc4836d
---
 .../android/quickstep/views/TaskThumbnailView.java | 14 ++++++++++++--
 .../src/com/android/quickstep/views/TaskView.java  |  2 ++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
index 8d69d88062..c70596d88e 100644
--- a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
@@ -19,6 +19,7 @@ package com.android.quickstep.views;
 import static android.view.WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS;
 import static android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS;
 
+import static com.android.launcher3.Utilities.comp;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.systemui.shared.system.WindowManagerWrapper.WINDOWING_MODE_FULLSCREEN;
 
@@ -308,8 +309,17 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
             float cornerRadius) {
         if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
             if (mTask != null && getTaskView().isRunningTask() && !getTaskView().showScreenshot()) {
-                canvas.drawRoundRect(x, y, width, height, cornerRadius, cornerRadius, mClearPaint);
-                canvas.drawRoundRect(x, y, width, height, cornerRadius, cornerRadius,
+                // TODO(b/189265196): Temporary fix to align the surface with the cutout perfectly.
+                // Round up only when the live tile task is displayed in Overview.
+                float rounding = comp(mFullscreenParams.mFullscreenProgress);
+                float left = x + rounding / 2;
+                float top = y + rounding / 2;
+                float right = width - rounding;
+                float bottom = height - rounding;
+
+                canvas.drawRoundRect(left, top, right, bottom, cornerRadius, cornerRadius,
+                        mClearPaint);
+                canvas.drawRoundRect(left, top, right, bottom, cornerRadius, cornerRadius,
                         mDimmingPaintAfterClearing);
                 return;
             }
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 4eb721e2c2..6738e7da90 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -1489,6 +1489,7 @@ public class TaskView extends FrameLayout implements Reusable {
         private final float mCornerRadius;
         private final float mWindowCornerRadius;
 
+        public float mFullscreenProgress;
         public RectF mCurrentDrawnInsets = new RectF();
         public float mCurrentDrawnCornerRadius;
         /** The current scale we apply to the thumbnail to adjust for new left/right insets. */
@@ -1506,6 +1507,7 @@ public class TaskView extends FrameLayout implements Reusable {
          */
         public void setProgress(float fullscreenProgress, float parentScale, int previewWidth,
                 DeviceProfile dp, PreviewPositionHelper pph) {
+            mFullscreenProgress = fullscreenProgress;
             RectF insets = pph.getInsetsToDrawInFullscreen();
 
             float currentInsetsLeft = insets.left * fullscreenProgress;
-- 
GitLab


From 5881b910e92d63ea1bf72e81d9bdde74a494f3b4 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Fri, 2 Jul 2021 19:13:28 +0000
Subject: [PATCH 1565/1664] Revert "Don't use ProxyActivity when launching from
 SearchActionItemInfo intent"

This reverts commit 878dedfb842f7a58b7e06a8ddf5060a2520a4638.

Reason for revert: b/192558017
Bug: 192558017

Change-Id: I41e64ab74c00d7b255be6f3ef1b783c01571d641
---
 .../launcher3/model/data/SearchActionItemInfo.java       | 9 ++-------
 src/com/android/launcher3/touch/ItemClickHandler.java    | 9 ++++++++-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/com/android/launcher3/model/data/SearchActionItemInfo.java b/src/com/android/launcher3/model/data/SearchActionItemInfo.java
index 7ca283ee0c..b3057d5bd2 100644
--- a/src/com/android/launcher3/model/data/SearchActionItemInfo.java
+++ b/src/com/android/launcher3/model/data/SearchActionItemInfo.java
@@ -25,7 +25,6 @@ import android.os.UserHandle;
 
 import androidx.annotation.Nullable;
 
-import com.android.launcher3.Utilities;
 import com.android.launcher3.logger.LauncherAtom.ItemInfo;
 import com.android.launcher3.logger.LauncherAtom.SearchActionItem;
 
@@ -35,7 +34,6 @@ import com.android.launcher3.logger.LauncherAtom.SearchActionItem;
 public class SearchActionItemInfo extends ItemInfoWithIcon {
 
     public static final int FLAG_SHOULD_START = 1 << 1;
-    @Deprecated
     public static final int FLAG_SHOULD_START_FOR_RESULT = FLAG_SHOULD_START | 1 << 2;
     public static final int FLAG_BADGE_WITH_PACKAGE = 1 << 3;
     public static final int FLAG_PRIMARY_ICON_FROM_TITLE = 1 << 4;
@@ -91,13 +89,10 @@ public class SearchActionItemInfo extends ItemInfoWithIcon {
      * Setter for mIntent with assertion for null value mPendingIntent
      */
     public void setIntent(Intent intent) {
-        if (mPendingIntent != null && intent != null && Utilities.IS_DEBUG_DEVICE) {
+        if (mPendingIntent != null && intent != null) {
             throw new RuntimeException(
                     "SearchActionItemInfo can only have either an Intent or a PendingIntent");
         }
-        if (intent != null) {
-            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        }
         mIntent = intent;
     }
 
@@ -109,7 +104,7 @@ public class SearchActionItemInfo extends ItemInfoWithIcon {
      * Setter of mPendingIntent with assertion for null value mIntent
      */
     public void setPendingIntent(PendingIntent pendingIntent) {
-        if (mIntent != null && pendingIntent != null && Utilities.IS_DEBUG_DEVICE) {
+        if (mIntent != null && pendingIntent != null) {
             throw new RuntimeException(
                     "SearchActionItemInfo can only have either an Intent or a PendingIntent");
         }
diff --git a/src/com/android/launcher3/touch/ItemClickHandler.java b/src/com/android/launcher3/touch/ItemClickHandler.java
index 408ba28e0a..b53f96eea3 100644
--- a/src/com/android/launcher3/touch/ItemClickHandler.java
+++ b/src/com/android/launcher3/touch/ItemClickHandler.java
@@ -262,12 +262,19 @@ public class ItemClickHandler {
      */
     public static void onClickSearchAction(Launcher launcher, SearchActionItemInfo itemInfo) {
         if (itemInfo.getIntent() != null) {
-            launcher.startActivity(itemInfo.getIntent());
+            if (itemInfo.hasFlags(SearchActionItemInfo.FLAG_SHOULD_START_FOR_RESULT)) {
+                launcher.startActivityForResult(itemInfo.getIntent(), 0);
+            } else {
+                launcher.startActivity(itemInfo.getIntent());
+            }
         } else if (itemInfo.getPendingIntent() != null) {
             try {
                 PendingIntent pendingIntent = itemInfo.getPendingIntent();
                 if (!itemInfo.hasFlags(SearchActionItemInfo.FLAG_SHOULD_START)) {
                     pendingIntent.send();
+                } else if (itemInfo.hasFlags(SearchActionItemInfo.FLAG_SHOULD_START_FOR_RESULT)) {
+                    launcher.startIntentSenderForResult(pendingIntent.getIntentSender(), 0, null, 0,
+                            0, 0);
                 } else {
                     launcher.startIntentSender(pendingIntent.getIntentSender(), null, 0, 0, 0);
                 }
-- 
GitLab


From 20a13047aed95d72284bcede1dab54e5c91a7bfd Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Fri, 2 Jul 2021 17:25:06 -0700
Subject: [PATCH 1566/1664] Use launcher surface when removing launch target

Otherwise events won't be dispatched properly and window opacity will be
wrong.

Test: manual
Fixes: 191149025
Change-Id: Ice7ea86252282c7dc1cb5925dd1bdb8cade89c08
---
 .../android/launcher3/statehandlers/DepthController.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
index bb8b62db71..82582ee790 100644
--- a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
+++ b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
@@ -180,6 +180,12 @@ public class DepthController implements StateHandler<LauncherState>,
      * Sets the specified app target surface to apply the blur to.
      */
     public void setSurface(SurfaceControl surface) {
+        // Set launcher as the SurfaceControl when we don't need an external target anymore.
+        if (surface == null) {
+            ViewRootImpl viewRootImpl = mLauncher.getDragLayer().getViewRootImpl();
+            surface = viewRootImpl != null ? viewRootImpl.getSurfaceControl() : null;
+        }
+
         if (mSurface != surface) {
             mSurface = surface;
             if (surface != null) {
-- 
GitLab


From 35c3c76d577e04f24a72a2b0d5a76430f6940dbc Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Fri, 2 Jul 2021 17:43:32 -0700
Subject: [PATCH 1567/1664] Deleting screen records for succeeded tests

Test: local runs
Bug: 187761685
Change-Id: I3b1a75b775d1d6677b331869a063fc6132217947
---
 .../com/android/launcher3/util/rule/ScreenRecordRule.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/src/com/android/launcher3/util/rule/ScreenRecordRule.java b/tests/src/com/android/launcher3/util/rule/ScreenRecordRule.java
index 00b1cdd35e..7a5cf2c2cd 100644
--- a/tests/src/com/android/launcher3/util/rule/ScreenRecordRule.java
+++ b/tests/src/com/android/launcher3/util/rule/ScreenRecordRule.java
@@ -62,12 +62,17 @@ public class ScreenRecordRule implements TestRule {
                 ParcelFileDescriptor output =
                         automation.executeShellCommand("screenrecord " + outputFile);
                 String screenRecordPid = device.executeShellCommand("pidof screenrecord");
+                boolean success = false;
                 try {
                     base.evaluate();
+                    success = true;
                 } finally {
                     device.executeShellCommand("kill -INT " + screenRecordPid);
                     Log.e(TAG, "Screenrecord captured at: " + outputFile);
                     output.close();
+                    if (success) {
+                        automation.executeShellCommand("rm " + outputFile);
+                    }
                 }
             }
         };
@@ -78,5 +83,6 @@ public class ScreenRecordRule implements TestRule {
      */
     @Retention(RetentionPolicy.RUNTIME)
     @Target(ElementType.METHOD)
-    public @interface ScreenRecord { }
+    public @interface ScreenRecord {
+    }
 }
-- 
GitLab


From 9960884744d7f439628c7a38fdfe258e7c2350af Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Thu, 1 Jul 2021 18:27:05 -0700
Subject: [PATCH 1568/1664] Adding more diags for TAPL actions that change
 Launcher state

Test: presubmit
Bug: 187761685
Change-Id: Ia3effe12d9c0448fe3b15909662755ee35b8ef51
Merged-In: I11a29956613a4a211d49ee3df6d78e0000b80ced
---
 .../android/launcher3/tapl/Background.java    | 14 +--
 .../android/launcher3/tapl/Launchable.java    | 38 ++++----
 .../tapl/LauncherInstrumentation.java         | 86 ++++++++++---------
 .../android/launcher3/tapl/OverviewTask.java  | 16 ++--
 .../com/android/launcher3/tapl/Workspace.java |  6 +-
 5 files changed, 82 insertions(+), 78 deletions(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/Background.java b/tests/tapl/com/android/launcher3/tapl/Background.java
index e86be2af1e..4b1610efdd 100644
--- a/tests/tapl/com/android/launcher3/tapl/Background.java
+++ b/tests/tapl/com/android/launcher3/tapl/Background.java
@@ -99,12 +99,12 @@ public class Background extends LauncherInstrumentation.VisibleContainer {
                                 end,
                                 gestureScope),
                         event -> TestProtocol.PAUSE_DETECTED_MESSAGE.equals(event.getClassName()),
-                        () -> "Pause wasn't detected");
+                        () -> "Pause wasn't detected", "swiping and holding");
                 mLauncher.runToState(
                         () -> mLauncher.sendPointer(
                                 downTime, SystemClock.uptimeMillis(), MotionEvent.ACTION_UP, end,
                                 gestureScope),
-                        OVERVIEW_STATE_ORDINAL);
+                        OVERVIEW_STATE_ORDINAL, "sending UP event");
                 break;
             }
 
@@ -137,7 +137,7 @@ public class Background extends LauncherInstrumentation.VisibleContainer {
                 mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, SQUARE_BUTTON_EVENT);
                 mLauncher.runToState(
                         () -> mLauncher.waitForSystemUiObject("recent_apps").click(),
-                        OVERVIEW_STATE_ORDINAL);
+                        OVERVIEW_STATE_ORDINAL, "clicking Recents button");
                 break;
         }
         expectSwitchToOverviewEvents();
@@ -218,7 +218,7 @@ public class Background extends LauncherInstrumentation.VisibleContainer {
                             () -> mLauncher.linearGesture(
                                     startX, startY, endX, endY, 20, false, gestureScope),
                             event -> event.getEventType() == TYPE_WINDOW_STATE_CHANGED,
-                            () -> "Quick switch gesture didn't change window state");
+                            () -> "Quick switch gesture didn't change window state", "swiping");
                     break;
                 }
 
@@ -226,13 +226,15 @@ public class Background extends LauncherInstrumentation.VisibleContainer {
                     // Double press the recents button.
                     UiObject2 recentsButton = mLauncher.waitForSystemUiObject("recent_apps");
                     mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, SQUARE_BUTTON_EVENT);
-                    mLauncher.runToState(() -> recentsButton.click(), OVERVIEW_STATE_ORDINAL);
+                    mLauncher.runToState(() -> recentsButton.click(), OVERVIEW_STATE_ORDINAL,
+                            "clicking Recents button for the first time");
                     mLauncher.getOverview();
                     mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, SQUARE_BUTTON_EVENT);
                     mLauncher.executeAndWaitForEvent(
                             () -> recentsButton.click(),
                             event -> event.getEventType() == TYPE_WINDOW_STATE_CHANGED,
-                            () -> "Pressing recents button didn't change window state");
+                            () -> "Pressing recents button didn't change window state",
+                            "clicking Recents button for the second time");
                     break;
             }
             mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, TASK_START_EVENT);
diff --git a/tests/tapl/com/android/launcher3/tapl/Launchable.java b/tests/tapl/com/android/launcher3/tapl/Launchable.java
index ec0a740dca..a15131dbfc 100644
--- a/tests/tapl/com/android/launcher3/tapl/Launchable.java
+++ b/tests/tapl/com/android/launcher3/tapl/Launchable.java
@@ -56,26 +56,24 @@ abstract class Launchable {
     protected abstract String launchableType();
 
     private Background launch(BySelector selector) {
-        try (LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
-                "clicking " + launchableType())) {
-            LauncherInstrumentation.log("Launchable.launch before click "
-                    + mObject.getVisibleCenter() + " in " + mLauncher.getVisibleBounds(mObject));
-            final String label = mObject.getText();
-
-            mLauncher.executeAndWaitForEvent(
-                    () -> {
-                        mLauncher.clickLauncherObject(mObject);
-                        expectActivityStartEvents();
-                    },
-                    event -> event.getEventType() == TYPE_WINDOW_STATE_CHANGED,
-                    () -> "Launching an app didn't open a new window: " + label);
-
-            mLauncher.assertTrue(
-                    "App didn't start: " + label + " (" + selector + ")",
-                    TestHelpers.wait(Until.hasObject(selector),
-                            LauncherInstrumentation.WAIT_TIME_MS));
-            return new Background(mLauncher);
-        }
+        LauncherInstrumentation.log("Launchable.launch before click "
+                + mObject.getVisibleCenter() + " in " + mLauncher.getVisibleBounds(mObject));
+        final String label = mObject.getText();
+
+        mLauncher.executeAndWaitForEvent(
+                () -> {
+                    mLauncher.clickLauncherObject(mObject);
+                    expectActivityStartEvents();
+                },
+                event -> event.getEventType() == TYPE_WINDOW_STATE_CHANGED,
+                () -> "Launching an app didn't open a new window: " + label,
+                "clicking " + launchableType());
+
+        mLauncher.assertTrue(
+                "App didn't start: " + label + " (" + selector + ")",
+                TestHelpers.wait(Until.hasObject(selector),
+                        LauncherInstrumentation.WAIT_TIME_MS));
+        return new Background(mLauncher);
     }
 
     /**
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index af3617529a..13576588ef 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -655,26 +655,30 @@ public final class LauncherInstrumentation {
     }
 
     Parcelable executeAndWaitForLauncherEvent(Runnable command,
-            UiAutomation.AccessibilityEventFilter eventFilter, Supplier<String> message) {
+            UiAutomation.AccessibilityEventFilter eventFilter, Supplier<String> message,
+            String actionName) {
         return executeAndWaitForEvent(
                 command,
                 e -> mLauncherPackage.equals(e.getPackageName()) && eventFilter.accept(e),
-                message);
+                message, actionName);
     }
 
     Parcelable executeAndWaitForEvent(Runnable command,
-            UiAutomation.AccessibilityEventFilter eventFilter, Supplier<String> message) {
-        try {
-            final AccessibilityEvent event =
-                    mInstrumentation.getUiAutomation().executeAndWaitForEvent(
-                            command, eventFilter, WAIT_TIME_MS);
-            assertNotNull("executeAndWaitForEvent returned null (this can't happen)", event);
-            final Parcelable parcelableData = event.getParcelableData();
-            event.recycle();
-            return parcelableData;
-        } catch (TimeoutException e) {
-            fail(message.get());
-            return null;
+            UiAutomation.AccessibilityEventFilter eventFilter, Supplier<String> message,
+            String actionName) {
+        try (LauncherInstrumentation.Closable c = addContextLayer(actionName)) {
+            try {
+                final AccessibilityEvent event =
+                        mInstrumentation.getUiAutomation().executeAndWaitForEvent(
+                                command, eventFilter, WAIT_TIME_MS);
+                assertNotNull("executeAndWaitForEvent returned null (this can't happen)", event);
+                final Parcelable parcelableData = event.getParcelableData();
+                event.recycle();
+                return parcelableData;
+            } catch (TimeoutException e) {
+                fail(message.get());
+                return null;
+            }
         }
     }
 
@@ -720,33 +724,30 @@ public final class LauncherInstrumentation {
                     dumpViewHierarchy();
                     action = "swiping up to home";
 
-                    try (LauncherInstrumentation.Closable c = addContextLayer(action)) {
-                        swipeToState(
-                                displaySize.x / 2, displaySize.y - 1,
-                                displaySize.x / 2, 0,
-                                ZERO_BUTTON_STEPS_FROM_BACKGROUND_TO_HOME, NORMAL_STATE_ORDINAL,
-                                launcherWasVisible
-                                        ? GestureScope.INSIDE_TO_OUTSIDE
-                                        : GestureScope.OUTSIDE_WITH_PILFER);
-                    }
+                    swipeToState(
+                            displaySize.x / 2, displaySize.y - 1,
+                            displaySize.x / 2, 0,
+                            ZERO_BUTTON_STEPS_FROM_BACKGROUND_TO_HOME, NORMAL_STATE_ORDINAL,
+                            launcherWasVisible
+                                    ? GestureScope.INSIDE_TO_OUTSIDE
+                                    : GestureScope.OUTSIDE_WITH_PILFER);
                 }
             } else {
                 log("Hierarchy before clicking home:");
                 dumpViewHierarchy();
                 action = "clicking home button";
-                try (LauncherInstrumentation.Closable c = addContextLayer(action)) {
-                    if (!isLauncher3() && getNavigationModel() == NavigationModel.TWO_BUTTON) {
-                        expectEvent(TestProtocol.SEQUENCE_TIS, EVENT_TOUCH_DOWN_TIS);
-                        expectEvent(TestProtocol.SEQUENCE_TIS, EVENT_TOUCH_UP_TIS);
-                    }
-
-                    runToState(
-                            waitForSystemUiObject("home")::click,
-                            NORMAL_STATE_ORDINAL,
-                            !hasLauncherObject(WORKSPACE_RES_ID)
-                                    && (hasLauncherObject(APPS_RES_ID)
-                                    || hasLauncherObject(OVERVIEW_RES_ID)));
+                if (!isLauncher3() && getNavigationModel() == NavigationModel.TWO_BUTTON) {
+                    expectEvent(TestProtocol.SEQUENCE_TIS, EVENT_TOUCH_DOWN_TIS);
+                    expectEvent(TestProtocol.SEQUENCE_TIS, EVENT_TOUCH_UP_TIS);
                 }
+
+                runToState(
+                        waitForSystemUiObject("home")::click,
+                        NORMAL_STATE_ORDINAL,
+                        !hasLauncherObject(WORKSPACE_RES_ID)
+                                && (hasLauncherObject(APPS_RES_ID)
+                                || hasLauncherObject(OVERVIEW_RES_ID)),
+                        action);
             }
             try (LauncherInstrumentation.Closable c = addContextLayer(
                     "performed action to switch to Home - " + action)) {
@@ -1022,22 +1023,23 @@ public final class LauncherInstrumentation {
                 + "]";
     }
 
-    void runToState(Runnable command, int expectedState, boolean requireEvent) {
+    void runToState(Runnable command, int expectedState, boolean requireEvent, String actionName) {
         if (requireEvent) {
-            runToState(command, expectedState);
+            runToState(command, expectedState, actionName);
         } else {
             command.run();
         }
     }
 
-    void runToState(Runnable command, int expectedState) {
+    void runToState(Runnable command, int expectedState, String actionName) {
         final List<Integer> actualEvents = new ArrayList<>();
         executeAndWaitForLauncherEvent(
                 command,
                 event -> isSwitchToStateEvent(event, expectedState, actualEvents),
                 () -> "Failed to receive an event for the state change: expected ["
                         + TestProtocol.stateOrdinalToString(expectedState)
-                        + "], actual: " + eventListToString(actualEvents));
+                        + "], actual: " + eventListToString(actualEvents),
+                        actionName);
     }
 
     private boolean isSwitchToStateEvent(
@@ -1054,7 +1056,8 @@ public final class LauncherInstrumentation {
             GestureScope gestureScope) {
         runToState(
                 () -> linearGesture(startX, startY, endX, endY, steps, false, gestureScope),
-                expectedState);
+                expectedState,
+                "swiping");
     }
 
     private int getBottomGestureSize() {
@@ -1161,7 +1164,8 @@ public final class LauncherInstrumentation {
                         startX, startY, endX, endY, steps, slowDown, GestureScope.INSIDE),
                 event -> TestProtocol.SCROLL_FINISHED_MESSAGE.equals(event.getClassName()),
                 () -> "Didn't receive a scroll end message: " + startX + ", " + startY
-                        + ", " + endX + ", " + endY);
+                        + ", " + endX + ", " + endY,
+                        "scrolling");
     }
 
     // Inject a swipe gesture. Inject exactly 'steps' motion points, incrementing event time by a
diff --git a/tests/tapl/com/android/launcher3/tapl/OverviewTask.java b/tests/tapl/com/android/launcher3/tapl/OverviewTask.java
index b2359190ba..657b74d116 100644
--- a/tests/tapl/com/android/launcher3/tapl/OverviewTask.java
+++ b/tests/tapl/com/android/launcher3/tapl/OverviewTask.java
@@ -71,15 +71,13 @@ public final class OverviewTask {
     public Background open() {
         try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck()) {
             verifyActiveContainer();
-            try (LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
-                    "clicking an overview task")) {
-                mLauncher.executeAndWaitForEvent(
-                        () -> mLauncher.clickLauncherObject(mTask),
-                        event -> event.getEventType() == TYPE_WINDOW_STATE_CHANGED,
-                        () -> "Launching task didn't open a new window: "
-                                + mTask.getParent().getContentDescription());
-                mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, TASK_START_EVENT);
-            }
+            mLauncher.executeAndWaitForEvent(
+                    () -> mLauncher.clickLauncherObject(mTask),
+                    event -> event.getEventType() == TYPE_WINDOW_STATE_CHANGED,
+                    () -> "Launching task didn't open a new window: "
+                            + mTask.getParent().getContentDescription(),
+                    "clicking an overview task");
+            mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, TASK_START_EVENT);
             return new Background(mLauncher);
         }
     }
diff --git a/tests/tapl/com/android/launcher3/tapl/Workspace.java b/tests/tapl/com/android/launcher3/tapl/Workspace.java
index 1ea0922029..43134d95ad 100644
--- a/tests/tapl/com/android/launcher3/tapl/Workspace.java
+++ b/tests/tapl/com/android/launcher3/tapl/Workspace.java
@@ -190,13 +190,15 @@ public final class Workspace extends Home {
                     launcher.movePointer(launchableCenter, dest, 10, downTime, true,
                             LauncherInstrumentation.GestureScope.INSIDE);
                 },
-                SPRING_LOADED_STATE_ORDINAL);
+                SPRING_LOADED_STATE_ORDINAL,
+                "long-pressing and moving");
         LauncherInstrumentation.log("dragIconToWorkspace: moved pointer");
         launcher.runToState(
                 () -> launcher.sendPointer(
                         downTime, SystemClock.uptimeMillis(), MotionEvent.ACTION_UP, dest,
                         LauncherInstrumentation.GestureScope.INSIDE),
-                NORMAL_STATE_ORDINAL);
+                NORMAL_STATE_ORDINAL,
+                "sending UP event");
         if (startsActivity || isWidgetShortcut) {
             launcher.expectEvent(TestProtocol.SEQUENCE_MAIN, LauncherInstrumentation.EVENT_START);
         }
-- 
GitLab


From 08137e17e370adc1501ee2262b6d7dd4c782241c Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sat, 3 Jul 2021 03:13:27 +0000
Subject: [PATCH 1569/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Ib5182dabf0e6a33287a5388449c2378fb2be10d1
---
 quickstep/res/values-ar/strings.xml     |  2 +-
 quickstep/res/values-ca/strings.xml     |  2 +-
 quickstep/res/values-de/strings.xml     | 28 ++++++++++++-------------
 quickstep/res/values-es/strings.xml     |  2 +-
 quickstep/res/values-is/strings.xml     |  2 +-
 quickstep/res/values-it/strings.xml     |  2 +-
 quickstep/res/values-ja/strings.xml     | 10 ++++-----
 quickstep/res/values-ko/strings.xml     |  2 +-
 quickstep/res/values-pt-rPT/strings.xml |  2 +-
 9 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/quickstep/res/values-ar/strings.xml b/quickstep/res/values-ar/strings.xml
index 1a6597d4da..826b162d79 100644
--- a/quickstep/res/values-ar/strings.xml
+++ b/quickstep/res/values-ar/strings.xml
@@ -55,7 +55,7 @@
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"تأكّد من عدم التمرير بالقرب من أسفل الشاشة."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"لتغيير مستوى حساسية إيماءة الرجوع، انتقِل إلى \"الإعدادات\""</string>
     <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"مرِّر سريعًا من اليمين للرجوع."</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"مرِّر سريعًا من اليسار للرجوع."</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"التمرير سريعًا من اليسار للرجوع"</string>
     <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"للرجوع إلى الشاشة السابقة، مرِّر سريعًا من الحافة اليمنى إلى وسط الشاشة"</string>
     <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"يمكنك أيضًا الرجوع للشاشة السابقة بالتمرير سريعًا من الحافة اليسرى إلى وسط الشاشة. جرِّب ذلك الآن."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"تأكّد من التمرير سريعًا من الحافة السفلى للشاشة إلى أعلاها."</string>
diff --git a/quickstep/res/values-ca/strings.xml b/quickstep/res/values-ca/strings.xml
index f93051a1c0..3e27168b47 100644
--- a/quickstep/res/values-ca/strings.xml
+++ b/quickstep/res/values-ca/strings.xml
@@ -66,7 +66,7 @@
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Llisca per anar a la pantalla d\'inici"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Llisca cap amunt des de la part inferior de la pantalla. Aquest gest et porta a la pantalla d\'inici."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Assegura\'t de lliscar des de la vora inferior de la pantalla."</string>
-    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Prova de mantenir premuda la finestra durant més temps abans de deixar anar."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Prova de mantenir premuda la finestra durant més temps abans de deixar-la anar."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Assegura\'t de lliscar directament cap amunt i després aturar-te."</string>
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Has après a utilitzar els gestos. Per desactivar-los, ves a Configuració."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Has completat el gest per canviar d\'aplicació."</string>
diff --git a/quickstep/res/values-de/strings.xml b/quickstep/res/values-de/strings.xml
index 17849e0bed..57d9dbf0c5 100644
--- a/quickstep/res/values-de/strings.xml
+++ b/quickstep/res/values-de/strings.xml
@@ -45,27 +45,27 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Funktion „App-Vorschläge“ aktiviert"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Funktion \"App-Vorschläge\" deaktiviert"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Vorgeschlagene App: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Wische vom äußersten linken Bildschirmrand."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Wische vom linken Bildschirmrand zur Bildschirmmitte und lass los."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Wische vom äußersten rechten Bildschirmrand."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Wische vom rechten Bildschirmrand zur Bildschirmmitte und lass los."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Du kannst jetzt vom linken Bildschirmrand aus wischen, um zurückzugehen."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Du kannst jetzt vom rechten Bildschirmrand aus wischen, um zurückzugehen. Gleich erfährst du, wie man zwischen Apps wechselt."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Wische vom äußersten linken Displayrand."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Wische vom linken Displayrand zur Displaymitte und lass los."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Wische vom äußersten rechten Displayrand."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Wische vom rechten Displayrand zur Displaymitte und lass los."</string>
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Du kannst jetzt vom linken Displayrand aus wischen, um zurückzugehen."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Du kannst jetzt vom rechten Displayrand aus wischen, um zurückzugehen. Gleich erfährst du, wie man zwischen Apps wechselt."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Du hast die „Zurück“-Touch-Geste abgeschlossen."</string>
-    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Wische nicht zu nah am unteren Bildschirmrand."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Wische nicht zu nah am unteren Displayrand."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Du kannst die Empfindlichkeit von „Zurück“ in den Einstellungen ändern"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Wische vom linken Bildschirmrand aus, um zurückzugehen"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Wische vom rechten Bildschirmrand aus, um zurückzugehen"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Wenn du zum letzten Bildschirm zurückgehen möchtest, wische vom linken Bildschirmrand zur Mitte."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Du kannst vom rechten Bildschirmrand zur Mitte wischen, um zum letzten Bildschirm zurückzugehen. Probier es aus."</string>
-    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Wische vom unteren Bildschirmrand nach oben."</string>
+    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Wische vom linken Displayrand aus, um zurückzugehen"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Wische vom rechten Displayrand aus, um zurückzugehen"</string>
+    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Wenn du zum letzten Bildschirm zurückgehen möchtest, wische vom linken Displayrand zur Mitte."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Du kannst vom rechten Displayrand zur Mitte wischen, um zum letzten Bildschirm zurückzugehen. Probier es aus."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Wische vom unteren Displayrand nach oben."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Achte darauf, nicht innezuhalten, bevor du loslässt."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Wische gerade nach oben."</string>
     <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Du hast die „Startbildschirm“-Touch-Geste abgeschlossen. Gleich lernst du, wie du zurückgelangst."</string>
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Du hast die „Startbildschirm“-Touch-Geste abgeschlossen."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Zum Startbildschirm gehen"</string>
-    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Wenn du zum Startbildschirm gehen möchtest, wische einfach vom unteren Bildschirmrand nach oben."</string>
-    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Wische vom unteren Bildschirmrand nach oben."</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Wenn du zum Startbildschirm gehen möchtest, wische einfach vom unteren Displayrand nach oben."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Wische vom unteren Displayrand nach oben."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Versuche, das Fenster länger festzuhalten, bevor du es loslässt."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Wische gerade nach oben und halte dann inne."</string>
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Nun weißt du, wie Touch-Gesten funktionieren. Du kannst sie in den Einstellungen deaktivieren."</string>
diff --git a/quickstep/res/values-es/strings.xml b/quickstep/res/values-es/strings.xml
index c2cb08eed7..220e3973ca 100644
--- a/quickstep/res/values-es/strings.xml
+++ b/quickstep/res/values-es/strings.xml
@@ -75,7 +75,7 @@
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Todo listo"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Siguiente"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Ajustes"</string>
-    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Reintentar"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Vuélvelo a intentar"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"¡Muy bien!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"¡Ya está!"</string>
diff --git a/quickstep/res/values-is/strings.xml b/quickstep/res/values-is/strings.xml
index 5928bdfce4..9c756d7694 100644
--- a/quickstep/res/values-is/strings.xml
+++ b/quickstep/res/values-is/strings.xml
@@ -57,7 +57,7 @@
     <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Strjúktu frá vinstri til að fara til baka"</string>
     <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Strjúktu frá hægri til að fara til baka"</string>
     <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Strjúktu frá vinstri brún að miðju skjásins til að fara aftur á síðasta skjá sem var opinn."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Þú getur líka farið á síðasta skjá með því að strjúka frá hægri brún að miðju skjásins. Prófa núna."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Þú getur líka farið á síðasta skjá með því að strjúka frá hægri brún að miðju skjásins. Prófaðu núna."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Passaðu að strjúka upp frá neðri brún skjásins."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Passaðu að stoppa ekki áður en þú sleppir."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Passaðu að strjúka beint upp."</string>
diff --git a/quickstep/res/values-it/strings.xml b/quickstep/res/values-it/strings.xml
index b64926670a..dc0bf57ae1 100644
--- a/quickstep/res/values-it/strings.xml
+++ b/quickstep/res/values-it/strings.xml
@@ -57,7 +57,7 @@
     <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Scorri da sinistra per tornare indietro"</string>
     <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Scorri da destra per tornare indietro"</string>
     <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Per tornare all\'ultima schermata mostrata, scorri dal bordo sinistro verso il centro dello schermo."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Puoi anche tornare all\'ultima schermata scorrendo da bordo destro verso centro dello schermo. Prova."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Puoi anche tornare all\'ultima schermata scorrendo dal bordo destro verso il centro dello schermo. Prova."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Assicurati di scorrere verso l\'alto dal bordo inferiore dello schermo."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Assicurati di non fare pause prima di sollevare il dito."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Assicurati di scorrere verso l\'alto senza fermarti."</string>
diff --git a/quickstep/res/values-ja/strings.xml b/quickstep/res/values-ja/strings.xml
index 38accd1062..eb9c509c1b 100644
--- a/quickstep/res/values-ja/strings.xml
+++ b/quickstep/res/values-ja/strings.xml
@@ -45,9 +45,9 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"アプリの候補表示が有効です"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"アプリの候補は無効です"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"予測されたアプリ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"一番左端からスワイプしてください。"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"左端からスワイプしてください。"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"画面の左端から中央に向かってスワイプし、指を離してください。"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"一番右端からスワイプしてください。"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"右端からスワイプしてください。"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"画面の右端から中央に向かってスワイプし、指を離してください。"</string>
     <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"左側からスワイプして前の画面に戻る方法を学習しました。"</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"右側からスワイプして前の画面に戻る方法を学習しました。次は、アプリを切り替える方法を覚えましょう。"</string>
@@ -66,7 +66,7 @@
     <string name="home_gesture_intro_title" msgid="836590312858441830">"スワイプでホームに戻る"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"画面を下から上にスワイプします。この操作でいつでもホーム画面に戻れます。"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"画面の下端から上にスワイプしてください。"</string>
-    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"指を離す前にウィンドウをもう少し長押ししてみましょう。"</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"ウィンドウをもう少し長く押してから指を離すようにしてみましょう。"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"まっすぐ上にスワイプしてから、いったん指を止めてください。"</string>
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"主な操作方法を覚えました。操作を OFF にするには、設定に移動してください。"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"「アプリを切り替える」操作を完了しました。"</string>
@@ -75,8 +75,8 @@
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"設定完了"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"次へ"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"設定"</string>
-    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"再試行"</string>
-    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"成功"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"もう一度"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"成功しました"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"チュートリアル <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"設定完了"</string>
     <string name="allset_hint" msgid="459504134589971527">"ホームに移動するには上にスワイプします"</string>
diff --git a/quickstep/res/values-ko/strings.xml b/quickstep/res/values-ko/strings.xml
index 1666a5a1f7..bd6ecc7b7d 100644
--- a/quickstep/res/values-ko/strings.xml
+++ b/quickstep/res/values-ko/strings.xml
@@ -57,7 +57,7 @@
     <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"왼쪽에서 스와이프하여 뒤로 돌아가세요"</string>
     <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"돌아가려면 오른쪽에서 스와이프하세요"</string>
     <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"마지막 화면으로 돌아가려면 왼쪽 가장자리에서 화면 중앙으로 스와이프하세요"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"오른쪽 가장자리에서 화면 중앙으로 스와이프해도 마지막 화면으로 돌아갈 수 있습니다. 지금 동작을 취해 보세요"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"오른쪽 가장자리에서 화면 중앙으로 스와이프해도 마지막 화면으로 돌아갈 수 있습니다. 지금 동작을 취해 보세요."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"화면 하단 가장자리에서 위로 스와이프하세요."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"손가락을 떼기 전에 멈추지 않아야 합니다."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"위로 똑바르게 스와이프하세요."</string>
diff --git a/quickstep/res/values-pt-rPT/strings.xml b/quickstep/res/values-pt-rPT/strings.xml
index 0163602e1f..891bcfb102 100644
--- a/quickstep/res/values-pt-rPT/strings.xml
+++ b/quickstep/res/values-pt-rPT/strings.xml
@@ -45,7 +45,7 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Sugestões de apps ativadas"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"As sugestões de apps estão desativadas"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App prevista: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Garanta que desliza rapidamente com o dedo a partir da extremidade esquerda."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Deslize rapidamente com o dedo a partir da extremidade esquerda."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Garanta que desliza rapidamente com o dedo do limite esquerdo até ao centro do ecrã e solta."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Garanta que desliza rapidamente com o dedo a partir da extremidade direita."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Garanta que desliza rapidamente com o dedo do limite direito até ao centro do ecrã e solta."</string>
-- 
GitLab


From c99f040c0358a3088180e870994b39ef72e62f30 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sat, 3 Jul 2021 03:14:42 +0000
Subject: [PATCH 1570/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I6adbd14a157d4bdd47aaf8fe8ca998da365802ad
---
 go/quickstep/res/values-af/strings.xml        | 4 ++++
 go/quickstep/res/values-am/strings.xml        | 4 ++++
 go/quickstep/res/values-ar/strings.xml        | 4 ++++
 go/quickstep/res/values-as/strings.xml        | 4 ++++
 go/quickstep/res/values-az/strings.xml        | 4 ++++
 go/quickstep/res/values-b+sr+Latn/strings.xml | 4 ++++
 go/quickstep/res/values-be/strings.xml        | 4 ++++
 go/quickstep/res/values-bg/strings.xml        | 4 ++++
 go/quickstep/res/values-bn/strings.xml        | 8 ++++++++
 go/quickstep/res/values-bs/strings.xml        | 4 ++++
 go/quickstep/res/values-ca/strings.xml        | 4 ++++
 go/quickstep/res/values-cs/strings.xml        | 4 ++++
 go/quickstep/res/values-da/strings.xml        | 4 ++++
 go/quickstep/res/values-de/strings.xml        | 4 ++++
 go/quickstep/res/values-el/strings.xml        | 4 ++++
 go/quickstep/res/values-en-rAU/strings.xml    | 4 ++++
 go/quickstep/res/values-en-rCA/strings.xml    | 4 ++++
 go/quickstep/res/values-en-rGB/strings.xml    | 4 ++++
 go/quickstep/res/values-en-rIN/strings.xml    | 4 ++++
 go/quickstep/res/values-en-rXC/strings.xml    | 4 ++++
 go/quickstep/res/values-es-rUS/strings.xml    | 4 ++++
 go/quickstep/res/values-es/strings.xml        | 4 ++++
 go/quickstep/res/values-et/strings.xml        | 4 ++++
 go/quickstep/res/values-eu/strings.xml        | 4 ++++
 go/quickstep/res/values-fa/strings.xml        | 4 ++++
 go/quickstep/res/values-fi/strings.xml        | 4 ++++
 go/quickstep/res/values-fr-rCA/strings.xml    | 8 ++++++++
 go/quickstep/res/values-fr/strings.xml        | 4 ++++
 go/quickstep/res/values-gl/strings.xml        | 4 ++++
 go/quickstep/res/values-gu/strings.xml        | 8 ++++++++
 go/quickstep/res/values-hi/strings.xml        | 4 ++++
 go/quickstep/res/values-hr/strings.xml        | 4 ++++
 go/quickstep/res/values-hu/strings.xml        | 4 ++++
 go/quickstep/res/values-hy/strings.xml        | 4 ++++
 go/quickstep/res/values-in/strings.xml        | 4 ++++
 go/quickstep/res/values-is/strings.xml        | 4 ++++
 go/quickstep/res/values-it/strings.xml        | 4 ++++
 go/quickstep/res/values-iw/strings.xml        | 8 ++++++++
 go/quickstep/res/values-ja/strings.xml        | 4 ++++
 go/quickstep/res/values-ka/strings.xml        | 4 ++++
 go/quickstep/res/values-kk/strings.xml        | 4 ++++
 go/quickstep/res/values-km/strings.xml        | 4 ++++
 go/quickstep/res/values-kn/strings.xml        | 8 ++++++++
 go/quickstep/res/values-ko/strings.xml        | 4 ++++
 go/quickstep/res/values-ky/strings.xml        | 4 ++++
 go/quickstep/res/values-lo/strings.xml        | 4 ++++
 go/quickstep/res/values-lt/strings.xml        | 4 ++++
 go/quickstep/res/values-lv/strings.xml        | 4 ++++
 go/quickstep/res/values-mk/strings.xml        | 4 ++++
 go/quickstep/res/values-ml/strings.xml        | 4 ++++
 go/quickstep/res/values-mn/strings.xml        | 4 ++++
 go/quickstep/res/values-mr/strings.xml        | 4 ++++
 go/quickstep/res/values-ms/strings.xml        | 4 ++++
 go/quickstep/res/values-my/strings.xml        | 4 ++++
 go/quickstep/res/values-nb/strings.xml        | 4 ++++
 go/quickstep/res/values-ne/strings.xml        | 4 ++++
 go/quickstep/res/values-nl/strings.xml        | 4 ++++
 go/quickstep/res/values-or/strings.xml        | 4 ++++
 go/quickstep/res/values-pa/strings.xml        | 8 ++++++++
 go/quickstep/res/values-pl/strings.xml        | 4 ++++
 go/quickstep/res/values-pt-rPT/strings.xml    | 4 ++++
 go/quickstep/res/values-pt/strings.xml        | 4 ++++
 go/quickstep/res/values-ro/strings.xml        | 4 ++++
 go/quickstep/res/values-ru/strings.xml        | 4 ++++
 go/quickstep/res/values-si/strings.xml        | 4 ++++
 go/quickstep/res/values-sk/strings.xml        | 4 ++++
 go/quickstep/res/values-sl/strings.xml        | 4 ++++
 go/quickstep/res/values-sq/strings.xml        | 8 ++++++++
 go/quickstep/res/values-sr/strings.xml        | 4 ++++
 go/quickstep/res/values-sv/strings.xml        | 4 ++++
 go/quickstep/res/values-sw/strings.xml        | 4 ++++
 go/quickstep/res/values-ta/strings.xml        | 4 ++++
 go/quickstep/res/values-te/strings.xml        | 4 ++++
 go/quickstep/res/values-th/strings.xml        | 4 ++++
 go/quickstep/res/values-tl/strings.xml        | 4 ++++
 go/quickstep/res/values-tr/strings.xml        | 4 ++++
 go/quickstep/res/values-uk/strings.xml        | 4 ++++
 go/quickstep/res/values-ur/strings.xml        | 4 ++++
 go/quickstep/res/values-uz/strings.xml        | 4 ++++
 go/quickstep/res/values-vi/strings.xml        | 4 ++++
 go/quickstep/res/values-zh-rCN/strings.xml    | 4 ++++
 go/quickstep/res/values-zh-rHK/strings.xml    | 4 ++++
 go/quickstep/res/values-zh-rTW/strings.xml    | 4 ++++
 go/quickstep/res/values-zu/strings.xml        | 4 ++++
 84 files changed, 364 insertions(+)

diff --git a/go/quickstep/res/values-af/strings.xml b/go/quickstep/res/values-af/strings.xml
index 8570531635..36b38b0657 100644
--- a/go/quickstep/res/values-af/strings.xml
+++ b/go/quickstep/res/values-af/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Luister"</string>
     <string name="action_translate" msgid="8028378961867277746">"Vertaal"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Vertaal of luister na teks op skerm"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Inligting soos teks op jou skerm, webadresse en skermskote kan met Google gedeel word.\n\nGaan na "<b>"Instellings &gt; Programme &gt; Verstekprogramme &gt; Digitale Assistent-program"</b>" om te verander watter inligting jy deel."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"KANSELLEER"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"HET DIT"</string>
 </resources>
diff --git a/go/quickstep/res/values-am/strings.xml b/go/quickstep/res/values-am/strings.xml
index fc82f599e6..7fab663fbf 100644
--- a/go/quickstep/res/values-am/strings.xml
+++ b/go/quickstep/res/values-am/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"ያዳምጡ"</string>
     <string name="action_translate" msgid="8028378961867277746">"ተርጉም"</string>
     <string name="action_search" msgid="6269564710943755464">"ሌንስ"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"በማያ ገጹ ላይ ጽሑፍን ይተረጉሙ ወይም ያዳምጡ"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"እንደ በማያ ገጽዎ ላይ ያለ ጽሑፍ፣ የድር አድራሻዎች እና ቅጽበታዊ ገጽ እይታዎች ያሉ መረጃዎች ለGoogle ሊጋሩ ይችላሉ።\n\nምን መረጃ እንደሚያጋሩ ለመቀየር ወደ "<b>"ቅንብሮች &gt; መተግበሪያዎች &gt; ነባሪ መተግበሪያዎች &gt; ዲጂታል ረዳት መተግበሪያ"</b>" ይሂዱ።"</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ይቅር"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ገባኝ"</string>
 </resources>
diff --git a/go/quickstep/res/values-ar/strings.xml b/go/quickstep/res/values-ar/strings.xml
index 8fc64dc252..7ea0ed051a 100644
--- a/go/quickstep/res/values-ar/strings.xml
+++ b/go/quickstep/res/values-ar/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"استماع"</string>
     <string name="action_translate" msgid="8028378961867277746">"‏ترجمة Google"</string>
     <string name="action_search" msgid="6269564710943755464">"‏عدسة Google"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"ترجمة النص الظاهر على الشاشة أو الاستماع إليه"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"‏قد تتم مشاركة معلومات مثل النص الظاهر على الشاشة وعناوين الويب ولقطات الشاشة مع Google.\n\nلتغيير المعلومات التي تتم مشاركتها، انتقِل إلى "<b>"الإعدادات &gt; التطبيقات &gt; التطبيقات التلقائية &gt; تطبيق المساعد الرقمي"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"إلغاء"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"حسنًا"</string>
 </resources>
diff --git a/go/quickstep/res/values-as/strings.xml b/go/quickstep/res/values-as/strings.xml
index a3b95c4851..d5d234cb46 100644
--- a/go/quickstep/res/values-as/strings.xml
+++ b/go/quickstep/res/values-as/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"শুনক"</string>
     <string name="action_translate" msgid="8028378961867277746">"অনুবাদ কৰক"</string>
     <string name="action_search" msgid="6269564710943755464">"লেন্স"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"স্ক্ৰীনত থকা পাঠ অনুবাদ কৰক অথবা শুনক"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"আপোনাৰ স্ক্ৰীনত থকা পাঠ, ৱেব ঠিকনা আৰু স্ক্ৰীনশ্বটৰ দৰে তথ্য Googleৰ সৈতে হয়তো শ্বেয়াৰ কৰা হ’ব।\n\nআপুনি কোনসমুহ তথ্য শ্বেয়াৰ কৰিব সেয়া সলনি কৰিবলৈ, "<b>"ছেটিং &gt; এপ্‌ &gt; ডিফ’ল্ট এপ্‌ &gt; ডিজিটেল সহায়ক এপ"</b>"লৈ যাওক।"</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"বাতিল কৰক"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"বুজি পালোঁ"</string>
 </resources>
diff --git a/go/quickstep/res/values-az/strings.xml b/go/quickstep/res/values-az/strings.xml
index 8b47b7f8b7..6fd0dd2cfb 100644
--- a/go/quickstep/res/values-az/strings.xml
+++ b/go/quickstep/res/values-az/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Dinləyin"</string>
     <string name="action_translate" msgid="8028378961867277746">"Tərcümə"</string>
     <string name="action_search" msgid="6269564710943755464">"Linza"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Ekrandakı mətni tərcümə edin və ya dinləyin"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Ekrandakı mətn, veb ünvanlar və ekran görüntüləri kimi məlumatlar Google ilə paylaşıla bilər.\n\nHansı məlumatların paylaşılmasını dəyişmək üçün "<b>"Ayarlar &gt; Tətbiqlər &gt; Defolt tətbiqlər &gt; Rəqəmsal assistent tətbiqi"</b>" bölməsinə keçin."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"LƏĞV EDİN"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ANLADIM"</string>
 </resources>
diff --git a/go/quickstep/res/values-b+sr+Latn/strings.xml b/go/quickstep/res/values-b+sr+Latn/strings.xml
index 7d383e1f0c..de76cca89d 100644
--- a/go/quickstep/res/values-b+sr+Latn/strings.xml
+++ b/go/quickstep/res/values-b+sr+Latn/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Pusti"</string>
     <string name="action_translate" msgid="8028378961867277746">"Prevedi"</string>
     <string name="action_search" msgid="6269564710943755464">"Objektiv"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Prevodite ili slušajte tekst na ekranu"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informacije poput teksta na ekranu, veb-adresa i snimaka ekrana mogu da se dele sa Google-om.\n\nDa biste promenili informacije koje delite, idite u "<b>"Podešavanja &gt; Aplikacije &gt; Podrazumevane aplikacije &gt; Aplikacija digitalnog pomoćnika"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"OTKAŽI"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"VAŽI"</string>
 </resources>
diff --git a/go/quickstep/res/values-be/strings.xml b/go/quickstep/res/values-be/strings.xml
index 95bff60b46..9d8220356b 100644
--- a/go/quickstep/res/values-be/strings.xml
+++ b/go/quickstep/res/values-be/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Праслухаць"</string>
     <string name="action_translate" msgid="8028378961867277746">"Перакласці"</string>
     <string name="action_search" msgid="6269564710943755464">"Аб\'ектыў"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Перакласці ці праслухаць тэкст на экране"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Такая інфармацыя з вашага экрана, як тэксты, вэб-адрасы і здымкі экрана, можа абагульвацца з Google.\n\nКаб змяніць тып інфармацыі для абагульвання, адкрыйце "<b>"Налады &gt; Праграмы &gt; Стандартныя праграмы &gt; Лічбавы памочнік"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"СКАСАВАЦЬ"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ЗРАЗУМЕЛА"</string>
 </resources>
diff --git a/go/quickstep/res/values-bg/strings.xml b/go/quickstep/res/values-bg/strings.xml
index 018d53623b..0408fbafc1 100644
--- a/go/quickstep/res/values-bg/strings.xml
+++ b/go/quickstep/res/values-bg/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Слушане"</string>
     <string name="action_translate" msgid="8028378961867277746">"Превод"</string>
     <string name="action_search" msgid="6269564710943755464">"Обектив"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Превеждане или четене на текста на екрана"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Определена информация може да бъде споделена с Google, като например текстът на екрана ви, уеб адресите и екранните снимки.\n\nЗа да промените информацията, която споделяте, отворете "<b>"„Настройки“ &gt; „Приложения“ &gt; „Приложения по подразбиране“ &gt; „Приложение за дигитален асистент“"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ОТКАЗ"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"РАЗБРАХ"</string>
 </resources>
diff --git a/go/quickstep/res/values-bn/strings.xml b/go/quickstep/res/values-bn/strings.xml
index b5c8ec949d..78b9df78fd 100644
--- a/go/quickstep/res/values-bn/strings.xml
+++ b/go/quickstep/res/values-bn/strings.xml
@@ -5,4 +5,12 @@
     <string name="action_listen" msgid="2370304050784689486">"শুনুন"</string>
     <string name="action_translate" msgid="8028378961867277746">"অনুবাদ করুন"</string>
     <string name="action_search" msgid="6269564710943755464">"লেন্স"</string>
+    <!-- no translation found for niu_actions_confirmation_title (3863451714863526143) -->
+    <skip />
+    <!-- no translation found for niu_actions_confirmation_text (2105271481950866089) -->
+    <skip />
+    <!-- no translation found for niu_actions_confirmation_no (6641104944008154587) -->
+    <skip />
+    <!-- no translation found for niu_actions_confirmation_yes (3817302060585371994) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-bs/strings.xml b/go/quickstep/res/values-bs/strings.xml
index 90ea104715..f83521e9fc 100644
--- a/go/quickstep/res/values-bs/strings.xml
+++ b/go/quickstep/res/values-bs/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Poslušajte"</string>
     <string name="action_translate" msgid="8028378961867277746">"Prevedi"</string>
     <string name="action_search" msgid="6269564710943755464">"Objektiv"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Prevedite ili slušajte tekst na ekranu"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informacije kao što su tekst na ekranu, web adrese i snimci ekrana mogu se dijeliti s Googleom.\n\nDa promijenite koje informacije dijelite, idite u "<b>"Postavke &gt; Aplikacije &gt; Zadane aplikacije &gt; Aplikacija digitalnog asistenta"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"OTKAŽI"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"RAZUMIJEM"</string>
 </resources>
diff --git a/go/quickstep/res/values-ca/strings.xml b/go/quickstep/res/values-ca/strings.xml
index e578f5a6a3..3320b06c0e 100644
--- a/go/quickstep/res/values-ca/strings.xml
+++ b/go/quickstep/res/values-ca/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Escolta"</string>
     <string name="action_translate" msgid="8028378961867277746">"Tradueix"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Tradueix o escolta el text en pantalla"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"És possible que determinada informació es comparteixi amb Google, com ara el text en pantalla, les adreces web i les captures de pantalla.\n\nPer canviar quina informació comparteixes, ves a "<b>"Configuració &gt; Aplicacions &gt; Aplicacions predeterminades &gt; Aplicació de l\'assistent digital"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"CANCEL·LA"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ENTESOS"</string>
 </resources>
diff --git a/go/quickstep/res/values-cs/strings.xml b/go/quickstep/res/values-cs/strings.xml
index cb21abe77f..310727eeb3 100644
--- a/go/quickstep/res/values-cs/strings.xml
+++ b/go/quickstep/res/values-cs/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Poslechnout"</string>
     <string name="action_translate" msgid="8028378961867277746">"Přeložit"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Překládejte nebo poslouchejte text na obrazovce"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"S Googlem mohou být sdílena data, jako je text na obrazovce, webové adresy a snímky obrazovky.\n\nSdílená data můžete upřesnit v "<b>"Nastavení &gt; Aplikace &gt; Výchozí aplikace &gt; Aplikace digitálního asistenta"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ZRUŠIT"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ROZUMÍM"</string>
 </resources>
diff --git a/go/quickstep/res/values-da/strings.xml b/go/quickstep/res/values-da/strings.xml
index 46648ce686..16b8fbbfeb 100644
--- a/go/quickstep/res/values-da/strings.xml
+++ b/go/quickstep/res/values-da/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Lyt"</string>
     <string name="action_translate" msgid="8028378961867277746">"Oversæt"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Oversæt eller hør tekst på skærmen"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Oplysninger såsom tekst på din skærm, webadresser og screenshots deles muligvis med Google.\n\nHvis du vil ændre, hvilke oplysninger du deler, kan du gå til "<b>"Indstillinger &gt; Apps &gt; Standardapps &gt; App for digital assistent"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ANNULLER"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
 </resources>
diff --git a/go/quickstep/res/values-de/strings.xml b/go/quickstep/res/values-de/strings.xml
index 1052b0cdf0..f29879e4b4 100644
--- a/go/quickstep/res/values-de/strings.xml
+++ b/go/quickstep/res/values-de/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Anhören"</string>
     <string name="action_translate" msgid="8028378961867277746">"Übersetzen"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Text auf dem Bildschirm übersetzen oder anhören"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informationen, wie Text auf deinem Bildschirm, Webadressen und Screenshots, werden möglicherweise an Google weitergegeben.\n\nWenn du ändern möchtest, welche Informationen weitergegeben werden, gehe zu "<b>"Einstellungen &gt; Apps &gt; Standard-Apps &gt; App für digitalen Assistenten"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ABBRECHEN"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
 </resources>
diff --git a/go/quickstep/res/values-el/strings.xml b/go/quickstep/res/values-el/strings.xml
index 3d514d966e..59cae3de6b 100644
--- a/go/quickstep/res/values-el/strings.xml
+++ b/go/quickstep/res/values-el/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Ακρόαση"</string>
     <string name="action_translate" msgid="8028378961867277746">"Μετάφραση"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Μετάφραση ή ακρόαση του κειμένου στην οθόνη"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Πληροφορίες όπως είναι το κείμενο στην οθόνη, οι διευθύνσεις ιστού και τα στιγμιότυπα οθόνης, ενδέχεται να κοινοποιηθούν στην Google.\n\nΓια να αλλάξετε τις πληροφορίες που κοινοποιείτε, μεταβείτε στις "<b>"Ρυθμίσεις &gt; Εφαρμογές &gt; Προεπιλεγμένες εφαρμογές &gt; Εφαρμογή ψηφιακού βοηθού"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ΑΚΥΡΩΣΗ"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ΟΚ"</string>
 </resources>
diff --git a/go/quickstep/res/values-en-rAU/strings.xml b/go/quickstep/res/values-en-rAU/strings.xml
index 3a609b6729..54b1330686 100644
--- a/go/quickstep/res/values-en-rAU/strings.xml
+++ b/go/quickstep/res/values-en-rAU/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Listen"</string>
     <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Translate or listen to text on screen"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Information such as text on your screen, web addresses and screenshots may be shared with Google.\n\nTo change what information you share, go to "<b>"Settings &gt; Apps &gt; Default apps &gt; Digital assistant app"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"CANCEL"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
 </resources>
diff --git a/go/quickstep/res/values-en-rCA/strings.xml b/go/quickstep/res/values-en-rCA/strings.xml
index 3a609b6729..54b1330686 100644
--- a/go/quickstep/res/values-en-rCA/strings.xml
+++ b/go/quickstep/res/values-en-rCA/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Listen"</string>
     <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Translate or listen to text on screen"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Information such as text on your screen, web addresses and screenshots may be shared with Google.\n\nTo change what information you share, go to "<b>"Settings &gt; Apps &gt; Default apps &gt; Digital assistant app"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"CANCEL"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
 </resources>
diff --git a/go/quickstep/res/values-en-rGB/strings.xml b/go/quickstep/res/values-en-rGB/strings.xml
index 3a609b6729..54b1330686 100644
--- a/go/quickstep/res/values-en-rGB/strings.xml
+++ b/go/quickstep/res/values-en-rGB/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Listen"</string>
     <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Translate or listen to text on screen"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Information such as text on your screen, web addresses and screenshots may be shared with Google.\n\nTo change what information you share, go to "<b>"Settings &gt; Apps &gt; Default apps &gt; Digital assistant app"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"CANCEL"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
 </resources>
diff --git a/go/quickstep/res/values-en-rIN/strings.xml b/go/quickstep/res/values-en-rIN/strings.xml
index 3a609b6729..54b1330686 100644
--- a/go/quickstep/res/values-en-rIN/strings.xml
+++ b/go/quickstep/res/values-en-rIN/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Listen"</string>
     <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Translate or listen to text on screen"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Information such as text on your screen, web addresses and screenshots may be shared with Google.\n\nTo change what information you share, go to "<b>"Settings &gt; Apps &gt; Default apps &gt; Digital assistant app"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"CANCEL"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
 </resources>
diff --git a/go/quickstep/res/values-en-rXC/strings.xml b/go/quickstep/res/values-en-rXC/strings.xml
index 614f69afe2..cac376e761 100644
--- a/go/quickstep/res/values-en-rXC/strings.xml
+++ b/go/quickstep/res/values-en-rXC/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‎‎‏‎‏‎‎‎‎‎‎‏‎‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‏‎‏‏‏‎‏‎‏‎‎‏‏‏‎‎Listen‎‏‎‎‏‎"</string>
     <string name="action_translate" msgid="8028378961867277746">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‎‏‎‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‎‎‏‎‏‎‎‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎‎‏‎‎Translate‎‏‎‎‏‎"</string>
     <string name="action_search" msgid="6269564710943755464">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‏‎‎‎‏‏‎‎‏‏‎‎‏‎‎‎‎Lens‎‏‎‎‏‎"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‎‏‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎Translate or listen to text on screen‎‏‎‎‏‎"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‏‎‏‎‏‎‎‎‎‏‎‎‎‏‏‎‏‎‏‎‏‏‏‎‎‎‏‎‎‎‎‏‎‏‎‏‎‏‎‏‎‎‏‎Information such as text on your screen, web addresses, and screenshots may be shared with Google.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To change what information you share, go to ‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎Settings &gt; Apps &gt; Default apps &gt; Digital assistant app‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎.‎‏‎‎‏‎"</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‏‎‎‏‏‏‏‏‎‎‎‏‏‏‎‎‎‎‏‎‏‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‏‎CANCEL‎‏‎‎‏‎"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‏‏‎‎‏‏‏‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‏‏‏‎‏‏‎‎‏‎‎‏‎‏‎‏‏‎‏‎‎GOT IT‎‏‎‎‏‎"</string>
 </resources>
diff --git a/go/quickstep/res/values-es-rUS/strings.xml b/go/quickstep/res/values-es-rUS/strings.xml
index e6946d7eee..475366282c 100644
--- a/go/quickstep/res/values-es-rUS/strings.xml
+++ b/go/quickstep/res/values-es-rUS/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Escuchar"</string>
     <string name="action_translate" msgid="8028378961867277746">"Traducir"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Traduce o escucha el texto que aparece en la pantalla"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Es posible que se comparta información con Google, como el texto de la pantalla, direcciones web y capturas de pantalla.\n\nPara cambiar la información que se comparte, ve a "<b>"Configuración &gt; Apps &gt; Apps predeterminadas &gt; App de asistente digital"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"CANCELAR"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ENTENDIDO"</string>
 </resources>
diff --git a/go/quickstep/res/values-es/strings.xml b/go/quickstep/res/values-es/strings.xml
index 845e34b840..fe227d46e0 100644
--- a/go/quickstep/res/values-es/strings.xml
+++ b/go/quickstep/res/values-es/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Escuchar"</string>
     <string name="action_translate" msgid="8028378961867277746">"Traducir"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Traduce o escucha texto que haya en pantalla"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Se puede compartir con Google cierta información, como el texto que aparece en pantalla, direcciones web o capturas de pantalla.\n\nPara cambiar la información que compartes, ve a "<b>"Ajustes &gt; Aplicaciones &gt; Aplicaciones predeterminadas &gt; Asistente digital"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"CANCELAR"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ENTENDIDO"</string>
 </resources>
diff --git a/go/quickstep/res/values-et/strings.xml b/go/quickstep/res/values-et/strings.xml
index 5d3c42753a..40f9f15f77 100644
--- a/go/quickstep/res/values-et/strings.xml
+++ b/go/quickstep/res/values-et/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Kuula"</string>
     <string name="action_translate" msgid="8028378961867277746">"Tõlge"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Ekraanil oleva teksti tõlkimine või kuulamine"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Teavet, nagu teie ekraanil olev tekst, veebiaadressid ja ekraanipildid, võidakse jagada Google\'iga.\n\nKui soovite muuta, millist teavet jagate, avage "<b>"Seaded &gt; Rakendused &gt; Vaikerakendused &gt; Digitaalse assistendi rakendus"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"LOOBU"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"SELGE"</string>
 </resources>
diff --git a/go/quickstep/res/values-eu/strings.xml b/go/quickstep/res/values-eu/strings.xml
index 2b89057fe4..8a71fd91b6 100644
--- a/go/quickstep/res/values-eu/strings.xml
+++ b/go/quickstep/res/values-eu/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Entzun"</string>
     <string name="action_translate" msgid="8028378961867277746">"Itzuli"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Itzuli edo entzun pantailako testua"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Agian pantailako testua, web-helbideak, pantaila-argazkiak eta antzeko informazioa partekatuko duzu Google-rekin.\n\nPartekatzen duzun informazioa aldatzeko, joan hona: "<b>"Ezarpenak &gt; Aplikazioak &gt; Aplikazio lehenetsiak &gt; Laguntzaile digitalaren aplikazioa"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"UTZI"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ADOS"</string>
 </resources>
diff --git a/go/quickstep/res/values-fa/strings.xml b/go/quickstep/res/values-fa/strings.xml
index 491b32fb11..d07c57eaa3 100644
--- a/go/quickstep/res/values-fa/strings.xml
+++ b/go/quickstep/res/values-fa/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"گوش دادن"</string>
     <string name="action_translate" msgid="8028378961867277746">"ترجمه"</string>
     <string name="action_search" msgid="6269564710943755464">"لنز"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"ترجمه نوشتار روی صفحه‌نمایش یا گوش دادن به آن"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"‏ممکن است اطلاعاتی مثل نوشتار روی صفحه‌نمایش، نشانی‌های وب، و نماگرفت‌ها با Google هم‌رسانی شود.\n\nبرای تغییر اطلاعاتی که هم‌رسانی می‌کنید، به "<b>"تنظیمات &lt; برنامه‌ها &lt; برنامه‌های پیش‌فرض &lt; برنامه دستیار دیجیتال"</b>" بروید."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"لغو"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"متوجه شدم"</string>
 </resources>
diff --git a/go/quickstep/res/values-fi/strings.xml b/go/quickstep/res/values-fi/strings.xml
index 29f71d8fe7..f7b8d785f8 100644
--- a/go/quickstep/res/values-fi/strings.xml
+++ b/go/quickstep/res/values-fi/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Kuuntele"</string>
     <string name="action_translate" msgid="8028378961867277746">"Käännä"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Käännä tai kuuntele näytöllä oleva teksti"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Googlelle saatetaan jakaa näytöllä olevaa tekstiä, verkko-osoitteita, kuvakaappauksia ja muita tietoja.\n\nVoit valita jaettavat tiedot valitsemalla "<b>"Asetukset &gt; Sovellukset &gt; Oletussovellukset &gt; Digiavustajasovellus"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"PERU"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"SELVÄ"</string>
 </resources>
diff --git a/go/quickstep/res/values-fr-rCA/strings.xml b/go/quickstep/res/values-fr-rCA/strings.xml
index 158bdd05f2..2b1c5141d5 100644
--- a/go/quickstep/res/values-fr-rCA/strings.xml
+++ b/go/quickstep/res/values-fr-rCA/strings.xml
@@ -5,4 +5,12 @@
     <string name="action_listen" msgid="2370304050784689486">"Écouter"</string>
     <string name="action_translate" msgid="8028378961867277746">"Traduire"</string>
     <string name="action_search" msgid="6269564710943755464">"Lentille"</string>
+    <!-- no translation found for niu_actions_confirmation_title (3863451714863526143) -->
+    <skip />
+    <!-- no translation found for niu_actions_confirmation_text (2105271481950866089) -->
+    <skip />
+    <!-- no translation found for niu_actions_confirmation_no (6641104944008154587) -->
+    <skip />
+    <!-- no translation found for niu_actions_confirmation_yes (3817302060585371994) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-fr/strings.xml b/go/quickstep/res/values-fr/strings.xml
index 7f48fdf0f5..88160323f0 100644
--- a/go/quickstep/res/values-fr/strings.xml
+++ b/go/quickstep/res/values-fr/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Écouter"</string>
     <string name="action_translate" msgid="8028378961867277746">"Traduire"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Traduire ou écouter le texte à l\'écran"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Des informations comme le texte sur votre écran, des adresses Web et des captures d\'écran peuvent être partagées avec Google.\n\nPour modifier les types d\'informations que vous partagez, accédez à "<b>"Paramètres &gt; Applis &gt; Applis par défaut &gt; Appli d\'assistant numérique"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ANNULER"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
 </resources>
diff --git a/go/quickstep/res/values-gl/strings.xml b/go/quickstep/res/values-gl/strings.xml
index 9ffaef716d..6946cde504 100644
--- a/go/quickstep/res/values-gl/strings.xml
+++ b/go/quickstep/res/values-gl/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Escoitar"</string>
     <string name="action_translate" msgid="8028378961867277746">"Traducir"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Traducir ou escoitar o texto que aparece na pantalla"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"É posible que se comparta con Google información como o texto que aparece na pantalla, os enderezos web e as capturas de pantalla.\n\nPara cambiar os datos que se comparten, vai a "<b>"Configuración &gt; Aplicacións &gt; Aplicacións predeterminadas &gt; Aplicación de asistente dixital"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"CANCELAR"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ENTENDIDO"</string>
 </resources>
diff --git a/go/quickstep/res/values-gu/strings.xml b/go/quickstep/res/values-gu/strings.xml
index b0244751bb..d3357a32b0 100644
--- a/go/quickstep/res/values-gu/strings.xml
+++ b/go/quickstep/res/values-gu/strings.xml
@@ -5,4 +5,12 @@
     <string name="action_listen" msgid="2370304050784689486">"સાંભળો"</string>
     <string name="action_translate" msgid="8028378961867277746">"અનુવાદ કરો"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for niu_actions_confirmation_title (3863451714863526143) -->
+    <skip />
+    <!-- no translation found for niu_actions_confirmation_text (2105271481950866089) -->
+    <skip />
+    <!-- no translation found for niu_actions_confirmation_no (6641104944008154587) -->
+    <skip />
+    <!-- no translation found for niu_actions_confirmation_yes (3817302060585371994) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-hi/strings.xml b/go/quickstep/res/values-hi/strings.xml
index 5238d406ee..0e51169e10 100644
--- a/go/quickstep/res/values-hi/strings.xml
+++ b/go/quickstep/res/values-hi/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"सुनें"</string>
     <string name="action_translate" msgid="8028378961867277746">"अनुवाद करें"</string>
     <string name="action_search" msgid="6269564710943755464">"Google Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"स्क्रीन पर मौजूद टेक्स्ट का अनुवाद पाएं या उसे सुनें"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"आपकी स्क्रीन पर मौजूद टेक्स्ट, वेब पते, और स्क्रीनशॉट जैसी जानकारी को Google के साथ शेयर की जा सकती है.\n\nआप Google के साथ किस जानकारी को शेयर करते हैं, इसे कंट्रोल करने के लिए "<b>"सेटिंग &gt; ऐप्लिकेशन &gt; डिफ़ॉल्ट ऐप्लिकेशन &gt; डिजिटल असिस्टेंट ऐप्लिकेशन"</b>" पर जाएं."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"रद्द करें"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ठीक है"</string>
 </resources>
diff --git a/go/quickstep/res/values-hr/strings.xml b/go/quickstep/res/values-hr/strings.xml
index e22034257b..b8f94c62ce 100644
--- a/go/quickstep/res/values-hr/strings.xml
+++ b/go/quickstep/res/values-hr/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Slušajte"</string>
     <string name="action_translate" msgid="8028378961867277746">"Prevedi"</string>
     <string name="action_search" msgid="6269564710943755464">"Objektiv"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Prevedite ili slušajte tekst na zaslonu"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informacije kao što su tekst na vašem zaslonu, web-adrese i snimke zaslona mogu se dijeliti s Googleom.\n\nDa biste promijenili informacije koje dijelite, otvorite "<b>"Postavke &gt; Aplikacije &gt; Zadane aplikacije &gt; Aplikacija digitalnog asistenta"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ODUSTANI"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"SHVAĆAM"</string>
 </resources>
diff --git a/go/quickstep/res/values-hu/strings.xml b/go/quickstep/res/values-hu/strings.xml
index c6fb51e574..bb2127c7e5 100644
--- a/go/quickstep/res/values-hu/strings.xml
+++ b/go/quickstep/res/values-hu/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Lejátszás"</string>
     <string name="action_translate" msgid="8028378961867277746">"Fordítás"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Képernyőn megjelenő szöveg fordítása és hallgatása"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Előfordulhat, hogy a rendszer megoszt bizonyos adatokat (például képernyőn megjelenő szöveget, internetcímeket és képernyőképeket) a Google-lal.\n\nHa módosítani szeretné, hogy milyen adatokat oszt meg, lépjen a "<b>"Beállítások és alkalmazások; Alapértelmezett alkalmazások; Digitális asszisztens app"</b>" menüpontra."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"MÉGSE"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ÉRTEM"</string>
 </resources>
diff --git a/go/quickstep/res/values-hy/strings.xml b/go/quickstep/res/values-hy/strings.xml
index f5bb44de80..6ea56014ae 100644
--- a/go/quickstep/res/values-hy/strings.xml
+++ b/go/quickstep/res/values-hy/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Լսել"</string>
     <string name="action_translate" msgid="8028378961867277746">"Թարգմանել"</string>
     <string name="action_search" msgid="6269564710943755464">"Տեսապակի"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Էկրանի տեքստի թարգմանություն կամ ունկնդրում"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Որոշակի տեղեկություններ (օր․՝ էկրանի տեքստը, վեբ հասցեները և սքրինշոթները) կարող են ուղարկվել Google-ին։\n\nՏեղեկությունները, որոնցով դուք կիսվում եք, կարող եք փոխել՝ անցնելով "<b>"Կարգավորումներ &gt; Հավելվածներ &gt; Կանխադրված հավելվածներ &gt; Թվային օգնականի հավելված"</b>"։"</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ՉԵՂԱՐԿԵԼ"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ԵՂԱՎ"</string>
 </resources>
diff --git a/go/quickstep/res/values-in/strings.xml b/go/quickstep/res/values-in/strings.xml
index ddadb35543..e84494493e 100644
--- a/go/quickstep/res/values-in/strings.xml
+++ b/go/quickstep/res/values-in/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Dengarkan"</string>
     <string name="action_translate" msgid="8028378961867277746">"Terjemahkan"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Terjemahkan atau dengarkan teks di layar"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informasi seperti teks di layar, alamat web, dan screenshot dapat dibagikan ke Google.\n\nUntuk mengubah informasi yang Anda bagikan, buka "<b>"Setelan &gt; Aplikasi &gt; Aplikasi default &gt; Aplikasi asisten digital"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"BATAL"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OKE"</string>
 </resources>
diff --git a/go/quickstep/res/values-is/strings.xml b/go/quickstep/res/values-is/strings.xml
index 2231cc56f6..1b74853b91 100644
--- a/go/quickstep/res/values-is/strings.xml
+++ b/go/quickstep/res/values-is/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Hlusta"</string>
     <string name="action_translate" msgid="8028378961867277746">"Þýða"</string>
     <string name="action_search" msgid="6269564710943755464">"Linsa"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Þýða eða hlusta á texta á skjánum"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Mögulegt er að upplýsingum á borð við texta á skjánum, vefslóðum og skjámyndum verði deilt með Google.\n\nTil að breyta því hvaða upplýsingum þú deilir skaltu opna "<b>"Stillingar &gt; Forrit &gt; Sjálfgefin forrit &gt; Forrit stafræns hjálpara"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"HÆTTA VIÐ"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ÉG SKIL"</string>
 </resources>
diff --git a/go/quickstep/res/values-it/strings.xml b/go/quickstep/res/values-it/strings.xml
index 485dcd6160..8a475607d4 100644
--- a/go/quickstep/res/values-it/strings.xml
+++ b/go/quickstep/res/values-it/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Ascolta"</string>
     <string name="action_translate" msgid="8028378961867277746">"Traduttore"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Traduci o ascolta il testo sullo schermo"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Alcune informazioni, come il testo sullo schermo, gli indirizzi web e gli screenshot, potrebbero essere condivise con Google.\n\nPer modificare quali informazioni condividere, vai a "<b>"Impostazioni &gt; App &gt; App predefinite &gt; App assistente digitale"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ANNULLA"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
 </resources>
diff --git a/go/quickstep/res/values-iw/strings.xml b/go/quickstep/res/values-iw/strings.xml
index d70d57a919..e3da0e7b34 100644
--- a/go/quickstep/res/values-iw/strings.xml
+++ b/go/quickstep/res/values-iw/strings.xml
@@ -5,4 +5,12 @@
     <string name="action_listen" msgid="2370304050784689486">"האזנה"</string>
     <string name="action_translate" msgid="8028378961867277746">"תרגום"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for niu_actions_confirmation_title (3863451714863526143) -->
+    <skip />
+    <!-- no translation found for niu_actions_confirmation_text (2105271481950866089) -->
+    <skip />
+    <!-- no translation found for niu_actions_confirmation_no (6641104944008154587) -->
+    <skip />
+    <!-- no translation found for niu_actions_confirmation_yes (3817302060585371994) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-ja/strings.xml b/go/quickstep/res/values-ja/strings.xml
index f8cbbab7aa..06066027dc 100644
--- a/go/quickstep/res/values-ja/strings.xml
+++ b/go/quickstep/res/values-ja/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"聴く"</string>
     <string name="action_translate" msgid="8028378961867277746">"翻訳"</string>
     <string name="action_search" msgid="6269564710943755464">"レンズ"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"画面上のテキストを翻訳または聞く"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"画面上のテキスト、ウェブアドレス、スクリーンショットなどの情報が Google と共有される場合があります。\n\n共有される情報を変更するには、"<b>"[設定] &gt; [アプリ] &gt; [デフォルトのアプリ] &gt; [デジタル アシスタント アプリ]"</b>" に移動してください。"</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"キャンセル"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
 </resources>
diff --git a/go/quickstep/res/values-ka/strings.xml b/go/quickstep/res/values-ka/strings.xml
index b430c88488..4747e036c3 100644
--- a/go/quickstep/res/values-ka/strings.xml
+++ b/go/quickstep/res/values-ka/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"მოსმენა"</string>
     <string name="action_translate" msgid="8028378961867277746">"თარგმნა"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"თარგმნეთ ან მოისმინეთ ეკრანზე ნაჩვენები ტექსტი"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"ისეთი ინფორმაცია, როგორიც არის ტექსტი თქვენს ეკრანზე, ვებ-მისამართები და ეკრანის ანაბეჭდები შეიძლება გაზიარდეს Google-თან.\n\nთუ გსურთ, შეცვალოთ, რა ინფორმაციას აზიარებთ, გადადით: "<b>"პარამეტრები &gt; აპები &gt; ნაგულისხმევი აპები &gt; ციფრული ასისტენტის აპი"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"გაუქმება"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"გასაგებია"</string>
 </resources>
diff --git a/go/quickstep/res/values-kk/strings.xml b/go/quickstep/res/values-kk/strings.xml
index c897dd84e6..d3f7e0cdf8 100644
--- a/go/quickstep/res/values-kk/strings.xml
+++ b/go/quickstep/res/values-kk/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Тыңдау"</string>
     <string name="action_translate" msgid="8028378961867277746">"Аудару"</string>
     <string name="action_search" msgid="6269564710943755464">"Объектив"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Экрандағы мәтінді аудару немесе тыңдау"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Экрандағы мәтін, веб-мекенжайлар мен скриншоттар сияқты ақпарат Google-мен бөлісілуі мүмкін.\n\nБөлісілетін ақпаратты өзгерту үшін "<b>"Параметрлер &gt; Қолданбалар &gt; Әдепкі қолданбалар &gt; Цифрлық көмекші қолданбасы"</b>" тармағына өтіңіз."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"БАС ТАРТУ"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ТҮСІНДІМ"</string>
 </resources>
diff --git a/go/quickstep/res/values-km/strings.xml b/go/quickstep/res/values-km/strings.xml
index 822ca781f9..09d4a84a75 100644
--- a/go/quickstep/res/values-km/strings.xml
+++ b/go/quickstep/res/values-km/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"ស្តាប់"</string>
     <string name="action_translate" msgid="8028378961867277746">"បកប្រែ"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"បកប្រែ ឬស្ដាប់អត្ថបទ​នៅលើអេក្រង់"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"ព័ត៌មានដូចជា អត្ថបទនៅលើ​អេក្រង់របស់អ្នក អាសយដ្ឋានទំព័រ និងរូបថតអេក្រង់​​អាចនឹងត្រូវបានចែក​រំលែកជាមួយ Google។\n\nដើម្បីប្ដូរព័ត៌មាន​ដែលអ្នកចែករំលែក សូមចូលទៅកាន់"<b>"ការកំណត់ &gt; កម្មវិធី &gt; កម្មវិធីលំនាំដើម &gt; កម្មវិធីជំនួយការឌីជីថល"</b>"។"</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"បោះបង់"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"យល់ហើយ"</string>
 </resources>
diff --git a/go/quickstep/res/values-kn/strings.xml b/go/quickstep/res/values-kn/strings.xml
index 77668d62e3..4f1c9cd72e 100644
--- a/go/quickstep/res/values-kn/strings.xml
+++ b/go/quickstep/res/values-kn/strings.xml
@@ -5,4 +5,12 @@
     <string name="action_listen" msgid="2370304050784689486">"ಆಲಿಸಿ"</string>
     <string name="action_translate" msgid="8028378961867277746">"ಅನುವಾದಿಸಿ"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for niu_actions_confirmation_title (3863451714863526143) -->
+    <skip />
+    <!-- no translation found for niu_actions_confirmation_text (2105271481950866089) -->
+    <skip />
+    <!-- no translation found for niu_actions_confirmation_no (6641104944008154587) -->
+    <skip />
+    <!-- no translation found for niu_actions_confirmation_yes (3817302060585371994) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-ko/strings.xml b/go/quickstep/res/values-ko/strings.xml
index 991df2a7ba..506a802fc4 100644
--- a/go/quickstep/res/values-ko/strings.xml
+++ b/go/quickstep/res/values-ko/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"듣기"</string>
     <string name="action_translate" msgid="8028378961867277746">"번역"</string>
     <string name="action_search" msgid="6269564710943755464">"렌즈"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"화면의 텍스트 번역 또는 듣기"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"화면의 텍스트, 웹 주소, 스크린샷과 같은 정보가 Google과 공유될 수 있습니다.\n\n공유되는 정보를 변경하려면 "<b>"설정 &gt; 앱 &gt; 기본 앱 &gt; 디지털 어시스턴트 앱"</b>"으로 이동하세요."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"취소"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"확인"</string>
 </resources>
diff --git a/go/quickstep/res/values-ky/strings.xml b/go/quickstep/res/values-ky/strings.xml
index e0baff3b01..b0d5c50318 100644
--- a/go/quickstep/res/values-ky/strings.xml
+++ b/go/quickstep/res/values-ky/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Угуу"</string>
     <string name="action_translate" msgid="8028378961867277746">"Которуу"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Экрандагы текстти которуу же угуу"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Экрандагы текст, веб-даректер жана скриншоттор сыяктуу маалымат Google менен бөлүшүлүшү мүмкүн.\n\nБөлүшүлгөн маалыматты өзгөртүү үчүн"<b>"Жөндөөлөр &gt; Колдонмолор &gt; Демейки колдонмолор &gt; Санариптик жардамчы колдонмосуна өтүңүз"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ЖОККО ЧЫГАРУУ"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ТҮШҮНДҮМ"</string>
 </resources>
diff --git a/go/quickstep/res/values-lo/strings.xml b/go/quickstep/res/values-lo/strings.xml
index 720fddb8f4..c391fee459 100644
--- a/go/quickstep/res/values-lo/strings.xml
+++ b/go/quickstep/res/values-lo/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"ຟັງ"</string>
     <string name="action_translate" msgid="8028378961867277746">"ແປພາສາ"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"ແປພາສາ ຫຼື ຟັງຂໍ້ຄວາມຢູ່ໜ້າຈໍ"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"ຂໍ້ມູນ ເຊັ່ນ: ຂໍ້ຄວາມຢູ່ໜ້າຈໍຂອງທ່ານ, ທີ່ຢູ່ເວັບ ແລະ ຮູບໜ້າຈໍອາດຖືກແບ່ງປັນໃຫ້ກັບ Google.\n\nເພື່ອປ່ຽນແປງຂໍ້ມູນທີ່ທ່ານແບ່ງປັນ, ໃຫ້ເຂົ້າໄປ "<b>"ການຕັ້ງຄ່າ &gt; ແອັບ &gt; ແອັບເລີ່ມຕົ້ນ &gt; ແອັບຜູ້ຊ່ວຍດິຈິຕອນ"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ຍົກເລີກ"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ເຂົ້າໃຈແລ້ວ"</string>
 </resources>
diff --git a/go/quickstep/res/values-lt/strings.xml b/go/quickstep/res/values-lt/strings.xml
index 2b1255c477..11f471c511 100644
--- a/go/quickstep/res/values-lt/strings.xml
+++ b/go/quickstep/res/values-lt/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Klausyti"</string>
     <string name="action_translate" msgid="8028378961867277746">"Išversti"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Ekrane esančio teksto vertimas arba klausymas"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Tam tikra informacija, pvz., ekrane esantis tekstas, žiniatinklio adresai ir ekrano kopijos, gali būti bendrinama su „Google“.\n\nJei norite pakeisti, kokia informacija gali būti bendrinama, eikite į "<b>"„Nustatymai“ &gt; „Programos“ &gt; „Numatytosios programos“ &gt; „Skaitmeninio pagelbiklio programa“"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ATŠAUKTI"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"SUPRATAU"</string>
 </resources>
diff --git a/go/quickstep/res/values-lv/strings.xml b/go/quickstep/res/values-lv/strings.xml
index d6c0a9c8f8..1918cbfb4b 100644
--- a/go/quickstep/res/values-lv/strings.xml
+++ b/go/quickstep/res/values-lv/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Klausīties"</string>
     <string name="action_translate" msgid="8028378961867277746">"Tulkot"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Ekrānā redzamā teksta atskaņošana vai tulkošana"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Ar uzņēmumu Google var tikt kopīgota noteikta informācija, piemēram, ekrānā redzamais teksts, tīmekļa adreses un ekrānuzņēmumi.\n\nLai mainītu kopīgotās informācijas veidu, atveriet sadaļu "<b>"Iestatījumi &gt; Lietotnes &gt; Noklusējuma lietotnes &gt; Digitālā asistenta lietotne"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ATCELT"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"LABI"</string>
 </resources>
diff --git a/go/quickstep/res/values-mk/strings.xml b/go/quickstep/res/values-mk/strings.xml
index 7df0e90e18..fea375348e 100644
--- a/go/quickstep/res/values-mk/strings.xml
+++ b/go/quickstep/res/values-mk/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Слушај"</string>
     <string name="action_translate" msgid="8028378961867277746">"Преведи"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Преведете или слушајте текст на екранот"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Информациите како текст на екранот, интернет-адреси и слики од екранот може да се споделуваат со Google.\n\nЗа да промените кои информации ќе се споделуваат, одете во "<b>"Поставки &gt; Апликации &gt; Стандардни апликации &gt; Апликација за дигитален помошник"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ОТКАЖИ"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"СФАТИВ"</string>
 </resources>
diff --git a/go/quickstep/res/values-ml/strings.xml b/go/quickstep/res/values-ml/strings.xml
index 0887f8b47a..05083d8baa 100644
--- a/go/quickstep/res/values-ml/strings.xml
+++ b/go/quickstep/res/values-ml/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"കേൾക്കുക"</string>
     <string name="action_translate" msgid="8028378961867277746">"വിവർത്തനം ചെയ്യുക"</string>
     <string name="action_search" msgid="6269564710943755464">"ലെൻസ്"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"സ്ക്രീനിലെ ടെക്സ്റ്റ് വിവർത്തനം ചെയ്യുകയോ കേൾക്കുകയോ ചെയ്യുക"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"നിങ്ങളുടെ സ്ക്രീനിലെ ടെക്സ്റ്റ്, വെബ് വിലാസങ്ങൾ, സ്ക്രീൻഷോട്ടുകൾ എന്നിവ പോലുള്ള വിവരങ്ങൾ Google-മായി പങ്കിട്ടേക്കാം.\n\nനിങ്ങൾ പങ്കിടുന്ന വിവരങ്ങൾ മാറ്റാൻ, "<b>"ക്രമീകരണ &gt; ആപ്പുകൾ &gt; ഡിഫോൾട്ട് ആപ്പുകൾ &gt; ഡിജിറ്റൽ അസിസ്‌റ്റന്റ് ആപ്പ്"</b>" എന്നതിലേക്ക് പോകുക."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"റദ്ദാക്കുക"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"മനസ്സിലായി"</string>
 </resources>
diff --git a/go/quickstep/res/values-mn/strings.xml b/go/quickstep/res/values-mn/strings.xml
index 4b0bdc1cfa..0a1dacb507 100644
--- a/go/quickstep/res/values-mn/strings.xml
+++ b/go/quickstep/res/values-mn/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Сонсох"</string>
     <string name="action_translate" msgid="8028378961867277746">"Орчуулах"</string>
     <string name="action_search" msgid="6269564710943755464">"Дуран"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Дэлгэц дээрх текстийг орчуулах эсвэл сонсох"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Таны дэлгэц дээрх текст, веб хаяг, дэлгэцийн агшин зэрэг мэдээллийг Google-тэй хуваалцаж болзошгүй.\n\nТа ямар мэдээлэл хуваалцахаа өөрчлөхийн тулд "<b>"Тохиргоо &gt; Апп &gt; Өгөгдмөл апп &gt; Дижитал туслах апп"</b>" руу очно уу."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ЦУЦЛАХ"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ОЙЛГОЛОО"</string>
 </resources>
diff --git a/go/quickstep/res/values-mr/strings.xml b/go/quickstep/res/values-mr/strings.xml
index e7d26521d7..c51a780e84 100644
--- a/go/quickstep/res/values-mr/strings.xml
+++ b/go/quickstep/res/values-mr/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"ऐका"</string>
     <string name="action_translate" msgid="8028378961867277746">"भाषांतर करा"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"स्क्रीनवरील मजकूर भाषांतरित करा किंवा ऐका"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"तुमच्या स्क्रीनवरील मजकूर, वेब अ‍ॅड्रेस आणि स्क्रीनशॉट यांसारखी माहिती Google सह शेअर केली जाऊ शकते.\n\nतुम्ही कोणती माहिती शेअर करता हे बदलण्यासाठी "<b>"सेटिंग्ज &gt; ॲप्स &gt; डीफॉल्ट ॲप्स &gt; डिजिटल असिस्टंट ॲपवर जा"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"रद्द करा"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"समजले"</string>
 </resources>
diff --git a/go/quickstep/res/values-ms/strings.xml b/go/quickstep/res/values-ms/strings.xml
index 39698e80db..64c6bff927 100644
--- a/go/quickstep/res/values-ms/strings.xml
+++ b/go/quickstep/res/values-ms/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Dengar"</string>
     <string name="action_translate" msgid="8028378961867277746">"Terjemah"</string>
     <string name="action_search" msgid="6269564710943755464">"Kanta"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Terjemahkan atau dengar teks pada skrin"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Maklumat seperti teks pada skrin anda, alamat web dan tangkapan skrin boleh dikongsi dengan Google.\n\nUntuk menukar maklumat yang anda kongsi, pergi ke "<b>"Tetapan &gt; Apl &gt; Apl lalai &gt; Apl pembantu digital"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"BATAL"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
 </resources>
diff --git a/go/quickstep/res/values-my/strings.xml b/go/quickstep/res/values-my/strings.xml
index 27d0e32bc9..eafa50da61 100644
--- a/go/quickstep/res/values-my/strings.xml
+++ b/go/quickstep/res/values-my/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"နားထောင်ရန်"</string>
     <string name="action_translate" msgid="8028378961867277746">"ဘာသာပြန်ရန်"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"ဖန်သားပြင်ပေါ်ရှိ စာသားကို ဘာသာပြန်ပါ (သို့) နားထောင်ပါ"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"သင့်ဖန်သားပြင်ပေါ်ရှိ စာသား၊ ဝဘ်လိပ်စာနှင့် ဖန်သားပြင်ဓာတ်ပုံများကဲ့သို့ အချက်အလက်များကို Google နှင့် မျှဝေနိုင်သည်။\n\nသင်မျှဝေသည့် အချက်အလက်များကို ပြောင်းရန် "<b>"ဆက်တင်များ &gt; အက်ပ်များ &gt; မူရင်းအက်ပ်များ &gt; ဒစ်ဂျစ်တယ် Assistant အက်ပ်"</b>" သို့ သွားပါ။"</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"မလုပ်တော့"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ရပြီ"</string>
 </resources>
diff --git a/go/quickstep/res/values-nb/strings.xml b/go/quickstep/res/values-nb/strings.xml
index 1121816f08..e4cedd6d30 100644
--- a/go/quickstep/res/values-nb/strings.xml
+++ b/go/quickstep/res/values-nb/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Lytt"</string>
     <string name="action_translate" msgid="8028378961867277746">"Oversett"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Oversett eller lytt til tekst på skjermen"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informasjon som tekst på skjermen, nettadresser og skjermdumper kan deles med Google.\n\nFor å endre hvilken informasjon du deler, gå til "<b>"Innstillinger &gt; Apper &gt; Standardapper &gt; Digital assistent-app"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"AVBRYT"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"GREIT"</string>
 </resources>
diff --git a/go/quickstep/res/values-ne/strings.xml b/go/quickstep/res/values-ne/strings.xml
index 5e06bd4107..56ebbf3728 100644
--- a/go/quickstep/res/values-ne/strings.xml
+++ b/go/quickstep/res/values-ne/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"सुन्नुहोस्"</string>
     <string name="action_translate" msgid="8028378961867277746">"अनुवाद गर्नुहोस्"</string>
     <string name="action_search" msgid="6269564710943755464">"लेन्स"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"स्क्रिनमा देखिने पाठ अनुवाद गरियोस् वा पढेर सुनाइयोस्"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"तपाईंको स्क्रिनमा देखिने पाठ, वेब ठेगाना र स्क्रिनसटलगायतका जानकारी Google सँग सेयर गर्न सकिन्छ।\n\nकुन कुन जानकारी सेयर गर्न दिने भन्ने सेटिङ बदल्न "<b>"सेटिङ &gt; एप &gt; डिफल्ट एप &gt; डिजिटल सहायक एप"</b>" मा जानुहोस्।"</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"रद्द गर्नुहोस्"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"बुझेँ"</string>
 </resources>
diff --git a/go/quickstep/res/values-nl/strings.xml b/go/quickstep/res/values-nl/strings.xml
index ff5f16bc26..63a38cb4cd 100644
--- a/go/quickstep/res/values-nl/strings.xml
+++ b/go/quickstep/res/values-nl/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Luisteren"</string>
     <string name="action_translate" msgid="8028378961867277746">"Vertalen"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Tekst op het scherm vertalen of beluisteren"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informatie zoals tekst op je scherm, webadressen en screenshots kan met Google worden gedeeld.\n\nAls je wilt aanpassen welke informatie je deelt, ga je naar "<b>"Instellingen &gt; Apps &gt; Standaard-apps &gt; Digitale-assistent-app"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ANNULEREN"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
 </resources>
diff --git a/go/quickstep/res/values-or/strings.xml b/go/quickstep/res/values-or/strings.xml
index 079d29eea3..06933750c0 100644
--- a/go/quickstep/res/values-or/strings.xml
+++ b/go/quickstep/res/values-or/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"ଶୁଣନ୍ତୁ"</string>
     <string name="action_translate" msgid="8028378961867277746">"ଅନୁବାଦ କରନ୍ତୁ"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"ସ୍କିନରେ ଥିବା ଟେକ୍ସଟକୁ ଅନୁବାଦ କରନ୍ତୁ କିମ୍ବା ଶୁଣନ୍ତୁ"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"ଆପଣଙ୍କ ସ୍କ୍ରିନରେ ଟେକ୍ସଟ୍, ୱେବ୍ ଠିକଣା ଏବଂ ସ୍କ୍ରିନସଟଗୁଡ଼ିକ ପରି ସୂଚନାକୁ Google ସହ ସେୟାର୍ କରାଯାଇପାରେ।\n\nଆପଣ କେଉଁ ସୂଚନା ସେୟାର୍ କରନ୍ତି ତାହା ପରିବର୍ତ୍ତନ କରିବାକୁ, "<b>"ସେଟିଂସ୍ &gt; ଆପ୍ସ &gt; ଡିଫଲ୍ଟ ଆପ୍ସ &gt; ଡିଜିଟାଲ୍ ଆସିଷ୍ଟାଣ୍ଟ ଆପ"</b>"କୁ ଯାଆନ୍ତୁ।"</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ବାତିଲ୍ କରନ୍ତୁ"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ବୁଝିଗଲି"</string>
 </resources>
diff --git a/go/quickstep/res/values-pa/strings.xml b/go/quickstep/res/values-pa/strings.xml
index 2226876656..1854ea7277 100644
--- a/go/quickstep/res/values-pa/strings.xml
+++ b/go/quickstep/res/values-pa/strings.xml
@@ -5,4 +5,12 @@
     <string name="action_listen" msgid="2370304050784689486">"ਸੁਣੋ"</string>
     <string name="action_translate" msgid="8028378961867277746">"ਅਨੁਵਾਦ ਕਰੋ"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for niu_actions_confirmation_title (3863451714863526143) -->
+    <skip />
+    <!-- no translation found for niu_actions_confirmation_text (2105271481950866089) -->
+    <skip />
+    <!-- no translation found for niu_actions_confirmation_no (6641104944008154587) -->
+    <skip />
+    <!-- no translation found for niu_actions_confirmation_yes (3817302060585371994) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-pl/strings.xml b/go/quickstep/res/values-pl/strings.xml
index a9696a6c1d..427ac815c6 100644
--- a/go/quickstep/res/values-pl/strings.xml
+++ b/go/quickstep/res/values-pl/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Posłuchaj"</string>
     <string name="action_translate" msgid="8028378961867277746">"Przetłumacz"</string>
     <string name="action_search" msgid="6269564710943755464">"Obiektyw"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Przetłumacz lub odsłuchaj tekst na ekranie"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informacje takie jak tekst na ekranie, adresy internetowe i zrzuty ekranu mogą być udostępniane Google.\n\nAby zmienić zakres udostępnianych informacji, kliknij "<b>"Ustawienia &gt; Aplikacje &gt; Aplikacje domyślne &gt; Asystent cyfrowy"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ANULUJ"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
 </resources>
diff --git a/go/quickstep/res/values-pt-rPT/strings.xml b/go/quickstep/res/values-pt-rPT/strings.xml
index ada33f349c..2bf8d143a0 100644
--- a/go/quickstep/res/values-pt-rPT/strings.xml
+++ b/go/quickstep/res/values-pt-rPT/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Ouvir"</string>
     <string name="action_translate" msgid="8028378961867277746">"Traduzir"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Traduza ou ouça o texto no ecrã"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informações como o texto no ecrã, endereços Web e capturas de ecrã podem ser partilhadas com a Google.\n\nPara alterar as informações que partilha, aceda a "<b>"Definições &gt; Apps &gt; App predefinidas &gt; App de assistente digital"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"CANCELAR"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
 </resources>
diff --git a/go/quickstep/res/values-pt/strings.xml b/go/quickstep/res/values-pt/strings.xml
index 6be221900d..ade09b43bf 100644
--- a/go/quickstep/res/values-pt/strings.xml
+++ b/go/quickstep/res/values-pt/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Ouvir"</string>
     <string name="action_translate" msgid="8028378961867277746">"Traduzir"</string>
     <string name="action_search" msgid="6269564710943755464">"Google Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Traduzir ou ouvir o texto na tela"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informações como o texto exibido, endereços da Web e capturas de tela poderão ser compartilhadas com o Google.\n\nPara mudar quais dados são compartilhados, acesse "<b>"Configurações &gt; Apps &gt; Apps padrão &gt; App assistente digital"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"CANCELAR"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
 </resources>
diff --git a/go/quickstep/res/values-ro/strings.xml b/go/quickstep/res/values-ro/strings.xml
index 0b6f2e7e98..a09e6d15a7 100644
--- a/go/quickstep/res/values-ro/strings.xml
+++ b/go/quickstep/res/values-ro/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Ascultați"</string>
     <string name="action_translate" msgid="8028378961867277746">"Traduceți"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Traduceți sau ascultați textul de pe ecran"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informații precum textul de pe ecran, adresele web și capturile de ecran pot fi trimise la Google.\n\nCa să schimbați informațiile trimise, accesați "<b>"Setări &gt; Aplicații &gt; Aplicații prestabilite &gt; Aplicația asistent digital"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ANULAȚI"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
 </resources>
diff --git a/go/quickstep/res/values-ru/strings.xml b/go/quickstep/res/values-ru/strings.xml
index d54b39afb1..41440d49ae 100644
--- a/go/quickstep/res/values-ru/strings.xml
+++ b/go/quickstep/res/values-ru/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Слушать"</string>
     <string name="action_translate" msgid="8028378961867277746">"Перевести"</string>
     <string name="action_search" msgid="6269564710943755464">"Объектив"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Перевод или прослушивание текста на экране"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Определенные сведения (например, текст на экране, веб-адреса и скриншоты) могут быть отправлены в Google.\n\nИзменить информацию, которой вы делитесь, можно в меню "<b>"Настройки &gt; Приложения &gt; Приложения по умолчанию &gt; Цифровой помощник"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ОТМЕНА"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ОК"</string>
 </resources>
diff --git a/go/quickstep/res/values-si/strings.xml b/go/quickstep/res/values-si/strings.xml
index 0004387592..85625f5996 100644
--- a/go/quickstep/res/values-si/strings.xml
+++ b/go/quickstep/res/values-si/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"සවන් දෙන්න"</string>
     <string name="action_translate" msgid="8028378961867277746">"පරිවර්තනය කරන්න"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"තිරය මත පෙළ පරිවර්තනය කරන්න හෝ එයට සවන් දෙන්න"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"ඔබගේ තිරයේ ඇති පෙළ, වෙබ් ලිපින සහ තිර රූ වැනි තොරතුරු Google සමඟ බෙදා ගත හැකිය.\n\nඔබ බෙදා ගන්නා තොරතුරු වෙනස් කිරීමට, "<b>"සැකසීම් &gt; යෙදුම් &gt; පෙරනිමි යෙදුම් &gt; ඩිජිටල් සහායක යෙදුම"</b>" වෙත යන්න."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"අවලංගු කරන්න"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"තේරුණා"</string>
 </resources>
diff --git a/go/quickstep/res/values-sk/strings.xml b/go/quickstep/res/values-sk/strings.xml
index f14249220a..cfe8712f52 100644
--- a/go/quickstep/res/values-sk/strings.xml
+++ b/go/quickstep/res/values-sk/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Počúvať"</string>
     <string name="action_translate" msgid="8028378961867277746">"Preložiť"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Prekladajte alebo počúvajte text na obrazovke"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Údaje, napríklad text na obrazovke, webové adresy a snímky obrazovky, môžu byť zdieľané s Googlom.\n\nAk chcete zmeniť, ktoré údaje zdieľate, prejdite do sekcie "<b>"Nastavenia &gt; Aplikácie &gt; Predvolené aplikácie &gt; Digitálny asistent"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ZRUŠIŤ"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"DOBRE"</string>
 </resources>
diff --git a/go/quickstep/res/values-sl/strings.xml b/go/quickstep/res/values-sl/strings.xml
index 1adc3f722b..c7fc10e5d3 100644
--- a/go/quickstep/res/values-sl/strings.xml
+++ b/go/quickstep/res/values-sl/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Poslušanje"</string>
     <string name="action_translate" msgid="8028378961867277746">"Prevedi"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Prevod ali poslušanje besedila na zaslonu"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Podatki, kot so besedilo na zaslonu, spletni naslovi in posnetki zaslonov, bodo morda deljeni z Googlom.\n\nČe želite spremeniti, katere podatke delite, odprite "<b>"Nastavitve &gt; Aplikacije &gt; Privzete aplikacije &gt; Digitalni pomočnik"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"PREKLIČI"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"RAZUMEM"</string>
 </resources>
diff --git a/go/quickstep/res/values-sq/strings.xml b/go/quickstep/res/values-sq/strings.xml
index 56b6ec6c62..d522136daf 100644
--- a/go/quickstep/res/values-sq/strings.xml
+++ b/go/quickstep/res/values-sq/strings.xml
@@ -5,4 +5,12 @@
     <string name="action_listen" msgid="2370304050784689486">"Dëgjo"</string>
     <string name="action_translate" msgid="8028378961867277746">"Përkthe"</string>
     <string name="action_search" msgid="6269564710943755464">"Lentja"</string>
+    <!-- no translation found for niu_actions_confirmation_title (3863451714863526143) -->
+    <skip />
+    <!-- no translation found for niu_actions_confirmation_text (2105271481950866089) -->
+    <skip />
+    <!-- no translation found for niu_actions_confirmation_no (6641104944008154587) -->
+    <skip />
+    <!-- no translation found for niu_actions_confirmation_yes (3817302060585371994) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-sr/strings.xml b/go/quickstep/res/values-sr/strings.xml
index b9dae390c6..e98e9d63af 100644
--- a/go/quickstep/res/values-sr/strings.xml
+++ b/go/quickstep/res/values-sr/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Пусти"</string>
     <string name="action_translate" msgid="8028378961867277746">"Преведи"</string>
     <string name="action_search" msgid="6269564710943755464">"Објектив"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Преводите или слушајте текст на екрану"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Информације попут текста на екрану, веб-адреса и снимака екрана могу да се деле са Google-ом.\n\nДа бисте променили информације које делите, идите у "<b>"Подешавања &gt; Апликације &gt; Подразумеване апликације &gt; Апликација дигиталног помоћника"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ОТКАЖИ"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ВАЖИ"</string>
 </resources>
diff --git a/go/quickstep/res/values-sv/strings.xml b/go/quickstep/res/values-sv/strings.xml
index e50dcbea52..8745afdbfd 100644
--- a/go/quickstep/res/values-sv/strings.xml
+++ b/go/quickstep/res/values-sv/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Lyssna"</string>
     <string name="action_translate" msgid="8028378961867277746">"Översätt"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Översätt eller lyssna på texten på skärmen"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Information som text på skärmen, webbadresser och skärmbilder kan delas med Google.\n\nFör att ändra vilken information du delar öppnar du "<b>"Inställningar &gt; Appar &gt; Standardappar &gt; Digital assistentapp"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"AVBRYT"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
 </resources>
diff --git a/go/quickstep/res/values-sw/strings.xml b/go/quickstep/res/values-sw/strings.xml
index 4deb7533f7..826d6e5455 100644
--- a/go/quickstep/res/values-sw/strings.xml
+++ b/go/quickstep/res/values-sw/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Sikiliza"</string>
     <string name="action_translate" msgid="8028378961867277746">"Tafsiri"</string>
     <string name="action_search" msgid="6269564710943755464">"Lenzi"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Tafsiri au usikilize maandishi kwenye skrini"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Maelezo kama vile maandishi kwenye skrini yako, anwani za wavuti na picha za skrini yanaweza kushirikiwa na Google.\n\nIli ubadilishe maelezo unayoshiriki, nenda kwenye "<b>"Mipangilio &gt; Programu &gt; Programu chaguomsingi &gt; Programu ya mratibu dijitali"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"GHAIRI"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"NIMEELEWA"</string>
 </resources>
diff --git a/go/quickstep/res/values-ta/strings.xml b/go/quickstep/res/values-ta/strings.xml
index fd445cd1fb..ad2e1305b9 100644
--- a/go/quickstep/res/values-ta/strings.xml
+++ b/go/quickstep/res/values-ta/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"கேளுங்கள்"</string>
     <string name="action_translate" msgid="8028378961867277746">"மொழிபெயர்"</string>
     <string name="action_search" msgid="6269564710943755464">"லென்ஸ்"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"திரையிலுள்ள உரையை மொழிபெயருங்கள் அல்லது கேளுங்கள்"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"உங்கள் திரையிலுள்ள உரை, வலை முகவரிகள், ஸ்கிரீன்ஷாட்டுகள் போன்ற தகவல்கள் Googleளுடன் பகிரப்படலாம்.\n\nஎந்தத் தகவல்கள் பகிரப்படலாம் என்பதை மாற்ற, "<b>"அமைப்புகள் &gt; ஆப்ஸ் &gt; இயல்பு ஆப்ஸ் &gt; டிஜிட்டல் அசிஸ்டண்ட் ஆப்ஸ்"</b>" என்பதற்குச் செல்லுங்கள்."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ரத்துசெய்"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"சரி"</string>
 </resources>
diff --git a/go/quickstep/res/values-te/strings.xml b/go/quickstep/res/values-te/strings.xml
index 2fb3b596f0..1736c7f086 100644
--- a/go/quickstep/res/values-te/strings.xml
+++ b/go/quickstep/res/values-te/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"వినండి"</string>
     <string name="action_translate" msgid="8028378961867277746">"అనువదించండి"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"స్క్రీన్‌పై టెక్స్ట్ అనువదించండి లేదా వినండి"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"మీ స్క్రీన్‌పై టెక్స్ట్, వెబ్ అడ్రస్‌లు, అలాగే స్క్రీన్‌షాట్‌ల వంటి సమాచారం Googleతో షేర్ చేయడం జరగవచ్చు.\n\nమీరు ఏ సమాచారాన్ని షేర్ చేసుకుంటారో మార్చడానికి "<b>"సెట్టింగ్‌లు &gt; యాప్‌లు &gt; ఆటోమేటిక్ సెట్టింగ్ యాప్‌లు &gt; డిజిటల్ అసిస్టెంట్ యాప్‌ల"</b>"‌కు వెళ్లండి."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"రద్దు చేయి"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"అర్థమైంది"</string>
 </resources>
diff --git a/go/quickstep/res/values-th/strings.xml b/go/quickstep/res/values-th/strings.xml
index bcd56d0744..ea89d88c9c 100644
--- a/go/quickstep/res/values-th/strings.xml
+++ b/go/quickstep/res/values-th/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"ฟัง"</string>
     <string name="action_translate" msgid="8028378961867277746">"แปลภาษา"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"แปลหรือฟังข้อความบนหน้าจอ"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"อาจมีการแชร์ข้อมูลอย่างเช่น ข้อความบนหน้าจอ ที่อยู่เว็บ และภาพหน้าจอกับ Google\n\nหากต้องการเปลี่ยนประเภทข้อมูลที่คุณแชร์ ให้ไปที่"<b>"การตั้งค่า &gt; แอป &gt; แอปเริ่มต้น &gt; แอปผู้ช่วยดิจิทัล"</b></string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ยกเลิก"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"รับทราบ"</string>
 </resources>
diff --git a/go/quickstep/res/values-tl/strings.xml b/go/quickstep/res/values-tl/strings.xml
index 0b6f74ab10..3502363726 100644
--- a/go/quickstep/res/values-tl/strings.xml
+++ b/go/quickstep/res/values-tl/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Makinig"</string>
     <string name="action_translate" msgid="8028378961867277746">"Isalin"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"I-translate o pakinggan ang text sa screen"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Posibleng ibahagi sa Google ang impormasyong gaya ng text sa iyong screen, mga web address, at screenshot.\n\nPara baguhin kung anong impormasyon ang ibinabahagi mo, pumunta sa "<b>"Mga Setting &gt; Mga App &gt; Mga default na app &gt; Digital assistant app"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"KANSELAHIN"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
 </resources>
diff --git a/go/quickstep/res/values-tr/strings.xml b/go/quickstep/res/values-tr/strings.xml
index 20a27b3c55..f150cc5f33 100644
--- a/go/quickstep/res/values-tr/strings.xml
+++ b/go/quickstep/res/values-tr/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Dinle"</string>
     <string name="action_translate" msgid="8028378961867277746">"Çevir"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Ekrandaki metni çevirin veya dinleyin"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Ekranınızdaki metin, web adresleri ve ekran görüntüleri gibi bilgiler Google ile paylaşılabilir.\n\nPaylaştığınız bilgileri değiştirmek için "<b>"Ayarlar &gt; Uygulamalar &gt; Varsayılan uygulamalar &gt; Dijital asistan uygulamasına gidin"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"İPTAL"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ANLADIM"</string>
 </resources>
diff --git a/go/quickstep/res/values-uk/strings.xml b/go/quickstep/res/values-uk/strings.xml
index 5041f8b877..d26341b7b3 100644
--- a/go/quickstep/res/values-uk/strings.xml
+++ b/go/quickstep/res/values-uk/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Слухати"</string>
     <string name="action_translate" msgid="8028378961867277746">"Перекласти"</string>
     <string name="action_search" msgid="6269564710943755464">"Об’єктив"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Перекласти або прослухати текст на екрані"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Ви можете надсилати на сервери Google інформацію, наприклад текст на екрані, веб-адреси або знімки екрана.\n\nЩоб змінити типи даних, які надсилаються, відкрийте "<b>"Налаштування &gt; Додатки &gt; Додатки за умовчанням &gt; Цифровий помічник"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"СКАСУВАТИ"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
 </resources>
diff --git a/go/quickstep/res/values-ur/strings.xml b/go/quickstep/res/values-ur/strings.xml
index aeea1f303d..daff43c7c1 100644
--- a/go/quickstep/res/values-ur/strings.xml
+++ b/go/quickstep/res/values-ur/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"سنیں"</string>
     <string name="action_translate" msgid="8028378961867277746">"‏Google ترجمہ"</string>
     <string name="action_search" msgid="6269564710943755464">"‏Google لینز"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"اسکرین پر موجود ٹیکسٹ کو سنیں یا ترجمہ کریں"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"‏آپ کی اسکرین پر ٹیکسٹ، ویب پتے اور اسکرین شاٹس جیسی معلومات کا اشتراک Google کے ساتھ کیا جا سکتا ہے۔\n\nآپ جس معلومات کا اشتراک کرتے ہیں اسے تبدیل کرنے کیلئے "<b>"ترتیبات ‎&gt;‎ ایپس ‎&gt;‎ ڈیفالٹ ایپس ‎&gt;‎ ڈیجیٹل اسسٹنٹ ایپ"</b>" پر جائیں۔"</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"منسوخ کریں"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"سمجھ آ گئی"</string>
 </resources>
diff --git a/go/quickstep/res/values-uz/strings.xml b/go/quickstep/res/values-uz/strings.xml
index bc751484d8..c67d81cd49 100644
--- a/go/quickstep/res/values-uz/strings.xml
+++ b/go/quickstep/res/values-uz/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Tinglash"</string>
     <string name="action_translate" msgid="8028378961867277746">"Tarjima"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Ekrandagi matnni tarjima qilish yoki tinglash"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Ekraningizdagi matn, veb-manzillar va skrinshot kabilar Googlega yuborilishi mumkin.\n\nQanday maʼlumotlarni ulashishni tanlash uchun "<b>"Sozlamalar &gt; Ilovalar &gt; Standart ilovalar &gt; Raqamli assistent"</b>" ilovasini oching."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"BEKOR QILISH"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
 </resources>
diff --git a/go/quickstep/res/values-vi/strings.xml b/go/quickstep/res/values-vi/strings.xml
index 2e1f10a84a..66f6ae782c 100644
--- a/go/quickstep/res/values-vi/strings.xml
+++ b/go/quickstep/res/values-vi/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Nghe"</string>
     <string name="action_translate" msgid="8028378961867277746">"Dịch"</string>
     <string name="action_search" msgid="6269564710943755464">"Ống kính"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Dịch hoặc nghe văn bản trên màn hình"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Những thông tin như văn bản trên màn hình, địa chỉ web và ảnh chụp màn hình có thể được chia sẻ với Google.\n\nĐể thay đổi những thông tin mà bạn chia sẻ, hãy chuyển đến phần "<b>"Cài đặt &gt; Ứng dụng &gt; Ứng dụng mặc định &gt; Ứng dụng trợ lý kỹ thuật số"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"HỦY"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
 </resources>
diff --git a/go/quickstep/res/values-zh-rCN/strings.xml b/go/quickstep/res/values-zh-rCN/strings.xml
index afd12e1525..de598e0879 100644
--- a/go/quickstep/res/values-zh-rCN/strings.xml
+++ b/go/quickstep/res/values-zh-rCN/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"聆听"</string>
     <string name="action_translate" msgid="8028378961867277746">"翻译"</string>
     <string name="action_search" msgid="6269564710943755464">"智能镜头"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"翻译或聆听屏幕上的文字"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"系统可能会将屏幕上的文字、网址和屏幕截图等信息分享给 Google。\n\n如需更改要分享哪些信息，请依次转到"<b>"设置 &gt; 应用 &gt; 默认应用 &gt; 数字助理应用"</b>"。"</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"取消"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"知道了"</string>
 </resources>
diff --git a/go/quickstep/res/values-zh-rHK/strings.xml b/go/quickstep/res/values-zh-rHK/strings.xml
index 6cb3d60bf2..c3a55ac07c 100644
--- a/go/quickstep/res/values-zh-rHK/strings.xml
+++ b/go/quickstep/res/values-zh-rHK/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"聆聽"</string>
     <string name="action_translate" msgid="8028378961867277746">"翻譯"</string>
     <string name="action_search" msgid="6269564710943755464">"智能鏡頭"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"翻譯或聆聽畫面上的文字"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"可能會與 Google 分享螢幕上的文字、網址和螢幕截圖等資料。\n\n如要變更分享的資料，請前往 "<b>"[設定] &gt; [應用程式] &gt; [預設應用程式] &gt; [數碼助理應用程式]"</b>"。"</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"取消"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"知道了"</string>
 </resources>
diff --git a/go/quickstep/res/values-zh-rTW/strings.xml b/go/quickstep/res/values-zh-rTW/strings.xml
index 443f7099e3..98c32b99d8 100644
--- a/go/quickstep/res/values-zh-rTW/strings.xml
+++ b/go/quickstep/res/values-zh-rTW/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"聆聽"</string>
     <string name="action_translate" msgid="8028378961867277746">"翻譯"</string>
     <string name="action_search" msgid="6269564710943755464">"智慧鏡頭"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"翻譯或朗讀畫面上的文字"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"系統可能會將畫面上的文字、網址和螢幕截圖等資訊分享給 Google。\n\n如要變更分享的資訊類型，請前往 [設定] &gt; [應用程式] &gt; [預設應用程式] &gt; [數位助理應用程式]"<b></b>"。"</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"取消"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"我知道了"</string>
 </resources>
diff --git a/go/quickstep/res/values-zu/strings.xml b/go/quickstep/res/values-zu/strings.xml
index 6dd94cb1ac..d8bba48878 100644
--- a/go/quickstep/res/values-zu/strings.xml
+++ b/go/quickstep/res/values-zu/strings.xml
@@ -5,4 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Lalela"</string>
     <string name="action_translate" msgid="8028378961867277746">"Humusha"</string>
     <string name="action_search" msgid="6269564710943755464">"Ilensi"</string>
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Humusha noma ulalele umbhalo osesikrinini"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Imininingwane efana nombhalo esikrinini sakho, amakheli wewebhu, nezithombe-skrini kungabiwa ne-Google.\n\nUkuze ushintshe ukuthi yiluphi ulwazi olwabayo, yiya kokuthi "<b>"Amasethingi &gt; ama-App &gt; Ama-app azenzakalelayo &gt; Umsizi we-app odijithali"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"KHANSELA"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"NGIYITHOLILE"</string>
 </resources>
-- 
GitLab


From 61348486daed0a9b7cda838d4c91a4135d33ada6 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sat, 3 Jul 2021 03:15:45 +0000
Subject: [PATCH 1571/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I980960f4d4167079b3dc2e50591d63f49a56a767
---
 res/values-af/strings.xml        |  3 +--
 res/values-am/strings.xml        |  3 +--
 res/values-ar/strings.xml        |  5 ++---
 res/values-as/strings.xml        |  3 +--
 res/values-az/strings.xml        |  3 +--
 res/values-b+sr+Latn/strings.xml |  3 +--
 res/values-be/strings.xml        |  3 +--
 res/values-bg/strings.xml        |  3 +--
 res/values-bn/strings.xml        | 10 ++++------
 res/values-bs/strings.xml        |  3 +--
 res/values-ca/strings.xml        |  3 +--
 res/values-cs/strings.xml        |  3 +--
 res/values-da/strings.xml        |  3 +--
 res/values-de/strings.xml        |  3 +--
 res/values-el/strings.xml        |  9 ++++-----
 res/values-en-rAU/strings.xml    |  5 ++---
 res/values-en-rCA/strings.xml    |  5 ++---
 res/values-en-rGB/strings.xml    |  5 ++---
 res/values-en-rIN/strings.xml    |  5 ++---
 res/values-es-rUS/strings.xml    |  5 ++---
 res/values-es/strings.xml        |  3 +--
 res/values-et/strings.xml        |  3 +--
 res/values-eu/strings.xml        |  3 +--
 res/values-fa/strings.xml        |  5 ++---
 res/values-fi/strings.xml        |  3 +--
 res/values-fr-rCA/strings.xml    |  3 +--
 res/values-fr/strings.xml        |  3 +--
 res/values-gl/strings.xml        |  3 +--
 res/values-gu/strings.xml        |  2 +-
 res/values-hi/strings.xml        |  3 +--
 res/values-hr/strings.xml        |  3 +--
 res/values-hu/strings.xml        |  9 ++++-----
 res/values-hy/strings.xml        |  3 +--
 res/values-in/strings.xml        |  3 +--
 res/values-is/strings.xml        |  3 +--
 res/values-it/strings.xml        |  3 +--
 res/values-iw/strings.xml        |  3 +--
 res/values-ja/strings.xml        |  3 +--
 res/values-ka/strings.xml        |  3 +--
 res/values-kk/strings.xml        |  3 +--
 res/values-km/strings.xml        |  3 +--
 res/values-kn/strings.xml        |  5 ++---
 res/values-ko/strings.xml        |  3 +--
 res/values-ky/strings.xml        |  3 +--
 res/values-lo/strings.xml        |  3 +--
 res/values-lt/strings.xml        |  3 +--
 res/values-lv/strings.xml        |  3 +--
 res/values-mk/strings.xml        |  3 +--
 res/values-ml/strings.xml        |  5 ++---
 res/values-mn/strings.xml        |  9 ++++-----
 res/values-mr/strings.xml        |  3 +--
 res/values-ms/strings.xml        |  3 +--
 res/values-my/strings.xml        |  3 +--
 res/values-nb/strings.xml        |  3 +--
 res/values-nl/strings.xml        |  3 +--
 res/values-or/strings.xml        |  3 +--
 res/values-pa/strings.xml        |  6 ++----
 res/values-pl/strings.xml        |  5 ++---
 res/values-pt-rPT/strings.xml    |  3 +--
 res/values-pt/strings.xml        |  9 ++++-----
 res/values-ro/strings.xml        |  3 +--
 res/values-ru/strings.xml        |  3 +--
 res/values-si/strings.xml        |  3 +--
 res/values-sk/strings.xml        |  3 +--
 res/values-sl/strings.xml        |  3 +--
 res/values-sq/strings.xml        |  5 ++---
 res/values-sr/strings.xml        |  3 +--
 res/values-sv/strings.xml        |  3 +--
 res/values-sw/strings.xml        |  3 +--
 res/values-ta/strings.xml        |  3 +--
 res/values-te/strings.xml        |  7 +++----
 res/values-th/strings.xml        |  3 +--
 res/values-tl/strings.xml        |  3 +--
 res/values-tr/strings.xml        |  3 +--
 res/values-uk/strings.xml        |  3 +--
 res/values-ur/strings.xml        |  3 +--
 res/values-uz/strings.xml        |  3 +--
 res/values-vi/strings.xml        |  3 +--
 res/values-zh-rCN/strings.xml    |  3 +--
 res/values-zh-rHK/strings.xml    |  7 +++----
 res/values-zh-rTW/strings.xml    |  3 +--
 res/values-zu/strings.xml        |  3 +--
 82 files changed, 113 insertions(+), 196 deletions(-)

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 834e384bb6..b0f0dcbbdb 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dubbeltik en hou om \'n legstuk te skuif of gebruik gepasmaakte handelinge."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d breed by %2$d hoog"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g>-legstuk"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Raak en hou die legstuk om dit op die Tuisskerm rond te beweeg"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Voeg by Tuisskerm"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 1b9c7ee196..f1ed7c51d4 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ምግብርን ለማንቀሳቀስ ወይም ብጁ እርምጃዎችን ለመጠቀም ሁለቴ መታ ያድርጉ እና ይያዙ።"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ስፋት በ%2$d ከፍታ"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"የ<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ምግብር"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"በመነሻ ገጽ አካባቢ ላይ ለማንቀሳቀስ ነክተው ይያዙት"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ወደ መነሻ ገጽ አክል"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index ac446a2ae8..bd517582b9 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"انقر مرتين مع تثبيت إصبعك لنقل أداة أو استخدام الإجراءات المخصّصة."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"‏العرض %1$d الطول %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"أداة <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"يمكنك النقر على الأداة مع الاستمرار لتحريكها على الشاشة الرئيسية."</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"إضافة إلى الشاشة الرئيسية"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
@@ -172,7 +171,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"الملف الشخصي للعمل"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"تحمل تطبيقات العمل شارة وتكون مرئية لمشرف تكنولوجيا المعلومات."</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"حسنًا"</string>
-    <string name="work_apps_paused_title" msgid="3040901117349444598">"تم إيقاف تطبيقات العمل مؤقتًا."</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"تطبيقات العمل متوقفة مؤقتًا"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"لا يمكن لتطبيقات العمل إرسال إشعارات إليك أو استخدام بطاريتك أو الوصول إلى موقعك الجغرافي."</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"تطبيقات العمل غير مفعّلة، وبالتالي لا يمكنها إرسال إشعارات إليك أو استخدام بطاريتك أو الوصول إلى موقعك الجغرافي."</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"تحمل تطبيقات العمل شارة وتكون مرئية لمشرف تكنولوجيا المعلومات."</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index f61a1527d0..df3cc1ab8e 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"কোনো ৱিজেট স্থানান্তৰ কৰিবলৈ দুবাৰ টিপি ধৰি ৰাখক অথবা কাষ্টম কাৰ্য ব্যৱহাৰ কৰক।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d বহল x %2$d ওখ"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ৱিজেট"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ৱিজেটটো গৃহ স্ক্ৰীনৰ আশে-পাশে নিবলৈ সেইটোত স্পৰ্শ কৰি ধৰি ৰাখক"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"গৃহ স্ক্ৰীনত যোগ কৰক"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 36d20519a1..4bca9c69a3 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Vidceti daşımaq üçün iki dəfə toxunub saxlayın və ya fərdi əməliyyatlardan istifadə edin."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%2$d hündürlük %1$d enində"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> vidceti"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Əsas ekranda hərəkət etdirmək üçün vidcetə toxunub saxlayın"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Əsas ekrana əlavə edin"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 62e4c2b215..66f2d925a5 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvaput dodirnite i zadržite da biste pomerali vidžet ili koristite prilagođene radnje."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d×%2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"širina od %1$d i visina od %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> vidžet"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Dodirnite i zadržite vidžet da biste ga pomerali po početnom ekranu"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Dodaj na početni ekran"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 9162de71e4..ce219dacd6 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Дакраніцеся двойчы і ўтрымлівайце, каб перамясціць віджэт або выкарыстоўваць спецыяльныя дзеянні."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Шырына: %1$d, вышыня: %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Віджэт \"<xliff:g id="WIDGET_NAME">%1$s</xliff:g>\""</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Утрымліваючы віджэт націснутым, перамяшчайце яго па Галоўным экране"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Дадаць на Галоўны экран"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index f23cef9053..7d477fc5e3 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Докоснете двукратно и задръжте за преместване на приспособление или използвайте персонал. действия."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Ширина %1$d и височина %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> приспособление"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Докоснете приспособлението и го задръжте, за да го местите по началния екран"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Добавяне към началния екран"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 0c4bdea72a..8350e06d4f 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"একটি উইজেট সরাতে বা কাস্টম অ্যাকশন ব্যবহার করতে ডবল ট্যাপ করে ধরে রাখুন।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%2$d উচ্চতা অনুযায়ী %1$d প্রস্থ"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g>টি উইজেট"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"হোম স্ক্রিনের যেকোনও জায়গায় উইজেটটি নিয়ে যেতে, টাচ করে ধরে থাকুন"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"হোম স্ক্রিনে যোগ করুন"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
@@ -66,8 +65,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"বিজ্ঞপ্তি"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"একটি শর্টকাট সরাতে টাচ করে ধরে রাখুন।"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"একটি শর্টকাট সরাতে বা কাস্টম অ্যাকশন ব্যবহার করতে ডবল ট্যাপ করে ধরে রাখুন।"</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"এই হোম স্ক্রিনে আর জায়গা খালি নেই"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"পছন্দসই ট্রে-তে আর কোনো জায়গা নেই"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"অ্যাপ্লিকেশানগুলির তালিকা"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"ব্যক্তিগত অ্যাপের তালিকা"</string>
@@ -161,13 +159,13 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"অফিসের প্রোফাইল"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"অফিসের অ্যাপে ব্যাজ যোগ করা হয়েছে এবং আপনার আইটি অ্যাডমিন সেটি দেখতে পাবেন"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"বুঝেছি"</string>
-    <string name="work_apps_paused_title" msgid="3040901117349444598">"অফিসের অ্যাপ বন্ধ করা আছে"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"অফিস অ্যাপ বন্ধ করা আছে"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"অফিসের অ্যাপ আপনাকে নোটিফিকেশন পাঠাতে পারবে না। এছাড়া, ব্যাটারি ব্যবহার করতে বা লোকেশন অ্যাক্সেস করতে পারবে না"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"অফিসের অ্যাপ বন্ধ আছে। আপনার অফিসের অ্যাপ আপনাকে বিজ্ঞপ্তি পাঠাতে, ব্যাটারি ব্যবহার করতে বা লোকেশন অ্যাক্সেস করতে পারবে না"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"অফিসের অ্যাপে ব্যাজ যোগ করা হয়েছে এবং আপনার আইটি অ্যাডমিন সেটি দেখতে পাবেন"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"বুঝেছি"</string>
     <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"অফিসের অ্যাপ বন্ধ করুন"</string>
-    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"অফিসের অ্যাপ চালু করুন"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"অফিস অ্যাপ চালু করুন"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"ফিল্টার"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"কাজটি করা যায়নি: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 79d47cb23f..6922915ead 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvaput dodirnite i zadržite da pomjerite vidžet ili da koristite prilagođene radnje."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Širina %1$d, visina %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Vidžet <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Dodirnite i držite vidžet da ga pomjerate po Početnom ekranu"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Dodaj na početni ekran"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index de59cfccf1..a951bc3191 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Fes doble toc i mantén premut per moure un widget o per utilitzar accions personalitzades."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d d\'amplada per %2$d d\'alçada"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget de <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Mantén premut el widget per moure\'l per la pantalla d\'inici"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Afegeix a la pantalla d\'inici"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 6a4d753629..d5034ddd94 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvojitým klepnutím a podržením přesunete widget, případně použijte vlastní akce."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"šířka %1$d, výška %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Pokud chcete widgetem pohybovat po ploše, podržte ho"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Přidat na plochu"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 388080833f..641b754c28 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Tryk to gange, og hold en widget nede for at flytte den eller bruge tilpassede handlinger."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d i bredden og %2$d i højden"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Widgetten <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Hold widgetten nede for at flytte den rundt på startskærmen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Føj til startskærm"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e7abca742e..1023366161 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Doppeltippen und halten, um ein Widget zu bewegen oder benutzerdefinierte Aktionen zu nutzen."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d breit und %2$d hoch"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget „<xliff:g id="WIDGET_NAME">%1$s</xliff:g>“"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Wenn du das Widget auf dem Startbildschirm verschieben möchtest, halte es gedrückt"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Zum Startbildschirm hinzufügen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 66c6bd1a31..71ffdaf82d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Πατήστε δύο φορές παρατεταμένα για μετακίνηση γραφικού στοιχείου ή χρήση προσαρμοσμένων ενεργειών."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Πλάτος %1$d επί ύψος %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Γραφικό στοιχείο <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Αγγίξτε παρατεταμένα το γραφικό στοιχείο για να το μετακινήσετε στην Αρχική οθόνη"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Προσθήκη στην Αρχική οθόνη"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
@@ -161,12 +160,12 @@
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Οι εφαρμογές εργασιών φέρουν σήμα και είναι ορατές στον διαχειριστή IT σας"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Το κατάλαβα"</string>
     <string name="work_apps_paused_title" msgid="3040901117349444598">"Οι εφαρμογές εργασίας τέθηκαν σε παύση."</string>
-    <string name="work_apps_paused_body" msgid="261634750995824906">"Οι εφαρμογές εργασιών δεν έχουν τη δυνατότητα αποστολής ειδοποιήσεων, χρήσης της μπαταρίας ή πρόσβασης στην τοποθεσία σας"</string>
-    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Οι εφαρμογές εργασιών είναι απενεργοποιημένες. Οι εφαρμογές εργασιών δεν έχουν τη δυνατότητα αποστολής ειδοποιήσεων, χρήσης της μπαταρίας ή πρόσβασης στην τοποθεσία σας"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Οι εφαρμογές εργασίας δεν έχουν τη δυνατότητα αποστολής ειδοποιήσεων, χρήσης της μπαταρίας ή πρόσβασης στην τοποθεσία σας"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Οι εφαρμογές εργασίας είναι απενεργοποιημένες. Οι εφαρμογές εργασίας δεν έχουν τη δυνατότητα αποστολής ειδοποιήσεων, χρήσης της μπαταρίας ή πρόσβασης στην τοποθεσία σας"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Οι εφαρμογές εργασιών φέρουν σήμα και είναι ορατές στον διαχειριστή IT σας"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Το κατάλαβα"</string>
     <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Απενεργοποίηση εφαρμογών εργασιών"</string>
-    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Ενεργοποίηση εφαρμογών εργασιών"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Ενεργοποίηση εφαρμογών εργασίας"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Φίλτρο"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Αποτυχία: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index f032f8bcdd..6ad7864282 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -28,12 +28,11 @@
     <string name="shortcut_not_available" msgid="2536503539825726397">"Shortcut isn\'t available"</string>
     <string name="home_screen" msgid="5629429142036709174">"Home"</string>
     <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Split screen"</string>
-    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Touch &amp; hold to move a widget."</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Touch and hold to move a widget."</string>
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Double-tap &amp; hold to move a widget or use custom actions."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d wide by %2$d high"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Touch and hold the widget to move it around the home screen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Add to home screen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index f032f8bcdd..6ad7864282 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -28,12 +28,11 @@
     <string name="shortcut_not_available" msgid="2536503539825726397">"Shortcut isn\'t available"</string>
     <string name="home_screen" msgid="5629429142036709174">"Home"</string>
     <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Split screen"</string>
-    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Touch &amp; hold to move a widget."</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Touch and hold to move a widget."</string>
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Double-tap &amp; hold to move a widget or use custom actions."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d wide by %2$d high"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Touch and hold the widget to move it around the home screen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Add to home screen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index f032f8bcdd..6ad7864282 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -28,12 +28,11 @@
     <string name="shortcut_not_available" msgid="2536503539825726397">"Shortcut isn\'t available"</string>
     <string name="home_screen" msgid="5629429142036709174">"Home"</string>
     <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Split screen"</string>
-    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Touch &amp; hold to move a widget."</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Touch and hold to move a widget."</string>
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Double-tap &amp; hold to move a widget or use custom actions."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d wide by %2$d high"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Touch and hold the widget to move it around the home screen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Add to home screen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index f032f8bcdd..6ad7864282 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -28,12 +28,11 @@
     <string name="shortcut_not_available" msgid="2536503539825726397">"Shortcut isn\'t available"</string>
     <string name="home_screen" msgid="5629429142036709174">"Home"</string>
     <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Split screen"</string>
-    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Touch &amp; hold to move a widget."</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Touch and hold to move a widget."</string>
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Double-tap &amp; hold to move a widget or use custom actions."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d wide by %2$d high"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Touch and hold the widget to move it around the home screen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Add to home screen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 18b00c6ea6..bf95309e4c 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -28,12 +28,11 @@
     <string name="shortcut_not_available" msgid="2536503539825726397">"El acceso directo no está disponible"</string>
     <string name="home_screen" msgid="5629429142036709174">"Pantalla principal"</string>
     <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Pantalla dividida"</string>
-    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Presiona y mantén presionado para mover un widget."</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Mantén presionado para mover un widget."</string>
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Presiona dos veces y mantén presionado para mover un widget o usar acciones personalizadas."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de ancho por %2$d de alto"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Mantén presionado el widget para moverlo por la pantalla principal"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Agregar a pantalla principal"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 4f4c697158..33c589caeb 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Toca dos veces y mantén pulsado un widget para moverlo o usar acciones personalizadas."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de ancho por %2$d de alto"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget de <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Mantén pulsado el widget para moverlo por la pantalla de inicio"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Añadir a la pantalla de inicio"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 3e3aed7d42..afca593a74 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Vidina teisaldamiseks või kohandatud toimingute kasutamiseks topeltpuudutage ja hoidke all."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d lai ja %2$d kõrge"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Vidin <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Vidina teisaldamiseks avakuval puudutage vidinat ja hoidke seda all"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Lisa avakuvale"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 1f31a5fef2..2f67e22f9f 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Sakatu birritan eta eduki sakatuta widget bat mugitzeko edo ekintza pertsonalizatuak erabiltzeko."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d zabal eta %2$d luze"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widgeta"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Eduki sakatuta widgeta hasierako pantailan zehar mugitzeko"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Gehitu hasierako pantailan"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 513f76f040..35ba9dfa68 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"برای جابه‌جا کردن ابزارک یا استفاده از کنش‌های سفارشی، دوضربه بزنید و نگه دارید."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"‏%1$d عرض در %2$d طول"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"ابزارک <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ابزارک را لمس کنید و نگه دارید تا آن را در صفحه اصلی حرکت دهید"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"افزودن به صفحه اصلی"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"نمایه کاری"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"برنامه‌های کاری دارای نشان هستند و سرپرست سیستم می‌تواند آن‌ها را ببیند"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"متوجه‌ام"</string>
-    <string name="work_apps_paused_title" msgid="3040901117349444598">"برنامه‌های کاری موقتاً متوقف می‌شوند"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"برنامه‌های کاری موقتاً متوقف شده‌اند."</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"برنامه‌های کاری نمی‌توانند برای شما اعلان ارسال کنند، از باتری استفاده کنند، یا به مکانتان دسترسی داشته باشند"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"برنامه‌های کاری خاموش است. برنامه‌های کاری نمی‌توانند برای شما اعلان ارسال کنند، از باتری استفاده کنند، یا به مکانتان دسترسی داشته باشند"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"برنامه‌های کاری دارای نشان هستند و سرپرست سیستم می‌تواند آن‌ها را ببیند."</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index c930be9377..f41da656a8 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Kaksoisnapauta ja paina pitkään, niin voit siirtää widgetiä tai käyttää muokattuja toimintoja."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Leveys: %1$d, korkeus: %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Voit siirtää widgetiä aloitusnäytöllä koskettamalla sitä pitkään"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Lisää aloitusnäytölle"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 6a48e94707..bab420fab2 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Touchez 2x un widget et maintenez le doigt dessus pour le déplacer ou utiliser des actions personnalisées."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de largeur sur %2$d de hauteur"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Maintenez le doigt sur le widget pour le déplacer sur l\'écran d\'accueil"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Ajouter à l\'écran d\'accueil"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 556117d8c6..66a930a056 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Appuyez deux fois et maintenez la pression pour déplacer widget ou utiliser actions personnalisées."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d x %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de largeur et %2$d de hauteur"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Appuyez de manière prolongée sur le widget pour le déplacer sur l\'écran d\'accueil"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Ajouter à l\'écran d\'accueil"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 6ce88ee51c..0260453c77 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Toca dúas veces un widget e manteno premido para movelo ou utiliza accións personalizadas."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de largo por %2$d de alto"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Mantén premido o widget para movelo pola pantalla de inicio"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Engadir á pantalla de inicio"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 1db9d7293d..2513cca831 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -45,7 +45,7 @@
       <item quantity="other"><xliff:g id="SHORTCUTS_COUNT_1">%1$d</xliff:g> શૉર્ટકટ</item>
     </plurals>
     <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
-    <string name="widget_button_text" msgid="2880537293434387943">"વિજેટ્સ"</string>
+    <string name="widget_button_text" msgid="2880537293434387943">"વિજેટ"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"શોધ"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"શોધ બૉક્સમાંથી ટેક્સ્ટ સાફ કરો"</string>
     <string name="no_widgets_available" msgid="4337693382501046170">"વિજેટ અને શૉર્ટકટ ઉપલબ્ધ નથી"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 7e9696855f..f84f554b31 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"किसी विजेट को एक से दूसरी जगह ले जाने के लिए, उस पर दो बार टैप करके दबाकर रखें या पसंद के मुताबिक कार्रवाइयां इस्तेमाल करें."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d चौड़ाई गुणा %2$d ऊंचाई"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> विजेट"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"होम स्क्रीन पर यहां-वहां ले जाने के लिए विजेट को दबाकर रखें"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"होम स्क्रीन पर जोड़ें"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index ac19155f5e..d7069f31b3 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvaput dodirnite i zadržite pritisak da biste premjestili widget ili upotrijebite prilagođene radnje"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d širine i %2$d visine"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Dodirnite i zadržite widget da biste ga pomicali po početnom zaslonu"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Dodaj na početni zaslon"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 2b4d9143f7..1f99025c23 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Modul áthelyezéséhez koppintson duplán, tartsa nyomva az ujját, vagy használjon egyéni műveleteket."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d széles és %2$d magas"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> modul"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Tartsa lenyomva a modult a kezdőképernyőn való mozgatáshoz"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Hozzáadás a kezdőképernyőhöz"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
@@ -161,12 +160,12 @@
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"A munkahelyi alkalmazások jelvénnyel vannak megjelölve, és láthatók a rendszergazda számára"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Értem"</string>
     <string name="work_apps_paused_title" msgid="3040901117349444598">"A munkahelyi alkalmazások szüneteltetve vannak"</string>
-    <string name="work_apps_paused_body" msgid="261634750995824906">"A munkahelyi alkalmazások nem küldhetnek értesítéseket, nem használhatják az akkumulátort, és nem férhetnek hozzá az Ön tartózkodási helyéhez."</string>
-    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"A munkahelyi alkalmazások ki vannak kapcsolva, nem küldhetnek értesítéseket, nem használhatják az akkumulátort, és nem férhetnek hozzá az Ön tartózkodási helyéhez"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"A munkahelyi alkalmazások nem küldhetnek Önnek értesítéseket, nem használhatják az akkumulátorát, és nem férhetnek hozzá a tartózkodási helyéhez."</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"A munkahelyi alkalmazások nem küldhetnek Önnek értesítéseket, nem használhatják az akkumulátorát, és nem férhetnek hozzá a tartózkodási helyéhez"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"A munkahelyi alkalmazások jelvénnyel vannak megjelölve, és láthatók a rendszergazda számára"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Értem"</string>
     <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Kapcsolja ki a munkahelyi alkalmazásokat"</string>
-    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Kapcsolja be a munkahelyi alkalmazásokat"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Munkahelyi alkalmazások bekapcsolása"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"Szűrő"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"Sikertelen: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index ea421f7465..dc0599ea66 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Կրկնակի հպեք և պահեք՝ վիջեթ տեղափոխելու համար, կամ օգտվեք հատուկ գործողություններից։"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Լայնությունը՝ %1$d, բարձրությունը՝ %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> վիջեթ"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Հպեք վիջեթին և պահեք տեղափոխելու համար"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Ավելացնել հիմնական էկրանին"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index b7324eef8d..cc86970dce 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Ketuk dua kali &amp; tahan untuk memindahkan widget atau gunakan tindakan khusus."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"lebar %1$d x tinggi %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Sentuh lama widget untuk memindahkannya di sekitar Layar utama"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Tambahkan ke Layar utama"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index d9431ca639..e2864ae203 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Ýttu tvisvar og haltu fingri á græju til að færa hana eða notaðu sérsniðnar aðgerðir."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d á breidd og %2$d á hæð"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Græjan <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Haltu fingri á græjunni til að hreyfa hana um heimaskjáinn"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Bæta á heimaskjá"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 71b64983c8..304019a3cc 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Tocca due volte e tieni premuto per spostare un widget o per usare le azioni personalizzate."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d di larghezza per %2$d di altezza"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Tocca e tieni premuto il widget per spostarlo nella schermata Home"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Aggiungi a schermata Home"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index dc0b261d0a..94fd441e6b 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"כדי להעביר ווידג\'ט למקום אחר או להשתמש בפעולות מותאמות אישית, יש ללחוץ פעמיים ולא להרפות."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"‏רוחב %1$d על גובה %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"ווידג\'ט <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"יש ללחוץ לחיצה ארוכה על הווידג\'ט כדי להזיז אותו ברחבי מסך הבית"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"הוספה למסך הבית"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index abf7667297..1250c35e93 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ウィジェットをダブルタップして長押ししながら移動するか、カスタム操作を使用してください。"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$dx%2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"幅 %1$d、高さ %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> 件のウィジェット"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ウィジェットを押し続けると、ホーム画面上に移動できます。"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ホーム画面に追加"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 8b423c00d9..b3bbf5e214 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ორმაგი შეხებით აირჩიეთ და გეჭიროთ ვიჯეტის გადასაადგილებლად ან მორგებული მოქმედებების გამოსაყენებლად."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"სიგრძე: %1$d, სიგანე: %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ვიჯეტი"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ხანგრძლივად შეეხეთ ვიჯეტს მთავარ ეკრანზე მის გადასაადგილებლად"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"მთავარ ეკრანზე დამატება"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index a240a5564f..2c547ae082 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Виджетті жылжыту үшін екі рет түртіңіз де, ұстап тұрыңыз немесе арнаулы әрекеттерді пайдаланыңыз."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Ені: %1$d, биіктігі: %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> виджеті"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Негізгі экранда қозғалту үшін виджетті басып тұрыңыз."</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Негізгі экранға қосу"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 1b03630f32..9d95e57db1 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ចុចពីរដង រួចសង្កត់ឱ្យជាប់ ដើម្បីផ្លាស់ទី​ធាតុក្រាហ្វិក ឬប្រើ​សកម្មភាព​តាមបំណង​។"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"ទទឺង %1$d គុណនឹងកម្ពស់ %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"ធាតុ​ក្រាហ្វិក <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ចុចធាតុក្រាហ្វិក​ឱ្យជាប់ ដើម្បីផ្លាស់ទីវា​ជុំវិញអេក្រង់ដើម"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"បញ្ចូល​ទៅអេក្រង់ដើម"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 938aa98ede..322878ec94 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ವಿಜೆಟ್ ಸರಿಸಲು ಅಥವಾ ಕಸ್ಟಮ್ ಕ್ರಿಯೆಗಳನ್ನು ಬಳಸಲು ಡಬಲ್-ಟ್ಯಾಪ್ ಮಾಡಿ ಮತ್ತು ಹಿಡಿದುಕೊಳ್ಳಿ."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ಅಗಲ ಮತ್ತು %2$d ಎತ್ತರ"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ವಿಜೆಟ್"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ಮುಖಪುಟದ ಪರದೆ ಸುತ್ತ ವಿಜೆಟ್ ಅನ್ನು ಸರಿಸಲು, ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಒತ್ತಿ ಹಿಡಿದುಕೊಳ್ಳಿ"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ಮುಖಪುಟಕ್ಕೆ ಸೇರಿಸಿ"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ಬ್ಯಾಡ್ಜ್ ಮಾಡಲಾಗಿದೆ ಮತ್ತು ಅವುಗಳು ನಿಮ್ಮ IT ನಿರ್ವಾಹಕರಿಗೆ ಗೋಚರಿಸುತ್ತವೆ"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ಸರಿ"</string>
-    <string name="work_apps_paused_title" msgid="3040901117349444598">"ಉದ್ಯೋಗದ ಆ್ಯಪ್‌ಗಳನ್ನು ವಿರಾಮಗೊಲಿಸಲಾಗಿದೆ"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ವಿರಾಮಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"ನಿಮ್ಮ ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳಿಗೆ ನಿಮಗೆ ಅಧಿಸೂಚನೆಗಳನ್ನು ಕಳುಹಿಸಲು, ನಿಮ್ಮ ಬ್ಯಾಟರಿಯನ್ನು ಬಳಸಲು ಅಥವಾ ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳು ಆಫ್ ಆಗಿವೆ. ನಿಮ್ಮ ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳು ನಿಮಗೆ ಅಧಿಸೂಚನೆಗಳನ್ನು ಕಳುಹಿಸಲು, ನಿಮ್ಮ ಬ್ಯಾಟರಿಯನ್ನು ಬಳಸಲು ಅಥವಾ ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳು ಬ್ಯಾಡ್ಜ್ ಮಾಡಲಾಗಿದೆ ಮತ್ತು ನಿಮ್ಮ IT ನಿರ್ವಾಹಕರಿಗೆ ಗೋಚರಿಸುತ್ತದೆ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 83e190d1fe..79c2ce3d8a 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"두 번 탭한 다음 길게 터치하여 위젯을 이동하거나 맞춤 작업을 사용하세요."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d×%2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"너비 %1$d, 높이 %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"위젯 <xliff:g id="WIDGET_NAME">%1$s</xliff:g>개"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"홈 화면에서 위젯을 이동하려면 길게 터치하세요."</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"홈 화면에 추가"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 3cf86ff7a4..da83578756 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Виджетти жылдыруу үчүн эки жолу таптап, кармап туруңуз же ыңгайлаштырылган аракеттерди колдонуңуз."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Туурасы: %1$d, бийиктиги: %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> виджети"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Башкы экранга жылдыруу үчүн виджетти коё бербей басып туруңуз"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Башкы экранга кошуу"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index be361e0ed0..e7195e6ed7 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ແຕະສອງເທື່ອຄ້າງໄວ້ເພື່ອຍ້າຍວິດເຈັດ ຫຼື ໃຊ້ຄຳສັ່ງກຳນົດເອງ."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"ກວ້າງ %1$d ຄູນສູງ %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"ວິດເຈັດ <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ແຕະວິດເຈັດຄ້າງໄວ້ເພື່ອຍ້າຍມັນໄປມາຢູ່ໂຮມສະກຣີນ"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ເພີ່ມໄປໃສ່ໂຮມສະກຣີນ"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 1114f26dd8..27a2598344 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dukart palieskite ir palaikykite, kad perkeltumėte valdiklį ar naudotumėte tinkintus veiksmus."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d plotis ir %2$d aukštis"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> valdiklis"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Paliesdami ir palaikydami valdiklį galite judėti pagrindiniame ekrane"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Pridėti prie pagrindinio ekrano"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 5735b0606c..b66e5668bf 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Lai pārvietotu logrīku, uz tā veiciet dubultskārienu un turiet. Varat arī veikt pielāgotas darbības."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d plats un %2$d augsts"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Logrīks <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Pieskarieties logrīkam un turiet to, lai to pārvietotu pa sākuma ekrānu."</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Pievienot sākuma ekrānam"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 3bf2a9784f..f5c55bd9ba 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Допрете двапати и задржете за да преместите виџет или користете приспособени дејства."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d широк на %2$d висок"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Виџет <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Допрете го и задржете го виџетот за да го движите наоколу на почетниот екран"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Додај на почетниот екран"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index b46f1d72a2..cff1781e4c 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"വിജറ്റ് നീക്കാൻ ഡബിൾ ടാപ്പ് ചെയ്യൂ, ഹോൾഡ് ചെയ്യൂ അല്ലെങ്കിൽ ഇഷ്‌ടാനുസൃത പ്രവർത്തനങ്ങൾ ഉപയോഗിക്കൂ."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d വീതിയും %2$d ഉയരവും"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> വിജറ്റ്"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ഹോം സ്‌ക്രീനിന് ചുറ്റും വിജറ്റ് നീക്കാൻ അതിൽ സ്‌പർശിച്ച് പിടിക്കുക"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ഹോം സ്‌ക്രീനിലേക്ക് ചേർക്കുക"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
@@ -46,7 +45,7 @@
     </plurals>
     <string name="widgets_and_shortcuts_count" msgid="7209136747878365116">"<xliff:g id="WIDGETS_COUNT">%1$s</xliff:g>, <xliff:g id="SHORTCUTS_COUNT">%2$s</xliff:g>"</string>
     <string name="widget_button_text" msgid="2880537293434387943">"വിജറ്റുകൾ"</string>
-    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"തിരയൽ"</string>
+    <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"തിരയുക"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"സെർച്ച് ബോക്‌സിൽ നിന്ന് ടെക്‌സ്‌റ്റ് മായ്‌ക്കുക"</string>
     <string name="no_widgets_available" msgid="4337693382501046170">"വിജറ്റുകളും കുറുക്കുവഴികളും ലഭ്യമല്ല"</string>
     <string name="no_search_results" msgid="3787956167293097509">"വിജറ്റുകളോ കുറുക്കുവഴികളോ കണ്ടെത്തിയില്ല"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 1320658f34..33e174b540 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -28,12 +28,11 @@
     <string name="shortcut_not_available" msgid="2536503539825726397">"Товчлол алга"</string>
     <string name="home_screen" msgid="5629429142036709174">"Нүүр"</string>
     <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Дэлгэцийг хуваах"</string>
-    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Жижиг хэрэгслийг зөөх бол хүрээд, удаан дарна уу."</string>
-    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Жижиг хэрэгслийг зөөх эсвэл захиалгат үйлдлийг ашиглахын тулд хоёр товшоод, удаан дарна уу."</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Виджетийг зөөх бол хүрээд, удаан дарна уу."</string>
+    <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Виджетийг зөөх эсвэл захиалгат үйлдлийг ашиглахын тулд хоёр товшоод, удаан дарна уу."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d өргөн %2$d өндөр"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> жижиг хэрэгсэл"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Жижиг хэрэгслийг Үндсэн нүүрний эргэн тойронд зөөхийн тулд түүнд хүрээд, удаан дарна уу"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Үндсэн нүүрэнд нэмэх"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
@@ -49,7 +48,7 @@
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Хайх"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Хайх хэсгээс текстийг арилгах"</string>
     <string name="no_widgets_available" msgid="4337693382501046170">"Жижиг хэрэгсэл болон товчлол боломжгүй байна"</string>
-    <string name="no_search_results" msgid="3787956167293097509">"Жижиг хэрэгсэл эсвэл товчлол олдсонгүй"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Виджет эсвэл товчлол олдсонгүй"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Хувийн виджетүүд"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Ажил"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Харилцан яриа"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index dab39d9e01..e0f22d924a 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"विजेट हलवण्यासाठी किंवा कस्टम कृती वापरण्यासाठी दोनदा टॅप करा आणि धरून ठेवा."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d रूंद बाय %2$d उंच"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> विजेट"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"होम स्क्रीनवर ते हलवण्यासाठी विजेटला स्पर्श करा आणि धरून ठेवा"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"होम स्‍क्रीनवर जोडा"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index b7469cd719..759e8769ee 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Ketik dua kali &amp; tahan untuk menggerakkan widget atau menggunakan tindakan tersuai."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Lebar %1$d kali tinggi %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Sentuh &amp; tahan widget untuk menggerakkan widget di sekitar Skrin utama"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Tambahkan pada Skrin utama"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index ef15561e10..e71ebaaee1 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ဝိဂျက်ကို ရွှေ့ရန် (သို့) စိတ်ကြိုက်လုပ်ဆောင်ချက်များကို သုံးရန် နှစ်ချက်တို့ပြီး ဖိထားပါ။"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"အလျား %1$d နှင့် အမြင့် %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ဝိဂျက်"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ပင်မစာမျက်နှာအနီးတွင် ဝိဂျက်ကိုရွှေ့ရန် ၎င်းကို တို့ထိ၍ဖိထားပါ"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ပင်မစာမျက်နှာသို့ ထည့်ရန်"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 5e934c0f1c..a045b40821 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dobbelttrykk og hold inne for å flytte en modul eller bruke tilpassede handlinger."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d bredde x %2$d høyde"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g>-modul"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Trykk og hold på modulen for å bevege den rundt på startskjermen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Legg til på startskjermen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index d7e7a9a8c7..59f42beee3 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dubbeltik en houd vast om een widget te verplaatsen of aangepaste acties te gebruiken."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d breed en %2$d hoog"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Houd de widget ingedrukt om deze te verplaatsen op het startscherm"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Toevoegen aan startscherm"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 259b98b5a8..e9fc3c55fa 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ଏକ ୱିଜେଟକୁ ମୁଭ୍ କରିବା ପାଇଁ ଦୁଇଥର-ଟାପ୍ କରି ଧରି ରଖନ୍ତୁ କିମ୍ବା କଷ୍ଟମ୍ କାର୍ଯ୍ୟଗୁଡ଼ିକୁ ବ୍ୟବହାର କରନ୍ତୁ।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ଓସାର ଓ %2$d ଉଚ୍ଚ"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ୱିଜେଟ୍"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ମୂଳସ୍କ୍ରିନର ଆଖପାଖରେ ୱିଜେଟକୁ ମୁଭ୍ କରିବା ପାଇଁ ଏହାକୁ ସ୍ପର୍ଶ କରି ଧରି ରଖନ୍ତୁ"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ମୂଳସ୍କ୍ରିନରେ ଯୋଗ କରନ୍ତୁ"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index d0df645126..67f5df890f 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ਵਿਜੇਟ ਲਿਜਾਉਣ ਲਈ ਜਾਂ ਵਿਉਂਂਤੀਆਂ ਕਾਰਵਾਈਆਂ ਵਰਤਣ ਲਈ ਦੋ ਵਾਰ ਟੈਪ ਕਰਕੇ ਦਬਾ ਕੇ ਰੱਖੋ।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ਚੌੜਾਈ ਅਤੇ %2$d ਲੰਬਾਈ"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ਵਿਜੇਟ"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ਵਿਜੇਟ ਨੂੰ ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਇੱਧਰ-ਉੱਧਰ ਲਿਜਾਉਣ ਲਈ ਸਪਰਸ਼ ਕਰਕੇ ਦਬਾਈ ਰੱਖੋ"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
@@ -66,8 +65,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"ਸੂਚਨਾਵਾਂ"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"ਕਿਸੇ ਸ਼ਾਰਟਕੱਟ ਨੂੰ ਲਿਜਾਉਣ ਲਈ ਸਪੱਰਸ਼ ਕਰਕੇ ਦਬਾਈ ਰੱਖੋ।"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ਕਿਸੇ ਸ਼ਾਰਟਕੱਟ ਨੂੰ ਲਿਜਾਉਣ ਲਈ ਡਬਲ ਟੈਪ ਕਰਕੇ ਦਬਾਈ ਰੱਖੋ ਜਾਂ ਵਿਉਂਤੀਆਂ ਕਾਰਵਾਈਆਂ ਵਰਤੋ।"</string>
-    <!-- no translation found for out_of_space (6692471482459245734) -->
-    <skip />
+    <string name="out_of_space" msgid="6692471482459245734">"ਇਸ ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਜਗ੍ਹਾ ਨਹੀਂ ਬਚੀ"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ਮਨਪਸੰਦ ਟ੍ਰੇ ਵਿੱਚ ਹੋਰ ਖਾਲੀ ਸਥਾਨ ਨਹੀਂ।"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ਐਪ ਸੂਚੀ"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"ਨਿੱਜੀ ਐਪਾਂ ਦੀ ਸੂਚੀ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 6b381a1995..9d1325db0b 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Naciśnij dwukrotnie i przytrzymaj, aby przenieść widżet lub użyć działań niestandardowych."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Szerokość %1$d, wysokość %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Widżet <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Kliknij i przytrzymaj widżet, by poruszać nim po ekranie głównym"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Dodaj do ekranu głównego"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
@@ -122,7 +121,7 @@
     <string name="msg_missing_notification_access" msgid="281113995110910548">"Aby pokazać plakietki z powiadomieniami, włącz powiadomienia aplikacji <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"Zmień ustawienia"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"Pokaż plakietki z powiadomieniami"</string>
-    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Dodaj ikony aplikacji do ekranu głównego"</string>
+    <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"Dodawaj ikony aplikacji do ekranu głównego"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"W przypadku nowych aplikacji"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Brak informacji"</string>
     <string name="abandoned_clean_this" msgid="7610119707847920412">"Usuń"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 306b0bbfe0..d95ee02d18 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Toque duas vezes sem soltar para mover um widget ou utilizar ações personalizadas."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de largura por %2$d de altura"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Toque sem soltar no widget para o mover à volta do ecrã principal"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Adicionar ao ecrã principal"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 4c3113d158..f8d3b8b104 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -28,12 +28,11 @@
     <string name="shortcut_not_available" msgid="2536503539825726397">"O atalho não está disponível"</string>
     <string name="home_screen" msgid="5629429142036709174">"Início"</string>
     <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Tela dividida"</string>
-    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Toque e mantenha a tela pressionada para mover um widget."</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Toque e mantenha pressionado para mover um widget."</string>
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Toque duas vezes e mantenha a tela pressionada para mover um widget ou usar ações personalizadas."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de largura por %2$d de altura"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Toque no widget e mantenha-o pressionado para movê-lo pela tela inicial"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Adicionar à tela inicial"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
@@ -158,12 +157,12 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Pessoais"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Trabalho"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de trabalho"</string>
-    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Os apps de trabalho têm um ícone e ficam visíveis para o administrador de TI"</string>
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Os apps de trabalho são identificados e ficam visíveis para o adm. de TI"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Ok"</string>
     <string name="work_apps_paused_title" msgid="3040901117349444598">"Os apps de trabalho foram pausados"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Os apps de trabalho não podem enviar notificações, usar a bateria nem acessar o local"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Os apps de trabalho estão desativados. Eles não podem enviar notificações, usar a bateria nem acessar o local"</string>
-    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Os apps de trabalho têm um ícone e ficam visíveis para o administrador de TI"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Os apps de trabalho são identificados e ficam visíveis para o adm. de TI"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Ok"</string>
     <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Desativar apps de trabalho"</string>
     <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Ativar apps de trabalho"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 3dfcf5cda4..fadd84debb 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Atingeți de două ori și țineți apăsat pentru a muta un widget sau folosiți acțiuni personalizate."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d lățime și %2$d înălțime"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Widgetul <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Atingeți lung widgetul pentru a-l muta pe ecranul de pornire"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Adăugați pe ecranul de pornire"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 997924ee73..5353cf900c 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Чтобы использовать специальные действия или перенести виджет, нажмите на него дважды и удерживайте."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d x %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Ширина %1$d, высота %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Виджет \"<xliff:g id="WIDGET_NAME">%1$s</xliff:g>\""</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Чтобы переместить виджет, нажмите на него и удерживайте."</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Добавить на главный экран"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 66d6324958..f57ad864cb 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"විජට් එකක් ගෙන යාමට හෝ අභිරුචි ක්‍රියා භාවිත කිරීමට දෙවරක් තට්ටු කර අල්ලා ගෙන සිටින්න."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"පළල %1$d උස %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> විජට්ටුව"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"එය මුල් පිටු තිරය වටා ගෙන යාමට විජට් එක ස්පර්ශ කර අල්ලා ගන්න"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"මුල් පිටු තිරය වෙත එක් කරන්න"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index cf458ce48c..1aac52153d 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvojitým klepnutím a pridržaním presuňte miniaplikáciu alebo použite vlastné akcie."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"šírka %1$d, výška %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Miniaplikácia <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Po pridržaní môžete miniaplikáciu posúvať po ploche"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Pridať na plochu"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 4b7927b9bb..8e92c222cc 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvakrat se dotaknite pripomočka in ga pridržite, da ga premaknete, ali pa uporabite dejanja po meri."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Širina %1$d, višina %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Pripomoček <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Pridržite pripomoček, če ga želite premikati po začetnem zaslonu."</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Dodaj na začetni zaslon"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 70084dfd23..4caf9c7864 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Trokit dy herë dhe mbaje shtypur një miniapliikacion për ta zhvendosur atë ose për të përdorur veprimet e personalizuara."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d i gjerë me %2$d i lartë"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> miniaplikacion"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Prek dhe mbaj të shtypur miniaplikacionin për ta lëvizur nëpër \"Ekranin bazë\""</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Shto në \"Ekranin bazë\""</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
@@ -160,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profili i punës"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Aplikacionet e punës janë të shënuara dhe të dukshme për administratorin e teknologjisë së informacionit"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"E kuptova"</string>
-    <string name="work_apps_paused_title" msgid="3040901117349444598">"Aplikacionet e punës janë në pauzë"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Aplikacionet e punës janë vendosur në pauzë"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Aplikacionet e tua të punës nuk mund të të dërgojnë njoftime, të përdorin baterinë tënde apo të kenë qasje në vendndodhjen tënde"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Aplikacionet e punës janë joaktive. Aplikacionet e tua të punës nuk mund të të dërgojnë njoftime, të përdorin baterinë tënde apo të kenë qasje në vendndodhjen tënde"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Aplikacionet e punës janë të shënuara dhe të dukshme për administratorin e teknologjisë së informacionit"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 335806262f..4b56e45016 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Двапут додирните и задржите да бисте померали виџет или користите прилагођене радње."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d×%2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"ширина од %1$d и висина од %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> виџет"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Додирните и задржите виџет да бисте га померали по почетном екрану"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Додај на почетни екран"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 12d99d44a5..5ef0c35502 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Tryck snabbt två gånger och håll kvar för att flytta en widget eller använda anpassade åtgärder."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d bred gånger %2$d hög"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget för <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Tryck länge på widgeten om du vill flytta den på startskärmen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Lägg till på startskärmen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index a16a8c113d..dc5be39c85 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Gusa mara mbili na ushikilie ili usogeze wijeti au utumie vitendo maalum."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Upana wa %1$d na kimo cha %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Wijeti ya <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Gusa na ushikilie wijeti ili uisogeze kwenye Skrini ya kwanza"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Weka kwenye Skrini ya kwanza"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 0117f6b2f1..ce50acce04 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"விட்ஜெட்டை நகர்த்த இருமுறை தட்டிப் பிடிக்கவும் அல்லது பிரத்தியேகச் செயல்களைப் பயன்படுத்தவும்."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d அகலத்திற்கு %2$d உயரம்"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> விட்ஜெட்"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"முகப்புத் திரைக்கு விட்ஜெட்டை நகர்த்த அதைத் தொட்டுப் பிடிக்கவும்"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"முகப்புத் திரையில் சேர்"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 07bb80b09d..a83c4c6e90 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -20,7 +20,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="work_folder_name" msgid="3753320833950115786">"కార్యాలయం"</string>
+    <string name="work_folder_name" msgid="3753320833950115786">"వర్క్"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"యాప్ ఇన్‌స్టాల్ చేయబడలేదు."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"యాప్ అందుబాటులో లేదు"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"డౌన్‌లోడ్ చేసిన యాప్ సురక్షిత మోడ్‌లో నిలిపివేయబడింది"</string>
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"విడ్జెట్‌ను తరలించడానికి లేదా అనుకూల చర్యలను ఉపయోగించడానికి రెండుసార్లు నొక్కండి &amp; హోల్డ్ చేయి."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d వెడల్పు X %2$d ఎత్తు"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> విడ్జెట్"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ఈ విడ్జెట్‌ను మొదటి స్క్రీన్‌లో కావాల్సిన చోట ఉంచడానికి, దాన్ని తాకి అలాగే నొక్కి పట్టుకోండి"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"మొదటి స్క్రీన్‌కు జోడించు"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
@@ -156,7 +155,7 @@
     <string name="accessibility_close" msgid="2277148124685870734">"మూసివేస్తుంది"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"నోటిఫికేషన్ తీసివేయబడింది"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"వ్యక్తిగతం"</string>
-    <string name="all_apps_work_tab" msgid="4884822796154055118">"కార్యాలయం"</string>
+    <string name="all_apps_work_tab" msgid="4884822796154055118">"వర్క్"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"కార్యాలయ ప్రొఫైల్"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"వర్క్ యాప్‌లు బ్యాడ్జ్ చేయబడ్డాయి, మీ IT అడ్మిన్‌కు కనిపిస్తాయి"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"అర్థమైంది"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 77a20be222..945dcf0bc0 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"แตะสองครั้งค้างไว้เพื่อย้ายวิดเจ็ตหรือใช้การดำเนินการที่กำหนดเอง"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"กว้าง %1$d x สูง %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"วิดเจ็ต <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"แตะวิดเจ็ตค้างไว้เพื่อย้ายไปรอบๆ หน้าจอหลัก"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"เพิ่มลงในหน้าจอหลัก"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index c6e919a783..edbc39aaf8 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"I-double tap at pindutin nang matagal para ilipat ang widget o gumamit ng mga custom na pagkilos."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ang lapad at %2$d ang taas"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Pindutin nang matagal ang widget para ilipat-lipat ito sa Home screen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Idagdag sa Home screen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index ce7527624f..01748c2e52 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Widget\'ı taşımak veya özel işlemleri kullanmak için iki kez dokunup basılı tutun."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"genişlik: %1$d, yükseklik: %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget\'ı"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Ana ekranda taşımak için widget\'a dokunup basılı tutun"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Ana ekrana ekle"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index e8a7bfc630..c309d8a175 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Двічі натисніть і втримуйте віджет, щоб перемістити його або виконати інші дії."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Ширина – %1$d, висота – %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Віджет <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Натисніть і втримуйте віджет, щоб перемістити його в потрібне місце на головному екрані"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Додати на головний екран"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 90da57c0d8..4e660fbac0 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ویجیٹ کو منتقل کرنے یا حسب ضرورت کارروائیاں استعمال کرنے کے لیے دوبار تھپتھپائیں اور پکڑ کر رکھیں۔"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"‏%1$d چوڑا اور ‎%2$d اونچا"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ویجیٹ"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ویجیٹ کو ہوم اسکرین کے چاروں طرف منتقل کرنے کیلئے اسے ٹچ کریں اور دبائے رکھیں"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ہوم اسکرین میں شامل کریں"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index bd80989d85..72838d59ec 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Ikki marta bosib va bosib turgan holatda vidjetni tanlang yoki maxsus amaldan foydalaning."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Eni %1$d, bo‘yi %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ta vidjet"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Vidjetni ushlagan holda kerakli joyga siljiting"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Bosh ekranga chiqarish"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 8a32ee7762..4a16045c1d 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Nhấn đúp và giữ để di chuyển một tiện ích hoặc sử dụng các thao tác tùy chỉnh."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Rộng %1$d x cao %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Tiện ích <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Chạm và giữ để di chuyển tiện ích xung quanh Màn hình chính"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Thêm vào Màn hình chính"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 225a7e1bd7..31c0df5870 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"点按两次并按住微件即可移动该微件或使用自定义操作。"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"宽 %1$d，高 %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"“<xliff:g id="WIDGET_NAME">%1$s</xliff:g>”微件"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"轻触并按住该微件即可将其在主屏幕上四处移动"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"添加到主屏幕"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 98f9ef7b04..fd2de37320 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"㩒兩下之後㩒住，就可以郁小工具或者用自訂操作。"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d 闊，%2$d 高"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"「<xliff:g id="WIDGET_NAME">%1$s</xliff:g>」小工具"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"按住小工具即可隨意在主畫面上移動"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"新增至主畫面"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
@@ -161,8 +160,8 @@
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"工作應用程式會加上標誌，且你的 IT 管理員可以看到這類應用程式"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"知道了"</string>
     <string name="work_apps_paused_title" msgid="3040901117349444598">"已暫停工作應用程式"</string>
-    <string name="work_apps_paused_body" msgid="261634750995824906">"工作應用程式無法向您傳送通知、使用電池或存取位置"</string>
-    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"工作應用程式已關閉。工作應用程式無法向您傳送通知、使用電池或存取位置"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"工作應用程式無法向您傳送通知、使用電池電量或存取您的位置"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"已暫停工作應用程式。工作應用程式無法向您傳送通知、使用電池電量或存取您的位置"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"IT 管理員可看到工作應用程式和相關標誌"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"知道了"</string>
     <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"關閉工作應用程式"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index f38f14334e..415908cd45 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"輕觸兩下並按住即可移動小工具或使用自訂操作。"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"寬度為 %1$d，高度為 %2$d"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"「<xliff:g id="WIDGET_NAME">%1$s</xliff:g>」小工具"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"按住小工具即可將它拖放到主畫面上的任何位置"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"新增到主畫面"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 9f48102baf..b8de754066 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Thepha kabili uphinde ubambe ukuze uhambise iwijethi noma usebenzise izindlela ezingokwezifiso."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ububanzi ngokungu-%2$d ukuya phezulu"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"Iwijethi elingu-<xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Thinta uphinde ubambe iwijethi ukuyihambisa Kusikrini sasekhaya"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Engeza kusikrini sasekhaya"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
-- 
GitLab


From 553d9780122d1f905180527772a1da8c97db357e Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 2 Jul 2021 14:18:31 -0700
Subject: [PATCH 1572/1664] Fix crash when handling recents animation canceled

- If Launcher finishes the animation, that also cleans up the screenshot
  on the server side, so we can skip calling it

Fixes: 192684578
Test: N/a, adding a null check
Change-Id: Ia6b99b4262e72f925e7d622ea8833d3c88252633
---
 quickstep/src/com/android/quickstep/GestureState.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/GestureState.java b/quickstep/src/com/android/quickstep/GestureState.java
index a302a07bca..385b3b482e 100644
--- a/quickstep/src/com/android/quickstep/GestureState.java
+++ b/quickstep/src/com/android/quickstep/GestureState.java
@@ -364,7 +364,9 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL
         mStateCallback.setState(STATE_RECENTS_ANIMATION_ENDED);
         if (mRecentsAnimationCanceledSnapshot != null) {
             // Clean up the screenshot to finalize the recents animation cancel
-            mRecentsAnimationController.cleanupScreenshot();
+            if (mRecentsAnimationController != null) {
+                mRecentsAnimationController.cleanupScreenshot();
+            }
             mRecentsAnimationCanceledSnapshot = null;
         }
     }
-- 
GitLab


From bf91858e6e574f36feeda8e095f5b8ee162124eb Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sun, 4 Jul 2021 19:05:46 +0000
Subject: [PATCH 1573/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Ia27bb122b5cfd53a63f2a3511308dffc0afdce85
---
 quickstep/res/values-az/strings.xml | 2 +-
 quickstep/res/values-et/strings.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/quickstep/res/values-az/strings.xml b/quickstep/res/values-az/strings.xml
index 3c5587c07f..18a0bceb2f 100644
--- a/quickstep/res/values-az/strings.xml
+++ b/quickstep/res/values-az/strings.xml
@@ -45,7 +45,7 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Tətbiq təklifləri aktivdir"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Tətbiq təklifləri deaktivdir"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Proqnozlaşdırılan tətbiq: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Ən sol tərəfdən sürüşdürdüyünüzə əmin olun."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Ekranın ən kənarından soldan sağa sürüşdürün."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Ekranın sol kənarından ortasına sürüşdürüb buraxın."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Ən sağ tərəfdən sürüşdürdüyünüzə əmin olun."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Ekranın sağ kənarından ortasına sürüşdürüb buraxın."</string>
diff --git a/quickstep/res/values-et/strings.xml b/quickstep/res/values-et/strings.xml
index 88f11cdd7b..c2c4bc9ce6 100644
--- a/quickstep/res/values-et/strings.xml
+++ b/quickstep/res/values-et/strings.xml
@@ -55,7 +55,7 @@
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Veenduge, et te ei pühiks liiga ekraanikuva allosa lähedalt."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Tagasiliigutuse tundlikkuse muutmiseks avage menüü Seaded"</string>
     <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Tagasiliikumiseks pühkige vasakult paremale"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Tagasiliikumiseks pühkige paremalt vasakule"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Eelmisele kuvale liikumiseks pühkige paremalt vasakule"</string>
     <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Eelmisele ekraanikuvale naasmiseks pühkige vasakust servast ekraanikuva keskele."</string>
     <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Eelmisele ekraanikuvale naasmiseks võite ka kuva paremast servast keskele pühkida. Proovige kohe."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pühkige kindlasti ekraanikuva alumisest servast üles."</string>
-- 
GitLab


From abfad495088cb4a9bb5b3eb14f12a705d5a54574 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sun, 4 Jul 2021 19:07:06 +0000
Subject: [PATCH 1574/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Ie0220ac1df352c3ae125d061ec8049e12478f091
---
 go/quickstep/res/values-iw/strings.xml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/go/quickstep/res/values-iw/strings.xml b/go/quickstep/res/values-iw/strings.xml
index e3da0e7b34..7c419ede70 100644
--- a/go/quickstep/res/values-iw/strings.xml
+++ b/go/quickstep/res/values-iw/strings.xml
@@ -5,12 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"האזנה"</string>
     <string name="action_translate" msgid="8028378961867277746">"תרגום"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for niu_actions_confirmation_title (3863451714863526143) -->
-    <skip />
-    <!-- no translation found for niu_actions_confirmation_text (2105271481950866089) -->
-    <skip />
-    <!-- no translation found for niu_actions_confirmation_no (6641104944008154587) -->
-    <skip />
-    <!-- no translation found for niu_actions_confirmation_yes (3817302060585371994) -->
-    <skip />
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"תרגום טקסט שמוצג במסך או האזנה לו"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"‏ייתכן שישותף עם Google מידע כגון טקסט שמוצג במסך, כתובות אינטרנט וצילומי מסך.\n\nכדי לקבוע איזה מידע ישותף, יש לעבור אל "<b>"הגדרות &gt; אפליקציות &amp;gt אפליקציות ברירת מחדל &gt; אפליקציית עוזר דיגיטלי"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ביטול"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"הבנתי"</string>
 </resources>
-- 
GitLab


From 2448e73a440b0cf936642c521c11a81843ea9fe5 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sun, 4 Jul 2021 19:08:08 +0000
Subject: [PATCH 1575/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I8c3a4daf77eaff36f51ff8cc7a3438507615cfec
---
 res/values-my/strings.xml | 2 +-
 res/values-ne/strings.xml | 3 +--
 res/values-ur/strings.xml | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index e71ebaaee1..ec768598b1 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -28,7 +28,7 @@
     <string name="shortcut_not_available" msgid="2536503539825726397">"ဖြတ်လမ်း မရနိုင်ပါ"</string>
     <string name="home_screen" msgid="5629429142036709174">"ပင်မစာမျက်နှာ"</string>
     <string name="recent_task_option_split_screen" msgid="6690461455618725183">"မျက်နှာပြင် ခွဲ၍ပြသခြင်း"</string>
-    <string name="long_press_widget_to_add" msgid="3587712543577675817">"ဝိဂျက်ကို ရွှေ့ရန် နှစ်ချက်တို့ပြီး ဖိထားပါ။"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"ဝိဂျက်ကို ရွှေ့ရန် တို့ပြီး ဖိထားပါ။"</string>
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ဝိဂျက်ကို ရွှေ့ရန် (သို့) စိတ်ကြိုက်လုပ်ဆောင်ချက်များကို သုံးရန် နှစ်ချက်တို့ပြီး ဖိထားပါ။"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"အလျား %1$d နှင့် အမြင့် %2$d"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index c17245043c..afedf854f0 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"कुनै विजेट सार्न वा आफ्नो रोजाइका कारबाही प्रयोग गर्न डबल ट्याप गरेर छोइराख्नुहोस्।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d चौडाइ गुणा %2$d उचाइ"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> विजेट"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"यो विजेट होम स्क्रिनमा यताउता सार्न त्यसमा टच एन्ड होल्ड गर्नुहोस्"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"होम स्क्रिनमा हाल्नुहोस्"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 4e660fbac0..f9a096ce38 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -157,12 +157,12 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"ذاتی"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"دفتری"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"دفتری پروفائل"</string>
-    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"‏ورک ایپس پر بَیج لگایا گیا ہے اور آپ کا IT منتظم اسے دیکھ سکتا ہے"</string>
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"‏ورک ایپس پر بَیج لگا ہوتا ہے اور آپ کا IT منتظم انہیں دیکھ سکتا ہے"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"سمجھ آ گئی"</string>
     <string name="work_apps_paused_title" msgid="3040901117349444598">"ورک ایپس موقوف ہیں"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"آپ کی ورک ایپس آپ کو اطلاعات نہیں بھیج سکتیں، آپ کی بیٹری کا استعمال یا آپ کے مقام تک رسائی حاصل نہیں کر سکتی ہیں"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"ورک ایپس آف ہیں۔ آپ کی ورک ایپس آپ کو اطلاعات نہیں بھیج سکتیں، آپ کی بیٹری استعمال یا آپ کے مقام تک رسائی حاصل نہیں کر سکتی ہیں"</string>
-    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"‏ورک ایپس پر بَیج لگایا ہے اور آپ کا IT منتظم انہیں دیکھ سکتا ہے"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"‏ورک ایپس پر بَیج لگا ہوتا ہے اور آپ کا IT منتظم انہیں دیکھ سکتا ہے"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"سمجھ آ گئی"</string>
     <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"ورک ایپس آف کریں"</string>
     <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"ورک ایپس آن کریں"</string>
-- 
GitLab


From 74876a5161ae5320bd27f9634429f9b59dba3223 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 7 Jul 2021 16:30:01 +0000
Subject: [PATCH 1576/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I5f86f87b40f235e4aa46383c09dda8cdf596b692
---
 quickstep/res/values-az/strings.xml     | 14 +++++++-------
 quickstep/res/values-bs/strings.xml     | 20 ++++++++++----------
 quickstep/res/values-fa/strings.xml     |  4 ++--
 quickstep/res/values-gl/strings.xml     |  2 +-
 quickstep/res/values-hr/strings.xml     |  6 +++---
 quickstep/res/values-iw/strings.xml     |  4 ++--
 quickstep/res/values-kn/strings.xml     |  4 ++--
 quickstep/res/values-ky/strings.xml     |  4 ++--
 quickstep/res/values-mk/strings.xml     |  4 ++--
 quickstep/res/values-ml/strings.xml     |  2 +-
 quickstep/res/values-or/strings.xml     |  2 +-
 quickstep/res/values-pa/strings.xml     |  4 ++--
 quickstep/res/values-pt-rPT/strings.xml |  6 +++---
 quickstep/res/values-sl/strings.xml     |  4 ++--
 quickstep/res/values-te/strings.xml     |  8 ++++----
 quickstep/res/values-th/strings.xml     | 10 +++++-----
 quickstep/res/values-uz/strings.xml     |  6 +++---
 quickstep/res/values-zh-rHK/strings.xml |  2 +-
 18 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/quickstep/res/values-az/strings.xml b/quickstep/res/values-az/strings.xml
index 18a0bceb2f..377292a56c 100644
--- a/quickstep/res/values-az/strings.xml
+++ b/quickstep/res/values-az/strings.xml
@@ -45,9 +45,9 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Tətbiq təklifləri aktivdir"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Tətbiq təklifləri deaktivdir"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Proqnozlaşdırılan tətbiq: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Ekranın ən kənarından soldan sağa sürüşdürün."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Ekranın ən kənar solundan sağa sürüşdürün."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Ekranın sol kənarından ortasına sürüşdürüb buraxın."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Ən sağ tərəfdən sürüşdürdüyünüzə əmin olun."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Ekranın ən kənar sağından sola sürüşdürün."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Ekranın sağ kənarından ortasına sürüşdürüb buraxın."</string>
     <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Geri qayıtmaq üçün soldan sürüşdürmək qaydasını öyrəndiniz."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Geri qayıtmaq üçün sağdan sürüşdürmək qaydasını öyrəndiniz. Sonra tətbiqləri keçirməyi öyrənin."</string>
@@ -58,16 +58,16 @@
     <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Geri qayıtmaq üçün sağdan sürüşdürün"</string>
     <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Son ekrana qayıtmaq üçün ekranın sol kənarından ortasına doğru sürüşdürün."</string>
     <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Həmçinin ekranın sağ kənarından ortasına sürüşdürərək son ekrana qayıda bilərsiniz. İndi sınayın."</string>
-    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Ekranın aşağı kənarından yuxarı sürüşdürdüyünüzə əmin olun."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Ekranın ən kənar aşağısından yuxarı sürüşdürün."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Buraxmazdan əvvəl durdurmadığınıza əmin olun."</string>
-    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Birbaşa yuxarı sürüşdürdüyünüzə əmin olun."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Birbaşa yuxarı sürüşdürün."</string>
     <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Əsas səhifəyə keçmə jestini tamamladınız. Sonra geri qayıtmağı öyrənin."</string>
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Əsas səhifəyə keçmə jestini tamamladınız."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Əsas səhifəyə keçmək üçün sürüşdürün"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Ekranın aşağısından yuxarısına sürüşdürün. Bu jest həmişə Əsas səhifəyə aparır."</string>
-    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Ekranın aşağı kənarından yuxarı sürüşdürdüyünüzə əmin olun."</string>
-    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Buraxmadan əvvəl pəncərəni daha uzun müddət saxlamağa çalışın."</string>
-    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Birbaşa yuxarı sürüşdürdüyünüzə, sonra durdurduğunuza əmin olun."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Ekranın ən kənar aşağısından yuxarı sürüşdürün."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Barmağı buraxmadan öncə displeydə bir müddət saxlayın."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Sürüşdürüb ekranın yuxarı kənarında saxlayın."</string>
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Jestlərdən istifadə qaydasını öyrəndiniz. Jestləri deaktiv etmək üçün Ayarlara keçin."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Tətbiqləri keçirmə jestini tamamladınız."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Tətbiqi keçirmək üçün sürüşdürün"</string>
diff --git a/quickstep/res/values-bs/strings.xml b/quickstep/res/values-bs/strings.xml
index 4ec2e06317..1dc595514d 100644
--- a/quickstep/res/values-bs/strings.xml
+++ b/quickstep/res/values-bs/strings.xml
@@ -45,10 +45,10 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Prijedlozi aplikacija su omogućeni"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Prijedlozi aplikacija su onemogućeni"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predviđena aplikacija: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Obratite pažnju da prevučete s krajnjeg lijevog ruba."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Obratite pažnju da prevučete s lijevog ruba prema sredini ekrana, a zatim pustite."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Obratite pažnju da prevučete s krajnjeg desnog ruba."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Obratite pažnju da prevučete s desnog ruba prema sredini ekrana, a zatim pustite."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Trebate prevući s krajnjeg lijevog ruba."</string>
+    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Trebate prevući s lijevog ruba prema sredini ekrana, a zatim pustiti."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Trebate prevući s krajnjeg desnog ruba."</string>
+    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Trebate prevući s desnog ruba prema sredini ekrana, a zatim pustiti."</string>
     <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Naučili ste kako prevući slijeva nadesno da se vratite."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Naučili ste kako prevući zdesna da se vratite. Sljedeće naučite kako prebacivati između aplikacija."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Završili ste pokret za vraćanje."</string>
@@ -58,16 +58,16 @@
     <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Prevucite prstom zdesna ulijevo da se vratite"</string>
     <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Da se vratite na posljednji ekran na kojem ste bili, prevucite od lijevog ruba do sredine ekrana."</string>
     <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Na posljednji ekran se možete vratiti i prevlačenjem od desnog ruba do sredine ekrana. Isprobajte."</string>
-    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Obratite pažnju da prevučete prema gore s donjeg ruba ekrana."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Trebate prevući prema gore s donjeg ruba ekrana."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Obratite pažnju da ne zastanete prije puštanja."</string>
-    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Obratite pažnju da prevučete ravno prema gore."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Trebate prevući ravno prema gore."</string>
     <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Završili ste pokret za otvaranje Početnog ekrana. Sljedeće naučite kako se vratiti."</string>
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Završili ste pokret za otvaranje Početnog ekrana."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Prevucite da odete na početni ekran"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Prevucite s dna ekrana prema gore. Tim pokretom uvijek idete na Početni ekran."</string>
-    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Obratite pažnju da prevučete prema gore s donjeg ruba ekrana."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Trebate prevući prema gore s donjeg ruba ekrana."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Pokušajte zadržati prozor duže prije puštanja."</string>
-    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Obratite pažnju da prevučete ravno prema gore, a zatim zastanite."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Trebate prevući ravno prema gore, a zatim zastati."</string>
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Naučili ste kako koristiti pokrete. Idite u Postavke da isključite pokrete."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Završili ste pokret za prebacivanje između aplikacija."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Prevucite da prebacujete između aplikacija"</string>
@@ -75,8 +75,8 @@
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Sve je spremno"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Naprijed"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Postavke"</string>
-    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Pokušaj ponovo"</string>
-    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Lijepo!"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Pokušajte ponovo"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Odlično!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Vodič <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Sve je spremno!"</string>
     <string name="allset_hint" msgid="459504134589971527">"Prevucite prema gore da odete na početnu stranicu"</string>
diff --git a/quickstep/res/values-fa/strings.xml b/quickstep/res/values-fa/strings.xml
index 721b968890..b8fd926401 100644
--- a/quickstep/res/values-fa/strings.xml
+++ b/quickstep/res/values-fa/strings.xml
@@ -45,9 +45,9 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"«پیشنهاد برنامه» فعال است"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"«پیشنهاد برنامه» غیرفعال است"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"برنامه پیش‌بینی‌شده: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"دقت کنید که از ابتدای لبه سمت چپ تند بکشید."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"دقت کنید که از انتهای سمت چپ لبه تند بکشید."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"دقت کنید که از لبه سمت چپ تند به وسط صفحه بکشید و رها کنید."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"دقت کنید که از ابتدای لبه سمت راست تند بکشید."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"دقت کنید که از انتهای سمت راست لبه تند بکشید."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"دقت کنید که از لبه سمت راست تند به وسط صفحه بکشید و رها کنید."</string>
     <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"یاد گرفتید چگونه برای رفتن به عقب از سمت چپ تند بکشید."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"یاد گرفتید چگونه برای رفتن به عقب از سمت راست تند بکشید. مورد بعدی، با نحوه جابه‌جا شدن بین برنامه‌ها آشنا شوید."</string>
diff --git a/quickstep/res/values-gl/strings.xml b/quickstep/res/values-gl/strings.xml
index dca7bb6dd1..5e4164cf23 100644
--- a/quickstep/res/values-gl/strings.xml
+++ b/quickstep/res/values-gl/strings.xml
@@ -55,7 +55,7 @@
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Asegúrate de non pasar o dedo demasiado preto da parte inferior da pantalla."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Podes cambiar a sensibilidade do xesto en Configuración"</string>
     <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Pasa o dedo desde a esquerda para volver"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Pasar o dedo desde a dereita para volver á pantalla anterior"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Pasa o dedo desde a dereita para volver á pantalla anterior"</string>
     <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Para volver á última pantalla, pasa o dedo desde o bordo esquerdo ata a metade da pantalla."</string>
     <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Tamén podes volver pasando o dedo desde o bordo dereito ata a metade da pantalla. Próbao agora."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Asegúrate de pasar o dedo cara arriba desde o bordo inferior da pantalla."</string>
diff --git a/quickstep/res/values-hr/strings.xml b/quickstep/res/values-hr/strings.xml
index c3520cbcd5..c1a3bf63a6 100644
--- a/quickstep/res/values-hr/strings.xml
+++ b/quickstep/res/values-hr/strings.xml
@@ -49,13 +49,13 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pazite da prijeđete prstom od lijevog ruba do sredine zaslona i podignite prst."</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pazite da prijeđete prstom od krajnjeg desnog ruba."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pazite da prijeđete prstom od desnog ruba do sredine zaslona i podignite prst."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Naučili ste kako prijeći prstom slijeva udesno da biste se vratili."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Naučili ste kako prijeći prstom zdesna ulijevo da biste se vratili. Sad saznajte kako promijeniti aplikaciju."</string>
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Naučili ste kako prijeći prstom slijeva da biste se vratili."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Naučili ste kako prijeći prstom zdesna da biste se vratili. Sad saznajte kako promijeniti aplikaciju."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Izvršili ste pokret za povratak."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pazite da ne prijeđete prstom preblizu dnu zaslona."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Osjetljivost pokreta povratka promijenite u postavkama"</string>
     <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Prijeđite prstom slijeva udesno da biste se vratili"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Prijeđite prstom zdesna ulijevo da biste se vratili"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Prijeđite prstom zdesna biste se vratili"</string>
     <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Da biste se vratili na posljednji posjećeni zaslon, prijeđite od lijevog ruba do sredine zaslona."</string>
     <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Na posljednji se zaslon možete vratiti i prelaskom od desnog ruba do sredine zaslona. Isprobajte odmah."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pazite da prijeđete prstom prema gore od donjeg ruba zaslona."</string>
diff --git a/quickstep/res/values-iw/strings.xml b/quickstep/res/values-iw/strings.xml
index ed69faaba5..1f5ee1e43e 100644
--- a/quickstep/res/values-iw/strings.xml
+++ b/quickstep/res/values-iw/strings.xml
@@ -66,7 +66,7 @@
     <string name="home_gesture_intro_title" msgid="836590312858441830">"יש להחליק כדי לעבור למסך הבית"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"החלקה למעלה מתחתית המסך תמיד תעביר אותך למסך הבית."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"חשוב להקפיד להחליק למעלה מהקצה התחתון של המסך."</string>
-    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"יש לנסות להחזיק את החלון לזמן רב יותר לפני שמשחררים."</string>
+    <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"אפשר להחזיק את החלון זמן רב יותר לפני שמשחררים."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"חשוב להקפיד להחליק ישר למעלה ואז להמתין."</string>
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"למדת איך להשתמש בתנועות. ניתן להשבית את התנועות ב\'הגדרות\'."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"השלמת את תנועת המעבר בין האפליקציות."</string>
@@ -75,7 +75,7 @@
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"הכול מוכן"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"הבא"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"הגדרות"</string>
-    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"אפשר לנסות שוב"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ניסיון חוזר"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"איזה יופי!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"מדריך <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"הכול מוכן!"</string>
diff --git a/quickstep/res/values-kn/strings.xml b/quickstep/res/values-kn/strings.xml
index 306f153035..a1d03e60c2 100644
--- a/quickstep/res/values-kn/strings.xml
+++ b/quickstep/res/values-kn/strings.xml
@@ -45,9 +45,9 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ಆ್ಯಪ್ ಸಲಹೆಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ಆ್ಯಪ್ ಸಲಹೆಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ಶಿಫಾರಸು ಮಾಡಿದ ಆ್ಯಪ್: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ನೀವು ದೂರದ ಎಡ ಅಂಚಿನಿಂದ ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ನೀವು ಎಡ ಭಾಗದ ಅಂಚಿನಿಂದ ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ಎಡ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ ಹಾಗೂ ನಿಮ್ಮ ಬೆರಳನ್ನು ಮೇಲೆತ್ತಿ."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ನೀವು ದೂರದ ಬಲ ಅಂಚಿನಿಂದ ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ನೀವು ಬಲ ಅಂಚಿನಿಂದ ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ಬಲ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ ಹಾಗೂ ನಿಮ್ಮ ಬೆರಳನ್ನು ಮೇಲೆತ್ತಿ."</string>
     <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"ಹಿಂದಕ್ಕೆ ಹೋಗಲು ಎಡದಿಂದ ಸ್ವೈಪ್ ಮಾಡುವುದು ಹೇಗೆಂದು ನೀವು ಕಲಿತಿರಿ."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ಹಿಂದೆ ಹೋಗಲು ಬಲದಿಂದ ಸ್ವೈಪ್ ಮಾಡುವುದು ಹೇಗೆಂದು ಕಲಿತಿರಿ. ಮುಂದೆ, ಆ್ಯಪ್‌ಗಳನ್ನು ಬದಲಿಸುವುದು ಹೇಗೆಂದು ತಿಳಿಯಿರಿ."</string>
diff --git a/quickstep/res/values-ky/strings.xml b/quickstep/res/values-ky/strings.xml
index 7f6741596e..0590f9c7d4 100644
--- a/quickstep/res/values-ky/strings.xml
+++ b/quickstep/res/values-ky/strings.xml
@@ -75,7 +75,7 @@
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Дапдаяр!"</string>
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Кийинки"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Жөндөөлөр"</string>
-    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Кайра аракет кылыңыз"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Кайталап көрүңүз"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Сонун!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Үйрөткүч: <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Бүттү!"</string>
@@ -88,5 +88,5 @@
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Жаңсап өтүү үйрөткүчүн өт-рүп жибер-би?"</string>
     <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Аны кийин <xliff:g id="NAME">%1$s</xliff:g> колдонмосунан табасыз"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Жокко чыгаруу"</string>
-    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Өтк-п жиберүү"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Өткрп жиберүү"</string>
 </resources>
diff --git a/quickstep/res/values-mk/strings.xml b/quickstep/res/values-mk/strings.xml
index 1b924130da..0b4e87f96f 100644
--- a/quickstep/res/values-mk/strings.xml
+++ b/quickstep/res/values-mk/strings.xml
@@ -45,9 +45,9 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Предлозите за апликации се овозможени"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Предлозите за апликации се оневозможени"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Предвидена апликација: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Повлечете од подалечниот лев агол."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Влечете од левиот раб."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Повлечете од левиот раб кон средината на екранот и пуштете."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Повлечете од подалечниот десен агол."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Влечете од десниот раб."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Повлечете од десниот раб кон средината на екранот и пуштете."</string>
     <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Научивте како да повлекувате одлево за да одите назад."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Научивте како да повлекувате оддесно за да одите назад. Следно, дознајте како да се префрлате помеѓу апликации."</string>
diff --git a/quickstep/res/values-ml/strings.xml b/quickstep/res/values-ml/strings.xml
index 3d9031770a..faa5dddc25 100644
--- a/quickstep/res/values-ml/strings.xml
+++ b/quickstep/res/values-ml/strings.xml
@@ -57,7 +57,7 @@
     <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"മടങ്ങാൻ ഇടതുഭാഗത്ത് നിന്ന് സ്വൈപ്പ് ചെയ്യുക"</string>
     <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"മടങ്ങാൻ വലതുഭാഗത്ത് നിന്ന് സ്വൈപ്പ് ചെയ്യുക"</string>
     <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"നിങ്ങളുടെ മുമ്പത്തെ സ്ക്രീനിലേക്ക് മടങ്ങാൻ, സ്ക്രീനിന്റെ ഇടത്തേ അരികിൽ നിന്ന് നടുവിലേക്ക് സ്വൈപ്പ് ചെയ്യുക."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"സ്ക്രീനിന്റെ വലത്തേ അരികിൽ നിന്ന് നടുവിലേക്ക് സ്വൈപ്പ് ചെയ്തും മുൻ സ്ക്രീനിലെത്താം. ഇതിന് ശ്രമിക്കൂ."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"സ്ക്രീനിന്റെ വലത്തേ അരികിൽ നിന്ന് നടുവിലേക്ക് സ്വൈപ്പ് ചെയ്തും മുൻ സ്ക്രീനിലെത്താം. ശ്രമിച്ചുനോക്കൂ."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"സ്‌ക്രീനിന്റെ താഴത്തെ അരികിൽ നിന്ന് മുകളിലേക്ക് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"വിടുന്നതിന് മുമ്പ് നിങ്ങൾ താൽക്കാലികമായി നിർത്തുന്നില്ലെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"നേരെ മുകളിലേക്ക് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പിക്കുക."</string>
diff --git a/quickstep/res/values-or/strings.xml b/quickstep/res/values-or/strings.xml
index 24c8f74262..e2517dda6f 100644
--- a/quickstep/res/values-or/strings.xml
+++ b/quickstep/res/values-or/strings.xml
@@ -49,7 +49,7 @@
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ଆପଣ ସ୍କ୍ରିନର ବାମ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରି ଛାଡ଼ି ଦେଉଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ଆପଣ ଦୂର-ଡାହାଣ ଧାରରୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ଆପଣ ସ୍କ୍ରିନର ଡାହାଣ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରି ଛାଡ଼ି ଦେଉଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"ପଛକୁ ଫେରିବା ପାଇଁ କିପରି ବାମ ଧାରରୁ ସ୍ୱାଇପ୍ କରିବେ ତାହା ଆପଣ ଜାଣିଲେ।"</string>
+    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"ପଛକୁ ଫେରିବା ପାଇଁ ବାମ ପାର୍ଶ୍ଵରୁ କିପରି ସ୍ୱାଇପ୍ କରିବାକୁ ହେବ ତାହା ଆପଣ ଜାଣିଲେ।"</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ଆପଣ ଡାହାଣ ଧାରରୁ ସ୍ୱାଇପ୍ କରି ପଛକୁ ଫେରିବା ଜାଣିଲେ। ତା\'ପରେ, ଆପଗୁଡ଼ିକୁ କିପରି ସ୍ୱିଚ୍ କରିବେ ତାହା ଜାଣନ୍ତୁ।"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ଆପଣ \'ପଛକୁ ଫେରନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି।"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ଆପଣ ସ୍କ୍ରିନର ତଳଭାଗର ଅତି ନିକଟରୁ ସ୍ୱାଇପ୍ କରୁନଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
diff --git a/quickstep/res/values-pa/strings.xml b/quickstep/res/values-pa/strings.xml
index 0dc125a1cf..cb2408e895 100644
--- a/quickstep/res/values-pa/strings.xml
+++ b/quickstep/res/values-pa/strings.xml
@@ -45,9 +45,9 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ਐਪ ਸੁਝਾਵਾਂ ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਗਿਆ"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ਐਪ ਸੁਝਾਵਾਂ ਨੂੰ ਬੰਦ ਕੀਤਾ ਗਿਆ"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ਪੂਰਵ ਅਨੁਮਾਨਿਤ ਐਪ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਦੂਰ-ਖੱਬੇ ਕਿਨਾਰੇ ਤੋਂ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ਇੱਕ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਖੱਬੇ ਪਾਸੇ ਦੇ ਬਿਲਕੁਲ ਕਿਨਾਰੇ ਤੋਂ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਖੱਬੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰਦੇ ਹੋ ਅਤੇ ਛੱਡ ਦਿੰਦੇ ਹੋ।"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਦੂਰ-ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸੱਜੇ ਪਾਸੇ ਦੇ ਬਿਲਕੁਲ ਕਿਨਾਰੇ ਤੋਂ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰਦੇ ਹੋ ਅਤੇ ਛੱਡ ਦਿੰਦੇ ਹੋ।"</string>
     <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"ਤੁਸੀਂ ਪਿੱਛੇ ਜਾਣ ਲਈ ਖੱਬੇ ਪਾਸੇ ਤੋਂ ਸਵਾਈਪ ਕਰਨ ਦਾ ਤਰੀਕਾ ਜਾਣਿਆ।"</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ਤੁਸੀਂ ਪਿੱਛੇ ਜਾਣ ਲਈ ਸੱਜੇ ਪਾਸੇ ਤੋਂ ਸਵਾਈਪ ਕਰਨ ਦਾ ਤਰੀਕਾ ਜਾਣਿਆ। ਅੱਗੇ, ਐਪਾਂ ਵਿਚਾਲੇ ਅਦਲਾ-ਬਦਲੀ ਕਰਨ ਦਾ ਤਰੀਕਾ ਜਾਣੋ।"</string>
diff --git a/quickstep/res/values-pt-rPT/strings.xml b/quickstep/res/values-pt-rPT/strings.xml
index 891bcfb102..48ebd13d76 100644
--- a/quickstep/res/values-pt-rPT/strings.xml
+++ b/quickstep/res/values-pt-rPT/strings.xml
@@ -47,7 +47,7 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App prevista: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Deslize rapidamente com o dedo a partir da extremidade esquerda."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Garanta que desliza rapidamente com o dedo do limite esquerdo até ao centro do ecrã e solta."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Garanta que desliza rapidamente com o dedo a partir da extremidade direita."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Deslize rapidamente com o dedo a partir da extremidade direita."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Garanta que desliza rapidamente com o dedo do limite direito até ao centro do ecrã e solta."</string>
     <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Aprendeu a deslizar rapidamente a partir da esquerda para retroceder."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Aprendeu a deslizar a partir da direita para retroceder. A seguir, saiba como alternar entre apps."</string>
@@ -57,7 +57,7 @@
     <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Deslize rapidamente a partir da esquerda para retroceder"</string>
     <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Deslize rapidamente a partir da direita para retroceder"</string>
     <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Para voltar ao último ecrã, deslize rapidamente a partir do limite esquerdo para o centro do ecrã."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Também pode voltar ao último ecrã ao deslizar da direita para o centro do ecrã. Experimente agora."</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Também pode voltar ao último ecrã deslizando da direita para o centro do ecrã. Experimente agora."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Garanta que desliza rapidamente com o dedo a partir do limite inferior do ecrã."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Garanta que não faz uma pausa antes de soltar."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Garanta que desliza rapidamente com o dedo para cima."</string>
@@ -65,7 +65,7 @@
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Concluiu o gesto para aceder à Página inicial."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Deslize rapidamente com o dedo para aceder à Página inicial"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Deslize rapidamente para cima a partir da parte inferior. Este gesto abre sempre o ecrã principal."</string>
-    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Garanta que desliza rapidamente com o dedo a partir do limite inferior do ecrã."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Deslize rapidamente com o dedo a partir do limite inferior do ecrã."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Experimente premir a janela durante mais tempo antes de soltar."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Garanta que desliza rapidamente com o dedo para cima e, em seguida, faz uma pausa."</string>
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Aprendeu a utilizar gestos. Para desativar os gestos, aceda às Definições."</string>
diff --git a/quickstep/res/values-sl/strings.xml b/quickstep/res/values-sl/strings.xml
index ed035aa74e..b4cb706c53 100644
--- a/quickstep/res/values-sl/strings.xml
+++ b/quickstep/res/values-sl/strings.xml
@@ -45,9 +45,9 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Predlogi aplikacij so omogočeni."</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Predlogi aplikacij so onemogočeni."</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predvidena aplikacija: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pazite, da ne povlečete s skrajno levega roba."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pazite, da povlečete s skrajno levega roba."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pazite, da povlečete z levega roba do sredine zaslona in dvignete prst."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pazite, da ne povlečete s skrajno desnega roba."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pazite, da povlečete s skrajno desnega roba."</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pazite, da povlečete z desnega roba do sredine zaslona in dvignete prst."</string>
     <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Naučili ste se, kako povlečete z leve za vrnitev."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Naučili ste se, kako povlečete z desne za vrnitev. Zdaj se naučite preklapljanja med aplikacijami."</string>
diff --git a/quickstep/res/values-te/strings.xml b/quickstep/res/values-te/strings.xml
index 0d18e35745..365cab7024 100644
--- a/quickstep/res/values-te/strings.xml
+++ b/quickstep/res/values-te/strings.xml
@@ -45,9 +45,9 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"యాప్ సలహాలు ఎనేబుల్ చేయబడ్డాయి"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"యాప్ సూచ‌న‌లు డిజేబుల్‌ చేయబడ్డాయి"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"సూచించబడిన యాప్: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"మీరు చాలా-ఎడమ అంచు నుండి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ఎడమ వైపు చిట్ట చివరి అంచు నుండి స్వయిప్ చేస్తున్నారని నిర్ధారించుకోండి."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"మీరు ఎడమ అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేశారని నిర్ధారించుకోని, ఆపై మీ వేలిని ఎత్తండి."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"మీరు చాలా-కుడి అంచు నుండి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"కుడి వైపు చిట్ట చివరి అంచు నుండి స్వయిప్ చేస్తున్నారని నిర్ధారించుకోండి"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"మీరు కుడి అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేశారని నిర్ధారించుకోని, ఆపై మీ వేలిని ఎత్తండి."</string>
     <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"వెనుకకు వెళ్లడానికి ఎడమ నుండి ఎలా స్వైప్ చేయాలో మీరు నేర్చుకున్నారు."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"వెనుకకు వెళ్లడానికి కుడి నుండి స్వైప్ ఎలానో మీకు తెలుసు. తర్వాత, యాప్‌ల మధ్య ఎలా మారాలో తెలుసుకోండి."</string>
@@ -58,14 +58,14 @@
     <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"వెనుకకు వెళ్లడానికి కుడి వైపు నుండి స్వైప్ చేయండి"</string>
     <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"మీరు ఉన్న చివరి స్క్రీన్‌కు తిరిగి వెళ్లడానికి, ఎడమ అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేయండి."</string>
     <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"కుడి అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేయడం ద్వారా మీరు చివరి స్క్రీన్‌కు తిరిగి వెళ్లవచ్చు. దీన్ని ఇప్పుడే ట్రై చేయండి."</string>
-    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"మీరు స్క్రీన్ దిగువ అంచు నుండి పైకి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"మీరు స్క్రీన్ దిగువ అంచు నుండి పైకి స్వయిప్ చేస్తున్నారని నిర్ధారించుకోండి."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"బయలుదేరే ముందు మీరు పాజ్ చేయకుండా చూసుకోండి."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"మీరు నేరుగా పైకి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
     <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"మీరు మొదటి ట్యాబ్‌కు వెళ్లే సంజ్ఞను పూర్తి చేశారు. తర్వాత, వెనుకకు ఎలా వెళ్లాలో తెలుసుకోండి."</string>
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"మీరు మొదటి ట్యాబ్‌కు వెళ్లే సంజ్ఞను పూర్తి చేశారు."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"వర్చువల్ హోమ్‌కి వెళ్లడానికి స్వైప్ చేయండి"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"మీ స్క్రీన్ కింది నుండి పైకి స్వైప్ చేయి. ఈ సంజ్ఞ ఎప్పుడూ మిమ్మల్ని మొదటి స్క్రీన్‌కు తీసుకెళ్తుంది."</string>
-    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"మీరు స్క్రీన్ దిగువ అంచు నుండి పైకి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"మీరు స్క్రీన్ దిగువ అంచు నుండి పైకి స్వయిప్ చేస్తున్నారని నిర్ధారించుకోండి."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"రిలీజ్ చేయడానికి ముందు విండోను ఎక్కువసేపు పట్టుకోడానికి ట్రై చేయండి."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"మీరు నేరుగా స్వైప్ చేశారని నిర్ధారించుకోండి, ఆపై పాజ్ చేయండి."</string>
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"మీరు సంజ్ఞలను ఎలా ఉపయోగించాలో నేర్చుకున్నారు. సంజ్ఞలను ఆఫ్ చేయడానికి, సెట్టింగ్‌లకు వెళ్లండి."</string>
diff --git a/quickstep/res/values-th/strings.xml b/quickstep/res/values-th/strings.xml
index 1758589f8b..13dcb10512 100644
--- a/quickstep/res/values-th/strings.xml
+++ b/quickstep/res/values-th/strings.xml
@@ -45,9 +45,9 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"เปิดใช้แอปแนะนำแล้ว"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ปิดใช้คำแนะนำเกี่ยวกับแอปอยู่"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"แอปที่คาดว่าจะใช้: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ตรวจสอบว่าปัดจากขอบด้านซ้ายสุด"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ปัดจากขอบด้านซ้ายสุด"</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ตรวจสอบว่าปัดจากขอบด้านซ้ายไปตรงกลางหน้าจอ แล้วยกนิ้วขึ้น"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ตรวจสอบว่าปัดจากขอบด้านขวาสุด"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ปัดจากขอบด้านขวาสุด"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ตรวจสอบว่าปัดจากขอบด้านขวาไปตรงกลางหน้าจอ แล้วยกนิ้วขึ้น"</string>
     <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"คุณรู้วิธีปัดจากด้านซ้ายเพื่อย้อนกลับแล้ว"</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"คุณรู้วิธีปัดจากด้านขวาเพื่อย้อนกลับแล้ว ต่อไปดูวิธีสลับแอป"</string>
@@ -57,15 +57,15 @@
     <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"ปัดจากด้านซ้ายเพื่อย้อนกลับ"</string>
     <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"ปัดจากด้านขวาเพื่อย้อนกลับ"</string>
     <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"หากต้องการย้อนกลับไปที่หน้าจอล่าสุดที่เปิด ให้ปัดจากขอบด้านซ้ายไปตรงกลางหน้าจอ"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"หรือจะกลับไปหน้าจอล่าสุดโดยปัดจากขอบขวาไปตรงกลางหน้าจอก็ได้ ลองเลย"</string>
-    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ตรวจสอบว่าปัดขึ้นจากขอบด้านล่างของหน้าจอ"</string>
+    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"กลับไปหน้าจอก่อนหน้าโดยปัดจากขอบขวาไปตรงกลางหน้าจอ ลองเลย"</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ปัดขึ้นจากขอบด้านล่างของหน้าจอ"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ตรวจสอบว่าไม่มีการหยุดชั่วคราวก่อนยกนิ้วขึ้น"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ตรวจสอบว่าปัดขึ้นในแนวตรง"</string>
     <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"คุณทำท่าทางสัมผัสเพื่อไปที่หน้าแรกเสร็จแล้ว ต่อไปดูวิธีย้อนกลับ"</string>
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"คุณทำท่าทางสัมผัสเพื่อไปที่หน้าแรกเสร็จแล้ว"</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"ปัดเพื่อไปที่หน้าแรก"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"ปัดขึ้นจากด้านล่างของหน้าจอ ท่าทางสัมผัสนี้จะนำคุณไปที่หน้าจอหลักเสมอ"</string>
-    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ตรวจสอบว่าปัดขึ้นจากขอบด้านล่างของหน้าจอ"</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ปัดขึ้นจากขอบด้านล่างของหน้าจอ"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"ลองแตะหน้าต่างค้างไว้นานขึ้นก่อนปล่อยนิ้ว"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"ตรวจสอบว่าปัดขึ้นในแนวตรง แล้วหยุดชั่วคราว"</string>
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"คุณรู้วิธีใช้ท่าทางสัมผัสแล้ว หากต้องการปิดท่าทางสัมผัส ให้ไปที่การตั้งค่า"</string>
diff --git a/quickstep/res/values-uz/strings.xml b/quickstep/res/values-uz/strings.xml
index 156730dd4f..b5321706c3 100644
--- a/quickstep/res/values-uz/strings.xml
+++ b/quickstep/res/values-uz/strings.xml
@@ -45,9 +45,9 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Ilova tavsiyalari yoqildi"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Endi ilova takliflari chiqmaydi"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Taklif etilgan ilova: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Barmoqni chapdagi eng chekkadan suring."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Ekranning chap chetidan boshlab oʻngga suring."</string>
     <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Barmoqni ekranning chap chetidan oʻrtasigacha suring va ekrandan uzing."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Barmoqni oʻngdagi eng chekkadan suring."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Ekran chetidan boshlab oʻngdan chapga suring"</string>
     <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Barmoqni ekranning oʻng chetidan oʻrtasigacha suring va ekrandan uzing."</string>
     <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Ortga qaytish uchun chapdan surishni oʻrgandingiz."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Ortga qaytish uchun oʻngdan surishni oʻrgandingiz. Endi ilovalarni almashtirishni oʻrganamiz."</string>
@@ -55,7 +55,7 @@
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Barmoqni ekran pastiga yaqin surmaslikka harakat qiling."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Orqaga ishorasi sezuvchanligi Sozlamalardan oʻzgartiriladi"</string>
     <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Orqaga qaytish uchun chapdan suring"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Orqaga qaytish uchun oʻngdan suring"</string>
+    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Orqaga qaytish uchun oʻngdan chapga suring"</string>
     <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Oxirgi ekranga qaytish uchun barmoqni ekranning chap chekkasidan oʻrtasigacha suring."</string>
     <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Shuningdek, oʻng chetdan ekran oʻrtasiga surish orqali ham oxirgi ekranga qaytish mumkin. Hoziroq sinang."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Barmoqni ekranning pastki chetidan yuqoriga suring."</string>
diff --git a/quickstep/res/values-zh-rHK/strings.xml b/quickstep/res/values-zh-rHK/strings.xml
index 5b03b023ee..81989d11ff 100644
--- a/quickstep/res/values-zh-rHK/strings.xml
+++ b/quickstep/res/values-zh-rHK/strings.xml
@@ -76,7 +76,7 @@
     <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"繼續"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"設定"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"再試一次"</string>
-    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"很好！"</string>
+    <string name="gesture_tutorial_nice" msgid="2936275692616928280">"做得好！"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"教學課程 <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"設定完成！"</string>
     <string name="allset_hint" msgid="459504134589971527">"向上滑動即可前往主畫面"</string>
-- 
GitLab


From 7f8a8f6ecdc598a6340ed17d99d246622d657078 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 7 Jul 2021 16:30:28 +0000
Subject: [PATCH 1577/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I9769b39a02aa7e2c5546b2dbf4cf6e35c13f8fb4
---
 go/quickstep/res/values-bn/strings.xml     | 12 ++++--------
 go/quickstep/res/values-fr-rCA/strings.xml | 12 ++++--------
 go/quickstep/res/values-gu/strings.xml     | 12 ++++--------
 go/quickstep/res/values-hi/strings.xml     |  2 +-
 go/quickstep/res/values-kn/strings.xml     | 12 ++++--------
 go/quickstep/res/values-pa/strings.xml     | 12 ++++--------
 go/quickstep/res/values-ru/strings.xml     |  2 +-
 go/quickstep/res/values-sq/strings.xml     | 12 ++++--------
 go/quickstep/res/values-uk/strings.xml     |  2 +-
 go/quickstep/res/values-zu/strings.xml     |  2 +-
 10 files changed, 28 insertions(+), 52 deletions(-)

diff --git a/go/quickstep/res/values-bn/strings.xml b/go/quickstep/res/values-bn/strings.xml
index 78b9df78fd..5b4fd34068 100644
--- a/go/quickstep/res/values-bn/strings.xml
+++ b/go/quickstep/res/values-bn/strings.xml
@@ -5,12 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"শুনুন"</string>
     <string name="action_translate" msgid="8028378961867277746">"অনুবাদ করুন"</string>
     <string name="action_search" msgid="6269564710943755464">"লেন্স"</string>
-    <!-- no translation found for niu_actions_confirmation_title (3863451714863526143) -->
-    <skip />
-    <!-- no translation found for niu_actions_confirmation_text (2105271481950866089) -->
-    <skip />
-    <!-- no translation found for niu_actions_confirmation_no (6641104944008154587) -->
-    <skip />
-    <!-- no translation found for niu_actions_confirmation_yes (3817302060585371994) -->
-    <skip />
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"অনুবাদ করুন বা স্ক্রিনে দেখানো টেক্সট শুনুন"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"আপনার স্ক্রিনে থাকা তথ্য যেমন ওয়েব ঠিকানা এবং স্ক্রিনশট Google-এর সাথে শেয়ার করা হতে পারে।\n\nকোন কোন তথ্য শেয়ার করবেন তা বেছে নিতে, "<b>"সেটিংস &gt; অ্যাপ &gt; ডিফল্ট অ্যাপ &gt; ডিজিটাল অ্যাসিস্ট্যান্ট অ্যাপ"</b>" বিকল্পগুলি বেছে নিন।"</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"বাতিল করুন"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"বুঝেছি"</string>
 </resources>
diff --git a/go/quickstep/res/values-fr-rCA/strings.xml b/go/quickstep/res/values-fr-rCA/strings.xml
index 2b1c5141d5..2ccf503c1f 100644
--- a/go/quickstep/res/values-fr-rCA/strings.xml
+++ b/go/quickstep/res/values-fr-rCA/strings.xml
@@ -5,12 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Écouter"</string>
     <string name="action_translate" msgid="8028378961867277746">"Traduire"</string>
     <string name="action_search" msgid="6269564710943755464">"Lentille"</string>
-    <!-- no translation found for niu_actions_confirmation_title (3863451714863526143) -->
-    <skip />
-    <!-- no translation found for niu_actions_confirmation_text (2105271481950866089) -->
-    <skip />
-    <!-- no translation found for niu_actions_confirmation_no (6641104944008154587) -->
-    <skip />
-    <!-- no translation found for niu_actions_confirmation_yes (3817302060585371994) -->
-    <skip />
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Traduire ou écouter le texte à l\'écran"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Des renseignements comme du texte sur votre écran, des adresses Web et des captures d\'écran peuvent être partagés avec Google.\n\nPour modifier les renseignements que vous partagez, accédez à "<b>"Paramètres &gt; Applications &gt; Applications par défaut &gt; Application d\'assistant numérique"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ANNULER"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
 </resources>
diff --git a/go/quickstep/res/values-gu/strings.xml b/go/quickstep/res/values-gu/strings.xml
index d3357a32b0..13815aa2d1 100644
--- a/go/quickstep/res/values-gu/strings.xml
+++ b/go/quickstep/res/values-gu/strings.xml
@@ -5,12 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"સાંભળો"</string>
     <string name="action_translate" msgid="8028378961867277746">"અનુવાદ કરો"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for niu_actions_confirmation_title (3863451714863526143) -->
-    <skip />
-    <!-- no translation found for niu_actions_confirmation_text (2105271481950866089) -->
-    <skip />
-    <!-- no translation found for niu_actions_confirmation_no (6641104944008154587) -->
-    <skip />
-    <!-- no translation found for niu_actions_confirmation_yes (3817302060585371994) -->
-    <skip />
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"સ્ક્રીન પરની ટેક્સ્ટનો અનુવાદ કરો અથવા સાંભળો"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"તમારી સ્ક્રીન પરની ટેક્સ્ટ, વેબ ઍડ્રેસ અને સ્ક્રીનશૉટ જેવી માહિતી Google સાથે શેર કરવામાં આવી શકે છે.\n\nતમે શેર કરતા હો તેવી માહિતીમાં ફેરફાર કરવા માટે, "<b>"સેટિંગ &gt; ઍપ &gt; ડિફૉલ્ટ ઍપ &gt; ડિજિટલ Assistant ઍપ"</b>" પર જાઓ."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"રદ કરો"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"સમજાઈ ગયું"</string>
 </resources>
diff --git a/go/quickstep/res/values-hi/strings.xml b/go/quickstep/res/values-hi/strings.xml
index 0e51169e10..361a546437 100644
--- a/go/quickstep/res/values-hi/strings.xml
+++ b/go/quickstep/res/values-hi/strings.xml
@@ -6,7 +6,7 @@
     <string name="action_translate" msgid="8028378961867277746">"अनुवाद करें"</string>
     <string name="action_search" msgid="6269564710943755464">"Google Lens"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"स्क्रीन पर मौजूद टेक्स्ट का अनुवाद पाएं या उसे सुनें"</string>
-    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"आपकी स्क्रीन पर मौजूद टेक्स्ट, वेब पते, और स्क्रीनशॉट जैसी जानकारी को Google के साथ शेयर की जा सकती है.\n\nआप Google के साथ किस जानकारी को शेयर करते हैं, इसे कंट्रोल करने के लिए "<b>"सेटिंग &gt; ऐप्लिकेशन &gt; डिफ़ॉल्ट ऐप्लिकेशन &gt; डिजिटल असिस्टेंट ऐप्लिकेशन"</b>" पर जाएं."</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"आपकी स्क्रीन पर मौजूद टेक्स्ट, वेब पते, और स्क्रीनशॉट जैसी जानकारी Google के साथ शेयर की जा सकती है.\n\nआप Google के साथ किस जानकारी को शेयर करते हैं, इसे कंट्रोल करने के लिए "<b>"सेटिंग &gt; ऐप्लिकेशन &gt; डिफ़ॉल्ट ऐप्लिकेशन &gt; डिजिटल असिस्टेंट ऐप्लिकेशन"</b>" पर जाएं."</string>
     <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"रद्द करें"</string>
     <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ठीक है"</string>
 </resources>
diff --git a/go/quickstep/res/values-kn/strings.xml b/go/quickstep/res/values-kn/strings.xml
index 4f1c9cd72e..0e06249269 100644
--- a/go/quickstep/res/values-kn/strings.xml
+++ b/go/quickstep/res/values-kn/strings.xml
@@ -5,12 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"ಆಲಿಸಿ"</string>
     <string name="action_translate" msgid="8028378961867277746">"ಅನುವಾದಿಸಿ"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for niu_actions_confirmation_title (3863451714863526143) -->
-    <skip />
-    <!-- no translation found for niu_actions_confirmation_text (2105271481950866089) -->
-    <skip />
-    <!-- no translation found for niu_actions_confirmation_no (6641104944008154587) -->
-    <skip />
-    <!-- no translation found for niu_actions_confirmation_yes (3817302060585371994) -->
-    <skip />
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"ಸ್ಕ್ರೀನ್ ಮೇಲಿರುವ ಪಠ್ಯವನ್ನು ಅನುವಾದಿಸಿ ಅಥವಾ ಆಲಿಸಿ"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಮೇಲಿರುವ ಪಠ್ಯ, ವೆಬ್ ವಿಳಾಸಗಳು, ಮತ್ತು ಸ್ಕ್ರೀನ್‌ಶಾಟ್‌ಗಳಂತಹ ಮಾಹಿತಿಯನ್ನು Google ಜೊತೆಗೆ ಹಂಚಿಕೊಳ್ಳಬಹುದು.\n\nನೀವು ಯಾವ ಮಾಹಿತಿಯನ್ನು ಹಂಚಿಕೊಳ್ಳುತ್ತೀರಿ ಎಂಬುದನ್ನು ಬದಲಾಯಿಸಲು, "<b>"ಸೆಟ್ಟಿಂಗ್‌ಗಳು, ಆ್ಯಪ್‌ಗಳು ಮತ್ತು ಡೀಫಾಲ್ಟ್ ಆ್ಯಪ್‌ಗಳು, ಡಿಜಿಟಲ್ ಅಸಿಸ್ಟೆಂಟ್ ಆ್ಯಪ್ ಎಂಬಲ್ಲಿ ಹೋಗಿ"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ರದ್ದುಮಾಡಿ"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ಅರ್ಥವಾಯಿತು"</string>
 </resources>
diff --git a/go/quickstep/res/values-pa/strings.xml b/go/quickstep/res/values-pa/strings.xml
index 1854ea7277..3252ec02d9 100644
--- a/go/quickstep/res/values-pa/strings.xml
+++ b/go/quickstep/res/values-pa/strings.xml
@@ -5,12 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"ਸੁਣੋ"</string>
     <string name="action_translate" msgid="8028378961867277746">"ਅਨੁਵਾਦ ਕਰੋ"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for niu_actions_confirmation_title (3863451714863526143) -->
-    <skip />
-    <!-- no translation found for niu_actions_confirmation_text (2105271481950866089) -->
-    <skip />
-    <!-- no translation found for niu_actions_confirmation_no (6641104944008154587) -->
-    <skip />
-    <!-- no translation found for niu_actions_confirmation_yes (3817302060585371994) -->
-    <skip />
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"ਸਕ੍ਰੀਨ \'ਤੇ ਦਿੱਤੀ ਲਿਖਤ ਦਾ ਅਨੁਵਾਦ ਕਰੋ ਜਾਂ ਉਸਨੂੰ ਸੁਣੋ"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ \'ਤੇ ਦਿੱਤੀ ਲਿਖਤ, ਵੈੱਬ ਪਤਿਆਂ ਅਤੇ ਸਕ੍ਰੀਨਸ਼ਾਟਾਂ ਵਰਗੀ ਜਾਣਕਾਰੀ ਨੂੰ Google ਨਾਲ ਸਾਂਝਾ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।\n\nਤੁਹਾਡੇ ਵੱਲੋਂ ਸਾਂਝੀ ਕੀਤੀ ਜਾਣਕਾਰੀ ਨੂੰ ਬਦਲਣ ਲਈ, "<b>"ਸੈਟਿੰਗਾਂ &gt; ਐਪਾਂ &gt; ਪੂਰਵ-ਨਿਰਧਾਰਿਤ ਐਪਾਂ &gt; ਡਿਜੀਟਲ ਸਹਾਇਕ ਐਪ"</b>" \'ਤੇ ਜਾਓ।"</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ਰੱਦ ਕਰੋ"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ਸਮਝ ਲਿਆ"</string>
 </resources>
diff --git a/go/quickstep/res/values-ru/strings.xml b/go/quickstep/res/values-ru/strings.xml
index 41440d49ae..5a726c1f04 100644
--- a/go/quickstep/res/values-ru/strings.xml
+++ b/go/quickstep/res/values-ru/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Поделиться приложением"</string>
+    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Поделиться"</string>
     <string name="action_listen" msgid="2370304050784689486">"Слушать"</string>
     <string name="action_translate" msgid="8028378961867277746">"Перевести"</string>
     <string name="action_search" msgid="6269564710943755464">"Объектив"</string>
diff --git a/go/quickstep/res/values-sq/strings.xml b/go/quickstep/res/values-sq/strings.xml
index d522136daf..0adc077420 100644
--- a/go/quickstep/res/values-sq/strings.xml
+++ b/go/quickstep/res/values-sq/strings.xml
@@ -5,12 +5,8 @@
     <string name="action_listen" msgid="2370304050784689486">"Dëgjo"</string>
     <string name="action_translate" msgid="8028378961867277746">"Përkthe"</string>
     <string name="action_search" msgid="6269564710943755464">"Lentja"</string>
-    <!-- no translation found for niu_actions_confirmation_title (3863451714863526143) -->
-    <skip />
-    <!-- no translation found for niu_actions_confirmation_text (2105271481950866089) -->
-    <skip />
-    <!-- no translation found for niu_actions_confirmation_no (6641104944008154587) -->
-    <skip />
-    <!-- no translation found for niu_actions_confirmation_yes (3817302060585371994) -->
-    <skip />
+    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Përkthe ose dëgjo tekstin në ekran"</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informacionet si teksti në ekranin tënd, adresat e uebit dhe pamjet e ekranit mund të ndahen me Google.\n\nPër të ndryshuar se çfarë informacionesh ndahen, shko te "<b>"Cilësimet &gt; Aplikacionet &gt; Aplikacionet e parazgjedhura &gt; Aplikacioni i asistentit dixhital"</b>"."</string>
+    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ANULO"</string>
+    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"E KUPTOVA"</string>
 </resources>
diff --git a/go/quickstep/res/values-uk/strings.xml b/go/quickstep/res/values-uk/strings.xml
index d26341b7b3..452c0ebffb 100644
--- a/go/quickstep/res/values-uk/strings.xml
+++ b/go/quickstep/res/values-uk/strings.xml
@@ -6,7 +6,7 @@
     <string name="action_translate" msgid="8028378961867277746">"Перекласти"</string>
     <string name="action_search" msgid="6269564710943755464">"Об’єктив"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Перекласти або прослухати текст на екрані"</string>
-    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Ви можете надсилати на сервери Google інформацію, наприклад текст на екрані, веб-адреси або знімки екрана.\n\nЩоб змінити типи даних, які надсилаються, відкрийте "<b>"Налаштування &gt; Додатки &gt; Додатки за умовчанням &gt; Цифровий помічник"</b>"."</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Певна інформація (наприклад, текст на екрані, веб-адреси, знімки екрана) може надсилатися на сервери Google.\n\nЩоб змінити типи даних, які надсилаються, відкрийте "<b>"Налаштування &gt; Додатки &gt; Додатки за умовчанням &gt; Цифровий помічник"</b>"."</string>
     <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"СКАСУВАТИ"</string>
     <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
 </resources>
diff --git a/go/quickstep/res/values-zu/strings.xml b/go/quickstep/res/values-zu/strings.xml
index d8bba48878..176dfe3ca2 100644
--- a/go/quickstep/res/values-zu/strings.xml
+++ b/go/quickstep/res/values-zu/strings.xml
@@ -6,7 +6,7 @@
     <string name="action_translate" msgid="8028378961867277746">"Humusha"</string>
     <string name="action_search" msgid="6269564710943755464">"Ilensi"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Humusha noma ulalele umbhalo osesikrinini"</string>
-    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Imininingwane efana nombhalo esikrinini sakho, amakheli wewebhu, nezithombe-skrini kungabiwa ne-Google.\n\nUkuze ushintshe ukuthi yiluphi ulwazi olwabayo, yiya kokuthi "<b>"Amasethingi &gt; ama-App &gt; Ama-app azenzakalelayo &gt; Umsizi we-app odijithali"</b>"."</string>
+    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Imininingwane efana nombhalo esikrinini sakho, amakheli wewebhu, nezithombe-skrini kungabiwa ne-Google.\n\nUkuze ushintshe ukuthi yiluphi ulwazi olwabayo, yiya kokuthi "<b>"Amasethingi &gt; ama-App &gt; Ama-app azenzekelayo &gt; Umsizi we-app odijithali"</b>"."</string>
     <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"KHANSELA"</string>
     <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"NGIYITHOLILE"</string>
 </resources>
-- 
GitLab


From 5e4aa53bfc784cc1992aa32af0abece4585c883f Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 7 Jul 2021 16:31:09 +0000
Subject: [PATCH 1578/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I0f393aa7d90b9f38e9581c255667e164fed12c25
---
 res/values-as/strings.xml        | 4 ++--
 res/values-b+sr+Latn/strings.xml | 4 ++--
 res/values-be/strings.xml        | 6 +++---
 res/values-bg/strings.xml        | 2 +-
 res/values-bn/strings.xml        | 2 +-
 res/values-bs/strings.xml        | 4 ++--
 res/values-ca/strings.xml        | 2 +-
 res/values-de/strings.xml        | 6 +++---
 res/values-es/strings.xml        | 4 ++--
 res/values-fi/strings.xml        | 6 +++---
 res/values-fr-rCA/strings.xml    | 2 +-
 res/values-fr/strings.xml        | 6 +++---
 res/values-gu/strings.xml        | 3 +--
 res/values-hi/strings.xml        | 4 ++--
 res/values-hr/strings.xml        | 6 +++---
 res/values-hy/strings.xml        | 8 ++++----
 res/values-in/strings.xml        | 2 +-
 res/values-ja/strings.xml        | 8 ++++----
 res/values-kn/strings.xml        | 4 ++--
 res/values-ky/strings.xml        | 6 +++---
 res/values-mn/strings.xml        | 2 +-
 res/values-mr/strings.xml        | 6 +++---
 res/values-pa/strings.xml        | 2 +-
 res/values-pl/strings.xml        | 2 +-
 res/values-ro/strings.xml        | 2 +-
 res/values-sl/strings.xml        | 2 +-
 res/values-sr/strings.xml        | 4 ++--
 res/values-sw/strings.xml        | 6 +++---
 res/values-te/strings.xml        | 6 +++---
 res/values-uk/strings.xml        | 4 ++--
 res/values-uz/strings.xml        | 8 ++++----
 res/values-vi/strings.xml        | 4 ++--
 res/values-zh-rHK/strings.xml    | 8 ++++----
 res/values-zh-rTW/strings.xml    | 4 ++--
 34 files changed, 74 insertions(+), 75 deletions(-)

diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index df3cc1ab8e..b92099e315 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -28,7 +28,7 @@
     <string name="shortcut_not_available" msgid="2536503539825726397">"শ্বৰ্টকাট নাই"</string>
     <string name="home_screen" msgid="5629429142036709174">"গৃহ স্ক্ৰীন"</string>
     <string name="recent_task_option_split_screen" msgid="6690461455618725183">"বিভাজিত স্ক্ৰীন"</string>
-    <string name="long_press_widget_to_add" msgid="3587712543577675817">"ৱিজেট স্থানান্তৰ কৰিবলৈ দুবাৰ টিপি ধৰি ৰাখক।"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"ৱিজেট স্থানান্তৰ কৰিবলৈ টিপি ধৰি ৰাখক।"</string>
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"কোনো ৱিজেট স্থানান্তৰ কৰিবলৈ দুবাৰ টিপি ধৰি ৰাখক অথবা কাষ্টম কাৰ্য ব্যৱহাৰ কৰক।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d বহল x %2$d ওখ"</string>
@@ -159,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"কৰ্মস্থানৰ প্ৰ\'ফাইল"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"কৰ্মস্থানৰ এপ্‌সমূহ প্ৰতীকেৰে চিহ্নিত কৰা হয় আৰু সেইবোৰ আপোনাৰ আইটি প্ৰশাসকৰ বাবে দৃশ্যমান হয়"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"বুজি পালোঁ"</string>
-    <string name="work_apps_paused_title" msgid="3040901117349444598">"কাম সম্পর্কীয় এপ্‌সমূহ পজ হৈ আছে"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"কৰ্মস্থানৰ এপ্‌সমূহ পজ হৈ আছে"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"আপোনাৰ কৰ্মস্থানৰ এপ্‌সমূহে আপোনালৈ জাননী পঠিয়াব, আপোনাৰ বেটাৰী ব্যৱহাৰ কৰিব অথবা আপোনাৰ অৱস্থান এক্সেছ কৰিব নোৱাৰে"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"কৰ্মস্থানৰ এপ্‌সমূহ অফ হৈ আছে। আপোনাৰ কৰ্মস্থানৰ এপ্‌সমূহে আপোনালৈ জাননী পঠিয়াব, আপোনাৰ বেটাৰী ব্যৱহাৰ কৰিব অথবা আপোনাৰ অৱস্থান এক্সেছ কৰিব নোৱাৰে"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"কর্মস্থানৰ এপ্‌সমূহ প্ৰতীকেৰে চিহ্নিত কৰা হয় আৰু সেইবোৰ আপোনাৰ আইটি প্ৰশাসকৰ বাবে দৃশ্যমান হয়"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 66f2d925a5..d173194772 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -28,7 +28,7 @@
     <string name="shortcut_not_available" msgid="2536503539825726397">"Prečica nije dostupna"</string>
     <string name="home_screen" msgid="5629429142036709174">"Početni ekran"</string>
     <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Podeljeni ekran"</string>
-    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Dvaput dodirnite i zadržite radi pomeranja vidžeta."</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Dodirnite i zadržite radi pomeranja vidžeta."</string>
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Dvaput dodirnite i zadržite da biste pomerali vidžet ili koristite prilagođene radnje."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d×%2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"širina od %1$d i visina od %2$d"</string>
@@ -65,7 +65,7 @@
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Pretraži još aplikacija"</string>
     <string name="label_application" msgid="8531721983832654978">"Aplikacija"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Obaveštenja"</string>
-    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Dvaput dodirnite i zadržite radi pomeranja prečice."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Dodirnite i zadržite radi pomeranja prečice."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dvaput dodirnite i zadržite da biste pomerali prečicu ili koristite prilagođene radnje."</string>
     <string name="out_of_space" msgid="6692471482459245734">"Nema prostora na ovom početnom ekranu"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Nema više prostora na traci Omiljeno"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index ce219dacd6..d61861050d 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -69,7 +69,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Апавяшчэнні"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Націсніце і ўтрымлівайце ярлык для перамяшчэння."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Дакраніцеся двойчы і ўтрымлівайце, каб перамясціць ярлык або выкарыстоўваць спецыяльныя дзеянні."</string>
-    <string name="out_of_space" msgid="6692471482459245734">"На гэтым Галоўным экране няма месца"</string>
+    <string name="out_of_space" msgid="6692471482459245734">"На галоўным экране няма месца"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"У латку \"Абранае\" больш няма месца"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Спіс праграм"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Спіс персанальных праграм"</string>
@@ -163,12 +163,12 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Асабістыя"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Працоўныя"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Працоўны профіль"</string>
-    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Працоўныя праграмы маюць значкі і бачныя IT-адміністратару"</string>
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Працоўныя праграмы пазначаны спецыяльнымі значкамі, а таксама бачныя IT-адміністратару"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Зразумела"</string>
     <string name="work_apps_paused_title" msgid="3040901117349444598">"Працоўныя праграмы прыпынены"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Працоўныя праграмы не могуць адпраўляць вам апавяшчэнні, выкарыстоўваць акумулятар або атрымліваць доступ да даных пра ваша месцазнаходжанне"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Працоўныя праграмы выключаны. Яны не могуць адпраўляць вам апавяшчэнні, выкарыстоўваць акумулятар або атрымліваць доступ да вашага месцазнаходжання"</string>
-    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Працоўныя праграмы маюць значкі і бачныя IT-адміністратару"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Працоўныя праграмы пазначаны спецыяльнымі значкамі, а таксама бачныя IT-адміністратару"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Зразумела"</string>
     <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Выключыць працоўныя праграмы"</string>
     <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Уключыць працоўныя праграмы"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 7d477fc5e3..4fb9eae843 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -28,7 +28,7 @@
     <string name="shortcut_not_available" msgid="2536503539825726397">"Няма достъп до прекия път"</string>
     <string name="home_screen" msgid="5629429142036709174">"Начален екран"</string>
     <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Разделен екран"</string>
-    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Докоснете и задръжте за преместване на приспособл."</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Докоснете и задръжте за преместване на приспособление"</string>
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Докоснете двукратно и задръжте за преместване на приспособление или използвайте персонал. действия."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Ширина %1$d и височина %2$d"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 8350e06d4f..167f0cab27 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -28,7 +28,7 @@
     <string name="shortcut_not_available" msgid="2536503539825726397">"শর্টকাটগুলি অনুপলব্ধ"</string>
     <string name="home_screen" msgid="5629429142036709174">"হোম"</string>
     <string name="recent_task_option_split_screen" msgid="6690461455618725183">"স্প্লিট স্ক্রিন"</string>
-    <string name="long_press_widget_to_add" msgid="3587712543577675817">"একটি উইজেট সরাতে টাচ করে ধরে রাখুন।"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"কোনও উইজেট সরাতে সেটি টাচ করে ধরে রাখুন।"</string>
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"একটি উইজেট সরাতে বা কাস্টম অ্যাকশন ব্যবহার করতে ডবল ট্যাপ করে ধরে রাখুন।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%2$d উচ্চতা অনুযায়ী %1$d প্রস্থ"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 6922915ead..f8dd8f1b49 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -50,7 +50,7 @@
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Pretražite"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Brisanje teksta iz okvira za pretraživanje"</string>
     <string name="no_widgets_available" msgid="4337693382501046170">"Vidžeti i prečice nisu dostupni"</string>
-    <string name="no_search_results" msgid="3787956167293097509">"Nije pronađen nijedan vidžet niti prečica"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Nije pronađen nijedan vidžet ili prečica"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Lično"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Posao"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Razgovori"</string>
@@ -67,7 +67,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Obavještenja"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Dodirnite i zadržite da pomjerite prečicu."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Dvaput dodirnite i zadržite da pomjerite prečicu ili da koristite prilagođene radnje."</string>
-    <string name="out_of_space" msgid="6692471482459245734">"Nema prostora na početnom ekranu"</string>
+    <string name="out_of_space" msgid="6692471482459245734">"Nema prostora na ovom početnom ekranu"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Nema više prostora u ladici Omiljeno"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista aplikacija"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista ličnih aplikacija"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index a951bc3191..c913171e54 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -159,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de treball"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Les aplicacions de treball tenen una insígnia i són visibles per al teu administrador de TI"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Entesos"</string>
-    <string name="work_apps_paused_title" msgid="3040901117349444598">"Les aplicacions de treball s\'han posat en pausa"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Les aplicacions de treball estan en pausa"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Les aplicacions de treball no poden enviar-te notificacions, consumir bateria ni accedir a la teva ubicació"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Les aplicacions de treball estan desactivades: no poden enviar-te notificacions, consumir bateria ni accedir a la teva ubicació"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Les aplicacions de treball tenen una insígnia i són visibles per al teu administrador de TI"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1023366161..862b3f51af 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -28,7 +28,7 @@
     <string name="shortcut_not_available" msgid="2536503539825726397">"Verknüpfung nicht verfügbar"</string>
     <string name="home_screen" msgid="5629429142036709174">"Startbildschirm"</string>
     <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Splitscreen"</string>
-    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Tippen und halten, um ein Widget zu bewegen."</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Zum Verschieben des Widgets berühren und halten"</string>
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Doppeltippen und halten, um ein Widget zu bewegen oder benutzerdefinierte Aktionen zu nutzen."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d breit und %2$d hoch"</string>
@@ -48,7 +48,7 @@
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Suche"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Text aus dem Suchfeld löschen"</string>
     <string name="no_widgets_available" msgid="4337693382501046170">"Widgets und Shortcuts nicht verfügbar"</string>
-    <string name="no_search_results" msgid="3787956167293097509">"Keine Widgets oder Shortcuts gefunden"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Keine Widgets oder Verknüpfungen gefunden"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Privat"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Geschäftlich"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Unterhaltungen"</string>
@@ -65,7 +65,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Benachrichtigungen"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Tippen und halten, um eine Verknüpfung zu bewegen."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Doppeltippen und halten, um eine Verknüpfung zu bewegen oder benutzerdefinierte Aktionen zu nutzen."</string>
-    <string name="out_of_space" msgid="6692471482459245734">"Auf dem Startbildschirm ist kein Platz mehr vorhanden"</string>
+    <string name="out_of_space" msgid="6692471482459245734">"Auf diesem Startbildschirm ist kein Platz mehr vorhanden"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Ablage \"Favoriten\" ist voll."</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Liste der Apps"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Liste der privaten Apps"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 33c589caeb..c923de1c24 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -159,8 +159,8 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de trabajo"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Las aplicaciones de trabajo tienen una insignia, y tu administrador de TI las puede ver"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Entendido"</string>
-    <string name="work_apps_paused_title" msgid="3040901117349444598">"Se han pausado las aplicaciones de trabajo"</string>
-    <string name="work_apps_paused_body" msgid="261634750995824906">"Tus aplicaciones de trabajo no pueden enviarte notificaciones, consumir batería ni acceder a tu ubicación"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Las aplicaciones de trabajo están en pausa"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Tus aplicaciones de trabajo no pueden enviarte notificaciones, usar batería ni acceder a tu ubicación"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Las aplicaciones de trabajo están desactivadas, por lo que no pueden enviarte notificaciones, consumir batería ni acceder a tu ubicación"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Las aplicaciones de trabajo tienen una insignia y tu administrador de TI las puede ver"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Entendido"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index f41da656a8..aac8bb8f85 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -48,7 +48,7 @@
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Haku"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Tyhjennä teksti hakukentästä"</string>
     <string name="no_widgets_available" msgid="4337693382501046170">"Widgetit ja pikanäppäimet eivät ole saatavilla"</string>
-    <string name="no_search_results" msgid="3787956167293097509">"Widgetejä tai pikanäppäimiä ei löytynyt"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Widgetejä tai pikakuvakkeita ei löytynyt"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Henkilökohtaiset"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Työ"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Keskustelut"</string>
@@ -157,12 +157,12 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Henkilökohtaiset"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Työsovellukset"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Työprofiili"</string>
-    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Työsovellukset on merkitty ja ne näkyvät IT-järjestelmänvalvojalle"</string>
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Työsovellukset on merkitty sellaisiksi ja näkyvät IT-järjestelmänvalvojille"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Selvä"</string>
     <string name="work_apps_paused_title" msgid="3040901117349444598">"Työsovellukset on keskeytetty"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Työsovellukset eivät voi lähettää sinulle ilmoituksia eivätkä käyttää akkuasi tai paikantaa sijaintiasi"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Työsovellukset ovat pois päältä. Ne eivät voi lähettää sinulle ilmoituksia eivätkä käyttää akkuasi tai sijaintiasi"</string>
-    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Työsovellukset on merkitty ja ne näkyvät IT-järjestelmänvalvojalle"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Työsovellukset on merkitty sellaisiksi ja näkyvät IT-järjestelmänvalvojille"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
     <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Laita työsovellukset pois päältä"</string>
     <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Laita työsovellukset päälle"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index bab420fab2..3c53df5dd0 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -53,7 +53,7 @@
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Professionnels"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversations"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Renseignements utiles à portée de main"</string>
-    <string name="widget_education_content" msgid="745542879510751525">"Pour obtenir des renseignements sans ouvrir aucune application, vous pouvez ajouter des widgets à votre écran d\'accueil"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Pour obtenir des renseignements sans ouvrir d\'application, vous pouvez ajouter des widgets à votre écran d\'accueil"</string>
     <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Touchez pour modifier les paramètres du widget"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
     <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Modifier les paramètres du widget"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 66a930a056..dfc103f39d 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -28,7 +28,7 @@
     <string name="shortcut_not_available" msgid="2536503539825726397">"Raccourci non disponible"</string>
     <string name="home_screen" msgid="5629429142036709174">"Accueil"</string>
     <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Écran partagé"</string>
-    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Appuyez de manière prolongée pour déplacer widget."</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Appuyez de manière prolongée sur un widget pour le déplacer."</string>
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Appuyez deux fois et maintenez la pression pour déplacer widget ou utiliser actions personnalisées."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d x %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d de largeur et %2$d de hauteur"</string>
@@ -48,7 +48,7 @@
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Rechercher"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Effacer le texte du champ de recherche"</string>
     <string name="no_widgets_available" msgid="4337693382501046170">"Les widgets et les raccourcis ne sont pas disponibles"</string>
-    <string name="no_search_results" msgid="3787956167293097509">"Aucun widget ni raccourci trouvés"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"Aucun widget ni raccourci trouvé"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Personnels"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Professionnels"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Conversations"</string>
@@ -65,7 +65,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notifications"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Appuyez de manière prolongée pour déplacer raccourci."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Appuyez deux fois et maintenez la pression pour déplacer un raccourci ou utiliser les actions personnalisées."</string>
-    <string name="out_of_space" msgid="6692471482459245734">"Pas d\'espace libre sur cet écran d\'accueil"</string>
+    <string name="out_of_space" msgid="6692471482459245734">"Espace insuffisant sur cet écran d\'accueil"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Plus d\'espace disponible dans la zone de favoris."</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Liste d\'applications"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Liste des applications personnelles"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 2513cca831..7f38842d36 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -32,8 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"વિજેટ ખસેડવા બે વાર ટૅપ કરીને દબાવી રાખો અથવા કસ્ટમ ક્રિયાઓનો ઉપયોગ કરો."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d પહોળાઈ X %2$d ઊંચાઈ"</string>
-    <!-- no translation found for widget_preview_context_description (9045841361655787574) -->
-    <skip />
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> વિજેટ"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"વિજેટને હોમ સ્ક્રીનની આજુબાજુ ખસેડવા માટે, તેને ટચ કરીને થોડીવાર દબાવી રાખો"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"હોમ સ્ક્રીન પર ઉમેરો"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index f84f554b31..f5b371d893 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -157,12 +157,12 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"निजी ऐप"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"काम से जुड़े ऐप"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"वर्क प्रोफ़ाइल"</string>
-    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन, बैज किए गए हैं और आईटी एडमिन को दिख रहे हैं"</string>
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन बैज किए गए हैं और आईटी एडमिन को दिख रहे हैं"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ठीक है"</string>
     <string name="work_apps_paused_title" msgid="3040901117349444598">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन रोके गए"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"ऑफ़िस के काम से जुड़े आपके ऐप्लिकेशन, आपको सूचनाएं नहीं भेज सकते. साथ ही, आपकी बैटरी का इस्तेमाल या आपकी जगह की जानकारी को ऐक्सेस भी नहीं कर सकते"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन बंद हैं. ये ऐप्लिकेशन, आपको सूचनाएं नहीं भेज सकते. साथ ही, आपकी बैटरी का इस्तेमाल या आपकी जगह की जानकारी को ऐक्सेस भी नहीं कर सकते"</string>
-    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन, बैज किए गए हैं और आईटी एडमिन को दिख रहे हैं"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन बैज किए गए हैं और आईटी एडमिन को दिख रहे हैं"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"ठीक है"</string>
     <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन बंद करें"</string>
     <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन चालू करें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index d7069f31b3..35cb69ed60 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -162,9 +162,9 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Poslovni profil"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Poslovne su aplikacije označene i vidljive vašem IT administratoru"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Shvaćam"</string>
-    <string name="work_apps_paused_title" msgid="3040901117349444598">"Pauzirane su poslovne lokacije"</string>
-    <string name="work_apps_paused_body" msgid="261634750995824906">"Poslovne aplikacije ne mogu vam slati obavijesti, trošiti bateriju niti pristupiti vašoj lokaciji"</string>
-    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Poslovne aplikacije su isključene. Ne mogu vam slati obavijesti, trošiti bateriju ili pristupiti vašoj lokaciji"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Poslovne aplikacije su pauzirane"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"Poslovne aplikacije ne mogu vam slati obavijesti, trošiti bateriju ili pristupati vašoj lokaciji"</string>
+    <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Poslovne aplikacije su isključene. Ne mogu vam slati obavijesti, trošiti bateriju ili pristupati vašoj lokaciji"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Poslovne su aplikacije označene i vidljive vašem IT administratoru"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Shvaćam"</string>
     <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Isključite poslovne aplikacije"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index dc0599ea66..31869fa3d4 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -52,8 +52,8 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Անձնական"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Աշխատանքային"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Զրույցներ"</string>
-    <string name="widget_education_header" msgid="4874760613775913787">"Օգտակար տեղեկությունները՝ միշտ հասանելի"</string>
-    <string name="widget_education_content" msgid="745542879510751525">"Ավելացրեք վիջեթներ ձեր հիմնական էկրանին և ստացեք տեղեկություններ՝ առանց հավելվածները բացելու։"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Բոլոր կարևոր տեղեկությունները՝ ձեռքի տակ"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Առանց հավելվածները բացելու տեղեկություններ ստանալու համար ձեր հիմնական էկրանին ավելացրեք վիջեթներ։"</string>
     <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Հպեք՝ վիջեթի կարգավորումները փոփոխելու համար"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Եղավ"</string>
     <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Փոխել վիջեթի կարգավորումները"</string>
@@ -157,12 +157,12 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Անձնական"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Աշխատանքային"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Աշխատանքային պրոֆիլ"</string>
-    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Աշխատանքային հավելվածները նշանակներ ունեն և տեսանելի են ՏՏ ադմինիստրատորին"</string>
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Աշխատանքային հավելվածները հատուկ նշանակ ունեն և տեսանելի են ՏՏ ադմինիստրատորին"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Եղավ"</string>
     <string name="work_apps_paused_title" msgid="3040901117349444598">"Աշխատանքային հավելվածները դադարեցված են"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Աշխատանքային հավելվածները չեն կարող ծանուցումներ ուղարկել ձեզ, օգտագործել մարտկոցը և ձեր տեղադրության մասին տվյալներ ստանալ։"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Աշխատանքային հավելվածներն անջատված են։ Դրանք չեն կարող ծանուցումներ ուղարկել ձեզ, օգտագործել մարտկոցը և ձեր տեղադրության մասին տվյալներ ստանալ։"</string>
-    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Աշխատանքային հավելվածները նշանակներ ունեն և տեսանելի են ՏՏ ադմինիստրատորին"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Աշխատանքային հավելվածները հատուկ նշանակ ունեն և տեսանելի են ՏՏ ադմինիստրատորին"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Եղավ"</string>
     <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Անջատել աշխատանքային հավելվածները"</string>
     <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Միացնել աշխատանքային հավելվածները"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index cc86970dce..165146f3d9 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -52,7 +52,7 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Pribadi"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Kantor"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Percakapan"</string>
-    <string name="widget_education_header" msgid="4874760613775913787">"Info yang bermanfaat di ujung jari Anda"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Info bermanfaat mudah dilihat"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Untuk mendapatkan info tanpa membuka aplikasi, Anda dapat menambahkan widget ke Layar utama"</string>
     <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Ketuk untuk mengubah setelan widget"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Oke"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 1250c35e93..d3670faa39 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -32,7 +32,7 @@
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ウィジェットをダブルタップして長押ししながら移動するか、カスタム操作を使用してください。"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$dx%2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"幅 %1$d、高さ %2$d"</string>
-    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> 件のウィジェット"</string>
+    <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ウィジェット"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ウィジェットを押し続けると、ホーム画面上に移動できます。"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ホーム画面に追加"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
@@ -48,11 +48,11 @@
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"検索"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"検索ボックスからテキストを消去します"</string>
     <string name="no_widgets_available" msgid="4337693382501046170">"ウィジェットもショートカットも利用できません"</string>
-    <string name="no_search_results" msgid="3787956167293097509">"ウィジェットもショートカットも見つかりませんでした"</string>
+    <string name="no_search_results" msgid="3787956167293097509">"ウィジェットやショートカットは見つかりませんでした"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"個人用"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"仕事用"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"会話"</string>
-    <string name="widget_education_header" msgid="4874760613775913787">"スワイプだけで役立つ情報をいつでも入手"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"ウィジェットで情報を得る"</string>
     <string name="widget_education_content" msgid="745542879510751525">"ホーム画面にウィジェットを追加すると、アプリを開かずに情報を入手できます"</string>
     <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"タップしてウィジェットの設定を変更する"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
@@ -157,7 +157,7 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"個人用"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"仕事用"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"仕事用プロファイル"</string>
-    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"仕事用アプリはバッジが付き、IT 管理者に公開されます"</string>
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"仕事用アプリはバッジ付きで表示され、IT 管理者に公開されます"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="3040901117349444598">"仕事用アプリの一時停止"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"仕事用アプリでは、通知の送信、バッテリーの使用、位置情報の取得が無効になっています"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 322878ec94..b8bb6e7568 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -65,7 +65,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"ಶಾರ್ಟ್‌ಕಟ್ ಸರಿಸಲು ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಹಿಡಿದುಕೊಳ್ಳಿ."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"ಶಾರ್ಟ್‌ಕಟ್ ಸರಿಸಲು ಅಥವಾ ಕಸ್ಟಮ್ ಕ್ರಿಯೆಗಳನ್ನು ಬಳಸಲು ಡಬಲ್-ಟ್ಯಾಪ್ ಮಾಡಿ ಮತ್ತು ಹಿಡಿದುಕೊಳ್ಳಿ."</string>
-    <string name="out_of_space" msgid="6692471482459245734">"ಈ ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿ ಸ್ಥಳಾವಾಕಾಶವಿಲ್ಲ"</string>
+    <string name="out_of_space" msgid="6692471482459245734">"ಈ ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿ ಸ್ಥಳಾವಕಾಶವಿಲ್ಲ"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ಮೆಚ್ಚಿನವುಗಳ ಟ್ರೇನಲ್ಲಿ ಹೆಚ್ಚಿನ ಸ್ಥಳಾವಕಾಶವಿಲ್ಲ"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಪಟ್ಟಿ"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"ವೈಯಕ್ತಿಕ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಪಟ್ಟಿ"</string>
@@ -160,7 +160,7 @@
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ಬ್ಯಾಡ್ಜ್ ಮಾಡಲಾಗಿದೆ ಮತ್ತು ಅವುಗಳು ನಿಮ್ಮ IT ನಿರ್ವಾಹಕರಿಗೆ ಗೋಚರಿಸುತ್ತವೆ"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"ಸರಿ"</string>
     <string name="work_apps_paused_title" msgid="3040901117349444598">"ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ವಿರಾಮಗೊಳಿಸಲಾಗಿದೆ"</string>
-    <string name="work_apps_paused_body" msgid="261634750995824906">"ನಿಮ್ಮ ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳಿಗೆ ನಿಮಗೆ ಅಧಿಸೂಚನೆಗಳನ್ನು ಕಳುಹಿಸಲು, ನಿಮ್ಮ ಬ್ಯಾಟರಿಯನ್ನು ಬಳಸಲು ಅಥವಾ ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"ನಿಮ್ಮ ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳಿಗೆ ನಿಮಗೆ ಅಧಿಸೂಚನೆಗಳನ್ನು ಕಳುಹಿಸಲು, ನಿಮ್ಮ ಬ್ಯಾಟರಿಯನ್ನು ಬಳಸಲು ಅಥವಾ ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಾಗದು"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳು ಆಫ್ ಆಗಿವೆ. ನಿಮ್ಮ ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳು ನಿಮಗೆ ಅಧಿಸೂಚನೆಗಳನ್ನು ಕಳುಹಿಸಲು, ನಿಮ್ಮ ಬ್ಯಾಟರಿಯನ್ನು ಬಳಸಲು ಅಥವಾ ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"ಕೆಲಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳು ಬ್ಯಾಡ್ಜ್ ಮಾಡಲಾಗಿದೆ ಮತ್ತು ನಿಮ್ಮ IT ನಿರ್ವಾಹಕರಿಗೆ ಗೋಚರಿಸುತ್ತದೆ"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"ಅರ್ಥವಾಯಿತು"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index da83578756..68650e4800 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -28,7 +28,7 @@
     <string name="shortcut_not_available" msgid="2536503539825726397">"Кыска жол жок"</string>
     <string name="home_screen" msgid="5629429142036709174">"Башкы экран"</string>
     <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Экранды бөлүү"</string>
-    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Виджетти жылдыруу үчүн коё бербей басып туруңуз."</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Виджетти кое бербей басып туруп жылдырыңыз."</string>
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Виджетти жылдыруу үчүн эки жолу таптап, кармап туруңуз же ыңгайлаштырылган аракеттерди колдонуңуз."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"Туурасы: %1$d, бийиктиги: %2$d"</string>
@@ -52,8 +52,8 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Жеке виджеттер"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Жумуш"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Сүйлөшүүлөр"</string>
-    <string name="widget_education_header" msgid="4874760613775913787">"Пайдалуу маалымат манжаңыздын учунда эле турат"</string>
-    <string name="widget_education_content" msgid="745542879510751525">"Колдонмолорду ачпастан керектүү маалыматты алуу үчүн Башкы экранга виджеттерди кошуңуз"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Керектүү маалымат манжаңыздын учунда"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Колдонмолорду ачпастан керектүү маалыматты алуу үчүн башкы экранга виджеттерди кошуңуз"</string>
     <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Виджеттин жөндөөлөрүн өзгөртүү үчүн таптап коюңуз"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Түшүндүм"</string>
     <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Виджеттин жөндөөлөрүн өзгөртүү"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 33e174b540..7367e2bed4 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -53,7 +53,7 @@
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Ажил"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Харилцан яриа"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Хэрэгтэй мэдээллээ хурууныхаа үзүүрээр аваарай"</string>
-    <string name="widget_education_content" msgid="745542879510751525">"Аппуудыг нээлгүйгээр мэдээлэл авахын тулд та Үндсэн нүүрэндээ жижиг хэрэгслүүд нэмэх боломжтой"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Аппуудыг нээлгүйгээр мэдээлэл авахын тулд та Үндсэн нүүрэндээ виджет нэмэх боломжтой"</string>
     <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Жижиг хэрэгслийн тохиргоог өөрчлөхийн тулд товшино уу"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Ойлголоо"</string>
     <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Жижиг хэрэгслийн тохиргоог өөрчлөх"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index e0f22d924a..bf9a170619 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -155,17 +155,17 @@
     <string name="accessibility_close" msgid="2277148124685870734">"बंद करा"</string>
     <string name="notification_dismissed" msgid="6002233469409822874">"सूचना डिसमिस केली"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"वैयक्तिक"</string>
-    <string name="all_apps_work_tab" msgid="4884822796154055118">"कार्यालय"</string>
+    <string name="all_apps_work_tab" msgid="4884822796154055118">"कार्य"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"कार्य प्रोफाइल"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"कामाशी संबंधित ॲप्स ही बॅज केलेली असून तुमच्या IT ॲडमिनला दृश्यमान आहेत"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"समजले"</string>
     <string name="work_apps_paused_title" msgid="3040901117349444598">"कार्य ॲप्स थांबवली आहेत"</string>
-    <string name="work_apps_paused_body" msgid="261634750995824906">"तुमची कामाशी संबंधित ॲप्स तुम्हाला सूचना पाठवू शकत नाहीत, तुमची बॅटरी वापरू शकत नाहीत किंवा तुमचे स्थान अ‍ॅक्सेस करू शकत नाहीत"</string>
+    <string name="work_apps_paused_body" msgid="261634750995824906">"तुमची कार्य ॲप्स तुम्हाला सूचना पाठवू शकत नाहीत, तुमची बॅटरी वापरू शकत नाहीत किंवा तुमचे स्थान अ‍ॅक्सेस करू शकत नाहीत"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"कामाशी संबंधित ॲप्स बंद आहेत. तुमचे कामाशी संबंधित ॲप्स तुम्हाला सूचना पाठवू शकत नाहीत, तुमची बॅटरी वापरू शकत नाहीत किंवा तुमचे स्थान अ‍ॅक्सेस करू शकत नाहीत"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Work apps ही बॅज केलेली असून तुमच्या IT ॲडमिनला दृश्यमान आहेत"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"समजले"</string>
     <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"कामाशी संबंधित ॲप्स बंद करा"</string>
-    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"कामाशी संबंधित ॲप्स सुरू करा"</string>
+    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"कार्य ॲप्स सुरू करा"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"फिल्टर"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"हे करता आले नाही: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 67f5df890f..269c5f796b 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -28,7 +28,7 @@
     <string name="shortcut_not_available" msgid="2536503539825726397">"ਸ਼ਾਰਟਕੱਟ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
     <string name="home_screen" msgid="5629429142036709174">"ਮੁੱਖ ਪੰਨਾ"</string>
     <string name="recent_task_option_split_screen" msgid="6690461455618725183">"ਸਪਲਿਟ ਸਕ੍ਰੀਨ"</string>
-    <string name="long_press_widget_to_add" msgid="3587712543577675817">"ਕਿਸੇ ਵਿਜੇਟ ਨੂੰ ਲਿਜਾਉਣ ਲਈ ਸਪੱਰਸ਼ ਕਰਕੇ ਦਬਾਈ ਰੱਖੋ।"</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"ਕਿਸੇ ਵਿਜੇਟ ਨੂੰ ਲਿਜਾਉਣ ਲਈ ਸਪਰਸ਼ ਕਰਕੇ ਰੱਖੋ।"</string>
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"ਵਿਜੇਟ ਲਿਜਾਉਣ ਲਈ ਜਾਂ ਵਿਉਂਂਤੀਆਂ ਕਾਰਵਾਈਆਂ ਵਰਤਣ ਲਈ ਦੋ ਵਾਰ ਟੈਪ ਕਰਕੇ ਦਬਾ ਕੇ ਰੱਖੋ।"</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"%1$d ਚੌੜਾਈ ਅਤੇ %2$d ਲੰਬਾਈ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 9d1325db0b..5532b286de 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -165,7 +165,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Profil służbowy"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Aplikacje służbowe mają plakietki i są widoczne dla administratora IT"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="3040901117349444598">"Aplikacje do pracy zostały wstrzymane"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Aplikacje służbowe zostały wstrzymane"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Aplikacje służbowe nie mogą wysyłać powiadomień, używać baterii ani uzyskiwać dostępu do Twojej lokalizacji"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Aplikacje służbowe są wyłączone i nie mogą wysyłać powiadomień, używać baterii ani uzyskiwać dostępu do Twojej lokalizacji"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Aplikacje służbowe mają plakietki i są widoczne dla administratora IT"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index fadd84debb..67be316b46 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -67,7 +67,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"Notificări"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Atingeți și țineți apăsat pentru a muta comanda rapidă."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Atingeți de două ori și țineți apăsat pentru a muta o comandă rapidă sau folosiți acțiuni personalizate."</string>
-    <string name="out_of_space" msgid="6692471482459245734">"Nu este disponibilă nicio sală pe acest ecran de pornire"</string>
+    <string name="out_of_space" msgid="6692471482459245734">"Nu există spațiu liber pe acest ecran de pornire"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Spațiu epuizat în bara Preferate"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"Lista de aplicații"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Lista de aplicații personale"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 8e92c222cc..de923b3e78 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -59,7 +59,7 @@
     <string name="widget_education_header" msgid="4874760613775913787">"Koristne informacije na dosegu prstov"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Če si želite podatke ogledati brez odpiranja aplikacij, lahko na začetni zaslon dodate pripomočke."</string>
     <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Dotaknite se, če želite spremeniti nastavitve pripomočka."</string>
-    <string name="widget_education_close_button" msgid="8676165703104836580">"V redu"</string>
+    <string name="widget_education_close_button" msgid="8676165703104836580">"Razumem"</string>
     <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Spreminjanje nastavitev pripomočka"</string>
     <string name="all_apps_search_bar_hint" msgid="1390553134053255246">"Iskanje programov"</string>
     <string name="all_apps_loading_message" msgid="5813968043155271636">"Nalaganje aplikacij …"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 4b56e45016..6d3c6bc9b5 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -28,7 +28,7 @@
     <string name="shortcut_not_available" msgid="2536503539825726397">"Пречица није доступна"</string>
     <string name="home_screen" msgid="5629429142036709174">"Почетни екран"</string>
     <string name="recent_task_option_split_screen" msgid="6690461455618725183">"Подељени екран"</string>
-    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Двапут додирните и задржите ради померања виџета."</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"Додирните и задржите ради померања виџета."</string>
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"Двапут додирните и задржите да бисте померали виџет или користите прилагођене радње."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d×%2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"ширина од %1$d и висина од %2$d"</string>
@@ -65,7 +65,7 @@
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Претражи још апликација"</string>
     <string name="label_application" msgid="8531721983832654978">"Апликација"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Обавештења"</string>
-    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Двапут додирните и задржите ради померања пречице."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Додирните и задржите ради померања пречице."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Двапут додирните и задржите да бисте померали пречицу или користите прилагођене радње."</string>
     <string name="out_of_space" msgid="6692471482459245734">"Нема простора на овом почетном екрану"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Нема више простора на траци Омиљено"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index dc5be39c85..e420aeff5d 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -52,7 +52,7 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Binafsi"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Kazini"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Mazungumzo"</string>
-    <string name="widget_education_header" msgid="4874760613775913787">"Maelezo muhimu mahali popote ulipo"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Maelezo muhimu, popote ulipo"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Ili upate maelezo bila kufungua programu, unaweza kuweka wijeti kwenye Skrini yako ya kwanza"</string>
     <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Gusa ili ubadilishe mipangilio ya wijeti"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"Nimeelewa"</string>
@@ -157,12 +157,12 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Binafsi"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Kazini"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Wasifu wa kazini"</string>
-    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Programu za kazini zina beji na zinaonekana kwa msimamizi wako wa TEHAMA"</string>
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Programu za kazini zina beji na msimamizi wako wa TEHAMA anaziona"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Nimeelewa"</string>
     <string name="work_apps_paused_title" msgid="3040901117349444598">"Programu za kazini zimesimamishwa"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Programu zako za kazini haziwezi kukutumia arifa, kutumia betri yako au kufikia maelezo ya mahali ulipo"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Programu za kazini zimezimwa. Programu zako za kazini haziwezi kukutumia arifa, kutumia betri yako au kufikia maelezo ya mahali ulipo"</string>
-    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Programu za kazini zina beji na zinaonekana kwa msimamizi wako wa TEHAMA"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Programu za kazini zina beji na msimamizi wako wa TEHAMA anaziona"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Nimeelewa"</string>
     <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Zima programu za kazini"</string>
     <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Washa programu za kazini"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index a83c4c6e90..65a99fd01f 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -157,14 +157,14 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"వ్యక్తిగతం"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"వర్క్"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"కార్యాలయ ప్రొఫైల్"</string>
-    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"వర్క్ యాప్‌లు బ్యాడ్జ్ చేయబడ్డాయి, మీ IT అడ్మిన్‌కు కనిపిస్తాయి"</string>
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"వర్క్ యాప్‌లకు బ్యాడ్జ్ ఉంటుంది, అవి మీ IT అడ్మిన్‌కు కనిపిస్తాయి"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"అర్థమైంది"</string>
     <string name="work_apps_paused_title" msgid="3040901117349444598">"వర్క్ యాప్‌లు పాజ్ చేయబడ్డాయి"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"మీకు నోటిఫికేషన్‌లు పంపడం, మీ బ్యాటరీని ఉపయోగించడం, లేదా మీ లొకేషన్‌ను యాక్సెస్ చేయడం మీ వర్క్ యాప్‌లకు సాధ్యపడదు"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"వర్క్ యాప్‌లు ఆఫ్‌లో ఉన్నాయి. మీకు నోటిఫికేషన్‌లు పంపడం, మీ బ్యాటరీని ఉపయోగించడం, లేదా మీ లొకేషన్‌ను యాక్సెస్ చేయడం మీ వర్క్ యాప్‌లకు సాధ్యపడదు"</string>
-    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"వర్క్ యాప్‌లు బ్యాడ్జ్ చేయబడ్డాయి, మీ IT అడ్మిన్‌కి కనిపిస్తాయి"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"వర్క్ యాప్‌లకు బ్యాడ్జ్ ఉంటుంది, అవి మీ IT అడ్మిన్‌కు కనిపిస్తాయి"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"అర్థమైంది"</string>
-    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"వర్క్ యాప్‌లను ఆఫ్ చేయి"</string>
+    <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"వర్క్ యాప్‌లను ఆఫ్ చేయండి"</string>
     <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"వర్క్ యాప్‌లను ఆన్ చేయి"</string>
     <string name="developer_options_filter_hint" msgid="5896817443635989056">"ఫిల్టర్ చేయి"</string>
     <string name="remote_action_failed" msgid="1383965239183576790">"విఫలమైంది: <xliff:g id="WHAT">%1$s</xliff:g>"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index c309d8a175..c4b3c24eb6 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -163,12 +163,12 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Особисті додатки"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Робочі додатки"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Робочий профіль"</string>
-    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Робочі додатки відповідно позначені й видимі системному адміністратору"</string>
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Робочі додатки мають спеціальну позначку. Їх бачить системний адміністратор."</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="3040901117349444598">"Робочі додатки призупинено"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Ваші робочі додатки не можуть надсилати сповіщення, використовувати заряд акумулятора й отримувати доступ до геоданих"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Робочі додатки вимкнено. Вони не можуть надсилати сповіщення, використовувати заряд акумулятора й отримувати доступ до геоданих."</string>
-    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Робочі додатки відповідно позначені й видимі системному адміністратору"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Робочі додатки мають спеціальну позначку. Їх бачить системноий адміністратор."</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Зрозуміло"</string>
     <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Вимкнути робочі додатки"</string>
     <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Увімкнути робочі додатки"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 72838d59ec..ca8a75ae3a 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -52,8 +52,8 @@
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Shaxsiy"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Ish"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Suhbatlar"</string>
-    <string name="widget_education_header" msgid="4874760613775913787">"Barcha foydali axborot koʻz oldingizda"</string>
-    <string name="widget_education_content" msgid="745542879510751525">"Ilovalarni ochmasdan axborot olish uchun vidjetlarni bosh ekranga qoʻshishingiz mumkin"</string>
+    <string name="widget_education_header" msgid="4874760613775913787">"Barcha kerakli axborot doim yoningizda"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"Kerakli ilovalarni ochmasdan turib ulardan axborot olish uchun vidjetlarni bosh ekranga chiqaring"</string>
     <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"Vidjet sozlamalarini oʻzgartirish uchun bosing"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"OK"</string>
     <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"Vidjet sozlamalarini oʻzgartirish"</string>
@@ -157,12 +157,12 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Shaxsiy"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Ish"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Ish profili"</string>
-    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Ishga oid ilovalar qadalgan va IT administratoringizga koʻrinadi"</string>
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Ishga oid ilovalarning maxsus belgisi bor hamda ular administratoringizga koʻrinadi"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="3040901117349444598">"Ishga oid ilovalar pauza qilingan"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Ishga oid ilovalar batareya sarfi haqida bildirishnomalar yubora olmaydi va joylashuv axborotidan foydalana olmaydi"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Ishga oid ilovalar faolsizlantirilgan. Ular batareya sarfi haqida bildirishnomalar yubora olmaydi va joylashuv axborotidan foydalana olmaydi"</string>
-    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Ishga oid ilovalar qadalgan va IT administratoringizga koʻrinadi"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Ishga oid ilovalarning maxsus belgisi bor hamda ular administratoringizga koʻrinadi"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"OK"</string>
     <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Ishga oid ilovalarni faolsizlantirish"</string>
     <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Ishga oid ilovalarni yoqish"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 4a16045c1d..2f53bafe04 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -157,12 +157,12 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Cá nhân"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Công việc"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Hồ sơ công việc"</string>
-    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Các ứng dụng công việc được gắn huy hiệu và quản trị viên CNTT sẽ nhìn thấy các ứng dụng này"</string>
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Các ứng dụng công việc được gắn huy hiệu và quản trị viên CNTT có thể nhìn thấy"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
     <string name="work_apps_paused_title" msgid="3040901117349444598">"Đã tạm dừng ứng dụng công việc"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Các ứng dụng công việc không thể gửi thông báo cho bạn, sử dụng pin hoặc truy cập thông tin vị trí của bạn"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Ứng dụng công việc đang tắt. Các ứng dụng công việc không thể gửi thông báo cho bạn, sử dụng pin hoặc truy cập thông tin vị trí của bạn"</string>
-    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Các ứng dụng công việc được gắn huy hiệu và quản trị viên CNTT sẽ nhìn thấy các ứng dụng này"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Các ứng dụng công việc được gắn huy hiệu và quản trị viên CNTT có thể nhìn thấy"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Tôi hiểu"</string>
     <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Tắt ứng dụng công việc"</string>
     <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Bật ứng dụng công việc"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index fd2de37320..f29c546acb 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -53,7 +53,7 @@
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"工作"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"對話"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"實用資訊，唾手可得"</string>
-    <string name="widget_education_content" msgid="745542879510751525">"只要將小工具新增到主畫面，就可以直接查看資訊，無需開啟應用程式"</string>
+    <string name="widget_education_content" msgid="745542879510751525">"將小工具新增到主畫面，不用開啟應用程式就可直接查看資訊"</string>
     <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"輕按即可變更小工具設定"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"知道了"</string>
     <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"變更小工具設定"</string>
@@ -65,7 +65,7 @@
     <string name="notifications_header" msgid="1404149926117359025">"通知"</string>
     <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"輕觸並按住即可移動捷徑。"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"㩒兩下之後㩒住，就可以郁捷徑或者用自訂操作。"</string>
-    <string name="out_of_space" msgid="6692471482459245734">"這個主畫面已無空間"</string>
+    <string name="out_of_space" msgid="6692471482459245734">"這個主畫面沒有空間了"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"我的收藏寄存區沒有足夠空間"</string>
     <string name="all_apps_button_label" msgid="8130441508702294465">"應用程式清單"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"個人應用程式清單"</string>
@@ -157,12 +157,12 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"個人"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"工作"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"工作設定檔"</string>
-    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"工作應用程式會加上標誌，且你的 IT 管理員可以看到這類應用程式"</string>
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"工作應用程式均加有標誌。您的 IT 管理員可以看到這些應用程式"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"知道了"</string>
     <string name="work_apps_paused_title" msgid="3040901117349444598">"已暫停工作應用程式"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"工作應用程式無法向您傳送通知、使用電池電量或存取您的位置"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"已暫停工作應用程式。工作應用程式無法向您傳送通知、使用電池電量或存取您的位置"</string>
-    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"IT 管理員可看到工作應用程式和相關標誌"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"工作應用程式均加有標誌。您的 IT 管理員可以看到這些應用程式"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"知道了"</string>
     <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"關閉工作應用程式"</string>
     <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"開啟工作應用程式"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 415908cd45..df028af657 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -157,12 +157,12 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"個人"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"工作"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"工作資料夾"</string>
-    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"工作應用程式會加上標記，而且你的 IT 管理員可以看到這類應用程式"</string>
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"工作應用程式會加上標記，且你的 IT 管理員可以看到這類應用程式"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"我知道了"</string>
     <string name="work_apps_paused_title" msgid="3040901117349444598">"系統已暫停工作應用程式"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"工作應用程式不會消耗電量、無法傳送通知，也無法存取你的位置資訊"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"工作應用程式已關閉。工作應用程式不會消耗電量、無法傳送通知，也無法存取你的位置資訊"</string>
-    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"你的 IT 管理員可以看見工作應用程式和相關標記"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"工作應用程式會加上標記，且你的 IT 管理員可以看到這類應用程式"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"我知道了"</string>
     <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"關閉工作應用程式"</string>
     <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"開啟工作應用程式"</string>
-- 
GitLab


From 675b2b674828fd6fd2eb4709af7e7d34dd911808 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Wed, 7 Jul 2021 13:51:59 -0700
Subject: [PATCH 1579/1664] Accessibility bug fixes for the snack bar

Bug: 192639465
Bug: 192598846
Test: scanned using accessibility scanner and verified no issue detected

Change-Id: If776a68f7c4c421cdb51ec3eb4f05648ab1ed5c1
---
 res/drawable/padded_rounded_action_button.xml | 30 +++++++++++++++++++
 res/values/dimens.xml                         |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 res/drawable/padded_rounded_action_button.xml

diff --git a/res/drawable/padded_rounded_action_button.xml b/res/drawable/padded_rounded_action_button.xml
new file mode 100644
index 0000000000..900f5fcf8c
--- /dev/null
+++ b/res/drawable/padded_rounded_action_button.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (C) 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+    <item android:bottom="8dp" android:top="8dp">
+        <shape android:shape="rectangle">
+
+        <corners android:radius="@dimen/rounded_button_radius" />
+        <stroke android:width="1dp" android:color="?androidprv:attr/colorAccentPrimaryVariant" />
+        <padding
+            android:left="@dimen/rounded_button_padding"
+            android:right="@dimen/rounded_button_padding" />
+        </shape>
+    </item>
+</layer-list>
+
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 2a2cf89459..4735983eaf 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -128,6 +128,8 @@
     <dimen name="work_profile_footer_text_size">16sp</dimen>
     <dimen name="work_edu_card_margin">16dp</dimen>
 
+    <!-- rounded button shown inside card views, and snack bars  -->
+    <dimen name="padded_rounded_button_height">48dp</dimen>
     <dimen name="rounded_button_height">32dp</dimen>
     <dimen name="rounded_button_radius">16dp</dimen>
     <dimen name="rounded_button_padding">8dp</dimen>
-- 
GitLab


From 9be8d842bde2d7c0eb1807fad1504f298dbe5d4b Mon Sep 17 00:00:00 2001
From: Jon Spivack <spivack@google.com>
Date: Fri, 2 Jul 2021 13:55:34 -0700
Subject: [PATCH 1580/1664] NIU Actions: Add strings for assistant error
 dialogs and feature tooltip

The assistant error strings will be used in dialogs that appear when the user clicks the NIU Actions buttons without an appropriate default assistant set on the device. The tooltips will appear to highlight and explain the feature for first-time users. Adding the strings before the dialogs themselves in order to unblock translation efforts.

Bug: 192505939
Bug: 186006700
Test: Manual (code builds, existing strings unchanged on device)
Change-Id: I2c37b5871545e99a6bba8d060c927cbd29ef5081
---
 .../niu_actions_confirmation_dialog.xml       |  4 +--
 go/quickstep/res/values/strings.xml           | 29 ++++++++++++++++---
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/go/quickstep/res/layout/niu_actions_confirmation_dialog.xml b/go/quickstep/res/layout/niu_actions_confirmation_dialog.xml
index db1531ac58..5dbcca5a45 100644
--- a/go/quickstep/res/layout/niu_actions_confirmation_dialog.xml
+++ b/go/quickstep/res/layout/niu_actions_confirmation_dialog.xml
@@ -76,12 +76,12 @@
             <Button
                 style="@style/ModalDialogButton"
                 android:id="@+id/niu_actions_confirmation_reject"
-                android:text="@string/niu_actions_confirmation_no"/>
+                android:text="@string/dialog_cancel"/>
 
             <Button
                 style="@style/ModalDialogButton"
                 android:id="@+id/niu_actions_confirmation_accept"
-                android:text="@string/niu_actions_confirmation_yes"/>
+                android:text="@string/dialog_acknowledge"/>
         </LinearLayout>
 
     </LinearLayout>
diff --git a/go/quickstep/res/values/strings.xml b/go/quickstep/res/values/strings.xml
index 6e9e63e3c2..8429f6a7f2 100644
--- a/go/quickstep/res/values/strings.xml
+++ b/go/quickstep/res/values/strings.xml
@@ -11,13 +11,34 @@
     <string name="action_translate">Translate</string>
     <!-- Label for a button that triggers Search on a screenshot of the current app. [CHAR_LIMIT=40] -->
     <string name="action_search">Lens</string>
+
+    <!-- ******* Dialogs ******* -->
+    <!-- Label for a button that acknowledges the contents of the dialog. [CHAR_LIMIT=40] -->
+    <string name="dialog_acknowledge">GOT IT</string>
+    <!-- Label for a button that cancels the dialog. [CHAR_LIMIT=40] -->
+    <string name="dialog_cancel">CANCEL</string>
+    <!-- Label for a button that redirects the user to Settings. [CHAR_LIMIT=40] -->
+    <string name="dialog_settings">SETTINGS</string>
+
     <!-- ******* NIU Actions First-Run Confirmation Dialog ******* -->
     <!-- Dialog title -->
     <string name="niu_actions_confirmation_title">Translate or listen to text on screen</string>
     <!-- Dialog content -->
     <string name="niu_actions_confirmation_text">Information such as text on your screen, web addresses, and screenshots may be shared with Google.\n\nTo change what information you share, go to <b>Settings > Apps > Default apps > Digital assistant app</b>.</string>
-    <!-- Label for a button that rejects the feature. [CHAR_LIMIT=40] -->
-    <string name="niu_actions_confirmation_no">CANCEL</string>
-    <!-- Label for a button that accepts the feature. [CHAR_LIMIT=40] -->
-    <string name="niu_actions_confirmation_yes">GOT IT</string>
+
+    <!-- ******* NIU Actions Default Assistant Error Dialogs ******* -->
+    <!-- Assistant not selected: Dialog title -->
+    <string name="assistant_not_selected_title">Choose an assistant to use this feature</string>
+    <!-- Assistant not selected: Dialog content -->
+    <string name="assistant_not_selected_text">To listen to or translate text on your screen, choose a digital assistant app in Settings</string>
+    <!-- Assistant not supported: Dialog title -->
+    <string name="assistant_not_supported_title">Change your assistant to use this feature</string>
+    <!-- Assistant not supported: Dialog content -->
+    <string name="assistant_not_supported_text">To listen to or translate text on your screen, change your digital assistant app in Settings</string>
+
+    <!-- ******* NIU Actions Tooltip ******* -->
+    <!-- Tooltip to highlight and explain the Listen button -->
+    <string name="tooltip_listen">Tap here to listen to text on this screen</string>
+    <!-- Tooltip to highlight and explain the Translate button -->
+    <string name="tooltip_translate">Tap here to translate text on this screen</string>
 </resources>
-- 
GitLab


From ae8462afb5f4f3df0dcf31b708bce7ddd909ae37 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Wed, 7 Jul 2021 18:20:53 -0500
Subject: [PATCH 1581/1664] Update work fab radius to match height

Bug: 192666217
Test: presubmit
Change-Id: I948cab4ce5477eed68480daf70570851d9715006
---
 res/drawable/work_card.xml | 2 +-
 res/values/dimens.xml      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/res/drawable/work_card.xml b/res/drawable/work_card.xml
index 7048955b74..4a66cacd72 100644
--- a/res/drawable/work_card.xml
+++ b/res/drawable/work_card.xml
@@ -19,6 +19,6 @@
     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
     android:shape="rectangle">
     <solid android:color="?androidprv:attr/colorSurface" />
-    <corners android:radius="@dimen/work_edu_card_margin" />
+    <corners android:radius="@dimen/work_edu_card_radius" />
 </shape>
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 2a2cf89459..97feae2a59 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -120,13 +120,14 @@
 
 <!-- Floating action button inside work tab to toggle work profile -->
     <dimen name="work_fab_height">56dp</dimen>
-    <dimen name="work_fab_radius">24dp</dimen>
+    <dimen name="work_fab_radius">28dp</dimen>
     <dimen name="work_card_padding_horizontal">24dp</dimen>
     <dimen name="work_card_padding_vertical">32dp</dimen>
     <dimen name="work_fab_margin">16dp</dimen>
     <dimen name="work_profile_footer_padding">20dp</dimen>
     <dimen name="work_profile_footer_text_size">16sp</dimen>
     <dimen name="work_edu_card_margin">16dp</dimen>
+    <dimen name="work_edu_card_radius">28dp</dimen>
 
     <dimen name="rounded_button_height">32dp</dimen>
     <dimen name="rounded_button_radius">16dp</dimen>
-- 
GitLab


From 3341a710d95e74c082e211024b2ddc1612852438 Mon Sep 17 00:00:00 2001
From: Bryan Bonnet <bbonnet@google.com>
Date: Wed, 7 Jul 2021 16:54:55 -0700
Subject: [PATCH 1582/1664] Update CachingWidgetPreviewLoaderTest members to be
 non-static. These classes are stubbed by roboelectric so they cannot be
 static

Bug: 183335046
Change-Id: Iafb52f87e8e3ece399f4e83c056b2a0dac160d6c
---
 .../widget/CachingWidgetPreviewLoaderTest.java       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/robolectric_tests/src/com/android/launcher3/widget/CachingWidgetPreviewLoaderTest.java b/robolectric_tests/src/com/android/launcher3/widget/CachingWidgetPreviewLoaderTest.java
index c18e26ce34..1090d1e69b 100644
--- a/robolectric_tests/src/com/android/launcher3/widget/CachingWidgetPreviewLoaderTest.java
+++ b/robolectric_tests/src/com/android/launcher3/widget/CachingWidgetPreviewLoaderTest.java
@@ -52,15 +52,15 @@ import java.util.Collections;
 
 @RunWith(RobolectricTestRunner.class)
 public class CachingWidgetPreviewLoaderTest {
-    private static final Size SIZE_10_10 = new Size(10, 10);
-    private static final Size SIZE_20_20 = new Size(20, 20);
+    private final Size SIZE_10_10 = new Size(10, 10);
+    private final Size SIZE_20_20 = new Size(20, 20);
     private static final String TEST_PACKAGE = "com.example.test";
-    private static final ComponentName TEST_PROVIDER =
+    private final ComponentName TEST_PROVIDER =
             new ComponentName(TEST_PACKAGE, ".WidgetProvider");
-    private static final ComponentName TEST_PROVIDER2 =
+    private final ComponentName TEST_PROVIDER2 =
             new ComponentName(TEST_PACKAGE, ".WidgetProvider2");
-    private static final Bitmap BITMAP = Bitmap.createBitmap(10, 10, Bitmap.Config.ARGB_8888);
-    private static final Bitmap BITMAP2 = Bitmap.createBitmap(20, 20, Bitmap.Config.ARGB_8888);
+    private final Bitmap BITMAP = Bitmap.createBitmap(10, 10, Bitmap.Config.ARGB_8888);
+    private final Bitmap BITMAP2 = Bitmap.createBitmap(20, 20, Bitmap.Config.ARGB_8888);
 
 
     @Mock private CancellationSignal mCancellationSignal;
-- 
GitLab


From 88be649d21e6fbf43297764486d55bcb258547e9 Mon Sep 17 00:00:00 2001
From: kumarashishg <kumarashishg@google.com>
Date: Mon, 28 Jun 2021 10:53:48 +0000
Subject: [PATCH 1583/1664] NIU Actions: Add NIU Actions tooltip

These tooltips are added to educate the user about NIU buttons actions. We have added tooltips for Translate and Listen NIU actions buttons.

Bug: 186006700
Test: Manual
Change-Id: Ib076c2a44055b62f2daf06bddf45aca220a28756
---
 .../arrow_toast_rounded_background.xml        | 19 +++++++
 go/quickstep/res/values/colors.xml            |  4 ++
 go/quickstep/res/values/dimens.xml            |  4 ++
 .../quickstep/TaskOverlayFactoryGo.java       | 44 +++++++++++++++-
 .../views/GoOverviewActionsView.java          | 50 ++++++++++++++++++-
 .../android/quickstep/TaskOverlayFactory.java |  6 +++
 .../quickstep/util/RecentsOrientedState.java  |  2 +-
 .../com/android/quickstep/views/TaskView.java |  1 +
 8 files changed, 126 insertions(+), 4 deletions(-)
 create mode 100644 go/quickstep/res/drawable/arrow_toast_rounded_background.xml

diff --git a/go/quickstep/res/drawable/arrow_toast_rounded_background.xml b/go/quickstep/res/drawable/arrow_toast_rounded_background.xml
new file mode 100644
index 0000000000..9c815fd19f
--- /dev/null
+++ b/go/quickstep/res/drawable/arrow_toast_rounded_background.xml
@@ -0,0 +1,19 @@
+<!--
+    Copyright (C) 2021 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="@color/arrow_tip_view_bg" />
+    <corners android:radius="@dimen/tooltip_corner_radius" />
+</shape>
diff --git a/go/quickstep/res/values/colors.xml b/go/quickstep/res/values/colors.xml
index 8034be217d..4ce7669a78 100644
--- a/go/quickstep/res/values/colors.xml
+++ b/go/quickstep/res/values/colors.xml
@@ -23,4 +23,8 @@
     <!-- Modal Dialogs -->
     <color name="go_modal_dialog_background">#FFFFFF</color>
     <color name="go_modal_dialog_background_dark">#424242</color>
+
+    <!-- Tooltip Color -->
+    <color name="arrow_tip_view_bg">#1A73E8</color>
+    <color name="arrow_tip_view_content">#FFFFFF</color>
 </resources>
diff --git a/go/quickstep/res/values/dimens.xml b/go/quickstep/res/values/dimens.xml
index 0a7ac4563d..c14df508b7 100644
--- a/go/quickstep/res/values/dimens.xml
+++ b/go/quickstep/res/values/dimens.xml
@@ -36,4 +36,8 @@
     <dimen name="modal_dialog_vertical_spacer">12dp</dimen>
     <dimen name="modal_dialog_corner_radius">8dp</dimen>
     <dimen name="confirmation_dialog_text_height">216dp</dimen>
+
+    <!-- Tooltip -->
+    <dimen name="tooltip_corner_radius">8dp</dimen>
+    <dimen name="tooltip_top_margin">3dp</dimen>
 </resources>
diff --git a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
index 37f535200a..f3c7a026bd 100644
--- a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
+++ b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
@@ -16,6 +16,8 @@
 
 package com.android.quickstep;
 
+import static android.view.Surface.ROTATION_0;
+
 import static com.android.quickstep.views.OverviewActionsView.DISABLED_NO_THUMBNAIL;
 import static com.android.quickstep.views.OverviewActionsView.DISABLED_ROTATED;
 
@@ -30,6 +32,7 @@ import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.graphics.Matrix;
 import android.graphics.drawable.ColorDrawable;
+import android.os.Handler;
 import android.os.SystemClock;
 import android.os.UserManager;
 import android.provider.Settings;
@@ -46,7 +49,8 @@ import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.quickstep.util.AssistContentRequester;
-import com.android.quickstep.views.OverviewActionsView;
+import com.android.quickstep.util.RecentsOrientedState;
+import com.android.quickstep.views.GoOverviewActionsView;
 import com.android.quickstep.views.TaskThumbnailView;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.recents.model.ThumbnailData;
@@ -67,6 +71,9 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
     private static final String NIU_ACTIONS_CONFIRMED = "launcher_go.niu_actions_confirmed";
     private static final String TAG = "TaskOverlayFactoryGo";
 
+    public static final String LISTEN_TOOL_TIP_SEEN = "launcher.go_listen_tip_seen";
+    public static final String TRANSLATE_TOOL_TIP_SEEN = "launcher.go_translate_tip_seen";
+
     private AssistContentRequester mContentRequester;
 
     public TaskOverlayFactoryGo(Context context) {
@@ -84,7 +91,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
      * Overlay on each task handling Overview Action Buttons.
      * @param <T> The type of View in which the overlay will be placed
      */
-    public static final class TaskOverlayGo<T extends OverviewActionsView> extends TaskOverlay {
+    public static final class TaskOverlayGo<T extends GoOverviewActionsView> extends TaskOverlay {
         private String mNIUPackageName;
         private String mTaskPackageName;
         private String mWebUrl;
@@ -99,6 +106,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
                 AssistContentRequester assistContentRequester) {
             super(taskThumbnailView);
             mFactoryContentRequester = assistContentRequester;
+            mSharedPreferences = Utilities.getPrefs(mApplicationContext);
         }
 
         /**
@@ -134,6 +142,18 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
 
             int taskId = task.key.id;
             mFactoryContentRequester.requestAssistContent(taskId, this::onAssistContentReceived);
+
+            RecentsOrientedState orientedState =
+                    mThumbnailView.getTaskView().getRecentsView().getPagedViewOrientedState();
+            boolean isInLandscape = orientedState.getDisplayRotation() != ROTATION_0;
+
+            // show tooltips in portrait mode only
+            // TODO: remove If check once b/183714277 is fixed
+            if (!isInLandscape) {
+                new Handler().post(() -> {
+                    showTooltipsIfUnseen();
+                });
+            }
         }
 
         /** Provide Assist Content to the overlay. */
@@ -149,6 +169,12 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
             mWebUrl = null;
         }
 
+        @Override
+        public void updateOrientationState(RecentsOrientedState state) {
+            super.updateOrientationState(state);
+            ((GoOverviewActionsView) getActionsView()).updateOrientationState(state);
+        }
+
         /**
          * Creates and sends an Intent corresponding to the button that was clicked
          */
@@ -275,6 +301,20 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
         private void onNiuActionsConfirmationReject(View v) {
             mConfirmationDialog.cancel();
         }
+
+        /**
+         * Checks and Shows the tooltip if they are not seen by user
+         * Order of tooltips are translate and then listen
+         */
+        private void showTooltipsIfUnseen() {
+            if (!mSharedPreferences.getBoolean(TRANSLATE_TOOL_TIP_SEEN, false)) {
+                ((GoOverviewActionsView) getActionsView()).showTranslateToolTip();
+                mSharedPreferences.edit().putBoolean(TRANSLATE_TOOL_TIP_SEEN, true).apply();
+            } else if (!mSharedPreferences.getBoolean(LISTEN_TOOL_TIP_SEEN, false)) {
+                ((GoOverviewActionsView) getActionsView()).showListenToolTip();
+                mSharedPreferences.edit().putBoolean(LISTEN_TOOL_TIP_SEEN, true).apply();
+            }
+        }
     }
 
     /**
diff --git a/go/quickstep/src/com/android/quickstep/views/GoOverviewActionsView.java b/go/quickstep/src/com/android/quickstep/views/GoOverviewActionsView.java
index 9997d16e2d..5b535a2f53 100644
--- a/go/quickstep/src/com/android/quickstep/views/GoOverviewActionsView.java
+++ b/go/quickstep/src/com/android/quickstep/views/GoOverviewActionsView.java
@@ -21,14 +21,20 @@ import android.util.AttributeSet;
 import android.view.View;
 
 import androidx.annotation.Nullable;
+import androidx.annotation.Px;
 
 import com.android.launcher3.R;
+import com.android.launcher3.views.ArrowTipView;
 import com.android.quickstep.TaskOverlayFactoryGo.OverlayUICallbacksGo;
+import com.android.quickstep.util.RecentsOrientedState;
 
 /**
  * View for showing Go-specific action buttons in Overview
  */
-public final class GoOverviewActionsView extends OverviewActionsView<OverlayUICallbacksGo> {
+public class GoOverviewActionsView extends OverviewActionsView<OverlayUICallbacksGo> {
+
+    private ArrowTipView mArrowTipView;
+
     public GoOverviewActionsView(Context context) {
         this(context, null);
     }
@@ -72,4 +78,46 @@ public final class GoOverviewActionsView extends OverviewActionsView<OverlayUICa
             mCallbacks.onSearch();
         }
     }
+
+    /**
+     * Shows Tooltip for action icons
+     */
+    private void showToolTip(int viewId, int textResourceId) {
+        int[] location = new int[2];
+        @Px int topMargin = getResources().getDimensionPixelSize(R.dimen.tooltip_top_margin);
+        findViewById(viewId).getLocationOnScreen(location);
+        mArrowTipView = new ArrowTipView(getContext(),  /* isPointingUp= */ false)
+            .showAtLocation(getResources().getString(textResourceId),
+                /* arrowXCoord= */ location[0] + findViewById(viewId).getWidth() / 2,
+                /* yCoord= */ location[1] - topMargin);
+
+        mArrowTipView.bringToFront();
+    }
+
+    /**
+     * Shows Tooltip for listen action icon
+     */
+    public void showListenToolTip() {
+        showToolTip(/* viewId= */ R.id.action_listen,
+                /* textResourceId= */ R.string.tooltip_listen);
+    }
+
+    /**
+     * Shows Tooltip for translate action icon
+     */
+    public void showTranslateToolTip() {
+        showToolTip(/* viewId= */ R.id.action_translate,
+                /* textResourceId= */ R.string.tooltip_translate);
+    }
+
+    /**
+     * Called when device orientation is changed
+     */
+    public void updateOrientationState(RecentsOrientedState orientedState) {
+        // dismiss tooltip
+        boolean canLauncherRotate = orientedState.canRecentsActivityRotate();
+        if (mArrowTipView != null && !canLauncherRotate) {
+            mArrowTipView.close(/* animate= */ false);
+        }
+    }
 }
diff --git a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
index 06a3c7048b..e75d751582 100644
--- a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
@@ -267,6 +267,12 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
             return mThumbnailView.getScaledInsets();
         }
 
+        /**
+         * Called when the device rotated.
+         */
+        public void updateOrientationState(RecentsOrientedState state) {
+        }
+
         protected void showBlockedByPolicyMessage() {
             Toast.makeText(
                     mThumbnailView.getContext(),
diff --git a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
index bfd900835b..c515bdff3d 100644
--- a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
+++ b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
@@ -65,7 +65,7 @@ import java.util.function.IntConsumer;
  * This class has initial default state assuming the device and foreground app have
  * no ({@link Surface#ROTATION_0} rotation.
  */
-public final class RecentsOrientedState implements
+public class RecentsOrientedState implements
         SharedPreferences.OnSharedPreferenceChangeListener {
 
     private static final String TAG = "RecentsOrientedState";
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 7690102c61..2d322e96ae 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -800,6 +800,7 @@ public class TaskView extends FrameLayout implements Reusable {
         mIconView.setRotation(orientationHandler.getDegreesRotated());
         snapshotParams.topMargin = deviceProfile.overviewTaskThumbnailTopMarginPx;
         mSnapshotView.setLayoutParams(snapshotParams);
+        getThumbnail().getTaskOverlay().updateOrientationState(orientationState);
     }
 
     private void setIconAndDimTransitionProgress(float progress, boolean invert) {
-- 
GitLab


From 3b8d6cfda2b15494c393d3070a9420a7f74586d8 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Thu, 8 Jul 2021 15:14:54 +0000
Subject: [PATCH 1584/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I549f22555e9238bd4b47112e6076a1cba6e67a9a
---
 go/quickstep/res/values-af/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-am/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-ar/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-as/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-az/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-b+sr+Latn/strings.xml | 20 +++++++++++++++++--
 go/quickstep/res/values-be/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-bg/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-bn/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-bs/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-ca/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-cs/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-da/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-de/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-el/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-en-rAU/strings.xml    | 20 +++++++++++++++++--
 go/quickstep/res/values-en-rCA/strings.xml    | 20 +++++++++++++++++--
 go/quickstep/res/values-en-rGB/strings.xml    | 20 +++++++++++++++++--
 go/quickstep/res/values-en-rIN/strings.xml    | 20 +++++++++++++++++--
 go/quickstep/res/values-en-rXC/strings.xml    | 20 +++++++++++++++++--
 go/quickstep/res/values-es-rUS/strings.xml    | 20 +++++++++++++++++--
 go/quickstep/res/values-es/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-et/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-eu/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-fa/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-fi/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-fr-rCA/strings.xml    | 20 +++++++++++++++++--
 go/quickstep/res/values-fr/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-gl/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-gu/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-hi/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-hr/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-hu/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-hy/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-in/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-is/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-it/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-iw/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-ja/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-ka/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-kk/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-km/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-kn/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-ko/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-ky/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-lo/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-lt/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-lv/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-mk/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-ml/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-mn/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-mr/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-ms/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-my/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-nb/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-ne/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-nl/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-or/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-pa/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-pl/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-pt-rPT/strings.xml    | 20 +++++++++++++++++--
 go/quickstep/res/values-pt/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-ro/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-ru/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-si/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-sk/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-sl/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-sq/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-sr/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-sv/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-sw/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-ta/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-te/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-th/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-tl/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-tr/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-uk/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-ur/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-uz/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-vi/strings.xml        | 20 +++++++++++++++++--
 go/quickstep/res/values-zh-rCN/strings.xml    | 20 +++++++++++++++++--
 go/quickstep/res/values-zh-rHK/strings.xml    | 20 +++++++++++++++++--
 go/quickstep/res/values-zh-rTW/strings.xml    | 20 +++++++++++++++++--
 go/quickstep/res/values-zu/strings.xml        | 20 +++++++++++++++++--
 84 files changed, 1512 insertions(+), 168 deletions(-)

diff --git a/go/quickstep/res/values-af/strings.xml b/go/quickstep/res/values-af/strings.xml
index 36b38b0657..722cdda8e8 100644
--- a/go/quickstep/res/values-af/strings.xml
+++ b/go/quickstep/res/values-af/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Luister"</string>
     <string name="action_translate" msgid="8028378961867277746">"Vertaal"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Vertaal of luister na teks op skerm"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Inligting soos teks op jou skerm, webadresse en skermskote kan met Google gedeel word.\n\nGaan na "<b>"Instellings &gt; Programme &gt; Verstekprogramme &gt; Digitale Assistent-program"</b>" om te verander watter inligting jy deel."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"KANSELLEER"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"HET DIT"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-am/strings.xml b/go/quickstep/res/values-am/strings.xml
index 7fab663fbf..ecf3d4876b 100644
--- a/go/quickstep/res/values-am/strings.xml
+++ b/go/quickstep/res/values-am/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"ያዳምጡ"</string>
     <string name="action_translate" msgid="8028378961867277746">"ተርጉም"</string>
     <string name="action_search" msgid="6269564710943755464">"ሌንስ"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"በማያ ገጹ ላይ ጽሑፍን ይተረጉሙ ወይም ያዳምጡ"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"እንደ በማያ ገጽዎ ላይ ያለ ጽሑፍ፣ የድር አድራሻዎች እና ቅጽበታዊ ገጽ እይታዎች ያሉ መረጃዎች ለGoogle ሊጋሩ ይችላሉ።\n\nምን መረጃ እንደሚያጋሩ ለመቀየር ወደ "<b>"ቅንብሮች &gt; መተግበሪያዎች &gt; ነባሪ መተግበሪያዎች &gt; ዲጂታል ረዳት መተግበሪያ"</b>" ይሂዱ።"</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ይቅር"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ገባኝ"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-ar/strings.xml b/go/quickstep/res/values-ar/strings.xml
index 7ea0ed051a..3f6e369e16 100644
--- a/go/quickstep/res/values-ar/strings.xml
+++ b/go/quickstep/res/values-ar/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"استماع"</string>
     <string name="action_translate" msgid="8028378961867277746">"‏ترجمة Google"</string>
     <string name="action_search" msgid="6269564710943755464">"‏عدسة Google"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"ترجمة النص الظاهر على الشاشة أو الاستماع إليه"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"‏قد تتم مشاركة معلومات مثل النص الظاهر على الشاشة وعناوين الويب ولقطات الشاشة مع Google.\n\nلتغيير المعلومات التي تتم مشاركتها، انتقِل إلى "<b>"الإعدادات &gt; التطبيقات &gt; التطبيقات التلقائية &gt; تطبيق المساعد الرقمي"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"إلغاء"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"حسنًا"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-as/strings.xml b/go/quickstep/res/values-as/strings.xml
index d5d234cb46..8940077193 100644
--- a/go/quickstep/res/values-as/strings.xml
+++ b/go/quickstep/res/values-as/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"শুনক"</string>
     <string name="action_translate" msgid="8028378961867277746">"অনুবাদ কৰক"</string>
     <string name="action_search" msgid="6269564710943755464">"লেন্স"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"স্ক্ৰীনত থকা পাঠ অনুবাদ কৰক অথবা শুনক"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"আপোনাৰ স্ক্ৰীনত থকা পাঠ, ৱেব ঠিকনা আৰু স্ক্ৰীনশ্বটৰ দৰে তথ্য Googleৰ সৈতে হয়তো শ্বেয়াৰ কৰা হ’ব।\n\nআপুনি কোনসমুহ তথ্য শ্বেয়াৰ কৰিব সেয়া সলনি কৰিবলৈ, "<b>"ছেটিং &gt; এপ্‌ &gt; ডিফ’ল্ট এপ্‌ &gt; ডিজিটেল সহায়ক এপ"</b>"লৈ যাওক।"</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"বাতিল কৰক"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"বুজি পালোঁ"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-az/strings.xml b/go/quickstep/res/values-az/strings.xml
index 6fd0dd2cfb..1914c3b6e3 100644
--- a/go/quickstep/res/values-az/strings.xml
+++ b/go/quickstep/res/values-az/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Dinləyin"</string>
     <string name="action_translate" msgid="8028378961867277746">"Tərcümə"</string>
     <string name="action_search" msgid="6269564710943755464">"Linza"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Ekrandakı mətni tərcümə edin və ya dinləyin"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Ekrandakı mətn, veb ünvanlar və ekran görüntüləri kimi məlumatlar Google ilə paylaşıla bilər.\n\nHansı məlumatların paylaşılmasını dəyişmək üçün "<b>"Ayarlar &gt; Tətbiqlər &gt; Defolt tətbiqlər &gt; Rəqəmsal assistent tətbiqi"</b>" bölməsinə keçin."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"LƏĞV EDİN"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ANLADIM"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-b+sr+Latn/strings.xml b/go/quickstep/res/values-b+sr+Latn/strings.xml
index de76cca89d..fc574c8676 100644
--- a/go/quickstep/res/values-b+sr+Latn/strings.xml
+++ b/go/quickstep/res/values-b+sr+Latn/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Pusti"</string>
     <string name="action_translate" msgid="8028378961867277746">"Prevedi"</string>
     <string name="action_search" msgid="6269564710943755464">"Objektiv"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Prevodite ili slušajte tekst na ekranu"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informacije poput teksta na ekranu, veb-adresa i snimaka ekrana mogu da se dele sa Google-om.\n\nDa biste promenili informacije koje delite, idite u "<b>"Podešavanja &gt; Aplikacije &gt; Podrazumevane aplikacije &gt; Aplikacija digitalnog pomoćnika"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"OTKAŽI"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"VAŽI"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-be/strings.xml b/go/quickstep/res/values-be/strings.xml
index 9d8220356b..e7bfec61de 100644
--- a/go/quickstep/res/values-be/strings.xml
+++ b/go/quickstep/res/values-be/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Праслухаць"</string>
     <string name="action_translate" msgid="8028378961867277746">"Перакласці"</string>
     <string name="action_search" msgid="6269564710943755464">"Аб\'ектыў"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Перакласці ці праслухаць тэкст на экране"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Такая інфармацыя з вашага экрана, як тэксты, вэб-адрасы і здымкі экрана, можа абагульвацца з Google.\n\nКаб змяніць тып інфармацыі для абагульвання, адкрыйце "<b>"Налады &gt; Праграмы &gt; Стандартныя праграмы &gt; Лічбавы памочнік"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"СКАСАВАЦЬ"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ЗРАЗУМЕЛА"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-bg/strings.xml b/go/quickstep/res/values-bg/strings.xml
index 0408fbafc1..6b2a5f2e2e 100644
--- a/go/quickstep/res/values-bg/strings.xml
+++ b/go/quickstep/res/values-bg/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Слушане"</string>
     <string name="action_translate" msgid="8028378961867277746">"Превод"</string>
     <string name="action_search" msgid="6269564710943755464">"Обектив"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Превеждане или четене на текста на екрана"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Определена информация може да бъде споделена с Google, като например текстът на екрана ви, уеб адресите и екранните снимки.\n\nЗа да промените информацията, която споделяте, отворете "<b>"„Настройки“ &gt; „Приложения“ &gt; „Приложения по подразбиране“ &gt; „Приложение за дигитален асистент“"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ОТКАЗ"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"РАЗБРАХ"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-bn/strings.xml b/go/quickstep/res/values-bn/strings.xml
index 5b4fd34068..f690668fef 100644
--- a/go/quickstep/res/values-bn/strings.xml
+++ b/go/quickstep/res/values-bn/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"শুনুন"</string>
     <string name="action_translate" msgid="8028378961867277746">"অনুবাদ করুন"</string>
     <string name="action_search" msgid="6269564710943755464">"লেন্স"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"অনুবাদ করুন বা স্ক্রিনে দেখানো টেক্সট শুনুন"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"আপনার স্ক্রিনে থাকা তথ্য যেমন ওয়েব ঠিকানা এবং স্ক্রিনশট Google-এর সাথে শেয়ার করা হতে পারে।\n\nকোন কোন তথ্য শেয়ার করবেন তা বেছে নিতে, "<b>"সেটিংস &gt; অ্যাপ &gt; ডিফল্ট অ্যাপ &gt; ডিজিটাল অ্যাসিস্ট্যান্ট অ্যাপ"</b>" বিকল্পগুলি বেছে নিন।"</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"বাতিল করুন"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"বুঝেছি"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-bs/strings.xml b/go/quickstep/res/values-bs/strings.xml
index f83521e9fc..88b4a21d28 100644
--- a/go/quickstep/res/values-bs/strings.xml
+++ b/go/quickstep/res/values-bs/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Poslušajte"</string>
     <string name="action_translate" msgid="8028378961867277746">"Prevedi"</string>
     <string name="action_search" msgid="6269564710943755464">"Objektiv"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Prevedite ili slušajte tekst na ekranu"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informacije kao što su tekst na ekranu, web adrese i snimci ekrana mogu se dijeliti s Googleom.\n\nDa promijenite koje informacije dijelite, idite u "<b>"Postavke &gt; Aplikacije &gt; Zadane aplikacije &gt; Aplikacija digitalnog asistenta"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"OTKAŽI"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"RAZUMIJEM"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-ca/strings.xml b/go/quickstep/res/values-ca/strings.xml
index 3320b06c0e..cb633d7969 100644
--- a/go/quickstep/res/values-ca/strings.xml
+++ b/go/quickstep/res/values-ca/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Escolta"</string>
     <string name="action_translate" msgid="8028378961867277746">"Tradueix"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Tradueix o escolta el text en pantalla"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"És possible que determinada informació es comparteixi amb Google, com ara el text en pantalla, les adreces web i les captures de pantalla.\n\nPer canviar quina informació comparteixes, ves a "<b>"Configuració &gt; Aplicacions &gt; Aplicacions predeterminades &gt; Aplicació de l\'assistent digital"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"CANCEL·LA"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ENTESOS"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-cs/strings.xml b/go/quickstep/res/values-cs/strings.xml
index 310727eeb3..9f6906068f 100644
--- a/go/quickstep/res/values-cs/strings.xml
+++ b/go/quickstep/res/values-cs/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Poslechnout"</string>
     <string name="action_translate" msgid="8028378961867277746">"Přeložit"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Překládejte nebo poslouchejte text na obrazovce"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"S Googlem mohou být sdílena data, jako je text na obrazovce, webové adresy a snímky obrazovky.\n\nSdílená data můžete upřesnit v "<b>"Nastavení &gt; Aplikace &gt; Výchozí aplikace &gt; Aplikace digitálního asistenta"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ZRUŠIT"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ROZUMÍM"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-da/strings.xml b/go/quickstep/res/values-da/strings.xml
index 16b8fbbfeb..973c32014d 100644
--- a/go/quickstep/res/values-da/strings.xml
+++ b/go/quickstep/res/values-da/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Lyt"</string>
     <string name="action_translate" msgid="8028378961867277746">"Oversæt"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Oversæt eller hør tekst på skærmen"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Oplysninger såsom tekst på din skærm, webadresser og screenshots deles muligvis med Google.\n\nHvis du vil ændre, hvilke oplysninger du deler, kan du gå til "<b>"Indstillinger &gt; Apps &gt; Standardapps &gt; App for digital assistent"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ANNULLER"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-de/strings.xml b/go/quickstep/res/values-de/strings.xml
index f29879e4b4..8a8fd4ab55 100644
--- a/go/quickstep/res/values-de/strings.xml
+++ b/go/quickstep/res/values-de/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Anhören"</string>
     <string name="action_translate" msgid="8028378961867277746">"Übersetzen"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Text auf dem Bildschirm übersetzen oder anhören"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informationen, wie Text auf deinem Bildschirm, Webadressen und Screenshots, werden möglicherweise an Google weitergegeben.\n\nWenn du ändern möchtest, welche Informationen weitergegeben werden, gehe zu "<b>"Einstellungen &gt; Apps &gt; Standard-Apps &gt; App für digitalen Assistenten"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ABBRECHEN"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-el/strings.xml b/go/quickstep/res/values-el/strings.xml
index 59cae3de6b..25072bfddb 100644
--- a/go/quickstep/res/values-el/strings.xml
+++ b/go/quickstep/res/values-el/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Ακρόαση"</string>
     <string name="action_translate" msgid="8028378961867277746">"Μετάφραση"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Μετάφραση ή ακρόαση του κειμένου στην οθόνη"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Πληροφορίες όπως είναι το κείμενο στην οθόνη, οι διευθύνσεις ιστού και τα στιγμιότυπα οθόνης, ενδέχεται να κοινοποιηθούν στην Google.\n\nΓια να αλλάξετε τις πληροφορίες που κοινοποιείτε, μεταβείτε στις "<b>"Ρυθμίσεις &gt; Εφαρμογές &gt; Προεπιλεγμένες εφαρμογές &gt; Εφαρμογή ψηφιακού βοηθού"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ΑΚΥΡΩΣΗ"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ΟΚ"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-en-rAU/strings.xml b/go/quickstep/res/values-en-rAU/strings.xml
index 54b1330686..3108295e84 100644
--- a/go/quickstep/res/values-en-rAU/strings.xml
+++ b/go/quickstep/res/values-en-rAU/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Listen"</string>
     <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Translate or listen to text on screen"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Information such as text on your screen, web addresses and screenshots may be shared with Google.\n\nTo change what information you share, go to "<b>"Settings &gt; Apps &gt; Default apps &gt; Digital assistant app"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"CANCEL"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-en-rCA/strings.xml b/go/quickstep/res/values-en-rCA/strings.xml
index 54b1330686..3108295e84 100644
--- a/go/quickstep/res/values-en-rCA/strings.xml
+++ b/go/quickstep/res/values-en-rCA/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Listen"</string>
     <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Translate or listen to text on screen"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Information such as text on your screen, web addresses and screenshots may be shared with Google.\n\nTo change what information you share, go to "<b>"Settings &gt; Apps &gt; Default apps &gt; Digital assistant app"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"CANCEL"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-en-rGB/strings.xml b/go/quickstep/res/values-en-rGB/strings.xml
index 54b1330686..3108295e84 100644
--- a/go/quickstep/res/values-en-rGB/strings.xml
+++ b/go/quickstep/res/values-en-rGB/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Listen"</string>
     <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Translate or listen to text on screen"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Information such as text on your screen, web addresses and screenshots may be shared with Google.\n\nTo change what information you share, go to "<b>"Settings &gt; Apps &gt; Default apps &gt; Digital assistant app"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"CANCEL"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-en-rIN/strings.xml b/go/quickstep/res/values-en-rIN/strings.xml
index 54b1330686..3108295e84 100644
--- a/go/quickstep/res/values-en-rIN/strings.xml
+++ b/go/quickstep/res/values-en-rIN/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Listen"</string>
     <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Translate or listen to text on screen"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Information such as text on your screen, web addresses and screenshots may be shared with Google.\n\nTo change what information you share, go to "<b>"Settings &gt; Apps &gt; Default apps &gt; Digital assistant app"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"CANCEL"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-en-rXC/strings.xml b/go/quickstep/res/values-en-rXC/strings.xml
index cac376e761..54eb30dda8 100644
--- a/go/quickstep/res/values-en-rXC/strings.xml
+++ b/go/quickstep/res/values-en-rXC/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‎‎‏‎‏‎‎‎‎‎‎‏‎‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‏‎‏‏‏‎‏‎‏‎‎‏‏‏‎‎Listen‎‏‎‎‏‎"</string>
     <string name="action_translate" msgid="8028378961867277746">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‎‏‎‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‎‎‏‎‏‎‎‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎‎‏‎‎Translate‎‏‎‎‏‎"</string>
     <string name="action_search" msgid="6269564710943755464">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‏‎‎‎‏‏‎‎‏‏‎‎‏‎‎‎‎Lens‎‏‎‎‏‎"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‎‏‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎Translate or listen to text on screen‎‏‎‎‏‎"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‏‎‏‎‏‎‎‎‎‏‎‎‎‏‏‎‏‎‏‎‏‏‏‎‎‎‏‎‎‎‎‏‎‏‎‏‎‏‎‏‎‎‏‎Information such as text on your screen, web addresses, and screenshots may be shared with Google.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To change what information you share, go to ‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎Settings &gt; Apps &gt; Default apps &gt; Digital assistant app‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎.‎‏‎‎‏‎"</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‏‎‎‏‏‏‏‏‎‎‎‏‏‏‎‎‎‎‏‎‏‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‏‎CANCEL‎‏‎‎‏‎"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‏‏‎‎‏‏‏‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‏‏‏‎‏‏‎‎‏‎‎‏‎‏‎‏‏‎‏‎‎GOT IT‎‏‎‎‏‎"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-es-rUS/strings.xml b/go/quickstep/res/values-es-rUS/strings.xml
index 475366282c..e9762ddf11 100644
--- a/go/quickstep/res/values-es-rUS/strings.xml
+++ b/go/quickstep/res/values-es-rUS/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Escuchar"</string>
     <string name="action_translate" msgid="8028378961867277746">"Traducir"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Traduce o escucha el texto que aparece en la pantalla"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Es posible que se comparta información con Google, como el texto de la pantalla, direcciones web y capturas de pantalla.\n\nPara cambiar la información que se comparte, ve a "<b>"Configuración &gt; Apps &gt; Apps predeterminadas &gt; App de asistente digital"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"CANCELAR"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ENTENDIDO"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-es/strings.xml b/go/quickstep/res/values-es/strings.xml
index fe227d46e0..2ca750ea2e 100644
--- a/go/quickstep/res/values-es/strings.xml
+++ b/go/quickstep/res/values-es/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Escuchar"</string>
     <string name="action_translate" msgid="8028378961867277746">"Traducir"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Traduce o escucha texto que haya en pantalla"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Se puede compartir con Google cierta información, como el texto que aparece en pantalla, direcciones web o capturas de pantalla.\n\nPara cambiar la información que compartes, ve a "<b>"Ajustes &gt; Aplicaciones &gt; Aplicaciones predeterminadas &gt; Asistente digital"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"CANCELAR"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ENTENDIDO"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-et/strings.xml b/go/quickstep/res/values-et/strings.xml
index 40f9f15f77..5bab725a24 100644
--- a/go/quickstep/res/values-et/strings.xml
+++ b/go/quickstep/res/values-et/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Kuula"</string>
     <string name="action_translate" msgid="8028378961867277746">"Tõlge"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Ekraanil oleva teksti tõlkimine või kuulamine"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Teavet, nagu teie ekraanil olev tekst, veebiaadressid ja ekraanipildid, võidakse jagada Google\'iga.\n\nKui soovite muuta, millist teavet jagate, avage "<b>"Seaded &gt; Rakendused &gt; Vaikerakendused &gt; Digitaalse assistendi rakendus"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"LOOBU"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"SELGE"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-eu/strings.xml b/go/quickstep/res/values-eu/strings.xml
index 8a71fd91b6..e4e456bc0d 100644
--- a/go/quickstep/res/values-eu/strings.xml
+++ b/go/quickstep/res/values-eu/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Entzun"</string>
     <string name="action_translate" msgid="8028378961867277746">"Itzuli"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Itzuli edo entzun pantailako testua"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Agian pantailako testua, web-helbideak, pantaila-argazkiak eta antzeko informazioa partekatuko duzu Google-rekin.\n\nPartekatzen duzun informazioa aldatzeko, joan hona: "<b>"Ezarpenak &gt; Aplikazioak &gt; Aplikazio lehenetsiak &gt; Laguntzaile digitalaren aplikazioa"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"UTZI"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ADOS"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-fa/strings.xml b/go/quickstep/res/values-fa/strings.xml
index d07c57eaa3..6e960775fa 100644
--- a/go/quickstep/res/values-fa/strings.xml
+++ b/go/quickstep/res/values-fa/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"گوش دادن"</string>
     <string name="action_translate" msgid="8028378961867277746">"ترجمه"</string>
     <string name="action_search" msgid="6269564710943755464">"لنز"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"ترجمه نوشتار روی صفحه‌نمایش یا گوش دادن به آن"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"‏ممکن است اطلاعاتی مثل نوشتار روی صفحه‌نمایش، نشانی‌های وب، و نماگرفت‌ها با Google هم‌رسانی شود.\n\nبرای تغییر اطلاعاتی که هم‌رسانی می‌کنید، به "<b>"تنظیمات &lt; برنامه‌ها &lt; برنامه‌های پیش‌فرض &lt; برنامه دستیار دیجیتال"</b>" بروید."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"لغو"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"متوجه شدم"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-fi/strings.xml b/go/quickstep/res/values-fi/strings.xml
index f7b8d785f8..51a4474de9 100644
--- a/go/quickstep/res/values-fi/strings.xml
+++ b/go/quickstep/res/values-fi/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Kuuntele"</string>
     <string name="action_translate" msgid="8028378961867277746">"Käännä"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Käännä tai kuuntele näytöllä oleva teksti"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Googlelle saatetaan jakaa näytöllä olevaa tekstiä, verkko-osoitteita, kuvakaappauksia ja muita tietoja.\n\nVoit valita jaettavat tiedot valitsemalla "<b>"Asetukset &gt; Sovellukset &gt; Oletussovellukset &gt; Digiavustajasovellus"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"PERU"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"SELVÄ"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-fr-rCA/strings.xml b/go/quickstep/res/values-fr-rCA/strings.xml
index 2ccf503c1f..5ffded5fee 100644
--- a/go/quickstep/res/values-fr-rCA/strings.xml
+++ b/go/quickstep/res/values-fr-rCA/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Écouter"</string>
     <string name="action_translate" msgid="8028378961867277746">"Traduire"</string>
     <string name="action_search" msgid="6269564710943755464">"Lentille"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Traduire ou écouter le texte à l\'écran"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Des renseignements comme du texte sur votre écran, des adresses Web et des captures d\'écran peuvent être partagés avec Google.\n\nPour modifier les renseignements que vous partagez, accédez à "<b>"Paramètres &gt; Applications &gt; Applications par défaut &gt; Application d\'assistant numérique"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ANNULER"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-fr/strings.xml b/go/quickstep/res/values-fr/strings.xml
index 88160323f0..62007f0297 100644
--- a/go/quickstep/res/values-fr/strings.xml
+++ b/go/quickstep/res/values-fr/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Écouter"</string>
     <string name="action_translate" msgid="8028378961867277746">"Traduire"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Traduire ou écouter le texte à l\'écran"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Des informations comme le texte sur votre écran, des adresses Web et des captures d\'écran peuvent être partagées avec Google.\n\nPour modifier les types d\'informations que vous partagez, accédez à "<b>"Paramètres &gt; Applis &gt; Applis par défaut &gt; Appli d\'assistant numérique"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ANNULER"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-gl/strings.xml b/go/quickstep/res/values-gl/strings.xml
index 6946cde504..e7d9d79292 100644
--- a/go/quickstep/res/values-gl/strings.xml
+++ b/go/quickstep/res/values-gl/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Escoitar"</string>
     <string name="action_translate" msgid="8028378961867277746">"Traducir"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Traducir ou escoitar o texto que aparece na pantalla"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"É posible que se comparta con Google información como o texto que aparece na pantalla, os enderezos web e as capturas de pantalla.\n\nPara cambiar os datos que se comparten, vai a "<b>"Configuración &gt; Aplicacións &gt; Aplicacións predeterminadas &gt; Aplicación de asistente dixital"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"CANCELAR"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ENTENDIDO"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-gu/strings.xml b/go/quickstep/res/values-gu/strings.xml
index 13815aa2d1..d8839fc3b7 100644
--- a/go/quickstep/res/values-gu/strings.xml
+++ b/go/quickstep/res/values-gu/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"સાંભળો"</string>
     <string name="action_translate" msgid="8028378961867277746">"અનુવાદ કરો"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"સ્ક્રીન પરની ટેક્સ્ટનો અનુવાદ કરો અથવા સાંભળો"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"તમારી સ્ક્રીન પરની ટેક્સ્ટ, વેબ ઍડ્રેસ અને સ્ક્રીનશૉટ જેવી માહિતી Google સાથે શેર કરવામાં આવી શકે છે.\n\nતમે શેર કરતા હો તેવી માહિતીમાં ફેરફાર કરવા માટે, "<b>"સેટિંગ &gt; ઍપ &gt; ડિફૉલ્ટ ઍપ &gt; ડિજિટલ Assistant ઍપ"</b>" પર જાઓ."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"રદ કરો"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"સમજાઈ ગયું"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-hi/strings.xml b/go/quickstep/res/values-hi/strings.xml
index 361a546437..4cc6236300 100644
--- a/go/quickstep/res/values-hi/strings.xml
+++ b/go/quickstep/res/values-hi/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"सुनें"</string>
     <string name="action_translate" msgid="8028378961867277746">"अनुवाद करें"</string>
     <string name="action_search" msgid="6269564710943755464">"Google Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"स्क्रीन पर मौजूद टेक्स्ट का अनुवाद पाएं या उसे सुनें"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"आपकी स्क्रीन पर मौजूद टेक्स्ट, वेब पते, और स्क्रीनशॉट जैसी जानकारी Google के साथ शेयर की जा सकती है.\n\nआप Google के साथ किस जानकारी को शेयर करते हैं, इसे कंट्रोल करने के लिए "<b>"सेटिंग &gt; ऐप्लिकेशन &gt; डिफ़ॉल्ट ऐप्लिकेशन &gt; डिजिटल असिस्टेंट ऐप्लिकेशन"</b>" पर जाएं."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"रद्द करें"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ठीक है"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-hr/strings.xml b/go/quickstep/res/values-hr/strings.xml
index b8f94c62ce..dbe026691a 100644
--- a/go/quickstep/res/values-hr/strings.xml
+++ b/go/quickstep/res/values-hr/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Slušajte"</string>
     <string name="action_translate" msgid="8028378961867277746">"Prevedi"</string>
     <string name="action_search" msgid="6269564710943755464">"Objektiv"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Prevedite ili slušajte tekst na zaslonu"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informacije kao što su tekst na vašem zaslonu, web-adrese i snimke zaslona mogu se dijeliti s Googleom.\n\nDa biste promijenili informacije koje dijelite, otvorite "<b>"Postavke &gt; Aplikacije &gt; Zadane aplikacije &gt; Aplikacija digitalnog asistenta"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ODUSTANI"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"SHVAĆAM"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-hu/strings.xml b/go/quickstep/res/values-hu/strings.xml
index bb2127c7e5..3606f9c64f 100644
--- a/go/quickstep/res/values-hu/strings.xml
+++ b/go/quickstep/res/values-hu/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Lejátszás"</string>
     <string name="action_translate" msgid="8028378961867277746">"Fordítás"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Képernyőn megjelenő szöveg fordítása és hallgatása"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Előfordulhat, hogy a rendszer megoszt bizonyos adatokat (például képernyőn megjelenő szöveget, internetcímeket és képernyőképeket) a Google-lal.\n\nHa módosítani szeretné, hogy milyen adatokat oszt meg, lépjen a "<b>"Beállítások és alkalmazások; Alapértelmezett alkalmazások; Digitális asszisztens app"</b>" menüpontra."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"MÉGSE"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ÉRTEM"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-hy/strings.xml b/go/quickstep/res/values-hy/strings.xml
index 6ea56014ae..6cee921608 100644
--- a/go/quickstep/res/values-hy/strings.xml
+++ b/go/quickstep/res/values-hy/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Լսել"</string>
     <string name="action_translate" msgid="8028378961867277746">"Թարգմանել"</string>
     <string name="action_search" msgid="6269564710943755464">"Տեսապակի"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Էկրանի տեքստի թարգմանություն կամ ունկնդրում"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Որոշակի տեղեկություններ (օր․՝ էկրանի տեքստը, վեբ հասցեները և սքրինշոթները) կարող են ուղարկվել Google-ին։\n\nՏեղեկությունները, որոնցով դուք կիսվում եք, կարող եք փոխել՝ անցնելով "<b>"Կարգավորումներ &gt; Հավելվածներ &gt; Կանխադրված հավելվածներ &gt; Թվային օգնականի հավելված"</b>"։"</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ՉԵՂԱՐԿԵԼ"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ԵՂԱՎ"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-in/strings.xml b/go/quickstep/res/values-in/strings.xml
index e84494493e..74bbbd7d05 100644
--- a/go/quickstep/res/values-in/strings.xml
+++ b/go/quickstep/res/values-in/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Dengarkan"</string>
     <string name="action_translate" msgid="8028378961867277746">"Terjemahkan"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Terjemahkan atau dengarkan teks di layar"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informasi seperti teks di layar, alamat web, dan screenshot dapat dibagikan ke Google.\n\nUntuk mengubah informasi yang Anda bagikan, buka "<b>"Setelan &gt; Aplikasi &gt; Aplikasi default &gt; Aplikasi asisten digital"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"BATAL"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OKE"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-is/strings.xml b/go/quickstep/res/values-is/strings.xml
index 1b74853b91..ce27dbbc13 100644
--- a/go/quickstep/res/values-is/strings.xml
+++ b/go/quickstep/res/values-is/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Hlusta"</string>
     <string name="action_translate" msgid="8028378961867277746">"Þýða"</string>
     <string name="action_search" msgid="6269564710943755464">"Linsa"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Þýða eða hlusta á texta á skjánum"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Mögulegt er að upplýsingum á borð við texta á skjánum, vefslóðum og skjámyndum verði deilt með Google.\n\nTil að breyta því hvaða upplýsingum þú deilir skaltu opna "<b>"Stillingar &gt; Forrit &gt; Sjálfgefin forrit &gt; Forrit stafræns hjálpara"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"HÆTTA VIÐ"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ÉG SKIL"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-it/strings.xml b/go/quickstep/res/values-it/strings.xml
index 8a475607d4..3f19491b4d 100644
--- a/go/quickstep/res/values-it/strings.xml
+++ b/go/quickstep/res/values-it/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Ascolta"</string>
     <string name="action_translate" msgid="8028378961867277746">"Traduttore"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Traduci o ascolta il testo sullo schermo"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Alcune informazioni, come il testo sullo schermo, gli indirizzi web e gli screenshot, potrebbero essere condivise con Google.\n\nPer modificare quali informazioni condividere, vai a "<b>"Impostazioni &gt; App &gt; App predefinite &gt; App assistente digitale"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ANNULLA"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-iw/strings.xml b/go/quickstep/res/values-iw/strings.xml
index 7c419ede70..8166a37483 100644
--- a/go/quickstep/res/values-iw/strings.xml
+++ b/go/quickstep/res/values-iw/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"האזנה"</string>
     <string name="action_translate" msgid="8028378961867277746">"תרגום"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"תרגום טקסט שמוצג במסך או האזנה לו"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"‏ייתכן שישותף עם Google מידע כגון טקסט שמוצג במסך, כתובות אינטרנט וצילומי מסך.\n\nכדי לקבוע איזה מידע ישותף, יש לעבור אל "<b>"הגדרות &gt; אפליקציות &amp;gt אפליקציות ברירת מחדל &gt; אפליקציית עוזר דיגיטלי"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ביטול"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"הבנתי"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-ja/strings.xml b/go/quickstep/res/values-ja/strings.xml
index 06066027dc..bc428b110e 100644
--- a/go/quickstep/res/values-ja/strings.xml
+++ b/go/quickstep/res/values-ja/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"聴く"</string>
     <string name="action_translate" msgid="8028378961867277746">"翻訳"</string>
     <string name="action_search" msgid="6269564710943755464">"レンズ"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"画面上のテキストを翻訳または聞く"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"画面上のテキスト、ウェブアドレス、スクリーンショットなどの情報が Google と共有される場合があります。\n\n共有される情報を変更するには、"<b>"[設定] &gt; [アプリ] &gt; [デフォルトのアプリ] &gt; [デジタル アシスタント アプリ]"</b>" に移動してください。"</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"キャンセル"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-ka/strings.xml b/go/quickstep/res/values-ka/strings.xml
index 4747e036c3..adf3e6b029 100644
--- a/go/quickstep/res/values-ka/strings.xml
+++ b/go/quickstep/res/values-ka/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"მოსმენა"</string>
     <string name="action_translate" msgid="8028378961867277746">"თარგმნა"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"თარგმნეთ ან მოისმინეთ ეკრანზე ნაჩვენები ტექსტი"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"ისეთი ინფორმაცია, როგორიც არის ტექსტი თქვენს ეკრანზე, ვებ-მისამართები და ეკრანის ანაბეჭდები შეიძლება გაზიარდეს Google-თან.\n\nთუ გსურთ, შეცვალოთ, რა ინფორმაციას აზიარებთ, გადადით: "<b>"პარამეტრები &gt; აპები &gt; ნაგულისხმევი აპები &gt; ციფრული ასისტენტის აპი"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"გაუქმება"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"გასაგებია"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-kk/strings.xml b/go/quickstep/res/values-kk/strings.xml
index d3f7e0cdf8..8a3aedbc07 100644
--- a/go/quickstep/res/values-kk/strings.xml
+++ b/go/quickstep/res/values-kk/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Тыңдау"</string>
     <string name="action_translate" msgid="8028378961867277746">"Аудару"</string>
     <string name="action_search" msgid="6269564710943755464">"Объектив"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Экрандағы мәтінді аудару немесе тыңдау"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Экрандағы мәтін, веб-мекенжайлар мен скриншоттар сияқты ақпарат Google-мен бөлісілуі мүмкін.\n\nБөлісілетін ақпаратты өзгерту үшін "<b>"Параметрлер &gt; Қолданбалар &gt; Әдепкі қолданбалар &gt; Цифрлық көмекші қолданбасы"</b>" тармағына өтіңіз."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"БАС ТАРТУ"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ТҮСІНДІМ"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-km/strings.xml b/go/quickstep/res/values-km/strings.xml
index 09d4a84a75..47e99a09f0 100644
--- a/go/quickstep/res/values-km/strings.xml
+++ b/go/quickstep/res/values-km/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"ស្តាប់"</string>
     <string name="action_translate" msgid="8028378961867277746">"បកប្រែ"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"បកប្រែ ឬស្ដាប់អត្ថបទ​នៅលើអេក្រង់"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"ព័ត៌មានដូចជា អត្ថបទនៅលើ​អេក្រង់របស់អ្នក អាសយដ្ឋានទំព័រ និងរូបថតអេក្រង់​​អាចនឹងត្រូវបានចែក​រំលែកជាមួយ Google។\n\nដើម្បីប្ដូរព័ត៌មាន​ដែលអ្នកចែករំលែក សូមចូលទៅកាន់"<b>"ការកំណត់ &gt; កម្មវិធី &gt; កម្មវិធីលំនាំដើម &gt; កម្មវិធីជំនួយការឌីជីថល"</b>"។"</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"បោះបង់"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"យល់ហើយ"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-kn/strings.xml b/go/quickstep/res/values-kn/strings.xml
index 0e06249269..7ed441e8a7 100644
--- a/go/quickstep/res/values-kn/strings.xml
+++ b/go/quickstep/res/values-kn/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"ಆಲಿಸಿ"</string>
     <string name="action_translate" msgid="8028378961867277746">"ಅನುವಾದಿಸಿ"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"ಸ್ಕ್ರೀನ್ ಮೇಲಿರುವ ಪಠ್ಯವನ್ನು ಅನುವಾದಿಸಿ ಅಥವಾ ಆಲಿಸಿ"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಮೇಲಿರುವ ಪಠ್ಯ, ವೆಬ್ ವಿಳಾಸಗಳು, ಮತ್ತು ಸ್ಕ್ರೀನ್‌ಶಾಟ್‌ಗಳಂತಹ ಮಾಹಿತಿಯನ್ನು Google ಜೊತೆಗೆ ಹಂಚಿಕೊಳ್ಳಬಹುದು.\n\nನೀವು ಯಾವ ಮಾಹಿತಿಯನ್ನು ಹಂಚಿಕೊಳ್ಳುತ್ತೀರಿ ಎಂಬುದನ್ನು ಬದಲಾಯಿಸಲು, "<b>"ಸೆಟ್ಟಿಂಗ್‌ಗಳು, ಆ್ಯಪ್‌ಗಳು ಮತ್ತು ಡೀಫಾಲ್ಟ್ ಆ್ಯಪ್‌ಗಳು, ಡಿಜಿಟಲ್ ಅಸಿಸ್ಟೆಂಟ್ ಆ್ಯಪ್ ಎಂಬಲ್ಲಿ ಹೋಗಿ"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ರದ್ದುಮಾಡಿ"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ಅರ್ಥವಾಯಿತು"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-ko/strings.xml b/go/quickstep/res/values-ko/strings.xml
index 506a802fc4..58e2278875 100644
--- a/go/quickstep/res/values-ko/strings.xml
+++ b/go/quickstep/res/values-ko/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"듣기"</string>
     <string name="action_translate" msgid="8028378961867277746">"번역"</string>
     <string name="action_search" msgid="6269564710943755464">"렌즈"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"화면의 텍스트 번역 또는 듣기"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"화면의 텍스트, 웹 주소, 스크린샷과 같은 정보가 Google과 공유될 수 있습니다.\n\n공유되는 정보를 변경하려면 "<b>"설정 &gt; 앱 &gt; 기본 앱 &gt; 디지털 어시스턴트 앱"</b>"으로 이동하세요."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"취소"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"확인"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-ky/strings.xml b/go/quickstep/res/values-ky/strings.xml
index b0d5c50318..0f56c9bbb6 100644
--- a/go/quickstep/res/values-ky/strings.xml
+++ b/go/quickstep/res/values-ky/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Угуу"</string>
     <string name="action_translate" msgid="8028378961867277746">"Которуу"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Экрандагы текстти которуу же угуу"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Экрандагы текст, веб-даректер жана скриншоттор сыяктуу маалымат Google менен бөлүшүлүшү мүмкүн.\n\nБөлүшүлгөн маалыматты өзгөртүү үчүн"<b>"Жөндөөлөр &gt; Колдонмолор &gt; Демейки колдонмолор &gt; Санариптик жардамчы колдонмосуна өтүңүз"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ЖОККО ЧЫГАРУУ"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ТҮШҮНДҮМ"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-lo/strings.xml b/go/quickstep/res/values-lo/strings.xml
index c391fee459..c8297a0937 100644
--- a/go/quickstep/res/values-lo/strings.xml
+++ b/go/quickstep/res/values-lo/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"ຟັງ"</string>
     <string name="action_translate" msgid="8028378961867277746">"ແປພາສາ"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"ແປພາສາ ຫຼື ຟັງຂໍ້ຄວາມຢູ່ໜ້າຈໍ"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"ຂໍ້ມູນ ເຊັ່ນ: ຂໍ້ຄວາມຢູ່ໜ້າຈໍຂອງທ່ານ, ທີ່ຢູ່ເວັບ ແລະ ຮູບໜ້າຈໍອາດຖືກແບ່ງປັນໃຫ້ກັບ Google.\n\nເພື່ອປ່ຽນແປງຂໍ້ມູນທີ່ທ່ານແບ່ງປັນ, ໃຫ້ເຂົ້າໄປ "<b>"ການຕັ້ງຄ່າ &gt; ແອັບ &gt; ແອັບເລີ່ມຕົ້ນ &gt; ແອັບຜູ້ຊ່ວຍດິຈິຕອນ"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ຍົກເລີກ"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ເຂົ້າໃຈແລ້ວ"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-lt/strings.xml b/go/quickstep/res/values-lt/strings.xml
index 11f471c511..e1b4d97e74 100644
--- a/go/quickstep/res/values-lt/strings.xml
+++ b/go/quickstep/res/values-lt/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Klausyti"</string>
     <string name="action_translate" msgid="8028378961867277746">"Išversti"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Ekrane esančio teksto vertimas arba klausymas"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Tam tikra informacija, pvz., ekrane esantis tekstas, žiniatinklio adresai ir ekrano kopijos, gali būti bendrinama su „Google“.\n\nJei norite pakeisti, kokia informacija gali būti bendrinama, eikite į "<b>"„Nustatymai“ &gt; „Programos“ &gt; „Numatytosios programos“ &gt; „Skaitmeninio pagelbiklio programa“"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ATŠAUKTI"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"SUPRATAU"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-lv/strings.xml b/go/quickstep/res/values-lv/strings.xml
index 1918cbfb4b..a697ccb3d1 100644
--- a/go/quickstep/res/values-lv/strings.xml
+++ b/go/quickstep/res/values-lv/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Klausīties"</string>
     <string name="action_translate" msgid="8028378961867277746">"Tulkot"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Ekrānā redzamā teksta atskaņošana vai tulkošana"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Ar uzņēmumu Google var tikt kopīgota noteikta informācija, piemēram, ekrānā redzamais teksts, tīmekļa adreses un ekrānuzņēmumi.\n\nLai mainītu kopīgotās informācijas veidu, atveriet sadaļu "<b>"Iestatījumi &gt; Lietotnes &gt; Noklusējuma lietotnes &gt; Digitālā asistenta lietotne"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ATCELT"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"LABI"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-mk/strings.xml b/go/quickstep/res/values-mk/strings.xml
index fea375348e..5560e119ac 100644
--- a/go/quickstep/res/values-mk/strings.xml
+++ b/go/quickstep/res/values-mk/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Слушај"</string>
     <string name="action_translate" msgid="8028378961867277746">"Преведи"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Преведете или слушајте текст на екранот"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Информациите како текст на екранот, интернет-адреси и слики од екранот може да се споделуваат со Google.\n\nЗа да промените кои информации ќе се споделуваат, одете во "<b>"Поставки &gt; Апликации &gt; Стандардни апликации &gt; Апликација за дигитален помошник"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ОТКАЖИ"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"СФАТИВ"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-ml/strings.xml b/go/quickstep/res/values-ml/strings.xml
index 05083d8baa..60e9bbdea2 100644
--- a/go/quickstep/res/values-ml/strings.xml
+++ b/go/quickstep/res/values-ml/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"കേൾക്കുക"</string>
     <string name="action_translate" msgid="8028378961867277746">"വിവർത്തനം ചെയ്യുക"</string>
     <string name="action_search" msgid="6269564710943755464">"ലെൻസ്"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"സ്ക്രീനിലെ ടെക്സ്റ്റ് വിവർത്തനം ചെയ്യുകയോ കേൾക്കുകയോ ചെയ്യുക"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"നിങ്ങളുടെ സ്ക്രീനിലെ ടെക്സ്റ്റ്, വെബ് വിലാസങ്ങൾ, സ്ക്രീൻഷോട്ടുകൾ എന്നിവ പോലുള്ള വിവരങ്ങൾ Google-മായി പങ്കിട്ടേക്കാം.\n\nനിങ്ങൾ പങ്കിടുന്ന വിവരങ്ങൾ മാറ്റാൻ, "<b>"ക്രമീകരണ &gt; ആപ്പുകൾ &gt; ഡിഫോൾട്ട് ആപ്പുകൾ &gt; ഡിജിറ്റൽ അസിസ്‌റ്റന്റ് ആപ്പ്"</b>" എന്നതിലേക്ക് പോകുക."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"റദ്ദാക്കുക"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"മനസ്സിലായി"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-mn/strings.xml b/go/quickstep/res/values-mn/strings.xml
index 0a1dacb507..fd7ffcd329 100644
--- a/go/quickstep/res/values-mn/strings.xml
+++ b/go/quickstep/res/values-mn/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Сонсох"</string>
     <string name="action_translate" msgid="8028378961867277746">"Орчуулах"</string>
     <string name="action_search" msgid="6269564710943755464">"Дуран"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Дэлгэц дээрх текстийг орчуулах эсвэл сонсох"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Таны дэлгэц дээрх текст, веб хаяг, дэлгэцийн агшин зэрэг мэдээллийг Google-тэй хуваалцаж болзошгүй.\n\nТа ямар мэдээлэл хуваалцахаа өөрчлөхийн тулд "<b>"Тохиргоо &gt; Апп &gt; Өгөгдмөл апп &gt; Дижитал туслах апп"</b>" руу очно уу."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ЦУЦЛАХ"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ОЙЛГОЛОО"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-mr/strings.xml b/go/quickstep/res/values-mr/strings.xml
index c51a780e84..79b555fc5f 100644
--- a/go/quickstep/res/values-mr/strings.xml
+++ b/go/quickstep/res/values-mr/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"ऐका"</string>
     <string name="action_translate" msgid="8028378961867277746">"भाषांतर करा"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"स्क्रीनवरील मजकूर भाषांतरित करा किंवा ऐका"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"तुमच्या स्क्रीनवरील मजकूर, वेब अ‍ॅड्रेस आणि स्क्रीनशॉट यांसारखी माहिती Google सह शेअर केली जाऊ शकते.\n\nतुम्ही कोणती माहिती शेअर करता हे बदलण्यासाठी "<b>"सेटिंग्ज &gt; ॲप्स &gt; डीफॉल्ट ॲप्स &gt; डिजिटल असिस्टंट ॲपवर जा"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"रद्द करा"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"समजले"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-ms/strings.xml b/go/quickstep/res/values-ms/strings.xml
index 64c6bff927..3f42e752e6 100644
--- a/go/quickstep/res/values-ms/strings.xml
+++ b/go/quickstep/res/values-ms/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Dengar"</string>
     <string name="action_translate" msgid="8028378961867277746">"Terjemah"</string>
     <string name="action_search" msgid="6269564710943755464">"Kanta"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Terjemahkan atau dengar teks pada skrin"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Maklumat seperti teks pada skrin anda, alamat web dan tangkapan skrin boleh dikongsi dengan Google.\n\nUntuk menukar maklumat yang anda kongsi, pergi ke "<b>"Tetapan &gt; Apl &gt; Apl lalai &gt; Apl pembantu digital"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"BATAL"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-my/strings.xml b/go/quickstep/res/values-my/strings.xml
index eafa50da61..6e0e78a1f5 100644
--- a/go/quickstep/res/values-my/strings.xml
+++ b/go/quickstep/res/values-my/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"နားထောင်ရန်"</string>
     <string name="action_translate" msgid="8028378961867277746">"ဘာသာပြန်ရန်"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"ဖန်သားပြင်ပေါ်ရှိ စာသားကို ဘာသာပြန်ပါ (သို့) နားထောင်ပါ"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"သင့်ဖန်သားပြင်ပေါ်ရှိ စာသား၊ ဝဘ်လိပ်စာနှင့် ဖန်သားပြင်ဓာတ်ပုံများကဲ့သို့ အချက်အလက်များကို Google နှင့် မျှဝေနိုင်သည်။\n\nသင်မျှဝေသည့် အချက်အလက်များကို ပြောင်းရန် "<b>"ဆက်တင်များ &gt; အက်ပ်များ &gt; မူရင်းအက်ပ်များ &gt; ဒစ်ဂျစ်တယ် Assistant အက်ပ်"</b>" သို့ သွားပါ။"</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"မလုပ်တော့"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ရပြီ"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-nb/strings.xml b/go/quickstep/res/values-nb/strings.xml
index e4cedd6d30..f21b7a5600 100644
--- a/go/quickstep/res/values-nb/strings.xml
+++ b/go/quickstep/res/values-nb/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Lytt"</string>
     <string name="action_translate" msgid="8028378961867277746">"Oversett"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Oversett eller lytt til tekst på skjermen"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informasjon som tekst på skjermen, nettadresser og skjermdumper kan deles med Google.\n\nFor å endre hvilken informasjon du deler, gå til "<b>"Innstillinger &gt; Apper &gt; Standardapper &gt; Digital assistent-app"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"AVBRYT"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"GREIT"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-ne/strings.xml b/go/quickstep/res/values-ne/strings.xml
index 56ebbf3728..c92751ca2f 100644
--- a/go/quickstep/res/values-ne/strings.xml
+++ b/go/quickstep/res/values-ne/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"सुन्नुहोस्"</string>
     <string name="action_translate" msgid="8028378961867277746">"अनुवाद गर्नुहोस्"</string>
     <string name="action_search" msgid="6269564710943755464">"लेन्स"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"स्क्रिनमा देखिने पाठ अनुवाद गरियोस् वा पढेर सुनाइयोस्"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"तपाईंको स्क्रिनमा देखिने पाठ, वेब ठेगाना र स्क्रिनसटलगायतका जानकारी Google सँग सेयर गर्न सकिन्छ।\n\nकुन कुन जानकारी सेयर गर्न दिने भन्ने सेटिङ बदल्न "<b>"सेटिङ &gt; एप &gt; डिफल्ट एप &gt; डिजिटल सहायक एप"</b>" मा जानुहोस्।"</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"रद्द गर्नुहोस्"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"बुझेँ"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-nl/strings.xml b/go/quickstep/res/values-nl/strings.xml
index 63a38cb4cd..3cf93be68b 100644
--- a/go/quickstep/res/values-nl/strings.xml
+++ b/go/quickstep/res/values-nl/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Luisteren"</string>
     <string name="action_translate" msgid="8028378961867277746">"Vertalen"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Tekst op het scherm vertalen of beluisteren"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informatie zoals tekst op je scherm, webadressen en screenshots kan met Google worden gedeeld.\n\nAls je wilt aanpassen welke informatie je deelt, ga je naar "<b>"Instellingen &gt; Apps &gt; Standaard-apps &gt; Digitale-assistent-app"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ANNULEREN"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-or/strings.xml b/go/quickstep/res/values-or/strings.xml
index 06933750c0..2e759743e3 100644
--- a/go/quickstep/res/values-or/strings.xml
+++ b/go/quickstep/res/values-or/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"ଶୁଣନ୍ତୁ"</string>
     <string name="action_translate" msgid="8028378961867277746">"ଅନୁବାଦ କରନ୍ତୁ"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"ସ୍କିନରେ ଥିବା ଟେକ୍ସଟକୁ ଅନୁବାଦ କରନ୍ତୁ କିମ୍ବା ଶୁଣନ୍ତୁ"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"ଆପଣଙ୍କ ସ୍କ୍ରିନରେ ଟେକ୍ସଟ୍, ୱେବ୍ ଠିକଣା ଏବଂ ସ୍କ୍ରିନସଟଗୁଡ଼ିକ ପରି ସୂଚନାକୁ Google ସହ ସେୟାର୍ କରାଯାଇପାରେ।\n\nଆପଣ କେଉଁ ସୂଚନା ସେୟାର୍ କରନ୍ତି ତାହା ପରିବର୍ତ୍ତନ କରିବାକୁ, "<b>"ସେଟିଂସ୍ &gt; ଆପ୍ସ &gt; ଡିଫଲ୍ଟ ଆପ୍ସ &gt; ଡିଜିଟାଲ୍ ଆସିଷ୍ଟାଣ୍ଟ ଆପ"</b>"କୁ ଯାଆନ୍ତୁ।"</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ବାତିଲ୍ କରନ୍ତୁ"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ବୁଝିଗଲି"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-pa/strings.xml b/go/quickstep/res/values-pa/strings.xml
index 3252ec02d9..cbcb13e06b 100644
--- a/go/quickstep/res/values-pa/strings.xml
+++ b/go/quickstep/res/values-pa/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"ਸੁਣੋ"</string>
     <string name="action_translate" msgid="8028378961867277746">"ਅਨੁਵਾਦ ਕਰੋ"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"ਸਕ੍ਰੀਨ \'ਤੇ ਦਿੱਤੀ ਲਿਖਤ ਦਾ ਅਨੁਵਾਦ ਕਰੋ ਜਾਂ ਉਸਨੂੰ ਸੁਣੋ"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ \'ਤੇ ਦਿੱਤੀ ਲਿਖਤ, ਵੈੱਬ ਪਤਿਆਂ ਅਤੇ ਸਕ੍ਰੀਨਸ਼ਾਟਾਂ ਵਰਗੀ ਜਾਣਕਾਰੀ ਨੂੰ Google ਨਾਲ ਸਾਂਝਾ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।\n\nਤੁਹਾਡੇ ਵੱਲੋਂ ਸਾਂਝੀ ਕੀਤੀ ਜਾਣਕਾਰੀ ਨੂੰ ਬਦਲਣ ਲਈ, "<b>"ਸੈਟਿੰਗਾਂ &gt; ਐਪਾਂ &gt; ਪੂਰਵ-ਨਿਰਧਾਰਿਤ ਐਪਾਂ &gt; ਡਿਜੀਟਲ ਸਹਾਇਕ ਐਪ"</b>" \'ਤੇ ਜਾਓ।"</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ਰੱਦ ਕਰੋ"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ਸਮਝ ਲਿਆ"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-pl/strings.xml b/go/quickstep/res/values-pl/strings.xml
index 427ac815c6..43a49b68f2 100644
--- a/go/quickstep/res/values-pl/strings.xml
+++ b/go/quickstep/res/values-pl/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Posłuchaj"</string>
     <string name="action_translate" msgid="8028378961867277746">"Przetłumacz"</string>
     <string name="action_search" msgid="6269564710943755464">"Obiektyw"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Przetłumacz lub odsłuchaj tekst na ekranie"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informacje takie jak tekst na ekranie, adresy internetowe i zrzuty ekranu mogą być udostępniane Google.\n\nAby zmienić zakres udostępnianych informacji, kliknij "<b>"Ustawienia &gt; Aplikacje &gt; Aplikacje domyślne &gt; Asystent cyfrowy"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ANULUJ"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-pt-rPT/strings.xml b/go/quickstep/res/values-pt-rPT/strings.xml
index 2bf8d143a0..426926a223 100644
--- a/go/quickstep/res/values-pt-rPT/strings.xml
+++ b/go/quickstep/res/values-pt-rPT/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Ouvir"</string>
     <string name="action_translate" msgid="8028378961867277746">"Traduzir"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Traduza ou ouça o texto no ecrã"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informações como o texto no ecrã, endereços Web e capturas de ecrã podem ser partilhadas com a Google.\n\nPara alterar as informações que partilha, aceda a "<b>"Definições &gt; Apps &gt; App predefinidas &gt; App de assistente digital"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"CANCELAR"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-pt/strings.xml b/go/quickstep/res/values-pt/strings.xml
index ade09b43bf..1bc16ec55d 100644
--- a/go/quickstep/res/values-pt/strings.xml
+++ b/go/quickstep/res/values-pt/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Ouvir"</string>
     <string name="action_translate" msgid="8028378961867277746">"Traduzir"</string>
     <string name="action_search" msgid="6269564710943755464">"Google Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Traduzir ou ouvir o texto na tela"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informações como o texto exibido, endereços da Web e capturas de tela poderão ser compartilhadas com o Google.\n\nPara mudar quais dados são compartilhados, acesse "<b>"Configurações &gt; Apps &gt; Apps padrão &gt; App assistente digital"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"CANCELAR"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-ro/strings.xml b/go/quickstep/res/values-ro/strings.xml
index a09e6d15a7..cfd11f8d5d 100644
--- a/go/quickstep/res/values-ro/strings.xml
+++ b/go/quickstep/res/values-ro/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Ascultați"</string>
     <string name="action_translate" msgid="8028378961867277746">"Traduceți"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Traduceți sau ascultați textul de pe ecran"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informații precum textul de pe ecran, adresele web și capturile de ecran pot fi trimise la Google.\n\nCa să schimbați informațiile trimise, accesați "<b>"Setări &gt; Aplicații &gt; Aplicații prestabilite &gt; Aplicația asistent digital"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ANULAȚI"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-ru/strings.xml b/go/quickstep/res/values-ru/strings.xml
index 5a726c1f04..ad9c7bd747 100644
--- a/go/quickstep/res/values-ru/strings.xml
+++ b/go/quickstep/res/values-ru/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Слушать"</string>
     <string name="action_translate" msgid="8028378961867277746">"Перевести"</string>
     <string name="action_search" msgid="6269564710943755464">"Объектив"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Перевод или прослушивание текста на экране"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Определенные сведения (например, текст на экране, веб-адреса и скриншоты) могут быть отправлены в Google.\n\nИзменить информацию, которой вы делитесь, можно в меню "<b>"Настройки &gt; Приложения &gt; Приложения по умолчанию &gt; Цифровой помощник"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ОТМЕНА"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ОК"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-si/strings.xml b/go/quickstep/res/values-si/strings.xml
index 85625f5996..9a18629f7f 100644
--- a/go/quickstep/res/values-si/strings.xml
+++ b/go/quickstep/res/values-si/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"සවන් දෙන්න"</string>
     <string name="action_translate" msgid="8028378961867277746">"පරිවර්තනය කරන්න"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"තිරය මත පෙළ පරිවර්තනය කරන්න හෝ එයට සවන් දෙන්න"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"ඔබගේ තිරයේ ඇති පෙළ, වෙබ් ලිපින සහ තිර රූ වැනි තොරතුරු Google සමඟ බෙදා ගත හැකිය.\n\nඔබ බෙදා ගන්නා තොරතුරු වෙනස් කිරීමට, "<b>"සැකසීම් &gt; යෙදුම් &gt; පෙරනිමි යෙදුම් &gt; ඩිජිටල් සහායක යෙදුම"</b>" වෙත යන්න."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"අවලංගු කරන්න"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"තේරුණා"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-sk/strings.xml b/go/quickstep/res/values-sk/strings.xml
index cfe8712f52..cea591a61e 100644
--- a/go/quickstep/res/values-sk/strings.xml
+++ b/go/quickstep/res/values-sk/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Počúvať"</string>
     <string name="action_translate" msgid="8028378961867277746">"Preložiť"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Prekladajte alebo počúvajte text na obrazovke"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Údaje, napríklad text na obrazovke, webové adresy a snímky obrazovky, môžu byť zdieľané s Googlom.\n\nAk chcete zmeniť, ktoré údaje zdieľate, prejdite do sekcie "<b>"Nastavenia &gt; Aplikácie &gt; Predvolené aplikácie &gt; Digitálny asistent"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ZRUŠIŤ"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"DOBRE"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-sl/strings.xml b/go/quickstep/res/values-sl/strings.xml
index c7fc10e5d3..ba17f7d477 100644
--- a/go/quickstep/res/values-sl/strings.xml
+++ b/go/quickstep/res/values-sl/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Poslušanje"</string>
     <string name="action_translate" msgid="8028378961867277746">"Prevedi"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Prevod ali poslušanje besedila na zaslonu"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Podatki, kot so besedilo na zaslonu, spletni naslovi in posnetki zaslonov, bodo morda deljeni z Googlom.\n\nČe želite spremeniti, katere podatke delite, odprite "<b>"Nastavitve &gt; Aplikacije &gt; Privzete aplikacije &gt; Digitalni pomočnik"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"PREKLIČI"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"RAZUMEM"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-sq/strings.xml b/go/quickstep/res/values-sq/strings.xml
index 0adc077420..9e379311fd 100644
--- a/go/quickstep/res/values-sq/strings.xml
+++ b/go/quickstep/res/values-sq/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Dëgjo"</string>
     <string name="action_translate" msgid="8028378961867277746">"Përkthe"</string>
     <string name="action_search" msgid="6269564710943755464">"Lentja"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Përkthe ose dëgjo tekstin në ekran"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informacionet si teksti në ekranin tënd, adresat e uebit dhe pamjet e ekranit mund të ndahen me Google.\n\nPër të ndryshuar se çfarë informacionesh ndahen, shko te "<b>"Cilësimet &gt; Aplikacionet &gt; Aplikacionet e parazgjedhura &gt; Aplikacioni i asistentit dixhital"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ANULO"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"E KUPTOVA"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-sr/strings.xml b/go/quickstep/res/values-sr/strings.xml
index e98e9d63af..9349d5fa49 100644
--- a/go/quickstep/res/values-sr/strings.xml
+++ b/go/quickstep/res/values-sr/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Пусти"</string>
     <string name="action_translate" msgid="8028378961867277746">"Преведи"</string>
     <string name="action_search" msgid="6269564710943755464">"Објектив"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Преводите или слушајте текст на екрану"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Информације попут текста на екрану, веб-адреса и снимака екрана могу да се деле са Google-ом.\n\nДа бисте променили информације које делите, идите у "<b>"Подешавања &gt; Апликације &gt; Подразумеване апликације &gt; Апликација дигиталног помоћника"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ОТКАЖИ"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ВАЖИ"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-sv/strings.xml b/go/quickstep/res/values-sv/strings.xml
index 8745afdbfd..b88145434f 100644
--- a/go/quickstep/res/values-sv/strings.xml
+++ b/go/quickstep/res/values-sv/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Lyssna"</string>
     <string name="action_translate" msgid="8028378961867277746">"Översätt"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Översätt eller lyssna på texten på skärmen"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Information som text på skärmen, webbadresser och skärmbilder kan delas med Google.\n\nFör att ändra vilken information du delar öppnar du "<b>"Inställningar &gt; Appar &gt; Standardappar &gt; Digital assistentapp"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"AVBRYT"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-sw/strings.xml b/go/quickstep/res/values-sw/strings.xml
index 826d6e5455..3ff9d9c162 100644
--- a/go/quickstep/res/values-sw/strings.xml
+++ b/go/quickstep/res/values-sw/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Sikiliza"</string>
     <string name="action_translate" msgid="8028378961867277746">"Tafsiri"</string>
     <string name="action_search" msgid="6269564710943755464">"Lenzi"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Tafsiri au usikilize maandishi kwenye skrini"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Maelezo kama vile maandishi kwenye skrini yako, anwani za wavuti na picha za skrini yanaweza kushirikiwa na Google.\n\nIli ubadilishe maelezo unayoshiriki, nenda kwenye "<b>"Mipangilio &gt; Programu &gt; Programu chaguomsingi &gt; Programu ya mratibu dijitali"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"GHAIRI"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"NIMEELEWA"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-ta/strings.xml b/go/quickstep/res/values-ta/strings.xml
index ad2e1305b9..cdb91c6189 100644
--- a/go/quickstep/res/values-ta/strings.xml
+++ b/go/quickstep/res/values-ta/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"கேளுங்கள்"</string>
     <string name="action_translate" msgid="8028378961867277746">"மொழிபெயர்"</string>
     <string name="action_search" msgid="6269564710943755464">"லென்ஸ்"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"திரையிலுள்ள உரையை மொழிபெயருங்கள் அல்லது கேளுங்கள்"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"உங்கள் திரையிலுள்ள உரை, வலை முகவரிகள், ஸ்கிரீன்ஷாட்டுகள் போன்ற தகவல்கள் Googleளுடன் பகிரப்படலாம்.\n\nஎந்தத் தகவல்கள் பகிரப்படலாம் என்பதை மாற்ற, "<b>"அமைப்புகள் &gt; ஆப்ஸ் &gt; இயல்பு ஆப்ஸ் &gt; டிஜிட்டல் அசிஸ்டண்ட் ஆப்ஸ்"</b>" என்பதற்குச் செல்லுங்கள்."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ரத்துசெய்"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"சரி"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-te/strings.xml b/go/quickstep/res/values-te/strings.xml
index 1736c7f086..33c17b906c 100644
--- a/go/quickstep/res/values-te/strings.xml
+++ b/go/quickstep/res/values-te/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"వినండి"</string>
     <string name="action_translate" msgid="8028378961867277746">"అనువదించండి"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"స్క్రీన్‌పై టెక్స్ట్ అనువదించండి లేదా వినండి"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"మీ స్క్రీన్‌పై టెక్స్ట్, వెబ్ అడ్రస్‌లు, అలాగే స్క్రీన్‌షాట్‌ల వంటి సమాచారం Googleతో షేర్ చేయడం జరగవచ్చు.\n\nమీరు ఏ సమాచారాన్ని షేర్ చేసుకుంటారో మార్చడానికి "<b>"సెట్టింగ్‌లు &gt; యాప్‌లు &gt; ఆటోమేటిక్ సెట్టింగ్ యాప్‌లు &gt; డిజిటల్ అసిస్టెంట్ యాప్‌ల"</b>"‌కు వెళ్లండి."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"రద్దు చేయి"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"అర్థమైంది"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-th/strings.xml b/go/quickstep/res/values-th/strings.xml
index ea89d88c9c..3267525b89 100644
--- a/go/quickstep/res/values-th/strings.xml
+++ b/go/quickstep/res/values-th/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"ฟัง"</string>
     <string name="action_translate" msgid="8028378961867277746">"แปลภาษา"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"แปลหรือฟังข้อความบนหน้าจอ"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"อาจมีการแชร์ข้อมูลอย่างเช่น ข้อความบนหน้าจอ ที่อยู่เว็บ และภาพหน้าจอกับ Google\n\nหากต้องการเปลี่ยนประเภทข้อมูลที่คุณแชร์ ให้ไปที่"<b>"การตั้งค่า &gt; แอป &gt; แอปเริ่มต้น &gt; แอปผู้ช่วยดิจิทัล"</b></string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"ยกเลิก"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"รับทราบ"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-tl/strings.xml b/go/quickstep/res/values-tl/strings.xml
index 3502363726..73bfb7fa0a 100644
--- a/go/quickstep/res/values-tl/strings.xml
+++ b/go/quickstep/res/values-tl/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Makinig"</string>
     <string name="action_translate" msgid="8028378961867277746">"Isalin"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"I-translate o pakinggan ang text sa screen"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Posibleng ibahagi sa Google ang impormasyong gaya ng text sa iyong screen, mga web address, at screenshot.\n\nPara baguhin kung anong impormasyon ang ibinabahagi mo, pumunta sa "<b>"Mga Setting &gt; Mga App &gt; Mga default na app &gt; Digital assistant app"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"KANSELAHIN"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-tr/strings.xml b/go/quickstep/res/values-tr/strings.xml
index f150cc5f33..0e16d93cc5 100644
--- a/go/quickstep/res/values-tr/strings.xml
+++ b/go/quickstep/res/values-tr/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Dinle"</string>
     <string name="action_translate" msgid="8028378961867277746">"Çevir"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Ekrandaki metni çevirin veya dinleyin"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Ekranınızdaki metin, web adresleri ve ekran görüntüleri gibi bilgiler Google ile paylaşılabilir.\n\nPaylaştığınız bilgileri değiştirmek için "<b>"Ayarlar &gt; Uygulamalar &gt; Varsayılan uygulamalar &gt; Dijital asistan uygulamasına gidin"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"İPTAL"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"ANLADIM"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-uk/strings.xml b/go/quickstep/res/values-uk/strings.xml
index 452c0ebffb..66b4be8318 100644
--- a/go/quickstep/res/values-uk/strings.xml
+++ b/go/quickstep/res/values-uk/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Слухати"</string>
     <string name="action_translate" msgid="8028378961867277746">"Перекласти"</string>
     <string name="action_search" msgid="6269564710943755464">"Об’єктив"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Перекласти або прослухати текст на екрані"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Певна інформація (наприклад, текст на екрані, веб-адреси, знімки екрана) може надсилатися на сервери Google.\n\nЩоб змінити типи даних, які надсилаються, відкрийте "<b>"Налаштування &gt; Додатки &gt; Додатки за умовчанням &gt; Цифровий помічник"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"СКАСУВАТИ"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-ur/strings.xml b/go/quickstep/res/values-ur/strings.xml
index daff43c7c1..9df59c9e45 100644
--- a/go/quickstep/res/values-ur/strings.xml
+++ b/go/quickstep/res/values-ur/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"سنیں"</string>
     <string name="action_translate" msgid="8028378961867277746">"‏Google ترجمہ"</string>
     <string name="action_search" msgid="6269564710943755464">"‏Google لینز"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"اسکرین پر موجود ٹیکسٹ کو سنیں یا ترجمہ کریں"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"‏آپ کی اسکرین پر ٹیکسٹ، ویب پتے اور اسکرین شاٹس جیسی معلومات کا اشتراک Google کے ساتھ کیا جا سکتا ہے۔\n\nآپ جس معلومات کا اشتراک کرتے ہیں اسے تبدیل کرنے کیلئے "<b>"ترتیبات ‎&gt;‎ ایپس ‎&gt;‎ ڈیفالٹ ایپس ‎&gt;‎ ڈیجیٹل اسسٹنٹ ایپ"</b>" پر جائیں۔"</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"منسوخ کریں"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"سمجھ آ گئی"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-uz/strings.xml b/go/quickstep/res/values-uz/strings.xml
index c67d81cd49..3d71b56944 100644
--- a/go/quickstep/res/values-uz/strings.xml
+++ b/go/quickstep/res/values-uz/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Tinglash"</string>
     <string name="action_translate" msgid="8028378961867277746">"Tarjima"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Ekrandagi matnni tarjima qilish yoki tinglash"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Ekraningizdagi matn, veb-manzillar va skrinshot kabilar Googlega yuborilishi mumkin.\n\nQanday maʼlumotlarni ulashishni tanlash uchun "<b>"Sozlamalar &gt; Ilovalar &gt; Standart ilovalar &gt; Raqamli assistent"</b>" ilovasini oching."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"BEKOR QILISH"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-vi/strings.xml b/go/quickstep/res/values-vi/strings.xml
index 66f6ae782c..d66e01dc54 100644
--- a/go/quickstep/res/values-vi/strings.xml
+++ b/go/quickstep/res/values-vi/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Nghe"</string>
     <string name="action_translate" msgid="8028378961867277746">"Dịch"</string>
     <string name="action_search" msgid="6269564710943755464">"Ống kính"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Dịch hoặc nghe văn bản trên màn hình"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Những thông tin như văn bản trên màn hình, địa chỉ web và ảnh chụp màn hình có thể được chia sẻ với Google.\n\nĐể thay đổi những thông tin mà bạn chia sẻ, hãy chuyển đến phần "<b>"Cài đặt &gt; Ứng dụng &gt; Ứng dụng mặc định &gt; Ứng dụng trợ lý kỹ thuật số"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"HỦY"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"OK"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-zh-rCN/strings.xml b/go/quickstep/res/values-zh-rCN/strings.xml
index de598e0879..b31de8fecd 100644
--- a/go/quickstep/res/values-zh-rCN/strings.xml
+++ b/go/quickstep/res/values-zh-rCN/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"聆听"</string>
     <string name="action_translate" msgid="8028378961867277746">"翻译"</string>
     <string name="action_search" msgid="6269564710943755464">"智能镜头"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"翻译或聆听屏幕上的文字"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"系统可能会将屏幕上的文字、网址和屏幕截图等信息分享给 Google。\n\n如需更改要分享哪些信息，请依次转到"<b>"设置 &gt; 应用 &gt; 默认应用 &gt; 数字助理应用"</b>"。"</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"取消"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"知道了"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-zh-rHK/strings.xml b/go/quickstep/res/values-zh-rHK/strings.xml
index c3a55ac07c..87eca776b4 100644
--- a/go/quickstep/res/values-zh-rHK/strings.xml
+++ b/go/quickstep/res/values-zh-rHK/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"聆聽"</string>
     <string name="action_translate" msgid="8028378961867277746">"翻譯"</string>
     <string name="action_search" msgid="6269564710943755464">"智能鏡頭"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"翻譯或聆聽畫面上的文字"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"可能會與 Google 分享螢幕上的文字、網址和螢幕截圖等資料。\n\n如要變更分享的資料，請前往 "<b>"[設定] &gt; [應用程式] &gt; [預設應用程式] &gt; [數碼助理應用程式]"</b>"。"</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"取消"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"知道了"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-zh-rTW/strings.xml b/go/quickstep/res/values-zh-rTW/strings.xml
index 98c32b99d8..a79c268ce9 100644
--- a/go/quickstep/res/values-zh-rTW/strings.xml
+++ b/go/quickstep/res/values-zh-rTW/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"聆聽"</string>
     <string name="action_translate" msgid="8028378961867277746">"翻譯"</string>
     <string name="action_search" msgid="6269564710943755464">"智慧鏡頭"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"翻譯或朗讀畫面上的文字"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"系統可能會將畫面上的文字、網址和螢幕截圖等資訊分享給 Google。\n\n如要變更分享的資訊類型，請前往 [設定] &gt; [應用程式] &gt; [預設應用程式] &gt; [數位助理應用程式]"<b></b>"。"</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"取消"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"我知道了"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
diff --git a/go/quickstep/res/values-zu/strings.xml b/go/quickstep/res/values-zu/strings.xml
index 176dfe3ca2..aeaf07a6f3 100644
--- a/go/quickstep/res/values-zu/strings.xml
+++ b/go/quickstep/res/values-zu/strings.xml
@@ -5,8 +5,24 @@
     <string name="action_listen" msgid="2370304050784689486">"Lalela"</string>
     <string name="action_translate" msgid="8028378961867277746">"Humusha"</string>
     <string name="action_search" msgid="6269564710943755464">"Ilensi"</string>
+    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
+    <skip />
+    <!-- no translation found for dialog_cancel (6464336969134856366) -->
+    <skip />
+    <!-- no translation found for dialog_settings (6564397136021186148) -->
+    <skip />
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Humusha noma ulalele umbhalo osesikrinini"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Imininingwane efana nombhalo esikrinini sakho, amakheli wewebhu, nezithombe-skrini kungabiwa ne-Google.\n\nUkuze ushintshe ukuthi yiluphi ulwazi olwabayo, yiya kokuthi "<b>"Amasethingi &gt; ama-App &gt; Ama-app azenzekelayo &gt; Umsizi we-app odijithali"</b>"."</string>
-    <string name="niu_actions_confirmation_no" msgid="6641104944008154587">"KHANSELA"</string>
-    <string name="niu_actions_confirmation_yes" msgid="3817302060585371994">"NGIYITHOLILE"</string>
+    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
+    <skip />
+    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
+    <skip />
+    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
+    <skip />
+    <!-- no translation found for tooltip_listen (7634466447860989102) -->
+    <skip />
+    <!-- no translation found for tooltip_translate (4184845868901542567) -->
+    <skip />
 </resources>
-- 
GitLab


From f7c6ae0e373a83429c611f6fc6fd7beb0809a73c Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Thu, 8 Jul 2021 15:15:35 +0000
Subject: [PATCH 1585/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I1f29c71229eb05b6264037308bf59184603388a7
---
 res/values-vi/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 2f53bafe04..0918465df6 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -159,7 +159,7 @@
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Hồ sơ công việc"</string>
     <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Các ứng dụng công việc được gắn huy hiệu và quản trị viên CNTT có thể nhìn thấy"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"OK"</string>
-    <string name="work_apps_paused_title" msgid="3040901117349444598">"Đã tạm dừng ứng dụng công việc"</string>
+    <string name="work_apps_paused_title" msgid="3040901117349444598">"Đã tạm dừng các ứng dụng công việc"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Các ứng dụng công việc không thể gửi thông báo cho bạn, sử dụng pin hoặc truy cập thông tin vị trí của bạn"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Ứng dụng công việc đang tắt. Các ứng dụng công việc không thể gửi thông báo cho bạn, sử dụng pin hoặc truy cập thông tin vị trí của bạn"</string>
     <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Các ứng dụng công việc được gắn huy hiệu và quản trị viên CNTT có thể nhìn thấy"</string>
-- 
GitLab


From 255fe1ea45e77e25c9cce86b0999a16e6c8d3b7c Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 8 Jul 2021 10:12:34 -0700
Subject: [PATCH 1586/1664] Fix crash when handling recents animation canceled

- If Launcher finishes the animation, that also cleans up the screenshot
    on the server side, so we can skip calling it

Fixes: 192684578
Test: N/a, adding a null check
Change-Id: I8bf1ad5089762469697d14842cc14c184055e925
---
 quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index e867f07fb7..7e45369692 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -387,8 +387,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         mGestureState.runOnceAtState(STATE_RECENTS_ANIMATION_CANCELED, () -> {
                 ThumbnailData snapshot = mGestureState.consumeRecentsAnimationCanceledSnapshot();
                 if (snapshot != null) {
-                    mRecentsView.switchToScreenshot(snapshot,
-                            () -> mRecentsAnimationController.cleanupScreenshot());
+                    mRecentsView.switchToScreenshot(snapshot, () -> {
+                        if (mRecentsAnimationController != null) {
+                            mRecentsAnimationController.cleanupScreenshot();
+                        }
+                    });
                     mRecentsView.onRecentsAnimationComplete();
                 }
             });
-- 
GitLab


From dc7f4623e5675c29fea35f4393cbb548e70b5550 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Thu, 8 Jul 2021 22:18:05 -0700
Subject: [PATCH 1587/1664] Edu card spec polish

Bug: 193134601
Test: manual
Change-Id: Ibcc053b5006d36efd97fb75f6474fb8c8a5c24a4
---
 res/layout/work_apps_edu.xml | 8 ++++----
 res/values/dimens.xml        | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/res/layout/work_apps_edu.xml b/res/layout/work_apps_edu.xml
index 2a3d1542a4..382b8fc0f2 100644
--- a/res/layout/work_apps_edu.xml
+++ b/res/layout/work_apps_edu.xml
@@ -24,7 +24,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:paddingHorizontal="@dimen/work_card_padding_horizontal"
-        android:paddingVertical="@dimen/work_card_padding_vertical"
+        android:paddingVertical="@dimen/work_card_padding_horizontal"
         android:background="@drawable/work_card"
         android:layout_gravity="center_horizontal"
         android:gravity="center"
@@ -36,14 +36,14 @@
             android:id="@+id/work_apps_paused_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/work_card_padding_vertical"
+            android:layout_marginBottom="@dimen/work_card_padding_horizontal"
             android:text="@string/work_profile_edu_work_apps"
             android:textAlignment="center"
             android:textSize="20sp" />
 
         <Button
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/rounded_button_height"
+            android:layout_width="match_parent"
+            android:layout_height="52dp"
             android:id="@+id/action_btn"
             android:textColor="?attr/workProfileOverlayTextColor"
             android:text="@string/work_profile_edu_accept"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 4735983eaf..393b39cb31 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -122,7 +122,6 @@
     <dimen name="work_fab_height">56dp</dimen>
     <dimen name="work_fab_radius">24dp</dimen>
     <dimen name="work_card_padding_horizontal">24dp</dimen>
-    <dimen name="work_card_padding_vertical">32dp</dimen>
     <dimen name="work_fab_margin">16dp</dimen>
     <dimen name="work_profile_footer_padding">20dp</dimen>
     <dimen name="work_profile_footer_text_size">16sp</dimen>
-- 
GitLab


From bd372ae84b4f98f898333990f4bbdbee3637b6d7 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Fri, 9 Jul 2021 06:01:24 +0000
Subject: [PATCH 1588/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I9905f7a629d628d392a1a59d74cbf65baf401b58
---
 go/quickstep/res/values-en-rXC/strings.xml | 27 ++++++++--------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/go/quickstep/res/values-en-rXC/strings.xml b/go/quickstep/res/values-en-rXC/strings.xml
index 54eb30dda8..c729cd845c 100644
--- a/go/quickstep/res/values-en-rXC/strings.xml
+++ b/go/quickstep/res/values-en-rXC/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‎‎‏‎‏‎‎‎‎‎‎‏‎‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‏‎‏‏‏‎‏‎‏‎‎‏‏‏‎‎Listen‎‏‎‎‏‎"</string>
     <string name="action_translate" msgid="8028378961867277746">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‎‏‎‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‎‎‏‎‏‎‎‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎‎‏‎‎Translate‎‏‎‎‏‎"</string>
     <string name="action_search" msgid="6269564710943755464">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‏‎‎‎‏‏‎‎‏‏‎‎‏‎‎‎‎Lens‎‏‎‎‏‎"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‏‎‎‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‏‎‎‎‎‏‏‎‏‎‎‎‏‏‎‎‏‏‎‎‏‏‎‏‎‏‎‏‏‏‎‏‎‎‎GOT IT‎‏‎‎‏‎"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎‏‏‏‏‏‎‎‎‎‎‎‏‏‏‎‎‏‎‏‎‏‎‎‎‏‏‎‏‏‎‏‎‏‎‏‎‏‏‎‎‎‏‎‏‎‏‏‏‎‎CANCEL‎‏‎‎‏‎"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‏‎‎‏‎‏‏‎‏‏‎‎‎‏‏‎‏‎‏‎‎‏‏‎‎‎‎‏‎‎‏‎‎‎‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‎SETTINGS‎‏‎‎‏‎"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‎‏‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎Translate or listen to text on screen‎‏‎‎‏‎"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‏‎‏‎‏‎‎‎‎‏‎‎‎‏‏‎‏‎‏‎‏‏‏‎‎‎‏‎‎‎‎‏‎‏‎‏‎‏‎‏‎‎‏‎Information such as text on your screen, web addresses, and screenshots may be shared with Google.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To change what information you share, go to ‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎Settings &gt; Apps &gt; Default apps &gt; Digital assistant app‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎.‎‏‎‎‏‎"</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‎‎‎‎‎‎‏‏‏‎‎‏‎‏‎‎‏‎‎‏‏‏‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‎‎‏‏‎‎‎Choose an assistant to use this feature‎‏‎‎‏‎"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‎‎‎‎‏‏‎‎‏‎‏‎‎‎‎‎‎‏‎‎‏‏‎‏‎‎‏‏‎‏‏‎‎‎To listen to or translate text on your screen, choose a digital assistant app in Settings‎‏‎‎‏‎"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‎‎‏‏‎‎‏‏‎‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‎‎‏‏‎‏‏‏‎‎Change your assistant to use this feature‎‏‎‎‏‎"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‏‎‏‎‎‏‏‎‏‏‏‎‏‏‎‎‏‏‎‎‏‎‎‎‎‎‏‏‎‏‎‏‎‎‏‏‎‎‏‎‏‎‎‎To listen to or translate text on your screen, change your digital assistant app in Settings‎‏‎‎‏‎"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎‏‎‎‏‎‎‎‎‎‎‏‎‎‏‏‎‎‏‎‎‎‏‏‏‏‏‎‎‏‎‏‎‏‏‏‎‎Tap here to listen to text on this screen‎‏‎‎‏‎"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‎‎‏‏‏‎‎‎‏‏‏‏‎‎‏‎‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‎‏‎‏‎‏‎‏‎‎‏‏‏‎Tap here to translate text on this screen‎‏‎‎‏‎"</string>
 </resources>
-- 
GitLab


From bfe33b057a1c51f24b45ead18c9e7e27caed4fb0 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Thu, 24 Jun 2021 15:05:18 -0700
Subject: [PATCH 1589/1664] Update Gesture navigation tutorial to match new
 specs

- Updated strings
- Updated removed 'next' button when there are followign steps
- Added timeout to automatically continue the tutorial
- Combined back left and right into one step

Bug: 192009114
Bug: 177005427
Test: manual
Change-Id: I58b9017c4d69b5d097326c7d5be156a63951fb1a
---
 ...eft.xml => gesture_tutorial_loop_back.xml} |    0
 .../gesture_tutorial_loop_back_right.xml      |   96 --
 ...t.xml => gesture_tutorial_motion_back.xml} |    0
 .../gesture_tutorial_motion_back_right.xml    | 1233 -----------------
 .../drawable/tutorial_step_indicator_pill.xml |    2 +-
 .../res/layout/gesture_tutorial_fragment.xml  |   36 +-
 quickstep/res/values/strings.xml              |   32 +-
 quickstep/res/values/styles.xml               |    4 +-
 .../BackGestureTutorialController.java        |   56 +-
 .../BackGestureTutorialFragment.java          |    8 +-
 .../interaction/GestureSandboxActivity.java   |    2 +-
 .../HomeGestureTutorialController.java        |    1 -
 .../SandboxModeTutorialController.java        |    6 +-
 .../interaction/TutorialController.java       |   35 +-
 .../interaction/TutorialFragment.java         |    5 +-
 .../settings/DeveloperOptionsFragment.java    |    5 +-
 16 files changed, 87 insertions(+), 1434 deletions(-)
 rename quickstep/res/drawable/{gesture_tutorial_loop_back_left.xml => gesture_tutorial_loop_back.xml} (100%)
 delete mode 100644 quickstep/res/drawable/gesture_tutorial_loop_back_right.xml
 rename quickstep/res/drawable/{gesture_tutorial_motion_back_left.xml => gesture_tutorial_motion_back.xml} (100%)
 delete mode 100644 quickstep/res/drawable/gesture_tutorial_motion_back_right.xml

diff --git a/quickstep/res/drawable/gesture_tutorial_loop_back_left.xml b/quickstep/res/drawable/gesture_tutorial_loop_back.xml
similarity index 100%
rename from quickstep/res/drawable/gesture_tutorial_loop_back_left.xml
rename to quickstep/res/drawable/gesture_tutorial_loop_back.xml
diff --git a/quickstep/res/drawable/gesture_tutorial_loop_back_right.xml b/quickstep/res/drawable/gesture_tutorial_loop_back_right.xml
deleted file mode 100644
index c20b252778..0000000000
--- a/quickstep/res/drawable/gesture_tutorial_loop_back_right.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
-    <target android:name="_R_G_L_1_G_D_0_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="1000"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="0"
-                    android:valueFrom="0.25"
-                    android:valueTo="0.75"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="1000"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1000"
-                    android:valueFrom="0.75"
-                    android:valueTo="0.25"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="0"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="783"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="time_group">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="2000"
-                    android:propertyName="translateX"
-                    android:startOffset="0"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <aapt:attr name="android:drawable">
-        <vector
-            android:width="412dp"
-            android:height="892dp"
-            android:viewportHeight="892"
-            android:viewportWidth="412">
-            <group android:name="_R_G">
-                <group
-                    android:name="_R_G_L_1_G"
-                    android:translateX="399.5"
-                    android:translateY="446">
-                    <path
-                        android:name="_R_G_L_1_G_D_0_P_0"
-                        android:fillAlpha="0.25"
-                        android:fillColor="@color/gesture_tutorial_primary_color"
-                        android:fillType="nonZero"
-                        android:pathData=" M12.5 -446 C12.5,-446 12.5,446 12.5,446 C12.5,446 -12.5,446 -12.5,446 C-12.5,446 -12.5,-446 -12.5,-446 C-12.5,-446 12.5,-446 12.5,-446c " />
-                </group>
-                <group
-                    android:name="_R_G_L_0_G"
-                    android:translateX="206"
-                    android:translateY="446" />
-            </group>
-            <group android:name="time_group" />
-        </vector>
-    </aapt:attr>
-</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_motion_back_left.xml b/quickstep/res/drawable/gesture_tutorial_motion_back.xml
similarity index 100%
rename from quickstep/res/drawable/gesture_tutorial_motion_back_left.xml
rename to quickstep/res/drawable/gesture_tutorial_motion_back.xml
diff --git a/quickstep/res/drawable/gesture_tutorial_motion_back_right.xml b/quickstep/res/drawable/gesture_tutorial_motion_back_right.xml
deleted file mode 100644
index b368d9d045..0000000000
--- a/quickstep/res/drawable/gesture_tutorial_motion_back_right.xml
+++ /dev/null
@@ -1,1233 +0,0 @@
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_0_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_1_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_2_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_3_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_4_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_5_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_6_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_7_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_8_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_9_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_10_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_11_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_12_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G_L_0_G_D_13_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="133"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="1367"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="283"
-                    android:propertyName="scaleX"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0.88012"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="283"
-                    android:propertyName="scaleY"
-                    android:startOffset="1217"
-                    android:valueFrom="1"
-                    android:valueTo="0.88012"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,0.536 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_3_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="2417"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_0_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_1_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_2_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_3_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_4_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_5_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_6_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_7_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_8_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_9_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_10_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_11_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_12_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_13_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_14_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_15_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_16_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_17_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_18_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_19_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_20_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_21_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_22_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_23_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_0_G_L_0_G_D_24_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="333"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_0_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G_L_0_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_2_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="1417"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="667"
-                    android:pathData="M 565.282,129.757C 554.782,129.757 512.7819999999999,129.757 502.282,129.757"
-                    android:propertyName="translateXY"
-                    android:propertyXName="translateX"
-                    android:propertyYName="translateY"
-                    android:startOffset="217">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="333"
-                    android:pathData="M 502.282,129.757C 502.282,129.757 502.282,129.757 502.282,129.757"
-                    android:propertyName="translateXY"
-                    android:propertyXName="translateX"
-                    android:propertyYName="translateY"
-                    android:startOffset="883">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0.333 0.667,0.667 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="250"
-                    android:pathData="M 502.282,129.757C 512.7819999999999,129.757 554.782,129.757 565.282,129.757"
-                    android:propertyName="translateXY"
-                    android:propertyXName="translateX"
-                    android:propertyYName="translateY"
-                    android:startOffset="1217">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="217"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="0"
-                    android:propertyName="scaleY"
-                    android:startOffset="2383"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_D_0_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="217"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="0"
-                    android:valueFrom="0"
-                    android:valueTo="0.75"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="967"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="217"
-                    android:valueFrom="0.75"
-                    android:valueTo="0.75"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="167"
-                    android:propertyName="fillAlpha"
-                    android:startOffset="1183"
-                    android:valueFrom="0.75"
-                    android:valueTo="0"
-                    android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_0_G_D_0_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="217"
-                    android:propertyName="pathData"
-                    android:startOffset="0"
-                    android:valueFrom="M205 13.5 C225.16,13.5 241.5,29.84 241.5,50 C241.5,70.16 225.16,86.5 205,86.5 C184.84,86.5 168.5,70.16 168.5,50 C168.5,29.84 184.84,13.5 205,13.5c "
-                    android:valueTo="M205.5 0 C233.11,0 255.5,22.39 255.5,50 C255.5,77.61 233.11,100 205.5,100 C177.89,100 155.5,77.61 155.5,50 C155.5,22.39 177.89,0 205.5,0c "
-                    android:valueType="pathType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="583"
-                    android:propertyName="pathData"
-                    android:startOffset="217"
-                    android:valueFrom="M205.5 0 C233.11,0 255.5,22.39 255.5,50 C255.5,77.61 233.11,100 205.5,100 C177.89,100 155.5,77.61 155.5,50 C155.5,22.39 177.89,0 205.5,0c "
-                    android:valueTo="M0 0 C27.61,0 50,22.39 50,50 C50,77.61 27.61,100 0,100 C-27.61,100 -50,77.61 -50,50 C-50,22.39 -27.61,0 0,0c "
-                    android:valueType="pathType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.5,0 0.5,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="383"
-                    android:propertyName="pathData"
-                    android:startOffset="800"
-                    android:valueFrom="M0 0 C27.61,0 50,22.39 50,50 C50,77.61 27.61,100 0,100 C-27.61,100 -50,77.61 -50,50 C-50,22.39 -27.61,0 0,0c "
-                    android:valueTo="M0 0 C27.61,0 50,22.39 50,50 C50,77.61 27.61,100 0,100 C-27.61,100 -50,77.61 -50,50 C-50,22.39 -27.61,0 0,0c "
-                    android:valueType="pathType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator
-                    android:duration="167"
-                    android:propertyName="pathData"
-                    android:startOffset="1183"
-                    android:valueFrom="M0 0 C27.61,0 50,22.39 50,50 C50,77.61 27.61,100 0,100 C-27.61,100 -50,77.61 -50,50 C-50,22.39 -27.61,0 0,0c "
-                    android:valueTo="M0 13.5 C20.16,13.5 36.5,29.84 36.5,50 C36.5,70.16 20.16,86.5 0,86.5 C-20.16,86.5 -36.5,70.16 -36.5,50 C-36.5,29.84 -20.16,13.5 0,13.5c "
-                    android:valueType="pathType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="time_group">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator
-                    android:duration="1767"
-                    android:propertyName="translateX"
-                    android:startOffset="0"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType" />
-            </set>
-        </aapt:attr>
-    </target>
-    <aapt:attr name="android:drawable">
-        <vector
-            android:width="412dp"
-            android:height="892dp"
-            android:viewportHeight="892"
-            android:viewportWidth="412">
-            <group android:name="_R_G">
-                <group
-                    android:name="_R_G_L_4_G"
-                    android:translateX="206"
-                    android:translateY="446">
-                    <path
-                        android:name="_R_G_L_4_G_D_0_P_0"
-                        android:fillAlpha="1"
-                        android:fillColor="#dadce0"
-                        android:fillType="nonZero"
-                        android:pathData=" M206 -446 C206,-446 206,446 206,446 C206,446 -206,446 -206,446 C-206,446 -206,-446 -206,-446 C-206,-446 206,-446 206,-446c " />
-                </group>
-                <group
-                    android:name="_R_G_L_3_G"
-                    android:pivotX="206"
-                    android:pivotY="446"
-                    android:scaleX="1"
-                    android:scaleY="1">
-                    <group android:name="_R_G_L_3_G_L_0_G">
-                        <group android:name="_R_G_L_3_G_L_0_G_L_0_G">
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_0_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#f1f3f4"
-                                android:fillType="nonZero"
-                                android:pathData=" M412 101 C412,101 412,892 412,892 C412,892 0,892 0,892 C0,892 0,101 0,101 C0,101 412,101 412,101c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_1_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#e8eaed"
-                                android:fillType="nonZero"
-                                android:pathData=" M412 0 C412,0 412,101 412,101 C412,101 0,101 0,101 C0,101 0,0 0,0 C0,0 412,0 412,0c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_2_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#dadce0"
-                                android:fillType="nonZero"
-                                android:pathData=" M383 804 C383,816.15 373.15,826 361,826 C361,826 51,826 51,826 C38.85,826 29,816.15 29,804 C29,791.85 38.85,782 51,782 C51,782 361,782 361,782 C373.15,782 383,791.85 383,804c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_3_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#dadce0"
-                                android:fillType="nonZero"
-                                android:pathData=" M201 47 C201,47 201,75 201,75 C201,77.21 199.21,79 197,79 C197,79 38,79 38,79 C35.79,79 34,77.21 34,75 C34,75 34,47 34,47 C34,44.79 35.79,43 38,43 C38,43 197,43 197,43 C199.21,43 201,44.79 201,47c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_4_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#dadce0"
-                                android:fillType="nonZero"
-                                android:pathData=" M388 47 C388,47 388,75 388,75 C388,77.21 386.21,79 384,79 C384,79 356,79 356,79 C353.79,79 352,77.21 352,75 C352,75 352,47 352,47 C352,44.79 353.79,43 356,43 C356,43 384,43 384,43 C386.21,43 388,44.79 388,47c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_5_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#dadce0"
-                                android:fillType="nonZero"
-                                android:pathData=" M336 47 C336,47 336,75 336,75 C336,77.21 334.21,79 332,79 C332,79 304,79 304,79 C301.79,79 300,77.21 300,75 C300,75 300,47 300,47 C300,44.79 301.79,43 304,43 C304,43 332,43 332,43 C334.21,43 336,44.79 336,47c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_6_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#dadce0"
-                                android:fillType="nonZero"
-                                android:pathData=" M70 618 C70,630.15 60.15,640 48,640 C35.85,640 26,630.15 26,618 C26,605.85 35.85,596 48,596 C60.15,596 70,605.85 70,618c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_7_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#dadce0"
-                                android:fillType="nonZero"
-                                android:pathData=" M70 396 C70,408.15 60.15,418 48,418 C35.85,418 26,408.15 26,396 C26,383.85 35.85,374 48,374 C60.15,374 70,383.85 70,396c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_8_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M394 248 C394,248 394,324 394,324 C394,333.94 385.94,342 376,342 C376,342 142,342 142,342 C132.06,342 124,333.94 124,324 C124,324 124,248 124,248 C124,238.06 132.06,230 142,230 C142,230 376,230 376,230 C385.94,230 394,238.06 394,248c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_9_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M393.94 468.38 C393.94,468.38 393.94,481.5 393.94,481.5 C393.94,483.71 392.15,485.5 389.94,485.5 C389.94,485.5 303.5,485.5 303.5,485.5 C301.29,485.5 299.5,483.71 299.5,481.5 C299.5,481.5 299.5,468.38 299.5,468.38 C299.5,466.17 301.29,464.38 303.5,464.38 C303.5,464.38 389.94,464.38 389.94,464.38 C392.15,464.38 393.94,466.17 393.94,468.38c  M394 468 C394,477.67 386.17,485.5 376.5,485.5 C376.5,485.5 290,485.5 290,485.5 C280.33,485.5 272.5,477.67 272.5,468 C272.5,458.34 280.33,450.5 290,450.5 C290,450.5 376.5,450.5 376.5,450.5 C386.17,450.5 394,458.34 394,468c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_10_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M394 494 C394,494 394,547 394,547 C394,549.21 392.21,551 390,551 C390,551 164,551 164,551 C161.79,551 160,549.21 160,547 C160,547 160,494 160,494 C160,491.79 161.79,490 164,490 C164,490 390,490 390,490 C392.21,490 394,491.79 394,494c  M394 508 C394,508 394,545 394,545 C394,554.94 385.94,563 376,563 C376,563 142,563 142,563 C132.06,563 124,554.94 124,545 C124,545 124,508 124,508 C124,498.06 132.06,490 142,490 C142,490 376,490 376,490 C385.94,490 394,498.06 394,508c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_11_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M394 690 C394,690 394,727 394,727 C394,736.94 385.94,745 376,745 C376,745 142,745 142,745 C132.06,745 124,736.94 124,727 C124,727 124,690 124,690 C124,680.06 132.06,672 142,672 C142,672 376,672 376,672 C385.94,672 394,680.06 394,690c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_12_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#e8eaed"
-                                android:fillType="nonZero"
-                                android:pathData=" M267.5 617 C267.5,626.67 259.67,634.5 250,634.5 C250,634.5 104.5,634.5 104.5,634.5 C94.84,634.5 87,626.67 87,617 C87,607.34 94.84,599.5 104.5,599.5 C104.5,599.5 250,599.5 250,599.5 C259.67,599.5 267.5,607.34 267.5,617c " />
-                            <path
-                                android:name="_R_G_L_3_G_L_0_G_L_0_G_D_13_P_0"
-                                android:fillAlpha="1"
-                                android:fillColor="#e8eaed"
-                                android:fillType="nonZero"
-                                android:pathData=" M299 395.5 C299,405.17 291.16,413 281.5,413 C281.5,413 104.5,413 104.5,413 C94.84,413 87,405.17 87,395.5 C87,385.84 94.84,378 104.5,378 C104.5,378 281.5,378 281.5,378 C291.16,378 299,385.84 299,395.5c " />
-                        </group>
-                    </group>
-                </group>
-                <group
-                    android:name="_R_G_L_2_G"
-                    android:scaleY="0">
-                    <group
-                        android:name="_R_G_L_2_G_L_0_G"
-                        android:scaleY="0">
-                        <group
-                            android:name="_R_G_L_2_G_L_0_G_L_0_G"
-                            android:scaleY="0">
-                            <path
-                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_0_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#dadce0"
-                                android:fillType="nonZero"
-                                android:pathData=" M412 0 C412,0 412,892 412,892 C412,892 0,892 0,892 C0,892 0,0 0,0 C0,0 412,0 412,0c " />
-                            <path
-                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_1_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#e8eaed"
-                                android:fillType="nonZero"
-                                android:pathData=" M412 0 C412,0 412,101 412,101 C412,101 0,101 0,101 C0,101 0,0 0,0 C0,0 412,0 412,0c " />
-                            <path
-                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_2_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M195 143 C195,143 195,153 195,153 C195,155.21 193.21,157 191,157 C191,157 106,157 106,157 C103.79,157 102,155.21 102,153 C102,153 102,143 102,143 C102,140.79 103.79,139 106,139 C106,139 191,139 191,139 C193.21,139 195,140.79 195,143c " />
-                            <path
-                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_3_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M270 165 C270,165 270,173 270,173 C270,175.21 268.21,177 266,177 C266,177 106,177 106,177 C103.79,177 102,175.21 102,173 C102,173 102,165 102,165 C102,162.79 103.79,161 106,161 C106,161 266,161 266,161 C268.21,161 270,162.79 270,165c " />
-                            <path
-                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_4_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M222 231 C222,231 222,241 222,241 C222,243.21 220.21,245 218,245 C218,245 106,245 106,245 C103.79,245 102,243.21 102,241 C102,241 102,231 102,231 C102,228.79 103.79,227 106,227 C106,227 218,227 218,227 C220.21,227 222,228.79 222,231c " />
-                            <path
-                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_5_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M241 253 C241,253 241,261 241,261 C241,263.21 239.21,265 237,265 C237,265 106,265 106,265 C103.79,265 102,263.21 102,261 C102,261 102,253 102,253 C102,250.79 103.79,249 106,249 C106,249 237,249 237,249 C239.21,249 241,250.79 241,253c " />
-                            <path
-                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_6_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M214 319 C214,319 214,329 214,329 C214,331.21 212.21,333 210,333 C210,333 106,333 106,333 C103.79,333 102,331.21 102,329 C102,329 102,319 102,319 C102,316.79 103.79,315 106,315 C106,315 210,315 210,315 C212.21,315 214,316.79 214,319c " />
-                            <path
-                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_7_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M333 341 C333,341 333,349 333,349 C333,351.21 331.21,353 329,353 C329,353 106,353 106,353 C103.79,353 102,351.21 102,349 C102,349 102,341 102,341 C102,338.79 103.79,337 106,337 C106,337 329,337 329,337 C331.21,337 333,338.79 333,341c " />
-                            <path
-                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_8_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M238 407 C238,407 238,417 238,417 C238,419.21 236.21,421 234,421 C234,421 106,421 106,421 C103.79,421 102,419.21 102,417 C102,417 102,407 102,407 C102,404.79 103.79,403 106,403 C106,403 234,403 234,403 C236.21,403 238,404.79 238,407c " />
-                            <path
-                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_9_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M295 429 C295,429 295,437 295,437 C295,439.21 293.21,441 291,441 C291,441 106,441 106,441 C103.79,441 102,439.21 102,437 C102,437 102,429 102,429 C102,426.79 103.79,425 106,425 C106,425 291,425 291,425 C293.21,425 295,426.79 295,429c " />
-                            <path
-                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_10_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M168 495 C168,495 168,505 168,505 C168,507.21 166.21,509 164,509 C164,509 106,509 106,509 C103.79,509 102,507.21 102,505 C102,505 102,495 102,495 C102,492.79 103.79,491 106,491 C106,491 164,491 164,491 C166.21,491 168,492.79 168,495c " />
-                            <path
-                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_11_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M269 517 C269,517 269,525 269,525 C269,527.21 267.21,529 265,529 C265,529 106,529 106,529 C103.79,529 102,527.21 102,525 C102,525 102,517 102,517 C102,514.79 103.79,513 106,513 C106,513 265,513 265,513 C267.21,513 269,514.79 269,517c " />
-                            <path
-                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_12_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M235 583 C235,583 235,593 235,593 C235,595.21 233.21,597 231,597 C231,597 106,597 106,597 C103.79,597 102,595.21 102,593 C102,593 102,583 102,583 C102,580.79 103.79,579 106,579 C106,579 231,579 231,579 C233.21,579 235,580.79 235,583c " />
-                            <path
-                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_13_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M295 605 C295,605 295,613 295,613 C295,615.21 293.21,617 291,617 C291,617 106,617 106,617 C103.79,617 102,615.21 102,613 C102,613 102,605 102,605 C102,602.79 103.79,601 106,601 C106,601 291,601 291,601 C293.21,601 295,602.79 295,605c " />
-                            <path
-                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_14_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M223 671 C223,671 223,681 223,681 C223,683.21 221.21,685 219,685 C219,685 106,685 106,685 C103.79,685 102,683.21 102,681 C102,681 102,671 102,671 C102,668.79 103.79,667 106,667 C106,667 219,667 219,667 C221.21,667 223,668.79 223,671c " />
-                            <path
-                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_15_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M246 693 C246,693 246,701 246,701 C246,703.21 244.21,705 242,705 C242,705 106,705 106,705 C103.79,705 102,703.21 102,701 C102,701 102,693 102,693 C102,690.79 103.79,689 106,689 C106,689 242,689 242,689 C244.21,689 246,690.79 246,693c " />
-                            <path
-                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_16_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#bdc1c6"
-                                android:fillType="nonZero"
-                                android:pathData=" M388 798 C388,798 388,798 388,798 C388,813.45 375.45,826 360,826 C360,826 267,826 267,826 C251.55,826 239,813.45 239,798 C239,798 239,798 239,798 C239,782.55 251.55,770 267,770 C267,770 360,770 360,770 C375.45,770 388,782.55 388,798c " />
-                            <path
-                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_17_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#f8f9fa"
-                                android:fillType="nonZero"
-                                android:pathData=" M377 47 C377,47 377,75 377,75 C377,77.21 375.21,79 373,79 C373,79 38,79 38,79 C35.79,79 34,77.21 34,75 C34,75 34,47 34,47 C34,44.79 35.79,43 38,43 C38,43 373,43 373,43 C375.21,43 377,44.79 377,47c " />
-                            <path
-                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_18_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#9aa0a6"
-                                android:fillType="nonZero"
-                                android:pathData=" M82 157 C82,172.46 69.46,185 54,185 C38.54,185 26,172.46 26,157 C26,141.54 38.54,129 54,129 C69.46,129 82,141.54 82,157c " />
-                            <path
-                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_19_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#9aa0a6"
-                                android:fillType="nonZero"
-                                android:pathData=" M82 245 C82,260.46 69.46,273 54,273 C38.54,273 26,260.46 26,245 C26,229.54 38.54,217 54,217 C69.46,217 82,229.54 82,245c " />
-                            <path
-                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_20_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#9aa0a6"
-                                android:fillType="nonZero"
-                                android:pathData=" M82 333 C82,348.46 69.46,361 54,361 C38.54,361 26,348.46 26,333 C26,317.54 38.54,305 54,305 C69.46,305 82,317.54 82,333c " />
-                            <path
-                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_21_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#9aa0a6"
-                                android:fillType="nonZero"
-                                android:pathData=" M82 421 C82,436.46 69.46,449 54,449 C38.54,449 26,436.46 26,421 C26,405.54 38.54,393 54,393 C69.46,393 82,405.54 82,421c " />
-                            <path
-                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_22_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#9aa0a6"
-                                android:fillType="nonZero"
-                                android:pathData=" M82 509 C82,524.46 69.46,537 54,537 C38.54,537 26,524.46 26,509 C26,493.54 38.54,481 54,481 C69.46,481 82,493.54 82,509c " />
-                            <path
-                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_23_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#9aa0a6"
-                                android:fillType="nonZero"
-                                android:pathData=" M82 597 C82,612.46 69.46,625 54,625 C38.54,625 26,612.46 26,597 C26,581.54 38.54,569 54,569 C69.46,569 82,581.54 82,597c " />
-                            <path
-                                android:name="_R_G_L_2_G_L_0_G_L_0_G_D_24_P_0"
-                                android:fillAlpha="0"
-                                android:fillColor="#9aa0a6"
-                                android:fillType="nonZero"
-                                android:pathData=" M82 685 C82,700.46 69.46,713 54,713 C38.54,713 26,700.46 26,685 C26,669.54 38.54,657 54,657 C69.46,657 82,669.54 82,685c " />
-                        </group>
-                    </group>
-                </group>
-                <group
-                    android:name="_R_G_L_1_G"
-                    android:scaleY="0"
-                    android:translateX="-17.875"
-                    android:translateY="322.017">
-                    <group
-                        android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0"
-                        android:translateX="565.282"
-                        android:translateY="129.757">
-                        <path
-                            android:name="_R_G_L_1_G_D_0_P_0"
-                            android:fillAlpha="1"
-                            android:fillColor="#3b4043"
-                            android:fillType="nonZero"
-                            android:pathData=" M-109 27.43 C-109,27.43 -112.61,23.81 -112.61,23.81 C-112.61,23.81 -133.03,44.23 -133.03,44.23 C-133.03,44.23 -112.61,64.64 -112.61,64.64 C-112.61,64.64 -109,61.03 -109,61.03 C-109,61.03 -125.8,44.23 -125.8,44.23 C-125.8,44.23 -109,27.43 -109,27.43c " />
-                    </group>
-                </group>
-                <group
-                    android:name="_R_G_L_0_G"
-                    android:translateX="206"
-                    android:translateY="446">
-                    <path
-                        android:name="_R_G_L_0_G_D_0_P_0"
-                        android:fillAlpha="0"
-                        android:fillColor="@color/gesture_tutorial_primary_color"
-                        android:fillType="nonZero"
-                        android:pathData=" M205 13.5 C225.16,13.5 241.5,29.84 241.5,50 C241.5,70.16 225.16,86.5 205,86.5 C184.84,86.5 168.5,70.16 168.5,50 C168.5,29.84 184.84,13.5 205,13.5c " />
-                </group>
-            </group>
-            <group android:name="time_group" />
-        </vector>
-    </aapt:attr>
-</animated-vector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/tutorial_step_indicator_pill.xml b/quickstep/res/drawable/tutorial_step_indicator_pill.xml
index 94a8748e64..d4e8f84cfb 100644
--- a/quickstep/res/drawable/tutorial_step_indicator_pill.xml
+++ b/quickstep/res/drawable/tutorial_step_indicator_pill.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="10dp"/>
+    <corners android:radius="3dp"/>
     <size android:width="16dp" android:height="6dp"/>
 </shape>
\ No newline at end of file
diff --git a/quickstep/res/layout/gesture_tutorial_fragment.xml b/quickstep/res/layout/gesture_tutorial_fragment.xml
index 1e8d0e03d3..cdda43c8a8 100644
--- a/quickstep/res/layout/gesture_tutorial_fragment.xml
+++ b/quickstep/res/layout/gesture_tutorial_fragment.xml
@@ -92,7 +92,8 @@
         android:layout_marginStart="@dimen/gesture_tutorial_feedback_margin_start_end"
         android:layout_marginEnd="@dimen/gesture_tutorial_feedback_margin_start_end"
         android:layout_marginTop="24dp"
-        android:padding="24dp"
+        android:paddingTop="24dp"
+        android:paddingBottom="16dp"
         android:background="@drawable/bg_sandbox_feedback">
 
         <TextView
@@ -100,6 +101,8 @@
             style="@style/TextAppearance.GestureTutorial.Feedback.Title"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginEnd="24dp"
 
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -111,6 +114,8 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
+            android:layout_marginStart="24dp"
+            android:layout_marginEnd="24dp"
 
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -131,31 +136,36 @@
             style="@style/TextAppearance.GestureTutorial.ButtonLabel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:text="@string/gesture_tutorial_action_button_label_next"
+            android:layout_marginTop="32dp"
+            android:layout_marginEnd="16dp"
+            android:paddingTop="16dp"
+            android:paddingBottom="16dp"
+            android:paddingStart="26dp"
+            android:paddingEnd="26dp"
+            android:text="@string/gesture_tutorial_action_button_label"
             android:background="@drawable/gesture_tutorial_action_button_background"
             android:stateListAnimator="@null"
             android:visibility="invisible"
 
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/gesture_tutorial_fragment_feedback_subtitle"/>
+            app:layout_constraintTop_toBottomOf="@id/gesture_tutorial_fragment_feedback_subtitle"
+            app:layout_constraintEnd_toEndOf="parent"/>
 
         <Button
             style="@style/TextAppearance.GestureTutorial.Feedback.Subtext"
             android:id="@+id/gesture_tutorial_fragment_close_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            android:layout_marginEnd="16dp"
+            android:paddingTop="16dp"
+            android:paddingBottom="16dp"
+            android:paddingStart="26dp"
+            android:paddingEnd="26dp"
             android:text="@string/gesture_tutorial_action_button_label_skip"
             android:background="?android:attr/selectableItemBackgroundBorderless"
 
-            app:layout_constraintTop_toTopOf="@id/gesture_tutorial_fragment_action_button"
-            app:layout_constraintBottom_toBottomOf="@id/gesture_tutorial_fragment_action_button"
-            app:layout_constraintStart_toStartOf="@id/gesture_tutorial_fragment_action_button"
-            app:layout_constraintEnd_toEndOf="@id/gesture_tutorial_fragment_action_button"/>
+            app:layout_constraintTop_toBottomOf="@id/gesture_tutorial_fragment_feedback_subtitle"
+            app:layout_constraintStart_toStartOf="parent"/>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml
index 281f735f8f..4aee2a9ccb 100644
--- a/quickstep/res/values/strings.xml
+++ b/quickstep/res/values/strings.xml
@@ -91,16 +91,10 @@
     <!-- content description for hotseat items -->
     <string name="hotseat_prediction_content_description">Predicted app: <xliff:g id="title" example="Chrome">%1$s</xliff:g></string>
 
-    <!-- Feedback shown during interactive parts of Back gesture tutorial for left edge when the gesture is too far from the edge. [CHAR LIMIT=100] -->
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge">Make sure you swipe from the far-left edge.</string>
-    <!-- Feedback shown during interactive parts of Back gesture tutorial for left edge when the gesture is cancelled. [CHAR LIMIT=100] -->
-    <string name="back_gesture_feedback_cancelled_left_edge">Make sure you swipe from the left edge to the middle of the screen and let go.</string>
     <!-- Feedback shown during interactive parts of Back gesture tutorial for right edge when the gesture is too far from the edge. [CHAR LIMIT=100] -->
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge">Make sure you swipe from the far-right edge.</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_edge">Make sure you swipe from the far-right or far-left edge.</string>
     <!-- Feedback shown during interactive parts of Back gesture tutorial for right edge when the gesture is cancelled. [CHAR LIMIT=100] -->
-    <string name="back_gesture_feedback_cancelled_right_edge">Make sure you swipe from the right edge to the middle of the screen and let go.</string>
-    <!-- Feedback shown after completing the back gesture step if the user is following the full gesture tutorial flow. [CHAR LIMIT=100] -->
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up">You learned how to swipe from the left to go back.</string>
+    <string name="back_gesture_feedback_cancelled">Make sure you swipe from the right or left edge to the middle of the screen and let go.</string>
     <!-- Feedback shown after completing the back gesture step if the user is following the full gesture tutorial flow. [CHAR LIMIT=100] -->
     <string name="back_gesture_feedback_complete_with_overview_follow_up">You learned how to swipe from the right to go back. Next up, learn how to switch apps.</string>
     <!-- Feedback shown after completing the back gesture step if the user started this tutorial individually. [CHAR LIMIT=100] -->
@@ -110,14 +104,10 @@
     <!-- Subtitle shown on the confirmation screen after successful gesture. [CHAR LIMIT=60] -->
     <string name="back_gesture_tutorial_confirm_subtitle">To change the sensitivity of the back gesture, go to Settings</string>
     <!-- Feedback shown during interactive parts of Home gesture tutorial when the gesture is started too far from the edge. [CHAR LIMIT=100] -->
-    <!-- Introduction title for the left edge Back gesture tutorial. [CHAR LIMIT=100] -->
-    <string name="back_left_gesture_intro_title">Swipe from the left to go back</string>
-    <!-- Introduction title for the right edge Back gesture tutorial. [CHAR LIMIT=100] -->
-    <string name="back_right_gesture_intro_title">Swipe from the right to go back</string>
-    <!-- Introduction subtitle for the Back left gesture tutorial. [CHAR LIMIT=200] -->
-    <string name="back_left_gesture_intro_subtitle">To go back to the last screen you were on, swipe from the left edge to the middle of the screen.</string>
-    <!-- Introduction subtitle for the Back right gesture tutorial. [CHAR LIMIT=100] -->
-    <string name="back_right_gesture_intro_subtitle">You can also go back to the last screen by swiping from the right edge to the middle of the screen. Try it now.</string>
+    <!-- Introduction title for the Back gesture tutorial. [CHAR LIMIT=100] -->
+    <string name="back_gesture_intro_title">Swipe to go back</string>
+    <!-- Introduction subtitle for the Back gesture tutorial. [CHAR LIMIT=200] -->
+    <string name="back_gesture_intro_subtitle">To go back to the last screen, swipe from the left or right edge to the middle of the screen.</string>
 
     <string name="home_gesture_feedback_swipe_too_far_from_edge">Make sure you swipe up from the bottom edge of the screen.</string>
     <!-- Feedback shown during interactive parts of Home gesture tutorial when the Overview gesture is detected. [CHAR LIMIT=100] -->
@@ -146,7 +136,7 @@
     <!-- Introduction title for the Overview gesture tutorial. [CHAR LIMIT=100] -->
     <string name="overview_gesture_intro_title">Swipe to switch apps</string>
     <!-- Introduction subtitle for the Overview gesture tutorial. [CHAR LIMIT=100] -->
-    <string name="overview_gesture_intro_subtitle">Swipe up from the bottom of your screen, hold, then release.</string>
+    <string name="overview_gesture_intro_subtitle">To switch between apps, swipe up from the bottom of your screen, hold, then release.</string>
 
     <!-- Title shown during interactive part of Assistant gesture tutorial. [CHAR LIMIT=30] -->
     <string name="assistant_gesture_tutorial_playground_title" translatable="false">Tutorial: Assistant</string>
@@ -176,8 +166,8 @@
 
     <!-- Title shown on the confirmation screen after successful gesture. [CHAR LIMIT=30] -->
     <string name="gesture_tutorial_confirm_title">All set</string>
-    <!-- Button text shown on a button on the feedback popup to proceed to the next tutorial step. [CHAR LIMIT=14] -->
-    <string name="gesture_tutorial_action_button_label_next">Next</string>
+    <!-- Button text shown on a button on the feedback popup to complete the gesture tutorial. [CHAR LIMIT=14] -->
+    <string name="gesture_tutorial_action_button_label">Done</string>
     <!-- Button text shown on a button to go to Settings. [CHAR LIMIT=14] -->
     <string name="gesture_tutorial_action_button_label_settings">Settings</string>
     <!-- Feedback title to try again. [CHAR LIMIT=30] -->
@@ -190,11 +180,11 @@
     <!-- Title of "All Set" page [CHAR LIMIT=NONE] -->
     <string name="allset_title">All set!</string>
     <!-- Hint string at the bottom of "All Set" page [CHAR LIMIT=NONE] -->
-    <string name="allset_hint">Swipe up to go home</string>
+    <string name="allset_hint">Swipe up to go Home</string>
     <!-- Description of "All Set" page [CHAR LIMIT=NONE] -->
     <string name="allset_description">You\u2019re ready to start using your phone</string>
     <!-- String linking to navigation settings on "All Set" page [CHAR LIMIT=NONE] -->
-    <string name="allset_navigation_settings"><annotation id="link">Navigation settings for accessibility</annotation></string>
+    <string name="allset_navigation_settings"><annotation id="link">System navigation settings</annotation></string>
 
     <!-- ******* Overview ******* -->
     <!-- Label for a button that causes the current overview app to be shared. [CHAR_LIMIT=40] -->
diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml
index ca1e8c835e..07c448df9e 100644
--- a/quickstep/res/values/styles.xml
+++ b/quickstep/res/values/styles.xml
@@ -41,10 +41,10 @@
         parent="TextAppearance.GestureTutorial">
         <item name="android:gravity">start</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:fontFamily">google-sans-display</item>
+        <item name="android:fontFamily">google-sans-regular</item>
         <item name="android:letterSpacing">0.03</item>
         <item name="android:textSize">36sp</item>
-        <item name="android:lineHeight">42sp</item>
+        <item name="android:lineHeight">44sp</item>
     </style>
 
     <style name="TextAppearance.GestureTutorial.Dialog.Title"
diff --git a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
index a06f903b48..3cb22f4ffe 100644
--- a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
@@ -15,9 +15,8 @@
  */
 package com.android.quickstep.interaction;
 
+import static com.android.quickstep.interaction.TutorialController.TutorialType.BACK_NAVIGATION;
 import static com.android.quickstep.interaction.TutorialController.TutorialType.BACK_NAVIGATION_COMPLETE;
-import static com.android.quickstep.interaction.TutorialController.TutorialType.LEFT_EDGE_BACK_NAVIGATION;
-import static com.android.quickstep.interaction.TutorialController.TutorialType.RIGHT_EDGE_BACK_NAVIGATION;
 
 import android.graphics.PointF;
 
@@ -36,15 +35,12 @@ final class BackGestureTutorialController extends TutorialController {
 
     @Override
     public Integer getIntroductionTitle() {
-        return mTutorialType == LEFT_EDGE_BACK_NAVIGATION
-                ? R.string.back_left_gesture_intro_title : R.string.back_right_gesture_intro_title;
+        return R.string.back_gesture_intro_title;
     }
 
     @Override
     public Integer getIntroductionSubtitle() {
-        return mTutorialType == LEFT_EDGE_BACK_NAVIGATION
-                ? R.string.back_left_gesture_intro_subtitle
-                : R.string.back_right_gesture_intro_subtitle;
+        return R.string.back_gesture_intro_subtitle;
     }
 
     @Override
@@ -58,11 +54,8 @@ final class BackGestureTutorialController extends TutorialController {
             return;
         }
         switch (mTutorialType) {
-            case RIGHT_EDGE_BACK_NAVIGATION:
-                handleAttemptFromRight(result);
-                break;
-            case LEFT_EDGE_BACK_NAVIGATION:
-                handleAttemptFromLeft(result);
+            case BACK_NAVIGATION:
+                handleBackAttempt(result);
                 break;
             case BACK_NAVIGATION_COMPLETE:
                 if (result == BackGestureResult.BACK_COMPLETED_FROM_LEFT
@@ -73,8 +66,9 @@ final class BackGestureTutorialController extends TutorialController {
         }
     }
 
-    private void handleAttemptFromRight(BackGestureResult result) {
+    private void handleBackAttempt(BackGestureResult result) {
         switch (result) {
+            case BACK_COMPLETED_FROM_LEFT:
             case BACK_COMPLETED_FROM_RIGHT:
                 mTutorialFragment.releaseGestureVideoView();
                 hideFeedback(true);
@@ -85,39 +79,12 @@ final class BackGestureTutorialController extends TutorialController {
                         : R.string.back_gesture_feedback_complete_with_overview_follow_up;
                 showFeedback(subtitleResId, true);
                 break;
-            case BACK_CANCELLED_FROM_RIGHT:
-                showFeedback(R.string.back_gesture_feedback_cancelled_right_edge);
-                break;
-            case BACK_COMPLETED_FROM_LEFT:
             case BACK_CANCELLED_FROM_LEFT:
-            case BACK_NOT_STARTED_TOO_FAR_FROM_EDGE:
-                showFeedback(R.string.back_gesture_feedback_swipe_too_far_from_right_edge);
-                break;
-            case BACK_NOT_STARTED_IN_NAV_BAR_REGION:
-                showFeedback(R.string.back_gesture_feedback_swipe_in_nav_bar);
-                break;
-        }
-    }
-
-    private void handleAttemptFromLeft(BackGestureResult result) {
-        switch (result) {
-            case BACK_COMPLETED_FROM_LEFT:
-                mTutorialFragment.releaseGestureVideoView();
-                hideFeedback(true);
-                mFakeTaskView.setBackground(AppCompatResources.getDrawable(mContext,
-                        R.drawable.mock_conversations_list));
-                int subtitleResId = mTutorialFragment.isAtFinalStep()
-                        ? R.string.back_gesture_feedback_complete_without_follow_up
-                        : R.string.back_gesture_feedback_complete_with_back_right_follow_up;
-                showFeedback(subtitleResId, true);
-                break;
-            case BACK_CANCELLED_FROM_LEFT:
-                showFeedback(R.string.back_gesture_feedback_cancelled_left_edge);
-                break;
-            case BACK_COMPLETED_FROM_RIGHT:
             case BACK_CANCELLED_FROM_RIGHT:
+                showFeedback(R.string.back_gesture_feedback_cancelled);
+                break;
             case BACK_NOT_STARTED_TOO_FAR_FROM_EDGE:
-                showFeedback(R.string.back_gesture_feedback_swipe_too_far_from_left_edge);
+                showFeedback(R.string.back_gesture_feedback_swipe_too_far_from_edge);
                 break;
             case BACK_NOT_STARTED_IN_NAV_BAR_REGION:
                 showFeedback(R.string.back_gesture_feedback_swipe_in_nav_bar);
@@ -134,8 +101,7 @@ final class BackGestureTutorialController extends TutorialController {
             if (result == NavBarGestureResult.HOME_GESTURE_COMPLETED) {
                 mTutorialFragment.closeTutorial();
             }
-        } else if (mTutorialType == LEFT_EDGE_BACK_NAVIGATION
-                || mTutorialType == RIGHT_EDGE_BACK_NAVIGATION) {
+        } else if (mTutorialType == BACK_NAVIGATION) {
             showFeedback(R.string.back_gesture_feedback_swipe_in_nav_bar);
         }
     }
diff --git a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java
index 9b6afd6a97..1740f68cc1 100644
--- a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialFragment.java
@@ -28,17 +28,13 @@ public class BackGestureTutorialFragment extends TutorialFragment {
     @Nullable
     @Override
     Integer getFeedbackVideoResId(boolean forDarkMode) {
-        return mTutorialType == TutorialType.RIGHT_EDGE_BACK_NAVIGATION
-                ? R.drawable.gesture_tutorial_motion_back_right
-                : R.drawable.gesture_tutorial_motion_back_left;
+        return R.drawable.gesture_tutorial_motion_back;
     }
 
     @Nullable
     @Override
     Integer getGestureVideoResId() {
-        return mTutorialType == TutorialType.RIGHT_EDGE_BACK_NAVIGATION
-                ? R.drawable.gesture_tutorial_loop_back_right
-                : R.drawable.gesture_tutorial_loop_back_left;
+        return R.drawable.gesture_tutorial_loop_back;
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java b/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java
index bc4913376c..7fb7d2997e 100644
--- a/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java
+++ b/quickstep/src/com/android/quickstep/interaction/GestureSandboxActivity.java
@@ -141,7 +141,7 @@ public class GestureSandboxActivity extends FragmentActivity {
     }
 
     private TutorialType[] getTutorialSteps(Bundle extras) {
-        TutorialType[] defaultSteps = new TutorialType[] {TutorialType.LEFT_EDGE_BACK_NAVIGATION};
+        TutorialType[] defaultSteps = new TutorialType[] {TutorialType.BACK_NAVIGATION};
         mCurrentStep = 1;
         mNumSteps = 1;
 
diff --git a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
index 83ce315052..819c91c55b 100644
--- a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
@@ -82,7 +82,6 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll
                     case HOME_GESTURE_COMPLETED: {
                         mTutorialFragment.releaseGestureVideoView();
                         animateFakeTaskViewHome(finalVelocity, null);
-                        showActionButton();
                         int subtitleResId = mTutorialFragment.isAtFinalStep()
                                 ? R.string.home_gesture_feedback_complete_without_follow_up
                                 : R.string.home_gesture_feedback_complete_with_follow_up;
diff --git a/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java b/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java
index 4e4b81af69..19b7933e24 100644
--- a/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java
@@ -36,11 +36,9 @@ public class SandboxModeTutorialController extends SwipeUpGestureTutorialControl
                 showRippleEffect(null);
                 showFeedback(R.string.sandbox_mode_back_gesture_feedback_successful);
                 break;
-            case BACK_CANCELLED_FROM_RIGHT:
-                showFeedback(R.string.back_gesture_feedback_cancelled_right_edge);
-                break;
             case BACK_CANCELLED_FROM_LEFT:
-                showFeedback(R.string.back_gesture_feedback_cancelled_left_edge);
+            case BACK_CANCELLED_FROM_RIGHT:
+                showFeedback(R.string.back_gesture_feedback_cancelled);
                 break;
             case BACK_NOT_STARTED_TOO_FAR_FROM_EDGE:
                 showFeedback(R.string.sandbox_mode_back_gesture_feedback_swipe_too_far_from_edge);
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
index dfe0c7270a..4b4e7e6753 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
@@ -59,6 +59,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
     private static final int FEEDBACK_ANIMATION_MS = 250;
     private static final int RIPPLE_VISIBLE_MS = 300;
     private static final int GESTURE_ANIMATION_DELAY_MS = 1500;
+    private static final int ADVANCE_TUTORIAL_TIMEOUT_MS = 4000;
 
     final TutorialFragment mTutorialFragment;
     TutorialType mTutorialType;
@@ -220,7 +221,15 @@ abstract class TutorialController implements BackGestureAttemptCallback,
                 mFeedbackView.findViewById(R.id.gesture_tutorial_fragment_feedback_subtitle);
         subtitle.setText(subtitleResId);
         if (isGestureSuccessful) {
-            showActionButton();
+            hideCloseButton();
+            if (mTutorialFragment.isAtFinalStep()) {
+                showActionButton();
+            }
+
+            if (mFeedbackVideoViewCallback != null) {
+                mFeedbackVideoView.removeCallbacks(mFeedbackVideoViewCallback);
+                mFeedbackVideoViewCallback = null;
+            }
         }
         mGestureCompleted = isGestureSuccessful;
 
@@ -248,6 +257,16 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         mFeedbackView.animate()
                 .setDuration(FEEDBACK_ANIMATION_MS)
                 .translationY(0)
+                .withEndAction(() -> {
+                    if (isGestureSuccessful && !mTutorialFragment.isAtFinalStep()) {
+                        if (mFeedbackViewCallback != null) {
+                            mFeedbackView.removeCallbacks(mFeedbackViewCallback);
+                        }
+                        mFeedbackViewCallback = mTutorialFragment::continueTutorial;
+                        mFeedbackView.postDelayed(mFeedbackViewCallback,
+                                ADVANCE_TUTORIAL_TIMEOUT_MS);
+                    }
+                })
                 .start();
         mFeedbackTitleView.postDelayed(mTitleViewCallback, FEEDBACK_ANIMATION_MS);
     }
@@ -352,19 +371,26 @@ abstract class TutorialController implements BackGestureAttemptCallback,
         }
     }
 
-    void hideActionButton() {
+    void hideCloseButton() {
+        mCloseButton.setVisibility(GONE);
+    }
+
+    void showCloseButton() {
         mCloseButton.setVisibility(View.VISIBLE);
         mCloseButton.setTextAppearance(Utilities.isDarkTheme(mContext)
                 ? R.style.TextAppearance_GestureTutorial_Feedback_Subtext
                 : R.style.TextAppearance_GestureTutorial_Feedback_Subtext_Dark);
+    }
 
+    void hideActionButton() {
+        showCloseButton();
         // Invisible to maintain the layout.
         mActionButton.setVisibility(View.INVISIBLE);
         mActionButton.setOnClickListener(null);
     }
 
     void showActionButton() {
-        mCloseButton.setVisibility(GONE);
+        hideCloseButton();
         mActionButton.setVisibility(View.VISIBLE);
         mActionButton.setOnClickListener(this::onActionButtonClicked);
     }
@@ -461,8 +487,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
 
     /** Denotes the type of the tutorial. */
     enum TutorialType {
-        RIGHT_EDGE_BACK_NAVIGATION,
-        LEFT_EDGE_BACK_NAVIGATION,
+        BACK_NAVIGATION,
         BACK_NAVIGATION_COMPLETE,
         HOME_NAVIGATION,
         HOME_NAVIGATION_COMPLETE,
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
index da0fc668ac..7637450a1a 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
@@ -64,7 +64,7 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
         TutorialFragment fragment = getFragmentForTutorialType(tutorialType);
         if (fragment == null) {
             fragment = new BackGestureTutorialFragment();
-            tutorialType = TutorialType.RIGHT_EDGE_BACK_NAVIGATION;
+            tutorialType = TutorialType.BACK_NAVIGATION;
         }
 
         Bundle args = new Bundle();
@@ -76,8 +76,7 @@ abstract class TutorialFragment extends Fragment implements OnTouchListener {
     @Nullable
     private static TutorialFragment getFragmentForTutorialType(TutorialType tutorialType) {
         switch (tutorialType) {
-            case RIGHT_EDGE_BACK_NAVIGATION:
-            case LEFT_EDGE_BACK_NAVIGATION:
+            case BACK_NAVIGATION:
             case BACK_NAVIGATION_COMPLETE:
                 return new BackGestureTutorialFragment();
             case HOME_NAVIGATION:
diff --git a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
index 8fe42acf59..4d63218785 100644
--- a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
+++ b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java
@@ -293,8 +293,7 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
                     "tutorial_steps",
                     new String[] {
                             "HOME_NAVIGATION",
-                            "LEFT_EDGE_BACK_NAVIGATION",
-                            "RIGHT_EDGE_BACK_NAVIGATION",
+                            "BACK_NAVIGATION",
                             "OVERVIEW_NAVIGATION"}));
             return true;
         });
@@ -306,7 +305,7 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
         launchBackTutorialPreference.setOnPreferenceClickListener(preference -> {
             startActivity(launchSandboxIntent.putExtra(
                     "tutorial_steps",
-                    new String[] {"LEFT_EDGE_BACK_NAVIGATION", "RIGHT_EDGE_BACK_NAVIGATION"}));
+                    new String[] {"BACK_NAVIGATION"}));
             return true;
         });
         sandboxCategory.addPreference(launchBackTutorialPreference);
-- 
GitLab


From 87b780832195c8c2c13562cc6124b7f9725a0723 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sat, 10 Jul 2021 00:38:13 +0000
Subject: [PATCH 1590/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I361ad941be6cee10767bd2f6a5e16e470269de85
---
 quickstep/res/values-tr/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/res/values-tr/strings.xml b/quickstep/res/values-tr/strings.xml
index 9a8c467f74..d9b4db3620 100644
--- a/quickstep/res/values-tr/strings.xml
+++ b/quickstep/res/values-tr/strings.xml
@@ -73,7 +73,7 @@
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Uygulamalar arasında geçiş yapmak için kaydırma"</string>
     <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Ekranınızın alt tarafından yukarı doğru kaydırın, tutun ve sonra bırakın."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Hepsi bu kadar"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Sonraki"</string>
+    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"İleri"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Ayarlar"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Tekrar deneyin"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Güzel!"</string>
-- 
GitLab


From 25acfb5667681f831cd570cd122e2f63e75318eb Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sat, 10 Jul 2021 00:38:41 +0000
Subject: [PATCH 1591/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I94fb2323a7f88c1416ee2243ca6ea8b5ce521c86
---
 go/quickstep/res/values-af/strings.xml     | 27 ++++++++--------------
 go/quickstep/res/values-am/strings.xml     | 27 ++++++++--------------
 go/quickstep/res/values-as/strings.xml     | 27 ++++++++--------------
 go/quickstep/res/values-bn/strings.xml     | 27 ++++++++--------------
 go/quickstep/res/values-bs/strings.xml     | 27 ++++++++--------------
 go/quickstep/res/values-de/strings.xml     | 27 ++++++++--------------
 go/quickstep/res/values-el/strings.xml     | 27 ++++++++--------------
 go/quickstep/res/values-en-rAU/strings.xml | 27 ++++++++--------------
 go/quickstep/res/values-en-rCA/strings.xml | 27 ++++++++--------------
 go/quickstep/res/values-en-rGB/strings.xml | 27 ++++++++--------------
 go/quickstep/res/values-en-rIN/strings.xml | 27 ++++++++--------------
 go/quickstep/res/values-eu/strings.xml     | 27 ++++++++--------------
 go/quickstep/res/values-fa/strings.xml     | 27 ++++++++--------------
 go/quickstep/res/values-fr/strings.xml     | 27 ++++++++--------------
 go/quickstep/res/values-gl/strings.xml     | 27 ++++++++--------------
 go/quickstep/res/values-gu/strings.xml     | 27 ++++++++--------------
 go/quickstep/res/values-in/strings.xml     | 27 ++++++++--------------
 go/quickstep/res/values-it/strings.xml     | 27 ++++++++--------------
 go/quickstep/res/values-km/strings.xml     | 27 ++++++++--------------
 go/quickstep/res/values-kn/strings.xml     | 27 ++++++++--------------
 go/quickstep/res/values-lo/strings.xml     | 27 ++++++++--------------
 go/quickstep/res/values-ml/strings.xml     | 27 ++++++++--------------
 go/quickstep/res/values-mr/strings.xml     | 27 ++++++++--------------
 go/quickstep/res/values-ms/strings.xml     | 27 ++++++++--------------
 go/quickstep/res/values-ne/strings.xml     | 27 ++++++++--------------
 go/quickstep/res/values-or/strings.xml     | 27 ++++++++--------------
 go/quickstep/res/values-pa/strings.xml     | 27 ++++++++--------------
 go/quickstep/res/values-pt-rPT/strings.xml | 27 ++++++++--------------
 go/quickstep/res/values-pt/strings.xml     | 27 ++++++++--------------
 go/quickstep/res/values-te/strings.xml     | 27 ++++++++--------------
 go/quickstep/res/values-ur/strings.xml     | 27 ++++++++--------------
 go/quickstep/res/values-zh-rHK/strings.xml | 27 ++++++++--------------
 go/quickstep/res/values-zu/strings.xml     | 27 ++++++++--------------
 33 files changed, 297 insertions(+), 594 deletions(-)

diff --git a/go/quickstep/res/values-af/strings.xml b/go/quickstep/res/values-af/strings.xml
index 722cdda8e8..363eff5050 100644
--- a/go/quickstep/res/values-af/strings.xml
+++ b/go/quickstep/res/values-af/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Luister"</string>
     <string name="action_translate" msgid="8028378961867277746">"Vertaal"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"HET DIT"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"KANSELLEER"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"INSTELLINGS"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Vertaal of luister na teks op skerm"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Inligting soos teks op jou skerm, webadresse en skermskote kan met Google gedeel word.\n\nGaan na "<b>"Instellings &gt; Programme &gt; Verstekprogramme &gt; Digitale Assistent-program"</b>" om te verander watter inligting jy deel."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Kies \'n assistent om hierdie kenmerk te gebruik"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Kies \'n digitalebystandprogram in Instellings om na teks op jou skerm te luister of dit te vertaal"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Verander jou assistent om hierdie kenmerk te gebruik"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Verander jou digitalebystandprogram in Instellings om na teks op jou skerm te luister of dit te vertaal"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Tik hier om na teks op hierdie skerm te luister"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Tik hier om teks op hierdie skerm te vertaal"</string>
 </resources>
diff --git a/go/quickstep/res/values-am/strings.xml b/go/quickstep/res/values-am/strings.xml
index ecf3d4876b..5d8a76603c 100644
--- a/go/quickstep/res/values-am/strings.xml
+++ b/go/quickstep/res/values-am/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"ያዳምጡ"</string>
     <string name="action_translate" msgid="8028378961867277746">"ተርጉም"</string>
     <string name="action_search" msgid="6269564710943755464">"ሌንስ"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"ገባኝ"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ይቅር"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"ቅንብሮች"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"በማያ ገጹ ላይ ጽሑፍን ይተረጉሙ ወይም ያዳምጡ"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"እንደ በማያ ገጽዎ ላይ ያለ ጽሑፍ፣ የድር አድራሻዎች እና ቅጽበታዊ ገጽ እይታዎች ያሉ መረጃዎች ለGoogle ሊጋሩ ይችላሉ።\n\nምን መረጃ እንደሚያጋሩ ለመቀየር ወደ "<b>"ቅንብሮች &gt; መተግበሪያዎች &gt; ነባሪ መተግበሪያዎች &gt; ዲጂታል ረዳት መተግበሪያ"</b>" ይሂዱ።"</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"ይህንን ባህሪ ለመጠቀም ረዳት ይምረጡ"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"በማያ ገጽዎ ላይ ጽሑፍን ለማዳመጥ ወይም ለመተርጎም በቅንብሮች ውስጥ የዲጂታል ረዳት መተግበሪያን ይምረጡ"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"ይህንን ባህሪ ለመጠቀም ረዳትዎን ይቀይሩ"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"በማያ ገጽዎ ላይ ጽሑፍን ለማዳመጥ ወይም ለመተርጎም በቅንብሮች ውስጥ የዲጂታል ረዳት መተግበሪያዎን ይቀይሩ"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"በዚህ ማያ ገጽ ላይ ጽሑፍ ለማዳመጥ እዚህ መታ ያድርጉ"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"በዚህ ማያ ገጽ ላይ ጽሑፍ ለመተርጎም እዚህ መታ ያድርጉ"</string>
 </resources>
diff --git a/go/quickstep/res/values-as/strings.xml b/go/quickstep/res/values-as/strings.xml
index 8940077193..cd123b5643 100644
--- a/go/quickstep/res/values-as/strings.xml
+++ b/go/quickstep/res/values-as/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"শুনক"</string>
     <string name="action_translate" msgid="8028378961867277746">"অনুবাদ কৰক"</string>
     <string name="action_search" msgid="6269564710943755464">"লেন্স"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"বুজি পালোঁ"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"বাতিল কৰক"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"ছেটিং"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"স্ক্ৰীনত থকা পাঠ অনুবাদ কৰক অথবা শুনক"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"আপোনাৰ স্ক্ৰীনত থকা পাঠ, ৱেব ঠিকনা আৰু স্ক্ৰীনশ্বটৰ দৰে তথ্য Googleৰ সৈতে হয়তো শ্বেয়াৰ কৰা হ’ব।\n\nআপুনি কোনসমুহ তথ্য শ্বেয়াৰ কৰিব সেয়া সলনি কৰিবলৈ, "<b>"ছেটিং &gt; এপ্‌ &gt; ডিফ’ল্ট এপ্‌ &gt; ডিজিটেল সহায়ক এপ"</b>"লৈ যাওক।"</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"এই সুবিধাটো ব্যৱহাৰ কৰিবলৈ এটা সহায়ক বাছনি কৰক"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"আপোনাৰ স্ক্ৰীনত থকা পাঠ শুনিবলৈ অথবা সেই পাঠৰ অনুবাদ কৰিবলৈ, ছেটিঙত এটা ডিজিটেল সহায়ক এপ্‌ বাছনি কৰক"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"এই সুবিধাটো ব্যৱহাৰ কৰিবলৈ আপোনাৰ সহায়ক সলনি কৰক"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"আপোনাৰ স্ক্ৰীনত থকা পাঠ শুনিবলৈ অথবা সেই পাঠৰ অনুবাদ কৰিবলৈ, ছেটিঙত আপোনাৰ ডিজিটেল সহায়ক এপ্‌টো সলনি কৰক"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"এই স্ক্ৰীনখনত থকা পাঠ শুনিবলৈ ইয়াত টিপক"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"এই স্ক্ৰীনখনত থকা পাঠৰ অনুবাদ কৰিবলৈ ইয়াত টিপক"</string>
 </resources>
diff --git a/go/quickstep/res/values-bn/strings.xml b/go/quickstep/res/values-bn/strings.xml
index f690668fef..4fb714da7a 100644
--- a/go/quickstep/res/values-bn/strings.xml
+++ b/go/quickstep/res/values-bn/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"শুনুন"</string>
     <string name="action_translate" msgid="8028378961867277746">"অনুবাদ করুন"</string>
     <string name="action_search" msgid="6269564710943755464">"লেন্স"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"বুঝেছি"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"বাতিল করুন"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"সেটিংস"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"অনুবাদ করুন বা স্ক্রিনে দেখানো টেক্সট শুনুন"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"আপনার স্ক্রিনে থাকা তথ্য যেমন ওয়েব ঠিকানা এবং স্ক্রিনশট Google-এর সাথে শেয়ার করা হতে পারে।\n\nকোন কোন তথ্য শেয়ার করবেন তা বেছে নিতে, "<b>"সেটিংস &gt; অ্যাপ &gt; ডিফল্ট অ্যাপ &gt; ডিজিটাল অ্যাসিস্ট্যান্ট অ্যাপ"</b>" বিকল্পগুলি বেছে নিন।"</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"এই ফিচার ব্যবহার করতে অ্যাসিস্ট্যান্ট বেছে নিন"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"আপনার স্ক্রিনে থাকা টেক্সট শুনতে বা অনুবাদ করতে, সেটিংস থেকে ডিজিটাল অ্যাসিস্ট্যান্ট অ্যাপ বেছে নিন"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"এই ফিচার ব্যবহার করতে অ্যাসিস্ট্যান্ট পরিবর্তন করুন"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"আপনার স্ক্রিনে থাকা টেক্সট শুনতে বা অনুবাদ করতে, সেটিংস থেকে ডিজিটাল অ্যাসিস্ট্যান্ট অ্যাপ পরিবর্তন করুন"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"স্ক্রিনে থাকা টেক্সট শুনতে এখানে ট্যাপ করুন"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"স্ক্রিনে থাকা টেক্সট অনুবাদ করতে এখানে ট্যাপ করুন"</string>
 </resources>
diff --git a/go/quickstep/res/values-bs/strings.xml b/go/quickstep/res/values-bs/strings.xml
index 88b4a21d28..675e5b8935 100644
--- a/go/quickstep/res/values-bs/strings.xml
+++ b/go/quickstep/res/values-bs/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Poslušajte"</string>
     <string name="action_translate" msgid="8028378961867277746">"Prevedi"</string>
     <string name="action_search" msgid="6269564710943755464">"Objektiv"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"RAZUMIJEM"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"OTKAŽI"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"POSTAVKE"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Prevedite ili slušajte tekst na ekranu"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informacije kao što su tekst na ekranu, web adrese i snimci ekrana mogu se dijeliti s Googleom.\n\nDa promijenite koje informacije dijelite, idite u "<b>"Postavke &gt; Aplikacije &gt; Zadane aplikacije &gt; Aplikacija digitalnog asistenta"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Odaberite asistenta da koristite ovu funkciju"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Da slušate ili prevedete tekst na ekranu, odaberite aplikaciju digitalnog asistenta u Postavkama"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Promijenite asistenta da koristite ovu funkciju"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Da slušate ili prevedete tekst na ekranu, promijenite aplikaciju digitalnog asistenta u Postavkama"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Dodirnite ovdje da slušate tekst na ovom ekranu"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Dodirnite ovdje da prevedete tekst na ovom ekranu"</string>
 </resources>
diff --git a/go/quickstep/res/values-de/strings.xml b/go/quickstep/res/values-de/strings.xml
index 8a8fd4ab55..3825b9d441 100644
--- a/go/quickstep/res/values-de/strings.xml
+++ b/go/quickstep/res/values-de/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Anhören"</string>
     <string name="action_translate" msgid="8028378961867277746">"Übersetzen"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"OK"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ABBRECHEN"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"EINSTELLUNGEN"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Text auf dem Bildschirm übersetzen oder anhören"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informationen, wie Text auf deinem Bildschirm, Webadressen und Screenshots, werden möglicherweise an Google weitergegeben.\n\nWenn du ändern möchtest, welche Informationen weitergegeben werden, gehe zu "<b>"Einstellungen &gt; Apps &gt; Standard-Apps &gt; App für digitalen Assistenten"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Assistenten auswählen, um diese Funktion zu nutzen"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Wenn du dir auf deinem Display Text anhören oder übersetzen lassen möchtest, wähle in den Einstellungen eine App für einen digitalen Assistenten"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Assistenten ändern, um diese Funktion zu nutzen"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Wenn du dir auf deinem Display Text anhören oder übersetzen lassen möchtest, ändere in den Einstellungen deine App für den digitalen Assistenten"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Hier tippen, um dir Text auf diesem Display anzuhören"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Hier tippen, um dir Text auf diesem Display übersetzen zu lassen"</string>
 </resources>
diff --git a/go/quickstep/res/values-el/strings.xml b/go/quickstep/res/values-el/strings.xml
index 25072bfddb..bfa6279f36 100644
--- a/go/quickstep/res/values-el/strings.xml
+++ b/go/quickstep/res/values-el/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Ακρόαση"</string>
     <string name="action_translate" msgid="8028378961867277746">"Μετάφραση"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"ΤΟ ΚΑΤΑΛΑΒΑ"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ΑΚΥΡΩΣΗ"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"ΡΥΘΜΙΣΕΙΣ"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Μετάφραση ή ακρόαση του κειμένου στην οθόνη"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Πληροφορίες όπως είναι το κείμενο στην οθόνη, οι διευθύνσεις ιστού και τα στιγμιότυπα οθόνης, ενδέχεται να κοινοποιηθούν στην Google.\n\nΓια να αλλάξετε τις πληροφορίες που κοινοποιείτε, μεταβείτε στις "<b>"Ρυθμίσεις &gt; Εφαρμογές &gt; Προεπιλεγμένες εφαρμογές &gt; Εφαρμογή ψηφιακού βοηθού"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Επιλέξτε έναν βοηθό για να χρησιμοποιήσετε αυτήν τη λειτουργία"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Για να ακούσετε ή να μεταφράσετε κείμενο στην οθόνη σας, επιλέξτε μια εφαρμογή ψηφιακού βοηθού στις Ρυθμίσεις."</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Αλλάξτε τον βοηθό σας για να χρησιμοποιήσετε αυτήν τη λειτουργία"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Για να ακούσετε ή να μεταφράσετε κείμενο στην οθόνη σας, αλλάξτε την εφαρμογή ψηφιακού βοηθού στις Ρυθμίσεις."</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Πατήστε εδώ για να ακούσετε το κείμενο σε αυτήν την οθόνη"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Πατήστε εδώ για να μεταφράσετε το κείμενο σε αυτήν την οθόνη"</string>
 </resources>
diff --git a/go/quickstep/res/values-en-rAU/strings.xml b/go/quickstep/res/values-en-rAU/strings.xml
index 3108295e84..f1d43a879a 100644
--- a/go/quickstep/res/values-en-rAU/strings.xml
+++ b/go/quickstep/res/values-en-rAU/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Listen"</string>
     <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"OK"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"CANCEL"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"SETTINGS"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Translate or listen to text on screen"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Information such as text on your screen, web addresses and screenshots may be shared with Google.\n\nTo change what information you share, go to "<b>"Settings &gt; Apps &gt; Default apps &gt; Digital assistant app"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Choose an assistant to use this feature"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"To listen to or translate text on your screen, choose a digital assistant app in settings"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Change your assistant to use this feature"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"To listen to or translate text on your screen, change your digital assistant app in settings"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Tap here to listen to text on this screen"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Tap here to translate text on this screen"</string>
 </resources>
diff --git a/go/quickstep/res/values-en-rCA/strings.xml b/go/quickstep/res/values-en-rCA/strings.xml
index 3108295e84..f1d43a879a 100644
--- a/go/quickstep/res/values-en-rCA/strings.xml
+++ b/go/quickstep/res/values-en-rCA/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Listen"</string>
     <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"OK"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"CANCEL"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"SETTINGS"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Translate or listen to text on screen"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Information such as text on your screen, web addresses and screenshots may be shared with Google.\n\nTo change what information you share, go to "<b>"Settings &gt; Apps &gt; Default apps &gt; Digital assistant app"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Choose an assistant to use this feature"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"To listen to or translate text on your screen, choose a digital assistant app in settings"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Change your assistant to use this feature"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"To listen to or translate text on your screen, change your digital assistant app in settings"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Tap here to listen to text on this screen"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Tap here to translate text on this screen"</string>
 </resources>
diff --git a/go/quickstep/res/values-en-rGB/strings.xml b/go/quickstep/res/values-en-rGB/strings.xml
index 3108295e84..f1d43a879a 100644
--- a/go/quickstep/res/values-en-rGB/strings.xml
+++ b/go/quickstep/res/values-en-rGB/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Listen"</string>
     <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"OK"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"CANCEL"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"SETTINGS"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Translate or listen to text on screen"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Information such as text on your screen, web addresses and screenshots may be shared with Google.\n\nTo change what information you share, go to "<b>"Settings &gt; Apps &gt; Default apps &gt; Digital assistant app"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Choose an assistant to use this feature"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"To listen to or translate text on your screen, choose a digital assistant app in settings"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Change your assistant to use this feature"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"To listen to or translate text on your screen, change your digital assistant app in settings"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Tap here to listen to text on this screen"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Tap here to translate text on this screen"</string>
 </resources>
diff --git a/go/quickstep/res/values-en-rIN/strings.xml b/go/quickstep/res/values-en-rIN/strings.xml
index 3108295e84..f1d43a879a 100644
--- a/go/quickstep/res/values-en-rIN/strings.xml
+++ b/go/quickstep/res/values-en-rIN/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Listen"</string>
     <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"OK"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"CANCEL"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"SETTINGS"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Translate or listen to text on screen"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Information such as text on your screen, web addresses and screenshots may be shared with Google.\n\nTo change what information you share, go to "<b>"Settings &gt; Apps &gt; Default apps &gt; Digital assistant app"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Choose an assistant to use this feature"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"To listen to or translate text on your screen, choose a digital assistant app in settings"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Change your assistant to use this feature"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"To listen to or translate text on your screen, change your digital assistant app in settings"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Tap here to listen to text on this screen"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Tap here to translate text on this screen"</string>
 </resources>
diff --git a/go/quickstep/res/values-eu/strings.xml b/go/quickstep/res/values-eu/strings.xml
index e4e456bc0d..3067382779 100644
--- a/go/quickstep/res/values-eu/strings.xml
+++ b/go/quickstep/res/values-eu/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Entzun"</string>
     <string name="action_translate" msgid="8028378961867277746">"Itzuli"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"ADOS"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"UTZI"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"EZARPENAK"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Itzuli edo entzun pantailako testua"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Agian pantailako testua, web-helbideak, pantaila-argazkiak eta antzeko informazioa partekatuko duzu Google-rekin.\n\nPartekatzen duzun informazioa aldatzeko, joan hona: "<b>"Ezarpenak &gt; Aplikazioak &gt; Aplikazio lehenetsiak &gt; Laguntzaile digitalaren aplikazioa"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Hautatu laguntzaile bat eginbidea erabiltzeko"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Pantailako testua entzun edo itzultzeko, hautatu laguntzaile digitalaren aplikazio bat Ezarpenak atalean"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Aldatu laguntzailea eginbidea erabiltzeko"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Pantailako testua entzun edo itzultzeko, aldatu laguntzaile digitalaren aplikazioa Ezarpenak atalean"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Sakatu hau pantailako testua entzuteko"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Sakatu hau pantailako testua itzultzeko"</string>
 </resources>
diff --git a/go/quickstep/res/values-fa/strings.xml b/go/quickstep/res/values-fa/strings.xml
index 6e960775fa..2552717605 100644
--- a/go/quickstep/res/values-fa/strings.xml
+++ b/go/quickstep/res/values-fa/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"گوش دادن"</string>
     <string name="action_translate" msgid="8028378961867277746">"ترجمه"</string>
     <string name="action_search" msgid="6269564710943755464">"لنز"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"متوجه شدم"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"لغو"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"تنظیمات"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"ترجمه نوشتار روی صفحه‌نمایش یا گوش دادن به آن"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"‏ممکن است اطلاعاتی مثل نوشتار روی صفحه‌نمایش، نشانی‌های وب، و نماگرفت‌ها با Google هم‌رسانی شود.\n\nبرای تغییر اطلاعاتی که هم‌رسانی می‌کنید، به "<b>"تنظیمات &lt; برنامه‌ها &lt; برنامه‌های پیش‌فرض &lt; برنامه دستیار دیجیتال"</b>" بروید."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"برای استفاده از این ویژگی، یکی از دستیارها را انتخاب کنید"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"برای گوش کردن به نوشتار در صفحه‌نمایش‌تان یا ترجمه کردن آن، یکی از برنامه‌های دستیار دیجیتالی را در «تنظیمات» انتخاب کنید"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"برای استفاده از این ویژگی، دستیارتان را تغییر دهید"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"برای گوش کردن به نوشتار در صفحه‌نمایش‌تان یا ترجمه کردن آن، برنامه دستیار دیجیتالی‌تان را در «تنظیمات» تغییر دهید"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"برای گوش کردن به نوشتار در این صفحه، اینجا ضربه بزنید"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"برای ترجمه نوشتار در این صفحه، اینجا ضربه بزنید"</string>
 </resources>
diff --git a/go/quickstep/res/values-fr/strings.xml b/go/quickstep/res/values-fr/strings.xml
index 62007f0297..045a8a0705 100644
--- a/go/quickstep/res/values-fr/strings.xml
+++ b/go/quickstep/res/values-fr/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Écouter"</string>
     <string name="action_translate" msgid="8028378961867277746">"Traduire"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"OK"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ANNULER"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"PARAMÈTRES"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Traduire ou écouter le texte à l\'écran"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Des informations comme le texte sur votre écran, des adresses Web et des captures d\'écran peuvent être partagées avec Google.\n\nPour modifier les types d\'informations que vous partagez, accédez à "<b>"Paramètres &gt; Applis &gt; Applis par défaut &gt; Appli d\'assistant numérique"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Sélectionnez un assistant pour utiliser cette fonctionnalité"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Pour écouter ou traduire le texte à l\'écran, sélectionnez une appli d\'assistant numérique dans \"Paramètres\""</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Changez d\'assistant pour utiliser cette fonctionnalité"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Pour écouter ou traduire le texte à l\'écran, modifiez l\'appli d\'assistant numérique dans \"Paramètres\""</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Appuyez ici pour écouter le texte à l\'écran"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Appuyez ici pour traduire le texte à l\'écran"</string>
 </resources>
diff --git a/go/quickstep/res/values-gl/strings.xml b/go/quickstep/res/values-gl/strings.xml
index e7d9d79292..0c013177bf 100644
--- a/go/quickstep/res/values-gl/strings.xml
+++ b/go/quickstep/res/values-gl/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Escoitar"</string>
     <string name="action_translate" msgid="8028378961867277746">"Traducir"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"ENTENDIDO"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"CANCELAR"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"CONFIGURACIÓN"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Traducir ou escoitar o texto que aparece na pantalla"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"É posible que se comparta con Google información como o texto que aparece na pantalla, os enderezos web e as capturas de pantalla.\n\nPara cambiar os datos que se comparten, vai a "<b>"Configuración &gt; Aplicacións &gt; Aplicacións predeterminadas &gt; Aplicación de asistente dixital"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Escolle un asistente para utilizar esta función"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Para escoitar ou traducir o texto da pantalla, escolle unha aplicación de asistente dixital en Configuración"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Cambia o asistente para utilizar esta función"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Para escoitar ou traducir o texto da pantalla, cambia a aplicación de asistente dixital en Configuración"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Tocar aquí para escoitar o texto desta pantalla"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Tocar aquí para traducir o texto desta pantalla"</string>
 </resources>
diff --git a/go/quickstep/res/values-gu/strings.xml b/go/quickstep/res/values-gu/strings.xml
index d8839fc3b7..28a2d3852d 100644
--- a/go/quickstep/res/values-gu/strings.xml
+++ b/go/quickstep/res/values-gu/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"સાંભળો"</string>
     <string name="action_translate" msgid="8028378961867277746">"અનુવાદ કરો"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"સમજાઈ ગયું"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"રદ કરો"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"સેટિંગ"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"સ્ક્રીન પરની ટેક્સ્ટનો અનુવાદ કરો અથવા સાંભળો"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"તમારી સ્ક્રીન પરની ટેક્સ્ટ, વેબ ઍડ્રેસ અને સ્ક્રીનશૉટ જેવી માહિતી Google સાથે શેર કરવામાં આવી શકે છે.\n\nતમે શેર કરતા હો તેવી માહિતીમાં ફેરફાર કરવા માટે, "<b>"સેટિંગ &gt; ઍપ &gt; ડિફૉલ્ટ ઍપ &gt; ડિજિટલ Assistant ઍપ"</b>" પર જાઓ."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"આ સુવિધાનો ઉપયોગ કરવા માટે આસિસ્ટંટ પસંદ કરો"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"તમારી સ્ક્રીન પર ટેક્સ્ટ સાંભળવા માટે અથવા તેનો અનુવાદ કરવા માટે, સેટિંગમાં જઈને ડિજિટલ આસિસ્ટંટ ઍપ પસંદ કરો"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"આ સુવિધાનો ઉપયોગ કરવા માટે તમારું આસિસ્ટંટ બદલો"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"તમારી સ્ક્રીન પર ટેક્સ્ટ સાંભળવા માટે અથવા તેનો અનુવાદ કરવા માટે, સેટિંગમાં જઈને તમારી ડિજિટલ આસિસ્ટંટ ઍપ બદલો"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"આ સ્ક્રીન પર ટેક્સ્ટ સાંભળવા માટે અહીં ટૅપ કરો"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"આ સ્ક્રીન પર ટેક્સ્ટનો અનુવાદ કરવા માટે અહીં ટૅપ કરો"</string>
 </resources>
diff --git a/go/quickstep/res/values-in/strings.xml b/go/quickstep/res/values-in/strings.xml
index 74bbbd7d05..7e240e8da6 100644
--- a/go/quickstep/res/values-in/strings.xml
+++ b/go/quickstep/res/values-in/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Dengarkan"</string>
     <string name="action_translate" msgid="8028378961867277746">"Terjemahkan"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"OKE"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"BATAL"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"SETELAN"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Terjemahkan atau dengarkan teks di layar"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informasi seperti teks di layar, alamat web, dan screenshot dapat dibagikan ke Google.\n\nUntuk mengubah informasi yang Anda bagikan, buka "<b>"Setelan &gt; Aplikasi &gt; Aplikasi default &gt; Aplikasi asisten digital"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Pilih asisten untuk menggunakan fitur ini"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Untuk mendengarkan atau menerjemahkan teks di layar, pilih aplikasi asisten digital di Setelan"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Ubah asisten untuk menggunakan fitur ini"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Untuk mendengarkan atau menerjemahkan teks di layar, ubah aplikasi asisten digital Anda di Setelan"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Ketuk di sini untuk mendengarkan teks di layar ini"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Ketuk di sini untuk menerjemahkan teks di layar ini"</string>
 </resources>
diff --git a/go/quickstep/res/values-it/strings.xml b/go/quickstep/res/values-it/strings.xml
index 3f19491b4d..75afcbb236 100644
--- a/go/quickstep/res/values-it/strings.xml
+++ b/go/quickstep/res/values-it/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Ascolta"</string>
     <string name="action_translate" msgid="8028378961867277746">"Traduttore"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"OK"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ANNULLA"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"IMPOSTAZIONI"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Traduci o ascolta il testo sullo schermo"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Alcune informazioni, come il testo sullo schermo, gli indirizzi web e gli screenshot, potrebbero essere condivise con Google.\n\nPer modificare quali informazioni condividere, vai a "<b>"Impostazioni &gt; App &gt; App predefinite &gt; App assistente digitale"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Scegli un assistente per usare questa funzionalità"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Per ascoltare o tradurre il testo mostrato sullo schermo, scegli l\'app di un assistente digitale nelle Impostazioni"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Cambia l\'assistente per usare questa funzionalità"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Per ascoltare o tradurre il testo mostrato sullo schermo, cambia l\'app dell\'assistente digitale nelle Impostazioni"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Tocca qui per ascoltare il testo mostrato in questa schermata"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Tocca qui per tradurre il testo mostrato in questa schermata"</string>
 </resources>
diff --git a/go/quickstep/res/values-km/strings.xml b/go/quickstep/res/values-km/strings.xml
index 47e99a09f0..b44ff0a104 100644
--- a/go/quickstep/res/values-km/strings.xml
+++ b/go/quickstep/res/values-km/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"ស្តាប់"</string>
     <string name="action_translate" msgid="8028378961867277746">"បកប្រែ"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"យល់ហើយ"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"បោះបង់"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"ការកំណត់"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"បកប្រែ ឬស្ដាប់អត្ថបទ​នៅលើអេក្រង់"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"ព័ត៌មានដូចជា អត្ថបទនៅលើ​អេក្រង់របស់អ្នក អាសយដ្ឋានទំព័រ និងរូបថតអេក្រង់​​អាចនឹងត្រូវបានចែក​រំលែកជាមួយ Google។\n\nដើម្បីប្ដូរព័ត៌មាន​ដែលអ្នកចែករំលែក សូមចូលទៅកាន់"<b>"ការកំណត់ &gt; កម្មវិធី &gt; កម្មវិធីលំនាំដើម &gt; កម្មវិធីជំនួយការឌីជីថល"</b>"។"</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"ជ្រើសរើស​ជំនួយការ ដើម្បីប្រើ​មុខងារនេះ"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"ដើម្បីស្ដាប់ ឬបកប្រែ​អត្ថបទ​នៅលើ​អេក្រង់របស់អ្នក សូមជ្រើសរើស​កម្មវិធី​ជំនួយការឌីជីថល​នៅក្នុង​ការកំណត់"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"ប្ដូរជំនួយការ​របស់អ្នក ដើម្បីប្រើ​មុខងារនេះ"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"ដើម្បីស្ដាប់ ឬបកប្រែ​អត្ថបទ​នៅលើ​អេក្រង់របស់អ្នក សូមប្ដូរ​កម្មវិធី​ជំនួយការឌីជីថល​របស់អ្នក​នៅក្នុង​ការកំណត់"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"ចុចត្រង់នេះ ដើម្បីស្ដាប់​អត្ថបទ​នៅលើ​អេក្រង់នេះ"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"ចុចត្រង់នេះ ដើម្បីបកប្រែ​អត្ថបទ​នៅលើ​អេក្រង់នេះ"</string>
 </resources>
diff --git a/go/quickstep/res/values-kn/strings.xml b/go/quickstep/res/values-kn/strings.xml
index 7ed441e8a7..4621437d17 100644
--- a/go/quickstep/res/values-kn/strings.xml
+++ b/go/quickstep/res/values-kn/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"ಆಲಿಸಿ"</string>
     <string name="action_translate" msgid="8028378961867277746">"ಅನುವಾದಿಸಿ"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"ಅರ್ಥವಾಯಿತು"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ರದ್ದುಗೊಳಿಸಿ"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"ಸ್ಕ್ರೀನ್ ಮೇಲಿರುವ ಪಠ್ಯವನ್ನು ಅನುವಾದಿಸಿ ಅಥವಾ ಆಲಿಸಿ"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಮೇಲಿರುವ ಪಠ್ಯ, ವೆಬ್ ವಿಳಾಸಗಳು, ಮತ್ತು ಸ್ಕ್ರೀನ್‌ಶಾಟ್‌ಗಳಂತಹ ಮಾಹಿತಿಯನ್ನು Google ಜೊತೆಗೆ ಹಂಚಿಕೊಳ್ಳಬಹುದು.\n\nನೀವು ಯಾವ ಮಾಹಿತಿಯನ್ನು ಹಂಚಿಕೊಳ್ಳುತ್ತೀರಿ ಎಂಬುದನ್ನು ಬದಲಾಯಿಸಲು, "<b>"ಸೆಟ್ಟಿಂಗ್‌ಗಳು, ಆ್ಯಪ್‌ಗಳು ಮತ್ತು ಡೀಫಾಲ್ಟ್ ಆ್ಯಪ್‌ಗಳು, ಡಿಜಿಟಲ್ ಅಸಿಸ್ಟೆಂಟ್ ಆ್ಯಪ್ ಎಂಬಲ್ಲಿ ಹೋಗಿ"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಬಳಸಲು Assistant ಅನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"ನಿಮ್ಮ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿರುವ ಪಠ್ಯವನ್ನು ಆಲಿಸಲು ಅಥವಾ ಅನುವಾದಿಸಲು ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಡಿಜಿಟಲ್ ಅಸಿಸ್ಟೆಂಟ್ ಆ್ಯಪ್ ಅನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಬಳಸಲು ನಿಮ್ಮ Assistant ಅನ್ನು ಬದಲಾಯಿಸಿ"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"ನಿಮ್ಮ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿರುವ ಪಠ್ಯವನ್ನು ಆಲಿಸಲು ಅಥವಾ ಅನುವಾದಿಸಲು ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ನಿಮ್ಮ ಡಿಜಿಟಲ್ ಅಸಿಸ್ಟೆಂಟ್ ಆ್ಯಪ್ ಅನ್ನು ಬದಲಾಯಿಸಿ"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"ಈ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿರುವ ಪಠ್ಯವನ್ನು ಆಲಿಸಲು ಇಲ್ಲಿ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"ಈ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿರುವ ಪಠ್ಯವನ್ನು ಅನುವಾದಿಸಲು ಇಲ್ಲಿ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
 </resources>
diff --git a/go/quickstep/res/values-lo/strings.xml b/go/quickstep/res/values-lo/strings.xml
index c8297a0937..f2c6ffacc7 100644
--- a/go/quickstep/res/values-lo/strings.xml
+++ b/go/quickstep/res/values-lo/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"ຟັງ"</string>
     <string name="action_translate" msgid="8028378961867277746">"ແປພາສາ"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"ເຂົ້າໃຈແລ້ວ"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ຍົກເລີກ"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"ການຕັ້ງຄ່າ"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"ແປພາສາ ຫຼື ຟັງຂໍ້ຄວາມຢູ່ໜ້າຈໍ"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"ຂໍ້ມູນ ເຊັ່ນ: ຂໍ້ຄວາມຢູ່ໜ້າຈໍຂອງທ່ານ, ທີ່ຢູ່ເວັບ ແລະ ຮູບໜ້າຈໍອາດຖືກແບ່ງປັນໃຫ້ກັບ Google.\n\nເພື່ອປ່ຽນແປງຂໍ້ມູນທີ່ທ່ານແບ່ງປັນ, ໃຫ້ເຂົ້າໄປ "<b>"ການຕັ້ງຄ່າ &gt; ແອັບ &gt; ແອັບເລີ່ມຕົ້ນ &gt; ແອັບຜູ້ຊ່ວຍດິຈິຕອນ"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"ເລືອກຜູ້ຊ່ວຍເພື່ອໃຊ້ຄຸນສົມບັດນີ້"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"ເພື່ອຟັງ ຫຼື ແປຂໍ້ຄວາມຢູ່ໜ້າຈໍຂອງທ່ານ, ໃຫ້ເລືອກຜູ້ຊ່ວຍດິຈິຕອນໃດໜຶ່ງໃນການຕັ້ງຄ່າ"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"ປ່ຽນຜູ້ຊ່ວຍຂອງທ່ານເພື່ອໃຊ້ຄຸນສົມບັດນີ້"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"ເພື່ອຟັງ ຫຼື ແປຂໍ້ຄວາມຢູ່ໜ້າຈໍຂອງທ່ານ, ໃຫ້ປ່ຽນຜູ້ຊ່ວຍດິຈິຕອນຂອງທ່ານໃນການຕັ້ງຄ່າ"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"ແຕະບ່ອນນີ້ເພື່ອຟັງຂໍ້ຄວາມຢູ່ໜ້າຈໍນີ້"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"ແຕະບ່ອນນີ້ເພື່ອແປຂໍ້ຄວາມຢູ່ໜ້າຈໍນີ້"</string>
 </resources>
diff --git a/go/quickstep/res/values-ml/strings.xml b/go/quickstep/res/values-ml/strings.xml
index 60e9bbdea2..04e8b0aa41 100644
--- a/go/quickstep/res/values-ml/strings.xml
+++ b/go/quickstep/res/values-ml/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"കേൾക്കുക"</string>
     <string name="action_translate" msgid="8028378961867277746">"വിവർത്തനം ചെയ്യുക"</string>
     <string name="action_search" msgid="6269564710943755464">"ലെൻസ്"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"മനസ്സിലായി"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"റദ്ദാക്കുക"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"ക്രമീകരണം"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"സ്ക്രീനിലെ ടെക്സ്റ്റ് വിവർത്തനം ചെയ്യുകയോ കേൾക്കുകയോ ചെയ്യുക"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"നിങ്ങളുടെ സ്ക്രീനിലെ ടെക്സ്റ്റ്, വെബ് വിലാസങ്ങൾ, സ്ക്രീൻഷോട്ടുകൾ എന്നിവ പോലുള്ള വിവരങ്ങൾ Google-മായി പങ്കിട്ടേക്കാം.\n\nനിങ്ങൾ പങ്കിടുന്ന വിവരങ്ങൾ മാറ്റാൻ, "<b>"ക്രമീകരണ &gt; ആപ്പുകൾ &gt; ഡിഫോൾട്ട് ആപ്പുകൾ &gt; ഡിജിറ്റൽ അസിസ്‌റ്റന്റ് ആപ്പ്"</b>" എന്നതിലേക്ക് പോകുക."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"ഈ ഫീച്ചർ ഉപയോഗിക്കാൻ, ഒരു അസിസ്‌റ്റന്റ് തിരഞ്ഞെടുക്കുക"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"നിങ്ങളുടെ സ്ക്രീനിലുള്ള ടെക്‌സ്‌റ്റ് കേൾക്കാനോ വിവർത്തനം ചെയ്യാനോ, ക്രമീകരണത്തിൽ നിന്ന് ഒരു ഡിജിറ്റൽ അസിസ്‌റ്റന്റ് ആപ്പ് തിരഞ്ഞെടുക്കുക"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"ഈ ഫീച്ചർ ഉപയോഗിക്കാൻ, നിങ്ങളുടെ അസിസ്‌റ്റന്റ് മാറ്റുക"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"നിങ്ങളുടെ സ്ക്രീനിലുള്ള ടെക്‌സ്‌റ്റ് കേൾക്കാനോ വിവർത്തനം ചെയ്യാനോ, ക്രമീകരണത്തിലെ നിങ്ങളുടെ ഡിജിറ്റൽ അസിസ്‌റ്റന്റ് ആപ്പ് മാറ്റുക"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"ഈ സ്ക്രീനിലെ ടെക്‌സ്‌റ്റ് കേൾക്കാൻ, ഇവിടെ ടാപ്പ് ചെയ്യുക"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"ഈ സ്ക്രീനിലെ ടെക്‌സ്‌റ്റ് വിവർത്തനം ചെയ്യാൻ, ഇവിടെ ടാപ്പ് ചെയ്യുക"</string>
 </resources>
diff --git a/go/quickstep/res/values-mr/strings.xml b/go/quickstep/res/values-mr/strings.xml
index 79b555fc5f..e190359da2 100644
--- a/go/quickstep/res/values-mr/strings.xml
+++ b/go/quickstep/res/values-mr/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"ऐका"</string>
     <string name="action_translate" msgid="8028378961867277746">"भाषांतर करा"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"समजले"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"रद्द करा"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"सेटिंग्ज"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"स्क्रीनवरील मजकूर भाषांतरित करा किंवा ऐका"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"तुमच्या स्क्रीनवरील मजकूर, वेब अ‍ॅड्रेस आणि स्क्रीनशॉट यांसारखी माहिती Google सह शेअर केली जाऊ शकते.\n\nतुम्ही कोणती माहिती शेअर करता हे बदलण्यासाठी "<b>"सेटिंग्ज &gt; ॲप्स &gt; डीफॉल्ट ॲप्स &gt; डिजिटल असिस्टंट ॲपवर जा"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"हे वैशिष्ट्य वापरण्यासाठी तुमचे असिस्टंट निवडा"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"तुमच्या स्क्रीनवरील मजकूर ऐकण्यासाठी किंवा भाषांतर करण्यासाठी, सेटिंग्ज मध्ये तुमचे डिजिटल असिस्टंट अ‍ॅप निवडा"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"हे वैशिष्ट्य वापरण्यासाठी असिस्टंट बदला"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"तुमच्या स्क्रीनवरील मजकूर ऐकण्यासाठी किंवा भाषांतर करण्यासाठी, सेटिंग्ज मध्ये तुमचे डिजिटल असिस्टंट अ‍ॅप बदला"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"या स्क्रीनवरील मजकूर ऐकण्यासाठी येथे टॅप करा"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"या स्क्रीनवरील मजकुराचे भाषांतर करण्यासाठी येथे टॅप करा"</string>
 </resources>
diff --git a/go/quickstep/res/values-ms/strings.xml b/go/quickstep/res/values-ms/strings.xml
index 3f42e752e6..8169256bfb 100644
--- a/go/quickstep/res/values-ms/strings.xml
+++ b/go/quickstep/res/values-ms/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Dengar"</string>
     <string name="action_translate" msgid="8028378961867277746">"Terjemah"</string>
     <string name="action_search" msgid="6269564710943755464">"Kanta"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"OK"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"BATAL"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"TETAPAN"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Terjemahkan atau dengar teks pada skrin"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Maklumat seperti teks pada skrin anda, alamat web dan tangkapan skrin boleh dikongsi dengan Google.\n\nUntuk menukar maklumat yang anda kongsi, pergi ke "<b>"Tetapan &gt; Apl &gt; Apl lalai &gt; Apl pembantu digital"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Pilih pembantu untuk menggunakan ciri ini"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Untuk mendengar atau menterjemahkan teks pada skrin anda, pilih apl pembantu digital dalam Tetapan"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Tukar pembantu anda untuk menggunakan ciri ini"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Untuk mendengar atau menterjemahkan teks pada skrin anda, tukar apl pembantu digital anda dalam Tetapan"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Ketik di sini untuk mendengar teks pada skrin ini"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Ketik di sini untuk menterjemahkan teks pada skrin ini"</string>
 </resources>
diff --git a/go/quickstep/res/values-ne/strings.xml b/go/quickstep/res/values-ne/strings.xml
index c92751ca2f..cd1ee06001 100644
--- a/go/quickstep/res/values-ne/strings.xml
+++ b/go/quickstep/res/values-ne/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"सुन्नुहोस्"</string>
     <string name="action_translate" msgid="8028378961867277746">"अनुवाद गर्नुहोस्"</string>
     <string name="action_search" msgid="6269564710943755464">"लेन्स"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"बुझेँ"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"रद्द गर्नुहोस्"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"सेटिङ"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"स्क्रिनमा देखिने पाठ अनुवाद गरियोस् वा पढेर सुनाइयोस्"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"तपाईंको स्क्रिनमा देखिने पाठ, वेब ठेगाना र स्क्रिनसटलगायतका जानकारी Google सँग सेयर गर्न सकिन्छ।\n\nकुन कुन जानकारी सेयर गर्न दिने भन्ने सेटिङ बदल्न "<b>"सेटिङ &gt; एप &gt; डिफल्ट एप &gt; डिजिटल सहायक एप"</b>" मा जानुहोस्।"</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"तपाईं यो सुविधा चलाउन चाहनुहुन्छ भने कुनै सहायक छनौट गर्नुहोस्"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"तपाईं आफ्नो स्क्रिनमा देखिने पाठ सुन्न वा अनुवाद गर्न चाहनुहुन्छ भने सेटिङमा गई कुनै डिजिटल सहायक एप छनौट गर्नुहोस्"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"तपाईं यो सुविधा चलाउन चाहनुहुन्छ भने आफ्नो सहायक परिवर्तन गर्नुहोस्"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"तपाईं आफ्नो स्क्रिनमा देखिने पाठ सुन्न वा अनुवाद गर्न चाहनुहुन्छ भने सेटिङमा गई कुनै डिजिटल सहायक एप परिर्वर्तन गर्नुहोस्"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"तपाईं यो स्क्रिनमा देखिने पाठ सुन्न चाहनुहुन्छ यहाँ ट्याप गर्नुहोस्"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"तपाईं यो स्क्रिनमा देखिने पाठ अनुवाद गर्न चाहनुहुन्छ यहाँ ट्याप गर्नुहोस्"</string>
 </resources>
diff --git a/go/quickstep/res/values-or/strings.xml b/go/quickstep/res/values-or/strings.xml
index 2e759743e3..df8febf331 100644
--- a/go/quickstep/res/values-or/strings.xml
+++ b/go/quickstep/res/values-or/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"ଶୁଣନ୍ତୁ"</string>
     <string name="action_translate" msgid="8028378961867277746">"ଅନୁବାଦ କରନ୍ତୁ"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"ବୁଝିଗଲି"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ବାତିଲ୍ କରନ୍ତୁ"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"ସେଟିଂସ୍"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"ସ୍କିନରେ ଥିବା ଟେକ୍ସଟକୁ ଅନୁବାଦ କରନ୍ତୁ କିମ୍ବା ଶୁଣନ୍ତୁ"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"ଆପଣଙ୍କ ସ୍କ୍ରିନରେ ଟେକ୍ସଟ୍, ୱେବ୍ ଠିକଣା ଏବଂ ସ୍କ୍ରିନସଟଗୁଡ଼ିକ ପରି ସୂଚନାକୁ Google ସହ ସେୟାର୍ କରାଯାଇପାରେ।\n\nଆପଣ କେଉଁ ସୂଚନା ସେୟାର୍ କରନ୍ତି ତାହା ପରିବର୍ତ୍ତନ କରିବାକୁ, "<b>"ସେଟିଂସ୍ &gt; ଆପ୍ସ &gt; ଡିଫଲ୍ଟ ଆପ୍ସ &gt; ଡିଜିଟାଲ୍ ଆସିଷ୍ଟାଣ୍ଟ ଆପ"</b>"କୁ ଯାଆନ୍ତୁ।"</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"ଏହି ଫିଚର୍ ବ୍ୟବହାର କରିବାକୁ ଏକ ଆସିଷ୍ଟାଣ୍ଟ ବାଛନ୍ତୁ"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"ଆପଣଙ୍କ ସ୍କ୍ରିନରେ ଥିବା ଟେକ୍ସଟକୁ ଶୁଣିବା ପାଇଁ କିମ୍ବା ଅନୁବାଦ କରିବାକୁ, ସେଟିଂସରେ ଏକ ଡିଜିଟାଲ୍ ଆସିଷ୍ଟାଣ୍ଟ ଆପ୍ ଚୟନ କରନ୍ତୁ"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"ଏହି ଫିଚର୍ ବ୍ୟବହାର କରିବା ପାଇଁ ଆପଣଙ୍କ ଆସିଷ୍ଟାଣ୍ଟକୁ ବଦଳାନ୍ତୁ"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"ଆପଣଙ୍କ ସ୍କ୍ରିନରେ ଥିବା ଟେକ୍ସଟକୁ ଶୁଣିବା ପାଇଁ କିମ୍ବା ଅନୁବାଦ କରିବାକୁ, ସେଟିଂସରେ ଆପଣଙ୍କ ଡିଜିଟାଲ୍ ଆସିଷ୍ଟାଣ୍ଟ ଆପକୁ ବଦଳାନ୍ତୁ"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"ଏହି ସ୍କ୍ରିନରେ ଥିବା ଟେକ୍ସଟକୁ ଶୁଣିବା ପାଇଁ ଏଠାରେ ଟାପ୍ କରନ୍ତୁ"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"ଏହି ସ୍କ୍ରିନରେ ଥିବା ଟେକ୍ସଟକୁ ଅନୁବାଦ କରିବା ପାଇଁ ଏଠାରେ ଟାପ୍ କରନ୍ତୁ"</string>
 </resources>
diff --git a/go/quickstep/res/values-pa/strings.xml b/go/quickstep/res/values-pa/strings.xml
index cbcb13e06b..c3bc875b51 100644
--- a/go/quickstep/res/values-pa/strings.xml
+++ b/go/quickstep/res/values-pa/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"ਸੁਣੋ"</string>
     <string name="action_translate" msgid="8028378961867277746">"ਅਨੁਵਾਦ ਕਰੋ"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"ਸਮਝ ਲਿਆ"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ਰੱਦ ਕਰੋ"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"ਸੈਟਿੰਗਾਂ"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"ਸਕ੍ਰੀਨ \'ਤੇ ਦਿੱਤੀ ਲਿਖਤ ਦਾ ਅਨੁਵਾਦ ਕਰੋ ਜਾਂ ਉਸਨੂੰ ਸੁਣੋ"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ \'ਤੇ ਦਿੱਤੀ ਲਿਖਤ, ਵੈੱਬ ਪਤਿਆਂ ਅਤੇ ਸਕ੍ਰੀਨਸ਼ਾਟਾਂ ਵਰਗੀ ਜਾਣਕਾਰੀ ਨੂੰ Google ਨਾਲ ਸਾਂਝਾ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।\n\nਤੁਹਾਡੇ ਵੱਲੋਂ ਸਾਂਝੀ ਕੀਤੀ ਜਾਣਕਾਰੀ ਨੂੰ ਬਦਲਣ ਲਈ, "<b>"ਸੈਟਿੰਗਾਂ &gt; ਐਪਾਂ &gt; ਪੂਰਵ-ਨਿਰਧਾਰਿਤ ਐਪਾਂ &gt; ਡਿਜੀਟਲ ਸਹਾਇਕ ਐਪ"</b>" \'ਤੇ ਜਾਓ।"</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"ਇਸ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਵਰਤਣ ਲਈ ਸਹਾਇਕ ਐਪ ਚੁਣੋ"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"ਆਪਣੀ ਸਕ੍ਰੀਨ \'ਤੇ ਲਿਖਤ ਨੂੰ ਸੁਣਨ ਅਤੇ ਉਸਦਾ ਅਨੁਵਾਦ ਕਰਨ ਲਈ, ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਡਿਜੀਟਲ ਸਹਾਇਕ ਐਪ ਚੁਣੋ"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"ਇਸ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਵਰਤਣ ਲਈ ਆਪਣੀ ਸਹਾਇਕ ਐਪ ਬਦਲੋ"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"ਆਪਣੀ ਸਕ੍ਰੀਨ \'ਤੇ ਲਿਖਤ ਨੂੰ ਸੁਣਨ ਅਤੇ ਉਸਦਾ ਅਨੁਵਾਦ ਕਰਨ ਲਈ, ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਆਪਣੀ ਡਿਜੀਟਲ ਸਹਾਇਕ ਐਪ ਬਦਲੋ"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"ਇਸ ਸਕ੍ਰੀਨ \'ਤੇ ਲਿਖਤ ਨੂੰ ਸੁਣਨ ਲਈ ਇੱਥੇ ਟੈਪ ਕਰੋ"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"ਇਸ ਸਕ੍ਰੀਨ \'ਤੇ ਲਿਖਤ ਦਾ ਅਨੁਵਾਦ ਕਰਨ ਲਈ ਇੱਥੇ ਟੈਪ ਕਰੋ"</string>
 </resources>
diff --git a/go/quickstep/res/values-pt-rPT/strings.xml b/go/quickstep/res/values-pt-rPT/strings.xml
index 426926a223..9764134cbb 100644
--- a/go/quickstep/res/values-pt-rPT/strings.xml
+++ b/go/quickstep/res/values-pt-rPT/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Ouvir"</string>
     <string name="action_translate" msgid="8028378961867277746">"Traduzir"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"OK"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"CANCELAR"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"DEFINIÇÕES"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Traduza ou ouça o texto no ecrã"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informações como o texto no ecrã, endereços Web e capturas de ecrã podem ser partilhadas com a Google.\n\nPara alterar as informações que partilha, aceda a "<b>"Definições &gt; Apps &gt; App predefinidas &gt; App de assistente digital"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Escolha um assistente para utilizar esta funcionalidade"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Para ouvir ou traduzir o texto no ecrã, escolha uma app de assistente digital nas Definições"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Mude de assistente para utilizar esta funcionalidade"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Para ouvir ou traduzir o texto no ecrã, mude de app de assistente digital nas Definições"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Toque aqui para ouvir o texto neste ecrã"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Toque aqui para traduzir o texto neste ecrã"</string>
 </resources>
diff --git a/go/quickstep/res/values-pt/strings.xml b/go/quickstep/res/values-pt/strings.xml
index 1bc16ec55d..32560d09f4 100644
--- a/go/quickstep/res/values-pt/strings.xml
+++ b/go/quickstep/res/values-pt/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Ouvir"</string>
     <string name="action_translate" msgid="8028378961867277746">"Traduzir"</string>
     <string name="action_search" msgid="6269564710943755464">"Google Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"OK"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"CANCELAR"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"CONFIGURAÇÕES"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Traduzir ou ouvir o texto na tela"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informações como o texto exibido, endereços da Web e capturas de tela poderão ser compartilhadas com o Google.\n\nPara mudar quais dados são compartilhados, acesse "<b>"Configurações &gt; Apps &gt; Apps padrão &gt; App assistente digital"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Escolha um assistente para usar esse recurso"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Para ouvir ou traduzir o texto exibido na tela, escolha um app assistente digital nas Configurações"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Mude seu assistente para usar esse recurso"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Para ouvir ou traduzir o texto exibido na tela, mude seu app assistente digital nas Configurações"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Toque aqui para ouvir o texto exibido na tela"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Toque aqui para traduzir o texto exibido na tela"</string>
 </resources>
diff --git a/go/quickstep/res/values-te/strings.xml b/go/quickstep/res/values-te/strings.xml
index 33c17b906c..cb481d0709 100644
--- a/go/quickstep/res/values-te/strings.xml
+++ b/go/quickstep/res/values-te/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"వినండి"</string>
     <string name="action_translate" msgid="8028378961867277746">"అనువదించండి"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"అర్థమైంది"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"రద్దు చేయండి"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"సెట్టింగ్‌లు"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"స్క్రీన్‌పై టెక్స్ట్ అనువదించండి లేదా వినండి"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"మీ స్క్రీన్‌పై టెక్స్ట్, వెబ్ అడ్రస్‌లు, అలాగే స్క్రీన్‌షాట్‌ల వంటి సమాచారం Googleతో షేర్ చేయడం జరగవచ్చు.\n\nమీరు ఏ సమాచారాన్ని షేర్ చేసుకుంటారో మార్చడానికి "<b>"సెట్టింగ్‌లు &gt; యాప్‌లు &gt; ఆటోమేటిక్ సెట్టింగ్ యాప్‌లు &gt; డిజిటల్ అసిస్టెంట్ యాప్‌ల"</b>"‌కు వెళ్లండి."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"ఈ ఫీచర్‌ను ఉపయోగించడానికి అసిస్టెంట్‌ను ఎంచుకోండి"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"మీ స్క్రీన్‌పై ఉన్న టెక్స్ట్‌ను వినడానికి లేదా అనువదించడానికి, సెట్టింగ్‌లలో డిజిటల్ అసిస్టెంట్ యాప్‌ను ఎంచుకోండి"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"ఈ ఫీచర్‌ను ఉపయోగించడానికి మీ అసిస్టెంట్‌ను మార్చండి"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"మీ స్క్రీన్‌పై ఉన్న టెక్స్ట్‌ను వినడానికి లేదా అనువదించడానికి, సెట్టింగ్‌లలో మీ డిజిటల్ అసిస్టెంట్ యాప్‌ను మార్చండి"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"ఈ స్క్రీన్‌పై ఉన్న టెక్స్ట్‌ను వినడానికి ఇక్కడ ట్యాప్ చేయండి"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"ఈ స్క్రీన్‌పై ఉన్న టెక్స్ట్‌ను అనువదించడానికి ఇక్కడ ట్యాప్ చేయండి"</string>
 </resources>
diff --git a/go/quickstep/res/values-ur/strings.xml b/go/quickstep/res/values-ur/strings.xml
index 9df59c9e45..6393127100 100644
--- a/go/quickstep/res/values-ur/strings.xml
+++ b/go/quickstep/res/values-ur/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"سنیں"</string>
     <string name="action_translate" msgid="8028378961867277746">"‏Google ترجمہ"</string>
     <string name="action_search" msgid="6269564710943755464">"‏Google لینز"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"سمجھ آ گئی"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"منسوخ کریں"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"ترتیبات"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"اسکرین پر موجود ٹیکسٹ کو سنیں یا ترجمہ کریں"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"‏آپ کی اسکرین پر ٹیکسٹ، ویب پتے اور اسکرین شاٹس جیسی معلومات کا اشتراک Google کے ساتھ کیا جا سکتا ہے۔\n\nآپ جس معلومات کا اشتراک کرتے ہیں اسے تبدیل کرنے کیلئے "<b>"ترتیبات ‎&gt;‎ ایپس ‎&gt;‎ ڈیفالٹ ایپس ‎&gt;‎ ڈیجیٹل اسسٹنٹ ایپ"</b>" پر جائیں۔"</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"اس خصوصیت کا استعمال کرنے کے لیے اسسٹنٹ کا انتخاب کریں"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"اپنی اسکرین پر موجود ٹیکسٹ کو سننے یا اس کا ترجمہ کرنے کیلئے ترتیبات میں ڈیجیٹل اسسٹنٹ ایپ کا انتخاب کریں"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"اس خصوصیت کا استعمال کرنے کے لیے اپنی اسسٹنٹ کا استعمال کریں"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"اپنی اسکرین پر موجود ٹیکسٹ کو سننے یا اس کا ترجمہ کرنے کیلئے ترتیبات میں اپنی ڈیجیٹل اسسٹنٹ ایپ کو تبدیل کریں"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"اس اسکرین پر موجود ٹیکسٹ کو سننے کے لیے یہاں تھپتھپائیں"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"اس اسکرین پر موجود ٹیکسٹ کا ترجمہ کرنے کے لیے یہاں تھپتھپائیں"</string>
 </resources>
diff --git a/go/quickstep/res/values-zh-rHK/strings.xml b/go/quickstep/res/values-zh-rHK/strings.xml
index 87eca776b4..29402d857c 100644
--- a/go/quickstep/res/values-zh-rHK/strings.xml
+++ b/go/quickstep/res/values-zh-rHK/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"聆聽"</string>
     <string name="action_translate" msgid="8028378961867277746">"翻譯"</string>
     <string name="action_search" msgid="6269564710943755464">"智能鏡頭"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"知道了"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"取消"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"設定"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"翻譯或聆聽畫面上的文字"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"可能會與 Google 分享螢幕上的文字、網址和螢幕截圖等資料。\n\n如要變更分享的資料，請前往 "<b>"[設定] &gt; [應用程式] &gt; [預設應用程式] &gt; [數碼助理應用程式]"</b>"。"</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"必須選擇數碼助理才可使用此功能"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"如要聆聽或翻譯畫面上的文字，請在「設定」中選擇數碼助理應用程式"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"必須變更數碼助理才可使用此功能"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"如要聆聽或翻譯畫面上的文字，請在「設定」中變更數碼助理應用程式"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"輕按這裡即可聆聽此畫面上的文字"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"輕按這裡即可翻譯此畫面上的文字"</string>
 </resources>
diff --git a/go/quickstep/res/values-zu/strings.xml b/go/quickstep/res/values-zu/strings.xml
index aeaf07a6f3..64b163549f 100644
--- a/go/quickstep/res/values-zu/strings.xml
+++ b/go/quickstep/res/values-zu/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Lalela"</string>
     <string name="action_translate" msgid="8028378961867277746">"Humusha"</string>
     <string name="action_search" msgid="6269564710943755464">"Ilensi"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"NGIYITHOLILE"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"KHANSELA"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"AMASETHINGI"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Humusha noma ulalele umbhalo osesikrinini"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Imininingwane efana nombhalo esikrinini sakho, amakheli wewebhu, nezithombe-skrini kungabiwa ne-Google.\n\nUkuze ushintshe ukuthi yiluphi ulwazi olwabayo, yiya kokuthi "<b>"Amasethingi &gt; ama-App &gt; Ama-app azenzekelayo &gt; Umsizi we-app odijithali"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Khetha umsizi ukuze usebenzise lesi sakhi"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Ukuze ulalele noma uhumushe umbhalo kusikrini sakho, khetha i-app yomsizi odijithali kokuthi Amasethingi"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Shintsha umsizi wakho ukuze usebenzise lesi sakhi"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Ukuze ulalele noma uhumushe umbhalo kusikrini sakho, shintsha i-app yomsizi wakho odijithali kokuthi Amasethingi"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Thepha lapha ukuze ulalele umbhalo kusikrini"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Thepha lapha ukuze uhumushe umbhalo kulesi sikrini"</string>
 </resources>
-- 
GitLab


From e23157bbb02de64ac7e1cf751e33a59c912e906f Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Sat, 10 Jul 2021 00:12:15 -0700
Subject: [PATCH 1592/1664] End live tile for overview actions in Android Go

Fixes: 193275019
Test: N/A
Change-Id: I0c22e557face73f656273da4fec4521a9c86d606
---
 .../src/com/android/quickstep/TaskOverlayFactoryGo.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
index f3c7a026bd..fc07162227 100644
--- a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
+++ b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
@@ -243,7 +243,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
             @SuppressLint("NewApi")
             public void onListen() {
                 if (mIsAllowedByPolicy) {
-                    sendNIUIntent(ACTION_LISTEN);
+                    endLiveTileMode(() -> sendNIUIntent(ACTION_LISTEN));
                 } else {
                     showBlockedByPolicyMessage();
                 }
@@ -252,7 +252,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
             @SuppressLint("NewApi")
             public void onTranslate() {
                 if (mIsAllowedByPolicy) {
-                    sendNIUIntent(ACTION_TRANSLATE);
+                    endLiveTileMode(() -> sendNIUIntent(ACTION_TRANSLATE));
                 } else {
                     showBlockedByPolicyMessage();
                 }
@@ -261,7 +261,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
             @SuppressLint("NewApi")
             public void onSearch() {
                 if (mIsAllowedByPolicy) {
-                    sendNIUIntent(ACTION_SEARCH);
+                    endLiveTileMode(() -> sendNIUIntent(ACTION_SEARCH));
                 } else {
                     showBlockedByPolicyMessage();
                 }
-- 
GitLab


From 8766f649c722c5d98ddec21f41c3a299531cce74 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sat, 10 Jul 2021 23:40:55 +0000
Subject: [PATCH 1593/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Ic76c41ac95bc3b018c732775aad6355466292f6e
---
 go/quickstep/res/values-hi/strings.xml | 27 +++++++++-----------------
 go/quickstep/res/values-hr/strings.xml | 27 +++++++++-----------------
 go/quickstep/res/values-mn/strings.xml | 27 +++++++++-----------------
 3 files changed, 27 insertions(+), 54 deletions(-)

diff --git a/go/quickstep/res/values-hi/strings.xml b/go/quickstep/res/values-hi/strings.xml
index 4cc6236300..95a8dd8f02 100644
--- a/go/quickstep/res/values-hi/strings.xml
+++ b/go/quickstep/res/values-hi/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"सुनें"</string>
     <string name="action_translate" msgid="8028378961867277746">"अनुवाद करें"</string>
     <string name="action_search" msgid="6269564710943755464">"Google Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"ठीक है"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"रद्द करें"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"सेटिंग"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"स्क्रीन पर मौजूद टेक्स्ट का अनुवाद पाएं या उसे सुनें"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"आपकी स्क्रीन पर मौजूद टेक्स्ट, वेब पते, और स्क्रीनशॉट जैसी जानकारी Google के साथ शेयर की जा सकती है.\n\nआप Google के साथ किस जानकारी को शेयर करते हैं, इसे कंट्रोल करने के लिए "<b>"सेटिंग &gt; ऐप्लिकेशन &gt; डिफ़ॉल्ट ऐप्लिकेशन &gt; डिजिटल असिस्टेंट ऐप्लिकेशन"</b>" पर जाएं."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"इस सुविधा का इस्तेमाल करने के लिए, कोई डिजिटल असिस्टेंट ऐप्लिकेशन चुनें"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"स्क्रीन पर मौजूद टेक्स्ट का अनुवाद करने या उसे सुनने के लिए, \'सेटिंग\' में जाकर कोई डिजिटल असिस्टेंट ऐप्लिकेशन चुनें"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"इस सुविधा का इस्तेमाल करने के लिए, अपना डिजिटल असिस्टेंट ऐप्लिकेशन बदलें"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"स्क्रीन पर मौजूद टेक्स्ट का अनुवाद करने या उसे सुनने के लिए, \'सेटिंग\' में जाकर अपना डिजिटल असिस्टेंट ऐप्लिकेशन बदलें"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"स्क्रीन पर मौजूद टेक्स्ट को सुनने के लिए, यहां टैप करें"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"स्क्रीन पर मौजूद टेक्स्ट का अनुवाद करने के लिए, यहां टैप करें"</string>
 </resources>
diff --git a/go/quickstep/res/values-hr/strings.xml b/go/quickstep/res/values-hr/strings.xml
index dbe026691a..bef6b71775 100644
--- a/go/quickstep/res/values-hr/strings.xml
+++ b/go/quickstep/res/values-hr/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Slušajte"</string>
     <string name="action_translate" msgid="8028378961867277746">"Prevedi"</string>
     <string name="action_search" msgid="6269564710943755464">"Objektiv"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"SHVAĆAM"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ODUSTANI"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"POSTAVKE"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Prevedite ili slušajte tekst na zaslonu"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informacije kao što su tekst na vašem zaslonu, web-adrese i snimke zaslona mogu se dijeliti s Googleom.\n\nDa biste promijenili informacije koje dijelite, otvorite "<b>"Postavke &gt; Aplikacije &gt; Zadane aplikacije &gt; Aplikacija digitalnog asistenta"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Odaberite asistenta za upotrebu te značajke"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Da biste poslušali ili preveli tekst na zaslonu, odaberite aplikaciju digitalnog asistenta u postavkama"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Promijenite asistenta da biste koristili tu značajku"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Da biste poslušali ili preveli tekst na zaslonu, promijenite aplikaciju digitalnog asistenta u postavkama"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Dodirnite ovdje da biste poslušali tekst na ovom zaslonu"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Dodirnite ovdje da biste preveli tekst na ovom zaslonu"</string>
 </resources>
diff --git a/go/quickstep/res/values-mn/strings.xml b/go/quickstep/res/values-mn/strings.xml
index fd7ffcd329..cf20677db6 100644
--- a/go/quickstep/res/values-mn/strings.xml
+++ b/go/quickstep/res/values-mn/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Сонсох"</string>
     <string name="action_translate" msgid="8028378961867277746">"Орчуулах"</string>
     <string name="action_search" msgid="6269564710943755464">"Дуран"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"ОЙЛГОЛОО"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ЦУЦЛАХ"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"ТОХИРГОО"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Дэлгэц дээрх текстийг орчуулах эсвэл сонсох"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Таны дэлгэц дээрх текст, веб хаяг, дэлгэцийн агшин зэрэг мэдээллийг Google-тэй хуваалцаж болзошгүй.\n\nТа ямар мэдээлэл хуваалцахаа өөрчлөхийн тулд "<b>"Тохиргоо &gt; Апп &gt; Өгөгдмөл апп &gt; Дижитал туслах апп"</b>" руу очно уу."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Энэ онцлогийг ашиглахын тулд туслах сонгоно уу"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Дэлгэц дээрээ текст сонсох эсвэл орчуулахын тулд Тохиргоо хэсэгт дижитал туслах аппыг сонгоно уу"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Энэ онцлогийг ашиглахын тулд туслахаа өөрчилнө үү"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Дэлгэц дээрээ текст сонсох эсвэл орчуулахын тулд Тохиргоо хэсэгт дижитал туслах аппаа өөрчилнө үү"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Энэ дэлгэц дээр текст сонсохын тулд энд товшино уу"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Энэ дэлгэц дээр текст орчуулахын тулд энд товшино уу"</string>
 </resources>
-- 
GitLab


From 47288bfe0dc0baf8ffb5338dcc143eb2bc8968cf Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sun, 11 Jul 2021 20:40:07 +0000
Subject: [PATCH 1594/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Iffe4974f900e1fe5c7062f5ecb0ad3e322286cfa
---
 go/quickstep/res/values-si/strings.xml | 27 +++++++++-----------------
 go/quickstep/res/values-sk/strings.xml | 27 +++++++++-----------------
 go/quickstep/res/values-uz/strings.xml | 27 +++++++++-----------------
 3 files changed, 27 insertions(+), 54 deletions(-)

diff --git a/go/quickstep/res/values-si/strings.xml b/go/quickstep/res/values-si/strings.xml
index 9a18629f7f..cd6060ca0d 100644
--- a/go/quickstep/res/values-si/strings.xml
+++ b/go/quickstep/res/values-si/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"සවන් දෙන්න"</string>
     <string name="action_translate" msgid="8028378961867277746">"පරිවර්තනය කරන්න"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"තේරුණා"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"අවලංගු කරන්න"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"සැකසීම්"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"තිරය මත පෙළ පරිවර්තනය කරන්න හෝ එයට සවන් දෙන්න"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"ඔබගේ තිරයේ ඇති පෙළ, වෙබ් ලිපින සහ තිර රූ වැනි තොරතුරු Google සමඟ බෙදා ගත හැකිය.\n\nඔබ බෙදා ගන්නා තොරතුරු වෙනස් කිරීමට, "<b>"සැකසීම් &gt; යෙදුම් &gt; පෙරනිමි යෙදුම් &gt; ඩිජිටල් සහායක යෙදුම"</b>" වෙත යන්න."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"මෙම විශේෂාංගය භාවිත කිරීමට සහායකයකු තෝරන්න"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"ඔබගේ තිරයේ පෙළ සවන් දීමට හෝ පරිවර්තනය කිරීමට, සැකසීම්වල ඩිජිටල් සහායක යෙදුමක් තෝරන්න"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"මෙම විශේෂාංගය භාවිත කිරීමට ඔබගේ සහායක වෙනස් කරන්න"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"ඔබගේ තිරයේ පෙළට සවන් දීමට හෝ පරිවර්තනය කිරීමට, සැකසීම් තුළ ඔබගේ ඩිජිටල් සහායක යෙදුම වෙනස් කරන්න"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"මෙම තිරයේ පෙළට සවන් දීමට මෙහි තට්ටු කරන්න"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"මෙම තිරයේ පෙළ පරිවර්තනය කිරීමට මෙහි තට්ටු කරන්න"</string>
 </resources>
diff --git a/go/quickstep/res/values-sk/strings.xml b/go/quickstep/res/values-sk/strings.xml
index cea591a61e..880d8ad3f4 100644
--- a/go/quickstep/res/values-sk/strings.xml
+++ b/go/quickstep/res/values-sk/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Počúvať"</string>
     <string name="action_translate" msgid="8028378961867277746">"Preložiť"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"DOBRE"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ZRUŠIŤ"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"NASTAVENIA"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Prekladajte alebo počúvajte text na obrazovke"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Údaje, napríklad text na obrazovke, webové adresy a snímky obrazovky, môžu byť zdieľané s Googlom.\n\nAk chcete zmeniť, ktoré údaje zdieľate, prejdite do sekcie "<b>"Nastavenia &gt; Aplikácie &gt; Predvolené aplikácie &gt; Digitálny asistent"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Ak chcete používať túto funkciu, vyberte asistenta"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Ak si chcete vypočuť alebo nechať preložiť text na obrazovke, vyberte v Nastaveniach aplikáciu digitálneho asistenta"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Ak chcete použígvať túto funkciu, zmeňte svojho asistenta"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Ak si chcete vypočuť alebo nechať preložiť text na obrazovke, zmeňte v Nastaveniach aplikáciu digitálneho asistenta"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Klepnutím tu si vypočujte text na tejto obrazovke"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Klepnutím tu si nechajte preložiť text na tejto obrazovke"</string>
 </resources>
diff --git a/go/quickstep/res/values-uz/strings.xml b/go/quickstep/res/values-uz/strings.xml
index 3d71b56944..5228cfe5a2 100644
--- a/go/quickstep/res/values-uz/strings.xml
+++ b/go/quickstep/res/values-uz/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Tinglash"</string>
     <string name="action_translate" msgid="8028378961867277746">"Tarjima"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"OK"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"BEKOR QILISH"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"SOZLAMALAR"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Ekrandagi matnni tarjima qilish yoki tinglash"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Ekraningizdagi matn, veb-manzillar va skrinshot kabilar Googlega yuborilishi mumkin.\n\nQanday maʼlumotlarni ulashishni tanlash uchun "<b>"Sozlamalar &gt; Ilovalar &gt; Standart ilovalar &gt; Raqamli assistent"</b>" ilovasini oching."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Bu funksiyadan foydalanish uchun assistentni tanlang"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Ekrandagi matnni eshittirish yoki tarjima qilish uchun Sozlamalar orqali raqamli assistent ilovasini tanlang"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Bu funksiyadan foydalanish uchun assistentni almashtiring"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Ekrandagi matnni eshittirish yoki tarjima qilish uchun Sozlamalar orqali raqamli assistent ilovasini almashtiring"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Ekrandagi matnni eshittirish uchun bosing"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Ekrandagi matnni tarjima qilish uchun bosing"</string>
 </resources>
-- 
GitLab


From fbb82586a7cab14ce7a343a8a1e0762186628485 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Fri, 9 Jul 2021 17:45:19 +0100
Subject: [PATCH 1595/1664] Clear WidgetCell#mItem before recylcing a
 WidgetCell

This fixes a bug which reuses a previous widget item spans to
compute the preview size.

Fix: 193133048
Test: manual
Change-Id: I5459882e258dc010898854dbbe52a6fa8d84796c
(cherry picked from commit 3d27207ff6ff951add0a21b699761126d1af11ec)
---
 src/com/android/launcher3/widget/WidgetCell.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index c3edcce95a..6605509c89 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -177,6 +177,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
             mWidgetImageContainer.removeView(mAppWidgetHostViewPreview);
         }
         mAppWidgetHostViewPreview = null;
+        mItem = null;
     }
 
     public void setSourceContainer(int sourceContainer) {
-- 
GitLab


From 75bff774fc4566b4d79bf3194e938c8e1325375a Mon Sep 17 00:00:00 2001
From: Galia Peycheva <galinap@google.com>
Date: Mon, 12 Jul 2021 13:27:41 +0200
Subject: [PATCH 1596/1664] Adjust usages of cross-window blur to new radius

Bug: 192241610
Test: m
Change-Id: Ibe9c25192f80c8bc19e8e79e39c7f3c3615e4f4d
---
 quickstep/res/values/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/res/values/config.xml b/quickstep/res/values/config.xml
index f22a9d7dbe..d67b23be0a 100644
--- a/quickstep/res/values/config.xml
+++ b/quickstep/res/values/config.xml
@@ -37,5 +37,5 @@
 
     <string name="wellbeing_provider_pkg" translatable="false"/>
 
-    <integer name="max_depth_blur_radius">72</integer>
+    <integer name="max_depth_blur_radius">23</integer>
 </resources>
-- 
GitLab


From dfa2752d28c1bf0f6847a90ae1bd5238cf6f2fb3 Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Fri, 9 Jul 2021 15:25:11 +0100
Subject: [PATCH 1597/1664] Add accessibility announcement when user clicks on
 'Add automatically to home screen' button

Test: Tested manually with talkback on
Bug: 192808036
Bug: 192811245
Change-Id: I1c02738e0e4755b3bbdde12dad96ac2ed1996e6c
---
 res/layout/add_item_confirmation_activity.xml |  3 +-
 res/values/strings.xml                        |  3 ++
 .../launcher3/dragndrop/AddItemActivity.java  | 31 +++++++++++++++++--
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/res/layout/add_item_confirmation_activity.xml b/res/layout/add_item_confirmation_activity.xml
index 1aeda50c5e..0e066908d0 100644
--- a/res/layout/add_item_confirmation_activity.xml
+++ b/res/layout/add_item_confirmation_activity.xml
@@ -62,8 +62,7 @@
                 android:text="@string/add_item_request_drag_hint"
                 android:textSize="14sp"
                 android:textColor="?android:attr/textColorSecondary"
-                android:alpha="0.7"
-                android:importantForAccessibility="no"/>
+                android:alpha="0.7"/>
 
             <include layout="@layout/widget_cell"
                 android:id="@+id/widget_cell"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ddd838dbf9..d1774e5a03 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -63,6 +63,9 @@
     <string name="add_item_request_drag_hint">Touch &amp; hold the widget to move it around the Home screen</string>
     <!-- Button label to automatically add a widget to home screen [CHAR_LIMIT=50] -->
     <string name="add_to_home_screen">Add to Home screen</string>
+    <!-- Accessibility spoken message announced when a widget gets added to the home screen using a
+         button in a dialog. [CHAR_LIMIT=none] -->
+    <string name="added_to_home_screen_accessibility_text"><xliff:g id="widget_name" example="Calendar month view">%1$s</xliff:g> widget added to home screen</string>
     <!-- Label for showing the number of widgets an app has in the full widgets picker.
          [CHAR_LIMIT=25] -->
     <plurals name="widgets_count">
diff --git a/src/com/android/launcher3/dragndrop/AddItemActivity.java b/src/com/android/launcher3/dragndrop/AddItemActivity.java
index df97bfbbda..905a701617 100644
--- a/src/com/android/launcher3/dragndrop/AddItemActivity.java
+++ b/src/com/android/launcher3/dragndrop/AddItemActivity.java
@@ -27,10 +27,12 @@ import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
 import android.annotation.TargetApi;
 import android.app.ActivityOptions;
 import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProviderInfo;
 import android.content.ClipData;
 import android.content.ClipDescription;
 import android.content.Intent;
 import android.content.pm.LauncherApps.PinItemRequest;
+import android.content.pm.ShortcutInfo;
 import android.content.res.Configuration;
 import android.graphics.Canvas;
 import android.graphics.Point;
@@ -39,12 +41,15 @@ import android.graphics.Rect;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.DragShadowBuilder;
 import android.view.View.OnLongClickListener;
 import android.view.View.OnTouchListener;
 import android.view.WindowManager;
+import android.view.accessibility.AccessibilityEvent;
+import android.view.accessibility.AccessibilityManager;
 import android.widget.TextView;
 
 import com.android.launcher3.BaseActivity;
@@ -92,6 +97,7 @@ public class AddItemActivity extends BaseActivity
     private InvariantDeviceProfile mIdp;
     private BaseDragLayer<AddItemActivity> mDragLayer;
     private AddItemWidgetsBottomSheet mSlideInView;
+    private AccessibilityManager mAccessibilityManager;
 
     private WidgetCell mWidgetCell;
 
@@ -127,6 +133,8 @@ public class AddItemActivity extends BaseActivity
         mDragLayer = findViewById(R.id.add_item_drag_layer);
         mDragLayer.recreateControllers();
         mWidgetCell = findViewById(R.id.widget_cell);
+        mAccessibilityManager =
+                getApplicationContext().getSystemService(AccessibilityManager.class);
 
         if (mRequest.getRequestType() == PinItemRequest.REQUEST_TYPE_SHORTCUT) {
             setupShortcut();
@@ -291,17 +299,25 @@ public class AddItemActivity extends BaseActivity
      */
     public void onPlaceAutomaticallyClick(View v) {
         if (mRequest.getRequestType() == PinItemRequest.REQUEST_TYPE_SHORTCUT) {
-            ItemInstallQueue.INSTANCE.get(this).queueItem(mRequest.getShortcutInfo());
+            ShortcutInfo shortcutInfo = mRequest.getShortcutInfo();
+            ItemInstallQueue.INSTANCE.get(this).queueItem(shortcutInfo);
             logCommand(LAUNCHER_ADD_EXTERNAL_ITEM_PLACED_AUTOMATICALLY);
             mRequest.accept();
+            CharSequence label = shortcutInfo.getLongLabel();
+            if (TextUtils.isEmpty(label)) {
+                label = shortcutInfo.getShortLabel();
+            }
+            sendWidgetAddedToScreenAccessibilityEvent(label.toString());
             mSlideInView.close(/* animate= */ true);
             return;
         }
 
         mPendingBindWidgetId = mAppWidgetHost.allocateAppWidgetId();
+        AppWidgetProviderInfo widgetProviderInfo = mRequest.getAppWidgetProviderInfo(this);
         boolean success = mAppWidgetManager.bindAppWidgetIdIfAllowed(
-                mPendingBindWidgetId, mRequest.getAppWidgetProviderInfo(this), mWidgetOptions);
+                mPendingBindWidgetId, widgetProviderInfo, mWidgetOptions);
         if (success) {
+            sendWidgetAddedToScreenAccessibilityEvent(widgetProviderInfo.label);
             acceptWidget(mPendingBindWidgetId);
             return;
         }
@@ -375,6 +391,17 @@ public class AddItemActivity extends BaseActivity
                 isSheetDark ? SystemUiController.FLAG_DARK_NAV : SystemUiController.FLAG_LIGHT_NAV);
     }
 
+    private void sendWidgetAddedToScreenAccessibilityEvent(String widgetName) {
+        if (mAccessibilityManager.isEnabled()) {
+            AccessibilityEvent event =
+                    AccessibilityEvent.obtain(AccessibilityEvent.TYPE_ANNOUNCEMENT);
+            event.setContentDescription(
+                    getApplicationContext().getResources().getString(
+                            R.string.added_to_home_screen_accessibility_text, widgetName));
+            mAccessibilityManager.sendAccessibilityEvent(event);
+        }
+    }
+
     private void logCommand(StatsLogManager.EventEnum command) {
         getStatsLogManager().logger()
                 .withItemInfo((ItemInfo) mWidgetCell.getWidgetView().getTag())
-- 
GitLab


From 8bf8ba735a91efb92e3dfb676305a4773098ccc3 Mon Sep 17 00:00:00 2001
From: Jon Spivack <spivack@google.com>
Date: Fri, 9 Jul 2021 15:06:12 -0700
Subject: [PATCH 1598/1664] NIU Actions: Add assistant error dialogs

The NIU Actions buttons send intents to the user's default assistant. If the user clicks one of the buttons without an appropriate default assistant set, a dialog will appear to explain the situation and redirect the user to Settings.

The existing privacy confirmation dialog code has been refactored into a reusable dialog, which is used here.

Bug: 192505939
Test: Manual on local Pixel 3A (unit tests to be added in b/192406446)
Test: m -j RunLauncherGoGoogleRoboTests
Change-Id: I7b43e008aa74805b166c09936fa938a5834c8460
---
 ...tion_dialog.xml => niu_actions_dialog.xml} |  35 +++--
 go/quickstep/res/values-land/dimens.xml       |   2 +-
 go/quickstep/res/values/dimens.xml            |   2 +-
 .../quickstep/TaskOverlayFactoryGo.java       | 145 ++++++++++++++----
 4 files changed, 143 insertions(+), 41 deletions(-)
 rename go/quickstep/res/layout/{niu_actions_confirmation_dialog.xml => niu_actions_dialog.xml} (72%)

diff --git a/go/quickstep/res/layout/niu_actions_confirmation_dialog.xml b/go/quickstep/res/layout/niu_actions_dialog.xml
similarity index 72%
rename from go/quickstep/res/layout/niu_actions_confirmation_dialog.xml
rename to go/quickstep/res/layout/niu_actions_dialog.xml
index 5dbcca5a45..6e944f8812 100644
--- a/go/quickstep/res/layout/niu_actions_confirmation_dialog.xml
+++ b/go/quickstep/res/layout/niu_actions_dialog.xml
@@ -16,7 +16,8 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/niu_actions_confirmation_dialog_layout"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/niu_actions_dialog_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="horizontal"
@@ -41,29 +42,37 @@
 
         <TextView
             style="@style/ModalDialogTitle"
-            android:id="@+id/niu_actions_confirmation_header"
-            android:text="@string/niu_actions_confirmation_title"/>
+            android:id="@+id/niu_actions_dialog_header"/>
 
         <Space
             android:layout_width="0dp"
             android:layout_height="@dimen/modal_dialog_vertical_spacer"/>
 
-        <ScrollView
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="@dimen/confirmation_dialog_text_height">
+            android:layout_height="wrap_content">
+
+            <ScrollView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constrainedHeight="true"
+                app:layout_constraintHeight_max="@dimen/modal_dialog_text_height">
+
+                <TextView
+                    style="@style/ModalDialogText"
+                    android:id="@+id/niu_actions_dialog_description"/>
+            </ScrollView>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-            <TextView
-                style="@style/ModalDialogText"
-                android:id="@+id/niu_actions_confirmation_description"
-                android:text="@string/niu_actions_confirmation_text"/>
-        </ScrollView>
 
         <Space
             android:layout_width="0dp"
             android:layout_height="@dimen/modal_dialog_vertical_spacer"/>
 
         <LinearLayout
-            android:id="@+id/niu_actions_confirmation_buttons"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="horizontal">
@@ -75,12 +84,12 @@
 
             <Button
                 style="@style/ModalDialogButton"
-                android:id="@+id/niu_actions_confirmation_reject"
+                android:id="@+id/niu_actions_dialog_button_1"
                 android:text="@string/dialog_cancel"/>
 
             <Button
                 style="@style/ModalDialogButton"
-                android:id="@+id/niu_actions_confirmation_accept"
+                android:id="@+id/niu_actions_dialog_button_2"
                 android:text="@string/dialog_acknowledge"/>
         </LinearLayout>
 
diff --git a/go/quickstep/res/values-land/dimens.xml b/go/quickstep/res/values-land/dimens.xml
index 50970162cd..6b5d0b469b 100644
--- a/go/quickstep/res/values-land/dimens.xml
+++ b/go/quickstep/res/values-land/dimens.xml
@@ -18,5 +18,5 @@
 <resources>
     <!-- Modal Dialogs -->
     <dimen name="modal_dialog_width">360dp</dimen>
-    <dimen name="confirmation_dialog_text_height">168dp</dimen>
+    <dimen name="modal_dialog_text_height">168dp</dimen>
 </resources>
diff --git a/go/quickstep/res/values/dimens.xml b/go/quickstep/res/values/dimens.xml
index c14df508b7..84d7fe5824 100644
--- a/go/quickstep/res/values/dimens.xml
+++ b/go/quickstep/res/values/dimens.xml
@@ -35,7 +35,7 @@
     <dimen name="modal_dialog_padding_bottom">8dp</dimen>
     <dimen name="modal_dialog_vertical_spacer">12dp</dimen>
     <dimen name="modal_dialog_corner_radius">8dp</dimen>
-    <dimen name="confirmation_dialog_text_height">216dp</dimen>
+    <dimen name="modal_dialog_text_height">216dp</dimen>
 
     <!-- Tooltip -->
     <dimen name="tooltip_corner_radius">8dp</dimen>
diff --git a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
index f3c7a026bd..01aafa4a9d 100644
--- a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
+++ b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
@@ -21,6 +21,8 @@ import static android.view.Surface.ROTATION_0;
 import static com.android.quickstep.views.OverviewActionsView.DISABLED_NO_THUMBNAIL;
 import static com.android.quickstep.views.OverviewActionsView.DISABLED_ROTATED;
 
+import static java.lang.annotation.RetentionPolicy.SOURCE;
+
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.app.assist.AssistContent;
@@ -32,6 +34,7 @@ import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.graphics.Matrix;
 import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
 import android.os.Handler;
 import android.os.SystemClock;
 import android.os.UserManager;
@@ -41,7 +44,9 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
+import android.widget.TextView;
 
+import androidx.annotation.IntDef;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.launcher3.BaseActivity;
@@ -55,6 +60,8 @@ import com.android.quickstep.views.TaskThumbnailView;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.recents.model.ThumbnailData;
 
+import java.lang.annotation.Retention;
+
 /**
  * Go-specific extension of the factory class that adds an overlay to TaskView
  */
@@ -69,11 +76,21 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
     public static final int ERROR_PERMISSIONS_STRUCTURE = 1;
     public static final int ERROR_PERMISSIONS_SCREENSHOT = 2;
     private static final String NIU_ACTIONS_CONFIRMED = "launcher_go.niu_actions_confirmed";
+    private static final String ASSIST_SETTINGS_ARGS_BUNDLE = ":settings:show_fragment_args";
+    private static final String ASSIST_SETTINGS_ARGS_KEY = ":settings:fragment_args_key";
+    private static final String ASSIST_SETTINGS_PREFERENCE_KEY = "default_assist";
     private static final String TAG = "TaskOverlayFactoryGo";
 
     public static final String LISTEN_TOOL_TIP_SEEN = "launcher.go_listen_tip_seen";
     public static final String TRANSLATE_TOOL_TIP_SEEN = "launcher.go_translate_tip_seen";
 
+    @Retention(SOURCE)
+    @IntDef({PRIVACY_CONFIRMATION, ASSISTANT_NOT_SELECTED, ASSISTANT_NOT_SUPPORTED})
+    private @interface DialogType{}
+    private static final int PRIVACY_CONFIRMATION = 0;
+    private static final int ASSISTANT_NOT_SELECTED = 1;
+    private static final int ASSISTANT_NOT_SUPPORTED = 2;
+
     private AssistContentRequester mContentRequester;
 
     public TaskOverlayFactoryGo(Context context) {
@@ -99,8 +116,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
         private boolean mAssistScreenshotPermitted;
         private AssistContentRequester mFactoryContentRequester;
         private SharedPreferences mSharedPreferences;
-        private String mPreviousAction;
-        private AlertDialog mConfirmationDialog;
+        private OverlayDialogGo mDialog;
 
         private TaskOverlayGo(TaskThumbnailView taskThumbnailView,
                 AssistContentRequester assistContentRequester) {
@@ -115,15 +131,14 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
         @Override
         public void initOverlay(Task task, ThumbnailData thumbnail, Matrix matrix,
                 boolean rotated) {
-            if (mConfirmationDialog != null && mConfirmationDialog.isShowing()) {
+            if (mDialog != null && mDialog.isShowing()) {
                 // Redraw the dialog in case the layout changed
-                mConfirmationDialog.dismiss();
-                showConfirmationDialog();
+                mDialog.dismiss();
+                showDialog(mDialog.getAction(), mDialog.getType());
             }
 
             getActionsView().updateDisabledFlags(DISABLED_NO_THUMBNAIL, thumbnail == null);
-            checkSettings();
-            if (thumbnail == null || TextUtils.isEmpty(mNIUPackageName)) {
+            if (thumbnail == null) {
                 return;
             }
 
@@ -135,8 +150,10 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
             getActionsView().setCallbacks(new OverlayUICallbacksGoImpl(isAllowedByPolicy, task));
             mTaskPackageName = task.key.getPackageName();
             mSharedPreferences = Utilities.getPrefs(mApplicationContext);
+            checkSettings();
 
-            if (!mAssistStructurePermitted || !mAssistScreenshotPermitted) {
+            if (!mAssistStructurePermitted || !mAssistScreenshotPermitted
+                    || TextUtils.isEmpty(mNIUPackageName)) {
                 return;
             }
 
@@ -179,9 +196,13 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
          * Creates and sends an Intent corresponding to the button that was clicked
          */
         private void sendNIUIntent(String actionType) {
+            if (TextUtils.isEmpty(mNIUPackageName)) {
+                showDialog(actionType, ASSISTANT_NOT_SELECTED);
+                return;
+            }
+
             if (!mSharedPreferences.getBoolean(NIU_ACTIONS_CONFIRMED, false)) {
-                mPreviousAction = actionType;
-                showConfirmationDialog();
+                showDialog(actionType, PRIVACY_CONFIRMATION);
                 return;
             }
 
@@ -199,6 +220,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
                     mApplicationContext.startActivity(intent);
                 } catch (ActivityNotFoundException e) {
                     Log.e(TAG, "No activity found to receive permission error intent");
+                    showDialog(actionType, ASSISTANT_NOT_SUPPORTED);
                 }
             }
         }
@@ -273,33 +295,86 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
             mImageApi = imageActionsApi;
         }
 
-        private void showConfirmationDialog() {
+        // TODO (b/192406446): Test that these dialogs are shown at the appropriate times
+        private void showDialog(String action, @DialogType int type) {
+            switch (type) {
+                case PRIVACY_CONFIRMATION:
+                    showDialog(action, PRIVACY_CONFIRMATION,
+                            R.string.niu_actions_confirmation_title,
+                            R.string.niu_actions_confirmation_text, R.string.dialog_cancel,
+                            this::onDialogClickCancel, R.string.dialog_acknowledge,
+                            this::onNiuActionsConfirmationAccept);
+                    break;
+                case ASSISTANT_NOT_SELECTED:
+                    showDialog(action, ASSISTANT_NOT_SELECTED,
+                            R.string.assistant_not_selected_title,
+                            R.string.assistant_not_selected_text, R.string.dialog_cancel,
+                            this::onDialogClickCancel, R.string.dialog_settings,
+                            this::onDialogClickSettings);
+                    break;
+                case ASSISTANT_NOT_SUPPORTED:
+                    showDialog(action, ASSISTANT_NOT_SUPPORTED,
+                            R.string.assistant_not_supported_title,
+                            R.string.assistant_not_supported_text, R.string.dialog_cancel,
+                            this::onDialogClickCancel, R.string.dialog_settings,
+                            this::onDialogClickSettings);
+                    break;
+                default:
+                    Log.e(TAG, "Unexpected dialog type");
+            }
+        }
+
+        private void showDialog(String action, @DialogType int type, int titleTextID,
+                                int bodyTextID, int button1TextID,
+                                View.OnClickListener button1Callback, int button2TextID,
+                                View.OnClickListener button2Callback) {
             BaseDraggingActivity activity = BaseActivity.fromContext(getActionsView().getContext());
             LayoutInflater inflater = LayoutInflater.from(activity);
-            View view = inflater.inflate(R.layout.niu_actions_confirmation_dialog, /* root */ null);
+            View view = inflater.inflate(R.layout.niu_actions_dialog, /* root */ null);
+
+            TextView dialogTitle = view.findViewById(R.id.niu_actions_dialog_header);
+            dialogTitle.setText(titleTextID);
+
+            TextView dialogBody = view.findViewById(R.id.niu_actions_dialog_description);
+            dialogBody.setText(bodyTextID);
 
-            Button acceptButton = view.findViewById(R.id.niu_actions_confirmation_accept);
-            acceptButton.setOnClickListener(this::onNiuActionsConfirmationAccept);
+            Button button1 = view.findViewById(R.id.niu_actions_dialog_button_1);
+            button1.setText(button1TextID);
+            button1.setOnClickListener(button1Callback);
 
-            Button rejectButton = view.findViewById(R.id.niu_actions_confirmation_reject);
-            rejectButton.setOnClickListener(this::onNiuActionsConfirmationReject);
+            Button button2 = view.findViewById(R.id.niu_actions_dialog_button_2);
+            button2.setText(button2TextID);
+            button2.setOnClickListener(button2Callback);
 
-            mConfirmationDialog = new AlertDialog.Builder(activity)
-                    .setView(view)
-                    .create();
-            mConfirmationDialog.getWindow()
-                    .setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-            mConfirmationDialog.show();
+            mDialog = new OverlayDialogGo(activity, type, action);
+            mDialog.setView(view);
+            mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+            mDialog.show();
         }
 
         private void onNiuActionsConfirmationAccept(View v) {
-            mConfirmationDialog.dismiss();
+            mDialog.dismiss();
             mSharedPreferences.edit().putBoolean(NIU_ACTIONS_CONFIRMED, true).apply();
-            sendNIUIntent(mPreviousAction);
+            sendNIUIntent(mDialog.getAction());
         }
 
-        private void onNiuActionsConfirmationReject(View v) {
-            mConfirmationDialog.cancel();
+        private void onDialogClickCancel(View v) {
+            mDialog.cancel();
+        }
+
+        private void onDialogClickSettings(View v) {
+            mDialog.dismiss();
+
+            Bundle fragmentArgs = new Bundle();
+            fragmentArgs.putString(ASSIST_SETTINGS_ARGS_KEY, ASSIST_SETTINGS_PREFERENCE_KEY);
+            Intent intent = new Intent(Settings.ACTION_VOICE_INPUT_SETTINGS)
+                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
+                    .putExtra(ASSIST_SETTINGS_ARGS_BUNDLE, fragmentArgs);
+            try {
+                mApplicationContext.startActivity(intent);
+            } catch (ActivityNotFoundException e) {
+                Log.e(TAG, "No activity found to receive assistant settings intent");
+            }
         }
 
         /**
@@ -317,6 +392,24 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
         }
     }
 
+    private static final class OverlayDialogGo extends AlertDialog {
+        private final String mAction;
+        private final @DialogType int mType;
+
+        OverlayDialogGo(Context context, @DialogType int type, String action) {
+            super(context);
+            mType = type;
+            mAction = action;
+        }
+
+        public String getAction() {
+            return mAction;
+        }
+        public @DialogType int getType() {
+            return mType;
+        }
+    }
+
     /**
      * Callbacks the Ui can generate. This is the only way for a Ui to call methods on the
      * controller.
-- 
GitLab


From 2ad8a3140235182d778e9b476bd22919b64eb78f Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Tue, 13 Jul 2021 07:23:22 +0000
Subject: [PATCH 1599/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I4b7ebce75701bfc23b7c65ed6d03eed16c94f26d
---
 go/quickstep/res/values-ar/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-az/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-b+sr+Latn/strings.xml | 27 +++++++------------
 go/quickstep/res/values-be/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-bg/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-ca/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-cs/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-da/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-es-rUS/strings.xml    | 27 +++++++------------
 go/quickstep/res/values-es/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-et/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-eu/strings.xml        |  2 +-
 go/quickstep/res/values-fa/strings.xml        |  4 +--
 go/quickstep/res/values-fi/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-fr-rCA/strings.xml    | 27 +++++++------------
 go/quickstep/res/values-hu/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-hy/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-is/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-iw/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-ja/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-ka/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-kk/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-ko/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-ky/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-lt/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-lv/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-mk/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-my/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-nb/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-nl/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-pl/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-pt/strings.xml        |  2 +-
 go/quickstep/res/values-ro/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-ru/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-sl/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-sr/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-sv/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-sw/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-ta/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-th/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-tl/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-tr/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-uk/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-vi/strings.xml        | 27 +++++++------------
 go/quickstep/res/values-zh-rCN/strings.xml    | 27 +++++++------------
 go/quickstep/res/values-zh-rTW/strings.xml    | 27 +++++++------------
 46 files changed, 391 insertions(+), 778 deletions(-)

diff --git a/go/quickstep/res/values-ar/strings.xml b/go/quickstep/res/values-ar/strings.xml
index 3f6e369e16..bbe35f5a5f 100644
--- a/go/quickstep/res/values-ar/strings.xml
+++ b/go/quickstep/res/values-ar/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"استماع"</string>
     <string name="action_translate" msgid="8028378961867277746">"‏ترجمة Google"</string>
     <string name="action_search" msgid="6269564710943755464">"‏عدسة Google"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"حسنًا"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"إلغاء"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"الإعدادات"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"ترجمة النص الظاهر على الشاشة أو الاستماع إليه"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"‏قد تتم مشاركة معلومات مثل النص الظاهر على الشاشة وعناوين الويب ولقطات الشاشة مع Google.\n\nلتغيير المعلومات التي تتم مشاركتها، انتقِل إلى "<b>"الإعدادات &gt; التطبيقات &gt; التطبيقات التلقائية &gt; تطبيق المساعد الرقمي"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"اختيار مساعد لاستخدام هذه الميزة"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"للاستماع للنص الظاهر على الشاشة أو ترجمته، اختَر تطبيق مساعد رقمي في الإعدادات."</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"تغيير المساعد لاستخدام هذه الميزة"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"للاستماع للنص الظاهر على الشاشة أو ترجمته، عليك تغيير تطبيق المساعد الرقمي في الإعدادات."</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"انقر هنا للاستماع للنص الظاهر على هذه الشاشة."</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"انقر هنا لترجمة النص الظاهر على هذه الشاشة."</string>
 </resources>
diff --git a/go/quickstep/res/values-az/strings.xml b/go/quickstep/res/values-az/strings.xml
index 1914c3b6e3..f097ad322b 100644
--- a/go/quickstep/res/values-az/strings.xml
+++ b/go/quickstep/res/values-az/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Dinləyin"</string>
     <string name="action_translate" msgid="8028378961867277746">"Tərcümə"</string>
     <string name="action_search" msgid="6269564710943755464">"Linza"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"ANLADIM"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"LƏĞV EDİN"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"AYARLAR"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Ekrandakı mətni tərcümə edin və ya dinləyin"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Ekrandakı mətn, veb ünvanlar və ekran görüntüləri kimi məlumatlar Google ilə paylaşıla bilər.\n\nHansı məlumatların paylaşılmasını dəyişmək üçün "<b>"Ayarlar &gt; Tətbiqlər &gt; Defolt tətbiqlər &gt; Rəqəmsal assistent tətbiqi"</b>" bölməsinə keçin."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Bu funksiyadan istifadə etmək üçün assistenti seçin"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Ekrandakı mətni dinləmək və ya tərcümə etmək üçün Ayarlarda rəqəmsal assistent tətbiqini seçin"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Bu funksiyadan istifadə etmək üçün assistenti dəyişin"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Ekrandakı mətni dinləmək və ya tərcümə etmək üçün Ayarlarda rəqəmsal assistent tətbiqini dəyişin"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Bu ekrandakı mətni dinləmək üçün buraya toxunun"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Bu ekrandakı mətni tərcümə etmək üçün buraya toxunun"</string>
 </resources>
diff --git a/go/quickstep/res/values-b+sr+Latn/strings.xml b/go/quickstep/res/values-b+sr+Latn/strings.xml
index fc574c8676..8663c8171d 100644
--- a/go/quickstep/res/values-b+sr+Latn/strings.xml
+++ b/go/quickstep/res/values-b+sr+Latn/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Pusti"</string>
     <string name="action_translate" msgid="8028378961867277746">"Prevedi"</string>
     <string name="action_search" msgid="6269564710943755464">"Objektiv"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"VAŽI"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"OTKAŽI"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"PODEŠAVANJA"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Prevodite ili slušajte tekst na ekranu"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informacije poput teksta na ekranu, veb-adresa i snimaka ekrana mogu da se dele sa Google-om.\n\nDa biste promenili informacije koje delite, idite u "<b>"Podešavanja &gt; Aplikacije &gt; Podrazumevane aplikacije &gt; Aplikacija digitalnog pomoćnika"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Odaberite pomoćnika da biste koristili ovu funkciju"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Da biste čuli tekst sa ekrana ili ga preveli, odaberite aplikaciju digitalnog pomoćnika u Podešavanjima"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Promenite pomoćnika da biste koristili ovu funkciju"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Da biste čuli tekst sa ekrana ili ga preveli, promenite aplikaciju digitalnog pomoćnika u Podešavanjima"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Dodirnite ovde da biste čuli tekst sa ovog ekrana"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Dodirnite ovde da biste preveli tekst sa ovog ekrana"</string>
 </resources>
diff --git a/go/quickstep/res/values-be/strings.xml b/go/quickstep/res/values-be/strings.xml
index e7bfec61de..d4600cc0e6 100644
--- a/go/quickstep/res/values-be/strings.xml
+++ b/go/quickstep/res/values-be/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Праслухаць"</string>
     <string name="action_translate" msgid="8028378961867277746">"Перакласці"</string>
     <string name="action_search" msgid="6269564710943755464">"Аб\'ектыў"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"ЗРАЗУМЕЛА"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"СКАСАВАЦЬ"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"НАЛАДЫ"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Перакласці ці праслухаць тэкст на экране"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Такая інфармацыя з вашага экрана, як тэксты, вэб-адрасы і здымкі экрана, можа абагульвацца з Google.\n\nКаб змяніць тып інфармацыі для абагульвання, адкрыйце "<b>"Налады &gt; Праграмы &gt; Стандартныя праграмы &gt; Лічбавы памочнік"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Для карыстання гэтай функцыяй выберыце памочніка"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Каб праслухаць або перакласці тэкст на экране, выберыце ў Наладах лічбавага памочніка"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Для карыстання гэтай функцыяй змяніце памочніка"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Каб праслухаць ці перакласці тэкст на экране, змяніце ў Наладах лічбавага памочніка"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Націсніце тут, каб праслухаць тэкст на экране"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Націсніце тут, каб перакласці тэкст на экране"</string>
 </resources>
diff --git a/go/quickstep/res/values-bg/strings.xml b/go/quickstep/res/values-bg/strings.xml
index 6b2a5f2e2e..3741646f7c 100644
--- a/go/quickstep/res/values-bg/strings.xml
+++ b/go/quickstep/res/values-bg/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Слушане"</string>
     <string name="action_translate" msgid="8028378961867277746">"Превод"</string>
     <string name="action_search" msgid="6269564710943755464">"Обектив"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"РАЗБРАХ"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ОТКАЗ"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"НАСТРОЙКИ"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Превеждане или четене на текста на екрана"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Определена информация може да бъде споделена с Google, като например текстът на екрана ви, уеб адресите и екранните снимки.\n\nЗа да промените информацията, която споделяте, отворете "<b>"„Настройки“ &gt; „Приложения“ &gt; „Приложения по подразбиране“ &gt; „Приложение за дигитален асистент“"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Изберете приложение за асистент, за да използвате тази функция"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"За да слушате или превеждате текст на екрана си, от настройките изберете приложение за дигитален асистент"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Изберете приложение за асистент, за да използвате тази функция"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"За да слушате или превеждате текст на екрана си, от настройките променете приложението си за дигитален асистент"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Докоснете тук, за да слушате текста на този екран"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Докоснете тук, за да преведете текста на този екран"</string>
 </resources>
diff --git a/go/quickstep/res/values-ca/strings.xml b/go/quickstep/res/values-ca/strings.xml
index cb633d7969..212df2871d 100644
--- a/go/quickstep/res/values-ca/strings.xml
+++ b/go/quickstep/res/values-ca/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Escolta"</string>
     <string name="action_translate" msgid="8028378961867277746">"Tradueix"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"ENTESOS"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"CANCEL·LA"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"CONFIGURACIÓ"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Tradueix o escolta el text en pantalla"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"És possible que determinada informació es comparteixi amb Google, com ara el text en pantalla, les adreces web i les captures de pantalla.\n\nPer canviar quina informació comparteixes, ves a "<b>"Configuració &gt; Aplicacions &gt; Aplicacions predeterminades &gt; Aplicació de l\'assistent digital"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Tria un assistent per utilitzar aquesta funció"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Per escoltar o traduir text en pantalla, tria una aplicació d\'assistent digital a Configuració"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Canvia l\'assistent per utilitzar aquesta funció"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Per escoltar o traduir text en pantalla, canvia l\'aplicació d\'assistent digital a Configuració"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Toca aquí per escoltar text en pantalla"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Toca aquí per traduir text en pantalla"</string>
 </resources>
diff --git a/go/quickstep/res/values-cs/strings.xml b/go/quickstep/res/values-cs/strings.xml
index 9f6906068f..886b5c2e88 100644
--- a/go/quickstep/res/values-cs/strings.xml
+++ b/go/quickstep/res/values-cs/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Poslechnout"</string>
     <string name="action_translate" msgid="8028378961867277746">"Přeložit"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"ROZUMÍM"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ZRUŠIT"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"NASTAVENÍ"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Překládejte nebo poslouchejte text na obrazovce"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"S Googlem mohou být sdílena data, jako je text na obrazovce, webové adresy a snímky obrazovky.\n\nSdílená data můžete upřesnit v "<b>"Nastavení &gt; Aplikace &gt; Výchozí aplikace &gt; Aplikace digitálního asistenta"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Pokud chcete použít tuto funkci, vyberte asistenta"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Pokud si chcete poslechnout nebo přeložit text na obrazovce, v Nastavení vyberte aplikaci digitálního asistenta"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Pokud chcete použít tuto funkci, změňte asistenta"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Pokud si chcete poslechnout nebo přeložit text na obrazovce, v Nastavení změňte aplikaci digitálního asistenta"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Klepnutím sem si poslechnete text na této obrazovce"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Klepnutím sem přeložíte text na této obrazovce"</string>
 </resources>
diff --git a/go/quickstep/res/values-da/strings.xml b/go/quickstep/res/values-da/strings.xml
index 973c32014d..2bc179c316 100644
--- a/go/quickstep/res/values-da/strings.xml
+++ b/go/quickstep/res/values-da/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Lyt"</string>
     <string name="action_translate" msgid="8028378961867277746">"Oversæt"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"OK"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ANNULLER"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"INDSTILLINGER"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Oversæt eller hør tekst på skærmen"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Oplysninger såsom tekst på din skærm, webadresser og screenshots deles muligvis med Google.\n\nHvis du vil ændre, hvilke oplysninger du deler, kan du gå til "<b>"Indstillinger &gt; Apps &gt; Standardapps &gt; App for digital assistent"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Vælg en assistent for at bruge denne funktion"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Hvis du vil høre eller oversætte tekst på din skærm, skal du vælge en digital assistent i Indstillinger"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Skift assistent for at bruge denne funktion"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Hvis du vil høre eller oversætte tekst på din skærm, skal du ændre din digitale assistent i Indstillinger"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Tryk her for at høre teksten på denne skærm"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Tryk her for at oversætte teksten på denne skærm"</string>
 </resources>
diff --git a/go/quickstep/res/values-es-rUS/strings.xml b/go/quickstep/res/values-es-rUS/strings.xml
index e9762ddf11..cde1cd7345 100644
--- a/go/quickstep/res/values-es-rUS/strings.xml
+++ b/go/quickstep/res/values-es-rUS/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Escuchar"</string>
     <string name="action_translate" msgid="8028378961867277746">"Traducir"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"ENTENDIDO"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"CANCELAR"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"CONFIGURACIÓN"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Traduce o escucha el texto que aparece en la pantalla"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Es posible que se comparta información con Google, como el texto de la pantalla, direcciones web y capturas de pantalla.\n\nPara cambiar la información que se comparte, ve a "<b>"Configuración &gt; Apps &gt; Apps predeterminadas &gt; App de asistente digital"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Elige un asistente para usar esta función"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Para escuchar o traducir texto en la pantalla, elige una app de asistente digital en Configuración"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Cambia el asistente para usar esta función"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Para escuchar o traducir texto en la pantalla, cambia la app de asistente digital en Configuración"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Presiona aquí para escuchar texto en esta pantalla"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Presiona aquí para traducir texto en esta pantalla"</string>
 </resources>
diff --git a/go/quickstep/res/values-es/strings.xml b/go/quickstep/res/values-es/strings.xml
index 2ca750ea2e..00494433d6 100644
--- a/go/quickstep/res/values-es/strings.xml
+++ b/go/quickstep/res/values-es/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Escuchar"</string>
     <string name="action_translate" msgid="8028378961867277746">"Traducir"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"ENTENDIDO"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"CANCELAR"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"AJUSTES"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Traduce o escucha texto que haya en pantalla"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Se puede compartir con Google cierta información, como el texto que aparece en pantalla, direcciones web o capturas de pantalla.\n\nPara cambiar la información que compartes, ve a "<b>"Ajustes &gt; Aplicaciones &gt; Aplicaciones predeterminadas &gt; Asistente digital"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Elige un asistente para usar esta función"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Para escuchar o traducir texto que haya en tu pantalla, elige una aplicación de asistente digital en Ajustes"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Cambia tu asistente para usar esta función"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Para escuchar o traducir texto que haya en tu pantalla, cambia tu aplicación de asistente digital en Ajustes"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Toca aquí para escuchar el texto que hay en esta pantalla"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Toca aquí para traducir el texto que hay en esta pantalla"</string>
 </resources>
diff --git a/go/quickstep/res/values-et/strings.xml b/go/quickstep/res/values-et/strings.xml
index 5bab725a24..9a7c1186bd 100644
--- a/go/quickstep/res/values-et/strings.xml
+++ b/go/quickstep/res/values-et/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Kuula"</string>
     <string name="action_translate" msgid="8028378961867277746">"Tõlge"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"SELGE"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"TÜHISTA"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"SEADED"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Ekraanil oleva teksti tõlkimine või kuulamine"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Teavet, nagu teie ekraanil olev tekst, veebiaadressid ja ekraanipildid, võidakse jagada Google\'iga.\n\nKui soovite muuta, millist teavet jagate, avage "<b>"Seaded &gt; Rakendused &gt; Vaikerakendused &gt; Digitaalse assistendi rakendus"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Valige selle funktsiooni kasutamiseks assistent"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Ekraanil kuvatud teksti kuulamiseks või tõlkimiseks valige seadetes digitaalse assistendi rakendus"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Vahetage selle funktsiooni kasutamiseks assistenti"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Ekraanil kuvatud teksti kuulamiseks või tõlkimiseks vahetage seadetes digitaalse assistendi rakendust"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Puudutage siin, et ekraanil kuvatud teksti kuulda"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Puudutage siin, et ekraanil kuvatud tekst tõlkida"</string>
 </resources>
diff --git a/go/quickstep/res/values-eu/strings.xml b/go/quickstep/res/values-eu/strings.xml
index 3067382779..79b1acbfd2 100644
--- a/go/quickstep/res/values-eu/strings.xml
+++ b/go/quickstep/res/values-eu/strings.xml
@@ -11,7 +11,7 @@
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Itzuli edo entzun pantailako testua"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Agian pantailako testua, web-helbideak, pantaila-argazkiak eta antzeko informazioa partekatuko duzu Google-rekin.\n\nPartekatzen duzun informazioa aldatzeko, joan hona: "<b>"Ezarpenak &gt; Aplikazioak &gt; Aplikazio lehenetsiak &gt; Laguntzaile digitalaren aplikazioa"</b>"."</string>
     <string name="assistant_not_selected_title" msgid="5017072974603345228">"Hautatu laguntzaile bat eginbidea erabiltzeko"</string>
-    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Pantailako testua entzun edo itzultzeko, hautatu laguntzaile digitalaren aplikazio bat Ezarpenak atalean"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Pantailako testua entzun edo itzultzeko, aukeratu laguntzaile digitalaren aplikazio bat Ezarpenak atalean"</string>
     <string name="assistant_not_supported_title" msgid="1675788067597484142">"Aldatu laguntzailea eginbidea erabiltzeko"</string>
     <string name="assistant_not_supported_text" msgid="1708031078549268884">"Pantailako testua entzun edo itzultzeko, aldatu laguntzaile digitalaren aplikazioa Ezarpenak atalean"</string>
     <string name="tooltip_listen" msgid="7634466447860989102">"Sakatu hau pantailako testua entzuteko"</string>
diff --git a/go/quickstep/res/values-fa/strings.xml b/go/quickstep/res/values-fa/strings.xml
index 2552717605..c86fddb785 100644
--- a/go/quickstep/res/values-fa/strings.xml
+++ b/go/quickstep/res/values-fa/strings.xml
@@ -5,12 +5,12 @@
     <string name="action_listen" msgid="2370304050784689486">"گوش دادن"</string>
     <string name="action_translate" msgid="8028378961867277746">"ترجمه"</string>
     <string name="action_search" msgid="6269564710943755464">"لنز"</string>
-    <string name="dialog_acknowledge" msgid="2804025517675853172">"متوجه شدم"</string>
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"متوجه‌ام"</string>
     <string name="dialog_cancel" msgid="6464336969134856366">"لغو"</string>
     <string name="dialog_settings" msgid="6564397136021186148">"تنظیمات"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"ترجمه نوشتار روی صفحه‌نمایش یا گوش دادن به آن"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"‏ممکن است اطلاعاتی مثل نوشتار روی صفحه‌نمایش، نشانی‌های وب، و نماگرفت‌ها با Google هم‌رسانی شود.\n\nبرای تغییر اطلاعاتی که هم‌رسانی می‌کنید، به "<b>"تنظیمات &lt; برنامه‌ها &lt; برنامه‌های پیش‌فرض &lt; برنامه دستیار دیجیتال"</b>" بروید."</string>
-    <string name="assistant_not_selected_title" msgid="5017072974603345228">"برای استفاده از این ویژگی، یکی از دستیارها را انتخاب کنید"</string>
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"برای استفاده از این ویژگی، دستیاری انتخاب کنید"</string>
     <string name="assistant_not_selected_text" msgid="3244613673884359276">"برای گوش کردن به نوشتار در صفحه‌نمایش‌تان یا ترجمه کردن آن، یکی از برنامه‌های دستیار دیجیتالی را در «تنظیمات» انتخاب کنید"</string>
     <string name="assistant_not_supported_title" msgid="1675788067597484142">"برای استفاده از این ویژگی، دستیارتان را تغییر دهید"</string>
     <string name="assistant_not_supported_text" msgid="1708031078549268884">"برای گوش کردن به نوشتار در صفحه‌نمایش‌تان یا ترجمه کردن آن، برنامه دستیار دیجیتالی‌تان را در «تنظیمات» تغییر دهید"</string>
diff --git a/go/quickstep/res/values-fi/strings.xml b/go/quickstep/res/values-fi/strings.xml
index 51a4474de9..c13a92c7b4 100644
--- a/go/quickstep/res/values-fi/strings.xml
+++ b/go/quickstep/res/values-fi/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Kuuntele"</string>
     <string name="action_translate" msgid="8028378961867277746">"Käännä"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"OK"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"PERU"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"ASETUKSET"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Käännä tai kuuntele näytöllä oleva teksti"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Googlelle saatetaan jakaa näytöllä olevaa tekstiä, verkko-osoitteita, kuvakaappauksia ja muita tietoja.\n\nVoit valita jaettavat tiedot valitsemalla "<b>"Asetukset &gt; Sovellukset &gt; Oletussovellukset &gt; Digiavustajasovellus"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Valitse avustaja tämän ominaisuuden käyttöön"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Jos haluat kuunnella tai kääntää näytöllä näkyvää tekstiä, valitse digiavustajasovellus asetuksista"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Vaihda avustaja tämän ominaisuuden käyttöä varten"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Jos haluat kuunnella tai kääntää näytöllä näkyvää tekstiä, vaihda digiavustajasovellus asetuksista"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Kuuntele näytöllä näkyvä teksti napauttamalla tästä"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Käännä näytöllä näkyvä teksti napauttamalla tästä"</string>
 </resources>
diff --git a/go/quickstep/res/values-fr-rCA/strings.xml b/go/quickstep/res/values-fr-rCA/strings.xml
index 5ffded5fee..d04abd898d 100644
--- a/go/quickstep/res/values-fr-rCA/strings.xml
+++ b/go/quickstep/res/values-fr-rCA/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Écouter"</string>
     <string name="action_translate" msgid="8028378961867277746">"Traduire"</string>
     <string name="action_search" msgid="6269564710943755464">"Lentille"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"OK"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ANNULER"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"PARAMÈTRES"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Traduire ou écouter le texte à l\'écran"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Des renseignements comme du texte sur votre écran, des adresses Web et des captures d\'écran peuvent être partagés avec Google.\n\nPour modifier les renseignements que vous partagez, accédez à "<b>"Paramètres &gt; Applications &gt; Applications par défaut &gt; Application d\'assistant numérique"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Choisir un assistant pour utiliser cette fonctionnalité"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Pour écouter ou traduire le texte affiché sur votre écran, choisissez l\'application d\'un assistant numérique dans les paramètres"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Modifier votre assistant pour utiliser cette fonctionnalité"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Pour écouter ou traduire le texte affiché sur votre écran, modifiez l\'application de votre assistant numérique dans les paramètres"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Touchez ce bouton pour écouter le texte affiché sur cet écran"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Touchez ce bouton pour traduire le texte affiché sur cet écran"</string>
 </resources>
diff --git a/go/quickstep/res/values-hu/strings.xml b/go/quickstep/res/values-hu/strings.xml
index 3606f9c64f..f2cd08995c 100644
--- a/go/quickstep/res/values-hu/strings.xml
+++ b/go/quickstep/res/values-hu/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Lejátszás"</string>
     <string name="action_translate" msgid="8028378961867277746">"Fordítás"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"ÉRTEM"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"MÉGSE"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"BEÁLLÍTÁSOK"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Képernyőn megjelenő szöveg fordítása és hallgatása"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Előfordulhat, hogy a rendszer megoszt bizonyos adatokat (például képernyőn megjelenő szöveget, internetcímeket és képernyőképeket) a Google-lal.\n\nHa módosítani szeretné, hogy milyen adatokat oszt meg, lépjen a "<b>"Beállítások és alkalmazások; Alapértelmezett alkalmazások; Digitális asszisztens app"</b>" menüpontra."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Válasszon asszisztenst a funkció használatához"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"A képernyőn megjelenő szöveg meghallgatásához vagy lefordításához válasszon digitálisasszisztens-alkalmazást a Beállítások menüben"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Módosítsa az asszisztenst a funkció használatához"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"A képernyőn megjelenő szöveg meghallgatásához vagy lefordításához módosítsa a digitálisasszisztens-alkalmazást a Beállítások menüben"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Koppintson ide a jelenleg képernyőn lévő szöveg meghallgatásához"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Koppintson ide a jelenleg képernyőn lévő szöveg lefordításához"</string>
 </resources>
diff --git a/go/quickstep/res/values-hy/strings.xml b/go/quickstep/res/values-hy/strings.xml
index 6cee921608..b238a92c0f 100644
--- a/go/quickstep/res/values-hy/strings.xml
+++ b/go/quickstep/res/values-hy/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Լսել"</string>
     <string name="action_translate" msgid="8028378961867277746">"Թարգմանել"</string>
     <string name="action_search" msgid="6269564710943755464">"Տեսապակի"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"ԵՂԱՎ"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ՉԵՂԱՐԿԵԼ"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"ԿԱՐԳԱՎՈՐՈՒՄՆԵՐ"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Էկրանի տեքստի թարգմանություն կամ ունկնդրում"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Որոշակի տեղեկություններ (օր․՝ էկրանի տեքստը, վեբ հասցեները և սքրինշոթները) կարող են ուղարկվել Google-ին։\n\nՏեղեկությունները, որոնցով դուք կիսվում եք, կարող եք փոխել՝ անցնելով "<b>"Կարգավորումներ &gt; Հավելվածներ &gt; Կանխադրված հավելվածներ &gt; Թվային օգնականի հավելված"</b>"։"</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Այս գործառույթն օգտագործելու համար ընտրեք օգնական"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Էկրանի տեքստը լսելու կամ թարգմանելու համար կարգավորումներում ընտրեք թվային օգնականի հավելված։"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Այս գործառույթն օգտագործելու համար փոխեք ձեր օգնականը"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Էկրանի տեքստը լսելու կամ թարգմանելու համար կարգավորումներում փոխեք ձեր թվային օգնականի հավելվածը։"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Հպեք այստեղ՝ այս էկրանի տեքստը լսելու համար"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Հպեք այստեղ` այս էկրանի տեքստը թարգմանելու համար"</string>
 </resources>
diff --git a/go/quickstep/res/values-is/strings.xml b/go/quickstep/res/values-is/strings.xml
index ce27dbbc13..c882c99b20 100644
--- a/go/quickstep/res/values-is/strings.xml
+++ b/go/quickstep/res/values-is/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Hlusta"</string>
     <string name="action_translate" msgid="8028378961867277746">"Þýða"</string>
     <string name="action_search" msgid="6269564710943755464">"Linsa"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"ÉG SKIL"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"HÆTTA VIÐ"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"STILLINGAR"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Þýða eða hlusta á texta á skjánum"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Mögulegt er að upplýsingum á borð við texta á skjánum, vefslóðum og skjámyndum verði deilt með Google.\n\nTil að breyta því hvaða upplýsingum þú deilir skaltu opna "<b>"Stillingar &gt; Forrit &gt; Sjálfgefin forrit &gt; Forrit stafræns hjálpara"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Veldu hjálpara til að nota þennan eiginleika"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Veldu stafrænan hjálpara í stillingum til að hlusta á eða þýða texta á skjánum"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Breyttu hjálparanum til að nota þennan eiginleika"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Breyttu forriti stafræna hjálparans í stillingum til að hlusta á eða þýða texta"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Ýttu hér til að hlusta á texta á þessum skjá"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Ýttu hér til að þýða texta á þessum skjá"</string>
 </resources>
diff --git a/go/quickstep/res/values-iw/strings.xml b/go/quickstep/res/values-iw/strings.xml
index 8166a37483..fd3747eb36 100644
--- a/go/quickstep/res/values-iw/strings.xml
+++ b/go/quickstep/res/values-iw/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"האזנה"</string>
     <string name="action_translate" msgid="8028378961867277746">"תרגום"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"הבנתי"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ביטול"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"הגדרות"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"תרגום טקסט שמוצג במסך או האזנה לו"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"‏ייתכן שישותף עם Google מידע כגון טקסט שמוצג במסך, כתובות אינטרנט וצילומי מסך.\n\nכדי לקבוע איזה מידע ישותף, יש לעבור אל "<b>"הגדרות &gt; אפליקציות &amp;gt אפליקציות ברירת מחדל &gt; אפליקציית עוזר דיגיטלי"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"יש לבחור עוזר דיגיטלי כדי להשתמש בתכונה הזו"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"כדי להאזין לטקסט שבמסך או לתרגם אותו, צריך לבחור אפליקציית עוזר דיגיטלי ב\'הגדרות\'"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"צריך לשנות את העוזר הדיגיטלי כדי להשתמש בתכונה הזו"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"כדי להאזין לטקסט שבמסך או לתרגם אותו, צריך לשנות את אפליקציית העוזר הדיגיטלי ב\'הגדרות\'"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"צריך להקיש כאן כדי להאזין לטקסט שבמסך הזה"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"צריך להקיש כאן כדי לתרגם את הטקסט שבמסך הזה"</string>
 </resources>
diff --git a/go/quickstep/res/values-ja/strings.xml b/go/quickstep/res/values-ja/strings.xml
index bc428b110e..cfbfecaad2 100644
--- a/go/quickstep/res/values-ja/strings.xml
+++ b/go/quickstep/res/values-ja/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"聴く"</string>
     <string name="action_translate" msgid="8028378961867277746">"翻訳"</string>
     <string name="action_search" msgid="6269564710943755464">"レンズ"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"OK"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"キャンセル"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"設定"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"画面上のテキストを翻訳または聞く"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"画面上のテキスト、ウェブアドレス、スクリーンショットなどの情報が Google と共有される場合があります。\n\n共有される情報を変更するには、"<b>"[設定] &gt; [アプリ] &gt; [デフォルトのアプリ] &gt; [デジタル アシスタント アプリ]"</b>" に移動してください。"</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"この機能を使用するにはアシスタントを選択してください"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"画面上のテキストを翻訳するかまたは聞くには、[設定] でデジタル アシスタント アプリを選択してください"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"この機能を使用するにはアシスタントを変更してください"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"画面上のテキストを翻訳するかまたは聞くには、[設定] でデジタル アシスタント アプリを変更してください"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"この画面上のテキストを聞くには、ここをタップしてください"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"この画面上のテキストを翻訳するには、ここをタップしてください"</string>
 </resources>
diff --git a/go/quickstep/res/values-ka/strings.xml b/go/quickstep/res/values-ka/strings.xml
index adf3e6b029..3280a7eedd 100644
--- a/go/quickstep/res/values-ka/strings.xml
+++ b/go/quickstep/res/values-ka/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"მოსმენა"</string>
     <string name="action_translate" msgid="8028378961867277746">"თარგმნა"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"გასაგებია"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"გაუქმება"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"პარამეტრები"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"თარგმნეთ ან მოისმინეთ ეკრანზე ნაჩვენები ტექსტი"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"ისეთი ინფორმაცია, როგორიც არის ტექსტი თქვენს ეკრანზე, ვებ-მისამართები და ეკრანის ანაბეჭდები შეიძლება გაზიარდეს Google-თან.\n\nთუ გსურთ, შეცვალოთ, რა ინფორმაციას აზიარებთ, გადადით: "<b>"პარამეტრები &gt; აპები &gt; ნაგულისხმევი აპები &gt; ციფრული ასისტენტის აპი"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"ამ ფუნქციით სარგებლობისთვის აირჩიეთ ასისტენტი"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"თქვენს ეკრანზე ნაჩვენები ტექსტის მოსასმენად ან სათარგმნად, აირჩიეთ ციფრული ასისტენტის აპი პარამეტრებიდან"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"ამ ფუნქციით სარგებლობისთვის შეცვალეთ ასისტენტი"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"თქვენს ეკრანზე ნაჩვენები ტექსტის მოსასმენად ან სათარგმნად, შეცვალეთ ციფრული ასისტენტის აპი პარამეტრებიდან"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"შეეხეთ აქ ამ ეკრანზე ნაჩვენები ტექსტის მოსასმენად"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"შეეხეთ აქ ამ ეკრანზე ნაჩვენები ტექსტის სათარგმნად"</string>
 </resources>
diff --git a/go/quickstep/res/values-kk/strings.xml b/go/quickstep/res/values-kk/strings.xml
index 8a3aedbc07..b68ab3e86b 100644
--- a/go/quickstep/res/values-kk/strings.xml
+++ b/go/quickstep/res/values-kk/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Тыңдау"</string>
     <string name="action_translate" msgid="8028378961867277746">"Аудару"</string>
     <string name="action_search" msgid="6269564710943755464">"Объектив"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"ТҮСІНІКТІ"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"БАС ТАРТУ"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"ПАРАМЕТРЛЕР"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Экрандағы мәтінді аудару немесе тыңдау"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Экрандағы мәтін, веб-мекенжайлар мен скриншоттар сияқты ақпарат Google-мен бөлісілуі мүмкін.\n\nБөлісілетін ақпаратты өзгерту үшін "<b>"Параметрлер &gt; Қолданбалар &gt; Әдепкі қолданбалар &gt; Цифрлық көмекші қолданбасы"</b>" тармағына өтіңіз."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Осы функцияны пайдалану үшін көмекшіні таңдау"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Экрандағы мәтінді тыңдау немесе аудару үшін параметрлерден цифрлық көмекшіні таңдаңыз."</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Осы функцияны пайдалану үшін көмекшіні өзгерту"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Экрандағы мәтінді тыңдау немесе аудару үшін параметрлерден цифрлық көмекшіні өзгертіңіз."</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Экрандағы мәтінді тыңдау үшін осы жерде түртіңіз."</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Экрандағы мәтінді аудару үшін осы жерде түртіңіз."</string>
 </resources>
diff --git a/go/quickstep/res/values-ko/strings.xml b/go/quickstep/res/values-ko/strings.xml
index 58e2278875..7b298e93fe 100644
--- a/go/quickstep/res/values-ko/strings.xml
+++ b/go/quickstep/res/values-ko/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"듣기"</string>
     <string name="action_translate" msgid="8028378961867277746">"번역"</string>
     <string name="action_search" msgid="6269564710943755464">"렌즈"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"확인"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"취소"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"설정"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"화면의 텍스트 번역 또는 듣기"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"화면의 텍스트, 웹 주소, 스크린샷과 같은 정보가 Google과 공유될 수 있습니다.\n\n공유되는 정보를 변경하려면 "<b>"설정 &gt; 앱 &gt; 기본 앱 &gt; 디지털 어시스턴트 앱"</b>"으로 이동하세요."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"이 기능을 사용하려면 어시스턴트를 선택하세요."</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"화면에서 텍스트를 듣거나 번역하려면 설정에서 디지털 어시스턴트 앱을 선택하세요."</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"어시스턴트가 이 기능을 사용하도록 변경하세요."</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"화면에서 텍스트를 듣거나 번역하려면 설정에서 디지털 어시스턴트 앱을 변경하세요."</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"화면에서 텍스트를 들으려면 여기를 탭하세요."</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"화면에서 텍스트를 번역하려면 여기를 탭하세요."</string>
 </resources>
diff --git a/go/quickstep/res/values-ky/strings.xml b/go/quickstep/res/values-ky/strings.xml
index 0f56c9bbb6..66fb264601 100644
--- a/go/quickstep/res/values-ky/strings.xml
+++ b/go/quickstep/res/values-ky/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Угуу"</string>
     <string name="action_translate" msgid="8028378961867277746">"Которуу"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"ТҮШҮНДҮМ"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ЖОККО ЧЫГАРУУ"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"ЖӨНДӨӨЛӨР"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Экрандагы текстти которуу же угуу"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Экрандагы текст, веб-даректер жана скриншоттор сыяктуу маалымат Google менен бөлүшүлүшү мүмкүн.\n\nБөлүшүлгөн маалыматты өзгөртүү үчүн"<b>"Жөндөөлөр &gt; Колдонмолор &gt; Демейки колдонмолор &gt; Санариптик жардамчы колдонмосуна өтүңүз"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Бул функцияны колдонуу үчүн жардамчыны тандаңыз"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Экраныңыздагы текстти угуу же которуу үчүн Жөндөөлөрдөн санариптик жардамчы колдонмосун тандаңыз"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Бул функцияны колдонуу үчүн жардамчыңызды өзгөртүңүз"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Экраныңыздагы текстти угуу же которуу үчүн Жөндөөлөрдөн санариптик жардамчы колдонмосун өзгөртүңүз"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Бул экрандагы текстти угуу үчүн бул жерди басыңыз"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Бул экрандагы текстти которуу үчүн бул жерди басыңыз"</string>
 </resources>
diff --git a/go/quickstep/res/values-lt/strings.xml b/go/quickstep/res/values-lt/strings.xml
index e1b4d97e74..e47d2bb5ec 100644
--- a/go/quickstep/res/values-lt/strings.xml
+++ b/go/quickstep/res/values-lt/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Klausyti"</string>
     <string name="action_translate" msgid="8028378961867277746">"Išversti"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"SUPRATAU"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ATŠAUKTI"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"NUSTATYMAI"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Ekrane esančio teksto vertimas arba klausymas"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Tam tikra informacija, pvz., ekrane esantis tekstas, žiniatinklio adresai ir ekrano kopijos, gali būti bendrinama su „Google“.\n\nJei norite pakeisti, kokia informacija gali būti bendrinama, eikite į "<b>"„Nustatymai“ &gt; „Programos“ &gt; „Numatytosios programos“ &gt; „Skaitmeninio pagelbiklio programa“"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Norint naudoti šią funkciją, reikia pasirinkti pagelbiklį"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Jei norite klausyti teksto ekrane ar jį išversti, pasirinkite skaitmeninio pagelbiklio programą „Nustatymų“ skiltyje"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Norint naudoti šią funkciją, reikia pakeisti pagelbiklį"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Jei norite klausyti teksto ekrane ar jį išversti, pakeiskite skaitmeninio pagelbiklio programą „Nustatymų“ skiltyje"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Palieskite čia, jei norite klausyti teksto šiame ekrane"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Palieskite čia, jei norite išversti tekstą šiame ekrane"</string>
 </resources>
diff --git a/go/quickstep/res/values-lv/strings.xml b/go/quickstep/res/values-lv/strings.xml
index a697ccb3d1..831486addf 100644
--- a/go/quickstep/res/values-lv/strings.xml
+++ b/go/quickstep/res/values-lv/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Klausīties"</string>
     <string name="action_translate" msgid="8028378961867277746">"Tulkot"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"LABI"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ATCELT"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"IESTATĪJUMI"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Ekrānā redzamā teksta atskaņošana vai tulkošana"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Ar uzņēmumu Google var tikt kopīgota noteikta informācija, piemēram, ekrānā redzamais teksts, tīmekļa adreses un ekrānuzņēmumi.\n\nLai mainītu kopīgotās informācijas veidu, atveriet sadaļu "<b>"Iestatījumi &gt; Lietotnes &gt; Noklusējuma lietotnes &gt; Digitālā asistenta lietotne"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Lai izmantotu šo funkciju, izvēlieties asistentu"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Lai klausītos vai tulkotu ekrānā parādīto tekstu, iestatījumos izvēlieties digitālā asistenta lietotni"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Lai izmantotu šo funkciju, mainiet asistentu"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Lai klausītos vai tulkotu ekrānā parādīto tekstu, iestatījumos mainiet digitālā asistenta lietotni"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Lai klausītos ekrānā parādīto tekstu, pieskarieties šeit"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Lai tulkotu ekrānā parādīto tekstu, pieskarieties šeit"</string>
 </resources>
diff --git a/go/quickstep/res/values-mk/strings.xml b/go/quickstep/res/values-mk/strings.xml
index 5560e119ac..93d582c311 100644
--- a/go/quickstep/res/values-mk/strings.xml
+++ b/go/quickstep/res/values-mk/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Слушај"</string>
     <string name="action_translate" msgid="8028378961867277746">"Преведи"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"СФАТИВ"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ОТКАЖИ"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"ПОСТАВКИ"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Преведете или слушајте текст на екранот"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Информациите како текст на екранот, интернет-адреси и слики од екранот може да се споделуваат со Google.\n\nЗа да промените кои информации ќе се споделуваат, одете во "<b>"Поставки &gt; Апликации &gt; Стандардни апликации &gt; Апликација за дигитален помошник"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Изберете помошник за да ја користите функцијава"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"За да го слушнете или преведете текстот од екранот, изберете ја апликацијата за дигитален помошник во „Поставки“"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Променете го помошникот за да ја користите функцијава"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"За да го слушнете или преведете текстот од екранот, променете ја апликацијата за дигитален помошник во „Поставки“"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Допрете тука за да го слушнете текстот од екранов"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Допрете тука за да го преведете текстот од екранов"</string>
 </resources>
diff --git a/go/quickstep/res/values-my/strings.xml b/go/quickstep/res/values-my/strings.xml
index 6e0e78a1f5..e3183148c4 100644
--- a/go/quickstep/res/values-my/strings.xml
+++ b/go/quickstep/res/values-my/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"နားထောင်ရန်"</string>
     <string name="action_translate" msgid="8028378961867277746">"ဘာသာပြန်ရန်"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"ရပြီ"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"မလုပ်တော့"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"ဆက်တင်များ"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"ဖန်သားပြင်ပေါ်ရှိ စာသားကို ဘာသာပြန်ပါ (သို့) နားထောင်ပါ"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"သင့်ဖန်သားပြင်ပေါ်ရှိ စာသား၊ ဝဘ်လိပ်စာနှင့် ဖန်သားပြင်ဓာတ်ပုံများကဲ့သို့ အချက်အလက်များကို Google နှင့် မျှဝေနိုင်သည်။\n\nသင်မျှဝေသည့် အချက်အလက်များကို ပြောင်းရန် "<b>"ဆက်တင်များ &gt; အက်ပ်များ &gt; မူရင်းအက်ပ်များ &gt; ဒစ်ဂျစ်တယ် Assistant အက်ပ်"</b>" သို့ သွားပါ။"</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"ဤဝန်ဆောင်မှုကို အသုံးပြုရန် assistant ရွေးပါ"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"ဖန်သားပြင်ပေါ်ရှိ စာသားကို နားထောင်ရန် (သို့) ဘာသာပြန်ဆိုရန် ‘ဆက်တင်များ’ တွင် ဒစ်ဂျစ်တယ် assistant အက်ပ် ရွေးပါ"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"ဤဝန်ဆောင်မှုကို သုံးရန် assistant ကို ပြောင်းပါ"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"ဖန်သားပြင်ပေါ်ရှိ စာသားကို နားထောင်ရန် (သို့) ဘာသာပြန်ဆိုရန် ‘ဆက်တင်များ’ တွင် ဒစ်ဂျစ်တယ် assistant အက်ပ်ကို ပြောင်းပါ"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"ဤဖန်သားပြင်ပေါ်ရှိ စာသားကို နားထောင်ရန် ဤနေရာကို တို့ပါ"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"ဤဖန်သားပြင်ပေါ်ရှိ စာသားကို ဘာသာပြန်ဆိုရန် ဤနေရာကို တို့ပါ"</string>
 </resources>
diff --git a/go/quickstep/res/values-nb/strings.xml b/go/quickstep/res/values-nb/strings.xml
index f21b7a5600..ec3ef595a5 100644
--- a/go/quickstep/res/values-nb/strings.xml
+++ b/go/quickstep/res/values-nb/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Lytt"</string>
     <string name="action_translate" msgid="8028378961867277746">"Oversett"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"GREIT"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"AVBRYT"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"INNSTILLINGER"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Oversett eller lytt til tekst på skjermen"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informasjon som tekst på skjermen, nettadresser og skjermdumper kan deles med Google.\n\nFor å endre hvilken informasjon du deler, gå til "<b>"Innstillinger &gt; Apper &gt; Standardapper &gt; Digital assistent-app"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Velg en assistent for å bruke denne funksjonen"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"For å høre eller oversette tekst på skjermen, velg en digital assistent-app i innstillingene"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Endre assistenten for å bruke denne funksjonen"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"For å høre eller oversette tekst på skjermen, endre digital assistent-appen i innstillingene"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Trykk her for å høre teksten på denne skjermen"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Trykk her for å oversette teksten på denne skjermen"</string>
 </resources>
diff --git a/go/quickstep/res/values-nl/strings.xml b/go/quickstep/res/values-nl/strings.xml
index 3cf93be68b..82a851929f 100644
--- a/go/quickstep/res/values-nl/strings.xml
+++ b/go/quickstep/res/values-nl/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Luisteren"</string>
     <string name="action_translate" msgid="8028378961867277746">"Vertalen"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"OK"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ANNULEREN"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"INSTELLINGEN"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Tekst op het scherm vertalen of beluisteren"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informatie zoals tekst op je scherm, webadressen en screenshots kan met Google worden gedeeld.\n\nAls je wilt aanpassen welke informatie je deelt, ga je naar "<b>"Instellingen &gt; Apps &gt; Standaard-apps &gt; Digitale-assistent-app"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Kies een assistent om deze functie te gebruiken"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Als je tekst op je scherm wilt beluisteren of vertalen, kies je een digitale-assistent-app in Instellingen"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Wijzig de assistent om deze functie te gebruiken"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Als je tekst op je scherm wilt beluisteren of vertalen, wijzig je de digitale-assistent-app in Instellingen"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Tik hier om tekst op dit scherm te beluisteren"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Tik hier om tekst op dit scherm te vertalen"</string>
 </resources>
diff --git a/go/quickstep/res/values-pl/strings.xml b/go/quickstep/res/values-pl/strings.xml
index 43a49b68f2..a03e05e8c3 100644
--- a/go/quickstep/res/values-pl/strings.xml
+++ b/go/quickstep/res/values-pl/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Posłuchaj"</string>
     <string name="action_translate" msgid="8028378961867277746">"Przetłumacz"</string>
     <string name="action_search" msgid="6269564710943755464">"Obiektyw"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"OK"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ANULUJ"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"USTAWIENIA"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Przetłumacz lub odsłuchaj tekst na ekranie"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informacje takie jak tekst na ekranie, adresy internetowe i zrzuty ekranu mogą być udostępniane Google.\n\nAby zmienić zakres udostępnianych informacji, kliknij "<b>"Ustawienia &gt; Aplikacje &gt; Aplikacje domyślne &gt; Asystent cyfrowy"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Aby użyć tej funkcji, wybierz asystenta"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Aby odsłuchać lub przetłumaczyć tekst widoczny na ekranie, wybierz w Ustawieniach aplikację asystenta cyfrowego"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Aby użyć tej funkcji, zmień asystenta"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Aby odsłuchać lub przetłumaczyć tekst widoczny na ekranie, zmień w Ustawieniach aplikację asystenta cyfrowego"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Kliknij tutaj, aby odsłuchać tekst widoczny na ekranie"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Kliknij tutaj, aby przetłumaczyć tekst widoczny na ekranie"</string>
 </resources>
diff --git a/go/quickstep/res/values-pt/strings.xml b/go/quickstep/res/values-pt/strings.xml
index 32560d09f4..0a0da3790a 100644
--- a/go/quickstep/res/values-pt/strings.xml
+++ b/go/quickstep/res/values-pt/strings.xml
@@ -4,7 +4,7 @@
     <string name="app_share_drop_target_label" msgid="5804774105974539508">"Compartilhar app"</string>
     <string name="action_listen" msgid="2370304050784689486">"Ouvir"</string>
     <string name="action_translate" msgid="8028378961867277746">"Traduzir"</string>
-    <string name="action_search" msgid="6269564710943755464">"Google Lens"</string>
+    <string name="action_search" msgid="6269564710943755464">"Lens"</string>
     <string name="dialog_acknowledge" msgid="2804025517675853172">"OK"</string>
     <string name="dialog_cancel" msgid="6464336969134856366">"CANCELAR"</string>
     <string name="dialog_settings" msgid="6564397136021186148">"CONFIGURAÇÕES"</string>
diff --git a/go/quickstep/res/values-ro/strings.xml b/go/quickstep/res/values-ro/strings.xml
index cfd11f8d5d..37cf48db72 100644
--- a/go/quickstep/res/values-ro/strings.xml
+++ b/go/quickstep/res/values-ro/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Ascultați"</string>
     <string name="action_translate" msgid="8028378961867277746">"Traduceți"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"OK"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ANULAȚI"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"SETĂRI"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Traduceți sau ascultați textul de pe ecran"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informații precum textul de pe ecran, adresele web și capturile de ecran pot fi trimise la Google.\n\nCa să schimbați informațiile trimise, accesați "<b>"Setări &gt; Aplicații &gt; Aplicații prestabilite &gt; Aplicația asistent digital"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Alegeți un asistent pentru a folosi această funcție"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Pentru a asculta sau a traduce text de pe ecran, alegeți o aplicație asistent digital în Setări"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Schimbați asistentul pentru a folosi această funcție"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Pentru a asculta sau a traduce text de pe ecran, schimbați aplicația asistent digital în Setări"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Atingeți aici pentru a asculta text de pe ecran"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Atingeți aici pentru a traduce text de pe ecran"</string>
 </resources>
diff --git a/go/quickstep/res/values-ru/strings.xml b/go/quickstep/res/values-ru/strings.xml
index ad9c7bd747..d31c42a7b0 100644
--- a/go/quickstep/res/values-ru/strings.xml
+++ b/go/quickstep/res/values-ru/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Слушать"</string>
     <string name="action_translate" msgid="8028378961867277746">"Перевести"</string>
     <string name="action_search" msgid="6269564710943755464">"Объектив"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"ОК"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ОТМЕНА"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"ОТКРЫТЬ НАСТРОЙКИ"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Перевод или прослушивание текста на экране"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Определенные сведения (например, текст на экране, веб-адреса и скриншоты) могут быть отправлены в Google.\n\nИзменить информацию, которой вы делитесь, можно в меню "<b>"Настройки &gt; Приложения &gt; Приложения по умолчанию &gt; Цифровой помощник"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Выберите помощника, чтобы пользоваться этой функцией"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Чтобы слушать или переводить текст на экране, укажите цифрового помощника в настройках."</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Смените помощника, чтобы пользоваться этой функцией"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Чтобы слушать или переводить текст на экране, выберите другого цифрового помощника в настройках."</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Нажмите, чтобы прослушать текст на этой странице"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Нажмите, чтобы перевести текст на этой странице"</string>
 </resources>
diff --git a/go/quickstep/res/values-sl/strings.xml b/go/quickstep/res/values-sl/strings.xml
index ba17f7d477..31fcffca84 100644
--- a/go/quickstep/res/values-sl/strings.xml
+++ b/go/quickstep/res/values-sl/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Poslušanje"</string>
     <string name="action_translate" msgid="8028378961867277746">"Prevedi"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"RAZUMEM"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"PREKLIČI"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"NASTAVITVE"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Prevod ali poslušanje besedila na zaslonu"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Podatki, kot so besedilo na zaslonu, spletni naslovi in posnetki zaslonov, bodo morda deljeni z Googlom.\n\nČe želite spremeniti, katere podatke delite, odprite "<b>"Nastavitve &gt; Aplikacije &gt; Privzete aplikacije &gt; Digitalni pomočnik"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Za uporabo te funkcije izberite pomočnika"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Za poslušanje ali prevod besedila na zaslonu v nastavitvah izberite digitalnega pomočnika."</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Za uporabo te funkcije izberite drugega pomočnika"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Za poslušanje ali prevod besedila na zaslonu v nastavitvah izberite drugega digitalnega pomočnika."</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Dotaknite se tukaj za poslušanje besedila na zaslonu."</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Dotaknite se tukaj za prevod besedila na zaslonu."</string>
 </resources>
diff --git a/go/quickstep/res/values-sr/strings.xml b/go/quickstep/res/values-sr/strings.xml
index 9349d5fa49..9c9a332a17 100644
--- a/go/quickstep/res/values-sr/strings.xml
+++ b/go/quickstep/res/values-sr/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Пусти"</string>
     <string name="action_translate" msgid="8028378961867277746">"Преведи"</string>
     <string name="action_search" msgid="6269564710943755464">"Објектив"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"ВАЖИ"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ОТКАЖИ"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"ПОДЕШАВАЊА"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Преводите или слушајте текст на екрану"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Информације попут текста на екрану, веб-адреса и снимака екрана могу да се деле са Google-ом.\n\nДа бисте променили информације које делите, идите у "<b>"Подешавања &gt; Апликације &gt; Подразумеване апликације &gt; Апликација дигиталног помоћника"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Одаберите помоћника да бисте користили ову функцију"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Да бисте чули текст са екрана или га превели, одаберите апликацију дигиталног помоћника у Подешавањима"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Промените помоћника да бисте користили ову функцију"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Да бисте чули текст са екрана или га превели, промените апликацију дигиталног помоћника у Подешавањима"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Додирните овде да бисте чули текст са овог екрана"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Додирните овде да бисте превели текст са овог екрана"</string>
 </resources>
diff --git a/go/quickstep/res/values-sv/strings.xml b/go/quickstep/res/values-sv/strings.xml
index b88145434f..cb70a58477 100644
--- a/go/quickstep/res/values-sv/strings.xml
+++ b/go/quickstep/res/values-sv/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Lyssna"</string>
     <string name="action_translate" msgid="8028378961867277746">"Översätt"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"OK"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"AVBRYT"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"INSTÄLLNINGAR"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Översätt eller lyssna på texten på skärmen"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Information som text på skärmen, webbadresser och skärmbilder kan delas med Google.\n\nFör att ändra vilken information du delar öppnar du "<b>"Inställningar &gt; Appar &gt; Standardappar &gt; Digital assistentapp"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Välj en assistent om du vill använda den här funktionen"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Välj en digital assistentapp i Inställningar om du vill lyssna på eller översätta text på skärmen"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Byt assistent om du vill använda den här funktionen"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Byt digital assistentapp i Inställningar om du vill lyssna på eller översätta text på skärmen"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Tryck här för att lyssna på texten på skärmen"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Tryck här för att översätta texten på skärmen"</string>
 </resources>
diff --git a/go/quickstep/res/values-sw/strings.xml b/go/quickstep/res/values-sw/strings.xml
index 3ff9d9c162..a78980a84e 100644
--- a/go/quickstep/res/values-sw/strings.xml
+++ b/go/quickstep/res/values-sw/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Sikiliza"</string>
     <string name="action_translate" msgid="8028378961867277746">"Tafsiri"</string>
     <string name="action_search" msgid="6269564710943755464">"Lenzi"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"NIMEELEWA"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"GHAIRI"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"MIPANGILIO"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Tafsiri au usikilize maandishi kwenye skrini"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Maelezo kama vile maandishi kwenye skrini yako, anwani za wavuti na picha za skrini yanaweza kushirikiwa na Google.\n\nIli ubadilishe maelezo unayoshiriki, nenda kwenye "<b>"Mipangilio &gt; Programu &gt; Programu chaguomsingi &gt; Programu ya mratibu dijitali"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Chagua programu ya mratibu ili utumie kipengele hiki"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Ili usikilize au utafsiri maandishi kwenye skrini yako, chagua programu ya mratibu dijitali katika Mipangilio"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Badilisha programu yako ya mratibu ili utumie kipengele hiki"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Ili usikilize au utafsiri maandishi kwenye skrini yako, badilisha programu yako ya mratibu dijitali katika Mipangilio"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Gusa hapa ili usikilize maandishi kwenye skrini hii"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Gusa hapa ili utafsiri maandishi kwenye skrini hii"</string>
 </resources>
diff --git a/go/quickstep/res/values-ta/strings.xml b/go/quickstep/res/values-ta/strings.xml
index cdb91c6189..896c7c6e8c 100644
--- a/go/quickstep/res/values-ta/strings.xml
+++ b/go/quickstep/res/values-ta/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"கேளுங்கள்"</string>
     <string name="action_translate" msgid="8028378961867277746">"மொழிபெயர்"</string>
     <string name="action_search" msgid="6269564710943755464">"லென்ஸ்"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"சரி"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ரத்துசெய்"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"அமைப்புகள்"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"திரையிலுள்ள உரையை மொழிபெயருங்கள் அல்லது கேளுங்கள்"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"உங்கள் திரையிலுள்ள உரை, வலை முகவரிகள், ஸ்கிரீன்ஷாட்டுகள் போன்ற தகவல்கள் Googleளுடன் பகிரப்படலாம்.\n\nஎந்தத் தகவல்கள் பகிரப்படலாம் என்பதை மாற்ற, "<b>"அமைப்புகள் &gt; ஆப்ஸ் &gt; இயல்பு ஆப்ஸ் &gt; டிஜிட்டல் அசிஸ்டண்ட் ஆப்ஸ்"</b>" என்பதற்குச் செல்லுங்கள்."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"இந்த அம்சத்தைப் பயன்படுத்த அசிஸ்டண்ட்டைத் தேர்வுசெய்யவும்"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"திரையில் தோன்றும் வார்த்தைகளைக் கேட்கவோ மொழிபெயர்க்கவோ அமைப்புகளில் டிஜிட்டல் அசிஸ்டண்ட் ஆப்ஸைத் தேர்வுசெய்யவும்"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"இந்த அம்சத்தைப் பயன்படுத்த அசிஸ்டண்ட்டை மாற்றவும்"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"திரையில் தோன்றும் வார்த்தைகளைக் கேட்கவோ மொழிபெயர்க்கவோ அமைப்புகளில் டிஜிட்டல் அசிஸ்டண்ட் ஆப்ஸை மாற்றவும்"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"இந்தத் திரையில் தோன்றும் வார்த்தைகளைக் கேட்க இங்கே தட்டவும்"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"இந்தத் திரையில் தோன்றும் வார்த்தைகளை மொழிபெயர்க்க இங்கே தட்டவும்"</string>
 </resources>
diff --git a/go/quickstep/res/values-th/strings.xml b/go/quickstep/res/values-th/strings.xml
index 3267525b89..f19cb2ae14 100644
--- a/go/quickstep/res/values-th/strings.xml
+++ b/go/quickstep/res/values-th/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"ฟัง"</string>
     <string name="action_translate" msgid="8028378961867277746">"แปลภาษา"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"รับทราบ"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ยกเลิก"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"การตั้งค่า"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"แปลหรือฟังข้อความบนหน้าจอ"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"อาจมีการแชร์ข้อมูลอย่างเช่น ข้อความบนหน้าจอ ที่อยู่เว็บ และภาพหน้าจอกับ Google\n\nหากต้องการเปลี่ยนประเภทข้อมูลที่คุณแชร์ ให้ไปที่"<b>"การตั้งค่า &gt; แอป &gt; แอปเริ่มต้น &gt; แอปผู้ช่วยดิจิทัล"</b></string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"เลือกผู้ช่วยเพื่อใช้ฟีเจอร์นี้"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"เลือกแอปผู้ช่วยดิจิทัลในการตั้งค่าเพื่อฟังหรือแปลข้อความบนหน้าจอ"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"เปลี่ยนผู้ช่วยเพื่อใช้ฟีเจอร์นี้"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"เปลี่ยนแอปผู้ช่วยดิจิทัลในการตั้งค่าเพื่อฟังหรือแปลข้อความบนหน้าจอ"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"แตะที่นี่เพื่อฟังข้อความบนหน้าจอนี้"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"แตะที่นี่เพื่อแปลข้อความบนหน้าจอนี้"</string>
 </resources>
diff --git a/go/quickstep/res/values-tl/strings.xml b/go/quickstep/res/values-tl/strings.xml
index 73bfb7fa0a..1810c4c036 100644
--- a/go/quickstep/res/values-tl/strings.xml
+++ b/go/quickstep/res/values-tl/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Makinig"</string>
     <string name="action_translate" msgid="8028378961867277746">"Isalin"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"OK"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"KANSELAHIN"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"MGA SETTING"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"I-translate o pakinggan ang text sa screen"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Posibleng ibahagi sa Google ang impormasyong gaya ng text sa iyong screen, mga web address, at screenshot.\n\nPara baguhin kung anong impormasyon ang ibinabahagi mo, pumunta sa "<b>"Mga Setting &gt; Mga App &gt; Mga default na app &gt; Digital assistant app"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Pumili ng assistant para magamit ang feature na ito"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Para pakinggan o isalin ang text sa iyong screen, pumili ng app ng digital na assistant sa Mga Setting"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Palitan ang iyong assistant para magamit ang feature na ito"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Para pakinggan o isalin ang text sa iyong screen, palitan ang iyong app ng digital na assistant sa Mga Setting"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Mag-tap dito para pakinggan ang text sa screen na ito"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Mag-tap dito para isalin ang text sa screen na ito"</string>
 </resources>
diff --git a/go/quickstep/res/values-tr/strings.xml b/go/quickstep/res/values-tr/strings.xml
index 0e16d93cc5..0854dec347 100644
--- a/go/quickstep/res/values-tr/strings.xml
+++ b/go/quickstep/res/values-tr/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Dinle"</string>
     <string name="action_translate" msgid="8028378961867277746">"Çevir"</string>
     <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"ANLADIM"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"İPTAL"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"AYARLAR"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Ekrandaki metni çevirin veya dinleyin"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Ekranınızdaki metin, web adresleri ve ekran görüntüleri gibi bilgiler Google ile paylaşılabilir.\n\nPaylaştığınız bilgileri değiştirmek için "<b>"Ayarlar &gt; Uygulamalar &gt; Varsayılan uygulamalar &gt; Dijital asistan uygulamasına gidin"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Bu özelliği kullanmak için bir asistan seçin"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Ekranınızdaki metni dinlemek veya çevirmek için Ayarlar\'dan bir dijital asistan uygulaması seçin"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Bu özelliği kullanmak için asistanınızı değiştirin"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Ekranınızdaki metni dinlemek veya çevirmek için Ayarlar\'dan dijital asistan uygulamanızı değiştirin"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Bu ekrandaki metni dinlemek için buraya dokunun"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Bu ekrandaki metni çevirmek için buraya dokunun"</string>
 </resources>
diff --git a/go/quickstep/res/values-uk/strings.xml b/go/quickstep/res/values-uk/strings.xml
index 66b4be8318..475ff20582 100644
--- a/go/quickstep/res/values-uk/strings.xml
+++ b/go/quickstep/res/values-uk/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Слухати"</string>
     <string name="action_translate" msgid="8028378961867277746">"Перекласти"</string>
     <string name="action_search" msgid="6269564710943755464">"Об’єктив"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"OK"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"СКАСУВАТИ"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"НАЛАШТУВАННЯ"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Перекласти або прослухати текст на екрані"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Певна інформація (наприклад, текст на екрані, веб-адреси, знімки екрана) може надсилатися на сервери Google.\n\nЩоб змінити типи даних, які надсилаються, відкрийте "<b>"Налаштування &gt; Додатки &gt; Додатки за умовчанням &gt; Цифровий помічник"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Щоб користуватися цією функцією, виберіть помічника"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Щоб прослухати чи перекласти текст на екрані, виберіть цифрового помічника в налаштуваннях"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Змініть помічника, щоб користуватися цією функцією"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Щоб прослухати чи перекласти текст на екрані, змініть цифрового помічника в налаштуваннях"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Натисніть тут, щоб прослухати текст на цьому екрані"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Натисніть тут, щоб перекласти текст на цьому екрані"</string>
 </resources>
diff --git a/go/quickstep/res/values-vi/strings.xml b/go/quickstep/res/values-vi/strings.xml
index d66e01dc54..cebb934820 100644
--- a/go/quickstep/res/values-vi/strings.xml
+++ b/go/quickstep/res/values-vi/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Nghe"</string>
     <string name="action_translate" msgid="8028378961867277746">"Dịch"</string>
     <string name="action_search" msgid="6269564710943755464">"Ống kính"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"OK"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"HỦY"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"CÀI ĐẶT"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Dịch hoặc nghe văn bản trên màn hình"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Những thông tin như văn bản trên màn hình, địa chỉ web và ảnh chụp màn hình có thể được chia sẻ với Google.\n\nĐể thay đổi những thông tin mà bạn chia sẻ, hãy chuyển đến phần "<b>"Cài đặt &gt; Ứng dụng &gt; Ứng dụng mặc định &gt; Ứng dụng trợ lý kỹ thuật số"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Chọn một ứng dụng trợ lý để dùng tính năng này"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Để nghe hoặc dịch văn bản trên màn hình, hãy chọn một ứng dụng trợ lý kỹ thuật số trong phần Cài đặt"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Thay đổi ứng dụng trợ lý để dùng tính năng này"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Để nghe hoặc dịch văn bản trên màn hình, hãy thay đổi ứng dụng trợ lý kỹ thuật số trong phần Cài đặt"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Nhấn vào đây để nghe văn bản trên màn hình này"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Nhấn vào đây để dịch văn bản trên màn hình này"</string>
 </resources>
diff --git a/go/quickstep/res/values-zh-rCN/strings.xml b/go/quickstep/res/values-zh-rCN/strings.xml
index b31de8fecd..9a71dd79fa 100644
--- a/go/quickstep/res/values-zh-rCN/strings.xml
+++ b/go/quickstep/res/values-zh-rCN/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"聆听"</string>
     <string name="action_translate" msgid="8028378961867277746">"翻译"</string>
     <string name="action_search" msgid="6269564710943755464">"智能镜头"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"知道了"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"取消"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"设置"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"翻译或聆听屏幕上的文字"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"系统可能会将屏幕上的文字、网址和屏幕截图等信息分享给 Google。\n\n如需更改要分享哪些信息，请依次转到"<b>"设置 &gt; 应用 &gt; 默认应用 &gt; 数字助理应用"</b>"。"</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"需选择一款助理应用，才能使用此功能"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"如需收听或翻译屏幕上的文字，请在“设置”部分选择一款数字助理应用"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"需更改助理应用，才能使用此功能"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"如需收听或翻译屏幕上的文字，请在“设置”部分更改数字助理应用"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"点按此处即可收听屏幕上的文字"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"点按此处即可翻译屏幕上的文字"</string>
 </resources>
diff --git a/go/quickstep/res/values-zh-rTW/strings.xml b/go/quickstep/res/values-zh-rTW/strings.xml
index a79c268ce9..86d78c6c0e 100644
--- a/go/quickstep/res/values-zh-rTW/strings.xml
+++ b/go/quickstep/res/values-zh-rTW/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"聆聽"</string>
     <string name="action_translate" msgid="8028378961867277746">"翻譯"</string>
     <string name="action_search" msgid="6269564710943755464">"智慧鏡頭"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"我知道了"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"取消"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"設定"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"翻譯或朗讀畫面上的文字"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"系統可能會將畫面上的文字、網址和螢幕截圖等資訊分享給 Google。\n\n如要變更分享的資訊類型，請前往 [設定] &gt; [應用程式] &gt; [預設應用程式] &gt; [數位助理應用程式]"<b></b>"。"</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"必須選擇數位助理應用程式才能使用這項功能"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"如要聽取或翻譯畫面上的文字，請前往「設定」選擇數位助理應用程式"</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"必須變更數位助理應用程式才能使用這項功能"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"如要聽取或翻譯畫面上的文字，請前往「設定」變更數位助理應用程式"</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"輕觸這裡即可聽取這個畫面上的文字"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"輕觸這裡即可翻譯這個畫面上的文字"</string>
 </resources>
-- 
GitLab


From 6fe115b2ae83de3493020780acf35083937c8e03 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 12 Jul 2021 19:01:31 +0100
Subject: [PATCH 1600/1664] Fix shortcut size calcuation

Shortcut size should be the size of all apps icon + padding

Test: Check shortcuts and widgets are shown without crash in the
      following surfaces with display & font set to largest and
      display cutout enabled. Repeat the same test with normal
      display setting and no cutout.
      1. Full widgets picker
      2. Bottom widgets picker
      3. Pin widget dialog
Fix: 193422438
Change-Id: Ibfebf94e92eed5e9cd1dd4196d98823b0e4dda6b
---
 .../android/launcher3/dragndrop/AddItemActivity.java |  2 +-
 src/com/android/launcher3/widget/WidgetCell.java     | 12 ++++--------
 .../android/launcher3/widget/WidgetsBottomSheet.java |  2 +-
 .../picker/WidgetsListTableViewHolderBinder.java     |  2 +-
 .../picker/WidgetsRecommendationTableLayout.java     |  2 +-
 .../android/launcher3/widget/util/WidgetSizes.java   |  5 ++++-
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/com/android/launcher3/dragndrop/AddItemActivity.java b/src/com/android/launcher3/dragndrop/AddItemActivity.java
index df97bfbbda..80edad94f1 100644
--- a/src/com/android/launcher3/dragndrop/AddItemActivity.java
+++ b/src/com/android/launcher3/dragndrop/AddItemActivity.java
@@ -270,7 +270,7 @@ public class AddItemActivity extends BaseActivity
 
             @Override
             protected void onPostExecute(WidgetItem item) {
-                mWidgetCell.setPreviewSize(item.spanX, item.spanY);
+                mWidgetCell.setPreviewSize(item);
                 mWidgetCell.applyFromCellItem(item, mApp.getWidgetCache());
                 mWidgetCell.ensurePreview();
             }
diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index c3edcce95a..993bdfbec9 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -208,8 +208,6 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
         mWidgetPreviewLoader = loader;
         if (item.activityInfo != null) {
             setTag(new PendingAddShortcutInfo(item.activityInfo));
-            mPreviewWidth += mShortcutPreviewPadding;
-            mPreviewHeight += mShortcutPreviewPadding;
         } else {
             setTag(new PendingAddWidgetInfo(item.widgetInfo, mSourceContainer));
         }
@@ -356,16 +354,14 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     }
 
     /** Sets the widget preview image size in number of cells. */
-    public Size setPreviewSize(int spanX, int spanY) {
-        return setPreviewSize(spanX, spanY, 1f);
+    public Size setPreviewSize(WidgetItem widgetItem) {
+        return setPreviewSize(widgetItem, 1f);
     }
 
     /** Sets the widget preview image size, in number of cells, and preview scale. */
-    public Size setPreviewSize(int spanX, int spanY, float previewScale) {
+    public Size setPreviewSize(WidgetItem widgetItem, float previewScale) {
         DeviceProfile deviceProfile = mActivity.getDeviceProfile();
-        Size widgetSize =
-                mItem != null ? WidgetSizes.getWidgetItemSizePx(getContext(), deviceProfile, mItem)
-                : WidgetSizes.getWidgetSizePx(deviceProfile, spanX, spanY);
+        Size widgetSize = WidgetSizes.getWidgetItemSizePx(getContext(), deviceProfile, widgetItem);
         mPreviewWidth = widgetSize.getWidth();
         mPreviewHeight = widgetSize.getHeight();
         mPreviewScale = previewScale;
diff --git a/src/com/android/launcher3/widget/WidgetsBottomSheet.java b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
index c045cf1b43..dedcc65d11 100644
--- a/src/com/android/launcher3/widget/WidgetsBottomSheet.java
+++ b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
@@ -199,7 +199,7 @@ public class WidgetsBottomSheet extends BaseWidgetSheet {
             tableRow.setGravity(Gravity.TOP);
             row.forEach(widgetItem -> {
                 WidgetCell widget = addItemCell(tableRow);
-                widget.setPreviewSize(widgetItem.spanX, widgetItem.spanY);
+                widget.setPreviewSize(widgetItem);
                 widget.applyFromCellItem(widgetItem, LauncherAppState.getInstance(mActivityContext)
                         .getWidgetCache());
                 widget.ensurePreview();
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java b/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
index 57dec1401e..9c06558b5c 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java
@@ -120,7 +120,7 @@ public final class WidgetsListTableViewHolderBinder
                 WidgetCell widget = (WidgetCell) row.getChildAt(j);
                 widget.clear();
                 WidgetItem widgetItem = widgetItemsPerRow.get(j);
-                Size previewSize = widget.setPreviewSize(widgetItem.spanX, widgetItem.spanY);
+                Size previewSize = widget.setPreviewSize(widgetItem);
                 widget.applyFromCellItem(widgetItem, mWidgetPreviewLoader);
                 widget.setApplyBitmapDeferred(mApplyBitmapDeferred);
                 Bitmap preview = mWidgetPreviewLoader.getPreview(widgetItem, previewSize);
diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
index 3800ede169..0b8ca3467c 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
@@ -115,7 +115,7 @@ public final class WidgetsRecommendationTableLayout extends TableLayout {
 
             for (WidgetItem widgetItem : widgetItems) {
                 WidgetCell widgetCell = addItemCell(tableRow);
-                widgetCell.setPreviewSize(widgetItem.spanX, widgetItem.spanY, data.mPreviewScale);
+                widgetCell.setPreviewSize(widgetItem, data.mPreviewScale);
                 widgetCell.applyFromCellItem(widgetItem,
                         LauncherAppState.getInstance(getContext()).getWidgetCache());
                 widgetCell.ensurePreview();
diff --git a/src/com/android/launcher3/widget/util/WidgetSizes.java b/src/com/android/launcher3/widget/util/WidgetSizes.java
index e2c84b5770..451ed6efcc 100644
--- a/src/com/android/launcher3/widget/util/WidgetSizes.java
+++ b/src/com/android/launcher3/widget/util/WidgetSizes.java
@@ -32,6 +32,7 @@ import androidx.annotation.Nullable;
 
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.R;
 import com.android.launcher3.model.WidgetItem;
 
 import java.util.ArrayList;
@@ -91,7 +92,9 @@ public final class WidgetSizes {
     public static Size getWidgetItemSizePx(Context context, DeviceProfile profile,
             WidgetItem widgetItem) {
         if (widgetItem.isShortcut()) {
-            return getWidgetSizePx(profile, widgetItem.spanX, widgetItem.spanY);
+            int dimension = profile.allAppsIconSizePx + 2 * context.getResources()
+                    .getDimensionPixelSize(R.dimen.widget_preview_shortcut_padding);
+            return new Size(dimension, dimension);
         }
         return getWidgetPaddedSizePx(context, widgetItem.componentName, profile, widgetItem.spanX,
                 widgetItem.spanY);
-- 
GitLab


From 673b4757877be3722e24c415dcf56098bb6b4b80 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Tue, 13 Jul 2021 01:31:02 -0700
Subject: [PATCH 1601/1664] AA+ Final UX spec changes

Bug: 192670508
Test: manual

Change-Id: Id448f31adef851175306cd513974a64a1f029e50
---
 res/drawable/padded_rounded_action_button.xml | 15 ++++++++-------
 res/layout/work_apps_edu.xml                  |  2 +-
 res/values/dimens.xml                         |  2 ++
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/res/drawable/padded_rounded_action_button.xml b/res/drawable/padded_rounded_action_button.xml
index 900f5fcf8c..6432efd539 100644
--- a/res/drawable/padded_rounded_action_button.xml
+++ b/res/drawable/padded_rounded_action_button.xml
@@ -16,14 +16,15 @@
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
-    <item android:bottom="8dp" android:top="8dp">
+    <item
+        android:left="@dimen/padded_rounded_button_padding"
+        android:top="@dimen/padded_rounded_button_padding"
+        android:right="@dimen/padded_rounded_button_padding"
+        android:bottom="@dimen/padded_rounded_button_padding">
         <shape android:shape="rectangle">
-
-        <corners android:radius="@dimen/rounded_button_radius" />
-        <stroke android:width="1dp" android:color="?androidprv:attr/colorAccentPrimaryVariant" />
-        <padding
-            android:left="@dimen/rounded_button_padding"
-            android:right="@dimen/rounded_button_padding" />
+            <corners android:radius="@dimen/rounded_button_radius" />
+            <stroke android:width="1dp"
+                android:color="?androidprv:attr/colorAccentPrimaryVariant" />
         </shape>
     </item>
 </layer-list>
diff --git a/res/layout/work_apps_edu.xml b/res/layout/work_apps_edu.xml
index 382b8fc0f2..1517087fe2 100644
--- a/res/layout/work_apps_edu.xml
+++ b/res/layout/work_apps_edu.xml
@@ -43,7 +43,7 @@
 
         <Button
             android:layout_width="match_parent"
-            android:layout_height="52dp"
+            android:layout_height="@dimen/work_card_button_height"
             android:id="@+id/action_btn"
             android:textColor="?attr/workProfileOverlayTextColor"
             android:text="@string/work_profile_edu_accept"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index ee2ceb1a54..f434644996 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -122,6 +122,7 @@
     <dimen name="work_fab_height">56dp</dimen>
     <dimen name="work_fab_radius">28dp</dimen>
     <dimen name="work_card_padding_horizontal">24dp</dimen>
+    <dimen name="work_card_button_height">52dp</dimen>
     <dimen name="work_fab_margin">16dp</dimen>
     <dimen name="work_profile_footer_padding">20dp</dimen>
     <dimen name="work_profile_footer_text_size">16sp</dimen>
@@ -329,4 +330,5 @@
 <!-- Search results related parameters -->
     <dimen name="search_row_icon_size">48dp</dimen>
     <dimen name="search_row_small_icon_size">32dp</dimen>
+    <dimen name="padded_rounded_button_padding">8dp</dimen>
 </resources>
-- 
GitLab


From b6acd14d0f65a679932ed7573f5b0507bc1d4e47 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Tue, 13 Jul 2021 01:31:59 -0700
Subject: [PATCH 1602/1664] Fix hole in recycler view

Bug: 153780395
Test: manual

Without this change, typing single character and then
backspace, and then scrolling down and up will result in
hole in recycler view.

Change-Id: Iff6fa3f147d8bfdb8a7e84847b96e5390941dd4e
---
 src/com/android/launcher3/allapps/AllAppsRecyclerView.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
index 9a5f3f2be9..2c84a3d4b9 100644
--- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
@@ -109,7 +109,8 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
         pool.setMaxRecycledViews(AllAppsGridAdapter.VIEW_TYPE_EMPTY_SEARCH, 1);
         pool.setMaxRecycledViews(AllAppsGridAdapter.VIEW_TYPE_ALL_APPS_DIVIDER, 1);
         pool.setMaxRecycledViews(AllAppsGridAdapter.VIEW_TYPE_SEARCH_MARKET, 1);
-        pool.setMaxRecycledViews(AllAppsGridAdapter.VIEW_TYPE_ICON, approxRows * mNumAppsPerRow);
+        pool.setMaxRecycledViews(AllAppsGridAdapter.VIEW_TYPE_ICON, approxRows
+                * (mNumAppsPerRow + 1));
 
         mViewHeights.clear();
         mViewHeights.put(AllAppsGridAdapter.VIEW_TYPE_ICON, grid.allAppsCellHeightPx);
-- 
GitLab


From 854fbf8d235a3a8ae6193d29fa68597d60c36ec4 Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Mon, 12 Jul 2021 17:49:13 -0700
Subject: [PATCH 1603/1664] Use display cutout info in auto-enter-pip
 transition

Video: http://recall/-/aaaaaabFQoRHlzixHdtY/bpKcGg1eoOo5Jz5U6IwBYK
Bug: 191310680
Test: manual, auto-enter-pip from landscape with source rect hint being
      turned on, see the video
Change-Id: Ic191fc73597132a5119522dda477a4319e35d1c8
Merged-In: Ic191fc73597132a5119522dda477a4319e35d1c8
---
 .../android/quickstep/AbsSwipeUpHandler.java   | 18 +++++++++---------
 .../quickstep/util/AssistantUtilities.java     |  3 +--
 .../quickstep/util/SwipePipToHomeAnimator.java | 15 ++++++++++++++-
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 7e45369692..ac1772c300 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -115,7 +115,6 @@ import com.android.systemui.shared.system.InputConsumerController;
 import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
 import com.android.systemui.shared.system.LatencyTrackerCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
-import com.android.systemui.shared.system.TaskInfoCompat;
 import com.android.systemui.shared.system.TaskStackChangeListener;
 import com.android.systemui.shared.system.TaskStackChangeListeners;
 
@@ -1105,7 +1104,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         public void onActivityRestartAttempt(ActivityManager.RunningTaskInfo task,
                 boolean homeTaskVisible, boolean clearedTask, boolean wasVisible) {
             if (task.taskId == mGestureState.getRunningTaskId()
-                    && TaskInfoCompat.getActivityType(task) != ACTIVITY_TYPE_HOME) {
+                    && task.configuration.windowConfiguration.getActivityType()
+                    != ACTIVITY_TYPE_HOME) {
                 // Since this is an edge case, just cancel and relaunch with default activity
                 // options (since we don't know if there's an associated app icon to launch from)
                 endRunningWindowAnim(true /* cancel */);
@@ -1146,8 +1146,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
             boolean appCanEnterPip = !mDeviceState.isPipActive()
                     && runningTaskTarget != null
                     && runningTaskTarget.taskInfo.pictureInPictureParams != null
-                    && TaskInfoCompat.isAutoEnterPipEnabled(
-                            runningTaskTarget.taskInfo.pictureInPictureParams);
+                    && runningTaskTarget.taskInfo.pictureInPictureParams.isAutoEnterEnabled();
             HomeAnimationFactory homeAnimFactory =
                     createHomeAnimationFactory(cookies, duration, isTranslucent, appCanEnterPip,
                             runningTaskTarget);
@@ -1248,7 +1247,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
 
         final Rect destinationBounds = SystemUiProxy.INSTANCE.get(mContext)
                 .startSwipePipToHome(taskInfo.topActivity,
-                        TaskInfoCompat.getTopActivityInfo(taskInfo),
+                        taskInfo.topActivityInfo,
                         runningTaskTarget.taskInfo.pictureInPictureParams,
                         homeRotation,
                         mDp.hotseatBarSizePx);
@@ -1257,9 +1256,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                 .setTaskId(runningTaskTarget.taskId)
                 .setComponentName(taskInfo.topActivity)
                 .setLeash(runningTaskTarget.leash.getSurfaceControl())
-                .setSourceRectHint(TaskInfoCompat.getPipSourceRectHint(
-                        runningTaskTarget.taskInfo.pictureInPictureParams))
-                .setAppBounds(TaskInfoCompat.getWindowConfigurationBounds(taskInfo))
+                .setSourceRectHint(
+                        runningTaskTarget.taskInfo.pictureInPictureParams.getSourceRectHint())
+                .setAppBounds(taskInfo.configuration.windowConfiguration.getBounds())
                 .setHomeToWindowPositionMap(homeToWindowPositionMap)
                 .setStartBounds(startRect)
                 .setDestinationBounds(destinationBounds)
@@ -1269,7 +1268,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         // is not ROTATION_0 (which implies the rotation is turned on in launcher settings).
         if (homeRotation == ROTATION_0
                 && (windowRotation == ROTATION_90 || windowRotation == ROTATION_270)) {
-            builder.setFromRotation(mTaskViewSimulator, windowRotation);
+            builder.setFromRotation(mTaskViewSimulator, windowRotation,
+                    taskInfo.displayCutoutInsets);
         }
         final SwipePipToHomeAnimator swipePipToHomeAnimator = builder.build();
         AnimatorPlaybackController activityAnimationToHome =
diff --git a/quickstep/src/com/android/quickstep/util/AssistantUtilities.java b/quickstep/src/com/android/quickstep/util/AssistantUtilities.java
index 552db1f4dd..336f7d1362 100644
--- a/quickstep/src/com/android/quickstep/util/AssistantUtilities.java
+++ b/quickstep/src/com/android/quickstep/util/AssistantUtilities.java
@@ -23,7 +23,6 @@ import android.content.Intent;
 import android.os.Build;
 
 import com.android.systemui.shared.system.ActivityManagerWrapper;
-import com.android.systemui.shared.system.TaskInfoCompat;
 
 /**
  * Utility class for interacting with the Assistant.
@@ -39,7 +38,7 @@ public final class AssistantUtilities {
     /** Returns true if the given task holds an Assistant activity that is excluded from recents. */
     public static boolean isExcludedAssistant(TaskInfo info) {
         return info != null
-            && TaskInfoCompat.getActivityType(info) == ACTIVITY_TYPE_ASSISTANT
+            && info.configuration.windowConfiguration.getActivityType() == ACTIVITY_TYPE_ASSISTANT
             && (info.baseIntent.getFlags() & Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS) != 0;
     }
 
diff --git a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
index 7488649eb7..c0f5c14e3c 100644
--- a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
+++ b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
@@ -301,6 +301,7 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim {
         private ComponentName mComponentName;
         private SurfaceControl mLeash;
         private Rect mSourceRectHint;
+        private Rect mDisplayCutoutInsets;
         private Rect mAppBounds;
         private Matrix mHomeToWindowPositionMap;
         private RectF mStartBounds;
@@ -366,7 +367,8 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim {
         }
 
         public Builder setFromRotation(TaskViewSimulator taskViewSimulator,
-                @RecentsOrientedState.SurfaceRotation int fromRotation) {
+                @RecentsOrientedState.SurfaceRotation int fromRotation,
+                Rect displayCutoutInsets) {
             if (fromRotation != Surface.ROTATION_90 && fromRotation != Surface.ROTATION_270) {
                 Log.wtf(TAG, "Not a supported rotation, rotation=" + fromRotation);
                 return this;
@@ -381,6 +383,9 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim {
             transformed.round(mDestinationBoundsTransformed);
 
             mFromRotation = fromRotation;
+            if (displayCutoutInsets != null) {
+                mDisplayCutoutInsets = new Rect(displayCutoutInsets);
+            }
             return this;
         }
 
@@ -388,6 +393,14 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim {
             if (mDestinationBoundsTransformed.isEmpty()) {
                 mDestinationBoundsTransformed.set(mDestinationBounds);
             }
+            // adjust the mSourceRectHint / mAppBounds by display cutout if applicable.
+            if (mSourceRectHint != null && mDisplayCutoutInsets != null) {
+                if (mFromRotation == Surface.ROTATION_90) {
+                    mSourceRectHint.offset(mDisplayCutoutInsets.left, mDisplayCutoutInsets.top);
+                } else if (mFromRotation == Surface.ROTATION_270) {
+                    mAppBounds.inset(mDisplayCutoutInsets);
+                }
+            }
             return new SwipePipToHomeAnimator(mContext, mTaskId, mComponentName, mLeash,
                     mSourceRectHint, mAppBounds,
                     mHomeToWindowPositionMap, mStartBounds, mDestinationBounds,
-- 
GitLab


From de28038e64585ac9fc06c528e974264f29d95543 Mon Sep 17 00:00:00 2001
From: Jon Spivack <spivack@google.com>
Date: Tue, 13 Jul 2021 13:54:02 -0700
Subject: [PATCH 1604/1664] NIU Actions: Hide button captions when feature is
 disabled

Previously, only the buttons themselves were hidden when the feature was flagged off at build time. This adds the rest of the relevant layout UI (captions, spaces) to that logic.

Bug: 192692326
Test: Manual (Pixel 3A, enable_niu_actions on and off)
Change-Id: Ic58d9891887e3e0eb10d38af80b73f04cf66ea79
---
 go/quickstep/res/layout/overview_actions_container.xml |  5 +++++
 .../android/quickstep/views/GoOverviewActionsView.java | 10 ++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/go/quickstep/res/layout/overview_actions_container.xml b/go/quickstep/res/layout/overview_actions_container.xml
index e7da196fad..0e718ca08d 100644
--- a/go/quickstep/res/layout/overview_actions_container.xml
+++ b/go/quickstep/res/layout/overview_actions_container.xml
@@ -34,6 +34,7 @@
             android:layout_weight="1" />
 
         <LinearLayout
+            android:id="@+id/layout_translate"
             style="@style/GoOverviewActionButtonContainer">
             <ImageButton
                 android:id="@+id/action_translate"
@@ -46,10 +47,12 @@
         </LinearLayout>
 
         <Space
+            android:id="@+id/spacer_translate"
             android:layout_width="@dimen/go_overview_button_container_margin"
             android:layout_height="1dp" />
 
         <LinearLayout
+            android:id="@+id/layout_listen"
             style="@style/GoOverviewActionButtonContainer">
             <ImageButton
                 android:id="@+id/action_listen"
@@ -63,10 +66,12 @@
         </LinearLayout>
 
         <Space
+            android:id="@+id/spacer_listen"
             android:layout_width="@dimen/go_overview_button_container_margin"
             android:layout_height="1dp" />
 
         <LinearLayout
+            android:id="@+id/layout_screenshot"
             style="@style/GoOverviewActionButtonContainer">
             <ImageButton
                 android:id="@+id/action_screenshot"
diff --git a/go/quickstep/src/com/android/quickstep/views/GoOverviewActionsView.java b/go/quickstep/src/com/android/quickstep/views/GoOverviewActionsView.java
index 5b535a2f53..97ba5905e0 100644
--- a/go/quickstep/src/com/android/quickstep/views/GoOverviewActionsView.java
+++ b/go/quickstep/src/com/android/quickstep/views/GoOverviewActionsView.java
@@ -16,6 +16,8 @@
 
 package com.android.quickstep.views;
 
+import static android.view.View.GONE;
+
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
@@ -54,11 +56,11 @@ public class GoOverviewActionsView extends OverviewActionsView<OverlayUICallback
         if (getResources().getBoolean(R.bool.enable_niu_actions)) {
             findViewById(R.id.action_listen).setOnClickListener(this);
             findViewById(R.id.action_translate).setOnClickListener(this);
-            findViewById(R.id.action_search).setOnClickListener(this);
         } else {
-            findViewById(R.id.action_listen).setVisibility(View.GONE);
-            findViewById(R.id.action_translate).setVisibility(View.GONE);
-            findViewById(R.id.action_search).setVisibility(View.GONE);
+            findViewById(R.id.layout_listen).setVisibility(GONE);
+            findViewById(R.id.spacer_listen).setVisibility(GONE);
+            findViewById(R.id.layout_translate).setVisibility(GONE);
+            findViewById(R.id.spacer_translate).setVisibility(GONE);
         }
     }
 
-- 
GitLab


From 3d7e1ff8f0e8126bae24546dbf1ae458e0f54395 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 14 Jul 2021 04:26:27 +0000
Subject: [PATCH 1605/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I0bd29843a664b6a0a4c106f0f7ac4a7505ef7602
---
 quickstep/res/values-af/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-am/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-ar/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-as/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-az/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-b+sr+Latn/strings.xml | 27 +++++++++++-----------
 quickstep/res/values-be/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-bg/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-bn/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-bs/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-ca/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-cs/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-da/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-de/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-el/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-en-rAU/strings.xml    | 27 +++++++++++-----------
 quickstep/res/values-en-rCA/strings.xml    | 27 +++++++++++-----------
 quickstep/res/values-en-rGB/strings.xml    | 27 +++++++++++-----------
 quickstep/res/values-en-rIN/strings.xml    | 27 +++++++++++-----------
 quickstep/res/values-en-rXC/strings.xml    | 21 +++++++----------
 quickstep/res/values-es-rUS/strings.xml    | 27 +++++++++++-----------
 quickstep/res/values-es/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-et/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-eu/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-fa/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-fi/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-fr-rCA/strings.xml    | 27 +++++++++++-----------
 quickstep/res/values-fr/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-gl/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-gu/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-hi/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-hr/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-hu/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-hy/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-in/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-is/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-it/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-iw/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-ja/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-ka/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-kk/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-km/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-kn/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-ko/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-ky/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-lo/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-lt/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-lv/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-mk/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-ml/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-mn/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-mr/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-ms/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-my/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-nb/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-ne/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-nl/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-or/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-pa/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-pl/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-pt-rPT/strings.xml    | 27 +++++++++++-----------
 quickstep/res/values-pt/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-ro/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-ru/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-si/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-sk/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-sl/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-sq/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-sr/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-sv/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-sw/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-ta/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-te/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-th/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-tl/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-tr/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-uk/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-ur/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-uz/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-vi/strings.xml        | 27 +++++++++++-----------
 quickstep/res/values-zh-rCN/strings.xml    | 27 +++++++++++-----------
 quickstep/res/values-zh-rHK/strings.xml    | 27 +++++++++++-----------
 quickstep/res/values-zh-rTW/strings.xml    | 27 +++++++++++-----------
 quickstep/res/values-zu/strings.xml        | 27 +++++++++++-----------
 84 files changed, 1170 insertions(+), 1092 deletions(-)

diff --git a/quickstep/res/values-af/strings.xml b/quickstep/res/values-af/strings.xml
index 468628e91a..cf2fec725a 100644
--- a/quickstep/res/values-af/strings.xml
+++ b/quickstep/res/values-af/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Programvoorstelle is geaktiveer"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Programvoorstelle is gedeaktiveer"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Voorspelde program: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Maak seker dat jy van die rand heel links af swiep."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Maak seker dat jy van die linkerrand na die middel van die skerm swiep en laat los."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Maak seker dat jy van die rand heel regs af swiep."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Maak seker dat jy van die regterrand na die middel van die skerm swiep en laat los."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Jy het geleer hoe om van links af te swiep om terug te gaan."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Jy het geleer hoe om van regs af te swiep om terug te gaan. Nou kan jy leer hoe om tussen programme te wissel."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Jy het die \"gaan terug\"-gebaar voltooi."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Maak seker dat jy nie te naby aan die onderkant van die skerm swiep nie."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Gaan na Instellings om sensitiwiteit van teruggebaar te verander"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Swiep van links af om terug te gaan"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Swiep van regs af om terug te gaan"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Swiep van links af na middel van skerm om terug te gaan na laaste skerm waarop jy was."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Swiep van regs af na middel van skerm om terug te gaan na laaste skerm. Probeer dit nou."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Swiep om terug te gaan"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Swiep van die linker- of regterrand na die middel van die skerm om na die vorige skerm terug te gaan."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Maak seker dat jy van die onderrand van die skerm af opswiep."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Maak seker jy onderbreek nie voordat jy laat los nie."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Maak seker jy swiep reguit op."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Jy het geleer hoe om gebare te gebruik. Gaan na Instellings om gebare af te skakel."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Jy het die \"wissel tussen programme\"-gebaar voltooi."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swiep om tussen programme te wissel"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swiep op van die onderkant van jou skerm af, hou en laat los dan."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Gereed"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Volgende"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Instellings"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Probeer weer"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Mooi so!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutoriaal <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Gereed!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Swiep op om na die tuisskerm toe te gaan"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Jy is gereed om jou foon te begin gebruik"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Navigasie-instellings vir toeganklikheid"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Deel"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Skermkiekie"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Jou organisasie laat nie hierdie program toe nie"</string>
diff --git a/quickstep/res/values-am/strings.xml b/quickstep/res/values-am/strings.xml
index 3b3366df47..4b57b9bbd0 100644
--- a/quickstep/res/values-am/strings.xml
+++ b/quickstep/res/values-am/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"የመተግበሪያ አስተያየት ጥቆማዎች ነቅቷል"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"የመተግበሪያ አስተያየቶች ቦዝነዋል"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"የተገመተው መተግበሪያ፦ <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ከግራ ጠርዝ ጥግ ጀምሮ ማንሸራተትዎን ያረጋግጡ።"</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ከግራ ጠርዝ ወደ ማያ ገጹ መሃል ማንሸራተትዎን እና መልቀቅዎን ያረጋግጡ።"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ከቀኝ ጠርዝ ጥግ ጀምሮ ማንሸራተትዎን ያረጋግጡ።"</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ከቀኝ ጠርዝ ወደ ማያ ገጹ መሃል ማንሸራተትዎን እና መልቀቅዎን ያረጋግጡ።"</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"ወደ ኋላ ለመመለስ ከግራ ጀምሮ እንዴት ማንሸራተት እንደሚችሉ አውቀዋል።"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ወደ ኋላ ለመመለስ ከቀኝ ጀምሮ እንዴት ማንሸራተት እንደሚችሉ አውቀዋል። ቀጥለው መተግበሪያዎችን እንዴት መቀየር እንደሚችሉ ይወቁ።"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ወደኋላ የመመለስ ምልክትን አጠናቀዋል።"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ከማያ ገጹ ታችኛው ክፍል ጋር በጣም ጠጋ ብለው አለማንሸራተትዎን ያረጋግጡ።"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ከኋላ ስሜት ሰጭነት ደረጃ ለመለወጥ ወደ ቅንብሮች ይመለሱ"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"ወደ ኋላ ለመመለስ ከግራ ጀምረው ያንሸራትቱ"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"ወደ ኋላ ለመመለስ ከቀኝ ጀምረው ያንሸራቱ"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"ወደነበሩበት የመጨረሻው ማያ ገጽ ለመመለስ ከግራ ጠርዝ ወደ ማያ ገጹ መሃል ያንሸራትቱ።"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"እንዲሁም ከቀኝ ጠርዝ ወደ ማያ ገጹ መሃል በማንሸራተት ወደ መጨረሻው ማያ ገጽ መመለስ ይችላሉ። አሁኑኑ ይሞክሩት።"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"ወደኋላ ለመመለስ ያንሸራትቱ"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"ወደ መጨረሻው ማያ ገጽ ለመመለስ ከግራ ወይም ከቀኝ ጠርዝ ወደ ማያ ገጹ መሃል ያንሸራትቱ።"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ከማያ ገጹ የታችኛው ጫፍ ወደ ላይ ማንሸራተትዎን ያረጋግጡ።"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ከመልቀቅዎ በፊት ለአፍታ እንዳልቆሙ ያረጋግጡ።"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"በቀጥታ ወደ ላይ ማንሸራተትዎን ያረጋግጡ።"</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"የእጅ ምልክቶችን እንዴት እንደሚጠቀሙ ተምረዋል። የእጅ ምልክቶችን ለማጥፋት ወደ ቅንብሮች ይሂዱ።"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"መተግበሪያዎችን የመቀያየር ምልክትን አጠናቀዋል።"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"መተግበሪያዎችን ለመቀየር ያንሸራትቱ"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ከእርስዎ ማያ ገጽ ግርጌ ላይ ወደ ላይ በጣት ጠረግ ያድርጉ፣ ይያዙ፣ በመቀጠል ይልቀቁ።"</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"ሁሉም ዝግጁ"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"ቀጣይ"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ቅንብሮች"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"እንደገና ሞክር"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ጥሩ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"አጋዥ ሥልጠና <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"ሁሉም ዝግጁ!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"ወደ መነሻ ለመሄድ በጣት ወደ ላይ ይጥረጉ"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"ስልክዎን መጠቀም ለመጀመር ዝግጁ ነዎት"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"የአሰሳ ቅንብሮች ለተደራሽነት"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"አጋራ"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ቅጽበታዊ ገጽ እይታ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ይህ ድርጊት በመተግበሪያው ወይም በእርስዎ ድርጅት አይፈቀድም"</string>
diff --git a/quickstep/res/values-ar/strings.xml b/quickstep/res/values-ar/strings.xml
index 826b162d79..238942eba0 100644
--- a/quickstep/res/values-ar/strings.xml
+++ b/quickstep/res/values-ar/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"تم تفعيل ميزة \"التطبيقات المقترحة\"."</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ميزة \"التطبيقات المقترحة\" غير مفعّلة."</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"التطبيق المتوقع: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"تأكّد من التمرير سريعًا من أقصى الحافة اليمنى."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"تأكّد من التمرير سريعًا من الحافة اليمنى إلى وسط الشاشة ثم ارفع إصبعك."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"تأكّد من التمرير سريعًا من أقصى الحافة اليسرى."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"تأكّد من التمرير سريعًا من الحافة اليسرى إلى وسط الشاشة ثم ارفع إصبعك."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"لقد تعلمت كيفية التمرير سريعًا من اليمين للرجوع."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"لقد تعلمت كيفية التمرير سريعًا من اليسار للرجوع. تعرّف بعد ذلك على كيفية التبديل بين التطبيقات."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"لقد أكملت التدريب على إيماءة الرجوع."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"تأكّد من عدم التمرير بالقرب من أسفل الشاشة."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"لتغيير مستوى حساسية إيماءة الرجوع، انتقِل إلى \"الإعدادات\""</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"مرِّر سريعًا من اليمين للرجوع."</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"التمرير سريعًا من اليسار للرجوع"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"للرجوع إلى الشاشة السابقة، مرِّر سريعًا من الحافة اليمنى إلى وسط الشاشة"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"يمكنك أيضًا الرجوع للشاشة السابقة بالتمرير سريعًا من الحافة اليسرى إلى وسط الشاشة. جرِّب ذلك الآن."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"مرِّر سريعًا للرجوع."</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"للرجوع إلى الشاشة السابقة، مرِّر سريعًا من الحافة اليسرى أو الحافة اليمنى إلى وسط الشاشة."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"تأكّد من التمرير سريعًا من الحافة السفلى للشاشة إلى أعلاها."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"تأكّد من عدم التوقّف قليلاً قبل رفع إصبعك."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"تأكّد من التمرير إلى الأعلى مباشرةً."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"تعرّفت على كيفية استخدام الإيماءات. لإيقاف الإيماءات، انتقِل إلى \"الإعدادات\"."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"أكملت التدريب على إيماءة التبديل بين التطبيقات."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"مرِّر سريعًا للتبديل بين التطبيقات"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"مرِّر سريعًا من أسفل الشاشة إلى أعلاها، وأبقِ إصبعك على الشاشة قليلاً ثم ارفعه."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"اكتمل التدريب على الإيماءة"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"التالي"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"الإعدادات"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"إعادة المحاولة"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"أحسنت"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"الدليل التوجيهي <xliff:g id="CURRENT">%1$d</xliff:g> من إجمالي <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"اكتمال الإعداد"</string>
-    <string name="allset_hint" msgid="459504134589971527">"يمكنك التمرير السريع إلى الأعلى للانتقال إلى الشاشة الرئيسية."</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"يمكنك الآن بدء استخدام هاتفك."</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"إعدادات التنقل لسهولة الاستخدام"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"مشاركة"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"لقطة شاشة"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"لا يسمح التطبيق أو لا تسمح مؤسستك بهذا الإجراء."</string>
diff --git a/quickstep/res/values-as/strings.xml b/quickstep/res/values-as/strings.xml
index bf61006c54..04653932dd 100644
--- a/quickstep/res/values-as/strings.xml
+++ b/quickstep/res/values-as/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"এপৰ পৰামৰ্শসমূহ সক্ষম কৰা আছে"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"এপৰ পৰামৰ্শসমূহ অক্ষম কৰা আছে"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"পূৰ্বানুমান কৰা এপ্: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"আপুনি বাওঁ প্ৰান্তৰৰ একেবাৰে সীমাৰ পৰা ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"আপুনি স্ক্ৰীনৰ বাওঁ প্ৰান্তৰৰ পৰা সোঁ প্ৰান্তৰৰ ফালে মধ্যভাগলৈকে ছোৱাইপ কৰি এৰি দিয়াটো নিশ্চিত কৰক।"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"আপুনি সোঁ প্ৰান্তৰৰ একেবাৰে সীমাৰ পৰা ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"আপুনি স্ক্ৰীনৰ সোঁ প্ৰান্তৰৰ পৰা মধ্যভাগলৈকে ছোৱাইপ কৰি এৰি দিয়াটো নিশ্চিত কৰক।"</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"বাওঁফালৰ পৰা ছোৱাইপ কৰি কেনেকৈ উভতি যাব লাগে, সেইটো আপুনি জানিলে।"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"সোঁফালৰ পৰা ছোৱাইপ কৰি কেনেকৈ উভতি যাব লাগে, সেইটো আপুনি জানিলে। ইয়াৰ পাছত, এপ্‌ কেনেকৈ সলনি কৰিব সেয়া জানক।"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"আপুনি উভতি যাওক নিৰ্দেশটো সম্পূৰ্ণ কৰিলে।"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"আপুনি স্ক্ৰীনৰ তলৰ অংশৰ বেছি ওচৰলৈ ছোৱাইপ নকৰাটো নিশ্চিত কৰক।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"উভতি যোৱাৰ নির্দেশটোৰ সংবেদনশীলতা সলনি কৰিবলৈ ছেটিঙলৈ যাওক"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"উভতি যাবলৈ বাওঁফালৰ পৰা ছোৱাইপ কৰক"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"উভতি যাবলৈ সোঁফালৰ পৰা ছোৱাইপ কৰক"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"আপুনি পূৰ্বে থকা অন্তিম স্ক্ৰীনখনলৈ উভতি যাবলৈ স্ক্ৰীনখনৰ বাওঁ প্ৰান্তৰৰ পৰা মাজলৈ ছোৱাইপ কৰক।"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"আপুনি স্ক্ৰীনখনৰ সোঁ প্ৰান্তৰৰ পৰা মাজলৈ ছোৱাইপ কৰিও অন্তিম স্ক্ৰীনখনলৈ উভতি যাব পাৰে। এতিয়াই চেষ্টা কৰি চাওক।"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"উভতি যাবলৈ ছোৱাইপ কৰক"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"অন্তিম স্ক্ৰীনখনলৈ উভতি যাবলৈ বাওঁ অথবা সোঁ প্ৰান্তৰৰ পৰা মাজলৈ ছোৱাইপ কৰক।"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"আপুনি স্ক্ৰীনৰ তলৰ প্ৰান্তৰ পৰা ওপৰলৈ ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"আপুনি এৰি দিয়াৰ পূৰ্বে অলপো নোৰোৱাটো নিশ্চিত কৰক।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"আপুনি পোনকৈ ওপৰলৈ ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"আপুনি নিৰ্দেশসমূহ কেনেকৈ ব্যৱহাৰ কৰিব লাগে সেয়া জানিলে। নিৰ্দেশসমূহ অফ কৰিবলৈ, ছেটিঙলৈ যাওক।"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"আপুনি এপ্‌ সলনি কৰাৰ নিৰ্দেশটো সম্পূৰ্ণ কৰিলে।"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"এপ্‌ সলনি কৰিবলৈ ছোৱাইপ কৰক"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"আপোনাৰ স্ক্ৰীনৰ একেবাৰে তলৰ অংশৰ পৰা ওপৰলৈ ছোৱাইপ কৰি ধৰি ৰাখক আৰু তাৰ পাছত এৰি দিয়ক।"</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"সম্পূৰ্ণ সাজু"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"পৰৱৰ্তী"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ছেটিং"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"পুনৰ চেষ্টা কৰক"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"সুন্দৰ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"টিউট’ৰিয়েল <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"সকলো সাজু!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"গৃহ স্ক্ৰীনলৈ যাবলৈ ওপৰলৈ ছোৱাইপ কৰক"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"আপুনি আপোনাৰ ফ’নটো ব্যৱহাৰ কৰিবলৈ সাজু"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"সাধ্য-সুবিধাৰ বাবে নেভিগেশ্বনৰ ছেটিং"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"শ্বেয়াৰ কৰক"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"স্ক্ৰীনশ্বট"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"এপ্‌টোৱে অথবা আপোনাৰ প্ৰতিষ্ঠানে এই কাৰ্যটোৰ অনুমতি নিদিয়ে"</string>
diff --git a/quickstep/res/values-az/strings.xml b/quickstep/res/values-az/strings.xml
index 377292a56c..75f1741d17 100644
--- a/quickstep/res/values-az/strings.xml
+++ b/quickstep/res/values-az/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Tətbiq təklifləri aktivdir"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Tətbiq təklifləri deaktivdir"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Proqnozlaşdırılan tətbiq: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Ekranın ən kənar solundan sağa sürüşdürün."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Ekranın sol kənarından ortasına sürüşdürüb buraxın."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Ekranın ən kənar sağından sola sürüşdürün."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Ekranın sağ kənarından ortasına sürüşdürüb buraxın."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Geri qayıtmaq üçün soldan sürüşdürmək qaydasını öyrəndiniz."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Geri qayıtmaq üçün sağdan sürüşdürmək qaydasını öyrəndiniz. Sonra tətbiqləri keçirməyi öyrənin."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Geri getmə jestini tamamladınız."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ekranın altına çox yaxın sürüşdürmədiyinizə əmin olun."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Geri qayıtma jestinin həssaslığını dəyişmək üçün Ayarlara keçin"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Geri qayıtmaq üçün soldan sürüşdürün"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Geri qayıtmaq üçün sağdan sürüşdürün"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Son ekrana qayıtmaq üçün ekranın sol kənarından ortasına doğru sürüşdürün."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Həmçinin ekranın sağ kənarından ortasına sürüşdürərək son ekrana qayıda bilərsiniz. İndi sınayın."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Geri qayıtmaq üçün sürüşdürün"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Sonuncu ekrana qayıtmaq üçün ekranın sol, yaxud sağ kənarından mərkəzinə doğru sürüşdürün."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Ekranın ən kənar aşağısından yuxarı sürüşdürün."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Buraxmazdan əvvəl durdurmadığınıza əmin olun."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Birbaşa yuxarı sürüşdürün."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Jestlərdən istifadə qaydasını öyrəndiniz. Jestləri deaktiv etmək üçün Ayarlara keçin."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Tətbiqləri keçirmə jestini tamamladınız."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Tətbiqi keçirmək üçün sürüşdürün"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Ekranın aşağısından yuxarı doğru sürüşdürüb saxlayın, sonra buraxın."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Tam hazır"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Sonra"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Ayarlar"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Yenə sınayın"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Əla!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Dərslik <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Hər şey hazırdır!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Əsas səhifəyə keçmək üçün yuxarı çəkin"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Telefondan istifadəyə başlamağa hazırsınız"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Əlçatımlıq üzrə naviqasiya ayarları"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Paylaşın"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Skrinşot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Bu əməliyyata tətbiq və ya təşkilatınız tərəfindən icazə verilmir"</string>
diff --git a/quickstep/res/values-b+sr+Latn/strings.xml b/quickstep/res/values-b+sr+Latn/strings.xml
index d37a640639..1d96f9d942 100644
--- a/quickstep/res/values-b+sr+Latn/strings.xml
+++ b/quickstep/res/values-b+sr+Latn/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Predlozi aplikacija su omogućeni"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Predlozi aplikacija su onemogućeni"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predviđamo aplikaciju: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Obavezno prevucite od same leve ivice."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Obavezno prevucite od leve ivice do sredine ekrana i otpustite."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Obavezno prevucite od same desne ivice."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Obavezno prevucite od desne ivice do sredine ekrana i otpustite."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Naučili ste kako da prevlačite sleva da biste se vratili."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Naučili ste kako da prevlačite zdesna da biste se vratili. Sada naučite da menjate aplikacije."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Dovršili ste pokret za povratak."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nikako ne prevlačite previše blizu dna ekrana."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Osetljivost pok. za nazad možete da promenite u Podešavanjima"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Prevucite sleva da biste se vratili"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Prevucite zdesna da biste se vratili"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Da biste se vratili na poslednji ekran, prevucite od leve ivice ka sredini ekrana."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Možete da se vratite na poslednji ekran i prevlačenjem od desne ivice ka sredini ekrana. Isprobajte."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Prevucite da biste se vratili"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Da biste se vratili na poslednji ekran, prevucite od leve ili desne ivice do sredine ekrana."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Obavezno prevucite nagore od donje ivice ekrana."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Nikako ne stajte pre otpuštanja."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Obavezno prevucite pravo nagore."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Naučili ste kako da koristite pokrete. Da biste isključili pokrete, idite na podešavanja."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Dovršili ste pokret za promenu aplikacija."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Prevucite da biste promenili aplikacije"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Prevucite nagore od dna ekrana, zadržite, pa pustite."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"To je to"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Dalje"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Podešavanja"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Probajte ponovo"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Svaka čast!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Vodič <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Gotovo!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Prevucite nagore da biste otvorili početni ekran"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Spremni ste da počnete da koristite telefon"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Podešavanja navigacije za pristupačnost"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Deli"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Snimak ekrana"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikacija ili organizacija ne dozvoljavaju ovu radnju"</string>
diff --git a/quickstep/res/values-be/strings.xml b/quickstep/res/values-be/strings.xml
index e0ae63b0f1..949fcbf503 100644
--- a/quickstep/res/values-be/strings.xml
+++ b/quickstep/res/values-be/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Прапановы праграм уключаны"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Прапановы праграм выключаны"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Праграма з падказкі: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Пераканайцеся, што вы не праводзіце пальцам занадта далёка ад левага вугла экрана."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Пераканайцеся, што праводзіце пальцам з левага вугла ў цэнтр экрана, а потым адпускаеце."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Пераканайцеся, што вы не праводзіце пальцам занадта далёка ад правага вугла экрана."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Пераканайцеся, што праводзіце пальцам з правага вугла ў цэнтр экрана, а потым адпускаеце."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Вы даведаліся, як праводзіць пальцам злева ўправа для вяртання."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Вы даведаліся, як гартаць справа для вяртання. Цяпер даведайцеся, як пераключацца паміж праграмамі."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Вы навучыліся рабіць жэст вяртання."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Пераканайцеся, што вы не праводзіце пальцам занадта блізка да ніжняга краю экрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Каб змяніць адчувальнасць жэста вяртання, адкрыйце налады"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Каб вярнуцца назад, правядзіце пальцам ад левага краю"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Каб вярнуцца назад, правядзіце пальцам ад правага краю"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Каб вярнуцца на папярэдні экран, правядзіце пальцам ад левага краю ў цэнтр экрана."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Для вяртання на папярэдні экран таксама можна правесці ад правага краю ў цэнтр экрана. Паспрабуйце."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Правядзіце пальцам, каб вярнуцца"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Каб вярнуцца на папярэдні экран, правядзіце пальцам ад левага ці правага краю да цэнтра экрана."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Пераканайцеся, што праводзіце пальцам па экране знізу ўверх."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Пераканайцеся, што не затрымліваецеся перад адпусканнем."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Пераканайцеся, што праводзіце пальцам вертыкальна."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Вы навучыліся выкарыстоўваць жэсты. Каб выключыць жэсты, адкрыйце Налады."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Вы навучыліся рабіць жэст пераключэння паміж праграмамі."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Правесці пальцам для пераключэння паміж праграмамі"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Правядзіце па экране знізу ўверх, утрымліваючы палец націснутым, потым адпусціце."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Гатова"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Далей"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Налады"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Паўтарыць спробу"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Выдатна!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Дапаможнік <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Гатова!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Каб перайсці на галоўны экран, правядзіце пальцам уверх"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Вы можаце пачаць карыстанне тэлефонам"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Налады навігацыі для спецыяльных магчымасцей"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Абагуліць"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Здымак экрана"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Гэта дзеянне не дазволена праграмай ці вашай арганізацыяй"</string>
diff --git a/quickstep/res/values-bg/strings.xml b/quickstep/res/values-bg/strings.xml
index 47317a7404..cf43c76d63 100644
--- a/quickstep/res/values-bg/strings.xml
+++ b/quickstep/res/values-bg/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Предложенията за приложения са активирани"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Функцията „Предложения за приложения“ е деактивирана"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Предвидено приложение: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Трябва да прекарате пръст от най-лявата част на екрана."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Трябва да прекарате пръст от левия край на екрана до средата, след което да вдигнете пръста си."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Трябва да прекарате пръст от най-дясната част на екрана."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Трябва да прекарате пръст от десния край на екрана до средата, след което да вдигнете пръста си."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Научихте как да се връщате назад с прекарване на пръст от левия край на екрана."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Научихте жеста за връщане с плъзгане от дясно. Сега научете как се превключва между приложения."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Изпълнихте жеста за връщане назад."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Не прекарвайте пръст твърде близо до долната част на екрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Променете чувств. на жеста за връщане назад от настройките"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Връщане назад с прекарване на пръст от левия край"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Връщане назад с прекарване на пръст от десния край"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"За да се върнете на последния активен екран, прекарайте пръст от левия край на екрана до средата."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Прекарайте пръст от десния край до средата за връщане към последния екран. Изпробвайте сега."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Прекарване на пръст за връщане назад"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"За да се върнете на предишния екран, прекарайте пръст от левия или десния край на екрана до средата."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Трябва да прекарате пръст нагоре от долния край на екрана."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Не задържайте, преди да вдигнете пръста си."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Трябва да прекарате пръст право нагоре."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Научихте как да използвате жестовете. За да ги изключите, отворете настройките."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Изпълнихте жеста за превключване между приложения."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Прекарване на пръст за превключване между приложенията"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Прекарайте пръст нагоре от долната част на екрана, задръжте и след това вдигнете пръста си."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Готово"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Напред"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Настройки"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Опитайте отново"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Чудесно!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Урок <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Готово!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Прекарайте пръст нагоре, за да отворите началния екран"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Можете да започнете да използвате телефона си"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Настройки за навигиране за достъпността"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Споделяне"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Екранна снимка"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Това действие не е разрешено от приложението или организацията ви"</string>
diff --git a/quickstep/res/values-bn/strings.xml b/quickstep/res/values-bn/strings.xml
index d41edccf78..eab0943f8c 100644
--- a/quickstep/res/values-bn/strings.xml
+++ b/quickstep/res/values-bn/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"অ্যাপ সাজেশন চালু করা আছে"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"অ্যাপ সাজেশন বন্ধ করা আছে"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"আপনার প্রয়োজন হতে পারে এমন অ্যাপ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"একদম বাঁ প্রান্ত থেকে সোয়াইপ করছেন কিনা ভাল করে দেখে নিন।"</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"আপনি বাঁ প্রান্ত থেকে স্ক্রিনের মাঝখান পর্যন্ত সোয়াইপ করছেন ও পরে আঙুল তুলে নিন। এটির খেয়াল রাখুন।"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"একদম ডান প্রান্ত থেকে সোয়াইপ করছেন কিনা ভাল করে দেখে নিন।"</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"আপনি ডান প্রান্ত থেকে স্ক্রিনের মাঝখান পর্যন্ত সোয়াইপ করছেন ও পরে আঙুল তুলে নিন। এটি খেয়াল রাখুন।"</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"ফিরে যেতে, কীভাবে বাঁদিক থেকে সোয়াইপ করতে হয় তা আপনি শিখেছেন।"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ফিরে যেতে, কীভাবে ডান দিক থেকে সোয়াইপ করতে হয় তা আপনি শিখেছেন। এরপর, একটি অ্যাপ থেকে অন্য অ্যাপে কীভাবে যাবেন জেনে নিন।"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"আপনি ফিরে যাওয়ার জেসচার সম্পর্কে জেনেছেন।"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"স্ক্রিনের নিচের প্রান্তের খুব কাছে পর্যন্ত যাতে সোয়াইপ না করেন সেটি ভাল করে দেখে নিন।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ফিরে যাওয়ার জেসচারের সেন্সিটিভিটি পরিবর্তন করতে, সেটিংসে যান"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"ফিরে যেতে স্ক্রিনের বাঁদিক থেকে সোয়াইপ করুন"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"ফিরে যেতে স্ক্রিনের ডানদিক থেকে সোয়াইপ করুন"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"শেষের যে স্ক্রিনে ছিলেন সেখানে ফিরে যেতে, বাঁদিকের প্রান্ত থেকে স্ক্রিনের মাঝখান পর্যন্ত সোয়াইপ করুন।"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"ডানদিকের প্রান্ত থেকে মাঝখান অবধি সোয়াইপ করেও, শেষের যে স্ক্রিনে ছিলেন সেখানে ফিরে যেতে পারেন। এখনই করে দেখুন।"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"ফিরে যেতে সোয়াইপ করুন"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"শেষের স্ক্রিনে ফিরে যেতে, ডান বা বাঁ প্রান্ত থেকে স্ক্রিনের মাঝখান পর্যন্ত সোয়াইপ করুন।"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"স্ক্রিনের নিচের প্রান্ত থেকে আপনি সোয়াইপ করেছেন কিনা ভাল করে দেখে নিন।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"আঙুল তুলে নেওয়ার আগে আপনি যাতে পজ না করেন সেটি ভাল করে দেখে নিন।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"আপনি উপরের দিকে সোজাসুজি সোয়াইপ করেছেন কিনা ভাল করে দেখে নিন।"</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"ইঙ্গিত কীভাবে ব্যবহার করতে হয় আপনি তা শিখে ফেলেছেন। ইঙ্গিত বন্ধ করতে, সেটিংসে যান।"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"আপনি একটি অ্যাপ থেকে অন্য অ্যাপে যাওয়ার জেসচার সম্পর্কে জেনেছেন।"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"একটি অ্যাপ থেকে অন্য অ্যাপে যেতে সোয়াইপ করুন"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"স্ক্রিনের নিচ থেকে উপরের দিকে সোয়াইপ করে ধরে থাকুন, তারপর ছেড়ে দিন।"</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"সব প্রস্তুত"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"পরবর্তী"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"সেটিংস"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"আবার চেষ্টা করুন"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"সাবাস!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"টিউটোরিয়াল <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"সব রেডি!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"হোম স্ক্রিনে যেতে উপরের দিকে সোয়াইপ করুন"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"এবারে আপনি ফোন ব্যবহার করতে পারবেন"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"অ্যাক্সেসিবিলিটির জন্য নেভিগেশন সেটিংস"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"শেয়ার করুন"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"স্ক্রিনশট নিন"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"এই অ্যাপ বা আপনার প্রতিষ্ঠান এই অ্যাকশনটি পারফর্ম করার অনুমতি দেয়নি"</string>
diff --git a/quickstep/res/values-bs/strings.xml b/quickstep/res/values-bs/strings.xml
index 1dc595514d..dce7656cb3 100644
--- a/quickstep/res/values-bs/strings.xml
+++ b/quickstep/res/values-bs/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Prijedlozi aplikacija su omogućeni"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Prijedlozi aplikacija su onemogućeni"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predviđena aplikacija: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Trebate prevući s krajnjeg lijevog ruba."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Trebate prevući s lijevog ruba prema sredini ekrana, a zatim pustiti."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Trebate prevući s krajnjeg desnog ruba."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Trebate prevući s desnog ruba prema sredini ekrana, a zatim pustiti."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Naučili ste kako prevući slijeva nadesno da se vratite."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Naučili ste kako prevući zdesna da se vratite. Sljedeće naučite kako prebacivati između aplikacija."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Završili ste pokret za vraćanje."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Obratite pažnju da ne prevučete preblizu donjem dijelu ekrana."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Promijenite osjetljivost pokreta za povratak u Postavkama"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Prevucite slijeva nadesno da se vratite"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Prevucite prstom zdesna ulijevo da se vratite"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Da se vratite na posljednji ekran na kojem ste bili, prevucite od lijevog ruba do sredine ekrana."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Na posljednji ekran se možete vratiti i prevlačenjem od desnog ruba do sredine ekrana. Isprobajte."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Prevucite da se vratite"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Da se vratite na posljednji ekran, prevucite s lijevog ili desnog ruba prema sredini ekrana."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Trebate prevući prema gore s donjeg ruba ekrana."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Obratite pažnju da ne zastanete prije puštanja."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Trebate prevući ravno prema gore."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Naučili ste kako koristiti pokrete. Idite u Postavke da isključite pokrete."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Završili ste pokret za prebacivanje između aplikacija."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Prevucite da prebacujete između aplikacija"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Prevucite s dna ekrana prema gore, zadržite, a zatim pustite."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Sve je spremno"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Naprijed"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Postavke"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Pokušajte ponovo"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Odlično!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Vodič <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Sve je spremno!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Prevucite prema gore da odete na početnu stranicu"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Sve je spremno da počnete koristiti telefon"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Postavke navigacije za pristupačnost"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Dijeli"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Snimak ekrana"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Ovu radnju ne dozvoljava aplikacija ili vaša organizacija"</string>
diff --git a/quickstep/res/values-ca/strings.xml b/quickstep/res/values-ca/strings.xml
index 3e27168b47..e7ee842eb3 100644
--- a/quickstep/res/values-ca/strings.xml
+++ b/quickstep/res/values-ca/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Els suggeriments d\'aplicacions estan activats"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Els suggeriments d\'aplicacions estan desactivats"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicció d\'aplicació: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Assegura\'t de lliscar des de l\'extrem esquerre de la pantalla."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Assegura\'t de lliscar des de la vora esquerra cap al centre de la pantalla i deixa anar."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Assegura\'t de lliscar des de l\'extrem dret de la pantalla."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Assegura\'t de lliscar des de la vora dreta cap al centre de la pantalla i deixa anar."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Has après com pots lliscar des de l\'esquerra per tornar enrere."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Has après com pots lliscar des de la dreta per tornar enrere. Ara, descobreix com pots canviar d\'app."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Has completat el gest per tornar enrere."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Assegura\'t de no lliscar massa a prop de la part inferior de la pantalla."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Per canviar la sensibilitat del gest, ves a Configuració"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Llisca des de l\'esquerra per tornar enrere"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Llisca des de la dreta per tornar enrere"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Per tornar a la darrera pantalla, llisca des de l\'extrem esquerre cap al centre de la pantalla."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"També pots tornar a la darrera pantalla lliscant des de l\'extrem dret cap al centre. Prova-ho ara."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Llisca per anar enrere"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Per tornar a la darrera pantalla, llisca des de la vora esquerra o dreta cap al centre de la pantalla."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Assegura\'t de lliscar des de la vora inferior de la pantalla."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Assegura\'t de no aturar-te abans de deixar anar."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Assegura\'t de lliscar directament cap amunt."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Has après a utilitzar els gestos. Per desactivar-los, ves a Configuració."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Has completat el gest per canviar d\'aplicació."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Llisca per canviar d\'aplicació"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Llisca cap amunt des de la part inferior de la pantalla, mantén premut i deixa anar."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Tot a punt"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Següent"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Configuració"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Torna-ho a provar"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Molt bé!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Tot a punt!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Llisca cap amunt per anar a la pàgina d\'inici"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Ja pots començar a utilitzar el telèfon"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Configuració de navegació per a accessibilitat"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Comparteix"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Captura de pantalla"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"L\'aplicació o la teva organització no permeten aquesta acció"</string>
diff --git a/quickstep/res/values-cs/strings.xml b/quickstep/res/values-cs/strings.xml
index 101f86557a..e780070f6e 100644
--- a/quickstep/res/values-cs/strings.xml
+++ b/quickstep/res/values-cs/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Návrhy aplikací jsou povoleny"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Návrhy aplikací jsou zakázány"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Předpokládaná aplikace: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Přejeďte prstem z úplného levého okraje obrazovky."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Přejeďte prstem z levého okraje doprostřed obrazovky a zdvihněte prst."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Přejeďte prstem z úplného pravého okraje obrazovky."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Přejeďte prstem z pravého okraje doprostřed obrazovky a zdvihněte prst."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Naučili jste se, jak se vrátit zpět přejetím prstem zleva."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Naučili jste se, jak se vrátit zpět přejetím prstem zprava. Teď se naučíte přepínat aplikace."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Dokončili jste gesto pro přechod zpět."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Dejte pozor, abyste prstem nepřejížděli moc blízko ke spodnímu okraji obrazovky."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Citlivost gesta pro přechod zpět můžete změnit v Nastavení"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Pokud se chcete vrátit, přejeďte prstem zleva"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Přejetím prstem zprava se vrátíte zpět"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Na poslední obrazovku se můžete vrátit přejetím prstem z levého okraje doprostřed obrazovky."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Přejetím prstem z pravého okraje doprostřed obrazovky se také můžete vrátit zpět na poslední obrazovku. Zkuste to."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Přejetím prstem se vrátíte zpět"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"K návratu na poslední obrazovku přejeďte prstem z levého nebo pravého okraje obrazovky doprostřed."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Přejeďte prstem nahoru z dolního okraje obrazovky."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Před zdvihnutím prstu nedělejte pauzu."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Přejeďte prstem přímo nahoru."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Naučili jste se používat gesta. Gesta můžete vypnout v nastavení."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Dokončili jste gesto pro přepínání aplikací."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Přepínání aplikací přejetím prstem"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Přejeďte prstem nahoru z dolního okraje obrazovky, podržte obrazovku a potom prst uvolněte."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Vše je nastaveno"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Další"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Nastavení"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Zkusit znovu"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Skvělé!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Výukový program <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Hotovo!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Přejetím nahoru se vrátíte na plochu"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Jste připraveni začít používat telefon"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Nastavení navigace pro usnadnění přístupu"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Sdílet"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Snímek obrazovky"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikace nebo organizace zakazuje tuto akci"</string>
diff --git a/quickstep/res/values-da/strings.xml b/quickstep/res/values-da/strings.xml
index 9c9d6241bf..e473c1e053 100644
--- a/quickstep/res/values-da/strings.xml
+++ b/quickstep/res/values-da/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Appforslag er aktiveret"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Appforslag er deaktiveret"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App, du forventes at skulle bruge: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Stryg fra kanten yderst til venstre."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Stryg fra venstre kant mod midten af skærmen, og løft fingeren."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Stryg fra kanten yderst til højre."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Stryg fra højre kant mod midten af skærmen, og løft fingeren."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Du har lært, hvordan du stryger fra venstre for at gå tilbage."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Du har lært, hvordan du stryger fra højre for at gå tilbage. Nu skal du se, hvordan du skifter app."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Du har fuldført bevægelsen for Gå tilbage."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Undgå at stryge for tæt på bunden af skærmen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Juster følsomheden for bevægelsen Gå tilbage i Indstillinger"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Stryg fra venstre for at gå tilbage"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Stryg fra højre for at gå tilbage"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Stryg mod midten af skærmen fra venstre kant for at gå tilbage til den seneste skærm, du var på."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Du kan også gå tilbage til den seneste skærm ved at stryge mod midten af skærmen fra højre kant. Prøv det nu."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Stryg for at gå tilbage"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Stryg mod midten af skærmen fra venstre eller højre kant for at gå tilbage til den seneste skærm."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Stryg opad fra bunden af skærmen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Undlad at holde fingeren stille, indtil du løfter fingeren."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Stryg lige opad."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Du har lært, hvordan du bruger bevægelser. Du kan aktivere bevægelser i Indstillinger."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Du har fuldført bevægelsen for Skift app."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Stryg for at skifte app"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Stryg opad fra bunden af skærmen, hold fingeren stille, og løft den."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Så er du klar"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Næste"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Indstillinger"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Prøv igen"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Sådan!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Selvstudie <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Alt er parat!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Stryg opad for at gå til startsiden"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Du er klar til at bruge din telefon"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Navigationsindstillinger for hjælpefunktioner"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Del"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Appen eller din organisation tillader ikke denne handling"</string>
diff --git a/quickstep/res/values-de/strings.xml b/quickstep/res/values-de/strings.xml
index 57d9dbf0c5..701bc29ffe 100644
--- a/quickstep/res/values-de/strings.xml
+++ b/quickstep/res/values-de/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Funktion „App-Vorschläge“ aktiviert"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Funktion \"App-Vorschläge\" deaktiviert"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Vorgeschlagene App: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Wische vom äußersten linken Displayrand."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Wische vom linken Displayrand zur Displaymitte und lass los."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Wische vom äußersten rechten Displayrand."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Wische vom rechten Displayrand zur Displaymitte und lass los."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Du kannst jetzt vom linken Displayrand aus wischen, um zurückzugehen."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Du kannst jetzt vom rechten Displayrand aus wischen, um zurückzugehen. Gleich erfährst du, wie man zwischen Apps wechselt."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Du hast die „Zurück“-Touch-Geste abgeschlossen."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Wische nicht zu nah am unteren Displayrand."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Du kannst die Empfindlichkeit von „Zurück“ in den Einstellungen ändern"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Wische vom linken Displayrand aus, um zurückzugehen"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Wische vom rechten Displayrand aus, um zurückzugehen"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Wenn du zum letzten Bildschirm zurückgehen möchtest, wische vom linken Displayrand zur Mitte."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Du kannst vom rechten Displayrand zur Mitte wischen, um zum letzten Bildschirm zurückzugehen. Probier es aus."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Zum Zurückgehen wischen"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Wenn du zum letzten Bildschirm zurückgehen möchtest, wische vom linken oder rechten Rand zur Mitte."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Wische vom unteren Displayrand nach oben."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Achte darauf, nicht innezuhalten, bevor du loslässt."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Wische gerade nach oben."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Nun weißt du, wie Touch-Gesten funktionieren. Du kannst sie in den Einstellungen deaktivieren."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Du hast die „Apps wechseln“-Touch-Geste abgeschlossen."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Zwischen Apps wechseln"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Wische auf dem Bildschirm von unten nach oben, halte ihn gedrückt und lass ihn dann los."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Fertig"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Weiter"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Einstellungen"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Wiederholen"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Sehr gut!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Anleitung <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Fertig!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Nach oben wischen, um den Startbildschirm aufzurufen"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Du kannst dein Smartphone jetzt verwenden"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Navigationseinstellungen für mehr Barrierefreiheit"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Teilen"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Die App oder deine Organisation lässt diese Aktion nicht zu"</string>
diff --git a/quickstep/res/values-el/strings.xml b/quickstep/res/values-el/strings.xml
index 67209b6eed..f2f850e774 100644
--- a/quickstep/res/values-el/strings.xml
+++ b/quickstep/res/values-el/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Οι προτεινόμενες εφαρμογές ενεργοποιήθηκαν"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Οι προτεινόμενες εφαρμογές είναι απενεργοποιημένες"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Εφαρμογή από πρόβλεψη: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Φροντίστε να σύρετε από το άκρο της αριστερής πλευράς."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Φροντίστε να σύρετε από το αριστερό άκρο προς το μέσο της οθόνης και απομακρύνετε το δάχτυλό σας."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Φροντίστε να σύρετε από το άκρο της δεξιάς πλευράς."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Φροντίστε να σύρετε από το δεξί άκρο προς το μέσο της οθόνης και απομακρύνετε το δάχτυλό σας."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Μάθατε πώς να σύρετε από τα αριστερά για επιστροφή."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Μάθατε πώς να σύρετε από τα δεξιά για επιστροφή. Στη συνέχεια, μάθετε πώς να κάνετε εναλλαγή εφαρμ."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ολοκληρώσατε την κίνηση επιστροφής."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Φροντίστε να μην σύρετε υπερβολικά κοντά στο κάτω μέρος της οθόνης."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Μεταβείτε στις Ρυθμίσεις για αλλαγή ευαισθ. κίνησης επιστρ."</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Για να επιστρέψετε, σύρετε από τα αριστερά"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Για να επιστρέψετε, σύρετε από τα δεξιά"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Για να επιστρέψετε στην τελευταία οθόνη, σύρετε από το αριστερό άκρο προς το κέντρο της οθόνης."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Επιστρέψτε στην τελευταία οθόνη σύροντας από τα δεξιά προς το κέντρο της οθόνης. Δοκιμάστε το τώρα."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Σύρετε για επιστροφή"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Για να επιστρέψετε στην τελευτ. οθόνη, σύρετε από το αριστ. ή το δεξί άκρο προς το μέσο της οθόνης."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Φροντίστε να σύρετε προς τα επάνω από το κάτω άκρο της οθόνης."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Φροντίστε να μην κάνετε παύση προτού απομακρύνετε τα δάχτυλά σας."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Φροντίστε να σύρετε απευθείας προς τα επάνω."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Μάθατε πώς να χρησιμοποιείτε κινήσεις. Μεταβείτε στις Ρυθμίσεις για απενεργοποίηση των κινήσεων."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Ολοκληρώσατε την κίνηση εναλλαγής εφαρμογών."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Σύρετε για εναλλαγή εφαρμογών"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Σύρετε προς τα πάνω από το κάτω μέρος της οθόνης σας, κρατήστε παρατεταμένα και έπειτα ελευθερώστε."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Όλα είναι έτοιμα"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Επόμενο"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Ρυθμίσεις"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Δοκιμάστε ξανά"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Ωραία!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Οδηγός <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Όλα έτοιμα!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Σύρετε προς τα επάνω για να μεταβείτε στην αρχική σελίδα"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Είστε έτοιμοι να ξεκινήστε να χρησιμοποιείτε το τηλέφωνό σας"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Ρυθμίσεις πλοήγησης για προσβασιμότητα"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Κοινοποίηση"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Στιγμιότυπο οθόνης"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Αυτή η ενέργεια δεν επιτρέπεται από την εφαρμογή ή τον οργανισμό σας."</string>
diff --git a/quickstep/res/values-en-rAU/strings.xml b/quickstep/res/values-en-rAU/strings.xml
index 86ae07f5ff..24cad6552f 100644
--- a/quickstep/res/values-en-rAU/strings.xml
+++ b/quickstep/res/values-en-rAU/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"App suggestions enabled"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"App suggestions are disabled"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicted app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Make sure that you swipe from the far-left edge."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Make sure that you swipe from the left edge to the middle of the screen and let go."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Make sure that you swipe from the far-right edge."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Make sure that you swipe from the right edge to the middle of the screen and let go."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"You learned how to swipe from the left to go back."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"You learned how to swipe from the right to go back. Next, learn how to switch apps."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"You completed the go back gesture."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"To change sensitivity of the back gesture, go to Settings"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Swipe from the left to go back"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Swipe from the right to go back"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"To go back to the last screen you were on, swipe from the left edge to the middle of the screen."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"You can also go back to the last screen by swiping from the right edge to the middle of the screen. Try it now."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Swipe to go back"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"To go back to the last screen, swipe from the left or right edge to the middle of the screen."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Make sure that you don\'t pause before letting go."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Make sure that you swipe straight up."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"You learned how to use gestures. To turn off gestures, go to settings."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"You completed the switch apps gesture."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe to switch apps"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swipe up from the bottom of your screen, hold, then release."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"All set"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Next"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Settings"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Try again"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Nice!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Ready!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Swipe up to go home"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"You’re ready to start using your phone"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Navigation settings for accessibility"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Share"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
diff --git a/quickstep/res/values-en-rCA/strings.xml b/quickstep/res/values-en-rCA/strings.xml
index 86ae07f5ff..24cad6552f 100644
--- a/quickstep/res/values-en-rCA/strings.xml
+++ b/quickstep/res/values-en-rCA/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"App suggestions enabled"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"App suggestions are disabled"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicted app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Make sure that you swipe from the far-left edge."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Make sure that you swipe from the left edge to the middle of the screen and let go."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Make sure that you swipe from the far-right edge."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Make sure that you swipe from the right edge to the middle of the screen and let go."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"You learned how to swipe from the left to go back."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"You learned how to swipe from the right to go back. Next, learn how to switch apps."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"You completed the go back gesture."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"To change sensitivity of the back gesture, go to Settings"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Swipe from the left to go back"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Swipe from the right to go back"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"To go back to the last screen you were on, swipe from the left edge to the middle of the screen."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"You can also go back to the last screen by swiping from the right edge to the middle of the screen. Try it now."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Swipe to go back"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"To go back to the last screen, swipe from the left or right edge to the middle of the screen."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Make sure that you don\'t pause before letting go."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Make sure that you swipe straight up."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"You learned how to use gestures. To turn off gestures, go to settings."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"You completed the switch apps gesture."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe to switch apps"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swipe up from the bottom of your screen, hold, then release."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"All set"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Next"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Settings"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Try again"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Nice!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Ready!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Swipe up to go home"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"You’re ready to start using your phone"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Navigation settings for accessibility"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Share"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
diff --git a/quickstep/res/values-en-rGB/strings.xml b/quickstep/res/values-en-rGB/strings.xml
index 86ae07f5ff..24cad6552f 100644
--- a/quickstep/res/values-en-rGB/strings.xml
+++ b/quickstep/res/values-en-rGB/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"App suggestions enabled"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"App suggestions are disabled"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicted app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Make sure that you swipe from the far-left edge."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Make sure that you swipe from the left edge to the middle of the screen and let go."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Make sure that you swipe from the far-right edge."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Make sure that you swipe from the right edge to the middle of the screen and let go."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"You learned how to swipe from the left to go back."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"You learned how to swipe from the right to go back. Next, learn how to switch apps."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"You completed the go back gesture."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"To change sensitivity of the back gesture, go to Settings"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Swipe from the left to go back"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Swipe from the right to go back"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"To go back to the last screen you were on, swipe from the left edge to the middle of the screen."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"You can also go back to the last screen by swiping from the right edge to the middle of the screen. Try it now."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Swipe to go back"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"To go back to the last screen, swipe from the left or right edge to the middle of the screen."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Make sure that you don\'t pause before letting go."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Make sure that you swipe straight up."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"You learned how to use gestures. To turn off gestures, go to settings."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"You completed the switch apps gesture."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe to switch apps"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swipe up from the bottom of your screen, hold, then release."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"All set"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Next"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Settings"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Try again"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Nice!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Ready!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Swipe up to go home"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"You’re ready to start using your phone"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Navigation settings for accessibility"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Share"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
diff --git a/quickstep/res/values-en-rIN/strings.xml b/quickstep/res/values-en-rIN/strings.xml
index 86ae07f5ff..24cad6552f 100644
--- a/quickstep/res/values-en-rIN/strings.xml
+++ b/quickstep/res/values-en-rIN/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"App suggestions enabled"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"App suggestions are disabled"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicted app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Make sure that you swipe from the far-left edge."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Make sure that you swipe from the left edge to the middle of the screen and let go."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Make sure that you swipe from the far-right edge."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Make sure that you swipe from the right edge to the middle of the screen and let go."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"You learned how to swipe from the left to go back."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"You learned how to swipe from the right to go back. Next, learn how to switch apps."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"You completed the go back gesture."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"To change sensitivity of the back gesture, go to Settings"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Swipe from the left to go back"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Swipe from the right to go back"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"To go back to the last screen you were on, swipe from the left edge to the middle of the screen."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"You can also go back to the last screen by swiping from the right edge to the middle of the screen. Try it now."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Swipe to go back"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"To go back to the last screen, swipe from the left or right edge to the middle of the screen."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Make sure that you don\'t pause before letting go."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Make sure that you swipe straight up."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"You learned how to use gestures. To turn off gestures, go to settings."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"You completed the switch apps gesture."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe to switch apps"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swipe up from the bottom of your screen, hold, then release."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"All set"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Next"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Settings"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Try again"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Nice!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Ready!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Swipe up to go home"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"You’re ready to start using your phone"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Navigation settings for accessibility"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Share"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
diff --git a/quickstep/res/values-en-rXC/strings.xml b/quickstep/res/values-en-rXC/strings.xml
index f7663dc70c..35ec6bb674 100644
--- a/quickstep/res/values-en-rXC/strings.xml
+++ b/quickstep/res/values-en-rXC/strings.xml
@@ -45,19 +45,14 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‏‏‏‎‎‏‎‎‎‏‏‏‏‎‏‎‎‎‎‏‎‎App suggestions enabled‎‏‎‎‏‎"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎‎‏‎‏‎‏‎‎‏‏‏‎‎‏‎‏‎‏‎‎‏‏‏‎‏‏‎App suggestions are disabled‎‏‎‎‏‎"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‎‎‏‎‎‏‏‏‎‏‎‏‏‎‎‏‏‏‎‏‏‏‎‎‏‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‎‎‏‏‎Predicted app: ‎‏‎‎‏‏‎<xliff:g id="TITLE">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‏‎‎‎Make sure you swipe from the far-left edge.‎‏‎‎‏‎"</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‎‏‎‏‎‏‎‎‎‏‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‎‎‎‎‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‎‎‎‎‏‎‎Make sure you swipe from the left edge to the middle of the screen and let go.‎‏‎‎‏‎"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‏‏‏‏‎‎‎‏‏‎‏‏‎‏‎‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‎‏‎‏‎‎‏‎‎‏‎‏‎‎‎‎‏‎Make sure you swipe from the far-right edge.‎‏‎‎‏‎"</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‎‎‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‎‎Make sure you swipe from the right edge to the middle of the screen and let go.‎‏‎‎‏‎"</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‏‏‎‏‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‏‏‏‏‎‎‏‏‎You learned how to swipe from the left to go back.‎‏‎‎‏‎"</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‎‎‎‎‎‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‏‏‏‎‏‎‏‎‏‎‎‏‏‏‎‏‎‏‏‎‏‎‎‎‏‏‎‎‎‎‏‎‎Make sure you swipe from the far-right or far-left edge.‎‏‎‎‏‎"</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‏‎‎‎‎‏‏‏‏‎‎‎‏‏‏‏‎‏‎‎‏‎‏‎‎‎‏‎‏‎‏‎‎‎‎‏‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‎Make sure you swipe from the right or left edge to the middle of the screen and let go.‎‏‎‎‏‎"</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‎‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‏‎‎‏‏‏‎‏‎‏‏‏‏‏‎‎‎‏‏‏‎You learned how to swipe from the right to go back. Next up, learn how to switch apps.‎‏‎‎‏‎"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‏‎‏‎‏‏‏‎‎‎‎‎‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‏‏‎‏‏‎‎‏‏‎‎You completed the go back gesture.‎‏‎‎‏‎"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‏‎‎‎‎‏‎‎‎‏‎‏‎‎‏‎‎‏‎‎‏‎‏‏‎‎‏‎‎‎‎‏‎‏‏‎Make sure you don\'t swipe too close to the bottom of the screen.‎‏‎‎‏‎"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‎‏‏‏‎‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‏‎‎‏‏‏‏‏‎‎‏‎‎‎‏‎‎To change the sensitivity of the back gesture, go to Settings‎‏‎‎‏‎"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‎‎‎‎‏‏‎‏‏‏‏‎‎‎‎‎‎‎‎‎‏‎‏‎‎‏‎‏‎‎‎‎‏‎‎‏‎‏‏‎‎‎‎‎‏‎‎‎‏‎Swipe from the left to go back‎‏‎‎‏‎"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‎‏‏‏‎‎‏‏‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‏‎‏‎‎Swipe from the right to go back‎‏‎‎‏‎"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‏‎‏‎‎To go back to the last screen you were on, swipe from the left edge to the middle of the screen.‎‏‎‎‏‎"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‏‎‎‎‏‏‎‎‎‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‎‏‎‏‏‏‏‎‏‎You can also go back to the last screen by swiping from the right edge to the middle of the screen. Try it now.‎‏‎‎‏‎"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‎‏‏‏‎‏‎‏‏‏‎‎‎‎‏‏‏‎‎‏‏‏‏‎‎‏‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎‎Swipe to go back‎‏‎‎‏‎"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‏‏‏‎‎‎‏‏‏‏‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‎‏‎‎‏‏‏‎‎‎‎‏‏‎‎‎‏‏‏‎‏‎‏‏‎‏‎To go back to the last screen, swipe from the left or right edge to the middle of the screen.‎‏‎‎‏‎"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‏‎‏‏‎‏‎‎‏‎‎Make sure you swipe up from the bottom edge of the screen.‎‏‎‎‏‎"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‏‎‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‎‏‏‏‎‏‎‏‎Make sure you don\'t pause before letting go.‎‏‎‎‏‎"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‎‏‏‏‎‏‎‎‏‎‎‏‏‎‏‎‎‏‎‎‏‏‏‏‎‎‎‎‏‎‏‏‏‏‎‎Make sure you swipe straight up.‎‏‎‎‏‎"</string>
@@ -71,17 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‎‎‎‎‎‏‎‎‏‏‎‎‏‏‎‎‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‎You learned how to use gestures. To turn off gestures, go to Settings.‎‏‎‎‏‎"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‎‏‏‎‏‏‎‏‏‎‏‏‏‏‎‎‎‎‎‎‎‎‎‏‏‏‎‎‎‏‎‎‏‏‎‏‏‏‎‎‎‏‏‏‎‎‎‏‎‎‎‎‎You completed the switch apps gesture.‎‏‎‎‏‎"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‎‎‏‏‎‎‎‏‎‏‎‏‏‎‎‎‏‏‏‎‎‏‏‎‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎‏‎‎‎‎‏‎‏‎‎‎‏‎‎Swipe to switch apps‎‏‎‎‏‎"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‎‏‎‏‏‏‎‎‏‎‎‏‎‏‎‎‎‎‏‎‎‏‏‏‎‎‏‏‏‏‏‎‎‎‎‏‏‏‎‎‏‏‏‎‏‏‏‏‏‏‎‏‎‎Swipe up from the bottom of your screen, hold, then release.‎‏‎‎‏‎"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‏‎‏‎‎‏‏‏‎‎‏‏‎‏‏‏‎‎‏‏‏‎‏‎‏‏‎‏‎‏‏‏‎‏‎‏‏‎To switch between apps, swipe up from the bottom of your screen, hold, then release.‎‏‎‎‏‎"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‎‎‎‏‏‏‎‎‎‏‎‎‏‎‏‏‎‏‎‏‎‏‎‏‏‏‎‏‎‏‏‏‎‏‏‎‏‏‎‎‎All set‎‏‎‎‏‎"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‏‏‏‎‎‏‏‎‏‎‏‎‏‏‏‏‎‎‎‎‏‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‎‎Next‎‏‎‎‏‎"</string>
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‎‏‏‏‏‎‎‏‎‏‎‏‎‏‎‎‎‏‎‎‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‎Done‎‏‎‎‏‎"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‎‎‏‎‏‏‎‎‏‎‎‏‏‏‎‏‏‎‏‎‎‏‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎Settings‎‏‎‎‏‎"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‎‎‏‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‎‎‏‏‎‎‏‏‎‎‎‏‏‎‎‏‎Try again‎‏‎‎‏‎"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‏‏‎‎‎‎Nice!‎‏‎‎‏‎"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‎‎‏‎‏‎‏‏‎‏‏‎‏‎‏‏‎‎‏‎‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‎‏‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎Tutorial ‎‏‎‎‏‏‎<xliff:g id="CURRENT">%1$d</xliff:g>‎‏‎‎‏‏‏‎/‎‏‎‎‏‏‎<xliff:g id="TOTAL">%2$d</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="allset_title" msgid="5021126669778966707">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‏‏‏‎‏‎‏‎‎‎‎‎‎‎‎‏‏‎‏‎‎‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎‎‏‏‎All set!‎‏‎‎‏‎"</string>
-    <string name="allset_hint" msgid="459504134589971527">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‎‎‏‏‎‏‏‎‏‎‏‏‎‎‎‎‏‏‏‎‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‏‎Swipe up to go home‎‏‎‎‏‎"</string>
+    <string name="allset_hint" msgid="2384632994739392447">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‏‎‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‎‎‏‏‎‎‎‎‏‎‏‏‎‎‎‏‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‏‎Swipe up to go Home‎‏‎‎‏‎"</string>
     <string name="allset_description" msgid="6350320429953234580">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‏‏‏‎‏‎‏‎‎‎‏‎‎‏‎‏‏‎‏‏‎‏‎‎‏‎‏‎‎‎You’re ready to start using your phone‎‏‎‎‏‎"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‏‏‎‎‎‎‏‏‏‎‏‎‏‎‎‎‏‏‎‏‏‎‎‎‎‏‏‏‏‎‏‎‎‏‏‎‎‎‏‎‎‎‎‏‏‏‏‎‏‏‏‏‎‎‏‎‎‏‏‎"<annotation id="link">"‎‏‎‎‏‏‏‎Navigation settings for accessibility‎‏‎‎‏‏‎"</annotation>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="allset_navigation_settings" msgid="4713404605961476027">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‎‏‎‎‏‎‏‏‎‎‎‎‎‏‎‎‎‎‏‎‎‎‎‏‏‎‏‎‏‎‎‎‎‎‏‏‎‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‏‎‎‏‏‎"<annotation id="link">"‎‏‎‎‏‏‏‎System navigation settings‎‏‎‎‏‏‎"</annotation>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="action_share" msgid="2648470652637092375">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‎‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‎‎‎‏‎‏‏‏‎Share‎‏‎‎‏‎"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‎‏‏‎‏‎‏‎‏‏‏‎‏‎‏‎‏‎‏‎‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‎‎‏‏‏‏‎‎‎‏‎‏‎Screenshot‎‏‎‎‏‎"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‏‎‎‏‏‎‎‏‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎This action isn\'t allowed by the app or your organization‎‏‎‎‏‎"</string>
diff --git a/quickstep/res/values-es-rUS/strings.xml b/quickstep/res/values-es-rUS/strings.xml
index 34d43d69c5..b30f5f3bc4 100644
--- a/quickstep/res/values-es-rUS/strings.xml
+++ b/quickstep/res/values-es-rUS/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Sugerencias de apps habilitadas"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Las sugerencias de aplicaciones están inhabilitadas"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicción de app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Asegúrate de deslizar el dedo bien desde el borde izquierdo."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Asegúrate de deslizar el dedo del borde izquierdo hacia el centro de la pantalla y, luego, suéltalo."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Asegúrate de deslizar el dedo bien desde el borde derecho."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Asegúrate de deslizar el dedo del borde derecho hacia el centro de la pantalla y, luego, suéltalo."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Aprendiste cómo deslizar el dedo desde la izquierda para volver."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Aprendiste a deslizar el dedo desde la derecha para volver. Ahora, descubre cómo cambiar de app."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Completaste el gesto \"Atrás\"."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Asegúrate de no hacerlo muy cerca de la parte inferior de la pantalla."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Cambia sensibilidad de gesto \"Atrás\" en Configuración"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Para volver, desliza el dedo desde la izquierda"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Para volver, desliza el dedo desde la derecha"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Para volver a la última pantalla, desliza el dedo del borde izquierdo al centro de la pantalla."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Desliza de derecha al centro para volver a última pantalla. Pruébalo ahora."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Desliza el dedo para volver"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Desliza el dedo desde el borde derecho o izquierdo para volver a la última pantalla."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Asegúrate de deslizar el dedo hacia arriba desde la borde inferior de la pantalla."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Asegúrate de no detenerte antes de soltarlo."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Asegúrate de deslizar el dedo derecho hacia arriba."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Ya sabes cómo usar los gestos. Para desactivarlos, ve a Configuración."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Completaste el gesto para cambiar de app."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Desliza el dedo para cambiar de app"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Desliza el dedo hacia arriba desde la parte inferior de la pantalla, mantenlo presionado y, luego, suéltalo."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Listo"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Siguiente"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Configuración"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Reintentar"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"¡Genial!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Instructivo <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Todo listo"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Desliza el dedo hacia arriba para ir a la página principal"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Ya puedes empezar a usar tu teléfono"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Configuración de la navegación para accesibilidad"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Compartir"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Captura de pantalla"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"La app o tu organización no permiten realizar esta acción"</string>
diff --git a/quickstep/res/values-es/strings.xml b/quickstep/res/values-es/strings.xml
index 220e3973ca..6c2db2d79f 100644
--- a/quickstep/res/values-es/strings.xml
+++ b/quickstep/res/values-es/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Sugerencias de aplicaciones habilitadas"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Las sugerencias de aplicaciones están inhabilitadas"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplicación sugerida: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Desliza el dedo desde el extremo izquierdo."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Desliza el dedo desde el borde izquierdo de la pantalla hasta el centro y levántalo."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Desliza el dedo desde el extremo derecho."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Desliza el dedo desde el borde derecho de la pantalla hasta el centro y levántalo."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Ya sabes deslizar el dedo desde la izquierda para ir atrás."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Ya sabes deslizar el dedo desde la derecha para ir atrás. Descubre ahora cómo cambiar de aplicación."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Has completado el gesto para volver."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"No deslices el dedo demasiado cerca de la parte inferior de la pantalla."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Para cambiar la sensibilidad del gesto, ve a Ajustes"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Desliza el dedo desde la izquierda para ir atrás"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Desliza el dedo desde la derecha para ir atrás"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Para volver a la pantalla anterior, desliza el dedo desde el borde izquierdo al centro."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"También puedes ir atrás deslizando el dedo del borde derecho al centro. Pruébalo ahora."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Desliza el dedo para volver"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Para volver a la última pantalla, desliza el dedo desde un lateral de la pantalla hasta el centro."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Desliza el dedo hacia arriba desde el borde inferior de la pantalla."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"No hagas ninguna pausa antes de levantar el dedo."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Desliza el dedo directamente hacia arriba."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Ya sabes cómo utilizar gestos. Para desactivarlos, ve a Configuración."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Has completado el gesto para cambiar de aplicación."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Deslizar el dedo para cambiar de aplicación"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Desliza el dedo hacia arriba desde la parte inferior de la pantalla, mantenlo pulsado y levántalo."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Todo listo"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Siguiente"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Ajustes"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Vuélvelo a intentar"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"¡Muy bien!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"¡Ya está!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Desliza el dedo hacia arriba para ir a la pantalla de inicio"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Ya puedes empezar a usar tu teléfono"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Ajustes de navegación para accesibilidad"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Compartir"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Hacer captura"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"No puedes hacerlo porque la aplicación o tu organización no lo permiten"</string>
diff --git a/quickstep/res/values-et/strings.xml b/quickstep/res/values-et/strings.xml
index c2c4bc9ce6..df7db835fd 100644
--- a/quickstep/res/values-et/strings.xml
+++ b/quickstep/res/values-et/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Rakenduste soovitused on lubatud"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Rakenduste soovitused on keelatud"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Ennustatud rakendus: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pühkige kindlasti vasakpoolsest servast."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pühkige ekraanikuva vasakust servast keskele ja eemaldage sõrm."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pühkige kindlasti parempoolsest servast."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pühkige ekraanikuva paremast servast keskele ja eemaldage sõrm."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Õppisite, kuidas tagasiliikumiseks vasakult pühkida."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Õppisite, kuidas tagasiliikumiseks paremalt pühkida. Nüüd vaadake, kuidas rakenduste vahel vahetada."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Tegite tagasiliikumise liigutuse."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Veenduge, et te ei pühiks liiga ekraanikuva allosa lähedalt."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Tagasiliigutuse tundlikkuse muutmiseks avage menüü Seaded"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Tagasiliikumiseks pühkige vasakult paremale"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Eelmisele kuvale liikumiseks pühkige paremalt vasakule"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Eelmisele ekraanikuvale naasmiseks pühkige vasakust servast ekraanikuva keskele."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Eelmisele ekraanikuvale naasmiseks võite ka kuva paremast servast keskele pühkida. Proovige kohe."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Tagasiliikumiseks pühkige"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Eelmisele ekraanikuvale naasmiseks pühkige vasakust või paremast servast ekraanikuva keskele."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pühkige kindlasti ekraanikuva alumisest servast üles."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Veenduge, et te enne vabastamist liigutust ei peataks."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pühkige kindlasti otse üles."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Õppisite liigutusi kasutama. Liigutuste väljalülitamiseks avage seaded."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Tegite rakenduste vahel vahetamise liigutuse."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Rakenduste vahel vahetamiseks pühkimine"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Pühkige ekraanikuva alaosast üles, hoidke ja seejärel vabastage."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Valmis"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Järgmine"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Seaded"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Proovige uuesti"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Tubli töö!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Õpetus <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Valmis!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Avalehele liikumiseks pühkige üles"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Olete valmis oma telefoni kasutama"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Juurdepääsetavuse navigeerimisseaded"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Jaga"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Ekraanipilt"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Rakendus või teie organisatsioon on selle toimingu keelanud"</string>
diff --git a/quickstep/res/values-eu/strings.xml b/quickstep/res/values-eu/strings.xml
index 19ad2f0c67..97cdc014e3 100644
--- a/quickstep/res/values-eu/strings.xml
+++ b/quickstep/res/values-eu/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Gaituta daude aplikazioen iradokizunak"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Desgaituta daude aplikazioen iradokizunak"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Iragarritako aplikazioa: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Ziurtatu hatza ezkerreko ertzetik pasatzen duzula."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Ziurtatu hatza pantailaren ezkerreko ertzetik erdialdera pasatzen eta askatzen duzula."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Ziurtatu hatza eskuineko ertzetik pasatzen duzula."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Ziurtatu hatza pantailaren eskuineko ertzetik erdialdera pasatzen eta askatzen duzula."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Hatza ezkerretik pasatuta atzera egiten ikasi duzu."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Hatza eskuinetik pasatuta atzera egiten ikasi duzu. Jarraian, ikasi aplikazioa aldatzen."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ikasi duzu atzera egiteko keinua."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ziurtatu hatza ez duzula pantailaren behealdetik gertuegi pasatzen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Keinuaren sentikortasuna aldatzeko, joan ezarpenetara"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Atzera egiteko, pasatu hatza ezkerretik"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Atzera egiteko, pasatu hatza eskuinetik"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Aurreko pantailara itzultzeko, pasatu hatza pantailaren ezkerreko ertzetik erdialdera"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Aurreko pantailara itzultzeko beste modu bat: pasatu hatza pantailaren eskuineko ertzetik erdialdera. Proba ezazu."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Pasatu hatza atzera egiteko"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Aurreko pantailara itzultzeko, pasatu hatza pantailaren ezkerreko edo eskuineko ertzetik erdialdera."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Ziurtatu hatza pantailaren beheko ertzetik gora pasatzen duzula."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Ziurtatu askatu aurretik ez duzula hatza gelditzen."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Ziurtatu hatza zuzen gora pasatzen duzula."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Ikasi duzu keinuak erabiltzen. Keinuak desaktibatzeko, joan ezarpenetara."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Ikasi duzu aplikazioa aldatzeko keinua."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Pasatu hatza aplikazioa aldatzeko"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Pasatu hatza pantailaren behealdetik gora, eduki pantaila sakatuta eta altxatu hatza."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Dena prest"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Hurrengoa"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Ezarpenak"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Saiatu berriro"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Ederki!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutoriala: <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Dena prest!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Pasatu hatza gora hasierako pantailara joateko"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Prest zaude telefonoa erabiltzen hasteko"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Erabilerraztasunerako nabigazio-ezarpenak"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Partekatu"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Atera pantaila-argazki bat"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikazioak edo erakundeak ez du eman ekintza hori gauzatzeko baimena"</string>
diff --git a/quickstep/res/values-fa/strings.xml b/quickstep/res/values-fa/strings.xml
index b8fd926401..cd4bbf1a08 100644
--- a/quickstep/res/values-fa/strings.xml
+++ b/quickstep/res/values-fa/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"«پیشنهاد برنامه» فعال است"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"«پیشنهاد برنامه» غیرفعال است"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"برنامه پیش‌بینی‌شده: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"دقت کنید که از انتهای سمت چپ لبه تند بکشید."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"دقت کنید که از لبه سمت چپ تند به وسط صفحه بکشید و رها کنید."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"دقت کنید که از انتهای سمت راست لبه تند بکشید."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"دقت کنید که از لبه سمت راست تند به وسط صفحه بکشید و رها کنید."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"یاد گرفتید چگونه برای رفتن به عقب از سمت چپ تند بکشید."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"یاد گرفتید چگونه برای رفتن به عقب از سمت راست تند بکشید. مورد بعدی، با نحوه جابه‌جا شدن بین برنامه‌ها آشنا شوید."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"اشاره برگشتن را تکمیل کردید."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"دقت کنید که موقع تند کشیدن بیش‌از حد به پایین صفحه نزدیک نشوید."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"برای تغییر حساسیت اشاره برگشت، به «تنظیمات» بروید"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"برای برگشتن به عقب، از سمت چپ تند بکشید"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"برای رفتن به عقب، از سمت راست تند بکشید"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"برای برگشتن به آخرین صفحه‌ای که در آن بودید، از لبه سمت چپ تند به‌وسط صفحه بکشید."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"با تند کشیدن از لبه سمت راست به وسط صفحه هم می‌توانید به عقب بروید. امتحان کنید."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"تند بکشید تا به‌عقب برگردید"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"برای برگشتن به صفحه آخر، از لبه سمت چپ یا راست تند به وسط صفحه بکشید."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"دقت کنید که از لبه پایینی صفحه تند به بالا بکشید."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"دقت کنید که تا قبل‌از رها کردن، کشیدن را متوقف نکنید."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"دقت کنید که مستقیماً تند به بالا بکشید."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"با نحوه استفاده از اشاره‌ها آشنا شدید. برای خاموش کردن اشاره‌ها، به «تنظیمات» بروید."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"اشاره جابه‌جا شدن بین برنامه‌ها را تکمیل کردید."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"تند کشیدن برای جابه‌جا شدن بین برنامه‌ها"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"از پایین صفحه‌نمایش تند به‌سمت بالا بکشید، نگه دارید، و سپس رها کنید."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"همه چیز آماده است"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"بعدی"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"تنظیمات"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"امتحان مجدد"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"عالی!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"آموزش گام‌به‌گام <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"همه چیز آماده است!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"برای رفتن به صفحه اصلی، تند به‌بالا بکشید"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"آماده‌اید از تلفنتان استفاده کنید"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"تنظیمات پیمایش برای دسترس‌پذیری"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"هم‌رسانی"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"نماگرفت"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"برنامه یا سازمان شما اجازه نمی‌دهد این کنش انجام شود."</string>
diff --git a/quickstep/res/values-fi/strings.xml b/quickstep/res/values-fi/strings.xml
index e81906f95b..3a93b77fb0 100644
--- a/quickstep/res/values-fi/strings.xml
+++ b/quickstep/res/values-fi/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Sovellusehdotukset käytössä"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Sovellusehdotukset on poistettu käytöstä"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Ennakoitu sovellus: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Muista pyyhkäistä aivan vasemmasta reunasta."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pyyhkäise näytön vasemmasta reunasta keskelle ja päästä irti."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Muista pyyhkäistä aivan oikeasta reunasta."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pyyhkäise näytön oikeasta reunasta keskelle ja päästä irti."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Nyt osaat palata takaisin pyyhkäisemällä vasemmasta reunasta."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Osaat palata takaisin pyyhkäisemällä oikeasta reunasta. Opettele seuraavaksi vaihtamaan sovellusta."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Olet oppinut Takaisin-eleen."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Varo, ettet pyyhkäise liian lähellä alareunaa."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Voit muuttaa Takaisin-eleen herkkyyttä asetuksista"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Palaa takaisin pyyhkäisemällä vasemmasta reunasta"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Palaa takaisin pyyhkäisemällä oikeasta reunasta"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Voit palata edelliseen näkymään pyyhkäisemällä näytön vasemmasta reunasta keskelle."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Voit myös palata edelliseen näkymään pyyhkäisemällä näytön oikeasta reunasta keskelle. Kokeile nyt."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Siirry takaisin pyyhkäisemällä"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Voit palata edelliseen näkymään pyyhkäisemällä näytön vasemmasta tai oikeasta reunasta keskelle."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pyyhkäise ylös näytön alareunasta."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Varo keskeyttämästä ennen kuin päästät irti."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Muista pyyhkäistä suoraan ylöspäin."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Olet oppinut käyttämään eleitä. Jos haluat laittaa eleet pois päältä, avaa Asetukset."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Olet oppinut sovellusten vaihtamiseleen."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Vaihda sovellusta pyyhkäisemällä"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Pyyhkäise ylöspäin näytön alareunasta ja päästä irti."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Valmista"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Seuraava"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Asetukset"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Yritä uudelleen"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Hienoa!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Ohje <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Valmis"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Siirry aloitusnäytölle pyyhkäisemällä ylös"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Olet valmis aloittamaan puhelimen käytön"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Siirtymisasetukset esteettömyyttä varten"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Jaa"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Kuvakaappaus"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Sovellus tai organisaatio ei salli tätä toimintoa"</string>
diff --git a/quickstep/res/values-fr-rCA/strings.xml b/quickstep/res/values-fr-rCA/strings.xml
index e9b5fed98e..a0742b5ec0 100644
--- a/quickstep/res/values-fr-rCA/strings.xml
+++ b/quickstep/res/values-fr-rCA/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Les suggestions d\'applications sont activées"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Les suggestions d\'applications sont désactivées"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Application prédite : <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Assurez-vous de balayer l\'écran à partir de l\'extrémité gauche."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Assurez-vous de balayer l\'écran de l\'extrémité gauche jusqu\'au centre, puis de lever le doigt."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Assurez-vous de balayer l\'écran à partir de l\'extrémité droite."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Assurez-vous de balayer l\'écran de l\'extrémité droite jusqu\'au centre, puis de lever le doigt."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Vous avez appris comment balayer l\'écran à partir de la gauche pour revenir en arrière."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Vous avez appris à balayer de la droite pour revenir en arrière. Apprenez comment changer d\'appli."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Vous avez appris le geste de retour en arrière."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Assurez-vous de ne pas balayer trop près du bas de l\'écran."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Modifiez la sensibilité du geste de retour dans Paramètres"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Balayez l\'écran à partir de la gauche pour revenir en arrière"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Balayer l\'écran à partir de la droite pour revenir en arrière"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Pour revenir à l\'écran précédent, balayez l\'écran du côté gauche jusqu\'au centre."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Vous pouvez revenir à l\'écran précédent en balayant l\'écran du côté droit vers le centre. Essayez-le."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Balayez l\'écran pour revenir en arrière"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Pour revenir à l\'écran précédent, balayez l\'écran de l\'extrémité gauche ou droite vers le centre."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Assurez-vous de balayer l\'écran à partir de l\'extrémité inférieure vers le haut."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Assurez-vous de ne pas interrompre le geste avant de lever le doigt."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Assurez-vous de balayer l\'écran en ligne droite vers le haut."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Vous avez appris à utiliser les gestes. Pour les désactiver, accédez au menu Paramètres."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Vous avez appris le geste de changement d\'application."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Balayer pour basculer entre les applications"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Balayez l\'écran de bas en haut, maintenez le doigt en place, puis relâchez-le."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Terminé"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Suivant"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Paramètres"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Réessayer"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bien!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Étape <xliff:g id="CURRENT">%1$d</xliff:g> sur <xliff:g id="TOTAL">%2$d</xliff:g> du tutoriel"</string>
     <string name="allset_title" msgid="5021126669778966707">"Tout est prêt!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Balayez l\'écran vers le haut pour accéder à l\'écran d\'accueil"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Vous êtes maintenant prêt à utiliser votre téléphone"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Paramètres de navigation pour les options d\'accessibilité"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Partager"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Capture d\'écran"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"L\'application ou votre organisation n\'autorise pas cette action"</string>
diff --git a/quickstep/res/values-fr/strings.xml b/quickstep/res/values-fr/strings.xml
index 2b3b6bbd4f..e36999ae14 100644
--- a/quickstep/res/values-fr/strings.xml
+++ b/quickstep/res/values-fr/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Suggestions d\'applications activées"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Les suggestions d\'applications sont désactivées"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Application prédite : <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Veillez à balayer l\'écran depuis le bord gauche."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Veillez à bien balayer l\'écran depuis le bord gauche jusqu\'au centre avant de relever le doigt."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Veillez à balayer l\'écran depuis le bord droit."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Veillez à bien balayer l\'écran depuis le bord droit jusqu\'au centre avant de relever le doigt."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Vous avez appris comment balayer l\'écran depuis la gauche pour revenir en arrière."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Vous avez appris à balayer depuis droite pour revenir en arrière. Apprenez à passer d\'une appli à l\'autre."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Vous avez appris le geste pour revenir en arrière."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Veillez à ne pas balayer l\'écran trop près du bas."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Modifiez la sensibilité du geste retour dans les paramètres"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Balayez l\'écran depuis la gauche pour revenir en arrière"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Balayez l\'écran depuis la droite pour revenir en arrière"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Pour revenir à l\'écran précédent, balayez l\'écran depuis le bord gauche jusqu\'au centre."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Pour revenir à l\'écran précédent, balayez l\'écran depuis le bord droit jusqu\'au centre. Essayez."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Balayez l\'écran pour revenir en arrière"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Pour revenir à l\'écran précédent, balayez l\'écran depuis le bord droit ou gauche jusqu\'au centre."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Veillez à balayer l\'écran du bas vers le haut."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Veillez à ne pas marquer de pause dans votre geste avant de relever le doigt."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Veillez à balayer l\'écran vers le haut."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Vous avez appris à utiliser les gestes. Pour les désactiver, accédez aux paramètres."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Vous avez appris le geste pour passer d\'une appli à l\'autre."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Balayer pour passer d\'une appli à l\'autre"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Balayez l\'écran du bas vers le haut, appuyez de manière prolongée, puis relevez le doigt."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Vous avez terminé"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Suivant"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Paramètres"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Réessayez"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bravo !"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutoriel <xliff:g id="CURRENT">%1$d</xliff:g> sur <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Tout est prêt !"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Balayez l\'écran vers le haut pour revenir à l\'accueil"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Vous êtes prêt à utiliser votre téléphone"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Paramètres de navigation pour l\'accessibilité"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Partager"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Capture d\'écran"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Cette action n\'est pas autorisée par l\'application ou par votre organisation"</string>
diff --git a/quickstep/res/values-gl/strings.xml b/quickstep/res/values-gl/strings.xml
index 5e4164cf23..5496b472f7 100644
--- a/quickstep/res/values-gl/strings.xml
+++ b/quickstep/res/values-gl/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"As suxestións de aplicacións están activadas"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"As suxestións de aplicacións están desactivadas"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplicación predita: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Asegúrate de pasar o dedo desde o bordo esquerdo máis afastado."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Asegúrate de pasar o dedo desde o bordo esquerdo ata o medio da pantalla e avanza."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Asegúrate de pasar o dedo desde o bordo dereito máis afastado."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Asegúrate de pasar o dedo desde o bordo dereito ata o medio da pantalla e avanza."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Aprendiches a pasar o dedo desde a esquerda para volver á pantalla anterior."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Aprendiches a pasar o dedo desde a dereita para volver. Agora, aprende a cambiar de aplicación."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Completaches o xesto de volver á última pantalla."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Asegúrate de non pasar o dedo demasiado preto da parte inferior da pantalla."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Podes cambiar a sensibilidade do xesto en Configuración"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Pasa o dedo desde a esquerda para volver"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Pasa o dedo desde a dereita para volver á pantalla anterior"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Para volver á última pantalla, pasa o dedo desde o bordo esquerdo ata a metade da pantalla."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Tamén podes volver pasando o dedo desde o bordo dereito ata a metade da pantalla. Próbao agora."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Pasar o dedo para volver"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Para volver á última pantalla, pasa o dedo cara ao medio desde o bordo dereito ou esquerdo."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Asegúrate de pasar o dedo cara arriba desde o bordo inferior da pantalla."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Asegúrate de non facer unha pausa antes de avanzar."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Asegúrate de pasar o dedo cara arriba cun movemento vertical."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Aprendiches a usar os xestos. Para desactivalos, vai a Configuración."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Completaches o xesto para cambiar de aplicación."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Pasar o dedo para cambiar de aplicación"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Pasa o dedo cara arriba desde a parte inferior da pantalla, mantena premida e sepárao."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Todo listo"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Seguinte"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Configuración"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Téntao de novo"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Excelente!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Titorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Todo listo"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Pasa o dedo cara arriba para ir á pantalla de inicio"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Todo está listo para comezar a utilizar o teléfono"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Configuración da navegación para a accesibilidade"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Compartir"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Facer captura"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"A aplicación ou a túa organización non permite realizar esta acción"</string>
diff --git a/quickstep/res/values-gu/strings.xml b/quickstep/res/values-gu/strings.xml
index c1375f9465..2e99036f50 100644
--- a/quickstep/res/values-gu/strings.xml
+++ b/quickstep/res/values-gu/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ઍપના સુઝાવો ચાલુ છે"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ઍપના સુઝાવો બંધ છે"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"પૂર્વાનુમાનિત ઍપ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ખાતરી કરો કે તમે એકદમ દૂરની ડાબી કિનારીએથી સ્વાઇપ કરો છો."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ખાતરી કરો કે તમે ડાબી કિનારીએથી સ્ક્રીનના મધ્ય ભાગ સુધી સ્વાઇપ કરો છે અને આંગળી ઊંચકી લો છો."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ખાતરી કરો કે તમે એકદમ દૂરની જમણી કિનારીએથી સ્વાઇપ કરો છો."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ખાતરી કરો કે તમે જમણી કિનારીએથી સ્ક્રીનના મધ્ય ભાગ સુધી સ્વાઇપ કરો છે અને આંગળી ઊંચકી લો છો."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"પાછળ જવા ડાબેથી કેવી રીતે સ્વાઇપ કરવું એ તમે શીખી લીધું છે."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"પાછળ જવા જમણેથી કેવી રીતે સ્વાઇપ કરવું એ તમે શીખી લીધું છે. હવે પછી, ઍપ સ્વિચ કરવાની રીત જાણો."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"તમે પાછા જવાનો સંકેત પૂર્ણ કર્યો છે."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ખાતરી કરો કે તમારાથી સ્ક્રીનની એકદમ નીચેની કિનારીની ખૂબ નજીક સુધી સ્વાઇપ ન થઈ જાય."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"પાછા જવાના સંકેતની સંવેદિતા બદલવા માટે, સેટિંગમાં જાઓ"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"પાછળ જવા ડાબેથી સ્વાઇપ કરો"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"પાછળ જવા માટે, જમણેથી સ્વાઇપ કરો"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"તમે જે છેલ્લી સ્ક્રીન પર હતા તેના પર પાછા જવા, ડાબી કિનારીએથી સ્ક્રીનના મધ્ય ભાગ સુધી સ્વાઇપ કરો."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"તમે જમણી કિનારીથી સ્ક્રીનની વચ્ચે સુધી સ્વાઇપ કરીને પણ છેલ્લી સ્ક્રીન પર પાછા જઈ શકો છો. અજમાવી જુઓ."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"પાછળ જવા માટે સ્વાઇપ કરો"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"છેલ્લી સ્ક્રીન પર પાછા જવા, ડાબી કે જમણી કિનારીએથી સ્ક્રીનના મધ્ય ભાગ સુધી સ્વાઇપ કરો."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ખાતરી કરો કે તમે સ્ક્રીનની નીચેની કિનારીએથી ઉપરની તરફ સ્વાઇપ કરો છો."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ખાતરી કરો કે તમે આંગળી ઊંચકી લેતા પહેલાં સ્વાઇપ કરવાનું થોભાવતા નથી."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ખાતરી કરો કે તમે સીધું ઉપરની તરફ સ્વાઇપ કરો છો."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"સંકેતોનો ઉપયોગ કરવાની રીત વિશે તમે જાણ્યું. સંકેતો બંધ કરવા, સેટિંગમાં જાઓ."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"તમે ઍપ સ્વિચ કરવાનો સંકેત પૂર્ણ કર્યો છે."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ઍપ સ્વિચ કરવા સ્વાઇપ કરો"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"તમારી સ્ક્રીનના નીચેના ભાગથી ઉપરની તરફ સ્વાઇપ કરીને, થોડીવાર દબાવી રાખો, પછી છોડી દો."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"બધું સેટ થઈ ગયું"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"આગળ"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"સેટિંગ"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ફરી પ્રયાસ કરો"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"સરસ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ટ્યૂટૉરિઅલ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"બધું સેટ થઈ ગયું!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"હોમ પર જવા માટે ઉપરની તરફ સ્વાઇપ કરો"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"તમે તમારા ફોનનો ઉપયોગ કરવા માટે તૈયાર છો"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"ઍક્સેસિબિલિટી માટે નૅવિગેશન સેટિંગ"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"શેર કરો"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"સ્ક્રીનશૉટ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ઍપ કે તમારી સંસ્થા દ્વારા આ ક્રિયા કરવાની મંજૂરી નથી"</string>
diff --git a/quickstep/res/values-hi/strings.xml b/quickstep/res/values-hi/strings.xml
index b48dee948e..75879872e5 100644
--- a/quickstep/res/values-hi/strings.xml
+++ b/quickstep/res/values-hi/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"सुझाए गए ऐप्लिकेशन की सुविधा चालू है"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"सुझाए गए ऐप्लिकेशन की सुविधा बंद है"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"सुझाया गया ऐप्लिकेशन: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"देख लें कि आप स्क्रीन की बाईं तरफ़ के बिल्कुल किनारे से स्वाइप कर रहे हों."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"देख लें कि आप स्क्रीन के बाएं किनारे से बीचों-बीच तक स्वाइप कर रहे हों और फिर अपनी उंगली उठा लें."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"देख लें कि आप स्क्रीन की दाईं तरफ़ के बिल्कुल किनारे से स्वाइप कर रहे हों."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"देख लें कि आप स्क्रीन के दाएं किनारे से बीचों-बीच तक स्वाइप कर रहे हों और फिर अपनी उंगली उठा लें."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"आपने स्क्रीन के बाएं किनारे से स्वाइप करके, पिछली स्क्रीन पर वापस जाने का तरीका सीख लिया है."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"आपने स्क्रीन के दाएं किनारे से स्वाइप करके, पिछली स्क्रीन पर वापस जाने का तरीका सीख लिया है. अब, एक ऐप से दूसरे ऐप पर जाने का तरीका सीखें."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"आपने पेज पर पीछे ले जाने वाले हाथ के जेस्चर (हाव-भाव) के बारे में जान लिया है."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"देखे लें कि आप स्क्रीन पर बिल्कुल नीचे तक स्वाइप न कर रहे हों."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"\'सेटिंग\' में जाकर, पीछे जाने के लिए इस्तेमाल होने वाले हाथ के जेस्चर (हाव-भाव) की संवेदनशीलता बदलें"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"वापस जाने के लिए, स्क्रीन के बाएं किनारे से स्वाइप करें"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"वापस जाने के लिए, स्क्रीन के दाएं किनारे से स्वाइप करें"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"पिछली स्क्रीन पर वापस जाने के लिए, स्क्रीन के बाएं किनारे से बीच तक स्वाइप करें."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"आप स्क्रीन के दाएं किनारे से बीच तक स्वाइप करके भी पिछली स्क्रीन पर जा सकते हैं. इसे अभी आज़माएं."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"पिछली स्क्रीन पर वापस जाने के लिए स्वाइप करें"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"पिछली स्क्रीन पर वापस जाने के लिए, स्क्रीन के बाएं या दाएं किनारे से बीचों-बीच तक स्वाइप करें."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"देख लें कि आप स्क्रीन के निचले किनारे से ऊपर की ओर स्वाइप कर रहे हों."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"देख लें कि आप स्क्रीन से अपनी उंगली उठाने से पहले, इसे कहीं न रोक रहे हों."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"देख लें कि आप ऊपर की ओर बिल्कुल सीधे स्वाइप कर रहे हों."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"आपने हाथ के जेस्चर (हाव-भाव) इस्तेमाल करने सीख लिए हैं. जेस्चर बंद करने के लिए, सेटिंग में जाएं."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"आपने एक ऐप्लिकेशन से दूसरे पर जाने के लिए इस्तेमाल होने वाले हाथ के जेस्चर के बारे में जान लिया है."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"एक ऐप्लिकेशन से दूसरे पर जाने के लिए स्वाइप करें"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"अपनी स्क्रीन पर नीचे से ऊपर की तरफ़ स्वाइप करें, दबाकर रखें, फिर छोड़ दें."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"आप पूरी तरह तैयार हैं"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"आगे बढ़ें"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"सेटिंग"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"फिर से कोशिश करें"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"बहुत बढ़िया!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ट्यूटोरियल <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"हो गया!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"होम पेज पर जाने के लिए, ऊपर की ओर स्वाइप करें"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"अब आप अपना फ़ोन इस्तेमाल कर सकते हैं"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"सुलभता के लिए नेविगेशन सेटिंग"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"शेयर करें"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"स्क्रीनशॉट लें"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ऐप्लिकेशन या आपका संगठन इस कार्रवाई की अनुमति नहीं देता"</string>
diff --git a/quickstep/res/values-hr/strings.xml b/quickstep/res/values-hr/strings.xml
index c1a3bf63a6..a8a7b24277 100644
--- a/quickstep/res/values-hr/strings.xml
+++ b/quickstep/res/values-hr/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Predlaganje apl. omogućeno"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Predlaganje apl. onemogućeno"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predviđena aplikacija: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pazite da prijeđete prstom od krajnjeg lijevog ruba."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pazite da prijeđete prstom od lijevog ruba do sredine zaslona i podignite prst."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pazite da prijeđete prstom od krajnjeg desnog ruba."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pazite da prijeđete prstom od desnog ruba do sredine zaslona i podignite prst."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Naučili ste kako prijeći prstom slijeva da biste se vratili."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Naučili ste kako prijeći prstom zdesna da biste se vratili. Sad saznajte kako promijeniti aplikaciju."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Izvršili ste pokret za povratak."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pazite da ne prijeđete prstom preblizu dnu zaslona."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Osjetljivost pokreta povratka promijenite u postavkama"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Prijeđite prstom slijeva udesno da biste se vratili"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Prijeđite prstom zdesna biste se vratili"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Da biste se vratili na posljednji posjećeni zaslon, prijeđite od lijevog ruba do sredine zaslona."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Na posljednji se zaslon možete vratiti i prelaskom od desnog ruba do sredine zaslona. Isprobajte odmah."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Prijeđite prstom da biste se vratili"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Za povratak na zadnji zaslon prijeđite prstom od lijevog ili desnog ruba do sredine zaslona."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pazite da prijeđete prstom prema gore od donjeg ruba zaslona."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pazite da ne zastanete prije podizanja prsta."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pazite da prijeđete prstom ravno prema gore."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Naučili ste koristiti pokrete. Pokrete možete isključiti u postavkama."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Izvršili ste pokret za promjenu aplikacije."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Prijeđite prstom da biste promijenili aplikaciju"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Prijeđite prstom od dna zaslona prema gore, zadržite pritisak pa podignite prst."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Sve je spremno"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Dalje"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Postavke"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Pokušajte ponovo"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Odlično!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Vodič <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Sve je spremno!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Prijeđite prstom prema gore da biste otvorili početni zaslon"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Spremni ste za početak upotrebe telefona"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Postavke navigacije za pristupačnost"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Podijeli"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Snimka zaslona"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikacija ili vaša organizacija ne dopuštaju ovu radnju"</string>
diff --git a/quickstep/res/values-hu/strings.xml b/quickstep/res/values-hu/strings.xml
index 5289af1891..54fc23ecda 100644
--- a/quickstep/res/values-hu/strings.xml
+++ b/quickstep/res/values-hu/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Alkalmazásjavaslatok engedélyezve"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Alkalmazásjavaslatok letiltva"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Várható alkalmazás: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Csúsztasson a képernyő bal széléről."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Csúsztasson a képernyő bal széléről a képernyő közepéig, és engedje el a képernyőt."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Csúsztasson a képernyő jobb széléről."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Csúsztasson a képernyő jobb széléről a képernyő közepéig, és engedje el a képernyőt."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Megtanulta, hogyan léphet vissza balról csúsztatva."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Megtanulta, hogyan léphet vissza jobbról csúsztatva. A következő az appok közötti váltás."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Teljesítette a visszalépési kézmozdulatot."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ne csúsztasson túl közel a képernyő aljához."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"A vissza mozdulat érzékenysége a Beállításokban módosítható"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"A visszalépéshez csúsztasson balról jobbra"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"A visszalépéshez csúsztasson jobbról balra"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Ha visszatérne a legutóbbi képernyőre, csúsztasson a képernyő közepére a bal szélétől."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"A képernyő jobb széléről a közepéig csúsztatva is visszatérhet a legutóbbi képernyőre. Próbálja ki."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Csúsztasson a visszalépéshez"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Ha visszatérne a legutóbbi képernyőre, csúsztasson a képernyő közepére a bal vagy a jobb széléről."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Csúsztasson felfelé a képernyő aljától."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Ne álljon meg, mielőtt elengedi a képernyőt."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Csúsztasson egyenesen felfelé."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Eddig megismerhette a kézmozdulatok használatát. A kézmozdulatokat a Beállításokban kapcsolhatja ki."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Teljesítette az alkalmazásváltás kézmozdulatát."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Alkalmazásváltás csúsztatással"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Csúsztasson felfelé a képernyő aljáról, tartsa lenyomva az ujját, majd emelje fel."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Minden kész"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Tovább"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Beállítások"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Újra"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Remek!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Útmutató (<xliff:g id="TOTAL">%2$d</xliff:g>/<xliff:g id="CURRENT">%1$d</xliff:g>.)"</string>
     <string name="allset_title" msgid="5021126669778966707">"Kész is!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Felfelé csúsztatva megjelenik a kezdőképernyő"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Készen áll a telefon használatára"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"A kisegítő lehetőségek navigációs beállításai"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Megosztás"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Képernyőkép"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Az alkalmazás vagy az Ön szervezete nem engedélyezi ezt a műveletet"</string>
diff --git a/quickstep/res/values-hy/strings.xml b/quickstep/res/values-hy/strings.xml
index 8a5a875b0b..01edb15d7d 100644
--- a/quickstep/res/values-hy/strings.xml
+++ b/quickstep/res/values-hy/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"«Առաջարկվող հավելվածներ» գործառույթը միացված է"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"«Առաջարկվող հավելվածներ» գործառույթն անջատված է"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Առաջարկվող հավելված՝ <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Համոզվեք, որ մատը սահեցնում եք էկրանի ձախ եզրից։"</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Մատը սահեցրեք էկրանի ձախ եզրից դեպի կենտրոն և բաց թողեք։"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Համոզվեք, որ մատը սահեցնում եք էկրանի աջ եզրից։"</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Մատը սահեցրեք էկրանի աջ եզրից դեպի կենտրոն և բաց թողեք։"</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Դուք սովորեցիք՝ ինչպես մատը ձախից սահեցնելով հետ գնալ"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Դուք սովորեցիք՝ ինչպես մատը աջից սահեցնելով հետ գնալ։ Այժմ սովորենք՝ ինչպես անցնել մի հավելվածից մյուսը։"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Դուք սովորեցիք հետ գնալու ժեստը։"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Համոզվեք, որ մատը չափազանց մոտ չեք սահեցնում էկրանին ներքևի հատվածին։"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Հետ գնալու ժեստի զգայունությունը փոփոխեք կարգավորումներում"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Սահեցրեք մատը ձախից՝ հետ գնալու համար"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Սահեցրեք մատը աջից՝ հետ գնալու համար"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Վերջին էկրան վերադառնալու համար էկրանի եզրից մատը սահեցրեք դեպի կենտրոն։"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Անցեք վերջին էկրան՝ էկրանի աջ եզրից մատը սահեցնելով դեպի կենտրոն։ Փորձեք հիմա։"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Սահեցրեք մատը՝ հետ գնալու համար"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Վերջին էկրան վերադառնալու համար էկրանի աջ կամ ձախ եզրից մատը սահեցրեք դեպի կենտրոն։"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Համոզվեք, որ մատն էկրանի ներքևի եզրից վերև եք սահեցնում։"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Համոզվեք, որ դադար չեք տալիս նախքան բաց թողնելը։"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Համոզվեք, որ մատն ուղիղ վերև եք սահեցնում։"</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Դուք սովորեցիք՝ ինչպես օգտագործել ժեստերը։ Ժեստերը կարող եք անջատել կարգավորումներում։"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Դուք սովորեցիք մի հավելվածից մյուսն անցնելու ժեստը։"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Մատը սահեցրեք՝ մյուս հավելվածին անցնելու համար"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Մատը սահեցրեք էկրանի ներքևից վերև, պահեք և բաց թողեք։"</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Պատրաստ է"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Առաջ"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Կարգավորումներ"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Նորից փորձեք"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Գերազանց է"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Ուղեցույց <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Պատրաստ է"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Մատը սահեցրեք վերև՝ հիմնական էկրան անցնելու համար"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Դուք արդեն կարող եք օգտագործել ձեր հեռախոսը"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Նավիգացիայի կարգավորումներ հատուկ գործառույթների համար"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Կիսվել"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Սքրինշոթ անել"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Այս գործողությունն արգելված է հավելվածի կամ ձեր կազմակերպության կողմից"</string>
diff --git a/quickstep/res/values-in/strings.xml b/quickstep/res/values-in/strings.xml
index d6802d401f..46eb6d8b97 100644
--- a/quickstep/res/values-in/strings.xml
+++ b/quickstep/res/values-in/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Saran aplikasi diaktifkan"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Saran aplikasi dinonaktifkan"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplikasi yang diprediksi: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pastikan Anda menggeser dari tepi ujung kiri."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pastikan Anda menggeser dari tepi kiri ke tengah layar, lalu lepaskan."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pastikan Anda menggeser dari tepi ujung kanan."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pastikan Anda menggeser dari tepi kanan ke tengah layar, lalu lepaskan."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Anda telah belajar cara geser dari kiri untuk kembali."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Anda telah belajar cara geser dari kanan untuk kembali. Berikutnya, pelajari cara beralih aplikasi."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Anda telah menyelesaikan gestur kembali."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pastikan Anda tidak menggeser terlalu dekat ke bagian bawah layar."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Untuk mengubah sensitivitas gestur kembali, buka Setelan"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Geser dari kiri untuk kembali"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Geser dari kanan untuk kembali"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Untuk kembali ke layar terakhir yang Anda buka, geser dari tepi kiri ke tengah layar."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Geser dari tepi kanan ke tengah layar untuk kembali ke layar terakhir. Coba sekarang."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Geser untuk kembali"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Untuk kembali ke layar terakhir, geser dari tepi kiri atau kanan ke tengah layar."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pastikan Anda menggeser ke atas dari tepi bawah layar."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pastikan Anda tidak menjeda sebelum melepaskan."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pastikan Anda menggeser lurus ke atas."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Anda telah mempelajari cara menggunakan gestur. Untuk menonaktifkan gestur, buka Setelan."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Anda telah menyelesaikan gestur beralih aplikasi."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Geser untuk beralih aplikasi"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Geser ke atas dari bagian bawah layar, tahan, lalu lepaskan."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Semua siap"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Berikutnya"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Setelan"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Coba lagi"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bagus!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Semua siap."</string>
-    <string name="allset_hint" msgid="459504134589971527">"Geser ke atas untuk beralih ke layar utama"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Anda sudah siap untuk mulai menggunakan ponsel"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Setelan navigasi untuk aksesibilitas"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Bagikan"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Tindakan ini tidak diizinkan oleh aplikasi atau organisasi Anda"</string>
diff --git a/quickstep/res/values-is/strings.xml b/quickstep/res/values-is/strings.xml
index 9c756d7694..8657639df4 100644
--- a/quickstep/res/values-is/strings.xml
+++ b/quickstep/res/values-is/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Kveikt á tillögum að forritum"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Slökkt er á tillögðum forritum"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Tillaga að forriti: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Passaðu að strjúka frá jaðri vinstri brúnar."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Passaðu að strjúka frá vinstri brún skjásins að miðju hans og sleppa svo."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Passaðu að strjúka frá jaðri hægri brúnar."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Passaðu að strjúka frá hægri brún skjásins að miðju hans og sleppa svo."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Þú lærðir að strjúka frá vinstri til að bakka."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Þú lærðir að strjúka frá hægri til að bakka. Næst skaltu læra hvernig þú skiptir á milli forrita."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Þú laukst við að kynna þér bendinguna „til baka“."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Passaðu að strjúka ekki of nálægt neðri brún skjásins."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Til að breyta næmi til baka-bendingar ferðu í stillingar"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Strjúktu frá vinstri til að fara til baka"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Strjúktu frá hægri til að fara til baka"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Strjúktu frá vinstri brún að miðju skjásins til að fara aftur á síðasta skjá sem var opinn."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Þú getur líka farið á síðasta skjá með því að strjúka frá hægri brún að miðju skjásins. Prófaðu núna."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Strjúktu til að fara til baka"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Til að fara til baka á síðasta skjá skaltu strjúka frá vinstri eða hægri brún að miðju skjásins."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Passaðu að strjúka upp frá neðri brún skjásins."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Passaðu að stoppa ekki áður en þú sleppir."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Passaðu að strjúka beint upp."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Þú kynntir þér hvernig á að nota bendingar. Opnaðu stillingar til að slökkva á bendingum."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Þú laukst við að kynna þér bendinguna „skipta um forrit“."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Strjúktu til að skipta á milli forrita"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Strjúktu upp frá neðri hluta skjásins, haltu fingrinum á skjánum og slepptu svo."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Allt til reiðu"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Áfram"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Stillingar"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Reyna aftur"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Flott!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Leiðsögn <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Allt tilbúið!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Strjúktu upp til að fara á heimaskjáinn"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Þú getur byrjað að nota símann"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Flettistillingar fyrir aðgengi"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Deila"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Skjámynd"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Forritið eða fyrirtækið leyfir ekki þessa aðgerð"</string>
diff --git a/quickstep/res/values-it/strings.xml b/quickstep/res/values-it/strings.xml
index dc0bf57ae1..7d8f6db9d3 100644
--- a/quickstep/res/values-it/strings.xml
+++ b/quickstep/res/values-it/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"La funzionalità app suggerite è attiva"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"La funzionalità app suggerite è disattivata"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App prevista: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Assicurati di scorrere dall\'estremità del bordo sinistro."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Assicurati di scorrere dal bordo sinistro verso il centro dello schermo e solleva il dito."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Assicurati di scorrere dall\'estremità del bordo destro."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Assicurati di scorrere dal bordo destro verso il centro dello schermo e solleva il dito."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Hai imparato a scorrere da sinistra per tornare indietro."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Hai imparato a scorrere da destra per tornare indietro. Ora impara come passare da un\'app all\'altra."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Hai completato il gesto Indietro."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Assicurati di non scorrere troppo vicino alla parte inferiore dello schermo."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Usa Impostazioni per cambiare sensibilità del gesto Indietro"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Scorri da sinistra per tornare indietro"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Scorri da destra per tornare indietro"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Per tornare all\'ultima schermata mostrata, scorri dal bordo sinistro verso il centro dello schermo."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Puoi anche tornare all\'ultima schermata scorrendo dal bordo destro verso il centro dello schermo. Prova."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Scorri per tornare indietro"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Per tornare all\'ultima schermata, scorri dal bordo sinistro o destro verso il centro dello schermo."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Assicurati di scorrere verso l\'alto dal bordo inferiore dello schermo."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Assicurati di non fare pause prima di sollevare il dito."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Assicurati di scorrere verso l\'alto senza fermarti."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Hai imparato a usare i gesti. Per disattivarli, vai alle Impostazioni."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Hai completato il gesto Cambia app."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Scorri per passare da un\'app all\'altra"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Scorri verso l\'alto dalla parte inferiore dello schermo, tieni premuto e rilascia."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Fatto"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Avanti"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Impostazioni"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Riprova"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bene!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Finito."</string>
-    <string name="allset_hint" msgid="459504134589971527">"Scorri verso l\'alto per andare alla schermata Home"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Puoi iniziare a usare il tuo telefono"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Impostazioni di navigazione per l\'accessibilità"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Condividi"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Questa azione non è consentita dall\'app o dall\'organizzazione"</string>
diff --git a/quickstep/res/values-iw/strings.xml b/quickstep/res/values-iw/strings.xml
index 1f5ee1e43e..65e8374e20 100644
--- a/quickstep/res/values-iw/strings.xml
+++ b/quickstep/res/values-iw/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"התכונה \'הצעות לאפליקציות\' מופעלת"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ההצעות לאפליקציות מושבתות"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"האפליקציות החזויות: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"חשוב להקפיד להחליק מהקצה הימני."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"חשוב להקפיד להחליק מהקצה הימני למרכז המסך ואז לשחרר."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"חשוב להקפיד להחליק מהקצה השמאלי."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"חשוב להקפיד להחליק מהקצה השמאלי למרכז המסך ואז לשחרר."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"למדת איך להחליק מצד שמאל כדי לחזור אחורה."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"למדת איך להחליק מצד ימין כדי לחזור אחורה. בשלב הבא לומדים איך לעבור בין אפליקציות."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"השלמת את תנועת \'הקודם\'."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"חשוב להקפיד שלא להחליק קרוב מדי לתחתית המסך."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"כדי לשנות את מידת הרגישות של תנועת החזרה, יש לעבור להגדרות"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"יש להחליק מצד שמאל כדי לחזור למסך הקודם"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"יש להחליק מצד ימין כדי לחזור אחורה"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"כדי לחזור למסך הקודם, יש להחליק מהקצה השמאלי של המסך אל המרכז."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"בנוסף, אפשר לחזור למסך הקודם בהחלקה מהקצה הימני של המסך אל המרכז. רוצה לנסות עכשיו?"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"יש להחליק כדי לחזור"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"כדי לחזור למסך הקודם, יש להחליק מהקצה השמאלי או הימני למרכז המסך."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"חשוב להקפיד להחליק למעלה מהקצה התחתון של המסך."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"חשוב לוודא שלא מחכים לפני שמשחררים."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"חשוב להקפיד להחליק ישר למעלה."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"למדת איך להשתמש בתנועות. ניתן להשבית את התנועות ב\'הגדרות\'."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"השלמת את תנועת המעבר בין האפליקציות."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"יש להחליק כדי לעבור בין אפליקציות"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"יש להחליק למעלה מתחתית המסך, להחזיק ולאחר מכן לשחרר."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"הכול מוכן"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"הבא"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"הגדרות"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ניסיון חוזר"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"איזה יופי!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"מדריך <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"הכול מוכן!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"כדי לחזור לדף הבית, מחליקים כלפי מעלה"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"הכול מוכן ואפשר להתחיל להשתמש בטלפון"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"הגדרות ניווט לנגישות"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"שיתוף"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"צילום מסך"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"האפליקציה או הארגון שלך אינם מתירים את הפעולה הזאת"</string>
diff --git a/quickstep/res/values-ja/strings.xml b/quickstep/res/values-ja/strings.xml
index eb9c509c1b..4a42a12f81 100644
--- a/quickstep/res/values-ja/strings.xml
+++ b/quickstep/res/values-ja/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"アプリの候補表示が有効です"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"アプリの候補は無効です"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"予測されたアプリ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"左端からスワイプしてください。"</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"画面の左端から中央に向かってスワイプし、指を離してください。"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"右端からスワイプしてください。"</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"画面の右端から中央に向かってスワイプし、指を離してください。"</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"左側からスワイプして前の画面に戻る方法を学習しました。"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"右側からスワイプして前の画面に戻る方法を学習しました。次は、アプリを切り替える方法を覚えましょう。"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"「戻る」操作を完了しました。"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"スワイプする際は画面の下部に近づきすぎないようにしましょう。"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"「戻る」操作の感度を変更するには [設定] に移動します"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"左端からスワイプすると前の画面に戻ります"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"右側からスワイプすると前の画面に戻ります"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"直前の画面に戻るには、画面の左端から中央に向かってスワイプします。"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"画面の右端から中央に向かってスワイプして直前の画面に戻ることもできます。では、やってみましょう。"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"スワイプで戻りましょう"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"直前の画面に戻るには、画面の左端または右端から中央に向かってスワイプします。"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"画面の下端から上にスワイプしてください。"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"指を離す前にいったん止めないでください。"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"まっすぐ上にスワイプしてください。"</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"主な操作方法を覚えました。操作を OFF にするには、設定に移動してください。"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"「アプリを切り替える」操作を完了しました。"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"スワイプでアプリを切り替え"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"画面を下から上にスワイプして長押しし、指を離します。"</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"設定完了"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"次へ"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"設定"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"もう一度"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"成功しました"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"チュートリアル <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"設定完了"</string>
-    <string name="allset_hint" msgid="459504134589971527">"ホームに移動するには上にスワイプします"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"スマートフォンを使い始めることができます"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"ユーザー補助の操作設定"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"共有"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"スクリーンショット"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"この操作はアプリまたは組織で許可されていません"</string>
diff --git a/quickstep/res/values-ka/strings.xml b/quickstep/res/values-ka/strings.xml
index 15c86b47f5..617d7214ee 100644
--- a/quickstep/res/values-ka/strings.xml
+++ b/quickstep/res/values-ka/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"აპის შეთავაზებები ჩართულია"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"აპის შეთავაზებები გათიშულია"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ნაწინასწარმეტყველები აპი: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"არ გადაფურცლოთ მარცხენა კიდის ბოლოდან."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"გადაფურცლეთ მარცხენა კიდიდან ეკრანის ცენტრისკენ და თითი აუშვით."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"არ გადაფურცლოთ მარჯვენა კიდის ბოლოდან."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"გადაფურცლეთ მარჯვენა კიდიდან ეკრანის ცენტრისკენ და თითი აუშვით."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"თქვენ ისწავლეთ მარცხნიდან გადაფურცვლა უკან დასაბრუნებლად."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"თქვენ ისწავლეთ მარჯვნიდან გადაფურცვლა უკან დასაბრუნებლად. ახლა კი შეიტყვეთ, როგორ გადართოთ აპები."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"თქვენ შეასრულეთ უკან დაბრუნების ჟესტი."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"არ გადაფურცლოთ ეკრანის ბოლოსთან ახლოს."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"დაბრუნების ჟესტის მგრძნობელობის შესაცვლელად გადადით პარამეტრებზე"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"უკან დასაბრუნებლად გადაფურცლეთ მარცხნიდან"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"უკან დასაბრუნებლად გადაფურცლეთ მარჯვნიდან"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"ბოლო ნანახ ეკრანზე დასაბრუნებლად გადაფურცლეთ მარცხენა კიდიდან ეკრანის ცენტრისკენ."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"ასევე შეგიძლიათ, დაბრუნდეთ ბოლო ეკრანზე მარჯვენა კიდიდან ეკრანის შუისკენ გადაფურცვლით. ცადეთ ახლავე."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"უკან დასაბრუნებლად გადაფურცლეთ"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"ბოლო ეკრანზე დასაბრუნებლად გადაფურცლეთ მარცხენა ან მარჯვენა კიდიდან ეკრანის ცენტრისკენ."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"გადაფურცლეთ ეკრანის ქვედა კიდიდან ზემოთ."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"არ დააპაუზოთ თითის აშვებამდე."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"გადაფურცლეთ ზემოთ."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"თქვენ ისწავლეთ ჟესტების გამოყენება. ჟესტების გამოსართავად გადადით პარამეტრებში."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"თქვენ შეასრულეთ აპების გადართვის ჟესტი."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"აპების გადასართავად გადაფურცლეთ"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"გადაფურცლეთ ეკრანის ქვედა კიდიდან ზემოთ, დააყოვნეთ, შემდეგ თითი აუშვით."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"მზად არის"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"შემდეგ"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"პარამეტრები"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ხელახლა ცდა"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"მშვენიერია!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"სახელმძღვანელო <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"მზადაა!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"მთავარ გვერდზე გადასასვლელად გადაფურცლეთ ზევით"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"მზად ხართ ტელეფონის გამოსაყენებლად"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"ნავიგაციის პარამეტრები მარტივი წვდომისთვის"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"გაზიარება"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ეკრანის ანაბეჭდი"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ეს მოქმედება არ არის დაშვებული აპის ან თქვენი ორგანიზაციის მიერ"</string>
diff --git a/quickstep/res/values-kk/strings.xml b/quickstep/res/values-kk/strings.xml
index 52d8b91c5c..b14e35bf60 100644
--- a/quickstep/res/values-kk/strings.xml
+++ b/quickstep/res/values-kk/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Ұсынылған қолданбалар функциясы қосылды."</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"\"Ұсынылған қолданбалар\" функциясы өшірулі."</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Болжалды қолданба: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Сол жақтағы ең шеткі нүктеден бастап сырғытыңыз."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Экранның сол жақ шетінен ортасына қарай сырғытыңыз да, жіберіңіз."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Оң жақтағы ең шеткі нүктеден бастап сырғытыңыз."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Экранның оң жақ шетінен ортасына қарай сырғытыңыз да, жіберіңіз."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Солдан оңға сырғыту арқылы артқа қайтуды үйрендіңіз."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Оңнан солға сырғыту арқылы артқа қайтуды үйрендіңіз. Енді қолданбаларды ауыстыруды үйреніңіз."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Артқа қайту қимылын аяқтадыңыз."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Саусағыңызбен сырғыту кезінде экранның төменгі жағына тым жақындамаңыз."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Артқа қайту қимылы сезгіштігін параметрлерден өзгертіңіз."</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Артқа қайту үшін солдан оңға сырғытыңыз."</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Артқа қайту үшін оңнан солға сырғытыңыз"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Соңғы ашылған экранға оралу үшін экранның сол жағынан ортасына сырғытыңыз."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Экранның оң жағынан ортасына сырғыту арқылы соңғы ашылған экранға орала аласыз. Қазір істеп көріңіз."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Артқа қайту үшін сырғытыңыз"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Соңғы ашылған экранға оралу үшін экранның сол немесе оң жақ шетінен ортасына қарай сырғытыңыз."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Экранның төменгі шетінен жоғары қарай сырғытыңыз."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Жіберер алдында кідіріс жасамаңыз."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Тігінен жоғары қарай сырғытыңыз."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Қимылдарды қолдануды үйрендіңіз. Қимылдарды өшіру үшін \"Параметрлер\" бөліміне өтіңіз."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Қолданбаларды ауыстыру қимылын аяқтадыңыз."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Қолданбаларды ауыстыру үшін сырғытыңыз"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Экранның төменгі жағынан жоғары қарай сырғытып, ұстап тұрыңыз да, жіберіңіз."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Бәрі дайын"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Келесі"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Параметрлер"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Қайталау"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Жақсы!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Оқулық: <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Бәрі дайын!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Негізгі экранға өту үшін жоғары қарай сырғытыңыз."</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Телефоныңыз пайдалануға дайын."</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Арнайы мүмкіндіктерге арналған навигация параметрлері"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Бөлісу"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Скриншот"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Бұл әрекетке қолданба не ұйым рұқсат етпейді."</string>
diff --git a/quickstep/res/values-km/strings.xml b/quickstep/res/values-km/strings.xml
index 2e8a5c400e..ab51a65ebb 100644
--- a/quickstep/res/values-km/strings.xml
+++ b/quickstep/res/values-km/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"បានបើក​ការណែនាំ​កម្មវិធី"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"បានបិទ​ការណែនាំ​កម្មវិធី"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"កម្មវិធី​ដែលបាន​ព្យាករ៖ <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ត្រូវប្រាកដថា​អ្នកអូសពី​ចុងគែម​ខាងឆ្វេង​។"</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ត្រូវប្រាកដថា​អ្នកអូសពី​គែមខាងឆ្វេង​ទៅផ្នែកកណ្ដាល​នៃអេក្រង់ រួច​ដកដៃ​។"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ត្រូវប្រាកដថា​អ្នកអូសពី​ចុងគែម​ខាងស្ដាំ​។"</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ត្រូវប្រាកដថា​អ្នកអូសពី​គែមខាងស្ដាំ​ទៅផ្នែកកណ្ដាល​នៃអេក្រង់ រួច​ដកដៃ​។"</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"អ្នក​បានស្វែងយល់​ពីរបៀប​អូសពី​ខាងឆ្វេង ដើម្បី​ថយក្រោយ។"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"អ្នកបានស្វែងយល់ពីរបៀបអូសពីខាងស្ដាំ ដើម្បីថយក្រោយ។ បន្ទាប់​ទៀត សូមស្វែងយល់​ពីរបៀប​ប្ដូរកម្មវិធី​។"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"អ្នក​បានបញ្ចប់​ចលនា​ថយក្រោយ​ហើយ។"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ត្រូវប្រាកដថា​អ្នកមិនអូស​ទៅជិត​ផ្នែកខាងក្រោម​នៃអេក្រង់ពេក​។"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ដើម្បីប្ដូរកម្រិត​រំញោចនឹង​ចលនាថយក្រោយ សូមចូលទៅកាន់​ការកំណត់"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"អូសពីខាងឆ្វេងដើម្បីថយក្រោយ"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"អូសពីខាងស្ដាំ​ដើម្បីថយក្រោយ"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"ដើម្បីត្រឡប់ទៅ​អេក្រង់ចុងក្រោយ​ដែលអ្នកបានចូល សូមអូសពី​គែមខាងឆ្វេង​ទៅផ្នែកកណ្ដាល​នៃអេក្រង់។"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"អ្នកក៏អាចត្រឡប់ទៅអេក្រង់ចុងក្រោយបានផងដែរ ដោយអូសពីគែមខាងស្ដាំទៅផ្នែកកណ្ដាលនៃអេក្រង់។ សាកល្បង​ឥឡូវនេះ។"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"អូស​ដើម្បី​ត្រឡប់​ទៅវិញ"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"ដើម្បី​ត្រឡប់ទៅ​អេក្រង់​ចុងក្រោយវិញ សូមអូស​ពីគែម​ខាងឆ្វេង ឬខាងស្ដាំ​ទៅផ្នែកកណ្ដាល​នៃអេក្រង់​។"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ត្រូវប្រាកដថា​អ្នកអូសឡើងលើ​ពីគែមខាងក្រោម​នៃអេក្រង់​។"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ត្រូវប្រាកដថា​អ្នកមិនផ្អាក មុនពេល​ដកដៃ​។"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ត្រូវប្រាកដថា​អ្នកអូស​ត្រង់ឡើងលើ​។"</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"អ្នក​បានស្វែងយល់អំពី​របៀបប្រើចលនា​ហើយ។ ដើម្បីបិទ​ចលនា សូមចូល​ទៅកាន់​ការកំណត់។"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"អ្នក​បានបញ្ចប់​ចលនា​ប្ដូរកម្មវិធី​ហើយ។"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"អូស​ដើម្បីប្ដូរ​កម្មវិធី"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"អូសឡើងលើ​ពីផ្នែកខាងក្រោមនៃអេក្រង់​របស់អ្នក រួចសង្កត់​ឱ្យជាប់ បន្ទាប់មកដកដៃចេញ។"</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"រួចហើយ"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"បន្ទាប់"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ការកំណត់"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ព្យាយាមម្ដងទៀត"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ល្អ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"មេរៀនទី <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"រួចហើយ!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"អូស​ឡើង​លើ ​ដើម្បី​ចូលទៅកាន់អេក្រង់ដើម"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"អ្នក​អាច​ចាប់ផ្ដើម​ប្រើ​ទូរសព្ទ​របស់អ្នក​បានហើយ"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"ការកំណត់​ការរុករក​សម្រាប់​ភាពងាយស្រួល"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"ចែករំលែក"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"រូបថតអេក្រង់"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"សកម្មភាពនេះ​មិនត្រូវបានអនុញ្ញាតដោយកម្មវិធី​ ឬ​ស្ថាប័ន​របស់អ្នកទេ"</string>
diff --git a/quickstep/res/values-kn/strings.xml b/quickstep/res/values-kn/strings.xml
index a1d03e60c2..357f41f00a 100644
--- a/quickstep/res/values-kn/strings.xml
+++ b/quickstep/res/values-kn/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ಆ್ಯಪ್ ಸಲಹೆಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ಆ್ಯಪ್ ಸಲಹೆಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ಶಿಫಾರಸು ಮಾಡಿದ ಆ್ಯಪ್: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ನೀವು ಎಡ ಭಾಗದ ಅಂಚಿನಿಂದ ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ಎಡ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ ಹಾಗೂ ನಿಮ್ಮ ಬೆರಳನ್ನು ಮೇಲೆತ್ತಿ."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ನೀವು ಬಲ ಅಂಚಿನಿಂದ ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ಬಲ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ ಹಾಗೂ ನಿಮ್ಮ ಬೆರಳನ್ನು ಮೇಲೆತ್ತಿ."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"ಹಿಂದಕ್ಕೆ ಹೋಗಲು ಎಡದಿಂದ ಸ್ವೈಪ್ ಮಾಡುವುದು ಹೇಗೆಂದು ನೀವು ಕಲಿತಿರಿ."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ಹಿಂದೆ ಹೋಗಲು ಬಲದಿಂದ ಸ್ವೈಪ್ ಮಾಡುವುದು ಹೇಗೆಂದು ಕಲಿತಿರಿ. ಮುಂದೆ, ಆ್ಯಪ್‌ಗಳನ್ನು ಬದಲಿಸುವುದು ಹೇಗೆಂದು ತಿಳಿಯಿರಿ."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ನೀವು ಗೋ ಬ್ಯಾಕ್ ಗೆಸ್ಚರ್ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದ್ದೀರಿ."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ನೀವು ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಭಾಗಕ್ಕೆ ಹೆಚ್ಚು ಹತ್ತಿರ ಸ್ವೈಪ್ ಮಾಡದಂತೆ ನೋಡಿಕೊಳ್ಳಿ."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ಬ್ಯಾಕ್ ಗೆಸ್ಚರ್‌ನ ಸೂಕ್ಷ್ಮತೆ ಬದಲಾಯಿಸಲು, ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಹೋಗಿ"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"ಹಿಂದಕ್ಕೆ ಹೋಗಲು ಎಡದಿಂದ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"ಹಿಂದಕ್ಕೆ ಹೋಗಲು ಬಲದಿಂದ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"ಈ ಮೊದಲು ನೀವಿದ್ದ ಕೊನೆಯ ಸ್ಕ್ರೀನ್‌ಗೆ ಹಿಂತಿರುಗಲು, ಎಡ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"ಬಲ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿಯೂ ನೀವು ಕೊನೆಯ ಸ್ಕ್ರೀನ್‌ಗೆ ಹೋಗಬಹುದು. ಇದನ್ನು ಈಗಲೇ ಪ್ರಯತ್ನಿಸಿ."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"ಹಿಂದಕ್ಕೆ ಹೋಗಲು ಸ್ವೈಪ್ ಮಾಡಿ"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"ಕೊನೆಯ ಸ್ಕ್ರೀನ್‌ಗೆ ಹಿಂತಿರುಗಲು, ಎಡ ಅಥವಾ ಬಲ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಗಿನ ಅಂಚಿನಿಂದ ನೀವು ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ವಿರಾಮಗೊಳಿಸದೆ ನಿಮ್ಮ ಬೆರಳನ್ನು ಸ್ಕ್ರೀನ್‌ನಿಂದ ಮೇಲೆತ್ತಿ."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ನೀವು ನೇರವಾಗಿ ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"ಗೆಸ್ಚರ್‌ಗಳನ್ನು ಬಳಕೆಯನ್ನು ನೀವು ತಿಳಿದುಕೊಂಡಿರುವಿರಿ. ಗೆಸ್ಚರ್‌ಗಳನ್ನು ಆಫ್ ಮಾಡಲು, ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಹೋಗಿ."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"ನೀವು ಆ್ಯಪ್‌ಗಳನ್ನು ಬದಲಾಯಿಸುವ ಗೆಸ್ಚರ್ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದ್ದೀರಿ."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ಆ್ಯಪ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಲು ಸ್ವೈಪ್ ಮಾಡಿ"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ನಿಮ್ಮ ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಗಿನಿಂದ ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ, ಒತ್ತಿ ಹಿಡಿಯಿರಿ, ನಂತರ ಬಿಟ್ಟು ಬಿಡಿ."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"ಸಂಪೂರ್ಣ ಸಿದ್ಧವಾಗಿದೆ"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"ಮುಂದೆ"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ಪುನಃ ಪ್ರಯತ್ನಿಸಿ"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ಚೆನ್ನಾಗಿದೆ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ಟ್ಯುಟೋರಿಯಲ್ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"ಎಲ್ಲವೂ ಸಿದ್ಧವಾಗಿದೆ!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"ಮುಖಪುಟಕ್ಕೆ ಹೋಗಲು ಮೇಲೆ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"ನಿಮ್ಮ ಫೋನ್ ಬಳಸುವುದನ್ನು ಪ್ರಾರಂಭಿಸಲು ನೀವು ಸಿದ್ದರಾಗಿರುವಿರಿ"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"ಅಕ್ಸೆಸಿಬಿಲಿಟಿಗಾಗಿ ನ್ಯಾವಿಗೇಶನ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"ಹಂಚಿಕೊಳ್ಳಿ"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ಸ್ಕ್ರೀನ್‌ಶಾಟ್"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ಆ್ಯಪ್ ಅಥವಾ ನಿಮ್ಮ ಸಂಸ್ಥೆಯು ಈ ಕ್ರಿಯೆಯನ್ನು ಅನುಮತಿಸುವುದಿಲ್ಲ"</string>
diff --git a/quickstep/res/values-ko/strings.xml b/quickstep/res/values-ko/strings.xml
index bd6ecc7b7d..d2bb8e095e 100644
--- a/quickstep/res/values-ko/strings.xml
+++ b/quickstep/res/values-ko/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"앱 제안이 사용 설정됨"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"앱 제안이 사용 중지됨"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"예상 앱: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"왼쪽 가장자리 끝에서 스와이프하세요."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"왼쪽 가장자리에서 화면 중앙으로 스와이프한 후 손가락을 떼세요."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"오른쪽 가장자리 끝에서 스와이프하세요."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"오른쪽 가장자리에서 화면 중앙으로 스와이프한 후 손가락을 떼세요."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"왼쪽에서 스와이프하여 뒤로 돌아가는 방법을 배웠습니다."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"오른쪽에서 스와이프하여 뒤로 돌아가는 방법을 배웠습니다. 이번에는 앱 전환 방법을 알아보겠습니다."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"돌아가기 동작을 완료했습니다."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"화면 하단에 지나치게 가까운 곳에서 스와이프하면 안 됩니다."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"돌아가기 동작의 민감도를 변경하려면 설정으로 이동하세요"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"왼쪽에서 스와이프하여 뒤로 돌아가세요"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"돌아가려면 오른쪽에서 스와이프하세요"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"마지막 화면으로 돌아가려면 왼쪽 가장자리에서 화면 중앙으로 스와이프하세요"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"오른쪽 가장자리에서 화면 중앙으로 스와이프해도 마지막 화면으로 돌아갈 수 있습니다. 지금 동작을 취해 보세요."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"스와이프하여 돌아가기"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"마지막 화면으로 돌아가려면 왼쪽 또는 오른쪽 가장자리에서 화면 중앙으로 스와이프하세요"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"화면 하단 가장자리에서 위로 스와이프하세요."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"손가락을 떼기 전에 멈추지 않아야 합니다."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"위로 똑바르게 스와이프하세요."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"동작 사용 방법을 알아봤습니다. 동작을 사용 중지하려면 설정으로 이동하세요."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"앱 전환 동작을 완료했습니다."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"스와이프로 앱 전환"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"화면 하단에서 위로 스와이프하고 잠시 멈춘 다음 손가락을 떼세요"</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"설정 완료"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"다음"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"설정"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"다시 시도"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"잘하셨습니다"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"튜토리얼 <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"설정 완료"</string>
-    <string name="allset_hint" msgid="459504134589971527">"위로 스와이프하여 홈으로 이동"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"휴대전화를 사용할 준비가 되었습니다."</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"접근성 탐색 설정"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"공유"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"스크린샷"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"이 작업은 앱 또는 조직에서 허용되지 않습니다."</string>
diff --git a/quickstep/res/values-ky/strings.xml b/quickstep/res/values-ky/strings.xml
index 0590f9c7d4..29cd4590dd 100644
--- a/quickstep/res/values-ky/strings.xml
+++ b/quickstep/res/values-ky/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Сунушталган колдонмолор функциясы иштетилди"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Сунушталган колдонмолор функциясы өчүрүлгөн"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Божомолдонгон колдонмо: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Экранды эң четинен солдон оңго карай сүрүңүз."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Экранды сол жагынан ортосуна карай сүрүп, манжаңызды алыңыз."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Экранды эң четинен оңдой солго карай сүрүңүз."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Экранды оң жагынан ортосуна карай сүрүп, манжаңызды алыңыз."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Артка кайтуу үчүн экранды солдон оңго карай сүрүүнү үйрөндүңүз."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Артка кайтуу үчүн экранды оңдон солго карай сүрүүнү үйрөндүңүз. Эми колдонмолорду которуштурганды үйрөнүп алыңыз."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"\"Артка\" жаңсоосу боюнча үйрөткүчтү бүтүрдүңүз."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Манжаңызды экрандын ылдый жагына өтө жакындатпай сүрүңүз."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"\"Артка\" жаң-нун сезгичтигин өзгөртүү үчүн Жөндөөлөргө өтүңүз"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Артка кайтуу үчүн экранды солдон оңго карай сүрүңүз"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Артка кайтуу үчүн экранды оңдон солго карай сүрүңүз"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Акыркы экранга кайтуу үчүн экранды сол жагынан ортосуна карай сүрүңүз."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Акыркы экранга кайтуу үчүн экранды оң жагынан ортосуна карай сүрүңүз. Азыр байкап көрүңүз."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Артка кайтуу үчүн сүрүңүз"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Акыркы экранга кайтуу үчүн экранды сол же оң жагынан ортосуна карай сүрүңүз."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Экранды ылдыйдан өйдө карай сүрүңүз."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Манжаңызды алганга чейин токтотпоңуз."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Экранды өйдө карай сүрүңүз."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Жаңсоолорду колдонгонду үйрөндүңүз. Жаңсоолорду өчүрүү үчүн Жөндөөлөргө өтүңүз."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"\"Колдонмолорду которуштуруу\" жаңсоосу боюнча үйрөткүчтү бүтүрдүңүз."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Колдонмолорду которуштуруу үчүн сүрүңүз"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Экранды ылдыйдан өйдө карай сүрүп, бир аз коё бербей кармап туруңуз."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Дапдаяр!"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Кийинки"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Жөндөөлөр"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Кайталап көрүңүз"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Сонун!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Үйрөткүч: <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Бүттү!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Башкы бетке өтүү үчүн экранды өйдө сүрүңүз"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Телефонуңузду колдонуп баштоого даярсыз"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Атайын мүмкүнчүлүктөр үчүн чабыттоо жөндөөлөрү"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Бөлүшүү"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Скриншот"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Бул аракетти аткарууга колдонмо же ишканаңыз тыюу салган"</string>
diff --git a/quickstep/res/values-lo/strings.xml b/quickstep/res/values-lo/strings.xml
index b6944eb230..8f9540d751 100644
--- a/quickstep/res/values-lo/strings.xml
+++ b/quickstep/res/values-lo/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ເປີດການນຳໃຊ້ການແນະນຳແອັບແລ້ວ"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ປິດການນຳໃຊ້ການແນະນຳແອັບແລ້ວ"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ແອັບທີ່ຄາດເດົາໄວ້: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ກະລຸນາກວດສອບວ່າທ່ານປັດຈາກຂອບຊ້າຍສຸດ."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ກະລຸນາກວດສອບວ່າທ່ານປັດຈາກຂອບຊ້າຍໄປຫາທາງກາງຂອງຈໍແລ້ວປ່ອຍ."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ກະລຸນາກວດສອບວ່າທ່ານປັດຈາກຂອບຂວາສຸດ."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ກະລຸນາກວດສອບວ່າທ່ານປັດຈາກຂອບຂວາໄປຫາທາງກາງຂອງຈໍແລ້ວປ່ອຍ."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"ທ່ານຮຽນຮູ້ວິທີປັດຈາກຊ້າຍເພື່ອກັບຄືນແລ້ວ."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ທ່ານຮຽນຮູ້ວິທີປັດຈາກຂວາເພື່ອກັບຄືນແລ້ວ. ຕໍ່ໄປ, ມາສຶກສາວິທີສະຫຼັບແອັບ."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ທ່ານໃຊ້ທ່າທາງກັບຄືນສຳເລັດແລ້ວ."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ກະລຸນາກວດສອບວ່າທ່ານບໍ່ໄດ້ປັດໃກ້ກັບທາງລຸ່ມຂອງໜ້າຈໍເກີນໄປ."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ເພື່ອປ່ຽນຄວາມລະອຽດອ່ອນຂອງທ່າທາງກັບຄືນ, ໃຫ້ໄປຫາການຕັ້ງຄ່າ"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"ປັດຈາກຊ້າຍເພື່ອກັບຄືນ"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"ປັດຈາກຂວາເພື່ອກັບຄືນ"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"ເພື່ອກັບຄືນໄປໜ້າຈໍຫຼ້າສຸດທີ່ທ່ານໃຊ້, ໃຫ້ປັດຈາກຂອບຊ້າຍໄປຫາກາງຈໍ."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"ທ່ານສາມາດກັບໄປຫາໜ້າຈໍຫຼ້າສຸດໄດ້ໂດຍການປັດຈາກຂອບຂວາໄປຫາກາງຈໍ. ລອງໃຊ້ມັນດຽວນີ້."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"ປັດເພື່ອກັບຄືນ"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"ເພື່ອກັບໄປໜ້າຈໍຫຼ້າສຸດ, ໃຫ້ປັດຈາກຂອບຊ້າຍ ຫຼື ຂວາໄປຫາທາງກາງຂອງໜ້າຈໍ."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ກະລຸນາກວດສອບວ່າທ່ານປັດຂຶ້ນຈາກຂອບລຸ່ມສຸດຂອງໜ້າຈໍ."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ກະລຸນາກວດສອບວ່າທ່ານບໍ່ຢຸດຊົ່ວຄາວກ່ອນປ່ອຍນິ້ວ."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ກະລຸນາກວດສອບວ່າທ່ານປັດຂຶ້ນໄປຊື່ໆ."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"ທ່ານໄດ້ສຶກສາວິທີໃຊ້ທ່າທາງແລ້ວ. ເພື່ອປິດທ່າທາງຕ່າງໆ, ໃຫ້ເຂົ້າໄປຫາການຕັ້ງຄ່າ."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"ທ່ານໃຊ້ທ່າທາງສະຫຼັບແອັບສຳເລັດແລ້ວ."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ປັດເພື່ອສະຫຼັບແອັບ"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ປັດຂຶ້ນຈາກລຸ່ມສຸດຂອງໜ້າຈໍທ່ານ, ຈາກນັ້ນປ່ອຍ."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"ທຸກຢ່າງພ້ອມແລ້ວ"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"ຕໍ່ໄປ"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ການຕັ້ງຄ່າ"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ລອງໃໝ່"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ດີ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ການສອນການນຳໃຊ້ທີ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"ຮຽບຮ້ອຍໝົດແລ້ວ!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"ປັດຂຶ້ນເພື່ອໄປຫາໜ້າຫຼັກ"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"ທ່ານພ້ອມເລີ່ມຕົ້ນໃຊ້ໂທລະສັບຂອງທ່ານແລ້ວ"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"ການຕັ້ງຄ່າການນຳທາງສຳລັບການຊ່ວຍເຂົ້າເຖິງ"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"ແບ່ງປັນ"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ຮູບໜ້າຈໍ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ແອັບ ຫຼື ອົງການຂອງທ່ານບໍ່ອະນຸຍາດໃຫ້ໃຊ້ຄຳສັ່ງນີ້"</string>
diff --git a/quickstep/res/values-lt/strings.xml b/quickstep/res/values-lt/strings.xml
index d1c08f9a9e..775cf6207c 100644
--- a/quickstep/res/values-lt/strings.xml
+++ b/quickstep/res/values-lt/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Siūlomų programų funkcija įgalinta"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Siūlomų programų funkcija išjungta"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Numatoma programa: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Turite perbraukti nuo kairiojo krašto."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Turite perbraukti nuo kairiojo krašto link ekrano vidurio ir pakelti pirštą."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Turite perbraukti nuo dešiniojo krašto."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Turite perbraukti nuo dešiniojo krašto link ekrano vidurio ir pakelti pirštą."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Išmokote, kaip sugrįžti perbraukiant iš kairės."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Išmokote, kaip sugrįžti perbraukiant iš dešinės. Toliau sužinosite, kaip perjungti programas."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Atlikote grįžimo atgal gestą."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nebraukite per arti ekrano apačios."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Norėd. pak. grįžimo gesto jautr., eikite į sk. „Nustatymai“"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Perbraukite iš kairės, kad grįžtumėte"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Perbraukite iš dešinės, kad grįžtumėte"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Norėdami grįžti į ankstesnį ekraną, kuriame lankėtės, perbraukite nuo kairiojo krašto link ekrano vidurio."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Į ankst. ekr. taip pat galite grįžti, perbraukdami nuo dešiniojo kr. link ekr. vidurio. Išb. dabar."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Norėdami grįžti, perbraukite"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Norėdami grįžti į ankstesnį ekraną, perbr. nuo kairiojo arba dešinio krašto link ekrano vidurio."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Turite perbraukti aukštyn nuo apatinio ekrano krašto."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Nepristabdykite prieš pakeldami pirštą."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Turite tiesiai perbraukti aukštyn."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"išmokote naudotis gestais. Gestus galite išjungti nustatymuose."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Atlikote programų perjungimo gestą."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Perbraukite, kad perjungtumėte programas"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Perbraukite aukštyn nuo ekrano apačios, palaikykite ir paleiskite."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Viskas nustatyta"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Kitas"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Nustatymai"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Bandykite dar kartą"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Šaunu!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Mokymo programa: <xliff:g id="CURRENT">%1$d</xliff:g> iš <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Paruošta!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Perbraukite aukštyn, kad grįžtumėte į pagrindinį ekraną"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Esate pasiruošę pradėti naudoti telefoną"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Pritaikomumo naršymo nustatymai"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Bendrinti"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Ekrano kopija"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Jūsų organizacijoje arba naudojant šią programą neleidžiama atlikti šio veiksmo"</string>
diff --git a/quickstep/res/values-lv/strings.xml b/quickstep/res/values-lv/strings.xml
index e825a4e77a..45fa4e76eb 100644
--- a/quickstep/res/values-lv/strings.xml
+++ b/quickstep/res/values-lv/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Ieteicamās lietotnes ir iespējotas"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Ieteicamās lietotnes ir atspējotas"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Prognozētā lietotne: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Jāvelk no pašas kreisās malas."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Jāvelk no ekrāna kreisās malas uz vidu un jāatlaiž."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Jāvelk no pašas labās malas."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Jāvelk no ekrāna labās malas uz vidu un jāatlaiž."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Jūs esat apguvis, kā vilkt no kreisās malas, lai pārietu atpakaļ."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Jūs esat apguvis, kā vilkt no labās malas, lai pārietu atpakaļ. Tagad mācieties pārslēgt lietotnes."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Jūs sekmīgi veicāt atgriešanās žestu."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nevelciet pārāk tuvu ekrāna apakšdaļai."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Atgriešanās žesta jutīguma līmeni varat mainīt iestatījumos."</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Lai pārietu atpakaļ, velciet no kreisās malas."</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Lai atgrieztos, velciet no labās malas"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Lai pārietu atpakaļ uz pēdējo izmantoto ekrānu, velciet no kreisās malas uz ekrāna vidu."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Varat arī pāriet atpakaļ uz pēdējo ekrānu, velkot no labās malas uz ekrāna vidu. Izmēģiniet tūlīt!"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Vilkšana, lai atgrieztos"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Lai atgrieztos iepriekšējā ekrānā, velciet no kreisās vai labās malas uz ekrāna vidu."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Jāvelk augšup no ekrāna apakšmalas."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pirms atlaišanas nepārtrauciet kustību."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Jāvelk tieši uz augšu."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Jūs esat apguvis žestu izmantošanu. Lai izslēgtu žestus, pārejiet uz sadaļu Iestatījumi."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Jūs sekmīgi veicāt lietotņu pārslēgšanas žestu."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Vilkšana, lai pārslēgtu lietotnes"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Velciet augšup no ekrāna apakšdaļas, turiet un pēc tam atlaidiet."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Gatavs"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Tālāk"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Iestatījumi"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Mēģināt vēlreiz"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Lieliski!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"<xliff:g id="CURRENT">%1$d</xliff:g>. mācību darbība no <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Gatavs!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Velciet augšup, lai pārietu uz sākuma ekrānu"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Varat sākt izmantot savu tālruni"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Navigācijas iestatījumi pieejamībai"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Kopīgot"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Veikt ekrānuzņēmumu"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Lietotne vai jūsu organizācija neatļauj veikt šo darbību."</string>
diff --git a/quickstep/res/values-mk/strings.xml b/quickstep/res/values-mk/strings.xml
index 0b4e87f96f..b20107af58 100644
--- a/quickstep/res/values-mk/strings.xml
+++ b/quickstep/res/values-mk/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Предлозите за апликации се овозможени"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Предлозите за апликации се оневозможени"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Предвидена апликација: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Влечете од левиот раб."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Повлечете од левиот раб кон средината на екранот и пуштете."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Влечете од десниот раб."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Повлечете од десниот раб кон средината на екранот и пуштете."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Научивте како да повлекувате одлево за да одите назад."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Научивте како да повлекувате оддесно за да одите назад. Следно, дознајте како да се префрлате помеѓу апликации."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Завршивте со упатството за враќање назад."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Не повлекувајте преблиску до долниот раб на екранот."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"За да ја промените чувствителноста, одете во „Поставки“"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Повлечете одлево за да се вратите назад"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Повлечете оддесно за да се вратите назад"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"За да се вратите на последниот екран на кој бевте, повлечете од левиот раб кон средината на екранот."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Може да се вратите на последниот екран и со повлекување од десниот раб кон средината. Пробајте."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Повлечете за да се вратите назад"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"За да се вратите на последниот екран, повлечете од левиот или десниот раб кон средината на екранот."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Повлечете нагоре од долниот раб на екранот."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Не правете пауза пред да пуштите."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Повлечете право нагоре."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Дознавте како се користат движењата. За да ги исклучите движењата, одете во „Поставки“."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Завршивте со упатството за префрлање помеѓу апликации."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Повлечете за префрлање помеѓу апликации"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Повлечете нагоре од дното на екранот и задржете, па пуштете."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Готово"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Следно"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Поставки"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Обиди се пак"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Одлично!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Упатство <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Готово!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Повлечете нагоре за да појдете на почетен екран"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Спремни сте да почнете да го користите телефонот"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Поставки за навигација за пристапност"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Сподели"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Слика од екранот"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Апликацијата или вашата организација не го дозволува дејствово"</string>
diff --git a/quickstep/res/values-ml/strings.xml b/quickstep/res/values-ml/strings.xml
index faa5dddc25..de875c9140 100644
--- a/quickstep/res/values-ml/strings.xml
+++ b/quickstep/res/values-ml/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ആപ്പ് നിർദ്ദേശങ്ങൾ പ്രവർത്തനക്ഷമമാക്കി"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ആപ്പ് നിർദ്ദേശങ്ങൾ പ്രവർത്തനരഹിതമാക്കി"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"പ്രവചിച്ച ആപ്പ്: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ഇടത്തേയറ്റത്തെ അരികിൽ നിന്ന് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പാക്കുക."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ഇടത്തേ അരികിൽ നിന്ന് സ്‌ക്രീനിന്റെ മധ്യഭാഗത്തേക്ക് സ്വെെപ്പ് ചെയ്‌ത് വിടുക."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"വലത്തേയറ്റത്തെ അരികിൽ നിന്ന് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പാക്കുക."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"വലത്തേ അരികിൽ നിന്ന് സ്‌ക്രീനിന്റെ മധ്യഭാഗത്തേക്ക് സ്വെെപ്പ് ചെയ്‌ത് വിടുക."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"മടങ്ങാൻ ഇടതുഭാഗത്ത് നിന്ന് സ്വൈപ്പ് ചെയ്യുന്ന രീതി നിങ്ങൾക്ക് മനസ്സിലായി."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"മടങ്ങാൻ വലതുഭാഗത്ത് നിന്ന് സ്വൈപ്പ് ചെയ്യുന്ന രീതി മനസ്സിലായി. ഇനി, ആപ്പുകൾ മാറുന്ന രീതി അറിയുക."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"മടങ്ങുക ജെസ്ച്ചർ നിങ്ങൾ പൂർത്തിയാക്കി."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"സ്‌ക്രീനിന്റെ ഏറ്റവും അടിഭാഗത്തേക്ക് സ്വെെപ്പ് ചെയ്യുന്നില്ലെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ബാക്ക്ജെസ്റ്ററിന്റെ സെൻസിറ്റിവിറ്റി മാറ്റാൻ ക്രമീകരണത്തിൽ പോകൂ"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"മടങ്ങാൻ ഇടതുഭാഗത്ത് നിന്ന് സ്വൈപ്പ് ചെയ്യുക"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"മടങ്ങാൻ വലതുഭാഗത്ത് നിന്ന് സ്വൈപ്പ് ചെയ്യുക"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"നിങ്ങളുടെ മുമ്പത്തെ സ്ക്രീനിലേക്ക് മടങ്ങാൻ, സ്ക്രീനിന്റെ ഇടത്തേ അരികിൽ നിന്ന് നടുവിലേക്ക് സ്വൈപ്പ് ചെയ്യുക."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"സ്ക്രീനിന്റെ വലത്തേ അരികിൽ നിന്ന് നടുവിലേക്ക് സ്വൈപ്പ് ചെയ്തും മുൻ സ്ക്രീനിലെത്താം. ശ്രമിച്ചുനോക്കൂ."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"മടങ്ങാൻ സ്വെെപ്പ് ചെയ്യുക"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"മുൻ സ്‌ക്രീനിലേക്ക് മടങ്ങാൻ, ഇടതോ വലതോ അരികിൽ നിന്ന് സ്‌ക്രീനിന്റെ നടുവിലേക്ക് സ്വെെപ്പ് ചെയ്യുക."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"സ്‌ക്രീനിന്റെ താഴത്തെ അരികിൽ നിന്ന് മുകളിലേക്ക് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"വിടുന്നതിന് മുമ്പ് നിങ്ങൾ താൽക്കാലികമായി നിർത്തുന്നില്ലെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"നേരെ മുകളിലേക്ക് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പിക്കുക."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"ജെസ്ച്ചറുകൾ ഉപയോഗിക്കുന്ന രീതി നിങ്ങൾ മനസ്സിലാക്കി. ജെസ്ച്ചറുകൾ ഓഫാക്കാൻ ക്രമീകരണത്തിലേക്ക് പോകുക."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"ആപ്പുകൾ തമ്മിൽ മാറുക ജെസ്‌ച്ചർ നിങ്ങൾ പൂർത്തിയാക്കി."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ആപ്പുകൾ മാറാൻ സ്വെെപ്പ് ചെയ്യുക"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"സ്‌ക്രീനിന്റെ താഴെ നിന്ന് മുകളിലേക്ക് സ്വൈപ്പ് ചെയ്‌ത് പിടിച്ച ശേഷം വിടുക."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"എല്ലാം സജ്ജീകരിച്ചു"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"അടുത്തത്"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ക്രമീകരണം"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"വീണ്ടും ശ്രമിക്കുക"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"കൊള്ളാം!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ട്യൂട്ടോറിയൽ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"എല്ലാം സജ്ജീകരിച്ചു!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"ഹോമിലേക്ക് പോകാൻ മുകളിലേക്ക് സ്വൈപ്പ് ചെയ്യുക"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"ഫോൺ ഉപയോഗിച്ച് തുടങ്ങാൻ നിങ്ങൾ തയ്യാറാണ്"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"ഉപയോഗസഹായിക്കുള്ള നാവിഗേഷൻ ക്രമീകരണം"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"പങ്കിടുക"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"സ്ക്രീൻഷോട്ട്"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ഈ നടപടി എടുക്കുന്നത് ആപ്പോ നിങ്ങളുടെ സ്ഥാപനമോ അനുവദിക്കുന്നില്ല"</string>
diff --git a/quickstep/res/values-mn/strings.xml b/quickstep/res/values-mn/strings.xml
index 1ef7299f70..dc00a1c661 100644
--- a/quickstep/res/values-mn/strings.xml
+++ b/quickstep/res/values-mn/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Санал болгож буй аппуудыг идэвхжүүлсэн"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Санал болгож буй аппуудыг идэвхгүй болгосон"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Таамаглаж буй апп: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Та зүүн захын булангаас шударна уу."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Та дэлгэцийн зүүн булангаас дунд хэсэг хүртэл шударч, суллаарай."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Та баруун захын булангаас шударна уу."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Та дэлгэцийн баруун булангаас дунд хэсэг хүртэл шударч, суллаарай."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Та буцахын тулд зүүнээс хэрхэн шудрахыг мэдэж авлаа."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Та буцахын тулд баруунаас хэрхэн шудрахыг мэдэж авлаа Дараа нь аппыг хэрхэн сэлгэхийг мэдэж аваарай."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Та буцах зангааг гүйцэтгэлээ."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Та дэлгэцийн доод хэсэгтэй хэт ойр бүү шудраарай."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Буцах зангааны мэдрэгшлийг өөрчлөх бол Тохиргоо руу очно уу"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Буцахын тулд зүүн талаас шударна уу"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Буцахын тулд баруун талаас шударна уу"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Та байсан сүүлийн дэлгэц рүүгээ буцахын тулд дэлгэцийн зүүн булангаас дунд хэсэг рүү шударна уу."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Та мөн дэлгэцийн баруунаас дунд хэсэг рүү шударснаар сүүлийн дэлгэц рүү буцаж болно. Одоо туршина уу"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Буцахын тулд шудрах"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Сүүлийн дэлгэц рүү буцахын тулд дэлгэцийн зүүн эсвэл баруун булангаас дунд хэсэг рүү шударна уу."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Та дэлгэцийн доод булангаас дээш шударна уу."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Та суллахаасаа өмнө түр зогсоож болохгүй."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Та чигээрээ шударна уу."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Та зангааг хэрхэн ашиглахыг мэдэж авлаа. Зангааг унтраахын тулд Тохиргоо руу очно уу."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Та аппуудыг сэлгэх зангааг гүйцэтгэлээ."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Аппуудыг сэлгэхийн тулд шудрах"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Дэлгэцийнхээ доод хэсгээс дээш шударч, удаан дараад суллана уу."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Бүгдийг тохируулсан"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Дараах"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Тохиргоо"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Дахин оролдох"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Янзтай!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"<xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g> практик хичээл"</string>
     <string name="allset_title" msgid="5021126669778966707">"Тохируулж дууслаа!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Нүүр хуудас руу очихын тулд дээш шударна уу"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Та утсаа ашиглаж эхлэхэд бэлэн боллоо"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Хандалтын навигацын тохиргоо"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Хуваалцах"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Дэлгэцийн агшин дарах"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Энэ үйлдлийг апп эсвэл танай байгууллага зөвшөөрдөггүй"</string>
diff --git a/quickstep/res/values-mr/strings.xml b/quickstep/res/values-mr/strings.xml
index d5bcc8a84a..99d6ebccec 100644
--- a/quickstep/res/values-mr/strings.xml
+++ b/quickstep/res/values-mr/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"अ‍ॅप सूचना सुरू केल्या आहेत"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"अ‍ॅप सूचना बंद केल्या आहेत"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"पूर्वानुमान केलेले अ‍ॅप: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"तुम्ही स्क्रीनच्या अगदी डाव्या कडेपासून स्‍वाइप करत आहात याची खात्री करा."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"तुम्ही स्क्रीनच्या डाव्या कडेपासून मध्यावर स्‍वाइप करून बोट उचलत आहात याची खात्री करा."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"तुम्ही स्क्रीनच्या अगदी उजव्या कडेपासून स्‍वाइप करत आहात याची खात्री करा."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"तुम्ही स्क्रीनच्या उजव्या कडेपासून मध्यावर स्‍वाइप करून बोट उचलत आहात याची खात्री करा."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"तुम्ही मागे जाण्यासाठी डावीकडून कसे स्‍वाइप करायचे ते जाणून घेतले."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"मागे जाण्यासाठी उजवीकडून कसे स्‍वाइप करावे ते शिकलात. आता पुढे, ॲप्स कशी स्विच करायची ते जाणून घ्या."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"तुम्ही गो बॅक जेश्चर पूर्ण केले."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"तुम्ही स्क्रीनच्या तळाच्या अगदी जवळून स्‍वाइप करत नाही याची खात्री करा."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"बॅक जेश्चरची संवेदनशीलता बदलण्यासाठी, सेटिंग्ज वर जा"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"मागे जाण्यासाठी डावीकडून स्वाइप करा"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"मागे जाण्यासाठी उजवीकडून स्वाइप करा"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"तुम्ही होतात त्या मागील स्क्रीनवर परत जाण्यासाठी, स्क्रीनच्या डाव्या कडेपासून मध्याभागी स्वाइप करा."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"स्क्रीनच्या उजव्या कडेपासून मध्याभागी स्वाइप करून मागील स्क्रीनवर परतदेखील जाऊ शकता. आता करून पहा."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"परत जाण्यासाठी स्वाइप करा"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"मागील स्क्रीनवर परत जाण्यासाठी, स्क्रीनच्या डाव्या किंवा उजव्या कडेपासून मध्यावर स्‍वाइप करा."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"तुम्ही स्क्रीनच्या तळाच्या कडेपासून वर स्वाइप करत आहात याची खात्री करा."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"तुम्ही स्क्रीनवरून बोट उचलण्यापूर्वी ते थांबवत नाही याची खात्री करा."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"तुम्ही सरळ वर स्वाइप करत आहात याची खात्री करा."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"तुम्ही जेश्चर कसे वापरायचे हे शिकलात. जेश्चर बंद करण्यासाठी, सेटिंग्ज वर जा."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"तुम्ही ॲप्स स्विच करण्याचे जेश्चर पूर्ण केले."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"अ‍ॅप्स स्विच करण्यासाठी स्वाइप करा"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"तुमच्या स्क्रीनच्या तळाकडून वर स्वाइप करा, धरून ठेवा, त्यानंतर बोट उचला."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"सर्व तयार आहे"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"पुढील"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"सेटिंग्ज"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"पुन्हा प्रयत्न करा"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"छान!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ट्युटोरियल <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"सर्व तयार आहे!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"होमवर जाण्यासाठी वरती स्वाइप करा"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"तुम्ही तुमचा फोन वापरण्यास सुरुवात करू शकता"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"अ‍ॅक्सेसिबिलिटीसाठी नेव्हिगेशन सेटिंग्ज"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"शेअर करा"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"स्क्रीनशॉट"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"अ‍ॅप किंवा तुमच्या संस्थेद्वारे ही क्रिया करण्याची अनुमती नाही"</string>
diff --git a/quickstep/res/values-ms/strings.xml b/quickstep/res/values-ms/strings.xml
index aa81471e35..ef9d7e7b85 100644
--- a/quickstep/res/values-ms/strings.xml
+++ b/quickstep/res/values-ms/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Cadangan apl didayakan"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Cadangan apl dilumpuhkan"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Apl yang diramalkan: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pastikan anda meleret dari hujung sebelah kiri."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pastikan anda meleret dari tepi sebelah kiri ke tengah skrin dan lepaskan."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pastikan anda meleret dari hujung sebelah kanan."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pastikan anda meleret dari tepi sebelah kanan ke tengah skrin dan lepaskan."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Anda belajar cara meleret dari kiri untuk kembali."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Anda belajar cara meleret dari kanan untuk kembali. Seterusnya, ketahui cara menukar apl."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Anda telah melengkapkan gerak isyarat undur."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pastikan anda tidak meleret terlalu dekat dengan bahagian bawah skrin."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Utk mengubah kepekaan gerak isyarat undur, pergi ke Tetapan"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Leret dari kiri untuk kembali"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Leret dari kanan untuk kembali"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Untuk kembali ke skrin terakhir yang anda berada, leret dari tepi sebelah kiri ke tengah skrin."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Anda juga boleh kembali ke skrin terakhir dengan meleret dari tepi sebelah kanan ke tengah skrin. Cubalah sekarang."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Leret untuk kembali"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Untuk kembali ke skrin terakhir, leret dari tepi sebelah kiri atau kanan ke tengah skrin."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pastikan anda meleret ke atas dari tepi sebelah bawah skrin."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pastikan anda tidak menjeda sebelum melepaskan gerak isyarat tersebut."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pastikan anda meleret terus ke atas."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Anda mempelajari cara menggunakan gerak isyarat. Untuk mematikan gerak isyarat, pergi ke Tetapan."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Anda telah melengkapkan gerak isyarat menukar apl."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Leret untuk menukar apl"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Leret ke atas dari bahagian bawah skrin anda, tahan, kemudian lepaskan."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Selesai"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Seterusnya"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Tetapan"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Cuba lagi"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bagus!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Siap!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Leret ke atas untuk mencapai laman utama"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Anda sudah sedia untuk mula menggunakan telefon anda"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Tetapan navigasi untuk kebolehaksesan"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Kongsi"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Tangkapan skrin"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Tindakan ini tidak dibenarkan oleh apl atau organisasi anda"</string>
diff --git a/quickstep/res/values-my/strings.xml b/quickstep/res/values-my/strings.xml
index 92eb25be8b..2e6d49c65b 100644
--- a/quickstep/res/values-my/strings.xml
+++ b/quickstep/res/values-my/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"အက်ပ်အကြံပြုချက်များ ဖွင့်ထားသည်"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"အက်ပ်အကြံပြုချက်များကို ပိတ်ထားသည်"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ကြိုတင်မှန်းဆထားသော အက်ပ်− <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ဘယ်ဘက်အစွန် ခပ်လှမ်းလှမ်းမှ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ဘယ်ဘက်အစွန်မှ ဖန်သားပြင်အလယ်သို့ ပွတ်ဆွဲပြီး လွှတ်လိုက်ကြောင်း သေချာပါစေ။"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ညာဘက်အစွန် ခပ်လှမ်းလှမ်းမှ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ညာဘက်အစွန်မှ ဖန်သားပြင်အလယ်သို့ ပွတ်ဆွဲပြီး လွှတ်လိုက်ကြောင်း သေချာပါစေ။"</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"နောက်ပြန်သွားရန် ဘယ်ဘက်မှပွတ်ဆွဲနည်းကို သိသွားပါပြီ။"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"နောက်ပြန်သွားရန် ညာဘက်မှပွတ်ဆွဲနည်းကို သိသွားပါပြီ။ နောက်အဆင့်တွင် အက်ပ်များပြောင်းနည်းကို လေ့လာပါ။"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"နောက်ဆုတ်လက်ဟန် ရှင်းလင်းပို့ချချက် ပြီးပါပြီ။"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ဖန်သားပြင် အောက်ခြေနှင့် အလွန်နီးကပ်စွာ ပွတ်ဆွဲခြင်းမရှိကြောင်း သေချာပါစေ။"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"နောက်ဆုတ်လက်ဟန်၏ အာရုံခံစွမ်းကိုပြောင်းရန် ‘ဆက်တင်များ’ သို့ သွားပါ"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"နောက်သို့ပြန်သွားရန် ဘယ်ဘက်မှ ပွတ်ဆွဲပါ"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"နောက်သို့ပြန်သွားရန် ညာဘက်မှ ပွတ်ဆွဲပါ"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"သင်ရှိခဲ့သည့် ပြီးခဲ့သောဖန်သားပြင်သို့ ပြန်သွားရန် ဖန်သားပြင်၏ဘယ်အစွန်းမှ အလယ်သို့ပွတ်ဆွဲပါ။"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"ဖန်သားပြင်၏ညာအစွန်းမှ အလယ်သို့ပွတ်ဆွဲ၍ ပြီးခဲ့သောဖန်သားပြင်သို့လည်း ပြန်သွားနိုင်သည်။ ယခုပဲ စမ်းကြည့်လိုက်ပါ။"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"နောက်ပြန်သွားရန် ပွတ်ဆွဲပါ"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"နောက်ဆုံးဖန်သားပြင်သို့ ပြန်သွားရန် ဘယ်ဘက် (သို့) ညာဘက်အစွန်မှ ဖန်သားပြင်အလယ်သို့ ပွတ်ဆွဲပါ။"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ဖန်သားပြင် အောက်ခြေအစွန်မှ အပေါ်သို့ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"လက်မလွှတ်ခင် ခဏရပ်ခြင်းမရှိကြောင်း သေချာပါစေ။"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"အပေါ်တည့်တည့်သို့ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"လက်ဟန်များသုံးနည်းကို သင်သိသွားပါပြီ။ လက်ဟန်များကို ပိတ်ရန် ‘ဆက်တင်များ’ သို့ သွားပါ။"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"အက်ပ်များပြောင်းသည့် လက်ဟန် ရှင်းလင်းပို့ချချက် ပြီးပါပြီ။"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"အက်ပ်များပြောင်းရန် ပွတ်ဆွဲပါ"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"သင့်ဖန်သားပြင် အောက်ခြေမှ အပေါ်သို့ ပွတ်ဆွဲပါ၊ ဖိထားပြီးနောက် လွှတ်လိုက်ပါ။"</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"အားလုံးအဆင်သင့်ဖြစ်ပါပြီ"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"ရှေ့သို့"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ဆက်တင်များ"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ထပ်စမ်းကြည့်ရန်"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ကောင်းသည်။"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ရှင်းလင်းပို့ချချက် <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"အားလုံး အဆင်သင့်ပါ။"</string>
-    <string name="allset_hint" msgid="459504134589971527">"ပင်မစာမျက်နှာသို့သွားရန် အပေါ်သို့ ပွတ်ဆွဲပါ"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"သင့်ဖုန်းကို စတင်အသုံးပြုရန် အသင့်ဖြစ်ပါပြီ"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"အများသုံးစွဲနိုင်မှုအတွက် လမ်းညွှန်ဆက်တင်များ"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"မျှဝေရန်"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ဖန်သားပြင်ဓာတ်ပုံ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ဤလုပ်ဆောင်ချက်ကို အက်ပ် သို့မဟုတ် သင်၏အဖွဲ့အစည်းက ခွင့်မပြုပါ"</string>
diff --git a/quickstep/res/values-nb/strings.xml b/quickstep/res/values-nb/strings.xml
index fd85ab1b46..6d43faee7a 100644
--- a/quickstep/res/values-nb/strings.xml
+++ b/quickstep/res/values-nb/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Appforslag er på"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Appforslag er slått av"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Foreslått app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Sørg for at du sveiper fra kanten helt til venstre."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Sørg for at du sveiper fra den venstre kanten til midten av skjermen og slipper."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Sørg for at du sveiper fra kanten helt til høyre."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Sørg for at du sveiper fra den høyre kanten til midten av skjermen og slipper."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Du har lært hvordan du sveiper fra venstre for å gå tilbake."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Du har lært hvordan du sveiper fra høyre for å gå tilbake. I neste trinn lærer du å bytte app."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Du har fullført bevegelsen for å gå tilbake."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Sørg for at du ikke sveiper for nær bunnen av skjermen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Gå til Innstillinger for å endre tilbakebevegelsefølsomheten"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Sveip fra venstre for å gå tilbake"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Sveip fra høyre for å gå tilbake"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"For å gå tilbake til den forrige skjermen du var på, sveip fra venstre kant til midten av skjermen."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Du kan også gå tilbake til forrige skjerm ved å sveipe fra høyre kant til midten. Prøv nå."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Sveip for å gå tilbake"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"For å gå tilbake til forrige skjerm, sveip fra venstre eller høyre kant til midten av skjermen."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Sørg for at du sveiper opp fra den nederste kanten av skjermen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Sørg for at du ikke setter på pause før du slipper."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Sørg for at du sveiper rett opp."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Du har lært hvordan du bruker bevegelser. For å slå av bevegelser, gå til Innstillinger."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Du har fullført bevegelsen for å bytte app."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Sveip for å bytte app"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Sveip opp fra bunnen av skjermen, hold og slipp."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Ferdig"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Neste"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Innstillinger"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Prøv igjen"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bra!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Veiledning <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Alt er klart!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Sveip opp for å gå til startskjermen"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Du er klar til å begynne å bruke telefonen"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Navigasjonsinnstillinger for tilgjengelighet"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Del"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Skjermdump"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Appen eller organisasjonen din tillater ikke denne handlingen"</string>
diff --git a/quickstep/res/values-ne/strings.xml b/quickstep/res/values-ne/strings.xml
index dea056b557..2b2e745bee 100644
--- a/quickstep/res/values-ne/strings.xml
+++ b/quickstep/res/values-ne/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"सिफारिस गरिएका एपहरू देखाउने सुविधा सक्षम पारिएका छन्"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"सिफारिस गरिएका एपहरू देखाउने सुविधा असक्षम पारिएको छ"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"पूर्वानुमान गरिएको एप: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"स्क्रिनको सबैभन्दा बायाँ किनाराबाट स्वाइप गर्नुहोस्।"</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"स्क्रिनको बायाँ किनाराबाट मध्य भागसम्म स्वाइप गर्नुहोस् अनि औँला उठाउनुहोस्।"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"स्क्रिनको सबैभन्दा दायाँ किनाराबाट स्वाइप गर्नुहोस्।"</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"स्क्रिनको दायाँ किनाराबाट मध्य भागसम्म स्वाइप गर्नुहोस् अनि औँला उठाउनुहोस्।"</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"तपाईंले स्क्रिनको बायाँ किनाराबाट स्वाइप गरेर अघिल्लो स्क्रिनमा फर्कने तरिका सिक्नुभयो।"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"तपाईंले स्क्रिनको दायाँ किनाराबाट स्वाइप गरेर अघिल्लो स्क्रिनमा फर्कने तरिका सिक्नुभयो। अब एउटा एपबाट अर्को एपमा जाने तरिका सिक्नुहोस्।"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"तपाईंले \'पछाडि जानुहोस्\' नामक इसारा प्रयोग गर्ने तरिका सिक्नुभयो।"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"स्क्रिनको फेदको धेरै नजिकसम्म स्वाइप नगर्नुहोस्।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"\'पछाडि\' नामक इसाराको संवेदनशीलता बदल्न सेटिङमा जानुहोस्"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"पछाडि जान बायाँ किनाराबाट स्वाइप गर्नुहोस्"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"पछाडि जान दायाँतिरबाट स्वाइप गर्नुहोस्"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"यसअघिको स्क्रिनमा फर्कन स्क्रिनको बायाँ किनाराबाट मध्य भागसम्म स्वाइप गर्नुहोस्।"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"तपाईं स्क्रिनको दायाँ किनाराबाट मध्य भागसम्म स्वाइप गरेर पनि यसअघिको स्क्रिनमा फर्कन सक्नुहुन्छ। अहिले नै यसो गरी हेर्नुहोस्।"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"पछाडि जान स्वाइप गर्नुहोस्"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"यसअघिको स्क्रिनमा फर्कन स्क्रिनको बायाँ वा दायाँ किनाराबाट मध्य भागसम्म स्वाइप गर्नुहोस्।"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"स्क्रिनको फेदबाट माथितिर स्वाइप गर्नुहोस्।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"औँला उठाउनुअघि नरोकिनुहोस्।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"सीधै माथितिर स्वाइप गर्नुहोस्।"</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"तपाईंले इसाराहरू प्रयोग गर्ने तरिका सिक्नुभयो। इसारा अफ गर्न सेटिङमा जानुहोस्।"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"तपाईंले \'एउटा एपबाट अर्को एपमा जानुहोस्\' नामक इसारा प्रयोग गर्ने तरिका सिक्नुभयो।"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"एउटा एपबाट अर्को एपमा जान स्वाइप गर्नुहोस्"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"स्क्रिनको फेदबाट माथितिर स्वाइप गर्नुहोस्, छोइराख्नुहोस् अनि औँला उठाउनुहोस्।"</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"सबै तयार छ"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"अर्को"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"सेटिङ"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"फेरि प्रयास गर्नुहोस्"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"राम्रो!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ट्युटोरियल <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"सबै तयार भयो!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"होममा जान माथितिर स्वाइप गर्नुहोस्"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"तपाईं आफ्नो फोन चलाउन थाल्न सक्नुहुन्छ"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"सर्वसुलभताका लागि नेभिगेसनसम्बन्धी सेटिङ"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"सेयर गर्नुहोस्"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"स्क्रिनसट"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"यो एप वा तपाईंको सङ्गठनले यो कारबाही गर्ने अनुमति दिँदैन"</string>
diff --git a/quickstep/res/values-nl/strings.xml b/quickstep/res/values-nl/strings.xml
index d97c82b645..2a79753dd3 100644
--- a/quickstep/res/values-nl/strings.xml
+++ b/quickstep/res/values-nl/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"App-suggesties zijn ingeschakeld"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"App-suggesties zijn uitgeschakeld"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Voorspelde app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Swipe helemaal vanaf de linkerrand."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Swipe vanaf de linkerrand naar het midden van het scherm en laat los."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Swipe helemaal vanaf de rechterrand."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Swipe vanaf de rechterrand naar het midden van het scherm en laat los."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Je weet nu hoe je vanaf links kunt swipen om terug te gaan."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Je weet nu hoe je vanaf rechts kunt swipen om terug te gaan. Ontdek nu hoe je tussen apps schakelt."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Je weet nu hoe je het gebaar Terug maakt."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Swipe niet te dicht bij de onderkant van het scherm."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Open Instellingen om de gevoeligheid van Terug te wijzigen"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Swipe vanaf de linkerkant om terug te gaan"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Swipe vanaf de rechterkant om terug te gaan"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Swipe vanaf de linkerkant naar het midden van het scherm om terug te gaan naar het vorige scherm."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Je kunt ook teruggaan naar het laatste scherm door vanaf de rechterkant naar het midden van het scherm te swipen. Probeer het nu."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Swipe om terug te gaan"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Swipe vanaf de linker- of rechterrand naar het midden om terug te gaan naar het vorige scherm."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Swipe vanaf de onderrand van het scherm omhoog."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pauzeer niet voordat je loslaat."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Swipe recht omhoog."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Je weet nu hoe je gebaren gebruikt. Als je gebaren wilt uitzetten, kun je dat via Instellingen doen."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Je weet nu hoe je het gebaar Schakelen tussen apps maakt."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe om tussen apps te schakelen"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swipe omhoog vanaf de onderkant van het scherm, houd vast en laat dan los."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Klaar"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Volgende"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Instellingen"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Opnieuw"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Dat gaat lekker."</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Klaar"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Swipe omhoog om naar het startscherm te gaan"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Je bent klaar om je telefoon te gebruiken"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Navigatie-instellingen voor toegankelijkheid"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Delen"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Deze actie wordt niet toegestaan door de app of je organisatie"</string>
diff --git a/quickstep/res/values-or/strings.xml b/quickstep/res/values-or/strings.xml
index e2517dda6f..187f9d8a3d 100644
--- a/quickstep/res/values-or/strings.xml
+++ b/quickstep/res/values-or/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ଆପ୍ ପରାମର୍ଶଗୁଡ଼ିକୁ ସକ୍ଷମ କରାଯାଇଛି"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ଆପ୍ ପରାମର୍ଶଗୁଡ଼ିକୁ ଅକ୍ଷମ କରାଯାଇଛି"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ପୂର୍ବାନୁମାନ କରାଯାଇଥିବା ଆପ୍: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ଆପଣ ଦୂର-ବାମ ଧାରରୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ଆପଣ ସ୍କ୍ରିନର ବାମ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରି ଛାଡ଼ି ଦେଉଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ଆପଣ ଦୂର-ଡାହାଣ ଧାରରୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ଆପଣ ସ୍କ୍ରିନର ଡାହାଣ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରି ଛାଡ଼ି ଦେଉଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"ପଛକୁ ଫେରିବା ପାଇଁ ବାମ ପାର୍ଶ୍ଵରୁ କିପରି ସ୍ୱାଇପ୍ କରିବାକୁ ହେବ ତାହା ଆପଣ ଜାଣିଲେ।"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ଆପଣ ଡାହାଣ ଧାରରୁ ସ୍ୱାଇପ୍ କରି ପଛକୁ ଫେରିବା ଜାଣିଲେ। ତା\'ପରେ, ଆପଗୁଡ଼ିକୁ କିପରି ସ୍ୱିଚ୍ କରିବେ ତାହା ଜାଣନ୍ତୁ।"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ଆପଣ \'ପଛକୁ ଫେରନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି।"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ଆପଣ ସ୍କ୍ରିନର ତଳଭାଗର ଅତି ନିକଟରୁ ସ୍ୱାଇପ୍ କରୁନଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ପଛକୁ ଫେରିବା ଜେଶ୍ଚରର ସମ୍ବେଦନଶୀଳତା ବଦଳାଇବାକୁ ସେଟିଂସକୁ ଯାଆନ୍ତୁ"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"ପଛକୁ ଫେରିବା ପାଇଁ ବାମ ଧାରରୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"ପଛକୁ ଫେରିବା ପାଇଁ ଡାହାଣ ଧାରରୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"ଆପଣ ଯେଉଁ ପୂର୍ବ ସ୍କ୍ରିନରେ ଥିଲେ ସେହି ସ୍କ୍ରିନକୁ ଫେରିବା ପାଇଁ, ସ୍କ୍ରିନର ବାମ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ।"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"ଆପଣ ସ୍କ୍ରିନର ଡାହାଣ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରି ପୂର୍ବ ସ୍କ୍ରିନକୁ ବି ଫେରିପାରିବେ। ଏବେ ଏହାକୁ ବ୍ୟବହାର କରନ୍ତୁ।"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"ପଛକୁ ଫେରିବା ପାଇଁ ସ୍ୱାଇପ୍ କରନ୍ତୁ"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"ପୂର୍ବବର୍ତ୍ତୀ ସ୍କ୍ରିନକୁ ଫେରିବା ପାଇଁ, ସ୍କ୍ରିନର ବାମ କିମ୍ବା ଡାହାଣ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ।"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ଆପଣ ସ୍କ୍ରିନର ତଳ ଧାରରୁ ଉପରକୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ଆପଣ ଛାଡ଼ିବା ପୂର୍ବରୁ ବିରତ କରୁନଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ଆପଣ ସିଧା ଉପରକୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"ଜେଶ୍ଚରଗୁଡ଼ିକୁ କିପରି ବ୍ୟବହାର କରାଯିବ ଆପଣ ତାହା ଶିଖିଛନ୍ତି। ଜେଶ୍ଚରଗୁଡ଼ିକୁ ବନ୍ଦ କରିବାକୁ, ସେଟିଂସକୁ ଯାଆନ୍ତୁ।"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"ଆପଣ \'ଆପଗୁଡ଼ିକୁ ସ୍ୱିଚ୍ କରନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି।"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ଆପଗୁଡ଼ିକୁ ସ୍ୱିଚ୍ କରିବା ପାଇଁ ସ୍ୱାଇପ୍ କରନ୍ତୁ"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ଆପଣଙ୍କ ସ୍କ୍ରିନର ତଳୁ ଉପରକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ, ଧରି ରଖନ୍ତୁ, ତା\'ପରେ ରିଲିଜ୍ କରନ୍ତୁ।"</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"ସବୁ ପ୍ରସ୍ତୁତ"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"ପରବର୍ତ୍ତୀ"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ସେଟିଂସ୍"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ବଢ଼ିଆ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ଟ୍ୟୁଟୋରିଆଲ୍ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"ସମ୍ପୂର୍ଣ୍ଣ ଭାବେ ପ୍ରସ୍ତୁତ!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"ମୂଳପୃଷ୍ଠାକୁ ଯିବା ପାଇଁ ଉପରକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"ଆପଣ ଆପଣଙ୍କ ଫୋନ୍ ବ୍ୟବହାର କରିବା ପାଇଁ ପ୍ରସ୍ତୁତ ଅଛନ୍ତି"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"ଆକ୍ସେସିବିଲିଟୀ ପାଇଁ ନାଭିଗେସନ୍ ସେଟିଂସ୍"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"ସେୟାର୍ କରନ୍ତୁ"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ସ୍କ୍ରିନସଟ୍"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ଆପ୍ କିମ୍ବା ଆପଣଙ୍କ ସଂସ୍ଥା ଦ୍ୱାରା ଏହି କାର୍ଯ୍ୟକୁ ଅନୁମତି ଦିଆଯାଇ ନାହିଁ"</string>
diff --git a/quickstep/res/values-pa/strings.xml b/quickstep/res/values-pa/strings.xml
index cb2408e895..266c6f9312 100644
--- a/quickstep/res/values-pa/strings.xml
+++ b/quickstep/res/values-pa/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ਐਪ ਸੁਝਾਵਾਂ ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਗਿਆ"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ਐਪ ਸੁਝਾਵਾਂ ਨੂੰ ਬੰਦ ਕੀਤਾ ਗਿਆ"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ਪੂਰਵ ਅਨੁਮਾਨਿਤ ਐਪ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ਇੱਕ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਖੱਬੇ ਪਾਸੇ ਦੇ ਬਿਲਕੁਲ ਕਿਨਾਰੇ ਤੋਂ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਖੱਬੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰਦੇ ਹੋ ਅਤੇ ਛੱਡ ਦਿੰਦੇ ਹੋ।"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸੱਜੇ ਪਾਸੇ ਦੇ ਬਿਲਕੁਲ ਕਿਨਾਰੇ ਤੋਂ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰਦੇ ਹੋ ਅਤੇ ਛੱਡ ਦਿੰਦੇ ਹੋ।"</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"ਤੁਸੀਂ ਪਿੱਛੇ ਜਾਣ ਲਈ ਖੱਬੇ ਪਾਸੇ ਤੋਂ ਸਵਾਈਪ ਕਰਨ ਦਾ ਤਰੀਕਾ ਜਾਣਿਆ।"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ਤੁਸੀਂ ਪਿੱਛੇ ਜਾਣ ਲਈ ਸੱਜੇ ਪਾਸੇ ਤੋਂ ਸਵਾਈਪ ਕਰਨ ਦਾ ਤਰੀਕਾ ਜਾਣਿਆ। ਅੱਗੇ, ਐਪਾਂ ਵਿਚਾਲੇ ਅਦਲਾ-ਬਦਲੀ ਕਰਨ ਦਾ ਤਰੀਕਾ ਜਾਣੋ।"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ਤੁਸੀਂ \'ਵਾਪਸ ਜਾਓ\' ਦਾ ਇਸ਼ਾਰਾ ਪੂਰਾ ਕੀਤਾ।"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਲੇ ਹਿੱਸੇ ਦੇ ਬਹੁਤ ਨੇੜੇ ਸਵਾਈਪ ਨਾ ਕਰੋ।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ਪਿੱਛੇ ਜਾਣ ਦੇ ਸੰਕੇਤ ਦੀ ਸੰਵੇਦਨਸ਼ੀਲਤਾ ਬਦਲਣ ਲਈ, ਸੈਟਿੰਗਾਂ \'ਤੇ ਜਾਓ"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"ਪਿੱਛੇ ਜਾਣ ਲਈ ਖੱਬੇ ਪਾਸੇ ਤੋਂ ਸਵਾਈਪ ਕਰੋ"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"ਪਿੱਛੇ ਜਾਣ ਲਈ ਸੱਜੇ ਪਾਸੇ ਤੋਂ ਸਵਾਈਪ ਕਰੋ"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"ਜਿੱਥੇ ਤੁਸੀਂ ਸੀ ਉਸ ਪਿਛਲੀ ਸਕ੍ਰੀਨ \'ਤੇ ਵਾਪਸ ਜਾਣ ਲਈ, ਖੱਬੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰੋ।"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"ਤੁਸੀਂ ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰਕੇ ਪਿਛਲੀ ਸਕ੍ਰੀਨ \'ਤੇ ਵਾਪਸ ਜਾ ਸਕਦੇ ਹੋ। ਹੁਣੇ ਵਰਤ ਕੇ ਦੇਖੋ।"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"ਪਿੱਛੇ ਜਾਣ ਲਈ ਸਵਾਈਪ ਕਰੋ"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"ਪਿਛਲੀ ਸਕ੍ਰੀਨ \'ਤੇ ਵਾਪਸ ਜਾਣ ਲਈ, ਖੱਬੇ ਜਾਂ ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰੋ।"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਲੇ ਕਿਨਾਰੇ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ਪੱਕਾ ਕਰੋ ਕਿ ਸਕ੍ਰੀਨ ਨੂੰ ਛੱਡਣ ਤੋਂ ਪਹਿਲਾਂ ਰੁਕੋ ਨਾ।"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਿੱਧੇ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"ਤੁਸੀਂ ਇਸ਼ਾਰੇ ਵਰਤਣ ਬਾਰੇ ਜਾਣਿਆ। ਇਸ਼ਾਰੇ ਬੰਦ ਕਰਨ ਲਈ, ਸੈਟਿੰਗਾਂ \'ਤੇ ਜਾਓ।"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"ਤੁਸੀਂ \'ਐਪਾਂ ਵਿਚਾਲੇ ਅਦਲਾ-ਬਦਲੀ ਕਰੋ\' ਦਾ ਇਸ਼ਾਰਾ ਪੂਰਾ ਕੀਤਾ।"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ਐਪਾਂ ਵਿਚਾਲੇ ਅਦਲਾ-ਬਦਲੀ ਕਰਨ ਲਈ ਸਵਾਈਪ ਕਰੋ"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ਆਪਣੀ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਾਂ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰਕੇ ਦਬਾਈ ਰੱਖੋ, ਅਤੇ ਫਿਰ ਛੱਡੋ।"</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"ਪੂਰੀ ਤਰ੍ਹਾਂ ਤਿਆਰ"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"ਅੱਗੇ"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ਸੈਟਿੰਗਾਂ"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ਵਧੀਆ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ਟਿਊਟੋਰੀਅਲ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"ਪੂਰੀ ਤਰ੍ਹਾਂ ਤਿਆਰ!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"ਹੋਮ \'ਤੇ ਜਾਣ ਲਈ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"ਤੁਸੀਂ ਆਪਣਾ ਫ਼ੋਨ ਵਰਤਣ ਲਈ ਤਿਆਰ ਹੋ"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"ਪਹੁੰਚਯੋਗਤਾ ਲਈ ਨੈਵੀਗੇਸ਼ਨ ਸੈਟਿੰਗਾਂ"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"ਸਾਂਝਾ ਕਰੋ"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ਸਕ੍ਰੀਨਸ਼ਾਟ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ਐਪ ਜਾਂ ਤੁਹਾਡੀ ਸੰਸਥਾ ਵੱਲੋਂ ਇਸ ਕਾਰਵਾਈ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ"</string>
diff --git a/quickstep/res/values-pl/strings.xml b/quickstep/res/values-pl/strings.xml
index db1d5ed4ee..18dc1bc608 100644
--- a/quickstep/res/values-pl/strings.xml
+++ b/quickstep/res/values-pl/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Włączono sugestie aplikacji"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Sugestie aplikacji są wyłączone"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Przewidywana aplikacja: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pamiętaj, aby przesuwać palcem od samej lewej krawędzi."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pamiętaj, aby przesuwać palcem od lewej krawędzi do środka ekranu, a potem podnieść palec."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pamiętaj, aby przesuwać palcem od samej prawej krawędzi."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pamiętaj, aby przesuwać palcem od prawej krawędzi do środka ekranu, a potem podnieść palec."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Wiesz już, jak przesuwać palcem od lewej strony, aby wrócić."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Wiesz już, jak przesuwać palcem od prawej strony, aby wrócić. Poćwicz teraz przełączanie aplikacji."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Gest przejścia wstecz został opanowany."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pamiętaj, aby nie przesuwać palcem zbyt blisko dolnej części ekranu."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Czułość gestu cofania możesz zmienić w Ustawieniach"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Aby wrócić, przesuń palcem od lewej strony"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Aby wrócić, przesuń palcem od prawej strony"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Aby wrócić do ostatniego ekranu, przesuń palcem od lewej krawędzi do środka ekranu."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Możesz także wrócić do ostatniego ekranu, przesuwając palcem od prawej krawędzi do środka ekranu. Spróbuj to zrobić teraz."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Przesuwanie palcem, aby przejść wstecz"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Aby wrócić do ostatniego ekranu, przesuń palcem od lewej lub prawej krawędzi do środka ekranu."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pamiętaj, aby przesuwać palcem od dolnej krawędzi ekranu."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pamiętaj, aby przed podniesieniem palca nie było przerwy."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pamiętaj, aby przesuwać palcem prosto do góry."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Wiesz już, jak używać gestów. Aby wyłączyć gesty, przejdź do Ustawień."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Gest przełączania aplikacji został opanowany."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Przesuwanie palcem, aby przełączać aplikacje"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Przesuń palcem od dołu ekranu, przytrzymaj i puść."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Wszystko gotowe"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Dalej"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Ustawienia"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Spróbuj ponownie"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Super!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Samouczek <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Wszystko gotowe"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Aby przejść na stronę główną, przesuń w górę"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Teraz możesz zacząć używać telefonu"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Ustawienia nawigacji na potrzeby ułatwień dostępu"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Udostępnij"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Zrzut ekranu"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Nie możesz wykonać tego działania, bo nie zezwala na to aplikacja lub Twoja organizacja"</string>
diff --git a/quickstep/res/values-pt-rPT/strings.xml b/quickstep/res/values-pt-rPT/strings.xml
index 48ebd13d76..7c28c7210a 100644
--- a/quickstep/res/values-pt-rPT/strings.xml
+++ b/quickstep/res/values-pt-rPT/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Sugestões de apps ativadas"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"As sugestões de apps estão desativadas"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App prevista: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Deslize rapidamente com o dedo a partir da extremidade esquerda."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Garanta que desliza rapidamente com o dedo do limite esquerdo até ao centro do ecrã e solta."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Deslize rapidamente com o dedo a partir da extremidade direita."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Garanta que desliza rapidamente com o dedo do limite direito até ao centro do ecrã e solta."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Aprendeu a deslizar rapidamente a partir da esquerda para retroceder."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Aprendeu a deslizar a partir da direita para retroceder. A seguir, saiba como alternar entre apps."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Concluiu o gesto para retroceder."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Garanta que não desliza rapidamente com o dedo demasiado perto da parte inferior do ecrã."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Altere a sensibilidade do gesto para voltar nas Definições."</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Deslize rapidamente a partir da esquerda para retroceder"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Deslize rapidamente a partir da direita para retroceder"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Para voltar ao último ecrã, deslize rapidamente a partir do limite esquerdo para o centro do ecrã."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Também pode voltar ao último ecrã deslizando da direita para o centro do ecrã. Experimente agora."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Deslize rapidamente com o dedo para retroceder"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Para voltar ao último ecrã, deslize rapidamente do limite esquerdo ou direito até ao centro do ecrã."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Garanta que desliza rapidamente com o dedo a partir do limite inferior do ecrã."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Garanta que não faz uma pausa antes de soltar."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Garanta que desliza rapidamente com o dedo para cima."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Aprendeu a utilizar gestos. Para desativar os gestos, aceda às Definições."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Concluiu o gesto para alternar entre apps."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Deslize rapidamente com o dedo para alternar entre apps"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Deslize rapidamente para cima a partir da parte inferior do ecrã sem soltar e, em seguida, solte."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Está tudo pronto"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Seguinte"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Definições"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Tente novamente"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Boa!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Tudo pronto!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Deslize rapidamente para cima para aceder ao ecrã principal"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Já pode começar a utilizar o seu telemóvel"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Definições de navegação para acessibilidade"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Partilhar"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Fazer captura de ecrã"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Esta ação não é permitida pela app ou a sua entidade."</string>
diff --git a/quickstep/res/values-pt/strings.xml b/quickstep/res/values-pt/strings.xml
index fa43bcbeae..1899719af2 100644
--- a/quickstep/res/values-pt/strings.xml
+++ b/quickstep/res/values-pt/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"O recurso \"sugestões de apps\" está ativado"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"O recurso \"sugestões de apps\" está desativado"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App previsto: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Deslize da borda esquerda."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Deslize da borda esquerda até o meio da tela e solte."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Deslize da borda direita."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Deslize da borda direita até o meio da tela e solte."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Você aprendeu a deslizar da esquerda para voltar."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Você aprendeu a deslizar da direita para voltar. A seguir, aprenda a trocar de app."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Você concluiu o gesto para voltar."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Não deslize perto demais da parte inferior da tela."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Mude a sensibilidade do gesto de voltar nas configurações"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Deslize da esquerda para voltar"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Deslizar da direita para voltar"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Para voltar à tela anterior, deslize da borda esquerda até o meio da tela."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Para voltar à tela anterior, deslize da borda direita até o meio da tela. Faça um teste."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Deslize para voltar"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Para voltar à tela anterior, deslize da borda esquerda ou direita até o meio da tela."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Deslize da borda inferior da tela para cima."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Não pare antes de soltar."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Deslize para cima."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Você aprendeu a usar gestos. Para desativá-los, acesse as Configurações."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Você concluiu o gesto para trocar de app."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Deslizar para trocar de app"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Deslize de baixo para cima na tela, mantenha-a pressionada e depois solte."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Tudo pronto"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Próxima"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Configurações"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Tentar novamente"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Muito bem!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Tudo pronto!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Deslize para cima para acessar a tela inicial"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Você já pode começar a usar seu smartphone"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Configurações de navegação para acessibilidade"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Compartilhar"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Capturar tela"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Essa ação não é permitida pelo app ou pela organização"</string>
diff --git a/quickstep/res/values-ro/strings.xml b/quickstep/res/values-ro/strings.xml
index 1e75cb5f20..91a2caa152 100644
--- a/quickstep/res/values-ro/strings.xml
+++ b/quickstep/res/values-ro/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Sugestiile de aplicații au fost activate"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Sugestiile de aplicații au fost dezactivate"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplicația estimată: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Glisați dinspre marginea stângă îndepărtată."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Glisați dinspre marginea stângă spre mijlocul ecranului și eliberați."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Glisați dinspre marginea dreaptă îndepărtată."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Glisați dinspre marginea dreaptă spre mijlocul ecranului și eliberați."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Ați învățat cum să glisați dinspre stânga pentru a reveni."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Ați învățat cum să glisați dinspre dreapta pentru a reveni. În continuare, aflați cum să comutați aplicațiile."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ați finalizat gestul „înapoi”."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nu glisați prea aproape de partea de jos a ecranului."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Schimbați sensibilitatea gestului „Înapoi” accesând Setările"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Glisați dinspre stânga pentru a reveni"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Glisați dinspre dreapta pentru a reveni"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Pentru a reveni la ultimul ecran accesat, glisați de la marginea stângă spre mijlocul ecranului."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Reveniți la ultimul ecran glisând de la marginea dreaptă spre mijlocul ecranului. Încercați acum."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Glisați pentru a reveni"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Pentru a reveni la ultimul ecran, glisați de la marginea stângă sau dreaptă spre mijlocul ecranului."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Glisați în sus dinspre marginea de jos a ecranului."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Nu întrerupeți gestul înainte de a elibera."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Glisați direct în sus."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Ați învățat cum să folosiți gesturi. Pentru a dezactiva gesturile, accesați Setările."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Ați finalizat gestul „comutați între aplicații”."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Glisați pentru a comuta între aplicații"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Glisați în sus din partea de jos a ecranului, așteptați, apoi eliberați."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Gata"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Înainte"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Setări"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Reîncercați"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bravo!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorialul <xliff:g id="CURRENT">%1$d</xliff:g> / <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Gata!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Glisați în sus pentru a accesa pagina principală"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Sunteți gata să folosiți telefonul"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Setări de navigare pentru accesibilitate"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Distribuiți"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Captură de ecran"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Această acțiune nu este permisă de aplicație sau de organizația dvs."</string>
diff --git a/quickstep/res/values-ru/strings.xml b/quickstep/res/values-ru/strings.xml
index ef05954ce8..c38e0cca65 100644
--- a/quickstep/res/values-ru/strings.xml
+++ b/quickstep/res/values-ru/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Функция \"Рекомендуемые приложения\" включена."</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Функция \"Рекомендуемые приложения\" отключена."</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Рекомендуемое приложение: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Проведите слева направо от самого края экрана."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Проведите от левого края экрана до середины дисплея и отпустите палец."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Проведите справа налево от самого края экрана."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Проведите от правого края экрана до середины дисплея и отпустите палец."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Теперь вы знаете, как вернуться, проведя слева направо."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Теперь вы знаете, как вернуться, проведя справа налево. Далее мы расскажем, как переключаться между приложениями."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Вы выполнили жест для перехода назад."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Проведите пальцем не слишком близко к нижнему краю экрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Уровень чувствительности можно изменить в настройках."</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Чтобы вернуться, проведите слева направо."</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Чтобы вернуться, проведите справа налево."</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Чтобы вернуться к предыдущему экрану, проведите от левого края к центру."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Вернуться назад можно, проведя от правого края к центру. Потренируйтесь на этом экране."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Возврат к предыдущему экрану"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Чтобы вернуться к предыдущему экрану, проведите от левого или правого края дисплея к центру."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Проведите снизу вверх от самого края экрана."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Не приостанавливайтесь перед тем, как отпустить палец."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Проведите по экрану ровно вверх."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Теперь вы знаете, как использовать жесты. Чтобы отключить их, перейдите в настройки."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Вы выполнили жест для переключения между приложениями."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Переключение между приложениями"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Проведите вверх от нижнего края экрана, задержите палец в крайнем положении, а затем отпустите."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Готово"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Далее"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Настройки"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Повторите попытку"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Поздравляем!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Руководство (шаг <xliff:g id="CURRENT">%1$d</xliff:g> из <xliff:g id="TOTAL">%2$d</xliff:g>)"</string>
     <string name="allset_title" msgid="5021126669778966707">"Готово!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Чтобы перейти на главный экран, проведите вверх."</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Теперь вы можете использовать телефон."</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Настройки навигации для функции \"Специальные возможности\""</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Поделиться"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Скриншот"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Это действие заблокировано приложением или организацией."</string>
diff --git a/quickstep/res/values-si/strings.xml b/quickstep/res/values-si/strings.xml
index 6e453ce320..a3645e4ecb 100644
--- a/quickstep/res/values-si/strings.xml
+++ b/quickstep/res/values-si/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"යෙදුම් යෝජනා සබලිතයි"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"යෙදුම් යෝජනා අබල කර ඇත"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"පුරෝකථනය කළ යෙදුම: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ඔබ ඈත වම් දාරයෙන් ස්වයිප් කරන බවට සහතික කර ගන්න."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ඔබ වම් දාරයේ සිට තිරයේ මැදට ස්වයිප් කර අත හරින බව සහතික කර ගන්න."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ඔබ ඈත දකුණු දාරයෙන් ස්වයිප් කරන බවට සහතික කර ගන්න."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ඔබ දකුණු දාරයේ සිට තිරයේ මැදට ස්වයිප් කර අත හරින බව සහතික කර ගන්න."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"ආපසු යාමට වමේ සිට ස්වයිප් කරන්නේ කෙසේදැයි ඔබ දැන ගත්තේය."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ආපසු යාමට දකුණේ සිට ස්වයිප් කරන්නේ කෙසේදැයි ඔබ දැන ගත්තේය. ඊළඟට, යෙදුම් මාරු කරන ආකාරය දැන ගන්න."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ඔබ ආපසු යාමේ ඉංගිතය සම්පූර්ණ කරන ලදි."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ඔබ තිරයේ පහළට ඉතාම සමීපව ස්වයිප් නොකරන බවට සහතික කර ගන්න."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ආපසු ඉංගිතයෙහි සංවේදීතාව වෙනස් කිරීමට, සැකසීම් වෙත යන්න"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"ආපසු යාමට වමේ සිට ස්වයිප් කරන්න"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"ආපසු යාමට දකුණින් ස්වයිප් කරන්න"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"ඔබ සිටි අවසාන තිරයට ආපසු යාමට, වම් මායිමෙන් තිරයේ මැදට ස්වයිප් කරන්න."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"දකුණු මායිමේ සිට තිරයේ මැදට ස්වයිප් කර අවසාන තිරයට යා හැකිය. දැන් එය උත්සාහ කරන්න."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"ආපසු යාමට ස්වයිප් කරන්න"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"අවසාන තිරයට ආපසු යාමට, වම් හෝ දකුණු දාරයෙන් තිරයේ මැදට ස්වයිප් කරන්න."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ඔබ තිරයේ පහළ දාරයේ සිට ඉහළට ස්වයිප් කරන බව සහතික කර ගන්න."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"යාමට ඉඩ හැරීමට පෙර ඔබ විරාමයක් නොගන්නා බව සහතික කර ගන්න."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ඔබ කෙලින්ම ඉහළට ස්වයිප් කරන බව සහතික කර ගන්න."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"ඔබ ඉංගිත භාවිත කරන ආකාරය දැන ගෙන ඇත. ඉංගිත ක්‍රියාවිරහිත කිරීමට, සැකසීම් වෙත යන්න."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"ඔබ යෙදුම් මාරු කිරීමේ ඉංගිතය සම්පූර්ණ කර ඇත."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"යෙදුම් මාරු කිරීමට ස්වයිප් කරන්න"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ඔබගේ තිරයේ පහළින් උඩට ස්වයිප් කර, අල්ලාගෙන සිට, අනතුරුව මුදා හරින්න."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"සියල්ල සකසා ඇත"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"ඊළඟ"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"සැකසීම්"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"නැවත උත්සාහ කරන්න"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"කදිමයි!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"නිබන්ධනය <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"සියල්ල සූදානම්!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"මුල් පිටුවට යාමට ඉහළට ස්වයිප් කරන්න"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"ඔබ ඔබගේ දුරකථනය භාවිත කිරීම පටන් ගැනීමට සූදානම්"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"ප්‍රවේශ්‍යතාව සඳහා සංචාලන සැකසීම්"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"බෙදා ගන්න"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"තිර රුව"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"මෙම ක්‍රියාව යෙදුම හෝ ඔබේ සංවිධානය මගින් ඉඩ නොදේ"</string>
diff --git a/quickstep/res/values-sk/strings.xml b/quickstep/res/values-sk/strings.xml
index 704ee61072..e42201f0a3 100644
--- a/quickstep/res/values-sk/strings.xml
+++ b/quickstep/res/values-sk/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Návrhy aplikácií zapnuté"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Návrhy aplikácií vypnuté"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predpovedaná aplikácia: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Musite potiahnuť z úplne krajného ľavého okraja."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Musíte potiahnuť z ľavého okraja do stredu obrazovky a uvoľniť."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Musite potiahnuť z úplne krajného pravého okraja."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Musíte potiahnuť z pravého okraja do stredu obrazovky a uvoľniť."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Naučili ste sa prejsť späť potiahnutím zľava."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Naučili ste sa prejsť späť potiahnutím sprava. V ďalšom kroku sa naučíte prepínať aplikácie."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Dokončili ste gesto na prechod späť."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nesmiete potiahnuť príliš blízko dolnej časti obrazovky."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Ak chcete zmeniť citlivosť gesta Späť, prejdite do Nastavení"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Späť prejdete potiahnutím zľava"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Späť prejdete potiahnutím sprava"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Na poslednú obrazovku prejdete potiahnutím z ľavého okraja do stredu obrazovky."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Na poslednú obrazovku tiež prejdete potiahnutím z pravého okraja do stredu obrazovky. Vyskúšajte to."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Prejdite späť potiahnutím"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Na poslednú obrazovku prejdete potiahnutím z ľavého alebo pravého okraja do stredu obrazovky."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Musíte potiahnuť nahor z dolného okraja obrazovky."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pred uvoľnením nesmiete zastať."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Musíte potiahnuť priamo hore."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Naučili ste sa používať gestá. Ak ich chcete vypnúť, prejdite do Nastavení."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Dokončili ste gesto na prepnutie aplikácií."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Prepínanie aplikácií potiahnutím"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Potiahnite nahor z dolnej časti obrazovky, pridržte a uvoľnite."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Hotovo"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Ďalej"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Nastavenia"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Skúste to znova"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Výborne!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Návod <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Hotovo"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Potiahnutím nahor prejdete na plochu"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Telefón môžete začať používať"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Nastavenia navigácie pre dostupnosť"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Zdieľať"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Snímka obrazovky"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikácia alebo vaša organizácia túto akciu nepovoľuje"</string>
diff --git a/quickstep/res/values-sl/strings.xml b/quickstep/res/values-sl/strings.xml
index b4cb706c53..0093dd2a14 100644
--- a/quickstep/res/values-sl/strings.xml
+++ b/quickstep/res/values-sl/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Predlogi aplikacij so omogočeni."</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Predlogi aplikacij so onemogočeni."</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predvidena aplikacija: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Pazite, da povlečete s skrajno levega roba."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Pazite, da povlečete z levega roba do sredine zaslona in dvignete prst."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Pazite, da povlečete s skrajno desnega roba."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Pazite, da povlečete z desnega roba do sredine zaslona in dvignete prst."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Naučili ste se, kako povlečete z leve za vrnitev."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Naučili ste se, kako povlečete z desne za vrnitev. Zdaj se naučite preklapljanja med aplikacijami."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Izvedli ste potezo za pomik nazaj."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pazite, da ne povlečete preblizu dna zaslona."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Občutljivost poteze za nazaj lahko spremenite v nastavitvah."</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Povlecite z leve za vrnitev."</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Povlecite z desne za vrnitev"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Če se želite vrniti na zadnji prikazani zaslon, povlecite z levega roba do sredine zaslona."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Na zadnji zaslon se lahko vrnete tudi, če z desnega roba povlečete do sredine zaslona. Preizkusite."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Povlecite za vrnitev."</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Če se želite vrniti na zadnji zaslon, povlecite z levega ali desnega roba do sredine zaslona."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pazite, da povlečete s spodnjega roba zaslona navzgor."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pazite, da ne zaustavite prsta, preden ga dvignete."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pazite, da povlečete naravnost navzgor."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Naučili ste se uporabljati poteze. Poteze lahko izklopite v nastavitvah."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Izvedli ste potezo za preklapljanje med aplikacijami."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Vlečenje za preklapljanje med aplikacijami"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Povlecite navzgor z dna zaslona, pridržite, nato izpustite."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Zdaj znate"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Naprej"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Nastavitve"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Poskusite znova"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Odlično!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Vadnica <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Končano"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Povlecite navzgor za začetni zaslon"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Pripravljeni ste, da začnete uporabljati telefon"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Nastavitve krmarjenja za dostopnost"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Deli"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Posnetek zaslona"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikacija ali vaša organizacija ne dovoljuje tega dejanja"</string>
diff --git a/quickstep/res/values-sq/strings.xml b/quickstep/res/values-sq/strings.xml
index 2ff94a122d..59ae630406 100644
--- a/quickstep/res/values-sq/strings.xml
+++ b/quickstep/res/values-sq/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Aplikacionet e sugjeruara janë aktivizuar"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Sugjerimet e aplikacioneve janë çaktivizuar"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplikacioni i parashikuar: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Sigurohu që të rrëshqasësh shpejt nga skaji sa më majtas."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Sigurohu që të rrëshqasësh shpejt nga skaji i majtë drejt mesit të ekranit dhe lëshoje."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Sigurohu që të rrëshqasësh shpejt nga skaji sa më djathtas."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Sigurohu që të rrëshqasësh shpejt nga skaji i djathtë drejt mesit të ekranit dhe lëshoje."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Ke mësuar si të rrëshqasësh shpejt nga e majta për t\'u kthyer prapa."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Ke mësuar si të rrëshqasësh shpejt nga e djathta për t\'u kthyer prapa. Në vijim do të mësosh se si t\'i ndërrosh aplikacionet."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"E ke përfunduar gjestin e kthimit prapa."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Sigurohu që të mos rrëshqasësh shumë afër fundit të ekranit."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Për të ndryshuar ndjeshmërinë e gjestit të kthimit prapa, shko te \"Cilësimet\""</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Rrëshqit shpejt nga e majta për t\'u kthyer prapa"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Rrëshqit shpejt nga e djathta për t\'u kthyer prapa"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Për t\'u kthyer në ekranin e fundit ku ishe, rrëshqit shpejt nga skaji i majtë në mes të ekranit."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Mund dhe të kthehesh në ekranin e fundit duke rrëshqitur shpejt nga skaji i djathtë në mes të ekranit. Provoje tani."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Rrëshqit shpejt për t\'u kthyer prapa"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Për t\'u kthyer prapa tek ekrani i fundit, rrëshqit shpejt nga skaji i majtë ose i djathtë drejt mesit të ekranit"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Sigurohu që të rrëshqasësh shpejt lart nga skaji i poshtëm i ekranit."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Sigurohu që të mos ndalosh para se ta lëshosh."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Sigurohu që të rrëshqasësh shpejt drejt lart."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Ke mësuar si të përdorësh gjestet. Për t\'i çaktivizuar gjestet, shko te \"Cilësimet\"."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"E ke përfunduar gjestin e ndërrimit të aplikacioneve."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Rrëshqit shpejt për të ndërruar aplikacionet"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Rrëshqit shpejt lart nga fundi i ekranit, mbaje të shtypur dhe më pas lëshoje."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Plotësisht gati"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Para"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Cilësimet"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Provo përsëri"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bukur!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Udhëzuesi <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Plotësisht gati!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Rrëshqit shpejt lart për të shkuar në ekranin bazë"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Je gati për të filluar përdorimin e telefonit tënd"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Cilësimet e navigimit për qasshmërinë"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Ndaj"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Pamja e ekranit"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Ky veprim nuk lejohet nga aplikacioni ose organizata jote"</string>
diff --git a/quickstep/res/values-sr/strings.xml b/quickstep/res/values-sr/strings.xml
index 28754b5baa..7c19ac89cc 100644
--- a/quickstep/res/values-sr/strings.xml
+++ b/quickstep/res/values-sr/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Предлози апликација су омогућени"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Предлози апликација су онемогућени"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Предвиђамо апликацију: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Обавезно превуците од саме леве ивице."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Обавезно превуците од леве ивице до средине екрана и отпустите."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Обавезно превуците од саме десне ивице."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Обавезно превуците од десне ивице до средине екрана и отпустите."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Научили сте како да превлачите слева да бисте се вратили."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Научили сте како да превлачите здесна да бисте се вратили. Сада научите да мењате апликације."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Довршили сте покрет за повратак."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Никако не превлачите превише близу дна екрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Осетљивост пок. за назад можете да промените у Подешавањима"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Превуците слева да бисте се вратили"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Превуците здесна да бисте се вратили"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Да бисте се вратили на последњи екран, превуците од леве ивице ка средини екрана."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Можете да се вратите на последњи екран и превлачењем од десне ивице ка средини екрана. Испробајте."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Превуците да бисте се вратили"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Да бисте се вратили на последњи екран, превуците од леве или десне ивице до средине екрана."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Обавезно превуците нагоре од доње ивице екрана."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Никако не стајте пре отпуштања."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Обавезно превуците право нагоре."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Научили сте како да користите покрете. Да бисте искључили покрете, идите на подешавања."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Довршили сте покрет за промену апликација."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Превуците да бисте променили апликације"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Превуците нагоре од дна екрана, задржите, па пустите."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"То је то"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Даље"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Подешавања"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Пробајте поново"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Свака част!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Водич <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Готово!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Превуците нагоре да бисте отворили почетни екран"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Спремни сте да почнете да користите телефон"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Подешавања навигације за приступачност"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Дели"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Снимак екрана"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Апликација или организација не дозвољавају ову радњу"</string>
diff --git a/quickstep/res/values-sv/strings.xml b/quickstep/res/values-sv/strings.xml
index 1838643a64..2d42f2f5c5 100644
--- a/quickstep/res/values-sv/strings.xml
+++ b/quickstep/res/values-sv/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Appförslag har aktiverats"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Appförslag har inaktiverats"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Appförslag: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Se till att du sveper ända från vänsterkanten."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Se till att du sveper från den vänstra kanten till mitten av skärmen och sedan släpper."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Se till att du sveper ända från högerkanten."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Se till att du sveper från den högra kanten till mitten av skärmen och sedan släpper."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Nu kan du svepa från vänster för att gå tillbaka."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Nu kan du svepa från höger för att gå tillbaka. Nu ska du få lära dig hur du byter mellan appar."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Du är klar med rörelsen för att gå tillbaka."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Se till att du inte sveper för nära skärmens nederkant."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Öppna inställningarna om du vill ändra rörelsens känslighet"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Återgå genom att svepa från vänster"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Svep från höger för att gå tillbaka"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Återgå till den senaste skärmen du var på genom att svepa från skärmens vänstra kant till mitten."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Du kan återgå till föregående skärm genom att svepa från den högra kanten till mitten. Testa nu."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Svep för att återgå"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Återgå till den senaste skärmen genom att svepa från skärmens vänster- eller högerkant till mitten."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Se till att du sveper från nederkanten på skärmen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Se till att du sveper i en jämn rörelse innan du släpper."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Se till att du sveper rakt uppåt."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Du har lärt dig hur du använder rörelser. Om du vill inaktivera rörelser öppnar du inställningarna."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Du är klar med rörelsen för att byta mellan appar."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Svep för att byta mellan appar"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Svep uppåt från skärmens nederkant. Håll fingret nedtryckt och släpp sedan."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Klart"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Nästa"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Inställningar"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Försök igen"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bra!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Självstudie <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Klart!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Svep uppåt för att öppna startskärmen"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Nu kan du börja använda telefonen"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Navigeringsinställningar för tillgänglighet"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Dela"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Skärmbild"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Appen eller organisationen tillåter inte den här åtgärden"</string>
diff --git a/quickstep/res/values-sw/strings.xml b/quickstep/res/values-sw/strings.xml
index 79e6483d1f..66ce61676b 100644
--- a/quickstep/res/values-sw/strings.xml
+++ b/quickstep/res/values-sw/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Mapendekezo ya programu yamewashwa"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Umezima mapendekezo ya programu"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Programu iliyotabiriwa: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Hakikisha unatelezesha kidole kuanzia ukingo wa mbali wa kushoto."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Hakikisha unatelezesha kidole kuanzia ukingo wa kushoto kuelekea katikati ya skrini na uachilie."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Hakikisha unatelezesha kidole kuanzia ukingo wa mbali wa kulia."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Hakikisha unatelezesha kidole kuanzia ukingo wa kulia kuelekea katikati ya skrini na uachilie."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Umejifunza jinsi ya kutelezesha kidole kuanzia kushoto ili kurudi nyuma."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Umejifunza jinsi ya kutelezesha kidole kuanzia kulia ili kurudi nyuma. Hatua inayofuata, jifunze jinsi ya kubadilisha programu."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Umekamilisha ishara ya kurudi nyuma."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Hakikisha hutelezeshi kidole karibu sana na sehemu ya chini ya skrini."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Kubadilisha hisi ya ishara ya nyuma, nenda kwenye Mipangilio"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Telezesha kidole kuanzia kushoto ili urudi nyuma"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Telezesha kidole kuanzia kulia ili urudi nyuma"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Ili urudi kwenye skrini iliyotangulia, telezesha kidole kuanzia ukingo wa kushoto kuelekea katikati ya skrini."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Unaweza pia kurudi kwenye skrini iliyotangulia kwa kutelezesha kidole kuanzia ukingo wa kulia kuelekea katikati ya skrini. Ijaribu sasa."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Telezesha kidole ili urudi nyuma"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Ili urudi kwenye skrini iliyotangulia, telezesha kidole kuanzia ukingo wa kushoto au wa kulia kuelekea katikati ya skrini."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Hakikisha unatelezesha kidole juu kuanzia ukingo wa chini wa skrini."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Hakikisha kuwa husimamishi kabla ya kuachilia."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Hakikisha unatelezesha kidole kuelekea juu."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Umejifunza jinsi ya kutumia ishara. Ili uzime ishara, nenda kwenye Mipangilio."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Umekamilisha ishara ya kubadilisha programu."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Telezesha kidole ili ubadilishe programu"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Telezesha kidole juu kuanzia sehemu ya chini ya skrini yako, ushikilie, kisha uachilie."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Kila kitu kiko tayari"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Endelea"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Mipangilio"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Jaribu tena"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Safi!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Mafunzo ya <xliff:g id="CURRENT">%1$d</xliff:g> kati ya <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Tayari!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Telezesha kidole juu ili uende kwenye skrini ya kwanza"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Uko tayari kuanza kutumia simu yako"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Mipangilio ya kusogeza kwa ajili ya ufikivu"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Shiriki"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Picha ya skrini"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Kitendo hiki hakiruhusiwi na programu au shirika lako"</string>
diff --git a/quickstep/res/values-ta/strings.xml b/quickstep/res/values-ta/strings.xml
index 788f525ddb..09589984c9 100644
--- a/quickstep/res/values-ta/strings.xml
+++ b/quickstep/res/values-ta/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ஆப்ஸ் பரிந்துரைகள் இயக்கப்பட்டுள்ளன"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ஆப்ஸ் பரிந்துரைகள் முடக்கப்பட்டுள்ளன"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"கணித்த ஆப்ஸ்: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"இடது ஓரத்தின் விளிம்பிலிருந்து ஸ்வைப் செய்கிறீர்கள் என்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"இடது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்தபிறகு விடுவிப்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"வலது ஓரத்தின் விளிம்பிலிருந்து ஸ்வைப் செய்கிறீர்கள் என்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"வலது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்தபிறகு விடுவிப்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"பின்செல்வதற்கு எப்படி இடதுபுறத்திலிருந்து ஸ்வைப் செய்வதென்று கற்றுக்கொண்டீர்கள்."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"பின்செல்வதற்கு எப்படி வலதுபுறத்திலிருந்து ஸ்வைப் செய்வதென்று கற்றுக்கொண்டீர்கள். அடுத்து ஆப்ஸுக்கிடையே எப்படி மாறுவது என்பதை அறிக."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"பின்செல் சைகைப் பயிற்சியை முடித்துவிட்டீர்கள்."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"திரையின் கீழ்பகுதிக்கு மிக நெருக்கமாக ஸ்வைப் செய்யவில்லை என்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"பின்செல் சைகையின் உணர்திறனை மாற்ற அமைப்புகளுக்குச் செல்க"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"பின்செல்வதற்கு இடதுபுறத்திலிருந்து ஸ்வைப் செய்யுங்கள்"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"பின்செல்வதற்கு வலதுபுறத்திலிருந்து ஸ்வைப் செய்யுங்கள்"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"முந்தைய திரைக்கு மீண்டும் செல்ல, இடது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்யுங்கள்."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"வலது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்தும் முந்தைய திரைக்குச் செல்லலாம். இப்போதே முயலுங்கள்."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"பின்செல்ல ஸ்வைப் செய்யுங்கள்"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"முந்தைய திரைக்கு மீண்டும் செல்ல, இடது/வலது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்க."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"திரையின் கீழ் ஓரத்திலிருந்து மேல்நோக்கி ஸ்வைப் செய்வதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"விடுவிப்பதற்கு முன்பாக இடைநிறுத்தவில்லை என்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"மேல்நோக்கி நேராக ஸ்வைப் செய்வதை உறுதிசெய்துகொள்ளுங்கள்."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"சைகைகளை எப்படி உபயோகிப்பது என்று கற்றுக்கொண்டீர்கள். சைகைகளை முடக்க அமைப்புகளுக்குச் செல்லுங்கள்."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"ஆப்ஸுக்கிடையே மாறும் சைகைப் பயிற்சியை முடித்துவிட்டீர்கள்."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ஆப்ஸுக்கிடையே மாற ஸ்வைப் செய்யுங்கள்"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"திரையின் கீழிலிருந்து மேலாக ஸ்வைப் செய்து, சில விநாடிகள் பிடித்திருந்து, பிறகு விரலை எடுங்கள்."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"எல்லாம் தயார்"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"அடுத்து"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"அமைப்புகள்"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"மீண்டும் முயல்க"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"அருமை!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"பயிற்சி <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"அனைத்தையும் அமைத்துவிட்டீர்கள்!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"முகப்புக்குச் செல்ல மேல்நோக்கி ஸ்வைப் செய்யுங்கள்"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"மொபைலைப் பயன்படுத்தத் தயாராகிவிட்டீர்கள்"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"அணுகல்தன்மைக்கான வழிசெலுத்தல் அமைப்புகள்"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"பகிர்"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ஸ்கிரீன்ஷாட்"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ஆப்ஸோ உங்கள் நிறுவனமோ இந்த செயலை அனுமதிப்பதில்லை"</string>
diff --git a/quickstep/res/values-te/strings.xml b/quickstep/res/values-te/strings.xml
index 365cab7024..4c493e2c5b 100644
--- a/quickstep/res/values-te/strings.xml
+++ b/quickstep/res/values-te/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"యాప్ సలహాలు ఎనేబుల్ చేయబడ్డాయి"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"యాప్ సూచ‌న‌లు డిజేబుల్‌ చేయబడ్డాయి"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"సూచించబడిన యాప్: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ఎడమ వైపు చిట్ట చివరి అంచు నుండి స్వయిప్ చేస్తున్నారని నిర్ధారించుకోండి."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"మీరు ఎడమ అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేశారని నిర్ధారించుకోని, ఆపై మీ వేలిని ఎత్తండి."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"కుడి వైపు చిట్ట చివరి అంచు నుండి స్వయిప్ చేస్తున్నారని నిర్ధారించుకోండి"</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"మీరు కుడి అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేశారని నిర్ధారించుకోని, ఆపై మీ వేలిని ఎత్తండి."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"వెనుకకు వెళ్లడానికి ఎడమ నుండి ఎలా స్వైప్ చేయాలో మీరు నేర్చుకున్నారు."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"వెనుకకు వెళ్లడానికి కుడి నుండి స్వైప్ ఎలానో మీకు తెలుసు. తర్వాత, యాప్‌ల మధ్య ఎలా మారాలో తెలుసుకోండి."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"మీరు తిరిగి వెనక్కు వెళ్లే సంజ్ఞను పూర్తి చేశారు."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"మీరు స్క్రీన్ దిగువకు చాలా దగ్గరగా స్వైప్ చేయలేదని నిర్ధారించుకోండి."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"వెనుక సంజ్ఞ సున్నితత్వం మార్చడానికి, సెట్టింగ్‌లకు వెళ్లండి"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"వెనుకకు వెళ్లడానికి ఎడమ వైపు నుండి స్వైప్ చేయండి"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"వెనుకకు వెళ్లడానికి కుడి వైపు నుండి స్వైప్ చేయండి"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"మీరు ఉన్న చివరి స్క్రీన్‌కు తిరిగి వెళ్లడానికి, ఎడమ అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేయండి."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"కుడి అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేయడం ద్వారా మీరు చివరి స్క్రీన్‌కు తిరిగి వెళ్లవచ్చు. దీన్ని ఇప్పుడే ట్రై చేయండి."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"వెనుకకు వెళ్ళడం కోసం స్వైప్ చేయండి"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"మునుపటి స్క్రీన్‌కు తిరిగి వెళ్లడానికి, ఎడమ లేదా కుడి అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేయండి."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"మీరు స్క్రీన్ దిగువ అంచు నుండి పైకి స్వయిప్ చేస్తున్నారని నిర్ధారించుకోండి."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"బయలుదేరే ముందు మీరు పాజ్ చేయకుండా చూసుకోండి."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"మీరు నేరుగా పైకి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"మీరు సంజ్ఞలను ఎలా ఉపయోగించాలో నేర్చుకున్నారు. సంజ్ఞలను ఆఫ్ చేయడానికి, సెట్టింగ్‌లకు వెళ్లండి."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"మీరు \'యాప్‌ల మధ్య మార్పు\' సంజ్ఞను పూర్తి చేశారు."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"యాప్‌ల మధ్య మార్చడం కోసం స్వైప్ చేయండి"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"మీ స్క్రీన్ కింది వైపు నుండి పైకి స్వైప్ చేసి, హోల్డ్ చేసి, తర్వాత రిలీజ్ చేయండి."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"అంతా సిద్ధంగా ఉంది"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"తర్వాత"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"సెట్టింగ్‌లు"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"మళ్లీ ట్రై చేయండి"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"పనితీరు బాగుంది!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ట్యుటోరియల్ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"అంతా సెట్ అయింది!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"హోమ్‌కు వెళ్లడానికి పైకి స్వైప్ చేయండి"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"మీరు మీ ఫోన్‌ను ఉపయోగించడానికి సిద్ధంగా ఉన్నారు"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"యాక్సెసిబిలిటీ కోసం నావిగేషన్ సెట్టింగ్‌లు"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"షేర్ చేయండి"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"స్క్రీన్‌షాట్"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ఈ చర్యను యాప్ గానీ, మీ సంస్థ గానీ అనుమతించవు"</string>
diff --git a/quickstep/res/values-th/strings.xml b/quickstep/res/values-th/strings.xml
index 13dcb10512..b803fc9727 100644
--- a/quickstep/res/values-th/strings.xml
+++ b/quickstep/res/values-th/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"เปิดใช้แอปแนะนำแล้ว"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ปิดใช้คำแนะนำเกี่ยวกับแอปอยู่"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"แอปที่คาดว่าจะใช้: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"ปัดจากขอบด้านซ้ายสุด"</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"ตรวจสอบว่าปัดจากขอบด้านซ้ายไปตรงกลางหน้าจอ แล้วยกนิ้วขึ้น"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"ปัดจากขอบด้านขวาสุด"</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"ตรวจสอบว่าปัดจากขอบด้านขวาไปตรงกลางหน้าจอ แล้วยกนิ้วขึ้น"</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"คุณรู้วิธีปัดจากด้านซ้ายเพื่อย้อนกลับแล้ว"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"คุณรู้วิธีปัดจากด้านขวาเพื่อย้อนกลับแล้ว ต่อไปดูวิธีสลับแอป"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"คุณทำท่าทางสัมผัสเพื่อย้อนกลับเสร็จแล้ว"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ตรวจสอบว่าไม่ได้ปัดใกล้กับด้านล่างของหน้าจอมากเกินไป"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"เปลี่ยนความไวของท่าทางสัมผัสเพื่อย้อนกลับได้ที่การตั้งค่า"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"ปัดจากด้านซ้ายเพื่อย้อนกลับ"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"ปัดจากด้านขวาเพื่อย้อนกลับ"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"หากต้องการย้อนกลับไปที่หน้าจอล่าสุดที่เปิด ให้ปัดจากขอบด้านซ้ายไปตรงกลางหน้าจอ"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"กลับไปหน้าจอก่อนหน้าโดยปัดจากขอบขวาไปตรงกลางหน้าจอ ลองเลย"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"ปัดเพื่อย้อนกลับ"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"หากต้องการย้อนกลับไปที่หน้าจอล่าสุด ให้ปัดจากขอบด้านซ้ายหรือขวาไปตรงกลางหน้าจอ"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"ปัดขึ้นจากขอบด้านล่างของหน้าจอ"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"ตรวจสอบว่าไม่มีการหยุดชั่วคราวก่อนยกนิ้วขึ้น"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"ตรวจสอบว่าปัดขึ้นในแนวตรง"</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"คุณรู้วิธีใช้ท่าทางสัมผัสแล้ว หากต้องการปิดท่าทางสัมผัส ให้ไปที่การตั้งค่า"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"คุณทำท่าทางสัมผัสเพื่อสลับแอปเสร็จแล้ว"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ปัดเพื่อสลับแอป"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"ปัดขึ้นจากด้านล่างของหน้าจอค้างไว้ แล้วปล่อย"</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"เรียบร้อย"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"ถัดไป"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"การตั้งค่า"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ลองอีกครั้ง"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ดีมาก"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"บทแนะนำ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"เรียบร้อยแล้ว"</string>
-    <string name="allset_hint" msgid="459504134589971527">"ปัดขึ้นเพื่อไปที่หน้าแรก"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"คุณเริ่มใช้โทรศัพท์ได้แล้ว"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"การตั้งค่าการนำทางสำหรับการช่วยเหลือพิเศษ"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"แชร์"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ภาพหน้าจอ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"แอปหรือองค์กรของคุณไม่อนุญาตการดำเนินการนี้"</string>
diff --git a/quickstep/res/values-tl/strings.xml b/quickstep/res/values-tl/strings.xml
index eade324ed5..5e461d105f 100644
--- a/quickstep/res/values-tl/strings.xml
+++ b/quickstep/res/values-tl/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Naka-enable ang mga iminumungkahing app"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Naka-disable ang mga iminumungkahing app"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Hinulaang app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Tiyaking magsa-swipe ka mula sa pinakadulo sa kaliwa."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Tiyaking mag-swipe mula sa kaliwang gilid papunta sa gitna ng screen, saka iangat ang iyong daliri."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Tiyaking magsa-swipe ka mula sa pinakadulo sa kanan."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Tiyaking mag-swipe mula sa kanang gilid papunta sa gitna ng screen, saka iangat ang iyong daliri."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Natutunan mong mag-swipe mula sa kaliwa para bumalik."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Natuto kang mag-swipe mula sa kanan para bumalik. Sunod, alamin kung paano magpalipat-lipat ng app."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Nakumpleto mo na ang galaw para bumalik."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Tiyaking hindi ka magsa-swipe nang masyadong malapit sa ibaba ng screen."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Pumunta sa Settings para baguhin ang sensitivity ng pagbalik"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Mag-swipe mula sa kaliwa para bumalik"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Mag-swipe mula sa kanan para bumalik"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Mag-swipe mula sa kaliwang gilid papunta sa gitna para bumalik sa nakaraang screen na pinuntahan mo."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Puwede ka ring mag-swipe mula kanan papuntang gitna para bumalik sa naunang screen. Subukan na ito."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Mag-swipe para bumalik"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Para bumalik sa nakaraang screen, mag-swipe mula sa kaliwa o kanang gilid patungo sa gitna ng screen."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Tiyaking magsa-swipe ka pataas mula sa pinakaibaba ng screen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Tiyaking hindi ka magpo-pause bago iangat ang iyong daliri."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Tiyaking magsa-swipe ka nang diretso pataas."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Alam mo na kung paano gumamit ng mga galaw. Para i-off ang mga galaw, pumunta sa Mga Setting."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Nakumpleto mo na ang galaw para magpalipat-lipat sa mga app."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Mag-swipe para lumipat ng app"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Mag-swipe pataas mula sa ibaba ng iyong screen, mag-hold, pagkatapos ay bitawan ito."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Handa na ang lahat"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Susunod"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Mga Setting"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Subukan ulit"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Magaling!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Handa na lahat!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Mag-swipe pataas para pumunta sa home"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Handa mo nang simulan ang paggamit sa iyong telepono"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Mga setting ng navigation para sa accessibility"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Ibahagi"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Hindi pinapayagan ng app o ng iyong organisasyon ang pagkilos na ito"</string>
diff --git a/quickstep/res/values-tr/strings.xml b/quickstep/res/values-tr/strings.xml
index d9b4db3620..372e45d6df 100644
--- a/quickstep/res/values-tr/strings.xml
+++ b/quickstep/res/values-tr/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Uygulama önerileri etkinleştirildi"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Uygulama önerileri devre dışı bırakıldı"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Tahmin edilen uygulama: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Ekranın en solundan kaydırdığınızdan emin olun."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Sol kenardan ekranın ortasına doğru kaydırıp bıraktığınızdan emin olun."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Ekranın en sağından kaydırdığınızdan emin olun."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Sağ kenardan ekranın ortasına doğru kaydırıp bıraktığınızdan emin olun."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Geri dönmek için soldan kaydırmayı öğrendiniz."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Geri dönmek için sağdan kaydırmayı öğrendiniz. Sırada uygulamalar arasında geçiş yapma var."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Geri dön hareketini tamamladınız."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ekranın alt kısmına çok yakın bir şekilde kaydırmadığınızdan emin olun."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Geri hareketinin hassasiyetini değiştirmek için Ayarlar\'a gidin"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Geri gitmek için soldan kaydırın"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Geri gitmek için sağdan kaydırın"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Görüntülediğiniz son ekrana dönmek için sol kenardan ekranın ortasına doğru kaydırın."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"İsterseniz sağ kenardan ekranın ortasına doğru kaydırarak son ekrana dönebilirsiniz. Şimdi deneyin."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Geri dönmek için kaydırın"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Son ekrana geri gitmek için sol veya sağ kenardan ekranın ortasına doğru kaydırın."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Ekranın alt kenarından yukarı kaydırdığınızdan emin olun."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Bırakmadan önce parmağınızı duraklatmadığınızdan emin olun."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Düz bir şekilde yukarı kaydırdığınızdan emin olun."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Hareketleri nasıl kullanacağınızı öğrendiniz. Hareketleri kapatmak için Ayarlar\'a gidin."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Uygulamalar arasında geçiş yapma hareketini tamamladınız."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Uygulamalar arasında geçiş yapmak için kaydırma"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Ekranınızın alt tarafından yukarı doğru kaydırın, tutun ve sonra bırakın."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Hepsi bu kadar"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"İleri"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Ayarlar"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Tekrar deneyin"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Güzel!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Eğitim <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"İşlem tamam!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Ana ekrana gitmek için yukarı kaydırın"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Telefonunuzu kullanmaya hazırsınız"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Erişilebilirlik için gezinme ayarları"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Paylaş"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Ekran görüntüsü"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Uygulamanız veya kuruluşunuz bu işleme izin vermiyor"</string>
diff --git a/quickstep/res/values-uk/strings.xml b/quickstep/res/values-uk/strings.xml
index c1ab0d8b5e..a6fc4537c5 100644
--- a/quickstep/res/values-uk/strings.xml
+++ b/quickstep/res/values-uk/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Рекомендовані додатки ввімкнено"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Рекомендовані додатки вимкнено"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Передбачений додаток: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Проведіть пальцем саме від лівого краю екрана."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Проведіть пальцем від лівого краю до середини екрана й підніміть палець."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Проведіть пальцем саме від правого краю екрана."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Проведіть пальцем від правого краю до середини екрана й підніміть палець."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Ви навчилися проводити пальцем зліва направо, щоб повертатися."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Ви вмієте проводити пальцем справа наліво, щоб повертатися. Дізнайтеся, як переходити між додатками."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ви виконали жест \"Назад\"."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Не проводьте пальцем надто близько до нижнього краю екрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Щоб змінити чутливість жесту \"Назад\", відкрийте налаштування"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Щоб повернутися, проведіть пальцем зліва направо"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Щоб повернутися, проведіть пальцем справа наліво"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Щоб перейти на попередній екран, проведіть пальцем від лівого краю до середини екрана."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Щоб повернутися, проведіть пальцем від правого краю до середини екрана. Спробуйте зараз."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Щоб повернутися, проведіть пальцем по екрану"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Щоб перейти на попередній екран, проведіть пальцем від лівого чи правого краю до середини екрана."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Проведіть пальцем угору від нижнього краю екрана."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Не робіть паузу перед тим, як відірвати палець від екрана."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Проводьте пальцем вертикально вгору."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Ви вивчили жести. Щоб вимкнути їх, перейдіть у налаштування."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Ви виконали жест переходу в інший додаток."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Проведіть пальцем, щоб перейти в інший додаток"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Проведіть пальцем вгору від низу екрана, утримуйте палець на екрані, а потім відпустіть."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Усе готово!"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Далі"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Налаштування"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Спробуйте ще"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Чудово!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Навчальний посібник <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Готово."</string>
-    <string name="allset_hint" msgid="459504134589971527">"Щоб перейти на головний екран, проведіть пальцем угору"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Тепер ви можете користуватися телефоном"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Налаштування навігації для спеціальних можливостей"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Поділитися"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Знімок екрана"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Ця дія заборонена додатком або адміністратором організації"</string>
diff --git a/quickstep/res/values-ur/strings.xml b/quickstep/res/values-ur/strings.xml
index 7c01ed6b46..292fdc7dac 100644
--- a/quickstep/res/values-ur/strings.xml
+++ b/quickstep/res/values-ur/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ایپ کی تجاویز فعال ہیں"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ایپ کی تجاویز غیر فعال ہیں"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"پیشن گوئی کردہ ایپ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"اس بات کو یقینی بنائیں کہ آپ بائیں کنارے سے دور سے سوائپ کریں۔"</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"یقینی طور پر بائیں کنارے سے اسکرین کے وسط تک سوائپ کریں اور پھر اپنی انگلی اٹھا لیں۔"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"اس بات کو یقینی بنائیں کہ آپ دائیں کنارے سے دور سے سوائپ کریں۔"</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"یقینی طور پر دائیں کنارے سے اسکرین کے وسط تک سوائپ کریں اور پھر اپنی انگلی اٹھا لیں۔"</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"آپ نے واپس جانے کے لیے بائیں کنارے سے سوائپ کرنے کا طریقہ سیکھ لیا۔"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"آپ نے واپس جانے کے لیے دائیں کنارے سے سوائپ کرنے کا طریقہ سیکھ لیا۔ اس کے بعد ایپس سوئچ کرنے کا طریقہ جانیں۔"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"آپ نے واپس جائیں اشارے کو مکمل کر لیا۔"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"اس بات کو یقینی بنائیں کہ آپ اسکرین کے نچلے حصے سے زیادہ قریب سے سوائپ نہ کریں۔"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"پچھلے اشارے کی حساسیت تبدیل کرنے کے لیے ترتیبات پر جائیں"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"واپس جانے کے لیے بائیں کنارے سے سوائپ کریں"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"واپس جانے کے لیے دائیں کنارے سے سوائپ کریں"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"پچھلی اسکرین جس پر آپ تھے اس پر واپس جانے کے لیے بائیں کنارے سے اسکرین کے وسط تک سوائپ کریں۔"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"آپ دائیں کنارے سے اسکرین کے وسط تک سوائپ کر کے پچھلی اسکرین پر واپس بھی جا سکتے ہیں۔ اسے ابھی آزمائیں۔"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"واپس جانے کے لیے سوائپ کریں"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"پچھلی اسکرین پر واپس جانے کے لیے بائیں یا دائیں کنارے سے اسکرین کے وسط تک سوائپ کریں۔"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"اس بات کو یقینی بنائیں کہ آپ اسکرین کے نچلے کنارے سے اوپر کی طرف سوائپ کریں۔"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"اس بات کو یقینی بنائیں کہ آپ اپنی انگلی اوپر اٹھانے سے پہلے موقوف نہ کریں۔"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"اس بات کو یقینی بنائیں کہ آپ سیدھا اوپر کی طرف سوائپ کریں۔"</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"آپ نے اشاروں کو استعمال کرنے کا طریقہ سیکھ لیا۔ اشاروں کو آف کرنے کے لیے ترتیبات پر جائیں۔"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"آپ نے ایپس کو سوئچ کرنے کا اشارہ مکمل کر لیا۔"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ایپس سوئچ کرنے کے لیے سوائپ کریں"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"اپنی اسکرین کے نچلے حصے سے اوپر کی طرف سوائپ کریں، پکڑ کر رکھیں، پھر چھوڑ دیں۔"</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"سب ہو گیا"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"آگے"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ترتیبات"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"پھر کوشش کریں"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"عمدہ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ٹیوٹوریل <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"سب کچھ تیار ہے!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"ہوم پر جانے کے لیے اوپر سوائپ کریں"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"آپ اپنا فون استعمال شروع کرنے کے لیے تیار ہیں"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"ایکسیسبیلٹی کے لئے نیویگیشن کی ترتیبات"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"اشتراک کریں"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"اسکرین شاٹ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ایپ یا آپ کی تنظیم کی جانب سے اس کارروائی کی اجازت نہیں ہے"</string>
diff --git a/quickstep/res/values-uz/strings.xml b/quickstep/res/values-uz/strings.xml
index b5321706c3..e666554ed4 100644
--- a/quickstep/res/values-uz/strings.xml
+++ b/quickstep/res/values-uz/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Ilova tavsiyalari yoqildi"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Endi ilova takliflari chiqmaydi"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Taklif etilgan ilova: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Ekranning chap chetidan boshlab oʻngga suring."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Barmoqni ekranning chap chetidan oʻrtasigacha suring va ekrandan uzing."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Ekran chetidan boshlab oʻngdan chapga suring"</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Barmoqni ekranning oʻng chetidan oʻrtasigacha suring va ekrandan uzing."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Ortga qaytish uchun chapdan surishni oʻrgandingiz."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Ortga qaytish uchun oʻngdan surishni oʻrgandingiz. Endi ilovalarni almashtirishni oʻrganamiz."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ortga qaytish ishorasi darsini tamomladingiz."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Barmoqni ekran pastiga yaqin surmaslikka harakat qiling."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Orqaga ishorasi sezuvchanligi Sozlamalardan oʻzgartiriladi"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Orqaga qaytish uchun chapdan suring"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Orqaga qaytish uchun oʻngdan chapga suring"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Oxirgi ekranga qaytish uchun barmoqni ekranning chap chekkasidan oʻrtasigacha suring."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Shuningdek, oʻng chetdan ekran oʻrtasiga surish orqali ham oxirgi ekranga qaytish mumkin. Hoziroq sinang."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Ortga qaytish uchun suring"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Ortga qaytish uchun barmoqni ekranning yon chekkalaridan oʻrtasigacha suring."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Barmoqni ekranning pastki chetidan yuqoriga suring."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Barmoqni ekrandan pauzasiz qoʻyib uzing."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Barmoqni tik tepaga suring."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Ishoralardan qanday foydalanishni oʻrganib oldingiz. Ishoralarni oʻchirish uchun Sozlamalarga kiring."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Ilovalarni almashtirish darsini tamomladingiz."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Svayp bilan ilovalarni almashtirish"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Ekranning pastidan tepasiga suring, bosib turing va qoʻyib yuboring."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Tayyor"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Keyingisi"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Sozlamalar"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Qayta urinish"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Yaxshi!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Darslik: <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Hammasi tayyor!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Boshiga qaytish uchun tepaga suring"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Telefoningiz xizmatga tayyor"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Maxsus imkoniyatlar uchun navigatsiya sozlamalari"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Ulashish"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Skrinshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Bu amal ilova yoki tashkilotingiz tomonidan taqiqlangan"</string>
diff --git a/quickstep/res/values-vi/strings.xml b/quickstep/res/values-vi/strings.xml
index 13f1a10a27..963e7aeb8b 100644
--- a/quickstep/res/values-vi/strings.xml
+++ b/quickstep/res/values-vi/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Đã bật tính năng Ứng dụng đề xuất"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Tính năng Ứng dụng đề xuất bị tắt"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Ứng dụng dự đoán: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Hãy vuốt từ mép ngoài cùng bên trái."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Hãy vuốt từ mép trái tới chính giữa màn hình rồi nhấc ngón tay."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Hãy vuốt từ mép ngoài cùng bên phải."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Hãy vuốt từ mép phải tới chính giữa màn hình rồi nhấc ngón tay."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Bạn đã tìm hiểu cách vuốt từ mép trái để quay lại."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Bạn đã tìm hiểu cách vuốt từ mép phải để quay lại. Tiếp theo, hãy tìm hiểu cách chuyển đổi ứng dụng."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Bạn đã thực hiện xong cử chỉ quay lại."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Hãy nhớ không được vuốt quá gần phần cuối màn hình."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Để thay đổi độ nhạy của cử chỉ quay lại, hãy vào mục Cài đặt"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Vuốt từ mép trái để quay lại"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Vuốt từ mép phải để quay lại"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Để quay lại màn hình gần đây nhất mà bạn xem, hãy vuốt từ mép trái tới giữa màn hình."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Bạn cũng có thể vuốt từ mép phải tới giữa màn hình để quay lại màn hình gần đây nhất. Hãy thử ngay."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Hãy vuốt để quay lại"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Để quay lại màn hình gần đây nhất, hãy vuốt từ mép trái hoặc mép phải tới chính giữa màn hình."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Hãy vuốt lên từ mép dưới cùng của màn hình."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Hãy nhớ không được tạm dừng trước khi nhấc ngón tay."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Hãy vuốt thẳng lên."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Bạn đã tìm hiểu cách sử dụng cử chỉ. Để tắt cử chỉ, hãy chuyển đến phần Cài đặt."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Bạn đã thực hiện xong cử chỉ chuyển đổi ứng dụng."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Vuốt để chuyển đổi ứng dụng"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Vuốt lên từ cuối màn hình, giữ rồi thả tay ra."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Đã hoàn tất"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Tiếp theo"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Cài đặt"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Thử lại"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Tuyệt vời!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Hướng dẫn <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Đã hoàn tất!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Vuốt lên để chuyển đến màn hình chính"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Hiện giờ, bạn đã có thể sử dụng điện thoại"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Chế độ cài đặt di chuyển cho tính năng hỗ trợ tiếp cận"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Chia sẻ"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Chụp ảnh màn hình"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Ứng dụng hoặc tổ chức của bạn không cho phép thực hiện hành động này"</string>
diff --git a/quickstep/res/values-zh-rCN/strings.xml b/quickstep/res/values-zh-rCN/strings.xml
index f026baff3b..e777ede3ad 100644
--- a/quickstep/res/values-zh-rCN/strings.xml
+++ b/quickstep/res/values-zh-rCN/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"已启用应用建议"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"已停用应用建议"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"预测的应用：<xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"请从最左侧边缘开始滑动。"</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"请从左侧边缘滑动到屏幕中间位置后再松开手指。"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"请从最右侧边缘开始滑动。"</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"请从右侧边缘滑动到屏幕中间位置后再松开手指。"</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"您已了解如何使用“从左侧向右滑动”手势返回。"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"您已了解如何使用“从右侧向左滑动”手势返回。接下来了解如何切换应用。"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"您完成了“返回”手势教程。"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"滑动时，手的位置不要太靠近屏幕底部。"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"如要调节“返回”手势的灵敏度，请转到“设置”"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"从左侧向右滑动手指即可返回"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"从右侧向左滑动手指即可返回"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"如要返回您查看过的上一个屏幕，请从左侧边缘滑动到屏幕中间位置。"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"如要返回上一个屏幕，您也可以从右侧边缘滑动到屏幕中间位置。现在就试试看吧。"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"滑动即可返回"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"如要返回上一个屏幕，请从左侧或右侧边缘滑动到屏幕中间位置。"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"请从屏幕底部边缘向上滑动。"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"在松开手指前请勿停下来。"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"请向上滑动。"</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"您已了解如何使用手势了。如要关闭手势，请转到“设置”。"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"您完成了“切换应用”手势教程。"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"滑动即可切换应用"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"从屏幕底部向上滑动后按住，然后松开。"</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"大功告成"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"继续"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"设置"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"重试"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"很好！"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"教程 <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"设置完毕！"</string>
-    <string name="allset_hint" msgid="459504134589971527">"向上滑动可转到主屏幕"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"您可以开始使用手机了"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"无障碍功能的导航设置"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"分享"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"屏幕截图"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"该应用或您所在的单位不允许执行此操作"</string>
diff --git a/quickstep/res/values-zh-rHK/strings.xml b/quickstep/res/values-zh-rHK/strings.xml
index 81989d11ff..cae910924e 100644
--- a/quickstep/res/values-zh-rHK/strings.xml
+++ b/quickstep/res/values-zh-rHK/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"已啟用應用程式建議"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"已停用應用程式建議"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"預測應用程式：<xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"請從螢幕左側邊緣滑動。"</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"請從螢幕左側邊緣往中央滑動，然後放開手指。"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"請從螢幕右側邊緣滑動。"</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"請從螢幕右側邊緣往中央滑動，然後放開手指"</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"您已瞭解如何使用「由左向右滑動」手勢返回。"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"您已瞭解如何透過「由右向左滑動」手勢返回。接下來一起瞭解如何切換應用程式。"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"您已完成「返回」手勢的教學課程。"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"滑動時，手的位置不要太接近螢幕底部。"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"如要變更「返回」手勢的敏感度，請前往「設定」"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"從螢幕左側往右滑動即可返回"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"由右向左滑動即可返回"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"如要返回上一個畫面，請從螢幕左側往中央滑動。"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"從螢幕右側往中央滑動亦可返回上一個畫面。立即試試吧。"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"滑動即可返回"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"如要返回上一個畫面，請從螢幕左側或右側邊緣往中央滑動。"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"請從螢幕底部邊緣向上滑動。"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"放開手指前請勿停下來。"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"請向上滑動。"</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"您已學會如何使用手勢。如要關閉手勢，請前往「設定」。"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"您已完成「切換應用程式」手勢的教學課程。"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"滑動即可切換應用程式"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"從螢幕底部向上滑動並按住，然後放開。"</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"大功告成"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"繼續"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"設定"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"再試一次"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"做得好！"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"教學課程 <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"設定完成！"</string>
-    <string name="allset_hint" msgid="459504134589971527">"向上滑動即可前往主畫面"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"您可以開始使用手機了"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"無障礙功能導覽設定"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"分享"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"螢幕截圖"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"應用程式或您的機構不允許此操作"</string>
diff --git a/quickstep/res/values-zh-rTW/strings.xml b/quickstep/res/values-zh-rTW/strings.xml
index 51bb189cd8..067af93710 100644
--- a/quickstep/res/values-zh-rTW/strings.xml
+++ b/quickstep/res/values-zh-rTW/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"應用程式建議功能已啟用"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"應用程式建議功能已停用"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"預測的應用程式：<xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"請從螢幕左側邊緣滑動。"</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"請從螢幕左側邊緣往中央滑動，然後放開手指。"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"請從螢幕右側邊緣滑動。"</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"請從螢幕右側邊緣往中央滑動，然後放開手指。"</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"你已瞭解如何使用「由左向右滑動」手勢返回。"</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"你已瞭解如何透過「由右向左滑動」手勢返回。接著，一起來瞭解如何切換應用程式。"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"你已完成「返回」手勢的教學課程。"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"滑動時，手的位置不要太接近螢幕底部。"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"如要變更「返回」手勢的敏感度，請前往「設定」"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"從螢幕左側往右滑動即可返回"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"由右向左滑動即可返回"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"如要返回先前的畫面，請從螢幕左側往中央滑動。"</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"從螢幕右側往中央滑動也可返回上一個畫面。現在就試試看吧！"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"滑動即可返回"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"如要返回上一個畫面，請從螢幕左側或右側邊緣往中央滑動。"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"請從螢幕底部邊緣向上滑動。"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"放開手指前請勿停下來。"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"請向上滑動。"</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"你已瞭解如何使用手勢了。如要關閉手勢，請前往「設定」。"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"你已完成「切換應用程式」手勢的教學課程。"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"使用滑動手勢切換應用程式"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"從螢幕底部向上滑動並按住，然後放開。"</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"大功告成"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"繼續"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"設定"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"重試"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"很好！"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"教學課程 <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"設定完成！"</string>
-    <string name="allset_hint" msgid="459504134589971527">"向上滑動即可前往主畫面"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"你可以開始使用手機了"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"無障礙工具的導覽設定"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"分享"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"螢幕截圖"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"這個應用程式或貴機構不允許執行這個動作"</string>
diff --git a/quickstep/res/values-zu/strings.xml b/quickstep/res/values-zu/strings.xml
index 1cfcb933df..da13a7ca07 100644
--- a/quickstep/res/values-zu/strings.xml
+++ b/quickstep/res/values-zu/strings.xml
@@ -45,19 +45,16 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Iziphakamiso zohlelo lokusebenza zinikwe amandla"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Iziphakamiso zohlelo lokusebenza zikhutshaziwe"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Uhlelo lokusebenza olubikezelwe: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_left_edge" msgid="340972404868601012">"Qiniseka ukuthi uswayiphela ekudeni emngceleni ongakwesobunxele."</string>
-    <string name="back_gesture_feedback_cancelled_left_edge" msgid="6671316150388702530">"Qiniseka ukuthi uswayipha kusuka emngceleni okwesobunxele kuya phakathi kwesikrini bese uyadedela."</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_right_edge" msgid="4306700023773832353">"Qiniseka ukuthi uswayiphela ekudeni emngceleni ongakwesokudla."</string>
-    <string name="back_gesture_feedback_cancelled_right_edge" msgid="4951916546256902552">"Qiniseka ukuthi uswayipha kusuka emngceleni okwesokudla kuya phakathi kwesikrini bese uyadedela."</string>
-    <string name="back_gesture_feedback_complete_with_back_right_follow_up" msgid="2100639504811809267">"Ufunde indlela yokuswayipha kusuka kwesokunxele ukuze ubuyele emuva."</string>
+    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
+    <skip />
+    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
+    <skip />
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Ufunde indlela yokuswayipha kusuka kwesokudla ukuze ubuyele emuva. Ngokulandelayo, funda indlela yokushintsha ama-app."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ukuqedile ukuthinta kokubuyela emuva."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Qiniseka ukuba awuswayipheli eduze kakhulu naphansi kwesikrini."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Ukuze ushintshe ukuzwela kokuthinta emuva, iya Kumasethingi"</string>
-    <string name="back_left_gesture_intro_title" msgid="5197184481779330065">"Swayipha kusuka kwesobunxele ukuze ubuyele emuva"</string>
-    <string name="back_right_gesture_intro_title" msgid="7431951986971898074">"Swayipha kusuka kwesokudla ukubuyela emuva"</string>
-    <string name="back_left_gesture_intro_subtitle" msgid="7672761376577628602">"Ukuze ubuyele esikrinini sangaphambilini lapho ubukade ukhona, swayipha kusuka kunqenqema lwesokunxele ukuya maphakathi nesikrini."</string>
-    <string name="back_right_gesture_intro_subtitle" msgid="2735828029197816509">"Futhi ungabuyela emuva esikrinini sangaphambilini ngokuswayipha kusuka kunqenqema langakwesokudla ukuya maphakathi nesikrini. Izame manje."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Swayipha ukuze uye emuva"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Ukuze ubuyele emuva esikrinini sokugcina, swapha kusuka emngceleni wesobunxele noma wesokudla kuya phakathi kwesikrini."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Qiniseka ukuthi uswayiphela phezulu kusuka emngceleni ophansi wesikrini."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Qiniseka ukuthi awumisi ngaphambi kokudedela."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Qiniseka ukuthi uswayiphela ngqo phezulu."</string>
@@ -71,17 +68,21 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Ufunde ukusebenzisa ukuthinta. Ukuze uvale ukuthinta, iya kokuthi Amasethingi."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Ukuqedile ukuthinta kokushintsha ama-app."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swayipha ukuze ushintshe ama-app"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="1579517193845186042">"Swayiphela phezulu kusuka ngezansi kwesikrini sakho, ubambe, bese udedele."</string>
+    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
+    <skip />
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Konke kusethiwe"</string>
-    <string name="gesture_tutorial_action_button_label_next" msgid="2556263116424738762">"Okulandelayo"</string>
+    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
+    <skip />
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Amasethingi"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Zama futhi"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Kuhle!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Okokufundisa <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Konke kusethiwe!"</string>
-    <string name="allset_hint" msgid="459504134589971527">"Swayiphela phezulu ukuze uye ekhaya"</string>
+    <!-- no translation found for allset_hint (2384632994739392447) -->
+    <skip />
     <string name="allset_description" msgid="6350320429953234580">"Usulungele ukuqala ukusebenzisa ifoni yakho"</string>
-    <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Amasethingi wokufinyelela ukuzulazula"</annotation></string>
+    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
+    <skip />
     <string name="action_share" msgid="2648470652637092375">"Yabelana"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Isithombe-skrini"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Lesi senzo asivunyelwanga uhlelo lokusebenza noma inhlangano yakho"</string>
-- 
GitLab


From 1f96ec3ba1d19f4f5185ace97a2296186109a0b5 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 14 Jul 2021 04:27:32 +0000
Subject: [PATCH 1606/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Id6b12fc5d2365c9bddbe1406006c404021463c9f
---
 res/values-af/strings.xml        | 2 ++
 res/values-am/strings.xml        | 2 ++
 res/values-ar/strings.xml        | 2 ++
 res/values-as/strings.xml        | 2 ++
 res/values-az/strings.xml        | 2 ++
 res/values-b+sr+Latn/strings.xml | 2 ++
 res/values-be/strings.xml        | 2 ++
 res/values-bg/strings.xml        | 2 ++
 res/values-bn/strings.xml        | 2 ++
 res/values-bs/strings.xml        | 2 ++
 res/values-ca/strings.xml        | 2 ++
 res/values-cs/strings.xml        | 2 ++
 res/values-da/strings.xml        | 2 ++
 res/values-de/strings.xml        | 2 ++
 res/values-el/strings.xml        | 2 ++
 res/values-en-rAU/strings.xml    | 2 ++
 res/values-en-rCA/strings.xml    | 2 ++
 res/values-en-rGB/strings.xml    | 2 ++
 res/values-en-rIN/strings.xml    | 2 ++
 res/values-en-rXC/strings.xml    | 1 +
 res/values-es-rUS/strings.xml    | 2 ++
 res/values-es/strings.xml        | 2 ++
 res/values-et/strings.xml        | 2 ++
 res/values-eu/strings.xml        | 2 ++
 res/values-fa/strings.xml        | 2 ++
 res/values-fi/strings.xml        | 2 ++
 res/values-fr-rCA/strings.xml    | 2 ++
 res/values-fr/strings.xml        | 2 ++
 res/values-gl/strings.xml        | 2 ++
 res/values-gu/strings.xml        | 2 ++
 res/values-hi/strings.xml        | 2 ++
 res/values-hr/strings.xml        | 2 ++
 res/values-hu/strings.xml        | 2 ++
 res/values-hy/strings.xml        | 2 ++
 res/values-in/strings.xml        | 2 ++
 res/values-is/strings.xml        | 2 ++
 res/values-it/strings.xml        | 2 ++
 res/values-iw/strings.xml        | 2 ++
 res/values-ja/strings.xml        | 2 ++
 res/values-ka/strings.xml        | 2 ++
 res/values-kk/strings.xml        | 2 ++
 res/values-km/strings.xml        | 2 ++
 res/values-kn/strings.xml        | 2 ++
 res/values-ko/strings.xml        | 4 +++-
 res/values-ky/strings.xml        | 2 ++
 res/values-lo/strings.xml        | 2 ++
 res/values-lt/strings.xml        | 2 ++
 res/values-lv/strings.xml        | 2 ++
 res/values-mk/strings.xml        | 2 ++
 res/values-ml/strings.xml        | 2 ++
 res/values-mn/strings.xml        | 2 ++
 res/values-mr/strings.xml        | 2 ++
 res/values-ms/strings.xml        | 2 ++
 res/values-my/strings.xml        | 2 ++
 res/values-nb/strings.xml        | 2 ++
 res/values-ne/strings.xml        | 2 ++
 res/values-nl/strings.xml        | 2 ++
 res/values-or/strings.xml        | 2 ++
 res/values-pa/strings.xml        | 2 ++
 res/values-pl/strings.xml        | 2 ++
 res/values-pt-rPT/strings.xml    | 2 ++
 res/values-pt/strings.xml        | 2 ++
 res/values-ro/strings.xml        | 2 ++
 res/values-ru/strings.xml        | 2 ++
 res/values-si/strings.xml        | 2 ++
 res/values-sk/strings.xml        | 2 ++
 res/values-sl/strings.xml        | 2 ++
 res/values-sq/strings.xml        | 2 ++
 res/values-sr/strings.xml        | 2 ++
 res/values-sv/strings.xml        | 2 ++
 res/values-sw/strings.xml        | 2 ++
 res/values-ta/strings.xml        | 2 ++
 res/values-te/strings.xml        | 2 ++
 res/values-th/strings.xml        | 2 ++
 res/values-tl/strings.xml        | 2 ++
 res/values-tr/strings.xml        | 2 ++
 res/values-uk/strings.xml        | 2 ++
 res/values-ur/strings.xml        | 2 ++
 res/values-uz/strings.xml        | 2 ++
 res/values-vi/strings.xml        | 2 ++
 res/values-zh-rCN/strings.xml    | 6 ++++--
 res/values-zh-rHK/strings.xml    | 2 ++
 res/values-zh-rTW/strings.xml    | 2 ++
 res/values-zu/strings.xml        | 2 ++
 84 files changed, 170 insertions(+), 3 deletions(-)

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index b0f0dcbbdb..ecab6afd42 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g>-legstuk"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Raak en hou die legstuk om dit op die Tuisskerm rond te beweeg"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Voeg by Tuisskerm"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> legstukke</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> legstuk</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index f1ed7c51d4..a0b2a988b6 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"የ<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ምግብር"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"በመነሻ ገጽ አካባቢ ላይ ለማንቀሳቀስ ነክተው ይያዙት"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ወደ መነሻ ገጽ አክል"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ንዑስ ፕሮግራሞች</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ንዑስ ፕሮግራሞች</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index bd517582b9..9e5360caa1 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"أداة <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"يمكنك النقر على الأداة مع الاستمرار لتحريكها على الشاشة الرئيسية."</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"إضافة إلى الشاشة الرئيسية"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="zero"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> أداة</item>
       <item quantity="two">أداتان (<xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g>)</item>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index b92099e315..f611529597 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ৱিজেট"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ৱিজেটটো গৃহ স্ক্ৰীনৰ আশে-পাশে নিবলৈ সেইটোত স্পৰ্শ কৰি ধৰি ৰাখক"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"গৃহ স্ক্ৰীনত যোগ কৰক"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> টা ৱিজেট</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> টা ৱিজেট</item>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 4bca9c69a3..eb3a82127c 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> vidceti"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Əsas ekranda hərəkət etdirmək üçün vidcetə toxunub saxlayın"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Əsas ekrana əlavə edin"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidcet</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> vidcet</item>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index d173194772..52734cda29 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> vidžet"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Dodirnite i zadržite vidžet da biste ga pomerali po početnom ekranu"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Dodaj na početni ekran"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidžet</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidžeta</item>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index d61861050d..1389e48afa 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Віджэт \"<xliff:g id="WIDGET_NAME">%1$s</xliff:g>\""</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Утрымліваючы віджэт націснутым, перамяшчайце яго па Галоўным экране"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Дадаць на Галоўны экран"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> віджэт</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> віджэты</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 4fb9eae843..967eda0d5f 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> приспособление"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Докоснете приспособлението и го задръжте, за да го местите по началния екран"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Добавяне към началния екран"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> приспособления</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> приспособление</item>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 167f0cab27..d74097578b 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g>টি উইজেট"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"হোম স্ক্রিনের যেকোনও জায়গায় উইজেটটি নিয়ে যেতে, টাচ করে ধরে থাকুন"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"হোম স্ক্রিনে যোগ করুন"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g>টি উইজেট</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g>টি উইজেট</item>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index f8dd8f1b49..b9a3b1d59c 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Vidžet <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Dodirnite i držite vidžet da ga pomjerate po Početnom ekranu"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Dodaj na početni ekran"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidžet</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidžeta</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index c913171e54..f95c037fc1 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget de <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Mantén premut el widget per moure\'l per la pantalla d\'inici"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Afegeix a la pantalla d\'inici"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index d5034ddd94..315ad1a822 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Pokud chcete widgetem pohybovat po ploše, podržte ho"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Přidat na plochu"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgety</item>
       <item quantity="many"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgetu</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 641b754c28..5d8bab57c0 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widgetten <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Hold widgetten nede for at flytte den rundt på startskærmen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Føj til startskærm"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 862b3f51af..1978f8bd85 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget „<xliff:g id="WIDGET_NAME">%1$s</xliff:g>“"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Wenn du das Widget auf dem Startbildschirm verschieben möchtest, halte es gedrückt"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Zum Startbildschirm hinzufügen"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> Widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> Widget</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 71ffdaf82d..04c3acc971 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Γραφικό στοιχείο <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Αγγίξτε παρατεταμένα το γραφικό στοιχείο για να το μετακινήσετε στην Αρχική οθόνη"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Προσθήκη στην Αρχική οθόνη"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> γραφικά στοιχεία</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> γραφικό στοιχείο</item>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 6ad7864282..da80b1b37d 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Touch and hold the widget to move it around the home screen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Add to home screen"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 6ad7864282..da80b1b37d 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Touch and hold the widget to move it around the home screen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Add to home screen"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 6ad7864282..da80b1b37d 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Touch and hold the widget to move it around the home screen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Add to home screen"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 6ad7864282..da80b1b37d 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Touch and hold the widget to move it around the home screen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Add to home screen"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index b6f01cea4d..42aa24036c 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -35,6 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‎‏‎‎‏‎‎‎‏‏‎‎‏‎‏‎‏‎‏‎‎‎‎‎‎‎‎‎‎‏‏‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="WIDGET_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ widget‎‏‎‎‏‎"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‎‎‎‎‏‎‎‎‏‏‎‎‎‏‎‏‎‎‏‏‏‎‏‎Touch &amp; hold the widget to move it around the Home screen‎‏‎‎‏‎"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‏‎‏‏‎‏‏‎‎‎‎‏‏‎‏‎‏‏‎‎‏‎‏‎‎‏‎‏‎‏‎‎‏‏‏‎‏‏‏‎‎‎‏‏‎‎‏‎‎‎Add to Home screen‎‏‎‎‏‎"</string>
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‎‎‎‏‎‎‎‏‎‏‎‎‏‎‎‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‎‏‎‏‏‏‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="WIDGET_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ widget added to home screen‎‏‎‎‏‎"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‏‏‏‎‏‎‏‏‎‎‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‏‎‎‎‎‏‎‏‏‎‎‎‏‎‎‏‎‏‎‏‏‏‎‎‎‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g>‎‏‎‎‏‏‏‎ widgets‎‏‎‎‏‎</item>
       <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‏‏‏‎‏‎‏‏‎‎‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‏‎‎‎‎‏‎‏‏‎‎‎‏‎‎‏‎‏‎‏‏‏‎‎‎‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g>‎‏‎‎‏‏‏‎ widget‎‏‎‎‏‎</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index bf95309e4c..b0381f86d1 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Mantén presionado el widget para moverlo por la pantalla principal"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Agregar a pantalla principal"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index c923de1c24..9f8818e5ce 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget de <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Mantén pulsado el widget para moverlo por la pantalla de inicio"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Añadir a la pantalla de inicio"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index afca593a74..e4018a5724 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Vidin <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Vidina teisaldamiseks avakuval puudutage vidinat ja hoidke seda all"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Lisa avakuvale"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidinat</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> vidin</item>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 2f67e22f9f..6e11a7c9e9 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widgeta"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Eduki sakatuta widgeta hasierako pantailan zehar mugitzeko"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Gehitu hasierako pantailan"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 35ba9dfa68..e2aaae6b6a 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"ابزارک <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ابزارک را لمس کنید و نگه دارید تا آن را در صفحه اصلی حرکت دهید"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"افزودن به صفحه اصلی"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ابزارک</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ابزارک</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index aac8bb8f85..10f18fff75 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Voit siirtää widgetiä aloitusnäytöllä koskettamalla sitä pitkään"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Lisää aloitusnäytölle"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgetiä</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 3c53df5dd0..ee43b45b70 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Maintenez le doigt sur le widget pour le déplacer sur l\'écran d\'accueil"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Ajouter à l\'écran d\'accueil"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index dfc103f39d..e07c34e6fc 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Appuyez de manière prolongée sur le widget pour le déplacer sur l\'écran d\'accueil"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Ajouter à l\'écran d\'accueil"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 0260453c77..1eeaf30c60 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Mantén premido o widget para movelo pola pantalla de inicio"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Engadir á pantalla de inicio"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 7f38842d36..978eeea40d 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> વિજેટ"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"વિજેટને હોમ સ્ક્રીનની આજુબાજુ ખસેડવા માટે, તેને ટચ કરીને થોડીવાર દબાવી રાખો"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"હોમ સ્ક્રીન પર ઉમેરો"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> વિજેટ</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> વિજેટ</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index f5b371d893..6e04246df8 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> विजेट"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"होम स्क्रीन पर यहां-वहां ले जाने के लिए विजेट को दबाकर रखें"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"होम स्क्रीन पर जोड़ें"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> विजेट</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> विजेट</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 35cb69ed60..7561e9586a 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Dodirnite i zadržite widget da biste ga pomicali po početnom zaslonu"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Dodaj na početni zaslon"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgeta</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 1f99025c23..9292d0a361 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> modul"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Tartsa lenyomva a modult a kezdőképernyőn való mozgatáshoz"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Hozzáadás a kezdőképernyőhöz"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> modul</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> modul</item>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 31869fa3d4..10e6e4a47f 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> վիջեթ"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Հպեք վիջեթին և պահեք տեղափոխելու համար"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Ավելացնել հիմնական էկրանին"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> վիջեթ</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> վիջեթ</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 165146f3d9..512498d6d9 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Sentuh lama widget untuk memindahkannya di sekitar Layar utama"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Tambahkan ke Layar utama"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index e2864ae203..5cd864402b 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Græjan <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Haltu fingri á græjunni til að hreyfa hana um heimaskjáinn"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Bæta á heimaskjá"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> græja</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> græjur</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 304019a3cc..fd1f110fda 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Tocca e tieni premuto il widget per spostarlo nella schermata Home"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Aggiungi a schermata Home"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 94fd441e6b..9ee139dc8a 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"ווידג\'ט <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"יש ללחוץ לחיצה ארוכה על הווידג\'ט כדי להזיז אותו ברחבי מסך הבית"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"הוספה למסך הבית"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="two"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ווידג\'טים</item>
       <item quantity="many"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ווידג\'טים</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index d3670faa39..2b22acc1ea 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ウィジェット"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ウィジェットを押し続けると、ホーム画面上に移動できます。"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ホーム画面に追加"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> 件のウィジェット</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> 件のウィジェット</item>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index b3bbf5e214..3d38dfc1d5 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ვიჯეტი"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ხანგრძლივად შეეხეთ ვიჯეტს მთავარ ეკრანზე მის გადასაადგილებლად"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"მთავარ ეკრანზე დამატება"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ვიჯეტი</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> ვიჯეტი</item>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 2c547ae082..9efc5713d6 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> виджеті"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Негізгі экранда қозғалту үшін виджетті басып тұрыңыз."</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Негізгі экранға қосу"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виджет</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> виджет</item>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 9d95e57db1..fb49923d89 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"ធាតុ​ក្រាហ្វិក <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ចុចធាតុក្រាហ្វិក​ឱ្យជាប់ ដើម្បីផ្លាស់ទីវា​ជុំវិញអេក្រង់ដើម"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"បញ្ចូល​ទៅអេក្រង់ដើម"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other">ធាតុ​ក្រាហ្វិក <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
       <item quantity="one">ធាតុ​ក្រាហ្វិក <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g></item>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index b8bb6e7568..3ed5498faf 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ವಿಜೆಟ್"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ಮುಖಪುಟದ ಪರದೆ ಸುತ್ತ ವಿಜೆಟ್ ಅನ್ನು ಸರಿಸಲು, ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಒತ್ತಿ ಹಿಡಿದುಕೊಳ್ಳಿ"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ಮುಖಪುಟಕ್ಕೆ ಸೇರಿಸಿ"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ವಿಜೆಟ್‌ಗಳು</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ವಿಜೆಟ್‌ಗಳು</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 79c2ce3d8a..13ecf3ac44 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"위젯 <xliff:g id="WIDGET_NAME">%1$s</xliff:g>개"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"홈 화면에서 위젯을 이동하려면 길게 터치하세요."</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"홈 화면에 추가"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other">위젯 <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g>개</item>
       <item quantity="one">위젯 <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g>개</item>
@@ -53,7 +55,7 @@
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"직장 위젯"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"대화"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"빠르게 유용한 정보 확인"</string>
-    <string name="widget_education_content" msgid="745542879510751525">"앱을 열지 않고 정보를 확인하려면 홈 화면에 위젯을 추가하세요."</string>
+    <string name="widget_education_content" msgid="745542879510751525">"앱을 열지 않고 정보를 확인하려면​ 홈 화면에 위젯을 추가하세요."</string>
     <string name="reconfigurable_widget_education_tip" msgid="6336962690888067057">"탭하여 위젯 설정 변경"</string>
     <string name="widget_education_close_button" msgid="8676165703104836580">"확인"</string>
     <string name="widget_reconfigure_button_content_description" msgid="8811472721881205250">"위젯 설정 변경"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 68650e4800..abd5364372 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> виджети"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Башкы экранга жылдыруу үчүн виджетти коё бербей басып туруңуз"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Башкы экранга кошуу"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виджет</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> виджет</item>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index e7195e6ed7..63e005f8e9 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"ວິດເຈັດ <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ແຕະວິດເຈັດຄ້າງໄວ້ເພື່ອຍ້າຍມັນໄປມາຢູ່ໂຮມສະກຣີນ"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ເພີ່ມໄປໃສ່ໂຮມສະກຣີນ"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ວິດເຈັດ</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> ວິດເຈັດ</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 27a2598344..2aaa4ce282 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> valdiklis"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Paliesdami ir palaikydami valdiklį galite judėti pagrindiniame ekrane"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Pridėti prie pagrindinio ekrano"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> valdiklis</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> valdikliai</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index b66e5668bf..16a39f8559 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Logrīks <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Pieskarieties logrīkam un turiet to, lai to pārvietotu pa sākuma ekrānu."</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Pievienot sākuma ekrānam"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="zero"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> logrīku</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> logrīks</item>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index f5c55bd9ba..5c3fa8c668 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Виџет <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Допрете го и задржете го виџетот за да го движите наоколу на почетниот екран"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Додај на почетниот екран"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виџет</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виџети</item>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index cff1781e4c..8fe9d77a41 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> വിജറ്റ്"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ഹോം സ്‌ക്രീനിന് ചുറ്റും വിജറ്റ് നീക്കാൻ അതിൽ സ്‌പർശിച്ച് പിടിക്കുക"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ഹോം സ്‌ക്രീനിലേക്ക് ചേർക്കുക"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> വിജറ്റുകൾ</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> വിജറ്റ്</item>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 7367e2bed4..d86aa17a69 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> жижиг хэрэгсэл"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Жижиг хэрэгслийг Үндсэн нүүрний эргэн тойронд зөөхийн тулд түүнд хүрээд, удаан дарна уу"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Үндсэн нүүрэнд нэмэх"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> жижиг хэрэгсэл</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> жижиг хэрэгсэл</item>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index bf9a170619..13df1d836a 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> विजेट"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"होम स्क्रीनवर ते हलवण्यासाठी विजेटला स्पर्श करा आणि धरून ठेवा"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"होम स्‍क्रीनवर जोडा"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> विजेट</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> विजेट</item>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 759e8769ee..89b45cbe30 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Sentuh &amp; tahan widget untuk menggerakkan widget di sekitar Skrin utama"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Tambahkan pada Skrin utama"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index ec768598b1..8bb9e35d53 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ဝိဂျက်"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ပင်မစာမျက်နှာအနီးတွင် ဝိဂျက်ကိုရွှေ့ရန် ၎င်းကို တို့ထိ၍ဖိထားပါ"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ပင်မစာမျက်နှာသို့ ထည့်ရန်"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other">ဝိဂျက် <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ခု</item>
       <item quantity="one">ဝိဂျက် <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> ခု</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index a045b40821..161fc05330 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g>-modul"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Trykk og hold på modulen for å bevege den rundt på startskjermen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Legg til på startskjermen"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> moduler</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> modul</item>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index afedf854f0..9ac6ce2dc7 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> विजेट"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"यो विजेट होम स्क्रिनमा यताउता सार्न त्यसमा टच एन्ड होल्ड गर्नुहोस्"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"होम स्क्रिनमा हाल्नुहोस्"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> वटा विजेट</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> वटा विजेट</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 59f42beee3..c065756e72 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Houd de widget ingedrukt om deze te verplaatsen op het startscherm"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Toevoegen aan startscherm"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index e9fc3c55fa..78fb710ddb 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ୱିଜେଟ୍"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ମୂଳସ୍କ୍ରିନର ଆଖପାଖରେ ୱିଜେଟକୁ ମୁଭ୍ କରିବା ପାଇଁ ଏହାକୁ ସ୍ପର୍ଶ କରି ଧରି ରଖନ୍ତୁ"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ମୂଳସ୍କ୍ରିନରେ ଯୋଗ କରନ୍ତୁ"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g>ଟି ୱିଜେଟ୍</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g>ଟି ୱିଜେଟ୍</item>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 269c5f796b..8ba4092809 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ਵਿਜੇਟ"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ਵਿਜੇਟ ਨੂੰ ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਇੱਧਰ-ਉੱਧਰ ਲਿਜਾਉਣ ਲਈ ਸਪਰਸ਼ ਕਰਕੇ ਦਬਾਈ ਰੱਖੋ"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ਵਿਜੇਟ</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ਵਿਜੇਟ</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 5532b286de..7e8ed2137f 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widżet <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Kliknij i przytrzymaj widżet, by poruszać nim po ekranie głównym"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Dodaj do ekranu głównego"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widżety</item>
       <item quantity="many"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widżetów</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index d95ee02d18..00fa5ce001 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Toque sem soltar no widget para o mover à volta do ecrã principal"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Adicionar ao ecrã principal"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index f8d3b8b104..07c9058cdc 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Toque no widget e mantenha-o pressionado para movê-lo pela tela inicial"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Adicionar à tela inicial"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 67be316b46..ba4b33366d 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widgetul <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Atingeți lung widgetul pentru a-l muta pe ecranul de pornire"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Adăugați pe ecranul de pornire"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgeturi</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> de widgeturi</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 5353cf900c..a6f85335e6 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Виджет \"<xliff:g id="WIDGET_NAME">%1$s</xliff:g>\""</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Чтобы переместить виджет, нажмите на него и удерживайте."</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Добавить на главный экран"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виджет</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виджета</item>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index f57ad864cb..e8619bacac 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> විජට්ටුව"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"එය මුල් පිටු තිරය වටා ගෙන යාමට විජට් එක ස්පර්ශ කර අල්ලා ගන්න"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"මුල් පිටු තිරය වෙත එක් කරන්න"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one">විජට් <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
       <item quantity="other">විජට් <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 1aac52153d..70e9cb68d1 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Miniaplikácia <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Po pridržaní môžete miniaplikáciu posúvať po ploche"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Pridať na plochu"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> miniaplikácie</item>
       <item quantity="many"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index de923b3e78..12843b1f9f 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Pripomoček <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Pridržite pripomoček, če ga želite premikati po začetnem zaslonu."</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Dodaj na začetni zaslon"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> pripomoček</item>
       <item quantity="two"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> pripomočka</item>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 4caf9c7864..1110cd734b 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> miniaplikacion"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Prek dhe mbaj të shtypur miniaplikacionin për ta lëvizur nëpër \"Ekranin bazë\""</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Shto në \"Ekranin bazë\""</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> miniaplikacione</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> miniaplikacion</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 6d3c6bc9b5..41cac322a0 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> виџет"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Додирните и задржите виџет да бисте га померали по почетном екрану"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Додај на почетни екран"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виџет</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виџета</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 5ef0c35502..5b38290737 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget för <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Tryck länge på widgeten om du vill flytta den på startskärmen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Lägg till på startskärmen"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgetar</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index e420aeff5d..8e27312297 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Wijeti ya <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Gusa na ushikilie wijeti ili uisogeze kwenye Skrini ya kwanza"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Weka kwenye Skrini ya kwanza"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other">Wijeti <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
       <item quantity="one">Wijeti <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g></item>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index ce50acce04..1a4b8434e6 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> விட்ஜெட்"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"முகப்புத் திரைக்கு விட்ஜெட்டை நகர்த்த அதைத் தொட்டுப் பிடிக்கவும்"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"முகப்புத் திரையில் சேர்"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> விட்ஜெட்டுகள்</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> விட்ஜெட்</item>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 65a99fd01f..854ffedde3 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> విడ్జెట్"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ఈ విడ్జెట్‌ను మొదటి స్క్రీన్‌లో కావాల్సిన చోట ఉంచడానికి, దాన్ని తాకి అలాగే నొక్కి పట్టుకోండి"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"మొదటి స్క్రీన్‌కు జోడించు"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> విడ్జెట్‌లు</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> విడ్జెట్</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 945dcf0bc0..e807f942a3 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"วิดเจ็ต <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"แตะวิดเจ็ตค้างไว้เพื่อย้ายไปรอบๆ หน้าจอหลัก"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"เพิ่มลงในหน้าจอหลัก"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other">วิดเจ็ต <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> รายการ</item>
       <item quantity="one">วิดเจ็ต <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> รายการ</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index edbc39aaf8..770bab3ea2 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Pindutin nang matagal ang widget para ilipat-lipat ito sa Home screen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Idagdag sa Home screen"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> na widget</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 01748c2e52..5d0e32c7ae 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget\'ı"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Ana ekranda taşımak için widget\'a dokunup basılı tutun"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Ana ekrana ekle"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index c4b3c24eb6..0ffb5cb6c4 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Віджет <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Натисніть і втримуйте віджет, щоб перемістити його в потрібне місце на головному екрані"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Додати на головний екран"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> віджет</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> віджети</item>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index f9a096ce38..3586fd3637 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ویجیٹ"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ویجیٹ کو ہوم اسکرین کے چاروں طرف منتقل کرنے کیلئے اسے ٹچ کریں اور دبائے رکھیں"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ہوم اسکرین میں شامل کریں"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ویجیٹس</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> ویجیٹ</item>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index ca8a75ae3a..7fe0c631f4 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ta vidjet"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Vidjetni ushlagan holda kerakli joyga siljiting"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Bosh ekranga chiqarish"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ta vidjet</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> ta vidjet</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 0918465df6..3c2db21886 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Tiện ích <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Chạm và giữ để di chuyển tiện ích xung quanh Màn hình chính"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Thêm vào Màn hình chính"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> tiện ích</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> tiện ích</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 31c0df5870..f4536532fb 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"“<xliff:g id="WIDGET_NAME">%1$s</xliff:g>”微件"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"轻触并按住该微件即可将其在主屏幕上四处移动"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"添加到主屏幕"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> 个微件</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> 个微件</item>
@@ -109,8 +111,8 @@
     <string name="allow_rotation_title" msgid="7728578836261442095">"允许旋转主屏幕"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"手机旋转时"</string>
     <string name="notification_dots_title" msgid="9062440428204120317">"通知圆点"</string>
-    <string name="notification_dots_desc_on" msgid="1679848116452218908">"开启"</string>
-    <string name="notification_dots_desc_off" msgid="1760796511504341095">"关闭"</string>
+    <string name="notification_dots_desc_on" msgid="1679848116452218908">"已开启"</string>
+    <string name="notification_dots_desc_off" msgid="1760796511504341095">"已关闭"</string>
     <string name="title_missing_notification_access" msgid="7503287056163941064">"需要获取通知使用权"</string>
     <string name="msg_missing_notification_access" msgid="281113995110910548">"要显示通知圆点，请开启<xliff:g id="NAME">%1$s</xliff:g>的应用通知功能"</string>
     <string name="title_change_settings" msgid="1376365968844349552">"更改设置"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index f29c546acb..0a6aa0f56c 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"「<xliff:g id="WIDGET_NAME">%1$s</xliff:g>」小工具"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"按住小工具即可隨意在主畫面上移動"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"新增至主畫面"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> 個小工具</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> 個小工具</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index df028af657..b42a4fedfd 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"「<xliff:g id="WIDGET_NAME">%1$s</xliff:g>」小工具"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"按住小工具即可將它拖放到主畫面上的任何位置"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"新增到主畫面"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> 項小工具</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> 項小工具</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index b8de754066..74580a8ab6 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -35,6 +35,8 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Iwijethi elingu-<xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Thinta uphinde ubambe iwijethi ukuyihambisa Kusikrini sasekhaya"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Engeza kusikrini sasekhaya"</string>
+    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
+    <skip />
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one">Amawijethi angu-<xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
       <item quantity="other">Amawijethi angu-<xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
-- 
GitLab


From b9a1ac47b8736decfb4645b6189c2354dc042cd1 Mon Sep 17 00:00:00 2001
From: Yogisha Dixit <ydixit@google.com>
Date: Fri, 2 Jul 2021 18:30:00 +0100
Subject: [PATCH 1607/1664] Remove press home command from AddConfigWidgetTest.

Context: b/192406323#comment4

Bug: 192406323
Test: AddConfigWidgetTest
Change-Id: I2741358de93f75ef7ed73ee97964020162542756
---
 .../com/android/launcher3/ui/widget/AddConfigWidgetTest.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java
index 0c9c4630a4..4978c0190d 100644
--- a/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java
+++ b/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java
@@ -102,8 +102,7 @@ public class AddConfigWidgetTest extends AbstractLauncherUiTest {
 
         setResult(acceptConfig);
         if (acceptConfig) {
-            // Dismiss widget resize frame.
-            mDevice.pressHome();
+            // TODO(b/192655785) Assert widget resize frame is shown and then dismiss it.
             Wait.atMost("", new WidgetSearchCondition(), DEFAULT_ACTIVITY_TIMEOUT, mLauncher);
             assertNotNull(mAppWidgetManager.getAppWidgetInfo(mWidgetId));
         } else {
-- 
GitLab


From 1cf5527ae80b52b2451447a8616fe2dbc9546a8b Mon Sep 17 00:00:00 2001
From: Cyrus Boadway <boadway@google.com>
Date: Wed, 14 Jul 2021 16:47:25 +0000
Subject: [PATCH 1608/1664] Keep transparent drawable for clipping outline
 during launch animation

During the widget-activity transition, the widget foreground loses its
clipping radius, if the clipping is determined by a drawable. We remove
the drawable through the animation.

For widgets where there is content being clipped by the background's
corener radius, this results in the widget window appearing square
through the entire animation, then snapping in rounded corners on
animation-complete.

To solve this, we leave a transparent clone of the drawable in the
original drawable's place, for the balance of the animation, providing
the outline for clipping.

Manual testing against 20 Google widgets showed no regression in
behaviour in other cases.

Bug: 193665108
Test: manual

Change-Id: I3db31e4634c8dd6b22a513a976386d396445ebc2
---
 .../quickstep/views/FloatingWidgetBackgroundView.java  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/FloatingWidgetBackgroundView.java b/quickstep/src/com/android/quickstep/views/FloatingWidgetBackgroundView.java
index 65dba338f8..1548268891 100644
--- a/quickstep/src/com/android/quickstep/views/FloatingWidgetBackgroundView.java
+++ b/quickstep/src/com/android/quickstep/views/FloatingWidgetBackgroundView.java
@@ -72,14 +72,20 @@ final class FloatingWidgetBackgroundView extends View {
             mForegroundProperties.init(
                     mOriginalForeground.getConstantState().newDrawable().mutate());
             setForeground(mForegroundProperties.mDrawable);
-            mSourceView.setForeground(null);
+            Drawable clipPlaceholder =
+                    mOriginalForeground.getConstantState().newDrawable().mutate();
+            clipPlaceholder.setAlpha(0);
+            mSourceView.setForeground(clipPlaceholder);
         }
         if (isSupportedDrawable(backgroundView.getBackground())) {
             mOriginalBackground = backgroundView.getBackground();
             mBackgroundProperties.init(
                     mOriginalBackground.getConstantState().newDrawable().mutate());
             setBackground(mBackgroundProperties.mDrawable);
-            mSourceView.setBackground(null);
+            Drawable clipPlaceholder =
+                    mOriginalBackground.getConstantState().newDrawable().mutate();
+            clipPlaceholder.setAlpha(0);
+            mSourceView.setBackground(clipPlaceholder);
         } else if (mOriginalForeground == null) {
             mFallbackDrawable.setColor(fallbackBackgroundColor);
             setBackground(mFallbackDrawable);
-- 
GitLab


From 83d5e8ca39d0f90f0003a19413a71b9bb83037a8 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 14 Jul 2021 21:40:23 +0000
Subject: [PATCH 1609/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I59d3343c23a12713e00ff0f3b5c96eea4ffb437e
---
 quickstep/res/values-bn/strings.xml     | 18 ++++++------------
 quickstep/res/values-bs/strings.xml     | 18 ++++++------------
 quickstep/res/values-en-rAU/strings.xml | 18 ++++++------------
 quickstep/res/values-en-rCA/strings.xml | 18 ++++++------------
 quickstep/res/values-en-rGB/strings.xml | 18 ++++++------------
 quickstep/res/values-en-rIN/strings.xml | 18 ++++++------------
 quickstep/res/values-es-rUS/strings.xml | 18 ++++++------------
 quickstep/res/values-fa/strings.xml     | 18 ++++++------------
 quickstep/res/values-hr/strings.xml     | 18 ++++++------------
 quickstep/res/values-in/strings.xml     | 18 ++++++------------
 quickstep/res/values-it/strings.xml     | 18 ++++++------------
 quickstep/res/values-lo/strings.xml     | 18 ++++++------------
 quickstep/res/values-pt-rPT/strings.xml | 18 ++++++------------
 quickstep/res/values-pt/strings.xml     | 18 ++++++------------
 quickstep/res/values-sq/strings.xml     | 18 ++++++------------
 quickstep/res/values-sw/strings.xml     | 18 ++++++------------
 quickstep/res/values-te/strings.xml     | 18 ++++++------------
 17 files changed, 102 insertions(+), 204 deletions(-)

diff --git a/quickstep/res/values-bn/strings.xml b/quickstep/res/values-bn/strings.xml
index eab0943f8c..90545e1577 100644
--- a/quickstep/res/values-bn/strings.xml
+++ b/quickstep/res/values-bn/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"অ্যাপ সাজেশন চালু করা আছে"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"অ্যাপ সাজেশন বন্ধ করা আছে"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"আপনার প্রয়োজন হতে পারে এমন অ্যাপ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"স্ক্রিনের একেবারে ডান বা বাঁদিকের প্রান্ত থেকে সোয়াইপ করেছেন কিনা তা দেখে নিন।"</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"স্ক্রিনের ডান বা বাঁদিকের প্রান্ত থেকে মাঝখান পর্যন্ত সোয়াইপ করে আঙুল তুলে নিয়েছেন কিনা তা দেখে নিন।"</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ফিরে যেতে, কীভাবে ডান দিক থেকে সোয়াইপ করতে হয় তা আপনি শিখেছেন। এরপর, একটি অ্যাপ থেকে অন্য অ্যাপে কীভাবে যাবেন জেনে নিন।"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"আপনি ফিরে যাওয়ার জেসচার সম্পর্কে জেনেছেন।"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"স্ক্রিনের নিচের প্রান্তের খুব কাছে পর্যন্ত যাতে সোয়াইপ না করেন সেটি ভাল করে দেখে নিন।"</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"ইঙ্গিত কীভাবে ব্যবহার করতে হয় আপনি তা শিখে ফেলেছেন। ইঙ্গিত বন্ধ করতে, সেটিংসে যান।"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"আপনি একটি অ্যাপ থেকে অন্য অ্যাপে যাওয়ার জেসচার সম্পর্কে জেনেছেন।"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"একটি অ্যাপ থেকে অন্য অ্যাপে যেতে সোয়াইপ করুন"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"একটি অ্যাপ থেকে অন্যটিতে পাল্টাতে, স্ক্রিনের নিচ থেকে উপরে সোয়াইপ করে ধরে রাখুন, তারপরে ছেড়ে দিন।"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"সব প্রস্তুত"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"সম্পূর্ণ হয়েছে"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"সেটিংস"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"আবার চেষ্টা করুন"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"সাবাস!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"টিউটোরিয়াল <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"সব রেডি!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"হোম স্ক্রিনে যেতে উপরের দিকে সোয়াইপ করুন"</string>
     <string name="allset_description" msgid="6350320429953234580">"এবারে আপনি ফোন ব্যবহার করতে পারবেন"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"সিস্টেম নেভিগেশন সেটিংস"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"শেয়ার করুন"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"স্ক্রিনশট নিন"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"এই অ্যাপ বা আপনার প্রতিষ্ঠান এই অ্যাকশনটি পারফর্ম করার অনুমতি দেয়নি"</string>
diff --git a/quickstep/res/values-bs/strings.xml b/quickstep/res/values-bs/strings.xml
index dce7656cb3..95b5f8e577 100644
--- a/quickstep/res/values-bs/strings.xml
+++ b/quickstep/res/values-bs/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Prijedlozi aplikacija su omogućeni"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Prijedlozi aplikacija su onemogućeni"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predviđena aplikacija: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Pazite da prijeđete prstom od krajnjeg desnog ili krajnjeg lijevog ruba."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Pazite da prijeđete prstom od desnog ili lijevog ruba do sredine zaslona i podignite prst."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Naučili ste kako prevući zdesna da se vratite. Sljedeće naučite kako prebacivati između aplikacija."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Završili ste pokret za vraćanje."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Obratite pažnju da ne prevučete preblizu donjem dijelu ekrana."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Naučili ste kako koristiti pokrete. Idite u Postavke da isključite pokrete."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Završili ste pokret za prebacivanje između aplikacija."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Prevucite da prebacujete između aplikacija"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Za promjenu aplikacije prijeđite prstom od dna zaslona prema gore, zadržite pritisak pa pustite."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Sve je spremno"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Gotovo"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Postavke"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Pokušajte ponovo"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Odlično!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Vodič <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Sve je spremno!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Prijeđite prstom prema gore da biste otvorili početni zaslon"</string>
     <string name="allset_description" msgid="6350320429953234580">"Sve je spremno da počnete koristiti telefon"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Postavke navigacije sustavom"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Dijeli"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Snimak ekrana"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Ovu radnju ne dozvoljava aplikacija ili vaša organizacija"</string>
diff --git a/quickstep/res/values-en-rAU/strings.xml b/quickstep/res/values-en-rAU/strings.xml
index 24cad6552f..ed7debceb1 100644
--- a/quickstep/res/values-en-rAU/strings.xml
+++ b/quickstep/res/values-en-rAU/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"App suggestions enabled"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"App suggestions are disabled"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicted app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Make sure that you swipe from the far-right or far-left edge."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Make sure that you swipe from the right or left edge to the middle of the screen and let go."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"You learned how to swipe from the right to go back. Next, learn how to switch apps."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"You completed the go back gesture."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"You learned how to use gestures. To turn off gestures, go to settings."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"You completed the switch apps gesture."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe to switch apps"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"To switch between apps, swipe up from the bottom of your screen, hold, then release."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"All set"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Done"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Settings"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Try again"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Nice!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Ready!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Swipe up to go home"</string>
     <string name="allset_description" msgid="6350320429953234580">"You’re ready to start using your phone"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"System navigation settings"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Share"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
diff --git a/quickstep/res/values-en-rCA/strings.xml b/quickstep/res/values-en-rCA/strings.xml
index 24cad6552f..ed7debceb1 100644
--- a/quickstep/res/values-en-rCA/strings.xml
+++ b/quickstep/res/values-en-rCA/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"App suggestions enabled"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"App suggestions are disabled"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicted app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Make sure that you swipe from the far-right or far-left edge."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Make sure that you swipe from the right or left edge to the middle of the screen and let go."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"You learned how to swipe from the right to go back. Next, learn how to switch apps."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"You completed the go back gesture."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"You learned how to use gestures. To turn off gestures, go to settings."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"You completed the switch apps gesture."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe to switch apps"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"To switch between apps, swipe up from the bottom of your screen, hold, then release."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"All set"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Done"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Settings"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Try again"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Nice!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Ready!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Swipe up to go home"</string>
     <string name="allset_description" msgid="6350320429953234580">"You’re ready to start using your phone"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"System navigation settings"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Share"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
diff --git a/quickstep/res/values-en-rGB/strings.xml b/quickstep/res/values-en-rGB/strings.xml
index 24cad6552f..ed7debceb1 100644
--- a/quickstep/res/values-en-rGB/strings.xml
+++ b/quickstep/res/values-en-rGB/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"App suggestions enabled"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"App suggestions are disabled"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicted app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Make sure that you swipe from the far-right or far-left edge."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Make sure that you swipe from the right or left edge to the middle of the screen and let go."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"You learned how to swipe from the right to go back. Next, learn how to switch apps."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"You completed the go back gesture."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"You learned how to use gestures. To turn off gestures, go to settings."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"You completed the switch apps gesture."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe to switch apps"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"To switch between apps, swipe up from the bottom of your screen, hold, then release."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"All set"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Done"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Settings"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Try again"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Nice!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Ready!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Swipe up to go home"</string>
     <string name="allset_description" msgid="6350320429953234580">"You’re ready to start using your phone"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"System navigation settings"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Share"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
diff --git a/quickstep/res/values-en-rIN/strings.xml b/quickstep/res/values-en-rIN/strings.xml
index 24cad6552f..ed7debceb1 100644
--- a/quickstep/res/values-en-rIN/strings.xml
+++ b/quickstep/res/values-en-rIN/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"App suggestions enabled"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"App suggestions are disabled"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicted app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Make sure that you swipe from the far-right or far-left edge."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Make sure that you swipe from the right or left edge to the middle of the screen and let go."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"You learned how to swipe from the right to go back. Next, learn how to switch apps."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"You completed the go back gesture."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Make sure that you don\'t swipe too close to the bottom of the screen."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"You learned how to use gestures. To turn off gestures, go to settings."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"You completed the switch apps gesture."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe to switch apps"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"To switch between apps, swipe up from the bottom of your screen, hold, then release."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"All set"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Done"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Settings"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Try again"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Nice!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Ready!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Swipe up to go home"</string>
     <string name="allset_description" msgid="6350320429953234580">"You’re ready to start using your phone"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"System navigation settings"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Share"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
diff --git a/quickstep/res/values-es-rUS/strings.xml b/quickstep/res/values-es-rUS/strings.xml
index b30f5f3bc4..a4e5778654 100644
--- a/quickstep/res/values-es-rUS/strings.xml
+++ b/quickstep/res/values-es-rUS/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Sugerencias de apps habilitadas"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Las sugerencias de aplicaciones están inhabilitadas"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicción de app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Asegúrate de deslizar desde el extremo derecho o izquierdo."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Asegúrate de deslizar desde borde izquierdo o derecho hacia centro de la pantalla y, luego, soltar."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Aprendiste a deslizar el dedo desde la derecha para volver. Ahora, descubre cómo cambiar de app."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Completaste el gesto \"Atrás\"."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Asegúrate de no hacerlo muy cerca de la parte inferior de la pantalla."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Ya sabes cómo usar los gestos. Para desactivarlos, ve a Configuración."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Completaste el gesto para cambiar de app."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Desliza el dedo para cambiar de app"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Para cambiar de app, desliza hacia arriba desde parte inferior, mantén presionado y, luego, suelta."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Listo"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Listo"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Configuración"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Reintentar"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"¡Genial!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Instructivo <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Todo listo"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Desliza el dedo hacia arriba para ir a la pantalla principal"</string>
     <string name="allset_description" msgid="6350320429953234580">"Ya puedes empezar a usar tu teléfono"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Configuración de navegación del sistema"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Compartir"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Captura de pantalla"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"La app o tu organización no permiten realizar esta acción"</string>
diff --git a/quickstep/res/values-fa/strings.xml b/quickstep/res/values-fa/strings.xml
index cd4bbf1a08..d1e849fa7d 100644
--- a/quickstep/res/values-fa/strings.xml
+++ b/quickstep/res/values-fa/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"«پیشنهاد برنامه» فعال است"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"«پیشنهاد برنامه» غیرفعال است"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"برنامه پیش‌بینی‌شده: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"دقت کنید که از انتهای لبه سمت راست یا سمت چپ تند بکشید."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"دقت کنید که از لبه سمت راست یا سمت چپ تند به وسط صفحه بکشید و رها کنید."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"یاد گرفتید چگونه برای رفتن به عقب از سمت راست تند بکشید. مورد بعدی، با نحوه جابه‌جا شدن بین برنامه‌ها آشنا شوید."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"اشاره برگشتن را تکمیل کردید."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"دقت کنید که موقع تند کشیدن بیش‌از حد به پایین صفحه نزدیک نشوید."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"با نحوه استفاده از اشاره‌ها آشنا شدید. برای خاموش کردن اشاره‌ها، به «تنظیمات» بروید."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"اشاره جابه‌جا شدن بین برنامه‌ها را تکمیل کردید."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"تند کشیدن برای جابه‌جا شدن بین برنامه‌ها"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"برای جابه‌جا شدن بین برنامه‌ها، از پایین صفحه تند به‌بالا بکشید، نگه دارید، و سپس رها کنید."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"همه چیز آماده است"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"تمام"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"تنظیمات"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"امتحان مجدد"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"عالی!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"آموزش گام‌به‌گام <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"همه چیز آماده است!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"برای رفتن به «صفحه اصلی»، تند به‌بالا بکشید"</string>
     <string name="allset_description" msgid="6350320429953234580">"آماده‌اید از تلفنتان استفاده کنید"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"تنظیمات پیمایش سیستم"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"هم‌رسانی"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"نماگرفت"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"برنامه یا سازمان شما اجازه نمی‌دهد این کنش انجام شود."</string>
diff --git a/quickstep/res/values-hr/strings.xml b/quickstep/res/values-hr/strings.xml
index a8a7b24277..5ab1a87bf3 100644
--- a/quickstep/res/values-hr/strings.xml
+++ b/quickstep/res/values-hr/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Predlaganje apl. omogućeno"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Predlaganje apl. onemogućeno"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predviđena aplikacija: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Pazite da prijeđete prstom od krajnjeg desnog ili krajnjeg lijevog ruba."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Pazite da prijeđete prstom od desnog ili lijevog ruba do sredine zaslona i podignite prst."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Naučili ste kako prijeći prstom zdesna da biste se vratili. Sad saznajte kako promijeniti aplikaciju."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Izvršili ste pokret za povratak."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pazite da ne prijeđete prstom preblizu dnu zaslona."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Naučili ste koristiti pokrete. Pokrete možete isključiti u postavkama."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Izvršili ste pokret za promjenu aplikacije."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Prijeđite prstom da biste promijenili aplikaciju"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Za promjenu aplikacije prijeđite prstom od dna zaslona prema gore, zadržite pritisak pa pustite."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Sve je spremno"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Gotovo"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Postavke"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Pokušajte ponovo"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Odlično!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Vodič <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Sve je spremno!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Prijeđite prstom prema gore da biste otvorili početni zaslon"</string>
     <string name="allset_description" msgid="6350320429953234580">"Spremni ste za početak upotrebe telefona"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Postavke navigacije sustavom"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Podijeli"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Snimka zaslona"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikacija ili vaša organizacija ne dopuštaju ovu radnju"</string>
diff --git a/quickstep/res/values-in/strings.xml b/quickstep/res/values-in/strings.xml
index 46eb6d8b97..3e24fcb620 100644
--- a/quickstep/res/values-in/strings.xml
+++ b/quickstep/res/values-in/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Saran aplikasi diaktifkan"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Saran aplikasi dinonaktifkan"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplikasi yang diprediksi: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Pastikan Anda menggeser dari tepi ujung kanan atau ujung kiri."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Pastikan Anda menggeser dari tepi kanan atau kiri ke tengah layar, lalu lepaskan."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Anda telah belajar cara geser dari kanan untuk kembali. Berikutnya, pelajari cara beralih aplikasi."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Anda telah menyelesaikan gestur kembali."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pastikan Anda tidak menggeser terlalu dekat ke bagian bawah layar."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Anda telah mempelajari cara menggunakan gestur. Untuk menonaktifkan gestur, buka Setelan."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Anda telah menyelesaikan gestur beralih aplikasi."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Geser untuk beralih aplikasi"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Untuk beralih antar-aplikasi, geser ke atas dari bagian bawah layar, tahan, lalu lepaskan."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Semua siap"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Selesai"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Setelan"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Coba lagi"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bagus!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Semua siap."</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Geser ke atas untuk beralih ke Layar utama"</string>
     <string name="allset_description" msgid="6350320429953234580">"Anda sudah siap untuk mulai menggunakan ponsel"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Setelan navigasi sistem"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Bagikan"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Tindakan ini tidak diizinkan oleh aplikasi atau organisasi Anda"</string>
diff --git a/quickstep/res/values-it/strings.xml b/quickstep/res/values-it/strings.xml
index 7d8f6db9d3..43a210b9de 100644
--- a/quickstep/res/values-it/strings.xml
+++ b/quickstep/res/values-it/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"La funzionalità app suggerite è attiva"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"La funzionalità app suggerite è disattivata"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App prevista: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Assicurati di scorrere dal bordo all\'estrema destra o all\'estrema sinistra."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Assicurati di scorrere dal bordo destro o sinistro verso il centro dello schermo e solleva il dito."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Hai imparato a scorrere da destra per tornare indietro. Ora impara come passare da un\'app all\'altra."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Hai completato il gesto Indietro."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Assicurati di non scorrere troppo vicino alla parte inferiore dello schermo."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Hai imparato a usare i gesti. Per disattivarli, vai alle Impostazioni."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Hai completato il gesto Cambia app."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Scorri per passare da un\'app all\'altra"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Per spostarti tra le app, scorri verso l\'alto dal fondo dello schermo, tieni premuto e rilascia."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Fatto"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Fine"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Impostazioni"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Riprova"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bene!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Finito."</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Scorri verso l\'alto per andare alla schermata Home"</string>
     <string name="allset_description" msgid="6350320429953234580">"Puoi iniziare a usare il tuo telefono"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Impostazioni Navigazione del sistema"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Condividi"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Questa azione non è consentita dall\'app o dall\'organizzazione"</string>
diff --git a/quickstep/res/values-lo/strings.xml b/quickstep/res/values-lo/strings.xml
index 8f9540d751..915578b8e7 100644
--- a/quickstep/res/values-lo/strings.xml
+++ b/quickstep/res/values-lo/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ເປີດການນຳໃຊ້ການແນະນຳແອັບແລ້ວ"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ປິດການນຳໃຊ້ການແນະນຳແອັບແລ້ວ"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ແອັບທີ່ຄາດເດົາໄວ້: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"ກະລຸນາກວດສອບວ່າທ່ານປັດຈາກຂອບຂວາສຸດ ຫຼື ຊ້າຍສຸດ."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"ກະລຸນາກວດສອບວ່າທ່ານປັດຈາກຂອບຂວາ ຫຼື ຊ້າຍໄປຫາທາງກາງຂອງໜ້າຈໍແລ້ວປ່ອຍນິ້ວ."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ທ່ານຮຽນຮູ້ວິທີປັດຈາກຂວາເພື່ອກັບຄືນແລ້ວ. ຕໍ່ໄປ, ມາສຶກສາວິທີສະຫຼັບແອັບ."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ທ່ານໃຊ້ທ່າທາງກັບຄືນສຳເລັດແລ້ວ."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ກະລຸນາກວດສອບວ່າທ່ານບໍ່ໄດ້ປັດໃກ້ກັບທາງລຸ່ມຂອງໜ້າຈໍເກີນໄປ."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"ທ່ານໄດ້ສຶກສາວິທີໃຊ້ທ່າທາງແລ້ວ. ເພື່ອປິດທ່າທາງຕ່າງໆ, ໃຫ້ເຂົ້າໄປຫາການຕັ້ງຄ່າ."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"ທ່ານໃຊ້ທ່າທາງສະຫຼັບແອັບສຳເລັດແລ້ວ."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ປັດເພື່ອສະຫຼັບແອັບ"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"ເພື່ອສະຫຼັບລະຫວ່າງແອັບ, ໃຫ້ປັດຂຶ້ນຈາກລຸ່ມສຸດຂອງໜ້າຈໍທ່ານ, ກົດຄ້າງໄວ້, ຈາກນັ້ນປ່ອຍ."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"ທຸກຢ່າງພ້ອມແລ້ວ"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"ແລ້ວໆ"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ການຕັ້ງຄ່າ"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ລອງໃໝ່"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ດີ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ການສອນການນຳໃຊ້ທີ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"ຮຽບຮ້ອຍໝົດແລ້ວ!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"ປັດຂຶ້ນເພື່ອໄປຫາໜ້າຫຼັກ"</string>
     <string name="allset_description" msgid="6350320429953234580">"ທ່ານພ້ອມເລີ່ມຕົ້ນໃຊ້ໂທລະສັບຂອງທ່ານແລ້ວ"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"ການຕັ້ງຄ່າການນຳທາງລະບົບ"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"ແບ່ງປັນ"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ຮູບໜ້າຈໍ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ແອັບ ຫຼື ອົງການຂອງທ່ານບໍ່ອະນຸຍາດໃຫ້ໃຊ້ຄຳສັ່ງນີ້"</string>
diff --git a/quickstep/res/values-pt-rPT/strings.xml b/quickstep/res/values-pt-rPT/strings.xml
index 7c28c7210a..7fe20bbd65 100644
--- a/quickstep/res/values-pt-rPT/strings.xml
+++ b/quickstep/res/values-pt-rPT/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Sugestões de apps ativadas"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"As sugestões de apps estão desativadas"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App prevista: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Deslize rapidamente a partir da extremidade mais à direita ou mais à esquerda."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Deslize rapidamente a partir da extremidade esquerda ou direita até ao centro do ecrã e solte."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Aprendeu a deslizar a partir da direita para retroceder. A seguir, saiba como alternar entre apps."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Concluiu o gesto para retroceder."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Garanta que não desliza rapidamente com o dedo demasiado perto da parte inferior do ecrã."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Aprendeu a utilizar gestos. Para desativar os gestos, aceda às Definições."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Concluiu o gesto para alternar entre apps."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Deslize rapidamente com o dedo para alternar entre apps"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"P/ alternar entre apps, deslize p/ cima a partir da parte inf. do ecrã sem soltar e, depois, solte."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Está tudo pronto"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Concluído"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Definições"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Tente novamente"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Boa!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Tudo pronto!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Deslize rapidamente para cima para aceder ao ecrã principal"</string>
     <string name="allset_description" msgid="6350320429953234580">"Já pode começar a utilizar o seu telemóvel"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Definições de navegação do sistema"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Partilhar"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Fazer captura de ecrã"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Esta ação não é permitida pela app ou a sua entidade."</string>
diff --git a/quickstep/res/values-pt/strings.xml b/quickstep/res/values-pt/strings.xml
index 1899719af2..422d13af89 100644
--- a/quickstep/res/values-pt/strings.xml
+++ b/quickstep/res/values-pt/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"O recurso \"sugestões de apps\" está ativado"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"O recurso \"sugestões de apps\" está desativado"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App previsto: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Deslize da borda direita ou esquerda."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Deslize da borda direita ou esquerda até o meio da tela e solte."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Você aprendeu a deslizar da direita para voltar. A seguir, aprenda a trocar de app."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Você concluiu o gesto para voltar."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Não deslize perto demais da parte inferior da tela."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Você aprendeu a usar gestos. Para desativá-los, acesse as Configurações."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Você concluiu o gesto para trocar de app."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Deslizar para trocar de app"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Para mudar de app, deslize de baixo para cima na tela, mantenha-a pressionada por um tempo e solte."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Tudo pronto"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Concluído"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Configurações"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Tentar novamente"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Muito bem!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Tudo pronto!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Deslize para cima para acessar a tela inicial"</string>
     <string name="allset_description" msgid="6350320429953234580">"Você já pode começar a usar seu smartphone"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Configurações de navegação do sistema"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Compartilhar"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Capturar tela"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Essa ação não é permitida pelo app ou pela organização"</string>
diff --git a/quickstep/res/values-sq/strings.xml b/quickstep/res/values-sq/strings.xml
index 59ae630406..86528d2777 100644
--- a/quickstep/res/values-sq/strings.xml
+++ b/quickstep/res/values-sq/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Aplikacionet e sugjeruara janë aktivizuar"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Sugjerimet e aplikacioneve janë çaktivizuar"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplikacioni i parashikuar: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Sigurohu që të rrëshqasësh shpejt nga skaji më i djathtë ose më i majtë."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Sigurohu që të rrëshqasësh shpejt nga skaji i djathtë ose i majtë drejt mesit të ekranit dhe lëshoje."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Ke mësuar si të rrëshqasësh shpejt nga e djathta për t\'u kthyer prapa. Në vijim do të mësosh se si t\'i ndërrosh aplikacionet."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"E ke përfunduar gjestin e kthimit prapa."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Sigurohu që të mos rrëshqasësh shumë afër fundit të ekranit."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Ke mësuar si të përdorësh gjestet. Për t\'i çaktivizuar gjestet, shko te \"Cilësimet\"."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"E ke përfunduar gjestin e ndërrimit të aplikacioneve."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Rrëshqit shpejt për të ndërruar aplikacionet"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Për të ndërruar mes aplikacioneve, rrëshqit shpejt lart nga fundi i ekranit tënd, mbaj dhe pastaj lësho."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Plotësisht gati"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"U krye"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Cilësimet"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Provo përsëri"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bukur!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Udhëzuesi <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Plotësisht gati!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Rrëshqit shpejt lart për të shkuar tek \"Ekrani bazë\""</string>
     <string name="allset_description" msgid="6350320429953234580">"Je gati për të filluar përdorimin e telefonit tënd"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Cilësimet e navigimit të sistemit"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Ndaj"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Pamja e ekranit"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Ky veprim nuk lejohet nga aplikacioni ose organizata jote"</string>
diff --git a/quickstep/res/values-sw/strings.xml b/quickstep/res/values-sw/strings.xml
index 66ce61676b..093cbb89b7 100644
--- a/quickstep/res/values-sw/strings.xml
+++ b/quickstep/res/values-sw/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Mapendekezo ya programu yamewashwa"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Umezima mapendekezo ya programu"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Programu iliyotabiriwa: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Hakikisha unatelezesha kidole kuanzia ukingo wa kulia kabisa au ukingo wa kushoto kabisa."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Hakikisha unatelezesha kidole kuanzia ukingo wa kulia au kushoto kuelekea katikati ya skrini na uachilie."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Umejifunza jinsi ya kutelezesha kidole kuanzia kulia ili kurudi nyuma. Hatua inayofuata, jifunze jinsi ya kubadilisha programu."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Umekamilisha ishara ya kurudi nyuma."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Hakikisha hutelezeshi kidole karibu sana na sehemu ya chini ya skrini."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Umejifunza jinsi ya kutumia ishara. Ili uzime ishara, nenda kwenye Mipangilio."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Umekamilisha ishara ya kubadilisha programu."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Telezesha kidole ili ubadilishe programu"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Ili ubadili kati ya programu, telezesha kidole juu kuanzia sehemu ya chini ya skrini yako, ushikilie, kisha uachilie."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Kila kitu kiko tayari"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Nimemaliza"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Mipangilio"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Jaribu tena"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Safi!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Mafunzo ya <xliff:g id="CURRENT">%1$d</xliff:g> kati ya <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Tayari!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Telezesha kidole juu ili uende kwenye skrini ya kwanza"</string>
     <string name="allset_description" msgid="6350320429953234580">"Uko tayari kuanza kutumia simu yako"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Mipangilio ya usogezaji kwenye mfumo"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Shiriki"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Picha ya skrini"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Kitendo hiki hakiruhusiwi na programu au shirika lako"</string>
diff --git a/quickstep/res/values-te/strings.xml b/quickstep/res/values-te/strings.xml
index 4c493e2c5b..be2ffbd4ab 100644
--- a/quickstep/res/values-te/strings.xml
+++ b/quickstep/res/values-te/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"యాప్ సలహాలు ఎనేబుల్ చేయబడ్డాయి"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"యాప్ సూచ‌న‌లు డిజేబుల్‌ చేయబడ్డాయి"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"సూచించబడిన యాప్: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"కుడి వైపు చిట్ట చివరి లేదా ఎడమ వైపు చిట్ట చివరి అంచు నుండి స్వైప్ చేస్తున్నారని నిర్ధారించుకోండి."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"మీరు కుడి లేదా ఎడమ అంచు నుండి స్క్రీన్ మధ్యలోకి స్వైప్ చేశారని నిర్ధారించుకోని, మీ వేలిని ఎత్తండి."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"వెనుకకు వెళ్లడానికి కుడి నుండి స్వైప్ ఎలానో మీకు తెలుసు. తర్వాత, యాప్‌ల మధ్య ఎలా మారాలో తెలుసుకోండి."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"మీరు తిరిగి వెనక్కు వెళ్లే సంజ్ఞను పూర్తి చేశారు."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"మీరు స్క్రీన్ దిగువకు చాలా దగ్గరగా స్వైప్ చేయలేదని నిర్ధారించుకోండి."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"మీరు సంజ్ఞలను ఎలా ఉపయోగించాలో నేర్చుకున్నారు. సంజ్ఞలను ఆఫ్ చేయడానికి, సెట్టింగ్‌లకు వెళ్లండి."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"మీరు \'యాప్‌ల మధ్య మార్పు\' సంజ్ఞను పూర్తి చేశారు."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"యాప్‌ల మధ్య మార్చడం కోసం స్వైప్ చేయండి"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"యాప్‌ల మధ్య మారడానికి, మీ స్క్రీన్ కింది వైపు నుండి పైకి స్వైప్ చేసి, పట్టుకుని, తర్వాత వదలండి."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"అంతా సిద్ధంగా ఉంది"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"పూర్తయింది"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"సెట్టింగ్‌లు"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"మళ్లీ ట్రై చేయండి"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"పనితీరు బాగుంది!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ట్యుటోరియల్ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"అంతా సెట్ అయింది!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"మొదటి స్క్రీన్‌కు వెళ్లడానికి పైకి స్వైప్ చేయండి"</string>
     <string name="allset_description" msgid="6350320429953234580">"మీరు మీ ఫోన్‌ను ఉపయోగించడానికి సిద్ధంగా ఉన్నారు"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"సిస్టమ్ నావిగేషన్ సెట్టింగ్‌లు"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"షేర్ చేయండి"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"స్క్రీన్‌షాట్"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ఈ చర్యను యాప్ గానీ, మీ సంస్థ గానీ అనుమతించవు"</string>
-- 
GitLab


From f2b0e01dd87bb62e8fda8c297e7ec8f5f556cd0f Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 14 Jul 2021 21:40:52 +0000
Subject: [PATCH 1610/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I1cb8955229751514f4577ba5d37f8ad1d0ab56c5
---
 go/quickstep/res/values-sq/strings.xml | 27 +++++++++-----------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/go/quickstep/res/values-sq/strings.xml b/go/quickstep/res/values-sq/strings.xml
index 9e379311fd..bc9c429d05 100644
--- a/go/quickstep/res/values-sq/strings.xml
+++ b/go/quickstep/res/values-sq/strings.xml
@@ -5,24 +5,15 @@
     <string name="action_listen" msgid="2370304050784689486">"Dëgjo"</string>
     <string name="action_translate" msgid="8028378961867277746">"Përkthe"</string>
     <string name="action_search" msgid="6269564710943755464">"Lentja"</string>
-    <!-- no translation found for dialog_acknowledge (2804025517675853172) -->
-    <skip />
-    <!-- no translation found for dialog_cancel (6464336969134856366) -->
-    <skip />
-    <!-- no translation found for dialog_settings (6564397136021186148) -->
-    <skip />
+    <string name="dialog_acknowledge" msgid="2804025517675853172">"E KUPTOVA"</string>
+    <string name="dialog_cancel" msgid="6464336969134856366">"ANULO"</string>
+    <string name="dialog_settings" msgid="6564397136021186148">"CILËSIMET"</string>
     <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Përkthe ose dëgjo tekstin në ekran"</string>
     <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Informacionet si teksti në ekranin tënd, adresat e uebit dhe pamjet e ekranit mund të ndahen me Google.\n\nPër të ndryshuar se çfarë informacionesh ndahen, shko te "<b>"Cilësimet &gt; Aplikacionet &gt; Aplikacionet e parazgjedhura &gt; Aplikacioni i asistentit dixhital"</b>"."</string>
-    <!-- no translation found for assistant_not_selected_title (5017072974603345228) -->
-    <skip />
-    <!-- no translation found for assistant_not_selected_text (3244613673884359276) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_title (1675788067597484142) -->
-    <skip />
-    <!-- no translation found for assistant_not_supported_text (1708031078549268884) -->
-    <skip />
-    <!-- no translation found for tooltip_listen (7634466447860989102) -->
-    <skip />
-    <!-- no translation found for tooltip_translate (4184845868901542567) -->
-    <skip />
+    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Zgjidh një asistent për të përdorur këtë veçori"</string>
+    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Për të dëgjuar ose përkthyer tekstin në ekran, zgjidh një aplikacion të asistentit dixhital te \"Cilësimet\""</string>
+    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Ndrysho asistentin për të përdorur këtë veçori"</string>
+    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Për të dëgjuar ose përkthyer tekstin në ekran, ndrysho aplikacionin e asistentit dixhital te \"Cilësimet\""</string>
+    <string name="tooltip_listen" msgid="7634466447860989102">"Trokit këtu për të dëgjuar tekstin në këtë ekran"</string>
+    <string name="tooltip_translate" msgid="4184845868901542567">"Trokit këtu për të përkthyer tekstin në këtë ekran"</string>
 </resources>
-- 
GitLab


From c00f82b9a246a8f440ed2435971b17156c5f82df Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 14 Jul 2021 21:41:32 +0000
Subject: [PATCH 1611/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I66e91e3b191845a9055ab7a7229447b5d73cd06e
---
 res/values-bn/strings.xml     | 3 +--
 res/values-bs/strings.xml     | 3 +--
 res/values-en-rAU/strings.xml | 3 +--
 res/values-en-rCA/strings.xml | 3 +--
 res/values-en-rGB/strings.xml | 3 +--
 res/values-en-rIN/strings.xml | 3 +--
 res/values-es-rUS/strings.xml | 3 +--
 res/values-fa/strings.xml     | 3 +--
 res/values-hr/strings.xml     | 3 +--
 res/values-in/strings.xml     | 3 +--
 res/values-it/strings.xml     | 3 +--
 res/values-lo/strings.xml     | 3 +--
 res/values-pt-rPT/strings.xml | 3 +--
 res/values-pt/strings.xml     | 3 +--
 res/values-sq/strings.xml     | 3 +--
 res/values-sw/strings.xml     | 3 +--
 res/values-te/strings.xml     | 3 +--
 17 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index d74097578b..d39f82a0fa 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g>টি উইজেট"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"হোম স্ক্রিনের যেকোনও জায়গায় উইজেটটি নিয়ে যেতে, টাচ করে ধরে থাকুন"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"হোম স্ক্রিনে যোগ করুন"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> উইজেট হোম স্ক্রিনে যোগ করা হয়েছে"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g>টি উইজেট</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g>টি উইজেট</item>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index b9a3b1d59c..6872e9d89a 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Vidžet <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Dodirnite i držite vidžet da ga pomjerate po Početnom ekranu"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Dodaj na početni ekran"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g> dodan je na početni zaslon"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidžet</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidžeta</item>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index da80b1b37d..aec1cbf5ce 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Touch and hold the widget to move it around the home screen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Add to home screen"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget added to home screen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index da80b1b37d..aec1cbf5ce 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Touch and hold the widget to move it around the home screen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Add to home screen"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget added to home screen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index da80b1b37d..aec1cbf5ce 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Touch and hold the widget to move it around the home screen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Add to home screen"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget added to home screen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index da80b1b37d..aec1cbf5ce 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Touch and hold the widget to move it around the home screen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Add to home screen"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget added to home screen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index b0381f86d1..36387ac060 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Mantén presionado el widget para moverlo por la pantalla principal"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Agregar a pantalla principal"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Se agregó el widget de <xliff:g id="WIDGET_NAME">%1$s</xliff:g> a la pantalla principal"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index e2aaae6b6a..9cc78185d4 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"ابزارک <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ابزارک را لمس کنید و نگه دارید تا آن را در صفحه اصلی حرکت دهید"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"افزودن به صفحه اصلی"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"ابزارک <xliff:g id="WIDGET_NAME">%1$s</xliff:g> به صفحه اصلی اضافه شد"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ابزارک</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ابزارک</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 7561e9586a..eb4456d525 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Dodirnite i zadržite widget da biste ga pomicali po početnom zaslonu"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Dodaj na početni zaslon"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g> dodan je na početni zaslon"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgeta</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 512498d6d9..a7f67bcdd8 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Sentuh lama widget untuk memindahkannya di sekitar Layar utama"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Tambahkan ke Layar utama"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g> ditambahkan ke layar utama"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index fd1f110fda..aee2c73709 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Tocca e tieni premuto il widget per spostarlo nella schermata Home"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Aggiungi a schermata Home"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g> aggiunto alla schermata Home"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 63e005f8e9..934229c64c 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"ວິດເຈັດ <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ແຕະວິດເຈັດຄ້າງໄວ້ເພື່ອຍ້າຍມັນໄປມາຢູ່ໂຮມສະກຣີນ"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ເພີ່ມໄປໃສ່ໂຮມສະກຣີນ"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"ເພີ່ມວິດເຈັດ <xliff:g id="WIDGET_NAME">%1$s</xliff:g> ໃສ່ໂຮມສະກຣີນແລ້ວ"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ວິດເຈັດ</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> ວິດເຈັດ</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 00fa5ce001..f0ba02156a 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Toque sem soltar no widget para o mover à volta do ecrã principal"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Adicionar ao ecrã principal"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g> adicionado ao ecrã principal"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 07c9058cdc..74bca02e82 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Toque no widget e mantenha-o pressionado para movê-lo pela tela inicial"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Adicionar à tela inicial"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g> adicionado à tela inicial"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 1110cd734b..9498d9674d 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> miniaplikacion"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Prek dhe mbaj të shtypur miniaplikacionin për ta lëvizur nëpër \"Ekranin bazë\""</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Shto në \"Ekranin bazë\""</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Miniaplikacioni <xliff:g id="WIDGET_NAME">%1$s</xliff:g> u shtua në ekranin bazë"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> miniaplikacione</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> miniaplikacion</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 8e27312297..43abecb9a2 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Wijeti ya <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Gusa na ushikilie wijeti ili uisogeze kwenye Skrini ya kwanza"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Weka kwenye Skrini ya kwanza"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Umeongeza wijeti ya <xliff:g id="WIDGET_NAME">%1$s</xliff:g> kwenye skrini ya kwanza"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other">Wijeti <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
       <item quantity="one">Wijeti <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g></item>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 854ffedde3..80a6f10bf1 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> విడ్జెట్"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ఈ విడ్జెట్‌ను మొదటి స్క్రీన్‌లో కావాల్సిన చోట ఉంచడానికి, దాన్ని తాకి అలాగే నొక్కి పట్టుకోండి"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"మొదటి స్క్రీన్‌కు జోడించు"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"మొదటి స్క్రీన్‌కు <xliff:g id="WIDGET_NAME">%1$s</xliff:g> విడ్జెట్ జోడించబడింది"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> విడ్జెట్‌లు</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> విడ్జెట్</item>
-- 
GitLab


From 44424572b4bb378995e138e2e5f89c6fcc3a1ca7 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Wed, 14 Jul 2021 11:39:43 -0700
Subject: [PATCH 1612/1664] Fix work profile disable button falsing

Bug: 191996677

Test: before this CL: when tapping on immediately above keyboard when
keyboard is translating or when onApplyWindowInset is called, the
hidden (GONE) view handles touch and triggers work profile to be disabled.

After the CL, the button view is not attached to the parent container
when on personal tab. Also, the onApplyWindowInsets method translations
can only be called when work tab is selected.

Change-Id: Ib3e9a5c4b3280052f9ccb62a199ed256ae4e094f
---
 .../launcher3/allapps/AllAppsContainerView.java    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 516af59d75..d2c71b2afe 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -477,10 +477,6 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
         } else {
             mAH[AdapterHolder.MAIN].setup(findViewById(R.id.apps_list_view), null);
             mAH[AdapterHolder.WORK].recyclerView = null;
-            if (mWorkModeSwitch != null) {
-                ((ViewGroup) mWorkModeSwitch.getParent()).removeView(mWorkModeSwitch);
-                mWorkModeSwitch = null;
-            }
         }
         setupHeader();
 
@@ -532,7 +528,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
 
     @Override
     public void onActivePageChanged(int currentActivePage) {
-        mHeader.setMainActive(currentActivePage == 0);
+        mHeader.setMainActive(currentActivePage == AdapterHolder.MAIN);
         if (mAH[currentActivePage].recyclerView != null) {
             mAH[currentActivePage].recyclerView.bindFastScrollbar();
         }
@@ -541,6 +537,14 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
             mWorkModeSwitch.setWorkTabVisible(currentActivePage == AdapterHolder.WORK
                     && mAllAppsStore.hasModelFlag(
                     FLAG_HAS_SHORTCUT_PERMISSION | FLAG_QUIET_MODE_CHANGE_PERMISSION));
+
+            if (currentActivePage == AdapterHolder.WORK) {
+                if (mWorkModeSwitch.getParent() == null) {
+                    addView(mWorkModeSwitch);
+                }
+            } else {
+                removeView(mWorkModeSwitch);
+            }
         }
     }
 
-- 
GitLab


From 671ffb88ca8543cfe9f33fe6b6dc30e70ee08e38 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Thu, 15 Jul 2021 13:11:59 +0100
Subject: [PATCH 1613/1664] Fix class cast issue in AddItemActivity

AddItemActivity is a standalone activity. There is no Launcher activity
instance. Avoid using LauncherAppWidgetHostView in WidgetCell by
replacing it NavigableAppWidgetHostView instead

Test: Check preview layouts are correctly rendered in widgets picker
      and pin widget dialog. Also test drag and drop to verify the
      local color extraction still works when dragging a preview layout
      from widgets picker to home screen.
Fix: 193765783
Change-Id: I3a734a54941257cebcd7b7f6a4c2c9cc764c5c12
---
 .../android/launcher3/widget/WidgetCell.java  | 37 ++++++++++++++-----
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index 5759f75535..5769ba0c69 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -43,6 +43,7 @@ import androidx.annotation.Nullable;
 import com.android.launcher3.BaseActivity;
 import com.android.launcher3.CheckLongPressHelper;
 import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.icons.RoundDrawableWrapper;
@@ -217,12 +218,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
 
     private void applyPreviewOnAppWidgetHostView(WidgetItem item) {
         if (mRemoteViewsPreview != null) {
-            mAppWidgetHostViewPreview = new NavigableAppWidgetHostView(getContext()) {
-                @Override
-                protected boolean shouldAllowDirectClick() {
-                    return false;
-                }
-            };
+            mAppWidgetHostViewPreview = createAppWidgetHostView(getContext());
             setAppWidgetHostViewPreview(mAppWidgetHostViewPreview, item.widgetInfo,
                     mRemoteViewsPreview);
             return;
@@ -230,10 +226,15 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
 
         if (!item.hasPreviewLayout()) return;
 
-        mAppWidgetHostViewPreview = new LauncherAppWidgetHostView(getContext());
+        Context context = getContext();
+        // If the context is a Launcher activity, DragView will show mAppWidgetHostViewPreview as
+        // a preview during drag & drop. And thus, we should use LauncherAppWidgetHostView, which
+        // supports applying local color extraction during drag & drop.
+        mAppWidgetHostViewPreview = isLauncherContext(context)
+                ? new LauncherAppWidgetHostView(context)
+                : createAppWidgetHostView(context);
         LauncherAppWidgetProviderInfo launcherAppWidgetProviderInfo =
-                LauncherAppWidgetProviderInfo.fromProviderInfo(getContext(),
-                        item.widgetInfo.clone());
+                LauncherAppWidgetProviderInfo.fromProviderInfo(context, item.widgetInfo.clone());
         // A hack to force the initial layout to be the preview layout since there is no API for
         // rendering a preview layout for work profile apps yet. For non-work profile layout, a
         // proper solution is to use RemoteViews(PackageName, LayoutId).
@@ -400,6 +401,24 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
         return "";
     }
 
+    private static NavigableAppWidgetHostView createAppWidgetHostView(Context context) {
+        return new NavigableAppWidgetHostView(context) {
+            @Override
+            protected boolean shouldAllowDirectClick() {
+                return false;
+            }
+        };
+    }
+
+    private static boolean isLauncherContext(Context context) {
+        try {
+            Launcher.getLauncher(context);
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
     @Override
     public CharSequence getAccessibilityClassName() {
         return WidgetCell.class.getName();
-- 
GitLab


From ddedb86ba1f0962881ff735bd5d779475f6022dd Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Thu, 15 Jul 2021 17:17:13 +0000
Subject: [PATCH 1614/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I07a46873b25609c6626be27f535de361b199c313
---
 quickstep/res/values-af/strings.xml        | 18 ++++++------------
 quickstep/res/values-am/strings.xml        | 18 ++++++------------
 quickstep/res/values-as/strings.xml        | 18 ++++++------------
 quickstep/res/values-b+sr+Latn/strings.xml | 18 ++++++------------
 quickstep/res/values-bg/strings.xml        | 18 ++++++------------
 quickstep/res/values-bs/strings.xml        | 10 +++++-----
 quickstep/res/values-ca/strings.xml        | 18 ++++++------------
 quickstep/res/values-cs/strings.xml        | 18 ++++++------------
 quickstep/res/values-da/strings.xml        | 18 ++++++------------
 quickstep/res/values-de/strings.xml        | 18 ++++++------------
 quickstep/res/values-es/strings.xml        | 18 ++++++------------
 quickstep/res/values-et/strings.xml        | 18 ++++++------------
 quickstep/res/values-eu/strings.xml        | 18 ++++++------------
 quickstep/res/values-fi/strings.xml        | 18 ++++++------------
 quickstep/res/values-fr-rCA/strings.xml    | 18 ++++++------------
 quickstep/res/values-fr/strings.xml        | 18 ++++++------------
 quickstep/res/values-gl/strings.xml        | 18 ++++++------------
 quickstep/res/values-gu/strings.xml        | 18 ++++++------------
 quickstep/res/values-hi/strings.xml        | 18 ++++++------------
 quickstep/res/values-hu/strings.xml        | 18 ++++++------------
 quickstep/res/values-hy/strings.xml        | 18 ++++++------------
 quickstep/res/values-is/strings.xml        | 18 ++++++------------
 quickstep/res/values-iw/strings.xml        | 18 ++++++------------
 quickstep/res/values-ja/strings.xml        | 18 ++++++------------
 quickstep/res/values-ka/strings.xml        | 18 ++++++------------
 quickstep/res/values-km/strings.xml        | 18 ++++++------------
 quickstep/res/values-kn/strings.xml        | 18 ++++++------------
 quickstep/res/values-ko/strings.xml        | 18 ++++++------------
 quickstep/res/values-lt/strings.xml        | 18 ++++++------------
 quickstep/res/values-lv/strings.xml        | 18 ++++++------------
 quickstep/res/values-mk/strings.xml        | 18 ++++++------------
 quickstep/res/values-ml/strings.xml        | 18 ++++++------------
 quickstep/res/values-mn/strings.xml        | 18 ++++++------------
 quickstep/res/values-mr/strings.xml        | 18 ++++++------------
 quickstep/res/values-ms/strings.xml        | 18 ++++++------------
 quickstep/res/values-my/strings.xml        | 18 ++++++------------
 quickstep/res/values-nb/strings.xml        | 18 ++++++------------
 quickstep/res/values-ne/strings.xml        | 18 ++++++------------
 quickstep/res/values-nl/strings.xml        | 18 ++++++------------
 quickstep/res/values-or/strings.xml        | 18 ++++++------------
 quickstep/res/values-pa/strings.xml        | 18 ++++++------------
 quickstep/res/values-ro/strings.xml        | 18 ++++++------------
 quickstep/res/values-ru/strings.xml        | 18 ++++++------------
 quickstep/res/values-si/strings.xml        | 18 ++++++------------
 quickstep/res/values-sk/strings.xml        | 18 ++++++------------
 quickstep/res/values-sl/strings.xml        | 18 ++++++------------
 quickstep/res/values-sr/strings.xml        | 18 ++++++------------
 quickstep/res/values-ta/strings.xml        | 18 ++++++------------
 quickstep/res/values-th/strings.xml        | 18 ++++++------------
 quickstep/res/values-tl/strings.xml        | 18 ++++++------------
 quickstep/res/values-tr/strings.xml        | 18 ++++++------------
 quickstep/res/values-uk/strings.xml        | 18 ++++++------------
 quickstep/res/values-uz/strings.xml        | 18 ++++++------------
 quickstep/res/values-vi/strings.xml        | 18 ++++++------------
 quickstep/res/values-zh-rCN/strings.xml    | 18 ++++++------------
 quickstep/res/values-zh-rHK/strings.xml    | 18 ++++++------------
 quickstep/res/values-zh-rTW/strings.xml    | 18 ++++++------------
 quickstep/res/values-zu/strings.xml        | 18 ++++++------------
 58 files changed, 347 insertions(+), 689 deletions(-)

diff --git a/quickstep/res/values-af/strings.xml b/quickstep/res/values-af/strings.xml
index cf2fec725a..433ef861cf 100644
--- a/quickstep/res/values-af/strings.xml
+++ b/quickstep/res/values-af/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Programvoorstelle is geaktiveer"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Programvoorstelle is gedeaktiveer"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Voorspelde program: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Maak seker dat jy van die rand heel regs of heel links af swiep."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Maak seker dat jy van die regter- of linkerrand na die middel van die skerm swiep en laat los."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Jy het geleer hoe om van regs af te swiep om terug te gaan. Nou kan jy leer hoe om tussen programme te wissel."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Jy het die \"gaan terug\"-gebaar voltooi."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Maak seker dat jy nie te naby aan die onderkant van die skerm swiep nie."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Jy het geleer hoe om gebare te gebruik. Gaan na Instellings om gebare af te skakel."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Jy het die \"wissel tussen programme\"-gebaar voltooi."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swiep om tussen programme te wissel"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Swiep van die onderkant van jou skerm af op, hou en laat los dan om tussen programme te wissel."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Gereed"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Klaar"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Instellings"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Probeer weer"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Mooi so!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutoriaal <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Gereed!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Swiep op om na die tuisskerm toe te gaan"</string>
     <string name="allset_description" msgid="6350320429953234580">"Jy is gereed om jou foon te begin gebruik"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Stelselnavigasie-instellings"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Deel"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Skermkiekie"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Jou organisasie laat nie hierdie program toe nie"</string>
diff --git a/quickstep/res/values-am/strings.xml b/quickstep/res/values-am/strings.xml
index 4b57b9bbd0..838dd60918 100644
--- a/quickstep/res/values-am/strings.xml
+++ b/quickstep/res/values-am/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"የመተግበሪያ አስተያየት ጥቆማዎች ነቅቷል"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"የመተግበሪያ አስተያየቶች ቦዝነዋል"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"የተገመተው መተግበሪያ፦ <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"ከቀኝ ጠርዝ ወይም ከግራ ጠርዝ ጥግ ጀምሮ ማንሸራተትዎን ያረጋግጡ።"</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"ከቀኝ ወይም ከግራ ጠርዝ ወደ ማያ ገጹ መሃል ማንሸራተትዎን እና መልቀቅዎን ያረጋግጡ።"</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ወደ ኋላ ለመመለስ ከቀኝ ጀምሮ እንዴት ማንሸራተት እንደሚችሉ አውቀዋል። ቀጥለው መተግበሪያዎችን እንዴት መቀየር እንደሚችሉ ይወቁ።"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ወደኋላ የመመለስ ምልክትን አጠናቀዋል።"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ከማያ ገጹ ታችኛው ክፍል ጋር በጣም ጠጋ ብለው አለማንሸራተትዎን ያረጋግጡ።"</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"የእጅ ምልክቶችን እንዴት እንደሚጠቀሙ ተምረዋል። የእጅ ምልክቶችን ለማጥፋት ወደ ቅንብሮች ይሂዱ።"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"መተግበሪያዎችን የመቀያየር ምልክትን አጠናቀዋል።"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"መተግበሪያዎችን ለመቀየር ያንሸራትቱ"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"በመተግበሪያዎች መካከል ለመቀያየር ከማያ ገጽዎ ግርጌ ወደ ላይ ያንሸራትቱ፣ ይያዙ፣ ከዚያ ይለቀቁ።"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"ሁሉም ዝግጁ"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"ተጠናቋል"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ቅንብሮች"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"እንደገና ሞክር"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ጥሩ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"አጋዥ ሥልጠና <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"ሁሉም ዝግጁ!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"ወደ መነሻ ለመሄድ በጣት ወደ ላይ ማንሸራተት"</string>
     <string name="allset_description" msgid="6350320429953234580">"ስልክዎን መጠቀም ለመጀመር ዝግጁ ነዎት"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"የስርዓት አሰሳ ቅንብሮች"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"አጋራ"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ቅጽበታዊ ገጽ እይታ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ይህ ድርጊት በመተግበሪያው ወይም በእርስዎ ድርጅት አይፈቀድም"</string>
diff --git a/quickstep/res/values-as/strings.xml b/quickstep/res/values-as/strings.xml
index 04653932dd..2551fc41a3 100644
--- a/quickstep/res/values-as/strings.xml
+++ b/quickstep/res/values-as/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"এপৰ পৰামৰ্শসমূহ সক্ষম কৰা আছে"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"এপৰ পৰামৰ্শসমূহ অক্ষম কৰা আছে"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"পূৰ্বানুমান কৰা এপ্: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"আপুনি সোঁ অথবা বাওঁ প্ৰান্তৰৰ একেবাৰে সীমাৰ পৰা ছোৱাইপ কৰাটো নিশ্চিত কৰক।"</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"আপুনি স্ক্ৰীনৰ সোঁ অথবা বাওঁ প্ৰান্তৰৰ পৰা মধ্যভাগলৈকে ছোৱাইপ কৰি এৰি দিয়াটো নিশ্চিত কৰক।"</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"সোঁফালৰ পৰা ছোৱাইপ কৰি কেনেকৈ উভতি যাব লাগে, সেইটো আপুনি জানিলে। ইয়াৰ পাছত, এপ্‌ কেনেকৈ সলনি কৰিব সেয়া জানক।"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"আপুনি উভতি যাওক নিৰ্দেশটো সম্পূৰ্ণ কৰিলে।"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"আপুনি স্ক্ৰীনৰ তলৰ অংশৰ বেছি ওচৰলৈ ছোৱাইপ নকৰাটো নিশ্চিত কৰক।"</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"আপুনি নিৰ্দেশসমূহ কেনেকৈ ব্যৱহাৰ কৰিব লাগে সেয়া জানিলে। নিৰ্দেশসমূহ অফ কৰিবলৈ, ছেটিঙলৈ যাওক।"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"আপুনি এপ্‌ সলনি কৰাৰ নিৰ্দেশটো সম্পূৰ্ণ কৰিলে।"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"এপ্‌ সলনি কৰিবলৈ ছোৱাইপ কৰক"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"এপ্‌সমূহ সালসলনিকৈ ব্যৱহাৰ কৰিবলৈ আপোনাৰ স্ক্ৰীনৰ একেবাৰে তলৰ অংশৰ পৰা ওপৰলৈ ছোৱাইপ কৰি ধৰি ৰাখক আৰু তাৰ পাছত এৰি দিয়ক।"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"সম্পূৰ্ণ সাজু"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"হ’ল"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ছেটিং"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"পুনৰ চেষ্টা কৰক"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"সুন্দৰ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"টিউট’ৰিয়েল <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"সকলো সাজু!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"গৃহ স্ক্ৰীনলৈ যাবলৈ ওপৰলৈ ছোৱাইপ কৰক"</string>
     <string name="allset_description" msgid="6350320429953234580">"আপুনি আপোনাৰ ফ’নটো ব্যৱহাৰ কৰিবলৈ সাজু"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"ছিষ্টেম নেভিগেশ্বনৰ ছেটিং"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"শ্বেয়াৰ কৰক"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"স্ক্ৰীনশ্বট"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"এপ্‌টোৱে অথবা আপোনাৰ প্ৰতিষ্ঠানে এই কাৰ্যটোৰ অনুমতি নিদিয়ে"</string>
diff --git a/quickstep/res/values-b+sr+Latn/strings.xml b/quickstep/res/values-b+sr+Latn/strings.xml
index 1d96f9d942..63de0e1b1a 100644
--- a/quickstep/res/values-b+sr+Latn/strings.xml
+++ b/quickstep/res/values-b+sr+Latn/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Predlozi aplikacija su omogućeni"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Predlozi aplikacija su onemogućeni"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predviđamo aplikaciju: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Obavezno prevucite od same desne ili leve ivice."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Obavezno prevucite od desne ili leve ivice do sredine ekrana i otpustite."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Naučili ste kako da prevlačite zdesna da biste se vratili. Sada naučite da menjate aplikacije."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Dovršili ste pokret za povratak."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nikako ne prevlačite previše blizu dna ekrana."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Naučili ste kako da koristite pokrete. Da biste isključili pokrete, idite na podešavanja."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Dovršili ste pokret za promenu aplikacija."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Prevucite da biste promenili aplikacije"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Za prelazak sa jedne aplikacije na drugu prevucite nagore od dna ekrana, zadržite, pa pustite."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"To je to"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Gotovo"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Podešavanja"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Probajte ponovo"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Svaka čast!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Vodič <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Gotovo!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Prevucite nagore da biste otvorili početni ekran"</string>
     <string name="allset_description" msgid="6350320429953234580">"Spremni ste da počnete da koristite telefon"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Podešavanja kretanja kroz sistem"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Deli"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Snimak ekrana"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikacija ili organizacija ne dozvoljavaju ovu radnju"</string>
diff --git a/quickstep/res/values-bg/strings.xml b/quickstep/res/values-bg/strings.xml
index cf43c76d63..37a2e57c09 100644
--- a/quickstep/res/values-bg/strings.xml
+++ b/quickstep/res/values-bg/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Предложенията за приложения са активирани"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Функцията „Предложения за приложения“ е деактивирана"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Предвидено приложение: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Трябва да прекарате пръст от най-дясната или най-лявата част на екрана."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Трябва да прекарате пръст от десния или левия край на екрана до средата, след което да освободите."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Научихте жеста за връщане с плъзгане от дясно. Сега научете как се превключва между приложения."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Изпълнихте жеста за връщане назад."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Не прекарвайте пръст твърде близо до долната част на екрана."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Научихте как да използвате жестовете. За да ги изключите, отворете настройките."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Изпълнихте жеста за превключване между приложения."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Прекарване на пръст за превключване между приложенията"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"За да превкл. между прил., прекарайте пръст нагоре от долната част на екрана, задръжте и освободете"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Готово"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Готово"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Настройки"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Опитайте отново"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Чудесно!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Урок <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Готово!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Прекарайте пръст нагоре, за да отворите началния екран"</string>
     <string name="allset_description" msgid="6350320429953234580">"Можете да започнете да използвате телефона си"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Настройки за навигиране в системата"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Споделяне"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Екранна снимка"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Това действие не е разрешено от приложението или организацията ви"</string>
diff --git a/quickstep/res/values-bs/strings.xml b/quickstep/res/values-bs/strings.xml
index 95b5f8e577..7e63a67d3c 100644
--- a/quickstep/res/values-bs/strings.xml
+++ b/quickstep/res/values-bs/strings.xml
@@ -45,8 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Prijedlozi aplikacija su omogućeni"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Prijedlozi aplikacija su onemogućeni"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predviđena aplikacija: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Pazite da prijeđete prstom od krajnjeg desnog ili krajnjeg lijevog ruba."</string>
-    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Pazite da prijeđete prstom od desnog ili lijevog ruba do sredine zaslona i podignite prst."</string>
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Vodite računa da prevučete s krajnjeg desnog ili krajnjeg lijevog ruba."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Vodite računa da prevučete s desnog ili lijevog ruba prema sredini ekrana i pustite."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Naučili ste kako prevući zdesna da se vratite. Sljedeće naučite kako prebacivati između aplikacija."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Završili ste pokret za vraćanje."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Obratite pažnju da ne prevučete preblizu donjem dijelu ekrana."</string>
@@ -66,7 +66,7 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Naučili ste kako koristiti pokrete. Idite u Postavke da isključite pokrete."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Završili ste pokret za prebacivanje između aplikacija."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Prevucite da prebacujete između aplikacija"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Za promjenu aplikacije prijeđite prstom od dna zaslona prema gore, zadržite pritisak pa pustite."</string>
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Da prebacujete između aplikacija, prevucite s dna ekrana prema gore, zadržite, a zatim pustite."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Sve je spremno"</string>
     <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Gotovo"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Postavke"</string>
@@ -74,9 +74,9 @@
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Odlično!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Vodič <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Sve je spremno!"</string>
-    <string name="allset_hint" msgid="2384632994739392447">"Prijeđite prstom prema gore da biste otvorili početni zaslon"</string>
+    <string name="allset_hint" msgid="2384632994739392447">"Prevucite prema gore da odete na početnu stranicu"</string>
     <string name="allset_description" msgid="6350320429953234580">"Sve je spremno da počnete koristiti telefon"</string>
-    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Postavke navigacije sustavom"</annotation></string>
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Postavke navigiranja sistemom"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Dijeli"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Snimak ekrana"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Ovu radnju ne dozvoljava aplikacija ili vaša organizacija"</string>
diff --git a/quickstep/res/values-ca/strings.xml b/quickstep/res/values-ca/strings.xml
index e7ee842eb3..9fe61c79fe 100644
--- a/quickstep/res/values-ca/strings.xml
+++ b/quickstep/res/values-ca/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Els suggeriments d\'aplicacions estan activats"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Els suggeriments d\'aplicacions estan desactivats"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predicció d\'aplicació: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Assegura\'t de lliscar des de l\'extrem dret o esquerre de la pantalla."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Assegura\'t de lliscar des de la vora dreta o esquerra cap al centre de la pantalla i deixar anar."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Has après com pots lliscar des de la dreta per tornar enrere. Ara, descobreix com pots canviar d\'app."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Has completat el gest per tornar enrere."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Assegura\'t de no lliscar massa a prop de la part inferior de la pantalla."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Has après a utilitzar els gestos. Per desactivar-los, ves a Configuració."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Has completat el gest per canviar d\'aplicació."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Llisca per canviar d\'aplicació"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Per canviar entre aplicacions, llisca cap amunt des de la part inferior, mantén premut i deixa anar."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Tot a punt"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Fet"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Configuració"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Torna-ho a provar"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Molt bé!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Tot a punt!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Llisca cap amunt per anar a la pàgina d\'inici"</string>
     <string name="allset_description" msgid="6350320429953234580">"Ja pots començar a utilitzar el telèfon"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Configuració de navegació del sistema"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Comparteix"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Captura de pantalla"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"L\'aplicació o la teva organització no permeten aquesta acció"</string>
diff --git a/quickstep/res/values-cs/strings.xml b/quickstep/res/values-cs/strings.xml
index e780070f6e..b2d092e07d 100644
--- a/quickstep/res/values-cs/strings.xml
+++ b/quickstep/res/values-cs/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Návrhy aplikací jsou povoleny"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Návrhy aplikací jsou zakázány"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Předpokládaná aplikace: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Přejeďte prstem z úplného pravého nebo levého okraje obrazovky."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Přejeďte prstem z pravého nebo levého okraje doprostřed obrazovky a zdvihněte prst."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Naučili jste se, jak se vrátit zpět přejetím prstem zprava. Teď se naučíte přepínat aplikace."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Dokončili jste gesto pro přechod zpět."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Dejte pozor, abyste prstem nepřejížděli moc blízko ke spodnímu okraji obrazovky."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Naučili jste se používat gesta. Gesta můžete vypnout v nastavení."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Dokončili jste gesto pro přepínání aplikací."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Přepínání aplikací přejetím prstem"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Přepínání mezi aplikacemi: Přejeďte nahoru z dolního okraje obrazovky, podržte obrazovku a uvolněte."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Vše je nastaveno"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Hotovo"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Nastavení"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Zkusit znovu"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Skvělé!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Výukový program <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Hotovo!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Přejetím nahoru se vrátíte na plochu"</string>
     <string name="allset_description" msgid="6350320429953234580">"Jste připraveni začít používat telefon"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Nastavení navigace v systému"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Sdílet"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Snímek obrazovky"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikace nebo organizace zakazuje tuto akci"</string>
diff --git a/quickstep/res/values-da/strings.xml b/quickstep/res/values-da/strings.xml
index e473c1e053..aa3df34bc4 100644
--- a/quickstep/res/values-da/strings.xml
+++ b/quickstep/res/values-da/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Appforslag er aktiveret"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Appforslag er deaktiveret"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"App, du forventes at skulle bruge: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Stryg fra kanten yderst til højre eller venstre."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Stryg fra højre eller venstre kant mod midten af skærmen, og løft fingeren."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Du har lært, hvordan du stryger fra højre for at gå tilbage. Nu skal du se, hvordan du skifter app."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Du har fuldført bevægelsen for Gå tilbage."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Undgå at stryge for tæt på bunden af skærmen."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Du har lært, hvordan du bruger bevægelser. Du kan aktivere bevægelser i Indstillinger."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Du har fuldført bevægelsen for Skift app."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Stryg for at skifte app"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Skift mellem apps ved at stryge opad fra bunden af skærmen, holde fingeren stille og løfte den."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Så er du klar"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Luk"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Indstillinger"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Prøv igen"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Sådan!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Selvstudie <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Alt er parat!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Stryg opad for at gå til startsiden"</string>
     <string name="allset_description" msgid="6350320429953234580">"Du er klar til at bruge din telefon"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Indstillinger for systemnavigation"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Del"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Appen eller din organisation tillader ikke denne handling"</string>
diff --git a/quickstep/res/values-de/strings.xml b/quickstep/res/values-de/strings.xml
index 701bc29ffe..483f362e70 100644
--- a/quickstep/res/values-de/strings.xml
+++ b/quickstep/res/values-de/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Funktion „App-Vorschläge“ aktiviert"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Funktion \"App-Vorschläge\" deaktiviert"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Vorgeschlagene App: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Wische vom äußersten rechten oder linken Displayrand."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Wische vom rechten oder linken Displayrand zur Displaymitte und lass los."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Du kannst jetzt vom rechten Displayrand aus wischen, um zurückzugehen. Gleich erfährst du, wie man zwischen Apps wechselt."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Du hast die „Zurück“-Touch-Geste abgeschlossen."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Wische nicht zu nah am unteren Displayrand."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Nun weißt du, wie Touch-Gesten funktionieren. Du kannst sie in den Einstellungen deaktivieren."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Du hast die „Apps wechseln“-Touch-Geste abgeschlossen."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Zwischen Apps wechseln"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Wische auf dem Display von unten nach oben und lass dann los, um zwischen Apps zu wechseln."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Fertig"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Fertig"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Einstellungen"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Wiederholen"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Sehr gut!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Anleitung <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Fertig!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Nach oben wischen, um den Startbildschirm aufzurufen"</string>
     <string name="allset_description" msgid="6350320429953234580">"Du kannst dein Smartphone jetzt verwenden"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Einstellungen der Systemsteuerung"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Teilen"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Die App oder deine Organisation lässt diese Aktion nicht zu"</string>
diff --git a/quickstep/res/values-es/strings.xml b/quickstep/res/values-es/strings.xml
index 6c2db2d79f..8e8829eaf7 100644
--- a/quickstep/res/values-es/strings.xml
+++ b/quickstep/res/values-es/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Sugerencias de aplicaciones habilitadas"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Las sugerencias de aplicaciones están inhabilitadas"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplicación sugerida: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Desliza el dedo desde el borde derecho o izquierdo de la pantalla."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Desliza el dedo desde el borde derecho o izquierdo de la pantalla hasta el centro y luego levántalo."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Ya sabes deslizar el dedo desde la derecha para ir atrás. Descubre ahora cómo cambiar de aplicación."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Has completado el gesto para volver."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"No deslices el dedo demasiado cerca de la parte inferior de la pantalla."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Ya sabes cómo utilizar gestos. Para desactivarlos, ve a Configuración."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Has completado el gesto para cambiar de aplicación."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Deslizar el dedo para cambiar de aplicación"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Para cambiar de app, desliza el dedo hacia arriba desde el borde inferior y no lo levantes enseguida."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Todo listo"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Hecho"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Ajustes"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Vuélvelo a intentar"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"¡Muy bien!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"¡Ya está!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Desliza el dedo hacia arriba para ir a la pantalla de inicio"</string>
     <string name="allset_description" msgid="6350320429953234580">"Ya puedes empezar a usar tu teléfono"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Ajustes de navegación del sistema"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Compartir"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Hacer captura"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"No puedes hacerlo porque la aplicación o tu organización no lo permiten"</string>
diff --git a/quickstep/res/values-et/strings.xml b/quickstep/res/values-et/strings.xml
index df7db835fd..6145562769 100644
--- a/quickstep/res/values-et/strings.xml
+++ b/quickstep/res/values-et/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Rakenduste soovitused on lubatud"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Rakenduste soovitused on keelatud"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Ennustatud rakendus: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Pühkige kindlasti parem- või vasakpoolsest servast."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Pühkige ekraanikuva paremast või vasakust servast keskele ja eemaldage sõrm."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Õppisite, kuidas tagasiliikumiseks paremalt pühkida. Nüüd vaadake, kuidas rakenduste vahel vahetada."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Tegite tagasiliikumise liigutuse."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Veenduge, et te ei pühiks liiga ekraanikuva allosa lähedalt."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Õppisite liigutusi kasutama. Liigutuste väljalülitamiseks avage seaded."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Tegite rakenduste vahel vahetamise liigutuse."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Rakenduste vahel vahetamiseks pühkimine"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Rakenduste vahel vahetamiseks pühkige ekraanikuva alaosast üles, hoidke ja seejärel vabastage."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Valmis"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Valmis"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Seaded"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Proovige uuesti"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Tubli töö!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Õpetus <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Valmis!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Avakuvale liikumiseks pühkige üles"</string>
     <string name="allset_description" msgid="6350320429953234580">"Olete valmis oma telefoni kasutama"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Süsteemi navigeerimisseaded"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Jaga"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Ekraanipilt"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Rakendus või teie organisatsioon on selle toimingu keelanud"</string>
diff --git a/quickstep/res/values-eu/strings.xml b/quickstep/res/values-eu/strings.xml
index 97cdc014e3..3b7d3672af 100644
--- a/quickstep/res/values-eu/strings.xml
+++ b/quickstep/res/values-eu/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Gaituta daude aplikazioen iradokizunak"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Desgaituta daude aplikazioen iradokizunak"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Iragarritako aplikazioa: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Ziurtatu hatza pantailaren eskuineko edo ezkerreko ertzetik hasten zarela pasatzen."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Ziurtatu hatza pantailaren eskuineko edo ezkerreko ertzetik erdialdera pasatzen eta altxatzen duzula."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Hatza eskuinetik pasatuta atzera egiten ikasi duzu. Jarraian, ikasi aplikazioa aldatzen."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ikasi duzu atzera egiteko keinua."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ziurtatu hatza ez duzula pantailaren behealdetik gertuegi pasatzen."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Ikasi duzu keinuak erabiltzen. Keinuak desaktibatzeko, joan ezarpenetara."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Ikasi duzu aplikazioa aldatzeko keinua."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Pasatu hatza aplikazioa aldatzeko"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Aplikazio batetik bestera joateko, pasatu hatza pantailaren behealdetik gora, eduki pantaila sakatuta eta altxatu hatza."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Dena prest"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Eginda"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Ezarpenak"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Saiatu berriro"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Ederki!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutoriala: <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Dena prest!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Pasatu hatza gora hasierako pantailara joateko"</string>
     <string name="allset_description" msgid="6350320429953234580">"Prest zaude telefonoa erabiltzen hasteko"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Sisteman nabigatzeko ezarpenak"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Partekatu"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Atera pantaila-argazki bat"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikazioak edo erakundeak ez du eman ekintza hori gauzatzeko baimena"</string>
diff --git a/quickstep/res/values-fi/strings.xml b/quickstep/res/values-fi/strings.xml
index 3a93b77fb0..8762feb139 100644
--- a/quickstep/res/values-fi/strings.xml
+++ b/quickstep/res/values-fi/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Sovellusehdotukset käytössä"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Sovellusehdotukset on poistettu käytöstä"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Ennakoitu sovellus: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Muista pyyhkäistä aivan oikeasta tai vasemmasta reunasta."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Pyyhkäise näytön oikeasta tai vasemmasta reunasta keskelle ja päästä irti."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Osaat palata takaisin pyyhkäisemällä oikeasta reunasta. Opettele seuraavaksi vaihtamaan sovellusta."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Olet oppinut Takaisin-eleen."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Varo, ettet pyyhkäise liian lähellä alareunaa."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Olet oppinut käyttämään eleitä. Jos haluat laittaa eleet pois päältä, avaa Asetukset."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Olet oppinut sovellusten vaihtamiseleen."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Vaihda sovellusta pyyhkäisemällä"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Voit vaihtaa sovelluksesta toiseen pyyhkäisemällä ylöspäin näytön alareunasta ja päästämällä sitten irti."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Valmista"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Valmis"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Asetukset"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Yritä uudelleen"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Hienoa!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Ohje <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Valmis"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Siirry aloitusnäytölle pyyhkäisemällä ylös"</string>
     <string name="allset_description" msgid="6350320429953234580">"Olet valmis aloittamaan puhelimen käytön"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Järjestelmän navigointiasetukset"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Jaa"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Kuvakaappaus"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Sovellus tai organisaatio ei salli tätä toimintoa"</string>
diff --git a/quickstep/res/values-fr-rCA/strings.xml b/quickstep/res/values-fr-rCA/strings.xml
index a0742b5ec0..f7b0605ede 100644
--- a/quickstep/res/values-fr-rCA/strings.xml
+++ b/quickstep/res/values-fr-rCA/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Les suggestions d\'applications sont activées"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Les suggestions d\'applications sont désactivées"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Application prédite : <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Assurez-vous de balayer l\'écran à partir de l\'extrémité droite ou gauche."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Balayez l\'écran de l\'extrémité droite ou gauche jusqu\'au centre de l\'écran, puis levez le doigt."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Vous avez appris à balayer de la droite pour revenir en arrière. Apprenez comment changer d\'appli."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Vous avez appris le geste de retour en arrière."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Assurez-vous de ne pas balayer trop près du bas de l\'écran."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Vous avez appris à utiliser les gestes. Pour les désactiver, accédez au menu Paramètres."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Vous avez appris le geste de changement d\'application."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Balayer pour basculer entre les applications"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Pour passer d\'une application à l\'autre, balayez l\'écran de bas en haut, maintenez la pression, puis relâchez."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Terminé"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"OK"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Paramètres"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Réessayer"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bien!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Étape <xliff:g id="CURRENT">%1$d</xliff:g> sur <xliff:g id="TOTAL">%2$d</xliff:g> du tutoriel"</string>
     <string name="allset_title" msgid="5021126669778966707">"Tout est prêt!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Balayez l\'écran vers le haut pour accéder à l\'écran d\'accueil"</string>
     <string name="allset_description" msgid="6350320429953234580">"Vous êtes maintenant prêt à utiliser votre téléphone"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Paramètres de navigation du système"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Partager"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Capture d\'écran"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"L\'application ou votre organisation n\'autorise pas cette action"</string>
diff --git a/quickstep/res/values-fr/strings.xml b/quickstep/res/values-fr/strings.xml
index e36999ae14..dca9705689 100644
--- a/quickstep/res/values-fr/strings.xml
+++ b/quickstep/res/values-fr/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Suggestions d\'applications activées"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Les suggestions d\'applications sont désactivées"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Application prédite : <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Veillez à bien balayer l\'écran depuis le bord gauche ou droit."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Balayez bien l\'écran depuis le bord gauche ou droit jusqu\'au centre avant de relever le doigt."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Vous avez appris à balayer depuis droite pour revenir en arrière. Apprenez à passer d\'une appli à l\'autre."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Vous avez appris le geste pour revenir en arrière."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Veillez à ne pas balayer l\'écran trop près du bas."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Vous avez appris à utiliser les gestes. Pour les désactiver, accédez aux paramètres."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Vous avez appris le geste pour passer d\'une appli à l\'autre."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Balayer pour passer d\'une appli à l\'autre"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Pour changer d\'appli, balayez l\'écran du bas vers le haut, appuyez de manière prolongée et relâchez."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Vous avez terminé"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"OK"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Paramètres"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Réessayez"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bravo !"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutoriel <xliff:g id="CURRENT">%1$d</xliff:g> sur <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Tout est prêt !"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Balayez l\'écran vers le haut pour revenir à l\'accueil"</string>
     <string name="allset_description" msgid="6350320429953234580">"Vous êtes prêt à utiliser votre téléphone"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Paramètres de navigation système"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Partager"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Capture d\'écran"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Cette action n\'est pas autorisée par l\'application ou par votre organisation"</string>
diff --git a/quickstep/res/values-gl/strings.xml b/quickstep/res/values-gl/strings.xml
index 5496b472f7..baa87e723b 100644
--- a/quickstep/res/values-gl/strings.xml
+++ b/quickstep/res/values-gl/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"As suxestións de aplicacións están activadas"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"As suxestións de aplicacións están desactivadas"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplicación predita: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Asegúrate de pasar o dedo desde o bordo dereito ou esquerdo máis afastado."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Asegúrate de pasar o dedo desde o bordo dereito ou esquerdo ata o medio da pantalla e avanza."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Aprendiches a pasar o dedo desde a dereita para volver. Agora, aprende a cambiar de aplicación."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Completaches o xesto de volver á última pantalla."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Asegúrate de non pasar o dedo demasiado preto da parte inferior da pantalla."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Aprendiches a usar os xestos. Para desactivalos, vai a Configuración."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Completaches o xesto para cambiar de aplicación."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Pasar o dedo para cambiar de aplicación"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Para cambiar de aplicación, pasa o dedo cara arriba desde abaixo, mantén premido e levanta o dedo."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Todo listo"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Feito"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Configuración"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Téntao de novo"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Excelente!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Titorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Todo listo"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Pasa o dedo cara arriba para ir á pantalla de inicio"</string>
     <string name="allset_description" msgid="6350320429953234580">"Todo está listo para comezar a utilizar o teléfono"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Configuración da navegación do sistema"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Compartir"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Facer captura"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"A aplicación ou a túa organización non permite realizar esta acción"</string>
diff --git a/quickstep/res/values-gu/strings.xml b/quickstep/res/values-gu/strings.xml
index 2e99036f50..33e86171d8 100644
--- a/quickstep/res/values-gu/strings.xml
+++ b/quickstep/res/values-gu/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ઍપના સુઝાવો ચાલુ છે"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ઍપના સુઝાવો બંધ છે"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"પૂર્વાનુમાનિત ઍપ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"ખાતરી કરો કે તમે એકદમ દૂરની જમણી કે ડાબી કિનારીએથી સ્વાઇપ કરો છો."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"ખાતરી કરો કે તમે જમણી કે ડાબી કિનારીએથી સ્ક્રીનના મધ્ય ભાગ સુધી સ્વાઇપ કરો છો અને આંગળી ઊંચકી લો છો."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"પાછળ જવા જમણેથી કેવી રીતે સ્વાઇપ કરવું એ તમે શીખી લીધું છે. હવે પછી, ઍપ સ્વિચ કરવાની રીત જાણો."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"તમે પાછા જવાનો સંકેત પૂર્ણ કર્યો છે."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ખાતરી કરો કે તમારાથી સ્ક્રીનની એકદમ નીચેની કિનારીની ખૂબ નજીક સુધી સ્વાઇપ ન થઈ જાય."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"સંકેતોનો ઉપયોગ કરવાની રીત વિશે તમે જાણ્યું. સંકેતો બંધ કરવા, સેટિંગમાં જાઓ."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"તમે ઍપ સ્વિચ કરવાનો સંકેત પૂર્ણ કર્યો છે."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ઍપ સ્વિચ કરવા સ્વાઇપ કરો"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"એક ઍપ પરથી બીજી ઍપ પર સ્વિચ કરવા માટે, તમારી સ્ક્રીનના નીચેના ભાગથી ઉપરની તરફ સ્વાઇપ કરીને, થોડીવાર દબાવી રાખો, પછી છોડી દો."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"બધું સેટ થઈ ગયું"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"થઈ ગયું"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"સેટિંગ"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ફરી પ્રયાસ કરો"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"સરસ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ટ્યૂટૉરિઅલ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"બધું સેટ થઈ ગયું!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"હોમપેજ પર જવા માટે ઉપરની તરફ સ્વાઇપ કરો"</string>
     <string name="allset_description" msgid="6350320429953234580">"તમે તમારા ફોનનો ઉપયોગ કરવા માટે તૈયાર છો"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"સિસ્ટમના નૅવિગેશન સેટિંગ"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"શેર કરો"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"સ્ક્રીનશૉટ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ઍપ કે તમારી સંસ્થા દ્વારા આ ક્રિયા કરવાની મંજૂરી નથી"</string>
diff --git a/quickstep/res/values-hi/strings.xml b/quickstep/res/values-hi/strings.xml
index 75879872e5..86f9017b30 100644
--- a/quickstep/res/values-hi/strings.xml
+++ b/quickstep/res/values-hi/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"सुझाए गए ऐप्लिकेशन की सुविधा चालू है"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"सुझाए गए ऐप्लिकेशन की सुविधा बंद है"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"सुझाया गया ऐप्लिकेशन: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"पक्का करें कि आप स्क्रीन की दाईं या बाईं ओर के बिल्कुल किनारे से स्वाइप कर रहे हों."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"पक्का करें कि आप स्क्रीन के दाएं या बाएं किनारे से, स्क्रीन के बीच तक स्वाइप करें और फिर अपनी उंगली उठा लें."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"आपने स्क्रीन के दाएं किनारे से स्वाइप करके, पिछली स्क्रीन पर वापस जाने का तरीका सीख लिया है. अब, एक ऐप से दूसरे ऐप पर जाने का तरीका सीखें."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"आपने पेज पर पीछे ले जाने वाले हाथ के जेस्चर (हाव-भाव) के बारे में जान लिया है."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"देखे लें कि आप स्क्रीन पर बिल्कुल नीचे तक स्वाइप न कर रहे हों."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"आपने हाथ के जेस्चर (हाव-भाव) इस्तेमाल करने सीख लिए हैं. जेस्चर बंद करने के लिए, सेटिंग में जाएं."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"आपने एक ऐप्लिकेशन से दूसरे पर जाने के लिए इस्तेमाल होने वाले हाथ के जेस्चर के बारे में जान लिया है."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"एक ऐप्लिकेशन से दूसरे पर जाने के लिए स्वाइप करें"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"एक ऐप से दूसरे पर जाने के लिए, स्क्रीन पर नीचे से ऊपर की ओर स्वाइप करें, दबाकर रखें, और फिर छोड़ दें."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"आप पूरी तरह तैयार हैं"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"हो गया"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"सेटिंग"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"फिर से कोशिश करें"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"बहुत बढ़िया!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ट्यूटोरियल <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"हो गया!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"होम स्क्रीन पर जाने के लिए, ऊपर की ओर स्वाइप करें"</string>
     <string name="allset_description" msgid="6350320429953234580">"अब आप अपना फ़ोन इस्तेमाल कर सकते हैं"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"सिस्टम नेविगेशन सेटिंग"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"शेयर करें"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"स्क्रीनशॉट लें"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ऐप्लिकेशन या आपका संगठन इस कार्रवाई की अनुमति नहीं देता"</string>
diff --git a/quickstep/res/values-hu/strings.xml b/quickstep/res/values-hu/strings.xml
index 54fc23ecda..e9bd2bff8c 100644
--- a/quickstep/res/values-hu/strings.xml
+++ b/quickstep/res/values-hu/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Alkalmazásjavaslatok engedélyezve"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Alkalmazásjavaslatok letiltva"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Várható alkalmazás: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Csúsztasson a képernyő jobb vagy bal széléről."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Csúsztassa ujját a képernyő jobb vagy bal széléről a képernyő közepéig, majd emelje fel."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Megtanulta, hogyan léphet vissza jobbról csúsztatva. A következő az appok közötti váltás."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Teljesítette a visszalépési kézmozdulatot."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ne csúsztasson túl közel a képernyő aljához."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Eddig megismerhette a kézmozdulatok használatát. A kézmozdulatokat a Beállításokban kapcsolhatja ki."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Teljesítette az alkalmazásváltás kézmozdulatát."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Alkalmazásváltás csúsztatással"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Appok közti váltáshoz csúsztasson felfelé a kép aljáról, tartsa lenyomva az ujját, majd emelje fel."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Minden kész"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Kész"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Beállítások"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Újra"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Remek!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Útmutató (<xliff:g id="TOTAL">%2$d</xliff:g>/<xliff:g id="CURRENT">%1$d</xliff:g>.)"</string>
     <string name="allset_title" msgid="5021126669778966707">"Kész is!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Felfelé csúsztatva megjelenik a Kezdőképernyő"</string>
     <string name="allset_description" msgid="6350320429953234580">"Készen áll a telefon használatára"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Rendszer-navigációs beállítások"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Megosztás"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Képernyőkép"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Az alkalmazás vagy az Ön szervezete nem engedélyezi ezt a műveletet"</string>
diff --git a/quickstep/res/values-hy/strings.xml b/quickstep/res/values-hy/strings.xml
index 01edb15d7d..e2c0af37c2 100644
--- a/quickstep/res/values-hy/strings.xml
+++ b/quickstep/res/values-hy/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"«Առաջարկվող հավելվածներ» գործառույթը միացված է"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"«Առաջարկվող հավելվածներ» գործառույթն անջատված է"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Առաջարկվող հավելված՝ <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Համոզվեք, որ մատը սահեցնում եք էկրանի աջ կամ ձախ եզրից։"</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Մատը սահեցրեք էկրանի աջ կամ ձախ եզրից դեպի կենտրոն և բաց թողեք։"</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Դուք սովորեցիք՝ ինչպես մատը աջից սահեցնելով հետ գնալ։ Այժմ սովորենք՝ ինչպես անցնել մի հավելվածից մյուսը։"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Դուք սովորեցիք հետ գնալու ժեստը։"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Համոզվեք, որ մատը չափազանց մոտ չեք սահեցնում էկրանին ներքևի հատվածին։"</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Դուք սովորեցիք՝ ինչպես օգտագործել ժեստերը։ Ժեստերը կարող եք անջատել կարգավորումներում։"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Դուք սովորեցիք մի հավելվածից մյուսն անցնելու ժեստը։"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Մատը սահեցրեք՝ մյուս հավելվածին անցնելու համար"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Մեկ հավելվածից մյուսն անցնելու համար մատը էկրանի ներքևից սահեցրեք վերև, ապա հեռացրեք այն էկրանից։"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Պատրաստ է"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Պատրաստ է"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Կարգավորումներ"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Նորից փորձեք"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Գերազանց է"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Ուղեցույց <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Պատրաստ է"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Մատը սահեցրեք վերև՝ հիմնական էկրան անցնելու համար"</string>
     <string name="allset_description" msgid="6350320429953234580">"Դուք արդեն կարող եք օգտագործել ձեր հեռախոսը"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Նավիգացիայի համակարգային կարգավորումներ"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Կիսվել"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Սքրինշոթ անել"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Այս գործողությունն արգելված է հավելվածի կամ ձեր կազմակերպության կողմից"</string>
diff --git a/quickstep/res/values-is/strings.xml b/quickstep/res/values-is/strings.xml
index 8657639df4..eeebc7136b 100644
--- a/quickstep/res/values-is/strings.xml
+++ b/quickstep/res/values-is/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Kveikt á tillögum að forritum"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Slökkt er á tillögðum forritum"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Tillaga að forriti: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Passaðu að strjúka frá jaðri hægri eða vinstri brúnar."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Passaðu að strjúka frá jaðri hægri eða vinstri brúnar að miðju skjásins og sleppa síðan."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Þú lærðir að strjúka frá hægri til að bakka. Næst skaltu læra hvernig þú skiptir á milli forrita."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Þú laukst við að kynna þér bendinguna „til baka“."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Passaðu að strjúka ekki of nálægt neðri brún skjásins."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Þú kynntir þér hvernig á að nota bendingar. Opnaðu stillingar til að slökkva á bendingum."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Þú laukst við að kynna þér bendinguna „skipta um forrit“."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Strjúktu til að skipta á milli forrita"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Strjúktu upp frá neðri hluta skjásins, haltu og slepptu svo til að skipta á milli forrita."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Allt til reiðu"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Lokið"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Stillingar"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Reyna aftur"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Flott!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Leiðsögn <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Allt tilbúið!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Strjúktu upp til að fara á heimaskjáinn"</string>
     <string name="allset_description" msgid="6350320429953234580">"Þú getur byrjað að nota símann"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Stillingar kerfisstjórnunar"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Deila"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Skjámynd"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Forritið eða fyrirtækið leyfir ekki þessa aðgerð"</string>
diff --git a/quickstep/res/values-iw/strings.xml b/quickstep/res/values-iw/strings.xml
index 65e8374e20..267769093b 100644
--- a/quickstep/res/values-iw/strings.xml
+++ b/quickstep/res/values-iw/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"התכונה \'הצעות לאפליקציות\' מופעלת"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ההצעות לאפליקציות מושבתות"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"האפליקציות החזויות: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"חשוב להקפיד להחליק מהקצה השמאלי או הימני."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"חשוב להקפיד להחליק מהקצה השמאלי או הימני למרכז המסך ואז לשחרר."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"למדת איך להחליק מצד ימין כדי לחזור אחורה. בשלב הבא לומדים איך לעבור בין אפליקציות."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"השלמת את תנועת \'הקודם\'."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"חשוב להקפיד שלא להחליק קרוב מדי לתחתית המסך."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"למדת איך להשתמש בתנועות. ניתן להשבית את התנועות ב\'הגדרות\'."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"השלמת את תנועת המעבר בין האפליקציות."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"יש להחליק כדי לעבור בין אפליקציות"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"כדי לעבור בין אפלקציות, יש להחליק למעלה מתחתית המסך, להחזיק ולאחר מכן לשחרר."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"הכול מוכן"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"סיום"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"הגדרות"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ניסיון חוזר"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"איזה יופי!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"מדריך <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"הכול מוכן!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"כדי לעבור לדף הבית, מחליקים כלפי מעלה"</string>
     <string name="allset_description" msgid="6350320429953234580">"הכול מוכן ואפשר להתחיל להשתמש בטלפון"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"הגדרות הניווט של המערכת"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"שיתוף"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"צילום מסך"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"האפליקציה או הארגון שלך אינם מתירים את הפעולה הזאת"</string>
diff --git a/quickstep/res/values-ja/strings.xml b/quickstep/res/values-ja/strings.xml
index 4a42a12f81..3ee1b99b08 100644
--- a/quickstep/res/values-ja/strings.xml
+++ b/quickstep/res/values-ja/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"アプリの候補表示が有効です"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"アプリの候補は無効です"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"予測されたアプリ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"右端または左端からスワイプしてください。"</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"画面の右端または左端から中央に向かってスワイプし、指を離してください。"</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"右側からスワイプして前の画面に戻る方法を学習しました。次は、アプリを切り替える方法を覚えましょう。"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"「戻る」操作を完了しました。"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"スワイプする際は画面の下部に近づきすぎないようにしましょう。"</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"主な操作方法を覚えました。操作を OFF にするには、設定に移動してください。"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"「アプリを切り替える」操作を完了しました。"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"スワイプでアプリを切り替え"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"アプリを切り替えるには、画面を下から上にスワイプして長押しし、指を離します。"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"設定完了"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"完了"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"設定"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"もう一度"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"成功しました"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"チュートリアル <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"設定完了"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"ホームに移動するには上にスワイプします"</string>
     <string name="allset_description" msgid="6350320429953234580">"スマートフォンを使い始めることができます"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"システム ナビゲーションの設定"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"共有"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"スクリーンショット"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"この操作はアプリまたは組織で許可されていません"</string>
diff --git a/quickstep/res/values-ka/strings.xml b/quickstep/res/values-ka/strings.xml
index 617d7214ee..ab3715aafb 100644
--- a/quickstep/res/values-ka/strings.xml
+++ b/quickstep/res/values-ka/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"აპის შეთავაზებები ჩართულია"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"აპის შეთავაზებები გათიშულია"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ნაწინასწარმეტყველები აპი: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"გადაფურცლეთ უკიდურესი მარჯვენა ან მარცხენა ბოლოდან."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"გადაფურცლეთ მარჯვენა ან მარცხენა კიდიდან ეკრანის ცენტრისკენ და თითი აუშვით."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"თქვენ ისწავლეთ მარჯვნიდან გადაფურცვლა უკან დასაბრუნებლად. ახლა კი შეიტყვეთ, როგორ გადართოთ აპები."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"თქვენ შეასრულეთ უკან დაბრუნების ჟესტი."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"არ გადაფურცლოთ ეკრანის ბოლოსთან ახლოს."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"თქვენ ისწავლეთ ჟესტების გამოყენება. ჟესტების გამოსართავად გადადით პარამეტრებში."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"თქვენ შეასრულეთ აპების გადართვის ჟესტი."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"აპების გადასართავად გადაფურცლეთ"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"აპების გადასართავად, გადაფურცლეთ ეკრანის ქვედა კიდიდან ზემოთ, დააყოვნეთ, შემდეგ თითი აუშვით."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"მზად არის"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"მზადაა"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"პარამეტრები"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ხელახლა ცდა"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"მშვენიერია!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"სახელმძღვანელო <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"მზადაა!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"მთავარ გვერდზე გადასასვლელად გადაფურცლეთ ზევით"</string>
     <string name="allset_description" msgid="6350320429953234580">"მზად ხართ ტელეფონის გამოსაყენებლად"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"სისტემის ნავიგაციის პარამეტრები"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"გაზიარება"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ეკრანის ანაბეჭდი"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ეს მოქმედება არ არის დაშვებული აპის ან თქვენი ორგანიზაციის მიერ"</string>
diff --git a/quickstep/res/values-km/strings.xml b/quickstep/res/values-km/strings.xml
index ab51a65ebb..2700b8383c 100644
--- a/quickstep/res/values-km/strings.xml
+++ b/quickstep/res/values-km/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"បានបើក​ការណែនាំ​កម្មវិធី"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"បានបិទ​ការណែនាំ​កម្មវិធី"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"កម្មវិធី​ដែលបាន​ព្យាករ៖ <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"ត្រូវប្រាកដថា​អ្នកអូសពី​គែមខាងស្ដាំ ឬ​ខាងឆ្វេង។"</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"ត្រូវប្រាកដថា​អ្នកអូសពី​គែមខាងស្ដាំ ឬខាងឆ្វេង​ទៅផ្នែកកណ្ដាល​នៃអេក្រង់ រួច​ដកដៃ។"</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"អ្នកបានស្វែងយល់ពីរបៀបអូសពីខាងស្ដាំ ដើម្បីថយក្រោយ។ បន្ទាប់​ទៀត សូមស្វែងយល់​ពីរបៀប​ប្ដូរកម្មវិធី​។"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"អ្នក​បានបញ្ចប់​ចលនា​ថយក្រោយ​ហើយ។"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ត្រូវប្រាកដថា​អ្នកមិនអូស​ទៅជិត​ផ្នែកខាងក្រោម​នៃអេក្រង់ពេក​។"</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"អ្នក​បានស្វែងយល់អំពី​របៀបប្រើចលនា​ហើយ។ ដើម្បីបិទ​ចលនា សូមចូល​ទៅកាន់​ការកំណត់។"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"អ្នក​បានបញ្ចប់​ចលនា​ប្ដូរកម្មវិធី​ហើយ។"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"អូស​ដើម្បីប្ដូរ​កម្មវិធី"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"ដើម្បីប្ដូររវាងកម្មវិធី សូមអូសឡើងលើពីផ្នែកខាងក្រោមនៃអេក្រង់របស់អ្នក រួចចុចឱ្យជាប់ បន្ទាប់មកដកដៃចេញ។"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"រួចហើយ"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"រួចរាល់"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ការកំណត់"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ព្យាយាមម្ដងទៀត"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ល្អ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"មេរៀនទី <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"រួចហើយ!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"អូសឡើងលើ ដើម្បី​ទៅកាន់​អេក្រង់ដើម"</string>
     <string name="allset_description" msgid="6350320429953234580">"អ្នក​អាច​ចាប់ផ្ដើម​ប្រើ​ទូរសព្ទ​របស់អ្នក​បានហើយ"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"ការកំណត់​ការរុករក​ប្រព័ន្ធ"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"ចែករំលែក"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"រូបថតអេក្រង់"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"សកម្មភាពនេះ​មិនត្រូវបានអនុញ្ញាតដោយកម្មវិធី​ ឬ​ស្ថាប័ន​របស់អ្នកទេ"</string>
diff --git a/quickstep/res/values-kn/strings.xml b/quickstep/res/values-kn/strings.xml
index 357f41f00a..e0297ce110 100644
--- a/quickstep/res/values-kn/strings.xml
+++ b/quickstep/res/values-kn/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ಆ್ಯಪ್ ಸಲಹೆಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ಆ್ಯಪ್ ಸಲಹೆಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ಶಿಫಾರಸು ಮಾಡಿದ ಆ್ಯಪ್: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"ನೀವು ಬಲಕೊನೆಯ ಅಂಚಿನಿಂದ ಅಥವಾ ಎಡಕೊನೆಯ ಅಂಚಿನಿಂದ ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"ನೀವು ಬಲ ಅಥವಾ ಎಡ ಅಂಚಿನಿಂದ ಸ್ಕ್ರೀನ್‌ನ ಮಧ್ಯಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಂಡು ಬಿಟ್ಟುಬಿಡಿ."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ಹಿಂದೆ ಹೋಗಲು ಬಲದಿಂದ ಸ್ವೈಪ್ ಮಾಡುವುದು ಹೇಗೆಂದು ಕಲಿತಿರಿ. ಮುಂದೆ, ಆ್ಯಪ್‌ಗಳನ್ನು ಬದಲಿಸುವುದು ಹೇಗೆಂದು ತಿಳಿಯಿರಿ."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ನೀವು ಗೋ ಬ್ಯಾಕ್ ಗೆಸ್ಚರ್ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದ್ದೀರಿ."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ನೀವು ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಭಾಗಕ್ಕೆ ಹೆಚ್ಚು ಹತ್ತಿರ ಸ್ವೈಪ್ ಮಾಡದಂತೆ ನೋಡಿಕೊಳ್ಳಿ."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"ಗೆಸ್ಚರ್‌ಗಳನ್ನು ಬಳಕೆಯನ್ನು ನೀವು ತಿಳಿದುಕೊಂಡಿರುವಿರಿ. ಗೆಸ್ಚರ್‌ಗಳನ್ನು ಆಫ್ ಮಾಡಲು, ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಹೋಗಿ."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"ನೀವು ಆ್ಯಪ್‌ಗಳನ್ನು ಬದಲಾಯಿಸುವ ಗೆಸ್ಚರ್ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದ್ದೀರಿ."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ಆ್ಯಪ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಲು ಸ್ವೈಪ್ ಮಾಡಿ"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"ಆ್ಯಪ್‌ಗಳನ್ನು ಬದಲಿಸಲು, ನಿಮ್ಮ ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಭಾಗದಿಂದ ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ, ಹೋಲ್ಡ್ ಮಾಡಿ, ನಂತರ ಬಿಟ್ಟುಬಿಡಿ."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"ಸಂಪೂರ್ಣ ಸಿದ್ಧವಾಗಿದೆ"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"ಮುಗಿದಿದೆ"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ಪುನಃ ಪ್ರಯತ್ನಿಸಿ"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ಚೆನ್ನಾಗಿದೆ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ಟ್ಯುಟೋರಿಯಲ್ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"ಎಲ್ಲವೂ ಸಿದ್ಧವಾಗಿದೆ!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"ಮುಖಪುಟಕ್ಕೆ ಹೋಗಲು ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
     <string name="allset_description" msgid="6350320429953234580">"ನಿಮ್ಮ ಫೋನ್ ಬಳಸುವುದನ್ನು ಪ್ರಾರಂಭಿಸಲು ನೀವು ಸಿದ್ದರಾಗಿರುವಿರಿ"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"ಸಿಸ್ಟಂ ನ್ಯಾವಿಗೇಶನ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"ಹಂಚಿಕೊಳ್ಳಿ"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ಸ್ಕ್ರೀನ್‌ಶಾಟ್"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ಆ್ಯಪ್ ಅಥವಾ ನಿಮ್ಮ ಸಂಸ್ಥೆಯು ಈ ಕ್ರಿಯೆಯನ್ನು ಅನುಮತಿಸುವುದಿಲ್ಲ"</string>
diff --git a/quickstep/res/values-ko/strings.xml b/quickstep/res/values-ko/strings.xml
index d2bb8e095e..9ec5295274 100644
--- a/quickstep/res/values-ko/strings.xml
+++ b/quickstep/res/values-ko/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"앱 제안이 사용 설정됨"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"앱 제안이 사용 중지됨"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"예상 앱: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"오른쪽 또는 왼쪽 가장자리 끝에서 스와이프하세요."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"오른쪽 또는 왼쪽 가장자리에서 화면 중앙으로 스와이프한 후 손가락을 떼세요."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"오른쪽에서 스와이프하여 뒤로 돌아가는 방법을 배웠습니다. 이번에는 앱 전환 방법을 알아보겠습니다."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"돌아가기 동작을 완료했습니다."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"화면 하단에 지나치게 가까운 곳에서 스와이프하면 안 됩니다."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"동작 사용 방법을 알아봤습니다. 동작을 사용 중지하려면 설정으로 이동하세요."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"앱 전환 동작을 완료했습니다."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"스와이프로 앱 전환"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"앱 간에 전환하려면 화면 하단에서 위로 스와이프하고 잠시 멈춘 다음 손가락을 떼세요."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"설정 완료"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"완료"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"설정"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"다시 시도"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"잘하셨습니다"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"튜토리얼 <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"설정 완료"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"위로 스와이프하여 홈으로 이동"</string>
     <string name="allset_description" msgid="6350320429953234580">"휴대전화를 사용할 준비가 되었습니다."</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"시스템 탐색 설정"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"공유"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"스크린샷"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"이 작업은 앱 또는 조직에서 허용되지 않습니다."</string>
diff --git a/quickstep/res/values-lt/strings.xml b/quickstep/res/values-lt/strings.xml
index 775cf6207c..b0c679c758 100644
--- a/quickstep/res/values-lt/strings.xml
+++ b/quickstep/res/values-lt/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Siūlomų programų funkcija įgalinta"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Siūlomų programų funkcija išjungta"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Numatoma programa: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Turite perbraukti nuo dešiniojo ar kairiojo krašto."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Turite perbraukti nuo dešiniojo ar kairiojo krašto link ekrano vidurio ir pakelti pirštą."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Išmokote, kaip sugrįžti perbraukiant iš dešinės. Toliau sužinosite, kaip perjungti programas."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Atlikote grįžimo atgal gestą."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nebraukite per arti ekrano apačios."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"išmokote naudotis gestais. Gestus galite išjungti nustatymuose."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Atlikote programų perjungimo gestą."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Perbraukite, kad perjungtumėte programas"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Norėdami perjungti programas, perbraukite aukštyn nuo ekrano apačios, palaikykite ir paleiskite."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Viskas nustatyta"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Atlikta"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Nustatymai"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Bandykite dar kartą"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Šaunu!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Mokymo programa: <xliff:g id="CURRENT">%1$d</xliff:g> iš <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Paruošta!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Perbraukite aukštyn, kad grįžtumėte į pagrindinį ekraną"</string>
     <string name="allset_description" msgid="6350320429953234580">"Esate pasiruošę pradėti naudoti telefoną"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Sistemos naršymo nustatymai"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Bendrinti"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Ekrano kopija"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Jūsų organizacijoje arba naudojant šią programą neleidžiama atlikti šio veiksmo"</string>
diff --git a/quickstep/res/values-lv/strings.xml b/quickstep/res/values-lv/strings.xml
index 45fa4e76eb..df1c3e9088 100644
--- a/quickstep/res/values-lv/strings.xml
+++ b/quickstep/res/values-lv/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Ieteicamās lietotnes ir iespējotas"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Ieteicamās lietotnes ir atspējotas"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Prognozētā lietotne: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Velciet no pašas labās vai kreisās malas."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Velciet no ekrāna labās vai kreisās malas uz vidu un atlaidiet."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Jūs esat apguvis, kā vilkt no labās malas, lai pārietu atpakaļ. Tagad mācieties pārslēgt lietotnes."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Jūs sekmīgi veicāt atgriešanās žestu."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nevelciet pārāk tuvu ekrāna apakšdaļai."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Jūs esat apguvis žestu izmantošanu. Lai izslēgtu žestus, pārejiet uz sadaļu Iestatījumi."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Jūs sekmīgi veicāt lietotņu pārslēgšanas žestu."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Vilkšana, lai pārslēgtu lietotnes"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Lai pārslēgtu lietotnes, velciet augšup no ekrāna apakšdaļas, turiet un pēc tam atlaidiet."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Gatavs"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Gatavs"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Iestatījumi"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Mēģināt vēlreiz"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Lieliski!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"<xliff:g id="CURRENT">%1$d</xliff:g>. mācību darbība no <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Gatavs!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Velciet augšup, lai pārietu uz sākuma ekrānu."</string>
     <string name="allset_description" msgid="6350320429953234580">"Varat sākt izmantot savu tālruni"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Sistēmas navigācijas iestatījumi"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Kopīgot"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Veikt ekrānuzņēmumu"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Lietotne vai jūsu organizācija neatļauj veikt šo darbību."</string>
diff --git a/quickstep/res/values-mk/strings.xml b/quickstep/res/values-mk/strings.xml
index b20107af58..98307da304 100644
--- a/quickstep/res/values-mk/strings.xml
+++ b/quickstep/res/values-mk/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Предлозите за апликации се овозможени"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Предлозите за апликации се оневозможени"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Предвидена апликација: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Повлечете од крајниот десен или крајниот лев раб."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Повлечете од десниот или левиот раб кон средината на екранот и пуштете."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Научивте како да повлекувате оддесно за да одите назад. Следно, дознајте како да се префрлате помеѓу апликации."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Завршивте со упатството за враќање назад."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Не повлекувајте преблиску до долниот раб на екранот."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Дознавте како се користат движењата. За да ги исклучите движењата, одете во „Поставки“."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Завршивте со упатството за префрлање помеѓу апликации."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Повлечете за префрлање помеѓу апликации"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"За да смените апликација, повлечете нагоре од дното на екранот и задржете, па пуштете."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Готово"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Готово"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Поставки"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Обиди се пак"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Одлично!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Упатство <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Готово!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Повлечете нагоре за да појдете на почетниот екран"</string>
     <string name="allset_description" msgid="6350320429953234580">"Спремни сте да почнете да го користите телефонот"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Поставки за системска навигација"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Сподели"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Слика од екранот"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Апликацијата или вашата организација не го дозволува дејствово"</string>
diff --git a/quickstep/res/values-ml/strings.xml b/quickstep/res/values-ml/strings.xml
index de875c9140..6124b1dbb3 100644
--- a/quickstep/res/values-ml/strings.xml
+++ b/quickstep/res/values-ml/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ആപ്പ് നിർദ്ദേശങ്ങൾ പ്രവർത്തനക്ഷമമാക്കി"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ആപ്പ് നിർദ്ദേശങ്ങൾ പ്രവർത്തനരഹിതമാക്കി"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"പ്രവചിച്ച ആപ്പ്: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"വലത്തേയറ്റത്തെയോ ഇടത്തേയറ്റത്തെയോ അരികിൽ നിന്ന് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പാക്കുക."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"വലതോ ഇടതോ അരികിൽ നിന്ന് സ്‌ക്രീനിന്റെ മധ്യഭാഗത്തേക്ക് സ്വെെപ്പ് ചെയ്‌ത് വിടുക."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"മടങ്ങാൻ വലതുഭാഗത്ത് നിന്ന് സ്വൈപ്പ് ചെയ്യുന്ന രീതി മനസ്സിലായി. ഇനി, ആപ്പുകൾ മാറുന്ന രീതി അറിയുക."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"മടങ്ങുക ജെസ്ച്ചർ നിങ്ങൾ പൂർത്തിയാക്കി."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"സ്‌ക്രീനിന്റെ ഏറ്റവും അടിഭാഗത്തേക്ക് സ്വെെപ്പ് ചെയ്യുന്നില്ലെന്ന് ഉറപ്പാക്കുക."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"ജെസ്ച്ചറുകൾ ഉപയോഗിക്കുന്ന രീതി നിങ്ങൾ മനസ്സിലാക്കി. ജെസ്ച്ചറുകൾ ഓഫാക്കാൻ ക്രമീകരണത്തിലേക്ക് പോകുക."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"ആപ്പുകൾ തമ്മിൽ മാറുക ജെസ്‌ച്ചർ നിങ്ങൾ പൂർത്തിയാക്കി."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ആപ്പുകൾ മാറാൻ സ്വെെപ്പ് ചെയ്യുക"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"ആപ്പുകൾക്കിടയിൽ മാറാറാൻ സ്‌ക്രീനിന്റെ താഴെ നിന്ന് മുകളിലേക്ക് സ്വൈപ്പ് ചെയ്‌ത് പിടിച്ച ശേഷം വിടുക."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"എല്ലാം സജ്ജീകരിച്ചു"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"പൂർത്തിയായി"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ക്രമീകരണം"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"വീണ്ടും ശ്രമിക്കുക"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"കൊള്ളാം!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ട്യൂട്ടോറിയൽ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"എല്ലാം സജ്ജീകരിച്ചു!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"ഹോമിലേക്ക് പോകാൻ മുകളിലേക്ക് സ്വൈപ്പ് ചെയ്യുക"</string>
     <string name="allset_description" msgid="6350320429953234580">"ഫോൺ ഉപയോഗിച്ച് തുടങ്ങാൻ നിങ്ങൾ തയ്യാറാണ്"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"സിസ്‌റ്റം നാവിഗേഷൻ ക്രമീകരണം"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"പങ്കിടുക"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"സ്ക്രീൻഷോട്ട്"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ഈ നടപടി എടുക്കുന്നത് ആപ്പോ നിങ്ങളുടെ സ്ഥാപനമോ അനുവദിക്കുന്നില്ല"</string>
diff --git a/quickstep/res/values-mn/strings.xml b/quickstep/res/values-mn/strings.xml
index dc00a1c661..dfa98e7432 100644
--- a/quickstep/res/values-mn/strings.xml
+++ b/quickstep/res/values-mn/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Санал болгож буй аппуудыг идэвхжүүлсэн"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Санал болгож буй аппуудыг идэвхгүй болгосон"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Таамаглаж буй апп: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Та баруун зах эсвэл зүүн захын булангаас шударна уу."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Та баруун эсвэл зүүн булангаас дэлгэцийн дунд хэсэг хүртэл шударч, суллана уу."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Та буцахын тулд баруунаас хэрхэн шудрахыг мэдэж авлаа Дараа нь аппыг хэрхэн сэлгэхийг мэдэж аваарай."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Та буцах зангааг гүйцэтгэлээ."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Та дэлгэцийн доод хэсэгтэй хэт ойр бүү шудраарай."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Та зангааг хэрхэн ашиглахыг мэдэж авлаа. Зангааг унтраахын тулд Тохиргоо руу очно уу."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Та аппуудыг сэлгэх зангааг гүйцэтгэлээ."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Аппуудыг сэлгэхийн тулд шудрах"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Аппуудын хооронд сэлгэхийн тулд дэлгэцийнхээ доод хэсгээс дээш шударч, удаан дараад, суллана уу."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Бүгдийг тохируулсан"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Дууссан"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Тохиргоо"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Дахин оролдох"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Янзтай!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"<xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g> практик хичээл"</string>
     <string name="allset_title" msgid="5021126669778966707">"Тохируулж дууслаа!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Нүүр хуудас руу очихын тулд дээш шударна уу"</string>
     <string name="allset_description" msgid="6350320429953234580">"Та утсаа ашиглаж эхлэхэд бэлэн боллоо"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Системийн навигацын тохиргоо"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Хуваалцах"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Дэлгэцийн агшин дарах"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Энэ үйлдлийг апп эсвэл танай байгууллага зөвшөөрдөггүй"</string>
diff --git a/quickstep/res/values-mr/strings.xml b/quickstep/res/values-mr/strings.xml
index 99d6ebccec..8618f85e70 100644
--- a/quickstep/res/values-mr/strings.xml
+++ b/quickstep/res/values-mr/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"अ‍ॅप सूचना सुरू केल्या आहेत"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"अ‍ॅप सूचना बंद केल्या आहेत"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"पूर्वानुमान केलेले अ‍ॅप: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"तुम्ही स्क्रीनच्या अगदी उजव्या किंवा अगदी डाव्या कडेला स्‍वाइप केल्याची खात्री करा."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"तुम्ही स्क्रीनच्या उजव्या किंवा डाव्या कडेपासून मध्यभागी स्‍वाइप करून सोडून दिल्याची खात्री करा."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"मागे जाण्यासाठी उजवीकडून कसे स्‍वाइप करावे ते शिकलात. आता पुढे, ॲप्स कशी स्विच करायची ते जाणून घ्या."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"तुम्ही गो बॅक जेश्चर पूर्ण केले."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"तुम्ही स्क्रीनच्या तळाच्या अगदी जवळून स्‍वाइप करत नाही याची खात्री करा."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"तुम्ही जेश्चर कसे वापरायचे हे शिकलात. जेश्चर बंद करण्यासाठी, सेटिंग्ज वर जा."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"तुम्ही ॲप्स स्विच करण्याचे जेश्चर पूर्ण केले."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"अ‍ॅप्स स्विच करण्यासाठी स्वाइप करा"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"ॲप्सदरम्यान स्विच करण्यासाठी, स्क्रीनच्या तळापासून वर स्वाइप करा, धरून ठेवा, त्यानंतर सोडून द्या."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"सर्व तयार आहे"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"पूर्ण झाले"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"सेटिंग्ज"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"पुन्हा प्रयत्न करा"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"छान!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ट्युटोरियल <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"सर्व तयार आहे!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"होम वर जाण्यासाठी वरती स्वाइप करा"</string>
     <string name="allset_description" msgid="6350320429953234580">"तुम्ही तुमचा फोन वापरण्यास सुरुवात करू शकता"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"सिस्टम नेव्हिगेशन सेटिंग्ज"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"शेअर करा"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"स्क्रीनशॉट"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"अ‍ॅप किंवा तुमच्या संस्थेद्वारे ही क्रिया करण्याची अनुमती नाही"</string>
diff --git a/quickstep/res/values-ms/strings.xml b/quickstep/res/values-ms/strings.xml
index ef9d7e7b85..1e2d43db1a 100644
--- a/quickstep/res/values-ms/strings.xml
+++ b/quickstep/res/values-ms/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Cadangan apl didayakan"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Cadangan apl dilumpuhkan"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Apl yang diramalkan: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Pastikan anda meleret dari hujung sebelah kanan atau sebelah kiri."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Pastikan anda meleret dari tepi sebelah kanan atau kiri ke tengah skrin dan lepaskan."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Anda belajar cara meleret dari kanan untuk kembali. Seterusnya, ketahui cara menukar apl."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Anda telah melengkapkan gerak isyarat undur."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pastikan anda tidak meleret terlalu dekat dengan bahagian bawah skrin."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Anda mempelajari cara menggunakan gerak isyarat. Untuk mematikan gerak isyarat, pergi ke Tetapan."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Anda telah melengkapkan gerak isyarat menukar apl."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Leret untuk menukar apl"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Untuk beralih antara apl, leret ke atas dari bahagian bawah skrin anda, tahan, kemudian lepaskan."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Selesai"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Selesai"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Tetapan"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Cuba lagi"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bagus!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Siap!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Leret ke atas untuk kembali ke Laman Utama"</string>
     <string name="allset_description" msgid="6350320429953234580">"Anda sudah sedia untuk mula menggunakan telefon anda"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Tetapan navigasi sistem"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Kongsi"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Tangkapan skrin"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Tindakan ini tidak dibenarkan oleh apl atau organisasi anda"</string>
diff --git a/quickstep/res/values-my/strings.xml b/quickstep/res/values-my/strings.xml
index 2e6d49c65b..874c911044 100644
--- a/quickstep/res/values-my/strings.xml
+++ b/quickstep/res/values-my/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"အက်ပ်အကြံပြုချက်များ ဖွင့်ထားသည်"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"အက်ပ်အကြံပြုချက်များကို ပိတ်ထားသည်"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ကြိုတင်မှန်းဆထားသော အက်ပ်− <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"ညာ သို့မဟုတ် ဘယ်ဘက်အစွန် ခပ်လှမ်းလှမ်းမှ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"စခရင်၏ ညာ သို့မဟုတ် ဘက်ဘက်အစွန်မှ အလယ်သို့ ပွတ်ဆွဲပြီး လွှတ်လိုက်ကြောင်း သေချာပါစေ။"</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"နောက်ပြန်သွားရန် ညာဘက်မှပွတ်ဆွဲနည်းကို သိသွားပါပြီ။ နောက်အဆင့်တွင် အက်ပ်များပြောင်းနည်းကို လေ့လာပါ။"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"နောက်ဆုတ်လက်ဟန် ရှင်းလင်းပို့ချချက် ပြီးပါပြီ။"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ဖန်သားပြင် အောက်ခြေနှင့် အလွန်နီးကပ်စွာ ပွတ်ဆွဲခြင်းမရှိကြောင်း သေချာပါစေ။"</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"လက်ဟန်များသုံးနည်းကို သင်သိသွားပါပြီ။ လက်ဟန်များကို ပိတ်ရန် ‘ဆက်တင်များ’ သို့ သွားပါ။"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"အက်ပ်များပြောင်းသည့် လက်ဟန် ရှင်းလင်းပို့ချချက် ပြီးပါပြီ။"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"အက်ပ်များပြောင်းရန် ပွတ်ဆွဲပါ"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"အက်ပ်တစ်ခုမှတစ်ခုသို့ ပြောင်းရန် စခရင်အောက်ခြေမှ အပေါ်သို့ ပွတ်ဆွဲ၍ ဖိထားပြီးနောက် လွှတ်ပါ။"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"အားလုံးအဆင်သင့်ဖြစ်ပါပြီ"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"ပြီးပြီ"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ဆက်တင်များ"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ထပ်စမ်းကြည့်ရန်"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ကောင်းသည်။"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ရှင်းလင်းပို့ချချက် <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"အားလုံး အဆင်သင့်ပါ။"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"ပင်မစာမျက်နှာသို့သွားရန် အပေါ်သို့ ပွတ်ဆွဲပါ"</string>
     <string name="allset_description" msgid="6350320429953234580">"သင့်ဖုန်းကို စတင်အသုံးပြုရန် အသင့်ဖြစ်ပါပြီ"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"စနစ် လမ်းညွှန် ဆက်တင်များ"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"မျှဝေရန်"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ဖန်သားပြင်ဓာတ်ပုံ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ဤလုပ်ဆောင်ချက်ကို အက်ပ် သို့မဟုတ် သင်၏အဖွဲ့အစည်းက ခွင့်မပြုပါ"</string>
diff --git a/quickstep/res/values-nb/strings.xml b/quickstep/res/values-nb/strings.xml
index 6d43faee7a..16988c583f 100644
--- a/quickstep/res/values-nb/strings.xml
+++ b/quickstep/res/values-nb/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Appforslag er på"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Appforslag er slått av"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Foreslått app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Sørg for at du sveiper fra kanten helt til høyre eller venstre."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Sørg for at du sveiper fra den høyre eller venstre kanten til midten av skjermen og slipper."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Du har lært hvordan du sveiper fra høyre for å gå tilbake. I neste trinn lærer du å bytte app."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Du har fullført bevegelsen for å gå tilbake."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Sørg for at du ikke sveiper for nær bunnen av skjermen."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Du har lært hvordan du bruker bevegelser. For å slå av bevegelser, gå til Innstillinger."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Du har fullført bevegelsen for å bytte app."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Sveip for å bytte app"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"For å bytte mellom apper, sveip opp fra bunnen av skjermen, hold, og slipp"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Ferdig"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Ferdig"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Innstillinger"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Prøv igjen"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bra!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Veiledning <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Alt er klart!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Sveip opp for å gå til startskjermen"</string>
     <string name="allset_description" msgid="6350320429953234580">"Du er klar til å begynne å bruke telefonen"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Innstillinger for systemnavigasjon"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Del"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Skjermdump"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Appen eller organisasjonen din tillater ikke denne handlingen"</string>
diff --git a/quickstep/res/values-ne/strings.xml b/quickstep/res/values-ne/strings.xml
index 2b2e745bee..cfd1c64893 100644
--- a/quickstep/res/values-ne/strings.xml
+++ b/quickstep/res/values-ne/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"सिफारिस गरिएका एपहरू देखाउने सुविधा सक्षम पारिएका छन्"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"सिफारिस गरिएका एपहरू देखाउने सुविधा असक्षम पारिएको छ"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"पूर्वानुमान गरिएको एप: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"स्क्रिनको सबैभन्दा दायाँ किनारा वा सबैभन्दा बायाँ किनाराबाट स्वाइप गर्नुहोस्।"</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"स्क्रिनको दायाँ वा बायाँ किनाराबाट मध्य भागसम्म स्वाइप गर्नुहोस् अनि औँला उठाउनुहोस्।"</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"तपाईंले स्क्रिनको दायाँ किनाराबाट स्वाइप गरेर अघिल्लो स्क्रिनमा फर्कने तरिका सिक्नुभयो। अब एउटा एपबाट अर्को एपमा जाने तरिका सिक्नुहोस्।"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"तपाईंले \'पछाडि जानुहोस्\' नामक इसारा प्रयोग गर्ने तरिका सिक्नुभयो।"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"स्क्रिनको फेदको धेरै नजिकसम्म स्वाइप नगर्नुहोस्।"</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"तपाईंले इसाराहरू प्रयोग गर्ने तरिका सिक्नुभयो। इसारा अफ गर्न सेटिङमा जानुहोस्।"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"तपाईंले \'एउटा एपबाट अर्को एपमा जानुहोस्\' नामक इसारा प्रयोग गर्ने तरिका सिक्नुभयो।"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"एउटा एपबाट अर्को एपमा जान स्वाइप गर्नुहोस्"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"एउटा एपबाट अर्को एपमा जान स्क्रिनको फेदबाट माथितिर स्वाइप गर्नुहोस्, छोइराख्नुहोस् अनि औँला उठाउनु…।"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"सबै तयार छ"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"सम्पन्न भयो"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"सेटिङ"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"फेरि प्रयास गर्नुहोस्"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"राम्रो!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ट्युटोरियल <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"सबै तयार भयो!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"होममा जान माथितिर स्वाइप गर्नुहोस्"</string>
     <string name="allset_description" msgid="6350320429953234580">"तपाईं आफ्नो फोन चलाउन थाल्न सक्नुहुन्छ"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"सिस्टम नेभिगेसनसम्बन्धी सेटिङ"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"सेयर गर्नुहोस्"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"स्क्रिनसट"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"यो एप वा तपाईंको सङ्गठनले यो कारबाही गर्ने अनुमति दिँदैन"</string>
diff --git a/quickstep/res/values-nl/strings.xml b/quickstep/res/values-nl/strings.xml
index 2a79753dd3..5651ac2c17 100644
--- a/quickstep/res/values-nl/strings.xml
+++ b/quickstep/res/values-nl/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"App-suggesties zijn ingeschakeld"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"App-suggesties zijn uitgeschakeld"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Voorspelde app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Swipe helemaal vanaf de rechter- of linkerrand."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Swipe vanaf de rechter- of linkerrand naar het midden van het scherm en laat los."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Je weet nu hoe je vanaf rechts kunt swipen om terug te gaan. Ontdek nu hoe je tussen apps schakelt."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Je weet nu hoe je het gebaar Terug maakt."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Swipe niet te dicht bij de onderkant van het scherm."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Je weet nu hoe je gebaren gebruikt. Als je gebaren wilt uitzetten, kun je dat via Instellingen doen."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Je weet nu hoe je het gebaar Schakelen tussen apps maakt."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe om tussen apps te schakelen"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Swipe omhoog vanaf de onderkant van het scherm, houd vast en laat los om tussen apps te wisselen."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Klaar"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Klaar"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Instellingen"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Opnieuw"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Dat gaat lekker."</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Klaar"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Swipe omhoog om naar het startscherm te gaan"</string>
     <string name="allset_description" msgid="6350320429953234580">"Je bent klaar om je telefoon te gebruiken"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Navigatie-instellingen van systeem"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Delen"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Deze actie wordt niet toegestaan door de app of je organisatie"</string>
diff --git a/quickstep/res/values-or/strings.xml b/quickstep/res/values-or/strings.xml
index 187f9d8a3d..a16638a118 100644
--- a/quickstep/res/values-or/strings.xml
+++ b/quickstep/res/values-or/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ଆପ୍ ପରାମର୍ଶଗୁଡ଼ିକୁ ସକ୍ଷମ କରାଯାଇଛି"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ଆପ୍ ପରାମର୍ଶଗୁଡ଼ିକୁ ଅକ୍ଷମ କରାଯାଇଛି"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ପୂର୍ବାନୁମାନ କରାଯାଇଥିବା ଆପ୍: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"ଆପଣ ସ୍କ୍ରିନର ଏକଦମ୍-ଡାହାଣ ବା ବାମ ଧାରରୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"ଆପଣ ସ୍କ୍ରିନର ଡାହାଣ ବା ବାମ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରି ଛାଡ଼ି ଦେଉଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ଆପଣ ଡାହାଣ ଧାରରୁ ସ୍ୱାଇପ୍ କରି ପଛକୁ ଫେରିବା ଜାଣିଲେ। ତା\'ପରେ, ଆପଗୁଡ଼ିକୁ କିପରି ସ୍ୱିଚ୍ କରିବେ ତାହା ଜାଣନ୍ତୁ।"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ଆପଣ \'ପଛକୁ ଫେରନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି।"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ଆପଣ ସ୍କ୍ରିନର ତଳଭାଗର ଅତି ନିକଟରୁ ସ୍ୱାଇପ୍ କରୁନଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"ଜେଶ୍ଚରଗୁଡ଼ିକୁ କିପରି ବ୍ୟବହାର କରାଯିବ ଆପଣ ତାହା ଶିଖିଛନ୍ତି। ଜେଶ୍ଚରଗୁଡ଼ିକୁ ବନ୍ଦ କରିବାକୁ, ସେଟିଂସକୁ ଯାଆନ୍ତୁ।"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"ଆପଣ \'ଆପଗୁଡ଼ିକୁ ସ୍ୱିଚ୍ କରନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି।"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ଆପଗୁଡ଼ିକୁ ସ୍ୱିଚ୍ କରିବା ପାଇଁ ସ୍ୱାଇପ୍ କରନ୍ତୁ"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"ଆପଗୁଡ଼ିକ ମଧ୍ୟରେ ସ୍ୱିଚ୍ କରିବାକୁ, ସ୍କ୍ରିନର ତଳୁ ଉପରକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ, ଧରି ରଖନ୍ତୁ, ତା\'ପରେ ରିଲିଜ୍ କରନ୍ତୁ।"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"ସବୁ ପ୍ରସ୍ତୁତ"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"ହୋଇଗଲା"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ସେଟିଂସ୍"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ବଢ଼ିଆ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ଟ୍ୟୁଟୋରିଆଲ୍ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"ସମ୍ପୂର୍ଣ୍ଣ ଭାବେ ପ୍ରସ୍ତୁତ!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"ମୂଳପୃଷ୍ଠାକୁ ଯିବା ପାଇଁ ଉପରକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ"</string>
     <string name="allset_description" msgid="6350320429953234580">"ଆପଣ ଆପଣଙ୍କ ଫୋନ୍ ବ୍ୟବହାର କରିବା ପାଇଁ ପ୍ରସ୍ତୁତ ଅଛନ୍ତି"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"ସିଷ୍ଟମ୍ ନାଭିଗେସନ୍ ସେଟିଂସ୍"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"ସେୟାର୍ କରନ୍ତୁ"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ସ୍କ୍ରିନସଟ୍"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ଆପ୍ କିମ୍ବା ଆପଣଙ୍କ ସଂସ୍ଥା ଦ୍ୱାରା ଏହି କାର୍ଯ୍ୟକୁ ଅନୁମତି ଦିଆଯାଇ ନାହିଁ"</string>
diff --git a/quickstep/res/values-pa/strings.xml b/quickstep/res/values-pa/strings.xml
index 266c6f9312..7fa05d801c 100644
--- a/quickstep/res/values-pa/strings.xml
+++ b/quickstep/res/values-pa/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ਐਪ ਸੁਝਾਵਾਂ ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਗਿਆ"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ਐਪ ਸੁਝਾਵਾਂ ਨੂੰ ਬੰਦ ਕੀਤਾ ਗਿਆ"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ਪੂਰਵ ਅਨੁਮਾਨਿਤ ਐਪ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸੱਜੇ ਜਾਂ ਖੱਬੇ ਪਾਸੇ ਦੇ ਬਿਲਕੁਲ ਕਿਨਾਰੇ ਤੋਂ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸੱਜੇ ਜਾਂ ਖੱਬੇ ਕਿਨਾਰੇ ਤੋਂ ਸਕ੍ਰੀਨ ਦੇ ਵਿਚਕਾਰ ਤੱਕ ਸਵਾਈਪ ਕਰਦੇ ਹੋ ਅਤੇ ਛੱਡ ਦਿੰਦੇ ਹੋ।"</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ਤੁਸੀਂ ਪਿੱਛੇ ਜਾਣ ਲਈ ਸੱਜੇ ਪਾਸੇ ਤੋਂ ਸਵਾਈਪ ਕਰਨ ਦਾ ਤਰੀਕਾ ਜਾਣਿਆ। ਅੱਗੇ, ਐਪਾਂ ਵਿਚਾਲੇ ਅਦਲਾ-ਬਦਲੀ ਕਰਨ ਦਾ ਤਰੀਕਾ ਜਾਣੋ।"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ਤੁਸੀਂ \'ਵਾਪਸ ਜਾਓ\' ਦਾ ਇਸ਼ਾਰਾ ਪੂਰਾ ਕੀਤਾ।"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਲੇ ਹਿੱਸੇ ਦੇ ਬਹੁਤ ਨੇੜੇ ਸਵਾਈਪ ਨਾ ਕਰੋ।"</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"ਤੁਸੀਂ ਇਸ਼ਾਰੇ ਵਰਤਣ ਬਾਰੇ ਜਾਣਿਆ। ਇਸ਼ਾਰੇ ਬੰਦ ਕਰਨ ਲਈ, ਸੈਟਿੰਗਾਂ \'ਤੇ ਜਾਓ।"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"ਤੁਸੀਂ \'ਐਪਾਂ ਵਿਚਾਲੇ ਅਦਲਾ-ਬਦਲੀ ਕਰੋ\' ਦਾ ਇਸ਼ਾਰਾ ਪੂਰਾ ਕੀਤਾ।"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ਐਪਾਂ ਵਿਚਾਲੇ ਅਦਲਾ-ਬਦਲੀ ਕਰਨ ਲਈ ਸਵਾਈਪ ਕਰੋ"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"ਐਪਾਂ ਵਿਚਾਲੇ ਅਦਲਾ-ਬਦਲੀ ਕਰਨ ਲਈ, ਆਪਣੀ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਾਂ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰਕੇ ਦਬਾਈ ਰੱਖੋ ਅਤੇ ਫਿਰ ਛੱਡੋ।"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"ਪੂਰੀ ਤਰ੍ਹਾਂ ਤਿਆਰ"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"ਹੋ ਗਿਆ"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ਸੈਟਿੰਗਾਂ"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ਵਧੀਆ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ਟਿਊਟੋਰੀਅਲ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"ਪੂਰੀ ਤਰ੍ਹਾਂ ਤਿਆਰ!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"ਹੋਮ \'ਤੇ ਜਾਣ ਲਈ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ"</string>
     <string name="allset_description" msgid="6350320429953234580">"ਤੁਸੀਂ ਆਪਣਾ ਫ਼ੋਨ ਵਰਤਣ ਲਈ ਤਿਆਰ ਹੋ"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"ਸਿਸਟਮ ਨੈਵੀਗੇਸ਼ਨ ਸੈਟਿੰਗਾਂ"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"ਸਾਂਝਾ ਕਰੋ"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ਸਕ੍ਰੀਨਸ਼ਾਟ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ਐਪ ਜਾਂ ਤੁਹਾਡੀ ਸੰਸਥਾ ਵੱਲੋਂ ਇਸ ਕਾਰਵਾਈ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ"</string>
diff --git a/quickstep/res/values-ro/strings.xml b/quickstep/res/values-ro/strings.xml
index 91a2caa152..89db8fc886 100644
--- a/quickstep/res/values-ro/strings.xml
+++ b/quickstep/res/values-ro/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Sugestiile de aplicații au fost activate"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Sugestiile de aplicații au fost dezactivate"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Aplicația estimată: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Glisați dinspre marginea dreaptă îndepărtată sau dinspre marginea stângă îndepărtată."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Glisați dinspre marginea dreaptă sau stângă spre mijlocul ecranului și eliberați."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Ați învățat cum să glisați dinspre dreapta pentru a reveni. În continuare, aflați cum să comutați aplicațiile."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ați finalizat gestul „înapoi”."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nu glisați prea aproape de partea de jos a ecranului."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Ați învățat cum să folosiți gesturi. Pentru a dezactiva gesturile, accesați Setările."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Ați finalizat gestul „comutați între aplicații”."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Glisați pentru a comuta între aplicații"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Pentru a comuta între aplicații, glisați în sus din partea de jos a ecranului, așteptați și eliberați"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Gata"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Gata"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Setări"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Reîncercați"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bravo!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorialul <xliff:g id="CURRENT">%1$d</xliff:g> / <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Gata!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Glisați în sus pentru a accesa ecranul de pornire"</string>
     <string name="allset_description" msgid="6350320429953234580">"Sunteți gata să folosiți telefonul"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Setările de navigare ale sistemului"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Distribuiți"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Captură de ecran"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Această acțiune nu este permisă de aplicație sau de organizația dvs."</string>
diff --git a/quickstep/res/values-ru/strings.xml b/quickstep/res/values-ru/strings.xml
index c38e0cca65..7c4d485012 100644
--- a/quickstep/res/values-ru/strings.xml
+++ b/quickstep/res/values-ru/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Функция \"Рекомендуемые приложения\" включена."</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Функция \"Рекомендуемые приложения\" отключена."</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Рекомендуемое приложение: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Проведите справа налево или слева направо от самого края экрана."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Проведите от правого или левого края экрана до середины дисплея и отпустите палец."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Теперь вы знаете, как вернуться, проведя справа налево. Далее мы расскажем, как переключаться между приложениями."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Вы выполнили жест для перехода назад."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Проведите пальцем не слишком близко к нижнему краю экрана."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Теперь вы знаете, как использовать жесты. Чтобы отключить их, перейдите в настройки."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Вы выполнили жест для переключения между приложениями."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Переключение между приложениями"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Чтобы переключиться между приложениями‚ проведите по экрану снизу вверх, задержите палец, а затем отпустите."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Готово"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Готово"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Настройки"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Повторите попытку"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Поздравляем!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Руководство (шаг <xliff:g id="CURRENT">%1$d</xliff:g> из <xliff:g id="TOTAL">%2$d</xliff:g>)"</string>
     <string name="allset_title" msgid="5021126669778966707">"Готово!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Чтобы перейти на главный экран, проведите вверх."</string>
     <string name="allset_description" msgid="6350320429953234580">"Теперь вы можете использовать телефон."</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Системные настройки навигации"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Поделиться"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Скриншот"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Это действие заблокировано приложением или организацией."</string>
diff --git a/quickstep/res/values-si/strings.xml b/quickstep/res/values-si/strings.xml
index a3645e4ecb..5f322e6af2 100644
--- a/quickstep/res/values-si/strings.xml
+++ b/quickstep/res/values-si/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"යෙදුම් යෝජනා සබලිතයි"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"යෙදුම් යෝජනා අබල කර ඇත"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"පුරෝකථනය කළ යෙදුම: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"ඔබ ඈත දකුණු හෝ ඈත වම් දාරයේ ස්වයිප් කරන බව සහතික කර ගන්න."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"ඔබ දකුණු හෝ වම් දාරයේ සිට තිරයේ මැදට ස්වයිප් කර අත හරින බව සහතික කර ගන්න."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ආපසු යාමට දකුණේ සිට ස්වයිප් කරන්නේ කෙසේදැයි ඔබ දැන ගත්තේය. ඊළඟට, යෙදුම් මාරු කරන ආකාරය දැන ගන්න."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ඔබ ආපසු යාමේ ඉංගිතය සම්පූර්ණ කරන ලදි."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ඔබ තිරයේ පහළට ඉතාම සමීපව ස්වයිප් නොකරන බවට සහතික කර ගන්න."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"ඔබ ඉංගිත භාවිත කරන ආකාරය දැන ගෙන ඇත. ඉංගිත ක්‍රියාවිරහිත කිරීමට, සැකසීම් වෙත යන්න."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"ඔබ යෙදුම් මාරු කිරීමේ ඉංගිතය සම්පූර්ණ කර ඇත."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"යෙදුම් මාරු කිරීමට ස්වයිප් කරන්න"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"යෙදුම් අතර මාරු වීමට, ඔබගේ තිරයේ පහළම සිට උඩට ස්වයිප් කර, අල්ලාගෙන සිට, අනතුරුව මුදා හරින්න."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"සියල්ල සකසා ඇත"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"නිමයි"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"සැකසීම්"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"නැවත උත්සාහ කරන්න"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"කදිමයි!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"නිබන්ධනය <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"සියල්ල සූදානම්!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"මුල් පිටුවට යාමට ඉහළට ස්වයිප් කරන්න"</string>
     <string name="allset_description" msgid="6350320429953234580">"ඔබ ඔබගේ දුරකථනය භාවිත කිරීම පටන් ගැනීමට සූදානම්"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"පද්ධති සංචාලන සැකසීම්"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"බෙදා ගන්න"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"තිර රුව"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"මෙම ක්‍රියාව යෙදුම හෝ ඔබේ සංවිධානය මගින් ඉඩ නොදේ"</string>
diff --git a/quickstep/res/values-sk/strings.xml b/quickstep/res/values-sk/strings.xml
index e42201f0a3..44c3c54440 100644
--- a/quickstep/res/values-sk/strings.xml
+++ b/quickstep/res/values-sk/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Návrhy aplikácií zapnuté"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Návrhy aplikácií vypnuté"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predpovedaná aplikácia: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Musite potiahnuť z úplne krajného pravého alebo ľavého okraja."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Musíte potiahnuť z pravého alebo ľavého okraja do stredu obrazovky a potom uvoľniť."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Naučili ste sa prejsť späť potiahnutím sprava. V ďalšom kroku sa naučíte prepínať aplikácie."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Dokončili ste gesto na prechod späť."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nesmiete potiahnuť príliš blízko dolnej časti obrazovky."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Naučili ste sa používať gestá. Ak ich chcete vypnúť, prejdite do Nastavení."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Dokončili ste gesto na prepnutie aplikácií."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Prepínanie aplikácií potiahnutím"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Prepínať medzi aplik. môžete potiahnutím nahor z dolnej časti obraz., pridržaním a násl. uvoľnením."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Hotovo"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Hotovo"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Nastavenia"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Skúste to znova"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Výborne!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Návod <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Hotovo"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Potiahnutím nahor prejdete na plochu"</string>
     <string name="allset_description" msgid="6350320429953234580">"Telefón môžete začať používať"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Nastavenia navigácie v systéme"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Zdieľať"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Snímka obrazovky"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikácia alebo vaša organizácia túto akciu nepovoľuje"</string>
diff --git a/quickstep/res/values-sl/strings.xml b/quickstep/res/values-sl/strings.xml
index 0093dd2a14..8aab5b1950 100644
--- a/quickstep/res/values-sl/strings.xml
+++ b/quickstep/res/values-sl/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Predlogi aplikacij so omogočeni."</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Predlogi aplikacij so onemogočeni."</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predvidena aplikacija: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Pazite, da povlečete s skrajno desnega ali skrajno levega roba."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Pazite, da povlečete z desnega ali levega roba do sredine zaslona in dvignete prst."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Naučili ste se, kako povlečete z desne za vrnitev. Zdaj se naučite preklapljanja med aplikacijami."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Izvedli ste potezo za pomik nazaj."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pazite, da ne povlečete preblizu dna zaslona."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Naučili ste se uporabljati poteze. Poteze lahko izklopite v nastavitvah."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Izvedli ste potezo za preklapljanje med aplikacijami."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Vlečenje za preklapljanje med aplikacijami"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Za preklapljanje med aplikacijami povlecite navzgor z dna zaslona, pridržite in nato izpustite."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Zdaj znate"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Končano"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Nastavitve"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Poskusite znova"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Odlično!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Vadnica <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Končano"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Povlecite navzgor za začetni zaslon"</string>
     <string name="allset_description" msgid="6350320429953234580">"Pripravljeni ste, da začnete uporabljati telefon"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Nastavitve krmarjenja po sistemu"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Deli"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Posnetek zaslona"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikacija ali vaša organizacija ne dovoljuje tega dejanja"</string>
diff --git a/quickstep/res/values-sr/strings.xml b/quickstep/res/values-sr/strings.xml
index 7c19ac89cc..98fe69f2bd 100644
--- a/quickstep/res/values-sr/strings.xml
+++ b/quickstep/res/values-sr/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Предлози апликација су омогућени"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Предлози апликација су онемогућени"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Предвиђамо апликацију: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Обавезно превуците од саме десне или леве ивице."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Обавезно превуците од десне или леве ивице до средине екрана и отпустите."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Научили сте како да превлачите здесна да бисте се вратили. Сада научите да мењате апликације."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Довршили сте покрет за повратак."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Никако не превлачите превише близу дна екрана."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Научили сте како да користите покрете. Да бисте искључили покрете, идите на подешавања."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Довршили сте покрет за промену апликација."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Превуците да бисте променили апликације"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"За прелазак са једне апликације на другу превуците нагоре од дна екрана, задржите, па пустите."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"То је то"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Готово"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Подешавања"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Пробајте поново"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Свака част!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Водич <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Готово!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Превуците нагоре да бисте отворили почетни екран"</string>
     <string name="allset_description" msgid="6350320429953234580">"Спремни сте да почнете да користите телефон"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Подешавања кретања кроз систем"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Дели"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Снимак екрана"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Апликација или организација не дозвољавају ову радњу"</string>
diff --git a/quickstep/res/values-ta/strings.xml b/quickstep/res/values-ta/strings.xml
index 09589984c9..de7c26d115 100644
--- a/quickstep/res/values-ta/strings.xml
+++ b/quickstep/res/values-ta/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ஆப்ஸ் பரிந்துரைகள் இயக்கப்பட்டுள்ளன"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ஆப்ஸ் பரிந்துரைகள் முடக்கப்பட்டுள்ளன"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"கணித்த ஆப்ஸ்: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"வலது அல்லது இடது ஓரத்தின் விளிம்பிலிருந்து ஸ்வைப் செய்வதை உறுதிசெய்க."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"வலது அல்லது இடது ஓரத்திலிருந்து திரையின் மையப் பகுதிக்கு ஸ்வைப் செய்தபிறகு விடுவிப்பதை உறுதிசெய்க."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"பின்செல்வதற்கு எப்படி வலதுபுறத்திலிருந்து ஸ்வைப் செய்வதென்று கற்றுக்கொண்டீர்கள். அடுத்து ஆப்ஸுக்கிடையே எப்படி மாறுவது என்பதை அறிக."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"பின்செல் சைகைப் பயிற்சியை முடித்துவிட்டீர்கள்."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"திரையின் கீழ்பகுதிக்கு மிக நெருக்கமாக ஸ்வைப் செய்யவில்லை என்பதை உறுதிசெய்துகொள்ளுங்கள்."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"சைகைகளை எப்படி உபயோகிப்பது என்று கற்றுக்கொண்டீர்கள். சைகைகளை முடக்க அமைப்புகளுக்குச் செல்லுங்கள்."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"ஆப்ஸுக்கிடையே மாறும் சைகைப் பயிற்சியை முடித்துவிட்டீர்கள்."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ஆப்ஸுக்கிடையே மாற ஸ்வைப் செய்யுங்கள்"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"ஆப்ஸுக்கு இடையே மாற, திரையின் கீழிலிருந்து மேலாக ஸ்வைப் செய்து, பிடித்திருந்து, பிறகு விடுவிக்கவும்."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"எல்லாம் தயார்"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"முடிந்தது"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"அமைப்புகள்"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"மீண்டும் முயல்க"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"அருமை!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"பயிற்சி <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"அனைத்தையும் அமைத்துவிட்டீர்கள்!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"முகப்புத் திரைக்குச் செல்ல மேல்நோக்கி ஸ்வைப் செய்யுங்கள்"</string>
     <string name="allset_description" msgid="6350320429953234580">"மொபைலைப் பயன்படுத்தத் தயாராகிவிட்டீர்கள்"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"சிஸ்டம் வழிசெலுத்தல் அமைப்புகள்"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"பகிர்"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ஸ்கிரீன்ஷாட்"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ஆப்ஸோ உங்கள் நிறுவனமோ இந்த செயலை அனுமதிப்பதில்லை"</string>
diff --git a/quickstep/res/values-th/strings.xml b/quickstep/res/values-th/strings.xml
index b803fc9727..96e9060e7f 100644
--- a/quickstep/res/values-th/strings.xml
+++ b/quickstep/res/values-th/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"เปิดใช้แอปแนะนำแล้ว"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ปิดใช้คำแนะนำเกี่ยวกับแอปอยู่"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"แอปที่คาดว่าจะใช้: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"ตรวจสอบว่าปัดจากขอบด้านขวาสุดหรือซ้ายสุด"</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"ตรวจสอบว่าปัดจากขอบด้านขวาหรือซ้ายไปตรงกลางหน้าจอ แล้วยกนิ้วขึ้น"</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"คุณรู้วิธีปัดจากด้านขวาเพื่อย้อนกลับแล้ว ต่อไปดูวิธีสลับแอป"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"คุณทำท่าทางสัมผัสเพื่อย้อนกลับเสร็จแล้ว"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ตรวจสอบว่าไม่ได้ปัดใกล้กับด้านล่างของหน้าจอมากเกินไป"</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"คุณรู้วิธีใช้ท่าทางสัมผัสแล้ว หากต้องการปิดท่าทางสัมผัส ให้ไปที่การตั้งค่า"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"คุณทำท่าทางสัมผัสเพื่อสลับแอปเสร็จแล้ว"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ปัดเพื่อสลับแอป"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"หากต้องการสลับระหว่างแอปต่างๆ ให้ปัดขึ้นจากด้านล่างของหน้าจอ ค้างไว้ แล้วปล่อย"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"เรียบร้อย"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"เสร็จสิ้น"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"การตั้งค่า"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"ลองอีกครั้ง"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"ดีมาก"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"บทแนะนำ <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"เรียบร้อยแล้ว"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"ปัดขึ้นเพื่อไปที่หน้าแรก"</string>
     <string name="allset_description" msgid="6350320429953234580">"คุณเริ่มใช้โทรศัพท์ได้แล้ว"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"การตั้งค่าการนำทางของระบบ"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"แชร์"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"ภาพหน้าจอ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"แอปหรือองค์กรของคุณไม่อนุญาตการดำเนินการนี้"</string>
diff --git a/quickstep/res/values-tl/strings.xml b/quickstep/res/values-tl/strings.xml
index 5e461d105f..b1ed104a18 100644
--- a/quickstep/res/values-tl/strings.xml
+++ b/quickstep/res/values-tl/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Naka-enable ang mga iminumungkahing app"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Naka-disable ang mga iminumungkahing app"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Hinulaang app: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Tiyaking magsa-swipe ka mula sa dulong kanan o dulong kaliwang gilid."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Tiyaking mag-swipe mula sa kanan o kaliwang gilid papunta sa gitna ng screen at iangat ang daliri."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Natuto kang mag-swipe mula sa kanan para bumalik. Sunod, alamin kung paano magpalipat-lipat ng app."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Nakumpleto mo na ang galaw para bumalik."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Tiyaking hindi ka magsa-swipe nang masyadong malapit sa ibaba ng screen."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Alam mo na kung paano gumamit ng mga galaw. Para i-off ang mga galaw, pumunta sa Mga Setting."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Nakumpleto mo na ang galaw para magpalipat-lipat sa mga app."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Mag-swipe para lumipat ng app"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Para lumipat ng app, mag-swipe pataas mula sa ibaba ng iyong screen, mag-hold, at iangat ang daliri."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Handa na ang lahat"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Tapos na"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Mga Setting"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Subukan ulit"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Magaling!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Handa na lahat!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Mag-swipe pataas para pumunta sa Home"</string>
     <string name="allset_description" msgid="6350320429953234580">"Handa mo nang simulan ang paggamit sa iyong telepono"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Mga setting ng navigation ng system"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Ibahagi"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Hindi pinapayagan ng app o ng iyong organisasyon ang pagkilos na ito"</string>
diff --git a/quickstep/res/values-tr/strings.xml b/quickstep/res/values-tr/strings.xml
index 372e45d6df..81554984cd 100644
--- a/quickstep/res/values-tr/strings.xml
+++ b/quickstep/res/values-tr/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Uygulama önerileri etkinleştirildi"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Uygulama önerileri devre dışı bırakıldı"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Tahmin edilen uygulama: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"En sağ veya en sol kenardan kaydırdığınızdan emin olun."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Ekranın sağ veya sol kenarından ortasına doğru sürükleyip bıraktığınızdan emin olun."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Geri dönmek için sağdan kaydırmayı öğrendiniz. Sırada uygulamalar arasında geçiş yapma var."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Geri dön hareketini tamamladınız."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ekranın alt kısmına çok yakın bir şekilde kaydırmadığınızdan emin olun."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Hareketleri nasıl kullanacağınızı öğrendiniz. Hareketleri kapatmak için Ayarlar\'a gidin."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Uygulamalar arasında geçiş yapma hareketini tamamladınız."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Uygulamalar arasında geçiş yapmak için kaydırma"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Uygulama değiştirmek için ekranınızın altından yukarı kaydırıp basılı tutun ve sonra bırakın."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Hepsi bu kadar"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Bitti"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Ayarlar"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Tekrar deneyin"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Güzel!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Eğitim <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"İşlem tamam!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Ana ekrana gitmek için yukarı kaydırın"</string>
     <string name="allset_description" msgid="6350320429953234580">"Telefonunuzu kullanmaya hazırsınız"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Sistem gezinme ayarları"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Paylaş"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Ekran görüntüsü"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Uygulamanız veya kuruluşunuz bu işleme izin vermiyor"</string>
diff --git a/quickstep/res/values-uk/strings.xml b/quickstep/res/values-uk/strings.xml
index a6fc4537c5..9acbf61894 100644
--- a/quickstep/res/values-uk/strings.xml
+++ b/quickstep/res/values-uk/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Рекомендовані додатки ввімкнено"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Рекомендовані додатки вимкнено"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Передбачений додаток: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Проведіть пальцем саме від правого або лівого краю екрана."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Проведіть пальцем від правого або лівого краю до середини екрана й підніміть палець."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Ви вмієте проводити пальцем справа наліво, щоб повертатися. Дізнайтеся, як переходити між додатками."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ви виконали жест \"Назад\"."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Не проводьте пальцем надто близько до нижнього краю екрана."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Ви вивчили жести. Щоб вимкнути їх, перейдіть у налаштування."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Ви виконали жест переходу в інший додаток."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Проведіть пальцем, щоб перейти в інший додаток"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Щоб переключитися між додатками, проведіть знизу вгору по екрані, утримуйте палець і відпустіть."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Усе готово!"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Готово"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Налаштування"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Спробуйте ще"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Чудово!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Навчальний посібник <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Готово."</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Щоб перейти на головний екран, проведіть пальцем угору"</string>
     <string name="allset_description" msgid="6350320429953234580">"Тепер ви можете користуватися телефоном"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Системні налаштування навігації"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Поділитися"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Знімок екрана"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Ця дія заборонена додатком або адміністратором організації"</string>
diff --git a/quickstep/res/values-uz/strings.xml b/quickstep/res/values-uz/strings.xml
index e666554ed4..cd34aace1d 100644
--- a/quickstep/res/values-uz/strings.xml
+++ b/quickstep/res/values-uz/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Ilova tavsiyalari yoqildi"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Endi ilova takliflari chiqmaydi"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Taklif etilgan ilova: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Ekran chetidan boshlab oʻngdan yoki chapdan suring."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Ekranning oʻng yoki chap chetidan oʻrtasiga suring va qoʻyib yuboring."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Ortga qaytish uchun oʻngdan surishni oʻrgandingiz. Endi ilovalarni almashtirishni oʻrganamiz."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ortga qaytish ishorasi darsini tamomladingiz."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Barmoqni ekran pastiga yaqin surmaslikka harakat qiling."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Ishoralardan qanday foydalanishni oʻrganib oldingiz. Ishoralarni oʻchirish uchun Sozlamalarga kiring."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Ilovalarni almashtirish darsini tamomladingiz."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Svayp bilan ilovalarni almashtirish"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Ilovalarni ochish uchun ekranning pastidan tepaga qarab suring, biroz ushlab turing va qoʻyib yuboring"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Tayyor"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Tayyor"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Sozlamalar"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Qayta urinish"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Yaxshi!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Darslik: <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Hammasi tayyor!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Boshiga qaytish uchun tepaga suring"</string>
     <string name="allset_description" msgid="6350320429953234580">"Telefoningiz xizmatga tayyor"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Tizim navigatsiya sozlamalari"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Ulashish"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Skrinshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Bu amal ilova yoki tashkilotingiz tomonidan taqiqlangan"</string>
diff --git a/quickstep/res/values-vi/strings.xml b/quickstep/res/values-vi/strings.xml
index 963e7aeb8b..6c192b28a6 100644
--- a/quickstep/res/values-vi/strings.xml
+++ b/quickstep/res/values-vi/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Đã bật tính năng Ứng dụng đề xuất"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Tính năng Ứng dụng đề xuất bị tắt"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Ứng dụng dự đoán: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Hãy vuốt từ mép ngoài cùng bên phải hoặc ngoài cùng bên trái."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Hãy vuốt từ mép phải hoặc mép trái tới giữa màn hình rồi thả tay ra."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Bạn đã tìm hiểu cách vuốt từ mép phải để quay lại. Tiếp theo, hãy tìm hiểu cách chuyển đổi ứng dụng."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Bạn đã thực hiện xong cử chỉ quay lại."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Hãy nhớ không được vuốt quá gần phần cuối màn hình."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Bạn đã tìm hiểu cách sử dụng cử chỉ. Để tắt cử chỉ, hãy chuyển đến phần Cài đặt."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Bạn đã thực hiện xong cử chỉ chuyển đổi ứng dụng."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Vuốt để chuyển đổi ứng dụng"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Để chuyển đổi giữa các ứng dụng, hãy vuốt lên từ cuối màn hình, giữ rồi thả ra."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Đã hoàn tất"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Xong"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Cài đặt"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Thử lại"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Tuyệt vời!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Hướng dẫn <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Đã hoàn tất!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Vuốt lên để chuyển đến Màn hình chính"</string>
     <string name="allset_description" msgid="6350320429953234580">"Hiện giờ, bạn đã có thể sử dụng điện thoại"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Chế độ cài đặt di chuyển trên hệ thống"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Chia sẻ"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Chụp ảnh màn hình"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Ứng dụng hoặc tổ chức của bạn không cho phép thực hiện hành động này"</string>
diff --git a/quickstep/res/values-zh-rCN/strings.xml b/quickstep/res/values-zh-rCN/strings.xml
index e777ede3ad..dbadfd0023 100644
--- a/quickstep/res/values-zh-rCN/strings.xml
+++ b/quickstep/res/values-zh-rCN/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"已启用应用建议"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"已停用应用建议"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"预测的应用：<xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"请从最右侧或最左侧边缘开始滑动。"</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"请从右侧或左侧边缘滑动到屏幕中间位置后再松开手指。"</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"您已了解如何使用“从右侧向左滑动”手势返回。接下来了解如何切换应用。"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"您完成了“返回”手势教程。"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"滑动时，手的位置不要太靠近屏幕底部。"</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"您已了解如何使用手势了。如要关闭手势，请转到“设置”。"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"您完成了“切换应用”手势教程。"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"滑动即可切换应用"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"如需在应用之间切换，请从屏幕底部向上滑动后按住，然后松开。"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"大功告成"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"完成"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"设置"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"重试"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"很好！"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"教程 <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"设置完毕！"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"向上滑动即可转到主屏幕"</string>
     <string name="allset_description" msgid="6350320429953234580">"您可以开始使用手机了"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"系统导航设置"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"分享"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"屏幕截图"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"该应用或您所在的单位不允许执行此操作"</string>
diff --git a/quickstep/res/values-zh-rHK/strings.xml b/quickstep/res/values-zh-rHK/strings.xml
index cae910924e..88a3613839 100644
--- a/quickstep/res/values-zh-rHK/strings.xml
+++ b/quickstep/res/values-zh-rHK/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"已啟用應用程式建議"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"已停用應用程式建議"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"預測應用程式：<xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"請從螢幕右側或左側邊緣滑動。"</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"請從螢幕右側或左側邊緣往中央滑動，然後放開手指。"</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"您已瞭解如何透過「由右向左滑動」手勢返回。接下來一起瞭解如何切換應用程式。"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"您已完成「返回」手勢的教學課程。"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"滑動時，手的位置不要太接近螢幕底部。"</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"您已學會如何使用手勢。如要關閉手勢，請前往「設定」。"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"您已完成「切換應用程式」手勢的教學課程。"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"滑動即可切換應用程式"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"如要切換應用程式，請從螢幕底部向上滑動並按住，然後放開。"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"大功告成"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"完成"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"設定"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"再試一次"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"做得好！"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"教學課程 <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"設定完成！"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"向上滑動即可前往主畫面"</string>
     <string name="allset_description" msgid="6350320429953234580">"您可以開始使用手機了"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"系統導覽設定"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"分享"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"螢幕截圖"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"應用程式或您的機構不允許此操作"</string>
diff --git a/quickstep/res/values-zh-rTW/strings.xml b/quickstep/res/values-zh-rTW/strings.xml
index 067af93710..db1035401a 100644
--- a/quickstep/res/values-zh-rTW/strings.xml
+++ b/quickstep/res/values-zh-rTW/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"應用程式建議功能已啟用"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"應用程式建議功能已停用"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"預測的應用程式：<xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"請從螢幕右側或左側邊緣滑動。"</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"請從螢幕右側或左側邊緣往中央滑動，然後放開手指。"</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"你已瞭解如何透過「由右向左滑動」手勢返回。接著，一起來瞭解如何切換應用程式。"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"你已完成「返回」手勢的教學課程。"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"滑動時，手的位置不要太接近螢幕底部。"</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"你已瞭解如何使用手勢了。如要關閉手勢，請前往「設定」。"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"你已完成「切換應用程式」手勢的教學課程。"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"使用滑動手勢切換應用程式"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"如要切換不同的應用程式，請從螢幕底部向上滑動並按住，然後放開手指。"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"大功告成"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"完成"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"設定"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"重試"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"很好！"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"教學課程 <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"設定完成！"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"向上滑動即可前往主畫面"</string>
     <string name="allset_description" msgid="6350320429953234580">"你可以開始使用手機了"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"系統操作機制設定"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"分享"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"螢幕截圖"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"這個應用程式或貴機構不允許執行這個動作"</string>
diff --git a/quickstep/res/values-zu/strings.xml b/quickstep/res/values-zu/strings.xml
index da13a7ca07..bbfb840e4a 100644
--- a/quickstep/res/values-zu/strings.xml
+++ b/quickstep/res/values-zu/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Iziphakamiso zohlelo lokusebenza zinikwe amandla"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Iziphakamiso zohlelo lokusebenza zikhutshaziwe"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Uhlelo lokusebenza olubikezelwe: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Qiniseka ukuthi uswayipha kusuka onqenqemeni olukude ngakwesokudla noma olukude ngakwesokunxele."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Qiniseka ukuthi uswayipha kusuka kunqenqema ongakwesokudla noma ongakwesokunxele kuya maphakathi nesikrini bese uyadedela."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Ufunde indlela yokuswayipha kusuka kwesokudla ukuze ubuyele emuva. Ngokulandelayo, funda indlela yokushintsha ama-app."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ukuqedile ukuthinta kokubuyela emuva."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Qiniseka ukuba awuswayipheli eduze kakhulu naphansi kwesikrini."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Ufunde ukusebenzisa ukuthinta. Ukuze uvale ukuthinta, iya kokuthi Amasethingi."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Ukuqedile ukuthinta kokushintsha ama-app."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swayipha ukuze ushintshe ama-app"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Ukuze ushintshe phakathi kwama-app, swayiphela phezulu kusuka ngezansi kwesikrini sakho, bese uyadedela."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Konke kusethiwe"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Kwenziwe"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Amasethingi"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Zama futhi"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Kuhle!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Okokufundisa <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Konke kusethiwe!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Swayiphela phezulu ukuze uye Ekhaya"</string>
     <string name="allset_description" msgid="6350320429953234580">"Usulungele ukuqala ukusebenzisa ifoni yakho"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Amasethingi wokuzulazula isistimu"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Yabelana"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Isithombe-skrini"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Lesi senzo asivunyelwanga uhlelo lokusebenza noma inhlangano yakho"</string>
-- 
GitLab


From 1fc7f990b509ae7d00335db1f2d796e4dc7e21d3 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Thu, 15 Jul 2021 17:18:25 +0000
Subject: [PATCH 1615/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Ie927e0de6422f58f850efe83a6a7ba4e20a7333c
---
 res/values-af/strings.xml        | 3 +--
 res/values-am/strings.xml        | 3 +--
 res/values-as/strings.xml        | 3 +--
 res/values-b+sr+Latn/strings.xml | 3 +--
 res/values-bg/strings.xml        | 3 +--
 res/values-bs/strings.xml        | 2 +-
 res/values-ca/strings.xml        | 3 +--
 res/values-cs/strings.xml        | 3 +--
 res/values-da/strings.xml        | 3 +--
 res/values-de/strings.xml        | 3 +--
 res/values-es/strings.xml        | 3 +--
 res/values-et/strings.xml        | 3 +--
 res/values-eu/strings.xml        | 3 +--
 res/values-fi/strings.xml        | 3 +--
 res/values-fr-rCA/strings.xml    | 3 +--
 res/values-fr/strings.xml        | 3 +--
 res/values-gl/strings.xml        | 3 +--
 res/values-gu/strings.xml        | 3 +--
 res/values-hi/strings.xml        | 3 +--
 res/values-hu/strings.xml        | 3 +--
 res/values-hy/strings.xml        | 3 +--
 res/values-is/strings.xml        | 3 +--
 res/values-iw/strings.xml        | 3 +--
 res/values-ja/strings.xml        | 3 +--
 res/values-ka/strings.xml        | 3 +--
 res/values-km/strings.xml        | 3 +--
 res/values-kn/strings.xml        | 3 +--
 res/values-ko/strings.xml        | 3 +--
 res/values-lt/strings.xml        | 3 +--
 res/values-lv/strings.xml        | 3 +--
 res/values-mk/strings.xml        | 3 +--
 res/values-ml/strings.xml        | 3 +--
 res/values-mn/strings.xml        | 3 +--
 res/values-mr/strings.xml        | 3 +--
 res/values-ms/strings.xml        | 3 +--
 res/values-my/strings.xml        | 3 +--
 res/values-nb/strings.xml        | 3 +--
 res/values-ne/strings.xml        | 3 +--
 res/values-nl/strings.xml        | 3 +--
 res/values-or/strings.xml        | 3 +--
 res/values-pa/strings.xml        | 3 +--
 res/values-ro/strings.xml        | 3 +--
 res/values-ru/strings.xml        | 3 +--
 res/values-si/strings.xml        | 3 +--
 res/values-sk/strings.xml        | 3 +--
 res/values-sl/strings.xml        | 3 +--
 res/values-sr/strings.xml        | 3 +--
 res/values-ta/strings.xml        | 3 +--
 res/values-th/strings.xml        | 3 +--
 res/values-tl/strings.xml        | 3 +--
 res/values-tr/strings.xml        | 3 +--
 res/values-uk/strings.xml        | 3 +--
 res/values-uz/strings.xml        | 3 +--
 res/values-vi/strings.xml        | 3 +--
 res/values-zh-rCN/strings.xml    | 3 +--
 res/values-zh-rHK/strings.xml    | 3 +--
 res/values-zh-rTW/strings.xml    | 3 +--
 res/values-zu/strings.xml        | 3 +--
 58 files changed, 58 insertions(+), 115 deletions(-)

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index ecab6afd42..bce71b70fc 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g>-legstuk"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Raak en hou die legstuk om dit op die Tuisskerm rond te beweeg"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Voeg by Tuisskerm"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g>-legstuk by tuisskerm gevoeg"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> legstukke</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> legstuk</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index a0b2a988b6..8923afc250 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"የ<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ምግብር"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"በመነሻ ገጽ አካባቢ ላይ ለማንቀሳቀስ ነክተው ይያዙት"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ወደ መነሻ ገጽ አክል"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ምግብር ወደ መነሻ ማያ ገጽ ታክሏል"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ንዑስ ፕሮግራሞች</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ንዑስ ፕሮግራሞች</item>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index f611529597..9bc08e3b6d 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ৱিজেট"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ৱিজেটটো গৃহ স্ক্ৰীনৰ আশে-পাশে নিবলৈ সেইটোত স্পৰ্শ কৰি ধৰি ৰাখক"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"গৃহ স্ক্ৰীনত যোগ কৰক"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ৱিজেটটো গৃহ স্ক্ৰীনত যোগ দিয়া হৈছে"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> টা ৱিজেট</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> টা ৱিজেট</item>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 52734cda29..b4f542e032 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> vidžet"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Dodirnite i zadržite vidžet da biste ga pomerali po početnom ekranu"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Dodaj na početni ekran"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Dodali ste vidžet <xliff:g id="WIDGET_NAME">%1$s</xliff:g> na početni ekran"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidžet</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidžeta</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 967eda0d5f..96e9d3121c 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> приспособление"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Докоснете приспособлението и го задръжте, за да го местите по началния екран"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Добавяне към началния екран"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Приспособлението <xliff:g id="WIDGET_NAME">%1$s</xliff:g> е добавено към началния екран"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> приспособления</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> приспособление</item>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 6872e9d89a..4b6ab9b64b 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -35,7 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Vidžet <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Dodirnite i držite vidžet da ga pomjerate po Početnom ekranu"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Dodaj na početni ekran"</string>
-    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g> dodan je na početni zaslon"</string>
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Vidžet <xliff:g id="WIDGET_NAME">%1$s</xliff:g> je dodan na početni ekran"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidžet</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidžeta</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index f95c037fc1..df30b436f3 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget de <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Mantén premut el widget per moure\'l per la pantalla d\'inici"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Afegeix a la pantalla d\'inici"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"El widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g> s\'ha afegit a la pantalla d\'inici"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 315ad1a822..7c6a76fabf 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Pokud chcete widgetem pohybovat po ploše, podržte ho"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Přidat na plochu"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g> byl přidán na plochu"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgety</item>
       <item quantity="many"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgetu</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 5d8bab57c0..e06a686255 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widgetten <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Hold widgetten nede for at flytte den rundt på startskærmen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Føj til startskærm"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Widgetten <xliff:g id="WIDGET_NAME">%1$s</xliff:g> blev føjet til startskærmen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1978f8bd85..521ade4745 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget „<xliff:g id="WIDGET_NAME">%1$s</xliff:g>“"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Wenn du das Widget auf dem Startbildschirm verschieben möchtest, halte es gedrückt"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Zum Startbildschirm hinzufügen"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g>-Widget zum Startbildschirm hinzugefügt"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> Widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> Widget</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 9f8818e5ce..d82e92d135 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget de <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Mantén pulsado el widget para moverlo por la pantalla de inicio"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Añadir a la pantalla de inicio"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g> añadido a la pantalla de inicio"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index e4018a5724..f8ef52b8b0 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Vidin <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Vidina teisaldamiseks avakuval puudutage vidinat ja hoidke seda all"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Lisa avakuvale"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Vidin <xliff:g id="WIDGET_NAME">%1$s</xliff:g> lisati avakuvale"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidinat</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> vidin</item>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 6e11a7c9e9..e87f6e6048 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widgeta"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Eduki sakatuta widgeta hasierako pantailan zehar mugitzeko"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Gehitu hasierako pantailan"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widgeta hasierako pantailan gehitu da"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 10f18fff75..e01ab255c6 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Voit siirtää widgetiä aloitusnäytöllä koskettamalla sitä pitkään"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Lisää aloitusnäytölle"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Widget lisätty aloitusnäytölle: <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgetiä</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index ee43b45b70..6f9e995293 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Maintenez le doigt sur le widget pour le déplacer sur l\'écran d\'accueil"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Ajouter à l\'écran d\'accueil"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Le widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g> a été ajouté à l\'écran d\'accueil"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index e07c34e6fc..c06179665d 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Appuyez de manière prolongée sur le widget pour le déplacer sur l\'écran d\'accueil"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Ajouter à l\'écran d\'accueil"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g> ajouté à l\'écran d\'accueil"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 1eeaf30c60..b9ae835ef6 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Mantén premido o widget para movelo pola pantalla de inicio"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Engadir á pantalla de inicio"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Engadiuse o widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g> á pantalla de inicio"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 978eeea40d..695b128e01 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> વિજેટ"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"વિજેટને હોમ સ્ક્રીનની આજુબાજુ ખસેડવા માટે, તેને ટચ કરીને થોડીવાર દબાવી રાખો"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"હોમ સ્ક્રીન પર ઉમેરો"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"હોમ સ્ક્રીન પર <xliff:g id="WIDGET_NAME">%1$s</xliff:g> વિજેટ ઉમેર્યુ"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> વિજેટ</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> વિજેટ</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 6e04246df8..e2310749e1 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> विजेट"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"होम स्क्रीन पर यहां-वहां ले जाने के लिए विजेट को दबाकर रखें"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"होम स्क्रीन पर जोड़ें"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> विजेट को होम स्क्रीन पर जोड़ा गया"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> विजेट</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> विजेट</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 9292d0a361..30b6f6f3f4 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> modul"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Tartsa lenyomva a modult a kezdőképernyőn való mozgatáshoz"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Hozzáadás a kezdőképernyőhöz"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> modul hozzáadva a kezdőképernyőhöz"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> modul</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> modul</item>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 10e6e4a47f..5ca8744324 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> վիջեթ"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Հպեք վիջեթին և պահեք տեղափոխելու համար"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Ավելացնել հիմնական էկրանին"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> վիջեթն ավելացվել է հիմնական էկրանին"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> վիջեթ</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> վիջեթ</item>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 5cd864402b..1431e81d56 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Græjan <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Haltu fingri á græjunni til að hreyfa hana um heimaskjáinn"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Bæta á heimaskjá"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> græju bætt við heimaskjá"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> græja</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> græjur</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 9ee139dc8a..b5e41b61b9 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"ווידג\'ט <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"יש ללחוץ לחיצה ארוכה על הווידג\'ט כדי להזיז אותו ברחבי מסך הבית"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"הוספה למסך הבית"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"הווידג\'ט <xliff:g id="WIDGET_NAME">%1$s</xliff:g> נוסף למסך הבית"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="two"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ווידג\'טים</item>
       <item quantity="many"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ווידג\'טים</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 2b22acc1ea..84becd85bb 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ウィジェット"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ウィジェットを押し続けると、ホーム画面上に移動できます。"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ホーム画面に追加"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"「<xliff:g id="WIDGET_NAME">%1$s</xliff:g>」ウィジェットをホーム画面に追加しました"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> 件のウィジェット</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> 件のウィジェット</item>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 3d38dfc1d5..6b89b05a85 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ვიჯეტი"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ხანგრძლივად შეეხეთ ვიჯეტს მთავარ ეკრანზე მის გადასაადგილებლად"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"მთავარ ეკრანზე დამატება"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ვიჯეტი დამატებულია მთავარ ეკრანზე"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ვიჯეტი</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> ვიჯეტი</item>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index fb49923d89..8ff9112321 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"ធាតុ​ក្រាហ្វិក <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ចុចធាតុក្រាហ្វិក​ឱ្យជាប់ ដើម្បីផ្លាស់ទីវា​ជុំវិញអេក្រង់ដើម"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"បញ្ចូល​ទៅអេក្រង់ដើម"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"បានបញ្ចូល​ធាតុក្រាហ្វិក <xliff:g id="WIDGET_NAME">%1$s</xliff:g> ទៅ​អេក្រង់ដើម"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other">ធាតុ​ក្រាហ្វិក <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
       <item quantity="one">ធាតុ​ក្រាហ្វិក <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g></item>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 3ed5498faf..3fa8ac76d3 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ವಿಜೆಟ್"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ಮುಖಪುಟದ ಪರದೆ ಸುತ್ತ ವಿಜೆಟ್ ಅನ್ನು ಸರಿಸಲು, ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಒತ್ತಿ ಹಿಡಿದುಕೊಳ್ಳಿ"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ಮುಖಪುಟಕ್ಕೆ ಸೇರಿಸಿ"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"ಹೋಮ್‌ಸ್ಕ್ರೀನ್‌ಗೆ <xliff:g id="WIDGET_NAME">%1$s</xliff:g> ವಿಜೆಟ್ ಅನ್ನು ಸೇರಿಸಲಾಗಿದೆ"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ವಿಜೆಟ್‌ಗಳು</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ವಿಜೆಟ್‌ಗಳು</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 13ecf3ac44..05d77107bb 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"위젯 <xliff:g id="WIDGET_NAME">%1$s</xliff:g>개"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"홈 화면에서 위젯을 이동하려면 길게 터치하세요."</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"홈 화면에 추가"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> 위젯이 홈 화면에 추가됨"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other">위젯 <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g>개</item>
       <item quantity="one">위젯 <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g>개</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 2aaa4ce282..0c3b91f183 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> valdiklis"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Paliesdami ir palaikydami valdiklį galite judėti pagrindiniame ekrane"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Pridėti prie pagrindinio ekrano"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Valdiklis „<xliff:g id="WIDGET_NAME">%1$s</xliff:g>“ pridėtas prie pagrindinio ekrano"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> valdiklis</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> valdikliai</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 16a39f8559..2f89a1f8b6 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Logrīks <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Pieskarieties logrīkam un turiet to, lai to pārvietotu pa sākuma ekrānu."</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Pievienot sākuma ekrānam"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Logrīks “<xliff:g id="WIDGET_NAME">%1$s</xliff:g>” ir pievienots sākuma ekrānam"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="zero"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> logrīku</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> logrīks</item>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 5c3fa8c668..99e4adbc59 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Виџет <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Допрете го и задржете го виџетот за да го движите наоколу на почетниот екран"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Додај на почетниот екран"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Виџетот <xliff:g id="WIDGET_NAME">%1$s</xliff:g> е додаден на почетниот екран"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виџет</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виџети</item>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 8fe9d77a41..f282bd1db4 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> വിജറ്റ്"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ഹോം സ്‌ക്രീനിന് ചുറ്റും വിജറ്റ് നീക്കാൻ അതിൽ സ്‌പർശിച്ച് പിടിക്കുക"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ഹോം സ്‌ക്രീനിലേക്ക് ചേർക്കുക"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> വിജറ്റ് ഹോം സ്‌ക്രീനിലേക്ക് ചേർത്തു"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> വിജറ്റുകൾ</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> വിജറ്റ്</item>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index d86aa17a69..3d00aea529 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> жижиг хэрэгсэл"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Жижиг хэрэгслийг Үндсэн нүүрний эргэн тойронд зөөхийн тулд түүнд хүрээд, удаан дарна уу"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Үндсэн нүүрэнд нэмэх"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> виджетийг үндсэн нүүрэнд нэмсэн"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> жижиг хэрэгсэл</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> жижиг хэрэгсэл</item>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 13df1d836a..9e14926693 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> विजेट"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"होम स्क्रीनवर ते हलवण्यासाठी विजेटला स्पर्श करा आणि धरून ठेवा"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"होम स्‍क्रीनवर जोडा"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> हे विजेट तुमच्या होम स्क्रीनवर जोडले आहे"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> विजेट</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> विजेट</item>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 89b45cbe30..48bff64a84 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Sentuh &amp; tahan widget untuk menggerakkan widget di sekitar Skrin utama"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Tambahkan pada Skrin utama"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g> ditambahkan pada skrin utama"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 8bb9e35d53..e05827346e 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ဝိဂျက်"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ပင်မစာမျက်နှာအနီးတွင် ဝိဂျက်ကိုရွှေ့ရန် ၎င်းကို တို့ထိ၍ဖိထားပါ"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ပင်မစာမျက်နှာသို့ ထည့်ရန်"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ဝိဂျက်ကို ပင်မစာမျက်နှာတွင် ထည့်လိုက်ပြီ"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other">ဝိဂျက် <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ခု</item>
       <item quantity="one">ဝိဂျက် <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> ခု</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 161fc05330..0f7dae98ab 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g>-modul"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Trykk og hold på modulen for å bevege den rundt på startskjermen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Legg til på startskjermen"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g>-modulen er lagt til på startskjermen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> moduler</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> modul</item>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 9ac6ce2dc7..97c23ad2c9 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> विजेट"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"यो विजेट होम स्क्रिनमा यताउता सार्न त्यसमा टच एन्ड होल्ड गर्नुहोस्"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"होम स्क्रिनमा हाल्नुहोस्"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"होम स्क्रिनमा <xliff:g id="WIDGET_NAME">%1$s</xliff:g> विजेट हालियो"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> वटा विजेट</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> वटा विजेट</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index c065756e72..05d2c7494a 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Houd de widget ingedrukt om deze te verplaatsen op het startscherm"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Toevoegen aan startscherm"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Widget <xliff:g id="WIDGET_NAME">%1$s</xliff:g> toegevoegd aan startscherm"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 78fb710ddb..b1d644551d 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ୱିଜେଟ୍"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ମୂଳସ୍କ୍ରିନର ଆଖପାଖରେ ୱିଜେଟକୁ ମୁଭ୍ କରିବା ପାଇଁ ଏହାକୁ ସ୍ପର୍ଶ କରି ଧରି ରଖନ୍ତୁ"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ମୂଳସ୍କ୍ରିନରେ ଯୋଗ କରନ୍ତୁ"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g>ର ୱିଜେଟ୍ ମୂଳସ୍କ୍ରିନରେ ଯୋଡ଼ାଗଲା"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g>ଟି ୱିଜେଟ୍</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g>ଟି ୱିଜେଟ୍</item>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 8ba4092809..f352e22f22 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ਵਿਜੇਟ"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ਵਿਜੇਟ ਨੂੰ ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਇੱਧਰ-ਉੱਧਰ ਲਿਜਾਉਣ ਲਈ ਸਪਰਸ਼ ਕਰਕੇ ਦਬਾਈ ਰੱਖੋ"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਸ਼ਾਮਲ ਕਰੋ"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ਵਿਜੇਟ ਨੂੰ ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ਵਿਜੇਟ</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ਵਿਜੇਟ</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index ba4b33366d..c8791067d9 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widgetul <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Atingeți lung widgetul pentru a-l muta pe ecranul de pornire"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Adăugați pe ecranul de pornire"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Widgetul <xliff:g id="WIDGET_NAME">%1$s</xliff:g> a fost adăugat pe ecranul de pornire"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgeturi</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> de widgeturi</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index a6f85335e6..85d7db62d4 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Виджет \"<xliff:g id="WIDGET_NAME">%1$s</xliff:g>\""</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Чтобы переместить виджет, нажмите на него и удерживайте."</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Добавить на главный экран"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Виджет \"<xliff:g id="WIDGET_NAME">%1$s</xliff:g>\" добавлен на главный экран"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виджет</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виджета</item>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index e8619bacac..aefcae892c 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> විජට්ටුව"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"එය මුල් පිටු තිරය වටා ගෙන යාමට විජට් එක ස්පර්ශ කර අල්ලා ගන්න"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"මුල් පිටු තිරය වෙත එක් කරන්න"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> විජට්ටුව මුල් පිටු තිරය වෙත එක් කරන ලදි"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one">විජට් <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
       <item quantity="other">විජට් <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 70e9cb68d1..5ad3599c27 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Miniaplikácia <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Po pridržaní môžete miniaplikáciu posúvať po ploche"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Pridať na plochu"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Na plochu bola pridaná miniaplikácia <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> miniaplikácie</item>
       <item quantity="many"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgets</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 12843b1f9f..830d25360c 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Pripomoček <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Pridržite pripomoček, če ga želite premikati po začetnem zaslonu."</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Dodaj na začetni zaslon"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Pripomoček »<xliff:g id="WIDGET_NAME">%1$s</xliff:g>« je dodan na začetni zaslon."</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> pripomoček</item>
       <item quantity="two"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> pripomočka</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 41cac322a0..44829b05ee 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> виџет"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Додирните и задржите виџет да бисте га померали по почетном екрану"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Додај на почетни екран"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Додали сте виџет <xliff:g id="WIDGET_NAME">%1$s</xliff:g> на почетни екран"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виџет</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виџета</item>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 1a4b8434e6..c4ee9ae523 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> விட்ஜெட்"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"முகப்புத் திரைக்கு விட்ஜெட்டை நகர்த்த அதைத் தொட்டுப் பிடிக்கவும்"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"முகப்புத் திரையில் சேர்"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> விட்ஜெட் முகப்புத் திரையில் சேர்க்கப்பட்டது"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> விட்ஜெட்டுகள்</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> விட்ஜெட்</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index e807f942a3..fe4468649d 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"วิดเจ็ต <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"แตะวิดเจ็ตค้างไว้เพื่อย้ายไปรอบๆ หน้าจอหลัก"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"เพิ่มลงในหน้าจอหลัก"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"เพิ่มวิดเจ็ต <xliff:g id="WIDGET_NAME">%1$s</xliff:g> ลงในหน้าจอหลักแล้ว"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other">วิดเจ็ต <xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> รายการ</item>
       <item quantity="one">วิดเจ็ต <xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> รายการ</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 770bab3ea2..726241ad53 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Pindutin nang matagal ang widget para ilipat-lipat ito sa Home screen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Idagdag sa Home screen"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Idinagdag sa home screen ang widget na <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> na widget</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 5d0e32c7ae..0c6a498adb 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget\'ı"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Ana ekranda taşımak için widget\'a dokunup basılı tutun"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Ana ekrana ekle"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> widget\'ı ana ekrana eklendi"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widget</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 0ffb5cb6c4..3e5233079e 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Віджет <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Натисніть і втримуйте віджет, щоб перемістити його в потрібне місце на головному екрані"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Додати на головний екран"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Віджет <xliff:g id="WIDGET_NAME">%1$s</xliff:g> додано на головний екран"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> віджет</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> віджети</item>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 7fe0c631f4..0cac80ff65 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ta vidjet"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Vidjetni ushlagan holda kerakli joyga siljiting"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Bosh ekranga chiqarish"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> vidjeti bosh ekranga qoʻshildi"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ta vidjet</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> ta vidjet</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 3c2db21886..ba9670aea1 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Tiện ích <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Chạm và giữ để di chuyển tiện ích xung quanh Màn hình chính"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Thêm vào Màn hình chính"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Đã thêm tiện ích <xliff:g id="WIDGET_NAME">%1$s</xliff:g> vào màn hình chính"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> tiện ích</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> tiện ích</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index f4536532fb..8fda4ef050 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"“<xliff:g id="WIDGET_NAME">%1$s</xliff:g>”微件"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"轻触并按住该微件即可将其在主屏幕上四处移动"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"添加到主屏幕"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"已将“<xliff:g id="WIDGET_NAME">%1$s</xliff:g>”微件添加到主屏幕"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> 个微件</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> 个微件</item>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 0a6aa0f56c..5887ed627f 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"「<xliff:g id="WIDGET_NAME">%1$s</xliff:g>」小工具"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"按住小工具即可隨意在主畫面上移動"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"新增至主畫面"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"已經將「<xliff:g id="WIDGET_NAME">%1$s</xliff:g>」小工具加咗去主畫面"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> 個小工具</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> 個小工具</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index b42a4fedfd..a65a7526d8 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"「<xliff:g id="WIDGET_NAME">%1$s</xliff:g>」小工具"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"按住小工具即可將它拖放到主畫面上的任何位置"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"新增到主畫面"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"已將「<xliff:g id="WIDGET_NAME">%1$s</xliff:g>」小工具新增到主畫面"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> 項小工具</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> 項小工具</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 74580a8ab6..9b590e7b6b 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Iwijethi elingu-<xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Thinta uphinde ubambe iwijethi ukuyihambisa Kusikrini sasekhaya"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Engeza kusikrini sasekhaya"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Iwijethi ye-<xliff:g id="WIDGET_NAME">%1$s</xliff:g> yengezwe kusikrini sasekhaya"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one">Amawijethi angu-<xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
       <item quantity="other">Amawijethi angu-<xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g></item>
-- 
GitLab


From 558b18eb126cc4c1fdfdbdac6556a826aa69403c Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 15 Jul 2021 16:17:51 -0700
Subject: [PATCH 1616/1664] Fixing regression from animation not starting while
 in overview

Bug: 193830420
Test: Open an app in overview, tap on a notification
Change-Id: Ifd9797dc40d9fffbf9603bca98fcb4a4119e0444
---
 quickstep/src/com/android/quickstep/views/RecentsView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 39627be7c4..4e1bcc9bee 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -904,8 +904,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             TaskViewUtils.composeRecentsLaunchAnimator(anim, taskView, apps, wallpaper, nonApps,
                     true /* launcherClosing */, mActivity.getStateManager(), this,
                     getDepthController());
-            anim.start();
         }
+        anim.start();
     }
 
     private void updateTaskStartIndex(View affectingView) {
-- 
GitLab


From 0896cbc8f34667df3a74d4700cf75070041a516e Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Fri, 16 Jul 2021 02:51:58 +0000
Subject: [PATCH 1617/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I3d7b3786054b9790b140cbaa43b0d96196beb042
---
 quickstep/res/values-ar/strings.xml | 18 ++++++------------
 quickstep/res/values-be/strings.xml | 18 ++++++------------
 quickstep/res/values-el/strings.xml | 18 ++++++------------
 quickstep/res/values-pl/strings.xml | 18 ++++++------------
 quickstep/res/values-sv/strings.xml | 18 ++++++------------
 quickstep/res/values-ur/strings.xml | 18 ++++++------------
 6 files changed, 36 insertions(+), 72 deletions(-)

diff --git a/quickstep/res/values-ar/strings.xml b/quickstep/res/values-ar/strings.xml
index 238942eba0..05f76074ab 100644
--- a/quickstep/res/values-ar/strings.xml
+++ b/quickstep/res/values-ar/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"تم تفعيل ميزة \"التطبيقات المقترحة\"."</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ميزة \"التطبيقات المقترحة\" غير مفعّلة."</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"التطبيق المتوقع: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"تأكّد من التمرير سريعًا من أقصى الحافة اليسرى أو اليمنى."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"تأكّد من التمرير سريعًا من الحافة اليسرى أو اليمنى إلى وسط الشاشة ثم ارفع إصبعك."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"لقد تعلمت كيفية التمرير سريعًا من اليسار للرجوع. تعرّف بعد ذلك على كيفية التبديل بين التطبيقات."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"لقد أكملت التدريب على إيماءة الرجوع."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"تأكّد من عدم التمرير بالقرب من أسفل الشاشة."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"تعرّفت على كيفية استخدام الإيماءات. لإيقاف الإيماءات، انتقِل إلى \"الإعدادات\"."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"أكملت التدريب على إيماءة التبديل بين التطبيقات."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"مرِّر سريعًا للتبديل بين التطبيقات"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"للتبديل بين التطبيقات، مرِّر سريعًا من أسفل الشاشة لأعلاها مع تثبيت إصبعك ثم ارفعه."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"اكتمل التدريب على الإيماءة"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"تم"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"الإعدادات"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"إعادة المحاولة"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"أحسنت"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"الدليل التوجيهي <xliff:g id="CURRENT">%1$d</xliff:g> من إجمالي <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"اكتمال الإعداد"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"مرِّر سريعًا للأعلى للانتقال إلى الشاشة الرئيسية."</string>
     <string name="allset_description" msgid="6350320429953234580">"يمكنك الآن بدء استخدام هاتفك."</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"إعدادات التنقّل داخل النظام"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"مشاركة"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"لقطة شاشة"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"لا يسمح التطبيق أو لا تسمح مؤسستك بهذا الإجراء."</string>
diff --git a/quickstep/res/values-be/strings.xml b/quickstep/res/values-be/strings.xml
index 949fcbf503..3151c27311 100644
--- a/quickstep/res/values-be/strings.xml
+++ b/quickstep/res/values-be/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Прапановы праграм уключаны"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Прапановы праграм выключаны"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Праграма з падказкі: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Пераканайцеся, што вы праводзіце пальцам ад самага вугла (правага ці левага) экрана."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Пераканайцеся, што праводзіце пальцам з правага ці левага вугла ў цэнтр экрана, а потым адпускаеце."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Вы даведаліся, як гартаць справа для вяртання. Цяпер даведайцеся, як пераключацца паміж праграмамі."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Вы навучыліся рабіць жэст вяртання."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Пераканайцеся, што вы не праводзіце пальцам занадта блізка да ніжняга краю экрана."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Вы навучыліся выкарыстоўваць жэсты. Каб выключыць жэсты, адкрыйце Налады."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Вы навучыліся рабіць жэст пераключэння паміж праграмамі."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Правесці пальцам для пераключэння паміж праграмамі"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Каб пераключыцца на іншую праграму, правядзіце па экране знізу ўверх, патрымайце палец і адпусціце."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Гатова"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Гатова"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Налады"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Паўтарыць спробу"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Выдатна!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Дапаможнік <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Гатова!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Каб перайсці на галоўны экран, правядзіце пальцам уверх"</string>
     <string name="allset_description" msgid="6350320429953234580">"Вы можаце пачаць карыстанне тэлефонам"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Налады навігацыі ў сістэме"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Абагуліць"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Здымак экрана"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Гэта дзеянне не дазволена праграмай ці вашай арганізацыяй"</string>
diff --git a/quickstep/res/values-el/strings.xml b/quickstep/res/values-el/strings.xml
index f2f850e774..352d10e711 100644
--- a/quickstep/res/values-el/strings.xml
+++ b/quickstep/res/values-el/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Οι προτεινόμενες εφαρμογές ενεργοποιήθηκαν"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Οι προτεινόμενες εφαρμογές είναι απενεργοποιημένες"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Εφαρμογή από πρόβλεψη: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Φροντίστε να σύρετε από το άκρο της δεξιάς ή της αριστερής πλευράς."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Σύρετε από το δεξί ή αριστερό άκρο προς το μέσο της οθόνης και απομακρύνετε το δάχτυλό σας."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Μάθατε πώς να σύρετε από τα δεξιά για επιστροφή. Στη συνέχεια, μάθετε πώς να κάνετε εναλλαγή εφαρμ."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ολοκληρώσατε την κίνηση επιστροφής."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Φροντίστε να μην σύρετε υπερβολικά κοντά στο κάτω μέρος της οθόνης."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Μάθατε πώς να χρησιμοποιείτε κινήσεις. Μεταβείτε στις Ρυθμίσεις για απενεργοποίηση των κινήσεων."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Ολοκληρώσατε την κίνηση εναλλαγής εφαρμογών."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Σύρετε για εναλλαγή εφαρμογών"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Για εναλλαγή εφαρμογών, σύρετε προς τα πάνω από το κάτω μέρος της οθόνης, πατήστε παρατεταμένα και μετά αφήστε."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Όλα είναι έτοιμα"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Τέλος"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Ρυθμίσεις"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Δοκιμάστε ξανά"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Ωραία!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Οδηγός <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Όλα έτοιμα!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Σύρετε προς τα πάνω για μετάβαση στην αρχική οθόνη."</string>
     <string name="allset_description" msgid="6350320429953234580">"Είστε έτοιμοι να ξεκινήστε να χρησιμοποιείτε το τηλέφωνό σας"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Ρυθμίσεις πλοήγησης συστήματος"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Κοινοποίηση"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Στιγμιότυπο οθόνης"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Αυτή η ενέργεια δεν επιτρέπεται από την εφαρμογή ή τον οργανισμό σας."</string>
diff --git a/quickstep/res/values-pl/strings.xml b/quickstep/res/values-pl/strings.xml
index 18dc1bc608..b63d063eba 100644
--- a/quickstep/res/values-pl/strings.xml
+++ b/quickstep/res/values-pl/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Włączono sugestie aplikacji"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Sugestie aplikacji są wyłączone"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Przewidywana aplikacja: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Pamiętaj, aby przesuwać palcem od samej prawej lub lewej krawędzi."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Pamiętaj, aby przesuwać palcem od prawej lub lewej krawędzi do środka ekranu i podnieść palec."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Wiesz już, jak przesuwać palcem od prawej strony, aby wrócić. Poćwicz teraz przełączanie aplikacji."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Gest przejścia wstecz został opanowany."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pamiętaj, aby nie przesuwać palcem zbyt blisko dolnej części ekranu."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Wiesz już, jak używać gestów. Aby wyłączyć gesty, przejdź do Ustawień."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Gest przełączania aplikacji został opanowany."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Przesuwanie palcem, aby przełączać aplikacje"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Aby przełączać się między aplikacjami, przesuń palcem od dołu ekranu, przytrzymaj i puść."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Wszystko gotowe"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Gotowe"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Ustawienia"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Spróbuj ponownie"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Super!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Samouczek <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Wszystko gotowe"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Aby przejść na stronę główną, przesuń palcem w górę"</string>
     <string name="allset_description" msgid="6350320429953234580">"Teraz możesz zacząć używać telefonu"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Ustawienia nawigacji w systemie"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Udostępnij"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Zrzut ekranu"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Nie możesz wykonać tego działania, bo nie zezwala na to aplikacja lub Twoja organizacja"</string>
diff --git a/quickstep/res/values-sv/strings.xml b/quickstep/res/values-sv/strings.xml
index 2d42f2f5c5..b412418b8f 100644
--- a/quickstep/res/values-sv/strings.xml
+++ b/quickstep/res/values-sv/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Appförslag har aktiverats"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Appförslag har inaktiverats"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Appförslag: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Se till att du sveper ända från högerkanten eller vänsterkanten."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Se till att du sveper från den högra eller vänstra kanten till mitten av skärmen och sedan släpper."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Nu kan du svepa från höger för att gå tillbaka. Nu ska du få lära dig hur du byter mellan appar."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Du är klar med rörelsen för att gå tillbaka."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Se till att du inte sveper för nära skärmens nederkant."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Du har lärt dig hur du använder rörelser. Om du vill inaktivera rörelser öppnar du inställningarna."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Du är klar med rörelsen för att byta mellan appar."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Svep för att byta mellan appar"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Byt mellan appar genom att svepa uppåt från skärmens nederkant. Håll fingret nedtryckt och släpp."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Klart"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Klar"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Inställningar"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Försök igen"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Bra!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Självstudie <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Klart!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Svep uppåt för att öppna startskärmen"</string>
     <string name="allset_description" msgid="6350320429953234580">"Nu kan du börja använda telefonen"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Systemnavigeringsinställningarna"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Dela"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Skärmbild"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Appen eller organisationen tillåter inte den här åtgärden"</string>
diff --git a/quickstep/res/values-ur/strings.xml b/quickstep/res/values-ur/strings.xml
index 292fdc7dac..2e8bde9b64 100644
--- a/quickstep/res/values-ur/strings.xml
+++ b/quickstep/res/values-ur/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"ایپ کی تجاویز فعال ہیں"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"ایپ کی تجاویز غیر فعال ہیں"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"پیشن گوئی کردہ ایپ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"یقینی بنائیں کہ آپ دائیں یا بائیں کنارے سے دور سے سوئپ کریں۔"</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"یقینی بنائیں کہ آپ دائیں یا بائیں کنارے سے اسکرین کے وسط تک سوائپ کریں اور پھر اپنی انگلی اٹھا لیں۔"</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"آپ نے واپس جانے کے لیے دائیں کنارے سے سوائپ کرنے کا طریقہ سیکھ لیا۔ اس کے بعد ایپس سوئچ کرنے کا طریقہ جانیں۔"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"آپ نے واپس جائیں اشارے کو مکمل کر لیا۔"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"اس بات کو یقینی بنائیں کہ آپ اسکرین کے نچلے حصے سے زیادہ قریب سے سوائپ نہ کریں۔"</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"آپ نے اشاروں کو استعمال کرنے کا طریقہ سیکھ لیا۔ اشاروں کو آف کرنے کے لیے ترتیبات پر جائیں۔"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"آپ نے ایپس کو سوئچ کرنے کا اشارہ مکمل کر لیا۔"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ایپس سوئچ کرنے کے لیے سوائپ کریں"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"ایپس کے مابین سوئچ کرنے کے لیے، اپنی اسکرین کے نچلے حصے سے اوپر کی جانب سوائپ کریں، پکڑے رکھیں، پھر چھوڑ دیں۔"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"سب ہو گیا"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"ہو گیا"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ترتیبات"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"پھر کوشش کریں"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"عمدہ!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"ٹیوٹوریل <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"سب کچھ تیار ہے!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"ہوم پر جانے کے لیے اوپر سوائپ کریں"</string>
     <string name="allset_description" msgid="6350320429953234580">"آپ اپنا فون استعمال شروع کرنے کے لیے تیار ہیں"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"سسٹم نیویگیشن کی ترتیبات"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"اشتراک کریں"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"اسکرین شاٹ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ایپ یا آپ کی تنظیم کی جانب سے اس کارروائی کی اجازت نہیں ہے"</string>
-- 
GitLab


From aaf56f0f9df9d0d676f9cd1875f9b959c3e873da Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Fri, 16 Jul 2021 02:54:26 +0000
Subject: [PATCH 1618/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Iea3e5d755411a8fc8b2e5a878815bf44b97e9f18
---
 res/values-ar/strings.xml | 3 +--
 res/values-be/strings.xml | 3 +--
 res/values-el/strings.xml | 3 +--
 res/values-pl/strings.xml | 3 +--
 res/values-sv/strings.xml | 3 +--
 res/values-ur/strings.xml | 3 +--
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 9e5360caa1..b828e1ddd9 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"أداة <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"يمكنك النقر على الأداة مع الاستمرار لتحريكها على الشاشة الرئيسية."</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"إضافة إلى الشاشة الرئيسية"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"تمت إضافة الأداة <xliff:g id="WIDGET_NAME">%1$s</xliff:g> إلى الشاشة الرئيسية."</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="zero"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> أداة</item>
       <item quantity="two">أداتان (<xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g>)</item>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 1389e48afa..3de26e8bde 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Віджэт \"<xliff:g id="WIDGET_NAME">%1$s</xliff:g>\""</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Утрымліваючы віджэт націснутым, перамяшчайце яго па Галоўным экране"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Дадаць на Галоўны экран"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Віджэт \"<xliff:g id="WIDGET_NAME">%1$s</xliff:g>\" дададзены на галоўны экран"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> віджэт</item>
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> віджэты</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 04c3acc971..13a0148611 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Γραφικό στοιχείο <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Αγγίξτε παρατεταμένα το γραφικό στοιχείο για να το μετακινήσετε στην Αρχική οθόνη"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Προσθήκη στην Αρχική οθόνη"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Το γραφικό στοιχείο <xliff:g id="WIDGET_NAME">%1$s</xliff:g> προστέθηκε στην αρχική οθόνη."</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> γραφικά στοιχεία</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> γραφικό στοιχείο</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 7e8ed2137f..1df4726a8e 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widżet <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Kliknij i przytrzymaj widżet, by poruszać nim po ekranie głównym"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Dodaj do ekranu głównego"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Widżet <xliff:g id="WIDGET_NAME">%1$s</xliff:g> został dodany do ekranu głównego"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="few"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widżety</item>
       <item quantity="many"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widżetów</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 5b38290737..19e40935b2 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"Widget för <xliff:g id="WIDGET_NAME">%1$s</xliff:g>"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Tryck länge på widgeten om du vill flytta den på startskärmen"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Lägg till på startskärmen"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"Widget för <xliff:g id="WIDGET_NAME">%1$s</xliff:g> har lagts till på startskärmen"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> widgetar</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> widget</item>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 3586fd3637..a44a376f55 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ویجیٹ"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"ویجیٹ کو ہوم اسکرین کے چاروں طرف منتقل کرنے کیلئے اسے ٹچ کریں اور دبائے رکھیں"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"ہوم اسکرین میں شامل کریں"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> ویجیٹ کو ہوم اسکرین میں شامل کیا گیا"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> ویجیٹس</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> ویجیٹ</item>
-- 
GitLab


From b27b45001d69018d4a95a650fdb671a87a304220 Mon Sep 17 00:00:00 2001
From: Yogisha Dixit <ydixit@google.com>
Date: Fri, 16 Jul 2021 15:04:33 +0100
Subject: [PATCH 1619/1664] Update widget manipulation colors to match AOD.

This CL makes two changes:
1. Changes the colors we use from system_accent1_50 ->
system_accent1_100 (light wallpapers) and system_accent2_700 ->
system_accent2_600 (dark wallpapers).
2. Changes when we use the light/dark colors. Before: light accent color
when wallpaper luminosity < 0.3. After: light accent color when wallpaper luminosity < 0.7.

Bug: 192359286
Test: manual on light/dark wallpapers with light/dark theme
Change-Id: I28abfd77439a16b4bb637376fd88180d536364cf
Merged-In: I28abfd77439a16b4bb637376fd88180d536364cf
---
 res/values-v31/colors.xml | 4 ++--
 res/values/colors.xml     | 4 ++--
 res/values/styles.xml     | 8 +++++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/res/values-v31/colors.xml b/res/values-v31/colors.xml
index fb37e858bc..d73ee57080 100644
--- a/res/values-v31/colors.xml
+++ b/res/values-v31/colors.xml
@@ -42,6 +42,6 @@
 
     <color name="folder_dot_color">@android:color/system_accent2_50</color>
 
-    <color name="workspace_accent_color_light">@android:color/system_accent2_700</color>
-    <color name="workspace_accent_color_dark">@android:color/system_accent1_50</color>
+    <color name="workspace_accent_color_light">@android:color/system_accent1_100</color>
+    <color name="workspace_accent_color_dark">@android:color/system_accent2_600</color>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 76fd1d7753..1b68fb68a7 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -81,6 +81,6 @@
     <color name="wallpaper_popup_scrim">?android:attr/colorAccent</color>
     <color name="wallpaper_scrim_color">#0D878787</color>
 
-    <color name="workspace_accent_color_light">#ff254e47</color>
-    <color name="workspace_accent_color_dark">#ff9cfff2</color>
+    <color name="workspace_accent_color_light">#ff8df5e3</color>
+    <color name="workspace_accent_color_dark">#ff3d665f</color>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 24851f24c5..d30b80c813 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -61,7 +61,7 @@
         <item name="eduHalfSheetBGColor">?android:attr/colorAccent</item>
         <item name="disabledIconAlpha">.54</item>
         <item name="workspaceAccentColor">@color/workspace_accent_color_light</item>
-        <item name="dropTargetHoverTextColor">@color/workspace_text_color_light</item>
+        <item name="dropTargetHoverTextColor">@color/workspace_text_color_dark</item>
         <item name="overviewScrimColor">@color/overview_scrim</item>
 
         <item name="android:windowTranslucentStatus">false</item>
@@ -75,8 +75,6 @@
 
     <style name="LauncherTheme.DarkMainColor" parent="@style/LauncherTheme">
         <item name="disabledIconAlpha">.254</item>
-        <item name="workspaceAccentColor">@color/workspace_accent_color_dark</item>
-        <item name="dropTargetHoverTextColor">@color/workspace_text_color_dark</item>
 
     </style>
 
@@ -87,6 +85,8 @@
         <item name="workspaceKeyShadowColor">@android:color/transparent</item>
         <item name="isWorkspaceDarkText">true</item>
         <item name="workspaceStatusBarScrim">@null</item>
+        <item name="workspaceAccentColor">@color/workspace_accent_color_dark</item>
+        <item name="dropTargetHoverTextColor">@color/workspace_text_color_light</item>
     </style>
 
     <style name="LauncherTheme.Dark" parent="@style/LauncherTheme">
@@ -133,6 +133,8 @@
         <item name="workspaceKeyShadowColor">@android:color/transparent</item>
         <item name="isWorkspaceDarkText">true</item>
         <item name="workspaceStatusBarScrim">@null</item>
+        <item name="workspaceAccentColor">@color/workspace_accent_color_dark</item>
+        <item name="dropTargetHoverTextColor">@color/workspace_text_color_light</item>
     </style>
 
     <!-- A derivative project can extend these themes to customize the application theme without
-- 
GitLab


From f8441cc276aafb9e5b6370ff445ad96d85d5e918 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Fri, 16 Jul 2021 17:50:56 -0700
Subject: [PATCH 1620/1664] Fix notification dot not always being up to date.

- Prediction row views were never updated when notification changes.
- FloatingIconView set the BubbleTextView to force hide dot, but never restored it.
  BubbleTextView is instanceof IconLabelDotView, so its already handled in the end runnable

Bug: 183360736
Test: 1. swipe up to go home such that the closing app has a notification,
         note that the notification dot is properly updated
      2. have all apps open
         make notification update for a predicted app
         ensure dot is properly updated

Change-Id: I35dacf9b71a3d8b8a857be450690d65ea9199bf6
---
 .../android/launcher3/appprediction/PredictionRowView.java | 7 +++++++
 src/com/android/launcher3/allapps/AllAppsStore.java        | 2 +-
 src/com/android/launcher3/views/FloatingIconView.java      | 5 -----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
index de040821b4..6afbf9a28c 100644
--- a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
+++ b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
@@ -96,6 +96,13 @@ public class PredictionRowView extends LinearLayout implements
 
     private void updateVisibility() {
         setVisibility(mPredictionsEnabled ? VISIBLE : GONE);
+        if (mLauncher.getAppsView() != null) {
+            if (mPredictionsEnabled) {
+                mLauncher.getAppsView().getAppsStore().registerIconContainer(this);
+            } else {
+                mLauncher.getAppsView().getAppsStore().unregisterIconContainer(this);
+            }
+        }
     }
 
     @Override
diff --git a/src/com/android/launcher3/allapps/AllAppsStore.java b/src/com/android/launcher3/allapps/AllAppsStore.java
index 2443b8360d..7bc3eecfea 100644
--- a/src/com/android/launcher3/allapps/AllAppsStore.java
+++ b/src/com/android/launcher3/allapps/AllAppsStore.java
@@ -132,7 +132,7 @@ public class AllAppsStore {
     }
 
     public void registerIconContainer(ViewGroup container) {
-        if (container != null) {
+        if (container != null && !mIconContainers.contains(container)) {
             mIconContainers.add(container);
         }
     }
diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java
index 3027db6c16..872adec42e 100644
--- a/src/com/android/launcher3/views/FloatingIconView.java
+++ b/src/com/android/launcher3/views/FloatingIconView.java
@@ -580,11 +580,6 @@ public class FloatingIconView extends FrameLayout implements
                     if (originalView instanceof IconLabelDotView) {
                         setIconAndDotVisible(originalView, true);
                     }
-                    if (originalView instanceof BubbleTextView) {
-                        BubbleTextView btv = (BubbleTextView) originalView;
-                        btv.setIconVisible(true);
-                        btv.setForceHideDot(true);
-                    }
                     view.finish(dragLayer);
                 }
             } else {
-- 
GitLab


From d795b67d1743eefb43f9858814641595b213ae05 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sun, 18 Jul 2021 04:16:45 +0000
Subject: [PATCH 1621/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Ic985ca3898b08c71facddecf2e9c94fd4f0ad350
---
 quickstep/res/values-az/strings.xml | 18 ++++++------------
 quickstep/res/values-kk/strings.xml | 18 ++++++------------
 quickstep/res/values-ky/strings.xml | 18 ++++++------------
 quickstep/res/values-ne/strings.xml |  2 +-
 4 files changed, 19 insertions(+), 37 deletions(-)

diff --git a/quickstep/res/values-az/strings.xml b/quickstep/res/values-az/strings.xml
index 75f1741d17..d01bf3f57f 100644
--- a/quickstep/res/values-az/strings.xml
+++ b/quickstep/res/values-az/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Tətbiq təklifləri aktivdir"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Tətbiq təklifləri deaktivdir"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Proqnozlaşdırılan tətbiq: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Ekranın ən sağ və ya sol kənarından sürüşdürün."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Ekranın sağ və ya sol kənarından ortasına sürüşdürüb buraxın."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Geri qayıtmaq üçün sağdan sürüşdürmək qaydasını öyrəndiniz. Sonra tətbiqləri keçirməyi öyrənin."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Geri getmə jestini tamamladınız."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ekranın altına çox yaxın sürüşdürmədiyinizə əmin olun."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Jestlərdən istifadə qaydasını öyrəndiniz. Jestləri deaktiv etmək üçün Ayarlara keçin."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Tətbiqləri keçirmə jestini tamamladınız."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Tətbiqi keçirmək üçün sürüşdürün"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Tətbiqlər arasında keçid üçün ekranın aşağısından yuxarı doğru sürüşdürüb saxlayın, sonra buraxın."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Tam hazır"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Oldu"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Ayarlar"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Yenə sınayın"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Əla!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Dərslik <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Hər şey hazırdır!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Əsas səhifəyə keçmək üçün yuxarı çəkin"</string>
     <string name="allset_description" msgid="6350320429953234580">"Telefondan istifadəyə başlamağa hazırsınız"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Sistem naviqasiya ayarları"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Paylaşın"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Skrinşot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Bu əməliyyata tətbiq və ya təşkilatınız tərəfindən icazə verilmir"</string>
diff --git a/quickstep/res/values-kk/strings.xml b/quickstep/res/values-kk/strings.xml
index b14e35bf60..d762bd87a9 100644
--- a/quickstep/res/values-kk/strings.xml
+++ b/quickstep/res/values-kk/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Ұсынылған қолданбалар функциясы қосылды."</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"\"Ұсынылған қолданбалар\" функциясы өшірулі."</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Болжалды қолданба: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Экранның оң немесе сол жиегінен сырғытыңыз."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Экранның оң немесе сол жиегінен ортасына қарай сырғытып, саусағыңызды жіберіңіз."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Оңнан солға сырғыту арқылы артқа қайтуды үйрендіңіз. Енді қолданбаларды ауыстыруды үйреніңіз."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Артқа қайту қимылын аяқтадыңыз."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Саусағыңызбен сырғыту кезінде экранның төменгі жағына тым жақындамаңыз."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Қимылдарды қолдануды үйрендіңіз. Қимылдарды өшіру үшін \"Параметрлер\" бөліміне өтіңіз."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Қолданбаларды ауыстыру қимылын аяқтадыңыз."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Қолданбаларды ауыстыру үшін сырғытыңыз"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Бір қолданбадан екіншісіне ауысу үшін экранның төменгі жағынан жоғары қарай сырғытып, ұстап тұрып жіберіңіз."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Бәрі дайын"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Дайын"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Параметрлер"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Қайталау"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Жақсы!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Оқулық: <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Бәрі дайын!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Негізгі экранға өту үшін жоғары қарай сырғытыңыз."</string>
     <string name="allset_description" msgid="6350320429953234580">"Телефоныңыз пайдалануға дайын."</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Навигацияның жүйелік параметрлері"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Бөлісу"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Скриншот"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Бұл әрекетке қолданба не ұйым рұқсат етпейді."</string>
diff --git a/quickstep/res/values-ky/strings.xml b/quickstep/res/values-ky/strings.xml
index 29cd4590dd..220559252e 100644
--- a/quickstep/res/values-ky/strings.xml
+++ b/quickstep/res/values-ky/strings.xml
@@ -45,10 +45,8 @@
     <string name="hotsaet_tip_prediction_enabled" msgid="2233554377501347650">"Сунушталган колдонмолор функциясы иштетилди"</string>
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"Сунушталган колдонмолор функциясы өчүрүлгөн"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Божомолдонгон колдонмо: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <!-- no translation found for back_gesture_feedback_swipe_too_far_from_edge (1711645592102201538) -->
-    <skip />
-    <!-- no translation found for back_gesture_feedback_cancelled (3274382913290074496) -->
-    <skip />
+    <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Экранды эң четинен оңдон солго же солдон оңго карай сүрүңүз."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Экранды оң же сол жагынан ортосуна карай сүрүп, манжаңызды алыңыз."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Артка кайтуу үчүн экранды оңдон солго карай сүрүүнү үйрөндүңүз. Эми колдонмолорду которуштурганды үйрөнүп алыңыз."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"\"Артка\" жаңсоосу боюнча үйрөткүчтү бүтүрдүңүз."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Манжаңызды экрандын ылдый жагына өтө жакындатпай сүрүңүз."</string>
@@ -68,21 +66,17 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Жаңсоолорду колдонгонду үйрөндүңүз. Жаңсоолорду өчүрүү үчүн Жөндөөлөргө өтүңүз."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"\"Колдонмолорду которуштуруу\" жаңсоосу боюнча үйрөткүчтү бүтүрдүңүз."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Колдонмолорду которуштуруу үчүн сүрүңүз"</string>
-    <!-- no translation found for overview_gesture_intro_subtitle (4968091015637850859) -->
-    <skip />
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Бир колдонмодон экинчисине өтүү үчүн экранды ылдыйдан өйдө карай сүрүп, бир аз коё бербей туруңуз."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Дапдаяр!"</string>
-    <!-- no translation found for gesture_tutorial_action_button_label (6249846312991332122) -->
-    <skip />
+    <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Бүттү"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Жөндөөлөр"</string>
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Кайталап көрүңүз"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Сонун!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Үйрөткүч: <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Бүттү!"</string>
-    <!-- no translation found for allset_hint (2384632994739392447) -->
-    <skip />
+    <string name="allset_hint" msgid="2384632994739392447">"Башкы бетке өтүү үчүн экранды өйдө сүрүңүз"</string>
     <string name="allset_description" msgid="6350320429953234580">"Телефонуңузду колдонуп баштоого даярсыз"</string>
-    <!-- no translation found for allset_navigation_settings (4713404605961476027) -->
-    <skip />
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Өтүү аракетинин тутумдук жөндөөлөрү"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Бөлүшүү"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Скриншот"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Бул аракетти аткарууга колдонмо же ишканаңыз тыюу салган"</string>
diff --git a/quickstep/res/values-ne/strings.xml b/quickstep/res/values-ne/strings.xml
index cfd1c64893..4428cec16b 100644
--- a/quickstep/res/values-ne/strings.xml
+++ b/quickstep/res/values-ne/strings.xml
@@ -66,7 +66,7 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"तपाईंले इसाराहरू प्रयोग गर्ने तरिका सिक्नुभयो। इसारा अफ गर्न सेटिङमा जानुहोस्।"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"तपाईंले \'एउटा एपबाट अर्को एपमा जानुहोस्\' नामक इसारा प्रयोग गर्ने तरिका सिक्नुभयो।"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"एउटा एपबाट अर्को एपमा जान स्वाइप गर्नुहोस्"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"एउटा एपबाट अर्को एपमा जान स्क्रिनको फेदबाट माथितिर स्वाइप गर्नुहोस्, छोइराख्नुहोस् अनि औँला उठाउनु…।"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"एउटा एपबाट अर्कोमा जान स्क्रिनको फेदबाट माथितिर स्वाइप गर्नुहोस्, छोइराख्नुहोस् अनि औँला उठाउनुहोस्।"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"सबै तयार छ"</string>
     <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"सम्पन्न भयो"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"सेटिङ"</string>
-- 
GitLab


From 968e80daaca467ad2581ed7647e9524fadbae5a4 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sun, 18 Jul 2021 04:18:59 +0000
Subject: [PATCH 1622/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I1a4046b443a41fcae2e8186cadf24d1e5d2ea296
---
 res/values-az/strings.xml | 3 +--
 res/values-kk/strings.xml | 3 +--
 res/values-ky/strings.xml | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index eb3a82127c..f938c4dbaa 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> vidceti"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Əsas ekranda hərəkət etdirmək üçün vidcetə toxunub saxlayın"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Əsas ekrana əlavə edin"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> vidceti əsas ekrana əlavə edildi"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> vidcet</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> vidcet</item>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 9efc5713d6..dc1746e855 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> виджеті"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Негізгі экранда қозғалту үшін виджетті басып тұрыңыз."</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Негізгі экранға қосу"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> виджеті негізгі экранға енгізілді."</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виджет</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> виджет</item>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index abd5364372..ae0416dffc 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -35,8 +35,7 @@
     <string name="widget_preview_context_description" msgid="9045841361655787574">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> виджети"</string>
     <string name="add_item_request_drag_hint" msgid="5653291305078645405">"Башкы экранга жылдыруу үчүн виджетти коё бербей басып туруңуз"</string>
     <string name="add_to_home_screen" msgid="8631549138215492708">"Башкы экранга кошуу"</string>
-    <!-- no translation found for added_to_home_screen_accessibility_text (4451545765448884415) -->
-    <skip />
+    <string name="added_to_home_screen_accessibility_text" msgid="4451545765448884415">"<xliff:g id="WIDGET_NAME">%1$s</xliff:g> виджети башкы экранга кошулду"</string>
     <plurals name="widgets_count" formatted="false" msgid="656794749266073027">
       <item quantity="other"><xliff:g id="WIDGETS_COUNT_1">%1$d</xliff:g> виджет</item>
       <item quantity="one"><xliff:g id="WIDGETS_COUNT_0">%1$d</xliff:g> виджет</item>
-- 
GitLab


From f706230a0051e143d8a1befb3a189bcb4ff50bdc Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 16 Jul 2021 16:48:42 -0700
Subject: [PATCH 1623/1664] Updating bounce animation to move hotseat instead
 of all-apps

Bug: 193827513
Test: Manual
Change-Id: I86c0e9cb56ab3c6e8e978f574e564fe1e1a41c43
---
 .../launcher3/allapps/DiscoveryBounce.java    | 42 ++++++++-----------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/com/android/launcher3/allapps/DiscoveryBounce.java b/src/com/android/launcher3/allapps/DiscoveryBounce.java
index d8ef18e754..be261f76b5 100644
--- a/src/com/android/launcher3/allapps/DiscoveryBounce.java
+++ b/src/com/android/launcher3/allapps/DiscoveryBounce.java
@@ -20,16 +20,17 @@ import static com.android.launcher3.LauncherState.NORMAL;
 
 import android.animation.Animator;
 import android.animation.AnimatorInflater;
-import android.animation.AnimatorListenerAdapter;
 import android.os.Handler;
 import android.os.UserManager;
 import android.view.MotionEvent;
+import android.view.View;
 
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.anim.AnimatorListeners;
 import com.android.launcher3.statemanager.StateManager.StateListener;
 import com.android.launcher3.util.OnboardingPrefs;
 
@@ -53,21 +54,15 @@ public class DiscoveryBounce extends AbstractFloatingView {
         public void onStateTransitionComplete(LauncherState finalState) {}
     };
 
-    public DiscoveryBounce(Launcher launcher, float delta) {
+    public DiscoveryBounce(Launcher launcher) {
         super(launcher, null);
         mLauncher = launcher;
-        AllAppsTransitionController controller = mLauncher.getAllAppsController();
 
         mDiscoBounceAnimation =
                 AnimatorInflater.loadAnimator(launcher, R.animator.discovery_bounce);
-        mDiscoBounceAnimation.setTarget(new VerticalProgressWrapper(controller, delta));
-        mDiscoBounceAnimation.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                handleClose(false);
-            }
-        });
-        mDiscoBounceAnimation.addListener(controller.getProgressAnimatorListener());
+        mDiscoBounceAnimation.setTarget(new VerticalProgressWrapper(
+                launcher.getHotseat(), mLauncher.getDragLayer().getHeight()));
+        mDiscoBounceAnimation.addListener(AnimatorListeners.forEndCallback(this::handleClose));
         launcher.getStateManager().addStateListener(mStateListener);
     }
 
@@ -104,9 +99,9 @@ public class DiscoveryBounce extends AbstractFloatingView {
         if (mIsOpen) {
             mIsOpen = false;
             mLauncher.getDragLayer().removeView(this);
-            // Reset the all-apps progress to what ever it was previously.
-            mLauncher.getAllAppsController().setProgress(mLauncher.getStateManager()
-                    .getState().getVerticalProgress(mLauncher));
+            // Reset the translation to what ever it was previously.
+            mLauncher.getHotseat().setTranslationY(mLauncher.getStateManager().getState()
+                    .getHotseatScaleAndTranslation(mLauncher).translationY);
             mLauncher.getStateManager().removeStateListener(mStateListener);
         }
     }
@@ -141,29 +136,28 @@ public class DiscoveryBounce extends AbstractFloatingView {
             return;
         }
         onboardingPrefs.incrementEventCount(OnboardingPrefs.HOME_BOUNCE_COUNT);
-
-        new DiscoveryBounce(launcher, 0).show();
+        new DiscoveryBounce(launcher).show();
     }
 
     /**
-     * A wrapper around {@link AllAppsTransitionController} allowing a fixed shift in the value.
+     * A wrapper around hotseat animator allowing a fixed shift in the value.
      */
     public static class VerticalProgressWrapper {
 
-        private final float mDelta;
-        private final AllAppsTransitionController mController;
+        private final View mView;
+        private final float mLimit;
 
-        private VerticalProgressWrapper(AllAppsTransitionController controller, float delta) {
-            mController = controller;
-            mDelta = delta;
+        private VerticalProgressWrapper(View view, float limit) {
+            mView = view;
+            mLimit = limit;
         }
 
         public float getProgress() {
-            return mController.getProgress() + mDelta;
+            return 1 + mView.getTranslationY() / mLimit;
         }
 
         public void setProgress(float progress) {
-            mController.setProgress(progress - mDelta);
+            mView.setTranslationY(mLimit * (progress - 1));
         }
     }
 }
-- 
GitLab


From 74e6ced3622efeb243c4cba5bb08db254d613deb Mon Sep 17 00:00:00 2001
From: Brian Isganitis <brianji@google.com>
Date: Mon, 19 Jul 2021 16:58:20 -0400
Subject: [PATCH 1624/1664] Use wallpaper colors for widgets in wallpaper
 change preview

Test: Widgets should adapt to wallpaper colors in launcher preview.
Bug: 192205054
Merged-In: I3fb76b6036cb909771b789eac15742df78c2c742
Merged-In: I4da9ad1cc88be251f97e86b6c8c9b346ed20f586
Change-Id: Ife80b07f99da913d65bff96fba2ccd76b0a2ed48
---
 .../graphics/LauncherPreviewRenderer.java     | 26 ++++++++++++++++++-
 .../graphics/PreviewSurfaceRenderer.java      |  2 +-
 .../launcher3/widget/LocalColorExtractor.java |  8 ++++++
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index cf3da4b9b7..a387f04e5b 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -15,6 +15,7 @@
  */
 package com.android.launcher3.graphics;
 
+import static android.app.WallpaperManager.FLAG_SYSTEM;
 import static android.view.View.MeasureSpec.EXACTLY;
 import static android.view.View.MeasureSpec.makeMeasureSpec;
 import static android.view.View.VISIBLE;
@@ -26,6 +27,8 @@ import static com.android.launcher3.model.ModelUtils.sortWorkspaceItemsSpatially
 
 import android.annotation.TargetApi;
 import android.app.Fragment;
+import android.app.WallpaperColors;
+import android.app.WallpaperManager;
 import android.appwidget.AppWidgetHostView;
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
@@ -41,6 +44,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Process;
 import android.util.AttributeSet;
+import android.util.SparseIntArray;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -84,6 +88,7 @@ import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.launcher3.views.ActivityContext;
 import com.android.launcher3.views.BaseDragLayer;
 import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
+import com.android.launcher3.widget.LocalColorExtractor;
 import com.android.launcher3.widget.custom.CustomWidgetManager;
 
 import java.util.ArrayList;
@@ -201,8 +206,12 @@ public class LauncherPreviewRenderer extends ContextWrapper
     private final InsettableFrameLayout mRootView;
     private final Hotseat mHotseat;
     private final CellLayout mWorkspace;
+    private final SparseIntArray mWallpaperColorResources;
+
+    public LauncherPreviewRenderer(Context context,
+            InvariantDeviceProfile idp,
+            WallpaperColors wallpaperColorsOverride) {
 
-    public LauncherPreviewRenderer(Context context, InvariantDeviceProfile idp) {
         super(context);
         mUiHandler = new Handler(Looper.getMainLooper());
         mContext = context;
@@ -254,6 +263,16 @@ public class LauncherPreviewRenderer extends ContextWrapper
                 mDp.workspacePadding.top,
                 mDp.workspacePadding.right + mDp.cellLayoutPaddingLeftRightPx,
                 mDp.workspacePadding.bottom);
+
+        if (Utilities.ATLEAST_S) {
+            WallpaperColors wallpaperColors = wallpaperColorsOverride != null
+                    ? wallpaperColorsOverride
+                    : WallpaperManager.getInstance(context).getWallpaperColors(FLAG_SYSTEM);
+            mWallpaperColorResources = LocalColorExtractor.newInstance(context)
+                    .generateColorsOverride(wallpaperColors);
+        } else {
+            mWallpaperColorResources = null;
+        }
     }
 
     /** Populate preview and render it. */
@@ -357,6 +376,11 @@ public class LauncherPreviewRenderer extends ContextWrapper
         view.setAppWidget(-1, providerInfo);
         view.updateAppWidget(null);
         view.setTag(info);
+
+        if (mWallpaperColorResources != null) {
+            view.setColorResources(mWallpaperColorResources);
+        }
+
         addInScreenFromBind(view, info);
     }
 
diff --git a/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java b/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java
index a8c3d15bde..df493599ed 100644
--- a/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java
+++ b/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java
@@ -209,7 +209,7 @@ public class PreviewSurfaceRenderer {
         if (mDestroyed) {
             return;
         }
-        View view = new LauncherPreviewRenderer(inflationContext, mIdp)
+        View view = new LauncherPreviewRenderer(inflationContext, mIdp, mWallpaperColors)
                 .getRenderedView(dataModel, widgetProviderInfoMap);
         // This aspect scales the view to fit in the surface and centers it
         final float scale = Math.min(mWidth / (float) view.getMeasuredWidth(),
diff --git a/src/com/android/launcher3/widget/LocalColorExtractor.java b/src/com/android/launcher3/widget/LocalColorExtractor.java
index 8ae6b2e435..23d9e151f7 100644
--- a/src/com/android/launcher3/widget/LocalColorExtractor.java
+++ b/src/com/android/launcher3/widget/LocalColorExtractor.java
@@ -75,6 +75,14 @@ public class LocalColorExtractor implements ResourceBasedOverride {
      */
     public void applyColorsOverride(Context base, WallpaperColors colors) { }
 
+    /**
+     * Generates color resource overrides from {@link WallpaperColors}.
+     */
+    @Nullable
+    public SparseIntArray generateColorsOverride(WallpaperColors colors) {
+        return null;
+    }
+
     /**
      * Takes a view and returns its rect that can be used by the wallpaper local color extractor.
      *
-- 
GitLab


From a28f864bbfce273513be82be93e6d156d965c11b Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pbdr@google.com>
Date: Mon, 19 Jul 2021 22:55:49 +0100
Subject: [PATCH 1625/1664] Remove the shadow under PendingAppWidgetHostView.

Fix: 194007734
Test: Manual (see bug)
Change-Id: Ia46dbf8417bb9df17f35b43bfa2698206d940587
---
 src/com/android/launcher3/widget/PendingAppWidgetHostView.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/com/android/launcher3/widget/PendingAppWidgetHostView.java b/src/com/android/launcher3/widget/PendingAppWidgetHostView.java
index 47f30be04f..d3a019001d 100644
--- a/src/com/android/launcher3/widget/PendingAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/PendingAppWidgetHostView.java
@@ -85,7 +85,6 @@ public class PendingAppWidgetHostView extends LauncherAppWidgetHostView
         setBackgroundResource(R.drawable.pending_widget_bg);
         setWillNotDraw(false);
 
-        setElevation(getResources().getDimension(R.dimen.pending_widget_elevation));
         updateAppWidget(null);
         setOnClickListener(ItemClickHandler.INSTANCE);
 
-- 
GitLab


From a1bed5428dc8036652876488e084670926921672 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Mon, 19 Jul 2021 17:08:31 -0700
Subject: [PATCH 1626/1664] Fixing quickswitch window not properly aligned in
 split-screen

Bug: 193992000
Test: Manual
Change-Id: Ic37cbc561a0299be1a1c05dfb17bd826c173100e
---
 .../quickstep/BaseActivityInterface.java      | 28 +++++++++++++------
 .../quickstep/util/RecentsOrientedState.java  |  9 ++----
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index 7ab371b4d9..fac4d52826 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -266,20 +266,32 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
         Gravity.apply(Gravity.CENTER, outWidth, outHeight, potentialTaskRect, outRect);
     }
 
-    private PointF getTaskDimension(Context context, DeviceProfile dp) {
+    private static PointF getTaskDimension(Context context, DeviceProfile dp) {
         PointF dimension = new PointF();
+        getTaskDimension(context, dp, dimension);
+        return dimension;
+    }
+
+    /**
+     * Gets the dimension of the task in the current system state.
+     */
+    public static void getTaskDimension(Context context, DeviceProfile dp, PointF out) {
         if (dp.isMultiWindowMode) {
             WindowBounds bounds = SplitScreenBounds.INSTANCE.getSecondaryWindowBounds(context);
-            dimension.x = bounds.availableSize.x;
-            dimension.y = bounds.availableSize.y;
+            if (TaskView.CLIP_STATUS_AND_NAV_BARS) {
+                out.x = bounds.availableSize.x;
+                out.y = bounds.availableSize.y;
+            } else {
+                out.x = bounds.availableSize.x + bounds.insets.left + bounds.insets.right;
+                out.y = bounds.availableSize.y + bounds.insets.top + bounds.insets.bottom;
+            }
         } else if (TaskView.CLIP_STATUS_AND_NAV_BARS) {
-            dimension.x = dp.availableWidthPx;
-            dimension.y = dp.availableHeightPx;
+            out.x = dp.availableWidthPx;
+            out.y = dp.availableHeightPx;
         } else {
-            dimension.x = dp.widthPx;
-            dimension.y = dp.heightPx;
+            out.x = dp.widthPx;
+            out.y = dp.heightPx;
         }
-        return dimension;
     }
 
     /**
diff --git a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
index c515bdff3d..7cfd151cda 100644
--- a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
+++ b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
@@ -25,6 +25,7 @@ import static android.view.Surface.ROTATION_90;
 import static com.android.launcher3.states.RotationHelper.ALLOW_ROTATION_PREFERENCE_KEY;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.launcher3.util.SettingsCache.ROTATION_SETTING_URI;
+import static com.android.quickstep.BaseActivityInterface.getTaskDimension;
 
 import static java.lang.annotation.RetentionPolicy.SOURCE;
 
@@ -49,7 +50,6 @@ import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.launcher3.util.DisplayController;
 import com.android.launcher3.util.SettingsCache;
-import com.android.launcher3.util.WindowBounds;
 import com.android.quickstep.BaseActivityInterface;
 import com.android.quickstep.SystemUiProxy;
 import com.android.quickstep.views.TaskView;
@@ -401,12 +401,7 @@ public class RecentsOrientedState implements
             fullHeight -= insets.top + insets.bottom;
         }
 
-        if (dp.isMultiWindowMode) {
-            WindowBounds bounds = SplitScreenBounds.INSTANCE.getSecondaryWindowBounds(mContext);
-            outPivot.set(bounds.availableSize.x, bounds.availableSize.y);
-        } else {
-            outPivot.set(fullWidth, fullHeight);
-        }
+        getTaskDimension(mContext, dp, outPivot);
         float scale = Math.min(outPivot.x / taskView.width(), outPivot.y / taskView.height());
         // We also scale the preview as part of fullScreenParams, so account for that as well.
         if (fullWidth > 0) {
-- 
GitLab


From f5fee1a7d3286673d4513aab95109245b53aea66 Mon Sep 17 00:00:00 2001
From: Jonathan Miranda <jonmiranda@google.com>
Date: Tue, 20 Jul 2021 00:37:19 +0000
Subject: [PATCH 1627/1664] Revert "Use wallpaper colors for widgets in
 wallpaper change preview"

Revert "Implement generateColorsOverride from LocalColorExtractor"

Revert submission 15331418-colorcp

Reason for revert: Broke the build
Reverted Changes:
Ife80b07f9:Use wallpaper colors for widgets in wallpaper chan...
I1371eb787:Implement generateColorsOverride from LocalColorEx...

Bug: 194138049

// Using original change's merged-in tag to avoid clashing
Merged-In: I3fb76b6036cb909771b789eac15742df78c2c742
Merged-In: I4da9ad1cc88be251f97e86b6c8c9b346ed20f586

Change-Id: I3835dfb8efe745dc0a654712a5b1f68c4946f446
---
 .../graphics/LauncherPreviewRenderer.java     | 26 +------------------
 .../graphics/PreviewSurfaceRenderer.java      |  2 +-
 .../launcher3/widget/LocalColorExtractor.java |  8 ------
 3 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index a387f04e5b..cf3da4b9b7 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -15,7 +15,6 @@
  */
 package com.android.launcher3.graphics;
 
-import static android.app.WallpaperManager.FLAG_SYSTEM;
 import static android.view.View.MeasureSpec.EXACTLY;
 import static android.view.View.MeasureSpec.makeMeasureSpec;
 import static android.view.View.VISIBLE;
@@ -27,8 +26,6 @@ import static com.android.launcher3.model.ModelUtils.sortWorkspaceItemsSpatially
 
 import android.annotation.TargetApi;
 import android.app.Fragment;
-import android.app.WallpaperColors;
-import android.app.WallpaperManager;
 import android.appwidget.AppWidgetHostView;
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
@@ -44,7 +41,6 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Process;
 import android.util.AttributeSet;
-import android.util.SparseIntArray;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -88,7 +84,6 @@ import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.launcher3.views.ActivityContext;
 import com.android.launcher3.views.BaseDragLayer;
 import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
-import com.android.launcher3.widget.LocalColorExtractor;
 import com.android.launcher3.widget.custom.CustomWidgetManager;
 
 import java.util.ArrayList;
@@ -206,12 +201,8 @@ public class LauncherPreviewRenderer extends ContextWrapper
     private final InsettableFrameLayout mRootView;
     private final Hotseat mHotseat;
     private final CellLayout mWorkspace;
-    private final SparseIntArray mWallpaperColorResources;
-
-    public LauncherPreviewRenderer(Context context,
-            InvariantDeviceProfile idp,
-            WallpaperColors wallpaperColorsOverride) {
 
+    public LauncherPreviewRenderer(Context context, InvariantDeviceProfile idp) {
         super(context);
         mUiHandler = new Handler(Looper.getMainLooper());
         mContext = context;
@@ -263,16 +254,6 @@ public class LauncherPreviewRenderer extends ContextWrapper
                 mDp.workspacePadding.top,
                 mDp.workspacePadding.right + mDp.cellLayoutPaddingLeftRightPx,
                 mDp.workspacePadding.bottom);
-
-        if (Utilities.ATLEAST_S) {
-            WallpaperColors wallpaperColors = wallpaperColorsOverride != null
-                    ? wallpaperColorsOverride
-                    : WallpaperManager.getInstance(context).getWallpaperColors(FLAG_SYSTEM);
-            mWallpaperColorResources = LocalColorExtractor.newInstance(context)
-                    .generateColorsOverride(wallpaperColors);
-        } else {
-            mWallpaperColorResources = null;
-        }
     }
 
     /** Populate preview and render it. */
@@ -376,11 +357,6 @@ public class LauncherPreviewRenderer extends ContextWrapper
         view.setAppWidget(-1, providerInfo);
         view.updateAppWidget(null);
         view.setTag(info);
-
-        if (mWallpaperColorResources != null) {
-            view.setColorResources(mWallpaperColorResources);
-        }
-
         addInScreenFromBind(view, info);
     }
 
diff --git a/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java b/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java
index df493599ed..a8c3d15bde 100644
--- a/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java
+++ b/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java
@@ -209,7 +209,7 @@ public class PreviewSurfaceRenderer {
         if (mDestroyed) {
             return;
         }
-        View view = new LauncherPreviewRenderer(inflationContext, mIdp, mWallpaperColors)
+        View view = new LauncherPreviewRenderer(inflationContext, mIdp)
                 .getRenderedView(dataModel, widgetProviderInfoMap);
         // This aspect scales the view to fit in the surface and centers it
         final float scale = Math.min(mWidth / (float) view.getMeasuredWidth(),
diff --git a/src/com/android/launcher3/widget/LocalColorExtractor.java b/src/com/android/launcher3/widget/LocalColorExtractor.java
index 23d9e151f7..8ae6b2e435 100644
--- a/src/com/android/launcher3/widget/LocalColorExtractor.java
+++ b/src/com/android/launcher3/widget/LocalColorExtractor.java
@@ -75,14 +75,6 @@ public class LocalColorExtractor implements ResourceBasedOverride {
      */
     public void applyColorsOverride(Context base, WallpaperColors colors) { }
 
-    /**
-     * Generates color resource overrides from {@link WallpaperColors}.
-     */
-    @Nullable
-    public SparseIntArray generateColorsOverride(WallpaperColors colors) {
-        return null;
-    }
-
     /**
      * Takes a view and returns its rect that can be used by the wallpaper local color extractor.
      *
-- 
GitLab


From b684c1b59b5dfa7158d442ed4cedebc8ebf1699a Mon Sep 17 00:00:00 2001
From: Brian Isganitis <brianji@google.com>
Date: Mon, 19 Jul 2021 20:54:14 -0400
Subject: [PATCH 1628/1664] Revert "Merge "Revert "Use wallpaper colors for
 widgets in wallpaper change preview"" into sc-dev"

This reverts commit 7de95d676728b4c510cc5e34a194f5012a978f47, reversing
changes made to 0a70a5a690dba50e07cb540d4d325d480a6893fa.

Lints have been added to fix errorprone.

Test: Widgets should adapt to wallpaper colors in launcher preview.
Bug: 192205054
Merged-In: I3fb76b6036cb909771b789eac15742df78c2c742
Merged-In: I4da9ad1cc88be251f97e86b6c8c9b346ed20f586
Change-Id: I6866f8521ed427d096f27da0a92d8b40e1099187
---
 lint-baseline-launcher3.xml                   | 22 ++++++++++++++++
 .../graphics/LauncherPreviewRenderer.java     | 26 ++++++++++++++++++-
 .../graphics/PreviewSurfaceRenderer.java      |  2 +-
 .../launcher3/widget/LocalColorExtractor.java |  8 ++++++
 4 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/lint-baseline-launcher3.xml b/lint-baseline-launcher3.xml
index 469ad942d9..9a68405d73 100644
--- a/lint-baseline-launcher3.xml
+++ b/lint-baseline-launcher3.xml
@@ -573,4 +573,26 @@
             column="42"/>
     </issue>
 
+    <issue
+        id="NewApi"
+        message="Call requires API level 31 (current min is 26): `android.appwidget.AppWidgetHostView#setColorResources`"
+        errorLine1="            view.setColorResources(mWallpaperColorResources);"
+        errorLine2="                 ~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java"
+            line="381"
+            column="18"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 27 (current min is 26): `android.app.WallpaperManager#getWallpaperColors`"
+        errorLine1="                    : WallpaperManager.getInstance(context).getWallpaperColors(FLAG_SYSTEM);"
+        errorLine2="                                                            ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/apps/Launcher3/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java"
+            line="270"
+            column="61"/>
+    </issue>
+
 </issues>
diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index cf3da4b9b7..a387f04e5b 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -15,6 +15,7 @@
  */
 package com.android.launcher3.graphics;
 
+import static android.app.WallpaperManager.FLAG_SYSTEM;
 import static android.view.View.MeasureSpec.EXACTLY;
 import static android.view.View.MeasureSpec.makeMeasureSpec;
 import static android.view.View.VISIBLE;
@@ -26,6 +27,8 @@ import static com.android.launcher3.model.ModelUtils.sortWorkspaceItemsSpatially
 
 import android.annotation.TargetApi;
 import android.app.Fragment;
+import android.app.WallpaperColors;
+import android.app.WallpaperManager;
 import android.appwidget.AppWidgetHostView;
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
@@ -41,6 +44,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Process;
 import android.util.AttributeSet;
+import android.util.SparseIntArray;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -84,6 +88,7 @@ import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.launcher3.views.ActivityContext;
 import com.android.launcher3.views.BaseDragLayer;
 import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
+import com.android.launcher3.widget.LocalColorExtractor;
 import com.android.launcher3.widget.custom.CustomWidgetManager;
 
 import java.util.ArrayList;
@@ -201,8 +206,12 @@ public class LauncherPreviewRenderer extends ContextWrapper
     private final InsettableFrameLayout mRootView;
     private final Hotseat mHotseat;
     private final CellLayout mWorkspace;
+    private final SparseIntArray mWallpaperColorResources;
+
+    public LauncherPreviewRenderer(Context context,
+            InvariantDeviceProfile idp,
+            WallpaperColors wallpaperColorsOverride) {
 
-    public LauncherPreviewRenderer(Context context, InvariantDeviceProfile idp) {
         super(context);
         mUiHandler = new Handler(Looper.getMainLooper());
         mContext = context;
@@ -254,6 +263,16 @@ public class LauncherPreviewRenderer extends ContextWrapper
                 mDp.workspacePadding.top,
                 mDp.workspacePadding.right + mDp.cellLayoutPaddingLeftRightPx,
                 mDp.workspacePadding.bottom);
+
+        if (Utilities.ATLEAST_S) {
+            WallpaperColors wallpaperColors = wallpaperColorsOverride != null
+                    ? wallpaperColorsOverride
+                    : WallpaperManager.getInstance(context).getWallpaperColors(FLAG_SYSTEM);
+            mWallpaperColorResources = LocalColorExtractor.newInstance(context)
+                    .generateColorsOverride(wallpaperColors);
+        } else {
+            mWallpaperColorResources = null;
+        }
     }
 
     /** Populate preview and render it. */
@@ -357,6 +376,11 @@ public class LauncherPreviewRenderer extends ContextWrapper
         view.setAppWidget(-1, providerInfo);
         view.updateAppWidget(null);
         view.setTag(info);
+
+        if (mWallpaperColorResources != null) {
+            view.setColorResources(mWallpaperColorResources);
+        }
+
         addInScreenFromBind(view, info);
     }
 
diff --git a/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java b/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java
index a8c3d15bde..df493599ed 100644
--- a/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java
+++ b/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java
@@ -209,7 +209,7 @@ public class PreviewSurfaceRenderer {
         if (mDestroyed) {
             return;
         }
-        View view = new LauncherPreviewRenderer(inflationContext, mIdp)
+        View view = new LauncherPreviewRenderer(inflationContext, mIdp, mWallpaperColors)
                 .getRenderedView(dataModel, widgetProviderInfoMap);
         // This aspect scales the view to fit in the surface and centers it
         final float scale = Math.min(mWidth / (float) view.getMeasuredWidth(),
diff --git a/src/com/android/launcher3/widget/LocalColorExtractor.java b/src/com/android/launcher3/widget/LocalColorExtractor.java
index 8ae6b2e435..23d9e151f7 100644
--- a/src/com/android/launcher3/widget/LocalColorExtractor.java
+++ b/src/com/android/launcher3/widget/LocalColorExtractor.java
@@ -75,6 +75,14 @@ public class LocalColorExtractor implements ResourceBasedOverride {
      */
     public void applyColorsOverride(Context base, WallpaperColors colors) { }
 
+    /**
+     * Generates color resource overrides from {@link WallpaperColors}.
+     */
+    @Nullable
+    public SparseIntArray generateColorsOverride(WallpaperColors colors) {
+        return null;
+    }
+
     /**
      * Takes a view and returns its rect that can be used by the wallpaper local color extractor.
      *
-- 
GitLab


From 02e5d63fc7535c6d254676bbbcfa804a06476d21 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Mon, 19 Jul 2021 23:44:14 -0700
Subject: [PATCH 1629/1664] Fix fast scroller issues / remove fast thumb access
 / fix wrong popup location

(1) Remove jumping to arbitrary fast scroller position
because back gesture can trigger arbitrary fast scrolling
(2) Pop up would show up in random location when user combines
touching the track and scrolling. This was because thumb
location was not updating when user was scrolling on the main
container.

Bug: 193177670
Bug: 191562400

Test: manual
Change-Id: I129aaa37ca911666453a8c98e24eaac33827238f
---
 .../launcher3/views/RecyclerViewFastScroller.java      | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/com/android/launcher3/views/RecyclerViewFastScroller.java b/src/com/android/launcher3/views/RecyclerViewFastScroller.java
index a88b8b7776..1c2534d9fd 100644
--- a/src/com/android/launcher3/views/RecyclerViewFastScroller.java
+++ b/src/com/android/launcher3/views/RecyclerViewFastScroller.java
@@ -278,12 +278,7 @@ public class RecyclerViewFastScroller extends View {
                 mIgnoreDragGesture |= absDeltaY > mConfig.getScaledPagingTouchSlop();
 
                 if (!mIsDragging && !mIgnoreDragGesture && mRv.supportsFastScrolling()) {
-                    // condition #1: triggering thumb is distance, angle based
-                    if ((isNearThumb(mDownX, mLastY)
-                            && absDeltaY > mConfig.getScaledPagingTouchSlop()
-                            && absDeltaY > absDeltaX)
-                            // condition#2: Fastscroll function is now time based
-                            || (isNearScrollBar(mDownX) && ev.getEventTime() - mDownTimeStampMillis
+                    if ((isNearThumb(mDownX, mLastY) && ev.getEventTime() - mDownTimeStampMillis
                                     > FASTSCROLL_THRESHOLD_MILLIS)) {
                         calcTouchOffsetAndPrepToFastScroll(mDownY, mLastY);
                     }
@@ -433,9 +428,6 @@ public class RecyclerViewFastScroller extends View {
     }
 
     private void updatePopupY(int lastTouchY) {
-        if (!mPopupVisible) {
-            return;
-        }
         int height = mPopupView.getHeight();
         // Aligns the rounded corner of the pop up with the top of the thumb.
         float top = mRv.getScrollBarTop() + lastTouchY + (getScrollThumbRadius() / 2f)
-- 
GitLab


From ee9099af7f8671bcd85dc65d42feb551f65e6573 Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Tue, 20 Jul 2021 14:13:50 -0700
Subject: [PATCH 1630/1664] Revert "Apply depth even when surface is null"

This reverts commit a6c38be150681f537ef316a56867387309861768.

Fixes: 193333562
Test: manual
Change-Id: I4fae079e0cd056fc800e5a15389f4795c77e17fb
---
 .../statehandlers/DepthController.java        | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
index 82582ee790..370fb8ef7c 100644
--- a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
+++ b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
@@ -100,9 +100,12 @@ public class DepthController implements StateHandler<LauncherState>,
                 }
             };
 
-    private final Consumer<Boolean> mCrossWindowBlurListener = (enabled) -> {
-        mCrossWindowBlursEnabled = enabled;
-        dispatchTransactionSurface();
+    private final Consumer<Boolean> mCrossWindowBlurListener = new Consumer<Boolean>() {
+        @Override
+        public void accept(Boolean enabled) {
+            mCrossWindowBlursEnabled = enabled;
+            dispatchTransactionSurface(mDepth);
+        }
     };
 
     private final Launcher mLauncher;
@@ -189,14 +192,14 @@ public class DepthController implements StateHandler<LauncherState>,
         if (mSurface != surface) {
             mSurface = surface;
             if (surface != null) {
-                dispatchTransactionSurface();
+                dispatchTransactionSurface(mDepth);
             }
         }
     }
 
     @Override
     public void setState(LauncherState toState) {
-        if (mIgnoreStateChangesDuringMultiWindowAnimation) {
+        if (mSurface == null || mIgnoreStateChangesDuringMultiWindowAnimation) {
             return;
         }
 
@@ -204,7 +207,7 @@ public class DepthController implements StateHandler<LauncherState>,
         if (Float.compare(mDepth, toDepth) != 0) {
             setDepth(toDepth);
         } else if (toState == LauncherState.OVERVIEW) {
-            dispatchTransactionSurface();
+            dispatchTransactionSurface(mDepth);
         }
     }
 
@@ -243,31 +246,36 @@ public class DepthController implements StateHandler<LauncherState>,
         if (Float.compare(mDepth, depthF) == 0) {
             return;
         }
-        mDepth = depthF;
-        dispatchTransactionSurface();
+        if (dispatchTransactionSurface(depthF)) {
+            mDepth = depthF;
+        }
     }
 
-    private void dispatchTransactionSurface() {
+    private boolean dispatchTransactionSurface(float depth) {
         boolean supportsBlur = BlurUtils.supportsBlursOnWindows();
+        if (supportsBlur && (mSurface == null || !mSurface.isValid())) {
+            return false;
+        }
         ensureDependencies();
         IBinder windowToken = mLauncher.getRootView().getWindowToken();
         if (windowToken != null) {
-            mWallpaperManager.setWallpaperZoomOut(windowToken, mDepth);
+            mWallpaperManager.setWallpaperZoomOut(windowToken, depth);
         }
 
-        if (supportsBlur && (mSurface != null && mSurface.isValid())) {
+        if (supportsBlur) {
             // We cannot mark the window as opaque in overview because there will be an app window
             // below the launcher layer, and we need to draw it -- without blurs.
             boolean isOverview = mLauncher.isInState(LauncherState.OVERVIEW);
             boolean opaque = mLauncher.getScrimView().isFullyOpaque() && !isOverview;
 
             int blur = opaque || isOverview || !mCrossWindowBlursEnabled
-                    || mBlurDisabledForAppLaunch ? 0 : (int) (mDepth * mMaxBlurRadius);
+                    || mBlurDisabledForAppLaunch ? 0 : (int) (depth * mMaxBlurRadius);
             new SurfaceControl.Transaction()
                     .setBackgroundBlurRadius(mSurface, blur)
                     .setOpaque(mSurface, opaque)
                     .apply();
         }
+        return true;
     }
 
     @Override
-- 
GitLab


From 92c1b5d3abaddb040888564c894aa9da29f53df8 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Tue, 20 Jul 2021 13:57:16 -0700
Subject: [PATCH 1631/1664] Folder icon polish.

- Increase the overlap between the preview items and the background
  so that it appears more intentional (lots of reports of users
  thinking that its a bug)
- Fix bug where clip path was still clipping icons when
  dragging and swiping to home.

Bug: 193701705
Bug: 191225536
Test: test 2 icon, 3 icon, and 4 icon folders
      close folder on 2nd page, ensure clipping
      ensure no preview items are clipped in drag view
      ensure no preview items are clipped in swipe up to home
      test 2x2, 3x3, 4x4, 4x5, and 5x5 grids to ensure no clipping
      of folder icons
      drag and drop folder in and out of hotseat
      create folders (2 icon, 3 icon, 4 icon)

Merged-In: Id49bae33438e10248bef05450d7e2c92c2140748
Change-Id: Ic3708bd402704f0a6f57ae5315ef602e2bbc6d82
---
 src/com/android/launcher3/DeviceProfile.java      | 15 ++++++++++-----
 src/com/android/launcher3/Hotseat.java            |  4 ++--
 .../launcher3/ShortcutAndWidgetContainer.java     |  2 +-
 .../launcher3/dragndrop/FolderAdaptiveIcon.java   | 13 +++++++++++--
 .../folder/ClippedFolderIconLayoutRule.java       |  4 +++-
 src/com/android/launcher3/folder/FolderIcon.java  |  3 +++
 .../launcher3/folder/PreviewBackground.java       | 10 ++++++++--
 7 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 88e817111e..5a3e7dd3cc 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -22,6 +22,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION;
 import static com.android.launcher3.ResourceUtils.pxFromDp;
 import static com.android.launcher3.Utilities.dpiFromPx;
 import static com.android.launcher3.Utilities.pxFromSp;
+import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.ICON_OVERLAP_FACTOR;
 import static com.android.launcher3.util.WindowManagerCompat.MIN_TABLET_WIDTH;
 
 import android.annotation.SuppressLint;
@@ -394,7 +395,8 @@ public class DeviceProfile {
     }
 
     private void updateHotseatIconSize(int hotseatIconSizePx) {
-        hotseatCellHeightPx = hotseatIconSizePx;
+        // Ensure there is enough space for folder icons, which have a slightly larger radius.
+        hotseatCellHeightPx = (int) Math.ceil(hotseatIconSizePx * ICON_OVERLAP_FACTOR);
         if (isVerticalBarLayout()) {
             hotseatBarSizePx = hotseatIconSizePx + hotseatBarSidePaddingStartPx
                     + hotseatBarSidePaddingEndPx;
@@ -473,7 +475,7 @@ public class DeviceProfile {
         if (workspaceCellPaddingY < iconTextHeight) {
             iconTextSizePx = 0;
             iconDrawablePaddingPx = 0;
-            cellHeightPx = iconSizePx;
+            cellHeightPx = (int) Math.ceil(iconSizePx * ICON_OVERLAP_FACTOR);
             autoResizeAllAppsCells();
         }
     }
@@ -560,7 +562,8 @@ public class DeviceProfile {
             desiredWorkspaceLeftRightMarginPx = (int) (desiredWorkspaceLeftRightOriginalPx * scale);
         } else {
             cellWidthPx = iconSizePx + iconDrawablePaddingPx;
-            cellHeightPx = iconSizePx + iconDrawablePaddingPx
+            cellHeightPx = (int) Math.ceil(iconSizePx * ICON_OVERLAP_FACTOR)
+                    + iconDrawablePaddingPx
                     + Utilities.calculateTextHeight(iconTextSizePx);
             int cellPaddingY = (getCellSize().y - cellHeightPx) / 2;
             if (iconDrawablePaddingPx > cellPaddingY && !isVerticalLayout
@@ -844,14 +847,16 @@ public class DeviceProfile {
         return isVerticalBarLayout();
     }
 
-    public int getCellHeight(@ContainerType int containerType) {
+    public int getCellContentHeight(@ContainerType int containerType) {
         switch (containerType) {
             case CellLayout.WORKSPACE:
                 return cellHeightPx;
             case CellLayout.FOLDER:
                 return folderCellHeightPx;
             case CellLayout.HOTSEAT:
-                return hotseatCellHeightPx;
+                // The hotseat is the only container where the cell height is going to be
+                // different from the content within that cell.
+                return iconSizePx;
             default:
                 // ??
                 return 0;
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index 42b4e89c13..0a6f06c260 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -207,8 +207,8 @@ public class Hotseat extends CellLayout implements Insettable {
                 ? dp.workspacePadding.bottom
                 : dp.hotseatBarSizePx - dp.hotseatCellHeightPx - mQsbHeight;
 
-        if (dp.isScalableGrid && dp.qsbBottomMarginPx <= freeSpace) {
-            return dp.qsbBottomMarginPx;
+        if (dp.isScalableGrid) {
+            return Math.min(dp.qsbBottomMarginPx, freeSpace);
         } else {
             return (int) (freeSpace * QSB_CENTER_FACTOR) + (dp.isTaskbarPresent
                     ? dp.taskbarSize
diff --git a/src/com/android/launcher3/ShortcutAndWidgetContainer.java b/src/com/android/launcher3/ShortcutAndWidgetContainer.java
index 2a5187d025..519b63d58e 100644
--- a/src/com/android/launcher3/ShortcutAndWidgetContainer.java
+++ b/src/com/android/launcher3/ShortcutAndWidgetContainer.java
@@ -122,7 +122,7 @@ public class ShortcutAndWidgetContainer extends ViewGroup implements FolderIcon.
 
     public int getCellContentHeight() {
         return Math.min(getMeasuredHeight(),
-                mActivity.getDeviceProfile().getCellHeight(mContainerType));
+                mActivity.getDeviceProfile().getCellContentHeight(mContainerType));
     }
 
     public void measureChild(View child) {
diff --git a/src/com/android/launcher3/dragndrop/FolderAdaptiveIcon.java b/src/com/android/launcher3/dragndrop/FolderAdaptiveIcon.java
index ea1fbdb583..98c0cfc3a6 100644
--- a/src/com/android/launcher3/dragndrop/FolderAdaptiveIcon.java
+++ b/src/com/android/launcher3/dragndrop/FolderAdaptiveIcon.java
@@ -21,11 +21,11 @@ import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import android.annotation.TargetApi;
 import android.graphics.Bitmap;
 import android.graphics.Matrix;
+import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.drawable.AdaptiveIconDrawable;
-import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.util.Log;
@@ -129,10 +129,19 @@ public class FolderAdaptiveIcon extends AdaptiveIconDrawable {
                     canvas.restore();
                 });
 
+        Bitmap bgBitmap = BitmapRenderer.createHardwareBitmap(dragViewSize.x, dragViewSize.y,
+                (canvas) -> {
+                    Paint p = new Paint();
+                    p.setColor(bg.getBgColor());
+
+                    canvas.drawCircle(dragViewSize.x / 2f, dragViewSize.y / 2f, bg.getRadius(), p);
+                });
+
         ShiftedBitmapDrawable badge = new ShiftedBitmapDrawable(badgeBmp, 0, 0);
         ShiftedBitmapDrawable foreground = new ShiftedBitmapDrawable(previewBitmap, 0, 0);
+        ShiftedBitmapDrawable background = new ShiftedBitmapDrawable(bgBitmap, 0, 0);
 
-        return new FolderAdaptiveIcon(new ColorDrawable(bg.getBgColor()), foreground, badge, mask);
+        return new FolderAdaptiveIcon(background, foreground, badge, mask);
     }
 
     @Override
diff --git a/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java b/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java
index 54967a9915..8cd91d3a43 100644
--- a/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java
+++ b/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java
@@ -7,7 +7,9 @@ public class ClippedFolderIconLayoutRule {
 
     private static final float MIN_SCALE = 0.44f;
     private static final float MAX_SCALE = 0.51f;
-    private static final float MAX_RADIUS_DILATION = 0.1f;
+    private static final float MAX_RADIUS_DILATION = 0.25f;
+    // The max amount of overlap the preview items can go outside of the background bounds.
+    public static final float ICON_OVERLAP_FACTOR = 1 + (MAX_RADIUS_DILATION / 2f);
     private static final float ITEM_RADIUS_SCALE_FACTOR = 1.15f;
 
     public static final int EXIT_INDEX = -2;
diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java
index e704957d32..96030f924e 100644
--- a/src/com/android/launcher3/folder/FolderIcon.java
+++ b/src/com/android/launcher3/folder/FolderIcon.java
@@ -16,6 +16,7 @@
 
 package com.android.launcher3.folder;
 
+import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.ICON_OVERLAP_FACTOR;
 import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW;
 import static com.android.launcher3.folder.PreviewItemManager.INITIAL_ITEM_ANIMATION_DURATION;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_FOLDER_AUTO_LABELED;
@@ -236,6 +237,8 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
     public void getPreviewBounds(Rect outBounds) {
         mPreviewItemManager.recomputePreviewDrawingParams();
         mBackground.getBounds(outBounds);
+        // The preview items go outside of the bounds of the background.
+        Utilities.scaleRectAboutCenter(outBounds, ICON_OVERLAP_FACTOR);
     }
 
     public float getBackgroundStrokeWidth() {
diff --git a/src/com/android/launcher3/folder/PreviewBackground.java b/src/com/android/launcher3/folder/PreviewBackground.java
index 460521f1a4..18d0b10528 100644
--- a/src/com/android/launcher3/folder/PreviewBackground.java
+++ b/src/com/android/launcher3/folder/PreviewBackground.java
@@ -16,6 +16,7 @@
 
 package com.android.launcher3.folder;
 
+import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.ICON_OVERLAP_FACTOR;
 import static com.android.launcher3.graphics.IconShape.getShape;
 import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
 
@@ -186,7 +187,7 @@ public class PreviewBackground extends CellLayout.DelegatedCellDrawing {
         outBounds.set(left, top, right, bottom);
     }
 
-    int getRadius() {
+    public int getRadius() {
         return previewSize / 2;
     }
 
@@ -348,7 +349,12 @@ public class PreviewBackground extends CellLayout.DelegatedCellDrawing {
 
     public Path getClipPath() {
         mPath.reset();
-        getShape().addToPath(mPath, getOffsetX(), getOffsetY(), getScaledRadius());
+        float radius = getScaledRadius() * ICON_OVERLAP_FACTOR;
+        // Find the difference in radius so that the clip path remains centered.
+        float radiusDifference = radius - getRadius();
+        float offsetX = basePreviewOffsetX - radiusDifference;
+        float offsetY = basePreviewOffsetY - radiusDifference;
+        getShape().addToPath(mPath, offsetX, offsetY, radius);
         return mPath;
     }
 
-- 
GitLab


From edc7917521ab73e5d737ae03ae8e38fb120fbce0 Mon Sep 17 00:00:00 2001
From: Jason Chang <jasonsfchang@google.com>
Date: Fri, 16 Jul 2021 18:55:08 +0800
Subject: [PATCH 1632/1664] Fix unable to swipe up to exit one-handed mode
 under 2 button navigation

Remove redundant condition checking when consuming One-handed mode
gesture events.

Bug: 193761450

Test: manual
Test: atest WMShellUnitTests
Change-Id: Id4687cb579c17d7de1a08b32c003e656cbbce820
---
 .../src/com/android/quickstep/TouchInteractionService.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 069ed11553..b6dc833967 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -564,8 +564,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
                 } else {
                     mUncheckedConsumer = InputConsumer.NO_OP;
                 }
-            } else if (mDeviceState.canTriggerOneHandedAction(event)
-                    && !mDeviceState.isOneHandedModeActive()) {
+            } else if (mDeviceState.canTriggerOneHandedAction(event)) {
                 // Consume gesture event for triggering one handed feature.
                 mUncheckedConsumer = new OneHandedModeInputConsumer(this, mDeviceState,
                         InputConsumer.NO_OP, mInputMonitorCompat);
-- 
GitLab


From ae99b65b1fafdcc1de6b6ecf320e86c0b35f8f54 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 21 Jul 2021 05:55:06 +0000
Subject: [PATCH 1633/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I828bb455fd6ce0c8e5552cac3bf2090f29021ccd
---
 quickstep/res/values-hi/strings.xml |  2 +-
 quickstep/res/values-ja/strings.xml | 12 ++++++------
 quickstep/res/values-mn/strings.xml |  2 +-
 quickstep/res/values-ne/strings.xml |  2 +-
 quickstep/res/values-th/strings.xml |  2 +-
 quickstep/res/values-vi/strings.xml |  6 +++---
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/quickstep/res/values-hi/strings.xml b/quickstep/res/values-hi/strings.xml
index 86f9017b30..23ffad3d89 100644
--- a/quickstep/res/values-hi/strings.xml
+++ b/quickstep/res/values-hi/strings.xml
@@ -46,7 +46,7 @@
     <string name="hotsaet_tip_prediction_disabled" msgid="1506426298884658491">"सुझाए गए ऐप्लिकेशन की सुविधा बंद है"</string>
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"सुझाया गया ऐप्लिकेशन: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"पक्का करें कि आप स्क्रीन की दाईं या बाईं ओर के बिल्कुल किनारे से स्वाइप कर रहे हों."</string>
-    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"पक्का करें कि आप स्क्रीन के दाएं या बाएं किनारे से, स्क्रीन के बीच तक स्वाइप करें और फिर अपनी उंगली उठा लें."</string>
+    <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"स्क्रीन के दाएं या बाएं किनारे से स्क्रीन के बीच तक स्वाइप करें और अपनी उंगली उठा लें."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"आपने स्क्रीन के दाएं किनारे से स्वाइप करके, पिछली स्क्रीन पर वापस जाने का तरीका सीख लिया है. अब, एक ऐप से दूसरे ऐप पर जाने का तरीका सीखें."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"आपने पेज पर पीछे ले जाने वाले हाथ के जेस्चर (हाव-भाव) के बारे में जान लिया है."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"देखे लें कि आप स्क्रीन पर बिल्कुल नीचे तक स्वाइप न कर रहे हों."</string>
diff --git a/quickstep/res/values-ja/strings.xml b/quickstep/res/values-ja/strings.xml
index 3ee1b99b08..9c2adefecd 100644
--- a/quickstep/res/values-ja/strings.xml
+++ b/quickstep/res/values-ja/strings.xml
@@ -48,16 +48,16 @@
     <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"右端または左端からスワイプしてください。"</string>
     <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"画面の右端または左端から中央に向かってスワイプし、指を離してください。"</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"右側からスワイプして前の画面に戻る方法を学習しました。次は、アプリを切り替える方法を覚えましょう。"</string>
-    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"「戻る」操作を完了しました。"</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"「戻る」操作を学習しました。"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"スワイプする際は画面の下部に近づきすぎないようにしましょう。"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"「戻る」操作の感度を変更するには [設定] に移動します"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"スワイプで戻りましょう"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"スワイプで戻る"</string>
     <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"直前の画面に戻るには、画面の左端または右端から中央に向かってスワイプします。"</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"画面の下端から上にスワイプしてください。"</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"指を離す前にいったん止めないでください。"</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"まっすぐ上にスワイプしてください。"</string>
-    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"「ホームに戻る」操作を完了しました。次は、前の画面に戻る方法を覚えましょう。"</string>
-    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"「ホームに戻る」操作を完了しました。"</string>
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"「ホームに戻る」操作を学習しました。次は、前の画面に戻る方法を覚えましょう。"</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"「ホームに戻る」操作を学習しました。"</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"スワイプでホームに戻る"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"画面を下から上にスワイプします。この操作でいつでもホーム画面に戻れます。"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"画面の下端から上にスワイプしてください。"</string>
@@ -65,7 +65,7 @@
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"まっすぐ上にスワイプしてから、いったん指を止めてください。"</string>
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"主な操作方法を覚えました。操作を OFF にするには、設定に移動してください。"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"「アプリを切り替える」操作を完了しました。"</string>
-    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"スワイプでアプリを切り替え"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"スワイプでアプリを切り替える"</string>
     <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"アプリを切り替えるには、画面を下から上にスワイプして長押しし、指を離します。"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"設定完了"</string>
     <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"完了"</string>
@@ -81,7 +81,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"スクリーンショット"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"この操作はアプリまたは組織で許可されていません"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"操作チュートリアルをスキップしますか？"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"これは後から <xliff:g id="NAME">%1$s</xliff:g> アプリで確認できます"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"チュートリアルは後から <xliff:g id="NAME">%1$s</xliff:g> アプリで確認できます"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"キャンセル"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"スキップ"</string>
 </resources>
diff --git a/quickstep/res/values-mn/strings.xml b/quickstep/res/values-mn/strings.xml
index dfa98e7432..79fbca6e49 100644
--- a/quickstep/res/values-mn/strings.xml
+++ b/quickstep/res/values-mn/strings.xml
@@ -47,7 +47,7 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Таамаглаж буй апп: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Та баруун зах эсвэл зүүн захын булангаас шударна уу."</string>
     <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Та баруун эсвэл зүүн булангаас дэлгэцийн дунд хэсэг хүртэл шударч, суллана уу."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Та буцахын тулд баруунаас хэрхэн шудрахыг мэдэж авлаа Дараа нь аппыг хэрхэн сэлгэхийг мэдэж аваарай."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Та буцахын тулд баруунаас хэрхэн шудрахыг мэдэж авлаа. Дараа нь аппууд хооронд хэрхэн сэлгэхийг мэдэж аваарай."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Та буцах зангааг гүйцэтгэлээ."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Та дэлгэцийн доод хэсэгтэй хэт ойр бүү шудраарай."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Буцах зангааны мэдрэгшлийг өөрчлөх бол Тохиргоо руу очно уу"</string>
diff --git a/quickstep/res/values-ne/strings.xml b/quickstep/res/values-ne/strings.xml
index 4428cec16b..d873795edf 100644
--- a/quickstep/res/values-ne/strings.xml
+++ b/quickstep/res/values-ne/strings.xml
@@ -23,7 +23,7 @@
     <string name="recent_task_option_freeform" msgid="48863056265284071">"फ्रिफर्म"</string>
     <string name="recents_empty_message" msgid="7040467240571714191">"हालसालैको कुनै पनि वस्तु छैन"</string>
     <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"एपको उपयोगका सेटिङहरू"</string>
-    <string name="recents_clear_all" msgid="5328176793634888831">"सबै खाली गर्नुहोस्"</string>
+    <string name="recents_clear_all" msgid="5328176793634888831">"सबै मेटाउनुहोस्"</string>
     <string name="accessibility_recent_apps" msgid="4058661986695117371">"हालसालैका एपहरू"</string>
     <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>, <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>
     <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt; १ मिनेट"</string>
diff --git a/quickstep/res/values-th/strings.xml b/quickstep/res/values-th/strings.xml
index 96e9060e7f..52b2878564 100644
--- a/quickstep/res/values-th/strings.xml
+++ b/quickstep/res/values-th/strings.xml
@@ -81,7 +81,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"ภาพหน้าจอ"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"แอปหรือองค์กรของคุณไม่อนุญาตการดำเนินการนี้"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"ข้ามบทแนะนำการนำทางไหม"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"คุณดูบทแนะนำนี้ได้ภายหลังในแอป <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"คุณดูบทแนะนำนี้ได้ภายหลังในแอป \"<xliff:g id="NAME">%1$s</xliff:g>\""</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"ยกเลิก"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"ข้าม"</string>
 </resources>
diff --git a/quickstep/res/values-vi/strings.xml b/quickstep/res/values-vi/strings.xml
index 6c192b28a6..7bd0c70420 100644
--- a/quickstep/res/values-vi/strings.xml
+++ b/quickstep/res/values-vi/strings.xml
@@ -47,11 +47,11 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Ứng dụng dự đoán: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Hãy vuốt từ mép ngoài cùng bên phải hoặc ngoài cùng bên trái."</string>
     <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Hãy vuốt từ mép phải hoặc mép trái tới giữa màn hình rồi thả tay ra."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Bạn đã tìm hiểu cách vuốt từ mép phải để quay lại. Tiếp theo, hãy tìm hiểu cách chuyển đổi ứng dụng."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Bạn đã học được cách vuốt từ mép phải để quay lại. Tiếp theo, hãy tìm hiểu cách chuyển đổi ứng dụng."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Bạn đã thực hiện xong cử chỉ quay lại."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Hãy nhớ không được vuốt quá gần phần cuối màn hình."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Để thay đổi độ nhạy của cử chỉ quay lại, hãy vào mục Cài đặt"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Hãy vuốt để quay lại"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Vuốt để quay lại"</string>
     <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Để quay lại màn hình gần đây nhất, hãy vuốt từ mép trái hoặc mép phải tới chính giữa màn hình."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Hãy vuốt lên từ mép dưới cùng của màn hình."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Hãy nhớ không được tạm dừng trước khi nhấc ngón tay."</string>
@@ -75,7 +75,7 @@
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Hướng dẫn <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Đã hoàn tất!"</string>
     <string name="allset_hint" msgid="2384632994739392447">"Vuốt lên để chuyển đến Màn hình chính"</string>
-    <string name="allset_description" msgid="6350320429953234580">"Hiện giờ, bạn đã có thể sử dụng điện thoại"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Vậy là bạn đã sẵn sàng sử dụng điện thoại của mình"</string>
     <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Chế độ cài đặt di chuyển trên hệ thống"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Chia sẻ"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Chụp ảnh màn hình"</string>
-- 
GitLab


From ec4a56a311437a46415e0cba04d666989fbd59af Mon Sep 17 00:00:00 2001
From: Brian Isganitis <brianji@google.com>
Date: Tue, 29 Jun 2021 01:33:25 -0400
Subject: [PATCH 1634/1664] Support overriding All Apps EDU animation on drag

Test: Dragging during All Apps EDU animation overrides the animation.
Bug: 160218103
Change-Id: I1c0a2d047bcb43ea7ce30cf87182b392dac313e4
---
 .../quickstep/views/AllAppsEduView.java       | 92 ++++++++++++-------
 .../AbstractStateChangeTouchController.java   |  4 +-
 2 files changed, 63 insertions(+), 33 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/AllAppsEduView.java b/quickstep/src/com/android/quickstep/views/AllAppsEduView.java
index f67940ab56..04a7baaa2b 100644
--- a/quickstep/src/com/android/quickstep/views/AllAppsEduView.java
+++ b/quickstep/src/com/android/quickstep/views/AllAppsEduView.java
@@ -17,13 +17,10 @@ package com.android.quickstep.views;
 
 import static com.android.launcher3.LauncherState.ALL_APPS;
 import static com.android.launcher3.LauncherState.NORMAL;
-import static com.android.launcher3.anim.Interpolators.ACCEL;
 import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_7;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALL_APPS_EDU_SHOWN;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_SCRIM_FADE;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -35,7 +32,7 @@ import android.graphics.Rect;
 import android.graphics.drawable.GradientDrawable;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
-import android.view.ViewGroup;
+import android.view.View;
 
 import androidx.core.graphics.ColorUtils;
 
@@ -44,25 +41,21 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
-import com.android.launcher3.allapps.AllAppsTransitionController;
 import com.android.launcher3.anim.AnimatorPlaybackController;
-import com.android.launcher3.anim.Interpolators;
-import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.dragndrop.DragLayer;
-import com.android.launcher3.states.StateAnimationConfig;
+import com.android.launcher3.uioverrides.touchcontrollers.PortraitStatesTouchController;
 import com.android.launcher3.util.Themes;
 import com.android.quickstep.util.MultiValueUpdateListener;
 
 /**
  * View used to educate the user on how to access All Apps when in No Nav Button navigation mode.
- * Consumes all touches until after the animation is completed and the view is removed.
+ * If the user drags on the view, the animation is overridden so the user can swipe to All Apps or
+ * Home.
  */
 public class AllAppsEduView extends AbstractFloatingView {
 
-    private static final float HINT_PROG_SCRIM_THRESHOLD = 0.06f;
-    private static final float HINT_PROG_CONTENT_THRESHOLD = 0.08f;
-
     private Launcher mLauncher;
+    private AllAppsEduTouchController mTouchController;
 
     private AnimatorSet mAnimation;
 
@@ -123,8 +116,35 @@ public class AllAppsEduView extends AbstractFloatingView {
         return true;
     }
 
+    @Override
+    public boolean onControllerTouchEvent(MotionEvent ev) {
+        mTouchController.onControllerTouchEvent(ev);
+        if (mAnimation != null) {
+            updateAnimationOnTouchEvent(ev);
+        }
+        return super.onControllerTouchEvent(ev);
+    }
+
+    private void updateAnimationOnTouchEvent(MotionEvent ev) {
+        switch (ev.getActionMasked()) {
+            case MotionEvent.ACTION_DOWN:
+                mAnimation.pause();
+                return;
+            case MotionEvent.ACTION_UP:
+            case MotionEvent.ACTION_CANCEL:
+                mAnimation.resume();
+                return;
+        }
+
+        if (mTouchController.isDraggingOrSettling()) {
+            mAnimation = null;
+            handleClose(false);
+        }
+    }
+
     @Override
     public boolean onControllerInterceptTouchEvent(MotionEvent ev) {
+        mTouchController.onControllerInterceptTouchEvent(ev);
         return true;
     }
 
@@ -145,23 +165,9 @@ public class AllAppsEduView extends AbstractFloatingView {
         int secondPart = 1200;
         int introDuration = firstPart + secondPart;
 
-        StateAnimationConfig config = new StateAnimationConfig();
-        config.setInterpolator(ANIM_ALL_APPS_FADE, Interpolators.clampToProgress(ACCEL,
-                HINT_PROG_SCRIM_THRESHOLD, HINT_PROG_CONTENT_THRESHOLD));
-        config.setInterpolator(ANIM_SCRIM_FADE,
-                Interpolators.clampToProgress(ACCEL, 0, HINT_PROG_CONTENT_THRESHOLD));
-        config.duration = secondPart;
-        config.userControlled = false;
         AnimatorPlaybackController stateAnimationController =
-                mLauncher.getStateManager().createAnimationToNewWorkspace(ALL_APPS, config);
-        float maxAllAppsProgress = mLauncher.getDeviceProfile().isLandscape ? 0.35f : 0.15f;
-
-        AllAppsTransitionController allAppsController = mLauncher.getAllAppsController();
-        PendingAnimation allAppsAlpha = new PendingAnimation(config.duration);
-        allAppsController.setAlphas(ALL_APPS, config, allAppsAlpha);
-        mLauncher.getWorkspace().getStateTransitionAnimation().setScrim(allAppsAlpha, ALL_APPS,
-                config);
-        mAnimation.play(allAppsAlpha.buildAnim());
+                mTouchController.initAllAppsAnimation();
+        float maxAllAppsProgress = 0.75f;
 
         ValueAnimator intro = ValueAnimator.ofFloat(0, 1f);
         intro.setInterpolator(LINEAR);
@@ -198,6 +204,7 @@ public class AllAppsEduView extends AbstractFloatingView {
                 mGradient.setAlpha(0);
             }
         });
+        mLauncher.getAppsView().setVisibility(View.VISIBLE);
         mAnimation.play(intro);
 
         ValueAnimator closeAllApps = ValueAnimator.ofFloat(maxAllAppsProgress, 0f);
@@ -223,6 +230,7 @@ public class AllAppsEduView extends AbstractFloatingView {
 
     private void init(Launcher launcher) {
         mLauncher = launcher;
+        mTouchController = new AllAppsEduTouchController(mLauncher);
 
         int accentColor = Themes.getColorAccent(launcher);
         mGradient = new GradientDrawable(GradientDrawable.Orientation.TOP_BOTTOM,
@@ -250,9 +258,8 @@ public class AllAppsEduView extends AbstractFloatingView {
      */
     public static void show(Launcher launcher) {
         final DragLayer dragLayer = launcher.getDragLayer();
-        ViewGroup parent = (ViewGroup) dragLayer.getParent();
-        AllAppsEduView view = launcher.getViewCache().getView(R.layout.all_apps_edu_view,
-                launcher, parent);
+        AllAppsEduView view = (AllAppsEduView) launcher.getLayoutInflater().inflate(
+                R.layout.all_apps_edu_view, dragLayer, false);
         view.init(launcher);
         launcher.getDragLayer().addView(view);
         launcher.getStatsLogManager().logger().log(LAUNCHER_ALL_APPS_EDU_SHOWN);
@@ -260,4 +267,27 @@ public class AllAppsEduView extends AbstractFloatingView {
         view.requestLayout();
         view.playAnimation();
     }
+
+    private static class AllAppsEduTouchController extends PortraitStatesTouchController {
+
+        private AllAppsEduTouchController(Launcher l) {
+            super(l);
+        }
+
+        @Override
+        protected boolean canInterceptTouch(MotionEvent ev) {
+            return true;
+        }
+
+        private AnimatorPlaybackController initAllAppsAnimation() {
+            mFromState = NORMAL;
+            mToState = ALL_APPS;
+            mProgressMultiplier = initCurrentAnimation();
+            return mCurrentAnimation;
+        }
+
+        private boolean isDraggingOrSettling() {
+            return mDetector.isDraggingOrSettling();
+        }
+    }
 }
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index 90f37f3404..5f8a4d4f3c 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -65,12 +65,12 @@ public abstract class AbstractStateChangeTouchController
     protected LauncherState mToState;
     protected AnimatorPlaybackController mCurrentAnimation;
     protected boolean mGoingBetweenStates = true;
+    // Ratio of transition process [0, 1] to drag displacement (px)
+    protected float mProgressMultiplier;
 
     private boolean mNoIntercept;
     private boolean mIsLogContainerSet;
     private float mStartProgress;
-    // Ratio of transition process [0, 1] to drag displacement (px)
-    private float mProgressMultiplier;
     private float mDisplacementShift;
     private boolean mCanBlockFling;
     private boolean mAllAppsOvershootStarted;
-- 
GitLab


From a606d344a628b9a3cc158e0a72ac6dd65c7b39ab Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Thu, 22 Jul 2021 16:08:15 +0100
Subject: [PATCH 1635/1664] Measure WidgetsFullSheet before estimating the
 recommended table size

Issue: The header view height was obtained before any measurement.

Test: On Pixel 5 4x5 gird with Photo widget shown in recommended
      table, make the device in landscape. Then open the full widgets
      picker. The widgets picker can be scrolled. Before this fix,
      scrolling is not possible.
Fix: 194172597
Change-Id: Ib30cf4b95d2ed23ff28f3d24e103f0e919b3a551
---
 .../launcher3/widget/picker/WidgetsFullSheet.java        | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 6c2cca6024..f2fee0a526 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -15,6 +15,8 @@
  */
 package com.android.launcher3.widget.picker;
 
+import static android.view.View.MeasureSpec.makeMeasureSpec;
+
 import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WIDGETSTRAY_SEARCHED;
 import static com.android.launcher3.testing.TestProtocol.NORMAL_STATE_ORDINAL;
@@ -519,7 +521,12 @@ public class WidgetsFullSheet extends BaseWidgetSheet
                                 mNoWidgetsView.getText().length(), noWidgetsViewTextBounds);
                 noWidgetsViewHeight = noWidgetsViewTextBounds.height();
             }
-            float maxTableHeight = (mActivityContext.getDeviceProfile().availableHeightPx
+            doMeasure(
+                    makeMeasureSpec(mActivityContext.getDeviceProfile().availableWidthPx,
+                            MeasureSpec.EXACTLY),
+                    makeMeasureSpec(mActivityContext.getDeviceProfile().availableHeightPx,
+                            MeasureSpec.EXACTLY));
+            float maxTableHeight = (mContent.getMeasuredHeight()
                     - mTabsHeight - mViewPagerTopPadding - getHeaderViewHeight()
                     - noWidgetsViewHeight) * RECOMMENDATION_TABLE_HEIGHT_RATIO;
 
-- 
GitLab


From ed82e0daef3226e645b90210393d92fb73b8f00a Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Wed, 21 Jul 2021 17:24:12 -0700
Subject: [PATCH 1636/1664] Fix widget drop preview outline on 4x5 grids

=> We were not account for mBorderSpacing in the outline calculation
=> This was fine in most cases as this value is 0, but 4x5 appears to be the exception

Bug: 194227752

Test: manual, see video in bug.
Change-Id: Ib590bc142a0f65e75f92ee057f8b4f4b0f81521b
---
 src/com/android/launcher3/CellLayout.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 00278e479b..a6adfc4bf6 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -566,9 +566,10 @@ public class CellLayout extends ViewGroup {
                 int spanX = mDragOutlines[i].cellHSpan;
                 int spanY = mDragOutlines[i].cellVSpan;
 
+                // TODO b/194414754 clean this up, reconcile with cellToRect
                 mVisualizeGridRect.set(paddingX, paddingY,
-                        mCellWidth * spanX - paddingX,
-                        mCellHeight * spanY - paddingY);
+                        mCellWidth * spanX + mBorderSpacing * (spanX - 1) - paddingX,
+                        mCellHeight * spanY + mBorderSpacing * (spanY - 1) - paddingY);
 
                 int transX = x * mCellWidth + (x * mBorderSpacing)
                         + getPaddingLeft() + paddingX;
-- 
GitLab


From 58e81e5da129431391cff19ab9ba8f542811aaee Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 22 Jul 2021 12:48:00 -0700
Subject: [PATCH 1637/1664] Fixing touch events ignored in some cases

Bug: 160218103
Test: Manual
Change-Id: Ifa71e742451acecd8979a6833a202c6189b4df52
---
 .../quickstep/views/AllAppsEduView.java       | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/AllAppsEduView.java b/quickstep/src/com/android/quickstep/views/AllAppsEduView.java
index 04a7baaa2b..e9d7c3cb31 100644
--- a/quickstep/src/com/android/quickstep/views/AllAppsEduView.java
+++ b/quickstep/src/com/android/quickstep/views/AllAppsEduView.java
@@ -17,6 +17,7 @@ package com.android.quickstep.views;
 
 import static com.android.launcher3.LauncherState.ALL_APPS;
 import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.Utilities.EDGE_NAV_BAR;
 import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
 import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_7;
@@ -67,6 +68,8 @@ public class AllAppsEduView extends AbstractFloatingView {
     private int mWidthPx;
     private int mMaxHeightPx;
 
+    private boolean mCanInterceptTouch;
+
     public AllAppsEduView(Context context, AttributeSet attrs) {
         super(context, attrs);
         mCircle = (GradientDrawable) context.getDrawable(R.drawable.all_apps_edu_circle);
@@ -116,16 +119,27 @@ public class AllAppsEduView extends AbstractFloatingView {
         return true;
     }
 
+
+    private boolean shouldInterceptTouch(MotionEvent ev) {
+        if (ev.getAction() == MotionEvent.ACTION_DOWN) {
+            mCanInterceptTouch = (ev.getEdgeFlags() & EDGE_NAV_BAR) == 0;
+        }
+        return mCanInterceptTouch;
+    }
+
     @Override
     public boolean onControllerTouchEvent(MotionEvent ev) {
-        mTouchController.onControllerTouchEvent(ev);
-        if (mAnimation != null) {
+        if (shouldInterceptTouch(ev)) {
+            mTouchController.onControllerTouchEvent(ev);
             updateAnimationOnTouchEvent(ev);
         }
-        return super.onControllerTouchEvent(ev);
+        return true;
     }
 
     private void updateAnimationOnTouchEvent(MotionEvent ev) {
+        if (mAnimation == null) {
+            return;
+        }
         switch (ev.getActionMasked()) {
             case MotionEvent.ACTION_DOWN:
                 mAnimation.pause();
@@ -144,7 +158,10 @@ public class AllAppsEduView extends AbstractFloatingView {
 
     @Override
     public boolean onControllerInterceptTouchEvent(MotionEvent ev) {
-        mTouchController.onControllerInterceptTouchEvent(ev);
+        if (shouldInterceptTouch(ev)) {
+            mTouchController.onControllerInterceptTouchEvent(ev);
+            updateAnimationOnTouchEvent(ev);
+        }
         return true;
     }
 
-- 
GitLab


From e4413cc6ae230c7e27c2bc475e29ce936fcf326c Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Tue, 20 Jul 2021 11:01:48 -0700
Subject: [PATCH 1638/1664] Update size limits to match spec.

Bug: 194124461
Test: Verified using screnshots over spec
      Only 4x5 grid is affected
      Tested on multiple devices, multiple display options

Change-Id: I301c512e416ed81f6d41f6f0ecbf5994d47d82bf
---
 res/xml/size_limits_80x104.xml | 57 ++++++++++++++++++++++++++++------
 1 file changed, 48 insertions(+), 9 deletions(-)

diff --git a/res/xml/size_limits_80x104.xml b/res/xml/size_limits_80x104.xml
index f5ca757586..93d43fbc89 100644
--- a/res/xml/size_limits_80x104.xml
+++ b/res/xml/size_limits_80x104.xml
@@ -31,32 +31,72 @@
     </device-padding>
 
     <device-padding
-        launcher:maxEmptySpace="97dp">
+        launcher:maxEmptySpace="100dp">
         <workspaceTopPadding
             launcher:a="0"
-            launcher:b="16dp"/>
+            launcher:b="9dp"/>
         <workspaceBottomPadding
-            launcher:a="0.56"
+            launcher:a="0.40"
             launcher:b="0"
-            launcher:c="16dp"/>
+            launcher:c="9dp"/>
         <hotseatBottomPadding
-            launcher:a="0.44"
+            launcher:a="0.60"
             launcher:b="0"
-            launcher:c="16dp"/>
+            launcher:c="9dp"/>
+    </device-padding>
+
+    <device-padding
+        launcher:maxEmptySpace="103dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="26dp"/>
+        <workspaceBottomPadding
+            launcher:a="0"
+            launcher:b="20dp"/>
+        <hotseatBottomPadding
+            launcher:a="1"
+            launcher:b="0"
+            launcher:c="46dp"/>
     </device-padding>
 
     <device-padding
         launcher:maxEmptySpace="107dp">
         <workspaceTopPadding
             launcher:a="0"
-            launcher:b="16dp"/>
+            launcher:b="9dp"/>
         <workspaceBottomPadding
             launcher:a="0"
-            launcher:b="36dp"/>
+            launcher:b="34dp"/>
         <hotseatBottomPadding
             launcher:a="1"
             launcher:b="0"
+            launcher:c="43dp"/>
+    </device-padding>
+
+    <device-padding
+        launcher:maxEmptySpace="120dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="16dp"/>
+        <workspaceBottomPadding
+            launcher:a="1"
             launcher:c="52dp"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="36dp"/>
+    </device-padding>
+
+    <device-padding
+        launcher:maxEmptySpace="135dp">
+        <workspaceTopPadding
+            launcher:a="0"
+            launcher:b="39dp"/>
+        <workspaceBottomPadding
+            launcher:a="1"
+            launcher:c="75dp"/>
+        <hotseatBottomPadding
+            launcher:a="0"
+            launcher:b="36dp"/>
     </device-padding>
 
     <device-padding
@@ -71,5 +111,4 @@
             launcher:a="0"
             launcher:b="36dp"/>
     </device-padding>
-
 </device-paddings>
\ No newline at end of file
-- 
GitLab


From f33f5b3fc563c505c9d8476c831b6baa01b96a67 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Thu, 22 Jul 2021 17:15:31 -0700
Subject: [PATCH 1639/1664] Folder polish: unbold folder title, ensure icons
 not cropped in folder.

- Ensure folder items are scaled to fit within the height/width in 4x5 mode.
- This bug surfaced now since  we increased the icon size.

Bug: 194356039
Test: set display to large, set font to large
Change-Id: Ie360ca67c3c91649a471bce920b2fc6a82fb9661
---
 res/layout/user_folder_icon_normalized.xml   | 1 -
 src/com/android/launcher3/DeviceProfile.java | 7 +++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/res/layout/user_folder_icon_normalized.xml b/res/layout/user_folder_icon_normalized.xml
index 15131f11d7..11eea6072c 100644
--- a/res/layout/user_folder_icon_normalized.xml
+++ b/res/layout/user_folder_icon_normalized.xml
@@ -44,7 +44,6 @@
             style="@style/TextHeadline"
             android:layout_weight="1"
             android:background="@android:color/transparent"
-            android:textStyle="bold"
             android:gravity="center_horizontal"
             android:hint="@string/folder_hint_text"
             android:imeOptions="flagNoExtractUi"
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 88e817111e..dff1c31c48 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -649,8 +649,11 @@ public class DeviceProfile {
         int textHeight = Utilities.calculateTextHeight(folderChildTextSizePx);
 
         if (isScalableGrid) {
-            folderCellWidthPx = (int) (cellWidthPx * scale);
-            folderCellHeightPx = (int) (cellHeightPx * scale);
+            int minWidth = folderChildIconSizePx + iconDrawablePaddingPx * 2;
+            int minHeight = folderChildIconSizePx + iconDrawablePaddingPx * 2 + textHeight;
+
+            folderCellWidthPx = (int) Math.max(minWidth, cellWidthPx * scale);
+            folderCellHeightPx = (int) Math.max(minHeight, cellHeightPx * scale);
 
             int borderSpacing = (int) (cellLayoutBorderSpacingOriginalPx * scale);
             folderCellLayoutBorderSpacingPx = borderSpacing;
-- 
GitLab


From 069f8c5ac9379dbb2d5f2081e537f0a7b06edbd8 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Fri, 23 Jul 2021 11:40:51 -0700
Subject: [PATCH 1640/1664] Update hotseat sizing for 4x5 grids.

If the qsb bottom margin is smaller than the bottom insets,
we'll fall back to centering the qsb in the available freespace.

Bug: 194435265
Test: 4x5 grid
      multiple devices,
      with: gesture nav enabled
            3 button nav enabled

Merged-In: I9fd4f0da3f2bc9f0b38a621ad1192533260379e3
Change-Id: I711e7d168b80254e73df0d4e1854756d819a705b
---
 res/xml/size_limits_80x104.xml         | 8 ++++----
 src/com/android/launcher3/Hotseat.java | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/res/xml/size_limits_80x104.xml b/res/xml/size_limits_80x104.xml
index 93d43fbc89..41786644fb 100644
--- a/res/xml/size_limits_80x104.xml
+++ b/res/xml/size_limits_80x104.xml
@@ -80,10 +80,10 @@
             launcher:b="16dp"/>
         <workspaceBottomPadding
             launcher:a="1"
-            launcher:c="52dp"/>
+            launcher:c="72dp"/>
         <hotseatBottomPadding
             launcher:a="0"
-            launcher:b="36dp"/>
+            launcher:b="56dp"/>
     </device-padding>
 
     <device-padding
@@ -93,10 +93,10 @@
             launcher:b="39dp"/>
         <workspaceBottomPadding
             launcher:a="1"
-            launcher:c="75dp"/>
+            launcher:c="95dp"/>
         <hotseatBottomPadding
             launcher:a="0"
-            launcher:b="36dp"/>
+            launcher:b="56dp"/>
     </device-padding>
 
     <device-padding
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index 0a6f06c260..eaca162e82 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -207,7 +207,7 @@ public class Hotseat extends CellLayout implements Insettable {
                 ? dp.workspacePadding.bottom
                 : dp.hotseatBarSizePx - dp.hotseatCellHeightPx - mQsbHeight;
 
-        if (dp.isScalableGrid) {
+        if (dp.isScalableGrid && dp.qsbBottomMarginPx > dp.getInsets().bottom) {
             return Math.min(dp.qsbBottomMarginPx, freeSpace);
         } else {
             return (int) (freeSpace * QSB_CENTER_FACTOR) + (dp.isTaskbarPresent
-- 
GitLab


From 80cddbccb69669eb35327f1851651ee5d34a1331 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Thu, 22 Jul 2021 13:51:16 -0700
Subject: [PATCH 1641/1664] Add more extra space to hotseat for taller devices.

Bug: 192520231
Test: manual test on taller devices
Change-Id: I3eccada67f0ba07d01f823c4156f02c3feb97f84
---
 src/com/android/launcher3/DeviceProfile.java | 34 +++++++++++++++-----
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 88e817111e..20d79fa468 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -89,6 +89,7 @@ public class DeviceProfile {
     private static final float MAX_HORIZONTAL_PADDING_PERCENT = 0.14f;
 
     private static final float TALL_DEVICE_ASPECT_RATIO_THRESHOLD = 2.0f;
+    private static final float TALLER_DEVICE_ASPECT_RATIO_THRESHOLD = 2.15f;
 
     // To evenly space the icons, increase the left/right margins for tablets in portrait mode.
     private static final int PORTRAIT_TABLET_LEFT_RIGHT_PADDING_MULTIPLIER = 4;
@@ -148,12 +149,13 @@ public class DeviceProfile {
     public int folderChildDrawablePaddingPx;
 
     // Hotseat
+    public int hotseatBarSizeExtraSpacePx;
     public final int numShownHotseatIcons;
     public int hotseatCellHeightPx;
     private final int hotseatExtraVerticalSize;
     // In portrait: size = height, in landscape: size = width
     public int hotseatBarSizePx;
-    public final int hotseatBarTopPaddingPx;
+    public int hotseatBarTopPaddingPx;
     public final int hotseatBarBottomPaddingPx;
     // Start is the side next to the nav bar, end is the side next to the workspace
     public final int hotseatBarSidePaddingStartPx;
@@ -322,6 +324,7 @@ public class DeviceProfile {
                 isTwoPanels ? inv.numDatabaseHotseatIcons : inv.numShownHotseatIcons;
         numShownAllAppsColumns =
                 isTwoPanels ? inv.numDatabaseAllAppsColumns : inv.numAllAppsColumns;
+        hotseatBarSizeExtraSpacePx = 0;
         hotseatBarTopPaddingPx =
                 res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_top_padding);
         hotseatBarBottomPaddingPx = (isTallDevice ? 0
@@ -352,6 +355,7 @@ public class DeviceProfile {
 
         // Calculate all of the remaining variables.
         extraSpace = updateAvailableDimensions(res);
+
         // Now that we have all of the variables calculated, we can tune certain sizes.
         if (isScalableGrid && inv.devicePaddings != null) {
             // Paddings were created assuming no scaling, so we first unscale the extra space.
@@ -371,12 +375,25 @@ public class DeviceProfile {
             qsbBottomMarginPx = Math.round(qsbBottomMarginOriginalPx * cellScaleToFit);
         } else if (!isVerticalBarLayout() && isPhone && isTallDevice) {
             // We increase the hotseat size when there is extra space.
-            // ie. For a display with a large aspect ratio, we can keep the icons on the workspace
-            // in portrait mode closer together by adding more height to the hotseat.
-            // Note: This calculation was created after noticing a pattern in the design spec.
-            int extraSpace = getCellSize().y - iconSizePx - iconDrawablePaddingPx * 2
-                    - workspacePageIndicatorHeight;
-            hotseatBarSizePx += extraSpace;
+
+            if (Float.compare(aspectRatio, TALLER_DEVICE_ASPECT_RATIO_THRESHOLD) >= 0) {
+                // For taller devices, we will take a third of the extra space from each row,
+                // and add it to the space above and below the hotseat.
+                int extraSpace = ((getCellSize().y - iconSizePx - iconDrawablePaddingPx * 2)
+                        * inv.numRows) / 3;
+
+                int halfExtraSpace = extraSpace / 2;
+                hotseatBarTopPaddingPx += halfExtraSpace;
+                hotseatBarSizeExtraSpacePx = halfExtraSpace;
+            } else {
+                // ie. For a display with a large aspect ratio, we can keep the icons on the
+                // workspace in portrait mode closer together by adding more height to the hotseat.
+                // Note: This calculation was created after noticing a pattern in the design spec.
+                hotseatBarSizeExtraSpacePx = getCellSize().y - iconSizePx
+                        - iconDrawablePaddingPx * 2 - workspacePageIndicatorHeight;
+            }
+
+            updateHotseatIconSize(iconSizePx);
 
             // Recalculate the available dimensions using the new hotseat size.
             updateAvailableDimensions(res);
@@ -400,7 +417,8 @@ public class DeviceProfile {
                     + hotseatBarSidePaddingEndPx;
         } else {
             hotseatBarSizePx = hotseatIconSizePx + hotseatBarTopPaddingPx
-                    + hotseatBarBottomPaddingPx + (isScalableGrid ? 0 : hotseatExtraVerticalSize);
+                    + hotseatBarBottomPaddingPx + (isScalableGrid ? 0 : hotseatExtraVerticalSize)
+                    + hotseatBarSizeExtraSpacePx;
         }
     }
 
-- 
GitLab


From 818238558a876287d7213614b65e4610d8d7b64b Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sat, 24 Jul 2021 03:05:08 +0000
Subject: [PATCH 1642/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I47acd077e560f94d070da5dd2c9b66ac07950e49
---
 quickstep/res/values-ar/strings.xml        |  2 +-
 quickstep/res/values-b+sr+Latn/strings.xml |  6 +++---
 quickstep/res/values-be/strings.xml        |  4 ++--
 quickstep/res/values-bg/strings.xml        | 10 ++++-----
 quickstep/res/values-bn/strings.xml        |  4 ++--
 quickstep/res/values-bs/strings.xml        |  6 +++---
 quickstep/res/values-ca/strings.xml        |  2 +-
 quickstep/res/values-da/strings.xml        |  2 +-
 quickstep/res/values-de/strings.xml        |  4 ++--
 quickstep/res/values-el/strings.xml        |  2 +-
 quickstep/res/values-en-rAU/strings.xml    |  2 +-
 quickstep/res/values-en-rCA/strings.xml    |  2 +-
 quickstep/res/values-en-rGB/strings.xml    |  2 +-
 quickstep/res/values-en-rIN/strings.xml    |  2 +-
 quickstep/res/values-et/strings.xml        |  6 +++---
 quickstep/res/values-eu/strings.xml        |  2 +-
 quickstep/res/values-fa/strings.xml        |  2 +-
 quickstep/res/values-fr/strings.xml        |  6 +++---
 quickstep/res/values-hi/strings.xml        |  2 +-
 quickstep/res/values-hr/strings.xml        |  2 +-
 quickstep/res/values-it/strings.xml        |  4 ++--
 quickstep/res/values-kn/strings.xml        |  4 ++--
 quickstep/res/values-ky/strings.xml        | 24 +++++++++++-----------
 quickstep/res/values-ml/strings.xml        |  4 ++--
 quickstep/res/values-my/strings.xml        |  2 +-
 quickstep/res/values-ne/strings.xml        |  2 +-
 quickstep/res/values-nl/strings.xml        |  4 ++--
 quickstep/res/values-or/strings.xml        |  2 +-
 quickstep/res/values-pa/strings.xml        |  2 +-
 quickstep/res/values-pl/strings.xml        | 10 ++++-----
 quickstep/res/values-pt-rPT/strings.xml    |  8 ++++----
 quickstep/res/values-ro/strings.xml        |  8 ++++----
 quickstep/res/values-sk/strings.xml        |  6 +++---
 quickstep/res/values-sl/strings.xml        |  6 +++---
 quickstep/res/values-sr/strings.xml        |  6 +++---
 quickstep/res/values-sv/strings.xml        |  6 +++---
 quickstep/res/values-sw/strings.xml        |  4 ++--
 quickstep/res/values-te/strings.xml        |  6 +++---
 quickstep/res/values-tl/strings.xml        |  2 +-
 quickstep/res/values-tr/strings.xml        |  6 +++---
 quickstep/res/values-uk/strings.xml        |  4 ++--
 quickstep/res/values-uz/strings.xml        |  4 ++--
 quickstep/res/values-zh-rCN/strings.xml    |  4 ++--
 quickstep/res/values-zh-rHK/strings.xml    |  2 +-
 44 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/quickstep/res/values-ar/strings.xml b/quickstep/res/values-ar/strings.xml
index 05f76074ab..64fe3828d1 100644
--- a/quickstep/res/values-ar/strings.xml
+++ b/quickstep/res/values-ar/strings.xml
@@ -81,7 +81,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"لقطة شاشة"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"لا يسمح التطبيق أو لا تسمح مؤسستك بهذا الإجراء."</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"هل تريد تخطي الدليل التوجيهي؟"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"يمكنك العثور على هذا الدليل التوجيهي لاحقًا في التطبيق <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"يمكنك العثور على هذا الدليل التوجيهي لاحقًا في التطبيق \"<xliff:g id="NAME">%1$s</xliff:g>\""</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"إلغاء"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"التخطي"</string>
 </resources>
diff --git a/quickstep/res/values-b+sr+Latn/strings.xml b/quickstep/res/values-b+sr+Latn/strings.xml
index 63de0e1b1a..bde409f422 100644
--- a/quickstep/res/values-b+sr+Latn/strings.xml
+++ b/quickstep/res/values-b+sr+Latn/strings.xml
@@ -47,11 +47,11 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Predviđamo aplikaciju: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Obavezno prevucite od same desne ili leve ivice."</string>
     <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Obavezno prevucite od desne ili leve ivice do sredine ekrana i otpustite."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Naučili ste kako da prevlačite zdesna da biste se vratili. Sada naučite da menjate aplikacije."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Naučili ste kako da prevlačite zdesna da biste se vratili unazad. Sada naučite da zamenite aplikacije."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Dovršili ste pokret za povratak."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Nikako ne prevlačite previše blizu dna ekrana."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Osetljivost pok. za nazad možete da promenite u Podešavanjima"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Prevucite da biste se vratili"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Prevucite da biste se vratili unazad"</string>
     <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Da biste se vratili na poslednji ekran, prevucite od leve ili desne ivice do sredine ekrana."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Obavezno prevucite nagore od donje ivice ekrana."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Nikako ne stajte pre otpuštanja."</string>
@@ -65,7 +65,7 @@
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Obavezno prevucite pravo nagore, pa zastanite."</string>
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Naučili ste kako da koristite pokrete. Da biste isključili pokrete, idite na podešavanja."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Dovršili ste pokret za promenu aplikacija."</string>
-    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Prevucite da biste promenili aplikacije"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Prevucite da biste zamenili aplikacije"</string>
     <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Za prelazak sa jedne aplikacije na drugu prevucite nagore od dna ekrana, zadržite, pa pustite."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"To je to"</string>
     <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Gotovo"</string>
diff --git a/quickstep/res/values-be/strings.xml b/quickstep/res/values-be/strings.xml
index 3151c27311..8e57bd8ce3 100644
--- a/quickstep/res/values-be/strings.xml
+++ b/quickstep/res/values-be/strings.xml
@@ -58,14 +58,14 @@
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Пераканайцеся, што праводзіце пальцам вертыкальна."</string>
     <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Вы навучыліся рабіць жэст пераходу на галоўны экран. А зараз даведайцеся, як вярнуцца назад."</string>
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Вы навучыліся рабіць жэст пераходу на галоўны экран."</string>
-    <string name="home_gesture_intro_title" msgid="836590312858441830">"Правесці пальцам для пераходу на галоўны экран"</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Правядзіце пальцам для пераходу на галоўны экран"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Правядзіце пальцам па экране знізу ўверх. Гэты жэст дазваляе вярнуцца на Галоўны экран."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Пераканайцеся, што праводзіце пальцам па экране знізу ўверх."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Перш чым адпусціць палец, паспрабуйце даўжэй утрымліваць акно націснутым."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Пераканайцеся, што праводзіце пальцам вертыкальна, а потым затрымліваеце яго."</string>
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Вы навучыліся выкарыстоўваць жэсты. Каб выключыць жэсты, адкрыйце Налады."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Вы навучыліся рабіць жэст пераключэння паміж праграмамі."</string>
-    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Правесці пальцам для пераключэння паміж праграмамі"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Правядзіце пальцам для пераключэння паміж праграмамі"</string>
     <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Каб пераключыцца на іншую праграму, правядзіце па экране знізу ўверх, патрымайце палец і адпусціце."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Гатова"</string>
     <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Гатова"</string>
diff --git a/quickstep/res/values-bg/strings.xml b/quickstep/res/values-bg/strings.xml
index 37a2e57c09..7305d9d1f4 100644
--- a/quickstep/res/values-bg/strings.xml
+++ b/quickstep/res/values-bg/strings.xml
@@ -51,22 +51,22 @@
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Изпълнихте жеста за връщане назад."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Не прекарвайте пръст твърде близо до долната част на екрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Променете чувств. на жеста за връщане назад от настройките"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Прекарване на пръст за връщане назад"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Жест за връщане назад"</string>
     <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"За да се върнете на предишния екран, прекарайте пръст от левия или десния край на екрана до средата."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Трябва да прекарате пръст нагоре от долния край на екрана."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Не задържайте, преди да вдигнете пръста си."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Трябва да прекарате пръст право нагоре."</string>
-    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Изпълнихте жеста за преминаване към началния екран. В следващия урок ще научите как се връща назад."</string>
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Изпълнихте жеста за преминаване към началния екран. В следващия урок ще научите как да се върнете назад."</string>
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Изпълнихте жеста за преминаване към началния екран."</string>
-    <string name="home_gesture_intro_title" msgid="836590312858441830">"Прекарване на пръст за преминаване към началния екран"</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Жест за преминаване към началния екран"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Прекарайте пръст нагоре от долната част на екрана. Този жест винаги ще ви отвежда до началния екран."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Трябва да прекарате пръст нагоре от долния край на екрана."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Задръжте прозореца по-дълго, преди да вдигнете пръста си."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Прекарайте пръст право нагоре, след което задръжте."</string>
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Научихте как да използвате жестовете. За да ги изключите, отворете настройките."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Изпълнихте жеста за превключване между приложения."</string>
-    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Прекарване на пръст за превключване между приложенията"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"За да превкл. между прил., прекарайте пръст нагоре от долната част на екрана, задръжте и освободете"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Жест за превключване между приложенията"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"За превключване прекарайте пръст нагоре от долната част на екрана, задръжте и освободете"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Готово"</string>
     <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Готово"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Настройки"</string>
diff --git a/quickstep/res/values-bn/strings.xml b/quickstep/res/values-bn/strings.xml
index 90545e1577..1d0b45fe59 100644
--- a/quickstep/res/values-bn/strings.xml
+++ b/quickstep/res/values-bn/strings.xml
@@ -47,7 +47,7 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"আপনার প্রয়োজন হতে পারে এমন অ্যাপ: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"স্ক্রিনের একেবারে ডান বা বাঁদিকের প্রান্ত থেকে সোয়াইপ করেছেন কিনা তা দেখে নিন।"</string>
     <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"স্ক্রিনের ডান বা বাঁদিকের প্রান্ত থেকে মাঝখান পর্যন্ত সোয়াইপ করে আঙুল তুলে নিয়েছেন কিনা তা দেখে নিন।"</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ফিরে যেতে, কীভাবে ডান দিক থেকে সোয়াইপ করতে হয় তা আপনি শিখেছেন। এরপর, একটি অ্যাপ থেকে অন্য অ্যাপে কীভাবে যাবেন জেনে নিন।"</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ফিরে যেতে, কীভাবে ডানদিক থেকে সোয়াইপ করতে হয় তা আপনি শিখেছেন। এরপর, একটি অ্যাপ থেকে অন্য অ্যাপে কীভাবে যাবেন জেনে নিন।"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"আপনি ফিরে যাওয়ার জেসচার সম্পর্কে জেনেছেন।"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"স্ক্রিনের নিচের প্রান্তের খুব কাছে পর্যন্ত যাতে সোয়াইপ না করেন সেটি ভাল করে দেখে নিন।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ফিরে যাওয়ার জেসচারের সেন্সিটিভিটি পরিবর্তন করতে, সেটিংসে যান"</string>
@@ -63,7 +63,7 @@
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"স্ক্রিনের নিচের প্রান্ত থেকে আপনি সোয়াইপ করেছেন কিনা ভাল করে দেখে নিন।"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"চেষ্টা করুন যাতে আঙুল সরিয়ে নেওয়ার আগে উইন্ডো কিছুক্ষণ প্রেস করে রাখা যায়।"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"আপনি উপরের দিকে সোজাসুজি সোয়াইপ করেছেন কিনা ভাল করে দেখে নিয়ে তারপর পজ করুন।"</string>
-    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"ইঙ্গিত কীভাবে ব্যবহার করতে হয় আপনি তা শিখে ফেলেছেন। ইঙ্গিত বন্ধ করতে, সেটিংসে যান।"</string>
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"জেসচার কীভাবে ব্যবহার করতে হয় আপনি তা শিখে ফেলেছেন। জেসচার বন্ধ করতে, সেটিংসে যান।"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"আপনি একটি অ্যাপ থেকে অন্য অ্যাপে যাওয়ার জেসচার সম্পর্কে জেনেছেন।"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"একটি অ্যাপ থেকে অন্য অ্যাপে যেতে সোয়াইপ করুন"</string>
     <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"একটি অ্যাপ থেকে অন্যটিতে পাল্টাতে, স্ক্রিনের নিচ থেকে উপরে সোয়াইপ করে ধরে রাখুন, তারপরে ছেড়ে দিন।"</string>
diff --git a/quickstep/res/values-bs/strings.xml b/quickstep/res/values-bs/strings.xml
index 7e63a67d3c..acd7b1003a 100644
--- a/quickstep/res/values-bs/strings.xml
+++ b/quickstep/res/values-bs/strings.xml
@@ -56,10 +56,10 @@
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Trebate prevući prema gore s donjeg ruba ekrana."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Obratite pažnju da ne zastanete prije puštanja."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Trebate prevući ravno prema gore."</string>
-    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Završili ste pokret za otvaranje Početnog ekrana. Sljedeće naučite kako se vratiti."</string>
-    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Završili ste pokret za otvaranje Početnog ekrana."</string>
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Završili ste pokret za otvaranje početnog ekrana. Sljedeće naučite kako se vratiti."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Završili ste pokret za otvaranje početnog ekrana."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Prevucite da odete na početni ekran"</string>
-    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Prevucite s dna ekrana prema gore. Tim pokretom uvijek idete na Početni ekran."</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Prevucite s dna ekrana prema gore. Tim pokretom uvijek idete na početni ekran."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Trebate prevući prema gore s donjeg ruba ekrana."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Pokušajte zadržati prozor duže prije puštanja."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Trebate prevući ravno prema gore, a zatim zastati."</string>
diff --git a/quickstep/res/values-ca/strings.xml b/quickstep/res/values-ca/strings.xml
index 9fe61c79fe..a0d6aeed4f 100644
--- a/quickstep/res/values-ca/strings.xml
+++ b/quickstep/res/values-ca/strings.xml
@@ -81,7 +81,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Captura de pantalla"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"L\'aplicació o la teva organització no permeten aquesta acció"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Vols ometre el tutorial de navegació?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Pots trobar-ho més tard a l\'aplicació <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Pots trobar-lo més tard a l\'aplicació <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Cancel·la"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Omet"</string>
 </resources>
diff --git a/quickstep/res/values-da/strings.xml b/quickstep/res/values-da/strings.xml
index aa3df34bc4..f2e2df02ec 100644
--- a/quickstep/res/values-da/strings.xml
+++ b/quickstep/res/values-da/strings.xml
@@ -56,7 +56,7 @@
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Stryg opad fra bunden af skærmen."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Undlad at holde fingeren stille, indtil du løfter fingeren."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Stryg lige opad."</string>
-    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Du har fuldført bevægelsen for Gå til startskærmen. Som det næste kan du se, hvordan du går til startskærmen."</string>
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Du har fuldført bevægelsen for Gå til startskærmen. Som det næste kan du se, hvordan du går tilbage."</string>
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Du har fuldført bevægelsen for Gå til startskærmen."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Stryg for at gå til startskærmen"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Stryg opad fra bunden af skærmen. Denne bevægelse åbner altid startskærmen."</string>
diff --git a/quickstep/res/values-de/strings.xml b/quickstep/res/values-de/strings.xml
index 483f362e70..4a023e35cb 100644
--- a/quickstep/res/values-de/strings.xml
+++ b/quickstep/res/values-de/strings.xml
@@ -56,7 +56,7 @@
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Wische vom unteren Displayrand nach oben."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Achte darauf, nicht innezuhalten, bevor du loslässt."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Wische gerade nach oben."</string>
-    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Du hast die „Startbildschirm“-Touch-Geste abgeschlossen. Gleich lernst du, wie du zurückgelangst."</string>
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Du hast die „Startbildschirm“-Touch-Geste abgeschlossen. Gleich erfährst du, wie du zurückgelangst."</string>
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Du hast die „Startbildschirm“-Touch-Geste abgeschlossen."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Zum Startbildschirm gehen"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Wenn du zum Startbildschirm gehen möchtest, wische einfach vom unteren Displayrand nach oben."</string>
@@ -81,7 +81,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Die App oder deine Organisation lässt diese Aktion nicht zu"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Navigationstutorial überspringen?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Das findest du später in der <xliff:g id="NAME">%1$s</xliff:g> App"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Du findest es später auch in der <xliff:g id="NAME">%1$s</xliff:g> App"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Abbrechen"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Überspringen"</string>
 </resources>
diff --git a/quickstep/res/values-el/strings.xml b/quickstep/res/values-el/strings.xml
index 352d10e711..7243e039ab 100644
--- a/quickstep/res/values-el/strings.xml
+++ b/quickstep/res/values-el/strings.xml
@@ -75,7 +75,7 @@
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Οδηγός <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Όλα έτοιμα!"</string>
     <string name="allset_hint" msgid="2384632994739392447">"Σύρετε προς τα πάνω για μετάβαση στην αρχική οθόνη."</string>
-    <string name="allset_description" msgid="6350320429953234580">"Είστε έτοιμοι να ξεκινήστε να χρησιμοποιείτε το τηλέφωνό σας"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Είστε έτοιμοι να ξεκινήσετε να χρησιμοποιείτε το τηλέφωνό σας"</string>
     <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Ρυθμίσεις πλοήγησης συστήματος"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Κοινοποίηση"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Στιγμιότυπο οθόνης"</string>
diff --git a/quickstep/res/values-en-rAU/strings.xml b/quickstep/res/values-en-rAU/strings.xml
index ed7debceb1..7b42aace1f 100644
--- a/quickstep/res/values-en-rAU/strings.xml
+++ b/quickstep/res/values-en-rAU/strings.xml
@@ -63,7 +63,7 @@
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Try holding the window for longer before releasing."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Make sure that you swipe straight up, then pause."</string>
-    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"You learned how to use gestures. To turn off gestures, go to settings."</string>
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"You learned how to use gestures. To turn off gestures, go to Settings."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"You completed the switch apps gesture."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe to switch apps"</string>
     <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"To switch between apps, swipe up from the bottom of your screen, hold, then release."</string>
diff --git a/quickstep/res/values-en-rCA/strings.xml b/quickstep/res/values-en-rCA/strings.xml
index ed7debceb1..7b42aace1f 100644
--- a/quickstep/res/values-en-rCA/strings.xml
+++ b/quickstep/res/values-en-rCA/strings.xml
@@ -63,7 +63,7 @@
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Try holding the window for longer before releasing."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Make sure that you swipe straight up, then pause."</string>
-    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"You learned how to use gestures. To turn off gestures, go to settings."</string>
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"You learned how to use gestures. To turn off gestures, go to Settings."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"You completed the switch apps gesture."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe to switch apps"</string>
     <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"To switch between apps, swipe up from the bottom of your screen, hold, then release."</string>
diff --git a/quickstep/res/values-en-rGB/strings.xml b/quickstep/res/values-en-rGB/strings.xml
index ed7debceb1..7b42aace1f 100644
--- a/quickstep/res/values-en-rGB/strings.xml
+++ b/quickstep/res/values-en-rGB/strings.xml
@@ -63,7 +63,7 @@
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Try holding the window for longer before releasing."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Make sure that you swipe straight up, then pause."</string>
-    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"You learned how to use gestures. To turn off gestures, go to settings."</string>
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"You learned how to use gestures. To turn off gestures, go to Settings."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"You completed the switch apps gesture."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe to switch apps"</string>
     <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"To switch between apps, swipe up from the bottom of your screen, hold, then release."</string>
diff --git a/quickstep/res/values-en-rIN/strings.xml b/quickstep/res/values-en-rIN/strings.xml
index ed7debceb1..7b42aace1f 100644
--- a/quickstep/res/values-en-rIN/strings.xml
+++ b/quickstep/res/values-en-rIN/strings.xml
@@ -63,7 +63,7 @@
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Make sure that you swipe up from the bottom edge of the screen."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Try holding the window for longer before releasing."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Make sure that you swipe straight up, then pause."</string>
-    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"You learned how to use gestures. To turn off gestures, go to settings."</string>
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"You learned how to use gestures. To turn off gestures, go to Settings."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"You completed the switch apps gesture."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe to switch apps"</string>
     <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"To switch between apps, swipe up from the bottom of your screen, hold, then release."</string>
diff --git a/quickstep/res/values-et/strings.xml b/quickstep/res/values-et/strings.xml
index 6145562769..74b75281ab 100644
--- a/quickstep/res/values-et/strings.xml
+++ b/quickstep/res/values-et/strings.xml
@@ -58,14 +58,14 @@
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pühkige kindlasti otse üles."</string>
     <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Tegite avakuvale minemise liigutuse. Järgmisena vaadake, kuidas minna tagasi."</string>
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Tegite avakuvale minemise liigutuse."</string>
-    <string name="home_gesture_intro_title" msgid="836590312858441830">"Pühkimine avakuvale minemiseks"</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Pühkige avakuvale minemiseks"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Pühkige ekraani alaosast üles. See liigutus viib teid alati tagasi avakuvale."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Pühkige kindlasti ekraanikuva alumisest servast üles."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Hoidke sõrme aknal pisut kauem, enne kui vabastate."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Pühkige kindlasti otse üles, seejärel peatuge."</string>
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Õppisite liigutusi kasutama. Liigutuste väljalülitamiseks avage seaded."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Tegite rakenduste vahel vahetamise liigutuse."</string>
-    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Rakenduste vahel vahetamiseks pühkimine"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Pühkige rakenduste vahetamiseks"</string>
     <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Rakenduste vahel vahetamiseks pühkige ekraanikuva alaosast üles, hoidke ja seejärel vabastage."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Valmis"</string>
     <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Valmis"</string>
@@ -75,7 +75,7 @@
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Õpetus <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Valmis!"</string>
     <string name="allset_hint" msgid="2384632994739392447">"Avakuvale liikumiseks pühkige üles"</string>
-    <string name="allset_description" msgid="6350320429953234580">"Olete valmis oma telefoni kasutama"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Olete valmis oma telefoni kasutama."</string>
     <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Süsteemi navigeerimisseaded"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Jaga"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Ekraanipilt"</string>
diff --git a/quickstep/res/values-eu/strings.xml b/quickstep/res/values-eu/strings.xml
index 3b7d3672af..bd016e9384 100644
--- a/quickstep/res/values-eu/strings.xml
+++ b/quickstep/res/values-eu/strings.xml
@@ -81,7 +81,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"Atera pantaila-argazki bat"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikazioak edo erakundeak ez du eman ekintza hori gauzatzeko baimena"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Nabigazio-tutoriala saltatu nahi duzu?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Tutorial hau <xliff:g id="NAME">%1$s</xliff:g> aplikazioan aurki dezakezu geroago"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"<xliff:g id="NAME">%1$s</xliff:g> aplikazioan dago eskuragarri tutoriala"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Utzi"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Saltatu"</string>
 </resources>
diff --git a/quickstep/res/values-fa/strings.xml b/quickstep/res/values-fa/strings.xml
index d1e849fa7d..ae260eda70 100644
--- a/quickstep/res/values-fa/strings.xml
+++ b/quickstep/res/values-fa/strings.xml
@@ -65,7 +65,7 @@
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"دقت کنید که مستقیماً تند به بالا بکشید و سپس توقف کنید."</string>
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"با نحوه استفاده از اشاره‌ها آشنا شدید. برای خاموش کردن اشاره‌ها، به «تنظیمات» بروید."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"اشاره جابه‌جا شدن بین برنامه‌ها را تکمیل کردید."</string>
-    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"تند کشیدن برای جابه‌جا شدن بین برنامه‌ها"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"برای جابه‌جا شدن بین برنامه‌ها، تند به‌بالا بکشید"</string>
     <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"برای جابه‌جا شدن بین برنامه‌ها، از پایین صفحه تند به‌بالا بکشید، نگه دارید، و سپس رها کنید."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"همه چیز آماده است"</string>
     <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"تمام"</string>
diff --git a/quickstep/res/values-fr/strings.xml b/quickstep/res/values-fr/strings.xml
index dca9705689..7e2e957d80 100644
--- a/quickstep/res/values-fr/strings.xml
+++ b/quickstep/res/values-fr/strings.xml
@@ -47,7 +47,7 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Application prédite : <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Veillez à bien balayer l\'écran depuis le bord gauche ou droit."</string>
     <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Balayez bien l\'écran depuis le bord gauche ou droit jusqu\'au centre avant de relever le doigt."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Vous avez appris à balayer depuis droite pour revenir en arrière. Apprenez à passer d\'une appli à l\'autre."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Vous savez revenir en arrière en balayant depuis la droite. Apprenez à passer d\'une appli à l\'autre."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Vous avez appris le geste pour revenir en arrière."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Veillez à ne pas balayer l\'écran trop près du bas."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Modifiez la sensibilité du geste retour dans les paramètres"</string>
@@ -56,7 +56,7 @@
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Veillez à balayer l\'écran du bas vers le haut."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Veillez à ne pas marquer de pause dans votre geste avant de relever le doigt."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Veillez à balayer l\'écran vers le haut."</string>
-    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Vous avez appris le geste pour revenir à l\'écran d\'accueil. Apprenez ensuite à revenir en arrière."</string>
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Vous savez désormais revenir à l\'écran d\'accueil. Apprenez maintenant à revenir en arrière."</string>
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Vous avez appris le geste pour revenir à l\'écran d\'accueil."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Balayer pour revenir à l\'écran d\'accueil"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Balayez l\'écran de bas en haut. Ce geste vous ramènera toujours à l\'écran d\'accueil."</string>
@@ -75,7 +75,7 @@
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutoriel <xliff:g id="CURRENT">%1$d</xliff:g> sur <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Tout est prêt !"</string>
     <string name="allset_hint" msgid="2384632994739392447">"Balayez l\'écran vers le haut pour revenir à l\'accueil"</string>
-    <string name="allset_description" msgid="6350320429953234580">"Vous êtes prêt à utiliser votre téléphone"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Vous pouvez maintenant utiliser votre téléphone"</string>
     <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Paramètres de navigation système"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Partager"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Capture d\'écran"</string>
diff --git a/quickstep/res/values-hi/strings.xml b/quickstep/res/values-hi/strings.xml
index 23ffad3d89..44f2f1594f 100644
--- a/quickstep/res/values-hi/strings.xml
+++ b/quickstep/res/values-hi/strings.xml
@@ -81,7 +81,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"स्क्रीनशॉट लें"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"ऐप्लिकेशन या आपका संगठन इस कार्रवाई की अनुमति नहीं देता"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"नेविगेशन ट्यूटोरियल छोड़ना चाहते हैं?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"आप बाद में, <xliff:g id="NAME">%1$s</xliff:g> ऐप्लिकेशन पर इसे देख सकते हैं"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"आप बाद में <xliff:g id="NAME">%1$s</xliff:g> ऐप्लिकेशन पर इसे देख सकते हैं"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"अभी नहीं"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"छोड़ें"</string>
 </resources>
diff --git a/quickstep/res/values-hr/strings.xml b/quickstep/res/values-hr/strings.xml
index 5ab1a87bf3..50efb74aab 100644
--- a/quickstep/res/values-hr/strings.xml
+++ b/quickstep/res/values-hr/strings.xml
@@ -65,7 +65,7 @@
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Pazite da prijeđete prstom ravno prema gore, a zatim zastanete."</string>
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Naučili ste koristiti pokrete. Pokrete možete isključiti u postavkama."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Izvršili ste pokret za promjenu aplikacije."</string>
-    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Prijeđite prstom da biste promijenili aplikaciju"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Povlačenje prstom za promjenu aplikacije"</string>
     <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Za promjenu aplikacije prijeđite prstom od dna zaslona prema gore, zadržite pritisak pa pustite."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Sve je spremno"</string>
     <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Gotovo"</string>
diff --git a/quickstep/res/values-it/strings.xml b/quickstep/res/values-it/strings.xml
index 43a210b9de..5a33a38161 100644
--- a/quickstep/res/values-it/strings.xml
+++ b/quickstep/res/values-it/strings.xml
@@ -56,10 +56,10 @@
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Assicurati di scorrere verso l\'alto dal bordo inferiore dello schermo."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Assicurati di non fare pause prima di sollevare il dito."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Assicurati di scorrere verso l\'alto senza fermarti."</string>
-    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Hai completato il gesto Vai alla schermata Home. Ora, impara come tornare indietro."</string>
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Hai completato il gesto per andare alla schermata Home. Ora, impara come tornare indietro."</string>
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Hai completato il gesto Vai alla schermata Home."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Scorri per andare alla schermata Home"</string>
-    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Scorri verso l\'alto dalla parte inferiore dello schermo; così arrivi sempre alla schermata Home."</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Scorri verso l\'alto dalla parte inferiore dello schermo. Questo gesto ti porta sempre alla schermata Home."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Assicurati di scorrere verso l\'alto dal bordo inferiore dello schermo."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Prova a tenere premuta la finestra più a lungo prima di rilasciarla."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Assicurati di scorrere verso l\'alto senza fermarti, poi fai una pausa."</string>
diff --git a/quickstep/res/values-kn/strings.xml b/quickstep/res/values-kn/strings.xml
index e0297ce110..9b981c2b58 100644
--- a/quickstep/res/values-kn/strings.xml
+++ b/quickstep/res/values-kn/strings.xml
@@ -63,10 +63,10 @@
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಗಿನ ಅಂಚಿನಿಂದ ನೀವು ಸ್ವೈಪ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"ಬೆರಳನ್ನು ಮೇಲೆತ್ತುವ ಮೊದಲು ವಿಂಡೋವನ್ನು ಹೆಚ್ಚು ಸಮಯ ಹಿಡಿದಿಡಲು ಪ್ರಯತ್ನಿಸಿ."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"ನೀವು ನೇರವಾಗಿ ಸ್ವೈಪ್ ಮಾಡಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ, ನಂತರ ವಿರಾಮಗೊಳಿಸಿ."</string>
-    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"ಗೆಸ್ಚರ್‌ಗಳನ್ನು ಬಳಕೆಯನ್ನು ನೀವು ತಿಳಿದುಕೊಂಡಿರುವಿರಿ. ಗೆಸ್ಚರ್‌ಗಳನ್ನು ಆಫ್ ಮಾಡಲು, ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಹೋಗಿ."</string>
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"ಗೆಶ್ಚರ್‌ಗಳನ್ನು ಬಳಸುವುದು ಹೇಗೆಂದು ನೀವು ತಿಳಿದುಕೊಂಡಿರುವಿರಿ. ಗೆಶ್ಚರ್‌ಗಳನ್ನು ಆಫ್ ಮಾಡಲು, ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಹೋಗಿ."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"ನೀವು ಆ್ಯಪ್‌ಗಳನ್ನು ಬದಲಾಯಿಸುವ ಗೆಸ್ಚರ್ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದ್ದೀರಿ."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ಆ್ಯಪ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಲು ಸ್ವೈಪ್ ಮಾಡಿ"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"ಆ್ಯಪ್‌ಗಳನ್ನು ಬದಲಿಸಲು, ನಿಮ್ಮ ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಭಾಗದಿಂದ ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ, ಹೋಲ್ಡ್ ಮಾಡಿ, ನಂತರ ಬಿಟ್ಟುಬಿಡಿ."</string>
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"ಆ್ಯಪ್‌ಗಳ ನಡುವೆ ಬದಲಿಸಲು, ನಿಮ್ಮ ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಭಾಗದಿಂದ ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ, ಹಿಡಿದಿಟ್ಟುಕೊಳ್ಳಿ, ನಂತರ ಬಿಟ್ಟುಬಿಡಿ."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"ಸಂಪೂರ್ಣ ಸಿದ್ಧವಾಗಿದೆ"</string>
     <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"ಮುಗಿದಿದೆ"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
diff --git a/quickstep/res/values-ky/strings.xml b/quickstep/res/values-ky/strings.xml
index 220559252e..8be5c53f9a 100644
--- a/quickstep/res/values-ky/strings.xml
+++ b/quickstep/res/values-ky/strings.xml
@@ -48,23 +48,23 @@
     <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Экранды эң четинен оңдон солго же солдон оңго карай сүрүңүз."</string>
     <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Экранды оң же сол жагынан ортосуна карай сүрүп, манжаңызды алыңыз."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Артка кайтуу үчүн экранды оңдон солго карай сүрүүнү үйрөндүңүз. Эми колдонмолорду которуштурганды үйрөнүп алыңыз."</string>
-    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"\"Артка\" жаңсоосу боюнча үйрөткүчтү бүтүрдүңүз."</string>
+    <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"\"Артка\" жаңсоосун үйрөндүңүз."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Манжаңызды экрандын ылдый жагына өтө жакындатпай сүрүңүз."</string>
-    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"\"Артка\" жаң-нун сезгичтигин өзгөртүү үчүн Жөндөөлөргө өтүңүз"</string>
+    <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"\"Артка\" жаң-нун сезгичтигин өзгөртүү үчүн жөндөөлөргө өтүңүз"</string>
     <string name="back_gesture_intro_title" msgid="19551256430224428">"Артка кайтуу үчүн сүрүңүз"</string>
     <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Акыркы экранга кайтуу үчүн экранды сол же оң жагынан ортосуна карай сүрүңүз."</string>
-    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Экранды ылдыйдан өйдө карай сүрүңүз."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Экранды ылдыйдан өйдө сүрүңүз."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Манжаңызды алганга чейин токтотпоңуз."</string>
-    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Экранды өйдө карай сүрүңүз."</string>
-    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"\"Башкы бетке өтүү\" жаңсоосу боюнча үйрөткүчтү бүтүрдүңүз. Эми артка кайтууну үйрөнүп алыңыз."</string>
-    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"\"Башкы бетке өтүү\" жаңсоосу боюнча үйрөткүчтү бүтүрдүңүз."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Экранды өйдө сүрүңүз."</string>
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"\"Башкы бетке өтүү\" жаңсоосун үйрөндүңүз. Эми артка кайтууну үйрөнүп алыңыз."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"\"Башкы бетке өтүү\" жаңсоосун үйрөндүңүз."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Башкы бетке өтүү үчүн сүрүп коюңуз"</string>
-    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Экранды ылдый жагынан өйдө карай сүрүңүз. Бул жаңсоо сизди ар дайым Башкы экранга алып барат."</string>
-    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Экранды ылдыйдан өйдө карай сүрүңүз."</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Экранды ылдый жагынан өйдө сүрүңүз. Бул жаңсоо сизди ар дайым Башкы экранга алып барат."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Экранды ылдыйдан өйдө сүрүңүз."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Манжаңызды алуудан мурун экранда узагыраак кармаңыз."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Экранды өйдө карай сүрүп, токтоп туруңуз."</string>
-    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Жаңсоолорду колдонгонду үйрөндүңүз. Жаңсоолорду өчүрүү үчүн Жөндөөлөргө өтүңүз."</string>
-    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"\"Колдонмолорду которуштуруу\" жаңсоосу боюнча үйрөткүчтү бүтүрдүңүз."</string>
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Жаңсоолорду колдонгонду үйрөндүңүз. Жаңсоолорду өчүрүү үчүн жөндөөлөргө өтүңүз."</string>
+    <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"\"Колдонмолорду которуштуруу\" жаңсоосун үйрөндүңүз."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Колдонмолорду которуштуруу үчүн сүрүңүз"</string>
     <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Бир колдонмодон экинчисине өтүү үчүн экранды ылдыйдан өйдө карай сүрүп, бир аз коё бербей туруңуз."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Дапдаяр!"</string>
@@ -75,12 +75,12 @@
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Үйрөткүч: <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Бүттү!"</string>
     <string name="allset_hint" msgid="2384632994739392447">"Башкы бетке өтүү үчүн экранды өйдө сүрүңүз"</string>
-    <string name="allset_description" msgid="6350320429953234580">"Телефонуңузду колдонуп баштоого даярсыз"</string>
+    <string name="allset_description" msgid="6350320429953234580">"Телефонуңузду колдоно берсеңиз болот"</string>
     <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Өтүү аракетинин тутумдук жөндөөлөрү"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Бөлүшүү"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Скриншот"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Бул аракетти аткарууга колдонмо же ишканаңыз тыюу салган"</string>
-    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Жаңсап өтүү үйрөткүчүн өт-рүп жибер-би?"</string>
+    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Жаңсоолор үйрөткүчүн өткөрүп жибересизби?"</string>
     <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Аны кийин <xliff:g id="NAME">%1$s</xliff:g> колдонмосунан табасыз"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Жокко чыгаруу"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Өткрп жиберүү"</string>
diff --git a/quickstep/res/values-ml/strings.xml b/quickstep/res/values-ml/strings.xml
index 6124b1dbb3..52be3ac297 100644
--- a/quickstep/res/values-ml/strings.xml
+++ b/quickstep/res/values-ml/strings.xml
@@ -56,7 +56,7 @@
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"സ്‌ക്രീനിന്റെ താഴത്തെ അരികിൽ നിന്ന് മുകളിലേക്ക് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"വിടുന്നതിന് മുമ്പ് നിങ്ങൾ താൽക്കാലികമായി നിർത്തുന്നില്ലെന്ന് ഉറപ്പാക്കുക."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"നേരെ മുകളിലേക്ക് സ്വെെപ്പ് ചെയ്യുന്നുണ്ടെന്ന് ഉറപ്പിക്കുക."</string>
-    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"ഹോമിലേക്ക് പോകുക ജെസ്ച്ചർ പൂർത്തിയാക്കി. അടുത്തത്, ഹോമിലേക്ക് എങ്ങനെ പോകാമെന്ന് മനസ്സിലാക്കുക."</string>
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"ഹോമിലേക്ക് പോകുക ജെസ്ച്ചർ പൂർത്തിയാക്കി. അടുത്തത്, എങ്ങനെ മടങ്ങാമെന്ന് അറിയുക."</string>
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"ഹോമിലേക്ക് പോകുക ജെസ്ച്ചർ നിങ്ങൾ പൂർത്തിയാക്കി."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"ഹോമിലേക്ക് പോകാൻ സ്വെെപ്പ് ചെയ്യുക"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"സ്‌ക്രീനിന്റെ താഴെ നിന്ന് മുകളിലേക്ക് സ്വൈപ്പ് ചെയ്യൂ. ഈ ജെസ്ച്ചർ എപ്പോഴും ഹോം സ്‌ക്രീനിലേക്ക് നയിക്കുന്നു."</string>
@@ -66,7 +66,7 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"ജെസ്ച്ചറുകൾ ഉപയോഗിക്കുന്ന രീതി നിങ്ങൾ മനസ്സിലാക്കി. ജെസ്ച്ചറുകൾ ഓഫാക്കാൻ ക്രമീകരണത്തിലേക്ക് പോകുക."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"ആപ്പുകൾ തമ്മിൽ മാറുക ജെസ്‌ച്ചർ നിങ്ങൾ പൂർത്തിയാക്കി."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"ആപ്പുകൾ മാറാൻ സ്വെെപ്പ് ചെയ്യുക"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"ആപ്പുകൾക്കിടയിൽ മാറാറാൻ സ്‌ക്രീനിന്റെ താഴെ നിന്ന് മുകളിലേക്ക് സ്വൈപ്പ് ചെയ്‌ത് പിടിച്ച ശേഷം വിടുക."</string>
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"ആപ്പുകൾക്കിടയിൽ മാറാൻ സ്‌ക്രീനിന്റെ താഴെ നിന്ന് മുകളിലേക്ക് സ്വൈപ്പ് ചെയ്‌ത് പിടിച്ച ശേഷം വിടുക."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"എല്ലാം സജ്ജീകരിച്ചു"</string>
     <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"പൂർത്തിയായി"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"ക്രമീകരണം"</string>
diff --git a/quickstep/res/values-my/strings.xml b/quickstep/res/values-my/strings.xml
index 874c911044..b07bbfa956 100644
--- a/quickstep/res/values-my/strings.xml
+++ b/quickstep/res/values-my/strings.xml
@@ -63,7 +63,7 @@
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ဖန်သားပြင် အောက်ခြေအစွန်မှ အပေါ်သို့ ပွတ်ဆွဲကြောင်း သေချာပါစေ။"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"မလွှတ်ခင် ဝင်းဒိုးကို အချိန်ကြာကြာ ဖိထားကြည့်ပါ။"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"အပေါ်တည့်တည့်သို့ ပွတ်ဆွဲပြီးနောက် ခဏရပ်ကြောင်း သေချာပါစေ။"</string>
-    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"လက်ဟန်များသုံးနည်းကို သင်သိသွားပါပြီ။ လက်ဟန်များကို ပိတ်ရန် ‘ဆက်တင်များ’ သို့ သွားပါ။"</string>
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"လက်ဟန်များသုံးနည်းကို သင်သိသွားပါပြီ။ လက်ဟန်များကို ပိတ်ရန် ဆက်တင်များသို့ သွားပါ။"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"အက်ပ်များပြောင်းသည့် လက်ဟန် ရှင်းလင်းပို့ချချက် ပြီးပါပြီ။"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"အက်ပ်များပြောင်းရန် ပွတ်ဆွဲပါ"</string>
     <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"အက်ပ်တစ်ခုမှတစ်ခုသို့ ပြောင်းရန် စခရင်အောက်ခြေမှ အပေါ်သို့ ပွတ်ဆွဲ၍ ဖိထားပြီးနောက် လွှတ်ပါ။"</string>
diff --git a/quickstep/res/values-ne/strings.xml b/quickstep/res/values-ne/strings.xml
index d873795edf..91cae4775f 100644
--- a/quickstep/res/values-ne/strings.xml
+++ b/quickstep/res/values-ne/strings.xml
@@ -81,7 +81,7 @@
     <string name="action_screenshot" msgid="8171125848358142917">"स्क्रिनसट"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"यो एप वा तपाईंको सङ्गठनले यो कारबाही गर्ने अनुमति दिँदैन"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"नेभिगेसन ट्युटोरियल स्किप गर्ने हो?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"तपाईं पछि <xliff:g id="NAME">%1$s</xliff:g> एपमा गई यो ट्युटोरियल भेट्टाउन सक्नुहुन्छ"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"तपाईं पछि <xliff:g id="NAME">%1$s</xliff:g> नामक एपमा गई यो ट्युटोरियल भेट्टाउन सक्नुहुन्छ"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"रद्द गर्नुहोस्"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"स्किप गर्नु…"</string>
 </resources>
diff --git a/quickstep/res/values-nl/strings.xml b/quickstep/res/values-nl/strings.xml
index 5651ac2c17..f6841fa0bf 100644
--- a/quickstep/res/values-nl/strings.xml
+++ b/quickstep/res/values-nl/strings.xml
@@ -56,8 +56,8 @@
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Swipe vanaf de onderrand van het scherm omhoog."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pauzeer niet voordat je loslaat."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Swipe recht omhoog."</string>
-    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Je weet nu hoe je het gebaar Naar startscherm maakt. Ontdek als volgende hoe je kunt teruggaan."</string>
-    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Je weet nu hoe je het gebaar Naar startscherm maakt."</string>
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Je weet nu hoe je teruggaat naar het startscherm. Ontdek als volgende hoe je kunt teruggaan."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Je weet nu hoe je teruggaat naar het startscherm."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Swipe om naar het startscherm te gaan"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Swipe omhoog vanaf de onderkant van het scherm. Met dit gebaar ga je altijd naar het startscherm."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Swipe vanaf de onderrand van het scherm omhoog."</string>
diff --git a/quickstep/res/values-or/strings.xml b/quickstep/res/values-or/strings.xml
index a16638a118..9488021139 100644
--- a/quickstep/res/values-or/strings.xml
+++ b/quickstep/res/values-or/strings.xml
@@ -47,7 +47,7 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"ପୂର୍ବାନୁମାନ କରାଯାଇଥିବା ଆପ୍: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"ଆପଣ ସ୍କ୍ରିନର ଏକଦମ୍-ଡାହାଣ ବା ବାମ ଧାରରୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"ଆପଣ ସ୍କ୍ରିନର ଡାହାଣ ବା ବାମ ଧାରରୁ ମଝିକୁ ସ୍ୱାଇପ୍ କରି ଛାଡ଼ି ଦେଉଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ଆପଣ ଡାହାଣ ଧାରରୁ ସ୍ୱାଇପ୍ କରି ପଛକୁ ଫେରିବା ଜାଣିଲେ। ତା\'ପରେ, ଆପଗୁଡ଼ିକୁ କିପରି ସ୍ୱିଚ୍ କରିବେ ତାହା ଜାଣନ୍ତୁ।"</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"ଆପଣ ଡାହାଣରୁ ସ୍ୱାଇପ୍ କରି ପଛକୁ କିପରି ଫେରିବେ ତାହା ଜାଣିଲେ। ତା\'ପରେ, ଆପକୁ କିପରି ସ୍ୱିଚ୍ କରିବେ ତାହା ଜାଣନ୍ତୁ।"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"ଆପଣ \'ପଛକୁ ଫେରନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି।"</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"ଆପଣ ସ୍କ୍ରିନର ତଳଭାଗର ଅତି ନିକଟରୁ ସ୍ୱାଇପ୍ କରୁନଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"ପଛକୁ ଫେରିବା ଜେଶ୍ଚରର ସମ୍ବେଦନଶୀଳତା ବଦଳାଇବାକୁ ସେଟିଂସକୁ ଯାଆନ୍ତୁ"</string>
diff --git a/quickstep/res/values-pa/strings.xml b/quickstep/res/values-pa/strings.xml
index 7fa05d801c..89b21194f5 100644
--- a/quickstep/res/values-pa/strings.xml
+++ b/quickstep/res/values-pa/strings.xml
@@ -59,7 +59,7 @@
     <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"ਤੁਸੀਂ \'ਹੋਮ \'ਤੇ ਜਾਓ\' ਦਾ ਇਸ਼ਾਰਾ ਪੂਰਾ ਕੀਤਾ। ਅੱਗੇ, ਜਾਣੋ ਕਿ ਪਿੱਛੇ ਕਿਵੇਂ ਜਾਣਾ ਹੈ।"</string>
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"ਤੁਸੀਂ \'ਹੋਮ \'ਤੇ ਜਾਓ\' ਦਾ ਇਸ਼ਾਰਾ ਪੂਰਾ ਕੀਤਾ।"</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"ਹੋਮ \'ਤੇ ਜਾਣ ਲਈ ਸਵਾਈਪ ਕਰੋ"</string>
-    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"ਆਪਣੀ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਾਂ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ। ਇਹ ਸੰਕੇਤ ਹਮੇਸ਼ਾਂ ਤੁਹਾਨੂੰ ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਲੈ ਜਾਂਦਾ ਹੈ।"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"ਆਪਣੀ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਾਂ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ। ਇਹ ਇਸ਼ਾਰਾ ਹਮੇਸ਼ਾਂ ਤੁਹਾਨੂੰ ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਲੈ ਜਾਂਦਾ ਹੈ।"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਲੇ ਕਿਨਾਰੇ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰਦੇ ਹੋ।"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"ਛੱਡਣ ਤੋਂ ਪਹਿਲਾਂ ਵਿੰਡੋ ਨੂੰ ਕੁਝ ਸਮੇਂ ਲਈ ਦਬਾ ਕੇ ਰੱਖੋ।"</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਿੱਧੇ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰਦੇ ਹੋ, ਫਿਰ ਰੋਕੋ।"</string>
diff --git a/quickstep/res/values-pl/strings.xml b/quickstep/res/values-pl/strings.xml
index b63d063eba..893db91b6c 100644
--- a/quickstep/res/values-pl/strings.xml
+++ b/quickstep/res/values-pl/strings.xml
@@ -47,25 +47,25 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Przewidywana aplikacja: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Pamiętaj, aby przesuwać palcem od samej prawej lub lewej krawędzi."</string>
     <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Pamiętaj, aby przesuwać palcem od prawej lub lewej krawędzi do środka ekranu i podnieść palec."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Wiesz już, jak przesuwać palcem od prawej strony, aby wrócić. Poćwicz teraz przełączanie aplikacji."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Wiesz już, jak przesuwać palcem, aby przejść wstecz. Poćwicz teraz przełączanie aplikacji."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Gest przejścia wstecz został opanowany."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pamiętaj, aby nie przesuwać palcem zbyt blisko dolnej części ekranu."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Czułość gestu cofania możesz zmienić w Ustawieniach"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Przesuwanie palcem, aby przejść wstecz"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Przesuń palcem, aby przejść wstecz"</string>
     <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Aby wrócić do ostatniego ekranu, przesuń palcem od lewej lub prawej krawędzi do środka ekranu."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pamiętaj, aby przesuwać palcem od dolnej krawędzi ekranu."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pamiętaj, aby przed podniesieniem palca nie było przerwy."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pamiętaj, aby przesuwać palcem prosto do góry."</string>
-    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Gest przechodzenia na ekran główny został opanowany. Poćwicz teraz przechodzenie na ekran główny."</string>
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Potrafisz już przejść na ekran główny. Poćwicz teraz powrót do wcześniejszego ekranu."</string>
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Gest przechodzenia na ekran główny został opanowany."</string>
-    <string name="home_gesture_intro_title" msgid="836590312858441830">"Przesuwanie palcem, aby przejść na ekran główny"</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Przesuń palcem, aby przejść na ekran główny"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Przesuń palcem z dołu ekranu. Ten gest zawsze powoduje przejście na ekran główny."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Pamiętaj, aby przesuwać palcem od dolnej krawędzi ekranu."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Przytrzymaj okno dłużej, zanim podniesiesz palec."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Pamiętaj, aby przesuwać palcem prosto do góry, a potem przerwać ruch."</string>
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Wiesz już, jak używać gestów. Aby wyłączyć gesty, przejdź do Ustawień."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Gest przełączania aplikacji został opanowany."</string>
-    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Przesuwanie palcem, aby przełączać aplikacje"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Przesuń palcem, aby przełączać aplikacje"</string>
     <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Aby przełączać się między aplikacjami, przesuń palcem od dołu ekranu, przytrzymaj i puść."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Wszystko gotowe"</string>
     <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Gotowe"</string>
diff --git a/quickstep/res/values-pt-rPT/strings.xml b/quickstep/res/values-pt-rPT/strings.xml
index 7fe20bbd65..c1cd2bbb92 100644
--- a/quickstep/res/values-pt-rPT/strings.xml
+++ b/quickstep/res/values-pt-rPT/strings.xml
@@ -56,9 +56,9 @@
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Garanta que desliza rapidamente com o dedo a partir do limite inferior do ecrã."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Garanta que não faz uma pausa antes de soltar."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Garanta que desliza rapidamente com o dedo para cima."</string>
-    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Concluiu o gesto para aceder à Página inicial. A seguir, saiba como retroceder."</string>
-    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Concluiu o gesto para aceder à Página inicial."</string>
-    <string name="home_gesture_intro_title" msgid="836590312858441830">"Deslize rapidamente com o dedo para aceder à Página inicial"</string>
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Concluiu o gesto para aceder ao ecrã principal. A seguir, saiba como retroceder."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Concluiu o gesto para aceder ao ecrã principal."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Deslize rapidamente com o dedo para aceder ao ecrã principal"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Deslize rapidamente para cima a partir da parte inferior. Este gesto abre sempre o ecrã principal."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Deslize rapidamente com o dedo a partir do limite inferior do ecrã."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Experimente premir a janela durante mais tempo antes de soltar."</string>
@@ -66,7 +66,7 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Aprendeu a utilizar gestos. Para desativar os gestos, aceda às Definições."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Concluiu o gesto para alternar entre apps."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Deslize rapidamente com o dedo para alternar entre apps"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"P/ alternar entre apps, deslize p/ cima a partir da parte inf. do ecrã sem soltar e, depois, solte."</string>
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Para alternar entre apps, deslize para cima sem soltar a partir da parte inferior do ecrã e solte."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Está tudo pronto"</string>
     <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Concluído"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Definições"</string>
diff --git a/quickstep/res/values-ro/strings.xml b/quickstep/res/values-ro/strings.xml
index 89db8fc886..a5e97e0519 100644
--- a/quickstep/res/values-ro/strings.xml
+++ b/quickstep/res/values-ro/strings.xml
@@ -56,9 +56,9 @@
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Glisați în sus dinspre marginea de jos a ecranului."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Nu întrerupeți gestul înainte de a elibera."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Glisați direct în sus."</string>
-    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Ați finalizat gestul „înapoi la pagina de pornire”. În continuare, aflați cum să reveniți."</string>
-    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Ați finalizat gestul „înapoi la pagina de pornire”."</string>
-    <string name="home_gesture_intro_title" msgid="836590312858441830">"Glisați pentru a accesa pagina de pornire"</string>
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Ați finalizat gestul „accesați ecranul de pornire”. În continuare, aflați cum să reveniți."</string>
+    <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Ați finalizat gestul „accesați ecranul de pornire”."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Glisați pentru a accesa ecranul de pornire"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Glisați în sus din partea de jos a ecranului. Cu acest gest accesați întotdeauna ecranul de pornire."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Glisați în sus dinspre marginea de jos a ecranului."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Încercați să țineți fereastra mai mult înainte s-o eliberați."</string>
@@ -66,7 +66,7 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Ați învățat cum să folosiți gesturi. Pentru a dezactiva gesturile, accesați Setările."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Ați finalizat gestul „comutați între aplicații”."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Glisați pentru a comuta între aplicații"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Pentru a comuta între aplicații, glisați în sus din partea de jos a ecranului, așteptați și eliberați"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Ca să comutați între aplicații, glisați în sus din partea de jos a ecranului, așteptați și eliberați."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Gata"</string>
     <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Gata"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Setări"</string>
diff --git a/quickstep/res/values-sk/strings.xml b/quickstep/res/values-sk/strings.xml
index 44c3c54440..799e94174b 100644
--- a/quickstep/res/values-sk/strings.xml
+++ b/quickstep/res/values-sk/strings.xml
@@ -59,14 +59,14 @@
     <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Dokončili ste gesto na prechod na plochu. V ďalšom kroku sa naučíte, ako sa vrátiť späť."</string>
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Dokončili ste gesto na prechod na plochu."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Prechod na plochu potiahnutím"</string>
-    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Potiahnite nahor z dolného okraja obrazovky. Týmto gestom sa vždy vrátite na plochu."</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Potiahnite nahor zdola obrazovky. Týmto gestom sa vždy vrátite na plochu."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Musíte potiahnuť nahor z dolného okraja obrazovky."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Skúste okno pred uvoľnením podržať dlhšie."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Musite potiahnuť priamo hore a potom zastať."</string>
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Naučili ste sa používať gestá. Ak ich chcete vypnúť, prejdite do Nastavení."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Dokončili ste gesto na prepnutie aplikácií."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Prepínanie aplikácií potiahnutím"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Prepínať medzi aplik. môžete potiahnutím nahor z dolnej časti obraz., pridržaním a násl. uvoľnením."</string>
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Aplikácie môžete prepínať potiahnutím obrazovky zdola nahor, pridržaním a následným uvoľnením."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Hotovo"</string>
     <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Hotovo"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Nastavenia"</string>
@@ -76,7 +76,7 @@
     <string name="allset_title" msgid="5021126669778966707">"Hotovo"</string>
     <string name="allset_hint" msgid="2384632994739392447">"Potiahnutím nahor prejdete na plochu"</string>
     <string name="allset_description" msgid="6350320429953234580">"Telefón môžete začať používať"</string>
-    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Nastavenia navigácie v systéme"</annotation></string>
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Nastavenia navigácie systémom"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Zdieľať"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Snímka obrazovky"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Aplikácia alebo vaša organizácia túto akciu nepovoľuje"</string>
diff --git a/quickstep/res/values-sl/strings.xml b/quickstep/res/values-sl/strings.xml
index 8aab5b1950..7e40277af4 100644
--- a/quickstep/res/values-sl/strings.xml
+++ b/quickstep/res/values-sl/strings.xml
@@ -51,21 +51,21 @@
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Izvedli ste potezo za pomik nazaj."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Pazite, da ne povlečete preblizu dna zaslona."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Občutljivost poteze za nazaj lahko spremenite v nastavitvah."</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Povlecite za vrnitev."</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Povlecite za vrnitev"</string>
     <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Če se želite vrniti na zadnji zaslon, povlecite z levega ali desnega roba do sredine zaslona."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Pazite, da povlečete s spodnjega roba zaslona navzgor."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pazite, da ne zaustavite prsta, preden ga dvignete."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Pazite, da povlečete naravnost navzgor."</string>
     <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Izvedli ste potezo za pomik na začetni zaslon. Zdaj se naučite, kako se pomaknete nazaj."</string>
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Izvedli ste potezo za pomik na začetni zaslon."</string>
-    <string name="home_gesture_intro_title" msgid="836590312858441830">"Vlečenje za pomik na začetni zaslon"</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Povlecite za pomik na začetni zaslon"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Z dna zaslona s prstom povlecite navzgor. S to potezo lahko vedno odprete začetni zaslon."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Pazite, da povlečete s spodnjega roba zaslona navzgor."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Poskusite okno pridržati dalj časa, preden ga izpustite."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Pazite, da povlečete naravnost navzgor in nato zaustavite prst."</string>
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Naučili ste se uporabljati poteze. Poteze lahko izklopite v nastavitvah."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Izvedli ste potezo za preklapljanje med aplikacijami."</string>
-    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Vlečenje za preklapljanje med aplikacijami"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Povlecite za preklapljanje med aplikacijami"</string>
     <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Za preklapljanje med aplikacijami povlecite navzgor z dna zaslona, pridržite in nato izpustite."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Zdaj znate"</string>
     <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Končano"</string>
diff --git a/quickstep/res/values-sr/strings.xml b/quickstep/res/values-sr/strings.xml
index 98fe69f2bd..f2ffa0a41e 100644
--- a/quickstep/res/values-sr/strings.xml
+++ b/quickstep/res/values-sr/strings.xml
@@ -47,11 +47,11 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Предвиђамо апликацију: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Обавезно превуците од саме десне или леве ивице."</string>
     <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Обавезно превуците од десне или леве ивице до средине екрана и отпустите."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Научили сте како да превлачите здесна да бисте се вратили. Сада научите да мењате апликације."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Научили сте како да превлачите здесна да бисте се вратили уназад. Сада научите да замените апликације."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Довршили сте покрет за повратак."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Никако не превлачите превише близу дна екрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Осетљивост пок. за назад можете да промените у Подешавањима"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Превуците да бисте се вратили"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Превуците да бисте се вратили уназад"</string>
     <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Да бисте се вратили на последњи екран, превуците од леве или десне ивице до средине екрана."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Обавезно превуците нагоре од доње ивице екрана."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Никако не стајте пре отпуштања."</string>
@@ -65,7 +65,7 @@
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Обавезно превуците право нагоре, па застаните."</string>
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Научили сте како да користите покрете. Да бисте искључили покрете, идите на подешавања."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Довршили сте покрет за промену апликација."</string>
-    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Превуците да бисте променили апликације"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Превуците да бисте заменили апликације"</string>
     <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"За прелазак са једне апликације на другу превуците нагоре од дна екрана, задржите, па пустите."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"То је то"</string>
     <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Готово"</string>
diff --git a/quickstep/res/values-sv/strings.xml b/quickstep/res/values-sv/strings.xml
index b412418b8f..931e4588b7 100644
--- a/quickstep/res/values-sv/strings.xml
+++ b/quickstep/res/values-sv/strings.xml
@@ -59,7 +59,7 @@
     <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Du är klar med rörelsen för att öppna startskärmen. Nu ska du få lära dig hur du går tillbaka."</string>
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Du är klar med rörelsen för att öppna startskärmen."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Svep för att öppna startskärmen"</string>
-    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Svep uppåt från skärmens nederkant. Du kan alltid återgå startskärmen med den här rörelsen."</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Svep uppåt från skärmens nederkant. Du kan alltid återgå till startskärmen med den här rörelsen."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Se till att du sveper från nederkanten på skärmen."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Testa att trycka längre på fönstret innan du släpper."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Se till att du sveper rakt uppåt och sedan pausar."</string>
@@ -76,12 +76,12 @@
     <string name="allset_title" msgid="5021126669778966707">"Klart!"</string>
     <string name="allset_hint" msgid="2384632994739392447">"Svep uppåt för att öppna startskärmen"</string>
     <string name="allset_description" msgid="6350320429953234580">"Nu kan du börja använda telefonen"</string>
-    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Systemnavigeringsinställningarna"</annotation></string>
+    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Systemnavigeringsinställningar"</annotation></string>
     <string name="action_share" msgid="2648470652637092375">"Dela"</string>
     <string name="action_screenshot" msgid="8171125848358142917">"Skärmbild"</string>
     <string name="blocked_by_policy" msgid="2071401072261365546">"Appen eller organisationen tillåter inte den här åtgärden"</string>
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Vill du hoppa över självstudierna?"</string>
-    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Du kan hitta det här igen i <xliff:g id="NAME">%1$s</xliff:g>-appen"</string>
+    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Du hittar det här igen i <xliff:g id="NAME">%1$s</xliff:g>-appen"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Avbryt"</string>
     <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Hoppa över"</string>
 </resources>
diff --git a/quickstep/res/values-sw/strings.xml b/quickstep/res/values-sw/strings.xml
index 093cbb89b7..22aa3ef29f 100644
--- a/quickstep/res/values-sw/strings.xml
+++ b/quickstep/res/values-sw/strings.xml
@@ -47,7 +47,7 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Programu iliyotabiriwa: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Hakikisha unatelezesha kidole kuanzia ukingo wa kulia kabisa au ukingo wa kushoto kabisa."</string>
     <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Hakikisha unatelezesha kidole kuanzia ukingo wa kulia au kushoto kuelekea katikati ya skrini na uachilie."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Umejifunza jinsi ya kutelezesha kidole kuanzia kulia ili kurudi nyuma. Hatua inayofuata, jifunze jinsi ya kubadilisha programu."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Umejifunza jinsi ya kutelezesha kidole kuanzia kulia ili kurudi nyuma. Sasa jifunze jinsi ya kubadilisha programu."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Umekamilisha ishara ya kurudi nyuma."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Hakikisha hutelezeshi kidole karibu sana na sehemu ya chini ya skrini."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Kubadilisha hisi ya ishara ya nyuma, nenda kwenye Mipangilio"</string>
@@ -56,7 +56,7 @@
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Hakikisha unatelezesha kidole juu kuanzia ukingo wa chini wa skrini."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Hakikisha kuwa husimamishi kabla ya kuachilia."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Hakikisha unatelezesha kidole kuelekea juu."</string>
-    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Umekamilisha ishara ya kwenda kwenye Skrini ya kwanza. Inayofuata, jifunze jinsi ya kurudi nyuma."</string>
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Umekamilisha ishara ya kwenda kwenye Skrini ya kwanza. Sasa jifunze jinsi ya kurudi nyuma."</string>
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Umekamilisha ishara ya kwenda kwenye Skrini ya kwanza."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Telezesha kidole ili uende kwenye skrini ya kwanza"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Telezesha kidole juu kuanzia chini ya skrini yako. Ishara hii kila wakati hukupeleka kwenye Skrini ya kwanza."</string>
diff --git a/quickstep/res/values-te/strings.xml b/quickstep/res/values-te/strings.xml
index be2ffbd4ab..73e4e0c687 100644
--- a/quickstep/res/values-te/strings.xml
+++ b/quickstep/res/values-te/strings.xml
@@ -56,10 +56,10 @@
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"మీరు స్క్రీన్ దిగువ అంచు నుండి పైకి స్వయిప్ చేస్తున్నారని నిర్ధారించుకోండి."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"బయలుదేరే ముందు మీరు పాజ్ చేయకుండా చూసుకోండి."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"మీరు నేరుగా పైకి స్వైప్ చేశారని నిర్ధారించుకోండి."</string>
-    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"మీరు మొదటి ట్యాబ్‌కు వెళ్లే సంజ్ఞను పూర్తి చేశారు. తర్వాత, వెనుకకు ఎలా వెళ్లాలో తెలుసుకోండి."</string>
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"మీరు మొదటి స్క్రీన్‌కు వెళ్లే సంజ్ఞను పూర్తి చేశారు. తర్వాత, వెనుకకు ఎలా వెళ్లాలో తెలుసుకోండి."</string>
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"మీరు మొదటి ట్యాబ్‌కు వెళ్లే సంజ్ఞను పూర్తి చేశారు."</string>
-    <string name="home_gesture_intro_title" msgid="836590312858441830">"వర్చువల్ హోమ్‌కి వెళ్లడానికి స్వైప్ చేయండి"</string>
-    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"మీ స్క్రీన్ కింది నుండి పైకి స్వైప్ చేయి. ఈ సంజ్ఞ ఎప్పుడూ మిమ్మల్ని మొదటి స్క్రీన్‌కు తీసుకెళ్తుంది."</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"మొదటి స్క్రీన్‌కు వెళ్లడానికి స్వైప్ చేయండి"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"స్క్రీన్ కింది నుండి పైకి స్వైప్ చేయండి. ఈ సంజ్ఞ ఎప్పుడూ మిమ్మల్ని మొదటి స్క్రీన్‌కు తీసుకెళ్తుంది."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"మీరు స్క్రీన్ దిగువ అంచు నుండి పైకి స్వయిప్ చేస్తున్నారని నిర్ధారించుకోండి."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"రిలీజ్ చేయడానికి ముందు విండోను ఎక్కువసేపు పట్టుకోడానికి ట్రై చేయండి."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"మీరు నేరుగా స్వైప్ చేశారని నిర్ధారించుకోండి, ఆపై పాజ్ చేయండి."</string>
diff --git a/quickstep/res/values-tl/strings.xml b/quickstep/res/values-tl/strings.xml
index b1ed104a18..412449b41a 100644
--- a/quickstep/res/values-tl/strings.xml
+++ b/quickstep/res/values-tl/strings.xml
@@ -73,7 +73,7 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Subukan ulit"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Magaling!"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="allset_title" msgid="5021126669778966707">"Handa na lahat!"</string>
+    <string name="allset_title" msgid="5021126669778966707">"Handa na ang lahat!"</string>
     <string name="allset_hint" msgid="2384632994739392447">"Mag-swipe pataas para pumunta sa Home"</string>
     <string name="allset_description" msgid="6350320429953234580">"Handa mo nang simulan ang paggamit sa iyong telepono"</string>
     <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Mga setting ng navigation ng system"</annotation></string>
diff --git a/quickstep/res/values-tr/strings.xml b/quickstep/res/values-tr/strings.xml
index 81554984cd..58d78e0efd 100644
--- a/quickstep/res/values-tr/strings.xml
+++ b/quickstep/res/values-tr/strings.xml
@@ -51,12 +51,12 @@
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Geri dön hareketini tamamladınız."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Ekranın alt kısmına çok yakın bir şekilde kaydırmadığınızdan emin olun."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Geri hareketinin hassasiyetini değiştirmek için Ayarlar\'a gidin"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Geri dönmek için kaydırın"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Geri dönmek için kaydırma"</string>
     <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Son ekrana geri gitmek için sol veya sağ kenardan ekranın ortasına doğru kaydırın."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Ekranın alt kenarından yukarı kaydırdığınızdan emin olun."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Bırakmadan önce parmağınızı duraklatmadığınızdan emin olun."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Düz bir şekilde yukarı kaydırdığınızdan emin olun."</string>
-    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Ana ekrana git hareketini tamamladınız. Şimdi ana ekrana nasıl gideceğinizi öğreneceksiniz."</string>
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Ana ekrana git hareketini tamamladınız. Şimdi nasıl geri döneceğinizi öğreneceksiniz."</string>
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Ana ekrana git hareketini tamamladınız."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Ana ekrana gitmek için kaydırma"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Ekranın alt kısmından yukarıya doğru kaydırın. Bu hareket sizi her zaman Ana ekrana götürür."</string>
@@ -66,7 +66,7 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Hareketleri nasıl kullanacağınızı öğrendiniz. Hareketleri kapatmak için Ayarlar\'a gidin."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Uygulamalar arasında geçiş yapma hareketini tamamladınız."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Uygulamalar arasında geçiş yapmak için kaydırma"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Uygulama değiştirmek için ekranınızın altından yukarı kaydırıp basılı tutun ve sonra bırakın."</string>
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Uygulamalar arasında geçiş yapmak için ekranınızın altından yukarı kaydırıp basılı tutun ve sonra bırakın."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Hepsi bu kadar"</string>
     <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Bitti"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Ayarlar"</string>
diff --git a/quickstep/res/values-uk/strings.xml b/quickstep/res/values-uk/strings.xml
index 9acbf61894..544cec7e0f 100644
--- a/quickstep/res/values-uk/strings.xml
+++ b/quickstep/res/values-uk/strings.xml
@@ -47,7 +47,7 @@
     <string name="hotseat_prediction_content_description" msgid="4582028296938078419">"Передбачений додаток: <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <string name="back_gesture_feedback_swipe_too_far_from_edge" msgid="1711645592102201538">"Проведіть пальцем саме від правого або лівого краю екрана."</string>
     <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"Проведіть пальцем від правого або лівого краю до середини екрана й підніміть палець."</string>
-    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Ви вмієте проводити пальцем справа наліво, щоб повертатися. Дізнайтеся, як переходити між додатками."</string>
+    <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"Тепер ви знаєте, як повернутися на попередній екран, провівши пальцем справа наліво. Дізнайтеся, як переключатися між додатками."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ви виконали жест \"Назад\"."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Не проводьте пальцем надто близько до нижнього краю екрана."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Щоб змінити чутливість жесту \"Назад\", відкрийте налаштування"</string>
@@ -66,7 +66,7 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Ви вивчили жести. Щоб вимкнути їх, перейдіть у налаштування."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Ви виконали жест переходу в інший додаток."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Проведіть пальцем, щоб перейти в інший додаток"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Щоб переключитися між додатками, проведіть знизу вгору по екрані, утримуйте палець і відпустіть."</string>
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Щоб переключатися між додатками, проведіть знизу вгору по екрану, утримуйте палець, а потім відпустіть."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Усе готово!"</string>
     <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Готово"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Налаштування"</string>
diff --git a/quickstep/res/values-uz/strings.xml b/quickstep/res/values-uz/strings.xml
index cd34aace1d..8b194de80f 100644
--- a/quickstep/res/values-uz/strings.xml
+++ b/quickstep/res/values-uz/strings.xml
@@ -51,7 +51,7 @@
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Ortga qaytish ishorasi darsini tamomladingiz."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Barmoqni ekran pastiga yaqin surmaslikka harakat qiling."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Orqaga ishorasi sezuvchanligi Sozlamalardan oʻzgartiriladi"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Ortga qaytish uchun suring"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Orqaga qaytish"</string>
     <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Ortga qaytish uchun barmoqni ekranning yon chekkalaridan oʻrtasigacha suring."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Barmoqni ekranning pastki chetidan yuqoriga suring."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Barmoqni ekrandan pauzasiz qoʻyib uzing."</string>
@@ -65,7 +65,7 @@
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Avval tik tepaga surib, keyin pauza qiling."</string>
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Ishoralardan qanday foydalanishni oʻrganib oldingiz. Ishoralarni oʻchirish uchun Sozlamalarga kiring."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Ilovalarni almashtirish darsini tamomladingiz."</string>
-    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Svayp bilan ilovalarni almashtirish"</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Ilovalar orasida almashish"</string>
     <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Ilovalarni ochish uchun ekranning pastidan tepaga qarab suring, biroz ushlab turing va qoʻyib yuboring"</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Tayyor"</string>
     <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Tayyor"</string>
diff --git a/quickstep/res/values-zh-rCN/strings.xml b/quickstep/res/values-zh-rCN/strings.xml
index dbadfd0023..c7e0bb70a1 100644
--- a/quickstep/res/values-zh-rCN/strings.xml
+++ b/quickstep/res/values-zh-rCN/strings.xml
@@ -58,7 +58,7 @@
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"请向上滑动。"</string>
     <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"您完成了“转到主屏幕”手势教程。接下来了解如何返回。"</string>
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"您完成了“转到主屏幕”手势教程。"</string>
-    <string name="home_gesture_intro_title" msgid="836590312858441830">"滑动即可转到主屏幕"</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"上滑可转到主屏幕"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"从屏幕底部向上滑动。这个手势会一律将您转到主屏幕。"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"请从屏幕底部边缘向上滑动。"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"请尝试按住窗口较长时间，然后再松开手指。"</string>
@@ -73,7 +73,7 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"重试"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"很好！"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"教程 <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="allset_title" msgid="5021126669778966707">"设置完毕！"</string>
+    <string name="allset_title" msgid="5021126669778966707">"大功告成！"</string>
     <string name="allset_hint" msgid="2384632994739392447">"向上滑动即可转到主屏幕"</string>
     <string name="allset_description" msgid="6350320429953234580">"您可以开始使用手机了"</string>
     <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"系统导航设置"</annotation></string>
diff --git a/quickstep/res/values-zh-rHK/strings.xml b/quickstep/res/values-zh-rHK/strings.xml
index 88a3613839..d1e8392d55 100644
--- a/quickstep/res/values-zh-rHK/strings.xml
+++ b/quickstep/res/values-zh-rHK/strings.xml
@@ -58,7 +58,7 @@
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"請向上滑動。"</string>
     <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"您已完成「返回主畫面」手勢的教學課程。接著，一起來瞭解如何返回上一個畫面。"</string>
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"您已完成「返回主畫面」手勢的教學課程。"</string>
-    <string name="home_gesture_intro_title" msgid="836590312858441830">"向上滑動即可返回主畫面。"</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"向上滑動即可返回主畫面"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"從螢幕底部向上滑動。這個手勢在所有畫面下都可讓您返回主畫面。"</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"請從螢幕底部邊緣向上滑動。"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"請嘗試按住視窗更長時間，然後再放開。"</string>
-- 
GitLab


From 38e18c295cee6bae566f3f9db75e4a03b90af696 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sat, 24 Jul 2021 03:07:29 +0000
Subject: [PATCH 1643/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Ia201032e39017688795dd9082946690e7e77fd45
---
 res/values-ar/strings.xml     |  4 ++--
 res/values-de/strings.xml     |  4 ++--
 res/values-es-rUS/strings.xml |  4 ++--
 res/values-fr/strings.xml     |  2 +-
 res/values-gu/strings.xml     | 10 +++++-----
 res/values-in/strings.xml     |  4 ++--
 res/values-ky/strings.xml     |  2 +-
 res/values-pl/strings.xml     |  2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index b828e1ddd9..b5b8b62450 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -28,7 +28,7 @@
     <string name="shortcut_not_available" msgid="2536503539825726397">"الاختصار غير متاح"</string>
     <string name="home_screen" msgid="5629429142036709174">"الشاشة الرئيسية"</string>
     <string name="recent_task_option_split_screen" msgid="6690461455618725183">"تقسيم الشاشة"</string>
-    <string name="long_press_widget_to_add" msgid="3587712543577675817">"انقر مرتين مع تثبيت إصبعك لنقل أداة."</string>
+    <string name="long_press_widget_to_add" msgid="3587712543577675817">"انقر مع الاستمرار لنقل أداة"</string>
     <string name="long_accessible_way_to_add" msgid="2733588281439571974">"انقر مرتين مع تثبيت إصبعك لنقل أداة أو استخدام الإجراءات المخصّصة."</string>
     <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
     <string name="widget_accessible_dims_format" msgid="3640149169885301790">"‏العرض %1$d الطول %2$d"</string>
@@ -72,7 +72,7 @@
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"البحث عن مزيد من التطبيقات"</string>
     <string name="label_application" msgid="8531721983832654978">"تطبيق"</string>
     <string name="notifications_header" msgid="1404149926117359025">"الإشعارات"</string>
-    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"انقر مرتين مع تثبيت إصبعك لنقل اختصار."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"انقر مع الاستمرار لنقل اختصار"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"انقر مرتين مع تثبيت إصبعك لنقل اختصار أو استخدام الإجراءات المخصّصة."</string>
     <string name="out_of_space" msgid="6692471482459245734">"ما مِن مساحة على هذه الشاشة الرئيسية."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"لا يوجد المزيد من الحقول في علبة المفضلة"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 521ade4745..d83776caa3 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -48,7 +48,7 @@
     <string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
     <string name="widgets_full_sheet_search_bar_hint" msgid="8484659090860596457">"Suche"</string>
     <string name="widgets_full_sheet_cancel_button_description" msgid="5766167035728653605">"Text aus dem Suchfeld löschen"</string>
-    <string name="no_widgets_available" msgid="4337693382501046170">"Widgets und Shortcuts nicht verfügbar"</string>
+    <string name="no_widgets_available" msgid="4337693382501046170">"Widgets und Verknüpfungen nicht verfügbar"</string>
     <string name="no_search_results" msgid="3787956167293097509">"Keine Widgets oder Verknüpfungen gefunden"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Privat"</string>
     <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Geschäftlich"</string>
@@ -64,7 +64,7 @@
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Weitere Apps suchen"</string>
     <string name="label_application" msgid="8531721983832654978">"App"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Benachrichtigungen"</string>
-    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Tippen und halten, um eine Verknüpfung zu bewegen."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Zum Verschieben einer Verknüpfung berühren und halten"</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Doppeltippen und halten, um eine Verknüpfung zu bewegen oder benutzerdefinierte Aktionen zu nutzen."</string>
     <string name="out_of_space" msgid="6692471482459245734">"Auf diesem Startbildschirm ist kein Platz mehr vorhanden"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Ablage \"Favoriten\" ist voll."</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 36387ac060..eca881f1f2 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -158,12 +158,12 @@
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Personales"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"De trabajo"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Perfil de trabajo"</string>
-    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Las apps de trabajo tienen una insignia y el administrador de IT las puede ver"</string>
+    <string name="work_profile_edu_work_apps" msgid="7895468576497746520">"Las apps de trabajo tienen una insignia y el administrador de TI las puede ver"</string>
     <string name="work_profile_edu_accept" msgid="6069788082535149071">"Entendido"</string>
     <string name="work_apps_paused_title" msgid="3040901117349444598">"Las apps de trabajo están detenidas"</string>
     <string name="work_apps_paused_body" msgid="261634750995824906">"Las apps de trabajo no pueden enviarte notificaciones, usar la batería ni acceder a tu ubicación"</string>
     <string name="work_apps_paused_content_description" msgid="5149623040804051095">"Las apps de trabajo están desactivadas y, por ende, no pueden enviarte notificaciones, usar la batería ni acceder a tu ubicación"</string>
-    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Las apps de trabajo tienen una insignia y el administrador de IT las puede ver"</string>
+    <string name="work_apps_paused_edu_banner" msgid="8872412121608402058">"Las apps de trabajo tienen una insignia y el administrador de TI las puede ver"</string>
     <string name="work_apps_paused_edu_accept" msgid="6377476824357318532">"Entendido"</string>
     <string name="work_apps_pause_btn_text" msgid="1921059713673767460">"Desactivar las apps de trabajo"</string>
     <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Activar las apps de trabajo"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index c06179665d..633ca2d094 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -64,7 +64,7 @@
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Rechercher plus d\'applications"</string>
     <string name="label_application" msgid="8531721983832654978">"Application"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Notifications"</string>
-    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Appuyez de manière prolongée pour déplacer raccourci."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Appuyez de manière prolongée pour déplacer un raccourci."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Appuyez deux fois et maintenez la pression pour déplacer un raccourci ou utiliser les actions personnalisées."</string>
     <string name="out_of_space" msgid="6692471482459245734">"Espace insuffisant sur cet écran d\'accueil"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Plus d\'espace disponible dans la zone de favoris."</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 695b128e01..2a154bf52c 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -79,10 +79,10 @@
     <string name="pin_prediction" msgid="4196423321649756498">"પૂર્વાનુમાનને પિન કરો"</string>
     <string name="permlab_install_shortcut" msgid="5632423390354674437">"શૉર્ટકટ ઇન્સ્ટૉલ કરો"</string>
     <string name="permdesc_install_shortcut" msgid="923466509822011139">"એપ્લિકેશનને વપરાશકર્તા હસ્તક્ષેપ વગર શોર્ટકટ્સ ઉમેરવાની મંજૂરી આપે છે."</string>
-    <string name="permlab_read_settings" msgid="1941457408239617576">"હોમ સેટિંગ્સ અને શોર્ટકટ્સ વાંચો"</string>
-    <string name="permdesc_read_settings" msgid="5833423719057558387">"એપ્લિકેશનને હોમમાં સેટિંગ્સ અને શોર્ટકટ્સ વાંચવાની મંજૂરી આપે છે."</string>
-    <string name="permlab_write_settings" msgid="3574213698004620587">"હોમ સેટિંગ્સ અને શોર્ટકટ્સ લખો"</string>
-    <string name="permdesc_write_settings" msgid="5440712911516509985">"એપ્લિકેશનને હોમમાં સેટિંગ્સ અને શોર્ટકટ્સ બદલવાની મંજૂરી આપે છે."</string>
+    <string name="permlab_read_settings" msgid="1941457408239617576">"હોમ સેટિંગ અને શૉર્ટકટ વાંચો"</string>
+    <string name="permdesc_read_settings" msgid="5833423719057558387">"ઍપને હોમમાં સેટિંગ અને શૉર્ટકટ વાંચવાની મંજૂરી આપે છે."</string>
+    <string name="permlab_write_settings" msgid="3574213698004620587">"હોમ સેટિંગ અને શૉર્ટકટ લખો"</string>
+    <string name="permdesc_write_settings" msgid="5440712911516509985">"ઍપને હોમમાં સેટિંગ અને શૉર્ટકટ બદલવાની મંજૂરી આપે છે."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> ને ફોન કૉલ્સ કરવાની મંજૂરી નથી"</string>
     <string name="gadget_error_text" msgid="740356548025791839">"વિજેટ લોડ કરી શકાતું નથી"</string>
     <string name="gadget_setup_text" msgid="1745356155479272374">"સેટઅપ પૂર્ણ કરવા માટે ટૅપ કરો"</string>
@@ -114,7 +114,7 @@
     <string name="notification_dots_desc_off" msgid="1760796511504341095">"બંધ છે"</string>
     <string name="title_missing_notification_access" msgid="7503287056163941064">"નોટિફિકેશનનો ઍક્સેસની જરૂરી છે"</string>
     <string name="msg_missing_notification_access" msgid="281113995110910548">"નોટિફિકેશન માટેનું ચિહ્ન બતાવવા હેતુ, <xliff:g id="NAME">%1$s</xliff:g> માટેની ઍપ્લિકેશન નોટિફિકેશન ચાલુ કરો"</string>
-    <string name="title_change_settings" msgid="1376365968844349552">"સેટિંગ્સ બદલો"</string>
+    <string name="title_change_settings" msgid="1376365968844349552">"સેટિંગ બદલો"</string>
     <string name="notification_dots_service_title" msgid="4284221181793592871">"નોટિફિકેશન માટેના ચિહ્ન બતાવો"</string>
     <string name="auto_add_shortcuts_label" msgid="3698776050751790653">"ઍપના આઇકન હોમ સ્ક્રીન પર ઉમેરો"</string>
     <string name="auto_add_shortcuts_description" msgid="7117251166066978730">"નવી ઍપ માટે"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index a7f67bcdd8..d3558ec2a0 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -20,7 +20,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="work_folder_name" msgid="3753320833950115786">"Kantor"</string>
+    <string name="work_folder_name" msgid="3753320833950115786">"Kerja"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Aplikasi tidak dipasang."</string>
     <string name="activity_not_available" msgid="7456344436509528827">"Aplikasi tidak tersedia"</string>
     <string name="safemode_shortcut_error" msgid="9160126848219158407">"Aplikasi yang didownload dinonaktifkan dalam mode Aman"</string>
@@ -51,7 +51,7 @@
     <string name="no_widgets_available" msgid="4337693382501046170">"Widget dan pintasan tidak tersedia"</string>
     <string name="no_search_results" msgid="3787956167293097509">"Tidak ada widget atau pintasan yang ditemukan"</string>
     <string name="widgets_full_sheet_personal_tab" msgid="2743540105607120182">"Pribadi"</string>
-    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Kantor"</string>
+    <string name="widgets_full_sheet_work_tab" msgid="3767150027110633765">"Kerja"</string>
     <string name="widget_category_conversations" msgid="8894438636213590446">"Percakapan"</string>
     <string name="widget_education_header" msgid="4874760613775913787">"Info bermanfaat mudah dilihat"</string>
     <string name="widget_education_content" msgid="745542879510751525">"Untuk mendapatkan info tanpa membuka aplikasi, Anda dapat menambahkan widget ke Layar utama"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index ae0416dffc..c21a9418a2 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -154,7 +154,7 @@
     <string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Кыска жолдор жана билдирмелер"</string>
     <string name="action_dismiss_notification" msgid="5909461085055959187">"Этибарга албоо"</string>
     <string name="accessibility_close" msgid="2277148124685870734">"Жабуу"</string>
-    <string name="notification_dismissed" msgid="6002233469409822874">"Эскертме көз жаздымда калтырылды"</string>
+    <string name="notification_dismissed" msgid="6002233469409822874">"Билдирме жабылды"</string>
     <string name="all_apps_personal_tab" msgid="4190252696685155002">"Жеке колдонмолор"</string>
     <string name="all_apps_work_tab" msgid="4884822796154055118">"Жумуш колдонмолору"</string>
     <string name="work_profile_toggle_label" msgid="3081029915775481146">"Жумуш профили"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 1df4726a8e..1d5321b7e5 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -68,7 +68,7 @@
     <string name="all_apps_search_market_message" msgid="1366263386197059176">"Wyszukaj więcej aplikacji"</string>
     <string name="label_application" msgid="8531721983832654978">"Aplikacja"</string>
     <string name="notifications_header" msgid="1404149926117359025">"Powiadomienia"</string>
-    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Naciśnij i przytrzymaj, aby wybrać skrót."</string>
+    <string name="long_press_shortcut_to_add" msgid="5405328730817637737">"Naciśnij i przytrzymaj, aby przenieść skrót."</string>
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"Naciśnij dwukrotnie i przytrzymaj, aby przenieść skrót lub użyć działań niestandardowych."</string>
     <string name="out_of_space" msgid="6692471482459245734">"Brak miejsca na tym ekranie głównym"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Brak miejsca w Ulubionych"</string>
-- 
GitLab


From 94e798bac1bb3b9fe8a8887857e6e44d42df7a28 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Thu, 22 Jul 2021 17:26:42 -0700
Subject: [PATCH 1644/1664] Reset current task and dequeue overview commands
 when recents animation is cancelled

Fixes: 193925362
Test: manual
Change-Id: I792be003e5aabf34324075829d5381cba591892b
---
 .../src/com/android/quickstep/OverviewCommandHelper.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
index 742d02d204..89c2ed8ed1 100644
--- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
@@ -15,7 +15,6 @@
  */
 package com.android.quickstep;
 
-import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.quickstep.util.ActiveGestureLog.INTENT_EXTRA_LOG_TRACE_ID;
 
@@ -199,6 +198,12 @@ public class OverviewCommandHelper {
             public void onRecentsAnimationCanceled(ThumbnailData thumbnailData) {
                 interactionHandler.onGestureCancelled();
                 cmd.removeListener(this);
+
+                RecentsView createdRecents =
+                        activityInterface.getCreatedActivity().getOverviewPanel();
+                if (createdRecents != null) {
+                    createdRecents.onRecentsAnimationComplete();
+                }
             }
         };
 
-- 
GitLab


From 6fc1eae8d0609d4d2a6a17f984011515e92fa1cf Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Tue, 27 Jul 2021 09:13:26 +0000
Subject: [PATCH 1645/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Ia2101dbfa85b65d3de87200f0fbaf5d09c25a7d9
---
 res/values-hi/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index e2310749e1..53640fe2e9 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -71,7 +71,7 @@
     <string name="all_apps_button_label" msgid="8130441508702294465">"ऐप्लिकेशन सूची"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"निजी ऐप्लिकेशन की सूची"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"काम से जुड़े ऐप्लिकेशन की सूची"</string>
-    <string name="remove_drop_target_label" msgid="7812859488053230776">"निकालें"</string>
+    <string name="remove_drop_target_label" msgid="7812859488053230776">"हटाएं"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"अनइंस्टॉल करें"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"ऐप्लिकेशन की जानकारी"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"इंस्‍टॉल करें"</string>
-- 
GitLab


From 2afb78453149783f2f56d51ab1e9f8af99cf6ae3 Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Thu, 22 Jul 2021 13:37:15 -1000
Subject: [PATCH 1646/1664] Enables Enhanced Smartspace by default.

Test: MemoryTests.java, manual
Bug: 187428578
Merged-In: Iffc6ae9b79db47d0585486529d2d8dfdf0a24692
Merged-In: I497523aa1be78e4d0890a7a74a1bd08d4ca50f50
Change-Id: I497523aa1be78e4d0890a7a74a1bd08d4ca50f50
---
 src/com/android/launcher3/config/FeatureFlags.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index aab6cb232b..f066dc1e02 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -175,8 +175,8 @@ public final class FeatureFlags {
             "ENABLE_SMARTSPACE_UNIVERSAL", false,
             "Replace Smartspace with a version rendered by System UI.");
 
-    public static final BooleanFlag ENABLE_SMARTSPACE_ENHANCED = new DeviceFlag(
-            "ENABLE_SMARTSPACE_ENHANCED", false,
+    public static final BooleanFlag ENABLE_SMARTSPACE_ENHANCED = getDebugFlag(
+            "ENABLE_SMARTSPACE_ENHANCED", true,
             "Replace Smartspace with the enhanced version. "
                     + "Ignored if ENABLE_SMARTSPACE_UNIVERSAL is enabled.");
 
-- 
GitLab


From 80dda30f49672f18140fe421b2fcbd1d36a6f558 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Wed, 28 Jul 2021 14:14:59 -0700
Subject: [PATCH 1647/1664] Add more restrictions on whether we increase the
 hotseat size for tall devices.

Bug: 194688362
Test: test devices that should not be affected, ensure they are not affected
Change-Id: I0e027354dbafcce30cf616998d2a7bfab516b5de
---
 src/com/android/launcher3/DeviceProfile.java | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 9ca753dd92..59962dd795 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -91,6 +91,8 @@ public class DeviceProfile {
 
     private static final float TALL_DEVICE_ASPECT_RATIO_THRESHOLD = 2.0f;
     private static final float TALLER_DEVICE_ASPECT_RATIO_THRESHOLD = 2.15f;
+    private static final float TALL_DEVICE_EXTRA_SPACE_THRESHOLD_DP = 252;
+    private static final float TALL_DEVICE_MORE_EXTRA_SPACE_THRESHOLD_DP = 268;
 
     // To evenly space the icons, increase the left/right margins for tablets in portrait mode.
     private static final int PORTRAIT_TABLET_LEFT_RIGHT_PADDING_MULTIPLIER = 4;
@@ -377,11 +379,17 @@ public class DeviceProfile {
         } else if (!isVerticalBarLayout() && isPhone && isTallDevice) {
             // We increase the hotseat size when there is extra space.
 
-            if (Float.compare(aspectRatio, TALLER_DEVICE_ASPECT_RATIO_THRESHOLD) >= 0) {
-                // For taller devices, we will take a third of the extra space from each row,
+            if (Float.compare(aspectRatio, TALLER_DEVICE_ASPECT_RATIO_THRESHOLD) >= 0
+                    && extraSpace >= Utilities.dpToPx(TALL_DEVICE_EXTRA_SPACE_THRESHOLD_DP)) {
+                // For taller devices, we will take a piece of the extra space from each row,
                 // and add it to the space above and below the hotseat.
+
+                // For devices with more extra space, we take a larger piece from each cell.
+                int piece = extraSpace < Utilities.dpToPx(TALL_DEVICE_MORE_EXTRA_SPACE_THRESHOLD_DP)
+                        ? 5 : 3;
+
                 int extraSpace = ((getCellSize().y - iconSizePx - iconDrawablePaddingPx * 2)
-                        * inv.numRows) / 3;
+                        * inv.numRows) / piece;
 
                 int halfExtraSpace = extraSpace / 2;
                 hotseatBarTopPaddingPx += halfExtraSpace;
-- 
GitLab


From d317f17273a24ac905aa5edd5739555efb906aeb Mon Sep 17 00:00:00 2001
From: Jon Spivack <spivack@google.com>
Date: Wed, 28 Jul 2021 16:28:43 -0700
Subject: [PATCH 1648/1664] NIU Actions: Change AppTheme to LauncherTheme

Some theme attributes used for the NIU Actions Overview were originally defined in a theme that inherited from LauncherTheme. However, 3rd-party Launchers that also used themes derived from LauncherTheme were unable to access these attributes, leading to crashes when they tried to open the Recents screen on Go devices. Just adding the attributes to LauncherTheme solves this issue.

Bug: 194810415
Test: Manual (tried a couple 3rd-party launchers on Wembley)
Test: m -j RunLauncherGoGoogleRoboTests
Change-Id: I7a2541f2a2ab3b39e0c6cf2fe40a4b096047df70
---
 go/quickstep/res/values/styles.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/go/quickstep/res/values/styles.xml b/go/quickstep/res/values/styles.xml
index 561531b623..442c41375d 100644
--- a/go/quickstep/res/values/styles.xml
+++ b/go/quickstep/res/values/styles.xml
@@ -16,14 +16,14 @@
 -->
 <resources>
     <!-- App themes -->
-    <style name="AppTheme" parent="@style/LauncherTheme">
+    <style name="LauncherTheme" parent="@style/BaseLauncherTheme">
         <item name="overviewButtonTextColor">@color/go_overview_text_color</item>
         <item name="overviewButtonIconColor">@color/go_overview_text_color</item>
         <item name="overviewButtonBackgroundColor">@color/go_overview_button_color</item>
         <item name="modalDialogBackground">@color/go_modal_dialog_background</item>
     </style>
 
-    <style name="AppTheme.Dark" parent="@style/LauncherTheme.Dark">
+    <style name="LauncherTheme.Dark" parent="@style/LauncherTheme">
         <item name="overviewButtonTextColor">@color/go_overview_text_color_dark</item>
         <item name="overviewButtonIconColor">@color/go_overview_text_color_dark</item>
         <item name="overviewButtonBackgroundColor">@color/go_overview_button_color_dark</item>
-- 
GitLab


From 684231560565d8477abc259e5fe222fe92c72592 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Wed, 28 Jul 2021 22:02:18 -0700
Subject: [PATCH 1649/1664] Clear command queue of OverviewCommandHelper on
 home tap

Fixes: 194934483
Test: manual
Change-Id: Id83b341245793c38c305e6ada5581ac4e49527a7
Merged-In: Id83b341245793c38c305e6ada5581ac4e49527a7
---
 .../android/launcher3/BaseQuickstepLauncher.java    | 13 +++++++++++++
 .../android/quickstep/OverviewCommandHelper.java    |  5 +++++
 .../android/quickstep/TouchInteractionService.java  |  4 ++++
 3 files changed, 22 insertions(+)

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 32e2f1ad10..a44de793a3 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -58,6 +58,7 @@ import com.android.launcher3.uioverrides.RecentsViewStateController;
 import com.android.launcher3.util.ActivityOptionsWrapper;
 import com.android.launcher3.util.ObjectWrapper;
 import com.android.launcher3.util.UiThreadHelper;
+import com.android.quickstep.OverviewCommandHelper;
 import com.android.quickstep.RecentsModel;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.SysUINavigationMode.Mode;
@@ -98,12 +99,15 @@ public abstract class BaseQuickstepLauncher extends Launcher
     private OverviewActionsView mActionsView;
 
     private @Nullable TaskbarManager mTaskbarManager;
+    private @Nullable OverviewCommandHelper mOverviewCommandHelper;
     private @Nullable LauncherTaskbarUIController mTaskbarUIController;
     private final ServiceConnection mTisBinderConnection = new ServiceConnection() {
         @Override
         public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
             mTaskbarManager = ((TISBinder) iBinder).getTaskbarManager();
             mTaskbarManager.setLauncher(BaseQuickstepLauncher.this);
+
+            mOverviewCommandHelper = ((TISBinder) iBinder).getOverviewCommandHelper();
         }
 
         @Override
@@ -136,6 +140,15 @@ public abstract class BaseQuickstepLauncher extends Launcher
         super.onDestroy();
     }
 
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+
+        if (mOverviewCommandHelper != null) {
+            mOverviewCommandHelper.clearPendingCommands();
+        }
+    }
+
     public QuickstepTransitionManager getAppTransitionManager() {
         return mAppTransitionManager;
     }
diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
index 89c2ed8ed1..5d1f90885a 100644
--- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
@@ -109,6 +109,11 @@ public class OverviewCommandHelper {
         MAIN_EXECUTOR.execute(() -> addCommand(cmd));
     }
 
+    @UiThread
+    public void clearPendingCommands() {
+        mPendingCommands.clear();
+    }
+
     private TaskView getNextTask(RecentsView view) {
         final TaskView runningTaskView = view.getRunningTaskView();
 
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index b6dc833967..db5c93c503 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -277,6 +277,10 @@ public class TouchInteractionService extends Service implements PluginListener<O
         public TaskbarManager getTaskbarManager() {
             return mTaskbarManager;
         }
+
+        public OverviewCommandHelper getOverviewCommandHelper() {
+            return mOverviewCommandHelper;
+        }
     }
 
     private static boolean sConnected = false;
-- 
GitLab


From da8bf1142f5646ef3bc14cc9f1613129b3f4cec6 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Fri, 30 Jul 2021 04:59:15 +0000
Subject: [PATCH 1650/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I13dab850677f614cab804cae0b3125c93c55eeed
---
 res/values-ar/strings.xml | 2 +-
 res/values-in/strings.xml | 2 +-
 res/values-ru/strings.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index b5b8b62450..2b8b9fa454 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -122,7 +122,7 @@
     <string name="allow_rotation_title" msgid="7728578836261442095">"السماح بتدوير الشاشة الرئيسية"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"عند تدوير الهاتف"</string>
     <string name="notification_dots_title" msgid="9062440428204120317">"نقاط الإشعارات"</string>
-    <string name="notification_dots_desc_on" msgid="1679848116452218908">"مفعّل"</string>
+    <string name="notification_dots_desc_on" msgid="1679848116452218908">"مفعّلة"</string>
     <string name="notification_dots_desc_off" msgid="1760796511504341095">"غير مفعّل"</string>
     <string name="title_missing_notification_access" msgid="7503287056163941064">"يلزم تمكين الوصول إلى الإشعارات"</string>
     <string name="msg_missing_notification_access" msgid="281113995110910548">"لعرض نقاط الإشعارات، يجب تفعيل إشعارات التطبيق في <xliff:g id="NAME">%1$s</xliff:g>"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index d3558ec2a0..673a4460bf 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -105,7 +105,7 @@
     <string name="folder_name_format_overflow" msgid="4270108890534995199">"Folder: <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="SIZE">%2$d</xliff:g> item atau lebih"</string>
     <string name="wallpaper_button_text" msgid="8404103075899945851">"Wallpaper"</string>
     <string name="styles_wallpaper_button_text" msgid="8216961355289236794">"Wallpaper &amp; gaya"</string>
-    <string name="settings_button_text" msgid="8873672322605444408">"Setelan layar utama"</string>
+    <string name="settings_button_text" msgid="8873672322605444408">"Setelan Layar utama"</string>
     <string name="msg_disabled_by_admin" msgid="6898038085516271325">"Dinonaktifkan oleh admin"</string>
     <string name="allow_rotation_title" msgid="7728578836261442095">"Izinkan Layar utama diputar"</string>
     <string name="allow_rotation_desc" msgid="8662546029078692509">"Saat ponsel diputar"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 85d7db62d4..241554261d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -75,7 +75,7 @@
     <string name="all_apps_button_label" msgid="8130441508702294465">"Список приложений"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"Открыть список личных приложений"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"Открыть список приложений для работы"</string>
-    <string name="remove_drop_target_label" msgid="7812859488053230776">"Убрать"</string>
+    <string name="remove_drop_target_label" msgid="7812859488053230776">"Удалить"</string>
     <string name="uninstall_drop_target_label" msgid="4722034217958379417">"Удалить"</string>
     <string name="app_info_drop_target_label" msgid="692894985365717661">"О приложении"</string>
     <string name="install_drop_target_label" msgid="2539096853673231757">"Установить"</string>
-- 
GitLab


From fb5ae9060dcb2bc562f915c0f3271aaf1cabc960 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Wed, 28 Jul 2021 17:23:20 +0100
Subject: [PATCH 1651/1664] Always treat FallbackRecentsView as visible if
 isInLiveTileMode is true

- activity.hasBeenResumed is no longer an accurate indicator after live tile has been introduced, indeed it's always false
- Return recentsView regardless if there is a runningTask as well

Bug: 194286330
Test: In fallback Recents with 3 button, tap overview button from home screen, then tap overview button again. Try combination with back and home button
Change-Id: Ib2775a11f5466abc433763f24192e7bfdcf191a2
(cherry picked from commit 455718e8422707c021445205da3b194094fae411)
---
 .../com/android/quickstep/FallbackActivityInterface.java   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
index f29d68a72a..7fb8e16063 100644
--- a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
@@ -107,10 +107,9 @@ public final class FallbackActivityInterface extends
     public RecentsView getVisibleRecentsView() {
         RecentsActivity activity = getCreatedActivity();
         if (activity != null) {
-            RecentsView recentsView = activity.getOverviewPanel();
-            if (activity.hasBeenResumed() || (ENABLE_QUICKSTEP_LIVE_TILE.get() && isInLiveTileMode()
-                    && recentsView.getRunningTaskId() == -1)) {
-                return recentsView;
+            if (activity.hasBeenResumed()
+                    || (ENABLE_QUICKSTEP_LIVE_TILE.get() && isInLiveTileMode())) {
+                return activity.getOverviewPanel();
             }
         }
         return null;
-- 
GitLab


From 21091ada882ce3a3abd16fec53598008e0ec96db Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Tue, 3 Aug 2021 11:08:52 -0700
Subject: [PATCH 1652/1664] Logging to figure out why first dump didn't result
 in assertion

Bug: 195319692
Test: presubmit
Change-Id: I4a80541a58eb8f630211de4b90836c435f6d41b2
---
 tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index bf4eba0f64..dcb6dc1b02 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -153,6 +153,8 @@ public abstract class AbstractLauncherUiTest {
     public static String dumpHprofData() {
         String result;
         if (sDumpWasGenerated) {
+            Log.d("b/195319692", "dump has already been generated by another test",
+                    new Exception());
             result = "dump has already been generated by another test";
         } else {
             try {
@@ -167,6 +169,7 @@ public abstract class AbstractLauncherUiTest {
                             "am dumpheap " + device.getLauncherPackageName() + " " + fileName);
                 }
                 sDumpWasGenerated = true;
+                Log.d("b/195319692", "sDumpWasGenerated := true", new Exception());
                 result = "memory dump filename: " + fileName;
             } catch (Throwable e) {
                 Log.e(TAG, "dumpHprofData failed", e);
-- 
GitLab


From 145bd7474935a4cde1e2965e7a34943695463151 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Tue, 20 Jul 2021 15:58:19 -0700
Subject: [PATCH 1653/1664] [DO NOT MERGE] Disable live tile in split mode for
 S

Recall link: https://recall.googleplex.com/projects/debb8388-5e38-42c5-99ab-20bdfb92d25e/sessions/655af962-b4bd-4dc4-93aa-178852c0d701

Bug: 193991436
Test: enter split screen and swipe up
Change-Id: I7adffcdefb12d225db207542716a436f29df0377
---
 .../com/android/quickstep/util/TaskViewSimulator.java  | 10 +++++++++-
 .../src/com/android/quickstep/views/RecentsView.java   |  9 ++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index c97ca32aa2..cceb872f78 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -56,6 +56,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
 
     private final Context mContext;
     private final BaseActivityInterface mSizeStrategy;
+    private final boolean mIsForLiveTile;
 
     @NonNull
     private RecentsOrientedState mOrientationState;
@@ -93,8 +94,14 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
     private int mOrientationStateId;
 
     public TaskViewSimulator(Context context, BaseActivityInterface sizeStrategy) {
+        this(context, sizeStrategy, false);
+    }
+
+    public TaskViewSimulator(Context context, BaseActivityInterface sizeStrategy,
+            boolean isForLiveTile) {
         mContext = context;
         mSizeStrategy = sizeStrategy;
+        mIsForLiveTile = isForLiveTile;
 
         // TODO(b/187074722): Don't create this per-TaskViewSimulator
         mOrientationState = TraceHelper.allowIpcs("",
@@ -302,7 +309,8 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
                 .withWindowCrop(mTmpCropRect)
                 .withCornerRadius(getCurrentCornerRadius());
 
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && params.getRecentsSurface() != null) {
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && mIsForLiveTile
+                && params.getRecentsSurface() != null) {
             // When relativeLayer = 0, it reverts the surfaces back to the original order.
             builder.withRelativeLayerTo(params.getRecentsSurface(),
                     mDrawsBelowRecents ? Integer.MIN_VALUE : 0);
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 4e1bcc9bee..ce79125be1 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -629,7 +629,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         // Initialize quickstep specific cache params here, as this is constructed only once
         mActivity.getViewCache().setCacheSize(R.layout.digital_wellbeing_toast, 5);
 
-        mLiveTileTaskViewSimulator = new TaskViewSimulator(getContext(), getSizeStrategy());
+        mLiveTileTaskViewSimulator = new TaskViewSimulator(getContext(), getSizeStrategy(),
+                true /* isForLiveTile */);
         mLiveTileTaskViewSimulator.recentsViewScale.value = 1;
         mLiveTileTaskViewSimulator.setOrientationState(mOrientationState);
         mLiveTileTaskViewSimulator.setDrawsBelowRecents(true);
@@ -1791,6 +1792,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         }
 
         mCurrentGestureEndTarget = null;
+
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && mActivity.getDeviceProfile().isMultiWindowMode) {
+            switchToScreenshot(
+                    () -> finishRecentsAnimation(true /* toRecents */, false /* shouldPip */,
+                            null));
+        }
     }
 
     /**
-- 
GitLab


From b269cc515030cb8a955d2c8315af98be56101236 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 4 Aug 2021 11:14:09 +0100
Subject: [PATCH 1654/1664] Don't delete widgets that violate min size
 requirement

Test: Manual
Bug: 194766124
Change-Id: I4713e65e27da23d833bb60fb556ae8924a63e305
---
 src/com/android/launcher3/model/LoaderTask.java | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index 28fd389c49..f6b0b4d3c8 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -760,16 +760,13 @@ public class LoaderTask implements Runnable {
                                 if (widgetProviderInfo != null
                                         && (appWidgetInfo.spanX < widgetProviderInfo.minSpanX
                                         || appWidgetInfo.spanY < widgetProviderInfo.minSpanY)) {
-                                    logDeleteWidgetInfo(mApp.getInvariantDeviceProfile(),
-                                            widgetProviderInfo);
-
-                                    // This can happen when display size changes.
-                                    c.markDeleted("Widget removed, min sizes not met: "
-                                            + "span=" + appWidgetInfo.spanX + "x"
-                                            + appWidgetInfo.spanY + " minSpan="
+                                    FileLog.d(TAG, "Widget " + widgetProviderInfo.getComponent()
+                                            + " minSizes not meet: span=" + appWidgetInfo.spanX
+                                            + "x" + appWidgetInfo.spanY + " minSpan="
                                             + widgetProviderInfo.minSpanX + "x"
                                             + widgetProviderInfo.minSpanY);
-                                    continue;
+                                    logWidgetInfo(mApp.getInvariantDeviceProfile(),
+                                            widgetProviderInfo);
                                 }
                                 if (!c.isOnWorkspaceOrHotseat()) {
                                     c.markDeleted("Widget found where container != " +
@@ -990,10 +987,8 @@ public class LoaderTask implements Runnable {
     }
 
     @SuppressLint("NewApi") // Already added API check.
-    private static void logDeleteWidgetInfo(InvariantDeviceProfile idp,
+    private static void logWidgetInfo(InvariantDeviceProfile idp,
             LauncherAppWidgetProviderInfo widgetProviderInfo) {
-        FileLog.d(TAG, "Deleting " + widgetProviderInfo.getComponent()
-                + " due to min size constraint");
         Point cellSize = new Point();
         for (DeviceProfile deviceProfile : idp.supportedProfiles) {
             deviceProfile.getCellSize(cellSize);
-- 
GitLab


From dafa5040ef2cf933201b8b77c3f7ced35ea5adae Mon Sep 17 00:00:00 2001
From: Brian Isganitis <brianji@google.com>
Date: Wed, 4 Aug 2021 14:21:27 -0400
Subject: [PATCH 1655/1664] Fix crash from previewing launcher with unknown
 wallpaper colors.

Test: Open wallpaper app with live wallpaper applied should not crash.
Fix: 195246865
Change-Id: Id64de32b35aa7a553daa752438060d7f6822bec8
---
 .../android/launcher3/graphics/LauncherPreviewRenderer.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index a387f04e5b..7a31ea01b5 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -268,8 +268,8 @@ public class LauncherPreviewRenderer extends ContextWrapper
             WallpaperColors wallpaperColors = wallpaperColorsOverride != null
                     ? wallpaperColorsOverride
                     : WallpaperManager.getInstance(context).getWallpaperColors(FLAG_SYSTEM);
-            mWallpaperColorResources = LocalColorExtractor.newInstance(context)
-                    .generateColorsOverride(wallpaperColors);
+            mWallpaperColorResources = wallpaperColors != null ? LocalColorExtractor.newInstance(
+                    context).generateColorsOverride(wallpaperColors) : null;
         } else {
             mWallpaperColorResources = null;
         }
-- 
GitLab


From a56cb8414157cd2a808696f64db1f961b88da637 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Tue, 3 Aug 2021 17:26:44 -0700
Subject: [PATCH 1656/1664] Update extra space allocations for taller devices.

- Take less space from cells
- Distribute some of the empty space above the workspace
- Already confirmed from previous testing that these thresholds
  only affect taller devices

Bug: 194688362
Test: long press on app icons,
      test drag and drop bounds
      test drop target bounds
      test folder opening bounds
      test all grids on taller devices

Change-Id: If90b7663ab4afedca1193bdd73a0ae38a1f25243
---
 src/com/android/launcher3/DeviceProfile.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 59962dd795..81eda10a15 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -386,14 +386,15 @@ public class DeviceProfile {
 
                 // For devices with more extra space, we take a larger piece from each cell.
                 int piece = extraSpace < Utilities.dpToPx(TALL_DEVICE_MORE_EXTRA_SPACE_THRESHOLD_DP)
-                        ? 5 : 3;
+                        ? 7 : 5;
 
                 int extraSpace = ((getCellSize().y - iconSizePx - iconDrawablePaddingPx * 2)
                         * inv.numRows) / piece;
 
-                int halfExtraSpace = extraSpace / 2;
-                hotseatBarTopPaddingPx += halfExtraSpace;
-                hotseatBarSizeExtraSpacePx = halfExtraSpace;
+                workspaceTopPadding = extraSpace / 8;
+                int halfLeftOver = (extraSpace - workspaceTopPadding) / 2;
+                hotseatBarTopPaddingPx += halfLeftOver;
+                hotseatBarSizeExtraSpacePx = halfLeftOver;
             } else {
                 // ie. For a display with a large aspect ratio, we can keep the icons on the
                 // workspace in portrait mode closer together by adding more height to the hotseat.
-- 
GitLab


From ff049aae0faf90f74935de8032ea9119f352743c Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 4 Aug 2021 22:14:26 +0000
Subject: [PATCH 1657/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I8da912b3e7ec23e63a5c1436773cd86b8cb8dffc
---
 quickstep/res/values-ar/strings.xml     |  6 +++---
 quickstep/res/values-es-rUS/strings.xml |  8 ++++----
 quickstep/res/values-fr-rCA/strings.xml |  2 +-
 quickstep/res/values-fr/strings.xml     | 12 ++++++------
 quickstep/res/values-hi/strings.xml     |  4 ++--
 quickstep/res/values-ko/strings.xml     |  4 ++--
 quickstep/res/values-nl/strings.xml     |  6 +++---
 quickstep/res/values-zh-rCN/strings.xml | 12 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/quickstep/res/values-ar/strings.xml b/quickstep/res/values-ar/strings.xml
index 64fe3828d1..3f26977245 100644
--- a/quickstep/res/values-ar/strings.xml
+++ b/quickstep/res/values-ar/strings.xml
@@ -56,14 +56,14 @@
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"تأكّد من التمرير سريعًا من الحافة السفلى للشاشة إلى أعلاها."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"تأكّد من عدم التوقّف قليلاً قبل رفع إصبعك."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"تأكّد من التمرير إلى الأعلى مباشرةً."</string>
-    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"أكملت التدريب على إيماءة الانتقال إلى الشاشة الرئيسية. تعرّف بعد ذلك على كيفية الرجوع."</string>
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"لقد أكملت التدريب على إيماءة الانتقال إلى الشاشة الرئيسية. تعرّف بعد ذلك على كيفية الرجوع."</string>
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"أكملت التدريب على إيماءة الانتقال إلى الشاشة الرئيسية."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"مرِّر سريعًا للانتقال إلى الشاشة الرئيسية"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"مرِّر سريعًا من أسفل الشاشة إلى أعلاها. تنقلك هذه الإيماءة دائمًا إلى الشاشة الرئيسية."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"تأكّد من التمرير سريعًا من الحافة السفلى للشاشة إلى أعلاها."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"حاوِل إبقاء إصبعك على النافذة لمدة أطول قبل رفعه."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"تأكّد من التمرير سريعًا للأعلى مباشرةً ثم التوقّف قليلاً."</string>
-    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"تعرّفت على كيفية استخدام الإيماءات. لإيقاف الإيماءات، انتقِل إلى \"الإعدادات\"."</string>
+    <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"لقد تعرّفت على كيفية استخدام الإيماءات. لإيقاف الإيماءات، انتقِل إلى \"الإعدادات\"."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"أكملت التدريب على إيماءة التبديل بين التطبيقات."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"مرِّر سريعًا للتبديل بين التطبيقات"</string>
     <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"للتبديل بين التطبيقات، مرِّر سريعًا من أسفل الشاشة لأعلاها مع تثبيت إصبعك ثم ارفعه."</string>
@@ -73,7 +73,7 @@
     <string name="gesture_tutorial_try_again" msgid="65962545858556697">"إعادة المحاولة"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"أحسنت"</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"الدليل التوجيهي <xliff:g id="CURRENT">%1$d</xliff:g> من إجمالي <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
-    <string name="allset_title" msgid="5021126669778966707">"اكتمال الإعداد"</string>
+    <string name="allset_title" msgid="5021126669778966707">"اكتملت عملية الإعداد"</string>
     <string name="allset_hint" msgid="2384632994739392447">"مرِّر سريعًا للأعلى للانتقال إلى الشاشة الرئيسية."</string>
     <string name="allset_description" msgid="6350320429953234580">"يمكنك الآن بدء استخدام هاتفك."</string>
     <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"إعدادات التنقّل داخل النظام"</annotation></string>
diff --git a/quickstep/res/values-es-rUS/strings.xml b/quickstep/res/values-es-rUS/strings.xml
index a4e5778654..e61fd9135d 100644
--- a/quickstep/res/values-es-rUS/strings.xml
+++ b/quickstep/res/values-es-rUS/strings.xml
@@ -53,16 +53,16 @@
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Cambia sensibilidad de gesto \"Atrás\" en Configuración"</string>
     <string name="back_gesture_intro_title" msgid="19551256430224428">"Desliza el dedo para volver"</string>
     <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Desliza el dedo desde el borde derecho o izquierdo para volver a la última pantalla."</string>
-    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Asegúrate de deslizar el dedo hacia arriba desde la borde inferior de la pantalla."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Desliza el dedo hacia arriba desde el borde inferior de la pantalla."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Asegúrate de no detenerte antes de soltarlo."</string>
-    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Asegúrate de deslizar el dedo derecho hacia arriba."</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Desliza el dedo directamente hacia arriba."</string>
     <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Completaste el gesto para ir a la página principal. A continuación, obtén información para volver."</string>
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Completaste el gesto para ir a la página principal."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Desliza el dedo para ir a la página principal"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Desliza el dedo hacia arriba desde la parte inferior de la pantalla. Este gesto te llevará siempre a la pantalla principal."</string>
-    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Asegúrate de deslizar el dedo hacia arriba desde la borde inferior de la pantalla."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Desliza el dedo hacia arriba desde el borde inferior de la pantalla."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Prueba mantener presionada la ventana más tiempo antes de soltarla."</string>
-    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Asegúrate de deslizar el dedo derecho hacia arriba y, luego, detente."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Desliza el dedo directamente hacia arriba y luego detente."</string>
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Ya sabes cómo usar los gestos. Para desactivarlos, ve a Configuración."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Completaste el gesto para cambiar de app."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Desliza el dedo para cambiar de app"</string>
diff --git a/quickstep/res/values-fr-rCA/strings.xml b/quickstep/res/values-fr-rCA/strings.xml
index f7b0605ede..a3c9393080 100644
--- a/quickstep/res/values-fr-rCA/strings.xml
+++ b/quickstep/res/values-fr-rCA/strings.xml
@@ -51,7 +51,7 @@
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"Vous avez appris le geste de retour en arrière."</string>
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"Assurez-vous de ne pas balayer trop près du bas de l\'écran."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Modifiez la sensibilité du geste de retour dans Paramètres"</string>
-    <string name="back_gesture_intro_title" msgid="19551256430224428">"Balayez l\'écran pour revenir en arrière"</string>
+    <string name="back_gesture_intro_title" msgid="19551256430224428">"Balayer l\'écran pour revenir en arrière"</string>
     <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Pour revenir à l\'écran précédent, balayez l\'écran de l\'extrémité gauche ou droite vers le centre."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Assurez-vous de balayer l\'écran à partir de l\'extrémité inférieure vers le haut."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Assurez-vous de ne pas interrompre le geste avant de lever le doigt."</string>
diff --git a/quickstep/res/values-fr/strings.xml b/quickstep/res/values-fr/strings.xml
index 7e2e957d80..516479202d 100644
--- a/quickstep/res/values-fr/strings.xml
+++ b/quickstep/res/values-fr/strings.xml
@@ -53,20 +53,20 @@
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"Modifiez la sensibilité du geste retour dans les paramètres"</string>
     <string name="back_gesture_intro_title" msgid="19551256430224428">"Balayez l\'écran pour revenir en arrière"</string>
     <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"Pour revenir à l\'écran précédent, balayez l\'écran depuis le bord droit ou gauche jusqu\'au centre."</string>
-    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Veillez à balayer l\'écran du bas vers le haut."</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Veillez à balayer l\'écran de bas en haut."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Veillez à ne pas marquer de pause dans votre geste avant de relever le doigt."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Veillez à balayer l\'écran vers le haut."</string>
     <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Vous savez désormais revenir à l\'écran d\'accueil. Apprenez maintenant à revenir en arrière."</string>
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Vous avez appris le geste pour revenir à l\'écran d\'accueil."</string>
-    <string name="home_gesture_intro_title" msgid="836590312858441830">"Balayer pour revenir à l\'écran d\'accueil"</string>
+    <string name="home_gesture_intro_title" msgid="836590312858441830">"Balayez pour revenir à l\'écran d\'accueil"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Balayez l\'écran de bas en haut. Ce geste vous ramènera toujours à l\'écran d\'accueil."</string>
-    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Veillez à balayer l\'écran du bas vers le haut."</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"Veillez à balayer l\'écran de bas en haut."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"Essayez d\'appuyer plus longtemps sur la fenêtre avant de relever le doigt."</string>
-    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Veillez à balayer l\'écran vers le haut et à marquer une pause dans votre geste."</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"Veillez à balayer l\'écran vers le haut, puis à marquer une pause."</string>
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Vous avez appris à utiliser les gestes. Pour les désactiver, accédez aux paramètres."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Vous avez appris le geste pour passer d\'une appli à l\'autre."</string>
-    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Balayer pour passer d\'une appli à l\'autre"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Pour changer d\'appli, balayez l\'écran du bas vers le haut, appuyez de manière prolongée et relâchez."</string>
+    <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Balayez pour passer d\'une appli à l\'autre"</string>
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Pour changer d\'appli, balayez l\'écran de bas en haut, appuyez de manière prolongée et relâchez."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Vous avez terminé"</string>
     <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"OK"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Paramètres"</string>
diff --git a/quickstep/res/values-hi/strings.xml b/quickstep/res/values-hi/strings.xml
index 44f2f1594f..50ebb27f4b 100644
--- a/quickstep/res/values-hi/strings.xml
+++ b/quickstep/res/values-hi/strings.xml
@@ -49,7 +49,7 @@
     <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"स्क्रीन के दाएं या बाएं किनारे से स्क्रीन के बीच तक स्वाइप करें और अपनी उंगली उठा लें."</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"आपने स्क्रीन के दाएं किनारे से स्वाइप करके, पिछली स्क्रीन पर वापस जाने का तरीका सीख लिया है. अब, एक ऐप से दूसरे ऐप पर जाने का तरीका सीखें."</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"आपने पेज पर पीछे ले जाने वाले हाथ के जेस्चर (हाव-भाव) के बारे में जान लिया है."</string>
-    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"देखे लें कि आप स्क्रीन पर बिल्कुल नीचे तक स्वाइप न कर रहे हों."</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"देख लें कि आप स्क्रीन पर बिल्कुल नीचे तक स्वाइप न कर रहे हों."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"\'सेटिंग\' में जाकर, पीछे जाने के लिए इस्तेमाल होने वाले हाथ के जेस्चर (हाव-भाव) की संवेदनशीलता बदलें"</string>
     <string name="back_gesture_intro_title" msgid="19551256430224428">"पिछली स्क्रीन पर वापस जाने के लिए स्वाइप करें"</string>
     <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"पिछली स्क्रीन पर वापस जाने के लिए, स्क्रीन के बाएं या दाएं किनारे से बीचों-बीच तक स्वाइप करें."</string>
@@ -83,5 +83,5 @@
     <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"नेविगेशन ट्यूटोरियल छोड़ना चाहते हैं?"</string>
     <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"आप बाद में <xliff:g id="NAME">%1$s</xliff:g> ऐप्लिकेशन पर इसे देख सकते हैं"</string>
     <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"अभी नहीं"</string>
-    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"छोड़ें"</string>
+    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"अभी नहीं"</string>
 </resources>
diff --git a/quickstep/res/values-ko/strings.xml b/quickstep/res/values-ko/strings.xml
index 9ec5295274..ba564a707b 100644
--- a/quickstep/res/values-ko/strings.xml
+++ b/quickstep/res/values-ko/strings.xml
@@ -52,14 +52,14 @@
     <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"화면 하단에 지나치게 가까운 곳에서 스와이프하면 안 됩니다."</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"돌아가기 동작의 민감도를 변경하려면 설정으로 이동하세요"</string>
     <string name="back_gesture_intro_title" msgid="19551256430224428">"스와이프하여 돌아가기"</string>
-    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"마지막 화면으로 돌아가려면 왼쪽 또는 오른쪽 가장자리에서 화면 중앙으로 스와이프하세요"</string>
+    <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"마지막 화면으로 돌아가려면 왼쪽 또는 오른쪽 가장자리에서 화면 중앙으로 스와이프하세요."</string>
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"화면 하단 가장자리에서 위로 스와이프하세요."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"손가락을 떼기 전에 멈추지 않아야 합니다."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"위로 똑바르게 스와이프하세요."</string>
     <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"홈으로 이동 동작을 완료했습니다. 이번에는 뒤로 돌아가는 방법을 알아보겠습니다."</string>
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"홈으로 이동 동작을 완료했습니다."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"스와이프하여 홈으로 이동"</string>
-    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"화면 하단에서 위로 스와이프합니다. 이 동작을 사용하면 언제든지 홈 화면으로 이동할 수 있습니다"</string>
+    <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"화면 하단에서 위로 스와이프합니다. 이 동작을 사용하면 언제든지 홈 화면으로 이동할 수 있습니다."</string>
     <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"화면 하단 가장자리에서 위로 스와이프하세요."</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"창을 더 오래 누르고 있다가 손가락을 떼 보세요."</string>
     <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"위로 똑바르게 스와이프한 후 잠깐 멈추세요."</string>
diff --git a/quickstep/res/values-nl/strings.xml b/quickstep/res/values-nl/strings.xml
index f6841fa0bf..96da9664b8 100644
--- a/quickstep/res/values-nl/strings.xml
+++ b/quickstep/res/values-nl/strings.xml
@@ -56,7 +56,7 @@
     <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"Swipe vanaf de onderrand van het scherm omhoog."</string>
     <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"Pauzeer niet voordat je loslaat."</string>
     <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"Swipe recht omhoog."</string>
-    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Je weet nu hoe je teruggaat naar het startscherm. Ontdek als volgende hoe je kunt teruggaan."</string>
+    <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"Je weet nu hoe je weer naar het startscherm gaat. Ontdek als volgende hoe je weer teruggaat."</string>
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"Je weet nu hoe je teruggaat naar het startscherm."</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"Swipe om naar het startscherm te gaan"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"Swipe omhoog vanaf de onderkant van het scherm. Met dit gebaar ga je altijd naar het startscherm."</string>
@@ -66,11 +66,11 @@
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"Je weet nu hoe je gebaren gebruikt. Als je gebaren wilt uitzetten, kun je dat via Instellingen doen."</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"Je weet nu hoe je het gebaar Schakelen tussen apps maakt."</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"Swipe om tussen apps te schakelen"</string>
-    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Swipe omhoog vanaf de onderkant van het scherm, houd vast en laat los om tussen apps te wisselen."</string>
+    <string name="overview_gesture_intro_subtitle" msgid="4968091015637850859">"Swipe omhoog vanaf de onderkant van het scherm, houd vast en laat los om tussen apps te schakelen."</string>
     <string name="gesture_tutorial_confirm_title" msgid="6201516182040074092">"Klaar"</string>
     <string name="gesture_tutorial_action_button_label" msgid="6249846312991332122">"Klaar"</string>
     <string name="gesture_tutorial_action_button_label_settings" msgid="2923621047916486604">"Instellingen"</string>
-    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Opnieuw"</string>
+    <string name="gesture_tutorial_try_again" msgid="65962545858556697">"Probeer opnieuw"</string>
     <string name="gesture_tutorial_nice" msgid="2936275692616928280">"Dat gaat lekker."</string>
     <string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="allset_title" msgid="5021126669778966707">"Klaar"</string>
diff --git a/quickstep/res/values-zh-rCN/strings.xml b/quickstep/res/values-zh-rCN/strings.xml
index c7e0bb70a1..9e641dec30 100644
--- a/quickstep/res/values-zh-rCN/strings.xml
+++ b/quickstep/res/values-zh-rCN/strings.xml
@@ -49,20 +49,20 @@
     <string name="back_gesture_feedback_cancelled" msgid="3274382913290074496">"请从右侧或左侧边缘滑动到屏幕中间位置后再松开手指。"</string>
     <string name="back_gesture_feedback_complete_with_overview_follow_up" msgid="9176400654037014471">"您已了解如何使用“从右侧向左滑动”手势返回。接下来了解如何切换应用。"</string>
     <string name="back_gesture_feedback_complete_without_follow_up" msgid="6405649621667113830">"您完成了“返回”手势教程。"</string>
-    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"滑动时，手的位置不要太靠近屏幕底部。"</string>
+    <string name="back_gesture_feedback_swipe_in_nav_bar" msgid="1148198467090405643">"请确保滑动时手的位置不要太靠近屏幕底部。"</string>
     <string name="back_gesture_tutorial_confirm_subtitle" msgid="5181305411668713250">"如要调节“返回”手势的灵敏度，请转到“设置”"</string>
     <string name="back_gesture_intro_title" msgid="19551256430224428">"滑动即可返回"</string>
     <string name="back_gesture_intro_subtitle" msgid="7912576483031802797">"如要返回上一个屏幕，请从左侧或右侧边缘滑动到屏幕中间位置。"</string>
-    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"请从屏幕底部边缘向上滑动。"</string>
-    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"在松开手指前请勿停下来。"</string>
-    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"请向上滑动。"</string>
+    <string name="home_gesture_feedback_swipe_too_far_from_edge" msgid="1446774096007065298">"请确保从屏幕底部边缘向上滑动。"</string>
+    <string name="home_gesture_feedback_overview_detected" msgid="1557523944897393013">"松开手指前，请确保不要停下来。"</string>
+    <string name="home_gesture_feedback_wrong_swipe_direction" msgid="6993979358080825438">"请确保直接向上滑动。"</string>
     <string name="home_gesture_feedback_complete_with_follow_up" msgid="1427872029729605034">"您完成了“转到主屏幕”手势教程。接下来了解如何返回。"</string>
     <string name="home_gesture_feedback_complete_without_follow_up" msgid="8049099486868933882">"您完成了“转到主屏幕”手势教程。"</string>
     <string name="home_gesture_intro_title" msgid="836590312858441830">"上滑可转到主屏幕"</string>
     <string name="home_gesture_intro_subtitle" msgid="2632238748497975326">"从屏幕底部向上滑动。这个手势会一律将您转到主屏幕。"</string>
-    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"请从屏幕底部边缘向上滑动。"</string>
+    <string name="overview_gesture_feedback_swipe_too_far_from_edge" msgid="3032757898111577225">"请确保从屏幕底部边缘向上滑动。"</string>
     <string name="overview_gesture_feedback_home_detected" msgid="1411130969354020489">"请尝试按住窗口较长时间，然后再松开手指。"</string>
-    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"请向上滑动，然后停住。"</string>
+    <string name="overview_gesture_feedback_wrong_swipe_direction" msgid="6725820500906747925">"请确保直接向上滑动，然后停住。"</string>
     <string name="overview_gesture_feedback_complete_with_follow_up" msgid="3544611727467765026">"您已了解如何使用手势了。如要关闭手势，请转到“设置”。"</string>
     <string name="overview_gesture_feedback_complete_without_follow_up" msgid="3199486203448379152">"您完成了“切换应用”手势教程。"</string>
     <string name="overview_gesture_intro_title" msgid="2902054412868489378">"滑动即可切换应用"</string>
-- 
GitLab


From 315b29c87ebb9bdb6acb8bb389582ce0c5d597f0 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 4 Aug 2021 22:16:53 +0000
Subject: [PATCH 1658/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Id83c1f3b8772c671e8a8836da2435f75d21cf40e
---
 res/values-it/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index aee2c73709..71a3403835 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -85,7 +85,7 @@
     <string name="permdesc_write_settings" msgid="5440712911516509985">"Consente all\'app di modificare le impostazioni e le scorciatoie in Home."</string>
     <string name="msg_no_phone_permission" msgid="9208659281529857371">"L\'app <xliff:g id="APP_NAME">%1$s</xliff:g> non è autorizzata a effettuare telefonate"</string>
     <string name="gadget_error_text" msgid="740356548025791839">"Impossibile caricare il widget"</string>
-    <string name="gadget_setup_text" msgid="1745356155479272374">"Tocca per completare la configurazione"</string>
+    <string name="gadget_setup_text" msgid="1745356155479272374">"Tocca e completa configurazione"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"Questa è un\'app di sistema e non può essere disinstallata."</string>
     <string name="folder_hint_text" msgid="5174843001373488816">"Modifica nome"</string>
     <string name="disabled_app_label" msgid="6673129024321402780">"App <xliff:g id="APP_NAME">%1$s</xliff:g> disattivata"</string>
-- 
GitLab


From 1c016851862141218ed2e9feb795a150e60ebe1c Mon Sep 17 00:00:00 2001
From: Damian Patel <damianpatel@google.com>
Date: Wed, 28 Jul 2021 14:38:39 +0000
Subject: [PATCH 1659/1664] API level 30 upgrade: AOSP/Launcher3

The AndroidManifest.xml and build.gradle file of the AOSP
Launcher app has been upgraded so that its targetSdkVersion
is 30. This change has been made on git_master so that
we can avoid presubmit conflicts when making this change
on the aosp-master branch.

Change-Id: Ie476f8cbe56bf51218b15b8361a22fec2dc845e6
(cherry picked from commit 499ffce2e704aa82b4d10468f99afd3dc4e727f8)
---
 AndroidManifest.xml | 2 +-
 build.gradle        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8066816e89..f793131fd3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,7 +20,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.launcher3">
-    <uses-sdk android:targetSdkVersion="29" android:minSdkVersion="26"/>
+    <uses-sdk android:targetSdkVersion="30" android:minSdkVersion="26"/>
     <!--
     Manifest entries specific to Launcher3. This is merged with AndroidManifest-common.xml.
     Refer comments around specific entries on how to extend individual components.
diff --git a/build.gradle b/build.gradle
index a7eef13a3d..0622d87764 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,8 +21,8 @@ android {
     buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
-        minSdkVersion 25
-        targetSdkVersion 28
+        minSdkVersion 26
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
 
-- 
GitLab


From 8bc9c6355ad2d274f488396488bd0ad8ea8fb081 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Mon, 9 Aug 2021 22:32:00 +0000
Subject: [PATCH 1660/1664] Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I8a0be2eb6ceb321440efdf75d2b8f6232de201fe
---
 res/values-te/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 80a6f10bf1..68938883b1 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -68,7 +68,7 @@
     <string name="long_accessible_way_to_add_shortcut" msgid="2199537273817090740">"షార్ట్‌కట్‌ను తరలించడానికి లేదా అనుకూల చర్యలను ఉపయోగించడానికి రెండుసార్లు నొక్కండి &amp; హోల్డ్ చేయండి."</string>
     <string name="out_of_space" msgid="6692471482459245734">"ఈ మొదటి స్క్రీన్‌లో స్థలం లేదు"</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"ఇష్టమైనవి ట్రేలో ఖాళీ లేదు"</string>
-    <string name="all_apps_button_label" msgid="8130441508702294465">"అనువర్తనాల జాబితా"</string>
+    <string name="all_apps_button_label" msgid="8130441508702294465">"యాప్‌ల జాబితా"</string>
     <string name="all_apps_button_personal_label" msgid="1315764287305224468">"వ్యక్తిగత యాప్‌ల జాబితా"</string>
     <string name="all_apps_button_work_label" msgid="7270707118948892488">"కార్యాలయ యాప్‌ల జాబితా"</string>
     <string name="remove_drop_target_label" msgid="7812859488053230776">"తీసివేయి"</string>
@@ -83,7 +83,7 @@
     <string name="permdesc_read_settings" msgid="5833423719057558387">"హోమ్‌లో సెట్టింగ్‌లు మరియు సత్వరమార్గాలను చదవడానికి యాప్‌ను అనుమతిస్తుంది."</string>
     <string name="permlab_write_settings" msgid="3574213698004620587">"హోమ్ సెట్టింగ్‌లు మరియు సత్వరమార్గాలను వ్రాయడం"</string>
     <string name="permdesc_write_settings" msgid="5440712911516509985">"హోమ్‌లో సెట్టింగ్‌లు మరియు సత్వరమార్గాలను మార్చడానికి యాప్‌ను అనుమతిస్తుంది."</string>
-    <string name="msg_no_phone_permission" msgid="9208659281529857371">"ఫోన్ కాల్‌లను చేసేందుకు <xliff:g id="APP_NAME">%1$s</xliff:g>కి అనుమతి లేదు"</string>
+    <string name="msg_no_phone_permission" msgid="9208659281529857371">"ఫోన్ కాల్స్‌ను చేసేందుకు <xliff:g id="APP_NAME">%1$s</xliff:g>కి అనుమతి లేదు"</string>
     <string name="gadget_error_text" msgid="740356548025791839">"విడ్జెట్‌ను లోడ్ చేయడం సాధ్యం కాలేదు"</string>
     <string name="gadget_setup_text" msgid="1745356155479272374">"సెటప్‌ను పూర్తి చేయడానికి ట్యాప్ చేయండి"</string>
     <string name="uninstall_system_app_text" msgid="4172046090762920660">"ఇది సిస్టమ్ యాప్ మరియు దీన్ని అన్‌ఇన్‌స్టాల్ చేయడం సాధ్యపడదు."</string>
-- 
GitLab


From 3f6a4e6bf5c1618583770a88a16a0647df8a27d2 Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Mon, 9 Aug 2021 17:45:22 -0700
Subject: [PATCH 1661/1664] Adjust all apps zoom level

The All Apps scrim fades in early, covering part of the zoom animation.
We need to adjust the max zoom in order to make All Apps consistent with
Overview, -1, and Shade.

Test: pull up the all apps drawer
Fixes: 195992422
Change-Id: Ia7bbe17fe7f227dd0a16ba7d21b402cff57176f0
(cherry picked from commit f168bb7aaf94dc3e7c483278ee6eb671485c38c1)
---
 .../android/launcher3/uioverrides/states/AllAppsState.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
index d822c8cf82..f8c9fd128f 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
@@ -70,7 +70,9 @@ public class AllAppsState extends LauncherState {
 
     @Override
     protected float getDepthUnchecked(Context context) {
-        return 1f;
+        // The scrim fades in at approximately 50% of the swipe gesture.
+        // This means that the depth should be greater than 1, in order to fully zoom out.
+        return 2f;
     }
 
     @Override
-- 
GitLab


From bdffb53843235563a2c40a3f503234cb1c767a62 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 11 Aug 2021 22:40:06 +0100
Subject: [PATCH 1662/1664] Fix pending restore widget touch issue

After http://ag/14980850, we block updateAppWidget until app widget
is restored. However, PendingAppWidgetHostView constructor relies
on updateAppWidget(null) to trigger set listener in getDefaultView().
We should call super.updateAppWidget(null) in the constructor instead.

Test: manual
Bug: 14980850
Change-Id: I30af9778a636af2ad822e7abc152b6f0bfdea1bf
---
 src/com/android/launcher3/widget/PendingAppWidgetHostView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/widget/PendingAppWidgetHostView.java b/src/com/android/launcher3/widget/PendingAppWidgetHostView.java
index d3a019001d..57a6d3fb07 100644
--- a/src/com/android/launcher3/widget/PendingAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/PendingAppWidgetHostView.java
@@ -85,7 +85,7 @@ public class PendingAppWidgetHostView extends LauncherAppWidgetHostView
         setBackgroundResource(R.drawable.pending_widget_bg);
         setWillNotDraw(false);
 
-        updateAppWidget(null);
+        super.updateAppWidget(null);
         setOnClickListener(ItemClickHandler.INSTANCE);
 
         if (info.pendingItemInfo == null) {
-- 
GitLab


From 94b8f0f6e446bab6876d0827fa7c275c7337770f Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Wed, 25 Aug 2021 22:06:47 +0000
Subject: [PATCH 1663/1664] Disable eager initialization of Jetpack libraries

Bug: 197780098
Test: Launcher3 tests
Change-Id: I8f921ae26e873822ac2340ad78449cf1040af4cf
Merged-In: I8f921ae26e873822ac2340ad78449cf1040af4cf
(cherry picked from commit a88802ee922bec27ef7ce3a45471fc163afbb7a7)
---
 AndroidManifest-common.xml       | 7 +++++++
 tests/AndroidManifest-common.xml | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index d725a16f80..3b6141b47f 100644
--- a/AndroidManifest-common.xml
+++ b/AndroidManifest-common.xml
@@ -19,6 +19,7 @@
 -->
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.android.launcher3">
 
     <!--
@@ -176,5 +177,11 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
+
+        <!-- [b/197780098] Disable eager initialization of Jetpack libraries. -->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            tools:node="remove" />
     </application>
 </manifest>
diff --git a/tests/AndroidManifest-common.xml b/tests/AndroidManifest-common.xml
index 918ec4af1a..4d980c47e0 100644
--- a/tests/AndroidManifest-common.xml
+++ b/tests/AndroidManifest-common.xml
@@ -16,6 +16,7 @@
 
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.android.launcher3.tests">
 
     <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>
@@ -235,5 +236,11 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity-alias>
+
+        <!-- [b/197780098] Disable eager initialization of Jetpack libraries. -->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            tools:node="remove" />
     </application>
 </manifest>
-- 
GitLab


From 183bca2dcce50780f8d434e99558fac1bcf2af28 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Thu, 26 Aug 2021 03:27:13 +0000
Subject: [PATCH 1664/1664] Temporarily disable Launcher3 tests affected by
 fling changes

Bug: 197802324
Test: TaplTestsLauncher3
Change-Id: I3958bd9fb5521d09fa7cae642128b9f5e11b8e2e
Merged-In: I3958bd9fb5521d09fa7cae642128b9f5e11b8e2e
(cherry picked from commit bc4dc49c6c48bc716df63def3b25c476a414a757)
---
 .../tests/src/com/android/quickstep/TaplTestsQuickstep.java     | 2 ++
 tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java      | 1 +
 2 files changed, 3 insertions(+)

diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
index a5038a1fb0..b856e0b560 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
@@ -44,6 +44,7 @@ import com.android.quickstep.views.RecentsView;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -218,6 +219,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
     }
 
     @Test
+    @Ignore("b/197802324")
     @PortraitLandscape
     public void testAllAppsFromHome() throws Exception {
         // Test opening all apps
diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
index 4dd44f4193..d8576df947 100644
--- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
+++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
@@ -247,6 +247,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
     }
 
     @Test
+    @Ignore("b/197802324")
     @PortraitLandscape
     public void testWidgets() throws Exception {
         // Test opening widgets.
-- 
GitLab